diff --git a/.agents/shared/test-loop.md b/.agents/shared/test-loop.md
new file mode 100644
index 00000000000000..a94d6a489a4dd0
--- /dev/null
+++ b/.agents/shared/test-loop.md
@@ -0,0 +1,310 @@
+# Test Loop Protocol (harness-neutral)
+
+The portable core of autonomous, tested implementation. Both `/implement` (Claude Code)
+and `$implement` (Codex) read and follow THIS file verbatim for the testing phase, so the
+impl⇄test loop behaves identically across harnesses. The harness-specific wrappers own
+project setup, task splitting, and the spawn/wait mechanics; this file owns everything from
+"a single task's implementation is committed" onward.
+
+## Vocabulary
+
+- **task-runner** — the per-task agent (one spawn per task). Owns the loop below. Its context
+  is disposable: only its compact final summary propagates up to the orchestrator.
+- **impl agent / impl-fix agent** — sub-agents the task-runner spawns to write or fix the
+  implementation. They never write test code.
+- **test-author agent** — sub-agent that writes the ad-hoc test overlay and builds.
+- **overlay** — the throwaway `#ifdef _DEBUG` test code for the current task. Never part of an
+  implementation commit. Lives as a patch under the task folder between rounds.
+- **golden tdata** — a read-only backup of the authed test account. Tests only ever copy FROM
+  it; they never write to it.
+
+## Inputs the wrapper passes in
+
+- `TASK_DIR` — `.ai/<project>/<letter>/` for this task.
+- `TASK_ID` — stable id used in commit trailers (e.g. the project + letter).
+- **TASK SPEC** — the task's full description block (from `implementing.md`) and its referenced
+  images (`images/<file>` design mockups / screenshots / graphic resources for this isolated task).
+  This is half of what the tests are designed against (the diff is the other half); the design READS
+  the images — they show what the result should look like.
+- Config: `BUILD` (build command), `EXE` (built binary path), `MAX_ATTEMPTS` (default 4). The test
+  account lives in `out/Debug/` as the portable-data folders described under "Test account" below;
+  the wrapper has already confirmed the golden one exists (launch gate). All paths are relative to
+  the current checkout — no worktrees are created; the run happens in whatever repository slot it
+  was launched from.
+
+## State machine (run by the task-runner)
+
+Precondition: the implementation for this task is committed in the current checkout (impl agents
+commit; they do not stash). Record that commit's SHA as **IMPL_SHA** — the reset after each test run
+returns the checkout to exactly it. The runner tracks the attempt number as its own state (`attempt`
+starts at 1); the commit message carries no attempt marker. Commits follow "Commit message" below.
+
+```
+TEST_AUTHOR -> RUN -> ASSESS (adversarial — see "Assessing"):
+  APPROVED       -> reset to the impl commit (drop overlay); delete the test binary; return DONE up.
+  TEST_FLAW      -> fix the overlay only; back to RUN. Does NOT cost an impl attempt.
+  IMPL_BUG       -> spawn impl-fix agent (input = test.md, latest attempt's Root cause / Fix hint);
+                    it commits a NEW attempt; re-apply overlay (--3way, else re-author); RUN. attempt++
+  UNRECOVERABLE  -> delete the test binary; return BLOCKED up with the reason. Stop.
+  attempt > MAX  -> delete the test binary; return BLOCKED up with test.md + "improve" notes. Stop.
+
+On every TERMINAL exit (APPROVED / BLOCKED / UNRECOVERABLE / cap) "delete the test binary" means the
+step in "Leave no test binary behind" below.
+```
+
+Early-escalation rule: if two consecutive ASSESS rounds produce the **same failure signature**
+(same step fails the same way after a fix), stop and return BLOCKED — do not burn the rest of
+the attempt budget chasing it.
+
+UNRECOVERABLE conditions: the app reaches a login screen / `AUTH_KEY_DUPLICATED` and re-copying the
+test account does not recover it; a file-lock build error (`LNK1104`, `C1041`) that persists after
+the path-scoped kill; `test_TelegramForcePortable` missing when SETUP runs; or a crash with no usable
+diagnostic after one retry.
+
+## Handoff tokens
+
+- **Commit** is the only impl handoff. Impl/impl-fix agents `git add -A && git commit` per "Commit
+  message" below (and, if submodules changed, commit inside each submodule first, then bump the
+  superproject pointer in the same logical attempt — real commits, never stash). The runner records
+  the resulting SHA as that attempt's IMPL_SHA.
+- **Result doc** (`result<n>.md`) is the only thing handed back to a fix agent and the only thing
+  the runner reads to decide. See format below.
+
+## Commit message
+
+Impl commits must read like the repository's own history — never marked as autonomous. Match the
+style of recent `git log` subjects.
+- **Subject:** one concise, plain-language line summarizing the change, ≤ ~50-60 characters. This is
+  usually the ENTIRE message.
+- **Body (rare):** only when the subject can't carry it — a short plain-language note of WHAT was
+  done (user-facing, not the technical how); a line or two at most.
+- **No trailers, ever.** No `Autotask:`/attempt marker; no `Co-Authored-By:` or any tool/assistant
+  attribution line. This explicitly OVERRIDES any harness default that would append one — a freshly
+  spawned committing sub-agent may add `Co-Authored-By` unless told not to, so pass this rule to it.
+  The attempt number is the runner's own state, never part of the message.
+
+## Test account (portable data) — hard rules
+
+The debug build runs in portable mode out of `out/Debug/`. Three sibling folders matter:
+
+- `test_TelegramForcePortable` — the golden test account, prepared by the user. Read-only SOURCE,
+  never modified by tests. (Its presence is the launch gate; the wrapper aborts if it is missing.)
+- `TelegramForcePortable` — the LIVE folder the app actually uses (its presence is what puts the
+  build in portable mode). Disposable; recreated fresh each run.
+- `real_TelegramForcePortable` — the user's real data, preserved once so manual use survives.
+
+**SETUP — run at the START of every test run, with NO app instance alive. Idempotent: it
+guarantees a clean test account no matter how the previous run ended.**
+1. If `TelegramForcePortable` exists AND `real_TelegramForcePortable` does NOT, rename
+   `TelegramForcePortable` -> `real_TelegramForcePortable`. (Captures the user's real data exactly
+   once; guarded so it is never overwritten afterward.)
+2. If `TelegramForcePortable` still exists, delete it. (Safe: `real_...` now holds the real data, so
+   this only discards a leftover live/test copy.)
+3. Copy `test_TelegramForcePortable` -> `TelegramForcePortable`. The live folder is now a fresh copy
+   of the golden test account — ready to launch.
+
+**CLEANUP — optional, after a run.** The SETUP steps already self-heal, so cleanup exists only to
+leave the user's real data live for manual use:
+1. Delete `TelegramForcePortable`.
+2. Copy `real_TelegramForcePortable` -> `TelegramForcePortable`.
+
+Why this is safe: `real_...` is written exactly once (step 1 is guarded by "real does not exist")
+and `test_...` is only ever a copy source, so both the user's real data and the golden test account
+are structurally protected — only `TelegramForcePortable` is ever destroyed. Use `robocopy /MIR`
+(or `Copy-Item -Recurse` / `Remove-Item -Recurse -Force`) for the folder ops.
+
+**Serialize app runs.** Never have two `Telegram.exe` instances alive against this account at once —
+concurrent reuse of one auth key can trigger a server-side session reset. Before SETUP, launching, or
+rebuilding, kill any straggler **of THIS checkout's binary only** — the one whose full executable
+path is `EXE` (`out/Debug/Telegram.exe` in this checkout). Match on the full path; do NOT blanket-kill
+every `Telegram.exe` on the machine. The user may be running a system-installed client or another
+checkout's build against unrelated accounts — those use different auth keys, never conflict with this
+account, and MUST be left alive. On Windows, scope the kill by path:
+
+    $exe = (Resolve-Path "$EXE").Path
+    Get-CimInstance Win32_Process -Filter "Name = 'Telegram.exe'" |
+      Where-Object { $_.ExecutablePath -eq $exe } |
+      ForEach-Object { Stop-Process -Id $_.ProcessId -Force }
+
+`taskkill /IM Telegram.exe /F` is forbidden here and anywhere else in this loop — it is image-name-wide
+and takes down the user's unrelated clients. Every "kill stragglers" / "taskkill" step below means
+this path-scoped kill.
+
+**Avoid destructive calls.** The overlay must never trigger logout / session-termination /
+account-deletion. Tests that genuinely need those use a separate burner account, not this one. (If a
+permanent destructive-call fuse is later added to the debug build, this is enforced in code; until
+then it is the test-author's responsibility.)
+
+## Design the tests from THIS task (the crux)
+
+The single most important rule: **tests are derived from what THIS task changed — not from generic
+project navigation, and not reused from a previous task.** Different change → different checks. If
+two tasks produce the same screenshots and the same assertions, the second test is a no-op. Before
+writing any overlay:
+
+1. **Read both sides of the task.** (a) The TASK SPEC — the task's full description block from
+   `implementing.md` and its referenced design-mockup images (`images/<file>`); READ the images,
+   they are the source of truth for what the result should look like. (b) The change under test —
+   `git show <IMPL_SHA>` (the actual diff) and `<TASK_DIR>/plan.md`. List every concrete thing the
+   diff changed and every surface the task (description + "Observable result") says it affects.
+2. **Turn each into a falsifiable check with an ORACLE** — something that can come out FAIL. A check
+   with no way to fail is not a test. By change type:
+   - **String / text** → assert the EXACT expected text is present at runtime (dump the label/widget
+     text to the log and compare) AND the old text is gone. Not "the screen opened".
+   - **Visual / asset (icon, image, color, layout)** → the rendered target must MATCH the intended
+     new artwork and DIFFER from the old. Both are available as files (intended art under
+     `.ai/<project>/...`; the committed new file is `git show <IMPL_SHA>:<path>`; the old is
+     `git show <IMPL_SHA>^:<path>`). Render those references to PNG and compare the tight crop
+     against both. **If the rendered target matches the OLD art — or you cannot tell them apart —
+     that is a FAIL, not a pass.** (This is the check that catches a change that never took effect,
+     e.g. an asset that wasn't rebuilt into the binary.)
+   - **Behavior** → drive the specific action and observe the concrete state/log/screenshot the
+     change should produce, and confirm the pre-change behavior no longer happens.
+3. **Cover every surface the task names.** If the Observable result lists a settings row, a balance
+   header, a gift field, and a suggestion bar, each must be observed (or explicitly marked N/A with
+   a reason). Do not stop at one or two.
+4. **Write the checks into `<TASK_DIR>/test.md` BEFORE running** (format under "Test report"), so the
+   design is explicit and Actual/Result can be filled in per check afterward.
+
+## Overlay mechanics
+
+The overlay is ad-hoc, authored fresh against the CURRENT implementation, injected at the
+highest level that still exercises the change (often a direct data-layer call like
+`item->applyEdition(...)` rather than a faked MTP response). It must:
+
+- Live entirely inside `#ifdef _DEBUG` blocks.
+- Pick a **test strategy** and record it in the spec:
+  `live-data` (use real account data) · `live-mutate` (really create an entity — prefer a
+  throwaway target, clean up after) · `inject` (build fake local state without the network) ·
+  `mock-api` (intercept specific requests, return canned responses — for payments/destructive).
+  Prefer `inject` over `live-mutate` to avoid account/server accumulation and flake.
+- Drive the scenario on the Qt event loop, preferring **condition-waits over fixed timers**
+  (wait until the target widget/data actually exists, with a timeout fallback). Fixed sleeps are
+  the main source of screenshot flake.
+- Write a flushed log to `<TASK_DIR>/test_log.txt` (open Append|Text, flush after each write) and
+  save screenshots to `<TASK_DIR>/screenshots/`. Delete the old log at the first step.
+- **Capture the target tightly.** Grab the specific widget / row / glyph (or crop the saved PNG to
+  it) so the target is unambiguously in frame at usable resolution. A full-window grab that leaves
+  the target clipped, off-screen, or thumbnail-sized is NOT acceptable evidence — if the target
+  isn't clearly captured, that is a TEST_FLAW (re-frame), never a pass.
+- **Lay down the oracle's reference.** For an asset/visual check, also save the OLD and intended-NEW
+  art as PNGs beside the crop (`screenshots/<name>_old.png`, `<name>_new.png`) so the assessment is
+  a direct three-way comparison, not a memory test.
+- Emit these markers, one per line:
+  `TEST_STEP: <desc>` · `TEST_RESULT: PASS: <what>` / `TEST_RESULT: FAIL: <what> - <details>` ·
+  `SCREENSHOT: <full path>` · `TEST_COMPLETE` (immediately before quit).
+- Prefer asserting on **logged state** (log the actual value, assert on text — deterministic);
+  reserve screenshots for genuinely visual checks where an eye is the right judge.
+- **Watchdog:** install a `QTimer` at scenario start that force-quits (`Core::Quit()`, and if
+  needed `std::abort` after a flush) at a hard wall-clock cap (default 120s). This guarantees the
+  app never hangs holding a lock on the exe — independent of the runner's own timeout.
+- End every path (success or assertion failure) by logging `TEST_COMPLETE` then `Core::Quit()`.
+
+### Git mechanics for the overlay (no stash)
+
+- After building, save the overlay as a patch: `git diff > <TASK_DIR>/test-overlay.patch`.
+  Then **reset the checkout back to the implementation commit** so it stays impl-only:
+  `git reset --hard <IMPL_SHA>` (and `git submodule update --init --recursive` if the overlay
+  touched submodules). The overlay never enters an impl commit.
+- Next round, re-apply on top of the new implementation: `git apply --3way
+  <TASK_DIR>/test-overlay.patch`. This succeeds ~90% of the time when the tail change was small.
+- On conflict, **re-author the conflicting hunk from the spec** in `test<n>.md` (which records
+  intent: injection point, fake values, assertions) rather than fighting the conflict markers.
+  Scenario steps that only call public APIs should live in their own block so they never conflict;
+  only true in-situ injections land inside impl files.
+
+## Build & run discipline
+
+- Build with `BUILD`. A single changed TU compiles fast; only the overlay-touched files + link
+  rebuild between rounds. On `LNK1104`/`C1041`, run the path-scoped kill (Test account → "Serialize
+  app runs"), wait, retry once; if it persists -> UNRECOVERABLE.
+- **Codegen does not track resource mtimes.** If the task changed only a resource the style codegen
+  consumes (an icon `.svg`, etc.) without touching a `.style`, an incremental build will NOT re-pack
+  it and the binary keeps the OLD asset. Before building such a task force regeneration — touch the
+  referencing `.style` (or clean the codegen output) — so the change actually ships. A render that
+  shows no difference from before is the symptom of skipping this.
+- Run: run the SETUP steps (Test account) -> launch `EXE` in the background -> poll `test_log.txt`
+  every ~5s -> on each `SCREENSHOT:` read the image and judge it -> detect `TEST_COMPLETE` (success)
+  or process death (crash) or no new output for the watchdog cap (hang) -> path-scoped kill of any
+  straggler (Test account → "Serialize app runs") -> optional CLEANUP -> save the overlay
+  (`git diff > <TASK_DIR>/test-overlay.patch`) -> THEN `git reset --hard <IMPL_SHA>` (back to
+  impl-only — the patch must be saved before this reset).
+
+### Leave no test binary behind
+
+The on-disk `EXE` (`out/Debug/Telegram.exe`) always contains the compiled overlay after a test run —
+`git reset --hard` only reverts the source, not the built binary. So when the loop reaches a TERMINAL
+verdict (APPROVED, BLOCKED, UNRECOVERABLE, or attempt cap), after the final path-scoped kill and
+`git reset --hard <IMPL_SHA>`, **delete the built `EXE`** so no overlay-laden test binary is left for
+the user to launch by mistake:
+
+    Remove-Item -Force "$EXE"
+
+A clean, feature-ready binary is one `BUILD` away on demand. (Delete only on terminal exit — between
+attempts the next round rebuilds the overlay, so the binary is reused there.)
+
+## Assessing (adversarial)
+
+ASSESS decides APPROVED / TEST_FLAW / IMPL_BUG. Default to **not approved**; a check passes only on
+positive, specific evidence — in the captured pixels or the log — that the change is present AND
+correct.
+
+- **No pass by inference.** "Same asset so it's fine", "probably", "looks like" are not evidence.
+  Missing, clipped, or ambiguous evidence for a check → **TEST_FLAW**: re-frame/re-capture and run
+  again. Never turn missing evidence into a PASS.
+- **Judge the actual artifact.** State what is literally visible in the crop / present in the log,
+  then compare to the oracle reference (`_old.png` vs `_new.png`). Do not narrate expectations.
+- **Judge visually, never by hash.** Do NOT pixel-diff or hash images. Desktop renders differ from
+  the mobile (iOS/Android) design mockups by platform, DPI, theme and antialiasing — the mockups
+  convey the intended look, they are NOT pixel targets, so never fail a check merely for not matching
+  a mockup pixel-for-pixel. The falsifiable signal is the on-screen crop against the OLD vs
+  intended-NEW render (does it match the new and differ from the old?); the mockup informs what
+  "correct" means. Read the images and decide like a designer reviewing the build.
+- **No-difference = IMPL_BUG.** If a check detects no difference from the pre-change state (the glyph
+  matches the OLD art; the string still shows the old word), the change did not take effect — return
+  IMPL_BUG; do not approve.
+- **A visual check with no baseline/target comparison cannot APPROVE** — with no oracle you have
+  tested nothing.
+- APPROVED requires every derived check to PASS with evidence; else IMPL_BUG (real defect) or
+  TEST_FLAW (the test was wrong, not the code).
+
+## Test report (`<TASK_DIR>/test.md`) — human-readable, append per attempt
+
+The file the human opens to see how testing went. The test-author writes the checks (Expected /
+Oracle / Observed via) BEFORE running; ASSESS fills Actual / Result and the verdict. Append a new
+`## Attempt` section each round — never overwrite prior attempts.
+
+```
+# Test report — <project>/<letter>: <title>
+
+## Attempt <n> — commit <sha> — strategy <...> — verdict: <APPROVED|TEST_FLAW|IMPL_BUG|UNRECOVERABLE>
+
+### Test 1 — <aspect of THIS change>
+- Expected: <observable effect the change should produce>
+- Oracle: <what would make this check FAIL>
+- Observed via: <surface + how captured: tight crop of widget X; refs _old/_new>
+- Actual: <what is literally visible / logged>
+- Screenshots: screenshots/<after>.png (refs: _old.png, _new.png)
+- Result: PASS | FAIL
+
+### Test 2 — ...
+
+### Verdict reasoning
+<1-3 lines tying the checks to the verdict>
+### Root cause / Fix hint    (only if IMPL_BUG — the impl-fix agent reads this)
+### Failure signature         (one line, for early-escalation comparison)
+```
+
+## Compact summary the task-runner returns up
+
+```
+TASK: <TASK_ID>
+STATUS: <DONE|BLOCKED>
+VERDICT: <APPROVED|reason if blocked>
+ATTEMPTS: <n>
+TOUCHED: <repo paths or none>
+DISCOVERED: <new follow-up tasks to append to implementing.md, or none>
+NOTES: <one or two lines, or none>
+```
+
+Detailed reasoning stays in `.ai/` artifacts. The chat reply is only this block.
diff --git a/.agents/skills/implement/SKILL.md b/.agents/skills/implement/SKILL.md
new file mode 100644
index 00000000000000..8158a1f058993d
--- /dev/null
+++ b/.agents/skills/implement/SKILL.md
@@ -0,0 +1,311 @@
+---
+name: implement
+description: Autonomously implement a request on this repository (Telegram Desktop). Accept an inline description, a task-list file, or just a project name with a prepared .ai/<project>/tasks/about.md default task source, normalize it into a project with a testability-split task list, then drive each task to test-approval through an isolated per-task runner subagent that does context, planning, implementation, build, a single review pass, and an in-app test loop. Use when the user wants one prompt — ideally under Goal run mode — to carry work all the way to a tested, approved state with persistent .ai/ artifacts and a thin parent thread. Reuses task-think's phase prompts and the shared test-loop protocol; prefers spawn_agent/wait_agent and keeps the main thread lean.
+---
+
+# Implement Pipeline
+
+You are the top orchestrator. Take a request -- an inline description OR a task-list file --
+normalize it into a project with a testability-split task list, and drive each task to
+test-approval through an isolated per-task **task-runner** subagent. Keep your context lean: hold
+only the task list and one compact summary per task. All heavy work (planning, coding, building,
+testing) happens inside subagents whose context is discarded.
+
+This tested superset of `task-think` does not re-specify the implementation phases or the test
+loop. It reuses:
+- `.agents/skills/task-think/PROMPTS.md` — Phase 0-6 prompt templates and the Codex execution-mode
+  / wait-ladder / progress-heartbeat / compact-reply rules.
+- `.agents/shared/test-loop.md` — the harness-neutral impl⇄test loop (state machine, commit
+  handoff, overlay mechanics, `--3way`/re-author, test-account swap, watchdog, escalation).
+
+Read both before orchestrating.
+
+## Inputs
+
+`$ARGUMENTS` = ONE of:
+- an inline task description (e.g. `add a dark-mode toggle to settings`)
+- a path to a task-list file (e.g. `.ai/communities/tasks.txt` -- a rough list of tasks to refine)
+- an existing project name to resume, optionally followed by extra work
+- **just a project name with a prepared `.ai/<project>/tasks/about.md`** -- the default task source
+  (see Artifacts). With no other input, `implement <project>` plans and implements straight from that
+  file, so `implement communities` alone fires the full pipeline off `.ai/communities/tasks/about.md`.
+
+May also reference attached images.
+
+## Config
+
+Runs in the **current checkout** — wherever the skill is invoked. No worktrees are created; paths
+below are relative to that repository root.
+
+```
+BUILD         = cmake --build ./out --config Debug --target Telegram
+EXE           = ./out/Debug/Telegram.exe   (or ./out/Debug/Telegram on WSL/Linux — verify the tree)
+TEST_ACCOUNT  = ./out/Debug/test_TelegramForcePortable   (user-prepared golden; launch gate aborts if absent)
+MAX_ATTEMPTS  = 4
+```
+
+`EXE` is also the process-cleanup scope. Any autonomous kill step must match the full executable
+path for THIS checkout's built binary only; never blanket-kill all `Telegram.exe` processes.
+
+Tasks run **sequentially** in this one checkout (the build cache stays warm; app runs must serialize
+against the account anyway). To parallelize, run the skill in a different checkout/slot (e.g.
+`C:\Telegram\tdesktop`, `D:\Telegram\tdesktop`, `D:\Telegram\twin`). Each run is independent and
+single-tree. Never run the **test phase** in two slots against the same account at once; concurrent
+clients on one auth key can trigger a session reset, so give parallel slots separate test accounts.
+
+## Artifacts (per project)
+
+- `.ai/<project>/tasks/about.md` — the **default task source**: a human-prepared description (or
+  rough list) of the batch to implement, with any mockups dropped beside it in `.ai/<project>/tasks/`.
+  This is the file the user prepares; the planner reads it as SOURCE when `implement <project>` is
+  invoked with no other input. It is **distinct** from the project blueprint `.ai/<project>/about.md`
+  (the `tasks/` subdir is what disambiguates them).
+- `.ai/<project>/implementing.md` — the canonical, final, testability-split task list (descriptions
+  + status); the main thread is its only writer.
+- `.ai/<project>/images/` — illustrations referenced by tasks (`images/01.png`, ...).
+- `.ai/<project>/<letter>/` — per-task artifacts (context, plan, review, test, result, overlay, logs).
+- `.ai/<project>/about.md` — project blueprint (task-think convention).
+
+## Done (for Goal run mode)
+
+The run is **done** when every task in `implementing.md` has `Status: approved` or
+`Status: blocked: <reason>`. Under Goal run mode this is the stop condition. The run is
+**resumable**: re-invoking with the project name reads `implementing.md` and continues from the
+first unfinished task.
+
+## Phase A: Setup & input resolution (main thread)
+
+1. Record `$START_TIME` (for example with `Get-Date`).
+2. **Test-account gate (hard precondition — before any work).** If
+   `out/Debug/test_TelegramForcePortable` does not exist, STOP the entire skill immediately and tell
+   the user that the test account is not prepared: create `out/Debug/test_TelegramForcePortable`
+   (a portable-data folder authed to a throwaway test account) before `implement` can run, because
+   autonomous testing is impossible without it. Do no implementation work.
+3. **Resolve `$ARGUMENTS` into (project, SOURCE, mode) — without reading task files or images.**
+   The main thread never loads task prose or assets; resolving needs only paths and existence checks.
+   SOURCE ends as EITHER inline text OR a confirmed file path that the planner will read.
+   - **File input** — if the first token is a path: confirm it exists (for example with `Test-Path`,
+     do NOT read it) and set SOURCE = that path. If the path is under `.ai/<name>/`, project =
+     `<name>`; else derive a short kebab name from the filename. Mode = **extend** if that project
+     already has `implementing.md`, else new.
+   - **Existing project** — else if `.ai/<FIRST_TOKEN>/` exists: project = `FIRST_TOKEN`.
+     - If there is a **remainder** → mode = **extend**: if the remainder is itself a path to an
+       existing file, SOURCE = that path (confirm it exists, do NOT read it); otherwise SOURCE = the
+       remainder text.
+     - If the remainder is **empty**, resolve SOURCE in this priority order (existence checks only,
+       do NOT read):
+       1. If `.ai/<project>/tasks/about.md` exists → SOURCE = that file (the **default task
+          source**); mode = **extend** if `implementing.md` already exists, else **new**. This is the
+          `implement <project>` with a prepared task source path — it fires the full pipeline.
+       2. Else if `implementing.md` exists → mode = **resume** (no SOURCE; Phase C finishes the
+          still-unfinished tasks).
+       3. Else there is nothing to implement — tell the user to prepare `.ai/<project>/tasks/about.md`
+          (or pass a description / task-file path) and stop.
+   - **New inline** — else SOURCE = all of `$ARGUMENTS`; pick a unique short kebab-case project name
+     after consulting `.ai/`.
+   After this step you always have a project name and either a SOURCE (inline text or a confirmed
+   path) or mode = **resume** — and you have read neither the file nor any image.
+4. Create `.ai/<project>/` and `.ai/<project>/images/` if new.
+5. **Images must be on disk.** The planner reads images as files, and subagents cannot see chat
+   attachments, so every image a task needs must exist as a file (referenced by the SOURCE file, or
+   under `.ai/<project>/images/`). The main thread usually cannot save a pasted/inline chat image to
+   disk from text-only tools. If the user only pasted an image into chat, either ask them to drop it
+   into `.ai/<project>/images/` as a file, or, as a lossy fallback, write a textual description for
+   the planner. Do not claim to have saved it. Images the SOURCE file *references by path* are the
+   planner's job, not handled here.
+6. If mode = **resume**, skip Phase B and go to Phase C.
+
+## Phase B: Planning & testability split (delegate)
+
+Spawn one planner subagent (`fork_context: false`) with this prompt shape:
+
+```
+You are a planning/splitting agent for a large C++ codebase (Telegram Desktop).
+
+SOURCE — EITHER an inline request OR a path to a task-list file. If it is a PATH, READ it yourself
+(and any task files it points to); the main thread has NOT read it. If it is inline text, use it as
+the request:
+<the inline description, or the file path>
+PROJECT: <project>     MODE: <new | extend>
+
+IMAGES — the SOURCE and/or its task file may reference images by path (resolve them relative to the
+SOURCE file's directory, or use absolute paths; when SOURCE is `.ai/<project>/tasks/about.md`, its
+sibling files in `.ai/<project>/tasks/` — e.g. the mockup PNGs there — are those images). READ every
+referenced image yourself, then COPY
+each into `.ai/<project>/images/` with a descriptive kebab-case name, and reference it from the
+specific task(s) it pertains to (see "Images per task" below). The main thread did NOT read or move
+these — that is your job. If an image exists only as a textual description because the user pasted it
+into chat and it could not be saved to a file, it is provided here; treat that description as the
+visual spec: <description(s) or none>
+
+Read AGENTS.md. Briefly scan the codebase to gauge scope. Produce the FINAL ordered task list that
+satisfies BOTH constraints for every task:
+
+- **Implementable in one pass**: a single agent with a ~200k-token budget must be able to implement
+  the task fully on its own WITHOUT triggering context compaction — i.e. a bounded change it can
+  read and edit across a handful of files, not a sweep across dozens. If a unit is too big, split it.
+- **Independently testable**: each task must yield an observable behavior the test agent can drive
+  from an in-app debug overlay and verify via log/screenshot. Split on testable seams, so each task
+  ends at a point where something concrete can be exercised and checked.
+
+Use the minimal number of tasks subject to both constraints; preserve dependency order (a task comes
+before any task that depends on it). If the SOURCE is already a list, respect its intended breakdown
+and refine only as needed: split entries that are too big or not independently testable; you may
+merge trivially tiny adjacent entries if the result is still one testable unit.
+
+Write `.ai/<project>/implementing.md` in EXACTLY this format:
+
+# Implementing: <project>
+
+## Goal
+<one-line overall goal>
+
+## Tasks
+
+### a: <imperative title>
+Status: todo
+<2-4 line self-contained description: what to implement and the observable, testable result. Enough
+that a fresh agent can act on it.>
+Images: images/<file> — <caption>      (this line only if the task uses an image)
+
+### b: <imperative title>
+Status: todo
+<...>
+
+**Images per task (required).** Every provided image is a design/resource the work must satisfy.
+Attach each to the task(s) it pertains to via the `Images:` line, with a caption stating what that
+task must match in it (the exact wording on a mockup, the glyph/shape of a resource, etc.). A task
+that changes UI / visual / asset behavior MUST cite the specific mockups/resources it has to match;
+do not leave such a task without its images, and do not leave a provided image referenced by no task
+(if one genuinely applies to none, note why). These per-task references are the oracle the test
+phase verifies against — be specific and per-task, not one shared dump on the first task.
+
+Use letters a, b, c... as task ids. Do not plan internals or implement. When done, reply with ONLY a
+compact confirmation — `ready — <N> tasks` (extend: `ready — appended <letters>`); do NOT echo the
+task list or image contents back, the main thread reads `implementing.md` itself.
+```
+
+For **extend** mode, instead instruct the planner to FIRST read the existing `implementing.md`, then
+rewrite it as: (1) a TRIMMED completed-history — keep only the **three most recent** `Status: approved`
+task blocks (the three nearest the bottom of the file) and drop all earlier approved ones; (2) every
+still-unfinished task left untouched, in place and with its status — that is all `todo`, `in-progress`,
+and `blocked` blocks (never drop these); then (3) APPEND new lettered tasks (continuing the letter
+sequence from the highest letter still present after the trim) after them. The trim only removes
+already-approved entries from the list — it never touches the per-task `.ai/<project>/<letter>/`
+artifacts on disk, so a follow-up letter can still read an earlier letter's `context.md` even after its
+block was trimmed out of `implementing.md`. It must append ONLY tasks from SOURCE not already
+represented in `implementing.md` — so re-running `implement <project>` against an unchanged default
+`tasks/about.md` appends nothing (the planner replies `ready — appended (none)`, still applying the
+completed-history trim) and Phase C just finishes whatever is still unfinished. (Any
+`todo`/`in-progress` leftovers from an interrupted run are picked up by Phase C regardless, so
+defaulting to extend never loses an in-flight batch — it is a superset of resume.)
+
+After the planner replies `ready`, read `implementing.md` back ONCE (your first and only load of the
+task prose; you never read the images). Initialize a progress list mirroring the tasks so progress
+is visible.
+
+## Phase C: Per-task loop (main thread orchestrates)
+
+For each task whose `Status` is not `approved`/`blocked`, in order:
+
+1. Set `Status: in-progress` and mark the corresponding progress item in progress. Spawn ONE
+   **task-runner** worker (`fork_context: false`, request `model: gpt-5.4`,
+   `reasoning_effort: xhigh` when supported) with the prompt below. Apply task-think's wait ladder
+   (5-min waits while in progress, 1-2 min near completion; inspect the task's progress/result
+   artifacts on timeout; one follow-up then one fresh retry before escalating).
+2. Read only its compact reply block. Detail is in `.ai/`.
+3. Update the task's `Status:` — `approved` (STATUS DONE) or `blocked: <reason>`.
+4. Append any `DISCOVERED` tasks as new lettered `### <letter>:` blocks (`Status: todo`) after the
+   remaining ones, and add them to the progress list. The main thread is the only writer of
+   `implementing.md`.
+5. On BLOCKED, stop and report — do not start the next task. Under Goal run mode, surfacing the
+   blocker is the correct stop; the loop should not spin on a blocked task.
+
+### task-runner prompt
+
+```
+You are a task-runner for ONE task in an autonomous implement-and-test workflow on Telegram
+Desktop (C++ / Qt). You own this task end to end and isolate its context from the orchestrator.
+You MUST use subagents (spawn_agent/wait_agent) for each phase, keeping the parent thread lean.
+
+PROJECT: <project>   TASK: <letter> — <title>
+TASK DESCRIPTION:
+<the task's full description block from implementing.md>
+IMAGES: <referenced .ai/<project>/images/* paths, or none — Read them if present>
+TASK_DIR: .ai/<project>/<letter>/   TASK_ID: <project>-<letter>
+Config (paths relative to this checkout): BUILD/EXE/MAX_ATTEMPTS = <values>. Test account = the
+out/Debug/ portable-data folders (see test-loop.md "Test account").
+
+Read first: AGENTS.md; REVIEW.md; `.agents/skills/task-think/PROMPTS.md` (Phase 1-6 templates +
+execution rules); `.agents/shared/test-loop.md` (testing). Read any IMAGES listed above. For a
+follow-up letter, also read `.ai/<project>/about.md` and the previous letter's `context.md`.
+Create `<TASK_DIR>/` and `<TASK_DIR>/logs/`.
+
+Pipeline for THIS task only, spawning a fresh subagent per phase (so each phase's output stays in
+YOUR context, not the orchestrator's), writing prompt/progress/result logs per task-think:
+1. CONTEXT  — task-think Phase 1 (or 1F) -> context.md (+ about.md).
+2. PLAN     — Phase 2 -> plan.md.
+3. ASSESS   — Phase 3.
+4. IMPLEMENT— Phase 4, one subagent per plan phase. Implementation agents do NOT commit yet; you
+   commit after build passes.
+5. BUILD    — Phase 5 (prefer same-thread build; fix errors). On file-lock errors, run the
+   path-scoped kill of THIS checkout's binary only (see test-loop.md "Serialize app runs") and retry
+   once; if the lock persists, return BLOCKED/UNRECOVERABLE with the lock reason. This overrides the
+   generic task-think stop-on-lock rule for this autonomous implement workflow.
+6. REVIEW   — Phase 6 but a SINGLE pass (one 6a, one 6b if NEEDS_CHANGES, rebuild).
+7. COMMIT   — stage the task's intended changes and git commit with a concise plain-language subject
+   (≤ ~50-60 chars, matching recent `git log` style; usually the whole message — add a short plain
+   body only if the subject can't carry it). NO `Autotask:`/attempt trailer and NO
+   `Co-Authored-By:`/attribution line (overrides the default; see test-loop.md "Commit message").
+   Commit submodules first if dirty, then bump the pointer. Record the commit SHA as IMPL_SHA (track
+   the attempt number yourself).
+8. TEST     — run `.agents/shared/test-loop.md` to APPROVED / BLOCKED / attempt cap. Spawn a
+   test-author subagent and feed it BOTH sides per test-loop.md "Design the tests from THIS task":
+   (1) the TASK SPEC — this task's full description block above PLUS its referenced IMAGES (have it
+   READ the mockups; they show the intended result), and (2) the implementation — `git show
+   <IMPL_SHA>` + touched files. It designs a falsifiable oracle per change and writes the plan into
+   `<TASK_DIR>/test.md` BEFORE running (visual/asset changes compare the tight crop vs old vs
+   intended-new art — judged VISUALLY, never by hash/byte; mobile mockups are not pixel targets),
+   covers every surface the task names, and never reuses another task's navigate+screenshot. You
+   drive RUN/ASSESS yourself, ADVERSARIALLY (no pass-by-inference; missing evidence = TEST_FLAW;
+   no-difference-from-before = IMPL_BUG), and keep the human-readable `<TASK_DIR>/test.md` report.
+   Spawn an impl-fix subagent on IMPL_BUG (it commits the next attempt → new IMPL_SHA). After each
+   run, save the overlay patch into TASK_DIR and `git reset --hard <IMPL_SHA>` so the checkout
+   returns to impl-only. Run the test-account SETUP before each launch and honor every test-account
+   hard rule (serialize app runs; avoid destructive calls).
+
+Skip TEST only for docs/config-only tasks (say so). On Windows, after approval run task-think
+Phase 7 (CRLF / no-BOM) on the task's touched source/config files.
+
+Reply with only the compact summary block from test-loop.md
+(TASK/STATUS/VERDICT/ATTEMPTS/TOUCHED/DISCOVERED/NOTES).
+```
+
+## Completion
+
+When the loop ends (all tasks approved/blocked, or a blocked task stopped it):
+1. Summarize per task: approved vs blocked, attempts, files touched, key test evidence.
+2. List any discovered tasks that were added.
+3. Note the project name for `implement <project> <follow-up>`.
+4. Show total elapsed time (`Xh Ym Zs`, omit zero components).
+5. Remind that test overlays are saved as `.ai/<project>/<letter>/test-overlay.patch` and the
+   checkout is left at each task's implementation commit (overlays reset away).
+
+## Error handling
+
+- Follow task-think's retry ladder for stuck phases; a task-runner returning BLOCKED stops the loop.
+- If `implementing.md` or any artifact is malformed, re-spawn that step with tighter instructions.
+- For file-lock build errors, run the autonomous path-scoped kill from test-loop.md and retry once.
+  Kill only the resolved `EXE` for this checkout; `taskkill /IM Telegram.exe /F` and other
+  image-name-wide kills are forbidden. If the lock persists after the scoped retry, return BLOCKED
+  with the lock reason instead of asking for user input.
+- The launch gate (Phase A) guarantees the test account exists before any work begins.
+- Keep `.ai/` artifacts and edited text files LF/no-BOM on WSL; run CRLF normalization only on a
+  native Windows checkout.
+
+## User invocation
+
+`Use local implement skill: <request or path to a task file>` — ideally under Goal run mode so it
+loops to a tested state. Resume/extend: `Use local implement skill: <project> [additional change]`.
+Default task source: `Use local implement skill: <project>` with a prepared `.ai/<project>/tasks/about.md`
+runs the whole pipeline from that file with no other input.
diff --git a/.agents/skills/task-think/PROMPTS.md b/.agents/skills/task-think/PROMPTS.md
new file mode 100644
index 00000000000000..aef21013b6212a
--- /dev/null
+++ b/.agents/skills/task-think/PROMPTS.md
@@ -0,0 +1,559 @@
+# Phase Prompts
+
+Use these templates as Codex subagent messages. Use them as same-session checklists only for Phase 0, intentional main-session build work, Phase 7, or when delegation is unavailable from the start. Replace `<TASK>`, `<PROJECT>`, `<LETTER>`, and `<REPO_ROOT>`.
+
+## Orchestration Rules
+
+- Phase 0 runs in the main session.
+- When delegation is available, use a fresh subagent for Phase 1, Phase 2, Phase 3, each Phase 4 implementation unit, and each Phase 6 pass. Do not switch those phases to same-session midstream because of a timeout or missing artifact.
+- Phase 7 runs in the main session on Windows because it depends on the final local diff and touched-file set.
+- Write each phase prompt to `.ai/<PROJECT>/<LETTER>/logs/phase-<name>.prompt.md` before execution.
+- If you delegate a phase, send the prompt file contents as the initial `spawn_agent` message.
+- When writing the phase prompt file, append the standard progress file contract and the standard compact reply block below so the subagent knows how to surface progress before the final artifact.
+- After each phase completes, write `.ai/<PROJECT>/<LETTER>/logs/phase-<name>.result.md` summarizing the status, files touched, and any follow-up notes.
+- Use `fork_context: false` by default. If the phase depends on thread-only context or UI attachments, pass that context explicitly or enable `fork_context` only for that phase.
+- Prefer `worker` for phases that write files. Use `default` for plan or review passes if that fits the host better. Use `explorer` only for narrow read-only questions.
+- When supported, request `model: gpt-5.4` and `reasoning_effort: xhigh` for delegated phases.
+- Default wait budget for delegated phases is 5 minutes while the phase is clearly still in progress. Successful completion may wake earlier, so this does not delay finished work.
+- When a phase appears close to landing, use 1-2 minute waits until it finishes.
+- A `wait_agent` timeout is not failure. On timeout, inspect both the expected artifact and the matching progress file before deciding anything.
+- If the expected artifact exists and shows progress, wait again.
+- If the expected artifact is not ready but the progress file mtime moved or its heartbeat counter increased since the previous check, wait again. Prefer mtime checks first and avoid rereading the file unless you need detail. Do not count that as a failed wait.
+- If neither the expected artifact nor the progress file moved since the previous blocked check, send one short follow-up asking the same agent to refresh the progress file, finish the required artifact, and return the standard compact reply block, then wait again.
+- If the same agent still produces no usable artifact and no meaningful progress-file movement after two full default waits and one follow-up, close it and retry the phase in a fresh subagent.
+- For Phase 1, Phase 2, Phase 3, Phase 4, and Phase 6, if delegated retries still fail, stop and ask the user rather than rerunning the phase locally.
+- Never use `codex exec`, background shell child processes, or JSONL child-session logging from this skill.
+
+## Standard Progress File Contract
+
+Append this verbatim to every delegated phase prompt:
+
+```text
+Before deep work, create or update the matching progress file in `.ai/<PROJECT>/<LETTER>/logs/`.
+
+Use `<phase-name>.progress.md` as a concise heartbeat with:
+- `Heartbeat: <N>` on the first line, incremented on each meaningful update
+- Current step
+- Files being read or edited
+- Concrete findings or decisions so far
+- Blocker or next checkpoint
+
+Update it sparingly: preferably at natural milestones, and otherwise only after a longer quiet stretch such as roughly 5-10 minutes.
+Keep it tiny so the parent can usually rely on file mtime or the heartbeat counter instead of rereading the whole file.
+Do not wait until the final artifact to write progress.
+```
+
+## Standard Compact Reply Block
+
+Append this verbatim to every delegated phase prompt:
+
+```text
+Before replying in chat, write the required artifact(s) to disk.
+
+Reply in 8 lines or fewer using exactly these keys:
+STATUS: <DONE|BLOCKED|APPROVED|NEEDS_CHANGES>
+ARTIFACTS: <paths>
+TOUCHED: <repo paths or none>
+BLOCKER: <none or one short line>
+
+Do not restate the full context, plan, diff, or long reasoning in the chat reply.
+```
+
+## Artifact-Based Completion Checks
+
+- Phase 1 is complete only when `about.md` and `context.md` both exist and are non-empty.
+- Phase 2 is complete only when `plan.md` exists, contains a `## Status` section, and no unintended source edits were made.
+- Phase 3 is complete only when `plan.md` contains both `Phases:` in the Status section and `Assessed: yes`.
+- Phase 4 is complete only when the target phase checkbox changed to checked and the touched-file list matches the owned write set, or the blocker explains any mismatch.
+- Phase 5 is complete only when the build outcome is known and the build checkbox is updated on success.
+- Phase 6a is complete only when `review<R>.md` exists and contains a verdict line.
+- Phase 6b is complete only when the requested fixes were applied and the post-fix build outcome is known.
+
+## Phase 0: Setup
+
+Record the current time now and store it as `$START_TIME`. You will use this at the end to display total elapsed time.
+
+Before running any phase prompts, determine whether this is a new project or a follow-up task.
+
+Follow-up detection:
+1. Extract the first word or token from the task description. Call it `FIRST_TOKEN`.
+2. Check `.ai/` to see existing project names.
+3. Check whether `.ai/<FIRST_TOKEN>/about.md` exists.
+4. If the file exists, this is a follow-up task. The project name is `FIRST_TOKEN`. The task description is everything after `FIRST_TOKEN`.
+5. If the file does not exist, this is a new project. The full input is the task description.
+
+Do not proceed until you have determined follow-up vs new.
+
+For new projects:
+- Using the list of existing projects, pick a unique short name (1-2 lowercase words, hyphen-separated) that does not collide.
+- Create `.ai/<PROJECT>/`, `.ai/<PROJECT>/a/`, and `.ai/<PROJECT>/a/logs/`.
+- Set `<LETTER>` = `a`.
+
+For follow-up tasks:
+- Scan `.ai/<PROJECT>/` for existing task folders (`a/`, `b/`, ...). Find the latest one (highest letter).
+- The previous task letter = that highest letter.
+- The new task letter = next letter in sequence.
+- Create `.ai/<PROJECT>/<LETTER>/` and `.ai/<PROJECT>/<LETTER>/logs/`.
+
+Then proceed to Phase 1. Follow-up tasks do not skip context gathering. They use a modified Phase 1F prompt.
+
+## Phase 1: Context (New Project, letter = `a`)
+
+```text
+You are a context-gathering agent for a large C++ codebase (Telegram Desktop).
+
+TASK: <TASK>
+
+YOUR JOB: Read AGENTS.md, inspect the codebase, find all files and code relevant to this task, and write two documents.
+
+Steps:
+1. Read AGENTS.md for project conventions and build instructions.
+2. Search the codebase for files, classes, functions, and patterns related to the task.
+3. Read all potentially relevant files. Be thorough and prefer reading more rather than less.
+4. For each relevant file, note:
+   - file path
+   - relevant line ranges
+   - what the code does and how it relates to the task
+   - key data structures, function signatures, and patterns used
+5. Look for similar existing features that could serve as a reference implementation.
+6. Check api.tl if the task involves Telegram API.
+7. Check .style files if the task involves UI.
+8. Check lang.strings if the task involves user-visible text.
+
+Write two files.
+
+File 1: .ai/<PROJECT>/about.md
+
+This file is not used by any agent in the current task. It exists solely as a starting point for a future follow-up task's context gatherer. No planning, implementation, or review phase should rely on it during the current task.
+
+Write it as if the project is already fully implemented and working. It should contain:
+- Project: What this project does (feature description, goals, scope)
+- Architecture: High-level architectural decisions, which modules are involved, how they interact
+- Key Design Decisions: Important choices made about the approach
+- Relevant Codebase Areas: Which parts of the codebase this project touches, key types and APIs involved
+
+Do not include temporal state like "Current State", "Pending Changes", "Not yet implemented", or "TODO". Describe the project as a complete, coherent whole.
+
+File 2: .ai/<PROJECT>/a/context.md
+
+This is the primary task-specific implementation context. All downstream phases should be able to work from this file plus the referenced source files. It must be self-contained. Include:
+- Task Description: The full task restated clearly
+- Relevant Files: Every file path with line ranges and descriptions
+- Key Code Patterns: How similar things are done in the codebase, with snippets when useful
+- Data Structures: Relevant types, structs, classes
+- API Methods: Any TL schema methods involved, copied from api.tl when useful
+- UI Styles: Any relevant style definitions
+- Localization: Any relevant string keys
+- Build Info: Build command and any special notes
+- Reference Implementations: Similar features that can serve as templates
+
+Be extremely thorough. Another agent with no prior context will rely on this file.
+
+Do not implement code in this phase.
+```
+
+## Phase 1F: Context (Follow-up Task, letter = `b`, `c`, ...)
+
+```text
+You are a context-gathering agent for a follow-up task on an existing project in a large C++ codebase (Telegram Desktop).
+
+NEW TASK: <TASK>
+
+YOUR JOB: Read the existing project state, gather any additional context needed, and produce fresh documents for the new task.
+
+Steps:
+1. Read AGENTS.md for project conventions and build instructions.
+2. Read .ai/<PROJECT>/about.md. This is the project-level blueprint describing everything done so far.
+3. Read .ai/<PROJECT>/<PREV_LETTER>/context.md. This is the previous task's gathered context.
+4. Understand what has already been implemented by reading the actual source files referenced in about.md and the previous context.
+5. Based on the new task description, search the codebase for any additional files, classes, functions, and patterns that are relevant to the new task but not already covered.
+6. Read all newly relevant files thoroughly.
+
+Write two files.
+
+File 1: .ai/<PROJECT>/about.md (rewrite)
+
+Rewrite this file instead of appending to it. The new about.md must be a single coherent document that describes the project as if everything, including this new task's changes, is already fully implemented and working.
+
+It should incorporate:
+- everything from the old about.md that is still accurate and relevant
+- the new task's functionality described as part of the project, not as a pending change
+- any changed design decisions or architectural updates from the new task requirements
+
+It should not contain:
+- temporal state such as "Current State", "Pending Changes", or "TODO"
+- history of how requirements changed between tasks
+- references to "the old approach" versus "the new approach"
+- task-by-task changelog or timeline
+- information that contradicts the new task requirements
+
+File 2: .ai/<PROJECT>/<LETTER>/context.md
+
+This is the primary document for the new task. It must be self-contained and should include:
+- Task Description: The new task restated clearly, with enough project background that an implementation agent can understand it without reading any other .ai files
+- Relevant Files: Every file path with line ranges relevant to this task
+- Key Code Patterns: How similar things are done in the codebase
+- Data Structures: Relevant types, structs, classes
+- API Methods: Any TL schema methods involved
+- UI Styles: Any relevant style definitions
+- Localization: Any relevant string keys
+- Build Info: Build command and any special notes
+- Reference Implementations: Similar features that can serve as templates
+
+Be extremely thorough. Another agent with no prior context should be able to work from this file alone.
+
+Do not implement code in this phase.
+```
+
+## Phase 2: Plan
+
+```text
+You are a planning agent. You must create a detailed implementation plan.
+
+Read these files:
+- .ai/<PROJECT>/<LETTER>/context.md
+- Then read the specific source files referenced in context.md to understand the code deeply.
+
+Create a detailed plan in: .ai/<PROJECT>/<LETTER>/plan.md
+
+The plan.md should contain:
+
+## Task
+<one-line summary>
+
+## Approach
+<high-level description of the implementation approach>
+
+## Files to Modify
+<list of files that will be created or modified>
+
+## Files to Create
+<list of new files, if any>
+
+## Implementation Steps
+
+Each step must be specific enough that an agent can execute it without ambiguity:
+- exact file paths
+- exact function names
+- what code to add, modify, or remove
+- where exactly in the file (after which function, in which class, and so on)
+
+Number every step. Group steps into phases if there are more than about eight steps.
+
+### Phase 1: <name>
+1. <specific step>
+2. <specific step>
+
+### Phase 2: <name> (if needed)
+1. <specific step>
+
+## Build Verification
+- build command to run
+- expected outcome
+
+## Status
+- [ ] Phase 1: <name>
+- [ ] Phase 2: <name> (if applicable)
+- [ ] Build verification
+- [ ] Code review
+
+Do not implement code in this phase.
+```
+
+## Phase 3: Plan Assessment
+
+```text
+You are a plan assessment agent. Review and refine an implementation plan.
+
+Read these files:
+- .ai/<PROJECT>/<LETTER>/context.md
+- .ai/<PROJECT>/<LETTER>/plan.md
+- Then read the actual source files referenced to verify the plan makes sense.
+
+Assess the plan:
+
+1. Correctness: Are the file paths and line references accurate? Does the plan reference real functions and types?
+2. Completeness: Are there missing steps? Edge cases not handled?
+3. Code quality: Will the plan minimize code duplication? Does it follow existing codebase patterns from AGENTS.md?
+4. Design: Could the approach be improved? Are there better patterns already used in the codebase?
+5. Phase sizing: Each phase should be implementable by a single agent in one session. If a phase has more than about 8-10 substantive code changes, split it further.
+
+Update plan.md with your refinements. Keep the same structure but:
+- fix any inaccuracies
+- add missing steps
+- improve the approach if you found better patterns
+- ensure phases are properly sized for single-agent execution
+- add a line at the top of the Status section: `Phases: <N>`
+- add `Assessed: yes` at the bottom of the file
+
+If the plan is small enough for a single agent (roughly 8 steps or fewer), mark it as a single phase.
+
+Do not implement code in this phase.
+```
+
+## Phase 4: Implementation
+
+Run one implementation unit per plan phase. Keep implementation phases sequential by default. Parallelize only if their write sets are disjoint and the plan makes that safe.
+
+For each phase in the plan that is not yet marked as done, use this prompt:
+
+```text
+You are an implementation agent working on phase <N> of an implementation plan.
+
+Read these files first:
+- .ai/<PROJECT>/<LETTER>/context.md
+- .ai/<PROJECT>/<LETTER>/plan.md
+
+Then read the source files you will be modifying.
+
+Your owned write set for this phase:
+<OWNED_WRITE_SET>
+
+YOUR TASK: Implement only Phase <N> from the plan:
+<paste the specific phase steps here>
+
+Rules:
+- Follow the plan precisely.
+- Follow AGENTS.md coding conventions.
+- You are not alone in the codebase. Respect existing changes and do not revert unrelated work.
+- Do not modify .ai/ files except to update the Status section in plan.md.
+- When done, update plan.md Status section: change `- [ ] Phase <N>: ...` to `- [x] Phase <N>: ...`
+- Do not work on other phases.
+
+When finished, report what you did, which files you changed, and any issues encountered.
+```
+
+After each implementation phase:
+1. Use a narrow read or search to confirm the status line was updated.
+2. Verify the owned write set and touched files with a small diff summary such as `git diff --name-only`.
+3. If more phases remain, run the next implementation phase.
+4. If all phases are done, proceed to build verification.
+
+## Phase 5: Build Verification
+
+Only run this phase if the task modified project source code.
+
+Prefer running the build in the main session because it is critical-path work. If you delegate it, use a worker subagent and wait immediately for the result.
+
+```text
+You are a build verification agent.
+
+Read these files:
+- .ai/<PROJECT>/<LETTER>/context.md
+- .ai/<PROJECT>/<LETTER>/plan.md
+
+The implementation is complete. Your job is to build the project and fix any build errors that block the planned work.
+
+Steps:
+1. Run (from repository root): cmake --build ./out --config Debug --target Telegram
+2. If the build succeeds, update plan.md: change `- [ ] Build verification` to `- [x] Build verification`
+3. If the build fails:
+   a. Read the error messages carefully
+   b. Read the relevant source files
+   c. Fix the errors in accordance with the plan and AGENTS.md conventions
+   d. Rebuild and repeat until the build passes
+   e. Update plan.md status when done
+
+Rules:
+- Only fix build errors. Do not refactor or improve code beyond what is needed for a passing build.
+- Follow AGENTS.md conventions.
+- If build fails with file-locked errors (C1041, LNK1104, "cannot open output file", or similar access-denied lock issues), stop and report the lock. Do not retry.
+- You are not alone in the codebase. Respect existing changes and do not revert unrelated work.
+
+When finished, report the build result and which files, if any, you changed.
+```
+
+## Phase 6: Code Review Loop
+
+After build verification passes, run up to 3 review-fix iterations. Set iteration counter `R = 1`.
+
+Review loop:
+
+```text
+LOOP:
+  1. Run review phase 6a with iteration R.
+  2. Read review<R>.md verdict:
+     - "APPROVED" -> go to FINISH
+     - "NEEDS_CHANGES" -> run fix phase 6b
+  3. After fix work completes and build passes:
+     R = R + 1
+     If R > 3 -> go to FINISH
+     Otherwise -> go to step 1
+
+FINISH:
+  - Update plan.md: change `- [ ] Code review` to `- [x] Code review`
+  - Proceed to Phase 7 on Windows, otherwise proceed to Completion
+```
+
+### Step 6a: Code Review
+
+```text
+You are a code review agent for Telegram Desktop (C++ / Qt).
+
+Read these files:
+- .ai/<PROJECT>/<LETTER>/context.md
+- .ai/<PROJECT>/<LETTER>/plan.md
+- REVIEW.md
+- If R > 1, also read .ai/<PROJECT>/<LETTER>/review<R-1>.md
+
+Then run `git diff` to see the current uncommitted changes for this task.
+
+Read the modified source files in full to understand the changes in context.
+
+Perform a focused code review using these criteria, in order:
+
+1. Correctness and safety: Obvious logic errors, missing null checks at API boundaries, potential crashes, use-after-free, dangling references, race conditions.
+2. Dead code: Added or left-behind code that is never used within the scope of the changes.
+3. Redundant changes: Diff hunks that have no functional effect.
+4. Code duplication: Repeated logic that should be shared.
+5. Wrong placement: Code added to a module where it does not logically belong.
+6. Function decomposition: Whether an extracted helper would clearly improve readability.
+7. Module structure: Only in exceptional cases where a large new chunk of code clearly belongs elsewhere.
+8. Style compliance: REVIEW.md rules and AGENTS.md conventions.
+
+Important guidelines:
+- Review only the changes made, not pre-existing code outside the scope of the task.
+- Be pragmatic. Each suggestion should have a clear, concrete benefit.
+- Do not suggest comments, docstrings, or over-engineering.
+
+Write your review to: .ai/<PROJECT>/<LETTER>/review<R>.md
+
+The review document should contain:
+
+## Code Review - Iteration <R>
+
+## Summary
+<1-2 sentence overall assessment>
+
+## Verdict: <APPROVED or NEEDS_CHANGES>
+
+If the verdict is NEEDS_CHANGES, continue with:
+
+## Changes Required
+
+### <Issue 1 title>
+- Category: <dead code | duplication | wrong placement | function decomposition | module structure | style | correctness>
+- File(s): <file paths>
+- Problem: <clear description>
+- Fix: <specific description of what to change>
+
+Keep the list focused. Prioritize the most impactful issues.
+
+When finished, report your verdict clearly as: APPROVED or NEEDS_CHANGES.
+```
+
+### Step 6b: Review Fix
+
+```text
+You are a review fix agent. You implement improvements identified during code review.
+
+Read these files:
+- .ai/<PROJECT>/<LETTER>/context.md
+- .ai/<PROJECT>/<LETTER>/plan.md
+- .ai/<PROJECT>/<LETTER>/review<R>.md
+
+Then read the source files mentioned in the review.
+
+YOUR TASK: Implement all changes listed in review<R>.md.
+
+Rules:
+- Implement exactly the review changes, nothing more.
+- Follow AGENTS.md coding conventions.
+- You are not alone in the codebase. Respect existing changes and do not revert unrelated work.
+- Do not modify .ai/ files except where the review process explicitly requires it.
+
+After all changes are made:
+1. Build (from repository root): cmake --build ./out --config Debug --target Telegram
+2. If the build fails, fix build errors and rebuild until it passes.
+3. If build fails with file-locked errors (C1041, LNK1104, "cannot open output file", or similar access-denied lock issues), stop and report the lock. Do not retry.
+
+When finished, report what changes were made and which files you touched.
+```
+
+## Phase 7: Windows Text Normalization
+
+Run this phase only on Windows hosts and only after the review loop has finished.
+
+Use the current task's result logs as the source of truth for what Codex touched. Do not sweep the whole repo and do not rewrite unrelated files from a dirty worktree.
+
+```text
+You are performing the final Windows-only text normalization phase for task-think.
+
+Read these files:
+- .ai/<PROJECT>/<LETTER>/plan.md
+- .ai/<PROJECT>/<LETTER>/logs/phase-4*.result.md
+- .ai/<PROJECT>/<LETTER>/logs/phase-5*.result.md
+- .ai/<PROJECT>/<LETTER>/logs/phase-6*.result.md
+
+Your job:
+- Collect the union of repo file paths listed under "Touched files" in those result logs.
+- Keep only files inside the repository that currently exist and are textual project files: source, headers, build/config files, localization files, style files, and similar text assets.
+- Exclude `.ai/`, `out/`, binary files, and unrelated user files that were not touched by Codex in this task.
+- Rewrite each kept file so all line endings are CRLF.
+- If a kept file is UTF-8 or ASCII text, write it back as UTF-8 without BOM. Never add a UTF-8 BOM to source/config/project text files.
+- Preserve file content otherwise. Preserve whether the file ended with a trailing newline.
+
+Rules:
+- Run this phase in the main session on Windows.
+- Do not modify files outside the touched-file set for the current task.
+- Do not rewrite binary files.
+- When scripting this phase, do not use writer APIs or defaults that emit UTF-8 with BOM.
+- If a file cannot be normalized safely, record it as a failure instead of silently skipping it.
+
+When finished:
+1. Write `.ai/<PROJECT>/<LETTER>/logs/phase-7-line-endings.result.md`
+2. Include:
+   - whether the phase completed
+   - which files were normalized
+   - which files were skipped and why
+   - whether any UTF-8 BOMs were removed or verified absent
+   - any failures that need to be mentioned in the final summary
+```
+
+## Completion
+
+When all phases, including build verification, code review, and Windows line ending normalization when applicable, are done:
+1. Read the final `plan.md` and report the summary to the user.
+2. Show which files were modified or created.
+3. Note any issues encountered during implementation.
+4. Summarize the code review iterations: how many rounds, what was found and fixed, or whether it was approved on the first pass.
+5. On Windows, mention the text-normalization result briefly: which project files were normalized, whether any BOMs were removed, or whether nothing needed changes.
+6. Calculate and display the total elapsed time since `$START_TIME` (format as `Xh Ym Zs`, omitting zero components).
+7. Remind the user of the project name so they can request follow-up tasks within the same project.
+
+## Error Handling
+
+- If any phase fails or gets stuck, follow the timeout and retry rules above. Do not close an agent solely because the final artifact is missing while its progress file is still advancing. For Phase 1, Phase 2, Phase 3, Phase 4, and Phase 6, do not rerun locally after delegated retries fail; ask the user instead.
+- If `context.md` or `plan.md` is not written properly by a phase, rerun that phase in a fresh subagent with more specific instructions.
+- If build errors persist after the build phase's attempts, report the remaining errors to the user.
+- If a review-fix phase introduces new build errors that it cannot resolve, report to the user.
+
+## Prompt Delivery And Logs
+
+For each phase:
+1. Write the full prompt to `.ai/<PROJECT>/<LETTER>/logs/phase-<name>.prompt.md`
+2. Delegate by sending that prompt text to a fresh subagent, or use it as a same-session checklist only for the designated main-session phases or when delegation was unavailable from the start
+3. For delegated phases, expect a matching `.ai/<PROJECT>/<LETTER>/logs/phase-<name>.progress.md` heartbeat while work is in flight
+4. Save a concise completion note to `.ai/<PROJECT>/<LETTER>/logs/phase-<name>.result.md`
+
+For review iterations, include the iteration in the file name, for example:
+- `phase-6a-review-1.prompt.md`
+- `phase-6a-review-1.result.md`
+- `phase-6b-fix-1.prompt.md`
+- `phase-6b-fix-1.result.md`
+
+## Subagent Pattern
+
+Use this pattern conceptually for delegated phases:
+
+1. Write the phase prompt file.
+2. Spawn a fresh subagent with the phase prompt, usually with `fork_context: false`.
+3. Require the agent to create the matching progress file early and refresh it sparingly: at natural milestones when possible, otherwise only after a longer quiet stretch such as roughly 5-10 minutes.
+4. Wait in 5-minute intervals when the next step is blocked on that phase, checking both the final artifact and the progress file on timeout.
+5. When the phase looks close to finishing, switch to 1-2 minute waits.
+6. Prefer filesystem mtime checks on the progress file first. If its mtime moved or the heartbeat counter increased, keep waiting; do not treat that as a stall.
+7. If neither the artifact nor the progress file moves, send one short follow-up to the same agent, then retry once with a fresh subagent before involving the user.
+8. Validate the expected artifact or code changes with small shell summaries and the completion checks above.
+9. Write the result log from the validated outcome and the compact reply block.
+
+Do not replace this pattern with shell-launched `codex exec`.
diff --git a/.agents/skills/task-think/SKILL.md b/.agents/skills/task-think/SKILL.md
new file mode 100644
index 00000000000000..939e78a42789ca
--- /dev/null
+++ b/.agents/skills/task-think/SKILL.md
@@ -0,0 +1,145 @@
+---
+name: task-think
+description: Orchestrate a multi-phase implementation workflow for this repository with artifact files under .ai/<project-name>/<letter>/ using Codex subagents instead of shell-spawned child processes. Use when the user wants one prompt to drive context gathering, planning, plan assessment, implementation, build verification, and review with persistent artifacts, clear phase handoffs, and a thin parent thread. Prefer spawn_agent/send_input/wait_agent, keep heavy pre-build work delegated when possible, and avoid pulling timed-out phases back into the main session.
+---
+
+# Task Pipeline
+
+Run a full implementation workflow with repository artifacts and clear phase boundaries.
+
+## Inputs
+
+Collect:
+- task description
+- optional project name (if missing, derive a short kebab-case name)
+- optional constraints (files, architecture, risk tolerance)
+- optional screenshot paths
+
+If screenshots are attached in UI but not present as files, write a brief textual summary into the task artifacts before spawning fresh subagents so later phases can read the requirements without inheriting the whole parent thread.
+
+## Overview
+
+The workflow is organized around projects. Each project lives in `.ai/<project-name>/` and can contain multiple sequential tasks (labeled `a`, `b`, `c`, ... `z`).
+
+Project structure:
+```text
+.ai/<project-name>/
+  about.md              # Single source of truth for the entire project
+  a/                    # First task
+    context.md          # Gathered codebase context for this task
+    plan.md             # Implementation plan
+    review1.md          # Code review documents (up to 3 iterations)
+    review2.md
+    review3.md
+    logs/
+      phase-*.prompt.md
+      phase-*.progress.md
+      phase-*.result.md
+  b/                    # Follow-up task
+    context.md
+    plan.md
+    review1.md
+    logs/
+      ...
+  c/                    # Another follow-up task
+    ...
+```
+
+- `about.md` is the project-level blueprint: a single comprehensive document describing what this project does and how it works, written as if everything is already fully implemented. It contains no temporal state ("current state", "pending changes", "not yet implemented"). It is rewritten, not appended to, each time a new task starts, incorporating the new task's changes as if they were always part of the design.
+- Each task folder (`a/`, `b/`, ...) contains self-contained files for that task. The task's `context.md` carries all task-specific information: what specifically needs to change, the delta from the current codebase, gathered file references, and code patterns. Planning, implementation, and review phases should rely on the current task folder.
+
+## Artifacts
+
+Create and maintain:
+- `.ai/<project-name>/about.md`
+- `.ai/<project-name>/<letter>/context.md`
+- `.ai/<project-name>/<letter>/plan.md`
+- `.ai/<project-name>/<letter>/review<R>.md` (up to 3 review iterations)
+- `.ai/<project-name>/<letter>/logs/phase-<name>.prompt.md`
+- `.ai/<project-name>/<letter>/logs/phase-<name>.progress.md` for delegated phases
+- `.ai/<project-name>/<letter>/logs/phase-<name>.result.md`
+
+Each `phase-<name>.result.md` should capture a concise outcome summary: whether the phase completed, which files it touched, and any follow-up notes or blockers.
+Each delegated `phase-<name>.progress.md` should act as a heartbeat: a tiny monotonic counter plus current step, files being read or edited, concrete findings so far, and the next checkpoint. It is not a final artifact; it exists so the parent can distinguish active research from a truly stuck subagent without rereading large context.
+
+## Phases
+
+Run these phases sequentially:
+
+1. Phase 0: Setup - Record start time, detect follow-up vs new project, create directories.
+2. Phase 1: Context Gathering - Read codebase, write `about.md` and `context.md`. Use Phase 1F for follow-up tasks.
+3. Phase 2: Planning - Read context, write detailed `plan.md` with numbered steps grouped into phases.
+4. Phase 3: Plan Assessment - Review and refine the plan for correctness, completeness, code quality, and phase sizing.
+5. Phase 4: Implementation - Execute one implementation unit per plan phase.
+6. Phase 5: Build Verification - Build the project, fix any build errors. Skip if no source code was modified.
+7. Phase 6: Code Review Loop - Run review and fix iterations until approved or the iteration limit is reached.
+8. Phase 7: Windows Text Normalization - On Windows only, after review passes and before the final summary, normalize LF to CRLF for the text source/config files Codex edited in this task and ensure rewritten UTF-8 project files are saved without BOM.
+
+Use the phase prompt templates in `PROMPTS.md`.
+
+## Execution Mode
+
+Use Codex subagents as the primary orchestration mechanism.
+
+- When delegation is available, Phase 1, Phase 2, Phase 3, each Phase 4 implementation unit, and each Phase 6 review or review-fix pass must run in fresh subagents. Do not rerun those phases in the main session midstream just because a wait timed out or an artifact is missing.
+- Run Phase 7 in the main session on Windows because it depends on the final local file state and the exact touched-file set for the current task.
+- When any same-session helper rewrites Windows project text files, preserve CRLF and write UTF-8 without BOM. Avoid writer APIs or defaults that silently inject a UTF-8 BOM.
+- The main session may read `context.md` once after Phase 1 and `plan.md` once after Phase 3. After that, prefer narrow shell checks, file existence checks, and status-line reads instead of rereading full documents or diffs.
+- Prefer `worker` for phases that write files. Use `explorer` only for narrow read-only questions that unblock your next local step.
+- Keep `fork_context` off by default. Pass the phase prompt and explicit file paths instead of the whole thread unless the phase truly needs prior conversational context or thread-only attachments.
+- When the platform supports it, request `model: gpt-5.4` and `reasoning_effort: xhigh` for spawned phase agents. If overrides are unavailable, inherit the current session settings.
+- Write the exact phase prompt to the matching `logs/phase-<name>.prompt.md` file before you delegate. Use the same prompt file as a checklist if you later need to fall back to same-session execution.
+- For delegated phases, require an early `logs/phase-<name>.progress.md` heartbeat before deep work. The subagent should create or update it early, keep it tiny, and refresh it sparingly: preferably at natural milestones, and otherwise only after a longer quiet stretch such as roughly 5-10 minutes.
+- In every delegated prompt, require a compact final reply with only status, artifact paths, touched files, and blocker or `none`. Detailed reasoning belongs in `.ai/` artifacts, not in the chat reply.
+- After a subagent finishes, verify that the expected artifacts or code changes exist, then write a short result log in `logs/phase-<name>.result.md`.
+- For delegated phases, use `wait_agent` with a 5-minute timeout by default while a phase is still clearly in progress. Successful completion may wake earlier, so this does not add latency to finished phases.
+- When a phase looks close to completion — for example the final artifact has appeared, a build is in its final pass, or the agent said it is wrapping up — switch to 1-2 minute waits until it lands.
+- A timeout is not a failure; it only means no final status arrived yet. Do not treat short waits as stall detection for research-heavy phases.
+- On timeout, inspect the expected artifact, the phase progress file mtime, and the worktree for movement. Prefer mtime checks first; only reread the progress file when you need detail.
+- If the progress file mtime moved or its heartbeat counter increased since the previous check, treat that as active progress and wait again.
+- If no usable final artifact exists yet but the progress file is appearing or advancing, keep the same subagent alive. Progress-file movement does not count toward the retry limit.
+- If no usable final artifact exists yet and neither the expected artifact nor the progress file has moved since the previous blocked check, send one short follow-up asking the same subagent to refresh the progress file, finish the artifact, and return the compact status block, then wait again.
+- Only if the same subagent still shows no meaningful movement in either the expected artifact or the progress file after two full default waits and one follow-up should you close it and rerun that phase in a fresh subagent.
+- Use `wait_agent` only when the next step is blocked on the result. While the delegated phase runs, do small non-overlapping local tasks such as validating directory structure or preparing the next prompt file.
+- Build verification is critical-path work. Prefer running the build in the main session, and only delegate a bounded build-fix phase when there is a concrete reason.
+- If subagents are unavailable in the current environment, or current policy does not allow delegation from the start, run the phase in the main session using the same prompt files. Otherwise, do not switch a pre-build phase to same-session midstream. Never fall back to shell-spawned `codex exec` child processes from this skill.
+
+## Verification Rules
+
+- If build or test commands fail due to file locks or access-denied outputs (C1041, LNK1104), stop and ask the user to close locking processes before retrying.
+- Treat a delegated phase as complete only when the required artifact or status update exists on disk and matches the phase goals; do not rely on the chat reply alone.
+- Never claim completion without:
+  - implemented code changes present
+  - build attempt results recorded
+  - review pass documented with any follow-up fixes
+  - on Windows, if the task edited project source/config text files, a CRLF / no-BOM normalization pass recorded after review
+
+## Completion Criteria
+
+Mark complete only when:
+- All plan phases are done
+- Build verification is recorded
+- Review issues are addressed or explicitly deferred with rationale
+- On Windows, Codex-edited project source/config text files have been normalized to CRLF, any UTF-8 rewrites were saved without BOM, and the result is logged
+- Display total elapsed time since start (format: `Xh Ym Zs`, omitting zero components)
+- Remind the user of the project name so they can request follow-up tasks within the same project
+
+## Error Handling
+
+- If any phase fails, times out, or gets stuck, follow the retry ladder from Execution Mode. Do not close an agent solely because the final artifact is missing while its progress file is still moving. After two delegated attempts remain blocked with no meaningful progress, report the issue to the user. Do not absorb the phase into the main session before build unless delegation was unavailable from the start.
+- If `context.md` or `plan.md` is not written properly by a phase, rerun that phase in a fresh subagent with more specific instructions. Do not repair it locally before build unless delegation was unavailable from the start.
+- If build errors persist after the build phase's attempts, report the remaining errors to the user.
+- If a review-fix phase introduces new build errors that it cannot resolve, report to the user.
+- If Phase 7 cannot safely normalize a touched file on Windows or remove an introduced UTF-8 BOM from a touched project text file, record the failure in the result log and report it in the final summary instead of silently skipping it.
+
+## User Invocation
+
+Use plain language with the skill name in the request, for example:
+
+`Use local task-think skill with subagents: make sure FileLoadTask::process does not create or read QPixmap on background threads; use QImage with ARGB32_Premultiplied instead.`
+
+For follow-up tasks on an existing project:
+
+`Use local task-think skill with subagents: my-project also handle the case where the file is already cached`
+
+If screenshots are relevant, include file paths in the same prompt when possible.
diff --git a/.claude/commands/icon.md b/.claude/commands/icon.md
new file mode 100644
index 00000000000000..479e23eceb0194
--- /dev/null
+++ b/.claude/commands/icon.md
@@ -0,0 +1,306 @@
+---
+description: Generate an SVG icon from a design mockup using vectosolve vectorization
+allowed-tools: Read, Write, Edit, Glob, Grep, Bash, Agent, AskUserQuestion, TodoWrite, mcp__vectosolve__vectorize
+---
+
+# Icon - SVG Icon Generation from Design Mockup
+
+You generate production-quality SVG icons for Telegram Desktop by vectorizing design mockup screenshots using the vectosolve MCP service, then post-processing the result to match the Telegram icon format.
+
+**Arguments:** `$ARGUMENTS` = "$ARGUMENTS"
+
+If `$ARGUMENTS` is empty, ask the user to describe the icon they want and paste a cropped screenshot of it.
+
+## Overview
+
+The workflow takes a cropped screenshot of an icon from a design mockup (grabbed from the clipboard), vectorizes it via the vectosolve MCP, then post-processes the SVG (recolor to white-on-transparent, restructure to minimal format, set 24x24 output size).
+
+Working directory: `.ai/icon_{name}/` with iterations labeled by letter (`a/`, `b/`, ...), each containing `source.png`. Output SVGs are in the icon root: `a.svg`, `b.svg`, etc.
+
+Follow-ups are supported: `/icon {icon_name} <description>` continues from where the previous run left off.
+
+## Phase 0: Setup
+
+**Record the current time** (using `date` or equivalent) as `$START_TIME`.
+
+### Step 0a: Clipboard grab (MUST be the VERY FIRST action)
+
+If there is an image attached to the user's message:
+
+1. Generate a random 8-character hex string for `HASH` (use `openssl rand -hex 4` or similar).
+2. **IMMEDIATELY** — before any other processing — run this Bash command to save the clipboard image:
+   ```bash
+   HASH=$(openssl rand -hex 4) && if [[ "$OSTYPE" == darwin* ]]; then bash .claude/grab_clipboard.sh ".ai/icon_${HASH}.png"; else powershell -ExecutionPolicy Bypass -File .claude/grab_clipboard.ps1 ".ai/icon_${HASH}.png"; fi
+   ```
+   On macOS `.claude/grab_clipboard.sh` is used; on Windows `.claude/grab_clipboard.ps1`. Both grab the current clipboard image and save it to the specified path.
+
+3. If the command fails (exit 1 / no image on clipboard):
+   - Tell the user: **"Clipboard doesn't contain an image. Please copy the icon area first, then retry."** (On macOS: Cmd+Ctrl+Shift+4 to snip to clipboard; on Windows: Win+Shift+S.)
+   - **STOP IMMEDIATELY. Do NOT continue.** You cannot use the image pasted in the conversation — it exists only as pixels in the chat, not as a file you can send to vectosolve. The clipboard grab is the ONLY way to get the image to disk. Do not attempt any workaround.
+
+4. Read back the saved `.ai/icon_HASH.png` using the Read tool.
+5. Compare it visually with the image pasted in the conversation. They should depict the same thing.
+   - If they look **completely different**: delete `.ai/icon_HASH.png` and fail:
+     > "The clipboard image doesn't match what you pasted. Please re-copy and retry."
+   - If they look the same (or close enough): proceed. Store the temp path.
+
+If NO image is attached to the message, skip this step entirely.
+
+### Step 0b: Fail-fast — verify vectosolve MCP
+
+Check that the `mcp__vectosolve__vectorize` tool is available by looking at your available tools list. If it is NOT available, fail immediately with:
+
+> vectosolve MCP is not configured. Set it up with:
+> ```
+> claude mcp add vectosolve --scope user -e VECTOSOLVE_API_KEY=vs_xxx -- npx @vectosolve/mcp
+> ```
+> Then restart Claude Code.
+
+### Step 0c: Follow-up detection
+
+Extract the first word/token from `$ARGUMENTS` (everything before the first space or newline). Call it `FIRST_TOKEN`.
+
+Run these TWO commands using the Bash tool, **IN PARALLEL**:
+1. `ls .ai/` — to see all existing icon project names
+2. `ls .ai/icon_{FIRST_TOKEN}/context.md` — to check if this specific icon project exists
+
+**Evaluate the results:**
+- If command 2 **succeeds** (context.md exists): this is a **follow-up**. The icon name is `FIRST_TOKEN`. The follow-up description is everything in `$ARGUMENTS` after `FIRST_TOKEN`.
+- If command 2 **fails** (not found): this is a **new icon**. The full `$ARGUMENTS` is the icon description.
+
+### Step 0d: New icon setup
+
+1. Parse `$ARGUMENTS` to determine:
+   - **Icon description**: what the icon should depict
+   - **Icon type**: default is `menu` (24x24 menu/button icon). User may specify otherwise.
+   - **Target subfolder**: `menu/` by default, or another subfolder if specified.
+
+2. Choose an icon file name:
+   - Lowercase letters and underscores only — **NO hyphens**
+   - Match existing naming conventions (check `Telegram/Resources/icons/{subfolder}/`)
+   - Must NOT conflict with existing icons
+   - Must NOT collide with existing `.ai/icon_{name}/` directories
+
+3. Create `.ai/icon_{name}/` and `.ai/icon_{name}/a/`.
+
+4. Write `.ai/icon_{name}/context.md` with:
+   ```
+   ## Icon: {icon_name}
+   Type: {menu/other}
+   Target: Telegram/Resources/icons/{subfolder}/{icon_name}.svg
+
+   ## Original Request
+   {full $ARGUMENTS text}
+
+   ## Follow-ups
+   (none yet)
+   ```
+
+5. Set `LETTER` to `a`.
+
+### Step 0e: Follow-up setup
+
+1. Read `.ai/icon_{name}/context.md` to get the icon type, subfolder, and full history.
+2. Find the latest existing letter folder in `.ai/icon_{name}/` (highest letter).
+3. Set `LETTER` to the next letter after the latest.
+4. Create `.ai/icon_{name}/{LETTER}/`.
+5. Update `.ai/icon_{name}/context.md` — append the follow-up description to the `## Follow-ups` section:
+   ```
+   ### Follow-up (starting at letter {LETTER})
+   {follow-up description}
+   ```
+
+### Step 0f: Place source image
+
+If a clipboard image was grabbed in Step 0a:
+1. Copy (or move) `.ai/icon_HASH.png` → `.ai/icon_{name}/source.png` (overwrite if exists — this is always the latest source).
+2. Copy it to `.ai/icon_{name}/{LETTER}/source.png` (archive per-iteration source).
+3. Delete the temp `.ai/icon_HASH.png` if it was copied (not moved).
+
+If NO image was grabbed:
+- **New icon with no image**: Ask the user to provide a screenshot. STOP.
+- **Follow-up with no image**: The existing `source.png` in the icon root carries forward. Copy it to `.ai/icon_{name}/{LETTER}/source.png`. If no source.png exists at all, ask the user for an image.
+
+### Step 0g: Verify renderer
+
+Locate the render tool (`codegen_style` with `--render-svg` mode):
+
+```bash
+if [[ "$OSTYPE" == darwin* ]]; then
+    ls out/Telegram/codegen/codegen/style/Debug/codegen_style
+else
+    ls out/Telegram/codegen/codegen/style/Debug/codegen_style.exe
+fi
+```
+
+If missing, build it: `cmake --build out --config Debug --target codegen_style`
+
+Test on a known good SVG (use the appropriate binary path for the OS):
+```bash
+CODEGEN=$(if [[ "$OSTYPE" == darwin* ]]; then echo out/Telegram/codegen/codegen/style/Debug/codegen_style; else echo out/Telegram/codegen/codegen/style/Debug/codegen_style.exe; fi)
+$CODEGEN --render-svg Telegram/Resources/icons/menu/tag_add.svg .ai/icon_{name}/test_render.png 512
+```
+
+If works → delete test render, set `RENDER_AVAILABLE = true`. If fails → `RENDER_AVAILABLE = false`.
+
+## Phase 1: Vectorize & Post-process
+
+### Step 1a: Call vectosolve
+
+Use the `mcp__vectosolve__vectorize` tool with `file_path` set to the **absolute path** of `.ai/icon_{name}/{LETTER}/source.png`.
+
+**If this fails, STOP IMMEDIATELY.** Do NOT try to generate the SVG manually or by any other means. Report the error to the user and let them fix the issue (bad API key, no credits, network error, etc.).
+
+Save the returned SVG content to `.ai/icon_{name}/{LETTER}/raw_vectosolve.svg`.
+
+The MCP tool calls the vectosolve API ($0.20/call). The API key is stored in `~/.claude.json` MCP config (never in the repository).
+
+### Step 1b: Post-process the SVG
+
+The vectosolve SVG will have colors from the mockup, arbitrary dimensions, and possibly a non-square aspect ratio from a non-square screenshot crop. Post-processing fixes this by adjusting the **viewBox** — leave path coordinates untouched.
+
+**Do NOT transform path coordinates.** Vectosolve's paths are correct — the only thing wrong is the framing. All geometry adjustments are done by manipulating the `viewBox` and the `width`/`height` attributes.
+
+#### Sub-step 1: Read the request and determine parameters
+
+Before touching the SVG, determine these from the user's request and context.md:
+
+1. **Output size** (`OUT_W × OUT_H`): default is `24px × 24px` for menu icons. The user may request different dimensions (e.g., 36×36, 48×48, or non-square). Always check the request.
+2. **Content padding**: default is ~2px equivalent on each side at the output scale (so content fills roughly (OUT_W-4) × (OUT_H-4)). The user may request different padding or edge-to-edge.
+3. **Centering**: default is centered both horizontally and vertically. The user may request specific alignment (e.g., "align to bottom").
+
+#### Sub-step 2: Parse the raw SVG
+
+1. Extract the `viewBox`: `viewBox="VB_X VB_Y VB_W VB_H"` (typically `0 0 W H`).
+2. Identify ALL paths. Classify each:
+   - **Background**: a rect or path spanning the full viewBox (first path that's a simple rectangle matching the viewBox bounds). **Remove it entirely.**
+   - **Content**: the actual icon shapes. **Keep these, paths unchanged.**
+3. If paths have `transform="translate(TX,TY)"` attributes, that's fine — keep them as-is. The viewBox framing will work regardless.
+
+#### Sub-step 3: Compute the content bounding box
+
+Estimate the bounding box of the content paths (after removing the background). You can either:
+- Eyeball it from the path coordinates (look at first/last M commands and extremes of curves)
+- Or for precision, write a quick script to parse the paths and find min/max X/Y
+
+Call the result: `CX_MIN, CY_MIN, CX_MAX, CY_MAX`. Content dimensions: `CW = CX_MAX - CX_MIN`, `CH = CY_MAX - CY_MIN`.
+
+#### Sub-step 4: Compute the new viewBox
+
+The viewBox determines what part of the SVG coordinate space maps to the output rectangle. By expanding the viewBox beyond the content bounds, we add padding. By making the viewBox aspect ratio match the output aspect ratio, we prevent stretching.
+
+1. **Output aspect ratio**: `OUT_AR = OUT_W / OUT_H` (for 24×24 this is 1.0).
+2. **Padding in SVG coordinates**: we want ~2px padding at output scale. The scale factor is `OUT_W / VB_CONTENT_W` approximately, so padding in SVG coords = `2 * (CW / (OUT_W - 4))` (or similar — the exact formula depends on which dimension is dominant). Simpler approach: aim for content to occupy ~83% of the viewBox (≈ 20/24), so:
+   - `PADDED_W = CW / 0.83`
+   - `PADDED_H = CH / 0.83`
+3. **Match output aspect ratio**: the viewBox aspect ratio must equal `OUT_AR` to avoid stretching.
+   - If `PADDED_W / PADDED_H > OUT_AR`: width is dominant → `VB_W = PADDED_W`, `VB_H = VB_W / OUT_AR`
+   - If `PADDED_W / PADDED_H < OUT_AR`: height is dominant → `VB_H = PADDED_H`, `VB_W = VB_H * OUT_AR`
+   - If equal: `VB_W = PADDED_W`, `VB_H = PADDED_H`
+4. **Center the content** in the new viewBox:
+   - `VB_X = CX_MIN - (VB_W - CW) / 2`
+   - `VB_Y = CY_MIN - (VB_H - CH) / 2`
+   - (Adjust if the user requested non-centered alignment)
+
+The new viewBox is: `viewBox="VB_X VB_Y VB_W VB_H"`.
+
+#### Sub-step 5: Recolor to white-on-transparent
+
+- Replace ALL `fill` color values (anything that isn't `none`) with `#FFFFFF`.
+- Remove ALL `stroke` and `stroke-width` attributes entirely.
+- Remove `opacity` attributes if present.
+
+#### Sub-step 6: Determine path composition
+
+Look at the icon's visual structure and decide how paths should combine:
+- **Outlined shape** (e.g., circle outline with something inside): combine outer + inner cutout into one `<path>` with `fill-rule="evenodd"`.
+- **Separate distinct parts** (e.g., magnifying glass + checkmark): keep as separate `<path>` elements.
+- **Filled shape with cutout** (e.g., filled circle with checkmark punched out): combine into one path with `fill-rule="evenodd"`.
+
+#### Sub-step 7: Assemble final SVG
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="{OUT_W}px" height="{OUT_H}px" viewBox="{VB_X} {VB_Y} {VB_W} {VB_H}" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="..." fill="#FFFFFF"></path>
+    </g>
+</svg>
+```
+
+- `width`/`height` = the output size from the request (default `24px`/`24px`).
+- `viewBox` = the computed viewBox from Sub-step 4. The SVG renderer maps this coordinate region to the output size.
+- Path `d` attributes are **unchanged** from vectosolve output (just background removed, colors replaced).
+- No `<title>`, `id`, `xmlns:xlink`, `version`, `class`, `style`, XML comments, `<metadata>`, or `preserveAspectRatio`.
+- No `<circle>`, `<rect>`, `<line>` — only `<path>`.
+
+Write the final SVG to `.ai/icon_{name}/{LETTER}.svg`.
+
+### Step 1c: Render
+
+If `RENDER_AVAILABLE`:
+```bash
+$CODEGEN --render-svg ".ai/icon_{name}/{LETTER}.svg" ".ai/icon_{name}/render_{LETTER}.png" 512
+```
+
+Read the render to visually verify the result.
+
+## Phase 2: Review
+
+After rendering, assess the result:
+
+1. **Recognizable?** The icon should be clearly identifiable as the intended symbol.
+2. **Scale reasonable?** Should fill the space appropriately with ~2-3px padding.
+3. **Clean lines?** No broken paths, artifacts, or unwanted elements.
+4. **Correct colors?** All white on transparent (no leftover colors from the mockup).
+
+If the result looks good → proceed to Phase 3 (Output).
+
+If there are fixable issues (stray element, missed color, etc.) → fix the SVG directly, re-render, and re-check.
+
+If the result is poor (vectosolve couldn't handle the input well) → report to the user and suggest:
+- Trying a cleaner/larger crop of the icon
+- Providing a different screenshot
+- Following up: `/icon {icon_name} <description of what to change>`
+
+## Phase 3: Output
+
+1. Read the `Target:` line from `.ai/icon_{name}/context.md` to get the output path.
+
+2. Copy the final SVG to that target path (e.g., `Telegram/Resources/icons/menu/{icon_name}.svg`).
+
+3. Update `.ai/icon_{name}/context.md` — append to the end:
+   ```
+   ## Latest Output
+   Letter: {LETTER}
+   Written to: {target_path}
+   ```
+
+4. Report to the user:
+   - Final icon file path
+   - Number of vectosolve calls made (cost at $0.20/call)
+   - Suggest verifying visually
+   - Working directory `.ai/icon_{name}/` has all iterations
+   - Elapsed time since `$START_TIME` (format `Xm Ys`)
+   - Follow-up: `/icon {icon_name} <description of what to change>`
+
+## Text-only Follow-ups (no new image)
+
+When a follow-up has no attached image, the user wants to refine the existing SVG based on text feedback. In this case:
+
+1. Skip Phase 1 (no vectosolve call needed).
+2. Read the latest SVG (`.ai/icon_{name}/{prev_letter}.svg`).
+3. Read the latest render if available.
+4. Apply the user's requested changes by editing the SVG directly.
+5. Save as `.ai/icon_{name}/{LETTER}.svg`.
+6. Render, review, and output as normal (Phases 1c → 3).
+
+If the changes are too complex for manual SVG editing, suggest the user provide a new screenshot instead.
+
+## Error Handling
+
+- If clipboard grab fails → tell user to re-copy and retry.
+- If vectosolve returns an error → report it and suggest a different/cleaner screenshot.
+- If vectosolve returns SVG that can't be parsed → save raw output for debugging, report to user.
+- If the render helper fails → set `RENDER_AVAILABLE = false`, continue with SVG-only review.
+- If post-processing produces a broken SVG → fall back to the raw vectosolve output and do lighter cleanup.
diff --git a/.claude/commands/implement.md b/.claude/commands/implement.md
new file mode 100644
index 00000000000000..f65644576341c0
--- /dev/null
+++ b/.claude/commands/implement.md
@@ -0,0 +1,290 @@
+---
+description: Autonomously implement a task (split into a task list if needed), then implement + test each task to approval via isolated per-task subagents
+allowed-tools: Read, Write, Edit, Glob, Grep, Bash, Task, AskUserQuestion, TodoWrite
+---
+
+# Implement - Autonomous Implement-and-Test Orchestrator
+
+You are the **top orchestrator**. You take a request — an inline description OR a task-list file —
+normalize it into a project with a testability-split task list, and drive each task to
+test-approval through an isolated per-task `task-runner` subagent. Your context must stay lean: you
+hold only the task list and one compact summary per task. All heavy work (planning, coding,
+building, testing) happens inside subagents whose context is discarded.
+
+This is the tested superset of `/task`: it reuses `/task`'s phase prompts for implementation and
+adds the impl⇄test loop defined in `.agents/shared/test-loop.md`.
+
+**Arguments:** `$ARGUMENTS` = ONE of:
+- an inline task description (e.g. `add a dark-mode toggle to settings`)
+- a path to a task-list file (e.g. `.ai/communities/tasks.txt` — a rough list of tasks to refine)
+- an existing project name to resume (e.g. `communities`), optionally followed by extra work
+- **just a project name with a prepared `.ai/<project>/tasks/about.md`** — the default task source
+  (see Artifacts). With no other input, `/implement <project>` plans and implements straight from
+  that file, so `/implement communities` alone fires the full pipeline off `.ai/communities/tasks/about.md`.
+May also reference attached images.
+
+## Config
+
+Runs in the **current checkout** — wherever `/implement` is invoked. No worktrees are created; all
+paths below are relative to that repository root.
+
+```
+BUILD         = cmake --build ./out --config Debug --target Telegram
+EXE           = ./out/Debug/Telegram.exe
+TEST_ACCOUNT  = ./out/Debug/test_TelegramForcePortable   # user-prepared golden; launch gate aborts if absent
+MAX_ATTEMPTS  = 4
+```
+
+Tasks run **sequentially** in this one checkout (the build cache stays warm; app runs must
+serialize against the account anyway). To parallelize, launch `/implement` in a different
+checkout/slot (e.g. `C:\Telegram\tdesktop`, `D:\Telegram\tdesktop`, `D:\Telegram\twin`) — each run
+is independent and single-tree. Don't run the **test phase** in two slots against the same account
+at once (concurrent clients on one auth key can trigger a session reset); give parallel slots
+separate test accounts.
+
+## Artifacts (per project)
+
+- `.ai/<project>/tasks/about.md` — the **default task source**: a human-prepared description (or
+  rough list) of the batch to implement, with any mockups dropped beside it in `.ai/<project>/tasks/`.
+  This is the file you prepare; the planner reads it as SOURCE when `/implement <project>` is invoked
+  with no other input. It is **distinct** from the project blueprint `.ai/<project>/about.md` (the
+  `tasks/` subdir is what disambiguates them).
+- `.ai/<project>/implementing.md` — the canonical, final, testability-split task list (descriptions
+  + status). Your single source of truth; you are its only writer.
+- `.ai/<project>/images/` — illustrations referenced by tasks (`images/01.png`, ...).
+- `.ai/<project>/<letter>/` — per-task artifacts (context, plan, review, test, result, overlay).
+- `.ai/<project>/about.md` — project blueprint (the `/task` convention).
+
+## Done (for `/goal` loop mode)
+
+The run is **done** when every task in `implementing.md` has `Status: approved` or
+`Status: blocked: <reason>`. Under a `/goal` loop this is the stop condition. The run is
+**resumable**: re-invoking with the project name reads `implementing.md` and continues from the
+first unfinished task.
+
+## Phase A: Setup & input resolution
+
+1. Record start time (`Get-Date`).
+2. **Test-account gate (hard precondition — before any work).** If
+   `out/Debug/test_TelegramForcePortable` does NOT exist, STOP the entire command immediately and
+   tell the user: the test account is not prepared — create `out/Debug/test_TelegramForcePortable`
+   (a portable-data folder authed to a throwaway test account) before `/implement` can run, because
+   autonomous testing is impossible without it. Do no implementation work.
+3. **Resolve `$ARGUMENTS` into (project, SOURCE, mode) — without reading task files or images.**
+   The main thread never loads task prose or assets; resolving needs only paths and existence
+   checks. SOURCE ends up as EITHER inline text OR a confirmed file path (the planner reads it).
+   - **File input** — if the first token is a path: confirm it exists (`Test-Path`, do NOT read it)
+     and set SOURCE = that path. If the path is under `.ai/<name>/`, project = `<name>`; else derive
+     a short kebab name from the filename. Mode = **extend** if that project already has
+     `implementing.md`, else new.
+   - **Existing project** — else if `.ai/<FIRST_TOKEN>/` exists: project = `FIRST_TOKEN`.
+     - If there is a **remainder** → mode = **extend**: if the remainder is itself a path to an
+       existing file, SOURCE = that path (confirm with `Test-Path`, do NOT read it); otherwise
+       SOURCE = the remainder text.
+     - If the remainder is **empty**, resolve SOURCE in this priority order (existence checks only,
+       `Test-Path`, do NOT read):
+       1. If `.ai/<project>/tasks/about.md` exists → SOURCE = that file (the **default task
+          source**); mode = **extend** if `implementing.md` already exists, else **new**. This is
+          the `/implement <project>` with a prepared task source path — it fires the full pipeline.
+       2. Else if `implementing.md` exists → mode = **resume** (no SOURCE; Phase C finishes the
+          still-unfinished tasks).
+       3. Else there is nothing to implement — tell the user to prepare `.ai/<project>/tasks/about.md`
+          (or pass a description / task-file path) and stop.
+   - **New inline** — else SOURCE = the `$ARGUMENTS` text; pick a unique short kebab-case project
+     name (consult `ls .ai/`).
+   After this step you always have a project name and either a SOURCE (inline text or a confirmed
+   path) or mode = **resume** — and you have read neither the file nor any image.
+4. Create `.ai/<project>/` and `.ai/<project>/images/` if new.
+5. **Images must be on disk.** The planner reads images as files, and subagents cannot see chat
+   attachments — so every image a task needs must exist as a file (referenced by the SOURCE file, or
+   under `.ai/<project>/images/`). The main thread **cannot** save a pasted/inline chat image to disk
+   (`Write` is text-only; there is no save-attachment tool, and on Windows clipboard-paste isn't even
+   supported). So if the user only pasted an image into the chat, either ask them to drop it into
+   `.ai/<project>/images/` as a file, or — as a lossy fallback — write a textual description of it for
+   the planner. Do not claim to have saved it. Images the SOURCE file *references by path* are the
+   planner's job, not handled here.
+6. If mode = **resume**, skip Phase B and go to Phase C.
+
+## Phase B: Planning & testability split
+
+Spawn one planner subagent (Task, `general-purpose`):
+
+```
+You are a planning/splitting agent for a large C++ codebase (Telegram Desktop).
+
+SOURCE — EITHER an inline request OR a path to a task-list file. If it is a PATH, READ it yourself
+(and any task files it points to); the main thread has NOT read it. If it is inline text, use it as
+the request:
+<the inline description, or the file path>
+PROJECT: <project>     MODE: <new | extend>
+
+IMAGES — the SOURCE and/or its task file may reference images by path (resolve them relative to the
+SOURCE file's directory, or use absolute paths; when SOURCE is `.ai/<project>/tasks/about.md`, its
+sibling files in `.ai/<project>/tasks/` — e.g. the mockup PNGs there — are those images). READ every
+referenced image yourself, then COPY
+each into `.ai/<project>/images/` with a descriptive kebab-case name, and reference it from the
+specific task(s) it pertains to (see "Images per task" below). The main thread did NOT read or move
+these — that is your job. If an image exists only as a textual description (because the user pasted
+it into chat and it could not be saved to a file), it is provided here — treat that description as
+the visual spec: <description(s) or none>
+
+Read AGENTS.md. Briefly scan the codebase to gauge scope. Produce the FINAL ordered task list that
+satisfies BOTH constraints for every task:
+
+- **Implementable in one pass**: a single agent with a ~200k-token budget must be able to implement
+  the task fully on its own WITHOUT triggering context compaction — i.e. a bounded change it can
+  read and edit across a handful of files, not a sweep across dozens. If a unit is too big, split
+  it.
+- **Independently testable**: each task must yield an observable behavior the test agent can drive
+  from an in-app debug overlay and verify via log/screenshot. Split on testable seams, so each task
+  ends at a point where something concrete can be exercised and checked.
+
+Use the minimal number of tasks subject to both constraints; preserve dependency order (a task
+comes before any task that depends on it). If the SOURCE is already a list, respect its intended
+breakdown and refine only as needed: split entries that are too big or not independently testable;
+you may merge trivially tiny adjacent entries if the result is still one testable unit.
+
+Write `.ai/<project>/implementing.md` in EXACTLY this format:
+
+# Implementing: <project>
+
+## Goal
+<one-line overall goal>
+
+## Tasks
+
+### a: <imperative title>
+Status: todo
+<2-4 line self-contained description: what to implement and the observable, testable result. Enough
+that a fresh agent can act on it.>
+Images: images/<file> — <caption>      (this line only if the task uses an image)
+
+### b: <imperative title>
+Status: todo
+<...>
+
+**Images per task (required).** Every provided image is a design/resource the work must satisfy.
+Attach each to the task(s) it pertains to via the `Images:` line, with a caption stating what that
+task must match in it (the exact wording on a mockup, the glyph/shape of a resource, etc.). A task
+that changes UI / visual / asset behavior MUST cite the specific mockups/resources it has to match;
+do not leave such a task without its images, and do not leave a provided image referenced by no task
+(if one genuinely applies to none, note why). These per-task references are the oracle the test
+phase verifies against — be specific and per-task, not one shared dump on the first task.
+
+Use letters a, b, c... as task ids. Do not plan internals or implement. When done, reply with ONLY a
+compact confirmation — `ready — <N> tasks` (extend: `ready — appended <letters>`); do NOT echo the
+task list or image contents back, the main thread reads `implementing.md` itself.
+```
+
+For **extend** mode, instead instruct the planner to FIRST read the existing `implementing.md`, then
+rewrite it as: (1) a TRIMMED completed-history — keep only the **three most recent** `Status: approved`
+task blocks (the three nearest the bottom of the file) and drop all earlier approved ones; (2) every
+still-unfinished task left untouched, in place and with its status — that is all `todo`, `in-progress`,
+and `blocked` blocks (never drop these); then (3) APPEND new lettered tasks (continuing the letter
+sequence from the highest letter still present after the trim) after them. The trim only removes
+already-approved entries from the list — it never touches the per-task `.ai/<project>/<letter>/`
+artifacts on disk, so a follow-up letter can still read an earlier letter's `context.md` even after its
+block was trimmed out of `implementing.md`. It must append ONLY tasks from SOURCE not already
+represented in `implementing.md` — so re-running `/implement <project>` against an unchanged default
+`tasks/about.md` appends nothing (the planner replies `ready — appended (none)`, still applying the
+completed-history trim) and Phase C just finishes whatever is still unfinished. (Any
+`todo`/`in-progress` leftovers from an interrupted run are picked up by Phase C regardless, so
+defaulting to extend never loses an in-flight batch — it is a superset of resume.)
+
+After the planner replies `ready`, read `implementing.md` back ONCE (your first and only load of the
+task prose; you never read the images). Initialize a TodoWrite list mirroring the tasks so progress
+is visible.
+
+## Phase C: Per-task loop
+
+For each task in `implementing.md` whose `Status` is not `approved`/`blocked`, in order:
+
+1. Set its `Status: in-progress` (and mark `in_progress` in TodoWrite).
+2. Spawn ONE `task-runner` subagent (Task, `general-purpose`) with the prompt below. Wait for it.
+3. Read ONLY its compact summary block (the `task-runner` writes all detail to `.ai/`).
+4. Update the task's `Status:` line — `approved` if `STATUS: DONE`, else `blocked: <reason>`.
+5. If `DISCOVERED` lists new tasks, append them to `implementing.md` as new lettered `### <letter>:`
+   blocks (`Status: todo`) **after** the current remaining tasks, and add them to TodoWrite. (You
+   are the only writer of `implementing.md`, so there are no write races.)
+6. If `STATUS: BLOCKED`, stop the loop and report to the user — do not start the next task. (Under
+   `/goal`, surfacing the blocker is the correct stop; the loop should not spin on a blocked task.)
+
+### task-runner prompt
+
+```
+You are a task-runner for ONE task in an autonomous implement-and-test workflow on Telegram
+Desktop (C++ / Qt). You own this task end to end and isolate its context from the orchestrator.
+You MAY and SHOULD spawn your own subagents (the Task tool is available to you).
+
+PROJECT: <project>     TASK: <letter> — <title>
+TASK DESCRIPTION:
+<the task's full description block from implementing.md>
+IMAGES: <referenced .ai/<project>/images/* paths, or none — Read them if present>
+TASK_DIR: .ai/<project>/<letter>/
+TASK_ID: <project>-<letter>
+
+Config (paths relative to this checkout): BUILD=<...> EXE=<...> MAX_ATTEMPTS=<...>. The test account
+is the out/Debug/ portable-data folders (see test-loop.md "Test account").
+
+Read first: AGENTS.md; REVIEW.md; `.claude/commands/task.md` (for the exact Phase 1-6 prompt
+templates); `.agents/shared/test-loop.md` (for the testing phase). For a follow-up letter, also read
+`.ai/<project>/about.md` and the previous letter's `context.md`.
+
+Run this pipeline for THIS task only, spawning a fresh subagent per phase (so each phase's output
+stays in YOUR context, not the orchestrator's):
+
+1. CONTEXT  — run task.md's Phase 1 (new) or Phase 1F (follow-up) prompt for this task; produces
+   `<TASK_DIR>/context.md` (and `about.md` for the project).
+2. PLAN     — task.md Phase 2 -> `<TASK_DIR>/plan.md`.
+3. ASSESS   — task.md Phase 3 (refine plan, size phases).
+4. IMPLEMENT— task.md Phase 4, one subagent per plan phase. Implementation agents do NOT commit
+   yet; you commit after build passes.
+5. BUILD    — task.md Phase 5 (build with BUILD, fix errors). On file-lock errors, run the
+   path-scoped kill of THIS checkout's binary (see test-loop.md "Serialize app runs") and retry
+   once, else stop.
+6. REVIEW   — task.md Phase 6 but a SINGLE pass (not 3): one review agent, then one fix agent if
+   NEEDS_CHANGES, then rebuild. (Tests catch behavior; review catches dead code / duplication /
+   placement / style.)
+7. COMMIT   — `git add -A && git commit` with a concise plain-language subject (≤ ~50-60 chars,
+   matching recent `git log` style; usually the whole message — add a short plain body only if the
+   subject can't carry it). NO `Autotask:`/attempt trailer and NO `Co-Authored-By:`/attribution line
+   (this overrides the default; see test-loop.md "Commit message"). Commit submodules first if dirty,
+   then bump the pointer. Record the commit SHA as IMPL_SHA (you track the attempt number yourself).
+8. TEST     — run the loop in `.agents/shared/test-loop.md` to APPROVED, BLOCKED, or attempt cap.
+   Spawn a test-author subagent and feed it BOTH sides per test-loop.md "Design the tests from THIS
+   task": (1) the TASK SPEC — this task's full description block above PLUS its referenced IMAGES
+   (tell it to READ the mockups; they show the intended result), and (2) the implementation —
+   `git show <IMPL_SHA>` + touched files. It designs a falsifiable oracle per change and writes the
+   plan into `<TASK_DIR>/test.md` BEFORE running (for visual/asset changes the oracle compares the
+   tight crop against old vs intended-new art — judged VISUALLY, never by hash/byte; mobile mockups
+   are not pixel targets), covers every surface the task names, and never reuses another task's
+   navigate+screenshot. You drive RUN/ASSESS yourself, ADVERSARIALLY (no pass-by-inference; missing
+   evidence = TEST_FLAW; no-difference-from-before = IMPL_BUG), and keep the human-readable
+   `<TASK_DIR>/test.md` report. Spawn an impl-fix subagent on IMPL_BUG (it commits the next attempt →
+   new IMPL_SHA). After each run, save the overlay patch into TASK_DIR and `git reset --hard
+   <IMPL_SHA>` so the checkout returns to impl-only. Run the test-account SETUP steps before each
+   launch and honor every test-account hard rule (serialize app runs; avoid destructive calls).
+
+Skip TEST only if the task changed no runnable behavior (docs/config only) — say so explicitly.
+
+When done, write nothing new to chat except the compact summary block from test-loop.md
+("TASK/STATUS/VERDICT/ATTEMPTS/TOUCHED/DISCOVERED/NOTES"). All reasoning lives in `.ai/`.
+```
+
+## Completion
+
+When the loop ends (all tasks approved/blocked, or a blocked task stopped it):
+1. Summarize per task: approved vs blocked, attempts, files touched, key test evidence.
+2. List any discovered tasks that were added.
+3. Note the project name for `/implement <project> <follow-up>`.
+4. Show total elapsed time (`Xh Ym Zs`, omit zero components).
+5. Remind that test overlays are saved as `.ai/<project>/<letter>/test-overlay.patch` and the
+   checkout is left at each task's implementation commit (overlays reset away).
+
+## Error handling
+
+- A `task-runner` returning BLOCKED stops the loop; report its reason and the `test.md` path.
+- If `implementing.md` or any artifact is malformed, re-spawn that step with tighter instructions.
+- Never proceed past a file-lock build error — ask the user to close `Telegram.exe`.
+- The launch gate (Phase A) guarantees the test account exists before any work begins; if it is
+  absent the command never starts.
diff --git a/.claude/commands/reflect.md b/.claude/commands/reflect.md
new file mode 100644
index 00000000000000..f05d292bea2aa6
--- /dev/null
+++ b/.claude/commands/reflect.md
@@ -0,0 +1,136 @@
+---
+description: Learn from corrections — examine staged vs unstaged diffs and optionally distill insights into AGENTS.md or REVIEW.md
+allowed-tools: Read, Edit, Bash(git diff:*), Bash(git status:*), Bash(git log:*), Bash(ls:*), AskUserQuestion
+---
+
+# Reflect — Learn from Corrections
+
+You are a reflection agent. Your job is to examine the difference between what an AI agent produced (staged changes) and what the user corrected (unstaged changes), and determine whether any **general, reusable insight** can be extracted and added to the project's coding guidelines.
+
+**CRITICAL: Use extended thinking ultrathink for your analysis. This requires deep, careful reasoning.**
+
+## Arguments
+
+`$ARGUMENTS` = "$ARGUMENTS"
+
+If `$ARGUMENTS` is provided, it is a task name (project name from the `/task` workflow). This means the agent was working within `.ai/<task-name>/` and you should read the task context for deeper understanding of what the agent was trying to do.
+
+If `$ARGUMENTS` is empty, skip the task context step — just work from the diffs alone.
+
+## Context
+
+The workflow is:
+1. An AI agent implemented something and its changes were staged (`git add`).
+2. The user reviewed and corrected the agent's work. These corrections are unstaged.
+3. You are now invoked to reflect on what went wrong and whether it reveals a pattern.
+
+## Step 1: Gather the Diffs and Task Context
+
+Run these commands in parallel:
+
+```bash
+git diff --cached    # What the agent wrote (staged)
+git diff             # What the user corrected (unstaged, on top of staged)
+git status           # Which files are involved
+```
+
+If either diff is empty, tell the user and stop. Both diffs must be non-empty for reflection to be meaningful.
+
+### Task context (only if `$ARGUMENTS` is non-empty)
+
+The task name is `$ARGUMENTS`. Read the task's project context:
+
+1. Read `.ai/$ARGUMENTS/about.md` — the project-level description of what this feature does.
+2. Find the latest task iteration folder: list `.ai/$ARGUMENTS/` and pick the folder with the highest letter (`a`, `b`, `c`, ...).
+3. Read `.ai/$ARGUMENTS/<latest-letter>/context.md` — the detailed implementation context the agent was working from.
+
+This helps you distinguish between:
+- **Task-specific mistakes** — the agent misunderstood this particular feature's requirements or made a wrong choice within the specific problem. These are NOT documentation-worthy.
+- **General convention mistakes** — the agent did something that violates a pattern the codebase follows broadly, regardless of which feature is being implemented. These ARE potentially documentation-worthy.
+
+Having the task context makes this distinction much sharper. Without it, you might mistake a task-specific correction for a general pattern or vice versa.
+
+## Step 2: Read the Current Guidelines
+
+Read both files:
+- `AGENTS.md` — development guidelines: build system, coding style, API usage patterns, UI styling, localization, rpl, architectural conventions, "how to do things"
+- `REVIEW.md` — mechanical style and formatting rules: brace placement, operator position, type checks, variable initialization, call formatting
+
+Read them carefully. You need to know exactly what's already documented to avoid duplicates and detect contradictions.
+
+## Step 3: Analyze the Corrections
+
+Now think deeply. For each correction the user made, ask yourself:
+
+1. **What did the agent do wrong?** Understand the specific mistake.
+2. **Why was it wrong?** Identify the underlying principle.
+3. **Is this already covered by AGENTS.md or REVIEW.md?** Check carefully:
+   - If the existing rule's scope, title, and examples **clearly cover** this exact scenario and the agent just ignored it — that's not a documentation problem. Skip it.
+   - If the existing rule **technically applies** but its scope is too narrow, its examples don't illustrate this usage pattern, or its wording would reasonably lead an agent to think it doesn't apply here — **the rule needs improvement**. Treat this as a potential insight (broaden the scope, add examples, adjust wording). A rule that agents repeatedly violate is an ineffective rule.
+4. **Is this specific to this particular task, or is it general?** Most corrections are task-specific ("wrong variable here", "this should call that function instead"). These are NOT documentation-worthy. Only patterns that would apply across many different tasks are worth capturing.
+5. **Would documenting this actually help a future agent?** Some things are too context-dependent or too obvious to be useful as a written rule. Be honest about this.
+
+## Step 4: Decision
+
+After analysis, you MUST reach one of these conclusions:
+
+### Conclusion A: No actionable insight
+
+The corrections are purely task-specific, or the existing documentation clearly and specifically covers the exact scenario and the agent simply ignored it. Say what the corrections were and why no doc changes are needed. Then **stop**.
+
+### Conclusion B: New insight found
+
+You can articulate a **concise, general rule** that:
+- Applies broadly (not just to this one task)
+- Is not already documented
+- Would genuinely help a future agent avoid the same class of mistake
+- Can be expressed in a few sentences with a clear code example
+
+If you have a new insight, proceed to Step 5.
+
+### Conclusion C: Existing rule needs improvement
+
+A rule already exists in AGENTS.md or REVIEW.md, but its **scope is too narrow**, its **examples don't cover** the pattern the agent encountered, or its **wording** would reasonably lead an agent to think the rule doesn't apply. The agent's mistake is evidence the rule isn't effective.
+
+This is NOT the same as Conclusion A. The test: would a careful agent, reading the existing rule, clearly know it applies to this specific situation? If no — the rule needs to be broadened, its examples expanded, or its title/scope adjusted. Proceed to Step 5.
+
+**Common signs of an ineffective rule:**
+- The rule's title or scope restricts it to a context narrower than the actual principle (e.g., "in localization calls" when the pattern applies generally)
+- The examples only show one usage pattern, and the agent encountered a different one
+- The wording describes *what* to use but not *when* — so agents only apply it in situations that look like the examples
+
+## Step 5: Categorize and Check for Contradictions
+
+### Where does it belong?
+
+- **REVIEW.md** — if it's a mechanical/style rule: formatting, naming, syntax preferences, call structure, brace/operator placement, type usage patterns. Rules that can be checked by looking at code locally without understanding the broader feature.
+- **AGENTS.md** — if it's an architectural/behavioral guideline: how to use APIs, where to place code, design patterns, build conventions, module organization, reactive patterns (rpl), localization usage, style system usage. Rules that require understanding the broader context.
+
+### Does it contradict existing content?
+
+Read the target file again carefully. Check if:
+1. The new insight **contradicts** an existing rule — if so, do NOT just append or just remove. Instead, use AskUserQuestion to present both the existing rule and the new insight to the user, explain the contradiction, and ask how to reconcile them.
+2. The new insight **overlaps** with an existing rule — if so, consider whether the existing rule should be extended/refined rather than adding a separate entry.
+3. The new insight is **complementary** — it adds something new without conflicting. This is the simplest case.
+
+## Step 6: Propose the Change
+
+**Do NOT silently edit the files.** First, present your proposed change to the user:
+
+- Quote the exact text you want to add or modify
+- Explain which file and where in the file
+- Explain why this is general enough to document
+- If modifying existing text, show the before and after
+
+Use AskUserQuestion to get the user's approval before making any edit.
+
+Only after the user approves, apply the edit using the Edit tool.
+
+## Rules
+
+- **Keep docs lean and high-signal.** Don't add vague or overly specific rules. But don't default to inaction either — if the user had to manually fix something that a better-worded rule would have prevented, improving that rule is high-signal work.
+- **Never dump corrections verbatim.** The goal is distilled principles, not a changelog of mistakes.
+- **One insight per reflection, maximum.** If you think you see multiple insights, pick the strongest one. You can always run `/reflect` again next time.
+- **Keep the same style.** Match the formatting, tone, and level of detail of the target file. REVIEW.md uses specific before/after code examples. AGENTS.md uses explanatory sections with code snippets.
+- **Don't add "don't do X" rules.** Frame rules positively: "do Y" is better than "don't do X." Show the right way, not just the wrong way.
+- **No meta-commentary.** Don't add notes like "Added after reflection on..." — the rule should read as if it was always there.
diff --git a/.claude/commands/release.md b/.claude/commands/release.md
new file mode 100644
index 00000000000000..baaa7c261db67d
--- /dev/null
+++ b/.claude/commands/release.md
@@ -0,0 +1,119 @@
+---
+description: Prepare changelog, set version, and commit a new release
+allowed-tools: Read, Bash, Edit, Grep, AskUserQuestion
+---
+
+# Release — Changelog, Set Version, Commit
+
+Full release flow: generate changelog entry, run `set_version`, and commit.
+
+**Arguments:** `$ARGUMENTS` = "$ARGUMENTS"
+
+Parse `$ARGUMENTS` for two optional parts (in any order):
+- A **version number** like `6.7` or `6.7.0` — if provided, use it as the new version exactly.
+- The word **"beta"** — if present, mark the release as beta.
+
+If no version number is given, auto-increment the patch component (see step 2).
+
+## Steps
+
+### 1. Check git status is clean
+
+Run `git status --porcelain`. If there are any uncommitted changes, **stop** and ask the user to commit or discard them before proceeding. Do not continue until status is clean.
+
+### 2. Read the current changelog
+
+Read `changelog.txt` from the repository root. Note the **latest version number** on the first line (e.g. `6.6.3 beta (12.03.26)`). Parse its major.minor.patch components.
+
+### 3. Determine the new version number
+
+**Important:** version numbers are shared across the beta and stable tracks — the sequence advances through both. The same `major.minor.patch` cannot be released as both beta and stable. A beta release "uses up" that number; the next stable must bump to a new patch.
+
+- **If a version was provided in arguments**, use it directly (append `.0` if only major.minor was given). If the latest changelog entry already used this exact number (regardless of beta/stable), warn the user — they likely want a bumped patch.
+- **If no version was provided**, auto-increment from the latest changelog version:
+  - If it was a beta, and the new release is **not** beta, bump the patch component by 1 (do **not** reuse the beta's number for stable).
+  - If the new release is beta and the latest was also beta with the same major.minor, bump patch.
+  - Otherwise bump the patch component by 1.
+- Present the chosen version to the user and ask for confirmation before proceeding. If the user suggests a different version, use that instead.
+
+### 4. Fetch tags and determine the last release tag
+
+Run `git fetch origin --tags` first to ensure all tags from the public repository are available locally. Then run `git tag --sort=-v:refname` and find the most recent `v*` tag. This is the baseline for the diff.
+
+### 5. Collect commits
+
+Run `git log <last-tag>..HEAD --oneline` to get all commits since the last release.
+
+### 6. Write the changelog entry
+
+Analyze every commit message. Group them mentally into features, improvements, and bug fixes. Then produce **brief, user-facing bullet points** following these rules:
+
+- **Style:** Match the existing changelog tone exactly — short, imperative sentences starting with a verb (Fix, Add, Allow, Show, Improve, Support…). Keep the trailing periods (the existing changelog uses them).
+- **Brevity:** Each bullet should be one short sentence, around 80 characters when possible. No implementation details. No commit hashes.
+- **Selection:** Only include changes that matter to end users. Skip CI, build infra, submodule bumps, code style, refactors, and intermediate WIP commits. Collapse many related commits (e.g. a dozen image-editor commits) into one or two bullets.
+- **Ordering:** Features first, then improvements, then bug fixes.
+- **Quantity:** Aim for 4-12 bullets total depending on the amount of changes.
+
+### 7. Format and insert into changelog.txt
+
+Use this exact format (date is today in DD.MM.YY):
+
+```
+<version> [beta ](DD.MM.YY)
+
+- Bullet one.
+- Bullet two.
+```
+
+Prepend the new entry at the very top of `changelog.txt`, separated by a blank line from the previous first entry. Use the Edit tool.
+
+**Never delete or edit existing entries**, even if the new stable entry merges bullets from prior beta(s). Prior beta blocks remain as historical record for beta-track users.
+
+**For stable releases spanning prior beta(s):** the entry should cover everything since the last **stable** release (not just since the last beta), including noteworthy beta-shipped features, trimmed as needed to stay within 4–12 bullets.
+
+### 8. Wait for approval
+
+After writing the entry to `changelog.txt` (step 7), tell the user the changelog has been updated and ask them to review it in the IDE. They can edit it directly and tell you to continue, or tell you what to change in chat. Do **not** print the full entry in chat — the file itself is the review surface.
+
+**Do NOT proceed until the user explicitly approves.**
+
+### 9. Run set_version
+
+Once approved, run the `set_version` script from the repository root. On Windows:
+
+```
+.\Telegram\build\set_version.bat <version_arg>
+```
+
+Where `<version_arg>` is formatted as the `set_version` script expects:
+- Stable: `6.7.0` or `6.7`
+- Beta: `6.7.0.beta`
+
+Verify the script exits successfully (exit code 0). If it fails, show the error and stop.
+
+### 10. Commit
+
+Stage all changes and create a commit. The commit message format:
+
+**First line:**
+- For stable: `Version <major>.<minor>.` if patch is 0, otherwise `Version <major>.<minor>.<patch>.`
+- For beta: `Beta version <major>.<minor>.<patch>.`
+
+**Then an empty line, then the changelog bullets.** Copy bullet lines from the changelog as-is. Only wrap lines that exceed 72 characters; shorter lines must stay on a single line. When wrapping is needed, break at logically correct places (between words/phrases) and indent continuation lines with two spaces.
+
+Example commit message:
+```
+Beta version 6.6.3.
+
+- Drawing tools in image editor
+  (brush, marker, eraser, arrow).
+- Draw-to-reply button in media viewer.
+- Trim recorded voice messages.
+- Fix reorder freeze in chats list.
+```
+
+Use a HEREDOC to pass the message to `git commit -a`.
+
+### 11. Done
+
+Run `git log -1` to show the resulting commit and confirm success.
diff --git a/.claude/commands/task.md b/.claude/commands/task.md
new file mode 100644
index 00000000000000..31988405bb91ed
--- /dev/null
+++ b/.claude/commands/task.md
@@ -0,0 +1,506 @@
+---
+description: Implement a feature or fix using multi-agent workflow with fresh context at each phase
+allowed-tools: Read, Write, Edit, Glob, Grep, Bash, Task, AskUserQuestion, TodoWrite
+---
+
+# Task - Multi-Agent Implementation Workflow
+
+You orchestrate a multi-phase implementation workflow that uses fresh agent spawns to work within context window limits on a large codebase.
+
+**Arguments:** `$ARGUMENTS` = "$ARGUMENTS"
+
+If `$ARGUMENTS` is provided, it's the task description. If empty, ask the user what they want implemented.
+
+## Overview
+
+The workflow is organized around **projects**. Each project lives in `.ai/<project-name>/` and can contain multiple sequential **tasks** (labeled `a`, `b`, `c`, ... `z`).
+
+Project structure:
+```
+.ai/<project-name>/
+  about.md              # Single source of truth for the entire project
+  a/                    # First task
+    context.md          # Gathered codebase context for this task
+    plan.md             # Implementation plan
+    review1.md          # Code review documents (up to 3)
+    review2.md
+    review3.md
+  b/                    # Follow-up task
+    context.md
+    plan.md
+    review1.md
+  c/                    # Another follow-up task
+    ...
+```
+
+- `about.md` is the project-level blueprint — a single comprehensive document describing what this project does and how it works, written as if everything is already fully implemented. It contains no temporal state ("current state", "pending changes", "not yet implemented"). It is **rewritten** (not appended to) each time a new task starts, incorporating the new task's changes as if they were always part of the design.
+- Each task folder (`a/`, `b/`, ...) contains self-contained files for that task. The task's `context.md` carries all task-specific information: what specifically needs to change, the delta from the current codebase, gathered file references and code patterns. Planning, implementation, and review agents only read the current task's folder.
+
+## Phase 0: Setup
+
+**Record the current time now** (using `Get-Date` in PowerShell or equivalent) and store it as `$START_TIME`. You will use this at the end to display total elapsed time.
+
+⚠️ **CRITICAL: Follow-up detection MUST happen FIRST, before anything else.**
+
+### Step 0a: Follow-up detection (MANDATORY — do this BEFORE understanding the task)
+
+Extract the first word/token from `$ARGUMENTS` (everything before the first space or newline). Call it `FIRST_TOKEN`.
+
+Then run these TWO commands using the Bash tool, IN PARALLEL, right now:
+1. `ls .ai/` — to see all existing project names
+2. `ls .ai/<FIRST_TOKEN>/about.md` — to check if this specific project exists
+
+**Evaluate the results:**
+- If command 2 **succeeds** (the file exists): this is a **follow-up task**. The project name is `FIRST_TOKEN`. The task description is everything in `$ARGUMENTS` AFTER `FIRST_TOKEN` (strip leading whitespace).
+- If command 2 **fails** (file not found): this is a **new project**. The full `$ARGUMENTS` is the task description.
+
+**Do NOT proceed to step 0b until you have run these commands and determined follow-up vs new.**
+
+### Step 0b: Project setup
+
+**For new projects:**
+- Using the list from command 1, pick a unique short name (1-2 lowercase words, hyphen-separated) that doesn't collide with existing projects.
+- Create `.ai/<project-name>/` and `.ai/<project-name>/a/`.
+- Set current task letter = `a`.
+
+**For follow-up tasks:**
+- Scan `.ai/<project-name>/` for existing task folders (`a/`, `b/`, ...). Find the latest one (highest letter).
+- The previous task letter = that highest letter.
+- The new task letter = next letter in sequence.
+- Create `.ai/<project-name>/<new-letter>/`.
+
+Then proceed to Phase 1 (Context Gathering) in both cases. Follow-up tasks do NOT skip context gathering — they go through a modified version of it.
+
+## Phase 1: Context Gathering
+
+### For New Projects (task letter = `a`)
+
+Spawn an agent (Task tool, subagent_type=`general-purpose`) with this prompt structure:
+
+```
+You are a context-gathering agent for a large C++ codebase (Telegram Desktop).
+
+TASK: <paste the user's task description here>
+
+YOUR JOB: Read AGENTS.md, inspect the codebase, find ALL files and code relevant to this task, and write two documents.
+
+Steps:
+1. Read AGENTS.md for project conventions and build instructions.
+2. Search the codebase for files, classes, functions, and patterns related to the task.
+3. Read all potentially relevant files. Be thorough - read more rather than less.
+4. For each relevant file, note:
+   - File path
+   - Relevant line ranges
+   - What the code does and how it relates to the task
+   - Key data structures, function signatures, patterns used
+5. Look for similar existing features that could serve as a reference implementation.
+6. Check api.tl if the task involves Telegram API.
+7. Check .style files if the task involves UI.
+8. Check lang.strings if the task involves user-visible text.
+
+Write TWO files:
+
+### File 1: .ai/<project-name>/about.md
+
+NOTE: This file is NOT used by any agent in the current task. It exists solely as a starting point for a FUTURE follow-up task's context gatherer. No planning, implementation, or review agent will ever read it. Only the context-gathering agent of the next follow-up task reads about.md (together with the latest context.md) to produce a fresh context.md for that next task.
+
+Write it as if the project is already fully implemented and working. It should contain:
+- **Project**: What this project does (feature description, goals, scope)
+- **Architecture**: High-level architectural decisions, which modules are involved, how they interact
+- **Key Design Decisions**: Important choices made about the approach
+- **Relevant Codebase Areas**: Which parts of the codebase this project touches, key types and APIs involved
+
+Do NOT include temporal state like "Current State", "Pending Changes", "Not yet implemented", "TODO", or any other framing that distinguishes between "done" and "not done". Describe the project as a complete, coherent whole — as if everything is already working. This is a project overview, not a status tracker. Task-specific work belongs exclusively in context.md.
+
+### File 2: .ai/<project-name>/a/context.md
+
+This is the task-specific implementation context. This is the PRIMARY document — all downstream agents (planning, implementation, review) will read ONLY this file. It must be completely self-contained. It should contain:
+- **Task Description**: The full task restated clearly
+- **Relevant Files**: Every file path with line ranges and descriptions of what's there
+- **Key Code Patterns**: How similar things are done in the codebase (with code snippets)
+- **Data Structures**: Relevant types, structs, classes
+- **API Methods**: Any TL schema methods involved (copied from api.tl)
+- **UI Styles**: Any relevant style definitions
+- **Localization**: Any relevant string keys
+- **Build Info**: Build command and any special notes
+- **Reference Implementations**: Similar features that can serve as templates
+
+Be extremely thorough. Another agent with NO prior context will read this file and must be able to understand everything needed to implement the task.
+```
+
+After this agent completes, read both `about.md` and `a/context.md` to verify they were written properly.
+
+### For Follow-up Tasks (task letter = `b`, `c`, ...)
+
+Spawn an agent (Task tool, subagent_type=`general-purpose`) with this prompt structure:
+
+```
+You are a context-gathering agent for a follow-up task on an existing project in a large C++ codebase (Telegram Desktop).
+
+NEW TASK: <paste the follow-up task description here>
+
+YOUR JOB: Read the existing project state, gather any additional context needed, and produce fresh documents for the new task.
+
+Steps:
+1. Read AGENTS.md for project conventions and build instructions.
+2. Read .ai/<project-name>/about.md — this is the project-level blueprint describing everything done so far.
+3. Read .ai/<project-name>/<previous-letter>/context.md — this is the previous task's gathered context.
+4. Understand what has already been implemented by reading the actual source files referenced in about.md and the previous context.
+5. Based on the NEW TASK description, search the codebase for any ADDITIONAL files, classes, functions, and patterns that are relevant to the new task but not already covered.
+6. Read all newly relevant files thoroughly.
+
+Write TWO files:
+
+### File 1: .ai/<project-name>/about.md (REWRITE)
+
+NOTE: This file is NOT used by any agent in the current task. It exists solely as a starting point for a FUTURE follow-up task's context gatherer. No planning, implementation, or review agent will ever read it. You are rewriting it now so that the next follow-up has an accurate project overview to start from.
+
+REWRITE this file (not append). The new about.md must be a single coherent document that describes the project as if everything — including this new task's changes — is already fully implemented and working.
+
+It should incorporate:
+- Everything from the old about.md that is still accurate and relevant
+- The new task's functionality described as part of the project (not as "changes to make")
+- Any changed design decisions or architectural updates from the new task requirements
+
+It should NOT contain:
+- Any temporal state: "Current State", "Pending Changes", "TODO", "Not yet implemented"
+- History of how requirements changed between tasks
+- References to "the old approach" vs "the new approach"
+- Task-by-task changelog or timeline
+- Any distinction between "what was done before" and "what this task adds"
+- Information that contradicts the new task requirements (if the new task changes direction, the about.md should reflect the NEW direction as if it was always the plan)
+
+Think of about.md as "the complete description of what this project does and how it works." Someone reading it should understand the full project as a finished product, without knowing it went through multiple tasks.
+
+### File 2: .ai/<project-name>/<new-letter>/context.md
+
+This is the PRIMARY document — all downstream agents (planning, implementation, review) will read ONLY this file. It must be completely self-contained. about.md will NOT be available to them.
+
+It should contain:
+- **Task Description**: The new task restated clearly, with enough project background (from about.md and previous context.md) that an implementation agent can understand it without reading any other .ai/ files
+- **Relevant Files**: Every file path with line ranges relevant to THIS task (including files modified by previous tasks and any newly relevant files)
+- **Key Code Patterns**: How similar things are done in the codebase
+- **Data Structures**: Relevant types, structs, classes
+- **API Methods**: Any TL schema methods involved
+- **UI Styles**: Any relevant style definitions
+- **Localization**: Any relevant string keys
+- **Build Info**: Build command and any special notes
+- **Reference Implementations**: Similar features that can serve as templates
+
+Be extremely thorough. Another agent with NO prior context will read ONLY this file and must be able to understand everything needed to implement the new task. Do NOT assume the reader has seen about.md or any previous task files. The context.md is the single source of truth for all downstream agents — it must include all relevant project background, not just the delta.
+```
+
+After this agent completes, read both `about.md` and `<new-letter>/context.md` to verify they were written properly.
+
+## Phase 2: Planning
+
+Spawn an agent (Task tool, subagent_type=`general-purpose`) with this prompt structure:
+
+```
+You are a planning agent. You must create a detailed implementation plan.
+
+Read these files:
+- .ai/<project-name>/<letter>/context.md - Contains all gathered context for this task
+- Then read the specific source files referenced in context.md to understand the code deeply.
+
+Think carefully about the implementation approach.
+
+Create a detailed plan in: .ai/<project-name>/<letter>/plan.md
+
+The plan.md should contain:
+
+## Task
+<one-line summary>
+
+## Approach
+<high-level description of the implementation approach>
+
+## Files to Modify
+<list of files that will be created or modified>
+
+## Files to Create
+<list of new files, if any>
+
+## Implementation Steps
+
+Each step must be specific enough that an agent can execute it without ambiguity:
+- Exact file paths
+- Exact function names
+- What code to add/modify/remove
+- Where exactly in the file (after which function, in which class, etc.)
+
+Number every step. Group steps into phases if there are more than ~8 steps.
+
+### Phase 1: <name>
+1. <specific step>
+2. <specific step>
+...
+
+### Phase 2: <name> (if needed)
+...
+
+## Build Verification
+- Build command to run
+- Expected outcome
+
+## Status
+- [ ] Phase 1: <name>
+- [ ] Phase 2: <name> (if applicable)
+- [ ] Build verification
+- [ ] Code review
+```
+
+After this agent completes, read `plan.md` to verify it was written properly.
+
+## Phase 3: Plan Assessment
+
+Spawn an agent (Task tool, subagent_type=`general-purpose`) with this prompt structure:
+
+```
+You are a plan assessment agent. Review and refine an implementation plan.
+
+Read these files:
+- .ai/<project-name>/<letter>/context.md
+- .ai/<project-name>/<letter>/plan.md
+- Then read the actual source files referenced to verify the plan makes sense.
+
+Carefully assess the plan:
+
+1. **Correctness**: Are the file paths and line references accurate? Does the plan reference real functions and types?
+2. **Completeness**: Are there missing steps? Edge cases not handled?
+3. **Code quality**: Will the plan minimize code duplication? Does it follow existing codebase patterns from AGENTS.md?
+4. **Design**: Could the approach be improved? Are there better patterns already used in the codebase?
+5. **Phase sizing**: Each phase should be implementable by a single agent in one session. If a phase has more than ~8-10 substantive code changes, split it further.
+
+Update plan.md with your refinements. Keep the same structure but:
+- Fix any inaccuracies
+- Add missing steps
+- Improve the approach if you found better patterns
+- Ensure phases are properly sized for single-agent execution
+- Add a line at the top of the Status section: `Phases: <N>` indicating how many implementation phases there are
+- Add `Assessed: yes` at the bottom of the file
+
+If the plan is small enough for a single agent (roughly <=8 steps), mark it as a single phase.
+```
+
+After this agent completes, read `plan.md` to verify it was assessed.
+
+## Phase 4: Implementation
+
+Now read `plan.md` yourself to understand the phases.
+
+For each phase in the plan that is not yet marked as done, spawn an implementation agent (Task tool, subagent_type=`general-purpose`):
+
+```
+You are an implementation agent working on phase <N> of an implementation plan.
+
+Read these files first:
+- .ai/<project-name>/<letter>/context.md - Full codebase context
+- .ai/<project-name>/<letter>/plan.md - Implementation plan
+
+Then read the source files you'll be modifying.
+
+YOUR TASK: Implement ONLY Phase <N> from the plan:
+<paste the specific phase steps here>
+
+Rules:
+- Follow the plan precisely
+- Follow AGENTS.md coding conventions (no comments except complex algorithms, use auto, empty line before closing brace, etc.)
+- Do NOT modify .ai/ files except to update the Status section in plan.md
+- When done, update plan.md Status section: change `- [ ] Phase <N>: ...` to `- [x] Phase <N>: ...`
+- Do NOT work on other phases
+
+When finished, report what you did and any issues encountered.
+```
+
+After each implementation agent returns:
+1. Read `plan.md` to check the status was updated.
+2. If more phases remain, spawn the next implementation agent.
+3. If all phases are done, proceed to build verification.
+
+## Phase 5: Build Verification
+
+Only run this phase if the task involved modifying project source code (not just docs or config).
+
+Spawn a build verification agent (Task tool, subagent_type=`general-purpose`):
+
+```
+You are a build verification agent.
+
+Read these files:
+- .ai/<project-name>/<letter>/context.md
+- .ai/<project-name>/<letter>/plan.md
+
+The implementation is complete. Your job is to build the project and fix any build errors.
+
+Steps:
+1. Run (from repository root): cmake --build ./out --config Debug --target Telegram
+2. If the build succeeds, update plan.md: change `- [ ] Build verification` to `- [x] Build verification`
+3. If the build fails:
+   a. Read the error messages carefully
+   b. Read the relevant source files
+   c. Fix the errors in accordance with the plan and AGENTS.md conventions
+   d. Rebuild and repeat until the build passes
+   e. Update plan.md status when done
+
+Rules:
+- Only fix build errors, do not refactor or improve code
+- Follow AGENTS.md conventions
+- If build fails with file-locked errors (C1041, LNK1104), STOP and report - do not retry
+
+When finished, report the build result.
+```
+
+After the build agent returns, read `plan.md` to confirm the final status. Then proceed to Phase 6.
+
+## Phase 6: Code Review Loop
+
+After build verification passes, run up to 3 review-fix iterations to improve code quality. Set iteration counter `R = 1`.
+
+### Review Loop
+
+```
+LOOP:
+  1. Spawn review agent (Step 6a) with iteration R
+  2. Read review<R>.md verdict:
+     - "APPROVED" → go to FINISH
+     - Has improvement suggestions → spawn fix agent (Step 6b)
+  3. After fix agent completes and build passes:
+     R = R + 1
+     If R > 3 → go to FINISH (stop iterating, accept current state)
+     Otherwise → go to step 1
+
+FINISH:
+  - Update plan.md: change `- [ ] Code review` to `- [x] Code review`
+  - Proceed to Completion
+```
+
+### Step 6a: Code Review Agent
+
+Spawn an agent (Task tool, subagent_type=`general-purpose`):
+
+```
+You are a code review agent for Telegram Desktop (C++ / Qt).
+
+Read these files:
+- .ai/<project-name>/<letter>/context.md - Codebase context
+- .ai/<project-name>/<letter>/plan.md - Implementation plan
+- REVIEW.md - Style and formatting rules to enforce
+<if R > 1, also read:>
+- .ai/<project-name>/<letter>/review<R-1>.md - Previous review (to see what was already addressed)
+
+Then run `git diff` to see all uncommitted changes made by the implementation. Implementation agents do not commit, so `git diff` shows exactly the current feature's changes.
+
+Then read the modified source files in full to understand changes in context.
+
+Perform a thorough code review.
+
+REVIEW CRITERIA (in order of importance):
+
+1. **Correctness and safety**: Obvious logic errors, missing null checks at API boundaries, potential crashes, use-after-free, dangling references, race conditions. This is the highest priority — bugs and safety issues must be caught first. Do NOT nitpick internal code that relies on framework guarantees.
+
+2. **Dead code**: Any code added or left behind that is never called or used, within the scope of the changes. Unused variables, unreachable branches, leftover scaffolding.
+
+3. **Redundant changes**: Changes in the diff that have no functional effect — moving declarations or code blocks to a different location without reason, reformatting untouched code, reordering includes or fields with no purpose. Every line in the diff should serve the feature. If a file appears in `git diff` but contains only no-op rearrangements, flag it for revert.
+
+4. **Code duplication**: Unnecessary repetition of logic that should be shared. Look for near-identical blocks that differ only in minor details and could be unified.
+
+5. **Wrong placement**: Code added to a module where it doesn't logically belong. If another existing module is a clearly better fit for the new code, flag it. Consider the existing module boundaries and responsibilities visible in context.md.
+
+6. **Function decomposition**: For longer functions (roughly 50+ lines), consider whether a logical sub-task could be cleanly extracted into a separate function. This is NOT a hard rule — a 100-line function that flows naturally and isn't easily divisible is perfectly fine. But sometimes even a 20-line function contains a clear isolated subtask that reads better as two 10-line functions. The key is to think about it each time: does extracting improve readability and reduce cognitive load, or does it just scatter logic across call sites for no real benefit? Only suggest extraction when there's a genuinely self-contained piece of logic with a clear name and purpose.
+
+7. **Module structure**: Only in exceptional cases — if a large amount of newly added code (hundreds of lines) is logically distinct from the rest of its host module, suggest extracting it into a new module. But do NOT suggest new modules lightly: every module adds significant build overhead due to PCH and heavy template usage. Only suggest this when the new code is both large enough AND logically separated enough to justify it. At the same time, don't let modules grow into multi-thousand-line monoliths either.
+
+8. **Style compliance**: Verify adherence to REVIEW.md rules (empty line before closing brace, operators at start of continuation lines, minimize type checks with direct cast instead of is+as, no if-with-initializer when simpler alternatives exist) and AGENTS.md conventions (no unnecessary comments, `auto` usage, no hardcoded sizes — must use .style definitions), etc.
+
+IMPORTANT GUIDELINES:
+- Review ONLY the changes made, not pre-existing code in the repository.
+- Be pragmatic. Don't suggest changes for the sake of it. Each suggestion should have a clear, concrete benefit.
+- Don't suggest adding comments, docstrings, or type annotations — the codebase style avoids these.
+- Don't suggest error handling for impossible scenarios or over-engineering.
+
+Write your review to: .ai/<project-name>/<letter>/review<R>.md
+
+The review document should contain:
+
+## Code Review - Iteration <R>
+
+## Summary
+<1-2 sentence overall assessment>
+
+## Verdict: <APPROVED or NEEDS_CHANGES>
+
+<If APPROVED, stop here. Everything looks good.>
+
+<If NEEDS_CHANGES, continue with:>
+
+## Changes Required
+
+### <Issue 1 title>
+- **Category**: <dead code | duplication | wrong placement | function decomposition | module structure | style | correctness>
+- **File(s)**: <file paths>
+- **Problem**: <clear description of what's wrong>
+- **Fix**: <specific description of what to change>
+
+### <Issue 2 title>
+...
+
+Keep the list focused. Only include issues that genuinely improve the code. If you find yourself listing more than ~5-6 issues, prioritize the most impactful ones.
+
+When finished, report your verdict clearly as: APPROVED or NEEDS_CHANGES.
+```
+
+After the review agent returns, read `review<R>.md`. If the verdict is APPROVED, proceed to Completion. If NEEDS_CHANGES, spawn the fix agent.
+
+### Step 6b: Review Fix Agent
+
+Spawn an agent (Task tool, subagent_type=`general-purpose`):
+
+```
+You are a review fix agent. You implement improvements identified during code review.
+
+Read these files:
+- .ai/<project-name>/<letter>/context.md - Codebase context
+- .ai/<project-name>/<letter>/plan.md - Original implementation plan
+- .ai/<project-name>/<letter>/review<R>.md - Code review with required changes
+
+Then read the source files mentioned in the review.
+
+YOUR TASK: Implement ALL changes listed in review<R>.md.
+
+For each issue in the review:
+1. Read the relevant source file(s).
+2. Make the specified change.
+3. Verify the change makes sense in context.
+
+After all changes are made:
+1. Build (from repository root): cmake --build ./out --config Debug --target Telegram
+2. If the build fails, fix build errors and rebuild until it passes.
+3. If build fails with file-locked errors (C1041, LNK1104), STOP and report - do not retry.
+
+Rules:
+- Implement exactly the changes from the review, nothing more.
+- Follow AGENTS.md coding conventions.
+- Do NOT modify .ai/ files.
+
+When finished, report what changes were made.
+```
+
+After the fix agent returns, increment R and loop back to Step 6a (unless R > 3, in which case proceed to Completion).
+
+## Completion
+
+When all phases including build verification and code review are done:
+1. Read the final `plan.md` and report the summary to the user.
+2. Show which files were modified/created.
+3. Note any issues encountered during implementation.
+4. Summarize code review iterations: how many rounds, what was found and fixed, or if it was approved on first pass.
+5. Calculate and display the total elapsed time since `$START_TIME` (format as `Xh Ym Zs`, omitting zero components — e.g. `12m 34s` or `1h 5m 12s`).
+6. Remind the user of the project name so they can use `/task <project-name> <follow-up description>` for follow-up changes.
+
+## Error Handling
+
+- If any agent fails or gets stuck, report the issue to the user and ask how to proceed.
+- If context.md or plan.md is not written properly by an agent, re-spawn that agent with more specific instructions.
+- If build errors persist after the build agent's attempts, report the remaining errors to the user.
+- If a review fix agent introduces new build errors that it cannot resolve, report to the user.
diff --git a/.claude/grab_clipboard.ps1 b/.claude/grab_clipboard.ps1
new file mode 100644
index 00000000000000..bece778c603882
--- /dev/null
+++ b/.claude/grab_clipboard.ps1
@@ -0,0 +1,11 @@
+param([string]$outPath)
+Add-Type -AssemblyName System.Windows.Forms
+$img = [System.Windows.Forms.Clipboard]::GetImage()
+if ($img) {
+    $img.Save($outPath, [System.Drawing.Imaging.ImageFormat]::Png)
+    Write-Host "Saved to $outPath"
+    exit 0
+} else {
+    Write-Host "No image on clipboard"
+    exit 1
+}
diff --git a/.claude/grab_clipboard.sh b/.claude/grab_clipboard.sh
new file mode 100755
index 00000000000000..80c0c6d05c99a8
--- /dev/null
+++ b/.claude/grab_clipboard.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# Grab clipboard image on macOS and save as PNG.
+outPath="$1"
+if [ -z "$outPath" ]; then
+    echo "Usage: grab_clipboard.sh <output.png>"
+    exit 1
+fi
+
+osascript -e '
+set theFile to POSIX file "'"$outPath"'"
+try
+    set theImage to the clipboard as «class PNGf»
+on error
+    return "no image"
+end try
+set fh to open for access theFile with write permission
+write theImage to fh
+close access fh
+return "ok"
+' 2>/dev/null | grep -q "ok"
+
+if [ $? -eq 0 ]; then
+    echo "Saved to $outPath"
+    exit 0
+else
+    echo "No image on clipboard"
+    exit 1
+fi
diff --git a/.cursorignore b/.cursorignore
new file mode 100644
index 00000000000000..db6b53b76545ab
--- /dev/null
+++ b/.cursorignore
@@ -0,0 +1,2 @@
+# Add directories or file patterns to ignore during indexing (e.g. foo/ or *.csv)
+Telegram/ThirdParty/
diff --git a/.devcontainer.json b/.devcontainer.json
new file mode 100644
index 00000000000000..16a1bcc1192bed
--- /dev/null
+++ b/.devcontainer.json
@@ -0,0 +1,30 @@
+{
+    "name": "CentOS",
+    "image": "tdesktop:centos_env",
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "C_Cpp.intelliSenseEngine": "disabled",
+                "cmake.generator": "Ninja Multi-Config",
+                "cmake.buildDirectory": "${workspaceFolder}/out",
+                "cmake.copyCompileCommands": "${workspaceFolder}/compile_commands.json"
+            },
+            "extensions": [
+                "ms-vscode.cpptools-extension-pack",
+                "llvm-vs-code-extensions.vscode-clangd",
+                "TheQtCompany.qt",
+                "ms-python.python",
+                "ms-azuretools.vscode-docker",
+                "eamodio.gitlens"
+            ]
+        }
+    },
+    "capAdd": [
+        "SYS_PTRACE"
+    ],
+    "securityOpt": [
+        "seccomp=unconfined"
+    ],
+    "workspaceMount": "source=${localWorkspaceFolder},target=/usr/src/tdesktop,type=bind,consistency=cached",
+    "workspaceFolder": "/usr/src/tdesktop"
+}
diff --git a/.github/scripts/generate_changelog.py b/.github/scripts/generate_changelog.py
new file mode 100644
index 00000000000000..6cdd12652d31b2
--- /dev/null
+++ b/.github/scripts/generate_changelog.py
@@ -0,0 +1,328 @@
+#!/usr/bin/env python3
+"""Convert changelog.txt to a static HTML page for GitHub Pages."""
+
+import re
+import shutil
+import sys
+import html
+from pathlib import Path
+
+MONTHS = [
+    "", "January", "February", "March", "April", "May", "June",
+    "July", "August", "September", "October", "November", "December",
+]
+
+VERSION_RE = re.compile(
+    r"^(\d+\.\d+(?:\.\d+)?)\s*"        # version number
+    r"(?:(alpha|beta|dev|stable)\s*)?"   # optional tag
+    r"\((\d{2})\.(\d{2})\.(\d{2,4})\)$" # date (DD.MM.YY or DD.MM.YYYY)
+)
+
+
+def parse_date(day: str, month: str, year: str) -> tuple[str, str, str]:
+    """Return (sort_key, raw_display, full_display) from DD, MM, YY strings."""
+    y = int(year)
+    if y < 100:
+        y += 2000
+    m = int(month)
+    d = int(day)
+    sort_key = f"{y:04d}-{m:02d}-{d:02d}"
+    raw_display = f"{day}.{month}.{year}"
+    full_display = f"{d} {MONTHS[m]} {y}"
+    return sort_key, raw_display, full_display
+
+
+def parse_changelog(text: str) -> list[dict]:
+    entries = []
+    current = None
+
+    for raw_line in text.splitlines():
+        line = raw_line.rstrip()
+        m = VERSION_RE.match(line)
+        if m:
+            if current:
+                entries.append(current)
+            version, tag, day, month, year = m.groups()
+            sort_key, raw_date, full_date = parse_date(day, month, year)
+            current = {
+                "version": version,
+                "tag": tag or "",
+                "date": raw_date,
+                "full_date": full_date,
+                "sort_key": sort_key,
+                "lines": [],
+            }
+        elif current is not None:
+            # Skip blank lines at the start
+            if not line and not current["lines"]:
+                continue
+            # Skip stray artifact lines
+            if line.strip() in ("),", "),"):
+                continue
+            current["lines"].append(line)
+
+    if current:
+        entries.append(current)
+
+    # Trim trailing blank lines from each entry
+    for entry in entries:
+        while entry["lines"] and not entry["lines"][-1]:
+            entry["lines"].pop()
+
+    return entries
+
+
+def render_entry(entry: dict) -> str:
+    version = html.escape(entry["version"])
+    tag = entry["tag"]
+    date = html.escape(entry["date"])
+    anchor = f"v{version}"
+
+    tag_html = ""
+    if tag and tag not in ("stable",):
+        tag_html = f' {html.escape(tag)}'
+
+    parts = [
+        f'<article class="entry" id="{anchor}">',
+        f'  <h2><a class="anchor" href="#{anchor}"></a>'
+        f'{version}{tag_html}'
+        f' <time>{date}</time></h2>',
+    ]
+
+    in_list = False
+    for line in entry["lines"]:
+        stripped = line.lstrip()
+        if stripped.startswith("- ") or stripped.startswith("\u2014 "):
+            # Bullet point (- or em dash)
+            if not in_list:
+                parts.append("  <ul>")
+                in_list = True
+            bullet_text = stripped[2:]
+            parts.append(f"    <li>{html.escape(bullet_text)}</li>")
+        else:
+            if in_list:
+                parts.append("  </ul>")
+                in_list = False
+            if stripped:
+                parts.append(f"  <p>{html.escape(stripped)}</p>")
+
+    if in_list:
+        parts.append("  </ul>")
+
+    parts.append("</article>")
+    return "\n".join(parts)
+
+
+def build_html(entries: list[dict]) -> str:
+    count = len(entries)
+    first_date = entries[-1]["full_date"] if entries else ""
+    latest_version = entries[0]["version"] if entries else ""
+
+    entries_html = "\n\n".join(render_entry(e) for e in entries)
+
+    return f"""<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Version history</title>
+<link rel="icon" type="image/png" sizes="32x32" href="icon32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="icon16.png">
+<style>
+* {{ margin: 0; padding: 0; box-sizing: border-box; }}
+body {{
+  font: 12px / 18px "Lucida Grande", "Lucida Sans Unicode", Arial,
+    Helvetica, Verdana, sans-serif;
+  background: #fff;
+  color: #000;
+}}
+header {{
+  background: #1d98dc;
+  color: #fff;
+  padding: 2rem 1.5rem;
+  text-align: center;
+}}
+header h1 {{ font-size: 18px; font-weight: 700; }}
+header p {{ opacity: .85; margin-top: 4px; font-size: 12px; }}
+.container {{
+  max-width: 600px;
+  margin: 0 auto;
+  padding: 20px 15px;
+}}
+.search-box {{
+  position: sticky;
+  top: 0;
+  z-index: 10;
+  background: #fff;
+  padding: 8px 0 12px;
+}}
+.search-box input {{
+  width: 100%;
+  padding: 6px 10px;
+  font: 12px / 18px "Lucida Grande", "Lucida Sans Unicode", Arial,
+    Helvetica, Verdana, sans-serif;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background: #fff;
+  color: #000;
+  outline: none;
+}}
+.search-box input:focus {{ border-color: #1d98dc; }}
+.entry {{
+  padding: 14px 0 4px;
+  scroll-margin-top: 48px;
+}}
+.entry h2 {{
+  font-size: 16px;
+  font-weight: 700;
+  line-height: 22px;
+  margin-bottom: 6px;
+  position: relative;
+}}
+.entry h2 .anchor {{
+  position: absolute;
+  left: -24px;
+  top: 0;
+  width: 24px;
+  height: 22px;
+  display: block;
+  opacity: 0;
+  transition: opacity .15s;
+  background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 16 16'%3E%3Cpath fill='%23168acd' d='M7.775 3.275a.75.75 0 0 0 1.06 1.06l1.25-1.25a2 2 0 1 1 2.83 2.83l-2.5 2.5a2 2 0 0 1-2.83 0 .75.75 0 0 0-1.06 1.06 3.5 3.5 0 0 0 4.95 0l2.5-2.5a3.5 3.5 0 0 0-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 0 1 0-2.83l2.5-2.5a2 2 0 0 1 2.83 0 .75.75 0 0 0 1.06-1.06 3.5 3.5 0 0 0-4.95 0l-2.5 2.5a3.5 3.5 0 0 0 4.95 4.95l1.25-1.25a.75.75 0 0 0-1.06-1.06l-1.25 1.25a2 2 0 0 1-2.83 0z'/%3E%3C/svg%3E") 0 center / 18px no-repeat;
+  cursor: pointer;
+}}
+.entry h2:hover .anchor {{ opacity: .6; }}
+.entry h2 .anchor:hover {{ opacity: 1; }}
+.entry h2 time {{
+  font-size: 12px;
+  font-weight: 400;
+  color: #999;
+  margin-left: 6px;
+}}
+.entry ul {{
+  margin: 0 0 4px 8px;
+  padding: 0;
+  list-style: none;
+}}
+.entry li {{
+  padding: 2px 0 2px 16px;
+  position: relative;
+  color: #333;
+}}
+.entry li::before {{
+  content: "";
+  position: absolute;
+  left: 0;
+  top: 9px;
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+  background: #009be1;
+}}
+.entry p {{
+  margin: 4px 0;
+  color: #555;
+  font-style: italic;
+}}
+.hidden {{ display: none; }}
+footer {{
+  text-align: center;
+  padding: 24px 15px;
+  font-size: 11px;
+  color: #999;
+}}
+footer a {{ color: #168acd; text-decoration: none; }}
+footer a:hover {{ text-decoration: underline; }}
+</style>
+</head>
+<body>
+
+<header>
+  <h1>Version history</h1>
+  <p>{count} releases since {first_date} &middot; latest: {latest_version}</p>
+</header>
+
+<div class="container">
+  <div class="search-box">
+    <input type="text" id="search" placeholder="Search versions and changes\u2026"
+           autocomplete="off" spellcheck="false">
+  </div>
+
+  <div id="entries">
+{entries_html}
+  </div>
+</div>
+
+<footer>
+  Auto-generated from
+  <a href="https://github.com/telegramdesktop/tdesktop/blob/dev/changelog.txt">changelog.txt</a>.
+  Source code is published under
+  <a href="https://github.com/telegramdesktop/tdesktop">GPL v3</a>.
+</footer>
+
+<script>
+(function() {{
+  var input = document.getElementById('search');
+  var entries = document.querySelectorAll('.entry');
+  var timer;
+  input.addEventListener('input', function() {{
+    clearTimeout(timer);
+    timer = setTimeout(function() {{
+      var q = input.value.toLowerCase().trim();
+      entries.forEach(function(el) {{
+        if (!q) {{
+          el.classList.remove('hidden');
+        }} else {{
+          el.classList.toggle('hidden', el.textContent.toLowerCase().indexOf(q) === -1);
+        }}
+      }});
+    }}, 150);
+  }});
+
+  // Anchor links: copy URL on click
+  document.addEventListener('click', function(e) {{
+    var anchor = e.target.closest('.anchor');
+    if (!anchor) return;
+    e.preventDefault();
+    var url = location.origin + location.pathname + anchor.getAttribute('href');
+    history.replaceState(null, '', anchor.getAttribute('href'));
+    if (navigator.clipboard) {{
+      navigator.clipboard.writeText(url);
+    }}
+  }});
+}})();
+</script>
+
+</body>
+</html>"""
+
+
+def main():
+    repo = Path(__file__).resolve().parent.parent.parent
+    src = repo / "changelog.txt"
+    if len(sys.argv) > 1:
+        src = Path(sys.argv[1])
+
+    out = repo / "docs" / "changelog" / "index.html"
+    if len(sys.argv) > 2:
+        out = Path(sys.argv[2])
+
+    text = src.read_text(encoding="utf-8")
+    entries = parse_changelog(text)
+    html_content = build_html(entries)
+
+    out.parent.mkdir(parents=True, exist_ok=True)
+    out.write_text(html_content, encoding="utf-8")
+
+    # Copy favicon files from resources
+    icons_src = repo / "Telegram" / "Resources" / "art"
+    for name in ("icon16.png", "icon32.png"):
+        icon = icons_src / name
+        if icon.exists():
+            shutil.copy2(icon, out.parent / name)
+
+    print(f"Generated {out} ({len(entries)} entries, {out.stat().st_size:,} bytes)")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.github/workflows/cant-reproduce.yml b/.github/workflows/cant-reproduce.yml
index 5c4edcba0fb0c5..8e20e07349b5b4 100644
--- a/.github/workflows/cant-reproduce.yml
+++ b/.github/workflows/cant-reproduce.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   cant-reproduce:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
       - uses: lee-dohm/no-response@v0.5.0
         with:
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
new file mode 100644
index 00000000000000..418e29fdc1c3b6
--- /dev/null
+++ b/.github/workflows/changelog.yml
@@ -0,0 +1,45 @@
+name: Changelog
+
+on:
+  push:
+    branches: [dev]
+    paths: [changelog.txt]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: pages
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.12"
+
+      - name: Generate HTML
+        run: python .github/scripts/generate_changelog.py
+
+      - name: Upload pages artifact
+        uses: actions/upload-pages-artifact@v4
+        with:
+          path: docs
+
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deploy.outputs.page_url }}
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deploy
+        uses: actions/deploy-pages@v5
diff --git a/.github/workflows/copyright_year_updater.yml b/.github/workflows/copyright_year_updater.yml
index 7cb129e36eae66..7ddb3d0403a778 100644
--- a/.github/workflows/copyright_year_updater.yml
+++ b/.github/workflows/copyright_year_updater.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   Copyright-year:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
       - uses: desktop-app/action_code_updater@master
         with:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ac40f3a330ec25..9582334f945ba4 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,22 +5,19 @@ on:
     paths:
       - '.github/workflows/docker.yml'
       - 'Telegram/build/docker/centos_env/**'
-  pull_request:
-    paths:
-      - '.github/workflows/docker.yml'
-      - 'Telegram/build/docker/centos_env/**'
 
 jobs:
   docker:
     name: Ubuntu
     runs-on: ubuntu-latest
+    if: github.ref_name == github.event.repository.default_branch
 
     env:
       IMAGE_TAG: ghcr.io/${{ github.repository }}/centos_env:latest
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           submodules: recursive
 
@@ -32,6 +29,8 @@ jobs:
 
       - name: Free up some disk space.
         uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
+        with:
+          tool-cache: true
 
       - name: Docker image build.
         run: |
@@ -40,5 +39,4 @@ jobs:
           DEBUG= LTO= poetry run gen_dockerfile | DOCKER_BUILDKIT=1 docker build -t $IMAGE_TAG -
 
       - name: Push the Docker image.
-        if: ${{ github.ref_name == github.event.repository.default_branch }}
         run: docker push $IMAGE_TAG
diff --git a/.github/workflows/issue_closer.yml b/.github/workflows/issue_closer.yml
index d3784944f6d7a5..35540516559071 100644
--- a/.github/workflows/issue_closer.yml
+++ b/.github/workflows/issue_closer.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   comment:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
       - name: Process an issue.
         uses: desktop-app/action_issue_closer@master
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 8eb20a2e55c43f..f3c4cac54a90dc 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -12,6 +12,7 @@ on:
       - '!.github/workflows/linux.yml'
       - 'snap/**'
       - 'Telegram/build/**'
+      - '!Telegram/build/docker/centos_env/**'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/Resources/winrc/**'
       - 'Telegram/SourceFiles/platform/win/**'
@@ -30,6 +31,7 @@ on:
       - '!.github/workflows/linux.yml'
       - 'snap/**'
       - 'Telegram/build/**'
+      - '!Telegram/build/docker/centos_env/**'
       - 'Telegram/Resources/uwp/**'
       - 'Telegram/Resources/winrc/**'
       - 'Telegram/SourceFiles/platform/win/**'
@@ -42,7 +44,7 @@ jobs:
 
   linux:
     name: Rocky Linux 8
-    runs-on: ubuntu-latest
+    runs-on: ${{ (github.event_name == 'pull_request' || startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/nightly') && 'depot-ubuntu-latest-16' || 'ubuntu-latest' }}
 
     strategy:
       matrix:
@@ -52,54 +54,121 @@ jobs:
 
     env:
       UPLOAD_ARTIFACT: "true"
+      ONLY_CACHE: "false"
+      IMAGE_TAG: tdesktop:centos_env
 
     steps:
-      - name: Get repository name.
-        run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
-
       - name: Clone.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           submodules: recursive
-          path: ${{ env.REPO_NAME }}
 
       - name: First set up.
         run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
-          docker pull ghcr.io/$GITHUB_REPOSITORY/centos_env
-          docker tag ghcr.io/$GITHUB_REPOSITORY/centos_env tdesktop:centos_env
+          echo "WEEK=$(date -u +%G%V)" >> $GITHUB_ENV
+          sudo apt update
+          curl -sSL https://install.python-poetry.org | python3 -
+          cd Telegram/build/docker/centos_env
+          poetry install
+          DOCKERFILE=$(DEBUG= LTO= poetry run gen_dockerfile)
+          echo "$DOCKERFILE" > Dockerfile
+          rm -rf __pycache__
 
-      - name: Telegram Desktop build.
+      - name: Free up some disk space.
+        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
+        with:
+          tool-cache: true
+
+      - name: Set up Docker Buildx.
+        id: setup-buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Libraries cache.
+        id: cache-libs
+        uses: actions/cache@v6
+        with:
+          path: |
+            ${{ runner.temp }}/.buildx-cache
+            ${{ runner.temp }}/.mount-cache
+          key: ${{ runner.OS }}-libs-${{ hashFiles('Telegram/build/docker/centos_env/**') }}
+          restore-keys: ${{ runner.OS }}-libs-
+
+      - name: Restore Docker cache mounts.
+        uses: reproducible-containers/buildkit-cache-dance@5422eac04292c961a382e0f584ea0f03ad9da723
+        with:
+          builder: ${{ steps.setup-buildx.outputs.name }}
+          cache-dir: ${{ runner.temp }}/.mount-cache
+          dockerfile: Telegram/build/docker/centos_env/Dockerfile
+          skip-extraction: ${{ steps.cache-libs.outputs.cache-hit }}
+
+      - name: Libraries.
+        uses: docker/build-push-action@v7
+        with:
+          context: Telegram/build/docker/centos_env
+          load: ${{ env.ONLY_CACHE == 'false' }}
+          tags: ${{ env.IMAGE_TAG }}
+          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-to: type=local,dest=${{ runner.temp }}/.buildx-cache-new,mode=max
+
+      - name: Move cache.
         run: |
-          cd $REPO_NAME
+          rm -rf ${{ runner.temp }}/.buildx-cache
+          mv ${{ runner.temp }}/.buildx-cache{-new,}
 
+      - name: Restore Telegram Desktop cache.
+        id: cache-tdesktop
+        if: env.ONLY_CACHE == 'false'
+        uses: actions/cache/restore@v6
+        with:
+          path: ${{ runner.temp }}/.tdesktop-cache
+          key: ${{ runner.OS }}-tdesktop-${{ matrix.defines || 'null' }}-${{ env.WEEK }}
+          restore-keys: ${{ runner.OS }}-tdesktop-${{ matrix.defines || 'null' }}-
+
+      - name: Telegram Desktop build.
+        if: env.ONLY_CACHE == 'false'
+        run: |
           DEFINE=""
           if [ -n "${{ matrix.defines }}" ]; then
             DEFINE="-D ${{ matrix.defines }}=ON"
             echo Define from matrix: $DEFINE
-            echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
+            echo "ARTIFACT_NAME=Telegram ${{ matrix.defines }}" >> $GITHUB_ENV
           else
             echo "ARTIFACT_NAME=Telegram" >> $GITHUB_ENV
           fi
 
+          mkdir -p ${{ runner.temp }}/.tdesktop-cache
+
           docker run --rm \
+          -u $(id -u) \
           -v $PWD:/usr/src/tdesktop \
+          -v ${{ runner.temp }}/.tdesktop-cache:/var/cache/ccache \
           -e CONFIG=Debug \
-          tdesktop:centos_env \
-          /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \
-          -D CMAKE_C_FLAGS_DEBUG="" \
-          -D CMAKE_CXX_FLAGS_DEBUG="" \
-          -D CMAKE_C_FLAGS="-Werror" \
-          -D CMAKE_CXX_FLAGS="-Werror" \
-          -D CMAKE_EXE_LINKER_FLAGS="-s" \
+          -e CCACHE_SLOPPINESS=pch_defines,time_macros \
+          $IMAGE_TAG \
+          env -u CCACHE_DISABLE /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \
+          -D CMAKE_CONFIGURATION_TYPES=Debug \
+          -D CMAKE_C_FLAGS_DEBUG="-O0 -fpch-preprocess -fuse-ld=lld" \
+          -D CMAKE_CXX_FLAGS_DEBUG="-O0 -fpch-preprocess -fuse-ld=lld" \
+          -D CMAKE_COMPILE_WARNING_AS_ERROR=ON \
           -D TDESKTOP_API_TEST=ON \
           -D DESKTOP_APP_DISABLE_AUTOUPDATE=OFF \
           -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \
           $DEFINE
 
+      - name: Save Telegram Desktop cache.
+        if: >
+          github.ref_name == github.event.repository.default_branch
+            && steps.cache-tdesktop.outputs.cache-hit != 'true'
+            && env.ONLY_CACHE == 'false'
+        uses: actions/cache/save@v6
+        with:
+          path: ${{ runner.temp }}/.tdesktop-cache
+          key: ${{ steps.cache-tdesktop.outputs.cache-primary-key }}
+
       - name: Check.
+        if: env.ONLY_CACHE == 'false'
         run: |
-          filePath="$REPO_NAME/out/Debug/Telegram"
+          filePath="out/Debug/Telegram"
           if test -f "$filePath"; then
             echo "Build successfully done! :)"
 
@@ -113,12 +182,12 @@ jobs:
       - name: Move artifact.
         if: env.UPLOAD_ARTIFACT == 'true'
         run: |
-          cd $REPO_NAME/out/Debug
-          sudo mkdir artifact
-          sudo mv {Telegram,Updater} artifact/
-      - uses: actions/upload-artifact@v4
+          cd out/Debug
+          mkdir artifact
+          mv {Telegram,Updater} artifact/
+      - uses: actions/upload-artifact@v7
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
           name: ${{ env.ARTIFACT_NAME }}
-          path: ${{ env.REPO_NAME }}/out/Debug/artifact/
+          path: out/Debug/artifact/
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
index cf3c4698962ba3..7904e79591f79a 100644
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -6,9 +6,9 @@ on:
 
 jobs:
   lock:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: dessant/lock-threads@v6
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: 45
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index e5f5e56206c181..57cfccc2194b56 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -40,7 +40,7 @@ jobs:
 
   macos:
     name: MacOS
-    runs-on: macos-13
+    runs-on: ${{ (github.event_name == 'pull_request' || startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/nightly') && 'depot-macos-latest' || 'macos-latest' }}
 
     strategy:
       matrix:
@@ -56,7 +56,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
@@ -67,26 +67,22 @@ jobs:
 
           brew update
           brew upgrade || true
-          brew install automake meson nasm ninja pkg-config
+          brew install automake libtool meson nasm ninja pkg-config
 
           # Disable spotlight.
           sudo mdutil -a -i off
 
           sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
 
-      - name: ThirdParty cache.
-        id: cache-third-party
-        uses: actions/cache@v4
-        with:
-          path: ThirdParty
-          key: ${{ runner.OS }}-third-party-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
-          restore-keys: ${{ runner.OS }}-third-party-
+          sudo sed -i '' '/CMAKE_${lang}_FLAGS_DEBUG_INIT/s/ -g//' /opt/homebrew/share/cmake/Modules/Compiler/GNU.cmake
 
       - name: Libraries cache.
         id: cache-libs
-        uses: actions/cache@v4
+        uses: actions/cache@v6
         with:
-          path: Libraries
+          path: |
+            Libraries
+            ThirdParty
           key: ${{ runner.OS }}-libs-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
           restore-keys: ${{ runner.OS }}-libs-
 
@@ -95,9 +91,7 @@ jobs:
           ./$REPO_NAME/Telegram/build/prepare/mac.sh skip-release silent
 
       - name: Free up some disk space.
-        run: |
-          cd Libraries
-          find . -iname "*.dir" -exec rm -rf {} || true \;
+        run: find Libraries '(' '(' ! '(' -name '*.a' -o -name '*.h' -o -name '*.hpp' -o -name '*.inc' -o -name '*.cmake' -o -path '*/include/*' -o -path '*/objects-*' -o -path '*/cache_keys/*' -o -path '*/patches/*' -o -perm +111 ')' -type f ')' -o -empty ')' -delete
 
       - name: Telegram Desktop build.
         if: env.ONLY_CACHE == 'false'
@@ -108,24 +102,21 @@ jobs:
           if [ -n "${{ matrix.defines }}" ]; then
             DEFINE="-D ${{ matrix.defines }}=ON"
             echo Define from matrix: $DEFINE
-            echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
+            echo "ARTIFACT_NAME=Telegram ${{ matrix.defines }}" >> $GITHUB_ENV
           else
             echo "ARTIFACT_NAME=Telegram" >> $GITHUB_ENV
           fi
 
           ./configure.sh \
-          -D CMAKE_C_FLAGS="-Werror" \
-          -D CMAKE_CXX_FLAGS="-Werror" \
+          -D CMAKE_CONFIGURATION_TYPES=Debug \
+          -D CMAKE_COMPILE_WARNING_AS_ERROR=ON \
           -D CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO \
           -D TDESKTOP_API_TEST=ON \
           -D DESKTOP_APP_DISABLE_AUTOUPDATE=OFF \
           -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \
           $DEFINE
 
-          cd ../out
-
-          xcoderun='xcodebuild build -project Telegram.xcodeproj -scheme Telegram -destination "platform=macOS,arch=x86_64" -configuration Debug'
-          bash -c "$xcoderun" || bash -c "$xcoderun" || bash -c "$xcoderun"
+          cmake --build ../out --config Debug --parallel
 
       - name: Move artifact.
         if: env.UPLOAD_ARTIFACT == 'true'
@@ -134,7 +125,7 @@ jobs:
           mkdir artifact
           mv Telegram.app artifact/
           mv Updater artifact/
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/mac_packaged.yml b/.github/workflows/mac_packaged.yml
index 7f2775eea1ab2e..1f9532a0ccd6cd 100644
--- a/.github/workflows/mac_packaged.yml
+++ b/.github/workflows/mac_packaged.yml
@@ -40,7 +40,7 @@ jobs:
 
   macos:
     name: MacOS
-    runs-on: macos-latest
+    runs-on: ${{ (github.event_name == 'pull_request' || startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/nightly') && 'depot-macos-latest' || 'macos-latest' }}
 
     strategy:
       matrix:
@@ -49,7 +49,11 @@ jobs:
 
     env:
       GIT: "https://github.com"
+      CMAKE_GENERATOR: "Ninja"
+      CMAKE_BUILD_TYPE: "Debug"
+      CMAKE_BUILD_PARALLEL_LEVEL: ""
       CMAKE_PREFIX_PATH: "/opt/homebrew/opt/ffmpeg@6:/opt/homebrew/opt/openal-soft"
+      TDE2E: "51743dfd01dff6179e2d8f7095729caa4e2222e9"
       UPLOAD_ARTIFACT: "true"
       ONLY_CACHE: "false"
       MANUAL_CACHING: "1"
@@ -60,20 +64,22 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
 
       - name: First set up.
         run: |
+          libs="ada-url ffmpeg@6 jpeg-xl libavif libheif minizip openal-soft openh264 openssl opus qtbase qtimageformats qtshadertools qtsvg xz"
           brew update
           brew upgrade || true
-          brew install ada-url autoconf automake boost cmake ffmpeg@6 libtool openal-soft openh264 openssl opus ninja pkg-config python qt yasm xz
+          brew install autoconf automake boost cmake libtool ninja pkg-config python $libs
           sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
+          sudo sed -i '' '/CMAKE_${lang}_FLAGS_DEBUG_INIT/s/ -g//' /opt/homebrew/share/cmake/Modules/Compiler/GNU.cmake
 
           xcodebuild -version > CACHE_KEY.txt
-          brew list --versions >> CACHE_KEY.txt
+          brew list --versions $libs >> CACHE_KEY.txt
           echo $MANUAL_CACHING >> CACHE_KEY.txt
           echo "$GITHUB_WORKSPACE" >> CACHE_KEY.txt
           if [ "$AUTO_CACHING" = "1" ]; then
@@ -82,27 +88,36 @@ jobs:
           fi
           echo "CACHE_KEY=`md5 -q CACHE_KEY.txt`" >> $GITHUB_ENV
 
+          echo "MACOSX_DEPLOYMENT_TARGET=$(grep 'set(QT_SUPPORTED_MIN_MACOS_VERSION' /opt/homebrew/Cellar/qtbase/*/lib/cmake/Qt6/Qt6ConfigExtras.cmake | sed -E 's/^.*"(.*)"\)$/\1/')" >> $GITHUB_ENV
           echo "LibrariesPath=`pwd`" >> $GITHUB_ENV
 
-          curl -o tg_owt-version.json https://api.github.com/repos/desktop-app/tg_owt/git/refs/heads/master
+          echo "RNNOISE=`curl -sSL --header 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' https://api.github.com/repos/xiph/rnnoise/git/refs/heads/master | jq -r .object.sha`" >> $GITHUB_ENV
+          echo "WEBRTC=`curl -sSL --header 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' https://api.github.com/repos/desktop-app/tg_owt/git/refs/heads/master | jq -r .object.sha`" >> $GITHUB_ENV
 
+      - name: RNNoise cache.
+        id: cache-rnnoise
+        uses: actions/cache@v6
+        with:
+          path: ${{ env.LibrariesPath }}/local/rnnoise
+          key: ${{ runner.OS }}-rnnoise-${{ env.RNNOISE }}-${{ env.CACHE_KEY }}
       - name: RNNoise.
+        if: steps.cache-rnnoise.outputs.cache-hit != 'true'
         run: |
           cd $LibrariesPath
 
-          git clone --depth=1 https://gitlab.xiph.org/xiph/rnnoise.git
+          git clone --depth=1 $GIT/xiph/rnnoise.git
           cd rnnoise
           ./autogen.sh
-          ./configure --disable-examples --disable-doc
+          ./configure --prefix=$LibrariesPath/local/rnnoise --disable-examples --disable-doc
           make -j$(sysctl -n hw.logicalcpu)
-          sudo make install
+          make install
 
       - name: WebRTC cache.
         id: cache-webrtc
-        uses: actions/cache@v4
+        uses: actions/cache@v6
         with:
-          path: ${{ env.LibrariesPath }}/tg_owt
-          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}-${{ hashFiles('**/tg_owt-version.json') }}
+          path: ${{ env.LibrariesPath }}/local/tg_owt
+          key: ${{ runner.OS }}-webrtc-${{ env.WEBRTC }}-${{ env.CACHE_KEY }}
       - name: WebRTC.
         if: steps.cache-webrtc.outputs.cache-hit != 'true'
         run: |
@@ -111,56 +126,58 @@ jobs:
           git clone --depth=1 --recursive --shallow-submodules $GIT/desktop-app/tg_owt.git
           cd tg_owt
 
-          cmake -Bbuild -GNinja . \
-          -DCMAKE_BUILD_TYPE=Debug \
-          -DCMAKE_C_FLAGS_DEBUG="" \
-          -DCMAKE_CXX_FLAGS_DEBUG=""
+          cmake -Bbuild . -DCMAKE_INSTALL_PREFIX=$LibrariesPath/local/tg_owt
+          cmake --build build
+          cmake --install build
+
+      - name: TDE2E cache.
+        id: cache-tde2e
+        uses: actions/cache@v6
+        with:
+          path: ${{ env.LibrariesPath }}/local/tde2e
+          key: ${{ runner.OS }}-tde2e-${{ env.TDE2E }}-${{ env.CACHE_KEY }}
+      - name: TDE2E.
+        if: steps.cache-tde2e.outputs.cache-hit != 'true'
+        run: |
+          cd $LibrariesPath
 
-          cmake --build build --parallel
+          git init tde2e
+          cd tde2e
+          git remote add origin $GIT/tdlib/td.git
+          git fetch --depth=1 origin $TDE2E
+          git reset --hard FETCH_HEAD
+
+          cmake -Bbuild . -DCMAKE_INSTALL_PREFIX=$LibrariesPath/local/tde2e -DTD_E2E_ONLY=ON
+          cmake --build build
+          cmake --install build
 
       - name: Telegram Desktop build.
         if: env.ONLY_CACHE == 'false'
-        env:
-          tg_owt_DIR: ${{ env.LibrariesPath }}/tg_owt/build
         run: |
           cd $REPO_NAME
+          export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH$(find $LibrariesPath/local -mindepth 1 -maxdepth 1 -type d -exec printf ':%s' {} +)"
 
           DEFINE=""
           if [ -n "${{ matrix.defines }}" ]; then
             DEFINE="-D ${{ matrix.defines }}=ON"
             echo Define from matrix: $DEFINE
-            echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
+            echo "ARTIFACT_NAME=Telegram ${{ matrix.defines }}" >> $GITHUB_ENV
           else
             echo "ARTIFACT_NAME=Telegram" >> $GITHUB_ENV
           fi
 
-          cmake -Bbuild -GNinja . \
-          -DCMAKE_BUILD_TYPE=Debug \
-          -DCMAKE_C_FLAGS_DEBUG="" \
-          -DCMAKE_CXX_FLAGS_DEBUG="" \
-          -DCMAKE_EXE_LINKER_FLAGS="-s" \
-          -DCMAKE_FIND_FRAMEWORK=LAST \
-          -DTDESKTOP_API_TEST=ON \
-          -DDESKTOP_APP_USE_PACKAGED_LAZY=ON \
-          $DEFINE
-
-          cmake --build build --parallel
-
-          cd build
-          macdeployqt Telegram.app
-          codesign --remove-signature Telegram.app
-
-          mkdir dmgsrc
-          mv Telegram.app dmgsrc
-          hdiutil create -volname Telegram -srcfolder dmgsrc -ov -format UDZO Telegram.dmg
+          cmake -Bbuild . -DTDESKTOP_API_TEST=ON $DEFINE
+          cmake --build build
+          macdeployqt build/Telegram.app
+          codesign --remove-signature build/Telegram.app
 
       - name: Move artifact.
         if: env.UPLOAD_ARTIFACT == 'true'
         run: |
           cd $REPO_NAME/build
           mkdir artifact
-          mv Telegram.dmg artifact/
-      - uses: actions/upload-artifact@v4
+          mv Telegram.app artifact/
+      - uses: actions/upload-artifact@v7
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/master_updater.yml b/.github/workflows/master_updater.yml
index c59f62e29ad931..fedc24f8e5d781 100644
--- a/.github/workflows/master_updater.yml
+++ b/.github/workflows/master_updater.yml
@@ -5,33 +5,9 @@ on:
     types: released
 
 jobs:
-  updater:
-    runs-on: ubuntu-latest
-    env:
-      SKIP: "0"
-      to_branch: "master"
+  User-agent:
+    runs-on: ubuntu-slim
     steps:
-      - uses: actions/checkout@v4
+      - uses: desktop-app/action_code_updater@master
         with:
-          fetch-depth: 0
-        if: env.SKIP == '0'
-      - name: Push the code to the master branch.
-        if: env.SKIP == '0'
-        run: |
-          token=${{ secrets.TOKEN_FOR_MASTER_UPDATER }}
-          if [ -z "${token}" ]; then
-              echo "Token is unset. Nothing to do."
-              exit 0
-          fi
-
-          url=https://x-access-token:$token@github.com/$GITHUB_REPOSITORY
-          latest_tag=$(git describe --tags --abbrev=0)
-          echo "Latest tag: $latest_tag"
-
-          git remote set-url origin $url
-          git remote -v
-          git checkout master
-          git merge $latest_tag
-
-          git push origin HEAD:refs/heads/$to_branch
-          echo "Done!"
+          type: "dev-to-master"
diff --git a/.github/workflows/needs-user-action.yml b/.github/workflows/needs-user-action.yml
index 46ad9f87d82d16..55ad7891ce3668 100644
--- a/.github/workflows/needs-user-action.yml
+++ b/.github/workflows/needs-user-action.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   needs-user-action:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
       - uses: lee-dohm/no-response@v0.5.0
         with:
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index 2d77999835410a..bbe9bcf03cb4ed 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -40,14 +40,14 @@ jobs:
 
   snap:
     name: Ubuntu
-    runs-on: ubuntu-latest
+    runs-on: ${{ (github.event_name == 'pull_request' || startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/nightly') && 'depot-ubuntu-latest-16' || 'ubuntu-latest' }}
 
     env:
       UPLOAD_ARTIFACT: "true"
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
           submodules: recursive
@@ -57,14 +57,18 @@ jobs:
           sudo iptables -P FORWARD ACCEPT
           sudo snap install --classic snapcraft
           sudo usermod -aG lxd $USER
-          sudo snap run lxd init --auto
-          sudo snap run lxd waitready
+          sudo lxd init --auto
+          sudo lxd waitready
 
       - name: Free up some disk space.
-        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
+        uses: samueldr/more-space-action@97048bd0df83fb05b5257887bdbaffc848887673
+        with:
+          enable-remove-default-apt-patterns: false
+          enable-lvm-span: true
+          lvm-span-mountpoint: /var/snap/lxd/common/lxd/storage-pools/default/containers
 
       - name: Telegram Desktop snap build.
-        run: sg lxd -c 'snap run snapcraft --verbosity=debug'
+        run: sudo -u $USER snap run snapcraft --verbosity=debug
 
       - name: Move artifact.
         if: env.UPLOAD_ARTIFACT == 'true'
@@ -75,7 +79,7 @@ jobs:
           mkdir artifact
           mv $artifact_name artifact
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.
         with:
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 4148917e712d2a..6b05f45d5ff71e 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -5,9 +5,9 @@ on:
 
 jobs:
   stale:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           stale-issue-message: |
             Hey there!
diff --git a/.github/workflows/unused_styles_updater.yml b/.github/workflows/unused_styles_updater.yml
new file mode 100644
index 00000000000000..2c021d1cd09f7a
--- /dev/null
+++ b/.github/workflows/unused_styles_updater.yml
@@ -0,0 +1,16 @@
+name: Unused styles updater.
+
+on:
+  repository_dispatch:
+    types: ["Restart unused_styles_updater workflow."]
+  schedule:
+    - cron: "0 3 1 * *"
+  workflow_dispatch:
+
+jobs:
+  Unused-styles:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: desktop-app/action_code_updater@master
+        with:
+          type: "unused-styles"
diff --git a/.github/workflows/user_agent_updater.yml b/.github/workflows/user_agent_updater.yml
index c1713b357f7ad9..1e3dae8182aefc 100644
--- a/.github/workflows/user_agent_updater.yml
+++ b/.github/workflows/user_agent_updater.yml
@@ -6,8 +6,6 @@ on:
   schedule:
     # At 00:00 on day-of-month 1.
     - cron: "0 0 1 * *"
-  pull_request_target:
-    types: [closed]
 
 jobs:
   User-agent:
diff --git a/.github/workflows/waiting-for-answer.yml b/.github/workflows/waiting-for-answer.yml
index 5e5ff87c968cd3..0cccca6b2d4343 100644
--- a/.github/workflows/waiting-for-answer.yml
+++ b/.github/workflows/waiting-for-answer.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   waiting-for-answer:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
       - uses: lee-dohm/no-response@v0.5.0
         with:
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index d08d5824d23d51..81048247d43532 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -5,6 +5,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
+      - '!docs/building-win*.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -23,6 +24,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
+      - '!docs/building-win*.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -42,12 +44,18 @@ jobs:
 
   windows:
     name: Windows
-    runs-on: windows-latest
+    runs-on: ${{ matrix.arch == 'arm64' && 'windows-11-arm' || ((github.event_name == 'pull_request' || startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/nightly') && 'depot-windows-latest-16' || 'windows-latest') }}
 
     strategy:
       matrix:
-        arch: [Win32, x64]
+        arch: [x64_x86, x64, arm64]
+        qt: ["", qt6]
         generator: ["", "Ninja Multi-Config"]
+        exclude:
+          - arch: arm64
+            qt: ""
+          - arch: x64_x86
+            qt: qt6
 
     env:
       UPLOAD_ARTIFACT: "true"
@@ -64,31 +72,55 @@ jobs:
           mkdir %userprofile%\TBuild\Libraries
           mklink /d %GITHUB_WORKSPACE%\TBuild %userprofile%\TBuild
           echo TBUILD=%GITHUB_WORKSPACE%\TBuild>>%GITHUB_ENV%
+          echo LibrariesPath=%GITHUB_WORKSPACE%\TBuild\Libraries${{ matrix.arch == 'x64' && '\win64' || '' }}>>%GITHUB_ENV%
 
       - name: Get repository name.
         shell: bash
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
-      - uses: ilammy/msvc-dev-cmd@v1.13.0
-        name: Native Tools Command Prompt.
-        with:
-          arch: ${{ matrix.arch }}
-
       - name: Clone.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           submodules: recursive
           path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}
 
-      - name: Set up environment paths.
+      - name: First set up.
         shell: bash
         run: |
-          echo "CACHE_KEY=$(sha256sum $TBUILD/$REPO_NAME/$PREPARE_PATH | awk '{ print $1 }')" >> $GITHUB_ENV
+          DOCPATH=$TBUILD/$REPO_NAME/docs/building-win.md
+          SDK="$(grep "SDK version" $DOCPATH | sed -r 's/.*\*\*(.*)\*\* SDK version.*/\1/')"
+          echo "SDK=$SDK" >> $GITHUB_ENV
+
+          sed -i '/CMAKE_${lang}_FLAGS_DEBUG_INIT/s/${_Zi}//' "$PROGRAMFILES"/CMake/share/cmake*/Modules/Platform/Windows-MSVC.cmake
+
+          echo "$(sha256sum $TBUILD/$REPO_NAME/$PREPARE_PATH | awk '{ print $1 }')" >> CACHE_KEY.txt
+          echo "$SDK" >> CACHE_KEY.txt
+          echo "CACHE_KEY=$(sha256sum CACHE_KEY.txt | awk '{ print $1 }')" >> $GITHUB_ENV
 
           echo "Configurate git for cherry-picks."
           git config --global user.email "you@example.com"
           git config --global user.name "Sample"
 
+      - name: Install VS 2026 Build Tools.
+        if: matrix.arch == 'arm64'
+        shell: pwsh
+        run: |
+          Invoke-WebRequest -Uri https://aka.ms/vs/18/stable/vs_buildtools.exe -OutFile vs_buildtools.exe
+          $p = Start-Process -FilePath .\vs_buildtools.exe -Wait -PassThru -ArgumentList `
+            '--quiet','--wait','--norestart','--nocache', `
+            '--add','Microsoft.VisualStudio.Workload.VCTools', `
+            '--add','Microsoft.VisualStudio.Component.VC.Tools.ARM64', `
+            '--add','Microsoft.VisualStudio.Component.VC.ATL.ARM64'
+          Remove-Item vs_buildtools.exe -Force
+          if ($p.ExitCode -ne 0 -and $p.ExitCode -ne 3010) { exit $p.ExitCode }
+
+      - uses: Eden-CI/msvc-dev-cmd@master
+        name: Native Tools Command Prompt.
+        with:
+          arch: ${{ matrix.arch }}
+          sdk: ${{ env.SDK }}
+          toolset: ${{ case(matrix.arch == 'arm64', '', '14.44') }}
+
       - name: NuGet sources.
         run: |
           nuget sources Disable -Name "Microsoft Visual Studio Offline Packages"
@@ -96,27 +128,38 @@ jobs:
 
       - name: ThirdParty cache.
         id: cache-third-party
-        uses: actions/cache@v4
+        uses: actions/cache@v6
         with:
           path: ${{ env.TBUILD }}\ThirdParty
-          key: ${{ runner.OS }}-${{ matrix.arch }}-third-party-${{ env.CACHE_KEY }}
-          restore-keys: ${{ runner.OS }}-${{ matrix.arch }}-third-party-
+          key: ${{ runner.OS }}-${{ runner.arch }}-third-party-${{ env.CACHE_KEY }}
+          restore-keys: ${{ runner.OS }}-${{ runner.arch }}-third-party-
 
       - name: Libraries cache.
         id: cache-libs
-        uses: actions/cache@v4
+        uses: actions/cache@v6
         with:
-          path: ${{ env.TBUILD }}\Libraries
+          path: |
+            ${{ env.LibrariesPath }}\*
+            !${{ env.LibrariesPath }}\cache_keys
+            !${{ env.LibrariesPath }}\[qQ]t[_-]*
+            ${{ env.LibrariesPath }}\cache_keys\*
+            !${{ env.LibrariesPath }}\cache_keys\[qQ]t[_-]*
           key: ${{ runner.OS }}-${{ matrix.arch }}-libs-${{ env.CACHE_KEY }}
           restore-keys: ${{ runner.OS }}-${{ matrix.arch }}-libs-
 
+      - name: Qt cache.
+        id: cache-qt
+        uses: actions/cache@v6
+        with:
+          path: |
+            ${{ env.LibrariesPath }}\[qQ]t[_-]*
+            ${{ env.LibrariesPath }}\cache_keys\[qQ]t[_-]*
+          key: ${{ runner.OS }}-${{ matrix.arch }}-${{ matrix.qt || 'qt' }}-${{ env.CACHE_KEY }}
+          restore-keys: ${{ runner.OS }}-${{ matrix.arch }}-${{ matrix.qt || 'qt' }}-
+
       - name: Libraries.
-        env:
-          GYP_MSVS_OVERRIDE_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\'
-          GYP_MSVS_VERSION: 2022
         run: |
-          cd %TBUILD%
-          %REPO_NAME%\Telegram\build\prepare\win.bat skip-release silent
+          %TBUILD%\%REPO_NAME%\Telegram\build\prepare\win.bat skip-release silent ${{ matrix.qt }}
 
       - name: Read configuration matrix.
         shell: bash
@@ -126,18 +169,23 @@ jobs:
           ARCH=""
           if [ -n "${{ matrix.arch }}" ]; then
             case "${{ matrix.arch }}" in
-              Win32) ARCH="x86";;
+              x64_x86) ARCH="x86";;
+              arm64) ARCH="arm";;
               *) ARCH="${{ matrix.arch }}";;
             esac
             echo "Architecture from matrix: $ARCH"
-            ARTIFACT_NAME="${ARTIFACT_NAME}_${{ matrix.arch }}"
+            ARTIFACT_NAME="${ARTIFACT_NAME} ${{ matrix.arch }}"
+          fi
+
+          if [ -n "${{ matrix.qt }}" ]; then
+            ARTIFACT_NAME="${ARTIFACT_NAME} ${{ matrix.qt }}"
           fi
 
           GENERATOR=""
           if [ -n "${{ matrix.generator }}" ]; then
             GENERATOR="-G \"${{ matrix.generator }}\""
             echo "Generator from matrix: $GENERATOR"
-            ARTIFACT_NAME="${ARTIFACT_NAME}_${{ matrix.generator }}"
+            ARTIFACT_NAME="${ARTIFACT_NAME} ${{ matrix.generator }}"
           fi
           echo "TDESKTOP_BUILD_GENERATOR=$GENERATOR" >> $GITHUB_ENV
 
@@ -148,7 +196,7 @@ jobs:
           if [ -n "${{ matrix.defines }}" ]; then
             DEFINE="-D ${{ matrix.defines }}=ON"
             echo "Define from matrix: $DEFINE"
-            ARTIFACT_NAME="${ARTIFACT_NAME}_${{ matrix.defines }}"
+            ARTIFACT_NAME="${ARTIFACT_NAME} ${{ matrix.defines }}"
           fi
           echo "TDESKTOP_BUILD_DEFINE=$DEFINE" >> $GITHUB_ENV
 
@@ -162,11 +210,8 @@ jobs:
           echo "TDESKTOP_BUILD_API=$API" >> $GITHUB_ENV
 
       - name: Free up some disk space.
-        run: |
-          cd %TBUILD%
-          del /S Libraries\*.pdb
-          del /S Libraries\*.pch
-          del /S Libraries\*.obj
+        shell: bash
+        run: find $LibrariesPath '(' '(' ! '(' -name '*.lib' -o -name '*.a' -o -name '*.exe' -o -name '*.h' -o -name '*.hpp' -o -name '*.inc' -o -name '*.cmake' -o -path '*/include/*' -o -path '*/objects-*' -o -path '*/cache_keys/*' -o -path '*/patches/*' ')' -type f ')' -o -empty ')' -delete
 
       - name: Telegram Desktop build.
         if: env.ONLY_CACHE == 'false'
@@ -176,12 +221,13 @@ jobs:
           call configure.bat ^
           %TDESKTOP_BUILD_GENERATOR% ^
           %TDESKTOP_BUILD_ARCH% ^
+          ${{ matrix.qt }} ^
           %TDESKTOP_BUILD_API% ^
-          -D CMAKE_C_FLAGS="/WX" ^
-          -D CMAKE_CXX_FLAGS="/WX" ^
+          -D CMAKE_CONFIGURATION_TYPES=Debug ^
+          -D CMAKE_COMPILE_WARNING_AS_ERROR=ON ^
+          -D CMAKE_MSVC_DEBUG_INFORMATION_FORMAT= ^
           -D DESKTOP_APP_DISABLE_AUTOUPDATE=OFF ^
           -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF ^
-          -D DESKTOP_APP_NO_PDB=ON ^
           %TDESKTOP_BUILD_DEFINE%
 
           cmake --build ..\out --config Debug --parallel
@@ -193,7 +239,7 @@ jobs:
           mkdir artifact
           move %OUT%\Telegram.exe artifact/
           move %OUT%\Updater.exe artifact/
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         name: Upload artifact.
         if: (env.UPLOAD_ARTIFACT == 'true') || (github.ref == 'refs/heads/nightly')
         with:
diff --git a/.gitignore b/.gitignore
index c2896799ea0b46..4da55962c4fbd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,8 @@ Release/
 ipch/
 .vs/
 .vscode/
+.cache/
+compile_commands.json
 
 /Telegram/log.txt
 /Telegram/data
@@ -51,3 +53,21 @@ stage
 *.*~
 .idea/
 cmake-build-debug/
+*.qsb
+
+# Local configuration files
+settings.local.json
+*.local.json
+.env
+.env.local
+.env.*.local
+
+# Cursor IDE local settings (but keep .cursor/rules/)
+.cursor/*
+!.cursor/rules/
+
+# AI work folder (session-specific, not for version control)
+.ai
+
+# Generated changelog page (built by CI, deployed to GitHub Pages)
+/docs/changelog/
diff --git a/.gitmodules b/.gitmodules
index 91f154826c6a1c..4d64f0fc22c285 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
-[submodule "Telegram/ThirdParty/libtgvoip"]
-	path = Telegram/ThirdParty/libtgvoip
-	url = https://github.com/telegramdesktop/libtgvoip
 [submodule "Telegram/ThirdParty/GSL"]
 	path = Telegram/ThirdParty/GSL
-	url = https://github.com/desktop-app/GSL.git
+	url = https://github.com/Microsoft/GSL.git
 [submodule "Telegram/ThirdParty/xxHash"]
 	path = Telegram/ThirdParty/xxHash
 	url = https://github.com/Cyan4973/xxHash.git
@@ -76,12 +73,6 @@
 [submodule "Telegram/lib_webview"]
 	path = Telegram/lib_webview
 	url = https://github.com/desktop-app/lib_webview.git
-[submodule "Telegram/ThirdParty/jemalloc"]
-	path = Telegram/ThirdParty/jemalloc
-	url = https://github.com/jemalloc/jemalloc
-[submodule "Telegram/ThirdParty/dispatch"]
-	path = Telegram/ThirdParty/dispatch
-	url = https://github.com/apple/swift-corelibs-libdispatch
 [submodule "Telegram/ThirdParty/kimageformats"]
 	path = Telegram/ThirdParty/kimageformats
 	url = https://github.com/KDE/kimageformats.git
@@ -97,3 +88,15 @@
 [submodule "Telegram/ThirdParty/xdg-desktop-portal"]
 	path = Telegram/ThirdParty/xdg-desktop-portal
 	url = https://github.com/flatpak/xdg-desktop-portal.git
+[submodule "Telegram/lib_translate"]
+	path = Telegram/lib_translate
+	url = https://github.com/desktop-app/lib_translate
+[submodule "Telegram/ThirdParty/cmark-gfm"]
+	path = Telegram/ThirdParty/cmark-gfm
+	url = https://github.com/github/cmark-gfm.git
+[submodule "Telegram/ThirdParty/MicroTeX"]
+	path = Telegram/ThirdParty/MicroTeX
+	url = https://github.com/desktop-app/MicroTeX.git
+[submodule "Telegram/ThirdParty/TooManyCooks"]
+	path = Telegram/ThirdParty/TooManyCooks
+	url = https://github.com/tzcnt/TooManyCooks.git
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 00000000000000..c87ae5fec805fd
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,536 @@
+# Agent Guide for Telegram Desktop
+
+This guide defines repository-wide instructions for coding agents working with the Telegram Desktop codebase.
+
+## Working from Codex on Windows + WSL
+
+This checkout may be opened in Codex Desktop through the Windows UNC path `\\wsl.localhost\{distro}\home\{user}\Telegram\tdesktop`, while the real Linux path is `/home/{user}/Telegram/tdesktop`. Treat it as a WSL/Linux checkout first, not as a native Windows checkout.
+
+- Prefer running repository-aware commands through WSL:
+
+```powershell
+wsl.exe -d {distro} --cd /home/{user}/Telegram/tdesktop -- <command>
+```
+
+- PowerShell can read and write files through the UNC path, but native Windows tools may see different ownership, path, executable, or line-ending behavior than Linux tools.
+- Git from PowerShell over `\\wsl.localhost\...` can fail with `detected dubious ownership`. Use WSL Git instead. Do not change global Git `safe.directory` settings unless the user explicitly asks for that.
+- Keep path styles matched to the shell. Use `/home/{user}/Telegram/tdesktop/...` with WSL commands, and quoted `\\wsl.localhost\{distro}\home\{user}\Telegram\tdesktop\...` paths with native Windows commands. Avoid passing UNC paths to Linux tools or Linux paths to native Windows tools unless the tool explicitly supports them.
+- If a command behaves strangely from the PowerShell UNC working directory, retry the same command through `wsl.exe -d {distro} --cd /home/{user}/Telegram/tdesktop -- ...` before concluding the repository or command is broken.
+- Recursive searches and repo inspection are usually faster and more faithful through WSL, for example `wsl.exe -d {distro} --cd /home/{user}/Telegram/tdesktop -- rg ...`.
+- Do not assume the WSL host has the build toolchain installed directly. In this setup, WSL may not have `cmake`, while Windows may have `cmake`, and the configured `out/` tree may still target the Linux Docker toolchain. Do not run native Windows `cmake --build out` against a Linux/Docker build tree.
+- For WSL/Linux builds, use the Docker build entry point from the repository root: `Telegram/build/docker/centos_env/build_debug.sh`. The Docker daemon must be reachable from WSL; checking `docker info` is fine, but do not start a build unless the user asked for one.
+- Existing build outputs may be Linux binaries, for example `out/Debug/Telegram` as an ELF executable, not `Telegram.exe`. Verify the build tree before assuming which platform produced it.
+- Be careful with text file line endings. In a WSL/Linux checkout, files should remain LF-only unless the file already uses another convention. CRLF finishing applies only to native, non-WSL Windows runs/checkouts. Do not let PowerShell or Windows tools silently rewrite WSL files to CRLF. If a file becomes mixed, normalize it back to the convention appropriate for the current checkout, without adding a UTF-8 BOM.
+- When using the local `task-think` skill from this WSL checkout, keep `.ai/...` artifacts and edited project text files LF-only. Treat the skill's Windows text-normalization phase as not applicable to WSL, except to record that line endings were checked and kept LF/no-BOM. Run CRLF normalization for `task-think` only in a native, non-WSL Windows checkout.
+
+## Build System Structure
+
+The build system expects this directory layout:
+
+```text
+L:\Telegram\                    # BuildPath
+L:\Telegram\tdesktop\           # Repository (you work here)
+L:\Telegram\Libraries\          # 32-bit dependencies (Linux/macOS)
+L:\Telegram\win64\Libraries\    # 64-bit dependencies (Windows)
+L:\Telegram\ThirdParty\         # Build tools (NuGet, Python, etc.)
+```
+
+Dependencies are located relative to the repository: `../Libraries`, `../win64/Libraries`, or `../ThirdParty`.
+
+## Build Configuration
+
+### Build Commands
+
+**From repository root, run:**
+
+```bash
+cmake --build out --config Debug --target Telegram
+```
+
+That's it. The `out/` directory is already configured. The executable will be at `out/Debug/Telegram.exe`.
+
+**From WSL, run through the Linux Docker build environment:**
+
+```bash
+Telegram/build/docker/centos_env/build_debug.sh
+```
+
+**Important:** When running cmake from a shell that doesn't support `cd`, use quoted absolute paths:
+```bash
+cmake --build "l:\Telegram\tx64\out" --config Debug --target Telegram
+```
+
+**Never build Release** - it's extremely heavy and not needed for testing changes.
+
+## Platform-Specific Requirements
+
+### Windows
+- Requires Visual Studio 2022
+- Must run from appropriate Native Tools Command Prompt:
+  - "x64 Native Tools Command Prompt" for `win64`
+  - "x86 Native Tools Command Prompt" for `win`
+  - "ARM64 Native Tools Command Prompt" for `winarm`
+- Dependencies: `../win64/Libraries` (64-bit) or `../Libraries` (32-bit)
+
+### macOS
+- Requires Xcode
+- Dependencies: `../Libraries/local/Qt-*`
+- Set `QT` environment variable: `export QT=6.8`
+
+### Linux
+- Build dependencies in `../Libraries`
+- Set `QT` environment variable if needed
+
+## Key Files
+
+- **`Telegram/build/version`** - Version information
+- **`out/`** - Build output directory
+
+## Troubleshooting
+
+### "Libraries not found"
+Ensure the repository is in `L:\Telegram\tdesktop`. The build system requires `../win64/Libraries` to exist.
+
+### Build fails with "wrong command prompt"
+On Windows, use the correct Visual Studio Native Tools Command Prompt matching your target (x64/x86/ARM64).
+
+### Build fails with PDB or EXE access errors
+
+**⚠️ CRITICAL: DO NOT RETRY THE BUILD. STOP AND WAIT FOR USER.**
+
+If the build fails with ANY of these errors:
+- `fatal error C1041: cannot open program database`
+- `cannot open output file 'Telegram.exe'`
+- `LNK1104: cannot open file`
+- Any "access denied" or "file in use" error
+
+**STOP IMMEDIATELY.** These errors mean files are locked by a running process (Telegram.exe or debugger).
+
+**What to do:**
+1. Do NOT attempt another build - it will fail the same way
+2. Do NOT try to delete files - they are locked
+3. Do NOT try any workarounds or fixes
+4. IMMEDIATELY inform the user:
+
+> "Build failed - files are locked. Please close Telegram.exe (and any debugger) so I can rebuild."
+
+**Then WAIT for user confirmation before attempting any build.**
+
+Retrying builds wastes time and context. The ONLY fix is for the user to close the running process.
+
+## Best Practices
+
+1. **Always use Debug builds** - Release builds are extremely heavy
+2. **Don't build Release configuration** - it's too heavy for testing
+
+## Text File Format
+
+- On Windows, keep project text files with CRLF line endings.
+- Do not save source, header, build/config, style, or localization files as UTF-8 with BOM. Use UTF-8 without BOM.
+- When rewriting project text files for normalization, preserve file content otherwise and do not introduce a BOM.
+
+## Commits
+
+- Subject: one concise, plain-language line summarizing the change, ~50-60 characters, matching the style of recent `git log` subjects. This is usually the entire message.
+- Add a short plain-language body only when the subject can't carry it (what was done, not the technical how) — a line or two at most.
+- Never add a `Co-Authored-By:` line or any tool/assistant attribution trailer.
+- Never add `Autotask:`/attempt or other workflow markers — commits read like normal history.
+
+## Local Storage Serialization
+
+Both app-level (`Core::Settings`) and session-level (`Main::SessionSettings`) use sequential binary serialization via `QDataStream`. Key rules:
+
+- New fields must ALWAYS be appended at the **end** of the stream, never inserted in the middle
+- Reading new fields must be guarded with `!stream.atEnd()` and provide a meaningful default/fallback
+- Inserting in the middle breaks reading of data saved by older versions (the new read code consumes bytes that belong to subsequent fields)
+- For simple flags and values, prefer using the generic KV prefs facility (`writePref<Type>` / `readPref<Type>`) instead of adding to the binary stream -- this avoids serialization ordering issues entirely
+
+---
+
+# Development Guidelines
+
+## Coding Style
+
+**Do NOT write comments in code:**
+
+This is important! Do not write single-line comments that describe what the next line does - they are bloat. Comments are allowed ONLY to describe complex algorithms in detail, when the explanation requires at least 4-5 lines. Self-documenting code with clear variable and function names is preferred.
+
+```cpp
+// BAD - don't do this:
+// Get the user's name
+auto name = user->name();
+// Check if premium
+if (user->isPremium()) {
+
+// GOOD - no comments needed, code is self-explanatory:
+auto name = user->name();
+if (user->isPremium()) {
+
+// ACCEPTABLE - complex algorithm explanation (4+ lines):
+// The algorithm works by first collecting all visible messages
+// in the viewport, then calculating their intersection with
+// the clip rectangle. Messages are grouped by date headers,
+// and we need to account for sticky headers that may overlap
+// with the first message in each group.
+```
+
+**Style and formatting rules** are in `REVIEW.md` — see that file for empty-line-before-closing-brace, operator placement in multi-line expressions, if-with-initializer, and other mechanical style rules.
+
+**Use `auto` for type deduction:**
+
+Prefer `auto` (or `const auto`, `const auto &`) instead of explicit types:
+
+```cpp
+// Prefer this:
+auto currentTitle = tr::lng_settings_title(tr::now);
+auto nameProducer = GetNameProducer();
+
+// Instead of this:
+QString currentTitle = tr::lng_settings_title(tr::now);
+rpl::producer<QString> nameProducer = GetNameProducer();
+```
+
+**Use trailing return types only when the normal form is too long:**
+
+Prefer the normal return type form when the opening line fits comfortably, roughly around 77 characters or less:
+
+```cpp
+// GOOD:
+[[nodiscard]] TextWithEntities FlattenSummaryBlocks(
+	const std::vector<Block> &blocks);
+```
+
+Do not use one-line trailing return types, or put the trailing return type after `)` on the same line. If it fits on one line with trailing syntax, the normal form would be shorter and easier to read:
+
+```cpp
+// BAD:
+auto ComputeTitle() -> QString;
+
+// BAD:
+[[nodiscard]] auto FlattenSummaryBlocks(
+	const std::vector<Block> &blocks) -> TextWithEntities;
+```
+
+Use `auto` with a trailing return type only when the normal opening line
+`{attributes} {return-type} {class-name::}{function-name(}` would be too long, or would force the return type onto its own line. Put the arrow and return type on the next line so the return type remains easy to find:
+
+```cpp
+// BAD:
+not_null<HistoryView::Controls::ComposeAiButton*>
+HistoryView::Controls::SetupCaptionAiButton(SetupCaptionAiButtonArgs &&args);
+```
+
+```cpp
+// GOOD:
+auto HistoryView::Controls::SetupCaptionAiButton(
+		SetupCaptionAiButtonArgs &&args)
+-> not_null<HistoryView::Controls::ComposeAiButton*>;
+```
+
+This applies to both declarations and definitions.
+
+**Use `_q` for QString literals:**
+
+Prefer the project literal `u"..."_q` instead of the verbose `QStringLiteral("...")` macro when creating `QString` values:
+
+```cpp
+// Prefer this:
+auto text = u"Settings"_q;
+
+// Instead of this:
+auto text = QStringLiteral("Settings");
+```
+
+## API Usage
+
+### API Schema Files
+
+API definitions use [TL Language](https://core.telegram.org/mtproto/TL):
+
+1. **`Telegram/SourceFiles/mtproto/scheme/mtproto.tl`** - MTProto protocol (encryption, auth, etc.)
+2. **`Telegram/SourceFiles/mtproto/scheme/api.tl`** - Telegram API (messages, users, chats, etc.)
+
+### Making API Requests
+
+Standard pattern using `api()`, generated `MTP...` types, and callbacks:
+
+```cpp
+api().request(MTPnamespace_MethodName(
+    MTP_flags(flags_value),
+    MTP_inputPeer(peer),
+    MTP_string(messageText),
+    MTP_long(randomId),
+    MTP_vector<MTPMessageEntity>()
+)).done([=](const MTPResponseType &result) {
+    // Handle successful response
+
+    // Multiple constructors - use .match() or check type:
+    result.match([&](const MTPDuser &data) {
+        // use data.vfirst_name().v
+    }, [&](const MTPDuserEmpty &data) {
+        // handle empty user
+    });
+
+    // Single constructor - use .data() shortcut:
+    const auto &data = result.data();
+    // use data.vmessages().v
+
+}).fail([=](const MTP::Error &error) {
+    // Handle API error
+    if (error.type() == u"FLOOD_WAIT_X"_q) {
+        // Handle flood wait
+    }
+}).handleFloodErrors().send();
+```
+
+**Key points:**
+- Always refer to `api.tl` for method signatures and return types
+- Use generated `MTP...` types for parameters (`MTP_int`, `MTP_string`, etc.)
+- For multiple constructors, use `.match()` or check `.type()` against `mtpc_` constants then call `.c_constructorName()`:
+  ```cpp
+  // Using match:
+  result.match([&](const MTPDuser &data) { ... }, [&](const MTPDuserEmpty &data) { ... });
+  // Or explicit type check:
+  if (result.type() == mtpc_user) {
+      const auto &data = result.c_user(); // asserts on type mismatch
+  }
+  ```
+- For single constructors, use `.data()` shortcut
+- Include `.handleFloodErrors()` before `.send()` in rare cases where you want special case flood error handling
+- Silently ignore HTTP 406 errors in UI: the server uses 406 to mean "show nothing to the user". Guard toasts with `MTP::IgnoreError(error)` or use `MTP::ShowErrorFallback(show, error)` (both in `mtproto/mtproto_response.h`) which shows `error.type()` as a toast unless the error should be ignored.
+
+## UI Styling
+
+### Style Files
+
+UI styles are defined in `.style` files using custom syntax:
+
+```style
+using "ui/basic.style";
+using "ui/widgets/widgets.style";
+
+MyButtonStyle {
+    textPadding: margins;
+    icon: icon;
+    height: pixels;
+}
+
+defaultButton: MyButtonStyle {
+    textPadding: margins(10px, 15px, 10px, 15px);
+    icon: icon{{ "gui/icons/search", iconColor }};
+    height: 30px;
+}
+
+primaryButton: MyButtonStyle(defaultButton) {
+    icon: icon{{ "gui/icons/check", iconColor }};
+}
+```
+
+**Built-in types:**
+- `int` - Integer numbers (e.g., `maxLines: 3;`)
+- `bool` - Boolean values (e.g., `useShadow: true;`)
+- `pixels` - Pixel values with `px` suffix (e.g., `10px`)
+- `color` - Named colors from `ui/colors.palette`
+- `icon` - Inline icon definition: `icon{{ "path/stem", color }}`
+- `margins` - Four values: `margins(top, right, bottom, left)`
+- `size` - Two values: `size(width, height)`
+- `point` - Two values: `point(x, y)`
+- `align` - Alignment: `align(center)`, `align(left)`
+- `font` - Font: `font(14px semibold)`
+- `double` - Floating point
+
+**Multi-part icons** (layers drawn bottom-up):
+```style
+myComplexIcon: icon{
+  { "gui/icons/background", iconBgColor },
+  { "gui/icons/foreground", iconFgColor }
+};
+```
+
+**Borders** are typically separate fields, not a single property:
+```style
+chatInput {
+  border: 1px;                       // width
+  borderFg: defaultInputFieldBorder; // color
+}
+```
+
+**Never hardcode sizes in code:**
+
+The app supports different interface scale options. Style `px` values are automatically scaled at runtime, but raw integer constants in code are not. Never use hardcoded numbers for margins, paddings, spacing, sizes, coordinates, or any other dimensional values. Always define them in `.style` files and reference via `st::`.
+
+```cpp
+// BAD - breaks at non-100% interface scale:
+p.drawText(10, 20, text);
+widget->setFixedHeight(48);
+auto margin = 8;
+auto iconSize = QSize(24, 24);
+
+// GOOD - define in .style file and reference:
+p.drawText(st::myWidgetTextLeft, st::myWidgetTextTop, text);
+widget->setFixedHeight(st::myWidgetHeight);
+auto margin = st::myWidgetMargin;
+auto iconSize = st::myWidgetIconSize;
+```
+
+**Duration constants**: Animation durations should NOT go in `.style` files, this is a legacy approach. Prefer `constexpr auto kName = crl::time(N)` in an anonymous namespace in the relevant `.cpp` file.
+
+### Usage in Code
+
+```cpp
+#include "styles/style_widgets.h"
+
+// Access style members
+int height = st::primaryButton.height;
+const style::icon &icon = st::primaryButton.icon;
+style::margins padding = st::primaryButton.textPadding;
+
+// Use in painting
+void MyWidget::paintEvent(QPaintEvent *e) {
+    Painter p(this);
+    p.fillRect(rect(), st::chatInput.backgroundColor);
+}
+```
+
+## Localization
+
+### String Definitions
+
+Strings are defined in `Telegram/Resources/langs/lang.strings`:
+
+```
+"lng_settings_title" = "Settings";
+"lng_confirm_delete_item" = "Are you sure you want to delete {item_name}?";
+"lng_files_selected#one" = "{count} file selected";
+"lng_files_selected#other" = "{count} files selected";
+```
+
+### Usage in Code
+
+**Immediate (current value):**
+
+```cpp
+auto currentTitle = tr::lng_settings_title(tr::now);
+
+auto currentConfirmation = tr::lng_confirm_delete_item(
+    tr::now,
+    lt_item_name, currentItemName);
+
+auto filesText = tr::lng_files_selected(tr::now, lt_count, count);
+```
+
+**Reactive (rpl::producer):**
+
+```cpp
+auto titleProducer = tr::lng_settings_title();
+
+auto confirmationProducer = tr::lng_confirm_delete_item(
+    lt_item_name,
+    std::move(itemNameProducer));
+
+auto filesTextProducer = tr::lng_files_selected(
+    lt_count,
+    countProducer | tr::to_count());
+```
+
+**Key points:**
+- Pass `tr::now` as first argument for immediate `QString`
+- Omit `tr::now` for reactive `rpl::producer<QString>`
+- Placeholders use `lt_tag_name, value` pattern
+- For `{count}`: immediate uses `int`, reactive uses `rpl::producer<float64>` with `| tr::to_count()`
+- Move producers with `std::move` when passing to placeholders
+- Rich text projectors — these `tr::` helpers serve double duty: as the **last argument** (projector) they set the return type to `TextWithEntities`, and as **placeholder values** they wrap individual substitutions in formatting. Always prefer them over `Ui::Text::Bold()`, `Ui::Text::RichLangValue`, etc. — see REVIEW.md for the full mapping.
+  - `tr::marked` — basic projection, converts `QString` to `TextWithEntities`
+  - `tr::rich` — interprets `**bold**`/`__italic__` markup in the string
+  - `tr::bold`, `tr::italic`, `tr::underline` — wrap text in that formatting
+  - `tr::link` — wrap as a clickable link
+  - `tr::url(u"https://..."_q)` — returns a projection that converts text to a link pointing to the given URL; can be passed to `rpl::map` or directly to a `tr::lng_...` call
+  ```cpp
+  // As last argument (projector):
+  auto title = tr::lng_export_progress_title(tr::now, tr::bold);
+  auto text = tr::lng_proxy_incorrect_secret(tr::now, tr::rich);
+  // As placeholder value wrapper + projector:
+  auto desc = tr::lng_some_key(
+      tr::now,
+      lt_name,
+      tr::bold(userName),
+      lt_group,
+      tr::bold(groupName),
+      tr::rich);
+  // Nested tr::lng as placeholder:
+  auto linked = tr::lng_settings_birthday_contacts(
+      lt_link,
+      tr::lng_settings_birthday_contacts_link(tr::url(link)),
+      tr::marked);
+  ```
+
+## RPL (Reactive Programming Library)
+
+### Core Concepts
+
+**Producers** represent streams of values over time:
+
+```cpp
+auto intProducer = rpl::single(123);  // Emits single value
+auto lifetime = rpl::lifetime();       // Manages subscription lifetime
+```
+
+### Starting Pipelines
+
+```cpp
+std::move(counter) | rpl::on_next([=](int value) {
+    qDebug() << "Received: " << value;
+}, lifetime);
+
+// Without lifetime parameter - MUST store returned lifetime:
+auto subscriptionLifetime = std::move(counter) | rpl::on_next([=](int value) {
+    // process value
+});
+```
+
+### Transforming Producers
+
+```cpp
+auto strings = std::move(ints) | rpl::map([](int value) {
+    return QString::number(value * 2);
+});
+
+auto evenInts = std::move(ints) | rpl::filter([](int value) {
+    return (value % 2 == 0);
+});
+```
+
+### Combining Producers
+
+**`rpl::combine`** - combines latest values (lambdas receive unpacked arguments):
+
+```cpp
+auto combined = rpl::combine(countProducer, textProducer);
+
+std::move(combined) | rpl::on_next([=](int count, const QString &text) {
+    qDebug() << "Count=" << count << ", Text=" << text;
+}, lifetime);
+```
+
+**`rpl::merge`** - merges producers of same type:
+
+```cpp
+auto merged = rpl::merge(sourceA, sourceB);
+
+std::move(merged) | rpl::on_next([=](QString &&value) {
+    qDebug() << "Merged value: " << value;
+}, lifetime);
+```
+
+**Other pipeline starters** — besides `rpl::on_next`, there are:
+- `rpl::on_error([=](Error &&e) { ... }, lifetime)` — handle errors
+- `rpl::on_done([=] { ... }, lifetime)` — handle stream completion
+- `rpl::on_next_error_done(nextCb, errorCb, doneCb, lifetime)` — handle all three
+
+The `Error` template parameter defaults to `rpl::no_error`: `rpl::producer<Type, Error = no_error>`.
+
+**Key points:**
+- Explicitly `std::move` producers when starting pipelines
+- Pass `rpl::lifetime` to `on_...` methods or store returned lifetime
+- Use `rpl::duplicate(producer)` to reuse a producer multiple times
+- Combined producers automatically unpack tuples in lambdas (works with `rpl::map`, `rpl::filter`, and `rpl::on_next`)
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 00000000000000..f8564d18cef4b9
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,3 @@
+# Claude Code Pointer
+
+Read `AGENTS.md` and treat it as the canonical repository-wide instructions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9393d81d723d23..343a5419d17b67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,14 +4,14 @@
 # For license and copyright information please follow this link:
 # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
-if (APPLE)
-    # target_precompile_headers with COMPILE_LANGUAGE restriction.
-    cmake_minimum_required(VERSION 3.23)
-else()
-    cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.31)
+
+# Workaround some linking errors in GCC due to static library order.
+if (POLICY CMP0156)
+    cmake_policy(SET CMP0156 OLD)
 endif()
-if (POLICY CMP0149)
-    cmake_policy(SET CMP0149 NEW)
+if (POLICY CMP0179)
+    cmake_policy(SET CMP0179 OLD)
 endif()
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -20,19 +20,27 @@ include(cmake/validate_special_target.cmake)
 include(cmake/version.cmake)
 desktop_app_parse_version(Telegram/build/version)
 
-set(project_langs C CXX)
-if (APPLE)
-    list(APPEND project_langs OBJC OBJCXX)
-elseif (LINUX)
-    list(APPEND project_langs ASM)
+if (NOT DEFINED CMAKE_CONFIGURATION_TYPES)
+    set(configuration_types_init 1)
 endif()
 
 project(Telegram
-    LANGUAGES ${project_langs}
+    LANGUAGES C CXX
     VERSION ${desktop_app_version_cmake}
     DESCRIPTION "Official Telegram Desktop messenger"
     HOMEPAGE_URL "https://desktop.telegram.org"
 )
+
+if (APPLE)
+    enable_language(OBJC OBJCXX)
+endif()
+
+if (configuration_types_init
+    AND CMAKE_CONFIGURATION_TYPES
+    AND NOT MinSizeRel IN_LIST CMAKE_CONFIGURATION_TYPES)
+    set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES};MinSizeRel" CACHE STRING "" FORCE)
+endif()
+
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Telegram)
 
 get_filename_component(third_party_loc "Telegram/ThirdParty" REALPATH)
@@ -47,9 +55,7 @@ include(cmake/variables.cmake)
 include(cmake/nice_target_sources.cmake)
 include(cmake/target_compile_options_if_exists.cmake)
 include(cmake/target_link_frameworks.cmake)
-include(cmake/target_link_optional_libraries.cmake)
 include(cmake/target_link_options_if_exists.cmake)
-include(cmake/target_link_static_libraries.cmake)
 include(cmake/init_target.cmake)
 include(cmake/generate_target.cmake)
 include(cmake/nuget.cmake)
diff --git a/LEGAL b/LEGAL
index 5d0f5e8a7155ed..09c9e383db122f 100644
--- a/LEGAL
+++ b/LEGAL
@@ -1,7 +1,7 @@
 This file is part of Telegram Desktop,
 the official desktop application for the Telegram messaging service.
 
-Copyright (c) 2014-2024 The Telegram Desktop Authors.
+Copyright (c) 2014-2026 The Telegram Desktop Authors.
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/README.md b/README.md
index f3995349b83274..d1bbce82ecda30 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ This is the complete source code and the build instructions for the official [Te
 [![Build Status](https://github.com/telegramdesktop/tdesktop/workflows/Windows./badge.svg)](https://github.com/telegramdesktop/tdesktop/actions)
 [![Build Status](https://github.com/telegramdesktop/tdesktop/workflows/MacOS./badge.svg)](https://github.com/telegramdesktop/tdesktop/actions)
 [![Build Status](https://github.com/telegramdesktop/tdesktop/workflows/Linux./badge.svg)](https://github.com/telegramdesktop/tdesktop/actions)
+[![Built with Depot](https://img.shields.io/badge/Built%20with-Depot.dev-46A75A)](https://depot.dev)
 
 [![Preview of Telegram Desktop][preview_image]][preview_image_url]
 
@@ -43,9 +44,9 @@ Version **1.8.15** was the last that supports older systems
 ## Third-party
 
 * Qt 6 ([LGPL](http://doc.qt.io/qt-6/lgpl.html)) and Qt 5.15 ([LGPL](http://doc.qt.io/qt-5/lgpl.html)) slightly patched
-* OpenSSL 3.2.1 ([Apache License 2.0](https://www.openssl.org/source/apache-license-2.0.txt))
+* OpenSSL 3.2.1 ([Apache License 2.0](https://openssl-library.org/source/license/apache-license-2.0.txt))
 * WebRTC ([New BSD License](https://github.com/desktop-app/tg_owt/blob/master/LICENSE))
-* zlib 1.2.11 ([zlib License](http://www.zlib.net/zlib_license.html))
+* zlib ([zlib License](http://www.zlib.net/zlib_license.html))
 * LZMA SDK 9.20 ([public domain](http://www.7-zip.org/sdk.html))
 * liblzma ([public domain](http://tukaani.org/xz/))
 * Google Breakpad ([License](https://chromium.googlesource.com/breakpad/breakpad/+/master/LICENSE))
@@ -58,7 +59,7 @@ Version **1.8.15** was the last that supports older systems
 * Guideline Support Library ([MIT License](https://github.com/Microsoft/GSL/blob/master/LICENSE))
 * Range-v3 ([Boost License](https://github.com/ericniebler/range-v3/blob/master/LICENSE.txt))
 * Open Sans font ([Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html))
-* Vazir font ([SIL Open Font License 1.1](https://github.com/rastikerdar/vazir-font/blob/master/OFL.txt))
+* Vazirmatn font ([SIL Open Font License 1.1](https://github.com/rastikerdar/vazirmatn/blob/master/OFL.txt))
 * Emoji alpha codes ([MIT License](https://github.com/emojione/emojione/blob/master/extras/alpha-codes/LICENSE.md))
 * xxHash ([BSD License](https://github.com/Cyan4973/xxHash/blob/dev/LICENSE))
 * QR Code generator ([MIT License](https://github.com/nayuki/QR-Code-generator#license))
@@ -68,7 +69,7 @@ Version **1.8.15** was the last that supports older systems
 
 ## Build instructions
 
-* Windows [(32-bit)][win32] [(64-bit)][win64]
+* [Windows (32-bit and 64-bit)][win]
 * [macOS][mac]
 * [GNU/Linux using Docker][linux]
 
@@ -78,9 +79,21 @@ Version **1.8.15** was the last that supports older systems
 [telegram_api]: https://core.telegram.org
 [telegram_proto]: https://core.telegram.org/mtproto
 [license]: LICENSE
-[win32]: docs/building-win.md
-[win64]: docs/building-win-x64.md
+[win]: docs/building-win.md
 [mac]: docs/building-mac.md
 [linux]: docs/building-linux.md
 [preview_image]: https://github.com/telegramdesktop/tdesktop/blob/dev/docs/assets/preview.png "Preview of Telegram Desktop"
 [preview_image_url]: https://raw.githubusercontent.com/telegramdesktop/tdesktop/dev/docs/assets/preview.png
+
+## Thanks to
+
+<a href="https://depot.dev">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://depot.dev/assets/brand/1693758816/depot-logo-horizontal-on-dark.svg">
+    <source media="(prefers-color-scheme: light)" srcset="https://depot.dev/assets/brand/1693758816/depot-logo-horizontal-on-light.svg">
+    <img alt="Depot" src="https://depot.dev/assets/brand/1693758816/depot-logo-horizontal-on-light.svg" width="150">
+  </picture>
+</a>
+
+CI infrastructure sponsored by [Depot](https://depot.dev) — fast GitHub Actions runners.
+
diff --git a/REVIEW.md b/REVIEW.md
new file mode 100644
index 00000000000000..d1a9a646dd54c5
--- /dev/null
+++ b/REVIEW.md
@@ -0,0 +1,555 @@
+# Code Review Style Guide
+
+This file contains style and formatting rules that the review subagent must check and fix. These are mechanical issues that should always be caught during code review.
+
+## Empty line before closing brace
+
+Always add an empty line before the closing brace of a **class** (which has one or more sections like `public:` / `private:`). Plain **structs** with just data members do NOT get a trailing empty line — they are compact: `struct Foo { data lines; };`.
+
+```cpp
+// BAD:
+class MyClass {
+public:
+    void foo();
+
+private:
+    int _value = 0;
+};
+
+// GOOD:
+class MyClass {
+public:
+    void foo();
+
+private:
+    int _value = 0;
+
+};
+```
+
+## No consecutive empty lines
+
+Use at most one empty line between declarations, definitions, include groups, or logical blocks. Two or more empty lines in a row add visual noise without adding structure.
+
+## Multi-line expressions — operators at the start of continuation lines
+
+When splitting an expression across multiple lines, place operators (like `&&`, `||`, `;`, `+`, etc.) at the **beginning** of continuation lines, not at the end of the previous line. This makes it immediately obvious from the left edge whether a line is a continuation or new code.
+
+```cpp
+// BAD - continuation looks like scope code:
+if (const auto &lottie = animation->lottie;
+	lottie && lottie->valid() && lottie->framesCount() > 1) {
+	lottie->animate([=] {
+
+// GOOD - semicolon at start signals continuation:
+if (const auto &lottie = animation->lottie
+	; lottie && lottie->valid() && lottie->framesCount() > 1) {
+	lottie->animate([=] {
+
+// BAD - trailing && makes next line look like independent code:
+if (veryLongExpression() &&
+	anotherLongExpression() &&
+	anotherOne()) {
+	doSomething();
+
+// GOOD - leading && clearly marks continuation:
+if (veryLongExpression()
+	&& anotherLongExpression()
+	&& anotherOne()) {
+	doSomething();
+```
+
+## Minimize type checks — prefer direct cast over is + as
+
+Don't check a type and then cast — just cast and check for null. `asUser()` already returns `nullptr` when the peer is not a user, so calling `isUser()` first is redundant. The same applies to `asChannel()`, `asChat()`, etc.
+
+```cpp
+// BAD - redundant isUser() check, then asUser():
+if (peer && peer->isUser()) {
+	peer->asUser()->setNoForwardFlags(
+
+// GOOD - just cast and null-check:
+if (const auto user = peer->asUser()) {
+	user->setNoForwardFlags(
+```
+
+When you need a specific subtype, look up the specific subtype directly instead of loading a generic type and then casting:
+
+```cpp
+// BAD - loads generic peer, then casts:
+if (const auto peer = session().data().peerLoaded(peerId)
+	; peer && peer->isUser()) {
+	peer->asUser()->setNoForwardFlags(
+
+// GOOD - look up the specific subtype directly:
+const auto userId = peerToUser(peerId);
+if (const auto user = session().data().userLoaded(userId)) {
+	user->setNoForwardFlags(
+```
+
+Avoid C++17 `if` with initializer (`;` inside the condition) when the code can be written more clearly with simple nested `if` statements or by extracting the value beforehand:
+
+```cpp
+// BAD - complex if-with-initializer:
+if (const auto peer = session().data().peerLoaded(peerId)
+	; peer && peer->isUser()) {
+
+// GOOD - simple nested ifs when direct lookup isn't available:
+if (const auto peer = session().data().peerLoaded(peerId)) {
+	if (const auto user = peer->asUser()) {
+
+## Always initialize variables of basic types
+
+Never leave variables of basic types (`int`, `float`, `bool`, pointers, etc.) uninitialized. Custom types with constructors are fine — they initialize themselves. But for any basic type, always provide a default value (`= 0`, `= false`, `= nullptr`, etc.). This applies especially to class fields, where uninitialized members are a persistent source of bugs.
+
+The only exception is performance-critical hot paths where you can prove no read-from-uninitialized-memory occurs. For class fields there is no such exception — always initialize.
+
+```cpp
+// BAD:
+int _bulletLeft;
+int _bulletTop;
+bool _expanded;
+SomeType *_pointer;
+
+// GOOD:
+int _bulletLeft = 0;
+int _bulletTop = 0;
+bool _expanded = false;
+SomeType *_pointer = nullptr;
+```
+
+## Use tr:: projections for TextWithEntities
+
+Inside `tr::lng_...()` calls, always use the `tr::` projection helpers instead of their `Ui::Text::` equivalents. The `tr::` helpers are shorter and work uniformly as both placeholder wrappers and final projectors.
+
+| Instead of | Use |
+|---|---|
+| `Ui::Text::Bold(x)` | `tr::bold(x)` |
+| `Ui::Text::Italic(x)` | `tr::italic(x)` |
+| `Ui::Text::RichLangValue` | `tr::rich` |
+| `Ui::Text::WithEntities` | `tr::marked` |
+
+```cpp
+// BAD - verbose Ui::Text:: functions:
+tr::lng_some_key(
+    tr::now,
+    lt_name,
+    Ui::Text::Bold(name),
+    lt_group,
+    Ui::Text::Bold(group),
+    Ui::Text::RichLangValue)
+
+// GOOD - concise tr:: helpers:
+tr::lng_some_key(
+    tr::now,
+    lt_name,
+    tr::bold(name),
+    lt_group,
+    tr::bold(group),
+    tr::rich)
+```
+
+Also use `tr::marked()` as the standard way to create `TextWithEntities` — not just as a projector:
+
+```cpp
+// BAD - verbose constructor:
+auto text = TextWithEntities();
+auto text = TextWithEntities{ u"hello"_q };
+auto text = TextWithEntities().append(u"hello"_q);
+
+// GOOD - concise:
+auto text = tr::marked();
+auto text = tr::marked(u"hello"_q);
+```
+
+## Multi-line calls — one argument per line
+
+When a function call doesn't fit on one line, put each argument on its own line. Don't group "logical pairs" on the same line — it creates inconsistent line lengths and makes diffs noisier.
+
+```cpp
+// BAD - pairs of arguments sharing lines:
+tr::lng_some_key(
+    tr::now,
+    lt_name, tr::bold(name),
+    lt_group, tr::bold(group),
+    tr::rich)
+
+// GOOD - one argument per line:
+tr::lng_some_key(
+    tr::now,
+    lt_name,
+    tr::bold(name),
+    lt_group,
+    tr::bold(group),
+    tr::rich)
+
+// Single-line is fine when everything fits:
+auto text = tr::lng_settings_title(tr::now);
+```
+
+## std::optional access — avoid value()
+
+Do not call `std::optional::value()` because it throws an exception that is not available on older macOS targets. Use `has_value()`, `value_or()`, `operator bool()`, or `operator*` instead.
+
+## Sort includes alphabetically, nested folders first
+
+After the file's own header, sort `#include` directives alphabetically with two special rules:
+
+1. **Nested folders before files** in the same directory — like Finder / File Explorer (folders first, then files). E.g. `ui/controls/button.h` sorts before `ui/abstract_button.h`.
+2. **Style includes (`styles/style_*.h`) always go last**, separated from the rest.
+
+```cpp
+// BAD - arbitrary order, style mixed in:
+#include "media/audio/media_audio.h"
+#include "styles/style_media_player.h"
+#include "data/data_document.h"
+#include "apiwrap.h"
+
+// GOOD - alphabetical, folders first, styles last:
+#include "apiwrap.h"
+#include "data/data_document.h"
+#include "media/audio/media_audio.h"
+
+#include "styles/style_media_player.h"
+```
+
+## Use C++17 nested namespace syntax
+
+Use `namespace A::B {` instead of nesting `namespace A { namespace B {`. The closing comment mirrors the opening: `} // namespace A::B`.
+
+```cpp
+// BAD - old-style nesting:
+namespace Media {
+namespace Player {
+...
+} // namespace Player
+} // namespace Media
+
+// GOOD - C++17 nested:
+namespace Media::Player {
+...
+} // namespace Media::Player
+```
+
+## Merge consecutive branches with identical bodies
+
+When two or more consecutive `if` / `else if` branches execute the same code, combine their conditions into a single branch.
+
+```cpp
+// BAD - duplicated body:
+if (!document) {
+    finalize();
+    return;
+}
+if (!document->isSong()) {
+    finalize();
+    return;
+}
+
+// GOOD - combined:
+if (!document || !document->isSong()) {
+    finalize();
+    return;
+}
+```
+
+## Use base::take for read-and-reset
+
+When you need to read a variable's current value and reset it in one step, use `base::take(var)` instead of manually copying and clearing. `base::take` returns the old value and resets the variable to its default-constructed state.
+
+```cpp
+// BAD - manual read + reset:
+if (_playing) {
+    _listenedMs += crl::now() - _playStartedAt;
+    _playing = false;
+}
+
+// GOOD:
+if (base::take(_playing)) {
+    _listenedMs += crl::now() - _playStartedAt;
+}
+
+// BAD - copy fields then clear them one by one:
+const auto document = _document;
+const auto contextId = _contextId;
+_document = nullptr;
+_listenedMs = 0;
+if (!document) {
+    return;
+}
+
+// GOOD - take everything upfront, then validate:
+const auto document = base::take(_document);
+const auto contextId = base::take(_contextId);
+const auto duration = static_cast<int>(base::take(_listenedMs) / 1000);
+if (!document || duration <= 0) {
+    return;
+}
+```
+
+## Don't wrap tr:: lang keys in rpl::single
+
+`tr::lng_*()` (without `tr::now`) already returns an `rpl::producer`. Wrapping a snapshot in `rpl::single()` defeats live language switching — the value is captured once and never updates. Just call the lang key without `tr::now`.
+
+```cpp
+// BAD - frozen snapshot, won't update on language change:
+rpl::single(tr::lng_ai_compose_title(tr::now))
+
+// GOOD - live producer that updates automatically:
+tr::lng_ai_compose_title()
+```
+
+## Extract method definitions from local classes
+
+When defining local classes (e.g. in anonymous namespaces), keep the class body compact — only declarations. Put all method definitions **after** all class definitions. This avoids unnecessary nesting inside the class body and keeps methods at the same indentation level as free functions.
+
+```cpp
+// BAD - methods defined inline, adding a nesting level:
+class MyWidget final : public Ui::RpWidget {
+public:
+    MyWidget(QWidget *parent)
+    : RpWidget(parent) {
+        // ... 20 lines of setup
+    }
+
+    void setActive(bool active) {
+        _active = active;
+        update();
+    }
+
+protected:
+    void paintEvent(QPaintEvent *e) override {
+        // ... 30 lines of painting
+    }
+
+private:
+    bool _active = false;
+
+};
+
+// GOOD - class is a compact declaration, methods defined after:
+class MyWidget final : public Ui::RpWidget {
+public:
+    MyWidget(QWidget *parent, QString label);
+
+    void setActive(bool active);
+
+protected:
+    void paintEvent(QPaintEvent *e) override;
+
+private:
+    bool _active = false;
+
+};
+
+MyWidget::MyWidget(QWidget *parent, QString label)
+: RpWidget(parent) {
+    // ... 20 lines of setup
+}
+
+void MyWidget::setActive(bool active) {
+    _active = active;
+    update();
+}
+
+void MyWidget::paintEvent(QPaintEvent *e) {
+    // ... 30 lines of painting
+}
+```
+
+When there are multiple local classes, put **all class definitions first**, then **all method definitions** after. This keeps the declarations readable as an overview.
+
+## Do not repeat [[nodiscard]] on method definitions
+
+Put `[[nodiscard]]` on the method declaration inside the class. Do not repeat it on the out-of-class method definition. Free functions may keep `[[nodiscard]]` on their definition when that is the only declaration.
+
+```cpp
+// BAD - duplicated attribute on the definition:
+[[nodiscard]] int MyClass::value() const {
+	return _value;
+}
+
+// GOOD - declaration carries the attribute, definition stays clean:
+int MyClass::value() const {
+	return _value;
+}
+```
+
+## Use RAII for resource cleanup
+
+When working with raw resources (Win32 HANDLEs, file descriptors, COM objects), use `gsl::finally` or a dedicated RAII wrapper for cleanup instead of calling release functions manually. Manual cleanup breaks when early returns are added later.
+
+```cpp
+// BAD - manual cleanup, fragile with early returns:
+const auto snapshot = CreateToolhelp32Snapshot(...);
+if (snapshot != INVALID_HANDLE_VALUE) {
+	// ... logic that might grow early returns ...
+	CloseHandle(snapshot);
+}
+
+// GOOD - RAII guard, cleanup runs on any exit path:
+const auto snapshot = CreateToolhelp32Snapshot(...);
+if (snapshot == INVALID_HANDLE_VALUE) {
+	return;
+}
+const auto guard = gsl::finally([&] {
+	CloseHandle(snapshot);
+});
+// ... logic, early returns are safe ...
+```
+
+## Extract substantial logic from lambdas
+
+When a lambda grows beyond a few lines of self-contained logic, extract it into a named function (free function in anonymous namespace, or a private method). Lambdas should primarily be glue — captures, dispatch, short transforms. This applies when the lambda's captures are minimal and can easily become function parameters. When a lambda captures many variables from its surrounding context, it may be cleaner to keep it inline.
+
+```cpp
+// BAD - substantial logic buried in a lambda:
+crl::async([=] {
+	auto found = false;
+	auto pe = PROCESSENTRY32();
+	pe.dwSize = sizeof(PROCESSENTRY32);
+	const auto snapshot = CreateToolhelp32Snapshot(...);
+	if (snapshot != INVALID_HANDLE_VALUE) {
+		for (...) {
+			if (/* match */) {
+				found = true;
+				break;
+			}
+		}
+		CloseHandle(snapshot);
+	}
+	crl::on_main(weak, [=] { handle(found); });
+});
+
+// GOOD - logic extracted, lambda is just glue:
+crl::async([=] {
+	const auto found = FindRunningReader();
+	crl::on_main(weak, [=] { handle(found); });
+});
+```
+
+## Data-driven matching over chained conditions
+
+When comparing a value against multiple known constants, store them in a collection and loop instead of chaining `||` conditions. Easier to extend, less repetition, and reads as data rather than logic.
+
+```cpp
+// BAD - repetitive chain, hard to extend:
+if (_wcsicmp(name, L"Narrator.exe") == 0
+	|| _wcsicmp(name, L"nvda.exe") == 0
+	|| _wcsicmp(name, L"jfw.exe") == 0
+	|| _wcsicmp(name, L"Zt.exe") == 0) {
+
+// GOOD - data-driven, easy to extend:
+const auto list = std::array{
+	L"Narrator.exe",
+	L"nvda.exe",
+	L"jfw.exe",
+	L"Zt.exe",
+};
+for (const auto &entry : list) {
+	if (_wcsicmp(name, entry) == 0) {
+		return true;
+	}
+}
+```
+
+## Use !isHidden() for logic checks, not isVisible()
+
+When you call `show()` / `hide()` / `setVisible()` on a widget and later branch on that state, always check `!isHidden()` (the widget's own flag) — never `isVisible()`. `isVisible()` returns `true` only when the widget **and every ancestor** are visible, so it silently returns `false` during parent show-animations, before the parent is laid out, etc. `isHidden()` reflects exactly the flag you set.
+
+```cpp
+// BAD — breaks when parent is still animating / not yet shown:
+child->setVisible(true);
+// ... later, in resizeGetHeight or similar:
+if (child->isVisible()) {   // false if parent isn't visible yet!
+    child->moveToRight(x, y, w);
+}
+
+// GOOD — checks the widget's own state:
+if (!child->isHidden()) {
+    child->moveToRight(x, y, w);
+}
+```
+
+The same applies to any logic that depends on a previous `show()`/`hide()` call: skip blocks, layout branches, opacity decisions, etc.
+
+## Consolidate make_state calls into a single State struct
+
+Every `make_state` is a separate heap allocation. When a function needs multiple pieces of lambda-captured mutable state, define a local `struct State` with all fields and call `make_state<State>()` once, then capture the resulting pointer everywhere.
+
+```cpp
+// BAD - two allocations:
+const auto shown = lifetime.make_state<bool>(false);
+const auto count = lifetime.make_state<int>(0);
+
+// GOOD - one allocation:
+struct State {
+	bool shown = false;
+	int count = 0;
+};
+const auto state = lifetime.make_state<State>();
+```
+
+## Use trailing return type only when the normal form is too long
+
+Prefer the normal return type form when the opening line fits comfortably, roughly around 77 characters or less. A short return type is easier to read in the normal position:
+
+```cpp
+// GOOD:
+[[nodiscard]] TextWithEntities FlattenSummaryBlocks(
+	const std::vector<Block> &blocks);
+```
+
+Do not use one-line trailing return types, and do not put the trailing return type after `)` on the same line. If trailing syntax fits on one line, the normal form is shorter:
+
+```cpp
+// BAD:
+auto ComputeTitle() -> QString;
+
+// BAD:
+[[nodiscard]] auto FlattenSummaryBlocks(
+	const std::vector<Block> &blocks) -> TextWithEntities;
+```
+
+Use `auto` with a trailing return type only when the normal opening line
+`{attributes} {return-type} {class-name::}{function-name(}` would be too long, or would force the return type onto its own line. In that case, put the arrow and return type on the next line:
+
+```cpp
+// BAD - return type orphaned on its own line:
+not_null<HistoryView::Controls::ComposeAiButton*>
+HistoryView::Controls::SetupCaptionAiButton(SetupCaptionAiButtonArgs &&args);
+
+// GOOD - long return type is visible and the function name stays on top:
+auto HistoryView::Controls::SetupCaptionAiButton(
+		SetupCaptionAiButtonArgs &&args)
+-> not_null<HistoryView::Controls::ComposeAiButton*>;
+```
+
+## Mind data structure sizes and alignment
+
+When adding fields to a class or struct, consider the memory layout. A standalone `bool` between two pointer-sized fields wastes 7 bytes to alignment padding. Review new fields for packing opportunities:
+
+- If the struct already has bitfields, pack new boolean flags as `: 1` members rather than standalone `bool`.
+- If alignment leaves a gap (e.g., an `int` followed by a pointer), consider whether a new small field can fill it.
+- For classes instantiated in large quantities (per-message, per-element, per-row), every wasted byte is multiplied thousands of times.
+
+```cpp
+// BAD - standalone bool adds 8 bytes (1 + 7 padding) before the next pointer:
+mutable bool _myFlag = false;
+mutable std::unique_ptr<Foo> _foo;
+
+// GOOD - packed into existing bitfield group, no extra bytes:
+mutable uint32 _myFlag : 1 = 0;
+```
+
+## Static member functions use PascalCase
+
+Non-static member functions use camelCase (`startBatch`, `finalize`). Static member functions use PascalCase (`ShouldTrack`, `Parse`, `Create`), matching the convention for free functions.
+
+```cpp
+// BAD - camelCase for static method:
+[[nodiscard]] static bool shouldTrack(not_null<HistoryItem*> item);
+
+// GOOD - PascalCase for static method:
+[[nodiscard]] static bool ShouldTrack(not_null<HistoryItem*> item);
+```
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index f378d925ad86dc..fc4a5690d310cf 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -16,6 +16,7 @@ add_subdirectory(lib_spellcheck)
 add_subdirectory(lib_storage)
 add_subdirectory(lib_lottie)
 add_subdirectory(lib_qr)
+add_subdirectory(lib_translate)
 add_subdirectory(lib_webrtc)
 add_subdirectory(lib_webview)
 add_subdirectory(codegen)
@@ -26,7 +27,6 @@ get_filename_component(res_loc Resources REALPATH)
 include(cmake/telegram_options.cmake)
 include(cmake/lib_ffmpeg.cmake)
 include(cmake/lib_stripe.cmake)
-include(cmake/lib_tgvoip.cmake)
 include(cmake/lib_tgcalls.cmake)
 include(cmake/lib_prisma.cmake)
 include(cmake/td_export.cmake)
@@ -34,8 +34,10 @@ include(cmake/td_iv.cmake)
 include(cmake/td_lang.cmake)
 include(cmake/td_mtproto.cmake)
 include(cmake/td_scheme.cmake)
+include(cmake/td_tde2e.cmake)
 include(cmake/td_ui.cmake)
-include(cmake/generate_appdata_changelog.cmake)
+include(cmake/telegram_apple_swift_runtime.cmake)
+include(cmake/generate_appstream_changelog.cmake)
 
 if (DESKTOP_APP_TEST_APPS)
     include(cmake/tests.cmake)
@@ -47,30 +49,19 @@ if (WIN32)
         platform/win/windows_quiethours.idl
         platform/win/windows_toastactivator.idl
     )
-
-    nuget_add_winrt(Telegram)
 endif()
 
 set_target_properties(Telegram PROPERTIES AUTOMOC ON)
 
 target_link_libraries(Telegram
 PRIVATE
-    tdesktop::lib_tgcalls_legacy
     tdesktop::lib_tgcalls
-    tdesktop::lib_tgvoip
-
-    # Order in this list defines the order of include paths in command line.
-    # We need to place desktop-app::external_minizip this early to have its
-    # include paths (usually ${PREFIX}/include/minizip) before any depend that
-    # would add ${PREFIX}/include. This path may have a different <zip.h>,
-    # for example installed by libzip (https://libzip.org).
-    desktop-app::external_minizip
-
     tdesktop::td_export
     tdesktop::td_iv
     tdesktop::td_lang
     tdesktop::td_mtproto
     tdesktop::td_scheme
+    tdesktop::td_tde2e
     tdesktop::td_ui
     desktop-app::lib_webrtc
     desktop-app::lib_base
@@ -81,11 +72,13 @@ PRIVATE
     desktop-app::lib_storage
     desktop-app::lib_lottie
     desktop-app::lib_qr
+    desktop-app::lib_translate
     desktop-app::lib_webview
     desktop-app::lib_ffmpeg
     desktop-app::lib_stripe
     desktop-app::external_rlottie
     desktop-app::external_zlib
+    desktop-app::external_minizip
     desktop-app::external_kcoreaddons
     desktop-app::external_qt_static_plugins
     desktop-app::external_qt
@@ -97,6 +90,10 @@ PRIVATE
     desktop-app::external_xxhash
 )
 
+if (NOT DESKTOP_APP_DISABLE_SWIFT6)
+    telegram_add_apple_swift_runtime(Telegram)
+endif()
+
 target_precompile_headers(Telegram PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/stdafx.h>)
 nice_target_sources(Telegram ${src_loc}
 PRIVATE
@@ -112,6 +109,8 @@ PRIVATE
     api/api_bot.h
     api/api_chat_filters.cpp
     api/api_chat_filters.h
+    api/api_chat_filters_remove_manager.cpp
+    api/api_chat_filters_remove_manager.h
     api/api_chat_invite.cpp
     api/api_chat_invite.h
     api/api_chat_links.cpp
@@ -120,12 +119,18 @@ PRIVATE
     api/api_chat_participants.h
     api/api_cloud_password.cpp
     api/api_cloud_password.h
+    data/data_search_calendar.h
+    data/data_search_calendar.cpp
     api/api_common.cpp
     api/api_common.h
     api/api_confirm_phone.cpp
     api/api_confirm_phone.h
+    api/api_compose_with_ai.cpp
+    api/api_compose_with_ai.h
     api/api_credits.cpp
     api/api_credits.h
+    api/api_credits_history_entry.cpp
+    api/api_credits_history_entry.h
     api/api_earn.cpp
     api/api_earn.h
     api/api_editing.cpp
@@ -147,12 +152,18 @@ PRIVATE
     api/api_peer_colors.h
     api/api_peer_photo.cpp
     api/api_peer_photo.h
+    api/api_peer_search.cpp
+    api/api_peer_search.h
     api/api_polls.cpp
     api/api_polls.h
     api/api_premium.cpp
     api/api_premium.h
     api/api_premium_option.cpp
     api/api_premium_option.h
+    api/api_reactions_notify_settings.cpp
+    api/api_reactions_notify_settings.h
+    api/api_read_metrics.cpp
+    api/api_read_metrics.h
     api/api_report.cpp
     api/api_report.h
     api/api_ringtones.cpp
@@ -173,8 +184,14 @@ PRIVATE
     api/api_statistics_data_deserialize.h
     api/api_statistics_sender.cpp
     api/api_statistics_sender.h
+    api/api_stickers_creator.cpp
+    api/api_stickers_creator.h
+    api/api_suggest_post.cpp
+    api/api_suggest_post.h
     api/api_text_entities.cpp
     api/api_text_entities.h
+    api/api_todo_lists.cpp
+    api/api_todo_lists.h
     api/api_toggling_media.cpp
     api/api_toggling_media.h
     api/api_transcribes.cpp
@@ -205,18 +222,24 @@ PRIVATE
     boxes/peers/add_bot_to_chat_box.h
     boxes/peers/add_participants_box.cpp
     boxes/peers/add_participants_box.h
+    boxes/peers/channel_ownership_transfer.cpp
+    boxes/peers/channel_ownership_transfer.h
     boxes/peers/choose_peer_box.cpp
     boxes/peers/choose_peer_box.h
+    boxes/peers/create_managed_bot_box.cpp
+    boxes/peers/create_managed_bot_box.h
     boxes/peers/edit_contact_box.cpp
     boxes/peers/edit_contact_box.h
     boxes/peers/edit_forum_topic_box.cpp
     boxes/peers/edit_forum_topic_box.h
-    boxes/peers/edit_linked_chat_box.cpp
-    boxes/peers/edit_linked_chat_box.h
+    boxes/peers/edit_discussion_link_box.cpp
+    boxes/peers/edit_discussion_link_box.h
     boxes/peers/edit_members_visible.cpp
     boxes/peers/edit_members_visible.h
     boxes/peers/edit_participant_box.cpp
     boxes/peers/edit_participant_box.h
+    boxes/peers/edit_tag_control.cpp
+    boxes/peers/edit_tag_control.h
     boxes/peers/edit_participants_box.cpp
     boxes/peers/edit_participants_box.h
     boxes/peers/edit_peer_color_box.cpp
@@ -244,6 +267,10 @@ PRIVATE
     boxes/peers/prepare_short_info_box.h
     boxes/peers/replace_boost_box.cpp
     boxes/peers/replace_boost_box.h
+    boxes/peers/tag_info_box.cpp
+    boxes/peers/tag_info_box.h
+    boxes/peers/verify_peers_box.cpp
+    boxes/peers/verify_peers_box.h
     boxes/about_box.cpp
     boxes/about_box.h
     boxes/about_sponsored_box.cpp
@@ -276,22 +303,30 @@ PRIVATE
     boxes/edit_caption_box.h
     boxes/edit_privacy_box.cpp
     boxes/edit_privacy_box.h
+    boxes/edit_todo_list_box.cpp
+    boxes/edit_todo_list_box.h
     boxes/gift_credits_box.cpp
     boxes/gift_credits_box.h
     boxes/gift_premium_box.cpp
     boxes/gift_premium_box.h
     boxes/language_box.cpp
     boxes/language_box.h
-    boxes/local_storage_box.cpp
-    boxes/local_storage_box.h
     boxes/max_invite_box.cpp
     boxes/max_invite_box.h
     boxes/moderate_messages_box.cpp
     boxes/moderate_messages_box.h
     boxes/peer_list_box.cpp
     boxes/peer_list_box.h
+    boxes/peer_list_scroll_cache.cpp
+    boxes/peer_list_scroll_cache.h
     boxes/peer_list_controllers.cpp
     boxes/peer_list_controllers.h
+    boxes/peer_list_section_headers.cpp
+    boxes/peer_list_section_headers.h
+    boxes/peer_list_section_index.cpp
+    boxes/peer_list_section_index.h
+    boxes/peer_list_widgets.cpp
+    boxes/peer_list_widgets.h
     boxes/peer_lists_box.cpp
     boxes/peer_lists_box.h
     boxes/passcode_box.cpp
@@ -310,6 +345,8 @@ PRIVATE
     boxes/report_messages_box.h
     boxes/ringtones_box.cpp
     boxes/ringtones_box.h
+    boxes/select_future_owner_box.cpp
+    boxes/select_future_owner_box.h
     boxes/self_destruction_box.cpp
     boxes/self_destruction_box.h
     boxes/send_credits_box.cpp
@@ -318,18 +355,42 @@ PRIVATE
     boxes/send_gif_with_caption_box.h
     boxes/send_files_box.cpp
     boxes/send_files_box.h
-    boxes/sessions_box.cpp
-    boxes/sessions_box.h
+    boxes/send_files_box_reply_header.cpp
+    boxes/send_files_box_reply_header.h
     boxes/share_box.cpp
     boxes/share_box.h
+    boxes/star_gift_auction_box.cpp
+    boxes/star_gift_auction_box.h
     boxes/star_gift_box.cpp
     boxes/star_gift_box.h
+    boxes/star_gift_cover_box.cpp
+    boxes/star_gift_cover_box.h
+    boxes/star_gift_craft_animation.cpp
+    boxes/star_gift_craft_animation.h
+    boxes/star_gift_craft_box.cpp
+    boxes/star_gift_craft_box.h
+    boxes/star_gift_preview_box.cpp
+    boxes/star_gift_preview_box.h
+    boxes/star_gift_resale_box.cpp
+    boxes/star_gift_resale_box.h
+    boxes/sticker_creator_box.cpp
+    boxes/sticker_creator_box.h
     boxes/sticker_set_box.cpp
     boxes/sticker_set_box.h
     boxes/stickers_box.cpp
     boxes/stickers_box.h
+    boxes/transfer_gift_box.cpp
+    boxes/transfer_gift_box.h
+    boxes/compose_ai_box.cpp
+    boxes/compose_ai_box.h
+    boxes/create_ai_tone_box.cpp
+    boxes/create_ai_tone_box.h
+    boxes/preview_ai_tone_box.cpp
+    boxes/preview_ai_tone_box.h
     boxes/translate_box.cpp
     boxes/translate_box.h
+    boxes/unconfirmed_auth_denied_box.cpp
+    boxes/unconfirmed_auth_denied_box.h
     boxes/url_auth_box.cpp
     boxes/url_auth_box.h
     boxes/username_box.cpp
@@ -350,12 +411,22 @@ PRIVATE
     calls/group/calls_group_members_row.h
     calls/group/calls_group_menu.cpp
     calls/group/calls_group_menu.h
+    calls/group/calls_group_message_encryption.cpp
+    calls/group/calls_group_message_encryption.h
+    calls/group/calls_group_message_field.cpp
+    calls/group/calls_group_message_field.h
+    calls/group/calls_group_messages.cpp
+    calls/group/calls_group_messages.h
+    calls/group/calls_group_messages_ui.cpp
+    calls/group/calls_group_messages_ui.h
     calls/group/calls_group_panel.cpp
     calls/group/calls_group_panel.h
     calls/group/calls_group_rtmp.cpp
     calls/group/calls_group_rtmp.h
     calls/group/calls_group_settings.cpp
     calls/group/calls_group_settings.h
+    calls/group/calls_group_stars_box.cpp
+    calls/group/calls_group_stars_box.h
     calls/group/calls_group_toasts.cpp
     calls/group/calls_group_toasts.h
     calls/group/calls_group_viewport.cpp
@@ -364,6 +435,8 @@ PRIVATE
     calls/group/calls_group_viewport_opengl.h
     calls/group/calls_group_viewport_raster.cpp
     calls/group/calls_group_viewport_raster.h
+    calls/group/calls_group_viewport_rhi.cpp
+    calls/group/calls_group_viewport_rhi.h
     calls/group/calls_group_viewport_tile.cpp
     calls/group/calls_group_viewport_tile.h
     calls/group/calls_volume_item.cpp
@@ -378,6 +451,8 @@ PRIVATE
     calls/calls_instance.h
     calls/calls_panel.cpp
     calls/calls_panel.h
+    calls/calls_panel_background.cpp
+    calls/calls_panel_background.h
     calls/calls_signal_bars.cpp
     calls/calls_signal_bars.h
     calls/calls_top_bar.cpp
@@ -388,6 +463,8 @@ PRIVATE
     calls/calls_video_bubble.h
     calls/calls_video_incoming.cpp
     calls/calls_video_incoming.h
+    calls/calls_window.cpp
+    calls/calls_window.h
     chat_helpers/compose/compose_features.h
     chat_helpers/compose/compose_show.cpp
     chat_helpers/compose/compose_show.h
@@ -401,6 +478,8 @@ PRIVATE
     chat_helpers/emoji_keywords.h
     chat_helpers/emoji_list_widget.cpp
     chat_helpers/emoji_list_widget.h
+    chat_helpers/emoji_picker_overlay.cpp
+    chat_helpers/emoji_picker_overlay.h
     chat_helpers/emoji_sets_manager.cpp
     chat_helpers/emoji_sets_manager.h
     chat_helpers/emoji_suggestions_widget.cpp
@@ -437,6 +516,11 @@ PRIVATE
     chat_helpers/ttl_media_layer_widget.h
     core/application.cpp
     core/application.h
+    core/proxy_rotation_manager.cpp
+    core/proxy_rotation_manager.h
+    core/cached_webview_availability.h
+    core/bank_card_click_handler.cpp
+    core/bank_card_click_handler.h
     core/base_integration.cpp
     core/base_integration.h
     core/changelogs.cpp
@@ -453,7 +537,21 @@ PRIVATE
     core/crash_report_window.h
     core/crash_reports.cpp
     core/crash_reports.h
+    core/credits_amount.h
     core/deadlock_detector.h
+    core/deep_links/deep_links_chats.cpp
+    core/deep_links/deep_links_chats.h
+    core/deep_links/deep_links_contacts.cpp
+    core/deep_links/deep_links_contacts.h
+    core/deep_links/deep_links_new.cpp
+    core/deep_links/deep_links_new.h
+    core/deep_links/deep_links_router.cpp
+    core/deep_links/deep_links_router.h
+    core/deep_links/deep_links_settings.cpp
+    core/deep_links/deep_links_settings.h
+    core/deep_links/deep_links_types.h
+    core/external_control.cpp
+    core/external_control.h
     core/file_utilities.cpp
     core/file_utilities.h
     core/launcher.cpp
@@ -487,10 +585,20 @@ PRIVATE
     data/components/credits.h
     data/components/factchecks.cpp
     data/components/factchecks.h
+    data/components/gift_auctions.cpp
+    data/components/gift_auctions.h
     data/components/location_pickers.cpp
     data/components/location_pickers.h
+    data/components/passkeys.cpp
+    data/components/passkeys.h
+    data/components/promo_suggestions.cpp
+    data/components/promo_suggestions.h
+    data/components/recent_inline_bots.cpp
+    data/components/recent_inline_bots.h
     data/components/recent_peers.cpp
     data/components/recent_peers.h
+    data/components/recent_shared_media_gifts.cpp
+    data/components/recent_shared_media_gifts.h
     data/components/scheduled_messages.cpp
     data/components/scheduled_messages.h
     data/components/sponsored_messages.cpp
@@ -501,6 +609,8 @@ PRIVATE
     data/notify/data_notify_settings.h
     data/notify/data_peer_notify_settings.cpp
     data/notify/data_peer_notify_settings.h
+    data/notify/data_peer_notify_volume.cpp
+    data/notify/data_peer_notify_volume.h
     data/stickers/data_custom_emoji.cpp
     data/stickers/data_custom_emoji.h
     data/stickers/data_stickers_set.cpp
@@ -510,6 +620,8 @@ PRIVATE
     data/data_abstract_sparse_ids.h
     data/data_abstract_structure.cpp
     data/data_abstract_structure.h
+    data/data_ai_compose_tones.cpp
+    data/data_ai_compose_tones.h
     data/data_audio_msg_id.cpp
     data/data_audio_msg_id.h
     data/data_auto_download.cpp
@@ -590,6 +702,7 @@ PRIVATE
     data/data_peer_bot_command.h
     data/data_peer_bot_commands.cpp
     data/data_peer_bot_commands.h
+    data/data_peer_common.h
     data/data_peer_id.cpp
     data/data_peer_id.h
     data/data_peer_values.cpp
@@ -600,6 +713,8 @@ PRIVATE
     data/data_photo_media.h
     data/data_poll.cpp
     data/data_poll.h
+    data/data_poll_messages.cpp
+    data/data_poll_messages.h
     data/data_premium_limits.cpp
     data/data_premium_limits.h
     data/data_pts_waiter.cpp
@@ -611,6 +726,8 @@ PRIVATE
     data/data_report.h
     data/data_saved_messages.cpp
     data/data_saved_messages.h
+    data/data_saved_music.cpp
+    data/data_saved_music.h
     data/data_saved_sublist.cpp
     data/data_saved_sublist.h
     data/data_search_controller.cpp
@@ -623,6 +740,8 @@ PRIVATE
     data/data_shared_media.h
     data/data_sparse_ids.cpp
     data/data_sparse_ids.h
+    data/data_star_gift.cpp
+    data/data_star_gift.h
     data/data_statistics.h
     data/data_stories.cpp
     data/data_stories.h
@@ -634,8 +753,12 @@ PRIVATE
     data/data_streaming.h
     data/data_thread.cpp
     data/data_thread.h
+    data/data_todo_list.cpp
+    data/data_todo_list.h
     data/data_types.cpp
     data/data_types.h
+    data/data_unread_value.cpp
+    data/data_unread_value.h
     data/data_user.cpp
     data/data_user.h
     data/data_user_photos.cpp
@@ -664,6 +787,8 @@ PRIVATE
     dialogs/dialogs_indexed_list.h
     dialogs/dialogs_inner_widget.cpp
     dialogs/dialogs_inner_widget.h
+    dialogs/dialogs_inner_widget_accessibility.cpp
+    dialogs/dialogs_inner_widget_accessibility.h
     dialogs/dialogs_key.cpp
     dialogs/dialogs_key.h
     dialogs/dialogs_list.cpp
@@ -672,12 +797,30 @@ PRIVATE
     dialogs/dialogs_main_list.h
     dialogs/dialogs_pinned_list.cpp
     dialogs/dialogs_pinned_list.h
+    dialogs/dialogs_quick_action.cpp
+    dialogs/dialogs_quick_action.h
     dialogs/dialogs_row.cpp
     dialogs/dialogs_row.h
     dialogs/dialogs_search_from_controllers.cpp
     dialogs/dialogs_search_from_controllers.h
     dialogs/dialogs_search_tags.cpp
     dialogs/dialogs_search_tags.h
+    dialogs/dialogs_search_posts.cpp
+    dialogs/dialogs_search_posts.h
+    dialogs/dialogs_top_bar_suggestion.cpp
+    dialogs/dialogs_top_bar_suggestion.h
+    dialogs/dialogs_top_bar_suggestion_test.cpp
+    dialogs/suggestions/suggestion.cpp
+    dialogs/suggestions/suggestion.h
+    dialogs/suggestions/suggestion_birthday_contacts.cpp
+    dialogs/suggestions/suggestion_birthday_setup.cpp
+    dialogs/suggestions/suggestion_custom_promo.cpp
+    dialogs/suggestions/suggestion_gift_auctions.cpp
+    dialogs/suggestions/suggestion_low_credits_subs.cpp
+    dialogs/suggestions/suggestion_premium_grace.cpp
+    dialogs/suggestions/suggestion_premium_offer.cpp
+    dialogs/suggestions/suggestion_unreviewed_auth.cpp
+    dialogs/suggestions/suggestion_userpic_setup.cpp
     dialogs/dialogs_widget.cpp
     dialogs/dialogs_widget.h
     editor/color_picker.cpp
@@ -718,6 +861,10 @@ PRIVATE
     history/admin_log/history_admin_log_section.cpp
     history/admin_log/history_admin_log_section.h
     history/view/controls/compose_controls_common.h
+    history/view/controls/history_view_compose_ai_button.cpp
+    history/view/controls/history_view_compose_ai_button.h
+    history/view/controls/history_view_compose_ai_tooltip.cpp
+    history/view/controls/history_view_compose_ai_tooltip.h
     history/view/controls/history_view_compose_controls.cpp
     history/view/controls/history_view_compose_controls.h
     history/view/controls/history_view_compose_media_edit_manager.cpp
@@ -728,12 +875,16 @@ PRIVATE
     history/view/controls/history_view_draft_options.h
     history/view/controls/history_view_forward_panel.cpp
     history/view/controls/history_view_forward_panel.h
+    history/view/controls/history_view_suggest_options.cpp
+    history/view/controls/history_view_suggest_options.h
     history/view/controls/history_view_ttl_button.cpp
     history/view/controls/history_view_ttl_button.h
     history/view/controls/history_view_voice_record_bar.cpp
     history/view/controls/history_view_voice_record_bar.h
     history/view/controls/history_view_webpage_processor.cpp
     history/view/controls/history_view_webpage_processor.h
+    history/view/media/history_view_birthday_suggestion.cpp
+    history/view/media/history_view_birthday_suggestion.h
     history/view/media/history_view_call.cpp
     history/view/media/history_view_call.h
     history/view/media/history_view_contact.cpp
@@ -770,12 +921,18 @@ PRIVATE
     history/view/media/history_view_media_spoiler.h
     history/view/media/history_view_media_unwrapped.cpp
     history/view/media/history_view_media_unwrapped.h
+    history/view/media/history_view_no_forwards_request.cpp
+    history/view/media/history_view_no_forwards_request.h
     history/view/media/history_view_photo.cpp
     history/view/media/history_view_photo.h
     history/view/media/history_view_poll.cpp
     history/view/media/history_view_poll.h
+    history/view/media/menu/history_view_poll_menu.cpp
+    history/view/media/menu/history_view_poll_menu.h
     history/view/media/history_view_premium_gift.cpp
     history/view/media/history_view_premium_gift.h
+    history/view/media/history_view_save_document_action.cpp
+    history/view/media/history_view_save_document_action.h
     history/view/media/history_view_service_box.cpp
     history/view/media/history_view_service_box.h
     history/view/media/history_view_similar_channels.cpp
@@ -789,8 +946,14 @@ PRIVATE
     history/view/media/history_view_sticker_player_abstract.h
     history/view/media/history_view_story_mention.cpp
     history/view/media/history_view_story_mention.h
+    history/view/media/history_view_suggest_decision.cpp
+    history/view/media/history_view_suggest_decision.h
     history/view/media/history_view_theme_document.cpp
     history/view/media/history_view_theme_document.h
+    history/view/media/history_view_todo_list.cpp
+    history/view/media/history_view_todo_list.h
+    history/view/media/history_view_unique_gift.cpp
+    history/view/media/history_view_unique_gift.h
     history/view/media/history_view_userpic_suggestion.cpp
     history/view/media/history_view_userpic_suggestion.h
     history/view/media/history_view_web_page.cpp
@@ -807,12 +970,16 @@ PRIVATE
     history/view/reactions/history_view_reactions_strip.h
     history/view/reactions/history_view_reactions_tabs.cpp
     history/view/reactions/history_view_reactions_tabs.h
+    history/view/history_view_top_peers_selector.cpp
+    history/view/history_view_top_peers_selector.h
     history/view/history_view_about_view.cpp
     history/view/history_view_about_view.h
     history/view/history_view_bottom_info.cpp
     history/view/history_view_bottom_info.h
     history/view/history_view_chat_preview.cpp
     history/view/history_view_chat_preview.h
+    history/view/history_view_chat_section.cpp
+    history/view/history_view_chat_section.h
     history/view/history_view_contact_status.cpp
     history/view/history_view_contact_status.h
     history/view/history_view_context_menu.cpp
@@ -821,6 +988,14 @@ PRIVATE
     history/view/history_view_corner_buttons.h
     history/view/history_view_cursor_state.cpp
     history/view/history_view_cursor_state.h
+    history/view/history_view_drag.cpp
+    history/view/history_view_drag.h
+    history/view/history_view_draw_to_reply.cpp
+    history/view/history_view_draw_to_reply.h
+    history/view/history_view_add_poll_option.cpp
+    history/view/history_view_add_poll_option.h
+    history/view/history_view_element_overlay.cpp
+    history/view/history_view_element_overlay.h
     history/view/history_view_element.cpp
     history/view/history_view_element.h
     history/view/history_view_emoji_interactions.cpp
@@ -831,7 +1006,11 @@ PRIVATE
     history/view/history_view_fake_items.h
     history/view/history_view_group_call_bar.cpp
     history/view/history_view_group_call_bar.h
+    history/view/history_view_group_members_widget.cpp
+    history/view/history_view_group_members_widget.h
     history/view/history_view_item_preview.h
+    history/view/history_view_keyboard_text_selection.cpp
+    history/view/history_view_keyboard_text_selection.h
     history/view/history_view_list_widget.cpp
     history/view/history_view_list_widget.h
     history/view/history_view_message.cpp
@@ -847,16 +1026,22 @@ PRIVATE
     history/view/history_view_pinned_tracker.h
     history/view/history_view_quick_action.cpp
     history/view/history_view_quick_action.h
-    history/view/history_view_replies_section.cpp
-    history/view/history_view_replies_section.h
+    history/view/history_view_reaction_preview.cpp
+    history/view/history_view_reaction_preview.h
+    history/view/history_view_read_metrics_tracker.cpp
+    history/view/history_view_read_metrics_tracker.h
     history/view/history_view_reply.cpp
     history/view/history_view_reply.h
+    history/view/history_view_reply_button.cpp
+    history/view/history_view_reply_button.h
     history/view/history_view_requests_bar.cpp
     history/view/history_view_requests_bar.h
     history/view/history_view_schedule_box.cpp
     history/view/history_view_schedule_box.h
     history/view/history_view_scheduled_section.cpp
     history/view/history_view_scheduled_section.h
+    history/view/history_view_self_forwards_tagger.cpp
+    history/view/history_view_self_forwards_tagger.h
     history/view/history_view_send_action.cpp
     history/view/history_view_send_action.h
     history/view/history_view_service_message.cpp
@@ -865,8 +1050,10 @@ PRIVATE
     history/view/history_view_sponsored_click_handler.h
     history/view/history_view_sticker_toast.cpp
     history/view/history_view_sticker_toast.h
-    history/view/history_view_sublist_section.cpp
-    history/view/history_view_sublist_section.h
+    history/view/history_view_subsection_tabs.cpp
+    history/view/history_view_subsection_tabs.h
+    history/view/history_view_summary_header.cpp
+    history/view/history_view_summary_header.h
     history/view/history_view_text_helper.cpp
     history/view/history_view_text_helper.h
     history/view/history_view_transcribe_button.cpp
@@ -899,20 +1086,34 @@ PRIVATE
     history/history_item_text.h
     history/history_inner_widget.cpp
     history/history_inner_widget.h
+    history/history_inner_widget_accessibility.cpp
+    history/history_inner_widget_accessibility.h
     history/history_location_manager.cpp
     history/history_location_manager.h
+    history/history_streamed_drafts.cpp
+    history/history_streamed_drafts.h
     history/history_translation.cpp
     history/history_translation.h
     history/history_unread_things.cpp
     history/history_unread_things.h
     history/history_view_highlight_manager.cpp
     history/history_view_highlight_manager.h
+    history/history_view_pull_to_next_channel.cpp
+    history/history_view_pull_to_next_channel.h
+    history/history_view_swipe_back_session.cpp
+    history/history_view_swipe_back_session.h
     history/history_widget.cpp
     history/history_widget.h
     info/bot/earn/info_bot_earn_list.cpp
     info/bot/earn/info_bot_earn_list.h
     info/bot/earn/info_bot_earn_widget.cpp
     info/bot/earn/info_bot_earn_widget.h
+    info/bot/starref/info_bot_starref_common.cpp
+    info/bot/starref/info_bot_starref_common.h
+    info/bot/starref/info_bot_starref_join_widget.cpp
+    info/bot/starref/info_bot_starref_join_widget.h
+    info/bot/starref/info_bot_starref_setup_widget.cpp
+    info/bot/starref/info_bot_starref_setup_widget.h
     info/channel_statistics/boosts/create_giveaway_box.cpp
     info/channel_statistics/boosts/create_giveaway_box.h
     info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp
@@ -935,11 +1136,20 @@ PRIVATE
     info/downloads/info_downloads_provider.h
     info/downloads/info_downloads_widget.cpp
     info/downloads/info_downloads_widget.h
+    info/global_media/info_global_media_widget.cpp
+    info/global_media/info_global_media_widget.h
+    info/global_media/info_global_media_inner_widget.cpp
+    info/global_media/info_global_media_inner_widget.h
+    info/global_media/info_global_media_provider.cpp
+    info/global_media/info_global_media_provider.h
+    info/media/info_media_buttons.cpp
     info/media/info_media_buttons.h
     info/media/info_media_common.cpp
     info/media/info_media_common.h
     info/media/info_media_empty_widget.cpp
     info/media/info_media_empty_widget.h
+    info/media/info_media_grid_zoom.cpp
+    info/media/info_media_grid_zoom.h
     info/media/info_media_inner_widget.cpp
     info/media/info_media_inner_widget.h
     info/media/info_media_list_section.cpp
@@ -952,18 +1162,26 @@ PRIVATE
     info/media/info_media_widget.h
     info/members/info_members_widget.cpp
     info/members/info_members_widget.h
+    info/peer_gifts/info_peer_gifts_collections.cpp
+    info/peer_gifts/info_peer_gifts_collections.h
     info/peer_gifts/info_peer_gifts_common.cpp
     info/peer_gifts/info_peer_gifts_common.h
     info/peer_gifts/info_peer_gifts_widget.cpp
     info/peer_gifts/info_peer_gifts_widget.h
+    info/polls/info_polls_list_widget.cpp
+    info/polls/info_polls_list_widget.h
     info/polls/info_polls_results_inner_widget.cpp
     info/polls/info_polls_results_inner_widget.h
     info/polls/info_polls_results_widget.cpp
     info/polls/info_polls_results_widget.h
     info/profile/info_profile_actions.cpp
     info/profile/info_profile_actions.h
+    info/profile/info_profile_badge_tooltip.cpp
+    info/profile/info_profile_badge_tooltip.h
     info/profile/info_profile_badge.cpp
     info/profile/info_profile_badge.h
+    info/profile/info_profile_birthday_effect.cpp
+    info/profile/info_profile_birthday_effect.h
     info/profile/info_profile_cover.cpp
     info/profile/info_profile_cover.h
     info/profile/info_profile_emoji_status_panel.cpp
@@ -976,18 +1194,32 @@ PRIVATE
     info/profile/info_profile_members_controllers.h
     info/profile/info_profile_phone_menu.cpp
     info/profile/info_profile_phone_menu.h
-    info/profile/info_profile_text.cpp
-    info/profile/info_profile_text.h
+    info/profile/info_profile_section_stack.cpp
+    info/profile/info_profile_section_stack.h
+    info/profile/info_profile_status_label.cpp
+    info/profile/info_profile_status_label.h
+    info/profile/info_profile_top_bar.cpp
+    info/profile/info_profile_top_bar.h
     info/profile/info_profile_values.cpp
     info/profile/info_profile_values.h
     info/profile/info_profile_widget.cpp
     info/profile/info_profile_widget.h
+    info/reactions_list/info_reactions_list_widget.cpp
+    info/reactions_list/info_reactions_list_widget.h
+    info/requests_list/info_requests_list_widget.cpp
+    info/requests_list/info_requests_list_widget.h
+    info/saved/info_saved_music_common.cpp
+    info/saved/info_saved_music_common.h
+    info/saved/info_saved_music_provider.cpp
+    info/saved/info_saved_music_provider.h
+    info/saved/info_saved_music_widget.cpp
+    info/saved/info_saved_music_widget.h
     info/saved/info_saved_sublists_widget.cpp
     info/saved/info_saved_sublists_widget.h
     info/settings/info_settings_widget.cpp
     info/settings/info_settings_widget.h
-    info/similar_channels/info_similar_channels_widget.cpp
-    info/similar_channels/info_similar_channels_widget.h
+    info/similar_peers/info_similar_peers_widget.cpp
+    info/similar_peers/info_similar_peers_widget.h
     info/statistics/info_statistics_common.h
     info/statistics/info_statistics_inner_widget.cpp
     info/statistics/info_statistics_inner_widget.h
@@ -995,8 +1227,12 @@ PRIVATE
     info/statistics/info_statistics_list_controllers.h
     info/statistics/info_statistics_recent_message.cpp
     info/statistics/info_statistics_recent_message.h
+    info/statistics/info_statistics_tag.h
     info/statistics/info_statistics_widget.cpp
     info/statistics/info_statistics_widget.h
+    info/stories/info_stories_albums.cpp
+    info/stories/info_stories_albums.h
+    info/stories/info_stories_common.h
     info/stories/info_stories_inner_widget.cpp
     info/stories/info_stories_inner_widget.h
     info/stories/info_stories_provider.cpp
@@ -1031,6 +1267,10 @@ PRIVATE
     info/info_wrap_widget.h
     inline_bots/bot_attach_web_view.cpp
     inline_bots/bot_attach_web_view.h
+    inline_bots/inline_bot_confirm_prepared.cpp
+    inline_bots/inline_bot_confirm_prepared.h
+    inline_bots/inline_bot_downloads.cpp
+    inline_bots/inline_bot_downloads.h
     inline_bots/inline_bot_layout_internal.cpp
     inline_bots/inline_bot_layout_internal.h
     inline_bots/inline_bot_layout_item.cpp
@@ -1039,12 +1279,16 @@ PRIVATE
     inline_bots/inline_bot_result.h
     inline_bots/inline_bot_send_data.cpp
     inline_bots/inline_bot_send_data.h
+    inline_bots/inline_bot_storage.cpp
+    inline_bots/inline_bot_storage.h
     inline_bots/inline_results_inner.cpp
     inline_bots/inline_results_inner.h
     inline_bots/inline_results_widget.cpp
     inline_bots/inline_results_widget.h
     intro/intro_code.cpp
     intro/intro_code.h
+    intro/intro_email.cpp
+    intro/intro_email.h
     intro/intro_password_check.cpp
     intro/intro_password_check.h
     intro/intro_phone.cpp
@@ -1059,10 +1303,18 @@ PRIVATE
     intro/intro_step.h
     intro/intro_widget.cpp
     intro/intro_widget.h
+    iv/iv_cached_media.cpp
+    iv/iv_cached_media.h
+#    iv/editor/iv_editor_session.cpp
+#    iv/editor/iv_editor_session.h
     iv/iv_delegate_impl.cpp
     iv/iv_delegate_impl.h
     iv/iv_instance.cpp
     iv/iv_instance.h
+    iv/iv_rich_message_serializer.cpp
+    iv/iv_rich_message_serializer.h
+    iv/iv_rich_page.cpp
+    iv/iv_rich_page.h
     lang/lang_cloud_manager.cpp
     lang/lang_cloud_manager.h
     lang/lang_instance.cpp
@@ -1071,6 +1323,12 @@ PRIVATE
     lang/lang_numbers_animation.h
     lang/lang_translator.cpp
     lang/lang_translator.h
+    lang/translate_mtproto_provider.cpp
+    lang/translate_mtproto_provider.h
+    lang/translate_provider.cpp
+    lang/translate_provider.h
+    lang/translate_url_provider.cpp
+    lang/translate_url_provider.h
     layout/layout_document_generic_preview.cpp
     layout/layout_document_generic_preview.h
     layout/layout_item_base.cpp
@@ -1093,6 +1351,8 @@ PRIVATE
     main/session/session_show.h
     media/audio/media_audio.cpp
     media/audio/media_audio.h
+    media/audio/media_audio_edit.cpp
+    media/audio/media_audio_edit.h
     media/audio/media_audio_capture.cpp
     media/audio/media_audio_capture.h
     media/audio/media_audio_capture_common.h
@@ -1102,6 +1362,8 @@ PRIVATE
     media/audio/media_audio_loader.h
     media/audio/media_audio_loaders.cpp
     media/audio/media_audio_loaders.h
+    media/audio/media_audio_local_cache.cpp
+    media/audio/media_audio_local_cache.h
     media/audio/media_audio_track.cpp
     media/audio/media_audio_track.h
     media/audio/media_child_ffmpeg_loader.cpp
@@ -1110,6 +1372,8 @@ PRIVATE
     media/player/media_player_float.h
     media/player/media_player_instance.cpp
     media/player/media_player_instance.h
+    media/player/media_player_listen_tracker.cpp
+    media/player/media_player_listen_tracker.h
     media/player/media_player_panel.cpp
     media/player/media_player_panel.h
     media/player/media_player_volume_controller.cpp
@@ -1162,37 +1426,56 @@ PRIVATE
     media/streaming/media_streaming_player.h
     media/streaming/media_streaming_reader.cpp
     media/streaming/media_streaming_reader.h
+    media/streaming/media_streaming_round_preview.cpp
+    media/streaming/media_streaming_round_preview.h
     media/streaming/media_streaming_utility.cpp
     media/streaming/media_streaming_utility.h
     media/streaming/media_streaming_video_track.cpp
     media/streaming/media_streaming_video_track.h
+    media/streaming/media_streaming_native_frame_mac.h
     media/view/media_view_group_thumbs.cpp
     media/view/media_view_group_thumbs.h
+    media/view/media_view_open_common.cpp
+    media/view/media_view_open_common.h
     media/view/media_view_overlay_opengl.cpp
     media/view/media_view_overlay_opengl.h
     media/view/media_view_overlay_raster.cpp
     media/view/media_view_overlay_raster.h
+    media/view/media_view_overlay_rhi.cpp
+    media/view/media_view_overlay_rhi.h
+    media/view/media_view_metal_texture.h
     media/view/media_view_overlay_renderer.h
     media/view/media_view_overlay_widget.cpp
     media/view/media_view_overlay_widget.h
+    media/view/media_view_recognition_selection.cpp
+    media/view/media_view_recognition_selection.h
     media/view/media_view_pip.cpp
     media/view/media_view_pip.h
     media/view/media_view_pip_opengl.cpp
     media/view/media_view_pip_opengl.h
     media/view/media_view_pip_raster.cpp
     media/view/media_view_pip_raster.h
+    media/view/media_view_pip_rhi.cpp
+    media/view/media_view_pip_rhi.h
     media/view/media_view_pip_renderer.h
     media/view/media_view_playback_controls.cpp
     media/view/media_view_playback_controls.h
     media/view/media_view_playback_progress.cpp
     media/view/media_view_playback_progress.h
-    media/view/media_view_open_common.h
+    media/view/media_view_playback_sponsored.cpp
+    media/view/media_view_playback_sponsored.h
+    media/view/media_view_video_stream.cpp
+    media/view/media_view_video_stream.h
     media/system_media_controls_manager.h
     media/system_media_controls_manager.cpp
     menu/menu_antispam_validator.cpp
     menu/menu_antispam_validator.h
+    menu/menu_dock.cpp
+    menu/menu_dock.h
     menu/menu_item_download_files.cpp
     menu/menu_item_download_files.h
+    menu/menu_item_rate_transcribe_session.cpp
+    menu/menu_item_rate_transcribe_session.h
     menu/menu_mute.cpp
     menu/menu_mute.h
     menu/menu_send.cpp
@@ -1218,6 +1501,8 @@ PRIVATE
     mtproto/facade.h
     mtproto/mtp_instance.cpp
     mtproto/mtp_instance.h
+    mtproto/proxy_check.cpp
+    mtproto/proxy_check.h
     mtproto/sender.h
     mtproto/session.cpp
     mtproto/session.h
@@ -1226,9 +1511,17 @@ PRIVATE
     mtproto/special_config_request.cpp
     mtproto/special_config_request.h
     mtproto/type_utils.h
+    overview/overview_checkbox.cpp
+    overview/overview_checkbox.h
     overview/overview_layout.cpp
     overview/overview_layout.h
     overview/overview_layout_delegate.h
+    poll/poll_link_box.cpp
+    poll/poll_link_box.h
+    poll/poll_link_thumbnail.cpp
+    poll/poll_link_thumbnail.h
+    poll/poll_media_upload.cpp
+    poll/poll_media_upload.h
     passport/passport_encryption.cpp
     passport/passport_encryption.h
     passport/passport_form_controller.cpp
@@ -1270,10 +1563,15 @@ PRIVATE
     platform/linux/overlay_widget_linux.h
     platform/linux/specific_linux.cpp
     platform/linux/specific_linux.h
+    platform/linux/translate_provider_linux.cpp
+    platform/linux/translate_provider_linux.h
     platform/linux/tray_linux.cpp
     platform/linux/tray_linux.h
+    platform/linux/webauthn_linux.cpp
     platform/mac/file_utilities_mac.mm
     platform/mac/file_utilities_mac.h
+    platform/mac/global_menu_mac.h
+    platform/mac/global_menu_mac.mm
     platform/mac/launcher_mac.mm
     platform/mac/launcher_mac.h
     platform/mac/integration_mac.mm
@@ -1281,6 +1579,8 @@ PRIVATE
     platform/mac/mac_iconv_helper.c
     platform/mac/main_window_mac.mm
     platform/mac/main_window_mac.h
+    platform/mac/native_event_mac.h
+    platform/mac/native_event_mac.mm
     platform/mac/notifications_manager_mac.mm
     platform/mac/notifications_manager_mac.h
     platform/mac/overlay_widget_mac.h
@@ -1289,8 +1589,11 @@ PRIVATE
     platform/mac/specific_mac.h
     platform/mac/specific_mac_p.mm
     platform/mac/specific_mac_p.h
-    platform/mac/tray_mac.mm
+    platform/mac/translate_provider_mac.h
+    platform/mac/translate_provider_mac.mm
     platform/mac/tray_mac.h
+    platform/mac/tray_mac.mm
+    platform/mac/webauthn_mac.mm
     platform/mac/window_title_mac.mm
     platform/mac/touchbar/items/mac_formatter_item.h
     platform/mac/touchbar/items/mac_formatter_item.mm
@@ -1323,14 +1626,18 @@ PRIVATE
     platform/win/overlay_widget_win.h
     platform/win/specific_win.cpp
     platform/win/specific_win.h
+    platform/win/translate_provider_win.h
     platform/win/tray_win.cpp
     platform/win/tray_win.h
+    platform/win/webauthn_win.cpp
     platform/win/windows_app_user_model_id.cpp
     platform/win/windows_app_user_model_id.h
     platform/win/windows_dlls.cpp
     platform/win/windows_dlls.h
     platform/win/windows_autostart_task.cpp
     platform/win/windows_autostart_task.h
+    platform/win/windows_taskbar_buttons.cpp
+    platform/win/windows_taskbar_buttons.h
     platform/win/windows_toast_activator.cpp
     platform/win/windows_toast_activator.h
     platform/platform_file_utilities.h
@@ -1342,14 +1649,10 @@ PRIVATE
     platform/platform_overlay_widget.cpp
     platform/platform_overlay_widget.h
     platform/platform_specific.h
+    platform/platform_translate_provider.h
     platform/platform_tray.h
+    platform/platform_webauthn.h
     platform/platform_window_title.h
-    profile/profile_back_button.cpp
-    profile/profile_back_button.h
-    profile/profile_block_group_members.cpp
-    profile/profile_block_group_members.h
-    profile/profile_block_peer_list.cpp
-    profile/profile_block_peer_list.h
     profile/profile_block_widget.cpp
     profile/profile_block_widget.h
     profile/profile_cover_drop_area.cpp
@@ -1374,8 +1677,6 @@ PRIVATE
     settings/business/settings_recipients_helper.h
     settings/business/settings_working_hours.cpp
     settings/business/settings_working_hours.h
-    settings/cloud_password/settings_cloud_password_common.cpp
-    settings/cloud_password/settings_cloud_password_common.h
     settings/cloud_password/settings_cloud_password_email.cpp
     settings/cloud_password/settings_cloud_password_email.h
     settings/cloud_password/settings_cloud_password_email_confirm.cpp
@@ -1384,59 +1685,87 @@ PRIVATE
     settings/cloud_password/settings_cloud_password_hint.h
     settings/cloud_password/settings_cloud_password_input.cpp
     settings/cloud_password/settings_cloud_password_input.h
+    settings/cloud_password/settings_cloud_password_login_email.cpp
+    settings/cloud_password/settings_cloud_password_login_email.h
+    settings/cloud_password/settings_cloud_password_login_email_confirm.cpp
+    settings/cloud_password/settings_cloud_password_login_email_confirm.h
     settings/cloud_password/settings_cloud_password_manage.cpp
     settings/cloud_password/settings_cloud_password_manage.h
     settings/cloud_password/settings_cloud_password_start.cpp
     settings/cloud_password/settings_cloud_password_start.h
-    settings/settings_advanced.cpp
-    settings/settings_advanced.h
-    settings/settings_blocked_peers.cpp
-    settings/settings_blocked_peers.h
-    settings/settings_business.cpp
-    settings/settings_business.h
-    settings/settings_chat.cpp
-    settings/settings_chat.h
-    settings/settings_calls.cpp
-    settings/settings_calls.h
+    settings/cloud_password/settings_cloud_password_step.cpp
+    settings/cloud_password/settings_cloud_password_step.h
+    settings/cloud_password/settings_cloud_password_validate_icon.cpp
+    settings/cloud_password/settings_cloud_password_validate_icon.h
+    settings/sections/settings_active_sessions.cpp
+    settings/sections/settings_active_sessions.h
+    settings/sections/settings_advanced.cpp
+    settings/sections/settings_advanced.h
+    settings/sections/settings_chat.cpp
+    settings/sections/settings_chat.h
+    settings/sections/settings_blocked_peers.cpp
+    settings/sections/settings_blocked_peers.h
+    settings/sections/settings_business.cpp
+    settings/sections/settings_business.h
+    settings/sections/settings_calls.cpp
+    settings/sections/settings_calls.h
     settings/settings_codes.cpp
     settings/settings_codes.h
     settings/settings_common_session.cpp
     settings/settings_common_session.h
-    settings/settings_credits.cpp
-    settings/settings_credits.h
+    settings/detailed_settings_button.cpp
+    settings/detailed_settings_button.h
+    settings/sections/settings_credits.cpp
+    settings/sections/settings_credits.h
     settings/settings_credits_graphics.cpp
     settings/settings_credits_graphics.h
     settings/settings_experimental.cpp
     settings/settings_experimental.h
-    settings/settings_folders.cpp
-    settings/settings_folders.h
-    settings/settings_global_ttl.cpp
-    settings/settings_global_ttl.h
-    settings/settings_information.cpp
-    settings/settings_information.h
+    settings/sections/settings_folders.cpp
+    settings/sections/settings_folders.h
+    settings/sections/settings_global_ttl.cpp
+    settings/sections/settings_global_ttl.h
+    settings/sections/settings_information.cpp
+    settings/sections/settings_information.h
     settings/settings_intro.cpp
     settings/settings_intro.h
-    settings/settings_local_passcode.cpp
-    settings/settings_local_passcode.h
-    settings/settings_main.cpp
-    settings/settings_main.h
-    settings/settings_notifications.cpp
-    settings/settings_notifications.h
-    settings/settings_notifications_type.cpp
-    settings/settings_notifications_type.h
+    settings/sections/settings_local_passcode.cpp
+    settings/sections/settings_local_passcode.h
+    settings/sections/settings_local_storage.cpp
+    settings/sections/settings_local_storage.h
+    settings/sections/settings_main.cpp
+    settings/sections/settings_main.h
+    settings/settings_recent_searches.cpp
+    settings/settings_recent_searches.h
+    settings/settings_search.cpp
+    settings/settings_search.h
+    settings/settings_faq_suggestions.cpp
+    settings/settings_faq_suggestions.h
+    settings/settings_builder.cpp
+    settings/settings_builder.h
+    settings/sections/settings_notifications.cpp
+    settings/sections/settings_notifications.h
+    settings/sections/settings_privacy_security.cpp
+    settings/sections/settings_privacy_security.h
+    settings/sections/settings_notifications_reactions.cpp
+    settings/sections/settings_notifications_reactions.h
+    settings/sections/settings_notifications_type.cpp
+    settings/sections/settings_notifications_type.h
+    settings/sections/settings_passkeys.cpp
+    settings/sections/settings_passkeys.h
     settings/settings_power_saving.cpp
     settings/settings_power_saving.h
-    settings/settings_premium.cpp
-    settings/settings_premium.h
+    settings/sections/settings_premium.cpp
+    settings/sections/settings_premium.h
     settings/settings_privacy_controllers.cpp
     settings/settings_privacy_controllers.h
-    settings/settings_privacy_security.cpp
-    settings/settings_privacy_security.h
     settings/settings_scale_preview.cpp
     settings/settings_scale_preview.h
     settings/settings_type.h
-    settings/settings_websites.cpp
-    settings/settings_websites.h
+    settings/sections/settings_shortcuts.cpp
+    settings/sections/settings_shortcuts.h
+    settings/sections/settings_websites.cpp
+    settings/sections/settings_websites.h
     storage/details/storage_file_utilities.cpp
     storage/details/storage_file_utilities.h
     storage/details/storage_settings_scheme.cpp
@@ -1489,8 +1818,12 @@ PRIVATE
     support/support_preload.h
     support/support_templates.cpp
     support/support_templates.h
+    tde2e/tde2e_integration.cpp
+    tde2e/tde2e_integration.h
     ui/boxes/edit_invite_link_session.cpp
     ui/boxes/edit_invite_link_session.h
+    ui/boxes/emoji_stake_box.cpp
+    ui/boxes/emoji_stake_box.h
     ui/boxes/peer_qr_box.cpp
     ui/boxes/peer_qr_box.h
     ui/chat/attach/attach_item_single_file_preview.cpp
@@ -1501,14 +1834,26 @@ PRIVATE
     ui/chat/choose_send_as.h
     ui/chat/choose_theme_controller.cpp
     ui/chat/choose_theme_controller.h
+    ui/chat/sponsored_message_bar.cpp
+    ui/chat/sponsored_message_bar.h
+    ui/controls/compose_ai_button_factory.cpp
+    ui/controls/compose_ai_button_factory.h
+    ui/controls/custom_emoji_toast_icon.cpp
+    ui/controls/custom_emoji_toast_icon.h
     ui/controls/emoji_button_factory.cpp
     ui/controls/emoji_button_factory.h
     ui/controls/location_picker.cpp
     ui/controls/location_picker.h
     ui/controls/silent_toggle.cpp
     ui/controls/silent_toggle.h
+    ui/controls/table_rows.cpp
+    ui/controls/table_rows.h
     ui/controls/userpic_button.cpp
     ui/controls/userpic_button.h
+    ui/controls/warning_tooltip.cpp
+    ui/controls/warning_tooltip.h
+    ui/effects/animated_string.cpp
+    ui/effects/animated_string.h
     ui/effects/credits_graphics.cpp
     ui/effects/credits_graphics.h
     ui/effects/emoji_fly_animation.cpp
@@ -1518,8 +1863,18 @@ PRIVATE
     ui/effects/message_sending_animation_controller.h
     ui/effects/reaction_fly_animation.cpp
     ui/effects/reaction_fly_animation.h
+    ui/effects/thanos_effect.cpp
+    ui/effects/thanos_effect.h
+    ui/effects/thanos_effect_controller.cpp
+    ui/effects/thanos_effect_controller.h
+    ui/effects/thanos_effect_renderer.cpp
+    ui/effects/thanos_effect_renderer.h
+    ui/effects/thanos_effect_session.cpp
+    ui/effects/thanos_effect_session.h
     ui/effects/send_action_animations.cpp
     ui/effects/send_action_animations.h
+    ui/effects/voice_once_particles.cpp
+    ui/effects/voice_once_particles.h
     ui/image/image.cpp
     ui/image/image.h
     ui/image/image_location.cpp
@@ -1530,8 +1885,10 @@ PRIVATE
     ui/text/format_song_document_name.h
     ui/widgets/expandable_peer_list.cpp
     ui/widgets/expandable_peer_list.h
-    ui/widgets/label_with_custom_emoji.cpp
-    ui/widgets/label_with_custom_emoji.h
+    ui/widgets/chat_filters_tabs_strip.cpp
+    ui/widgets/chat_filters_tabs_strip.h
+    ui/widgets/peer_bubble.cpp
+    ui/widgets/peer_bubble.h
     ui/countryinput.cpp
     ui/countryinput.h
     ui/dynamic_thumbnails.cpp
@@ -1543,10 +1900,12 @@ PRIVATE
     ui/item_text_options.cpp
     ui/item_text_options.h
     ui/resize_area.h
-    ui/search_field_controller.cpp
-    ui/search_field_controller.h
+    ui/top_background_gradient.cpp
+    ui/top_background_gradient.h
     ui/unread_badge.cpp
     ui/unread_badge.h
+    ui/peer/video_userpic_player.cpp
+    ui/peer/video_userpic_player.h
     window/main_window.cpp
     window/main_window.h
     window/notifications_manager.cpp
@@ -1562,6 +1921,8 @@ PRIVATE
     window/window_adaptive.h
     window/window_chat_preview.cpp
     window/window_chat_preview.h
+    window/window_chat_switch_process.cpp
+    window/window_chat_switch_process.h
     window/window_connecting_widget.cpp
     window/window_connecting_widget.h
     window/window_controller.cpp
@@ -1583,9 +1944,12 @@ PRIVATE
     window/window_section_common.h
     window/window_separate_id.cpp
     window/window_separate_id.h
+    window/session/window_session_media.cpp
     window/window_session_controller.cpp
     window/window_session_controller.h
     window/window_session_controller_link_info.h
+    window/window_setup_email.cpp
+    window/window_setup_email.h
     window/window_top_bar_wrap.h
     window/themes/window_theme.cpp
     window/themes/window_theme.h
@@ -1618,10 +1982,25 @@ PRIVATE
     settings.cpp
     settings.h
     stdafx.h
+    tray_accounts_menu.h
     tray.cpp
     tray.h
 )
 
+if (APPLE)
+    nice_target_sources(Telegram ${src_loc}
+    PRIVATE
+        tray_accounts_menu.cpp
+        media/view/media_view_metal_texture.mm
+        media/streaming/media_streaming_native_frame_mac.mm
+    )
+else()
+    nice_target_sources(Telegram ${src_loc}
+    PRIVATE
+        tray_accounts_menu_dummy.cpp
+    )
+endif()
+
 if (NOT build_winstore)
     remove_target_sources(Telegram ${src_loc}
         platform/win/windows_start_task.cpp
@@ -1648,7 +2027,6 @@ PRIVATE
     qrc/emoji_preview.qrc
     qrc/telegram/animations.qrc
     qrc/telegram/export.qrc
-    qrc/telegram/iv.qrc
     qrc/telegram/picker.qrc
     qrc/telegram/telegram.qrc
     qrc/telegram/sounds.qrc
@@ -1659,6 +2037,9 @@ PRIVATE
     numbers.txt
 )
 
+include(cmake/qrhi_shaders.cmake)
+include(cmake/generate_models.cmake)
+
 if (APPLE AND NOT build_macstore)
     nice_target_sources(Telegram ${res_loc}
     PRIVATE
@@ -1679,6 +2060,12 @@ if (WIN32)
     # COMMENT
     #     $<IF:${release},"Appending compatibility manifest.","Finalizing build.">
     # )
+
+    if (QT_VERSION LESS 6)
+        target_link_libraries(Telegram PRIVATE desktop-app::win_directx_helper)
+    endif()
+
+    target_link_options(Telegram PRIVATE /PDBPAGESIZE:8192)
 elseif (APPLE)
     if (NOT DESKTOP_APP_USE_PACKAGED)
         target_link_libraries(Telegram PRIVATE desktop-app::external_iconv)
@@ -1743,22 +2130,31 @@ elseif (APPLE)
         COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Resources
         COMMAND cp ${CMAKE_BINARY_DIR}/lib_ui.rcc $<TARGET_FILE_DIR:Telegram>/../Resources
         COMMAND cp ${CMAKE_BINARY_DIR}/lib_spellcheck.rcc $<TARGET_FILE_DIR:Telegram>/../Resources
+        COMMAND cp ${CMAKE_BINARY_DIR}/external_microtex_bundled.rcc $<TARGET_FILE_DIR:Telegram>/../Resources
     )
     if (NOT build_macstore AND NOT DESKTOP_APP_DISABLE_CRASH_REPORTS)
-        if (DESKTOP_APP_MAC_ARCH STREQUAL "x86_64" OR DESKTOP_APP_MAC_ARCH STREQUAL "arm64")
-            set(crashpad_dir_part ".${DESKTOP_APP_MAC_ARCH}")
+        if (DESKTOP_APP_USE_PACKAGED)
+            find_program(CRASHPAD_HANDLER crashpad_handler REQUIRED)
+        elseif (DESKTOP_APP_MAC_ARCH STREQUAL "x86_64" OR DESKTOP_APP_MAC_ARCH STREQUAL "arm64")
+            set(CRASHPAD_HANDLER "${libs_loc}/crashpad/out/$<IF:$<CONFIG:Debug>,Debug,Release>.${DESKTOP_APP_MAC_ARCH}/crashpad_handler")
         else()
-            set(crashpad_dir_part "")
+            set(CRASHPAD_HANDLER "${libs_loc}/crashpad/out/$<IF:$<CONFIG:Debug>,Debug,Release>/crashpad_handler")
         endif()
         add_custom_command(TARGET Telegram
         PRE_LINK
             COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Helpers
-            COMMAND cp ${libs_loc}/crashpad/out/$<IF:$<CONFIG:Debug>,Debug,Release>${crashpad_dir_part}/crashpad_handler $<TARGET_FILE_DIR:Telegram>/../Helpers/
+            COMMAND cp ${CRASHPAD_HANDLER} $<TARGET_FILE_DIR:Telegram>/../Helpers/
         )
     endif()
 else()
+    nice_target_sources(Telegram ${res_loc}
+    PRIVATE
+        qrc/telegram/bot_webview_shell.qrc
+    )
+
     include(${cmake_helpers_loc}/external/glib/generate_dbus.cmake)
     generate_dbus(Telegram org.freedesktop.portal. XdpBackground ${third_party_loc}/xdg-desktop-portal/data/org.freedesktop.portal.Background.xml)
+    generate_dbus(Telegram org.freedesktop.portal. FlatpakPortal ${src_loc}/platform/linux/org.freedesktop.portal.Flatpak.xml)
     generate_dbus(Telegram org.freedesktop. XdgNotifications ${src_loc}/platform/linux/org.freedesktop.Notifications.xml)
 
     if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
@@ -1773,8 +2169,9 @@ if (build_macstore)
     set(bundle_identifier "org.telegram.desktop")
     set(bundle_entitlements "Telegram Lite.entitlements")
     set(output_name "Telegram Lite")
-    set_target_properties(Telegram PROPERTIES
-        XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS ${libs_loc}/breakpad/src/client/mac/build/Release
+    target_link_options(Telegram
+    PRIVATE
+        -F${libs_loc}/breakpad/src/client/mac/build/Release
     )
     target_link_frameworks(Telegram PRIVATE Breakpad)
     add_custom_command(TARGET Telegram
@@ -1792,11 +2189,7 @@ else()
         set(bundle_identifier "com.tdesktop.Telegram")
     endif()
     set(bundle_entitlements "Telegram.entitlements")
-    if (LINUX AND DESKTOP_APP_USE_PACKAGED)
-        set(output_name "telegram-desktop")
-    else()
-        set(output_name "Telegram")
-    endif()
+    set(output_name "Telegram")
 endif()
 
 if (CMAKE_GENERATOR STREQUAL Xcode)
@@ -1813,7 +2206,7 @@ set_target_properties(Telegram PROPERTIES
     XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER ${bundle_identifier}
     XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION ${desktop_app_version_string}
     XCODE_ATTRIBUTE_PRODUCT_NAME ${output_name}
-    XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME AppIcon
+    XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME Icon
     XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME YES
     XCODE_ATTRIBUTE_COMBINE_HIDPI_IMAGES YES
     XCODE_ATTRIBUTE_COPY_PHASE_STRIP NO
@@ -1838,8 +2231,9 @@ PRIVATE
     G_LOG_DOMAIN="Telegram"
 )
 
+get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if (APPLE
-    OR "${CMAKE_GENERATOR}" STREQUAL "Ninja Multi-Config"
+    OR is_multi_config
     OR NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL ""
     OR NOT "${output_name}" STREQUAL "Telegram")
     set(output_folder ${CMAKE_BINARY_DIR})
@@ -1849,7 +2243,7 @@ endif()
 
 set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})
 
-if (WIN32 AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+if (MSVC)
     target_link_libraries(Telegram
     PRIVATE
         delayimp
@@ -1862,6 +2256,7 @@ if (WIN32 AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
         /DELAYLOAD:user32.dll
         /DELAYLOAD:gdi32.dll
         /DELAYLOAD:advapi32.dll
+        /DELAYLOAD:avrt.dll
         /DELAYLOAD:shell32.dll
         /DELAYLOAD:ole32.dll
         /DELAYLOAD:oleaut32.dll
@@ -1874,6 +2269,7 @@ if (WIN32 AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
         /DELAYLOAD:crypt32.dll
         /DELAYLOAD:bcrypt.dll
         /DELAYLOAD:netapi32.dll
+        /DELAYLOAD:mpr.dll
         /DELAYLOAD:imm32.dll
         /DELAYLOAD:userenv.dll
         /DELAYLOAD:wtsapi32.dll
@@ -1899,7 +2295,7 @@ if (WIN32 AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
             /DELAYLOAD:API-MS-Win-Core-ProcessThreads-l1-1-0.dll
             /DELAYLOAD:API-MS-Win-Core-Synch-l1-2-0.dll # Synchronization.lib
             /DELAYLOAD:API-MS-Win-Core-SysInfo-l1-1-0.dll
-            /DELAYLOAD:API-MS-Win-Core-Timezone-l1-1-0.dll
+            # /DELAYLOAD:API-MS-Win-Core-Timezone-l1-1-0.dll
             /DELAYLOAD:API-MS-Win-Core-WinRT-l1-1-0.dll
             /DELAYLOAD:API-MS-Win-Core-WinRT-Error-l1-1-0.dll
             /DELAYLOAD:API-MS-Win-Core-WinRT-String-l1-1-0.dll
@@ -1946,7 +2342,7 @@ if (NOT DESKTOP_APP_DISABLE_AUTOUPDATE AND NOT build_macstore AND NOT build_wins
             base/platform/win/base_windows_safe_library.h
         )
         target_include_directories(Updater PRIVATE ${lib_base_loc})
-        if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+        if (MSVC)
             target_link_libraries(Updater
             PRIVATE
                 delayimp
@@ -1964,7 +2360,7 @@ if (NOT DESKTOP_APP_DISABLE_AUTOUPDATE AND NOT build_macstore AND NOT build_wins
         endif()
     elseif (APPLE)
         add_custom_command(TARGET Updater
-        PRE_LINK
+        POST_BUILD
             COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Frameworks
             COMMAND cp $<TARGET_FILE:Updater> $<TARGET_FILE_DIR:Telegram>/../Frameworks/
         )
@@ -1990,6 +2386,10 @@ if (NOT DESKTOP_APP_DISABLE_AUTOUPDATE AND NOT build_macstore AND NOT build_wins
             desktop-app::external_openssl
         )
 
+        if (DESKTOP_APP_USE_PACKAGED)
+            target_compile_definitions(Packer PRIVATE PACKER_USE_PACKAGED)
+        endif()
+
         set_target_properties(Packer PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})
     endif()
 elseif (build_winstore)
@@ -2012,16 +2412,25 @@ if (LINUX AND DESKTOP_APP_USE_PACKAGED)
     include(GNUInstallDirs)
     configure_file("../lib/xdg/org.telegram.desktop.service" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.service" @ONLY)
     configure_file("../lib/xdg/org.telegram.desktop.metainfo.xml" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml" @ONLY)
-    generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml")
+    generate_appstream_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml")
     install(TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}")
-    install(FILES "Resources/art/icon16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "telegram.png")
-    install(FILES "Resources/art/icon32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "telegram.png")
-    install(FILES "Resources/art/icon48.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME "telegram.png")
-    install(FILES "Resources/art/icon64.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps" RENAME "telegram.png")
-    install(FILES "Resources/art/icon128.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME "telegram.png")
-    install(FILES "Resources/art/icon256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "telegram.png")
-    install(FILES "Resources/art/icon512.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME "telegram.png")
-    install(FILES "Resources/icons/tray_monochrome.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/symbolic/apps" RENAME "telegram-symbolic.svg")
+    install(FILES "Resources/art/icon16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/art/icon16@2x.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16@2/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/art/icon32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/art/icon32@2x.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32@2/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/art/icon48.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/art/icon48@2x.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48@2/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/art/icon64.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/art/icon64@2x.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64@2/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/art/icon128.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/art/icon128@2x.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128@2/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/art/icon256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/art/icon256@2x.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256@2/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/art/icon512.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/art/icon512@2x.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512@2/apps" RENAME "org.telegram.desktop.png")
+    install(FILES "Resources/icons/tray_monochrome.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/symbolic/apps" RENAME "org.telegram.desktop-symbolic.svg")
+    install(FILES "Resources/icons/tray_monochrome_attention.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/symbolic/apps" RENAME "org.telegram.desktop-attention-symbolic.svg")
+    install(FILES "Resources/icons/tray_monochrome_mute.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/symbolic/apps" RENAME "org.telegram.desktop-mute-symbolic.svg")
     install(FILES "../lib/xdg/org.telegram.desktop.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.service" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services")
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
diff --git a/Telegram/Resources/animations/ban.tgs b/Telegram/Resources/animations/ban.tgs
new file mode 100644
index 00000000000000..1ac1aaa8a493a9
Binary files /dev/null and b/Telegram/Resources/animations/ban.tgs differ
diff --git a/Telegram/Resources/animations/cake.tgs b/Telegram/Resources/animations/cake.tgs
new file mode 100644
index 00000000000000..2d49c2066dcb62
Binary files /dev/null and b/Telegram/Resources/animations/cake.tgs differ
diff --git a/Telegram/Resources/animations/camera_outline.tgs b/Telegram/Resources/animations/camera_outline.tgs
new file mode 100644
index 00000000000000..f63db249de6cf4
Binary files /dev/null and b/Telegram/Resources/animations/camera_outline.tgs differ
diff --git a/Telegram/Resources/animations/chat/sparkles_emoji.tgs b/Telegram/Resources/animations/chat/sparkles_emoji.tgs
new file mode 100644
index 00000000000000..9a97d10b764367
Binary files /dev/null and b/Telegram/Resources/animations/chat/sparkles_emoji.tgs differ
diff --git a/Telegram/Resources/animations/chat/video_to_voice.tgs b/Telegram/Resources/animations/chat/video_to_voice.tgs
new file mode 100644
index 00000000000000..854a6c734ce31b
Binary files /dev/null and b/Telegram/Resources/animations/chat/video_to_voice.tgs differ
diff --git a/Telegram/Resources/animations/chat/voice_to_video.tgs b/Telegram/Resources/animations/chat/voice_to_video.tgs
new file mode 100644
index 00000000000000..de864f07d9cf6f
Binary files /dev/null and b/Telegram/Resources/animations/chat/voice_to_video.tgs differ
diff --git a/Telegram/Resources/animations/chat/white_flag_emoji.tgs b/Telegram/Resources/animations/chat/white_flag_emoji.tgs
new file mode 100644
index 00000000000000..4c7837d24e6ee8
Binary files /dev/null and b/Telegram/Resources/animations/chat/white_flag_emoji.tgs differ
diff --git a/Telegram/Resources/animations/cleaning_cache.tgs b/Telegram/Resources/animations/cleaning_cache.tgs
new file mode 100644
index 00000000000000..a488fd72d2c72b
Binary files /dev/null and b/Telegram/Resources/animations/cleaning_cache.tgs differ
diff --git a/Telegram/Resources/animations/cloud_password/validate.tgs b/Telegram/Resources/animations/cloud_password/validate.tgs
new file mode 100644
index 00000000000000..fd5161d885486b
Binary files /dev/null and b/Telegram/Resources/animations/cloud_password/validate.tgs differ
diff --git a/Telegram/Resources/animations/cocoon.tgs b/Telegram/Resources/animations/cocoon.tgs
new file mode 100644
index 00000000000000..9eba8213addbee
Binary files /dev/null and b/Telegram/Resources/animations/cocoon.tgs differ
diff --git a/Telegram/Resources/animations/craft_failed.tgs b/Telegram/Resources/animations/craft_failed.tgs
new file mode 100644
index 00000000000000..a64ab0a7ffaf9d
Binary files /dev/null and b/Telegram/Resources/animations/craft_failed.tgs differ
diff --git a/Telegram/Resources/animations/craft_progress.tgs b/Telegram/Resources/animations/craft_progress.tgs
new file mode 100644
index 00000000000000..7bcdbda3b276bc
Binary files /dev/null and b/Telegram/Resources/animations/craft_progress.tgs differ
diff --git a/Telegram/Resources/animations/diamond.tgs b/Telegram/Resources/animations/diamond.tgs
new file mode 100644
index 00000000000000..63d1896d9a7f14
Binary files /dev/null and b/Telegram/Resources/animations/diamond.tgs differ
diff --git a/Telegram/Resources/animations/dice/dice_6.tgs b/Telegram/Resources/animations/dice/dice_6.tgs
new file mode 100644
index 00000000000000..f151a226e7e1b3
Binary files /dev/null and b/Telegram/Resources/animations/dice/dice_6.tgs differ
diff --git a/Telegram/Resources/animations/edit_peers/direct_messages.tgs b/Telegram/Resources/animations/edit_peers/direct_messages.tgs
new file mode 100644
index 00000000000000..3a0806e1ae3274
Binary files /dev/null and b/Telegram/Resources/animations/edit_peers/direct_messages.tgs differ
diff --git a/Telegram/Resources/animations/edit_peers/topics.tgs b/Telegram/Resources/animations/edit_peers/topics.tgs
new file mode 100644
index 00000000000000..a5552a4acb86a3
Binary files /dev/null and b/Telegram/Resources/animations/edit_peers/topics.tgs differ
diff --git a/Telegram/Resources/animations/edit_peers/topics_list.tgs b/Telegram/Resources/animations/edit_peers/topics_list.tgs
new file mode 100644
index 00000000000000..d85bf7ff85b8c8
Binary files /dev/null and b/Telegram/Resources/animations/edit_peers/topics_list.tgs differ
diff --git a/Telegram/Resources/animations/edit_peers/topics_tabs.tgs b/Telegram/Resources/animations/edit_peers/topics_tabs.tgs
new file mode 100644
index 00000000000000..3a240b4c62e16e
Binary files /dev/null and b/Telegram/Resources/animations/edit_peers/topics_tabs.tgs differ
diff --git a/Telegram/Resources/animations/hello_status.tgs b/Telegram/Resources/animations/hello_status.tgs
new file mode 100644
index 00000000000000..b48182c2c11a4c
Binary files /dev/null and b/Telegram/Resources/animations/hello_status.tgs differ
diff --git a/Telegram/Resources/animations/media_forbidden.tgs b/Telegram/Resources/animations/media_forbidden.tgs
new file mode 100644
index 00000000000000..34e9808eea86d0
Binary files /dev/null and b/Telegram/Resources/animations/media_forbidden.tgs differ
diff --git a/Telegram/Resources/animations/my_gifts_empty.tgs b/Telegram/Resources/animations/my_gifts_empty.tgs
new file mode 100644
index 00000000000000..85393b18fe76b3
Binary files /dev/null and b/Telegram/Resources/animations/my_gifts_empty.tgs differ
diff --git a/Telegram/Resources/animations/no_chats.tgs b/Telegram/Resources/animations/no_chats.tgs
new file mode 100644
index 00000000000000..a30673b48a7821
Binary files /dev/null and b/Telegram/Resources/animations/no_chats.tgs differ
diff --git a/Telegram/Resources/animations/passkeys.tgs b/Telegram/Resources/animations/passkeys.tgs
new file mode 100644
index 00000000000000..62e11b25406ed3
Binary files /dev/null and b/Telegram/Resources/animations/passkeys.tgs differ
diff --git a/Telegram/Resources/animations/photo_editor/arrow.tgs b/Telegram/Resources/animations/photo_editor/arrow.tgs
new file mode 100644
index 00000000000000..9a9b65a13fef68
Binary files /dev/null and b/Telegram/Resources/animations/photo_editor/arrow.tgs differ
diff --git a/Telegram/Resources/animations/photo_editor/blur.tgs b/Telegram/Resources/animations/photo_editor/blur.tgs
new file mode 100644
index 00000000000000..3e4ca0aad8bd86
Binary files /dev/null and b/Telegram/Resources/animations/photo_editor/blur.tgs differ
diff --git a/Telegram/Resources/animations/photo_editor/eraser.tgs b/Telegram/Resources/animations/photo_editor/eraser.tgs
new file mode 100644
index 00000000000000..f8119d19daa34b
Binary files /dev/null and b/Telegram/Resources/animations/photo_editor/eraser.tgs differ
diff --git a/Telegram/Resources/animations/photo_editor/marker.tgs b/Telegram/Resources/animations/photo_editor/marker.tgs
new file mode 100644
index 00000000000000..47bdec5e1d7a1d
Binary files /dev/null and b/Telegram/Resources/animations/photo_editor/marker.tgs differ
diff --git a/Telegram/Resources/animations/photo_editor/pen.tgs b/Telegram/Resources/animations/photo_editor/pen.tgs
new file mode 100644
index 00000000000000..4c739f679a3ef8
Binary files /dev/null and b/Telegram/Resources/animations/photo_editor/pen.tgs differ
diff --git a/Telegram/Resources/animations/photo_suggest_icon.tgs b/Telegram/Resources/animations/photo_suggest_icon.tgs
new file mode 100644
index 00000000000000..d05f5648e180a8
Binary files /dev/null and b/Telegram/Resources/animations/photo_suggest_icon.tgs differ
diff --git a/Telegram/Resources/animations/profile/profile_muting.tgs b/Telegram/Resources/animations/profile/profile_muting.tgs
new file mode 100644
index 00000000000000..bdae1b5f90aff1
Binary files /dev/null and b/Telegram/Resources/animations/profile/profile_muting.tgs differ
diff --git a/Telegram/Resources/animations/profile/profile_unmuting.tgs b/Telegram/Resources/animations/profile/profile_unmuting.tgs
new file mode 100644
index 00000000000000..a1dd834d6c7f79
Binary files /dev/null and b/Telegram/Resources/animations/profile/profile_unmuting.tgs differ
diff --git a/Telegram/Resources/animations/rtmp.tgs b/Telegram/Resources/animations/rtmp.tgs
new file mode 100644
index 00000000000000..53917fd1a0b775
Binary files /dev/null and b/Telegram/Resources/animations/rtmp.tgs differ
diff --git a/Telegram/Resources/animations/settings/chat_automation.tgs b/Telegram/Resources/animations/settings/chat_automation.tgs
new file mode 100644
index 00000000000000..703ceb2e61ed84
Binary files /dev/null and b/Telegram/Resources/animations/settings/chat_automation.tgs differ
diff --git a/Telegram/Resources/animations/show_or_premium_lastseen.tgs b/Telegram/Resources/animations/show_or_premium_lastseen.tgs
new file mode 100644
index 00000000000000..1048f5806edd28
Binary files /dev/null and b/Telegram/Resources/animations/show_or_premium_lastseen.tgs differ
diff --git a/Telegram/Resources/animations/show_or_premium_readtime.tgs b/Telegram/Resources/animations/show_or_premium_readtime.tgs
new file mode 100644
index 00000000000000..ac3ea3f758ea58
Binary files /dev/null and b/Telegram/Resources/animations/show_or_premium_readtime.tgs differ
diff --git a/Telegram/Resources/animations/starref_link.tgs b/Telegram/Resources/animations/starref_link.tgs
new file mode 100644
index 00000000000000..ea630045260142
Binary files /dev/null and b/Telegram/Resources/animations/starref_link.tgs differ
diff --git a/Telegram/Resources/animations/stop.tgs b/Telegram/Resources/animations/stop.tgs
new file mode 100644
index 00000000000000..70ace96393b53c
Binary files /dev/null and b/Telegram/Resources/animations/stop.tgs differ
diff --git a/Telegram/Resources/animations/swipe_action/archive.tgs b/Telegram/Resources/animations/swipe_action/archive.tgs
new file mode 100644
index 00000000000000..73e049e69c344c
Binary files /dev/null and b/Telegram/Resources/animations/swipe_action/archive.tgs differ
diff --git a/Telegram/Resources/animations/swipe_action/delete.tgs b/Telegram/Resources/animations/swipe_action/delete.tgs
new file mode 100644
index 00000000000000..daa3a01626fc0d
Binary files /dev/null and b/Telegram/Resources/animations/swipe_action/delete.tgs differ
diff --git a/Telegram/Resources/animations/swipe_action/disabled.tgs b/Telegram/Resources/animations/swipe_action/disabled.tgs
new file mode 100644
index 00000000000000..a4fb31cb257a14
Binary files /dev/null and b/Telegram/Resources/animations/swipe_action/disabled.tgs differ
diff --git a/Telegram/Resources/animations/swipe_action/mute.tgs b/Telegram/Resources/animations/swipe_action/mute.tgs
new file mode 100644
index 00000000000000..97d7bbf68c6e7f
Binary files /dev/null and b/Telegram/Resources/animations/swipe_action/mute.tgs differ
diff --git a/Telegram/Resources/animations/swipe_action/pin.tgs b/Telegram/Resources/animations/swipe_action/pin.tgs
new file mode 100644
index 00000000000000..5fbeedbc4fb7a0
Binary files /dev/null and b/Telegram/Resources/animations/swipe_action/pin.tgs differ
diff --git a/Telegram/Resources/animations/swipe_action/read.tgs b/Telegram/Resources/animations/swipe_action/read.tgs
new file mode 100644
index 00000000000000..59b258677c082b
Binary files /dev/null and b/Telegram/Resources/animations/swipe_action/read.tgs differ
diff --git a/Telegram/Resources/animations/swipe_action/unarchive.tgs b/Telegram/Resources/animations/swipe_action/unarchive.tgs
new file mode 100644
index 00000000000000..f8a4f2108fd675
Binary files /dev/null and b/Telegram/Resources/animations/swipe_action/unarchive.tgs differ
diff --git a/Telegram/Resources/animations/swipe_action/unmute.tgs b/Telegram/Resources/animations/swipe_action/unmute.tgs
new file mode 100644
index 00000000000000..563749f53fe9db
Binary files /dev/null and b/Telegram/Resources/animations/swipe_action/unmute.tgs differ
diff --git a/Telegram/Resources/animations/swipe_action/unpin.tgs b/Telegram/Resources/animations/swipe_action/unpin.tgs
new file mode 100644
index 00000000000000..8e96e36ec92ef4
Binary files /dev/null and b/Telegram/Resources/animations/swipe_action/unpin.tgs differ
diff --git a/Telegram/Resources/animations/swipe_action/unread.tgs b/Telegram/Resources/animations/swipe_action/unread.tgs
new file mode 100644
index 00000000000000..97ce96a05f58bc
Binary files /dev/null and b/Telegram/Resources/animations/swipe_action/unread.tgs differ
diff --git a/Telegram/Resources/animations/toast/chats_archived.tgs b/Telegram/Resources/animations/toast/chats_archived.tgs
new file mode 100644
index 00000000000000..7fc3e57802c11c
Binary files /dev/null and b/Telegram/Resources/animations/toast/chats_archived.tgs differ
diff --git a/Telegram/Resources/animations/toast/chats_filter_in.tgs b/Telegram/Resources/animations/toast/chats_filter_in.tgs
new file mode 100644
index 00000000000000..aba04090d0b62d
Binary files /dev/null and b/Telegram/Resources/animations/toast/chats_filter_in.tgs differ
diff --git a/Telegram/Resources/animations/toast/contact_check.tgs b/Telegram/Resources/animations/toast/contact_check.tgs
new file mode 100644
index 00000000000000..c8f62a39a37758
Binary files /dev/null and b/Telegram/Resources/animations/toast/contact_check.tgs differ
diff --git a/Telegram/Resources/animations/toast/copy.tgs b/Telegram/Resources/animations/toast/copy.tgs
new file mode 100644
index 00000000000000..152af85f798597
Binary files /dev/null and b/Telegram/Resources/animations/toast/copy.tgs differ
diff --git a/Telegram/Resources/animations/toast/delete.tgs b/Telegram/Resources/animations/toast/delete.tgs
new file mode 100644
index 00000000000000..7925f503f0d8bc
Binary files /dev/null and b/Telegram/Resources/animations/toast/delete.tgs differ
diff --git a/Telegram/Resources/animations/toast/mute.tgs b/Telegram/Resources/animations/toast/mute.tgs
new file mode 100644
index 00000000000000..1dd6ccf0fa3a63
Binary files /dev/null and b/Telegram/Resources/animations/toast/mute.tgs differ
diff --git a/Telegram/Resources/animations/toast/pin.tgs b/Telegram/Resources/animations/toast/pin.tgs
new file mode 100644
index 00000000000000..9e12da9a10afdc
Binary files /dev/null and b/Telegram/Resources/animations/toast/pin.tgs differ
diff --git a/Telegram/Resources/animations/toast/save_to_gallery.tgs b/Telegram/Resources/animations/toast/save_to_gallery.tgs
new file mode 100644
index 00000000000000..bd9de4b9196d5a
Binary files /dev/null and b/Telegram/Resources/animations/toast/save_to_gallery.tgs differ
diff --git a/Telegram/Resources/animations/toast/save_to_music.tgs b/Telegram/Resources/animations/toast/save_to_music.tgs
new file mode 100644
index 00000000000000..6c7a66aaa86b7b
Binary files /dev/null and b/Telegram/Resources/animations/toast/save_to_music.tgs differ
diff --git a/Telegram/Resources/animations/toast/saved_messages.tgs b/Telegram/Resources/animations/toast/saved_messages.tgs
new file mode 100644
index 00000000000000..6d2cac78305883
Binary files /dev/null and b/Telegram/Resources/animations/toast/saved_messages.tgs differ
diff --git a/Telegram/Resources/animations/toast/star_premium_2.tgs b/Telegram/Resources/animations/toast/star_premium_2.tgs
new file mode 100644
index 00000000000000..141a1a68cc97b1
Binary files /dev/null and b/Telegram/Resources/animations/toast/star_premium_2.tgs differ
diff --git a/Telegram/Resources/animations/toast/tagged.tgs b/Telegram/Resources/animations/toast/tagged.tgs
new file mode 100644
index 00000000000000..7d2d20cfca90ce
Binary files /dev/null and b/Telegram/Resources/animations/toast/tagged.tgs differ
diff --git a/Telegram/Resources/animations/toast/unmute.tgs b/Telegram/Resources/animations/toast/unmute.tgs
new file mode 100644
index 00000000000000..7685f107cc7f53
Binary files /dev/null and b/Telegram/Resources/animations/toast/unmute.tgs differ
diff --git a/Telegram/Resources/animations/toast/unpin.tgs b/Telegram/Resources/animations/toast/unpin.tgs
new file mode 100644
index 00000000000000..b35563a2b18609
Binary files /dev/null and b/Telegram/Resources/animations/toast/unpin.tgs differ
diff --git a/Telegram/Resources/animations/toast/voip_invite.tgs b/Telegram/Resources/animations/toast/voip_invite.tgs
new file mode 100644
index 00000000000000..0a552e9ff7537e
Binary files /dev/null and b/Telegram/Resources/animations/toast/voip_invite.tgs differ
diff --git a/Telegram/Resources/animations/transcribe_loading.tgs b/Telegram/Resources/animations/transcribe_loading.tgs
new file mode 100644
index 00000000000000..f63b6e9a0282ce
Binary files /dev/null and b/Telegram/Resources/animations/transcribe_loading.tgs differ
diff --git a/Telegram/Resources/art/affiliate_logo.png b/Telegram/Resources/art/affiliate_logo.png
new file mode 100644
index 00000000000000..d5f9b5087d5564
Binary files /dev/null and b/Telegram/Resources/art/affiliate_logo.png differ
diff --git a/Telegram/Resources/art/cocoon.webp b/Telegram/Resources/art/cocoon.webp
new file mode 100644
index 00000000000000..060239730be9f1
Binary files /dev/null and b/Telegram/Resources/art/cocoon.webp differ
diff --git a/Telegram/Resources/art/dice/dice1.svg b/Telegram/Resources/art/dice/dice1.svg
new file mode 100644
index 00000000000000..4ab6abbe6156b8
--- /dev/null
+++ b/Telegram/Resources/art/dice/dice1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" fill="none"><path fill="#F9F8FE" d="M63.8 5c-2.1.2-4.4.8-6.6 1.5C55 7.3 53 8.2 51.4 9a557 557 0 0 0-17 8.4c-7.7 4-15.9 8.3-19.2 10.7-4 2.9-5.4 7.1-6 11.5-.5 4.4 0 8.9 0 12.2-.1 2.4-.6 11-.7 19.7-.1 8.8 0 17.8 1.4 21.1a19 19 0 0 0 6.2 8.2 51 51 0 0 0 9.1 5.4c3.1 1.5 10.8 5.7 18.8 9.5 8 3.7 16.4 7 20.9 6.8 4-.1 8.9-1.7 12-3.2 9.7-4.5 19-9.4 28.4-14.1 6.5-3.3 11.5-7.3 13.4-15 1.8-7.6 1.8-45.6.6-53.3-1-6.3-9.3-11.5-16-14.8C97.2 19 73.3 4.6 63.9 5Z"/><path fill="#C1C2D3" d="M66.2 69c0-5.9 4.2-12.7 9.4-15.3l35.2-17.5c4-2 7.2 0 7.2 4.4v46c0 6.2-4.4 13.3-9.8 16l-33 16.4c-5 2.5-9 0-9-5.5V68.9Z"/><path fill="#D8DDEB" d="M10.8 40.3c0-4.2 3-6 6.7-4.2L53 53.9c5.2 2.6 9.4 9.4 9.4 15.2v44.3c0 5.7-4 8.2-9.1 5.7l-32.8-16.4a19.4 19.4 0 0 1-9.9-15.9V40.3Z"/><path fill="#F2F1F8" d="m73.5 7.2 36 18c5.3 2.6 5.3 7 0 9.6l-35.9 18a24.1 24.1 0 0 1-19.1 0l-36-18c-5.3-2.7-5.3-7 0-9.6l35.9-18a24.1 24.1 0 0 1 19.1 0Z"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.7" d="m81 47.1-3.9 2m-4 2h-.3c-.5.4-1.2.6-1.9.9"/><path stroke="#939BAC" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.5" d="M63.8 5c-2.1.2-4.4.8-6.6 1.5C55 7.3 53 8.2 51.4 9a557 557 0 0 0-17 8.4c-7.7 4-15.9 8.3-19.2 10.7-4 2.9-5.4 7.1-6 11.5-.5 4.4 0 8.9 0 12.2-.1 2.4-.6 11-.7 19.7-.1 8.8 0 17.8 1.4 21.1a19 19 0 0 0 6.2 8.2 51 51 0 0 0 9.1 5.4c3.1 1.5 10.8 5.7 18.8 9.5 8 3.7 16.4 7 20.9 6.8 4-.1 8.9-1.7 12-3.2 9.7-4.5 19-9.4 28.4-14.1 6.5-3.3 11.5-7.3 13.4-15 1.8-7.6 1.8-45.6.6-53.3-1-6.3-9.3-11.5-16-14.8C97.2 19 73.3 4.6 63.9 5Z"/><path fill="#191919" d="M85 65.3c0 4.1-2.6 8.7-6 10.4-3.2 1.7-5.9-.3-5.9-4.4 0-4 2.7-8.6 6-10.3 3.3-1.6 6 .3 6 4.3ZM111.3 84.4c0 4-2.6 8.7-6 10.3-3.3 1.7-6-.2-6-4.3 0-4 2.8-8.7 6-10.3 3.4-1.7 6 .3 6 4.3ZM105.4 62.5c-3.4 1.7-6-.3-6-4.3s2.6-8.7 6-10.3c3.3-1.7 6 .3 6 4.3s-2.7 8.7-6 10.3ZM79 107.9c-3.2 1.6-5.9-.3-5.9-4.3 0-4.1 2.7-8.7 6-10.4 3.3-1.6 6 .3 6 4.4 0 4-2.7 8.6-6 10.3ZM43.6 65.4c0 4 2.7 8.7 6 10.3 3.3 1.7 6-.3 6-4.3 0-4.1-2.7-8.7-6-10.4-3.3-1.6-6 .3-6 4.4ZM17.3 84.4c0 4 2.7 8.7 6 10.4 3.3 1.6 6-.3 6-4.4 0-4-2.7-8.7-6-10.3-3.3-1.7-6 .3-6 4.3ZM23.3 62.6c3.3 1.6 6-.3 6-4.4 0-4-2.7-8.6-6-10.3-3.3-1.7-6 .3-6 4.3s2.7 8.7 6 10.4ZM49.6 107.9c3.3 1.6 6-.3 6-4.3s-2.7-8.7-6-10.4c-3.3-1.6-6 .3-6 4.4 0 4 2.7 8.6 6 10.3ZM30.5 74.9c0 4 2.7 8.6 6 10.3 3.3 1.6 6-.3 6-4.4 0-4-2.7-8.7-6-10.3-3.3-1.7-6 .3-6 4.4Z"/><path fill="#E72525" d="M56 30.1c-.3-2.3 3.2-4.3 8-4.4 4.6-.2 8.6 1.6 8.9 4 .3 2.3-3.3 4.3-8 4.4-4.6.2-8.6-1.6-9-4Z"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".3" stroke-width="3.1" d="M61.8 28.8s2.8-.6 5.1.2m15.3 37.6s0 1.5-1 2.9m27-15.3s0 1.5-1 2.9m-25 41.8s0 1.5-1 2.8m27-15.2s0 1.4-1 2.8m-60.5 9.4s0 1.4.9 2.8M20.3 86.2s.2 1.5 1 2.9m25.4-22.5s0 1.5.9 2.9M20.3 54.2s.2 1.5 1 2.9M34 76.9s0 1.5 1 2.9"/></svg>
\ No newline at end of file
diff --git a/Telegram/Resources/art/dice/dice2.svg b/Telegram/Resources/art/dice/dice2.svg
new file mode 100644
index 00000000000000..1e9e0c85340392
--- /dev/null
+++ b/Telegram/Resources/art/dice/dice2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" fill="none"><path fill="#F9F8FE" d="M63.8 5c-2.1.2-4.4.8-6.6 1.5C55 7.3 53 8.2 51.4 9a557 557 0 0 0-17 8.4c-7.7 4-15.9 8.3-19.2 10.7-4 2.9-5.4 7.1-6 11.5-.5 4.4 0 8.9 0 12.2-.1 2.4-.6 11-.7 19.7-.1 8.8 0 17.8 1.4 21.1a19 19 0 0 0 6.2 8.2 51 51 0 0 0 9.1 5.4c3.1 1.5 10.8 5.7 18.8 9.5 8 3.7 16.4 7 20.9 6.8 4-.1 8.9-1.7 12-3.2 9.7-4.5 19-9.4 28.4-14.1 6.5-3.3 11.5-7.3 13.4-15 1.8-7.6 1.8-45.6.6-53.3-1-6.3-9.3-11.5-16-14.8C97.2 19 73.3 4.6 63.9 5Z"/><path fill="#C1C2D3" d="M66.2 69c0-5.9 4.2-12.7 9.4-15.3l35.2-17.5c4-2 7.2 0 7.2 4.4v46c0 6.2-4.4 13.3-9.8 16l-33 16.4c-5 2.5-9 0-9-5.5V68.9Z"/><path fill="#D8DDEB" d="M10.8 40.3c0-4.2 3-6 6.7-4.2L53 53.9c5.2 2.6 9.4 9.4 9.4 15.2v44.3c0 5.7-4 8.2-9.1 5.7l-32.8-16.4a19.4 19.4 0 0 1-9.9-15.9V40.3Z"/><path fill="#F2F1F8" d="m73.5 7.2 36 18c5.3 2.6 5.3 7 0 9.6l-35.9 18a24.1 24.1 0 0 1-19.1 0l-36-18c-5.3-2.7-5.3-7 0-9.6l35.9-18a24.1 24.1 0 0 1 19.1 0Z"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.7" d="m81 47.1-3.9 2m-4 2h-.3c-.5.4-1.2.6-1.9.9"/><path stroke="#939BAC" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.5" d="M63.8 5c-2.1.2-4.4.8-6.6 1.5C55 7.3 53 8.2 51.4 9a557 557 0 0 0-17 8.4c-7.7 4-15.9 8.3-19.2 10.7-4 2.9-5.4 7.1-6 11.5-.5 4.4 0 8.9 0 12.2-.1 2.4-.6 11-.7 19.7-.1 8.8 0 17.8 1.4 21.1a19 19 0 0 0 6.2 8.2 51 51 0 0 0 9.1 5.4c3.1 1.5 10.8 5.7 18.8 9.5 8 3.7 16.4 7 20.9 6.8 4-.1 8.9-1.7 12-3.2 9.7-4.5 19-9.4 28.4-14.1 6.5-3.3 11.5-7.3 13.4-15 1.8-7.6 1.8-45.6.6-53.3-1-6.3-9.3-11.5-16-14.8C97.2 19 73.3 4.6 63.9 5Z"/><path fill="#E72525" d="M86.3 81c0-4 2.7-8.7 6-10.3 3.3-1.7 6 .2 6 4.3 0 4-2.7 8.7-6 10.3-3.3 1.7-6-.3-6-4.3Z"/><path fill="#191919" d="M43.6 97.6c0-4 2.7-6 6-4.4 3.3 1.7 6 6.3 6 10.4 0 4-2.7 6-6 4.3-3.3-1.6-6-6.3-6-10.3ZM17.3 52.2c0-4 2.7-6 6-4.3 3.3 1.7 6 6.3 6 10.3 0 4-2.7 6-6 4.4-3.3-1.7-6-6.3-6-10.4ZM36.5 85.2c-3.3-1.7-6-6.3-6-10.3 0-4 2.7-6 6-4.4 3.3 1.7 6 6.3 6 10.4 0 4-2.7 6-6 4.3ZM97.1 27.7c3 1.9 2.5 4.5-1.1 6a15 15 0 0 1-12-.5c-3-1.9-2.4-4.5 1.2-6a15 15 0 0 1 12 .5ZM45.2 26.4c3 1.8 2.5 4.5-1.1 6a15 15 0 0 1-12-.6c-3-1.8-2.4-4.5 1.2-6a15 15 0 0 1 12 .6Z"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".3" stroke-width="3.1" d="M90.2 28.6s1.5 0 3 .4m-55-1.8s1.6 0 3 .5m54 48.8s0 1.5-1 2.8M46.8 98.7s0 1.4.9 2.8M20.3 54.2s.2 1.5 1 2.9M34 76.9s0 1.5 1 2.9"/></svg>
\ No newline at end of file
diff --git a/Telegram/Resources/art/dice/dice3.svg b/Telegram/Resources/art/dice/dice3.svg
new file mode 100644
index 00000000000000..84ff3fcc134889
--- /dev/null
+++ b/Telegram/Resources/art/dice/dice3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" fill="none"><path fill="#F9F8FE" d="M63.8 5c-2.1.2-4.4.8-6.6 1.5C55 7.3 53 8.2 51.4 9a557 557 0 0 0-17 8.4c-7.7 4-15.9 8.3-19.2 10.7-4 2.9-5.4 7.1-6 11.5-.5 4.4 0 8.9 0 12.2-.1 2.4-.6 11-.7 19.7-.1 8.8 0 17.8 1.4 21.1a19 19 0 0 0 6.2 8.2 51 51 0 0 0 9.1 5.4c3.1 1.5 10.8 5.7 18.8 9.5 8 3.7 16.4 7 20.9 6.8 4-.1 8.9-1.7 12-3.2 9.7-4.5 19-9.4 28.4-14.1 6.5-3.3 11.5-7.3 13.4-15 1.8-7.6 1.8-45.6.6-53.3-1-6.3-9.3-11.5-16-14.8C97.2 19 73.3 4.6 63.9 5Z"/><path fill="#C1C2D3" d="M66.2 69c0-5.9 4.2-12.7 9.4-15.3l35.2-17.5c4-2 7.2 0 7.2 4.4v46c0 6.2-4.4 13.3-9.8 16l-33 16.4c-5 2.5-9 0-9-5.5V68.9Z"/><path fill="#D8DDEB" d="M10.8 40.3c0-4.2 3-6 6.7-4.2L53 53.9c5.2 2.6 9.4 9.4 9.4 15.2v44.3c0 5.7-4 8.2-9.1 5.7l-32.8-16.4a19.4 19.4 0 0 1-9.9-15.9V40.3Z"/><path fill="#191919" d="M79 93.2c3.3-1.6 6 .3 6 4.4 0 4-2.7 8.7-6 10.3-3.3 1.7-6-.3-6-4.3s2.7-8.7 6-10.4ZM105.3 48c3.3-1.7 6 .2 6 4.2 0 4.1-2.7 8.7-6 10.4-3.3 1.6-6-.3-6-4.4 0-4 2.7-8.6 6-10.3Z"/><path fill="#E72525" d="M36.3 70.6c3.3 1.7 6 6.3 6 10.3 0 4-2.7 6-6 4.4-3.3-1.7-6-6.3-6-10.4 0-4 2.7-6 6-4.3Z"/><path fill="#F2F1F8" d="m73.5 7.2 36 18c5.3 2.6 5.3 7 0 9.6l-35.9 18a24.1 24.1 0 0 1-19.1 0l-36-18c-5.3-2.7-5.3-7 0-9.6l35.9-18a24.1 24.1 0 0 1 19.1 0Z"/><path fill="#191919" d="M97.1 27.7c3 1.8 2.5 4.5-1.1 6a15 15 0 0 1-12-.6c-3-1.8-2.4-4.4 1.2-6a15 15 0 0 1 12 .6ZM70.8 27.3c3 1.8 2.5 4.5-1.1 6a15 15 0 0 1-12-.6c-3-1.8-2.4-4.5 1.2-6a15 15 0 0 1 12 .6ZM45.2 26.4c3 1.8 2.5 4.5-1.1 6a15 15 0 0 1-12-.6c-3-1.8-2.5-4.5 1.2-6a15 15 0 0 1 12 .6Z"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".3" stroke-width="3.1" d="M90.2 28.6s1.5 0 3 .4m-29.3-.8s1.5 0 3 .4m-28.6-1.4s1.5 0 3 .5m67 26.5s-.2 1.5-1 2.9M82.2 98.9s0 1.5-1 2.8M34 77s0 1.5 1 2.9"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.7" d="m81 47.1-3.9 2m-4 2h-.3c-.5.4-1.2.6-1.9.9"/><path stroke="#939BAC" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.5" d="M63.8 5c-2.1.2-4.4.8-6.6 1.5C55 7.3 53 8.2 51.4 9a557 557 0 0 0-17 8.4c-7.7 4-15.9 8.3-19.2 10.7-4 2.9-5.4 7.1-6 11.5-.5 4.4 0 8.9 0 12.2-.1 2.4-.6 11-.7 19.7-.1 8.8 0 17.8 1.4 21.1a19 19 0 0 0 6.2 8.2 51 51 0 0 0 9.1 5.4c3.1 1.5 10.8 5.7 18.8 9.5 8 3.7 16.4 7 20.9 6.8 4-.1 8.9-1.7 12-3.2 9.7-4.5 19-9.4 28.4-14.1 6.5-3.3 11.5-7.3 13.4-15 1.8-7.6 1.8-45.6.6-53.3-1-6.3-9.3-11.5-16-14.8C97.2 19 73.3 4.6 63.9 5Z"/></svg>
\ No newline at end of file
diff --git a/Telegram/Resources/art/dice/dice4.svg b/Telegram/Resources/art/dice/dice4.svg
new file mode 100644
index 00000000000000..dc4af3c88f651a
--- /dev/null
+++ b/Telegram/Resources/art/dice/dice4.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" fill="none"><path fill="#F9F8FE" d="M63.8 5c-2.1.2-4.4.8-6.6 1.5C55 7.3 53 8.2 51.4 9a557 557 0 0 0-17 8.4c-7.7 4-15.9 8.3-19.2 10.7-4 2.9-5.4 7.1-6 11.5-.5 4.4 0 8.9 0 12.2-.1 2.4-.6 11-.7 19.7-.1 8.8 0 17.8 1.4 21.1a19 19 0 0 0 6.2 8.2 51 51 0 0 0 9.1 5.4c3.1 1.5 10.8 5.7 18.8 9.5 8 3.7 16.4 7 20.9 6.8 4-.1 8.9-1.7 12-3.2 9.7-4.5 19-9.4 28.4-14.1 6.5-3.3 11.5-7.3 13.4-15 1.8-7.6 1.8-45.6.6-53.3-1-6.3-9.3-11.5-16-14.8C97.2 19 73.3 4.6 63.9 5Z"/><path fill="#C1C2D3" d="M66.2 69c0-5.9 4.2-12.7 9.4-15.3l35.2-17.5c4-2 7.2 0 7.2 4.4v46c0 6.2-4.4 13.3-9.8 16l-33 16.4c-5 2.5-9 0-9-5.5V68.9Z"/><path fill="#D8DDEB" d="M10.8 40.3c0-4.2 3-6 6.7-4.2L53 53.9c5.2 2.6 9.4 9.4 9.4 15.2v44.3c0 5.7-4 8.2-9.1 5.7l-32.8-16.4a19.4 19.4 0 0 1-9.9-15.9V40.3Z"/><path fill="#F2F1F8" d="m73.5 7.2 36 18c5.3 2.6 5.3 7 0 9.6l-35.9 18a24.1 24.1 0 0 1-19.1 0l-36-18c-5.3-2.7-5.3-7 0-9.6l35.9-18a24.1 24.1 0 0 1 19.1 0Z"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.7" d="m81 47.1-3.9 2m-4 2h-.3c-.5.4-1.2.6-1.9.9"/><path stroke="#939BAC" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.5" d="M63.8 5c-2.1.2-4.4.8-6.6 1.5C55 7.3 53 8.2 51.4 9a557 557 0 0 0-17 8.4c-7.7 4-15.9 8.3-19.2 10.7-4 2.9-5.4 7.1-6 11.5-.5 4.4 0 8.9 0 12.2-.1 2.4-.6 11-.7 19.7-.1 8.8 0 17.8 1.4 21.1a19 19 0 0 0 6.2 8.2 51 51 0 0 0 9.1 5.4c3.1 1.5 10.8 5.7 18.8 9.5 8 3.7 16.4 7 20.9 6.8 4-.1 8.9-1.7 12-3.2 9.7-4.5 19-9.4 28.4-14.1 6.5-3.3 11.5-7.3 13.4-15 1.8-7.6 1.8-45.6.6-53.3-1-6.3-9.3-11.5-16-14.8C97.2 19 73.3 4.6 63.9 5Z"/><path fill="#E72525" d="M36.5 85.2c-3.3-1.7-6-6.3-6-10.3 0-4 2.7-6 6-4.4 3.3 1.7 6 6.3 6 10.4 0 4-2.7 6-6 4.3Z"/><path fill="#191919" d="M79 75.7c3.3-1.6 6-6.3 6-10.3 0-4-2.7-6-6-4.3-3.3 1.6-6 6.2-6 10.3 0 4 2.7 6 6 4.3ZM105.3 94.8c3.3-1.7 6-6.3 6-10.3 0-4-2.7-6-6-4.4-3.3 1.6-6 6.3-6 10.3 0 4 2.7 6 6 4.4ZM85 97.6c0-4-2.7-6-6-4.4-3.3 1.7-6 6.3-6 10.4 0 4 2.7 6 6 4.3 3.3-1.6 6-6.3 6-10.3ZM111.3 52.3c0-4.1-2.7-6-6-4.4-3.3 1.7-6 6.3-6 10.3 0 4 2.7 6 6 4.4 3.3-1.7 6-6.3 6-10.3ZM92 85.2c3.4-1.7 6-6.3 6-10.3 0-4-2.6-6-6-4.4-3.2 1.7-6 6.3-6 10.4 0 4 2.8 6 6 4.3ZM97.1 27.7c3 1.9 2.5 4.5-1.1 6a15 15 0 0 1-12-.5c-3-1.9-2.4-4.5 1.2-6a15 15 0 0 1 12 .5ZM70.5 40.3c3 1.8 2.4 4.5-1.2 6a15 15 0 0 1-12-.6c-2.9-1.8-2.4-4.5 1.2-6a15 15 0 0 1 12 .6ZM71.6 16c3 1.9 2.5 4.6-1.1 6a15 15 0 0 1-12-.5c-3-1.8-2.4-4.5 1.2-6a15 15 0 0 1 12 .6ZM45.2 26.4c3 1.8 2.5 4.5-1.1 6a15 15 0 0 1-12-.6c-3-1.8-2.5-4.5 1.1-6a15 15 0 0 1 12 .6Z"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".3" stroke-width="3.1" d="M90.2 28.6s1.5 0 3 .4M63.6 41.1s1.5 0 3 .5m-1.9-24.7s1.5 0 3 .5m-29.4 9.8s1.5 0 3 .5m40.9 39s0 1.4-1 2.8m27-15.3s0 1.5-1 2.9m-25 41.8s0 1.5-1 2.9m27-15.3s0 1.4-1 2.8m-12-12.8s0 1.5-1 2.9M34 76.9s0 1.5 1 2.9"/></svg>
\ No newline at end of file
diff --git a/Telegram/Resources/art/dice/dice5.svg b/Telegram/Resources/art/dice/dice5.svg
new file mode 100644
index 00000000000000..cdd1efd1db262f
--- /dev/null
+++ b/Telegram/Resources/art/dice/dice5.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" fill="none"><path fill="#F9F8FE" d="M63.8 5c-2.1.2-4.4.8-6.6 1.5C55 7.3 53 8.2 51.4 9a557 557 0 0 0-17 8.4c-7.7 4-15.9 8.3-19.2 10.7-4 2.9-5.4 7.1-6 11.5-.5 4.4 0 8.9 0 12.2-.1 2.4-.6 11-.7 19.7-.1 8.8 0 17.8 1.4 21.1a19 19 0 0 0 6.2 8.2 51 51 0 0 0 9.1 5.4c3.1 1.5 10.8 5.7 18.8 9.5 8 3.7 16.4 7 20.9 6.8 4-.1 8.9-1.7 12-3.2 9.7-4.5 19-9.4 28.4-14.1 6.5-3.3 11.5-7.3 13.4-15 1.8-7.6 1.8-45.6.6-53.3-1-6.3-9.3-11.5-16-14.8C97.2 19 73.3 4.6 63.9 5Z"/><path fill="#C1C2D3" d="M66.2 69c0-5.9 4.2-12.7 9.4-15.3l35.2-17.5c4-2 7.2 0 7.2 4.4v46c0 6.2-4.4 13.3-9.8 16l-33 16.4c-5 2.5-9 0-9-5.5V68.9Z"/><path fill="#D8DDEB" d="M10.8 40.3c0-4.2 3-6 6.7-4.2L53 53.9c5.2 2.6 9.4 9.4 9.4 15.2v44.3c0 5.7-4 8.2-9.1 5.7l-32.8-16.4a19.4 19.4 0 0 1-9.9-15.9V40.3Z"/><path fill="#F2F1F8" d="m73.5 7.2 36 18c5.3 2.6 5.3 7 0 9.6l-35.9 18a24.1 24.1 0 0 1-19.1 0l-36-18c-5.3-2.7-5.3-7 0-9.6l35.9-18a24.1 24.1 0 0 1 19.1 0Z"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.7" d="m81 47.1-3.9 2m-4 2h-.3c-.5.4-1.2.6-1.9.9"/><path stroke="#939BAC" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.5" d="M63.8 5c-2.1.2-4.4.8-6.6 1.5C55 7.3 53 8.2 51.4 9a557 557 0 0 0-17 8.4c-7.7 4-15.9 8.3-19.2 10.7-4 2.9-5.4 7.1-6 11.5-.5 4.4 0 8.9 0 12.2-.1 2.4-.6 11-.7 19.7-.1 8.8 0 17.8 1.4 21.1a19 19 0 0 0 6.2 8.2 51 51 0 0 0 9.1 5.4c3.1 1.5 10.8 5.7 18.8 9.5 8 3.7 16.4 7 20.9 6.8 4-.1 8.9-1.7 12-3.2 9.7-4.5 19-9.4 28.4-14.1 6.5-3.3 11.5-7.3 13.4-15 1.8-7.6 1.8-45.6.6-53.3-1-6.3-9.3-11.5-16-14.8C97.2 19 73.3 4.6 63.9 5Z"/><path fill="#E72525" d="M42.3 80.7c0 4-2.6 6-6 4.4-3.3-1.7-6-6.3-6-10.4 0-4 2.8-6 6-4.3 3.4 1.7 6 6.3 6 10.3Z"/><path fill="#191919" d="M85 65.4c0 4-2.7 8.7-6 10.4-3.3 1.6-6-.3-6-4.4 0-4 2.7-8.6 6-10.3 3.3-1.7 6 .3 6 4.3ZM111.3 84.5c0 4-2.7 8.6-6 10.3-3.3 1.6-6-.3-6-4.3s2.7-8.7 6-10.4c3.3-1.6 6 .3 6 4.4ZM92.1 70.7c3.3-1.6 6 .3 6 4.4 0 4-2.7 8.7-6 10.3-3.3 1.7-6-.3-6-4.3s2.7-8.7 6-10.4ZM45.2 26.4c3 1.8 2.5 4.5-1.1 6a15 15 0 0 1-12-.6c-3-1.8-2.5-4.5 1.1-6a15 15 0 0 1 12 .6ZM71.6 14c3 1.9 2.5 4.6-1 6a15 15 0 0 1-12-.5c-3-1.8-2.5-4.5 1.1-6a15 15 0 0 1 12 .6ZM70.9 27.2c3 1.8 2.5 4.4-1.1 6a15 15 0 0 1-12-.6c-3-1.8-2.5-4.5 1.1-6a15 15 0 0 1 12 .6ZM70.5 40.3c3 1.8 2.4 4.5-1.2 6a15 15 0 0 1-12-.6c-2.9-1.8-2.4-4.5 1.2-6a15 15 0 0 1 12 .6ZM97.1 27.7c3 1.9 2.5 4.5-1.1 6a15 15 0 0 1-12-.6c-3-1.8-2.4-4.4 1.2-6a15 15 0 0 1 12 .6Z"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".3" stroke-width="3.1" d="M38.3 27.2s1.5 0 3 .5m23.4-12.8s1.5 0 3 .5M64 28s1.5 0 3 .5M63.4 41s1.6 0 3 .5m23.7-13s1.5 0 3 .4m-11 37.6s0 1.5-1 2.9m27 17s0 1.4-1 2.8m-12-12.8s0 1.5-1 2.9M34 76.9s0 1.5 1 2.9"/></svg>
\ No newline at end of file
diff --git a/Telegram/Resources/art/dice/dice6.svg b/Telegram/Resources/art/dice/dice6.svg
new file mode 100644
index 00000000000000..f024e88b055fe1
--- /dev/null
+++ b/Telegram/Resources/art/dice/dice6.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" fill="none"><path fill="#F9F8FE" d="M63.8 5c-2.1.2-4.4.8-6.6 1.5C55 7.3 53 8.2 51.4 9a557 557 0 0 0-17 8.4c-7.7 4-15.9 8.3-19.2 10.7-4 2.9-5.4 7.1-6 11.5-.5 4.4 0 8.9 0 12.2-.1 2.4-.6 11-.7 19.7-.1 8.8 0 17.8 1.4 21.1a19 19 0 0 0 6.2 8.2 51 51 0 0 0 9.1 5.4c3.1 1.5 10.8 5.7 18.8 9.5 8 3.7 16.4 7 20.9 6.8 4-.1 8.9-1.7 12-3.2 9.7-4.5 19-9.4 28.4-14.1 6.5-3.3 11.5-7.3 13.4-15 1.8-7.6 1.8-45.6.6-53.3-1-6.3-9.3-11.5-16-14.8C97.2 19 73.3 4.6 63.9 5Z"/><path fill="#C1C2D3" d="M66.2 69c0-5.9 4.2-12.7 9.4-15.3l35.2-17.5c4-2 7.2 0 7.2 4.4v46c0 6.2-4.4 13.3-9.8 16l-33 16.4c-5 2.5-9 0-9-5.5V68.9Z"/><path fill="#D8DDEB" d="M10.8 40.3c0-4.2 3-6 6.7-4.2L53 53.9c5.2 2.6 9.4 9.4 9.4 15.2v44.3c0 5.7-4 8.2-9.1 5.7l-32.8-16.4a19.4 19.4 0 0 1-9.9-15.9V40.3Z"/><path fill="#F2F1F8" d="m73.5 7.2 36 18c5.3 2.6 5.3 7 0 9.6l-35.9 18a24.1 24.1 0 0 1-19.1 0l-36-18c-5.3-2.7-5.3-7 0-9.6l35.9-18a24.1 24.1 0 0 1 19.1 0Z"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.7" d="m81 47.1-3.9 2m-4 2h-.3c-.5.4-1.2.6-1.9.9"/><path stroke="#939BAC" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.5" d="M63.8 5c-2.1.2-4.4.8-6.6 1.5C55 7.3 53 8.2 51.4 9a557 557 0 0 0-17 8.4c-7.7 4-15.9 8.3-19.2 10.7-4 2.9-5.4 7.1-6 11.5-.5 4.4 0 8.9 0 12.2-.1 2.4-.6 11-.7 19.7-.1 8.8 0 17.8 1.4 21.1a19 19 0 0 0 6.2 8.2 51 51 0 0 0 9.1 5.4c3.1 1.5 10.8 5.7 18.8 9.5 8 3.7 16.4 7 20.9 6.8 4-.1 8.9-1.7 12-3.2 9.7-4.5 19-9.4 28.4-14.1 6.5-3.3 11.5-7.3 13.4-15 1.8-7.6 1.8-45.6.6-53.3-1-6.3-9.3-11.5-16-14.8C97.2 19 73.3 4.6 63.9 5Z"/><path fill="#191919" d="M79 93.3c3.4-1.7 6 .2 6 4.3 0 4-2.6 8.7-6 10.3-3.2 1.7-5.9-.3-5.9-4.3s2.7-8.7 6-10.3ZM105.4 48c3.3-1.7 6 .2 6 4.2s-2.7 8.7-6 10.4c-3.3 1.6-6-.3-6-4.4 0-4 2.7-8.6 6-10.3ZM86.3 81c0-4 2.7-8.7 6-10.4 3.3-1.6 6 .3 6 4.4 0 4-2.7 8.7-6 10.3-3.3 1.7-6-.3-6-4.3ZM43.6 65.4c0 4 2.7 8.7 6 10.3 3.3 1.7 6-.3 6-4.4 0-4-2.7-8.6-6-10.3-3.3-1.6-6 .3-6 4.4ZM17.3 84.4c0 4 2.7 8.7 6 10.4 3.3 1.6 6-.3 6-4.4 0-4-2.7-8.7-6-10.3-3.3-1.7-6 .3-6 4.3ZM23.3 62.6c3.3 1.6 6-.3 6-4.4 0-4-2.7-8.7-6-10.3-3.3-1.7-6 .3-6 4.3s2.7 8.7 6 10.4ZM49.6 107.9c3.3 1.6 6-.3 6-4.3 0-4.1-2.7-8.7-6-10.4-3.3-1.6-6 .3-6 4.4 0 4 2.7 8.6 6 10.3ZM30.6 74.8c0 4.1 2.6 8.7 6 10.4 3.2 1.6 6-.3 6-4.4 0-4-2.8-8.7-6-10.3-3.4-1.7-6 .3-6 4.3ZM45.2 26.4c3 1.8 2.5 4.5-1.1 6a15 15 0 0 1-12-.6c-3-1.8-2.5-4.5 1.2-6a15 15 0 0 1 12 .6ZM71.7 14c3 1.9 2.4 4.6-1.2 6a15 15 0 0 1-12-.5c-3-1.8-2.4-4.5 1.2-6a15 15 0 0 1 12 .6ZM57.4 34c3 1.8 2.5 4.5-1.2 6a15 15 0 0 1-12-.6c-2.9-1.8-2.4-4.5 1.2-6a15 15 0 0 1 12 .6ZM84.5 20.8c3 1.8 2.5 4.5-1.1 6a15 15 0 0 1-12-.6c-3-1.8-2.4-4.5 1.2-6a15 15 0 0 1 12 .6ZM70.5 40.3c3 1.8 2.5 4.5-1.2 6a15 15 0 0 1-12-.6c-2.9-1.8-2.4-4.5 1.2-6a15 15 0 0 1 12 .6ZM97.1 28.2c3 1.8 2.5 4.5-1 6a15 15 0 0 1-12-.6c-3-1.8-2.5-4.5 1.1-6a15 15 0 0 1 12 .6Z"/><path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".3" stroke-width="3.1" d="M38.3 27.2s1.5 0 3 .5m23.4-12.8s1.5 0 3 .5M50.4 34.8s1.6 0 3 .5m24.2-13.6s1.5 0 3 .4m-17 19s1.5 0 3 .5M90.1 29s1.5 0 3 .5m15 24.7s0 1.5-1 2.9m-25 41.8s0 1.5-1 2.8m14-25.2s0 1.5-1 2.8M46.8 98.7s0 1.4.9 2.8M20.3 86.2s.2 1.5 1 2.9m25.4-22.5s0 1.5.9 2.9M20.3 54.2s.2 1.5 1 2.9M34 76.9s0 1.5 1 2.9"/></svg>
\ No newline at end of file
diff --git a/Telegram/Resources/art/premium/coin_border.png b/Telegram/Resources/art/premium/coin_border.png
new file mode 100644
index 00000000000000..03a5254f568947
Binary files /dev/null and b/Telegram/Resources/art/premium/coin_border.png differ
diff --git a/Telegram/Resources/art/premium/coin_inner.obj b/Telegram/Resources/art/premium/coin_inner.obj
new file mode 100644
index 00000000000000..03b7f0fabc0efb
--- /dev/null
+++ b/Telegram/Resources/art/premium/coin_inner.obj
@@ -0,0 +1,281 @@
+# 3D mesh decoded from .binobj (source of truth; baked back to .binobj at build time).
+# UVs are stored raw here; the V coordinate is flipped (1-v) at load time.
+v -0.332026988 24.7804127 0.521257997
+v 2.48780489 24.6208229 0.521257997
+v 5.27214098 24.1440811 0.521257997
+v 7.98604107 23.3561516 0.521257997
+v 10.5953112 22.2669773 0.521257997
+v 13.0671577 20.8902378 0.521257997
+v 15.3705359 19.2432289 0.521257997
+v 17.4764156 17.3467064 0.521256983
+v 19.3583431 15.2244949 0.521256983
+v 20.9926777 12.9032536 0.521256983
+v 22.35882 10.4122334 0.521256983
+v 23.4396133 7.78272915 0.521256983
+v 24.2214775 5.04778004 0.521256983
+v 24.6945534 2.24185109 0.521256983
+v 24.8529148 -0.599849999 0.521256983
+v 24.6945534 -3.44155097 0.52125603
+v 24.2214775 -6.24748087 0.52125603
+v 23.4396133 -8.98242855 0.52125603
+v 22.35882 -11.6119356 0.52125603
+v 20.9926777 -14.102953 0.52125603
+v 19.3583431 -16.4241962 0.52125603
+v 17.4764175 -18.5464039 0.52125603
+v 15.3705368 -20.4429264 0.52125603
+v 13.0671587 -22.0899372 0.52125603
+v 10.5953093 -23.4666748 0.52125603
+v 7.98604107 -24.5558491 0.52125603
+v 5.27214098 -25.3437786 0.521255016
+v 2.48780489 -25.8205223 0.521255016
+v -0.332026988 -25.9801102 0.521255016
+v -3.15185905 -25.8205223 0.52125603
+v -5.9361949 -25.3437786 0.52125603
+v -8.65009499 -24.5558491 0.52125603
+v -11.259366 -23.4666748 0.52125603
+v -13.7312136 -22.0899372 0.52125603
+v -16.0345917 -20.4429264 0.52125603
+v -18.1404686 -18.5464058 0.52125603
+v -20.022398 -16.4241943 0.52125603
+v -21.6567326 -14.1029539 0.52125603
+v -23.0228748 -11.6119337 0.52125603
+v -24.1036701 -8.98242855 0.52125603
+v -24.8855343 -6.24748087 0.52125603
+v -25.3586082 -3.44155097 0.521256983
+v -25.5169697 -0.599849999 0.521256983
+v -25.3586082 2.24185109 0.521256983
+v -24.8855343 5.04778004 0.521256983
+v -24.1036701 7.7827282 0.521256983
+v -23.0228767 10.4122343 0.521256983
+v -21.6567326 12.9032526 0.521256983
+v -20.0223999 15.2244949 0.521256983
+v -18.1404724 17.3467045 0.521256983
+v -16.0345917 19.2432289 0.521256983
+v -13.7312145 20.8902378 0.521257997
+v -11.2593651 22.2669773 0.521257997
+v -8.65009499 23.3561516 0.521257997
+v -5.93619394 24.1440811 0.521257997
+v -3.15185905 24.6208229 0.521257997
+v 2.48780489 24.6208229 -2.76847601
+v -0.332026988 24.7804127 -2.76847601
+v 5.27214098 24.1440811 -2.76847601
+v 7.98604107 23.3561516 -2.76847601
+v 10.5953112 22.2669773 -2.76847601
+v 13.0671577 20.8902378 -2.76847601
+v 15.3705359 19.2432289 -2.76847601
+v 17.4764156 17.3467064 -2.76847601
+v 19.3583431 15.2244949 -2.76847601
+v 20.9926777 12.9032536 -2.76847601
+v 22.35882 10.4122334 -2.76847601
+v 23.4396133 7.78272915 -2.76847696
+v 24.2214775 5.04778004 -2.76847601
+v 24.6945534 2.24185109 -2.76847696
+v 24.8529148 -0.599849999 -2.76847696
+v 24.6945534 -3.44155097 -2.76847696
+v 24.2214775 -6.24748087 -2.76847696
+v 23.4396133 -8.98242855 -2.76847696
+v 22.35882 -11.6119356 -2.76847696
+v 20.9926777 -14.102953 -2.76847792
+v 19.3583431 -16.4241962 -2.76847792
+v 17.4764175 -18.5464039 -2.76847792
+v 15.3705368 -20.4429264 -2.76847792
+v 13.0671587 -22.0899372 -2.76847792
+v 10.5953093 -23.4666748 -2.76847792
+v 7.98604107 -24.5558491 -2.76847792
+v 5.27214098 -25.3437786 -2.76847792
+v 2.48780489 -25.8205223 -2.76847792
+v -0.332026988 -25.9801102 -2.76847792
+v -3.15185905 -25.8205223 -2.76847792
+v -5.9361949 -25.3437786 -2.76847792
+v -8.65009499 -24.5558491 -2.76847792
+v -11.259366 -23.4666748 -2.76847792
+v -13.7312136 -22.0899372 -2.76847792
+v -16.0345917 -20.4429264 -2.76847792
+v -18.1404686 -18.5464058 -2.76847792
+v -20.022398 -16.4241943 -2.76847696
+v -21.6567326 -14.1029539 -2.76847792
+v -23.0228748 -11.6119337 -2.76847792
+v -24.1036701 -8.98242855 -2.76847696
+v -24.8855343 -6.24748087 -2.76847696
+v -25.3586082 -3.44155097 -2.76847696
+v -25.5169697 -0.599849999 -2.76847696
+v -25.3586082 2.24185109 -2.76847696
+v -24.8855343 5.04778004 -2.76847696
+v -24.1036701 7.7827282 -2.76847601
+v -23.0228767 10.4122343 -2.76847696
+v -21.6567326 12.9032526 -2.76847601
+v -20.0223999 15.2244949 -2.76847601
+v -18.1404724 17.3467045 -2.76847601
+v -16.0345917 19.2432289 -2.76847601
+v -13.7312145 20.8902378 -2.76847601
+v -11.2593651 22.2669773 -2.76847601
+v -8.65009499 23.3561516 -2.76847601
+v -5.9361949 24.1440811 -2.76847601
+v -3.15185905 24.6208229 -2.76847601
+vt 0.686730981 0.89130801
+vt 0.641683996 0.910112977
+vt 0.309423 0.89130801
+vt 0.354470998 0.910112977
+vt 0.401324987 0.923716009
+vt 0.594829977 0.923716009
+vt 0.546760023 0.93194598
+vt 0.498077005 0.934701025
+vt 0.449393988 0.93194598
+vt 0.266748011 0.867540002
+vt 0.226981997 0.83910501
+vt 0.729405999 0.867540002
+vt 0.190624997 0.806362987
+vt 0.805528998 0.806362987
+vt 0.158133999 0.769724011
+vt 0.838020027 0.769724011
+vt 0.866235971 0.729649007
+vt 0.129919007 0.729649007
+vt 0.106333002 0.686643004
+vt 0.889820993 0.686643004
+vt 0.0876739994 0.641246021
+vt 0.0741750002 0.594029009
+vt 0.908481002 0.641246021
+vt 0.0660080016 0.54558599
+vt 0.92197901 0.594029009
+vt 0.0632740036 0.496526003
+vt 0.930145979 0.54558599
+vt 0.0660080016 0.447465986
+vt 0.930145979 0.447465986
+vt 0.0741750002 0.399022996
+vt 0.92197901 0.399022996
+vt 0.908481002 0.351806015
+vt 0.0876739994 0.351806015
+vt 0.106333002 0.306409001
+vt 0.889820993 0.306409001
+vt 0.129919007 0.263402998
+vt 0.158133999 0.223327994
+vt 0.866235971 0.263402998
+vt 0.190624997 0.186689004
+vt 0.838020027 0.223327994
+vt 0.226981997 0.153946996
+vt 0.805528998 0.186689004
+vt 0.266748011 0.125512004
+vt 0.729405999 0.125512004
+vt 0.309423 0.101744004
+vt 0.686730981 0.101744004
+vt 0.354470998 0.0829399973
+vt 0.641683996 0.0829399973
+vt 0.401324987 0.0693370029
+vt 0.594829977 0.0693370029
+vt 0.449393988 0.0611060001
+vt 0.498077005 0.0583509989
+vt 0.546760023 0.0611060001
+vt 0.769173026 0.153946996
+vt 0.932880998 0.496526003
+vt 0.769173026 0.83910501
+vt 0.401324004 0.0693370029
+vn -0 -0 1
+vn -0 -0 -1
+f 5/1/1 4/2/1 53/3/1
+f 110/4/2 111/5/2 60/2/2
+f 3/6/1 2/7/1 55/5/1
+f 2/7/1 1/8/1 56/9/1
+f 55/5/1 2/7/1 56/9/1
+f 55/5/1 54/4/1 3/6/1
+f 54/4/1 53/3/1 4/2/1
+f 3/6/1 54/4/1 4/2/1
+f 53/3/1 52/10/1 5/1/1
+f 52/10/1 51/11/1 6/12/1
+f 5/1/1 52/10/1 6/12/1
+f 51/11/1 50/13/1 8/14/1
+f 50/13/1 49/15/1 9/16/1
+f 10/17/1 49/15/1 48/18/1
+f 48/18/1 47/19/1 11/20/1
+f 47/19/1 46/21/1 11/20/1
+f 46/21/1 45/22/1 12/23/1
+f 11/20/1 46/21/1 12/23/1
+f 45/22/1 44/24/1 13/25/1
+f 44/24/1 43/26/1 14/27/1
+f 43/26/1 42/28/1 16/29/1
+f 42/28/1 41/30/1 17/31/1
+f 18/32/1 41/30/1 40/33/1
+f 40/33/1 39/34/1 19/35/1
+f 39/34/1 38/36/1 19/35/1
+f 38/36/1 37/37/1 20/38/1
+f 19/35/1 38/36/1 20/38/1
+f 37/37/1 36/39/1 21/40/1
+f 36/39/1 35/41/1 22/42/1
+f 35/41/1 34/43/1 24/44/1
+f 34/43/1 33/45/1 25/46/1
+f 33/45/1 32/47/1 26/48/1
+f 32/47/1 31/49/1 27/50/1
+f 31/49/1 30/51/1 27/50/1
+f 30/51/1 29/52/1 28/53/1
+f 27/50/1 30/51/1 28/53/1
+f 27/50/1 26/48/1 32/47/1
+f 26/48/1 25/46/1 33/45/1
+f 25/46/1 24/44/1 34/43/1
+f 24/44/1 23/54/1 35/41/1
+f 23/54/1 22/42/1 35/41/1
+f 22/42/1 21/40/1 36/39/1
+f 21/40/1 20/38/1 37/37/1
+f 19/35/1 18/32/1 40/33/1
+f 18/32/1 17/31/1 41/30/1
+f 42/28/1 17/31/1 16/29/1
+f 16/29/1 15/55/1 43/26/1
+f 15/55/1 14/27/1 43/26/1
+f 14/27/1 13/25/1 44/24/1
+f 13/25/1 12/23/1 45/22/1
+f 11/20/1 10/17/1 48/18/1
+f 10/17/1 9/16/1 49/15/1
+f 50/13/1 9/16/1 8/14/1
+f 8/14/1 7/56/1 51/11/1
+f 7/56/1 6/12/1 51/11/1
+f 112/9/2 58/8/2 57/7/2
+f 57/7/2 59/6/2 112/9/2
+f 59/6/2 60/2/2 111/5/2
+f 112/9/2 59/6/2 111/5/2
+f 60/2/2 61/1/2 109/3/2
+f 61/1/2 62/12/2 108/10/2
+f 62/12/2 63/56/2 108/10/2
+f 63/56/2 64/14/2 107/11/2
+f 108/10/2 63/56/2 107/11/2
+f 64/14/2 65/16/2 105/15/2
+f 65/16/2 66/17/2 104/18/2
+f 66/17/2 67/20/2 104/18/2
+f 67/20/2 68/23/2 103/19/2
+f 104/18/2 67/20/2 103/19/2
+f 68/23/2 69/25/2 102/21/2
+f 69/25/2 70/27/2 101/22/2
+f 70/27/2 71/55/2 100/24/2
+f 71/55/2 72/29/2 99/26/2
+f 72/29/2 73/31/2 97/30/2
+f 73/31/2 74/32/2 96/33/2
+f 74/32/2 75/35/2 96/33/2
+f 75/35/2 76/38/2 95/34/2
+f 96/33/2 75/35/2 95/34/2
+f 76/38/2 77/40/2 93/37/2
+f 77/40/2 78/42/2 92/39/2
+f 78/42/2 79/54/2 92/39/2
+f 79/54/2 80/44/2 91/41/2
+f 92/39/2 79/54/2 91/41/2
+f 80/44/2 81/46/2 89/45/2
+f 81/46/2 82/48/2 88/47/2
+f 82/48/2 83/50/2 88/47/2
+f 83/50/2 84/53/2 87/57/2
+f 88/47/2 83/50/2 87/57/2
+f 84/53/2 85/52/2 86/51/2
+f 86/51/2 87/57/2 84/53/2
+f 88/47/2 89/45/2 81/46/2
+f 89/45/2 90/43/2 80/44/2
+f 90/43/2 91/41/2 80/44/2
+f 92/39/2 93/37/2 77/40/2
+f 93/37/2 94/36/2 76/38/2
+f 94/36/2 95/34/2 76/38/2
+f 96/33/2 97/30/2 73/31/2
+f 97/30/2 98/28/2 72/29/2
+f 98/28/2 99/26/2 72/29/2
+f 99/26/2 100/24/2 71/55/2
+f 100/24/2 101/22/2 70/27/2
+f 101/22/2 102/21/2 69/25/2
+f 102/21/2 103/19/2 68/23/2
+f 104/18/2 105/15/2 65/16/2
+f 105/15/2 106/13/2 64/14/2
+f 106/13/2 107/11/2 64/14/2
+f 108/10/2 109/3/2 61/1/2
+f 109/3/2 110/4/2 60/2/2
diff --git a/Telegram/Resources/art/premium/coin_logo.obj b/Telegram/Resources/art/premium/coin_logo.obj
new file mode 100644
index 00000000000000..66b2ba732c28eb
--- /dev/null
+++ b/Telegram/Resources/art/premium/coin_logo.obj
@@ -0,0 +1,2227 @@
+# 3D mesh decoded from .binobj (source of truth; baked back to .binobj at build time).
+# UVs are stored raw here; the V coordinate is flipped (1-v) at load time.
+v 17.7109451 -0.564248979 -3.419173
+v 17.5940895 -0.251874 -3.419173
+v 16.8931866 0.381357998 -3.419173
+v 15.5693579 1.02586401 -3.419173
+v 10.8696461 3.06970406 -3.41917109
+v -1.21869302 8.25569725 -3.41916895
+v -8.14043808 11.0665941 -3.41916609
+v -12.1315041 12.1704216 -3.4191649
+v -12.3533545 12.1413603 -3.4191649
+v -13.2234211 11.6918497 -3.41916394
+v -13.3316479 11.5302191 -3.41916394
+v -13.4054632 11.3657866 -3.41916394
+v -13.5437584 10.1791248 -3.41916394
+v -13.5305204 9.92968464 -3.41916394
+v -10.2690344 -10.7624893 -3.41916203
+v -8.76296043 -13.5862312 -3.41916299
+v -8.30170155 -13.7132282 -3.41916299
+v -7.34092283 -13.6489267 -3.41916299
+v -6.44059992 -13.3229551 -3.41916299
+v -5.5646348 -12.8125639 -3.41916394
+v -3.74139309 -11.5475273 -3.4191649
+v -1.09378195 -9.77816391 -3.41916609
+v 0.088835001 -8.97351646 -3.41916609
+v 3.86536694 -6.19874001 -3.419168
+v 2.0629251 -2.64928699 -3.419168
+v -0.871262014 0.0925000012 -3.41916704
+v -3.137604 2.23444605 -3.41916609
+v -5.03022814 4.10011387 -3.41916609
+v -5.8782959 5.16451216 -3.41916704
+v -5.25391579 5.68733501 -3.41916704
+v 2.75399804 0.500262976 -3.419168
+v 7.67969704 -2.7854569 -3.4191699
+v 8.33005238 -3.11310506 -3.4191699
+v 8.95442486 -3.34368491 -3.4191699
+v 9.55281353 -3.47720098 -3.4191699
+v 11.721097 -3.26896405 -3.41917109
+v 12.6859941 -3.02756906 -3.41917109
+v 15.6278648 -2.12884498 -3.41917205
+v 16.5098476 -1.822873 -3.419173
+v 17.6083946 -1.086725 -3.419173
+v 17.7109451 -0.564249992 -2.79506302
+v 17.5940895 -0.251874 -2.79506302
+v 17.3215027 0.0633300021 -2.79506302
+v 17.3215027 0.0633300021 -3.419173
+v 16.8931866 0.381357998 -2.79506302
+v 16.3091373 0.702203989 -2.79506302
+v 16.3091373 0.702203989 -3.419173
+v 15.5693588 1.02586401 -2.79506302
+v 10.869647 3.06970406 -2.79506111
+v 6.84098577 4.81460619 -2.79505992
+v 6.84098577 4.81460619 -3.4191699
+v 3.48337412 6.260571 -2.79505897
+v 3.48337412 6.260571 -3.41916895
+v 0.796814024 7.40760183 -2.79505801
+v 0.796813011 7.40760088 -3.419168
+v -1.21869302 8.25569725 -2.79505897
+v -5.30144787 9.93825912 -2.79505706
+v -5.30144787 9.93825912 -3.41916704
+v -8.14043713 11.0665941 -2.7950561
+v -10.0118971 11.7457552 -2.7950561
+v -10.011898 11.7457552 -3.41916609
+v -11.1920586 12.0807896 -2.79505491
+v -11.1920605 12.0807896 -3.4191649
+v -11.95716 12.1767502 -2.79505491
+v -11.9571609 12.1767502 -3.4191649
+v -12.1315031 12.1704216 -2.79505491
+v -12.3533545 12.1413603 -2.79505491
+v -12.5995827 12.0820017 -2.79505491
+v -12.5995836 12.0820017 -3.4191649
+v -12.8470583 11.9847803 -2.79505491
+v -12.8470592 11.9847803 -3.4191649
+v -13.0726519 11.8421307 -2.79505491
+v -13.0726528 11.8421307 -3.4191649
+v -13.2234201 11.6918497 -2.79505396
+v -13.3316469 11.5302191 -2.79505396
+v -13.4054623 11.3657866 -2.79505396
+v -13.4529972 11.207099 -2.79505396
+v -13.4529982 11.207099 -3.41916394
+v -13.4823818 11.0627031 -2.79505396
+v -13.4823828 11.0627031 -3.41916394
+v -13.5057487 10.8971291 -2.79505396
+v -13.5057497 10.8971291 -3.41916394
+v -13.5268087 10.6819429 -2.79505396
+v -13.5268097 10.6819429 -3.41916394
+v -13.5409994 10.4362431 -2.79505396
+v -13.5410004 10.4362431 -3.41916394
+v -13.5437574 10.1791248 -2.79505396
+v -13.5305185 9.92968464 -2.79505396
+v -13.1165123 6.5194478 -2.79505301
+v -13.1165133 6.51944685 -3.41916299
+v -12.4699783 2.148 -2.79505301
+v -12.4699793 2.148 -3.41916299
+v -11.704299 -2.58754802 -2.79505301
+v -11.7042999 -2.58754802 -3.41916299
+v -10.9328585 -7.09008408 -2.79505301
+v -10.9328585 -7.09008503 -3.41916299
+v -10.2690334 -10.7624893 -2.79505205
+v -9.98333168 -11.8907843 -2.79505205
+v -9.98333263 -11.8907843 -3.41916203
+v -9.62376118 -12.7125072 -2.79505205
+v -9.62376213 -12.7125072 -3.41916203
+v -9.21030903 -13.2651577 -2.79505301
+v -9.21030998 -13.2651577 -3.41916299
+v -8.76295853 -13.5862312 -2.79505301
+v -8.30170059 -13.7132282 -2.79505301
+v -7.34092283 -13.6489267 -2.79505301
+v -6.44059992 -13.3229551 -2.79505396
+v -5.5646348 -12.8125639 -2.79505396
+v -4.67693186 -12.1950054 -2.79505396
+v -4.67693186 -12.1950054 -3.41916394
+v -3.74139309 -11.5475273 -2.79505491
+v -2.33644104 -10.6167526 -2.79505491
+v -2.33644104 -10.6167526 -3.4191649
+v -1.09378195 -9.77816391 -2.7950561
+v 0.088835001 -8.97351646 -2.7950561
+v 1.31366301 -8.14455986 -2.79505706
+v 1.31366301 -8.14455986 -3.41916609
+v 2.68295598 -7.23304987 -2.79505801
+v 2.68295598 -7.23304987 -3.419168
+v 3.86536694 -6.19874001 -2.79505801
+v 4.15901709 -5.29502392 -2.79505801
+v 4.15901709 -5.29502392 -3.419168
+v 3.79945707 -4.45008612 -2.79505801
+v 3.79945707 -4.45008707 -3.419168
+v 3.02224112 -3.59211206 -2.79505801
+v 3.02224112 -3.59211206 -3.419168
+v 2.0629251 -2.64928699 -2.79505801
+v 1.08888495 -1.73298895 -2.79505801
+v 1.08888495 -1.73298895 -3.419168
+v -0.871262014 0.0925000012 -2.79505706
+v -3.137604 2.23444605 -2.79505706
+v -5.03022814 4.10011482 -2.7950561
+v -5.86921978 5.0967741 -2.79505491
+v -5.86921978 5.0967741 -3.41916704
+v -5.8782959 5.16451216 -2.79505491
+v -5.87825298 5.26563597 -2.79505491
+v -5.87825298 5.26563501 -3.41916704
+v -5.86027908 5.38377285 -2.79505706
+v -5.86027908 5.3837719 -3.41916704
+v -5.81556082 5.50255489 -2.79505706
+v -5.81556082 5.50255394 -3.41916704
+v -5.73528481 5.60560894 -2.79505706
+v -5.73528481 5.60560799 -3.41916704
+v -5.62587309 5.67296314 -2.79505706
+v -5.62587309 5.67296314 -3.41916704
+v -5.50439787 5.70227385 -2.79505706
+v -5.50439787 5.70227289 -3.41916704
+v -5.37802505 5.70368481 -2.79505706
+v -5.37802505 5.70368385 -3.41916704
+v -5.25391579 5.68733501 -2.79505706
+v -5.13923788 5.66336489 -2.79505706
+v -5.13923788 5.66336393 -3.41916704
+v -4.53155804 5.31472492 -2.79505706
+v -4.53155804 5.31472397 -3.41916704
+v -3.01345992 4.33799601 -2.79505706
+v -3.01345992 4.33799601 -3.41916609
+v -0.58494103 2.73317504 -2.79505706
+v -0.58494103 2.73317504 -3.41916704
+v 2.75399804 0.500262976 -2.79505801
+v 7.00336218 -2.36073995 -2.79505897
+v 7.00336218 -2.36073995 -3.4191699
+v 7.67969704 -2.7854569 -2.79505992
+v 8.33005333 -3.11310506 -2.79505992
+v 8.95442581 -3.34368491 -2.79505992
+v 9.55281353 -3.47720098 -2.79505992
+v 10.1252203 -3.51365209 -2.79505992
+v 10.1252193 -3.51365209 -3.4191699
+v 10.8441992 -3.44087601 -2.79506111
+v 10.8441982 -3.44087601 -3.41917109
+v 11.7210979 -3.26896405 -2.79506111
+v 12.6859951 -3.02756906 -2.79506207
+v 13.6689644 -2.746346 -2.79506207
+v 13.6689634 -2.746346 -3.41917205
+v 14.6000843 -2.4549489 -2.79506207
+v 14.6000834 -2.4549489 -3.41917205
+v 15.6278658 -2.12884498 -2.79506207
+v 16.5098476 -1.822873 -2.79506302
+v 17.1890259 -1.49088299 -2.79506302
+v 17.1890259 -1.49088299 -3.419173
+v 17.6083946 -1.086725 -2.79506302
+v 0.105411001 16.7273979 1.11999905
+v 0.345261991 16.7147732 1.11999905
+v 0.581322014 16.6745682 1.11999905
+v 0.80707401 16.6032829 1.11999905
+v 1.01599801 16.4974174 1.11999905
+v 1.20157599 16.3534756 1.11999905
+v 1.32826197 16.2077866 1.11999905
+v 1.43035698 16.0346966 1.11999905
+v 1.50581396 15.8335915 1.11999905
+v 1.55258799 15.6038523 1.11999905
+v 1.56863403 15.3448668 1.11999905
+v 1.56863403 15.1605854 1.11999905
+v 1.56863403 14.7211456 1.11999905
+v 1.56863403 14.1966543 1.11999905
+v 1.56863403 13.7572136 1.11999905
+v 1.56863403 13.5729322 1.11999905
+v 3.15907192 13.3233585 1.11999905
+v 4.65419817 12.9316282 1.11999905
+v 6.02081823 12.3993158 1.11999905
+v 7.22574186 11.727994 1.11999905
+v 8.23577785 10.91924 1.11999905
+v 8.80188179 10.3189545 1.11999905
+v 9.25199318 9.70048046 1.11999905
+v 9.58047676 9.07110405 1.11999905
+v 9.78169918 8.43811131 1.11999905
+v 9.85002518 7.80878496 1.11999905
+v 9.82569885 7.49253893 1.11999905
+v 9.75514603 7.19792891 1.11999905
+v 9.64200401 6.92755795 1.12
+v 9.48991108 6.68403101 1.12
+v 9.30250454 6.46994686 1.12
+v 9.07253456 6.27994108 1.12
+v 8.81319046 6.12785816 1.12
+v 8.52901745 6.01616812 1.12
+v 8.22456837 5.94734097 1.12
+v 7.90438986 5.92385101 1.12
+v 7.33121204 5.96799612 1.12
+v 6.79715014 6.10252285 1.12
+v 6.28231716 6.33056688 1.12
+v 5.76682281 6.65526295 1.12
+v 5.23078012 7.0797472 1.12
+v 4.18395901 7.97779608 1.11999905
+v 3.16072512 8.64487267 1.11999905
+v 2.12022305 9.09902 1.11999905
+v 1.02160001 9.35827827 1.11999905
+v -0.175996006 9.44068909 1.11999905
+v -0.900669992 9.39911556 1.11999905
+v -1.56719804 9.27902508 1.11999905
+v -2.17204404 9.08736229 1.11999905
+v -2.71166801 8.83106995 1.11999905
+v -3.18253303 8.51709366 1.11999905
+v -3.61706591 8.11411953 1.11999905
+v -3.96249294 7.65745401 1.11999905
+v -4.21453094 7.15459919 1.11999905
+v -4.36889505 6.6130538 1.12
+v -4.42130184 6.04031801 1.12
+v -4.38049316 5.53547812 1.12
+v -4.25691414 5.067801 1.12
+v -4.04883623 4.63680696 1.12
+v -3.7545321 4.24201298 1.12
+v -3.37227297 3.882936 1.12
+v -2.94513392 3.58780408 1.12
+v -2.43714499 3.32225204 1.12
+v -1.846573 3.08675098 1.12
+v -1.17168498 2.88177204 1.12
+v -0.410748988 2.70778799 1.12
+v -0.0152270002 2.62619209 1.12
+v 0.927940011 2.43161702 1.12
+v 2.0536561 2.19938207 1.12
+v 2.99682403 2.004807 1.12
+v 3.39234495 1.92321098 1.12
+v 4.78504276 1.59496701 1.12
+v 6.03043413 1.17929602 1.12
+v 7.12831688 0.674637973 1.12
+v 8.0784893 0.0794320032 1.12
+v 8.88075066 -0.607885003 1.12
+v 9.52265453 -1.37318397 1.11999905
+v 10.019618 -2.22838807 1.11999905
+v 10.3729563 -3.17356706 1.11999905
+v 10.5839901 -4.20879507 1.11999905
+v 10.6540413 -5.33414078 1.11999905
+v 10.5555544 -6.651227 1.12
+v 10.2652121 -7.87847614 1.12
+v 9.79068756 -9.00913429 1.12
+v 9.13966084 -10.0364475 1.12
+v 8.3198061 -10.9536591 1.12
+v 7.27590084 -11.7985697 1.12
+v 6.06304693 -12.5051193 1.12
+v 4.69099712 -13.0665941 1.12
+v 3.16950703 -13.4762774 1.12
+v 1.50833201 -13.7274532 1.12
+v 1.50833201 -13.8932819 1.12
+v 1.50833201 -14.2887201 1.12
+v 1.50833201 -14.7606926 1.12
+v 1.50833201 -15.1561298 1.12
+v 1.50833201 -15.3219585 1.12
+v 1.49228597 -15.5809469 1.12
+v 1.44551206 -15.8106861 1.12
+v 1.37005496 -16.0117931 1.12
+v 1.26795995 -16.1848812 1.12
+v 1.14127398 -16.3305683 1.12
+v 0.955695987 -16.4745121 1.12
+v 0.746771991 -16.5803776 1.12
+v 0.521021008 -16.6516628 1.12
+v 0.284960002 -16.6918678 1.12
+v 0.0451090001 -16.7044907 1.12
+v -0.196757004 -16.6917133 1.12
+v -0.435656011 -16.6510601 1.12
+v -0.664767027 -16.5790424 1.12
+v -0.87727201 -16.4721718 1.12
+v -1.06634903 -16.3269634 1.12
+v -1.19433606 -16.1816311 1.12
+v -1.29772401 -16.0090923 1.12
+v -1.37430406 -15.8087206 1.12
+v -1.42186999 -15.5798845 1.12
+v -1.43821597 -15.3219585 1.12
+v -1.43821597 -15.1592388 1.12
+v -1.43821597 -14.7712126 1.12
+v -1.43821597 -14.3080854 1.12
+v -1.43821597 -13.9200583 1.12
+v -1.43821597 -13.7573366 1.12
+v -3.25013494 -13.5464516 1.12
+v -4.94489288 -13.1700163 1.12
+v -6.48735285 -12.6305323 1.12
+v -7.8423748 -11.9305029 1.12
+v -8.97482014 -11.0724287 1.12
+v -9.54416466 -10.4921713 1.12
+v -10.0029211 -9.88578606 1.12
+v -10.3419342 -9.25695324 1.12
+v -10.5520515 -8.60934734 1.12
+v -10.6241264 -7.94664907 1.12
+v -10.5984468 -7.57830191 1.12
+v -10.5235186 -7.24243593 1.12
+v -10.4025087 -6.9403491 1.12
+v -10.2385826 -6.67333794 1.12
+v -10.0349073 -6.44269991 1.12
+v -9.77230453 -6.23402596 1.12
+v -9.47389889 -6.0711832 1.12
+v -9.14502144 -5.95448303 1.12
+v -8.79100513 -5.88423491 1.12
+v -8.41718483 -5.86075115 1.12
+v -7.94380999 -5.89670706 1.12
+v -7.48150587 -6.01501799 1.12
+v -7.00411797 -6.23135185 1.12
+v -6.48548985 -6.56137419 1.12
+v -5.8994689 -7.020751 1.12
+v -4.7603302 -7.93607521 1.12
+v -3.58193588 -8.65157413 1.12
+v -2.37061095 -9.16519165 1.12
+v -1.13268697 -9.47486973 1.12
+v 0.125511006 -9.57855225 1.12
+v 0.977401972 -9.53865528 1.12
+v 1.74607205 -9.42228222 1.12
+v 2.43071294 -9.23440647 1.12
+v 3.03051305 -8.9800024 1.12
+v 3.54466105 -8.66404533 1.12
+v 4.01046419 -8.25353336 1.12
+v 4.37620306 -7.77952099 1.12
+v 4.63989687 -7.2461009 1.12
+v 4.79956579 -6.65736723 1.12
+v 4.85323 -6.01741123 1.12
+v 4.81260395 -5.51269817 1.11999905
+v 4.68770695 -5.04885292 1.11999905
+v 4.47400713 -4.62345886 1.11999905
+v 4.16697311 -4.23409986 1.11999905
+v 3.76207304 -3.87836099 1.11999905
+v 3.30957389 -3.58684206 1.11999905
+v 2.76379991 -3.31911993 1.11999905
+v 2.12057805 -3.0738759 1.11999905
+v 1.37573099 -2.8497901 1.11999905
+v 0.525086999 -2.64554191 1.11999905
+v 0.131674007 -2.5597651 1.11999905
+v -0.806464016 -2.35521889 1.11999905
+v -1.92617798 -2.11108398 1.11999905
+v -2.86431694 -1.90653896 1.11999905
+v -3.25773001 -1.82076204 1.11999905
+v -4.59268618 -1.48558605 1.11999905
+v -5.7895298 -1.05978703 1.12
+v -6.84740305 -0.543057024 1.12
+v -7.76544523 0.0649129972 1.12
+v -8.54279613 0.764429986 1.12
+v -9.17054462 1.54515696 1.12
+v -9.65782356 2.41389799 1.12
+v -10.0051918 3.36962509 1.12
+v -10.2132044 4.4113059 1.12
+v -10.2824183 5.53791189 1.12
+v -10.1845474 6.82223701 1.12
+v -9.89668941 8.02005672 1.11999905
+v -9.4274807 9.12346935 1.11999905
+v -8.78555202 10.1245785 1.11999905
+v -7.97953701 11.0154829 1.11999905
+v -6.95675898 11.8308792 1.11999905
+v -5.77239084 12.5051966 1.11999905
+v -4.43723917 13.0303583 1.11999905
+v -2.962111 13.3982849 1.11999905
+v -1.35781395 13.6008978 1.11999905
+v -1.35781395 13.7822704 1.11999905
+v -1.35781395 14.214776 1.11999905
+v -1.35781395 14.7309904 1.11999905
+v -1.35781395 15.1634951 1.11999905
+v -1.35781395 15.3448668 1.11999905
+v -1.34199095 15.6066008 1.11999905
+v -1.29579496 15.8380814 1.11999905
+v -1.22113299 16.0400581 1.11999905
+v -1.11991405 16.2132854 1.11999905
+v -0.994045973 16.3585148 1.11999905
+v -0.808125019 16.5020428 1.11999905
+v -0.59859401 16.6066704 1.11999905
+v -0.372078001 16.676424 1.11999905
+v -0.135201007 16.7153244 1.11999905
+v 0.105411001 16.7273979 0.479999989
+v 0.345261991 16.7147732 0.479999989
+v 0.581322014 16.6745682 0.479999989
+v 0.80707401 16.6032829 0.479999989
+v 1.01599801 16.4974174 0.479999989
+v 1.20157599 16.3534756 0.479999989
+v 1.32826197 16.2077866 0.479999989
+v 1.43035698 16.0346966 0.479999989
+v 1.50581396 15.8335915 0.479999989
+v 1.55258799 15.6038523 0.479999989
+v 1.56863403 15.3448668 0.479999989
+v 1.56863403 15.1605854 0.479999989
+v 1.56863403 14.7211456 0.479999989
+v 1.56863403 14.1966543 0.479999989
+v 1.56863403 13.7572136 0.479999989
+v 1.56863403 13.5729322 0.479999989
+v 3.15907192 13.3233585 0.479999989
+v 4.65419817 12.9316282 0.479999989
+v 6.02081823 12.3993158 0.479999989
+v 7.22574186 11.727994 0.479999989
+v 8.23577785 10.91924 0.479999989
+v 8.80188179 10.3189545 0.479999989
+v 9.25199318 9.70048046 0.479999989
+v 9.58047676 9.07110405 0.479999006
+v 9.78169918 8.43811131 0.479999006
+v 9.85002518 7.80878496 0.479999006
+v 9.82569885 7.49253893 0.479999006
+v 9.75514603 7.19792891 0.479999006
+v 9.64200401 6.92755795 0.479999006
+v 9.48991108 6.68403101 0.479999006
+v 9.30250454 6.46994686 0.479999989
+v 9.07253456 6.27994108 0.479999989
+v 8.81319046 6.12785816 0.479999989
+v 8.52901745 6.01616812 0.479999989
+v 8.22456837 5.94734097 0.479999989
+v 7.90438986 5.92385101 0.479999989
+v 7.33121204 5.96799612 0.479999989
+v 6.79715014 6.10252285 0.479999989
+v 6.28231716 6.33056688 0.479999989
+v 5.76682281 6.65526295 0.479999006
+v 5.23078012 7.0797472 0.479999006
+v 4.18395901 7.97779608 0.479999006
+v 3.16072512 8.64487267 0.479999006
+v 2.12022305 9.09902 0.479999006
+v 1.02160001 9.35827827 0.479999989
+v -0.175996006 9.44068909 0.479999989
+v -0.900669992 9.39911556 0.479999989
+v -1.56719804 9.27902508 0.479999989
+v -2.17204404 9.08736229 0.479999006
+v -2.71166801 8.83106995 0.479999006
+v -3.18253303 8.51709366 0.479999006
+v -3.61706591 8.11411953 0.479999006
+v -3.96249294 7.65745401 0.479999006
+v -4.21453094 7.15459919 0.479999006
+v -4.36889505 6.6130538 0.479999006
+v -4.42130184 6.04031801 0.479999989
+v -4.38049316 5.53547812 0.479999989
+v -4.25691414 5.067801 0.479999989
+v -4.04883623 4.63680696 0.479999989
+v -3.7545321 4.24201298 0.479999989
+v -3.37227297 3.882936 0.479999989
+v -2.94513392 3.58780408 0.479999989
+v -2.43714499 3.32225204 0.479999989
+v -1.846573 3.08675098 0.479999989
+v -1.17168498 2.88177204 0.479999989
+v -0.410748988 2.70778799 0.479999989
+v -0.0152270002 2.62619209 0.479999989
+v 0.927940011 2.43161702 0.479999989
+v 2.0536561 2.19938207 0.479999989
+v 2.99682403 2.004807 0.479999989
+v 3.39234495 1.92321098 0.479999989
+v 4.78504276 1.59496701 0.479999989
+v 6.03043413 1.17929602 0.479999989
+v 7.12831688 0.674637973 0.479999989
+v 8.0784893 0.0794320032 0.479999989
+v 8.88075066 -0.607885003 0.479999989
+v 9.52265453 -1.37318397 0.479999989
+v 10.019618 -2.22838807 0.479999989
+v 10.3729563 -3.17356706 0.479999989
+v 10.5839901 -4.20879507 0.479999989
+v 10.6540413 -5.33414078 0.479999989
+v 10.5555544 -6.651227 0.479999989
+v 10.2652121 -7.87847614 0.480001003
+v 9.79068756 -9.00913429 0.480001003
+v 9.13966084 -10.0364475 0.480001003
+v 8.3198061 -10.9536591 0.480001003
+v 7.27590084 -11.7985697 0.480001003
+v 6.06304693 -12.5051193 0.480001003
+v 4.69099712 -13.0665941 0.480001003
+v 3.16950703 -13.4762774 0.480001003
+v 1.50833201 -13.7274532 0.480001003
+v 1.50833201 -13.8932819 0.480001003
+v 1.50833201 -14.2887201 0.479999989
+v 1.50833201 -14.7606926 0.479999989
+v 1.50833201 -15.1561298 0.479999989
+v 1.50833201 -15.3219585 0.479999989
+v 1.49228597 -15.5809469 0.479999989
+v 1.44551206 -15.8106861 0.479999989
+v 1.37005496 -16.0117931 0.479999989
+v 1.26795995 -16.1848812 0.479999989
+v 1.14127398 -16.3305683 0.479999989
+v 0.955695987 -16.4745121 0.479999989
+v 0.746771991 -16.5803776 0.479999989
+v 0.521021008 -16.6516628 0.479999989
+v 0.284960002 -16.6918678 0.479999989
+v 0.0451090001 -16.7044907 0.479999989
+v -0.196757004 -16.6917133 0.479999989
+v -0.435656011 -16.6510601 0.479999989
+v -0.664767027 -16.5790424 0.479999989
+v -0.87727201 -16.4721718 0.479999989
+v -1.06634903 -16.3269634 0.479999989
+v -1.19433606 -16.1816311 0.479999989
+v -1.29772401 -16.0090923 0.479999989
+v -1.37430406 -15.8087206 0.479999989
+v -1.42186999 -15.5798845 0.479999989
+v -1.43821597 -15.3219585 0.479999989
+v -1.43821597 -15.1592388 0.479999989
+v -1.43821597 -14.7712126 0.479999989
+v -1.43821597 -14.3080854 0.479999989
+v -1.43821597 -13.9200583 0.480001003
+v -1.43821597 -13.7573366 0.480001003
+v -3.25013494 -13.5464516 0.480001003
+v -4.94489288 -13.1700163 0.480001003
+v -6.48735285 -12.6305323 0.480001003
+v -7.8423748 -11.9305029 0.480001003
+v -8.97482014 -11.0724287 0.480001003
+v -9.54416466 -10.4921713 0.480001003
+v -10.0029211 -9.88578606 0.480001003
+v -10.3419342 -9.25695324 0.480001003
+v -10.5520515 -8.60934734 0.480001003
+v -10.6241264 -7.94664907 0.480001003
+v -10.5984468 -7.57830191 0.480001003
+v -10.5235186 -7.24243593 0.480001003
+v -10.4025087 -6.9403491 0.480001003
+v -10.2385826 -6.67333794 0.479999989
+v -10.0349073 -6.44269991 0.479999989
+v -9.77230453 -6.23402596 0.479999989
+v -9.47389889 -6.0711832 0.479999989
+v -9.14502144 -5.95448303 0.479999989
+v -8.79100513 -5.88423491 0.479999989
+v -8.41718483 -5.86075115 0.479999989
+v -7.94380999 -5.89670706 0.479999989
+v -7.48150587 -6.01501799 0.479999989
+v -7.00411797 -6.23135185 0.479999989
+v -6.48548985 -6.56137419 0.479999989
+v -5.8994689 -7.020751 0.480001003
+v -4.7603302 -7.93607521 0.480001003
+v -3.58193588 -8.65157413 0.480001003
+v -2.37061095 -9.16519165 0.480001003
+v -1.13268697 -9.47486973 0.480001003
+v 0.125511006 -9.57855225 0.480001003
+v 0.977401972 -9.53865528 0.480001003
+v 1.74607205 -9.42228222 0.480001003
+v 2.43071294 -9.23440647 0.480001003
+v 3.03051305 -8.9800024 0.480001003
+v 3.54466105 -8.66404533 0.480001003
+v 4.01046419 -8.25353336 0.480001003
+v 4.37620306 -7.77952099 0.480001003
+v 4.63989687 -7.2461009 0.480001003
+v 4.79956579 -6.65736723 0.479999989
+v 4.85323 -6.01741123 0.479999989
+v 4.81260395 -5.51269817 0.479999989
+v 4.68770695 -5.04885292 0.479999989
+v 4.47400713 -4.62345886 0.479999989
+v 4.16697311 -4.23409986 0.479999989
+v 3.76207304 -3.87836099 0.479999989
+v 3.30957389 -3.58684206 0.479999989
+v 2.76379991 -3.31911993 0.479999989
+v 2.12057805 -3.0738759 0.479999989
+v 1.37573099 -2.8497901 0.479999989
+v 0.525086999 -2.64554191 0.479999989
+v 0.131674007 -2.5597651 0.479999989
+v -0.806464016 -2.35521889 0.479999989
+v -1.92617798 -2.11108398 0.479999989
+v -2.86431694 -1.90653896 0.479999989
+v -3.25773001 -1.82076204 0.479999989
+v -4.59268618 -1.48558605 0.479999989
+v -5.7895298 -1.05978703 0.479999989
+v -6.84740305 -0.543056011 0.479999989
+v -7.76544523 0.0649129972 0.479999989
+v -8.54279613 0.764429986 0.479999989
+v -9.17054462 1.54515696 0.479999989
+v -9.65782356 2.41389799 0.479999989
+v -10.0051918 3.36962509 0.479999989
+v -10.2132044 4.4113059 0.479999989
+v -10.2824183 5.53791189 0.479999989
+v -10.1845474 6.82223701 0.479999006
+v -9.89668941 8.02005672 0.479999006
+v -9.4274807 9.12346935 0.479999006
+v -8.78555202 10.1245785 0.479999989
+v -7.97953701 11.0154829 0.479999989
+v -6.95675898 11.8308792 0.479999989
+v -5.77239084 12.5051966 0.479999989
+v -4.43723917 13.0303583 0.479999989
+v -2.962111 13.3982849 0.479999989
+v -1.35781395 13.6008978 0.479999989
+v -1.35781395 13.7822704 0.479999989
+v -1.35781395 14.214776 0.479999989
+v -1.35781395 14.7309904 0.479999989
+v -1.35781395 15.1634951 0.479999989
+v -1.35781395 15.3448668 0.479999989
+v -1.34199095 15.6066008 0.479999989
+v -1.29579496 15.8380814 0.479999989
+v -1.22113299 16.0400581 0.479999989
+v -1.11991405 16.2132854 0.479999989
+v -0.994045973 16.3585148 0.479999989
+v -0.808125019 16.5020428 0.479999989
+v -0.59859401 16.6066704 0.479999989
+v -0.372078001 16.676424 0.479999989
+v -0.135201007 16.7153244 0.479999989
+vt 0.906646013 0.888722003
+vt 0.918564022 0.889859021
+vt 0.916351974 0.88993901
+vt 0.921378016 0.889490008
+vt 0.924502015 0.888737023
+vt 0.927641988 0.887503982
+vt 0.891673982 0.884472013
+vt 0.930503011 0.885694027
+vt 0.932416022 0.88378799
+vt 0.867932975 0.875855982
+vt 0.933789015 0.881736994
+vt 0.934724987 0.87965101
+vt 0.935328007 0.877637982
+vt 0.935701013 0.875805974
+vt 0.831918001 0.861541986
+vt 0.935998023 0.873705983
+vt 0.936264992 0.870975971
+vt 0.936444998 0.867859006
+vt 0.936479986 0.864597023
+vt 0.93631202 0.861433029
+vt 0.780124009 0.840197027
+vt 0.931060016 0.818170011
+vt 0.754554987 0.829437971
+vt 0.720472991 0.814885974
+vt 0.834492028 0.807803988
+vt 0.836032987 0.807431996
+vt 0.922858 0.762714028
+vt 0.677878022 0.796543002
+vt 0.83288902 0.807821989
+vt 0.831314981 0.807614028
+vt 0.829859972 0.807309985
+vt 0.837421 0.806577981
+vt 0.822151005 0.802887022
+vt 0.838440001 0.805270016
+vt 0.83900702 0.803762972
+vt 0.839235008 0.802264988
+vt 0.802892029 0.790497005
+vt 0.839235008 0.800981998
+vt 0.839119971 0.800122023
+vt 0.828477025 0.787478983
+vt 0.62677002 0.774407029
+vt 0.772083998 0.770138025
+vt 0.804467022 0.763810992
+vt 0.567149997 0.748479009
+vt 0.729726017 0.741810977
+vt 0.775716007 0.73663801
+vt 0.913143992 0.702638984
+vt 0.557765007 0.744373024
+vt 0.550355017 0.740302026
+vt 0.675818026 0.705515981
+vt 0.544921994 0.736267984
+vt 0.750849009 0.713479996
+vt 0.541463971 0.732268989
+vt 0.539981008 0.728305995
+vt 0.541281998 0.721678019
+vt 0.546602011 0.716551006
+vt 0.555218995 0.712338984
+vt 0.738493025 0.701856017
+vt 0.566407025 0.708458006
+vt 0.579446018 0.704321027
+vt 0.667237997 0.700128019
+vt 0.591257989 0.700623989
+vt 0.903357983 0.645519018
+vt 0.726323009 0.689894974
+vt 0.603727996 0.697057009
+vt 0.658987999 0.695972025
+vt 0.615969002 0.693993986
+vt 0.651067019 0.693045974
+vt 0.627093017 0.691812992
+vt 0.643476009 0.691353023
+vt 0.636214018 0.690890014
+vt 0.716463029 0.679010987
+vt 0.711902022 0.668291986
+vt 0.715627015 0.656826973
+vt 0.730627 0.643706024
+vt 0.894936979 0.598931015
+vt 0.747997999 0.632142007
+vt 0.763535976 0.621626019
+vt 0.778539002 0.611418009
+vt 0.794303 0.60078001
+vt 0.812126994 0.588971972
+vt 0.891312003 0.584617019
+vt 0.823994994 0.580757976
+vt 0.886750996 0.574193001
+vt 0.83525598 0.572924018
+vt 0.881506026 0.567182004
+vt 0.846369028 0.566448987
+vt 0.875829995 0.563108981
+vt 0.857789993 0.562313974
+vt 0.869979024 0.561497986
+vt 0.541463971 0.732268989
+vt 0.567149997 0.748479009
+vt 0.754554987 0.829437971
+vt 0.906646013 0.888722003
+vt 0.936444998 0.867859006
+vt 0.922858 0.762714028
+vt 0.886750996 0.574193001
+vt 0.875829995 0.563108981
+vt 0.836032987 0.807431996
+vt 0.834492028 0.807803988
+vt 0.615969002 0.693993986
+vt 0.243977994 0.465353012
+vt 0.250073999 0.465346009
+vt 0.247031003 0.465505987
+vt 0.240972996 0.464859009
+vt 0.253068 0.464836001
+vt 0.238100007 0.463973999
+vt 0.255932003 0.463930994
+vt 0.235441998 0.462646991
+vt 0.258583009 0.462588012
+vt 0.233082995 0.46082601
+vt 0.260937005 0.460761994
+vt 0.231485993 0.458983988
+vt 0.262544006 0.458914012
+vt 0.230202004 0.456786007
+vt 0.263839006 0.456717998
+vt 0.229255006 0.45422399
+vt 0.264795989 0.454167008
+vt 0.228669003 0.451287001
+vt 0.265390009 0.451252013
+vt 0.228468001 0.447966993
+vt 0.265592992 0.447966993
+vt 0.228468001 0.445665985
+vt 0.265592992 0.445629001
+vt 0.228468001 0.44017899
+vt 0.265592992 0.440053999
+vt 0.228468001 0.433631003
+vt 0.265592992 0.433400989
+vt 0.228468001 0.428144008
+vt 0.265592992 0.427825987
+vt 0.228468001 0.425843
+vt 0.265592992 0.425487995
+vt 0.208115995 0.423272997
+vt 0.285769999 0.422322005
+vt 0.189402997 0.418605
+vt 0.304737002 0.417351991
+vt 0.172464997 0.411942989
+vt 0.322073996 0.410600007
+vt 0.157440007 0.403387994
+vt 0.337359995 0.402083009
+vt 0.144464999 0.393043995
+vt 0.350172997 0.391822994
+vt 0.134240001 0.381742001
+vt 0.357354999 0.384207994
+vt 0.363065004 0.376361996
+vt 0.126095995 0.369042009
+vt 0.243460998 0.373066008
+vt 0.367231995 0.368378013
+vt 0.234267995 0.372539014
+vt 0.258653998 0.37202099
+vt 0.225812003 0.371015012
+vt 0.272590995 0.368732005
+vt 0.218138993 0.368584007
+vt 0.120144002 0.355044007
+vt 0.28579101 0.362971008
+vt 0.211292997 0.365332991
+vt 0.369785011 0.360347986
+vt 0.205320001 0.36135
+vt 0.298772007 0.354508013
+vt 0.199807003 0.356236994
+vt 0.370651007 0.352364004
+vt 0.195425004 0.350443989
+vt 0.116492003 0.339848995
+vt 0.312052011 0.343115002
+vt 0.370343 0.348351985
+vt 0.192228004 0.344065011
+vt 0.369448006 0.344615012
+vt 0.368012011 0.341185004
+vt 0.190270007 0.337195009
+vt 0.318852007 0.33772999
+vt 0.366082996 0.338095009
+vt 0.115249999 0.323554993
+vt 0.363705993 0.335379004
+vt 0.325390995 0.333611012
+vt 0.189604998 0.329928994
+vt 0.360787988 0.33296901
+vt 0.331923008 0.330718011
+vt 0.35749799 0.331039995
+vt 0.353893012 0.329623014
+vt 0.338698 0.329012007
+vt 0.190123007 0.323525012
+vt 0.350030988 0.328750014
+vt 0.345968992 0.328451991
+vt 0.116129003 0.309262991
+vt 0.191689998 0.317591995
+vt 0.194330007 0.312124014
+vt 0.198063999 0.307116002
+vt 0.118767001 0.296048999
+vt 0.202913001 0.302560002
+vt 0.208332002 0.298815995
+vt 0.214775994 0.295448005
+vt 0.123173997 0.283924013
+vt 0.222268 0.292459995
+vt 0.230829999 0.28986001
+vt 0.240483001 0.287651986
+vt 0.245499998 0.286617011
+vt 0.257465988 0.284148991
+vt 0.27174601 0.281203002
+vt 0.129355997 0.272902995
+vt 0.283710986 0.278733999
+vt 0.288729012 0.277698994
+vt 0.306396991 0.273535013
+vt 0.322196007 0.268261999
+vt 0.137318999 0.262998998
+vt 0.336124003 0.261860013
+vt 0.147181004 0.254124999
+vt 0.348177999 0.254308999
+vt 0.358354986 0.245590001
+vt 0.158827007 0.246411994
+vt 0.172246993 0.239857003
+vt 0.366497993 0.235881001
+vt 0.187430993 0.234455004
+vt 0.372803003 0.225032002
+vt 0.204365999 0.230203003
+vt 0.209356993 0.229114994
+vt 0.221258 0.226520002
+vt 0.235462993 0.223423004
+vt 0.377285004 0.213040993
+vt 0.247363999 0.220827997
+vt 0.252355009 0.219740003
+vt 0.263146013 0.217149004
+vt 0.272594988 0.214305997
+vt 0.280755013 0.211195007
+vt 0.379963011 0.199908003
+vt 0.287678987 0.207799003
+vt 0.293419003 0.204099998
+vt 0.298556 0.199587002
+vt 0.380851001 0.185632005
+vt 0.302451015 0.194647998
+vt 0.305162013 0.189251006
+vt 0.306746989 0.183366999
+vt 0.379601985 0.168924004
+vt 0.307262003 0.176964
+vt 0.134170994 0.178654
+vt 0.144917995 0.178495005
+vt 0.138913006 0.178951994
+vt 0.129679993 0.177763
+vt 0.150783002 0.176994994
+vt 0.125506997 0.176282004
+vt 0.156838998 0.174250007
+vt 0.306580991 0.168845996
+vt 0.121721998 0.174216002
+vt 0.163417995 0.170063004
+vt 0.118390001 0.171569005
+vt 0.115806997 0.168642998
+vt 0.170853004 0.164235994
+vt 0.375919014 0.153355002
+vt 0.304556012 0.161376998
+vt 0.113727003 0.165255994
+vt 0.112191997 0.161423996
+vt 0.185304001 0.152623996
+vt 0.111240998 0.157162994
+vt 0.301209986 0.154609993
+vt 0.110916004 0.152490005
+vt 0.296570987 0.148597002
+vt 0.369899005 0.139010996
+vt 0.200252995 0.143546999
+vt 0.111830004 0.144082993
+vt 0.290661007 0.143389001
+vt 0.114495002 0.135867
+vt 0.215619996 0.137031004
+vt 0.284139007 0.139381006
+vt 0.276529998 0.136152998
+vt 0.361640006 0.125979006
+vt 0.231324002 0.133102998
+vt 0.267843992 0.133770004
+vt 0.118795998 0.127890006
+vt 0.258092999 0.132293999
+vt 0.247286007 0.131787002
+vt 0.124615997 0.120196998
+vt 0.351238996 0.114343002
+vt 0.131839007 0.112836003
+vt 0.337996006 0.103624001
+vt 0.146204993 0.101949997
+vt 0.322609991 0.0946609974
+vt 0.163395002 0.0930700004
+vt 0.305204004 0.0875379965
+vt 0.182962999 0.0862260014
+vt 0.285901994 0.0823410004
+vt 0.204462007 0.0814500004
+vt 0.264827996 0.0791539997
+vt 0.227448002 0.0787750036
+vt 0.264827996 0.0770509988
+vt 0.227448002 0.076710999
+vt 0.264827996 0.0720340014
+vt 0.227448002 0.0717879981
+vt 0.264827996 0.0660469979
+vt 0.227448002 0.0659129992
+vt 0.264827996 0.0610300004
+vt 0.227448002 0.0609910004
+vt 0.264827996 0.0589260012
+vt 0.227448002 0.0589260012
+vt 0.227656007 0.0556540005
+vt 0.264625013 0.0556409992
+vt 0.228258997 0.052751001
+vt 0.264030993 0.0527260005
+vt 0.229231 0.0502090007
+vt 0.263074011 0.050175
+vt 0.230542004 0.0480200015
+vt 0.26177901 0.047979001
+vt 0.232166007 0.0461769998
+vt 0.260172009 0.0461309999
+vt 0.234565005 0.0443350002
+vt 0.257818013 0.0443050005
+vt 0.237259999 0.0429789983
+vt 0.255167007 0.0429619998
+vt 0.240167007 0.0420649983
+vt 0.252303004 0.0420579985
+vt 0.243198007 0.0415499993
+vt 0.249309003 0.0415479988
+vt 0.246266007 0.0413869992
+vt 0.202913001 0.302560002
+vt 0.208332002 0.298815995
+vt 0.240483001 0.287651986
+vt 0.214775994 0.295448005
+vt 0.209356993 0.229114994
+vt 0.204365999 0.230203003
+vt 0.147181004 0.254124999
+vn -0 -0 -1
+vn 0.638899982 0.379099995 -0.669399977
+vn 0.996599972 0.0820000023 -0
+vn 0.756799996 0.0623000003 -0.650699973
+vn 0.496699989 0.535099983 -0.683300018
+vn 0.860000014 0.510299981 -0
+vn 0.389800012 0.607500017 -0.692099988
+vn 0.680299997 0.732900023 -0
+vn 0.316599995 0.643299997 -0.697099984
+vn 0.540099978 0.841600001 -0
+vn 0.282700002 0.648400009 -0.706900001
+vn 0.441599995 0.897199988 -0
+vn 0.281599998 0.648800015 -0.706900001
+vn 0.399800003 0.916599989 -0
+vn 0.282799989 0.648400009 -0.706900001
+vn 0.280499995 0.649399996 -0.706900001
+vn 0.398000002 0.917400002 -0
+vn 0.278800011 0.650300026 -0.706700027
+vn 0.396400005 0.918099999 -0
+vn 0.276199996 0.651600003 -0.706499994
+vn 0.394199997 0.91900003 -0
+vn 0.278800011 0.650200009 -0.706700027
+vn 0.272199988 0.653500021 -0.70630002
+vn 0.390300006 0.920700014 -0
+vn 0.265799999 0.656799972 -0.70569998
+vn 0.38440001 0.923200011 -0
+vn 0.355300009 0.934800029 -0
+vn 0.375200003 0.926900029 -0
+vn 0.252400011 0.664099991 -0.703700006
+vn 0.307300001 0.951600015 -0
+vn 0.219699994 0.680400014 -0.699100018
+vn 0.199300006 0.979900002 -0
+vn 0.144199997 0.708899975 -0.690400004
+vn 0.0441999994 0.999000013 -0
+vn 0.0320000015 0.723699987 -0.689400017
+vn -0.0832000002 0.996500015 -0
+vn -0.059700001 0.714900017 -0.696699977
+vn -0.182400003 0.983200014 -0
+vn -0.131099999 0.70660001 -0.695299983
+vn -0.300700009 0.953700006 -0
+vn -0.217099994 0.688600004 -0.691900015
+vn -0.452100009 0.89200002 -0
+vn -0.328799993 0.648699999 -0.686399996
+vn -0.624000013 0.781400025 -0
+vn -0.562099993 0.462599993 -0.685599983
+vn -0.455599993 0.570599973 -0.683200002
+vn -0.87470001 0.484699994 -0
+vn -0.772199988 0.635399997 -0
+vn -0.675899982 0.251700014 -0.692700028
+vn -0.634199977 0.351399988 -0.68870002
+vn -0.6954 0.174500003 -0.697099984
+vn -0.937099993 0.349000007 -0
+vn -0.703400016 0.121100001 -0.700399995
+vn -0.969900012 0.243399993 -0
+vn -0.6954 0.174600005 -0.697099984
+vn -0.992900014 0.118600003 -0
+vn -0.985499978 0.169699997 -0
+vn -0.709399998 0.0551999994 -0.702600002
+vn -0.706799984 0.0843999982 -0.702300012
+vn -0.99940002 0.0342000015 -0
+vn -0.996999979 0.0775000006 -0
+vn -0.713999987 -0.0152000003 -0.699999988
+vn -0.711899996 0.0243999995 -0.701900005
+vn -0.711899996 -0.061999999 -0.699599981
+vn -0.999800026 -0.0210999995 -0
+vn -0.713999987 -0.0151000004 -0.699999988
+vn -0.703700006 -0.0947000012 -0.704200029
+vn -0.996200025 -0.0868000016 -0
+vn -0.700299978 -0.108400002 -0.705600023
+vn -0.991100013 -0.133399993 -0
+vn -0.698499978 -0.116300002 -0.706099987
+vn -0.988200009 -0.152999997 -0
+vn -0.697399974 -0.1228 -0.706099987
+vn -0.986400008 -0.164199993 -0
+vn -0.698499978 -0.1514 -0.699400008
+vn -0.984899998 -0.1734 -0
+vn -0.685500026 -0.234999999 -0.689100027
+vn -0.977299988 -0.211799994 -0
+vn -0.631799996 -0.368000001 -0.682200015
+vn -0.94599998 -0.324299991 -0
+vn -0.700100005 -0.714100003 -0
+vn -0.864099979 -0.503300011 -0
+vn -0.320100009 -0.67019999 -0.66960001
+vn -0.516900003 -0.5273 -0.674399972
+vn -0.0746999979 -0.737299979 -0.671400011
+vn -0.430999994 -0.902400017 -0
+vn 0.151299998 -0.720300019 -0.676900029
+vn -0.100699998 -0.994899988 -0
+vn 0.307599992 -0.657899976 -0.687399983
+vn 0.205599993 -0.978600025 -0
+vn 0.307700008 -0.657899976 -0.687399983
+vn 0.537699997 -0.843100011 -0
+vn 0.423700005 -0.905799985 -0
+vn 0.384900004 -0.603600025 -0.698199987
+vn 0.570100009 -0.82160002 -0
+vn 0.402999997 -0.58069998 -0.707400024
+vn 0.560699999 -0.828000009 -0
+vn 0.393599987 -0.58859998 -0.706099987
+vn 0.395200014 -0.583599985 -0.709399998
+vn 0.396899998 -0.585699975 -0.706700027
+vn 0.555800021 -0.83130002 -0
+vn 0.396899998 -0.584900022 -0.707400024
+vn 0.56099999 -0.827799976 -0
+vn 0.393599987 -0.586399972 -0.708000004
+vn 0.561399996 -0.827499986 -0
+vn 0.607599974 -0.79430002 -0
+vn 0.557299972 -0.830299973 -0
+vn 0.438199997 -0.573000014 -0.692600012
+vn 0.834699988 -0.550599992 -0
+vn 0.770900011 0.0340000018 -0.635999978
+vn 0.834800005 -0.550599992 -0
+vn 0.633000016 -0.417600006 -0.651899993
+vn 0.624100029 0.399300009 -0.671599984
+vn 0.999000013 0.0441000015 -0
+vn 0.514699996 0.494199991 -0.700600028
+vn 0.842299998 0.538999975 -0
+vn 0.49180001 0.511500001 -0.704699993
+vn 0.721300006 0.692600012 -0
+vn 0.483599991 0.516700029 -0.706499994
+vn 0.693099976 0.720799983 -0
+vn 0.49180001 0.511399984 -0.704699993
+vn 0.483200014 0.515100002 -0.707899988
+vn 0.683300018 0.730099976 -0
+vn 0.489399999 0.507099986 -0.709500015
+vn 0.684199989 0.729300022 -0
+vn 0.511300027 0.4727 -0.717700005
+vn 0.694500029 0.719500005 -0
+vn 0.577099979 0.255299985 -0.77579999
+vn 0.734300017 0.678799987 -0
+vn 0.689899981 0.0458999984 -0.72240001
+vn 0.914499998 0.404500008 -0
+vn 0.687399983 -0.052099999 -0.724399984
+vn 0.997799993 0.0662999973 -0
+vn 0.687399983 -0.0520000011 -0.724399984
+vn 0.967499971 -0.252799988 -0
+vn 0.997099996 -0.0755999982 -0
+vn 0.584299982 -0.327499986 -0.742600024
+vn 0.659799993 -0.172399998 -0.731400013
+vn 0.441799998 -0.493200004 -0.74940002
+vn 0.872300029 -0.488999993 -0
+vn 0.584299982 -0.327499986 -0.742500007
+vn 0.256599993 -0.616699994 -0.744199991
+vn 0.667200029 -0.744899988 -0
+vn 0.441700011 -0.493299991 -0.74940002
+vn 0.0841000006 -0.674600005 -0.733299971
+vn 0.384200007 -0.923300028 -0
+vn -0.0599000007 -0.998199999 -0
+vn 0.123599999 -0.992299974 -0
+vn -0.117200002 -0.688499987 -0.715699971
+vn -0.0412999988 -0.689100027 -0.723500013
+vn -0.237499997 -0.62440002 -0.744099975
+vn -0.167699993 -0.985800028 -0
+vn -0.364300013 -0.59920001 -0.712899983
+vn -0.355500013 -0.934700012 -0
+vn -0.385500014 -0.591099977 -0.708500028
+vn -0.519500017 -0.854499996 -0
+vn -0.391099989 -0.58829999 -0.707700014
+vn -0.546199977 -0.837599993 -0
+vn -0.385500014 -0.591199994 -0.708500028
+vn -0.393700004 -0.586899996 -0.707499981
+vn -0.553600013 -0.832799971 -0
+vn -0.391099989 -0.588400006 -0.707700014
+vn -0.39379999 -0.586899996 -0.707499981
+vn -0.54519999 -0.83829999 -0
+vn -0.557200015 -0.83039999 -0
+vn -0.352499992 -0.624800026 -0.696699977
+vn -0.387499988 -0.595700026 -0.703499973
+vn -0.398799986 -0.916999996 -0
+vn -0.491400003 -0.870899975 -0
+vn -0.203999996 -0.692200005 -0.692300022
+vn -0.286900014 -0.659699976 -0.694599986
+vn -0.1021 -0.716600001 -0.689999998
+vn -0.282700002 -0.959200025 -0
+vn 0.0135000004 -0.724600017 -0.689100027
+vn -0.141100004 -0.99000001 -0
+vn 0.0136000002 -0.724600017 -0.689100027
+vn 0.146699995 -0.989199996 -0
+vn 0.0186000001 -0.999800026 -0
+vn 0.155100003 -0.69569999 -0.701399982
+vn 0.1052 -0.709500015 -0.696799994
+vn 0.183899999 -0.686600029 -0.703400016
+vn 0.217600003 -0.976000011 -0
+vn 0.155000001 -0.69569999 -0.701399982
+vn 0.203600004 -0.680000007 -0.704400003
+vn 0.258899987 -0.965900004 -0
+vn 0.184 -0.686600029 -0.703400016
+vn 0.212699994 -0.674799979 -0.706700027
+vn 0.286900014 -0.958000004 -0
+vn 0.223800004 -0.673900008 -0.704100013
+vn 0.300599992 -0.953700006 -0
+vn 0.315100014 -0.949100018 -0
+vn 0.423799992 -0.605400026 -0.673699975
+vn 0.27669999 -0.664900005 -0.693799973
+vn 0.878099978 -0.478399992 -0
+vn 0.573499978 -0.819199979 -0
+vn 0.756799996 0.0621999986 -0.650600016
+vn 0.670799971 -0.365500003 -0.645299971
+vn -0 -0 1
+vn 0.0526000001 0.998600006 -0
+vn 0.612900019 0.790199995 -0
+vn 0.979900002 0.199499995 -0
+vn 1 -0 -0
+vn 0.253399998 0.967299998 -0
+vn 0.727500021 0.686100006 -0
+vn 0.994199991 0.107900001 -0
+vn -1 -0 -0
+vn 0.848200023 -0.529699981 -0
+vn 0.365799993 -0.930700004 -0
+vn -0.996800005 -0.0802000016 -0
+vn -0.0687000006 -0.997600019 -0
+vn 0.42899999 -0.903299987 -0
+vn 0.893999994 -0.448100001 -0
+vn 0.966799974 0.255499989 -0
+vn 0.568499982 0.822700024 -0
+vn 0.222900003 0.974799991 -0
+vn 0.202000007 0.979399979 -0
+vn 0.417699993 0.908599973 -0
+vn 0.864600003 0.502399981 -0
+vn -0.938000023 0.346700013 -0
+vn 0.997200012 -0.0746000037 -0
+vn 0.745599985 -0.666400015 -0
+vn -0.980599999 -0.195800006 -0
+vn 0.25999999 -0.965600014 -0
+vn 0.979900002 -0.199499995 -0
+vn 0.612900019 -0.790199995 -0
+vn 0.0526000001 -0.998600006 -0
+vn -0.115599997 -0.993300021 -0
+vn -0.603900015 -0.796999991 -0
+vn -0.951200008 -0.308600008 -0
+vn -0.446700007 0.894699991 -0
+vn -0.928300023 0.371899992 -0
+vn -0.479000002 0.877799988 -0
+vn -0.920300007 0.391299993 -0
+vn 0.0756999999 0.997099996 -0
+vn 0.616900027 0.787 -0
+vn -0.791700006 0.610899985 -0
+vn -0.660000026 -0.75120002 -0
+vn -0.288100004 -0.957599998 -0
+vn -0.213 -0.976999998 -0
+vn -0.0500999987 0.998700023 -0
+vn -0.335200012 -0.942200005 -0
+vn 0.167899996 0.985800028 -0
+vn 0.754599988 0.656199992 -0
+vn 0.998099983 0.0617999993 -0
+vn 0.362899989 0.931800008 -0
+vn -0.620800018 -0.783999979 -0
+vn 0.808499992 0.588400006 -0
+vn 0.997099996 -0.076700002 -0
+vn 0.752399981 -0.658699989 -0
+vn 0.220500007 -0.975399971 -0
+vn -0.405000001 -0.914300025 -0
+vn -0.54610002 -0.837700009 -0
+vn -0.365999997 0.930599988 -0
+vn 0.0573000014 -0.998399973 -0
+vn -0.779299974 -0.626600027 -0
+vn 0.554799974 -0.832000017 -0
+vn -0.229699999 -0.97329998 -0
+vn 0.9005 0.434799999 -0
+vn 0.46329999 0.886200011 -0
+vn -0.458999991 -0.888400018 -0
+vn 0.530900002 0.847500026 -0
+vn 0.936699986 0.350199997 -0
+vn 0.973100007 -0.230199993 -0
+vn 0.629100025 -0.7773 -0
+vn 0.149499997 -0.988799989 -0
+vn 0.93629998 -0.351300001 -0
+vn -0.998099983 -0.0612999983 -0
+vn 0.451999992 -0.89200002 -0
+vn -0.0527999997 -0.998600006 -0
+vn -0.609099984 -0.793099999 -0
+vn -0.979099989 -0.203500003 -0
+vn 0.518999994 0.854799986 -0
+vn -0.994099975 -0.108099997 -0
+vn -0.449299991 -0.893400013 -0
+vn -0.852199972 0.523199975 -0
+vn -0.334399998 0.942399979 -0
+vn 0.247899994 0.968800008 -0
+vn 0.626399994 0.779500008 -0
+vn 0.0820999965 0.996599972 -0
+vn -0.841799974 0.539799988 -0
+vn -0.390500009 0.920599997 -0
+vn -0.896399975 0.443199992 -0
+vn -0.965600014 -0.25999999 -0
+vn -0.541599989 -0.840600014 -0
+vn -0.233500004 -0.97240001 -0
+vn -0.438899994 -0.898500025 -0
+vn -0.934099972 -0.356999993 -0
+vn -0.741599977 0.670899987 -0
+vn -0.241999999 0.970300019 -0
+vn -0.980700016 0.195700005 -0
+vn -0.611100018 0.791599989 -0
+vn -0.244299993 -0.969699979 -0
+vn -0.167799994 -0.985800028 -0
+vn 0.301099986 0.953599989 -0
+vn 0.861299992 0.508000016 -0
+vn -0.96509999 0.261799991 -0
+vn 0.486699998 0.873600006 -0
+vn 0.886500001 0.462700009 -0
+vn -0.0627000034 0.998000026 -0
+vn 0.972500026 -0.232899994 -0
+vn 0.0732000023 -0.997300029 -0
+vn -0.400000006 -0.916499972 -0
+vn 0.177300006 -0.984200001 -0
+vn 0.680000007 -0.733200014 -0
+vn -0.998199999 0.0603 -0
+vn 0.995800018 -0.0910999998 -0
+vn 0.801699996 0.5977 -0
+vn -0.872200012 -0.489199996 -0
+vn 0.370400012 0.928900003 -0
+vn 0.229399994 0.97329998 -0
+vn 0.650600016 0.75940001 -0
+vn 0.979799986 0.199699998 -0
+vn 0.922100008 -0.386999995 -0
+vn -0.65109998 -0.759000003 -0
+vn 0.503400028 -0.864099979 -0
+vn 0.861299992 -0.508000016 -0
+vn 0.301099986 -0.953599989 -0
+vn -0.755699992 0.654900014 -0
+vn -0.997099996 0.0759999976 -0
+vn -0.998000026 -0.0631999969 -0
+vn -0.440400004 -0.897800028 -0
+vn -0.3301 -0.943899989 -0
+vn -0.797500014 -0.603299975 -0
+vn -0.997600019 0.0694999993 -0
+vn -0.749599993 0.661899984 -0
+vn -0.194600001 0.98089999 -0
+vn 0.412800014 0.91079998 -0
+vn -0.0467999987 0.998899996 -0
+vn -0.523599982 0.851999998 -0
+vn -0.162100002 0.986800015 -0
+vn -0.893599987 -0.448900014 -0
+vn -0.661199987 0.750199974 -0
+vn -0.264600009 0.964299977 -0
+vn 0.451999992 0.89200002 -0
+vn 0.93629998 0.351300001 -0
+vn 0.155000001 0.987900019 -0
+vn 0.625 0.780600011 -0
+vn -0.552100003 -0.833700001 -0
+vn 0.953000009 0.302899987 -0
+vn 0.922500014 -0.386000007 -0
+vn 0.505900025 -0.862600029 -0
+vn -0.0768000036 -0.996999979 -0
+vn -0.216800004 -0.976199985 -0
+vn 0.302100003 -0.953299999 -0
+vn 0.797500014 -0.603299975 -0
+vn 0.996699989 0.0806000009 -0
+vn 0.684700012 0.728900015 -0
+vn 0.290600002 0.956799984 -0
+vn 0.316599995 0.948599994 -0
+vn -0.939800024 -0.341600001 -0
+vn 0.766200006 0.6426 -0
+vn -0.7852 -0.619199991 -0
+vn 0.844699979 -0.535300016 -0
+vn 0.378699988 -0.925499976 -0
+vn 0.998099983 -0.0617999993 -0
+vn -0.713800013 -0.700399995 -0
+vn 0.754599988 -0.656199992 -0
+vn 0.167899996 -0.985800028 -0
+vn -0.299899995 -0.953999996 -0
+vn -0.857800007 -0.513999999 -0
+vn -0.972299993 0.233700007 -0
+vn -0.880200028 -0.4745 -0
+vn -0.976000011 0.217700005 -0
+vn -0.622099996 0.782899976 -0
+vn 0.636900008 -0.770900011 -0
+vn 0.242699996 0.970099986 -0
+vn 0.536899984 0.843699992 -0
+vn 0.390399992 0.920700014 -0
+vn -0.149700001 0.988699973 -0
+vn -0.750500023 -0.660899997 -0
+vn -0.996500015 0.0835999995 -0
+vn -0.356299996 -0.934400022 -0
+vn -0.243499994 -0.969900012 -0
+vn -0.623399973 0.781899989 -0
+vn -0.668900013 -0.743300021 -0
+vn 0.961700022 -0.274100006 -0
+vn -0.494800001 0.869000018 -0
+vn -0.863399982 0.504499972 -0
+vn -0.29429999 0.95569998 -0
+vn -0.125300005 0.9921 -0
+vn -0.532999992 -0.846099973 -0
+vn 0.399899989 0.916599989 -0
+vn 0.398200005 0.917299986 -0
+vn 0.280499995 0.649299979 -0.706900001
+vn 0.396600008 0.917999983 -0
+vn 0.393999994 0.919099987 -0
+vn 0.39410001 0.919099987 -0
+vn 0.252400011 0.664200008 -0.703700006
+vn 0.0320000015 0.72359997 -0.689400017
+vn -0.131099999 0.706700027 -0.695299983
+vn -0.217099994 0.688499987 -0.691900015
+vn -0.56220001 0.462500006 -0.685599983
+vn -0.562099993 0.462500006 -0.685599983
+vn -0.711899996 -0.0621000007 -0.699599981
+vn -0.0746000037 -0.737299979 -0.671400011
+vn 0.396800011 -0.584900022 -0.707400024
+vn 0.561500013 -0.827400029 -0
+vn 0.438300014 -0.572899997 -0.692600012
+vn 0.683399975 0.730000019 -0
+vn 0.577099979 0.255199999 -0.77579999
+vn 0.689899981 0.0460000001 -0.72240001
+vn 0.584299982 -0.327399999 -0.742600024
+vn 0.441700011 -0.493299991 -0.749300003
+vn 0.256700009 -0.616699994 -0.744199991
+vn -0.237399995 -0.62440002 -0.744099975
+vn -0.39379999 -0.586799979 -0.707499981
+vn -0.203899994 -0.692200005 -0.692300022
+vn 0.756900012 0.0623000003 -0.650600016
+vn 0.253500015 0.967299998 -0
+vn 0.953000009 0.303000003 -0
+vn 0.998099983 0.0621000007 -0
+f 63/1/1 8/2/1 65/3/1
+f 63/1/1 9/4/1 8/2/1
+f 63/1/1 69/5/1 9/4/1
+f 63/1/1 71/6/1 69/5/1
+f 61/7/1 71/6/1 63/1/1
+f 61/7/1 73/8/1 71/6/1
+f 61/7/1 10/9/1 73/8/1
+f 7/10/1 10/9/1 61/7/1
+f 7/10/1 11/11/1 10/9/1
+f 7/10/1 12/12/1 11/11/1
+f 7/10/1 78/13/1 12/12/1
+f 7/10/1 80/14/1 78/13/1
+f 58/15/1 80/14/1 7/10/1
+f 58/15/1 82/16/1 80/14/1
+f 58/15/1 84/17/1 82/16/1
+f 58/15/1 86/18/1 84/17/1
+f 58/15/1 13/19/1 86/18/1
+f 58/15/1 14/20/1 13/19/1
+f 6/21/1 14/20/1 58/15/1
+f 6/21/1 90/22/1 14/20/1
+f 55/23/1 90/22/1 6/21/1
+f 53/24/1 90/22/1 55/23/1
+f 53/24/1 147/25/1 90/22/1
+f 147/25/1 145/26/1 90/22/1
+f 145/26/1 92/27/1 90/22/1
+f 51/28/1 149/29/1 53/24/1
+f 149/29/1 147/25/1 53/24/1
+f 51/28/1 30/30/1 149/29/1
+f 51/28/1 152/31/1 30/30/1
+f 143/32/1 92/27/1 145/26/1
+f 51/28/1 154/33/1 152/31/1
+f 141/34/1 92/27/1 143/32/1
+f 139/35/1 92/27/1 141/34/1
+f 137/36/1 92/27/1 139/35/1
+f 51/28/1 156/37/1 154/33/1
+f 29/38/1 92/27/1 137/36/1
+f 134/39/1 92/27/1 29/38/1
+f 28/40/1 92/27/1 134/39/1
+f 5/41/1 156/37/1 51/28/1
+f 5/41/1 158/42/1 156/37/1
+f 27/43/1 92/27/1 28/40/1
+f 4/44/1 158/42/1 5/41/1
+f 4/44/1 31/45/1 158/42/1
+f 26/46/1 92/27/1 27/43/1
+f 26/46/1 94/47/1 92/27/1
+f 47/48/1 31/45/1 4/44/1
+f 3/49/1 31/45/1 47/48/1
+f 3/49/1 161/50/1 31/45/1
+f 44/51/1 161/50/1 3/49/1
+f 129/52/1 94/47/1 26/46/1
+f 2/53/1 161/50/1 44/51/1
+f 1/54/1 161/50/1 2/53/1
+f 40/55/1 161/50/1 1/54/1
+f 179/56/1 161/50/1 40/55/1
+f 39/57/1 161/50/1 179/56/1
+f 25/58/1 94/47/1 129/52/1
+f 38/59/1 161/50/1 39/57/1
+f 175/60/1 161/50/1 38/59/1
+f 175/60/1 32/61/1 161/50/1
+f 173/62/1 32/61/1 175/60/1
+f 25/58/1 96/63/1 94/47/1
+f 126/64/1 96/63/1 25/58/1
+f 37/65/1 32/61/1 173/62/1
+f 37/65/1 33/66/1 32/61/1
+f 36/67/1 33/66/1 37/65/1
+f 36/67/1 34/68/1 33/66/1
+f 169/69/1 34/68/1 36/67/1
+f 169/69/1 35/70/1 34/68/1
+f 167/71/1 35/70/1 169/69/1
+f 124/72/1 96/63/1 126/64/1
+f 122/73/1 96/63/1 124/72/1
+f 24/74/1 96/63/1 122/73/1
+f 119/75/1 96/63/1 24/74/1
+f 119/75/1 15/76/1 96/63/1
+f 117/77/1 15/76/1 119/75/1
+f 23/78/1 15/76/1 117/77/1
+f 22/79/1 15/76/1 23/78/1
+f 113/80/1 15/76/1 22/79/1
+f 21/81/1 15/76/1 113/80/1
+f 21/81/1 99/82/1 15/76/1
+f 110/83/1 99/82/1 21/81/1
+f 110/83/1 101/84/1 99/82/1
+f 20/85/1 101/84/1 110/83/1
+f 20/85/1 103/86/1 101/84/1
+f 19/87/1 103/86/1 20/85/1
+f 19/87/1 16/88/1 103/86/1
+f 18/89/1 16/88/1 19/87/1
+f 18/89/1 17/90/1 16/88/1
+f 2/53/2 41/54/3 1/54/4
+f 44/51/5 42/91/6 2/53/2
+f 3/49/7 43/51/8 44/51/5
+f 47/48/9 45/49/10 3/49/7
+f 4/44/11 46/48/12 47/48/9
+f 5/41/13 48/92/14 4/44/15
+f 51/28/16 49/41/17 5/41/13
+f 53/24/18 50/28/19 51/28/16
+f 55/23/20 52/24/21 53/24/22
+f 6/21/23 54/93/24 55/23/20
+f 58/15/25 56/21/26 6/21/23
+f 58/15/25 59/10/27 57/15/28
+f 7/10/29 60/7/30 59/10/27
+f 61/7/31 62/94/32 60/7/30
+f 63/1/33 64/3/34 62/94/32
+f 65/3/35 66/2/36 64/3/34
+f 8/2/37 67/4/38 66/2/36
+f 9/4/39 68/5/40 67/4/38
+f 69/5/41 70/6/42 68/5/40
+f 71/6/43 72/8/44 70/6/42
+f 10/9/45 72/8/44 73/8/46
+f 10/9/45 75/11/47 74/9/48
+f 12/12/49 75/11/47 11/11/50
+f 78/13/51 76/12/52 12/12/49
+f 80/14/53 77/13/54 78/13/55
+f 80/14/53 81/16/56 79/14/57
+f 84/17/58 81/16/56 82/16/59
+f 84/17/58 85/95/60 83/17/61
+f 13/19/62 85/95/60 86/18/63
+f 14/20/64 87/19/65 13/19/66
+f 90/22/67 88/20/68 14/20/64
+f 92/27/69 89/22/70 90/22/67
+f 94/47/71 91/96/72 92/27/69
+f 96/63/73 93/47/74 94/47/71
+f 15/76/75 95/63/76 96/63/73
+f 99/82/77 97/76/78 15/76/75
+f 101/84/79 98/82/80 99/82/77
+f 101/84/79 102/86/81 100/97/82
+f 16/88/83 102/86/81 103/86/84
+f 17/90/85 104/98/86 16/88/83
+f 18/89/87 105/90/88 17/90/85
+f 19/87/89 106/89/90 18/89/87
+f 19/87/91 108/85/92 107/87/93
+f 20/85/94 109/83/95 108/85/92
+f 110/83/96 111/81/97 109/83/95
+f 113/80/98 111/81/97 21/81/99
+f 22/79/100 112/80/101 113/80/98
+f 23/78/102 114/79/103 22/79/100
+f 117/77/104 115/78/105 23/78/102
+f 117/77/104 118/75/106 116/77/107
+f 119/75/108 120/74/109 118/75/106
+f 122/73/110 120/74/111 24/74/112
+f 124/72/113 121/73/114 122/73/110
+f 126/64/115 123/72/116 124/72/113
+f 25/58/117 125/64/118 126/64/115
+f 129/52/119 127/58/120 25/58/121
+f 26/46/122 128/52/123 129/52/119
+f 27/43/124 130/46/125 26/46/122
+f 28/40/126 131/43/127 27/43/124
+f 134/39/128 132/40/129 28/40/126
+f 29/38/130 133/39/131 134/39/128
+f 137/36/132 135/38/133 29/38/130
+f 137/36/134 138/35/135 136/36/136
+f 141/34/137 138/35/135 139/35/138
+f 143/32/139 140/34/140 141/34/141
+f 145/26/142 142/32/143 143/32/144
+f 147/25/145 144/99/146 145/26/142
+f 147/25/145 148/29/147 146/100/148
+f 30/30/149 148/29/147 149/29/150
+f 152/31/151 150/30/152 30/30/149
+f 154/33/153 151/31/154 152/31/151
+f 156/37/155 153/33/156 154/33/153
+f 158/42/157 155/37/158 156/37/159
+f 31/45/160 157/42/161 158/42/162
+f 31/45/163 160/50/164 159/45/165
+f 32/61/166 160/50/164 161/50/167
+f 32/61/166 163/66/168 162/61/169
+f 34/68/170 163/66/168 33/66/171
+f 35/70/172 164/68/173 34/68/170
+f 167/71/174 165/70/175 35/70/172
+f 167/71/176 168/69/177 166/71/178
+f 36/67/179 168/69/177 169/69/180
+f 37/65/181 170/101/182 36/67/183
+f 173/62/184 171/65/185 37/65/186
+f 175/60/187 172/62/188 173/62/184
+f 38/59/189 174/60/190 175/60/187
+f 38/59/189 177/57/146 176/59/191
+f 179/56/192 177/57/146 39/57/193
+f 179/56/192 180/55/194 178/56/195
+f 1/54/196 180/55/194 40/55/197
+f 390/102/198 182/103/198 181/104/198
+f 389/105/198 182/103/198 390/102/198
+f 389/105/198 183/106/198 182/103/198
+f 388/107/198 183/106/198 389/105/198
+f 388/107/198 184/108/198 183/106/198
+f 387/109/198 184/108/198 388/107/198
+f 387/109/198 185/110/198 184/108/198
+f 386/111/198 185/110/198 387/109/198
+f 386/111/198 186/112/198 185/110/198
+f 385/113/198 186/112/198 386/111/198
+f 385/113/198 187/114/198 186/112/198
+f 384/115/198 187/114/198 385/113/198
+f 384/115/198 188/116/198 187/114/198
+f 383/117/198 188/116/198 384/115/198
+f 383/117/198 189/118/198 188/116/198
+f 382/119/198 189/118/198 383/117/198
+f 382/119/198 190/120/198 189/118/198
+f 381/121/198 190/120/198 382/119/198
+f 381/121/198 191/122/198 190/120/198
+f 380/123/198 191/122/198 381/121/198
+f 380/123/198 192/124/198 191/122/198
+f 379/125/198 192/124/198 380/123/198
+f 379/125/198 193/126/198 192/124/198
+f 378/127/198 193/126/198 379/125/198
+f 378/127/198 194/128/198 193/126/198
+f 377/129/198 194/128/198 378/127/198
+f 377/129/198 195/130/198 194/128/198
+f 376/131/198 195/130/198 377/129/198
+f 376/131/198 196/132/198 195/130/198
+f 375/133/198 196/132/198 376/131/198
+f 375/133/198 197/134/198 196/132/198
+f 374/135/198 197/134/198 375/133/198
+f 374/135/198 198/136/198 197/134/198
+f 373/137/198 198/136/198 374/135/198
+f 373/137/198 199/138/198 198/136/198
+f 372/139/198 199/138/198 373/137/198
+f 372/139/198 200/140/198 199/138/198
+f 371/141/198 200/140/198 372/139/198
+f 371/141/198 201/142/198 200/140/198
+f 370/143/198 201/142/198 371/141/198
+f 370/143/198 202/144/198 201/142/198
+f 370/143/198 203/145/198 202/144/198
+f 369/146/198 226/147/198 370/143/198
+f 226/147/198 203/145/198 370/143/198
+f 226/147/198 204/148/198 203/145/198
+f 369/146/198 227/149/198 226/147/198
+f 225/150/198 204/148/198 226/147/198
+f 369/146/198 228/151/198 227/149/198
+f 224/152/198 204/148/198 225/150/198
+f 369/146/198 229/153/198 228/151/198
+f 368/154/198 229/153/198 369/146/198
+f 223/155/198 204/148/198 224/152/198
+f 368/154/198 230/156/198 229/153/198
+f 223/155/198 205/157/198 204/148/198
+f 368/154/198 231/158/198 230/156/198
+f 222/159/198 205/157/198 223/155/198
+f 368/154/198 232/160/198 231/158/198
+f 222/159/198 206/161/198 205/157/198
+f 368/154/198 233/162/198 232/160/198
+f 367/163/198 233/162/198 368/154/198
+f 221/164/198 206/161/198 222/159/198
+f 221/164/198 207/165/198 206/161/198
+f 367/163/198 234/166/198 233/162/198
+f 221/164/198 208/167/198 207/165/198
+f 221/164/198 209/168/198 208/167/198
+f 367/163/198 235/169/198 234/166/198
+f 220/170/198 209/168/198 221/164/198
+f 220/170/198 210/171/198 209/168/198
+f 366/172/198 235/169/198 367/163/198
+f 220/170/198 211/173/198 210/171/198
+f 219/174/198 211/173/198 220/170/198
+f 366/172/198 236/175/198 235/169/198
+f 219/174/198 212/176/198 211/173/198
+f 218/177/198 212/176/198 219/174/198
+f 218/177/198 213/178/198 212/176/198
+f 218/177/198 214/179/198 213/178/198
+f 217/180/198 214/179/198 218/177/198
+f 366/172/198 237/181/198 236/175/198
+f 217/180/198 215/182/198 214/179/198
+f 216/183/198 215/182/198 217/180/198
+f 365/184/198 237/181/198 366/172/198
+f 365/184/198 238/185/198 237/181/198
+f 365/184/198 239/186/198 238/185/198
+f 365/184/198 240/187/198 239/186/198
+f 364/188/198 240/187/198 365/184/198
+f 364/188/198 241/189/198 240/187/198
+f 364/188/198 242/190/198 241/189/198
+f 364/188/198 243/191/198 242/190/198
+f 363/192/198 243/191/198 364/188/198
+f 363/192/198 244/193/198 243/191/198
+f 363/192/198 245/194/198 244/193/198
+f 363/192/198 246/195/198 245/194/198
+f 363/192/198 247/196/198 246/195/198
+f 363/192/198 248/197/198 247/196/198
+f 363/192/198 249/198/198 248/197/198
+f 362/199/198 249/198/198 363/192/198
+f 362/199/198 250/200/198 249/198/198
+f 362/199/198 251/201/198 250/200/198
+f 362/199/198 252/202/198 251/201/198
+f 362/199/198 253/203/198 252/202/198
+f 361/204/198 253/203/198 362/199/198
+f 361/204/198 254/205/198 253/203/198
+f 360/206/198 254/205/198 361/204/198
+f 360/206/198 255/207/198 254/205/198
+f 360/206/198 256/208/198 255/207/198
+f 359/209/198 256/208/198 360/206/198
+f 358/210/198 256/208/198 359/209/198
+f 358/210/198 257/211/198 256/208/198
+f 357/212/198 257/211/198 358/210/198
+f 357/212/198 258/213/198 257/211/198
+f 356/214/198 258/213/198 357/212/198
+f 355/215/198 258/213/198 356/214/198
+f 354/216/198 258/213/198 355/215/198
+f 353/217/198 258/213/198 354/216/198
+f 353/217/198 259/218/198 258/213/198
+f 352/219/198 259/218/198 353/217/198
+f 351/220/198 259/218/198 352/219/198
+f 350/221/198 259/218/198 351/220/198
+f 349/222/198 259/218/198 350/221/198
+f 348/223/198 259/218/198 349/222/198
+f 348/223/198 260/224/198 259/218/198
+f 347/225/198 260/224/198 348/223/198
+f 346/226/198 260/224/198 347/225/198
+f 345/227/198 260/224/198 346/226/198
+f 345/227/198 261/228/198 260/224/198
+f 344/229/198 261/228/198 345/227/198
+f 343/230/198 261/228/198 344/229/198
+f 342/231/198 261/228/198 343/230/198
+f 342/231/198 262/232/198 261/228/198
+f 341/233/198 262/232/198 342/231/198
+f 320/234/198 322/235/198 321/236/198
+f 319/237/198 322/235/198 320/234/198
+f 319/237/198 323/238/198 322/235/198
+f 318/239/198 323/238/198 319/237/198
+f 318/239/198 324/240/198 323/238/198
+f 340/241/198 262/232/198 341/233/198
+f 317/242/198 324/240/198 318/239/198
+f 317/242/198 325/243/198 324/240/198
+f 316/244/198 325/243/198 317/242/198
+f 315/245/198 325/243/198 316/244/198
+f 315/245/198 326/246/198 325/243/198
+f 340/241/198 263/247/198 262/232/198
+f 339/248/198 263/247/198 340/241/198
+f 314/249/198 326/246/198 315/245/198
+f 313/250/198 326/246/198 314/249/198
+f 313/250/198 327/251/198 326/246/198
+f 312/252/198 327/251/198 313/250/198
+f 338/253/198 263/247/198 339/248/198
+f 311/254/198 327/251/198 312/252/198
+f 337/255/198 263/247/198 338/253/198
+f 337/255/198 264/256/198 263/247/198
+f 311/254/198 328/257/198 327/251/198
+f 310/258/198 328/257/198 311/254/198
+f 336/259/198 264/256/198 337/255/198
+f 309/260/198 328/257/198 310/258/198
+f 309/260/198 329/261/198 328/257/198
+f 335/262/198 264/256/198 336/259/198
+f 334/263/198 264/256/198 335/262/198
+f 334/263/198 265/264/198 264/256/198
+f 309/260/198 330/265/198 329/261/198
+f 333/266/198 265/264/198 334/263/198
+f 308/267/198 330/265/198 309/260/198
+f 332/268/198 265/264/198 333/266/198
+f 308/267/198 331/269/198 330/265/198
+f 331/269/198 265/264/198 332/268/198
+f 308/267/198 265/264/198 331/269/198
+f 307/270/198 265/264/198 308/267/198
+f 307/270/198 266/271/198 265/264/198
+f 306/272/198 266/271/198 307/270/198
+f 306/272/198 267/273/198 266/271/198
+f 305/274/198 267/273/198 306/272/198
+f 305/274/198 268/275/198 267/273/198
+f 304/276/198 268/275/198 305/274/198
+f 304/276/198 269/277/198 268/275/198
+f 303/278/198 269/277/198 304/276/198
+f 303/278/198 270/279/198 269/277/198
+f 302/280/198 270/279/198 303/278/198
+f 302/280/198 271/281/198 270/279/198
+f 301/282/198 271/281/198 302/280/198
+f 301/282/198 272/283/198 271/281/198
+f 300/284/198 272/283/198 301/282/198
+f 300/284/198 273/285/198 272/283/198
+f 299/286/198 273/285/198 300/284/198
+f 299/286/198 274/287/198 273/285/198
+f 298/288/198 274/287/198 299/286/198
+f 298/288/198 275/289/198 274/287/198
+f 297/290/198 275/289/198 298/288/198
+f 297/290/198 276/291/198 275/289/198
+f 296/292/198 276/291/198 297/290/198
+f 295/293/198 276/291/198 296/292/198
+f 295/293/198 277/294/198 276/291/198
+f 294/295/198 277/294/198 295/293/198
+f 294/295/198 278/296/198 277/294/198
+f 293/297/198 278/296/198 294/295/198
+f 293/297/198 279/298/198 278/296/198
+f 292/299/198 279/298/198 293/297/198
+f 292/299/198 280/300/198 279/298/198
+f 291/301/198 280/300/198 292/299/198
+f 291/301/198 281/302/198 280/300/198
+f 290/303/198 281/302/198 291/301/198
+f 290/303/198 282/304/198 281/302/198
+f 289/305/198 282/304/198 290/303/198
+f 289/305/198 283/306/198 282/304/198
+f 288/307/198 283/306/198 289/305/198
+f 288/307/198 284/308/198 283/306/198
+f 287/309/198 284/308/198 288/307/198
+f 287/309/198 285/310/198 284/308/198
+f 286/311/198 285/310/198 287/309/198
+f 182/103/199 391/104/199 181/104/199
+f 186/112/200 395/110/200 185/110/200
+f 190/120/201 399/118/201 189/118/201
+f 194/128/202 403/126/202 193/126/202
+f 198/136/203 407/134/203 197/134/203
+f 202/144/204 411/142/204 201/142/204
+f 206/161/205 415/157/205 205/157/205
+f 380/123/206 589/125/206 379/125/206
+f 210/171/207 419/168/207 209/168/207
+f 214/179/208 423/178/208 213/178/208
+f 342/231/209 551/233/209 341/233/209
+f 226/147/210 435/150/210 225/150/210
+f 230/156/211 439/153/211 229/153/211
+f 234/166/212 443/162/212 233/162/212
+f 238/185/213 447/181/213 237/181/213
+f 242/190/214 451/312/214 241/189/214
+f 246/195/215 455/194/215 245/194/215
+f 250/200/216 459/198/216 249/198/216
+f 254/205/217 463/203/217 253/203/217
+f 258/213/218 467/211/218 257/211/218
+f 384/115/219 593/117/219 383/117/219
+f 262/232/220 471/228/220 261/228/220
+f 266/271/221 475/264/221 265/264/221
+f 365/184/222 574/188/222 364/188/222
+f 270/279/223 479/277/223 269/277/223
+f 274/287/202 483/285/202 273/285/202
+f 278/296/224 487/294/224 277/294/224
+f 282/304/225 491/302/225 281/302/225
+f 286/311/226 495/310/226 285/310/226
+f 297/290/206 508/288/206 507/290/206
+f 302/280/227 511/282/227 301/282/227
+f 306/272/228 515/274/228 305/274/228
+f 310/258/229 519/260/229 309/260/229
+f 388/107/230 597/109/230 387/109/230
+f 314/249/231 523/250/231 313/250/231
+f 318/239/232 527/242/232 317/242/232
+f 369/146/233 578/154/233 368/154/233
+f 322/235/234 531/236/234 321/236/234
+f 326/246/235 535/243/235 325/243/235
+f 338/253/236 547/255/236 337/255/236
+f 345/227/237 556/226/237 555/227/237
+f 350/221/238 559/222/238 349/222/238
+f 354/216/239 563/217/239 353/217/239
+f 181/104/240 600/102/240 390/102/240
+f 297/290/206 506/292/206 296/292/206
+f 357/212/241 568/210/241 567/212/241
+f 183/106/242 392/103/242 182/103/242
+f 187/114/243 396/112/243 186/112/243
+f 191/122/244 400/120/244 190/120/244
+f 195/130/202 404/128/202 194/128/202
+f 199/138/245 408/136/245 198/136/245
+f 220/170/246 431/164/246 430/170/246
+f 203/145/247 412/144/247 202/144/247
+f 207/165/248 416/161/248 206/161/248
+f 211/173/249 420/171/249 210/171/249
+f 215/182/250 424/179/250 214/179/250
+f 219/174/251 428/177/251 218/177/251
+f 223/155/252 432/159/252 222/159/252
+f 374/135/253 583/137/253 373/137/253
+f 227/149/254 436/147/254 226/147/254
+f 362/199/255 571/204/255 361/204/255
+f 231/158/256 440/156/256 230/156/256
+f 225/150/257 434/152/257 224/152/257
+f 239/186/258 448/185/258 238/185/258
+f 243/191/259 452/313/259 242/190/259
+f 247/196/216 456/314/216 246/195/216
+f 251/201/216 460/200/216 250/200/216
+f 305/274/260 514/276/260 304/276/260
+f 255/207/261 464/205/261 254/205/261
+f 259/218/262 468/213/262 258/213/262
+f 263/247/263 472/232/263 262/232/263
+f 267/273/264 476/271/264 266/271/264
+f 271/281/265 480/279/265 270/279/265
+f 275/289/202 484/287/202 274/287/202
+f 279/298/266 488/296/266 278/296/266
+f 365/184/267 576/172/267 575/184/267
+f 283/306/268 492/304/268 282/304/268
+f 287/309/269 496/311/269 286/311/269
+f 291/301/270 500/303/270 290/303/270
+f 295/293/271 504/295/271 294/295/271
+f 328/257/272 537/251/272 327/251/272
+f 311/254/273 520/258/273 310/258/273
+f 290/303/274 499/305/274 289/305/274
+f 314/249/275 525/245/275 524/249/275
+f 319/237/276 528/239/276 318/239/276
+f 323/238/277 532/235/277 322/235/277
+f 327/251/278 536/246/278 326/246/278
+f 331/269/279 540/265/279 330/265/279
+f 370/143/280 579/146/280 369/146/280
+f 335/262/281 544/263/281 334/263/281
+f 339/248/282 548/253/282 338/253/282
+f 342/231/283 553/230/283 552/231/283
+f 347/225/284 556/226/284 346/226/284
+f 351/220/285 560/221/285 350/221/285
+f 358/210/286 569/209/286 568/210/286
+f 294/295/287 503/297/287 293/297/287
+f 371/141/288 580/143/288 370/143/288
+f 375/133/289 584/135/289 374/135/289
+f 379/125/206 588/127/206 378/127/206
+f 383/117/290 592/119/290 382/119/290
+f 387/109/291 596/111/291 386/111/291
+f 355/215/239 564/216/239 354/216/239
+f 218/177/292 427/180/292 217/180/292
+f 288/307/293 497/309/293 287/309/293
+f 378/127/206 587/129/206 377/129/206
+f 184/108/294 393/106/294 183/106/294
+f 188/116/295 397/114/295 187/114/295
+f 192/124/202 401/122/202 191/122/202
+f 196/132/202 405/130/202 195/130/202
+f 339/248/296 550/241/296 549/248/296
+f 200/140/297 409/138/297 199/138/297
+f 204/148/298 413/145/298 203/145/298
+f 321/236/299 530/234/299 320/234/299
+f 208/167/300 417/165/300 207/165/300
+f 216/183/301 425/182/301 215/182/301
+f 224/152/302 433/155/302 223/155/302
+f 228/151/303 437/149/303 227/149/303
+f 232/160/304 441/158/304 231/158/304
+f 382/119/305 591/121/305 381/121/305
+f 236/175/306 445/169/306 235/169/306
+f 240/187/307 449/186/307 239/186/307
+f 362/199/308 573/192/308 572/199/308
+f 244/193/309 453/315/309 243/191/309
+f 248/197/216 457/196/216 247/196/216
+f 252/202/310 461/201/310 251/201/310
+f 256/208/311 465/207/311 255/207/311
+f 260/224/312 469/218/312 259/218/312
+f 264/256/313 473/247/313 263/247/313
+f 222/159/314 431/164/314 221/164/314
+f 268/275/315 477/273/315 267/273/315
+f 272/283/202 481/281/202 271/281/202
+f 276/291/202 485/289/202 275/289/202
+f 280/300/316 489/298/316 279/298/316
+f 284/308/317 493/306/317 283/306/317
+f 386/111/318 595/113/318 385/113/318
+f 367/163/319 576/172/319 366/172/319
+f 296/292/320 505/293/320 295/293/320
+f 300/284/206 509/286/206 299/286/206
+f 348/223/321 557/225/321 347/225/321
+f 304/276/322 513/278/322 303/278/322
+f 308/267/323 517/270/323 307/270/323
+f 312/252/324 521/254/324 311/254/324
+f 315/245/325 526/244/325 525/245/325
+f 320/234/326 529/237/326 319/237/326
+f 324/240/327 533/238/327 323/238/327
+f 332/268/328 541/269/328 331/269/328
+f 336/259/329 545/262/329 335/262/329
+f 390/102/330 599/105/330 389/105/330
+f 344/229/331 553/230/331 343/230/331
+f 352/219/239 561/220/239 351/220/239
+f 356/214/239 565/316/239 355/215/239
+f 337/255/332 546/259/332 336/259/332
+f 334/263/333 543/266/333 333/266/333
+f 299/286/206 508/288/206 298/288/206
+f 185/110/334 394/108/334 184/108/334
+f 189/118/335 398/116/335 188/116/335
+f 193/126/202 402/124/202 192/124/202
+f 197/134/336 406/132/336 196/132/336
+f 201/142/337 410/140/337 200/140/337
+f 360/206/338 569/209/338 359/209/338
+f 205/157/339 414/148/339 204/148/339
+f 209/168/340 418/167/340 208/167/340
+f 213/178/341 422/176/341 212/176/341
+f 217/180/342 426/183/342 216/183/342
+f 303/278/343 512/280/343 302/280/343
+f 229/153/344 438/151/344 228/151/344
+f 233/162/345 442/160/345 232/160/345
+f 237/181/346 446/175/346 236/175/346
+f 241/189/347 450/187/347 240/187/347
+f 245/194/348 454/193/348 244/193/348
+f 249/198/216 458/197/216 248/197/216
+f 253/203/349 462/202/349 252/202/349
+f 364/188/350 573/192/350 363/192/350
+f 257/211/351 466/208/351 256/208/351
+f 345/227/352 554/229/352 344/229/352
+f 265/264/353 474/256/353 264/256/353
+f 269/277/354 478/275/354 268/275/354
+f 273/285/202 482/283/202 272/283/202
+f 277/294/355 486/291/355 276/291/355
+f 307/270/356 516/272/356 306/272/356
+f 281/302/357 490/300/357 280/300/357
+f 285/310/358 494/308/358 284/308/358
+f 289/305/359 498/307/359 288/307/359
+f 292/299/360 503/297/360 502/299/360
+f 368/154/361 577/163/361 367/163/361
+f 308/267/362 519/260/362 518/267/362
+f 313/250/363 522/252/363 312/252/363
+f 317/242/364 526/244/364 316/244/364
+f 301/282/206 510/284/206 300/284/206
+f 212/176/365 421/173/365 211/173/365
+f 330/265/366 539/261/366 329/261/366
+f 325/243/367 534/240/367 324/240/367
+f 329/261/368 538/257/368 328/257/368
+f 333/266/369 542/268/369 332/268/369
+f 292/299/370 501/301/370 291/301/370
+f 341/233/371 550/241/371 340/241/371
+f 349/222/372 558/223/372 348/223/372
+f 353/217/239 562/219/239 352/219/239
+f 357/212/373 566/317/373 356/214/373
+f 372/139/374 581/141/374 371/141/374
+f 361/204/375 570/318/375 360/206/375
+f 235/169/376 444/166/376 234/166/376
+f 372/139/377 583/137/377 582/139/377
+f 377/129/206 586/131/206 376/131/206
+f 381/121/206 590/123/206 380/123/206
+f 385/113/378 594/115/378 384/115/378
+f 389/105/379 598/107/379 388/107/379
+f 376/131/380 585/133/380 375/133/380
+f 220/170/381 429/174/381 219/174/381
+f 2/53/2 42/91/6 41/54/3
+f 44/51/5 43/51/8 42/91/6
+f 3/49/7 45/49/10 43/51/8
+f 47/48/9 46/48/12 45/49/10
+f 4/44/15 48/92/382 46/48/12
+f 5/41/13 49/41/383 48/92/14
+f 51/28/384 50/28/385 49/41/17
+f 53/24/18 52/24/386 50/28/19
+f 55/23/20 54/93/24 52/24/387
+f 6/21/23 56/21/26 54/93/24
+f 58/15/25 57/15/28 56/21/26
+f 58/15/25 7/10/29 59/10/27
+f 7/10/388 61/7/31 60/7/30
+f 61/7/31 63/1/33 62/94/32
+f 63/1/33 65/3/35 64/3/34
+f 65/3/389 8/2/37 66/2/36
+f 8/2/37 9/4/39 67/4/38
+f 9/4/390 69/5/391 68/5/40
+f 69/5/41 71/6/43 70/6/42
+f 71/6/43 73/8/46 72/8/44
+f 10/9/392 74/9/48 72/8/44
+f 10/9/393 11/11/50 75/11/47
+f 12/12/49 76/12/52 75/11/47
+f 78/13/55 77/13/54 76/12/52
+f 80/14/53 79/14/57 77/13/54
+f 80/14/53 82/16/59 81/16/56
+f 84/17/58 83/17/61 81/16/56
+f 84/17/58 86/18/63 85/95/60
+f 13/19/66 87/19/65 85/95/60
+f 14/20/394 88/20/68 87/19/65
+f 90/22/67 89/22/70 88/20/68
+f 92/27/69 91/96/72 89/22/70
+f 94/47/71 93/47/74 91/96/72
+f 96/63/73 95/63/76 93/47/74
+f 15/76/75 97/76/78 95/63/76
+f 99/82/77 98/82/80 97/76/78
+f 101/84/79 100/97/82 98/82/80
+f 101/84/79 103/86/84 102/86/81
+f 16/88/83 104/98/86 102/86/81
+f 17/90/395 105/90/88 104/98/86
+f 18/89/87 106/89/90 105/90/88
+f 19/87/91 107/87/93 106/89/90
+f 19/87/91 20/85/94 108/85/92
+f 20/85/94 110/83/96 109/83/95
+f 110/83/96 21/81/99 111/81/97
+f 113/80/98 112/80/101 111/81/97
+f 22/79/100 114/79/103 112/80/101
+f 23/78/396 115/78/397 114/79/103
+f 117/77/104 116/77/107 115/78/105
+f 117/77/104 119/75/398 118/75/106
+f 119/75/398 24/74/112 120/74/109
+f 122/73/110 121/73/114 120/74/111
+f 124/72/113 123/72/116 121/73/114
+f 126/64/115 125/64/118 123/72/116
+f 25/58/121 127/58/120 125/64/118
+f 129/52/119 128/52/399 127/58/120
+f 26/46/122 130/46/125 128/52/123
+f 27/43/124 131/43/127 130/46/125
+f 28/40/126 132/40/129 131/43/127
+f 134/39/400 133/39/131 132/40/129
+f 29/38/401 135/38/133 133/39/131
+f 137/36/134 136/36/136 135/38/133
+f 137/36/132 139/35/138 138/35/135
+f 141/34/402 140/34/140 138/35/135
+f 143/32/403 142/32/143 140/34/140
+f 145/26/404 144/99/146 142/32/143
+f 147/25/145 146/100/148 144/99/146
+f 147/25/145 149/29/150 148/29/147
+f 30/30/149 150/30/152 148/29/147
+f 152/31/405 151/31/154 150/30/152
+f 154/33/153 153/33/156 151/31/154
+f 156/37/159 155/37/158 153/33/156
+f 158/42/157 157/42/161 155/37/158
+f 31/45/163 159/45/165 157/42/161
+f 31/45/406 161/50/167 160/50/164
+f 32/61/166 162/61/169 160/50/164
+f 32/61/166 33/66/171 163/66/168
+f 34/68/407 164/68/173 163/66/168
+f 35/70/172 165/70/175 164/68/173
+f 167/71/174 166/71/178 165/70/175
+f 167/71/174 169/69/180 168/69/177
+f 36/67/179 170/101/182 168/69/177
+f 37/65/186 171/65/185 170/101/182
+f 173/62/184 172/62/188 171/65/185
+f 175/60/187 174/60/190 172/62/188
+f 38/59/189 176/59/191 174/60/190
+f 38/59/189 39/57/193 177/57/146
+f 179/56/192 178/56/195 177/57/146
+f 179/56/192 40/55/197 180/55/194
+f 1/54/408 41/54/3 180/55/194
+f 182/103/199 392/103/199 391/104/199
+f 186/112/200 396/112/200 395/110/200
+f 190/120/201 400/120/201 399/118/201
+f 194/128/202 404/128/202 403/126/202
+f 198/136/409 408/136/409 407/134/409
+f 202/144/204 412/144/204 411/142/204
+f 206/161/205 416/161/205 415/157/205
+f 380/123/206 590/123/206 589/125/206
+f 210/171/207 420/171/207 419/168/207
+f 214/179/208 424/179/208 423/178/208
+f 342/231/209 552/231/209 551/233/209
+f 226/147/210 436/147/210 435/150/210
+f 230/156/211 440/156/211 439/153/211
+f 234/166/212 444/166/212 443/162/212
+f 238/185/213 448/185/213 447/181/213
+f 242/190/214 452/313/214 451/312/214
+f 246/195/215 456/314/215 455/194/215
+f 250/200/216 460/200/216 459/198/216
+f 254/205/217 464/205/217 463/203/217
+f 258/213/218 468/213/218 467/211/218
+f 384/115/219 594/115/219 593/117/219
+f 262/232/220 472/232/220 471/228/220
+f 266/271/221 476/271/221 475/264/221
+f 365/184/222 575/184/222 574/188/222
+f 270/279/223 480/279/223 479/277/223
+f 274/287/202 484/287/202 483/285/202
+f 278/296/224 488/296/224 487/294/224
+f 282/304/225 492/304/225 491/302/225
+f 286/311/226 496/311/226 495/310/226
+f 297/290/206 298/288/206 508/288/206
+f 302/280/227 512/280/227 511/282/227
+f 306/272/228 516/272/228 515/274/228
+f 310/258/229 520/258/229 519/260/229
+f 388/107/230 598/107/230 597/109/230
+f 314/249/231 524/249/231 523/250/231
+f 318/239/232 528/239/232 527/242/232
+f 369/146/233 579/146/233 578/154/233
+f 322/235/234 532/235/234 531/236/234
+f 326/246/235 536/246/235 535/243/235
+f 338/253/236 548/253/236 547/255/236
+f 345/227/237 346/226/237 556/226/237
+f 350/221/238 560/221/238 559/222/238
+f 354/216/239 564/216/239 563/217/239
+f 181/104/240 391/104/240 600/102/240
+f 297/290/206 507/290/206 506/292/206
+f 357/212/241 358/210/241 568/210/241
+f 183/106/242 393/106/242 392/103/242
+f 187/114/243 397/114/243 396/112/243
+f 191/122/244 401/122/244 400/120/244
+f 195/130/202 405/130/202 404/128/202
+f 199/138/245 409/138/245 408/136/245
+f 220/170/246 221/164/246 431/164/246
+f 203/145/247 413/145/247 412/144/247
+f 207/165/248 417/165/248 416/161/248
+f 211/173/249 421/173/249 420/171/249
+f 215/182/250 425/182/250 424/179/250
+f 219/174/251 429/174/251 428/177/251
+f 223/155/252 433/155/252 432/159/252
+f 374/135/253 584/135/253 583/137/253
+f 227/149/254 437/149/254 436/147/254
+f 362/199/255 572/199/255 571/204/255
+f 231/158/256 441/158/256 440/156/256
+f 225/150/257 435/150/257 434/152/257
+f 239/186/258 449/186/258 448/185/258
+f 243/191/259 453/315/259 452/313/259
+f 247/196/216 457/196/216 456/314/216
+f 251/201/216 461/201/216 460/200/216
+f 305/274/260 515/274/260 514/276/260
+f 255/207/261 465/207/261 464/205/261
+f 259/218/262 469/218/262 468/213/262
+f 263/247/263 473/247/263 472/232/263
+f 267/273/264 477/273/264 476/271/264
+f 271/281/265 481/281/265 480/279/265
+f 275/289/202 485/289/202 484/287/202
+f 279/298/266 489/298/266 488/296/266
+f 365/184/267 366/172/267 576/172/267
+f 283/306/268 493/306/268 492/304/268
+f 287/309/269 497/309/269 496/311/269
+f 291/301/270 501/301/270 500/303/270
+f 295/293/271 505/293/271 504/295/271
+f 328/257/272 538/257/272 537/251/272
+f 311/254/273 521/254/273 520/258/273
+f 290/303/274 500/303/274 499/305/274
+f 314/249/275 315/245/275 525/245/275
+f 319/237/276 529/237/276 528/239/276
+f 323/238/277 533/238/277 532/235/277
+f 327/251/278 537/251/278 536/246/278
+f 331/269/279 541/269/279 540/265/279
+f 370/143/280 580/143/280 579/146/280
+f 335/262/281 545/262/281 544/263/281
+f 339/248/282 549/248/282 548/253/282
+f 342/231/283 343/230/283 553/230/283
+f 347/225/284 557/225/284 556/226/284
+f 351/220/285 561/220/285 560/221/285
+f 358/210/286 359/209/286 569/209/286
+f 294/295/287 504/295/287 503/297/287
+f 371/141/288 581/141/288 580/143/288
+f 375/133/289 585/133/289 584/135/289
+f 379/125/206 589/125/206 588/127/206
+f 383/117/290 593/117/290 592/119/290
+f 387/109/291 597/109/291 596/111/291
+f 218/177/292 428/177/292 427/180/292
+f 288/307/293 498/307/293 497/309/293
+f 378/127/206 588/127/206 587/129/206
+f 184/108/294 394/108/294 393/106/294
+f 188/116/295 398/116/295 397/114/295
+f 192/124/202 402/124/202 401/122/202
+f 196/132/202 406/132/202 405/130/202
+f 339/248/296 340/241/296 550/241/296
+f 200/140/297 410/140/297 409/138/297
+f 204/148/298 414/148/298 413/145/298
+f 321/236/299 531/236/299 530/234/299
+f 208/167/300 418/167/300 417/165/300
+f 216/183/301 426/183/301 425/182/301
+f 224/152/302 434/152/302 433/155/302
+f 228/151/303 438/151/303 437/149/303
+f 232/160/304 442/160/304 441/158/304
+f 382/119/305 592/119/305 591/121/305
+f 236/175/306 446/175/306 445/169/306
+f 240/187/307 450/187/307 449/186/307
+f 362/199/308 363/192/308 573/192/308
+f 244/193/309 454/193/309 453/315/309
+f 248/197/216 458/197/216 457/196/216
+f 252/202/310 462/202/310 461/201/310
+f 256/208/311 466/208/311 465/207/311
+f 264/256/313 474/256/313 473/247/313
+f 222/159/314 432/159/314 431/164/314
+f 268/275/315 478/275/315 477/273/315
+f 272/283/202 482/283/202 481/281/202
+f 276/291/202 486/291/202 485/289/202
+f 280/300/316 490/300/316 489/298/316
+f 284/308/317 494/308/317 493/306/317
+f 386/111/318 596/111/318 595/113/318
+f 367/163/319 577/163/319 576/172/319
+f 296/292/320 506/292/320 505/293/320
+f 300/284/206 510/284/206 509/286/206
+f 348/223/321 558/223/321 557/225/321
+f 304/276/322 514/276/322 513/278/322
+f 308/267/323 518/267/323 517/270/323
+f 312/252/324 522/252/324 521/254/324
+f 315/245/325 316/244/325 526/244/325
+f 320/234/326 530/234/326 529/237/326
+f 324/240/327 534/240/327 533/238/327
+f 332/268/328 542/268/328 541/269/328
+f 336/259/329 546/259/329 545/262/329
+f 390/102/330 600/102/330 599/105/330
+f 344/229/331 554/229/331 553/230/331
+f 352/219/239 562/219/239 561/220/239
+f 356/214/239 566/317/239 565/316/239
+f 337/255/332 547/255/332 546/259/332
+f 334/263/333 544/263/333 543/266/333
+f 299/286/206 509/286/206 508/288/206
+f 185/110/334 395/110/334 394/108/334
+f 189/118/335 399/118/335 398/116/335
+f 193/126/202 403/126/202 402/124/202
+f 197/134/336 407/134/336 406/132/336
+f 201/142/337 411/142/337 410/140/337
+f 360/206/338 570/318/338 569/209/338
+f 205/157/410 415/157/410 414/148/410
+f 209/168/340 419/168/340 418/167/340
+f 213/178/341 423/178/341 422/176/341
+f 217/180/342 427/180/342 426/183/342
+f 303/278/343 513/278/343 512/280/343
+f 229/153/344 439/153/344 438/151/344
+f 233/162/345 443/162/345 442/160/345
+f 237/181/346 447/181/346 446/175/346
+f 241/189/347 451/312/347 450/187/347
+f 245/194/348 455/194/348 454/193/348
+f 249/198/216 459/198/216 458/197/216
+f 253/203/349 463/203/349 462/202/349
+f 364/188/350 574/188/350 573/192/350
+f 257/211/351 467/211/351 466/208/351
+f 345/227/352 555/227/352 554/229/352
+f 265/264/353 475/264/353 474/256/353
+f 269/277/354 479/277/354 478/275/354
+f 273/285/202 483/285/202 482/283/202
+f 277/294/355 487/294/355 486/291/355
+f 307/270/356 517/270/356 516/272/356
+f 281/302/357 491/302/357 490/300/357
+f 285/310/358 495/310/358 494/308/358
+f 289/305/359 499/305/359 498/307/359
+f 292/299/360 293/297/360 503/297/360
+f 368/154/361 578/154/361 577/163/361
+f 308/267/362 309/260/362 519/260/362
+f 313/250/363 523/250/363 522/252/363
+f 317/242/364 527/242/364 526/244/364
+f 301/282/206 511/282/206 510/284/206
+f 212/176/365 422/176/365 421/173/365
+f 330/265/366 540/265/366 539/261/366
+f 325/243/367 535/243/367 534/240/367
+f 329/261/368 539/261/368 538/257/368
+f 333/266/369 543/266/369 542/268/369
+f 292/299/370 502/299/370 501/301/370
+f 341/233/371 551/233/371 550/241/371
+f 349/222/372 559/222/372 558/223/372
+f 353/217/239 563/217/239 562/219/239
+f 357/212/373 567/212/373 566/317/373
+f 372/139/374 582/139/374 581/141/374
+f 361/204/375 571/204/375 570/318/375
+f 235/169/376 445/169/376 444/166/376
+f 372/139/377 373/137/377 583/137/377
+f 377/129/206 587/129/206 586/131/206
+f 381/121/206 591/121/206 590/123/206
+f 385/113/378 595/113/378 594/115/378
+f 389/105/379 599/105/379 598/107/379
+f 376/131/380 586/131/380 585/133/380
+f 220/170/381 430/170/381 429/174/381
+f 564/216/239 355/215/239 565/316/239
+f 469/218/312 260/224/312 470/224/312
+f 260/224/411 261/228/411 470/224/411
+f 471/228/411 470/224/411 261/228/411
diff --git a/Telegram/Resources/art/premium/coin_outer.obj b/Telegram/Resources/art/premium/coin_outer.obj
new file mode 100644
index 00000000000000..de81610f687952
--- /dev/null
+++ b/Telegram/Resources/art/premium/coin_outer.obj
@@ -0,0 +1,2363 @@
+# 3D mesh decoded from .binobj (source of truth; baked back to .binobj at build time).
+# UVs are stored raw here; the V coordinate is flipped (1-v) at load time.
+v -0.332026988 24.7804146 -3.92194796
+v -0.332026988 27.6801491 -3.7071259
+v -0.332026988 24.7804146 1.64672995
+v -0.332026988 27.6801491 1.43190801
+v 2.50967407 24.6208248 -3.92194796
+v 2.83432794 27.5023289 -3.70712495
+v 2.50967407 24.6208248 1.64672995
+v 2.83432794 27.5023289 1.43190801
+v 5.31560421 24.144083 -3.92194796
+v 5.96086502 26.9711113 -3.70712495
+v 5.31560421 24.144083 1.64672995
+v 5.96086502 26.9711113 1.43190801
+v 8.05055237 23.3561535 -3.92194796
+v 9.00826359 26.0931683 -3.7071259
+v 8.05055141 23.3561535 1.64672995
+v 9.00826454 26.0931683 1.43190801
+v 10.6800575 22.2669792 -3.92194796
+v 11.9382019 24.879549 -3.7071259
+v 10.6800575 22.2669792 1.64672995
+v 11.9382029 24.879549 1.43190801
+v 13.1710749 20.8902416 -3.92194796
+v 14.7138395 23.3455086 -3.7071259
+v 13.1710758 20.8902416 1.64672995
+v 14.7138395 23.3455086 1.43190801
+v 15.4923172 19.2432308 -3.92194796
+v 17.3002644 21.5103416 -3.7071259
+v 15.4923182 19.2432308 1.64672995
+v 17.3002644 21.5103416 1.43190801
+v 17.6145287 17.3467083 -3.92194891
+v 19.6649513 19.3971272 -3.7071259
+v 17.6145287 17.3467083 1.64672899
+v 19.6649513 19.3971272 1.43190706
+v 19.5110512 15.2244959 -3.92194796
+v 21.778162 17.0324421 -3.7071259
+v 19.5110512 15.2244959 1.64672899
+v 21.778162 17.0324421 1.43190706
+v 21.158062 12.9032555 -3.92194891
+v 23.6133289 14.4460163 -3.7071259
+v 21.158062 12.9032555 1.64672899
+v 23.6133289 14.4460163 1.43190706
+v 22.5347996 10.4122343 -3.92194796
+v 25.1473694 11.6703806 -3.7071259
+v 22.5347996 10.4122343 1.64672899
+v 25.1473694 11.6703815 1.43190706
+v 23.6239738 7.78272915 -3.92194891
+v 26.3609905 8.74044228 -3.70712709
+v 23.6239738 7.78272915 1.64672899
+v 26.3609905 8.74044228 1.43190706
+v 24.4119034 5.04778099 -3.92194891
+v 27.2389317 5.69304085 -3.7071259
+v 24.4119034 5.04778099 1.64672899
+v 27.2389317 5.69304085 1.43190706
+v 24.8886471 2.24185109 -3.92194891
+v 27.7701511 2.56650496 -3.70712709
+v 24.8886471 2.24185109 1.64672899
+v 27.7701511 2.56650496 1.43190706
+v 25.0482349 -0.599849999 -3.92194891
+v 27.9479694 -0.599849999 -3.70712709
+v 25.0482349 -0.599849999 1.64672899
+v 27.9479694 -0.599849999 1.43190598
+v 24.8886471 -3.44155097 -3.92194891
+v 27.7701511 -3.76620603 -3.70712709
+v 24.8886471 -3.44155097 1.64672899
+v 27.7701511 -3.76620603 1.43190598
+v 24.4119034 -6.24748087 -3.9219501
+v 27.2389297 -6.89274216 -3.70712709
+v 24.4119034 -6.24748087 1.64672899
+v 27.2389297 -6.89274216 1.43190598
+v 23.6239758 -8.98242855 -3.9219501
+v 26.3609905 -9.94014168 -3.70712805
+v 23.6239758 -8.98242855 1.64672899
+v 26.3609905 -9.94014168 1.43190598
+v 22.5348015 -11.6119366 -3.92194891
+v 25.1473694 -12.8700819 -3.70712709
+v 22.5348015 -11.6119366 1.64672804
+v 25.1473694 -12.8700809 1.43190598
+v 21.158062 -14.1029539 -3.9219501
+v 23.6133308 -15.6457186 -3.70712709
+v 21.158062 -14.1029539 1.64672804
+v 23.6133308 -15.6457186 1.43190598
+v 19.5110512 -16.4241962 -3.9219501
+v 21.778162 -18.2321434 -3.70712805
+v 19.5110512 -16.4241962 1.64672804
+v 21.778162 -18.2321434 1.43190598
+v 17.6145306 -18.5464058 -3.9219501
+v 19.6649475 -20.5968285 -3.70712805
+v 17.6145306 -18.5464058 1.64672804
+v 19.6649475 -20.5968285 1.43190598
+v 15.4923182 -20.4429283 -3.9219501
+v 17.3002644 -22.7100391 -3.70712805
+v 15.4923191 -20.4429283 1.64672804
+v 17.3002644 -22.7100391 1.43190598
+v 13.1710758 -22.0899391 -3.9219501
+v 14.7138376 -24.5452061 -3.70712805
+v 13.1710768 -22.0899391 1.64672804
+v 14.7138386 -24.5452061 1.43190598
+v 10.6800556 -23.4666767 -3.9219501
+v 11.9382029 -26.0792465 -3.70712805
+v 10.6800566 -23.4666767 1.64672804
+v 11.9382038 -26.0792465 1.43190503
+v 8.05055141 -24.555851 -3.9219501
+v 9.00826454 -27.2928677 -3.70712805
+v 8.05055141 -24.555851 1.64672804
+v 9.00826454 -27.2928677 1.43190503
+v 5.31560421 -25.3437805 -3.9219501
+v 5.96086502 -28.1708088 -3.70712805
+v 5.31560421 -25.3437805 1.64672804
+v 5.96086502 -28.1708088 1.43190503
+v 2.50967407 -25.8205242 -3.9219501
+v 2.83432794 -28.7020283 -3.70712805
+v 2.50967407 -25.8205242 1.64672804
+v 2.83432794 -28.7020283 1.43190503
+v -0.332026988 -25.9801121 -3.92195106
+v -0.332026988 -28.8798466 -3.70712805
+v -0.332026988 -25.9801121 1.64672804
+v -0.332026988 -28.8798466 1.43190503
+v -3.17372799 -25.8205242 -3.92195106
+v -3.49838305 -28.7020283 -3.70712805
+v -3.17372799 -25.8205242 1.64672804
+v -3.49838305 -28.7020283 1.43190503
+v -5.97965813 -25.3437805 -3.9219501
+v -6.62491798 -28.1708069 -3.70712805
+v -5.97965813 -25.3437805 1.64672804
+v -6.62491894 -28.1708069 1.43190503
+v -8.71460724 -24.5558529 -3.9219501
+v -9.67232037 -27.2928677 -3.70712805
+v -8.71460724 -24.5558529 1.64672804
+v -9.67231941 -27.2928677 1.43190503
+v -11.3441153 -23.4666786 -3.9219501
+v -12.6022596 -26.0792465 -3.70712805
+v -11.3441143 -23.4666786 1.64672804
+v -12.6022587 -26.0792465 1.43190503
+v -13.8351326 -22.0899391 -3.9219501
+v -15.3778973 -24.545208 -3.70712805
+v -13.8351316 -22.0899391 1.64672804
+v -15.3778963 -24.545208 1.43190503
+v -16.156374 -20.4429283 -3.9219501
+v -17.9643192 -22.7100391 -3.70712805
+v -16.156374 -20.4429283 1.64672804
+v -17.9643192 -22.7100391 1.43190598
+v -18.2785854 -18.5464077 -3.9219501
+v -20.3290081 -20.5968246 -3.70712805
+v -18.2785854 -18.5464077 1.64672804
+v -20.3290081 -20.5968246 1.43190598
+v -20.175108 -16.4241962 -3.9219501
+v -22.4422188 -18.2321415 -3.70712805
+v -20.175108 -16.4241962 1.64672804
+v -22.4422188 -18.2321415 1.43190598
+v -21.8221169 -14.1029549 -3.9219501
+v -24.2773857 -15.6457176 -3.70712709
+v -21.8221169 -14.1029549 1.64672804
+v -24.2773857 -15.6457176 1.43190598
+v -23.1988564 -11.6119356 -3.92194891
+v -25.8114262 -12.8700819 -3.70712709
+v -23.1988564 -11.6119356 1.64672804
+v -25.8114262 -12.8700809 1.43190598
+v -24.2880306 -8.98242855 -3.9219501
+v -27.0250454 -9.94014263 -3.70712805
+v -24.2880306 -8.98242855 1.64672804
+v -27.0250454 -9.94014263 1.43190598
+v -25.0759602 -6.24748087 -3.92194891
+v -27.9029903 -6.89274216 -3.70712709
+v -25.0759602 -6.24748087 1.64672899
+v -27.9029903 -6.89274216 1.43190598
+v -25.552702 -3.44155192 -3.92194891
+v -28.434206 -3.76620603 -3.70712709
+v -25.552702 -3.44155192 1.64672899
+v -28.434206 -3.76620603 1.43190598
+v -25.7122917 -0.599849999 -3.92194891
+v -28.6120262 -0.599849999 -3.70712709
+v -25.7122917 -0.599849999 1.64672899
+v -28.6120262 -0.599849999 1.43190598
+v -25.552702 2.24185109 -3.92194891
+v -28.434206 2.56650496 -3.70712709
+v -25.552702 2.24185109 1.64672899
+v -28.434206 2.56650496 1.43190706
+v -25.0759602 5.04778099 -3.92194891
+v -27.9029884 5.69304085 -3.70712709
+v -25.0759602 5.04778099 1.64672899
+v -27.9029884 5.69304085 1.43190706
+v -24.2880306 7.78272915 -3.92194891
+v -27.0250454 8.74044132 -3.70712709
+v -24.2880306 7.78272915 1.64672899
+v -27.0250454 8.74044132 1.43190706
+v -23.1988564 10.4122362 -3.92194796
+v -25.8114262 11.6703806 -3.7071259
+v -23.1988564 10.4122362 1.64672899
+v -25.8114262 11.6703815 1.43190706
+v -21.8221188 12.9032536 -3.92194891
+v -24.2773857 14.4460182 -3.7071259
+v -21.8221188 12.9032536 1.64672899
+v -24.2773857 14.4460182 1.43190706
+v -20.175108 15.2244959 -3.92194796
+v -22.4422188 17.0324421 -3.7071259
+v -20.175108 15.2244959 1.64672899
+v -22.4422188 17.0324421 1.43190706
+v -18.2785854 17.3467064 -3.92194796
+v -20.3290043 19.397131 -3.7071259
+v -18.2785854 17.3467064 1.64672995
+v -20.3290043 19.397131 1.43190706
+v -16.156374 19.2432308 -3.92194796
+v -17.9643192 21.5103416 -3.7071259
+v -16.156374 19.2432308 1.64672995
+v -17.9643192 21.5103416 1.43190801
+v -13.8351336 20.8902397 -3.92194796
+v -15.3778954 23.3455086 -3.7071259
+v -13.8351326 20.8902397 1.64672995
+v -15.3778944 23.3455086 1.43190706
+v -11.3441133 22.2669792 -3.92194796
+v -12.6022606 24.879549 -3.7071259
+v -11.3441124 22.2669792 1.64672995
+v -12.6022596 24.879549 1.43190801
+v -8.71460724 23.3561535 -3.92194796
+v -9.67232132 26.0931683 -3.7071259
+v -8.71460724 23.3561535 1.64672995
+v -9.67232037 26.0931683 1.43190801
+v -5.97965813 24.144083 -3.92194796
+v -6.62491798 26.9711132 -3.7071259
+v -5.97965813 24.144083 1.64672995
+v -6.62491894 26.9711132 1.43190801
+v -3.17372799 24.6208248 -3.92194796
+v -3.49838305 27.5023289 -3.7071259
+v -3.17372799 24.6208248 1.64672995
+v -3.49838305 27.5023289 1.43190801
+v 2.80981803 27.2846775 -3.92194796
+v -0.332026988 27.4611206 -3.92194796
+v -0.332026988 27.4611206 1.64672995
+v 2.80981803 27.2846775 1.64672995
+v 5.912117 26.7575779 -3.92194796
+v 5.912117 26.7575779 1.64672995
+v 8.93593216 25.8864288 -3.92194796
+v 8.93593311 25.8864288 1.64672995
+v 11.8431702 24.6822128 -3.92194796
+v 11.8431711 24.6822128 1.64672995
+v 14.5972986 23.1600609 -3.92194796
+v 14.5972996 23.1600609 1.64672995
+v 17.1637115 21.3390923 -3.92194796
+v 17.1637115 21.3390923 1.64672995
+v 19.5100765 19.2422523 -3.92194796
+v 19.5100765 19.2422523 1.64672995
+v 21.6069145 16.8958874 -3.92194891
+v 21.6069145 16.8958874 1.64672899
+v 23.4278812 14.3294754 -3.92194796
+v 23.4278812 14.3294754 1.64672899
+v 24.9500332 11.5753489 -3.92194891
+v 24.9500332 11.5753498 1.64672899
+v 26.1542492 8.66810989 -3.92194891
+v 26.1542492 8.66810989 1.64672899
+v 27.0253983 5.64429379 -3.92194891
+v 27.0253983 5.64429379 1.64672899
+v 27.5524979 2.54199505 -3.92194891
+v 27.5524979 2.54199505 1.64672899
+v 27.7289429 -0.599849999 -3.92194891
+v 27.7289429 -0.599849999 1.64672899
+v 27.5524979 -3.74169493 -3.92194891
+v 27.5524979 -3.74169493 1.64672899
+v 27.0253963 -6.84399509 -3.92194891
+v 27.0253963 -6.84399509 1.64672804
+v 26.1542511 -9.86781025 -3.92194891
+v 26.1542511 -9.86781025 1.64672804
+v 24.9500332 -12.7750511 -3.9219501
+v 24.9500332 -12.7750502 1.64672804
+v 23.4278812 -15.5291777 -3.9219501
+v 23.4278812 -15.5291777 1.64672804
+v 21.6069145 -18.0955887 -3.9219501
+v 21.6069145 -18.0955887 1.64672804
+v 19.5100746 -20.4419537 -3.9219501
+v 19.5100746 -20.4419537 1.64672804
+v 17.1637096 -22.5387917 -3.9219501
+v 17.1637096 -22.5387917 1.64672804
+v 14.5972967 -24.3597584 -3.92195106
+v 14.5972977 -24.3597584 1.64672804
+v 11.8431711 -25.8819103 -3.9219501
+v 11.8431721 -25.8819103 1.64672804
+v 8.93593311 -27.0861263 -3.9219501
+v 8.93593407 -27.0861263 1.64672804
+v 5.91211796 -27.9572754 -3.9219501
+v 5.912117 -27.9572754 1.64672804
+v 2.80981803 -28.484375 -3.92195106
+v 2.80981803 -28.484375 1.64672804
+v -0.332026988 -28.66082 -3.92195106
+v -0.332026988 -28.66082 1.64672804
+v -3.47387195 -28.484375 -3.92195106
+v -3.47387195 -28.484375 1.64672697
+v -6.57617092 -27.9572735 -3.92195106
+v -6.57617092 -27.9572735 1.64672697
+v -9.59998894 -27.0861282 -3.9219501
+v -9.59998798 -27.0861282 1.64672804
+v -12.5072279 -25.8819103 -3.9219501
+v -12.5072269 -25.8819103 1.64672804
+v -15.2613564 -24.3597584 -3.9219501
+v -15.2613554 -24.3597584 1.64672804
+v -17.8277664 -22.5387917 -3.9219501
+v -17.8277664 -22.5387917 1.64672804
+v -20.1741333 -20.4419518 -3.9219501
+v -20.1741333 -20.4419518 1.64672804
+v -22.2709694 -18.0955887 -3.9219501
+v -22.2709694 -18.0955887 1.64672804
+v -24.091938 -15.5291767 -3.9219501
+v -24.091938 -15.5291767 1.64672804
+v -25.6140881 -12.7750511 -3.9219501
+v -25.6140881 -12.7750492 1.64672804
+v -26.818306 -9.8678112 -3.92194891
+v -26.818306 -9.8678112 1.64672804
+v -27.6894569 -6.84399509 -3.92194891
+v -27.6894569 -6.84399509 1.64672899
+v -28.2165546 -3.74169493 -3.9219501
+v -28.2165546 -3.74169493 1.64672899
+v -28.3929977 -0.599849999 -3.92194891
+v -28.3929977 -0.599849999 1.64672899
+v -28.2165546 2.54199505 -3.92194891
+v -28.2165546 2.54199505 1.64672899
+v -27.689455 5.64429379 -3.92194796
+v -27.689455 5.64429379 1.64672899
+v -26.818306 8.66810894 -3.92194796
+v -26.818306 8.66810894 1.64672899
+v -25.61409 11.5753489 -3.92194891
+v -25.61409 11.5753498 1.64672899
+v -24.091938 14.3294773 -3.92194796
+v -24.091938 14.3294773 1.64672995
+v -22.2709694 16.8958893 -3.92194796
+v -22.2709694 16.8958893 1.64672995
+v -20.1741295 19.2422562 -3.92194796
+v -20.1741295 19.2422562 1.64672995
+v -17.8277645 21.3390923 -3.92194796
+v -17.8277645 21.3390923 1.64672995
+v -15.2613544 23.1600609 -3.92194796
+v -15.2613525 23.1600609 1.64672995
+v -12.5072289 24.6822109 -3.92194796
+v -12.5072279 24.6822109 1.64672995
+v -9.59998894 25.8864288 -3.92194796
+v -9.59998798 25.8864288 1.64672995
+v -6.57617188 26.7575798 -3.92194796
+v -6.57617188 26.7575798 1.64672995
+v -3.47387195 27.2846775 -3.92194796
+v -3.47387195 27.2846775 1.64672995
+v -0.332026988 24.7804146 0.633257985
+v 2.50967407 24.6208248 0.633257985
+v 5.31560421 24.144083 0.633257985
+v 8.05055141 23.3561535 0.633257985
+v 10.6800575 22.2669792 0.633257985
+v 13.1710758 20.8902416 0.633257985
+v 15.4923182 19.2432308 0.633257985
+v 17.6145287 17.3467083 0.633257985
+v 19.5110512 15.2244959 0.633256972
+v 21.158062 12.9032555 0.633256972
+v 22.5347996 10.4122343 0.633256972
+v 23.6239738 7.78272915 0.633256972
+v 24.4119034 5.04778099 0.633256972
+v 24.8886471 2.24185109 0.633256972
+v 25.0482349 -0.599849999 0.633256972
+v 24.8886471 -3.44155097 0.633256972
+v 24.4119034 -6.24748087 0.633256972
+v 23.6239758 -8.98242855 0.633256018
+v 22.5348015 -11.6119366 0.633256018
+v 21.158062 -14.1029539 0.633256018
+v 19.5110512 -16.4241962 0.633256018
+v 17.6145306 -18.5464058 0.633256018
+v 15.4923191 -20.4429283 0.633256018
+v 13.1710768 -22.0899391 0.633256018
+v 10.6800566 -23.4666767 0.633256018
+v 8.05055141 -24.555851 0.633256018
+v 5.31560421 -25.3437805 0.633256018
+v 2.50967407 -25.8205242 0.633256018
+v -0.332026988 -25.9801121 0.633256018
+v -3.17372894 -25.8205242 0.633256018
+v -5.97965908 -25.3437805 0.633256018
+v -8.71460724 -24.5558529 0.633256018
+v -11.3441143 -23.4666786 0.633256018
+v -13.8351316 -22.0899391 0.633256018
+v -16.156374 -20.4429283 0.633256018
+v -18.2785854 -18.5464077 0.633256018
+v -20.175108 -16.4241962 0.633256018
+v -21.8221169 -14.1029549 0.633256018
+v -23.1988564 -11.6119356 0.633256018
+v -24.2880306 -8.98242855 0.633256018
+v -25.0759602 -6.24748087 0.633256972
+v -25.552702 -3.44155192 0.633256972
+v -25.7122917 -0.599849999 0.633256972
+v -25.552702 2.24185109 0.633256972
+v -25.0759602 5.04778099 0.633256972
+v -24.2880306 7.78272915 0.633256972
+v -23.1988564 10.4122362 0.633256972
+v -21.8221188 12.9032536 0.633256972
+v -20.175108 15.2244959 0.633257985
+v -18.2785854 17.3467064 0.633257985
+v -16.156374 19.2432308 0.633257985
+v -13.8351326 20.8902397 0.633257985
+v -11.3441124 22.2669792 0.633257985
+v -8.71460724 23.3561535 0.633257985
+v -5.97965813 24.144083 0.633257985
+v -3.17372894 24.6208248 0.633257985
+v 2.50967407 24.6208248 -2.880476
+v -0.332026988 24.7804146 -2.880476
+v 5.31560421 24.144083 -2.880476
+v 8.05055237 23.3561535 -2.880476
+v 10.6800575 22.2669792 -2.880476
+v 13.1710758 20.8902416 -2.880476
+v 15.4923182 19.2432308 -2.880476
+v 17.6145287 17.3467083 -2.880476
+v 19.5110512 15.2244959 -2.880476
+v 21.158062 12.9032555 -2.880476
+v 22.5347996 10.4122343 -2.880476
+v 23.6239738 7.78272915 -2.88047695
+v 24.4119034 5.04778099 -2.88047695
+v 24.8886471 2.24185109 -2.88047695
+v 25.0482349 -0.599849999 -2.88047695
+v 24.8886471 -3.44155097 -2.88047695
+v 24.4119034 -6.24748087 -2.88047695
+v 23.6239758 -8.98242855 -2.88047695
+v 22.5348015 -11.6119366 -2.88047695
+v 21.158062 -14.1029539 -2.88047791
+v 19.5110512 -16.4241962 -2.88047695
+v 17.6145306 -18.5464058 -2.88047791
+v 15.4923191 -20.4429283 -2.88047791
+v 13.1710768 -22.0899391 -2.88047791
+v 10.6800566 -23.4666767 -2.88047791
+v 8.05055237 -24.555851 -2.88047791
+v 5.31560421 -25.3437805 -2.88047791
+v 2.50967407 -25.8205242 -2.88047791
+v -0.332026988 -25.9801121 -2.88047791
+v -3.17372894 -25.8205242 -2.88047791
+v -5.97965908 -25.3437805 -2.88047791
+v -8.71460629 -24.5558529 -2.88047791
+v -11.3441143 -23.4666786 -2.88047791
+v -13.8351316 -22.0899391 -2.88047791
+v -16.156374 -20.4429283 -2.88047791
+v -18.2785854 -18.5464077 -2.88047791
+v -20.175108 -16.4241962 -2.88047695
+v -21.8221169 -14.1029549 -2.88047791
+v -23.1988564 -11.6119356 -2.88047695
+v -24.2880306 -8.98242855 -2.88047695
+v -25.0759602 -6.24748087 -2.88047695
+v -25.552702 -3.44155192 -2.88047695
+v -25.7122917 -0.599849999 -2.88047695
+v -25.552702 2.24185109 -2.88047695
+v -25.0759602 5.04778099 -2.88047695
+v -24.2880306 7.78272915 -2.880476
+v -23.1988564 10.4122362 -2.880476
+v -21.8221188 12.9032536 -2.880476
+v -20.175108 15.2244959 -2.880476
+v -18.2785854 17.3467064 -2.880476
+v -16.156374 19.2432308 -2.880476
+v -13.8351326 20.8902397 -2.880476
+v -11.3441124 22.2669792 -2.880476
+v -8.71460629 23.3561535 -2.880476
+v -5.97965813 24.144083 -2.880476
+v -3.17372894 24.6208248 -2.880476
+v -0.332026988 24.7804127 0.521257997
+v 2.48780489 24.6208229 0.521257997
+v 5.27214098 24.1440811 0.521257997
+v 7.98604107 23.3561516 0.521257997
+v 10.5953112 22.2669773 0.521257997
+v 13.0671577 20.8902378 0.521257997
+v 15.3705359 19.2432289 0.521257997
+v 17.4764156 17.3467064 0.521256983
+v 19.3583431 15.2244949 0.521256983
+v 20.9926777 12.9032536 0.521256983
+v 22.35882 10.4122334 0.521256983
+v 23.4396133 7.78272915 0.521256983
+v 24.2214775 5.04778004 0.521256983
+v 24.6945534 2.24185109 0.521256983
+v 24.8529148 -0.599849999 0.521256983
+v 24.6945534 -3.44155097 0.52125603
+v 24.2214775 -6.24748087 0.52125603
+v 23.4396133 -8.98242855 0.52125603
+v 22.35882 -11.6119356 0.52125603
+v 20.9926777 -14.102953 0.52125603
+v 19.3583431 -16.4241962 0.52125603
+v 17.4764175 -18.5464039 0.52125603
+v 15.3705368 -20.4429264 0.52125603
+v 13.0671587 -22.0899372 0.52125603
+v 10.5953093 -23.4666748 0.52125603
+v 7.98604107 -24.5558491 0.52125603
+v 5.27214098 -25.3437786 0.521255016
+v 2.48780489 -25.8205223 0.521255016
+v -0.332026988 -25.9801102 0.521255016
+v -3.15185905 -25.8205223 0.52125603
+v -5.9361949 -25.3437786 0.52125603
+v -8.65009499 -24.5558491 0.52125603
+v -11.259366 -23.4666748 0.52125603
+v -13.7312136 -22.0899372 0.52125603
+v -16.0345917 -20.4429264 0.52125603
+v -18.1404686 -18.5464058 0.52125603
+v -20.022398 -16.4241943 0.52125603
+v -21.6567326 -14.1029539 0.52125603
+v -23.0228748 -11.6119337 0.52125603
+v -24.1036701 -8.98242855 0.52125603
+v -24.8855343 -6.24748087 0.52125603
+v -25.3586082 -3.44155097 0.521256983
+v -25.5169697 -0.599849999 0.521256983
+v -25.3586082 2.24185109 0.521256983
+v -24.8855343 5.04778004 0.521256983
+v -24.1036701 7.7827282 0.521256983
+v -23.0228767 10.4122343 0.521256983
+v -21.6567326 12.9032526 0.521256983
+v -20.0223999 15.2244949 0.521256983
+v -18.1404724 17.3467045 0.521256983
+v -16.0345917 19.2432289 0.521256983
+v -13.7312145 20.8902378 0.521257997
+v -11.2593651 22.2669773 0.521257997
+v -8.65009499 23.3561516 0.521257997
+v -5.93619394 24.1440811 0.521257997
+v -3.15185905 24.6208229 0.521257997
+v 2.48780489 24.6208229 -2.76847601
+v -0.332026988 24.7804127 -2.76847601
+v 5.27214098 24.1440811 -2.76847601
+v 7.98604107 23.3561516 -2.76847601
+v 10.5953112 22.2669773 -2.76847601
+v 13.0671577 20.8902378 -2.76847601
+v 15.3705359 19.2432289 -2.76847601
+v 17.4764156 17.3467064 -2.76847601
+v 19.3583431 15.2244949 -2.76847601
+v 20.9926777 12.9032536 -2.76847601
+v 22.35882 10.4122334 -2.76847601
+v 23.4396133 7.78272915 -2.76847696
+v 24.2214775 5.04778004 -2.76847601
+v 24.6945534 2.24185109 -2.76847696
+v 24.8529148 -0.599849999 -2.76847696
+v 24.6945534 -3.44155097 -2.76847696
+v 24.2214775 -6.24748087 -2.76847696
+v 23.4396133 -8.98242855 -2.76847696
+v 22.35882 -11.6119356 -2.76847696
+v 20.9926777 -14.102953 -2.76847792
+v 19.3583431 -16.4241962 -2.76847792
+v 17.4764175 -18.5464039 -2.76847792
+v 15.3705368 -20.4429264 -2.76847792
+v 13.0671587 -22.0899372 -2.76847792
+v 10.5953093 -23.4666748 -2.76847792
+v 7.98604107 -24.5558491 -2.76847792
+v 5.27214098 -25.3437786 -2.76847792
+v 2.48780489 -25.8205223 -2.76847792
+v -0.332026988 -25.9801102 -2.76847792
+v -3.15185905 -25.8205223 -2.76847792
+v -5.9361949 -25.3437786 -2.76847792
+v -8.65009499 -24.5558491 -2.76847792
+v -11.259366 -23.4666748 -2.76847792
+v -13.7312136 -22.0899372 -2.76847792
+v -16.0345917 -20.4429264 -2.76847792
+v -18.1404686 -18.5464058 -2.76847792
+v -20.022398 -16.4241943 -2.76847696
+v -21.6567326 -14.1029539 -2.76847792
+v -23.0228748 -11.6119337 -2.76847792
+v -24.1036701 -8.98242855 -2.76847696
+v -24.8855343 -6.24748087 -2.76847696
+v -25.3586082 -3.44155097 -2.76847696
+v -25.5169697 -0.599849999 -2.76847696
+v -25.3586082 2.24185109 -2.76847696
+v -24.8855343 5.04778004 -2.76847696
+v -24.1036701 7.7827282 -2.76847601
+v -23.0228767 10.4122343 -2.76847696
+v -21.6567326 12.9032526 -2.76847601
+v -20.0223999 15.2244949 -2.76847601
+v -18.1404724 17.3467045 -2.76847601
+v -16.0345917 19.2432289 -2.76847601
+v -13.7312145 20.8902378 -2.76847601
+v -11.2593651 22.2669773 -2.76847601
+v -8.65009499 23.3561516 -2.76847601
+v -5.9361949 24.1440811 -2.76847601
+v -3.15185905 24.6208229 -2.76847601
+vt 0.443412006 0.981693983
+vt 0.498077005 0.98476398
+vt 0.606719971 0.97252202
+vt 0.659331977 0.957364976
+vt 0.709914982 0.93641299
+vt 0.757834971 0.909928977
+vt 0.802488029 0.878246009
+vt 0.843312979 0.841762006
+vt 0.879796982 0.800936997
+vt 0.91148001 0.756283998
+vt 0.937964022 0.70836401
+vt 0.958917022 0.657781005
+vt 0.974074006 0.605168998
+vt 0.983245015 0.551190972
+vt 0.986315012 0.496526003
+vt 0.983245015 0.441861004
+vt 0.974074006 0.387883008
+vt 0.958917022 0.335271001
+vt 0.937964022 0.284687996
+vt 0.91148001 0.236768007
+vt 0.879796982 0.192114994
+vt 0.843312979 0.151289999
+vt 0.802488029 0.114807002
+vt 0.757834971 0.0831229985
+vt 0.709914982 0.0566390008
+vt 0.659331977 0.0356869996
+vt 0.606719971 0.0205290001
+vt 0.552743018 0.0113580003
+vt 0.498077005 0.00828799978
+vt 0.443412006 0.0113580003
+vt 0.38943401 0.0205290001
+vt 0.336822003 0.0356869996
+vt 0.286238998 0.0566390008
+vt 0.238318995 0.0831229985
+vt 0.193665996 0.114807002
+vt 0.152841002 0.151289999
+vt 0.116357997 0.192114994
+vt 0.0846740007 0.236768007
+vt 0.0581899993 0.284687996
+vt 0.0372380018 0.335271001
+vt 0.0220810007 0.387883008
+vt 0.0129089998 0.441861004
+vt 0.00984000042 0.496526003
+vt 0.0129089998 0.551190972
+vt 0.0220810007 0.605168998
+vt 0.0372380018 0.657781005
+vt 0.0581899993 0.70836401
+vt 0.0846740007 0.756283998
+vt 0.116357997 0.800936997
+vt 0.152841002 0.841762006
+vt 0.193665996 0.878246009
+vt 0.238318995 0.909928977
+vt 0.286238998 0.93641299
+vt 0.286238998 0.93641299
+vt 0.336822003 0.957364976
+vt 0.38943401 0.972522974
+vt 0.552743018 0.981693983
+vt 0.911664009 0.351806015
+vt 0.892859995 0.306409001
+vt 0.498077005 0.980982006
+vt 0.55231899 0.977936029
+vt 0.605879009 0.96883601
+vt 0.658083022 0.953796029
+vt 0.70827502 0.933005989
+vt 0.755823016 0.906727016
+vt 0.757834971 0.909928977
+vt 0.800131023 0.875289023
+vt 0.840640008 0.839088023
+vt 0.876839995 0.798579991
+vt 0.908277988 0.754271984
+vt 0.934557021 0.706723988
+vt 0.955347002 0.65653199
+vt 0.970386982 0.604327977
+vt 0.979487002 0.550768018
+vt 0.982532978 0.496526003
+vt 0.979487002 0.442283988
+vt 0.970386982 0.388725013
+vt 0.955347002 0.336519986
+vt 0.934557021 0.286327988
+vt 0.908277988 0.238780007
+vt 0.876839995 0.194472
+vt 0.840640008 0.153963998
+vt 0.800131023 0.117762998
+vt 0.755823016 0.0863249972
+vt 0.70827502 0.0600459985
+vt 0.658083022 0.039255999
+vt 0.605879009 0.024216
+vt 0.55231899 0.0151159996
+vt 0.498077005 0.0120700002
+vt 0.44383499 0.0151159996
+vt 0.390276015 0.024216
+vt 0.338070989 0.039255999
+vt 0.338070989 0.039255999
+vt 0.28787899 0.0600459985
+vt 0.240330994 0.0863249972
+vt 0.196023002 0.117762998
+vt 0.155515 0.153963998
+vt 0.119314 0.194472
+vt 0.0878759995 0.238780007
+vt 0.0615970008 0.286327988
+vt 0.0408070013 0.336519986
+vt 0.0257670004 0.388725013
+vt 0.0166669991 0.442283988
+vt 0.0136209996 0.496526003
+vt 0.0166669991 0.550768018
+vt 0.0257670004 0.604327977
+vt 0.0408070013 0.65653199
+vt 0.0615970008 0.706723988
+vt 0.0878759995 0.754271984
+vt 0.119314 0.798579991
+vt 0.155515 0.839088023
+vt 0.196024001 0.875289023
+vt 0.240330994 0.906727016
+vt 0.240330994 0.906727016
+vt 0.28787899 0.933005989
+vt 0.338070989 0.953796029
+vt 0.338070989 0.953796029
+vt 0.390276015 0.96883601
+vt 0.44383499 0.977936029
+vt 0.353356987 0.0829399973
+vt 0.400573999 0.0693370029
+vt 0.400573999 0.0693370029
+vt 0.498077005 0.934701979
+vt 0.547137022 0.93194598
+vt 0.595579982 0.923716009
+vt 0.642798007 0.910112977
+vt 0.688193977 0.89130801
+vt 0.642796993 0.910112977
+vt 0.73119998 0.867540002
+vt 0.771274984 0.83910501
+vt 0.807914019 0.806362987
+vt 0.840655982 0.769724011
+vt 0.869090974 0.729649007
+vt 0.892859995 0.686643004
+vt 0.911664009 0.641246021
+vt 0.925266981 0.594029009
+vt 0.933497012 0.54558599
+vt 0.936251998 0.496526003
+vt 0.933497012 0.447465986
+vt 0.925266981 0.399022996
+vt 0.869090974 0.263402998
+vt 0.840655982 0.223327994
+vt 0.807914019 0.186689004
+vt 0.771274984 0.153946996
+vt 0.771274984 0.153946996
+vt 0.73119998 0.125512004
+vt 0.688193977 0.101744004
+vt 0.642796993 0.0829399973
+vt 0.595579982 0.0693370029
+vt 0.547137022 0.0611060001
+vt 0.498077005 0.0583509989
+vt 0.449016988 0.0611060001
+vt 0.307960004 0.101744004
+vt 0.264954001 0.125512004
+vt 0.224878997 0.153946996
+vt 0.188240007 0.186689004
+vt 0.155497998 0.223327994
+vt 0.127063006 0.263402998
+vt 0.103294998 0.306409001
+vt 0.0844909996 0.351806015
+vt 0.0708879977 0.399022996
+vt 0.0626569986 0.447465986
+vt 0.0599020012 0.496526003
+vt 0.0626569986 0.54558599
+vt 0.0708879977 0.594029009
+vt 0.0844909996 0.641246021
+vt 0.103294998 0.686643004
+vt 0.127063006 0.729649007
+vt 0.155497998 0.769724011
+vt 0.188240007 0.806362987
+vt 0.224878997 0.83910501
+vt 0.264954001 0.867540002
+vt 0.307960004 0.89130801
+vt 0.353356987 0.910112977
+vt 0.400573999 0.923716009
+vt 0.449016988 0.93194598
+vt 0.354470998 0.910112977
+vt 0.401324987 0.923716009
+vt 0.866235971 0.263402998
+vt 0.642798007 0.0829399973
+vt 0.546760023 0.0611060001
+vt 0.594829977 0.923716009
+vt 0.449393988 0.93194598
+vt 0.449393988 0.0611060001
+vt 0.641683996 0.910112977
+vt 0.498077005 0.934701025
+vt 0.401324987 0.0693370029
+vt 0.686730981 0.89130801
+vt 0.354470998 0.0829399973
+vt 0.729405999 0.867540002
+vt 0.309423 0.101744004
+vt 0.769173026 0.83910501
+vt 0.266748011 0.125512004
+vt 0.805528998 0.806362987
+vt 0.226981997 0.153946996
+vt 0.838020027 0.769724011
+vt 0.190624997 0.186689004
+vt 0.866235971 0.729649007
+vt 0.158133999 0.223327994
+vt 0.889820993 0.686643004
+vt 0.129919007 0.263402998
+vt 0.908481002 0.641246021
+vt 0.106333002 0.306409001
+vt 0.92197901 0.594029009
+vt 0.0876739994 0.351806015
+vt 0.930145979 0.54558599
+vt 0.0741750002 0.399022996
+vt 0.932880998 0.496526003
+vt 0.0660080016 0.447465986
+vt 0.930145979 0.447465986
+vt 0.0632740036 0.496526003
+vt 0.92197901 0.399022996
+vt 0.0660080016 0.54558599
+vt 0.908481002 0.351806015
+vt 0.0741750002 0.594029009
+vt 0.889820993 0.306409001
+vt 0.0876739994 0.641246021
+vt 0.106333002 0.686643004
+vt 0.838020027 0.223327994
+vt 0.129919007 0.729649007
+vt 0.805528998 0.186689004
+vt 0.158133999 0.769724011
+vt 0.769173026 0.153946996
+vt 0.190624997 0.806362987
+vt 0.729405999 0.125512004
+vt 0.226981997 0.83910501
+vt 0.686730981 0.101744004
+vt 0.266748011 0.867540002
+vt 0.641683996 0.0829399973
+vt 0.309423 0.89130801
+vt 0.594829977 0.0693370029
+vt 0.546760023 0.93194598
+vt 0.401324004 0.0693370029
+vn -0.103500001 0.918200016 0.382299989
+vn -0 0.924000025 -0.382299989
+vn -0.103500001 0.918200016 -0.382299989
+vn 0.205599993 0.900900006 0.382299989
+vn 0.305200011 0.872200012 -0.382299989
+vn 0.205599993 0.900900006 -0.382299989
+vn 0.400900006 0.832499981 0.382299989
+vn 0.400900006 0.832499981 -0.382299989
+vn 0.491600007 0.782400012 -0.382299989
+vn 0.576099992 0.72240001 0.382299989
+vn 0.576099992 0.72240001 -0.382299989
+vn 0.653400004 0.653400004 -0.382299989
+vn 0.653400004 0.653400004 0.382299989
+vn 0.72240001 0.576099992 -0.382299989
+vn 0.72240001 0.576099992 0.382299989
+vn 0.782400012 0.491600007 -0.382299989
+vn 0.832499981 0.400900006 0.382299989
+vn 0.832499981 0.400900006 -0.382299989
+vn 0.872200012 0.305200011 -0.382299989
+vn 0.872200012 0.305200011 0.382299989
+vn 0.900900006 0.205599993 -0.382299989
+vn 0.900900006 0.205599993 0.382299989
+vn 0.918200016 0.103500001 -0.382299989
+vn 0.918200016 0.103500001 0.382299989
+vn 0.924000025 -0 -0.382299989
+vn 0.924000025 -0 0.382299989
+vn 0.918200016 -0.103500001 -0.382299989
+vn 0.918200016 -0.103500001 0.382299989
+vn 0.900900006 -0.205599993 -0.382299989
+vn 0.872200012 -0.305200011 0.382299989
+vn 0.872200012 -0.305200011 -0.382299989
+vn 0.832499981 -0.400900006 0.382299989
+vn 0.832499981 -0.400900006 -0.382299989
+vn 0.782400012 -0.491600007 -0.382299989
+vn 0.782400012 -0.491600007 0.382299989
+vn 0.72240001 -0.576099992 -0.382299989
+vn 0.72240001 -0.576099992 0.382299989
+vn 0.653400004 -0.653400004 -0.382299989
+vn 0.653400004 -0.653400004 0.382299989
+vn 0.576099992 -0.72240001 -0.382299989
+vn 0.491600007 -0.782400012 0.382299989
+vn 0.491600007 -0.782400012 -0.382299989
+vn 0.400900006 -0.832499981 -0.382299989
+vn 0.305200011 -0.872200012 0.382299989
+vn 0.305200011 -0.872200012 -0.382299989
+vn 0.205599993 -0.900900006 0.382299989
+vn 0.205599993 -0.900900006 -0.382299989
+vn 0.103500001 -0.918200016 -0.382299989
+vn 0.103500001 -0.918200016 0.382299989
+vn -0 -0.924000025 -0.382299989
+vn -0 -0.924000025 0.382299989
+vn -0.103500001 -0.918200016 -0.382299989
+vn -0.103500001 -0.918200016 0.382299989
+vn -0.205599993 -0.900900006 -0.382299989
+vn -0.305200011 -0.872200012 0.382299989
+vn -0.305200011 -0.872200012 -0.382299989
+vn -0.400900006 -0.832499981 0.382299989
+vn -0.400900006 -0.832499981 -0.382299989
+vn -0.491600007 -0.782400012 -0.382299989
+vn -0.576099992 -0.72240001 0.382299989
+vn -0.576099992 -0.72240001 -0.382299989
+vn -0.653400004 -0.653400004 -0.382299989
+vn -0.653400004 -0.653400004 0.382299989
+vn -0.72240001 -0.576099992 -0.382299989
+vn -0.72240001 -0.576099992 0.382299989
+vn -0.782400012 -0.491600007 -0.382299989
+vn -0.782400012 -0.491600007 0.382299989
+vn -0.832499981 -0.400900006 -0.382299989
+vn -0.832499981 -0.400900006 0.382299989
+vn -0.872200012 -0.305200011 -0.382299989
+vn -0.872200012 -0.305200011 0.382299989
+vn -0.900900006 -0.205599993 -0.382299989
+vn -0.900900006 -0.205599993 0.382299989
+vn -0.918200016 -0.103500001 -0.382299989
+vn -0.918200016 -0.103500001 0.382299989
+vn -0.924000025 -0 -0.382299989
+vn -0.924000025 -0 0.382299989
+vn -0.918200016 0.103500001 -0.382299989
+vn -0.918200016 0.103500001 0.382299989
+vn -0.900900006 0.205599993 -0.382299989
+vn -0.900900006 0.205599993 0.382299989
+vn -0.872200012 0.305200011 -0.382299989
+vn -0.872200012 0.305200011 0.382299989
+vn -0.832499981 0.400900006 -0.382299989
+vn -0.832499981 0.400900006 0.382299989
+vn -0.782400012 0.491600007 -0.382299989
+vn -0.782400012 0.491600007 0.382299989
+vn -0.72240001 0.576099992 -0.382299989
+vn -0.72240001 0.576099992 0.382299989
+vn -0.653400004 0.653400004 -0.382299989
+vn -0.653400004 0.653400004 0.382299989
+vn -0.576099992 0.72240001 -0.382299989
+vn -0.576099992 0.72240001 0.382299989
+vn -0.491600007 0.782400012 -0.382299989
+vn -0.491600007 0.782400012 0.382299989
+vn -0.400900006 0.832499981 -0.382299989
+vn -0.400900006 0.832499981 0.382299989
+vn -0.305200011 0.872200012 -0.382299989
+vn -0.305200011 0.872200012 0.382299989
+vn -0.205599993 0.900900006 -0.382299989
+vn -0.205599993 0.900900006 0.382299989
+vn 0.103500001 0.918200016 0.382299989
+vn 0.103500001 0.918200016 -0.382299989
+vn -0.655099988 0.229200006 0.719900012
+vn -0.80430001 0.382200003 0.455000013
+vn -0.62529999 0.301099986 0.719900012
+vn -0 0.924000025 0.382299989
+vn -0 0.389699996 -0.921000004
+vn -0 0.389699996 0.921000004
+vn 0.0436000004 0.387199998 0.921000004
+vn 0.0436000004 0.387199998 -0.921000004
+vn 0.0866999999 0.379900008 0.921000004
+vn 0.0866999999 0.379900008 -0.921000004
+vn 0.128700003 0.367799997 0.921000004
+vn 0.305200011 0.872200012 0.382299989
+vn 0.128700003 0.367799997 -0.921000004
+vn 0.169100001 0.351099998 0.921000004
+vn 0.207300007 0.329899997 -0.921000004
+vn 0.169100001 0.351099998 -0.921000004
+vn 0.207300007 0.329899997 0.921000004
+vn 0.491600007 0.782400012 0.382299989
+vn 0.242899999 0.3046 -0.921000004
+vn 0.242899999 0.3046 0.921000004
+vn 0.2755 0.2755 0.921000004
+vn 0.3046 0.242899999 -0.921000004
+vn 0.2755 0.2755 -0.921000004
+vn 0.3046 0.242899999 0.921000004
+vn 0.782400012 0.491600007 0.382299989
+vn 0.329899997 0.207300007 0.921000004
+vn 0.329899997 0.207300007 -0.921000004
+vn 0.351099998 0.169100001 0.921000004
+vn 0.367799997 0.128700003 -0.921000004
+vn 0.351099998 0.169100001 -0.921000004
+vn 0.367799997 0.128700003 0.921000004
+vn 0.379900008 0.0866999999 -0.921000004
+vn 0.379900008 0.0866999999 0.921000004
+vn 0.387199998 0.0436000004 -0.921000004
+vn 0.387199998 0.0436000004 0.921000004
+vn 0.389699996 -0 -0.921000004
+vn 0.389699996 -0 0.921000004
+vn 0.387199998 -0.0436000004 0.921000004
+vn 0.387199998 -0.0436000004 -0.921000004
+vn 0.900900006 -0.205599993 0.382299989
+vn 0.379900008 -0.0866999999 0.921000004
+vn 0.379900008 -0.0866999999 -0.921000004
+vn 0.367799997 -0.128700003 0.921000004
+vn 0.367799997 -0.128700003 -0.921000004
+vn 0.351099998 -0.169100001 0.921000004
+vn 0.329899997 -0.207300007 -0.921000004
+vn 0.351099998 -0.169100001 -0.921000004
+vn 0.329899997 -0.207300007 0.921000004
+vn 0.3046 -0.242899999 -0.921000004
+vn 0.3046 -0.242899999 0.921000004
+vn 0.2755 -0.2755 0.921000004
+vn 0.242899999 -0.3046 -0.921000004
+vn 0.2755 -0.2755 -0.921000004
+vn 0.242899999 -0.3046 0.921000004
+vn 0.576099992 -0.72240001 0.382299989
+vn 0.207300007 -0.329899997 0.921000004
+vn 0.207300007 -0.329899997 -0.921000004
+vn 0.400900006 -0.832499981 0.382299989
+vn 0.169100001 -0.351099998 0.921000004
+vn 0.128700003 -0.367799997 -0.921000004
+vn 0.169100001 -0.351099998 -0.921000004
+vn 0.128700003 -0.367799997 0.921000004
+vn 0.0866999999 -0.379900008 0.921000004
+vn 0.0436000004 -0.387199998 -0.921000004
+vn 0.0866999999 -0.379900008 -0.921000004
+vn 0.0436000004 -0.387199998 0.921000004
+vn -0 -0.389699996 -0.921000004
+vn -0 -0.389699996 0.921000004
+vn -0.0436000004 -0.387199998 0.921000004
+vn -0.0436000004 -0.387199998 -0.921000004
+vn -0.205599993 -0.900900006 0.382299989
+vn -0.0866999999 -0.379900008 0.921000004
+vn -0.0866999999 -0.379900008 -0.921000004
+vn -0.128700003 -0.367799997 0.921000004
+vn -0.128700003 -0.367799997 -0.921000004
+vn -0.169100001 -0.351099998 0.921000004
+vn -0.207300007 -0.329899997 -0.921000004
+vn -0.169100001 -0.351099998 -0.921000004
+vn -0.207300007 -0.329899997 0.921000004
+vn -0.491600007 -0.782400012 0.382299989
+vn -0.243000001 -0.3046 -0.921000004
+vn -0.243000001 -0.3046 0.921000004
+vn -0.2755 -0.2755 0.921000004
+vn -0.3046 -0.242899999 -0.921000004
+vn -0.2755 -0.2755 -0.921000004
+vn -0.3046 -0.242899999 0.921000004
+vn -0.329899997 -0.207300007 0.921000004
+vn -0.329899997 -0.207300007 -0.921000004
+vn -0.351099998 -0.169100001 0.921000004
+vn -0.367799997 -0.128700003 -0.921000004
+vn -0.351099998 -0.169100001 -0.921000004
+vn -0.367799997 -0.128700003 0.921000004
+vn -0.379900008 -0.0866999999 0.921000004
+vn -0.387199998 -0.0436000004 -0.921000004
+vn -0.379900008 -0.0866999999 -0.921000004
+vn -0.387199998 -0.0436000004 0.921000004
+vn -0.389699996 -0 -0.921000004
+vn -0.389699996 -0 0.921000004
+vn -0.387199998 0.0436000004 0.921000004
+vn -0.387199998 0.0436000004 -0.921000004
+vn -0.379900008 0.0866999999 0.921000004
+vn -0.379900008 0.0866999999 -0.921000004
+vn -0.367799997 0.128700003 0.921000004
+vn -0.367799997 0.128700003 -0.921000004
+vn -0.351099998 0.169100001 0.921000004
+vn -0.329899997 0.207300007 -0.921000004
+vn -0.351099998 0.169100001 -0.921000004
+vn -0.329899997 0.207300007 0.921000004
+vn -0.3046 0.242899999 -0.921000004
+vn -0.3046 0.242899999 0.921000004
+vn -0.2755 0.2755 0.921000004
+vn -0.242899999 0.3046 -0.921000004
+vn -0.2755 0.2755 -0.921000004
+vn -0.242899999 0.3046 0.921000004
+vn -0.207300007 0.329899997 0.921000004
+vn -0.207300007 0.329899997 -0.921000004
+vn -0.169100001 0.351099998 0.921000004
+vn -0.128700003 0.367799997 -0.921000004
+vn -0.169100001 0.351099998 -0.921000004
+vn -0.128700003 0.367799997 0.921000004
+vn -0.0866999999 0.379900008 0.921000004
+vn -0.0436000004 0.387199998 -0.921000004
+vn -0.0866999999 0.379900008 -0.921000004
+vn -0.0436000004 0.387199998 0.921000004
+vn 0.229200006 0.655099988 -0.719900012
+vn 0.229100004 0.972299993 -0.0460000001
+vn 0.154400006 0.676599979 -0.719900012
+vn -0 -0 -1
+vn -0 -0 1
+vn 0.229100004 -0.972299993 0.0460000001
+vn 0.309500009 -0.934199989 0.177599996
+vn 0.209999993 -0.974300027 0.0811000019
+vn -0.369199991 -0.587700009 0.719900012
+vn -0.437599987 -0.88410002 0.164199993
+vn -0.526499987 -0.817600012 0.233199999
+vn 0.676599979 -0.154400006 0.719900012
+vn 0.832799971 -0.287900001 0.472799987
+vn 0.655099988 -0.229200006 0.719900012
+vn 0.229200006 0.655099988 0.719900012
+vn 0.437599987 0.88410002 0.164199993
+vn 0.301099986 0.62529999 0.719900012
+vn -0.7676 0.475300014 0.430000007
+vn -0.587700009 0.369199991 0.719900012
+vn -0.603100002 -0.740100026 0.297500014
+vn -0.432700008 -0.542599976 0.719900012
+vn 0.80430001 -0.382200003 0.455000013
+vn 0.62529999 -0.301099986 0.719900012
+vn 0.526499987 0.817600012 0.233199999
+vn 0.369199991 0.587700009 0.719900012
+vn -0.722500026 0.566600025 0.396299988
+vn -0.542599976 0.432700008 0.719900012
+vn -0.490799993 -0.490799993 0.719900012
+vn -0.667999983 -0.655399978 0.352299988
+vn 0.7676 -0.475300014 0.430000007
+vn 0.587700009 -0.369199991 0.719900012
+vn 0.603100002 0.740100026 0.297500014
+vn 0.432700008 0.542599976 0.719900012
+vn -0.667999983 0.655399978 0.352299988
+vn -0.490799993 0.490799993 0.719900012
+vn -0.722500026 -0.566600025 0.396299988
+vn -0.542599976 -0.432700008 0.719900012
+vn 0.542599976 -0.432700008 0.719900012
+vn 0.722500026 -0.566600025 0.396299988
+vn 0.667999983 0.655399978 0.352400005
+vn 0.490799993 0.490799993 0.719900012
+vn -0.603100002 0.740100026 0.297500014
+vn -0.432700008 0.542599976 0.719900012
+vn -0.7676 -0.475300014 0.430000007
+vn -0.587700009 -0.369199991 0.719900012
+vn 0.667999983 -0.655399978 0.352400005
+vn 0.490799993 -0.490799993 0.719900012
+vn 0.542599976 0.432700008 0.719900012
+vn 0.722500026 0.566600025 0.396299988
+vn -0.526499987 0.817600012 0.233199999
+vn -0.369199991 0.587700009 0.719900012
+vn -0.80430001 -0.382200003 0.455000013
+vn -0.62529999 -0.301099986 0.719900012
+vn 0.603100002 -0.740100026 0.297500014
+vn 0.432700008 -0.542599976 0.719900012
+vn 0.7676 0.475300014 0.430000007
+vn 0.587700009 0.369199991 0.719900012
+vn -0.301099986 0.62529999 0.719900012
+vn -0.437599987 0.88410002 0.164199993
+vn -0.832799971 -0.287900001 0.472799987
+vn -0.655099988 -0.229200006 0.719900012
+vn 0.526499987 -0.817600012 0.233099997
+vn 0.369199991 -0.587700009 0.719900012
+vn 0.80430001 0.382200003 0.455000013
+vn 0.62529999 0.301099986 0.719900012
+vn -0.229200006 0.655099988 0.719900012
+vn -0.337500006 0.936100006 0.0988999978
+vn -0.853200018 -0.192599997 0.484699994
+vn -0.676599979 -0.154400006 0.719900012
+vn 0.437599987 -0.88410002 0.164199993
+vn 0.301099986 -0.62529999 0.719900012
+vn 0.832799971 0.287900001 0.472799987
+vn 0.655099988 0.229200006 0.719900012
+vn -0.229100004 0.972299993 0.0460000001
+vn -0.154400006 0.676599979 0.719900012
+vn -0.689700007 -0.0776999965 0.719900012
+vn -0.865499973 -0.0965000018 0.49149999
+vn 0.229200006 -0.655099988 0.719900012
+vn 0.337500006 -0.936100006 0.0988999978
+vn 0.853200018 0.192599997 0.484699994
+vn 0.676599979 0.154400006 0.719900012
+vn -0.0776999965 0.689700007 0.719900012
+vn -0.115699999 0.993200004 0.0119000003
+vn -0.869700015 -0 0.493699998
+vn -0.694000006 -0 0.719900012
+vn -0 -0.694000006 0.719900012
+vn -0.115699999 -0.993200004 0.0119000003
+vn -0.0776999965 -0.689700007 0.719900012
+vn 0.154400006 -0.676599979 0.719900012
+vn 0.865499973 0.0965000018 0.49149999
+vn 0.689700007 0.0776999965 0.719900012
+vn -0 1 9.99999975e-05
+vn -0 0.694000006 0.719900012
+vn -0.865499973 0.0965000018 0.49149999
+vn -0.689700007 0.0776999965 0.719900012
+vn -0.229100004 -0.972299993 0.0460000001
+vn -0.154400006 -0.676599979 0.719900012
+vn 0.115699999 -0.993200004 0.0119000003
+vn 0.0776999965 -0.689700007 0.719900012
+vn 0.694000006 -0 0.719900012
+vn 0.869599998 -0 0.493699998
+vn 0.0776999965 0.689700007 0.719900012
+vn 0.115699999 0.993200004 0.0119000003
+vn -0.853200018 0.192599997 0.484699994
+vn -0.676599979 0.154400006 0.719900012
+vn -0.337500006 -0.936100006 0.0988999978
+vn -0.229200006 -0.655099988 0.719900012
+vn -0 -1 9.99999975e-05
+vn 0.865499973 -0.0965000018 0.49149999
+vn 0.689700007 -0.0776999965 0.719900012
+vn 0.154400006 0.676599979 0.719900012
+vn 0.229100004 0.972299993 0.0460000001
+vn -0.832799971 0.287900001 0.472799987
+vn -0.301099986 -0.62529999 0.719900012
+vn 0.853200018 -0.192599997 0.484699994
+vn 0.337500006 0.936100006 0.0988999978
+vn -0.722500026 0.566600025 -0.396299988
+vn -0.5273 0.342999995 -0.777400017
+vn -0.7676 0.475300014 -0.430000007
+vn -0.62529999 0.301099986 -0.719900012
+vn -0.832799971 0.287900001 -0.472799987
+vn -0.655099988 0.229200006 -0.719900012
+vn -0.369199991 -0.587700009 -0.719900012
+vn -0.437599987 -0.88410002 -0.164199993
+vn -0.301099986 -0.62529999 -0.719900012
+vn 0.655099988 -0.229200006 -0.719900012
+vn 0.853200018 -0.192599997 -0.484699994
+vn 0.676599979 -0.154400006 -0.719900012
+vn 0.437599987 0.88410002 -0.164199993
+vn 0.337500006 0.936100006 -0.0988999978
+vn -0.587700009 0.369199991 -0.719900012
+vn -0.80430001 0.382200003 -0.455000013
+vn -0.432700008 -0.542599976 -0.719900012
+vn -0.526499987 -0.817600012 -0.233199999
+vn 0.62529999 -0.301099986 -0.719900012
+vn 0.832799971 -0.287900001 -0.472799987
+vn 0.301099986 0.62529999 -0.719900012
+vn 0.526499987 0.817600012 -0.233199999
+vn -0.542599976 0.432700008 -0.719900012
+vn -0.490799993 -0.490799993 -0.719900012
+vn -0.603100002 -0.740100026 -0.297500014
+vn 0.587700009 -0.369199991 -0.719900012
+vn 0.80430001 -0.382200003 -0.455000013
+vn 0.369199991 0.587700009 -0.719900012
+vn 0.603100002 0.740100026 -0.297500014
+vn -0.667999983 0.655399978 -0.352299988
+vn -0.542599976 -0.432700008 -0.719900012
+vn -0.667999983 -0.655399978 -0.352299988
+vn 0.542599976 -0.432700008 -0.719900012
+vn 0.7676 -0.475300014 -0.430000007
+vn 0.490799993 0.490799993 -0.719900012
+vn 0.432700008 0.542599976 -0.719900012
+vn -0.490799993 0.490799993 -0.719900012
+vn -0.603100002 0.740100026 -0.297500014
+vn -0.7676 -0.475300014 -0.430000007
+vn -0.722500026 -0.566600025 -0.396299988
+vn 0.490799993 -0.490799993 -0.719900012
+vn 0.722500026 -0.566600025 -0.396299988
+vn 0.542599976 0.432700008 -0.719900012
+vn 0.667999983 0.655399978 -0.352400005
+vn -0.432700008 0.542599976 -0.719900012
+vn -0.526499987 0.817600012 -0.233199999
+vn -0.62529999 -0.301099986 -0.719900012
+vn -0.587700009 -0.369199991 -0.719900012
+vn 0.432700008 -0.542599976 -0.719900012
+vn 0.667999983 -0.655399978 -0.352299988
+vn 0.587700009 0.369199991 -0.719900012
+vn 0.722500026 0.566600025 -0.396299988
+vn -0.369199991 0.587700009 -0.719900012
+vn -0.437599987 0.88410002 -0.164199993
+vn -0.655099988 -0.229200006 -0.719900012
+vn -0.80430001 -0.382200003 -0.455000013
+vn 0.369199991 -0.587599993 -0.719900012
+vn 0.603100002 -0.740100026 -0.297500014
+vn 0.62529999 0.301099986 -0.719900012
+vn 0.7676 0.475300014 -0.430000007
+vn -0.301099986 0.62529999 -0.719900012
+vn -0.337500006 0.936100006 -0.0988999978
+vn -0.853200018 -0.192599997 -0.484699994
+vn -0.832799971 -0.287900001 -0.472799987
+vn 0.301099986 -0.62529999 -0.719900012
+vn 0.526499987 -0.817600012 -0.233099997
+vn 0.655099988 0.229200006 -0.719900012
+vn 0.80430001 0.382200003 -0.455000013
+vn -0.229200006 0.655099988 -0.719900012
+vn -0.229100004 0.972299993 -0.0460000001
+vn -0.689700007 -0.0776999965 -0.719900012
+vn -0.676599979 -0.154400006 -0.719900012
+vn 0.229200006 -0.655099988 -0.719900012
+vn 0.437599987 -0.88410002 -0.164199993
+vn 0.676599979 0.154400006 -0.719900012
+vn 0.832799971 0.287900001 -0.472799987
+vn -0.0776999965 0.689700007 -0.719900012
+vn -0.154400006 0.676599979 -0.719900012
+vn -0.694000006 -0 -0.719900012
+vn -0.865499973 -0.0965000018 -0.49149999
+vn -0 -0.694000006 -0.719900012
+vn -0.115699999 -0.993200004 -0.0119000003
+vn -0 -1 -9.99999975e-05
+vn 0.154400006 -0.676599979 -0.719900012
+vn 0.337500006 -0.936100006 -0.0988999978
+vn 0.689700007 0.0776999965 -0.719900012
+vn 0.853200018 0.192599997 -0.484699994
+vn -0 0.694000006 -0.719900012
+vn -0.115699999 0.993200004 -0.0119000003
+vn -0.689700007 0.0776999965 -0.719900012
+vn -0.869700015 -0 -0.493699998
+vn -0.0776999965 -0.689700007 -0.719900012
+vn -0.229100004 -0.972299993 -0.0460000001
+vn 0.115699999 -0.993200004 -0.0119000003
+vn 0.229100004 -0.972299993 -0.0460000001
+vn 0.694000006 -0 -0.719900012
+vn 0.865499973 0.0965000018 -0.49149999
+vn 0.0776999965 0.689700007 -0.719900012
+vn -0 1 -9.99999975e-05
+vn -0.853200018 0.192599997 -0.484699994
+vn -0.865499973 0.0965000018 -0.49149999
+vn -0.229200006 -0.655099988 -0.719900012
+vn -0.154400006 -0.676599979 -0.719900012
+vn 0.0776999965 -0.689700007 -0.719900012
+vn 0.689700007 -0.0776999965 -0.719900012
+vn 0.869599998 -0 -0.493699998
+vn 0.115699999 0.993200004 -0.0119000003
+vn -0.676599979 0.154400006 -0.719900012
+vn -0.337500006 -0.936100006 -0.0988999978
+vn 0.865499973 -0.0965000018 -0.49149999
+vn -0.105700001 0.994199991 0.0205000006
+vn -0 1 -0
+vn -0.209999993 -0.974300027 0.0811000019
+vn 0.105700001 -0.994199991 0.0205000006
+vn 0.105700001 0.994199991 0.0205000006
+vn -0.309500009 -0.934199989 0.177599996
+vn -0 -1 -0
+vn 0.209999993 0.974300027 0.0811000019
+vn -0.396899998 -0.867600024 0.299499989
+vn 0.309500009 0.934199989 0.177599996
+vn -0.464100003 -0.774600029 0.4296
+vn 0.396899998 0.867600024 0.299499989
+vn -0.506799996 -0.663999975 0.549899995
+vn 0.464100003 0.774699986 0.4296
+vn -0.527100027 -0.548799992 0.648800015
+vn 0.506799996 0.663999975 0.549799979
+vn -0.531599998 -0.440100014 0.723699987
+vn 0.527100027 0.548799992 0.648800015
+vn -0.5273 -0.342999995 0.777400017
+vn 0.531700015 0.440100014 0.723699987
+vn -0.519200027 -0.258300006 0.814700007
+vn 0.5273 0.342999995 0.777400017
+vn -0.510699987 -0.184300005 0.8398
+vn 0.519200027 0.258300006 0.814700007
+vn -0.503700018 -0.118500002 0.855700016
+vn 0.510699987 0.184300005 0.8398
+vn -0.4991 -0.0579999983 0.864600003
+vn 0.503700018 0.118500002 0.855700016
+vn -0.497599989 -0 0.867399991
+vn 0.4991 0.0579999983 0.864600003
+vn -0.4991 0.0579999983 0.864600003
+vn 0.497599989 -0 0.867399991
+vn -0.503700018 0.118500002 0.855700016
+vn 0.4991 -0.0579999983 0.864600003
+vn -0.510699987 0.184300005 0.8398
+vn 0.503700018 -0.118500002 0.855700016
+vn -0.519200027 0.258300006 0.814700007
+vn 0.510699987 -0.184300005 0.8398
+vn -0.5273 0.342999995 0.777400017
+vn 0.519200027 -0.258300006 0.814700007
+vn -0.531700015 0.440100014 0.723699987
+vn 0.5273 -0.342999995 0.777400017
+vn -0.527100027 0.548799992 0.648800015
+vn 0.531700015 -0.440100014 0.723699987
+vn -0.506799996 0.663999975 0.549799979
+vn 0.527100027 -0.548799992 0.648800015
+vn -0.464100003 0.774699986 0.4296
+vn 0.506799996 -0.663999975 0.549799979
+vn -0.396899998 0.867600024 0.299400002
+vn 0.464100003 -0.774699986 0.4296
+vn -0.309500009 0.934199989 0.177599996
+vn 0.396899998 -0.867600024 0.299499989
+vn -0.209999993 0.974300027 0.0811000019
+vn -0.105700001 -0.994199991 0.0205000006
+vn 0.519200027 -0.258300006 -0.814700007
+vn -0.531700015 0.440100014 -0.723699987
+vn 0.5273 -0.342999995 -0.777400017
+vn -0.527100027 0.548799992 -0.648800015
+vn 0.531599998 -0.440100014 -0.723699987
+vn -0.506799996 0.663999975 -0.549799979
+vn 0.527100027 -0.548799992 -0.648800015
+vn -0.464100003 0.774699986 -0.4296
+vn 0.506799996 -0.663999975 -0.549799979
+vn -0.396899998 0.867600024 -0.299499989
+vn 0.464100003 -0.774699986 -0.4296
+vn -0.309500009 0.934199989 -0.177599996
+vn 0.396899998 -0.867600024 -0.299499989
+vn -0.209999993 0.974300027 -0.0811000019
+vn -0.105700001 -0.994199991 -0.0205000006
+vn 0.309500009 -0.934199989 -0.177599996
+vn -0.105700001 0.994199991 -0.0205000006
+vn -0.209999993 -0.974300027 -0.0811000019
+vn 0.209999993 -0.974300027 -0.0811000019
+vn 0.105700001 0.994199991 -0.0205000006
+vn -0.309500009 -0.934199989 -0.177599996
+vn 0.105700001 -0.994199991 -0.0205000006
+vn 0.209999993 0.974300027 -0.0811000019
+vn -0.396899998 -0.867600024 -0.299499989
+vn 0.309500009 0.934199989 -0.177599996
+vn -0.464100003 -0.774600029 -0.4296
+vn 0.396899998 0.867600024 -0.299499989
+vn -0.506799996 -0.663999975 -0.549899995
+vn 0.464100003 0.774699986 -0.4296
+vn -0.527100027 -0.548799992 -0.648800015
+vn 0.506799996 0.663999975 -0.549799979
+vn -0.531599998 -0.440100014 -0.723699987
+vn 0.527100027 0.548799992 -0.648800015
+vn -0.5273 -0.342999995 -0.777400017
+vn 0.531599998 0.440100014 -0.723699987
+vn -0.519200027 -0.258300006 -0.814700007
+vn 0.5273 0.342999995 -0.777400017
+vn -0.510699987 -0.184300005 -0.8398
+vn 0.519200027 0.258300006 -0.814700007
+vn -0.503700018 -0.118500002 -0.855700016
+vn 0.510699987 0.184300005 -0.8398
+vn -0.4991 -0.0579999983 -0.864600003
+vn 0.503700018 0.118500002 -0.855700016
+vn -0.497599989 -0 -0.867399991
+vn 0.4991 0.0579999983 -0.864600003
+vn 0.497599989 -0 -0.867399991
+vn -0.4991 0.0579999983 -0.864600003
+vn -0.503700018 0.118500002 -0.855700016
+vn 0.4991 -0.0579999983 -0.864600003
+vn -0.510699987 0.184300005 -0.8398
+vn 0.503700018 -0.118500002 -0.855700016
+vn -0.519200027 0.258300006 -0.814700007
+vn 0.510699987 -0.184300005 -0.8398
+f 224/1/1 2/2/2 222/1/3
+f 12/3/4 14/4/5 10/3/6
+f 14/4/5 20/5/7 18/5/8
+f 20/5/7 22/6/9 18/5/8
+f 22/6/9 28/7/10 26/7/11
+f 28/7/10 30/8/12 26/7/11
+f 32/8/13 34/9/14 30/8/12
+f 36/9/15 38/10/16 34/9/14
+f 38/10/16 44/11/17 42/11/18
+f 44/11/17 46/12/19 42/11/18
+f 48/12/20 50/13/21 46/12/19
+f 52/13/22 54/14/23 50/13/21
+f 56/14/24 58/15/25 54/14/23
+f 60/15/26 62/16/27 58/15/25
+f 64/16/28 66/17/29 62/16/27
+f 66/17/29 72/18/30 70/18/31
+f 70/18/31 76/19/32 74/19/33
+f 76/19/32 78/20/34 74/19/33
+f 80/20/35 82/21/36 78/20/34
+f 84/21/37 86/22/38 82/21/36
+f 88/22/39 90/23/40 86/22/38
+f 90/23/40 96/24/41 94/24/42
+f 96/24/41 98/25/43 94/24/42
+f 98/25/43 104/26/44 102/26/45
+f 102/26/45 108/27/46 106/27/47
+f 108/27/46 110/28/48 106/27/47
+f 112/28/49 114/29/50 110/28/48
+f 116/29/51 118/30/52 114/29/50
+f 120/30/53 122/31/54 118/30/52
+f 122/31/54 128/32/55 126/32/56
+f 126/32/56 132/33/57 130/33/58
+f 132/33/57 134/34/59 130/33/58
+f 134/34/59 140/35/60 138/35/61
+f 140/35/60 142/36/62 138/35/61
+f 144/36/63 146/37/64 142/36/62
+f 148/37/65 150/38/66 146/37/64
+f 152/38/67 154/39/68 150/38/66
+f 156/39/69 158/40/70 154/39/68
+f 160/40/71 162/41/72 158/40/70
+f 164/41/73 166/42/74 162/41/72
+f 168/42/75 170/43/76 166/42/74
+f 172/43/77 174/44/78 170/43/76
+f 176/44/79 178/45/80 174/44/78
+f 180/45/81 182/46/82 178/45/80
+f 184/46/83 186/47/84 182/46/82
+f 188/47/85 190/48/86 186/47/84
+f 192/48/87 194/49/88 190/48/86
+f 196/49/89 198/50/90 194/49/88
+f 200/50/91 202/51/92 198/50/90
+f 204/51/93 206/52/94 202/51/92
+f 208/52/95 210/53/96 206/52/94
+f 212/54/97 214/55/98 210/53/96
+f 216/55/99 218/56/100 214/55/98
+f 220/56/101 222/1/3 218/56/100
+f 8/57/102 10/3/6 6/57/103
+f 71/58/104 355/59/105 75/59/106
+f 4/2/107 6/57/103 2/2/2
+f 6/57/103 226/60/108 2/2/2
+f 8/57/102 227/60/109 228/61/110
+f 10/3/6 225/61/111 6/57/103
+f 12/3/4 228/61/110 230/62/112
+f 14/4/5 229/62/113 10/3/6
+f 12/3/4 232/63/114 16/4/115
+f 18/5/8 231/63/116 14/4/5
+f 20/5/7 232/63/114 234/64/117
+f 18/5/8 235/65/118 233/64/119
+f 20/5/7 236/65/120 24/66/121
+f 22/6/9 237/67/122 235/65/118
+f 24/66/121 238/67/123 28/7/10
+f 30/8/12 237/67/122 26/7/11
+f 32/8/13 238/67/123 240/68/124
+f 30/8/12 241/69/125 239/68/126
+f 32/8/13 242/69/127 36/9/15
+f 38/10/16 241/69/125 34/9/14
+f 40/10/128 242/69/127 244/70/129
+f 42/11/18 243/70/130 38/10/16
+f 44/11/17 244/70/129 246/71/131
+f 42/11/18 247/72/132 245/71/133
+f 44/11/17 248/72/134 48/12/20
+f 46/12/19 249/73/135 247/72/132
+f 52/13/22 248/72/134 250/73/136
+f 50/13/21 251/74/137 249/73/135
+f 52/13/22 252/74/138 56/14/24
+f 54/14/23 253/75/139 251/74/137
+f 56/14/24 254/75/140 60/15/26
+f 62/16/27 253/75/139 58/15/25
+f 64/16/28 254/75/140 256/76/141
+f 66/17/29 255/76/142 62/16/27
+f 68/17/143 256/76/141 258/77/144
+f 70/18/31 257/77/145 66/17/29
+f 72/18/30 258/77/144 260/78/146
+f 74/19/33 259/78/147 70/18/31
+f 76/19/32 260/78/146 262/79/148
+f 74/19/33 263/80/149 261/79/150
+f 76/19/32 264/80/151 80/20/35
+f 78/20/34 265/81/152 263/80/149
+f 80/20/35 266/81/153 84/21/37
+f 86/22/38 265/81/152 82/21/36
+f 88/22/39 266/81/153 268/82/154
+f 86/22/38 269/83/155 267/82/156
+f 88/22/39 270/83/157 92/23/158
+f 94/24/42 269/83/155 90/23/40
+f 96/24/41 270/83/157 272/84/159
+f 98/25/43 271/84/160 94/24/42
+f 100/25/161 272/84/159 274/85/162
+f 98/25/43 275/86/163 273/85/164
+f 100/25/161 276/86/165 104/26/44
+f 106/27/47 275/86/163 102/26/45
+f 104/26/44 278/87/166 108/27/46
+f 106/27/47 279/88/167 277/87/168
+f 108/27/46 280/88/169 112/28/49
+f 110/28/48 281/89/170 279/88/167
+f 112/28/49 282/89/171 116/29/51
+f 118/30/52 281/89/170 114/29/50
+f 120/30/53 282/89/171 284/90/172
+f 122/31/54 283/90/173 118/30/52
+f 124/31/174 284/90/172 286/91/175
+f 126/32/56 285/91/176 122/31/54
+f 128/32/55 286/91/175 288/92/177
+f 130/33/58 287/93/178 126/32/56
+f 132/33/57 288/92/177 290/94/179
+f 130/33/58 291/95/180 289/94/181
+f 132/33/57 292/95/182 136/34/183
+f 134/34/59 293/96/184 291/95/180
+f 136/34/183 294/96/185 140/35/60
+f 142/36/62 293/96/184 138/35/61
+f 144/36/63 294/96/185 296/97/186
+f 142/36/62 297/98/187 295/97/188
+f 144/36/63 298/98/189 148/37/65
+f 150/38/66 297/98/187 146/37/64
+f 152/38/67 298/98/189 300/99/190
+f 154/39/68 299/99/191 150/38/66
+f 156/39/69 300/99/190 302/100/192
+f 154/39/68 303/101/193 301/100/194
+f 156/39/69 304/101/195 160/40/71
+f 162/41/72 303/101/193 158/40/70
+f 160/40/71 306/102/196 164/41/73
+f 162/41/72 307/103/197 305/102/198
+f 164/41/73 308/103/199 168/42/75
+f 166/42/74 309/104/200 307/103/197
+f 168/42/75 310/104/201 172/43/77
+f 174/44/78 309/104/200 170/43/76
+f 176/44/79 310/104/201 312/105/202
+f 178/45/80 311/105/203 174/44/78
+f 180/45/81 312/105/202 314/106/204
+f 182/46/82 313/106/205 178/45/80
+f 180/45/81 316/107/206 184/46/83
+f 186/47/84 315/107/207 182/46/82
+f 188/47/85 316/107/206 318/108/208
+f 186/47/84 319/109/209 317/108/210
+f 188/47/85 320/109/211 192/48/87
+f 190/48/86 321/110/212 319/109/209
+f 192/48/87 322/110/213 196/49/89
+f 198/50/90 321/110/212 194/49/88
+f 200/50/91 322/110/213 324/111/214
+f 198/50/90 325/112/215 323/111/216
+f 200/50/91 326/112/217 204/51/93
+f 206/52/94 325/112/215 202/51/92
+f 208/52/95 326/112/217 328/113/218
+f 210/53/96 327/114/219 206/52/94
+f 212/54/97 328/113/218 330/115/220
+f 210/53/96 331/116/221 329/115/222
+f 212/54/97 332/117/223 216/55/99
+f 218/56/100 331/116/221 214/55/98
+f 216/55/99 334/118/224 220/56/101
+f 218/56/100 335/119/225 333/118/226
+f 220/56/101 336/119/227 224/1/1
+f 222/1/3 226/60/108 335/119/225
+f 224/1/1 227/60/109 4/2/107
+f 125/120/228 423/121/229 121/122/230
+f 1/123/231 225/61/231 5/124/231
+f 3/123/232 228/61/232 227/60/232
+f 9/125/231 225/61/231 229/62/231
+f 11/125/232 228/61/232 7/124/232
+f 9/125/231 231/63/231 13/126/231
+f 11/125/232 232/63/232 230/62/232
+f 13/126/231 233/64/231 17/127/231
+f 19/127/232 232/63/232 15/128/232
+f 17/127/231 235/65/231 21/129/231
+f 19/127/232 236/65/232 234/64/232
+f 21/129/231 237/67/231 25/130/231
+f 23/129/232 238/67/232 236/65/232
+f 29/131/231 237/67/231 239/68/231
+f 31/131/232 238/67/232 27/130/232
+f 33/132/231 239/68/231 241/69/231
+f 35/132/232 240/68/232 31/131/232
+f 37/133/231 241/69/231 243/70/231
+f 39/133/232 242/69/232 35/132/232
+f 41/134/231 243/70/231 245/71/231
+f 43/134/232 244/70/232 39/133/232
+f 41/134/231 247/72/231 45/135/231
+f 43/134/232 248/72/232 246/71/232
+f 49/136/231 247/72/231 249/73/231
+f 51/136/232 248/72/232 47/135/232
+f 49/136/231 251/74/231 53/137/231
+f 51/136/232 252/74/232 250/73/232
+f 57/138/231 251/74/231 253/75/231
+f 59/138/232 252/74/232 55/137/232
+f 57/138/231 255/76/231 61/139/231
+f 59/138/232 256/76/232 254/75/232
+f 65/140/231 255/76/231 257/77/231
+f 67/140/232 256/76/232 63/139/232
+f 65/140/231 259/78/231 69/58/231
+f 67/140/232 260/78/232 258/77/232
+f 73/59/231 259/78/231 261/79/231
+f 75/59/232 260/78/232 71/58/232
+f 73/59/231 263/80/231 77/141/231
+f 75/59/232 264/80/232 262/79/232
+f 77/141/231 265/81/231 81/142/231
+f 79/141/232 266/81/232 264/80/232
+f 85/143/231 265/81/231 267/82/231
+f 87/143/232 266/81/232 83/142/232
+f 89/144/231 267/82/231 269/83/231
+f 91/145/232 268/82/232 87/143/232
+f 93/146/231 269/83/231 271/84/231
+f 95/146/232 270/83/232 91/145/232
+f 97/147/231 271/84/231 273/85/231
+f 99/147/232 272/84/232 95/146/232
+f 97/147/231 275/86/231 101/148/231
+f 99/147/232 276/86/232 274/85/232
+f 105/149/231 275/86/231 277/87/231
+f 107/149/232 276/86/232 103/148/232
+f 105/149/231 279/88/231 109/150/231
+f 107/149/232 280/88/232 278/87/232
+f 113/151/231 279/88/231 281/89/231
+f 115/151/232 280/88/232 111/150/232
+f 113/151/231 283/90/231 117/152/231
+f 115/151/232 284/90/232 282/89/232
+f 121/122/231 283/90/231 285/91/231
+f 123/122/232 284/90/232 119/152/232
+f 125/120/231 285/91/231 287/93/231
+f 127/120/232 286/91/232 123/122/232
+f 129/153/231 287/93/231 289/94/231
+f 131/153/232 288/92/232 127/120/232
+f 129/153/231 291/95/231 133/154/231
+f 131/153/232 292/95/232 290/94/232
+f 133/154/231 293/96/231 137/155/231
+f 135/154/232 294/96/232 292/95/232
+f 141/156/231 293/96/231 295/97/231
+f 143/156/232 294/96/232 139/155/232
+f 145/157/231 295/97/231 297/98/231
+f 147/157/232 296/97/232 143/156/232
+f 149/158/231 297/98/231 299/99/231
+f 151/158/232 298/98/232 147/157/232
+f 153/159/231 299/99/231 301/100/231
+f 155/159/232 300/99/232 151/158/232
+f 153/159/231 303/101/231 157/160/231
+f 155/159/232 304/101/232 302/100/232
+f 161/161/231 303/101/231 305/102/231
+f 163/161/232 304/101/232 159/160/232
+f 161/161/231 307/103/231 165/162/231
+f 163/161/232 308/103/232 306/102/232
+f 169/163/231 307/103/231 309/104/231
+f 171/163/232 308/103/232 167/162/232
+f 169/163/231 311/105/231 173/164/231
+f 171/163/232 312/105/232 310/104/232
+f 177/165/231 311/105/231 313/106/231
+f 179/165/232 312/105/232 175/164/232
+f 177/165/231 315/107/231 181/166/231
+f 179/165/232 316/107/232 314/106/232
+f 185/167/231 315/107/231 317/108/231
+f 187/167/232 316/107/232 183/166/232
+f 185/167/231 319/109/231 189/168/231
+f 191/168/232 318/108/232 187/167/232
+f 189/168/231 321/110/231 193/169/231
+f 191/168/232 322/110/232 320/109/232
+f 197/170/231 321/110/231 323/111/231
+f 199/170/232 322/110/232 195/169/232
+f 201/171/231 323/111/231 325/112/231
+f 203/171/232 324/111/232 199/170/232
+f 205/172/231 325/112/231 327/114/231
+f 207/172/232 326/112/232 203/171/232
+f 209/173/231 327/114/231 329/115/231
+f 211/173/232 328/113/232 207/172/232
+f 209/173/231 331/116/231 213/174/231
+f 211/173/232 332/117/232 330/115/232
+f 217/175/231 331/116/231 333/118/231
+f 219/175/232 332/117/232 215/174/232
+f 217/175/231 335/119/231 221/176/231
+f 219/175/232 336/119/232 334/118/232
+f 1/123/231 335/119/231 226/60/231
+f 3/123/232 336/119/232 223/176/232
+f 391/175/233 502/177/234 503/178/235
+f 23/129/236 341/127/237 342/129/238
+f 179/165/239 382/166/240 183/166/241
+f 127/120/242 369/153/243 131/153/244
+f 75/59/106 356/141/245 79/141/246
+f 23/129/236 343/130/247 27/130/248
+f 183/166/241 383/167/249 187/167/250
+f 131/153/244 370/154/251 135/154/252
+f 79/141/246 357/142/253 83/142/254
+f 31/131/255 343/130/247 344/131/256
+f 187/167/250 384/168/257 191/168/258
+f 135/154/252 371/155/259 139/155/260
+f 83/142/254 358/143/261 87/143/262
+f 31/131/255 345/132/263 35/132/264
+f 195/169/265 384/168/257 385/169/266
+f 139/155/260 372/156/267 143/156/268
+f 87/143/262 359/145/269 91/145/270
+f 35/132/264 346/133/271 39/133/272
+f 195/169/265 386/170/273 199/170/274
+f 147/157/275 372/156/267 373/157/276
+f 91/145/270 360/146/277 95/146/278
+f 39/133/272 347/134/279 43/134/280
+f 199/170/274 387/171/281 203/171/282
+f 147/157/275 374/158/283 151/158/284
+f 99/147/285 360/146/277 361/147/286
+f 43/134/280 348/135/287 47/135/288
+f 203/171/282 388/172/289 207/172/290
+f 151/158/284 375/159/291 155/159/292
+f 103/148/293 361/147/286 362/148/294
+f 47/135/288 349/136/295 51/136/296
+f 207/172/290 389/173/297 211/173/298
+f 155/159/292 376/160/299 159/160/300
+f 103/148/293 363/149/301 107/149/302
+f 55/137/303 349/136/295 350/137/304
+f 215/174/305 389/173/297 390/174/306
+f 159/160/300 377/161/307 163/161/308
+f 111/150/309 363/149/301 364/150/310
+f 55/137/303 351/138/311 59/138/312
+f 3/123/313 338/124/314 7/124/315
+f 215/174/305 391/175/233 219/175/316
+f 163/161/308 378/162/317 167/162/318
+f 111/150/309 365/151/319 115/151/320
+f 59/138/312 352/139/321 63/139/322
+f 7/124/315 339/125/323 11/125/324
+f 219/175/316 392/176/325 223/176/326
+f 171/163/327 378/162/317 379/163/328
+f 119/152/329 365/151/319 366/152/330
+f 63/139/322 353/140/331 67/140/332
+f 11/125/324 340/128/333 15/128/334
+f 223/176/326 337/123/335 3/123/313
+f 171/163/327 380/164/336 175/164/337
+f 123/122/338 366/152/330 367/121/339
+f 67/140/332 354/58/340 71/58/104
+f 15/128/334 341/127/237 19/127/341
+f 175/164/337 381/165/342 179/165/239
+f 127/120/242 367/121/339 368/120/343
+f 413/142/344 524/179/345 412/141/346
+f 73/59/347 410/58/348 69/58/349
+f 21/129/350 397/127/351 17/127/352
+f 181/166/353 437/165/354 177/165/355
+f 125/120/228 425/153/356 424/120/357
+f 77/141/358 411/59/359 73/59/347
+f 25/130/360 398/129/361 21/129/350
+f 185/167/362 438/166/363 181/166/353
+f 129/153/364 426/154/365 425/153/356
+f 81/142/366 412/141/346 77/141/358
+f 29/131/367 399/130/368 25/130/360
+f 189/168/369 439/167/370 185/167/362
+f 133/154/371 427/155/372 426/154/365
+f 81/142/366 414/143/373 413/142/344
+f 33/132/374 400/131/375 29/131/367
+f 193/169/376 440/168/377 189/168/369
+f 141/156/378 427/155/372 137/155/379
+f 85/143/380 415/145/381 414/143/373
+f 33/132/374 402/133/382 401/132/383
+f 197/170/384 441/169/385 193/169/376
+f 145/157/386 428/156/387 141/156/378
+f 89/144/388 416/146/389 415/145/381
+f 41/134/390 402/133/382 37/133/391
+f 201/171/392 442/170/393 197/170/384
+f 149/158/394 429/157/395 145/157/386
+f 93/146/396 417/147/397 416/146/389
+f 45/135/398 403/134/399 41/134/390
+f 205/172/400 443/171/401 201/171/392
+f 153/159/402 430/158/403 149/158/394
+f 97/147/404 418/180/405 417/147/397
+f 45/135/398 405/136/406 404/135/407
+f 209/173/408 444/172/409 205/172/400
+f 157/160/410 431/159/411 153/159/402
+f 101/148/412 419/149/413 418/180/405
+f 53/137/414 405/136/406 49/136/415
+f 213/174/416 445/173/417 209/173/408
+f 161/161/418 432/160/419 157/160/410
+f 109/150/420 419/149/413 105/149/421
+f 57/138/422 406/137/423 53/137/414
+f 1/123/424 393/124/425 394/123/426
+f 217/175/427 446/174/428 213/174/416
+f 165/162/429 433/161/430 161/161/418
+f 113/151/431 420/150/432 109/150/420
+f 61/139/433 407/138/434 57/138/422
+f 5/124/435 395/125/436 393/124/425
+f 217/175/427 448/176/437 447/175/438
+f 169/163/439 434/162/440 165/162/429
+f 117/152/441 421/151/442 113/151/431
+f 61/139/433 409/140/443 408/139/444
+f 13/126/445 395/125/436 9/125/446
+f 221/176/447 394/123/426 448/176/437
+f 173/164/448 435/163/449 169/163/439
+f 121/122/230 422/152/450 117/152/441
+f 69/58/349 409/140/443 65/140/451
+f 13/126/445 397/127/351 396/126/452
+f 177/165/355 436/164/453 173/164/448
+f 365/151/319 476/181/454 477/151/455
+f 338/124/314 451/182/456 339/125/323
+f 392/176/325 503/178/235 504/183/457
+f 365/151/319 478/184/458 366/152/330
+f 339/125/323 452/185/459 340/128/333
+f 337/123/335 504/183/457 449/186/460
+f 366/152/330 479/187/461 367/121/339
+f 340/128/333 453/188/462 341/127/237
+f 367/121/339 480/189/463 368/120/343
+f 341/127/237 454/190/464 342/129/238
+f 368/120/343 481/191/465 369/153/243
+f 342/129/238 455/192/466 343/130/247
+f 369/153/243 482/193/467 370/154/251
+f 343/130/247 456/194/468 344/131/256
+f 370/154/251 483/195/469 371/155/259
+f 344/131/256 457/196/470 345/132/263
+f 371/155/259 484/197/471 372/156/267
+f 345/132/263 458/198/472 346/133/271
+f 372/156/267 485/199/473 373/157/276
+f 346/133/271 459/200/474 347/134/279
+f 373/157/276 486/201/475 374/158/283
+f 347/134/279 460/202/476 348/135/287
+f 374/158/283 487/203/477 375/159/291
+f 348/135/287 461/204/478 349/136/295
+f 375/159/291 488/205/479 376/160/299
+f 349/136/295 462/206/480 350/137/304
+f 376/160/299 489/207/481 377/161/307
+f 350/137/304 463/208/482 351/138/311
+f 377/161/307 490/209/483 378/162/317
+f 352/139/321 463/208/482 464/210/484
+f 378/162/317 491/211/485 379/163/328
+f 353/140/331 464/210/484 465/212/486
+f 380/164/336 491/211/485 492/213/487
+f 354/58/340 465/212/486 466/214/488
+f 381/165/342 492/213/487 493/215/489
+f 355/59/105 466/214/488 467/216/490
+f 382/166/240 493/215/489 494/217/491
+f 356/141/245 467/216/490 468/179/492
+f 383/167/249 494/217/491 495/218/493
+f 357/142/253 468/179/492 469/219/494
+f 384/168/257 495/218/493 496/220/495
+f 358/143/261 469/219/494 470/221/496
+f 385/169/266 496/220/495 497/222/497
+f 359/145/269 470/221/496 471/223/498
+f 386/170/273 497/222/497 498/224/499
+f 360/146/277 471/223/498 472/225/500
+f 387/171/281 498/224/499 499/226/501
+f 361/147/286 472/225/500 473/227/502
+f 388/172/289 499/226/501 500/228/503
+f 362/148/294 473/227/502 474/229/504
+f 389/173/297 500/228/503 501/230/505
+f 363/149/301 474/229/504 475/231/506
+f 390/174/306 501/230/505 502/177/234
+f 364/150/310 475/231/506 476/181/454
+f 337/123/335 450/232/507 338/124/314
+f 440/168/377 551/218/508 439/167/370
+f 414/143/373 525/219/509 413/142/344
+f 441/169/385 552/220/510 440/168/377
+f 415/145/381 526/221/511 414/143/373
+f 442/170/393 553/222/512 441/169/385
+f 416/146/389 527/223/513 415/145/381
+f 443/171/401 554/224/514 442/170/393
+f 417/147/397 528/225/515 416/146/389
+f 444/172/409 555/226/516 443/171/401
+f 418/180/405 529/227/517 417/147/397
+f 445/173/417 556/228/518 444/172/409
+f 419/149/413 530/229/519 418/180/405
+f 446/174/428 557/230/520 445/173/417
+f 420/150/432 531/231/521 419/149/413
+f 394/123/426 505/232/522 506/186/460
+f 447/175/438 558/177/523 446/174/428
+f 421/151/442 532/181/524 420/150/432
+f 393/124/425 507/182/525 505/232/522
+f 448/176/437 559/178/526 447/175/438
+f 421/151/442 534/184/527 533/151/455
+f 395/125/436 508/185/528 507/182/525
+f 394/123/426 560/183/529 448/176/437
+f 422/152/450 535/233/530 534/184/527
+f 396/126/452 509/188/531 508/185/528
+f 423/121/229 536/189/532 535/233/530
+f 397/127/351 510/190/533 509/188/531
+f 424/120/357 537/191/534 536/189/532
+f 398/129/361 511/192/535 510/190/533
+f 425/153/356 538/193/536 537/191/534
+f 399/130/368 512/194/537 511/192/535
+f 426/154/365 539/195/538 538/193/536
+f 400/131/375 513/196/539 512/194/537
+f 427/155/372 540/197/540 539/195/538
+f 401/132/383 514/198/541 513/196/539
+f 428/156/387 541/199/542 540/197/540
+f 402/133/382 515/200/543 514/198/541
+f 429/157/395 542/201/544 541/199/542
+f 403/134/399 516/202/545 515/200/543
+f 430/158/403 543/203/546 542/201/544
+f 404/135/407 517/204/547 516/202/545
+f 431/159/411 544/205/548 543/203/546
+f 405/136/406 518/206/549 517/204/547
+f 432/160/419 545/207/550 544/205/548
+f 406/137/423 519/208/551 518/206/549
+f 433/161/430 546/209/552 545/207/550
+f 408/139/444 519/208/551 407/138/434
+f 434/162/440 547/211/553 546/209/552
+f 409/140/443 520/210/554 408/139/444
+f 436/164/453 547/211/553 435/163/449
+f 410/58/348 521/212/555 409/140/443
+f 437/165/354 548/213/556 436/164/453
+f 411/59/359 522/214/557 410/58/348
+f 438/166/363 549/215/558 437/165/354
+f 412/141/346 523/216/559 411/59/359
+f 439/167/370 550/217/560 438/166/363
+f 224/1/1 4/2/107 2/2/2
+f 12/3/4 16/4/115 14/4/5
+f 14/4/5 16/4/115 20/5/7
+f 20/5/7 24/66/121 22/6/9
+f 22/6/9 24/66/121 28/7/10
+f 28/7/10 32/8/13 30/8/12
+f 32/8/13 36/9/15 34/9/14
+f 36/9/15 40/10/128 38/10/16
+f 38/10/16 40/10/128 44/11/17
+f 44/11/17 48/12/20 46/12/19
+f 48/12/20 52/13/22 50/13/21
+f 52/13/22 56/14/24 54/14/23
+f 56/14/24 60/15/26 58/15/25
+f 60/15/26 64/16/28 62/16/27
+f 64/16/28 68/17/143 66/17/29
+f 66/17/29 68/17/143 72/18/30
+f 70/18/31 72/18/30 76/19/32
+f 76/19/32 80/20/35 78/20/34
+f 80/20/35 84/21/37 82/21/36
+f 84/21/37 88/22/39 86/22/38
+f 88/22/39 92/23/158 90/23/40
+f 90/23/40 92/23/158 96/24/41
+f 96/24/41 100/25/161 98/25/43
+f 98/25/43 100/25/161 104/26/44
+f 102/26/45 104/26/44 108/27/46
+f 108/27/46 112/28/49 110/28/48
+f 112/28/49 116/29/51 114/29/50
+f 116/29/51 120/30/53 118/30/52
+f 120/30/53 124/31/174 122/31/54
+f 122/31/54 124/31/174 128/32/55
+f 126/32/56 128/32/55 132/33/57
+f 132/33/57 136/34/183 134/34/59
+f 134/34/59 136/34/183 140/35/60
+f 140/35/60 144/36/63 142/36/62
+f 144/36/63 148/37/65 146/37/64
+f 148/37/65 152/38/67 150/38/66
+f 152/38/67 156/39/69 154/39/68
+f 156/39/69 160/40/71 158/40/70
+f 160/40/71 164/41/73 162/41/72
+f 164/41/73 168/42/75 166/42/74
+f 168/42/75 172/43/77 170/43/76
+f 172/43/77 176/44/79 174/44/78
+f 176/44/79 180/45/81 178/45/80
+f 180/45/81 184/46/83 182/46/82
+f 184/46/83 188/47/85 186/47/84
+f 188/47/85 192/48/87 190/48/86
+f 192/48/87 196/49/89 194/49/88
+f 196/49/89 200/50/91 198/50/90
+f 200/50/91 204/51/93 202/51/92
+f 204/51/93 208/52/95 206/52/94
+f 208/52/95 212/54/97 210/53/96
+f 212/54/97 216/55/99 214/55/98
+f 216/55/99 220/56/101 218/56/100
+f 220/56/101 224/1/1 222/1/3
+f 8/57/102 12/3/4 10/3/6
+f 71/58/104 354/58/340 355/59/105
+f 4/2/107 8/57/102 6/57/103
+f 6/57/103 225/61/111 226/60/108
+f 8/57/102 4/2/107 227/60/109
+f 10/3/6 229/62/113 225/61/111
+f 12/3/4 8/57/102 228/61/110
+f 14/4/5 231/63/116 229/62/113
+f 12/3/4 230/62/112 232/63/114
+f 18/5/8 233/64/119 231/63/116
+f 20/5/7 16/4/115 232/63/114
+f 18/5/8 22/6/9 235/65/118
+f 20/5/7 234/64/117 236/65/120
+f 22/6/9 26/7/11 237/67/122
+f 24/66/121 236/65/120 238/67/123
+f 30/8/12 239/68/126 237/67/122
+f 32/8/13 28/7/10 238/67/123
+f 30/8/12 34/9/14 241/69/125
+f 32/8/13 240/68/124 242/69/127
+f 38/10/16 243/70/130 241/69/125
+f 40/10/128 36/9/15 242/69/127
+f 42/11/18 245/71/133 243/70/130
+f 44/11/17 40/10/128 244/70/129
+f 42/11/18 46/12/19 247/72/132
+f 44/11/17 246/71/131 248/72/134
+f 46/12/19 50/13/21 249/73/135
+f 52/13/22 48/12/20 248/72/134
+f 50/13/21 54/14/23 251/74/137
+f 52/13/22 250/73/136 252/74/138
+f 54/14/23 58/15/25 253/75/139
+f 56/14/24 252/74/138 254/75/140
+f 62/16/27 255/76/142 253/75/139
+f 64/16/28 60/15/26 254/75/140
+f 66/17/29 257/77/145 255/76/142
+f 68/17/143 64/16/28 256/76/141
+f 70/18/31 259/78/147 257/77/145
+f 72/18/30 68/17/143 258/77/144
+f 74/19/33 261/79/150 259/78/147
+f 76/19/32 72/18/30 260/78/146
+f 74/19/33 78/20/34 263/80/149
+f 76/19/32 262/79/148 264/80/151
+f 78/20/34 82/21/36 265/81/152
+f 80/20/35 264/80/151 266/81/153
+f 86/22/38 267/82/156 265/81/152
+f 88/22/39 84/21/37 266/81/153
+f 86/22/38 90/23/40 269/83/155
+f 88/22/39 268/82/154 270/83/157
+f 94/24/42 271/84/160 269/83/155
+f 96/24/41 92/23/158 270/83/157
+f 98/25/43 273/85/164 271/84/160
+f 100/25/161 96/24/41 272/84/159
+f 98/25/43 102/26/45 275/86/163
+f 100/25/161 274/85/162 276/86/165
+f 106/27/47 277/87/168 275/86/163
+f 104/26/44 276/86/165 278/87/166
+f 106/27/47 110/28/48 279/88/167
+f 108/27/46 278/87/166 280/88/169
+f 110/28/48 114/29/50 281/89/170
+f 112/28/49 280/88/169 282/89/171
+f 118/30/52 283/90/173 281/89/170
+f 120/30/53 116/29/51 282/89/171
+f 122/31/54 285/91/176 283/90/173
+f 124/31/174 120/30/53 284/90/172
+f 126/32/56 287/93/178 285/91/176
+f 128/32/55 124/31/174 286/91/175
+f 130/33/58 289/94/181 287/93/178
+f 132/33/57 128/32/55 288/92/177
+f 130/33/58 134/34/59 291/95/180
+f 132/33/57 290/94/179 292/95/182
+f 134/34/59 138/35/61 293/96/184
+f 136/34/183 292/95/182 294/96/185
+f 142/36/62 295/97/188 293/96/184
+f 144/36/63 140/35/60 294/96/185
+f 142/36/62 146/37/64 297/98/187
+f 144/36/63 296/97/186 298/98/189
+f 150/38/66 299/99/191 297/98/187
+f 152/38/67 148/37/65 298/98/189
+f 154/39/68 301/100/194 299/99/191
+f 156/39/69 152/38/67 300/99/190
+f 154/39/68 158/40/70 303/101/193
+f 156/39/69 302/100/192 304/101/195
+f 162/41/72 305/102/198 303/101/193
+f 160/40/71 304/101/195 306/102/196
+f 162/41/72 166/42/74 307/103/197
+f 164/41/73 306/102/196 308/103/199
+f 166/42/74 170/43/76 309/104/200
+f 168/42/75 308/103/199 310/104/201
+f 174/44/78 311/105/203 309/104/200
+f 176/44/79 172/43/77 310/104/201
+f 178/45/80 313/106/205 311/105/203
+f 180/45/81 176/44/79 312/105/202
+f 182/46/82 315/107/207 313/106/205
+f 180/45/81 314/106/204 316/107/206
+f 186/47/84 317/108/210 315/107/207
+f 188/47/85 184/46/83 316/107/206
+f 186/47/84 190/48/86 319/109/209
+f 188/47/85 318/108/208 320/109/211
+f 190/48/86 194/49/88 321/110/212
+f 192/48/87 320/109/211 322/110/213
+f 198/50/90 323/111/216 321/110/212
+f 200/50/91 196/49/89 322/110/213
+f 198/50/90 202/51/92 325/112/215
+f 200/50/91 324/111/214 326/112/217
+f 206/52/94 327/114/219 325/112/215
+f 208/52/95 204/51/93 326/112/217
+f 210/53/96 329/115/222 327/114/219
+f 212/54/97 208/52/95 328/113/218
+f 210/53/96 214/55/98 331/116/221
+f 212/54/97 330/115/220 332/117/223
+f 218/56/100 333/118/226 331/116/221
+f 216/55/99 332/117/223 334/118/224
+f 218/56/100 222/1/3 335/119/225
+f 220/56/101 334/118/224 336/119/227
+f 222/1/3 2/2/2 226/60/108
+f 224/1/1 336/119/227 227/60/109
+f 125/120/228 424/120/357 423/121/229
+f 1/123/231 226/60/231 225/61/231
+f 3/123/232 7/124/232 228/61/232
+f 9/125/231 5/124/231 225/61/231
+f 11/125/232 230/62/232 228/61/232
+f 9/125/231 229/62/231 231/63/231
+f 11/125/232 15/128/232 232/63/232
+f 13/126/231 231/63/231 233/64/231
+f 19/127/232 234/64/232 232/63/232
+f 17/127/231 233/64/231 235/65/231
+f 19/127/232 23/129/232 236/65/232
+f 21/129/231 235/65/231 237/67/231
+f 23/129/232 27/130/232 238/67/232
+f 29/131/231 25/130/231 237/67/231
+f 31/131/232 240/68/232 238/67/232
+f 33/132/231 29/131/231 239/68/231
+f 35/132/232 242/69/232 240/68/232
+f 37/133/231 33/132/231 241/69/231
+f 39/133/232 244/70/232 242/69/232
+f 41/134/231 37/133/231 243/70/231
+f 43/134/232 246/71/232 244/70/232
+f 41/134/231 245/71/231 247/72/231
+f 43/134/232 47/135/232 248/72/232
+f 49/136/231 45/135/231 247/72/231
+f 51/136/232 250/73/232 248/72/232
+f 49/136/231 249/73/231 251/74/231
+f 51/136/232 55/137/232 252/74/232
+f 57/138/231 53/137/231 251/74/231
+f 59/138/232 254/75/232 252/74/232
+f 57/138/231 253/75/231 255/76/231
+f 59/138/232 63/139/232 256/76/232
+f 65/140/231 61/139/231 255/76/231
+f 67/140/232 258/77/232 256/76/232
+f 65/140/231 257/77/231 259/78/231
+f 67/140/232 71/58/232 260/78/232
+f 73/59/231 69/58/231 259/78/231
+f 75/59/232 262/79/232 260/78/232
+f 73/59/231 261/79/231 263/80/231
+f 75/59/232 79/141/232 264/80/232
+f 77/141/231 263/80/231 265/81/231
+f 79/141/232 83/142/232 266/81/232
+f 85/143/231 81/142/231 265/81/231
+f 87/143/232 268/82/232 266/81/232
+f 89/144/231 85/143/231 267/82/231
+f 91/145/232 270/83/232 268/82/232
+f 93/146/231 89/144/231 269/83/231
+f 95/146/232 272/84/232 270/83/232
+f 97/147/231 93/146/231 271/84/231
+f 99/147/232 274/85/232 272/84/232
+f 97/147/231 273/85/231 275/86/231
+f 99/147/232 103/148/232 276/86/232
+f 105/149/231 101/148/231 275/86/231
+f 107/149/232 278/87/232 276/86/232
+f 105/149/231 277/87/231 279/88/231
+f 107/149/232 111/150/232 280/88/232
+f 113/151/231 109/150/231 279/88/231
+f 115/151/232 282/89/232 280/88/232
+f 113/151/231 281/89/231 283/90/231
+f 115/151/232 119/152/232 284/90/232
+f 121/122/231 117/152/231 283/90/231
+f 123/122/232 286/91/232 284/90/232
+f 125/120/231 121/122/231 285/91/231
+f 127/120/232 288/92/232 286/91/232
+f 129/153/231 125/120/231 287/93/231
+f 131/153/232 290/94/232 288/92/232
+f 129/153/231 289/94/231 291/95/231
+f 131/153/232 135/154/232 292/95/232
+f 133/154/231 291/95/231 293/96/231
+f 135/154/232 139/155/232 294/96/232
+f 141/156/231 137/155/231 293/96/231
+f 143/156/232 296/97/232 294/96/232
+f 145/157/231 141/156/231 295/97/231
+f 147/157/232 298/98/232 296/97/232
+f 149/158/231 145/157/231 297/98/231
+f 151/158/232 300/99/232 298/98/232
+f 153/159/231 149/158/231 299/99/231
+f 155/159/232 302/100/232 300/99/232
+f 153/159/231 301/100/231 303/101/231
+f 155/159/232 159/160/232 304/101/232
+f 161/161/231 157/160/231 303/101/231
+f 163/161/232 306/102/232 304/101/232
+f 161/161/231 305/102/231 307/103/231
+f 163/161/232 167/162/232 308/103/232
+f 169/163/231 165/162/231 307/103/231
+f 171/163/232 310/104/232 308/103/232
+f 169/163/231 309/104/231 311/105/231
+f 171/163/232 175/164/232 312/105/232
+f 177/165/231 173/164/231 311/105/231
+f 179/165/232 314/106/232 312/105/232
+f 177/165/231 313/106/231 315/107/231
+f 179/165/232 183/166/232 316/107/232
+f 185/167/231 181/166/231 315/107/231
+f 187/167/232 318/108/232 316/107/232
+f 185/167/231 317/108/231 319/109/231
+f 191/168/232 320/109/232 318/108/232
+f 189/168/231 319/109/231 321/110/231
+f 191/168/232 195/169/232 322/110/232
+f 197/170/231 193/169/231 321/110/231
+f 199/170/232 324/111/232 322/110/232
+f 201/171/231 197/170/231 323/111/231
+f 203/171/232 326/112/232 324/111/232
+f 205/172/231 201/171/231 325/112/231
+f 207/172/232 328/113/232 326/112/232
+f 209/173/231 205/172/231 327/114/231
+f 211/173/232 330/115/232 328/113/232
+f 209/173/231 329/115/231 331/116/231
+f 211/173/232 215/174/232 332/117/232
+f 217/175/231 213/174/231 331/116/231
+f 219/175/232 334/118/232 332/117/232
+f 217/175/231 333/118/231 335/119/231
+f 219/175/232 223/176/232 336/119/232
+f 1/123/231 221/176/231 335/119/231
+f 3/123/232 227/60/232 336/119/232
+f 391/175/233 390/174/306 502/177/234
+f 23/129/236 19/127/341 341/127/237
+f 179/165/239 381/165/342 382/166/240
+f 127/120/242 368/120/343 369/153/243
+f 75/59/106 355/59/105 356/141/245
+f 23/129/236 342/129/238 343/130/247
+f 183/166/241 382/166/240 383/167/249
+f 131/153/244 369/153/243 370/154/251
+f 79/141/246 356/141/245 357/142/253
+f 31/131/255 27/130/248 343/130/247
+f 187/167/250 383/167/249 384/168/257
+f 135/154/252 370/154/251 371/155/259
+f 83/142/254 357/142/253 358/143/261
+f 31/131/255 344/131/256 345/132/263
+f 195/169/265 191/168/258 384/168/257
+f 139/155/260 371/155/259 372/156/267
+f 87/143/262 358/143/261 359/145/269
+f 35/132/264 345/132/263 346/133/271
+f 195/169/265 385/169/266 386/170/273
+f 147/157/275 143/156/268 372/156/267
+f 91/145/270 359/145/269 360/146/277
+f 39/133/272 346/133/271 347/134/279
+f 199/170/274 386/170/273 387/171/281
+f 147/157/275 373/157/276 374/158/283
+f 99/147/285 95/146/278 360/146/277
+f 43/134/280 347/134/279 348/135/287
+f 203/171/282 387/171/281 388/172/289
+f 151/158/284 374/158/283 375/159/291
+f 103/148/293 99/147/285 361/147/286
+f 47/135/288 348/135/287 349/136/295
+f 207/172/290 388/172/289 389/173/297
+f 155/159/292 375/159/291 376/160/299
+f 103/148/293 362/148/294 363/149/301
+f 55/137/303 51/136/296 349/136/295
+f 215/174/305 211/173/298 389/173/297
+f 159/160/300 376/160/299 377/161/307
+f 111/150/309 107/149/302 363/149/301
+f 55/137/303 350/137/304 351/138/311
+f 3/123/313 337/123/335 338/124/314
+f 215/174/305 390/174/306 391/175/233
+f 163/161/308 377/161/307 378/162/317
+f 111/150/309 364/150/310 365/151/319
+f 59/138/312 351/138/311 352/139/321
+f 7/124/315 338/124/314 339/125/323
+f 219/175/316 391/175/233 392/176/325
+f 171/163/327 167/162/318 378/162/317
+f 119/152/329 115/151/320 365/151/319
+f 63/139/322 352/139/321 353/140/331
+f 11/125/324 339/125/323 340/128/333
+f 223/176/326 392/176/325 337/123/335
+f 171/163/327 379/163/328 380/164/336
+f 123/122/338 119/152/329 366/152/330
+f 67/140/332 353/140/331 354/58/340
+f 15/128/334 340/128/333 341/127/237
+f 175/164/337 380/164/336 381/165/342
+f 127/120/242 123/122/338 367/121/339
+f 413/142/344 525/219/509 524/179/345
+f 73/59/347 411/59/359 410/58/348
+f 21/129/350 398/129/361 397/127/351
+f 181/166/353 438/166/363 437/165/354
+f 125/120/228 129/153/364 425/153/356
+f 77/141/358 412/141/346 411/59/359
+f 25/130/360 399/130/368 398/129/361
+f 185/167/362 439/167/370 438/166/363
+f 129/153/364 133/154/371 426/154/365
+f 81/142/366 413/142/344 412/141/346
+f 29/131/367 400/131/375 399/130/368
+f 189/168/369 440/168/377 439/167/370
+f 133/154/371 137/155/379 427/155/372
+f 81/142/366 85/143/380 414/143/373
+f 33/132/374 401/132/383 400/131/375
+f 193/169/376 441/169/385 440/168/377
+f 141/156/378 428/156/387 427/155/372
+f 85/143/380 89/144/388 415/145/381
+f 33/132/374 37/133/391 402/133/382
+f 197/170/384 442/170/393 441/169/385
+f 145/157/386 429/157/395 428/156/387
+f 89/144/388 93/146/396 416/146/389
+f 41/134/390 403/134/399 402/133/382
+f 201/171/392 443/171/401 442/170/393
+f 149/158/394 430/158/403 429/157/395
+f 93/146/396 97/147/404 417/147/397
+f 45/135/398 404/135/407 403/134/399
+f 205/172/400 444/172/409 443/171/401
+f 153/159/402 431/159/411 430/158/403
+f 97/147/404 101/148/412 418/180/405
+f 45/135/398 49/136/415 405/136/406
+f 209/173/408 445/173/417 444/172/409
+f 157/160/410 432/160/419 431/159/411
+f 101/148/412 105/149/421 419/149/413
+f 53/137/414 406/137/423 405/136/406
+f 213/174/416 446/174/428 445/173/417
+f 161/161/418 433/161/430 432/160/419
+f 109/150/420 420/150/432 419/149/413
+f 57/138/422 407/138/434 406/137/423
+f 1/123/424 5/124/435 393/124/425
+f 217/175/427 447/175/438 446/174/428
+f 165/162/429 434/162/440 433/161/430
+f 113/151/431 421/151/442 420/150/432
+f 61/139/433 408/139/444 407/138/434
+f 5/124/435 9/125/446 395/125/436
+f 217/175/427 221/176/447 448/176/437
+f 169/163/439 435/163/449 434/162/440
+f 117/152/441 422/152/450 421/151/442
+f 61/139/433 65/140/451 409/140/443
+f 13/126/445 396/126/452 395/125/436
+f 221/176/447 1/123/424 394/123/426
+f 173/164/448 436/164/453 435/163/449
+f 121/122/230 423/121/229 422/152/450
+f 69/58/349 410/58/348 409/140/443
+f 13/126/445 17/127/352 397/127/351
+f 177/165/355 437/165/354 436/164/453
+f 365/151/319 364/150/310 476/181/454
+f 338/124/314 450/232/507 451/182/456
+f 392/176/325 391/175/233 503/178/235
+f 365/151/319 477/151/455 478/184/458
+f 339/125/323 451/182/456 452/185/459
+f 337/123/335 392/176/325 504/183/457
+f 366/152/330 478/184/458 479/187/461
+f 340/128/333 452/185/459 453/188/462
+f 367/121/339 479/187/461 480/189/463
+f 341/127/237 453/188/462 454/190/464
+f 368/120/343 480/189/463 481/191/465
+f 342/129/238 454/190/464 455/192/466
+f 369/153/243 481/191/465 482/193/467
+f 343/130/247 455/192/466 456/194/468
+f 370/154/251 482/193/467 483/195/469
+f 344/131/256 456/194/468 457/196/470
+f 371/155/259 483/195/469 484/197/471
+f 345/132/263 457/196/470 458/198/472
+f 372/156/267 484/197/471 485/199/473
+f 346/133/271 458/198/472 459/200/474
+f 373/157/276 485/199/473 486/201/475
+f 347/134/279 459/200/474 460/202/476
+f 374/158/283 486/201/475 487/203/477
+f 348/135/287 460/202/476 461/204/478
+f 375/159/291 487/203/477 488/205/479
+f 349/136/295 461/204/478 462/206/480
+f 376/160/299 488/205/479 489/207/481
+f 350/137/304 462/206/480 463/208/482
+f 377/161/307 489/207/481 490/209/483
+f 352/139/321 351/138/311 463/208/482
+f 378/162/317 490/209/483 491/211/485
+f 353/140/331 352/139/321 464/210/484
+f 380/164/336 379/163/328 491/211/485
+f 354/58/340 353/140/331 465/212/486
+f 381/165/342 380/164/336 492/213/487
+f 355/59/105 354/58/340 466/214/488
+f 382/166/240 381/165/342 493/215/489
+f 356/141/245 355/59/105 467/216/490
+f 383/167/249 382/166/240 494/217/491
+f 357/142/253 356/141/245 468/179/492
+f 384/168/257 383/167/249 495/218/493
+f 358/143/261 357/142/253 469/219/494
+f 385/169/266 384/168/257 496/220/495
+f 359/145/269 358/143/261 470/221/496
+f 386/170/273 385/169/266 497/222/497
+f 360/146/277 359/145/269 471/223/498
+f 387/171/281 386/170/273 498/224/499
+f 361/147/286 360/146/277 472/225/500
+f 388/172/289 387/171/281 499/226/501
+f 362/148/294 361/147/286 473/227/502
+f 389/173/297 388/172/289 500/228/503
+f 363/149/301 362/148/294 474/229/504
+f 390/174/306 389/173/297 501/230/505
+f 364/150/310 363/149/301 475/231/506
+f 337/123/335 449/186/460 450/232/507
+f 440/168/377 552/220/510 551/218/508
+f 414/143/373 526/221/511 525/219/509
+f 441/169/385 553/222/512 552/220/510
+f 415/145/381 527/223/513 526/221/511
+f 442/170/393 554/224/514 553/222/512
+f 416/146/389 528/225/515 527/223/513
+f 443/171/401 555/226/516 554/224/514
+f 417/147/397 529/227/517 528/225/515
+f 444/172/409 556/228/518 555/226/516
+f 418/180/405 530/229/519 529/227/517
+f 445/173/417 557/230/520 556/228/518
+f 419/149/413 531/231/521 530/229/519
+f 446/174/428 558/177/523 557/230/520
+f 420/150/432 532/181/524 531/231/521
+f 394/123/426 393/124/425 505/232/522
+f 447/175/438 559/178/526 558/177/523
+f 421/151/442 533/151/455 532/181/524
+f 393/124/425 395/125/436 507/182/525
+f 448/176/437 560/183/529 559/178/526
+f 421/151/442 422/152/450 534/184/527
+f 395/125/436 396/126/452 508/185/528
+f 394/123/426 506/186/460 560/183/529
+f 422/152/450 423/121/229 535/233/530
+f 396/126/452 397/127/351 509/188/531
+f 423/121/229 424/120/357 536/189/532
+f 397/127/351 398/129/361 510/190/533
+f 424/120/357 425/153/356 537/191/534
+f 398/129/361 399/130/368 511/192/535
+f 425/153/356 426/154/365 538/193/536
+f 399/130/368 400/131/375 512/194/537
+f 426/154/365 427/155/372 539/195/538
+f 400/131/375 401/132/383 513/196/539
+f 427/155/372 428/156/387 540/197/540
+f 401/132/383 402/133/382 514/198/541
+f 428/156/387 429/157/395 541/199/542
+f 402/133/382 403/134/399 515/200/543
+f 429/157/395 430/158/403 542/201/544
+f 403/134/399 404/135/407 516/202/545
+f 430/158/403 431/159/411 543/203/546
+f 404/135/407 405/136/406 517/204/547
+f 431/159/411 432/160/419 544/205/548
+f 405/136/406 406/137/423 518/206/549
+f 432/160/419 433/161/430 545/207/550
+f 406/137/423 407/138/434 519/208/551
+f 433/161/430 434/162/440 546/209/552
+f 408/139/444 520/210/554 519/208/551
+f 434/162/440 435/163/449 547/211/553
+f 409/140/443 521/212/555 520/210/554
+f 436/164/453 548/213/556 547/211/553
+f 410/58/348 522/214/557 521/212/555
+f 437/165/354 549/215/558 548/213/556
+f 411/59/359 523/216/559 522/214/557
+f 438/166/363 550/217/560 549/215/558
+f 412/141/346 524/179/345 523/216/559
+f 439/167/370 551/218/508 550/217/560
diff --git a/Telegram/Resources/art/premium/coin_stars.obj b/Telegram/Resources/art/premium/coin_stars.obj
new file mode 100644
index 00000000000000..df345a485650cc
--- /dev/null
+++ b/Telegram/Resources/art/premium/coin_stars.obj
@@ -0,0 +1,2137 @@
+# 3D mesh decoded from .binobj (source of truth; baked back to .binobj at build time).
+# UVs are stored raw here; the V coordinate is flipped (1-v) at load time.
+v 17.0529709 -7.40135288 0.987299025
+v 16.6459484 -7.8074832 0.987299025
+v 15.810586 -7.992764 0.987299025
+v 15.7302771 -8.02249527 0.987299025
+v 15.6758432 -8.08117867 0.987299025
+v 15.6558008 -8.15955257 0.987299025
+v 15.6762972 -8.23908234 0.987299025
+v 15.7315817 -8.29777431 0.987299025
+v 15.8123465 -8.32634068 0.987299025
+v 16.6506844 -8.49965286 0.987299025
+v 17.0602894 -8.91117954 0.987299025
+v 17.2539082 -9.77368546 0.987299025
+v 17.2842293 -9.85181046 0.987299025
+v 17.3420792 -9.90405846 0.987299025
+v 17.4188404 -9.92310333 0.987299025
+v 17.4956017 -9.90405846 0.987299025
+v 17.5534496 -9.85181046 0.987299025
+v 17.5837631 -9.77368546 0.987299025
+v 17.782814 -8.91389275 0.987299025
+v 18.191864 -8.50390339 0.987299025
+v 19.0288582 -8.32634068 0.987299025
+v 19.1083832 -8.29777527 0.987299025
+v 19.1632099 -8.23908329 0.987299025
+v 19.1836452 -8.15955353 0.987299025
+v 19.162756 -8.08078766 0.987299025
+v 19.1070786 -8.02171326 0.987299025
+v 19.0271034 -7.99276495 0.987299025
+v 18.187521 -7.81945276 0.987299025
+v 17.7774563 -7.40792608 0.987299025
+v 17.583765 -6.54542208 0.987299025
+v 17.5538425 -6.46729708 0.987299025
+v 17.4963875 -6.41504812 0.987299025
+v 17.4188423 -6.3960042 0.987299025
+v 17.3432541 -6.41504812 0.987299025
+v 17.2854042 -6.46729708 0.987299025
+v 17.253912 -6.54542208 0.987299025
+v 4.9120512 20.9299164 0.987299025
+v 4.94354296 21.0080414 0.987299025
+v 5.00139284 21.0602913 0.987299025
+v 5.07698202 21.0793343 0.987299025
+v 5.15452719 21.0602913 0.987299025
+v 5.21198177 21.0080414 0.987299025
+v 5.24190378 20.9299164 0.987299025
+v 5.43559599 20.0674133 0.987299025
+v 5.84566021 19.6558838 0.987299025
+v 6.68524313 19.4825726 0.987299025
+v 6.76521778 19.4536247 0.987299025
+v 6.8208952 19.3945503 0.987299025
+v 6.841784 19.3157845 0.987299025
+v 6.82134914 19.2362556 0.987299025
+v 6.76652193 19.1775627 0.987299025
+v 6.68699694 19.1489983 0.987299025
+v 5.85000277 18.9714355 0.987299025
+v 5.44095278 18.5614471 0.987299025
+v 5.24190187 17.7016525 0.987299025
+v 5.21158886 17.6235275 0.987299025
+v 5.15374088 17.5712795 0.987299025
+v 5.07698011 17.5522346 0.987299025
+v 5.00021791 17.5712795 0.987299025
+v 4.94236898 17.6235275 0.987299025
+v 4.91204691 17.7016525 0.987299025
+v 4.71842909 18.5641575 0.987299025
+v 4.30882406 18.9756851 0.987299025
+v 3.47048593 19.1489983 0.987299025
+v 3.38972092 19.1775627 0.987299025
+v 3.33443689 19.2362556 0.987299025
+v 3.31394005 19.3157845 0.987299025
+v 3.33398294 19.3941593 0.987299025
+v 3.38841701 19.4528427 0.987299025
+v 3.46872497 19.4825745 0.987299025
+v 4.30408812 19.6678543 0.987299025
+v 4.71111012 20.0739861 0.987299025
+v 17.0529709 -7.40135288 0.987299025
+v 17.0529709 -7.40135288 0.503844023
+v 16.6459484 -7.8074832 0.987299025
+v 16.6459484 -7.8074832 0.503844023
+v 15.810586 -7.992764 0.987299025
+v 15.810586 -7.992764 0.503844023
+v 15.7302771 -8.02249527 0.987299025
+v 15.7302771 -8.02249527 0.503844023
+v 15.6758432 -8.08117867 0.987299025
+v 15.6758432 -8.08117867 0.503844023
+v 15.6558008 -8.15955257 0.987299025
+v 15.6558008 -8.15955257 0.503844023
+v 15.6762972 -8.23908234 0.987299025
+v 15.6762972 -8.23908234 0.503844023
+v 15.7315817 -8.29777431 0.987299025
+v 15.7315817 -8.29777431 0.503844023
+v 15.8123465 -8.32634068 0.987299025
+v 15.8123465 -8.32634068 0.503844023
+v 16.6506844 -8.49965286 0.987299025
+v 16.6506844 -8.49965286 0.503844023
+v 17.0602894 -8.91117954 0.987299025
+v 17.0602894 -8.91117954 0.503844023
+v 17.2539082 -9.77368546 0.987299025
+v 17.2539082 -9.77368546 0.503844023
+v 17.2842293 -9.85181046 0.987299025
+v 17.2842293 -9.85181046 0.503844023
+v 17.3420792 -9.90405846 0.987299025
+v 17.3420792 -9.90405846 0.503844023
+v 17.4188404 -9.92310333 0.987299025
+v 17.4188404 -9.92310333 0.503844023
+v 17.4956017 -9.90405846 0.987299025
+v 17.4956017 -9.90405846 0.503844023
+v 17.5534496 -9.85181046 0.987299025
+v 17.5534496 -9.85181046 0.503844023
+v 17.5837631 -9.77368546 0.987299025
+v 17.5837631 -9.77368546 0.503844023
+v 17.782814 -8.91389275 0.987299025
+v 17.782814 -8.91389275 0.503844023
+v 18.191864 -8.50390339 0.987299025
+v 18.191864 -8.50390339 0.503844023
+v 19.0288582 -8.32634068 0.987299025
+v 19.0288582 -8.32634068 0.503844023
+v 19.1083832 -8.29777527 0.987299025
+v 19.1083832 -8.29777527 0.503844023
+v 19.1632099 -8.23908329 0.987299025
+v 19.1632099 -8.23908329 0.503844023
+v 19.1836452 -8.15955353 0.987299025
+v 19.1836452 -8.15955353 0.503844023
+v 19.162756 -8.08078766 0.987299025
+v 19.162756 -8.08078766 0.503844023
+v 19.1070786 -8.02171326 0.987299025
+v 19.1070786 -8.02171326 0.503844023
+v 19.0271034 -7.99276495 0.987299025
+v 19.0271034 -7.99276495 0.503844023
+v 18.187521 -7.81945276 0.503844023
+v 17.7774563 -7.40792608 0.987299025
+v 17.7774563 -7.40792608 0.503844023
+v 17.583765 -6.54542208 0.987299025
+v 17.583765 -6.54542208 0.503844023
+v 17.5538425 -6.46729708 0.987299025
+v 17.5538425 -6.46729708 0.503844023
+v 17.4963875 -6.41504812 0.987299025
+v 17.4963875 -6.41504812 0.503844023
+v 17.4188423 -6.3960042 0.987299025
+v 17.4188423 -6.3960042 0.503844023
+v 17.3432541 -6.41504812 0.987299025
+v 17.3432541 -6.41504812 0.503844023
+v 17.2854042 -6.46729708 0.987299025
+v 17.2854042 -6.46729708 0.503844023
+v 17.253912 -6.54542208 0.987299025
+v 17.253912 -6.54542208 0.503844023
+v -9.73268127 19.0501385 0.987299025
+v 4.9120512 20.9299164 0.503844023
+v 4.9120512 20.9299164 0.987299025
+v 4.94354296 21.0080414 0.503844023
+v 4.94354296 21.0080414 0.987299025
+v 5.00139284 21.0602913 0.503844023
+v 5.00139284 21.0602913 0.987299025
+v 5.07698202 21.0793343 0.503844023
+v 5.07698202 21.0793343 0.987299025
+v 5.15452719 21.0602913 0.503844023
+v 5.15452719 21.0602913 0.987299025
+v 5.21198177 21.0080414 0.503844023
+v 5.21198177 21.0080414 0.987299025
+v 5.24190378 20.9299164 0.503844023
+v 5.24190378 20.9299164 0.987299025
+v 5.43559599 20.0674133 0.503844023
+v 5.43559599 20.0674133 0.987299025
+v 5.84566021 19.6558838 0.503844023
+v 6.68524313 19.4825726 0.503844023
+v 6.68524313 19.4825726 0.987299025
+v 6.76521778 19.4536247 0.503844023
+v 6.76521778 19.4536247 0.987299025
+v 6.8208952 19.3945503 0.503844023
+v 6.8208952 19.3945503 0.987299025
+v 6.841784 19.3157845 0.503844023
+v 6.841784 19.3157845 0.987299025
+v 6.82134914 19.2362556 0.503844023
+v 6.82134914 19.2362556 0.987299025
+v 6.76652193 19.1775627 0.503844023
+v 6.76652193 19.1775627 0.987299025
+v 6.68699694 19.1489983 0.503844023
+v 6.68699694 19.1489983 0.987299025
+v 5.85000277 18.9714355 0.503844023
+v 5.85000277 18.9714355 0.987299025
+v 5.44095278 18.5614471 0.503844023
+v 5.44095278 18.5614471 0.987299025
+v 5.24190187 17.7016525 0.503844023
+v 5.24190187 17.7016525 0.987299025
+v 5.21158886 17.6235275 0.503844023
+v 5.21158886 17.6235275 0.987299025
+v 5.15374088 17.5712795 0.503844023
+v 5.15374088 17.5712795 0.987299025
+v 5.07698011 17.5522346 0.503844023
+v 5.07698011 17.5522346 0.987299025
+v 5.00021791 17.5712795 0.503844023
+v 5.00021791 17.5712795 0.987299025
+v 4.94236898 17.6235275 0.503844023
+v 4.94236898 17.6235275 0.987299025
+v 4.91204691 17.7016525 0.503844023
+v 4.91204691 17.7016525 0.987299025
+v 4.71842909 18.5641575 0.503844023
+v 4.71842909 18.5641575 0.987299025
+v 4.30882406 18.9756851 0.503844023
+v 4.30882406 18.9756851 0.987299025
+v 3.47048593 19.1489983 0.503844023
+v 3.47048593 19.1489983 0.987299025
+v 3.38972092 19.1775627 0.503844023
+v 3.38972092 19.1775627 0.987299025
+v 3.33443689 19.2362556 0.503844023
+v 3.33443689 19.2362556 0.987299025
+v 3.31394005 19.3157845 0.503844023
+v 3.31394005 19.3157845 0.987299025
+v 3.33398294 19.3941593 0.503844023
+v 3.33398294 19.3941593 0.987299025
+v 3.38841701 19.4528427 0.503844023
+v 3.38841701 19.4528427 0.987299025
+v 3.46872497 19.4825745 0.503844023
+v 3.46872497 19.4825745 0.987299025
+v 4.30408812 19.6678543 0.503844023
+v 4.30408812 19.6678543 0.987299025
+v 4.71111012 20.0739861 0.503844023
+v 4.71111012 20.0739861 0.987299025
+v 17.4523716 11.6629057 0.999832988
+v 17.0453491 11.2567759 0.999834001
+v 16.2099857 11.0714941 0.999834001
+v 16.1296768 11.0417633 0.999834001
+v 16.075243 10.9830799 0.999834001
+v 16.0552006 10.904706 0.999834001
+v 16.0756969 10.8251762 0.999834001
+v 16.1309814 10.7664843 0.999834001
+v 16.2117462 10.7379179 0.999834001
+v 17.0500851 10.5646067 0.999834001
+v 17.4596901 10.1530781 0.999834001
+v 17.6533089 9.29057407 0.999834001
+v 17.68363 9.21244812 0.999834001
+v 17.7414799 9.16020012 0.999834001
+v 17.8182411 9.14115524 0.999834001
+v 17.8950024 9.16020012 0.999834001
+v 17.9528503 9.21244812 0.999834001
+v 17.9831638 9.29057407 0.999834001
+v 18.1822147 10.1503668 0.999834001
+v 18.5912647 10.5603552 0.999834001
+v 19.4282589 10.7379179 0.999834001
+v 19.5077839 10.7664833 0.999834001
+v 19.5626106 10.8251753 0.999834001
+v 19.583046 10.904705 0.999834001
+v 19.5621567 10.9834709 0.999834001
+v 19.5064793 11.0425453 0.999834001
+v 19.4265041 11.0714931 0.999834001
+v 18.5869217 11.2448053 0.999834001
+v 18.176857 11.656333 0.999832988
+v 17.9831657 12.518837 0.999832988
+v 17.9532433 12.596962 0.999832988
+v 17.8957882 12.6492109 0.999832988
+v 17.818243 12.6682549 0.999832988
+v 17.7426548 12.6492109 0.999832988
+v 17.6848049 12.596962 0.999832988
+v 17.6533127 12.518837 0.999832988
+v 17.4523716 11.6629057 0.999832988
+v 17.4523716 11.6629057 0.516377985
+v 17.0453491 11.2567759 0.999834001
+v 17.0453491 11.2567759 0.516378999
+v 16.2099857 11.0714941 0.999834001
+v 16.2099857 11.0714941 0.516378999
+v 16.1296768 11.0417633 0.999834001
+v 16.1296768 11.0417633 0.516378999
+v 16.075243 10.9830799 0.999834001
+v 16.075243 10.9830799 0.516378999
+v 16.0552006 10.904706 0.999834001
+v 16.0552006 10.904706 0.516378999
+v 16.0756969 10.8251762 0.999834001
+v 16.0756969 10.8251762 0.516378999
+v 16.1309814 10.7664843 0.999834001
+v 16.1309814 10.7664843 0.516378999
+v 16.2117462 10.7379179 0.999834001
+v 16.2117462 10.7379179 0.516378999
+v 17.0500851 10.5646067 0.999834001
+v 17.0500851 10.5646067 0.516378999
+v 17.4596901 10.1530781 0.999834001
+v 17.4596901 10.1530781 0.516378999
+v 17.6533089 9.29057407 0.999834001
+v 17.6533089 9.29057407 0.516378999
+v 17.68363 9.21244812 0.999834001
+v 17.68363 9.21244812 0.516378999
+v 17.7414799 9.16020012 0.999834001
+v 17.7414799 9.16020012 0.516378999
+v 17.8182411 9.14115524 0.999834001
+v 17.8182411 9.14115524 0.516378999
+v 17.8950024 9.16020012 0.999834001
+v 17.8950024 9.16020012 0.516378999
+v 17.9528503 9.21244812 0.999834001
+v 17.9528503 9.21244812 0.516378999
+v 17.9831638 9.29057407 0.999834001
+v 17.9831638 9.29057407 0.516378999
+v 18.1822147 10.1503668 0.999834001
+v 18.1822147 10.1503668 0.516378999
+v 18.5912647 10.5603552 0.999834001
+v 18.5912647 10.5603552 0.516378999
+v 19.4282589 10.7379179 0.999834001
+v 19.4282589 10.7379179 0.516378999
+v 19.5077839 10.7664833 0.999834001
+v 19.5077839 10.7664833 0.516378999
+v 19.5626106 10.8251753 0.999834001
+v 19.5626106 10.8251753 0.516378999
+v 19.583046 10.904705 0.999834001
+v 19.583046 10.904705 0.516378999
+v 19.5621567 10.9834709 0.999834001
+v 19.5621567 10.9834709 0.516378999
+v 19.5064793 11.0425453 0.999834001
+v 19.5064793 11.0425453 0.516378999
+v 19.4265041 11.0714931 0.999834001
+v 19.4265041 11.0714931 0.516378999
+v 18.5869217 11.2448053 0.516378999
+v 18.176857 11.656333 0.999832988
+v 18.176857 11.656333 0.516377985
+v 17.9831657 12.518837 0.999832988
+v 17.9831657 12.518837 0.516377985
+v 17.9532433 12.596962 0.999832988
+v 17.9532433 12.596962 0.516377985
+v 17.8957882 12.6492109 0.999832988
+v 17.8957882 12.6492109 0.516377985
+v 17.818243 12.6682549 0.999832988
+v 17.818243 12.6682549 0.516377985
+v 17.7426548 12.6492109 0.999832988
+v 17.7426548 12.6492109 0.516377985
+v 17.6848049 12.596962 0.999832988
+v 17.6848049 12.596962 0.516377985
+v 17.6533127 12.518837 0.999832988
+v 17.6533127 12.518837 0.516377985
+v -9.70118904 19.1282635 0.987299025
+v -9.64333916 19.1805134 0.987299025
+v -9.56775093 19.1995564 0.987299025
+v -9.49020576 19.1805134 0.987299025
+v -9.4327507 19.1282635 0.987299025
+v -9.40282822 19.0501385 0.987299025
+v -9.20913696 18.1876354 0.987299025
+v -8.79907227 17.776104 0.987299025
+v -7.95948982 17.6027927 0.987299025
+v -7.87951517 17.5738449 0.987299025
+v -7.8238368 17.5147705 0.987299025
+v -7.802948 17.4360046 0.987299025
+v -7.82338285 17.3564758 0.987299025
+v -7.87821007 17.2977829 0.987299025
+v -7.95773506 17.2692184 0.987299025
+v -8.79472923 17.0916557 0.987299025
+v -9.20377922 16.6816673 0.987299025
+v -9.40283012 15.8218727 0.987299025
+v -9.43314362 15.7437477 0.987299025
+v -9.49099159 15.6914997 0.987299025
+v -9.56775284 15.6724548 0.987299025
+v -9.64451408 15.6914997 0.987299025
+v -9.70236397 15.7437477 0.987299025
+v -9.73268509 15.8218727 0.987299025
+v -9.92630386 16.6843777 0.987299025
+v -10.3359089 17.0959053 0.987299025
+v -11.1742468 17.2692184 0.987299025
+v -11.2550116 17.2977829 0.987299025
+v -11.3102961 17.3564758 0.987299025
+v -11.3307924 17.4360046 0.987299025
+v -11.31075 17.5143795 0.987299025
+v -11.2563162 17.5730629 0.987299025
+v -11.1760073 17.6027946 0.987299025
+v -10.3406448 17.7880745 0.987299025
+v -9.93362236 18.1942081 0.987299025
+v -9.73268127 19.0501385 0.503844023
+v -9.73268127 19.0501385 0.987299025
+v -9.70118904 19.1282635 0.503844023
+v -9.70118904 19.1282635 0.987299025
+v -9.64333916 19.1805134 0.503844023
+v -9.64333916 19.1805134 0.987299025
+v -9.56775093 19.1995564 0.503844023
+v -9.56775093 19.1995564 0.987299025
+v -9.49020576 19.1805134 0.503844023
+v -9.49020576 19.1805134 0.987299025
+v -9.4327507 19.1282635 0.503844023
+v -9.4327507 19.1282635 0.987299025
+v -9.40282822 19.0501385 0.503844023
+v -9.40282822 19.0501385 0.987299025
+v -9.20913696 18.1876354 0.503844023
+v -9.20913696 18.1876354 0.987299025
+v -8.79907227 17.776104 0.503844023
+v -7.95948982 17.6027927 0.503844023
+v -7.95948982 17.6027927 0.987299025
+v -7.87951517 17.5738449 0.503844023
+v -7.87951517 17.5738449 0.987299025
+v -7.8238368 17.5147705 0.503844023
+v -7.8238368 17.5147705 0.987299025
+v -7.802948 17.4360046 0.503844023
+v -7.802948 17.4360046 0.987299025
+v -7.82338285 17.3564758 0.503844023
+v -7.82338285 17.3564758 0.987299025
+v -7.87821007 17.2977829 0.503844023
+v -7.87821007 17.2977829 0.987299025
+v -7.95773506 17.2692184 0.503844023
+v -7.95773506 17.2692184 0.987299025
+v -8.79472923 17.0916557 0.503844023
+v -8.79472923 17.0916557 0.987299025
+v -9.20377922 16.6816673 0.503844023
+v -9.20377922 16.6816673 0.987299025
+v -9.40283012 15.8218727 0.503844023
+v -9.40283012 15.8218727 0.987299025
+v -9.43314362 15.7437477 0.503844023
+v -9.43314362 15.7437477 0.987299025
+v -9.49099159 15.6914997 0.503844023
+v -9.49099159 15.6914997 0.987299025
+v -9.56775284 15.6724548 0.503844023
+v -9.56775284 15.6724548 0.987299025
+v -9.64451408 15.6914997 0.503844023
+v -9.64451408 15.6914997 0.987299025
+v -9.70236397 15.7437477 0.503844023
+v -9.70236397 15.7437477 0.987299025
+v -9.73268509 15.8218727 0.503844023
+v -9.73268509 15.8218727 0.987299025
+v -9.92630386 16.6843777 0.503844023
+v -9.92630386 16.6843777 0.987299025
+v -10.3359089 17.0959053 0.503844023
+v -10.3359089 17.0959053 0.987299025
+v -11.1742468 17.2692184 0.503844023
+v -11.1742468 17.2692184 0.987299025
+v -11.2550116 17.2977829 0.503844023
+v -11.2550116 17.2977829 0.987299025
+v -11.3102961 17.3564758 0.503844023
+v -11.3102961 17.3564758 0.987299025
+v -11.3307924 17.4360046 0.503844023
+v -11.3307924 17.4360046 0.987299025
+v -11.31075 17.5143795 0.503844023
+v -11.31075 17.5143795 0.987299025
+v -11.2563162 17.5730629 0.503844023
+v -11.2563162 17.5730629 0.987299025
+v -11.1760073 17.6027946 0.503844023
+v -11.1760073 17.6027946 0.987299025
+v -10.3406448 17.7880745 0.503844023
+v -10.3406448 17.7880745 0.987299025
+v -9.93362236 18.1942081 0.503844023
+v -9.93362236 18.1942081 0.987299025
+v -19.4914989 6.60830307 0.987299025
+v -19.4600067 6.68642807 0.987299025
+v -19.4021568 6.73867798 0.987299025
+v -19.3265686 6.75772095 0.987299025
+v -19.2490234 6.73867798 0.987299025
+v -19.1915684 6.68642807 0.987299025
+v -19.1616459 6.60830307 0.987299025
+v -18.9679546 5.74580002 0.987299025
+v -18.5578899 5.33427 0.987299025
+v -17.7183075 5.16095781 0.987299025
+v -17.6383324 5.13200998 0.987299025
+v -17.582655 5.07293606 0.987299025
+v -17.5617657 4.99417019 0.987299025
+v -17.582201 4.9146409 0.987299025
+v -17.6370277 4.85594797 0.987299025
+v -17.7165527 4.827384 0.987299025
+v -18.5535469 4.6498208 0.987299025
+v -18.9625969 4.23983288 0.987299025
+v -19.1616478 3.38003802 0.987299025
+v -19.1919613 3.30191302 0.987299025
+v -19.2498093 3.24966502 0.987299025
+v -19.3265705 3.23061991 0.987299025
+v -19.4033318 3.24966502 0.987299025
+v -19.4611816 3.30191302 0.987299025
+v -19.4915028 3.38003802 0.987299025
+v -19.6851215 4.24254322 0.987299025
+v -20.0947266 4.65407085 0.987299025
+v -20.9330654 4.827384 0.987299025
+v -21.0138302 4.85594797 0.987299025
+v -21.0691147 4.9146409 0.987299025
+v -21.0896111 4.99417019 0.987299025
+v -21.0695686 5.07254505 0.987299025
+v -21.0151348 5.13122797 0.987299025
+v -20.9348259 5.1609602 0.987299025
+v -20.0994625 5.34624004 0.987299025
+v -19.69244 5.75237322 0.987299025
+v -19.4914989 6.60830307 0.503844023
+v -19.4914989 6.60830307 0.987299025
+v -19.4600067 6.68642807 0.503844023
+v -19.4600067 6.68642807 0.987299025
+v -19.4021568 6.73867798 0.503844023
+v -19.4021568 6.73867798 0.987299025
+v -19.3265686 6.75772095 0.503844023
+v -19.3265686 6.75772095 0.987299025
+v -19.2490234 6.73867798 0.503844023
+v -19.2490234 6.73867798 0.987299025
+v -19.1915684 6.68642807 0.503844023
+v -19.1915684 6.68642807 0.987299025
+v -19.1616459 6.60830307 0.503844023
+v -19.1616459 6.60830307 0.987299025
+v -18.9679546 5.74580002 0.503844023
+v -18.9679546 5.74580002 0.987299025
+v -18.5578899 5.33427 0.503844023
+v -17.7183075 5.16095781 0.503844023
+v -17.7183075 5.16095781 0.987299025
+v -17.6383324 5.13200998 0.503844023
+v -17.6383324 5.13200998 0.987299025
+v -17.582655 5.07293606 0.503844023
+v -17.582655 5.07293606 0.987299025
+v -17.5617657 4.99417019 0.503844023
+v -17.5617657 4.99417019 0.987299025
+v -17.582201 4.9146409 0.503844023
+v -17.582201 4.9146409 0.987299025
+v -17.6370277 4.85594797 0.503844023
+v -17.6370277 4.85594797 0.987299025
+v -17.7165527 4.827384 0.503844023
+v -17.7165527 4.827384 0.987299025
+v -18.5535469 4.6498208 0.503844023
+v -18.5535469 4.6498208 0.987299025
+v -18.9625969 4.23983288 0.503844023
+v -18.9625969 4.23983288 0.987299025
+v -19.1616478 3.38003802 0.503844023
+v -19.1616478 3.38003802 0.987299025
+v -19.1919613 3.30191302 0.503844023
+v -19.1919613 3.30191302 0.987299025
+v -19.2498093 3.24966502 0.503844023
+v -19.2498093 3.24966502 0.987299025
+v -19.3265705 3.23061991 0.503844023
+v -19.3265705 3.23061991 0.987299025
+v -19.4033318 3.24966502 0.503844023
+v -19.4033318 3.24966502 0.987299025
+v -19.4611816 3.30191302 0.503844023
+v -19.4611816 3.30191302 0.987299025
+v -19.4915028 3.38003802 0.503844023
+v -19.4915028 3.38003802 0.987299025
+v -19.6851215 4.24254322 0.503844023
+v -19.6851215 4.24254322 0.987299025
+v -20.0947266 4.65407085 0.503844023
+v -20.0947266 4.65407085 0.987299025
+v -20.9330654 4.827384 0.503844023
+v -20.9330654 4.827384 0.987299025
+v -21.0138302 4.85594797 0.503844023
+v -21.0138302 4.85594797 0.987299025
+v -21.0691147 4.9146409 0.503844023
+v -21.0691147 4.9146409 0.987299025
+v -21.0896111 4.99417019 0.503844023
+v -21.0896111 4.99417019 0.987299025
+v -21.0695686 5.07254505 0.503844023
+v -21.0695686 5.07254505 0.987299025
+v -21.0151348 5.13122797 0.503844023
+v -21.0151348 5.13122797 0.987299025
+v -20.9348259 5.1609602 0.503844023
+v -20.9348259 5.1609602 0.987299025
+v -20.0994625 5.34624004 0.503844023
+v -20.0994625 5.34624004 0.987299025
+v -19.69244 5.75237322 0.503844023
+v -19.69244 5.75237322 0.987299025
+v -17.2138233 -7.84859419 0.987299025
+v -17.1823311 -7.77046919 0.987299025
+v -17.1244812 -7.7182188 0.987299025
+v -17.048893 -7.69917583 0.987299025
+v -16.9713478 -7.7182188 0.987299025
+v -16.9138927 -7.77046919 0.987299025
+v -16.8839703 -7.84859419 0.987299025
+v -16.690279 -8.71109676 0.987299025
+v -16.2802143 -9.12262726 0.987299025
+v -15.4406319 -9.29593754 0.987299025
+v -15.3606567 -9.32488632 0.987299025
+v -15.3049793 -9.38396072 0.987299025
+v -15.28409 -9.46272659 0.987299025
+v -15.3045254 -9.5422554 0.987299025
+v -15.3593521 -9.60094833 0.987299025
+v -15.4388771 -9.62951279 0.987299025
+v -16.2758713 -9.80707645 0.987299025
+v -16.6849213 -10.2170639 0.987299025
+v -16.8839722 -11.0768595 0.987299025
+v -16.9142857 -11.1549845 0.987299025
+v -16.9721336 -11.2072325 0.987299025
+v -17.0488949 -11.2262764 0.987299025
+v -17.1256561 -11.2072325 0.987299025
+v -17.183506 -11.1549845 0.987299025
+v -17.2138271 -11.0768595 0.987299025
+v -17.4074459 -10.2143536 0.987299025
+v -17.8170509 -9.80282593 0.987299025
+v -18.6553898 -9.62951279 0.987299025
+v -18.7361546 -9.60094833 0.987299025
+v -18.7914391 -9.5422554 0.987299025
+v -18.8119354 -9.46272659 0.987299025
+v -18.791893 -9.38435173 0.987299025
+v -18.7374592 -9.32566833 0.987299025
+v -18.6571503 -9.29593658 0.987299025
+v -17.8217869 -9.11065674 0.987299025
+v -17.4147644 -8.70452404 0.987299025
+v -17.2138233 -7.84859419 0.503844023
+v -17.2138233 -7.84859419 0.987299025
+v -17.1823311 -7.77046919 0.503844023
+v -17.1823311 -7.77046919 0.987299025
+v -17.1244812 -7.7182188 0.503844023
+v -17.1244812 -7.7182188 0.987299025
+v -17.048893 -7.69917583 0.503844023
+v -17.048893 -7.69917583 0.987299025
+v -16.9713478 -7.7182188 0.503844023
+v -16.9713478 -7.7182188 0.987299025
+v -16.9138927 -7.77046919 0.503844023
+v -16.9138927 -7.77046919 0.987299025
+v -16.8839703 -7.84859419 0.503844023
+v -16.8839703 -7.84859419 0.987299025
+v -16.690279 -8.71109676 0.503844023
+v -16.690279 -8.71109676 0.987299025
+v -16.2802143 -9.12262726 0.503844023
+v -15.4406319 -9.29593754 0.503844023
+v -15.4406319 -9.29593754 0.987299025
+v -15.3606567 -9.32488632 0.503844023
+v -15.3606567 -9.32488632 0.987299025
+v -15.3049793 -9.38396072 0.503844023
+v -15.3049793 -9.38396072 0.987299025
+v -15.28409 -9.46272659 0.503844023
+v -15.28409 -9.46272659 0.987299025
+v -15.3045254 -9.5422554 0.503844023
+v -15.3045254 -9.5422554 0.987299025
+v -15.3593521 -9.60094833 0.503844023
+v -15.3593521 -9.60094833 0.987299025
+v -15.4388771 -9.62951279 0.503844023
+v -15.4388771 -9.62951279 0.987299025
+v -16.2758713 -9.80707645 0.503844023
+v -16.2758713 -9.80707645 0.987299025
+v -16.6849213 -10.2170639 0.503844023
+v -16.6849213 -10.2170639 0.987299025
+v -16.8839722 -11.0768595 0.503844023
+v -16.8839722 -11.0768595 0.987299025
+v -16.9142857 -11.1549845 0.503844023
+v -16.9142857 -11.1549845 0.987299025
+v -16.9721336 -11.2072325 0.503844023
+v -16.9721336 -11.2072325 0.987299025
+v -17.0488949 -11.2262764 0.503844023
+v -17.0488949 -11.2262764 0.987299025
+v -17.1256561 -11.2072325 0.503844023
+v -17.1256561 -11.2072325 0.987299025
+v -17.183506 -11.1549845 0.503844023
+v -17.183506 -11.1549845 0.987299025
+v -17.2138271 -11.0768595 0.503844023
+v -17.2138271 -11.0768595 0.987299025
+v -17.4074459 -10.2143536 0.503844023
+v -17.4074459 -10.2143536 0.987299025
+v -17.8170509 -9.80282593 0.503844023
+v -17.8170509 -9.80282593 0.987299025
+v -18.6553898 -9.62951279 0.503844023
+v -18.6553898 -9.62951279 0.987299025
+v -18.7361546 -9.60094833 0.503844023
+v -18.7361546 -9.60094833 0.987299025
+v -18.7914391 -9.5422554 0.503844023
+v -18.7914391 -9.5422554 0.987299025
+v -18.8119354 -9.46272659 0.503844023
+v -18.8119354 -9.46272659 0.987299025
+v -18.791893 -9.38435173 0.503844023
+v -18.791893 -9.38435173 0.987299025
+v -18.7374592 -9.32566833 0.503844023
+v -18.7374592 -9.32566833 0.987299025
+v -18.6571503 -9.29593658 0.503844023
+v -18.6571503 -9.29593658 0.987299025
+v -17.8217869 -9.11065674 0.503844023
+v -17.8217869 -9.11065674 0.987299025
+v -17.4147644 -8.70452404 0.503844023
+v -17.4147644 -8.70452404 0.987299025
+v -6.44442987 -16.9490128 0.987299025
+v -6.41293812 -16.8708878 0.987299025
+v -6.35508823 -16.8186378 0.987299025
+v -6.27950001 -16.7995949 0.987299025
+v -6.20195484 -16.8186378 0.987299025
+v -6.14449978 -16.8708878 0.987299025
+v -6.11457682 -16.9490128 0.987299025
+v -5.92088604 -17.8115158 0.987299025
+v -5.51082087 -18.2230453 0.987299025
+v -4.6712389 -18.3963585 0.987299025
+v -4.59126377 -18.4253044 0.987299025
+v -4.53558588 -18.4843788 0.987299025
+v -4.51469707 -18.5631447 0.987299025
+v -4.53513193 -18.6426735 0.987299025
+v -4.58995914 -18.7013664 0.987299025
+v -4.66948414 -18.7299309 0.987299025
+v -5.50647783 -18.9074936 0.987299025
+v -5.91552782 -19.317482 0.987299025
+v -6.1145792 -20.1772766 0.987299025
+v -6.14489317 -20.2554016 0.987299025
+v -6.20274115 -20.3076515 0.987299025
+v -6.27950191 -20.3266945 0.987299025
+v -6.35626316 -20.3076515 0.987299025
+v -6.41411304 -20.2554016 0.987299025
+v -6.44443417 -20.1772766 0.987299025
+v -6.63805294 -19.3147736 0.987299025
+v -7.04765797 -18.903244 0.987299025
+v -7.88599682 -18.7299309 0.987299025
+v -7.96676207 -18.7013664 0.987299025
+v -8.02204609 -18.6426735 0.987299025
+v -8.04254246 -18.5631447 0.987299025
+v -8.02250004 -18.4847717 0.987299025
+v -7.96806622 -18.4260864 0.987299025
+v -7.88775682 -18.3963547 0.987299025
+v -7.05239391 -18.2110748 0.987299025
+v -6.64537096 -17.8049431 0.987299025
+v -6.44442987 -16.9490128 0.503844023
+v -6.44442987 -16.9490128 0.987299025
+v -6.41293812 -16.8708878 0.503844023
+v -6.41293812 -16.8708878 0.987299025
+v -6.35508823 -16.8186378 0.503844023
+v -6.35508823 -16.8186378 0.987299025
+v -6.27950001 -16.7995949 0.503844023
+v -6.27950001 -16.7995949 0.987299025
+v -6.20195484 -16.8186378 0.503844023
+v -6.20195484 -16.8186378 0.987299025
+v -6.14449978 -16.8708878 0.503844023
+v -6.14449978 -16.8708878 0.987299025
+v -6.11457682 -16.9490128 0.503844023
+v -6.11457682 -16.9490128 0.987299025
+v -5.92088604 -17.8115158 0.503844023
+v -5.92088604 -17.8115158 0.987299025
+v -5.51082087 -18.2230453 0.503844023
+v -4.6712389 -18.3963585 0.503844023
+v -4.6712389 -18.3963585 0.987299025
+v -4.59126377 -18.4253044 0.503844023
+v -4.59126377 -18.4253044 0.987299025
+v -4.53558588 -18.4843788 0.503844023
+v -4.53558588 -18.4843788 0.987299025
+v -4.51469707 -18.5631447 0.503844023
+v -4.51469707 -18.5631447 0.987299025
+v -4.53513193 -18.6426735 0.503844023
+v -4.53513193 -18.6426735 0.987299025
+v -4.58995914 -18.7013664 0.503844023
+v -4.58995914 -18.7013664 0.987299025
+v -4.66948414 -18.7299309 0.503844023
+v -4.66948414 -18.7299309 0.987299025
+v -5.50647783 -18.9074936 0.503844023
+v -5.50647783 -18.9074936 0.987299025
+v -5.91552782 -19.317482 0.503844023
+v -5.91552782 -19.317482 0.987299025
+v -6.1145792 -20.1772766 0.503844023
+v -6.1145792 -20.1772766 0.987299025
+v -6.14489317 -20.2554016 0.503844023
+v -6.14489317 -20.2554016 0.987299025
+v -6.20274115 -20.3076515 0.503844023
+v -6.20274115 -20.3076515 0.987299025
+v -6.27950191 -20.3266945 0.503844023
+v -6.27950191 -20.3266945 0.987299025
+v -6.35626316 -20.3076515 0.503844023
+v -6.35626316 -20.3076515 0.987299025
+v -6.41411304 -20.2554016 0.503844023
+v -6.41411304 -20.2554016 0.987299025
+v -6.44443417 -20.1772766 0.503844023
+v -6.44443417 -20.1772766 0.987299025
+v -6.63805294 -19.3147736 0.503844023
+v -6.63805294 -19.3147736 0.987299025
+v -7.04765797 -18.903244 0.503844023
+v -7.04765797 -18.903244 0.987299025
+v -7.88599682 -18.7299309 0.503844023
+v -7.88599682 -18.7299309 0.987299025
+v -7.96676207 -18.7013664 0.503844023
+v -7.96676207 -18.7013664 0.987299025
+v -8.02204609 -18.6426735 0.503844023
+v -8.02204609 -18.6426735 0.987299025
+v -8.04254246 -18.5631447 0.503844023
+v -8.04254246 -18.5631447 0.987299025
+v -8.02250004 -18.4847717 0.503844023
+v -8.02250004 -18.4847717 0.987299025
+v -7.96806622 -18.4260864 0.503844023
+v -7.96806622 -18.4260864 0.987299025
+v -7.88775682 -18.3963547 0.503844023
+v -7.88775682 -18.3963547 0.987299025
+v -7.05239391 -18.2110748 0.503844023
+v -7.05239391 -18.2110748 0.987299025
+v -6.64537096 -17.8049431 0.503844023
+v -6.64537096 -17.8049431 0.987299025
+v 10.0222101 -16.6688595 0.987299025
+v 10.0537024 -16.5907345 0.987299025
+v 10.1115522 -16.5384846 0.987299025
+v 10.1871405 -16.5194416 0.987299025
+v 10.2646856 -16.5384846 0.987299025
+v 10.3221407 -16.5907345 0.987299025
+v 10.3520632 -16.6688595 0.987299025
+v 10.5457544 -17.5313625 0.987299025
+v 10.9558191 -17.9428921 0.987299025
+v 11.7954016 -18.1162052 0.987299025
+v 11.8753767 -18.1451511 0.987299025
+v 11.9310541 -18.2042255 0.987299025
+v 11.9519434 -18.2829914 0.987299025
+v 11.9315081 -18.3625202 0.987299025
+v 11.8766813 -18.4212132 0.987299025
+v 11.7971563 -18.4497776 0.987299025
+v 10.9601622 -18.6273403 0.987299025
+v 10.5511122 -19.0373287 0.987299025
+v 10.3520613 -19.8971233 0.987299025
+v 10.3217478 -19.9752483 0.987299025
+v 10.2638998 -20.0274982 0.987299025
+v 10.1871386 -20.0465412 0.987299025
+v 10.1103773 -20.0274982 0.987299025
+v 10.0525274 -19.9752483 0.987299025
+v 10.0222063 -19.8971233 0.987299025
+v 9.82858753 -19.0346203 0.987299025
+v 9.41898346 -18.6230907 0.987299025
+v 8.58064365 -18.4497776 0.987299025
+v 8.49987888 -18.4212132 0.987299025
+v 8.44459438 -18.3625202 0.987299025
+v 8.42409801 -18.2829914 0.987299025
+v 8.44414043 -18.2046185 0.987299025
+v 8.49857426 -18.1459332 0.987299025
+v 8.57888317 -18.1162014 0.987299025
+v 9.41424656 -17.9309216 0.987299025
+v 9.82126904 -17.5247898 0.987299025
+v 10.0222101 -16.6688595 0.503844023
+v 10.0222101 -16.6688595 0.987299025
+v 10.0537024 -16.5907345 0.503844023
+v 10.0537024 -16.5907345 0.987299025
+v 10.1115522 -16.5384846 0.503844023
+v 10.1115522 -16.5384846 0.987299025
+v 10.1871405 -16.5194416 0.503844023
+v 10.1871405 -16.5194416 0.987299025
+v 10.2646856 -16.5384846 0.503844023
+v 10.2646856 -16.5384846 0.987299025
+v 10.3221407 -16.5907345 0.503844023
+v 10.3221407 -16.5907345 0.987299025
+v 10.3520632 -16.6688595 0.503844023
+v 10.3520632 -16.6688595 0.987299025
+v 10.5457544 -17.5313625 0.503844023
+v 10.5457544 -17.5313625 0.987299025
+v 10.9558191 -17.9428921 0.503844023
+v 11.7954016 -18.1162052 0.503844023
+v 11.7954016 -18.1162052 0.987299025
+v 11.8753767 -18.1451511 0.503844023
+v 11.8753767 -18.1451511 0.987299025
+v 11.9310541 -18.2042255 0.503844023
+v 11.9310541 -18.2042255 0.987299025
+v 11.9519434 -18.2829914 0.503844023
+v 11.9519434 -18.2829914 0.987299025
+v 11.9315081 -18.3625202 0.503844023
+v 11.9315081 -18.3625202 0.987299025
+v 11.8766813 -18.4212132 0.503844023
+v 11.8766813 -18.4212132 0.987299025
+v 11.7971563 -18.4497776 0.503844023
+v 11.7971563 -18.4497776 0.987299025
+v 10.9601622 -18.6273403 0.503844023
+v 10.9601622 -18.6273403 0.987299025
+v 10.5511122 -19.0373287 0.503844023
+v 10.5511122 -19.0373287 0.987299025
+v 10.3520613 -19.8971233 0.503844023
+v 10.3520613 -19.8971233 0.987299025
+v 10.3217478 -19.9752483 0.503844023
+v 10.3217478 -19.9752483 0.987299025
+v 10.2638998 -20.0274982 0.503844023
+v 10.2638998 -20.0274982 0.987299025
+v 10.1871386 -20.0465412 0.503844023
+v 10.1871386 -20.0465412 0.987299025
+v 10.1103773 -20.0274982 0.503844023
+v 10.1103773 -20.0274982 0.987299025
+v 10.0525274 -19.9752483 0.503844023
+v 10.0525274 -19.9752483 0.987299025
+v 10.0222063 -19.8971233 0.503844023
+v 10.0222063 -19.8971233 0.987299025
+v 9.82858753 -19.0346203 0.503844023
+v 9.82858753 -19.0346203 0.987299025
+v 9.41898346 -18.6230907 0.503844023
+v 9.41898346 -18.6230907 0.987299025
+v 8.58064365 -18.4497776 0.503844023
+v 8.58064365 -18.4497776 0.987299025
+v 8.49987888 -18.4212132 0.503844023
+v 8.49987888 -18.4212132 0.987299025
+v 8.44459438 -18.3625202 0.503844023
+v 8.44459438 -18.3625202 0.987299025
+v 8.42409801 -18.2829914 0.503844023
+v 8.42409801 -18.2829914 0.987299025
+v 8.44414043 -18.2046185 0.503844023
+v 8.44414043 -18.2046185 0.987299025
+v 8.49857426 -18.1459332 0.503844023
+v 8.49857426 -18.1459332 0.987299025
+v 8.57888317 -18.1162014 0.503844023
+v 8.57888317 -18.1162014 0.987299025
+v 9.41424656 -17.9309216 0.503844023
+v 9.41424656 -17.9309216 0.987299025
+v 9.82126904 -17.5247898 0.503844023
+v 9.82126904 -17.5247898 0.987299025
+vt 0.764985025 0.456185997
+vt 0.767931998 0.468735993
+vt 0.781620026 0.450055987
+vt 0.775608003 0.456090003
+vt 0.759018004 0.450230986
+vt 0.793929994 0.447515011
+vt 0.746770024 0.447515011
+vt 0.795103014 0.44709
+vt 0.745591998 0.447079003
+vt 0.795919001 0.446224004
+vt 0.744794011 0.446218014
+vt 0.744499981 0.445068985
+vt 0.795925975 0.443902999
+vt 0.744800985 0.443902999
+vt 0.795122027 0.443042994
+vt 0.745611012 0.443042994
+vt 0.746794999 0.442624003
+vt 0.793955982 0.442624003
+vt 0.759087026 0.440082997
+vt 0.775686026 0.434008986
+vt 0.781683981 0.440019995
+vt 0.765093029 0.43404901
+vt 0.772768021 0.421402991
+vt 0.767931998 0.421402991
+vt 0.772323012 0.420257986
+vt 0.768375993 0.420257986
+vt 0.770349979 0.419212013
+vt 0.771475017 0.419490993
+vt 0.769223988 0.419490993
+vt 0.796225011 0.445068985
+vt 0.772768021 0.468735993
+vt 0.76839298 0.469880998
+vt 0.769241989 0.470647007
+vt 0.771486998 0.470647007
+vt 0.772328973 0.469880998
+vt 0.770349979 0.470925987
+vt 0 0
+vn -0 -0 1
+vn -0.87349999 0.486900002 -0
+vn -0.480500013 0.876999974 -0
+vn -0.480599999 0.876999974 -0
+vn -0.282499999 0.959299982 -0
+vn -0.555400014 0.83160001 -0
+vn -0.555299997 0.831700027 -0
+vn -0.878000021 0.478599995 -0
+vn -1 -0.000899999985 -0
+vn -1 -0.000899999985 0.000199999995
+vn -0.875699997 -0.482800007 -0
+vn -0.875699997 -0.482800007 0.000199999995
+vn -0.546000004 -0.837800026 -0
+vn -0.546000004 -0.837800026 9.99999975e-05
+vn -0.268599987 -0.96329999 -0
+vn -0.475699991 -0.879599988 -0
+vn -0.876600027 -0.481099993 -0
+vn -0.876699984 -0.481099993 -0
+vn -0.956700027 -0.291200012 -0
+vn -0.956700027 -0.291099995 -0
+vn -0.823499978 -0.567300022 -0
+vn -0.469599992 -0.8829 -0
+vn -0 -1 -0
+vn 0.469599992 -0.8829 -0
+vn 0.823499978 -0.567399979 -0
+vn 0.823499978 -0.567300022 -0
+vn 0.95569998 -0.29429999 -0
+vn 0.95569998 -0.294400007 -0
+vn 0.87470001 -0.484600008 -0
+vn 0.874800026 -0.484600008 -0
+vn 0.477499992 -0.878600001 -0
+vn 0.273400009 -0.961899996 -0
+vn 0.549799979 -0.835300028 -0
+vn 0.876900017 -0.480699986 -0
+vn 1 0.00389999989 -0
+vn 0.874000013 0.486000001 -0
+vn 0.549000025 0.835799992 -0
+vn 0.272000015 0.962300003 -0
+vn 0.475400001 0.879800022 -0
+vn 0.87650001 0.481400013 -0
+vn 0.957300007 0.289099991 -0
+vn 0.825699985 0.564100027 -0
+vn 0.470099986 0.882600009 -0
+vn -0.00300000003 1 -0
+vn -0.471199989 0.882000029 -0
+vn -0.819800019 0.572600007 -0
+vn -0.953299999 0.302100003 -0
+vn -0.875699997 -0.482800007 9.99999975e-05
+vn -1 -0.00079999998 0.000199999995
+vn -0.88410002 -0.447899997 0.133100003
+vn -0.962800026 -0.263700008 -0.0582999997
+vn -0.972000003 -0.056400001 -0.228200004
+vn -0.522700012 -0.832400024 0.184200004
+vn -0.828400016 -0.529600024 0.182500005
+vn -0.769500017 -0.584399998 -0.257400006
+vn -0.247899994 -0.967499971 -0.0491999984
+vn -0.431499988 -0.888700008 0.154699996
+vn -0.178599998 -0.981899977 0.0636000037
+vn -0.505800009 -0.851999998 -0.135000005
+vn -0.27610001 -0.960600019 -0.0318999998
+vn -0.245700002 -0.944000006 0.220300004
+vn -0.845300019 -0.515100002 -0.141900003
+vn -0.564499974 -0.818099976 -0.109499998
+vn -0.644800007 -0.727999985 0.232999995
+vn -0.988900006 -0.0439999998 -0.142100006
+vn -0.8829 -0.454899997 -0.116099998
+vn -0.916100025 -0.326700002 0.232600003
+vn -0.888899982 0.43599999 -0.140400007
+vn -0.992900014 0.0267999992 -0.115699999
+vn -0.960600019 0.1558 0.230299994
+vn -0.840399981 0.524299979 -0.1373
+vn -0.858799994 0.499300003 -0.114399999
+vn -0.768599987 0.601700008 0.217299998
+vn -0.397599995 0.916700006 -0.0406999998
+vn -0.529799998 0.841099977 -0.108999997
+vn -0.35620001 0.931999981 0.0672999993
+vn -0.207900003 0.937399983 0.279300004
+vn -0.257699996 0.9648 -0.0529999994
+vn -0.0520000011 0.972000003 -0.229100004
+vn -0.679199994 0.680700004 0.274399996
+vn -0.529799998 0.827799976 0.184499994
+vn -0.593999982 0.765799999 -0.2465
+vn -0.976400018 0.203500003 -0.0719999969
+vn -0.8829 0.446500003 0.145099998
+vn -0.976800025 0.201800004 0.0714000016
+vn -0.834999979 0.535099983 -0.128700003
+vn -0.949999988 0.310299993 -0.0357000008
+vn -0.933499992 0.290600002 0.209999993
+vn -0.79519999 0.589399993 -0.142299995
+vn -0.800899982 0.589699984 -0.1039
+vn -0.71390003 0.662899971 0.225799993
+vn -0.426200002 0.893400013 -0.142199993
+vn -0.444700003 0.888700008 -0.111699998
+vn -0.319799989 0.92019999 0.225799993
+vn 0.0384999998 0.988600016 -0.145500004
+vn 0.0238000005 0.993399978 -0.112099998
+vn 0.146500006 0.962100029 0.230100006
+vn 0.516099989 0.845600009 -0.136299998
+vn 0.490700006 0.863900006 -0.113700002
+vn 0.594200015 0.774600029 0.216700003
+vn 0.910600007 0.411000013 -0.0430999994
+vn 0.835300028 0.538999975 -0.1083
+vn 0.92750001 0.366899997 0.0715000033
+vn 0.937300026 0.210500002 0.277700007
+vn 0.96329999 0.262499988 -0.0566000007
+vn 0.971899986 0.056400001 -0.228400007
+vn 0.522400022 0.832599998 0.184
+vn 0.828199983 0.529900014 0.182500005
+vn 0.708400011 0.705799997 -0
+vn 0.202199996 0.979399979 -0
+vn 0.193599999 0.938000023 0.287600011
+vn 0.2016 0.976800025 -0.071800001
+vn 0.43900001 0.887300014 0.141299993
+vn 0.509599984 0.850099981 -0.1329
+vn 0.279900014 0.959399998 -0.0337000005
+vn 0.254200011 0.942499995 0.216800004
+vn 0.843900025 0.51789999 -0.140200004
+vn 0.567300022 0.816399992 -0.107900001
+vn 0.646000028 0.727900028 0.229900002
+vn 0.883099973 0.444700003 -0.149800003
+vn 0.881200016 0.458600014 -0.114500001
+vn 0.912400007 0.334100008 0.236399993
+vn 0.887899995 -0.43779999 -0.141299993
+vn 0.992699981 -0.0243999995 -0.117899999
+vn 0.960200012 -0.156499997 0.231399998
+vn 0.829699993 -0.529799998 0.176100001
+vn 0.5273 -0.828800023 0.1875
+vn 0.595700026 -0.764299989 -0.247099996
+vn 0.960699975 -0.272799999 -0.0516000018
+vn 0.88410002 -0.444299996 0.144999996
+vn 0.977400005 -0.200499997 0.0666999966
+vn 0.83859998 -0.528500021 -0.132200003
+vn 0.952700019 -0.302100003 -0.0333999991
+vn 0.936699986 -0.27579999 0.215900004
+vn 0.501600027 -0.853999972 -0.1382
+vn 0.804099977 -0.584800005 -0.106799997
+vn 0.713999987 -0.662199974 0.227500007
+vn 0.422300011 -0.895200014 -0.142199993
+vn 0.442699999 -0.889599979 -0.1127
+vn 0.316399992 -0.921500027 0.225199997
+vn 0.441500008 -0.886300027 0.140100002
+vn 0.248600006 -0.967199981 -0.0529000014
+vn 0.0401999988 -0.971400023 -0.233999997
+vn 0.28490001 -0.957799971 -0.0388999991
+vn 0.523999989 -0.844600022 -0.110200003
+vn 0.34709999 -0.935400009 0.0670000017
+vn 0.839699984 -0.524999976 -0.1391
+vn 0.857599974 -0.501399994 -0.1149
+vn 0.766700029 -0.603100002 0.220100001
+vn -0.951799989 -0.3037 -0.0428000018
+vn -0.833199978 -0.542299986 -0.108099997
+vn -0.925599992 -0.371300012 0.0737000033
+vn -0.793200016 -0.594699979 -0.131200001
+vn -0.490099996 -0.864400029 -0.112499997
+vn -0.591899991 -0.776499987 0.216100007
+vn -0.427700013 -0.893299997 -0.138400003
+vn -0.0265999995 -0.993399978 -0.111599997
+vn -0.150000006 -0.962199986 0.227500007
+vn -0.530499995 0.829100013 -0.176599994
+vn -0.67809999 0.679799974 -0.279300004
+vn -0.550999999 0.806699991 0.213799998
+vn 0.0295000002 0.990100026 -0.137400001
+vn -0.216000006 0.973999977 0.0680999979
+vn -0.248699993 0.966799974 -0.0593000017
+vn -0.357499987 0.931500018 0.0671000034
+vn -0.337700009 0.912199974 0.232099995
+vn -0.551999986 0.832799971 -0.0405000001
+vn -0.738900006 0.633700013 0.229000002
+vn -0.710600019 0.659099996 0.246199995
+vn -0.875800014 0.481000006 -0.0401999988
+vn -0.949100018 0.200800002 0.242799997
+vn -0.938399971 0.239999995 0.248600006
+vn -0.999199986 0.00240000011 -0.0410999991
+vn -0.927600026 -0.281899989 0.245299995
+vn -0.937900007 -0.241699994 0.248899996
+vn -0.876600027 -0.479400009 -0.0417000018
+vn -0.676999986 -0.693799973 0.245700002
+vn -0.707499981 -0.666400015 0.235400006
+vn -0.548200011 -0.835399985 -0.0386999995
+vn -0.28549999 -0.929899991 0.231800005
+vn -0.332700014 -0.940599978 0.0680000037
+vn -0.269600004 -0.962899983 -0.0119000003
+vn -0.143999994 -0.989000022 0.0333999991
+vn -0.193900004 -0.937900007 -0.287800014
+vn -0.332500011 -0.909200013 0.25060001
+vn -0.834800005 -0.51880002 -0.184200004
+vn -0.680899978 -0.6778 -0.277399987
+vn -0.806200027 -0.551999986 0.213200003
+vn -0.990700006 0.0270000007 -0.133100003
+vn -0.97299999 -0.218400002 0.0746000037
+vn -0.965200007 -0.253300011 -0.0653999969
+vn -0.925000012 -0.372700006 0.0736000016
+vn -0.907100022 -0.352100015 0.230900005
+vn -0.824699998 -0.564100027 -0.0395000018
+vn -0.624800026 -0.746699989 0.228
+vn -0.650099993 -0.719900012 0.243200004
+vn -0.471899986 -0.880800009 -0.0386999995
+vn -0.195500001 -0.950900018 0.239999995
+vn -0.233700007 -0.941999972 0.240799993
+vn -0.00310000009 -0.999199986 -0.0388999991
+vn 0.271400005 -0.932699978 0.237599999
+vn 0.233600006 -0.941399992 0.243200004
+vn 0.466500014 -0.883700013 -0.0392999984
+vn 0.678900003 -0.693899989 0.240199998
+vn 0.652199984 -0.722100019 0.230900005
+vn 0.82130003 -0.569299996 -0.0368000008
+vn 0.921299994 -0.315200001 0.227599993
+vn 0.929899991 -0.360799998 0.0713
+vn 0.955299973 -0.295399994 -0.0121999998
+vn 0.985899985 -0.164100006 0.0342000015
+vn 0.936699986 -0.216900006 -0.274800003
+vn 0.906899989 -0.345499992 0.240999997
+vn 0.531700015 -0.828400016 -0.176100001
+vn 0.678600013 -0.677100003 -0.284700006
+vn 0.549700022 -0.806200027 0.218600005
+vn -0.0436000004 -0.989199996 -0.140100002
+vn 0.207000002 -0.976000011 0.0678000003
+vn 0.239700004 -0.969099998 -0.0590999983
+vn 0.348199993 -0.935000002 0.0669
+vn 0.328599989 -0.914799988 0.235100001
+vn 0.546500027 -0.836499989 -0.0405000001
+vn 0.736599982 -0.635299981 0.231900007
+vn 0.708100021 -0.66140002 0.247299999
+vn 0.874599993 -0.483099997 -0.0405000001
+vn 0.948800027 -0.201000005 0.243799999
+vn 0.937099993 -0.240799993 0.252600014
+vn 0.999100029 0.00039999999 -0.0423000008
+vn 0.924499989 0.288599998 0.2491
+vn 0.936999977 0.248500004 0.245700002
+vn 0.874899983 0.48269999 -0.0408000015
+vn 0.67750001 0.694400012 0.242400005
+vn 0.707899988 0.667200029 0.231700003
+vn 0.551199973 0.833500028 -0.0384000018
+vn 0.293300003 0.92839998 0.228300005
+vn 0.33950001 0.937900007 0.0716999993
+vn 0.273000002 0.961899996 -0.0124000004
+vn 0.834500015 0.519400001 -0.184
+vn 0.680499971 0.67809999 -0.277700007
+vn 0.805899978 0.552299976 0.213400006
+vn 0.990700006 -0.0272000004 -0.133200005
+vn 0.973100007 0.218500003 0.072300002
+vn 0.965499997 0.252400011 -0.063500002
+vn 0.926999986 0.368200004 0.0714000016
+vn 0.908500016 0.347900003 0.2315
+vn 0.826900005 0.560899973 -0.0395000018
+vn 0.627399981 0.744400024 0.228400007
+vn 0.652100027 0.717100024 0.246000007
+vn 0.472499996 0.880500019 -0.0390000008
+vn 0.192200005 0.950900018 0.242799997
+vn 0.231399998 0.942399979 0.241400003
+vn 9.99999975e-05 0.999199986 -0.0394000001
+vn -0.274300009 0.931599975 0.238299996
+vn -0.237100005 0.940999985 0.241500005
+vn -0.468199998 0.882799983 -0.0384000018
+vn -0.67900002 0.694400012 0.238399997
+vn -0.653199971 0.723200023 0.224600002
+vn -0.817700028 0.574599981 -0.0357999988
+vn -0.918200016 0.328599989 0.221200004
+vn -0.924799979 0.372799993 0.0762000009
+vn -0.952899992 0.30309999 -0.0131000001
+vn -0.986000001 0.162799999 0.0366999991
+vn -0.936200023 0.219799995 -0.274399996
+vn -0.906000018 0.348500013 0.240400001
+vn -0.937399983 -0.2104 -0.277399987
+vn -0.975799978 -0.206 -0.0734999999
+vn -0.987399995 0.0121999998 -0.157800004
+vn -0.678799987 -0.675599992 -0.287900001
+vn -0.649999976 -0.708800018 0.273900002
+vn -0.860400021 -0.493200004 -0.128700003
+vn -0.182600006 -0.981000006 0.0650999993
+vn -0.0614 -0.965300024 0.254000008
+vn -0.139699996 -0.989899993 0.0239000004
+vn -0.48089999 -0.860800028 0.166600004
+vn -0.312900007 -0.947600007 -0.0647
+vn -0.116400003 -0.989700019 0.0830999985
+vn -0.827400029 -0.534099996 0.173600003
+vn -0.656899989 -0.720000029 -0.2236
+vn -0.545300007 -0.833700001 0.0878000036
+vn -0.982200027 -0.0697999969 0.1743
+vn -0.918500006 -0.316799998 -0.236499995
+vn -0.879899979 -0.467000008 0.0877000019
+vn -0.895399988 0.410899997 0.171900004
+vn -0.957700014 0.1646 -0.236100003
+vn -0.996100008 0.0170000009 0.0869999975
+vn -0.853900015 0.5097 0.104900002
+vn -0.763100028 0.602500021 -0.233799994
+vn -0.860899985 0.502200007 0.0815000013
+vn -0.403400004 0.914499998 0.0305000003
+vn -0.404900014 0.887300014 -0.220799997
+vn -0.409399986 0.912299991 0.0104999999
+vn -0.205200002 0.976400018 -0.0671999976
+vn 0.0157999992 0.986999989 -0.159700006
+vn -0.530600011 0.828999996 -0.176599994
+vn -0.707799971 0.650200009 0.276199996
+vn -0.504700005 0.854900002 -0.120399997
+vn -0.987900019 0.154699996 0.0126999998
+vn -0.966799974 0.0891999975 0.239399999
+vn -0.986999989 0.158399999 0.0267999992
+vn -0.844299972 0.512000024 0.158299997
+vn -0.933600008 0.350800008 -0.0724999979
+vn -0.982299984 0.169499993 0.0794999972
+vn -0.810199976 0.575900018 0.109399997
+vn -0.70569998 0.675700009 -0.213100001
+vn -0.818000019 0.568799973 0.0855000019
+vn -0.445800006 0.888400018 0.109399997
+vn -0.310900003 0.922399998 -0.229100004
+vn -0.456099987 0.885800004 0.0852999985
+vn 0.0181000009 0.993600011 0.111199997
+vn 0.157900006 0.960500002 -0.229200006
+vn 0.00769999996 0.996200025 0.0870999992
+vn 0.501800001 0.85860002 0.104900002
+vn 0.594600022 0.769400001 -0.233400002
+vn 0.494199991 0.865499973 0.0815000013
+vn 0.908299983 0.417100012 0.0324999988
+vn 0.882799983 0.415100008 -0.219999999
+vn 0.905799985 0.423500001 0.0109000001
+vn 0.975899994 0.206499994 -0.0713
+vn 0.987399995 -0.0122999996 -0.157900006
+vn 0.67839998 0.675999999 -0.287600011
+vn 0.649399996 0.709299982 0.274100006
+vn -0.0516999997 0.988600016 -0.141299993
+vn 0.131400004 0.991299987 -0
+vn -0.0881000012 0.996100008 -0
+vn 0.485300004 0.858900011 0.163800001
+vn 0.318599999 0.9454 -0.0681999996
+vn 0.127200007 0.988499999 0.0816999972
+vn 0.825999975 0.536899984 0.171700001
+vn 0.658200026 0.719900012 -0.220100001
+vn 0.547699988 0.832199991 0.0866999999
+vn 0.877399981 0.465999991 0.113899998
+vn 0.917299986 0.322699994 -0.233400002
+vn 0.874599993 0.476599991 0.0891000032
+vn 0.894500017 -0.412099987 0.173299998
+vn 0.956700027 -0.164499998 -0.240099996
+vn 0.995999992 -0.0171000008 0.0873000026
+vn 0.680700004 -0.679099977 -0.274800003
+vn 0.709900022 -0.645699978 0.281300008
+vn 0.506099999 -0.853999972 -0.120300002
+vn 0.976599991 -0.203899994 0.067900002
+vn 0.967199981 -0.0852999985 0.239399999
+vn 0.986800015 -0.159999996 0.0251000002
+vn 0.847800016 -0.504800022 0.162599996
+vn 0.937900007 -0.340200007 -0.0678000003
+vn 0.985199988 -0.150600001 0.0816999972
+vn 0.519800007 -0.837599993 0.168300003
+vn 0.706200004 -0.673300028 -0.219099998
+vn 0.819000006 -0.567399979 0.0860000029
+vn 0.442099988 -0.890299976 0.108999997
+vn 0.307799995 -0.922999978 -0.230800003
+vn 0.452300012 -0.887799978 0.0851000026
+vn 0.198899999 -0.937699974 -0.284799993
+vn 0.1963 -0.978299975 -0.0669
+vn -0.0299999993 -0.986299992 -0.162200004
+vn 0.291999996 -0.955200016 0.0478999987
+vn 0.397100002 -0.890100002 -0.223499998
+vn 0.400400013 -0.916299999 0.0104
+vn 0.853500009 -0.510200024 0.106200002
+vn 0.760999978 -0.604799986 -0.234799996
+vn 0.860499978 -0.502699971 0.0825999975
+vn -0.948800027 -0.311300009 0.0526000001
+vn -0.881200016 -0.418799996 -0.219500005
+vn -0.902999997 -0.429500014 0.0111999996
+vn -0.775900006 -0.610300004 0.159799993
+vn -0.593200028 -0.771300018 -0.230800003
+vn -0.49180001 -0.866900027 0.0812000036
+vn -0.403400004 -0.899299979 0.168899998
+vn -0.1602 -0.960200012 -0.228599995
+vn -0.0127999997 -0.996200025 0.0860999972
+vn -0.858900011 0.499300003 -0.114399999
+vn -0.834999979 0.535000026 -0.128700003
+vn 0.843800008 0.51789999 -0.140200004
+vn 0.887899995 -0.437700003 -0.141299993
+vn 0.804099977 -0.584900022 -0.106799997
+vn 0.839600027 -0.524999976 -0.1391
+vn 0.857500017 -0.501399994 -0.1149
+vn -0.833199978 -0.542200029 -0.108099997
+vn -0.564599991 -0.818099976 -0.109499998
+vn -0.644800007 -0.727900028 0.232999995
+vn -0.875800014 -0.482800007 -0
+vn -0.878000021 0.478700012 -0
+vn 0.960699975 -0.272899985 -0.0516000018
+vn 0.874000013 0.485900015 -0
+vn -0.545899987 -0.837800026 9.99999975e-05
+vn -1 -0.00079999998 -0
+vn -0.555299997 0.83160001 -0
+vn -0.845300019 -0.514999986 -0.141900003
+vn -0.644900024 -0.727900028 0.232999995
+vn -0.8829 -0.455000013 -0.116099998
+vn -0.916000009 -0.326700002 0.232600003
+vn -0.529900014 0.841000021 -0.108999997
+vn 0.992699981 -0.0242999997 -0.117899999
+vn -0.469700009 -0.882799983 -0
+vn 0.316300005 -0.921500027 0.225199997
+vn -0.427599996 -0.893299997 -0.138400003
+f 29/1/1 30/2/1 36/2/1
+f 244/1/1 245/2/1 251/2/1
+f 74/1/2 76/3/3 75/4/3
+f 76/5/4 78/6/5 77/5/5
+f 78/7/5 80/8/6 79/7/6
+f 80/9/7 82/10/8 81/9/8
+f 82/11/8 84/3/9 83/11/9
+f 84/12/10 86/13/11 85/12/11
+f 86/14/12 88/15/13 87/14/13
+f 88/16/14 90/16/15 89/15/15
+f 90/17/15 92/18/16 91/17/16
+f 92/19/16 94/20/17 93/21/17
+f 94/22/18 96/23/19 95/22/19
+f 96/24/20 98/25/21 97/24/21
+f 98/26/21 100/27/22 99/28/22
+f 100/29/22 102/28/23 101/26/23
+f 102/27/23 104/26/24 103/25/24
+f 104/28/24 106/24/25 105/23/26
+f 106/25/26 108/22/27 107/20/27
+f 108/23/28 110/21/29 109/19/29
+f 110/20/30 112/19/31 111/18/31
+f 112/21/31 114/17/32 113/16/32
+f 114/18/32 116/14/33 115/13/33
+f 116/15/33 118/12/34 117/30/34
+f 118/13/34 120/11/35 119/10/35
+f 120/30/35 122/9/36 121/8/36
+f 122/10/36 124/7/37 123/6/37
+f 124/8/37 126/5/38 125/3/38
+f 127/3/39 129/1/40 128/31/40
+f 129/4/40 131/2/41 130/32/41
+f 131/31/41 133/33/42 132/34/42
+f 133/35/42 135/36/43 134/12/43
+f 135/34/43 137/12/44 136/3/44
+f 137/36/44 139/34/45 138/36/45
+f 139/33/45 141/35/46 140/33/46
+f 141/32/46 143/32/47 142/35/47
+f 143/2/47 74/31/2 73/2/2
+f 145/2/47 214/31/2 215/2/2
+f 147/32/46 145/32/47 146/35/47
+f 149/33/45 147/35/46 148/33/46
+f 151/36/44 149/34/45 150/36/45
+f 153/34/43 151/12/44 152/3/44
+f 155/35/42 153/36/43 154/12/43
+f 157/31/41 155/33/42 156/34/42
+f 159/4/40 157/2/41 158/32/41
+f 161/3/39 159/1/40 160/31/40
+f 164/8/37 162/5/38 163/3/38
+f 166/10/36 164/7/37 165/6/37
+f 168/30/35 166/9/36 167/8/36
+f 170/13/34 168/11/35 169/10/35
+f 172/15/33 170/12/34 171/30/34
+f 174/18/32 172/14/33 173/13/33
+f 176/21/31 174/17/32 175/16/32
+f 178/20/30 176/19/31 177/18/31
+f 180/23/28 178/21/29 179/19/29
+f 182/25/26 180/22/28 181/20/28
+f 184/28/24 182/24/26 183/23/26
+f 186/27/23 184/26/24 185/25/24
+f 188/29/22 186/28/23 187/26/23
+f 190/26/21 188/27/22 189/28/22
+f 192/24/19 190/25/21 191/24/21
+f 194/22/18 192/23/19 193/22/19
+f 196/19/16 194/20/17 195/21/17
+f 198/17/15 196/18/16 197/17/16
+f 200/16/14 198/16/15 199/15/15
+f 202/14/48 200/15/13 201/14/13
+f 204/12/49 202/13/11 203/12/11
+f 206/11/8 204/3/9 205/11/9
+f 208/9/7 206/10/8 207/9/8
+f 210/7/5 208/8/6 209/7/6
+f 212/5/4 210/6/5 211/5/5
+f 214/1/2 212/3/3 213/4/3
+f 194/22/50 193/22/51 195/21/52
+f 94/22/50 95/22/51 93/21/52
+f 92/19/53 93/21/54 91/17/55
+f 90/17/56 91/17/57 89/15/58
+f 88/16/59 89/15/60 87/14/61
+f 86/14/62 87/14/63 85/12/64
+f 84/12/65 85/12/66 83/11/67
+f 82/11/68 83/11/69 81/9/70
+f 80/8/71 81/9/72 79/7/73
+f 78/6/74 79/7/75 77/5/76
+f 76/3/77 77/5/78 75/4/79
+f 74/31/80 75/4/81 73/2/82
+f 143/32/83 73/2/84 142/35/85
+f 141/32/86 142/35/87 140/33/88
+f 139/34/89 140/33/90 138/36/91
+f 137/12/92 138/36/93 136/3/94
+f 135/36/95 136/3/96 134/12/97
+f 133/33/98 134/12/99 132/34/100
+f 131/2/101 132/34/102 130/32/103
+f 129/1/104 130/32/105 128/31/106
+f 127/3/107 128/31/108 28/37/109
+f 28/37/110 125/37/110 127/3/111
+f 126/5/112 127/3/113 125/37/110
+f 124/8/114 125/3/115 123/6/116
+f 122/10/117 123/6/118 121/8/119
+f 120/11/120 121/8/121 119/10/122
+f 118/13/123 119/10/124 117/30/125
+f 110/20/126 111/18/127 109/19/128
+f 108/23/129 109/19/130 107/20/131
+f 106/25/132 107/20/133 105/23/134
+f 104/28/135 105/23/136 103/25/137
+f 102/28/138 103/25/139 101/26/140
+f 112/21/141 113/16/142 111/18/143
+f 114/18/144 115/13/145 113/16/146
+f 116/14/147 117/30/148 115/13/149
+f 96/24/150 97/24/151 95/22/152
+f 98/26/153 99/28/154 97/24/155
+f 100/29/156 101/26/157 99/28/158
+f 357/1/1 348/19/1 329/1/1
+f 253/1/159 255/3/160 254/4/161
+f 255/5/162 257/6/163 256/5/164
+f 257/7/165 259/8/166 258/7/167
+f 259/9/168 261/10/169 260/9/170
+f 261/11/171 263/3/172 262/11/173
+f 263/12/174 265/13/175 264/12/176
+f 265/14/177 267/15/178 266/14/179
+f 267/16/180 269/16/181 268/15/182
+f 269/17/183 271/18/184 270/17/185
+f 271/19/186 273/20/187 272/21/188
+f 273/22/189 275/23/190 274/22/191
+f 275/24/192 277/25/193 276/24/194
+f 277/26/195 279/27/196 278/28/197
+f 279/29/198 281/28/199 280/26/200
+f 281/27/201 283/26/202 282/25/203
+f 283/28/204 285/24/205 284/23/206
+f 285/25/207 287/22/208 286/20/209
+f 287/23/210 289/21/211 288/19/212
+f 289/20/213 291/19/214 290/18/215
+f 291/21/216 293/17/217 292/16/218
+f 293/18/219 295/14/220 294/13/221
+f 295/15/222 297/12/223 296/30/224
+f 297/13/225 299/11/226 298/10/227
+f 299/30/228 301/9/229 300/8/230
+f 301/10/231 303/7/232 302/6/233
+f 303/8/234 305/5/235 304/3/236
+f 306/3/237 308/1/238 307/31/239
+f 308/4/240 310/2/241 309/32/242
+f 310/31/243 312/33/244 311/34/245
+f 312/35/246 314/36/247 313/12/248
+f 314/34/249 316/12/250 315/3/251
+f 316/36/252 318/34/253 317/36/254
+f 318/33/255 320/35/256 319/33/257
+f 320/32/258 322/32/259 321/35/260
+f 322/2/261 253/31/262 252/2/263
+f 273/22/264 274/22/265 272/21/266
+f 271/19/267 272/21/268 270/17/269
+f 269/17/270 270/17/271 268/15/272
+f 267/16/273 268/15/274 266/14/275
+f 265/14/276 266/14/277 264/12/278
+f 263/12/279 264/12/280 262/11/281
+f 261/11/282 262/11/283 260/9/284
+f 259/8/285 260/9/286 258/7/287
+f 257/6/288 258/7/289 256/5/290
+f 255/3/162 256/5/291 254/4/292
+f 253/31/293 254/4/294 252/2/295
+f 322/32/296 252/2/297 321/35/298
+f 320/32/299 321/35/300 319/33/301
+f 318/34/302 319/33/303 317/36/304
+f 316/12/305 317/36/306 315/3/307
+f 314/36/308 315/3/309 313/12/310
+f 312/33/311 313/12/312 311/34/313
+f 310/2/314 311/34/315 309/32/316
+f 308/1/240 309/32/317 307/31/318
+f 306/3/319 307/31/320 243/37/109
+f 243/37/110 304/37/110 306/3/321
+f 305/5/322 306/3/323 304/37/110
+f 303/8/324 304/3/325 302/6/326
+f 301/10/327 302/6/328 300/8/329
+f 299/11/330 300/8/331 298/10/332
+f 297/13/333 298/10/334 296/30/335
+f 289/20/336 290/18/337 288/19/338
+f 287/23/339 288/19/340 286/20/341
+f 285/25/342 286/20/343 284/23/344
+f 283/28/345 284/23/346 282/25/347
+f 281/28/348 282/25/349 280/26/350
+f 291/21/351 292/16/352 290/18/353
+f 293/18/354 294/13/355 292/16/356
+f 295/14/357 296/30/358 294/13/359
+f 275/24/360 276/24/361 274/22/362
+f 277/26/363 278/28/364 276/24/365
+f 279/29/366 280/26/367 278/28/368
+f 196/19/53 195/21/54 197/17/55
+f 198/17/56 197/17/57 199/15/58
+f 200/16/59 199/15/60 201/14/61
+f 202/14/62 201/14/63 203/12/64
+f 204/12/65 203/12/66 205/11/67
+f 206/11/68 205/11/69 207/9/70
+f 208/8/71 207/9/369 209/7/73
+f 210/6/74 209/7/75 211/5/76
+f 212/3/77 211/5/78 213/4/79
+f 214/31/80 213/4/81 215/2/82
+f 145/32/83 215/2/84 146/35/85
+f 147/32/370 146/35/87 148/33/88
+f 149/34/89 148/33/90 150/36/91
+f 151/12/92 150/36/93 152/3/94
+f 153/36/95 152/3/96 154/12/97
+f 155/33/98 154/12/99 156/34/100
+f 157/2/101 156/34/102 158/32/103
+f 159/1/104 158/32/105 160/31/106
+f 161/3/107 160/31/108 45/37/109
+f 45/37/110 163/37/110 161/3/111
+f 162/5/112 161/3/113 163/37/110
+f 164/8/114 163/3/115 165/6/116
+f 166/10/371 165/6/118 167/8/119
+f 168/11/120 167/8/121 169/10/122
+f 170/13/372 169/10/124 171/30/125
+f 178/20/126 177/18/127 179/19/128
+f 180/23/129 179/19/130 181/20/131
+f 182/25/132 181/20/133 183/23/134
+f 184/28/135 183/23/373 185/25/137
+f 186/28/138 185/25/139 187/26/140
+f 176/21/141 175/16/142 177/18/143
+f 174/18/144 173/13/145 175/16/146
+f 172/14/374 171/30/375 173/13/149
+f 192/24/150 191/24/376 193/22/152
+f 190/26/153 189/28/154 191/24/155
+f 188/29/156 187/26/157 189/28/158
+f 464/1/1 455/19/1 436/1/1
+f 358/2/47 427/31/2 428/2/2
+f 360/32/46 358/32/47 359/35/47
+f 362/33/45 360/35/46 361/33/46
+f 364/36/44 362/34/45 363/36/45
+f 366/34/43 364/12/44 365/3/44
+f 368/35/42 366/36/43 367/12/43
+f 370/31/41 368/33/42 369/34/42
+f 372/4/40 370/2/41 371/32/41
+f 374/3/39 372/1/40 373/31/40
+f 377/8/37 375/5/38 376/3/38
+f 379/10/36 377/7/37 378/6/37
+f 381/30/35 379/9/36 380/8/36
+f 383/13/34 381/11/35 382/10/35
+f 385/15/33 383/12/34 384/30/34
+f 387/18/32 385/14/33 386/13/33
+f 389/21/31 387/17/32 388/16/32
+f 391/20/30 389/19/31 390/18/31
+f 393/23/28 391/21/29 392/19/29
+f 395/25/26 393/22/28 394/20/28
+f 397/28/24 395/24/26 396/23/26
+f 399/27/23 397/26/24 398/25/24
+f 401/29/22 399/28/23 400/26/23
+f 403/26/21 401/27/22 402/28/22
+f 405/24/19 403/25/21 404/24/21
+f 407/22/18 405/23/19 406/22/19
+f 409/19/16 407/20/17 408/21/17
+f 411/17/15 409/18/16 410/17/16
+f 413/16/14 411/16/15 412/15/15
+f 415/14/48 413/15/13 414/14/13
+f 417/12/10 415/13/11 416/12/11
+f 419/11/8 417/3/9 418/11/9
+f 421/9/7 419/10/8 420/9/8
+f 423/7/5 421/8/6 422/7/6
+f 425/5/4 423/6/5 424/5/5
+f 427/1/2 425/3/3 426/4/3
+f 407/22/50 406/22/51 408/21/52
+f 409/19/53 408/21/54 410/17/55
+f 411/17/56 410/17/57 412/15/58
+f 413/16/59 412/15/60 414/14/61
+f 415/14/62 414/14/377 416/12/378
+f 417/12/65 416/12/66 418/11/67
+f 419/11/68 418/11/69 420/9/70
+f 421/8/71 420/9/72 422/7/73
+f 423/6/74 422/7/75 424/5/76
+f 425/3/77 424/5/78 426/4/79
+f 427/31/80 426/4/81 428/2/82
+f 358/32/83 428/2/84 359/35/85
+f 360/32/370 359/35/87 361/33/88
+f 362/34/89 361/33/90 363/36/91
+f 364/12/92 363/36/93 365/3/94
+f 366/36/95 365/3/96 367/12/97
+f 368/33/98 367/12/99 369/34/100
+f 370/2/101 369/34/102 371/32/103
+f 372/1/104 371/32/105 373/31/106
+f 374/3/107 373/31/108 330/37/109
+f 330/37/110 376/37/110 374/3/111
+f 375/5/112 374/3/113 376/37/110
+f 377/8/114 376/3/115 378/6/116
+f 379/10/371 378/6/118 380/8/119
+f 381/11/120 380/8/121 382/10/122
+f 383/13/372 382/10/124 384/30/125
+f 391/20/126 390/18/127 392/19/128
+f 393/23/129 392/19/130 394/20/131
+f 395/25/132 394/20/133 396/23/134
+f 397/28/135 396/23/373 398/25/137
+f 399/28/138 398/25/139 400/26/140
+f 389/21/141 388/16/142 390/18/143
+f 387/18/144 386/13/145 388/16/146
+f 385/14/374 384/30/375 386/13/149
+f 405/24/150 404/24/376 406/22/152
+f 403/26/153 402/28/154 404/24/155
+f 401/29/156 400/26/157 402/28/158
+f 571/1/1 562/19/1 543/1/1
+f 465/2/47 534/31/2 535/2/2
+f 467/32/46 465/32/47 466/35/47
+f 469/33/45 467/35/46 468/33/46
+f 471/36/44 469/34/45 470/36/45
+f 473/34/43 471/12/44 472/3/44
+f 475/35/42 473/36/43 474/12/43
+f 477/31/41 475/33/42 476/34/42
+f 479/4/40 477/2/41 478/32/41
+f 481/3/39 479/1/40 480/31/40
+f 484/8/37 482/5/38 483/3/38
+f 486/10/36 484/7/37 485/6/37
+f 488/30/35 486/9/36 487/8/36
+f 490/13/34 488/11/35 489/10/35
+f 492/15/33 490/12/34 491/30/34
+f 494/18/32 492/14/33 493/13/33
+f 496/21/31 494/17/32 495/16/32
+f 498/20/30 496/19/31 497/18/31
+f 500/23/28 498/21/29 499/19/29
+f 502/25/26 500/22/27 501/20/27
+f 504/28/24 502/24/26 503/23/26
+f 506/27/23 504/26/24 505/25/24
+f 508/29/22 506/28/23 507/26/23
+f 510/26/21 508/27/22 509/28/22
+f 512/24/20 510/25/21 511/24/21
+f 514/22/18 512/23/19 513/22/19
+f 516/19/16 514/20/17 515/21/17
+f 518/17/15 516/18/16 517/17/16
+f 520/16/14 518/16/15 519/15/15
+f 522/14/48 520/15/13 521/14/13
+f 524/12/49 522/13/379 523/12/379
+f 526/11/8 524/3/9 525/11/9
+f 528/9/7 526/10/380 527/9/380
+f 530/7/5 528/8/6 529/7/6
+f 532/5/4 530/6/5 531/5/5
+f 534/1/2 532/3/3 533/4/3
+f 514/22/50 513/22/51 515/21/52
+f 516/19/53 515/21/54 517/17/55
+f 518/17/56 517/17/57 519/15/58
+f 520/16/59 519/15/60 521/14/61
+f 522/14/62 521/14/63 523/12/64
+f 524/12/65 523/12/66 525/11/67
+f 526/11/68 525/11/69 527/9/70
+f 528/8/71 527/9/369 529/7/73
+f 530/6/74 529/7/75 531/5/76
+f 532/3/77 531/5/78 533/4/79
+f 534/31/80 533/4/81 535/2/82
+f 465/32/83 535/2/84 466/35/85
+f 467/32/86 466/35/87 468/33/88
+f 469/34/89 468/33/90 470/36/91
+f 471/12/92 470/36/93 472/3/94
+f 473/36/95 472/3/96 474/12/97
+f 475/33/98 474/12/99 476/34/100
+f 477/2/101 476/34/102 478/32/103
+f 479/1/104 478/32/105 480/31/106
+f 481/3/107 480/31/108 437/37/109
+f 437/37/110 483/37/110 481/3/111
+f 482/5/112 481/3/113 483/37/110
+f 484/8/114 483/3/115 485/6/116
+f 486/10/117 485/6/118 487/8/119
+f 488/11/120 487/8/121 489/10/122
+f 490/13/123 489/10/124 491/30/125
+f 498/20/126 497/18/127 499/19/128
+f 500/23/381 499/19/130 501/20/131
+f 502/25/132 501/20/133 503/23/134
+f 504/28/135 503/23/136 505/25/137
+f 506/28/138 505/25/139 507/26/140
+f 496/21/141 495/16/142 497/18/143
+f 494/18/144 493/13/145 495/16/146
+f 492/14/374 491/30/375 493/13/149
+f 512/24/150 511/24/151 513/22/152
+f 510/26/153 509/28/154 511/24/155
+f 508/29/156 507/26/157 509/28/158
+f 678/1/1 669/19/1 650/1/1
+f 572/2/47 641/31/2 642/2/2
+f 574/32/46 572/32/47 573/35/47
+f 576/33/45 574/35/46 575/33/46
+f 578/36/44 576/34/45 577/36/45
+f 580/34/43 578/12/44 579/3/44
+f 582/35/42 580/36/43 581/12/43
+f 584/31/41 582/33/42 583/34/42
+f 586/4/40 584/2/41 585/32/41
+f 588/3/39 586/1/40 587/31/40
+f 591/8/37 589/5/38 590/3/38
+f 593/10/36 591/7/37 592/6/37
+f 595/30/35 593/9/382 594/8/36
+f 597/13/34 595/11/35 596/10/35
+f 599/15/33 597/12/34 598/30/34
+f 601/18/32 599/14/33 600/13/33
+f 603/21/31 601/17/32 602/16/32
+f 605/20/30 603/19/31 604/18/31
+f 607/23/28 605/21/29 606/19/29
+f 609/25/26 607/22/27 608/20/27
+f 611/28/24 609/24/25 610/23/26
+f 613/27/23 611/26/24 612/25/24
+f 615/29/22 613/28/23 614/26/23
+f 617/26/21 615/27/22 616/28/22
+f 619/24/20 617/25/21 618/24/21
+f 621/22/18 619/23/19 620/22/19
+f 623/19/16 621/20/17 622/21/17
+f 625/17/15 623/18/16 624/17/16
+f 627/16/383 625/16/15 626/15/15
+f 629/14/48 627/15/13 628/14/13
+f 631/12/49 629/13/379 630/12/379
+f 633/11/8 631/3/384 632/11/384
+f 635/9/385 633/10/8 634/9/8
+f 637/7/5 635/8/385 636/7/385
+f 639/5/4 637/6/5 638/5/5
+f 641/1/2 639/3/3 640/4/3
+f 621/22/50 620/22/51 622/21/52
+f 623/19/53 622/21/54 624/17/55
+f 625/17/56 624/17/57 626/15/58
+f 627/16/59 626/15/60 628/14/61
+f 629/14/386 628/14/377 630/12/387
+f 631/12/65 630/12/388 632/11/389
+f 633/11/68 632/11/69 634/9/70
+f 635/8/71 634/9/369 636/7/73
+f 637/6/74 636/7/390 638/5/76
+f 639/3/77 638/5/78 640/4/79
+f 641/31/80 640/4/81 642/2/82
+f 572/32/83 642/2/84 573/35/85
+f 574/32/86 573/35/87 575/33/88
+f 576/34/89 575/33/90 577/36/91
+f 578/12/92 577/36/93 579/3/94
+f 580/36/95 579/3/96 581/12/97
+f 582/33/98 581/12/99 583/34/100
+f 584/2/101 583/34/102 585/32/103
+f 586/1/104 585/32/105 587/31/106
+f 588/3/107 587/31/108 544/37/109
+f 544/37/110 590/37/110 588/3/111
+f 589/5/112 588/3/113 590/37/110
+f 591/8/114 590/3/115 592/6/116
+f 593/10/371 592/6/118 594/8/119
+f 595/11/120 594/8/121 596/10/122
+f 597/13/372 596/10/391 598/30/125
+f 605/20/126 604/18/127 606/19/128
+f 607/23/129 606/19/130 608/20/131
+f 609/25/132 608/20/133 610/23/134
+f 611/28/135 610/23/136 612/25/137
+f 613/28/138 612/25/139 614/26/140
+f 603/21/141 602/16/142 604/18/143
+f 601/18/144 600/13/145 602/16/146
+f 599/14/374 598/30/375 600/13/149
+f 619/24/150 618/24/151 620/22/152
+f 617/26/153 616/28/154 618/24/155
+f 615/29/156 614/26/157 616/28/158
+f 785/1/1 776/19/1 757/1/1
+f 679/2/47 748/31/2 749/2/2
+f 681/32/46 679/32/47 680/35/47
+f 683/33/45 681/35/46 682/33/46
+f 685/36/44 683/34/45 684/36/45
+f 687/34/43 685/12/44 686/3/44
+f 689/35/42 687/36/43 688/12/43
+f 691/31/41 689/33/42 690/34/42
+f 693/4/40 691/2/41 692/32/41
+f 695/3/39 693/1/40 694/31/40
+f 698/8/37 696/5/38 697/3/38
+f 700/10/36 698/7/37 699/6/37
+f 702/30/35 700/9/36 701/8/36
+f 704/13/34 702/11/35 703/10/35
+f 706/15/33 704/12/34 705/30/34
+f 708/18/32 706/14/33 707/13/33
+f 710/21/31 708/17/32 709/16/32
+f 712/20/30 710/19/31 711/18/31
+f 714/23/28 712/21/29 713/19/29
+f 716/25/26 714/22/28 715/20/28
+f 718/28/24 716/24/26 717/23/26
+f 720/27/23 718/26/24 719/25/24
+f 722/29/22 720/28/23 721/26/23
+f 724/26/21 722/27/392 723/28/392
+f 726/24/19 724/25/21 725/24/21
+f 728/22/18 726/23/19 727/22/19
+f 730/19/16 728/20/17 729/21/17
+f 732/17/15 730/18/16 731/17/16
+f 734/16/14 732/16/15 733/15/15
+f 736/14/48 734/15/13 735/14/13
+f 738/12/49 736/13/11 737/12/11
+f 740/11/8 738/3/9 739/11/9
+f 742/9/385 740/10/8 741/9/8
+f 744/7/5 742/8/6 743/7/6
+f 746/5/4 744/6/5 745/5/5
+f 748/1/2 746/3/3 747/4/3
+f 728/22/50 727/22/51 729/21/52
+f 730/19/53 729/21/54 731/17/55
+f 732/17/56 731/17/57 733/15/58
+f 734/16/59 733/15/60 735/14/61
+f 736/14/62 735/14/63 737/12/64
+f 738/12/65 737/12/66 739/11/67
+f 740/11/68 739/11/69 741/9/70
+f 742/8/71 741/9/369 743/7/73
+f 744/6/74 743/7/75 745/5/76
+f 746/3/77 745/5/78 747/4/79
+f 748/31/80 747/4/81 749/2/82
+f 679/32/83 749/2/84 680/35/85
+f 681/32/370 680/35/87 682/33/88
+f 683/34/89 682/33/90 684/36/91
+f 685/12/92 684/36/93 686/3/94
+f 687/36/95 686/3/96 688/12/97
+f 689/33/98 688/12/99 690/34/100
+f 691/2/101 690/34/102 692/32/103
+f 693/1/104 692/32/105 694/31/106
+f 695/3/107 694/31/108 651/37/109
+f 651/37/110 697/37/110 695/3/111
+f 696/5/112 695/3/113 697/37/110
+f 698/8/114 697/3/115 699/6/116
+f 700/10/371 699/6/118 701/8/119
+f 702/11/120 701/8/121 703/10/122
+f 704/13/372 703/10/124 705/30/125
+f 712/20/126 711/18/127 713/19/128
+f 714/23/129 713/19/130 715/20/131
+f 716/25/132 715/20/133 717/23/134
+f 718/28/135 717/23/136 719/25/137
+f 720/28/138 719/25/139 721/26/393
+f 710/21/141 709/16/142 711/18/143
+f 708/18/144 707/13/145 709/16/146
+f 706/14/374 705/30/375 707/13/149
+f 726/24/150 725/24/376 727/22/152
+f 724/26/153 723/28/154 725/24/155
+f 722/29/394 721/26/157 723/28/158
+f 786/2/47 855/31/2 856/2/2
+f 788/32/46 786/32/47 787/35/47
+f 790/33/45 788/35/46 789/33/46
+f 792/36/44 790/34/45 791/36/45
+f 794/34/43 792/12/44 793/3/44
+f 796/35/42 794/36/43 795/12/43
+f 798/31/41 796/33/42 797/34/42
+f 800/4/40 798/2/41 799/32/41
+f 802/3/39 800/1/40 801/31/40
+f 805/8/37 803/5/38 804/3/38
+f 807/10/36 805/7/37 806/6/37
+f 809/30/35 807/9/382 808/8/36
+f 811/13/34 809/11/35 810/10/35
+f 813/15/33 811/12/34 812/30/34
+f 815/18/32 813/14/33 814/13/33
+f 817/21/31 815/17/32 816/16/32
+f 819/20/30 817/19/31 818/18/31
+f 821/23/28 819/21/29 820/19/29
+f 823/25/26 821/22/28 822/20/28
+f 825/28/24 823/24/26 824/23/26
+f 827/27/23 825/26/24 826/25/24
+f 829/29/22 827/28/23 828/26/23
+f 831/26/21 829/27/392 830/28/392
+f 833/24/19 831/25/21 832/24/21
+f 835/22/18 833/23/19 834/22/19
+f 837/19/16 835/20/17 836/21/17
+f 839/17/15 837/18/16 838/17/16
+f 841/16/14 839/16/15 840/15/15
+f 843/14/48 841/15/13 842/14/13
+f 845/12/10 843/13/11 844/12/11
+f 847/11/8 845/3/9 846/11/9
+f 849/9/385 847/10/8 848/9/8
+f 851/7/5 849/8/6 850/7/6
+f 853/5/4 851/6/5 852/5/5
+f 855/1/2 853/3/3 854/4/3
+f 835/22/50 834/22/51 836/21/52
+f 837/19/53 836/21/54 838/17/55
+f 839/17/56 838/17/57 840/15/58
+f 841/16/59 840/15/60 842/14/61
+f 843/14/62 842/14/63 844/12/64
+f 845/12/65 844/12/66 846/11/67
+f 847/11/68 846/11/69 848/9/70
+f 849/8/71 848/9/369 850/7/73
+f 851/6/74 850/7/75 852/5/76
+f 853/3/77 852/5/78 854/4/79
+f 855/31/80 854/4/81 856/2/82
+f 786/32/83 856/2/84 787/35/85
+f 788/32/370 787/35/87 789/33/88
+f 790/34/89 789/33/90 791/36/91
+f 792/12/92 791/36/93 793/3/94
+f 794/36/95 793/3/96 795/12/97
+f 796/33/98 795/12/99 797/34/100
+f 798/2/101 797/34/102 799/32/103
+f 800/1/104 799/32/105 801/31/106
+f 802/3/107 801/31/108 758/37/109
+f 758/37/110 804/37/110 802/3/111
+f 803/5/112 802/3/113 804/37/110
+f 805/8/114 804/3/115 806/6/116
+f 807/10/371 806/6/118 808/8/119
+f 809/11/120 808/8/121 810/10/122
+f 811/13/372 810/10/391 812/30/125
+f 819/20/126 818/18/127 820/19/128
+f 821/23/129 820/19/130 822/20/131
+f 823/25/132 822/20/133 824/23/134
+f 825/28/135 824/23/136 826/25/137
+f 827/28/138 826/25/139 828/26/393
+f 817/21/141 816/16/142 818/18/143
+f 815/18/144 814/13/145 816/16/146
+f 813/14/374 812/30/375 814/13/149
+f 833/24/150 832/24/376 834/22/152
+f 831/26/153 830/28/154 832/24/155
+f 829/29/394 828/26/157 830/28/158
+f 72/1/1 63/19/1 44/1/1
+f 13/26/1 14/29/1 15/28/1
+f 15/28/1 16/26/1 17/24/1
+f 17/24/1 18/22/1 13/26/1
+f 18/22/1 19/21/1 11/22/1
+f 13/26/1 18/22/1 12/24/1
+f 20/19/1 21/17/1 27/5/1
+f 21/17/1 22/14/1 26/7/1
+f 25/9/1 23/12/1 24/11/1
+f 15/28/1 17/24/1 13/26/1
+f 23/12/1 25/9/1 22/14/1
+f 12/24/1 18/22/1 11/22/1
+f 22/14/1 25/9/1 26/7/1
+f 21/17/1 26/7/1 27/5/1
+f 11/22/1 19/21/1 29/1/1
+f 19/21/1 20/19/1 28/4/1
+f 29/1/1 19/21/1 28/4/1
+f 8/16/1 9/17/1 4/9/1
+f 9/17/1 10/19/1 3/7/1
+f 3/7/1 10/19/1 2/5/1
+f 10/19/1 11/22/1 29/1/1
+f 20/19/1 27/5/1 28/4/1
+f 2/5/1 10/19/1 1/1/1
+f 6/12/1 7/14/1 8/16/1
+f 4/9/1 5/11/1 6/12/1
+f 3/7/1 4/9/1 9/17/1
+f 35/32/1 36/2/1 30/2/1
+f 36/2/1 1/1/1 29/1/1
+f 35/32/1 33/36/1 34/33/1
+f 4/9/1 6/12/1 8/16/1
+f 33/36/1 35/32/1 31/33/1
+f 33/36/1 31/33/1 32/12/1
+f 1/1/1 10/19/1 29/1/1
+f 31/33/1 35/32/1 30/2/1
+f 228/26/1 229/29/1 230/28/1
+f 230/28/1 231/26/1 232/24/1
+f 232/24/1 233/22/1 228/26/1
+f 233/22/1 234/21/1 226/22/1
+f 228/26/1 233/22/1 227/24/1
+f 235/19/1 236/17/1 242/5/1
+f 236/17/1 237/14/1 241/7/1
+f 240/9/1 238/12/1 239/11/1
+f 230/28/1 232/24/1 228/26/1
+f 238/12/1 240/9/1 237/14/1
+f 227/24/1 233/22/1 226/22/1
+f 237/14/1 240/9/1 241/7/1
+f 236/17/1 241/7/1 242/5/1
+f 226/22/1 234/21/1 244/1/1
+f 234/21/1 235/19/1 243/4/1
+f 244/1/1 234/21/1 243/4/1
+f 223/16/1 224/17/1 219/9/1
+f 224/17/1 225/19/1 218/7/1
+f 218/7/1 225/19/1 217/5/1
+f 225/19/1 226/22/1 244/1/1
+f 235/19/1 242/5/1 243/4/1
+f 217/5/1 225/19/1 216/1/1
+f 221/12/1 222/14/1 223/16/1
+f 219/9/1 220/11/1 221/12/1
+f 218/7/1 219/9/1 224/17/1
+f 250/32/1 251/2/1 245/2/1
+f 251/2/1 216/1/1 244/1/1
+f 250/32/1 248/36/1 249/33/1
+f 219/9/1 221/12/1 223/16/1
+f 248/36/1 250/32/1 246/33/1
+f 248/36/1 246/33/1 247/12/1
+f 216/1/1 225/19/1 244/1/1
+f 246/33/1 250/32/1 245/2/1
+f 347/22/1 346/24/1 340/22/1
+f 346/24/1 345/26/1 340/22/1
+f 347/22/1 340/22/1 339/21/1
+f 345/26/1 344/29/1 343/28/1
+f 343/28/1 342/26/1 341/24/1
+f 341/24/1 340/22/1 345/26/1
+f 338/19/1 337/17/1 331/5/1
+f 337/17/1 336/14/1 332/7/1
+f 333/9/1 335/12/1 334/11/1
+f 343/28/1 341/24/1 345/26/1
+f 335/12/1 333/9/1 336/14/1
+f 336/14/1 333/9/1 332/7/1
+f 347/22/1 339/21/1 329/1/1
+f 339/21/1 338/19/1 330/4/1
+f 329/1/1 339/21/1 330/4/1
+f 350/16/1 349/17/1 354/9/1
+f 349/17/1 348/19/1 355/7/1
+f 355/7/1 348/19/1 356/5/1
+f 348/19/1 347/22/1 329/1/1
+f 337/17/1 332/7/1 331/5/1
+f 331/5/1 330/4/1 338/19/1
+f 329/1/1 328/2/1 144/2/1
+f 328/2/1 327/33/1 323/32/1
+f 329/1/1 144/2/1 357/1/1
+f 327/33/1 326/12/1 325/36/1
+f 356/5/1 348/19/1 357/1/1
+f 352/12/1 351/14/1 350/16/1
+f 354/9/1 353/11/1 352/12/1
+f 355/7/1 354/9/1 349/17/1
+f 323/32/1 144/2/1 328/2/1
+f 323/32/1 325/36/1 324/33/1
+f 354/9/1 352/12/1 350/16/1
+f 325/36/1 323/32/1 327/33/1
+f 454/22/1 453/24/1 447/22/1
+f 453/24/1 452/26/1 447/22/1
+f 454/22/1 447/22/1 446/21/1
+f 452/26/1 451/29/1 450/28/1
+f 450/28/1 449/26/1 448/24/1
+f 448/24/1 447/22/1 452/26/1
+f 445/19/1 444/17/1 438/5/1
+f 444/17/1 443/14/1 439/7/1
+f 440/9/1 442/12/1 441/11/1
+f 450/28/1 448/24/1 452/26/1
+f 442/12/1 440/9/1 443/14/1
+f 443/14/1 440/9/1 439/7/1
+f 454/22/1 446/21/1 436/1/1
+f 446/21/1 445/19/1 437/4/1
+f 436/1/1 446/21/1 437/4/1
+f 457/16/1 456/17/1 461/9/1
+f 456/17/1 455/19/1 462/7/1
+f 462/7/1 455/19/1 463/5/1
+f 455/19/1 454/22/1 436/1/1
+f 444/17/1 439/7/1 438/5/1
+f 438/5/1 437/4/1 445/19/1
+f 436/1/1 435/2/1 429/2/1
+f 435/2/1 434/33/1 430/32/1
+f 436/1/1 429/2/1 464/1/1
+f 434/33/1 433/12/1 432/36/1
+f 463/5/1 455/19/1 464/1/1
+f 459/12/1 458/14/1 457/16/1
+f 461/9/1 460/11/1 459/12/1
+f 462/7/1 461/9/1 456/17/1
+f 430/32/1 429/2/1 435/2/1
+f 430/32/1 432/36/1 431/33/1
+f 461/9/1 459/12/1 457/16/1
+f 432/36/1 430/32/1 434/33/1
+f 561/22/1 560/24/1 554/22/1
+f 560/24/1 559/26/1 554/22/1
+f 561/22/1 554/22/1 553/21/1
+f 559/26/1 558/29/1 557/28/1
+f 557/28/1 556/26/1 555/24/1
+f 555/24/1 554/22/1 559/26/1
+f 552/19/1 551/17/1 545/5/1
+f 551/17/1 550/14/1 546/7/1
+f 547/9/1 549/12/1 548/11/1
+f 557/28/1 555/24/1 559/26/1
+f 549/12/1 547/9/1 550/14/1
+f 550/14/1 547/9/1 546/7/1
+f 561/22/1 553/21/1 543/1/1
+f 553/21/1 552/19/1 544/4/1
+f 543/1/1 553/21/1 544/4/1
+f 564/16/1 563/17/1 568/9/1
+f 563/17/1 562/19/1 569/7/1
+f 569/7/1 562/19/1 570/5/1
+f 562/19/1 561/22/1 543/1/1
+f 551/17/1 546/7/1 545/5/1
+f 545/5/1 544/4/1 552/19/1
+f 543/1/1 542/2/1 536/2/1
+f 542/2/1 541/33/1 537/32/1
+f 543/1/1 536/2/1 571/1/1
+f 541/33/1 540/12/1 539/36/1
+f 570/5/1 562/19/1 571/1/1
+f 566/12/1 565/14/1 564/16/1
+f 568/9/1 567/11/1 566/12/1
+f 569/7/1 568/9/1 563/17/1
+f 537/32/1 536/2/1 542/2/1
+f 537/32/1 539/36/1 538/33/1
+f 568/9/1 566/12/1 564/16/1
+f 539/36/1 537/32/1 541/33/1
+f 668/22/1 667/24/1 661/22/1
+f 667/24/1 666/26/1 661/22/1
+f 668/22/1 661/22/1 660/21/1
+f 666/26/1 665/29/1 664/28/1
+f 664/28/1 663/26/1 662/24/1
+f 662/24/1 661/22/1 666/26/1
+f 659/19/1 658/17/1 652/5/1
+f 658/17/1 657/14/1 653/7/1
+f 654/9/1 656/12/1 655/11/1
+f 664/28/1 662/24/1 666/26/1
+f 656/12/1 654/9/1 657/14/1
+f 657/14/1 654/9/1 653/7/1
+f 668/22/1 660/21/1 650/1/1
+f 660/21/1 659/19/1 651/4/1
+f 650/1/1 660/21/1 651/4/1
+f 671/16/1 670/17/1 675/9/1
+f 670/17/1 669/19/1 676/7/1
+f 676/7/1 669/19/1 677/5/1
+f 669/19/1 668/22/1 650/1/1
+f 658/17/1 653/7/1 652/5/1
+f 652/5/1 651/4/1 659/19/1
+f 650/1/1 649/2/1 643/2/1
+f 649/2/1 648/33/1 644/32/1
+f 650/1/1 643/2/1 678/1/1
+f 648/33/1 647/12/1 646/36/1
+f 677/5/1 669/19/1 678/1/1
+f 673/12/1 672/14/1 671/16/1
+f 675/9/1 674/11/1 673/12/1
+f 676/7/1 675/9/1 670/17/1
+f 644/32/1 643/2/1 649/2/1
+f 644/32/1 646/36/1 645/33/1
+f 675/9/1 673/12/1 671/16/1
+f 646/36/1 644/32/1 648/33/1
+f 775/22/1 774/24/1 768/22/1
+f 774/24/1 773/26/1 768/22/1
+f 775/22/1 768/22/1 767/21/1
+f 773/26/1 772/29/1 771/28/1
+f 771/28/1 770/26/1 769/24/1
+f 769/24/1 768/22/1 773/26/1
+f 766/19/1 765/17/1 759/5/1
+f 765/17/1 764/14/1 760/7/1
+f 761/9/1 763/12/1 762/11/1
+f 771/28/1 769/24/1 773/26/1
+f 763/12/1 761/9/1 764/14/1
+f 764/14/1 761/9/1 760/7/1
+f 775/22/1 767/21/1 757/1/1
+f 767/21/1 766/19/1 758/4/1
+f 757/1/1 767/21/1 758/4/1
+f 778/16/1 777/17/1 782/9/1
+f 777/17/1 776/19/1 783/7/1
+f 783/7/1 776/19/1 784/5/1
+f 776/19/1 775/22/1 757/1/1
+f 765/17/1 760/7/1 759/5/1
+f 759/5/1 758/4/1 766/19/1
+f 757/1/1 756/2/1 750/2/1
+f 756/2/1 755/33/1 751/32/1
+f 757/1/1 750/2/1 785/1/1
+f 755/33/1 754/12/1 753/36/1
+f 784/5/1 776/19/1 785/1/1
+f 780/12/1 779/14/1 778/16/1
+f 782/9/1 781/11/1 780/12/1
+f 783/7/1 782/9/1 777/17/1
+f 751/32/1 750/2/1 756/2/1
+f 751/32/1 753/36/1 752/33/1
+f 782/9/1 780/12/1 778/16/1
+f 753/36/1 751/32/1 755/33/1
+f 62/22/1 61/24/1 55/22/1
+f 61/24/1 60/26/1 55/22/1
+f 62/22/1 55/22/1 54/21/1
+f 60/26/1 59/29/1 58/28/1
+f 58/28/1 57/26/1 56/24/1
+f 56/24/1 55/22/1 60/26/1
+f 53/19/1 52/17/1 46/5/1
+f 52/17/1 51/14/1 47/7/1
+f 48/9/1 50/12/1 49/11/1
+f 58/28/1 56/24/1 60/26/1
+f 50/12/1 48/9/1 51/14/1
+f 51/14/1 48/9/1 47/7/1
+f 62/22/1 54/21/1 44/1/1
+f 54/21/1 53/19/1 45/4/1
+f 44/1/1 54/21/1 45/4/1
+f 65/16/1 64/17/1 69/9/1
+f 64/17/1 63/19/1 70/7/1
+f 70/7/1 63/19/1 71/5/1
+f 63/19/1 62/22/1 44/1/1
+f 52/17/1 47/7/1 46/5/1
+f 46/5/1 45/4/1 53/19/1
+f 44/1/1 43/2/1 37/2/1
+f 43/2/1 42/33/1 38/32/1
+f 44/1/1 37/2/1 72/1/1
+f 42/33/1 41/12/1 40/36/1
+f 71/5/1 63/19/1 72/1/1
+f 67/12/1 66/14/1 65/16/1
+f 69/9/1 68/11/1 67/12/1
+f 70/7/1 69/9/1 64/17/1
+f 38/32/1 37/2/1 43/2/1
+f 38/32/1 40/36/1 39/33/1
+f 69/9/1 67/12/1 65/16/1
+f 40/36/1 38/32/1 42/33/1
diff --git a/Telegram/Resources/art/premium/diamond.obj b/Telegram/Resources/art/premium/diamond.obj
new file mode 100644
index 00000000000000..b8bf01fdbfc6ab
--- /dev/null
+++ b/Telegram/Resources/art/premium/diamond.obj
@@ -0,0 +1,65 @@
+# UVs are stored raw here; the V coordinate is flipped (1-v) at load time.
+v 0 -0.750370979 0
+v 0.38727501 0.423541009 -0.803673029
+v 0.869799018 0.423541009 -0.198298007
+v 0.697345972 0.423541009 0.556400001
+v -0.000222000002 0.423541009 0.892117023
+v -0.697624028 0.423541009 0.556052029
+v -0.869700015 0.423541009 -0.198732004
+v -0.386875004 0.423541009 -0.803866029
+v 0.502963006 0.76503402 -0.40110001
+v 0.627183974 0.76503402 0.143151
+v 0.279123008 0.76503402 0.579604983
+v -0.279123008 0.76503402 0.579604983
+v -0.627183974 0.76503402 0.143151
+v -0.502963006 0.76503402 -0.40110001
+v 0 0.76503402 -0.643314004
+vt 0 0
+vn 0.645200014 -0.564999998 -0.514299989
+vn 0.804400027 -0.564999998 0.183799997
+vn 0.357800007 -0.564999998 0.743499994
+vn -0.358200014 -0.564999998 0.743300021
+vn -0.804499984 -0.564999998 0.183400005
+vn -0.644999981 -0.564999998 -0.514599979
+vn 0.000199999995 -0.564999998 -0.825100005
+vn 0.576799989 0.675100029 0.460000008
+vn 0.392500013 0.425300002 0.815500021
+vn -0 0.675100029 0.737699986
+vn -0.39289999 0.425300002 0.815299988
+vn -0.576799989 0.675100029 0.460000008
+vn -0.882399976 0.425300002 0.201199993
+vn -0.719200015 0.675100029 -0.164199993
+vn -0.707499981 0.425300002 -0.564499974
+vn -0.320100009 0.675100029 -0.664699972
+vn 0.000199999995 0.425300002 -0.905099988
+vn 0.320100009 0.675100029 -0.664699972
+vn 0.707799971 0.425300002 -0.564100027
+vn 0.719200015 0.675100029 -0.164199993
+vn 0.882300019 0.425300002 0.2016
+vn -0 1 -0
+f 3/1/1 1/1/1 2/1/1
+f 4/1/2 1/1/2 3/1/2
+f 5/1/3 1/1/3 4/1/3
+f 6/1/4 1/1/4 5/1/4
+f 7/1/5 1/1/5 6/1/5
+f 8/1/6 1/1/6 7/1/6
+f 2/1/7 1/1/7 8/1/7
+f 11/1/8 4/1/8 10/1/8
+f 5/1/9 4/1/9 11/1/9
+f 12/1/10 5/1/10 11/1/10
+f 6/1/11 5/1/11 12/1/11
+f 13/1/12 6/1/12 12/1/12
+f 7/1/13 6/1/13 13/1/13
+f 14/1/14 7/1/14 13/1/14
+f 8/1/15 7/1/15 14/1/15
+f 15/1/16 8/1/16 14/1/16
+f 2/1/17 8/1/17 15/1/17
+f 9/1/18 2/1/18 15/1/18
+f 3/1/19 2/1/19 9/1/19
+f 10/1/20 3/1/20 9/1/20
+f 3/1/21 10/1/21 4/1/21
+f 15/1/22 13/1/22 11/1/22
+f 15/1/22 14/1/22 13/1/22
+f 13/1/22 12/1/22 11/1/22
+f 11/1/22 10/1/22 9/1/22
+f 9/1/22 15/1/22 11/1/22
diff --git a/Telegram/Resources/art/premium/diamond_outer.obj b/Telegram/Resources/art/premium/diamond_outer.obj
new file mode 100644
index 00000000000000..ddb5fea680fd55
--- /dev/null
+++ b/Telegram/Resources/art/premium/diamond_outer.obj
@@ -0,0 +1,69 @@
+# UVs are stored raw here; the V coordinate is flipped (1-v) at load time.
+v 0 -1.06897998 0
+v 0.488651991 0.418583006 -1.01405394
+v 1.097489 0.418583006 -0.250209004
+v 0.879894972 0.418583006 0.702049017
+v -0.000279 0.418583006 1.12565005
+v -0.88024199 0.418583006 0.701613009
+v -1.09736502 0.418583006 -0.250752002
+v -0.488150001 0.418583006 -1.01429605
+v 0.590651989 0.937004983 -0.471022993
+v 0.734121025 0.933223009 0.167564005
+v 0.328667015 0.940138996 0.682497025
+v -0.326719999 0.933223009 0.678429008
+v -0.737766027 0.938952029 0.168384999
+v -0.588716984 0.933223009 -0.469493002
+v 4.99999987e-06 0.938952029 -0.756738007
+vt 0 0
+vn 0.646099985 -0.563300014 -0.514999986
+vn 0.805499971 -0.563300014 0.184100002
+vn 0.3583 -0.563300014 0.744499981
+vn -0.358700007 -0.563300014 0.744300008
+vn -0.805599988 -0.563300014 0.183699995
+vn -0.645900011 -0.563300014 -0.515299976
+vn 0.000199999995 -0.563300014 -0.826200008
+vn 0.600199997 0.65170002 0.463800013
+vn 0.389099985 0.441500008 0.808499992
+vn -0.0115999999 0.65170002 0.758400023
+vn -0.387100011 0.452499986 0.803300023
+vn -0.586499989 0.652400017 0.479999989
+vn -0.873899996 0.443399996 0.199200004
+vn -0.736699998 0.652400017 -0.178000003
+vn -0.697099984 0.452499986 -0.556200027
+vn -0.337399989 0.652400017 -0.678600013
+vn 0.000199999995 0.443399996 -0.896300018
+vn 0.332599998 0.650099993 -0.683099985
+vn 0.699699998 0.446500003 -0.557699978
+vn 0.739199996 0.653599977 -0.162200004
+vn 0.869300008 0.452499986 0.198599994
+vn -0.00079999998 1 -0.000600000028
+vn -0.0159000009 0.999800026 -0.0126999998
+vn -0.0107000005 0.99970001 0.0197999999
+vn 0.0190999992 0.999800026 0.00159999996
+vn 0.00419999985 1 -0.00179999997
+f 3/1/1 1/1/1 2/1/1
+f 4/1/2 1/1/2 3/1/2
+f 5/1/3 1/1/3 4/1/3
+f 6/1/4 1/1/4 5/1/4
+f 7/1/5 1/1/5 6/1/5
+f 8/1/6 1/1/6 7/1/6
+f 2/1/7 1/1/7 8/1/7
+f 11/1/8 4/1/8 10/1/8
+f 5/1/9 4/1/9 11/1/9
+f 12/1/10 5/1/10 11/1/10
+f 6/1/11 5/1/11 12/1/11
+f 13/1/12 6/1/12 12/1/12
+f 7/1/13 6/1/13 13/1/13
+f 14/1/14 7/1/14 13/1/14
+f 8/1/15 7/1/15 14/1/15
+f 15/1/16 8/1/16 14/1/16
+f 2/1/17 8/1/17 15/1/17
+f 9/1/18 2/1/18 15/1/18
+f 3/1/19 2/1/19 9/1/19
+f 10/1/20 3/1/20 9/1/20
+f 3/1/21 10/1/21 4/1/21
+f 15/1/22 13/1/22 11/1/22
+f 15/1/23 14/1/23 13/1/23
+f 13/1/24 12/1/24 11/1/24
+f 11/1/25 10/1/25 9/1/25
+f 9/1/26 15/1/26 11/1/26
diff --git a/Telegram/Resources/art/premium/diamond_outer_2.obj b/Telegram/Resources/art/premium/diamond_outer_2.obj
new file mode 100644
index 00000000000000..4b6a514df52961
--- /dev/null
+++ b/Telegram/Resources/art/premium/diamond_outer_2.obj
@@ -0,0 +1,65 @@
+# UVs are stored raw here; the V coordinate is flipped (1-v) at load time.
+v -0 -1.13013005 -0
+v 0.517108977 0.416763991 -1.07310998
+v 1.16140401 0.416763991 -0.264780998
+v 0.931137979 0.416763991 0.742933989
+v -0.000293999998 0.416763991 1.19120395
+v -0.931505024 0.416763991 0.74247402
+v -1.161273 0.416763991 -0.265354991
+v -0.516578972 0.416763991 -1.07336605
+v 0.618188977 0.991851985 -0.492980987
+v 0.770861983 0.991851985 0.175951004
+v 0.343059987 0.991851985 0.712387979
+v -0.34307301 0.991851985 0.712382019
+v -0.770865023 0.991851985 0.175937995
+v -0.618179977 0.991851985 -0.492991
+v 7.0000001e-06 0.991851985 -0.790687978
+vt 0 0
+vn 0.642499983 -0.569999993 -0.512099981
+vn 0.800999999 -0.569999993 0.182999998
+vn 0.356299996 -0.569999993 0.7403
+vn -0.356700003 -0.569999993 0.740199983
+vn -0.801100016 -0.569999993 0.182600006
+vn -0.642199993 -0.569999993 -0.512399971
+vn 0.000199999995 -0.569999993 -0.82160002
+vn 0.600799978 0.639900029 0.479200006
+vn 0.389200002 0.441000015 0.808700025
+vn -0 0.639900029 0.76849997
+vn -0.389600009 0.441000015 0.808499992
+vn -0.600799978 0.639900029 0.479099989
+vn -0.875100017 0.441000015 0.199499995
+vn -0.749199986 0.639900029 -0.171000004
+vn -0.701600015 0.441000015 -0.559800029
+vn -0.333400011 0.639900029 -0.692399979
+vn 0.000199999995 0.441000015 -0.897499979
+vn 0.333400011 0.639900029 -0.692399979
+vn 0.701900005 0.441000015 -0.559400022
+vn 0.749199986 0.639900029 -0.171000004
+vn 0.875 0.441000015 0.199900001
+vn -0 1 -0
+f 2/1/1 3/1/1 1/1/1
+f 3/1/2 4/1/2 1/1/2
+f 4/1/3 5/1/3 1/1/3
+f 5/1/4 6/1/4 1/1/4
+f 6/1/5 7/1/5 1/1/5
+f 7/1/6 8/1/6 1/1/6
+f 8/1/7 2/1/7 1/1/7
+f 10/1/8 11/1/8 4/1/8
+f 11/1/9 5/1/9 4/1/9
+f 11/1/10 12/1/10 5/1/10
+f 12/1/11 6/1/11 5/1/11
+f 12/1/12 13/1/12 6/1/12
+f 13/1/13 7/1/13 6/1/13
+f 13/1/14 14/1/14 7/1/14
+f 14/1/15 8/1/15 7/1/15
+f 14/1/16 15/1/16 8/1/16
+f 15/1/17 2/1/17 8/1/17
+f 15/1/18 9/1/18 2/1/18
+f 9/1/19 3/1/19 2/1/19
+f 9/1/20 10/1/20 3/1/20
+f 4/1/21 3/1/21 10/1/21
+f 10/1/22 14/1/22 12/1/22
+f 14/1/22 9/1/22 15/1/22
+f 12/1/22 14/1/22 13/1/22
+f 10/1/22 12/1/22 11/1/22
+f 14/1/22 10/1/22 9/1/22
diff --git a/Telegram/Resources/art/premium/flecks.png b/Telegram/Resources/art/premium/flecks.png
new file mode 100644
index 00000000000000..b6695a1690d98b
Binary files /dev/null and b/Telegram/Resources/art/premium/flecks.png differ
diff --git a/Telegram/Resources/art/premium/star.obj b/Telegram/Resources/art/premium/star.obj
new file mode 100644
index 00000000000000..a8cc84093cbe64
--- /dev/null
+++ b/Telegram/Resources/art/premium/star.obj
@@ -0,0 +1,18251 @@
+# 3D mesh decoded from .binobj (source of truth; baked back to .binobj at build time).
+# UVs are stored raw here; the V coordinate is flipped (1-v) at load time.
+v -0.103200004 27.3429031 -4.3691349
+v -0.921007991 26.3249779 -4.0468359
+v -1.15358305 25.2562637 -3.71698189
+v 1.35340703 -0.495142013 6.66928196
+v 2.39414907 -0.386483014 6.65102386
+v 0.908179998 25.9860134 -3.933182
+v 0.319952995 -0.126155004 0.0581469983
+v 2.24310994 -0.360754013 0.0373330005
+v 1.27218997 -0.462208986 0.0514319986
+v 1.52056897 23.8180561 -3.28783703
+v -0.0233730003 24.1532192 -3.37743497
+v 0.44908601 22.0349197 -2.7895081
+v 1.82794702 21.981329 -2.79083395
+v 2.74957609 23.3583279 -3.18677402
+v -1.35894597 23.7580318 -3.27873397
+v -2.277457 22.5031452 -2.954427
+v -1.12660396 21.833147 -2.7500701
+v 3.6192441 22.423378 -2.96252704
+v 4.60329008 21.5523701 -2.77907705
+v 3.34760809 21.1011372 -2.60858297
+v 4.62258911 20.4319897 -2.49855399
+v 3.03088188 24.3124313 -3.469908
+v 2.22142696 20.3826752 -2.39483094
+v 0.606887996 19.4607296 -2.15617204
+v -0.473601013 20.4358139 -2.39049006
+v -2.21846604 20.6159992 -2.46739197
+v -3.7702539 21.0314808 -2.63148499
+v -3.93886399 19.3480301 -2.23449707
+v -4.77740383 20.4333534 -2.53670001
+v -4.06157684 22.4211273 -3.00376797
+v 3.75344801 19.2794037 -2.18492699
+v 3.59288096 17.7471294 -1.84488297
+v 5.08681917 17.836401 -1.93500805
+v 1.80748403 18.4209061 -1.936373
+v 0.697205007 17.4671135 -1.72268605
+v -0.602970004 18.3546829 -1.91194403
+v -1.89323294 17.4733009 -1.75009894
+v -1.992226 19.3772278 -2.16730809
+v -3.21656799 18.1033173 -1.92638302
+v -4.5995698 17.6358089 -1.89436901
+v 4.001369 16.1750908 -1.54841805
+v 2.79484797 15.0578089 -1.29774499
+v 2.55327511 16.807003 -1.61812794
+v 5.26112509 14.7151604 -1.34512603
+v 5.29022884 15.966732 -1.57381201
+v 1.31580698 15.2467661 -1.299402
+v -0.343216985 15.921998 -1.41818404
+v -1.82915902 14.9054928 -1.25853503
+v -2.93170905 16.2269573 -1.53500605
+v -3.88161707 15.235177 -1.39364302
+v -5.38371897 17.02108 -1.81944203
+v -7.46859217 14.5915432 -1.52851796
+v -5.25357294 15.5123215 -1.52008295
+v 6.66723394 13.2908916 -1.20574999
+v 4.98189783 12.6522007 -0.999445975
+v 3.71888804 13.727396 -1.10562599
+v 3.12408209 12.009758 -0.824706018
+v 1.62712705 13.4317389 -1.00058806
+v 1.94071496 11.9230566 -0.782513976
+v 0.107428998 12.4078054 -0.833989978
+v -0.498650998 14.0592155 -1.092538
+v -1.98063397 13.1559858 -0.974731982
+v -4.31356812 14.0368643 -1.20818305
+v -3.67241192 12.8179045 -0.986639023
+v -6.35899305 13.6603518 -1.28202796
+v -5.48161316 12.5572758 -1.04827499
+v 5.67541218 11.1304312 -0.828876019
+v 7.07975483 11.3040562 -0.952576995
+v 8.28427124 9.593503 -0.846688986
+v 4.07553005 11.528307 -0.797245979
+v 3.2458539 10.3038387 -0.606781006
+v 0.763613999 10.3628311 -0.563097
+v -0.949016988 11.3249922 -0.693311989
+v -2.484375 11.0020227 -0.68542701
+v -0.879643977 9.68631172 -0.492121011
+v -4.0710392 11.2828169 -0.786907971
+v -4.36267519 9.91420555 -0.633979023
+v -6.28450918 10.8585939 -0.87371099
+v -6.20007801 9.43526554 -0.699660003
+v 19.1762905 8.21221256 -2.42608809
+v 17.2106743 8.93722439 -2.08353305
+v 17.8393383 7.18965721 -2.045398
+v 17.5056934 9.81051922 -2.24247408
+v 14.9987526 8.91669846 -1.66740894
+v 16.7387066 7.96679306 -1.89363003
+v 14.9046783 7.55504322 -1.51925004
+v 15.8654985 10.1021051 -1.95711398
+v 14.9067698 9.83474255 -1.75547802
+v 13.2855387 8.00247765 -1.29907799
+v 13.2114506 9.24208546 -1.41322899
+v 10.6433277 9.60744286 -1.10127401
+v 11.9312611 8.28133488 -1.12866795
+v 10.4957619 7.18926811 -0.846327007
+v 12.1121759 10.6919651 -1.42256904
+v 9.05832672 8.10255814 -0.769194007
+v 7.58985901 8.15517235 -0.637099981
+v 6.08414602 8.99944878 -0.604354024
+v 6.06626177 6.80268717 -0.402478009
+v 2.62062001 9.05187988 -0.446431011
+v 4.76029491 9.3608408 -0.565549016
+v 4.52878523 7.223423 -0.346491992
+v 2.95722795 7.40674782 -0.299845994
+v 1.19183898 8.18444347 -0.33236599
+v -0.883956015 8.43158531 -0.360514998
+v -2.05778503 7.09779406 -0.263130993
+v -0.588746011 6.88110685 -0.217985004
+v -3.02394795 9.06397724 -0.478347003
+v -3.08403492 7.80807686 -0.359577
+v -4.69250202 8.15307903 -0.467774004
+v -5.97427177 7.73551607 -0.512925029
+v -7.61051893 9.27994633 -0.799959004
+v -7.47149992 7.81745195 -0.643091977
+v -9.18087673 7.73124599 -0.804193974
+v -9.08691788 9.66987801 -0.990090013
+v -11.1588287 8.80176353 -1.14762795
+v -12.7797947 7.79362917 -1.28202403
+v -11.5048513 10.0253878 -1.33176506
+v -14.2737961 9.3977356 -1.68808496
+v -14.3276119 8.14106083 -1.56738496
+v -12.9711905 10.0605717 -1.550946
+v -15.7932014 9.01541519 -1.92005396
+v -15.6833401 7.57456493 -1.75667405
+v -17.6089993 9.27209854 -2.31149602
+v -17.1405354 7.34633112 -2.0243361
+v -15.3687878 10.2190533 -1.97768998
+v -16.6459656 9.92490768 -2.18950891
+v -18.6934814 8.2018404 -2.43712306
+v -20.2231522 8.51864433 -2.8284409
+v -21.6097908 7.97957802 -3.126405
+v -19.8975487 6.91571617 -2.60182595
+v -19.5571194 9.49830627 -2.7754159
+v 25.4143906 5.3156662 -3.8357439
+v 26.2277164 7.10243082 -4.22346401
+v 26.8470345 5.15573883 -4.274652
+v 27.6434803 6.75901604 -4.65223122
+v 28.4580956 4.90066814 -4.79706621
+v 23.3479881 6.12165499 -3.29312992
+v 24.5395184 6.83877516 -3.68734694
+v 23.7168846 4.32680988 -3.28169608
+v 21.8380337 5.79849911 -2.86493611
+v 19.6677761 6.07402897 -2.35688996
+v 20.3361359 4.61247301 -2.42117596
+v 20.740778 7.60299587 -2.73566508
+v 22.0305634 7.56259108 -3.0586741
+v 18.4200401 5.18884706 -2.01877904
+v 16.5529194 6.11881495 -1.70363402
+v 14.8239202 5.88341713 -1.37420905
+v 16.9528065 4.3567791 -1.67256296
+v 13.4763432 6.16437483 -1.17450094
+v 13.3922567 4.7187891 -1.06891799
+v 11.5919857 5.63556719 -0.868534982
+v 12.2890911 6.69355202 -1.04037797
+v 8.96886921 6.21057892 -0.602680981
+v 7.2803278 5.89982224 -0.424638003
+v 7.9059701 4.56241083 -0.397798985
+v 10.0228462 5.03924799 -0.638373971
+v 5.39853096 5.27442312 -0.25397101
+v 2.94959593 5.6337471 -0.165178999
+v 4.02324104 4.88337088 -0.159137994
+v 1.25966001 6.24080276 -0.170030996
+v 0.967519999 4.87861776 -0.0803769976
+v -0.579460979 5.28710699 -0.107152
+v -2.15438294 4.97580194 -0.117358997
+v -3.39158392 6.04632711 -0.228102997
+v -4.77090693 5.89604187 -0.286538005
+v -6.79539013 6.67519999 -0.486568987
+v -6.23920918 5.29924822 -0.348549008
+v -9.66063499 5.66563988 -0.696901023
+v -8.47331047 6.53768682 -0.631338
+v -8.17352104 5.30375099 -0.514325023
+v -11.6005621 5.58136797 -0.937345982
+v -10.7297745 6.99179077 -0.924588025
+v -13.3072166 6.14973688 -1.23126698
+v -14.5951643 4.90956688 -1.36424899
+v -14.6979733 6.27665901 -1.47200596
+v -12.5047722 4.36283207 -0.995095015
+v -16.8713799 5.93999815 -1.85755205
+v -18.909626 6.61166382 -2.3457799
+v -17.8049088 5.0277319 -1.99291897
+v -18.9879856 4.52020693 -2.22634006
+v -21.1963215 6.37303305 -2.87996697
+v -20.2629242 5.32396317 -2.57394195
+v -22.0498791 5.01730108 -3.01108408
+v -24.2135201 7.09057999 -3.769274
+v -22.9778156 7.41639805 -3.44165492
+v -24.0039062 5.2480278 -3.57057595
+v -27.7297764 5.01402807 -4.73546124
+v -27.9401054 6.25595284 -4.89501381
+v -26.0507202 6.93858814 -4.32019281
+v -25.8620167 5.95949793 -4.18356705
+v -27.550972 7.52548695 -4.86907482
+v -28.7873631 6.66102123 -5.2234602
+v 23.6560001 3.1396451 -3.21068192
+v 22.1079178 2.27198005 -2.7658689
+v 25.7698536 3.01008391 -3.82838011
+v 23.2633305 1.10647202 -3.05126595
+v 24.3142872 1.87100005 -3.36128497
+v 21.5654659 3.66457891 -2.6760819
+v 21.3151817 1.57086504 -2.5447681
+v 19.4709377 3.18303609 -2.15148711
+v 18.0024452 2.69501495 -1.81452799
+v 15.4936447 4.33419609 -1.39728498
+v 16.396698 2.41539502 -1.485605
+v 13.8888884 3.48490405 -1.08691204
+v 13.2754335 2.18011808 -0.947542012
+v 10.5219059 4.09535408 -0.646643996
+v 11.4814472 3.357337 -0.731684983
+v 9.09394169 3.61698389 -0.466325015
+v 9.54481506 1.99833906 -0.460108012
+v 6.184587 3.80081797 -0.225188002
+v 7.43821716 2.31510901 -0.266801
+v 4.39028597 2.80345201 -0.081629999
+v 2.62010789 3.32562494 -0.0338330008
+v 1.17141998 3.29892111 -0.00690799998
+v 1.19206595 2.08799696 0.0298629999
+v -1.090469 3.73045802 -0.0300089996
+v -1.926983 2.56307602 -0.00644099992
+v -0.308690995 1.88306701 0.0380120017
+v -1.86860502 1.01496005 0.0295170005
+v -0.261139989 0.0881669968 0.0585040003
+v -1.20280099 -0.531994998 0.0456169993
+v -3.49317789 3.64412403 -0.0982669964
+v -5.02210999 3.72200108 -0.181435004
+v -3.50149202 1.59302199 -0.0344379991
+v -4.76650286 1.79001498 -0.103890002
+v -5.30865383 -0.305738002 -0.119378999
+v -3.27022004 -0.262454003 -0.0116729997
+v -6.31711102 3.72494888 -0.270437002
+v -5.91411114 1.61661398 -0.173546001
+v -6.98330402 -0.0697600022 -0.243351996
+v -9.38346958 4.04633093 -0.574903011
+v -7.66356087 3.52681589 -0.373573005
+v -9.08390236 2.52737308 -0.482127994
+v -8.07574654 1.66842496 -0.35699001
+v -8.22090054 0.273304999 -0.357295007
+v -9.92778873 0.559773982 -0.542725027
+v -10.4023142 3.47512794 -0.668170989
+v -11.9725771 2.58156705 -0.847478986
+v -10.9733772 1.61875296 -0.686062992
+v -13.4073725 3.0833261 -1.079983
+v -14.6994381 2.16719699 -1.26877105
+v -16.5223694 4.37357712 -1.692788
+v -15.6228142 3.11367989 -1.46302199
+v -19.3237343 3.17529607 -2.2413919
+v -17.8003197 2.8005271 -1.88756096
+v -22.1705475 2.94527102 -2.942204
+v -20.4190578 3.50489712 -2.51535106
+v -20.52808 1.67226803 -2.484442
+v -25.9737339 4.02642679 -4.10149002
+v -24.6692543 2.74815989 -3.64665508
+v -24.2526131 3.84803796 -3.5672729
+v -23.1269035 3.49973297 -3.226861
+v -25.1500511 1.26954603 -3.75615096
+v -23.5926476 1.14551795 -3.293643
+v -22.416666 0.497114986 -2.95901895
+v 20.3215542 0.311578989 -2.29029012
+v 21.2750225 -0.564773977 -2.52464199
+v 20.5514011 -1.96860802 -2.36681795
+v 22.0743179 -0.862363994 -2.72911501
+v 19.2253761 1.38618898 -2.04932308
+v 18.2390079 -0.0835150033 -1.82015705
+v 15.3602161 1.64417601 -1.27852201
+v 17.0520706 0.887130976 -1.58290505
+v 16.0576 -0.190346003 -1.38883901
+v 14.2137804 0.500478983 -1.06937802
+v 12.6124153 0.845857024 -0.827893019
+v 12.6232643 -0.750437021 -0.826328993
+v 11.3617878 0.796414018 -0.654711008
+v 9.94986153 0.646207988 -0.483934999
+v 7.55075312 1.12820005 -0.25228399
+v 8.59401608 0.224720001 -0.340604991
+v 3.99498892 0.61848402 -0.0216739997
+v 3.0823431 1.582847 -9.60000034e-05
+v 2.57922506 0.330246001 0.0286689997
+v 5.70795918 1.75289905 -0.128622994
+v 5.96218109 -0.186343998 -0.126115993
+v -11.878005 -0.235916004 -0.792636991
+v -12.8229198 1.188887 -0.940997005
+v -12.0578556 -1.20025802 -0.826870978
+v -10.4335203 -1.47012305 -0.614951015
+v -11.3937407 -2.30114007 -0.759109974
+v -9.46112347 -0.454571992 -0.488146991
+v -9.06811523 -1.26758099 -0.453530997
+v -8.06685066 -0.744117975 -0.345391989
+v -7.23132801 -1.194363 -0.273972005
+v -14.2815132 0.52353698 -1.16867101
+v -13.7912645 -1.45230305 -1.09783995
+v -15.0140953 -0.93344301 -1.30014896
+v -16.2891006 0.85532701 -1.53698301
+v -20.7962933 0.460480988 -2.53694201
+v -19.0213203 -0.0830340013 -2.11081195
+v -18.1447392 1.32556498 -1.92563605
+v -16.1716423 -1.43168795 -1.522802
+v -17.4901428 -1.09929895 -1.78180897
+v -17.1104546 -2.96643806 -1.75017297
+v -15.0019617 -2.79238796 -1.339643
+v -21.026556 -0.851534009 -2.59700394
+v -19.3057289 -1.46274805 -2.18810201
+v -18.5152168 -2.857481 -2.04534698
+v 19.0905743 -1.04003 -2.01337194
+v 18.1409454 -1.96960998 -1.82313395
+v 18.8988457 -3.03661895 -2.01833296
+v 17.7950649 -4.88061905 -1.86784399
+v 18.9613056 -4.30681992 -2.08760691
+v 16.5446529 -1.60656095 -1.49609601
+v 14.9347134 -2.52389789 -1.22440803
+v 16.9191742 -3.46561909 -1.62112105
+v 14.5311384 -1.04911804 -1.12540698
+v 12.9145145 -2.30740309 -0.897356987
+v 11.4971733 -1.63132906 -0.683526993
+v 10.1507912 -2.96339893 -0.553018987
+v 9.52041054 -1.11213803 -0.44005999
+v 7.53227806 -2.62286401 -0.281776011
+v 9.17799854 -3.20089197 -0.456515998
+v 7.11939096 -1.09715402 -0.215669006
+v 5.13839483 -1.72393596 -0.0929140002
+v 15.6835155 -4.85057497 -1.45544195
+v 13.7792053 -4.21426296 -1.09942698
+v 11.9057245 -3.43528008 -0.790982008
+v 12.2174044 -4.8264122 -0.901234984
+v 10.5060244 -5.4221139 -0.71419102
+v 8.80543709 -5.00833797 -0.503000975
+v 5.4364109 -3.28254104 -0.154492006
+v 7.29063702 -4.32694101 -0.331315011
+v 6.168437 -5.44653511 -0.308795989
+v 13.7548494 -6.21399784 -1.21724606
+v 12.8568745 -7.65973711 -1.19848096
+v 15.2558689 -7.73570013 -1.59149504
+v 15.6119537 -5.97117901 -1.51545501
+v 11.5215149 -6.68387699 -0.929253995
+v 8.65897083 -6.49530697 -0.588458002
+v 9.47611713 -7.61034584 -0.762938023
+v 6.613276 -7.09380102 -0.460979998
+v 5.26470184 -6.79326677 -0.34888199
+v 5.19218206 -8.30712223 -0.476339012
+v 4.16771984 -5.745152 -0.215999007
+v 3.33352709 -7.41615915 -0.308838993
+v 2.21434402 -6.04320288 -0.169577003
+v 1.179497 -5.78369617 -0.135966003
+v 0.831822991 -7.50329924 -0.263597012
+v 0.227923006 -4.75573206 -0.0690409988
+v -0.382685989 -6.78902817 -0.205317006
+v -2.49471092 -7.21869421 -0.282615989
+v -2.81189489 -6.52072001 -0.240222007
+v -4.29723597 -7.27742815 -0.365395993
+v -4.80641794 -8.4359417 -0.496362001
+v -1.46493399 -5.68212605 -0.143261001
+v 13.1180115 -9.50669956 -1.42211103
+v 14.7760286 -8.6173296 -1.59463298
+v 14.4625549 -9.85966778 -1.677302
+v 11.2358007 -8.59878063 -1.06310904
+v 10.9477568 -10.4784126 -1.23498499
+v 9.71778965 -9.53539753 -0.982052982
+v 7.90276003 -8.63293839 -0.704589009
+v 8.22870255 -10.2505512 -0.913016021
+v 6.79298306 -8.90179825 -0.642383993
+v 5.3426342 -9.83947372 -0.646700978
+v 3.78415608 -8.89529133 -0.466475993
+v 2.3529911 -9.10283947 -0.439485013
+v 3.72947311 -11.0496683 -0.710942984
+v 1.27381206 -9.57064247 -0.47251001
+v 0.142765 -10.8763618 -0.620083988
+v -0.651701987 -9.45103931 -0.456135005
+v -1.02323997 -8.04366016 -0.319507986
+v -2.79266095 -8.991189 -0.458166987
+v -2.55993104 -10.8328342 -0.661082983
+v -4.34807205 -10.4458561 -0.689980984
+v -5.88332987 -9.6232872 -0.692873001
+v -7.484828 -9.57244778 -0.816106021
+v -8.72431755 -9.30804253 -0.908766985
+v -9.132164 -10.5111923 -1.09033799
+v -6.78611279 -8.25774479 -0.619984984
+v 14.2080889 -11.0240154 -1.77668202
+v 13.6791382 -12.3169355 -1.86837101
+v 12.2325706 -10.9567833 -1.467273
+v 15.7889662 -11.9361687 -2.17519903
+v 11.2743425 -12.3537388 -1.52782595
+v 8.12127972 -12.2961245 -1.17094398
+v 9.3774786 -11.414135 -1.17511594
+v 6.16063499 -10.8844967 -0.823018014
+v 6.61492491 -12.1416683 -1.02451205
+v 4.71689081 -12.7418537 -0.992026985
+v 1.58925903 -11.4008837 -0.698890984
+v -0.0282029994 -12.8803921 -0.896893978
+v 2.14763999 -12.6837034 -0.888661981
+v -1.28842795 -11.7029829 -0.742304981
+v -3.2696929 -12.6827869 -0.940001011
+v -4.56699991 -12.5195017 -0.980868995
+v -5.82995701 -11.477664 -0.915288985
+v -6.95950079 -10.7322731 -0.907122016
+v -6.8839221 -12.5366278 -1.14418495
+v -8.48483944 -11.6203537 -1.165573
+v -10.2188606 -12.0131245 -1.41388404
+v 14.1495399 -13.4361181 -2.11444592
+v 14.2654743 -14.8009682 -2.36131001
+v 12.4209614 -13.9161148 -1.92639399
+v 12.6854706 -15.4711599 -2.23499608
+v 16.0683537 -13.3547621 -2.43867898
+v 10.9072762 -13.8236208 -1.70759106
+v 7.81717777 -14.5004549 -1.48981595
+v 9.25040054 -13.4314203 -1.453632
+v 9.53606701 -15.1670218 -1.77446902
+v 6.47152996 -13.8291168 -1.27009106
+v 4.48588991 -14.2855511 -1.22335398
+v 6.04056501 -15.3985252 -1.50902104
+v 3.1284709 -13.324975 -1.01341701
+v 2.43380809 -15.6314917 -1.38133705
+v 4.46839905 -15.8333197 -1.49492598
+v 0.273099005 -14.4017954 -1.13891494
+v 1.54110599 -14.5590754 -1.175174
+v -1.47141504 -13.631835 -1.03013206
+v -3.04352689 -14.0964565 -1.15144801
+v -5.11445713 -15.0214977 -1.41477501
+v -3.0326519 -15.5482044 -1.40330803
+v -5.5099659 -13.7838907 -1.23269296
+v -7.06221914 -14.5538101 -1.47998095
+v -8.78705788 -13.3347883 -1.44479203
+v -8.69752026 -14.9034023 -1.69600797
+v -10.6589603 -14.2267332 -1.80927503
+v -12.5306511 -14.1244488 -2.056072
+v -14.1781635 -14.5053167 -2.38503003
+v -14.6464787 -15.5542402 -2.65398693
+v -13.7482996 -12.6380434 -2.01424289
+v -12.3521795 -12.5083418 -1.77405202
+v 16.0604229 -16.8708019 -3.07112789
+v 14.6395483 -16.1598587 -2.67446089
+v 16.9028034 -17.6134052 -3.38749003
+v 14.6431408 -17.6808052 -2.9814899
+v 16.0443554 -15.3315086 -2.77205205
+v 12.8288946 -16.8999748 -2.52873492
+v 10.9868879 -16.089653 -2.116009
+v 9.57514381 -17.0131741 -2.13050604
+v 11.5168943 -18.1742439 -2.60813594
+v 7.74642515 -16.0791111 -1.76725304
+v 8.06365013 -17.6512318 -2.10678101
+v 5.5719471 -17.004858 -1.78217101
+v 5.56963921 -18.2187614 -2.033674
+v 0.631785989 -16.077776 -1.43989396
+v 1.90420306 -17.627079 -1.75854897
+v -0.0286689997 -17.6903133 -1.75847602
+v 3.72245002 -16.6914368 -1.627599
+v 3.734725 -18.1843166 -1.93319702
+v 4.3674612 -19.7308903 -2.30876207
+v 2.96279812 -19.291111 -2.14994097
+v 3.07927895 -20.701889 -2.48856711
+v -1.02346504 -15.9096861 -1.41557002
+v -2.53091311 -16.7860413 -1.62002695
+v -1.51742399 -18.0206852 -1.84599304
+v -4.32347202 -16.6732712 -1.67729199
+v -3.07970905 -18.1298237 -1.91672802
+v -4.71279907 -18.1234818 -1.99502003
+v -4.45513582 -19.4490376 -2.27443194
+v -2.89986992 -20.0301304 -2.33812308
+v -1.39594698 -19.0287819 -2.06301188
+v -5.87304688 -16.3618145 -1.71368301
+v -6.62253618 -17.6965008 -2.03812099
+v -7.98806 -16.1757908 -1.85610402
+v -9.17375565 -17.5915165 -2.263134
+v -10.4517422 -16.1695042 -2.1308949
+v -11.6243258 -17.585989 -2.57217407
+v -12.1042833 -15.7680807 -2.28181195
+v -12.9912767 -16.0091133 -2.46087408
+v -14.6535149 -16.9960899 -2.93505907
+v -15.9583302 -16.5150452 -3.08253503
+v -15.6069365 -18.2095776 -3.36613488
+v 16.2621136 -18.6075268 -3.47795796
+v 16.6745262 -20.4782295 -3.99699211
+v 14.8774519 -19.8416424 -3.50678301
+v 17.5993748 -18.8581657 -3.80418611
+v 17.850338 -20.8660641 -4.33886719
+v 13.4275093 -18.8743057 -3.04164505
+v 13.1623735 -20.1884518 -3.30738211
+v 11.6950455 -19.5935345 -2.95293498
+v 9.93765736 -20.4550438 -2.9351449
+v 9.73602676 -18.8649616 -2.54165101
+v 5.80282211 -19.496418 -2.33504605
+v 7.39765978 -18.5442734 -2.24153304
+v 8.08023167 -19.7743797 -2.57905602
+v 5.42797279 -20.9180241 -2.65249395
+v 4.27051878 -21.4665127 -2.7285471
+v 7.04268694 -20.8697968 -2.75446105
+v -5.93416023 -19.6743565 -2.42195892
+v -7.90481615 -19.1019268 -2.45755196
+v -8.21887302 -20.8767223 -2.91094303
+v -10.3832998 -19.0015488 -2.71259093
+v -11.152276 -20.5581703 -3.18227506
+v -13.5507517 -18.4678707 -3.05543399
+v -12.3468752 -19.7095242 -3.14847708
+v -13.7104111 -20.5152397 -3.56263995
+v -16.7999268 -19.0956688 -3.80140495
+v -15.2460957 -19.6939411 -3.63519692
+v 15.5391617 -21.1278267 -3.94470596
+v 15.765173 -22.3612633 -4.30993414
+v 13.3334846 -21.6337471 -3.6962781
+v 13.9225082 -23.1135597 -4.19176197
+v 8.55993462 -21.9700451 -3.17293191
+v 10.1352072 -22.430582 -3.46691298
+v 11.5374537 -20.8967514 -3.24591994
+v 12.0021276 -22.4090767 -3.70304608
+v 9.09270191 -23.4783669 -3.63975191
+v 7.62714577 -22.9169559 -3.34037304
+v 10.7943058 -23.8013535 -3.92784405
+v 10.251894 -25.0662937 -4.23714018
+v 12.4150047 -24.4856415 -4.35124493
+v -9.81721878 -22.1631222 -3.42026997
+v -9.7818737 -20.7111073 -3.04444504
+v -8.24162102 -22.850605 -3.4308269
+v -6.43650389 -20.7334423 -2.71496296
+v -9.05435658 -24.1277161 -3.87957501
+v -7.30040693 -23.1729889 -3.43012309
+v -8.53522491 -24.3704605 -3.89513898
+v -11.8511553 -22.120573 -3.68104911
+v -10.338089 -23.5482578 -3.86586595
+v -11.8393335 -24.4337502 -4.32958889
+v -10.1477852 -25.2198048 -4.33750916
+v -13.3572903 -21.8395214 -3.84007907
+v -15.1118946 -21.2683086 -3.99934196
+v -17.0373154 -22.341711 -4.66399002
+v -16.7784786 -20.7633591 -4.19853306
+v -15.4640741 -23.1780949 -4.58099604
+v 14.1758385 -24.5853386 -4.66160011
+v 15.595583 -23.7772217 -4.67591619
+v 15.7133503 -25.3328609 -5.16469097
+v 17.1490784 -23.6643124 -4.948174
+v 14.3139048 -25.9189262 -5.09661198
+v 12.6720552 -26.1794319 -4.91265583
+v 15.8824844 -26.8484344 -5.68291998
+v 17.0790863 -26.9030724 -5.94176579
+v -13.3074675 -24.0089626 -4.43239307
+v -14.3843365 -23.1338081 -4.36844397
+v -15.0474091 -24.6123276 -4.92084312
+v -16.5027828 -25.0028305 -5.324646
+v -14.0328264 -25.9082203 -5.13549185
+v -12.1430159 -26.1432114 -4.90173197
+v -15.575489 -26.0824089 -5.478302
+v -16.2121468 -26.9157352 -5.87530994
+v -6.34078789 -22.5878983 -3.18717003
+v -4.894907 -21.893671 -2.89973402
+v -6.69215107 -23.388195 -3.43773198
+v -3.45876193 -21.593998 -2.7494359
+v -3.87467408 -20.4591408 -2.48303008
+v -1.00711501 -20.2852917 -2.34737992
+v -12.5227528 -26.8569412 -5.19280005
+v -14.0195255 -27.612812 -5.69475985
+v -10.4385462 -25.6468754 -4.50406408
+v -13.0060406 -27.3486919 -5.43563795
+v -8.35952854 -24.4331951 -3.89388609
+v -10.6950436 -25.9752197 -4.64451599
+v -11.2187653 -28.5037479 0.699948013
+v -13.6669645 -29.940876 -0.131308004
+v -8.56880665 -26.8968449 1.72714305
+v -13.7127771 -29.9622478 0.072976999
+v -11.3209925 -28.5562439 0.921891987
+v -6.19265795 -25.439743 2.39766097
+v -3.46832395 -23.8039894 2.97260809
+v -5.7401228 -25.1753883 2.24547696
+v -3.44415808 -23.7958813 2.76684189
+v -17.3482399 -31.4109631 -1.35211599
+v -18.0155087 -31.3232098 -1.41836596
+v -16.52425 -31.282341 -1.110798
+v -17.3952446 -31.4396687 -1.100811
+v -18.0486717 -31.3424416 -1.17210495
+v -16.5864334 -31.2986698 -0.802726984
+v -13.7061977 -29.9630127 0.0475619994
+v -15.3500299 -30.8177299 -0.749695003
+v -19.8008919 -30.2679691 -1.48175097
+v -20.2530174 -29.7181625 -1.41095805
+v -20.2684097 -29.7640247 -1.20224297
+v -19.2645912 -30.7312546 -1.49226701
+v -19.819458 -30.3130112 -1.20050001
+v -19.2830601 -30.76367 -1.22092497
+v -18.6540871 -31.0795383 -1.51050496
+v -20.8961849 -27.3638973 -0.769062996
+v -20.8498077 -26.0773945 -0.349227995
+v -20.8556442 -26.1299896 -0.166802004
+v -20.8119373 -28.3529778 -1.03889298
+v -20.8967953 -27.4362221 -0.492567986
+v -20.8014297 -28.4242992 -0.734569013
+v -20.6000729 -29.16366 -1.01739597
+v -20.5934944 -29.1060333 -1.26609004
+v -19.9277706 -20.5554237 1.33661401
+v -19.458231 -18.7177505 1.920977
+v -20.3375378 -22.5028648 0.761460006
+v -19.9230747 -20.6303711 1.61065996
+v -20.3393593 -22.5765209 1.00027096
+v -20.6557713 -24.4737015 0.423247993
+v -20.8505249 -26.1460381 -0.109108999
+v -20.6535645 -24.3908539 0.181658
+v -17.8050117 -14.641571 2.96417499
+v -17.1037655 -13.6195383 3.24868488
+v -17.1104736 -13.6771851 3.45521688
+v -18.4098091 -15.7896233 2.62790799
+v -18.4173908 -15.8370218 2.805547
+v -17.8036976 -14.7121735 3.21005607
+v -18.9536266 -17.2021294 2.52739
+v -19.4504681 -18.7740383 2.10823989
+v -18.9521656 -17.1250038 2.28372407
+v -13.7016554 -10.7250357 4.24101782
+v -11.5956202 -9.50048256 4.68086386
+v -15.2102461 -11.7603025 3.89643192
+v -11.5919704 -9.57438564 4.92324686
+v -13.6993856 -10.7987356 4.48682308
+v -15.2073574 -11.8515825 4.15578699
+v -16.2948456 -12.7672958 3.79602098
+v -16.2903843 -12.689394 3.55245495
+v -2.48929405 -4.88485622 5.7598052
+v 0.140224993 -3.59916806 5.8825202
+v -5.51969624 -6.37996483 5.55592394
+v 0.170918003 -3.64229894 6.07832384
+v -2.41662788 -4.92403221 6.00936222
+v -5.49605417 -6.479352 5.85132408
+v -8.71817112 -8.0595808 5.39198685
+v -11.592042 -9.57417393 4.9228878
+v -8.71321487 -7.98125792 5.14838886
+v 2.89953494 -2.08475709 5.86903477
+v 2.96444106 -1.95768499 5.85500908
+v 3.01082611 -1.97552299 6.06374884
+v 2.56330395 -2.32499909 5.86888695
+v 2.95973396 -2.1183691 6.11723185
+v 2.61484408 -2.36465597 6.111516
+v 0.170955002 -3.64234591 6.07847118
+v 1.71536303 -2.79432201 5.87498522
+v 3.00277996 -1.58166099 5.87516689
+v 2.948946 -1.41632903 5.87212896
+v 3.01630807 -1.46169496 6.0731492
+v 3.01833606 -1.70542002 5.89970398
+v 3.06790709 -1.57490802 6.12292624
+v 3.0805459 -1.70544505 6.11475801
+v 3.00275302 -1.83196104 5.87061119
+v 2.75049901 -1.21155596 5.88153887
+v 2.71744609 -1.15081298 6.08570099
+v 2.87010098 -1.301579 5.91042614
+v 2.83771491 -1.18622398 6.1626358
+v 2.94978499 -1.31128001 6.10698795
+v 1.22229397 -1.29059994 5.91424894
+v -0.550769985 -1.56671906 5.93036318
+v 2.18791795 -1.16075301 5.92934895
+v -0.549992979 -1.52208698 6.13356876
+v 1.24702203 -1.22415304 6.19195223
+v 2.19951606 -1.10247898 6.16672802
+v 2.60763097 -1.09181595 6.14372778
+v 2.58155894 -1.14475095 5.89480114
+v -10.5277166 -3.19489408 5.24257088
+v -13.8858309 -3.63618708 4.92380714
+v -13.8623886 -3.65999794 4.77353716
+v -6.92281818 -2.62565207 5.63943577
+v -10.5691614 -3.14501691 5.49055004
+v -6.93305206 -2.54111695 5.94173193
+v -3.45124698 -1.99818504 6.08210707
+v -0.549995005 -1.52216494 6.13333988
+v -3.50009894 -2.06233811 5.82957315
+v -19.9199562 -3.84324694 3.62083197
+v -21.2557468 -3.55446911 3.30927396
+v -21.2941208 -3.5213511 3.51791191
+v -18.3734341 -3.96519494 3.97525907
+v -19.9664459 -3.7944591 3.86830902
+v -18.4086437 -3.91823912 4.1917038
+v -13.9012899 -3.60886097 5.02374601
+v -16.4133892 -3.911901 4.33118582
+v -25.0983543 -1.80080402 2.36888599
+v -26.3982239 -0.921649992 2.00525808
+v -23.836174 -2.52671194 2.72996998
+v -26.4384232 -0.872572005 2.25780201
+v -25.1462078 -1.75419295 2.58739209
+v -23.8669529 -2.48294592 2.94750404
+v -22.5952263 -3.06832504 3.26804399
+v -22.5577126 -3.11426902 3.01903796
+v -30.2038708 2.28074908 0.741362989
+v -31.1913681 3.30851007 0.369423985
+v -29.0424728 1.19850504 1.18824697
+v -31.2282639 3.35146809 0.609804988
+v -30.2481823 2.33082604 0.989175022
+v -29.0739536 1.26343799 1.49265695
+v -27.761795 0.130927995 1.81762695
+v -26.4343319 -0.881922007 2.22193694
+v -27.7431049 0.105645001 1.59144998
+v -32.6474876 5.68322277 -0.306665003
+v -32.7465439 6.38413095 -0.408721
+v -32.7821236 6.40124083 -0.197965994
+v -32.3822021 4.96963596 -0.132955
+v -32.6820259 5.71287489 -0.0542359985
+v -32.4086876 5.00048304 0.0878980011
+v -31.9013119 4.189538 0.0597760007
+v -32.2624207 8.4956913 -0.392062008
+v -31.8742886 9.10272026 -0.266867995
+v -32.5469475 7.82309914 -0.438659996
+v -32.2974243 8.49669266 -0.167300001
+v -31.9101181 9.08207512 -0.0208810009
+v -32.5858688 7.82582188 -0.161844
+v -32.7136688 7.11098909 -0.437858999
+v -29.3088188 10.393239 0.457621008
+v -27.3517704 10.7369862 1.07241297
+v -30.5875893 10.0238781 0.0867919996
+v -27.3929977 10.7200756 1.25016201
+v -29.3685608 10.3633051 0.735282004
+v -30.6344433 9.99980736 0.304048985
+v -31.4190655 9.58193874 0.0753299966
+v -31.3684006 9.60114956 -0.174733996
+v -15.1075125 11.9644537 3.87309289
+v -21.1902161 11.3991604 2.84643698
+v -21.1859589 11.4060535 2.66457391
+v -15.1330996 11.9350119 4.13537693
+v -18.027071 11.6722565 3.60271502
+v -24.5387764 11.0530043 2.11501503
+v -27.4044495 10.7107153 1.30665505
+v -24.4646931 11.0826674 1.87210298
+v -11.6529608 12.5114374 4.29874992
+v -11.3651133 12.693284 4.3502841
+v -12.22118 12.3443079 4.2731452
+v -11.6574726 12.493228 4.55558777
+v -11.3535223 12.6726427 4.59915304
+v -12.2256746 12.3124733 4.54674816
+v -15.1311932 11.9399872 4.10929489
+v -13.2960749 12.168787 4.11502314
+v -10.2395363 14.3774729 4.19632101
+v -9.45063591 16.0580864 4.04143
+v -10.7573586 13.400279 4.31267214
+v -9.43552113 16.0656242 4.22648382
+v -10.2211905 14.3720913 4.48143578
+v -10.7274113 13.3858891 4.62396002
+v -11.0861044 12.9062004 4.5708251
+v -11.0956221 12.9140387 4.31540012
+v -5.55041504 24.7700977 2.35852289
+v -4.29132986 27.4328995 1.66960895
+v -6.93013287 21.7233505 3.0787921
+v -4.26557302 27.4640274 1.871876
+v -5.5112319 24.8207455 2.606143
+v -6.88288689 21.7402153 3.38753295
+v -9.43556499 16.0656338 4.22618818
+v -1.98852098 30.916399 0.578216016
+v -1.39087796 31.2264347 0.465779006
+v -1.38049805 31.2602253 0.677568018
+v -2.6088469 30.3075657 0.802031994
+v -1.965855 30.9517498 0.832005024
+v -2.58329105 30.3362465 1.02306604
+v -4.26566792 27.4639797 1.87147701
+v -3.34688306 29.2015114 1.12132394
+v 0.638122022 31.4181423 0.425862998
+v 1.29696798 31.2386379 0.528487027
+v -0.0454620011 31.4869385 0.431019992
+v 0.630199015 31.4480934 0.681055009
+v 1.274979 31.2596817 0.774671018
+v -0.048246 31.5074596 0.704719007
+v -0.731317997 31.4186134 0.422271013
+v 3.24813008 29.1996403 1.14558196
+v 4.18741798 27.4329243 1.70030403
+v 2.51357388 30.3049507 0.821608007
+v 4.16095686 27.4636745 1.89871705
+v 3.21154594 29.2395229 1.42579305
+v 2.48432112 30.336256 1.04084504
+v 1.86840999 30.951704 0.845197976
+v 1.89332902 30.9161396 0.593428016
+v 9.33081818 16.0566883 4.08767986
+v 9.3203516 16.0669174 4.25787687
+v 6.81886101 21.7169533 3.12938404
+v 8.09222794 18.7851582 3.9430759
+v 6.77567291 21.7557354 3.36835909
+v 5.40083408 24.8201561 2.64542794
+v 4.15560913 27.4669056 1.92867696
+v 5.44548702 24.761404 2.40047598
+v 10.9718304 12.9146271 4.3932972
+v 11.2359304 12.6925688 4.37847614
+v 11.2369432 12.6871729 4.59311295
+v 10.6312695 13.4052467 4.38951683
+v 10.9612532 12.9062557 4.64969683
+v 10.616312 13.3967648 4.61322784
+v 10.1149597 14.3821115 4.26946306
+v 13.1748552 12.169035 4.21045303
+v 15.0011845 11.9640026 3.97422194
+v 12.0937891 12.3455534 4.36174011
+v 15.0215006 11.9441023 4.18477488
+v 13.1845675 12.141696 4.49473715
+v 12.0996361 12.3037243 4.67148113
+v 11.5325928 12.4933395 4.63842201
+v 11.5290327 12.5117846 4.38297987
+v 24.4278927 11.0786724 2.029037
+v 27.3225327 10.7355728 1.24498498
+v 21.0948009 11.4060211 2.86322498
+v 27.3743954 10.709362 1.48113203
+v 24.4912376 11.0499783 2.27549911
+v 21.1683159 11.3548365 3.15595603
+v 17.9404793 11.6696844 3.72655392
+v 15.0214844 11.9441624 4.18446016
+v 31.351265 9.61386871 0.0217579994
+v 31.8437939 9.11770535 -0.118020996
+v 31.8857136 9.11188602 0.0923369974
+v 30.5732079 10.0300322 0.277990997
+v 31.4002075 9.59487247 0.273499995
+v 30.6158619 10.0070448 0.49722299
+v 27.3652611 10.719346 1.43124497
+v 29.2911701 10.3949347 0.642533004
+v 32.7091904 7.13774204 -0.236488998
+v 32.7480164 6.41226721 -0.209134996
+v 32.7822685 6.42935324 0.00224200008
+v 32.5447769 7.8484292 -0.207341999
+v 32.7430649 7.14879799 0.0460699983
+v 32.5705261 7.85157824 0.0143139996
+v 32.2479973 8.51764774 -0.189363003
+v 31.4789314 3.80339599 0.425132006
+v 30.1105499 2.31399393 0.977714002
+v 32.2833519 4.88913202 0.107632004
+v 30.1393204 2.35165596 1.21066296
+v 31.5129032 3.84539604 0.705730975
+v 32.3097954 4.92267704 0.327775002
+v 32.6871338 5.73936892 0.144712999
+v 32.6544914 5.70950794 -0.107543997
+v 20.8795319 -6.15373611 3.42707109
+v 25.5053692 -2.02493811 2.4280479
+v 20.8859253 -6.13705683 3.62298012
+v 23.0629025 -4.19608307 3.23850894
+v 25.5272541 -1.96721399 2.73466396
+v 28.0271435 0.30714801 1.93001294
+v 30.137331 2.34565306 1.17994201
+v 27.9840374 0.256572992 1.68326402
+v 18.3704891 -8.66266155 3.7299149
+v 18.2415714 -8.9825201 3.7643981
+v 18.7382736 -8.19052315 3.72685504
+v 18.3667889 -8.66070843 3.98685098
+v 18.2231407 -8.98777866 4.01297903
+v 18.7203579 -8.17510891 4.03967285
+v 19.511467 -7.39805079 3.86104393
+v 20.8852959 -6.13335419 3.65381408
+v 19.5149288 -7.40407324 3.60461807
+v 18.2945042 -11.0015697 3.48989606
+v 18.6153965 -12.8169022 3.1991179
+v 18.1542702 -9.91158009 3.67356491
+v 18.6062069 -12.8508768 3.438519
+v 18.2799816 -11.0247335 3.77472591
+v 18.1332474 -9.93489933 3.94539809
+v 18.1397762 -9.333004 3.96521401
+v 18.1488972 -9.31838894 3.71000099
+v 20.2963371 -22.1385307 0.990288019
+v 20.6955051 -25.0162048 0.139116004
+v 19.7520809 -18.8769989 1.89857304
+v 20.6930485 -25.0769367 0.371365994
+v 20.2947769 -22.2100735 1.23618305
+v 19.7253914 -18.9266148 2.20683694
+v 18.6063251 -12.8508272 3.43825293
+v 19.1589298 -15.6667099 2.62100101
+v 20.618187 -29.1923294 -1.17403305
+v 20.2844296 -29.811924 -1.26712203
+v 20.8162899 -28.3251858 -0.933358014
+v 20.6239471 -29.2490463 -0.923793018
+v 20.2872391 -29.8516769 -1.02103496
+v 20.8188152 -28.3912392 -0.661692977
+v 20.6929646 -25.076664 0.370173991
+v 20.8527393 -27.0018921 -0.513795018
+v 18.679369 -31.1503201 -1.42573202
+v 18.0308266 -31.3811512 -1.38785005
+v 18.0640144 -31.4138966 -1.178141
+v 19.2870407 -30.8047409 -1.40401804
+v 18.7102947 -31.1856346 -1.14453304
+v 19.3073578 -30.8350983 -1.13183498
+v 19.8255424 -30.34268 -1.38955104
+v 15.3641911 -30.882864 -0.680565
+v 13.6694403 -30.0004978 -0.0689110011
+v 16.5445404 -31.3509026 -1.03538704
+v 13.7124624 -30.0221195 0.129637003
+v 15.4221668 -30.9100437 -0.402532995
+v 16.5907135 -31.3717003 -0.817591012
+v 17.4199848 -31.5100555 -1.02352405
+v 17.3738194 -31.4812927 -1.27377498
+v 5.95968008 -25.3744011 2.21729803
+v 3.35061407 -23.8071213 2.78710699
+v 8.521945 -26.9328728 1.77241504
+v 3.37235093 -23.8138924 2.97793198
+v 11.2996254 -28.6050682 0.977840006
+v 13.7126732 -30.0221272 0.130425006
+v 11.2204828 -28.5651741 0.737121999
+v 0.278678 -22.2317848 3.22588801
+v -0.057395 -22.2058315 3.217417
+v -0.0582650006 -22.2147846 3.43223691
+v 0.827049017 -22.4296799 3.2027719
+v 0.285778999 -22.233923 3.48317599
+v 0.843685985 -22.4154472 3.51606202
+v 3.37366796 -23.8152714 2.9956491
+v 1.78723502 -22.913168 3.04178095
+v -1.889395 -22.9064102 3.03076911
+v -0.934660971 -22.4262695 3.19792891
+v -3.47267103 -23.8029652 3.00408506
+v -1.90722799 -22.9100494 3.28667808
+v -0.954298019 -22.4242878 3.44301009
+v -0.402691007 -22.2339306 3.48061991
+v -0.392852992 -22.2316322 3.22429609
+v -13.7660732 -29.936945 0.261628002
+v -11.394248 -28.5400448 1.07829797
+v -8.6230402 -26.8603172 1.92859197
+v -5.82020378 -25.1399078 2.6925981
+v -3.49352598 -23.7816391 3.1114161
+v -18.0659046 -31.2918167 -0.937085986
+v -17.4232121 -31.4114037 -0.933233023
+v -15.4077663 -30.8437748 -0.471240997
+v -13.749608 -29.948164 0.207339004
+v -20.2341633 -29.7775574 -0.946653008
+v -19.7738266 -30.2867203 -0.942816019
+v -19.2665386 -30.7375565 -1.036026
+v -18.6822243 -31.0694695 -0.999459028
+v -18.685442 -31.1151314 -1.22998905
+v -20.8010635 -26.1950512 0.0742949992
+v -20.808897 -27.4826946 -0.249651998
+v -20.5642586 -29.180603 -0.851637006
+v -19.4225578 -18.817564 2.2269299
+v -19.8300304 -20.717762 1.84225202
+v -20.2744846 -22.6483154 1.21098495
+v -20.6115208 -24.5305271 0.578974009
+v -20.7958927 -26.1953354 0.0761979967
+v -17.0633755 -13.7850866 3.68657398
+v -18.3796062 -15.9227896 3.0282371
+v -17.7508717 -14.7921209 3.39067602
+v -18.8784313 -17.3040237 2.75860691
+v -19.3965626 -18.8422756 2.28230405
+v -11.5453796 -9.69548035 5.12284184
+v -13.6543398 -10.916193 4.68492603
+v -15.1644869 -11.9487839 4.31157589
+v -16.2625961 -12.8497934 3.94691396
+v 0.229914993 -3.71603489 6.25292683
+v -2.33355308 -4.98273182 6.16069317
+v -8.69691753 -8.15003109 5.53931713
+v -11.5536804 -9.67645168 5.096138
+v 3.08267808 -2.00054312 6.21612215
+v 3.0379281 -2.16099811 6.26298618
+v 3.19652104 -2.03836107 6.36234617
+v 2.71455693 -2.43809891 6.30881214
+v 1.78206098 -2.84315205 6.14953089
+v 0.229702994 -3.71574593 6.2526741
+v 3.05908108 -1.37561297 6.22364283
+v 3.17282391 -1.70488298 6.27792501
+v 3.15506911 -1.56181896 6.27241516
+v 3.19373608 -1.39468002 6.37415314
+v 3.07951808 -1.84430802 6.14493895
+v 2.76949 -1.06895101 6.28480101
+v 2.98482895 -1.20790601 6.2913661
+v 2.93670797 -1.07027805 6.38041878
+v -0.546274006 -1.43627501 6.31164694
+v 1.28831899 -1.07400799 6.41297102
+v 2.23575592 -0.983700991 6.37033987
+v 2.64015603 -1.01474297 6.29348612
+v -13.9205332 -3.55240297 5.14649105
+v -10.6061792 -3.06670094 5.64194489
+v -3.41555905 -1.90859699 6.23771811
+v -0.547430992 -1.46293795 6.26468086
+v -21.3127518 -3.45867205 3.67526698
+v -18.4328594 -3.83724999 4.35961199
+v -19.990736 -3.684093 4.07377481
+v -21.3195362 -3.35336304 3.83214307
+v -16.4540081 -3.853899 4.6074729
+v -13.9331675 -3.4945941 5.22689581
+v -25.1453075 -1.68197298 2.77735996
+v -23.875658 -2.40677691 3.11891389
+v -26.4347897 -0.791188002 2.43678904
+v -22.6053581 -2.96190405 3.47668695
+v -31.2106819 3.41591501 0.796030998
+v -30.2434502 2.39650798 1.14895797
+v -27.7731438 0.212203994 2.00349808
+v -26.438736 -0.81032002 2.405231
+v -32.7632217 6.42068577 0.0221650004
+v -32.3890266 5.04037905 0.270824999
+v -32.658577 5.74291182 0.115202002
+v -31.9383888 4.23243904 0.338982999
+v -31.2300911 3.35879803 0.640073001
+v -32.2889786 8.46669865 0.0333920009
+v -31.8924198 9.03063202 0.181862995
+v -32.5487595 7.80674314 0.0477470011
+v -32.6985741 7.12067795 0.0744939968
+v -32.7494049 7.12131596 -0.155128002
+v -27.4189224 10.6781693 1.40769303
+v -30.6446381 9.94524193 0.484212995
+v -29.3792839 10.2527199 0.977975011
+v -31.420866 9.53399754 0.241357997
+v -21.2413025 11.3407221 3.04880095
+v -17.9004898 11.6080055 3.81880999
+v -15.1299849 11.8190374 4.37440014
+v -24.5753689 10.9878807 2.27067304
+v -27.4257507 10.6358747 1.49417603
+v -11.3047075 12.5948324 4.82185507
+v -11.6379328 12.4394398 4.7194581
+v -12.1989651 12.2151232 4.76446676
+v -13.3028297 12.1422033 4.39965296
+v -15.1335936 11.8648376 4.29794788
+v -9.38282967 16.0461884 4.4175868
+v -10.1326771 14.3079338 4.72502422
+v -11.0483589 12.8657608 4.73495913
+v -4.20812607 27.4627857 2.06052303
+v -5.44467878 24.8343067 2.76310301
+v -8.21181011 18.786129 3.8839221
+v -9.40031147 16.0536976 4.36581802
+v -1.35227001 31.242403 0.896525979
+v -2.53832603 30.3235455 1.20457196
+v -1.92857695 30.933794 0.999167979
+v -3.31349301 29.2394161 1.40242803
+v -4.22714615 27.4656887 2.00814509
+v 1.23382103 31.2127037 1.00714505
+v 0.611069024 31.4057846 0.910448015
+v -0.0489349999 31.4643097 0.888432026
+v -0.72547698 31.4484882 0.705093026
+v 4.1212101 27.4657555 2.037081
+v 2.43796301 30.3235531 1.22238898
+v 3.11622691 29.2074261 1.67114794
+v 4.04767418 27.4439907 2.19702196
+v 1.83010495 30.9340057 1.01168096
+v 9.2770052 16.0537262 4.4329052
+v 8.03081512 18.6492901 4.20071697
+v 9.21610641 16.0240784 4.57099009
+v 6.70191097 21.7385025 3.56256199
+v 5.33299208 24.8341331 2.80190301
+v 4.07595301 27.4550743 2.14575791
+v 11.2056189 12.6366196 4.80683517
+v 10.5725307 13.3602448 4.79177284
+v 10.9221802 12.865715 4.81426287
+v 10.0969677 14.3718338 4.55487919
+v 9.30321407 16.0646477 4.35486221
+v 15.026329 11.8821869 4.37241793
+v 13.1609402 12.0292435 4.73630095
+v 11.5119305 12.4397116 4.80228806
+v 27.3948231 10.6349735 1.66799998
+v 24.5278282 10.9844522 2.43154407
+v 17.8281498 11.617116 3.91202402
+v 15.0263157 11.8821211 4.37237787
+v 31.8853474 9.07118988 0.310382009
+v 30.6252441 9.95239162 0.676949978
+v 31.4013844 9.54674053 0.439016014
+v 29.3469353 10.3655462 0.920772016
+v 27.3883286 10.6715918 1.59008706
+v 32.7619247 6.44792509 0.221802995
+v 32.551487 7.83873987 0.200588003
+v 32.670845 7.13672495 0.333609015
+v 32.2867928 8.51299763 0.0925429985
+v 32.2878647 4.96064281 0.51049298
+v 30.1078491 2.4232161 1.43091404
+v 31.468092 3.91507101 0.927137017
+v 32.6623497 5.76805305 0.312323987
+v 20.8677902 -6.1084199 3.76294398
+v 22.9604988 -4.20029783 3.44694901
+v 20.8162441 -6.05144882 3.92762995
+v 28.0184402 0.369991004 2.09078097
+v 30.1232643 2.39929295 1.37005198
+v 18.1408653 -8.96681023 4.23849201
+v 18.3215237 -8.63853931 4.15325308
+v 19.4533558 -7.35020018 4.08405304
+v 20.8459301 -6.08271885 3.84637904
+v 18.5424118 -12.8776026 3.6277051
+v 18.1892319 -11.0420008 3.99213004
+v 18.0191936 -9.94070339 4.19991922
+v 18.0873032 -9.33224964 4.131217
+v 20.6242428 -25.1258678 0.58740598
+v 20.2487488 -22.2611179 1.39161396
+v 19.1399536 -15.6747179 2.90998602
+v 20.2534332 -29.8531742 -0.853161991
+v 20.5875111 -29.2655182 -0.758316994
+v 20.7578278 -28.4172726 -0.461975992
+v 20.851078 -27.0690079 -0.237093002
+v 20.6247406 -25.1255054 0.585584998
+v 18.0876236 -31.3858814 -0.921168983
+v 18.7035217 -31.1312408 -0.885340989
+v 19.2900715 -30.8092232 -0.947863996
+v 19.8037319 -30.366003 -0.879923999
+v 19.8435268 -30.3866615 -1.10902095
+v 13.7490854 -30.0087662 0.267652005
+v 16.6273041 -31.3441486 -0.635172009
+v 15.4899855 -30.8412971 -0.153192997
+v 13.7944889 -29.9653854 0.409359008
+v 17.4471207 -31.4816856 -0.85482198
+v 3.390625 -23.8020554 3.10118294
+v 5.7420702 -25.1765079 2.69751501
+v 3.43808103 -23.7312241 3.29679108
+v 8.57567215 -26.8966808 1.97426498
+v 11.3883018 -28.5861931 1.15869904
+v 13.7651453 -29.9977818 0.322127998
+v -0.0590439998 -22.1680851 3.64874101
+v 0.296290994 -22.1878586 3.65066791
+v 1.83888996 -22.8363132 3.54844904
+v 1.80088198 -22.9118366 3.32733798
+v 3.40907788 -23.7787437 3.18746305
+v -3.51365399 -23.7543831 3.19665694
+v -1.943398 -22.8320293 3.53835893
+v -0.981139004 -22.3539734 3.66932297
+v -0.416842014 -22.1652412 3.70491195
+v -11.4401464 -28.4646034 1.24106801
+v -13.8414907 -29.839756 0.465884
+v -8.68238354 -26.7849274 2.09453511
+v -5.93264914 -25.071516 2.8603909
+v -3.53523707 -23.719677 3.27563
+v -17.4437408 -31.3441048 -0.763773024
+v -16.6503906 -31.1885891 -0.518935978
+v -18.0592918 -31.1464291 -0.704050004
+v -15.523901 -30.6743164 -0.072333999
+v -15.4771271 -30.7748852 -0.222610995
+v -13.8028107 -29.8965359 0.368292004
+v -19.2279587 -30.6765289 -0.862167001
+v -20.1045876 -29.7197781 -0.674094975
+v -19.7107372 -30.2282524 -0.784107983
+v -18.6560688 -30.9948463 -0.835672975
+v -20.6788826 -28.4470139 -0.455864012
+v -20.6282539 -26.2531853 0.318695009
+v -20.7021561 -27.4951382 -0.104859002
+v -20.4970036 -29.1749058 -0.684179008
+v -19.2963181 -18.9217091 2.44029689
+v -19.7178326 -20.7732887 1.97435296
+v -20.1716156 -22.7045345 1.35889494
+v -20.5279064 -24.5699444 0.733765006
+v -20.6924324 -26.2370663 0.247204006
+v -17.6757641 -14.8919687 3.52395105
+v -18.2558002 -16.0502415 3.23339009
+v -16.9169693 -13.9656544 3.89755201
+v -18.759634 -17.4041805 2.90491009
+v -19.2959652 -18.9219532 2.44072104
+v -15.0928488 -12.0679359 4.44295502
+v -11.4440956 -9.88419533 5.29366016
+v -13.5837688 -11.0342693 4.80832481
+v -16.1968708 -12.9480877 4.08434391
+v -2.25952792 -5.10976219 6.31377888
+v 0.340276003 -3.84768295 6.42044687
+v -5.40439701 -6.64166117 6.06305599
+v -8.63124561 -8.25657177 5.67370176
+v -11.4861803 -9.81018734 5.23825312
+v 3.152246 -2.21887994 6.39694786
+v 3.39027095 -2.10263991 6.49897909
+v 2.86585498 -2.54818797 6.46405983
+v 2.02330303 -3.01712799 6.45823193
+v 0.339866012 -3.84718299 6.42016983
+v 1.88527596 -2.93665099 6.34126377
+v 3.27448797 -1.53368294 6.40571308
+v 3.34818792 -1.70177603 6.44392776
+v 3.23548603 -1.86935306 6.35883379
+v 2.9132359 -0.946193993 6.46105623
+v 3.11477995 -1.094064 6.4604249
+v 3.12385511 -1.268062 6.37227583
+v -0.53797698 -1.27240801 6.48702097
+v 2.231004 -0.813417017 6.51735115
+v 2.68930888 -0.902707994 6.43154001
+v -10.6148596 -2.94850302 5.78193378
+v -13.952302 -3.37274003 5.348629
+v -6.95425701 -2.36633801 6.16195202
+v -3.43185592 -1.76989901 6.39729977
+v -0.542361021 -1.35723901 6.41022301
+v -18.4505768 -3.67273402 4.53798199
+v -19.9957581 -3.50858307 4.24402809
+v -21.3041153 -3.16581392 3.99095106
+v -16.4964809 -3.569453 4.94991016
+v -16.48699 -3.71113491 4.83016396
+v -25.1128674 -1.53719103 2.969275
+v -26.4006195 -0.672402024 2.59974599
+v -23.8527012 -2.25423288 3.30671811
+v -22.5811253 -2.81918812 3.6343801
+v -30.1965923 2.47399807 1.30802
+v -31.1486378 3.50760508 0.972980976
+v -29.0264187 1.39740205 1.73435497
+v -27.7265472 0.347521007 2.19984508
+v -26.4114876 -0.705238998 2.55950999
+v -32.595459 5.77469778 0.283832014
+v -32.6931572 6.43759394 0.198035002
+v -32.2979355 5.11129189 0.483956993
+v -32.58395 6.45358896 0.356023997
+v -31.8059082 4.38762808 0.735936999
+v -31.8891659 4.31518793 0.587173998
+v -31.1948452 3.44382405 0.857420981
+v -32.2137032 8.40198612 0.253870994
+v -32.4747314 7.77668715 0.219646007
+v -31.8028564 8.91669559 0.41484201
+v -32.614994 7.10778618 0.236880004
+v -27.4280701 10.5736341 1.59303296
+v -30.6164989 9.8214941 0.691036999
+v -29.354393 10.1355019 1.12184799
+v -27.4119148 10.4209242 1.75337601
+v -31.3927708 9.4601841 0.406349987
+v -17.9345245 11.4764795 3.98328996
+v -21.2490883 11.2103548 3.25373292
+v -15.1023769 11.6470976 4.5524931
+v -24.5698204 10.8896465 2.42736006
+v -27.4249477 10.5169878 1.66306305
+v -11.5947094 12.3552618 4.87538719
+v -11.1997299 12.4388208 5.02397299
+v -12.150527 12.0791998 4.92363501
+v -13.2810879 12.0301056 4.64116192
+v -15.1199608 11.7457743 4.46362495
+v -9.26737309 15.9823246 4.61770821
+v -10.6116505 13.2846861 4.89381409
+v -10.017272 14.1717033 4.90850592
+v -10.9890327 12.7930603 4.89165688
+v -5.363451 24.7919102 2.92239308
+v -4.10819721 27.4214191 2.23919296
+v -6.7511611 21.700758 3.6308229
+v -8.05447388 18.5694599 4.28492498
+v -8.15227127 18.6500626 4.14223003
+v -9.32829475 16.0175972 4.52806282
+v -1.877177 30.8791046 1.16511405
+v -1.31256294 31.1762009 1.06979001
+v -2.44403791 30.2517395 1.41337502
+v -1.26306796 31.073122 1.22357297
+v -3.11034799 29.1354046 1.812819
+v -3.21985698 29.2073822 1.648453
+v -4.15435886 27.4436989 2.16882801
+v -0.0494370013 31.3800621 1.05860698
+v 0.591023028 31.3233166 1.07143402
+v 1.16270006 31.0731583 1.23232198
+v -0.682291985 31.2882195 1.11627305
+v -0.702709973 31.3836021 0.96143502
+v 2.34203696 30.2517014 1.43076396
+v 3.00545692 29.1354237 1.83484304
+v 3.90764809 27.3696251 2.38015103
+v 1.77733696 30.8792458 1.17798698
+v 9.11785889 15.967454 4.71101809
+v 7.93177795 18.5690899 4.34256601
+v 6.59876204 21.6882648 3.71684289
+v 5.25049114 24.7917805 2.96072292
+v 3.94736695 27.3933201 2.33804202
+v 10.8617392 12.7929258 4.97039604
+v 11.1487083 12.5517197 4.96833992
+v 10.4686565 13.2690411 4.99111509
+v 11.0715151 12.4388542 5.10417509
+v 10.0067768 14.3079357 4.79746103
+v 9.11738682 15.9671717 4.71158409
+v 9.2158556 16.023941 4.57130814
+v 15.0066214 11.7221069 4.59612083
+v 12.0559454 12.1707926 4.91498804
+v 13.0774984 11.8697557 4.91767216
+v 11.4674559 12.3551865 4.95856524
+v 24.5210247 10.8867216 2.58748007
+v 27.39328 10.5146103 1.83879197
+v 21.1790237 11.2071695 3.39620209
+v 17.8443909 11.5158529 4.061728
+v 15.0065994 11.7219906 4.59616613
+v 31.3727055 9.47246838 0.603899002
+v 31.8260422 8.98353958 0.527869999
+v 30.5964527 9.8280201 0.883759975
+v 29.3435612 10.240221 1.19543195
+v 27.3974552 10.5882444 1.74688399
+v 32.6905632 6.46374989 0.397581995
+v 32.4610329 7.80065393 0.421288013
+v 32.5807114 6.4782052 0.55448401
+v 32.1623917 8.40567207 0.504674971
+v 32.2408867 8.46186543 0.348825991
+v 32.194519 5.02972507 0.723617971
+v 30.0286617 2.51254296 1.60173702
+v 31.3863926 3.97940493 1.08241296
+v 32.5979843 5.79970694 0.481020004
+v 22.9090328 -4.08763218 3.62013102
+v 25.452549 -1.856305 2.98312712
+v 20.6955585 -5.9395628 4.11351299
+v 27.958395 0.436529011 2.25246596
+v 30.0461159 2.495579 1.57556605
+v 18.2390594 -8.60499191 4.31269217
+v 18.5972137 -8.09691906 4.31453705
+v 17.9671268 -8.91421032 4.44636583
+v 19.331419 -7.29378986 4.26128101
+v 20.7676582 -6.00473499 4.0181222
+v 18.4063396 -12.9052982 3.82730103
+v 18.0718594 -11.016448 4.14231491
+v 17.9986477 -9.3175211 4.28977108
+v 20.1608639 -22.2865582 1.55025399
+v 19.5975323 -18.9820805 2.44925404
+v 20.5068798 -25.1568661 0.755106986
+v 19.0057564 -15.6428776 3.19446802
+v 18.5171165 -12.8851519 3.6822021
+v 20.518816 -29.2600632 -0.590746999
+v 20.1791859 -29.8254738 -0.670138001
+v 20.6655159 -28.4197845 -0.297623008
+v 20.6341419 -27.126358 0.171228006
+v 20.7609692 -27.1117401 0.0067230002
+v 20.507328 -25.156765 0.754616022
+v 19.2506733 -30.7480373 -0.773675025
+v 18.0846329 -31.2382736 -0.645078003
+v 18.6755219 -31.0480194 -0.72635901
+v 19.7473259 -30.3117142 -0.716732979
+v 16.6747475 -31.2397804 -0.420902014
+v 13.8525286 -29.8780441 0.557516992
+v 15.5358849 -30.7408218 -0.00252799992
+v 17.4664803 -31.414711 -0.685908973
+v 5.85760403 -25.0948353 2.89386797
+v 8.6327219 -26.8206139 2.14084101
+v 3.50882506 -23.5867558 3.48529005
+v 11.4263983 -28.4960079 1.32203603
+v 13.8304119 -29.9149361 0.504809022
+v 0.305557996 -22.1028957 3.81183791
+v -0.0597180016 -22.0629406 3.83457708
+v 0.884288013 -22.2799625 3.79368901
+v 1.85336995 -22.7224293 3.70175505
+v 3.46996403 -23.670023 3.39219999
+v -3.56764007 -23.6587429 3.37037706
+v -1.98099804 -22.6533661 3.75517988
+v -1.021716 -22.208271 3.86294794
+v -0.437721997 -22.024807 3.90361595
+v -11.5388317 -28.2954121 1.43417501
+v -13.9220266 -29.6825714 0.62924099
+v -8.78425312 -26.6138 2.28274202
+v -6.02680779 -24.9121418 3.01643991
+v -3.60733795 -23.5750866 3.46361089
+v -17.4618988 -31.1734219 -0.550755978
+v -16.6972809 -31.0045662 -0.32365799
+v -18.0364037 -30.9835663 -0.562204003
+v -15.582407 -30.5577698 0.0432979986
+v -13.8843346 -29.7624969 0.559401989
+v -19.6225262 -30.1562824 -0.651199996
+v -19.1578903 -30.566103 -0.697619975
+v -19.9526901 -29.6247025 -0.513105989
+v -18.6231995 -30.863699 -0.676589012
+v -20.5746536 -27.5120106 0.00628500013
+v -20.4981251 -28.4258823 -0.267452002
+v -20.4283867 -26.2781906 0.452562988
+v -20.3395176 -29.1274319 -0.475546002
+v -19.5893593 -20.8497295 2.06975198
+v -19.125452 -19.0196514 2.57902193
+v -20.0362854 -22.7608395 1.47931397
+v -20.3409691 -24.6286297 0.914039016
+v -20.5205688 -26.2696266 0.401403993
+v -17.5329475 -15.0346699 3.65667105
+v -18.1130581 -16.1619244 3.34744906
+v -16.752039 -14.1254854 3.99166393
+v -18.6286011 -17.4752178 3.0026679
+v -19.0936165 -19.0362072 2.59891701
+v -13.4970541 -11.1967974 4.90928602
+v -14.9814968 -12.2218437 4.54440594
+v -11.3152657 -10.0862589 5.3765769
+v -16.0507927 -13.1251707 4.23187923
+v -2.12100697 -5.31165314 6.43776083
+v 0.480969995 -4.01132488 6.52912092
+v -5.2885251 -6.82403088 6.18671799
+v -8.5085783 -8.46104717 5.81135416
+v -11.3624201 -10.0156336 5.3580761
+v 3.36604905 -2.32648897 6.53000498
+v 3.58873796 -2.16749001 6.56293011
+v 3.03926897 -2.68060994 6.55434179
+v 0.480518997 -4.01080322 6.52899122
+v 3.41115594 -1.40506101 6.50954103
+v 3.55794096 -1.59154403 6.54751587
+v 3.47273707 -1.07407999 6.58032703
+v 3.43455195 -1.89798796 6.49808407
+v 3.05323195 -0.778922021 6.57280779
+v 3.25620008 -0.966808975 6.55841112
+v 3.29039407 -1.16176605 6.51470613
+v 2.33504605 -0.628978014 6.60599995
+v -0.526449025 -1.06129396 6.60566378
+v 2.7797699 -0.687094986 6.57358217
+v -10.6359749 -2.71776295 5.93066597
+v -13.9716654 -3.164397 5.46901417
+v -6.97038078 -2.13327694 6.30715322
+v -3.44249105 -1.53145599 6.5324049
+v -0.531984985 -1.16121995 6.56005096
+v -18.4517403 -3.48664498 4.64825678
+v -19.990736 -3.32043409 4.34144783
+v -21.2698765 -2.96819806 4.08007812
+v -16.5159798 -3.41200995 5.03388977
+v -13.9621382 -3.28773594 5.41004801
+v -25.0426197 -1.35340798 3.10992599
+v -26.3210049 -0.495198995 2.74577403
+v -23.8042183 -2.082479 3.42852211
+v -22.5583725 -2.6385529 3.74544501
+v -30.0752945 2.6300149 1.49684203
+v -31.0093575 3.6516211 1.15088499
+v -28.9312496 1.55409205 1.89930606
+v -27.6368694 0.518498003 2.34621191
+v -26.3594208 -0.574301004 2.69054604
+v -32.4313202 5.83054399 0.494773
+v -32.1481285 5.19429922 0.653217018
+v -32.4173508 6.46907711 0.494778007
+v -31.7083721 4.47836208 0.852070987
+v -31.1025066 3.56054091 1.05043697
+v -32.0829697 8.30928707 0.432859004
+v -32.3442612 7.72830915 0.381130993
+v -31.6647415 8.78127003 0.570740998
+v -32.4757156 7.103508 0.392926991
+v -29.329586 10.000638 1.22951996
+v -30.5471172 9.65606594 0.852083027
+v -27.3701 10.2340221 1.86740303
+v -31.2982559 9.30434704 0.610180974
+v -17.9116173 11.2819214 4.129179
+v -21.22995 10.9993191 3.42990589
+v -15.0594568 11.454731 4.66085005
+v -24.5479488 10.6823835 2.608567
+v -27.3943691 10.3319616 1.816203
+v -11.4962416 12.1758118 5.05732203
+v -11.0916157 12.2823267 5.13196898
+v -12.129776 11.8931513 5.03969383
+v -13.1992016 11.8699741 4.82379818
+v -15.0790453 11.5365648 4.62549782
+v -9.10764027 15.8816204 4.77060509
+v -10.405592 13.1660948 5.0769701
+v -10.859211 12.6361895 5.07446384
+v -5.18851519 24.6991978 3.1078639
+v -3.96316195 27.335886 2.402637
+v -6.569911 21.6101246 3.81118703
+v -7.92346096 18.5122337 4.39089108
+v -9.18535519 15.9316998 4.70771313
+v -1.77371502 30.7342644 1.36966205
+v -2.32290697 30.1282864 1.57655299
+v -1.19773102 30.915411 1.35681295
+v -2.98214197 29.0224152 1.94350004
+v -4.01651812 27.3696575 2.35156202
+v 0.550112009 31.1924038 1.23093498
+v -0.0501240008 31.2364101 1.21716297
+v 1.09625304 30.9151211 1.36524403
+v -0.647836983 31.1679878 1.24504995
+v 2.21988201 30.1283569 1.59282994
+v 2.87635303 29.0224133 1.96459198
+v 3.75538206 27.2667198 2.49728894
+v 1.67238402 30.7347126 1.38170505
+v 7.80003691 18.5122566 4.4474659
+v 8.98276424 15.8825274 4.83480406
+v 6.45062208 21.6100388 3.85808706
+v 5.07427216 24.6991253 3.14484191
+v 3.80748105 27.3036232 2.46324992
+v 10.7307358 12.6363754 5.15212202
+v 10.277132 13.1656771 5.15154314
+v 10.9625769 12.282362 5.21140909
+v 9.89020824 14.1711197 4.98028183
+v 8.98212624 15.8821163 4.83525181
+v 11.9896975 11.9975863 5.07736397
+v 14.9593287 11.4985762 4.74760294
+v 11.2301044 11.9140539 5.25833988
+v 11.3676939 12.1755276 5.13982201
+v 24.4982681 10.6792545 2.76866889
+v 27.3667393 10.3521128 1.97544801
+v 21.1587601 10.9962902 3.57216501
+v 17.821312 11.3074474 4.23904514
+v 14.9594088 11.4989452 4.74734783
+v 31.2780743 9.3156023 0.806908011
+v 31.6916313 8.83825588 0.732428014
+v 30.5268822 9.66198921 1.04414904
+v 29.3193321 10.0254717 1.39822102
+v 27.3803349 10.4204836 1.92722702
+v 32.4897385 7.13254118 0.574117005
+v 32.3300018 7.7510128 0.581936002
+v 32.4127693 6.49217081 0.692699015
+v 32.0646858 8.32944775 0.633387983
+v 31.2720451 4.08106279 1.21928096
+v 29.8914146 2.63502598 1.76125395
+v 32.0418739 5.11037493 0.892769992
+v 32.4321251 5.8548522 0.691079974
+v 22.7778816 -3.95324397 3.77617908
+v 25.3142319 -1.70891798 3.17066097
+v 20.5509815 -5.81681108 4.23032522
+v 27.8204308 0.578706026 2.44459605
+v 29.9131851 2.61644602 1.73934698
+v 18.0569038 -8.52828217 4.50152206
+v 18.4811802 -7.9516468 4.4700799
+v 17.7892113 -8.85738182 4.56017494
+v 20.6293106 -5.88231897 4.17663383
+v 17.8399277 -9.98769855 4.37266302
+v 18.1860104 -12.9269552 3.98416591
+v 17.7034225 -9.92731667 4.45983124
+v 17.8041496 -9.27783966 4.47745085
+v 19.9676495 -22.3251514 1.73532498
+v 20.3741779 -25.1730042 0.872419
+v 19.3996086 -19.0253448 2.62953997
+v 18.7968006 -15.7331467 3.39019299
+v 18.3338013 -12.9140644 3.8901329
+v 20.3602219 -29.2129993 -0.383466005
+v 20.0215168 -29.7370987 -0.460343987
+v 20.5021439 -28.398428 -0.133024007
+v 20.4686108 -27.116766 0.303474993
+v 20.3295612 -25.176939 0.906346023
+v 18.6454506 -30.9345798 -0.591663003
+v 19.1700878 -30.6221371 -0.590689003
+v 18.0579815 -31.0548553 -0.480935007
+v 19.6441021 -30.2297878 -0.560347021
+v 15.5939837 -30.6243534 0.113536
+v 13.9316092 -29.7174301 0.716033995
+v 16.7156601 -31.0744267 -0.249314994
+v 17.4833794 -31.2439308 -0.472469002
+v 5.94987106 -24.9349194 3.05082011
+v 8.73383808 -26.6495419 2.32968807
+v 3.58136296 -23.4121685 3.60643911
+v 11.5147562 -28.3448029 1.49119604
+v 13.9400311 -29.6951466 0.727284014
+v 13.8828678 -29.8206177 0.623144984
+v 0.324037999 -21.9095459 4.00567007
+v -0.0603340007 -21.890789 4.00610685
+v 1.00276899 -22.1337318 3.94878888
+v 3.544137 -23.5046024 3.55204201
+v -3.6427691 -23.4937286 3.52947998
+v -1.11805904 -22.0555153 3.98857999
+v -0.463905007 -21.8599586 4.03242922
+v -11.6560173 -28.0307808 1.575073
+v -14.0187922 -29.4342251 0.763945997
+v -8.91007137 -26.3589211 2.41392207
+v -6.14345694 -24.675108 3.13528609
+v -3.68084192 -23.4001427 3.58426595
+v -3.74297309 -23.2396946 3.65373206
+v -17.4670963 -30.9044819 -0.381850004
+v -16.7362366 -30.7646332 -0.185222998
+v -18.0112362 -30.8302574 -0.470562011
+v -15.6472244 -30.3096046 0.182281002
+v -13.9588614 -29.5934677 0.685936987
+v -14.0186033 -29.4334774 0.762574017
+v -19.4637814 -29.9903812 -0.49288699
+v -19.0285664 -30.3628979 -0.522442997
+v -19.8264389 -29.542614 -0.423963994
+v -18.5379753 -30.6461868 -0.516478002
+v -20.3303375 -27.4892864 0.135585994
+v -20.2702007 -28.3757782 -0.136065006
+v -20.2660389 -26.2867527 0.520195007
+v -20.0990505 -29.0325623 -0.313255996
+v -19.338932 -20.9360008 2.16732407
+v -18.8754139 -19.1321888 2.67349601
+v -19.7465401 -22.8441238 1.60724902
+v -20.0638943 -24.6829472 1.03608203
+v -20.2666969 -26.2872753 0.521714985
+v -17.2874737 -15.2147751 3.74483204
+v -17.8713684 -16.3206005 3.43868494
+v -16.6188354 -14.2424765 4.0281682
+v -18.3926678 -17.6096783 3.08706093
+v -18.8747559 -19.131918 2.67172503
+v -13.3073769 -11.4461184 4.97625589
+v -14.7938032 -12.4532509 4.61435795
+v -11.2127237 -10.2358952 5.40266085
+v -15.8420229 -13.3535938 4.30566883
+v -1.96531296 -5.54931784 6.48702288
+v 0.675674975 -4.23400784 6.58191299
+v -5.1104002 -7.10434389 6.25517178
+v -8.33426285 -8.7254858 5.87203598
+v -11.2127409 -10.235877 5.40287209
+v 3.64359689 -2.46985102 6.58408499
+v 3.76004791 -2.22374201 6.58440304
+v 3.24429798 -2.81139803 6.58658218
+v 2.33158588 -3.3614049 6.594944
+v 0.675683022 -4.23400497 6.58181477
+v 3.80591989 -1.42148495 6.59978914
+v 3.65282106 -1.83152902 6.56508207
+v 3.7325201 -1.17295003 6.60430622
+v 3.83764505 -1.68744802 6.59257793
+v 3.82329798 -1.95893598 6.58955717
+v 3.301121 -0.609000981 6.62499619
+v 3.1053431 -0.486303002 6.63143682
+v 3.47515392 -0.765668988 6.61764193
+v 3.62035108 -0.954128027 6.61249208
+v 1.34916103 -0.49595499 6.66999817
+v -0.509720981 -0.768639028 6.67147684
+v 2.394135 -0.386482 6.65080118
+v 2.8912251 -0.39793399 6.63965416
+v -10.6507111 -2.40460396 6.0061841
+v -13.9835424 -2.8743 5.53940821
+v -6.98818684 -1.82841694 6.37729883
+v -3.46178603 -1.25021195 6.59490919
+v -0.520250022 -0.951602995 6.63790894
+v -0.509688973 -0.768319011 6.6695652
+v -19.9475613 -3.07406592 4.41152191
+v -18.4374599 -3.19163203 4.73173904
+v -21.2323818 -2.79599404 4.12409306
+v -16.5130672 -3.13050199 5.10451508
+v -13.9772882 -3.05401897 5.50321388
+v -13.9832764 -2.8739779 5.53771782
+v -24.9321365 -1.10448802 3.205688
+v -26.1857796 -0.254689991 2.85128593
+v -23.7039013 -1.81162405 3.53194594
+v -22.4773865 -2.3752501 3.83386302
+v -29.8817081 2.84522891 1.62857497
+v -28.7438011 1.79628694 2.03894496
+v -30.8227196 3.80934405 1.26352
+v -27.4840813 0.737950027 2.45415306
+v -26.2712479 -0.403012007 2.79324603
+v -26.1850471 -0.25444901 2.84945202
+v -32.1701851 5.90565681 0.659834027
+v -31.9262466 5.29650211 0.788963974
+v -32.2605324 6.48241377 0.583419025
+v -31.4909344 4.61206579 0.987245977
+v -30.9500999 3.70314503 1.19170201
+v -30.8226223 3.80936098 1.26331604
+v -31.8746834 8.18679047 0.584475994
+v -32.107811 7.64536905 0.549757004
+v -31.5475845 8.67259026 0.655484974
+v -32.238018 7.06972408 0.547821999
+v -29.2309761 9.75565815 1.353297
+v -30.4305096 9.43471813 0.976908028
+v -27.3227329 10.066102 1.93315995
+v -31.1345367 9.08137894 0.764854014
+v -17.8686466 11.0133247 4.23155785
+v -21.181488 10.710227 3.54360104
+v -15.0168114 11.2850056 4.71926212
+v -24.4867668 10.3899717 2.73133993
+v -27.3233376 10.0665035 1.93457305
+v -11.3596821 11.9144163 5.17811012
+v -10.993433 12.1417046 5.19227219
+v -11.9957142 11.7112684 5.11991787
+v -13.1375799 11.5100641 4.98741007
+v -15.0168695 11.2850819 4.71953106
+v -9.70522213 13.994668 5.07869911
+v -8.8808012 15.7283583 4.88330889
+v -10.2655191 12.9630766 5.16615915
+v -10.6623554 12.4186602 5.19680977
+v -4.94576788 24.5434418 3.23580408
+v -3.72822189 27.1644478 2.54108906
+v -6.32357216 21.4678173 3.93032002
+v -7.69200993 18.3812752 4.49863195
+v -9.02527332 15.8266954 4.81915379
+v -8.88036442 15.7279272 4.88154984
+v -1.62917304 30.5035858 1.52452803
+v -2.16442108 29.9434147 1.70315599
+v -1.13819206 30.7675457 1.44033599
+v -2.83317304 28.8953304 2.02936506
+v -3.86405301 27.2660122 2.47040391
+v -3.72797799 27.1638126 2.53971791
+v 0.503440976 30.9270458 1.39706504
+v -0.0507109985 30.9808788 1.38008106
+v 1.03623402 30.7676487 1.44814396
+v -0.604997993 30.92696 1.39311504
+v 2.06041694 29.9435005 1.71833205
+v 2.72673512 28.8954315 2.04938889
+v 3.61780405 27.1639156 2.56617594
+v 1.52653003 30.5036964 1.535887
+v 7.56767988 18.3812828 4.55359602
+v 8.75373363 15.7284555 4.94707823
+v 6.20332813 21.4678535 3.97543812
+v 4.83057308 24.5434055 3.271029
+v 3.61805201 27.1644974 2.56753111
+v 10.5328531 12.4186621 5.27317286
+v 10.8639374 12.1417046 5.27100515
+v 10.1363592 12.9630766 5.23963881
+v 9.57668304 13.9946623 5.14814377
+v 8.75368595 15.7283964 4.94683981
+v 13.0154123 11.5096502 5.08081579
+v 14.9053621 11.2839651 4.82504892
+v 11.8681526 11.7111664 5.20570707
+v 27.2923985 10.0650377 2.11150908
+v 24.4366875 10.3865585 2.89103508
+v 21.1099186 10.7069893 3.68551397
+v 17.7752285 11.0110931 4.35448599
+v 14.9053736 11.2839842 4.82512712
+v 31.1145744 9.09140778 0.960295022
+v 30.4106483 9.43993473 1.16791201
+v 31.5272236 8.68713856 0.85352999
+v 29.2079735 9.75649548 1.53743601
+v 27.3380527 10.2318611 2.04194999
+v 27.2907639 10.0638123 2.10726905
+v 32.2280388 7.09116793 0.746380985
+v 32.0932198 7.66572189 0.749155998
+v 32.2556458 6.50367117 0.780358016
+v 31.856348 8.20479774 0.783773005
+v 31.0483665 4.21044922 1.35476506
+v 31.8180199 5.20978403 1.027408
+v 29.6985817 2.77994895 1.87015104
+v 32.1697235 5.92537308 0.854578018
+v 22.5878143 -3.766572 3.89223289
+v 25.1067467 -1.51090002 3.2991991
+v 20.416914 -5.7074151 4.29755211
+v 27.6000233 0.77067399 2.582407
+v 29.6992931 2.77986598 1.87156498
+v 17.79492 -8.40380478 4.63208199
+v 17.6283436 -8.80465412 4.62565184
+v 18.1966267 -7.86112499 4.60169697
+v 19.0126553 -7.01644802 4.50801992
+v 20.4175491 -5.70770884 4.2993288
+v 17.6477203 -11.058136 4.37876892
+v 17.5104046 -9.89744568 4.53770399
+v 17.9688683 -12.9382601 4.06765699
+v 17.5188389 -9.22434044 4.60673285
+v 20.0983677 -25.1795616 1.01222801
+v 19.6824455 -22.3484364 1.86447096
+v 19.1181488 -19.0621433 2.74948096
+v 18.5082684 -15.7806187 3.51156712
+v 18.1427231 -12.9295998 4.00367022
+v 17.9687824 -12.9382372 4.06741905
+v 20.1205063 -29.1156025 -0.222258002
+v 20.2739658 -28.3461609 -0.00257400004
+v 19.8477173 -29.6193752 -0.332704991
+v 20.2779503 -27.1040516 0.391164988
+v 20.096632 -25.1782875 1.00815797
+v 18.5592251 -30.7168484 -0.431576014
+v 19.049139 -30.4330006 -0.436630994
+v 18.0324116 -30.9011154 -0.388965994
+v 19.4849491 -30.0633812 -0.402790993
+v 15.6576967 -30.3763905 0.253037989
+v 16.7539425 -30.834568 -0.110448003
+v 14.0155497 -29.4938488 0.828104973
+v 17.4876614 -30.9753399 -0.303559989
+v 6.06561613 -24.697855 3.17051506
+v 8.85836697 -26.3950939 2.4614799
+v 3.64324498 -23.2511978 3.67664695
+v 11.631134 -28.0804081 1.63281298
+v 14.0155621 -29.4939117 0.828227997
+v 0.360338002 -21.6235771 4.14222717
+v -0.0608480014 -21.5946236 4.15058422
+v 0.984166026 -21.8311043 4.08986807
+v 2.01280808 -22.3353405 3.95496988
+v 3.64319301 -23.2519169 3.67838001
+v -2.12563396 -22.330761 3.94135189
+v -3.74296498 -23.240448 3.65549994
+v -1.10354698 -21.8299847 4.08264112
+v -0.481602013 -21.6241245 4.14077091
+v -11.5263891 -27.9523144 1.61562598
+v -13.4378176 -28.9231434 1.02702606
+v -14.0186033 -29.4334774 0.762574017
+v -11.2066593 -27.624197 1.76449597
+v -8.91473007 -26.3609543 2.41085792
+v -8.61125183 -26.0681744 2.52889109
+v -10.8600302 -27.1728935 1.94541502
+v -9.14104557 -26.2544804 2.41982102
+v -9.66199017 -26.0167828 2.43438697
+v -7.18280077 -25.1955948 2.90917611
+v -6.13963223 -24.6721077 3.13456297
+v -3.73844695 -23.2385063 3.66012001
+v -7.79095411 -24.9745636 2.91910791
+v -6.75477505 -24.3448277 3.18015003
+v -5.224473 -23.602314 3.48542404
+v -6.59289789 -22.1304092 3.76421905
+v -3.08288002 -21.5673294 4.09601688
+v -1.45793104 -20.5123997 4.3858552
+v -0.481687009 -21.6236858 4.1399498
+v -0.0608399995 -21.5938969 4.14878416
+v -1.10424399 -21.831131 4.08618879
+v -2.12574196 -22.3301601 3.93979692
+v -15.0409412 -29.7438927 0.486615986
+v -12.9832649 -28.1922741 1.33533001
+v -12.654665 -26.3523235 1.95217001
+v -17.4673271 -30.9045849 -0.380861998
+v -18.0112362 -30.8302574 -0.470562011
+v -16.7362328 -30.7643833 -0.185267001
+v -17.0876503 -29.0176125 0.348663002
+v -15.6466703 -30.3086605 0.181024
+v -19.4635639 -29.9900398 -0.493151009
+v -19.8264389 -29.542614 -0.423963994
+v -18.4825459 -29.4580555 -0.0909850001
+v -19.0274658 -30.3612366 -0.525663972
+v -18.5375538 -30.6456127 -0.51749599
+v -20.0991306 -29.0329494 -0.311807007
+v -20.2697029 -28.3753033 -0.137239993
+v -18.6180592 -27.6157227 0.484495014
+v -20.3303642 -27.4891815 0.137106001
+v -20.2660389 -26.2867527 0.520195007
+v -19.3384609 -20.9356995 2.16655207
+v -18.4545231 -19.6619415 2.64685893
+v -18.8743763 -19.1293526 2.6747601
+v -18.0076427 -22.3991795 2.09540296
+v -18.017746 -20.6185112 2.52322102
+v -19.7453098 -22.8425903 1.60581696
+v -18.6359386 -24.5360661 1.39769804
+v -20.063343 -24.6828995 1.03451097
+v -18.9327564 -26.0254498 0.903548002
+v -17.220396 -25.7786179 1.33449495
+v -17.2877197 -15.2153721 3.74660301
+v -16.6188354 -14.2424765 4.0281682
+v -17.8704357 -16.320528 3.43651891
+v -15.9768171 -16.3864441 3.7869761
+v -17.2419224 -17.6334972 3.31339693
+v -18.3922234 -17.609745 3.08556199
+v -13.307682 -11.4465666 4.97508907
+v -14.7924566 -12.4528913 4.61202621
+v -11.2127237 -10.2358952 5.40266085
+v -15.8987427 -14.1780319 4.1713028
+v -15.841671 -13.3536301 4.30420399
+v -9.61338997 -9.8722887 5.62864399
+v -6.47182798 -8.20431042 6.07574177
+v -8.33665943 -8.72691536 5.87011194
+v -4.97419786 -7.03703785 6.26592588
+v -7.69874191 -9.03225708 5.89820099
+v -1.87106299 -5.50266123 6.488626
+v 0.238408998 -5.11724186 6.53860283
+v 0.675880015 -4.23415899 6.57984209
+v -1.57959604 -6.11706209 6.45890522
+v -3.02359796 -7.02542591 6.35454082
+v -4.61812592 -7.84434414 6.21999311
+v -6.7626071 -8.88815308 5.98928499
+v -4.90120792 -8.94768906 6.10736895
+v -9.38278961 -10.0411205 5.63506317
+v -7.76911879 -10.0776854 5.78544903
+v -10.5768375 -11.6409473 5.31555319
+v -8.78110981 -11.0278282 5.58530807
+v -11.5820036 -11.031848 5.26673889
+v -12.3795261 -12.6423187 4.95221519
+v -11.5845146 -13.7095718 4.906672
+v -13.5172901 -13.4400721 4.67526388
+v -14.722127 -13.6569738 4.45250416
+v 3.64370394 -2.47000098 6.58256006
+v 4.27632999 -2.54581594 6.55638409
+v 3.76004791 -2.22374201 6.58440304
+v 3.24433398 -2.81140494 6.58716202
+v 5.84363794 -3.50881505 6.44673681
+v 3.20202088 -4.00009298 6.54615784
+v 2.33163595 -3.36160898 6.59318781
+v 4.55044603 -4.18765116 6.48667717
+v 5.592834 -5.52634478 6.36479616
+v 2.81572199 -5.49636078 6.48374319
+v 1.94928396 -4.56942511 6.5513072
+v 1.27347302 -6.21968889 6.4665699
+v 3.823493 -1.958884 6.58788395
+v 4.73405504 -1.50446296 6.55953121
+v 3.83764505 -1.68744802 6.59257793
+v 3.80611491 -1.42145896 6.59814596
+v 3.7325201 -1.17295003 6.60430622
+v 5.31305695 -0.188094005 6.54105711
+v 6.28700876 -1.44826198 6.47306681
+v 3.30172706 -0.609378994 6.62455606
+v 3.47519708 -0.765685976 6.618577
+v 3.1053431 -0.486303002 6.63143682
+v 3.62048197 -0.953936994 6.61084223
+v -0.509688973 -0.768319011 6.6695652
+v 2.891186 -0.397675008 6.6384201
+v 3.289747 1.71705997 6.61286116
+v 2.75327802 0.362351 6.64384317
+v -0.668861985 -0.431528986 6.67158794
+v -3.33880711 -1.22982097 6.59635782
+v -6.0228548 -1.31604099 6.45598316
+v -6.98562098 -1.827788 6.37615108
+v -1.43790698 -0.194426 6.66242313
+v -3.284271 -0.542421997 6.60800886
+v -10.6547241 -2.40494704 6.00413084
+v -8.90794277 -1.57505095 6.21161699
+v -13.9832764 -2.8739779 5.53771782
+v -7.33637285 -1.19201899 6.35831404
+v -6.94449997 -0.505060971 6.39702702
+v -5.90473604 -0.492202014 6.47105789
+v -4.47926283 -0.325809002 6.55541515
+v 0.637826025 0.0195550006 6.67723989
+v 1.34553099 0.639385998 6.66897583
+v -0.713504016 1.507411 6.66177988
+v 1.25285196 2.25181103 6.64511681
+v -15.8129387 -2.87888503 5.23818207
+v -14.2335148 -2.06831598 5.52263594
+v -13.7458153 -0.765824974 5.61613989
+v -12.1943798 -0.505792975 5.8417449
+v -12.7363338 -1.83399498 5.75000286
+v -11.1142912 -0.903376997 5.9768858
+v -9.83877277 0.243062004 6.13074017
+v -9.53156662 -1.00171995 6.1554451
+v -11.1207342 -1.69527102 5.96490002
+v -7.99162817 -0.369598001 6.31057596
+v -17.6965923 -3.00637507 4.88550901
+v -16.5122433 -3.13015294 5.10293484
+v -18.4359741 -3.19104409 4.7296381
+v -19.9480247 -3.07371593 4.41123676
+v -21.2323608 -2.79597712 4.12385178
+v -20.7881508 -1.55312395 4.26088095
+v -24.9318142 -1.10409796 3.20406199
+v -24.3715649 -0.626734972 3.36557889
+v -25.6067982 -0.311262995 3.01876712
+v -26.1902256 -0.251359999 2.85086012
+v -22.7009583 -1.00051498 3.80399203
+v -23.7027607 -1.81105196 3.52876401
+v -22.4766521 -2.37523699 3.83375311
+v -27.4820805 0.737021983 2.45316505
+v -28.7416382 1.79593003 2.03637791
+v -29.881813 2.84555793 1.62875998
+v -30.8232327 3.80968404 1.26418996
+v -29.2032814 2.61911607 1.86434698
+v -28.4813023 3.93652892 2.052531
+v -29.8596191 4.14739895 1.58441997
+v -30.6952381 5.40237188 1.22645497
+v -29.2168179 5.44571114 1.73017597
+v -32.1696548 5.90569592 0.659057021
+v -32.2610283 6.48244381 0.584774971
+v -31.9260006 5.29656792 0.788842976
+v -31.4901123 4.61203623 0.985855997
+v -31.8738728 8.1865778 0.583014011
+v -32.1063805 7.64503193 0.547564983
+v -31.5475845 8.67259026 0.655484974
+v -30.8018131 6.72281408 1.09732902
+v -32.2373276 7.06951189 0.546675026
+v -31.134079 9.08105278 0.763879001
+v -30.6073608 8.12825775 1.04771399
+v -30.4299564 9.43440533 0.975706995
+v -29.2308655 9.75558853 1.35442495
+v -27.3222237 10.0665207 1.93554497
+v -29.0982876 7.332798 1.63387597
+v -17.8648796 11.0130138 4.22981501
+v -16.5900841 10.9590073 4.48420095
+v -15.0168114 11.2850056 4.71926212
+v -19.4632397 10.6625566 3.93877411
+v -21.1786289 10.7101068 3.54289389
+v -20.6904602 10.6210566 3.670362
+v -17.9683285 10.6280994 4.25654221
+v -21.1053047 10.1623602 3.62441111
+v -19.0152702 9.88919163 4.12614584
+v -23.2529106 10.0683393 3.10066009
+v -24.5094357 10.3873892 2.7251451
+v -23.1182404 10.4161921 3.09437799
+v -21.8273811 9.07685089 3.56817698
+v -24.8308792 8.57915497 2.82790089
+v -23.3128033 8.49367523 3.24833012
+v -26.1121655 7.53147793 2.55568099
+v -25.7646484 9.542799 2.46129489
+v -27.4277611 7.41996288 2.164361
+v -28.2950821 8.91280365 1.750337
+v -11.3594255 11.9139643 5.17655277
+v -10.9469976 11.2091618 5.31809711
+v -10.993433 12.1417046 5.19227219
+v -11.9957628 11.7113523 5.12051201
+v -12.4351807 10.7433186 5.18087196
+v -13.1373682 11.5095901 4.98577881
+v -14.0152416 10.766921 4.94582891
+v -15.0049839 11.0552979 4.75095606
+v -9.70557976 13.9936428 5.0796032
+v -10.2666082 12.9626999 5.17047596
+v -8.88036442 15.7279272 4.88154984
+v -10.661973 12.4183388 5.19544888
+v -4.93713903 24.5603352 3.22848105
+v -4.19881201 25.3958797 3.04030704
+v -3.72797799 27.1638126 2.53971791
+v -5.13299417 23.6735916 3.45639896
+v -6.32417583 21.465416 3.92944098
+v -5.99667501 21.9034863 3.85005093
+v -4.47439194 24.1134262 3.38097906
+v -5.56791401 22.3811836 3.7586
+v -4.88024282 22.668045 3.73114991
+v -6.88229179 19.8391895 4.25850582
+v -7.6988821 18.3650208 4.50037289
+v -8.11867905 15.6844273 4.96609497
+v -7.53420496 17.473938 4.6908412
+v -6.82270098 18.9779243 4.44621992
+v -5.98476315 20.5387554 4.16878796
+v -4.90801907 21.4272346 4.03181601
+v -7.37504578 13.669467 5.35258913
+v -8.66789341 14.196291 5.15437078
+v -8.57868099 12.0888224 5.46502495
+v -6.833179 11.6607761 5.67237186
+v -7.28920317 10.2030344 5.80998087
+v -9.84268761 10.3727875 5.54686785
+v -1.62898397 30.5032387 1.52402699
+v -1.13819206 30.7675457 1.44033599
+v -2.1645689 29.9429798 1.70339894
+v -2.83274007 28.8967667 2.03055596
+v -2.88295698 27.9021816 2.34711599
+v -3.3495369 26.3577251 2.79966688
+v -2.57070708 24.2111511 3.43290496
+v 0.503434002 30.9273148 1.39861596
+v 1.03623402 30.7676487 1.44814396
+v -0.0507079996 30.9790974 1.37677801
+v -0.604993999 30.9267025 1.39319301
+v -0.209106997 29.4226284 1.91283906
+v 2.72673512 28.8954315 2.04938889
+v 2.060462 29.9438801 1.72057199
+v 2.8125689 27.7709942 2.40782905
+v 3.61780405 27.1639156 2.56617594
+v 1.52631903 30.5030518 1.53451598
+v 7.57043791 18.3737679 4.553092
+v 7.55459118 18.1525536 4.60007715
+v 8.15557957 16.3392334 4.89402199
+v 8.75327206 15.7279272 4.94506407
+v 6.20395422 21.465416 3.97456908
+v 6.66687679 20.245779 4.22631693
+v 7.2482419 18.6074142 4.53087711
+v 6.66165018 19.726368 4.34130192
+v 5.93837309 21.7290955 3.92866492
+v 4.89620018 24.3992462 3.30511308
+v 5.61743879 22.6813908 3.71430206
+v 6.90590715 18.14468 4.65153885
+v 6.2274828 20.4052296 4.22119284
+v 5.42436123 22.5949402 3.74901295
+v 5.52754879 21.8478489 3.9252851
+v 4.77058506 23.4057198 3.57616711
+v 4.25823307 24.9062386 3.19912195
+v 3.8607111 26.0512257 2.88919497
+v 2.98874307 25.9176369 2.96013188
+v 1.50267506 26.3329506 2.87304306
+v 0.865935981 27.971056 2.38019395
+v -0.150524005 25.9964962 2.97776198
+v 10.5324574 12.418313 5.27160501
+v 10.8639374 12.1417046 5.27100515
+v 9.89848328 11.4942274 5.46243
+v 10.1363592 12.9630766 5.23963881
+v 9.13954353 13.0924883 5.32437277
+v 8.37173271 11.835906 5.56574202
+v 8.51283169 9.83373928 5.79107094
+v 7.73838902 13.2977858 5.4196949
+v 9.57625294 13.9943724 5.14654684
+v 8.81808281 14.5968647 5.1270628
+v 7.23518991 14.4281063 5.28956604
+v 11.2299967 11.9140511 5.25857401
+v 11.8681011 11.7117538 5.20935011
+v 13.0148821 11.509326 5.07985878
+v 14.0405331 11.1054487 4.98251915
+v 14.9053354 11.283886 4.82477808
+v 12.61059 10.1411648 5.29823589
+v 11.1624718 9.89616108 5.5077548
+v 24.4231205 10.387538 2.89297509
+v 22.6603146 10.4301395 3.34497595
+v 27.2892303 10.0642147 2.10906792
+v 20.0540047 10.6523428 3.93031812
+v 22.1463566 10.1304798 3.50639892
+v 21.1072636 10.7068491 3.68474388
+v 19.0714989 10.4785786 4.15665913
+v 16.9300556 10.6350527 4.55623007
+v 17.7951794 10.8621531 4.36859512
+v 15.8292875 10.9739285 4.71143007
+v 17.767107 11.0113525 4.35422993
+v 14.7106142 9.71937847 5.03961897
+v 31.1146412 9.09124279 0.96082598
+v 31.5272236 8.68713856 0.85352999
+v 29.2898407 8.37691212 1.65391099
+v 30.4101048 9.43961811 1.16670299
+v 28.1782265 7.74816704 2.06782699
+v 27.4155159 8.96371937 2.19018006
+v 29.2069588 9.75612259 1.53589201
+v 25.6255035 8.3315649 2.77874088
+v 24.3316269 8.34294701 3.13403606
+v 22.4848709 8.68846321 3.57669806
+v 20.4207993 8.98897934 4.0317688
+v 21.9592209 7.33199978 3.82428694
+v 31.8555489 8.20458698 0.782314003
+v 32.0914307 7.66521788 0.745864987
+v 32.2272415 7.09094 0.744913995
+v 32.1710167 5.92576218 0.858789027
+v 32.2556458 6.50367117 0.780358016
+v 30.4221764 7.24548101 1.37536895
+v 31.0473099 4.21025419 1.35319996
+v 30.5939503 5.33752108 1.45145702
+v 29.8603745 4.28762007 1.75726104
+v 29.6985817 2.77994895 1.87015104
+v 31.8173695 5.20977592 1.02620995
+v 22.6309032 -3.72758794 3.88271904
+v 20.9286957 -4.70806599 4.23968601
+v 20.416914 -5.7074151 4.29755211
+v 21.429018 -3.68413591 4.17326021
+v 25.0257778 -1.58372998 3.31963801
+v 23.7310104 -0.836139977 3.67841411
+v 25.1216278 -0.180960998 3.30539489
+v 26.4312572 0.960458994 2.93081808
+v 25.009819 1.29863 3.32962608
+v 28.1910477 2.32596302 2.37146592
+v 27.5519352 0.725044012 2.60050797
+v 26.9244099 1.81181598 2.77199197
+v 27.4351444 2.86395788 2.58901811
+v 28.9481449 3.28165007 2.10057497
+v 28.8565693 5.650877 2.01183009
+v 27.6140881 4.65146589 2.46035409
+v 19.1466236 -5.17742395 4.60387182
+v 20.1968861 -4.92329979 4.39373684
+v 20.1820145 -2.8732059 4.48541307
+v 18.9157505 -6.41426086 4.57201099
+v 17.7946949 -8.40374184 4.63153601
+v 16.8568306 -8.76399899 4.77570105
+v 17.6283436 -8.80465412 4.62565184
+v 18.1968327 -7.8614049 4.60336304
+v 19.0121956 -7.01609278 4.50643682
+v 16.5960598 -6.8831768 4.98422289
+v 17.1747704 -5.53548813 4.96834517
+v 17.6471767 -11.0580816 4.37718391
+v 16.9707851 -11.1175203 4.49945211
+v 17.9687824 -12.9382372 4.06741905
+v 17.510088 -9.89734364 4.53719378
+v 17.518404 -9.22426319 4.60580683
+v 19.698679 -22.4537926 1.83336401
+v 19.4794979 -21.5329876 2.10923409
+v 20.096302 -25.1713104 1.01240003
+v 19.0586433 -19.3843784 2.69334507
+v 19.1169529 -19.0579052 2.74921298
+v 19.0226231 -20.8242054 2.37896609
+v 18.7230606 -18.564888 2.93569589
+v 18.2546997 -18.8851929 2.96527195
+v 18.5679646 -17.1956959 3.24227309
+v 18.1115589 -15.9037685 3.56912899
+v 17.7867317 -14.2595558 3.90580797
+v 18.5045891 -15.7639685 3.51343107
+v 17.0253372 -12.7897043 4.2699728
+v 16.6761417 -14.4992352 4.07683182
+v 17.3149471 -16.4366512 3.62823391
+v 17.3399162 -18.0879326 3.30710912
+v 15.4033813 -15.865386 4.07088614
+v 15.7966652 -11.1801367 4.69952297
+v 20.1199474 -29.1151295 -0.223570004
+v 18.9778786 -28.5030251 0.236279994
+v 19.4849262 -30.0632915 -0.402271986
+v 19.8477173 -29.6193752 -0.332704991
+v 20.2734699 -28.3456802 -0.00374899991
+v 17.7553253 -29.449276 0.175628006
+v 19.0770206 -27.3655357 0.579253972
+v 20.2779503 -27.1040516 0.391164988
+v 18.9942474 -26.1498871 0.969332993
+v 18.2141933 -24.2294827 1.68207002
+v 19.1135426 -23.7736378 1.616189
+v 18.4855995 -22.3553677 2.11705399
+v 19.3295727 -22.6083031 1.87420201
+v 18.5587502 -30.7161331 -0.432969004
+v 19.0489807 -30.4328251 -0.436632991
+v 18.0329037 -30.9020329 -0.386409014
+v 17.4874439 -30.9746189 -0.304881006
+v 16.753952 -30.8343639 -0.110363998
+v 15.657443 -30.3759251 0.253006011
+v 14.6456108 -29.2665329 0.805189013
+v 14.0123243 -29.4922276 0.830052972
+v 15.8744345 -29.3546143 0.564038992
+v 6.06172085 -24.694809 3.16978502
+v 6.45329523 -24.7536068 3.12988997
+v 4.75650597 -23.4629974 3.5760839
+v 3.64324498 -23.2511978 3.67664695
+v 8.85756111 -26.3940544 2.46044111
+v 8.25261307 -25.9245758 2.65674496
+v 6.24655294 -24.2960873 3.26632595
+v 7.77233315 -25.4505272 2.83086991
+v 10.0595579 -27.0325184 2.14528394
+v 11.6332865 -28.0810852 1.63074195
+v 10.4594803 -27.0429764 2.09835792
+v 10.0981903 -26.2984638 2.36209989
+v 11.1828089 -27.3074512 1.93022501
+v 12.1884375 -28.1426563 1.539307
+v 13.8336601 -28.0568752 1.32981503
+v 3.48850298 -20.5566444 4.33508921
+v 1.82444894 -21.1640167 4.23925686
+v 3.417943 -22.211874 3.94935894
+v 2.12970996 -19.2923908 4.64955091
+v 5.6167388 -21.8411922 3.93451309
+v 0.360056013 -21.6235218 4.14227819
+v 0.33644101 -20.2956562 4.45111895
+v 0.984166026 -21.8311043 4.08986807
+v 2.01293206 -22.3347397 3.95340705
+v -1.69700897 -19.3745098 4.62860012
+v -0.392435998 -18.4430428 4.84057379
+v -1.11109698 28.3260498 2.25876999
+v -1.36184704 27.1718712 2.61454201
+v -1.58270502 25.5651493 3.08411407
+v 0.303766012 24.4139481 3.42237091
+v -0.79191798 23.5828457 3.63912511
+v 2.2107079 24.0172634 3.50900006
+v -1.33619106 22.4412327 3.919276
+v -0.0895889997 21.4519787 4.1741538
+v -2.09990692 20.4257889 4.38195515
+v -3.06462598 22.1188564 3.95383406
+v 1.20599699 22.7639408 3.84970307
+v 2.58341193 21.47822 4.13914919
+v 3.90599298 22.2515888 3.90958405
+v 3.36474299 24.3505955 3.38625312
+v -4.18275404 20.2486744 4.34208918
+v -3.33998299 19.0824566 4.63099003
+v -5.44088221 19.1137276 4.51709509
+v -5.21963692 17.8509636 4.78774405
+v -1.00063097 20.1301842 4.46814203
+v 0.317436993 18.8022594 4.76029205
+v 1.35289097 20.0378418 4.49169397
+v 2.68576002 18.9019661 4.70868778
+v 4.11618423 20.4358521 4.32859516
+v 6.31203985 18.9054546 4.53793907
+v 4.90778494 18.7419796 4.65525293
+v -2.88160992 17.8440571 4.89779806
+v -3.98030901 16.7258358 5.06557512
+v -6.00634909 16.4245396 5.00350714
+v -1.02262199 17.8565235 4.94252396
+v 0.323677987 16.1347504 5.26919222
+v -1.96447396 15.933526 5.27867222
+v 1.36454904 17.3771667 5.03662395
+v 3.27009296 15.5853014 5.3165679
+v 3.8928349 17.4666061 4.95372486
+v 5.57514 17.1051579 4.9389348
+v 5.24894285 15.5889006 5.22979593
+v 6.88106203 16.3002453 5.00224018
+v -2.56669807 14.2554817 5.53735399
+v -4.61715889 13.5409718 5.55856895
+v -4.72915983 15.0903034 5.31217003
+v -6.28023481 14.7738972 5.26513004
+v -6.37838507 13.0734396 5.51522398
+v -1.08542597 14.0804682 5.59723902
+v 0.794746995 14.0515404 5.61079788
+v -0.34097299 12.7793007 5.79429913
+v 1.70855701 15.4087868 5.38237715
+v 2.93550706 13.538847 5.64947796
+v 5.19352913 13.5729609 5.55215406
+v -4.97409391 12.3496456 5.70593882
+v -4.7622838 10.6513548 5.9305048
+v -2.72726607 12.2152452 5.82593584
+v -2.75536299 9.95858765 6.09340382
+v 0.50810498 11.0460215 6.02045202
+v -1.42316103 11.0314236 6.00693607
+v 1.68067503 12.1118727 5.87530899
+v 1.75982296 10.5105171 6.06980705
+v 3.84298992 11.7647514 5.86392498
+v 4.9332571 10.8219471 5.92919683
+v 6.62898493 12.1242018 5.66587305
+v 6.53579521 10.3864298 5.88352108
+v -5.69843006 9.0981617 6.03921986
+v -5.06681585 7.71033478 6.20386887
+v -7.37194395 7.704072 6.04497719
+v -8.15904045 8.93118191 5.86568403
+v -9.75361919 7.99231911 5.79249096
+v -4.02820015 9.03616619 6.13979578
+v -0.600305974 9.40974045 6.19676208
+v 0.130866006 7.24576998 6.395823
+v -1.95103395 8.05535507 6.30196714
+v 3.388381 9.14985466 6.17585993
+v 1.47987294 8.60124969 6.2721839
+v 5.40453911 9.08469486 6.08961678
+v 4.79222822 7.23849201 6.286798
+v 6.58463287 8.63443565 6.06117487
+v 8.4477272 8.07863712 5.96542501
+v 9.78104591 9.6699028 5.6858511
+v 10.8434505 8.18107319 5.71454
+v -16.0158348 9.92099285 4.70740223
+v -17.4516354 8.90135288 4.54678011
+v -16.2608261 7.61169386 4.88725901
+v -18.3655949 7.92769909 4.4535079
+v -19.7906094 7.60978508 4.17886877
+v -20.1776028 8.73677254 3.99040794
+v -21.9103661 7.3452549 3.70652294
+v -12.8668947 8.92817307 5.31573582
+v -14.5306568 8.78244877 5.07776403
+v -18.2071686 6.31411791 4.61359978
+v -16.2434959 5.31648207 5.05182505
+v -18.8753128 5.34777403 4.53860998
+v -20.8262024 4.59022284 4.147645
+v -21.4570885 5.9754529 3.91923308
+v -13.4812593 7.01541996 5.39068222
+v -14.8215351 6.67299795 5.20672178
+v -14.048686 5.05521011 5.43586302
+v -12.8289356 4.58876181 5.63981819
+v -11.4420938 8.94165421 5.50717306
+v -10.4237919 7.04257202 5.79412603
+v -11.8897419 6.5977149 5.64650679
+v -9.7405262 5.66823387 5.96544695
+v -11.1940603 4.60124493 5.85726881
+v -8.29365921 6.41065502 6.06151199
+v -7.47505188 5.12327909 6.21502495
+v -6.4209218 6.35293913 6.21935177
+v -4.9207058 5.98804283 6.34033108
+v -3.37858009 6.69884014 6.36405516
+v -1.74291694 6.36329508 6.4376092
+v -2.78698301 5.24906301 6.47948503
+v 0.267123014 5.43110991 6.51898909
+v -1.25566804 4.9281249 6.5331521
+v 2.43215299 7.04927301 6.3845048
+v 2.32324195 5.69472504 6.48001623
+v 5.8525672 5.46383476 6.34953785
+v 4.07330179 5.69905615 6.42383099
+v 7.10809088 7.05959606 6.15688896
+v 7.25683784 5.00053883 6.28238583
+v 8.91990566 4.30789089 6.176723
+v 10.5239363 6.65526485 5.87276888
+v 9.35853863 6.16159296 6.02958393
+v 11.1689892 5.0363121 5.90074396
+v 14.2440929 8.67818642 5.21406412
+v 13.1506748 7.74232292 5.46017218
+v 12.2918224 6.43170691 5.67593002
+v 13.855485 5.38019896 5.52565193
+v 16.8048439 9.46565914 4.70887709
+v 15.9646158 8.23321533 4.97851419
+v 15.0982094 6.65898991 5.25013781
+v 16.8474407 5.77272701 5.01205206
+v 15.5335035 5.04437208 5.280756
+v 19.3713646 8.72436523 4.28199816
+v 18.9679203 7.71471405 4.45714521
+v 18.0954361 9.21924877 4.49270678
+v 17.4541569 7.47955608 4.77431917
+v 18.8164406 5.82493496 4.63132191
+v -26.1869392 5.29250288 2.69359493
+v -27.6886578 5.52617979 2.2227931
+v -26.9712391 3.61872101 2.54165792
+v -25.969389 2.37065005 2.88474202
+v -27.7206192 1.96092105 2.36275792
+v -23.9851723 6.66952276 3.22625303
+v -24.2613964 5.44686985 3.23298597
+v -24.8993931 3.94050193 3.13453889
+v -23.4079647 2.23935795 3.60014296
+v -22.9208679 3.70723605 3.67695904
+v -21.4887943 2.20392489 4.08178997
+v -19.5608177 3.2917881 4.48987198
+v -18.2668171 2.48599195 4.78478384
+v -17.1811104 3.75196505 4.95532084
+v -15.2335939 3.62292004 5.30998611
+v -16.3614063 2.189291 5.15977383
+v -13.0894527 2.69064212 5.678267
+v -14.5273123 1.68370605 5.48310423
+v -11.4889307 2.95217395 5.88627815
+v -8.11567879 3.6371491 6.22803402
+v -9.46561146 3.97364807 6.08302689
+v -9.43028927 2.56844711 6.13881111
+v -6.42567205 3.98071599 6.35193396
+v -5.07250977 2.96595001 6.47701788
+v -6.83942699 2.17149401 6.38214684
+v -4.11078882 4.0001421 6.49034119
+v -2.12094808 3.15747309 6.59412718
+v -3.0072391 1.66307497 6.607481
+v -0.670166016 3.25803494 6.6156168
+v 1.26326394 3.77156091 6.59700918
+v 2.78313589 3.5907321 6.57660103
+v 4.81059885 4.33822203 6.46673584
+v 6.11327505 2.252738 6.46837378
+v 4.75916004 2.97621393 6.52076483
+v 7.55467892 2.37846208 6.363657
+v 10.7782717 3.55287695 6.01621008
+v 11.568511 2.70605493 5.95325422
+v 9.21238041 1.93258202 6.22866917
+v 13.0334387 3.91810989 5.71806479
+v 14.2119617 1.97789001 5.61036301
+v 15.3106394 3.37814808 5.39566708
+v 16.8823872 3.69026804 5.1114068
+v 18.2113209 4.03365993 4.84687614
+v 19.9958916 4.03801584 4.4792161
+v 18.6083832 2.34747505 4.82864189
+v 20.5938988 6.44930887 4.20870018
+v 21.3037949 4.52827501 4.16295624
+v 22.1953297 3.36345601 4.00433302
+v 20.2192326 2.34200406 4.4892149
+v 23.7737389 6.96420097 3.39899898
+v 24.7339516 6.00573683 3.21401
+v 22.6141605 5.45270395 3.79889202
+v 24.4785004 4.22421217 3.38404107
+v 23.7607307 2.54753304 3.6367929
+v 26.5528355 7.41466284 2.59212995
+v 27.4279385 6.41838789 2.40566492
+v 25.8744431 5.46647787 2.9294641
+v 26.2762184 3.84931898 2.89778304
+v 25.4868088 2.80583906 3.16160488
+v -24.1149349 0.919443011 3.432096
+v -25.4158077 1.13294494 3.06854296
+v -22.405735 0.397879004 3.88233089
+v -19.7678089 1.31902897 4.4935112
+v -17.9129715 0.901835024 4.88610792
+v -18.8401527 -1.25696397 4.69515705
+v -20.493639 -0.178496003 4.34080505
+v -15.6772909 0.313497007 5.30687189
+v -17.5770149 -0.643646002 4.95461798
+v -13.43997 0.523904979 5.66466522
+v -11.3812494 1.31550705 5.9401269
+v -7.74722004 0.846773982 6.33104181
+v -5.688241 0.876362026 6.48277283
+v -4.4614439 1.32119906 6.54902792
+v 4.34309578 0.928480029 6.5857048
+v 8.50663185 -0.0541869998 6.31396198
+v 7.11710405 -0.0718130022 6.42725992
+v 10.3007383 0.736814976 6.1355381
+v 11.3097677 -0.30893299 6.02143717
+v 12.5423717 0.893571019 5.86341
+v 13.2855139 -0.660310984 5.76352119
+v 16.6074619 1.70446897 5.22185612
+v 14.9764223 0.185984001 5.51298523
+v 19.0803757 0.253448009 4.7631259
+v 17.3686523 0.186704993 5.0998168
+v 21.8696003 1.67872202 4.12820721
+v 20.7918167 0.693365991 4.39195585
+v 23.5170956 1.07959604 3.72807002
+v 22.6077251 -0.26730299 3.96533704
+v -16.8207169 -1.56117499 5.08818007
+v -15.4405928 -1.13273597 5.33994198
+v 8.02670383 -2.17772603 6.33142519
+v 8.83562279 -3.11309695 6.23125601
+v 10.3576155 -1.52344406 6.11997604
+v 10.5762539 -3.374825 6.04728079
+v 14.2268267 -1.74315596 5.6113739
+v 12.207406 -2.48390388 5.8798871
+v 13.6742306 -3.20057201 5.65696001
+v 15.5663967 -1.797364 5.40003395
+v 17.1161499 -1.79158998 5.1274991
+v 17.1538467 -3.35590291 5.07726097
+v 18.5107613 -2.00849009 4.85727882
+v 20.5292187 -1.03083098 4.44642019
+v 22.1095581 -2.03577304 4.0648818
+v 7.66349506 -4.52182198 6.27746105
+v 9.84697723 -4.46602583 6.07848597
+v 10.5297613 -6.50392389 5.88723516
+v 9.33073521 -6.04563093 6.041996
+v 12.0440025 -4.85886908 5.80608702
+v 13.8753595 -5.47515821 5.51986599
+v 15.6216507 -4.4164381 5.30358601
+v 14.8663893 -6.49907303 5.30390215
+v 18.5125408 -3.961555 4.79306507
+v 7.527637 -6.82867002 6.14775276
+v 6.72937202 -8.66096592 6.05345106
+v 5.11105108 -7.52743101 6.25044394
+v 3.71859908 -6.545681 6.38575792
+v 2.97597599 -7.62150002 6.32937002
+v 11.1707678 -8.39331818 5.66034079
+v 8.98824596 -8.30442142 5.901124
+v 12.4460363 -6.7522192 5.63558102
+v 13.4658365 -8.3845396 5.36273909
+v 15.4850512 -8.78785419 5.01114082
+v 0.909029007 -8.07157898 6.32920599
+v -1.08446395 -8.66213608 6.26898718
+v -0.400963992 -7.30833817 6.39194107
+v -2.67220592 -7.78133488 6.30867386
+v 1.73213601 -9.56258106 6.17796993
+v 2.66224408 -11.3039227 5.96505499
+v 0.125213996 -11.5474768 5.96501684
+v 0.0528259985 -9.91176605 6.1516881
+v -1.82064903 -10.649622 6.04957724
+v -2.98496199 -9.69048691 6.1196909
+v 4.03734779 -9.21810627 6.14892101
+v 6.48022509 -9.78586197 5.95763206
+v 5.18188 -11.1785803 5.88003492
+v 4.09097385 -10.5694151 6.00066423
+v 8.13172245 -10.1662254 5.79140997
+v 7.08977699 -11.5261021 5.71559811
+v 9.81557846 -9.88172054 5.66326523
+v 11.546772 -10.0931273 5.44498014
+v 10.8057356 -11.6039734 5.35617685
+v 9.16953087 -11.1950455 5.57805395
+v 12.8446922 -10.2731075 5.25740719
+v 14.1417398 -10.170332 5.0824461
+v -4.63337183 -10.9053316 5.91269588
+v -6.42421103 -10.1931515 5.88203907
+v -3.59830904 -11.9599113 5.83037281
+v -2.76668906 -13.01682 5.72097206
+v -1.96101904 -13.9466429 5.60569382
+v -5.06299686 -13.5390511 5.54095888
+v -5.3933239 -12.0660391 5.72364616
+v -7.18603277 -11.8947458 5.62014914
+v -7.27425623 -13.2866135 5.42418814
+v -0.904640973 -12.5737572 5.82243586
+v 1.00538003 -12.6272688 5.8198328
+v -0.126093999 -13.8462648 5.64891195
+v 2.34594107 -13.2661076 5.71048307
+v 5.78913498 -12.536788 5.67255688
+v 4.08300591 -12.9827728 5.69525099
+v 8.84675217 -12.7020884 5.41497898
+v 8.85949039 -14.6396971 5.1278491
+v 6.76813316 -13.6677284 5.44759512
+v 10.4130268 -13.6294537 5.12257624
+v 12.4634924 -12.2347736 5.06880283
+v 14.3800106 -11.8897381 4.83864403
+v 13.8476486 -13.4982405 4.69693899
+v 11.8107147 -13.8796644 4.91880894
+v 15.3751707 -13.8244486 4.40907192
+v -9.10082531 -12.5450153 5.35829592
+v -9.79480743 -13.6754913 5.12476301
+v -8.25615883 -14.6316662 5.13314486
+v -7.69669724 -16.3832283 4.88809586
+v -9.41956425 -16.1096973 4.77160501
+v -10.5447512 -15.9314518 4.67659903
+v -12.5551243 -15.4384785 4.50017595
+v -11.9792347 -16.861208 4.32645988
+v -13.3936367 -17.0414982 4.09185505
+v -5.62248898 -15.9654293 5.12023497
+v -6.63750505 -14.9646521 5.21527576
+v -4.34482622 -16.898983 5.024086
+v -3.7099731 -14.8783236 5.40310192
+v -1.77937603 -15.5090036 5.36235094
+v -2.90338898 -16.3740005 5.18025589
+v -0.238893002 -16.0353527 5.2944231
+v 1.79105997 -14.5452938 5.528512
+v 2.86219311 -16.2831173 5.21436024
+v 1.06108296 -15.6165056 5.36376476
+v 4.02037716 -14.6057596 5.45693588
+v 6.07728577 -15.5486107 5.19433022
+v 4.603508 -16.3451538 5.13948393
+v 7.70086098 -15.5568037 5.07669783
+v 8.85067844 -17.296854 4.66589499
+v 10.7452488 -15.9048214 4.72043705
+v 12.6217213 -14.920785 4.64959717
+v 14.0773401 -15.5273304 4.33993483
+v 12.3993359 -17.2190323 4.27677488
+v -14.5558977 -15.5431309 4.17870378
+v -14.3499861 -18.3831158 3.68067193
+v -15.0963554 -17.7336712 3.68636394
+v -16.6508522 -18.8542709 3.18188691
+v -10.8437414 -17.9801579 4.25840521
+v -10.4891605 -19.6783752 3.94891191
+v -12.3509846 -19.0867863 3.8366251
+v -7.52789116 -18.5593681 4.48940516
+v -9.4058094 -18.4222565 4.33482599
+v -4.9377408 -18.5773163 4.66915512
+v -6.74024391 -18.3584938 4.59143782
+v -3.26717591 -17.9619045 4.86877298
+v -1.63415599 -17.6718159 4.97537708
+v -3.25384808 -19.5273838 4.5496912
+v 1.33154404 -17.6422024 4.99469614
+v 3.53457499 -18.6904774 4.73719788
+v 4.39489412 -17.9471626 4.84774113
+v 6.35840511 -17.3125782 4.86002207
+v 5.71507978 -18.9407787 4.57875776
+v 7.77387381 -17.9376698 4.63479519
+v 7.35734177 -19.8780842 4.26753998
+v 8.70295715 -19.655592 4.19981384
+v 10.9941101 -18.5494366 4.192204
+v 9.85031033 -19.556818 4.10729313
+v 13.6792822 -17.5937996 4.02396107
+v 13.1351452 -19.1640949 3.78461599
+v 14.9800091 -17.6162853 3.81697011
+v 16.4005947 -18.0531082 3.489465
+v 15.3663015 -19.7009506 3.32415891
+v -14.406394 -20.2322693 3.27739096
+v -12.7845211 -22.4064026 3.01102996
+v -14.9887733 -21.6553497 2.84830904
+v -16.6132927 -20.6984482 2.78265405
+v -11.926301 -20.8230553 3.51225591
+v -9.762743 -21.2926865 3.66905594
+v -8.86715126 -19.9679241 4.06368685
+v -7.80282211 -20.9035721 3.95385909
+v -6.20209122 -20.2517586 4.23016787
+v -4.58400297 -21.0399971 4.15273523
+v 5.77842617 -20.3686886 4.26785612
+v 8.03221703 -21.4886436 3.84526801
+v 10.3209677 -21.4861794 3.61972189
+v 11.9969645 -20.4688358 3.65391994
+v 13.3705177 -22.2738247 3.03576303
+v 11.921133 -21.9068871 3.32437301
+v 14.5235291 -20.7662315 3.22241211
+v 16.1665573 -21.5684319 2.75552297
+v 17.5696297 -19.9516087 2.86928797
+v 17.3382549 -21.9430199 2.449054
+v -16.1902828 -22.9600182 2.30784893
+v -15.0465307 -24.2684383 2.16445494
+v -16.8933754 -24.3971138 1.79236901
+v -13.7536459 -23.9298363 2.47139311
+v -11.9034986 -24.3018112 2.64101791
+v -10.3868017 -22.6053143 3.27816105
+v -10.1760216 -24.1378384 2.90323997
+v -8.41024208 -22.8732414 3.421103
+v -8.79028416 -24.6348457 2.91886401
+v 6.72141695 -23.0852184 3.5550611
+v 9.03773403 -22.9504547 3.39298201
+v 8.56199646 -24.4142132 3.05125093
+v 7.48505402 -24.5941238 3.09588289
+v 10.5965958 -23.4587383 3.09585905
+v 9.80035305 -24.7837486 2.82739902
+v 11.6038513 -23.8546028 2.87138605
+v 13.8492699 -24.224905 2.45897889
+v 15.1791048 -23.1391411 2.53427792
+v 16.0668316 -24.2149315 2.09394908
+v -15.990572 -26.1652393 1.45729303
+v -14.8815994 -27.7094593 1.18241096
+v -14.1809874 -26.1220875 1.78279698
+v -11.2330894 -25.8459339 2.29457092
+v 8.84428787 -25.8073597 2.635288
+v 11.8214178 -25.5191345 2.38376689
+v 13.467514 -26.2947788 1.92803895
+v 15.0011663 -26.061821 1.75314701
+v 15.807703 -27.3760872 1.21865797
+v 16.874279 -25.5175343 1.58063304
+v 17.2551479 -27.769516 0.826771021
+v -16.7347889 -27.8708725 0.792644024
+v -3.24615002 -22.363245 -2.42643404
+v -5.4551959 -23.6913128 -2.911304
+v -8.15140915 -25.4007397 -3.50854897
+v -3.23746395 -22.4728527 -2.21234488
+v -12.8721533 -28.1517849 -5.15348005
+v -8.32168388 -25.5645599 -3.43850398
+v -12.8902845 -28.2724457 -4.95654297
+v -5.43967199 -23.8032627 -2.68174005
+v -12.8722324 -28.1517391 -5.15334702
+v -15.5829411 -29.5347271 -5.89098787
+v -15.5513353 -29.4120369 -6.07542801
+v -16.325573 -29.5369244 -6.28372908
+v -16.9350872 -29.4442902 -6.38384104
+v -16.3727818 -29.6739349 -6.07337379
+v -16.9943886 -29.5827579 -6.17234898
+v -14.484354 -29.1134644 -5.50197792
+v -18.0918732 -28.8908062 -6.45439911
+v -18.1787186 -29.0284653 -6.22763205
+v -19.0205479 -27.9665184 -6.3304038
+v -18.6898251 -28.5956402 -6.19474792
+v -19.1193295 -28.0786285 -6.11718702
+v -17.606348 -29.3621216 -6.22181702
+v -19.3361588 -27.3988228 -6.20506477
+v -19.5648975 -26.711441 -5.97106791
+v -19.5693035 -24.5627136 -5.35577917
+v -19.7257938 -25.8535957 -5.52017403
+v -19.6773491 -24.6312199 -5.14105415
+v -19.6468563 -26.7860088 -5.78671408
+v -19.438961 -27.4977531 -5.99236012
+v -19.5849743 -24.5713596 -5.32927084
+v -19.3894997 -22.9973278 -4.85141993
+v -19.191349 -21.2655258 -4.1023078
+v -18.2831783 -17.6413383 -3.22668099
+v -18.8119488 -19.4255352 -3.534127
+v -18.3622093 -17.6682549 -3.0393889
+v -19.4970512 -23.0474281 -4.62482214
+v -18.2537479 -17.6362724 -3.27917409
+v -17.7900124 -16.1628342 -2.87322998
+v -17.372364 -14.9209423 -2.32450008
+v -16.0776062 -12.8657141 -1.90222895
+v -16.8063202 -13.8346167 -1.99535203
+v -16.1481495 -12.8715582 -1.69987595
+v -17.8901024 -16.1816807 -2.63838196
+v -15.2920341 -11.9958296 -1.68220198
+v -14.3060751 -11.1094284 -1.30076897
+v -10.8903513 -8.98707104 -0.574612975
+v -12.931941 -10.1349993 -0.788936973
+v -10.939105 -8.97519398 -0.377770007
+v -14.3578215 -11.1087799 -1.12412095
+v -15.3754997 -11.9896746 -1.44033003
+v -10.8741608 -8.99521637 -0.624836981
+v -8.27744102 -7.62637806 -0.196787
+v -5.36978912 -6.11112213 0.383691996
+v -2.19693899 -4.59931278 0.401309997
+v 0.176776007 -3.42550302 0.518145025
+v -2.16136003 -4.52964401 0.656090021
+v 0.147245005 -3.39959908 0.717423975
+v -8.22574139 -7.5456562 0.0670500025
+v 0.176666006 -3.4253931 0.518710017
+v 2.47307611 -2.22322512 0.507701993
+v 2.43777204 -2.19689798 0.754314005
+v 2.79663897 -1.99143898 0.495104998
+v 2.8477509 -1.85950506 0.551612973
+v 2.75432491 -1.97037697 0.746455014
+v 2.81602502 -1.85111701 0.763314009
+v 1.64133704 -2.63776207 0.756950021
+v 2.864465 -1.607463 0.725758016
+v 2.91047311 -1.60378098 0.507059991
+v 2.89832211 -1.48088503 0.503946006
+v 2.82506204 -1.38962495 0.718971014
+v 2.85122108 -1.49408495 0.754508972
+v 2.85149693 -1.73064399 0.751293004
+v 2.81167293 -1.274279 0.537280023
+v 2.72218108 -1.22773099 0.735992014
+v 2.55715609 -1.11508405 0.730390012
+v 2.64626908 -1.16826296 0.765744984
+v 2.78067899 -1.30696201 0.760311007
+v 2.465868 -1.02702296 0.521094024
+v 2.07241392 -1.09804702 0.753663003
+v 2.08193707 -1.03677797 0.516236007
+v -0.501060009 -1.43229198 0.570309997
+v 1.16157901 -1.22162199 0.793624997
+v -0.50525701 -1.48076999 0.772040009
+v 2.45271707 -1.08283806 0.771453023
+v -0.501049995 -1.43210101 0.569741011
+v -3.16892099 -1.86899495 0.469112009
+v -3.84848309 -2.04378295 0.683230996
+v -6.49335814 -2.41100693 0.245739996
+v -10.0193281 -2.98037004 -0.0754090026
+v -9.90468788 -3.01546097 0.160285994
+v -13.0797606 -3.45808697 -0.291765988
+v -17.3249283 -3.74507999 -1.08966196
+v -17.2800732 -3.68283701 -1.29974794
+v -18.7416401 -3.56599498 -1.61390996
+v -20.0125465 -3.31339097 -1.84317803
+v -18.8012142 -3.63207793 -1.37438798
+v -20.0712051 -3.36021304 -1.64240098
+v -15.4874392 -3.69668698 -0.702615976
+v -21.2106285 -2.88412094 -2.17744899
+v -22.4390163 -2.35938096 -2.39535999
+v -23.62327 -1.64974201 -2.76595211
+v -24.8179607 -0.821083009 -3.13885498
+v -23.6920147 -1.70429301 -2.55603504
+v -24.9233665 -0.872386992 -2.90079308
+v -22.4985466 -2.39340091 -2.22473192
+v -21.292923 -2.94423008 -1.94265902
+v -24.8453884 -0.837908983 -3.08495903
+v -26.0780258 0.119469002 -3.48845196
+v -27.3927193 1.11965096 -3.71791101
+v -27.2866325 1.16780996 -3.93410993
+v -28.4019051 2.18982196 -4.31938887
+v -29.3371506 3.14309192 -4.65188599
+v -28.5145798 2.14994907 -4.09345102
+v -26.1897659 0.0953309983 -3.29060102
+v -29.4328079 3.12443089 -4.48860502
+v -30.5558701 4.68741894 -4.9688921
+v -30.6866894 5.36577511 -5.29922295
+v -30.778244 6.01595497 -5.38625813
+v -30.826025 5.36653423 -5.08502483
+v -30.9227295 6.02946091 -5.17078495
+v -30.1211567 3.95510006 -4.73735714
+v -30.7211304 7.38369179 -5.23100424
+v -30.597229 7.35126209 -5.4146452
+v -29.9923592 8.55145264 -5.25394583
+v -30.4631386 8.02318954 -5.16607523
+v -30.0936298 8.5970726 -5.07060719
+v -30.889576 6.71496296 -5.20832014
+v -29.5000477 9.00011826 -5.17874479
+v -28.8662472 9.46117687 -4.76342106
+v -28.7668972 9.39398766 -4.95254612
+v -25.8011208 10.1280632 -3.84671307
+v -27.6752911 9.81656456 -4.3621192
+v -29.6184731 9.0681982 -4.9618721
+v -25.7422733 10.0770741 -3.99142408
+v -20.0384483 10.7644815 -2.29765701
+v -19.9265919 10.6805296 -2.50704408
+v -16.8212528 10.9730368 -1.84341002
+v -14.2219105 11.2549047 -1.30040896
+v -16.8506088 11.0617428 -1.60453606
+v -14.2534704 11.3004084 -1.16075695
+v -23.1102047 10.466877 -3.03042793
+v -14.1980801 11.2146778 -1.39143896
+v -11.5181856 11.6543303 -0.809201002
+v -11.4712086 11.5767946 -1.01325405
+v -10.9352713 11.7352133 -0.969744027
+v -10.670188 11.931488 -0.908303022
+v -10.992403 11.8179836 -0.735110998
+v -10.719286 11.9928236 -0.708607018
+v -12.5410566 11.4952879 -0.905826986
+v -10.3987617 12.1232433 -0.955035985
+v -10.1385117 12.6545372 -0.772949994
+v -8.84440327 15.0917492 -1.246629
+v -9.6565733 13.5843906 -0.830480993
+v -8.91214561 15.1626158 -1.02680302
+v -10.4664698 12.1990681 -0.719434023
+v -8.84415722 15.0914764 -1.24739301
+v -7.75266695 17.5365143 -1.606305
+v -6.52403116 20.5169277 -1.93897605
+v -3.9887321 25.8052654 -3.4589541
+v -5.2489171 23.3538132 -2.55736089
+v -4.03660297 25.9003201 -3.26055002
+v -7.82868814 17.6006298 -1.37100196
+v -3.99433899 25.8162766 -3.43730211
+v -2.40690589 28.4884338 -4.29985523
+v -2.45195794 28.6231403 -4.05962515
+v -1.83075404 29.0757523 -4.46804619
+v -1.28261304 29.4006596 -4.5146389
+v -1.86431003 29.203619 -4.24993086
+v -1.29977095 29.5067863 -4.32921696
+v -3.1481111 27.583353 -3.73414302
+v -0.0315850005 29.7259388 -4.43713379
+v -0.0290890001 29.6022701 -4.6240449
+v 1.23532295 29.4852676 -4.36788702
+v 0.616321981 29.6790485 -4.39214182
+v -0.677353024 29.6790352 -4.39626408
+v 1.77111495 29.075449 -4.45562983
+v 2.38579702 28.6124477 -4.06989813
+v 3.92724109 25.8162746 -3.40877199
+v 3.08208394 27.5852909 -3.71222806
+v 3.96827602 25.900423 -3.23148108
+v 1.80267 29.2045708 -4.23633623
+v 3.92175508 25.8052254 -3.43052006
+v 6.44502306 20.51931 -1.89276004
+v 7.67235088 17.5363579 -1.55075896
+v 8.76062298 15.0909224 -1.18531299
+v 7.75101805 17.5904694 -1.31356394
+v 8.82761574 15.1625977 -0.962969005
+v 5.1483922 23.4129009 -2.5341289
+v 8.76083279 15.0911608 -1.18463504
+v 10.054821 12.6500111 -0.699959993
+v 10.3134756 12.1230555 -0.88083303
+v 10.5846596 11.9315672 -0.831628025
+v 10.3799753 12.1981239 -0.645421028
+v 10.6325102 11.9927101 -0.631703019
+v 9.57247734 13.5809116 -0.760564983
+v 10.8501015 11.73528 -0.891187012
+v 11.4383526 11.6532145 -0.726760983
+v 11.3877964 11.5767183 -0.931023002
+v 12.4646645 11.4942379 -0.817300022
+v 14.1817455 11.2974138 -1.06730497
+v 10.906683 11.8179102 -0.655183971
+v 14.1366491 11.2261868 -1.26361704
+v 16.7695847 10.9708138 -1.72772002
+v 19.9318352 10.7685671 -2.14682794
+v 25.7467823 10.0757294 -3.82535195
+v 23.0570755 10.4678259 -2.87055492
+v 25.8163681 10.1357555 -3.64816904
+v 16.8078556 11.0587893 -1.49016201
+v 25.7333603 10.0593777 -3.85514998
+v 28.8762264 9.46936798 -4.58073902
+v 28.781683 9.40092945 -4.77099514
+v 29.5145454 9.01235867 -4.99264479
+v 30.0064926 8.56891918 -5.06456423
+v 29.6303978 9.08092022 -4.77555799
+v 30.1062908 8.61479092 -4.88067293
+v 27.6837883 9.81924438 -4.18628788
+v 30.7393436 7.41209078 -5.040411
+v 30.8491268 6.04573393 -5.15039587
+v 30.9140701 6.74273586 -5.01876116
+v 30.9604702 6.05826187 -4.96751595
+v 30.4781094 8.04629612 -4.97410917
+v 30.7233868 5.39030981 -5.11444998
+v 30.4958496 4.61738491 -4.74302387
+v 30.3733578 4.62367392 -4.93022823
+v 28.3297501 2.20779896 -4.11299276
+v 29.7539864 3.59345698 -4.39286518
+v 28.4480438 2.18354988 -3.90601492
+v 30.8624554 5.3930192 -4.89882803
+v 28.3467255 2.20358896 -4.08671808
+v 26.447155 0.382946014 -3.46690106
+v 26.3454971 0.136983007 -3.16107607
+v 23.9959126 -1.85948598 -2.76914191
+v 21.6339054 -3.986974 -2.194031
+v 19.6605988 -5.77634001 -1.76705694
+v 21.7071838 -4.06069517 -1.95880997
+v 19.7304859 -5.81203794 -1.59944105
+v 19.6367226 -5.7633729 -1.81602204
+v 17.6060848 -7.68548012 -1.54928696
+v 17.7123032 -7.74065781 -1.29715002
+v 17.2706184 -8.13768101 -1.503613
+v 17.2306499 -8.48575974 -1.31239998
+v 17.368187 -8.18537998 -1.27217996
+v 18.4467297 -6.99940777 -1.38831699
+v 17.0574856 -8.7691288 -1.52357495
+v 17.1548462 -9.36419296 -1.37766695
+v 17.1937065 -10.3595781 -1.72814298
+v 17.494545 -12.0743246 -2.01702809
+v 17.2978516 -10.3991804 -1.49819005
+v 17.5941849 -12.105298 -1.79983604
+v 17.1594048 -8.80496883 -1.29149699
+v 17.5078831 -12.0779457 -1.99205399
+v 17.9735489 -14.649291 -2.54952407
+v 18.6312771 -17.6439934 -3.00725198
+v 19.0930996 -20.9407082 -4.10884809
+v 19.4563313 -23.5594711 -4.90106297
+v 19.1847725 -20.8957176 -3.85562992
+v 19.5576744 -23.6242962 -4.69594812
+v 18.0838528 -14.6414785 -2.28423309
+v 19.4562683 -23.5595913 -4.90075302
+v 19.6713505 -26.7484341 -5.69811678
+v 19.5658474 -26.6639442 -5.90118313
+v 19.3907337 -27.4788971 -6.11774397
+v 19.1632404 -28.1364059 -6.06051111
+v 19.4921322 -27.577528 -5.90501499
+v 19.7140789 -25.5075207 -5.27885914
+v 18.2270927 -29.0823059 -6.16942596
+v 18.1557446 -28.9713402 -6.34910488
+v 17.0440655 -29.6323872 -6.12769699
+v 17.6617966 -29.4275074 -6.142097
+v 18.7445984 -28.664732 -6.10705423
+v 16.3810234 -29.6027184 -6.21132088
+v 15.637682 -29.6006413 -5.82334805
+v 12.9054623 -28.2070656 -5.09507513
+v 14.5309973 -29.1767807 -5.43768597
+v 12.924057 -28.3399506 -4.87774992
+v 16.4280262 -29.7408009 -5.99948883
+v 12.9072332 -28.2250671 -5.06923103
+v 10.7493172 -26.9451237 -4.36591721
+v 8.02416325 -25.4099388 -3.34663796
+v 5.41893291 -23.7129059 -2.88036704
+v 3.18720007 -22.389473 -2.38021588
+v 5.39309978 -23.8191776 -2.64983511
+v 3.17881489 -22.4835186 -2.19279099
+v 0.790907025 -21.1752777 -1.81974494
+v 0.802881002 -21.0731869 -2.01854801
+v 0.284579009 -20.8887119 -1.97699499
+v -0.0425539985 -20.9673824 -1.77890396
+v 0.277121007 -21.0026016 -1.74821103
+v 1.69916403 -21.6450653 -1.91979301
+v -0.362111002 -20.8888149 -1.97915697
+v -0.872566998 -21.1764164 -1.82562196
+v -1.77341402 -21.6424065 -1.931831
+v -0.357205987 -21.0031586 -1.74971604
+v -3.27084398 -22.2309093 -2.573915
+v -5.49165106 -23.5882378 -3.0425601
+v -8.04759979 -25.2168083 -3.65729403
+v -10.6015768 -26.7408352 -4.459692
+v -12.8742218 -28.0069199 -5.29329109
+v -12.8742495 -28.0065212 -5.29357195
+v -14.4495497 -28.9599133 -5.73911285
+v -15.5284424 -29.2771816 -6.2021842
+v -16.2963467 -29.4118881 -6.39515114
+v -16.8853683 -29.3018646 -6.50597286
+v -17.5270348 -29.2148476 -6.45203876
+v -18.5918159 -28.4615784 -6.42483902
+v -18.8918839 -27.8425846 -6.47484922
+v -19.2369156 -27.3231125 -6.31847286
+v -19.427454 -26.6197929 -6.13985777
+v -19.6033211 -25.760519 -5.75973701
+v -19.4206505 -24.5071869 -5.51515913
+v -19.4680767 -24.5221119 -5.47413397
+v -19.2825089 -22.9754848 -4.980721
+v -19.0439339 -21.1994247 -4.36837101
+v -18.686903 -19.3621674 -3.78182697
+v -18.1772289 -17.6328068 -3.38205695
+v -18.1070633 -17.6354332 -3.4562161
+v -17.6496506 -16.1749802 -3.05504107
+v -17.2576923 -14.9068975 -2.57199001
+v -16.558382 -13.8611603 -2.43783903
+v -16.6965523 -13.8232803 -2.25758195
+v -15.9493036 -12.9008722 -2.12168694
+v -15.2095318 -12.0326986 -1.828565
+v -14.2082357 -11.1485472 -1.51604795
+v -12.8423901 -10.149251 -1.058743
+v -10.8229322 -9.03164196 -0.746273994
+v -8.0239048 -7.59671211 -0.347451001
+v -5.12492895 -6.07174206 0.101487003
+v -2.20148706 -4.68295097 0.245526999
+v 0.232887998 -3.48171806 0.337686002
+v 0.214551002 -3.46283698 0.387968004
+v 1.68667305 -2.67238402 0.477605999
+v 2.57097602 -2.29060602 0.277381986
+v 2.86141205 -2.02483511 0.343567997
+v 2.94570208 -1.88830101 0.315741986
+v 2.90762997 -1.73308897 0.471893013
+v 2.98732901 -1.59741497 0.338568985
+v 2.97112012 -1.46368599 0.349994004
+v 2.96759295 -1.31996202 0.296649992
+v 2.87753797 -1.36311495 0.477654994
+v 2.87994194 -1.22799003 0.354561001
+v 2.76680493 -1.17782497 0.470082998
+v 2.6805439 -1.11501706 0.488240987
+v 2.63068604 -0.963319004 0.311058015
+v 2.58488202 -1.05696595 0.489995986
+v 2.48897099 -0.951578021 0.371744007
+v 2.102777 -0.937453985 0.337345004
+v 1.17894804 -1.15191603 0.517280996
+v -0.496470004 -1.37327099 0.44183901
+v -0.494495988 -1.34507298 0.393146992
+v -3.21799898 -1.79496503 0.317178994
+v -6.48093891 -2.30487394 0.0697029978
+v -9.81801891 -2.86048794 -0.229479
+v -13.038744 -3.38187099 -0.559504986
+v -13.0384798 -3.38099289 -0.561259985
+v -15.4295111 -3.61949492 -0.970875978
+v -17.2382126 -3.59334493 -1.45701802
+v -18.6799622 -3.44668007 -1.80174506
+v -19.931673 -3.19808292 -2.05814195
+v -21.1235275 -2.77193904 -2.35949111
+v -22.3457432 -2.27070904 -2.59771299
+v -23.5231037 -1.57739997 -2.9247179
+v -24.7207317 -0.744221985 -3.28929591
+v -25.9916859 0.202494994 -3.65132999
+v -27.1655979 1.23927104 -4.08407593
+v -28.3021526 2.24542594 -4.44680405
+v -29.2129402 3.18566394 -4.79772997
+v -29.1646137 3.20658302 -4.83912086
+v -29.969923 3.97225904 -4.97868204
+v -30.4020424 4.70059919 -5.19512987
+v -30.2614098 4.72698402 -5.3125701
+v -29.3038235 3.152632 -4.69751787
+v -30.5609512 5.37558079 -5.4138422
+v -30.6302242 6.00969696 -5.51210499
+v -30.7313175 6.68443012 -5.44331598
+v -30.4663677 7.31260204 -5.53975105
+v -30.3128109 7.96996593 -5.400702
+v -29.8335934 8.46080685 -5.43439913
+v -29.4022312 8.92523384 -5.29590321
+v -28.6694794 9.30815315 -5.08541107
+v -27.5570488 9.72857666 -4.60615587
+v -25.6472054 9.95064163 -4.16734695
+v -25.718483 10.0476685 -4.04089403
+v -25.662096 9.9737072 -4.14493895
+v -22.9382744 10.291934 -3.38033795
+v -19.8627625 10.5611525 -2.66227198
+v -16.8011494 10.8737698 -1.982939
+v -14.1437569 11.099678 -1.54714
+v -14.1843538 11.1874123 -1.43458498
+v -14.1438494 11.0999126 -1.54687405
+v -12.4763947 11.3982859 -1.16651797
+v -11.4145441 11.4797268 -1.162256
+v -10.8793659 11.6456079 -1.10402298
+v -10.5788593 11.8112583 -1.11573505
+v -10.3273821 12.0442963 -1.08950996
+v -10.0578766 12.5672522 -1.02023602
+v -9.97008801 12.4796534 -1.15710497
+v -9.57893372 13.4947567 -1.08956397
+v -8.74928474 15.0072527 -1.40201902
+v -7.66302109 17.48596 -1.74356103
+v -6.43205023 20.4013786 -2.21352196
+v -5.14164495 23.211462 -2.87572002
+v -3.907969 25.6941166 -3.608742
+v -3.92369509 25.7133465 -3.58859706
+v -3.09479809 27.4505634 -3.98054409
+v -2.33858109 28.3500175 -4.44023705
+v -1.78890705 28.9617901 -4.58656406
+v -1.24262202 29.2254219 -4.69790506
+v -0.664802015 29.5249653 -4.63525105
+v -0.0286369994 29.4687023 -4.75232315
+v 0.606795013 29.524931 -4.63067293
+v 1.17681205 29.1942234 -4.70810413
+v 1.21334302 29.3466263 -4.57317114
+v 1.73005199 28.9611969 -4.5744648
+v 2.33899999 28.473177 -4.30091
+v 2.27893305 28.3501644 -4.42348909
+v 3.03175497 27.4505386 -3.95837498
+v 3.85771799 25.7133923 -3.56050396
+v 3.84209609 25.694109 -3.58082509
+v 5.07036781 23.2117805 -2.83894706
+v 6.35612011 20.4013081 -2.1674459
+v 7.56062317 17.4409161 -1.72785902
+v 8.66525745 15.0053205 -1.34207702
+v 8.64992332 14.9919786 -1.36281097
+v 9.49486923 13.4947691 -1.02081001
+v 9.97327328 12.5673943 -0.947974026
+v 9.88658237 12.4797344 -1.08544695
+v 10.2429962 12.0441542 -1.01567197
+v 10.4947538 11.8112736 -1.03982902
+v 10.7952595 11.6455183 -1.02604103
+v 11.332118 11.479557 -1.08055305
+v 12.3980532 11.3978786 -1.077636
+v 14.1238041 11.2035666 -1.31303501
+v 14.0863771 11.1229076 -1.42333698
+v 16.7502918 10.8717518 -1.86712396
+v 19.874157 10.6467428 -2.42873001
+v 22.8983822 10.2732992 -3.24585104
+v 25.6661205 9.97052574 -3.98273802
+v 25.6526108 9.94911289 -4.00335693
+v 27.5693684 9.73059177 -4.43183184
+v 28.6853218 9.31477833 -4.90468979
+v 29.417881 8.93705654 -5.11059904
+v 29.8491116 8.47762299 -5.24642801
+v 30.3295326 7.9911561 -5.21089077
+v 30.5867691 7.36642504 -5.26284599
+v 30.7578201 6.710289 -5.25414324
+v 30.6652336 6.03467989 -5.32876205
+v 30.5985603 5.39908314 -5.22928905
+v 30.2416534 4.64242792 -5.06050587
+v 29.6029911 3.60861492 -4.63419485
+v 28.1985416 2.2555871 -4.25319004
+v 28.2234211 2.24504399 -4.23278999
+v 24.2676201 -1.50478601 -2.95654988
+v 21.5617886 -3.90668702 -2.329005
+v 19.5805721 -5.72963381 -1.90158904
+v 19.504652 -5.68089199 -1.98814797
+v 18.3345032 -6.94335222 -1.64433503
+v 17.4796371 -7.6164732 -1.70154405
+v 17.1709309 -8.08959198 -1.63455999
+v 16.9932289 -8.38994312 -1.68514895
+v 17.125246 -8.43966579 -1.53282201
+v 16.9520645 -8.73904133 -1.65500104
+v 17.0147171 -9.31957626 -1.65327501
+v 17.0226784 -10.326375 -1.92209101
+v 17.3464622 -12.0495434 -2.1884861
+v 17.3914394 -12.0556335 -2.14670205
+v 18.5198498 -17.7751026 -3.32344508
+v 19.3581829 -23.5192986 -5.01378107
+v 19.3275013 -23.5078793 -5.04384422
+v 19.5930233 -25.4154453 -5.51936579
+v 19.4182205 -26.5718403 -6.0556612
+v 19.2926941 -27.4027481 -6.23113012
+v 18.9474049 -27.9152527 -6.3879652
+v 19.0629158 -28.0273113 -6.25974798
+v 18.6467094 -28.5305271 -6.33896303
+v 18.0820122 -28.8536034 -6.4709301
+v 17.5828476 -29.2807751 -6.37209082
+v 16.9318676 -29.3378086 -6.45046091
+v 16.9845829 -29.4930725 -6.3246212
+v 16.352375 -29.4771461 -6.32298422
+v 15.5919085 -29.4189301 -6.07352591
+v 14.4955559 -29.0220184 -5.67443609
+v 12.9071903 -28.0833931 -5.21689415
+v 12.906208 -28.0902767 -5.21394396
+v 10.629199 -26.7482071 -4.44833517
+v 8.03611183 -25.2506313 -3.61493492
+v 5.45599508 -23.609621 -3.01132989
+v 3.20911789 -22.2659893 -2.53372908
+v 3.19092393 -22.359848 -2.42914891
+v 1.70948601 -21.5142612 -2.17291808
+v 0.816502988 -20.9533577 -2.15996504
+v 0.294364989 -20.7751217 -2.10548592
+v -0.0382420011 -20.7017021 -2.14481211
+v -0.0387500003 -20.8465004 -1.99678099
+v -0.370907009 -20.7756939 -2.10740709
+v -0.881003976 -21.0445747 -2.066113
+v -0.898068011 -20.9138794 -2.19666696
+v -1.77852798 -21.5098896 -2.18426108
+v -3.24800491 -22.3486462 -2.4496069
+v -3.31010103 -22.0685844 -2.684587
+v -5.51368713 -23.4428673 -3.14531898
+v -8.08918953 -25.002409 -3.82404995
+v -10.6542301 -26.5385551 -4.62001705
+v -12.8927336 -27.8344841 -5.39440012
+v -12.8926744 -27.8344765 -5.3945508
+v -14.4418516 -28.7545261 -5.90072393
+v -14.4457378 -28.5874386 -5.96493387
+v -15.5142555 -29.0962944 -6.29722214
+v -16.2649231 -29.2591076 -6.4820652
+v -16.8338032 -29.130703 -6.59028101
+v -17.4352837 -29.0216808 -6.6000309
+v -17.3653946 -28.8712006 -6.6531601
+v -17.9791546 -28.7132034 -6.60399389
+v -18.3516521 -28.1727638 -6.628016
+v -18.4574547 -28.2985096 -6.57385492
+v -18.7297592 -27.7023621 -6.55959177
+v -19.1146851 -27.2343388 -6.40758085
+v -19.2482319 -26.5278301 -6.25104284
+v -19.2755146 -25.6243496 -5.99541521
+v -19.4244347 -25.6785641 -5.92629194
+v -19.2852535 -24.4738846 -5.599895
+v -19.1140804 -22.8997974 -5.08847618
+v -18.8396721 -21.1795654 -4.54462624
+v -18.3724766 -19.4620609 -4.08986616
+v -18.5035629 -19.333065 -3.96391797
+v -18.0053158 -17.6468086 -3.53719091
+v -17.9494534 -17.657198 -3.56714606
+v -17.4678783 -16.226511 -3.19324803
+v -17.0817719 -14.9430866 -2.77772689
+v -16.4239445 -13.9056606 -2.5431869
+v -15.1000576 -12.0874243 -1.95621097
+v -14.0569525 -11.2556877 -1.70381403
+v -12.6070471 -10.3193951 -1.38227999
+v -12.717802 -10.2327251 -1.27290201
+v -10.713994 -9.13166523 -0.925840974
+v -10.7685003 -9.07797718 -0.848824978
+v -7.99197578 -7.73341608 -0.508185029
+v -5.02274513 -6.19895077 -0.118813001
+v -2.11283994 -4.75803423 0.106760003
+v 0.336508006 -3.59190798 0.160438001
+v 0.281329989 -3.53267694 0.241457
+v 1.78861403 -2.76161003 0.252909005
+v 2.69699502 -2.38028002 0.130616993
+v 2.96039605 -2.07294297 0.200368002
+v 3.12861609 -1.94510996 0.121454999
+v 3.04069495 -1.74827099 0.248042002
+v 3.17055607 -1.76247299 0.129933
+v 3.14070606 -1.58853102 0.162181005
+v 3.0746479 -1.43328595 0.210522994
+v 3.12042403 -1.250687 0.134286001
+v 3.00689197 -1.14052701 0.178378999
+v 2.85392404 -1.08887506 0.270693988
+v 2.76134706 -1.00120199 0.268009007
+v 2.69627094 -0.836504996 0.174897
+v 2.5280571 -0.843757987 0.233326003
+v 2.13957906 -0.771111012 0.175887004
+v 1.22871697 -0.86935401 0.185519993
+v 1.19920802 -1.00780106 0.29896
+v -0.489300013 -1.26972198 0.299066991
+v -0.483779997 -1.18610406 0.222626001
+v -3.19602299 -1.67604101 0.183506995
+v -6.47328377 -2.129282 -0.0880689994
+v -9.87317467 -2.70518899 -0.405889988
+v -13.0095139 -3.24718189 -0.751245975
+v -12.9899931 -3.0879879 -0.88124001
+v -15.3801489 -3.46818995 -1.17859304
+v -15.341754 -3.327564 -1.281443
+v -17.1882782 -3.4261651 -1.61521101
+v -13.0094137 -3.24650002 -0.751914024
+v -18.6191406 -3.27056408 -1.94560695
+v -19.8395195 -2.99933195 -2.22134995
+v -21.0301285 -2.6312871 -2.47842598
+v -22.2252617 -2.103405 -2.76298308
+v -23.4166813 -1.455387 -3.052176
+v -24.6996117 -0.723586023 -3.31251907
+v -25.8893661 0.394650012 -3.82174301
+v -27.4189014 1.74605596 -4.356915
+v -28.1619129 2.30140591 -4.54433823
+v -29.0361538 3.27017999 -4.92078876
+v -29.007988 3.28588796 -4.93244314
+v -29.7766685 4.029953 -5.14407921
+v -29.6229668 4.08642721 -5.21180201
+v -30.100975 4.76517391 -5.39594412
+v -30.4081116 5.38859081 -5.50371408
+v -30.4537659 6.00796318 -5.60023499
+v -30.523613 6.650105 -5.59666681
+v -30.360136 6.62259912 -5.65408802
+v -30.2658672 7.25032806 -5.64245701
+v -29.9729195 7.81315899 -5.61485386
+v -30.1221447 7.88412809 -5.55591202
+v -29.2851486 8.82875061 -5.38993597
+v -28.5332546 9.15705967 -5.20298576
+v -27.3349037 9.44552708 -4.85227299
+v -27.4306927 9.577775 -4.77890491
+v -25.5628109 9.80828667 -4.27706385
+v -25.5626278 9.8078146 -4.27715015
+v -22.900568 10.16467 -3.4970541
+v -19.7874336 10.3764315 -2.78902698
+v -16.7347965 10.7491713 -2.09357309
+v -14.0847349 10.9525661 -1.66538703
+v -14.0856838 10.9552164 -1.66396701
+v -12.3976545 11.2368326 -1.35733497
+v -12.3301506 11.0960417 -1.44499695
+v -11.3278961 11.3118868 -1.30255699
+v -10.8053188 11.5309744 -1.21821797
+v -10.2392855 11.9397192 -1.203269
+v -9.86300755 12.37181 -1.263345
+v -9.33264828 13.2654953 -1.36530399
+v -9.44604015 13.3729153 -1.27883899
+v -8.71804047 14.9804049 -1.44271004
+v -8.64098167 14.9180365 -1.50778902
+v -7.56404305 17.3859196 -1.85352194
+v -6.28075409 20.2576523 -2.39043403
+v -4.99311018 23.1299839 -3.0369761
+v -3.80022812 25.5690784 -3.71873498
+v -3.80059004 25.569376 -3.71868706
+v -2.99155903 27.2862091 -4.15331602
+v -2.89962697 27.1539803 -4.22619009
+v -2.26068902 28.2092705 -4.5293498
+v -1.73450303 28.8218994 -4.6819582
+v -0.639178991 29.3200703 -4.79455614
+v -0.617918015 29.1575394 -4.85641623
+v -0.0282760002 29.2612057 -4.85976124
+v 0.561374009 29.1575546 -4.85217094
+v 0.582157016 29.3204651 -4.79003477
+v 1.11782503 28.9883575 -4.80244398
+v 1.67646301 28.8216267 -4.6698451
+v 2.20156288 28.2093086 -4.51330614
+v 2.83828306 27.1539268 -4.20551586
+v 2.92963004 27.2861462 -4.13205099
+v 3.73566794 25.5695457 -3.69142509
+v 3.73530293 25.5692425 -3.69147801
+v 4.92310286 23.1300297 -3.00123501
+v 6.20608902 20.2576427 -2.34543109
+v 7.41716194 17.3557072 -1.84363198
+v 8.54351044 14.9046116 -1.45937002
+v 8.51971245 14.8859224 -1.47337902
+v 9.36338997 13.3728962 -1.21104395
+v 9.25051785 13.2654676 -1.29839206
+v 9.78013039 12.3717718 -1.19260895
+v 10.1558599 11.9396448 -1.12988102
+v 10.3600121 11.6258574 -1.18868899
+v 10.7219152 11.5308361 -1.14078295
+v 11.2464476 11.3117638 -1.22141099
+v 12.2538157 11.0956869 -1.357131
+v 12.3207254 11.236454 -1.26899099
+v 14.008152 10.9236975 -1.58012903
+v 14.0605211 11.0609913 -1.484375
+v 14.0181179 10.9516859 -1.56615496
+v 16.6847935 10.7469063 -1.97839999
+v 19.7868767 10.4579592 -2.608495
+v 22.8744698 10.1135139 -3.37754202
+v 25.5694275 9.80689812 -4.11338902
+v 25.5695858 9.80731964 -4.11332512
+v 27.4444942 9.57955742 -4.60545206
+v 27.3495827 9.44713688 -4.67949486
+v 28.5505066 9.16322613 -5.02328491
+v 29.3018513 8.84011269 -5.20546198
+v 30.1402512 7.9044528 -5.36721802
+v 29.9922066 7.83265114 -5.42704105
+v 30.4065113 7.31060219 -5.40281296
+v 30.3887596 6.64606905 -5.4670248
+v 30.5514832 6.6747098 -5.40865803
+v 30.4148426 6.03081179 -5.43523407
+v 30.445715 5.41209507 -5.32032299
+v 30.0403824 4.68916178 -5.17227602
+v 29.2521381 3.71805501 -4.86869001
+v 29.4090557 3.66476488 -4.80082989
+v 28.0434589 2.326612 -4.35740519
+v 28.0430698 2.3268671 -4.35743999
+v 26.0977211 0.389665991 -3.65904593
+v 23.7743149 -1.73293102 -2.99386501
+v 21.4329815 -3.83866405 -2.43414497
+v 19.3378239 -5.56626797 -2.10664392
+v 19.4668674 -5.65548611 -2.02006292
+v 19.362009 -5.58312607 -2.09236097
+v 18.1740971 -6.84740686 -1.82777095
+v 18.0360203 -6.76772881 -1.909235
+v 17.3423958 -7.54279709 -1.80303299
+v 17.042572 -8.03331375 -1.74388099
+v 16.8176498 -8.69899559 -1.76534796
+v 16.8108883 -9.27660847 -1.83035803
+v 16.8422527 -10.2973661 -2.02185106
+v 17.174757 -12.0335703 -2.29721999
+v 17.2047424 -12.0354824 -2.28410196
+v 17.784153 -14.704524 -2.7698319
+v 18.3092613 -17.7242641 -3.49338603
+v 18.8315296 -20.7734356 -4.310987
+v 19.1972599 -23.4691734 -5.13649988
+v 19.1705341 -23.4630661 -5.14844322
+v 19.4143009 -25.3310509 -5.68684101
+v 19.264492 -25.2727547 -5.75593281
+v 19.2280712 -26.4813385 -6.14655209
+v 19.1705818 -27.3137417 -6.32115889
+v 18.7865486 -27.7748451 -6.47326088
+v 18.5135155 -28.3670979 -6.48841715
+v 18.408596 -28.2414913 -6.54293013
+v 17.9697094 -28.6751366 -6.5685339
+v 17.4226627 -28.9368153 -6.573699
+v 17.4921741 -29.0878563 -6.52016783
+v 16.8708553 -29.1269302 -6.53280401
+v 16.3215237 -29.3246441 -6.40956879
+v 15.5696898 -29.1615963 -6.23211622
+v 14.4929562 -28.6495895 -5.89979982
+v 14.4888573 -28.8167152 -5.83576822
+v 12.922514 -27.9212666 -5.32277298
+v 12.9271774 -27.8921757 -5.33390522
+v 10.6680555 -26.5847206 -4.56738615
+v 8.07846546 -25.0359669 -3.78122711
+v 5.47844219 -23.463974 -3.1139009
+v 3.25491309 -22.07864 -2.66468
+v 3.23030496 -22.1738338 -2.60875392
+v 1.74332702 -21.326889 -2.35246611
+v 1.77208698 -21.1679573 -2.43081999
+v 0.846234977 -20.7587223 -2.2885921
+v 0.303097993 -20.6327877 -2.21104693
+v -0.378957003 -20.6327209 -2.21354508
+v -0.919776022 -20.7577534 -2.29460597
+v -1.83949995 -21.1636543 -2.44264197
+v -1.81114602 -21.3225327 -2.36405492
+v -3.31837296 -22.0387573 -2.69694996
+v -3.28128791 -22.1842384 -2.61202097
+v -3.37122297 -21.8575249 -2.7514081
+v -5.58168888 -23.2056332 -3.23274899
+v -8.14959526 -24.7875423 -3.90099192
+v -10.7255087 -26.3015842 -4.69171619
+v -12.9343023 -27.6163006 -5.44992113
+v -12.9343548 -27.6159573 -5.45004177
+v -14.509428 -28.4436569 -6.01138687
+v -15.5142155 -28.8967495 -6.34506512
+v -16.2287426 -29.0075932 -6.53789711
+v -16.767498 -28.8728199 -6.62573385
+v -17.3079262 -28.7131691 -6.67105913
+v -17.8409405 -28.4957485 -6.67815399
+v -18.2349873 -28.0568161 -6.6474061
+v -18.5855045 -27.5875263 -6.574821
+v -18.907053 -27.1032524 -6.46779823
+v -19.071043 -26.452528 -6.29212999
+v -19.1213264 -25.606987 -6.03870201
+v -19.1963654 -24.4572067 -5.63755417
+v -19.0906258 -24.4435596 -5.66065598
+v -18.5314503 -21.197197 -4.65225887
+v -18.2261143 -19.4869881 -4.1410532
+v -17.7753429 -17.6964245 -3.63731909
+v -17.7746029 -17.6966209 -3.63749599
+v -17.3053474 -16.3239231 -3.26834011
+v -16.8592453 -15.0275249 -2.90619206
+v -16.2766724 -14.0136728 -2.63211203
+v -15.7387581 -13.0102816 -2.30892992
+v -14.9099646 -12.2082882 -2.08544993
+v -13.9213324 -11.3743439 -1.80016899
+v -12.6544266 -10.5241108 -1.49585903
+v -10.5504713 -9.31682968 -1.07170498
+v -10.6254797 -9.22846222 -1.01700306
+v -7.87935877 -7.89492702 -0.626533985
+v -4.90206003 -6.35206318 -0.25228101
+v -1.973194 -4.92264318 -0.0422639996
+v 0.467328012 -3.73512912 0.0392110012
+v 0.402808011 -3.66404796 0.0887459964
+v 2.04438305 -2.98451591 0.0269300006
+v 2.82862997 -2.46684098 0.0407559983
+v 1.90308106 -2.86486506 0.117822997
+v 3.1508801 -2.16698909 0.0495470017
+v 3.30515099 -1.89400601 0.0404490009
+v 3.27995491 -1.49636602 0.0704170018
+v 3.36744499 -1.43468201 0.0320109986
+v 3.22063994 -1.10176504 0.0567159988
+v 3.00441909 -0.942498028 0.0991040021
+v 3.05338907 -0.758280993 0.0421580002
+v 2.87049389 -0.856388986 0.120118998
+v 2.61945105 -0.694359004 0.118741997
+v 2.19049001 -0.564019024 0.0742390007
+v 1.231143 -0.724931002 0.107836999
+v -0.477173001 -1.08348894 0.154534996
+v -0.47112599 -0.986809015 0.110179998
+v -3.18635297 -1.45408404 0.0445169993
+v -6.46757317 -1.91201401 -0.184939995
+v -9.87553978 -2.50236702 -0.514410973
+v -12.9877329 -3.0654099 -0.896322012
+v -12.9775906 -2.88670993 -0.965315998
+v -16.9381123 -3.26867104 -1.65366101
+v -18.4960098 -3.07142401 -2.01149511
+v -19.7779751 -2.82925391 -2.285532
+v -21.036911 -2.39372706 -2.5863781
+v -22.1293011 -1.93923199 -2.83795905
+v -23.2370319 -1.31914997 -3.12793803
+v -24.5448303 -0.557537973 -3.44878411
+v -24.5451984 -0.557996988 -3.44857788
+v -26.2688541 0.966179013 -4.047328
+v -28.8419628 3.38418102 -4.98068523
+v -28.8142357 3.40128303 -4.98620796
+v -29.4843483 4.17180395 -5.25065899
+v -29.909729 4.82260799 -5.43587589
+v -30.1575947 5.42252207 -5.5646019
+v -30.1882133 6.01326323 -5.6415472
+v -30.1928749 6.60837317 -5.67586994
+v -30.075943 7.18919802 -5.67378521
+v -29.828825 7.72698498 -5.639112
+v -29.6048698 8.30348873 -5.55255699
+v -29.1032295 8.65613747 -5.45781612
+v -28.3701687 8.95359898 -5.25569105
+v -27.3013458 9.29367256 -4.90770578
+v -25.4684086 9.61141586 -4.34567881
+v -25.4684658 9.61148357 -4.34557009
+v -22.8174419 9.93848515 -3.59598207
+v -19.7133656 10.1579227 -2.850214
+v -16.6545067 10.5210972 -2.19577694
+v -14.0148392 10.7514744 -1.74434602
+v -14.0038815 10.7186785 -1.75350595
+v -12.2852716 10.9446821 -1.49987698
+v -11.2434072 11.1389618 -1.37081099
+v -10.6794624 11.326623 -1.31972897
+v -10.4269381 11.6038914 -1.27631104
+v -10.0844212 11.7567387 -1.30380201
+v -9.72541428 12.2371683 -1.33026099
+v -9.20340157 13.1752243 -1.41793704
+v -8.53530025 14.834981 -1.57102203
+v -8.47831345 14.7914219 -1.59324503
+v -7.37477922 17.2378712 -1.952479
+v -6.11201 20.1209316 -2.47782207
+v -4.81107807 22.9755211 -3.13176394
+v -3.64971995 25.4179039 -3.78525901
+v -3.63330603 25.4020004 -3.79013109
+v -2.76802206 27.0797176 -4.2803359
+v -2.12552094 27.9919796 -4.58231306
+v -1.63240004 28.59552 -4.751297
+v -1.165977 28.9608383 -4.81945515
+v -0.582454979 28.9938431 -4.88323116
+v -0.0280809999 29.0620327 -4.89579582
+v 0.526216984 28.9939747 -4.8792448
+v 1.05977595 28.8087311 -4.82573414
+v 1.57493198 28.5955601 -4.73977518
+v 2.06675792 27.9919415 -4.56722498
+v 2.70717001 27.0796013 -4.26056623
+v 3.56884408 25.4020882 -3.76417398
+v 3.58519006 25.417963 -3.75918603
+v 4.74177694 22.975523 -3.09734297
+v 6.03796196 20.1209297 -2.43405008
+v 7.27370024 17.2212181 -1.90374196
+v 8.37405872 14.7736855 -1.53730595
+v 8.34808254 14.7538929 -1.545856
+v 9.12171841 13.1752338 -1.35192597
+v 9.64291382 12.2370443 -1.26053405
+v 10.0017576 11.7567472 -1.23145795
+v 10.2524118 11.4756279 -1.23920095
+v 10.5967979 11.3264685 -1.24311399
+v 11.16255 11.1389027 -1.29024506
+v 12.2093391 10.9442806 -1.41235006
+v 13.9377108 10.7169142 -1.65505302
+v 13.9481983 10.748457 -1.64611006
+v 16.6051636 10.5190535 -2.08102202
+v 19.7133274 10.251812 -2.69954705
+v 22.8027554 9.90788269 -3.45167589
+v 25.4756813 9.6094656 -4.18301392
+v 25.4756794 9.609519 -4.18309402
+v 27.3190422 9.29441929 -4.7360301
+v 28.3894634 8.95905399 -5.07741785
+v 29.1213493 8.66664791 -5.2746911
+v 29.6220856 8.31906509 -5.36622906
+v 29.8488331 7.74547577 -5.45232821
+v 30.1614914 7.23111486 -5.48555422
+v 30.2213783 6.63049793 -5.48986387
+v 30.2250404 6.033535 -5.45306921
+v 30.1955585 5.44563389 -5.38250494
+v 29.7870064 4.75762701 -5.21698189
+v 29.1336136 3.82297301 -4.91588688
+v 27.8484726 2.43285489 -4.41697884
+v 27.8484306 2.43290496 -4.41688919
+v 25.8994312 0.532191992 -3.74817991
+v 23.5912647 -1.605425 -3.0742569
+v 21.232439 -3.69583511 -2.52528906
+v 19.1841297 -5.45378494 -2.15234995
+v 19.1826897 -5.45323801 -2.15676808
+v 17.9105606 -6.66824818 -1.95680702
+v 17.1719341 -7.44814301 -1.863778
+v 16.8202858 -7.93562698 -1.83686697
+v 16.7756062 -8.3117466 -1.81496894
+v 16.5841846 -8.63560295 -1.85930502
+v 16.6331348 -9.24701977 -1.90579998
+v 16.4673462 -9.22302628 -1.93347299
+v 16.6838493 -10.2972021 -2.07267308
+v 16.9560528 -12.0232067 -2.36562204
+v 16.989809 -12.0244865 -2.35759807
+v 17.5088272 -14.6434908 -2.87052798
+v 18.0918198 -17.7056885 -3.57735991
+v 18.5960045 -20.765543 -4.40732718
+v 18.9601707 -23.4233456 -5.21176577
+v 18.9611835 -23.42346 -5.21174097
+v 19.1139736 -25.280468 -5.80784988
+v 19.0402851 -26.3970261 -6.1707449
+v 18.9631176 -27.1827106 -6.38243103
+v 18.6424294 -27.6593227 -6.48915577
+v 18.2920647 -28.1251621 -6.56290293
+v 17.8640289 -28.5079498 -6.5949688
+v 17.3655758 -28.778904 -6.5917592
+v 16.8245659 -28.9424362 -6.54563522
+v 16.2858047 -29.0733986 -6.46529388
+v 15.562789 -28.8697224 -6.27835417
+v 14.5575857 -28.5060158 -5.94605303
+v 12.9684935 -27.6759109 -5.38944197
+v 12.9684048 -27.6763592 -5.38933182
+v 10.7398281 -26.3475704 -4.63860893
+v 8.13928032 -24.8210793 -3.8576169
+v 5.5471611 -23.2267933 -3.20081902
+v 3.31614399 -21.868782 -2.7306869
+v 3.28638506 -21.9669228 -2.70886397
+v 1.82338405 -21.0160217 -2.47572708
+v 0.878735006 -20.5650196 -2.34514093
+v 0.321271002 -20.3877335 -2.29827595
+v -0.0377210006 -20.4666901 -2.26848292
+v -0.396492988 -20.3877335 -2.30085897
+v -0.951875985 -20.5640659 -2.35144806
+v -1.89050996 -21.011879 -2.48790407
+v -3.3808651 -21.8255539 -2.75824499
+v -3.45861197 -21.5938644 -2.75099802
+v -5.682374 -22.9227638 -3.23253298
+v -8.26450825 -24.4945164 -3.9076879
+v -10.8223743 -26.0516777 -4.6875248
+v -13.0056019 -27.3483562 -5.4375639
+v -13.0056286 -27.3483868 -5.43742085
+v -15.5109482 -28.7167645 -6.33568907
+v -14.5186758 -28.1617146 -5.97620583
+v -15.5307302 -28.5848198 -6.317348
+v -16.2094383 -28.714468 -6.50160599
+v -16.7156544 -28.6464119 -6.58136082
+v -17.2042694 -28.4743404 -6.62687397
+v -17.6594181 -28.2098618 -6.63608503
+v -18.0645142 -27.8650436 -6.60496902
+v -18.4019299 -27.4495602 -6.53985691
+v -18.6547852 -26.9752254 -6.43793392
+v -18.8136921 -26.3644676 -6.27513885
+v -18.8695812 -25.5412235 -6.02120018
+v -18.9729729 -24.4330349 -5.67014217
+v -18.8105183 -24.4250221 -5.66084099
+v -18.8104305 -24.4245319 -5.66254807
+v -18.6222363 -22.9346199 -5.18456078
+v -18.3264275 -21.2248478 -4.65385818
+v -17.9481697 -19.4515934 -4.13309193
+v -17.5177841 -17.776783 -3.66362691
+v -17.5177898 -17.776804 -3.66355991
+v -17.0694656 -16.3626347 -3.27895808
+v -16.5843964 -15.1641207 -2.95608902
+v -16.04245 -14.1372585 -2.66775703
+v -15.5558004 -13.1333971 -2.38071799
+v -15.4218988 -13.2344923 -2.40154099
+v -14.6995754 -12.4082165 -2.14668298
+v -13.7250729 -11.571044 -1.86378205
+v -12.3442612 -10.6356573 -1.52364099
+v -10.3989706 -9.51184464 -1.124717
+v -10.5022993 -9.3777771 -1.09252799
+v -7.72923803 -8.11080265 -0.692133009
+v -10.3989878 -9.51191044 -1.12447703
+v -4.724195 -6.59945297 -0.339047015
+v -1.78927195 -5.14857578 -0.119034998
+v 0.64665103 -3.9353981 -0.0322090015
+v 0.531898975 -3.80694294 0.00626000017
+v 2.18522811 -3.12494993 -0.0183479991
+v 0.646848023 -3.93565202 -0.0307490006
+v 3.03296208 -2.61357188 -0.0257329997
+v 3.40409088 -2.29633188 -0.0295739993
+v 3.51204705 -2.06760812 -0.0283070002
+v 3.57101393 -1.82166302 -0.0248470008
+v 3.58448195 -1.56947398 -0.0189139992
+v 3.55487108 -1.32231104 -0.0152770001
+v 3.48646092 -1.09152699 -0.00982199982
+v 3.38246894 -0.888127983 -0.00349500007
+v 3.2476871 -0.713038027 0.00437500002
+v 3.08629107 -0.567983985 0.00923299976
+v 2.66318989 -0.57080698 0.0634950027
+v 2.90409088 -0.453474998 0.0171879996
+v 2.70507407 -0.371372014 0.0219810009
+v 2.24329805 -0.360731006 0.0351839997
+v 1.27111995 -0.462615997 0.0497270003
+v -0.465079993 -0.887996018 0.0814500004
+v -0.454677999 -0.715499997 0.0526160002
+v -0.45469299 -0.715755999 0.0510779992
+v -3.17676592 -1.15982604 -0.0188909993
+v -6.47154093 -1.69986701 -0.219996005
+v -9.88382339 -2.23684406 -0.567698002
+v -12.9762583 -2.8429389 -0.974795997
+v -12.9731579 -2.67189193 -0.998993993
+v -12.9731102 -2.67192411 -0.999239028
+v -15.3224707 -2.91009998 -1.40448296
+v -17.1107616 -2.96637607 -1.75120294
+v -18.5141239 -2.85770988 -2.04838896
+v -19.7080975 -2.59966612 -2.31421089
+v -20.8642921 -2.20850205 -2.58502793
+v -22.0035629 -1.68428004 -2.86589599
+v -23.1452427 -1.027668 -3.1687541
+v -24.4059105 -0.376255006 -3.49530602
+v -24.3099823 -0.238057002 -3.49669504
+v -24.4059887 -0.376367003 -3.495296
+v -25.5153236 0.683430016 -3.86674905
+v -24.3099823 -0.238057002 -3.49669504
+v -26.6849117 1.66686904 -4.256423
+v -27.743845 2.64202499 -4.63400316
+v -28.6183567 3.537431 -4.97215605
+v -29.2386131 4.28324986 -5.22990417
+v -28.6187267 3.53768301 -4.970397
+v -29.6428871 4.91892385 -5.41577387
+v -29.869812 5.48516607 -5.533916
+v -29.9548283 6.02123308 -5.60209179
+v -29.9327335 6.56668091 -5.63806295
+v -29.8104782 7.10119009 -5.63996506
+v -29.5952454 7.60454702 -5.6040349
+v -29.4207821 8.16288757 -5.56146717
+v -29.2923756 8.05616474 -5.53513384
+v -28.9076557 8.43571568 -5.43623304
+v -28.253952 8.76397228 -5.23761702
+v -27.1389713 9.06209087 -4.88823795
+v -25.3665581 9.35098362 -4.34985209
+v -25.3665409 9.35098076 -4.34993505
+v -22.7381516 9.65077972 -3.61119199
+v -19.6584606 9.94924831 -2.85240507
+v -16.5683327 10.2319202 -2.212883
+v -13.93326 10.4834461 -1.76102602
+v -12.1875658 10.6920643 -1.51355302
+v -13.9333916 10.4833851 -1.75943696
+v -11.1262636 10.8795128 -1.39079499
+v -10.5351658 11.0678091 -1.33605301
+v -10.2936287 11.4178228 -1.32085598
+v -10.1951714 11.2793055 -1.31995201
+v -9.8873148 11.5362883 -1.31868303
+v -9.51903343 12.0424318 -1.34783399
+v -8.99774075 13.0010338 -1.42868304
+v -8.37178993 14.7125568 -1.60950899
+v -8.23197269 14.6113186 -1.60864305
+v -8.23203659 14.6112156 -1.61024106
+v -7.13334084 17.0630894 -1.96533597
+v -5.855268 19.9460278 -2.4977839
+v -4.57293606 22.8082676 -3.14239693
+v -3.44502902 25.2362232 -3.78639007
+v -3.44486809 25.2365551 -3.78473496
+v -2.61345601 26.8453617 -4.25864077
+v -1.99195004 27.8186302 -4.5628581
+v -1.49476504 28.3387318 -4.73043394
+v -1.09462595 28.7413902 -4.83076
+v -1.03862703 28.5848217 -4.80592012
+v -0.543226004 28.731966 -4.852736
+v -0.0282179993 28.7806835 -4.86854601
+v 0.486642003 28.731966 -4.84904194
+v 0.981770992 28.5845776 -4.8004818
+v 1.43718398 28.338728 -4.71989393
+v 1.93308401 27.8186302 -4.548738
+v 2.55232 26.8454647 -4.24004221
+v 3.3802619 25.236557 -3.760144
+v 3.38043499 25.2362232 -3.7618041
+v 4.50366783 22.8082905 -3.10971594
+v 5.78138304 19.9459724 -2.45585799
+v 7.05559921 17.063076 -1.91422701
+v 8.15172195 14.6112165 -1.55122995
+v 8.91611481 13.0010138 -1.36416698
+v 8.15164757 14.6113186 -1.54963899
+v 9.43676281 12.0424423 -1.27955401
+v 9.80480289 11.5362873 -1.24775195
+v 10.1126451 11.2793036 -1.248631
+v 10.4526138 11.0678082 -1.26043797
+v 11.0455484 10.8794127 -1.311077
+v 12.1118517 10.6916561 -1.42674303
+v 13.8676243 10.4823685 -1.66139305
+v 13.867425 10.4824343 -1.662974
+v 16.5196648 10.2298555 -2.0988369
+v 19.6334476 9.94601154 -2.72515988
+v 22.7300949 9.64755821 -3.46295404
+v 25.3745193 9.3488493 -4.18818188
+v 25.3745384 9.34885025 -4.18808508
+v 27.1554623 9.06288528 -4.71714306
+v 28.2732964 8.76880836 -5.06015778
+v 28.9268036 8.44503403 -5.25463676
+v 29.4390507 8.17721462 -5.37650299
+v 29.3112087 8.06967354 -5.35113001
+v 29.6159229 7.62127018 -5.41886187
+v 29.8347187 7.12008905 -5.45472288
+v 29.9613419 6.58658981 -5.45361614
+v 29.9876728 6.04083586 -5.420928
+v 29.9071884 5.50348902 -5.35287905
+v 29.5807934 4.83882618 -5.19068384
+v 28.8652973 3.910151 -4.88688517
+v 27.6118336 2.58100295 -4.40841198
+v 27.6118183 2.58100104 -4.408494
+v 25.6651516 0.717745006 -3.74889207
+v 23.3446064 -1.40589201 -3.0835681
+v 20.9919186 -3.51255703 -2.52811909
+v 18.9883556 -5.30452204 -2.15283608
+v 17.6835861 -6.52003479 -1.95889199
+v 18.9884739 -5.30446577 -2.15124607
+v 16.9253979 -7.30551386 -1.87227702
+v 16.5520515 -7.80969715 -1.84244001
+v 16.5583153 -8.2365942 -1.85250604
+v 16.3976078 -8.18214989 -1.84640801
+v 16.2952652 -8.57178211 -1.866907
+v 16.2876587 -9.19736958 -1.92932999
+v 16.415062 -10.2761717 -2.0790019
+v 16.7139225 -12.0226936 -2.3650701
+v 16.7138882 -12.0224705 -2.36667895
+v 17.2101707 -14.6397152 -2.87951803
+v 17.7807522 -17.7090931 -3.59372592
+v 18.3059902 -20.7682209 -4.41560698
+v 18.690815 -23.3945847 -5.20929003
+v 18.6908169 -23.3945656 -5.20932913
+v 18.8593807 -25.1843967 -5.78072405
+v 18.8551064 -26.3379574 -6.14764404
+v 18.7124157 -27.0523949 -6.35331917
+v 18.4594555 -27.5209217 -6.45507622
+v 18.1220322 -27.9328499 -6.52127123
+v 17.7169666 -28.2760201 -6.55446386
+v 17.261879 -28.5400105 -6.54798698
+v 16.7726879 -28.7118492 -6.50733709
+v 16.2663479 -28.7803345 -6.42888117
+v 15.5849915 -28.6497707 -6.24786091
+v 14.5662174 -28.223814 -5.91046476
+v 13.0405979 -27.4045067 -5.37655687
+v 13.0405731 -27.4044743 -5.37670183
+v 10.8368921 -26.0976753 -4.63372183
+v 8.25445938 -24.5281677 -3.86350799
+v 5.64780998 -22.9439716 -3.19984293
+v 3.40371704 -21.6044521 -2.72970009
+v 3.34829903 -21.7690277 -2.73736691
+v 1.88939202 -20.7531433 -2.47272992
+v 3.40385699 -21.6045856 -2.72814012
+v 0.933108985 -20.2849197 -2.34781098
+v 0.353302985 -20.0922375 -2.29700994
+v -0.0376139991 -20.2350197 -2.30001998
+v -0.0376470014 -20.0647678 -2.2894671
+v -0.428541988 -20.0922375 -2.29982901
+v -1.00623596 -20.2838974 -2.3545239
+v -1.95646703 -20.7488823 -2.48538208
+v -3.45876193 -21.593998 -2.7494359
+v 1.88789403 -20.7528152 -2.46915793
+v 0.933282971 -20.2854195 -2.34317493
+v 3.40385699 -21.6045856 -2.72814012
+v 0.81706202 -19.164217 -2.07895207
+v 0.353412986 -20.0923576 -2.29551411
+v -0.0376470014 -20.0647678 -2.2894671
+v -0.428662002 -20.0925217 -2.29762912
+v -1.95612204 -20.748867 -2.4832499
+v 10.7647076 -26.0543213 -4.60934114
+v 11.6617517 -26.2506123 -4.788445
+v 13.0409584 -27.4047871 -5.37475204
+v 9.11920357 -24.7918015 -4.02423716
+v 8.24853611 -24.5246906 -3.85812712
+v 8.87903118 -24.4084225 -3.88709402
+v 7.32977104 -23.6532459 -3.518291
+v 6.66328192 -23.0952301 -3.31173301
+v 5.62523603 -22.9312229 -3.19046402
+v 6.60455704 -22.307621 -3.09335589
+v 5.69551706 -22.1886978 -2.99684
+v 16.2671471 -28.7814083 -6.42514181
+v 16.7729664 -28.7121792 -6.50555277
+v 15.5851793 -28.6501408 -6.24681187
+v 14.5654182 -28.2247562 -5.90508604
+v 13.502162 -27.2081242 -5.38068819
+v 18.1226273 -27.9337864 -6.51787281
+v 18.459589 -27.5213547 -6.4532752
+v 17.7173214 -28.2767544 -6.55092812
+v 17.2623215 -28.5407543 -6.54520512
+v 18.8558598 -26.3391018 -6.14435911
+v 18.7124748 -27.0528412 -6.35187578
+v 18.8593807 -25.1843967 -5.78072405
+v 17.6812 -25.4692802 -5.60562801
+v 18.6908245 -23.3936195 -5.20656013
+v 17.1661835 -14.4036722 -2.82542491
+v 17.2397423 -16.0032997 -3.13022709
+v 16.7139225 -12.0226936 -2.3650701
+v 16.8095455 -14.8163204 -2.82749701
+v 17.7914505 -17.7661705 -3.60278893
+v 17.3705196 -17.2925797 -3.41623592
+v 17.9452572 -19.3579712 -3.98984098
+v 17.9233437 -20.0243587 -4.14508009
+v 18.3155155 -20.8262253 -4.4293561
+v 17.7027245 -22.1436329 -4.64100885
+v 18.0428295 -23.8903141 -5.20395088
+v 15.7574635 -10.3694458 -1.96296597
+v 16.4150181 -10.2758026 -2.07726407
+v 16.2877941 -9.19739628 -1.92859006
+v 16.2954102 -8.57202339 -1.86477995
+v 16.3976078 -8.18214989 -1.84640801
+v 17.6832981 -6.52088213 -1.95535505
+v 16.9261513 -7.30569887 -1.86591005
+v 18.9884739 -5.30446577 -2.15124607
+v 16.5521507 -7.80965996 -1.84094095
+v 19.8268471 -3.87835503 -2.26079988
+v 21.0385647 -3.47112393 -2.53549504
+v 23.266489 -1.47687602 -3.0588131
+v 25.6158657 0.670234978 -3.72731495
+v 27.6121655 2.58123398 -4.40657377
+v 23.3617897 -0.229674995 -3.07380605
+v 24.5779095 0.830008984 -3.42086196
+v 18.2738857 -5.2533021 -1.99195099
+v 29.909277 5.50401592 -5.34643793
+v 29.988018 6.04098415 -5.41911602
+v 29.5807934 4.83882618 -5.19068384
+v 27.3927078 3.44852304 -4.36171579
+v 28.8652973 3.910151 -4.88688517
+v 25.9901752 2.03344893 -3.86744094
+v 29.6162205 7.62133121 -5.41730404
+v 28.5161705 7.12662315 -4.98139811
+v 28.9278297 8.44514465 -5.25136709
+v 29.3112087 8.06967354 -5.35113001
+v 29.8354073 7.12020016 -5.4511652
+v 29.9616489 6.58662415 -5.45205116
+v 28.2732964 8.76880836 -5.06015778
+v 27.1576786 9.0631752 -4.71319199
+v 25.7639484 8.25847435 -4.18686008
+v 25.3744373 9.34908104 -4.18448591
+v 16.5407505 10.22791 -2.100981
+v 14.5005093 10.2785196 -1.73827195
+v 13.8426418 10.485671 -1.65453506
+v 18.3068161 9.90722847 -2.4221251
+v 19.6298523 9.94624615 -2.72062397
+v 19.3182812 9.86823368 -2.6383009
+v 19.9435558 9.3871851 -2.72699594
+v 21.5382652 9.58525944 -3.13870192
+v 22.8139954 9.63876343 -3.48217797
+v 24.5029297 8.02099895 -3.78470898
+v 23.1914082 7.813972 -3.39250708
+v 10.4528017 11.067831 -1.25836599
+v 10.1126785 11.2793055 -1.24679697
+v 11.0458403 10.8793926 -1.30682898
+v 9.80474472 11.5363665 -1.24624801
+v 8.23177147 11.4491262 -1.07112396
+v 9.43668556 12.0425463 -1.27594399
+v 9.24077511 10.6615076 -1.06952202
+v 8.91651154 13.0005198 -1.36156797
+v 8.00388813 13.0516376 -1.28093004
+v 8.1520071 14.6109304 -1.54861903
+v 4.45514917 22.9171963 -3.1312511
+v 3.38022804 25.2366199 -3.75988507
+v 5.40777397 20.3452301 -2.52217102
+v 5.78304577 19.942091 -2.45134401
+v 5.52793121 19.615799 -2.35740304
+v 6.21637201 18.3702145 -2.12032294
+v 6.40182304 17.5218754 -1.95491695
+v 7.05265999 17.0696316 -1.91382897
+v 6.43897104 16.399435 -1.73288596
+v 7.12181997 15.6013985 -1.63399303
+v 4.10745001 22.9879894 -3.13518596
+v 3.20942807 24.8745327 -3.64219999
+v 1.43700302 28.3390617 -4.71841812
+v 0.981693029 28.5857487 -4.79626179
+v 1.93331099 27.8193855 -4.54581594
+v 2.55232 26.8454647 -4.24004221
+v 2.14661288 25.7758751 -3.88679409
+v -0.0282090008 28.7821503 -4.86255598
+v 0.486638993 28.7322369 -4.84747696
+v -0.54323101 28.7322369 -4.85117197
+v -1.03864706 28.5850334 -4.80529594
+v -1.49464905 28.3394699 -4.7277379
+v -2.61216998 26.8490715 -4.25604582
+v -3.44483495 25.2366199 -3.78447008
+v -1.99195898 27.8186455 -4.56278801
+v -2.59400606 25.9218159 -3.96083689
+v -7.13257122 17.0652122 -1.96344495
+v -6.33424902 18.4374943 -2.185606
+v -8.23197269 14.6113186 -1.60864305
+v -5.52384615 20.3473454 -2.56462407
+v -5.85698891 19.942091 -2.49326491
+v -5.1009841 20.8054123 -2.65165401
+v -4.71205711 22.00173 -2.9325881
+v -3.82900906 23.6065044 -3.32021689
+v -4.56891918 22.8163147 -3.14418006
+v -3.02300406 24.4954967 -3.54240489
+v -7.41130781 11.4917812 -1.04887199
+v -8.00239563 13.2087021 -1.35518599
+v -8.99865913 13.0000219 -1.42463899
+v -9.51994228 12.0422468 -1.34028804
+v -6.98359108 16.12183 -1.76487398
+v -6.25855207 17.6475983 -2.0117929
+v -5.47075701 19.0991707 -2.27012706
+v -9.88728809 11.5363884 -1.31701803
+v -10.1271658 10.4355202 -1.202788
+v -10.1951714 11.2793055 -1.31995201
+v -10.5353069 11.0677528 -1.33456099
+v -11.1265297 10.8794861 -1.38666403
+v -12.1872139 10.6920872 -1.51181495
+v -13.9333916 10.4833851 -1.75943696
+v -22.7538109 9.64931488 -3.61252308
+v -21.4514694 9.69312668 -3.26873994
+v -25.3663692 9.35124874 -4.34610891
+v -19.1798649 9.89543343 -2.73155403
+v -21.5612946 9.39770603 -3.26198912
+v -19.6584606 9.94924831 -2.85240507
+v -18.0405865 9.94200611 -2.4837079
+v -16.5793133 10.23069 -2.21410489
+v -13.8977318 10.3048925 -1.730165
+v -26.2550526 8.35325813 -4.52052116
+v -27.1396885 9.06234932 -4.88604403
+v -23.8999596 8.91339493 -3.85694695
+v -28.9083958 8.43573284 -5.43383217
+v -29.2927303 8.05624008 -5.53420496
+v -28.2542763 8.76408386 -5.23663998
+v -29.5955544 7.60460377 -5.60246801
+v -29.8114338 7.10137796 -5.63572979
+v -29.933136 6.56673002 -5.63626719
+v -29.9552937 6.0212822 -5.60082912
+v -29.2392769 4.28344297 -5.22725105
+v -28.6198368 3.53781104 -4.96732807
+v -29.6441669 4.9193368 -5.41049194
+v -29.8701572 5.48537683 -5.5323391
+v -27.743742 2.64151311 -4.63119793
+v -26.6901131 1.67056203 -4.25143194
+v -27.4955616 3.22644901 -4.56698418
+v -25.5152245 0.683251023 -3.86483002
+v -24.3096905 -0.238635004 -3.49485803
+v -23.1456413 -1.02765 -3.16589999
+v -22.0036182 -1.68430805 -2.86553001
+v -20.8645077 -2.20840311 -2.58289289
+v -19.7084427 -2.59942007 -2.31258893
+v -15.3228426 -2.909904 -1.40296602
+v -15.6506929 -2.84713292 -1.45919597
+v -12.9731579 -2.67189193 -0.998993993
+v -3.18251109 -1.16052902 -0.0176839996
+v -6.26348114 -1.66817498 -0.199269995
+v -2.98564696 -0.841489971 -0.00758600002
+v -0.454677999 -0.715499997 0.0526160002
+v -7.76736403 -1.87105095 -0.331607997
+v -5.88409901 -1.381621 -0.170635998
+v -9.13201618 -1.96440697 -0.475131989
+v -9.89719009 -2.23933506 -0.567696989
+v -12.328702 -2.60082889 -0.898474991
+v -12.338191 -2.60203195 -0.901152015
+v -10.0880461 -2.26298308 -0.589155972
+v -12.9731579 -2.67189193 -0.998993993
+v -13.5775938 -2.74332905 -1.09672999
+v -14.1679344 -2.78028202 -1.19458401
+v -14.1648989 -2.78015208 -1.19508803
+v -13.5778856 -2.74336004 -1.09686601
+v -14.9997091 -2.79226708 -1.34063005
+v -14.1648989 -2.78015208 -1.19508803
+v 2.70511389 -0.37112999 0.0236729998
+v 2.90409088 -0.453474998 0.0171879996
+v 1.385553 0.403111994 0.0524090007
+v -5.14716816 -1.02084196 -0.114450999
+v 3.24772692 -0.713054001 0.005229
+v 3.08654809 -0.567826986 0.0108009996
+v 3.38271308 -0.887960017 -0.00194300001
+v 3.48680902 -1.09144294 -0.00801800005
+v 3.57133889 -1.82166803 -0.0232790001
+v 3.512393 -2.06775403 -0.0265069995
+v 3.58448195 -1.56947398 -0.0189139992
+v 4.38616085 -0.736558974 -0.0404810011
+v 3.55519295 -1.32234001 -0.0137400003
+v 2.18522811 -3.12494993 -0.0183479991
+v 3.03322601 -2.61374688 -0.023937
+v 3.03244901 -4.22830009 -0.084973
+v 0.646848023 -3.93565202 -0.0307490006
+v 3.98898911 -2.37379098 -0.0525939986
+v 4.23422098 -3.90634894 -0.117357001
+v 3.40429497 -2.2965529 -0.0282259993
+v -7.72681093 -8.10992813 -0.69016403
+v -6.00714779 -7.61780596 -0.49950701
+v -8.93152905 -9.16277599 -0.915274978
+v -10.3989878 -9.51191044 -1.12447703
+v -4.60297823 -6.53997803 -0.322515011
+v -1.72067797 -5.11479092 -0.115557998
+v 1.81810498 -4.2496419 -0.0571690015
+v -11.5237675 -11.7085867 -1.54324901
+v -10.7627163 -10.2340174 -1.25139105
+v -14.6997023 -12.408658 -2.14515591
+v -15.4214439 -13.2335625 -2.39741302
+v -13.7249956 -11.5717335 -1.85913301
+v -12.3454523 -10.6367569 -1.52180696
+v -16.043211 -14.13832 -2.66337609
+v -16.5847759 -15.1651869 -2.95141006
+v -17.0695438 -16.3630142 -3.27737403
+v -17.0836067 -17.8307915 -3.57900906
+v -17.5178833 -17.7772846 -3.66182899
+v -17.948637 -19.4532471 -4.13130283
+v -18.3266754 -21.2248249 -4.6523509
+v -18.6222763 -22.9347839 -5.18298292
+v -18.8105183 -24.4250221 -5.66084099
+v -17.3442955 -23.7231979 -5.11852407
+v -18.6548576 -26.9756718 -6.43647099
+v -18.4029675 -27.4514103 -6.53403521
+v -18.8138771 -26.3654461 -6.271667
+v -18.0053558 -25.5529423 -5.82043982
+v -18.8696671 -25.5416298 -6.01960611
+v -17.2044258 -28.4746666 -6.62532091
+v -16.716053 -28.6471043 -6.57941723
+v -17.6601162 -28.2110577 -6.63118792
+v -18.0646858 -27.8653584 -6.60342312
+v -15.5310669 -28.5853977 -6.31574583
+v -16.2097778 -28.7147255 -6.50016117
+v -14.5186872 -28.1618233 -5.9758029
+v -5.68552685 -22.9247074 -3.23180294
+v -8.25870895 -24.4910946 -3.90229702
+vt 0.565008998 0.459580988
+vt 0.558318973 0.468914002
+vt 0.557350993 0.46471101
+vt 0.57209897 0.476336002
+vt 0.55853498 0.473221004
+vt 0.55805397 0.47744301
+vt 0.556931019 0.481386006
+vt 0.550360024 0.490330011
+vt 0.553005993 0.487848997
+vt 0.542542994 0.506143987
+vt 0.54736501 0.492282987
+vt 0.555221975 0.484862
+vt 0.54409802 0.493689001
+vt 0.700343013 0.647772014
+vt 0.711170971 0.666224003
+vt 0.72132802 0.663015008
+vt 0.541260004 0.494109988
+vt 0.539830029 0.505589008
+vt 0.544295013 0.492803991
+vt 0.54953599 0.488685012
+vt 0.547078013 0.490989
+vt 0.551595986 0.485908985
+vt 0.566060007 0.488474011
+vt 0.553183019 0.482679993
+vt 0.554472983 0.471091986
+vt 0.560661972 0.462309986
+vt 0.553574026 0.467186004
+vt 0.554673016 0.475093991
+vt 0.554225981 0.479014993
+vt 0.498564005 0.934010983
+vt 0.485762 0.917596996
+vt 0.460177988 0.92603898
+vt 0.505070984 0.498463988
+vt 0.534213006 0.494275987
+vt 0.519403994 0.492664993
+vt 0.512400985 0.912670016
+vt 0.482223988 0.900354028
+vt 0.499612004 0.883350015
+vt 0.521449029 0.877582014
+vt 0.504261971 0.848842978
+vt 0.527593017 0.848924994
+vt 0.54221499 0.870395005
+vt 0.545386016 0.885169029
+vt 0.465409011 0.856884003
+vt 0.478435993 0.876479983
+vt 0.482903987 0.846711993
+vt 0.551413 0.834410012
+vt 0.555006981 0.856163979
+vt 0.569225013 0.841017008
+vt 0.569921017 0.823513985
+vt 0.533502996 0.823092997
+vt 0.557702005 0.804700971
+vt 0.510017991 0.808597028
+vt 0.492850006 0.823804975
+vt 0.465938985 0.828288972
+vt 0.470245004 0.807591021
+vt 0.429908007 0.824199975
+vt 0.443450987 0.834227979
+vt 0.440730989 0.806713998
+vt 0.437483013 0.853643
+vt 0.577866971 0.782270014
+vt 0.583824992 0.811136007
+vt 0.555087984 0.782495022
+vt 0.528478026 0.792337
+vt 0.510632992 0.777172983
+vt 0.538797021 0.766335011
+vt 0.490530014 0.791175008
+vt 0.471184999 0.777190983
+vt 0.430081993 0.779703975
+vt 0.451512009 0.787217975
+vt 0.560464025 0.756774008
+vt 0.542732 0.738965988
+vt 0.57971102 0.731684983
+vt 0.580165029 0.753109992
+vt 0.520072997 0.741936982
+vt 0.49525401 0.753265977
+vt 0.454860002 0.757369995
+vt 0.471100003 0.73792702
+vt 0.419546992 0.745931983
+vt 0.440607995 0.741868019
+vt 0.405694991 0.781040013
+vt 0.41762501 0.769802988
+vt 0.393406987 0.756303012
+vt 0.387876987 0.730651021
+vt 0.601466 0.711583972
+vt 0.576505005 0.699630976
+vt 0.557129025 0.717716992
+vt 0.546958983 0.690301001
+vt 0.492397994 0.723087013
+vt 0.52452302 0.712854028
+vt 0.502655983 0.698309004
+vt 0.529597998 0.68948102
+vt 0.469011992 0.707552016
+vt 0.434186995 0.722981989
+vt 0.443975002 0.70302099
+vt 0.416523993 0.699617028
+vt 0.402276993 0.717184007
+vt 0.385161996 0.684125006
+vt 0.586471021 0.675952017
+vt 0.607667029 0.679077983
+vt 0.59355402 0.642629981
+vt 0.572477996 0.648213983
+vt 0.621535003 0.707525015
+vt 0.626263976 0.652490973
+vt 0.625398993 0.682157993
+vt 0.562494993 0.683766007
+vt 0.549506009 0.663501978
+vt 0.512238026 0.66464901
+vt 0.46379301 0.674611986
+vt 0.484306991 0.679865003
+vt 0.486846 0.653972983
+vt 0.438493013 0.681123972
+vt 0.432449013 0.658774018
+vt 0.403542995 0.672959983
+vt 0.405416995 0.650004983
+vt 0.384763986 0.646775007
+vt 0.762585998 0.643564999
+vt 0.792500019 0.629297018
+vt 0.773033977 0.614175975
+vt 0.766601026 0.654601991
+vt 0.728788972 0.640900016
+vt 0.755459011 0.625487983
+vt 0.727631986 0.618694007
+vt 0.742273986 0.660139024
+vt 0.726944983 0.655658007
+vt 0.702553988 0.626632988
+vt 0.662052989 0.652324021
+vt 0.682199001 0.631237984
+vt 0.659057021 0.613762021
+vt 0.68473202 0.669663012
+vt 0.636995971 0.628849983
+vt 0.615723014 0.629688025
+vt 0.593071997 0.607757986
+vt 0.569148004 0.614645004
+vt 0.539969027 0.643635988
+vt 0.546319008 0.617371976
+vt 0.517592013 0.628682017
+vt 0.453880012 0.643827975
+vt 0.486809999 0.633499026
+vt 0.470266998 0.612459004
+vt 0.491068989 0.609548986
+vt 0.452960014 0.62351501
+vt 0.428676009 0.630092025
+vt 0.408345997 0.622368991
+vt 0.386047006 0.624517024
+vt 0.36253801 0.65298599
+vt 0.360035986 0.623265982
+vt 0.305610001 0.623179972
+vt 0.329737008 0.638027012
+vt 0.335485995 0.609973013
+vt 0.323857009 0.658784986
+vt 0.345355004 0.665295005
+vt 0.282038987 0.648294985
+vt 0.281605989 0.629112005
+vt 0.304816008 0.65921998
+vt 0.288558006 0.662965
+vt 0.230791003 0.645913005
+vt 0.259169996 0.642530978
+vt 0.261361986 0.619610012
+vt 0.237838998 0.615813971
+vt 0.266079992 0.660251975
+vt 0.245569006 0.656500995
+vt 0.215145007 0.630153
+vt 0.191796005 0.634781003
+vt 0.197414994 0.610293984
+vt 0.170651004 0.626748025
+vt 0.202676997 0.651072025
+vt 0.213342994 0.605692983
+vt 0.886301994 0.583763003
+vt 0.900159001 0.612836003
+vt 0.909474015 0.58168602
+vt 0.874710023 0.608870983
+vt 0.920346975 0.606509984
+vt 0.934810996 0.577848017
+vt 0.832422018 0.591675997
+vt 0.855172992 0.596098006
+vt 0.861661971 0.569096029
+vt 0.854134977 0.624282002
+vt 0.799960017 0.595044017
+vt 0.810454011 0.572884977
+vt 0.836297989 0.62023598
+vt 0.816003025 0.620706975
+vt 0.780113995 0.581959009
+vt 0.752506971 0.596038997
+vt 0.758562028 0.569422007
+vt 0.737628996 0.568812013
+vt 0.726092994 0.593070984
+vt 0.704859972 0.598868012
+vt 0.70430702 0.574286997
+vt 0.687492013 0.606049001
+vt 0.676126003 0.589501023
+vt 0.652661026 0.581732988
+vt 0.611038983 0.593223989
+vt 0.636712015 0.598471999
+vt 0.620472014 0.572367013
+vt 0.582629979 0.583998024
+vt 0.544417977 0.589712024
+vt 0.560956001 0.576543987
+vt 0.51978898 0.599994004
+vt 0.51454699 0.576191008
+vt 0.491160989 0.583507001
+vt 0.467422009 0.579128027
+vt 0.449393004 0.596280992
+vt 0.426757991 0.593370974
+vt 0.396589011 0.604808986
+vt 0.404834986 0.583700001
+vt 0.375340998 0.584160984
+vt 0.351640999 0.590885997
+vt 0.371109992 0.604592025
+vt 0.322535992 0.588382006
+vt 0.275130987 0.600013018
+vt 0.296952993 0.597600996
+vt 0.278333992 0.576987982
+vt 0.308710992 0.567906976
+vt 0.242847994 0.59414798
+vt 0.248892993 0.56901902
+vt 0.227758005 0.578472972
+vt 0.190931007 0.584850013
+vt 0.210449994 0.571910024
+vt 0.176397994 0.60194701
+vt 0.163966 0.579474986
+vt 0.130673006 0.612746
+vt 0.150952995 0.617227972
+vt 0.134066999 0.58434099
+vt 0.0746020004 0.600130975
+vt 0.101186998 0.612695992
+vt 0.105567999 0.594586015
+vt 0.0771400034 0.579876006
+vt 0.0590899996 0.605062008
+vt 0.0478539988 0.578067005
+vt 0.0795179978 0.619740009
+vt 0.104532003 0.563414991
+vt 0.890398026 0.548551023
+vt 0.860791981 0.549372017
+vt 0.871403992 0.529924989
+vt 0.854619026 0.517728984
+vt 0.836677015 0.535848022
+vt 0.828644991 0.557981014
+vt 0.823677003 0.523177981
+vt 0.796486974 0.549452007
+vt 0.773916006 0.542151988
+vt 0.750262022 0.540901005
+vt 0.71223098 0.554126978
+vt 0.702408016 0.535045028
+vt 0.734049976 0.525147974
+vt 0.676672995 0.551746011
+vt 0.660552025 0.56416899
+vt 0.637489974 0.557241976
+vt 0.612141013 0.539382994
+vt 0.645587027 0.533074021
+vt 0.594603002 0.559158027
+vt 0.587089002 0.527535021
+vt 0.568140984 0.545799017
+vt 0.541351974 0.55329901
+vt 0.546989024 0.524667025
+vt 0.517354012 0.552977979
+vt 0.518458009 0.533509016
+vt 0.470941007 0.54114598
+vt 0.483530015 0.560172021
+vt 0.495375007 0.529662013
+vt 0.471767008 0.516278028
+vt 0.495099008 0.503500998
+vt 0.446758002 0.556757987
+vt 0.447115988 0.525134981
+vt 0.428364009 0.526956022
+vt 0.425080001 0.559147
+vt 0.418417007 0.496123999
+vt 0.449858993 0.495321989
+vt 0.482879996 0.494093001
+vt 0.382351011 0.555985987
+vt 0.404051006 0.559261024
+vt 0.408758014 0.526059985
+vt 0.377840996 0.52619803
+vt 0.392673999 0.498555005
+vt 0.356876999 0.563817024
+vt 0.360877991 0.540289998
+vt 0.340216011 0.554942012
+vt 0.374720007 0.504733026
+vt 0.34790799 0.509392023
+vt 0.355293006 0.492684007
+vt 0.31783101 0.541414022
+vt 0.332511991 0.525237978
+vt 0.261411995 0.550305009
+vt 0.295073003 0.548671007
+vt 0.275804013 0.534397006
+vt 0.227960005 0.545000017
+vt 0.205270007 0.550673008
+vt 0.163462996 0.546840012
+vt 0.187520996 0.55567199
+vt 0.187227994 0.527234972
+vt 0.123911001 0.542484999
+vt 0.0929860026 0.526472986
+vt 0.128482997 0.561251998
+vt 0.146430001 0.555831015
+vt 0.117119998 0.522374988
+vt 0.139791995 0.518114984
+vt 0.157995999 0.508298993
+vt 0.809768021 0.504535019
+vt 0.82406199 0.490761012
+vt 0.83780998 0.486393988
+vt 0.813763976 0.469193012
+vt 0.760928988 0.514415026
+vt 0.793682992 0.522306025
+vt 0.778015018 0.498387992
+vt 0.744970024 0.49681899
+vt 0.692745984 0.513422012
+vt 0.716536999 0.507210016
+vt 0.692349017 0.487980008
+vt 0.673291981 0.512637973
+vt 0.652544975 0.510710001
+vt 0.614453018 0.518836021
+vt 0.631304979 0.503458977
+vt 0.560196996 0.509844005
+vt 0.590942979 0.495741993
+vt 0.609411001 0.480785012
+vt 0.30489701 0.51928997
+vt 0.318118006 0.497707009
+vt 0.316650987 0.480587989
+vt 0.341529012 0.478563011
+vt 0.325769007 0.464076012
+vt 0.362156004 0.480315
+vt 0.377196014 0.488341987
+vt 0.390211999 0.481133014
+vt 0.282779992 0.509469986
+vt 0.270875007 0.485134989
+vt 0.289710999 0.476871997
+vt 0.283912003 0.455895007
+vt 0.311960995 0.458775014
+vt 0.251908988 0.513705015
+vt 0.222239003 0.519550025
+vt 0.182747006 0.507148027
+vt 0.209251001 0.498845994
+vt 0.233303994 0.482645988
+vt 0.252635986 0.477234006
+vt 0.239022002 0.452924013
+vt 0.27117601 0.455707997
+vt 0.179008007 0.485821009
+vt 0.205302 0.476007015
+vt 0.217603996 0.454656988
+vt 0.790776014 0.483763993
+vt 0.776323974 0.468012989
+vt 0.788769007 0.451436996
+vt 0.80052501 0.439305991
+vt 0.758656025 0.445524991
+vt 0.770476997 0.423175007
+vt 0.787586987 0.432146013
+vt 0.721826971 0.483561993
+vt 0.751904011 0.474063993
+vt 0.728052974 0.458793014
+vt 0.697261989 0.463685006
+vt 0.645178974 0.481857985
+vt 0.673505008 0.474218994
+vt 0.656045973 0.452932
+vt 0.615269005 0.457168996
+vt 0.638958991 0.450194001
+vt 0.578296006 0.472622007
+vt 0.584203005 0.448293
+vt 0.739763975 0.423972994
+vt 0.71013999 0.434038013
+vt 0.681046009 0.444393009
+vt 0.686340988 0.423693001
+vt 0.659587979 0.414579004
+vt 0.610202014 0.432478011
+vt 0.634211004 0.421849012
+vt 0.593937993 0.412699997
+vt 0.709950984 0.399912
+vt 0.733943999 0.380097002
+vt 0.696371019 0.378277987
+vt 0.738141 0.405012012
+vt 0.675065994 0.394089013
+vt 0.645429015 0.378544003
+vt 0.632353008 0.398077995
+vt 0.622511983 0.363261998
+vt 0.602340996 0.385987997
+vt 0.580236971 0.393023014
+vt 0.578997016 0.36749199
+vt 0.535748005 0.40535
+vt 0.56309402 0.409359992
+vt 0.550889015 0.3829
+vt 0.547297001 0.433297992
+vt 0.493312001 0.39350301
+vt 0.517832994 0.408232003
+vt 0.512754977 0.380082011
+vt 0.504203022 0.424194008
+vt 0.462298006 0.385628998
+vt 0.484297007 0.370368004
+vt 0.457038999 0.39606899
+vt 0.434486002 0.383911014
+vt 0.47784999 0.409943998
+vt 0.725396991 0.363393009
+vt 0.700336993 0.349557996
+vt 0.721067011 0.343279004
+vt 0.67136699 0.363555998
+vt 0.666958988 0.333342999
+vt 0.648338974 0.348367006
+vt 0.686506987 0.325585008
+vt 0.625672996 0.335615009
+vt 0.603686988 0.358821005
+vt 0.581781983 0.344159991
+vt 0.593478024 0.327594012
+vt 0.537126005 0.356018007
+vt 0.557717025 0.358846009
+vt 0.556694984 0.324568987
+vt 0.489982992 0.35018
+vt 0.519424021 0.347849011
+vt 0.503032982 0.328366011
+vt 0.457437009 0.355738014
+vt 0.459928006 0.329228014
+vt 0.426174998 0.364854991
+vt 0.433670998 0.33494401
+vt 0.386413008 0.348004997
+vt 0.410760999 0.347656012
+vt 0.394531995 0.329198003
+vt 0.367511004 0.350845993
+vt 0.361095011 0.333902001
+vt 0.397365987 0.367352992
+vt 0.716904998 0.324636012
+vt 0.708723009 0.304390997
+vt 0.739233017 0.33513999
+vt 0.74051398 0.310494989
+vt 0.671949029 0.303965002
+vt 0.623861015 0.304883987
+vt 0.643029988 0.318877012
+vt 0.641840994 0.287084997
+vt 0.601181984 0.305853009
+vt 0.572130978 0.296613008
+vt 0.547712982 0.28828001
+vt 0.532065988 0.299771994
+vt 0.525041997 0.318448007
+vt 0.49960199 0.296090007
+vt 0.480349988 0.314298004
+vt 0.477443993 0.282840014
+vt 0.449777007 0.299668014
+vt 0.42949599 0.302489012
+vt 0.411208004 0.316630006
+vt 0.394012004 0.299649
+vt 0.344224989 0.309291989
+vt 0.370121002 0.315237999
+vt 0.365781009 0.288834006
+vt 0.689454019 0.279175997
+vt 0.715595007 0.285703003
+vt 0.717854023 0.264156014
+vt 0.693168998 0.254204988
+vt 0.742924988 0.288262993
+vt 0.666580021 0.28183499
+vt 0.666728973 0.244329005
+vt 0.645579994 0.259321988
+vt 0.618795991 0.270143986
+vt 0.568976998 0.273815006
+vt 0.598766983 0.281598002
+vt 0.592612982 0.255858988
+vt 0.537545979 0.25208199
+vt 0.568729997 0.249898002
+vt 0.524537981 0.268009007
+vt 0.503513992 0.271685004
+vt 0.453729987 0.276230991
+vt 0.485390007 0.247412995
+vt 0.453981996 0.254346013
+vt 0.416132987 0.282950014
+vt 0.422307014 0.260526001
+vt 0.392951995 0.268965989
+vt 0.367027998 0.264604986
+vt 0.309320003 0.276030988
+vt 0.337401986 0.274136007
+vt 0.315914005 0.249519005
+vt 0.310508996 0.299784005
+vt 0.282898009 0.271174014
+vt 0.300511003 0.246022999
+vt 0.277054995 0.251612991
+vt 0.290298015 0.299005002
+vt 0.264795005 0.289979011
+vt 0.72320801 0.243522003
+vt 0.744787991 0.232756004
+vt 0.723729014 0.219319999
+vt 0.757838011 0.219494
+vt 0.744351029 0.256087989
+vt 0.695433974 0.232284993
+vt 0.64614898 0.229717001
+vt 0.67532599 0.212199003
+vt 0.618403018 0.244585007
+vt 0.623749018 0.221148998
+vt 0.584981024 0.230161995
+vt 0.584951997 0.210737005
+vt 0.509634018 0.244472995
+vt 0.528971016 0.219711006
+vt 0.499707997 0.219531
+vt 0.55676502 0.234694004
+vt 0.557057977 0.211648002
+vt 0.566299975 0.186765
+vt 0.54451102 0.193508998
+vt 0.548554003 0.171149999
+vt 0.589047015 0.190720007
+vt 0.461154997 0.234678999
+vt 0.476767987 0.213955
+vt 0.434056014 0.235791996
+vt 0.453272015 0.212334007
+vt 0.427603006 0.213247001
+vt 0.430801004 0.191846997
+vt 0.456923008 0.182364002
+vt 0.440391004 0.176130995
+vt 0.478857011 0.195467994
+vt 0.484640986 0.178108007
+vt 0.378019989 0.241917998
+vt 0.410151005 0.240538999
+vt 0.398685008 0.220289007
+vt 0.340442002 0.241995007
+vt 0.359694004 0.220706001
+vt 0.322326988 0.220798999
+vt 0.276246011 0.229891002
+vt 0.292703986 0.207209006
+vt 0.255807996 0.238121003
+vt 0.262154013 0.211713001
+vt 0.239568993 0.216783002
+vt 0.748063982 0.204154998
+vt 0.754141986 0.174932003
+vt 0.728103995 0.185243994
+vt 0.772544026 0.181067005
+vt 0.768423021 0.200668007
+vt 0.770974994 0.167852998
+vt 0.705170989 0.20036
+vt 0.70085001 0.179556996
+vt 0.678431988 0.188590005
+vt 0.651892006 0.175165996
+vt 0.648586988 0.200702995
+vt 0.612771988 0.205357
+vt 0.623028994 0.186215997
+vt 0.606932998 0.167947993
+vt 0.60124898 0.146348998
+vt 0.582548976 0.168272004
+vt 0.616934001 0.136595994
+vt 0.566923976 0.159966007
+vt 0.379877001 0.197520003
+vt 0.408991992 0.187937006
+vt 0.40080899 0.169066995
+vt 0.341412991 0.199882999
+vt 0.374648988 0.168318003
+vt 0.35087201 0.171063006
+vt 0.310977012 0.187591001
+vt 0.330684006 0.174205005
+vt 0.290915012 0.174545005
+vt 0.267374992 0.187360004
+vt 0.244537994 0.196227998
+vt 0.737092972 0.164801002
+vt 0.740550995 0.146081999
+vt 0.769858003 0.147479996
+vt 0.761229992 0.124095
+vt 0.703355014 0.156718001
+vt 0.712513983 0.133559003
+vt 0.682518005 0.143711999
+vt 0.675411999 0.167413995
+vt 0.630207002 0.151190996
+vt 0.654736996 0.145005003
+vt 0.638023973 0.127923995
+vt 0.665431976 0.121757001
+vt 0.656585991 0.103486001
+vt 0.690028012 0.111130998
+vt 0.350252002 0.148236006
+vt 0.373450994 0.138292998
+vt 0.403241009 0.143992007
+vt 0.359625012 0.117473997
+vt 0.38884601 0.132176995
+vt 0.369565994 0.113526002
+vt 0.341179013 0.125292003
+vt 0.319810987 0.148493007
+vt 0.319094002 0.111378998
+vt 0.345683008 0.100043997
+vt 0.296014994 0.153457001
+vt 0.268967986 0.162302002
+vt 0.244078994 0.170984
+vt 0.239989996 0.145761997
+vt 0.263538986 0.132092997
+vt 0.281506985 0.132024005
+vt 0.715946019 0.109406002
+vt 0.738277972 0.122574002
+vt 0.739962995 0.0984859988
+vt 0.769554973 0.0963170007
+vt 0.693647981 0.0865319967
+vt 0.718044996 0.0888239965
+vt 0.705846012 0.0701220036
+vt 0.722176015 0.0521190017
+vt 0.742538989 0.0737989992
+vt 0.761004984 0.073115997
+vt 0.297223985 0.119061001
+vt 0.270615995 0.109142996
+vt 0.248062998 0.102943003
+vt 0.236166 0.123590998
+vt 0.313165009 0.0871889964
+vt 0.285634995 0.0884760022
+vt 0.262181014 0.0864700004
+vt 0.25189501 0.0709320009
+vt 0.287674993 0.0648839995
+vt 0.399123996 0.129117996
+vt 0.423929989 0.153945997
+vt 0.447243989 0.157319993
+vt 0.308851004 0.0748440027
+vt 0.340303004 0.0934500024
+vt 0.301622987 0.0659969971
+vt 0.372536987 0.112154998
+vt 0.336721987 0.0879789963
+vt 0.291527003 0.0248920005
+vt 0.328440011 0.0474289991
+vt 0.327116996 0.0468260013
+vt 0.29083401 0.0245619994
+vt 0.369210988 0.0732769966
+vt 0.411314011 0.0997399986
+vt 0.411610991 0.0999839976
+vt 0.447454005 0.122408003
+vt 0.447088003 0.122285999
+vt 0.225254998 0.00298699993
+vt 0.234680995 0.00116600003
+vt 0.224713996 0.00267100008
+vt 0.247970998 0.00363599998
+vt 0.246999994 0.00348099996
+vt 0.235373005 0.001559
+vt 0.264955997 0.0106629999
+vt 0.265906006 0.0109900003
+vt 0.290924013 0.0245869998
+vt 0.197984993 0.0197020005
+vt 0.190902993 0.0277139992
+vt 0.191091001 0.0283959992
+vt 0.197791994 0.0190559998
+vt 0.206217006 0.012348
+vt 0.205928996 0.0118800001
+vt 0.215045005 0.00635900022
+vt 0.215517998 0.00679699983
+vt 0.181298003 0.0657740012
+vt 0.181963995 0.0853419974
+vt 0.182012007 0.0861700028
+vt 0.181391999 0.0646279976
+vt 0.182620004 0.0500410013
+vt 0.182868004 0.0489789993
+vt 0.185866997 0.0372349992
+vt 0.185929999 0.0380829982
+vt 0.203298002 0.202932999
+vt 0.196091995 0.173885003
+vt 0.196253002 0.172600001
+vt 0.189811006 0.142849997
+vt 0.189851001 0.141734004
+vt 0.185026005 0.111606002
+vt 0.184974998 0.112740003
+vt 0.182055995 0.0850899965
+vt 0.228465006 0.267664999
+vt 0.239074007 0.282911003
+vt 0.239123002 0.283863991
+vt 0.219199002 0.249430001
+vt 0.219129995 0.248651996
+vt 0.228513002 0.266483992
+vt 0.210982993 0.226989999
+vt 0.210916996 0.228132993
+vt 0.203404993 0.202047005
+vt 0.291096985 0.328568995
+vt 0.268000007 0.31329599
+vt 0.268108994 0.311868012
+vt 0.323152006 0.349209994
+vt 0.291069001 0.329807997
+vt 0.323242992 0.347995996
+vt 0.251522988 0.297340006
+vt 0.251504004 0.298566014
+vt 0.463497013 0.421900004
+vt 0.415674001 0.398616999
+vt 0.416242003 0.397049993
+vt 0.502157986 0.442856014
+vt 0.463001013 0.422928989
+vt 0.502632022 0.442173004
+vt 0.367017001 0.371995986
+vt 0.366827011 0.373162001
+vt 0.323242009 0.347997993
+vt 0.544239998 0.466888011
+vt 0.54598999 0.468632013
+vt 0.545219004 0.468928009
+vt 0.545216024 0.466340989
+vt 0.539120018 0.463093996
+vt 0.539965987 0.462442994
+vt 0.527206004 0.454762995
+vt 0.526293993 0.455702007
+vt 0.502632976 0.442171991
+vt 0.545831025 0.47488001
+vt 0.546069026 0.476832986
+vt 0.544924974 0.477521002
+vt 0.546869993 0.475030005
+vt 0.546094 0.472970009
+vt 0.547006011 0.472938001
+vt 0.547092021 0.470708013
+vt 0.545831978 0.470963001
+vt 0.543352008 0.481283009
+vt 0.543798983 0.479407012
+vt 0.54500401 0.479140013
+vt 0.541485012 0.481799006
+vt 0.54193598 0.480719
+vt 0.518914998 0.480675012
+vt 0.533291996 0.481629997
+vt 0.533600986 0.482553005
+vt 0.491598994 0.475171
+vt 0.518709004 0.479553998
+vt 0.491614014 0.475883991
+vt 0.539801002 0.482755989
+vt 0.539357007 0.481866002
+vt 0.339174986 0.449292004
+vt 0.288204998 0.44235
+vt 0.288560003 0.441947013
+vt 0.338705987 0.450170994
+vt 0.394614011 0.458427012
+vt 0.394226998 0.459823996
+vt 0.447701007 0.468481988
+vt 0.447847992 0.467532992
+vt 0.491614014 0.475883007
+vt 0.196137995 0.439042985
+vt 0.175227001 0.444189012
+vt 0.175794005 0.443598002
+vt 0.195476994 0.439868987
+vt 0.219809994 0.437133998
+vt 0.219221994 0.437840998
+vt 0.249044001 0.438975006
+vt 0.249752998 0.437954992
+vt 0.28797099 0.442815989
+vt 0.116586 0.472126991
+vt 0.136511996 0.459928006
+vt 0.135973006 0.460617006
+vt 0.0973709971 0.485399991
+vt 0.117147997 0.471477002
+vt 0.0967900008 0.486220986
+vt 0.155392006 0.451388001
+vt 0.156013995 0.450574994
+vt 0.0386990011 0.537046015
+vt 0.0571350008 0.518996
+vt 0.0566519983 0.520166993
+vt 0.0242699999 0.552523017
+vt 0.0392629988 0.536278009
+vt 0.0237520002 0.553232014
+vt 0.0764330029 0.502236009
+vt 0.0769859999 0.501590014
+vt 0.0968250036 0.486036003
+vt 0.00205500005 0.590218008
+vt 5.40000001e-05 0.601583004
+vt 0.000529000012 0.601312995
+vt 0.00159400003 0.590677023
+vt 0.00614499999 0.578866005
+vt 0.0057000001 0.579358995
+vt 0.0129669998 0.567233026
+vt 0.0134650003 0.566459
+vt 0.0237700008 0.553376019
+vt 0.0138569996 0.644375026
+vt 0.00738799991 0.634765983
+vt 0.0133189997 0.644089997
+vt 0.00794100016 0.634827018
+vt 0.00358700007 0.624131024
+vt 0.00310699991 0.624146998
+vt 0.000616999983 0.612991989
+vt 0.00104500004 0.612800002
+vt 0.0520949997 0.664332986
+vt 0.0334520005 0.659006
+vt 0.0327569991 0.658672988
+vt 0.0828189999 0.670356989
+vt 0.0529789999 0.664910972
+vt 0.0821869969 0.670107007
+vt 0.0208310001 0.651989996
+vt 0.0215360001 0.652320981
+vt 0.176855996 0.681006014
+vt 0.176622003 0.680839002
+vt 0.26958999 0.689845026
+vt 0.226374999 0.685090005
+vt 0.269221008 0.68926698
+vt 0.125649005 0.675298989
+vt 0.126409993 0.675795019
+vt 0.0820410028 0.66988802
+vt 0.32673201 0.701403022
+vt 0.322234005 0.698180974
+vt 0.326855004 0.701063991
+vt 0.313652009 0.695847988
+vt 0.313573003 0.695309997
+vt 0.322255999 0.698513985
+vt 0.297093004 0.692552984
+vt 0.297334999 0.693103015
+vt 0.269232988 0.689396977
+vt 0.344222993 0.728035986
+vt 0.335990012 0.712656021
+vt 0.336492985 0.712312996
+vt 0.355874002 0.754849017
+vt 0.343816012 0.728093982
+vt 0.356112003 0.754923999
+vt 0.330962002 0.704744995
+vt 0.330803007 0.704940975
+vt 0.416078001 0.893965006
+vt 0.394389987 0.844807029
+vt 0.395235002 0.845093012
+vt 0.434570998 0.935320973
+vt 0.415544987 0.893477023
+vt 0.434965014 0.935805023
+vt 0.374455988 0.796284974
+vt 0.356112003 0.754923999
+vt 0.469698012 0.990607977
+vt 0.478964001 0.996004999
+vt 0.478787988 0.995536983
+vt 0.470055997 0.99110198
+vt 0.46023199 0.980898976
+vt 0.460606009 0.981392026
+vt 0.449555993 0.963923991
+vt 0.448945999 0.963349998
+vt 0.434964001 0.935805023
+vt 0.519721985 0.995680988
+vt 0.509598017 0.998969972
+vt 0.519425988 0.996022999
+vt 0.499278992 0.999615014
+vt 0.499264002 0.999907017
+vt 0.509747028 0.998552978
+vt 0.488959998 0.998924971
+vt 0.488810986 0.998556972
+vt 0.548889995 0.963925004
+vt 0.538281024 0.98089999
+vt 0.537883997 0.981391013
+vt 0.563844025 0.935320973
+vt 0.549530983 0.963349998
+vt 0.563440025 0.935801983
+vt 0.528456986 0.99110198
+vt 0.528838992 0.990612984
+vt 0.603869021 0.844806015
+vt 0.642095983 0.754903018
+vt 0.642314017 0.754778981
+vt 0.623705983 0.796285987
+vt 0.603338003 0.845149994
+vt 0.582234025 0.893965006
+vt 0.582794011 0.89347899
+vt 0.563323021 0.935819983
+vt 0.667319 0.704940021
+vt 0.671352029 0.701276004
+vt 0.671378016 0.701417029
+vt 0.667132974 0.704746008
+vt 0.662132978 0.712656021
+vt 0.661916018 0.712576985
+vt 0.653881013 0.728034019
+vt 0.654321015 0.728093028
+vt 0.641795993 0.754850984
+vt 0.701106012 0.692544997
+vt 0.684494972 0.695846021
+vt 0.684491992 0.695101976
+vt 0.728802979 0.689827025
+vt 0.700893998 0.693095982
+vt 0.729107022 0.689505994
+vt 0.675861001 0.698183
+vt 0.675866008 0.698513985
+vt 0.873634994 0.675248027
+vt 0.821816027 0.680895984
+vt 0.822933972 0.680022001
+vt 0.916736007 0.670333982
+vt 0.872891009 0.675747991
+vt 0.917501986 0.669870019
+vt 0.77225399 0.685050011
+vt 0.729107022 0.689507008
+vt 0.978192985 0.652530015
+vt 0.986288011 0.644554019
+vt 0.985704005 0.644686997
+vt 0.978881001 0.65219599
+vt 0.96627897 0.659124017
+vt 0.966959 0.658788979
+vt 0.947577 0.664368987
+vt 0.946716011 0.664946973
+vt 0.917366982 0.670037985
+vt 0.998884022 0.613246024
+vt 0.999948025 0.602028012
+vt 0.999494016 0.601761997
+vt 0.999285996 0.61342901
+vt 0.996334016 0.624559999
+vt 0.996770024 0.624592006
+vt 0.992344022 0.635024011
+vt 0.991828978 0.63519299
+vt 0.980549991 0.561097026
+vt 0.992375016 0.57764101
+vt 0.992789984 0.578121006
+vt 0.959243 0.536741972
+vt 0.980112016 0.560360014
+vt 0.959635019 0.537362993
+vt 0.998483002 0.591096997
+vt 0.998054028 0.590646029
+vt 0.851103008 0.433003992
+vt 0.889165998 0.468077987
+vt 0.889295995 0.468944997
+vt 0.818405986 0.402370989
+vt 0.818536997 0.402631998
+vt 0.927473009 0.504984975
+vt 0.927089989 0.504359007
+vt 0.959641993 0.537244022
+vt 0.778150022 0.357425004
+vt 0.780066013 0.362598002
+vt 0.777908027 0.35738799
+vt 0.785735011 0.370023996
+vt 0.785400987 0.370352
+vt 0.780185997 0.362558991
+vt 0.797556996 0.382665008
+vt 0.797540009 0.382423013
+vt 0.818491995 0.402718991
+vt 0.778697014 0.324995011
+vt 0.776848018 0.342664003
+vt 0.77649498 0.342361987
+vt 0.783905029 0.296602994
+vt 0.779008985 0.32546699
+vt 0.783712983 0.296068013
+vt 0.77659899 0.351913989
+vt 0.776790023 0.352095991
+vt 0.809471011 0.147476003
+vt 0.801194012 0.200569004
+vt 0.800724983 0.199533001
+vt 0.815632999 0.103010997
+vt 0.809584022 0.148436993
+vt 0.815541983 0.102059998
+vt 0.791658998 0.251688987
+vt 0.791998029 0.252501011
+vt 0.783712983 0.296068996
+vt 0.809355021 0.0269719996
+vt 0.814495981 0.035879001
+vt 0.809395015 0.0263030007
+vt 0.814453006 0.0367299989
+vt 0.817485988 0.0505109988
+vt 0.817421019 0.0495040007
+vt 0.817912996 0.0704490021
+vt 0.818036973 0.0715470016
+vt 0.815545022 0.102063999
+vt 0.784883976 0.0056830002
+vt 0.775507987 0.00155699998
+vt 0.775021017 0.00200999994
+vt 0.785332978 0.00523999985
+vt 0.794175982 0.0112180002
+vt 0.794443011 0.0107469996
+vt 0.802574992 0.0178859998
+vt 0.802405 0.0185320005
+vt 0.735265017 0.00961100031
+vt 0.752388 0.00253399997
+vt 0.753051996 0.00217700005
+vt 0.708509028 0.023945
+vt 0.734340012 0.0099419998
+vt 0.70915997 0.0236109998
+vt 0.765695989 4.99999987e-05
+vt 0.765030026 0.000442999997
+vt 0.55111903 0.122229002
+vt 0.590938985 0.0973279998
+vt 0.551393986 0.122080997
+vt 0.630071998 0.0727080032
+vt 0.672564983 0.046046
+vt 0.671775997 0.0463280007
+vt 0.70916301 0.0236109998
+vt 0.504270971 0.147222996
+vt 0.499110997 0.147542998
+vt 0.499123007 0.147614002
+vt 0.504366994 0.147254005
+vt 0.512592971 0.144131005
+vt 0.512899995 0.144446
+vt 0.527543008 0.136518002
+vt 0.527163029 0.136467993
+vt 0.551468015 0.122107998
+vt 0.470865011 0.136502996
+vt 0.485682011 0.144148007
+vt 0.485448986 0.144198999
+vt 0.47121501 0.136539996
+vt 0.447007 0.122348003
+vt 0.493849993 0.147254005
+vt 0.493974 0.147221997
+vt 0.290017009 0.0250080004
+vt 0.326420993 0.047226999
+vt 0.368411988 0.0737340003
+vt 0.410205007 0.100647002
+vt 0.446707994 0.122621998
+vt 0.446058005 0.123667002
+vt 0.234276995 0.00154099998
+vt 0.224481001 0.0035600001
+vt 0.263907999 0.0116959997
+vt 0.290275991 0.024766
+vt 0.289460003 0.0256450009
+vt 0.191493005 0.027555
+vt 0.198456004 0.0194300003
+vt 0.206143007 0.0122349998
+vt 0.215058997 0.00699499995
+vt 0.182868004 0.08433
+vt 0.182679996 0.0638779998
+vt 0.186339006 0.0369650014
+vt 0.203881994 0.201350003
+vt 0.197605997 0.171200007
+vt 0.190841004 0.140607998
+vt 0.185646996 0.11084
+vt 0.182843998 0.0843079984
+vt 0.239856005 0.281170994
+vt 0.219782993 0.247270003
+vt 0.229231998 0.265143991
+vt 0.212179005 0.225404993
+vt 0.204186007 0.200978994
+vt 0.291774988 0.326714009
+vt 0.268718004 0.310375988
+vt 0.323947996 0.346089005
+vt 0.252000004 0.296113998
+vt 0.503555 0.440975994
+vt 0.464174986 0.420769989
+vt 0.367496014 0.370736986
+vt 0.323799014 0.346415997
+vt 0.547038019 0.46825099
+vt 0.546361029 0.465718001
+vt 0.548812985 0.467626989
+vt 0.541491985 0.461299002
+vt 0.52869302 0.453292012
+vt 0.503552973 0.440979004
+vt 0.546616971 0.478170007
+vt 0.548466027 0.472943991
+vt 0.548128009 0.475264996
+vt 0.548771024 0.477892011
+vt 0.549408019 0.470308989
+vt 0.542280972 0.483101994
+vt 0.545578003 0.480886012
+vt 0.544815004 0.48308
+vt 0.547708988 0.479900002
+vt 0.491672993 0.477284998
+vt 0.519252002 0.482841015
+vt 0.534144998 0.484501004
+vt 0.540296972 0.483904988
+vt 0.287685007 0.443758011
+vt 0.338400006 0.451368988
+vt 0.447616011 0.469695002
+vt 0.491650999 0.476803005
+vt 0.491732001 0.478531986
+vt 0.174927995 0.445131987
+vt 0.218858004 0.439184994
+vt 0.195122004 0.441608995
+vt 0.174848005 0.446851999
+vt 0.248522997 0.441175014
+vt 0.287488997 0.44461599
+vt 0.116503 0.473383993
+vt 0.135876 0.461876005
+vt 0.096822001 0.487475008
+vt 0.155226007 0.453074008
+vt 0.0387969986 0.537954986
+vt 0.0239870008 0.554226995
+vt 0.0967900008 0.487204999
+vt 0.0764549971 0.503418028
+vt 0.00035799999 0.601886988
+vt 0.00605600001 0.580022991
+vt 0.00189299998 0.591103017
+vt 0.013665 0.56852299
+vt 0.0242289994 0.554669976
+vt 0.0075869998 0.634324014
+vt 0.0035600001 0.623880029
+vt 0.0136169996 0.643254995
+vt 0.00130100001 0.612995982
+vt 0.0818220004 0.669377029
+vt 0.032621 0.657746017
+vt 0.0519060008 0.662634015
+vt 0.0207790006 0.651304007
+vt 0.175953999 0.679871976
+vt 0.226265997 0.684001982
+vt 0.269253999 0.68748498
+vt 0.125339001 0.674382985
+vt 0.081701003 0.668745995
+vt 0.322526991 0.697405994
+vt 0.313988 0.693782985
+vt 0.327645004 0.699765027
+vt 0.297320992 0.690833986
+vt 0.269183993 0.688248992
+vt 0.356950998 0.754588008
+vt 0.345557004 0.727150023
+vt 0.331470013 0.704133987
+vt 0.435869008 0.935756028
+vt 0.416871995 0.893905997
+vt 0.375683993 0.795768023
+vt 0.356635004 0.754749
+vt 0.357778013 0.75413698
+vt 0.479395002 0.995706022
+vt 0.461342007 0.981153011
+vt 0.470566988 0.990863979
+vt 0.450942993 0.963456988
+vt 0.435539991 0.935845971
+vt 0.436684012 0.935452998
+vt 0.509298027 0.998301983
+vt 0.499253988 0.999294996
+vt 0.518779993 0.995190024
+vt 0.489304006 0.997951984
+vt 0.562844992 0.935846984
+vt 0.537127018 0.981154025
+vt 0.547477007 0.963456988
+vt 0.561688006 0.935456991
+vt 0.527929008 0.990868986
+vt 0.641484022 0.754747987
+vt 0.622458994 0.795767009
+vt 0.640537977 0.754261971
+vt 0.602177978 0.844884992
+vt 0.581422985 0.893905997
+vt 0.562111974 0.93562901
+vt 0.67086798 0.700465024
+vt 0.661194026 0.711969972
+vt 0.666606009 0.704132974
+vt 0.652522027 0.727150023
+vt 0.640534997 0.754260004
+vt 0.729165971 0.68848002
+vt 0.700851023 0.690819979
+vt 0.675550997 0.697409987
+vt 0.873930991 0.674329996
+vt 0.91782701 0.668733001
+vt 0.772342026 0.684279025
+vt 0.729165971 0.688480973
+vt 0.986266017 0.643903017
+vt 0.967083991 0.657859981
+vt 0.978923023 0.651506007
+vt 0.947700024 0.662325978
+vt 0.917739987 0.669331014
+vt 0.917850018 0.667961001
+vt 0.999621987 0.602317989
+vt 0.996416986 0.624365985
+vt 0.998170018 0.613376021
+vt 0.991694987 0.634232998
+vt 0.992406011 0.578764975
+vt 0.959155977 0.538491011
+vt 0.979946971 0.562156975
+vt 0.998167992 0.591507971
+vt 0.818275988 0.403075993
+vt 0.850597978 0.433860004
+vt 0.817439973 0.404013991
+vt 0.927232027 0.505760014
+vt 0.959388018 0.538115025
+vt 0.779424012 0.362890005
+vt 0.776579022 0.357748002
+vt 0.796730995 0.383469999
+vt 0.817924976 0.403495014
+vt 0.782784998 0.295646012
+vt 0.777424991 0.324696004
+vt 0.774711013 0.342292011
+vt 0.775870025 0.351942003
+vt 0.808817983 0.146884993
+vt 0.814494014 0.101291001
+vt 0.789804995 0.250919014
+vt 0.782310009 0.295534015
+vt 0.814011991 0.0356119983
+vt 0.816599011 0.0490619987
+vt 0.808890998 0.0262809992
+vt 0.816592991 0.069761999
+vt 0.814508975 0.101295002
+vt 0.775843978 0.00208700006
+vt 0.785255015 0.00605300022
+vt 0.794215977 0.0110980002
+vt 0.802029014 0.0181460008
+vt 0.709716022 0.0238029994
+vt 0.753629029 0.00267699989
+vt 0.736290991 0.0106410002
+vt 0.710409999 0.0245159995
+vt 0.766086996 0.000426000013
+vt 0.551711977 0.122326002
+vt 0.588609993 0.10024
+vt 0.552460015 0.123484001
+vt 0.630851984 0.0731640011
+vt 0.673386991 0.0465990007
+vt 0.709969997 0.0240400005
+vt 0.499098986 0.148295999
+vt 0.504490018 0.147918001
+vt 0.528110027 0.137603
+vt 0.552020013 0.122732997
+vt 0.470201999 0.137722
+vt 0.44639799 0.123074003
+vt 0.485029012 0.145396993
+vt 0.493643999 0.148342997
+vt 0.325497001 0.0483650006
+vt 0.288874 0.0265350007
+vt 0.367464989 0.0749749988
+vt 0.409265012 0.102155998
+vt 0.444967002 0.125944003
+vt 0.233944997 0.00267100008
+vt 0.246042997 0.00518799992
+vt 0.224564001 0.00579700014
+vt 0.263134003 0.0132099995
+vt 0.288224995 0.0277559999
+vt 0.206762001 0.0132529996
+vt 0.193431005 0.0284499992
+vt 0.199404001 0.0202719998
+vt 0.215377003 0.0082080001
+vt 0.184698999 0.0486209989
+vt 0.185458004 0.083416
+vt 0.184256002 0.0635960028
+vt 0.187430993 0.0370550007
+vt 0.205743 0.199722007
+vt 0.199221998 0.170178995
+vt 0.192340001 0.139679
+vt 0.186957002 0.110079996
+vt 0.184450999 0.0836569965
+vt 0.230436996 0.263677001
+vt 0.221608996 0.245281994
+vt 0.242046997 0.278349012
+vt 0.213917002 0.223912999
+vt 0.205752 0.199717
+vt 0.269832999 0.308454007
+vt 0.292741001 0.324827999
+vt 0.325502992 0.343100011
+vt 0.252995014 0.294479012
+vt 0.465514004 0.418740004
+vt 0.505223989 0.438903004
+vt 0.417582989 0.394542992
+vt 0.368387014 0.368930012
+vt 0.324842989 0.344283998
+vt 0.548129976 0.464765996
+vt 0.551744998 0.466614991
+vt 0.543793023 0.459587008
+vt 0.530318022 0.451709002
+vt 0.505218983 0.438910007
+vt 0.550004005 0.475650996
+vt 0.551119983 0.472992986
+vt 0.55191499 0.477636009
+vt 0.552412987 0.469823986
+vt 0.544445992 0.485195011
+vt 0.547544003 0.482677996
+vt 0.550243974 0.481543005
+vt 0.491798013 0.479864001
+vt 0.534030974 0.48694399
+vt 0.541037977 0.485729992
+vt 0.33810699 0.453274012
+vt 0.287198007 0.446534991
+vt 0.393902987 0.462507993
+vt 0.447533011 0.472041994
+vt 0.491889 0.481617987
+vt 0.218588993 0.441774994
+vt 0.195066005 0.444366008
+vt 0.175081998 0.449804991
+vt 0.248278007 0.443367004
+vt 0.287057996 0.447905004
+vt 0.116971999 0.475672007
+vt 0.0973690003 0.489378989
+vt 0.136223003 0.464278013
+vt 0.155452996 0.455350995
+vt 0.0394579992 0.539319992
+vt 0.0249610003 0.555692017
+vt 0.0573149994 0.522230029
+vt 0.0771749988 0.505528986
+vt 0.0971639976 0.488819987
+vt 0.0979899988 0.490922987
+vt 0.002905 0.591657996
+vt 0.00135699997 0.60215503
+vt 0.0074339998 0.581139982
+vt 0.00307000009 0.602414012
+vt 0.0148440003 0.569702983
+vt 0.0256990008 0.556541979
+vt 0.00873200037 0.633320987
+vt 0.00474199979 0.623386025
+vt 0.0150140002 0.641444027
+vt 0.0025810001 0.612882018
+vt 0.0816690028 0.667756975
+vt 0.0330459997 0.655797005
+vt 0.0521919988 0.660800993
+vt 0.0819289982 0.665323019
+vt 0.0212290008 0.650074005
+vt 0.226366997 0.682008982
+vt 0.175848007 0.677818
+vt 0.269672006 0.684778988
+vt 0.125266999 0.672746003
+vt 0.0817290023 0.666840971
+vt 0.323175013 0.696002007
+vt 0.32920599 0.697349012
+vt 0.314722002 0.691673994
+vt 0.297886997 0.688468993
+vt 0.269405007 0.686335027
+vt 0.358696997 0.753583014
+vt 0.338218004 0.710735023
+vt 0.347377986 0.725776017
+vt 0.332441002 0.702970028
+vt 0.418240994 0.893379986
+vt 0.437361002 0.935127974
+vt 0.397136003 0.844421029
+vt 0.377297997 0.794921994
+vt 0.359941006 0.752784014
+vt 0.471397996 0.989957988
+vt 0.479979992 0.994723022
+vt 0.462769985 0.980022013
+vt 0.480753005 0.993044019
+vt 0.452578992 0.962342024
+vt 0.438773006 0.934285998
+vt 0.499244004 0.997901022
+vt 0.508964002 0.997071028
+vt 0.517715991 0.993044019
+vt 0.489648014 0.996517003
+vt 0.535674989 0.980022013
+vt 0.545822024 0.962342978
+vt 0.559566975 0.934284985
+vt 0.527077973 0.989961982
+vt 0.639050007 0.753371
+vt 0.620828986 0.794921994
+vt 0.600611985 0.844213009
+vt 0.580034971 0.893378973
+vt 0.560164988 0.934653997
+vt 0.665616989 0.702969015
+vt 0.670038998 0.69917202
+vt 0.659623027 0.71053201
+vt 0.668838024 0.697350025
+vt 0.650682986 0.725776017
+vt 0.639042974 0.753367007
+vt 0.728848994 0.685914993
+vt 0.683862984 0.693073988
+vt 0.700272977 0.688475013
+vt 0.674884021 0.69599998
+vt 0.873992026 0.672698975
+vt 0.917788029 0.666803002
+vt 0.82308197 0.677767992
+vt 0.772287011 0.682621002
+vt 0.72884798 0.685913026
+vt 0.978465974 0.650268018
+vt 0.985367 0.642527997
+vt 0.966648996 0.655901015
+vt 0.917590022 0.665315986
+vt 0.998604 0.602568984
+vt 0.995047987 0.623767018
+vt 0.996879995 0.602805018
+vt 0.990579009 0.633336008
+vt 0.99099201 0.579850972
+vt 0.978766024 0.563273013
+vt 0.957991004 0.539883971
+vt 0.997134984 0.592047989
+vt 0.849418998 0.435261011
+vt 0.888203025 0.470631003
+vt 0.815614998 0.405775011
+vt 0.926388979 0.506969988
+vt 0.958223999 0.539629996
+vt 0.778137028 0.363487989
+vt 0.783558011 0.371560007
+vt 0.773994982 0.358559012
+vt 0.795238018 0.384701014
+vt 0.816708028 0.404747009
+vt 0.780633986 0.295217991
+vt 0.775694013 0.324544996
+vt 0.774459004 0.352144986
+vt 0.807442009 0.146332994
+vt 0.798851013 0.198686004
+vt 0.812754989 0.100790001
+vt 0.779583991 0.295073986
+vt 0.812905014 0.035707999
+vt 0.807739973 0.0267539993
+vt 0.815137982 0.0490150005
+vt 0.814701974 0.0695279986
+vt 0.812762976 0.100791998
+vt 0.793583989 0.0121170003
+vt 0.775801003 0.00438199984
+vt 0.784897983 0.00732700014
+vt 0.801110983 0.0189399999
+vt 0.754347026 0.00432100007
+vt 0.711290002 0.0258889999
+vt 0.73705101 0.0121539999
+vt 0.766402006 0.00155100005
+vt 0.589573979 0.101791002
+vt 0.631784022 0.0744069964
+vt 0.553530991 0.125759006
+vt 0.710955024 0.0253120009
+vt 0.674322009 0.0478270017
+vt 0.504675984 0.149317995
+vt 0.499089003 0.149918005
+vt 0.513500988 0.146550998
+vt 0.528726995 0.139223993
+vt 0.552941978 0.124443002
+vt 0.445569009 0.124622002
+vt 0.469300985 0.140094995
+vt 0.484448999 0.147615999
+vt 0.493346989 0.150553003
+vt 0.323983997 0.0510400012
+vt 0.287654012 0.0290099997
+vt 0.365936011 0.0777089968
+vt 0.407983989 0.104700997
+vt 0.443854988 0.128681004
+vt 0.233649999 0.00539099984
+vt 0.245315 0.00803100038
+vt 0.224892005 0.00834599975
+vt 0.262436986 0.0151420003
+vt 0.287093014 0.0303990003
+vt 0.200681001 0.0215349998
+vt 0.207808003 0.0149670001
+vt 0.195701003 0.0298800003
+vt 0.216031 0.0102359997
+vt 0.186196998 0.0635450035
+vt 0.187392995 0.0489189997
+vt 0.188433006 0.0829989985
+vt 0.189855993 0.0377780013
+vt 0.201258004 0.169216007
+vt 0.208324999 0.198177993
+vt 0.194441006 0.138805002
+vt 0.189796001 0.109119996
+vt 0.187047005 0.0831409991
+vt 0.232690006 0.261512995
+vt 0.223752007 0.243525997
+vt 0.244504005 0.275840014
+vt 0.208846003 0.197923005
+vt 0.215862006 0.222611994
+vt 0.294268012 0.322355002
+vt 0.271494001 0.306028008
+vt 0.327423006 0.339935005
+vt 0.255169988 0.291637003
+vt 0.467648 0.415663004
+vt 0.507354021 0.436325997
+vt 0.419330001 0.391662002
+vt 0.370225012 0.365685999
+vt 0.326730013 0.341039985
+vt 0.551366985 0.463037014
+vt 0.554745018 0.465593994
+vt 0.546499014 0.457350999
+vt 0.507346988 0.436333001
+vt 0.554166973 0.474848002
+vt 0.552868009 0.48288101
+vt 0.555508018 0.470950007
+vt 0.549674988 0.484672993
+vt 0.546549022 0.487578988
+vt 0.535640001 0.490269005
+vt 0.491971999 0.48318699
+vt 0.542376995 0.489156008
+vt 0.337754995 0.456916988
+vt 0.286904991 0.449813992
+vt 0.393651009 0.466197014
+vt 0.447465986 0.475735992
+vt 0.492065996 0.484910995
+vt 0.218554005 0.444689989
+vt 0.195262 0.44729799
+vt 0.175589994 0.452910006
+vt 0.248159006 0.445876986
+vt 0.286814988 0.45154801
+vt 0.117991999 0.478578001
+vt 0.0985679999 0.492166013
+vt 0.136944994 0.466966003
+vt 0.156020001 0.458119988
+vt 0.041255001 0.54183197
+vt 0.0270939991 0.55796802
+vt 0.0587630011 0.524690986
+vt 0.0785600021 0.508180976
+vt 0.0993110016 0.493615001
+vt 0.00540499995 0.592589021
+vt 0.00969799981 0.582445979
+vt 0.00557299983 0.602676988
+vt 0.016454 0.570975006
+vt 0.0279489998 0.558770001
+vt 0.0107260002 0.631910026
+vt 0.0066920002 0.622635007
+vt 0.0170399994 0.63932699
+vt 0.00469300011 0.61264199
+vt 0.0527709983 0.658720016
+vt 0.0340950005 0.65319401
+vt 0.0825479999 0.662389994
+vt 0.0226579998 0.647580028
+vt 0.226777002 0.678973019
+vt 0.176174998 0.674475014
+vt 0.270312011 0.681761026
+vt 0.125589997 0.669459999
+vt 0.0821899995 0.663927972
+vt 0.324611992 0.693122983
+vt 0.330835015 0.694895029
+vt 0.315768987 0.689263999
+vt 0.270033985 0.683019996
+vt 0.361113012 0.751999021
+vt 0.340597987 0.708311975
+vt 0.334473997 0.70053798
+vt 0.420910001 0.89191699
+vt 0.439594001 0.933731973
+vt 0.399877012 0.842939019
+vt 0.379213989 0.793778002
+vt 0.36235401 0.751142979
+vt 0.47299999 0.987664998
+vt 0.464603007 0.978080988
+vt 0.481754005 0.990583003
+vt 0.454607993 0.960608006
+vt 0.441073 0.932669997
+vt 0.508485019 0.994893014
+vt 0.499235988 0.995666027
+vt 0.516698003 0.990579009
+vt 0.490056008 0.994552016
+vt 0.533825994 0.978082001
+vt 0.543779016 0.960609019
+vt 0.55726999 0.932681978
+vt 0.525457025 0.987671018
+vt 0.618903995 0.793779016
+vt 0.636982977 0.752013981
+vt 0.59830302 0.842939019
+vt 0.577346981 0.89191699
+vt 0.558063984 0.933269024
+vt 0.66356802 0.700538993
+vt 0.65744102 0.708308995
+vt 0.667196989 0.694895029
+vt 0.636973977 0.752008021
+vt 0.68284601 0.690352023
+vt 0.728155017 0.682446003
+vt 0.67128998 0.689065993
+vt 0.673426986 0.693120003
+vt 0.873658001 0.669411004
+vt 0.917401016 0.664259017
+vt 0.822742999 0.674426973
+vt 0.77186197 0.67928803
+vt 0.728156984 0.682452977
+vt 0.977033019 0.647759974
+vt 0.983286023 0.640226007
+vt 0.965596974 0.653288007
+vt 0.946982026 0.659114003
+vt 0.916963995 0.662356973
+vt 0.995486975 0.613062024
+vt 0.993090987 0.622994006
+vt 0.99435699 0.60303998
+vt 0.988996983 0.632227004
+vt 0.976890981 0.56467402
+vt 0.955837011 0.541840017
+vt 0.988685012 0.581121027
+vt 0.994601011 0.592948973
+vt 0.847401023 0.437323004
+vt 0.886076987 0.472956002
+vt 0.813440025 0.407701999
+vt 0.924292982 0.509235024
+vt 0.956212997 0.541534007
+vt 0.775391996 0.364771992
+vt 0.781911016 0.373742014
+vt 0.771315992 0.359450012
+vt 0.771420002 0.366640002
+vt 0.814616024 0.406675011
+vt 0.772255003 0.341583997
+vt 0.777355015 0.294867992
+vt 0.77026701 0.342534989
+vt 0.771480024 0.352703005
+vt 0.80449599 0.145725995
+vt 0.810737014 0.100536004
+vt 0.795826972 0.198050007
+vt 0.786581993 0.250295997
+vt 0.77670598 0.294824004
+vt 0.810469985 0.0364449993
+vt 0.805329025 0.0281949993
+vt 0.812668025 0.0493500009
+vt 0.812150002 0.0695979968
+vt 0.809998989 0.100505002
+vt 0.784307003 0.00910899974
+vt 0.792366028 0.0140960002
+vt 0.775438011 0.00721500022
+vt 0.799649 0.0203699991
+vt 0.737737 0.0140850004
+vt 0.712487996 0.0285030007
+vt 0.754967988 0.00692200009
+vt 0.766678989 0.00427199993
+vt 0.590839982 0.104339004
+vt 0.633295 0.0771420002
+vt 0.554627001 0.128489003
+vt 0.67564702 0.0502579994
+vt 0.711753011 0.0267849993
+vt 0.712619007 0.0288059991
+vt 0.505026996 0.152375996
+vt 0.499080002 0.152692005
+vt 0.515211999 0.148683995
+vt 0.505496025 0.156847998
+vt 0.554063976 0.127045006
+vt 0.44443199 0.127216995
+vt 0.483960986 0.150132
+vt 0.493046999 0.153139994
+vt 0.322174013 0.0551650003
+vt 0.286177009 0.0329109989
+vt 0.36411199 0.0817179978
+vt 0.406358987 0.108459003
+vt 0.442909002 0.131202996
+vt 0.233582005 0.0095800003
+vt 0.244729996 0.011798
+vt 0.225278005 0.0107460003
+vt 0.261344999 0.0190229993
+vt 0.286177009 0.032912001
+vt 0.203132004 0.0240870006
+vt 0.209778994 0.0181900002
+vt 0.197592005 0.0311810002
+vt 0.217253 0.0136789996
+vt 0.189916 0.0637760013
+vt 0.190831006 0.0497040004
+vt 0.190887004 0.0828479975
+vt 0.193443 0.0392820016
+vt 0.205041006 0.167783007
+vt 0.212108001 0.196391001
+vt 0.198834002 0.137505993
+vt 0.190887004 0.0828479975
+vt 0.193977997 0.1083
+vt 0.236328006 0.258556992
+vt 0.227430001 0.241009995
+vt 0.246517003 0.273981988
+vt 0.219468996 0.220547006
+vt 0.212108001 0.196391001
+vt 0.297037989 0.318363994
+vt 0.274369001 0.302377999
+vt 0.328974992 0.337563992
+vt 0.258372009 0.288087994
+vt 0.470218003 0.412093014
+vt 0.510308981 0.432806998
+vt 0.422154009 0.387322009
+vt 0.372844994 0.361506999
+vt 0.328974992 0.337563992
+vt 0.55557698 0.460803002
+vt 0.557350993 0.46471101
+vt 0.549484015 0.455385
+vt 0.535564005 0.446653992
+vt 0.510308981 0.432806998
+vt 0.55805397 0.47744301
+vt 0.556931019 0.481386006
+vt 0.55853498 0.473221004
+vt 0.558318973 0.468914002
+vt 0.550351977 0.490328014
+vt 0.553005993 0.487848997
+vt 0.555221975 0.484862
+vt 0.520574987 0.492134005
+vt 0.492226005 0.487807006
+vt 0.536517024 0.49386701
+vt 0.54409802 0.493689001
+vt 0.54736501 0.492282987
+vt 0.337484986 0.461840004
+vt 0.286716998 0.454391986
+vt 0.393449992 0.470990002
+vt 0.447443992 0.480159014
+vt 0.492226005 0.487807006
+vt 0.195748001 0.451222003
+vt 0.218792006 0.44936201
+vt 0.176146999 0.455630004
+vt 0.248142004 0.450325996
+vt 0.286716998 0.454391986
+vt 0.119722001 0.482479006
+vt 0.100605004 0.495961994
+vt 0.138467997 0.471260995
+vt 0.157167003 0.462309986
+vt 0.0442290008 0.545157015
+vt 0.0616060011 0.528506994
+vt 0.0298699997 0.560451984
+vt 0.0808089972 0.511705995
+vt 0.100605004 0.495961994
+vt 0.00932700001 0.593719006
+vt 0.0130460002 0.584051013
+vt 0.00793700013 0.602871001
+vt 0.0196889993 0.57318902
+vt 0.0298699997 0.560451984
+vt 0.0138349999 0.629914999
+vt 0.0102939997 0.621318996
+vt 0.0188120008 0.637628019
+vt 0.00829400029 0.612187982
+vt 0.0541619994 0.654810011
+vt 0.0358589999 0.649716973
+vt 0.0832530037 0.659741998
+vt 0.0251219999 0.644109011
+vt 0.227574006 0.674799979
+vt 0.176965997 0.669966996
+vt 0.270951986 0.679085016
+vt 0.0832519978 0.659743011
+vt 0.126480997 0.664865971
+vt 0.326738 0.689065993
+vt 0.332320005 0.692680001
+vt 0.317032009 0.685849011
+vt 0.299618989 0.682649016
+vt 0.270951986 0.679085016
+vt 0.351974994 0.722079992
+vt 0.364549994 0.74958998
+vt 0.343421996 0.705715001
+vt 0.337375998 0.697068989
+vt 0.424576014 0.889491975
+vt 0.443138003 0.931070983
+vt 0.403535008 0.840642989
+vt 0.382615 0.791589975
+vt 0.364549994 0.74958998
+vt 0.475154012 0.984059989
+vt 0.466989011 0.97517103
+vt 0.482639015 0.988259017
+vt 0.456786007 0.958549023
+vt 0.443138003 0.931070983
+vt 0.507678986 0.990776002
+vt 0.499226987 0.991614997
+vt 0.515805006 0.988259017
+vt 0.490772009 0.990776002
+vt 0.531424999 0.975171983
+vt 0.541589975 0.958549023
+vt 0.55518198 0.931070983
+vt 0.523280978 0.984059989
+vt 0.615489006 0.791589975
+vt 0.63351202 0.74958998
+vt 0.594631016 0.840642989
+vt 0.55518198 0.931070983
+vt 0.57366699 0.889491975
+vt 0.660650015 0.697068989
+vt 0.665705025 0.692680001
+vt 0.654606998 0.705715001
+vt 0.646063983 0.722079992
+vt 0.63351202 0.74958998
+vt 0.698517025 0.682641983
+vt 0.681021988 0.685846984
+vt 0.72734803 0.679067016
+vt 0.916258991 0.659705997
+vt 0.872762024 0.664811015
+vt 0.821943998 0.66991502
+vt 0.771001995 0.674763024
+vt 0.72734803 0.679067016
+vt 0.974574029 0.644267976
+vt 0.963837981 0.649800003
+vt 0.980876982 0.637858987
+vt 0.945487022 0.654824018
+vt 0.916258991 0.659704983
+vt 0.991554976 0.612528026
+vt 0.989482999 0.62164098
+vt 0.991988003 0.603208005
+vt 0.985885024 0.630200982
+vt 0.973559022 0.566812992
+vt 0.985302985 0.58267498
+vt 0.952984989 0.54411602
+vt 0.990665972 0.59403199
+vt 0.844421029 0.440102011
+vt 0.882905006 0.475984007
+vt 0.811414003 0.409428
+vt 0.952984989 0.54411602
+vt 0.920982003 0.512251973
+vt 0.768881023 0.360276997
+vt 0.777548015 0.375250012
+vt 0.789987981 0.388660014
+vt 0.811414003 0.409428
+vt 0.769168019 0.324515998
+vt 0.767076015 0.342936993
+vt 0.774074018 0.294679999
+vt 0.76720202 0.353619009
+vt 0.806529999 0.100438997
+vt 0.800203979 0.145342007
+vt 0.791594982 0.197565004
+vt 0.782289982 0.249841005
+vt 0.774074018 0.294679999
+vt 0.806883991 0.0379640013
+vt 0.809225976 0.0501740016
+vt 0.802733004 0.0299629997
+vt 0.809293985 0.069877997
+vt 0.806529999 0.100438997
+vt 0.783071995 0.0125580002
+vt 0.790546 0.0170600004
+vt 0.775043011 0.0096230004
+vt 0.797192991 0.0229279995
+vt 0.738816023 0.0179629996
+vt 0.755541027 0.0106880004
+vt 0.713775992 0.0319540016
+vt 0.766731024 0.00845499989
+vt 0.592453003 0.108098
+vt 0.63510102 0.0811439976
+vt 0.555570006 0.131020993
+vt 0.677441001 0.0543790013
+vt 0.713775992 0.0319540016
+vt 0.499071985 0.157321006
+vt 0.515011013 0.153556004
+vt 0.530703008 0.145565003
+vt 0.555570006 0.131020993
+vt 0.467575997 0.145638004
+vt 0.442909002 0.131202996
+vt 0.483168006 0.153574005
+vt 0.492653012 0.156849995
+vt 0.32408601 0.0565590002
+vt 0.294842988 0.0420899987
+vt 0.286177009 0.032912001
+vt 0.328563988 0.0621000007
+vt 0.36401999 0.0816790015
+vt 0.368622988 0.0863820016
+vt 0.334785998 0.0690149963
+vt 0.360318005 0.0836279988
+vt 0.350077987 0.0875869989
+vt 0.391609997 0.100239001
+vt 0.418603987 0.127179995
+vt 0.40635401 0.108471997
+vt 0.442907006 0.131208003
+vt 0.396952003 0.116279997
+vt 0.381392986 0.10362
+vt 0.398582995 0.148157999
+vt 0.429621011 0.164986998
+vt 0.454183012 0.157929003
+vt 0.477840006 0.173757002
+vt 0.483159989 0.153576002
+vt 0.492653012 0.156849995
+vt 0.467575997 0.145638004
+vt 0.272576004 0.0310619995
+vt 0.300038993 0.0549230017
+vt 0.273865998 0.0600919984
+vt 0.30667001 0.0809049979
+vt 0.233582005 0.0095800003
+vt 0.244729996 0.011798
+vt 0.237783 0.0378810018
+vt 0.261344999 0.0190239996
+vt 0.209778994 0.0181900002
+vt 0.218314007 0.0324340016
+vt 0.203132004 0.0240870006
+vt 0.217253 0.0136789996
+vt 0.225278005 0.0107460003
+vt 0.193443 0.0392820016
+vt 0.197592005 0.0311810002
+vt 0.216094002 0.0617499985
+vt 0.190831006 0.0497040004
+vt 0.189917997 0.0637769997
+vt 0.244723007 0.057852
+vt 0.205046996 0.167775005
+vt 0.219033003 0.187755004
+vt 0.212137997 0.196419999
+vt 0.225384995 0.145010993
+vt 0.225826994 0.172079995
+vt 0.198835 0.137505993
+vt 0.215018004 0.110587001
+vt 0.242106006 0.113388002
+vt 0.211381003 0.0868360028
+vt 0.193977997 0.1083
+vt 0.190887004 0.0828479975
+vt 0.236085996 0.0915250033
+vt 0.236329004 0.258556008
+vt 0.227430001 0.241009995
+vt 0.236705005 0.220601007
+vt 0.255623996 0.240252003
+vt 0.245060995 0.202166006
+vt 0.219468996 0.220547006
+vt 0.276291996 0.283573985
+vt 0.258372009 0.288087994
+vt 0.257672995 0.27482
+vt 0.274378002 0.302381992
+vt 0.246517003 0.273981988
+vt 0.278100014 0.253134012
+vt 0.353056997 0.343791991
+vt 0.401358992 0.369542003
+vt 0.372842997 0.361510009
+vt 0.328974992 0.337563992
+vt 0.424199998 0.387468994
+vt 0.382946998 0.35661
+vt 0.470376015 0.411866993
+vt 0.504401028 0.418451995
+vt 0.510308981 0.432806998
+vt 0.476087004 0.403043002
+vt 0.453803986 0.388024002
+vt 0.429583013 0.374864995
+vt 0.398178995 0.357524008
+vt 0.42375201 0.35631001
+vt 0.357535988 0.339073002
+vt 0.381274998 0.34009099
+vt 0.340543002 0.314877987
+vt 0.366333991 0.325397998
+vt 0.324335992 0.323101997
+vt 0.310389996 0.299937993
+vt 0.323641986 0.28143099
+vt 0.350645006 0.281295002
+vt 0.294086009 0.286413997
+vt 0.297037989 0.318351001
+vt 0.55557698 0.460803002
+vt 0.549484015 0.455385
+vt 0.590514004 0.444738001
+vt 0.570008993 0.433714002
+vt 0.548950016 0.436843991
+vt 0.535564005 0.446653992
+vt 0.585660994 0.411082
+vt 0.543658018 0.411897004
+vt 0.530170023 0.427208006
+vt 0.519263983 0.401318014
+vt 0.580331028 0.497191995
+vt 0.59573698 0.477118999
+vt 0.565841973 0.514397979
+vt 0.536517024 0.49386701
+vt 0.520604014 0.49217701
+vt 0.550149977 0.526763022
+vt 0.509618998 0.50158602
+vt 0.492226005 0.487807006
+vt 0.518521011 0.51037699
+vt 0.489740998 0.493721992
+vt 0.447546005 0.480778992
+vt 0.408156991 0.479077995
+vt 0.393449992 0.470993996
+vt 0.477492988 0.498400986
+vt 0.449712008 0.491443992
+vt 0.337484986 0.461834997
+vt 0.36462301 0.474927008
+vt 0.332145005 0.473531991
+vt 0.286716998 0.454391986
+vt 0.388099998 0.481083989
+vt 0.409666002 0.49259901
+vt 0.393189996 0.493506998
+vt 0.430887014 0.495606005
+vt 0.489223987 0.524254978
+vt 0.519405007 0.536144018
+vt 0.543945014 0.557556987
+vt 0.29036501 0.488007009
+vt 0.314466 0.493065
+vt 0.29439199 0.508773983
+vt 0.284269989 0.46883899
+vt 0.306757003 0.472431988
+vt 0.259272009 0.455265999
+vt 0.330581009 0.485789001
+vt 0.349584013 0.504710019
+vt 0.35522601 0.484154999
+vt 0.377411008 0.494176
+vt 0.229757994 0.454438001
+vt 0.248142004 0.450327009
+vt 0.218805 0.449359
+vt 0.176146999 0.455630004
+vt 0.195748001 0.451225013
+vt 0.182742998 0.474031001
+vt 0.212721005 0.480152011
+vt 0.243395999 0.474987
+vt 0.119722001 0.482479006
+vt 0.127821997 0.490238011
+vt 0.109742001 0.495766014
+vt 0.100562997 0.496026993
+vt 0.138468996 0.471260995
+vt 0.153119996 0.483797997
+vt 0.157170996 0.462312996
+vt 0.0616150014 0.528503001
+vt 0.0555219986 0.542708993
+vt 0.0442360006 0.545163989
+vt 0.0768790022 0.53244102
+vt 0.0808169991 0.511713028
+vt 0.111925997 0.517912984
+vt 0.0648960024 0.562021971
+vt 0.0447760001 0.566935003
+vt 0.029871 0.560455978
+vt 0.0319529995 0.585416019
+vt 0.0541829988 0.586961985
+vt 0.00793700013 0.602871001
+vt 0.00932700001 0.593719006
+vt 0.0130460002 0.584051013
+vt 0.0196889993 0.57318902
+vt 0.0138349999 0.629914999
+vt 0.0102939997 0.621318996
+vt 0.0332290009 0.629750013
+vt 0.0188120008 0.637628019
+vt 0.0302060004 0.606575012
+vt 0.00829400029 0.612187982
+vt 0.0251219999 0.644109011
+vt 0.0358589999 0.649716973
+vt 0.0541619994 0.654808998
+vt 0.0682710037 0.641430974
+vt 0.0832530037 0.659739017
+vt 0.0565319993 0.617147028
+vt 0.227511004 0.674758017
+vt 0.247483 0.67178297
+vt 0.270951986 0.679085016
+vt 0.203277007 0.668470979
+vt 0.176966995 0.669961989
+vt 0.184446007 0.668640971
+vt 0.225311995 0.667564988
+vt 0.179220006 0.661633015
+vt 0.209371999 0.655707002
+vt 0.145732 0.658867002
+vt 0.147383004 0.665296972
+vt 0.126250997 0.664704025
+vt 0.167413995 0.643665016
+vt 0.123204 0.635460973
+vt 0.144678995 0.634945989
+vt 0.101724997 0.619733989
+vt 0.107910998 0.651238978
+vt 0.0816380009 0.617658019
+vt 0.326738 0.689065993
+vt 0.332823992 0.677559972
+vt 0.332320005 0.692680001
+vt 0.317032009 0.685849011
+vt 0.309754997 0.670242012
+vt 0.28906399 0.670363009
+vt 0.299618989 0.682649016
+vt 0.271762997 0.674794018
+vt 0.257230997 0.656332016
+vt 0.351125985 0.664092004
+vt 0.343425006 0.705702007
+vt 0.337375998 0.697068989
+vt 0.424612999 0.889771998
+vt 0.435665011 0.90160799
+vt 0.443138003 0.931070983
+vt 0.421707988 0.875681996
+vt 0.403539002 0.840640008
+vt 0.408450007 0.847642004
+vt 0.431163996 0.880487025
+vt 0.415307999 0.855104029
+vt 0.427228004 0.857963979
+vt 0.395489007 0.813930988
+vt 0.382643998 0.79144299
+vt 0.378208011 0.747869015
+vt 0.385260999 0.776140988
+vt 0.364549994 0.74958998
+vt 0.397244006 0.802199006
+vt 0.410061002 0.826072991
+vt 0.425285995 0.839864016
+vt 0.416078001 0.802909017
+vt 0.436132997 0.822144985
+vt 0.386216015 0.716775
+vt 0.368454993 0.725912988
+vt 0.369356006 0.691830993
+vt 0.395116001 0.685724974
+vt 0.388954014 0.66248697
+vt 0.351978987 0.722068012
+vt 0.456167012 0.943718016
+vt 0.456802994 0.95855999
+vt 0.466989011 0.975169003
+vt 0.482829988 0.949343979
+vt 0.479014993 0.93078202
+vt 0.449653 0.91653502
+vt 0.474950999 0.905110002
+vt 0.46094501 0.883978009
+vt 0.499226987 0.991614997
+vt 0.490772009 0.990776002
+vt 0.507678986 0.990776002
+vt 0.49703899 0.967162013
+vt 0.475154012 0.984059989
+vt 0.482639015 0.988259017
+vt 0.541589975 0.958549023
+vt 0.531424999 0.975171983
+vt 0.541345 0.93957001
+vt 0.55518198 0.931070983
+vt 0.523280978 0.984059989
+vt 0.515805006 0.988259017
+vt 0.615469992 0.791577995
+vt 0.615445971 0.786934972
+vt 0.624045014 0.759485006
+vt 0.63351202 0.74958998
+vt 0.594627023 0.840640008
+vt 0.601795971 0.821318984
+vt 0.610556006 0.795287013
+vt 0.601787984 0.813117981
+vt 0.590577006 0.844825983
+vt 0.585681021 0.859937012
+vt 0.573948026 0.886914015
+vt 0.603913009 0.787734985
+vt 0.594309986 0.823216975
+vt 0.582688987 0.858223021
+vt 0.582837999 0.846026003
+vt 0.564393997 0.894225001
+vt 0.572055995 0.869903982
+vt 0.55893898 0.913055003
+vt 0.543932974 0.911857009
+vt 0.511655986 0.944257975
+vt 0.521628976 0.918238997
+vt 0.497678012 0.912602007
+vt 0.660650015 0.697068989
+vt 0.651158988 0.682866991
+vt 0.665705025 0.692680001
+vt 0.654606998 0.705715001
+vt 0.639348984 0.708800018
+vt 0.627645016 0.688143015
+vt 0.627312005 0.656359971
+vt 0.618121028 0.710412025
+vt 0.634168029 0.731719971
+vt 0.646063983 0.722079992
+vt 0.610427976 0.729398012
+vt 0.698513985 0.682639003
+vt 0.714444995 0.675490975
+vt 0.72734803 0.679067016
+vt 0.693270028 0.661083996
+vt 0.681020021 0.685845017
+vt 0.669983983 0.656777978
+vt 0.649946988 0.653656006
+vt 0.671288013 0.689065993
+vt 0.845632017 0.665518999
+vt 0.805849016 0.669206977
+vt 0.837330997 0.659958005
+vt 0.872730017 0.664911985
+vt 0.821942985 0.669910014
+vt 0.790749013 0.665479004
+vt 0.771481991 0.672474027
+vt 0.741870999 0.673089027
+vt 0.75752902 0.667650998
+vt 0.770998001 0.674741983
+vt 0.72440201 0.656835973
+vt 0.974574029 0.644267976
+vt 0.947577 0.633560002
+vt 0.963029027 0.615761995
+vt 0.963837981 0.649800003
+vt 0.929913998 0.623072982
+vt 0.918156028 0.642305017
+vt 0.945487022 0.654823005
+vt 0.91624099 0.659691989
+vt 0.905691981 0.616822004
+vt 0.891559005 0.63252598
+vt 0.872148991 0.632373989
+vt 0.842229009 0.637377024
+vt 0.813237011 0.641725004
+vt 0.833814025 0.615253985
+vt 0.985885024 0.630200982
+vt 0.980876982 0.637858987
+vt 0.989482999 0.62164098
+vt 0.991554976 0.612528026
+vt 0.990665972 0.59403199
+vt 0.991988003 0.603208005
+vt 0.967354 0.584769011
+vt 0.973558009 0.566814005
+vt 0.955274999 0.567564011
+vt 0.952984989 0.54411602
+vt 0.985302985 0.58267498
+vt 0.84443599 0.440881014
+vt 0.819220006 0.425287008
+vt 0.811414003 0.409428
+vt 0.825755 0.441837013
+vt 0.837539017 0.468151003
+vt 0.881788015 0.476063997
+vt 0.86332798 0.486761987
+vt 0.883185029 0.497076005
+vt 0.902999997 0.515594006
+vt 0.881254971 0.520779014
+vt 0.930368006 0.535974979
+vt 0.92009002 0.511848986
+vt 0.910722017 0.531381011
+vt 0.918053985 0.545877993
+vt 0.941832006 0.553170979
+vt 0.940087974 0.589541972
+vt 0.920826018 0.573810995
+vt 0.80795002 0.454124987
+vt 0.806469977 0.422805995
+vt 0.788097024 0.398238987
+vt 0.791013002 0.418453008
+vt 0.771418989 0.366638988
+vt 0.756552994 0.361537993
+vt 0.768881023 0.360276997
+vt 0.777547002 0.375250012
+vt 0.789987981 0.388660014
+vt 0.753331006 0.389741987
+vt 0.762220979 0.411559999
+vt 0.769168019 0.324515998
+vt 0.757625997 0.323210001
+vt 0.774074018 0.294679999
+vt 0.767076015 0.342936993
+vt 0.740465999 0.322023004
+vt 0.76720202 0.353619009
+vt 0.791586995 0.197564006
+vt 0.791024983 0.192885995
+vt 0.79677701 0.158369005
+vt 0.800240993 0.143663004
+vt 0.788888991 0.169384003
+vt 0.785134971 0.205224007
+vt 0.778451025 0.199194998
+vt 0.783896029 0.227225006
+vt 0.775577009 0.247210994
+vt 0.770884991 0.273083001
+vt 0.782245994 0.249836996
+vt 0.759398997 0.296761006
+vt 0.75396502 0.268702
+vt 0.763671994 0.238499999
+vt 0.764289975 0.213494003
+vt 0.735229015 0.247195005
+vt 0.806883991 0.0379640013
+vt 0.789395988 0.0473800004
+vt 0.797192991 0.0229279995
+vt 0.802733004 0.0299629997
+vt 0.809225976 0.0501740016
+vt 0.770748973 0.0321029983
+vt 0.790123999 0.0848390013
+vt 0.790861011 0.0663319975
+vt 0.809293985 0.069877997
+vt 0.806502998 0.100469001
+vt 0.77599901 0.113086
+vt 0.791260004 0.121495999
+vt 0.780660987 0.145256996
+vt 0.794425011 0.141315997
+vt 0.783071995 0.0125580002
+vt 0.790546 0.0170600004
+vt 0.775043011 0.0096230004
+vt 0.755541027 0.0106880004
+vt 0.766731024 0.00845499989
+vt 0.738816023 0.0179639999
+vt 0.723143995 0.0376439989
+vt 0.713737011 0.0319949985
+vt 0.741962016 0.034593001
+vt 0.59245801 0.108111002
+vt 0.598482013 0.107344002
+vt 0.573095024 0.127662003
+vt 0.555570006 0.131020993
+vt 0.635101974 0.0811460018
+vt 0.62579602 0.0885189995
+vt 0.618726015 0.0963729993
+vt 0.653689981 0.0712760016
+vt 0.595587015 0.115056999
+vt 0.686351001 0.0542210005
+vt 0.677438974 0.0543729998
+vt 0.659597993 0.0711980015
+vt 0.635909021 0.0910329968
+vt 0.671262026 0.0679809973
+vt 0.655826986 0.0831009969
+vt 0.711268008 0.056109
+vt 0.706817985 0.082558997
+vt 0.553238988 0.173270002
+vt 0.529022992 0.164188996
+vt 0.552341998 0.148371994
+vt 0.532651007 0.193201005
+vt 0.505891025 0.177590996
+vt 0.585842013 0.153540999
+vt 0.603013992 0.133386999
+vt 0.505491972 0.156849995
+vt 0.499071985 0.157321006
+vt 0.515011013 0.153556004
+vt 0.530703008 0.145565003
+vt 0.494497001 0.207275003
+vt 0.47369799 0.192537993
+vt 0.504328012 0.887696981
+vt 0.487233013 0.873452008
+vt 0.55132997 0.885963976
+vt 0.532698989 0.880428016
+vt 0.518845975 0.861087978
+vt 0.499047011 0.840562999
+vt 0.479627013 0.855652988
+vt 0.46697101 0.823621988
+vt 0.452982992 0.851624012
+vt 0.560199976 0.853891015
+vt 0.540529013 0.840424001
+vt 0.448918998 0.802775025
+vt 0.421573013 0.781672001
+vt 0.408196986 0.760600984
+vt 0.485621005 0.820105016
+vt 0.521710992 0.819420993
+vt 0.483024001 0.782602012
+vt 0.505150974 0.798530996
+vt 0.563304007 0.824099004
+vt 0.542059004 0.798446
+vt 0.573805988 0.796684027
+vt 0.594623029 0.801285028
+vt 0.456575006 0.783380985
+vt 0.439157009 0.764962018
+vt 0.469857007 0.754365027
+vt 0.521884024 0.77690798
+vt 0.504634023 0.755847991
+vt 0.559828997 0.777037978
+vt 0.525488019 0.743991971
+vt 0.548276007 0.746972024
+vt 0.585524976 0.771129012
+vt 0.580471992 0.74633199
+vt 0.60532701 0.759248972
+vt 0.427848995 0.739691019
+vt 0.460851014 0.725373983
+vt 0.42978099 0.716714978
+vt 0.402922004 0.733545005
+vt 0.402841985 0.708005011
+vt 0.484053999 0.72310698
+vt 0.512736976 0.724209011
+vt 0.494661987 0.702440023
+vt 0.543456018 0.715002
+vt 0.579557002 0.714165986
+vt 0.424703002 0.695563018
+vt 0.426272988 0.670562029
+vt 0.458236009 0.694342971
+vt 0.478311002 0.674471974
+vt 0.457888991 0.657468975
+vt 0.506848991 0.674970984
+vt 0.525933981 0.692004979
+vt 0.557211995 0.688831985
+vt 0.527414978 0.667209983
+vt 0.601571023 0.692516983
+vt 0.573864996 0.672259986
+vt 0.600035012 0.664506018
+vt 0.412883013 0.644181013
+vt 0.438634008 0.643087029
+vt 0.422407001 0.622024
+vt 0.387567014 0.622247994
+vt 0.375315011 0.642901003
+vt 0.351743996 0.627351999
+vt 0.469815999 0.627985001
+vt 0.49041599 0.649145007
+vt 0.522580028 0.637335002
+vt 0.502322972 0.614517987
+vt 0.552191019 0.645057976
+vt 0.582427025 0.644584
+vt 0.572713017 0.616164982
+vt 0.601293027 0.636532009
+vt 0.629140019 0.628008008
+vt 0.666707993 0.628021002
+vt 0.234139994 0.641134024
+vt 0.25198999 0.62093401
+vt 0.219501004 0.625575006
+vt 0.192524001 0.638692975
+vt 0.197911993 0.618399978
+vt 0.165961996 0.616644025
+vt 0.30439499 0.641490996
+vt 0.278854996 0.638067007
+vt 0.222492993 0.600067973
+vt 0.252685994 0.584531009
+vt 0.211053997 0.581920028
+vt 0.172304004 0.594829977
+vt 0.182511002 0.572425008
+vt 0.294373989 0.610906005
+vt 0.273936987 0.605889976
+vt 0.285151005 0.581654012
+vt 0.325529993 0.641609013
+vt 0.340754986 0.611082971
+vt 0.317364007 0.604529977
+vt 0.351680994 0.589836001
+vt 0.328682005 0.572811007
+vt 0.304329991 0.572512984
+vt 0.37400499 0.601961017
+vt 0.386184007 0.580118001
+vt 0.402022988 0.600479007
+vt 0.425891012 0.595206022
+vt 0.448473006 0.606297016
+vt 0.473417997 0.600670993
+vt 0.457286 0.581377029
+vt 0.502767026 0.586353004
+vt 0.481550992 0.578419983
+vt 0.537096024 0.612170994
+vt 0.535191 0.590251029
+vt 0.562129021 0.590016007
+vt 0.589780986 0.588515997
+vt 0.608726025 0.612347007
+vt 0.64221102 0.597429991
+vt 0.612285018 0.579159021
+vt 0.636439979 0.568464994
+vt 0.660748005 0.606344998
+vt 0.670044005 0.579585016
+vt 0.700640023 0.622458994
+vt 0.717140019 0.637314975
+vt 0.686573982 0.602100015
+vt 0.711612999 0.585192025
+vt 0.756308973 0.650191009
+vt 0.743439972 0.62973702
+vt 0.728992999 0.605480015
+vt 0.756878972 0.591373026
+vt 0.736917019 0.58047998
+vt 0.794710994 0.63815999
+vt 0.788906991 0.622174025
+vt 0.776126027 0.645843029
+vt 0.766676009 0.619387984
+vt 0.78640902 0.593917012
+vt 0.0769700035 0.587134004
+vt 0.100675002 0.583904028
+vt 0.0888319984 0.557603002
+vt 0.103545003 0.538788021
+vt 0.134607002 0.607879996
+vt 0.130271003 0.587529004
+vt 0.120325997 0.56261301
+vt 0.150997996 0.560169995
+vt 0.142672002 0.534841001
+vt 0.172352001 0.535212994
+vt 0.201630995 0.551392019
+vt 0.238151997 0.557907999
+vt 0.267412007 0.557601988
+vt 0.250616014 0.534630001
+vt 0.221709996 0.538920999
+vt 0.301625997 0.542867005
+vt 0.278326988 0.526256025
+vt 0.32476899 0.546428978
+vt 0.356148988 0.538721025
+vt 0.355637014 0.563054025
+vt 0.376219988 0.558144987
+vt 0.395447999 0.535439014
+vt 0.401695997 0.562974989
+vt 0.437920988 0.564518988
+vt 0.422322005 0.547385991
+vt 0.468531996 0.550411999
+vt 0.453467995 0.526250005
+vt 0.489800006 0.551392019
+vt 0.518260002 0.56022799
+vt 0.57337302 0.568881989
+vt 0.572202981 0.547257006
+vt 0.593297005 0.535753012
+vt 0.61551702 0.537550986
+vt 0.664117992 0.557591975
+vt 0.641095996 0.530466974
+vt 0.67751199 0.539969027
+vt 0.699343979 0.56398499
+vt 0.716190994 0.531913996
+vt 0.734937012 0.553655028
+vt 0.757488012 0.558986008
+vt 0.752349973 0.527848005
+vt 0.777756989 0.564005017
+vt 0.80457598 0.56449002
+vt 0.783751011 0.536983013
+vt 0.814836025 0.602844
+vt 0.84622997 0.587076008
+vt 0.825578988 0.571159005
+vt 0.839088976 0.552156985
+vt 0.808386981 0.537588
+vt 0.862757027 0.610701978
+vt 0.87667799 0.595704019
+vt 0.873103976 0.56833601
+vt 0.861868024 0.540211022
+vt 0.917870998 0.602050006
+vt 0.895134985 0.586089015
+vt 0.900376022 0.561300993
+vt 0.888265014 0.543569028
+vt 0.132455006 0.514764011
+vt 0.158207998 0.506151974
+vt 0.186750993 0.497343004
+vt 0.199781999 0.521095991
+vt 0.226497993 0.514313996
+vt 0.259718001 0.504355013
+vt 0.230214998 0.49011901
+vt 0.326312006 0.521355987
+vt 0.38152501 0.514181972
+vt 0.432532996 0.521412015
+vt 0.412218004 0.51415199
+vt 0.630882978 0.500150025
+vt 0.60847199 0.499287009
+vt 0.657625973 0.511349976
+vt 0.691129982 0.514627993
+vt 0.729323983 0.502767026
+vt 0.70312202 0.490123987
+vt 0.673003972 0.494758993
+vt 0.765626013 0.502696991
+vt 0.790480971 0.503349006
+vt 0.833600998 0.526579022
+vt 0.816082001 0.509752989
+vt 0.858950019 0.517075002
+vt 0.844615996 0.495249987
+vt 0.26492399 0.482033014
+vt 0.621585011 0.46696201
+vt 0.657971978 0.475937992
+vt 0.662101984 0.447620988
+vt 0.634765029 0.450096011
+vt 0.716991007 0.472761989
+vt 0.708724022 0.447952986
+vt 0.686187983 0.460584015
+vt 0.737197995 0.471711993
+vt 0.760699987 0.471280992
+vt 0.76117003 0.447326005
+vt 0.782761991 0.468243986
+vt 0.812693 0.483925015
+vt 0.618317008 0.428487986
+vt 0.683884025 0.422984004
+vt 0.650498986 0.428806007
+vt 0.662863016 0.395904005
+vt 0.643167973 0.40456
+vt 0.711332977 0.413314015
+vt 0.738649011 0.430593997
+vt 0.727573991 0.396055996
+vt 0.782950997 0.43659699
+vt 0.614472985 0.390971988
+vt 0.602380991 0.363757998
+vt 0.636789978 0.36945501
+vt 0.577602029 0.380609989
+vt 0.556410015 0.396315008
+vt 0.544759989 0.378075987
+vt 0.670572996 0.365186989
+vt 0.688530982 0.393016994
+vt 0.705577016 0.368535995
+vt 0.735930026 0.36076501
+vt 0.51394397 0.370999008
+vt 0.492962986 0.385354012
+vt 0.483361006 0.360408008
+vt 0.459614009 0.376722008
+vt 0.526719987 0.348441988
+vt 0.561574996 0.353722006
+vt 0.539958 0.320398003
+vt 0.501407027 0.315948993
+vt 0.501142025 0.342711985
+vt 0.473199993 0.329064012
+vt 0.454510987 0.344523013
+vt 0.598837972 0.344375014
+vt 0.578899026 0.323556006
+vt 0.562394977 0.331860006
+vt 0.624037981 0.338981986
+vt 0.609256029 0.318156004
+vt 0.649748981 0.342859
+vt 0.676205993 0.340395004
+vt 0.664641976 0.315459996
+vt 0.639656007 0.322158992
+vt 0.694670022 0.336973011
+vt 0.715964019 0.339058012
+vt 0.428279996 0.326534003
+vt 0.403714001 0.337069988
+vt 0.444745004 0.311107993
+vt 0.457170993 0.294708014
+vt 0.421478003 0.285329998
+vt 0.417979002 0.307954013
+vt 0.390296996 0.310552001
+vt 0.389054 0.289137989
+vt 0.515761018 0.299697995
+vt 0.485837996 0.299569011
+vt 0.498023003 0.279662997
+vt 0.470093995 0.278198004
+vt 0.53578198 0.289784014
+vt 0.562273979 0.293684006
+vt 0.58829999 0.301070005
+vt 0.635200977 0.299614012
+vt 0.603374004 0.282685012
+vt 0.636707008 0.268471003
+vt 0.65832603 0.284238011
+vt 0.689795017 0.305667996
+vt 0.719287992 0.311610013
+vt 0.711192012 0.286904991
+vt 0.679939985 0.27956301
+vt 0.734238982 0.280671
+vt 0.360693991 0.30052799
+vt 0.374072999 0.26810801
+vt 0.358720988 0.244298995
+vt 0.382685006 0.238928005
+vt 0.339468986 0.247284994
+vt 0.308717012 0.256246001
+vt 0.317200005 0.232972994
+vt 0.295901 0.229673997
+vt 0.398764014 0.262535989
+vt 0.414236993 0.247077003
+vt 0.442104012 0.264075994
+vt 0.471996009 0.254375011
+vt 0.454834998 0.238849998
+vt 0.43324101 0.232412994
+vt 0.49504599 0.244075999
+vt 0.516533017 0.252247006
+vt 0.527935028 0.269834995
+vt 0.561320007 0.268236011
+vt 0.543578029 0.241555005
+vt 0.592697978 0.253562003
+vt 0.570445001 0.240932003
+vt 0.616845012 0.253338993
+vt 0.66486001 0.247308001
+vt 0.636820018 0.226930007
+vt 0.692582011 0.263312012
+vt 0.713503003 0.253592014
+vt 0.687970996 0.227798998
+vt 0.282076001 0.207334995
+vt 0.311255991 0.198299006
+vt 0.268018007 0.218520001
+vt 0.334621012 0.214393005
+vt 0.339984 0.187258005
+vt 0.357410997 0.207202002
+vt 0.381862998 0.204276994
+vt 0.425505012 0.205033004
+vt 0.397370011 0.208767995
+vt 0.450177014 0.214488998
+vt 0.474561989 0.220090002
+vt 0.450628996 0.190161005
+vt 0.520703018 0.220262006
+vt 0.553833008 0.203383997
+vt 0.567345977 0.214901999
+vt 0.597172976 0.225467995
+vt 0.587468028 0.199615002
+vt 0.618562996 0.215059996
+vt 0.612214029 0.184580997
+vt 0.631478012 0.188087001
+vt 0.667671978 0.20566
+vt 0.650430024 0.190373003
+vt 0.708324015 0.220671996
+vt 0.70026201 0.195298001
+vt 0.729451001 0.219742
+vt 0.748193979 0.214160994
+vt 0.735907972 0.189916998
+vt 0.280663997 0.178271994
+vt 0.318264991 0.169104993
+vt 0.304307014 0.144226998
+vt 0.270817995 0.155396998
+vt 0.245798007 0.171964005
+vt 0.351108998 0.162120998
+vt 0.365069002 0.183436006
+vt 0.380838007 0.168061003
+vt 0.405662 0.178770006
+vt 0.589116991 0.176263005
+vt 0.623578012 0.157500997
+vt 0.682757974 0.174129993
+vt 0.657638013 0.160290003
+vt 0.721873999 0.169256002
+vt 0.703731 0.145834997
+vt 0.681833029 0.152750999
+vt 0.745718002 0.158414006
+vt 0.767993987 0.182733998
+vt 0.763388991 0.152149007
+vt 0.252492994 0.135857999
+vt 0.270565003 0.114946
+vt 0.292100012 0.119459003
+vt 0.341623992 0.141203001
+vt 0.319038987 0.113963999
+vt 0.344630003 0.117973
+vt 0.372007012 0.136851996
+vt 0.365015 0.110059999
+vt 0.638759971 0.136026993
+vt 0.630473018 0.112884998
+vt 0.614277005 0.109948002
+vt 0.661729991 0.127981007
+vt 0.649906993 0.106096998
+vt 0.678855002 0.120830998
+vt 0.710587025 0.114651002
+vt 0.731478989 0.133270994
+vt 0.745454013 0.114689
+vt 0.256814986 0.0837680027
+vt 0.283854008 0.0853670016
+vt 0.328693002 0.0895899981
+vt 0.681035995 0.0937810019
+vt 0.728663027 0.0863189995
+vt 0.757815003 0.0949449986
+vt 0.740926981 0.0655390024
+vt 0.763715029 0.0592200011
+vt 0.416662008 0.124062002
+vt 0.375624001 0.0969249979
+vt 0.377169013 0.0999229997
+vt 0.450607985 0.143398002
+vt 0.416750014 0.122123003
+vt 0.450461 0.145177007
+vt 0.372907996 0.0942849964
+vt 0.303373992 0.0513640009
+vt 0.303638011 0.0533129983
+vt 0.279550999 0.0405139998
+vt 0.262277007 0.0313460007
+vt 0.262798995 0.0332700014
+vt 0.279078007 0.038017001
+vt 0.303638011 0.0533119999
+vt 0.250984997 0.0313359983
+vt 0.250239998 0.0291210003
+vt 0.240777001 0.0305720009
+vt 0.241696998 0.0328020006
+vt 0.231479004 0.0340569988
+vt 0.232688993 0.0364729986
+vt 0.222727999 0.0393589996
+vt 0.224097997 0.0416040011
+vt 0.216490999 0.0483970009
+vt 0.214917004 0.046250999
+vt 0.208395004 0.0544289984
+vt 0.209935993 0.0562199987
+vt 0.203529999 0.0636190027
+vt 0.205127999 0.0652230009
+vt 0.201654002 0.0761210024
+vt 0.201093003 0.0911860019
+vt 0.199146003 0.0897649974
+vt 0.199891001 0.109118
+vt 0.201575994 0.110201001
+vt 0.200331002 0.074924998
+vt 0.204322994 0.135082006
+vt 0.207352996 0.162664995
+vt 0.209643006 0.163534001
+vt 0.202625006 0.134145007
+vt 0.201306 0.110068001
+vt 0.215029001 0.192559004
+vt 0.213130996 0.191907004
+vt 0.221185997 0.220017001
+vt 0.219944 0.219610006
+vt 0.228716999 0.243484005
+vt 0.235092998 0.26324299
+vt 0.236831993 0.263392001
+vt 0.227131993 0.243151993
+vt 0.221642002 0.220091999
+vt 0.245413005 0.28054601
+vt 0.243709996 0.280497015
+vt 0.254819989 0.295787007
+vt 0.253702015 0.295738012
+vt 0.265475988 0.309691995
+vt 0.26680699 0.309579015
+vt 0.281823009 0.323659986
+vt 0.304154992 0.338817
+vt 0.302850008 0.33919999
+vt 0.333927989 0.357324988
+vt 0.281004012 0.323711991
+vt 0.333160013 0.357549995
+vt 0.374992996 0.379954994
+vt 0.420585006 0.404276013
+vt 0.421701998 0.403403997
+vt 0.374419987 0.380163014
+vt 0.334181011 0.357185006
+vt 0.466019988 0.426550001
+vt 0.465321988 0.427150995
+vt 0.502264023 0.446025014
+vt 0.502719998 0.44561401
+vt 0.525063992 0.458131999
+vt 0.525795996 0.457498997
+vt 0.502717972 0.445616007
+vt 0.537182987 0.465113014
+vt 0.537800014 0.46468699
+vt 0.54272598 0.468356013
+vt 0.542017996 0.468699992
+vt 0.543500006 0.470472991
+vt 0.542954028 0.47061801
+vt 0.544466972 0.472474009
+vt 0.543744981 0.474460006
+vt 0.544411004 0.474550992
+vt 0.543519974 0.472548991
+vt 0.544281006 0.476518989
+vt 0.543163002 0.477937013
+vt 0.543931007 0.478381991
+vt 0.543520987 0.476249993
+vt 0.542943001 0.479759991
+vt 0.541576982 0.480536014
+vt 0.542258978 0.481362998
+vt 0.54242301 0.479290009
+vt 0.540955007 0.482405007
+vt 0.539068997 0.482347995
+vt 0.539439023 0.483269006
+vt 0.540407002 0.481458992
+vt 0.537638009 0.483779013
+vt 0.531657994 0.482632011
+vt 0.531804979 0.483592004
+vt 0.537401974 0.482845008
+vt 0.51801002 0.481844991
+vt 0.51789999 0.480664015
+vt 0.492291987 0.476532996
+vt 0.492359996 0.477306008
+vt 0.451126009 0.470436007
+vt 0.439837992 0.467411995
+vt 0.400985986 0.461787999
+vt 0.492361009 0.477308989
+vt 0.348621994 0.452793986
+vt 0.34830901 0.452093005
+vt 0.300494999 0.445152014
+vt 0.301115006 0.446458995
+vt 0.264611006 0.442680001
+vt 0.235691994 0.440625012
+vt 0.236433998 0.441574991
+vt 0.263819993 0.441365004
+vt 0.301119 0.446471006
+vt 0.214148998 0.443486005
+vt 0.213173002 0.442395985
+vt 0.194765002 0.447483003
+vt 0.193858996 0.446680993
+vt 0.175266996 0.453287005
+vt 0.176487997 0.45430699
+vt 0.157759994 0.462603986
+vt 0.139814004 0.473774999
+vt 0.138549998 0.473035008
+vt 0.119860001 0.486173987
+vt 0.121487997 0.48703301
+vt 0.156835005 0.462018013
+vt 0.102063 0.50207901
+vt 0.0821050033 0.517912984
+vt 0.0838370025 0.518554986
+vt 0.121068001 0.486759007
+vt 0.100611001 0.501479983
+vt 0.0668540001 0.534781992
+vt 0.0649790019 0.534251988
+vt 0.0511009991 0.549614012
+vt 0.0525499992 0.549899995
+vt 0.0429489985 0.563108981
+vt 0.053061001 0.550055981
+vt 0.0339680016 0.574437976
+vt 0.0363430008 0.574621022
+vt 0.0405969992 0.562761009
+vt 0.0320039988 0.585168004
+vt 0.0298299994 0.585206985
+vt 0.0283669997 0.595701993
+vt 0.0306059998 0.595480025
+vt 0.031355001 0.606070995
+vt 0.0314700007 0.617187023
+vt 0.033321999 0.616653979
+vt 0.0288679991 0.606540978
+vt 0.037721999 0.626420021
+vt 0.0353900008 0.627345979
+vt 0.0425750017 0.635667026
+vt 0.0409910008 0.636425018
+vt 0.0500789993 0.642768025
+vt 0.0597480014 0.650102973
+vt 0.0612360016 0.649061978
+vt 0.0482349992 0.64387399
+vt 0.0796839967 0.654277027
+vt 0.106470004 0.660674989
+vt 0.107730001 0.659411013
+vt 0.0779249966 0.655771971
+vt 0.107390001 0.65979898
+vt 0.195014998 0.670841992
+vt 0.196066007 0.669449985
+vt 0.147317007 0.666046977
+vt 0.243266001 0.674004972
+vt 0.242314994 0.675431013
+vt 0.283087999 0.678562999
+vt 0.282600999 0.679301977
+vt 0.309727997 0.68077302
+vt 0.324290991 0.684885979
+vt 0.325042993 0.683699012
+vt 0.308766991 0.682406008
+vt 0.283455014 0.67789799
+vt 0.333238989 0.686164021
+vt 0.332316995 0.687506974
+vt 0.337285012 0.689293027
+vt 0.336504012 0.690312982
+vt 0.341437012 0.692332029
+vt 0.345380008 0.700755
+vt 0.346637994 0.699380994
+vt 0.340386003 0.693585992
+vt 0.353983015 0.714091003
+vt 0.352678001 0.715457976
+vt 0.364089012 0.74060601
+vt 0.365155011 0.739455998
+vt 0.381900996 0.77838701
+vt 0.400516987 0.825522006
+vt 0.401980996 0.823655009
+vt 0.380798995 0.779698014
+vt 0.365159988 0.739450991
+vt 0.439242989 0.909443974
+vt 0.42048201 0.871599019
+vt 0.438454986 0.911004007
+vt 0.451992989 0.93770498
+vt 0.452885985 0.935576975
+vt 0.439099014 0.909667015
+vt 0.46261999 0.95422101
+vt 0.463355005 0.952009976
+vt 0.472113013 0.961355984
+vt 0.471601009 0.963438988
+vt 0.480455995 0.966512978
+vt 0.480179012 0.968249023
+vt 0.489883006 0.968442976
+vt 0.499545991 0.971679986
+vt 0.499556988 0.969749987
+vt 0.489654005 0.970959008
+vt 0.509230018 0.968442976
+vt 0.518844008 0.967844009
+vt 0.518486977 0.965677977
+vt 0.509432971 0.970955014
+vt 0.526978016 0.961350024
+vt 0.536369026 0.95400703
+vt 0.535637021 0.951794028
+vt 0.527468979 0.963445008
+vt 0.546151996 0.935577989
+vt 0.547016978 0.937705994
+vt 0.560501993 0.91100502
+vt 0.559876978 0.909667015
+vt 0.559736013 0.909443974
+vt 0.598294973 0.825522006
+vt 0.596859992 0.823653996
+vt 0.578437984 0.871671975
+vt 0.61687398 0.778385997
+vt 0.617945015 0.779690027
+vt 0.634621024 0.740604997
+vt 0.633565009 0.739440978
+vt 0.644734025 0.714091003
+vt 0.653299987 0.700752974
+vt 0.652072012 0.699380994
+vt 0.646010995 0.715458989
+vt 0.633570015 0.739444971
+vt 0.657262027 0.692330003
+vt 0.658285975 0.693579972
+vt 0.661410987 0.689293981
+vt 0.662171006 0.690312982
+vt 0.665462971 0.686164021
+vt 0.674414992 0.684886992
+vt 0.673684001 0.683699012
+vt 0.666361988 0.687511981
+vt 0.68907702 0.680765986
+vt 0.690007985 0.682398021
+vt 0.716305971 0.679252982
+vt 0.715403974 0.677684009
+vt 0.755940974 0.673973024
+vt 0.804467022 0.670786023
+vt 0.803143978 0.668824017
+vt 0.756874025 0.675405979
+vt 0.715614974 0.678120017
+vt 0.892673016 0.659776986
+vt 0.852446973 0.665971994
+vt 0.893764973 0.660817981
+vt 0.920503974 0.654308975
+vt 0.94045198 0.65021199
+vt 0.938988984 0.649172008
+vt 0.922236025 0.655806005
+vt 0.892490983 0.659569025
+vt 0.95014298 0.642961979
+vt 0.951956987 0.644069016
+vt 0.957641006 0.635945022
+vt 0.959201992 0.636705995
+vt 0.962531984 0.626756012
+vt 0.968825996 0.617578983
+vt 0.966476977 0.616877019
+vt 0.964847982 0.627695024
+vt 0.969048977 0.606481016
+vt 0.97150898 0.606961012
+vt 0.970480978 0.595942974
+vt 0.972229004 0.596140981
+vt 0.968554974 0.585560024
+vt 0.96509397 0.57328099
+vt 0.963261008 0.573377013
+vt 0.970721006 0.585609019
+vt 0.951461971 0.557345986
+vt 0.953785002 0.557002008
+vt 0.933890998 0.534671009
+vt 0.93205601 0.535079002
+vt 0.902547002 0.504383028
+vt 0.901682973 0.502197981
+vt 0.865980983 0.470524013
+vt 0.93234098 0.534988999
+vt 0.830066979 0.436993003
+vt 0.831691027 0.436199009
+vt 0.800924003 0.407786995
+vt 0.799870014 0.408340007
+vt 0.781310976 0.388902992
+vt 0.779570997 0.389883012
+vt 0.799463987 0.408583999
+vt 0.770155013 0.37718299
+vt 0.768447995 0.378093988
+vt 0.76336199 0.370891988
+vt 0.762772024 0.365404993
+vt 0.761170983 0.366082013
+vt 0.764908016 0.37014401
+vt 0.760106981 0.360852987
+vt 0.761605978 0.351435989
+vt 0.759398997 0.352106988
+vt 0.761702001 0.360258996
+vt 0.762187004 0.335597992
+vt 0.763800025 0.335099995
+vt 0.768332005 0.307895005
+vt 0.766776025 0.308385015
+vt 0.774084985 0.266883999
+vt 0.784681022 0.217232004
+vt 0.782325983 0.218154997
+vt 0.775967002 0.266240001
+vt 0.767013013 0.308331013
+vt 0.791351974 0.168639004
+vt 0.792661011 0.167881995
+vt 0.798282027 0.125098005
+vt 0.796696007 0.126124993
+vt 0.798749983 0.0966499969
+vt 0.799992025 0.0754970014
+vt 0.798400998 0.0768859982
+vt 0.800674021 0.0952230021
+vt 0.796698987 0.126123995
+vt 0.795704007 0.0639510006
+vt 0.792225003 0.0534939989
+vt 0.790728986 0.0552389994
+vt 0.797276974 0.0623439997
+vt 0.784345984 0.0473020002
+vt 0.777966976 0.0385069996
+vt 0.776916981 0.0402589999
+vt 0.785905004 0.0451399982
+vt 0.768160999 0.0354249999
+vt 0.759934008 0.0298069995
+vt 0.759063005 0.0320019983
+vt 0.769348025 0.0330090001
+vt 0.749858975 0.0302920006
+vt 0.738511026 0.0303130001
+vt 0.737851977 0.0332540013
+vt 0.75059098 0.0280579999
+vt 0.721152008 0.039526999
+vt 0.721605003 0.0370239988
+vt 0.697131991 0.0504550003
+vt 0.696869016 0.0524360016
+vt 0.662360013 0.0741169974
+vt 0.622542977 0.0967279971
+vt 0.622651994 0.0993880033
+vt 0.696880996 0.0521170013
+vt 0.582777023 0.123722002
+vt 0.58266598 0.121795997
+vt 0.548497975 0.143228993
+vt 0.548624992 0.144727007
+vt 0.526111007 0.158684999
+vt 0.512116015 0.163995996
+vt 0.512244999 0.165602997
+vt 0.525885999 0.156552002
+vt 0.548712015 0.145266995
+vt 0.504348993 0.168580994
+vt 0.499397993 0.167327002
+vt 0.499410003 0.169220001
+vt 0.504260004 0.166722
+vt 0.494468004 0.168578997
+vt 0.486708999 0.164009005
+vt 0.486550987 0.166107997
+vt 0.494531989 0.166715994
+vt 0.472833008 0.158752993
+vt 0.473031998 0.156620994
+vt 0.450417995 0.145444006
+vt 0.416397989 0.125770003
+vt 0.450100005 0.147237003
+vt 0.337756008 0.0756699964
+vt 0.303620994 0.0555739999
+vt 0.303620011 0.0555800013
+vt 0.27966401 0.0437109992
+vt 0.263117999 0.0354430005
+vt 0.251459002 0.0332649983
+vt 0.242452994 0.0350239985
+vt 0.234062001 0.039489001
+vt 0.225786999 0.0443740003
+vt 0.218510002 0.0509390011
+vt 0.211888999 0.0581750013
+vt 0.206579998 0.0664340034
+vt 0.203733996 0.0775550008
+vt 0.203770995 0.0924689993
+vt 0.203833997 0.111074999
+vt 0.203114003 0.11084
+vt 0.205920994 0.135597005
+vt 0.217544004 0.192744002
+vt 0.222779006 0.220161006
+vt 0.230856001 0.243322998
+vt 0.239528999 0.262784988
+vt 0.223867998 0.220102996
+vt 0.247451007 0.279994994
+vt 0.256810993 0.295179009
+vt 0.268061012 0.309080988
+vt 0.283349007 0.32297799
+vt 0.305958986 0.33750999
+vt 0.334939986 0.356638998
+vt 0.37658 0.378544003
+vt 0.335801005 0.355839014
+vt 0.466690987 0.425826997
+vt 0.503597975 0.444692999
+vt 0.503283978 0.445033014
+vt 0.527298987 0.456115991
+vt 0.504332006 0.443890005
+vt 0.539319992 0.463595986
+vt 0.543667972 0.467877001
+vt 0.545051992 0.469992995
+vt 0.546440005 0.472232014
+vt 0.545637012 0.474647999
+vt 0.545324028 0.476817995
+vt 0.545328021 0.479077995
+vt 0.543983996 0.480560988
+vt 0.543579996 0.482762009
+vt 0.542146027 0.484171003
+vt 0.540154994 0.48477599
+vt 0.537989974 0.484907001
+vt 0.532127023 0.485188991
+vt 0.518272996 0.484064013
+vt 0.492428005 0.478224993
+vt 0.492540002 0.47991401
+vt 0.492462009 0.478726
+vt 0.451211005 0.471563995
+vt 0.401154995 0.463494986
+vt 0.349014014 0.454984993
+vt 0.301564008 0.448505998
+vt 0.265282989 0.44500199
+vt 0.301566005 0.448516011
+vt 0.237062007 0.443048
+vt 0.215101004 0.445367008
+vt 0.195997 0.449371994
+vt 0.177782997 0.456086993
+vt 0.159192994 0.464074999
+vt 0.141182005 0.475055993
+vt 0.123282999 0.488577008
+vt 0.103664003 0.50316602
+vt 0.0856949985 0.519702017
+vt 0.0684320033 0.535520971
+vt 0.0544600002 0.550598025
+vt 0.122982003 0.488297999
+vt 0.0551920012 0.550927997
+vt 0.0458419994 0.564005971
+vt 0.0384420007 0.575012982
+vt 0.0338770002 0.585277021
+vt 0.032825999 0.595372975
+vt 0.0344699994 0.605543017
+vt 0.0353499986 0.616028011
+vt 0.0405780002 0.625078022
+vt 0.0450140014 0.63419503
+vt 0.0515599996 0.641645014
+vt 0.0627169982 0.647651017
+vt 0.0815740004 0.651933014
+vt 0.108811997 0.657881021
+vt 0.108589999 0.658213019
+vt 0.149483994 0.663190007
+vt 0.197041005 0.667536974
+vt 0.243963003 0.672582984
+vt 0.283652008 0.677519023
+vt 0.284274012 0.676114976
+vt 0.284271985 0.67611903
+vt 0.310891002 0.678265989
+vt 0.325902998 0.682110012
+vt 0.334089994 0.684809983
+vt 0.33870399 0.687343001
+vt 0.34246701 0.691103995
+vt 0.347932011 0.698024988
+vt 0.355973005 0.71221
+vt 0.367101997 0.737681985
+vt 0.383026987 0.777284026
+vt 0.366573989 0.738137007
+vt 0.422356009 0.868893981
+vt 0.440414995 0.90773201
+vt 0.440203995 0.90802002
+vt 0.454430014 0.933019996
+vt 0.464329988 0.94987601
+vt 0.472698987 0.959580004
+vt 0.481085986 0.96370101
+vt 0.490272999 0.965250015
+vt 0.499563009 0.967594028
+vt 0.508857012 0.965255976
+vt 0.517924011 0.963249028
+vt 0.526404023 0.959569991
+vt 0.534759998 0.949878991
+vt 0.544624984 0.933018982
+vt 0.558789015 0.90802002
+vt 0.576564014 0.868893981
+vt 0.558579981 0.907730997
+vt 0.615222991 0.77680099
+vt 0.632146001 0.738107979
+vt 0.631888986 0.737882972
+vt 0.642764986 0.712211013
+vt 0.650794029 0.698026001
+vt 0.65624702 0.691101015
+vt 0.660013974 0.687341988
+vt 0.664626002 0.684808016
+vt 0.672838986 0.682106972
+vt 0.687934995 0.678259015
+vt 0.714457989 0.675499976
+vt 0.714845002 0.676450014
+vt 0.755258024 0.672550976
+vt 0.850108027 0.662675977
+vt 0.891471028 0.658164024
+vt 0.891269028 0.657858014
+vt 0.918637991 0.651961029
+vt 0.937524974 0.647755027
+vt 0.948678017 0.641831994
+vt 0.955223024 0.634460986
+vt 0.959698975 0.625398993
+vt 0.963747978 0.61599803
+vt 0.965954006 0.605934024
+vt 0.967644989 0.595777988
+vt 0.966696978 0.585655987
+vt 0.961229026 0.573715985
+vt 0.948561013 0.558220029
+vt 0.930087984 0.535812974
+vt 0.930445015 0.535668015
+vt 0.869957983 0.476426989
+vt 0.828694999 0.437826991
+vt 0.798611999 0.409117013
+vt 0.79746002 0.409886986
+vt 0.777185977 0.391384989
+vt 0.766595006 0.379130006
+vt 0.761879981 0.371601999
+vt 0.759141982 0.366874993
+vt 0.758558989 0.361348987
+vt 0.759567022 0.336089998
+vt 0.76452601 0.308773994
+vt 0.765208006 0.308678001
+vt 0.77115798 0.267352015
+vt 0.795116007 0.126796007
+vt 0.794772029 0.126943007
+vt 0.796077013 0.0979709998
+vt 0.796108007 0.0783480033
+vt 0.794268012 0.0651659966
+vt 0.788957 0.0570209995
+vt 0.782343984 0.0498489998
+vt 0.775775015 0.0421559997
+vt 0.766806006 0.0384389982
+vt 0.758261025 0.0344769992
+vt 0.749394 0.0322280005
+vt 0.721054018 0.042723
+vt 0.696874976 0.054347001
+vt 0.69688201 0.0542800017
+vt 0.662482023 0.0753619969
+vt 0.583052993 0.125432
+vt 0.548972011 0.146707997
+vt 0.526628017 0.161593005
+vt 0.549293995 0.148162007
+vt 0.512483001 0.167539001
+vt 0.504463017 0.170330003
+vt 0.499417007 0.171534002
+vt 0.494369 0.170322001
+vt 0.486308008 0.168127
+vt 0.472335994 0.161661997
+vt 0.449939013 0.147976995
+vt 0.337244987 0.0789100006
+vt 0.376560986 0.103252001
+vt 0.303324997 0.0583150014
+vt 0.415883988 0.128021002
+vt 0.449492007 0.14982
+vt 0.303324997 0.0583159998
+vt 0.279529989 0.0463149995
+vt 0.263327986 0.0382770002
+vt 0.251902014 0.0357140005
+vt 0.243246004 0.0377449989
+vt 0.235079005 0.0418619998
+vt 0.227881998 0.0478070006
+vt 0.220129997 0.0528820008
+vt 0.214341998 0.0603859983
+vt 0.208487004 0.0678090006
+vt 0.206016004 0.0932639986
+vt 0.207248002 0.111847997
+vt 0.206448004 0.0790069997
+vt 0.219527006 0.190121993
+vt 0.225431994 0.219903007
+vt 0.212687001 0.163879007
+vt 0.208223999 0.135985002
+vt 0.205883995 0.111598998
+vt 0.233622 0.242666006
+vt 0.226236999 0.219777003
+vt 0.249414995 0.279145986
+vt 0.259970009 0.293466002
+vt 0.269688994 0.308108002
+vt 0.307498008 0.336066008
+vt 0.336622 0.354999006
+vt 0.285614997 0.321328998
+vt 0.377932012 0.376985013
+vt 0.337947994 0.353507012
+vt 0.467844009 0.424457997
+vt 0.423350006 0.401526988
+vt 0.505167007 0.442957997
+vt 0.529026985 0.454495996
+vt 0.506170988 0.441819012
+vt 0.541172981 0.462249994
+vt 0.545207024 0.467079997
+vt 0.547766984 0.469114006
+vt 0.548362017 0.471971989
+vt 0.547959983 0.47478801
+vt 0.546958983 0.477247
+vt 0.547640979 0.480170012
+vt 0.54589802 0.481950015
+vt 0.545883 0.485092014
+vt 0.543774009 0.486469001
+vt 0.541139007 0.486746013
+vt 0.538582981 0.486663014
+vt 0.532702029 0.487803996
+vt 0.518546999 0.486223996
+vt 0.492724001 0.482847989
+vt 0.451299995 0.473475993
+vt 0.401279986 0.466259986
+vt 0.349189013 0.45717299
+vt 0.301883012 0.451422989
+vt 0.492624015 0.481229991
+vt 0.301856011 0.451041013
+vt 0.265679985 0.447207004
+vt 0.237820998 0.445681006
+vt 0.216067001 0.448123991
+vt 0.197386995 0.45244801
+vt 0.179030001 0.458335996
+vt 0.161006004 0.466670007
+vt 0.142776996 0.476971
+vt 0.125626996 0.491214007
+vt 0.105547003 0.504801989
+vt 0.125621006 0.491207004
+vt 0.0817819983 0.52799201
+vt 0.0703079998 0.536666989
+vt 0.0571370013 0.551928997
+vt 0.0575550012 0.552160025
+vt 0.0481280014 0.564935982
+vt 0.0408970006 0.57565099
+vt 0.0362199992 0.585542023
+vt 0.035521999 0.595337987
+vt 0.036936 0.605153024
+vt 0.0383859985 0.615046978
+vt 0.0428059995 0.623933971
+vt 0.0484559983 0.63173902
+vt 0.053332001 0.640066981
+vt 0.0829460025 0.649829984
+vt 0.110092998 0.655606985
+vt 0.0647820011 0.645271003
+vt 0.150491998 0.661113977
+vt 0.198189005 0.664629996
+vt 0.244770005 0.670531988
+vt 0.285171986 0.673768997
+vt 0.110096 0.655601025
+vt 0.285156995 0.673808992
+vt 0.31180501 0.676038027
+vt 0.327215999 0.679464996
+vt 0.335202992 0.682941973
+vt 0.340985 0.684100986
+vt 0.34385699 0.689444005
+vt 0.357737005 0.710623026
+vt 0.369839996 0.735408008
+vt 0.349601001 0.696316004
+vt 0.424012005 0.867147982
+vt 0.404249012 0.821466029
+vt 0.442070991 0.905749977
+vt 0.384662986 0.775861979
+vt 0.368221015 0.736725986
+vt 0.442068011 0.90575403
+vt 0.455873013 0.931011975
+vt 0.465557009 0.947650015
+vt 0.473571986 0.957355976
+vt 0.482232988 0.95956099
+vt 0.490630001 0.962714016
+vt 0.499568999 0.964325011
+vt 0.508507013 0.96271503
+vt 0.517032981 0.960004985
+vt 0.525542021 0.957351983
+vt 0.543191016 0.931012988
+vt 0.556940973 0.905755997
+vt 0.533541024 0.947649002
+vt 0.613254011 0.775128007
+vt 0.630276024 0.736506999
+vt 0.594610989 0.821466029
+vt 0.574919999 0.867148995
+vt 0.556937993 0.905752003
+vt 0.629933 0.736221015
+vt 0.641011 0.710622013
+vt 0.64913398 0.696314991
+vt 0.654869974 0.689441979
+vt 0.658001006 0.684463978
+vt 0.663524985 0.682938993
+vt 0.687031984 0.676032007
+vt 0.713662028 0.673331976
+vt 0.671541989 0.679463029
+vt 0.801841021 0.665902972
+vt 0.890007019 0.655586004
+vt 0.849048018 0.660344005
+vt 0.754463017 0.670495987
+vt 0.713811994 0.673753023
+vt 0.890009999 0.655591011
+vt 0.917280972 0.649855971
+vt 0.935481012 0.645368993
+vt 0.946923018 0.640246987
+vt 0.951806009 0.631985009
+vt 0.957489014 0.624243021
+vt 0.960030019 0.614740014
+vt 0.963500023 0.605526984
+vt 0.963890016 0.595713973
+vt 0.964349985 0.585905015
+vt 0.946236014 0.559129
+vt 0.927718997 0.536953986
+vt 0.95818001 0.574450016
+vt 0.826857984 0.439099014
+vt 0.796914995 0.410259992
+vt 0.794933975 0.41169399
+vt 0.862622023 0.472566009
+vt 0.898148 0.506591976
+vt 0.92771399 0.536956012
+vt 0.795313001 0.411412001
+vt 0.775175989 0.392719001
+vt 0.764496028 0.380335987
+vt 0.759909987 0.37254101
+vt 0.75582999 0.368111014
+vt 0.756470978 0.361952007
+vt 0.756883025 0.33644101
+vt 0.761945009 0.30903101
+vt 0.756367028 0.352775007
+vt 0.792746007 0.127538994
+vt 0.786994994 0.169859007
+vt 0.779222012 0.218723997
+vt 0.762381017 0.308993995
+vt 0.792365015 0.127642006
+vt 0.79381001 0.0988110006
+vt 0.793281972 0.0798090026
+vt 0.792367995 0.0665540025
+vt 0.786522985 0.0592360012
+vt 0.780737996 0.0517919995
+vt 0.774074972 0.0449680015
+vt 0.765793025 0.0408199988
+vt 0.757335007 0.0377979986
+vt 0.748960972 0.0346730016
+vt 0.721194029 0.0453279987
+vt 0.697143972 0.0569589995
+vt 0.737505972 0.0372780003
+vt 0.583579004 0.127684996
+vt 0.623277009 0.102719001
+vt 0.549664974 0.149660006
+vt 0.66296798 0.0781750008
+vt 0.6972 0.057399001
+vt 0.527153015 0.164045006
+vt 0.550143003 0.151421994
+vt 0.512933016 0.170606002
+vt 0.50463599 0.172615007
+vt 0.499424011 0.175252005
+vt 0.494206011 0.172616005
+vt 0.471819997 0.164113
+vt 0.449377 0.150275007
+vt 0.485944986 0.170620993
+vt 0.375638008 0.106637001
+vt 0.302697003 0.061751999
+vt 0.336344004 0.0826160014
+vt 0.414813995 0.131738007
+vt 0.448567003 0.153145
+vt 0.252406001 0.0396800004
+vt 0.263357997 0.0414390005
+vt 0.244257003 0.0417979993
+vt 0.279287994 0.0485280007
+vt 0.302695006 0.0617580004
+vt 0.221796006 0.0548090003
+vt 0.216519997 0.0622039996
+vt 0.236077994 0.044298999
+vt 0.211657003 0.0698160008
+vt 0.208252996 0.0938709974
+vt 0.210611001 0.112251997
+vt 0.209126994 0.0801889971
+vt 0.209018007 0.112072997
+vt 0.217356995 0.163633004
+vt 0.223240003 0.192034006
+vt 0.228888005 0.219145
+vt 0.228899002 0.219142005
+vt 0.236527994 0.241659001
+vt 0.242863998 0.261487991
+vt 0.251828015 0.277846009
+vt 0.262724996 0.291559011
+vt 0.272412986 0.306071997
+vt 0.339085013 0.352100015
+vt 0.309074998 0.334363997
+vt 0.287661999 0.319474995
+vt 0.379776001 0.37461701
+vt 0.339812011 0.351166993
+vt 0.469924986 0.421837002
+vt 0.425202012 0.39912799
+vt 0.507146001 0.440701991
+vt 0.531103015 0.452529997
+vt 0.50812 0.439576
+vt 0.543147027 0.460808009
+vt 0.548098028 0.46556899
+vt 0.550390005 0.469983995
+vt 0.55131501 0.477319002
+vt 0.549883008 0.476099998
+vt 0.549085975 0.482535988
+vt 0.546483994 0.487861991
+vt 0.539924026 0.488709986
+vt 0.540673018 0.49059701
+vt 0.533455014 0.491064996
+vt 0.518845975 0.488507003
+vt 0.492906988 0.485918999
+vt 0.451395988 0.476969987
+vt 0.401318014 0.469680995
+vt 0.349298 0.46033299
+vt 0.302067995 0.45489499
+vt 0.492814988 0.484367996
+vt 0.242056996 0.448626995
+vt 0.302044988 0.454207987
+vt 0.218144998 0.450958997
+vt 0.198326007 0.45511201
+vt 0.178911999 0.461971015
+vt 0.144312993 0.479191989
+vt 0.127735004 0.494038999
+vt 0.162459001 0.46924299
+vt 0.0996749997 0.515372992
+vt 0.127734005 0.494037002
+vt 0.0600269996 0.553673983
+vt 0.0399970002 0.586144984
+vt 0.0395420007 0.595408022
+vt 0.0437889993 0.576556027
+vt 0.0503440015 0.565993011
+vt 0.0604909994 0.554014027
+vt 0.0450589992 0.622704029
+vt 0.0512330011 0.629522979
+vt 0.0412589982 0.614085972
+vt 0.0394509993 0.604776978
+vt 0.0560530014 0.637313008
+vt 0.111523002 0.652507007
+vt 0.0840179995 0.647930026
+vt 0.0672060028 0.642028987
+vt 0.151851997 0.657626987
+vt 0.199276 0.66117698
+vt 0.245943993 0.666930974
+vt 0.286229998 0.670599997
+vt 0.111521997 0.652508974
+vt 0.337065011 0.679690003
+vt 0.342994004 0.681190014
+vt 0.328482002 0.676744998
+vt 0.312685013 0.673707008
+vt 0.286390007 0.670065999
+vt 0.346244007 0.686592996
+vt 0.359575987 0.709017992
+vt 0.372310996 0.733479023
+vt 0.351687014 0.694211006
+vt 0.42672199 0.864675999
+vt 0.406818986 0.819333017
+vt 0.444350004 0.903367996
+vt 0.38755101 0.773573995
+vt 0.370712996 0.734718978
+vt 0.475156993 0.95380801
+vt 0.483319014 0.956115007
+vt 0.467664003 0.944262981
+vt 0.457148999 0.929418981
+vt 0.444608986 0.903122008
+vt 0.491030991 0.960103989
+vt 0.508108974 0.960106015
+vt 0.516161978 0.957174003
+vt 0.499570996 0.961190999
+vt 0.523966014 0.95380801
+vt 0.554405987 0.903123021
+vt 0.541920006 0.929419994
+vt 0.53144002 0.944262028
+vt 0.592051029 0.819332004
+vt 0.627712011 0.734444022
+vt 0.610912979 0.773307025
+vt 0.572220027 0.864677012
+vt 0.554665029 0.903369009
+vt 0.652494013 0.686591983
+vt 0.656373978 0.682106018
+vt 0.647054017 0.69420898
+vt 0.639176011 0.709017992
+vt 0.627304018 0.734130025
+vt 0.661673009 0.679687977
+vt 0.712599993 0.670037985
+vt 0.686155975 0.673699975
+vt 0.670283973 0.676743984
+vt 0.800728977 0.662652016
+vt 0.888586998 0.652477026
+vt 0.847868025 0.657175004
+vt 0.753302991 0.666899025
+vt 0.712752998 0.670552015
+vt 0.944222987 0.637480021
+vt 0.949045002 0.629751027
+vt 0.933094978 0.642108977
+vt 0.916225016 0.647966027
+vt 0.888586998 0.652477026
+vt 0.955245018 0.622996986
+vt 0.960983992 0.605129004
+vt 0.961015999 0.595748007
+vt 0.960569978 0.586477995
+vt 0.924767017 0.538626015
+vt 0.944274008 0.560018003
+vt 0.954358995 0.575581014
+vt 0.823857009 0.441381991
+vt 0.792608976 0.413457006
+vt 0.859852016 0.47457999
+vt 0.895093977 0.50861299
+vt 0.924767017 0.538626015
+vt 0.756561995 0.374130994
+vt 0.752557993 0.369289994
+vt 0.761928022 0.381835014
+vt 0.773142993 0.394115001
+vt 0.792582989 0.413484007
+vt 0.752919972 0.362897009
+vt 0.753690004 0.353258014
+vt 0.751172006 0.353653997
+vt 0.754477978 0.336661994
+vt 0.758605003 0.309177995
+vt 0.783576012 0.170273006
+vt 0.775932014 0.218973994
+vt 0.789183021 0.12827
+vt 0.767036974 0.267592013
+vt 0.759127975 0.309168994
+vt 0.791857004 0.0993850008
+vt 0.790419996 0.0810900033
+vt 0.789206028 0.0685790032
+vt 0.784349024 0.0610649996
+vt 0.789197981 0.128267005
+vt 0.779076993 0.0537250005
+vt 0.764800012 0.0432550013
+vt 0.756624997 0.0407040007
+vt 0.772476017 0.0476000011
+vt 0.748462975 0.038635999
+vt 0.697825015 0.0608059987
+vt 0.721437991 0.0475360006
+vt 0.737457991 0.0418480001
+vt 0.584657013 0.131402001
+vt 0.62420702 0.106103003
+vt 0.550592005 0.152965993
+vt 0.663874984 0.0818860009
+vt 0.697822988 0.0607989989
+vt 0.527741015 0.166509002
+vt 0.551075995 0.154540002
+vt 0.504961014 0.176474005
+vt 0.499426007 0.178884998
+vt 0.513433993 0.173648998
+vt 0.493891001 0.176473007
+vt 0.448408008 0.153653994
+vt 0.471237004 0.166575
+vt 0.48545 0.173664004
+vt 0.374040008 0.111323997
+vt 0.301622987 0.0659969971
+vt 0.335083991 0.0866250023
+vt 0.413277 0.136207998
+vt 0.447243989 0.157319993
+vt 0.301622987 0.0659969971
+vt 0.263415009 0.0442700014
+vt 0.278551012 0.0530939996
+vt 0.263112992 0.0463789999
+vt 0.252756 0.0443190001
+vt 0.245040998 0.0454020016
+vt 0.237583995 0.0481280014
+vt 0.230639994 0.0523179993
+vt 0.219317004 0.0643889979
+vt 0.224463999 0.0577969998
+vt 0.212185994 0.0946730003
+vt 0.213088006 0.112392999
+vt 0.213036001 0.0815989971
+vt 0.215462998 0.0719159991
+vt 0.215957999 0.136041
+vt 0.220470995 0.163176998
+vt 0.226238996 0.191306993
+vt 0.232804 0.217886999
+vt 0.213088006 0.112392999
+vt 0.255306989 0.275646001
+vt 0.264773995 0.289977998
+vt 0.247040004 0.259342998
+vt 0.239642993 0.240330994
+vt 0.232804 0.217886999
+vt 0.275788009 0.303083986
+vt 0.311713994 0.331212997
+vt 0.34138599 0.349052995
+vt 0.290652007 0.31636101
+vt 0.382140994 0.371306002
+vt 0.34138599 0.349052995
+vt 0.427967012 0.395274013
+vt 0.509865999 0.437543988
+vt 0.472651005 0.418251008
+vt 0.533330977 0.450408995
+vt 0.509865999 0.437543988
+vt 0.546265006 0.458521992
+vt 0.553574026 0.467186004
+vt 0.551925004 0.463555008
+vt 0.554472983 0.471091986
+vt 0.554673016 0.475093991
+vt 0.554225981 0.479014993
+vt 0.553183019 0.482679993
+vt 0.551595986 0.485908985
+vt 0.54953599 0.488685012
+vt 0.547078013 0.490989
+vt 0.544295013 0.492803991
+vt 0.541260004 0.494109988
+vt 0.534215987 0.494275004
+vt 0.519402981 0.492660999
+vt 0.493065 0.488646001
+vt 0.451458007 0.481593013
+vt 0.401291013 0.473024011
+vt 0.349294007 0.464507014
+vt 0.302123994 0.457599014
+vt 0.493065 0.488646001
+vt 0.266283989 0.453821987
+vt 0.239014 0.45292601
+vt 0.302123994 0.457599014
+vt 0.217603996 0.454654008
+vt 0.199392006 0.458748996
+vt 0.181757003 0.464955986
+vt 0.164385006 0.473271996
+vt 0.146966994 0.483695
+vt 0.129205003 0.496221989
+vt 0.110812999 0.510851026
+vt 0.129205003 0.496221989
+vt 0.0929709971 0.526459992
+vt 0.0634849966 0.556140006
+vt 0.0768250003 0.54193002
+vt 0.0540250018 0.567974985
+vt 0.0634849966 0.556140006
+vt 0.0443979986 0.587049007
+vt 0.0431060009 0.595552981
+vt 0.0478530005 0.578067005
+vt 0.0434379987 0.604209006
+vt 0.0485870019 0.620679021
+vt 0.0532109998 0.627844989
+vt 0.0452970006 0.612693012
+vt 0.0590730011 0.633867025
+vt 0.0690490007 0.639078021
+vt 0.0860550031 0.643809021
+vt 0.113082998 0.648392022
+vt 0.153240994 0.653173983
+vt 0.200154006 0.657886982
+vt 0.247180998 0.662349999
+vt 0.287476987 0.666364014
+vt 0.113082998 0.648392022
+vt 0.314110994 0.669677019
+vt 0.287476987 0.666364014
+vt 0.339307994 0.67563802
+vt 0.344494998 0.678995013
+vt 0.33028999 0.672648013
+vt 0.349191993 0.683072984
+vt 0.362755001 0.706312001
+vt 0.374440014 0.731871009
+vt 0.354808986 0.691106021
+vt 0.410654008 0.816474974
+vt 0.447456986 0.900487006
+vt 0.430189013 0.861872017
+vt 0.391252011 0.770874023
+vt 0.374440014 0.731871009
+vt 0.447456986 0.900487006
+vt 0.460137993 0.926016986
+vt 0.469617009 0.941461027
+vt 0.477203012 0.949719012
+vt 0.484158009 0.95362097
+vt 0.491714001 0.955959976
+vt 0.499568999 0.956739008
+vt 0.514972985 0.95362097
+vt 0.507422984 0.955959976
+vt 0.521917999 0.949720025
+vt 0.529484987 0.94146198
+vt 0.538929999 0.926016986
+vt 0.551558018 0.900487006
+vt 0.588217974 0.816474974
+vt 0.624334991 0.731871009
+vt 0.607562006 0.770874023
+vt 0.568754017 0.861872971
+vt 0.551558018 0.900487006
+vt 0.635999024 0.706312001
+vt 0.624334991 0.731871009
+vt 0.643935978 0.691106021
+vt 0.654245973 0.678995013
+vt 0.649549007 0.683072984
+vt 0.684733987 0.669669986
+vt 0.711519003 0.66634798
+vt 0.668478012 0.672646999
+vt 0.659434021 0.67563802
+vt 0.799412012 0.657850027
+vt 0.887039006 0.648357987
+vt 0.846632004 0.653123021
+vt 0.752071977 0.662317991
+vt 0.711519003 0.66634798
+vt 0.887039006 0.648357987
+vt 0.914195001 0.643821001
+vt 0.931245029 0.639154971
+vt 0.941220999 0.634015024
+vt 0.947076023 0.628059983
+vt 0.951729 0.620944977
+vt 0.955071986 0.612991989
+vt 0.957399011 0.595866024
+vt 0.956997991 0.60452503
+vt 0.956170976 0.587339997
+vt 0.951188982 0.576789021
+vt 0.940276027 0.562050998
+vt 0.921162009 0.540961981
+vt 0.856050014 0.477661014
+vt 0.789627016 0.415821999
+vt 0.820263982 0.444348007
+vt 0.891439021 0.511348009
+vt 0.921162009 0.540961981
+vt 0.769720018 0.396524996
+vt 0.789627016 0.415821999
+vt 0.752466023 0.376065999
+vt 0.750108004 0.370155007
+vt 0.758161008 0.384066999
+vt 0.748547971 0.363968998
+vt 0.748431027 0.35404399
+vt 0.750376999 0.336930007
+vt 0.754933 0.309208989
+vt 0.771207988 0.218977004
+vt 0.785089016 0.128737003
+vt 0.779220998 0.170457006
+vt 0.762512982 0.267544001
+vt 0.754933 0.309208989
+vt 0.785089016 0.128737003
+vt 0.787657022 0.100341998
+vt 0.787593007 0.0820349976
+vt 0.785417974 0.0706909969
+vt 0.781561017 0.0632570013
+vt 0.770237982 0.0512689985
+vt 0.755833983 0.0443589985
+vt 0.763293028 0.0470860004
+vt 0.776413023 0.0567209981
+vt 0.74811101 0.0432740003
+vt 0.737713993 0.0453479998
+vt 0.722175002 0.0521089993
+vt 0.698909998 0.065105997
+vt 0.62580502 0.110789999
+vt 0.55191803 0.157150999
+vt 0.586194992 0.135873005
+vt 0.665135026 0.0858950019
+vt 0.698909998 0.065105997
+vt 0.528814018 0.170662001
+vt 0.55191803 0.157150999
+vt 0.505391002 0.181149006
+vt 0.499426007 0.181586996
+vt 0.51423502 0.178088993
+vt 0.493461996 0.181149006
+vt 0.470162988 0.170729995
+vt 0.447243989 0.157319993
+vt 0.484649003 0.178105995
+vt 0.51423502 0.178088993
+vt 0.512215018 0.196281001
+vt 0.528814971 0.170671999
+vt 0.505391002 0.181149006
+vt 0.499426007 0.181586996
+vt 0.493461996 0.181149006
+vt 0.470162988 0.170733005
+vt 0.664422989 0.0867450014
+vt 0.678156972 0.0835179985
+vt 0.698909998 0.0651070029
+vt 0.638921022 0.106106997
+vt 0.625813007 0.110811003
+vt 0.635628998 0.112905003
+vt 0.611401975 0.123885997
+vt 0.601633012 0.133496001
+vt 0.585916996 0.136207998
+vt 0.587728977 0.148478001
+vt 0.55191803 0.157150999
+vt 0.74811101 0.0432740003
+vt 0.737713993 0.0453479998
+vt 0.770237982 0.0512680002
+vt 0.763293028 0.0470860004
+vt 0.776413023 0.0567209981
+vt 0.755833983 0.0443589985
+vt 0.787593007 0.0820349976
+vt 0.785417974 0.0706909969
+vt 0.781561017 0.0632570013
+vt 0.787657022 0.100341998
+vt 0.776048005 0.121028997
+vt 0.785077989 0.128757
+vt 0.763689995 0.246141002
+vt 0.755757987 0.264483005
+vt 0.760962009 0.270985007
+vt 0.771341026 0.218937993
+vt 0.76453203 0.225420997
+vt 0.773890018 0.192879006
+vt 0.779202998 0.169502005
+vt 0.750374973 0.336930007
+vt 0.754933 0.309208989
+vt 0.748431027 0.35404399
+vt 0.748547971 0.363968998
+vt 0.750108004 0.370155007
+vt 0.752466023 0.376065999
+vt 0.758161008 0.384066999
+vt 0.82030201 0.444940001
+vt 0.789627016 0.415821999
+vt 0.890568018 0.510944009
+vt 0.896681011 0.53153199
+vt 0.921162009 0.540961981
+vt 0.856338978 0.496320009
+vt 0.874729991 0.513513982
+vt 0.854894996 0.477679998
+vt 0.778617024 0.417064995
+vt 0.769716978 0.396526992
+vt 0.951188982 0.576789021
+vt 0.956170976 0.587339997
+vt 0.917369008 0.555458009
+vt 0.940276027 0.562050998
+vt 0.951729 0.620944977
+vt 0.934809029 0.613436997
+vt 0.941220999 0.634015024
+vt 0.947076023 0.628059983
+vt 0.955071986 0.612991989
+vt 0.956997991 0.60452503
+vt 0.957399011 0.595866024
+vt 0.914196014 0.643817008
+vt 0.931245029 0.639154971
+vt 0.893512011 0.630665004
+vt 0.887035012 0.648352027
+vt 0.752288997 0.66228801
+vt 0.779098988 0.656534016
+vt 0.799408972 0.657840014
+vt 0.794636011 0.656619012
+vt 0.803601027 0.647900999
+vt 0.828271985 0.651785016
+vt 0.847434998 0.652329981
+vt 0.874476016 0.627543986
+vt 0.668478012 0.672646999
+vt 0.659434021 0.67563802
+vt 0.641160011 0.669624984
+vt 0.649549007 0.683072984
+vt 0.654245973 0.678995013
+vt 0.643935978 0.691106021
+vt 0.635996997 0.706309021
+vt 0.624337971 0.731871009
+vt 0.567314982 0.863358021
+vt 0.582660019 0.823024988
+vt 0.562223971 0.864539027
+vt 0.588207006 0.816466987
+vt 0.595503986 0.791896999
+vt 0.597819984 0.778495014
+vt 0.606769025 0.748088002
+vt 0.607572973 0.77088201
+vt 0.596639991 0.761439979
+vt 0.548802972 0.894338012
+vt 0.551558018 0.900487006
+vt 0.529483974 0.941460013
+vt 0.514972985 0.95362097
+vt 0.521917999 0.949720025
+vt 0.531826019 0.909309983
+vt 0.538929999 0.926016986
+vt 0.499568999 0.956739008
+vt 0.507422984 0.955959976
+vt 0.484158009 0.95362097
+vt 0.477203012 0.949719012
+vt 0.491714001 0.955959976
+vt 0.460447013 0.912220001
+vt 0.447456986 0.900487006
+vt 0.469617009 0.941461027
+vt 0.410665005 0.816466987
+vt 0.415609002 0.822986007
+vt 0.403766006 0.791814029
+vt 0.391250998 0.770816982
+vt 0.422416002 0.830102026
+vt 0.428128004 0.849151015
+vt 0.44126299 0.873185992
+vt 0.430227011 0.862088978
+vt 0.454531014 0.887139022
+vt 0.378493011 0.710196018
+vt 0.362760007 0.706300974
+vt 0.374440014 0.731871009
+vt 0.354811996 0.691094995
+vt 0.417786002 0.803228974
+vt 0.349191993 0.683072984
+vt 0.344494998 0.678995013
+vt 0.339307994 0.67563802
+vt 0.33028999 0.672648013
+vt 0.314112008 0.669674993
+vt 0.287476987 0.666364014
+vt 0.172805995 0.653823018
+vt 0.207475007 0.657051027
+vt 0.171483994 0.648311973
+vt 0.153017998 0.65300101
+vt 0.200154006 0.657886982
+vt 0.224950001 0.657131016
+vt 0.247118995 0.662347019
+vt 0.0993760005 0.632516026
+vt 0.0860550031 0.643809021
+vt 0.113084003 0.648388028
+vt 0.136282995 0.641269028
+vt 0.0532109998 0.627844989
+vt 0.0590730011 0.633867025
+vt 0.0690490007 0.639078021
+vt 0.0485859998 0.620679021
+vt 0.0452970006 0.612693012
+vt 0.0431069992 0.595552981
+vt 0.0434379987 0.604209006
+vt 0.0443979986 0.587049007
+vt 0.0810210034 0.551898003
+vt 0.0768380016 0.541922987
+vt 0.0634939969 0.556137979
+vt 0.129226997 0.496253997
+vt 0.110813998 0.510852993
+vt 0.0540260002 0.567974985
+vt 0.164385006 0.473271996
+vt 0.146969005 0.483696014
+vt 0.181758001 0.464956999
+vt 0.199392006 0.458748996
+vt 0.266283989 0.453821987
+vt 0.261067986 0.455529988
+vt 0.302123994 0.457599014
+vt 0.451458007 0.481582999
+vt 0.404439002 0.473688006
+vt 0.454587996 0.486357003
+vt 0.493065 0.488646001
+vt 0.381532997 0.470302999
+vt 0.410250992 0.478074998
+vt 0.360612005 0.469170004
+vt 0.349040002 0.464504987
+vt 0.311809003 0.458707988
+vt 0.346143991 0.46401
+vt 0.302123994 0.457599014
+vt 0.29290399 0.456467003
+vt 0.283946007 0.455881
+vt 0.292899996 0.456465006
+vt 0.271212012 0.455689013
+vt 0.283946007 0.455881
+vt 0.522264004 0.506510019
+vt 0.421483994 0.484506994
+vt 0.533330977 0.450408995
+vt 0.546265006 0.458521992
+vt 0.509865999 0.437543988
+vt 0.565136015 0.438156992
+vt 0.551925004 0.463555008
+vt 0.528154016 0.432285994
+vt 0.382144988 0.371300995
+vt 0.408445001 0.37886101
+vt 0.363501012 0.354993999
+vt 0.34138599 0.349052995
+vt 0.429859996 0.395429999
+vt 0.472748011 0.41810599
+vt 0.323540002 0.314713001
+vt 0.336737007 0.335922986
+vt 0.275788009 0.303083986
+vt 0.290661007 0.316365004
+vt 0.311711997 0.331200987
+vt 0.255308002 0.275646001
+vt 0.239642993 0.240330994
+vt 0.232804 0.217886999
+vt 0.247040004 0.259342998
+vt 0.226244003 0.191300005
+vt 0.220471993 0.163176998
+vt 0.215958998 0.136041
+vt 0.213088006 0.112392999
+vt 0.213036001 0.0815989971
+vt 0.225716993 0.0942739993
+vt 0.219317004 0.0643889979
+vt 0.215462998 0.0719159991
+vt 0.212185994 0.0946730003
+vt 0.230639994 0.0523179993
+vt 0.245040998 0.0454020016
+vt 0.237583995 0.0481280014
+vt 0.224463999 0.0577969998
+vt 0.263112992 0.0463789999
+vt 0.252756 0.0443190001
+vt 0.278551012 0.0530939996
+vt 0.41328001 0.136200994
+vt 0.374031991 0.111345001
+vn 0.0399999991 -0.0227000006 0.998899996
+vn 0.0410999991 -0.0210999995 0.998899996
+vn 0.0441000015 -0.0196000002 0.99879998
+vn 0.0403999984 -0.0127999997 0.999100029
+vn 0.0401000008 -0.0162000004 0.999100029
+vn 0.0337000005 -0.00079999998 0.99940002
+vn 0.0350000001 -9.99999975e-05 0.99940002
+vn 0.0416000001 -0.00889999978 0.999100029
+vn 0.0419000015 -0.0083999997 0.999100029
+vn 0.0320000015 -0.0013 0.999499977
+vn -0.159400001 -0.109499998 -0.981100023
+vn -0.0320000015 0.00139999995 -0.999499977
+vn -0.0339000002 0.000699999975 -0.99940002
+vn -0.0348999985 0.000199999995 -0.99940002
+vn -0.0399000011 0.0102000004 -0.999199986
+vn -0.0397999994 0.00949999969 -0.999199986
+vn -0.0401000008 0.0227000006 -0.998899996
+vn -0.0461999997 0.0186000001 -0.99879998
+vn -0.0441999994 0.0196000002 -0.99879998
+vn -0.0410000011 0.0126 -0.999100029
+vn -0.0432999991 0.0157999992 -0.998899996
+vn 0.00439999998 -0.315100014 -0.949100018
+vn 0.0137999998 -0.304699987 -0.952400029
+vn 0.0249000005 -0.307900012 -0.951099992
+vn -0.00219999999 0.00380000006 -1
+vn -0.0208999999 0 -0.999800026
+vn -0.0113000004 -0.0119000003 -0.999899983
+vn -0.00700000022 -0.299400002 -0.954100013
+vn 0.0161000006 -0.291000009 -0.95660001
+vn 0.00270000007 -0.278600007 -0.960399985
+vn -0.0132999998 -0.275700003 -0.961099982
+vn -0.00150000001 -0.254099995 -0.967199981
+vn -0.0184000004 -0.253300011 -0.967199981
+vn -0.0311999992 -0.268900007 -0.962700009
+vn -0.0331999995 -0.280200005 -0.959399998
+vn 0.0304000005 -0.259499997 -0.965300024
+vn 0.0190999992 -0.273299992 -0.961700022
+vn 0.0157999992 -0.252700001 -0.967400014
+vn -0.0355999991 -0.242799997 -0.969399989
+vn -0.0370000005 -0.257800013 -0.965499997
+vn -0.127299994 -0.275900006 -0.952700019
+vn -0.0533999987 -0.237200007 -0.970000029
+vn -0.0217000004 -0.234899998 -0.971800029
+vn -0.0397999994 -0.222599998 -0.974099994
+vn -0.00410000002 -0.225700006 -0.97420001
+vn 0.00779999979 -0.235699996 -0.971800029
+vn 0.0296 -0.238700002 -0.970600009
+vn 0.0260000005 -0.223199993 -0.974399984
+vn 0.0612000003 -0.234999999 -0.970099986
+vn 0.0443000011 -0.243699998 -0.968800008
+vn 0.0505999997 -0.223000005 -0.973500013
+vn 0.069600001 -0.264299989 -0.961899996
+vn -0.0557000004 -0.206 -0.976999998
+vn -0.0691 -0.227599993 -0.971300006
+vn -0.0388000011 -0.204600006 -0.978100002
+vn -0.0184000004 -0.212799996 -0.976899981
+vn -0.00490000006 -0.200399995 -0.979700029
+vn -0.0252 -0.193700001 -0.980700016
+vn 0.0102000004 -0.211500004 -0.977299988
+vn 0.0241 -0.200599998 -0.979399979
+vn 0.0557000004 -0.203400001 -0.977500021
+vn 0.0395000018 -0.208700001 -0.977199972
+vn -0.0436000004 -0.187000006 -0.981400013
+vn -0.0300999992 -0.173299998 -0.984399974
+vn -0.0577000007 -0.169200003 -0.983900011
+vn -0.0577999987 -0.185499996 -0.98089999
+vn -0.0115 -0.176300004 -0.984300017
+vn 0.00749999983 -0.185000002 -0.98269999
+vn 0.0370000005 -0.187700003 -0.98150003
+vn 0.0256999992 -0.172700003 -0.984600008
+vn 0.064000003 -0.179399997 -0.981700003
+vn 0.0467000008 -0.176899999 -0.983099997
+vn 0.0821999982 -0.203899994 -0.975499988
+vn 0.065700002 -0.194800004 -0.978600025
+vn 0.0922999978 -0.186399996 -0.978100002
+vn 0.0894000009 -0.171200007 -0.98119998
+vn -0.0733999982 -0.153899997 -0.985400021
+vn -0.0549999997 -0.146699995 -0.987699986
+vn -0.0390999988 -0.158999994 -0.986500025
+vn -0.0324999988 -0.139899999 -0.989600003
+vn 0.0074 -0.162 -0.986800015
+vn -0.0157999992 -0.1558 -0.987699986
+vn 0.00159999996 -0.1435 -0.989700019
+vn -0.0182000007 -0.136800006 -0.990400016
+vn 0.0269000009 -0.151600003 -0.988099992
+vn 0.052099999 -0.162 -0.985400021
+vn 0.0441999994 -0.148200005 -0.987999976
+vn 0.0666000023 -0.144600004 -0.987200022
+vn 0.0759999976 -0.157900006 -0.984499991
+vn 0.0898000002 -0.133000001 -0.986999989
+vn -0.0623999983 -0.127900004 -0.989799976
+vn -0.0776999965 -0.129899994 -0.988499999
+vn -0.0678000003 -0.104199998 -0.992200017
+vn -0.0502999984 -0.108099997 -0.992900014
+vn -0.0886999965 -0.150900006 -0.984600008
+vn -0.0917999968 -0.111199997 -0.989600003
+vn -0.0916000009 -0.132599995 -0.986899972
+vn -0.0456000008 -0.131500006 -0.9903
+vn -0.0342999995 -0.119199999 -0.992299974
+vn -0.00650000013 -0.1193 -0.992799997
+vn 0.0313999988 -0.127100006 -0.991400003
+vn 0.0141000003 -0.131300002 -0.99119997
+vn 0.0132999998 -0.111500002 -0.993700027
+vn 0.0505000018 -0.130899996 -0.990100026
+vn 0.0542000011 -0.114200003 -0.991999984
+vn 0.074500002 -0.125300005 -0.989300013
+vn 0.074000001 -0.1083 -0.991400003
+vn 0.0908999965 -0.1074 -0.990100026
+vn -0.195999995 -0.103600003 -0.975099981
+vn -0.216999993 -0.0952999964 -0.971499979
+vn -0.203700006 -0.0825000033 -0.975600004
+vn -0.199699998 -0.1329 -0.970799983
+vn -0.170100003 -0.102600001 -0.980099976
+vn -0.188600004 -0.0914999992 -0.977800012
+vn -0.169100001 -0.0864000022 -0.98180002
+vn -0.179800004 -0.133200005 -0.974600017
+vn -0.167999998 -0.113300003 -0.979300022
+vn -0.151099995 -0.0916000009 -0.984300017
+vn -0.148599997 -0.107199997 -0.983099997
+vn -0.119400002 -0.109499998 -0.986800015
+vn -0.133399993 -0.0966000035 -0.986299992
+vn -0.117899999 -0.0834000036 -0.989499986
+vn -0.136000007 -0.113899998 -0.984099984
+vn -0.101800002 -0.0931999981 -0.990400016
+vn -0.0842000023 -0.0923999995 -0.992200017
+vn -0.0670000017 -0.0797000006 -0.994599998
+vn -0.0487999991 -0.0841000006 -0.995299995
+vn -0.0275999997 -0.104500003 -0.994099975
+vn -0.0313999988 -0.0860000029 -0.995800018
+vn -0.00949999969 -0.0949999988 -0.995400012
+vn 0.0364999995 -0.105099998 -0.993799984
+vn 0.0131000001 -0.0978000015 -0.995100021
+vn 0.0263 -0.0819000006 -0.996299982
+vn 0.00939999986 -0.0790999979 -0.996800005
+vn 0.0390999988 -0.0898000002 -0.995199978
+vn 0.0568999983 -0.0935000032 -0.994000018
+vn 0.0715999976 -0.0896999985 -0.993399978
+vn 0.0905999988 -0.0899000019 -0.99180001
+vn 0.107600003 -0.112099998 -0.987900019
+vn 0.108800001 -0.0895999968 -0.99000001
+vn 0.150199994 -0.0900999978 -0.984499991
+vn 0.131600007 -0.101199999 -0.986100018
+vn 0.127299994 -0.0811000019 -0.988499999
+vn 0.136199996 -0.1149 -0.984000027
+vn 0.118900001 -0.1197 -0.985700011
+vn 0.166899994 -0.107199997 -0.980099976
+vn 0.167300001 -0.0935000032 -0.98150003
+vn 0.1523 -0.1162 -0.98150003
+vn 0.163200006 -0.121600002 -0.979099989
+vn 0.208000004 -0.114200003 -0.971400023
+vn 0.186299995 -0.102899998 -0.977100015
+vn 0.184599996 -0.0876000002 -0.978900015
+vn 0.201100007 -0.0863000005 -0.975799978
+vn 0.182899997 -0.160699993 -0.969900012
+vn 0.198500007 -0.141900003 -0.969799995
+vn 0.218199998 -0.0949999988 -0.971300006
+vn 0.2368 -0.0986000001 -0.966499984
+vn 0.233500004 -0.0807999969 -0.968999982
+vn 0.252499998 -0.0926000029 -0.963100016
+vn 0.2333 -0.148900002 -0.960900009
+vn 0.219799995 -0.0754000023 -0.972599983
+vn -0.289400011 -0.0604999997 -0.955299973
+vn -0.299600005 -0.0816999972 -0.950600028
+vn -0.306199998 -0.0593999997 -0.950100005
+vn -0.280299991 -0.0782999992 -0.956700027
+vn -0.315600008 -0.0781000033 -0.94569999
+vn -0.324400008 -0.0582000017 -0.944100022
+vn -0.248400003 -0.0662999973 -0.966400027
+vn -0.266099989 -0.070100002 -0.961399972
+vn -0.270399988 -0.0513000004 -0.961399972
+vn -0.263900012 -0.0921000019 -0.960099995
+vn -0.224099994 -0.0714000016 -0.972000003
+vn -0.2315 -0.0535999984 -0.971400023
+vn -0.251300007 -0.0883999988 -0.96390003
+vn -0.236000001 -0.0878000036 -0.967800021
+vn -0.209000006 -0.0595999993 -0.976100028
+vn -0.187600002 -0.0709000006 -0.979700029
+vn -0.193000004 -0.0502000004 -0.979900002
+vn -0.174999997 -0.0494000018 -0.983299971
+vn -0.168699995 -0.0678000003 -0.983299971
+vn -0.152099997 -0.0719000027 -0.985700011
+vn -0.150299996 -0.0544000007 -0.987100005
+vn -0.138300002 -0.0777999982 -0.987299979
+vn -0.130600005 -0.064199999 -0.989400029
+vn -0.111900002 -0.059799999 -0.991900027
+vn -0.0812000036 -0.0691 -0.994300008
+vn -0.0996000022 -0.072800003 -0.992399991
+vn -0.0881000012 -0.0520000011 -0.994700015
+vn -0.0590999983 -0.060899999 -0.996399999
+vn -0.0306000002 -0.0649999976 -0.997399986
+vn -0.0439999998 -0.0562000014 -0.997500002
+vn -0.0114000002 -0.0729999989 -0.997300029
+vn -0.00820000004 -0.0555000007 -0.998399973
+vn 0.00989999995 -0.0617000014 -0.998000026
+vn 0.0283000004 -0.0577999987 -0.997900009
+vn 0.0423999988 -0.069600001 -0.996699989
+vn 0.0581 -0.0680999979 -0.995999992
+vn 0.0816999972 -0.076700002 -0.993700027
+vn 0.0754000023 -0.0606000014 -0.995299995
+vn 0.0961999968 -0.0606000014 -0.993499994
+vn 0.115800001 -0.0653000027 -0.991100013
+vn 0.100199997 -0.0781999975 -0.991900027
+vn 0.136299998 -0.0647 -0.988600016
+vn 0.1734 -0.0728999972 -0.982200027
+vn 0.155699998 -0.0715999976 -0.985199988
+vn 0.171800002 -0.0559 -0.983500004
+vn 0.147100002 -0.0505999997 -0.987800002
+vn 0.1963 -0.0691 -0.978100002
+vn 0.1928 -0.0509000011 -0.979900002
+vn 0.209600002 -0.0577999987 -0.976100028
+vn 0.236499995 -0.0606999993 -0.969699979
+vn 0.221799999 -0.0527999997 -0.973699987
+vn 0.248799995 -0.0741999969 -0.965699971
+vn 0.2579 -0.0584999993 -0.964399993
+vn 0.283699989 -0.0825999975 -0.95539999
+vn 0.267199993 -0.0857999995 -0.959800005
+vn 0.279300004 -0.0617000014 -0.958199978
+vn 0.324099988 -0.0714000016 -0.943300009
+vn 0.30309999 -0.0820000023 -0.949400008
+vn 0.301099986 -0.0669 -0.951300025
+vn 0.32249999 -0.0581 -0.944800019
+vn 0.335099995 -0.0766000003 -0.939100027
+vn 0.335200012 -0.0617999993 -0.940100014
+vn 0.320800006 -0.0872000009 -0.943099976
+vn 0.302599996 -0.0463999994 -0.952000022
+vn -0.293099999 -0.0373999998 -0.955299973
+vn -0.269600004 -0.0362999998 -0.962300003
+vn -0.27790001 -0.0229000002 -0.960300028
+vn -0.264200002 -0.00960000046 -0.964399993
+vn -0.253199995 -0.0275999997 -0.967000008
+vn -0.245800003 -0.0430000015 -0.968400002
+vn -0.241999999 -0.0179999992 -0.970099986
+vn -0.222200006 -0.0370000005 -0.974300027
+vn -0.204600006 -0.0315999985 -0.978299975
+vn -0.185100004 -0.0296999998 -0.982299984
+vn -0.158000007 -0.0397999994 -0.986599982
+vn -0.149399996 -0.0253999997 -0.988399982
+vn -0.172600001 -0.0199999996 -0.984799981
+vn -0.129899994 -0.0379000008 -0.990800023
+vn -0.1184 -0.0461999997 -0.991900027
+vn -0.101599999 -0.0412000008 -0.994000018
+vn -0.0829999968 -0.0286999997 -0.996100008
+vn -0.1074 -0.0238000005 -0.993900001
+vn -0.0680000037 -0.0441000015 -0.996699989
+vn -0.0625 -0.0198999997 -0.997799993
+vn -0.0482000001 -0.0329999998 -0.998300016
+vn -0.0274 -0.0395999998 -0.99879998
+vn -0.0315000005 -0.0192000009 -0.999300003
+vn -0.00860000029 -0.0392999984 -0.999199986
+vn -0.0110999998 -0.0227000006 -0.99970001
+vn 0.0260000005 -0.0306000002 -0.999199986
+vn 0.0149999997 -0.0430999994 -0.999000013
+vn 0.00630000001 -0.0220999997 -0.99970001
+vn 0.0243999995 -0.0113000004 -0.999599993
+vn 0.0057000001 -0.000600000028 -1
+vn 0.0430000015 -0.0428999998 -0.998199999
+vn 0.0438000001 -0.0184000004 -0.998899996
+vn 0.0573999994 -0.0207000002 -0.998099983
+vn 0.0601000004 -0.0436000004 -0.997200012
+vn 0.0643000007 0.0013 -0.997900009
+vn 0.0417999998 0.00340000005 -0.999100029
+vn 0.0197000001 0.0216000006 -0.999599993
+vn 0.0908999965 -0.0408000015 -0.995000005
+vn 0.0759999976 -0.0428000018 -0.996200025
+vn 0.072800003 -0.0189999994 -0.997200012
+vn 0.0952000022 -0.0189999994 -0.995299995
+vn 0.0820999965 -0.000199999995 -0.996599972
+vn 0.111000001 -0.0480999984 -0.992699981
+vn 0.108999997 -0.0285999998 -0.993600011
+vn 0.124499999 -0.0412000008 -0.991400003
+vn 0.0983999968 -0.00439999998 -0.995100021
+vn 0.118000001 -0.00719999988 -0.992999971
+vn 0.113399997 0.00449999981 -0.993499994
+vn 0.141000003 -0.0306000002 -0.989499986
+vn 0.129099995 -0.0186999999 -0.99150002
+vn 0.183500007 -0.0359000005 -0.9824
+vn 0.158800006 -0.0357999988 -0.986699998
+vn 0.172099993 -0.0243999995 -0.984799981
+vn 0.207300007 -0.0328000002 -0.977699995
+vn 0.224900007 -0.0353999995 -0.973699987
+vn 0.257999986 -0.0329000019 -0.965600014
+vn 0.239899993 -0.0416000001 -0.969900012
+vn 0.239299998 -0.0197999999 -0.970700026
+vn 0.288199991 -0.0307999998 -0.957099974
+vn 0.304699987 -0.0278999992 -0.952099979
+vn 0.283699989 -0.0460000001 -0.957799971
+vn 0.270000011 -0.0405000001 -0.962000012
+vn 0.292899996 -0.0157999992 -0.95599997
+vn 0.274500012 -0.0146000003 -0.961499989
+vn 0.261200011 -0.00639999984 -0.965300024
+vn -0.230499998 -0.00319999992 -0.973100007
+vn -0.241099998 0.00510000018 -0.970499992
+vn -0.252700001 0.0109000001 -0.967499971
+vn -0.234899998 0.0228000004 -0.971800029
+vn -0.194299996 -0.0107000005 -0.98089999
+vn -0.218400002 -0.0165999997 -0.975700021
+vn -0.206799999 0.00039999999 -0.978399992
+vn -0.182099998 0.00230000005 -0.983299971
+vn -0.1426 -0.0105999997 -0.989700019
+vn -0.160799995 -0.00630000001 -0.986999989
+vn -0.142800003 0.00769999996 -0.989700019
+vn -0.127399996 -0.00989999995 -0.99180001
+vn -0.112000003 -0.00689999992 -0.993700027
+vn -0.0841000006 -0.0121999998 -0.996399999
+vn -0.0957999974 -0.00359999994 -0.995400012
+vn -0.0447999984 -0.00810000021 -0.999000013
+vn -0.0653999969 0.000600000028 -0.997900009
+vn -0.0482000001 0.00769999996 -0.99879998
+vn -0.0795999989 0.0126999998 -0.996699989
+vn 0.151199996 -0.0137999998 -0.988399982
+vn 0.140100002 0.00120000006 -0.990100026
+vn 0.143099993 0.0141000003 -0.989600003
+vn 0.119800001 0.0241 -0.992500007
+vn 0.119099997 0.0762000009 -0.989899993
+vn 0.106899999 0.0172000006 -0.994099975
+vn 0.0964000002 0.0105999997 -0.995299995
+vn 0.0847000033 0.0287999995 -0.995999992
+vn 0.167199999 -0.00609999988 -0.985899985
+vn 0.176599994 0.0100999996 -0.984200001
+vn 0.161200002 0.0154999997 -0.986800015
+vn 0.167799994 0.0238000005 -0.985499978
+vn 0.146300003 0.0255999994 -0.988900006
+vn 0.191400006 -0.0103000002 -0.98150003
+vn 0.212699994 -0.0148999998 -0.976999998
+vn 0.242400005 -0.00540000014 -0.970200002
+vn 0.222499996 -0.000500000024 -0.974900007
+vn 0.204899997 0.0115999999 -0.978699982
+vn 0.189799994 0.0157999992 -0.981700003
+vn 0.200499997 0.0267999992 -0.979300022
+vn 0.175400004 0.0219999999 -0.984300017
+vn 0.2456 0.00939999986 -0.969299972
+vn 0.225799993 0.0164999999 -0.973999977
+vn 0.214499995 0.0245999992 -0.976400018
+vn -0.219099998 0.0126999998 -0.975600004
+vn -0.205899999 0.0223999992 -0.978299975
+vn -0.214499995 0.0335999988 -0.976199985
+vn -0.230700001 0.0505000018 -0.971700013
+vn -0.191599995 0.0392999984 -0.980700016
+vn -0.199900001 0.0555999987 -0.978200018
+vn -0.217299998 0.0540999994 -0.974600017
+vn -0.164299995 0.0120999999 -0.986299992
+vn -0.187800005 0.0182000007 -0.981999993
+vn -0.169400007 0.0299999993 -0.985099971
+vn -0.147400007 0.0269000009 -0.988699973
+vn -0.106899999 0.0127999997 -0.994199991
+vn -0.128000006 0.0174000002 -0.991599977
+vn -0.115000002 0.0348999985 -0.992799997
+vn -0.0834999979 0.0297999997 -0.996100008
+vn -0.101300001 0.0370999984 -0.994199991
+vn -0.0577999987 0.0203000009 -0.998099983
+vn -0.0612000003 0.0379999988 -0.997399986
+vn -0.178000003 0.0553000011 -0.982500017
+vn -0.156499997 0.0480000004 -0.986500025
+vn -0.133499995 0.0399999991 -0.990199983
+vn -0.137500003 0.0562999994 -0.988900006
+vn -0.117799997 0.0612999983 -0.991100013
+vn -0.0808999985 0.0498999991 -0.995500028
+vn -0.0979999974 0.0571000017 -0.993600011
+vn -0.068599999 0.0617000014 -0.995700002
+vn -0.155499995 0.0714000016 -0.985300004
+vn -0.171700001 0.0874999985 -0.981299996
+vn -0.146200001 0.0886999965 -0.985300004
+vn -0.179499999 0.0688999966 -0.981299996
+vn -0.129600003 0.0768000036 -0.988600016
+vn -0.107100002 0.0874999985 -0.990400016
+vn -0.0952999964 0.0744000003 -0.992699981
+vn -0.0887999982 0.0984999985 -0.99119997
+vn -0.075000003 0.0812999979 -0.993900001
+vn -0.056400001 0.0784000009 -0.995299995
+vn -0.0566999987 0.0952000022 -0.993799984
+vn -0.0236000009 0.070100002 -0.997300029
+vn -0.0449000001 0.0653999969 -0.996800005
+vn -0.0346999988 0.0850000009 -0.995800018
+vn -0.0311999992 0.0489000008 -0.998300016
+vn 0.00820000004 0.0763999969 -0.996999979
+vn -0.0092000002 0.066200003 -0.997799993
+vn -0.00800000038 0.0876000002 -0.996100008
+vn 0.00499999989 0.0516000018 -0.998700023
+vn 0.0322000012 0.0838000029 -0.995999992
+vn 0.0152000003 0.0926000029 -0.995599985
+vn 0.0403999984 0.0625 -0.997200012
+vn 0.060899999 0.0579000004 -0.996500015
+vn 0.0221999995 0.0647 -0.997699976
+vn -0.165700004 0.0996999964 -0.981100023
+vn -0.147300005 0.108800001 -0.983099997
+vn -0.163900003 0.112800002 -0.980000019
+vn -0.126800001 0.0988999978 -0.986999989
+vn -0.123199999 0.120399997 -0.985099971
+vn -0.108400002 0.109200001 -0.988099992
+vn -0.139300004 0.126399994 -0.982200027
+vn -0.0907000005 0.118799999 -0.988799989
+vn -0.0741000026 0.103299998 -0.991900027
+vn -0.057599999 0.113300003 -0.991900027
+vn -0.0681999996 0.125300005 -0.989799976
+vn -0.0241 0.104900002 -0.994199991
+vn -0.0412000008 0.103399999 -0.993799984
+vn -0.0397000015 0.127000004 -0.991100013
+vn 0.0109999999 0.109300002 -0.993900001
+vn -0.0108000003 0.109999999 -0.993900001
+vn 0.00209999993 0.125400007 -0.9921
+vn 0.0357999988 0.103100002 -0.994000018
+vn 0.0322000012 0.124300003 -0.991699994
+vn 0.058699999 0.0953999981 -0.993700027
+vn 0.0527999997 0.120300002 -0.991299987
+vn 0.0900999978 0.109399997 -0.989899993
+vn 0.0706999972 0.110699996 -0.991299987
+vn 0.0842999965 0.1237 -0.988699973
+vn 0.102200001 0.105899997 -0.989099979
+vn 0.108599998 0.120399997 -0.986800015
+vn 0.0957999974 0.0741000026 -0.992600024
+vn -0.160300002 0.127299994 -0.978799999
+vn -0.153699994 0.141499996 -0.977900028
+vn -0.178499997 0.1197 -0.976599991
+vn -0.178900003 0.138099998 -0.974099994
+vn -0.126900002 0.142100006 -0.981700003
+vn -0.0899000019 0.141399994 -0.985899985
+vn -0.105999999 0.131899998 -0.985599995
+vn -0.1039 0.153799996 -0.982599974
+vn -0.0732000023 0.139699996 -0.987500012
+vn -0.0518000014 0.145400003 -0.987999976
+vn -0.0333000012 0.154100001 -0.987500012
+vn -0.0208999999 0.145999998 -0.989099979
+vn -0.0161000006 0.130600005 -0.991299987
+vn 0.00170000002 0.148000002 -0.989000022
+vn 0.0184000004 0.133300006 -0.99089998
+vn 0.0205000006 0.158099994 -0.987200022
+vn 0.0410000011 0.145300001 -0.988499999
+vn 0.0559 0.144800007 -0.987900019
+vn 0.0693000033 0.132400006 -0.988799989
+vn 0.0826999992 0.145099998 -0.986000001
+vn 0.120999999 0.139400005 -0.982800007
+vn 0.100199997 0.133900002 -0.985899985
+vn 0.104400001 0.153200001 -0.98269999
+vn -0.140000001 0.160300002 -0.977100015
+vn -0.160899997 0.154699996 -0.974799991
+vn -0.161699995 0.170200005 -0.972000003
+vn -0.142700002 0.177300006 -0.973800004
+vn -0.188199997 0.150199994 -0.970600009
+vn -0.1228 0.160300002 -0.979399979
+vn -0.124399997 0.185000002 -0.974799991
+vn -0.106799997 0.174799994 -0.978799999
+vn -0.0869000033 0.166500002 -0.982200027
+vn -0.0482000001 0.164700001 -0.985199988
+vn -0.0713 0.158800006 -0.984700024
+vn -0.067400001 0.177200004 -0.981899977
+vn -0.0256999992 0.179800004 -0.983399987
+vn -0.0478999987 0.181600004 -0.982200027
+vn -0.0153000001 0.166099995 -0.986000001
+vn 0.000300000014 0.165700004 -0.986199975
+vn 0.0388000011 0.163100004 -0.985899985
+vn 0.0152000003 0.182500005 -0.983099997
+vn 0.0377999991 0.178000003 -0.983299971
+vn 0.0658999979 0.157700002 -0.985300004
+vn 0.0612999983 0.172999993 -0.98299998
+vn 0.0841000006 0.167600006 -0.982299984
+vn 0.104400001 0.171900004 -0.979600012
+vn 0.147300005 0.162499994 -0.975700021
+vn 0.126200005 0.163000003 -0.978500009
+vn 0.140799999 0.180800006 -0.973399997
+vn 0.144500002 0.144600004 -0.978900015
+vn 0.165800005 0.165900007 -0.972100019
+vn 0.153799996 0.185699999 -0.970499992
+vn 0.1734 0.179299995 -0.968400002
+vn 0.161500007 0.147100002 -0.975799978
+vn 0.172399998 0.157900006 -0.972299993
+vn -0.165099993 0.186199993 -0.968500018
+vn -0.182999998 0.193800002 -0.963800013
+vn -0.165900007 0.204400003 -0.964699984
+vn -0.191 0.203299999 -0.960300028
+vn -0.182400003 0.177100003 -0.967100024
+vn -0.145099998 0.195099995 -0.970000029
+vn -0.107699998 0.1963 -0.974600017
+vn -0.128999993 0.209099993 -0.969399989
+vn -0.0856000036 0.185599998 -0.978900015
+vn -0.0892999992 0.202999994 -0.975099981
+vn -0.0623999983 0.195600003 -0.978699982
+vn -0.0615000017 0.209700003 -0.975799978
+vn -0.00439999998 0.185699999 -0.982599974
+vn -0.0188999996 0.202800006 -0.978999972
+vn 0.00340000005 0.203299999 -0.979099989
+vn -0.0388999991 0.193599999 -0.980300009
+vn -0.0403999984 0.208800003 -0.977100015
+vn -0.0471000001 0.227300003 -0.9727
+vn -0.0296999998 0.222200006 -0.9745
+vn -0.0335000008 0.239199996 -0.970399976
+vn -0.0649000034 0.224999994 -0.972199976
+vn 0.0320000015 0.193499997 -0.980599999
+vn 0.0201999992 0.206 -0.978399992
+vn 0.0527999997 0.191799998 -0.980000019
+vn 0.0390999988 0.2095 -0.976999998
+vn 0.0582000017 0.208100006 -0.976400018
+vn 0.0544000007 0.224099994 -0.97299999
+vn 0.0357999988 0.229800001 -0.972599983
+vn 0.0491999984 0.236699998 -0.970300019
+vn 0.0190999992 0.2192 -0.975499988
+vn 0.0183000006 0.226600006 -0.973800004
+vn 0.0949999988 0.187399998 -0.977699995
+vn 0.0715000033 0.188099995 -0.979499996
+vn 0.0800999999 0.2042 -0.975700021
+vn 0.122599997 0.186499998 -0.974799991
+vn 0.1087 0.202600002 -0.973200023
+vn 0.1373 0.202999994 -0.969500005
+vn 0.1708 0.196400002 -0.965499997
+vn 0.159099996 0.211999997 -0.96420002
+vn 0.187099993 0.189600006 -0.96390003
+vn 0.1822 0.209399998 -0.960699975
+vn 0.200399995 0.204699993 -0.958100021
+vn -0.183200002 0.214900002 -0.959299982
+vn -0.188899994 0.235400006 -0.953400016
+vn -0.168400005 0.228200004 -0.958899975
+vn -0.206300005 0.228799999 -0.951399982
+vn -0.251800001 0.203799993 -0.946099997
+vn -0.200800002 0.242500007 -0.949100018
+vn -0.151700005 0.216100007 -0.96450001
+vn -0.149000004 0.232999995 -0.961000025
+vn -0.130500004 0.224600002 -0.965699971
+vn -0.111199997 0.235699996 -0.965399981
+vn -0.110100001 0.216800004 -0.970000029
+vn -0.0806000009 0.213699996 -0.97359997
+vn -0.0903000012 0.228 -0.969500005
+vn -0.0784000009 0.240799993 -0.967400014
+vn -0.0714000016 0.262699991 -0.962199986
+vn -0.059700001 0.240999997 -0.968699992
+vn -0.0838999972 0.267199993 -0.959999979
+vn -0.0259000007 0.270799994 -0.962300003
+vn 0.0952000022 0.219699994 -0.970899999
+vn 0.0713 0.226099998 -0.971499979
+vn 0.0773999989 0.239899993 -0.967700005
+vn 0.121799998 0.218400002 -0.968200028
+vn 0.0976999998 0.240500003 -0.965699971
+vn 0.114600003 0.2368 -0.9648
+vn 0.145400003 0.226999998 -0.963
+vn 0.132300004 0.2377 -0.962300003
+vn 0.160699993 0.235599995 -0.958500028
+vn 0.178299993 0.226799995 -0.957499981
+vn 0.197099999 0.220599994 -0.955299973
+vn -0.173999995 0.244200006 -0.953999996
+vn -0.178499997 0.256999999 -0.949800014
+vn -0.203299999 0.254799992 -0.9454
+vn -0.193299994 0.272799999 -0.942499995
+vn -0.1523 0.248999998 -0.956499994
+vn -0.157299995 0.265700012 -0.951200008
+vn -0.135299996 0.259000003 -0.956399977
+vn -0.129700005 0.241400003 -0.961700022
+vn -0.0956000015 0.251700014 -0.963100016
+vn -0.114 0.257200003 -0.959599972
+vn -0.101099998 0.270999998 -0.957199991
+vn -0.121600002 0.274699986 -0.953800023
+vn -0.0964000002 0.315699995 -0.943899989
+vn -0.140000001 0.281800002 -0.949199975
+vn 0.116400003 0.255299985 -0.959800005
+vn 0.0980999991 0.262499988 -0.959900022
+vn 0.0731000006 0.261700004 -0.962400019
+vn 0.107699998 0.278299987 -0.954400003
+vn 0.0883999988 0.268299997 -0.959299982
+vn 0.103500001 0.279900014 -0.954400003
+vn 0.123099998 0.271100014 -0.954699993
+vn 0.139799997 0.255199999 -0.956700027
+vn 0.139599994 0.280800015 -0.949599981
+vn 0.114200003 0.290800005 -0.949899971
+vn 0.156299993 0.251700014 -0.9551
+vn 0.1778 0.245900005 -0.952899992
+vn 0.196500003 0.238900006 -0.950999975
+vn 0.199000001 0.256799996 -0.945800006
+vn 0.182799995 0.266600013 -0.94630003
+vn 0.168799996 0.265500009 -0.949199975
+vn -0.159700006 0.283499986 -0.945599973
+vn -0.176599994 0.274300009 -0.945299983
+vn -0.179299995 0.291599989 -0.939599991
+vn -0.199100003 0.293000013 -0.935100019
+vn -0.143600002 0.302300006 -0.942300022
+vn -0.161799997 0.299299985 -0.940400004
+vn -0.153400004 0.3134 -0.93720001
+vn -0.169499993 0.315699995 -0.933600008
+vn -0.179499999 0.309300005 -0.933899999
+vn -0.193800002 0.309799999 -0.930800021
+vn 0.155699998 0.276899993 -0.948199987
+vn 0.176699996 0.283399999 -0.942600012
+vn 0.193399996 0.287800014 -0.938000023
+vn 0.202999994 0.273900002 -0.940100014
+vn 0.140300006 0.30250001 -0.942799985
+vn 0.164700001 0.298500001 -0.940100014
+vn 0.180299997 0.301899999 -0.936100006
+vn 0.190200001 0.310299993 -0.931400001
+vn 0.161400005 0.32280001 -0.932600021
+vn 0.0562999994 0.308999985 -0.949400008
+vn 0.0557000004 0.257600009 -0.964699984
+vn 0.0434000008 0.247299999 -0.967999995
+vn 0.132699996 0.326799989 -0.935699999
+vn 0.105099998 0.313899994 -0.943599999
+vn 0.155200005 0.312400013 -0.93720001
+vn 0.0979000032 0.2852 -0.953499973
+vn 0.134000003 0.300199986 -0.944400012
+vn 0.507799983 -0.856100023 -0.0964000002
+vn 0.529399991 -0.844399989 -0.0820999965
+vn 0.466500014 -0.869899988 0.159999996
+vn 0.469599992 -0.874000013 0.124499999
+vn 0.485799998 -0.863499999 0.135199994
+vn 0.478500009 -0.860000014 0.177599996
+vn 0.530300021 -0.843699992 -0.0829999968
+vn 0.516200006 -0.852400005 -0.0837000012
+vn 0.490099996 -0.861899972 0.129999995
+vn -0.210199997 -0.947000027 -0.243000001
+vn 0.0013 -0.99970001 0.0223999992
+vn -0.248999998 -0.967800021 0.0357000008
+vn 0.298099995 -0.944700003 -0.136399999
+vn 0.208399996 -0.958800018 0.193100005
+vn 0.0520000011 -0.97299999 -0.224900007
+vn 0.361699998 -0.917299986 0.1664
+vn 0.442299992 -0.889699996 -0.112999998
+vn 0.435400009 -0.894999981 0.0966000035
+vn -0.696699977 -0.662599981 -0.274899989
+vn -0.830200016 -0.554700017 -0.0555000007
+vn -0.817600012 -0.507799983 -0.271600008
+vn -0.707000017 -0.707099974 0.0131000001
+vn -0.560699999 -0.783800006 -0.26699999
+vn -0.576399982 -0.817099988 0.0138999997
+vn -0.424299985 -0.905499995 0.00820000004
+vn -0.396400005 -0.874100029 -0.280800015
+vn -0.992699981 0.00939999986 -0.119999997
+vn -0.995100021 0.00960000046 0.0980999991
+vn -0.989700019 0.105899997 -0.0964000002
+vn -0.985400021 -0.0736000016 0.153400004
+vn -0.979799986 -0.140499994 -0.142000005
+vn -0.957099974 -0.226600006 0.180299997
+vn -0.922800004 -0.3847 0.0201999992
+vn -0.920700014 -0.324600011 -0.216800004
+vn -0.961000025 0.2764 0.00400000019
+vn -0.970099986 0.238900006 -0.0421000011
+vn -0.958299994 0.153899997 0.240899995
+vn -0.977400005 0.202800006 -0.0604999997
+vn -0.974600017 0.128000006 0.183699995
+vn -0.982500017 0.0885000005 0.164000005
+vn -0.984200001 0.162100002 -0.0716999993
+vn -0.985899985 0.0653000027 0.154400006
+vn -0.859200001 0.510900021 0.0291000009
+vn -0.799099982 0.541199982 0.261799991
+vn -0.79519999 0.605099976 0.0394000001
+vn -0.904500008 0.426099986 -0.0200999994
+vn -0.9102 0.375200003 0.1752
+vn -0.854700029 0.437700003 0.279000014
+vn -0.932200015 0.2685 0.242500007
+vn -0.939199984 0.342900008 -0.0193000007
+vn -0.940999985 0.233899996 0.244499996
+vn -0.552600026 0.739499986 0.38440001
+vn -0.626299977 0.768299997 0.132200003
+vn -0.623399973 0.66960001 0.403699994
+vn -0.499900013 0.853900015 0.144800007
+vn -0.550599992 0.824400008 0.130799994
+vn -0.520399988 0.753400028 0.40200001
+vn -0.717299998 0.614899993 0.327600002
+vn -0.715200007 0.693700016 0.0850000009
+vn -0.423500001 0.816200018 0.393000007
+vn -0.452100009 0.874000013 0.178200006
+vn -0.424299985 0.754100025 0.50120002
+vn -0.444700003 0.88319999 0.148900002
+vn -0.442999989 0.883899987 0.149900004
+vn -0.419999987 0.827899992 0.371699989
+vn -0.464899987 0.793799996 0.39199999
+vn -0.469000012 0.870599985 0.148599997
+vn -0.478399992 0.784799993 0.393999994
+vn -0.745700002 0.649100006 0.150399998
+vn -0.877099991 0.350400001 0.328500003
+vn -0.9199 0.370799989 0.127900004
+vn -0.69599998 0.593699992 0.403899997
+vn -0.526799977 0.838400006 0.140100002
+vn -0.492799997 0.783800006 0.377799988
+vn -0.428900003 0.800100029 0.419400007
+vn -0.464399993 0.873199999 0.148000002
+vn -0.42750001 0.829999983 0.358200014
+vn -0.969900012 -0.203700006 0.133499995
+vn -0.886600018 -0.342900008 0.310499996
+vn -0.885399997 -0.448100001 0.123499997
+vn -0.901300013 -0.192599997 0.388099998
+vn -0.985899985 -0.00710000005 0.167199999
+vn -0.924799979 -0.0125000002 0.380299985
+vn -0.88440001 0.156399995 0.439799994
+vn -0.971499979 0.1884 0.143600002
+vn -0.522300005 -0.745500028 0.414000005
+vn -0.706399977 -0.690100014 0.157600001
+vn -0.730499983 -0.584399998 0.353399992
+vn -0.371600002 -0.881399989 0.291599989
+vn -0.487399995 -0.86619997 0.110299997
+vn 0.132499993 -0.912999988 0.385800004
+vn 0.0882000029 -0.989799976 0.111400001
+vn 0.0878999978 -0.925700009 0.367900014
+vn 0.157900006 -0.982299984 0.100599997
+vn 0.143000007 -0.984499991 0.1017
+vn 0.145300001 -0.937900007 0.315100014
+vn -0.132200003 -0.920899987 0.36680001
+vn -0.157199994 -0.981899977 0.105899997
+vn 0.134499997 -0.985800028 0.100500003
+vn 0.0949999988 -0.959200025 0.266200006
+vn 0.104000002 -0.990800023 0.0868000016
+vn 0.0962999985 -0.932600021 0.347799987
+vn 0.147 -0.980499983 0.130199999
+vn 0.1043 -0.882099986 0.459399998
+vn 0.138099998 -0.926900029 0.349099994
+vn 0.158500001 -0.98210001 0.1021
+vn 0.148300007 -0.937699974 0.314300001
+vn -0.153699994 -0.987200022 0.0430999994
+vn -0.30430001 -0.9296 0.208100006
+vn -0.266499996 -0.963800013 0.000699999975
+vn -0.202000007 -0.931999981 0.301099986
+vn -0.0416000001 -0.995999992 0.0786999986
+vn -0.0873999968 -0.946399987 0.31099999
+vn -0.00930000003 -0.926299989 0.376599997
+vn 0.0460000001 -0.994899988 0.0900999978
+vn 0.0313000008 -0.933399975 0.3574
+vn -0.556500018 -0.811399996 0.178800002
+vn -0.455199987 -0.890299976 -0.0153000001
+vn -0.49059999 -0.842999995 0.220500007
+vn -0.571799994 -0.818300009 -0.0584999993
+vn -0.518599987 -0.853600025 -0.0487999991
+vn -0.5898 -0.780399978 0.207499996
+vn -0.409999996 -0.875899971 0.254299998
+vn -0.369599998 -0.929199994 -0.0057000001
+vn -0.722100019 -0.675499976 0.149399996
+vn -0.65109998 -0.757000029 -0.0549999997
+vn -0.689100027 -0.6699 0.2764
+vn -0.726599991 -0.678499997 -0.107900001
+vn -0.679899991 -0.727100015 -0.0954999998
+vn -0.740199983 -0.657100022 0.142900005
+vn -0.645500004 -0.748199999 0.152999997
+vn -0.610199988 -0.788699985 -0.0749000013
+vn -0.628700018 -0.761900008 0.155599996
+vn -0.935299993 -0.279900014 -0.216299996
+vn -0.997799993 -0.0520000011 -0.0417999998
+vn -0.96329999 -0.0693999976 -0.259200007
+vn -0.968299985 -0.247500002 0.0346000008
+vn -0.869300008 -0.465600014 -0.166099995
+vn -0.902199984 -0.426099986 0.0662999973
+vn -0.827600002 -0.540700018 0.150399998
+vn -0.790099978 -0.597500026 -0.1373
+vn -0.793299973 -0.582799971 0.175799996
+vn -0.741999984 0.641099989 -0.196099997
+vn -0.880699992 0.47330001 -0.0207000002
+vn -0.781199992 0.619499981 0.0768000036
+vn -0.844299972 0.475400001 -0.247299999
+vn -0.917699993 0.307399988 -0.251800001
+vn -0.951300025 0.307399988 0.0241999999
+vn -0.989000022 0.1426 0.0388999991
+vn -0.959399998 0.130099997 -0.250200003
+vn -0.282799989 0.934099972 0.217800006
+vn -0.350300014 0.931299984 -0.0996000022
+vn -0.408699989 0.903699994 0.127399996
+vn -0.134299994 0.99000001 -0.0434000008
+vn -0.208299994 0.976100028 -0.0623999983
+vn -0.209900007 0.968500018 0.134100005
+vn -0.609799981 0.788999975 0.0749000013
+vn -0.558300018 0.811200023 -0.173899993
+vn -0.0833000019 0.995100021 -0.0526000001
+vn -0.124700002 0.9824 0.1391
+vn -0.0976999998 0.995000005 -0.0225000009
+vn -0.133100003 0.96359998 0.231900007
+vn -0.134800002 0.950399995 0.280200005
+vn -0.162599996 0.96329999 0.213799998
+vn -0.100900002 0.994400024 -0.0307
+vn -0.1734 0.963 0.206400007
+vn -0.583400011 0.810899973 -0.0443000011
+vn -0.412900001 0.888700008 0.199399993
+vn -0.572899997 0.783100009 0.241699994
+vn -0.221000001 0.975000024 -0.0252
+vn -0.246999994 0.930199981 0.271600008
+vn -0.404500008 0.912299991 -0.0640999973
+vn -0.166099995 0.950299978 0.263399988
+vn -0.131600007 0.990800023 -0.0309999995
+vn -0.142100006 0.964399993 0.222900003
+vn -0.858399987 0.453200012 0.240400001
+vn -0.853500009 0.519800007 -0.0370000005
+vn -0.800000012 0.514100015 0.309399992
+vn -0.910700023 0.409700006 -0.0520000011
+vn -0.896000028 0.440899998 -0.0533000007
+vn -0.885399997 0.435299993 0.163100004
+vn -0.721599996 0.666000009 0.188700005
+vn -0.735599995 0.673500001 -0.0731000006
+vn -0.873399973 0.450100005 0.185900003
+vn -0.913900018 0.405200005 -0.0240000002
+vn -0.843400002 0.441700011 0.305999994
+vn -0.898500025 0.434199989 -0.063699998
+vn -0.911300004 0.407999992 -0.0551000014
+vn -0.878000021 0.455000013 0.148499995
+vn -0.868799984 0.428799987 0.247700006
+vn -0.89230001 0.421700001 0.161200002
+vn -0.6074 0.7755 -0.172499999
+vn -0.372999996 0.9278 -0.00860000029
+vn -0.385500014 0.894699991 -0.225400001
+vn -0.578499973 0.812399983 0.0734999999
+vn -0.782500029 0.612900019 -0.110299997
+vn -0.748300016 0.653699994 0.112899996
+vn -0.814800024 0.546000004 0.195099995
+vn -0.86500001 0.495299995 -0.0806000009
+vn -0.8574 0.495999992 0.136999995
+vn 0.386700004 0.903900027 -0.182999998
+vn 0.181799993 0.982599974 0.0388999991
+vn 0.358700007 0.928499997 0.0960000008
+vn 0.000500000024 0.977500021 -0.210700005
+vn -0.00150000001 0.997099996 0.0766000003
+vn 0.192599997 0.954699993 -0.226799995
+vn -0.176699996 0.98150003 0.0738999993
+vn -0.187800005 0.956700027 -0.222299993
+vn 0.813300014 0.546000004 0.200900003
+vn 0.783800006 0.612200022 -0.104699999
+vn 0.747099996 0.654100001 0.118100002
+vn 0.898800015 0.434599996 -0.0562000014
+vn 0.865700006 0.495000005 -0.0744000003
+vn 0.856999993 0.495700002 0.140900001
+vn 0.577600002 0.812699974 0.0769999996
+vn 0.607599974 0.776000023 -0.169400007
+vn 0.914799988 0.402700007 -0.0302000009
+vn 0.896200001 0.419099987 0.145300001
+vn 0.911300004 0.408399999 -0.0515000001
+vn 0.864099979 0.429699987 0.262100011
+vn 0.870299995 0.43720001 0.226899996
+vn 0.872099996 0.449600011 0.192900002
+vn 0.91170001 0.407900006 -0.0485000014
+vn 0.868300021 0.459500015 0.186900005
+vn 0.734700024 0.675199986 -0.0661000013
+vn 0.581799984 0.801199973 0.140300006
+vn 0.582799971 0.808300018 -0.0841000006
+vn 0.717599988 0.668299973 0.1963
+vn 0.854499996 0.517499983 -0.0452999994
+vn 0.83099997 0.522499979 0.191
+vn 0.855499983 0.4551 0.247099996
+vn 0.896600008 0.440299988 -0.0465000011
+vn 0.867900014 0.434899986 0.239899993
+vn 0.1646 0.950299978 0.264099985
+vn 0.222499996 0.974799991 -0.0172000006
+vn 0.243300006 0.914399981 0.323599994
+vn 0.0967999995 0.994899988 -0.0285999998
+vn 0.131799996 0.990800023 -0.0297999997
+vn 0.136600003 0.972299993 0.189500004
+vn 0.411599994 0.888899982 0.201100007
+vn 0.408899993 0.910700023 -0.0590000004
+vn 0.160400003 0.96329999 0.215100005
+vn 0.0947000012 0.995500028 0.0013
+vn 0.161699995 0.928799987 0.333299994
+vn 0.131600007 0.9903 -0.0443999991
+vn 0.100000001 0.994499981 -0.0297999997
+vn 0.170900002 0.963400006 0.206699997
+vn 0.129899994 0.966099977 0.222900003
+vn 0.123000003 0.971700013 0.201700002
+vn 0.554899991 0.814700007 -0.168300003
+vn 0.771499991 0.636099994 -0.0132999998
+vn 0.730400026 0.643100023 -0.230299994
+vn 0.605300009 0.791999996 0.0797000006
+vn 0.347799987 0.932600021 -0.0965000018
+vn 0.403899997 0.905399978 0.131099999
+vn 0.280900002 0.932500005 0.226999998
+vn 0.206799999 0.976499975 -0.0606000014
+vn 0.209700003 0.966199994 0.150099993
+vn 0.959399998 0.138699993 -0.245499998
+vn 0.998399973 -0.0432999991 -0.0359000005
+vn 0.965300024 -0.0606000014 -0.253899992
+vn 0.987200022 0.149499997 0.0555000007
+vn 0.91930002 0.314999998 -0.236000001
+vn 0.948199987 0.317600012 -0.00359999994
+vn 0.879800022 0.471500009 0.0606000014
+vn 0.845399976 0.480300009 -0.233799994
+vn 0.786499977 -0.595399976 0.164399996
+vn 0.834999979 -0.530700028 -0.145300001
+vn 0.868799984 -0.488000005 0.0843999982
+vn 0.69630003 -0.711700022 -0.0931999981
+vn 0.748000026 -0.653800011 -0.114100002
+vn 0.753199995 -0.636399984 0.166199997
+vn 0.960900009 -0.273400009 0.0447000004
+vn 0.929199994 -0.307300001 -0.205300003
+vn 0.676500022 -0.716000021 0.172499999
+vn 0.663200021 -0.746599972 -0.0533000007
+vn 0.684700012 -0.671599984 0.282999992
+vn 0.661899984 -0.745899975 -0.075000003
+vn 0.672599971 -0.726400018 0.141100004
+vn 0.70389998 -0.691600025 0.161599994
+vn 0.669499993 -0.737999976 -0.0851000026
+vn 0.711899996 -0.691299975 0.1241
+vn 0.945100009 -0.317900002 -0.0751999989
+vn 0.854900002 -0.494300008 0.157900006
+vn 0.924099982 -0.318399996 0.211400002
+vn 0.747799993 -0.660399973 -0.067900002
+vn 0.735800028 -0.61619997 0.280999988
+vn 0.858500004 -0.501900017 -0.104999997
+vn 0.697000027 -0.695299983 0.175099999
+vn 0.684000015 -0.724099994 -0.0882999972
+vn 0.680700004 -0.710600019 0.178299993
+vn 0.966199994 0.113300003 0.2315
+vn 0.995999992 0.0727000013 -0.0511999987
+vn 0.967299998 0.0293000005 0.252000004
+vn 0.980499983 0.189500004 -0.0516000018
+vn 0.985499978 0.1602 -0.0560999997
+vn 0.971599996 0.1382 0.1919
+vn 0.976000011 -0.136299998 0.169799998
+vn 0.988699973 -0.117799997 -0.0926999971
+vn 0.979399979 0.0988999978 0.176200002
+vn 0.983299971 0.180000007 -0.0284000002
+vn 0.949999988 0.0921000019 0.298400015
+vn 0.988900006 0.129999995 -0.0720999986
+vn 0.983799994 0.168200001 -0.0621000007
+vn 0.98150003 0.0839999989 0.172199994
+vn 0.960300028 0.1259 0.248899996
+vn 0.979799986 0.194000006 -0.0478000008
+vn 0.965600014 0.1417 0.217999995
+vn 0.820599973 -0.523100019 -0.230199993
+vn 0.930999994 -0.363900006 0.0278999992
+vn 0.821399987 -0.569599986 0.0271000005
+vn 0.928900003 -0.306899995 -0.207499996
+vn 0.985899985 -0.0842000023 -0.144600004
+vn 0.981400013 -0.156900004 0.110399999
+vn 0.984499991 -0.0274999999 0.173199996
+vn 0.993600011 0.056499999 -0.0978000015
+vn 0.984899998 0.0259000007 0.171399996
+vn 0.399199992 -0.87349999 -0.278800011
+vn 0.236599997 -0.969900012 -0.0579999983
+vn 0.203700006 -0.9375 -0.282000005
+vn 0.426800013 -0.904299974 0.0140000004
+vn 0.560199976 -0.785000026 -0.264600009
+vn 0.575299978 -0.817700028 0.0163000003
+vn 0.706099987 -0.708000004 0.0111999996
+vn 0.69690001 -0.663500011 -0.272100002
+vn -0.364800006 -0.916700006 0.163100004
+vn -0.301699996 -0.941100001 -0.152600005
+vn -0.243499994 -0.967100024 0.0738999993
+vn -0.506500006 -0.85680002 -0.0964000002
+vn -0.442799985 -0.889100015 -0.115599997
+vn -0.433200002 -0.895500004 0.102200001
+vn -0.00319999992 -0.99970001 0.0241
+vn -0.0537 -0.97299999 -0.224399999
+vn -0.51639998 -0.851800025 -0.0877000019
+vn -0.534500003 -0.837199986 -0.115599997
+vn -0.498199999 -0.861899972 0.0944000036
+vn -0.486999989 -0.863399982 0.131799996
+vn -0.466399997 -0.869599998 0.161899999
+vn -0.529500008 -0.843900025 -0.0870999992
+vn -0.47209999 -0.87379998 0.116700001
+vn -0.206699997 -0.970799983 -0.121699996
+vn -0.00039999999 -0.996599972 0.0817999989
+vn 0.00039999999 -0.989600003 -0.143700004
+vn -0.195500001 -0.970600009 0.140200004
+vn -0.399699986 -0.913200021 -0.0800999999
+vn -0.351000011 -0.897300005 0.26789999
+vn -0.439900011 -0.876600027 0.195099995
+vn -0.483700007 -0.870400012 -0.0917000026
+vn -0.4736 -0.871399999 0.127700001
+vn 0.443199992 -0.879100025 0.175600007
+vn 0.400400013 -0.912100017 -0.0882999972
+vn 0.367599994 -0.91170001 0.183400005
+vn 0.483999997 -0.870100021 -0.0930999964
+vn 0.466800004 -0.868600011 0.166299999
+vn 0.187099993 -0.969799995 0.156800002
+vn 0.206200004 -0.971099973 -0.119800001
+vn 0.375999987 -0.853900015 0.360000014
+vn 0.378100008 -0.843299985 0.381999999
+vn 0.396400005 -0.833500028 0.384799987
+vn 0.390300006 -0.815299988 0.427899987
+vn 0.434700012 -0.83950001 0.325899988
+vn 0.341199994 -0.763100028 0.548900008
+vn -0.0439999998 -0.9648 0.25940001
+vn -0.26910001 -0.898699999 0.346300006
+vn 0.237000003 -0.855199993 0.460999995
+vn 0.359800011 -0.884199977 0.298099995
+vn 0.249500006 -0.819000006 0.516799986
+vn -0.775300026 -0.574699998 0.262100011
+vn -0.649200022 -0.682500005 0.335799992
+vn -0.550800025 -0.790000021 0.269400001
+vn -0.416999996 -0.856599987 0.303900003
+vn -0.914300025 -0.0829000026 0.396499991
+vn -0.880100012 -0.157600001 0.447899997
+vn -0.874300003 -0.415399998 0.251199991
+vn -0.921700001 0.142000005 0.360900015
+vn -0.846700013 0.0447999984 0.530099988
+vn -0.893899977 0.0340000018 0.446999997
+vn -0.924799979 0.0119000003 0.380299985
+vn -0.919499993 -0.0190999992 0.3926
+vn -0.731599987 0.401199996 0.551199973
+vn -0.852400005 0.275599986 0.444299996
+vn -0.788999975 0.329699993 0.518400013
+vn -0.833000004 0.154599994 0.531300008
+vn -0.871800005 0.149200007 0.466500014
+vn -0.509899974 0.583299994 0.632300019
+vn -0.573899984 0.530099988 0.624199986
+vn -0.470999986 0.578999996 0.665600002
+vn -0.675100029 0.503400028 0.539200008
+vn -0.367399991 0.704299986 0.6074
+vn -0.377900004 0.697600007 0.608699977
+vn -0.431699991 0.671999991 0.601700008
+vn -0.442900002 0.644800007 0.622900009
+vn -0.774999976 0.306100011 0.552900016
+vn -0.607900023 0.516499996 0.603100002
+vn -0.625800014 0.236900002 0.743099988
+vn -0.418799996 0.649800003 0.63440001
+vn -0.353500009 0.653199971 0.669700027
+vn -0.377700001 0.718900025 0.583500028
+vn -0.756500006 -0.387300014 0.52700001
+vn -0.789300025 -0.0255999994 0.613499999
+vn -0.784099996 -0.165199995 0.59829998
+vn -0.631399989 -0.25850001 0.731100023
+vn -0.679499984 0.102799997 0.726400018
+vn -0.32159999 -0.752099991 0.575200021
+vn -0.579599977 -0.553900003 0.5977
+vn -0.422399998 -0.593200028 0.685299993
+vn -0.575100005 -0.391099989 0.718599975
+vn 0.123400003 -0.826900005 0.548600018
+vn 0.109899998 -0.751999974 0.649999976
+vn 0.0691 -0.771399975 0.632600009
+vn -0.1206 -0.814300001 0.567799985
+vn 0.0441999994 -0.855199993 0.516499996
+vn 0.053199999 -0.824199975 0.563799977
+vn 0.108599998 -0.813799977 0.570900023
+vn 0.130099997 -0.854799986 0.502399981
+vn 0.100599997 -0.703999996 0.703000009
+vn -0.329299986 -0.846899986 0.417499989
+vn -0.132100001 -0.828499973 0.544200003
+vn -0.238499999 -0.78579998 0.570599973
+vn -0.337000012 -0.701099992 0.628300011
+vn -0.0705000013 -0.754100025 0.652999997
+vn -0.0296 -0.775200009 0.630999982
+vn -0.558700025 -0.706900001 0.433800012
+vn -0.497700006 -0.734300017 0.461699992
+vn -0.584200025 -0.67110002 0.456499994
+vn -0.421600014 -0.739400029 0.524900019
+vn -0.717100024 -0.586199999 0.377000004
+vn -0.73360002 -0.557900012 0.388000011
+vn -0.630400002 -0.66869998 0.394199997
+vn -0.646099985 -0.644800007 0.408300012
+vn -0.972800016 -0.0278999992 0.229800001
+vn -0.879000008 -0.355199993 0.318199992
+vn -0.941500008 -0.2007 0.270700008
+vn -0.784799993 -0.421000004 0.45480001
+vn -0.757499993 -0.459800005 0.463499993
+vn -0.864000022 0.436500013 0.2509
+vn -0.908599973 0.28459999 0.305700004
+vn -0.757000029 0.545099974 0.360300004
+vn -0.930599988 0.142100006 0.337300003
+vn -0.260100007 0.900200009 0.349299997
+vn -0.443599999 0.816500008 0.369599998
+vn -0.336899996 0.792100012 0.509000003
+vn -0.621900022 0.721599996 0.30430001
+vn -0.174999997 0.905399978 0.386799991
+vn -0.170399994 0.859700024 0.481599987
+vn -0.171900004 0.792500019 0.585200012
+vn -0.211300001 0.875400007 0.434799999
+vn -0.229300007 0.866100013 0.444299996
+vn -0.395900011 0.812300026 0.428299993
+vn -0.248600006 0.793099999 0.555999994
+vn -0.501800001 0.674000025 0.542200029
+vn -0.186199993 0.800400019 0.569700003
+vn -0.169400007 0.86619997 0.470099986
+vn -0.803900003 0.430000007 0.411000013
+vn -0.721400023 0.418300003 0.551900029
+vn -0.657199979 0.623099983 0.424100012
+vn -0.79369998 0.476700008 0.377900004
+vn -0.785700023 0.46450001 0.408399999
+vn -0.729700029 0.415100008 0.543299973
+vn -0.831499994 0.423099995 0.359899998
+vn -0.709299982 0.40079999 0.579900026
+vn -0.333499998 0.906099975 0.260399997
+vn -0.665000021 0.657400012 0.354299992
+vn -0.516900003 0.800300002 0.303799987
+vn -0.675100029 0.548900008 0.493000001
+vn -0.791199982 0.515699983 0.328799993
+vn -0.665600002 0.511300027 0.543600023
+vn 0.153699994 0.932299972 0.327499986
+vn -0.00139999995 0.943000019 0.332800001
+vn 0.295399994 0.866599977 0.402200013
+vn -0.147400007 0.907000005 0.394600004
+vn 0.789799988 0.515600026 0.332300007
+vn 0.662500024 0.657400012 0.358999997
+vn 0.671599984 0.548799992 0.497799993
+vn 0.662500024 0.511500001 0.547299981
+vn 0.51700002 0.800000012 0.304500014
+vn 0.833700001 0.423700005 0.354099989
+vn 0.725600004 0.415399998 0.548699975
+vn 0.731400013 0.407400012 0.546899974
+vn 0.759500027 0.440200001 0.478899986
+vn 0.783699989 0.464300007 0.412499994
+vn 0.754899979 0.477800012 0.449299991
+vn 0.538900018 0.734499991 0.412299991
+vn 0.749300003 0.493999988 0.441000015
+vn 0.658500016 0.619799972 0.426899999
+vn 0.716400027 0.420100003 0.557099998
+vn 0.751800001 0.414099991 0.513100028
+vn 0.165299997 0.882000029 0.441300005
+vn 0.182999998 0.799600005 0.572000027
+vn 0.394899994 0.807500005 0.438199997
+vn 0.207900003 0.875199974 0.43689999
+vn 0.225500003 0.866400003 0.4454
+vn 0.163100004 0.878499985 0.449099988
+vn 0.155399993 0.873300016 0.461600006
+vn 0.768700004 0.582400024 0.264299989
+vn 0.43810001 0.817799985 0.373299986
+vn 0.617600024 0.722800016 0.310099989
+vn 0.335299999 0.759599984 0.557299972
+vn 0.257999986 0.899399996 0.352899998
+vn 0.297800004 0.768999994 0.565599978
+vn 0.971700013 -0.0200999994 0.235200003
+vn 0.918799996 0.298299998 0.258700013
+vn 0.894299984 0.141200006 0.424499989
+vn 0.827000022 0.411500007 0.382999986
+vn 0.848100007 -0.412800014 0.332100004
+vn 0.730499983 -0.518899977 0.444000006
+vn 0.757000029 -0.48120001 0.442000002
+vn 0.933700025 -0.224800006 0.278800011
+vn 0.65990001 -0.672399998 0.335200012
+vn 0.648599982 -0.623399973 0.436699986
+vn 0.606000006 -0.565500021 0.559400022
+vn 0.694100022 -0.605300009 0.389600009
+vn 0.709599972 -0.603200018 0.364199996
+vn 0.800700009 -0.449299991 0.396299988
+vn 0.806800008 -0.288800001 0.515399992
+vn 0.650399983 -0.604399979 0.460000008
+vn 0.648500025 -0.63319999 0.422500014
+vn 0.891799986 0.0790999979 0.4454
+vn 0.861100018 0.054299999 0.505500019
+vn 0.815800011 -0.0214000009 0.578000009
+vn 0.904399991 -0.147 0.400700003
+vn 0.917999983 0.0275999997 0.395599991
+vn 0.90200001 -0.00590000022 0.431699991
+vn 0.81190002 0.0272000004 0.583199978
+vn 0.845499992 0.0592 0.530600011
+vn 0.879599988 -0.400900006 0.256000012
+vn 0.904399991 -0.218700007 0.366299987
+vn 0.771200001 -0.578599989 0.265399992
+vn 0.875999987 -0.119900003 0.467200011
+vn 0.895299971 -0.0643000007 0.440899998
+vn 0.263300002 -0.927299976 0.266099989
+vn 0.410100013 -0.846300006 0.34009999
+vn 0.549199998 -0.790300012 0.271499991
+vn 0.653999984 -0.692099988 0.305500001
+vn -0.363200009 -0.88499999 0.291399986
+vn -0.167199999 -0.932900012 0.318899989
+vn -0.240400001 -0.855099976 0.459399998
+vn -0.273400009 -0.835399985 0.476799995
+vn 0.0416000001 -0.965799987 0.256099999
+vn -0.449200004 -0.846099973 0.287
+vn -0.405200005 -0.824800014 0.394400001
+vn -0.347600013 -0.765200019 0.541899979
+vn -0.399199992 -0.833400011 0.382299989
+vn -0.366600007 -0.835900009 0.408399999
+vn -0.382699996 -0.855799973 0.348100007
+vn 9.99999975e-05 -0.932900012 0.360100001
+vn -0.165099993 -0.909200013 0.382200003
+vn -0.355399996 -0.803600013 0.477400005
+vn -0.404399991 -0.833299994 0.377000004
+vn 0.34830001 -0.798799992 0.490500003
+vn 0.39320001 -0.822000027 0.412
+vn 0.29429999 -0.829400003 0.474900007
+vn 0.149499997 -0.879199982 0.452300012
+vn 0.262899995 -0.761200011 0.592800021
+vn 0.239399999 -0.761099994 0.602900028
+vn 0.277099997 -0.742399991 0.610000014
+vn 0.2676 -0.70569998 0.656099975
+vn 0.201499999 -0.609300017 0.766900003
+vn -0.0837000012 -0.871699989 0.482800007
+vn 0.0786999986 -0.83829999 0.539499998
+vn -0.258399993 -0.729700029 0.633000016
+vn 0.118900001 -0.744099975 0.657400012
+vn 0.100500003 -0.673900008 0.731899977
+vn -0.488999993 -0.711499989 0.504700005
+vn -0.609000027 -0.522199988 0.597000003
+vn -0.555100024 -0.61559999 0.559499979
+vn -0.380800009 -0.754800022 0.534099996
+vn -0.797999978 -0.291700006 0.5273
+vn -0.697300017 -0.184100002 0.692700028
+vn -0.731899977 -0.215200007 0.646600008
+vn -0.773599982 -0.420700014 0.473800004
+vn -0.756500006 0.0153000001 0.653800011
+vn -0.6972 -0.0412999988 0.715699971
+vn -0.757700026 -0.0522999987 0.650399983
+vn -0.804899991 -0.0693000033 0.589299977
+vn -0.784500003 -0.104199998 0.611400008
+vn -0.678200006 0.205300003 0.705600023
+vn -0.697000027 0.130799994 0.7051
+vn -0.556900024 0.188199997 0.809000015
+vn -0.674799979 0.0428999998 0.736800015
+vn -0.726800025 0.0397000015 0.685699999
+vn -0.490399987 0.363700002 0.791999996
+vn -0.437099993 0.408800006 0.801100016
+vn -0.365200013 0.328799993 0.870899975
+vn -0.587300003 0.35800001 0.725899994
+vn -0.299299985 0.513999999 0.803799987
+vn -0.275900006 0.498899996 0.82160002
+vn -0.340499997 0.532000005 0.775300026
+vn -0.368099988 0.504599988 0.781000018
+vn -0.373299986 0.45449999 0.808799982
+vn -0.466199994 0.391600013 0.793299973
+vn -0.401199996 0.140499994 0.905200005
+vn -0.297600001 0.440400004 0.847100019
+vn -0.265599996 0.485000014 0.833199978
+vn -0.285100013 0.533100009 0.796599984
+vn -0.626600027 -0.126200005 0.768999994
+vn -0.561600029 -0.0302000009 0.826900005
+vn -0.43689999 -0.147300005 0.887399971
+vn -0.430900007 0.0511999987 0.901000023
+vn -0.274500012 -0.511200011 0.814400017
+vn -0.391400009 -0.418799996 0.819400012
+vn -0.361099988 -0.262800008 0.894699991
+vn 0.0922000036 -0.629400015 0.771600008
+vn 0.0549000017 -0.554400027 0.83039999
+vn -0.0890000015 -0.642499983 0.761099994
+vn 0.00800000038 -0.660300016 0.750899971
+vn -0.0200999994 -0.640200019 0.76789999
+vn 0.0449000001 -0.662 0.748199999
+vn 0.0671000034 -0.627799988 0.7755
+vn 0.0568000004 -0.467400014 0.882200003
+vn -0.169100001 -0.626900017 0.760500014
+vn -0.252000004 -0.568599999 0.782999992
+vn -0.318899989 -0.479600012 0.817499995
+vn -0.112800002 -0.566500008 0.816299975
+vn -0.0912000015 -0.520299971 0.849099994
+vn -0.513999999 -0.527199984 0.676699996
+vn -0.536499977 -0.513400018 0.669799984
+vn -0.462700009 -0.551100016 0.694400012
+vn -0.397199988 -0.55339998 0.73210001
+vn -0.665700018 -0.459800005 0.587800026
+vn -0.671899974 -0.413700014 0.614300013
+vn -0.640799999 -0.491899997 0.589399993
+vn -0.588699996 -0.473399997 0.655300021
+vn -0.591099977 -0.536300004 0.602500021
+vn -0.515799999 -0.372999996 0.771200001
+vn -0.855599999 -0.143199995 0.497399986
+vn -0.883899987 -0.00289999996 0.467599988
+vn -0.775399983 -0.245700002 0.581700027
+vn -0.745400012 0.0221999995 0.666299999
+vn -0.69599998 -0.293799996 0.655200005
+vn -0.644900024 -0.293500006 0.705600023
+vn -0.770200014 0.355399996 0.529600024
+vn -0.806699991 0.245700002 0.537500024
+vn -0.651899993 0.405099988 0.641099989
+vn -0.816600025 0.130600005 0.56220001
+vn -0.304500014 0.755299985 0.58039999
+vn -0.444799989 0.646799982 0.619499981
+vn -0.355300009 0.623000026 0.69690001
+vn -0.324699998 0.547800004 0.771000028
+vn -0.594399989 0.608900011 0.525300026
+vn -0.198100001 0.685400009 0.700699985
+vn -0.217600003 0.729700029 0.648199975
+vn -0.188700005 0.563600004 0.804199994
+vn -0.246600002 0.728799999 0.638800025
+vn -0.26910001 0.70630002 0.654799998
+vn -0.352299988 0.675599992 0.647599995
+vn -0.374900013 0.489399999 0.787400007
+vn -0.229200006 0.602400005 0.764599979
+vn -0.187399998 0.60589999 0.773100019
+vn -0.183899999 0.702400029 0.687600017
+vn -0.64410001 0.38440001 0.66140002
+vn -0.61680001 0.431800008 0.658100009
+vn -0.55250001 0.355800003 0.753799975
+vn -0.5528 0.535300016 0.638599992
+vn -0.645699978 0.448799998 0.617799997
+vn -0.646200001 0.465600014 0.604700029
+vn -0.658100009 0.423999995 0.622099996
+vn -0.568499982 0.373699993 0.73299998
+vn -0.507499993 0.340000004 0.791700006
+vn -0.424699992 0.738200009 0.524100006
+vn -0.273400009 0.824800014 0.495000005
+vn -0.512700021 0.605799973 0.608399987
+vn -0.198400006 0.698300004 0.68779999
+vn -0.493400007 0.503899992 0.708999991
+vn -0.460900009 0.463099986 0.757000029
+vn -0.00179999997 0.829400003 0.558600008
+vn 0.120099999 0.823499978 0.554499984
+vn 0.198300004 0.708199978 0.677600026
+vn -0.112199999 0.782000005 0.613099992
+vn 0.508300006 0.605700016 0.612200022
+vn 0.488299996 0.503899992 0.712499976
+vn 0.456200004 0.46329999 0.759800017
+vn 0.422300011 0.736599982 0.528299987
+vn 0.583999991 0.367300004 0.72390002
+vn 0.56279999 0.37349999 0.737399995
+vn 0.603100002 0.412099987 0.682900012
+vn 0.640699983 0.449000001 0.622799993
+vn 0.569700003 0.454100013 0.685000002
+vn 0.55250001 0.531599998 0.64200002
+vn 0.463499993 0.62440002 0.628700018
+vn 0.581900001 0.418199986 0.69749999
+vn 0.363900006 0.481700003 0.797200024
+vn 0.547299981 0.356000006 0.757399976
+vn 0.602800012 0.370000005 0.706900001
+vn 0.180000007 0.682200015 0.708700001
+vn 0.232700005 0.733500004 0.638599992
+vn 0.181299999 0.583199978 0.791899979
+vn 0.352600008 0.676500022 0.646600008
+vn 0.241500005 0.729200006 0.640299976
+vn 0.263500005 0.709299982 0.653800011
+vn 0.211400002 0.735700011 0.64349997
+vn 0.189799994 0.731299996 0.655200005
+vn 0.179199994 0.656700015 0.732599974
+vn 0.590900004 0.609000027 0.529100001
+vn 0.693199992 0.466300011 0.549499989
+vn 0.439200014 0.647700012 0.622600019
+vn 0.318500012 0.55369997 0.769400001
+vn 0.880299985 0.00410000002 0.474299997
+vn 0.806599975 0.252600014 0.534399986
+vn 0.742600024 0.0288999993 0.669099987
+vn 0.72329998 0.333700001 0.604600012
+vn 0.751699984 -0.292299986 0.591199994
+vn 0.67900002 -0.351799995 0.644400001
+vn 0.650200009 -0.366100013 0.665799975
+vn 0.84859997 -0.164100006 0.502900004
+vn 0.571699977 -0.479799986 0.665499985
+vn 0.616999984 -0.503899992 0.604499996
+vn 0.493099988 -0.39320001 0.776000023
+vn 0.638800025 -0.479499996 0.601599991
+vn 0.647800028 -0.453500003 0.611999989
+vn 0.691399992 -0.379400015 0.614899993
+vn 0.616400003 -0.474900007 0.628000021
+vn 0.599300027 -0.226799995 0.767700016
+vn 0.56099999 -0.481099993 0.673600018
+vn 0.568899989 -0.507099986 0.647499979
+vn 0.724399984 0.00760000013 0.689300001
+vn 0.773299992 0.0220999997 0.633700013
+vn 0.764199972 -0.153300002 0.62650001
+vn 0.795799971 -0.0476000011 0.603699982
+vn 0.791000009 -0.0142000001 0.611599982
+vn 0.75849998 -0.0891999975 0.645500004
+vn 0.625999987 -0.0310999993 0.779200017
+vn 0.774200022 -0.41170001 0.480800003
+vn 0.661199987 -0.548099995 0.512300014
+vn 0.767799973 -0.262899995 0.584299982
+vn 0.703000009 -0.191599995 0.684899986
+vn 0.735899985 -0.145899996 0.661199987
+vn 0.485900015 -0.709599972 0.510200024
+vn 0.259000003 -0.755900025 0.601300001
+vn 0.370200008 -0.738799989 0.563199997
+vn 0.564800024 -0.62650001 0.537100017
+vn -0.0658999979 -0.813899994 0.577300012
+vn -0.157199994 -0.733200014 0.661599994
+vn -0.124499999 -0.743900001 0.656599998
+vn 0.0844999999 -0.871399999 0.483200014
+vn -0.275099993 -0.708999991 0.649399996
+vn -0.281199992 -0.742299974 0.608299971
+vn -0.207100004 -0.609700024 0.765100002
+vn -0.266600013 -0.780200005 0.565800011
+vn -0.250800014 -0.746800005 0.61589998
+vn -0.131600007 -0.790099978 0.59859997
+vn 0.00400000019 -0.791400015 0.611199975
+vn -0.242799997 -0.74940002 0.61589998
+vn -0.266900003 -0.69690001 0.665700018
+vn -0.295399994 -0.717899978 0.630299985
+vn 0.28670001 -0.715200007 0.637399971
+vn 0.228499994 -0.647300005 0.727199972
+vn 0.190799996 -0.664200008 0.722800016
+vn 0.0961000025 -0.704699993 0.703000009
+vn 0.0922000036 -0.58890003 0.802900016
+vn 0.0803999975 -0.600000024 0.796000004
+vn 0.111900002 -0.565800011 0.816900015
+vn 0.119099997 -0.532400012 0.838100016
+vn 0.0758000016 -0.4472 0.891200006
+vn -0.137199998 -0.673799992 0.726100028
+vn -0.0436999984 -0.630299985 0.775099993
+vn -0.234099999 -0.549199998 0.802200019
+vn 0.00260000001 -0.601899981 0.798600018
+vn -0.0293000005 -0.513300002 0.85769999
+vn -0.432700008 -0.523599982 0.733900011
+vn -0.39199999 -0.578800023 0.71509999
+vn -0.422100008 -0.430900007 0.797500014
+vn -0.324600011 -0.600600004 0.730700016
+vn -0.55250001 -0.260399997 0.791800022
+vn -0.557600021 -0.31220001 0.769200027
+vn -0.467299998 -0.245800003 0.849300027
+vn -0.564599991 -0.395700008 0.724300027
+vn -0.520399988 -0.120899998 0.845300019
+vn -0.536199987 -0.0956000015 0.83859998
+vn -0.569400012 -0.136500001 0.810699999
+vn -0.577899992 -0.166600004 0.798900008
+vn -0.571200013 -0.187199995 0.799199998
+vn -0.493099988 0.0467999987 0.868700027
+vn -0.501600027 -0.0055999998 0.865100026
+vn -0.375 0.0118000004 0.926999986
+vn -0.497500002 -0.0791999996 0.863799989
+vn -0.500800014 -0.0522000007 0.864000022
+vn -0.332899988 0.196999997 0.922100008
+vn -0.36680001 0.158800006 0.916700006
+vn -0.254000008 0.103100002 0.961700022
+vn -0.425099999 0.142299995 0.893899977
+vn -0.179700002 0.257800013 0.949299991
+vn -0.158800006 0.251100004 0.95480001
+vn -0.227500007 0.274300009 0.934400022
+vn -0.25819999 0.248300001 0.933600008
+vn -0.264499992 0.208900005 0.941500008
+vn -0.247199997 0.1954 0.949100018
+vn -0.188899994 0.0540000014 0.980499983
+vn -0.150199994 0.219500005 0.963999987
+vn -0.165299997 0.299499989 0.939700007
+vn -0.290100008 -0.0546000004 0.95539999
+vn -0.176799998 -0.141599998 0.973999977
+vn -0.206300005 -0.00109999999 0.978500009
+vn -0.280800015 -0.330500007 0.90109998
+vn -0.147799999 -0.287499994 0.94630003
+vn 0.0311999992 -0.314200014 0.948800027
+vn 0.0555000007 -0.376199991 0.924899995
+vn -0.0438000001 -0.356599987 0.933200002
+vn -0.0520000011 -0.395599991 0.916899979
+vn -0.0759000033 -0.38440001 0.920099974
+vn -0.0143999998 -0.381900012 0.924099982
+vn 0.0163000003 -0.357300013 0.933799982
+vn 0.0167999994 -0.248199999 0.968599975
+vn -0.190599993 -0.387400001 0.90200001
+vn -0.245900005 -0.33919999 0.907999992
+vn -0.284200013 -0.268900007 0.920300007
+vn -0.147 -0.364600003 0.919499993
+vn -0.1338 -0.27759999 0.951300025
+vn -0.424499989 -0.306699991 0.851899981
+vn -0.442699999 -0.299800009 0.845000029
+vn -0.392399997 -0.335799992 0.856299996
+vn -0.349000007 -0.33919999 0.873600006
+vn -0.543600023 -0.254000008 0.800000012
+vn -0.543099999 -0.218999997 0.810599983
+vn -0.525699973 -0.279799998 0.803300023
+vn -0.480100006 -0.264699996 0.836300015
+vn -0.4208 -0.201100007 0.884599984
+vn -0.66869998 -0.0579999983 0.74119997
+vn -0.608399987 -0.116899997 0.785000026
+vn -0.572300017 0.0461999997 0.818700016
+vn -0.577899992 -0.159899995 0.800300002
+vn -0.502499998 -0.1259 0.855400026
+vn -0.609899998 0.244499996 0.753799975
+vn -0.645600021 0.185699999 0.740700006
+vn -0.50940001 0.254400015 0.822099984
+vn -0.647700012 0.116800003 0.752900004
+vn -0.354699999 0.432900012 0.828700006
+vn -0.409200013 0.423200011 0.808399975
+vn -0.323599994 0.342400014 0.882099986
+vn -0.507799983 0.409799993 0.757700026
+vn -0.208199993 0.448900014 0.869000018
+vn -0.237800002 0.471500009 0.84920001
+vn -0.189500004 0.353599995 0.916000009
+vn -0.271400005 0.478100002 0.835300028
+vn -0.289700001 0.476500005 0.8301
+vn -0.264999986 0.445100009 0.855400026
+vn -0.254200011 0.317799985 0.913500011
+vn -0.188299999 0.392699987 0.900200009
+vn -0.180999994 0.460599989 0.869000018
+vn -0.426800013 0.301999986 0.852400005
+vn -0.374900013 0.296200007 0.878400028
+vn -0.369599998 0.371199995 0.851800025
+vn -0.405600011 0.389699996 0.826799989
+vn -0.431499988 0.415499985 0.800800025
+vn -0.407999992 0.355500013 0.840900004
+vn -0.384499997 0.315899998 0.867399991
+vn -0.311100006 0.270099998 0.911199987
+vn -0.26789999 0.591099977 0.760800004
+vn -0.31189999 0.502099991 0.806599975
+vn -0.114200003 0.537800014 0.835300028
+vn -0.297399998 0.430400014 0.852299988
+vn -0.260899991 0.394199997 0.881200016
+vn 0.0724000037 0.655600011 0.751699984
+vn -0.0046000001 0.65109998 0.759000003
+vn 0.108000003 0.537599981 0.836300015
+vn -0.069600001 0.628799975 0.774399996
+vn 0.305999994 0.501999974 0.808899999
+vn 0.291299999 0.430400014 0.854300022
+vn 0.255100012 0.394499987 0.882799983
+vn 0.262600005 0.591400027 0.762499988
+vn 0.378800005 0.315100014 0.870199978
+vn 0.381599993 0.299800009 0.874300003
+vn 0.393000007 0.352299988 0.849399984
+vn 0.399300009 0.389400005 0.829999983
+vn 0.357499987 0.395300001 0.846099973
+vn 0.363700002 0.370900005 0.854499996
+vn 0.364100009 0.293599993 0.883899987
+vn 0.247899994 0.317000002 0.915400028
+vn 0.414200008 0.298900008 0.859700024
+vn 0.201399997 0.4903 0.84799999
+vn 0.172800004 0.425799996 0.888199985
+vn 0.205200002 0.305599988 0.929799974
+vn 0.264099985 0.438600004 0.859000027
+vn 0.265399992 0.478500009 0.837000012
+vn 0.283699989 0.492000014 0.823000014
+vn 0.2315 0.472000003 0.850700021
+vn 0.202299997 0.481099993 0.852999985
+vn 0.183799997 0.397700012 0.898899972
+vn 0.503700018 0.41080001 0.75999999
+vn 0.548099995 0.300500005 0.780600011
+vn 0.403800011 0.422300011 0.811500013
+vn 0.349000007 0.48120001 0.804199994
+vn 0.317400008 0.342799991 0.884199977
+vn 0.678600013 0.121600002 0.724399984
+vn 0.638100028 0.189899996 0.746100008
+vn 0.567099988 0.0487999991 0.8222
+vn 0.597800016 0.244499996 0.763499975
+vn 0.557600021 -0.193100005 0.807399988
+vn 0.515900016 -0.182300001 0.837000012
+vn 0.592499971 -0.145799994 0.792299986
+vn 0.663699985 -0.0724000037 0.744499981
+vn 0.443199992 -0.293099999 0.847100019
+vn 0.48120001 -0.291599989 0.826699972
+vn 0.372599989 -0.230199993 0.898999989
+vn 0.513300002 -0.275299996 0.812900007
+vn 0.528100014 -0.262899995 0.807399988
+vn 0.484699994 -0.252499998 0.837400019
+vn 0.457300007 -0.332300007 0.824899971
+vn 0.402700007 -0.164000005 0.9005
+vn 0.360300004 -0.180800006 0.915099978
+vn 0.435499996 -0.332199991 0.836600006
+vn 0.60860002 -0.053199999 0.791700006
+vn 0.485799998 -0.0631999969 0.871800005
+vn 0.431899995 -0.0872000009 0.897700012
+vn 0.528100014 -0.139799997 0.837599993
+vn 0.566799998 -0.1426 0.811399996
+vn 0.576699972 -0.160400003 0.801100016
+vn 0.549399972 -0.109999999 0.828299999
+vn 0.553600013 -0.0758000016 0.829299986
+vn 0.421400011 -0.0954999998 0.901799977
+vn 0.567099988 -0.389400005 0.725799978
+vn 0.471700013 -0.462799996 0.750500023
+vn 0.552999973 -0.293799996 0.779699981
+vn 0.500800014 -0.243000001 0.830799997
+vn 0.510399997 -0.2192 0.831499994
+vn 0.319000006 -0.597100019 0.736000001
+vn 0.378199995 -0.567700028 0.73119998
+vn 0.230299994 -0.554899991 0.799399972
+vn 0.434500009 -0.52640003 0.730799973
+vn -0.00949999969 -0.601999998 0.798500001
+vn -0.00960000046 -0.560899973 0.827799976
+vn 0.0414000005 -0.626100004 0.778599977
+vn 0.132300004 -0.673500001 0.727199972
+vn -0.124799997 -0.532500029 0.837199986
+vn -0.116999999 -0.565800011 0.816200018
+vn -0.0821999982 -0.447699994 0.890399992
+vn -0.0947000012 -0.584999979 0.805499971
+vn -0.155399993 -0.677699983 0.718800008
+vn -0.0414999984 -0.549199998 0.834599972
+vn -0.0698999986 -0.558399975 0.826699972
+vn 0.00359999994 -0.574400008 0.818599999
+vn -0.154400006 -0.560400009 0.81370002
+vn -0.0388999991 -0.425900012 0.903900027
+vn -0.161300004 -0.539499998 0.826399982
+vn 0.153799996 -0.539499998 0.827799976
+vn 0.100699998 -0.478700012 0.872200012
+vn 0.0516999997 -0.505200028 0.861400008
+vn -0.00150000001 -0.470099986 0.882600009
+vn -0.0159000009 -0.48120001 0.87650001
+vn 0.0225000009 -0.448700011 0.893400013
+vn 0.0438000001 -0.429800004 0.901899993
+vn 0.0320999995 -0.386599988 0.921700001
+vn -0.160300002 -0.521399975 0.838100016
+vn -0.100100003 -0.50940001 0.854700029
+vn -0.221300006 -0.47330001 0.852599978
+vn -0.0617999993 -0.498800009 0.864499986
+vn -0.0729999989 -0.452899992 0.888599992
+vn -0.348500013 -0.445899993 0.824400008
+vn -0.323799998 -0.485399991 0.812099993
+vn -0.34830001 -0.389999986 0.852400005
+vn -0.275999993 -0.493299991 0.824899971
+vn -0.4278 -0.274500012 0.861199975
+vn -0.422300011 -0.311300009 0.851300001
+vn -0.382800013 -0.262800008 0.885699987
+vn -0.413700014 -0.360300004 0.836099982
+vn -0.406300008 -0.162499994 0.899200022
+vn -0.406699985 -0.147799999 0.901499987
+vn -0.4384 -0.181899995 0.880200028
+vn -0.429899991 -0.225999996 0.874100029
+vn -0.428499997 -0.212400004 0.878199995
+vn -0.365500003 -0.0476000011 0.9296
+vn -0.390300006 -0.070600003 0.917999983
+vn -0.304699987 -0.0500999987 0.951099992
+vn -0.387400001 -0.108499996 0.915499985
+vn -0.36559999 -0.135499999 0.920899987
+vn -0.255600005 0.063000001 0.964699984
+vn -0.292600006 0.0494999997 0.954900026
+vn -0.212899998 0.0243999995 0.976800025
+vn -0.315600008 0.0146000003 0.948800027
+vn -0.116099998 0.128099993 0.984899998
+vn -0.105099998 0.141000003 0.984399974
+vn -0.160600007 0.135199994 0.977699995
+vn -0.186399996 0.100599997 0.977299988
+vn -0.194600001 0.0667999983 0.978600025
+vn -0.126200005 0.0883999988 0.988099992
+vn -0.114799999 0.0295000002 0.992999971
+vn -0.0807000026 0.1175 0.989799976
+vn -0.0847000033 0.146799996 0.985499978
+vn -0.0896999985 0.153899997 0.984000027
+vn -0.148000002 -0.0573999994 0.987299979
+vn -0.115900002 -0.0640999973 0.99119997
+vn -0.124200001 -0.0298999995 0.99180001
+vn -0.132499993 0.0092000002 0.991100013
+vn -0.0839999989 -0.152700007 0.984700024
+vn -0.0776000023 -0.119199999 0.989799976
+vn -0.1241 -0.111699998 0.986000001
+vn 0.0337000005 -0.219400004 0.975000024
+vn 0.0333000012 -0.221100003 0.974699974
+vn 0.0260000005 -0.187700003 0.981899977
+vn -0.0192000009 -0.201199993 0.979399979
+vn 0.0487999991 0.0254999995 0.99849999
+vn -0.0803000033 -0.237000003 0.968200028
+vn -0.1017 -0.238499999 0.965799987
+vn -0.0414999984 -0.226300001 0.973200023
+vn -0.00760000013 -0.216700003 0.976199985
+vn 0.00289999996 -0.170399994 0.985400021
+vn -0.235499993 -0.225999996 0.945200026
+vn -0.196500003 -0.255899996 0.946500003
+vn -0.266799986 -0.183699995 0.946099997
+vn -0.159500003 -0.237599999 0.958199978
+vn -0.146799996 -0.190899998 0.970600009
+vn -0.367399991 -0.187399998 0.911000013
+vn -0.380899996 -0.182999998 0.906300008
+vn -0.345999986 -0.217500001 0.912699997
+vn -0.310099989 -0.213599995 0.926400006
+vn -0.452800006 -0.130400002 0.882000029
+vn -0.445100009 -0.159799993 0.881099999
+vn -0.449200004 -0.102300003 0.887600005
+vn -0.41080001 -0.153999999 0.898599982
+vn -0.377099991 -0.128199995 0.917299986
+vn -0.527499974 -0.00480000023 0.849600017
+vn -0.505500019 -0.0469999984 0.861599982
+vn -0.494800001 0.054299999 0.867299974
+vn -0.488299996 -0.0790999979 0.869099975
+vn -0.44690001 -0.065200001 0.892199993
+vn -0.503199995 0.180600002 0.845099986
+vn -0.53490001 0.146599993 0.832099974
+vn -0.448900014 0.195899993 0.871800005
+vn -0.529600024 0.100000001 0.842299998
+vn -0.340499997 0.310000002 0.887700021
+vn -0.377900004 0.295700014 0.877399981
+vn -0.319599986 0.266000003 0.909399986
+vn -0.431800008 0.270599991 0.860400021
+vn -0.205599993 0.319000006 0.925199986
+vn -0.236399993 0.321099997 0.917100012
+vn -0.187600002 0.277200013 0.942300022
+vn -0.290499985 0.323399991 0.900600016
+vn -0.271100014 0.323500007 0.906599998
+vn -0.207300007 0.305900007 0.929199994
+vn -0.211099997 0.256999999 0.943099976
+vn -0.171399996 0.289099991 0.941799998
+vn -0.169 0.316700011 0.933300018
+vn -0.170300007 0.307900012 0.936100006
+vn -0.28639999 0.240199998 0.92750001
+vn -0.29339999 0.244499996 0.924199998
+vn -0.25909999 0.232999995 0.937300026
+vn -0.25819999 0.270000011 0.927600026
+vn -0.259200007 0.338200003 0.904699981
+vn -0.262400001 0.361099988 0.894800007
+vn -0.266600013 0.304100007 0.914600015
+vn -0.273400009 0.273900002 0.922100008
+vn -0.239299998 0.242799997 0.940100014
+vn -0.159299999 0.472900003 0.866599977
+vn -0.197099999 0.430799991 0.880599976
+vn -0.0800999999 0.465600014 0.881399989
+vn -0.193599999 0.382699996 0.903400004
+vn -0.188999996 0.3662 0.91109997
+vn 0.0412000008 0.520399988 0.852900028
+vn -0.00139999995 0.533599973 0.845799983
+vn 0.0737999976 0.465700001 0.881900012
+vn -0.0469000004 0.512899995 0.857200027
+vn 0.190899998 0.430900007 0.882000029
+vn 0.187299997 0.382699996 0.904699981
+vn 0.182999998 0.366400003 0.912299991
+vn 0.153300002 0.473100007 0.867500007
+vn 0.268299997 0.273200005 0.923799992
+vn 0.277500004 0.261000007 0.924600005
+vn 0.25999999 0.304100007 0.916499972
+vn 0.238999993 0.352999985 0.904600024
+vn 0.252700001 0.338200003 0.906499982
+vn 0.251599997 0.270099998 0.929400027
+vn 0.205400005 0.256199986 0.944599986
+vn 0.252299994 0.232999995 0.939199984
+vn 0.279700011 0.240199998 0.9296
+vn 0.287099987 0.2447 0.926100016
+vn 0.162200004 0.303499997 0.938899994
+vn 0.137700006 0.180399999 0.97390002
+vn 0.162900001 0.298400015 0.940400004
+vn 0.286300004 0.346899986 0.893100023
+vn 0.264600009 0.323700011 0.908399999
+vn 0.230199993 0.321099997 0.91869998
+vn 0.199200004 0.327600002 0.923600018
+vn 0.181799993 0.293799996 0.938399971
+vn 0.425799996 0.270999998 0.863300025
+vn 0.371600002 0.295899987 0.879999995
+vn 0.451200008 0.2051 0.868499994
+vn 0.334699988 0.318100005 0.887000024
+vn 0.313600004 0.266099989 0.911499977
+vn 0.531000018 0.104000002 0.841000021
+vn 0.530499995 0.147499993 0.834699988
+vn 0.489600003 0.0560000017 0.870199978
+vn 0.497299999 0.182500005 0.848200023
+vn 0.470800012 -0.101000004 0.876399994
+vn 0.492399991 -0.0666000023 0.867799997
+vn 0.437400013 -0.0903000012 0.894699991
+vn 0.520500004 -0.0133999996 0.853699982
+vn 0.365500003 -0.1928 0.910600007
+vn 0.392199993 -0.1752 0.902999997
+vn 0.326499999 -0.171100006 0.9296
+vn 0.438499987 -0.143299997 0.887300014
+vn 0.422399998 -0.155399993 0.893000007
+vn 0.333200008 -0.140900001 0.932200015
+vn 0.234599993 -0.119599998 0.964699984
+vn 0.328099996 -0.205599993 0.921999991
+vn 0.344199985 -0.222299993 0.912199974
+vn 0.378899992 -0.0850000009 0.921500027
+vn 0.360100001 -0.0931999981 0.928300023
+vn 0.361499995 -0.0917999968 0.9278
+vn 0.379299998 -0.124499999 0.916899979
+vn 0.445100009 -0.2007 0.872699976
+vn 0.417499989 -0.185599998 0.889500022
+vn 0.404199988 -0.152199998 0.901899993
+vn 0.400599986 -0.119800001 0.908399999
+vn 0.346899986 -0.1162 0.930700004
+vn 0.411900014 -0.355100006 0.83920002
+vn 0.41870001 -0.300099999 0.85710001
+vn 0.353199989 -0.397000015 0.847100019
+vn 0.388799995 -0.261500001 0.883400023
+vn 0.389200002 -0.247600004 0.887199998
+vn 0.272300005 -0.493200004 0.826200008
+vn 0.309500009 -0.473699987 0.824500024
+vn 0.216399997 -0.4745 0.853299975
+vn 0.341800004 -0.44749999 0.826399982
+vn 0.056499999 -0.499300003 0.864600003
+vn 0.0948000029 -0.510100007 0.854900002
+vn 0.0593999997 -0.465000004 0.883300006
+vn 0.155200005 -0.521899998 0.838800013
+vn -0.0498999991 -0.429899991 0.901499987
+vn -0.0283000004 -0.448799998 0.89319998
+vn -0.0386000015 -0.386999995 0.921299994
+vn -0.00430000015 -0.469700009 0.882799983
+vn 0.0291000009 -0.456900001 0.888999999
+vn 0.00120000006 -0.432599992 0.901600003
+vn -0.0151000004 -0.287099987 0.957799971
+vn -0.0644999966 -0.391299993 0.917999983
+vn -0.0803000033 -0.419400007 0.904299974
+vn 0.0684999973 -0.407200009 0.91079998
+vn 0.0746000037 -0.41960001 0.904600024
+vn 0.0491999984 -0.387199998 0.920700014
+vn 0.0307 -0.412600011 0.910399973
+vn -0.137899995 -0.29550001 0.945299983
+vn -0.126900002 -0.334899992 0.933700025
+vn -0.156900004 -0.309399992 0.937900007
+vn -0.0988000035 -0.32280001 0.941299975
+vn -0.126499996 -0.256199986 0.958299994
+vn -0.0872000009 -0.27759999 0.956700027
+vn -0.112099998 -0.292899996 0.949500024
+vn -0.0886000022 -0.30399999 0.948499978
+vn -0.107000001 -0.278899997 0.954400003
+vn -0.0443000011 -0.326499999 0.944199979
+vn -0.0560000017 -0.256599993 0.964900017
+vn -0.0807000026 -0.249799997 0.964900017
+vn -0.0483000018 -0.241500005 0.969200015
+vn -0.0710999966 -0.263000011 0.962199986
+vn -0.0873999968 -0.268700004 0.959200025
+vn -0.0727000013 -0.237399995 0.968699992
+vn -0.0527000017 -0.225400001 0.972800016
+vn -0.0357999988 -0.229699999 0.972599983
+vn -0.0190999992 -0.219099998 0.975499988
+vn -0.0183000006 -0.226899996 0.973699987
+vn -0.00769999996 -0.224099994 0.9745
+vn -0.0286999997 -0.234999999 0.971599996
+vn -0.158500001 -0.325700015 0.932099998
+vn -0.1382 -0.30430001 0.942499995
+vn -0.161899999 -0.297100008 0.940999985
+vn -0.139200002 -0.281399995 0.949400008
+vn -0.191100001 -0.321799994 0.927299976
+vn -0.183200002 -0.320899993 0.929199994
+vn -0.185399994 -0.311399996 0.931999981
+vn -0.174099997 -0.3204 0.931100011
+vn -0.203600004 -0.322100013 0.924499989
+vn -0.200399995 -0.314099997 0.927999973
+vn -0.207599998 -0.317499995 0.925199986
+vn -0.198899999 -0.323199987 0.925199986
+vn -0.197099999 -0.326900005 0.924300015
+vn -0.209600002 -0.307200015 0.928300023
+vn -0.218600005 -0.319799989 0.921899974
+vn -0.201900005 -0.295399994 0.933799982
+vn -0.2148 -0.30219999 0.92869997
+vn -0.211400002 -0.294499993 0.931999981
+vn -0.181899995 -0.297699988 0.93720001
+vn -0.205300003 -0.226899996 0.952000022
+vn -0.199300006 -0.210800007 0.957000017
+vn -0.198599994 -0.204699993 0.958400011
+vn -0.195800006 -0.240099996 0.950800002
+vn -0.195700005 -0.221100003 0.95539999
+vn -0.207200006 -0.246000007 0.94690001
+vn -0.202700004 -0.261400014 0.943700016
+vn -0.183799997 -0.260399997 0.947799981
+vn -0.205500007 -0.279199988 0.938000023
+vn -0.213499993 -0.265100002 0.940299988
+vn -0.2139 -0.281300008 0.935500026
+vn -0.188700005 -0.2773 0.942099988
+vn -0.179800004 -0.168400005 0.969200015
+vn -0.183799997 -0.178599998 0.966600001
+vn -0.186800003 -0.188500002 0.964100003
+vn -0.174600005 -0.175500005 0.968900025
+vn -0.180700004 -0.201900005 0.962599993
+vn -0.194499999 -0.192499995 0.961799979
+vn -0.160099998 -0.147200003 0.976100028
+vn -0.170599997 -0.143199995 0.974900007
+vn -0.173099995 -0.152999997 0.972899973
+vn -0.157000005 -0.135900006 0.978200018
+vn -0.179299995 -0.154699996 0.971599996
+vn -0.158299997 -0.165999994 0.97329998
+vn -0.113600001 -0.0930000022 0.989199996
+vn -0.0746999979 -0.0852999985 0.993499994
+vn -0.0793000013 -0.116400003 0.99000001
+vn -0.119599998 -0.1096 0.986800015
+vn -0.0476999991 -0.0929000005 0.994499981
+vn -0.107000001 -0.0601000004 0.992399991
+vn -0.0263 -0.0590999983 0.997900009
+vn -0.00480000023 -0.0518000014 0.998600006
+vn 0.00549999997 -0.0454000011 0.999000013
+vn -0.0219999999 -0.0647 0.997699976
+vn -0.0401000008 -0.0627999976 0.997200012
+vn -0.060800001 -0.0577000007 0.996500015
+vn -0.0816999972 -0.0678000003 0.994400024
+vn -0.0553000011 -0.0951000005 0.993900001
+vn -0.102899998 -0.106600001 0.989000022
+vn -0.0861999989 -0.109499998 0.990199983
+vn -0.115699999 -0.124799997 0.985400021
+vn -0.0965000018 -0.118500002 0.988300025
+vn -0.129999995 -0.114799999 0.984799981
+vn -0.135100007 -0.134000003 0.981700003
+vn -0.126000002 -0.147400007 0.981000006
+vn -0.108000003 -0.147100002 0.983200014
+vn -0.147200003 -0.144500002 0.978500009
+vn -0.143199995 -0.126300007 0.981599987
+vn 0.0379000008 -0.0287999995 0.998899996
+vn 0.0447000004 -0.0287999995 0.998600006
+vn 0.0392999984 -0.0240000002 0.998899996
+vn 0.0355000012 -0.0350000001 0.99879998
+vn 0.0487999991 -0.0156999994 0.998700023
+vn 0.0610999987 -0.0364999995 0.997500002
+vn 0.0452000014 -0.0456000008 0.997900009
+vn 0.0311999992 -0.0427000001 0.998600006
+vn 0.0216000006 -0.0441000015 0.99879998
+vn 0.0573000014 -0.0595999993 0.996599972
+vn 0.0283000004 -0.0593000017 0.997799993
+vn 0.0164999999 -0.0423999988 0.999000013
+vn 0.0109000001 -0.0671000034 0.997699976
+vn 0.0540000014 -0.00039999999 0.99849999
+vn 0.0649999976 -0.0167999994 0.997699976
+vn 0.0262000002 0.0057000001 0.999599993
+vn 0.0408000015 -0.00260000001 0.999199986
+vn 0.0450999998 0.0100999996 0.998899996
+vn 0.0201999992 -9.99999975e-05 0.999800026
+vn 0.0294000003 -0.00179999997 0.999599993
+vn 0.0120999999 -0.00270000007 0.999899983
+vn 0.0310999993 0.0199999996 0.999300003
+vn 0.00190000003 -0.000199999995 1
+vn -0.00999999978 -0.0118000004 0.999899983
+vn 0.0122999996 0.00949999969 0.999899983
+vn -0.0120000001 -0.00410000002 0.999899983
+vn -0.0405000001 -0.0164999999 0.999000013
+vn -0.0621999986 -0.0239000004 0.997799993
+vn -0.0819000006 -0.00810000021 0.996599972
+vn -0.0197999999 -0.00689999992 0.999800026
+vn -0.0377999991 -0.00639999984 0.999300003
+vn -0.116999999 -0.0263999999 0.992799997
+vn -0.0952999964 -0.0304000005 0.995000005
+vn -0.123599999 -0.0220999997 0.9921
+vn -0.150000006 -0.0331999995 0.988099992
+vn -0.0913000032 0.00200000009 0.995800018
+vn -0.0606999993 -0.0233999994 0.997900009
+vn -0.0754999965 -0.0157999992 0.996999979
+vn -0.050999999 -0.00769999996 0.998700023
+vn -0.0104999999 0.0162000004 0.999800026
+vn 0.0104999999 0.0233999994 0.99970001
+vn 0.0278999992 0.0390999988 0.99879998
+vn -0.151299998 -0.00719999988 0.988499999
+vn -0.133000001 -0.00419999985 0.991100013
+vn -0.146799996 0.00680000009 0.989199996
+vn -0.155900002 -0.0220999997 0.987500012
+vn -0.135399997 -0.0291000009 0.990400016
+vn -0.167699993 -0.0500000007 0.984600008
+vn -0.121399999 -0.00769999996 0.992600024
+vn -0.1083 0.00389999989 0.994099975
+vn -0.105700001 -0.0120999999 0.994300008
+vn -0.0878999978 -0.0055999998 0.996100008
+vn -0.191400006 -0.0461999997 0.980400026
+vn -0.181199998 -0.0280000009 0.983099997
+vn -0.204899997 -0.00579999993 0.978799999
+vn -0.229499996 -0.0252 0.97299999
+vn -0.213799998 -0.0245999992 0.976599991
+vn -0.225799993 -0.0164000001 0.973999977
+vn -0.204899997 -0.0131999999 0.978699982
+vn -0.183599994 -0.0165999997 0.982900023
+vn -0.269400001 -0.0108000003 0.963
+vn -0.262899995 -0.00540000014 0.9648
+vn -0.274599999 -0.00359999994 0.961499989
+vn -0.282000005 0.00549999997 0.959399998
+vn -0.255400002 -0.0153000001 0.966700017
+vn -0.245499998 -0.00970000029 0.969399989
+vn -0.240600005 -0.0197999999 0.970399976
+vn -0.309100002 0.0208999999 0.950800002
+vn -0.316199988 0.0274999999 0.948300004
+vn -0.312700003 0.0500000007 0.948499978
+vn -0.298700005 0.0208000001 0.954100013
+vn -0.288300008 0.0144999996 0.957400024
+vn -0.2764 0.0127999997 0.961000025
+vn -0.307500005 0.0421000011 0.950600028
+vn -0.32249999 0.0439000018 0.945500016
+vn -0.328900009 0.0445000008 0.943300009
+vn -0.33070001 0.0590000004 0.941900015
+vn -0.316199988 0.0599999987 0.946799994
+vn -0.34009999 0.0702999979 0.93779999
+vn -0.328599989 0.0693000033 0.941900015
+vn -0.338999987 0.0614 0.938799977
+vn -0.336100012 0.0516999997 0.940400004
+vn -0.339700013 0.0859000012 0.936600029
+vn -0.339899987 0.079400003 0.937099993
+vn -0.329400003 0.0872000009 0.940199971
+vn -0.338499993 0.0901999995 0.936600029
+vn -0.331800014 0.0715999976 0.940599978
+vn -0.333600014 0.074500002 0.939800024
+vn -0.333900005 0.0948000029 0.93779999
+vn -0.325700015 0.0961000025 0.940599978
+vn -0.315299988 0.0962999985 0.944100022
+vn -0.304899991 0.0948000029 0.947600007
+vn -0.293000013 0.100400001 0.950800002
+vn -0.314700007 0.0785000026 0.945900023
+vn -0.193299994 0.0759000033 0.978200018
+vn -0.182999998 0.149599999 0.971700013
+vn -0.164000005 0.1294 0.977900028
+vn -0.211799994 0.126300007 0.969099998
+vn -0.235499993 0.0980999991 0.966899991
+vn -0.216900006 0.0848999992 0.972500026
+vn -0.197899997 0.138400003 0.970399976
+vn -0.2333 0.145199999 0.961499989
+vn -0.209099993 0.113200001 0.971300006
+vn -0.251700014 0.107600003 0.961799979
+vn -0.249699995 0.175799996 0.952199996
+vn -0.265599996 0.101999998 0.958700001
+vn -0.236900002 0.0979000032 0.966600001
+vn -0.268400013 0.0934000015 0.958800018
+vn -0.252999991 0.0910999998 0.963199973
+vn -0.282400012 0.0807999969 0.955900013
+vn -0.279799998 0.1052 0.954299986
+vn -0.296499997 0.0806000009 0.951600015
+vn -0.123800002 0.125200003 0.984399974
+vn -0.1193 0.119099997 0.985700011
+vn -0.117399998 0.127000004 0.984899998
+vn -0.130600005 0.1219 0.983900011
+vn -0.135600001 0.113600001 0.984200001
+vn -0.153099999 0.115800001 0.981400013
+vn -0.144199997 0.1219 0.981999993
+vn -0.163900003 0.119000003 0.979300022
+vn -0.173999995 0.1052 0.979099989
+vn -0.107500002 0.111199997 0.987999976
+vn -0.1039 0.1329 0.985700011
+vn -0.112400003 0.126499996 0.985599995
+vn -0.0555999987 0.262600005 0.96329999
+vn -0.0621000007 0.280099988 0.958000004
+vn -0.0310999993 0.282499999 0.958800018
+vn -0.0434999987 0.245499998 0.968400002
+vn -0.0610000007 0.220599994 0.973399997
+vn -0.0785000026 0.240500003 0.967499971
+vn -0.0724000037 0.264999986 0.961499989
+vn -0.064000003 0.240700006 0.968500018
+vn -0.0562999994 0.244000003 0.968100011
+vn -0.118600003 0.230499998 0.965799987
+vn -0.0768000036 0.196600005 0.977500021
+vn -0.0900999978 0.170599997 0.98119998
+vn -0.0914999992 0.187600002 0.977999985
+vn -0.0995000005 0.170399994 0.980300009
+vn -0.0816000029 0.202099994 0.976000011
+vn -0.0713 0.2245 0.971899986
+vn -0.0582000017 0.230499998 0.971300006
+vn -0.0615999997 0.205400005 0.976700008
+vn -0.0483000018 0.217700005 0.974799991
+vn -0.0829000026 0.146400005 0.985700011
+vn -0.0957000032 0.151700005 0.983799994
+vn -0.0952000022 0.129199997 0.986999989
+vn -0.0758000016 0.124899998 0.989300013
+vn -0.0808999985 0.109399997 0.990700006
+vn -0.0997999981 0.146799996 0.984099984
+vn -0.0366000012 0.299199998 0.953499973
+vn -0.0274999999 0.307700008 0.951099992
+vn -0.0192000009 0.315100014 0.948899984
+vn -0.0147000002 0.303900003 0.952600002
+vn -0.0171000008 0.290899992 0.95660001
+vn -0.0480000004 0.287999988 0.956399977
+vn -0.0206000004 0.273499995 0.961600006
+vn -0.0305000003 0.258899987 0.965399981
+vn -0.00480000023 0.344700009 0.93870002
+vn -0.00899999961 0.325100005 0.945599973
+vn 0.00200000009 0.323700011 0.946200013
+vn -0.00449999981 0.315100014 0.949000001
+vn -0.0149999997 0.32100001 0.947000027
+vn -0.0129000004 0.323599994 0.946099997
+vn 0.0131999999 0.3046 0.952400029
+vn 0.0107000005 0.3134 0.949500024
+vn 0.0294000003 0.299600005 0.953599989
+vn 0.0326000005 0.287999988 0.957099974
+vn 0.00820000004 0.32280001 0.946399987
+vn 0.0103000002 0.327499986 0.944800019
+vn 0.0593999997 0.203299999 0.977299988
+vn 0.0744000003 0.186499998 0.979600012
+vn 0.0961000025 0.182999998 0.978399992
+vn 0.0895000026 0.166999996 0.981899977
+vn -0.0623000003 0.179299995 0.98180002
+vn 0.206599995 0.263799995 0.942200005
+vn 0.0143999998 0.173600003 0.984700024
+vn 0.125499994 0.234599993 0.963999987
+vn 0.0724999979 0.233700007 0.969600022
+vn 0.0954999998 0.26789999 0.958700001
+vn 0.0454000011 0.255400002 0.965799987
+vn 0.0859000012 0.198899999 0.976300001
+vn 0.0930000022 0.234799996 0.967599988
+vn 0.0590999983 0.249300003 0.966600001
+vn 0.0654999986 0.2359 0.969600022
+vn 0.0498000011 0.270700008 0.961399972
+vn 0.107500002 0.272500008 0.956099987
+vn 0.0601000004 0.287 0.95599997
+vn 0.0280000009 0.277999997 0.960200012
+vn 0.00659999996 0.300099999 0.95389998
+vn 0.0130000003 0.281599998 0.959399998
+vn -0.00380000006 0.279100001 0.960300028
+vn 0.105700001 0.130999997 0.985700011
+vn 0.103 0.122500002 0.987100005
+vn 0.1105 0.126599997 0.985800028
+vn 0.101999998 0.136399999 0.985400021
+vn 0.0947000012 0.140200004 0.985599995
+vn 0.0861999989 0.125699997 0.988300025
+vn 0.0874999985 0.105599999 0.990499973
+vn 0.0790999979 0.142499998 0.986599982
+vn 0.0932999998 0.158299997 0.98299998
+vn 0.0975999981 0.149800003 0.983900011
+vn 0.0733999982 0.155000001 0.985199988
+vn 0.136600003 0.119099997 0.983399987
+vn 0.1479 0.125200003 0.981000006
+vn 0.157399997 0.116099998 0.980700016
+vn 0.132699996 0.106399998 0.985400021
+vn 0.1215 0.1171 0.985700011
+vn 0.118000001 0.105899997 0.987299979
+vn 0.100699998 0.101000004 0.989799976
+vn 0.1131 0.120200001 0.986299992
+vn 0.246399999 0.160999998 0.95569998
+vn 0.211300001 0.1602 0.96420002
+vn 0.232899994 0.1127 0.965900004
+vn 0.258899987 0.1061 0.960099995
+vn 0.223700002 0.0724000037 0.972000003
+vn 0.201499999 0.115599997 0.972599983
+vn 0.185000002 0.0864999965 0.978900015
+vn 0.170599997 0.137199998 0.975700021
+vn 0.185900003 0.145799994 0.971700013
+vn 0.189500004 0.130899996 0.973100007
+vn 0.154300004 0.104400001 0.982500017
+vn 0.325500011 0.0896999985 0.941299975
+vn 0.310900003 0.0895000026 0.946200013
+vn 0.322299987 0.0775000006 0.943499982
+vn 0.319599986 0.0952999964 0.942799985
+vn 0.300199986 0.0817999989 0.950399995
+vn 0.290199995 0.0971999988 0.952000022
+vn 0.307599992 0.100400001 0.946200013
+vn 0.286199987 0.104500003 0.952400029
+vn 0.280699998 0.0790000036 0.956499994
+vn 0.271200001 0.0916000009 0.958199978
+vn 0.257200003 0.0909999982 0.962100029
+vn 0.239600003 0.0949999988 0.966199994
+vn 0.216600001 0.0987000018 0.971300006
+vn 0.231999993 0.0785000026 0.969500005
+vn 0.331800014 0.0846000016 0.939499974
+vn 0.326099992 0.0829000026 0.941699982
+vn 0.333799988 0.0791999996 0.939300001
+vn 0.329699993 0.0760999992 0.940999985
+vn 0.333099991 0.0676999986 0.940500021
+vn 0.359800011 0.0734999999 0.930100024
+vn 0.324299991 0.0584000014 0.944100022
+vn 0.327399999 0.0461000018 0.943799973
+vn 0.316500008 0.0452000014 0.94749999
+vn 0.315200001 0.0296999998 0.948599994
+vn 0.332899988 0.054299999 0.941399992
+vn 0.240700006 -0.0361000001 0.969900012
+vn 0.228799999 -0.0566000007 0.971800029
+vn 0.206699997 -0.0511999987 0.977100015
+vn 0.2271 -0.0401000008 0.97299999
+vn 0.235699996 -0.0219000001 0.971599996
+vn 0.263300002 -0.0161000006 0.964600027
+vn 0.252700001 -0.0107000005 0.967499971
+vn 0.259499997 0.0148 0.965600014
+vn 0.278800011 0.00700000022 0.960300028
+vn 0.265599996 0.0110999998 0.963999987
+vn 0.302700013 0.0211999994 0.952899992
+vn 0.288899988 0.0118000004 0.957300007
+vn 0.288199991 0.0166999996 0.957400024
+vn 0.290499985 0.0326000005 0.95630002
+vn 0.306600004 0.0364000015 0.951200008
+vn 0.306699991 0.0615999997 0.949800014
+vn 0.29339999 0.0498999991 0.954699993
+vn 0.213 -0.0304000005 0.976599991
+vn 0.217700005 -0.059799999 0.97420001
+vn 0.200100005 -0.068400003 0.977400005
+vn 0.202099994 -0.0551999994 0.977800012
+vn 0.183699995 -0.0864999965 0.979200006
+vn 0.176100001 -0.0942000002 0.979900002
+vn 0.185399994 -0.0927999988 0.978299975
+vn 0.186399996 -0.0777999982 0.979399979
+vn 0.200000003 -0.0744000003 0.976999998
+vn 0.174999997 -0.0733999982 0.98180002
+vn 0.181299999 -0.0584999993 0.981700003
+vn 0.186900005 -0.120899998 0.974900007
+vn 0.179000005 -0.118600003 0.976700008
+vn 0.190200001 -0.138400003 0.971899986
+vn 0.176100001 -0.106799997 0.978600025
+vn 0.165900007 -0.119199999 0.978900015
+vn 0.182099998 -0.0993999988 0.978200018
+vn 0.201700002 -0.198200002 0.959200025
+vn 0.181199998 -0.222599998 0.957899988
+vn 0.301200002 -0.204699993 0.931299984
+vn 0.212300003 -0.240899995 0.947000027
+vn 0.217899993 -0.214399993 0.952099979
+vn 0.210600004 -0.193299994 0.958299994
+vn 0.192699999 -0.202999994 0.959999979
+vn 0.2016 -0.185299993 0.961799979
+vn 0.237000003 -0.155499995 0.958999991
+vn 0.197799996 -0.151700005 0.968400002
+vn 0.170499995 -0.174099997 0.969900012
+vn 0.178800002 -0.136000007 0.974399984
+vn 0.175899997 -0.156200007 0.971899986
+vn 0.182699993 -0.176699996 0.967199981
+vn 0.185200006 -0.193900004 0.963400006
+vn 0.162900001 -0.170399994 0.971800029
+vn 0.207100004 -0.310099989 0.927900016
+vn 0.200200006 -0.305599988 0.930899978
+vn 0.200000003 -0.315499991 0.927600026
+vn 0.200200006 -0.309300005 0.929700017
+vn 0.2095 -0.301999986 0.930000007
+vn 0.186399996 -0.314999998 0.930599988
+vn 0.199399993 -0.279300004 0.939300001
+vn 0.201100007 -0.292699993 0.934800029
+vn 0.210600004 -0.289700001 0.933600008
+vn 0.207800001 -0.269199997 0.940400004
+vn 0.190899998 -0.259499997 0.946699977
+vn 0.206699997 -0.254099995 0.944800019
+vn 0.194600001 -0.240099996 0.950999975
+vn 0.203700006 -0.242699996 0.948499978
+vn 0.199300006 -0.333000004 0.921599984
+vn 0.195899993 -0.319999993 0.926900029
+vn 0.188800007 -0.323599994 0.927200019
+vn 0.178499997 -0.321399987 0.930000007
+vn 0.182400003 -0.330500007 0.925999999
+vn 0.168799996 -0.320199996 0.932200015
+vn 0.153699994 -0.312900007 0.937300026
+vn 0.145600006 -0.308600008 0.939999998
+vn 0.168899998 -0.312999994 0.934599996
+vn 0.0568999983 -0.264299989 0.962800026
+vn 0.0939999968 -0.233899996 0.967700005
+vn 0.0441999994 -0.260199994 0.96450001
+vn 0.0346000008 -0.248899996 0.967899978
+vn 0.115400001 -0.253800005 0.960399985
+vn 0.0487000011 -0.326900005 0.943799973
+vn 0.0763000026 -0.275299996 0.958299994
+vn 0.0573999994 -0.35710001 0.932299972
+vn 0.0289999992 -0.309899986 0.950299978
+vn 0.125100002 -0.310900003 0.942200005
+vn 0.123199999 -0.287999988 0.949699998
+vn 0.117700003 -0.279300004 0.953000009
+vn 0.0839999989 -0.288500011 0.953800023
+vn 0.114 -0.299199998 0.947399974
+vn 0.0975999981 -0.294 0.950800002
+vn 0.144199997 -0.301999986 0.942300022
+vn 0.140900001 -0.281800002 0.949100018
+vn 0.0366000012 -0.220300004 0.974799991
+vn 0.0175000001 -0.226199999 0.97390002
+vn 0.0293000005 -0.240099996 0.970300019
+vn 0.0181000009 -0.206400007 0.978299975
+vn 0.00100000005 -0.215499997 0.976499975
+vn 0.056499999 -0.232700005 0.970899999
+vn 0.0700000003 -0.246399999 0.966600001
+vn 0.00329999998 -0.226500005 0.973999977
+vn -0.00300000003 -0.225899994 0.974099994
+vn 0.00910000037 -0.229499996 0.97329998
+vn 0.0285999998 -0.232800007 0.972100019
+vn -0.00540000014 -0.197300002 0.980300009
+vn -0.0214000009 -0.206400007 0.978200018
+vn 0.00139999995 0.262600005 0.964900017
+vn -0.0119000003 0.252700001 0.967499971
+vn 0.0329000019 0.259799987 0.96509999
+vn 0.0203000009 0.257299989 0.966099977
+vn 0.0104999999 0.243200004 0.969900012
+vn -0.00300000003 0.230199993 0.973100007
+vn -0.0186999999 0.240799993 0.970399976
+vn -0.0258000009 0.218700007 0.975399971
+vn -0.0353999995 0.237900004 0.970600009
+vn 0.0384000018 0.239600003 0.970099986
+vn 0.0234999992 0.230399996 0.972800016
+vn -0.0377999991 0.203999996 0.978200018
+vn -0.0593000017 0.1919 0.979600012
+vn -0.067900002 0.176400006 0.981999993
+vn -0.0126999998 0.214499995 0.976599991
+vn 0.0119000003 0.215800002 0.976400018
+vn -0.0142999999 0.191699997 0.981400013
+vn 0.00079999998 0.201800004 0.979399979
+vn 0.0410000011 0.218700007 0.974900007
+vn 0.0260000005 0.202999994 0.978799999
+vn 0.0493000001 0.201399997 0.978299975
+vn 0.068599999 0.204600006 0.976400018
+vn -0.0331000015 0.191599995 0.98089999
+vn -0.0447999984 0.178499997 0.982900023
+vn -0.0239000004 0.171100006 0.985000014
+vn 0.0127999997 0.186499998 0.9824
+vn -0.00109999999 0.172600001 0.985000014
+vn 0.0375999995 0.1866 0.981700003
+vn 0.0160000008 0.165399998 0.986100018
+vn 0.0324999988 0.167199999 0.985400021
+vn 0.056499999 0.184200004 0.981299996
+vn 0.0527000017 0.166099995 0.984700024
+vn 0.0709000006 0.174700007 0.98210001
+vn -0.0520000011 0.162300006 0.985400021
+vn -0.0318000019 0.153099999 0.987699986
+vn -0.0513999984 0.145600006 0.987999976
+vn -0.0703999996 0.158700004 0.984799981
+vn -0.0702000037 0.140300006 0.987600029
+vn -0.0141000003 0.151700005 0.988300025
+vn 0.00600000005 0.150900006 0.988499999
+vn -0.00700000022 0.136199996 0.990700006
+vn 0.0291000009 0.145899996 0.988900006
+vn 0.0524999984 0.145500004 0.987999976
+vn -0.0555000007 0.131300002 0.989799976
+vn -0.0538000017 0.115199998 0.991900027
+vn -0.0326000005 0.131099999 0.990800023
+vn -0.0179999992 0.118600003 0.992799997
+vn -0.0320999995 0.107299998 0.993700027
+vn 0.00179999997 0.117899999 0.992999971
+vn 0.0156999994 0.130999997 0.991299987
+vn 0.0381000005 0.126300007 0.991299987
+vn 0.0174000002 0.1118 0.993600011
+vn 0.0671999976 0.1303 0.989199996
+vn 0.0500999987 0.116400003 0.991900027
+vn 0.0683000013 0.1118 0.991400003
+vn -0.0654999986 0.0979000032 0.992999971
+vn -0.0450000018 0.0960000008 0.994400024
+vn -0.0573000014 0.0824000016 0.995000005
+vn -0.0812999979 0.0833000019 0.993200004
+vn -0.0908000022 0.0961999968 0.99119997
+vn -0.1065 0.0865999982 0.990499973
+vn -0.0240000002 0.0869999975 0.995899975
+vn -0.00879999995 0.100400001 0.994899988
+vn 0.0124000004 0.0927999988 0.995599985
+vn -0.0013 0.0777999982 0.996999979
+vn 0.0337000005 0.0983999968 0.994599998
+vn 0.0537 0.0974999964 0.993799984
+vn 0.0483000018 0.0781999975 0.995800018
+vn 0.0681999996 0.0923999995 0.993399978
+vn 0.0890000015 0.0865999982 0.992299974
+vn 0.113499999 0.0882000029 0.989600003
+vn -0.189300001 0.0961999968 0.977199972
+vn -0.177200004 0.0813999996 0.980799973
+vn -0.199399993 0.0851999968 0.976199985
+vn -0.219300002 0.0945999995 0.971099973
+vn -0.215499997 0.0798999965 0.973200023
+vn -0.237900004 0.0791999996 0.968100011
+vn -0.140900001 0.0952999964 0.985400021
+vn -0.158899993 0.0944000036 0.982800007
+vn -0.1963 0.0681999996 0.978200018
+vn -0.177499995 0.057599999 0.9824
+vn -0.205500007 0.0566000007 0.976999998
+vn -0.233199999 0.0636000037 0.970300019
+vn -0.226500005 0.0487000011 0.972800016
+vn -0.146200001 0.0755999982 0.986400008
+vn -0.162100002 0.0716999993 0.984200001
+vn -0.153400004 0.0542000011 0.986699998
+vn -0.124899998 0.0957999974 0.987500012
+vn -0.115000002 0.075000003 0.990499973
+vn -0.130700007 0.0709000006 0.988900006
+vn -0.107000001 0.060899999 0.992399991
+vn -0.122599997 0.0496000014 0.99119997
+vn -0.139899999 0.0494000018 0.988900006
+vn -0.0926999971 0.0693000033 0.993300021
+vn -0.0828000009 0.0551999994 0.995000005
+vn -0.0709000006 0.0672999993 0.995199978
+vn -0.0559 0.063000001 0.996399999
+vn -0.0395000018 0.0732999966 0.996500015
+vn -0.0204000007 0.0689999983 0.997399986
+vn -0.0333000012 0.0555999987 0.997900009
+vn 0.000500000024 0.0584999993 0.998300016
+vn -0.0156999994 0.0522999987 0.99849999
+vn 0.0233999994 0.0760999992 0.996800005
+vn 0.0214000009 0.060800001 0.997900009
+vn 0.0395000018 0.0615000017 0.997300029
+vn 0.0599000007 0.0593000017 0.996399999
+vn 0.0732999966 0.075000003 0.994499981
+vn 0.0961999968 0.0665000007 0.993099988
+vn 0.0747999996 0.0527999997 0.995800018
+vn 0.0930000022 0.0456000008 0.994599998
+vn 0.109800003 0.072300002 0.991299987
+vn 0.117200002 0.0538999997 0.991599977
+vn 0.137799993 0.0842999965 0.986899972
+vn 0.144899994 0.0953999981 0.984799981
+vn 0.128999993 0.0683000013 0.989300013
+vn 0.145300001 0.0577000007 0.987699986
+vn 0.176699996 0.101199999 0.979099989
+vn 0.168500006 0.0878000036 0.98180002
+vn 0.158700004 0.0722000003 0.984700024
+vn 0.177900001 0.0623000003 0.98210001
+vn 0.163000003 0.0533999987 0.985199988
+vn 0.204500005 0.0970000029 0.973999977
+vn 0.201000005 0.0817999989 0.976199985
+vn 0.191 0.0998999998 0.976499975
+vn 0.183599994 0.0803000033 0.979700029
+vn 0.199000001 0.0623999983 0.977999985
+vn -0.299299985 0.0601000004 0.952300012
+vn -0.282400012 0.0579000004 0.957599998
+vn -0.291500002 0.0395000018 0.955799997
+vn -0.280600011 0.0251000002 0.959500015
+vn -0.259900004 0.0716999993 0.963
+vn -0.262100011 0.0584000014 0.96329999
+vn -0.269800007 0.0414999984 0.962000012
+vn -0.247600004 0.0421000011 0.967899978
+vn -0.254599988 0.0241 0.966799974
+vn -0.232500002 0.0239000004 0.972299993
+vn -0.212400004 0.0357999988 0.976499975
+vn -0.187700003 0.0416000001 0.981299996
+vn -0.165199995 0.0390000008 0.985499978
+vn -0.178299993 0.0232999995 0.983699977
+vn -0.198200002 0.0270000007 0.979799986
+vn -0.143600002 0.0293000005 0.989199996
+vn -0.158399999 0.0188999996 0.987200022
+vn -0.125200003 0.0324000008 0.991599977
+vn -0.104099996 0.0265999995 0.994199991
+vn -0.1052 0.0438000001 0.993499994
+vn -0.0892999992 0.0386000015 0.995299995
+vn -0.0762000009 0.0239000004 0.996800005
+vn -0.0705000013 0.0439000018 0.996500015
+vn -0.0469999984 0.0432999991 0.998000026
+vn -0.0573000014 0.0308999997 0.997900009
+vn -0.0263 0.0344999991 0.999100029
+vn -0.0348000005 0.0175000001 0.999199986
+vn -0.00879999995 0.0357999988 0.999300003
+vn 0.00939999986 0.0417000018 0.999100029
+vn 0.0494999997 0.0461000018 0.997699976
+vn 0.0478999987 0.0315000005 0.998399973
+vn 0.0626000017 0.0245999992 0.997699976
+vn 0.0781999975 0.0262000002 0.996599972
+vn 0.111299999 0.0388999991 0.992999971
+vn 0.0957999974 0.0216000006 0.995199978
+vn 0.1219 0.0278999992 0.9921
+vn 0.136999995 0.0421999991 0.989700019
+vn 0.148800001 0.0215000007 0.988600016
+vn 0.160500005 0.0366000012 0.986400008
+vn 0.178100005 0.0395999998 0.983200014
+vn 0.174700007 0.0189999994 0.984399974
+vn 0.192300007 0.0436999984 0.980400026
+vn 0.211199999 0.0436999984 0.976499975
+vn 0.196199998 0.0249000005 0.980199993
+vn 0.217600003 0.0693999976 0.97359997
+vn 0.239999995 0.0584999993 0.968999982
+vn 0.2245 0.0494999997 0.973200023
+vn 0.235200003 0.0362999998 0.971300006
+vn 0.2139 0.0254999995 0.976499975
+vn 0.251599997 0.0754000023 0.964900017
+vn 0.261700004 0.0654999986 0.962899983
+vn 0.258100003 0.0454999991 0.964999974
+vn 0.251399994 0.0280000009 0.967499971
+vn 0.291099995 0.0681999996 0.954299986
+vn 0.275400013 0.0590000004 0.959500015
+vn 0.278699994 0.0414000005 0.959500015
+vn 0.270200014 0.0297999997 0.962300003
+vn -0.260899991 0.00939999986 0.965300024
+vn -0.242200002 0.00490000006 0.970200002
+vn -0.222399995 -0.000300000014 0.975000024
+vn -0.214499995 0.0135000004 0.976599991
+vn -0.194999993 0.00930000003 0.980799973
+vn -0.171100006 0.0037 0.985199988
+vn -0.190899998 -0.00590000022 0.981599987
+vn -0.125100002 0.0141000003 0.991999984
+vn -0.0855000019 0.0092000002 0.996299982
+vn -0.0509000011 0.0142000001 0.998600006
+vn -0.063699998 0.00930000003 0.997900009
+vn 0.0891000032 -0.00039999999 0.995999992
+vn 0.0731000006 0.00100000005 0.997300029
+vn 0.107699998 0.00829999987 0.994199991
+vn 0.131799996 0.0104999999 0.99119997
+vn 0.158000007 0.00240000011 0.987399995
+vn 0.138799995 -0.00710000005 0.9903
+vn 0.119499996 -0.00389999989 0.992799997
+vn 0.182799995 0.00159999996 0.983099997
+vn 0.201499999 0.0027999999 0.979499996
+vn 0.231999993 0.0184000004 0.972500026
+vn 0.219699994 0.00730000017 0.975499988
+vn 0.248999998 0.0111999996 0.968400002
+vn 0.237800002 -0.00209999993 0.971300006
+vn -0.167899996 -0.0116999997 0.985700011
+vn 0.0834000036 -0.0229000002 0.996299982
+vn 0.106799997 -0.0163000003 0.994099975
+vn 0.110600002 -0.0353999995 0.993200004
+vn 0.0942000002 -0.0307999998 0.995100021
+vn 0.148100004 -0.0185000002 0.988799989
+vn 0.144199997 -0.0348000005 0.988900006
+vn 0.128099993 -0.0259000007 0.991400003
+vn 0.164399996 -0.0194000006 0.986199975
+vn 0.180000007 -0.0177999996 0.983500004
+vn 0.179900005 -0.0362000018 0.98299998
+vn 0.1963 -0.0203000009 0.980300009
+vn 0.216900006 -0.0110999998 0.976100028
+vn 0.0790000036 -0.0483000018 0.995700002
+vn 0.126000002 -0.0513000004 0.990700006
+vn 0.102600001 -0.0485999994 0.993499994
+vn 0.110699996 -0.0697000027 0.991400003
+vn 0.0956000015 -0.0644000024 0.993300021
+vn 0.144800007 -0.0571999997 0.987800002
+vn 0.164199993 -0.0463999994 0.985300004
+vn 0.156399995 -0.0702999979 0.985199988
+vn 0.195800006 -0.0421000011 0.979700029
+vn 0.077200003 -0.0725999996 0.994400024
+vn 0.0688999966 -0.0917000026 0.993399978
+vn 0.0935000032 -0.0883999988 0.991699994
+vn 0.0527999997 -0.0807999969 0.995299995
+vn 0.0381999984 -0.0687000006 0.996900022
+vn 0.0280000009 -0.0822999999 0.996200025
+vn 0.1171 -0.0896999985 0.989099979
+vn 0.130700007 -0.0724000037 0.988799989
+vn 0.141100004 -0.0891000032 0.986000001
+vn 0.162400007 -0.0942000002 0.982200027
+vn 0.00789999962 -0.0864000022 0.996200025
+vn -0.00789999962 -0.0764999986 0.996999979
+vn -0.0148999998 -0.0930000022 0.995599985
+vn -0.0315999985 -0.0837000012 0.995999992
+vn 0.0164000001 -0.102799997 0.994599998
+vn 0.0406999998 -0.0983000025 0.994300008
+vn 0.0252999999 -0.1206 0.992399991
+vn -0.000699999975 -0.122400001 0.992500007
+vn -0.00179999997 -0.1061 0.994400024
+vn -0.0227000006 -0.114799999 0.993099988
+vn -0.0359000005 -0.103600003 0.994000018
+vn 0.0649000034 -0.104999997 0.992399991
+vn 0.0520000011 -0.118500002 0.991599977
+vn 0.0403000005 -0.113499999 0.992699981
+vn 0.0839999989 -0.107900001 0.99059999
+vn 0.074000001 -0.123499997 0.989600003
+vn 0.102899998 -0.104900002 0.989099979
+vn 0.121100001 -0.107500002 0.986800015
+vn 0.113300003 -0.124700002 0.985700011
+vn 0.0952000022 -0.120200001 0.988200009
+vn 0.133900002 -0.110299997 0.984799981
+vn 0.149700001 -0.1087 0.98269999
+vn -0.0516999997 -0.115900002 0.991900027
+vn -0.0713 -0.109999999 0.991400003
+vn -0.0410999991 -0.126900002 0.991100013
+vn -0.0322999991 -0.138899997 0.989799976
+vn -0.0571000017 -0.145300001 0.987699986
+vn -0.0614 -0.1294 0.989700019
+vn -0.0795999989 -0.126300007 0.988799989
+vn -0.0806000009 -0.142299995 0.986500025
+vn 0.00860000029 -0.135700002 0.990700006
+vn -0.0142000001 -0.135100007 0.990700006
+vn -0.00430000015 -0.148699999 0.988900006
+vn -0.0221999995 -0.148300007 0.988699973
+vn 0.0222999994 -0.142000005 0.989600003
+vn 0.0410999991 -0.138400003 0.989499986
+vn 0.0584999993 -0.135700002 0.989000022
+vn 0.0913000032 -0.135800004 0.986500025
+vn 0.0693999976 -0.146899998 0.986699998
+vn 0.0923999995 -0.156900004 0.983299971
+vn 0.109300002 -0.145500004 0.983299971
+vn 0.130500004 -0.130500004 0.982800007
+vn 0.151099995 -0.127499998 0.980300009
+vn 0.144899994 -0.144400001 0.978900015
+vn 0.123499997 -0.1479 0.981299996
+vn 0.161699995 -0.147 0.975799978
+vn -0.0997999981 -0.134800002 0.985800028
+vn -0.0922999978 -0.156100005 0.983399987
+vn -0.102700002 -0.173199996 0.979499996
+vn -0.0852999985 -0.176899999 0.980499983
+vn -0.116599999 -0.169400007 0.978600025
+vn -0.137600005 -0.163900003 0.976800025
+vn -0.130899996 -0.181500003 0.974600017
+vn -0.146599993 -0.182799995 0.972199976
+vn -0.0734999999 -0.159099996 0.984499991
+vn -0.063000001 -0.171499997 0.983200014
+vn -0.0432000011 -0.158700004 0.986400008
+vn -0.0215000007 -0.165399998 0.986000001
+vn -0.0340000018 -0.175300002 0.983900011
+vn -0.0500999987 -0.180700004 0.982299984
+vn -0.00590000022 -0.172299996 0.985000014
+vn 0.00899999961 -0.167400002 0.985899985
+vn 0.0167999994 -0.155000001 0.987800002
+vn 0.0408999994 -0.1558 0.986899972
+vn 0.0274999999 -0.174899995 0.984200001
+vn 0.061900001 -0.165199995 0.984300017
+vn 0.0463000014 -0.175400004 0.983399987
+vn 0.0793000013 -0.167600006 0.98269999
+vn 0.111900002 -0.170599997 0.978999972
+vn 0.0930000022 -0.184499994 0.978399992
+vn 0.132200003 -0.160500005 0.978100002
+vn 0.147200003 -0.166500002 0.975000024
+vn 0.129099995 -0.183300003 0.9745
+vn -0.1558 -0.198400006 0.967599988
+vn -0.135900006 -0.203899994 0.969500005
+vn -0.165999994 -0.189099997 0.967800021
+vn -0.119199999 -0.1919 0.974099994
+vn -0.115800001 -0.210600004 0.970700026
+vn -0.102799997 -0.195299998 0.975300014
+vn -0.0850000009 -0.198300004 0.976400018
+vn -0.0562999994 -0.198899999 0.978399992
+vn -0.071800001 -0.194499999 0.978299975
+vn -0.0370000005 -0.192900002 0.980499983
+vn -0.0205000006 -0.188600004 0.98180002
+vn -0.0379000008 -0.209399998 0.977100015
+vn 0.0114000002 -0.188899994 0.981899977
+vn 0.0351999998 -0.199499995 0.979300022
+vn 0.0441000015 -0.189899996 0.980799973
+vn 0.065700002 -0.185000002 0.980499983
+vn 0.0581 -0.202299997 0.977599978
+vn 0.0790999979 -0.191699997 0.978299975
+vn 0.0753000006 -0.212599993 0.97420001
+vn 0.0910999998 -0.210299999 0.973399997
+vn 0.114699997 -0.197699994 0.973500013
+vn 0.103100002 -0.209800005 0.972299993
+vn 0.144800007 -0.188099995 0.971400023
+vn 0.138400003 -0.205500007 0.968800008
+vn 0.157499999 -0.188600004 0.969299972
+vn 0.172499999 -0.193399996 0.965900004
+vn 0.162400007 -0.209800005 0.96420002
+vn -0.156499997 -0.216100007 0.963800013
+vn -0.131300002 -0.223399997 0.965799987
+vn -0.139799997 -0.239099994 0.960900009
+vn -0.162499994 -0.233099997 0.958800018
+vn -0.180399999 -0.221699998 0.958299994
+vn -0.107199997 -0.227899998 0.967800021
+vn -0.0973000005 -0.213400006 0.972100019
+vn -0.0864999965 -0.223900005 0.970799983
+vn -0.0689999983 -0.216399997 0.97390002
+vn 0.057500001 -0.219099998 0.973999977
+vn 0.0830999985 -0.230100006 0.969600022
+vn 0.126000002 -0.218700007 0.967599988
+vn 0.106899999 -0.229499996 0.967400014
+vn 0.151299998 -0.223199993 0.963
+vn 0.140400007 -0.238299996 0.961000025
+vn 0.124899998 -0.235300004 0.96390003
+vn 0.169599995 -0.230399996 0.958199978
+vn 0.183799997 -0.213699996 0.959399998
+vn 0.182400003 -0.236000001 0.95450002
+vn -0.175999999 -0.244900003 0.953400016
+vn -0.164299995 -0.259900004 0.951499999
+vn -0.150199994 -0.256199986 0.954900026
+vn -0.115199998 -0.242200002 0.963400006
+vn -0.130700007 -0.259900004 0.956799984
+vn -0.112000003 -0.25850001 0.959500015
+vn -0.0925000012 -0.244900003 0.96509999
+vn -0.0966999978 -0.263500005 0.959800005
+vn 0.0932999998 -0.245499998 0.964900017
+vn 0.0886000022 -0.25999999 0.961499989
+vn 0.0756999999 -0.264299989 0.961499989
+vn 0.109700002 -0.249899998 0.962000012
+vn 0.103200004 -0.264899999 0.958700001
+vn 0.122900002 -0.255199999 0.959100008
+vn 0.144999996 -0.259799987 0.954699993
+vn 0.1602 -0.246600002 0.955799997
+vn 0.169799998 -0.258899987 0.950900018
+vn -0.173099995 -0.279799998 0.944299996
+vn -0.154499993 -0.279100001 0.947799981
+vn -0.122900002 -0.275999993 0.953299999
+vn 0.123999998 -0.273600012 0.953800023
+vn 0.157900006 -0.278200001 0.947399974
+vn 0.178399995 -0.274199992 0.944999993
+vn 0.165800005 -0.293000013 0.941600025
+vn 0.1822 -0.296600014 0.9375
+vn 0.532800019 -0.676199973 -0.50880003
+vn 0.554400027 -0.715900004 -0.424400002
+vn 0.529399991 -0.591099977 -0.60860002
+vn 0.526300013 -0.793600023 -0.305400014
+vn 0.546500027 -0.783299983 -0.296400011
+vn 0.521000028 -0.675499976 -0.521799982
+vn 0.556500018 -0.781499982 -0.282200009
+vn 0.540600002 -0.785399973 -0.301400006
+vn 0.558499992 -0.664200008 -0.496800005
+vn 0.496600002 -0.668500006 -0.553600013
+vn 0.345299989 -0.861400008 -0.372399986
+vn 0.368099988 -0.742999971 -0.558899999
+vn 0.481099993 -0.815400004 -0.321999997
+vn 0.534500003 -0.667299986 -0.518599987
+vn 0.1347 -0.769699991 -0.624100029
+vn 0.0947000012 -0.898999989 -0.427700013
+vn -0.1611 -0.866100013 -0.473199993
+vn -0.102799997 -0.734000027 -0.671299994
+vn -0.349299997 -0.798799992 -0.489800006
+vn -0.269899994 -0.650399983 -0.709999979
+vn -0.511200011 -0.706799984 -0.488999993
+vn -0.420899987 -0.57099998 -0.70480001
+vn -0.547299981 -0.459699988 -0.699400008
+vn -0.649900019 -0.588400006 -0.481000006
+vn -0.771399975 -0.442999989 -0.456900001
+vn -0.673900008 -0.338800013 -0.656499982
+vn -0.871999979 -0.261400014 -0.414000005
+vn -0.776300013 -0.174899995 -0.605599999
+vn -0.852999985 -0.00999999978 -0.521799982
+vn -0.821399987 0.152999997 -0.549499989
+vn -0.943700016 0.0760999992 -0.321799994
+vn -0.941699982 0.165399998 -0.293099999
+vn -0.833100021 0.197799996 -0.516499996
+vn -0.935400009 -0.0759999976 -0.345299989
+vn -0.836300015 0.268000007 -0.478300005
+vn -0.921199977 0.260899991 -0.288500011
+vn -0.764900029 0.313800007 -0.5625
+vn -0.936200023 0.218899995 -0.275000006
+vn -0.854399979 0.245199993 -0.458099991
+vn -0.796199977 0.330900013 -0.506500006
+vn -0.921299994 0.288599998 -0.260399997
+vn -0.842400014 0.336100012 -0.421200007
+vn -0.913699985 0.328099996 -0.239800006
+vn -0.791100025 0.407499999 -0.456200004
+vn -0.857200027 0.461299986 -0.2289
+vn -0.730700016 0.476399988 -0.488999993
+vn -0.893899977 0.3847 -0.230000004
+vn -0.796899974 0.379599988 -0.469999999
+vn -0.70599997 0.549899995 -0.4463
+vn -0.815999985 0.54549998 -0.191400006
+vn -0.685599983 0.638100028 -0.350499988
+vn -0.759899974 0.633400023 -0.145999998
+vn -0.676800013 0.72390002 -0.133399993
+vn -0.597100019 0.716400027 -0.360900015
+vn -0.540899992 0.796999991 -0.268900007
+vn -0.435900003 0.823199987 -0.363799989
+vn -0.516499996 0.851199985 -0.0934000015
+vn -0.439399987 0.855599999 -0.273499995
+vn -0.593400002 0.800400019 -0.0847999975
+vn -0.47299999 0.877900004 -0.0741000026
+vn -0.399599999 0.860499978 -0.316100001
+vn -0.435000002 0.894900024 -0.100000001
+vn -0.372799993 0.830200016 -0.414499998
+vn -0.447299987 0.891099989 -0.0763000026
+vn -0.399800003 0.857800007 -0.323100001
+vn -0.405999988 0.860800028 -0.307000011
+vn -0.436699986 0.896700025 -0.0731000006
+vn -0.444099993 0.893000007 -0.0731000006
+vn -0.413399994 0.864400029 -0.286199987
+vn -0.468100011 0.880699992 -0.0729999989
+vn -0.442799985 0.829599977 -0.34009999
+vn -0.436199993 0.860199988 -0.264299989
+vn -0.532400012 0.843999982 -0.0650999993
+vn -0.511500001 0.805599988 -0.298900008
+vn -0.717000008 0.618700027 -0.32100001
+vn -0.753099978 0.653900027 -0.072300002
+vn -0.895799994 0.362300009 -0.257499993
+vn -0.926299989 0.373100013 -0.0526000001
+vn -0.918900013 0.166299999 -0.35769999
+vn -0.994899988 -0.00549999997 -0.100900002
+vn -0.952600002 0.000300000014 -0.304199994
+vn -0.979200006 0.189899996 -0.0711999983
+vn -0.933000028 -0.168300003 -0.317999989
+vn -0.927999973 -0.354000002 -0.116400003
+vn -0.872699976 -0.320100009 -0.368600011
+vn -0.981299996 -0.181400001 -0.063699998
+vn -0.816100001 -0.500400007 -0.289200008
+vn -0.717899978 -0.684899986 -0.124600001
+vn -0.668299973 -0.626299977 -0.4014
+vn -0.845499992 -0.529900014 -0.0666000023
+vn -0.535000026 -0.752900004 -0.383100003
+vn -0.404199988 -0.903400004 -0.142800003
+vn -0.397199988 -0.83039999 -0.390700012
+vn -0.562099993 -0.822399974 -0.0872000009
+vn -0.148000002 -0.923699975 -0.353300005
+vn 0.0847000033 -0.987699986 -0.131200001
+vn 0.0738999993 -0.927399993 -0.366699994
+vn -0.141000003 -0.984499991 -0.104199998
+vn 0.126900002 -0.911800027 -0.390599996
+vn 0.141599998 -0.982200027 -0.123499997
+vn 0.160799995 -0.979399979 -0.122100003
+vn 0.146699995 -0.93809998 -0.313699991
+vn 0.166500002 -0.917400002 -0.361600012
+vn 0.168400005 -0.977699995 -0.125200003
+vn 0.179700002 -0.90170002 -0.393299997
+vn 0.1646 -0.927999973 -0.334300011
+vn 0.178100005 -0.925999999 -0.332899988
+vn 0.1611 -0.979600012 -0.120200001
+vn 0.137700006 -0.981299996 -0.134499997
+vn 0.179299995 -0.901300013 -0.394199997
+vn 0.134399995 -0.902999997 -0.407999992
+vn 0.0083999997 -0.986599982 -0.162599996
+vn 0.0529000014 -0.924300015 -0.377900004
+vn 0.0882999972 -0.986100018 -0.140900001
+vn 0.159600005 -0.898400009 -0.409200013
+vn -0.0443999991 -0.910099983 -0.412099987
+vn -0.104599997 -0.978799999 -0.175999999
+vn -0.1611 -0.906300008 -0.390700012
+vn -0.221799999 -0.957199991 -0.186100006
+vn -0.313199997 -0.922999978 -0.223499998
+vn -0.2315 -0.860000014 -0.454899997
+vn -0.337700009 -0.852100015 -0.399800003
+vn -0.379900008 -0.804400027 -0.456800014
+vn -0.460399985 -0.849900007 -0.256399989
+vn -0.509500027 -0.817399979 -0.268700004
+vn -0.386999995 -0.774699986 -0.500100017
+vn -0.401499987 -0.888599992 -0.221799999
+vn -0.449800014 -0.754000008 -0.478700012
+vn -0.568499982 -0.762899995 -0.307799995
+vn -0.453700006 -0.717400014 -0.528699994
+vn -0.442600012 -0.76730001 -0.464100003
+vn -0.545400023 -0.789699972 -0.281100005
+vn -0.493600011 -0.699899971 -0.516099989
+vn -0.60710001 -0.733399987 -0.305900007
+vn -0.644400001 -0.687900007 -0.333900005
+vn -0.524299979 -0.688899994 -0.500500023
+vn -0.563300014 -0.579699993 -0.588699996
+vn -0.530099988 -0.626699984 -0.571099997
+vn -0.780200005 -0.479799986 -0.401499987
+vn -0.628600001 -0.461800009 -0.625800014
+vn -0.711099982 -0.608900011 -0.351599991
+vn -0.726800025 -0.289900005 -0.622699976
+vn -0.85769999 -0.292600006 -0.422800004
+vn -0.887499988 -0.0835999995 -0.453200012
+vn -0.74879998 -0.0965000018 -0.655700028
+vn -0.718699992 0.0789000019 -0.690900028
+vn -0.834200025 0.28670001 -0.471100003
+vn -0.71329999 0.254099995 -0.653199971
+vn -0.878600001 0.110200003 -0.464700013
+vn -0.61500001 0.398200005 -0.680599988
+vn -0.767499983 0.453900009 -0.452800006
+vn -0.563300014 0.573800027 -0.594500005
+vn -0.667200029 0.620999992 -0.411300004
+vn -0.37470001 0.721899986 -0.581799984
+vn -0.271200001 0.905799985 -0.325500011
+vn -0.182500005 0.836099982 -0.51730001
+vn -0.483099997 0.789699972 -0.377999991
+vn -0.0372000001 0.855499983 -0.51639998
+vn -0.0640999973 0.962899983 -0.262100011
+vn 0.00419999985 0.86500001 -0.501800001
+vn -0.136500001 0.951499999 -0.27579999
+vn 0.0165999997 0.900099993 -0.435299993
+vn -0.0333000012 0.965399981 -0.258700013
+vn 0.0274999999 0.873300016 -0.486400008
+vn -0.0366000012 0.965200007 -0.2588
+vn 0.00680000009 0.88440001 -0.466600001
+vn -0.0425000004 0.968400002 -0.245900005
+vn -0.0178999994 0.922699988 -0.385199994
+vn -0.0610000007 0.968599975 -0.240999997
+vn -0.0515000001 0.856299996 -0.513899982
+vn -0.187199995 0.943099976 -0.274800003
+vn -0.146200001 0.864199996 -0.481400013
+vn -0.0976999998 0.961399972 -0.256999999
+vn -0.0317000002 0.879299998 -0.475300014
+vn -0.323500007 0.797399998 -0.509500027
+vn -0.380100012 0.881200016 -0.281199992
+vn -0.506600022 0.718400002 -0.476700008
+vn -0.558700025 0.782800019 -0.273900002
+vn -0.639199972 0.57069999 -0.515500009
+vn -0.824199975 0.481099993 -0.298599988
+vn -0.731899977 0.40990001 -0.544399977
+vn -0.707899988 0.644599974 -0.288700014
+vn -0.778400004 0.334199995 -0.531400025
+vn -0.871500015 0.404599994 -0.277099997
+vn -0.888100028 0.370400012 -0.272300005
+vn -0.804499984 0.320899993 -0.499799997
+vn -0.826799989 0.287400007 -0.483500004
+vn -0.893899977 0.341500014 -0.290199995
+vn -0.78579998 0.234099999 -0.57249999
+vn -0.896000028 0.354200006 -0.267699987
+vn -0.817700028 0.291799992 -0.496100008
+vn -0.840200007 0.273000002 -0.468499988
+vn -0.897499979 0.348100007 -0.270700008
+vn -0.888400018 0.370700002 -0.270900011
+vn -0.857299984 0.426099986 -0.288899988
+vn -0.791899979 0.313600004 -0.523899972
+vn -0.832199991 0.303900003 -0.463699996
+vn -0.776300013 0.540799975 -0.324000001
+vn -0.724300027 0.424899995 -0.542999983
+vn -0.565800011 0.588999987 -0.577099979
+vn -0.603100002 0.702899992 -0.377000004
+vn -0.363700002 0.724099994 -0.586000025
+vn -0.382699996 0.831799984 -0.401899993
+vn -0.171700001 0.72329998 -0.668900013
+vn 0.00120000006 0.893000007 -0.449999988
+vn 0.00260000001 0.771899998 -0.635699987
+vn -0.186100006 0.880100012 -0.43689999
+vn 0.178599998 0.722500026 -0.667900026
+vn 0.382600009 0.815900028 -0.433499992
+vn 0.354999989 0.673099995 -0.648800015
+vn 0.190799996 0.879999995 -0.434899986
+vn 0.568700016 0.589100003 -0.574100018
+vn 0.777499974 0.533699989 -0.332500011
+vn 0.722199976 0.411799997 -0.555800021
+vn 0.603600025 0.70569998 -0.371100008
+vn 0.795799971 0.313600004 -0.518100023
+vn 0.859099984 0.426800013 -0.282499999
+vn 0.890299976 0.370700002 -0.264499992
+vn 0.835600019 0.303900003 -0.457700014
+vn 0.843500018 0.273000002 -0.462500006
+vn 0.896200001 0.341399997 -0.283499986
+vn 0.789799988 0.234799996 -0.566600025
+vn 0.899399996 0.348199993 -0.264099985
+vn 0.825699985 0.282799989 -0.488200009
+vn 0.897800028 0.354699999 -0.261099994
+vn 0.889900029 0.370200008 -0.266400009
+vn 0.819700003 0.291700006 -0.492900014
+vn 0.782400012 0.334100008 -0.525600016
+vn 0.825999975 0.48179999 -0.292699993
+vn 0.736100018 0.40959999 -0.538800001
+vn 0.873300016 0.405000001 -0.270700008
+vn 0.809499979 0.321799994 -0.491100013
+vn 0.642799973 0.570500016 -0.511200011
+vn 0.709200025 0.645099998 -0.284299999
+vn 0.50999999 0.718400002 -0.47299999
+vn 0.560299993 0.782999992 -0.270099998
+vn 0.326999992 0.797399998 -0.507099986
+vn 0.187999994 0.943400025 -0.273200005
+vn 0.149700001 0.864199996 -0.480399996
+vn 0.381199986 0.881699979 -0.277999997
+vn 0.0557000004 0.855799973 -0.514199972
+vn 0.0989999995 0.961499989 -0.256199986
+vn 0.0610000007 0.966000021 -0.251199991
+vn 0.0281000007 0.863600016 -0.503400028
+vn -0.00480000023 0.884899974 -0.465700001
+vn 0.0322999991 0.962499976 -0.269400001
+vn -0.0450000018 0.829299986 -0.556900024
+vn 0.0436000004 0.968400002 -0.245700002
+vn 0.00760000013 0.89380002 -0.448500007
+vn -0.0130000003 0.90259999 -0.430200011
+vn 0.0375999995 0.965600014 -0.257200003
+vn 0.0688000023 0.965799987 -0.249799997
+vn 0.0375999995 0.85619998 -0.515299976
+vn 0.26879999 0.907599986 -0.322600007
+vn 0.182600006 0.837300003 -0.515299976
+vn 0.135299996 0.951900005 -0.274800003
+vn 0.00600000005 0.876800001 -0.480699986
+vn 0.374900013 0.724399984 -0.578499973
+vn 0.481099993 0.792699993 -0.374300003
+vn 0.56400001 0.577799976 -0.589999974
+vn 0.666299999 0.625 -0.406599998
+vn 0.616100013 0.400700003 -0.67809999
+vn 0.83099997 0.29429999 -0.47209999
+vn 0.670400023 0.247600004 -0.699500024
+vn 0.767099977 0.460200012 -0.446999997
+vn 0.719299972 0.0918999985 -0.688600004
+vn 0.880200028 0.121699996 -0.458799988
+vn 0.785300016 -0.0864000022 -0.613099992
+vn 0.899600029 -0.0734999999 -0.430599988
+vn 0.7227 -0.317999989 -0.613699973
+vn 0.753099978 -0.543299973 -0.371100008
+vn 0.637700021 -0.528400004 -0.560599983
+vn 0.853100002 -0.320600003 -0.41170001
+vn 0.532100022 -0.631200016 -0.564400017
+vn 0.672500014 -0.663299978 -0.328399986
+vn 0.624100029 -0.717899978 -0.308400005
+vn 0.51849997 -0.66930002 -0.532199979
+vn 0.501600027 -0.700500011 -0.507700026
+vn 0.601199985 -0.740800023 -0.299600005
+vn 0.488000005 -0.687900007 -0.537400007
+vn 0.51789999 -0.705200016 -0.484299988
+vn 0.507399976 -0.691200018 -0.514500022
+vn 0.599399984 -0.742699981 -0.298599988
+vn 0.611199975 -0.7324 -0.300199986
+vn 0.537100017 -0.703400016 -0.465499997
+vn 0.637700021 -0.70599997 -0.307900012
+vn 0.534799993 -0.63349998 -0.559099972
+vn 0.531700015 -0.663399994 -0.526600003
+vn 0.699800014 -0.64200002 -0.3134
+vn 0.603299975 -0.576099992 -0.551400006
+vn 0.722899973 -0.429899991 -0.540899992
+vn 0.89410001 -0.289900005 -0.341500014
+vn 0.779100001 -0.244900003 -0.577099979
+vn 0.817099988 -0.479900002 -0.319299996
+vn 0.846800029 -0.064000003 -0.528100014
+vn 0.944999993 0.102399997 -0.310600013
+vn 0.791100025 0.126900002 -0.59829998
+vn 0.947799981 -0.0944999978 -0.304500014
+vn 0.838100016 0.203999996 -0.505999982
+vn 0.943099976 0.187800005 -0.274300009
+vn 0.936500013 0.221200004 -0.272100002
+vn 0.836199999 0.230900005 -0.497500002
+vn 0.807299972 0.264099985 -0.527800024
+vn 0.927100003 0.236100003 -0.291200012
+vn 0.772199988 0.280200005 -0.570299983
+vn 0.933499992 0.233700007 -0.272000015
+vn 0.847100019 0.254500002 -0.466500014
+vn 0.83859998 0.263599992 -0.476799995
+vn 0.93720001 0.221200004 -0.269499987
+vn 0.940900028 0.189700007 -0.280499995
+vn 0.845099986 0.258700013 -0.467799991
+vn 0.826200008 0.191599995 -0.529799998
+vn 0.935699999 -0.0136000002 -0.352499992
+vn 0.828000009 0.0603 -0.557399988
+vn 0.945900023 0.119800001 -0.301400006
+vn 0.837700009 0.227300003 -0.496600002
+vn 0.788600028 -0.151899993 -0.595899999
+vn 0.766300023 -0.439799994 -0.468400002
+vn 0.662199974 -0.33039999 -0.672500014
+vn 0.88349998 -0.240799993 -0.401899993
+vn 0.550800025 -0.460299999 -0.69630003
+vn 0.510599971 -0.703199983 -0.494700015
+vn 0.440699995 -0.596800029 -0.67049998
+vn 0.651499987 -0.591300011 -0.475300014
+vn 0.271499991 -0.65109998 -0.708800018
+vn 0.160600007 -0.857299984 -0.489199996
+vn 0.0987000018 -0.711300015 -0.69599998
+vn 0.353399992 -0.799300015 -0.486099988
+vn -0.131200001 -0.769500017 -0.625
+vn -0.345699996 -0.854600012 -0.387400001
+vn -0.372200012 -0.664200008 -0.648299992
+vn -0.0916000009 -0.899500012 -0.427300006
+vn -0.493499994 -0.667900026 -0.557200015
+vn -0.479200006 -0.814999998 -0.325800002
+vn -0.539200008 -0.78609997 -0.302300006
+vn -0.532000005 -0.670700014 -0.516700029
+vn -0.555400014 -0.659200013 -0.507000029
+vn -0.554400027 -0.767700016 -0.321399987
+vn -0.530499995 -0.600199997 -0.598699987
+vn -0.558300018 -0.680400014 -0.474599987
+vn -0.529200017 -0.676299989 -0.512399971
+vn -0.54369998 -0.783800006 -0.300199986
+vn -0.524200022 -0.79430002 -0.307099998
+vn -0.522400022 -0.693300009 -0.496399999
+vn -0.456 -0.689700007 -0.5625
+vn -0.402500004 -0.852999985 -0.332199991
+vn -0.384000003 -0.754100025 -0.532800019
+vn -0.487899989 -0.814700007 -0.313300014
+vn -0.4824 -0.6778 -0.554899991
+vn -0.196199998 -0.805400014 -0.559400022
+vn 0.00249999994 -0.930299997 -0.366699994
+vn 0.00200000009 -0.800100029 -0.599900007
+vn -0.209099993 -0.918600023 -0.335399985
+vn 0.201700002 -0.806200027 -0.556200027
+vn 0.404399991 -0.850499988 -0.336199999
+vn 0.376399994 -0.724900007 -0.576900005
+vn 0.212400004 -0.91839999 -0.333799988
+vn 0.460399985 -0.689199984 -0.559499979
+vn 0.490099996 -0.814700007 -0.309899986
+vn 0.487399995 -0.679899991 -0.547900021
+vn 0.490099996 -0.53490001 -0.688300014
+vn 0.468300015 -0.514999986 -0.717899978
+vn 0.53640002 -0.539799988 -0.648699999
+vn 0.527800024 -0.501800001 -0.685299993
+vn 0.512000024 -0.490700006 -0.7051
+vn 0.467599988 -0.439599991 -0.766900003
+vn 0.37439999 -0.57160002 -0.730099976
+vn 0.167600006 -0.604300022 -0.778900027
+vn -0.0342000015 -0.548399985 -0.835500002
+vn -0.156299993 -0.417299986 -0.895200014
+vn -0.269899994 -0.349599987 -0.897199988
+vn -0.375499994 -0.270200014 -0.886600018
+vn -0.504800022 -0.188500002 -0.842400014
+vn -0.645900011 -0.0813999996 -0.75910002
+vn -0.688300014 0.0800999999 -0.721000016
+vn -0.606700003 0.226799995 -0.761900008
+vn -0.633400023 0.262100011 -0.728100002
+vn -0.705900013 0.287600011 -0.647300005
+vn -0.688300014 0.3046 -0.658399999
+vn -0.579100013 0.34709999 -0.737699986
+vn -0.70450002 0.35679999 -0.613399982
+vn -0.607500017 0.402200013 -0.685000002
+vn -0.5 0.439200014 -0.746399999
+vn -0.610899985 0.382299989 -0.693300009
+vn -0.531899989 0.511900008 -0.674600005
+vn -0.521799982 0.589999974 -0.61619997
+vn -0.487100005 0.67049998 -0.559599996
+vn -0.429100007 0.739700019 -0.518400013
+vn -0.305500001 0.712199986 -0.632000029
+vn -0.35589999 0.793600023 -0.493499994
+vn -0.319499999 0.769500017 -0.552999973
+vn -0.292800009 0.739300013 -0.606400013
+vn -0.352899998 0.778800011 -0.51849997
+vn -0.359400004 0.773899972 -0.521399975
+vn -0.406300008 0.799499989 -0.442400008
+vn -0.373100013 0.689599991 -0.620700002
+vn -0.349599987 0.689800024 -0.634000003
+vn -0.450500011 0.683600008 -0.574299991
+vn -0.662199974 0.549199998 -0.509800017
+vn -0.769200027 0.309199989 -0.559199989
+vn -0.74849999 0.131999999 -0.649900019
+vn -0.842899978 -0.00549999997 -0.538100004
+vn -0.841600001 -0.142499998 -0.521000028
+vn -0.746399999 -0.267100006 -0.609499991
+vn -0.725799978 -0.430500001 -0.536599994
+vn -0.560500026 -0.497900009 -0.66170001
+vn -0.439500004 -0.594500005 -0.673399985
+vn -0.346500009 -0.707899988 -0.615499973
+vn -0.146500006 -0.824100018 -0.547200024
+vn 0.0522999987 -0.798699975 -0.599399984
+vn 0.0976999998 -0.745400012 -0.659399986
+vn 0.132599995 -0.861199975 -0.490700006
+vn 0.111199997 -0.727599978 -0.676900029
+vn 0.152199998 -0.810899973 -0.564999998
+vn 0.160999998 -0.812600017 -0.560100019
+vn 0.174899995 -0.765399992 -0.619400024
+vn 0.187099993 -0.802399993 -0.566799998
+vn 0.191699997 -0.735000014 -0.650399983
+vn 0.171499997 -0.723699987 -0.668500006
+vn 0.1866 -0.729900002 -0.657599986
+vn 0.0998999998 -0.798900008 -0.592999995
+vn 0.0297999997 -0.755200028 -0.654900014
+vn -0.0617000014 -0.760100007 -0.646799982
+vn -0.119599998 -0.718699992 -0.685000002
+vn -0.223199993 -0.742799997 -0.631200016
+vn -0.25819999 -0.705299973 -0.6602
+vn -0.233600006 -0.640999973 -0.731100023
+vn -0.309300005 -0.658999979 -0.685599983
+vn -0.290100008 -0.61500001 -0.733299971
+vn -0.359699994 -0.628400028 -0.689800024
+vn -0.381399989 -0.618700027 -0.686800003
+vn -0.279799998 -0.653599977 -0.703199983
+vn -0.349900007 -0.547200024 -0.760399997
+vn -0.343499988 -0.493400007 -0.799099982
+vn -0.446500003 -0.415300012 -0.792599976
+vn -0.560000002 -0.273400009 -0.782100022
+vn -0.555199981 -0.104800001 -0.825100005
+vn -0.466800004 0.0383000001 -0.88349998
+vn -0.532700002 0.200599998 -0.8222
+vn -0.380100012 0.296799988 -0.875999987
+vn -0.366600007 0.457100004 -0.810299993
+vn -0.2509 0.620599985 -0.742900014
+vn -0.0720999986 0.710099995 -0.700399995
+vn 0.0786999986 0.666800022 -0.741100013
+vn 0.0846000016 0.727699995 -0.680700004
+vn 0.0870999992 0.76849997 -0.63380003
+vn 0.0877000019 0.758300006 -0.646000028
+vn 0.0926999971 0.708599985 -0.699500024
+vn 0.0557999983 0.755500019 -0.652800024
+vn 0.0154999997 0.844799995 -0.534799993
+vn 0.0546000004 0.717800021 -0.694100022
+vn 0.0118000004 0.731899977 -0.681299984
+vn 0.00659999996 0.655399978 -0.755299985
+vn -0.0938000008 0.722000003 -0.685500026
+vn -0.259600013 0.675599992 -0.690100014
+vn -0.386599988 0.56190002 -0.731299996
+vn -0.53640002 0.475899994 -0.697000027
+vn -0.599300027 0.315800011 -0.735599995
+vn -0.59920001 0.223499998 -0.768700004
+vn -0.632000029 0.215000004 -0.744499981
+vn -0.714100003 0.206300005 -0.668900013
+vn -0.688399971 0.204300001 -0.69599998
+vn -0.64349997 0.113399997 -0.757000029
+vn -0.727999985 0.168500006 -0.664499998
+vn -0.726899981 0.184799999 -0.66140002
+vn -0.646499991 0.155399993 -0.746900022
+vn -0.621800005 0.273900002 -0.733799994
+vn -0.50150001 0.4463 -0.74119997
+vn -0.305000007 0.5079 -0.805599988
+vn -0.140200004 0.473100007 -0.869799972
+vn 0.00289999996 0.587300003 -0.809300005
+vn 0.147300005 0.474999994 -0.867600024
+vn 0.298299998 0.472799987 -0.829100013
+vn 0.505800009 0.445800006 -0.738499999
+vn 0.625 0.270700008 -0.732200027
+vn 0.651799977 0.155399993 -0.742299974
+vn 0.731700003 0.184799999 -0.656099975
+vn 0.648299992 0.112999998 -0.752900004
+vn 0.732800007 0.168500006 -0.659200013
+vn 0.6778 0.179900005 -0.712899983
+vn 0.688399971 0.201800004 -0.696699977
+vn 0.66170001 0.229100004 -0.71390003
+vn 0.605499983 0.223000005 -0.763999999
+vn 0.604700029 0.315800011 -0.731100023
+vn 0.541199982 0.475600004 -0.693400025
+vn 0.39410001 0.564899981 -0.725000024
+vn 0.264200002 0.675700009 -0.688199997
+vn 0.0983999968 0.722000003 -0.684800029
+vn -9.99999975e-05 0.655399978 -0.755299985
+vn -0.0200999994 0.689400017 -0.724099994
+vn -0.0417999998 0.750199974 -0.659799993
+vn -0.0516999997 0.754299998 -0.654500008
+vn -0.0992000028 0.713400006 -0.693700016
+vn -0.0846000016 0.768999994 -0.633599997
+vn -0.0804999992 0.731899977 -0.676699996
+vn -0.0760999992 0.667200029 -0.740999997
+vn 0.0732999966 0.711300015 -0.699000001
+vn 0.252499998 0.622799993 -0.740499973
+vn 0.369100004 0.460399985 -0.807399988
+vn 0.384900004 0.29429999 -0.874800026
+vn 0.430999994 0.173999995 -0.885399997
+vn 0.467099994 0.0505000018 -0.882700026
+vn 0.559300005 -0.0969000012 -0.823300004
+vn 0.560599983 -0.300799996 -0.771499991
+vn 0.471199989 -0.481900007 -0.738799989
+vn 0.323399991 -0.534699976 -0.780700028
+vn 0.359200001 -0.593599975 -0.720200002
+vn 0.382200003 -0.630800009 -0.675199986
+vn 0.376199991 -0.623099983 -0.685699999
+vn 0.389499992 -0.603600025 -0.69569999
+vn 0.43900001 -0.631699979 -0.638999999
+vn 0.391900003 -0.542999983 -0.742699981
+vn 0.368600011 -0.490500003 -0.789600015
+vn 0.461400002 -0.466100007 -0.754899979
+vn 0.593599975 -0.358399987 -0.720600009
+vn 0.595300019 -0.175799996 -0.784099996
+vn 0.699800014 -0.0379999988 -0.71329999
+vn 0.632700026 0.207699999 -0.745999992
+vn 0.6602 0.234400004 -0.71359998
+vn 0.690599978 0.2676 -0.671899974
+vn 0.549300015 0.274599999 -0.789200008
+vn 0.712899983 0.292100012 -0.637600005
+vn 0.674899995 0.277099997 -0.684000015
+vn 0.613799989 0.256099999 -0.746800005
+vn 0.638000011 0.148300007 -0.755599976
+vn 0.661199987 -0.0623000003 -0.747600019
+vn 0.503899992 -0.188899994 -0.842899978
+vn 0.384900004 -0.267399997 -0.883400023
+vn 0.334899992 -0.438600004 -0.833999991
+vn 0.152899995 -0.4208 -0.894200027
+vn 0.0277999993 -0.503899992 -0.863300025
+vn -0.165800005 -0.600499988 -0.782199979
+vn -0.463400006 -0.439799994 -0.769299984
+vn -0.513000011 -0.514599979 -0.686999977
+vn -0.531199992 -0.528100014 -0.662500024
+vn -0.520600021 -0.509199977 -0.685400009
+vn -0.485399991 -0.534699976 -0.691799998
+vn -0.472900003 -0.537400007 -0.698300004
+vn -0.377400011 -0.482600003 -0.790400028
+vn -0.40169999 -0.470499992 -0.785700023
+vn -0.337099999 -0.598200023 -0.726999998
+vn -0.173700005 -0.657199979 -0.733399987
+vn 0.00289999996 -0.59829998 -0.801299989
+vn 0.1796 -0.656899989 -0.732299984
+vn 0.327100009 -0.560400009 -0.760900021
+vn 0.38409999 -0.482899994 -0.787
+vn 0.420599997 -0.499599993 -0.757300019
+vn 0.457300007 -0.309899986 -0.833599985
+vn 0.446500003 -0.348199993 -0.824299991
+vn 0.460900009 -0.296200007 -0.836600006
+vn 0.413700014 -0.352999985 -0.83920002
+vn 0.377000004 -0.307000011 -0.87379998
+vn 0.447699994 -0.265599996 -0.853799999
+vn 0.412 -0.224399999 -0.883099973
+vn 0.356099993 -0.344999999 -0.868399978
+vn 0.1954 -0.392500013 -0.898800015
+vn 0.0405000001 -0.31099999 -0.949500024
+vn -0.0494999997 -0.210199997 -0.976400018
+vn -0.0719000027 -0.0648000017 -0.995299995
+vn -0.221399993 -0.102399997 -0.969799995
+vn -0.2861 -0.0166999996 -0.958100021
+vn -0.465900004 0.0272000004 -0.88440001
+vn -0.390199989 0.26879999 -0.880599976
+vn -0.336100012 0.305799991 -0.890799999
+vn -0.447400004 0.1734 -0.877399981
+vn -0.360500008 0.333200008 -0.871200025
+vn -0.474799991 0.352100015 -0.806599975
+vn -0.520500004 0.334800005 -0.78549999
+vn -0.469700009 0.328099996 -0.819599986
+vn -0.476799995 0.318100005 -0.819400012
+vn -0.363599986 0.361499995 -0.85860002
+vn -0.396600008 0.354799986 -0.846700013
+vn -0.344500005 0.44749999 -0.825299978
+vn -0.262899995 0.458200008 -0.849099994
+vn -0.339899987 0.583999991 -0.737200022
+vn -0.177699998 0.572300017 -0.800499976
+vn -0.220200002 0.645200014 -0.731599987
+vn -0.254299998 0.59859997 -0.759599984
+vn -0.210600004 0.619599998 -0.756200016
+vn -0.148200005 0.533800006 -0.832499981
+vn -0.278499991 0.644200027 -0.712400019
+vn -0.259499997 0.661499977 -0.703599989
+vn -0.267500013 0.601300001 -0.752900004
+vn -0.2773 0.507099986 -0.816100001
+vn -0.253600001 0.499199986 -0.828599989
+vn -0.351200014 0.50940001 -0.785600007
+vn -0.530900002 0.448500007 -0.718999982
+vn -0.550800025 0.218400002 -0.805599988
+vn -0.565800011 0.102499999 -0.818199992
+vn -0.639400005 0.0148 -0.76880002
+vn -0.689499974 -0.125100002 -0.713400006
+vn -0.54430002 -0.173299998 -0.820800006
+vn -0.552299976 -0.321500003 -0.769200027
+vn -0.386400014 -0.299400002 -0.872399986
+vn -0.308200002 -0.404300004 -0.861100018
+vn -0.300000012 -0.538200021 -0.787599981
+vn -0.125400007 -0.660700023 -0.740100026
+vn 0.0182000007 -0.574599981 -0.818199992
+vn 0.0687000006 -0.560000002 -0.825600028
+vn 0.0736000016 -0.505500019 -0.859700024
+vn 0.141399994 -0.648899972 -0.747600019
+vn 0.155000001 -0.542500019 -0.825699985
+vn 0.184699997 -0.593500018 -0.783399999
+vn 0.186299995 -0.49939999 -0.846099973
+vn 0.123000003 -0.60589999 -0.785899997
+vn 0.195999995 -0.510699987 -0.837100029
+vn 0.189600006 -0.515699983 -0.835600019
+vn 0.143099993 -0.592199981 -0.792999983
+vn 0.101899996 -0.52670002 -0.843900025
+vn 0.0529000014 -0.518899977 -0.853200018
+vn -0.00109999999 -0.525399983 -0.850899994
+vn -0.0643000007 -0.541199982 -0.838400006
+vn -0.113200001 -0.546500027 -0.82980001
+vn -0.0406999998 -0.426800013 -0.903400004
+vn -0.112999998 -0.482800007 -0.868399978
+vn -0.0504000001 -0.433099985 -0.899900019
+vn -0.0868000016 -0.443699986 -0.89200002
+vn -0.202800006 -0.520399988 -0.82950002
+vn -0.176200002 -0.487399995 -0.855199993
+vn -0.142700002 -0.426400006 -0.89319998
+vn -0.142199993 -0.387899995 -0.910700023
+vn -0.238000005 -0.342700005 -0.908800006
+vn -0.350400001 -0.242599994 -0.904600024
+vn -0.309500009 -0.1052 -0.944999993
+vn -0.231099993 0.00179999997 -0.972899973
+vn -0.278600007 0.122000001 -0.952600002
+vn -0.173600003 0.194100007 -0.965499997
+vn -0.0881000012 0.261099994 -0.961300015
+vn -0.1021 0.476399988 -0.873300016
+vn 0.165299997 0.467200011 -0.868600011
+vn 0.168699995 0.523599982 -0.835099995
+vn 0.0700000003 0.498299986 -0.864099979
+vn 0.149399996 0.577700019 -0.802399993
+vn 0.154499993 0.465299994 -0.871599972
+vn 0.103 0.570900023 -0.814499974
+vn 0.100400001 0.514800012 -0.851400018
+vn 0.161699995 0.558000028 -0.813899994
+vn 0.0577000007 0.525399983 -0.84890002
+vn 0.0527000017 0.448000014 -0.892499983
+vn -0.0274999999 0.494700015 -0.868600011
+vn -0.168599993 0.499000013 -0.850000024
+vn -0.193499997 0.302300006 -0.933399975
+vn -0.391799986 0.338800013 -0.855400026
+vn -0.414299995 0.117399998 -0.902499974
+vn -0.379999995 0.0781999975 -0.921700001
+vn -0.425099999 0.2016 -0.882399976
+vn -0.587499976 0.0697000027 -0.806200027
+vn -0.574599981 0.0892999992 -0.813499987
+vn -0.56190002 0.0458999984 -0.825999975
+vn -0.550000012 0.108900003 -0.828000009
+vn -0.517099977 0.106700003 -0.84920001
+vn -0.535300016 0.0282000005 -0.844200015
+vn -0.481400013 0.0144999996 -0.876399994
+vn -0.475800008 0.1043 -0.873300016
+vn -0.406100005 0.266099989 -0.874199986
+vn -0.196600005 0.187600002 -0.962400019
+vn -0.1021 0.247899994 -0.963400006
+vn 0.00340000005 0.324400008 -0.945900023
+vn 0.108900003 0.246199995 -0.963100016
+vn 0.213699996 0.217099994 -0.952499986
+vn 0.412400007 0.265300006 -0.871500015
+vn 0.487699986 0.0144999996 -0.872900009
+vn 0.541599989 0.0284000002 -0.840200007
+vn 0.48210001 0.1043 -0.869899988
+vn 0.483399987 0.0654999986 -0.872900009
+vn 0.498800009 0.0918999985 -0.861800015
+vn 0.579699993 0.0904000029 -0.809800029
+vn 0.593400002 0.0697000027 -0.801900029
+vn 0.567900002 0.0460000001 -0.821799994
+vn 0.466899991 0.119000003 -0.876299977
+vn 0.41960001 0.1175 -0.900099993
+vn 0.431400001 0.2016 -0.879400015
+vn 0.397100002 0.338999987 -0.852900028
+vn 0.223199993 0.333600014 -0.915899992
+vn 0.174999997 0.498199999 -0.84920001
+vn -0.0460000001 0.448199987 -0.892700016
+vn -0.0606999993 0.487199992 -0.871200025
+vn 0.0335000008 0.494700015 -0.868399978
+vn -0.122900002 0.585200012 -0.801500022
+vn -0.157900006 0.557699978 -0.814899981
+vn -0.159500003 0.523699999 -0.836899996
+vn -0.0960000008 0.570800006 -0.815500021
+vn -0.0935999975 0.520299971 -0.848800004
+vn -0.164399996 0.524399996 -0.835399985
+vn -0.161400005 0.467400014 -0.869199991
+vn -0.0669 0.4991 -0.863900006
+vn 0.105099998 0.477999985 -0.871999979
+vn 0.0923999995 0.263099998 -0.960300028
+vn 0.184900001 0.197899997 -0.962599993
+vn 0.108800001 0.0697999969 -0.991599977
+vn 0.245499998 0.0109000001 -0.969299972
+vn 0.25029999 -0.0970000029 -0.96329999
+vn 0.353100002 -0.265899986 -0.897000015
+vn 0.133100003 -0.418500006 -0.898400009
+vn 0.164700001 -0.468199998 -0.868099988
+vn 0.228400007 -0.386799991 -0.893400013
+vn 0.242300004 -0.471799999 -0.847800016
+vn 0.310099989 -0.519900024 -0.796000004
+vn 0.154400006 -0.370599985 -0.915899992
+vn 0.222200006 -0.484899998 -0.845899999
+vn 0.192000002 -0.490500003 -0.850000024
+vn 0.190099999 -0.493999988 -0.848399997
+vn 0.223900005 -0.384900004 -0.895399988
+vn 0.208900005 -0.340900004 -0.916599989
+vn 0.293900013 -0.328399986 -0.897700012
+vn 0.417400002 -0.256099999 -0.871900022
+vn 0.316799998 -0.0766000003 -0.9454
+vn 0.504499972 -0.00609999988 -0.863399982
+vn 0.400099993 0.193299994 -0.895900011
+vn 0.433200002 0.218899995 -0.874300003
+vn 0.537100017 0.139699996 -0.831900001
+vn 0.514299989 0.31310001 -0.798399985
+vn 0.497500002 0.309500009 -0.810400009
+vn 0.512300014 0.293099999 -0.807299972
+vn 0.450300008 0.256799996 -0.855099976
+vn 0.451299995 0.308999985 -0.837100029
+vn 0.398299992 0.292199999 -0.869499981
+vn 0.378199995 0.228400007 -0.897099972
+vn 0.478300005 0.0406999998 -0.877300024
+vn 0.289799988 -0.0184000004 -0.956900001
+vn 0.222599998 -0.0966999978 -0.970099986
+vn 0.182699993 -0.216900006 -0.958899975
+vn 0.0511000007 -0.207000002 -0.976999998
+vn -0.0526000001 -0.239399999 -0.969500005
+vn -0.195299998 -0.394400001 -0.897899985
+vn -0.404700011 -0.222900003 -0.886900008
+vn -0.453399986 -0.294099987 -0.841400027
+vn -0.353799999 -0.349099994 -0.867699981
+vn -0.408199996 -0.352800012 -0.842000008
+vn -0.441100001 -0.347799987 -0.827300012
+vn -0.373400003 -0.3116 -0.87379998
+vn -0.448300004 -0.299699992 -0.842199981
+vn -0.459399998 -0.3046 -0.834399998
+vn -0.290300012 -0.281500012 -0.914600015
+vn -0.282700002 -0.222800002 -0.933000028
+vn -0.251199991 -0.36649999 -0.895900011
+vn -0.136199996 -0.453500003 -0.880800009
+vn 0.00340000005 -0.298799992 -0.954299986
+vn 0.142800003 -0.453299999 -0.879800022
+vn 0.295300007 -0.281199992 -0.913100004
+vn 0.331900001 -0.305999994 -0.89230001
+vn 0.254200011 -0.358500004 -0.898299992
+vn 0.314099997 -0.0736000016 -0.946500003
+vn 0.34709999 -0.0430000015 -0.936800003
+vn 0.321200013 -0.0241 -0.946699977
+vn 0.278499991 -0.0822999999 -0.956900001
+vn 0.243200004 -0.0529999994 -0.968500018
+vn 0.211400002 -0.0851000026 -0.973699987
+vn 0.310799986 -0.0966000035 -0.945599973
+vn 0.120700002 -0.00779999979 -0.992699981
+vn 0.331200004 -0.00800000038 -0.943499982
+vn 0.335900009 0.00249999994 -0.941900015
+vn -0.050999999 0.0734999999 -0.995999992
+vn -0.0671000034 0.138899997 -0.987999976
+vn 0.0542000011 0.0027999999 -0.99849999
+vn -0.179000005 0.165800005 -0.969799995
+vn -0.157600001 0.288899988 -0.944299996
+vn -0.0571000017 0.310699999 -0.948800027
+vn -0.177900001 0.245900005 -0.952799976
+vn -0.195800006 0.320499986 -0.926800013
+vn -0.065700002 0.302399993 -0.950900018
+vn -0.140100002 0.304199994 -0.942300022
+vn -0.171900004 0.308899999 -0.935400009
+vn -0.150700003 0.300900012 -0.941699982
+vn -0.1162 0.297800004 -0.94749999
+vn -0.195899993 0.343199998 -0.918600023
+vn -0.127900004 0.340000004 -0.931699991
+vn -0.0370000005 0.314300001 -0.948599994
+vn -0.119400002 0.416700006 -0.901199996
+vn -0.0476999991 0.408499986 -0.911499977
+vn -0.0562999994 0.411199987 -0.909799993
+vn -0.0772999972 0.419400007 -0.904500008
+vn -0.0794999972 0.405699998 -0.91049999
+vn -0.0248000007 0.335799992 -0.941600025
+vn -0.152999997 0.410299987 -0.898999989
+vn -0.127200007 0.430799991 -0.893400013
+vn -0.148300007 0.367900014 -0.917999983
+vn -0.169499993 0.30340001 -0.937699974
+vn -0.146699995 0.291999996 -0.945100009
+vn -0.229900002 0.317000002 -0.920099974
+vn -0.322600007 0.249799997 -0.912999988
+vn -0.350499988 0.0969000012 -0.931500018
+vn -0.311300009 -0.0168999992 -0.950200021
+vn -0.480800003 -0.00419999985 -0.876800001
+vn -0.330799997 -0.145500004 -0.932399988
+vn -0.200399995 -0.182999998 -0.962499976
+vn -0.140499994 -0.440400004 -0.886699975
+vn -0.0948999971 -0.262699991 -0.960200012
+vn -0.00689999992 -0.309199989 -0.950999975
+vn 0.0401999988 -0.349900007 -0.935899973
+vn 0.0375999995 -0.271800011 -0.961600006
+vn 0.1039 -0.377700001 -0.920099974
+vn 0.123199999 -0.285899997 -0.950299978
+vn 0.162499994 -0.331200004 -0.929400027
+vn 0.166999996 -0.247199997 -0.95450002
+vn 0.0812999979 -0.340799987 -0.936600029
+vn 0.185399994 -0.355599999 -0.916100025
+vn 0.189799994 -0.2685 -0.944400012
+vn 0.167099997 -0.277099997 -0.946200013
+vn 0.138600007 -0.285600007 -0.948300004
+vn 0.109099999 -0.289400011 -0.950999975
+vn 0.0577999987 -0.324099988 -0.944299996
+vn 0.124200001 -0.215200007 -0.968599975
+vn 0.0741999969 -0.324000001 -0.943099976
+vn 0.0810000002 -0.281800002 -0.95599997
+vn 0.128199995 -0.222200006 -0.966499984
+vn 0.0489999987 -0.308999985 -0.949800014
+vn -0.0454000011 -0.179399997 -0.98269999
+vn 0.00219999999 -0.0936999992 -0.995599985
+vn 0.00609999988 -0.238999993 -0.971000016
+vn 0.0471000001 -0.264999986 -0.963100016
+vn 0.0838999972 -0.262899995 -0.961199999
+vn 0.0285999998 0.0816000029 -0.996299982
+vn 0.138400003 0.0834999979 -0.986800015
+vn -0.0166999996 0.0381999984 -0.999100029
+vn -0.00810000021 -0.0256999992 -0.999599993
+vn 0.0991000012 0.244499996 -0.964600027
+vn 0.245000005 0.250999987 -0.936500013
+vn 0.232800007 0.256099999 -0.938199997
+vn 0.209199995 0.225500003 -0.951499999
+vn 0.214499995 0.288700014 -0.933099985
+vn 0.199300006 0.195500001 -0.960300028
+vn 0.155000001 0.281100005 -0.947099984
+vn 0.143199995 0.240099996 -0.960099995
+vn 0.227899998 0.2861 -0.930700004
+vn -0.0406000018 0.217899993 -0.975099981
+vn -0.0306000002 0.0793000013 -0.996399999
+vn 0.0425000004 0.237200007 -0.970499992
+vn 0.0953999981 0.231000006 -0.968299985
+vn 0.1074 0.240500003 -0.964699984
+vn -0.160300002 0.132699996 -0.978100002
+vn -0.217199996 0.00800000038 -0.976100028
+vn -0.151600003 -0.0373000018 -0.987699986
+vn -0.206 0.0606999993 -0.976700008
+vn -0.318599999 -0.0864000022 -0.944000006
+vn -0.3116 -0.0559 -0.948599994
+vn -0.325599998 -0.0967999995 -0.940500021
+vn -0.286599994 -0.0305000003 -0.957599998
+vn -0.265899986 -0.0216000006 -0.963699996
+vn -0.241400003 0.00609999988 -0.970399976
+vn -0.0929000005 -0.0816999972 -0.992299974
+vn -0.258700013 -0.103 -0.960500002
+vn -0.305700004 -0.107600003 -0.94599998
+vn -0.2755 -0.138600007 -0.951200008
+vn -0.0549999997 0.0219999999 -0.998199999
+vn 0.0649999976 0.0210999995 -0.997699976
+vn 0.120899998 -0.0296 -0.992200017
+vn 0.00359999994 0.0516999997 -0.998700023
+vn 0.245399997 0.0057000001 -0.969399989
+vn 0.282499999 -0.138600007 -0.949199975
+vn 0.312599987 -0.107600003 -0.943799973
+vn 0.265599996 -0.103 -0.958599985
+vn 0.317799985 -0.0553000011 -0.946500003
+vn 0.247500002 -0.0348000005 -0.968299985
+vn 0.254299998 -0.0491999984 -0.965900004
+vn 0.325399995 -0.0864000022 -0.941600025
+vn 0.332500011 -0.0967999995 -0.93809998
+vn 0.168300003 0.128800005 -0.977299988
+vn 0.0672999993 0.120200001 -0.990499973
+vn 0.212899998 0.0606000014 -0.975199997
+vn 0.224399999 0.00899999961 -0.9745
+vn 0.231999993 -0.00310000009 -0.9727
+vn 0.0434999987 0.217500001 -0.975099981
+vn -0.102700002 0.232700005 -0.967100024
+vn -0.0885000005 0.231099993 -0.968900025
+vn -0.0357000008 0.237299994 -0.970799983
+vn -0.179800004 0.294200003 -0.93870002
+vn -0.222200006 0.28670001 -0.931900024
+vn -0.215100005 0.252900004 -0.943300009
+vn -0.147400007 0.280800015 -0.948400021
+vn -0.136700004 0.238999993 -0.961399972
+vn -0.0944999978 0.245499998 -0.9648
+vn -0.133100003 0.0842999965 -0.987500012
+vn -0.204400003 0.225899994 -0.952499986
+vn -0.227699995 0.256500006 -0.939300001
+vn -0.239700004 0.251399994 -0.937699974
+vn -0.0286999997 0.0852999985 -0.995899975
+vn 0.00789999962 -0.0281000007 -0.999599993
+vn -0.0203000009 -0.0899000019 -0.995700002
+vn 0.0513000004 -0.1919 -0.980099976
+vn -0.0610000007 -0.288399994 -0.955600023
+vn -0.0480999984 -0.284999996 -0.957300007
+vn -0.0472000018 -0.245800003 -0.968200028
+vn 0.0284000002 -0.259799987 -0.965200007
+vn -0.0151000004 -0.190699995 -0.98150003
+vn 0.0114000002 -0.289600015 -0.957099974
+vn -0.0151000004 -0.303000003 -0.952899992
+vn -0.0264999997 -0.307500005 -0.951200008
+vn 0.148300007 -0.0957000032 -0.984300017
+vn 0.0590999983 0.0120999999 -0.998199999
+vn 0.0922999978 -0.159700006 -0.982800007
+vn 0.0460000001 -0.185399994 -0.981599987
+vn 0.0353999995 -0.194800004 -0.980199993
+vn 0.198899999 0.0436999984 -0.978999972
+vn 0.29519999 0.134200007 -0.94599998
+vn 0.0820000023 0.122599997 -0.989099979
+vn 0.168799996 0.171800002 -0.970600009
+vn 0.167699993 0.188199997 -0.967700005
+vn 0.201800004 0.298500001 -0.932799995
+vn 0.211799994 0.273299992 -0.938300014
+vn 0.207699999 0.309300005 -0.927999973
+vn 0.210600004 0.241799995 -0.9472
+vn 0.1646 0.220899999 -0.961300015
+vn 0.167500004 0.305599988 -0.937300026
+vn 0.112300001 0.278200001 -0.95389998
+vn 0.1928 0.172900006 -0.965900004
+vn 0.0715999976 0.138300002 -0.987800002
+vn 0.161400005 0.314799994 -0.935299993
+vn 0.0555999987 0.0681999996 -0.996100008
+vn -0.0445000008 0.00439999998 -0.999000013
+vn -0.120899998 0.0166999996 -0.992500007
+vn 0.0238000005 0.0109999999 -0.99970001
+vn -0.204600006 -0.0806000009 -0.975499988
+vn -0.334899992 -0.00480000023 -0.942300022
+vn -0.325300008 -0.0125000002 -0.945500016
+vn -0.288300008 -0.00659999996 -0.957499981
+vn -0.272000015 -0.0820000023 -0.958800018
+vn -0.307900012 -0.0731000006 -0.948599994
+vn -0.236699998 -0.0529999994 -0.970099986
+vn -0.315400004 -0.0234999992 -0.948700011
+vn -0.342799991 -0.0452999994 -0.938300014
+vn -0.192900002 -0.0755999982 -0.978299975
+vn -0.165700004 -0.000699999975 -0.986199975
+vn -0.0715000033 -0.144400001 -0.986899972
+vn 0.00359999994 -0.0253999997 -0.99970001
+vn -0.152199998 -0.112199999 -0.981999993
+vn 0.0785000026 -0.144400001 -0.986400008
+vn 0.213100001 -0.0719000027 -0.974399984
+vn 0.199300006 -0.076700002 -0.976899981
+vn 0.158999994 -0.112400003 -0.98089999
+vn 0.230700001 0.0697999969 -0.970499992
+vn 0.261299998 0.113899998 -0.958500028
+vn 0.243699998 0.110600002 -0.963500023
+vn 0.189999998 0.068400003 -0.979399979
+vn 0.177000001 0.0604999997 -0.9824
+vn 0.276800007 0.119800001 -0.953400016
+vn 0.2597 0.103799999 -0.960099995
+vn 0.194299996 0.264499992 -0.944599986
+vn 0.240400001 0.168899998 -0.955900013
+vn 0.208199993 0.1149 -0.971300006
+vn 0.1602 0.154400006 -0.974900007
+vn 0.113799997 0.137700006 -0.983900011
+vn 0.0610999987 0.122299999 -0.99059999
+vn 0.0281000007 0.205200002 -0.978299975
+vn 0.0493000001 0.173800007 -0.983500004
+vn -0.00930000003 0.298200011 -0.954400003
+vn 0.0394000001 0.305099994 -0.951499999
+vn -0.0263 0.272399992 -0.961799979
+vn -0.00439999998 0.235300004 -0.971899986
+vn 0.0306000002 0.292100012 -0.955900013
+vn 0.0307 0.283300012 -0.958500028
+vn -0.00659999996 0.277500004 -0.960699975
+vn -0.0122999996 0.273600012 -0.961799979
+vn -0.0274 0.308499992 -0.950800002
+vn -0 0.272700012 -0.962100029
+vn 0.0438000001 0.256900012 -0.965399981
+vn -0.0311999992 0.278299987 -0.959999979
+vn -0.000600000028 0.261400014 -0.965200007
+vn -0.0137999998 0.264299989 -0.964299977
+vn 0.0120000001 0.300900012 -0.953599989
+vn 0.0231999997 0.300399989 -0.953499973
+vn 0.0318000019 0.285100013 -0.958000004
+vn 0.0118000004 0.316100001 -0.948599994
+vn -0.0110999998 0.282700002 -0.959200025
+vn 0.0254999995 0.250099987 -0.967899978
+vn -0.055399999 0.293300003 -0.954400003
+vn -0.0936999992 0.258300006 -0.961499989
+vn -0.079400003 0.262199998 -0.961799979
+vn -0.114200003 0.198599994 -0.973399997
+vn -0.0952000022 0.195600003 -0.976000011
+vn -0.160699993 0.208399996 -0.9648
+vn -0.245399997 0.0966000035 -0.964600027
+vn -0.214699998 0.160600007 -0.963400006
+vn -0.241600007 0.0406999998 -0.969500005
+vn -0.216900006 0.0194000006 -0.976000011
+vn -0.226799995 -0.0313000008 -0.973399997
+vn -0.2359 -0.0582999997 -0.970000029
+vn -0.203999996 -0.108599998 -0.972899973
+vn -0.166199997 -0.105099998 -0.980499983
+vn -0.136000007 -0.142700002 -0.980400026
+vn -0.117799997 -0.145899996 -0.982299984
+vn -0.0631999969 -0.188299999 -0.980099976
+vn -0.0172000006 -0.184300005 -0.98269999
+vn 0.0161000006 -0.215100005 -0.976499975
+vn 0.0227000006 -0.166199997 -0.985800028
+vn 0.0763000026 -0.211400002 -0.974399984
+vn 0.104099996 -0.1602 -0.981599987
+vn 0.144700006 -0.188899994 -0.971300006
+vn 0.156399995 -0.141100004 -0.977599978
+vn 0.0606999993 -0.215900004 -0.9745
+vn 0.184 -0.154499993 -0.970700026
+vn 0.192699999 -0.131999999 -0.972299993
+vn 0.183300003 -0.157100007 -0.970399976
+vn 0.187700003 -0.151600003 -0.970499992
+vn 0.173600003 -0.171800002 -0.969699979
+vn 0.173099995 -0.154300004 -0.9727
+vn 0.173800007 -0.146799996 -0.973800004
+vn 0.154599994 -0.181899995 -0.971099973
+vn 0.181899995 -0.136099994 -0.973800004
+vn 0.172199994 -0.162599996 -0.971599996
+vn 0.189899996 -0.1417 -0.971499979
+vn 0.178200006 -0.182500005 -0.966899991
+vn 0.171700001 -0.196799994 -0.965300024
+vn 0.194800004 -0.163499996 -0.967100024
+vn 0.167600006 -0.182899997 -0.968800008
+vn 0.197699994 -0.171499997 -0.96509999
+vn 0.138600007 -0.133300006 -0.981299996
+vn 0.168899998 -0.0851000026 -0.981999993
+vn 0.138899997 -0.170599997 -0.975499988
+vn 0.140499994 -0.0476000011 -0.988900006
+vn 0.160600007 0.0141000003 -0.986899972
+vn 0.215800002 0.0187999997 -0.976300001
+vn 0.1294 -0.00960000046 -0.99150002
+vn 0.216800004 0.0851000026 -0.972500026
+vn 0.270099998 0.074000001 -0.959999979
+vn 0.279799998 0.0684999973 -0.957599998
+vn 0.271800011 0.120499998 -0.95480001
+vn 0.238900006 0.115900002 -0.964100003
+vn 0.212699994 0.066200003 -0.974900007
+vn 0.174500003 0.1087 -0.978600025
+vn 0.158299997 0.108900003 -0.981400013
+vn 0.256799996 0.116899997 -0.959399998
+vn 0.112800002 0.0953999981 -0.989000022
+vn 0.131600007 0.0644000024 -0.989199996
+vn 0.0281000007 0.0694999993 -0.997200012
+vn 0.0208999999 0.00829999987 -0.99970001
+vn 0.0760999992 0.107299998 -0.991299987
+vn -0.0397000015 0.0211999994 -0.999000013
+vn -0.0926000029 -0.0504000001 -0.994400024
+vn -0.0553000011 -0.0848999992 -0.994899988
+vn -0.0917999968 -0.0119000003 -0.995700002
+vn -0.1611 -0.126800001 -0.978699982
+vn -0.165900007 -0.180500001 -0.969500005
+vn -0.158800006 -0.164199993 -0.97359997
+vn -0.127299994 -0.103200004 -0.986500025
+vn -0.129999995 -0.0863000005 -0.987699986
+vn -0.152899995 -0.206499994 -0.966400027
+vn -0.130600005 -0.217500001 -0.967299998
+vn -0.1294 -0.208499998 -0.969399989
+vn -0.121799998 -0.155399993 -0.980300009
+vn -0.0544000007 -0.175400004 -0.98299998
+vn -0.0307999998 -0.124799997 -0.991699994
+vn 0.00359999994 -0.102600001 -0.994700015
+vn 0.0806000009 -0.135700002 -0.987500012
+vn 0.0439000018 -0.120999999 -0.991699994
+vn 0.127100006 -0.149100006 -0.980599999
+vn 0.136399999 -0.208499998 -0.968500018
+vn 0.137199998 -0.217700005 -0.966300011
+vn 0.159899995 -0.206499994 -0.965300024
+vn 0.167799994 -0.126599997 -0.977699995
+vn 0.127100006 -0.0907000005 -0.987699986
+vn 0.125300005 -0.1074 -0.986299992
+vn 0.165800005 -0.164199993 -0.97240001
+vn 0.172900006 -0.180500001 -0.968299985
+vn 0.0997999981 -0.0504000001 -0.993700027
+vn 0.0759999976 -0.0784000009 -0.994000018
+vn 0.0989999995 -0.0120000001 -0.995000005
+vn 0.0140000004 0.0465000011 -0.99879998
+vn 0.0573999994 0.0225000009 -0.998099983
+vn -0.105800003 0.0954999998 -0.989799976
+vn -0.124700002 0.064000003 -0.990100026
+vn -0.0691 0.1074 -0.99180001
+vn -0.023 0.0795999989 -0.996599972
+vn -0.1998 0.132100001 -0.970899999
+vn -0.250099987 0.115900002 -0.961300015
+vn -0.234599993 0.107299998 -0.966099977
+vn -0.166700006 0.1096 -0.979900002
+vn -0.151500002 0.108000003 -0.982500017
+vn -0.266200006 0.120499998 -0.95630002
+vn -0.274599999 0.0649999976 -0.959399998
+vn -0.264699996 0.0744000003 -0.961499989
+vn -0.211500004 0.0856000036 -0.97359997
+vn -0.210199997 0.0193000007 -0.977500021
+vn -0.155000001 0.0152000003 -0.987800002
+vn -0.106399998 -0.00209999993 -0.994300008
+vn -0.133100003 -0.0868000016 -0.987299979
+vn -0.129600003 -0.0496999994 -0.9903
+vn -0.131999999 -0.132799998 -0.982299984
+vn -0.186700001 -0.160099998 -0.969299972
+vn -0.197099999 -0.162200004 -0.966899991
+vn -0.160500005 -0.198599994 -0.966899991
+vn -0.101199999 -0.169100001 -0.980400026
+vn -0.0832000002 -0.113200001 -0.990100026
+vn -0.0885000005 -0.131400004 -0.987399995
+vn -0.136999995 -0.176799998 -0.974699974
+vn -0.150999993 -0.186700001 -0.970799983
+vn -0.0478000008 -0.0842999965 -0.995299995
+vn -0.0816000029 -0.0697000027 -0.994199991
+vn 0.0057000001 -0.0137 -0.999899983
+vn -0.0242999997 0.0401999988 -0.998899996
+vn -0.0110999998 -0.0725999996 -0.997300029
+vn 0.0280000009 0.068400003 -0.997300029
+vn -0.00639999984 0.115800001 -0.993300021
+vn 0.0315000005 0.150999993 -0.987999976
+vn -0.00190000003 0.161300004 -0.986899972
+vn 0.0469999984 0.249300003 -0.967299998
+vn 0.0226000007 0.292400002 -0.95599997
+vn 0.0249000005 0.27669999 -0.960600019
+vn 0.0320999995 0.213100001 -0.976499975
+vn 0.0335999988 0.198500007 -0.979499996
+vn 0.0233999994 0.307300001 -0.951300025
+vn -0.0405000001 0.300399989 -0.952899992
+vn -0.0253999997 0.294 -0.955500007
+vn 0.00689999992 0.239700004 -0.970799983
+vn -0.0231999997 0.204999998 -0.978500009
+vn -0.0661000013 0.137999997 -0.988200009
+vn -0.149000004 0.1259 -0.980799973
+vn -0.110299997 0.132599995 -0.985000014
+vn -0.0439999998 0.173999995 -0.983799994
+vn -0.196099997 0.112599999 -0.974099994
+vn -0.239600003 0.157000005 -0.958100021
+vn -0.245900005 0.1646 -0.955200016
+vn -0.272300005 0.118900001 -0.95480001
+vn -0.224399999 0.0702000037 -0.972000003
+vn -0.170399994 0.0604000017 -0.983500004
+vn -0.183400005 0.068599999 -0.980599999
+vn -0.2377 0.111199997 -0.964999974
+vn -0.256099999 0.112899996 -0.959999979
+vn -0.124600001 0.0441999994 -0.99119997
+vn -0.113899998 0.0939999968 -0.989000022
+vn -0.0386999995 0.0165999997 -0.999100029
+vn 0.00359999994 0.061900001 -0.998099983
+vn -0.101300001 0.0132999998 -0.994799972
+vn 0.0458000004 0.0165999997 -0.99879998
+vn 0.131500006 0.0441999994 -0.9903
+vn 0.128299996 0.0807999969 -0.988399982
+vn 0.1083 0.0132999998 -0.994000018
+vn -0.0124000004 0.228100002 -0.973500013
+vn -0.00689999992 0.219799995 -0.975499988
+vn -0.0218000002 0.231800005 -0.972500026
+vn -0.00109999999 0.227699995 -0.973699987
+vn 0.00350000011 0.2245 -0.9745
+vn 0.00710000005 0.222299993 -0.975000024
+vn 0.0297999997 0.235200003 -0.971499979
+vn -0.127299994 0.280600011 -0.951399982
+vn -0.123400003 0.314700007 -0.941100001
+vn -0.143700004 0.31400001 -0.938499987
+vn -0.1074 0.293500006 -0.949899971
+vn -0.0952000022 0.276600003 -0.95630002
+vn -0.0978000015 0.280699998 -0.95480001
+vn -0.0904999971 0.260600001 -0.961199999
+vn -0.0737999976 0.263799995 -0.961799979
+vn -0.0706999972 0.244499996 -0.967100024
+vn -0.0478999987 0.275099993 -0.960200012
+vn -0.0535000004 0.238100007 -0.969799995
+vn -0.185699999 0.321200013 -0.928600013
+vn -0.179900005 0.32069999 -0.929899991
+vn -0.201199993 0.326799989 -0.923399985
+vn -0.192399994 0.321099997 -0.927299976
+vn -0.200200006 0.315800011 -0.92750001
+vn -0.192599997 0.336600006 -0.921700001
+vn -0.205300003 0.3037 -0.930400014
+vn -0.202700004 0.310699999 -0.92869997
+vn -0.200499997 0.309399992 -0.9296
+vn -0.210299999 0.288700014 -0.934099972
+vn -0.206400007 0.275900006 -0.938799977
+vn -0.211999997 0.26730001 -0.939999998
+vn -0.199900001 0.185900003 -0.962000012
+vn -0.188500002 0.172900006 -0.966700017
+vn -0.193800002 0.163499996 -0.967299998
+vn -0.123099998 0.221900001 -0.967299998
+vn -0.243000001 0.188099995 -0.951600015
+vn -0.237200007 0.211899996 -0.948099971
+vn -0.211999997 0.241999999 -0.946799994
+vn -0.186700001 0.1206 -0.975000024
+vn -0.186199993 0.142700002 -0.972100019
+vn -0.177499995 0.1065 -0.978299975
+vn -0.1787 0.0988000035 -0.978900015
+vn -0.182500005 0.0921000019 -0.978900015
+vn -0.183300003 0.0886000022 -0.978999972
+vn -0.185399994 0.0755999982 -0.979799986
+vn -0.240500003 0.0361000001 -0.970000029
+vn -0.216299996 0.057599999 -0.974600017
+vn -0.289400011 -0.0104 -0.957199991
+vn -0.299699992 -0.0208999999 -0.953800023
+vn -0.31400001 -0.0278999992 -0.949000001
+vn -0.25850001 -0.0155999996 -0.965900004
+vn -0.279599994 -0.00529999984 -0.960099995
+vn -0.263700008 0.0164000001 -0.96450001
+vn -0.209700003 0.0627000034 -0.975799978
+vn -0.193000004 0.0676999986 -0.978900015
+vn -0.333000004 -0.0544999987 -0.941299975
+vn -0.331800014 -0.0681999996 -0.940900028
+vn -0.312900007 -0.0401000008 -0.948899984
+vn -0.326900005 -0.0463999994 -0.943899989
+vn -0.333400011 -0.0852999985 -0.938899994
+vn -0.325899988 -0.0817999989 -0.941799998
+vn -0.324200004 -0.0904999971 -0.941600025
+vn -0.326400012 -0.0829999968 -0.941600025
+vn -0.334300011 -0.0788000003 -0.939199984
+vn -0.328900009 -0.0759000033 -0.941299975
+vn -0.35800001 -0.0734999999 -0.930800021
+vn -0.309199989 -0.0942000002 -0.94630003
+vn -0.314700007 -0.0773999989 -0.94599998
+vn -0.294400007 -0.0949999988 -0.950999975
+vn -0.286000013 -0.104099996 -0.952600002
+vn -0.192000002 -0.0934000015 -0.976899981
+vn -0.169200003 -0.138300002 -0.975799978
+vn -0.155300006 -0.1162 -0.981000006
+vn -0.210600004 -0.148800001 -0.966199994
+vn -0.229100004 -0.111000001 -0.967100024
+vn -0.209700003 -0.0261000004 -0.977400005
+vn -0.227200001 -0.125799999 -0.965699971
+vn -0.245900005 -0.150199994 -0.957599998
+vn -0.261599988 -0.106799997 -0.959200025
+vn -0.278400004 -0.0957999974 -0.95569998
+vn -0.1237 -0.120099999 -0.985000014
+vn -0.114799999 -0.122299999 -0.985800028
+vn -0.103799999 -0.122100003 -0.987100005
+vn -0.105700001 -0.130999997 -0.985700011
+vn -0.110600002 -0.126800001 -0.985700011
+vn -0.100400001 -0.136800006 -0.985499978
+vn -0.0961000025 -0.1479 -0.984300017
+vn -0.0857999995 -0.167099997 -0.982200027
+vn -0.0427000001 -0.255499989 -0.965900004
+vn -0.0441999994 -0.240099996 -0.969699979
+vn -0.0417999998 -0.26699999 -0.962800026
+vn -0.0614 -0.225400001 -0.972299993
+vn -0.0750999972 -0.216700003 -0.97329998
+vn -0.114699997 -0.212599993 -0.970399976
+vn -0.0844999999 -0.181700006 -0.979700029
+vn -0.0625 -0.192100003 -0.979399979
+vn -0.0737000033 -0.190699995 -0.978900015
+vn -0.0386000015 -0.286900014 -0.957199991
+vn -0.0383000001 -0.294200003 -0.954999983
+vn -0.0115 -0.313899994 -0.949400008
+vn -0.0057000001 -0.32280001 -0.946500003
+vn -0.0175999999 -0.330199987 -0.943700016
+vn -0.0219000001 -0.297500014 -0.95450002
+vn -0.0201999992 -0.306600004 -0.951600015
+vn 0.00410000002 -0.325599998 -0.945500016
+vn -0.00639999984 -0.349299997 -0.936999977
+vn 0.0115999999 -0.323799998 -0.94599998
+vn 0.0156999994 -0.317400008 -0.948099971
+vn 0.0113000004 -0.332100004 -0.943199992
+vn 0.0342000015 -0.297699988 -0.954100013
+vn 0.0326000005 -0.283399999 -0.958500028
+vn -0.00100000005 -0.300999999 -0.953599989
+vn 0.0647 -0.2227 -0.9727
+vn 0.0725999996 -0.238100007 -0.968500018
+vn 0.108900003 -0.226699993 -0.967800021
+vn 0.0751999989 -0.195899993 -0.977699995
+vn 0.0658999979 -0.244599998 -0.967400014
+vn 0.0421000011 -0.245199993 -0.968599975
+vn 0.0593000017 -0.279100001 -0.958400011
+vn 0.0562000014 -0.263099998 -0.963100016
+vn 0.0465999991 -0.287900001 -0.956499994
+vn 0.0943000019 -0.151700005 -0.983900011
+vn 0.0998999998 -0.147 -0.984099984
+vn 0.0991000012 -0.170200005 -0.980400026
+vn 0.103399999 -0.132300004 -0.985800028
+vn 0.0684999973 -0.224199995 -0.972100019
+vn 0.112800002 -0.126800001 -0.985499978
+vn 0.117600001 -0.127299994 -0.984899998
+vn 0.123899996 -0.125200003 -0.984399974
+vn 0.130500004 -0.122100003 -0.983900011
+vn 0.144099995 -0.122100003 -0.981999993
+vn 0.164399996 -0.130400002 -0.977699995
+vn 0.25029999 -0.189300001 -0.949500024
+vn 0.216700003 -0.0912000015 -0.972000003
+vn 0.251800001 -0.108000003 -0.961700022
+vn 0.265300006 -0.101000004 -0.958899975
+vn 0.235200003 -0.0886000022 -0.967899978
+vn 0.211600006 -0.130799994 -0.968599975
+vn 0.191799998 -0.0617999993 -0.979499996
+vn 0.303200006 -0.0961000025 -0.948099971
+vn 0.314799994 -0.0984999985 -0.944000006
+vn 0.293099999 -0.100299999 -0.950800002
+vn 0.279000014 -0.105999999 -0.954400003
+vn 0.334899992 -0.0877000019 -0.938199997
+vn 0.331099987 -0.0898000002 -0.939300001
+vn 0.326299995 -0.0939000025 -0.940599978
+vn 0.3398 -0.0851999968 -0.936600029
+vn 0.341899991 -0.0803000033 -0.93629998
+vn 0.340799987 -0.0697999969 -0.9375
+vn 0.331800014 -0.0746000037 -0.940400004
+vn 0.341100007 -0.0656000003 -0.937699974
+vn 0.317600012 -0.0384999998 -0.947399974
+vn 0.319499999 -0.0315999985 -0.947099984
+vn 0.328000009 -0.0483000018 -0.943400025
+vn 0.278800011 -0.00329999998 -0.960300028
+vn 0.296700001 -0.00779999979 -0.954900026
+vn 0.296299994 -0.0855000019 -0.951300025
+vn 0.255299985 0.0121999998 -0.966799974
+vn 0.265100002 0.00419999985 -0.96420002
+vn 0.240799993 0.0199999996 -0.970399976
+vn 0.229900002 0.0251000002 -0.972899973
+vn 0.170599997 0.0083999997 -0.985300004
+vn 0.185200006 0.0592 -0.98089999
+vn 0.101599999 0.576600015 -0.810699999
+vn 0.0496999994 0.00100000005 -0.99879998
+vn 0.0838000029 -0.00860000029 -0.996399999
+vn 0.0344999991 0.0130000003 -0.999300003
+vn 0.00860000029 0.0055999998 -0.999899983
+vn 0.0617000014 0.218199998 -0.973999977
+vn 0.0653999969 0.0171000008 -0.997699976
+vn 0.106799997 0.0335000008 -0.993700027
+vn 0.141800001 -0.0604999997 -0.987999976
+vn -0.180099994 0.347600013 0.92019999
+vn -0.180099994 0.349099994 0.91960001
+vn 0.184799999 -0.471700013 -0.862200022
+vn 0.157800004 0.0252999999 -0.987200022
+vn -0.167300001 0.0970000029 0.981100023
+vn -0.173299998 0.178399995 0.968599975
+vn 0.169200003 0.109399997 -0.979499996
+vn -0.180299997 0.2764 0.944000006
+vn -0.0270000007 -0.00639999984 -0.999599993
+vn -0.0309999995 0.00150000001 -0.999499977
+vn -0.0116999997 -0.00549999997 -0.999899983
+vn 0.0551999994 0.0331999995 -0.997900009
+vn -0.0379999988 0.00340000005 -0.999300003
+vn -0.0441999994 0.0281000007 -0.998600006
+vn -0.0226000007 0.0430000015 -0.99879998
+vn -0.0353000015 0.0362000018 -0.998700023
+vn -0.00579999993 0.0454999991 -0.998899996
+vn -0.0467999987 0.0456000008 -0.997900009
+vn -0.0377999991 0.0286999997 -0.998899996
+vn -0.0392999984 0.0239000004 -0.998899996
+vn -0.0196000002 0.0299999993 -0.99940002
+vn 0.0785999969 0.117799997 -0.989899993
+vn 0.0773999989 0.0764999986 -0.994099975
+vn 0.114 0.0922000036 -0.989199996
+vn 0.1193 0.109899998 -0.986699998
+vn 0.0476999991 0.0931999981 -0.994499981
+vn 0.0263 0.0588999987 -0.997900009
+vn 0.135499999 0.134900004 -0.981599987
+vn 0.129999995 0.114600003 -0.984899998
+vn 0.169300005 0.145799994 -0.974699974
+vn 0.156800002 0.135800004 -0.978200018
+vn 0.143399999 0.126100004 -0.981599987
+vn 0.179800004 0.170399994 -0.968800008
+vn 0.195899993 0.190599993 -0.961899996
+vn 0.207699999 0.205599993 -0.95630002
+vn 0.1831 0.178900003 -0.966700017
+vn 0.205699995 0.226300001 -0.952099979
+vn 0.208700001 0.2456 -0.946699977
+vn 0.213200003 0.264699996 -0.940500021
+vn 0.214100003 0.281100005 -0.935500026
+vn 0.214100003 0.303200006 -0.928600013
+vn 0.209000006 0.294800013 -0.932399988
+vn 0.206400007 0.310699999 -0.9278
+vn 0.223499998 0.307999998 -0.924799979
+vn 0.2183 0.29370001 -0.930599988
+vn 0.201100007 0.318399996 -0.926400006
+vn 0.194299996 0.321399987 -0.926800013
+vn 0.203600004 0.331499994 -0.921199977
+vn 0.225899994 0.337799996 -0.913699985
+vn 0.184300005 0.320600003 -0.929099977
+vn 0.188800007 0.328799993 -0.925300002
+vn 0.174899995 0.319499999 -0.931299984
+vn 0.0771000013 0.254200011 -0.964100003
+vn 0.0878000036 0.294699997 -0.951600015
+f 1763/1/1 1774/2/1 1764/3/1
+f 1763/1/2 1775/4/2 1776/5/2
+f 1763/1/3 1776/5/3 1774/2/3
+f 1777/6/4 1775/4/4 1778/7/4
+f 1776/5/5 1775/4/5 1777/6/5
+f 1781/8/6 1782/9/6 1788/10/6
+f 1781/8/7 1788/10/7 1783/11/7
+f 1775/4/8 1782/9/8 1784/12/8
+f 1775/4/9 1784/12/9 1778/7/9
+f 1788/10/10 1786/13/10 1783/11/10
+f 90/14/11 3711/15/11 3710/16/11
+f 3833/17/12 274/18/12 3834/19/12
+f 274/18/13 3837/20/13 3838/21/13
+f 274/18/14 3838/21/14 3834/19/14
+f 3839/22/15 3837/20/15 3844/23/15
+f 3839/22/16 3844/23/16 3840/24/16
+f 3841/25/17 3850/26/17 3842/27/17
+f 3843/28/18 3844/23/18 3850/26/18
+f 3843/28/19 3850/26/19 3841/25/19
+f 3844/23/20 3845/29/20 3840/24/20
+f 3844/23/21 3843/28/21 3845/29/21
+f 1/30/22 2/31/23 3752/32/24
+f 7/33/25 8/34/26 9/35/27
+f 6/36/28 2/31/23 1/30/22
+f 3/37/29 2/31/23 6/36/28
+f 11/38/30 3/37/29 6/36/28
+f 11/38/30 10/39/31 12/40/32
+f 12/40/32 10/39/31 13/41/33
+f 14/42/34 10/39/31 22/43/35
+f 13/41/33 10/39/31 14/42/34
+f 16/44/36 15/45/37 17/46/38
+f 3/37/29 11/38/30 15/45/37
+f 15/45/37 11/38/30 12/40/32
+f 17/46/38 15/45/37 12/40/32
+f 20/47/39 18/48/40 19/49/41
+f 20/47/39 19/49/41 21/50/42
+f 14/42/34 18/48/40 13/41/33
+f 18/48/40 14/42/34 22/43/35
+f 20/47/39 21/50/42 23/51/43
+f 23/51/43 21/50/42 31/52/44
+f 18/48/40 20/47/39 13/41/33
+f 12/40/32 23/51/43 24/53/45
+f 13/41/33 23/51/43 12/40/32
+f 20/47/39 23/51/43 13/41/33
+f 17/46/38 25/54/46 26/55/47
+f 26/55/47 25/54/46 38/56/48
+f 17/46/38 26/55/47 16/44/36
+f 25/54/46 17/46/38 12/40/32
+f 25/54/46 12/40/32 24/53/45
+f 29/57/49 27/58/50 28/59/51
+f 30/60/52 27/58/50 29/57/49
+f 26/55/47 27/58/50 30/60/52
+f 26/55/47 30/60/52 16/44/36
+f 28/59/51 27/58/50 26/55/47
+f 33/61/53 31/52/44 3734/62/54
+f 3734/62/54 31/52/44 21/50/42
+f 32/63/55 31/52/44 33/61/53
+f 24/53/45 34/64/56 35/65/57
+f 23/51/43 34/64/56 24/53/45
+f 31/52/44 34/64/56 23/51/43
+f 34/64/56 31/52/44 32/63/55
+f 43/66/58 34/64/56 32/63/55
+f 38/56/48 36/67/59 37/68/60
+f 25/54/46 36/67/59 38/56/48
+f 24/53/45 36/67/59 25/54/46
+f 36/67/59 24/53/45 35/65/57
+f 40/69/61 28/59/51 39/70/62
+f 39/70/62 28/59/51 38/56/48
+f 38/56/48 28/59/51 26/55/47
+f 39/70/62 38/56/48 37/68/60
+f 43/66/58 41/71/63 42/72/64
+f 42/72/64 41/71/63 44/73/65
+f 32/63/55 41/71/63 43/66/58
+f 45/74/66 41/71/63 32/63/55
+f 45/74/66 32/63/55 33/61/53
+f 41/71/63 45/74/66 44/73/65
+f 43/66/58 46/75/67 35/65/57
+f 34/64/56 43/66/58 35/65/57
+f 35/65/57 46/75/67 47/76/68
+f 46/75/67 43/66/58 42/72/64
+f 49/77/69 47/76/68 48/78/70
+f 36/67/59 47/76/68 37/68/60
+f 37/68/60 47/76/68 49/77/69
+f 35/65/57 47/76/68 36/67/59
+f 53/79/71 49/77/69 50/80/72
+f 39/70/62 49/77/69 40/69/61
+f 40/69/61 49/77/69 53/79/71
+f 49/77/69 39/70/62 37/68/60
+f 50/80/72 49/77/69 48/78/70
+f 3771/81/73 51/82/74 3770/83/75
+f 40/69/61 51/82/74 3771/81/73
+f 51/82/74 53/79/71 3770/83/75
+f 3770/83/75 53/79/71 52/84/76
+f 40/69/61 53/79/71 51/82/74
+f 44/73/65 54/85/77 55/86/78
+f 56/87/79 55/86/78 57/88/80
+f 44/73/65 56/87/79 42/72/64
+f 55/86/78 56/87/79 44/73/65
+f 61/89/81 58/90/82 60/91/83
+f 58/90/82 59/92/84 60/91/83
+f 46/75/67 58/90/82 61/89/81
+f 46/75/67 61/89/81 47/76/68
+f 58/90/82 46/75/67 42/72/64
+f 56/87/79 58/90/82 42/72/64
+f 58/90/82 56/87/79 57/88/80
+f 59/92/84 58/90/82 57/88/80
+f 61/89/81 62/93/85 48/78/70
+f 61/89/81 48/78/70 47/76/68
+f 62/93/85 61/89/81 60/91/83
+f 63/94/86 64/95/87 66/96/88
+f 50/80/72 63/94/86 53/79/71
+f 62/93/85 63/94/86 48/78/70
+f 48/78/70 63/94/86 50/80/72
+f 64/95/87 63/94/86 62/93/85
+f 65/97/89 66/96/88 3766/98/90
+f 53/79/71 65/97/89 52/84/76
+f 63/94/86 65/97/89 53/79/71
+f 66/96/88 65/97/89 63/94/86
+f 67/99/91 68/100/92 97/101/93
+f 67/99/91 97/101/93 100/102/94
+f 54/85/77 67/99/91 55/86/78
+f 68/100/92 67/99/91 54/85/77
+f 68/100/92 54/85/77 3728/103/95
+f 97/101/93 68/100/92 69/104/96
+f 69/104/96 68/100/92 3724/105/97
+f 57/88/80 70/106/98 71/107/99
+f 55/86/78 70/106/98 57/88/80
+f 67/99/91 70/106/98 55/86/78
+f 71/107/99 70/106/98 67/99/91
+f 71/107/99 67/99/91 100/102/94
+f 59/92/84 72/108/100 60/91/83
+f 72/108/100 59/92/84 71/107/99
+f 71/107/99 59/92/84 57/88/80
+f 74/109/101 73/110/102 75/111/103
+f 60/91/83 73/110/102 62/93/85
+f 62/93/85 73/110/102 74/109/101
+f 72/108/100 73/110/102 60/91/83
+f 75/111/103 73/110/102 72/108/100
+f 64/95/87 76/112/104 66/96/88
+f 74/109/101 76/112/104 64/95/87
+f 74/109/101 64/95/87 62/93/85
+f 77/113/105 76/112/104 74/109/101
+f 78/114/106 79/115/107 111/116/108
+f 66/96/88 78/114/106 3766/98/90
+f 76/112/104 78/114/106 66/96/88
+f 79/115/107 78/114/106 77/113/105
+f 78/114/106 76/112/104 77/113/105
+f 81/117/109 80/118/110 82/119/111
+f 80/118/110 81/117/109 83/120/112
+f 84/121/113 81/117/109 85/122/114
+f 84/121/113 85/122/114 86/123/115
+f 87/124/116 81/117/109 84/121/113
+f 87/124/116 84/121/113 88/125/117
+f 85/122/114 81/117/109 82/119/111
+f 89/126/118 84/121/113 86/123/115
+f 84/121/113 89/126/118 90/14/119
+f 84/121/113 90/14/119 88/125/117
+f 91/127/120 92/128/121 93/129/122
+f 92/128/121 91/127/120 94/130/123
+f 90/14/119 92/128/121 94/130/123
+f 92/128/121 90/14/119 89/126/118
+f 69/104/96 95/131/124 96/132/125
+f 95/131/124 69/104/96 91/127/120
+f 95/131/124 91/127/120 93/129/122
+f 97/101/93 98/133/126 101/134/127
+f 96/132/125 97/101/93 69/104/96
+f 98/133/126 97/101/93 96/132/125
+f 99/135/128 100/102/94 101/134/127
+f 99/135/128 101/134/127 102/136/129
+f 71/107/99 100/102/94 99/135/128
+f 101/134/127 100/102/94 97/101/93
+f 99/135/128 103/137/130 72/108/100
+f 99/135/128 72/108/100 71/107/99
+f 103/137/130 99/135/128 102/136/129
+f 107/138/131 104/139/132 105/140/133
+f 104/139/132 106/141/134 105/140/133
+f 75/111/103 104/139/132 107/138/131
+f 75/111/103 107/138/131 74/109/101
+f 103/137/130 104/139/132 75/111/103
+f 103/137/130 75/111/103 72/108/100
+f 106/141/134 104/139/132 103/137/130
+f 107/138/131 108/142/135 109/143/136
+f 107/138/131 109/143/136 77/113/105
+f 107/138/131 77/113/105 74/109/101
+f 108/142/135 107/138/131 105/140/133
+f 111/116/108 79/115/107 110/144/137
+f 111/116/108 110/144/137 112/145/138
+f 109/143/136 79/115/107 77/113/105
+f 110/144/137 79/115/107 109/143/136
+f 114/146/139 111/116/108 113/147/140
+f 113/147/140 111/116/108 112/145/138
+f 116/148/141 115/149/142 172/150/143
+f 115/149/142 117/151/144 3774/152/145
+f 114/146/139 115/149/142 3774/152/145
+f 172/150/143 115/149/142 113/147/140
+f 115/149/142 114/146/139 113/147/140
+f 118/153/146 116/148/141 119/154/147
+f 120/155/148 116/148/141 118/153/146
+f 120/155/148 118/153/146 3788/156/149
+f 115/149/142 116/148/141 120/155/148
+f 115/149/142 120/155/148 117/151/144
+f 123/157/150 121/158/151 122/159/152
+f 123/157/150 122/159/152 124/160/153
+f 125/161/154 121/158/151 126/162/155
+f 126/162/155 121/158/151 123/157/150
+f 119/154/147 121/158/151 118/153/146
+f 121/158/151 125/161/154 118/153/146
+f 122/159/152 121/158/151 119/154/147
+f 127/163/156 123/157/150 124/160/153
+f 128/164/157 130/165/158 129/166/159
+f 127/163/156 128/164/157 131/167/160
+f 123/157/150 127/163/156 131/167/160
+f 130/165/158 128/164/157 127/163/156
+f 130/165/158 127/163/156 178/168/161
+f 132/169/162 133/170/163 134/171/164
+f 133/170/163 132/169/162 138/172/165
+f 134/171/164 133/170/163 135/173/166
+f 134/171/164 135/173/166 136/174/167
+f 140/175/168 137/176/169 139/177/170
+f 3719/178/171 138/172/165 137/176/169
+f 137/176/169 138/172/165 132/169/162
+f 139/177/170 137/176/169 132/169/162
+f 141/179/172 140/175/168 142/180/173
+f 144/181/174 140/175/168 143/182/175
+f 143/182/175 140/175/168 141/179/172
+f 137/176/169 140/175/168 144/181/174
+f 137/176/169 144/181/174 3719/178/171
+f 141/179/172 145/183/176 82/119/111
+f 80/118/110 141/179/172 82/119/111
+f 143/182/175 141/179/172 80/118/110
+f 145/183/176 141/179/172 142/180/173
+f 146/184/177 148/185/178 202/186/179
+f 147/187/180 146/184/177 202/186/179
+f 85/122/114 146/184/177 86/123/115
+f 146/184/177 147/187/180 86/123/115
+f 145/183/176 146/184/177 82/119/111
+f 82/119/111 146/184/177 85/122/114
+f 148/185/178 146/184/177 145/183/176
+f 149/188/181 147/187/180 150/189/182
+f 86/123/115 149/188/181 89/126/118
+f 89/126/118 149/188/181 152/190/183
+f 147/187/180 149/188/181 86/123/115
+f 150/189/182 147/187/180 202/186/179
+f 93/129/122 151/191/184 156/192/185
+f 152/190/183 151/191/184 93/129/122
+f 92/128/121 152/190/183 93/129/122
+f 152/190/183 92/128/121 89/126/118
+f 151/191/184 152/190/183 149/188/181
+f 150/189/182 151/191/184 149/188/181
+f 154/193/186 153/194/187 155/195/188
+f 153/194/187 156/192/185 155/195/188
+f 95/131/124 153/194/187 154/193/186
+f 95/131/124 154/193/186 96/132/125
+f 93/129/122 153/194/187 95/131/124
+f 156/192/185 153/194/187 93/129/122
+f 98/133/126 154/193/186 157/196/189
+f 154/193/186 98/133/126 96/132/125
+f 158/197/190 101/134/127 159/198/191
+f 101/134/127 158/197/190 102/136/129
+f 159/198/191 101/134/127 157/196/189
+f 157/196/189 101/134/127 98/133/126
+f 103/137/130 160/199/192 106/141/134
+f 158/197/190 160/199/192 102/136/129
+f 102/136/129 160/199/192 103/137/130
+f 161/200/193 160/199/192 158/197/190
+f 106/141/134 162/201/194 163/202/195
+f 105/140/133 106/141/134 163/202/195
+f 162/201/194 106/141/134 160/199/192
+f 162/201/194 160/199/192 161/200/193
+f 108/142/135 164/203/196 109/143/136
+f 109/143/136 164/203/196 165/204/197
+f 105/140/133 164/203/196 108/142/135
+f 164/203/196 105/140/133 163/202/195
+f 166/205/198 167/206/199 170/207/200
+f 110/144/137 166/205/198 112/145/138
+f 165/204/197 166/205/198 110/144/137
+f 165/204/197 110/144/137 109/143/136
+f 167/206/199 166/205/198 165/204/197
+f 168/208/201 169/209/202 170/207/200
+f 169/209/202 168/208/201 172/150/143
+f 113/147/140 169/209/202 172/150/143
+f 166/205/198 169/209/202 113/147/140
+f 166/205/198 113/147/140 112/145/138
+f 170/207/200 169/209/202 166/205/198
+f 172/150/143 171/210/203 116/148/141
+f 171/210/203 172/150/143 168/208/201
+f 175/211/204 173/212/205 174/213/206
+f 174/213/206 173/212/205 176/214/207
+f 116/148/141 173/212/205 175/211/204
+f 116/148/141 175/211/204 119/154/147
+f 119/154/147 175/211/204 122/159/152
+f 171/210/203 173/212/205 116/148/141
+f 176/214/207 173/212/205 171/210/203
+f 177/215/208 242/216/209 179/217/210
+f 122/159/152 177/215/208 124/160/153
+f 175/211/204 177/215/208 122/159/152
+f 242/216/209 177/215/208 175/211/204
+f 242/216/209 175/211/204 174/213/206
+f 130/165/158 178/168/161 182/218/211
+f 178/168/161 179/217/210 180/219/212
+f 182/218/211 178/168/161 180/219/212
+f 177/215/208 178/168/161 124/160/153
+f 124/160/153 178/168/161 127/163/156
+f 179/217/210 178/168/161 177/215/208
+f 181/220/213 182/218/211 183/221/214
+f 130/165/158 181/220/213 129/166/159
+f 182/218/211 181/220/213 130/165/158
+f 184/222/215 185/223/216 186/224/217
+f 181/220/213 185/223/216 129/166/159
+f 186/224/217 185/223/216 183/221/214
+f 183/221/214 185/223/216 181/220/213
+f 188/225/218 189/226/219 190/227/220
+f 187/228/221 188/225/218 190/227/220
+f 188/225/218 187/228/221 192/229/222
+f 192/229/222 187/228/221 3801/230/223
+f 191/231/224 188/225/218 192/229/222
+f 189/226/219 188/225/218 191/231/224
+f 184/222/215 190/227/220 189/226/219
+f 249/232/225 190/227/220 186/224/217
+f 190/227/220 184/222/215 186/224/217
+f 195/233/226 139/177/170 132/169/162
+f 193/234/227 139/177/170 195/233/226
+f 197/235/228 196/236/229 193/234/227
+f 193/234/227 196/236/229 194/237/230
+f 197/235/228 193/234/227 195/233/226
+f 198/238/231 194/237/230 199/239/232
+f 200/240/233 198/238/231 199/239/232
+f 140/175/168 198/238/231 142/180/173
+f 142/180/173 198/238/231 200/240/233
+f 193/234/227 198/238/231 139/177/170
+f 139/177/170 198/238/231 140/175/168
+f 194/237/230 198/238/231 193/234/227
+f 145/183/176 200/240/233 201/241/234
+f 200/240/233 145/183/176 142/180/173
+f 202/186/179 148/185/178 203/242/235
+f 201/241/234 148/185/178 145/183/176
+f 203/242/235 148/185/178 201/241/234
+f 204/243/236 150/189/182 202/186/179
+f 205/244/237 204/243/236 262/245/238
+f 204/243/236 202/186/179 203/242/235
+f 262/245/238 204/243/236 203/242/235
+f 151/191/184 207/246/239 206/247/240
+f 151/191/184 206/247/240 156/192/185
+f 204/243/236 207/246/239 150/189/182
+f 207/246/239 151/191/184 150/189/182
+f 207/246/239 204/243/236 205/244/237
+f 155/195/188 208/248/241 211/249/242
+f 208/248/241 209/250/243 211/249/242
+f 156/192/185 208/248/241 155/195/188
+f 206/247/240 208/248/241 156/192/185
+f 208/248/241 206/247/240 207/246/239
+f 209/250/243 208/248/241 207/246/239
+f 210/251/244 211/249/242 275/252/245
+f 212/253/246 210/251/244 275/252/245
+f 154/193/186 210/251/244 157/196/189
+f 155/195/188 210/251/244 154/193/186
+f 211/249/242 210/251/244 155/195/188
+f 213/254/247 212/253/246 273/255/248
+f 159/198/191 212/253/246 213/254/247
+f 159/198/191 213/254/247 158/197/190
+f 210/251/244 212/253/246 159/198/191
+f 210/251/244 159/198/191 157/196/189
+f 213/254/247 214/256/249 161/200/193
+f 213/254/247 161/200/193 158/197/190
+f 215/257/250 214/256/249 213/254/247
+f 217/258/251 216/259/252 218/260/253
+f 162/201/194 216/259/252 163/202/195
+f 214/256/249 216/259/252 161/200/193
+f 161/200/193 216/259/252 162/201/194
+f 218/260/253 216/259/252 214/256/249
+f 218/260/253 214/256/249 215/257/250
+f 218/260/253 219/261/254 217/258/251
+f 219/261/254 218/260/253 220/262/255
+f 222/263/256 224/264/257 225/265/258
+f 223/266/259 222/263/256 225/265/258
+f 164/203/196 222/263/256 165/204/197
+f 165/204/197 222/263/256 223/266/259
+f 216/259/252 222/263/256 163/202/195
+f 163/202/195 222/263/256 164/203/196
+f 222/263/256 216/259/252 217/258/251
+f 224/264/257 222/263/256 217/258/251
+f 225/265/258 224/264/257 226/267/260
+f 224/264/257 227/268/261 226/267/260
+f 219/261/254 224/264/257 217/258/251
+f 227/268/261 224/264/257 219/261/254
+f 227/268/261 219/261/254 221/269/262
+f 232/270/263 228/271/264 229/272/265
+f 167/206/199 228/271/264 232/270/263
+f 167/206/199 232/270/263 170/207/200
+f 223/266/259 228/271/264 167/206/199
+f 223/266/259 167/206/199 165/204/197
+f 229/272/265 228/271/264 223/266/259
+f 229/272/265 223/266/259 225/265/258
+f 234/273/266 229/272/265 230/274/267
+f 229/272/265 234/273/266 232/270/263
+f 230/274/267 229/272/265 226/267/260
+f 229/272/265 225/265/258 226/267/260
+f 231/275/268 232/270/263 233/276/269
+f 231/275/268 233/276/269 237/277/270
+f 170/207/200 232/270/263 231/275/268
+f 170/207/200 231/275/268 168/208/201
+f 234/273/266 233/276/269 232/270/263
+f 234/273/266 235/278/271 236/279/272
+f 236/279/272 235/278/271 282/280/273
+f 233/276/269 234/273/266 236/279/272
+f 235/278/271 234/273/266 230/274/267
+f 176/214/207 237/277/270 238/281/274
+f 238/281/274 237/277/270 239/282/275
+f 171/210/203 237/277/270 176/214/207
+f 237/277/270 171/210/203 168/208/201
+f 231/275/268 237/277/270 168/208/201
+f 243/283/276 240/284/277 241/285/278
+f 176/214/207 240/284/277 174/213/206
+f 174/213/206 240/284/277 243/283/276
+f 240/284/277 176/214/207 238/281/274
+f 242/216/209 243/283/276 245/286/279
+f 243/283/276 242/216/209 174/213/206
+f 180/219/212 245/286/279 244/287/280
+f 245/286/279 180/219/212 179/217/210
+f 242/216/209 245/286/279 179/217/210
+f 246/288/281 247/289/282 248/290/283
+f 247/289/282 246/288/281 183/221/214
+f 182/218/211 247/289/282 183/221/214
+f 244/287/280 247/289/282 180/219/212
+f 180/219/212 247/289/282 182/218/211
+f 249/232/225 250/291/284 3804/292/285
+f 190/227/220 249/232/225 187/228/221
+f 251/293/286 249/232/225 186/224/217
+f 250/291/284 249/232/225 251/293/286
+f 251/293/286 252/294/287 250/291/284
+f 186/224/217 252/294/287 251/293/286
+f 246/288/281 252/294/287 183/221/214
+f 252/294/287 186/224/217 183/221/214
+f 250/291/284 253/295/288 3804/292/285
+f 252/294/287 254/296/289 250/291/284
+f 254/296/289 253/295/288 250/291/284
+f 255/297/290 254/296/289 246/288/281
+f 246/288/281 254/296/289 252/294/287
+f 256/298/291 199/239/232 257/299/292
+f 196/236/229 199/239/232 194/237/230
+f 257/299/292 199/239/232 259/300/293
+f 259/300/293 199/239/232 196/236/229
+f 258/301/294 257/299/292 259/300/293
+f 257/299/292 258/301/294 256/298/291
+f 263/302/295 260/303/296 261/304/297
+f 200/240/233 260/303/296 201/241/234
+f 201/241/234 260/303/296 263/302/295
+f 256/298/291 260/303/296 199/239/232
+f 199/239/232 260/303/296 200/240/233
+f 261/304/297 260/303/296 256/298/291
+f 262/245/238 263/302/295 264/305/298
+f 203/242/235 263/302/295 262/245/238
+f 263/302/295 203/242/235 201/241/234
+f 264/305/298 263/302/295 261/304/297
+f 266/306/299 265/307/300 267/308/301
+f 205/244/237 265/307/300 266/306/299
+f 262/245/238 265/307/300 205/244/237
+f 265/307/300 262/245/238 264/305/298
+f 268/309/302 269/310/303 209/250/243
+f 207/246/239 268/309/302 209/250/243
+f 266/306/299 268/309/302 205/244/237
+f 205/244/237 268/309/302 207/246/239
+f 268/309/302 266/306/299 267/308/301
+f 270/311/304 269/310/303 271/312/305
+f 209/250/243 269/310/303 270/311/304
+f 211/249/242 209/250/243 270/311/304
+f 212/253/246 272/313/306 273/255/248
+f 275/252/245 272/313/306 212/253/246
+f 272/313/306 275/252/245 276/314/307
+f 3844/23/308 272/313/306 276/314/307
+f 275/252/245 270/311/304 276/314/307
+f 211/249/242 270/311/304 275/252/245
+f 276/314/307 270/311/304 315/315/309
+f 315/315/309 270/311/304 271/312/305
+f 278/316/310 239/282/275 277/317/311
+f 239/282/275 278/316/310 238/281/274
+f 236/279/272 239/282/275 233/276/269
+f 233/276/269 239/282/275 237/277/270
+f 277/317/311 239/282/275 236/279/272
+f 279/318/312 280/319/313 281/320/314
+f 280/319/313 279/318/312 277/317/311
+f 280/319/313 277/317/311 282/280/273
+f 282/280/273 277/317/311 236/279/272
+f 280/319/313 282/280/273 283/321/315
+f 283/321/315 282/280/273 284/322/316
+f 284/322/316 282/280/273 235/278/271
+f 283/321/315 284/322/316 285/323/317
+f 280/319/313 283/321/315 281/320/314
+f 230/274/267 284/322/316 235/278/271
+f 285/323/317 284/322/316 230/274/267
+f 285/323/317 230/274/267 226/267/260
+f 278/316/310 286/324/318 241/285/278
+f 240/284/277 278/316/310 241/285/278
+f 238/281/274 278/316/310 240/284/277
+f 286/324/318 278/316/310 277/317/311
+f 288/325/319 287/326/320 3828/327/321
+f 286/324/318 287/326/320 288/325/319
+f 279/318/312 287/326/320 277/317/311
+f 277/317/311 287/326/320 286/324/318
+f 287/326/320 279/318/312 3823/328/322
+f 3823/328/322 279/318/312 281/320/314
+f 289/329/323 292/330/324 245/286/279
+f 243/283/276 289/329/323 245/286/279
+f 286/324/318 289/329/323 241/285/278
+f 241/285/278 289/329/323 243/283/276
+f 289/329/323 286/324/318 288/325/319
+f 255/297/290 248/290/283 290/331/325
+f 248/290/283 255/297/290 246/288/281
+f 248/290/283 247/289/282 244/287/280
+f 290/331/325 248/290/283 291/332/326
+f 248/290/283 292/330/324 291/332/326
+f 245/286/279 292/330/324 244/287/280
+f 244/287/280 292/330/324 248/290/283
+f 291/332/326 292/330/324 294/333/327
+f 294/333/327 292/330/324 289/329/323
+f 294/333/327 293/334/328 295/335/329
+f 289/329/323 293/334/328 294/333/327
+f 288/325/319 293/334/328 289/329/323
+f 293/334/328 288/325/319 296/336/330
+f 296/336/330 288/325/319 3828/327/321
+f 290/331/325 297/337/331 255/297/290
+f 298/338/332 297/337/331 291/332/326
+f 291/332/326 297/337/331 290/331/325
+f 294/333/327 298/338/332 291/332/326
+f 299/339/333 298/338/332 294/333/327
+f 300/340/334 301/341/335 261/304/297
+f 258/301/294 300/340/334 256/298/291
+f 300/340/334 261/304/297 256/298/291
+f 301/341/335 300/340/334 258/301/294
+f 302/342/336 301/341/335 258/301/294
+f 302/342/336 258/301/294 3685/343/337
+f 307/344/338 302/342/336 303/345/339
+f 303/345/339 302/342/336 304/346/340
+f 301/341/335 302/342/336 307/344/338
+f 308/347/341 305/348/342 306/349/343
+f 305/348/342 307/344/338 306/349/343
+f 264/305/298 305/348/342 308/347/341
+f 305/348/342 264/305/298 261/304/297
+f 301/341/335 305/348/342 261/304/297
+f 307/344/338 305/348/342 301/341/335
+f 308/347/341 306/349/343 309/350/344
+f 267/308/301 308/347/341 309/350/344
+f 265/307/300 308/347/341 267/308/301
+f 308/347/341 265/307/300 264/305/298
+f 312/351/345 310/352/346 311/353/347
+f 268/309/302 310/352/346 312/351/345
+f 268/309/302 312/351/345 269/310/303
+f 267/308/301 310/352/346 268/309/302
+f 310/352/346 267/308/301 309/350/344
+f 315/315/309 312/351/345 313/354/348
+f 313/354/348 312/351/345 314/355/349
+f 271/312/305 312/351/345 315/315/309
+f 312/351/345 271/312/305 269/310/303
+f 314/355/349 312/351/345 311/353/347
+f 316/356/350 315/315/309 313/354/348
+f 316/356/350 313/354/348 323/357/351
+f 276/314/307 315/315/309 316/356/350
+f 307/344/338 317/358/352 306/349/343
+f 317/358/352 307/344/338 303/345/339
+f 306/349/343 318/359/353 309/350/344
+f 309/350/344 318/359/353 319/360/354
+f 317/358/352 318/359/353 306/349/343
+f 319/360/354 320/361/355 321/362/356
+f 311/353/347 319/360/354 321/362/356
+f 310/352/346 319/360/354 311/353/347
+f 319/360/354 310/352/346 309/350/344
+f 320/361/355 319/360/354 318/359/353
+f 324/363/357 314/355/349 322/364/358
+f 314/355/349 324/363/357 313/354/348
+f 322/364/358 314/355/349 311/353/347
+f 322/364/358 311/353/347 321/362/356
+f 323/357/351 324/363/357 325/365/359
+f 313/354/348 324/363/357 323/357/351
+f 326/366/360 328/367/361 327/368/362
+f 318/359/353 326/366/360 320/361/355
+f 326/366/360 318/359/353 317/358/352
+f 329/369/363 326/366/360 317/358/352
+f 328/367/361 326/366/360 329/369/363
+f 321/362/356 330/370/364 332/371/365
+f 320/361/355 330/370/364 321/362/356
+f 326/366/360 330/370/364 320/361/355
+f 327/368/362 330/370/364 326/366/360
+f 331/372/366 332/371/365 354/373/367
+f 321/362/356 331/372/366 322/364/358
+f 332/371/365 331/372/366 321/362/356
+f 325/365/359 333/374/368 334/375/369
+f 334/375/369 333/374/368 335/376/370
+f 331/372/366 333/374/368 325/365/359
+f 331/372/366 325/365/359 322/364/358
+f 322/364/358 325/365/359 324/363/357
+f 354/373/367 333/374/368 331/372/366
+f 338/377/371 336/378/372 337/379/373
+f 3848/380/374 336/378/372 338/377/371
+f 334/375/369 336/378/372 325/365/359
+f 337/379/373 336/378/372 334/375/369
+f 337/379/373 334/375/369 335/376/370
+f 342/381/375 339/382/376 340/383/377
+f 339/382/376 342/381/375 341/384/378
+f 340/383/377 339/382/376 338/377/371
+f 340/383/377 338/377/371 337/379/373
+f 343/385/379 342/381/375 364/386/380
+f 342/381/375 340/383/377 364/386/380
+f 344/387/381 343/385/379 345/388/382
+f 342/381/375 343/385/379 347/389/383
+f 347/389/383 343/385/379 344/387/381
+f 342/381/375 347/389/383 341/384/378
+f 349/390/384 348/391/385 327/368/362
+f 328/367/361 349/390/384 327/368/362
+f 348/391/385 349/390/384 350/392/386
+f 351/393/387 352/394/388 353/395/389
+f 330/370/364 351/393/387 332/371/365
+f 348/391/385 351/393/387 327/368/362
+f 351/393/387 330/370/364 327/368/362
+f 352/394/388 351/393/387 348/391/385
+f 352/394/388 348/391/385 375/396/390
+f 354/373/367 353/395/389 355/397/391
+f 332/371/365 353/395/389 354/373/367
+f 351/393/387 353/395/389 332/371/365
+f 335/376/370 356/398/392 357/399/393
+f 357/399/393 356/398/392 380/400/394
+f 333/374/368 356/398/392 335/376/370
+f 356/398/392 333/374/368 354/373/367
+f 380/400/394 356/398/392 355/397/391
+f 355/397/391 356/398/392 354/373/367
+f 359/401/395 358/402/396 360/403/397
+f 337/379/373 358/402/396 359/401/395
+f 335/376/370 358/402/396 337/379/373
+f 358/402/396 335/376/370 357/399/393
+f 360/403/397 358/402/396 357/399/393
+f 363/404/398 361/405/399 362/406/400
+f 359/401/395 361/405/399 340/383/377
+f 340/383/377 361/405/399 363/404/398
+f 359/401/395 340/383/377 337/379/373
+f 365/407/401 363/404/398 366/408/402
+f 364/386/380 363/404/398 365/407/401
+f 363/404/398 364/386/380 340/383/377
+f 346/409/403 365/407/401 367/410/404
+f 343/385/379 365/407/401 346/409/403
+f 343/385/379 346/409/403 345/388/382
+f 364/386/380 365/407/401 343/385/379
+f 367/410/404 365/407/401 366/408/402
+f 369/411/405 368/412/406 390/413/407
+f 368/412/406 346/409/403 367/410/404
+f 370/414/408 369/411/405 371/415/409
+f 368/412/406 369/411/405 372/416/410
+f 368/412/406 372/416/410 346/409/403
+f 375/396/390 373/417/411 374/418/412
+f 350/392/386 373/417/411 348/391/385
+f 348/391/385 373/417/411 375/396/390
+f 373/417/411 350/392/386 3676/419/413
+f 374/418/412 373/417/411 376/420/414
+f 352/394/388 375/396/390 377/421/415
+f 377/421/415 375/396/390 374/418/412
+f 378/422/416 379/423/417 401/424/418
+f 379/423/417 378/422/416 355/397/391
+f 379/423/417 355/397/391 353/395/389
+f 352/394/388 379/423/417 353/395/389
+f 379/423/417 352/394/388 377/421/415
+f 401/424/418 379/423/417 377/421/415
+f 380/400/394 381/425/419 382/426/420
+f 378/422/416 381/425/419 380/400/394
+f 378/422/416 380/400/394 355/397/391
+f 360/403/397 382/426/420 406/427/421
+f 385/428/422 360/403/397 406/427/421
+f 380/400/394 360/403/397 357/399/393
+f 382/426/420 360/403/397 380/400/394
+f 362/406/400 383/429/423 384/430/424
+f 383/429/423 385/428/422 384/430/424
+f 361/405/399 383/429/423 362/406/400
+f 383/429/423 361/405/399 359/401/395
+f 360/403/397 383/429/423 359/401/395
+f 385/428/422 383/429/423 360/403/397
+f 386/431/425 384/430/424 411/432/426
+f 386/431/425 411/432/426 387/433/427
+f 362/406/400 386/431/425 366/408/402
+f 363/404/398 362/406/400 366/408/402
+f 386/431/425 362/406/400 384/430/424
+f 367/410/404 366/408/402 387/433/427
+f 367/410/404 387/433/427 388/434/428
+f 387/433/427 366/408/402 386/431/425
+f 390/413/407 389/435/429 391/436/430
+f 368/412/406 389/435/429 390/413/407
+f 389/435/429 368/412/406 367/410/404
+f 391/436/430 389/435/429 388/434/428
+f 389/435/429 367/410/404 388/434/428
+f 393/437/431 392/438/432 417/439/433
+f 371/415/409 392/438/432 393/437/431
+f 392/438/432 371/415/409 390/413/407
+f 390/413/407 371/415/409 369/411/405
+f 417/439/433 392/438/432 391/436/430
+f 391/436/430 392/438/432 390/413/407
+f 396/440/434 394/441/435 395/442/436
+f 396/440/434 395/442/436 397/443/437
+f 374/418/412 394/441/435 396/440/434
+f 394/441/435 374/418/412 376/420/414
+f 395/442/436 394/441/435 398/444/438
+f 399/445/439 431/446/440 402/447/441
+f 396/440/434 399/445/439 377/421/415
+f 396/440/434 377/421/415 374/418/412
+f 431/446/440 399/445/439 396/440/434
+f 431/446/440 396/440/434 397/443/437
+f 400/448/442 401/424/418 402/447/441
+f 401/424/418 400/448/442 378/422/416
+f 399/445/439 401/424/418 377/421/415
+f 402/447/441 401/424/418 399/445/439
+f 404/449/443 403/450/444 405/451/445
+f 403/450/444 404/449/443 382/426/420
+f 381/425/419 403/450/444 382/426/420
+f 400/448/442 403/450/444 378/422/416
+f 378/422/416 403/450/444 381/425/419
+f 405/451/445 403/450/444 400/448/442
+f 406/427/421 404/449/443 407/452/446
+f 404/449/443 408/453/447 407/452/446
+f 382/426/420 404/449/443 406/427/421
+f 408/453/447 404/449/443 405/451/445
+f 385/428/422 410/454/448 409/455/449
+f 385/428/422 409/455/449 384/430/424
+f 406/427/421 410/454/448 385/428/422
+f 410/454/448 406/427/421 407/452/446
+f 412/456/450 411/432/426 446/457/451
+f 412/456/450 446/457/451 414/458/452
+f 409/455/449 411/432/426 384/430/424
+f 446/457/451 411/432/426 409/455/449
+f 415/459/453 412/456/450 413/460/454
+f 412/456/450 414/458/452 413/460/454
+f 387/433/427 412/456/450 415/459/453
+f 387/433/427 415/459/453 388/434/428
+f 411/432/426 412/456/450 387/433/427
+f 415/459/453 413/460/454 416/461/455
+f 391/436/430 415/459/453 416/461/455
+f 415/459/453 391/436/430 388/434/428
+f 416/461/455 417/439/433 391/436/430
+f 418/462/456 417/439/433 416/461/455
+f 420/463/457 419/464/458 461/465/459
+f 393/437/431 419/464/458 424/466/460
+f 424/466/460 419/464/458 420/463/457
+f 417/439/433 419/464/458 393/437/431
+f 419/464/458 417/439/433 418/462/456
+f 421/467/461 462/468/462 422/469/463
+f 423/470/464 420/463/457 421/467/461
+f 423/470/464 421/467/461 3863/471/465
+f 420/463/457 423/470/464 424/466/460
+f 462/468/462 421/467/461 420/463/457
+f 462/468/462 420/463/457 461/465/459
+f 426/472/466 425/473/467 428/474/468
+f 425/473/467 427/475/469 428/474/468
+f 429/476/470 425/473/467 426/472/466
+f 429/476/470 426/472/466 395/442/436
+f 426/472/466 430/477/471 397/443/437
+f 395/442/436 426/472/466 397/443/437
+f 430/477/471 426/472/466 428/474/468
+f 432/478/472 431/446/440 433/479/473
+f 430/477/471 431/446/440 397/443/437
+f 433/479/473 431/446/440 430/477/471
+f 434/480/474 432/478/472 435/481/475
+f 402/447/441 432/478/472 434/480/474
+f 402/447/441 434/480/474 400/448/442
+f 431/446/440 432/478/472 402/447/441
+f 405/451/445 436/482/476 408/453/447
+f 434/480/474 436/482/476 405/451/445
+f 434/480/474 405/451/445 400/448/442
+f 436/482/476 434/480/474 435/481/475
+f 437/483/477 436/482/476 435/481/475
+f 438/484/478 407/452/446 439/485/479
+f 438/484/478 439/485/479 440/486/480
+f 410/454/448 407/452/446 438/484/478
+f 410/454/448 438/484/478 409/455/449
+f 407/452/446 441/487/481 439/485/479
+f 439/485/479 441/487/481 442/488/482
+f 408/453/447 441/487/481 407/452/446
+f 441/487/481 408/453/447 436/482/476
+f 442/488/482 441/487/481 436/482/476
+f 442/488/482 443/489/483 444/490/484
+f 444/490/484 443/489/483 445/491/485
+f 442/488/482 444/490/484 439/485/479
+f 437/483/477 442/488/482 436/482/476
+f 443/489/483 442/488/482 437/483/477
+f 443/489/483 437/483/477 476/492/486
+f 447/493/487 446/457/451 448/494/488
+f 446/457/451 447/493/487 414/458/452
+f 438/484/478 446/457/451 409/455/449
+f 448/494/488 446/457/451 440/486/480
+f 440/486/480 446/457/451 438/484/478
+f 449/495/489 447/493/487 450/496/490
+f 449/495/489 450/496/490 451/497/491
+f 414/458/452 447/493/487 449/495/489
+f 414/458/452 449/495/489 413/460/454
+f 450/496/490 447/493/487 448/494/488
+f 452/498/492 450/496/490 453/499/493
+f 452/498/492 453/499/493 541/500/494
+f 450/496/490 452/498/492 451/497/491
+f 454/501/495 450/496/490 448/494/488
+f 453/499/493 450/496/490 454/501/495
+f 453/499/493 454/501/495 542/502/496
+f 457/503/497 455/504/498 456/505/499
+f 413/460/454 455/504/498 416/461/455
+f 416/461/455 455/504/498 457/503/497
+f 449/495/489 455/504/498 413/460/454
+f 456/505/499 455/504/498 451/497/491
+f 451/497/491 455/504/498 449/495/489
+f 459/506/500 457/503/497 458/507/501
+f 418/462/456 457/503/497 459/506/500
+f 457/503/497 418/462/456 416/461/455
+f 458/507/501 457/503/497 456/505/499
+f 461/465/459 459/506/500 460/508/502
+f 419/464/458 459/506/500 461/465/459
+f 459/506/500 419/464/458 418/462/456
+f 460/508/502 459/506/500 458/507/501
+f 463/509/503 462/468/462 487/510/504
+f 422/469/463 462/468/462 463/509/503
+f 487/510/504 462/468/462 460/508/502
+f 462/468/462 461/465/459 460/508/502
+f 464/511/505 463/509/503 465/512/506
+f 464/511/505 465/512/506 3869/513/507
+f 422/469/463 463/509/503 464/511/505
+f 466/514/508 467/515/509 468/516/510
+f 427/475/469 466/514/508 428/474/468
+f 466/514/508 468/516/510 428/474/468
+f 3672/517/511 466/514/508 469/518/512
+f 469/518/512 466/514/508 427/475/469
+f 467/515/509 466/514/508 3672/517/511
+f 467/515/509 3672/517/511 470/519/513
+f 428/474/468 471/520/514 430/477/471
+f 430/477/471 471/520/514 433/479/473
+f 468/516/510 471/520/514 428/474/468
+f 472/521/515 471/520/514 468/516/510
+f 433/479/473 473/522/516 474/523/517
+f 475/524/518 433/479/473 474/523/517
+f 433/479/473 475/524/518 432/478/472
+f 471/520/514 473/522/516 433/479/473
+f 473/522/516 471/520/514 472/521/515
+f 477/525/519 476/492/486 437/483/477
+f 477/525/519 437/483/477 435/481/475
+f 476/492/486 477/525/519 478/526/520
+f 481/527/521 476/492/486 478/526/520
+f 435/481/475 475/524/518 478/526/520
+f 435/481/475 478/526/520 477/525/519
+f 475/524/518 435/481/475 432/478/472
+f 478/526/520 475/524/518 474/523/517
+f 3649/528/522 479/529/523 481/527/521
+f 3649/528/522 481/527/521 501/530/524
+f 443/489/483 479/529/523 480/531/525
+f 443/489/483 480/531/525 445/491/485
+f 479/529/523 443/489/483 476/492/486
+f 476/492/486 481/527/521 479/529/523
+f 483/532/526 482/533/527 508/534/528
+f 456/505/499 482/533/527 483/532/526
+f 451/497/491 482/533/527 456/505/499
+f 482/533/527 451/497/491 452/498/492
+f 485/535/529 483/532/526 484/536/530
+f 485/535/529 484/536/530 506/537/531
+f 458/507/501 483/532/526 485/535/529
+f 483/532/526 458/507/501 456/505/499
+f 488/538/532 485/535/529 486/539/533
+f 460/508/502 485/535/529 488/538/532
+f 485/535/529 460/508/502 458/507/501
+f 486/539/533 485/535/529 506/537/531
+f 487/510/504 488/538/532 489/540/534
+f 491/541/535 487/510/504 489/540/534
+f 488/538/532 487/510/504 460/508/502
+f 490/542/536 465/512/506 491/541/535
+f 487/510/504 465/512/506 463/509/503
+f 491/541/535 465/512/506 487/510/504
+f 467/515/509 492/543/537 468/516/510
+f 493/544/538 492/543/537 467/515/509
+f 493/544/538 467/515/509 3674/545/539
+f 493/544/538 3674/545/539 524/546/540
+f 494/547/541 495/548/542 499/549/543
+f 472/521/515 494/547/541 498/550/544
+f 494/547/541 472/521/515 468/516/510
+f 492/543/537 494/547/541 468/516/510
+f 494/547/541 492/543/537 493/544/538
+f 495/548/542 494/547/541 493/544/538
+f 481/527/521 496/551/545 501/530/524
+f 474/523/517 496/551/545 478/526/520
+f 478/526/520 496/551/545 481/527/521
+f 496/551/545 474/523/517 497/552/546
+f 498/550/544 499/549/543 497/552/546
+f 474/523/517 498/550/544 497/552/546
+f 473/522/516 498/550/544 474/523/517
+f 498/550/544 473/522/516 472/521/515
+f 499/549/543 498/550/544 494/547/541
+f 500/553/547 502/554/548 503/555/549
+f 496/551/545 500/553/547 501/530/524
+f 502/554/548 500/553/547 497/552/546
+f 500/553/547 496/551/545 497/552/546
+f 502/554/548 504/556/550 503/555/549
+f 499/549/543 502/554/548 497/552/546
+f 504/556/550 502/554/548 499/549/543
+f 506/537/531 484/536/530 505/557/551
+f 505/557/551 484/536/530 507/558/552
+f 508/534/528 484/536/530 483/532/526
+f 484/536/530 508/534/528 537/559/553
+f 507/558/552 484/536/530 537/559/553
+f 509/560/554 507/558/552 510/561/555
+f 509/560/554 510/561/555 511/562/556
+f 507/558/552 509/560/554 513/563/557
+f 505/557/551 507/558/552 513/563/557
+f 510/561/555 507/558/552 537/559/553
+f 486/539/533 505/557/551 512/564/558
+f 486/539/533 512/564/558 488/538/532
+f 505/557/551 486/539/533 506/537/531
+f 505/557/551 513/563/557 512/564/558
+f 513/563/557 514/565/559 512/564/558
+f 514/565/559 513/563/557 515/566/560
+f 515/566/560 513/563/557 509/560/554
+f 489/540/534 516/567/561 517/568/562
+f 516/567/561 489/540/534 488/538/532
+f 512/564/558 516/567/561 488/538/532
+f 519/569/563 517/568/562 518/570/564
+f 518/570/564 517/568/562 520/571/565
+f 491/541/535 517/568/562 519/569/563
+f 491/541/535 519/569/563 490/542/536
+f 489/540/534 517/568/562 491/541/535
+f 520/571/565 517/568/562 530/572/566
+f 530/572/566 517/568/562 516/567/561
+f 504/556/550 495/548/542 521/573/567
+f 495/548/542 504/556/550 499/549/543
+f 521/573/567 495/548/542 522/574/568
+f 521/573/567 522/574/568 523/575/569
+f 493/544/538 522/574/568 495/548/542
+f 524/546/540 522/574/568 493/544/538
+f 523/575/569 522/574/568 524/546/540
+f 523/575/569 524/546/540 3663/576/570
+f 526/577/571 525/578/572 3655/579/573
+f 3655/579/573 525/578/572 3654/580/574
+f 521/573/567 525/578/572 526/577/571
+f 521/573/567 526/577/571 504/556/550
+f 523/575/569 525/578/572 521/573/567
+f 525/578/572 527/581/575 3654/580/574
+f 523/575/569 527/581/575 525/578/572
+f 528/582/576 527/581/575 523/575/569
+f 528/582/576 523/575/569 3663/576/570
+f 516/567/561 529/583/577 530/572/566
+f 514/565/559 529/583/577 512/564/558
+f 529/583/577 516/567/561 512/564/558
+f 520/571/565 531/584/578 532/585/579
+f 3875/586/580 520/571/565 532/585/579
+f 518/570/564 520/571/565 3875/586/580
+f 531/584/578 520/571/565 530/572/566
+f 531/584/578 530/572/566 529/583/577
+f 534/587/581 533/588/582 529/583/577
+f 534/587/581 529/583/577 514/565/559
+f 531/584/578 535/589/583 532/585/579
+f 535/589/583 536/590/584 532/585/579
+f 533/588/582 535/589/583 531/584/578
+f 533/588/582 531/584/578 529/583/577
+f 536/590/584 535/589/583 533/588/582
+f 536/590/584 533/588/582 544/591/585
+f 539/592/586 537/559/553 538/593/587
+f 510/561/555 537/559/553 539/592/586
+f 510/561/555 539/592/586 511/562/556
+f 508/534/528 538/593/587 537/559/553
+f 482/533/527 538/593/587 508/534/528
+f 541/500/494 538/593/587 482/533/527
+f 541/500/494 482/533/527 452/498/492
+f 538/593/587 541/500/494 540/594/588
+f 541/500/494 453/499/493 540/594/588
+f 534/587/581 543/595/589 533/588/582
+f 533/588/582 543/595/589 544/591/585
+f 545/596/590 534/587/581 514/565/559
+f 545/596/590 514/565/559 515/566/560
+f 543/595/589 534/587/581 545/596/590
+f 544/591/585 543/595/589 546/597/591
+f 545/596/590 547/598/592 548/599/593
+f 545/596/590 548/599/593 543/595/589
+f 550/600/594 549/601/595 553/602/596
+f 550/600/594 553/602/596 552/603/597
+f 549/601/595 551/604/598 553/602/596
+f 554/605/599 556/606/600 557/607/601
+f 554/605/599 557/607/601 555/608/602
+f 551/604/598 556/606/600 554/605/599
+f 556/606/600 551/604/598 549/601/595
+f 559/609/603 561/610/604 562/611/605
+f 561/610/604 560/612/606 563/613/607
+f 559/609/603 558/614/608 561/610/604
+f 558/614/608 560/612/606 561/610/604
+f 892/615/609 565/616/610 564/617/611
+f 563/613/607 560/612/606 892/615/609
+f 560/612/606 565/616/610 892/615/609
+f 564/617/611 565/616/610 550/600/594
+f 566/618/612 568/619/613 567/620/614
+f 570/621/615 569/622/616 571/623/617
+f 568/619/613 566/618/612 570/621/615
+f 566/618/612 569/622/616 570/621/615
+f 898/624/618 559/609/603 562/611/605
+f 898/624/618 572/625/619 559/609/603
+f 571/623/617 569/622/616 898/624/618
+f 569/622/616 572/625/619 898/624/618
+f 573/626/620 575/627/621 574/628/622
+f 577/629/623 576/630/624 578/631/625
+f 575/627/621 573/626/620 577/629/623
+f 573/626/620 576/630/624 577/629/623
+f 579/632/626 580/633/627 568/619/613
+f 578/631/625 576/630/624 579/632/626
+f 576/630/624 580/633/627 579/632/626
+f 568/619/613 580/633/627 567/620/614
+f 582/634/628 581/635/629 584/636/630
+f 581/635/629 583/637/631 585/638/632
+f 581/635/629 585/638/632 584/636/630
+f 586/639/633 588/640/634 574/628/622
+f 586/639/633 574/628/622 587/641/635
+f 585/638/632 583/637/631 588/640/634
+f 585/638/632 588/640/634 586/639/633
+f 589/642/636 591/643/637 590/644/638
+f 592/645/639 593/646/640 589/642/636
+f 591/643/637 589/642/636 594/647/641
+f 589/642/636 593/646/640 594/647/641
+f 595/648/642 597/649/643 582/634/628
+f 595/648/642 582/634/628 596/650/644
+f 593/646/640 597/649/643 595/648/642
+f 597/649/643 593/646/640 592/645/639
+f 602/651/645 600/652/646 603/653/647
+f 599/654/648 598/655/649 602/651/645
+f 599/654/648 602/651/645 601/656/650
+f 598/655/649 600/652/646 602/651/645
+f 604/657/651 605/658/652 591/643/637
+f 603/653/647 600/652/646 604/657/651
+f 600/652/646 605/658/652 604/657/651
+f 591/643/637 605/658/652 590/644/638
+f 610/659/653 608/660/654 611/661/655
+f 607/662/656 606/663/657 610/659/653
+f 607/662/656 610/659/653 609/664/658
+f 606/663/657 608/660/654 610/659/653
+f 612/665/659 614/666/660 599/654/648
+f 612/665/659 599/654/648 613/667/661
+f 611/661/655 608/660/654 612/665/659
+f 608/660/654 614/666/660 612/665/659
+f 615/668/662 617/669/663 616/670/664
+f 617/669/663 615/668/662 619/671/665
+f 615/668/662 618/672/666 620/673/667
+f 615/668/662 620/673/667 619/671/665
+f 924/674/668 622/675/669 607/662/656
+f 924/674/668 607/662/656 621/676/670
+f 620/673/667 618/672/666 622/675/669
+f 620/673/667 622/675/669 924/674/668
+f 623/677/671 625/678/672 624/679/673
+f 627/680/674 626/681/675 628/682/676
+f 625/678/672 623/677/671 627/680/674
+f 623/677/671 626/681/675 627/680/674
+f 930/683/677 629/684/678 617/669/663
+f 628/682/676 626/681/675 930/683/677
+f 626/681/675 629/684/678 930/683/677
+f 617/669/663 629/684/678 616/670/664
+f 633/685/679 632/686/680 634/687/681
+f 631/688/682 630/689/683 633/685/679
+f 630/689/683 632/686/680 633/685/679
+f 634/687/681 624/679/673 625/678/672
+f 632/686/680 624/679/673 634/687/681
+f 639/690/684 637/691/685 640/692/686
+f 636/693/687 635/694/688 639/690/684
+f 636/693/687 639/690/684 638/695/689
+f 635/694/688 637/691/685 639/690/684
+f 641/696/690 642/697/691 631/688/682
+f 640/692/686 637/691/685 641/696/690
+f 637/691/685 642/697/691 641/696/690
+f 631/688/682 642/697/691 630/689/683
+f 643/698/692 644/699/693 645/700/694
+f 647/701/695 646/702/696 648/703/697
+f 644/699/693 643/698/692 647/701/695
+f 643/698/692 646/702/696 647/701/695
+f 649/704/698 651/705/699 636/693/687
+f 649/704/698 636/693/687 650/706/700
+f 648/703/697 646/702/696 649/704/698
+f 646/702/696 651/705/699 649/704/698
+f 652/707/701 654/708/702 653/709/703
+f 656/710/704 655/711/705 657/712/706
+f 654/708/702 652/707/701 656/710/704
+f 652/707/701 655/711/705 656/710/704
+f 946/713/707 659/714/708 645/700/694
+f 946/713/707 645/700/694 658/715/709
+f 657/712/706 655/711/705 946/713/707
+f 655/711/705 659/714/708 946/713/707
+f 664/716/710 662/717/711 665/718/712
+f 661/719/713 660/720/714 664/716/710
+f 661/719/713 664/716/710 663/721/715
+f 660/720/714 662/717/711 664/716/710
+f 666/722/716 667/723/717 654/708/702
+f 665/718/712 662/717/711 666/722/716
+f 662/717/711 667/723/717 666/722/716
+f 654/708/702 667/723/717 653/709/703
+f 672/724/718 670/725/719 673/726/720
+f 669/727/721 668/728/722 672/724/718
+f 669/727/721 672/724/718 671/729/723
+f 668/728/722 670/725/719 672/724/718
+f 674/730/724 676/731/725 661/719/713
+f 674/730/724 661/719/713 675/732/726
+f 673/726/720 670/725/719 674/730/724
+f 670/725/719 676/731/725 674/730/724
+f 677/733/727 679/734/728 678/735/729
+f 681/736/730 680/737/731 682/738/732
+f 679/734/728 677/733/727 681/736/730
+f 677/733/727 680/737/731 681/736/730
+f 959/739/733 683/740/734 669/727/721
+f 959/739/733 669/727/721 960/741/735
+f 682/738/732 680/737/731 959/739/733
+f 680/737/731 683/740/734 959/739/733
+f 685/742/736 687/743/737 688/744/738
+f 685/742/736 684/745/739 687/743/737
+f 684/745/739 686/746/740 689/747/741
+f 684/745/739 689/747/741 687/743/737
+f 965/748/742 690/749/743 679/734/728
+f 689/747/741 686/746/740 690/749/743
+f 689/747/741 690/749/743 965/748/742
+f 679/734/728 690/749/743 678/735/729
+f 695/750/744 693/751/745 696/752/746
+f 692/753/747 691/754/748 695/750/744
+f 692/753/747 695/750/744 694/755/749
+f 691/754/748 693/751/745 695/750/744
+f 697/756/750 685/742/736 688/744/738
+f 697/756/750 698/757/751 685/742/736
+f 696/752/746 693/751/745 697/756/750
+f 693/751/745 698/757/751 697/756/750
+f 701/758/752 700/759/753 699/760/754
+f 699/760/754 700/759/753 703/761/755
+f 699/760/754 703/761/755 702/762/756
+f 704/763/757 706/764/758 692/753/747
+f 704/763/757 692/753/747 705/765/759
+f 700/759/753 706/764/758 704/763/757
+f 706/764/758 700/759/753 701/758/752
+f 708/766/760 710/767/761 711/768/762
+f 710/767/761 709/769/763 712/770/764
+f 708/766/760 707/771/765 710/767/761
+f 707/771/765 709/769/763 710/767/761
+f 978/772/766 714/773/767 699/760/754
+f 978/772/766 699/760/754 713/774/768
+f 712/770/764 709/769/763 978/772/766
+f 709/769/763 714/773/767 978/772/766
+f 719/775/769 717/776/770 720/777/771
+f 716/778/772 715/779/773 719/775/769
+f 716/778/772 719/775/769 718/780/774
+f 715/779/773 717/776/770 719/775/769
+f 721/781/775 708/766/760 711/768/762
+f 721/781/775 722/782/776 708/766/760
+f 720/777/771 717/776/770 721/781/775
+f 717/776/770 722/782/776 721/781/775
+f 727/783/777 725/784/778 728/785/779
+f 724/786/780 723/787/781 727/783/777
+f 724/786/780 727/783/777 726/788/782
+f 723/787/781 725/784/778 727/783/777
+f 985/789/783 716/778/772 729/790/784
+f 728/785/779 725/784/778 985/789/783
+f 725/784/778 716/778/772 985/789/783
+f 730/791/785 732/792/786 731/793/787
+f 734/794/788 733/795/789 735/796/790
+f 732/792/786 730/791/785 734/794/788
+f 730/791/785 733/795/789 734/794/788
+f 990/797/791 737/798/792 724/786/780
+f 990/797/791 724/786/780 736/799/793
+f 735/796/790 733/795/789 990/797/791
+f 733/795/789 737/798/792 990/797/791
+f 739/800/794 741/801/795 742/802/796
+f 741/801/795 740/803/797 743/804/798
+f 739/800/794 738/805/799 741/801/795
+f 738/805/799 740/803/797 741/801/795
+f 995/806/800 744/807/801 732/792/786
+f 743/804/798 740/803/797 995/806/800
+f 740/803/797 744/807/801 995/806/800
+f 732/792/786 744/807/801 731/793/787
+f 749/808/802 747/809/803 750/810/804
+f 746/811/805 745/812/806 749/808/802
+f 746/811/805 749/808/802 748/813/807
+f 745/812/806 747/809/803 749/808/802
+f 751/814/808 739/800/794 742/802/796
+f 751/814/808 752/815/809 739/800/794
+f 750/810/804 747/809/803 751/814/808
+f 747/809/803 752/815/809 751/814/808
+f 755/816/810 754/817/811 753/818/812
+f 756/819/813 755/816/810 757/820/814
+f 754/817/811 755/816/810 756/819/813
+f 758/821/815 760/822/816 746/811/805
+f 758/821/815 746/811/805 759/823/817
+f 757/820/814 755/816/810 758/821/815
+f 755/816/810 760/822/816 758/821/815
+f 761/824/818 763/825/819 762/826/820
+f 765/827/821 764/828/822 766/829/823
+f 763/825/819 761/824/818 765/827/821
+f 761/824/818 764/828/822 765/827/821
+f 1010/830/824 767/831/825 753/818/812
+f 1010/830/824 753/818/812 1011/832/826
+f 766/829/823 764/828/822 1010/830/824
+f 764/828/822 767/831/825 1010/830/824
+f 772/833/827 770/834/828 773/835/829
+f 769/836/830 768/837/831 772/833/827
+f 769/836/830 772/833/827 771/838/832
+f 768/837/831 770/834/828 772/833/827
+f 774/839/833 775/840/834 763/825/819
+f 773/835/829 770/834/828 774/839/833
+f 770/834/828 775/840/834 774/839/833
+f 763/825/819 775/840/834 762/826/820
+f 780/841/835 778/842/836 781/843/837
+f 777/844/838 776/845/839 780/841/835
+f 777/844/838 780/841/835 779/846/840
+f 776/845/839 778/842/836 780/841/835
+f 782/847/841 778/842/836 769/836/830
+f 782/847/841 769/836/830 783/848/842
+f 781/843/837 778/842/836 782/847/841
+f 784/849/843 786/850/844 785/851/845
+f 788/852/846 787/853/847 789/854/848
+f 786/850/844 784/849/843 788/852/846
+f 784/849/843 787/853/847 788/852/846
+f 1022/855/849 791/856/850 790/857/851
+f 789/854/848 787/853/847 1022/855/849
+f 787/853/847 791/856/850 1022/855/849
+f 790/857/851 791/856/850 777/844/838
+f 792/858/852 794/859/853 793/860/854
+f 796/861/855 795/862/856 797/863/857
+f 794/859/853 792/858/852 796/861/855
+f 792/858/852 795/862/856 796/861/855
+f 1027/864/858 798/865/859 786/850/844
+f 797/863/857 795/862/856 1027/864/858
+f 795/862/856 798/865/859 1027/864/858
+f 786/850/844 798/865/859 785/851/845
+f 803/866/860 801/867/861 804/868/862
+f 800/869/863 799/870/864 803/866/860
+f 800/869/863 803/866/860 802/871/865
+f 799/870/864 801/867/861 803/866/860
+f 805/872/866 806/873/867 794/859/853
+f 804/868/862 801/867/861 805/872/866
+f 801/867/861 806/873/867 805/872/866
+f 794/859/853 806/873/867 793/860/854
+f 810/874/868 808/875/869 811/876/870
+f 807/877/871 810/874/868 809/878/872
+f 807/877/871 808/875/869 810/874/868
+f 812/879/873 814/880/874 800/869/863
+f 812/879/873 800/869/863 813/881/875
+f 811/876/870 808/875/869 812/879/873
+f 808/875/869 814/880/874 812/879/873
+f 816/882/876 818/883/877 819/884/878
+f 818/883/877 817/885/879 820/886/880
+f 816/882/876 815/887/881 818/883/877
+f 815/887/881 817/885/879 818/883/877
+f 821/888/882 823/889/883 807/877/871
+f 821/888/882 807/877/871 822/890/884
+f 820/886/880 817/885/879 821/888/882
+f 817/885/879 823/889/883 821/888/882
+f 828/891/885 826/892/886 829/893/887
+f 825/894/888 824/895/889 828/891/885
+f 825/894/888 828/891/885 827/896/890
+f 824/895/889 826/892/886 828/891/885
+f 830/897/891 816/882/876 819/884/878
+f 830/897/891 831/898/892 816/882/876
+f 829/893/887 826/892/886 830/897/891
+f 826/892/886 831/898/892 830/897/891
+f 836/899/893 834/900/894 837/901/895
+f 833/902/896 832/903/897 836/899/893
+f 833/902/896 836/899/893 835/904/898
+f 832/903/897 834/900/894 836/899/893
+f 1047/905/899 839/906/900 825/894/888
+f 1047/905/899 825/894/888 838/907/901
+f 837/901/895 834/900/894 1047/905/899
+f 834/900/894 839/906/900 1047/905/899
+f 841/908/902 843/909/903 844/910/904
+f 841/908/902 840/911/905 843/909/903
+f 840/911/905 842/912/906 845/913/907
+f 840/911/905 845/913/907 843/909/903
+f 1051/914/908 847/915/909 833/902/896
+f 1051/914/908 833/902/896 846/916/910
+f 845/913/907 842/912/906 847/915/909
+f 845/913/907 847/915/909 1051/914/908
+f 848/917/911 850/918/912 849/919/913
+f 852/920/914 851/921/915 853/922/916
+f 850/918/912 848/917/911 852/920/914
+f 848/917/911 851/921/915 852/920/914
+f 1057/923/917 841/908/902 844/910/904
+f 1057/923/917 854/924/918 841/908/902
+f 853/922/916 851/921/915 1057/923/917
+f 851/921/915 854/924/918 1057/923/917
+f 859/925/919 857/926/920 860/927/921
+f 856/928/922 855/929/923 859/925/919
+f 856/928/922 859/925/919 858/930/924
+f 855/929/923 857/926/920 859/925/919
+f 861/931/925 862/932/926 850/918/912
+f 860/927/921 857/926/920 861/931/925
+f 857/926/920 862/932/926 861/931/925
+f 850/918/912 862/932/926 849/919/913
+f 864/933/927 863/934/928 866/935/929
+f 863/934/928 865/936/930 866/935/929
+f 867/937/931 869/938/932 856/928/922
+f 867/937/931 856/928/922 868/939/933
+f 865/936/930 869/938/932 867/937/931
+f 869/938/932 865/936/930 863/934/928
+f 870/940/934 872/941/935 871/942/936
+f 874/943/937 873/944/938 875/945/939
+f 872/941/935 870/940/934 874/943/937
+f 870/940/934 873/944/938 874/943/937
+f 1072/946/940 877/947/941 864/933/927
+f 1072/946/940 864/933/927 876/948/942
+f 875/945/939 873/944/938 1072/946/940
+f 873/944/938 877/947/941 1072/946/940
+f 881/949/943 879/950/944 882/951/945
+f 557/607/601 878/952/946 881/949/943
+f 557/607/601 881/949/943 880/953/947
+f 878/952/946 879/950/944 881/949/943
+f 883/954/948 884/955/949 872/941/935
+f 882/951/945 879/950/944 883/954/948
+f 879/950/944 884/955/949 883/954/948
+f 872/941/935 884/955/949 871/942/936
+f 553/602/596 885/956/950 552/603/597
+f 885/956/950 553/602/596 886/957/951
+f 553/602/596 551/604/598 887/958/952
+f 553/602/596 887/958/952 886/957/951
+f 888/959/953 889/960/954 1082/961/955
+f 888/959/953 554/605/599 889/960/954
+f 887/958/952 551/604/598 554/605/599
+f 887/958/952 554/605/599 888/959/953
+f 889/960/954 554/605/599 555/608/602
+f 562/611/605 561/610/604 891/962/956
+f 562/611/605 891/962/956 890/963/957
+f 561/610/604 563/613/607 891/962/956
+f 1087/964/958 892/615/609 893/965/959
+f 1087/964/958 893/965/959 1088/966/960
+f 563/613/607 892/615/609 1087/964/958
+f 893/965/959 892/615/609 564/617/611
+f 570/621/615 894/967/961 568/619/613
+f 894/967/961 570/621/615 895/968/962
+f 570/621/615 571/623/617 896/969/963
+f 570/621/615 896/969/963 895/968/962
+f 897/970/964 898/624/618 890/963/957
+f 898/624/618 562/611/605 890/963/957
+f 896/969/963 571/623/617 898/624/618
+f 896/969/963 898/624/618 897/970/964
+f 577/629/623 899/971/965 575/627/621
+f 899/971/965 577/629/623 900/972/966
+f 577/629/623 578/631/625 900/972/966
+f 901/973/967 579/632/626 894/967/961
+f 578/631/625 579/632/626 901/973/967
+f 894/967/961 579/632/626 568/619/613
+f 584/636/630 902/974/968 582/634/628
+f 902/974/968 584/636/630 903/975/969
+f 584/636/630 904/976/970 903/975/969
+f 584/636/630 585/638/632 904/976/970
+f 905/977/971 586/639/633 587/641/635
+f 905/977/971 587/641/635 906/978/972
+f 904/976/970 585/638/632 586/639/633
+f 904/976/970 586/639/633 905/977/971
+f 594/647/641 907/979/973 591/643/637
+f 593/646/640 908/980/974 594/647/641
+f 907/979/973 594/647/641 909/981/975
+f 594/647/641 908/980/974 909/981/975
+f 910/982/976 595/648/642 596/650/644
+f 910/982/976 596/650/644 911/983/977
+f 908/980/974 595/648/642 910/982/976
+f 595/648/642 908/980/974 593/646/640
+f 913/984/978 603/653/647 914/985/979
+f 601/656/650 602/651/645 913/984/978
+f 601/656/650 913/984/978 912/986/980
+f 602/651/645 603/653/647 913/984/978
+f 915/987/981 604/657/651 907/979/973
+f 914/985/979 603/653/647 915/987/981
+f 603/653/647 604/657/651 915/987/981
+f 907/979/973 604/657/651 591/643/637
+f 610/659/653 916/988/982 609/664/658
+f 916/988/982 610/659/653 917/989/983
+f 610/659/653 611/661/655 917/989/983
+f 918/990/984 612/665/659 613/667/661
+f 918/990/984 613/667/661 919/991/985
+f 611/661/655 612/665/659 918/990/984
+f 619/671/665 920/992/986 617/669/663
+f 920/992/986 921/993/987 922/994/988
+f 920/992/986 619/671/665 921/993/987
+f 619/671/665 620/673/667 923/995/989
+f 619/671/665 923/995/989 921/993/987
+f 1121/996/990 924/674/668 925/997/991
+f 923/995/989 924/674/668 1121/996/990
+f 923/995/989 620/673/667 924/674/668
+f 925/997/991 924/674/668 621/676/670
+f 627/680/674 926/998/992 625/678/672
+f 628/682/676 927/999/993 627/680/674
+f 926/998/992 928/1000/994 929/1001/995
+f 926/998/992 627/680/674 928/1000/994
+f 627/680/674 927/999/993 928/1000/994
+f 1124/1002/996 930/683/677 920/992/986
+f 1124/1002/996 920/992/986 922/994/988
+f 927/999/993 930/683/677 1124/1002/996
+f 920/992/986 930/683/677 617/669/663
+f 930/683/677 927/999/993 628/682/676
+f 633/685/679 931/1003/997 631/688/682
+f 634/687/681 932/1004/998 633/685/679
+f 931/1003/997 633/685/679 933/1005/999
+f 633/685/679 932/1004/998 933/1005/999
+f 1127/1006/1000 926/998/992 929/1001/995
+f 932/1004/998 926/998/992 1127/1006/1000
+f 926/998/992 634/687/681 625/678/672
+f 926/998/992 932/1004/998 634/687/681
+f 639/690/684 934/1007/1001 638/695/689
+f 934/1007/1001 639/690/684 935/1008/1002
+f 639/690/684 936/1009/1003 935/1008/1002
+f 639/690/684 640/692/686 936/1009/1003
+f 937/1010/1004 641/696/690 931/1003/997
+f 936/1009/1003 640/692/686 641/696/690
+f 936/1009/1003 641/696/690 937/1010/1004
+f 931/1003/997 641/696/690 631/688/682
+f 647/701/695 938/1011/1005 644/699/693
+f 938/1011/1005 647/701/695 939/1012/1006
+f 647/701/695 648/703/697 939/1012/1006
+f 940/1013/1007 941/1014/1008 1135/1015/1009
+f 940/1013/1007 649/704/698 941/1014/1008
+f 648/703/697 649/704/698 940/1013/1007
+f 941/1014/1008 649/704/698 650/706/700
+f 656/710/704 942/1016/1010 654/708/702
+f 657/712/706 943/1017/1011 656/710/704
+f 942/1016/1010 944/1018/1012 945/1019/1013
+f 942/1016/1010 656/710/704 944/1018/1012
+f 656/710/704 943/1017/1011 944/1018/1012
+f 1140/1020/1014 946/713/707 947/1021/1015
+f 946/713/707 658/715/709 947/1021/1015
+f 943/1017/1011 946/713/707 1140/1020/1014
+f 946/713/707 943/1017/1011 657/712/706
+f 664/716/710 948/1022/1016 663/721/715
+f 665/718/712 949/1023/1017 948/1022/1016
+f 665/718/712 948/1022/1016 664/716/710
+f 663/721/715 948/1022/1016 950/1024/1018
+f 951/1025/1019 942/1016/1010 945/1019/1013
+f 951/1025/1019 666/722/716 942/1016/1010
+f 949/1023/1017 666/722/716 951/1025/1019
+f 942/1016/1010 666/722/716 654/708/702
+f 666/722/716 949/1023/1017 665/718/712
+f 671/729/723 672/724/718 953/1026/1020
+f 671/729/723 953/1026/1020 952/1027/1021
+f 672/724/718 673/726/720 953/1026/1020
+f 955/1028/1022 954/1029/1023 674/730/724
+f 955/1028/1022 674/730/724 675/732/726
+f 954/1029/1023 673/726/720 674/730/724
+f 681/736/730 956/1030/1024 679/734/728
+f 682/738/732 957/1031/1025 681/736/730
+f 956/1030/1024 681/736/730 958/1032/1026
+f 681/736/730 957/1031/1025 958/1032/1026
+f 1155/1033/1027 959/739/733 960/741/735
+f 1155/1033/1027 960/741/735 1156/1034/1028
+f 957/1031/1025 959/739/733 1155/1033/1027
+f 959/739/733 957/1031/1025 682/738/732
+f 687/743/737 961/1035/1029 688/744/738
+f 689/747/741 961/1035/1029 687/743/737
+f 961/1035/1029 689/747/741 963/1036/1030
+f 688/744/738 961/1035/1029 962/1037/1031
+f 964/1038/1032 965/748/742 956/1030/1024
+f 963/1036/1030 689/747/741 965/748/742
+f 963/1036/1030 965/748/742 964/1038/1032
+f 956/1030/1024 965/748/742 679/734/728
+f 695/750/744 966/1039/1033 694/755/749
+f 696/752/746 967/1040/1034 695/750/744
+f 966/1039/1033 695/750/744 968/1041/1035
+f 695/750/744 967/1040/1034 968/1041/1035
+f 969/1042/1036 697/756/750 688/744/738
+f 969/1042/1036 688/744/738 962/1037/1031
+f 967/1040/1034 697/756/750 969/1042/1036
+f 697/756/750 967/1040/1034 696/752/746
+f 700/759/753 970/1043/1037 703/761/755
+f 702/762/756 971/1044/1038 972/1045/1039
+f 702/762/756 703/761/755 971/1044/1038
+f 703/761/755 970/1043/1037 971/1044/1038
+f 973/1046/1040 704/763/757 705/765/759
+f 973/1046/1040 705/765/759 974/1047/1041
+f 970/1043/1037 704/763/757 973/1046/1040
+f 704/763/757 970/1043/1037 700/759/753
+f 976/1048/1042 712/770/764 977/1049/1043
+f 711/768/762 710/767/761 976/1048/1042
+f 711/768/762 976/1048/1042 975/1050/1044
+f 710/767/761 712/770/764 976/1048/1042
+f 1174/1051/1045 978/772/766 979/1052/1046
+f 978/772/766 713/774/768 979/1052/1046
+f 977/1049/1043 712/770/764 978/772/766
+f 977/1049/1043 978/772/766 1174/1051/1045
+f 719/775/769 980/1053/1047 718/780/774
+f 980/1053/1047 719/775/769 981/1054/1048
+f 719/775/769 720/777/771 981/1054/1048
+f 982/1055/1049 721/781/775 711/768/762
+f 982/1055/1049 711/768/762 975/1050/1044
+f 720/777/771 721/781/775 982/1055/1049
+f 727/783/777 983/1056/1050 726/788/782
+f 983/1056/1050 727/783/777 984/1057/1051
+f 727/783/777 728/785/779 984/1057/1051
+f 1184/1058/1052 985/789/783 986/1059/1053
+f 1184/1058/1052 986/1059/1053 1185/1060/1054
+f 728/785/779 985/789/783 1184/1058/1052
+f 986/1059/1053 985/789/783 729/790/784
+f 734/794/788 987/1061/1055 732/792/786
+f 735/796/790 988/1062/1056 734/794/788
+f 987/1061/1055 734/794/788 989/1063/1057
+f 734/794/788 988/1062/1056 989/1063/1057
+f 1191/1064/1058 990/797/791 991/1065/1059
+f 1191/1064/1058 991/1065/1059 1192/1066/1060
+f 988/1062/1056 990/797/791 1191/1064/1058
+f 991/1065/1059 990/797/791 736/799/793
+f 990/797/791 988/1062/1056 735/796/790
+f 993/1067/1061 743/804/798 994/1068/1062
+f 742/802/796 741/801/795 993/1067/1061
+f 742/802/796 993/1067/1061 992/1069/1063
+f 741/801/795 743/804/798 993/1067/1061
+f 1197/1070/1064 995/806/800 987/1061/1055
+f 994/1068/1062 743/804/798 995/806/800
+f 994/1068/1062 995/806/800 1197/1070/1064
+f 987/1061/1055 995/806/800 732/792/786
+f 749/808/802 996/1071/1065 748/813/807
+f 750/810/804 997/1072/1066 749/808/802
+f 996/1071/1065 749/808/802 998/1073/1067
+f 996/1071/1065 998/1073/1067 999/1074/1068
+f 749/808/802 997/1072/1066 998/1073/1067
+f 1000/1075/1069 751/814/808 742/802/796
+f 1000/1075/1069 742/802/796 992/1069/1063
+f 997/1072/1066 751/814/808 1000/1075/1069
+f 751/814/808 997/1072/1066 750/810/804
+f 756/819/813 1001/1076/1070 754/817/811
+f 1001/1076/1070 756/819/813 1002/1077/1071
+f 1001/1076/1070 1002/1077/1071 1003/1078/1072
+f 756/819/813 1004/1079/1073 1002/1077/1071
+f 756/819/813 757/820/814 1004/1079/1073
+f 1005/1080/1074 758/821/815 759/823/817
+f 1005/1080/1074 759/823/817 1006/1081/1075
+f 1004/1079/1073 757/820/814 758/821/815
+f 1004/1079/1073 758/821/815 1005/1080/1074
+f 765/827/821 1007/1082/1076 763/825/819
+f 766/829/823 1008/1083/1077 765/827/821
+f 1007/1082/1076 765/827/821 1009/1084/1078
+f 765/827/821 1008/1083/1077 1009/1084/1078
+f 1211/1085/1079 1010/830/824 1011/832/826
+f 1211/1085/1079 1011/832/826 1213/1086/1080
+f 1008/1083/1077 1010/830/824 1211/1085/1079
+f 1010/830/824 1008/1083/1077 766/829/823
+f 772/833/827 1012/1087/1081 771/838/832
+f 1012/1087/1081 772/833/827 1013/1088/1082
+f 772/833/827 773/835/829 1013/1088/1082
+f 1014/1089/1083 774/839/833 1007/1082/1076
+f 773/835/829 774/839/833 1014/1089/1083
+f 1007/1082/1076 774/839/833 763/825/819
+f 779/846/840 780/841/835 1016/1090/1084
+f 779/846/840 1016/1090/1084 1015/1091/1085
+f 780/841/835 781/843/837 1016/1090/1084
+f 1017/1092/1086 782/847/841 1018/1093/1087
+f 781/843/837 782/847/841 1017/1092/1086
+f 1018/1093/1087 782/847/841 783/848/842
+f 788/852/846 1019/1094/1088 786/850/844
+f 789/854/848 1020/1095/1089 788/852/846
+f 1019/1094/1088 788/852/846 1021/1096/1090
+f 788/852/846 1020/1095/1089 1021/1096/1090
+f 1226/1097/1091 1022/855/849 1023/1098/1092
+f 1226/1097/1091 1023/1098/1092 1227/1099/1093
+f 1020/1095/1089 1022/855/849 1226/1097/1091
+f 1023/1098/1092 1022/855/849 790/857/851
+f 1022/855/849 1020/1095/1089 789/854/848
+f 796/861/855 1024/1100/1094 794/859/853
+f 797/863/857 1025/1101/1095 796/861/855
+f 1024/1100/1094 796/861/855 1026/1102/1096
+f 796/861/855 1025/1101/1095 1026/1102/1096
+f 1232/1103/1097 1027/864/858 1019/1094/1088
+f 1025/1101/1095 1027/864/858 1232/1103/1097
+f 1019/1094/1088 1027/864/858 786/850/844
+f 1027/864/858 1025/1101/1095 797/863/857
+f 804/868/862 1028/1104/1098 803/866/860
+f 1029/1105/1099 803/866/860 1030/1106/1100
+f 803/866/860 1028/1104/1098 1030/1106/1100
+f 802/871/865 803/866/860 1029/1105/1099
+f 1031/1107/1101 805/872/866 1024/1100/1094
+f 1028/1104/1098 805/872/866 1031/1107/1101
+f 1024/1100/1094 805/872/866 794/859/853
+f 805/872/866 1028/1104/1098 804/868/862
+f 810/874/868 1032/1108/1102 809/878/872
+f 1032/1108/1102 1033/1109/1103 1034/1110/1104
+f 1032/1108/1102 810/874/868 1033/1109/1103
+f 810/874/868 811/876/870 1033/1109/1103
+f 1035/1111/1105 812/879/873 1036/1112/1106
+f 811/876/870 812/879/873 1035/1111/1105
+f 1036/1112/1106 812/879/873 813/881/875
+f 819/884/878 818/883/877 1038/1113/1107
+f 819/884/878 1038/1113/1107 1037/1114/1108
+f 818/883/877 820/886/880 1038/1113/1107
+f 1039/1115/1109 821/888/882 822/890/884
+f 1039/1115/1109 822/890/884 1040/1116/1110
+f 820/886/880 821/888/882 1039/1115/1109
+f 1041/1117/1111 828/891/885 1042/1118/1112
+f 828/891/885 829/893/887 1043/1119/1113
+f 828/891/885 1043/1119/1113 1042/1118/1112
+f 827/896/890 828/891/885 1041/1117/1111
+f 1044/1120/1114 830/897/891 819/884/878
+f 1044/1120/1114 819/884/878 1037/1114/1108
+f 1043/1119/1113 829/893/887 1044/1120/1114
+f 829/893/887 830/897/891 1044/1120/1114
+f 835/904/898 836/899/893 1046/1121/1115
+f 835/904/898 1046/1121/1115 1045/1122/1116
+f 836/899/893 837/901/895 1046/1121/1115
+f 1253/1123/1117 1047/905/899 1254/1124/1118
+f 1047/905/899 838/907/901 1254/1124/1118
+f 837/901/895 1047/905/899 1253/1123/1117
+f 1049/1125/1119 845/913/907 1050/1126/1120
+f 844/910/904 843/909/903 1049/1125/1119
+f 844/910/904 1049/1125/1119 1048/1127/1121
+f 843/909/903 845/913/907 1049/1125/1119
+f 1259/1128/1122 1051/914/908 1052/1129/1123
+f 1051/914/908 846/916/910 1052/1129/1123
+f 1050/1126/1120 845/913/907 1051/914/908
+f 1050/1126/1120 1051/914/908 1259/1128/1122
+f 852/920/914 1053/1130/1124 850/918/912
+f 1053/1130/1124 852/920/914 1054/1131/1125
+f 852/920/914 853/922/916 1055/1132/1126
+f 852/920/914 1055/1132/1126 1054/1131/1125
+f 1056/1133/1127 1057/923/917 1048/1127/1121
+f 1057/923/917 844/910/904 1048/1127/1121
+f 1055/1132/1126 853/922/916 1057/923/917
+f 1055/1132/1126 1057/923/917 1056/1133/1127
+f 859/925/919 1058/1134/1128 858/930/924
+f 860/927/921 1059/1135/1129 859/925/919
+f 1058/1134/1128 859/925/919 1060/1136/1130
+f 1058/1134/1128 1060/1136/1130 1061/1137/1131
+f 859/925/919 1059/1135/1129 1060/1136/1130
+f 1062/1138/1132 861/931/925 1053/1130/1124
+f 1059/1135/1129 861/931/925 1062/1138/1132
+f 1053/1130/1124 861/931/925 850/918/912
+f 861/931/925 1059/1135/1129 860/927/921
+f 865/936/930 1063/1139/1133 866/935/929
+f 865/936/930 1064/1140/1134 1063/1139/1133
+f 1063/1139/1133 1064/1140/1134 1065/1141/1135
+f 1064/1140/1134 865/936/930 1066/1142/1136
+f 1067/1143/1137 867/937/931 1068/1144/1138
+f 1066/1142/1136 865/936/930 867/937/931
+f 1066/1142/1136 867/937/931 1067/1143/1137
+f 1068/1144/1138 867/937/931 868/939/933
+f 874/943/937 1069/1145/1139 872/941/935
+f 1069/1145/1139 874/943/937 1070/1146/1140
+f 874/943/937 875/945/939 1070/1146/1140
+f 1071/1147/1141 1072/946/940 1073/1148/1142
+f 875/945/939 1072/946/940 1071/1147/1141
+f 1073/1148/1142 1072/946/940 876/948/942
+f 880/953/947 881/949/943 1075/1149/1143
+f 880/953/947 1075/1149/1143 1074/1150/1144
+f 881/949/943 882/951/945 1076/1151/1145
+f 881/949/943 1076/1151/1145 1075/1149/1143
+f 1077/1152/1146 883/954/948 1069/1145/1139
+f 1076/1151/1145 882/951/945 883/954/948
+f 1076/1151/1145 883/954/948 1077/1152/1146
+f 1069/1145/1139 883/954/948 872/941/935
+f 886/957/951 1078/1153/1147 885/956/950
+f 1078/1153/1147 1079/1154/1148 885/956/950
+f 887/958/952 1080/1155/1149 1078/1153/1147
+f 887/958/952 1078/1153/1147 886/957/951
+f 1081/1156/1150 1082/961/955 1287/1157/1151
+f 888/959/953 1080/1155/1149 887/958/952
+f 1082/961/955 1081/1156/1150 888/959/953
+f 1081/1156/1150 1080/1155/1149 888/959/953
+f 891/962/956 1083/1158/1152 890/963/957
+f 563/613/607 1084/1159/1153 1083/1158/1152
+f 563/613/607 1083/1158/1152 891/962/956
+f 890/963/957 1083/1158/1152 1085/1160/1154
+f 1086/1161/1155 1087/964/958 1088/966/960
+f 1086/1161/1155 1088/966/960 1292/1162/1156
+f 1084/1159/1153 1087/964/958 1086/1161/1155
+f 1087/964/958 1084/1159/1153 563/613/607
+f 896/969/963 1089/1163/1157 895/968/962
+f 1090/1164/1158 895/968/962 1091/1165/1159
+f 895/968/962 1089/1163/1157 1091/1165/1159
+f 894/967/961 895/968/962 1090/1164/1158
+f 1092/1166/1160 890/963/957 1085/1160/1154
+f 1092/1166/1160 897/970/964 890/963/957
+f 1089/1163/1157 897/970/964 1092/1166/1160
+f 897/970/964 1089/1163/1157 896/969/963
+f 578/631/625 1093/1167/1161 900/972/966
+f 1094/1168/1162 900/972/966 1095/1169/1163
+f 900/972/966 1093/1167/1161 1095/1169/1163
+f 899/971/965 900/972/966 1094/1168/1162
+f 1096/1170/1164 894/967/961 1090/1164/1158
+f 894/967/961 1096/1170/1164 901/973/967
+f 1096/1170/1164 1093/1167/1161 578/631/625
+f 1096/1170/1164 578/631/625 901/973/967
+f 903/975/969 1097/1171/1165 902/974/968
+f 1097/1171/1165 903/975/969 1098/1172/1166
+f 903/975/969 1099/1173/1167 1098/1172/1166
+f 903/975/969 904/976/970 1099/1173/1167
+f 1099/1173/1167 904/976/970 1100/1174/1168
+f 906/978/972 1100/1174/1168 905/977/971
+f 1100/1174/1168 904/976/970 905/977/971
+f 1101/1175/1169 1100/1174/1168 906/978/972
+f 909/981/975 1102/1176/1170 907/979/973
+f 908/980/974 1103/1177/1171 1102/1176/1170
+f 908/980/974 1102/1176/1170 909/981/975
+f 907/979/973 1102/1176/1170 1104/1178/1172
+f 1105/1179/1173 910/982/976 1106/1180/1174
+f 1103/1177/1171 910/982/976 1105/1179/1173
+f 1106/1180/1174 910/982/976 911/983/977
+f 910/982/976 1103/1177/1171 908/980/974
+f 914/985/979 1107/1181/1175 913/984/978
+f 912/986/980 913/984/978 1109/1182/1176
+f 912/986/980 1109/1182/1176 1108/1183/1177
+f 913/984/978 1107/1181/1175 1109/1182/1176
+f 1110/1184/1178 907/979/973 1104/1178/1172
+f 907/979/973 1110/1184/1178 915/987/981
+f 1110/1184/1178 914/985/979 915/987/981
+f 1110/1184/1178 1107/1181/1175 914/985/979
+f 917/989/983 1111/1185/1179 916/988/982
+f 1111/1185/1179 1112/1186/1180 916/988/982
+f 611/661/655 1113/1187/1181 1111/1185/1179
+f 611/661/655 1111/1185/1179 917/989/983
+f 919/991/985 1114/1188/1182 918/990/984
+f 1114/1188/1182 1113/1187/1181 611/661/655
+f 1114/1188/1182 611/661/655 918/990/984
+f 1115/1189/1183 1114/1188/1182 919/991/985
+f 921/993/987 1116/1190/1184 922/994/988
+f 923/995/989 1116/1190/1184 921/993/987
+f 922/994/988 1116/1190/1184 1117/1191/1185
+f 1116/1190/1184 923/995/989 1118/1192/1186
+f 1119/1193/1187 1121/996/990 1120/1194/1188
+f 1118/1192/1186 923/995/989 1121/996/990
+f 1118/1192/1186 1121/996/990 1119/1193/1187
+f 1120/1194/1188 1121/996/990 925/997/991
+f 928/1000/994 1122/1195/1189 929/1001/995
+f 927/999/993 1122/1195/1189 928/1000/994
+f 927/999/993 1123/1196/1190 1122/1195/1189
+f 929/1001/995 1122/1195/1189 1324/1197/1191
+f 1327/1198/1192 1124/1002/996 922/994/988
+f 1327/1198/1192 922/994/988 1117/1191/1185
+f 1123/1196/1190 1124/1002/996 1327/1198/1192
+f 1124/1002/996 1123/1196/1190 927/999/993
+f 933/1005/999 1125/1199/1193 931/1003/997
+f 932/1004/998 1126/1200/1194 933/1005/999
+f 933/1005/999 1126/1200/1194 1125/1199/1193
+f 1330/1201/1195 1127/1006/1000 929/1001/995
+f 1330/1201/1195 929/1001/995 1324/1197/1191
+f 1126/1200/1194 1127/1006/1000 1330/1201/1195
+f 1127/1006/1000 1126/1200/1194 932/1004/998
+f 935/1008/1002 1128/1202/1196 934/1007/1001
+f 1128/1202/1196 935/1008/1002 1129/1203/1197
+f 935/1008/1002 936/1009/1003 1129/1203/1197
+f 1129/1203/1197 936/1009/1003 1130/1204/1198
+f 931/1003/997 1130/1204/1198 937/1010/1004
+f 1130/1204/1198 936/1009/1003 937/1010/1004
+f 1125/1199/1193 1130/1204/1198 931/1003/997
+f 939/1012/1006 1131/1205/1199 938/1011/1005
+f 1131/1205/1199 1132/1206/1200 938/1011/1005
+f 648/703/697 1133/1207/1201 1131/1205/1199
+f 648/703/697 1131/1205/1199 939/1012/1006
+f 1134/1208/1202 1135/1015/1009 1338/1209/1203
+f 1135/1015/1009 1134/1208/1202 940/1013/1007
+f 1134/1208/1202 1133/1207/1201 648/703/697
+f 1134/1208/1202 648/703/697 940/1013/1007
+f 943/1017/1011 1136/1210/1204 944/1018/1012
+f 945/1019/1013 1137/1211/1205 1138/1212/1206
+f 945/1019/1013 944/1018/1012 1137/1211/1205
+f 944/1018/1012 1136/1210/1204 1137/1211/1205
+f 1139/1213/1207 1140/1020/1014 1343/1214/1208
+f 1140/1020/1014 947/1021/1015 1343/1214/1208
+f 1136/1210/1204 1140/1020/1014 1139/1213/1207
+f 1140/1020/1014 1136/1210/1204 943/1017/1011
+f 948/1022/1016 1141/1215/1209 1142/1216/1210
+f 948/1022/1016 1142/1216/1210 950/1024/1018
+f 949/1023/1017 1143/1217/1211 1141/1215/1209
+f 949/1023/1017 1141/1215/1209 948/1022/1016
+f 1144/1218/1212 945/1019/1013 1138/1212/1206
+f 1144/1218/1212 951/1025/1019 945/1019/1013
+f 1143/1217/1211 951/1025/1019 1144/1218/1212
+f 951/1025/1019 1143/1217/1211 949/1023/1017
+f 953/1026/1020 1145/1219/1213 952/1027/1021
+f 1145/1219/1213 1146/1220/1214 952/1027/1021
+f 673/726/720 1147/1221/1215 1145/1219/1213
+f 673/726/720 1145/1219/1213 953/1026/1020
+f 1148/1222/1216 1149/1223/1217 1352/1224/1218
+f 954/1029/1023 1147/1221/1215 673/726/720
+f 1149/1223/1217 1148/1222/1216 954/1029/1023
+f 1149/1223/1217 954/1029/1023 955/1028/1022
+f 1148/1222/1216 1147/1221/1215 954/1029/1023
+f 958/1032/1026 1150/1225/1219 956/1030/1024
+f 1150/1225/1219 1151/1226/1220 956/1030/1024
+f 957/1031/1025 1150/1225/1219 958/1032/1026
+f 957/1031/1025 1152/1227/1221 1150/1225/1219
+f 1151/1226/1220 1150/1225/1219 1153/1228/1222
+f 1154/1229/1223 1155/1033/1027 1357/1230/1224
+f 1155/1033/1027 1156/1034/1028 1357/1230/1224
+f 1152/1227/1221 1155/1033/1027 1154/1229/1223
+f 1155/1033/1027 1152/1227/1221 957/1031/1025
+f 961/1035/1029 1157/1231/1225 962/1037/1031
+f 963/1036/1030 1158/1232/1226 1157/1231/1225
+f 963/1036/1030 1157/1231/1225 961/1035/1029
+f 962/1037/1031 1157/1231/1225 1159/1233/1227
+f 1160/1234/1228 1151/1226/1220 1153/1228/1222
+f 1160/1234/1228 964/1038/1032 1151/1226/1220
+f 1158/1232/1226 964/1038/1032 1160/1234/1228
+f 1151/1226/1220 964/1038/1032 956/1030/1024
+f 964/1038/1032 1158/1232/1226 963/1036/1030
+f 968/1041/1035 1161/1235/1229 966/1039/1033
+f 967/1040/1034 1162/1236/1230 968/1041/1035
+f 1161/1235/1229 968/1041/1035 1163/1237/1231
+f 1161/1235/1229 1163/1237/1231 1164/1238/1232
+f 968/1041/1035 1162/1236/1230 1163/1237/1231
+f 1165/1239/1233 962/1037/1031 1159/1233/1227
+f 962/1037/1031 1165/1239/1233 969/1042/1036
+f 1165/1239/1233 967/1040/1034 969/1042/1036
+f 1165/1239/1233 1162/1236/1230 967/1040/1034
+f 971/1044/1038 1166/1240/1234 972/1045/1039
+f 970/1043/1037 1167/1241/1235 971/1044/1038
+f 1167/1241/1235 1166/1240/1234 971/1044/1038
+f 972/1045/1039 1166/1240/1234 1168/1242/1236
+f 974/1047/1041 1169/1243/1237 973/1046/1040
+f 1169/1243/1237 1167/1241/1235 970/1043/1037
+f 1169/1243/1237 970/1043/1037 973/1046/1040
+f 1170/1244/1238 1169/1243/1237 974/1047/1041
+f 976/1048/1042 1171/1245/1239 975/1050/1044
+f 977/1049/1043 1171/1245/1239 976/1048/1042
+f 975/1050/1044 1171/1245/1239 1172/1246/1240
+f 1171/1245/1239 977/1049/1043 1173/1247/1241
+f 1374/1248/1242 1174/1051/1045 1175/1249/1243
+f 1173/1247/1241 977/1049/1043 1174/1051/1045
+f 1173/1247/1241 1174/1051/1045 1374/1248/1242
+f 1175/1249/1243 1174/1051/1045 979/1052/1046
+f 981/1054/1048 1176/1250/1244 980/1053/1047
+f 720/777/771 1177/1251/1245 981/1054/1048
+f 1176/1250/1244 981/1054/1048 1178/1252/1246
+f 981/1054/1048 1177/1251/1245 1178/1252/1246
+f 1179/1253/1247 975/1050/1044 1172/1246/1240
+f 975/1050/1044 1179/1253/1247 982/1055/1049
+f 1179/1253/1247 1177/1251/1245 720/777/771
+f 1179/1253/1247 720/777/771 982/1055/1049
+f 984/1057/1051 1180/1254/1248 983/1056/1050
+f 1180/1254/1248 1181/1255/1249 983/1056/1050
+f 728/785/779 1182/1256/1250 1180/1254/1248
+f 728/785/779 1180/1254/1248 984/1057/1051
+f 1183/1257/1251 1184/1058/1052 1185/1060/1054
+f 1183/1257/1251 1185/1060/1054 1383/1258/1252
+f 1182/1256/1250 1184/1058/1052 1183/1257/1251
+f 1184/1058/1052 1182/1256/1250 728/785/779
+f 989/1063/1057 1186/1259/1253 987/1061/1055
+f 1186/1259/1253 1187/1260/1254 987/1061/1055
+f 988/1062/1056 1186/1259/1253 989/1063/1057
+f 988/1062/1056 1188/1261/1255 1186/1259/1253
+f 1187/1260/1254 1186/1259/1253 1189/1262/1256
+f 1190/1263/1257 1191/1064/1058 1192/1066/1060
+f 1190/1263/1257 1192/1066/1060 1388/1264/1258
+f 1188/1261/1255 1191/1064/1058 1190/1263/1257
+f 1191/1064/1058 1188/1261/1255 988/1062/1056
+f 994/1068/1062 1193/1265/1259 993/1067/1061
+f 992/1069/1063 1194/1266/1260 1195/1267/1261
+f 992/1069/1063 993/1067/1061 1194/1266/1260
+f 993/1067/1061 1193/1265/1259 1194/1266/1260
+f 1196/1268/1262 1197/1070/1064 1187/1260/1254
+f 1196/1268/1262 1187/1260/1254 1189/1262/1256
+f 1193/1265/1259 1197/1070/1064 1196/1268/1262
+f 1187/1260/1254 1197/1070/1064 987/1061/1055
+f 1197/1070/1064 1193/1265/1259 994/1068/1062
+f 997/1072/1066 1198/1269/1263 998/1073/1067
+f 999/1074/1068 998/1073/1067 1199/1270/1264
+f 999/1074/1068 1199/1270/1264 1200/1271/1265
+f 998/1073/1067 1198/1269/1263 1199/1270/1264
+f 1201/1272/1266 992/1069/1063 1195/1267/1261
+f 992/1069/1063 1201/1272/1266 1000/1075/1069
+f 1201/1272/1266 997/1072/1066 1000/1075/1069
+f 1201/1272/1266 1198/1269/1263 997/1072/1066
+f 1202/1273/1267 1002/1077/1071 1203/1274/1268
+f 1002/1077/1071 1204/1275/1269 1203/1274/1268
+f 1003/1078/1072 1002/1077/1071 1202/1273/1267
+f 1002/1077/1071 1004/1079/1073 1204/1275/1269
+f 1205/1276/1270 1006/1081/1075 1206/1277/1271
+f 1204/1275/1269 1004/1079/1073 1205/1276/1270
+f 1006/1081/1075 1205/1276/1270 1005/1080/1074
+f 1205/1276/1270 1004/1079/1073 1005/1080/1074
+f 1009/1084/1078 1207/1278/1272 1007/1082/1076
+f 1207/1278/1272 1208/1279/1273 1007/1082/1076
+f 1008/1083/1077 1207/1278/1272 1009/1084/1078
+f 1008/1083/1077 1209/1280/1274 1207/1278/1272
+f 1208/1279/1273 1207/1278/1272 1210/1281/1275
+f 1405/1282/1276 1211/1085/1079 1212/1283/1277
+f 1211/1085/1079 1213/1086/1080 1212/1283/1277
+f 1209/1280/1274 1211/1085/1079 1405/1282/1276
+f 1211/1085/1079 1209/1280/1274 1008/1083/1077
+f 1013/1088/1082 1214/1284/1278 1012/1087/1081
+f 773/835/829 1215/1285/1279 1013/1088/1082
+f 1214/1284/1278 1013/1088/1082 1216/1286/1280
+f 1013/1088/1082 1215/1285/1279 1216/1286/1280
+f 1217/1287/1281 1208/1279/1273 1210/1281/1275
+f 1007/1082/1076 1217/1287/1281 1014/1089/1083
+f 1217/1287/1281 1215/1285/1279 773/835/829
+f 1217/1287/1281 773/835/829 1014/1089/1083
+f 1208/1279/1273 1217/1287/1281 1007/1082/1076
+f 1016/1090/1084 1218/1288/1282 1015/1091/1085
+f 1218/1288/1282 1219/1289/1283 1015/1091/1085
+f 781/843/837 1220/1290/1284 1218/1288/1282
+f 781/843/837 1218/1288/1282 1016/1090/1084
+f 1018/1093/1087 1221/1291/1285 1017/1092/1086
+f 1221/1291/1285 1220/1290/1284 781/843/837
+f 1221/1291/1285 781/843/837 1017/1092/1086
+f 1222/1292/1286 1221/1291/1285 1018/1093/1087
+f 1021/1096/1090 1223/1293/1287 1019/1094/1088
+f 1223/1293/1287 1224/1294/1288 1019/1094/1088
+f 1020/1095/1089 1223/1293/1287 1021/1096/1090
+f 1020/1095/1089 1225/1295/1289 1223/1293/1287
+f 1226/1097/1091 1227/1099/1093 1420/1296/1290
+f 1226/1097/1091 1225/1295/1289 1020/1095/1089
+f 1026/1102/1096 1228/1297/1291 1024/1100/1094
+f 1025/1101/1095 1229/1298/1292 1026/1102/1096
+f 1228/1297/1291 1026/1102/1096 1230/1299/1293
+f 1231/1300/1294 1232/1103/1097 1224/1294/1288
+f 1229/1298/1292 1232/1103/1097 1231/1300/1294
+f 1224/1294/1288 1232/1103/1097 1019/1094/1088
+f 1232/1103/1097 1229/1298/1292 1025/1101/1095
+f 1028/1104/1098 1233/1301/1295 1030/1106/1100
+f 1029/1105/1099 1030/1106/1100 1235/1302/1296
+f 1029/1105/1099 1235/1302/1296 1234/1303/1297
+f 1030/1106/1100 1233/1301/1295 1235/1302/1296
+f 1236/1304/1298 1228/1297/1291 1230/1299/1293
+f 1024/1100/1094 1236/1304/1298 1031/1107/1101
+f 1236/1304/1298 1028/1104/1098 1031/1107/1101
+f 1228/1297/1291 1236/1304/1298 1024/1100/1094
+f 1236/1304/1298 1233/1301/1295 1028/1104/1098
+f 1033/1109/1103 1237/1305/1299 1034/1110/1104
+f 811/876/870 1238/1306/1300 1033/1109/1103
+f 1238/1306/1300 1237/1305/1299 1033/1109/1103
+f 1034/1110/1104 1237/1305/1299 1239/1307/1301
+f 1036/1112/1106 1240/1308/1302 1035/1111/1105
+f 1240/1308/1302 1238/1306/1300 811/876/870
+f 1240/1308/1302 811/876/870 1035/1111/1105
+f 1241/1309/1303 1240/1308/1302 1036/1112/1106
+f 1038/1113/1107 1242/1310/1304 1037/1114/1108
+f 820/886/880 1243/1311/1305 1242/1310/1304
+f 820/886/880 1242/1310/1304 1038/1113/1107
+f 1037/1114/1108 1242/1310/1304 1244/1312/1306
+f 1245/1313/1307 1039/1115/1109 1246/1314/1308
+f 1243/1311/1305 1039/1115/1109 1245/1313/1307
+f 1039/1115/1109 1243/1311/1305 820/886/880
+f 1246/1314/1308 1039/1115/1109 1040/1116/1110
+f 1042/1118/1112 1247/1315/1309 1041/1117/1111
+f 1247/1315/1309 1042/1118/1112 1248/1316/1310
+f 1042/1118/1112 1043/1119/1113 1248/1316/1310
+f 1249/1317/1311 1037/1114/1108 1244/1312/1306
+f 1037/1114/1108 1249/1317/1311 1044/1120/1114
+f 1249/1317/1311 1043/1119/1113 1044/1120/1114
+f 1046/1121/1115 1250/1318/1312 1045/1122/1116
+f 837/901/895 1251/1319/1313 1250/1318/1312
+f 837/901/895 1250/1318/1312 1046/1121/1115
+f 1045/1122/1116 1250/1318/1312 1252/1320/1314
+f 1253/1123/1117 1254/1124/1118 1446/1321/1315
+f 1253/1123/1117 1251/1319/1313 837/901/895
+f 1049/1125/1119 1255/1322/1316 1048/1127/1121
+f 1255/1322/1316 1256/1323/1317 1048/1127/1121
+f 1050/1126/1120 1255/1322/1316 1049/1125/1119
+f 1050/1126/1120 1257/1324/1318 1255/1322/1316
+f 1258/1325/1319 1259/1128/1122 1260/1326/1320
+f 1259/1128/1122 1052/1129/1123 1260/1326/1320
+f 1257/1324/1318 1259/1128/1122 1258/1325/1319
+f 1259/1128/1122 1257/1324/1318 1050/1126/1120
+f 1055/1132/1126 1261/1327/1321 1054/1131/1125
+f 1262/1328/1322 1054/1131/1125 1263/1329/1323
+f 1054/1131/1125 1261/1327/1321 1263/1329/1323
+f 1053/1130/1124 1054/1131/1125 1262/1328/1322
+f 1264/1330/1324 1056/1133/1127 1256/1323/1317
+f 1261/1327/1321 1056/1133/1127 1264/1330/1324
+f 1256/1323/1317 1056/1133/1127 1048/1127/1121
+f 1056/1133/1127 1261/1327/1321 1055/1132/1126
+f 1059/1135/1129 1265/1331/1325 1060/1136/1130
+f 1266/1332/1326 1060/1136/1130 1267/1333/1327
+f 1060/1136/1130 1265/1331/1325 1267/1333/1327
+f 1061/1137/1131 1060/1136/1130 1266/1332/1326
+f 1268/1334/1328 1053/1130/1124 1262/1328/1322
+f 1053/1130/1124 1268/1334/1328 1062/1138/1132
+f 1268/1334/1328 1059/1135/1129 1062/1138/1132
+f 1268/1334/1328 1265/1331/1325 1059/1135/1129
+f 1064/1140/1134 1269/1335/1329 1065/1141/1135
+f 1066/1142/1136 1270/1336/1330 1064/1140/1134
+f 1270/1336/1330 1269/1335/1329 1064/1140/1134
+f 1065/1141/1135 1269/1335/1329 1271/1337/1331
+f 1067/1143/1137 1270/1336/1330 1066/1142/1136
+f 1273/1338/1332 1272/1339/1333 1067/1143/1137
+f 1273/1338/1332 1067/1143/1137 1068/1144/1138
+f 1272/1339/1333 1270/1336/1330 1067/1143/1137
+f 1070/1146/1140 1274/1340/1334 1069/1145/1139
+f 1274/1340/1334 1275/1341/1335 1069/1145/1139
+f 875/945/939 1276/1342/1336 1274/1340/1334
+f 875/945/939 1274/1340/1334 1070/1146/1140
+f 1277/1343/1337 1071/1147/1141 1278/1344/1338
+f 1276/1342/1336 1071/1147/1141 1277/1343/1337
+f 1071/1147/1141 1276/1342/1336 875/945/939
+f 1278/1344/1338 1071/1147/1141 1073/1148/1142
+f 1075/1149/1143 1279/1345/1339 1074/1150/1144
+f 1279/1345/1339 1075/1149/1143 1280/1346/1340
+f 1075/1149/1143 1076/1151/1145 1281/1347/1341
+f 1075/1149/1143 1281/1347/1341 1280/1346/1340
+f 1282/1348/1342 1077/1152/1146 1275/1341/1335
+f 1281/1347/1341 1076/1151/1145 1282/1348/1342
+f 1076/1151/1145 1077/1152/1146 1282/1348/1342
+f 1275/1341/1335 1077/1152/1146 1069/1145/1139
+f 1078/1153/1147 1283/1349/1343 1079/1154/1148
+f 1283/1349/1343 1284/1350/1344 1079/1154/1148
+f 1080/1155/1149 1285/1351/1345 1283/1349/1343
+f 1080/1155/1149 1283/1349/1343 1078/1153/1147
+f 1286/1352/1346 1287/1157/1151 1477/1353/1347
+f 1081/1156/1150 1285/1351/1345 1080/1155/1149
+f 1287/1157/1151 1286/1352/1346 1081/1156/1150
+f 1286/1352/1346 1285/1351/1345 1081/1156/1150
+f 1083/1158/1152 1288/1354/1348 1085/1160/1154
+f 1084/1159/1153 1288/1354/1348 1083/1158/1152
+f 1084/1159/1153 1289/1355/1349 1288/1354/1348
+f 1085/1160/1154 1288/1354/1348 1290/1356/1350
+f 1291/1357/1351 1292/1162/1156 1483/1358/1352
+f 1292/1162/1156 1291/1357/1351 1086/1161/1155
+f 1291/1357/1351 1289/1355/1349 1084/1159/1153
+f 1291/1357/1351 1084/1159/1153 1086/1161/1155
+f 1091/1165/1159 1293/1359/1353 1090/1164/1158
+f 1089/1163/1157 1294/1360/1354 1293/1359/1353
+f 1089/1163/1157 1293/1359/1353 1091/1165/1159
+f 1090/1164/1158 1293/1359/1353 1295/1361/1355
+f 1296/1362/1356 1085/1160/1154 1290/1356/1350
+f 1085/1160/1154 1296/1362/1356 1092/1166/1160
+f 1296/1362/1356 1294/1360/1354 1089/1163/1157
+f 1296/1362/1356 1089/1163/1157 1092/1166/1160
+f 1095/1169/1163 1297/1363/1357 1094/1168/1162
+f 1093/1167/1161 1298/1364/1358 1297/1363/1357
+f 1093/1167/1161 1297/1363/1357 1095/1169/1163
+f 1094/1168/1162 1297/1363/1357 1299/1365/1359
+f 1300/1366/1360 1090/1164/1158 1295/1361/1355
+f 1090/1164/1158 1300/1366/1360 1096/1170/1164
+f 1300/1366/1360 1093/1167/1161 1096/1170/1164
+f 1300/1366/1360 1298/1364/1358 1093/1167/1161
+f 1098/1172/1166 1301/1367/1361 1302/1368/1362
+f 1098/1172/1166 1302/1368/1362 1097/1171/1165
+f 1099/1173/1167 1303/1369/1363 1098/1172/1166
+f 1303/1369/1363 1301/1367/1361 1098/1172/1166
+f 1101/1175/1169 1304/1370/1364 1100/1174/1168
+f 1304/1370/1364 1303/1369/1363 1099/1173/1167
+f 1304/1370/1364 1099/1173/1167 1100/1174/1168
+f 1305/1371/1365 1304/1370/1364 1101/1175/1169
+f 1102/1176/1170 1306/1372/1366 1104/1178/1172
+f 1103/1177/1171 1306/1372/1366 1102/1176/1170
+f 1103/1177/1171 1307/1373/1367 1306/1372/1366
+f 1104/1178/1172 1306/1372/1366 1308/1374/1368
+f 1310/1375/1369 1309/1376/1370 1105/1179/1173
+f 1310/1375/1369 1105/1179/1173 1106/1180/1174
+f 1309/1376/1370 1307/1373/1367 1103/1177/1171
+f 1309/1376/1370 1103/1177/1171 1105/1179/1173
+f 1109/1182/1176 1311/1377/1371 1108/1183/1177
+f 1107/1181/1175 1311/1377/1371 1109/1182/1176
+f 1107/1181/1175 1312/1378/1372 1311/1377/1371
+f 1108/1183/1177 1311/1377/1371 1313/1379/1373
+f 1314/1380/1374 1104/1178/1172 1308/1374/1368
+f 1104/1178/1172 1314/1380/1374 1110/1184/1178
+f 1314/1380/1374 1107/1181/1175 1110/1184/1178
+f 1314/1380/1374 1312/1378/1372 1107/1181/1175
+f 1111/1185/1179 1315/1381/1375 1316/1382/1376
+f 1111/1185/1179 1316/1382/1376 1112/1186/1180
+f 1113/1187/1181 1317/1383/1377 1111/1185/1179
+f 1317/1383/1377 1315/1381/1375 1111/1185/1179
+f 1115/1189/1183 1318/1384/1378 1114/1188/1182
+f 1318/1384/1378 1317/1383/1377 1113/1187/1181
+f 1318/1384/1378 1113/1187/1181 1114/1188/1182
+f 1319/1385/1379 1318/1384/1378 1115/1189/1183
+f 1116/1190/1184 1320/1386/1380 1117/1191/1185
+f 1118/1192/1186 1320/1386/1380 1116/1190/1184
+f 1117/1191/1185 1320/1386/1380 1321/1387/1381
+f 1320/1386/1380 1118/1192/1186 1322/1388/1382
+f 1323/1389/1383 1322/1388/1382 1119/1193/1187
+f 1323/1389/1383 1119/1193/1187 1120/1194/1188
+f 1322/1388/1382 1118/1192/1186 1119/1193/1187
+f 1123/1196/1190 1324/1197/1191 1122/1195/1189
+f 1123/1196/1190 1325/1390/1384 1324/1197/1191
+f 1324/1197/1191 1325/1390/1384 1326/1391/1385
+f 1518/1392/1386 1327/1198/1192 1117/1191/1185
+f 1518/1392/1386 1117/1191/1185 1321/1387/1381
+f 1325/1390/1384 1327/1198/1192 1518/1392/1386
+f 1327/1198/1192 1325/1390/1384 1123/1196/1190
+f 1126/1200/1194 1329/1393/1387 1328/1394/1388
+f 1126/1200/1194 1328/1394/1388 1125/1199/1193
+f 1326/1391/1385 1330/1201/1195 1324/1197/1191
+f 1329/1393/1387 1330/1201/1195 1326/1391/1385
+f 1330/1201/1195 1329/1393/1387 1126/1200/1194
+f 1129/1203/1197 1331/1395/1389 1332/1396/1390
+f 1129/1203/1197 1332/1396/1390 1128/1202/1196
+f 1125/1199/1193 1333/1397/1391 1130/1204/1198
+f 1333/1397/1391 1129/1203/1197 1130/1204/1198
+f 1328/1394/1388 1333/1397/1391 1125/1199/1193
+f 1333/1397/1391 1331/1395/1389 1129/1203/1197
+f 1131/1205/1199 1334/1398/1392 1132/1206/1200
+f 1334/1398/1392 1335/1399/1393 1132/1206/1200
+f 1133/1207/1201 1336/1400/1394 1334/1398/1392
+f 1133/1207/1201 1334/1398/1392 1131/1205/1199
+f 1337/1401/1395 1338/1209/1203 1534/1402/1396
+f 1134/1208/1202 1336/1400/1394 1133/1207/1201
+f 1338/1209/1203 1337/1401/1395 1134/1208/1202
+f 1337/1401/1395 1336/1400/1394 1134/1208/1202
+f 1136/1210/1204 1339/1403/1397 1137/1211/1205
+f 1138/1212/1206 1340/1404/1398 1341/1405/1399
+f 1138/1212/1206 1137/1211/1205 1340/1404/1398
+f 1137/1211/1205 1339/1403/1397 1340/1404/1398
+f 1342/1406/1400 1343/1214/1208 1540/1407/1401
+f 1343/1214/1208 1342/1406/1400 1139/1213/1207
+f 1342/1406/1400 1339/1403/1397 1136/1210/1204
+f 1342/1406/1400 1136/1210/1204 1139/1213/1207
+f 1141/1215/1209 1344/1408/1402 1345/1409/1403
+f 1141/1215/1209 1345/1409/1403 1142/1216/1210
+f 1143/1217/1211 1346/1410/1404 1344/1408/1402
+f 1143/1217/1211 1344/1408/1402 1141/1215/1209
+f 1347/1411/1405 1138/1212/1206 1341/1405/1399
+f 1138/1212/1206 1347/1411/1405 1144/1218/1212
+f 1347/1411/1405 1346/1410/1404 1143/1217/1211
+f 1347/1411/1405 1143/1217/1211 1144/1218/1212
+f 1145/1219/1213 1348/1412/1406 1146/1220/1214
+f 1348/1412/1406 1349/1413/1407 1146/1220/1214
+f 1147/1221/1215 1350/1414/1408 1348/1412/1406
+f 1147/1221/1215 1348/1412/1406 1145/1219/1213
+f 1351/1415/1409 1352/1224/1218 1550/1416/1410
+f 1148/1222/1216 1350/1414/1408 1147/1221/1215
+f 1352/1224/1218 1351/1415/1409 1148/1222/1216
+f 1351/1415/1409 1350/1414/1408 1148/1222/1216
+f 1150/1225/1219 1353/1417/1411 1153/1228/1222
+f 1152/1227/1221 1353/1417/1411 1150/1225/1219
+f 1152/1227/1221 1354/1418/1412 1353/1417/1411
+f 1153/1228/1222 1353/1417/1411 1355/1419/1413
+f 1356/1420/1414 1357/1230/1224 1556/1421/1415
+f 1357/1230/1224 1356/1420/1414 1154/1229/1223
+f 1356/1420/1414 1354/1418/1412 1152/1227/1221
+f 1356/1420/1414 1152/1227/1221 1154/1229/1223
+f 1157/1231/1225 1358/1422/1416 1159/1233/1227
+f 1158/1232/1226 1359/1423/1417 1358/1422/1416
+f 1158/1232/1226 1358/1422/1416 1157/1231/1225
+f 1159/1233/1227 1358/1422/1416 1360/1424/1418
+f 1361/1425/1419 1153/1228/1222 1355/1419/1413
+f 1153/1228/1222 1361/1425/1419 1160/1234/1228
+f 1361/1425/1419 1359/1423/1417 1158/1232/1226
+f 1361/1425/1419 1158/1232/1226 1160/1234/1228
+f 1163/1237/1231 1362/1426/1420 1164/1238/1232
+f 1162/1236/1230 1363/1427/1421 1362/1426/1420
+f 1162/1236/1230 1362/1426/1420 1163/1237/1231
+f 1164/1238/1232 1362/1426/1420 1364/1428/1422
+f 1365/1429/1423 1159/1233/1227 1360/1424/1418
+f 1159/1233/1227 1365/1429/1423 1165/1239/1233
+f 1365/1429/1423 1162/1236/1230 1165/1239/1233
+f 1365/1429/1423 1363/1427/1421 1162/1236/1230
+f 1166/1240/1234 1366/1430/1424 1168/1242/1236
+f 1167/1241/1235 1367/1431/1425 1166/1240/1234
+f 1367/1431/1425 1366/1430/1424 1166/1240/1234
+f 1168/1242/1236 1366/1430/1424 1368/1432/1426
+f 1170/1244/1238 1369/1433/1427 1169/1243/1237
+f 1369/1433/1427 1367/1431/1425 1167/1241/1235
+f 1369/1433/1427 1167/1241/1235 1169/1243/1237
+f 1370/1434/1428 1369/1433/1427 1170/1244/1238
+f 1171/1245/1239 1371/1435/1429 1172/1246/1240
+f 1173/1247/1241 1371/1435/1429 1171/1245/1239
+f 1172/1246/1240 1371/1435/1429 1372/1436/1430
+f 1371/1435/1429 1173/1247/1241 1373/1437/1431
+f 1373/1437/1431 1374/1248/1242 1375/1438/1432
+f 1373/1437/1431 1173/1247/1241 1374/1248/1242
+f 1375/1438/1432 1374/1248/1242 1175/1249/1243
+f 1178/1252/1246 1376/1439/1433 1176/1250/1244
+f 1177/1251/1245 1377/1440/1434 1178/1252/1246
+f 1376/1439/1433 1178/1252/1246 1377/1440/1434
+f 1378/1441/1435 1172/1246/1240 1372/1436/1430
+f 1172/1246/1240 1378/1441/1435 1179/1253/1247
+f 1378/1441/1435 1177/1251/1245 1179/1253/1247
+f 1378/1441/1435 1377/1440/1434 1177/1251/1245
+f 1180/1254/1248 1379/1442/1436 1380/1443/1437
+f 1180/1254/1248 1380/1443/1437 1181/1255/1249
+f 1182/1256/1250 1381/1444/1438 1379/1442/1436
+f 1182/1256/1250 1379/1442/1436 1180/1254/1248
+f 1382/1445/1439 1383/1258/1252 1584/1446/1440
+f 1183/1257/1251 1381/1444/1438 1182/1256/1250
+f 1383/1258/1252 1382/1445/1439 1183/1257/1251
+f 1382/1445/1439 1381/1444/1438 1183/1257/1251
+f 1186/1259/1253 1384/1447/1441 1189/1262/1256
+f 1188/1261/1255 1384/1447/1441 1186/1259/1253
+f 1188/1261/1255 1385/1448/1442 1384/1447/1441
+f 1189/1262/1256 1384/1447/1441 1386/1449/1443
+f 1387/1450/1444 1388/1264/1258 1590/1451/1445
+f 1387/1450/1444 1190/1263/1257 1388/1264/1258
+f 1385/1448/1442 1190/1263/1257 1387/1450/1444
+f 1190/1263/1257 1385/1448/1442 1188/1261/1255
+f 1194/1266/1260 1389/1452/1446 1195/1267/1261
+f 1193/1265/1259 1389/1452/1446 1194/1266/1260
+f 1193/1265/1259 1390/1453/1447 1389/1452/1446
+f 1195/1267/1261 1389/1452/1446 1391/1454/1448
+f 1392/1455/1449 1189/1262/1256 1386/1449/1443
+f 1189/1262/1256 1392/1455/1449 1196/1268/1262
+f 1392/1455/1449 1390/1453/1447 1193/1265/1259
+f 1392/1455/1449 1193/1265/1259 1196/1268/1262
+f 1198/1269/1263 1393/1456/1450 1199/1270/1264
+f 1200/1271/1265 1394/1457/1451 1395/1458/1452
+f 1200/1271/1265 1199/1270/1264 1394/1457/1451
+f 1199/1270/1264 1393/1456/1450 1394/1457/1451
+f 1396/1459/1453 1195/1267/1261 1391/1454/1448
+f 1195/1267/1261 1396/1459/1453 1201/1272/1266
+f 1396/1459/1453 1198/1269/1263 1201/1272/1266
+f 1396/1459/1453 1393/1456/1450 1198/1269/1263
+f 1203/1274/1268 1397/1460/1454 1398/1461/1455
+f 1203/1274/1268 1398/1461/1455 1202/1273/1267
+f 1204/1275/1269 1399/1462/1456 1203/1274/1268
+f 1399/1462/1456 1397/1460/1454 1203/1274/1268
+f 1400/1463/1457 1206/1277/1271 1401/1464/1458
+f 1206/1277/1271 1400/1463/1457 1205/1276/1270
+f 1400/1463/1457 1399/1462/1456 1204/1275/1269
+f 1400/1463/1457 1204/1275/1269 1205/1276/1270
+f 1207/1278/1272 1402/1465/1459 1210/1281/1275
+f 1209/1280/1274 1402/1465/1459 1207/1278/1272
+f 1209/1280/1274 1403/1466/1460 1402/1465/1459
+f 1210/1281/1275 1402/1465/1459 1404/1467/1461
+f 1403/1466/1460 1405/1282/1276 1406/1468/1462
+f 1406/1468/1462 1405/1282/1276 1212/1283/1277
+f 1405/1282/1276 1403/1466/1460 1209/1280/1274
+f 1215/1285/1279 1407/1469/1463 1216/1286/1280
+f 1408/1470/1464 1216/1286/1280 1409/1471/1465
+f 1216/1286/1280 1407/1469/1463 1409/1471/1465
+f 1214/1284/1278 1216/1286/1280 1408/1470/1464
+f 1410/1472/1466 1210/1281/1275 1404/1467/1461
+f 1210/1281/1275 1410/1472/1466 1217/1287/1281
+f 1410/1472/1466 1407/1469/1463 1215/1285/1279
+f 1410/1472/1466 1215/1285/1279 1217/1287/1281
+f 1218/1288/1282 1411/1473/1467 1219/1289/1283
+f 1411/1473/1467 1412/1474/1468 1219/1289/1283
+f 1220/1290/1284 1413/1475/1469 1411/1473/1467
+f 1220/1290/1284 1411/1473/1467 1218/1288/1282
+f 1414/1476/1470 1222/1292/1286 1415/1477/1471
+f 1222/1292/1286 1414/1476/1470 1221/1291/1285
+f 1414/1476/1470 1413/1475/1469 1220/1290/1284
+f 1414/1476/1470 1220/1290/1284 1221/1291/1285
+f 1223/1293/1287 1416/1478/1472 1224/1294/1288
+f 1416/1478/1472 1417/1479/1473 1224/1294/1288
+f 1225/1295/1289 1416/1478/1472 1223/1293/1287
+f 1225/1295/1289 1418/1480/1474 1416/1478/1472
+f 1419/1481/1475 1420/1296/1290 1622/1482/1476
+f 1420/1296/1290 1419/1481/1475 1226/1097/1091
+f 1419/1481/1475 1225/1295/1289 1226/1097/1091
+f 1419/1481/1475 1418/1480/1474 1225/1295/1289
+f 1026/1102/1096 1421/1483/1477 1230/1299/1293
+f 1229/1298/1292 1421/1483/1477 1026/1102/1096
+f 1229/1298/1292 1422/1484/1478 1421/1483/1477
+f 1230/1299/1293 1421/1483/1477 1423/1485/1479
+f 1417/1479/1473 1424/1486/1480 1231/1300/1294
+f 1417/1479/1473 1231/1300/1294 1224/1294/1288
+f 1424/1486/1480 1422/1484/1478 1229/1298/1292
+f 1424/1486/1480 1229/1298/1292 1231/1300/1294
+f 1235/1302/1296 1425/1487/1481 1426/1488/1482
+f 1235/1302/1296 1426/1488/1482 1234/1303/1297
+f 1233/1301/1295 1427/1489/1483 1425/1487/1481
+f 1233/1301/1295 1425/1487/1481 1235/1302/1296
+f 1428/1490/1484 1230/1299/1293 1423/1485/1479
+f 1230/1299/1293 1428/1490/1484 1236/1304/1298
+f 1428/1490/1484 1233/1301/1295 1236/1304/1298
+f 1428/1490/1484 1427/1489/1483 1233/1301/1295
+f 1237/1305/1299 1429/1491/1485 1239/1307/1301
+f 1238/1306/1300 1430/1492/1486 1237/1305/1299
+f 1430/1492/1486 1429/1491/1485 1237/1305/1299
+f 1239/1307/1301 1429/1491/1485 1431/1493/1487
+f 1241/1309/1303 1432/1494/1488 1240/1308/1302
+f 1432/1494/1488 1430/1492/1486 1238/1306/1300
+f 1432/1494/1488 1238/1306/1300 1240/1308/1302
+f 1433/1495/1489 1432/1494/1488 1241/1309/1303
+f 1242/1310/1304 1434/1496/1490 1244/1312/1306
+f 1243/1311/1305 1434/1496/1490 1242/1310/1304
+f 1243/1311/1305 1435/1497/1491 1434/1496/1490
+f 1244/1312/1306 1434/1496/1490 1436/1498/1492
+f 1637/1499/1493 1435/1497/1491 1437/1500/1494
+f 1437/1500/1494 1435/1497/1491 1245/1313/1307
+f 1437/1500/1494 1245/1313/1307 1246/1314/1308
+f 1435/1497/1491 1243/1311/1305 1245/1313/1307
+f 1248/1316/1310 1438/1501/1495 1247/1315/1309
+f 1043/1119/1113 1438/1501/1495 1248/1316/1310
+f 1439/1502/1496 1438/1501/1495 1440/1503/1497
+f 1247/1315/1309 1438/1501/1495 1439/1502/1496
+f 1441/1504/1498 1244/1312/1306 1436/1498/1492
+f 1440/1503/1497 1438/1501/1495 1441/1504/1498
+f 1244/1312/1306 1441/1504/1498 1249/1317/1311
+f 1441/1504/1498 1438/1501/1495 1043/1119/1113
+f 1441/1504/1498 1043/1119/1113 1249/1317/1311
+f 1250/1318/1312 1442/1505/1499 1252/1320/1314
+f 1442/1505/1499 1443/1506/1500 1252/1320/1314
+f 1251/1319/1313 1444/1507/1501 1442/1505/1499
+f 1251/1319/1313 1442/1505/1499 1250/1318/1312
+f 1445/1508/1502 1446/1321/1315 1650/1509/1503
+f 1446/1321/1315 1445/1508/1502 1253/1123/1117
+f 1445/1508/1502 1444/1507/1501 1251/1319/1313
+f 1445/1508/1502 1251/1319/1313 1253/1123/1117
+f 1255/1322/1316 1447/1510/1504 1256/1323/1317
+f 1447/1510/1504 1448/1511/1505 1256/1323/1317
+f 1257/1324/1318 1447/1510/1504 1255/1322/1316
+f 1257/1324/1318 1449/1512/1506 1447/1510/1504
+f 1450/1513/1507 1258/1325/1319 1451/1514/1508
+f 1449/1512/1506 1258/1325/1319 1450/1513/1507
+f 1451/1514/1508 1258/1325/1319 1260/1326/1320
+f 1258/1325/1319 1449/1512/1506 1257/1324/1318
+f 1263/1329/1323 1452/1515/1509 1262/1328/1322
+f 1261/1327/1321 1453/1516/1510 1452/1515/1509
+f 1261/1327/1321 1452/1515/1509 1263/1329/1323
+f 1262/1328/1322 1452/1515/1509 1454/1517/1511
+f 1448/1511/1505 1455/1518/1512 1264/1330/1324
+f 1448/1511/1505 1264/1330/1324 1256/1323/1317
+f 1455/1518/1512 1453/1516/1510 1261/1327/1321
+f 1455/1518/1512 1261/1327/1321 1264/1330/1324
+f 1267/1333/1327 1456/1519/1513 1457/1520/1514
+f 1267/1333/1327 1457/1520/1514 1266/1332/1326
+f 1265/1331/1325 1458/1521/1515 1456/1519/1513
+f 1265/1331/1325 1456/1519/1513 1267/1333/1327
+f 1459/1522/1516 1262/1328/1322 1454/1517/1511
+f 1262/1328/1322 1459/1522/1516 1268/1334/1328
+f 1459/1522/1516 1265/1331/1325 1268/1334/1328
+f 1459/1522/1516 1458/1521/1515 1265/1331/1325
+f 1269/1335/1329 1460/1523/1517 1271/1337/1331
+f 1270/1336/1330 1461/1524/1518 1269/1335/1329
+f 1461/1524/1518 1460/1523/1517 1269/1335/1329
+f 1271/1337/1331 1460/1523/1517 1462/1525/1519
+f 1463/1526/1520 1465/1527/1521 1464/1528/1522
+f 1465/1527/1521 1463/1526/1520 1272/1339/1333
+f 1465/1527/1521 1272/1339/1333 1273/1338/1332
+f 1463/1526/1520 1461/1524/1518 1270/1336/1330
+f 1463/1526/1520 1270/1336/1330 1272/1339/1333
+f 1274/1340/1334 1466/1529/1523 1467/1530/1524
+f 1274/1340/1334 1467/1530/1524 1275/1341/1335
+f 1276/1342/1336 1466/1529/1523 1274/1340/1334
+f 1276/1342/1336 1468/1531/1525 1466/1529/1523
+f 1670/1532/1526 1468/1531/1525 1469/1533/1527
+f 1469/1533/1527 1468/1531/1525 1277/1343/1337
+f 1469/1533/1527 1277/1343/1337 1278/1344/1338
+f 1468/1531/1525 1276/1342/1336 1277/1343/1337
+f 1280/1346/1340 1470/1534/1528 1279/1345/1339
+f 1470/1534/1528 1280/1346/1340 1471/1535/1529
+f 1280/1346/1340 1281/1347/1341 1471/1535/1529
+f 1472/1536/1530 1282/1348/1342 1467/1530/1524
+f 1471/1535/1529 1281/1347/1341 1282/1348/1342
+f 1471/1535/1529 1282/1348/1342 1472/1536/1530
+f 1467/1530/1524 1282/1348/1342 1275/1341/1335
+f 1283/1349/1343 1473/1537/1531 1474/1538/1532
+f 1283/1349/1343 1474/1538/1532 1284/1350/1344
+f 1285/1351/1345 1475/1539/1533 1473/1537/1531
+f 1285/1351/1345 1473/1537/1531 1283/1349/1343
+f 1476/1540/1534 1477/1353/1347 1478/1541/1535
+f 1477/1353/1347 1476/1540/1534 1286/1352/1346
+f 1476/1540/1534 1475/1539/1533 1285/1351/1345
+f 1476/1540/1534 1285/1351/1345 1286/1352/1346
+f 1288/1354/1348 1479/1542/1536 1290/1356/1350
+f 1289/1355/1349 1480/1543/1537 1479/1542/1536
+f 1289/1355/1349 1479/1542/1536 1288/1354/1348
+f 1290/1356/1350 1479/1542/1536 1481/1544/1538
+f 1482/1545/1539 1483/1358/1352 1484/1546/1540
+f 1483/1358/1352 1482/1545/1539 1291/1357/1351
+f 1482/1545/1539 1480/1543/1537 1289/1355/1349
+f 1482/1545/1539 1289/1355/1349 1291/1357/1351
+f 1293/1359/1353 1485/1547/1541 1295/1361/1355
+f 1294/1360/1354 1486/1548/1542 1293/1359/1353
+f 1486/1548/1542 1485/1547/1541 1293/1359/1353
+f 1295/1361/1355 1485/1547/1541 1487/1549/1543
+f 1488/1550/1544 1290/1356/1350 1481/1544/1538
+f 1296/1362/1356 1486/1548/1542 1294/1360/1354
+f 1290/1356/1350 1488/1550/1544 1296/1362/1356
+f 1488/1550/1544 1486/1548/1542 1296/1362/1356
+f 1297/1363/1357 1489/1551/1545 1299/1365/1359
+f 1298/1364/1358 1490/1552/1546 1489/1551/1545
+f 1298/1364/1358 1489/1551/1545 1297/1363/1357
+f 1299/1365/1359 1489/1551/1545 1491/1553/1547
+f 1492/1554/1548 1295/1361/1355 1487/1549/1543
+f 1295/1361/1355 1492/1554/1548 1300/1366/1360
+f 1492/1554/1548 1490/1552/1546 1298/1364/1358
+f 1492/1554/1548 1298/1364/1358 1300/1366/1360
+f 1301/1367/1361 1493/1555/1549 1494/1556/1550
+f 1301/1367/1361 1494/1556/1550 1302/1368/1362
+f 1303/1369/1363 1495/1557/1551 1301/1367/1361
+f 1495/1557/1551 1493/1555/1549 1301/1367/1361
+f 1304/1370/1364 1495/1557/1551 1303/1369/1363
+f 1497/1558/1552 1496/1559/1553 1304/1370/1364
+f 1497/1558/1552 1304/1370/1364 1305/1371/1365
+f 1496/1559/1553 1495/1557/1551 1304/1370/1364
+f 1306/1372/1366 1498/1560/1554 1308/1374/1368
+f 1307/1373/1367 1499/1561/1555 1306/1372/1366
+f 1499/1561/1555 1498/1560/1554 1306/1372/1366
+f 1308/1374/1368 1498/1560/1554 1500/1562/1556
+f 1501/1563/1557 1310/1375/1369 1502/1564/1558
+f 1309/1376/1370 1499/1561/1555 1307/1373/1367
+f 1310/1375/1369 1501/1563/1557 1309/1376/1370
+f 1501/1563/1557 1499/1561/1555 1309/1376/1370
+f 1311/1377/1371 1503/1565/1559 1313/1379/1373
+f 1312/1378/1372 1504/1566/1560 1311/1377/1371
+f 1504/1566/1560 1503/1565/1559 1311/1377/1371
+f 1313/1379/1373 1503/1565/1559 1505/1567/1561
+f 1506/1568/1562 1308/1374/1368 1500/1562/1556
+f 1314/1380/1374 1504/1566/1560 1312/1378/1372
+f 1308/1374/1368 1506/1568/1562 1314/1380/1374
+f 1506/1568/1562 1504/1566/1560 1314/1380/1374
+f 1315/1381/1375 1507/1569/1563 1508/1570/1564
+f 1315/1381/1375 1508/1570/1564 1316/1382/1376
+f 1317/1383/1377 1509/1571/1565 1315/1381/1375
+f 1509/1571/1565 1507/1569/1563 1315/1381/1375
+f 1510/1572/1566 1319/1385/1379 1511/1573/1567
+f 1318/1384/1378 1509/1571/1565 1317/1383/1377
+f 1319/1385/1379 1510/1572/1566 1318/1384/1378
+f 1510/1572/1566 1509/1571/1565 1318/1384/1378
+f 1320/1386/1380 1512/1574/1568 1321/1387/1381
+f 1322/1388/1382 1512/1574/1568 1320/1386/1380
+f 1321/1387/1381 1512/1574/1568 1513/1575/1569
+f 1512/1574/1568 1322/1388/1382 1514/1576/1570
+f 1514/1576/1570 1322/1388/1382 1515/1577/1571
+f 1516/1578/1572 1515/1577/1571 1322/1388/1382
+f 1516/1578/1572 1322/1388/1382 1323/1389/1383
+f 1325/1390/1384 1517/1579/1573 1326/1391/1385
+f 1518/1392/1386 1517/1579/1573 1325/1390/1384
+f 1326/1391/1385 1517/1579/1573 1519/1580/1574
+f 1517/1579/1573 1518/1392/1386 1520/1581/1575
+f 1521/1582/1576 1321/1387/1381 1513/1575/1569
+f 1520/1581/1575 1518/1392/1386 1521/1582/1576
+f 1321/1387/1381 1521/1582/1576 1518/1392/1386
+f 1329/1393/1387 1326/1391/1385 1328/1394/1388
+f 1326/1391/1385 1522/1583/1577 1328/1394/1388
+f 1522/1583/1577 1326/1391/1385 1524/1584/1578
+f 1525/1585/1579 1326/1391/1385 1519/1580/1574
+f 1524/1584/1578 1326/1391/1385 1525/1585/1579
+f 1331/1395/1389 1526/1586/1580 1527/1587/1581
+f 1331/1395/1389 1527/1587/1581 1332/1396/1390
+f 1526/1586/1580 1331/1395/1389 1528/1588/1582
+f 1529/1589/1583 1522/1583/1577 1523/1590/1584
+f 1528/1588/1582 1331/1395/1389 1529/1589/1583
+f 1522/1583/1577 1529/1589/1583 1333/1397/1391
+f 1522/1583/1577 1333/1397/1391 1328/1394/1388
+f 1529/1589/1583 1331/1395/1389 1333/1397/1391
+f 1334/1398/1392 1530/1591/1585 1531/1592/1586
+f 1334/1398/1392 1531/1592/1586 1335/1399/1393
+f 1336/1400/1394 1532/1593/1587 1530/1591/1585
+f 1336/1400/1394 1530/1591/1585 1334/1398/1392
+f 1533/1594/1588 1534/1402/1396 1535/1595/1589
+f 1534/1402/1396 1533/1594/1588 1337/1401/1395
+f 1533/1594/1588 1532/1593/1587 1336/1400/1394
+f 1533/1594/1588 1336/1400/1394 1337/1401/1395
+f 1340/1404/1398 1536/1596/1590 1341/1405/1399
+f 1339/1403/1397 1537/1597/1591 1340/1404/1398
+f 1537/1597/1591 1536/1596/1590 1340/1404/1398
+f 1341/1405/1399 1536/1596/1590 1538/1598/1592
+f 1539/1599/1593 1540/1407/1401 1541/1600/1594
+f 1342/1406/1400 1537/1597/1591 1339/1403/1397
+f 1540/1407/1401 1539/1599/1593 1342/1406/1400
+f 1539/1599/1593 1537/1597/1591 1342/1406/1400
+f 1344/1408/1402 1542/1601/1595 1543/1602/1596
+f 1344/1408/1402 1543/1602/1596 1345/1409/1403
+f 1346/1410/1404 1544/1603/1597 1344/1408/1402
+f 1544/1603/1597 1542/1601/1595 1344/1408/1402
+f 1545/1604/1598 1341/1405/1399 1538/1598/1592
+f 1347/1411/1405 1544/1603/1597 1346/1410/1404
+f 1341/1405/1399 1545/1604/1598 1347/1411/1405
+f 1545/1604/1598 1544/1603/1597 1347/1411/1405
+f 1348/1412/1406 1546/1605/1599 1349/1413/1407
+f 1350/1414/1408 1547/1606/1600 1348/1412/1406
+f 1547/1606/1600 1546/1605/1599 1348/1412/1406
+f 1349/1413/1407 1546/1605/1599 1548/1607/1601
+f 1549/1608/1602 1550/1416/1410 1551/1609/1603
+f 1351/1415/1409 1547/1606/1600 1350/1414/1408
+f 1550/1416/1410 1549/1608/1602 1351/1415/1409
+f 1549/1608/1602 1547/1606/1600 1351/1415/1409
+f 1353/1417/1411 1552/1610/1604 1355/1419/1413
+f 1354/1418/1412 1553/1611/1605 1552/1610/1604
+f 1354/1418/1412 1552/1610/1604 1353/1417/1411
+f 1355/1419/1413 1552/1610/1604 1554/1612/1606
+f 1555/1613/1607 1556/1421/1415 1557/1614/1608
+f 1556/1421/1415 1555/1613/1607 1356/1420/1414
+f 1555/1613/1607 1553/1611/1605 1354/1418/1412
+f 1555/1613/1607 1354/1418/1412 1356/1420/1414
+f 1358/1422/1416 1558/1615/1609 1360/1424/1418
+f 1359/1423/1417 1559/1616/1610 1358/1422/1416
+f 1559/1616/1610 1558/1615/1609 1358/1422/1416
+f 1360/1424/1418 1558/1615/1609 1560/1617/1611
+f 1561/1618/1612 1355/1419/1413 1554/1612/1606
+f 1361/1425/1419 1559/1616/1610 1359/1423/1417
+f 1355/1419/1413 1561/1618/1612 1361/1425/1419
+f 1561/1618/1612 1559/1616/1610 1361/1425/1419
+f 1362/1426/1420 1562/1619/1613 1364/1428/1422
+f 1363/1427/1421 1563/1620/1614 1562/1619/1613
+f 1363/1427/1421 1562/1619/1613 1362/1426/1420
+f 1364/1428/1422 1562/1619/1613 1564/1621/1615
+f 1565/1622/1616 1360/1424/1418 1560/1617/1611
+f 1360/1424/1418 1565/1622/1616 1365/1429/1423
+f 1565/1622/1616 1563/1620/1614 1363/1427/1421
+f 1565/1622/1616 1363/1427/1421 1365/1429/1423
+f 1366/1430/1424 1566/1623/1617 1368/1432/1426
+f 1367/1431/1425 1567/1624/1618 1566/1623/1617
+f 1367/1431/1425 1566/1623/1617 1366/1430/1424
+f 1368/1432/1426 1566/1623/1617 1568/1625/1619
+f 1570/1626/1620 1569/1627/1621 1369/1433/1427
+f 1570/1626/1620 1369/1433/1427 1370/1434/1428
+f 1569/1627/1621 1567/1624/1618 1367/1431/1425
+f 1569/1627/1621 1367/1431/1425 1369/1433/1427
+f 1371/1435/1429 1571/1628/1622 1372/1436/1430
+f 1373/1437/1431 1571/1628/1622 1371/1435/1429
+f 1372/1436/1430 1571/1628/1622 1572/1629/1623
+f 1571/1628/1622 1373/1437/1431 1573/1630/1624
+f 1574/1631/1625 1375/1438/1432 1575/1632/1626
+f 1573/1630/1624 1373/1437/1431 1574/1631/1625
+f 1375/1438/1432 1574/1631/1625 1373/1437/1431
+f 1377/1440/1434 1576/1633/1627 1577/1634/1628
+f 1377/1440/1434 1577/1634/1628 1376/1439/1433
+f 1576/1633/1627 1377/1440/1434 1578/1635/1629
+f 1579/1636/1630 1372/1436/1430 1572/1629/1623
+f 1578/1635/1629 1377/1440/1434 1579/1636/1630
+f 1372/1436/1430 1579/1636/1630 1378/1441/1435
+f 1579/1636/1630 1377/1440/1434 1378/1441/1435
+f 1379/1442/1436 1580/1637/1631 1581/1638/1632
+f 1379/1442/1436 1581/1638/1632 1380/1443/1437
+f 1381/1444/1438 1582/1639/1633 1580/1637/1631
+f 1381/1444/1438 1580/1637/1631 1379/1442/1436
+f 1583/1640/1634 1584/1446/1440 1585/1641/1635
+f 1584/1446/1440 1583/1640/1634 1382/1445/1439
+f 1583/1640/1634 1582/1639/1633 1381/1444/1438
+f 1583/1640/1634 1381/1444/1438 1382/1445/1439
+f 1384/1447/1441 1586/1642/1636 1386/1449/1443
+f 1385/1448/1442 1587/1643/1637 1586/1642/1636
+f 1385/1448/1442 1586/1642/1636 1384/1447/1441
+f 1386/1449/1443 1586/1642/1636 1588/1644/1638
+f 1589/1645/1639 1387/1450/1444 1590/1451/1445
+f 1589/1645/1639 1590/1451/1445 1591/1646/1640
+f 1587/1643/1637 1387/1450/1444 1589/1645/1639
+f 1387/1450/1444 1587/1643/1637 1385/1448/1442
+f 1389/1452/1446 1592/1647/1641 1391/1454/1448
+f 1390/1453/1447 1593/1648/1642 1389/1452/1446
+f 1593/1648/1642 1592/1647/1641 1389/1452/1446
+f 1391/1454/1448 1592/1647/1641 1594/1649/1643
+f 1595/1650/1644 1386/1449/1443 1588/1644/1638
+f 1392/1455/1449 1593/1648/1642 1390/1453/1447
+f 1386/1449/1443 1595/1650/1644 1392/1455/1449
+f 1595/1650/1644 1593/1648/1642 1392/1455/1449
+f 1393/1456/1450 1596/1651/1645 1394/1457/1451
+f 1395/1458/1452 1394/1457/1451 1597/1652/1646
+f 1395/1458/1452 1597/1652/1646 1598/1653/1647
+f 1394/1457/1451 1596/1651/1645 1597/1652/1646
+f 1599/1654/1648 1391/1454/1448 1594/1649/1643
+f 1391/1454/1448 1599/1654/1648 1396/1459/1453
+f 1599/1654/1648 1596/1651/1645 1393/1456/1450
+f 1599/1654/1648 1393/1456/1450 1396/1459/1453
+f 1397/1460/1454 1600/1655/1649 1601/1656/1650
+f 1397/1460/1454 1601/1656/1650 1398/1461/1455
+f 1399/1462/1456 1602/1657/1651 1600/1655/1649
+f 1399/1462/1456 1600/1655/1649 1397/1460/1454
+f 1604/1658/1652 1603/1659/1653 1400/1463/1457
+f 1604/1658/1652 1400/1463/1457 1401/1464/1458
+f 1603/1659/1653 1602/1657/1651 1399/1462/1456
+f 1603/1659/1653 1399/1462/1456 1400/1463/1457
+f 1402/1465/1459 1605/1660/1654 1404/1467/1461
+f 1403/1466/1460 1605/1660/1654 1402/1465/1459
+f 1404/1467/1461 1605/1660/1654 1606/1661/1655
+f 1605/1660/1654 1403/1466/1460 1607/1662/1656
+f 1607/1662/1656 1403/1466/1460 1608/1663/1657
+f 1609/1664/1658 1608/1663/1657 1403/1466/1460
+f 1609/1664/1658 1403/1466/1460 1406/1468/1462
+f 1409/1471/1465 1610/1665/1659 1408/1470/1464
+f 1610/1665/1659 1409/1471/1465 1612/1666/1660
+f 1408/1470/1464 1610/1665/1659 1611/1667/1661
+f 1409/1471/1465 1404/1467/1461 1606/1661/1655
+f 1410/1472/1466 1409/1471/1465 1407/1469/1463
+f 1404/1467/1461 1409/1471/1465 1410/1472/1466
+f 1411/1473/1467 1613/1668/1662 1412/1474/1468
+f 1411/1473/1467 1614/1669/1663 1613/1668/1662
+f 1413/1475/1469 1615/1670/1664 1614/1669/1663
+f 1413/1475/1469 1614/1669/1663 1411/1473/1467
+f 1616/1671/1665 1415/1477/1471 1617/1672/1666
+f 1415/1477/1471 1616/1671/1665 1414/1476/1470
+f 1616/1671/1665 1615/1670/1664 1413/1475/1469
+f 1616/1671/1665 1413/1475/1469 1414/1476/1470
+f 1416/1478/1472 1618/1673/1667 1417/1479/1473
+f 1418/1480/1474 1619/1674/1668 1618/1673/1667
+f 1418/1480/1474 1618/1673/1667 1416/1478/1472
+f 1417/1479/1473 1618/1673/1667 1620/1675/1669
+f 1621/1676/1670 1622/1482/1476 1623/1677/1671
+f 1622/1482/1476 1621/1676/1670 1419/1481/1475
+f 1621/1676/1670 1619/1674/1668 1418/1480/1474
+f 1621/1676/1670 1418/1480/1474 1419/1481/1475
+f 1421/1483/1477 1624/1678/1672 1423/1485/1479
+f 1422/1484/1478 1625/1679/1673 1421/1483/1477
+f 1625/1679/1673 1624/1678/1672 1421/1483/1477
+f 1423/1485/1479 1624/1678/1672 1626/1680/1674
+f 1627/1681/1675 1417/1479/1473 1620/1675/1669
+f 1424/1486/1480 1625/1679/1673 1422/1484/1478
+f 1417/1479/1473 1627/1681/1675 1424/1486/1480
+f 1627/1681/1675 1625/1679/1673 1424/1486/1480
+f 1425/1487/1481 1628/1682/1676 1426/1488/1482
+f 1427/1489/1483 1629/1683/1677 1628/1682/1676
+f 1427/1489/1483 1628/1682/1676 1425/1487/1481
+f 1426/1488/1482 1628/1682/1676 1630/1684/1678
+f 1631/1685/1679 1423/1485/1479 1626/1680/1674
+f 1423/1485/1479 1631/1685/1679 1428/1490/1484
+f 1631/1685/1679 1629/1683/1677 1427/1489/1483
+f 1631/1685/1679 1427/1489/1483 1428/1490/1484
+f 1429/1491/1485 1632/1686/1680 1431/1493/1487
+f 1430/1492/1486 1633/1687/1681 1632/1686/1680
+f 1430/1492/1486 1632/1686/1680 1429/1491/1485
+f 1431/1493/1487 1632/1686/1680 1634/1688/1682
+f 1636/1689/1683 1635/1690/1684 1432/1494/1488
+f 1636/1689/1683 1432/1494/1488 1433/1495/1489
+f 1635/1690/1684 1633/1687/1681 1430/1492/1486
+f 1635/1690/1684 1430/1492/1486 1432/1494/1488
+f 1434/1496/1490 1637/1499/1493 1436/1498/1492
+f 1435/1497/1491 1637/1499/1493 1434/1496/1490
+f 1436/1498/1492 1637/1499/1493 1638/1691/1685
+f 1639/1692/1686 1637/1499/1493 1640/1693/1687
+f 1641/1694/1688 1640/1693/1687 1637/1499/1493
+f 1641/1694/1688 1637/1499/1493 1437/1500/1494
+f 1440/1503/1497 1642/1695/1689 1439/1502/1496
+f 1440/1503/1497 1643/1696/1690 1642/1695/1689
+f 1439/1502/1496 1642/1695/1689 1644/1697/1691
+f 1645/1698/1692 1436/1498/1492 1638/1691/1685
+f 1436/1498/1492 1645/1698/1692 1441/1504/1498
+f 1645/1698/1692 1643/1696/1690 1440/1503/1497
+f 1645/1698/1692 1440/1503/1497 1441/1504/1498
+f 1442/1505/1499 1646/1699/1693 1443/1506/1500
+f 1442/1505/1499 1647/1700/1694 1646/1699/1693
+f 1444/1507/1501 1648/1701/1695 1647/1700/1694
+f 1444/1507/1501 1647/1700/1694 1442/1505/1499
+f 1649/1702/1696 1650/1509/1503 1651/1703/1697
+f 1650/1509/1503 1649/1702/1696 1445/1508/1502
+f 1649/1702/1696 1648/1701/1695 1444/1507/1501
+f 1649/1702/1696 1444/1507/1501 1445/1508/1502
+f 1447/1510/1504 1652/1704/1698 1448/1511/1505
+f 1449/1512/1506 1653/1705/1699 1652/1704/1698
+f 1449/1512/1506 1652/1704/1698 1447/1510/1504
+f 1448/1511/1505 1652/1704/1698 1654/1706/1700
+f 1655/1707/1701 1450/1513/1507 1451/1514/1508
+f 1655/1707/1701 1451/1514/1508 1656/1708/1702
+f 1653/1705/1699 1450/1513/1507 1655/1707/1701
+f 1450/1513/1507 1653/1705/1699 1449/1512/1506
+f 1452/1515/1509 1657/1709/1703 1454/1517/1511
+f 1453/1516/1510 1658/1710/1704 1657/1709/1703
+f 1453/1516/1510 1657/1709/1703 1452/1515/1509
+f 1454/1517/1511 1657/1709/1703 1659/1711/1705
+f 1660/1712/1706 1448/1511/1505 1654/1706/1700
+f 1448/1511/1505 1660/1712/1706 1455/1518/1512
+f 1660/1712/1706 1658/1710/1704 1453/1516/1510
+f 1660/1712/1706 1453/1516/1510 1455/1518/1512
+f 1456/1519/1513 1661/1713/1707 1457/1520/1514
+f 1458/1521/1515 1662/1714/1708 1661/1713/1707
+f 1458/1521/1515 1661/1713/1707 1456/1519/1513
+f 1457/1520/1514 1661/1713/1707 1663/1715/1709
+f 1664/1716/1710 1454/1517/1511 1659/1711/1705
+f 1454/1517/1511 1664/1716/1710 1459/1522/1516
+f 1664/1716/1710 1662/1714/1708 1458/1521/1515
+f 1664/1716/1710 1458/1521/1515 1459/1522/1516
+f 1460/1523/1517 1665/1717/1711 1462/1525/1519
+f 1461/1524/1518 1666/1718/1712 1665/1717/1711
+f 1461/1524/1518 1665/1717/1711 1460/1523/1517
+f 1462/1525/1519 1665/1717/1711 1667/1719/1713
+f 1668/1720/1714 1464/1528/1522 1669/1721/1715
+f 1464/1528/1522 1668/1720/1714 1463/1526/1520
+f 1668/1720/1714 1666/1718/1712 1461/1524/1518
+f 1668/1720/1714 1461/1524/1518 1463/1526/1520
+f 1466/1529/1523 1670/1532/1526 1671/1722/1716
+f 1466/1529/1523 1671/1722/1716 1467/1530/1524
+f 1468/1531/1525 1670/1532/1526 1466/1529/1523
+f 1672/1723/1717 1670/1532/1526 1673/1724/1718
+f 1674/1725/1719 1673/1724/1718 1670/1532/1526
+f 1674/1725/1719 1670/1532/1526 1469/1533/1527
+f 1471/1535/1529 1675/1726/1720 1676/1727/1721
+f 1471/1535/1529 1676/1727/1721 1470/1534/1528
+f 1675/1726/1720 1471/1535/1529 1677/1728/1722
+f 1677/1728/1722 1471/1535/1529 1678/1729/1723
+f 1671/1722/1716 1678/1729/1723 1472/1536/1530
+f 1671/1722/1716 1472/1536/1530 1467/1530/1524
+f 1678/1729/1723 1471/1535/1529 1472/1536/1530
+f 1679/1730/1724 1680/1731/1725 1681/1732/1726
+f 1679/1730/1724 1682/1733/1727 1680/1731/1725
+f 1683/1734/1728 1684/1735/1729 1682/1733/1727
+f 1683/1734/1728 1682/1733/1727 1679/1730/1724
+f 1685/1736/1730 1686/1737/1731 1687/1738/1732
+f 1686/1737/1731 1684/1735/1729 1688/1739/1733
+f 1682/1733/1727 1686/1737/1731 1685/1736/1730
+f 1682/1733/1727 1684/1735/1729 1686/1737/1731
+f 1693/1740/1734 1688/1739/1733 1689/1741/1735
+f 1693/1740/1734 1689/1741/1735 1690/1742/1736
+f 1688/1739/1733 1683/1734/1728 1689/1741/1735
+f 1684/1735/1729 1683/1734/1728 1688/1739/1733
+f 1688/1739/1733 1692/1743/1737 1691/1744/1738
+f 1688/1739/1733 1691/1744/1738 1686/1737/1731
+f 1693/1740/1734 1692/1743/1737 1688/1739/1733
+f 1693/1740/1734 1694/1745/1739 1692/1743/1737
+f 1694/1745/1739 1693/1740/1734 1690/1742/1736
+f 1694/1745/1739 1690/1742/1736 2463/1746/1740
+f 1690/1742/1736 1695/1747/1741 2463/1746/1740
+f 1696/1748/1742 1699/1749/1743 1697/1750/1744
+f 1700/1751/1745 1699/1749/1743 1695/1747/1741
+f 1700/1751/1745 1695/1747/1741 1690/1742/1736
+f 1680/1731/1725 1701/1752/1746 1681/1732/1726
+f 1682/1733/1727 1702/1753/1747 1680/1731/1725
+f 1701/1752/1746 1680/1731/1725 2494/1754/1748
+f 1680/1731/1725 1702/1753/1747 2494/1754/1748
+f 1703/1755/1749 1702/1753/1747 1682/1733/1727
+f 1703/1755/1749 1682/1733/1727 1685/1736/1730
+f 1704/1756/1750 1706/1757/1751 1707/1758/1752
+f 1707/1758/1752 1706/1757/1751 1708/1759/1753
+f 1707/1758/1752 1708/1759/1753 1701/1752/1746
+f 1701/1752/1746 1708/1759/1753 1681/1732/1726
+f 1712/1760/1754 1711/1761/1755 1709/1762/1756
+f 1711/1761/1755 1704/1756/1750 1707/1758/1752
+f 1704/1756/1750 1713/1763/1757 1705/1764/1758
+f 1713/1763/1757 1711/1761/1755 1712/1760/1754
+f 1704/1756/1750 1711/1761/1755 1713/1763/1757
+f 1709/1762/1756 1714/1765/1759 1710/1766/1760
+f 1711/1761/1755 1714/1765/1759 1709/1762/1756
+f 1711/1761/1755 1716/1767/1761 1714/1765/1759
+f 1715/1768/1762 1714/1765/1759 1717/1769/1763
+f 1714/1765/1759 1716/1767/1761 1717/1769/1763
+f 1716/1767/1761 1707/1758/1752 2504/1770/1764
+f 1707/1758/1752 1716/1767/1761 1711/1761/1755
+f 1719/1771/1765 1720/1772/1766 1721/1773/1767
+f 1719/1771/1765 1722/1774/1768 1723/1775/1769
+f 1719/1771/1765 1723/1775/1769 1720/1772/1766
+f 1724/1776/1770 1722/1774/1768 1719/1771/1765
+f 1722/1774/1768 1725/1777/1771 2476/1778/1772
+f 1722/1774/1768 1724/1776/1770 1725/1777/1771
+f 1727/1779/1773 1725/1777/1771 1726/1780/1774
+f 1727/1779/1773 1726/1780/1774 1718/1781/1775
+f 1725/1777/1771 1724/1776/1770 1726/1780/1774
+f 1725/1777/1771 1727/1779/1773 1728/1782/1776
+f 1728/1782/1776 1727/1779/1773 1716/1767/1761
+f 1728/1782/1776 1716/1767/1761 2504/1770/1764
+f 1717/1769/1763 1727/1779/1773 1718/1781/1775
+f 1716/1767/1761 1727/1779/1773 1717/1769/1763
+f 1729/1783/1777 1731/1784/1778 1733/1785/1779
+f 1729/1783/1777 1733/1785/1779 1732/1786/1780
+f 1733/1785/1779 1721/1773/1767 2428/1787/1781
+f 1721/1773/1767 1733/1785/1779 1734/1788/1782
+f 1733/1785/1779 1731/1784/1778 1734/1788/1782
+f 1720/1772/1766 1723/1775/1769 2428/1787/1781
+f 1721/1773/1767 1720/1772/1766 2428/1787/1781
+f 1761/1789/1783 1739/1790/1784 1738/1791/1785
+f 1736/1792/1786 1739/1790/1784 1761/1789/1783
+f 1738/1791/1785 1739/1790/1784 1730/1793/1787
+f 1732/1786/1780 1738/1791/1785 1729/1783/1777
+f 2425/1794/1788 1738/1791/1785 1732/1786/1780
+f 1729/1783/1777 1738/1791/1785 1730/1793/1787
+f 1740/1795/1789 1741/1796/1790 1742/1797/1791
+f 1740/1795/1789 1742/1797/1791 1737/1798/1792
+f 1741/1796/1790 1743/1799/1793 1742/1797/1791
+f 1744/1800/1794 1741/1796/1790 1740/1795/1789
+f 1745/1801/1795 1746/1802/1796 1747/1803/1797
+f 1745/1801/1795 1748/1804/1798 1746/1802/1796
+f 1743/1799/1793 1748/1804/1798 1745/1801/1795
+f 1748/1804/1798 1743/1799/1793 1749/1805/1799
+f 1750/1806/1800 1751/1807/1801 1752/1808/1802
+f 1750/1806/1800 1741/1796/1790 1744/1800/1794
+f 1750/1806/1800 1744/1800/1794 1751/1807/1801
+f 1749/1805/1799 1743/1799/1793 1741/1796/1790
+f 1749/1805/1799 1741/1796/1790 1750/1806/1800
+f 1744/1800/1794 1753/1809/1803 1754/1810/1804
+f 1744/1800/1794 1754/1810/1804 1751/1807/1801
+f 1753/1809/1803 1755/1811/1805 1756/1812/1806
+f 1753/1809/1803 1757/1813/1807 1755/1811/1805
+f 1757/1813/1807 1740/1795/1789 1737/1798/1792
+f 1740/1795/1789 1753/1809/1803 1744/1800/1794
+f 1757/1813/1807 1753/1809/1803 1740/1795/1789
+f 1757/1813/1807 1758/1814/1808 1755/1811/1805
+f 1755/1811/1805 1759/1815/1809 2398/1816/1810
+f 1755/1811/1805 1758/1814/1808 1759/1815/1809
+f 1759/1815/1809 1758/1814/1808 1760/1817/1811
+f 1761/1789/1783 1760/1817/1811 1736/1792/1786
+f 1735/1818/1812 1757/1813/1807 1737/1798/1792
+f 1735/1818/1812 1760/1817/1811 1758/1814/1808
+f 1735/1818/1812 1758/1814/1808 1757/1813/1807
+f 1736/1792/1786 1760/1817/1811 1735/1818/1812
+f 1762/1819/1813 1763/1/1814 1764/3/1815
+f 1765/1820/1816 1763/1/1814 1762/1819/1813
+f 1775/4/1817 1763/1/1814 1766/1821/1818
+f 1763/1/1814 1769/1822/1819 1766/1821/1818
+f 1767/1823/1820 1765/1820/1816 1768/1824/1821
+f 1767/1823/1820 1768/1824/1821 1747/1803/1797
+f 1769/1822/1819 1763/1/1814 1765/1820/1816
+f 1769/1822/1819 1765/1820/1816 1767/1823/1820
+f 1766/1821/1818 1769/1822/1819 1770/1825/1822
+f 1770/1825/1822 1769/1822/1819 1771/1826/1823
+f 1769/1822/1819 1767/1823/1820 1771/1826/1823
+f 1772/1827/1824 1767/1823/1820 1747/1803/1797
+f 1767/1823/1820 1772/1827/1824 1771/1826/1823
+f 1773/1828/1825 1772/1827/1824 1746/1802/1796
+f 1771/1826/1823 1772/1827/1824 1773/1828/1825
+f 1746/1802/1796 1772/1827/1824 1747/1803/1797
+f 1779/1829/1826 1775/4/1817 1780/1830/1827
+f 1780/1830/1827 1775/4/1817 1766/1821/1818
+f 1788/10/1828 1782/9/1829 2302/1831/1830
+f 2302/1831/1830 1782/9/1829 1775/4/1817
+f 2302/1831/1830 1775/4/1817 1779/1829/1826
+f 5/1832/1831 1786/13/1832 1788/10/1828
+f 5/1832/1831 1788/10/1828 4/1833/1833
+f 1787/1834/1834 1788/10/1828 2302/1831/1830
+f 4/1833/1833 1802/1835/1835 1785/1836/1836
+f 4/1833/1833 1788/10/1828 1803/1837/1837
+f 1789/1838/1838 1790/1839/1839 1785/1836/1836
+f 1790/1839/1839 1791/1840/1840 1792/1841/1841
+f 1793/1842/1842 1794/1843/1843 1790/1839/1839
+f 1793/1842/1842 1790/1839/1839 1789/1838/1838
+f 1794/1843/1843 1791/1840/1840 1790/1839/1839
+f 1795/1844/1844 1796/1845/1845 1814/1846/1846
+f 1795/1844/1844 1814/1846/1846 1797/1847/1847
+f 1792/1841/1841 1791/1840/1840 1796/1845/1845
+f 1792/1841/1841 1796/1845/1845 1795/1844/1844
+f 1791/1840/1840 1798/1848/1848 1796/1845/1845
+f 1796/1845/1845 1798/1848/1848 1800/1849/1849
+f 1796/1845/1845 1800/1849/1849 1799/1850/1850
+f 1798/1848/1848 1791/1840/1840 1801/1851/1851
+f 1798/1848/1848 1801/1851/1851 1800/1849/1849
+f 1801/1851/1851 1791/1840/1840 1794/1843/1843
+f 1793/1842/1842 1789/1838/1838 1802/1835/1835
+f 1802/1835/1835 1789/1838/1838 1785/1836/1836
+f 1803/1837/1837 1804/1852/1852 1802/1835/1835
+f 1804/1852/1852 1803/1837/1837 1805/1853/1853
+f 2259/1854/1854 1805/1853/1853 1787/1834/1834
+f 1805/1853/1853 1803/1837/1837 1788/10/1828
+f 1805/1853/1853 1788/10/1828 1787/1834/1834
+f 1808/1855/1855 1809/1856/1856 2297/1857/1857
+f 1808/1855/1855 1807/1858/1858 1810/1859/1859
+f 1808/1855/1855 1810/1859/1859 1809/1856/1856
+f 1807/1858/1858 1806/1860/1860 1797/1847/1847
+f 1809/1856/1856 1811/1861/1861 1812/1862/1862
+f 1810/1859/1859 1811/1861/1861 1809/1856/1856
+f 1812/1862/1862 1811/1861/1861 1813/1863/1863
+f 1811/1861/1861 1814/1846/1846 1813/1863/1863
+f 1810/1859/1859 1807/1858/1858 1797/1847/1847
+f 1814/1846/1846 1811/1861/1861 1810/1859/1859
+f 1813/1863/1863 1815/1864/1864 1812/1862/1862
+f 1815/1864/1864 1813/1863/1863 1796/1845/1845
+f 1815/1864/1864 1796/1845/1845 1799/1850/1850
+f 1814/1846/1846 1810/1859/1859 1797/1847/1847
+f 1796/1845/1845 1813/1863/1863 1814/1846/1846
+f 1806/1860/1860 1816/1865/1865 1817/1866/1866
+f 1806/1860/1860 1817/1866/1866 1797/1847/1847
+f 1816/1865/1865 1818/1867/1867 1817/1866/1866
+f 1820/1868/1868 1819/1869/1869 1821/1870/1870
+f 1819/1869/1869 1816/1865/1865 2293/1871/1871
+f 1819/1869/1869 1818/1867/1867 1816/1865/1865
+f 2317/1872/1872 1816/1865/1865 1806/1860/1860
+f 1822/1873/1873 1823/1874/1874 1824/1875/1875
+f 1822/1873/1873 1824/1875/1875 1825/1876/1876
+f 1827/1877/1877 1823/1874/1874 1822/1873/1873
+f 1827/1877/1877 1826/1878/1878 1823/1874/1874
+f 1828/1879/1879 1820/1868/1868 1821/1870/1870
+f 1828/1879/1879 1826/1878/1878 1827/1877/1877
+f 1830/1880/1880 1833/1881/1881 1831/1882/1882
+f 1833/1881/1881 1830/1880/1880 2233/1883/1883
+f 2233/1883/1883 1830/1880/1880 1829/1884/1884
+f 1825/1876/1876 1824/1875/1875 2289/1885/1885
+f 2289/1885/1885 1824/1875/1875 1823/1874/1874
+f 1834/1886/1886 1835/1887/1887 1833/1881/1881
+f 1834/1886/1886 1833/1881/1881 2233/1883/1883
+f 1833/1881/1881 1835/1887/1887 1832/1888/1888
+f 1833/1881/1881 1832/1888/1888 1831/1882/1882
+f 1832/1888/1888 1835/1887/1887 1836/1889/1889
+f 1835/1887/1887 1834/1886/1886 1837/1890/1890
+f 1836/1889/1889 1835/1887/1887 1837/1890/1890
+f 1839/1891/1891 1838/1892/1892 1840/1893/1893
+f 1836/1889/1889 1840/1893/1893 1841/1894/1894
+f 1836/1889/1889 1841/1894/1894 1832/1888/1888
+f 1842/1895/1895 1843/1896/1896 1848/1897/1897
+f 1842/1895/1895 1848/1897/1897 1844/1898/1898
+f 1843/1896/1896 1845/1899/1899 1848/1897/1897
+f 1845/1899/1899 1839/1891/1891 1840/1893/1893
+f 1845/1899/1899 1843/1896/1896 1839/1891/1891
+f 1839/1891/1891 1843/1896/1896 1846/1900/1900
+f 1848/1897/1897 1847/1901/1901 1844/1898/1898
+f 1847/1901/1901 1848/1897/1897 1849/1902/1902
+f 1850/1903/1903 1871/1904/1904 1851/1905/1905
+f 1849/1902/1902 1848/1897/1897 1850/1903/1903
+f 1850/1903/1903 1848/1897/1897 1852/1906/1906
+f 1853/1907/1907 1854/1908/1908 1855/1909/1909
+f 1853/1907/1907 1856/1910/1910 1854/1908/1908
+f 1857/1911/1911 1858/1912/1912 1853/1907/1907
+f 1858/1912/1912 1856/1910/1910 1853/1907/1907
+f 1859/1913/1913 1856/1910/1910 1860/1914/1914
+f 1859/1913/1913 1860/1914/1914 1861/1915/1915
+f 1856/1910/1910 1858/1912/1912 1862/1916/1916
+f 1856/1910/1910 1862/1916/1916 1860/1914/1914
+f 1854/1908/1908 1856/1910/1910 1859/1913/1913
+f 1864/1917/1917 1858/1912/1912 1857/1911/1911
+f 1864/1917/1917 1857/1911/1911 1863/1918/1918
+f 1862/1916/1916 1858/1912/1912 1864/1917/1917
+f 1862/1916/1916 1864/1917/1917 1863/1918/1918
+f 1862/1916/1916 1865/1919/1919 1860/1914/1914
+f 1862/1916/1916 1866/1920/1920 1867/1921/1921
+f 1862/1916/1916 1867/1921/1921 1865/1919/1919
+f 1868/1922/1922 1869/1923/1923 1851/1905/1905
+f 1866/1920/1920 1869/1923/1923 1868/1922/1922
+f 1851/1905/1905 1869/1923/1923 1863/1918/1918
+f 1869/1923/1923 1862/1916/1916 1863/1918/1918
+f 1869/1923/1923 1866/1920/1920 1862/1916/1916
+f 1851/1905/1905 1871/1904/1904 1870/1924/1924
+f 1851/1905/1905 1870/1924/1924 1868/1922/1922
+f 1871/1904/1904 1850/1903/1903 1852/1906/1906
+f 1870/1924/1924 1871/1904/1904 1852/1906/1906
+f 1872/1925/1925 1873/1926/1926 1874/1927/1927
+f 1875/1928/1928 1873/1926/1926 1872/1925/1925
+f 1873/1926/1926 1875/1928/1928 1876/1929/1929
+f 1878/1930/1930 1876/1929/1929 1877/1931/1931
+f 1878/1930/1930 1877/1931/1931 1855/1909/1909
+f 1876/1929/1929 1875/1928/1928 1877/1931/1931
+f 1879/1932/1932 1878/1930/1930 1855/1909/1909
+f 1879/1932/1932 1854/1908/1908 2173/1933/1933
+f 1854/1908/1908 1879/1932/1932 1855/1909/1909
+f 1905/1934/1934 1881/1935/1935 1873/1926/1926
+f 1873/1926/1926 1883/1936/1936 1874/1927/1927
+f 1873/1926/1926 1881/1935/1935 1883/1936/1936
+f 1884/1937/1937 1885/1938/1938 1886/1939/1939
+f 1884/1937/1937 1887/1940/1940 1885/1938/1938
+f 1888/1941/1941 1889/1942/1942 1884/1937/1937
+f 1889/1942/1942 1887/1940/1940 1884/1937/1937
+f 1890/1943/1943 1891/1944/1944 1892/1945/1945
+f 1891/1944/1944 1889/1942/1942 1893/1946/1946
+f 1885/1938/1938 1887/1940/1940 1891/1944/1944
+f 1885/1938/1938 1891/1944/1944 1890/1943/1943
+f 1887/1940/1940 1889/1942/1942 1891/1944/1944
+f 1893/1946/1946 1889/1942/1942 1888/1941/1941
+f 1893/1946/1946 1888/1941/1941 1894/1947/1947
+f 1895/1948/1948 1896/1949/1949 1894/1947/1947
+f 1895/1948/1948 1894/1947/1947 1882/1950/1950
+f 1896/1949/1949 1897/1951/1951 1893/1946/1946
+f 1896/1949/1949 1893/1946/1946 1894/1947/1947
+f 1891/1944/1944 1898/1952/1952 1892/1945/1945
+f 1898/1952/1952 1899/1953/1953 1892/1945/1945
+f 1893/1946/1946 1897/1951/1951 1898/1952/1952
+f 1893/1946/1946 1898/1952/1952 1891/1944/1944
+f 1899/1953/1953 1898/1952/1952 2112/1954/1954
+f 1899/1953/1953 2112/1954/1954 2110/1955/1955
+f 1898/1952/1952 1897/1951/1951 2112/1954/1954
+f 1900/1956/1956 1895/1948/1948 1901/1957/1957
+f 1901/1957/1957 1895/1948/1948 1882/1950/1950
+f 1902/1958/1958 1903/1959/1959 1900/1956/1956
+f 1901/1957/1957 1902/1958/1958 1900/1956/1956
+f 1903/1959/1959 1902/1958/1958 1904/1960/1960
+f 1902/1958/1958 1905/1934/1934 1904/1960/1960
+f 1902/1958/1958 1881/1935/1935 1905/1934/1934
+f 1880/1961/1961 1901/1957/1957 1882/1950/1950
+f 1880/1961/1961 1902/1958/1958 1901/1957/1957
+f 1881/1935/1935 1902/1958/1958 1880/1961/1961
+f 1910/1962/1962 1909/1963/1963 1886/1939/1939
+f 1908/1964/1964 1909/1963/1963 2096/1965/1965
+f 1909/1963/1963 1910/1962/1962 2096/1965/1965
+f 2096/1965/1965 1910/1962/1962 2097/1966/1966
+f 1885/1938/1938 1911/1967/1967 1910/1962/1962
+f 1885/1938/1938 1910/1962/1962 1886/1939/1939
+f 2097/1966/1966 1911/1967/1967 2098/1968/1968
+f 1910/1962/1962 1911/1967/1967 2097/1966/1966
+f 1912/1969/1969 1885/1938/1938 1890/1943/1943
+f 2098/1968/1968 1911/1967/1967 1912/1969/1969
+f 1911/1967/1967 1885/1938/1938 1912/1969/1969
+f 1915/1970/1970 1916/1971/1971 1913/1972/1972
+f 1913/1972/1972 1916/1971/1971 1917/1973/1973
+f 1917/1973/1973 1906/1974/1974 1908/1964/1964
+f 1906/1974/1974 1916/1971/1971 1907/1975/1975
+f 1906/1974/1974 1917/1973/1973 1916/1971/1971
+f 1918/1976/1976 1919/1977/1977 1920/1978/1978
+f 1918/1976/1976 1920/1978/1978 1921/1979/1979
+f 1917/1973/1973 1919/1977/1977 1913/1972/1972
+f 1913/1972/1972 1919/1977/1977 1922/1980/1980
+f 1913/1972/1972 1922/1980/1980 1914/1981/1981
+f 1923/1982/1982 1924/1983/1983 1925/1984/1984
+f 1923/1982/1982 1925/1984/1984 1926/1985/1985
+f 1927/1986/1986 1928/1987/1987 1924/1983/1983
+f 1927/1986/1986 1924/1983/1983 1923/1982/1982
+f 1925/1984/1984 1929/1988/1988 1930/1989/1989
+f 1929/1988/1988 1928/1987/1987 1931/1990/1990
+f 1929/1988/1988 1931/1990/1990 1930/1989/1989
+f 1925/1984/1984 1924/1983/1983 1929/1988/1988
+f 1924/1983/1983 1928/1987/1987 1929/1988/1988
+f 1933/1991/1991 1928/1987/1987 1927/1986/1986
+f 1933/1991/1991 1927/1986/1986 1932/1992/1992
+f 1931/1990/1990 1928/1987/1987 1933/1991/1991
+f 1931/1990/1990 1933/1991/1991 1932/1992/1992
+f 1930/1989/1989 1934/1993/1993 1925/1984/1984
+f 1930/1989/1989 1935/1994/1994 1934/1993/1993
+f 1931/1990/1990 1936/1995/1995 1930/1989/1989
+f 1936/1995/1995 1935/1994/1994 1930/1989/1989
+f 1937/1996/1996 1936/1995/1995 1939/1997/1997
+f 1937/1996/1996 1939/1997/1997 1938/1998/1998
+f 1935/1994/1994 1936/1995/1995 1937/1996/1996
+f 1940/1999/1999 1932/1992/1992 1921/1979/1979
+f 1932/1992/1992 1936/1995/1995 1931/1990/1990
+f 1939/1997/1997 1936/1995/1995 1932/1992/1992
+f 1939/1997/1997 1932/1992/1992 1940/1999/1999
+f 1941/2000/2000 1940/1999/1999 1920/1978/1978
+f 1939/1997/1997 1940/1999/1999 1941/2000/2000
+f 1920/1978/1978 1940/1999/1999 1921/1979/1979
+f 1919/1977/1977 1943/2001/2001 1920/1978/1978
+f 1920/1978/1978 1942/2002/2002 1941/2000/2000
+f 1920/1978/1978 1943/2001/2001 1942/2002/2002
+f 1942/2002/2002 1943/2001/2001 1944/2003/2003
+f 1943/2001/2001 1919/1977/1977 1917/1973/1973
+f 1945/2004/2004 1947/2005/2005 1946/2006/2006
+f 1948/2007/2007 1949/2008/2008 1947/2005/2005
+f 1948/2007/2007 1947/2005/2005 1945/2004/2004
+f 1947/2005/2005 1950/2009/2009 1951/2010/2010
+f 1947/2005/2005 1949/2008/2008 1950/2009/2009
+f 1950/2009/2009 1949/2008/2008 1952/2011/2011
+f 1954/2012/2012 1949/2008/2008 1953/2013/2013
+f 1954/2012/2012 1953/2013/2013 1926/1985/1985
+f 1949/2008/2008 1948/2007/2007 1953/2013/2013
+f 1952/2011/2011 1954/2012/2012 1955/2014/2014
+f 1949/2008/2008 1954/2012/2012 1952/2011/2011
+f 1955/2014/2014 1954/2012/2012 1925/1984/1984
+f 1925/1984/1984 1954/2012/2012 1926/1985/1985
+f 1958/2015/2015 1959/2016/2016 1960/2017/2017
+f 1959/2016/2016 1958/2015/2015 1961/2018/2018
+f 1958/2015/2015 1957/2019/2019 1961/2018/2018
+f 1957/2019/2019 1947/2005/2005 1962/2020/2020
+f 1947/2005/2005 2171/2021/2021 1962/2020/2020
+f 2171/2021/2021 1947/2005/2005 1951/2010/2010
+f 1947/2005/2005 1956/2022/2022 1946/2006/2006
+f 1947/2005/2005 1957/2019/2019 1956/2022/2022
+f 1964/2023/2023 1966/2024/2024 1967/2025/2025
+f 1964/2023/2023 1967/2025/2025 1963/2026/2026
+f 1968/2027/2027 1966/2024/2024 1964/2023/2023
+f 1968/2027/2027 1964/2023/2023 1963/2026/2026
+f 1969/2028/2028 1971/2029/2029 1972/2030/2030
+f 1969/2028/2028 1972/2030/2030 1970/2031/2031
+f 1967/2025/2025 1966/2024/2024 1969/2028/2028
+f 1966/2024/2024 1971/2029/2029 1969/2028/2028
+f 1972/2030/2030 1971/2029/2029 1973/2032/2032
+f 1972/2030/2030 1973/2032/2032 1960/2017/2017
+f 1971/2029/2029 1966/2024/2024 1968/2027/2027
+f 1971/2029/2029 1968/2027/2027 1973/2032/2032
+f 1972/2030/2030 1959/2016/2016 1974/2033/2033
+f 1959/2016/2016 1972/2030/2030 1960/2017/2017
+f 1975/2034/2034 1977/2035/2035 1992/2036/2036
+f 1978/2037/2037 1977/2035/2035 1975/2034/2034
+f 1979/2038/2038 1977/2035/2035 1980/2039/2039
+f 1980/2039/2039 1977/2035/2035 1981/2040/2040
+f 1980/2039/2039 1981/2040/2040 1965/2041/2041
+f 1977/2035/2035 1978/2037/2037 1981/2040/2040
+f 1979/2038/2038 1980/2039/2039 2283/2042/2042
+f 1980/2039/2039 1982/2043/2043 2283/2042/2042
+f 1982/2043/2043 1980/2039/2039 1965/2041/2041
+f 1963/2026/2026 1983/2044/2044 1982/2043/2043
+f 1963/2026/2026 1982/2043/2043 1965/2041/2041
+f 1967/2025/2025 1984/2045/2045 1983/2044/2044
+f 1967/2025/2025 1983/2044/2044 1963/2026/2026
+f 1984/2045/2045 1985/2046/2046 1986/2047/2047
+f 1985/2046/2046 1967/2025/2025 1969/2028/2028
+f 1984/2045/2045 1967/2025/2025 1985/2046/2046
+f 1975/2034/2034 1992/2036/2036 1987/2048/2048
+f 1975/2034/2034 1987/2048/2048 1976/2049/2049
+f 1992/2036/2036 1988/2050/2050 1987/2048/2048
+f 1989/2051/2051 1990/2052/2052 1991/2053/2053
+f 1988/2050/2050 1992/2036/2036 1990/2052/2052
+f 1988/2050/2050 1990/2052/2052 1989/2051/2051
+f 1990/2052/2052 1992/2036/2036 1994/2054/2054
+f 1993/2055/2055 1994/2054/2054 1995/2056/2056
+f 1993/2055/2055 1995/2056/2056 1996/2057/2057
+f 1997/2058/2058 1994/2054/2054 1993/2055/2055
+f 1990/2052/2052 1994/2054/2054 1997/2058/2058
+f 1998/2059/2059 1999/2060/2060 2000/2061/2061
+f 1998/2059/2059 2001/2062/2062 1999/2060/2060
+f 2001/2062/2062 1998/2059/2059 2331/2063/2063
+f 1998/2059/2059 2002/2064/2064 2003/2065/2065
+f 1998/2059/2059 2003/2065/2065 2331/2063/2063
+f 2003/2065/2065 2004/2066/2066 2005/2067/2067
+f 2003/2065/2065 2005/2067/2067 2006/2068/2068
+f 2003/2065/2065 2002/2064/2064 2004/2066/2066
+f 2007/2069/2069 2008/2070/2070 1996/2057/2057
+f 2005/2067/2067 2004/2066/2066 2008/2070/2070
+f 2005/2067/2067 2008/2070/2070 2007/2069/2069
+f 2004/2066/2066 2002/2064/2064 2008/2070/2070
+f 2005/2067/2067 2009/2071/2071 2006/2068/2068
+f 2010/2072/2072 2007/2069/2069 2011/2073/2073
+f 2009/2071/2071 2007/2069/2069 2010/2072/2072
+f 2011/2073/2073 2007/2069/2069 1996/2057/2057
+f 2007/2069/2069 2009/2071/2071 2005/2067/2067
+f 1995/2056/2056 2011/2073/2073 1996/2057/2057
+f 1995/2056/2056 2012/2074/2074 2011/2073/2073
+f 2011/2073/2073 2013/2075/2075 2010/2072/2072
+f 2011/2073/2073 2012/2074/2074 2013/2075/2075
+f 2012/2074/2074 1995/2056/2056 1994/2054/2054
+f 2016/2076/2076 2015/2077/2077 2001/2062/2062
+f 1999/2060/2060 2015/2077/2077 2017/2078/2078
+f 1999/2060/2060 2017/2078/2078 2000/2061/2061
+f 2015/2077/2077 2014/2079/2079 2017/2078/2078
+f 2001/2062/2062 2015/2077/2077 1999/2060/2060
+f 2018/2080/2080 2019/2081/2081 2020/2082/2082
+f 2021/2083/2083 2019/2081/2081 2018/2080/2080
+f 2017/2078/2078 2021/2083/2083 2022/2084/2084
+f 2017/2078/2078 2022/2084/2084 2000/2061/2061
+f 2021/2083/2083 2023/2085/2085 2019/2081/2081
+f 2024/2086/2086 2023/2085/2085 2017/2078/2078
+f 2024/2086/2086 2017/2078/2078 2014/2079/2079
+f 2017/2078/2078 2023/2085/2085 2021/2083/2083
+f 2025/2087/2087 2026/2088/2088 2027/2089/2089
+f 2028/2090/2090 2026/2088/2088 2025/2087/2087
+f 2026/2088/2088 2019/2081/2081 2047/2091/2091
+f 2026/2088/2088 2028/2090/2090 2019/2081/2081
+f 2019/2081/2081 2028/2090/2090 2029/2092/2092
+f 2019/2081/2081 2029/2092/2092 2020/2082/2082
+f 2034/2093/2093 2033/2094/2094 2031/2095/2095
+f 2034/2093/2093 2031/2095/2095 2030/2096/2096
+f 2035/2097/2097 2036/2098/2098 2037/2099/2099
+f 2036/2098/2098 2038/2100/2100 2039/2101/2101
+f 2031/2095/2095 2033/2094/2094 2036/2098/2098
+f 2031/2095/2095 2036/2098/2098 2035/2097/2097
+f 2033/2094/2094 2038/2100/2100 2036/2098/2098
+f 2040/2102/2102 2038/2100/2100 2041/2103/2103
+f 2040/2102/2102 2041/2103/2103 2027/2089/2089
+f 2038/2100/2100 2033/2094/2094 2034/2093/2093
+f 2038/2100/2100 2034/2093/2093 2041/2103/2103
+f 2039/2101/2101 2038/2100/2100 2040/2102/2102
+f 2042/2104/2104 2040/2102/2102 2027/2089/2089
+f 2040/2102/2102 2043/2105/2105 2039/2101/2101
+f 2036/2098/2098 2044/2106/2106 2045/2107/2107
+f 2036/2098/2098 2045/2107/2107 2037/2099/2099
+f 2039/2101/2101 2044/2106/2106 2036/2098/2098
+f 2039/2101/2101 2043/2105/2105 2044/2106/2106
+f 2044/2106/2106 2043/2105/2105 2046/2108/2108
+f 2043/2105/2105 2040/2102/2102 2042/2104/2104
+f 2042/2104/2104 2026/2088/2088 2047/2091/2091
+f 2026/2088/2088 2042/2104/2104 2027/2089/2089
+f 2048/2109/2109 2049/2110/2110 2050/2111/2111
+f 2048/2109/2109 2050/2111/2111 2051/2112/2112
+f 2052/2113/2113 2049/2110/2110 2048/2109/2109
+f 2050/2111/2111 2049/2110/2110 2053/2114/2114
+f 2056/2115/2115 2054/2116/2116 2055/2117/2117
+f 2056/2115/2115 2055/2117/2117 2032/2118/2118
+f 2054/2116/2116 2049/2110/2110 2052/2113/2113
+f 2054/2116/2116 2052/2113/2113 2055/2117/2117
+f 2056/2115/2115 2032/2118/2118 2057/2119/2119
+f 2032/2118/2118 2058/2120/2120 2057/2119/2119
+f 2059/2121/2121 2058/2120/2120 2060/2122/2122
+f 2060/2122/2122 2035/2097/2097 2059/2121/2121
+f 2035/2097/2097 2060/2122/2122 2031/2095/2095
+f 2030/2096/2096 2060/2122/2122 2058/2120/2120
+f 2030/2096/2096 2058/2120/2120 2032/2118/2118
+f 2031/2095/2095 2060/2122/2122 2030/2096/2096
+f 2061/2123/2123 2062/2124/2124 2063/2125/2125
+f 2063/2125/2125 2062/2124/2124 2053/2114/2114
+f 2062/2124/2124 2050/2111/2111 2053/2114/2114
+f 2063/2125/2125 2065/2126/2126 2064/2127/2127
+f 2066/2128/2128 2067/2129/2129 2068/2130/2130
+f 2066/2128/2128 2069/2131/2131 2067/2129/2129
+f 2066/2128/2128 2065/2126/2126 2053/2114/2114
+f 2066/2128/2128 2053/2114/2114 2069/2131/2131
+f 2053/2114/2114 2065/2126/2126 2063/2125/2125
+f 2070/2132/2132 2071/2133/2133 2072/2134/2134
+f 2070/2132/2132 2072/2134/2134 2073/2135/2135
+f 2074/2136/2136 2075/2137/2137 2071/2133/2133
+f 2074/2136/2136 2071/2133/2133 2070/2132/2132
+f 2077/2138/2138 2075/2137/2137 2078/2139/2139
+f 2072/2134/2134 2071/2133/2133 2077/2138/2138
+f 2072/2134/2134 2077/2138/2138 2076/2140/2140
+f 2071/2133/2133 2075/2137/2137 2077/2138/2138
+f 2083/2141/2141 2078/2139/2139 2079/2142/2142
+f 2083/2141/2141 2079/2142/2142 2068/2130/2130
+f 2078/2139/2139 2075/2137/2137 2074/2136/2136
+f 2078/2139/2139 2074/2136/2136 2079/2142/2142
+f 2078/2139/2139 2080/2143/2143 2497/2144/2144
+f 2078/2139/2139 2497/2144/2144 2077/2138/2138
+f 2497/2144/2144 2080/2143/2143 2082/2145/2145
+f 2497/2144/2144 2082/2145/2145 2081/2146/2146
+f 2083/2141/2141 2080/2143/2143 2078/2139/2139
+f 2082/2145/2145 2080/2143/2143 2083/2141/2141
+f 2083/2141/2141 2084/2147/2147 2499/2148/2148
+f 2083/2141/2141 2499/2148/2148 2082/2145/2145
+f 2067/2129/2129 2084/2147/2147 2083/2141/2141
+f 2067/2129/2129 2083/2141/2141 2068/2130/2130
+f 2085/2149/2149 2086/2150/2150 2087/2151/2151
+f 2087/2151/2151 2086/2150/2150 2073/2135/2135
+f 2086/2150/2150 2088/2152/2152 2091/2153/2153
+f 2088/2152/2152 2086/2150/2150 2085/2149/2149
+f 2072/2134/2134 2087/2151/2151 2073/2135/2135
+f 2089/2154/2154 2072/2134/2134 2483/2155/2155
+f 2087/2151/2151 2072/2134/2134 2089/2154/2154
+f 2483/2155/2155 2072/2134/2134 2076/2140/2140
+f 2090/2156/2156 2091/2153/2153 1698/2157/2157
+f 2092/2158/2158 2091/2153/2153 2090/2156/2156
+f 2086/2150/2150 2093/2159/2159 2073/2135/2135
+f 2086/2150/2150 2091/2153/2153 2092/2158/2158
+f 2086/2150/2150 2092/2158/2158 2093/2159/2159
+f 2095/2160/2160 2094/2161/2161 2091/2153/2153
+f 2094/2161/2161 1696/1748/1742 2091/2153/2153
+f 2091/2153/2153 1696/1748/1742 1697/1750/1744
+f 2091/2153/2153 1697/1750/1744 1698/2157/2157
+f 1917/1973/1973 2096/1965/1965 1943/2001/2001
+f 1943/2001/2001 2097/1966/1966 1944/2003/2003
+f 1943/2001/2001 2096/1965/1965 2097/1966/1966
+f 2096/1965/1965 1917/1973/1973 1908/1964/1964
+f 2099/2162/2162 2098/1968/1968 2100/2163/2163
+f 1944/2003/2003 2098/1968/1968 2099/2162/2162
+f 2100/2163/2163 2098/1968/1968 1912/1969/1969
+f 2098/1968/1968 1944/2003/2003 2097/1966/1966
+f 2109/2164/2164 1941/2000/2000 2101/2165/2165
+f 1941/2000/2000 1942/2002/2002 2101/2165/2165
+f 2099/2162/2162 1942/2002/2002 1944/2003/2003
+f 2101/2165/2165 1942/2002/2002 2099/2162/2162
+f 2106/2166/2166 2100/2163/2163 2103/2167/2167
+f 2100/2163/2163 2102/2168/2168 2103/2167/2167
+f 2104/2169/2169 2102/2168/2168 2105/2170/2170
+f 2103/2167/2167 2102/2168/2168 2104/2169/2169
+f 2105/2170/2170 2102/2168/2168 2100/2163/2163
+f 2105/2170/2170 2100/2163/2163 1912/1969/1969
+f 1890/1943/1943 2105/2170/2170 1912/1969/1969
+f 2105/2170/2170 1892/1945/1945 1899/1953/1953
+f 1892/1945/1945 2105/2170/2170 1890/1943/1943
+f 2101/2165/2165 2106/2166/2166 2108/2171/2171
+f 2108/2171/2171 2106/2166/2166 2107/2172/2172
+f 2107/2172/2172 2106/2166/2166 2103/2167/2167
+f 2100/2163/2163 2106/2166/2166 2099/2162/2162
+f 2106/2166/2166 2101/2165/2165 2099/2162/2162
+f 1938/1998/1998 2108/2171/2171 1937/1996/1996
+f 1938/1998/1998 2109/2164/2164 2108/2171/2171
+f 1939/1997/1997 2109/2164/2164 1938/1998/1998
+f 2109/2164/2164 1939/1997/1997 1941/2000/2000
+f 2101/2165/2165 2108/2171/2171 2109/2164/2164
+f 2105/2170/2170 2110/1955/1955 2104/2169/2169
+f 2104/2169/2169 2110/1955/1955 2111/2173/2173
+f 2113/2174/2174 2111/2173/2173 2112/1954/1954
+f 2111/2173/2173 2110/1955/1955 2112/1954/1954
+f 2110/1955/1955 2105/2170/2170 1899/1953/1953
+f 2123/2175/2175 1896/1949/1949 1895/1948/1948
+f 1896/1949/1949 2112/1954/1954 1897/1951/1951
+f 2113/2174/2174 2112/1954/1954 1896/1949/1949
+f 2113/2174/2174 1896/1949/1949 2123/2175/2175
+f 2103/2167/2167 2114/2176/2176 2116/2177/2177
+f 2114/2176/2176 2124/2178/2178 2115/2179/2179
+f 2116/2177/2177 2114/2176/2176 2115/2179/2179
+f 2124/2178/2178 2104/2169/2169 2111/2173/2173
+f 2124/2178/2178 2114/2176/2176 2104/2169/2169
+f 2114/2176/2176 2103/2167/2167 2104/2169/2169
+f 2107/2172/2172 2116/2177/2177 2118/2180/2180
+f 2118/2180/2180 2116/2177/2177 2117/2181/2181
+f 2117/2181/2181 2116/2177/2177 2115/2179/2179
+f 2116/2177/2177 2107/2172/2172 2103/2167/2167
+f 2108/2171/2171 2118/2180/2180 1937/1996/1996
+f 1935/1994/1994 2118/2180/2180 2120/2182/2182
+f 1935/1994/1994 2120/2182/2182 2119/2183/2183
+f 2120/2182/2182 2118/2180/2180 2117/2181/2181
+f 2118/2180/2180 2108/2171/2171 2107/2172/2172
+f 2121/2184/2184 2122/2185/2185 2126/2186/2186
+f 2113/2174/2174 2121/2184/2184 2111/2173/2173
+f 2122/2185/2185 2121/2184/2184 2113/2174/2174
+f 2113/2174/2174 2123/2175/2175 2122/2185/2185
+f 2115/2179/2179 2124/2178/2178 2127/2187/2187
+f 2124/2178/2178 2126/2186/2186 2125/2188/2188
+f 2127/2187/2187 2124/2178/2178 2125/2188/2188
+f 2126/2186/2186 2124/2178/2178 2121/2184/2184
+f 2121/2184/2184 2124/2178/2178 2111/2173/2173
+f 2117/2181/2181 2127/2187/2187 2129/2189/2189
+f 2127/2187/2187 2141/2190/2190 2128/2191/2191
+f 2129/2189/2189 2127/2187/2187 2128/2191/2191
+f 2141/2190/2190 2127/2187/2187 2125/2188/2188
+f 2127/2187/2187 2117/2181/2181 2115/2179/2179
+f 2120/2182/2182 2129/2189/2189 2130/2192/2192
+f 2130/2192/2192 2129/2189/2189 2131/2193/2193
+f 2131/2193/2193 2129/2189/2189 2128/2191/2191
+f 2129/2189/2189 2120/2182/2182 2117/2181/2181
+f 1935/1994/1994 2119/2183/2183 1934/1993/1993
+f 2118/2180/2180 1935/1994/1994 1937/1996/1996
+f 1934/1993/1993 2132/2194/2194 1925/1984/1984
+f 2131/2193/2193 2132/2194/2194 2130/2192/2192
+f 2120/2182/2182 2130/2192/2192 2119/2183/2183
+f 2130/2192/2192 2132/2194/2194 1934/1993/1993
+f 2130/2192/2192 1934/1993/1993 2119/2183/2183
+f 2122/2185/2185 2135/2195/2195 2126/2186/2186
+f 2135/2195/2195 2133/2196/2196 2126/2186/2186
+f 2133/2196/2196 2135/2195/2195 2134/2197/2197
+f 2135/2195/2195 2122/2185/2185 2123/2175/2175
+f 2123/2175/2175 2136/2198/2198 2135/2195/2195
+f 2136/2198/2198 2137/2199/2199 2134/2197/2197
+f 2135/2195/2195 2136/2198/2198 2134/2197/2197
+f 2137/2199/2199 2136/2198/2198 1900/1956/1956
+f 1895/1948/1948 2136/2198/2198 2123/2175/2175
+f 1900/1956/1956 2136/2198/2198 1895/1948/1948
+f 2125/2188/2188 2138/2200/2200 2139/2201/2201
+f 2126/2186/2186 2138/2200/2200 2125/2188/2188
+f 2139/2201/2201 2138/2200/2200 2140/2202/2202
+f 2133/2196/2196 2138/2200/2200 2126/2186/2186
+f 2128/2191/2191 2141/2190/2190 2142/2203/2203
+f 2141/2190/2190 2139/2201/2201 2142/2203/2203
+f 2139/2201/2201 2141/2190/2190 2125/2188/2188
+f 2131/2193/2193 2128/2191/2191 2143/2204/2204
+f 2143/2204/2204 2128/2191/2191 2142/2203/2203
+f 2132/2194/2194 1955/2014/2014 1925/1984/1984
+f 1955/2014/2014 2131/2193/2193 2143/2204/2204
+f 1952/2011/2011 1955/2014/2014 2143/2204/2204
+f 1955/2014/2014 2132/2194/2194 2131/2193/2193
+f 2134/2197/2197 2137/2199/2199 2144/2205/2205
+f 2137/2199/2199 1903/1959/1959 2144/2205/2205
+f 1903/1959/1959 1904/1960/1960 2145/2206/2206
+f 2144/2205/2205 1903/1959/1959 2145/2206/2206
+f 1903/1959/1959 2137/2199/2199 1900/1956/1956
+f 2134/2197/2197 2146/2207/2207 2133/2196/2196
+f 2149/2208/2208 2146/2207/2207 2147/2209/2209
+f 2146/2207/2207 2145/2206/2206 2147/2209/2209
+f 2146/2207/2207 2144/2205/2205 2145/2206/2206
+f 2144/2205/2205 2146/2207/2207 2134/2197/2197
+f 2148/2210/2210 2140/2202/2202 2149/2208/2208
+f 2149/2208/2208 2140/2202/2202 2146/2207/2207
+f 2146/2207/2207 2138/2200/2200 2133/2196/2196
+f 2146/2207/2207 2140/2202/2202 2138/2200/2200
+f 2142/2203/2203 2150/2211/2211 2152/2212/2212
+f 2139/2201/2201 2150/2211/2211 2142/2203/2203
+f 2152/2212/2212 2150/2211/2211 2151/2213/2213
+f 2151/2213/2213 2150/2211/2211 2148/2210/2210
+f 2140/2202/2202 2150/2211/2211 2139/2201/2201
+f 2148/2210/2210 2150/2211/2211 2140/2202/2202
+f 2143/2204/2204 2152/2212/2212 2154/2214/2214
+f 2154/2214/2214 2152/2212/2212 2153/2215/2215
+f 2152/2212/2212 2143/2204/2204 2142/2203/2203
+f 1952/2011/2011 2154/2214/2214 1950/2009/2009
+f 1950/2009/2009 2154/2214/2214 2155/2216/2216
+f 1950/2009/2009 2155/2216/2216 1951/2010/2010
+f 2155/2216/2216 2154/2214/2214 2153/2215/2215
+f 2154/2214/2214 1952/2011/2011 2143/2204/2204
+f 1904/1960/1960 2156/2217/2217 2145/2206/2206
+f 2161/2218/2218 2156/2217/2217 2157/2219/2219
+f 2156/2217/2217 2158/2220/2220 2157/2219/2219
+f 2158/2220/2220 2156/2217/2217 2159/2221/2221
+f 2156/2217/2217 1904/1960/1960 2159/2221/2221
+f 1905/1934/1934 2159/2221/2221 1904/1960/1960
+f 2159/2221/2221 2160/2222/2222 2158/2220/2220
+f 2159/2221/2221 1905/1934/1934 2160/2222/2222
+f 2145/2206/2206 2161/2218/2218 2147/2209/2209
+f 2147/2209/2209 2161/2218/2218 2164/2223/2223
+f 2156/2217/2217 2161/2218/2218 2145/2206/2206
+f 2149/2208/2208 2162/2224/2224 2148/2210/2210
+f 2166/2225/2225 2162/2224/2224 2163/2226/2226
+f 2162/2224/2224 2164/2223/2223 2163/2226/2226
+f 2164/2223/2223 2162/2224/2224 2147/2209/2209
+f 2147/2209/2209 2162/2224/2224 2149/2208/2208
+f 2151/2213/2213 2165/2227/2227 2152/2212/2212
+f 2151/2213/2213 2166/2225/2225 2165/2227/2227
+f 2162/2224/2224 2166/2225/2225 2148/2210/2210
+f 2166/2225/2225 2151/2213/2213 2148/2210/2210
+f 2153/2215/2215 2167/2228/2228 2155/2216/2216
+f 2153/2215/2215 2165/2227/2227 2167/2228/2228
+f 2167/2228/2228 2168/2229/2229 2169/2230/2230
+f 2167/2228/2228 2165/2227/2227 2168/2229/2229
+f 2165/2227/2227 2153/2215/2215 2152/2212/2212
+f 2155/2216/2216 2169/2230/2230 1951/2010/2010
+f 1951/2010/2010 2169/2230/2230 2170/2231/2231
+f 2167/2228/2228 2169/2230/2230 2155/2216/2216
+f 1962/2020/2020 2171/2021/2021 2172/2232/2232
+f 2172/2232/2232 2171/2021/2021 1951/2010/2010
+f 2172/2232/2232 1951/2010/2010 2170/2231/2231
+f 1854/1908/1908 2174/2233/2233 2173/1933/1933
+f 2173/1933/1933 2174/2233/2233 2175/2234/2234
+f 2174/2233/2233 1861/1915/1915 2176/2235/2235
+f 1861/1915/1915 2174/2233/2233 1859/1913/1913
+f 2174/2233/2233 1854/1908/1908 1859/1913/1913
+f 2176/2235/2235 2178/2236/2236 2177/2237/2237
+f 1861/1915/1915 2178/2236/2236 2176/2235/2235
+f 2178/2236/2236 2179/2238/2238 2177/2237/2237
+f 2178/2236/2236 1865/1919/1919 2179/2238/2238
+f 2179/2238/2238 1865/1919/1919 1867/1921/1921
+f 1860/1914/1914 2178/2236/2236 1861/1915/1915
+f 1865/1919/1919 2178/2236/2236 1860/1914/1914
+f 1878/1930/1930 2180/2239/2239 1876/1929/1929
+f 1878/1930/1930 2181/2240/2240 2180/2239/2239
+f 2181/2240/2240 2173/1933/1933 2175/2234/2234
+f 2173/1933/1933 2181/2240/2240 1879/1932/1932
+f 2181/2240/2240 1878/1930/1930 1879/1932/1932
+f 2175/2234/2234 2182/2241/2241 2183/2242/2242
+f 2183/2242/2242 2182/2241/2241 2184/2243/2243
+f 2176/2235/2235 2175/2234/2234 2174/2233/2233
+f 2182/2241/2241 2175/2234/2234 2176/2235/2235
+f 2177/2237/2237 2182/2241/2241 2176/2235/2235
+f 2182/2241/2241 2177/2237/2237 2184/2243/2243
+f 2184/2243/2243 2186/2244/2244 2185/2245/2245
+f 2184/2243/2243 2177/2237/2237 2186/2244/2244
+f 2186/2244/2244 2177/2237/2237 2179/2238/2238
+f 2181/2240/2240 2187/2246/2246 2180/2239/2239
+f 2181/2240/2240 2188/2247/2247 2187/2246/2246
+f 2187/2246/2246 2188/2247/2247 2189/2248/2248
+f 2188/2247/2247 2175/2234/2234 2183/2242/2242
+f 2189/2248/2248 2188/2247/2247 2183/2242/2242
+f 2175/2234/2234 2188/2247/2247 2181/2240/2240
+f 1873/1926/1926 2191/2249/2249 1905/1934/1934
+f 1876/1929/1929 2191/2249/2249 1873/1926/1926
+f 1905/1934/1934 2191/2249/2249 2160/2222/2222
+f 2180/2239/2239 2191/2249/2249 1876/1929/1929
+f 2191/2249/2249 2192/2250/2250 2160/2222/2222
+f 2191/2249/2249 2193/2251/2251 2192/2250/2250
+f 2194/2252/2252 2193/2251/2251 2195/2253/2253
+f 2192/2250/2250 2193/2251/2251 2194/2252/2252
+f 2190/2254/2254 2193/2251/2251 2189/2248/2248
+f 2193/2251/2251 2187/2246/2246 2189/2248/2248
+f 2195/2253/2253 2193/2251/2251 2190/2254/2254
+f 2187/2246/2246 2193/2251/2251 2180/2239/2239
+f 2193/2251/2251 2191/2249/2249 2180/2239/2239
+f 2160/2222/2222 2196/2255/2255 2158/2220/2220
+f 2196/2255/2255 2194/2252/2252 2197/2256/2256
+f 2194/2252/2252 2196/2255/2255 2192/2250/2250
+f 2192/2250/2250 2196/2255/2255 2160/2222/2222
+f 2157/2219/2219 2198/2257/2257 2199/2258/2258
+f 2158/2220/2220 2198/2257/2257 2157/2219/2219
+f 2198/2257/2257 2197/2256/2256 2199/2258/2258
+f 2197/2256/2256 2198/2257/2257 2196/2255/2255
+f 2196/2255/2255 2198/2257/2257 2158/2220/2220
+f 2200/2259/2259 2201/2260/2260 2164/2223/2223
+f 2161/2218/2218 2200/2259/2259 2164/2223/2223
+f 2201/2260/2260 2200/2259/2259 2202/2261/2261
+f 2202/2261/2261 2200/2259/2259 2199/2258/2258
+f 2157/2219/2219 2200/2259/2259 2161/2218/2218
+f 2199/2258/2258 2200/2259/2259 2157/2219/2219
+f 2203/2262/2262 2201/2260/2260 2204/2263/2263
+f 2163/2226/2226 2201/2260/2260 2203/2262/2262
+f 2204/2263/2263 2201/2260/2260 2202/2261/2261
+f 2201/2260/2260 2163/2226/2226 2164/2223/2223
+f 2166/2225/2225 2205/2264/2264 2165/2227/2227
+f 2206/2265/2265 2205/2264/2264 2163/2226/2226
+f 2206/2265/2265 2163/2226/2226 2203/2262/2262
+f 2163/2226/2226 2205/2264/2264 2166/2225/2225
+f 2168/2229/2229 2208/2266/2266 2207/2267/2267
+f 2208/2266/2266 2168/2229/2229 2205/2264/2264
+f 2208/2266/2266 2205/2264/2264 2206/2265/2265
+f 2205/2264/2264 2168/2229/2229 2165/2227/2227
+f 2209/2268/2268 2213/2269/2269 2170/2231/2231
+f 2169/2230/2230 2209/2268/2268 2170/2231/2231
+f 2213/2269/2269 2210/2270/2270 2211/2271/2271
+f 2213/2269/2269 2209/2268/2268 2210/2270/2270
+f 2207/2267/2267 2209/2268/2268 2168/2229/2229
+f 2210/2270/2270 2209/2268/2268 2207/2267/2267
+f 2168/2229/2229 2209/2268/2268 2169/2230/2230
+f 2212/2272/2272 2213/2269/2269 2214/2273/2273
+f 2170/2231/2231 2212/2272/2272 2172/2232/2232
+f 2213/2269/2269 2212/2272/2272 2170/2231/2231
+f 1961/2018/2018 1974/2033/2033 1959/2016/2016
+f 1974/2033/2033 1961/2018/2018 2216/2274/2274
+f 1974/2033/2033 2216/2274/2274 2215/2275/2275
+f 2216/2274/2274 1961/2018/2018 1962/2020/2020
+f 2216/2274/2274 1962/2020/2020 2172/2232/2232
+f 1962/2020/2020 1961/2018/2018 1957/2019/2019
+f 2216/2274/2274 2217/2276/2276 2218/2277/2277
+f 2214/2273/2273 2217/2276/2276 2212/2272/2272
+f 2217/2276/2276 2216/2274/2274 2172/2232/2232
+f 2212/2272/2272 2217/2276/2276 2172/2232/2232
+f 1972/2030/2030 1974/2033/2033 2219/2278/2278
+f 1972/2030/2030 2219/2278/2278 1970/2031/2031
+f 2219/2278/2278 1974/2033/2033 2220/2279/2279
+f 2220/2279/2279 1974/2033/2033 2215/2275/2275
+f 2220/2279/2279 2221/2280/2280 2222/2281/2281
+f 2222/2281/2281 2221/2280/2280 2223/2282/2282
+f 2221/2280/2280 2216/2274/2274 2218/2277/2277
+f 2223/2282/2282 2221/2280/2280 2218/2277/2277
+f 2216/2274/2274 2221/2280/2280 2215/2275/2275
+f 2221/2280/2280 2220/2279/2279 2215/2275/2275
+f 1985/2046/2046 2224/2283/2283 2225/2284/2284
+f 2226/2285/2285 1969/2028/2028 1970/2031/2031
+f 2226/2285/2285 2224/2283/2283 1985/2046/2046
+f 2226/2285/2285 1985/2046/2046 1969/2028/2028
+f 2224/2283/2283 2226/2285/2285 2225/2284/2284
+f 2226/2285/2285 2227/2286/2286 2225/2284/2284
+f 2227/2286/2286 2226/2285/2285 2220/2279/2279
+f 2226/2285/2285 2219/2278/2278 2220/2279/2279
+f 2219/2278/2278 2226/2285/2285 1970/2031/2031
+f 2227/2286/2286 2228/2287/2287 2225/2284/2284
+f 2228/2287/2287 2227/2286/2286 2222/2281/2281
+f 2222/2281/2281 2227/2286/2286 2220/2279/2279
+f 1848/1897/1897 1845/1899/1899 1852/1906/1906
+f 1852/1906/1906 1845/1899/1899 1836/1889/1889
+f 1852/1906/1906 1836/1889/1889 1837/1890/1890
+f 1836/1889/1889 1845/1899/1899 1840/1893/1893
+f 1868/1922/1922 1870/1924/1924 2230/2288/2288
+f 1868/1922/1922 2230/2288/2288 2229/2289/2289
+f 2230/2288/2288 1852/1906/1906 1837/1890/1890
+f 2230/2288/2288 1870/1924/1924 1852/1906/1906
+f 2230/2288/2288 2231/2290/2290 2229/2289/2289
+f 2231/2290/2290 2233/1883/1883 2232/2291/2291
+f 2233/1883/1883 2231/2290/2290 1834/1886/1886
+f 1837/1890/1890 1834/1886/1886 2230/2288/2288
+f 1834/1886/1886 2231/2290/2290 2230/2288/2288
+f 1866/1920/1920 2234/2292/2292 1867/1921/1921
+f 2235/2293/2293 2234/2292/2292 1868/1922/1922
+f 2235/2293/2293 1868/1922/1922 2229/2289/2289
+f 1868/1922/1922 2234/2292/2292 1866/1920/1920
+f 2236/2294/2294 2238/2295/2295 2235/2293/2293
+f 2236/2294/2294 2232/2291/2291 2237/2296/2296
+f 2238/2295/2295 2236/2294/2294 2237/2296/2296
+f 2232/2291/2291 2236/2294/2294 2231/2290/2290
+f 2229/2289/2289 2236/2294/2294 2235/2293/2293
+f 2231/2290/2290 2236/2294/2294 2229/2289/2289
+f 2186/2244/2244 2234/2292/2292 2235/2293/2293
+f 2186/2244/2244 2179/2238/2238 2234/2292/2292
+f 2234/2292/2292 2179/2238/2238 1867/1921/1921
+f 2186/2244/2244 2238/2295/2295 2185/2245/2245
+f 2239/2297/2297 2238/2295/2295 2237/2296/2296
+f 2185/2245/2245 2238/2295/2295 2239/2297/2297
+f 2238/2295/2295 2186/2244/2244 2235/2293/2293
+f 2185/2245/2245 2240/2298/2298 2184/2243/2243
+f 2240/2298/2298 2185/2245/2245 2239/2297/2297
+f 2183/2242/2242 2242/2299/2299 2243/2300/2300
+f 2243/2300/2300 2242/2299/2299 2244/2301/2301
+f 2242/2299/2299 2240/2298/2298 2241/2302/2302
+f 2244/2301/2301 2242/2299/2299 2241/2302/2302
+f 2184/2243/2243 2242/2299/2299 2183/2242/2242
+f 2240/2298/2298 2242/2299/2299 2184/2243/2243
+f 2245/2303/2303 2243/2300/2300 2246/2304/2304
+f 2190/2254/2254 2189/2248/2248 2245/2303/2303
+f 2189/2248/2248 2243/2300/2300 2245/2303/2303
+f 2246/2304/2304 2243/2300/2300 2244/2301/2301
+f 2243/2300/2300 2189/2248/2248 2183/2242/2242
+f 2195/2253/2253 2247/2305/2305 2250/2306/2306
+f 2247/2305/2305 2195/2253/2253 2190/2254/2254
+f 2247/2305/2305 2190/2254/2254 2245/2303/2303
+f 2194/2252/2252 2249/2307/2307 2197/2256/2256
+f 2249/2307/2307 2248/2308/2308 2197/2256/2256
+f 2248/2308/2308 2250/2306/2306 2253/2309/2309
+f 2248/2308/2308 2249/2307/2307 2250/2306/2306
+f 2249/2307/2307 2195/2253/2253 2250/2306/2306
+f 2195/2253/2253 2249/2307/2307 2194/2252/2252
+f 2199/2258/2258 2251/2310/2310 2254/2311/2311
+f 2197/2256/2256 2251/2310/2310 2199/2258/2258
+f 2252/2312/2312 2251/2310/2310 2253/2309/2309
+f 2254/2311/2311 2251/2310/2310 2252/2312/2312
+f 2253/2309/2309 2251/2310/2310 2248/2308/2308
+f 2248/2308/2308 2251/2310/2310 2197/2256/2256
+f 2202/2261/2261 2254/2311/2311 2255/2313/2313
+f 2255/2313/2313 2254/2311/2311 2256/2314/2314
+f 2256/2314/2314 2254/2311/2311 2252/2312/2312
+f 2254/2311/2311 2202/2261/2261 2199/2258/2258
+f 2203/2262/2262 2257/2315/2315 2258/2316/2316
+f 2204/2263/2263 2257/2315/2315 2203/2262/2262
+f 2258/2316/2316 2257/2315/2315 1805/1853/1853
+f 2255/2313/2313 2204/2263/2263 2202/2261/2261
+f 2255/2313/2313 2257/2315/2315 2204/2263/2263
+f 2206/2265/2265 2258/2316/2316 2259/1854/1854
+f 2258/2316/2316 1805/1853/1853 2259/1854/1854
+f 2258/2316/2316 2206/2265/2265 2203/2262/2262
+f 2208/2266/2266 2260/2317/2317 2207/2267/2267
+f 2260/2317/2317 2262/2318/2318 2261/2319/2319
+f 2262/2318/2318 2259/1854/1854 1787/1834/1834
+f 2262/2318/2318 2260/2317/2317 2259/1854/1854
+f 2259/1854/1854 2260/2317/2317 2208/2266/2266
+f 2259/1854/1854 2208/2266/2266 2206/2265/2265
+f 2211/2271/2271 2210/2270/2270 2263/2320/2320
+f 2261/2319/2319 2210/2270/2270 2260/2317/2317
+f 2263/2320/2320 2210/2270/2270 2261/2319/2319
+f 2260/2317/2317 2210/2270/2270 2207/2267/2267
+f 2213/2269/2269 2211/2271/2271 2214/2273/2273
+f 2211/2271/2271 2264/2321/2321 2214/2273/2273
+f 2264/2321/2321 2266/2322/2322 2265/2323/2323
+f 2266/2322/2322 2211/2271/2271 2263/2320/2320
+f 2266/2322/2322 2264/2321/2321 2211/2271/2271
+f 2217/2276/2276 2267/2324/2324 2218/2277/2277
+f 2267/2324/2324 2265/2323/2323 2268/2325/2325
+f 2265/2323/2323 2267/2324/2324 2264/2321/2321
+f 2214/2273/2273 2267/2324/2324 2217/2276/2276
+f 2264/2321/2321 2267/2324/2324 2214/2273/2273
+f 2223/2282/2282 2269/2326/2326 2270/2327/2327
+f 2223/2282/2282 2270/2327/2327 2222/2281/2281
+f 2270/2327/2327 2269/2326/2326 2309/2328/2328
+f 2268/2325/2325 2269/2326/2326 2267/2324/2324
+f 2267/2324/2324 2269/2326/2326 2218/2277/2277
+f 2269/2326/2326 2223/2282/2282 2218/2277/2277
+f 2271/2329/2329 2272/2330/2330 2228/2287/2287
+f 2272/2330/2330 2271/2329/2329 2273/2331/2331
+f 2273/2331/2331 2271/2329/2329 2270/2327/2327
+f 2273/2331/2331 2270/2327/2327 2309/2328/2328
+f 2222/2281/2281 2271/2329/2329 2228/2287/2287
+f 2270/2327/2327 2271/2329/2329 2222/2281/2281
+f 1985/2046/2046 2274/2332/2332 1986/2047/2047
+f 2280/2333/2333 2274/2332/2332 2275/2334/2334
+f 1986/2047/2047 2274/2332/2332 2280/2333/2333
+f 2225/2284/2284 2274/2332/2332 1985/2046/2046
+f 2228/2287/2287 2274/2332/2332 2225/2284/2284
+f 2274/2332/2332 2272/2330/2330 2275/2334/2334
+f 2276/2335/2335 2272/2330/2330 2277/2336/2336
+f 2275/2334/2334 2272/2330/2330 2276/2335/2335
+f 2277/2336/2336 2272/2330/2330 2273/2331/2331
+f 2272/2330/2330 2274/2332/2332 2228/2287/2287
+f 1984/2045/2045 2278/2337/2337 1983/2044/2044
+f 2278/2337/2337 2280/2333/2333 2279/2338/2338
+f 2280/2333/2333 2278/2337/2337 1986/2047/2047
+f 1986/2047/2047 2278/2337/2337 1984/2045/2045
+f 2280/2333/2333 2281/2339/2339 2279/2338/2338
+f 2280/2333/2333 2276/2335/2335 2281/2339/2339
+f 2281/2339/2339 2276/2335/2335 2282/2340/2340
+f 2275/2334/2334 2276/2335/2335 2280/2333/2333
+f 2284/2341/2341 2285/2342/2342 2013/2075/2075
+f 2284/2341/2341 2283/2042/2042 2285/2342/2342
+f 2283/2042/2042 2279/2338/2338 2285/2342/2342
+f 2278/2337/2337 2279/2338/2338 1982/2043/2043
+f 2278/2337/2337 1982/2043/2043 1983/2044/2044
+f 2279/2338/2338 2283/2042/2042 1982/2043/2043
+f 2285/2342/2342 2286/2343/2343 2013/2075/2075
+f 2013/2075/2075 2286/2343/2343 2010/2072/2072
+f 2287/2344/2344 2281/2339/2339 2282/2340/2340
+f 2286/2343/2343 2281/2339/2339 2287/2344/2344
+f 2281/2339/2339 2285/2342/2342 2279/2338/2338
+f 2281/2339/2339 2286/2343/2343 2285/2342/2342
+f 1977/2035/2035 2012/2074/2074 1992/2036/2036
+f 1979/2038/2038 2012/2074/2074 1977/2035/2035
+f 1992/2036/2036 2012/2074/2074 1994/2054/2054
+f 2012/2074/2074 2284/2341/2341 2013/2075/2075
+f 2012/2074/2074 1979/2038/2038 2284/2341/2341
+f 2284/2341/2341 1979/2038/2038 2283/2042/2042
+f 1825/1876/1876 2233/1883/1883 1829/1884/1884
+f 2232/2291/2291 2233/1883/1883 1825/1876/1876
+f 2232/2291/2291 2289/1885/1885 2237/2296/2296
+f 2289/1885/1885 2288/2345/2345 2237/2296/2296
+f 2288/2345/2345 2289/1885/1885 1823/1874/1874
+f 2289/1885/1885 2232/2291/2291 1825/1876/1876
+f 2237/2296/2296 2290/2346/2346 2239/2297/2297
+f 2239/2297/2297 2290/2346/2346 2294/2347/2347
+f 2290/2346/2346 2288/2345/2345 1823/1874/1874
+f 2290/2346/2346 2237/2296/2296 2288/2345/2345
+f 2240/2298/2298 2291/2348/2348 2241/2302/2302
+f 2291/2348/2348 2292/2349/2349 2241/2302/2302
+f 2292/2349/2349 2291/2348/2348 2293/1871/1871
+f 2291/2348/2348 2294/2347/2347 2293/1871/1871
+f 2294/2347/2347 2291/2348/2348 2239/2297/2297
+f 2239/2297/2297 2291/2348/2348 2240/2298/2298
+f 2295/2350/2350 2292/2349/2349 2296/2351/2351
+f 2244/2301/2301 2292/2349/2349 2295/2350/2350
+f 2296/2351/2351 2292/2349/2349 2293/1871/1871
+f 2292/2349/2349 2244/2301/2301 2241/2302/2302
+f 2246/2304/2304 2297/1857/1857 2245/2303/2303
+f 2297/1857/1857 2246/2304/2304 2295/2350/2350
+f 2295/2350/2350 2246/2304/2304 2244/2301/2301
+f 2247/2305/2305 2298/2352/2352 2250/2306/2306
+f 1812/1862/1862 2298/2352/2352 1809/1856/1856
+f 1809/1856/1856 2298/2352/2352 2297/1857/1857
+f 2245/2303/2303 2298/2352/2352 2247/2305/2305
+f 2297/1857/1857 2298/2352/2352 2245/2303/2303
+f 2250/2306/2306 2299/2353/2353 2253/2309/2309
+f 2250/2306/2306 1812/1862/1862 2299/2353/2353
+f 2298/2352/2352 1812/1862/1862 2250/2306/2306
+f 2252/2312/2312 2253/2309/2309 2301/2354/2354
+f 2253/2309/2309 2300/2355/2355 2301/2354/2354
+f 2253/2309/2309 2299/2353/2353 2300/2355/2355
+f 2300/2355/2355 2299/2353/2353 1815/1864/1864
+f 2300/2355/2355 1815/1864/1864 1799/1850/1850
+f 1815/1864/1864 2299/2353/2353 1812/1862/1862
+f 2256/2314/2314 1794/1843/1843 1793/1842/1842
+f 2256/2314/2314 2301/2354/2354 1801/1851/1851
+f 2256/2314/2314 1801/1851/1851 1794/1843/1843
+f 1800/1849/1849 2301/2354/2354 2300/2355/2355
+f 1800/1849/1849 2300/2355/2355 1799/1850/1850
+f 1801/1851/1851 2301/2354/2354 1800/1849/1849
+f 2301/2354/2354 2256/2314/2314 2252/2312/2312
+f 2257/2315/2315 1804/1852/1852 1805/1853/1853
+f 1802/1835/1835 1804/1852/1852 1793/1842/1842
+f 1793/1842/1842 1804/1852/1852 2256/2314/2314
+f 1804/1852/1852 2257/2315/2315 2255/2313/2313
+f 2256/2314/2314 1804/1852/1852 2255/2313/2313
+f 2262/2318/2318 2302/1831/1830 2261/2319/2319
+f 2261/2319/2319 2302/1831/1830 1779/1829/1826
+f 1787/1834/1834 2302/1831/1830 2262/2318/2318
+f 2266/2322/2322 2263/2320/2320 2303/2356/2356
+f 2263/2320/2320 2304/2357/2357 2303/2356/2356
+f 2304/2357/2357 2261/2319/2319 1779/1829/1826
+f 2304/2357/2357 2263/2320/2320 2261/2319/2319
+f 2266/2322/2322 2305/2358/2358 2265/2323/2323
+f 2305/2358/2358 2266/2322/2322 2303/2356/2356
+f 2265/2323/2323 2307/2359/2359 2268/2325/2325
+f 2310/2360/2360 2307/2359/2359 2308/2361/2361
+f 2268/2325/2325 2307/2359/2359 2310/2360/2360
+f 2306/2362/2362 2307/2359/2359 2305/2358/2358
+f 2305/2358/2358 2307/2359/2359 2265/2323/2323
+f 2269/2326/2326 2268/2325/2325 2309/2328/2328
+f 2309/2328/2328 2310/2360/2360 2312/2363/2363
+f 2309/2328/2328 2268/2325/2325 2310/2360/2360
+f 2273/2331/2331 2312/2363/2363 2311/2364/2364
+f 2312/2363/2363 2273/2331/2331 2309/2328/2328
+f 2277/2336/2336 2313/2365/2365 2276/2335/2335
+f 2277/2336/2336 2314/2366/2366 2313/2365/2365
+f 2311/2364/2364 2314/2366/2366 2277/2336/2336
+f 2311/2364/2364 2277/2336/2336 2273/2331/2331
+f 2282/2340/2340 2315/2367/2367 2006/2068/2068
+f 2006/2068/2068 2315/2367/2367 2003/2065/2065
+f 2315/2367/2367 2316/2368/2368 2003/2065/2065
+f 2316/2368/2368 2313/2365/2365 2314/2366/2366
+f 2315/2367/2367 2313/2365/2365 2316/2368/2368
+f 2313/2365/2365 2282/2340/2340 2276/2335/2335
+f 2313/2365/2365 2315/2367/2367 2282/2340/2340
+f 2286/2343/2343 2287/2344/2344 2009/2071/2071
+f 2286/2343/2343 2009/2071/2071 2010/2072/2072
+f 2287/2344/2344 2006/2068/2068 2009/2071/2071
+f 2282/2340/2340 2006/2068/2068 2287/2344/2344
+f 2290/2346/2346 1826/1878/1878 2294/2347/2347
+f 1826/1878/1878 1821/1870/1870 2294/2347/2347
+f 1821/1870/1870 1826/1878/1878 1828/1879/1879
+f 1826/1878/1878 2290/2346/2346 1823/1874/1874
+f 2294/2347/2347 1821/1870/1870 2293/1871/1871
+f 2293/1871/1871 1821/1870/1870 1819/1869/1869
+f 2317/1872/1872 2318/2369/2369 2295/2350/2350
+f 2296/2351/2351 2317/1872/1872 2295/2350/2350
+f 2318/2369/2369 2317/1872/1872 1806/1860/1860
+f 1816/1865/1865 2296/2351/2351 2293/1871/1871
+f 2317/1872/1872 2296/2351/2351 1816/1865/1865
+f 1808/1855/1855 2318/2369/2369 1807/1858/1858
+f 2295/2350/2350 2318/2369/2369 1808/1855/1855
+f 2295/2350/2350 1808/1855/1855 2297/1857/1857
+f 1807/1858/1858 2318/2369/2369 1806/1860/1860
+f 2304/2357/2357 2319/2370/2370 2303/2356/2356
+f 2304/2357/2357 1780/1830/1827 2319/2370/2370
+f 2319/2370/2370 1780/1830/1827 1766/1821/1818
+f 1780/1830/1827 2304/2357/2357 1779/1829/1826
+f 2305/2358/2358 2321/2371/2371 2306/2362/2362
+f 2322/2372/2372 2321/2371/2371 2319/2370/2370
+f 2322/2372/2372 2319/2370/2370 2320/2373/2373
+f 2303/2356/2356 2321/2371/2371 2305/2358/2358
+f 2319/2370/2370 2321/2371/2371 2303/2356/2356
+f 2323/2374/2374 2308/2361/2361 2325/2375/2375
+f 2308/2361/2361 2324/2376/2376 2325/2375/2375
+f 2324/2376/2376 2321/2371/2371 2322/2372/2372
+f 2306/2362/2362 2308/2361/2361 2307/2359/2359
+f 2321/2371/2371 2324/2376/2376 2306/2362/2362
+f 2324/2376/2376 2308/2361/2361 2306/2362/2362
+f 2310/2360/2360 2326/2377/2377 2312/2363/2363
+f 2326/2377/2377 2327/2378/2378 2312/2363/2363
+f 2327/2378/2378 2326/2377/2377 2328/2379/2379
+f 2326/2377/2377 2323/2374/2374 2325/2375/2375
+f 2323/2374/2374 2310/2360/2360 2308/2361/2361
+f 2323/2374/2374 2326/2377/2377 2310/2360/2360
+f 2312/2363/2363 2329/2380/2380 2311/2364/2364
+f 2329/2380/2380 2327/2378/2378 2328/2379/2379
+f 2327/2378/2378 2329/2380/2380 2312/2363/2363
+f 2314/2366/2366 2330/2381/2381 2316/2368/2368
+f 2330/2381/2381 2331/2063/2063 2316/2368/2368
+f 2331/2063/2063 2016/2076/2076 2001/2062/2062
+f 2330/2381/2381 2016/2076/2076 2331/2063/2063
+f 2016/2076/2076 2330/2381/2381 2329/2380/2380
+f 2330/2381/2381 2314/2366/2366 2311/2364/2364
+f 2329/2380/2380 2330/2381/2381 2311/2364/2364
+f 2003/2065/2065 2316/2368/2368 2331/2063/2063
+f 2319/2370/2370 2332/2382/2382 2320/2373/2373
+f 2332/2382/2382 1766/1821/1818 1770/1825/1822
+f 1766/1821/1818 2332/2382/2382 2319/2370/2370
+f 2336/2383/2383 2333/2384/2384 2334/2385/2385
+f 2333/2384/2384 2335/2386/2386 2334/2385/2385
+f 2322/2372/2372 2333/2384/2384 2336/2383/2383
+f 2335/2386/2386 2333/2384/2384 2332/2382/2382
+f 2332/2382/2382 2333/2384/2384 2320/2373/2373
+f 2333/2384/2384 2322/2372/2372 2320/2373/2373
+f 2324/2376/2376 2336/2383/2383 2325/2375/2375
+f 2325/2375/2375 2336/2383/2383 2337/2387/2387
+f 2322/2372/2372 2336/2383/2383 2324/2376/2376
+f 2326/2377/2377 2338/2388/2388 2328/2379/2379
+f 2338/2388/2388 2325/2375/2375 2337/2387/2387
+f 2339/2389/2389 2338/2388/2388 2337/2387/2387
+f 2325/2375/2375 2338/2388/2388 2326/2377/2377
+f 2329/2380/2380 2340/2390/2390 2016/2076/2076
+f 2329/2380/2380 2328/2379/2379 2340/2390/2390
+f 2340/2390/2390 2024/2086/2086 2014/2079/2079
+f 2024/2086/2086 2328/2379/2379 2338/2388/2388
+f 2340/2390/2390 2328/2379/2379 2024/2086/2086
+f 2014/2079/2079 2016/2076/2076 2340/2390/2390
+f 2015/2077/2077 2016/2076/2076 2014/2079/2079
+f 2332/2382/2382 2341/2391/2391 2335/2386/2386
+f 2341/2391/2391 2342/2392/2392 2347/2393/2393
+f 2342/2392/2392 2341/2391/2391 2343/2394/2394
+f 1770/1825/1822 2341/2391/2391 2332/2382/2382
+f 2343/2394/2394 2341/2391/2391 1770/1825/1822
+f 2344/2395/2395 2343/2394/2394 1770/1825/1822
+f 2343/2394/2394 2344/2395/2395 2345/2396/2396
+f 2344/2395/2395 1770/1825/1822 1771/1826/1823
+f 2334/2385/2385 2347/2393/2393 2346/2397/2397
+f 2347/2393/2393 2335/2386/2386 2341/2391/2391
+f 2334/2385/2385 2335/2386/2386 2347/2393/2393
+f 2348/2398/2398 2339/2389/2389 2337/2387/2387
+f 2336/2383/2383 2348/2398/2398 2337/2387/2387
+f 2339/2389/2389 2348/2398/2398 2349/2399/2399
+f 2348/2398/2398 2334/2385/2385 2346/2397/2397
+f 2349/2399/2399 2348/2398/2398 2346/2397/2397
+f 2334/2385/2385 2348/2398/2398 2336/2383/2383
+f 2338/2388/2388 2339/2389/2389 2024/2086/2086
+f 2339/2389/2389 2023/2085/2085 2024/2086/2086
+f 2023/2085/2085 2350/2400/2400 2019/2081/2081
+f 2023/2085/2085 2339/2389/2389 2350/2400/2400
+f 2350/2400/2400 2339/2389/2389 2349/2399/2399
+f 1771/1826/1823 2345/2396/2396 2344/2395/2395
+f 1773/1828/1825 2345/2396/2396 1771/1826/1823
+f 2345/2396/2396 1773/1828/1825 2351/2401/2401
+f 2351/2401/2401 1773/1828/1825 2353/2402/2402
+f 2353/2402/2402 1773/1828/1825 1746/1802/1796
+f 2351/2401/2401 2353/2402/2402 2352/2403/2403
+f 2352/2403/2403 2353/2402/2402 2354/2404/2404
+f 2354/2404/2404 1749/1805/1799 1750/1806/1800
+f 1748/1804/1798 2353/2402/2402 1746/1802/1796
+f 1748/1804/1798 2354/2404/2404 2353/2402/2402
+f 1749/1805/1799 2354/2404/2404 1748/1804/1798
+f 2345/2396/2396 2355/2405/2405 2361/2406/2406
+f 2351/2401/2401 2355/2405/2405 2345/2396/2396
+f 2361/2406/2406 2355/2405/2405 2356/2407/2407
+f 2357/2408/2408 2355/2405/2405 2358/2409/2409
+f 2356/2407/2407 2355/2405/2405 2357/2408/2408
+f 2358/2409/2409 2355/2405/2405 2351/2401/2401
+f 2352/2403/2403 2358/2409/2409 2351/2401/2401
+f 2358/2409/2409 2359/2410/2410 2357/2408/2408
+f 2358/2409/2409 2352/2403/2403 2359/2410/2410
+f 2360/2411/2411 2359/2410/2410 2352/2403/2403
+f 2343/2394/2394 2361/2406/2406 2342/2392/2392
+f 2361/2406/2406 2362/2412/2412 2342/2392/2392
+f 2362/2412/2412 2361/2406/2406 2363/2413/2413
+f 2361/2406/2406 2364/2414/2414 2363/2413/2413
+f 2364/2414/2414 2361/2406/2406 2356/2407/2407
+f 2361/2406/2406 2343/2394/2394 2345/2396/2396
+f 2342/2392/2392 2365/2415/2415 2347/2393/2393
+f 2342/2392/2392 2362/2412/2412 2365/2415/2415
+f 2365/2415/2415 2362/2412/2412 2366/2416/2416
+f 2366/2416/2416 2362/2412/2412 2363/2413/2413
+f 2346/2397/2397 2367/2417/2417 2368/2418/2418
+f 2347/2393/2393 2367/2417/2417 2346/2397/2397
+f 2368/2418/2418 2367/2417/2417 2369/2419/2419
+f 2367/2417/2417 2370/2420/2420 2369/2419/2419
+f 2370/2420/2420 2367/2417/2417 2365/2415/2415
+f 2365/2415/2415 2367/2417/2417 2347/2393/2393
+f 2349/2399/2399 2371/2421/2421 2372/2422/2422
+f 2368/2418/2418 2371/2421/2421 2349/2399/2399
+f 2368/2418/2418 2349/2399/2399 2346/2397/2397
+f 2019/2081/2081 2350/2400/2400 2047/2091/2091
+f 2350/2400/2400 2372/2422/2422 2047/2091/2091
+f 2372/2422/2422 2350/2400/2400 2349/2399/2399
+f 2354/2404/2404 2360/2411/2411 2352/2403/2403
+f 2360/2411/2411 2373/2423/2423 2359/2410/2410
+f 2360/2411/2411 1752/1808/1802 2373/2423/2423
+f 1752/1808/1802 2360/2411/2411 2354/2404/2404
+f 1752/1808/1802 2354/2404/2404 1750/1806/1800
+f 1752/1808/1802 2374/2424/2424 2373/2423/2423
+f 1754/1810/1804 1756/1812/1806 2374/2424/2424
+f 1756/1812/1806 1754/1810/1804 1753/1809/1803
+f 1751/1807/1801 2374/2424/2424 1752/1808/1802
+f 1751/1807/1801 1754/1810/1804 2374/2424/2424
+f 2375/2425/2425 2376/2426/2426 2359/2410/2410
+f 2373/2423/2423 2375/2425/2425 2359/2410/2410
+f 2378/2427/2427 2375/2425/2425 2379/2428/2428
+f 2376/2426/2426 2375/2425/2425 2378/2427/2427
+f 2379/2428/2428 2375/2425/2425 2373/2423/2423
+f 2374/2424/2424 2380/2429/2429 2379/2428/2428
+f 2374/2424/2424 2379/2428/2428 2373/2423/2423
+f 2379/2428/2428 2380/2429/2429 2381/2430/2430
+f 2379/2428/2428 2381/2430/2430 2378/2427/2427
+f 2383/2431/2431 2382/2432/2432 2384/2433/2433
+f 2357/2408/2408 2382/2432/2432 2383/2431/2431
+f 2384/2433/2433 2382/2432/2432 2376/2426/2426
+f 2384/2433/2433 2376/2426/2426 2377/2434/2434
+f 2376/2426/2426 2382/2432/2432 2359/2410/2410
+f 2382/2432/2432 2357/2408/2408 2359/2410/2410
+f 2356/2407/2407 2383/2431/2431 2385/2435/2435
+f 2385/2435/2435 2383/2431/2431 2384/2433/2433
+f 2383/2431/2431 2356/2407/2407 2357/2408/2408
+f 2363/2413/2413 2387/2436/2436 2386/2437/2437
+f 2387/2436/2436 2356/2407/2407 2385/2435/2435
+f 2356/2407/2407 2363/2413/2413 2364/2414/2414
+f 2387/2436/2436 2363/2413/2413 2356/2407/2407
+f 2365/2415/2415 2366/2416/2416 2370/2420/2420
+f 2366/2416/2416 2388/2438/2438 2370/2420/2420
+f 2388/2438/2438 2390/2439/2439 2389/2440/2440
+f 2366/2416/2416 2390/2439/2439 2388/2438/2438
+f 2390/2439/2439 2366/2416/2416 2386/2437/2437
+f 2386/2437/2437 2366/2416/2416 2363/2413/2413
+f 2369/2419/2419 2388/2438/2438 2391/2441/2441
+f 2391/2441/2441 2388/2438/2438 2389/2440/2440
+f 2388/2438/2438 2369/2419/2419 2370/2420/2420
+f 2371/2421/2421 2392/2442/2442 2393/2443/2443
+f 2371/2421/2421 2393/2443/2443 2372/2422/2422
+f 2394/2444/2444 2392/2442/2442 2395/2445/2445
+f 2393/2443/2443 2392/2442/2442 2394/2444/2444
+f 2395/2445/2445 2392/2442/2442 2391/2441/2441
+f 2392/2442/2442 2369/2419/2419 2391/2441/2441
+f 2369/2419/2419 2392/2442/2442 2371/2421/2421
+f 2369/2419/2419 2371/2421/2421 2368/2418/2418
+f 2047/2091/2091 2396/2446/2446 2042/2104/2104
+f 2047/2091/2091 2393/2443/2443 2396/2446/2446
+f 2396/2446/2446 2393/2443/2443 2394/2444/2444
+f 2393/2443/2443 2047/2091/2091 2372/2422/2422
+f 1756/1812/1806 2380/2429/2429 2374/2424/2424
+f 1756/1812/1806 2397/2447/2447 2380/2429/2429
+f 2381/2430/2430 2397/2447/2447 2398/1816/1810
+f 2380/2429/2429 2397/2447/2447 2381/2430/2430
+f 2397/2447/2447 1755/1811/1805 2398/1816/1810
+f 1755/1811/1805 2397/2447/2447 1756/1812/1806
+f 2398/1816/1810 2399/2448/2448 2381/2430/2430
+f 2399/2448/2448 2401/2449/2449 2400/2450/2450
+f 2402/2451/2451 2401/2449/2449 2398/1816/1810
+f 2401/2449/2449 2399/2448/2448 2398/1816/1810
+f 1759/1815/1809 2402/2451/2451 2398/1816/1810
+f 1759/1815/1809 2403/2452/2452 2402/2451/2451
+f 2402/2451/2451 2403/2452/2452 2404/2453/2453
+f 2404/2453/2453 2403/2452/2452 2405/2454/2454
+f 2403/2452/2452 1759/1815/1809 1760/1817/1811
+f 2381/2430/2430 2407/2455/2455 2378/2427/2427
+f 2407/2455/2455 2406/2456/2456 2378/2427/2427
+f 2407/2455/2455 2399/2448/2448 2400/2450/2450
+f 2406/2456/2456 2407/2455/2455 2400/2450/2450
+f 2399/2448/2448 2407/2455/2455 2381/2430/2430
+f 2376/2426/2426 2409/2457/2457 2377/2434/2434
+f 2409/2457/2457 2410/2458/2458 2377/2434/2434
+f 2410/2458/2458 2409/2457/2457 2411/2459/2459
+f 2408/2460/2460 2409/2457/2457 2406/2456/2456
+f 2411/2459/2459 2409/2457/2457 2408/2460/2460
+f 2409/2457/2457 2376/2426/2426 2378/2427/2427
+f 2406/2456/2456 2409/2457/2457 2378/2427/2427
+f 2384/2433/2433 2412/2461/2461 2415/2462/2462
+f 2384/2433/2433 2410/2458/2458 2412/2461/2461
+f 2410/2458/2458 2384/2433/2433 2377/2434/2434
+f 2385/2435/2435 2413/2463/2463 2416/2464/2464
+f 2416/2464/2464 2413/2463/2463 2414/2465/2465
+f 2413/2463/2463 2415/2462/2462 2414/2465/2465
+f 2413/2463/2463 2385/2435/2435 2384/2433/2433
+f 2415/2462/2462 2413/2463/2463 2384/2433/2433
+f 2386/2437/2437 2416/2464/2464 2390/2439/2439
+f 2416/2464/2464 2417/2466/2466 2390/2439/2439
+f 2387/2436/2436 2416/2464/2464 2386/2437/2437
+f 2417/2466/2466 2416/2464/2464 2418/2467/2467
+f 2418/2467/2467 2416/2464/2464 2414/2465/2465
+f 2416/2464/2464 2387/2436/2436 2385/2435/2435
+f 2390/2439/2439 2419/2468/2468 2389/2440/2440
+f 2417/2466/2466 2419/2468/2468 2390/2439/2439
+f 2391/2441/2441 2421/2469/2469 2395/2445/2445
+f 2391/2441/2441 2389/2440/2440 2421/2469/2469
+f 2420/2470/2470 2389/2440/2440 2419/2468/2468
+f 2421/2469/2469 2389/2440/2440 2420/2470/2470
+f 2422/2471/2471 2423/2472/2472 2394/2444/2444
+f 2395/2445/2445 2422/2471/2471 2394/2444/2444
+f 2423/2472/2472 2422/2471/2471 2424/2473/2473
+f 2424/2473/2473 2422/2471/2471 2421/2469/2469
+f 2421/2469/2469 2422/2471/2471 2395/2445/2445
+f 2396/2446/2446 2043/2105/2105 2042/2104/2104
+f 2043/2105/2105 2396/2446/2446 2046/2108/2108
+f 2046/2108/2108 2396/2446/2446 2423/2472/2472
+f 2423/2472/2472 2396/2446/2446 2394/2444/2444
+f 1760/1817/1811 2425/1794/1788 2403/2452/2452
+f 1761/1789/1783 2425/1794/1788 1760/1817/1811
+f 2403/2452/2452 2425/1794/1788 2405/2454/2454
+f 2425/1794/1788 1761/1789/1783 1738/1791/1785
+f 2405/2454/2454 2426/2474/2474 2431/2475/2475
+f 2426/2474/2474 2427/2476/2476 2428/1787/1781
+f 2427/2476/2476 2425/1794/1788 1732/1786/1780
+f 2427/2476/2476 2405/2454/2454 2425/1794/1788
+f 2426/2474/2474 2405/2454/2454 2427/2476/2476
+f 1732/1786/1780 2428/1787/1781 2427/2476/2476
+f 1733/1785/1779 2428/1787/1781 1732/1786/1780
+f 2404/2453/2453 2429/2477/2477 2402/2451/2451
+f 2429/2477/2477 2430/2478/2478 2433/2479/2479
+f 2429/2477/2477 2431/2475/2475 2430/2478/2478
+f 2431/2475/2475 2404/2453/2453 2405/2454/2454
+f 2429/2477/2477 2404/2453/2453 2431/2475/2475
+f 2401/2449/2449 2433/2479/2479 2432/2480/2480
+f 2401/2449/2449 2432/2480/2480 2400/2450/2450
+f 2429/2477/2477 2433/2479/2479 2401/2449/2449
+f 2429/2477/2477 2401/2449/2449 2402/2451/2451
+f 2406/2456/2456 2434/2481/2481 2408/2460/2460
+f 2406/2456/2456 2435/2482/2482 2434/2481/2481
+f 2432/2480/2480 2435/2482/2482 2400/2450/2450
+f 2435/2482/2482 2406/2456/2456 2400/2450/2450
+f 2411/2459/2459 2436/2483/2483 2437/2484/2484
+f 2408/2460/2460 2436/2483/2483 2411/2459/2459
+f 2437/2484/2484 2436/2483/2483 2438/2485/2485
+f 2437/2484/2484 2438/2485/2485 2094/2161/2161
+f 2438/2485/2485 2436/2483/2483 2434/2481/2481
+f 2436/2483/2483 2408/2460/2460 2434/2481/2481
+f 2412/2461/2461 2095/2160/2160 2439/2486/2486
+f 2437/2484/2484 2095/2160/2160 2412/2461/2461
+f 2095/2160/2160 2437/2484/2484 2094/2161/2161
+f 2411/2459/2459 2437/2484/2484 2410/2458/2458
+f 2437/2484/2484 2412/2461/2461 2410/2458/2458
+f 2414/2465/2465 2439/2486/2486 2440/2487/2487
+f 2415/2462/2462 2439/2486/2486 2414/2465/2465
+f 2440/2487/2487 2439/2486/2486 2088/2152/2152
+f 2088/2152/2152 2439/2486/2486 2095/2160/2160
+f 2088/2152/2152 2095/2160/2160 2091/2153/2153
+f 2412/2461/2461 2439/2486/2486 2415/2462/2462
+f 2418/2467/2467 2441/2488/2488 2442/2489/2489
+f 2441/2488/2488 2440/2487/2487 2443/2490/2490
+f 2442/2489/2489 2441/2488/2488 2443/2490/2490
+f 2440/2487/2487 2441/2488/2488 2418/2467/2467
+f 2440/2487/2487 2418/2467/2467 2414/2465/2465
+f 2419/2468/2468 2442/2489/2489 2420/2470/2470
+f 2442/2489/2489 2444/2491/2491 2420/2470/2470
+f 2444/2491/2491 2445/2492/2492 2446/2493/2493
+f 2445/2492/2492 2444/2491/2491 2443/2490/2490
+f 2444/2491/2491 2442/2489/2489 2443/2490/2490
+f 2418/2467/2467 2442/2489/2489 2417/2466/2466
+f 2442/2489/2489 2419/2468/2468 2417/2466/2466
+f 2420/2470/2470 2447/2494/2494 2421/2469/2469
+f 2447/2494/2494 2420/2470/2470 2448/2495/2495
+f 2446/2493/2493 2420/2470/2470 2444/2491/2491
+f 2448/2495/2495 2420/2470/2470 2446/2493/2493
+f 2424/2473/2473 2449/2496/2496 2423/2472/2472
+f 2449/2496/2496 2424/2473/2473 2450/2497/2497
+f 2450/2497/2497 2424/2473/2473 2447/2494/2494
+f 2447/2494/2494 2424/2473/2473 2421/2469/2469
+f 2046/2108/2108 2451/2498/2498 2452/2499/2499
+f 2452/2499/2499 2451/2498/2498 2453/2500/2500
+f 2450/2497/2497 2451/2498/2498 2449/2496/2496
+f 2453/2500/2500 2451/2498/2498 2450/2497/2497
+f 2449/2496/2496 2451/2498/2498 2046/2108/2108
+f 2449/2496/2496 2046/2108/2108 2423/2472/2472
+f 2037/2099/2099 2045/2107/2107 2452/2499/2499
+f 2452/2499/2499 2044/2106/2106 2046/2108/2108
+f 2452/2499/2499 2045/2107/2107 2044/2106/2106
+f 2454/2501/2501 2458/2502/2502 2431/2475/2475
+f 2426/2474/2474 2454/2501/2501 2431/2475/2475
+f 2458/2502/2502 2454/2501/2501 2455/2503/2503
+f 2454/2501/2501 2456/2504/2504 2455/2503/2503
+f 2454/2501/2501 2426/2474/2474 2428/1787/1781
+f 2428/1787/1781 2457/2505/2505 2454/2501/2501
+f 2454/2501/2501 2457/2505/2505 2456/2504/2504
+f 1723/1775/1769 2457/2505/2505 2428/1787/1781
+f 2431/2475/2475 2458/2502/2502 2430/2478/2478
+f 2430/2478/2478 2458/2502/2502 2459/2506/2506
+f 2460/2507/2507 2461/2508/2508 2432/2480/2480
+f 2433/2479/2479 2460/2507/2507 2432/2480/2480
+f 2460/2507/2507 2459/2506/2506 2461/2508/2508
+f 2459/2506/2506 2460/2507/2507 2430/2478/2478
+f 2430/2478/2478 2460/2507/2507 2433/2479/2479
+f 2462/2509/2509 2463/1746/1740 2434/2481/2481
+f 2435/2482/2482 2462/2509/2509 2434/2481/2481
+f 2463/1746/1740 2462/2509/2509 1694/1745/1739
+f 1694/1745/1739 2462/2509/2509 2461/2508/2508
+f 2432/2480/2480 2462/2509/2509 2435/2482/2482
+f 2461/2508/2508 2462/2509/2509 2432/2480/2480
+f 2438/2485/2485 1696/1748/1742 2094/2161/2161
+f 1696/1748/1742 1695/1747/1741 1699/1749/1743
+f 1696/1748/1742 2438/2485/2485 1695/1747/1741
+f 1695/1747/1741 2438/2485/2485 2463/1746/1740
+f 2463/1746/1740 2438/2485/2485 2434/2481/2481
+f 2440/2487/2487 2085/2149/2149 2464/2510/2510
+f 2440/2487/2487 2464/2510/2510 2443/2490/2490
+f 2464/2510/2510 2085/2149/2149 2087/2151/2151
+f 2464/2510/2510 2087/2151/2151 2089/2154/2154
+f 2085/2149/2149 2440/2487/2487 2088/2152/2152
+f 2446/2493/2493 2445/2492/2492 2465/2511/2511
+f 2465/2511/2511 2445/2492/2492 2464/2510/2510
+f 2465/2511/2511 2464/2510/2510 2089/2154/2154
+f 2464/2510/2510 2445/2492/2492 2443/2490/2490
+f 2448/2495/2495 2467/2512/2512 2447/2494/2494
+f 2467/2512/2512 2448/2495/2495 2466/2513/2513
+f 2466/2513/2513 2448/2495/2495 2446/2493/2493
+f 2466/2513/2513 2446/2493/2493 2465/2511/2511
+f 2450/2497/2497 2467/2512/2512 2470/2514/2514
+f 2470/2514/2514 2467/2512/2512 2468/2515/2515
+f 2467/2512/2512 2469/2516/2516 2468/2515/2515
+f 2469/2516/2516 2467/2512/2512 2466/2513/2513
+f 2467/2512/2512 2450/2497/2497 2447/2494/2494
+f 2453/2500/2500 2470/2514/2514 2471/2517/2517
+f 2470/2514/2514 2453/2500/2500 2450/2497/2497
+f 2037/2099/2099 2472/2518/2518 2035/2097/2097
+f 2035/2097/2097 2472/2518/2518 2473/2519/2519
+f 2035/2097/2097 2473/2519/2519 2059/2121/2121
+f 2471/2517/2517 2472/2518/2518 2453/2500/2500
+f 2473/2519/2519 2472/2518/2518 2471/2517/2517
+f 2453/2500/2500 2472/2518/2518 2452/2499/2499
+f 2472/2518/2518 2037/2099/2099 2452/2499/2499
+f 2457/2505/2505 2474/2520/2520 2456/2504/2504
+f 2474/2520/2520 2476/1778/1772 2475/2521/2521
+f 2476/1778/1772 2474/2520/2520 1722/1774/1768
+f 1722/1774/1768 2457/2505/2505 1723/1775/1769
+f 1722/1774/1768 2474/2520/2520 2457/2505/2505
+f 2456/2504/2504 2477/2522/2522 2455/2503/2503
+f 2475/2521/2521 2477/2522/2522 2474/2520/2520
+f 2474/2520/2520 2477/2522/2522 2456/2504/2504
+f 2458/2502/2502 2479/2523/2523 2459/2506/2506
+f 2479/2523/2523 2478/2524/2524 2480/2525/2525
+f 2478/2524/2524 2455/2503/2503 2477/2522/2522
+f 2478/2524/2524 2479/2523/2523 2455/2503/2503
+f 2455/2503/2503 2479/2523/2523 2458/2502/2502
+f 2461/2508/2508 2481/2526/2526 1694/1745/1739
+f 2459/2506/2506 2481/2526/2526 2461/2508/2508
+f 1692/1743/1737 2481/2526/2526 2482/2527/2527
+f 1694/1745/1739 2481/2526/2526 1692/1743/1737
+f 2482/2527/2527 2481/2526/2526 2480/2525/2525
+f 2481/2526/2526 2479/2523/2523 2480/2525/2525
+f 2479/2523/2523 2481/2526/2526 2459/2506/2506
+f 2465/2511/2511 2483/2155/2155 2484/2528/2528
+f 2484/2528/2528 2483/2155/2155 2485/2529/2529
+f 2483/2155/2155 2486/2530/2530 2485/2529/2529
+f 2486/2530/2530 2483/2155/2155 2076/2140/2140
+f 2089/2154/2154 2483/2155/2155 2465/2511/2511
+f 2484/2528/2528 2487/2531/2531 2466/2513/2513
+f 2487/2531/2531 2484/2528/2528 2488/2532/2532
+f 2488/2532/2532 2484/2528/2528 2485/2529/2529
+f 2484/2528/2528 2466/2513/2513 2465/2511/2511
+f 2469/2516/2516 2489/2533/2533 2468/2515/2515
+f 2468/2515/2515 2489/2533/2533 2490/2534/2534
+f 2487/2531/2531 2489/2533/2533 2469/2516/2516
+f 2487/2531/2531 2469/2516/2516 2466/2513/2513
+f 2470/2514/2514 2491/2535/2535 2471/2517/2517
+f 2491/2535/2535 2490/2534/2534 2492/2536/2536
+f 2491/2535/2535 2468/2515/2515 2490/2534/2534
+f 2468/2515/2515 2491/2535/2535 2470/2514/2514
+f 2058/2120/2120 2059/2121/2121 2057/2119/2119
+f 2059/2121/2121 2473/2519/2519 2057/2119/2119
+f 2492/2536/2536 2473/2519/2519 2491/2535/2535
+f 2057/2119/2119 2473/2519/2519 2492/2536/2536
+f 2491/2535/2535 2473/2519/2519 2471/2517/2517
+f 2476/1778/1772 2493/2537/2537 2475/2521/2521
+f 2476/1778/1772 1728/1782/1776 2493/2537/2537
+f 2504/1770/1764 2493/2537/2537 1728/1782/1776
+f 1725/1777/1771 1728/1782/1776 2476/1778/1772
+f 2477/2522/2522 1703/1755/1749 2478/2524/2524
+f 2477/2522/2522 2495/2538/2538 1703/1755/1749
+f 2494/1754/1748 2495/2538/2538 2493/2537/2537
+f 2493/2537/2537 2495/2538/2538 2475/2521/2521
+f 2495/2538/2538 2477/2522/2522 2475/2521/2521
+f 2480/2525/2525 2496/2539/2539 1687/1738/1732
+f 2478/2524/2524 2496/2539/2539 2480/2525/2525
+f 1687/1738/1732 2496/2539/2539 1685/1736/1730
+f 2496/2539/2539 1703/1755/1749 1685/1736/1730
+f 1703/1755/1749 2496/2539/2539 2478/2524/2524
+f 2482/2527/2527 1691/1744/1738 1692/1743/1737
+f 1691/1744/1738 2482/2527/2527 1687/1738/1732
+f 1691/1744/1738 1687/1738/1732 1686/1737/1731
+f 1687/1738/1732 2482/2527/2527 2480/2525/2525
+f 2485/2529/2529 2497/2144/2144 2488/2532/2532
+f 2486/2530/2530 2497/2144/2144 2485/2529/2529
+f 2488/2532/2532 2497/2144/2144 2081/2146/2146
+f 2077/2138/2138 2486/2530/2530 2076/2140/2140
+f 2497/2144/2144 2486/2530/2530 2077/2138/2138
+f 2487/2531/2531 2488/2532/2532 2489/2533/2533
+f 2488/2532/2532 2498/2540/2540 2489/2533/2533
+f 2498/2540/2540 2488/2532/2532 2081/2146/2146
+f 2498/2540/2540 2499/2148/2148 2490/2534/2534
+f 2489/2533/2533 2498/2540/2540 2490/2534/2534
+f 2082/2145/2145 2498/2540/2540 2081/2146/2146
+f 2499/2148/2148 2498/2540/2540 2082/2145/2145
+f 2492/2536/2536 2500/2541/2541 2502/2542/2542
+f 2490/2534/2534 2500/2541/2541 2492/2536/2536
+f 2502/2542/2542 2500/2541/2541 2501/2543/2543
+f 2499/2148/2148 2500/2541/2541 2490/2534/2534
+f 2057/2119/2119 2502/2542/2542 2056/2115/2115
+f 2056/2115/2115 2503/2544/2544 2054/2116/2116
+f 2056/2115/2115 2502/2542/2542 2503/2544/2544
+f 2503/2544/2544 2502/2542/2542 2501/2543/2543
+f 2502/2542/2542 2057/2119/2119 2492/2536/2536
+f 2493/2537/2537 2504/1770/1764 2494/1754/1748
+f 2494/1754/1748 2504/1770/1764 1701/1752/1746
+f 2504/1770/1764 1707/1758/1752 1701/1752/1746
+f 2495/2538/2538 2494/1754/1748 1702/1753/1747
+f 2495/2538/2538 1702/1753/1747 1703/1755/1749
+f 2501/2543/2543 2067/2129/2129 2069/2131/2131
+f 2501/2543/2543 2084/2147/2147 2067/2129/2129
+f 2084/2147/2147 2501/2543/2543 2500/2541/2541
+f 2084/2147/2147 2500/2541/2541 2499/2148/2148
+f 2503/2544/2544 2049/2110/2110 2054/2116/2116
+f 2049/2110/2110 2503/2544/2544 2053/2114/2114
+f 2069/2131/2131 2503/2544/2544 2501/2543/2543
+f 2053/2114/2114 2503/2544/2544 2069/2131/2131
+f 2506/2545/2545 2507/2546/2546 2800/2547/2547
+f 2508/2548/2548 2512/2549/2549 2506/2545/2545
+f 2508/2548/2548 2506/2545/2545 2505/2550/2550
+f 2512/2549/2549 2507/2546/2546 2506/2545/2545
+f 2507/2546/2546 2510/2551/2551 2511/2552/2552
+f 2507/2546/2546 2511/2552/2552 2509/2553/2553
+f 2510/2551/2551 2507/2546/2546 2512/2549/2549
+f 2804/2554/2554 2514/2555/2555 2515/2556/2556
+f 2511/2552/2552 2520/2557/2557 2804/2554/2554
+f 2511/2552/2552 2804/2554/2554 2513/2558/2558
+f 2520/2557/2557 2514/2555/2555 2804/2554/2554
+f 2516/2559/2559 2518/2560/2560 2519/2561/2561
+f 2516/2559/2559 2519/2561/2561 2517/2562/2562
+f 2515/2556/2556 2514/2555/2555 2516/2559/2559
+f 2514/2555/2555 2518/2560/2560 2516/2559/2559
+f 2519/2561/2561 2526/2563/2563 2808/2564/2564
+f 2519/2561/2561 2808/2564/2564 2517/2562/2562
+f 2526/2563/2563 2522/2565/2565 2521/2566/2566
+f 2526/2563/2563 2521/2566/2566 2808/2564/2564
+f 2809/2567/2567 2524/2568/2568 2525/2569/2569
+f 2809/2567/2567 2525/2569/2569 2523/2570/2570
+f 2521/2566/2566 2522/2565/2565 2524/2568/2568
+f 2521/2566/2566 2524/2568/2568 2809/2567/2567
+f 2525/2569/2569 2533/2571/2571 2527/2572/2572
+f 2525/2569/2569 2527/2572/2572 2523/2570/2570
+f 2533/2571/2571 2528/2573/2573 2527/2572/2572
+f 2813/2574/2574 2530/2575/2575 2531/2576/2576
+f 2813/2574/2574 2531/2576/2576 2529/2577/2577
+f 2528/2573/2573 2530/2575/2575 2813/2574/2574
+f 2530/2575/2575 2528/2573/2573 2532/2578/2578
+f 2532/2578/2578 2528/2573/2573 2533/2571/2571
+f 2535/2579/2579 2536/2580/2580 2817/2581/2581
+f 2531/2576/2576 2540/2582/2582 2535/2579/2579
+f 2531/2576/2576 2535/2579/2579 2534/2583/2583
+f 2540/2582/2582 2536/2580/2580 2535/2579/2579
+f 2818/2584/2584 2538/2585/2585 2537/2586/2586
+f 2817/2581/2581 2536/2580/2580 2818/2584/2584
+f 2536/2580/2580 2538/2585/2585 2818/2584/2584
+f 2537/2586/2586 2538/2585/2585 2539/2587/2587
+f 2542/2588/2588 2543/2589/2589 2822/2590/2590
+f 2539/2587/2587 2547/2591/2591 2542/2588/2588
+f 2539/2587/2587 2542/2588/2588 2541/2592/2592
+f 2547/2591/2591 2543/2589/2589 2542/2588/2588
+f 2824/2593/2593 2545/2594/2594 2544/2595/2595
+f 2822/2590/2590 2543/2589/2589 2824/2593/2593
+f 2543/2589/2589 2545/2594/2594 2824/2593/2593
+f 2544/2595/2595 2545/2594/2594 2546/2596/2596
+f 2544/2595/2595 2554/2597/2597 2548/2598/2598
+f 2554/2597/2597 2549/2599/2599 2548/2598/2598
+f 2828/2600/2600 2551/2601/2601 2550/2602/2602
+f 2549/2599/2599 2551/2601/2601 2828/2600/2600
+f 2551/2601/2601 2549/2599/2599 2553/2603/2603
+f 2550/2602/2602 2551/2601/2601 2552/2604/2604
+f 2554/2597/2597 2544/2595/2595 2546/2596/2596
+f 2553/2603/2603 2549/2599/2599 2554/2597/2597
+f 2556/2605/2605 2557/2606/2606 2831/2607/2607
+f 2552/2604/2604 2562/2608/2608 2556/2605/2605
+f 2552/2604/2604 2556/2605/2605 2555/2609/2609
+f 2562/2608/2608 2557/2606/2606 2556/2605/2605
+f 2558/2610/2610 2560/2611/2611 2561/2612/2612
+f 2558/2610/2610 2561/2612/2612 2559/2613/2613
+f 2831/2607/2607 2557/2606/2606 2558/2610/2610
+f 2557/2606/2606 2560/2611/2611 2558/2610/2610
+f 2561/2612/2612 2570/2614/2614 2835/2615/2615
+f 2561/2612/2612 2835/2615/2615 2563/2616/2616
+f 2570/2614/2614 2565/2617/2617 2564/2618/2618
+f 2570/2614/2614 2564/2618/2618 2835/2615/2615
+f 2566/2619/2619 2568/2620/2620 2567/2621/2621
+f 2564/2618/2618 2565/2617/2617 2568/2620/2620
+f 2564/2618/2618 2568/2620/2620 2566/2619/2619
+f 2567/2621/2621 2568/2620/2620 2569/2622/2622
+f 2839/2623/2623 2571/2624/2624 2572/2625/2625
+f 2567/2621/2621 2576/2626/2626 2839/2623/2623
+f 2576/2626/2626 2571/2624/2624 2839/2623/2623
+f 2573/2627/2627 2574/2628/2628 2843/2629/2629
+f 2573/2627/2627 2575/2630/2630 2574/2628/2628
+f 2572/2625/2625 2571/2624/2624 2573/2627/2627
+f 2571/2624/2624 2575/2630/2630 2573/2627/2627
+f 2576/2626/2626 2567/2621/2621 2569/2622/2622
+f 2574/2628/2628 2577/2631/2631 2843/2629/2629
+f 2577/2631/2631 2578/2632/2632 2845/2633/2633
+f 2574/2628/2628 2581/2634/2634 2577/2631/2631
+f 2581/2634/2634 2578/2632/2632 2577/2631/2631
+f 2846/2635/2635 2579/2636/2636 2848/2637/2637
+f 2846/2635/2635 2580/2638/2638 2579/2636/2636
+f 2845/2633/2633 2578/2632/2632 2846/2635/2635
+f 2578/2632/2632 2580/2638/2638 2846/2635/2635
+f 2579/2636/2636 2582/2639/2639 2848/2637/2637
+f 2582/2639/2639 2583/2640/2640 2584/2641/2641
+f 2579/2636/2636 2588/2642/2642 2582/2639/2639
+f 2588/2642/2642 2583/2640/2640 2582/2639/2639
+f 2851/2643/2643 2586/2644/2644 2587/2645/2645
+f 2851/2643/2643 2587/2645/2645 2585/2646/2646
+f 2584/2641/2641 2583/2640/2640 2851/2643/2643
+f 2583/2640/2640 2586/2644/2644 2851/2643/2643
+f 2590/2647/2647 2591/2648/2648 2592/2649/2649
+f 2587/2645/2645 2591/2648/2648 2590/2647/2647
+f 2587/2645/2645 2590/2647/2647 2589/2650/2650
+f 2593/2651/2651 2594/2652/2652 2595/2653/2653
+f 2593/2651/2651 2595/2653/2653 2857/2654/2654
+f 2592/2649/2649 2591/2648/2648 2593/2651/2651
+f 2591/2648/2648 2594/2652/2652 2593/2651/2651
+f 2859/2655/2655 2596/2656/2656 2597/2657/2657
+f 2595/2653/2653 2602/2658/2658 2859/2655/2655
+f 2595/2653/2653 2859/2655/2655 2858/2659/2659
+f 2602/2658/2658 2596/2656/2656 2859/2655/2655
+f 2598/2660/2660 2600/2661/2661 2599/2662/2662
+f 2597/2657/2657 2596/2656/2656 2598/2660/2660
+f 2596/2656/2656 2600/2661/2661 2598/2660/2660
+f 2599/2662/2662 2600/2661/2661 2601/2663/2663
+f 2599/2662/2662 2610/2664/2664 2603/2665/2665
+f 2610/2664/2664 2604/2666/2666 2603/2665/2665
+f 2605/2667/2667 2607/2668/2668 2608/2669/2669
+f 2605/2667/2667 2608/2669/2669 2606/2670/2670
+f 2604/2666/2666 2607/2668/2668 2605/2667/2667
+f 2607/2668/2668 2604/2666/2666 2609/2671/2671
+f 2610/2664/2664 2599/2662/2662 2601/2663/2663
+f 2609/2671/2671 2604/2666/2666 2610/2664/2664
+f 2612/2672/2672 2613/2673/2673 2614/2674/2674
+f 2611/2675/2675 2618/2676/2676 2612/2672/2672
+f 2618/2676/2676 2613/2673/2673 2612/2672/2672
+f 2615/2677/2677 2617/2678/2678 2619/2679/2679
+f 2615/2677/2677 2619/2679/2679 2616/2680/2680
+f 2614/2674/2674 2613/2673/2673 2615/2677/2677
+f 2613/2673/2673 2617/2678/2678 2615/2677/2677
+f 2618/2676/2676 2611/2675/2675 2608/2669/2669
+f 2619/2679/2679 2872/2681/2681 2875/2682/2682
+f 2872/2681/2681 2620/2683/2683 2873/2684/2684
+f 2619/2679/2679 2625/2685/2685 2872/2681/2681
+f 2625/2685/2685 2620/2683/2683 2872/2681/2681
+f 2621/2686/2686 2623/2687/2687 2624/2688/2688
+f 2621/2686/2686 2624/2688/2688 2622/2689/2689
+f 2873/2684/2684 2620/2683/2683 2621/2686/2686
+f 2620/2683/2683 2623/2687/2687 2621/2686/2686
+f 2878/2690/2690 2626/2691/2691 2627/2692/2692
+f 2624/2688/2688 2631/2693/2693 2878/2690/2690
+f 2624/2688/2688 2878/2690/2690 2622/2689/2689
+f 2631/2693/2693 2626/2691/2691 2878/2690/2690
+f 2880/2694/2694 2629/2695/2695 2628/2696/2696
+f 2627/2692/2692 2626/2691/2691 2880/2694/2694
+f 2626/2691/2691 2629/2695/2695 2880/2694/2694
+f 2628/2696/2696 2629/2695/2695 2630/2697/2697
+f 2632/2698/2698 2633/2699/2699 2634/2700/2700
+f 2628/2696/2696 2637/2701/2701 2632/2698/2698
+f 2637/2701/2701 2633/2699/2699 2632/2698/2698
+f 2884/2702/2702 2635/2703/2703 2886/2704/2704
+f 2884/2702/2702 2636/2705/2705 2635/2703/2703
+f 2634/2700/2700 2633/2699/2699 2884/2702/2702
+f 2633/2699/2699 2636/2705/2705 2884/2702/2702
+f 2637/2701/2701 2628/2696/2696 2630/2697/2697
+f 2638/2706/2706 2639/2707/2707 2640/2708/2708
+f 2635/2703/2703 2645/2709/2709 2638/2706/2706
+f 2645/2709/2709 2639/2707/2707 2638/2706/2706
+f 2641/2710/2710 2643/2711/2711 2642/2712/2712
+f 2640/2708/2708 2639/2707/2707 2641/2710/2710
+f 2639/2707/2707 2643/2711/2711 2641/2710/2710
+f 2642/2712/2712 2643/2711/2711 2644/2713/2713
+f 2894/2714/2714 2647/2715/2715 2648/2716/2716
+f 2644/2713/2713 2653/2717/2717 2894/2714/2714
+f 2644/2713/2713 2894/2714/2714 2646/2718/2718
+f 2653/2717/2717 2647/2715/2715 2894/2714/2714
+f 2649/2719/2719 2651/2720/2720 2650/2721/2721
+f 2648/2716/2716 2647/2715/2715 2649/2719/2719
+f 2647/2715/2715 2651/2720/2720 2649/2719/2719
+f 2650/2721/2721 2651/2720/2720 2652/2722/2722
+f 2654/2723/2723 2655/2724/2724 2899/2725/2725
+f 2650/2721/2721 2659/2726/2726 2654/2723/2723
+f 2659/2726/2726 2655/2724/2724 2654/2723/2723
+f 2901/2727/2727 2657/2728/2728 2658/2729/2729
+f 2901/2727/2727 2658/2729/2729 2656/2730/2730
+f 2899/2725/2725 2655/2724/2724 2901/2727/2727
+f 2655/2724/2724 2657/2728/2728 2901/2727/2727
+f 2659/2726/2726 2650/2721/2721 2652/2722/2722
+f 2661/2731/2731 2662/2732/2732 2904/2733/2733
+f 2658/2729/2729 2666/2734/2734 2661/2731/2731
+f 2658/2729/2729 2661/2731/2731 2660/2735/2735
+f 2666/2734/2734 2662/2732/2732 2661/2731/2731
+f 2663/2736/2736 2664/2737/2737 2665/2738/2738
+f 2904/2733/2733 2662/2732/2732 2663/2736/2736
+f 2662/2732/2732 2664/2737/2737 2663/2736/2736
+f 2665/2738/2738 2674/2739/2739 2908/2740/2740
+f 2665/2738/2738 2908/2740/2740 2667/2741/2741
+f 2674/2739/2739 2669/2742/2742 2668/2743/2743
+f 2674/2739/2739 2668/2743/2743 2908/2740/2740
+f 2670/2744/2744 2672/2745/2745 2671/2746/2746
+f 2668/2743/2743 2669/2742/2742 2672/2745/2745
+f 2668/2743/2743 2672/2745/2745 2670/2744/2744
+f 2671/2746/2746 2672/2745/2745 2673/2747/2747
+f 2912/2748/2748 2675/2749/2749 2676/2750/2750
+f 2671/2746/2746 2679/2751/2751 2912/2748/2748
+f 2679/2751/2751 2675/2749/2749 2912/2748/2748
+f 2914/2752/2752 2677/2753/2753 2916/2754/2754
+f 2914/2752/2752 2678/2755/2755 2677/2753/2753
+f 2676/2750/2750 2675/2749/2749 2914/2752/2752
+f 2675/2749/2749 2678/2755/2755 2914/2752/2752
+f 2679/2751/2751 2671/2746/2746 2673/2747/2747
+f 2677/2753/2753 2680/2756/2756 2916/2754/2754
+f 2680/2756/2756 2681/2757/2757 2918/2758/2758
+f 2677/2753/2753 2685/2759/2759 2680/2756/2756
+f 2685/2759/2759 2681/2757/2757 2680/2756/2756
+f 2920/2760/2760 2683/2761/2761 2684/2762/2762
+f 2920/2760/2760 2684/2762/2762 2682/2763/2763
+f 2918/2758/2758 2681/2757/2757 2920/2760/2760
+f 2681/2757/2757 2683/2761/2761 2920/2760/2760
+f 2686/2764/2764 2687/2765/2765 2924/2766/2766
+f 2684/2762/2762 2692/2767/2767 2686/2764/2764
+f 2692/2767/2767 2687/2765/2765 2686/2764/2764
+f 2688/2768/2768 2690/2769/2769 2691/2770/2770
+f 2688/2768/2768 2691/2770/2770 2689/2771/2771
+f 2924/2766/2766 2687/2765/2765 2688/2768/2768
+f 2687/2765/2765 2690/2769/2769 2688/2768/2768
+f 2928/2772/2772 2694/2773/2773 2929/2774/2774
+f 2691/2770/2770 2699/2775/2775 2928/2772/2772
+f 2691/2770/2770 2928/2772/2772 2693/2776/2776
+f 2699/2775/2775 2694/2773/2773 2928/2772/2772
+f 2695/2777/2777 2697/2778/2778 2696/2779/2779
+f 2929/2774/2774 2694/2773/2773 2695/2777/2777
+f 2694/2773/2773 2697/2778/2778 2695/2777/2777
+f 2696/2779/2779 2697/2778/2778 2698/2780/2780
+f 2700/2781/2781 2701/2782/2782 2702/2783/2783
+f 2696/2779/2779 2705/2784/2784 2700/2781/2781
+f 2705/2784/2784 2701/2782/2782 2700/2781/2781
+f 2935/2785/2785 2703/2786/2786 2704/2787/2787
+f 2935/2785/2785 2704/2787/2787 2936/2788/2788
+f 2702/2783/2783 2701/2782/2782 2935/2785/2785
+f 2701/2782/2782 2703/2786/2786 2935/2785/2785
+f 2705/2784/2784 2696/2779/2779 2698/2780/2780
+f 2707/2789/2789 2708/2790/2790 2939/2791/2791
+f 2704/2787/2787 2712/2792/2792 2707/2789/2789
+f 2704/2787/2787 2707/2789/2789 2706/2793/2793
+f 2712/2792/2792 2708/2790/2790 2707/2789/2789
+f 2709/2794/2794 2710/2795/2795 2711/2796/2796
+f 2939/2791/2791 2708/2790/2790 2709/2794/2794
+f 2708/2790/2790 2710/2795/2795 2709/2794/2794
+f 2943/2797/2797 2714/2798/2798 2715/2799/2799
+f 2711/2796/2796 2720/2800/2800 2943/2797/2797
+f 2711/2796/2796 2943/2797/2797 2713/2801/2801
+f 2720/2800/2800 2714/2798/2798 2943/2797/2797
+f 2716/2802/2802 2718/2803/2803 2717/2804/2804
+f 2715/2799/2799 2714/2798/2798 2716/2802/2802
+f 2714/2798/2798 2718/2803/2803 2716/2802/2802
+f 2717/2804/2804 2718/2803/2803 2719/2805/2805
+f 2947/2806/2806 2721/2807/2807 2948/2808/2808
+f 2717/2804/2804 2725/2809/2809 2947/2806/2806
+f 2725/2809/2809 2721/2807/2807 2947/2806/2806
+f 2949/2810/2810 2723/2811/2811 2722/2812/2812
+f 2948/2808/2808 2721/2807/2807 2949/2810/2810
+f 2721/2807/2807 2723/2811/2811 2949/2810/2810
+f 2722/2812/2812 2723/2811/2811 2724/2813/2813
+f 2725/2809/2809 2717/2804/2804 2719/2805/2805
+f 2726/2814/2814 2727/2815/2815 2728/2816/2816
+f 2722/2812/2812 2732/2817/2817 2726/2814/2814
+f 2732/2817/2817 2727/2815/2815 2726/2814/2814
+f 2953/2818/2818 2730/2819/2819 2731/2820/2820
+f 2953/2818/2818 2731/2820/2820 2729/2821/2821
+f 2728/2816/2816 2727/2815/2815 2953/2818/2818
+f 2727/2815/2815 2730/2819/2819 2953/2818/2818
+f 2732/2817/2817 2722/2812/2812 2724/2813/2813
+f 2734/2822/2822 2735/2823/2823 2736/2824/2824
+f 2731/2820/2820 2735/2823/2823 2734/2822/2822
+f 2731/2820/2820 2734/2822/2822 2733/2825/2825
+f 2737/2826/2826 2739/2827/2827 2740/2828/2828
+f 2737/2826/2826 2740/2828/2828 2738/2829/2829
+f 2736/2824/2824 2735/2823/2823 2737/2826/2826
+f 2735/2823/2823 2739/2827/2827 2737/2826/2826
+f 2740/2828/2828 2747/2830/2830 2960/2831/2831
+f 2740/2828/2828 2960/2831/2831 2741/2832/2832
+f 2747/2830/2830 2743/2833/2833 2742/2834/2834
+f 2747/2830/2830 2742/2834/2834 2960/2831/2831
+f 2744/2835/2835 2745/2836/2836 2964/2837/2837
+f 2744/2835/2835 2746/2838/2838 2745/2836/2836
+f 2742/2834/2834 2743/2833/2833 2746/2838/2838
+f 2742/2834/2834 2746/2838/2838 2744/2835/2835
+f 2745/2836/2836 2748/2839/2839 2964/2837/2837
+f 2748/2839/2839 2749/2840/2840 2966/2841/2841
+f 2745/2836/2836 2754/2842/2842 2748/2839/2839
+f 2754/2842/2842 2749/2840/2840 2748/2839/2839
+f 2750/2843/2843 2752/2844/2844 2753/2845/2845
+f 2750/2843/2843 2753/2845/2845 2751/2846/2846
+f 2966/2841/2841 2749/2840/2840 2750/2843/2843
+f 2749/2840/2840 2752/2844/2844 2750/2843/2843
+f 2756/2847/2847 2757/2848/2848 2970/2849/2849
+f 2753/2845/2845 2762/2850/2850 2756/2847/2847
+f 2753/2845/2845 2756/2847/2847 2755/2851/2851
+f 2762/2850/2850 2757/2848/2848 2756/2847/2847
+f 2758/2852/2852 2760/2853/2853 2761/2854/2854
+f 2758/2852/2852 2761/2854/2854 2759/2855/2855
+f 2970/2849/2849 2757/2848/2848 2758/2852/2852
+f 2757/2848/2848 2760/2853/2853 2758/2852/2852
+f 2973/2856/2856 2764/2857/2857 2765/2858/2858
+f 2761/2854/2854 2769/2859/2859 2973/2856/2856
+f 2761/2854/2854 2973/2856/2856 2763/2860/2860
+f 2769/2859/2859 2764/2857/2857 2973/2856/2856
+f 2766/2861/2861 2767/2862/2862 2977/2863/2863
+f 2766/2861/2861 2768/2864/2864 2767/2862/2862
+f 2765/2858/2858 2764/2857/2857 2766/2861/2861
+f 2764/2857/2857 2768/2864/2864 2766/2861/2861
+f 2767/2862/2862 2978/2865/2865 2977/2863/2863
+f 2978/2865/2865 2770/2866/2866 2771/2867/2867
+f 2767/2862/2862 2774/2868/2868 2978/2865/2865
+f 2774/2868/2868 2770/2866/2866 2978/2865/2865
+f 2980/2869/2869 2772/2870/2870 2982/2871/2871
+f 2980/2869/2869 2773/2872/2872 2772/2870/2870
+f 2771/2867/2867 2770/2866/2866 2980/2869/2869
+f 2770/2866/2866 2773/2872/2872 2980/2869/2869
+f 2772/2870/2870 2775/2873/2873 2982/2871/2871
+f 2775/2873/2873 2776/2874/2874 2984/2875/2875
+f 2772/2870/2870 2780/2876/2876 2775/2873/2873
+f 2780/2876/2876 2776/2874/2874 2775/2873/2873
+f 2985/2877/2877 2778/2878/2878 2779/2879/2879
+f 2985/2877/2877 2779/2879/2879 2777/2880/2880
+f 2984/2875/2875 2776/2874/2874 2985/2877/2877
+f 2776/2874/2874 2778/2878/2878 2985/2877/2877
+f 2782/2881/2881 2783/2882/2882 2989/2883/2883
+f 2779/2879/2879 2782/2881/2881 2781/2884/2884
+f 2779/2879/2879 2783/2882/2882 2782/2881/2881
+f 2784/2885/2885 2786/2886/2886 2787/2887/2887
+f 2784/2885/2885 2787/2887/2887 2785/2888/2888
+f 2989/2883/2883 2783/2882/2882 2784/2885/2885
+f 2783/2882/2882 2786/2886/2886 2784/2885/2885
+f 2993/2889/2889 2788/2890/2890 2789/2891/2891
+f 2787/2887/2887 2793/2892/2892 2993/2889/2889
+f 2787/2887/2887 2993/2889/2889 2992/2893/2893
+f 2793/2892/2892 2788/2890/2890 2993/2889/2889
+f 2790/2894/2894 2791/2895/2895 2997/2896/2896
+f 2790/2894/2894 2792/2897/2897 2791/2895/2895
+f 2789/2891/2891 2788/2890/2890 2790/2894/2894
+f 2788/2890/2890 2792/2897/2897 2790/2894/2894
+f 2791/2895/2895 2794/2898/2898 2997/2896/2896
+f 2794/2898/2898 2795/2899/2899 2999/2900/2900
+f 2791/2895/2895 2797/2901/2901 2794/2898/2898
+f 2797/2901/2901 2795/2899/2899 2794/2898/2898
+f 3001/2902/2902 2796/2903/2903 2508/2548/2548
+f 3001/2902/2902 2508/2548/2548 3002/2904/2904
+f 2999/2900/2900 2795/2899/2899 3001/2902/2902
+f 2795/2899/2899 2796/2903/2903 3001/2902/2902
+f 2505/2550/2550 2506/2545/2545 2799/2905/2905
+f 2505/2550/2550 2799/2905/2905 2798/2906/2906
+f 2506/2545/2545 2800/2547/2547 2799/2905/2905
+f 2801/2907/2907 2509/2553/2553 2802/2908/2908
+f 2509/2553/2553 2801/2907/2907 2507/2546/2546
+f 2801/2907/2907 2800/2547/2547 2507/2546/2546
+f 2803/2909/2909 2804/2554/2554 3009/2910/2910
+f 2804/2554/2554 2805/2911/2911 3009/2910/2910
+f 2513/2558/2558 2804/2554/2554 2803/2909/2909
+f 2806/2912/2912 2516/2559/2559 2517/2562/2562
+f 2806/2912/2912 2517/2562/2562 2807/2913/2913
+f 2805/2911/2911 2516/2559/2559 2806/2912/2912
+f 2516/2559/2559 2805/2911/2911 2515/2556/2556
+f 2515/2556/2556 2805/2911/2911 2804/2554/2554
+f 2807/2913/2913 2808/2564/2564 3014/2914/2914
+f 2808/2564/2564 2521/2566/2566 3016/2915/2915
+f 2808/2564/2564 3016/2915/2915 3014/2914/2914
+f 2517/2562/2562 2808/2564/2564 2807/2913/2913
+f 3018/2916/2916 2809/2567/2567 2810/2917/2917
+f 2809/2567/2567 2523/2570/2570 2810/2917/2917
+f 3016/2915/2915 2521/2566/2566 2809/2567/2567
+f 3016/2915/2915 2809/2567/2567 3018/2916/2916
+f 2523/2570/2570 2527/2572/2572 2811/2918/2918
+f 2523/2570/2570 2811/2918/2918 2810/2917/2917
+f 2527/2572/2572 2812/2919/2919 2811/2918/2918
+f 3023/2920/2920 2813/2574/2574 2814/2921/2921
+f 2813/2574/2574 2529/2577/2577 2814/2921/2921
+f 2812/2919/2919 2813/2574/2574 3023/2920/2920
+f 2813/2574/2574 2812/2919/2919 2528/2573/2573
+f 2528/2573/2573 2812/2919/2919 2527/2572/2572
+f 2815/2922/2922 2535/2579/2579 2816/2923/2923
+f 2535/2579/2579 2817/2581/2581 2816/2923/2923
+f 3028/2924/2924 2818/2584/2584 2819/2925/2925
+f 2817/2581/2581 2818/2584/2584 3028/2924/2924
+f 2819/2925/2925 2818/2584/2584 2537/2586/2586
+f 2535/2579/2579 2815/2922/2922 2534/2583/2583
+f 2821/2926/2926 2822/2590/2590 3032/2927/2927
+f 2541/2592/2592 2542/2588/2588 2821/2926/2926
+f 2541/2592/2592 2821/2926/2926 2820/2928/2928
+f 2542/2588/2588 2822/2590/2590 2821/2926/2926
+f 2823/2929/2929 2824/2593/2593 2825/2930/2930
+f 3032/2927/2927 2822/2590/2590 2824/2593/2593
+f 3032/2927/2927 2824/2593/2593 2823/2929/2929
+f 2825/2930/2930 2824/2593/2593 2544/2595/2595
+f 2825/2930/2930 2548/2598/2598 2826/2931/2931
+f 2548/2598/2598 2827/2932/2932 2826/2931/2931
+f 3037/2933/2933 2828/2600/2600 2829/2934/2934
+f 2827/2932/2932 2828/2600/2600 3037/2933/2933
+f 2828/2600/2600 2827/2932/2932 2549/2599/2599
+f 2829/2934/2934 2828/2600/2600 2550/2602/2602
+f 2548/2598/2598 2825/2930/2930 2544/2595/2595
+f 2549/2599/2599 2827/2932/2932 2548/2598/2598
+f 2555/2609/2609 2556/2605/2605 2830/2935/2935
+f 2555/2609/2609 2830/2935/2935 3039/2936/2936
+f 2556/2605/2605 2831/2607/2607 2830/2935/2935
+f 2832/2937/2937 2558/2610/2610 2833/2938/2938
+f 2831/2607/2607 2558/2610/2610 2832/2937/2937
+f 2833/2938/2938 2558/2610/2610 2559/2613/2613
+f 2834/2939/2939 2835/2615/2615 3045/2940/2940
+f 2834/2939/2939 3045/2940/2940 3044/2941/2941
+f 2835/2615/2615 2836/2942/2942 3045/2940/2940
+f 2835/2615/2615 2564/2618/2618 2836/2942/2942
+f 2837/2943/2943 2566/2619/2619 2838/2944/2944
+f 2836/2942/2942 2564/2618/2618 2566/2619/2619
+f 2836/2942/2942 2566/2619/2619 2837/2943/2943
+f 2838/2944/2944 2566/2619/2619 2567/2621/2621
+f 2835/2615/2615 2834/2939/2939 2563/2616/2616
+f 2838/2944/2944 2839/2623/2623 3049/2945/2945
+f 2839/2623/2623 2840/2946/2946 3049/2945/2945
+f 2841/2947/2947 2573/2627/2627 2843/2629/2629
+f 2841/2947/2947 2843/2629/2629 2842/2948/2948
+f 2840/2946/2946 2573/2627/2627 2841/2947/2947
+f 2573/2627/2627 2840/2946/2946 2572/2625/2625
+f 2839/2623/2623 2838/2944/2944 2567/2621/2621
+f 2572/2625/2625 2840/2946/2946 2839/2623/2623
+f 2844/2949/2949 2845/2633/2633 3055/2950/2950
+f 2843/2629/2629 2844/2949/2949 2842/2948/2948
+f 3056/2951/2951 2846/2635/2635 2847/2952/2952
+f 2846/2635/2635 2848/2637/2637 2847/2952/2952
+f 3055/2950/2950 2845/2633/2633 2846/2635/2635
+f 3055/2950/2950 2846/2635/2635 3056/2951/2951
+f 2577/2631/2631 2844/2949/2949 2843/2629/2629
+f 2845/2633/2633 2844/2949/2949 2577/2631/2631
+f 2848/2637/2637 2582/2639/2639 2849/2953/2953
+f 2848/2637/2637 2849/2953/2953 2847/2952/2952
+f 2582/2639/2639 2584/2641/2641 2850/2954/2954
+f 2582/2639/2639 2850/2954/2954 2849/2953/2953
+f 3061/2955/2955 2851/2643/2643 2852/2956/2956
+f 3061/2955/2955 2852/2956/2956 3062/2957/2957
+f 2850/2954/2954 2851/2643/2643 3061/2955/2955
+f 2850/2954/2954 2584/2641/2641 2851/2643/2643
+f 2852/2956/2956 2851/2643/2643 2585/2646/2646
+f 2853/2958/2958 2590/2647/2647 2854/2959/2959
+f 2590/2647/2647 2592/2649/2649 2855/2960/2960
+f 2590/2647/2647 2855/2960/2960 2854/2959/2959
+f 2856/2961/2961 2857/2654/2654 3067/2962/2962
+f 2855/2960/2960 2592/2649/2649 2856/2961/2961
+f 2857/2654/2654 2856/2961/2961 2593/2651/2651
+f 2856/2961/2961 2592/2649/2649 2593/2651/2651
+f 2590/2647/2647 2853/2958/2958 2589/2650/2650
+f 2858/2659/2659 2859/2655/2655 3069/2963/2963
+f 2858/2659/2659 3069/2963/2963 3072/2964/2964
+f 2859/2655/2655 2860/2965/2965 3069/2963/2963
+f 2861/2966/2966 2598/2660/2660 2862/2967/2967
+f 2860/2965/2965 2598/2660/2660 2861/2966/2966
+f 2862/2967/2967 2598/2660/2660 2599/2662/2662
+f 2598/2660/2660 2860/2965/2965 2597/2657/2657
+f 2597/2657/2657 2860/2965/2965 2859/2655/2655
+f 2862/2967/2967 2603/2665/2665 2863/2968/2968
+f 2603/2665/2665 2864/2969/2969 2863/2968/2968
+f 2865/2970/2970 2606/2670/2670 3078/2971/2971
+f 2605/2667/2667 2864/2969/2969 2604/2666/2666
+f 2606/2670/2670 2865/2970/2970 2605/2667/2667
+f 2865/2970/2970 2864/2969/2969 2605/2667/2667
+f 2603/2665/2665 2862/2967/2967 2599/2662/2662
+f 2604/2666/2666 2864/2969/2969 2603/2665/2665
+f 2867/2972/2972 2614/2674/2674 2868/2973/2973
+f 2869/2974/2974 2615/2677/2677 2870/2975/2975
+f 2868/2973/2973 2614/2674/2674 2615/2677/2677
+f 2868/2973/2973 2615/2677/2677 2869/2974/2974
+f 2870/2975/2975 2615/2677/2677 2616/2680/2680
+f 2612/2672/2672 2867/2972/2972 2866/2976/2976
+f 2612/2672/2672 2866/2976/2976 2611/2675/2675
+f 2614/2674/2674 2867/2972/2972 2612/2672/2672
+f 2871/2977/2977 2872/2681/2681 3084/2978/2978
+f 2872/2681/2681 2873/2684/2684 2874/2979/2979
+f 2872/2681/2681 2874/2979/2979 3084/2978/2978
+f 2875/2682/2682 2872/2681/2681 2871/2977/2977
+f 2876/2980/2980 2621/2686/2686 2622/2689/2689
+f 2876/2980/2980 2622/2689/2689 2877/2981/2981
+f 2874/2979/2979 2873/2684/2684 2876/2980/2980
+f 2873/2684/2684 2621/2686/2686 2876/2980/2980
+f 2877/2981/2981 2878/2690/2690 3089/2982/2982
+f 2878/2690/2690 2879/2983/2983 3089/2982/2982
+f 2622/2689/2689 2878/2690/2690 2877/2981/2981
+f 3093/2984/2984 2880/2694/2694 2881/2985/2985
+f 2879/2983/2983 2880/2694/2694 3093/2984/2984
+f 2881/2985/2985 2880/2694/2694 2628/2696/2696
+f 2880/2694/2694 2879/2983/2983 2627/2692/2692
+f 2627/2692/2692 2879/2983/2983 2878/2690/2690
+f 2881/2985/2985 2632/2698/2698 2882/2986/2986
+f 2632/2698/2698 2883/2987/2987 2882/2986/2986
+f 3097/2988/2988 2884/2702/2702 2885/2989/2989
+f 2884/2702/2702 2886/2704/2704 2885/2989/2989
+f 2883/2987/2987 2884/2702/2702 3097/2988/2988
+f 2884/2702/2702 2883/2987/2987 2634/2700/2700
+f 2632/2698/2698 2881/2985/2985 2628/2696/2696
+f 2634/2700/2700 2883/2987/2987 2632/2698/2698
+f 2887/2990/2990 2638/2706/2706 2888/2991/2991
+f 2638/2706/2706 2640/2708/2708 2889/2992/2992
+f 2638/2706/2706 2889/2992/2992 2888/2991/2991
+f 2890/2993/2993 2641/2710/2710 2892/2994/2994
+f 2890/2993/2993 2892/2994/2994 2891/2995/2995
+f 2889/2992/2992 2640/2708/2708 2641/2710/2710
+f 2889/2992/2992 2641/2710/2710 2890/2993/2993
+f 2892/2994/2994 2641/2710/2710 2642/2712/2712
+f 2893/2996/2996 2894/2714/2714 3105/2997/2997
+f 2894/2714/2714 2895/2998/2998 3105/2997/2997
+f 2646/2718/2718 2894/2714/2714 2893/2996/2996
+f 2896/2999/2999 2649/2719/2719 2897/3000/3000
+f 2895/2998/2998 2649/2719/2719 2896/2999/2999
+f 2897/3000/3000 2649/2719/2719 2650/2721/2721
+f 2649/2719/2719 2895/2998/2998 2648/2716/2716
+f 2648/2716/2716 2895/2998/2998 2894/2714/2714
+f 2898/3001/3001 2899/2725/2725 2900/3002/3002
+f 2897/3000/3000 2654/2723/2723 2898/3001/3001
+f 2654/2723/2723 2899/2725/2725 2898/3001/3001
+f 3112/3003/3003 2901/2727/2727 3113/3004/3004
+f 2901/2727/2727 2656/2730/2730 3113/3004/3004
+f 2900/3002/3002 2899/2725/2725 2901/2727/2727
+f 2900/3002/3002 2901/2727/2727 3112/3003/3003
+f 2654/2723/2723 2897/3000/3000 2650/2721/2721
+f 2660/2735/2735 2661/2731/2731 2903/3005/3005
+f 2660/2735/2735 2903/3005/3005 2902/3006/3006
+f 2661/2731/2731 2904/2733/2733 2903/3005/3005
+f 2905/3007/3007 2663/2736/2736 2906/3008/3008
+f 2905/3007/3007 2904/2733/2733 2663/2736/2736
+f 2907/3009/3009 2908/2740/2740 3120/3010/3010
+f 2908/2740/2740 2668/2743/2743 2909/3011/3011
+f 2908/2740/2740 2909/3011/3011 3120/3010/3010
+f 2910/3012/3012 2670/2744/2744 2911/3013/3013
+f 2909/3011/3011 2668/2743/2743 2910/3012/3012
+f 2668/2743/2743 2670/2744/2744 2910/3012/3012
+f 2911/3013/3013 2670/2744/2744 2671/2746/2746
+f 2908/2740/2740 2907/3009/3009 2667/2741/2741
+f 2911/3013/3013 2912/2748/2748 3124/3014/3014
+f 2912/2748/2748 2913/3015/3015 3124/3014/3014
+f 3128/3016/3016 2914/2752/2752 2915/3017/3017
+f 2914/2752/2752 2916/2754/2754 2915/3017/3017
+f 2913/3015/3015 2914/2752/2752 3128/3016/3016
+f 2914/2752/2752 2913/3015/3015 2676/2750/2750
+f 2912/2748/2748 2911/3013/3013 2671/2746/2746
+f 2676/2750/2750 2913/3015/3015 2912/2748/2748
+f 2917/3018/3018 2918/2758/2758 2919/3019/3019
+f 2916/2754/2754 2680/2756/2756 2917/3018/3018
+f 2916/2754/2754 2917/3018/3018 2915/3017/3017
+f 2680/2756/2756 2918/2758/2758 2917/3018/3018
+f 3133/3020/3020 2920/2760/2760 2921/3021/3021
+f 2919/3019/3019 2918/2758/2758 2920/2760/2760
+f 2919/3019/3019 2920/2760/2760 3133/3020/3020
+f 2921/3021/3021 2920/2760/2760 2682/2763/2763
+f 2686/2764/2764 2923/3022/3022 2922/3023/3023
+f 2925/3024/3024 2688/2768/2768 2689/2771/2771
+f 2925/3024/3024 2689/2771/2771 2926/3025/3025
+f 2924/2766/2766 2688/2768/2768 2925/3024/3024
+f 2924/2766/2766 2923/3022/3022 2686/2764/2764
+f 2927/3026/3026 2928/2772/2772 3141/3027/3027
+f 2928/2772/2772 2929/2774/2774 2930/3028/3028
+f 2928/2772/2772 2930/3028/3028 3141/3027/3027
+f 2693/2776/2776 2928/2772/2772 2927/3026/3026
+f 2931/3029/3029 2695/2777/2777 2932/3030/3030
+f 2930/3028/3028 2929/2774/2774 2931/3029/3029
+f 2929/2774/2774 2695/2777/2777 2931/3029/3029
+f 2932/3030/3030 2695/2777/2777 2696/2779/2779
+f 2932/3030/3030 2700/2781/2781 2933/3031/3031
+f 2700/2781/2781 2934/3032/3032 2933/3031/3031
+f 3149/3033/3033 2935/2785/2785 2936/2788/2788
+f 3149/3033/3033 2936/2788/2788 3151/3034/3034
+f 2934/3032/3032 2935/2785/2785 3149/3033/3033
+f 2935/2785/2785 2934/3032/3032 2702/2783/2783
+f 2700/2781/2781 2932/3030/3030 2696/2779/2779
+f 2702/2783/2783 2934/3032/3032 2700/2781/2781
+f 2937/3035/3035 2707/2789/2789 2938/3036/3036
+f 2707/2789/2789 2939/2791/2791 2938/3036/3036
+f 2940/3037/3037 2709/2794/2794 2941/3038/3038
+f 2939/2791/2791 2709/2794/2794 2940/3037/3037
+f 2707/2789/2789 2937/3035/3035 2706/2793/2793
+f 2942/3039/3039 2943/2797/2797 3158/3040/3040
+f 2943/2797/2797 2944/3041/3041 3158/3040/3040
+f 2713/2801/2801 2943/2797/2797 2942/3039/3039
+f 2945/3042/3042 2716/2802/2802 2946/3043/3043
+f 2944/3041/3041 2716/2802/2802 2945/3042/3042
+f 2946/3043/3043 2716/2802/2802 2717/2804/2804
+f 2716/2802/2802 2944/3041/3041 2715/2799/2799
+f 2715/2799/2799 2944/3041/3041 2943/2797/2797
+f 2946/3043/3043 2947/2806/2806 3162/3044/3044
+f 2947/2806/2806 2948/2808/2808 3164/3045/3045
+f 2947/2806/2806 3164/3045/3045 3162/3044/3044
+f 3166/3046/3046 2949/2810/2810 2950/3047/3047
+f 3164/3045/3045 2948/2808/2808 2949/2810/2810
+f 3164/3045/3045 2949/2810/2810 3166/3046/3046
+f 2950/3047/3047 2949/2810/2810 2722/2812/2812
+f 2947/2806/2806 2946/3043/3043 2717/2804/2804
+f 2950/3047/3047 2726/2814/2814 2951/3048/3048
+f 2726/2814/2814 2952/3049/3049 2951/3048/3048
+f 3171/3050/3050 2953/2818/2818 2954/3051/3051
+f 2953/2818/2818 2729/2821/2821 2954/3051/3051
+f 2952/3049/3049 2953/2818/2818 3171/3050/3050
+f 2953/2818/2818 2952/3049/3049 2728/2816/2816
+f 2726/2814/2814 2950/3047/3047 2722/2812/2812
+f 2728/2816/2816 2952/3049/3049 2726/2814/2814
+f 2955/3052/3052 2734/2822/2822 2956/3053/3053
+f 2734/2822/2822 2736/2824/2824 2956/3053/3053
+f 2957/3054/3054 2737/2826/2826 2958/3055/3055
+f 2956/3053/3053 2736/2824/2824 2737/2826/2826
+f 2956/3053/3053 2737/2826/2826 2957/3054/3054
+f 2958/3055/3055 2737/2826/2826 2738/2829/2829
+f 2734/2822/2822 2955/3052/3052 2733/2825/2825
+f 2959/3056/3056 2960/2831/2831 3180/3057/3057
+f 2960/2831/2831 2742/2834/2834 2961/3058/3058
+f 2960/2831/2831 2961/3058/3058 3180/3057/3057
+f 2741/2832/2832 2960/2831/2831 2959/3056/3056
+f 2962/3059/3059 2744/2835/2835 2964/2837/2837
+f 2962/3059/3059 2964/2837/2837 2963/3060/3060
+f 2961/3058/3058 2742/2834/2834 2962/3059/3059
+f 2742/2834/2834 2744/2835/2835 2962/3059/3059
+f 2964/2837/2837 2748/2839/2839 2965/3061/3061
+f 2964/2837/2837 2965/3061/3061 2963/3060/3060
+f 2748/2839/2839 2966/2841/2841 2965/3061/3061
+f 2967/3062/3062 2750/2843/2843 2751/2846/2846
+f 2967/3062/3062 2751/2846/2846 2968/3063/3063
+f 2966/2841/2841 2750/2843/2843 2967/3062/3062
+f 2969/3064/3064 2756/2847/2847 3189/3065/3065
+f 2756/2847/2847 2970/2849/2849 3189/3065/3065
+f 2971/3066/3066 2758/2852/2852 2759/2855/2855
+f 2970/2849/2849 2758/2852/2852 2971/3066/3066
+f 2756/2847/2847 2969/3064/3064 2755/2851/2851
+f 2972/3067/3067 2973/2856/2856 3194/3068/3068
+f 2973/2856/2856 2974/3069/3069 3194/3068/3068
+f 2763/2860/2860 2973/2856/2856 2972/3067/3067
+f 2973/2856/2856 2765/2858/2858 2974/3069/3069
+f 2975/3070/3070 2766/2861/2861 2977/2863/2863
+f 2975/3070/3070 2977/2863/2863 2976/3071/3071
+f 2974/3069/3069 2765/2858/2858 2766/2861/2861
+f 2974/3069/3069 2766/2861/2861 2975/3070/3070
+f 2976/3071/3071 2978/2865/2865 3199/3072/3072
+f 2978/2865/2865 2979/3073/3073 3199/3072/3072
+f 2977/2863/2863 2978/2865/2865 2976/3071/3071
+f 3203/3074/3074 2980/2869/2869 2981/3075/3075
+f 2980/2869/2869 2982/2871/2871 2981/3075/3075
+f 2979/3073/3073 2980/2869/2869 3203/3074/3074
+f 2980/2869/2869 2979/3073/3073 2771/2867/2867
+f 2771/2867/2867 2979/3073/3073 2978/2865/2865
+f 2982/2871/2871 2775/2873/2873 2983/3076/3076
+f 2982/2871/2871 2983/3076/3076 2981/3075/3075
+f 2775/2873/2873 2984/2875/2875 2983/3076/3076
+f 3208/3077/3077 2985/2877/2877 2986/3078/3078
+f 2985/2877/2877 2777/2880/2880 2986/3078/3078
+f 2984/2875/2875 2985/2877/2877 3208/3077/3077
+f 2987/3079/3079 2782/2881/2881 2988/3080/3080
+f 2782/2881/2881 2989/2883/2883 2988/3080/3080
+f 2990/3081/3081 2784/2885/2885 2991/3082/3082
+f 2989/2883/2883 2784/2885/2885 2990/3081/3081
+f 2991/3082/3082 2784/2885/2885 2785/2888/2888
+f 2782/2881/2881 2987/3079/3079 2781/2884/2884
+f 2992/2893/2893 2993/2889/2889 3216/3083/3083
+f 2992/2893/2893 3216/3083/3083 3215/3084/3084
+f 2993/2889/2889 2994/3085/3085 3216/3083/3083
+f 2995/3086/3086 2790/2894/2894 2997/2896/2896
+f 2995/3086/3086 2997/2896/2896 2996/3087/3087
+f 2994/3085/3085 2790/2894/2894 2995/3086/3086
+f 2790/2894/2894 2994/3085/3085 2789/2891/2891
+f 2789/2891/2891 2994/3085/3085 2993/2889/2889
+f 2998/3088/3088 2999/2900/2900 3000/3089/3089
+f 2997/2896/2896 2794/2898/2898 2998/3088/3088
+f 2997/2896/2896 2998/3088/3088 2996/3087/3087
+f 2794/2898/2898 2999/2900/2900 2998/3088/3088
+f 3223/3090/3090 3001/2902/2902 3002/2904/2904
+f 3223/3090/3090 3002/2904/2904 3225/3091/3091
+f 3000/3089/3089 2999/2900/2900 3001/2902/2902
+f 3000/3089/3089 3001/2902/2902 3223/3090/3090
+f 2802/2908/2908 3006/3092/3092 2801/2907/2907
+f 3006/3092/3092 3005/3093/3093 2800/2547/2547
+f 3006/3092/3092 2800/2547/2547 2801/2907/2907
+f 3007/3094/3094 3006/3092/3092 2802/2908/2908
+f 2799/2905/2905 3004/3095/3095 2798/2906/2906
+f 3004/3095/3095 3003/3096/3096 2798/2906/2906
+f 2800/2547/2547 3005/3093/3093 3004/3095/3095
+f 2800/2547/2547 3004/3095/3095 2799/2905/2905
+f 3008/3097/3097 3009/2910/2910 3010/3098/3098
+f 3009/2910/2910 3011/3099/3099 3010/3098/3098
+f 2807/2913/2913 3012/3100/3100 2806/2912/2912
+f 3012/3100/3100 2805/2911/2911 2806/2912/2912
+f 3013/3101/3101 3012/3100/3100 2807/2913/2913
+f 3012/3100/3100 3011/3099/3099 2805/2911/2911
+f 3009/2910/2910 3008/3097/3097 2803/2909/2909
+f 2805/2911/2911 3011/3099/3099 3009/2910/2910
+f 3013/3101/3101 3014/2914/2914 3015/3102/3102
+f 3014/2914/2914 3016/2915/2915 3237/3103/3103
+f 3014/2914/2914 3237/3103/3103 3015/3102/3102
+f 3017/3104/3104 3018/2916/2916 3019/3105/3105
+f 3018/2916/2916 2810/2917/2917 3019/3105/3105
+f 3237/3103/3103 3016/2915/2915 3018/2916/2916
+f 3237/3103/3103 3018/2916/2916 3017/3104/3104
+f 3014/2914/2914 3013/3101/3101 2807/2913/2913
+f 2810/2917/2917 3020/3106/3106 3019/3105/3105
+f 3022/3107/3107 3023/2920/2920 3243/3108/3108
+f 3023/2920/2920 2814/2921/2921 3243/3108/3108
+f 3021/3109/3109 3023/2920/2920 3022/3107/3107
+f 3023/2920/2920 3021/3109/3109 2812/2919/2919
+f 2811/2918/2918 3020/3106/3106 2810/2917/2917
+f 2812/2919/2919 3020/3106/3106 2811/2918/2918
+f 2812/2919/2919 3021/3109/3109 3020/3106/3106
+f 3027/3110/3110 3028/2924/2924 3029/3111/3111
+f 3026/3112/3112 3028/2924/2924 3027/3110/3110
+f 3029/3111/3111 3028/2924/2924 2819/2925/2925
+f 3028/2924/2924 3026/3112/3112 2817/2581/2581
+f 2816/2923/2923 3025/3113/3113 2815/2922/2922
+f 3025/3113/3113 3024/3114/3114 2815/2922/2922
+f 2817/2581/2581 3026/3112/3112 3025/3113/3113
+f 2817/2581/2581 3025/3113/3113 2816/2923/2923
+f 2820/2928/2928 2821/2926/2926 3031/3115/3115
+f 2820/2928/2928 3031/3115/3115 3030/3116/3116
+f 2821/2926/2926 3032/2927/2927 3031/3115/3115
+f 3033/3117/3117 2823/2929/2929 2825/2930/2930
+f 3033/3117/3117 2825/2930/2930 3252/3118/3118
+f 3032/2927/2927 2823/2929/2929 3033/3117/3117
+f 2825/2930/2930 3034/3119/3119 3252/3118/3118
+f 3036/3120/3120 3037/2933/2933 3038/3121/3121
+f 3035/3122/3122 3037/2933/2933 3036/3120/3120
+f 3038/3121/3121 3037/2933/2933 2829/2934/2934
+f 3037/2933/2933 3035/3122/3122 2827/2932/2932
+f 2826/2931/2931 3034/3119/3119 2825/2930/2930
+f 2827/2932/2932 3034/3119/3119 2826/2931/2931
+f 2827/2932/2932 3035/3122/3122 3034/3119/3119
+f 3039/2936/2936 3040/3123/3123 3257/3124/3124
+f 2833/2938/2938 3042/3125/3125 2832/2937/2937
+f 3042/3125/3125 3041/3126/3126 2831/2607/2607
+f 3042/3125/3125 2831/2607/2607 2832/2937/2937
+f 3043/3127/3127 3042/3125/3125 2833/2938/2938
+f 2830/2935/2935 3040/3123/3123 3039/2936/2936
+f 2831/2607/2607 3041/3126/3126 2830/2935/2935
+f 3041/3126/3126 3040/3123/3123 2830/2935/2935
+f 3044/2941/2941 3045/2940/2940 3265/3128/3128
+f 3044/2941/2941 3265/3128/3128 3262/3129/3129
+f 3045/2940/2940 2836/2942/2942 3046/3130/3130
+f 3045/2940/2940 3046/3130/3130 3265/3128/3128
+f 3047/3131/3131 2838/2944/2944 3048/3132/3132
+f 3046/3130/3130 2836/2942/2942 3047/3131/3131
+f 2838/2944/2944 3047/3131/3131 2837/2943/2943
+f 3047/3131/3131 2836/2942/2942 2837/2943/2943
+f 3048/3132/3132 3049/2945/2945 3050/3133/3133
+f 3049/2945/2945 3051/3134/3134 3050/3133/3133
+f 2838/2944/2944 3049/2945/2945 3048/3132/3132
+f 3052/3135/3135 2842/2948/2948 3053/3136/3136
+f 2842/2948/2948 3052/3135/3135 2841/2947/2947
+f 3052/3135/3135 2840/2946/2946 2841/2947/2947
+f 3052/3135/3135 3051/3134/3134 2840/2946/2946
+f 2840/2946/2946 3051/3134/3134 3049/2945/2945
+f 3054/3137/3137 3055/2950/2950 3271/3138/3138
+f 2842/2948/2948 3054/3137/3137 3053/3136/3136
+f 3273/3139/3139 3056/2951/2951 3057/3140/3140
+f 3056/2951/2951 2847/2952/2952 3057/3140/3140
+f 3271/3138/3138 3055/2950/2950 3056/2951/2951
+f 3271/3138/3138 3056/2951/2951 3273/3139/3139
+f 2844/2949/2949 3054/3137/3137 2842/2948/2948
+f 3055/2950/2950 3054/3137/3137 2844/2949/2949
+f 2847/2952/2952 3058/3141/3141 3057/3140/3140
+f 3058/3141/3141 2850/2954/2954 3059/3142/3142
+f 3060/3143/3143 3061/2955/2955 3062/2957/2957
+f 3060/3143/3143 3062/2957/2957 3277/3144/3144
+f 3059/3142/3142 3061/2955/2955 3060/3143/3143
+f 3059/3142/3142 2850/2954/2954 3061/2955/2955
+f 2849/2953/2953 3058/3141/3141 2847/2952/2952
+f 2850/2954/2954 3058/3141/3141 2849/2953/2953
+f 3064/3145/3145 2855/2960/2960 3065/3146/3146
+f 3066/3147/3147 3067/2962/2962 3282/3148/3148
+f 3065/3146/3146 2855/2960/2960 3066/3147/3147
+f 3067/2962/2962 3066/3147/3147 2856/2961/2961
+f 3066/3147/3147 2855/2960/2960 2856/2961/2961
+f 2854/2959/2959 3064/3145/3145 2853/2958/2958
+f 3064/3145/3145 3063/3149/3149 2853/2958/2958
+f 2855/2960/2960 3064/3145/3145 2854/2959/2959
+f 3068/3150/3150 3069/2963/2963 3070/3151/3151
+f 3069/2963/2963 3071/3152/3152 3070/3151/3151
+f 3072/2964/2964 3069/2963/2963 3068/3150/3150
+f 3073/3153/3153 2861/2966/2966 2862/2967/2967
+f 3073/3153/3153 2862/2967/2967 3074/3154/3154
+f 3071/3152/3152 2861/2966/2966 3073/3153/3153
+f 2861/2966/2966 3071/3152/3152 2860/2965/2965
+f 2860/2965/2965 3071/3152/3152 3069/2963/2963
+f 2862/2967/2967 2863/2968/2968 3075/3155/3155
+f 2862/2967/2967 3075/3155/3155 3074/3154/3154
+f 2863/2968/2968 3076/3156/3156 3075/3155/3155
+f 3077/3157/3157 3078/2971/2971 3290/3158/3158
+f 3078/2971/2971 3077/3157/3157 2865/2970/2970
+f 3077/3157/3157 3076/3156/3156 2864/2969/2969
+f 3077/3157/3157 2864/2969/2969 2865/2970/2970
+f 2864/2969/2969 3076/3156/3156 2863/2968/2968
+f 2866/2976/2976 3079/3159/3159 3291/3160/3160
+f 3079/3159/3159 2868/2973/2973 3080/3161/3161
+f 3080/3161/3161 2868/2973/2973 3081/3162/3162
+f 2870/2975/2975 3081/3162/3162 2869/2974/2974
+f 3081/3162/3162 2868/2973/2973 2869/2974/2974
+f 3082/3163/3163 3081/3162/3162 2870/2975/2975
+f 2867/2972/2972 3079/3159/3159 2866/2976/2976
+f 2868/2973/2973 3079/3159/3159 2867/2972/2972
+f 3083/3164/3164 3084/2978/2978 3085/3165/3165
+f 3084/2978/2978 3086/3166/3166 3085/3165/3165
+f 2871/2977/2977 3084/2978/2978 3083/3164/3164
+f 2877/2981/2981 3087/3167/3167 2876/2980/2980
+f 3087/3167/3167 2874/2979/2979 2876/2980/2980
+f 3088/3168/3168 3087/3167/3167 2877/2981/2981
+f 3087/3167/3167 3086/3166/3166 2874/2979/2979
+f 2874/2979/2979 3086/3166/3166 3084/2978/2978
+f 3088/3168/3168 3089/2982/2982 3090/3169/3169
+f 3089/2982/2982 3091/3170/3170 3090/3169/3169
+f 3092/3171/3171 3093/2984/2984 3302/3172/3172
+f 3093/2984/2984 2881/2985/2985 3302/3172/3172
+f 3091/3170/3170 3093/2984/2984 3092/3171/3171
+f 3093/2984/2984 3091/3170/3170 2879/2983/2983
+f 3089/2982/2982 3088/3168/3168 2877/2981/2981
+f 2879/2983/2983 3091/3170/3170 3089/2982/2982
+f 2881/2985/2985 3094/3173/3173 3302/3172/3172
+f 3096/3174/3174 3097/2988/2988 3098/3175/3175
+f 3095/3176/3176 3097/2988/2988 3096/3174/3174
+f 3098/3175/3175 3097/2988/2988 2885/2989/2989
+f 3097/2988/2988 3095/3176/3176 2883/2987/2987
+f 2882/2986/2986 3094/3173/3173 2881/2985/2985
+f 2883/2987/2987 3094/3173/3173 2882/2986/2986
+f 2883/2987/2987 3095/3176/3176 3094/3173/3173
+f 3100/3177/3177 2889/2992/2992 3101/3178/3178
+f 3101/3178/3178 2889/2992/2992 3102/3179/3179
+f 2891/2995/2995 3102/3179/3179 2890/2993/2993
+f 3102/3179/3179 2889/2992/2992 2890/2993/2993
+f 3103/3180/3180 3102/3179/3179 2891/2995/2995
+f 2888/2991/2991 3100/3177/3177 2887/2990/2990
+f 3100/3177/3177 3099/3181/3181 2887/2990/2990
+f 2889/2992/2992 3100/3177/3177 2888/2991/2991
+f 3104/3182/3182 3105/2997/2997 3106/3183/3183
+f 3105/2997/2997 3107/3184/3184 3106/3183/3183
+f 3108/3185/3185 2897/3000/3000 3316/3186/3186
+f 2897/3000/3000 3108/3185/3185 2896/2999/2999
+f 3108/3185/3185 2895/2998/2998 2896/2999/2999
+f 3108/3185/3185 3107/3184/3184 2895/2998/2998
+f 3105/2997/2997 3104/3182/3182 2893/2996/2996
+f 2895/2998/2998 3107/3184/3184 3105/2997/2997
+f 2897/3000/3000 3109/3187/3187 3316/3186/3186
+f 3111/3188/3188 3112/3003/3003 3113/3004/3004
+f 3111/3188/3188 3113/3004/3004 3320/3189/3189
+f 3110/3190/3190 3112/3003/3003 3111/3188/3188
+f 3112/3003/3003 3110/3190/3190 2900/3002/3002
+f 2898/3001/3001 3109/3187/3187 2897/3000/3000
+f 2900/3002/3002 3109/3187/3187 2898/3001/3001
+f 2900/3002/3002 3110/3190/3190 3109/3187/3187
+f 2906/3008/3008 3117/3191/3191 2905/3007/3007
+f 3117/3191/3191 3116/3192/3192 2904/2733/2733
+f 3117/3191/3191 2904/2733/2733 2905/3007/3007
+f 3118/3193/3193 3117/3191/3191 2906/3008/3008
+f 2903/3005/3005 3115/3194/3194 2902/3006/3006
+f 3115/3194/3194 3114/3195/3195 2902/3006/3006
+f 2904/2733/2733 3116/3192/3192 3115/3194/3194
+f 2904/2733/2733 3115/3194/3194 2903/3005/3005
+f 3119/3196/3196 3120/3010/3010 3121/3197/3197
+f 3120/3010/3010 3122/3198/3198 3121/3197/3197
+f 3123/3199/3199 2911/3013/3013 3330/3200/3200
+f 2911/3013/3013 3123/3199/3199 2910/3012/3012
+f 3123/3199/3199 2909/3011/3011 2910/3012/3012
+f 3123/3199/3199 3122/3198/3198 2909/3011/3011
+f 3120/3010/3010 3119/3196/3196 2907/3009/3009
+f 2909/3011/3011 3122/3198/3198 3120/3010/3010
+f 3330/3200/3200 3124/3014/3014 3125/3201/3201
+f 3124/3014/3014 3126/3202/3202 3125/3201/3201
+f 2911/3013/3013 3124/3014/3014 3330/3200/3200
+f 3127/3203/3203 3128/3016/3016 3129/3204/3204
+f 3128/3016/3016 2915/3017/3017 3129/3204/3204
+f 3126/3202/3202 3128/3016/3016 3127/3203/3203
+f 3128/3016/3016 3126/3202/3202 2913/3015/3015
+f 2913/3015/3015 3126/3202/3202 3124/3014/3014
+f 2915/3017/3017 3130/3205/3205 3129/3204/3204
+f 3132/3206/3206 3133/3020/3020 3134/3207/3207
+f 3131/3208/3208 3133/3020/3020 3132/3206/3206
+f 3134/3207/3207 3133/3020/3020 2921/3021/3021
+f 3133/3020/3020 3131/3208/3208 2919/3019/3019
+f 2917/3018/3018 3130/3205/3205 2915/3017/3017
+f 2919/3019/3019 3130/3205/3205 2917/3018/3018
+f 2919/3019/3019 3131/3208/3208 3130/3205/3205
+f 3138/3209/3209 2925/3024/3024 3139/3210/3210
+f 3137/3211/3211 2925/3024/3024 3138/3209/3209
+f 2925/3024/3024 3137/3211/3211 2924/2766/2766
+f 3139/3210/3210 2925/3024/3024 2926/3025/3025
+f 2923/3022/3022 3136/3212/3212 2922/3023/3023
+f 3136/3212/3212 3135/3213/3213 2922/3023/3023
+f 2924/2766/2766 3137/3211/3211 3136/3212/3212
+f 2924/2766/2766 3136/3212/3212 2923/3022/3022
+f 3140/3214/3214 3141/3027/3027 3142/3215/3215
+f 3141/3027/3027 3143/3216/3216 3142/3215/3215
+f 2927/3026/3026 3141/3027/3027 3140/3214/3214
+f 3144/3217/3217 2932/3030/3030 3145/3218/3218
+f 2932/3030/3030 3144/3217/3217 2931/3029/3029
+f 3144/3217/3217 2930/3028/3028 2931/3029/3029
+f 3144/3217/3217 3143/3216/3216 2930/3028/3028
+f 2930/3028/3028 3143/3216/3216 3141/3027/3027
+f 2932/3030/3030 3146/3219/3219 3145/3218/3218
+f 3148/3220/3220 3149/3033/3033 3150/3221/3221
+f 3149/3033/3033 3151/3034/3034 3150/3221/3221
+f 3147/3222/3222 3149/3033/3033 3148/3220/3220
+f 3149/3033/3033 3147/3222/3222 2934/3032/3032
+f 2933/3031/3031 3146/3219/3219 2932/3030/3030
+f 2934/3032/3032 3146/3219/3219 2933/3031/3031
+f 2934/3032/3032 3147/3222/3222 3146/3219/3219
+f 2940/3037/3037 3154/3223/3223 2939/2791/2791
+f 3156/3224/3224 3155/3225/3225 2940/3037/3037
+f 3156/3224/3224 2940/3037/3037 2941/3038/3038
+f 3155/3225/3225 3154/3223/3223 2940/3037/3037
+f 2938/3036/3036 3153/3226/3226 2937/3035/3035
+f 3153/3226/3226 3152/3227/3227 2937/3035/3035
+f 2939/2791/2791 3154/3223/3223 3153/3226/3226
+f 2939/2791/2791 3153/3226/3226 2938/3036/3036
+f 3157/3228/3228 3158/3040/3040 3159/3229/3229
+f 3158/3040/3040 3160/3230/3230 3159/3229/3229
+f 3161/3231/3231 2946/3043/3043 3362/3232/3232
+f 2946/3043/3043 3161/3231/3231 2945/3042/3042
+f 3161/3231/3231 2944/3041/3041 2945/3042/3042
+f 3161/3231/3231 3160/3230/3230 2944/3041/3041
+f 3158/3040/3040 3157/3228/3228 2942/3039/3039
+f 2944/3041/3041 3160/3230/3230 3158/3040/3040
+f 3362/3232/3232 3162/3044/3044 3163/3233/3233
+f 3162/3044/3044 3164/3045/3045 3364/3234/3234
+f 3162/3044/3044 3364/3234/3234 3163/3233/3233
+f 2946/3043/3043 3162/3044/3044 3362/3232/3232
+f 3165/3235/3235 3166/3046/3046 3167/3236/3236
+f 3166/3046/3046 2950/3047/3047 3167/3236/3236
+f 3364/3234/3234 3164/3045/3045 3166/3046/3046
+f 3364/3234/3234 3166/3046/3046 3165/3235/3235
+f 2950/3047/3047 3168/3237/3237 3167/3236/3236
+f 3170/3238/3238 3171/3050/3050 3172/3239/3239
+f 3169/3240/3240 3171/3050/3050 3170/3238/3238
+f 3172/3239/3239 3171/3050/3050 2954/3051/3051
+f 3171/3050/3050 3169/3240/3240 2952/3049/3049
+f 2951/3048/3048 3168/3237/3237 2950/3047/3047
+f 2952/3049/3049 3168/3237/3237 2951/3048/3048
+f 2952/3049/3049 3169/3240/3240 3168/3237/3237
+f 3176/3241/3241 3178/3242/3242 3177/3243/3243
+f 3178/3242/3242 3176/3241/3241 2957/3054/3054
+f 3178/3242/3242 2957/3054/3054 2958/3055/3055
+f 3176/3241/3241 3175/3244/3244 2956/3053/3053
+f 3176/3241/3241 2956/3053/3053 2957/3054/3054
+f 2956/3053/3053 3174/3245/3245 2955/3052/3052
+f 3174/3245/3245 3173/3246/3246 2955/3052/3052
+f 2956/3053/3053 3175/3244/3244 3174/3245/3245
+f 3179/3247/3247 3180/3057/3057 3181/3248/3248
+f 3180/3057/3057 3182/3249/3249 3181/3248/3248
+f 2959/3056/3056 3180/3057/3057 3179/3247/3247
+f 3183/3250/3250 2963/3060/3060 3380/3251/3251
+f 2963/3060/3060 3183/3250/3250 2962/3059/3059
+f 3183/3250/3250 2961/3058/3058 2962/3059/3059
+f 3183/3250/3250 3182/3249/3249 2961/3058/3058
+f 2961/3058/3058 3182/3249/3249 3180/3057/3057
+f 2963/3060/3060 3184/3252/3252 3380/3251/3251
+f 3186/3253/3253 2967/3062/3062 3187/3254/3254
+f 2967/3062/3062 2968/3063/3063 3187/3254/3254
+f 3185/3255/3255 2967/3062/3062 3186/3253/3253
+f 2967/3062/3062 3185/3255/3255 2966/2841/2841
+f 2965/3061/3061 3184/3252/3252 2963/3060/3060
+f 2966/2841/2841 3185/3255/3255 3184/3252/3252
+f 2966/2841/2841 3184/3252/3252 2965/3061/3061
+f 3192/3256/3256 3191/3257/3257 2971/3066/3066
+f 3191/3257/3257 3190/3258/3258 2970/2849/2849
+f 3191/3257/3257 2970/2849/2849 2971/3066/3066
+f 3189/3065/3065 3188/3259/3259 2969/3064/3064
+f 2970/2849/2849 3190/3258/3258 3189/3065/3065
+f 3193/3260/3260 3194/3068/3068 3195/3261/3261
+f 3194/3068/3068 2974/3069/3069 3196/3262/3262
+f 3194/3068/3068 3196/3262/3262 3195/3261/3261
+f 3197/3263/3263 2976/3071/3071 3198/3264/3264
+f 3196/3262/3262 2974/3069/3069 3197/3263/3263
+f 2976/3071/3071 3197/3263/3263 2975/3070/3070
+f 3197/3263/3263 2974/3069/3069 2975/3070/3070
+f 3194/3068/3068 3193/3260/3260 2972/3067/3067
+f 3198/3264/3264 3199/3072/3072 3200/3265/3265
+f 3199/3072/3072 3201/3266/3266 3200/3265/3265
+f 2976/3071/3071 3199/3072/3072 3198/3264/3264
+f 3202/3267/3267 3203/3074/3074 3204/3268/3268
+f 3203/3074/3074 2981/3075/3075 3204/3268/3268
+f 3201/3266/3266 3203/3074/3074 3202/3267/3267
+f 3203/3074/3074 3201/3266/3266 2979/3073/3073
+f 2979/3073/3073 3201/3266/3266 3199/3072/3072
+f 2981/3075/3075 3205/3269/3269 3204/3268/3268
+f 3207/3270/3270 3208/3077/3077 3209/3271/3271
+f 3206/3272/3272 3208/3077/3077 3207/3270/3270
+f 3209/3271/3271 3208/3077/3077 2986/3078/3078
+f 3208/3077/3077 3206/3272/3272 2984/2875/2875
+f 2983/3076/3076 3205/3269/3269 2981/3075/3075
+f 2984/2875/2875 3206/3272/3272 3205/3269/3269
+f 2984/2875/2875 3205/3269/3269 2983/3076/3076
+f 2991/3082/3082 3213/3273/3273 2990/3081/3081
+f 3213/3273/3273 3212/3274/3274 2989/2883/2883
+f 3213/3273/3273 2989/2883/2883 2990/3081/3081
+f 3214/3275/3275 3213/3273/3273 2991/3082/3082
+f 2988/3080/3080 3211/3276/3276 2987/3079/3079
+f 3211/3276/3276 3210/3277/3277 2987/3079/3079
+f 2989/2883/2883 3212/3274/3274 3211/3276/3276
+f 2989/2883/2883 3211/3276/3276 2988/3080/3080
+f 3215/3084/3084 3216/3083/3083 3217/3278/3278
+f 3215/3084/3084 3217/3278/3278 3409/3279/3279
+f 3216/3083/3083 3218/3280/3280 3217/3278/3278
+f 3219/3281/3281 2996/3087/3087 3413/3282/3282
+f 2996/3087/3087 3219/3281/3281 2995/3086/3086
+f 3219/3281/3281 2994/3085/3085 2995/3086/3086
+f 3219/3281/3281 3218/3280/3280 2994/3085/3085
+f 2994/3085/3085 3218/3280/3280 3216/3083/3083
+f 2996/3087/3087 3220/3283/3283 3413/3282/3282
+f 3222/3284/3284 3223/3090/3090 3224/3285/3285
+f 3223/3090/3090 3225/3091/3091 3224/3285/3285
+f 3221/3286/3286 3223/3090/3090 3222/3284/3284
+f 3223/3090/3090 3221/3286/3286 3000/3089/3089
+f 2998/3088/3088 3220/3283/3283 2996/3087/3087
+f 3000/3089/3089 3220/3283/3283 2998/3088/3088
+f 3000/3089/3089 3221/3286/3286 3220/3283/3283
+f 3006/3092/3092 3228/3287/3287 3005/3093/3093
+f 3230/3288/3288 3229/3289/3289 3006/3092/3092
+f 3230/3288/3288 3006/3092/3092 3007/3094/3094
+f 3229/3289/3289 3228/3287/3287 3006/3092/3092
+f 3004/3095/3095 3227/3290/3290 3003/3096/3096
+f 3227/3290/3290 3226/3291/3291 3003/3096/3096
+f 3005/3093/3093 3228/3287/3287 3227/3290/3290
+f 3005/3093/3093 3227/3290/3290 3004/3095/3095
+f 3013/3101/3101 3234/3292/3292 3012/3100/3100
+f 3234/3292/3292 3233/3293/3293 3011/3099/3099
+f 3234/3292/3292 3011/3099/3099 3012/3100/3100
+f 3235/3294/3294 3234/3292/3292 3013/3101/3101
+f 3010/3098/3098 3232/3295/3295 3231/3296/3296
+f 3010/3098/3098 3231/3296/3296 3008/3097/3097
+f 3011/3099/3099 3233/3293/3293 3010/3098/3098
+f 3233/3293/3293 3232/3295/3295 3010/3098/3098
+f 3238/3297/3297 3019/3105/3105 3239/3298/3298
+f 3019/3105/3105 3238/3297/3297 3017/3104/3104
+f 3238/3297/3297 3237/3103/3103 3017/3104/3104
+f 3015/3102/3102 3236/3299/3299 3235/3294/3294
+f 3015/3102/3102 3235/3294/3294 3013/3101/3101
+f 3237/3103/3103 3236/3299/3299 3015/3102/3102
+f 3019/3105/3105 3240/3300/3300 3239/3298/3298
+f 3242/3301/3301 3243/3108/3108 3436/3302/3302
+f 3243/3108/3108 3242/3301/3301 3022/3107/3107
+f 3242/3301/3301 3241/3303/3303 3021/3109/3109
+f 3242/3301/3301 3021/3109/3109 3022/3107/3107
+f 3020/3106/3106 3240/3300/3300 3019/3105/3105
+f 3021/3109/3109 3240/3300/3300 3020/3106/3106
+f 3021/3109/3109 3241/3303/3303 3240/3300/3300
+f 3244/3304/3304 3027/3110/3110 3245/3305/3305
+f 3245/3305/3305 3027/3110/3110 3246/3306/3306
+f 3247/3307/3307 3246/3306/3306 3027/3110/3110
+f 3247/3307/3307 3027/3110/3110 3029/3111/3111
+f 3025/3113/3113 3244/3304/3304 3024/3114/3114
+f 3026/3112/3112 3027/3110/3110 3025/3113/3113
+f 3027/3110/3110 3244/3304/3304 3025/3113/3113
+f 3248/3308/3308 3031/3115/3115 3249/3309/3309
+f 3031/3115/3115 3250/3310/3310 3249/3309/3309
+f 3251/3311/3311 3252/3118/3118 3447/3312/3312
+f 3033/3117/3117 3250/3310/3310 3032/2927/2927
+f 3252/3118/3118 3251/3311/3311 3033/3117/3117
+f 3251/3311/3311 3250/3310/3310 3033/3117/3117
+f 3031/3115/3115 3248/3308/3308 3030/3116/3116
+f 3032/2927/2927 3250/3310/3310 3031/3115/3115
+f 3252/3118/3118 3253/3313/3313 3447/3312/3312
+f 3256/3314/3314 3255/3315/3315 3036/3120/3120
+f 3256/3314/3314 3036/3120/3120 3038/3121/3121
+f 3255/3315/3315 3254/3316/3316 3035/3122/3122
+f 3255/3315/3315 3035/3122/3122 3036/3120/3120
+f 3034/3119/3119 3253/3313/3313 3252/3118/3118
+f 3035/3122/3122 3253/3313/3313 3034/3119/3119
+f 3035/3122/3122 3254/3316/3316 3253/3313/3313
+f 3257/3124/3124 3258/3317/3317 3453/3318/3318
+f 3043/3127/3127 3260/3319/3319 3042/3125/3125
+f 3260/3319/3319 3259/3320/3320 3041/3126/3126
+f 3260/3319/3319 3041/3126/3126 3042/3125/3125
+f 3261/3321/3321 3260/3319/3319 3043/3127/3127
+f 3040/3123/3123 3258/3317/3317 3257/3124/3124
+f 3041/3126/3126 3259/3320/3320 3040/3123/3123
+f 3259/3320/3320 3258/3317/3317 3040/3123/3123
+f 3262/3129/3129 3263/3322/3322 3459/3323/3323
+f 3262/3129/3129 3265/3128/3128 3263/3322/3322
+f 3265/3128/3128 3264/3324/3324 3263/3322/3322
+f 3266/3325/3325 3048/3132/3132 3267/3326/3326
+f 3048/3132/3132 3266/3325/3325 3047/3131/3131
+f 3266/3325/3325 3046/3130/3130 3047/3131/3131
+f 3266/3325/3325 3264/3324/3324 3046/3130/3130
+f 3046/3130/3130 3264/3324/3324 3265/3128/3128
+f 3269/3327/3327 3268/3328/3328 3053/3136/3136
+f 3269/3327/3327 3053/3136/3136 3270/3329/3329
+f 3053/3136/3136 3268/3328/3328 3052/3135/3135
+f 3268/3328/3328 3051/3134/3134 3052/3135/3135
+f 3050/3133/3133 3267/3326/3326 3048/3132/3132
+f 3051/3134/3134 3268/3328/3328 3267/3326/3326
+f 3051/3134/3134 3267/3326/3326 3050/3133/3133
+f 3272/3330/3330 3273/3139/3139 3274/3331/3331
+f 3272/3330/3330 3274/3331/3331 3472/3332/3332
+f 3271/3138/3138 3273/3139/3139 3272/3330/3330
+f 3274/3331/3331 3273/3139/3139 3057/3140/3140
+f 3054/3137/3137 3270/3329/3329 3053/3136/3136
+f 3271/3138/3138 3270/3329/3329 3054/3137/3137
+f 3274/3331/3331 3059/3142/3142 3275/3333/3333
+f 3274/3331/3331 3275/3333/3333 3472/3332/3332
+f 3276/3334/3334 3277/3144/3144 3477/3335/3335
+f 3275/3333/3333 3059/3142/3142 3276/3334/3334
+f 3277/3144/3144 3276/3334/3334 3060/3143/3143
+f 3276/3334/3334 3059/3142/3142 3060/3143/3143
+f 3058/3141/3141 3274/3331/3331 3057/3140/3140
+f 3059/3142/3142 3274/3331/3331 3058/3141/3141
+f 3279/3336/3336 3065/3146/3146 3280/3337/3337
+f 3281/3338/3338 3282/3148/3148 3483/3339/3339
+f 3280/3337/3337 3065/3146/3146 3281/3338/3338
+f 3282/3148/3148 3281/3338/3338 3066/3147/3147
+f 3281/3338/3338 3065/3146/3146 3066/3147/3147
+f 3064/3145/3145 3279/3336/3336 3063/3149/3149
+f 3279/3336/3336 3278/3340/3340 3063/3149/3149
+f 3065/3146/3146 3279/3336/3336 3064/3145/3145
+f 3068/3150/3150 3284/3341/3341 3283/3342/3342
+f 3285/3343/3343 3073/3153/3153 3074/3154/3154
+f 3285/3343/3343 3074/3154/3154 3286/3344/3344
+f 3284/3341/3341 3073/3153/3153 3285/3343/3343
+f 3073/3153/3153 3284/3341/3341 3071/3152/3152
+f 3070/3151/3151 3284/3341/3341 3068/3150/3150
+f 3071/3152/3152 3284/3341/3341 3070/3151/3151
+f 3074/3154/3154 3287/3345/3345 3286/3344/3344
+f 3289/3346/3346 3290/3158/3158 3493/3347/3347
+f 3290/3158/3158 3289/3346/3346 3077/3157/3157
+f 3289/3346/3346 3076/3156/3156 3077/3157/3157
+f 3289/3346/3346 3288/3348/3348 3076/3156/3156
+f 3075/3155/3155 3287/3345/3345 3074/3154/3154
+f 3076/3156/3156 3288/3348/3348 3287/3345/3345
+f 3076/3156/3156 3287/3345/3345 3075/3155/3155
+f 3291/3160/3160 3292/3349/3349 3495/3350/3350
+f 3291/3160/3160 3079/3159/3159 3292/3349/3349
+f 3079/3159/3159 3080/3161/3161 3292/3349/3349
+f 3292/3349/3349 3080/3161/3161 3293/3351/3351
+f 3082/3163/3163 3080/3161/3161 3081/3162/3162
+f 3293/3351/3351 3080/3161/3161 3082/3163/3163
+f 3088/3168/3168 3297/3352/3352 3087/3167/3167
+f 3297/3352/3352 3086/3166/3166 3087/3167/3167
+f 3298/3353/3353 3297/3352/3352 3088/3168/3168
+f 3297/3352/3352 3296/3354/3354 3086/3166/3166
+f 3085/3165/3165 3295/3355/3355 3294/3356/3356
+f 3085/3165/3165 3294/3356/3356 3083/3164/3164
+f 3086/3166/3166 3296/3354/3354 3295/3355/3355
+f 3086/3166/3166 3295/3355/3355 3085/3165/3165
+f 3301/3357/3357 3302/3172/3172 3509/3358/3358
+f 3302/3172/3172 3301/3357/3357 3092/3171/3171
+f 3301/3357/3357 3300/3359/3359 3091/3170/3170
+f 3301/3357/3357 3091/3170/3170 3092/3171/3171
+f 3090/3169/3169 3299/3360/3360 3298/3353/3353
+f 3090/3169/3169 3298/3353/3353 3088/3168/3168
+f 3091/3170/3170 3300/3359/3359 3299/3360/3360
+f 3091/3170/3170 3299/3360/3360 3090/3169/3169
+f 3302/3172/3172 3303/3361/3361 3509/3358/3358
+f 3306/3362/3362 3305/3363/3363 3096/3174/3174
+f 3306/3362/3362 3096/3174/3174 3098/3175/3175
+f 3305/3363/3363 3304/3364/3364 3095/3176/3176
+f 3305/3363/3363 3095/3176/3176 3096/3174/3174
+f 3094/3173/3173 3303/3361/3361 3302/3172/3172
+f 3095/3176/3176 3303/3361/3361 3094/3173/3173
+f 3095/3176/3176 3304/3364/3364 3303/3361/3361
+f 3308/3365/3365 3101/3178/3178 3309/3366/3366
+f 3309/3366/3366 3101/3178/3178 3310/3367/3367
+f 3103/3180/3180 3310/3367/3367 3102/3179/3179
+f 3310/3367/3367 3101/3178/3178 3102/3179/3179
+f 3311/3368/3368 3310/3367/3367 3103/3180/3180
+f 3100/3177/3177 3308/3365/3365 3099/3181/3181
+f 3308/3365/3365 3307/3369/3369 3099/3181/3181
+f 3101/3178/3178 3308/3365/3365 3100/3177/3177
+f 3315/3370/3370 3316/3186/3186 3524/3371/3371
+f 3316/3186/3186 3315/3370/3370 3108/3185/3185
+f 3315/3370/3370 3107/3184/3184 3108/3185/3185
+f 3315/3370/3370 3314/3372/3372 3107/3184/3184
+f 3106/3183/3183 3313/3373/3373 3312/3374/3374
+f 3106/3183/3183 3312/3374/3374 3104/3182/3182
+f 3107/3184/3184 3314/3372/3372 3313/3373/3373
+f 3107/3184/3184 3313/3373/3373 3106/3183/3183
+f 3316/3186/3186 3317/3375/3375 3524/3371/3371
+f 3319/3376/3376 3320/3189/3189 3529/3377/3377
+f 3320/3189/3189 3319/3376/3376 3111/3188/3188
+f 3319/3376/3376 3318/3378/3378 3110/3190/3190
+f 3319/3376/3376 3110/3190/3190 3111/3188/3188
+f 3109/3187/3187 3317/3375/3375 3316/3186/3186
+f 3110/3190/3190 3317/3375/3375 3109/3187/3187
+f 3110/3190/3190 3318/3378/3378 3317/3375/3375
+f 3118/3193/3193 3324/3379/3379 3117/3191/3191
+f 3324/3379/3379 3323/3380/3380 3116/3192/3192
+f 3324/3379/3379 3116/3192/3192 3117/3191/3191
+f 3325/3381/3381 3324/3379/3379 3118/3193/3193
+f 3115/3194/3194 3322/3382/3382 3321/3383/3383
+f 3115/3194/3194 3321/3383/3383 3114/3195/3195
+f 3116/3192/3192 3323/3380/3380 3322/3382/3382
+f 3116/3192/3192 3322/3382/3382 3115/3194/3194
+f 3329/3384/3384 3330/3200/3200 3540/3385/3385
+f 3330/3200/3200 3329/3384/3384 3123/3199/3199
+f 3329/3384/3384 3122/3198/3198 3123/3199/3199
+f 3329/3384/3384 3328/3386/3386 3122/3198/3198
+f 3121/3197/3197 3327/3387/3387 3326/3388/3388
+f 3121/3197/3197 3326/3388/3388 3119/3196/3196
+f 3122/3198/3198 3328/3386/3386 3327/3387/3387
+f 3122/3198/3198 3327/3387/3387 3121/3197/3197
+f 3330/3200/3200 3331/3389/3389 3540/3385/3385
+f 3333/3390/3390 3129/3204/3204 3334/3391/3391
+f 3129/3204/3204 3333/3390/3390 3127/3203/3203
+f 3333/3390/3390 3332/3392/3392 3126/3202/3202
+f 3333/3390/3390 3126/3202/3202 3127/3203/3203
+f 3125/3201/3201 3331/3389/3389 3330/3200/3200
+f 3126/3202/3202 3332/3392/3392 3331/3389/3389
+f 3126/3202/3202 3331/3389/3389 3125/3201/3201
+f 3129/3204/3204 3335/3393/3393 3334/3391/3391
+f 3338/3394/3394 3337/3395/3395 3132/3206/3206
+f 3338/3394/3394 3132/3206/3206 3134/3207/3207
+f 3337/3395/3395 3336/3396/3396 3131/3208/3208
+f 3337/3395/3395 3131/3208/3208 3132/3206/3206
+f 3130/3205/3205 3335/3393/3393 3129/3204/3204
+f 3131/3208/3208 3335/3393/3393 3130/3205/3205
+f 3131/3208/3208 3336/3396/3396 3335/3393/3393
+f 3138/3209/3209 3341/3397/3397 3137/3211/3211
+f 3343/3398/3398 3342/3399/3399 3138/3209/3209
+f 3343/3398/3398 3138/3209/3209 3139/3210/3210
+f 3342/3399/3399 3341/3397/3397 3138/3209/3209
+f 3136/3212/3212 3340/3400/3400 3135/3213/3213
+f 3340/3400/3400 3339/3401/3401 3135/3213/3213
+f 3137/3211/3211 3341/3397/3397 3340/3400/3400
+f 3137/3211/3211 3340/3400/3400 3136/3212/3212
+f 3347/3402/3402 3145/3218/3218 3348/3403/3403
+f 3145/3218/3218 3347/3402/3402 3144/3217/3217
+f 3347/3402/3402 3143/3216/3216 3144/3217/3217
+f 3347/3402/3402 3346/3404/3404 3143/3216/3216
+f 3142/3215/3215 3345/3405/3405 3344/3406/3406
+f 3142/3215/3215 3344/3406/3406 3140/3214/3214
+f 3143/3216/3216 3346/3404/3404 3345/3405/3405
+f 3143/3216/3216 3345/3405/3405 3142/3215/3215
+f 3145/3218/3218 3349/3407/3407 3348/3403/3403
+f 3352/3408/3408 3351/3409/3409 3148/3220/3220
+f 3352/3408/3408 3148/3220/3220 3150/3221/3221
+f 3351/3409/3409 3350/3410/3410 3147/3222/3222
+f 3351/3409/3409 3147/3222/3222 3148/3220/3220
+f 3146/3219/3219 3349/3407/3407 3145/3218/3218
+f 3147/3222/3222 3349/3407/3407 3146/3219/3219
+f 3147/3222/3222 3350/3410/3410 3349/3407/3407
+f 3155/3225/3225 3355/3411/3411 3154/3223/3223
+f 3357/3412/3412 3356/3413/3413 3155/3225/3225
+f 3357/3412/3412 3155/3225/3225 3156/3224/3224
+f 3356/3413/3413 3355/3411/3411 3155/3225/3225
+f 3153/3226/3226 3354/3414/3414 3152/3227/3227
+f 3354/3414/3414 3353/3415/3415 3152/3227/3227
+f 3154/3223/3223 3355/3411/3411 3354/3414/3414
+f 3154/3223/3223 3354/3414/3414 3153/3226/3226
+f 3361/3416/3416 3362/3232/3232 3573/3417/3417
+f 3362/3232/3232 3361/3416/3416 3161/3231/3231
+f 3361/3416/3416 3160/3230/3230 3161/3231/3231
+f 3361/3416/3416 3360/3418/3418 3160/3230/3230
+f 3159/3229/3229 3359/3419/3419 3358/3420/3420
+f 3159/3229/3229 3358/3420/3420 3157/3228/3228
+f 3160/3230/3230 3360/3418/3418 3359/3419/3419
+f 3160/3230/3230 3359/3419/3419 3159/3229/3229
+f 3362/3232/3232 3363/3421/3421 3573/3417/3417
+f 3365/3422/3422 3167/3236/3236 3366/3423/3423
+f 3167/3236/3236 3365/3422/3422 3165/3235/3235
+f 3365/3422/3422 3364/3234/3234 3165/3235/3235
+f 3163/3233/3233 3363/3421/3421 3362/3232/3232
+f 3364/3234/3234 3363/3421/3421 3163/3233/3233
+f 3167/3236/3236 3367/3424/3424 3366/3423/3423
+f 3370/3425/3425 3369/3426/3426 3170/3238/3238
+f 3370/3425/3425 3170/3238/3238 3172/3239/3239
+f 3369/3426/3426 3368/3427/3427 3169/3240/3240
+f 3369/3426/3426 3169/3240/3240 3170/3238/3238
+f 3168/3237/3237 3367/3424/3424 3167/3236/3236
+f 3169/3240/3240 3367/3424/3424 3168/3237/3237
+f 3169/3240/3240 3368/3427/3427 3367/3424/3424
+f 3374/3428/3428 3177/3243/3243 3375/3429/3429
+f 3177/3243/3243 3374/3428/3428 3176/3241/3241
+f 3374/3428/3428 3373/3430/3430 3175/3244/3244
+f 3374/3428/3428 3175/3244/3244 3176/3241/3241
+f 3174/3245/3245 3372/3431/3431 3173/3246/3246
+f 3372/3431/3431 3371/3432/3432 3173/3246/3246
+f 3175/3244/3244 3373/3430/3430 3372/3431/3431
+f 3175/3244/3244 3372/3431/3431 3174/3245/3245
+f 3379/3433/3433 3380/3251/3251 3592/3434/3434
+f 3380/3251/3251 3379/3433/3433 3183/3250/3250
+f 3379/3433/3433 3182/3249/3249 3183/3250/3250
+f 3379/3433/3433 3378/3435/3435 3182/3249/3249
+f 3181/3248/3248 3377/3436/3436 3376/3437/3437
+f 3181/3248/3248 3376/3437/3437 3179/3247/3247
+f 3182/3249/3249 3378/3435/3435 3377/3436/3436
+f 3182/3249/3249 3377/3436/3436 3181/3248/3248
+f 3380/3251/3251 3381/3438/3438 3592/3434/3434
+f 3381/3438/3438 3382/3439/3439 3383/3440/3440
+f 3383/3440/3440 3382/3439/3439 3384/3441/3441
+f 3186/3253/3253 3382/3439/3439 3185/3255/3255
+f 3385/3442/3442 3384/3441/3441 3186/3253/3253
+f 3385/3442/3442 3186/3253/3253 3187/3254/3254
+f 3384/3441/3441 3382/3439/3439 3186/3253/3253
+f 3184/3252/3252 3381/3438/3438 3380/3251/3251
+f 3185/3255/3255 3382/3439/3439 3381/3438/3438
+f 3185/3255/3255 3381/3438/3438 3184/3252/3252
+f 3192/3256/3256 3389/3443/3443 3191/3257/3257
+f 3389/3443/3443 3388/3444/3444 3190/3258/3258
+f 3389/3443/3443 3190/3258/3258 3191/3257/3257
+f 3390/3445/3445 3389/3443/3443 3192/3256/3256
+f 3189/3065/3065 3387/3446/3446 3188/3259/3259
+f 3387/3446/3446 3386/3447/3447 3188/3259/3259
+f 3190/3258/3258 3388/3444/3444 3387/3446/3446
+f 3190/3258/3258 3387/3446/3446 3189/3065/3065
+f 3392/3448/3448 3196/3262/3262 3393/3449/3449
+f 3394/3450/3450 3198/3264/3264 3395/3451/3451
+f 3393/3449/3449 3196/3262/3262 3394/3450/3450
+f 3198/3264/3264 3394/3450/3450 3197/3263/3263
+f 3394/3450/3450 3196/3262/3262 3197/3263/3263
+f 3195/3261/3261 3392/3448/3448 3391/3452/3452
+f 3195/3261/3261 3391/3452/3452 3193/3260/3260
+f 3196/3262/3262 3392/3448/3448 3195/3261/3261
+f 3198/3264/3264 3396/3453/3453 3395/3451/3451
+f 3398/3454/3454 3204/3268/3268 3399/3455/3455
+f 3204/3268/3268 3398/3454/3454 3202/3267/3267
+f 3398/3454/3454 3397/3456/3456 3201/3266/3266
+f 3398/3454/3454 3201/3266/3266 3202/3267/3267
+f 3200/3265/3265 3396/3453/3453 3198/3264/3264
+f 3201/3266/3266 3397/3456/3456 3396/3453/3453
+f 3201/3266/3266 3396/3453/3453 3200/3265/3265
+f 3204/3268/3268 3400/3457/3457 3399/3455/3455
+f 3403/3458/3458 3402/3459/3459 3207/3270/3270
+f 3403/3458/3458 3207/3270/3270 3209/3271/3271
+f 3402/3459/3459 3401/3460/3460 3206/3272/3272
+f 3402/3459/3459 3206/3272/3272 3207/3270/3270
+f 3205/3269/3269 3400/3457/3457 3204/3268/3268
+f 3206/3272/3272 3400/3457/3457 3205/3269/3269
+f 3206/3272/3272 3401/3460/3460 3400/3457/3457
+f 3214/3275/3275 3407/3461/3461 3213/3273/3273
+f 3407/3461/3461 3406/3462/3462 3212/3274/3274
+f 3407/3461/3461 3212/3274/3274 3213/3273/3273
+f 3408/3463/3463 3407/3461/3461 3214/3275/3275
+f 3211/3276/3276 3405/3464/3464 3404/3465/3465
+f 3211/3276/3276 3404/3465/3465 3210/3277/3277
+f 3212/3274/3274 3406/3462/3462 3211/3276/3276
+f 3406/3462/3462 3405/3464/3464 3211/3276/3276
+f 3409/3279/3279 3410/3466/3466 3621/3467/3467
+f 3412/3468/3468 3413/3282/3282 3626/3469/3469
+f 3413/3282/3282 3412/3468/3468 3219/3281/3281
+f 3412/3468/3468 3218/3280/3280 3219/3281/3281
+f 3412/3468/3468 3411/3470/3470 3218/3280/3280
+f 3217/3278/3278 3410/3466/3466 3409/3279/3279
+f 3218/3280/3280 3411/3470/3470 3410/3466/3466
+f 3218/3280/3280 3410/3466/3466 3217/3278/3278
+f 3413/3282/3282 3414/3471/3471 3626/3469/3469
+f 3417/3472/3472 3416/3473/3473 3222/3284/3284
+f 3417/3472/3472 3222/3284/3284 3224/3285/3285
+f 3416/3473/3473 3415/3474/3474 3221/3286/3286
+f 3416/3473/3473 3221/3286/3286 3222/3284/3284
+f 3220/3283/3283 3414/3471/3471 3413/3282/3282
+f 3221/3286/3286 3414/3471/3471 3220/3283/3283
+f 3221/3286/3286 3415/3474/3474 3414/3471/3471
+f 3229/3289/3289 3420/3475/3475 3228/3287/3287
+f 3422/3476/3476 3421/3477/3477 3229/3289/3289
+f 3422/3476/3476 3229/3289/3289 3230/3288/3288
+f 3421/3477/3477 3420/3475/3475 3229/3289/3289
+f 3227/3290/3290 3419/3478/3478 3418/3479/3479
+f 3227/3290/3290 3418/3479/3479 3226/3291/3291
+f 3228/3287/3287 3420/3475/3475 3227/3290/3290
+f 3420/3475/3475 3419/3478/3478 3227/3290/3290
+f 3423/3480/3480 3424/3481/3481 3425/3482/3482
+f 3424/3481/3481 3426/3483/3483 3425/3482/3482
+f 3427/3484/3484 3235/3294/3294 3428/3485/3485
+f 3426/3483/3483 3424/3481/3481 3427/3484/3484
+f 3234/3292/3292 3424/3481/3481 3233/3293/3293
+f 3235/3294/3294 3427/3484/3484 3234/3292/3292
+f 3427/3484/3484 3424/3481/3481 3234/3292/3292
+f 3232/3295/3295 3424/3481/3481 3423/3480/3480
+f 3232/3295/3295 3423/3480/3480 3231/3296/3296
+f 3233/3293/3293 3424/3481/3481 3232/3295/3295
+f 3235/3294/3294 3429/3486/3486 3428/3485/3485
+f 3238/3297/3297 3430/3487/3487 3237/3103/3103
+f 3432/3488/3488 3431/3489/3489 3238/3297/3297
+f 3432/3488/3488 3238/3297/3297 3239/3298/3298
+f 3431/3489/3489 3430/3487/3487 3238/3297/3297
+f 3236/3299/3299 3429/3486/3486 3235/3294/3294
+f 3237/3103/3103 3430/3487/3487 3236/3299/3299
+f 3430/3487/3487 3429/3486/3486 3236/3299/3299
+f 3435/3490/3490 3436/3302/3302 3437/3491/3491
+f 3242/3301/3301 3434/3492/3492 3241/3303/3303
+f 3436/3302/3302 3435/3490/3490 3242/3301/3301
+f 3435/3490/3490 3434/3492/3492 3242/3301/3301
+f 3240/3300/3300 3433/3493/3493 3432/3488/3488
+f 3240/3300/3300 3432/3488/3488 3239/3298/3298
+f 3241/3303/3303 3434/3492/3492 3240/3300/3300
+f 3434/3492/3492 3433/3493/3493 3240/3300/3300
+f 3439/3494/3494 3245/3305/3305 3440/3495/3495
+f 3440/3495/3495 3245/3305/3305 3441/3496/3496
+f 3442/3497/3497 3441/3496/3496 3246/3306/3306
+f 3442/3497/3497 3246/3306/3306 3247/3307/3307
+f 3441/3496/3496 3245/3305/3305 3246/3306/3306
+f 3244/3304/3304 3439/3494/3494 3438/3498/3498
+f 3245/3305/3305 3439/3494/3494 3244/3304/3304
+f 3446/3499/3499 3447/3312/3312 3448/3500/3500
+f 3251/3311/3311 3445/3501/3501 3250/3310/3310
+f 3447/3312/3312 3446/3499/3499 3251/3311/3311
+f 3446/3499/3499 3445/3501/3501 3251/3311/3311
+f 3249/3309/3309 3444/3502/3502 3443/3503/3503
+f 3249/3309/3309 3443/3503/3503 3248/3308/3308
+f 3250/3310/3310 3445/3501/3501 3249/3309/3309
+f 3445/3501/3501 3444/3502/3502 3249/3309/3309
+f 3447/3312/3312 3449/3504/3504 3448/3500/3500
+f 3451/3505/3505 3256/3314/3314 3452/3506/3506
+f 3255/3315/3315 3450/3507/3507 3254/3316/3316
+f 3256/3314/3314 3451/3505/3505 3255/3315/3315
+f 3451/3505/3505 3450/3507/3507 3255/3315/3315
+f 3253/3313/3313 3449/3504/3504 3447/3312/3312
+f 3254/3316/3316 3450/3507/3507 3253/3313/3313
+f 3450/3507/3507 3449/3504/3504 3253/3313/3313
+f 3453/3318/3318 3454/3508/3508 3455/3509/3509
+f 3260/3319/3319 3456/3510/3510 3259/3320/3320
+f 3458/3511/3511 3457/3512/3512 3260/3319/3319
+f 3458/3511/3511 3260/3319/3319 3261/3321/3321
+f 3457/3512/3512 3456/3510/3510 3260/3319/3319
+f 3258/3317/3317 3454/3508/3508 3453/3318/3318
+f 3259/3320/3320 3456/3510/3510 3258/3317/3317
+f 3456/3510/3510 3454/3508/3508 3258/3317/3317
+f 3459/3323/3323 3263/3322/3322 3460/3513/3513
+f 3459/3323/3323 3460/3513/3513 3461/3514/3514
+f 3263/3322/3322 3462/3515/3515 3460/3513/3513
+f 3464/3516/3516 3463/3517/3517 3266/3325/3325
+f 3464/3516/3516 3266/3325/3325 3267/3326/3326
+f 3463/3517/3517 3462/3515/3515 3264/3324/3324
+f 3463/3517/3517 3264/3324/3324 3266/3325/3325
+f 3264/3324/3324 3462/3515/3515 3263/3322/3322
+f 3465/3518/3518 3269/3327/3327 3466/3519/3519
+f 3466/3519/3519 3269/3327/3327 3467/3520/3520
+f 3468/3521/3521 3467/3520/3520 3269/3327/3327
+f 3468/3521/3521 3269/3327/3327 3270/3329/3329
+f 3267/3326/3326 3465/3518/3518 3464/3516/3516
+f 3268/3328/3328 3269/3327/3327 3267/3326/3326
+f 3269/3327/3327 3465/3518/3518 3267/3326/3326
+f 3469/3522/3522 3272/3330/3330 3470/3523/3523
+f 3471/3524/3524 3472/3332/3332 3473/3525/3525
+f 3470/3523/3523 3272/3330/3330 3471/3524/3524
+f 3472/3332/3332 3471/3524/3524 3272/3330/3330
+f 3270/3329/3329 3469/3522/3522 3468/3521/3521
+f 3271/3138/3138 3272/3330/3330 3270/3329/3329
+f 3272/3330/3330 3469/3522/3522 3270/3329/3329
+f 3472/3332/3332 3474/3526/3526 3473/3525/3525
+f 3474/3526/3526 3275/3333/3333 3475/3527/3527
+f 3476/3528/3528 3477/3335/3335 3478/3529/3529
+f 3475/3527/3527 3275/3333/3333 3476/3528/3528
+f 3477/3335/3335 3476/3528/3528 3276/3334/3334
+f 3476/3528/3528 3275/3333/3333 3276/3334/3334
+f 3275/3333/3333 3474/3526/3526 3472/3332/3332
+f 3480/3530/3530 3280/3337/3337 3481/3531/3531
+f 3482/3532/3532 3483/3339/3339 3484/3533/3533
+f 3481/3531/3531 3280/3337/3337 3482/3532/3532
+f 3483/3339/3339 3482/3532/3532 3281/3338/3338
+f 3482/3532/3532 3280/3337/3337 3281/3338/3338
+f 3279/3336/3336 3480/3530/3530 3479/3534/3534
+f 3279/3336/3336 3479/3534/3534 3278/3340/3340
+f 3280/3337/3337 3480/3530/3530 3279/3336/3336
+f 3486/3535/3535 3285/3343/3343 3487/3536/3536
+f 3283/3342/3342 3486/3535/3535 3485/3537/3537
+f 3487/3536/3536 3285/3343/3343 3488/3538/3538
+f 3489/3539/3539 3488/3538/3538 3285/3343/3343
+f 3489/3539/3539 3285/3343/3343 3286/3344/3344
+f 3284/3341/3341 3486/3535/3535 3283/3342/3342
+f 3285/3343/3343 3486/3535/3535 3284/3341/3341
+f 3490/3540/3540 3287/3345/3345 3491/3541/3541
+f 3492/3542/3542 3493/3347/3347 3494/3543/3543
+f 3491/3541/3541 3287/3345/3345 3492/3542/3542
+f 3289/3346/3346 3287/3345/3345 3288/3348/3348
+f 3493/3347/3347 3492/3542/3542 3289/3346/3346
+f 3492/3542/3542 3287/3345/3345 3289/3346/3346
+f 3287/3345/3345 3490/3540/3540 3489/3539/3539
+f 3287/3345/3345 3489/3539/3539 3286/3344/3344
+f 3495/3350/3350 3496/3544/3544 3497/3545/3545
+f 3293/3351/3351 3498/3546/3546 3292/3349/3349
+f 3500/3547/3547 3499/3548/3548 3293/3351/3351
+f 3499/3548/3548 3498/3546/3546 3293/3351/3351
+f 3292/3349/3349 3496/3544/3544 3495/3350/3350
+f 3498/3546/3546 3496/3544/3544 3292/3349/3349
+f 3294/3356/3356 3501/3549/3549 3502/3550/3550
+f 3504/3551/3551 3298/3353/3353 3505/3552/3552
+f 3297/3352/3352 3503/3553/3553 3296/3354/3354
+f 3298/3353/3353 3504/3551/3551 3297/3352/3352
+f 3504/3551/3551 3503/3553/3553 3297/3352/3352
+f 3295/3355/3355 3501/3549/3549 3294/3356/3356
+f 3296/3354/3354 3503/3553/3553 3295/3355/3355
+f 3503/3553/3553 3501/3549/3549 3295/3355/3355
+f 3298/3353/3353 3506/3554/3554 3505/3552/3552
+f 3508/3555/3555 3509/3358/3358 3510/3556/3556
+f 3301/3357/3357 3507/3557/3557 3300/3359/3359
+f 3509/3358/3358 3508/3555/3555 3301/3357/3357
+f 3508/3555/3555 3507/3557/3557 3301/3357/3357
+f 3299/3360/3360 3506/3554/3554 3298/3353/3353
+f 3300/3359/3359 3507/3557/3557 3299/3360/3360
+f 3507/3557/3557 3506/3554/3554 3299/3360/3360
+f 3509/3358/3358 3511/3558/3558 3510/3556/3556
+f 3511/3558/3558 3304/3364/3364 3512/3559/3559
+f 3513/3560/3560 3304/3364/3364 3514/3561/3561
+f 3512/3559/3559 3304/3364/3364 3513/3560/3560
+f 3514/3561/3561 3304/3364/3364 3305/3363/3363
+f 3514/3561/3561 3305/3363/3363 3306/3362/3362
+f 3303/3361/3361 3511/3558/3558 3509/3358/3358
+f 3304/3364/3364 3511/3558/3558 3303/3361/3361
+f 3516/3562/3562 3309/3366/3366 3517/3563/3563
+f 3517/3563/3563 3309/3366/3366 3518/3564/3564
+f 3519/3565/3565 3518/3564/3564 3310/3367/3367
+f 3519/3565/3565 3310/3367/3367 3311/3368/3368
+f 3518/3564/3564 3309/3366/3366 3310/3367/3367
+f 3308/3365/3365 3516/3562/3562 3515/3566/3566
+f 3308/3365/3365 3515/3566/3566 3307/3369/3369
+f 3309/3366/3366 3516/3562/3562 3308/3365/3365
+f 3312/3374/3374 3520/3567/3567 3521/3568/3568
+f 3523/3569/3569 3524/3371/3371 3525/3570/3570
+f 3315/3370/3370 3522/3571/3571 3314/3372/3372
+f 3524/3371/3371 3523/3569/3569 3315/3370/3370
+f 3523/3569/3569 3522/3571/3571 3315/3370/3370
+f 3313/3373/3373 3520/3567/3567 3312/3374/3374
+f 3314/3372/3372 3522/3571/3571 3313/3373/3373
+f 3522/3571/3571 3520/3567/3567 3313/3373/3373
+f 3524/3371/3371 3526/3572/3572 3525/3570/3570
+f 3528/3573/3573 3529/3377/3377 3530/3574/3574
+f 3319/3376/3376 3527/3575/3575 3318/3378/3378
+f 3529/3377/3377 3528/3573/3573 3319/3376/3376
+f 3528/3573/3573 3527/3575/3575 3319/3376/3376
+f 3317/3375/3375 3526/3572/3572 3524/3371/3371
+f 3318/3378/3378 3527/3575/3575 3317/3375/3375
+f 3527/3575/3575 3526/3572/3572 3317/3375/3375
+f 3324/3379/3379 3533/3576/3576 3323/3380/3380
+f 3535/3577/3577 3534/3578/3578 3324/3379/3379
+f 3535/3577/3577 3324/3379/3379 3325/3381/3381
+f 3534/3578/3578 3533/3576/3576 3324/3379/3379
+f 3322/3382/3382 3532/3579/3579 3531/3580/3580
+f 3322/3382/3382 3531/3580/3580 3321/3383/3383
+f 3323/3380/3380 3533/3576/3576 3322/3382/3382
+f 3533/3576/3576 3532/3579/3579 3322/3382/3382
+f 3536/3581/3581 3328/3386/3386 3537/3582/3582
+f 3328/3386/3386 3538/3583/3583 3537/3582/3582
+f 3326/3388/3388 3328/3386/3386 3536/3581/3581
+f 3539/3584/3584 3540/3385/3385 3541/3585/3585
+f 3538/3583/3583 3328/3386/3386 3539/3584/3584
+f 3540/3385/3385 3539/3584/3584 3329/3384/3384
+f 3539/3584/3584 3328/3386/3386 3329/3384/3384
+f 3327/3387/3387 3328/3386/3386 3326/3388/3388
+f 3540/3385/3385 3542/3586/3586 3541/3585/3585
+f 3333/3390/3390 3543/3587/3587 3332/3392/3392
+f 3545/3588/3588 3544/3589/3589 3333/3390/3390
+f 3545/3588/3588 3333/3390/3390 3334/3391/3391
+f 3544/3589/3589 3543/3587/3587 3333/3390/3390
+f 3331/3389/3389 3542/3586/3586 3540/3385/3385
+f 3332/3392/3392 3543/3587/3587 3331/3389/3389
+f 3543/3587/3587 3542/3586/3586 3331/3389/3389
+f 3546/3590/3590 3336/3396/3396 3547/3591/3591
+f 3548/3592/3592 3336/3396/3396 3549/3593/3593
+f 3336/3396/3396 3338/3394/3394 3549/3593/3593
+f 3547/3591/3591 3336/3396/3396 3548/3592/3592
+f 3338/3394/3394 3336/3396/3396 3337/3395/3395
+f 3335/3393/3393 3546/3590/3590 3545/3588/3588
+f 3335/3393/3393 3545/3588/3588 3334/3391/3391
+f 3336/3396/3396 3546/3590/3590 3335/3393/3393
+f 3342/3399/3399 3552/3594/3594 3341/3397/3397
+f 3554/3595/3595 3553/3596/3596 3342/3399/3399
+f 3554/3595/3595 3342/3399/3399 3343/3398/3398
+f 3553/3596/3596 3552/3594/3594 3342/3399/3399
+f 3340/3400/3400 3551/3597/3597 3550/3598/3598
+f 3340/3400/3400 3550/3598/3598 3339/3401/3401
+f 3341/3397/3397 3552/3594/3594 3340/3400/3400
+f 3552/3594/3594 3551/3597/3597 3340/3400/3400
+f 3344/3406/3406 3555/3599/3599 3556/3600/3600
+f 3347/3402/3402 3557/3601/3601 3346/3404/3404
+f 3559/3602/3602 3558/3603/3603 3347/3402/3402
+f 3559/3602/3602 3347/3402/3402 3348/3403/3403
+f 3558/3603/3603 3557/3601/3601 3347/3402/3402
+f 3345/3405/3405 3555/3599/3599 3344/3406/3406
+f 3346/3404/3404 3557/3601/3601 3345/3405/3405
+f 3557/3601/3601 3555/3599/3599 3345/3405/3405
+f 3562/3604/3604 3352/3408/3408 3563/3605/3605
+f 3351/3409/3409 3561/3606/3606 3350/3410/3410
+f 3352/3408/3408 3562/3604/3604 3351/3409/3409
+f 3562/3604/3604 3561/3606/3606 3351/3409/3409
+f 3349/3407/3407 3560/3607/3607 3559/3602/3602
+f 3349/3407/3407 3559/3602/3602 3348/3403/3403
+f 3350/3410/3410 3561/3606/3606 3349/3407/3407
+f 3561/3606/3606 3560/3607/3607 3349/3407/3407
+f 3356/3413/3413 3566/3608/3608 3355/3411/3411
+f 3568/3609/3609 3567/3610/3610 3356/3413/3413
+f 3568/3609/3609 3356/3413/3413 3357/3412/3412
+f 3567/3610/3610 3566/3608/3608 3356/3413/3413
+f 3354/3414/3414 3565/3611/3611 3564/3612/3612
+f 3354/3414/3414 3564/3612/3612 3353/3415/3415
+f 3355/3411/3411 3566/3608/3608 3354/3414/3414
+f 3566/3608/3608 3565/3611/3611 3354/3414/3414
+f 3569/3613/3613 3360/3418/3418 3570/3614/3614
+f 3360/3418/3418 3571/3615/3615 3570/3614/3614
+f 3572/3616/3616 3573/3417/3417 3574/3617/3617
+f 3571/3615/3615 3360/3418/3418 3572/3616/3616
+f 3573/3417/3417 3572/3616/3616 3361/3416/3416
+f 3572/3616/3616 3360/3418/3418 3361/3416/3416
+f 3359/3419/3419 3360/3418/3418 3569/3613/3613
+f 3359/3419/3419 3569/3613/3613 3358/3420/3420
+f 3573/3417/3417 3575/3618/3618 3574/3617/3617
+f 3365/3422/3422 3576/3619/3619 3364/3234/3234
+f 3578/3620/3620 3577/3621/3621 3365/3422/3422
+f 3578/3620/3620 3365/3422/3422 3366/3423/3423
+f 3577/3621/3621 3576/3619/3619 3365/3422/3422
+f 3363/3421/3421 3575/3618/3618 3573/3417/3417
+f 3364/3234/3234 3576/3619/3619 3363/3421/3421
+f 3576/3619/3619 3575/3618/3618 3363/3421/3421
+f 3579/3622/3622 3368/3427/3427 3580/3623/3623
+f 3581/3624/3624 3368/3427/3427 3582/3625/3625
+f 3580/3623/3623 3368/3427/3427 3581/3624/3624
+f 3582/3625/3625 3368/3427/3427 3369/3426/3426
+f 3582/3625/3625 3369/3426/3426 3370/3425/3425
+f 3367/3424/3424 3579/3622/3622 3578/3620/3620
+f 3367/3424/3424 3578/3620/3620 3366/3423/3423
+f 3368/3427/3427 3579/3622/3622 3367/3424/3424
+f 3374/3428/3428 3585/3626/3626 3373/3430/3430
+f 3587/3627/3627 3586/3628/3628 3374/3428/3428
+f 3587/3627/3627 3374/3428/3428 3375/3429/3429
+f 3586/3628/3628 3585/3626/3626 3374/3428/3428
+f 3372/3431/3431 3584/3629/3629 3583/3630/3630
+f 3372/3431/3431 3583/3630/3630 3371/3432/3432
+f 3373/3430/3430 3585/3626/3626 3372/3431/3431
+f 3585/3626/3626 3584/3629/3629 3372/3431/3431
+f 3376/3437/3437 3588/3631/3631 3589/3632/3632
+f 3591/3633/3633 3592/3434/3434 3593/3634/3634
+f 3379/3433/3433 3590/3635/3635 3378/3435/3435
+f 3592/3434/3434 3591/3633/3633 3379/3433/3433
+f 3591/3633/3633 3590/3635/3635 3379/3433/3433
+f 3377/3436/3436 3588/3631/3631 3376/3437/3437
+f 3378/3435/3435 3590/3635/3635 3377/3436/3436
+f 3590/3635/3635 3588/3631/3631 3377/3436/3436
+f 3592/3434/3434 3594/3636/3636 3593/3634/3634
+f 3594/3636/3636 3383/3440/3440 3595/3637/3637
+f 3596/3638/3638 3385/3442/3442 3597/3639/3639
+f 3595/3637/3637 3383/3440/3440 3596/3638/3638
+f 3385/3442/3442 3596/3638/3638 3384/3441/3441
+f 3596/3638/3638 3383/3440/3440 3384/3441/3441
+f 3381/3438/3438 3594/3636/3636 3592/3434/3434
+f 3383/3440/3440 3594/3636/3636 3381/3438/3438
+f 3389/3443/3443 3600/3640/3640 3388/3444/3444
+f 3602/3641/3641 3601/3642/3642 3389/3443/3443
+f 3602/3641/3641 3389/3443/3443 3390/3445/3445
+f 3601/3642/3642 3600/3640/3640 3389/3443/3443
+f 3387/3446/3446 3599/3643/3643 3598/3644/3644
+f 3387/3446/3446 3598/3644/3644 3386/3447/3447
+f 3388/3444/3444 3600/3640/3640 3387/3446/3446
+f 3600/3640/3640 3599/3643/3643 3387/3446/3446
+f 3603/3645/3645 3393/3449/3449 3604/3646/3646
+f 3393/3449/3449 3605/3647/3647 3604/3646/3646
+f 3605/3647/3647 3393/3449/3449 3606/3648/3648
+f 3607/3649/3649 3606/3648/3648 3394/3450/3450
+f 3607/3649/3649 3394/3450/3450 3395/3451/3451
+f 3606/3648/3648 3393/3449/3449 3394/3450/3450
+f 3392/3448/3448 3393/3449/3449 3603/3645/3645
+f 3392/3448/3448 3603/3645/3645 3391/3452/3452
+f 3398/3454/3454 3609/3650/3650 3397/3456/3456
+f 3611/3651/3651 3610/3652/3652 3398/3454/3454
+f 3611/3651/3651 3398/3454/3454 3399/3455/3455
+f 3610/3652/3652 3609/3650/3650 3398/3454/3454
+f 3396/3453/3453 3608/3653/3653 3607/3649/3649
+f 3396/3453/3453 3607/3649/3649 3395/3451/3451
+f 3397/3456/3456 3609/3650/3650 3396/3453/3453
+f 3609/3650/3650 3608/3653/3653 3396/3453/3453
+f 3612/3654/3654 3401/3460/3460 3613/3655/3655
+f 3614/3656/3656 3401/3460/3460 3615/3657/3657
+f 3613/3655/3655 3401/3460/3460 3614/3656/3656
+f 3615/3657/3657 3401/3460/3460 3402/3459/3459
+f 3615/3657/3657 3402/3459/3459 3403/3458/3458
+f 3400/3457/3457 3612/3654/3654 3611/3651/3651
+f 3400/3457/3457 3611/3651/3651 3399/3455/3455
+f 3401/3460/3460 3612/3654/3654 3400/3457/3457
+f 3407/3461/3461 3618/3658/3658 3406/3462/3462
+f 3620/3659/3659 3619/3660/3660 3407/3461/3461
+f 3620/3659/3659 3407/3461/3461 3408/3463/3463
+f 3619/3660/3660 3618/3658/3658 3407/3461/3461
+f 3405/3464/3464 3617/3661/3661 3616/3662/3662
+f 3405/3464/3464 3616/3662/3662 3404/3465/3465
+f 3406/3462/3462 3618/3658/3658 3405/3464/3464
+f 3618/3658/3658 3617/3661/3661 3405/3464/3464
+f 3621/3467/3467 3622/3663/3663 3623/3664/3664
+f 3625/3665/3665 3626/3469/3469 3627/3666/3666
+f 3412/3468/3468 3624/3667/3667 3411/3470/3470
+f 3626/3469/3469 3625/3665/3665 3412/3468/3468
+f 3625/3665/3665 3624/3667/3667 3412/3468/3468
+f 3410/3466/3466 3622/3663/3663 3621/3467/3467
+f 3411/3470/3470 3624/3667/3667 3410/3466/3466
+f 3624/3667/3667 3622/3663/3663 3410/3466/3466
+f 3626/3469/3469 3628/3668/3668 3627/3666/3666
+f 3630/3669/3669 3417/3472/3472 3631/3670/3670
+f 3416/3473/3473 3629/3671/3671 3415/3474/3474
+f 3417/3472/3472 3630/3669/3669 3416/3473/3473
+f 3630/3669/3669 3629/3671/3671 3416/3473/3473
+f 3414/3471/3471 3628/3668/3668 3626/3469/3469
+f 3415/3474/3474 3629/3671/3671 3414/3471/3471
+f 3629/3671/3671 3628/3668/3668 3414/3471/3471
+f 3633/3672/3672 3635/3673/3673 3632/3674/3674
+f 3635/3673/3673 3636/3675/3675 3637/3676/3676
+f 3635/3673/3673 3633/3672/3672 3636/3675/3675
+f 3635/3673/3673 454/501/495 440/486/480
+f 454/501/495 448/494/488 440/486/480
+f 3638/3677/3677 454/501/495 3635/3673/3673
+f 3638/3677/3677 3635/3673/3673 3637/3676/3676
+f 453/499/493 3639/3678/3678 540/594/588
+f 542/502/496 3639/3678/3678 453/499/493
+f 3638/3677/3677 542/502/496 454/501/495
+f 3640/3679/3679 3641/3680/3680 3642/3681/3681
+f 3640/3679/3679 3643/3682/3682 3641/3680/3680
+f 3644/3683/3683 3643/3682/3682 3640/3679/3679
+f 3645/3684/3684 3646/3685/3685 3647/3686/3686
+f 3641/3680/3680 3643/3682/3682 3645/3684/3684
+f 3641/3680/3680 3645/3684/3684 503/555/549
+f 3643/3682/3682 3646/3685/3685 3645/3684/3684
+f 3646/3685/3685 3643/3682/3682 3644/3683/3683
+f 3646/3685/3685 3644/3683/3683 3648/3687/3687
+f 3647/3686/3686 3646/3685/3685 3648/3687/3687
+f 3645/3684/3684 501/530/524 500/553/547
+f 3645/3684/3684 500/553/547 503/555/549
+f 3647/3686/3686 3650/3688/3688 501/530/524
+f 3647/3686/3686 501/530/524 3645/3684/3684
+f 3650/3688/3688 3649/528/522 501/530/524
+f 3649/528/522 3650/3688/3688 479/529/523
+f 479/529/523 3650/3688/3688 480/531/525
+f 445/491/485 480/531/525 3648/3687/3687
+f 445/491/485 3648/3687/3687 3634/3689/3689
+f 480/531/525 3650/3688/3688 3647/3686/3686
+f 480/531/525 3647/3686/3686 3648/3687/3687
+f 444/490/484 3635/3673/3673 439/485/479
+f 439/485/479 3635/3673/3673 440/486/480
+f 3632/3674/3674 445/491/485 3634/3689/3689
+f 3632/3674/3674 444/490/484 445/491/485
+f 3635/3673/3673 444/490/484 3632/3674/3674
+f 3651/3690/3690 527/581/575 528/582/576
+f 3651/3690/3690 3653/3691/3691 527/581/575
+f 527/581/575 3653/3691/3691 3654/580/574
+f 3655/579/573 3654/580/574 3642/3681/3681
+f 504/556/550 526/577/571 3641/3680/3680
+f 504/556/550 3641/3680/3680 503/555/549
+f 3641/3680/3680 3655/579/573 3642/3681/3681
+f 3641/3680/3680 526/577/571 3655/579/573
+f 3658/3692/3692 3659/3693/3693 3656/3694/3694
+f 528/582/576 3659/3693/3693 3651/3690/3690
+f 3656/3694/3694 3659/3693/3693 528/582/576
+f 3651/3690/3690 3659/3693/3693 3652/3695/3695
+f 3656/3694/3694 3660/3696/3696 3661/3697/3697
+f 3656/3694/3694 3661/3697/3697 3657/3698/3698
+f 3662/3699/3699 3663/576/570 3675/3700/3700
+f 3662/3699/3699 3675/3700/3700 3664/3701/3701
+f 3660/3696/3696 3663/576/570 3662/3699/3699
+f 3663/576/570 3660/3696/3696 528/582/576
+f 528/582/576 3660/3696/3696 3656/3694/3694
+f 3666/3702/3702 3668/3703/3703 3665/3704/3704
+f 3669/3705/3705 3666/3702/3702 3665/3704/3704
+f 3670/3706/3706 469/518/512 427/475/469
+f 3670/3706/3706 3671/3707/3707 3672/517/511
+f 3670/3706/3706 3672/517/511 469/518/512
+f 3668/3703/3703 3666/3702/3702 3670/3706/3706
+f 3666/3702/3702 3669/3705/3705 3671/3707/3707
+f 3666/3702/3702 3671/3707/3707 3670/3706/3706
+f 3671/3707/3707 3669/3705/3705 3673/3708/3708
+f 3672/517/511 3671/3707/3707 3673/3708/3708
+f 3673/3708/3708 470/519/513 3672/517/511
+f 3674/545/539 470/519/513 3673/3708/3708
+f 3674/545/539 3673/3708/3708 3664/3701/3701
+f 470/519/513 3674/545/539 467/515/509
+f 3674/545/539 3675/3700/3700 524/546/540
+f 3675/3700/3700 3674/545/539 3664/3701/3701
+f 524/546/540 3675/3700/3700 3663/576/570
+f 3676/419/413 3677/3709/3709 3667/3710/3710
+f 3676/419/413 3678/3711/3711 3677/3709/3709
+f 3679/3712/3712 328/367/361 3680/3713/3713
+f 328/367/361 3679/3712/3712 349/390/384
+f 3679/3712/3712 3678/3711/3711 349/390/384
+f 349/390/384 3676/419/413 350/392/386
+f 349/390/384 3678/3711/3711 3676/419/413
+f 373/417/411 3676/419/413 376/420/414
+f 376/420/414 3676/419/413 3667/3710/3710
+f 3665/3704/3704 398/444/438 376/420/414
+f 3665/3704/3704 376/420/414 3667/3710/3710
+f 3668/3703/3703 398/444/438 3665/3704/3704
+f 376/420/414 398/444/438 394/441/435
+f 398/444/438 429/476/470 395/442/436
+f 425/473/467 429/476/470 3670/3706/3706
+f 425/473/467 3670/3706/3706 427/475/469
+f 429/476/470 3668/3703/3703 3670/3706/3706
+f 429/476/470 398/444/438 3668/3703/3703
+f 328/367/361 3684/3714/3714 3680/3713/3713
+f 328/367/361 3682/3715/3715 3684/3714/3714
+f 3685/343/337 3686/3716/3716 3683/3717/3717
+f 3688/3718/3718 3698/3719/3719 3689/3720/3720
+f 3688/3718/3718 3690/3721/3721 3691/3722/3722
+f 3688/3718/3718 3691/3722/3722 3698/3719/3719
+f 3687/3723/3723 3690/3721/3721 3688/3718/3718
+f 3691/3722/3722 3690/3721/3721 259/300/293
+f 3691/3722/3722 259/300/293 196/236/229
+f 3690/3721/3721 3687/3723/3723 259/300/293
+f 258/301/294 3686/3716/3716 3685/343/337
+f 259/300/293 3687/3723/3723 3686/3716/3716
+f 259/300/293 3686/3716/3716 258/301/294
+f 3685/343/337 304/346/340 302/342/336
+f 304/346/340 3692/3724/3724 303/345/339
+f 3692/3724/3724 3685/343/337 3683/3717/3717
+f 3692/3724/3724 304/346/340 3685/343/337
+f 3681/3725/3725 3682/3715/3715 317/358/352
+f 3681/3725/3725 317/358/352 303/345/339
+f 317/358/352 3682/3715/3715 329/369/363
+f 329/369/363 3682/3715/3715 328/367/361
+f 3681/3725/3725 3692/3724/3724 3683/3717/3717
+f 3681/3725/3725 303/345/339 3692/3724/3724
+f 3695/3726/3726 136/174/167 3693/3727/3727
+f 3696/3728/3728 136/174/167 3697/3729/3729
+f 3696/3728/3728 3697/3729/3729 3689/3720/3720
+f 136/174/167 3695/3726/3726 3697/3729/3729
+f 3696/3728/3728 134/171/164 136/174/167
+f 134/171/164 195/233/226 132/169/162
+f 195/233/226 134/171/164 3696/3728/3728
+f 195/233/226 3698/3719/3719 197/235/228
+f 3696/3728/3728 3698/3719/3719 195/233/226
+f 196/236/229 197/235/228 3691/3722/3722
+f 197/235/228 3698/3719/3719 3691/3722/3722
+f 3698/3719/3719 3696/3728/3728 3689/3720/3720
+f 3699/3730/3730 3700/3731/3731 3701/3732/3732
+f 3699/3730/3730 3701/3732/3732 3702/3733/3733
+f 3703/3734/3734 3700/3731/3731 3699/3730/3730
+f 135/173/166 3693/3727/3727 136/174/167
+f 135/173/166 3700/3731/3731 3693/3727/3727
+f 3693/3727/3727 3704/3735/3735 3694/3736/3736
+f 3693/3727/3727 3700/3731/3731 3703/3734/3734
+f 3693/3727/3727 3703/3734/3734 3704/3735/3735
+f 3701/3732/3732 3706/3737/3737 3705/3738/3738
+f 3700/3731/3731 3706/3737/3737 3701/3732/3732
+f 3706/3737/3737 3707/3739/3739 3708/3740/3740
+f 3707/3739/3739 3706/3737/3737 133/170/163
+f 3706/3737/3737 135/173/166 133/170/163
+f 135/173/166 3706/3737/3737 3700/3731/3731
+f 3709/3741/3741 3710/16/3742 3711/15/3743
+f 3709/3741/3741 3712/3742/3744 87/124/116
+f 3709/3741/3741 87/124/116 3710/16/3742
+f 3713/3743/3745 3714/3744/3746 3709/3741/3741
+f 3714/3744/3746 3712/3742/3744 3709/3741/3741
+f 83/120/112 3712/3742/3744 3715/3745/3747
+f 3712/3742/3744 3714/3744/3746 3716/3746/3748
+f 3712/3742/3744 3716/3746/3748 3715/3745/3747
+f 87/124/116 3712/3742/3744 83/120/112
+f 3716/3746/3748 3714/3744/3746 3713/3743/3745
+f 3716/3746/3748 3713/3743/3745 3717/3747/3749
+f 3718/3748/3750 3719/178/171 3717/3747/3749
+f 3718/3748/3750 3717/3747/3749 3708/3740/3740
+f 3719/178/171 3716/3746/3748 3717/3747/3749
+f 3715/3745/3747 80/118/110 83/120/112
+f 3715/3745/3747 143/182/175 80/118/110
+f 3716/3746/3748 143/182/175 3715/3745/3747
+f 143/182/175 3716/3746/3748 144/181/174
+f 144/181/174 3716/3746/3748 3719/178/171
+f 3718/3748/3750 138/172/165 3719/178/171
+f 138/172/165 3707/3739/3739 133/170/163
+f 138/172/165 3718/3748/3750 3707/3739/3739
+f 3707/3739/3739 3718/3748/3750 3708/3740/3740
+f 94/130/123 3711/15/3743 90/14/119
+f 90/14/119 3710/16/3742 88/125/117
+f 3710/16/3742 87/124/116 88/125/117
+f 81/117/109 87/124/116 83/120/112
+f 3722/3749/3751 91/127/120 3720/3750/3752
+f 91/127/120 3722/3749/3751 94/130/123
+f 3726/3751/3753 3723/3752/3754 3721/3753/3755
+f 3726/3751/3753 3724/105/97 3725/3754/3756
+f 3726/3751/3753 3725/3754/3756 3723/3752/3754
+f 3727/3755/3757 3728/103/95 3729/3756/3758
+f 3727/3755/3757 3724/105/97 3728/103/95
+f 3725/3754/3756 3724/105/97 3727/3755/3757
+f 3728/103/95 3724/105/97 68/100/92
+f 3724/105/97 3726/3751/3753 69/104/96
+f 69/104/96 3726/3751/3753 91/127/120
+f 3720/3750/3752 3726/3751/3753 3721/3753/3755
+f 91/127/120 3726/3751/3753 3720/3750/3752
+f 3730/3757/3759 3732/3758/3760 3740/3759/3761
+f 3733/3760/3762 3732/3758/3760 3730/3757/3759
+f 19/49/41 3734/62/54 21/50/42
+f 3734/62/54 3735/3761/3763 3736/3762/3764
+f 3740/3759/3761 3732/3758/3760 3734/62/54
+f 3740/3759/3761 3734/62/54 19/49/41
+f 3732/3758/3760 3735/3761/3763 3734/62/54
+f 3739/3763/3765 3735/3761/3763 3737/3764/3766
+f 3739/3763/3765 3737/3764/3766 3729/3756/3758
+f 3735/3761/3763 3732/3758/3760 3733/3760/3762
+f 3735/3761/3763 3733/3760/3762 3737/3764/3766
+f 3736/3762/3764 3735/3761/3763 3739/3763/3765
+f 3736/3762/3764 33/61/53 3734/62/54
+f 33/61/53 3738/3765/3767 45/74/66
+f 33/61/53 3736/3762/3764 3738/3765/3767
+f 3739/3763/3765 3738/3765/3767 3736/3762/3764
+f 3738/3765/3767 44/73/65 45/74/66
+f 3739/3763/3765 54/85/77 44/73/65
+f 3739/3763/3765 44/73/65 3738/3765/3767
+f 3728/103/95 54/85/77 3729/3756/3758
+f 54/85/77 3739/3763/3765 3729/3756/3758
+f 22/43/35 3740/3759/3761 18/48/40
+f 3741/3766/3768 3740/3759/3761 22/43/35
+f 18/48/40 3740/3759/3761 19/49/41
+f 3730/3757/3759 3741/3766/3768 3731/3767/3769
+f 3740/3759/3761 3741/3766/3768 3730/3757/3759
+f 3744/3768/3770 3743/3769/3771 3742/3770/3772
+f 3743/3769/3771 3744/3768/3770 1/30/22
+f 3746/3771/3773 3744/3768/3770 3745/3772/3774
+f 3746/3771/3773 3745/3772/3774 3731/3767/3769
+f 3744/3768/3770 6/36/28 1/30/22
+f 6/36/28 10/39/31 11/38/30
+f 6/36/28 3746/3771/3773 10/39/31
+f 3746/3771/3773 3741/3766/3768 22/43/35
+f 10/39/31 3746/3771/3773 22/43/35
+f 3741/3766/3768 3746/3771/3773 3731/3767/3769
+f 3746/3771/3773 6/36/28 3744/3768/3770
+f 3743/3769/3771 3747/3773/3775 3748/3774/3776
+f 3750/3775/3777 1/30/22 3751/3776/3778
+f 3747/3773/3775 3750/3775/3777 3749/3777/3779
+f 3747/3773/3775 1/30/22 3750/3775/3777
+f 3751/3776/3778 1/30/22 3752/32/24
+f 1/30/22 3747/3773/3775 3743/3769/3771
+f 3752/32/24 3755/3778/3780 3753/3779/3781
+f 3752/32/24 3754/3780/3782 3751/3776/3778
+f 3755/3778/3780 2/31/23 3/37/29
+f 2/31/23 3755/3778/3780 3752/32/24
+f 3760/3781/3783 3759/3782/3784 3757/3783/3785
+f 3760/3781/3783 3757/3783/3785 3756/3784/3786
+f 3761/3785/3787 30/60/52 29/57/49
+f 3761/3785/3787 3762/3786/3788 3763/3787/3789
+f 3761/3785/3787 3763/3787/3789 30/60/52
+f 3757/3783/3785 3759/3782/3784 3761/3785/3787
+f 3759/3782/3784 3762/3786/3788 3761/3785/3787
+f 3763/3787/3789 3764/3788/3790 3753/3779/3781
+f 3764/3788/3790 3759/3782/3784 3760/3781/3783
+f 3763/3787/3789 3762/3786/3788 3764/3788/3790
+f 3762/3786/3788 3759/3782/3784 3764/3788/3790
+f 3755/3778/3780 3765/3789/3791 3763/3787/3789
+f 3755/3778/3780 3763/3787/3789 3753/3779/3781
+f 16/44/36 3765/3789/3791 15/45/37
+f 30/60/52 3763/3787/3789 16/44/36
+f 3763/3787/3789 3765/3789/3791 16/44/36
+f 15/45/37 3765/3789/3791 3/37/29
+f 3765/3789/3791 3755/3778/3780 3/37/29
+f 3767/3790/3792 3768/3791/3793 3758/3792/3794
+f 3767/3790/3792 3766/98/90 3768/3791/3793
+f 3766/98/90 3769/3793/3795 3768/3791/3793
+f 3769/3793/3795 3766/98/90 114/146/139
+f 111/116/108 3766/98/90 78/114/106
+f 114/146/139 3766/98/90 111/116/108
+f 3766/98/90 3767/3790/3792 65/97/89
+f 3767/3790/3792 52/84/76 65/97/89
+f 52/84/76 3767/3790/3792 3758/3792/3794
+f 3756/3784/3786 3770/83/75 52/84/76
+f 3756/3784/3786 52/84/76 3758/3792/3794
+f 3757/3783/3785 3771/81/73 3770/83/75
+f 3757/3783/3785 3770/83/75 3756/3784/3786
+f 40/69/61 3772/3794/3796 29/57/49
+f 40/69/61 29/57/49 28/59/51
+f 3771/81/73 3772/3794/3796 40/69/61
+f 29/57/49 3772/3794/3796 3761/3785/3787
+f 3772/3794/3796 3771/81/73 3757/3783/3785
+f 3772/3794/3796 3757/3783/3785 3761/3785/3787
+f 3773/3795/3797 3774/152/145 3775/3796/3798
+f 3773/3795/3797 3769/3793/3795 3774/152/145
+f 3774/152/145 3769/3793/3795 114/146/139
+f 3774/152/145 3776/3797/3799 3775/3796/3798
+f 3774/152/145 3777/3798/3800 3776/3797/3799
+f 3778/3799/3801 117/151/144 120/155/148
+f 3778/3799/3801 120/155/148 3779/3800/3802
+f 3777/3798/3800 117/151/144 3778/3799/3801
+f 117/151/144 3777/3798/3800 3774/152/145
+f 3781/3801/3803 3783/3802/3804 3784/3803/3805
+f 3781/3801/3803 3784/3803/3805 3780/3804/3806
+f 3785/3805/3807 3783/3802/3804 3781/3801/3803
+f 3785/3805/3807 3781/3801/3803 3780/3804/3806
+f 131/167/160 3786/3806/3808 126/162/155
+f 131/167/160 126/162/155 123/157/150
+f 3786/3806/3808 125/161/154 126/162/155
+f 3784/3803/3805 3783/3802/3804 3786/3806/3808
+f 3784/3803/3805 3786/3806/3808 131/167/160
+f 125/161/154 3787/3807/3809 3779/3800/3802
+f 3787/3807/3809 3783/3802/3804 3785/3805/3807
+f 125/161/154 3786/3806/3808 3787/3807/3809
+f 3786/3806/3808 3783/3802/3804 3787/3807/3809
+f 125/161/154 3788/156/149 118/153/146
+f 3788/156/149 125/161/154 3779/3800/3802
+f 120/155/148 3788/156/149 3779/3800/3802
+f 191/231/224 3789/3808/3810 189/226/219
+f 3790/3809/3811 3789/3808/3810 191/231/224
+f 189/226/219 3789/3808/3810 3782/3810/3812
+f 189/226/219 3782/3810/3812 184/222/215
+f 3782/3810/3812 3791/3811/3813 184/222/215
+f 3791/3811/3813 185/223/216 184/222/215
+f 128/164/157 3784/3803/3805 131/167/160
+f 129/166/159 185/223/216 3784/3803/3805
+f 129/166/159 3784/3803/3805 128/164/157
+f 3780/3804/3806 3791/3811/3813 3782/3810/3812
+f 3784/3803/3805 3791/3811/3813 3780/3804/3806
+f 3784/3803/3805 185/223/216 3791/3811/3813
+f 3793/3812/3814 3792/3813/3815 192/229/222
+f 3792/3813/3815 3794/3814/3816 191/231/224
+f 3792/3813/3815 191/231/224 192/229/222
+f 3789/3808/3810 3790/3809/3811 3782/3810/3812
+f 191/231/224 3794/3814/3816 3790/3809/3811
+f 3793/3812/3814 192/229/222 3795/3815/3817
+f 192/229/222 3796/3816/3818 3795/3815/3817
+f 3796/3816/3818 3798/3817/3819 3797/3818/3820
+f 3801/230/223 3798/3817/3819 192/229/222
+f 3798/3817/3819 3796/3816/3818 192/229/222
+f 3798/3817/3819 3801/230/223 3802/3819/3821
+f 3805/3820/3822 3804/292/285 3803/3821/3823
+f 3805/3820/3822 3803/3821/3823 3800/3822/3824
+f 3807/3823/3825 3806/3824/3826 253/295/288
+f 3806/3824/3826 3804/292/285 253/295/288
+f 3805/3820/3822 249/232/225 3804/292/285
+f 249/232/225 3805/3820/3822 187/228/221
+f 3805/3820/3822 3800/3822/3824 187/228/221
+f 187/228/221 3800/3822/3824 3801/230/223
+f 3801/230/223 3800/3822/3824 3799/3825/3827
+f 297/337/331 3809/3826/3828 3808/3827/3829
+f 3809/3826/3828 297/337/331 3810/3828/3830
+f 3810/3828/3830 297/337/331 298/338/332
+f 3811/3829/3831 3810/3828/3830 298/338/332
+f 297/337/331 3808/3827/3829 255/297/290
+f 255/297/290 3807/3823/3825 254/296/289
+f 3808/3827/3829 3807/3823/3825 255/297/290
+f 254/296/289 3807/3823/3825 253/295/288
+f 3812/3830/3832 3813/3831/3833 3814/3832/3834
+f 295/335/329 3813/3831/3833 3812/3830/3832
+f 295/335/329 299/339/333 294/333/327
+f 299/339/333 3811/3829/3831 298/338/332
+f 3815/3833/3835 3816/3834/3836 3817/3835/3837
+f 3815/3833/3835 3817/3835/3837 3818/3836/3838
+f 3816/3834/3836 3819/3837/3839 3820/3838/3840
+f 3816/3834/3836 3820/3838/3840 3817/3835/3837
+f 3821/3839/3841 3822/3840/3842 3823/328/322
+f 3821/3839/3841 3823/328/322 281/320/314
+f 3820/3838/3840 3819/3837/3839 3821/3839/3841
+f 3819/3837/3839 3822/3840/3842 3821/3839/3841
+f 3824/3841/3843 3825/3842/3844 3826/3843/3845
+f 3822/3840/3842 3819/3837/3839 3816/3834/3836
+f 3823/328/322 3827/3844/3846 287/326/320
+f 287/326/320 3827/3844/3846 3828/327/321
+f 3829/3845/3847 3830/3846/3848 3824/3841/3843
+f 3829/3845/3847 3824/3841/3843 3826/3843/3845
+f 293/334/328 3813/3831/3833 295/335/329
+f 293/334/328 296/336/330 3813/3831/3833
+f 3813/3831/3833 3831/3847/3849 3832/3848/3850
+f 3813/3831/3833 3832/3848/3850 3814/3832/3834
+f 7/33/25 9/35/27 3818/3836/3838
+f 274/18/3851 3833/17/3852 8/34/26
+f 274/18/3851 273/255/248 272/313/306
+f 3835/3849/3853 274/18/3851 8/34/26
+f 273/255/248 215/257/250 213/254/247
+f 274/18/3851 3835/3849/3853 215/257/250
+f 274/18/3851 215/257/250 273/255/248
+f 215/257/250 3835/3849/3853 218/260/253
+f 220/262/255 3835/3849/3853 7/33/25
+f 218/260/253 3835/3849/3853 220/262/255
+f 219/261/254 220/262/255 221/269/262
+f 221/269/262 7/33/25 3818/3836/3838
+f 221/269/262 220/262/255 7/33/25
+f 3817/3835/3837 221/269/262 3818/3836/3838
+f 3817/3835/3837 227/268/261 221/269/262
+f 3820/3838/3840 3836/3850/3854 3817/3835/3837
+f 3836/3850/3854 227/268/261 3817/3835/3837
+f 226/267/260 3836/3850/3854 285/323/317
+f 227/268/261 3836/3850/3854 226/267/260
+f 283/321/315 285/323/317 3821/3839/3841
+f 283/321/315 3821/3839/3841 281/320/314
+f 285/323/317 3836/3850/3854 3820/3838/3840
+f 285/323/317 3820/3838/3840 3821/3839/3841
+f 3844/23/308 3837/20/3855 272/313/306
+f 272/313/306 3837/20/3855 274/18/3851
+f 3844/23/308 316/356/350 3850/26/3856
+f 316/356/350 3844/23/308 276/314/307
+f 3846/3851/3857 3847/3852/3858 3848/380/374
+f 3846/3851/3857 3848/380/374 3849/3853/3859
+f 3847/3852/3858 3850/26/3856 3851/3854/3860
+f 3847/3852/3858 3851/3854/3860 3848/380/374
+f 323/357/351 3850/26/3856 316/356/350
+f 3851/3854/3860 3850/26/3856 323/357/351
+f 3850/26/3856 3852/3855/3861 3842/27/3862
+f 3850/26/3856 3847/3852/3858 3852/3855/3861
+f 3848/380/374 3859/3856/3863 3849/3853/3859
+f 3848/380/374 3851/3854/3860 336/378/372
+f 336/378/372 3851/3854/3860 325/365/359
+f 3851/3854/3860 323/357/351 325/365/359
+f 3853/3857/3864 3854/3858/3865 3855/3859/3866
+f 3853/3857/3864 3855/3859/3866 3856/3860/3867
+f 3854/3858/3865 372/416/410 3855/3859/3866
+f 3857/3861/3868 3854/3858/3865 3853/3857/3864
+f 372/416/410 345/388/382 346/409/403
+f 372/416/410 3854/3858/3865 345/388/382
+f 3854/3858/3865 3857/3861/3868 344/387/381
+f 3854/3858/3865 344/387/381 345/388/382
+f 344/387/381 3857/3861/3868 347/389/383
+f 341/384/378 3858/3862/3869 3849/3853/3859
+f 341/384/378 347/389/383 3858/3862/3869
+f 347/389/383 3857/3861/3868 3858/3862/3869
+f 339/382/376 3859/3856/3863 338/377/371
+f 341/384/378 3859/3856/3863 339/382/376
+f 338/377/371 3859/3856/3863 3848/380/374
+f 3859/3856/3863 341/384/378 3849/3853/3859
+f 3860/3863/3870 393/437/431 424/466/460
+f 393/437/431 3860/3863/3870 3861/3864/3871
+f 393/437/431 3861/3864/3871 371/415/409
+f 3861/3864/3871 370/414/408 371/415/409
+f 369/411/405 370/414/408 372/416/410
+f 3855/3859/3866 3861/3864/3871 3856/3860/3867
+f 3855/3859/3866 370/414/408 3861/3864/3871
+f 372/416/410 370/414/408 3855/3859/3866
+f 3863/471/465 3862/3865/3872 423/470/464
+f 3862/3865/3872 3864/3866/3873 423/470/464
+f 3864/3866/3873 424/466/460 423/470/464
+f 3861/3864/3871 3865/3867/3874 3856/3860/3867
+f 3865/3867/3874 424/466/460 3864/3866/3873
+f 3860/3863/3870 424/466/460 3865/3867/3874
+f 3860/3863/3870 3865/3867/3874 3861/3864/3871
+f 3866/3868/3875 3863/471/465 421/467/461
+f 3868/3869/3876 3869/513/507 3870/3870/3877
+f 3868/3869/3876 464/511/505 3869/513/507
+f 3867/3871/3878 464/511/505 3868/3869/3876
+f 422/469/463 3866/3868/3875 421/467/461
+f 464/511/505 3867/3871/3878 3866/3868/3875
+f 464/511/505 3866/3868/3875 422/469/463
+f 490/542/536 3869/513/507 465/512/506
+f 3869/513/507 3871/3872/3879 3870/3870/3877
+f 490/542/536 519/569/563 3871/3872/3879
+f 490/542/536 3871/3872/3879 3869/513/507
+f 519/569/563 3872/3873/3880 3871/3872/3879
+f 3873/3874/3881 518/570/564 3875/586/580
+f 3873/3874/3881 3875/586/580 3874/3875/3882
+f 3872/3873/3880 518/570/564 3873/3874/3881
+f 518/570/564 3872/3873/3880 519/569/563
+f 3878/3876/3883 3879/3877/3884 3877/3878/3885
+f 3878/3876/3883 3877/3878/3885 3876/3879/3886
+f 3877/3878/3885 3879/3877/3884 536/590/584
+f 536/590/584 3879/3877/3884 532/585/579
+f 3879/3877/3884 3880/3880/3887 3874/3875/3882
+f 3879/3877/3884 3878/3876/3883 3880/3880/3887
+f 3879/3877/3884 3875/586/580 532/585/579
+f 3875/586/580 3879/3877/3884 3874/3875/3882
+f 3883/3881/3888 3882/3882/3889 3881/3883/3890
+f 536/590/584 3883/3881/3888 3877/3878/3885
+f 3882/3882/3889 3883/3881/3888 536/590/584
+f 3877/3878/3885 3883/3881/3888 3884/3884/3891
+f 3882/3882/3889 3885/3885/3892 3886/3886/3893
+f 3887/3887/3894 544/591/585 546/597/591
+f 3887/3887/3894 3885/3885/3892 536/590/584
+f 3887/3887/3894 536/590/584 544/591/585
+f 536/590/584 3885/3885/3892 3882/3882/3889
+f 3888/3888/3895 539/592/586 538/593/587
+f 3888/3888/3895 538/593/587 540/594/588
+f 3889/3889/3896 547/598/592 539/592/586
+f 3889/3889/3896 539/592/586 3888/3888/3895
+f 511/562/556 515/566/560 509/560/554
+f 511/562/556 545/596/590 515/566/560
+f 539/592/586 547/598/592 511/562/556
+f 547/598/592 545/596/590 511/562/556
+f 543/595/589 548/599/593 546/597/591
+f 548/599/593 547/598/592 3889/3889/3896
+f 2672/2745/2745 2669/2742/2742 733/795/789
+f 2672/2745/2745 733/795/789 730/791/785
+f 2669/2742/2742 2674/2739/2739 737/798/792
+f 2669/2742/2742 737/798/792 733/795/789
+f 2674/2739/2739 2665/2738/2738 724/786/780
+f 2674/2739/2739 724/786/780 737/798/792
+f 2665/2738/2738 2664/2737/2737 723/787/781
+f 2665/2738/2738 723/787/781 724/786/780
+f 2664/2737/2737 2662/2732/2732 725/784/778
+f 2664/2737/2737 725/784/778 723/787/781
+f 2662/2732/2732 2666/2734/2734 716/778/772
+f 2662/2732/2732 716/778/772 725/784/778
+f 2666/2734/2734 2658/2729/2729 716/778/772
+f 2658/2729/2729 2657/2728/2728 715/779/773
+f 2658/2729/2729 715/779/773 716/778/772
+f 2657/2728/2728 2655/2724/2724 717/776/770
+f 2657/2728/2728 717/776/770 715/779/773
+f 2655/2724/2724 2659/2726/2726 722/782/776
+f 2655/2724/2724 722/782/776 717/776/770
+f 2659/2726/2726 2652/2722/2722 708/766/760
+f 2659/2726/2726 708/766/760 722/782/776
+f 2652/2722/2722 2651/2720/2720 707/771/765
+f 2652/2722/2722 707/771/765 708/766/760
+f 2651/2720/2720 2647/2715/2715 709/769/763
+f 2651/2720/2720 709/769/763 707/771/765
+f 2647/2715/2715 2653/2717/2717 714/773/767
+f 2647/2715/2715 714/773/767 709/769/763
+f 2653/2717/2717 2644/2713/2713 699/760/754
+f 2653/2717/2717 699/760/754 714/773/767
+f 2644/2713/2713 2643/2711/2711 699/760/754
+f 2643/2711/2711 2639/2707/2707 701/758/752
+f 2643/2711/2711 701/758/752 699/760/754
+f 2639/2707/2707 2645/2709/2709 706/764/758
+f 2639/2707/2707 706/764/758 701/758/752
+f 2645/2709/2709 2635/2703/2703 692/753/747
+f 2645/2709/2709 692/753/747 706/764/758
+f 2635/2703/2703 2636/2705/2705 691/754/748
+f 2635/2703/2703 691/754/748 692/753/747
+f 2636/2705/2705 2633/2699/2699 693/751/745
+f 2636/2705/2705 693/751/745 691/754/748
+f 2633/2699/2699 2637/2701/2701 698/757/751
+f 2633/2699/2699 698/757/751 693/751/745
+f 2637/2701/2701 2630/2697/2697 685/742/736
+f 2637/2701/2701 685/742/736 698/757/751
+f 2630/2697/2697 2629/2695/2695 684/745/739
+f 2630/2697/2697 684/745/739 685/742/736
+f 2629/2695/2695 2626/2691/2691 686/746/740
+f 2629/2695/2695 686/746/740 684/745/739
+f 2626/2691/2691 2631/2693/2693 690/749/743
+f 2626/2691/2691 690/749/743 686/746/740
+f 2631/2693/2693 2624/2688/2688 678/735/729
+f 2631/2693/2693 678/735/729 690/749/743
+f 2624/2688/2688 2623/2687/2687 677/733/727
+f 2624/2688/2688 677/733/727 678/735/729
+f 2623/2687/2687 2620/2683/2683 680/737/731
+f 2623/2687/2687 680/737/731 677/733/727
+f 2620/2683/2683 2625/2685/2685 683/740/734
+f 2620/2683/2683 683/740/734 680/737/731
+f 2625/2685/2685 2619/2679/2679 669/727/721
+f 2625/2685/2685 669/727/721 683/740/734
+f 2619/2679/2679 2617/2678/2678 668/728/722
+f 2619/2679/2679 668/728/722 669/727/721
+f 2617/2678/2678 2613/2673/2673 670/725/719
+f 2617/2678/2678 670/725/719 668/728/722
+f 2613/2673/2673 2618/2676/2676 676/731/725
+f 2613/2673/2673 676/731/725 670/725/719
+f 2618/2676/2676 2608/2669/2669 661/719/713
+f 2618/2676/2676 661/719/713 676/731/725
+f 2608/2669/2669 2607/2668/2668 660/720/714
+f 2608/2669/2669 660/720/714 661/719/713
+f 2607/2668/2668 2609/2671/2671 662/717/711
+f 2607/2668/2668 662/717/711 660/720/714
+f 2609/2671/2671 2610/2664/2664 667/723/717
+f 2609/2671/2671 667/723/717 662/717/711
+f 2610/2664/2664 2601/2663/2663 653/709/703
+f 2610/2664/2664 653/709/703 667/723/717
+f 2601/2663/2663 2600/2661/2661 652/707/701
+f 2601/2663/2663 652/707/701 653/709/703
+f 2600/2661/2661 2596/2656/2656 655/711/705
+f 2600/2661/2661 655/711/705 652/707/701
+f 2596/2656/2656 2602/2658/2658 659/714/708
+f 2596/2656/2656 659/714/708 655/711/705
+f 2602/2658/2658 2595/2653/2653 645/700/694
+f 2602/2658/2658 645/700/694 659/714/708
+f 2595/2653/2653 2594/2652/2652 643/698/692
+f 2595/2653/2653 643/698/692 645/700/694
+f 2594/2652/2652 2591/2648/2648 646/702/696
+f 2594/2652/2652 646/702/696 643/698/692
+f 2591/2648/2648 651/705/699 646/702/696
+f 2591/2648/2648 2587/2645/2645 636/693/687
+f 2591/2648/2648 636/693/687 651/705/699
+f 2587/2645/2645 2586/2644/2644 635/694/688
+f 2587/2645/2645 635/694/688 636/693/687
+f 2586/2644/2644 2583/2640/2640 637/691/685
+f 2586/2644/2644 637/691/685 635/694/688
+f 2583/2640/2640 2588/2642/2642 642/697/691
+f 2583/2640/2640 642/697/691 637/691/685
+f 2588/2642/2642 2579/2636/2636 630/689/683
+f 2588/2642/2642 630/689/683 642/697/691
+f 2579/2636/2636 2580/2638/2638 630/689/683
+f 2580/2638/2638 2578/2632/2632 632/686/680
+f 2580/2638/2638 632/686/680 630/689/683
+f 2578/2632/2632 2581/2634/2634 624/679/673
+f 2578/2632/2632 624/679/673 632/686/680
+f 2581/2634/2634 2574/2628/2628 624/679/673
+f 2574/2628/2628 2575/2630/2630 623/677/671
+f 2574/2628/2628 623/677/671 624/679/673
+f 2575/2630/2630 2571/2624/2624 626/681/675
+f 2575/2630/2630 626/681/675 623/677/671
+f 2571/2624/2624 2576/2626/2626 629/684/678
+f 2571/2624/2624 629/684/678 626/681/675
+f 2576/2626/2626 2569/2622/2622 616/670/664
+f 2576/2626/2626 616/670/664 629/684/678
+f 2569/2622/2622 2568/2620/2620 615/668/662
+f 2569/2622/2622 615/668/662 616/670/664
+f 2568/2620/2620 2565/2617/2617 618/672/666
+f 2568/2620/2620 618/672/666 615/668/662
+f 2565/2617/2617 2570/2614/2614 622/675/669
+f 2565/2617/2617 622/675/669 618/672/666
+f 2570/2614/2614 2561/2612/2612 607/662/656
+f 2570/2614/2614 607/662/656 622/675/669
+f 2561/2612/2612 2560/2611/2611 606/663/657
+f 2561/2612/2612 606/663/657 607/662/656
+f 2560/2611/2611 2557/2606/2606 608/660/654
+f 2560/2611/2611 608/660/654 606/663/657
+f 2557/2606/2606 2562/2608/2608 614/666/660
+f 2557/2606/2606 614/666/660 608/660/654
+f 2562/2608/2608 2552/2604/2604 599/654/648
+f 2562/2608/2608 599/654/648 614/666/660
+f 2552/2604/2604 2551/2601/2601 598/655/649
+f 2552/2604/2604 598/655/649 599/654/648
+f 2551/2601/2601 2553/2603/2603 600/652/646
+f 2551/2601/2601 600/652/646 598/655/649
+f 2553/2603/2603 2554/2597/2597 605/658/652
+f 2553/2603/2603 605/658/652 600/652/646
+f 2554/2597/2597 2546/2596/2596 590/644/638
+f 2554/2597/2597 590/644/638 605/658/652
+f 2546/2596/2596 2545/2594/2594 589/642/636
+f 2546/2596/2596 589/642/636 590/644/638
+f 2545/2594/2594 2543/2589/2589 592/645/639
+f 2545/2594/2594 592/645/639 589/642/636
+f 2543/2589/2589 2547/2591/2591 597/649/643
+f 2543/2589/2589 597/649/643 592/645/639
+f 2547/2591/2591 2539/2587/2587 582/634/628
+f 2547/2591/2591 582/634/628 597/649/643
+f 2539/2587/2587 2538/2585/2585 581/635/629
+f 2539/2587/2587 581/635/629 582/634/628
+f 2538/2585/2585 2536/2580/2580 583/637/631
+f 2538/2585/2585 583/637/631 581/635/629
+f 2536/2580/2580 2540/2582/2582 588/640/634
+f 2536/2580/2580 588/640/634 583/637/631
+f 2540/2582/2582 2531/2576/2576 574/628/622
+f 2540/2582/2582 574/628/622 588/640/634
+f 2531/2576/2576 2530/2575/2575 573/626/620
+f 2531/2576/2576 573/626/620 574/628/622
+f 2530/2575/2575 2532/2578/2578 576/630/624
+f 2530/2575/2575 576/630/624 573/626/620
+f 2532/2578/2578 2533/2571/2571 580/633/627
+f 2532/2578/2578 580/633/627 576/630/624
+f 2533/2571/2571 2525/2569/2569 567/620/614
+f 2533/2571/2571 567/620/614 580/633/627
+f 2525/2569/2569 2524/2568/2568 566/618/612
+f 2525/2569/2569 566/618/612 567/620/614
+f 2524/2568/2568 2522/2565/2565 569/622/616
+f 2524/2568/2568 569/622/616 566/618/612
+f 2522/2565/2565 2526/2563/2563 572/625/619
+f 2522/2565/2565 572/625/619 569/622/616
+f 2526/2563/2563 2519/2561/2561 559/609/603
+f 2526/2563/2563 559/609/603 572/625/619
+f 2519/2561/2561 2518/2560/2560 558/614/608
+f 2519/2561/2561 558/614/608 559/609/603
+f 2518/2560/2560 2514/2555/2555 560/612/606
+f 2518/2560/2560 560/612/606 558/614/608
+f 2514/2555/2555 2520/2557/2557 565/616/610
+f 2514/2555/2555 565/616/610 560/612/606
+f 2520/2557/2557 2511/2552/2552 550/600/594
+f 2520/2557/2557 550/600/594 565/616/610
+f 2511/2552/2552 2510/2551/2551 549/601/595
+f 2511/2552/2552 549/601/595 550/600/594
+f 2510/2551/2551 2512/2549/2549 556/606/600
+f 2510/2551/2551 556/606/600 549/601/595
+f 2512/2549/2549 2508/2548/2548 557/607/601
+f 2512/2549/2549 557/607/601 556/606/600
+f 2508/2548/2548 2796/2903/2903 878/952/946
+f 2508/2548/2548 878/952/946 557/607/601
+f 2796/2903/2903 2795/2899/2899 879/950/944
+f 2796/2903/2903 879/950/944 878/952/946
+f 2795/2899/2899 2797/2901/2901 884/955/949
+f 2795/2899/2899 884/955/949 879/950/944
+f 2797/2901/2901 2791/2895/2895 871/942/936
+f 2797/2901/2901 871/942/936 884/955/949
+f 2791/2895/2895 2792/2897/2897 870/940/934
+f 2791/2895/2895 870/940/934 871/942/936
+f 2792/2897/2897 2788/2890/2890 873/944/938
+f 2792/2897/2897 873/944/938 870/940/934
+f 2788/2890/2890 2793/2892/2892 877/947/941
+f 2788/2890/2890 877/947/941 873/944/938
+f 2793/2892/2892 2787/2887/2887 864/933/927
+f 2793/2892/2892 864/933/927 877/947/941
+f 2787/2887/2887 2786/2886/2886 863/934/928
+f 2787/2887/2887 863/934/928 864/933/927
+f 2786/2886/2886 2783/2882/2882 863/934/928
+f 2783/2882/2882 2779/2879/2879 869/938/932
+f 2783/2882/2882 869/938/932 863/934/928
+f 2779/2879/2879 856/928/922 869/938/932
+f 2779/2879/2879 2778/2878/2878 855/929/923
+f 2779/2879/2879 855/929/923 856/928/922
+f 2778/2878/2878 2776/2874/2874 857/926/920
+f 2778/2878/2878 857/926/920 855/929/923
+f 2776/2874/2874 2780/2876/2876 862/932/926
+f 2776/2874/2874 862/932/926 857/926/920
+f 2780/2876/2876 2772/2870/2870 849/919/913
+f 2780/2876/2876 849/919/913 862/932/926
+f 2772/2870/2870 2773/2872/2872 848/917/911
+f 2772/2870/2870 848/917/911 849/919/913
+f 2773/2872/2872 2770/2866/2866 851/921/915
+f 2773/2872/2872 851/921/915 848/917/911
+f 2770/2866/2866 2774/2868/2868 854/924/918
+f 2770/2866/2866 854/924/918 851/921/915
+f 2774/2868/2868 2767/2862/2862 841/908/902
+f 2774/2868/2868 841/908/902 854/924/918
+f 2767/2862/2862 2768/2864/2864 840/911/905
+f 2767/2862/2862 840/911/905 841/908/902
+f 2768/2864/2864 2764/2857/2857 842/912/906
+f 2768/2864/2864 842/912/906 840/911/905
+f 2764/2857/2857 2769/2859/2859 847/915/909
+f 2764/2857/2857 847/915/909 842/912/906
+f 2769/2859/2859 2761/2854/2854 833/902/896
+f 2769/2859/2859 833/902/896 847/915/909
+f 2761/2854/2854 2760/2853/2853 832/903/897
+f 2761/2854/2854 832/903/897 833/902/896
+f 2760/2853/2853 2757/2848/2848 834/900/894
+f 2760/2853/2853 834/900/894 832/903/897
+f 2757/2848/2848 2762/2850/2850 839/906/900
+f 2757/2848/2848 839/906/900 834/900/894
+f 2762/2850/2850 2753/2845/2845 825/894/888
+f 2762/2850/2850 825/894/888 839/906/900
+f 2753/2845/2845 2752/2844/2844 824/895/889
+f 2753/2845/2845 824/895/889 825/894/888
+f 2752/2844/2844 2749/2840/2840 826/892/886
+f 2752/2844/2844 826/892/886 824/895/889
+f 2749/2840/2840 2754/2842/2842 831/898/892
+f 2749/2840/2840 831/898/892 826/892/886
+f 2754/2842/2842 2745/2836/2836 816/882/876
+f 2754/2842/2842 816/882/876 831/898/892
+f 2745/2836/2836 2746/2838/2838 815/887/881
+f 2745/2836/2836 815/887/881 816/882/876
+f 2746/2838/2838 2743/2833/2833 817/885/879
+f 2746/2838/2838 817/885/879 815/887/881
+f 2743/2833/2833 2747/2830/2830 823/889/883
+f 2743/2833/2833 823/889/883 817/885/879
+f 2747/2830/2830 2740/2828/2828 807/877/871
+f 2747/2830/2830 807/877/871 823/889/883
+f 2740/2828/2828 2739/2827/2827 807/877/871
+f 2739/2827/2827 2735/2823/2823 808/875/869
+f 2739/2827/2827 808/875/869 807/877/871
+f 2735/2823/2823 814/880/874 808/875/869
+f 2735/2823/2823 2731/2820/2820 800/869/863
+f 2735/2823/2823 800/869/863 814/880/874
+f 2731/2820/2820 2730/2819/2819 799/870/864
+f 2731/2820/2820 799/870/864 800/869/863
+f 2730/2819/2819 2727/2815/2815 801/867/861
+f 2730/2819/2819 801/867/861 799/870/864
+f 2727/2815/2815 2732/2817/2817 806/873/867
+f 2727/2815/2815 806/873/867 801/867/861
+f 2732/2817/2817 2724/2813/2813 793/860/854
+f 2732/2817/2817 793/860/854 806/873/867
+f 2724/2813/2813 2723/2811/2811 792/858/852
+f 2724/2813/2813 792/858/852 793/860/854
+f 2723/2811/2811 2721/2807/2807 795/862/856
+f 2723/2811/2811 795/862/856 792/858/852
+f 2721/2807/2807 2725/2809/2809 798/865/859
+f 2721/2807/2807 798/865/859 795/862/856
+f 2725/2809/2809 2719/2805/2805 785/851/845
+f 2725/2809/2809 785/851/845 798/865/859
+f 2719/2805/2805 2718/2803/2803 784/849/843
+f 2719/2805/2805 784/849/843 785/851/845
+f 2718/2803/2803 2714/2798/2798 787/853/847
+f 2718/2803/2803 787/853/847 784/849/843
+f 2714/2798/2798 2720/2800/2800 791/856/850
+f 2714/2798/2798 791/856/850 787/853/847
+f 2720/2800/2800 2711/2796/2796 777/844/838
+f 2720/2800/2800 777/844/838 791/856/850
+f 2711/2796/2796 2710/2795/2795 776/845/839
+f 2711/2796/2796 776/845/839 777/844/838
+f 2710/2795/2795 2708/2790/2790 778/842/836
+f 2710/2795/2795 778/842/836 776/845/839
+f 2708/2790/2790 2712/2792/2792 778/842/836
+f 2712/2792/2792 2704/2787/2787 769/836/830
+f 2712/2792/2792 769/836/830 778/842/836
+f 2704/2787/2787 2703/2786/2786 768/837/831
+f 2704/2787/2787 768/837/831 769/836/830
+f 2703/2786/2786 2701/2782/2782 770/834/828
+f 2703/2786/2786 770/834/828 768/837/831
+f 2701/2782/2782 2705/2784/2784 775/840/834
+f 2701/2782/2782 775/840/834 770/834/828
+f 2705/2784/2784 2698/2780/2780 762/826/820
+f 2705/2784/2784 762/826/820 775/840/834
+f 2698/2780/2780 2697/2778/2778 761/824/818
+f 2698/2780/2780 761/824/818 762/826/820
+f 2697/2778/2778 2694/2773/2773 764/828/822
+f 2697/2778/2778 764/828/822 761/824/818
+f 2694/2773/2773 2699/2775/2775 767/831/825
+f 2694/2773/2773 767/831/825 764/828/822
+f 2699/2775/2775 2691/2770/2770 753/818/812
+f 2699/2775/2775 753/818/812 767/831/825
+f 2691/2770/2770 2690/2769/2769 753/818/812
+f 2690/2769/2769 2687/2765/2765 755/816/810
+f 2690/2769/2769 755/816/810 753/818/812
+f 2687/2765/2765 2692/2767/2767 760/822/816
+f 2687/2765/2765 760/822/816 755/816/810
+f 2692/2767/2767 2684/2762/2762 746/811/805
+f 2692/2767/2767 746/811/805 760/822/816
+f 2684/2762/2762 2683/2761/2761 745/812/806
+f 2684/2762/2762 745/812/806 746/811/805
+f 2683/2761/2761 2681/2757/2757 747/809/803
+f 2683/2761/2761 747/809/803 745/812/806
+f 2681/2757/2757 2685/2759/2759 752/815/809
+f 2681/2757/2757 752/815/809 747/809/803
+f 2685/2759/2759 2677/2753/2753 739/800/794
+f 2685/2759/2759 739/800/794 752/815/809
+f 2677/2753/2753 2678/2755/2755 738/805/799
+f 2677/2753/2753 738/805/799 739/800/794
+f 2678/2755/2755 2675/2749/2749 740/803/797
+f 2678/2755/2755 740/803/797 738/805/799
+f 2675/2749/2749 2679/2751/2751 744/807/801
+f 2675/2749/2749 744/807/801 740/803/797
+f 2679/2751/2751 2673/2747/2747 731/793/787
+f 2679/2751/2751 731/793/787 744/807/801
+f 2673/2747/2747 2672/2745/2745 730/791/785
+f 2673/2747/2747 730/791/785 731/793/787
+f 4/1833/1833 1803/1837/1837 1802/1835/1835
+f 7/33/25 3835/3849/3853 8/34/26
diff --git a/Telegram/Resources/art/premium/star_texture.svg b/Telegram/Resources/art/premium/star_texture.svg
new file mode 100644
index 00000000000000..6d09446fb56ac7
--- /dev/null
+++ b/Telegram/Resources/art/premium/star_texture.svg
@@ -0,0 +1 @@
+<svg width="1024px" height="1024px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M242.441216,1023.96673 C484.760949,868.195472 619.565351,780.153383 646.854423,759.840461 C738.267847,691.795866 863.983039,585.091695 1024,439.727947 L1024,363.976818 C810.351061,332.876819 639.684394,317.32682 512,317.32682 C384.315606,317.32682 213.648939,332.876819 0,363.976818 L0,1023.96673 L242.441216,1023.96673 Z" fill="#FFFFFF"/></svg>
\ No newline at end of file
diff --git a/Telegram/Resources/art/round_placeholder.jpg b/Telegram/Resources/art/round_placeholder.jpg
new file mode 100644
index 00000000000000..cbdc9aee39c6ec
Binary files /dev/null and b/Telegram/Resources/art/round_placeholder.jpg differ
diff --git a/Telegram/Resources/art/verified_bg.webp b/Telegram/Resources/art/verified_bg.webp
new file mode 100644
index 00000000000000..f08059f4550135
Binary files /dev/null and b/Telegram/Resources/art/verified_bg.webp differ
diff --git a/Telegram/Resources/art/verified_fg.webp b/Telegram/Resources/art/verified_fg.webp
new file mode 100644
index 00000000000000..3535123495877e
Binary files /dev/null and b/Telegram/Resources/art/verified_fg.webp differ
diff --git a/Telegram/Resources/bot_webview_shell_html/body.html b/Telegram/Resources/bot_webview_shell_html/body.html
new file mode 100644
index 00000000000000..36e0d3eaa3c306
--- /dev/null
+++ b/Telegram/Resources/bot_webview_shell_html/body.html
@@ -0,0 +1,46 @@
+<div id="root">
+<div id="scene">
+<div id="shell">
+<header id="header">
+<button id="back" class="title-control hidden" type="button" aria-label="Back">
+<svg viewBox="0 0 24 24" aria-hidden="true">
+<path d="M14.5 5.5L8 12l6.5 6.5"></path>
+</svg>
+</button>
+<div id="title-row">
+<div id="title"></div>
+<div id="badge" class="hidden" aria-hidden="true"></div>
+</div>
+<button id="menu-toggle" class="title-control" type="button" aria-label="Menu">
+<span id="menu-toggle-icon" class="title-control-mask" aria-hidden="true"></span>
+</button>
+<button id="close" class="title-control" type="button" aria-label="Close">
+<svg viewBox="0 0 24 24" aria-hidden="true">
+<path d="M6 6l12 12"></path>
+<path d="M18 6L6 18"></path>
+</svg>
+</button>
+</header>
+<div id="body">
+<div id="frame-shell"><main id="frame-wrap"></main></div>
+<footer id="footer">
+<div id="disclosure"></div>
+<div id="buttons-wrap"><div id="buttons"></div></div>
+</footer>
+</div>
+<div id="menu-backdrop"></div>
+<div id="menu"><div id="menu-list"></div></div>
+<div id="blocker"></div>
+</div>
+</div>
+<div id="resize-handles">
+<div class="resize-handle" data-resize-edge="top-left"></div>
+<div class="resize-handle" data-resize-edge="top"></div>
+<div class="resize-handle" data-resize-edge="top-right"></div>
+<div class="resize-handle" data-resize-edge="left"></div>
+<div class="resize-handle" data-resize-edge="right"></div>
+<div class="resize-handle" data-resize-edge="bottom-left"></div>
+<div class="resize-handle" data-resize-edge="bottom"></div>
+<div class="resize-handle" data-resize-edge="bottom-right"></div>
+</div>
+</div>
diff --git a/Telegram/Resources/bot_webview_shell_html/page.css b/Telegram/Resources/bot_webview_shell_html/page.css
new file mode 100644
index 00000000000000..ba184f57333617
--- /dev/null
+++ b/Telegram/Resources/bot_webview_shell_html/page.css
@@ -0,0 +1,642 @@
+html,
+body {
+	width: 100%;
+	height: 100%;
+	margin: 0;
+	overflow: hidden;
+	background: transparent;
+}
+:root {
+	--font-sans: -apple-system, BlinkMacSystemFont, avenir next, avenir, Segoe UI Variable Text, segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, tahoma, arial, sans-serif;
+}
+body {
+	font: 14px/1.35 var(--font-sans);
+	color: var(--title-fg, #000000);
+	-webkit-font-smoothing: antialiased;
+	text-rendering: optimizeLegibility;
+}
+button,
+input,
+textarea,
+select {
+	font: inherit;
+}
+* {
+	box-sizing: border-box;
+}
+#root {
+	width: 100%;
+	height: 100%;
+	position: relative;
+	--shell-radius: 7px;
+	--shell-pad-top: 12px;
+	--shell-pad-right: 12px;
+	--shell-pad-bottom: 12px;
+	--shell-pad-left: 12px;
+	--shadow-pad-top: 12px;
+	--shadow-pad-right: 14px;
+	--shadow-pad-bottom: 16px;
+	--shadow-pad-left: 14px;
+	--header-height: 60px;
+	--title-pad-top: 0px;
+	--title-pad-right: 0px;
+	--title-pad-bottom: 0px;
+	--title-pad-left: 0px;
+	--badge-skip: 4px;
+	--frame-radius: 6px;
+	--control-width: 36px;
+	--control-height: 36px;
+	--button-height: 40px;
+	--button-gap-x: 12px;
+	--button-gap-y: 8px;
+	--disclosure-skip: 12px;
+	--footer-button-skip: 10px;
+	--footer-gap: var(--disclosure-skip);
+	--fullscreen-control-width: 44px;
+	--fullscreen-control-height: 44px;
+	--fullscreen-control-top: 8px;
+	--fullscreen-control-right: 8px;
+	--fullscreen-control-gap: 8px;
+	--body-bg: #ffffff;
+	--title-bg: #ffffff;
+	--bottom-bg: #ffffff;
+	--body-fg: #000000;
+	--title-fg: #000000;
+	--title-control-fg: rgba(0, 0, 0, 0.64);
+	--title-control-ripple: rgba(0, 0, 0, 0.064);
+	--footer-fg: rgba(0, 0, 0, 0.55);
+	--button-ripple: rgba(0, 0, 0, 0.14);
+	--menu-bg: #ffffff;
+	--menu-fg: #000000;
+	--menu-hover-bg: #f1f1f1;
+	--menu-ripple: #e5e5e5;
+	--menu-separator: rgba(0, 0, 0, 0.08);
+	--menu-attention: #d05c5c;
+}
+.hidden {
+	display: none !important;
+}
+#scene {
+	position: absolute;
+	inset: 0;
+	padding: var(--shadow-pad-top)
+		var(--shadow-pad-right)
+		var(--shadow-pad-bottom)
+		var(--shadow-pad-left);
+}
+#root.no-window-alpha #scene {
+	background: #eeeeee;
+}
+#shell {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	border-radius: var(--shell-radius);
+	background: var(--body-bg, #ffffff);
+	box-shadow:
+		0 0 0 1px rgba(0, 0, 0, 0.08),
+		0 1px 2px rgba(0, 0, 0, 0.18),
+		0 3px 8px -1px rgba(0, 0, 0, 0.16),
+		0 8px 14px -5px rgba(0, 0, 0, 0.20);
+	overflow: hidden;
+}
+#root.no-window-alpha #shell {
+	box-shadow: none;
+	border: 1px solid rgba(0, 0, 0, 0.10);
+}
+#header {
+	flex: 0 0 auto;
+	min-height: var(--header-height);
+	display: grid;
+	grid-template-columns: auto minmax(0, 1fr) auto auto;
+	align-items: center;
+	gap: 4px;
+	padding: 0 var(--shell-pad-right) 0 var(--shell-pad-left);
+	background: var(--title-bg, #ffffff);
+	color: var(--title-fg, #000000);
+	border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+	-webkit-user-select: none;
+	user-select: none;
+}
+#back {
+	grid-column: 1;
+}
+#title-row {
+	grid-column: 2;
+}
+#menu-toggle {
+	grid-column: 3;
+}
+#close {
+	grid-column: 4;
+}
+.title-control {
+	width: var(--control-width);
+	height: var(--control-height);
+	border: 0;
+	border-radius: 999px;
+	background: transparent;
+	color: var(--title-control-fg, currentColor);
+	cursor: pointer;
+	padding: 0;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	position: relative;
+	overflow: hidden;
+	transition: opacity 120ms linear;
+}
+.title-control svg {
+	width: 20px;
+	height: 20px;
+	stroke: currentColor;
+	stroke-width: 2;
+	stroke-linecap: round;
+	stroke-linejoin: round;
+	fill: none;
+	position: relative;
+	z-index: 1;
+}
+.title-control .fill-icon {
+	fill: currentColor;
+	stroke: none;
+}
+.title-control-mask {
+	display: block;
+	width: 20px;
+	height: 20px;
+	background: currentColor;
+	-webkit-mask-repeat: no-repeat;
+	mask-repeat: no-repeat;
+	-webkit-mask-position: center;
+	mask-position: center;
+	-webkit-mask-size: contain;
+	mask-size: contain;
+	position: relative;
+	z-index: 1;
+}
+.title-control:disabled {
+	opacity: 0.45;
+	cursor: default;
+}
+#title-row {
+	display: flex;
+	align-items: center;
+	min-width: 0;
+	padding: var(--title-pad-top)
+		var(--title-pad-right)
+		var(--title-pad-bottom)
+		var(--title-pad-left);
+	-webkit-user-select: none;
+	user-select: none;
+}
+#title {
+	min-width: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	font-size: 20px;
+	line-height: 24px;
+	font-weight: 600;
+	-webkit-user-select: none;
+	user-select: none;
+}
+#badge {
+	margin-left: var(--badge-skip);
+	width: 16px;
+	height: 16px;
+	flex: 0 0 auto;
+	background-position: center;
+	background-repeat: no-repeat;
+	background-size: contain;
+}
+#body {
+	flex: 1 1 auto;
+	min-height: 0;
+	display: flex;
+	flex-direction: column;
+	gap: var(--footer-gap);
+	padding: 0;
+	background: var(--body-bg, #ffffff);
+}
+#frame-shell {
+	flex: 1 1 auto;
+	min-height: 0;
+	border-radius: 0;
+	overflow: hidden;
+	background: var(--body-bg, #ffffff);
+	box-shadow: none;
+}
+#frame-wrap,
+#frame-wrap iframe {
+	display: block;
+	width: 100%;
+	height: 100%;
+	border: 0;
+	background: var(--body-bg, #ffffff);
+}
+#footer {
+	display: none;
+	flex: 0 0 auto;
+	color: var(--footer-fg);
+	padding: max(0px, calc(var(--shell-pad-bottom) - var(--footer-gap)))
+		var(--shell-pad-right)
+		var(--shell-pad-bottom)
+		var(--shell-pad-left);
+	background: var(--bottom-bg, var(--body-bg));
+}
+#footer.visible {
+	display: flex;
+	flex-direction: column;
+}
+#disclosure {
+	display: none;
+	text-align: center;
+	font-size: 12px;
+	line-height: 16px;
+	padding: 0 4px;
+	word-break: break-word;
+}
+#disclosure.visible {
+	display: block;
+}
+#buttons-wrap {
+	display: none;
+	background: var(--bottom-bg, var(--body-bg));
+	border-radius: var(--frame-radius);
+	overflow: hidden;
+}
+#buttons-wrap.visible {
+	display: block;
+}
+#buttons {
+	display: grid;
+	grid-template-columns: minmax(0, 1fr);
+	column-gap: var(--button-gap-x);
+	row-gap: var(--button-gap-y);
+}
+#buttons[data-layout="horizontal"] {
+	grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
+}
+.shell-button {
+	min-width: 0;
+	height: var(--button-height);
+	border: 0;
+	border-radius: calc(var(--frame-radius) - 1px);
+	padding: 0 14px;
+	font-weight: 600;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	gap: 8px;
+	cursor: pointer;
+	position: relative;
+	overflow: hidden;
+	transition: opacity 120ms linear;
+}
+.shell-button:disabled {
+	opacity: 0.55;
+	cursor: default;
+}
+.button-icon {
+	display: none;
+	flex: 0 0 auto;
+	width: 20px;
+	height: 20px;
+	background-position: center;
+	background-repeat: no-repeat;
+	background-size: contain;
+	position: relative;
+	z-index: 1;
+}
+.button-icon.visible {
+	display: block;
+}
+.button-icon.pending {
+	border-radius: 999px;
+	background-color: currentColor;
+	opacity: 0.18;
+}
+.button-label {
+	min-width: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	position: relative;
+	z-index: 1;
+}
+.button-spinner {
+	display: none;
+	flex: 0 0 auto;
+	width: 14px;
+	height: 14px;
+	border: 2px solid currentColor;
+	border-right-color: transparent;
+	border-radius: 50%;
+	animation: spin 0.8s linear infinite;
+	position: relative;
+	z-index: 1;
+}
+.button-spinner.visible {
+	display: block;
+}
+#menu-backdrop {
+	position: absolute;
+	inset: 0;
+	display: none;
+	background: transparent;
+	z-index: 11;
+}
+#menu-backdrop.visible {
+	display: block;
+}
+#menu {
+	position: absolute;
+	top: calc(var(--header-height) - 8px);
+	right: calc(var(--shell-pad-right) + var(--control-width));
+	display: none;
+	min-width: 220px;
+	max-width: calc(100% - var(--shadow-pad-left) - var(--shadow-pad-right));
+	background: var(--menu-bg, #ffffff);
+	color: var(--menu-fg, #000000);
+	border-radius: 12px;
+	box-shadow:
+		0 20px 38px rgba(0, 0, 0, 0.22),
+		0 4px 12px rgba(0, 0, 0, 0.12);
+	overflow: hidden;
+	z-index: 12;
+}
+#root.fullscreen #scene {
+	padding: 0;
+}
+#root.fullscreen #shell {
+	border-radius: 0;
+	box-shadow: none;
+}
+#root.fullscreen #header {
+	position: absolute;
+	top: var(--fullscreen-control-top);
+	right: var(--fullscreen-control-right);
+	z-index: 13;
+	width: auto;
+	min-height: var(--fullscreen-control-height);
+	display: flex;
+	justify-content: flex-end;
+	gap: var(--fullscreen-control-gap);
+	padding: 0;
+	background: transparent;
+	border-bottom: 0;
+	pointer-events: none;
+}
+#root.fullscreen #back,
+#root.fullscreen #title-row {
+	display: none !important;
+}
+#root.fullscreen .title-control {
+	width: var(--fullscreen-control-width);
+	height: var(--fullscreen-control-height);
+	color: #ffffff;
+	background: rgba(0, 0, 0, 0.35);
+	--title-control-ripple: rgba(0, 0, 0, 0.094);
+	pointer-events: auto;
+}
+#root.fullscreen #body {
+	gap: 0;
+}
+#root.fullscreen #menu {
+	top: calc(
+		var(--fullscreen-control-top)
+			+ var(--fullscreen-control-height)
+			- 8px);
+	right: calc(var(--fullscreen-control-right) + var(--fullscreen-control-width));
+}
+#root.fullscreen #resize-handles {
+	display: none;
+}
+#resize-handles {
+	position: absolute;
+	inset: 0;
+	z-index: 11;
+	pointer-events: none;
+}
+.resize-handle {
+	position: absolute;
+	pointer-events: auto;
+}
+.resize-handle[data-resize-edge="top"] {
+	top: 0;
+	left: var(--shadow-pad-left);
+	right: var(--shadow-pad-right);
+	height: var(--shadow-pad-top);
+	cursor: ns-resize;
+}
+.resize-handle[data-resize-edge="bottom"] {
+	bottom: 0;
+	left: var(--shadow-pad-left);
+	right: var(--shadow-pad-right);
+	height: var(--shadow-pad-bottom);
+	cursor: ns-resize;
+}
+.resize-handle[data-resize-edge="left"] {
+	top: var(--shadow-pad-top);
+	bottom: var(--shadow-pad-bottom);
+	left: 0;
+	width: var(--shadow-pad-left);
+	cursor: ew-resize;
+}
+.resize-handle[data-resize-edge="right"] {
+	top: var(--shadow-pad-top);
+	bottom: var(--shadow-pad-bottom);
+	right: 0;
+	width: var(--shadow-pad-right);
+	cursor: ew-resize;
+}
+.resize-handle[data-resize-edge="top-left"] {
+	top: 0;
+	left: 0;
+	width: var(--shadow-pad-left);
+	height: var(--shadow-pad-top);
+	cursor: nwse-resize;
+}
+.resize-handle[data-resize-edge="top-right"] {
+	top: 0;
+	right: 0;
+	width: var(--shadow-pad-right);
+	height: var(--shadow-pad-top);
+	cursor: nesw-resize;
+}
+.resize-handle[data-resize-edge="bottom-left"] {
+	bottom: 0;
+	left: 0;
+	width: var(--shadow-pad-left);
+	height: var(--shadow-pad-bottom);
+	cursor: nesw-resize;
+}
+.resize-handle[data-resize-edge="bottom-right"] {
+	right: 0;
+	bottom: 0;
+	width: var(--shadow-pad-right);
+	height: var(--shadow-pad-bottom);
+	cursor: nwse-resize;
+}
+#menu.visible {
+	display: block;
+}
+#menu-list {
+	padding: 6px 0;
+}
+.menu-separator {
+	height: 1px;
+	margin: 6px 0;
+	background: var(--menu-separator, rgba(0, 0, 0, 0.08));
+}
+.menu-item,
+.menu-download {
+	width: 100%;
+	border: 0;
+	background: transparent;
+	color: inherit;
+	display: flex;
+	align-items: center;
+	gap: 12px;
+	padding: 10px 14px;
+	text-align: left;
+	cursor: default;
+	position: relative;
+	overflow: hidden;
+	transition: opacity 120ms linear;
+}
+.menu-download {
+	padding-left: 0;
+	padding-right: 0;
+}
+button.menu-item,
+button.menu-download {
+	cursor: pointer;
+}
+button.menu-item:hover,
+button.menu-download:hover {
+	background: var(--menu-hover-bg, rgba(127, 127, 127, 0.14));
+}
+.menu-item.disabled,
+.menu-download.disabled {
+	opacity: 0.72;
+}
+.menu-item.attention,
+.menu-download.attention {
+	color: var(--menu-attention, #d05c5c);
+}
+.menu-group {
+	padding: 0 14px;
+}
+.menu-group-title {
+	padding-left: 0;
+	padding-right: 0;
+	cursor: default;
+}
+.menu-group-children {
+	display: flex;
+	flex-direction: column;
+	gap: 2px;
+	padding: 0 0 6px 32px;
+}
+.menu-item-icon {
+	flex: 0 0 20px;
+	width: 20px;
+	height: 20px;
+	background-position: center;
+	background-repeat: no-repeat;
+	background-size: contain;
+	position: relative;
+	z-index: 1;
+}
+.ripple {
+	position: absolute;
+	inset: 0;
+	border-radius: inherit;
+	overflow: hidden;
+	pointer-events: none;
+	z-index: 0;
+}
+.ripple .inner {
+	position: absolute;
+	border-radius: 50%;
+	transform: scale(0);
+	opacity: 1;
+	animation: ripple 650ms cubic-bezier(0.22, 1, 0.36, 1) forwards;
+}
+.ripple.hiding {
+	animation: fadeOut 200ms linear forwards;
+}
+.title-control .ripple .inner {
+	background-color: var(--title-control-ripple);
+}
+button.menu-item .ripple .inner,
+button.menu-download .ripple .inner {
+	background-color: var(--menu-ripple);
+}
+.shell-button .ripple .inner {
+	background-color: var(--button-ripple);
+}
+.menu-item-copy {
+	min-width: 0;
+	flex: 1 1 auto;
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	position: relative;
+	z-index: 1;
+}
+.menu-item-title,
+.menu-item-subtitle,
+.menu-item-action {
+	display: block;
+	min-width: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.menu-item-title {
+	font-size: 14px;
+	line-height: 18px;
+}
+.menu-item-subtitle,
+.menu-item-action {
+	font-size: 12px;
+	line-height: 16px;
+}
+.menu-item-subtitle {
+	opacity: 0.64;
+}
+.menu-item-action {
+	flex: 0 0 auto;
+	padding-left: 12px;
+	opacity: 0.8;
+	position: relative;
+	z-index: 1;
+}
+#blocker {
+	position: absolute;
+	inset: 0;
+	display: none;
+	background: rgba(0, 0, 0, 0.12);
+	z-index: 20;
+}
+#root.blocked #blocker {
+	display: block;
+}
+@keyframes spin {
+	to { transform: rotate(360deg); }
+}
+@keyframes ripple {
+	to {
+		transform: scale(2);
+	}
+}
+@keyframes fadeOut {
+	to {
+		opacity: 0;
+	}
+}
diff --git a/Telegram/Resources/bot_webview_shell_html/page.js b/Telegram/Resources/bot_webview_shell_html/page.js
new file mode 100644
index 00000000000000..9e8c5b937e7433
--- /dev/null
+++ b/Telegram/Resources/bot_webview_shell_html/page.js
@@ -0,0 +1,1138 @@
+(function() {
+	'use strict';
+
+	const root = document.getElementById('root');
+	const header = document.getElementById('header');
+	const frameShell = document.getElementById('frame-shell');
+	const frameWrap = document.getElementById('frame-wrap');
+	const disclosure = document.getElementById('disclosure');
+	const footer = document.getElementById('footer');
+	const buttonsWrap = document.getElementById('buttons-wrap');
+	const buttons = document.getElementById('buttons');
+	const badge = document.getElementById('badge');
+	const menuBackdrop = document.getElementById('menu-backdrop');
+	const menu = document.getElementById('menu');
+	const menuList = document.getElementById('menu-list');
+	const blocker = document.getElementById('blocker');
+	const resizeHandles = Array.prototype.slice.call(
+		document.querySelectorAll('.resize-handle'));
+	const title = document.getElementById('title');
+	const controls = {
+		back: document.getElementById('back'),
+		menu: document.getElementById('menu-toggle'),
+		menuIcon: document.getElementById('menu-toggle-icon'),
+		close: document.getElementById('close')
+	};
+	const shellState = {
+		backVisible: false,
+		menuVisible: false,
+		badgeVisible: false,
+		bottomText: '',
+		isFullscreen: false,
+		blocked: false,
+		menuOpen: false,
+		menuItems: [],
+		buttons: {
+			main: null,
+			secondary: null
+		}
+	};
+	if (window.TelegramDesktopWindowAlphaSupported === false) {
+		root.classList.add('no-window-alpha');
+	}
+	const shellAssets = {
+		icons: Object.create(null),
+		titleMenuIcon: null,
+		verifiedBadge: null,
+		menuPalette: null
+	};
+	const shellToken = TDESKTOP_SHELL_TOKEN_PLACEHOLDER;
+	const nativeMessageType = 'tdesktop_external_bot_webapp';
+	const maxPendingEvents = 64;
+	let iframe = null;
+	let frameLoaded = false;
+	let frameUrl = 'about:blank';
+	let frameOrigin = '';
+	let sameOrigin = false;
+	let frameGeneration = 0;
+	let reloadSupported = false;
+	let reloadTimeout = null;
+	let viewportScheduled = false;
+	let resizeObserver = null;
+	const pendingEvents = [];
+
+	function normalizeEventData(eventData) {
+		if (typeof eventData === 'string') {
+			try {
+				const parsed = JSON.parse(eventData);
+				return parsed
+					&& typeof parsed === 'object'
+					&& !Array.isArray(parsed)
+					? parsed
+					: {};
+			} catch (e) {
+				return {};
+			}
+		}
+		return eventData
+			&& typeof eventData === 'object'
+			&& !Array.isArray(eventData)
+			? eventData
+			: {};
+	}
+
+	function isShellOrigin() {
+		return window.location.protocol === 'https:'
+			&& window.location.hostname === 'web.telegram.org'
+			&& (!window.location.port || window.location.port === '443');
+	}
+
+	function originFromUrl(url) {
+		try {
+			const origin = new URL(url, window.location.href).origin;
+			return origin && origin !== 'null' ? origin : '';
+		} catch (e) {
+			return '';
+		}
+	}
+
+	function invokeNative(source, eventType, eventData, origin) {
+		if (!window.external
+			|| typeof window.external.invoke !== 'function'
+			|| typeof shellToken !== 'string'
+			|| !shellToken
+			|| typeof eventType !== 'string') {
+			return;
+		}
+		if (source === 'shell' && !isShellOrigin()) {
+			return;
+		}
+		window.external.invoke(JSON.stringify({
+			type: nativeMessageType,
+			source: source,
+			token: shellToken,
+			origin: origin || window.location.origin,
+			eventType: eventType,
+			eventData: normalizeEventData(eventData)
+		}));
+	}
+
+	function invokeShell(eventType, eventData) {
+		invokeNative('shell', eventType, eventData);
+	}
+
+	function invokeWebApp(eventType, eventData, origin) {
+		invokeNative('webapp', eventType, eventData, origin);
+	}
+
+	function sendToFrame(eventType, eventData, generation) {
+		if (!iframe
+			|| !iframe.contentWindow
+			|| generation !== frameGeneration) {
+			return;
+		}
+		if (sameOrigin && !frameOrigin) {
+			return;
+		}
+		const targetOrigin = sameOrigin ? frameOrigin : '*';
+		iframe.contentWindow.postMessage(JSON.stringify({
+			eventType: eventType,
+			eventData: eventData || {}
+		}), targetOrigin);
+	}
+
+	function postToFrame(eventType, eventData) {
+		const generation = frameGeneration;
+		if (!iframe || !iframe.contentWindow || !frameLoaded) {
+			pendingEvents.push({
+				generation: generation,
+				eventType: eventType,
+				eventData: eventData || {}
+			});
+			while (pendingEvents.length > maxPendingEvents) {
+				pendingEvents.shift();
+			}
+			return;
+		}
+		sendToFrame(eventType, eventData, generation);
+	}
+
+	function shellPointerPayload(event, extra) {
+		const payload = {
+			button: event.button,
+			x: event.clientX,
+			y: event.clientY,
+			rootX: event.screenX,
+			rootY: event.screenY,
+			timeStamp: Math.round(event.timeStamp || 0)
+		};
+		if (extra && typeof extra === 'object') {
+			for (const key in extra) {
+				payload[key] = extra[key];
+			}
+		}
+		return payload;
+	}
+
+	function beginShellControl(command, event, extra) {
+		if (shellState.blocked
+			|| shellState.isFullscreen
+			|| event.defaultPrevented
+			|| !event.isTrusted
+			|| event.button !== 0) {
+			return;
+		}
+		closeMenu();
+		invokeShell(command, shellPointerPayload(event, extra));
+		event.preventDefault();
+	}
+
+	function beginShellMove(event) {
+		const target = event.target;
+		if (target
+			&& target.closest
+			&& target.closest('.title-control, #menu')) {
+			return;
+		}
+		beginShellControl('shell_begin_move', event);
+	}
+
+	function beginShellResize(edge, event) {
+		beginShellControl('shell_begin_resize', event, {
+			edge: edge
+		});
+	}
+
+	function flushPendingEvents() {
+		const pending = pendingEvents.splice(0);
+		for (const event of pending) {
+			if (event.generation === frameGeneration) {
+				sendToFrame(event.eventType, event.eventData, event.generation);
+			}
+		}
+	}
+
+	function sendViewportChanged() {
+		if (!iframe) {
+			return;
+		}
+		const height = Math.max(
+			0,
+			Math.round(frameShell.getBoundingClientRect().height));
+		postToFrame('viewport_changed', {
+			height: height,
+			is_state_stable: true,
+			is_expanded: true
+		});
+	}
+
+	function scheduleViewport() {
+		if (viewportScheduled) {
+			return;
+		}
+		viewportScheduled = true;
+		window.requestAnimationFrame(function() {
+			viewportScheduled = false;
+			sendViewportChanged();
+		});
+	}
+
+	function setMetric(name, value) {
+		if (typeof value === 'number' && Number.isFinite(value)) {
+			root.style.setProperty(name, String(value) + 'px');
+		}
+	}
+
+	function applyMetrics(data) {
+		if (!data || typeof data !== 'object') {
+			return;
+		}
+		setMetric('--shell-radius', data.shellRadius);
+		setMetric('--shell-pad-top', data.shellPaddingTop);
+		setMetric('--shell-pad-right', data.shellPaddingRight);
+		setMetric('--shell-pad-bottom', data.shellPaddingBottom);
+		setMetric('--shell-pad-left', data.shellPaddingLeft);
+		setMetric('--shadow-pad-top', data.shadowPaddingTop);
+		setMetric('--shadow-pad-right', data.shadowPaddingRight);
+		setMetric('--shadow-pad-bottom', data.shadowPaddingBottom);
+		setMetric('--shadow-pad-left', data.shadowPaddingLeft);
+		setMetric('--header-height', data.headerHeight);
+		setMetric('--title-pad-top', data.titlePaddingTop);
+		setMetric('--title-pad-right', data.titlePaddingRight);
+		setMetric('--title-pad-bottom', data.titlePaddingBottom);
+		setMetric('--title-pad-left', data.titlePaddingLeft);
+		setMetric('--badge-skip', data.badgeSkip);
+		setMetric('--frame-radius', data.frameRadius);
+		setMetric('--control-width', data.controlWidth);
+		setMetric('--control-height', data.controlHeight);
+		setMetric('--button-height', data.buttonHeight);
+		setMetric('--button-gap-x', data.buttonGapX);
+		setMetric('--button-gap-y', data.buttonGapY);
+		setMetric('--disclosure-skip', data.disclosureSkip);
+		setMetric('--footer-button-skip', data.footerButtonSkip);
+		setMetric('--fullscreen-control-width', data.fullscreenControlWidth);
+		setMetric('--fullscreen-control-height', data.fullscreenControlHeight);
+		setMetric('--fullscreen-control-top', data.fullscreenControlTop);
+		setMetric('--fullscreen-control-right', data.fullscreenControlRight);
+		setMetric('--fullscreen-control-gap', data.fullscreenControlGap);
+	}
+
+	function colorForBackground(value) {
+		if (!/^#[0-9a-f]{6}$/i.test(value || '')) {
+			return null;
+		}
+		const red = parseInt(value.slice(1, 3), 16) / 255;
+		const green = parseInt(value.slice(3, 5), 16) / 255;
+		const blue = parseInt(value.slice(5, 7), 16) / 255;
+		const luminance = 0.2126 * red + 0.7152 * green + 0.0722 * blue;
+		return luminance > 0.5 ? '#000000' : '#ffffff';
+	}
+
+	function footerColorForBackground(value) {
+		if (!/^#[0-9a-f]{6}$/i.test(value || '')) {
+			return null;
+		}
+		const red = parseInt(value.slice(1, 3), 16) / 255;
+		const green = parseInt(value.slice(3, 5), 16) / 255;
+		const blue = parseInt(value.slice(5, 7), 16) / 255;
+		const luminance = 0.2126 * red + 0.7152 * green + 0.0722 * blue;
+		const contrast = 2.5;
+		const textLuminance = (luminance > 0.5) ? 0 : 1;
+		const adaptiveOpacity = (luminance - textLuminance + contrast) / contrast;
+		const opacity = Math.max(0.5, Math.min(0.64, adaptiveOpacity));
+		const channel = (luminance > 0.5) ? 0 : 255;
+		return 'rgba('
+			+ String(channel) + ', '
+			+ String(channel) + ', '
+			+ String(channel) + ', '
+			+ String(opacity) + ')';
+	}
+
+	function titleControlColorsForBackground(value) {
+		if (!/^#[0-9a-f]{6}$/i.test(value || '')) {
+			return null;
+		}
+		const red = parseInt(value.slice(1, 3), 16) / 255;
+		const green = parseInt(value.slice(3, 5), 16) / 255;
+		const blue = parseInt(value.slice(5, 7), 16) / 255;
+		const luminance = 0.2126 * red + 0.7152 * green + 0.0722 * blue;
+		const contrast = 2.5;
+		const textLuminance = (luminance > 0.5) ? 0 : 1;
+		const adaptiveOpacity = (luminance - textLuminance + contrast) / contrast;
+		const opacity = Math.max(0.5, Math.min(0.64, adaptiveOpacity));
+		const channel = (luminance > 0.5) ? 0 : 255;
+		return {
+			fg: 'rgba('
+				+ String(channel) + ', '
+				+ String(channel) + ', '
+				+ String(channel) + ', '
+				+ String(opacity) + ')',
+			ripple: 'rgba('
+				+ String(channel) + ', '
+				+ String(channel) + ', '
+				+ String(channel) + ', '
+				+ String(opacity * 0.1) + ')'
+		};
+	}
+
+	function hexByte(value) {
+		const text = Math.max(
+			0,
+			Math.min(255, Math.round(value))).toString(16);
+		return (text.length < 2 ? '0' : '') + text;
+	}
+
+	function buttonRippleForBackground(value) {
+		if (!/^#[0-9a-f]{6}$/i.test(value || '')) {
+			return null;
+		}
+		const red = parseInt(value.slice(1, 3), 16);
+		const green = parseInt(value.slice(3, 5), 16);
+		const blue = parseInt(value.slice(5, 7), 16);
+		const maximum = Math.max(red, green, blue);
+		const minimum = Math.min(red, green, blue);
+		const delta = maximum - minimum;
+		let hue = 0;
+		if (delta !== 0 && maximum === red) {
+			hue = 60 * (((green - blue) / delta) % 6);
+		} else if (delta !== 0 && maximum === green) {
+			hue = 60 * ((blue - red) / delta + 2);
+		} else if (delta !== 0) {
+			hue = 60 * ((red - green) / delta + 4);
+		}
+		if (hue < 0) {
+			hue += 360;
+		}
+		const saturation = maximum === 0 ? 0 : delta / maximum;
+		const nextValue = Math.max(
+			0,
+			Math.min(255, maximum + (maximum > 128 ? -32 : 32)));
+		const chroma = nextValue * saturation;
+		const x = chroma * (1 - Math.abs((hue / 60) % 2 - 1));
+		const m = nextValue - chroma;
+		let nextRed = 0;
+		let nextGreen = 0;
+		let nextBlue = 0;
+		if (hue < 60) {
+			nextRed = chroma;
+			nextGreen = x;
+		} else if (hue < 120) {
+			nextRed = x;
+			nextGreen = chroma;
+		} else if (hue < 180) {
+			nextGreen = chroma;
+			nextBlue = x;
+		} else if (hue < 240) {
+			nextGreen = x;
+			nextBlue = chroma;
+		} else if (hue < 300) {
+			nextRed = x;
+			nextBlue = chroma;
+		} else {
+			nextRed = chroma;
+			nextBlue = x;
+		}
+		return '#'
+			+ hexByte(nextRed + m)
+			+ hexByte(nextGreen + m)
+			+ hexByte(nextBlue + m);
+	}
+
+	function applyColors(data) {
+		const next = (data && data.colors) ? data.colors : data;
+		if (!next || typeof next !== 'object') {
+			return;
+		}
+		if (next.bodyBg) {
+			root.style.setProperty('--body-bg', next.bodyBg);
+			const footerFg = footerColorForBackground(next.bodyBg);
+			if (footerFg) {
+				root.style.setProperty('--footer-fg', footerFg);
+			}
+		}
+		if (next.titleBg) {
+			root.style.setProperty('--title-bg', next.titleBg);
+			const titleFg = colorForBackground(next.titleBg);
+			if (titleFg) {
+				root.style.setProperty('--title-fg', titleFg);
+			}
+			const titleControl = titleControlColorsForBackground(next.titleBg);
+			if (titleControl) {
+				root.style.setProperty('--title-control-fg', titleControl.fg);
+				root.style.setProperty(
+					'--title-control-ripple',
+					titleControl.ripple);
+			}
+		}
+		if (next.bottomBg) {
+			root.style.setProperty('--bottom-bg', next.bottomBg);
+		}
+	}
+
+	function applyAssets(data) {
+		if (!data || typeof data !== 'object') {
+			return;
+		}
+		if (data.icons && typeof data.icons === 'object') {
+			shellAssets.icons = data.icons;
+		}
+		if (data.titleMenuIcon && typeof data.titleMenuIcon === 'object') {
+			shellAssets.titleMenuIcon = data.titleMenuIcon;
+		}
+		if (data.verifiedBadge && typeof data.verifiedBadge === 'object') {
+			shellAssets.verifiedBadge = data.verifiedBadge;
+		}
+		if (data.menuPalette && typeof data.menuPalette === 'object') {
+			shellAssets.menuPalette = data.menuPalette;
+			if (data.menuPalette.bg) {
+				root.style.setProperty('--menu-bg', data.menuPalette.bg);
+			}
+			if (data.menuPalette.fg) {
+				root.style.setProperty('--menu-fg', data.menuPalette.fg);
+			}
+			if (data.menuPalette.hoverBg) {
+				root.style.setProperty(
+					'--menu-hover-bg',
+					data.menuPalette.hoverBg);
+			}
+			if (data.menuPalette.ripple) {
+				root.style.setProperty('--menu-ripple', data.menuPalette.ripple);
+			}
+			if (data.menuPalette.separator) {
+				root.style.setProperty(
+					'--menu-separator',
+					data.menuPalette.separator);
+			}
+			if (data.menuPalette.attention) {
+				root.style.setProperty(
+					'--menu-attention',
+					data.menuPalette.attention);
+			}
+		}
+		if (shellAssets.titleMenuIcon && shellAssets.titleMenuIcon.url) {
+			controls.menuIcon.style.webkitMaskImage = 'url('
+				+ shellAssets.titleMenuIcon.url + ')';
+			controls.menuIcon.style.maskImage = 'url('
+				+ shellAssets.titleMenuIcon.url + ')';
+			if (shellAssets.titleMenuIcon.width) {
+				controls.menuIcon.style.width
+					= String(shellAssets.titleMenuIcon.width) + 'px';
+			}
+			if (shellAssets.titleMenuIcon.height) {
+				controls.menuIcon.style.height
+					= String(shellAssets.titleMenuIcon.height) + 'px';
+			}
+		}
+		if (shellAssets.verifiedBadge && shellAssets.verifiedBadge.url) {
+			badge.style.backgroundImage = 'url('
+				+ shellAssets.verifiedBadge.url + ')';
+			if (shellAssets.verifiedBadge.width) {
+				badge.style.width = String(shellAssets.verifiedBadge.width) + 'px';
+			}
+			if (shellAssets.verifiedBadge.height) {
+				badge.style.height = String(shellAssets.verifiedBadge.height) + 'px';
+			}
+			if (shellAssets.verifiedBadge.alt) {
+				badge.setAttribute('aria-label', shellAssets.verifiedBadge.alt);
+			}
+		} else {
+			badge.style.backgroundImage = '';
+			badge.removeAttribute('aria-label');
+		}
+		applyChrome({});
+		renderMenu();
+	}
+
+	function applyChrome(data) {
+		if (!data || typeof data !== 'object') {
+			return;
+		}
+		if (Object.prototype.hasOwnProperty.call(data, 'backVisible')) {
+			shellState.backVisible = !!data.backVisible;
+		}
+		if (Object.prototype.hasOwnProperty.call(data, 'menuVisible')) {
+			shellState.menuVisible = !!data.menuVisible;
+		}
+		if (Object.prototype.hasOwnProperty.call(data, 'badgeVisible')) {
+			shellState.badgeVisible = !!data.badgeVisible;
+		}
+		controls.back.classList.toggle('hidden', !shellState.backVisible);
+		controls.menu.classList.toggle('hidden', !shellState.menuVisible);
+		controls.menu.disabled = !shellState.menuVisible
+			|| !shellState.menuItems.length;
+		badge.classList.toggle(
+			'hidden',
+			!shellState.badgeVisible
+				|| !(shellAssets.verifiedBadge && shellAssets.verifiedBadge.url));
+		badge.setAttribute(
+			'aria-hidden',
+			badge.classList.contains('hidden') ? 'true' : 'false');
+		if (controls.menu.disabled) {
+			closeMenu();
+		}
+	}
+
+	function visibleButtons() {
+		const main = shellState.buttons.main && shellState.buttons.main.visible
+			? shellState.buttons.main
+			: null;
+		const secondary = shellState.buttons.secondary
+			&& shellState.buttons.secondary.visible
+			? shellState.buttons.secondary
+			: null;
+		const result = {
+			layout: 'single',
+			buttons: []
+		};
+		if (main && secondary) {
+			const position = secondary.position || 'left';
+			if (position === 'top') {
+				result.layout = 'vertical';
+				result.buttons = [secondary, main];
+			} else if (position === 'bottom') {
+				result.layout = 'vertical';
+				result.buttons = [main, secondary];
+			} else if (position === 'left') {
+				result.layout = 'horizontal';
+				result.buttons = [secondary, main];
+			} else {
+				result.layout = 'horizontal';
+				result.buttons = [main, secondary];
+			}
+		} else if (main) {
+			result.buttons = [main];
+		} else if (secondary) {
+			result.buttons = [secondary];
+		}
+		return result;
+	}
+
+	function requestButtonIcon(state) {
+		if (!state
+			|| !state.visible
+			|| !state.iconCustomEmojiId
+			|| state.iconResolvedGeneration === state.iconGeneration
+			|| state.iconRequestGeneration === state.iconGeneration) {
+			return;
+		}
+		state.iconRequestGeneration = state.iconGeneration;
+		invokeShell('shell_request_button_icon', {
+			name: state.name
+		});
+	}
+
+	function updateFooter() {
+		const visible = visibleButtons();
+		const hasButtons = !!visible.buttons.length;
+		disclosure.textContent = '';
+		disclosure.classList.remove('visible');
+		buttonsWrap.classList.toggle('visible', hasButtons);
+		footer.classList.toggle('visible', hasButtons);
+		root.style.setProperty(
+			'--footer-gap',
+			shellState.isFullscreen
+				? '0px'
+				: hasButtons
+				? 'var(--footer-button-skip)'
+				: 'var(--disclosure-skip)');
+		scheduleViewport();
+	}
+
+	function renderButtons() {
+		const visible = visibleButtons();
+		buttons.textContent = '';
+		buttons.dataset.layout = visible.layout;
+		for (const state of visible.buttons) {
+			const button = document.createElement('button');
+			button.type = 'button';
+			button.className = 'shell-button';
+			button.disabled = !state.active;
+			const buttonColor = state.color || '#40a7e3';
+			button.style.background = buttonColor;
+			button.style.color = state.textColor || '#ffffff';
+			const rippleColor = buttonRippleForBackground(buttonColor);
+			if (rippleColor) {
+				button.style.setProperty('--button-ripple', rippleColor);
+			}
+
+			const icon = document.createElement('span');
+			icon.className = 'button-icon';
+			const iconReady = state.iconResolvedGeneration === state.iconGeneration;
+			if (state.iconCustomEmojiId && state.iconUrl) {
+				icon.classList.add('visible');
+				icon.style.backgroundImage = 'url(' + state.iconUrl + ')';
+			} else if (state.iconCustomEmojiId && !iconReady) {
+				icon.classList.add('visible', 'pending');
+				requestButtonIcon(state);
+			}
+			button.appendChild(icon);
+
+			const label = document.createElement('span');
+			label.className = 'button-label';
+			label.textContent = state.text || '';
+			button.appendChild(label);
+
+			const spinner = document.createElement('span');
+			spinner.className = 'button-spinner';
+			if (state.progress) {
+				spinner.classList.add('visible');
+			}
+			button.appendChild(spinner);
+
+			button.addEventListener('click', function() {
+				if (!button.disabled) {
+					postToFrame(state.name + '_button_pressed', {});
+				}
+			});
+			setupRipple(button);
+			buttons.appendChild(button);
+		}
+		updateFooter();
+	}
+
+	function menuIconUrl(name) {
+		const asset = shellAssets.icons && name ? shellAssets.icons[name] : null;
+		return (asset && asset.url) ? asset.url : '';
+	}
+
+	function createMenuNode(item, className) {
+		const clickable = !!item.id && item.enabled !== false;
+		const node = document.createElement(clickable ? 'button' : 'div');
+		node.className = className
+			+ (item.attention ? ' attention' : '')
+			+ (clickable ? '' : ' disabled');
+		if (clickable) {
+			node.type = 'button';
+			setupRipple(node);
+			node.addEventListener('click', function(event) {
+				if (!shellState.blocked && event.isTrusted) {
+					invokeShell('shell_menu_action', { id: item.id });
+					closeMenu();
+				}
+			});
+		}
+		return node;
+	}
+
+	function createMenuCopy(item) {
+		const copy = document.createElement('span');
+		copy.className = 'menu-item-copy';
+		const titleNode = document.createElement('span');
+		titleNode.className = 'menu-item-title';
+		titleNode.textContent = item.text || '';
+		copy.appendChild(titleNode);
+		if (item.subtitle) {
+			const subtitleNode = document.createElement('span');
+			subtitleNode.className = 'menu-item-subtitle';
+			subtitleNode.textContent = item.subtitle;
+			copy.appendChild(subtitleNode);
+		}
+		return copy;
+	}
+
+	function renderMenu() {
+		menuList.textContent = '';
+		for (const item of shellState.menuItems) {
+			if (item.separator) {
+				const separator = document.createElement('div');
+				separator.className = 'menu-separator';
+				menuList.appendChild(separator);
+				continue;
+			}
+			if (Array.isArray(item.children) && item.children.length) {
+				const group = document.createElement('div');
+				group.className = 'menu-group';
+
+				const header = document.createElement('div');
+				header.className = 'menu-item menu-group-title';
+				const headerIcon = document.createElement('span');
+				headerIcon.className = 'menu-item-icon';
+				const headerIconUrl = menuIconUrl(item.icon);
+				if (headerIconUrl) {
+					headerIcon.style.backgroundImage = 'url('
+						+ headerIconUrl + ')';
+				}
+				header.appendChild(headerIcon);
+				header.appendChild(createMenuCopy(item));
+				group.appendChild(header);
+
+				const children = document.createElement('div');
+				children.className = 'menu-group-children';
+				for (const child of item.children) {
+					if (child.separator) {
+						const separator = document.createElement('div');
+						separator.className = 'menu-separator';
+						children.appendChild(separator);
+						continue;
+					}
+					const row = createMenuNode(child, 'menu-download');
+					row.appendChild(createMenuCopy(child));
+					if (child.actionLabel) {
+						const action = document.createElement('span');
+						action.className = 'menu-item-action';
+						action.textContent = child.actionLabel;
+						row.appendChild(action);
+					}
+					children.appendChild(row);
+				}
+				group.appendChild(children);
+				menuList.appendChild(group);
+				continue;
+			}
+
+			const row = createMenuNode(item, 'menu-item');
+			const icon = document.createElement('span');
+			icon.className = 'menu-item-icon';
+			const iconUrl = menuIconUrl(item.icon);
+			if (iconUrl) {
+				icon.style.backgroundImage = 'url(' + iconUrl + ')';
+			}
+			row.appendChild(icon);
+			row.appendChild(createMenuCopy(item));
+			menuList.appendChild(row);
+		}
+		menu.classList.toggle(
+			'visible',
+			shellState.menuOpen
+				&& shellState.menuVisible
+				&& !!shellState.menuItems.length);
+		menuBackdrop.classList.toggle(
+			'visible',
+			menu.classList.contains('visible'));
+		controls.menu.classList.toggle(
+			'active',
+			menu.classList.contains('visible'));
+	}
+	function closeMenu() {
+		if (!shellState.menuOpen) {
+			return;
+		}
+		shellState.menuOpen = false;
+		renderMenu();
+	}
+
+	function toggleMenu(event) {
+		if (event && !event.isTrusted) {
+			return;
+		}
+		if (shellState.blocked) {
+			return;
+		}
+		if (shellState.menuOpen) {
+			closeMenu();
+			return;
+		}
+		invokeShell('shell_menu_request', {});
+		shellState.menuOpen = true;
+		renderMenu();
+	}
+
+	function parseFrameMessage(data) {
+		if (typeof data === 'string') {
+			try {
+				return JSON.parse(data);
+			} catch (e) {
+				return null;
+			}
+		}
+		return data && typeof data === 'object' && !Array.isArray(data)
+			? data
+			: null;
+	}
+
+	function addRipple(button, x, y) {
+		if (!button || button.disabled) {
+			return;
+		}
+		const rect = button.getBoundingClientRect();
+		const ripple = document.createElement('span');
+		ripple.className = 'ripple';
+		const inner = document.createElement('span');
+		inner.className = 'inner';
+		const size = 2 * Math.hypot(
+			Math.max(x, rect.width - x),
+			Math.max(y, rect.height - y));
+		inner.style.width = String(size) + 'px';
+		inner.style.height = String(size) + 'px';
+		inner.style.left = String(x - size / 2) + 'px';
+		inner.style.top = String(y - size / 2) + 'px';
+		ripple.appendChild(inner);
+		button.appendChild(ripple);
+	}
+
+	function stopRipples(button) {
+		const ripples = Array.prototype.slice.call(
+			button.querySelectorAll('.ripple:not(.hiding)'));
+		for (const ripple of ripples) {
+			ripple.classList.add('hiding');
+			window.setTimeout(function() {
+				ripple.remove();
+			}, 200);
+		}
+	}
+
+	function setupRipple(button) {
+		button.addEventListener('mousedown', function(event) {
+			if (event.button !== 0) {
+				return;
+			}
+			const rect = button.getBoundingClientRect();
+			addRipple(button, event.clientX - rect.left, event.clientY - rect.top);
+		});
+		button.addEventListener('mouseup', function() {
+			stopRipples(button);
+		});
+		button.addEventListener('mouseleave', function() {
+			stopRipples(button);
+		});
+	}
+
+	window.addEventListener('message', function(event) {
+		if (!iframe
+			|| !iframe.contentWindow
+			|| event.source !== iframe.contentWindow) {
+			return;
+		}
+		if (sameOrigin && (!frameOrigin || event.origin !== frameOrigin)) {
+			return;
+		}
+		const message = parseFrameMessage(event.data);
+		if (!message || typeof message.eventType !== 'string') {
+			return;
+		}
+		if (message.eventType === 'iframe_ready') {
+			reloadSupported = !!(message.eventData && message.eventData.reload_supported);
+			return;
+		} else if (message.eventType === 'iframe_will_reload') {
+			if (reloadTimeout) {
+				window.clearTimeout(reloadTimeout);
+				reloadTimeout = null;
+			}
+			frameLoaded = false;
+			return;
+		}
+		invokeWebApp(message.eventType, message.eventData, event.origin);
+	});
+
+	menuBackdrop.addEventListener('mousedown', closeMenu);
+	blocker.addEventListener('click', function(event) {
+		if (!event.isTrusted || !shellState.blocked) {
+			return;
+		}
+		invokeShell('shell_close_layer', {});
+		event.preventDefault();
+		event.stopPropagation();
+	});
+
+	document.addEventListener('mousedown', function(event) {
+		if (!shellState.menuOpen) {
+			return;
+		}
+		const target = event.target;
+		if (menu.contains(target)
+			|| controls.menu.contains(target)
+			|| menuBackdrop.contains(target)) {
+			return;
+		}
+		closeMenu();
+	});
+
+	window.addEventListener('keydown', function(event) {
+		if (event.key === 'Escape' && shellState.menuOpen) {
+			event.preventDefault();
+			closeMenu();
+		}
+	});
+
+	window.addEventListener('resize', scheduleViewport);
+	if (window.ResizeObserver) {
+		resizeObserver = new window.ResizeObserver(scheduleViewport);
+		resizeObserver.observe(frameShell);
+		resizeObserver.observe(root);
+	}
+
+	controls.close.addEventListener('click', function(event) {
+		if (event.isTrusted) {
+			invokeShell('shell_close', {});
+		}
+	});
+	controls.back.addEventListener('click', function() {
+		postToFrame('back_button_pressed', {});
+	});
+	controls.menu.addEventListener('click', toggleMenu);
+	setupRipple(controls.close);
+	setupRipple(controls.back);
+	setupRipple(controls.menu);
+	header.addEventListener('selectstart', function(event) {
+		event.preventDefault();
+	});
+	header.addEventListener('mousedown', beginShellMove);
+	for (const handle of resizeHandles) {
+		handle.addEventListener('mousedown', function(event) {
+			beginShellResize(handle.getAttribute('data-resize-edge'), event);
+		});
+	}
+
+	function createIframe(url) {
+		closeMenu();
+		if (reloadTimeout) {
+			window.clearTimeout(reloadTimeout);
+			reloadTimeout = null;
+		}
+		const generation = ++frameGeneration;
+		pendingEvents.splice(0);
+		const next = document.createElement('iframe');
+		next.setAttribute('allow', 'clipboard-read; clipboard-write; fullscreen');
+		next.referrerPolicy = 'no-referrer';
+		next.addEventListener('load', function() {
+			if (iframe !== next || generation !== frameGeneration) {
+				return;
+			}
+			frameLoaded = true;
+			flushPendingEvents();
+			scheduleViewport();
+		});
+		frameLoaded = false;
+		reloadSupported = false;
+		if (iframe) {
+			iframe.remove();
+		}
+		iframe = next;
+		iframe.src = url || 'about:blank';
+		frameWrap.appendChild(iframe);
+	}
+
+	function fallbackReloadFrame() {
+		createIframe(frameUrl || 'about:blank');
+	}
+
+	function reloadFrame() {
+		if (!iframe) {
+			return;
+		}
+		if (reloadSupported && frameLoaded && iframe.contentWindow) {
+			sendToFrame('reload_iframe', {}, frameGeneration);
+			if (reloadTimeout) {
+				window.clearTimeout(reloadTimeout);
+			}
+			reloadTimeout = window.setTimeout(function() {
+				reloadTimeout = null;
+				fallbackReloadFrame();
+			}, 500);
+			return;
+		}
+		fallbackReloadFrame();
+	}
+
+	function isNativeToken(token) {
+		return !!shellToken && token === shellToken;
+	}
+
+	const api = {
+		bootstrap: function(data, token) {
+			if (!isNativeToken(token)) {
+				return;
+			}
+			applyMetrics(data && data.metrics);
+			applyColors(data && data.colors);
+			applyChrome(data || {});
+			shellState.bottomText = '';
+			title.textContent = (data && data.title) || '';
+			document.title = (data && data.title) || 'Telegram';
+			sameOrigin = !!(data && data.sameOrigin);
+			frameUrl = (data && data.url) || 'about:blank';
+			frameOrigin = sameOrigin ? originFromUrl(frameUrl) : '';
+			createIframe(frameUrl);
+			renderButtons();
+			renderMenu();
+		},
+		nativeEvent: function(eventType, eventData, token) {
+			if (!isNativeToken(token) || typeof eventType !== 'string') {
+				return;
+			}
+			if (eventType === 'fullscreen_changed' && eventData) {
+				shellState.isFullscreen = !!eventData.is_fullscreen;
+				root.classList.toggle('fullscreen', shellState.isFullscreen);
+				updateFooter();
+			}
+			postToFrame(eventType, eventData || {});
+		},
+		setTitle: function(data, token) {
+			if (!isNativeToken(token)) {
+				return;
+			}
+			title.textContent = (data && data.title) || '';
+			document.title = (data && data.title) || 'Telegram';
+		},
+		setChrome: function(data, token) {
+			if (!isNativeToken(token)) {
+				return;
+			}
+			applyChrome(data || {});
+		},
+		setColors: function(data, token) {
+			if (!isNativeToken(token)) {
+				return;
+			}
+			applyColors(data || {});
+		},
+		setAssets: function(data, token) {
+			if (!isNativeToken(token)) {
+				return;
+			}
+			applyAssets(data || {});
+		},
+		setMenu: function(data, token) {
+			if (!isNativeToken(token)) {
+				return;
+			}
+			shellState.menuItems = Array.isArray(data && data.items)
+				? data.items
+				: [];
+			applyChrome({});
+			renderMenu();
+		},
+		setBottomText: function(data, token) {
+			if (!isNativeToken(token)) {
+				return;
+			}
+			shellState.bottomText = '';
+			updateFooter();
+		},
+		setButton: function(data, token) {
+			if (!isNativeToken(token)) {
+				return;
+			}
+			if (!data || !data.name) {
+				return;
+			}
+			const previous = shellState.buttons[data.name] || {};
+			const next = Object.assign({}, previous, data);
+			if (next.iconGeneration !== previous.iconGeneration
+				|| next.iconCustomEmojiId !== previous.iconCustomEmojiId) {
+				next.iconRequestGeneration = '';
+				next.iconResolvedGeneration = '';
+				next.iconUrl = '';
+			}
+			if (!next.iconCustomEmojiId) {
+				next.iconRequestGeneration = '';
+				next.iconResolvedGeneration = next.iconGeneration || '';
+				next.iconUrl = '';
+			}
+			shellState.buttons[data.name] = next;
+			renderButtons();
+		},
+		setButtonIcon: function(data, token) {
+			if (!isNativeToken(token)) {
+				return;
+			}
+			if (!data || !data.name) {
+				return;
+			}
+			const state = shellState.buttons[data.name];
+			if (!state || state.iconGeneration !== (data.generation || '')) {
+				return;
+			}
+			const icon = (data.icon && typeof data.icon === 'object')
+				? data.icon
+				: null;
+			state.iconRequestGeneration = '';
+			state.iconResolvedGeneration = state.iconGeneration;
+			state.iconUrl = (icon && icon.url) ? icon.url : '';
+			renderButtons();
+		},
+		setBlocked: function(data, token) {
+			if (!isNativeToken(token)) {
+				return;
+			}
+			shellState.blocked = !!(data && data.blocked);
+			root.classList.toggle('blocked', shellState.blocked);
+			if (shellState.blocked) {
+				closeMenu();
+			}
+		},
+		setProgress: function(data, token) {
+			if (!isNativeToken(token)) {
+				return;
+			}
+			root.classList.toggle('loading', !!(data && data.shown));
+		},
+		reloadFrame: function(data, token) {
+			if (!isNativeToken(token)) {
+				return;
+			}
+			reloadFrame();
+		},
+		sendViewport: function(data, token) {
+			if (!isNativeToken(token)) {
+				return;
+			}
+			scheduleViewport();
+		}
+	};
+	Object.defineProperty(window, 'TelegramDesktopShell', {
+		value: Object.freeze(api),
+		configurable: false,
+		writable: false
+	});
+})();
diff --git a/Telegram/Resources/day-custom-base.tdesktop-theme b/Telegram/Resources/day-custom-base.tdesktop-theme
index d10f68c7568edc..42d69a8d4f40c2 100644
Binary files a/Telegram/Resources/day-custom-base.tdesktop-theme and b/Telegram/Resources/day-custom-base.tdesktop-theme differ
diff --git a/Telegram/Resources/default_shortcuts-custom.json b/Telegram/Resources/default_shortcuts-custom.json
index 42d412b15b4107..054ad70d077680 100644
--- a/Telegram/Resources/default_shortcuts-custom.json
+++ b/Telegram/Resources/default_shortcuts-custom.json
@@ -1,6 +1,7 @@
 // This is a list of your own shortcuts for Telegram Desktop
 // You can see full list of commands in the 'shortcuts-default.json' file
 // Place a null value instead of a command string to switch the shortcut off
+// You can also edit them in Settings > Chat Settings > Keyboard Shortcuts.
 
 [
     // {
diff --git a/Telegram/Resources/emoji/emoji_1.webp b/Telegram/Resources/emoji/emoji_1.webp
index 4669e602224636..a46934a411816d 100644
Binary files a/Telegram/Resources/emoji/emoji_1.webp and b/Telegram/Resources/emoji/emoji_1.webp differ
diff --git a/Telegram/Resources/emoji/emoji_2.webp b/Telegram/Resources/emoji/emoji_2.webp
index 0c0d7c2956901e..1ed5db43fb7b0e 100644
Binary files a/Telegram/Resources/emoji/emoji_2.webp and b/Telegram/Resources/emoji/emoji_2.webp differ
diff --git a/Telegram/Resources/emoji/emoji_3.webp b/Telegram/Resources/emoji/emoji_3.webp
index 4d874b37bfdf03..f31b74cbe72ecb 100644
Binary files a/Telegram/Resources/emoji/emoji_3.webp and b/Telegram/Resources/emoji/emoji_3.webp differ
diff --git a/Telegram/Resources/emoji/emoji_4.webp b/Telegram/Resources/emoji/emoji_4.webp
index bc4eead449b685..53f65c27a0a2cd 100644
Binary files a/Telegram/Resources/emoji/emoji_4.webp and b/Telegram/Resources/emoji/emoji_4.webp differ
diff --git a/Telegram/Resources/emoji/emoji_5.webp b/Telegram/Resources/emoji/emoji_5.webp
index 9a4e9afd6de03a..dda7edca30d4bf 100644
Binary files a/Telegram/Resources/emoji/emoji_5.webp and b/Telegram/Resources/emoji/emoji_5.webp differ
diff --git a/Telegram/Resources/emoji/emoji_6.webp b/Telegram/Resources/emoji/emoji_6.webp
index 7d5842d8e65386..d8dbd4774c0598 100644
Binary files a/Telegram/Resources/emoji/emoji_6.webp and b/Telegram/Resources/emoji/emoji_6.webp differ
diff --git a/Telegram/Resources/emoji/emoji_7.webp b/Telegram/Resources/emoji/emoji_7.webp
index b324a3e8328ec9..13e3a97437ca80 100644
Binary files a/Telegram/Resources/emoji/emoji_7.webp and b/Telegram/Resources/emoji/emoji_7.webp differ
diff --git a/Telegram/Resources/emoji/emoji_8.webp b/Telegram/Resources/emoji/emoji_8.webp
index 5ac85a8a713504..585d8c7182279c 100644
Binary files a/Telegram/Resources/emoji/emoji_8.webp and b/Telegram/Resources/emoji/emoji_8.webp differ
diff --git a/Telegram/Resources/export_html/css/style.css b/Telegram/Resources/export_html/css/style.css
index f9727d68ac6f32..3189390b4ca1d4 100644
--- a/Telegram/Resources/export_html/css/style.css
+++ b/Telegram/Resources/export_html/css/style.css
@@ -440,6 +440,9 @@ div.toast_shown {
 .section.stories {
     background-image: url(../images/section_stories.png);
 }
+.section.music {
+    background-image: url(../images/section_music.png);
+}
 .section.web {
     background-image: url(../images/section_web.png);
 }
@@ -481,6 +484,16 @@ div.toast_shown {
 .media_video .fill {
     background-image: url(../images/media_video.png)
 }
+.audio_icon {
+    width: 48px;
+    height: 48px;
+    border-radius: 50%;
+    background-color: #4f9cd9;
+    background-image: url(../images/media_music.png);
+    background-repeat: no-repeat;
+    background-position: 12px 12px;
+    background-size: 24px 24px;
+}
 
 @media only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) {
 .section.calls {
@@ -504,6 +517,9 @@ div.toast_shown {
 .section.stories {
     background-image: url(../images/section_stories@2x.png);
 }
+.section.music {
+    background-image: url(../images/section_music@2x.png);
+}
 .section.web {
     background-image: url(../images/section_web@2x.png);
 }
@@ -545,6 +561,9 @@ div.toast_shown {
 .media_video .fill {
     background-image: url(../images/media_video@2x.png)
 }
+.audio_icon {
+    background-image: url(../images/media_music@2x.png);
+}
 }
 
 .spoiler {
@@ -633,4 +652,101 @@ div.toast_shown {
 .reactions .reaction .count {
     margin-right: 8px;
     line-height: 20px;
+}
+
+@media (prefers-color-scheme: dark) {
+html, body {
+    background-color: #1a2026; /* groupCallBg */
+    margin: 0;
+    padding: 0;
+}
+.page_wrap {
+    background-color: #1a2026; /* groupCallBg */
+    color: #ffffff; /* groupCallMembersFg */
+    min-height: 100vh;
+}
+.page_wrap a {
+    color: #4db8ff; /* groupCallActiveFg */
+}
+.page_header {
+    background-color: #1a2026; /* groupCallBg */
+    border-bottom: 1px solid #2c333d; /* groupCallMembersBg */
+}
+.bold {
+    color: #ffffff; /* groupCallMembersFg */
+}
+.details {
+    color: #91979e; /* groupCallMemberNotJoinedStatus */
+}
+.page_body {
+    background-color: #1a2026; /* groupCallBg */
+}
+code {
+    color: #ff8aac; /* historyPeer6UserpicBg */
+    background-color: #2c333d; /* groupCallMembersBg */
+}
+pre {
+    color: #ffffff; /* groupCallMembersFg */
+    background-color: #2c333d; /* groupCallMembersBg */
+    border: 1px solid #323a45; /* groupCallMembersBgOver */
+}
+.with_divider {
+    border-top: 1px solid #2c333d; /* groupCallMembersBg */
+}
+a.block_link:hover {
+    background-color: #323a45; /* groupCallMembersBgOver */
+}
+.list_page .entry {
+    color: #ffffff; /* groupCallMembersFg */
+}
+.message {
+    color: #ffffff; /* groupCallMembersFg */
+}
+div.selected {
+    background-color: #323a45; /* groupCallMembersBgOver */
+}
+.default .from_name {
+    color: #4db8ff; /* groupCallActiveFg */
+}
+.default .media .description {
+    color: #ffffff; /* groupCallMembersFg */
+}
+msgInBg,
+.historyComposeAreaBg {
+    background-color: #2c333d; /* groupCallMembersBg */
+}
+msgOutBg {
+    background-color: #323a45; /* groupCallMembersBgOver */
+}
+msgInBgSelected {
+    background-color: #39424f; /* groupCallMembersBgRipple */
+}
+msgOutBgSelected {
+    background-color: #39424f; /* groupCallMembersBgRipple */
+}
+.spoiler {
+    background: #323a45; /* groupCallMembersBgOver */
+}
+.spoiler.hidden {
+    background: #61c0ff; /* groupCallMemberInactiveStatus */
+}
+.bot_button {
+    background-color: #4db8ff40; /* groupCallActiveFg with opacity */
+}
+.reactions .reaction {
+    background-color: #2c333d; /* groupCallMembersBg */
+    color: #4db8ff; /* groupCallActiveFg */
+}
+.reactions .reaction.active {
+    background-color: #4db8ff; /* groupCallActiveFg */
+    color: #1a2026; /* groupCallBg */
+}
+.reactions .reaction.paid {
+    background-color: #323a45; /* groupCallMembersBgOver */
+    color: #febb5b; /* historyPeer8UserpicBg */
+}
+.reactions .reaction.active.paid {
+    background-color: #febb5b; /* historyPeer8UserpicBg */
+    color: #1a2026; /* groupCallBg */
+}
 }
\ No newline at end of file
diff --git a/Telegram/Resources/export_html/images/section_music.png b/Telegram/Resources/export_html/images/section_music.png
new file mode 100644
index 00000000000000..a76a2449d54fd2
Binary files /dev/null and b/Telegram/Resources/export_html/images/section_music.png differ
diff --git a/Telegram/Resources/export_html/images/section_music@2x.png b/Telegram/Resources/export_html/images/section_music@2x.png
new file mode 100644
index 00000000000000..53dc7022c65857
Binary files /dev/null and b/Telegram/Resources/export_html/images/section_music@2x.png differ
diff --git a/Telegram/Resources/icons/arrows_select.png b/Telegram/Resources/icons/arrows_select.png
new file mode 100644
index 00000000000000..6ce5c0f6c4538f
Binary files /dev/null and b/Telegram/Resources/icons/arrows_select.png differ
diff --git a/Telegram/Resources/icons/arrows_select@2x.png b/Telegram/Resources/icons/arrows_select@2x.png
new file mode 100644
index 00000000000000..6db5b158e95307
Binary files /dev/null and b/Telegram/Resources/icons/arrows_select@2x.png differ
diff --git a/Telegram/Resources/icons/arrows_select@3x.png b/Telegram/Resources/icons/arrows_select@3x.png
new file mode 100644
index 00000000000000..63bf8a6a44d13e
Binary files /dev/null and b/Telegram/Resources/icons/arrows_select@3x.png differ
diff --git a/Telegram/Resources/icons/calls/call_group.png b/Telegram/Resources/icons/calls/call_group.png
new file mode 100644
index 00000000000000..d60c581b1f0651
Binary files /dev/null and b/Telegram/Resources/icons/calls/call_group.png differ
diff --git a/Telegram/Resources/icons/calls/call_group@2x.png b/Telegram/Resources/icons/calls/call_group@2x.png
new file mode 100644
index 00000000000000..ab1dd6a1504693
Binary files /dev/null and b/Telegram/Resources/icons/calls/call_group@2x.png differ
diff --git a/Telegram/Resources/icons/calls/call_group@3x.png b/Telegram/Resources/icons/calls/call_group@3x.png
new file mode 100644
index 00000000000000..67f363752b4c36
Binary files /dev/null and b/Telegram/Resources/icons/calls/call_group@3x.png differ
diff --git a/Telegram/Resources/icons/calls/call_message.png b/Telegram/Resources/icons/calls/call_message.png
new file mode 100644
index 00000000000000..3fcc4ecda58f03
Binary files /dev/null and b/Telegram/Resources/icons/calls/call_message.png differ
diff --git a/Telegram/Resources/icons/calls/call_message@2x.png b/Telegram/Resources/icons/calls/call_message@2x.png
new file mode 100644
index 00000000000000..e6d5f0f8b11ac3
Binary files /dev/null and b/Telegram/Resources/icons/calls/call_message@2x.png differ
diff --git a/Telegram/Resources/icons/calls/call_message@3x.png b/Telegram/Resources/icons/calls/call_message@3x.png
new file mode 100644
index 00000000000000..f7e20df4fb52d5
Binary files /dev/null and b/Telegram/Resources/icons/calls/call_message@3x.png differ
diff --git a/Telegram/Resources/icons/calls/calls_add_people.png b/Telegram/Resources/icons/calls/calls_add_people.png
new file mode 100644
index 00000000000000..4e07a92f475276
Binary files /dev/null and b/Telegram/Resources/icons/calls/calls_add_people.png differ
diff --git a/Telegram/Resources/icons/calls/calls_add_people@2x.png b/Telegram/Resources/icons/calls/calls_add_people@2x.png
new file mode 100644
index 00000000000000..bf55e663c391e5
Binary files /dev/null and b/Telegram/Resources/icons/calls/calls_add_people@2x.png differ
diff --git a/Telegram/Resources/icons/calls/calls_add_people@3x.png b/Telegram/Resources/icons/calls/calls_add_people@3x.png
new file mode 100644
index 00000000000000..c138ad5c24c537
Binary files /dev/null and b/Telegram/Resources/icons/calls/calls_add_people@3x.png differ
diff --git a/Telegram/Resources/icons/calls/filled_stream_crown.svg b/Telegram/Resources/icons/calls/filled_stream_crown.svg
new file mode 100644
index 00000000000000..f1b17ee2be3b0e
--- /dev/null
+++ b/Telegram/Resources/icons/calls/filled_stream_crown.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Filled / filled_stream_crown</title>
+    <g id="Filled-/-filled_stream_crown" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M10.5793798,21.3515408 L22.4461242,27.5065085 C23.3919447,27.6775566 24.3643369,27.4213643 25.1079413,26.8052098 L34.6112236,12.5021245 C35.4192073,11.8326252 36.5811617,11.8326252 37.3891453,12.5021245 L46.8924276,26.8052098 C47.6360321,27.4213643 48.6084242,27.6775566 49.5542448,27.5065085 L61.4209891,21.3515408 C62.613521,21.1358757 63.7528909,21.9400986 63.965843,23.1478228 C64.0112154,23.4051449 64.0113863,23.6685576 63.9663481,23.9259399 L57.0245486,49.6650027 C56.2820716,53.9080693 48.2297454,57 36.0001845,57 C23.7706236,57 15.7182973,53.9080693 14.9758203,49.6650027 L8.03402089,23.9259399 C7.8226367,22.7179332 8.61824017,21.5651064 9.81105098,21.3510293 C10.0651955,21.3054173 10.3252947,21.3055904 10.5793798,21.3515408 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/calls/group_call_logo.png b/Telegram/Resources/icons/calls/group_call_logo.png
new file mode 100644
index 00000000000000..b083149297bd7e
Binary files /dev/null and b/Telegram/Resources/icons/calls/group_call_logo.png differ
diff --git a/Telegram/Resources/icons/calls/group_call_logo@2x.png b/Telegram/Resources/icons/calls/group_call_logo@2x.png
new file mode 100644
index 00000000000000..ca935f224961d2
Binary files /dev/null and b/Telegram/Resources/icons/calls/group_call_logo@2x.png differ
diff --git a/Telegram/Resources/icons/calls/group_call_logo@3x.png b/Telegram/Resources/icons/calls/group_call_logo@3x.png
new file mode 100644
index 00000000000000..890bab3cb2a8cc
Binary files /dev/null and b/Telegram/Resources/icons/calls/group_call_logo@3x.png differ
diff --git a/Telegram/Resources/icons/chat/ai_letters.svg b/Telegram/Resources/icons/chat/ai_letters.svg
new file mode 100644
index 00000000000000..47c8ce91d6529b
--- /dev/null
+++ b/Telegram/Resources/icons/chat/ai_letters.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="96.5 111.3 766.5 766.5" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 498.706 365.42 C 515.594 363.348 538.563 365.861 548.485 381.651 C 566.807 410.809 576.751 446.661 588.311 479.176 L 637.399 618.626 L 665.78 698.579 C 676.659 729.146 687.226 748.313 682.54 781.481 C 675.846 788.102 668.071 795.055 658.868 797.629 C 651.616 799.698 643.834 798.72 637.319 794.919 C 631.617 791.632 622.75 782.719 620.419 776.738 C 608.192 745.354 594.733 707.965 586.262 675.669 C 569.761 672.672 533.607 673.757 515.5 673.803 L 465.584 673.663 C 429.007 673.61 428.662 668.91 417.869 707.395 C 410.414 728.146 405.333 752.038 396.071 771.94 C 379.585 807.367 355.479 802.277 330.202 783.696 C 330.019 782.164 329.86 780.629 329.726 779.091 C 328.901 769.751 329.769 760.338 332.289 751.306 C 338.538 728.396 348.963 702.053 357.021 679.401 L 394.065 573.806 L 430.927 469.343 C 440.963 440.571 450.771 403.685 469.355 379.052 C 476.858 369.108 486.798 366.389 498.706 365.42 z M 504.968 436.525 C 508.866 440.798 524.908 486.278 526.975 494.054 C 537.563 533.876 560.589 582.995 564.841 623.288 C 546.777 622.864 528.711 622.571 510.642 622.408 C 489.848 622.27 469.054 622.56 448.271 623.279 C 449.463 605.6 468.851 551.806 475.731 531.511 C 486.173 500.704 494.943 466.856 504.968 436.525 z" fill="#FFFFFF"></path>
+        <path d="M 754.216 524.167 C 763.771 523.439 778.578 525.381 783.67 533.512 C 790.57 544.531 788.595 576.397 788.599 589.29 L 788.562 654.629 C 788.553 691.578 790.329 746.525 787.335 782.106 C 781.652 787.948 775.21 792.333 768.254 796.474 C 752.507 799.502 746.874 792.906 735.396 783.22 C 733.424 762.938 733.05 546.574 736.372 537.446 C 738.677 531.114 748.456 526.925 754.216 524.167 z" fill="#FFFFFF"></path>
+        <path d="M 757.56 426.311 C 768.63 427.03 775.49 429.481 785.226 434.328 C 797.887 454.333 796.6 461.896 785.005 482.127 C 777.16 485.341 772.393 487.022 764.241 489.32 C 731.637 497.151 705.869 438.865 757.56 426.311 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/chat/ai_star1.svg b/Telegram/Resources/icons/chat/ai_star1.svg
new file mode 100644
index 00000000000000..4c62840ce6e7b3
--- /dev/null
+++ b/Telegram/Resources/icons/chat/ai_star1.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="96.5 111.3 766.5 766.5" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 361.507 181.705 C 372.454 181.635 380.002 234.986 387.127 242.295 C 407.219 262.908 437.857 263.914 463.429 280.408 C 440.851 302.031 406.127 295.636 389.728 315.608 C 381.989 325.033 369.855 367.603 363.046 382.355 C 351.465 373.05 343.119 333.179 332.642 316.843 C 318.951 295.494 264.524 299.57 262.849 280.314 C 270.405 265.304 317.273 260.399 329.146 248.809 C 346.343 232.022 342.909 197.93 361.507 181.705 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/chat/ai_star2.svg b/Telegram/Resources/icons/chat/ai_star2.svg
new file mode 100644
index 00000000000000..45d06aefd76fb6
--- /dev/null
+++ b/Telegram/Resources/icons/chat/ai_star2.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="96.5 111.3 766.5 766.5" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 227.159 367.788 C 233.561 369.307 240.228 369.662 246.771 369.89 C 248.488 420.574 264.795 427.64 311.005 436.455 C 310.491 445.011 310.17 446.339 311.45 454.821 C 305.224 455.372 297.895 455.922 291.885 456.866 C 243.817 464.419 258.4 489.944 240.267 514.706 C 237.443 517.55 234.726 520.712 231.065 522.27 C 229.488 521.415 227.953 519.681 227.797 517.859 C 223.678 469.953 209.284 457.548 161.759 455.794 C 162.291 447.329 162.683 442.73 161.662 434.383 C 213.477 429.408 223.054 418.438 227.159 367.788 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/chat/ai_style_tone.svg b/Telegram/Resources/icons/chat/ai_style_tone.svg
new file mode 100644
index 00000000000000..778574b6790deb
--- /dev/null
+++ b/Telegram/Resources/icons/chat/ai_style_tone.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="86 88 1428 1428" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 958.553 1299.97 C 934.769 1305.39 906.43 1312.64 882.948 1315.92 C 779.669 1330.36 677.454 1318.71 583.292 1272.15 C 563.463 1262.34 547.132 1254.86 527.944 1242.75 C 435.019 1184.11 363.007 1097.59 322.199 995.568 C 270.377 868.326 271.778 723.336 327.271 597.348 C 339.315 570.005 347.862 549.146 364.195 523.501 C 440.059 406.442 559.396 324.393 695.857 295.468 C 793.87 273.039 896.365 280.647 989.993 317.299 C 1023.84 330.856 1064.3 352.862 1095.4 372.043 C 1131.57 394.356 1165.91 427.689 1193.83 459.345 C 1252.08 524.213 1295 608.113 1312.6 693.716 C 1330.75 781.951 1326.27 882.203 1296.79 967.484 C 1292.99 978.458 1283.28 1006.98 1276.51 1015.69 C 1273.57 1022.68 1268.1 1032.56 1264.61 1040.23 C 1265.07 1028.72 1265.56 1020.16 1264.79 1008.68 C 1254.79 973.218 1242.44 960.874 1212.87 941.129 C 1218.75 927.097 1222.13 912.02 1225.38 897.254 C 1243.43 814.997 1237.73 723.116 1206.19 644.774 C 1159.36 528.464 1073.88 445.913 958.19 399.511 C 767.873 323.175 536.448 406.112 432.131 581.107 C 420.192 601.135 411.979 624.034 402.565 645.324 C 360.668 747.59 363.066 865.571 405.417 967.139 C 441.894 1054.37 505.485 1127.53 586.779 1175.81 C 604.994 1186.4 634.545 1199.51 654.867 1207.68 C 712.277 1230.79 779.141 1236.79 840.406 1232.3 C 860.115 1230.86 879.512 1226.97 898.933 1225.24 C 900.582 1248.18 911.027 1266.69 928.362 1281.83 C 937.274 1289.62 947.496 1295.76 958.553 1299.97 z" fill="#FFFFFF"></path>
+        <path d="M 1128.69 1164.62 C 1126.89 1138.94 1129.74 1110.05 1128.91 1083.97 C 1129.53 1062.87 1126.32 1039.59 1128.73 1018.82 C 1131.19 997.636 1150.52 980.952 1171.68 980.635 C 1227.95 979.793 1219.16 1038.37 1219.11 1074.53 L 1219 1164.55 C 1251.14 1165.51 1283.43 1164.42 1315.58 1164.78 C 1333.04 1164.98 1353.69 1163.41 1370.55 1166.9 C 1403.29 1173.68 1416.22 1221.5 1391.21 1244.31 C 1384.38 1250.42 1376.05 1254.61 1367.07 1256.44 C 1352.27 1259.6 1327.65 1258.18 1311.86 1258.37 C 1281.15 1258.74 1249.63 1257.71 1218.96 1258.75 L 1219.1 1356.51 C 1219.12 1377.54 1223.48 1414.32 1207.25 1428.23 C 1172.49 1458.02 1132.23 1439.9 1127.9 1395.53 C 1122.53 1372.19 1117.35 1310 1126.65 1288.84 L 1127.08 1289.83 L 1128.41 1287.22 C 1128.27 1278.01 1127.93 1267.97 1128.08 1258.84 C 1083.86 1257.02 1039.03 1259.47 994.752 1258.25 C 989.7 1258.11 984.635 1257.5 979.69 1256.56 C 956.617 1253.73 941.757 1229.5 943.148 1207.43 C 943.828 1195.73 949.179 1184.79 958 1177.08 C 976.352 1161.03 1014.24 1164.71 1037.73 1164.72 L 1128.69 1164.62 z" fill="#FFFFFF"></path>
+        <path d="M 610.973 895.133 C 643.186 892.884 648.43 905.548 667.386 929.45 C 675.615 939.699 684.891 949.062 695.063 957.386 C 730.715 986.644 776.693 1000.22 822.52 995.027 C 865.303 990.469 904.474 969.266 933.418 937.876 C 940.853 929.813 946.51 922.315 953.186 913.72 C 962.084 902.256 970.413 896.331 984.914 894.729 C 1008.49 892.123 1030.8 911.274 1032.5 934.785 C 1034.05 956.385 1017.23 974.884 1003.86 990.297 C 965.325 1032.63 927.972 1059.61 871.965 1074.67 C 801.761 1093.54 733.018 1083.12 670.277 1046.06 C 635.22 1024.35 591.125 986.858 576.88 947.553 C 568.425 924.222 588.241 900.643 610.973 895.133 z" fill="#FFFFFF"></path>
+        <path d="M 961.019 634.145 C 970.488 633.512 981.532 632.792 990.535 636.285 C 1051.66 660 1046.51 761.342 981.201 775.898 C 899.252 786.262 882.791 651.991 961.019 634.145 z" fill="#FFFFFF"></path>
+        <path d="M 624.902 634.175 C 641.093 632.775 651.579 633.112 666.22 641.676 C 700.598 661.786 706.956 712.893 687.854 745.391 C 679.285 759.97 664.152 771.962 647.31 775.873 C 566.74 787.124 546.445 655.7 624.902 634.175 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/chat/code_tags.svg b/Telegram/Resources/icons/chat/code_tags.svg
new file mode 100644
index 00000000000000..f03e9ce1b3a53b
--- /dev/null
+++ b/Telegram/Resources/icons/chat/code_tags.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M5.9010,12.0 L8.9994,8.4976 A0.6,0.6 0 0,0 8.1006,7.7024 L4.5919,11.6690 A0.5,0.5 0 0,0 4.5919,12.3310 L8.1006,16.2976 A0.6,0.6 0 0,0 8.9994,15.5024 Z" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M18.0990,12.0 L15.0006,8.4976 A0.6,0.6 0 0,1 15.8994,7.7024 L19.4081,11.6690 A0.5,0.5 0 0,1 19.4081,12.3310 L15.8994,16.2976 A0.6,0.6 0 0,1 15.0006,15.5024 Z" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M13.7387,6.2657 L11.4387,17.9657 A0.6,0.6 0 0,1 10.2613,17.7343 L12.5613,6.0343 A0.6,0.6 0 0,1 13.7387,6.2657 Z" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/filled_forge.svg b/Telegram/Resources/icons/chat/filled_forge.svg
new file mode 100644
index 00000000000000..02b46ac4817b3a
--- /dev/null
+++ b/Telegram/Resources/icons/chat/filled_forge.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>General / filled_forge</title>
+    <g id="General-/-filled_forge" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M26.8803711,42.9691285 L26.8803711,33.7410056 C26.8803711,33.11927 26.3893032,32.6152537 25.7835403,32.6152537 L8.09706803,32.6154971 C7.49130511,32.6152537 7,33.11927 7,33.7410056 C7,33.9944037 7.08318975,34.2404095 7.23626246,34.4392245 C9.56487979,37.4608308 12.1213046,39.7244765 14.9057916,41.2299549 C17.8018091,42.7957341 20.5397889,43.8582429 24.9161047,44.4179683 L25.2457274,44.4589071 C26.0477924,44.5565198 26.7750924,43.9683037 26.8701973,43.1450899 L26.8778029,43.0572626 L26.8803711,42.9691285 Z M30.8798186,32.6154971 L59.9031688,32.6154971 C60.5089318,32.6154971 60.9999998,33.1195134 60.9999998,33.7412491 L60.9999998,36.4408258 C61.000316,37.0212546 60.5706169,37.5067847 60.0076722,37.5620866 C57.3927119,37.8210366 55.1679079,38.6553059 53.3332522,40.064809 C50.2394895,42.4416407 49.2366731,44.4435299 49.1755065,48.0018733 C49.1382293,50.1704578 50.1322377,52.2585707 52.1575318,54.2662123 L52.296812,54.4034138 C52.5894925,54.6869764 52.7553736,55.0818071 52.7553809,55.494901 L52.7553809,58.4989974 C52.7553809,59.3279782 52.1006237,60 51.2929398,60 L31.2454289,60 C30.4377449,60 29.7829878,59.3279782 29.7829878,58.4989974 L29.7829878,55.7751285 C29.7829878,55.2288989 30.07236,54.7258646 30.5381844,54.461705 C32.2097215,53.515021 33.045631,52.0517712 33.045631,50.071432 C33.045631,48.0381514 32.1644305,46.5830842 30.4020296,45.7062304 C30.0237528,45.5192489 29.7835556,45.1264633 29.7829878,44.6955343 L29.7829878,33.7412491 C29.7829878,33.1195134 30.2740556,32.6154971 30.8798186,32.6154971 Z M29.237607,20.3106275 L28.6499023,17.7939453 C28.4616476,16.9877966 28.9457606,16.1776492 29.731199,15.9844306 L29.7897387,15.9713252 L56.7002319,10.5626871 C58.1450662,10.2709171 59.5574843,11.1988248 59.9043292,12.6676634 C60.2342627,14.0648845 59.398154,15.4720725 58.0368282,15.8107056 L57.9904306,15.8217747 L30.9506174,21.431793 C30.2027293,21.5875657 29.4685665,21.1272206 29.2564842,20.3834763 L29.237607,20.3106275 Z M21.0454851,29.4020889 L25.8385445,28.1561792 C27.1874085,27.8053966 28.0160509,26.4127572 27.7040622,25.0209386 L26.1574242,18.1229025 C25.9968368,17.4069908 25.709601,16.7274065 25.3099901,16.1179194 L25.080135,15.7700577 C22.3045369,11.599669 20.2944004,9.68972122 19.0487201,10.0409088 C17.7772179,10.3993761 16.869418,13.1789485 16.3253204,18.3796257 L16.3034188,18.5917858 C16.2363952,19.2528701 16.2767862,19.9207888 16.422944,20.5682925 L17.9744041,27.4363312 C18.2935763,28.8495773 19.6685461,29.729677 21.0454851,29.4020889 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/input_comments_expand.png b/Telegram/Resources/icons/chat/input_comments_expand.png
new file mode 100644
index 00000000000000..2a67d963186765
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_comments_expand.png differ
diff --git a/Telegram/Resources/icons/chat/input_comments_expand@2x.png b/Telegram/Resources/icons/chat/input_comments_expand@2x.png
new file mode 100644
index 00000000000000..5fe041c4ad8ab2
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_comments_expand@2x.png differ
diff --git a/Telegram/Resources/icons/chat/input_comments_expand@3x.png b/Telegram/Resources/icons/chat/input_comments_expand@3x.png
new file mode 100644
index 00000000000000..4e675a43f0dc2b
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_comments_expand@3x.png differ
diff --git a/Telegram/Resources/icons/chat/input_comments_hide.png b/Telegram/Resources/icons/chat/input_comments_hide.png
new file mode 100644
index 00000000000000..606fb2c4979c49
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_comments_hide.png differ
diff --git a/Telegram/Resources/icons/chat/input_comments_hide@2x.png b/Telegram/Resources/icons/chat/input_comments_hide@2x.png
new file mode 100644
index 00000000000000..233fd06490ecc2
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_comments_hide@2x.png differ
diff --git a/Telegram/Resources/icons/chat/input_comments_hide@3x.png b/Telegram/Resources/icons/chat/input_comments_hide@3x.png
new file mode 100644
index 00000000000000..e6f6d925c0e5b1
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_comments_hide@3x.png differ
diff --git a/Telegram/Resources/icons/chat/input_gift.png b/Telegram/Resources/icons/chat/input_gift.png
new file mode 100644
index 00000000000000..eac02d4b2a04b1
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_gift.png differ
diff --git a/Telegram/Resources/icons/chat/input_gift@2x.png b/Telegram/Resources/icons/chat/input_gift@2x.png
new file mode 100644
index 00000000000000..51c3472a6e27ce
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_gift@2x.png differ
diff --git a/Telegram/Resources/icons/chat/input_gift@3x.png b/Telegram/Resources/icons/chat/input_gift@3x.png
new file mode 100644
index 00000000000000..d88028bb459bbf
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_gift@3x.png differ
diff --git a/Telegram/Resources/icons/chat/input_paid.svg b/Telegram/Resources/icons/chat/input_paid.svg
new file mode 100644
index 00000000000000..1179751c9a6d9e
--- /dev/null
+++ b/Telegram/Resources/icons/chat/input_paid.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Input / input_paid</title>
+    <g id="Icon-/-Input-/-input_paid" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M20,9.8 C25.6299826,9.8 30.2,14.2730045 30.2,19.7983329 C30.2,25.3236612 25.6299826,29.7966657 20,29.7966657 C18.7457032,29.7966657 17.522531,29.57429 16.3765194,29.1472418 L16.049,29.018 L15.8675895,29.1274403 L15.6273764,29.2612632 C14.545782,29.8404011 13.0955737,30.1473058 11.2731839,30.1996583 C10.8153842,30.2127839 10.4336239,29.8523042 10.4204985,29.3945045 C10.4177264,29.2978179 10.4318913,29.2013918 10.4663408,29.0979123 C10.9468917,27.7307176 11.2958938,26.5818971 11.5130707,25.6565167 L11.566,25.42 L11.5361505,25.3785138 C10.4824637,23.8473989 9.87852612,22.0565089 9.80714989,20.1756532 L9.8,19.7983329 C9.8,14.2730045 14.3700174,9.8 20,9.8 Z M20,11.2 C15.1365724,11.2 11.2,15.0530063 11.2,19.7983329 C11.2,21.6384229 11.7922255,23.3893508 12.8759186,24.8453165 L13.0610907,25.0940992 L13.001223,25.3983974 C12.8243697,26.2973155 12.5137714,27.4099145 12.0719423,28.73207 L12.064,28.754 L12.2244984,28.7405395 C13.2682683,28.6413859 14.1190062,28.4334572 14.7754263,28.1231964 L14.9665215,28.0270547 C15.164827,27.9208723 15.3780604,27.7932923 15.605736,27.6441968 L15.9287098,27.4326945 L16.2799121,27.5930136 C17.4341359,28.1199012 18.6962936,28.3966657 20,28.3966657 C24.8634276,28.3966657 28.8,24.5436594 28.8,19.7983329 C28.8,15.0530063 24.8634276,11.2 20,11.2 Z" id="Shape---" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M20.2258661,25.6815247 C20.5071894,25.6815247 20.874026,25.4574745 20.874026,25.0631159 L20.874026,24.4093038 C22.5557139,24.2186972 23.4454545,23.1802196 23.4454545,21.6685117 C23.4454545,20.3671283 22.7015108,19.5784112 21.1573587,19.2234884 L19.8882782,18.9211469 C19.0943214,18.7371128 18.7067205,18.3558996 18.7067205,17.7972249 C18.7067205,17.1268153 19.2568638,16.6404397 20.1195884,16.6404397 C20.8197708,16.6404397 21.3073978,16.8902001 21.8512894,17.5277465 C22.126361,17.8300881 22.3389164,17.941823 22.6264913,17.941823 C22.9765824,17.941823 23.2454024,17.68549 23.2454024,17.3042767 C23.2454024,16.9362087 23.0390987,16.5352774 22.6890076,16.1737821 C22.2263871,15.713697 21.7022327,15.4113555 20.9207792,15.3061932 L20.9207792,14.6509738 C20.9207792,14.2631879 20.5009377,13.9363049 20.2133629,13.9363049 C19.9320396,13.9363049 19.5493506,14.2566152 19.5493506,14.6509738 L19.5493506,15.2864752 C17.930179,15.4442187 17.0312842,16.4629784 17.0312842,17.9221051 C17.0312842,19.1971979 17.7752279,20.0450688 19.2005991,20.3802736 L20.4696796,20.6891878 C21.3949206,20.9192303 21.7762699,21.2610078 21.7762699,21.8394004 C21.7762699,22.5886817 21.219875,23.061912 20.2258661,23.061912 C19.4819224,23.061912 18.8630112,22.766143 18.3003647,22.1285967 C17.9815316,21.7933919 17.8064861,21.7210928 17.5689242,21.7210928 C17.1875749,21.7210928 16.9,21.9774259 16.9,22.417793 C16.9,22.8055789 17.1125554,23.2065101 17.4939047,23.5548602 C17.9940349,24.0346632 18.7115432,24.3238594 19.5805195,24.4093038 L19.5805195,25.0565432 C19.5805195,25.4509018 19.9382912,25.6815247 20.2258661,25.6815247 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/input_send_round.png b/Telegram/Resources/icons/chat/input_send_round.png
new file mode 100644
index 00000000000000..7052e9116defd8
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_send_round.png differ
diff --git a/Telegram/Resources/icons/chat/input_send_round@2x.png b/Telegram/Resources/icons/chat/input_send_round@2x.png
new file mode 100644
index 00000000000000..92b3b02c7f00e5
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_send_round@2x.png differ
diff --git a/Telegram/Resources/icons/chat/input_send_round@3x.png b/Telegram/Resources/icons/chat/input_send_round@3x.png
new file mode 100644
index 00000000000000..f33a744a6214d0
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_send_round@3x.png differ
diff --git a/Telegram/Resources/icons/chat/input_video.png b/Telegram/Resources/icons/chat/input_video.png
new file mode 100644
index 00000000000000..34a71853d435f3
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_video.png differ
diff --git a/Telegram/Resources/icons/chat/input_video@2x.png b/Telegram/Resources/icons/chat/input_video@2x.png
new file mode 100644
index 00000000000000..0657613a8aae90
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_video@2x.png differ
diff --git a/Telegram/Resources/icons/chat/input_video@3x.png b/Telegram/Resources/icons/chat/input_video@3x.png
new file mode 100644
index 00000000000000..9fb24d542a5c35
Binary files /dev/null and b/Telegram/Resources/icons/chat/input_video@3x.png differ
diff --git a/Telegram/Resources/icons/chat/large_messages.png b/Telegram/Resources/icons/chat/large_messages.png
new file mode 100644
index 00000000000000..f2b2fda9d0633d
Binary files /dev/null and b/Telegram/Resources/icons/chat/large_messages.png differ
diff --git a/Telegram/Resources/icons/chat/large_messages@2x.png b/Telegram/Resources/icons/chat/large_messages@2x.png
new file mode 100644
index 00000000000000..c4a0821ec60db8
Binary files /dev/null and b/Telegram/Resources/icons/chat/large_messages@2x.png differ
diff --git a/Telegram/Resources/icons/chat/large_messages@3x.png b/Telegram/Resources/icons/chat/large_messages@3x.png
new file mode 100644
index 00000000000000..1d5b682e32d250
Binary files /dev/null and b/Telegram/Resources/icons/chat/large_messages@3x.png differ
diff --git a/Telegram/Resources/icons/chat/large_user_tag.svg b/Telegram/Resources/icons/chat/large_user_tag.svg
new file mode 100644
index 00000000000000..ed97783eba20fa
--- /dev/null
+++ b/Telegram/Resources/icons/chat/large_user_tag.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="192px" height="192px" viewBox="0 0 192 192" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Other / Large / large_user_tag</title>
+    <g id="Other-/-Large-/-large_user_tag" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M134.779316,99.2776105 L155.861136,126.586165 C159.213567,130.92877 158.410871,137.166828 154.068266,140.519258 L137.349024,153.118955 C133.003707,156.393386 126.832804,155.562756 123.507963,151.255889 L102.341831,123.838121 C101.020315,122.126282 100.709294,119.840656 101.525344,117.837943 L107.904357,102.18287 C108.669944,100.304003 110.404748,98.9967346 112.421855,98.7786913 L129.321766,96.9518613 C131.421678,96.724867 133.488626,97.6057022 134.779316,99.2776105 Z M93.0045522,97.5 C96.0738449,97.5 99.0280025,97.6802939 101.867025,98.0408816 C101.658034,98.4287114 101.468568,98.8297452 101.299796,99.2430624 L94.927069,114.849633 C93.2728501,118.900753 93.7623745,123.498344 96.1864336,127.10949 L96.6969772,127.818112 L110.089,145.166 L55.2019123,145.166667 C50.0608762,145.166667 46.4337638,144.380785 44.3205752,142.809021 L44.1207992,142.654461 C42.0402664,140.979657 41,138.612081 41,135.551733 C41,131.543526 42.2098787,127.327177 44.6296361,122.902685 C47.0493935,118.478193 50.5360562,114.345377 55.0896242,110.504236 C59.6431923,106.663095 65.1152969,103.535437 71.5059383,101.121262 C77.8965797,98.7070875 85.0627843,97.5 93.0045522,97.5 Z M115.981148,108.01419 C113.77151,109.670379 113.331818,112.797477 114.999066,114.998781 C116.666338,117.200067 119.809193,117.641973 122.018852,115.98581 C124.22849,114.329621 124.668182,111.202523 123.000934,109.001219 C121.333662,106.799933 118.190807,106.358027 115.981148,108.01419 Z M93,86.6666667 C97.7764274,86.6666667 102.130651,85.4958452 106.062672,83.1542021 C109.994693,80.8125591 113.133919,77.6591033 115.480352,73.6938349 C117.826784,69.7285665 119,65.2736229 119,60.3290043 C119,55.562273 117.815549,51.2391277 115.446646,47.3595686 C113.077743,43.4800095 109.922365,40.394636 105.980514,38.1034483 C102.038662,35.8122605 97.7118241,34.6666667 93,34.6666667 C88.2881759,34.6666667 83.9615135,35.8242275 80.020013,38.1393492 C76.0785124,40.4544708 72.9231351,43.5619993 70.5538811,47.4619346 C68.184627,51.3618699 67,55.6835597 67,60.427004 C67.0196619,65.3062895 68.2027089,69.7285665 70.5491411,73.6938349 C72.8955734,77.6591033 76.0412953,80.8125591 79.9863069,83.1542021 C83.9313185,85.4958452 88.2692162,86.6666667 93,86.6666667 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/markup_webview.png b/Telegram/Resources/icons/chat/markup_webview.png
new file mode 100644
index 00000000000000..801937d7c6bc79
Binary files /dev/null and b/Telegram/Resources/icons/chat/markup_webview.png differ
diff --git a/Telegram/Resources/icons/chat/markup_webview@2x.png b/Telegram/Resources/icons/chat/markup_webview@2x.png
new file mode 100644
index 00000000000000..068f4f00b5ecb3
Binary files /dev/null and b/Telegram/Resources/icons/chat/markup_webview@2x.png differ
diff --git a/Telegram/Resources/icons/chat/markup_webview@3x.png b/Telegram/Resources/icons/chat/markup_webview@3x.png
new file mode 100644
index 00000000000000..d52aa42c98d39d
Binary files /dev/null and b/Telegram/Resources/icons/chat/markup_webview@3x.png differ
diff --git a/Telegram/Resources/icons/chat/menu_sidebar1.svg b/Telegram/Resources/icons/chat/menu_sidebar1.svg
new file mode 100644
index 00000000000000..ae5d1b0c451e50
--- /dev/null
+++ b/Telegram/Resources/icons/chat/menu_sidebar1.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>General / menu_sidebar1</title>
+    <g id="General-/-menu_sidebar1" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M51,11.75 C57.7654882,11.75 63.25,17.2345118 63.25,24 L63.25,48 C63.25,54.7654882 57.7654882,60.25 51,60.25 L21,60.25 C14.2345118,60.25 8.75,54.7654882 8.75,48 L8.75,24 C8.75,17.2345118 14.2345118,11.75 21,11.75 L51,11.75 Z M33.75,16.25 L21,16.25 C16.7197932,16.25 13.25,19.7197932 13.25,24 L13.25,48 C13.25,52.2802068 16.7197932,55.75 21,55.75 L33.75,55.75 L33.75,16.25 Z M51,16.25 L38.25,16.25 L38.25,55.75 L51,55.75 C55.2802068,55.75 58.75,52.2802068 58.75,48 L58.75,24 C58.75,19.7197932 55.2802068,16.25 51,16.25 Z M27,38.75 C28.2426407,38.75 29.25,39.7573593 29.25,41 C29.25,42.2426407 28.2426407,43.25 27,43.25 L20,43.25 C18.7573593,43.25 17.75,42.2426407 17.75,41 C17.75,39.7573593 18.7573593,38.75 20,38.75 L27,38.75 Z M27,30.25 C28.2426407,30.25 29.25,31.2573593 29.25,32.5 C29.25,33.7426407 28.2426407,34.75 27,34.75 L20,34.75 C18.7573593,34.75 17.75,33.7426407 17.75,32.5 C17.75,31.2573593 18.7573593,30.25 20,30.25 L27,30.25 Z M27,21.75 C28.2426407,21.75 29.25,22.7573593 29.25,24 C29.25,25.2426407 28.2426407,26.25 27,26.25 L20,26.25 C18.7573593,26.25 17.75,25.2426407 17.75,24 C17.75,22.7573593 18.7573593,21.75 20,21.75 L27,21.75 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/menu_sidebar2.svg b/Telegram/Resources/icons/chat/menu_sidebar2.svg
new file mode 100644
index 00000000000000..177ce3e81d012d
--- /dev/null
+++ b/Telegram/Resources/icons/chat/menu_sidebar2.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>General / menu_sidebar2</title>
+    <g id="General-/-menu_sidebar2" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M51,11.75 C57.7654882,11.75 63.25,17.2345118 63.25,24 L63.25,48 C63.25,54.7654882 57.7654882,60.25 51,60.25 L21,60.25 C14.2345118,60.25 8.75,54.7654882 8.75,48 L8.75,24 C8.75,17.2345118 14.2345118,11.75 21,11.75 L51,11.75 Z M58.75,40.249 L13.25,40.249 L13.25,48 C13.25,52.2802068 16.7197932,55.75 21,55.75 L51,55.75 C55.2802068,55.75 58.75,52.2802068 58.75,48 L58.75,40.249 Z M52,45.25 C53.2426407,45.25 54.25,46.2573593 54.25,47.5 C54.25,48.7426407 53.2426407,49.75 52,49.75 L47,49.75 C45.7573593,49.75 44.75,48.7426407 44.75,47.5 C44.75,46.2573593 45.7573593,45.25 47,45.25 L52,45.25 Z M38,45.25 C39.2426407,45.25 40.25,46.2573593 40.25,47.5 C40.25,48.7426407 39.2426407,49.75 38,49.75 L33,49.75 C31.7573593,49.75 30.75,48.7426407 30.75,47.5 C30.75,46.2573593 31.7573593,45.25 33,45.25 L38,45.25 Z M25,45.25 C26.2426407,45.25 27.25,46.2573593 27.25,47.5 C27.25,48.7426407 26.2426407,49.75 25,49.75 L20,49.75 C18.7573593,49.75 17.75,48.7426407 17.75,47.5 C17.75,46.2573593 18.7573593,45.25 20,45.25 L25,45.25 Z M51,16.25 L21,16.25 L20.2076076,16.2900124 C16.2996229,16.6868898 13.25,19.9873061 13.25,24 L13.25,35.749 L58.75,35.749 L58.75,24 C58.75,19.7197932 55.2802068,16.25 51,16.25 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/menu_sidebar3.svg b/Telegram/Resources/icons/chat/menu_sidebar3.svg
new file mode 100644
index 00000000000000..7d47fa76829d82
--- /dev/null
+++ b/Telegram/Resources/icons/chat/menu_sidebar3.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>General / menu_sidebar3</title>
+    <g id="General-/-menu_sidebar3" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M51,11.75 C57.7654882,11.75 63.25,17.2345118 63.25,24 L63.25,48 C63.25,54.7654882 57.7654882,60.25 51,60.25 L21,60.25 C14.2345118,60.25 8.75,54.7654882 8.75,48 L8.75,24 C8.75,17.2345118 14.2345118,11.75 21,11.75 L51,11.75 Z M58.75,36.249 L13.25,36.249 L13.25,48 C13.25,52.2802068 16.7197932,55.75 21,55.75 L51,55.75 C55.2802068,55.75 58.75,52.2802068 58.75,48 L58.75,36.249 Z M51,16.25 L21,16.25 L20.2076076,16.2900124 C16.2996229,16.6868898 13.25,19.9873061 13.25,24 L13.25,31.749 L58.75,31.749 L58.75,24 C58.75,19.7197932 55.2802068,16.25 51,16.25 Z M52,22.25 C53.2426407,22.25 54.25,23.2573593 54.25,24.5 C54.25,25.7426407 53.2426407,26.75 52,26.75 L47,26.75 C45.7573593,26.75 44.75,25.7426407 44.75,24.5 C44.75,23.2573593 45.7573593,22.25 47,22.25 L52,22.25 Z M38,22.25 C39.2426407,22.25 40.25,23.2573593 40.25,24.5 C40.25,25.7426407 39.2426407,26.75 38,26.75 L33,26.75 C31.7573593,26.75 30.75,25.7426407 30.75,24.5 C30.75,23.2573593 31.7573593,22.25 33,22.25 L38,22.25 Z M25,22.25 C26.2426407,22.25 27.25,23.2573593 27.25,24.5 C27.25,25.7426407 26.2426407,26.75 25,26.75 L20,26.75 C18.7573593,26.75 17.75,25.7426407 17.75,24.5 C17.75,23.2573593 18.7573593,22.25 20,22.25 L25,22.25 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/mini_gift_hidden.png b/Telegram/Resources/icons/chat/mini_gift_hidden.png
new file mode 100644
index 00000000000000..3c7afb68fbdb44
Binary files /dev/null and b/Telegram/Resources/icons/chat/mini_gift_hidden.png differ
diff --git a/Telegram/Resources/icons/chat/mini_gift_hidden@2x.png b/Telegram/Resources/icons/chat/mini_gift_hidden@2x.png
new file mode 100644
index 00000000000000..c212d24dfdfa0a
Binary files /dev/null and b/Telegram/Resources/icons/chat/mini_gift_hidden@2x.png differ
diff --git a/Telegram/Resources/icons/chat/mini_gift_hidden@3x.png b/Telegram/Resources/icons/chat/mini_gift_hidden@3x.png
new file mode 100644
index 00000000000000..cb21e63b36433c
Binary files /dev/null and b/Telegram/Resources/icons/chat/mini_gift_hidden@3x.png differ
diff --git a/Telegram/Resources/icons/chat/mini_info_alert.png b/Telegram/Resources/icons/chat/mini_info_alert.png
new file mode 100644
index 00000000000000..8c79b97d3ba509
Binary files /dev/null and b/Telegram/Resources/icons/chat/mini_info_alert.png differ
diff --git a/Telegram/Resources/icons/chat/mini_info_alert@2x.png b/Telegram/Resources/icons/chat/mini_info_alert@2x.png
new file mode 100644
index 00000000000000..e36a5ed4105a53
Binary files /dev/null and b/Telegram/Resources/icons/chat/mini_info_alert@2x.png differ
diff --git a/Telegram/Resources/icons/chat/mini_info_alert@3x.png b/Telegram/Resources/icons/chat/mini_info_alert@3x.png
new file mode 100644
index 00000000000000..1c8cfe8edec237
Binary files /dev/null and b/Telegram/Resources/icons/chat/mini_info_alert@3x.png differ
diff --git a/Telegram/Resources/icons/chat/mini_roll.svg b/Telegram/Resources/icons/chat/mini_roll.svg
new file mode 100644
index 00000000000000..158f3d10b88476
--- /dev/null
+++ b/Telegram/Resources/icons/chat/mini_roll.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Mini / mini_roll</title>
+    <g id="Mini-/-mini_roll" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M39,2 C43.418278,2 47,5.581722 47,10 L47,31.1887793 C47,33.760437 45.763725,36.1753059 43.6774292,37.6788992 L34.2435723,44.4778795 C32.80623,45.5137721 31.0656753,46.0432193 29.2949637,45.9831622 L9.09321639,45.2979811 C4.83370452,45.1535116 1.4353133,41.695068 1.3654701,37.4336792 L1.01104954,15.8091855 C0.964546919,12.9718908 2.42455232,10.3222835 4.84796505,8.84597906 L14.1687682,3.1678941 C15.4226494,2.40404961 16.8625562,2 18.3307784,2 L39,2 Z M24.3182849,33.7895214 C22.1896369,33.7895214 20.4640268,35.5323942 20.4640268,37.6823369 C20.4640268,39.8322795 22.1896369,41.5751524 24.3182849,41.5751524 C26.4469329,41.5751524 28.1725431,39.8322795 28.1725431,37.6823369 C28.1725431,35.5323942 26.4469329,33.7895214 24.3182849,33.7895214 Z M43.5028298,5.95486664 C43.1084204,5.43724087 42.382444,5.3096145 41.8351419,5.66168777 L31.2535872,12.4687141 L31.2037023,12.4638297 L6.92120008,11.3103335 L6.84373037,11.3084945 C5.94203119,11.3084945 5.21105957,12.0394661 5.21105957,12.9411653 C5.21105957,13.8980472 5.96558985,14.6847215 6.92163968,14.7246185 L30.6738798,15.7148123 L31.0006238,39.5729782 C31.0133849,40.5057402 31.773163,41.2551949 32.7060123,41.2551949 L32.733167,41.2551949 C33.6470713,41.239975 34.3757796,40.4869516 34.3607825,39.5730473 L33.9468798,14.3838123 L43.2886761,7.54001021 C43.7855383,7.16142182 43.8814182,6.45172886 43.5028298,5.95486664 Z M39.599298,27.9369227 C37.937203,27.9369227 36.5898088,29.6797956 36.5898088,31.8297382 C36.5898088,33.9796808 37.937203,35.7225537 39.599298,35.7225537 C41.261393,35.7225537 42.6087873,33.9796808 42.6087873,31.8297382 C42.6087873,29.6797956 41.261393,27.9369227 39.599298,27.9369227 Z M14.6034425,25.1506705 C12.3581563,25.1506705 10.5379922,26.9890433 10.5379922,29.256791 C10.5379922,31.5245387 12.3581563,33.3629114 14.6034425,33.3629114 C16.8487288,33.3629114 18.6688929,31.5245387 18.6688929,29.256791 C18.6688929,26.9890433 16.8487288,25.1506705 14.6034425,25.1506705 Z M6.57813796,16.8317771 C4.44948998,16.8317771 2.72387984,18.5746499 2.72387984,20.7245926 C2.72387984,22.8745352 4.44948998,24.6174081 6.57813796,24.6174081 C8.70678594,24.6174081 10.4323961,22.8745352 10.4323961,20.7245926 C10.4323961,18.5746499 8.70678594,16.8317771 6.57813796,16.8317771 Z M42.1944513,12.7656951 C40.5323563,12.7656951 39.1849621,14.508568 39.1849621,16.6585107 C39.1849621,18.8084533 40.5323563,20.5513262 42.1944513,20.5513262 C43.8565463,20.5513262 45.2039405,18.8084533 45.2039405,16.6585107 C45.2039405,14.508568 43.8565463,12.7656951 42.1944513,12.7656951 Z M24.5822752,3.97181227 C22.5411059,3.97181227 20.8864113,5.2700629 20.8864113,6.8715362 C20.8864113,8.4730095 22.5411059,9.77126013 24.5822752,9.77126013 C26.6234445,9.77126013 28.2781392,8.4730095 28.2781392,6.8715362 C28.2781392,5.2700629 26.6234445,3.97181227 24.5822752,3.97181227 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/mini_shield_lock.svg b/Telegram/Resources/icons/chat/mini_shield_lock.svg
new file mode 100644
index 00000000000000..cd3713bc3e7bf4
--- /dev/null
+++ b/Telegram/Resources/icons/chat/mini_shield_lock.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="136 93 890 890" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 504.293 117.528 C 541.446 99.7386 580.165 93.0717 620.376 105.14 C 631.219 106.538 642.207 112.941 652.696 116.099 C 685.679 126.03 718.461 137.261 751.14 148.185 C 771.898 155.125 792.735 166.277 813.15 174.324 C 844.056 185.54 876.215 195.225 905.75 209.334 C 937.422 224.463 936.82 234.758 940.62 266.838 C 941.264 272.274 947.532 283.343 947.257 289.815 C 948.29 308.247 947.449 327.131 947.373 345.618 L 947.253 450.107 L 947.412 559.832 C 947.418 583.715 948.121 608.768 945.021 632.429 C 943.594 643.319 939.156 656.054 937.845 666.251 C 936.109 679.746 938.392 693.239 934.483 707.066 C 923.993 744.179 905.848 769.673 879.537 796.773 C 871.104 805.459 861.724 816.87 852.521 824.69 C 834.848 839.707 814.811 853.263 796.454 867.416 C 770.014 887.801 741.551 901.337 712.921 917.845 C 694.961 928.2 676.572 939.801 658.394 949.982 C 647.71 955.967 634.87 961.488 623.797 967.04 C 616.99 970.453 605.942 977.072 599.322 979.306 C 590.948 982.089 582.03 982.827 573.312 981.459 C 542.488 976.519 483.314 933.2 454.78 916.988 C 434.334 905.372 405.908 890.768 387.058 876.991 C 360.851 857.838 331.89 837.407 306.191 817.72 C 286.933 802.966 267.098 773.198 251.65 754.279 C 237.533 735.799 220.972 686.481 217.505 663.848 C 214.303 642.945 215.099 600.161 215.106 577.653 L 215.158 439.036 L 215.117 324.637 C 215.127 304.574 214.636 280.21 216.71 260.869 C 218.141 247.521 236.958 220.957 248.527 214.041 C 274.555 198.483 311.855 188.305 340.466 176.772 C 361.514 168.287 382.654 158.028 403.543 150.073 C 421.306 143.309 442.064 138.108 460.328 131.464 C 470.376 127.808 494.692 119.308 504.293 117.528 Z M 573.709 268.42 C 576.771 268.116 579.847 267.969 582.924 267.978 C 608.716 267.978 644.131 280.327 662.572 298.851 C 677.129 313.475 692.182 338.207 696.023 358.614 C 697.874 368.452 697.508 378.679 699.449 388.516 C 701.916 401.019 706.646 413.704 707.202 426.475 C 707.544 434.331 705.86 442.126 705.956 449.933 C 705.973 451.348 705.994 453.774 706.502 455.102 C 707.552 457.852 724.533 467.681 728.273 471.343 C 748.567 491.214 748.389 524.546 748.737 551.038 C 749.106 579.102 748.938 607.197 748.958 635.264 C 748.974 657.07 749.933 679.723 746.931 701.37 C 745.374 712.592 740.911 733.503 732.367 741.388 C 721.175 751.718 612.643 749.679 591.75 749.627 C 561.928 749.993 532.102 749.846 502.286 749.185 C 481.497 748.698 446.201 749.623 428.139 737.83 C 421.328 733.384 416.406 722.037 415.942 713.803 C 415.191 682.14 414.377 661.553 415.144 628.574 C 416.154 585.116 412.041 532.025 418.316 489.191 C 423.845 475.897 447.238 466.568 455.494 458.577 C 458.498 455.669 458.353 422.492 458.253 417.833 C 456.658 343.872 494.181 275.47 573.709 268.42 Z M 568.799 321.43 C 598.31 318.687 617.332 321.214 638.664 342.747 C 659.103 363.379 658.732 380.711 659.048 408.218 C 659.254 426.161 659.096 444.185 659.08 462.067 C 636.76 461.69 611.386 462.973 588.154 462.839 C 572.61 462.93 510.818 463.972 498.21 459.548 C 496.757 457.569 496.59 456.075 496.808 453.532 C 501.396 400.111 501.471 364.357 542.702 324.334 C 551.539 322.441 559.837 322.047 568.799 321.43 Z" fill="#FFFFFF" fill-rule="evenodd"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/chat/mini_ton_bold.svg b/Telegram/Resources/icons/chat/mini_ton_bold.svg
new file mode 100644
index 00000000000000..a81c8e7491856a
--- /dev/null
+++ b/Telegram/Resources/icons/chat/mini_ton_bold.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Mini / mini_ton_bold</title>
+    <g id="Icon-/-Mini-/-mini_ton_bold" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M16.8320513,6.00293199 L30.8742776,6.00123694 C32.482123,6.00783392 33.4103182,6.04961484 34.2623721,6.31422732 C35.1580007,6.59421191 35.9885254,7.04943867 36.7058696,7.65573625 C37.5159618,8.34260493 38.1215277,9.28730116 39.331057,11.1787079 L42.4336058,16.0331171 C43.3610852,17.483397 43.8238233,18.2105513 43.9498243,18.9739625 C44.060601,19.6467312 43.9872841,20.3376285 43.736484,20.972126 C43.4520303,21.6912231 42.8444612,22.3015492 41.6315265,23.5201872 L27.3998258,37.8316301 C26.2101281,39.028111 25.6151791,39.6263515 24.9290847,39.8519506 C24.3257223,40.0493498 23.6742832,40.0493498 23.0707205,39.8519506 C22.3848264,39.6263515 21.7896771,39.028111 20.5999795,37.8316301 L6.36827878,23.5201872 C5.15534405,22.3015492 4.54777493,21.6912231 4.2633212,20.972126 C4.01272148,20.3376285 3.93940453,19.6467312 4.05018123,18.9739625 C4.17618221,18.208537 4.64052287,17.483397 5.56820259,16.0331171 L8.66894853,11.1787079 C9.87847782,9.28730116 10.4840437,8.34260493 11.2941359,7.65573625 C12.0112798,7.04943867 12.8420049,6.59421191 13.7374332,6.31422732 C14.5362336,6.06615312 15.4020801,6.01392697 16.8320513,6.00293199 L16.8320513,6.00293199 Z M26.6095652,16.0935454 L21.2222943,18.0992412 C20.8749418,18.2285614 20.8750778,18.7199164 21.2225017,18.8490444 L26.6095652,20.8512693 L28.5994612,26.262372 C28.7278807,26.611582 29.2217607,26.6116429 29.3502665,26.2624646 L31.3417134,20.8512693 L36.7271277,18.8490302 C37.0745006,18.7198807 37.0746365,18.2285972 36.7273352,18.0992555 L31.3417134,16.0935454 L29.3502525,10.6840067 C29.2217251,10.3348792 28.7279163,10.3349401 28.5994752,10.6840994 L26.6095652,16.0935454 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/new_thread.svg b/Telegram/Resources/icons/chat/new_thread.svg
new file mode 100644
index 00000000000000..bcf13e4ce5cdd2
--- /dev/null
+++ b/Telegram/Resources/icons/chat/new_thread.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 72 72">
+  <path fill="#FFFFFF" fill-rule="evenodd" d="M55,37C62.732,37 69,43.268 69,51C69,58.732 62.732,65 55,65C47.268,65 41,58.732 41,51C41,43.268 47.268,37 55,37ZM36,7C52.569,7 66,19.234 66,34.325C66,35.114 65.963,35.895 65.891,36.667C62.867,34.366 59.093,33 55,33C45.059,33 37,41.059 37,51C37,54.863 38.217,58.442 40.288,61.374C38.888,61.556 37.456,61.651 36,61.651C31.929,61.651 28.047,60.912 24.507,59.574C23.5,60.389 22.256,61.163 20.777,61.895C16.779,63.874 12.723,64.458 8.606,63.645C7.977,63.521 7.568,62.91 7.692,62.281C7.731,62.086 7.819,61.903 7.949,61.752C10.634,58.619 11.966,54.919 11.944,50.654C8.21,46.099 6,40.447 6,34.325C6,19.234 19.431,7 36,7ZM55,42.419C53.872,42.419 52.957,43.334 52.957,44.462L52.956,48.956L48.462,48.957C47.334,48.957 46.419,49.872 46.419,51C46.419,52.128 47.334,53.043 48.462,53.043L52.956,53.042L52.957,57.538C52.957,58.666 53.872,59.581 55,59.581C56.128,59.581 57.043,58.666 57.043,57.538L57.042,53.042L61.538,53.043C62.666,53.043 63.581,52.128 63.581,51C63.581,49.872 62.666,48.957 61.538,48.957L57.042,48.956L57.043,44.462C57.043,43.334 56.128,42.419 55,42.419Z"/>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/new_topic.svg b/Telegram/Resources/icons/chat/new_topic.svg
new file mode 100644
index 00000000000000..51edcba31bd8e8
--- /dev/null
+++ b/Telegram/Resources/icons/chat/new_topic.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / new_topic</title>
+    <g id="Icon-/-Menu-/-new_topic" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M12,3.15416667 C12.3865993,3.15416667 12.7,3.46756734 12.7,3.85416667 C12.7,4.24076599 12.3865993,4.55416667 12,4.55416667 L7.24826389,4.55416667 C5.76035508,4.55416667 4.55416667,5.76035508 4.55416667,7.24826389 L4.55416667,16.7517361 C4.55416667,18.2396449 5.76035508,19.4458333 7.24826389,19.4458333 L16.7517361,19.4458333 C18.2396449,19.4458333 19.4458333,18.2396449 19.4458333,16.7517361 L19.4458333,12 C19.4458333,11.6134007 19.759234,11.3 20.1458333,11.3 C20.5324327,11.3 20.8458333,11.6134007 20.8458333,12 L20.8458333,16.7517361 C20.8458333,19.0128436 19.0128436,20.8458333 16.7517361,20.8458333 L7.24826389,20.8458333 C4.98715643,20.8458333 3.15416667,19.0128436 3.15416667,16.7517361 L3.15416667,7.24826389 C3.15416667,4.98715643 4.98715643,3.15416667 7.24826389,3.15416667 L12,3.15416667 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M19.3511597,5.34872828 C20.2469248,6.24449337 20.2469248,7.69681554 19.3511597,8.59258064 L12.7489306,15.1948097 C12.4577752,15.4859651 12.0995331,15.7011118 11.7057162,15.8213249 L10.029497,16.3329929 C9.10119412,16.6163585 8.11894274,16.0935336 7.83557714,15.1652307 C7.71876473,14.7825544 7.73602986,14.3714738 7.88451862,13.99994 L8.70227653,11.9538276 C8.8286621,11.6375983 9.01800726,11.3503585 9.2588125,11.1095532 L15.5634724,4.80489335 C16.4592375,3.90912826 17.9115597,3.90912826 18.8073247,4.80489335 L19.3511597,5.34872828 Z M18.3612102,6.33867777 L17.8173753,5.79484285 C17.4683442,5.44581176 16.902453,5.44581176 16.5534219,5.79484285 L10.248762,12.0995027 C10.1421189,12.2061458 10.0582655,12.3333529 10.0022944,12.4733983 L9.18453646,14.5195106 C9.15433809,14.59507 9.15082685,14.678672 9.17458316,14.7564974 C9.23221162,14.9452877 9.43197346,15.0516153 9.62076372,14.9939869 L11.296983,14.4823189 C11.4713888,14.4290813 11.63004,14.3338014 11.7589811,14.2048602 L18.3612102,7.60263114 C18.7102413,7.25360006 18.7102413,6.68770886 18.3612102,6.33867777 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <polygon id="Path" fill="#FFFFFF" fill-rule="nonzero" points="15.5907211 6.54669192 17.5755336 8.53150439 16.5855841 9.52145388 14.6007716 7.53664141"></polygon>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/paid_approve.svg b/Telegram/Resources/icons/chat/paid_approve.svg
new file mode 100644
index 00000000000000..c122dca22d2f74
--- /dev/null
+++ b/Telegram/Resources/icons/chat/paid_approve.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Filled / paid_approve</title>
+    <g id="Icon-/-Filled-/-paid_approve" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M12,4.5 C16.14,4.5 19.5,7.86 19.5,12 C19.5,16.14 16.14,19.5 12,19.5 C7.86,19.5 4.5,16.14 4.5,12 C4.5,7.86 7.86,4.5 12,4.5 Z M15.7577636,9.89127556 C15.4992394,9.62810439 15.0763217,9.62433727 14.8131506,9.88286145 L10.7479688,13.8761719 L9.18684944,12.3424898 C8.92367827,12.0839656 8.50076063,12.0877327 8.24223645,12.3509039 C7.98371227,12.6140751 7.98747939,13.0369927 8.25065056,13.2955169 L10.204967,15.2153247 C10.5064723,15.5115061 10.9896874,15.5115061 11.2911927,15.2153247 L15.7493494,10.8358886 C16.0125206,10.5773644 16.0162877,10.1544467 15.7577636,9.89127556 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/paid_decline.svg b/Telegram/Resources/icons/chat/paid_decline.svg
new file mode 100644
index 00000000000000..66f52af7ea30e8
--- /dev/null
+++ b/Telegram/Resources/icons/chat/paid_decline.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Filled / paid_decline</title>
+    <g id="Icon-/-Filled-/-paid_decline" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M12,4.5 C16.1421356,4.5 19.5,7.85786438 19.5,12 C19.5,16.1421356 16.1421356,19.5 12,19.5 C7.85786438,19.5 4.5,16.1421356 4.5,12 C4.5,7.85786438 7.85786438,4.5 12,4.5 Z M9.73375908,8.63964245 C9.43162712,8.33751049 8.94177442,8.33751049 8.63964245,8.63964245 L8.59853606,8.68404063 C8.33819559,8.98800138 8.35189772,9.44601435 8.63964245,9.73375908 L10.9059783,12 L8.63964245,14.2662409 C8.33751049,14.5683729 8.33751049,15.0582256 8.63964245,15.3603575 L8.68404063,15.4014639 C8.98800138,15.6618044 9.44601435,15.6481023 9.73375908,15.3603575 L12,13.0936701 L14.2662409,15.3603575 C14.5683729,15.6624895 15.0582256,15.6624895 15.3603575,15.3603575 L15.4014639,15.3159594 C15.6618044,15.0119986 15.6481023,14.5539856 15.3603575,14.2662409 L13.0936701,12 L15.3603575,9.73375908 C15.6624895,9.43162712 15.6624895,8.94177442 15.3603575,8.63964245 L15.3159594,8.59853606 C15.0119986,8.33819559 14.5539856,8.35189772 14.2662409,8.63964245 L12,10.9059783 L9.73375908,8.63964245 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/paid_edit.svg b/Telegram/Resources/icons/chat/paid_edit.svg
new file mode 100644
index 00000000000000..5b4ec4a4890266
--- /dev/null
+++ b/Telegram/Resources/icons/chat/paid_edit.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Filled / paid_edit</title>
+    <g id="Icon-/-Filled-/-paid_edit" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13.5029106,7.64699152 C13.6056531,7.5472623 13.7697888,7.549705 13.869518,7.65244745 L16.2610253,10.1162122 C16.3593492,10.2175069 16.3585592,10.3788499 16.259248,10.4791768 L7.97687653,18.8462593 C7.87948817,18.9446437 7.74680196,19 7.6083679,19 L5.51851849,19 C5.23214864,19 5,18.7678513 5,18.4814815 L5,16.3683223 C5,16.2308422 5.05459809,16.0989896 5.15178971,16.0017551 L13.5029106,7.64699152 Z M16.0299869,5.19856593 C16.3408365,4.91998643 16.8161619,4.93645109 17.1069903,5.23587194 L18.7801411,6.95845528 C19.073802,7.26079221 19.0732123,7.74202152 18.7788114,8.04363789 L17.6449122,9.20518682 C17.5421105,9.3048549 17.3779763,9.30231456 17.2783082,9.19951281 L14.8031149,6.64621027 C14.707554,6.53957983 14.7165277,6.3756714 14.8231582,6.28011055 L16.0299869,5.19856593 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/refresh.svg b/Telegram/Resources/icons/chat/refresh.svg
new file mode 100644
index 00000000000000..10e1e400ace30d
--- /dev/null
+++ b/Telegram/Resources/icons/chat/refresh.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="-54 -126.5 1300 1300" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 293.256 246.66 C 303.57 231.316 346.963 193.508 362.121 182.857 C 382.415 168.598 439.629 137.351 462.441 132.86 C 470.936 131.188 479.696 129.931 487.895 127.07 C 500.501 122.671 512.121 116.238 525.425 114.002 C 555.645 108.924 640.89 107.622 669.916 114.173 C 683.279 117.189 695.566 124.379 708.747 128.119 C 718.506 130.889 728.902 131.327 738.592 134.243 C 757.682 139.988 804.12 165.473 821.912 177.449 C 867.145 207.897 919.822 260.531 948.249 307.519 C 956.862 321.754 962.746 336.715 969.862 351.626 C 975.201 362.815 983.166 373.039 985.555 385.407 C 987.846 397.263 988.468 408.699 992.437 420.254 C 996.946 433.384 1004.11 445.487 1007.96 458.861 C 1016.96 457.67 1040.85 458.039 1050.9 458.099 C 1071.24 458.22 1096.29 457.055 1116.12 458.887 C 1113.9 472.586 1109.75 486.906 1099.93 497.379 C 1091.13 509.049 1081.18 520.048 1071.87 531.335 C 1040.42 569.475 1005.46 609.384 978.799 651.023 C 958.481 658.332 946.002 656.045 925.372 650.899 C 923.434 638.943 906.187 620.514 898.648 610.127 C 870.778 571.724 838.388 534.317 807.162 498.633 C 796.457 486.112 794.628 475.55 791.043 460.243 C 806.428 457.256 856.509 458.12 874.563 458.212 C 883.566 458.092 893.22 457.323 902.256 456.764 C 903.74 449.659 902.471 448.74 901.714 441.787 C 900.687 415.298 900.595 400.329 884.444 377.489 C 881.097 372.755 877.002 361.881 873.678 356.511 C 843.98 308.538 807.536 273.71 760.358 243.338 C 755.347 240.111 745.152 237.841 739.751 234.55 C 722.189 218.469 706.178 219.541 684.402 213.641 C 674.021 210.828 662.702 201.355 650.37 200.448 C 611.58 197.595 558.962 193.272 522.048 205.721 C 504.105 211.771 495.028 218.663 475.513 221.182 C 456.615 227.903 431.787 244.276 414.511 254.977 C 394.757 269.256 370.747 294.197 349.204 304.094 C 335.659 310.316 317.151 305.429 305.81 295.04 C 301.065 290.655 296.833 285.745 293.196 280.405 C 292.284 268.047 292.218 259.075 293.256 246.66 z" fill="#FFFFFF"></path>
+        <path d="M 186.21 590.217 C 165.947 586.351 91.3706 591.299 77.8568 585.809 C 75.5685 582.498 76.2555 583.019 75.838 578.51 C 77.5916 574.02 91.758 559.627 96.0945 554.009 C 111.556 535.17 124.332 514.736 139.966 496.003 C 166.731 463.932 193.103 430.125 220.887 399.027 C 225.297 394.866 236.541 390.072 242.554 391.758 C 263.746 397.702 280.201 429.811 293.903 445.212 C 325.984 481.268 354.299 517.854 382.164 557.04 C 386.544 563.2 392.893 568.595 397.499 574.66 C 400.763 579.027 401.107 578.847 400.448 583.758 C 398.359 586.15 396.178 586.68 392.934 587.013 C 358.35 590.56 322.483 586.695 287.998 590.332 C 286.888 594.013 288.348 594.999 287.802 597.634 C 289.784 611.55 290.883 626.521 294.274 640.12 C 295.861 649.754 305.692 659.151 308.895 667.473 C 316.255 686.601 325.546 698.041 337.263 714.289 C 376.585 768.818 438.026 814.138 503.435 831.266 C 515.296 834.373 527.363 841.503 539.704 843.839 C 561.158 848.014 583.548 847.455 605.323 847.395 C 618.707 846.567 639.142 847.471 651.643 843.722 C 674.039 837.007 696.296 828.486 718.987 822.786 C 728.912 820.292 758.859 801.739 768.491 796.066 C 792.188 782.109 823.117 749.603 849.588 741.891 C 853.848 742.617 857.997 743.565 861.98 745.286 C 877.229 751.876 890.039 765.465 896.003 780.961 C 898.307 786.949 898.876 792.855 896.197 798.806 C 887.925 817.181 839.079 856.675 821.137 868.231 C 804.479 878.961 785.773 887.555 768.037 896.353 C 758.813 900.928 749.665 906.4 740.065 910.114 C 729.664 914.14 717.667 914.007 706.836 916.831 C 697.251 919.33 688.426 924.652 679.192 928.197 C 650.723 939.126 543.279 936.774 512.519 929.224 C 502.551 926.777 493.919 920.224 484.247 916.818 C 473.53 913.044 461.504 913.434 450.587 909.918 C 441.609 907.026 434.012 901.262 425.66 897.078 C 417.434 892.958 408.696 889.753 400.299 885.987 C 347.46 862.286 271.215 782.467 241.089 732.394 C 233.035 719.007 229.024 704.264 222.018 690.519 C 218.612 683.836 212.373 678.567 209.546 671.603 C 204.416 658.964 206.387 644.372 203.035 631.286 C 199.386 617.039 191.425 603.959 186.21 590.217 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/chat/summary_arrows.svg b/Telegram/Resources/icons/chat/summary_arrows.svg
new file mode 100644
index 00000000000000..97d5de2d02de69
--- /dev/null
+++ b/Telegram/Resources/icons/chat/summary_arrows.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 72 72">
+    <path fill="#ffffff" fill-rule="evenodd" d="M32.5952 38C33.3684 38 33.9952 38.6268 33.9952 39.4V56.1373C33.9952 57.0209 33.2788 57.7373 32.3952 57.7373C31.9708 57.7373 31.5639 57.5687 31.2638 57.2686L25.9422 51.947L19.2057 58.6518C17.5821 60.2675 14.9562 60.2611 13.3405 58.6376C11.7247 57.014 11.7311 54.388 13.3547 52.7723L20.0772 46.082L14.7265 40.7314C14.1017 40.1065 14.1017 39.0935 14.7265 38.4686C15.0266 38.1686 15.4336 38 15.8579 38H32.5952Z"/>
+</svg>
diff --git a/Telegram/Resources/icons/chat/summary_stars.svg b/Telegram/Resources/icons/chat/summary_stars.svg
new file mode 100644
index 00000000000000..f6ac6f60398621
--- /dev/null
+++ b/Telegram/Resources/icons/chat/summary_stars.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 72 72">
+    <path fill="#ffffff" fill-opacity="0.5" fill-rule="evenodd" d="M49.2732 56.5962L45.2962 55.5283C44.5655 55.3321 44.1322 54.5806 44.3285 53.8499C44.4553 53.3778 44.8241 53.009 45.2962 52.8822L49.2732 51.8142C49.8611 51.6563 50.3204 51.1971 50.4783 50.6091L51.5462 46.6322C51.7425 45.9015 52.4939 45.4682 53.2246 45.6644C53.6967 45.7912 54.0655 46.16 54.1923 46.6322L55.2603 50.6091C55.4182 51.1971 55.8774 51.6563 56.4654 51.8142L60.4423 52.8822C61.173 53.0784 61.6063 53.8298 61.4101 54.5605C61.2833 55.0327 60.9145 55.4015 60.4423 55.5283L56.4654 56.5962C55.8774 56.7541 55.4182 57.2134 55.2603 57.8013L54.1923 61.7783C53.9961 62.509 53.2447 62.9423 52.514 62.746C52.0418 62.6193 51.673 62.2504 51.5462 61.7783L50.4783 57.8013C50.3204 57.2134 49.8611 56.7541 49.2732 56.5962Z"/>
+    <path fill="#ffffff" fill-opacity="0.5" fill-rule="evenodd" d="M14.9896 19.8736L12.1138 19.0921C11.5352 18.9349 11.1935 18.3383 11.3508 17.7596C11.4518 17.3879 11.7421 17.0975 12.1138 16.9965L14.9896 16.2151C15.5962 16.0502 16.0691 15.5746 16.2303 14.967L17.0052 12.0468C17.157 11.4749 17.7436 11.1343 18.3155 11.2861C18.6872 11.3847 18.9775 11.6751 19.0761 12.0468L19.851 14.967C20.0123 15.5746 20.4851 16.0502 21.0918 16.2151L23.9675 16.9965C24.5462 17.1538 24.8878 17.7504 24.7306 18.3291C24.6296 18.7008 24.3392 18.9911 23.9675 19.0921L21.0918 19.8736C20.4851 20.0384 20.0123 20.5141 19.851 21.1217L19.0761 24.0419C18.9244 24.6137 18.3378 24.9543 17.7659 24.8026C17.3942 24.7039 17.1039 24.4136 17.0052 24.0419L16.2303 21.1217C16.0691 20.5141 15.5962 20.0384 14.9896 19.8736Z"/>
+</svg>
diff --git a/Telegram/Resources/icons/chat/text_to_file.svg b/Telegram/Resources/icons/chat/text_to_file.svg
new file mode 100644
index 00000000000000..d3d7ce7039599c
--- /dev/null
+++ b/Telegram/Resources/icons/chat/text_to_file.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="96.5 111.3 766.5 766.5" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 229.278 428.274 C 220.345 431.087 209.724 433.028 201.037 428.414 C 195.269 425.35 191.59 419.715 189.754 413.573 C 183.55 392.827 189.646 312.841 194.598 289.706 C 197.361 276.798 201.636 264.234 208.088 252.692 C 225.944 220.748 254.345 196.434 289.828 186.42 C 299.548 183.676 309.688 182.14 319.754 181.423 C 366.51 178.095 414.437 180.111 461.345 180.132 C 499.997 180.149 540.285 177.606 578.657 181.934 C 589.925 183.204 601.183 185.766 611.125 191.369 C 638.232 206.647 660.549 233.285 682.155 255.355 L 741.115 315.299 L 790.708 365.561 C 856.391 432.25 853.313 440.991 854.144 532.569 L 854.982 618.399 C 855.281 646.04 857.577 702.741 854.521 727.102 C 852.435 744.448 846.915 761.205 838.282 776.393 C 820.298 808.656 790.121 832.354 754.514 842.176 C 724.089 850.54 664.593 848.635 631.504 848.632 L 502.763 848.626 L 395.022 848.66 C 368.985 848.68 338.582 849.327 312.926 846.33 C 294.671 844.264 277.017 838.552 261.012 829.532 C 228.881 811.132 205.527 780.551 196.236 744.708 C 190.977 725.111 181.752 660.54 192.22 640.91 C 194.552 636.536 200.443 631.193 204.584 628.088 C 212.69 627.794 223.61 625.977 229.827 632.364 C 238.468 641.24 238.784 653.684 239.449 665.298 C 241.05 693.25 237.429 726.072 251.724 751.22 C 263.068 771.178 283.96 788.616 306.011 795.036 C 326.159 800.066 359.183 798.753 380.622 798.749 L 460.193 798.696 L 703.391 798.695 C 736.68 798.43 755.087 795.322 779.818 770.591 C 807.116 743.293 806.834 720.038 807.012 684.161 C 807.237 638.481 802.094 586.261 804.093 541.122 C 797.284 541.268 784.894 540.995 778.473 540.182 L 670.807 540.171 C 620.731 540.215 563.716 547.86 526.38 508.874 C 515.394 497.402 505.295 482.717 501.211 466.939 C 495.154 439.227 496.977 401.501 496.999 372.596 L 497.103 265.614 C 497.25 253.886 497.577 242.161 498.083 230.443 C 460.209 229.51 422.322 229.222 384.438 229.578 C 335.986 229.564 309.732 221.795 269.362 254.551 C 217.116 296.943 257.721 389.29 229.559 427.897 L 229.278 428.274 z M 543.987 230.048 C 569.591 229.725 580.035 227.497 600.857 244.842 C 616.603 257.958 630.079 272.64 644.427 287.248 L 711.181 355.245 L 759.072 403.921 C 769.77 414.798 785.756 430.108 793.914 442.441 C 801.17 453.41 801.179 474.426 802.716 487.848 L 663.551 488.081 C 655.173 488.09 645.943 488.449 637.627 488.107 C 619.637 487.367 594.727 490.338 577.846 484.153 C 545.853 472.432 543.843 436.102 544.247 407.389 C 544.438 393.841 544.247 379.666 544.256 365.887 C 544.495 320.607 544.405 275.326 543.987 230.048 z" fill="#FFFFFF"></path>
+        <path d="M 306.755 391.204 C 311.745 389.305 333.398 408.89 337.28 412.89 C 364.174 440.939 392.794 467.428 419.422 495.698 C 442.291 519.978 433.144 542.942 411.651 563.866 C 381.068 593.638 352.265 625.515 320.324 653.743 C 313.888 659.431 296.743 655.829 288.97 654.425 C 287.039 649.138 280.827 633.452 282.505 628.63 C 289.515 608.489 314.352 590.824 328.353 575.581 C 338.311 564.74 345.544 555.412 356.226 547.597 L 356.28 545.853 C 344.978 549.112 335.336 551.079 323.481 551.267 C 274.259 551.846 224.991 551.501 175.755 551.624 C 155.295 551.676 133.425 553.912 116.627 541.311 C 114.956 537.351 114 533.126 113.802 528.833 C 113.091 514.333 117.1 501.472 133.314 500.562 C 154.052 499.399 174.698 499.879 195.467 499.925 C 239.08 500.336 282.696 500.334 326.309 499.918 C 332.541 499.822 343.551 500.1 347.833 495.685 C 347.436 491.434 313.367 461.839 307.219 455.232 C 291.043 437.85 275.937 429.066 286.23 402.426 C 291.881 397.453 299.873 394.302 306.755 391.204 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/dialogs/dialogs_chatlist_mention.svg b/Telegram/Resources/icons/dialogs/dialogs_chatlist_mention.svg
new file mode 100644
index 00000000000000..7eaf976ae69e7b
--- /dev/null
+++ b/Telegram/Resources/icons/dialogs/dialogs_chatlist_mention.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Filled / filled_chatlist_mention</title>
+    <g id="Filled-/-filled_chatlist_mention" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M36,7.94444444 C51.4946555,7.94444444 64.0555556,20.5053445 64.0555556,36 C64.0555556,45.4079588 60.5708092,50.852875 53.5366724,50.4132415 C50.1034854,50.1986673 47.6130345,48.761699 46.074269,46.3154879 C43.5446485,48.7868521 40.1096404,50.3348637 36.3135543,50.4158502 L36,50.4191919 C28.0365002,50.4191919 21.5808081,43.9634998 21.5808081,36 C21.5808081,28.0365002 28.0365002,21.5808081 36,21.5808081 C43.9634998,21.5808081 50.4191919,28.0365002 50.4191919,36 L50.4156549,36.3225752 C50.4221637,36.4530489 50.4193336,36.5855158 50.4077048,36.7192471 C49.9335852,42.1716224 51.0798543,44.1366551 53.917873,44.3140313 C56.580706,44.4804583 57.9444444,42.349617 57.9444444,36 C57.9444444,23.880418 48.119582,14.0555556 36,14.0555556 C23.880418,14.0555556 14.0555556,23.880418 14.0555556,36 C14.0555556,48.119582 23.880418,57.9444444 36,57.9444444 L46.4545455,57.9444444 C48.1420822,57.9444444 49.510101,59.3124633 49.510101,61 C49.510101,62.6875367 48.1420822,64.0555556 46.4545455,64.0555556 L36,64.0555556 C20.5053445,64.0555556 7.94444444,51.4946555 7.94444444,36 C7.94444444,20.5053445 20.5053445,7.94444444 36,7.94444444 Z M36,27.6919192 C31.4115737,27.6919192 27.6919192,31.4115737 27.6919192,36 C27.6919192,40.5884263 31.4115737,44.3080808 36,44.3080808 C40.5884263,44.3080808 44.3080808,40.5884263 44.3080808,36 C44.3080808,31.4115737 40.5884263,27.6919192 36,27.6919192 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/dialogs/dialogs_chatlist_poll.svg b/Telegram/Resources/icons/dialogs/dialogs_chatlist_poll.svg
new file mode 100644
index 00000000000000..95226d86f3a726
--- /dev/null
+++ b/Telegram/Resources/icons/dialogs/dialogs_chatlist_poll.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Filled / filled_chatlist_poll</title>
+    <g id="Filled-/-filled_chatlist_poll" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M16,27.6666667 C19.3137085,27.6666667 22,30.3529582 22,33.6666667 L22,55 C22,58.3137085 19.3137085,61 16,61 C12.6862915,61 10,58.3137085 10,55 L10,33.6666667 C10,30.4282697 12.5655749,27.7890949 15.7750617,27.6708051 L16,27.6666667 Z M36,11 C39.3137085,11 42,13.6862915 42,17 L42,55 C42,58.3137085 39.3137085,61 36,61 C32.6862915,61 30,58.3137085 30,55 L30,17 C30,13.6862915 32.6862915,11 36,11 Z M56,36 C59.3137085,36 62,38.6862915 62,42 L62,55 C62,58.3137085 59.3137085,61 56,61 C52.6862915,61 50,58.3137085 50,55 L50,42 C50,38.6862915 52.6862915,36 56,36 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/dialogs/dialogs_chatlist_reaction.svg b/Telegram/Resources/icons/dialogs/dialogs_chatlist_reaction.svg
new file mode 100644
index 00000000000000..901a7a9825dd59
--- /dev/null
+++ b/Telegram/Resources/icons/dialogs/dialogs_chatlist_reaction.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Filled / filled_chatlist_reaction</title>
+    <g id="Filled-/-filled_chatlist_reaction" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M39.7777796,60.0291132 C37.6505975,61.9950186 34.3758567,61.9950185 32.2486747,60.0006218 L31.9407931,59.7157078 C17.2464435,46.1823011 7.64613503,36.9178019 8.00999511,25.8631454 C8.17793054,21.0196104 10.6129942,16.375515 14.5594767,13.6403423 C21.5930174,8.75871019 30.1988776,13.0872447 35.2594851,18.4794853 C35.515351,18.7521185 36.4762456,18.7597927 36.7283013,18.4906892 C41.7874742,13.0893374 50.4004979,8.72813558 57.4389884,13.6403423 C61.3854708,16.375515 63.8205345,21.0196104 63.9884699,25.8631454 C64.3803192,36.9178019 54.7520216,46.1823011 40.0576719,59.7726906 L39.7777796,60.0291132 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/dialogs/dialogs_mute.png b/Telegram/Resources/icons/dialogs/dialogs_mute.png
new file mode 100644
index 00000000000000..3b37e1172dbf7a
Binary files /dev/null and b/Telegram/Resources/icons/dialogs/dialogs_mute.png differ
diff --git a/Telegram/Resources/icons/dialogs/dialogs_mute@2x.png b/Telegram/Resources/icons/dialogs/dialogs_mute@2x.png
new file mode 100644
index 00000000000000..96681eb66f571f
Binary files /dev/null and b/Telegram/Resources/icons/dialogs/dialogs_mute@2x.png differ
diff --git a/Telegram/Resources/icons/dialogs/dialogs_mute@3x.png b/Telegram/Resources/icons/dialogs/dialogs_mute@3x.png
new file mode 100644
index 00000000000000..a246b7e6a5c023
Binary files /dev/null and b/Telegram/Resources/icons/dialogs/dialogs_mute@3x.png differ
diff --git a/Telegram/Resources/icons/dialogs/dialogs_unread_media_dot.svg b/Telegram/Resources/icons/dialogs/dialogs_unread_media_dot.svg
new file mode 100644
index 00000000000000..d0da6ff5fc4420
--- /dev/null
+++ b/Telegram/Resources/icons/dialogs/dialogs_unread_media_dot.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="6px" height="6px" viewBox="0 0 6 6" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="3" cy="3" r="3" fill="#FFFFFF"/>
+</svg>
diff --git a/Telegram/Resources/icons/history_unread_poll_vote.svg b/Telegram/Resources/icons/history_unread_poll_vote.svg
new file mode 100644
index 00000000000000..ccc1f67190bfb2
--- /dev/null
+++ b/Telegram/Resources/icons/history_unread_poll_vote.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <rect x="11" y="11" width="18" height="18" rx="3.5" stroke="#FFFFFF" stroke-width="1.5" fill="none"/>
+        <g transform="translate(20,20) scale(0.19) translate(-36,-36)">
+            <path d="M16,27.6666667 C19.3137085,27.6666667 22,30.3529582 22,33.6666667 L22,55 C22,58.3137085 19.3137085,61 16,61 C12.6862915,61 10,58.3137085 10,55 L10,33.6666667 C10,30.4282697 12.5655749,27.7890949 15.7750617,27.6708051 L16,27.6666667 Z M36,11 C39.3137085,11 42,13.6862915 42,17 L42,55 C42,58.3137085 39.3137085,61 36,61 C32.6862915,61 30,58.3137085 30,55 L30,17 C30,13.6862915 32.6862915,11 36,11 Z M56,36 C59.3137085,36 62,38.6862915 62,42 L62,55 C62,58.3137085 59.3137085,61 56,61 C52.6862915,61 50,58.3137085 50,55 L50,42 C50,38.6862915 52.6862915,36 56,36 Z" fill="#FFFFFF"/>
+        </g>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/info/info_iv_mini.svg b/Telegram/Resources/icons/info/info_iv_mini.svg
new file mode 100644
index 00000000000000..89530ebdcf8963
--- /dev/null
+++ b/Telegram/Resources/icons/info/info_iv_mini.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="-29.406 151.938 1015.18 1015.18" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 681.49 238.5 C 688.644 238.228 698.144 238.411 700.312 246.982 C 705.155 266.121 706.46 291.051 702.367 310.395 C 697.621 326.84 676.818 331.53 668.6 345.449 C 656.82 365.403 659.626 383.752 645.214 402.765 C 633.25 418.55 620.051 435.809 610.041 452.717 C 603.542 463.695 601.169 480.533 592.705 491.252 C 583.025 504.078 568.174 510.614 561.32 525.929 C 552.186 546.341 592.151 588.784 605.893 601.159 C 615.384 609.706 634.202 618.934 644.263 627.575 C 655.754 637.444 663.187 648.609 675.803 657.639 C 691.081 668.574 715.992 674.152 722.508 693.522 C 728.788 712.19 733.439 745.591 725.257 764.511 C 720.654 775.157 701.808 783.849 692.34 790.697 C 684.545 796.336 678.531 800.452 671.216 807.257 C 664.567 813.444 655.306 823.829 648.411 828.884 C 636.538 837.587 620.134 844.374 607.919 851.916 C 597.197 858.537 585.891 873.728 575.221 881.665 C 557.283 895.346 536.237 903.788 518.313 917.394 C 511.466 922.591 505.979 927.797 499.804 933.7 C 495.985 936.801 490.612 943.433 486.689 945.809 C 463.073 960.112 444.838 974.06 425.927 994.068 C 419.08 1001.31 396.985 1008.69 387.418 1016.88 C 373.673 1028.65 360.538 1041.92 346.069 1052.69 C 334.225 1060.37 304.75 1076.26 291.692 1080.83 C 288.158 1080.68 285.573 1078.81 282.48 1077.04 C 270.856 1068.08 260.108 1052.45 255.419 1038.18 C 254.539 1035.5 258.24 1025.19 259.307 1021.79 C 265.905 1000.78 273.744 983.213 288.982 967.103 C 294.966 960.777 303.117 950.814 307.7 943.234 C 317.209 927.506 321.822 908.356 329.895 892.306 C 336.76 878.655 349.339 865.14 357.94 852.051 C 370.179 834.076 375.822 813.134 383.093 793.046 C 389.616 776 404.657 759.437 387.818 742.303 C 367.195 721.318 341.998 698.709 319.047 679.848 C 309.642 672.118 295.606 667.096 286.095 659.91 C 274.74 651.33 264.457 634.463 254.32 624.195 C 248.395 617.985 241.484 610.31 235.612 604.3 C 225.929 594.39 222.929 584.767 231.45 572.836 C 232.909 570.83 234.301 567.699 235.967 565.889 C 251.962 548.522 265.616 529.598 280.907 511.809 C 281.408 511.226 290.425 505.453 291.709 504.647 C 315.694 489.596 336.052 470.125 358.727 453.357 C 378.854 438.328 401.913 426.515 419.485 408.559 C 425.232 403.373 431.383 395.076 437.976 391.068 C 461.361 376.852 483.636 361.638 506.002 345.931 C 522.91 334.057 542.313 324.101 559.034 312.114 C 578.878 297.889 595.117 276.961 616.056 263.808 C 628.59 256.289 667.254 240.757 681.49 238.5 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/levels/level10_inner.svg b/Telegram/Resources/icons/levels/level10_inner.svg
new file mode 100644
index 00000000000000..8ce8b2c9b2000d
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level10_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level10_inner</title>
+    <g id="Badge-/-level10_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M23,15 L49,15 C53.418278,15 57,18.581722 57,23 L57,46.8429984 C57,48.7715399 55.8908719,50.5281562 54.1496679,51.357301 L37.2898007,59.3858092 C36.4738291,59.7743671 35.5261709,59.7743671 34.7101993,59.3858092 L17.8503321,51.357301 C16.1091281,50.5281562 15,48.7715399 15,46.8429984 L15,23 C15,18.581722 18.581722,15 23,15 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level1_inner.svg b/Telegram/Resources/icons/levels/level1_inner.svg
new file mode 100644
index 00000000000000..37959bcb5d8e07
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level1_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level1_inner</title>
+    <g id="Badge-/-level1_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M53,45 C54.6943359,39.9169922 55.1925159,32.4416725 54.49454,22.5740409 C54.2708931,19.4342396 51.6589867,17.0009114 48.5112305,17 L23.4887695,17 C20.3410133,17.0009114 17.7291069,19.4342396 17.50546,22.5740409 C16.8074841,32.4416725 17.3056641,39.9169922 19,45 C20.9999787,50.9999361 32.8055802,57.9438271 36.0181519,58.0000467 C39.2307237,58.0555136 50.70353,51.8894101 53,45 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level20_inner.svg b/Telegram/Resources/icons/levels/level20_inner.svg
new file mode 100644
index 00000000000000..055e99e5c3d614
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level20_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level20_inner</title>
+    <g id="Badge-/-level20_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M17.5067188,13.1565216 L35.4932812,17.8672879 C35.8254913,17.9542953 36.1745087,17.9542953 36.5067188,17.8672879 L54.4932812,13.1565216 C55.5618111,12.8766685 56.6548914,13.5160174 56.9347444,14.5845472 C56.9780693,14.7499693 57,14.9202646 57,15.091266 L57,50 C57,53.8659932 53.8659932,57 50,57 L22,57 C18.1340068,57 15,53.8659932 15,50 L15,15.091266 C15,13.9866965 15.8954305,13.091266 17,13.091266 C17.1710014,13.091266 17.3412968,13.1131968 17.5067188,13.1565216 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level2_inner.svg b/Telegram/Resources/icons/levels/level2_inner.svg
new file mode 100644
index 00000000000000..2cd67761cc6bc7
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level2_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level2_inner</title>
+    <g id="Badge-/-level2_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M28,15 L44,15 C51.1797017,15 57,20.8202983 57,28 L57,44 C57,51.1797017 51.1797017,57 44,57 L28,57 C20.8202983,57 15,51.1797017 15,44 L15,28 C15,20.8202983 20.8202983,15 28,15 Z" id="Rectangle" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level30_inner.svg b/Telegram/Resources/icons/levels/level30_inner.svg
new file mode 100644
index 00000000000000..b74a2e6efbaf16
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level30_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level30_inner</title>
+    <g id="Badge-/-level30_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M17.5067188,13.1565216 L35.4932812,17.8672879 C35.8254913,17.9542953 36.1745087,17.9542953 36.5067188,17.8672879 L54.4932812,13.1565216 C55.5618111,12.8766685 56.6548914,13.5160174 56.9347444,14.5845472 C56.9780693,14.7499693 57,14.9202646 57,15.091266 L57,47.2740807 C57,49.2380496 55.850227,51.0201354 54.0608393,51.8296203 L37.2365036,59.4406293 C36.4505105,59.7961976 35.5494895,59.7961976 34.7634964,59.4406293 L17.9391607,51.8296203 C16.149773,51.0201354 15,49.2380496 15,47.2740807 L15,15.091266 C15,13.9866965 15.8954305,13.091266 17,13.091266 C17.1710014,13.091266 17.3412968,13.1131968 17.5067188,13.1565216 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level3_inner.svg b/Telegram/Resources/icons/levels/level3_inner.svg
new file mode 100644
index 00000000000000..3bc0ef35050d3c
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level3_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level3_inner</title>
+    <g id="Badge-/-level3_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M35.8544323,16.5 C42.5603579,16.5 48.9772339,17.3142695 55.1127909,18.9403855 C57.8720367,19.6721748 59.5984053,22.4098874 59.0695564,25.2151096 L58.9161688,25.9952446 C57.6492744,32.2345248 55.3583898,38.2325914 52.0339947,44.0033008 C48.4623738,50.2031617 44.2319724,54.8983246 39.3449322,58.1412366 L38.808,58.49 L38.6366496,58.5935691 C37.0148548,59.5241021 35.0268922,59.5572143 33.3750071,58.6812087 L33.244,58.609 L33.1538672,58.5548802 C27.4610226,55.1837021 22.8566119,50.5438551 19.3062949,44.5841668 L18.9660053,44.0033008 C15.6094458,38.1767582 13.4677002,31.8512809 12.5350759,24.997545 C12.1766452,22.3675806 13.7646861,19.874921 16.2717218,19.0736995 L16.531,18.998 L17.3695077,18.774139 C22.9281007,17.3348182 28.7645985,16.5777965 34.8855941,16.5056926 L35.8544323,16.5 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level40_inner.svg b/Telegram/Resources/icons/levels/level40_inner.svg
new file mode 100644
index 00000000000000..f7fef2c1678081
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level40_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level40_inner</title>
+    <g id="Badge-/-level40_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13.8209245,17.0037365 L23.6412021,18.7573575 C24.5036156,18.9113599 25.3902576,18.6806984 26.0682874,18.1259467 L34.7335244,11.0362073 C35.4702562,10.4334268 36.5297438,10.4334268 37.2664756,11.0362073 L45.9317126,18.1259467 C46.6097424,18.6806984 47.4963844,18.9113599 48.3587979,18.7573575 L58.1790755,17.0037365 C59.2664441,16.8095635 60.3053389,17.5336417 60.4995119,18.6210104 C60.5408831,18.8526891 60.541039,19.0898514 60.4999724,19.3215843 L55.1703343,49.3959706 C54.4933325,53.2161951 51.17282,56 47.2930717,56 L24.7069283,56 C20.82718,56 17.5066675,53.2161951 16.8296657,49.3959706 L11.5000276,19.3215843 C11.3072843,18.2339613 12.0327276,17.1960193 13.1203506,17.003276 C13.3520835,16.9622094 13.5892458,16.9623653 13.8209245,17.0037365 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level4_inner.svg b/Telegram/Resources/icons/levels/level4_inner.svg
new file mode 100644
index 00000000000000..b23971ce553bd9
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level4_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level4_inner</title>
+    <g id="Badge-/-level4_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M44.3705856,16.4672101 L55.5327899,27.6294144 C60.1557367,32.2523612 60.1557367,39.7476388 55.5327899,44.3705856 L44.3705856,55.5327899 C39.7476388,60.1557367 32.2523612,60.1557367 27.6294144,55.5327899 L16.4672101,44.3705856 C11.8442633,39.7476388 11.8442633,32.2523612 16.4672101,27.6294144 L27.6294144,16.4672101 C32.2523612,11.8442633 39.7476388,11.8442633 44.3705856,16.4672101 Z" id="Polygon" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level50_inner.svg b/Telegram/Resources/icons/levels/level50_inner.svg
new file mode 100644
index 00000000000000..23aa9e3107cb30
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level50_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level50_inner</title>
+    <g id="Badge-/-level50_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13.8457992,17.0081784 L23.6412021,18.7573575 C24.5036156,18.9113599 25.3902576,18.6806984 26.0682874,18.1259467 L34.7335244,11.0362073 C35.4702562,10.4334268 36.5297438,10.4334268 37.2664756,11.0362073 L45.9317126,18.1259467 C46.6097424,18.6806984 47.4963844,18.9113599 48.3587979,18.7573575 L58.1542008,17.0081784 C59.2415694,16.8140055 60.2804642,17.5380836 60.4746372,18.6254523 C60.5169804,18.862574 60.516141,19.1053947 60.4721595,19.342218 L55.2572125,47.4227021 C54.7824054,49.9793556 53.0945991,52.1457247 50.731704,53.2313793 L37.6700007,59.2327024 C36.6099358,59.7197592 35.3900642,59.7197592 34.3299993,59.2327024 L21.268296,53.2313793 C18.9054009,52.1457247 17.2175946,49.9793556 16.7427875,47.4227021 L11.5278405,19.342218 C11.3261547,18.2562177 12.0430333,17.2123419 13.1290336,17.0106561 C13.3658569,16.9666746 13.6086775,16.9658353 13.8457992,17.0081784 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level5_inner.svg b/Telegram/Resources/icons/levels/level5_inner.svg
new file mode 100644
index 00000000000000..e28cd650ab1750
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level5_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level5_inner</title>
+    <g id="Badge-/-level5_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M24.6347159,52.197233 L15.086894,45.3306104 C13.3626301,44.0905507 12.6070688,41.9044024 13.1995002,39.8696074 L16.4885503,28.5785206 L20.056184,18.2789734 C20.736028,16.3172234 22.5589494,14.9756983 24.6408724,14.9050076 L35.519949,14.536208 L46.4041369,14.5 C48.4875477,14.4932153 50.3596774,15.7663386 51.1123731,17.7018167 L55.0199245,27.7496763 C55.0516847,27.8313442 55.081291,27.9138273 55.1087132,27.9970407 L58.7486546,39.0425771 C59.4120036,41.0555339 58.7334828,43.2666211 57.0537084,44.5658775 L47.7086588,51.7944553 L39.3643082,58.4096688 C37.5845851,59.8205932 35.0761178,59.866608 33.245468,58.5219115 L24.6347159,52.197233 Z" id="Star-Flat" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level60_inner.svg b/Telegram/Resources/icons/levels/level60_inner.svg
new file mode 100644
index 00000000000000..b006ec32809a0c
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level60_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level60_inner</title>
+    <g id="Badge-/-level60_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M25.1630277,52.850407 L17.8273486,50.8900353 C15.0747,50.1544232 13.4412291,47.3453418 14.1759196,44.6106697 L16.1338353,37.322897 C16.3667018,36.4561188 16.3667018,35.5438812 16.1338353,34.677103 L14.1759196,27.3893303 C13.4412291,24.6546582 15.0747,21.8455768 17.8273486,21.1099647 L25.1630277,19.149593 C26.0355037,18.9164343 26.8311982,18.4603155 27.4708076,17.826696 L32.848571,12.499295 C34.8665291,10.500235 38.1334709,10.500235 40.151429,12.499295 L45.5291924,17.826696 C46.1688018,18.4603155 46.9644963,18.9164343 47.8369723,19.149593 L55.1726514,21.1099647 C57.9253,21.8455768 59.5587709,24.6546582 58.8240804,27.3893303 L56.8661647,34.677103 C56.6332982,35.5438812 56.6332982,36.4561188 56.8661647,37.322897 L58.8240804,44.6106697 C59.5587709,47.3453418 57.9253,50.1544232 55.1726514,50.8900353 L47.8369723,52.850407 C46.9644963,53.0835657 46.1688018,53.5396845 45.5291924,54.173304 L40.151429,59.500705 C38.1334709,61.499765 34.8665291,61.499765 32.848571,59.500705 L27.4708076,54.173304 C26.8311982,53.5396845 26.0355037,53.0835657 25.1630277,52.850407 Z" id="Star-Flat" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level6_inner.svg b/Telegram/Resources/icons/levels/level6_inner.svg
new file mode 100644
index 00000000000000..1b8a68d0dab68a
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level6_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level6_inner</title>
+    <g id="Badge-/-level6_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M56.5,27.2077494 L56.5,44.7922506 C56.5,46.727022 55.4750178,48.5148244 53.8111544,49.4822101 L38.6888456,58.2744607 C37.0249822,59.2418464 34.9750178,59.2418464 33.3111544,58.2744607 L18.1888456,49.4822101 C16.5249822,48.5148244 15.5,46.727022 15.5,44.7922506 L15.5,27.2077494 C15.5,25.272978 16.5249822,23.4851756 18.1888456,22.5177899 L33.3111544,13.7255393 C34.9750178,12.7581536 37.0249822,12.7581536 38.6888456,13.7255393 L53.8111544,22.5177899 C55.4750178,23.4851756 56.5,25.272978 56.5,27.2077494 Z" id="Polygon-Flat" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level70_inner.svg b/Telegram/Resources/icons/levels/level70_inner.svg
new file mode 100644
index 00000000000000..d6bc1b8b4ad31f
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level70_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level70_inner</title>
+    <g id="Badge-/-level70_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M25.6231529,53.6849537 L20.2456512,53.1119864 C17.3639984,52.8049492 15.263688,50.1918606 15.5389909,47.256223 L16.0527382,41.7779796 C16.1648264,40.5827489 15.8804506,39.3837383 15.2449668,38.3721824 L12.332278,33.7357975 C10.7714495,31.2512883 11.4691887,27.9507327 13.8958667,26.3394648 L18.424332,23.3326503 C19.4123422,22.6766303 20.1560647,21.7027674 20.5368804,20.5663865 L22.2823186,15.3578763 C23.2176501,12.5667813 26.188027,11.0641444 28.9387422,11.9905637 L34.0718987,13.7193707 C35.1918391,14.0965579 36.4036217,14.0811813 37.5139749,13.6756934 L42.6031895,11.8171724 C45.3303573,10.821243 48.3366176,12.248041 49.3400252,15.0145349 L51.2125014,20.1771366 C51.621034,21.3035012 52.3883797,22.2581898 53.3921518,22.8889356 L57.9928604,25.779908 C60.4582516,27.3290994 61.2366199,30.6109243 59.7371336,33.1342664 L56.9389167,37.8431184 C56.3284081,38.870485 56.07349,40.0763388 56.2148201,41.2683538 L56.8625953,46.7318584 C57.20972,49.6595979 55.1740691,52.3251686 52.3008327,52.7052309 L46.9390371,53.4144716 C45.7692127,53.5692121 44.6839892,54.1181986 43.8564529,54.9738712 L40.0635069,58.8957776 C38.030973,60.9974176 34.7141896,61.0395051 32.6308086,58.9900928 L28.7429758,55.1656495 C27.8947373,54.3312412 26.7964039,53.8099624 25.6231529,53.6849537 Z" id="Star-Flat" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level7_inner.svg b/Telegram/Resources/icons/levels/level7_inner.svg
new file mode 100644
index 00000000000000..d0a0c79299108a
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level7_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level7_inner</title>
+    <g id="Badge-/-level7_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M47.5119469,15.9725146 L56.9485165,28.1544765 C57.8703305,29.3444749 58.2101938,30.8974518 57.8718989,32.3737956 L54.4087892,47.487062 C54.0704943,48.9634057 53.0908608,50.2024337 51.7472,50.8534058 L37.9922031,57.5173789 C36.6485423,58.1683511 35.087096,58.1604167 33.7498732,57.4958219 L20.0607825,50.6923941 C18.7235597,50.0277993 17.7561016,48.7788774 17.4322729,47.2991691 L14.1172527,32.1514602 C13.793424,30.6717519 14.1484698,29.1223062 15.0818847,27.9417349 L24.637213,15.8562787 C25.570628,14.6757075 26.9808209,13.9925021 28.468599,14 L43.6989186,14.0774536 C45.1866968,14.0850136 46.5901329,14.7825162 47.5119469,15.9725146 Z" id="Polygon-Flat" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level80_inner.svg b/Telegram/Resources/icons/levels/level80_inner.svg
new file mode 100644
index 00000000000000..a469b74988cee9
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level80_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level80_inner</title>
+    <g id="Badge-/-level80_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M25.4075318,55.0983015 L20.6181753,54.4891523 C18.1878179,54.1800396 16.3367069,52.1599065 16.2405902,49.7118564 L16.0511788,44.887634 C16.0102196,43.84442 15.6446438,42.8400089 15.0054554,42.0145324 L12.0496025,38.1972124 C10.5496559,36.2601145 10.6691726,33.5227316 12.3322407,31.723734 L15.609547,28.1785595 C16.3182481,27.4119333 16.769973,26.4432062 16.9016985,25.4075318 L17.5108477,20.6181753 C17.8199604,18.1878179 19.8400935,16.3367069 22.2881436,16.2405902 L27.112366,16.0511788 C28.15558,16.0102196 29.1599911,15.6446438 29.9854676,15.0054554 L33.8027876,12.0496025 C35.7398855,10.5496559 38.4772684,10.6691726 40.276266,12.3322407 L43.8214405,15.609547 C44.5880667,16.3182481 45.5567938,16.769973 46.5924682,16.9016985 L51.3818247,17.5108477 C53.8121821,17.8199604 55.6632931,19.8400935 55.7594098,22.2881436 L55.9488212,27.112366 C55.9897804,28.15558 56.3553562,29.1599911 56.9945446,29.9854676 L59.9503975,33.8027876 C61.4503441,35.7398855 61.3308274,38.4772684 59.6677593,40.276266 L56.390453,43.8214405 C55.6817519,44.5880667 55.230027,45.5567938 55.0983015,46.5924682 L54.4891523,51.3818247 C54.1800396,53.8121821 52.1599065,55.6632931 49.7118564,55.7594098 L44.887634,55.9488212 C43.84442,55.9897804 42.8400089,56.3553562 42.0145324,56.9945446 L38.1972124,59.9503975 C36.2601145,61.4503441 33.5227316,61.3308274 31.723734,59.6677593 L28.1785595,56.390453 C27.4119333,55.6817519 26.4432062,55.230027 25.4075318,55.0983015 Z" id="Star" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level8_inner.svg b/Telegram/Resources/icons/levels/level8_inner.svg
new file mode 100644
index 00000000000000..f4a0d3b7d11b0e
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level8_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level8_inner</title>
+    <g id="Badge-/-level8_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M27.9852814,15 L44.0147186,15 C45.6060176,15 47.132141,15.632141 48.2573593,16.7573593 L55.2426407,23.7426407 C56.367859,24.867859 57,26.3939824 57,27.9852814 L57,44.0147186 C57,45.6060176 56.367859,47.132141 55.2426407,48.2573593 L48.2573593,55.2426407 C47.132141,56.367859 45.6060176,57 44.0147186,57 L27.9852814,57 C26.3939824,57 24.867859,56.367859 23.7426407,55.2426407 L16.7573593,48.2573593 C15.632141,47.132141 15,45.6060176 15,44.0147186 L15,27.9852814 C15,26.3939824 15.632141,24.867859 16.7573593,23.7426407 L23.7426407,16.7573593 C24.867859,15.632141 26.3939824,15 27.9852814,15 Z" id="Rectangle" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level90_inner.svg b/Telegram/Resources/icons/levels/level90_inner.svg
new file mode 100644
index 00000000000000..d25a731d93dd11
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level90_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level90_inner</title>
+    <g id="Badge-/-level90_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15.8733536,45.5876663 L13.5374788,26.4767308 C13.2739231,24.3204523 14.4193524,22.2383675 16.3756386,21.3177141 L34.3082495,12.8783965 C35.3803169,12.3738678 36.6196831,12.3738678 37.6917505,12.8783965 L55.6243614,21.3177141 C57.5806476,22.2383675 58.7260769,24.3204523 58.4625212,26.4767308 L56.1266464,45.5876663 C55.9615284,46.9385772 55.2580965,48.1641245 54.1775745,48.9834175 L39.003776,60.4887707 C37.2255672,61.8370764 34.7744328,61.8370764 32.996224,60.4887707 L17.8224255,48.9834175 C16.7419035,48.1641245 16.0384716,46.9385772 15.8733536,45.5876663 Z" id="Diamond-Flat" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level9_inner.svg b/Telegram/Resources/icons/levels/level9_inner.svg
new file mode 100644
index 00000000000000..27fe8c25a2b115
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level9_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level9_inner</title>
+    <g id="Badge-/-level9_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <circle id="Oval" fill="#FFFFFF" cx="36" cy="36" r="21"></circle>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level_warning.svg b/Telegram/Resources/icons/levels/level_warning.svg
new file mode 100644
index 00000000000000..cba1db00765c86
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level_warning.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Filled / Folder / filled_warning</title>
+    <g id="Icon-/-Filled-/-Folder-/-filled_warning" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M4.88979533,20 L19.1102047,20 C20.5643501,20 21.4708304,18.4289284 20.7437577,17.1777157 L13.633553,4.93840953 C12.9064803,3.68719682 11.0935197,3.68719682 10.366447,4.93840953 L3.25624234,17.1777157 C2.52916961,18.4289284 3.43564989,20 4.88979533,20 Z M12,9.51724138 C12.4659903,9.51724138 12.84375,9.89500112 12.84375,10.3609914 L12.84375,13.3631466 C12.84375,13.8291368 12.4659903,14.2068966 12,14.2068966 C11.5340097,14.2068966 11.15625,13.8291368 11.15625,13.3631466 L11.15625,10.3609914 C11.15625,9.89500112 11.5340097,9.51724138 12,9.51724138 Z M12.018319,17.1862069 L11.981681,17.1862069 C11.463676,17.1862069 11.04375,16.7662809 11.04375,16.2482759 C11.04375,15.7302709 11.463676,15.3103448 11.981681,15.3103448 L12.018319,15.3103448 C12.536324,15.3103448 12.95625,15.7302709 12.95625,16.2482759 C12.95625,16.7662809 12.536324,17.1862069 12.018319,17.1862069 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/limits/filled_rating_crown.svg b/Telegram/Resources/icons/limits/filled_rating_crown.svg
new file mode 100644
index 00000000000000..e7cc2e124f588f
--- /dev/null
+++ b/Telegram/Resources/icons/limits/filled_rating_crown.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Filled / Folder / filled_rating_crown</title>
+    <g id="Icon-/-Filled-/-Folder-/-filled_rating_crown" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M12.006194,4 C12.2804747,4 12.5305167,4.06540388 12.7563199,4.19621163 C12.9821231,4.32701939 13.1625206,4.50276893 13.2975123,4.72346025 C13.4325041,4.94415157 13.5,5.18550018 13.5,5.44750606 C13.5,5.71705917 13.4325041,5.96227898 13.2975123,6.18316549 C13.1625206,6.404052 12.9821231,6.5799154 12.7563199,6.71075569 L15.4435899,11.5643277 C15.5815617,11.7639089 15.7563694,11.7899721 15.968013,11.6425174 L18.1781768,9.33989673 C18.0593923,9.13003568 18,8.89851056 18,8.64532138 C18,8.38325043 18.0675127,8.14188556 18.202538,7.92122677 C18.3375634,7.70056798 18.5179776,7.52481844 18.7437808,7.39397816 C18.969584,7.26313787 19.2198274,7.19771773 19.494511,7.19771773 C19.7726861,7.19771773 20.0256488,7.26313787 20.2533991,7.39397816 C20.4811495,7.52481844 20.6625206,7.69962458 20.7975123,7.91839656 C20.9325041,8.13716855 21,8.37947682 21,8.64532138 C21,8.91526486 20.9315305,9.16058227 20.7945916,9.38127359 C20.6576527,9.60196491 20.4753248,9.77771445 20.247608,9.90852221 C20.0847544,10.0020705 19.9099761,10.0621678 19.7232729,10.0888143 L18.6881679,14.8280591 L18.18147,17.2645439 C18.0360821,17.8406994 17.5858498,18.2705453 17.2433245,18.5609529 C16.9007991,18.8513606 16.024907,19 15.4030968,19 L8.60301533,19 C7.98112362,19 7.07922209,18.853651 6.73645226,18.5609529 C6.39368244,18.2682549 5.96970407,17.8361186 5.82537564,17.2645439 L5.33200224,14.8280591 L4.28780473,10.091804 C4.09296054,10.0668449 3.91161924,10.005751 3.74378084,9.90852221 C3.51797764,9.77771445 3.33756337,9.60196491 3.20253802,9.38127359 C3.06751267,9.16058227 3,8.91526486 3,8.64532138 C3,8.38325043 3.06751267,8.14188556 3.20253802,7.92122677 C3.33756337,7.70056798 3.51797764,7.52481844 3.74378084,7.39397816 C3.96958405,7.26313787 4.21982744,7.19771773 4.49451103,7.19771773 C4.77268607,7.19771773 5.02564877,7.26313787 5.25339913,7.39397816 C5.48114949,7.52481844 5.66252056,7.69962458 5.79751234,7.91839656 C5.93250411,8.13716855 6,8.37947682 6,8.64532138 C6,8.85527742 5.9585802,9.05033621 5.8757406,9.23049773 L5.8356,9.31024634 L8.05741354,11.6413327 C8.17558193,11.7218918 8.27307085,11.7527925 8.3498803,11.7340349 C8.42668976,11.7152773 8.49488107,11.6628546 8.55445424,11.576767 L11.2500459,6.70934707 C11.0234694,6.57865415 10.8419403,6.40326029 10.7054588,6.18316549 C10.5684863,5.96227898 10.5,5.71705917 10.5,5.44750606 C10.5,5.18172656 10.5675127,4.93943456 10.702538,4.72063004 C10.8375634,4.50182552 11.0189344,4.32701939 11.2466512,4.19621163 C11.474368,4.06540388 11.7275489,4 12.006194,4 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/limits/filled_understood.svg b/Telegram/Resources/icons/limits/filled_understood.svg
new file mode 100644
index 00000000000000..337b43cc71812b
--- /dev/null
+++ b/Telegram/Resources/icons/limits/filled_understood.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Filled / Folder / filled_understood</title>
+    <g id="Icon-/-Filled-/-Folder-/-filled_understood" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M12.8474094,2.35452236 C13.885383,1.47475174 14.8173541,2.39162557 15.6118925,3.37253311 L15.7012514,3.4837597 C16.5164257,4.50413739 16.896938,5.20519347 17.573079,6.45345067 C18.2023878,7.61607163 19,9.78891004 19,11.0676479 L18.9982623,11.4602681 C18.9876271,12.5429001 18.9217408,13.3886119 18.6297323,14.4132675 L18.4373147,15.0832437 C17.6686959,17.7193108 17.0159257,19.2763685 14.5216634,19.7807735 C13.10206,20.068163 10.6477559,20.1900858 9.65842399,19.3946847 C7.99649075,18.0581246 7.24548521,16.7868457 6.69332563,15.7108913 L6.48407363,15.2966137 C6.20747049,14.7436067 5.49035123,13.0903916 6.59969082,12.2935391 C7.07533115,11.9524455 7.88026093,12.0496935 8.21540442,12.3820783 C9.4579233,13.6143694 9.58232154,15.2464067 11.9078369,15.2464067 C13.3786631,15.2464067 13.9391869,14.2869904 13.9391869,12.58878 C13.9391869,11.3521345 12.1390712,10.1619357 9.97161486,11.0502304 C8.24621513,12.1140246 7.17909072,11.547078 6.86322591,10.7478144 L6.82781627,10.6508891 L6.79127892,10.5445502 C6.5448802,9.79724635 6.61229951,9.16312262 10.1911412,7.82363067 C10.6137438,7.6657143 11.3830789,7.698766 12.0161927,7.78792773 C12.8897042,8.04621996 13.6148836,8.35641256 14.1913276,8.71620571 C14.929645,9.17703372 15.7391454,9.82868756 16.6173642,10.6711738 C16.8017985,10.848104 17.0950516,10.8396614 17.2723632,10.6523169 C17.4496747,10.4649723 17.4439006,10.1696692 17.2594662,9.99273903 C16.7803672,9.5331334 16.3184045,9.12578598 15.8732309,8.77069768 L15.8624136,8.73672043 C15.3582916,7.35121785 14.8646161,6.25548747 14.3777651,5.44628421 C13.9445436,4.72621943 13.3206019,3.99276536 12.5068246,3.24305992 C12.4746432,2.90001775 12.5672164,2.59132364 12.8474094,2.35452236 Z M10.9668008,4.0469269 L11.0518595,3.98215031 C11.2745376,3.81947674 11.4718477,3.74284792 11.8308451,3.8850515 C12.6071746,4.59396408 13.1906226,5.27558261 13.5826599,5.9271944 C13.8835044,6.42723311 14.1925809,7.05721299 14.5092459,7.81609175 C13.7940229,7.39877614 12.9130339,7.05268239 11.8658275,6.77510676 L11.6720359,6.53222118 C11.6390059,6.49065589 11.6057339,6.44860798 11.5724054,6.40616676 L11.3960913,6.1777103 C10.8136406,5.40671311 10.3189783,4.5550951 10.9668008,4.0469269 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/limits/mini_gift_lock.svg b/Telegram/Resources/icons/limits/mini_gift_lock.svg
new file mode 100644
index 00000000000000..2887a84d4c2a07
--- /dev/null
+++ b/Telegram/Resources/icons/limits/mini_gift_lock.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Mini / mini_gift_lock</title>
+    <g id="Mini-/-mini_gift_lock" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M34.6666667,26.3333333 C40.1895142,26.3333333 44.6666667,30.8104858 44.6666667,36.3333333 C44.6666667,41.8561808 40.1895142,46.3333333 34.6666667,46.3333333 C29.1438192,46.3333333 24.6666667,41.8561808 24.6666667,36.3333333 C24.6666667,30.8104858 29.1438192,26.3333333 34.6666667,26.3333333 Z M22,3.06666667 C27.8542183,3.06666667 32.6,7.81244832 32.6,13.6666667 L32.5999548,19.4672746 C34.7232323,19.9235567 36.4292218,21.5034006 37.0650949,23.5539779 C36.287246,23.4090943 35.4858038,23.3333333 34.6666667,23.3333333 C27.4869649,23.3333333 21.6666667,29.1536316 21.6666667,36.3333333 C21.6666667,38.3649522 22.1326999,40.2877232 22.9636948,42.0005746 L12.6666667,42 C9.35295817,42 6.66666667,39.3137085 6.66666667,36 L6.66666667,25.3333333 C6.66666667,22.454169 8.69461762,20.048658 11.4000452,19.4672746 L11.4,13.6666667 C11.4,7.81244832 16.1457817,3.06666667 22,3.06666667 Z M34.6666667,29.3061633 C33.7052821,29.3061633 32.9259259,30.0855195 32.9259259,31.0469041 L32.9259259,36.9308449 C32.9259259,37.7182476 33.2996271,38.4589206 33.9329602,38.9267797 L37.3333333,41.3922119 C38.1066056,41.9634476 39.1965447,41.7996646 39.7677804,41.0263923 L39.8381314,40.9238035 C40.323622,40.1593232 40.1416125,39.1383445 39.4019608,38.5919452 L36.4074074,36.4264726 L36.4074074,31.0469041 C36.4074074,30.0855195 35.6280512,29.3061633 34.6666667,29.3061633 Z M22,7.6 C18.6494725,7.6 15.9333333,10.3161392 15.9333333,13.6666667 L15.9326667,19.3326667 L28.0666667,19.3326667 L28.0666667,13.6666667 C28.0666667,10.3161392 25.3505275,7.6 22,7.6 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/local_storage/documents.svg b/Telegram/Resources/icons/local_storage/documents.svg
new file mode 100644
index 00000000000000..a9e90e536d6d17
--- /dev/null
+++ b/Telegram/Resources/icons/local_storage/documents.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 72 72" xmlns="http://www.w3.org/2000/svg"><path d="M43.15125,14.3808511 C42.24875,13.4914894 41.0375,13 39.77875,13 L24.7,13 C21.1375,13 18,16.106383 18,19.6170213 L18,50.3829787 C18,53.893617 21.11375,57 24.67625,57 L49.3,57 C52.8625,57 56,53.893617 56,50.3829787 L56,28.9851064 C56,27.7446809 55.50125,26.5510638 54.59875,25.6851064 L43.15125,14.3808511 Z M39.375,27.0425532 L39.375,16.5106383 L52.4375,29.3829787 L41.75,29.3829787 C40.44375,29.3829787 39.375,28.3297872 39.375,27.0425532 Z" fill="#FFFFFF" fill-rule="nonzero"/></svg>
diff --git a/Telegram/Resources/icons/local_storage/music.svg b/Telegram/Resources/icons/local_storage/music.svg
new file mode 100644
index 00000000000000..2909f5a288b310
--- /dev/null
+++ b/Telegram/Resources/icons/local_storage/music.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 72 72" xmlns="http://www.w3.org/2000/svg"><path d="M36,10 C50.352,10 62,21.648 62,36 C62,50.352 50.352,62 36,62 C21.648,62 10,50.352 10,36 C10,21.648 21.648,10 36,10 Z M33.1111111,23.950754 C31.5156218,23.950754 30.2222222,25.2441536 30.2222222,26.8396429 L30.2222222,45.6296296 C30.2222222,46.2546991 30.4249583,46.8629074 30.8,47.362963 C31.7572936,48.6393544 33.568053,48.8980343 34.8444444,47.9407407 L46.5881862,39.1329344 C46.7600033,39.0040716 46.9169145,38.8564504 47.0560109,38.6928077 C48.089327,37.4771416 47.9415032,35.6539814 46.7258372,34.6206653 L34.9820954,24.6384848 C34.4597827,24.194519 33.7966155,23.950754 33.1111111,23.950754 Z" fill="#FFFFFF" fill-rule="nonzero"/></svg>
diff --git a/Telegram/Resources/icons/local_storage/photos.svg b/Telegram/Resources/icons/local_storage/photos.svg
new file mode 100644
index 00000000000000..a23f8afb3bf25c
--- /dev/null
+++ b/Telegram/Resources/icons/local_storage/photos.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 72 72" xmlns="http://www.w3.org/2000/svg"><path d="M48,12 C54.627417,12 60,17.372583 60,24 L60,48 C60,54.627417 54.627417,60 48,60 L24,60 C17.372583,60 12,54.627417 12,48 L12,24 C12,17.372583 17.372583,12 24,12 L48,12 Z M44.3651844,34.6306685 C43.8183724,33.9010116 42.7247485,33.9010116 42.1779366,34.6036442 L33.7023513,45.3863509 L27.9608258,38.549196 C27.3866733,37.8735878 26.3477306,37.9006121 25.8282592,38.6032446 L19.9804504,47.2510295 C19.2695949,48.1428323 19.8984286,50.4 21.0467337,50.4 L51.9081103,50.4 C52.9904208,50.4 53.639443,48.3210078 53.0676996,47.374937 L44.3651844,34.6306685 Z" fill="#FFFFFF"/></svg>
diff --git a/Telegram/Resources/icons/local_storage/stickers.svg b/Telegram/Resources/icons/local_storage/stickers.svg
new file mode 100644
index 00000000000000..a72cfb16f94c30
--- /dev/null
+++ b/Telegram/Resources/icons/local_storage/stickers.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 72 72" xmlns="http://www.w3.org/2000/svg"><path d="M60,35.5 L59.9953966,35.670698 C59.9067791,37.309531 58.5498341,38.6111111 56.8888889,38.6111111 L50.6666667,38.6111111 L50.3912615,38.6142092 C45.9287855,38.7147025 42.0676082,41.2512307 40.0852923,44.9462311 C39.7167534,44.8455073 39.3161253,44.8387068 38.9195771,44.9463572 C37.9769648,45.202247 36.9982344,45.3333333 36,45.3333333 C33.4531941,45.3333333 29.5907927,43.2780139 28.1265456,41.3638425 L27.9058916,41.062472 C27.1856257,40.1544843 25.8744537,39.9480152 24.9057896,40.6151336 C23.8950097,41.3112571 23.6399302,42.6949756 24.3360537,43.7057556 C26.5046744,46.8546196 31.8881746,49.7777778 36,49.7777778 C36.9171651,49.7777778 37.8247038,49.6981543 38.7149707,49.541295 C38.6826363,49.8921863 38.6666667,50.2497837 38.6666667,50.6111111 L38.6666667,56.8888889 L38.6620632,57.0595868 C38.5734457,58.6984199 37.2165008,60 35.5555556,60 L24.4137931,60 C17.5578445,60 12,54.4421555 12,47.5862069 L12,24.4137931 C12,17.5578445 17.5578445,12 24.4137931,12 L47.5862069,12 C54.4421555,12 60,17.5578445 60,24.4137931 L60,35.5 Z M44.4444444,28 C42.7262252,28 41.3333333,29.790861 41.3333333,32 C41.3333333,34.209139 42.7262252,36 44.4444444,36 C46.1626637,36 47.5555556,34.209139 47.5555556,32 C47.5555556,29.790861 46.1626637,28 44.4444444,28 Z M27.5555556,28 C25.8373363,28 24.4444444,29.790861 24.4444444,32 C24.4444444,34.209139 25.8373363,36 27.5555556,36 C29.2737748,36 30.6666667,34.209139 30.6666667,32 C30.6666667,29.790861 29.2737748,28 27.5555556,28 Z" fill="#FFFFFF"/></svg>
diff --git a/Telegram/Resources/icons/local_storage/videos.svg b/Telegram/Resources/icons/local_storage/videos.svg
new file mode 100644
index 00000000000000..3ef2b7d2220c3d
--- /dev/null
+++ b/Telegram/Resources/icons/local_storage/videos.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 72 72" xmlns="http://www.w3.org/2000/svg"><path d="M18.5095398,18.85 L36.9719416,18.85 C40.5670612,18.85 43.4814815,21.7644203 43.4814815,25.3595398 L43.4814815,45.6404602 C43.4814815,49.2355797 40.5670612,52.15 36.9719416,52.15 L18.5095398,52.15 C14.9144203,52.15 12,49.2355797 12,45.6404602 L12,25.3595398 C12,21.7644203 14.9144203,18.85 18.5095398,18.85 Z M49.5847133,27.1084323 L56.6902242,21.3231792 C58.0841802,20.1882308 60.1342623,20.3981979 61.2692107,21.7921539 C61.741904,22.3727209 62,23.0984963 62,23.8471598 L62,47.6096485 C62,49.4072083 60.5427899,50.8644185 58.7452301,50.8644185 C58.0575374,50.8644185 57.3875158,50.6465978 56.831289,50.2422056 L49.8668429,45.1788626 C48.1820423,43.9539665 47.1851852,41.9967567 47.1851852,39.9137485 L47.1851852,32.1563935 C47.1851852,30.1985078 48.0664292,28.3446077 49.5847133,27.1084323 Z" fill="#FFFFFF"/></svg>
diff --git a/Telegram/Resources/icons/mediaview/draw.png b/Telegram/Resources/icons/mediaview/draw.png
new file mode 100644
index 00000000000000..96a1d8086eac53
Binary files /dev/null and b/Telegram/Resources/icons/mediaview/draw.png differ
diff --git a/Telegram/Resources/icons/mediaview/draw@2x.png b/Telegram/Resources/icons/mediaview/draw@2x.png
new file mode 100644
index 00000000000000..40da849c7e0ab1
Binary files /dev/null and b/Telegram/Resources/icons/mediaview/draw@2x.png differ
diff --git a/Telegram/Resources/icons/mediaview/draw@3x.png b/Telegram/Resources/icons/mediaview/draw@3x.png
new file mode 100644
index 00000000000000..22ee4fb7bbb928
Binary files /dev/null and b/Telegram/Resources/icons/mediaview/draw@3x.png differ
diff --git a/Telegram/Resources/icons/mediaview/recognize.png b/Telegram/Resources/icons/mediaview/recognize.png
new file mode 100644
index 00000000000000..05941e32466ba4
Binary files /dev/null and b/Telegram/Resources/icons/mediaview/recognize.png differ
diff --git a/Telegram/Resources/icons/mediaview/recognize@2x.png b/Telegram/Resources/icons/mediaview/recognize@2x.png
new file mode 100644
index 00000000000000..bc86664b691b73
Binary files /dev/null and b/Telegram/Resources/icons/mediaview/recognize@2x.png differ
diff --git a/Telegram/Resources/icons/mediaview/recognize@3x.png b/Telegram/Resources/icons/mediaview/recognize@3x.png
new file mode 100644
index 00000000000000..0be9ab5e32c9d2
Binary files /dev/null and b/Telegram/Resources/icons/mediaview/recognize@3x.png differ
diff --git a/Telegram/Resources/icons/menu/2sv_off.png b/Telegram/Resources/icons/menu/2sv_off.png
new file mode 100644
index 00000000000000..78a288600010b8
Binary files /dev/null and b/Telegram/Resources/icons/menu/2sv_off.png differ
diff --git a/Telegram/Resources/icons/menu/2sv_off@2x.png b/Telegram/Resources/icons/menu/2sv_off@2x.png
new file mode 100644
index 00000000000000..98cae67216e536
Binary files /dev/null and b/Telegram/Resources/icons/menu/2sv_off@2x.png differ
diff --git a/Telegram/Resources/icons/menu/2sv_off@3x.png b/Telegram/Resources/icons/menu/2sv_off@3x.png
new file mode 100644
index 00000000000000..cf1b017baea776
Binary files /dev/null and b/Telegram/Resources/icons/menu/2sv_off@3x.png differ
diff --git a/Telegram/Resources/icons/menu/2sv_on.png b/Telegram/Resources/icons/menu/2sv_on.png
new file mode 100644
index 00000000000000..f7089daa1feeb4
Binary files /dev/null and b/Telegram/Resources/icons/menu/2sv_on.png differ
diff --git a/Telegram/Resources/icons/menu/2sv_on@2x.png b/Telegram/Resources/icons/menu/2sv_on@2x.png
new file mode 100644
index 00000000000000..021ec634e684a4
Binary files /dev/null and b/Telegram/Resources/icons/menu/2sv_on@2x.png differ
diff --git a/Telegram/Resources/icons/menu/2sv_on@3x.png b/Telegram/Resources/icons/menu/2sv_on@3x.png
new file mode 100644
index 00000000000000..5e74c1fcc39441
Binary files /dev/null and b/Telegram/Resources/icons/menu/2sv_on@3x.png differ
diff --git a/Telegram/Resources/icons/info/edit/stickers_add.png b/Telegram/Resources/icons/menu/add.png
similarity index 100%
rename from Telegram/Resources/icons/info/edit/stickers_add.png
rename to Telegram/Resources/icons/menu/add.png
diff --git a/Telegram/Resources/icons/info/edit/stickers_add@2x.png b/Telegram/Resources/icons/menu/add@2x.png
similarity index 100%
rename from Telegram/Resources/icons/info/edit/stickers_add@2x.png
rename to Telegram/Resources/icons/menu/add@2x.png
diff --git a/Telegram/Resources/icons/info/edit/stickers_add@3x.png b/Telegram/Resources/icons/menu/add@3x.png
similarity index 100%
rename from Telegram/Resources/icons/info/edit/stickers_add@3x.png
rename to Telegram/Resources/icons/menu/add@3x.png
diff --git a/Telegram/Resources/icons/menu/affiliate_simple.png b/Telegram/Resources/icons/menu/affiliate_simple.png
new file mode 100644
index 00000000000000..c09ce88fc2fab0
Binary files /dev/null and b/Telegram/Resources/icons/menu/affiliate_simple.png differ
diff --git a/Telegram/Resources/icons/menu/affiliate_simple@2x.png b/Telegram/Resources/icons/menu/affiliate_simple@2x.png
new file mode 100644
index 00000000000000..3e41ea4277cfef
Binary files /dev/null and b/Telegram/Resources/icons/menu/affiliate_simple@2x.png differ
diff --git a/Telegram/Resources/icons/menu/affiliate_simple@3x.png b/Telegram/Resources/icons/menu/affiliate_simple@3x.png
new file mode 100644
index 00000000000000..d075a10bd78037
Binary files /dev/null and b/Telegram/Resources/icons/menu/affiliate_simple@3x.png differ
diff --git a/Telegram/Resources/icons/menu/affiliate_transparent.png b/Telegram/Resources/icons/menu/affiliate_transparent.png
new file mode 100644
index 00000000000000..abcd00046ed9b5
Binary files /dev/null and b/Telegram/Resources/icons/menu/affiliate_transparent.png differ
diff --git a/Telegram/Resources/icons/menu/affiliate_transparent@2x.png b/Telegram/Resources/icons/menu/affiliate_transparent@2x.png
new file mode 100644
index 00000000000000..ffbc05cba68aee
Binary files /dev/null and b/Telegram/Resources/icons/menu/affiliate_transparent@2x.png differ
diff --git a/Telegram/Resources/icons/menu/affiliate_transparent@3x.png b/Telegram/Resources/icons/menu/affiliate_transparent@3x.png
new file mode 100644
index 00000000000000..54185c44c8d5a3
Binary files /dev/null and b/Telegram/Resources/icons/menu/affiliate_transparent@3x.png differ
diff --git a/Telegram/Resources/icons/menu/article_rich.svg b/Telegram/Resources/icons/menu/article_rich.svg
new file mode 100644
index 00000000000000..2d7ce183ef6aaa
--- /dev/null
+++ b/Telegram/Resources/icons/menu/article_rich.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="25.3 46.3 1120.5 1120.5" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M235.5,169.409 C283.875,167.709 340.128,169.168 389.119,169.169 L685.597,169.157 L855.442,169.108 C885.874,169.084 918.886,168.222 949.031,170.56 C964.43,172.507 980.371,180.335 992.084,190.153 C1026.46,218.965 1022.2,255.653 1022.11,295.936 L1022.06,377.869 L1022.08,644.517 L1022.13,862.891 L1022.13,929.617 C1022.13,937.165 1022,945.512 1022.06,952.994 C1022.45,1007.46 987.524,1039.67 936.297,1043.76 C882.714,1044.91 826.621,1044.01 772.755,1044.01 L468.243,1044 L311.669,1044.01 C287.856,1044.03 245.645,1045.38 223.58,1042.75 C207.255,1040.83 191.887,1034.04 179.482,1023.26 C142.706,991.017 148.895,952.638 148.992,908.126 L149.024,820.746 L148.994,539.4 L148.969,344.657 L148.972,284.949 C148.982,272.277 148.336,258.433 149.913,245.913 C155.817,199.021 190.367,172.338 235.5,169.409 Z M233.938,227.343 C268.957,225.926 313.395,227.126 348.883,227.127 L572.096,227.142 L810.482,227.16 C850.622,227.161 891.007,226.92 931.133,227.272 C939.338,227.684 944.374,227.154 951.511,231.631 C967.188,241.464 964.594,262 964.9,278.65 C965.168,293.228 964.906,309.299 964.904,324.513 L964.858,473.651 L964.882,788.498 C964.891,842.355 965.046,896.22 964.691,950.073 C964.566,969.098 959.855,982.208 939.25,985.939 C898.274,987.845 848.287,986.494 806.567,986.49 L564.462,986.477 L348.544,986.472 C311.343,986.474 273.998,986.946 236.811,986.171 C229.415,986.072 224.296,984.823 218.256,980.547 C203.392,970.025 206.789,949.674 206.771,932.887 L206.776,879.547 L206.792,706.336 L206.785,410.209 L206.755,312.312 C206.751,294.394 206.706,276.485 206.931,258.567 C207.165,239.884 214.972,229.7 233.938,227.343 Z" fill="#FFFFFF"></path>
+        <path d="M324.774,390.489 C380.743,389.809 436.758,390.847 492.991,390.595 C524.059,390.455 561.714,388.963 592.815,392.271 C599.852,393.019 611.066,404.641 611.753,412.717 C613.079,428.322 615.971,450.656 606.795,464.597 C587.919,489.074 559.065,475.665 554.582,448.139 C530.054,448.042 505.525,448.074 480.998,448.235 C479.349,514.32 480.671,588.684 480.906,655.103 C500.327,654.982 514.751,652.143 527.936,668.521 C541.184,692.372 524.424,712.755 498.942,712.852 C472.013,712.953 445.091,712.456 418.157,712.942 C404.646,713.186 389.565,713.284 379.106,703.327 C367.693,693.13 370.681,673.869 379.932,663.537 C388.852,653.574 410.562,655.093 423.056,655.049 C424.167,587.249 423.242,517.054 423.232,449.07 C398.039,448.841 372.844,448.823 347.65,449.018 C344.508,473.936 320.321,485.861 300.049,470.798 C285.898,460.284 286.016,411.645 298.118,399.199 C305.363,391.747 314.831,390.8 324.774,390.489 Z" fill="#FFFFFF"></path>
+        <path d="M317.739,787.416 C334.352,786.041 370.424,787.105 388.632,787.101 L530.883,787.085 L738.495,787.094 C757.249,787.097 860.031,784.525 870.817,791.8 C877.338,796.292 881.821,803.178 883.288,810.96 C886.999,830.038 873.861,841.886 856.25,844.933 C816.432,845.684 774.548,845.08 734.575,845.08 L506.919,845.072 L378.693,845.115 C359.64,845.124 331.865,846.288 313.819,844.78 C278.716,841.848 273.3,791.018 317.739,787.416 Z" fill="#FFFFFF"></path>
+        <path d="M616.24,655.427 C663.269,654.149 715.819,655.263 763.256,655.266 L820.46,655.229 C831.822,655.218 842.978,655.292 854.337,655.675 C891.943,656.944 896.058,707.895 854.269,712.766 L690.454,712.806 C663.693,712.811 636.253,713.43 609.928,712.097 C586.298,710.9 575.083,680.649 592.115,664.095 C600.128,656.306 605.821,656.005 616.24,655.427 Z" fill="#FFFFFF"></path>
+        <path d="M740.729,523.21 C777.099,520.824 817.932,523.331 854.631,523.075 C886.669,522.851 897.665,567.919 860.672,579.748 C822.937,581.958 781.271,579.937 743.263,579.855 C714.021,579.792 703.142,531.719 740.729,523.21 Z" fill="#FFFFFF"></path>
+        <path d="M751.68,390.479 L821.011,390.416 C831.099,390.414 852.799,389.899 861.807,391.742 C866.466,392.652 870.796,394.796 874.344,397.95 C886.22,408.417 887.029,427.578 876.01,438.928 C868.597,446.562 861.766,447.721 851.599,448.094 L779.099,448.207 C763.428,448.224 737.679,451.156 725.845,440.452 C720.284,435.38 716.983,428.295 716.678,420.774 C716.351,412.667 719.334,404.775 724.942,398.911 C732.301,391.156 741.871,390.791 751.68,390.479 Z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/auction_carry.png b/Telegram/Resources/icons/menu/auction_carry.png
new file mode 100644
index 00000000000000..d63bbb745f38b0
Binary files /dev/null and b/Telegram/Resources/icons/menu/auction_carry.png differ
diff --git a/Telegram/Resources/icons/menu/auction_carry@2x.png b/Telegram/Resources/icons/menu/auction_carry@2x.png
new file mode 100644
index 00000000000000..dd5367f9434cf5
Binary files /dev/null and b/Telegram/Resources/icons/menu/auction_carry@2x.png differ
diff --git a/Telegram/Resources/icons/menu/auction_carry@3x.png b/Telegram/Resources/icons/menu/auction_carry@3x.png
new file mode 100644
index 00000000000000..c8f18887378ee6
Binary files /dev/null and b/Telegram/Resources/icons/menu/auction_carry@3x.png differ
diff --git a/Telegram/Resources/icons/menu/auction_drop.png b/Telegram/Resources/icons/menu/auction_drop.png
new file mode 100644
index 00000000000000..d1b3af2c3366c1
Binary files /dev/null and b/Telegram/Resources/icons/menu/auction_drop.png differ
diff --git a/Telegram/Resources/icons/menu/auction_drop@2x.png b/Telegram/Resources/icons/menu/auction_drop@2x.png
new file mode 100644
index 00000000000000..3ced06af81e8f2
Binary files /dev/null and b/Telegram/Resources/icons/menu/auction_drop@2x.png differ
diff --git a/Telegram/Resources/icons/menu/auction_drop@3x.png b/Telegram/Resources/icons/menu/auction_drop@3x.png
new file mode 100644
index 00000000000000..c2f58a2377827f
Binary files /dev/null and b/Telegram/Resources/icons/menu/auction_drop@3x.png differ
diff --git a/Telegram/Resources/icons/menu/auction_refund.png b/Telegram/Resources/icons/menu/auction_refund.png
new file mode 100644
index 00000000000000..aebc536a0ff77c
Binary files /dev/null and b/Telegram/Resources/icons/menu/auction_refund.png differ
diff --git a/Telegram/Resources/icons/menu/auction_refund@2x.png b/Telegram/Resources/icons/menu/auction_refund@2x.png
new file mode 100644
index 00000000000000..5cc6db3dcbb159
Binary files /dev/null and b/Telegram/Resources/icons/menu/auction_refund@2x.png differ
diff --git a/Telegram/Resources/icons/menu/auction_refund@3x.png b/Telegram/Resources/icons/menu/auction_refund@3x.png
new file mode 100644
index 00000000000000..eb9f032df0a350
Binary files /dev/null and b/Telegram/Resources/icons/menu/auction_refund@3x.png differ
diff --git a/Telegram/Resources/icons/menu/bot.png b/Telegram/Resources/icons/menu/bot.png
new file mode 100644
index 00000000000000..5a890cf8b945d0
Binary files /dev/null and b/Telegram/Resources/icons/menu/bot.png differ
diff --git a/Telegram/Resources/icons/menu/bot@2x.png b/Telegram/Resources/icons/menu/bot@2x.png
new file mode 100644
index 00000000000000..aaa8dc9afd69e2
Binary files /dev/null and b/Telegram/Resources/icons/menu/bot@2x.png differ
diff --git a/Telegram/Resources/icons/menu/bot@3x.png b/Telegram/Resources/icons/menu/bot@3x.png
new file mode 100644
index 00000000000000..59a23832b3a875
Binary files /dev/null and b/Telegram/Resources/icons/menu/bot@3x.png differ
diff --git a/Telegram/Resources/icons/menu/bot_add.png b/Telegram/Resources/icons/menu/bot_add.png
new file mode 100644
index 00000000000000..aadbec32dcf2c5
Binary files /dev/null and b/Telegram/Resources/icons/menu/bot_add.png differ
diff --git a/Telegram/Resources/icons/menu/bot_add@2x.png b/Telegram/Resources/icons/menu/bot_add@2x.png
new file mode 100644
index 00000000000000..0eea54a256c1f4
Binary files /dev/null and b/Telegram/Resources/icons/menu/bot_add@2x.png differ
diff --git a/Telegram/Resources/icons/menu/bot_add@3x.png b/Telegram/Resources/icons/menu/bot_add@3x.png
new file mode 100644
index 00000000000000..e89bb32eb0ce2f
Binary files /dev/null and b/Telegram/Resources/icons/menu/bot_add@3x.png differ
diff --git a/Telegram/Resources/icons/menu/cancel_fee.png b/Telegram/Resources/icons/menu/cancel_fee.png
new file mode 100644
index 00000000000000..467c369cec28a1
Binary files /dev/null and b/Telegram/Resources/icons/menu/cancel_fee.png differ
diff --git a/Telegram/Resources/icons/menu/cancel_fee@2x.png b/Telegram/Resources/icons/menu/cancel_fee@2x.png
new file mode 100644
index 00000000000000..75c0a6c94192a4
Binary files /dev/null and b/Telegram/Resources/icons/menu/cancel_fee@2x.png differ
diff --git a/Telegram/Resources/icons/menu/cancel_fee@3x.png b/Telegram/Resources/icons/menu/cancel_fee@3x.png
new file mode 100644
index 00000000000000..73fee9f98a6b70
Binary files /dev/null and b/Telegram/Resources/icons/menu/cancel_fee@3x.png differ
diff --git a/Telegram/Resources/icons/menu/caption_hide.png b/Telegram/Resources/icons/menu/caption_hide.png
new file mode 100644
index 00000000000000..0320b2e2e78397
Binary files /dev/null and b/Telegram/Resources/icons/menu/caption_hide.png differ
diff --git a/Telegram/Resources/icons/menu/caption_hide@2x.png b/Telegram/Resources/icons/menu/caption_hide@2x.png
new file mode 100644
index 00000000000000..6b9169008e917b
Binary files /dev/null and b/Telegram/Resources/icons/menu/caption_hide@2x.png differ
diff --git a/Telegram/Resources/icons/menu/caption_hide@3x.png b/Telegram/Resources/icons/menu/caption_hide@3x.png
new file mode 100644
index 00000000000000..75d4841d1b2f59
Binary files /dev/null and b/Telegram/Resources/icons/menu/caption_hide@3x.png differ
diff --git a/Telegram/Resources/icons/menu/caption_show.png b/Telegram/Resources/icons/menu/caption_show.png
new file mode 100644
index 00000000000000..9c7b05c6399168
Binary files /dev/null and b/Telegram/Resources/icons/menu/caption_show.png differ
diff --git a/Telegram/Resources/icons/menu/caption_show@2x.png b/Telegram/Resources/icons/menu/caption_show@2x.png
new file mode 100644
index 00000000000000..962eeaee1b5cc7
Binary files /dev/null and b/Telegram/Resources/icons/menu/caption_show@2x.png differ
diff --git a/Telegram/Resources/icons/menu/caption_show@3x.png b/Telegram/Resources/icons/menu/caption_show@3x.png
new file mode 100644
index 00000000000000..4dd44a6097c193
Binary files /dev/null and b/Telegram/Resources/icons/menu/caption_show@3x.png differ
diff --git a/Telegram/Resources/icons/menu/craft_chance.svg b/Telegram/Resources/icons/menu/craft_chance.svg
new file mode 100644
index 00000000000000..c3ea4c40dba6f8
--- /dev/null
+++ b/Telegram/Resources/icons/menu/craft_chance.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / craft_chance</title>
+    <g id="Icon-/-Menu-/-craft_chance" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M14.2394854,18.3384734 C15.1002335,18.3384734 15.6545373,18.9252891 15.6545373,19.830532 L15.6545373,19.9942945 C15.6545373,20.8813416 15.0641813,21.5 14.2124462,21.5 C13.3607112,21.5 12.7973944,20.8995374 12.7973944,19.9942945 L12.7973944,19.830532 C12.7973944,18.938936 13.3742308,18.3384734 14.2394854,18.3384734 Z M14.8002575,14.8144933 C15.0602829,15.0211239 15.1045571,15.4006755 14.8991467,15.6622455 L10.5569642,21.1915888 C10.3515538,21.4531588 9.97424351,21.4976959 9.71421812,21.2910653 C9.45419274,21.0844347 9.40991856,20.7048831 9.61532898,20.4433131 L13.9575114,14.9139699 C14.1629219,14.6523999 14.5402321,14.6078627 14.8002575,14.8144933 Z M14.2558401,19.2729857 C14.0219885,19.2729857 13.8896197,19.4974831 13.8896197,19.9015784 L13.8896197,19.9689277 C13.8896197,20.3685331 14.0264008,20.6065003 14.2558401,20.6065003 C14.4808671,20.6065003 14.6132359,20.3685331 14.6132359,19.9689277 L14.6132359,19.9015784 C14.6132359,19.501973 14.4852794,19.2729857 14.2558401,19.2729857 Z M12,2.5 C17.2467051,2.5 21.5,6.77856068 21.5,12.0564327 C21.5,14.8051138 20.3392414,17.3671126 18.3459938,19.168073 C18.0818576,19.4067281 17.6754071,19.3847997 17.4381612,19.1190945 C17.2009154,18.8533892 17.2227143,18.4445243 17.4868505,18.2058691 C19.2113831,16.647701 20.2142857,14.4341182 20.2142857,12.0564327 C20.2142857,7.49285915 16.5366247,3.7933518 12,3.7933518 C7.46337527,3.7933518 3.78571429,7.49285915 3.78571429,12.0564327 C3.78571429,14.6032885 4.93761579,16.9582836 6.87881601,18.5174708 C7.1562635,18.7403187 7.20159194,19.1472244 6.98005992,19.42632 C6.7585279,19.7054156 6.35402509,19.7510133 6.07657761,19.5281653 C3.83300652,17.7261116 2.5,15.0008578 2.5,12.0564327 C2.5,6.77856068 6.75329488,2.5 12,2.5 Z M10.2394854,14.8895352 C11.1002335,14.8895352 11.6545373,15.476351 11.6545373,16.3815939 L11.6545373,16.5453564 C11.6545373,17.4324034 11.0641813,18.0510619 10.2124462,18.0510619 C9.36071122,18.0510619 8.79739441,17.4505993 8.79739441,16.5453564 L8.79739441,16.3815939 C8.79739441,15.4899979 9.37423083,14.8895352 10.2394854,14.8895352 Z M10.2558401,15.8240476 C10.0219885,15.8240476 9.88961966,16.048545 9.88961966,16.4526403 L9.88961966,16.5199895 C9.88961966,16.9195949 10.0264008,17.1575622 10.2558401,17.1575622 C10.4808671,17.1575622 10.6132359,16.9195949 10.6132359,16.5199895 L10.6132359,16.4526403 C10.6132359,16.0530349 10.4852794,15.8240476 10.2558401,15.8240476 Z M12.7357164,9.85753889 L15.410911,11.9797736 C15.6896921,12.200931 15.7374641,12.6075537 15.5176127,12.8879908 C15.2977613,13.168428 14.8935398,13.2164838 14.6147587,12.9953264 L12.2503714,11.1196555 L9.86540882,13.0262454 C9.58745192,13.24845 9.18305457,13.2019154 8.96216206,12.9223074 C8.74126956,12.6426993 8.78752939,12.2358997 9.0654863,12.013695 L11.7603373,9.85937373 C12.0456859,9.63126002 12.4495217,9.63050034 12.7357164,9.85753889 Z M12.7357164,6.40860076 L15.410911,8.53083548 C15.6896921,8.75199285 15.7374641,9.15861554 15.5176127,9.4390527 C15.2977613,9.71948986 14.8935398,9.76754563 14.6147587,9.54638827 L12.2503714,7.67071733 L9.86540882,9.57730723 C9.58745192,9.7995119 9.18305457,9.75297727 8.96216206,9.47336922 C8.74126956,9.19376117 8.78752939,8.78696158 9.0654863,8.56475691 L11.7603373,6.4104356 C12.0456859,6.18232188 12.4495217,6.18156221 12.7357164,6.40860076 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/craft_random.svg b/Telegram/Resources/icons/menu/craft_random.svg
new file mode 100644
index 00000000000000..afaf213c10569e
--- /dev/null
+++ b/Telegram/Resources/icons/menu/craft_random.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / craft_random</title>
+    <g id="Icon-/-Menu-/-craft_random" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M18.2068965,5.24210527 C20.0808558,5.24210527 21.6,6.76124942 21.6,8.63520871 L21.6,18.2068966 C21.6,20.0808558 20.0808558,21.6 18.2068966,21.6 L8.89655172,21.6 C7.02259244,21.6 5.50344828,20.0808558 5.50344828,18.2068966 L5.50344828,8.63520871 C5.50344828,6.76124942 7.02259244,5.24210527 8.89655173,5.24210527 L18.2068965,5.24210527 Z M18.2068966,6.44210526 L8.89655173,6.44210526 L8.67231965,6.45342802 C7.56643389,6.56573682 6.70344828,7.49969222 6.70344828,8.63520871 L6.70344828,18.2068966 C6.70344828,19.4181141 7.68533413,20.4 8.89655172,20.4 L18.2068966,20.4 C19.4181141,20.4 20.4,19.4181141 20.4,18.2068966 L20.4,8.63520871 C20.4,7.42399112 19.4181141,6.44210526 18.2068966,6.44210526 Z M16.8103448,15.6315789 C17.4102403,15.6315789 17.8965517,16.1264221 17.8965517,16.7368421 C17.8965517,17.3472621 17.4102403,17.8421053 16.8103448,17.8421053 C16.2104493,17.8421053 15.7241379,17.3472621 15.7241379,16.7368421 C15.7241379,16.1264221 16.2104493,15.6315789 16.8103448,15.6315789 Z M10.2931034,15.6315789 C10.892999,15.6315789 11.3793103,16.1264221 11.3793103,16.7368421 C11.3793103,17.3472621 10.892999,17.8421053 10.2931034,17.8421053 C9.69320794,17.8421053 9.20689655,17.3472621 9.20689655,16.7368421 C9.20689655,16.1264221 9.69320794,15.6315789 10.2931034,15.6315789 Z M15.4137931,2.4 C15.745164,2.4 16.0137931,2.66862915 16.0137931,3 C16.0137931,3.33137085 15.745164,3.6 15.4137931,3.6 L7.65517241,3.6 C5.41556253,3.6 3.6,5.41556253 3.6,7.65517241 L3.6,15.6315789 C3.6,15.9629498 3.33137085,16.2315789 3,16.2315789 C2.66862915,16.2315789 2.4,15.9629498 2.4,15.6315789 L2.4,7.65517241 C2.4,4.75282083 4.75282083,2.4 7.65517241,2.4 L15.4137931,2.4 Z M13.7068966,12.1578947 C14.3067921,12.1578947 14.7931034,12.6527379 14.7931034,13.2631579 C14.7931034,13.8735779 14.3067921,14.3684211 13.7068966,14.3684211 C13.107001,14.3684211 12.6206897,13.8735779 12.6206897,13.2631579 C12.6206897,12.6527379 13.107001,12.1578947 13.7068966,12.1578947 Z M10.2931034,9 C10.892999,9 11.3793103,9.49484317 11.3793103,10.1052632 C11.3793103,10.7156831 10.892999,11.2105263 10.2931034,11.2105263 C9.69320794,11.2105263 9.20689655,10.7156831 9.20689655,10.1052632 C9.20689655,9.49484317 9.69320794,9 10.2931034,9 Z M16.8103448,9 C17.4102403,9 17.8965517,9.49484317 17.8965517,10.1052632 C17.8965517,10.7156831 17.4102403,11.2105263 16.8103448,11.2105263 C16.2104493,11.2105263 15.7241379,10.7156831 15.7241379,10.1052632 C15.7241379,9.49484317 16.2104493,9 16.8103448,9 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/craft_start.svg b/Telegram/Resources/icons/menu/craft_start.svg
new file mode 100644
index 00000000000000..5a8067fbbf6dc8
--- /dev/null
+++ b/Telegram/Resources/icons/menu/craft_start.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / craft_forge</title>
+    <g id="Icon-/-Menu-/-craft_forge" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M19.6809217,11.584649 C20.5356033,11.584649 21.2000008,12.2878722 21.2000008,13.1223747 L21.2000008,13.9316204 C21.2004071,14.7091201 20.622556,15.3824541 19.8332338,15.4624173 C19.2936121,15.517524 18.863406,15.6838819 18.5148679,15.9600196 C17.9029046,16.4448622 17.7719074,16.7050396 17.7599805,17.4205617 C17.7549104,17.7247336 17.9066741,18.0535064 18.2828229,18.4380374 L18.3163193,18.4721239 C18.6286055,18.7841363 18.8015577,19.2086622 18.8015652,19.6484703 L18.8015652,20.5496992 C18.8015652,21.4463744 18.0895511,22.2 17.1761278,22.2 L11.3441247,22.2 C10.4307014,22.2 9.71868728,21.4463744 9.71868728,20.5496992 L9.7187576,17.4274295 C9.47755232,17.5254077 9.20719261,17.5641978 8.92399018,17.5270815 L8.82750933,17.5141684 C7.54911686,17.3380977 6.63726756,17.0107043 5.59868772,16.406024 C4.66746279,15.8638477 3.83259127,15.0678149 3.08965928,14.0296999 C2.89997398,13.7643972 2.8,13.4461878 2.8,13.1223017 C2.8,12.2981385 3.44617313,11.5842771 4.30561482,11.584649 L19.6809217,11.584649 Z M19.6809217,12.7846491 L10.9186873,12.7846491 L10.9186873,20.5496992 C10.9186873,20.7983935 11.1091621,21 11.3441247,21 L17.1761278,21 C17.4110904,21 17.6015652,20.7983935 17.6015652,20.5496992 L17.6015652,19.6484703 C17.6015631,19.5245421 17.5533068,19.4060929 17.4681634,19.3210241 L17.4276455,19.2798637 C16.838469,18.6775712 16.5493029,18.0511373 16.5601472,17.400562 C16.5779411,16.333059 16.8696695,15.7324922 17.7696732,15.0194427 C18.3033912,14.5965918 18.9506069,14.346311 19.7113227,14.268626 C19.8750884,14.2520354 20.0000918,14.1063764 20.0000008,13.9322477 L20.0000008,13.1223747 C20.0000008,12.935854 19.8571436,12.7846491 19.6809217,12.7846491 Z M9.53846149,12.7845761 L4.30563157,12.7846491 C4.13687242,12.7845761 4,12.935781 4,13.1223017 C4,13.1983211 4.02317579,13.2721229 4.06582023,13.3317674 C4.71454843,14.2382492 5.42674138,14.9173429 6.20247008,15.3689865 C7.00926998,15.8387202 7.77204223,16.1574729 8.9912376,16.3253905 L9.083067,16.3376721 C9.30651386,16.3669559 9.50913195,16.1904911 9.53562716,15.943527 L9.53774602,15.9171788 L9.53846149,15.8907386 L9.53846149,12.7845761 Z M10.4788189,4.1585305 C10.6359537,4.04081238 10.8193928,3.95031211 11.0249783,3.89447895 L11.0560294,3.88689861 L18.2834796,2.19763527 C19.3588588,1.95756484 20.3605762,2.68507871 20.5879674,3.7496305 C20.804869,4.76507473 20.236643,5.82229392 19.2136718,6.10353547 L19.1761421,6.1131484 L11.9134443,7.8629449 C11.783972,7.89275655 11.655752,7.90569509 11.5309524,7.90138406 C11.5250994,8.77232221 10.9561307,9.57148161 10.0819194,9.80593161 L8.68757486,10.1797045 L8.66280238,10.186063 C7.5930357,10.4485249 6.54544345,9.75702049 6.31125651,8.68767158 L5.85988213,6.62707487 C5.79048169,6.31001116 5.77133091,5.98343154 5.80332573,5.65800939 L5.80985756,5.59276914 C6.02661339,3.45619581 6.36817266,2.37770145 7.46098137,2.05998431 C8.58655657,1.73274083 9.37690318,2.47216744 10.4788189,4.1585305 Z M7.79599128,3.21227263 C7.42609973,3.31981284 7.16201249,4.15368454 7.00372953,5.71388771 L6.99735817,5.77753574 C6.9778604,5.97586102 6.98961052,6.17623664 7.03212914,6.37048776 L7.48346299,8.43089936 C7.57631307,8.85487318 7.97630428,9.11890309 8.37686836,9.02062668 L9.77121288,8.64685376 C10.1636097,8.54161898 10.4046693,8.12382717 10.313909,7.70628159 L9.8639779,5.63687074 C9.81726157,5.42209724 9.73370206,5.21822195 9.61745161,5.03537583 L9.55058468,4.9310173 C8.74313795,3.6799007 8.15837098,3.10691637 7.79599128,3.21227263 Z M19.4144405,4.00029901 C19.3203161,3.55964744 18.9370239,3.28127513 18.5449348,3.36880612 L11.3291525,5.05540352 L11.3132664,5.05933514 C11.1001196,5.11730073 10.9687444,5.36034493 11.0198317,5.60218956 L11.1793189,6.35719422 L11.1844416,6.37904886 C11.241995,6.60217216 11.4412271,6.74027568 11.6441837,6.69354387 L18.89506,4.94653241 L18.907651,4.94321168 C19.2770782,4.84162174 19.5039756,4.41946535 19.4144405,4.00029901 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/craft_tools.svg b/Telegram/Resources/icons/menu/craft_tools.svg
new file mode 100644
index 00000000000000..db111821bd6c11
--- /dev/null
+++ b/Telegram/Resources/icons/menu/craft_tools.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / craft_tools</title>
+    <g id="Icon-/-Menu-/-craft_tools" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M12.541342,18.4924763 C12.6445719,18.5253411 12.7254551,18.6062243 12.7583199,18.7094543 L13.0044335,19.4825087 C13.0497169,19.624746 13.1612345,19.7361465 13.3035194,19.7812804 L14.0783199,20.0270534 C14.2538034,20.0827181 14.3509357,20.2701008 14.2952709,20.4455843 C14.2625103,20.5488623 14.181598,20.6297746 14.0783199,20.6625353 L13.3035194,20.9083082 C13.1612345,20.9534421 13.0497169,21.0648426 13.0044335,21.20708 L12.7583199,21.9801344 C12.7023503,22.1559376 12.5144613,22.253082 12.338658,22.1971123 C12.2354281,22.1642475 12.1545449,22.0833643 12.1216801,21.9801344 L11.8755665,21.20708 C11.8302831,21.0648426 11.7187655,20.9534421 11.5764806,20.9083082 L10.8016801,20.6625353 C10.6261966,20.6068705 10.5290643,20.4194878 10.5847291,20.2440043 C10.6174897,20.1407263 10.698402,20.059814 10.8016801,20.0270534 L11.5764806,19.7812804 C11.7187655,19.7361465 11.8302831,19.624746 11.8755665,19.4825087 L12.1216801,18.7094543 C12.1776497,18.533651 12.3655387,18.4365067 12.541342,18.4924763 Z M13.7933075,3.4379879 C14.0550407,3.50764862 14.2657847,3.70155715 14.3569458,3.95659937 C14.5100215,4.38486101 14.2869393,4.85612808 13.8586777,5.00920383 L13.7929141,5.03271004 C13.1392301,5.27552589 12.5430235,5.58803471 12.0024547,5.96968 C11.5903785,6.2606086 11.3374152,6.51683874 11.2381856,6.71593966 C11.2250671,6.74201237 11.2293846,6.77347446 11.2488802,6.79487212 L13.5314953,9.29849086 L15.9004367,7.11171922 C15.918283,7.09565182 15.9328509,7.07272614 15.9417448,7.04591278 L15.9704087,6.89387964 L16.1303987,6.32166349 C16.1905902,5.87662074 16.4633132,5.48631783 16.8634867,5.290877 L19.1115273,4.19295602 C19.6351622,3.93721788 20.2550612,4.07266372 20.6309547,4.52032068 L21.1594552,5.14971953 C21.5313354,5.59259707 21.5772946,6.23584618 21.2780218,6.73449372 L19.9454405,8.95483742 C19.6896314,9.38106587 19.2234823,9.62878133 18.824751,9.58711139 L18.1995992,9.61976377 C18.1845363,9.61844594 18.1665726,9.62462398 18.1537423,9.63613837 L15.8154953,11.8024909 L20.5690675,17.0161275 C21.1145678,17.6143422 21.0843021,18.5382109 20.5008186,19.0994403 L19.6732058,19.8954266 C19.0741783,20.4628021 18.1286219,20.4371431 17.5612226,19.8380905 L12.6694953,14.6734909 L11.3365359,15.8687652 C11.4914429,16.3526516 11.3677567,16.9023527 10.9772093,17.2735474 L7.90723447,20.1886966 C7.33438086,20.6775189 6.4737225,20.6093981 5.98490021,20.0365445 L4.28244086,18.0406951 C3.80886338,17.4551758 3.89961015,16.5966082 4.48512945,16.1230308 L7.7016812,13.5214316 C8.122409,13.1811402 8.68600359,13.1314191 9.14617379,13.350555 L9.10868764,13.3112751 L10.3224953,12.1954909 L8.00598108,9.7489343 C7.97934529,9.72485673 7.93935086,9.72491284 7.91286496,9.7478052 C7.64886032,10.040125 7.43558355,10.2999218 7.26761131,10.5324159 C7.10565718,10.7565802 6.91167106,11.078909 6.69176714,11.4927286 C6.62045233,11.6266286 6.52573157,11.7466732 6.41209133,11.8471765 C5.8865022,12.312007 5.08360848,12.2627524 4.6174837,11.7356949 L2.98809736,9.88116434 C2.8937888,9.77287155 2.81852271,9.64937345 2.76549857,9.51591981 C2.50641846,8.86385478 2.82499567,8.12522571 3.4770607,7.86614559 L3.84409229,7.7203157 L4.56257559,7.42587142 C4.96709972,7.25749814 5.17626442,7.15371294 5.30789112,7.06171106 C5.3633111,7.02297468 5.4097919,6.98311449 5.46518098,6.92718533 L5.79678387,6.56301197 L5.98156868,5.92196695 C6.05862783,5.68242976 6.14121056,5.47203226 6.24413027,5.26802673 C6.31025272,5.13696005 6.38326862,5.01214747 6.46457329,4.89316321 C7.07971196,3.9929466 9.29775861,3.08006265 10.8866679,3.04552781 C11.739287,3.0269962 12.7057051,3.15838357 13.7933075,3.4379879 Z M8.45632016,14.4544483 L5.2397684,17.0560474 C5.16953996,17.1128493 5.1586556,17.2158277 5.2154575,17.2860562 L6.89773426,19.2576131 C6.94463857,19.3125806 7.02008613,19.3288032 7.08356814,19.3030748 L7.13481401,19.2699982 L10.1505055,16.4037424 C10.2138948,16.3434942 10.2186705,16.2440387 10.1613456,16.1779939 L8.68267982,14.4744044 C8.62492214,14.4078611 8.52482952,14.3990368 8.45632016,14.4544483 Z M11.9024953,9.29249086 L10.4654953,10.6004909 L18.4324799,19.0129173 C18.5281636,19.1139389 18.6785137,19.1320796 18.7937381,19.0649027 L18.8496428,19.0226323 L19.6689436,18.2345796 C19.7837439,18.1241578 19.7896987,17.9423868 19.6823635,17.8246793 L11.9024953,9.29249086 Z M11.1474953,13.0664909 L9.98049525,14.1384909 L10.6304953,14.8874909 L11.8434953,13.8014909 L11.1474953,13.0664909 Z M20.8899493,10.7401151 C20.9763158,10.7686169 21.0440635,10.8363646 21.0725653,10.922731 L21.2845637,11.5651305 C21.3226557,11.6805572 21.4132584,11.771062 21.5287263,11.8090291 L22.1725653,12.0207303 C22.3228251,12.0701374 22.4045824,12.2319994 22.3551754,12.3822592 C22.3267606,12.4686759 22.258982,12.5364546 22.1725653,12.5648693 L21.5287263,12.7765705 C21.4132584,12.8145376 21.3226557,12.9050424 21.2845637,13.0204691 L21.0725653,13.6628686 C21.0228876,13.8134022 20.8605843,13.8951621 20.7100507,13.8454845 C20.6236842,13.8169827 20.5559365,13.749235 20.5274347,13.6628686 L20.3154363,13.0204691 C20.2773443,12.9050424 20.1867416,12.8145376 20.0712737,12.7765705 L19.4274347,12.5648693 C19.2771749,12.5154622 19.1954176,12.3536002 19.2448246,12.2033404 C19.2732394,12.1169237 19.341018,12.049145 19.4274347,12.0207303 L20.0712737,11.8090291 C20.1867416,11.771062 20.2773443,11.6805572 20.3154363,11.5651305 L20.5274347,10.922731 C20.5771124,10.7721974 20.7394157,10.6904375 20.8899493,10.7401151 Z M10.9127437,4.24524447 C9.67583937,4.2721285 7.82057667,5.03570105 7.45535165,5.57018481 C7.40485532,5.644083 7.35848282,5.72335165 7.31550977,5.80853202 C7.24390582,5.95046403 7.18327067,6.10494529 7.12391255,6.28945912 L6.97973289,6.7736061 C6.90837842,7.00699681 6.84719167,7.160462 6.74763621,7.29399137 L6.66516222,7.39223425 C6.60758959,7.45650802 6.43929449,7.6432472 6.35253201,7.73539112 L6.31781591,7.7715867 C6.21386916,7.87654701 6.11303261,7.96302065 5.99535962,8.04526943 C5.77542616,8.19899424 5.50212251,8.33460448 5.02369763,8.53373715 L4.47506969,8.75972804 L3.90529528,8.98951538 C3.87943471,9.00783619 3.8684763,9.04206798 3.88069726,9.07282626 L3.89130951,9.09110048 L5.51767042,10.9421837 C5.54344583,10.9713283 5.58796727,10.9740595 5.61711182,10.9482841 L5.63235711,10.929124 C5.8757013,10.4711808 6.09656411,10.1042047 6.29491507,9.82966271 L6.50695559,9.54965561 L6.624453,9.40386592 L6.61392869,9.39435241 L7.01627929,8.94925243 C7.48679411,8.42874585 8.2901757,8.38821952 8.81068228,8.85873434 L8.88054166,8.9269418 L9.64049525,9.72949086 L11.0934953,8.40549086 L10.3620065,7.60323774 C10.0075118,7.21415853 9.92964998,6.6467753 10.165199,6.17863659 C10.3675802,5.77254536 10.7506435,5.38453503 11.3103534,4.98937605 C11.6401975,4.75650391 11.9872605,4.54621345 12.3515686,4.35880098 C11.8273233,4.27302877 11.3479147,4.23578606 10.9127437,4.24524447 Z M19.6381454,5.27122935 L17.3901048,6.36915033 C17.3543486,6.38661331 17.3230426,6.43362399 17.3178503,6.49297212 L17.2979723,6.60224078 L17.1360729,7.18128594 C17.0926696,7.49826621 16.9401121,7.7903648 16.7089861,7.99839271 L14.3404953,10.1854909 L15.0064953,10.9154909 L17.3438289,8.75071247 C17.6074311,8.51273142 17.9536467,8.39366191 18.2141284,8.42323658 L18.8392802,8.3905842 C18.8627166,8.39263462 18.8929747,8.3765552 18.9165257,8.33731469 L20.249107,6.11697099 C20.2867292,6.05428498 20.2806528,5.96923839 20.2404694,5.92138347 L19.711969,5.29198462 C19.6884721,5.26400189 19.6639256,5.25863856 19.6381454,5.27122935 Z M3.7346363,1.81474244 C3.83726885,1.84617216 3.91760155,1.92650485 3.94903126,2.0291374 L4.18360877,2.79514141 C4.2301584,2.94714746 4.34921075,3.06607869 4.5012641,3.11247357 L5.26903126,3.34673651 C5.43939408,3.39871801 5.5353611,3.57896371 5.48337959,3.74932653 C5.45205322,3.85199474 5.37169948,3.93234849 5.26903126,3.96367486 L4.5012641,4.19793779 C4.34921075,4.24433267 4.2301584,4.36326391 4.18360877,4.51526996 L3.94903126,5.28127396 C3.89676508,5.45194721 3.71603695,5.54793511 3.5453637,5.49566892 C3.44273115,5.46423921 3.36239845,5.38390651 3.33096874,5.28127396 L3.09639123,4.51526996 C3.05915153,4.39366512 2.97551008,4.29322816 2.86569177,4.23416339 L2.7787359,4.19793779 L2.01096874,3.96367486 C1.84060592,3.91169335 1.7446389,3.73144766 1.79662041,3.56108484 C1.82794678,3.45841662 1.90830052,3.37806287 2.01096874,3.34673651 L2.7787359,3.11247357 C2.93078925,3.06607869 3.0498416,2.94714746 3.09639123,2.79514141 L3.33096874,2.0291374 C3.38323492,1.85846415 3.56396305,1.76247625 3.7346363,1.81474244 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/download_off.svg b/Telegram/Resources/icons/menu/download_off.svg
new file mode 100644
index 00000000000000..bac54d5525eea4
--- /dev/null
+++ b/Telegram/Resources/icons/menu/download_off.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>General / menu_download_off</title>
+    <g id="General-/-menu_download_off" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M9.47389883,17.6528876 L12.7944831,20.7769886 C9.92145398,25.1476842 8.25,30.3786476 8.25,36 C8.25,51.3259018 20.6740982,63.75 36,63.75 C42.2291078,63.75 47.9788491,61.6975883 52.6098705,58.2321183 L55.930069,61.3563149 C50.444238,65.674153 43.5229296,68.25 36,68.25 C18.1888168,68.25 3.75,53.8111832 3.75,36 C3.75,29.1836121 5.86472873,22.8611455 9.47389883,17.6528876 Z M10.5466159,7.36583985 L66.5466159,60.3658399 C67.4491376,61.2200122 67.4883325,62.6440941 66.6341601,63.5466159 C65.7799878,64.4491376 64.3559059,64.4883325 63.4533841,63.6341601 L7.45338414,10.6341601 C6.55086241,9.7799878 6.5116675,8.35590587 7.36583985,7.45338414 C8.2200122,6.55086241 9.64409413,6.5116675 10.5466159,7.36583985 Z M23.5706043,35.8888817 L33.2499989,45.324 L33.2499989,40.02 L37.7499989,44.253 L37.7499989,46.299 L38.818,45.258 L42.099,48.344 L37.7102136,52.6229689 C36.7587254,53.5505305 35.2412746,53.5505305 34.2897864,52.6229689 L20.4293957,39.1111183 C19.5395996,38.2436975 19.5214609,36.8191917 20.3888817,35.9293957 C21.2563025,35.0395996 22.6808083,35.0214609 23.5706043,35.8888817 Z M36,3.75 C53.8111832,3.75 68.25,18.1888168 68.25,36 C68.25,42.0362889 66.5916122,47.6852405 63.7056013,52.5160902 L60.3364031,49.3450226 C62.512335,45.3853526 63.75,40.8372124 63.75,36 C63.75,20.6740982 51.3259018,8.25 36,8.25 C30.5567647,8.25 25.4795707,9.81720938 21.1950318,12.5250144 L17.8250746,9.35540043 C23.0002277,5.81848433 29.2585536,3.75 36,3.75 Z M51.6111183,35.9293957 C52.4785391,36.8191917 52.4604004,38.2436975 51.5706043,39.1111183 L50.532,40.123 L47.251,37.036 L48.4293957,35.8888817 C49.3191917,35.0214609 50.7436975,35.0395996 51.6111183,35.9293957 Z M35.5,17.75 C36.7426407,17.75 37.75,18.7573593 37.75,20 L37.75,28.099 L33.25,23.865 L33.25,20 C33.25,18.7573593 34.2573593,17.75 35.5,17.75 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/edit_stars.svg b/Telegram/Resources/icons/menu/edit_stars.svg
new file mode 100644
index 00000000000000..228638acb7470f
--- /dev/null
+++ b/Telegram/Resources/icons/menu/edit_stars.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M4.551472,18.848528 Q4.551472,19.448528 5.151472,19.448528 L8.576955,19.448528 Q9.076955,19.448528 9.430509,19.094975 L19.202082,9.323402 Q20.262742,8.262742 19.202082,7.202082 L16.797918,4.797918 Q15.737258,3.737258 14.676598,4.797918 L4.905025,14.569491 Q4.551472,14.923045 4.551472,15.423045 Z M5.751472,18.248528 L5.751472,15.420101 L12.838120,8.333452 L15.666548,11.161880 L8.579899,18.248528 Z M13.686649,7.484924 L15.171573,6.000000 Q15.737258,5.434315 16.302944,6.000000 L18.000000,7.697056 Q18.565685,8.262742 18.000000,8.828427 L16.515076,10.313351 Z" fill="#FFFFFF"></path>
+        <path d="M4.5,7.3999999999999995 L5.2,8.9 L6.7,9.6 L5.2,10.299999999999999 L4.5,11.8 L3.8,10.299999999999999 L2.3,9.6 L3.8,8.9 Z" fill="#FFFFFF"></path>
+        <path d="M9.3,2.45 L9.975000000000001,3.7250000000000005 L11.25,4.4 L9.975000000000001,5.075 L9.3,6.3500000000000005 L8.625,5.075 L7.3500000000000005,4.4 L8.625,3.7250000000000005 Z" fill="#FFFFFF"></path>
+        <path d="M17.7,16.3 L18.4,17.8 L19.9,18.5 L18.4,19.2 L17.7,20.7 L17.0,19.2 L15.5,18.5 L17.0,17.8 Z" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/edit_stars_add.svg b/Telegram/Resources/icons/menu/edit_stars_add.svg
new file mode 100644
index 00000000000000..04b6a8c915ece5
--- /dev/null
+++ b/Telegram/Resources/icons/menu/edit_stars_add.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="75 74 885 885" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 485.872 154.421 C 489.97 154.046 494.423 154.058 498.509 153.897 C 550.78 151.838 601.802 157.649 650.431 177.877 C 667.745 185.111 693.731 190.279 692.097 214.216 C 691.384 224.651 681.86 237.281 671.016 236.327 C 653.387 234.776 634.559 225.215 617.678 219.534 C 596.3 212.246 574.213 207.234 551.783 204.582 C 469.584 195.653 387.24 220.083 323.211 272.396 C 261.614 321.783 217.09 396.821 208.415 475.761 C 206.956 482.079 206.614 495.229 206.281 501.694 C 204.396 538.381 211.27 573.459 219.719 608.938 C 224.462 628.854 221.439 642.528 198.953 647.477 C 194.156 648.533 186.809 645.768 183.151 642.302 C 163.893 619.135 161.813 578.405 157.609 549.212 C 156.007 530.135 155.785 487.372 158.155 469.629 C 167.611 398.838 196.617 332.034 243.259 278.161 C 304.622 206.501 391.836 162.019 485.872 154.421 z" fill="#FFFFFF"></path>
+        <path d="M 835.576 387.119 C 846.257 386.476 859.055 391.76 862.457 402.727 C 952.916 694.355 683.31 955.692 392.557 856.088 C 373.491 849.469 359.657 835.857 369.781 815.187 C 380.661 792.975 424.62 813.919 442.89 818.575 C 668.956 876.181 881.625 663.172 819.977 436.576 C 814.533 416.562 809.795 393.853 835.576 387.119 z" fill="#FFFFFF"></path>
+        <path d="M 506.655 356.237 C 507.253 356.193 507.852 356.164 508.452 356.149 C 514.915 355.965 524.437 356.269 529.019 361.243 C 541.438 374.727 538.608 402.515 538.558 419.699 C 538.336 440.88 538.437 462.063 538.862 483.24 C 564.166 484.738 591.325 483.308 616.786 483.757 C 628.64 484.306 640.998 482.703 652.742 484.688 C 679.097 489.144 678.77 502.3 675.383 523.737 C 658.032 540.009 627.072 535.994 604.59 535.956 C 582.68 535.868 560.769 535.934 538.86 536.153 C 538.481 557.735 538.358 579.321 538.491 600.907 C 538.51 618.768 539.533 641.312 536.012 658.614 C 534.681 665.156 528.901 669.767 523.287 672.977 C 479.344 684.02 486.343 635.046 486.378 606.695 L 486.523 536.072 C 464.79 535.891 443.057 535.869 421.324 536.008 C 401.889 536.033 361.672 541.339 359.068 513.56 C 355.669 477.301 396.449 483.784 422.364 483.781 C 443.752 483.956 465.14 483.733 486.52 483.113 C 486.442 461.785 482.477 380.51 492.947 364.316 C 496.294 359.139 500.844 357.43 506.655 356.237 z" fill="#FFFFFF"></path>
+        <path d="M 273.483 635.716 C 279.402 635.318 282.607 638.76 287.122 642.37 C 290.955 650.759 294.158 665.727 296.611 675.355 C 300.185 689.387 303.286 700.322 308.344 714.042 C 328.986 722.065 347.188 725.311 368.296 730.924 C 378.676 733.685 382.203 737.899 386.734 746.651 C 377.464 767.083 349.327 764.448 330.321 771.075 C 322.237 773.894 315.391 775.635 307.166 778.987 C 302.219 793.4 299.145 808.432 295.467 823.202 C 291.842 837.76 290.715 847.938 277.759 857.105 C 273.015 857.333 267.834 852.625 264.059 849.727 C 257.052 830.72 252.102 802.131 244.156 778.901 C 227.676 772.036 210.016 768.699 192.777 764.177 C 183.037 761.623 168.221 758.973 166.7 746.721 C 166.027 741.295 170.305 736.719 173.617 733.049 C 196.08 726.576 219.674 721.849 242.955 715.166 C 254.629 690.133 254.04 665.986 265.651 642.555 C 266.876 640.083 271.122 637.274 273.483 635.716 z" fill="#FFFFFF"></path>
+        <path d="M 778.555 201.873 C 779.561 201.996 780.856 202.153 782.44 202.346 C 793.311 209.755 797.518 249.625 804.521 257.463 C 819.052 273.725 842.541 270.313 863.58 283.156 L 863.691 283.532 C 863.946 284.417 865.096 288.479 865.225 289.089 C 869.022 307.019 825.422 305.382 811.604 315.971 C 793.451 329.882 798.069 353.434 786.988 372.313 C 784.987 375.721 782.996 376.704 779.456 377.455 C 778.406 377.433 773.501 377.273 772.932 376.82 C 761.115 367.408 760.692 337.63 752.125 324.294 C 746.888 313.426 728.414 309.537 716.752 306.692 C 680.1 297.753 681.643 280.476 717.76 272.848 C 723.122 271.716 733.685 268.125 739.553 266.177 C 766.027 257.386 754.066 210.621 778.555 201.873 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/edited_status.png b/Telegram/Resources/icons/menu/edited_status.png
new file mode 100644
index 00000000000000..70fb24466a33f9
Binary files /dev/null and b/Telegram/Resources/icons/menu/edited_status.png differ
diff --git a/Telegram/Resources/icons/menu/edited_status@2x.png b/Telegram/Resources/icons/menu/edited_status@2x.png
new file mode 100644
index 00000000000000..004167a148f30c
Binary files /dev/null and b/Telegram/Resources/icons/menu/edited_status@2x.png differ
diff --git a/Telegram/Resources/icons/menu/edited_status@3x.png b/Telegram/Resources/icons/menu/edited_status@3x.png
new file mode 100644
index 00000000000000..1acdf8ea936009
Binary files /dev/null and b/Telegram/Resources/icons/menu/edited_status@3x.png differ
diff --git a/Telegram/Resources/icons/menu/forwarded_status.png b/Telegram/Resources/icons/menu/forwarded_status.png
new file mode 100644
index 00000000000000..66d08a835cea53
Binary files /dev/null and b/Telegram/Resources/icons/menu/forwarded_status.png differ
diff --git a/Telegram/Resources/icons/menu/forwarded_status@2x.png b/Telegram/Resources/icons/menu/forwarded_status@2x.png
new file mode 100644
index 00000000000000..8892f4ce311519
Binary files /dev/null and b/Telegram/Resources/icons/menu/forwarded_status@2x.png differ
diff --git a/Telegram/Resources/icons/menu/forwarded_status@3x.png b/Telegram/Resources/icons/menu/forwarded_status@3x.png
new file mode 100644
index 00000000000000..e2940b1636c72d
Binary files /dev/null and b/Telegram/Resources/icons/menu/forwarded_status@3x.png differ
diff --git a/Telegram/Resources/icons/menu/hourglass.png b/Telegram/Resources/icons/menu/hourglass.png
new file mode 100644
index 00000000000000..e7389fb11a82c6
Binary files /dev/null and b/Telegram/Resources/icons/menu/hourglass.png differ
diff --git a/Telegram/Resources/icons/menu/hourglass@2x.png b/Telegram/Resources/icons/menu/hourglass@2x.png
new file mode 100644
index 00000000000000..69a579183a2515
Binary files /dev/null and b/Telegram/Resources/icons/menu/hourglass@2x.png differ
diff --git a/Telegram/Resources/icons/menu/hourglass@3x.png b/Telegram/Resources/icons/menu/hourglass@3x.png
new file mode 100644
index 00000000000000..0fcfcfab9a285c
Binary files /dev/null and b/Telegram/Resources/icons/menu/hourglass@3x.png differ
diff --git a/Telegram/Resources/icons/menu/name_hide.png b/Telegram/Resources/icons/menu/name_hide.png
new file mode 100644
index 00000000000000..0d6bb287ae7914
Binary files /dev/null and b/Telegram/Resources/icons/menu/name_hide.png differ
diff --git a/Telegram/Resources/icons/menu/name_hide@2x.png b/Telegram/Resources/icons/menu/name_hide@2x.png
new file mode 100644
index 00000000000000..8903e549d4fb34
Binary files /dev/null and b/Telegram/Resources/icons/menu/name_hide@2x.png differ
diff --git a/Telegram/Resources/icons/menu/name_hide@3x.png b/Telegram/Resources/icons/menu/name_hide@3x.png
new file mode 100644
index 00000000000000..88b94bc5fbb8f9
Binary files /dev/null and b/Telegram/Resources/icons/menu/name_hide@3x.png differ
diff --git a/Telegram/Resources/icons/menu/name_show.png b/Telegram/Resources/icons/menu/name_show.png
new file mode 100644
index 00000000000000..93cad5d875601f
Binary files /dev/null and b/Telegram/Resources/icons/menu/name_show.png differ
diff --git a/Telegram/Resources/icons/menu/name_show@2x.png b/Telegram/Resources/icons/menu/name_show@2x.png
new file mode 100644
index 00000000000000..486d0a24def846
Binary files /dev/null and b/Telegram/Resources/icons/menu/name_show@2x.png differ
diff --git a/Telegram/Resources/icons/menu/name_show@3x.png b/Telegram/Resources/icons/menu/name_show@3x.png
new file mode 100644
index 00000000000000..20418ed26fd3d2
Binary files /dev/null and b/Telegram/Resources/icons/menu/name_show@3x.png differ
diff --git a/Telegram/Resources/icons/menu/nft_takeoff.png b/Telegram/Resources/icons/menu/nft_takeoff.png
new file mode 100644
index 00000000000000..464d149bdca3a7
Binary files /dev/null and b/Telegram/Resources/icons/menu/nft_takeoff.png differ
diff --git a/Telegram/Resources/icons/menu/nft_takeoff@2x.png b/Telegram/Resources/icons/menu/nft_takeoff@2x.png
new file mode 100644
index 00000000000000..6603a81947ec0c
Binary files /dev/null and b/Telegram/Resources/icons/menu/nft_takeoff@2x.png differ
diff --git a/Telegram/Resources/icons/menu/nft_takeoff@3x.png b/Telegram/Resources/icons/menu/nft_takeoff@3x.png
new file mode 100644
index 00000000000000..bd0d91eaf9e5ae
Binary files /dev/null and b/Telegram/Resources/icons/menu/nft_takeoff@3x.png differ
diff --git a/Telegram/Resources/icons/menu/nft_wear.png b/Telegram/Resources/icons/menu/nft_wear.png
new file mode 100644
index 00000000000000..868711c1b7bd46
Binary files /dev/null and b/Telegram/Resources/icons/menu/nft_wear.png differ
diff --git a/Telegram/Resources/icons/menu/nft_wear@2x.png b/Telegram/Resources/icons/menu/nft_wear@2x.png
new file mode 100644
index 00000000000000..d94838dbef3d25
Binary files /dev/null and b/Telegram/Resources/icons/menu/nft_wear@2x.png differ
diff --git a/Telegram/Resources/icons/menu/nft_wear@3x.png b/Telegram/Resources/icons/menu/nft_wear@3x.png
new file mode 100644
index 00000000000000..35545df8963d06
Binary files /dev/null and b/Telegram/Resources/icons/menu/nft_wear@3x.png differ
diff --git a/Telegram/Resources/icons/menu/order_date.png b/Telegram/Resources/icons/menu/order_date.png
new file mode 100644
index 00000000000000..c5c1391e4d85a0
Binary files /dev/null and b/Telegram/Resources/icons/menu/order_date.png differ
diff --git a/Telegram/Resources/icons/menu/order_date@2x.png b/Telegram/Resources/icons/menu/order_date@2x.png
new file mode 100644
index 00000000000000..60e5f56da388e6
Binary files /dev/null and b/Telegram/Resources/icons/menu/order_date@2x.png differ
diff --git a/Telegram/Resources/icons/menu/order_date@3x.png b/Telegram/Resources/icons/menu/order_date@3x.png
new file mode 100644
index 00000000000000..9efac756f4d1dd
Binary files /dev/null and b/Telegram/Resources/icons/menu/order_date@3x.png differ
diff --git a/Telegram/Resources/icons/menu/order_number.png b/Telegram/Resources/icons/menu/order_number.png
new file mode 100644
index 00000000000000..1771ee9f71bc5a
Binary files /dev/null and b/Telegram/Resources/icons/menu/order_number.png differ
diff --git a/Telegram/Resources/icons/menu/order_number@2x.png b/Telegram/Resources/icons/menu/order_number@2x.png
new file mode 100644
index 00000000000000..3cd11faad9afb1
Binary files /dev/null and b/Telegram/Resources/icons/menu/order_number@2x.png differ
diff --git a/Telegram/Resources/icons/menu/order_number@3x.png b/Telegram/Resources/icons/menu/order_number@3x.png
new file mode 100644
index 00000000000000..a779b671310ee4
Binary files /dev/null and b/Telegram/Resources/icons/menu/order_number@3x.png differ
diff --git a/Telegram/Resources/icons/menu/order_price.png b/Telegram/Resources/icons/menu/order_price.png
new file mode 100644
index 00000000000000..56f780814ec51a
Binary files /dev/null and b/Telegram/Resources/icons/menu/order_price.png differ
diff --git a/Telegram/Resources/icons/menu/order_price@2x.png b/Telegram/Resources/icons/menu/order_price@2x.png
new file mode 100644
index 00000000000000..ff726b8866196f
Binary files /dev/null and b/Telegram/Resources/icons/menu/order_price@2x.png differ
diff --git a/Telegram/Resources/icons/menu/order_price@3x.png b/Telegram/Resources/icons/menu/order_price@3x.png
new file mode 100644
index 00000000000000..f0e4c871228165
Binary files /dev/null and b/Telegram/Resources/icons/menu/order_price@3x.png differ
diff --git a/Telegram/Resources/icons/menu/quality_hd.svg b/Telegram/Resources/icons/menu/quality_hd.svg
new file mode 100644
index 00000000000000..1d4378221f0d44
--- /dev/null
+++ b/Telegram/Resources/icons/menu/quality_hd.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M7.142857,5.4 L16.857143,5.4 C19.068542,5.4 20.857143,7.188601 20.857143,9.4 L20.857143,14.6 C20.857143,16.811399 19.068542,18.6 16.857143,18.6 L7.142857,18.6 C4.931458,18.6 3.142857,16.811399 3.142857,14.6 L3.142857,9.4 C3.142857,7.188601 4.931458,5.4 7.142857,5.4 Z M7.142857,6.6 C5.594716,6.6 4.342857,7.851859 4.342857,9.4 L4.342857,14.6 C4.342857,16.148141 5.594716,17.4 7.142857,17.4 L16.857143,17.4 C18.405284,17.4 19.657143,16.148141 19.657143,14.6 L19.657143,9.4 C19.657143,7.851859 18.405284,6.6 16.857143,6.6 L7.142857,6.6 Z M6.925,8.85 L8.225,8.85 L8.225,11.4 L10.225,11.4 L10.225,8.85 L11.525,8.85 L11.525,15.15 L10.225,15.15 L10.225,12.6 L8.225,12.6 L8.225,15.15 L6.925,15.15 L6.925,8.85 Z M12.725,8.85 L14.725,8.85 C16.466907,8.85 17.875,10.258093 17.875,12.0 C17.875,13.741907 16.466907,15.15 14.725,15.15 L12.725,15.15 L12.725,8.85 Z M14.025,10.05 L14.025,13.95 L14.725,13.95 C15.802321,13.95 16.675,13.077321 16.675,12.0 C16.675,10.922679 15.802321,10.05 14.725,10.05 L14.025,10.05 Z" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/rating_gifts.svg b/Telegram/Resources/icons/menu/rating_gifts.svg
new file mode 100644
index 00000000000000..ed3aa9d4b1d9ff
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rating_gifts.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / rating_gifts</title>
+    <g id="Icon-/-Menu-/-rating_gifts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M9.49180328,1 C11.2844653,1 12.6018066,2.18644541 12.6018066,3.65 C12.6018066,5.11355459 11.2844653,6.3 9.49180328,6.3 C7.6991413,6.3 6.24590164,5.11355459 6.24590164,3.65 C6.24590164,2.18644541 7.6991413,1 9.49180328,1 Z M9.49180328,2.2 C8.31430075,2.2 7.44590164,2.90897331 7.44590164,3.65 C7.44590164,4.39102669 8.31430075,5.1 9.49180328,5.1 C10.6309547,5.1 11.4018066,4.43203043 11.4018066,3.65 C11.4018066,2.86796957 10.6309547,2.2 9.49180328,2.2 Z" id="Oval" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M14.5081967,1 C16.3008587,1 17.7540984,2.18644541 17.7540984,3.65 C17.7540984,5.11355459 16.3008587,6.3 14.5081967,6.3 C12.7155347,6.3 11.4638672,5.11355459 11.4638672,3.65 C11.4638672,2.18644541 12.7155347,1 14.5081967,1 Z M14.5081967,2.2 C13.3883731,2.2 12.6638672,2.84700401 12.6638672,3.65 C12.6638672,4.45299599 13.3883731,5.1 14.5081967,5.1 C15.6856993,5.1 16.5540984,4.39102669 16.5540984,3.65 C16.5540984,2.90897331 15.6856993,2.2 14.5081967,2.2 Z" id="Oval" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M19.5245902,5.2245614 C20.6708074,5.2245614 21.6,6.15375404 21.6,7.29997124 L21.6,9.62036238 C21.6,10.2776718 21.0671455,10.8105263 20.4098361,10.8105263 L3.59016393,10.8105263 C2.93285454,10.8105263 2.4,10.2776718 2.4,9.62036238 L2.4,7.29997124 C2.4,6.15375404 3.32919263,5.2245614 4.47540984,5.2245614 L19.5245902,5.2245614 Z M19.5245902,6.4245614 L4.47540984,6.4245614 C3.99193433,6.4245614 3.6,6.81649574 3.6,7.29997124 L3.6,9.6095614 L20.4,9.6095614 L20.4,7.29997124 C20.4,6.85368616 20.0660441,6.48540066 19.6343997,6.43138209 L19.5245902,6.4245614 Z" id="Rectangle" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M5.07540984,10.7953216 L5.07540984,18.3761864 C5.07540984,19.3485697 5.86368226,20.1368421 6.83606557,20.1368421 L17.1639344,20.1368421 C18.1363177,20.1368421 18.9245902,19.3485697 18.9245902,18.3761864 L18.9245902,10.7953216 L20.1245902,10.7953216 L20.1245902,18.3761864 C20.1245902,20.0113114 18.7990594,21.3368421 17.1639344,21.3368421 L6.83606557,21.3368421 C5.20094056,21.3368421 3.87540984,20.0113114 3.87540984,18.3761864 L3.87540984,10.7953216 L5.07540984,10.7953216 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <polygon id="Path" fill="#FFFFFF" fill-rule="nonzero" points="11.4 6.11695906 11.4 21 12.6 21 12.6 6.11695906"></polygon>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/rating_refund.svg b/Telegram/Resources/icons/menu/rating_refund.svg
new file mode 100644
index 00000000000000..05434da66a2cda
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rating_refund.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / rating_refund</title>
+    <g id="Icon-/-Menu-/-rating_refund" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M9.58495703,2.34314741 C14.845204,0.914046898 20.2520851,4.07916838 21.661564,9.41264412 C23.0710429,14.7461199 19.9493787,20.2282711 14.6891317,21.6573716 C9.70832403,23.0105542 4.55852362,20.241996 2.84766326,15.3548697 L2.79687536,15.2061286 C2.7724639,15.132795 2.65678419,14.7396157 2.52176727,14.2756688 L2.02361181,12.5403036 C1.92527607,12.1682007 2.1430666,11.785725 2.51006058,11.6860203 C2.87705455,11.5863156 3.25427881,11.807138 3.35261455,12.179241 L3.59432993,13.0275538 C3.80113943,13.7451404 4.06828557,14.6632038 4.10050903,14.760005 C5.52633258,19.0432668 10.0041242,21.485941 14.3330265,20.3098676 C18.8592855,19.0801764 21.5453687,14.3629766 20.3325613,9.77370673 C19.1197538,5.18443691 14.4673212,2.46096029 9.94106224,3.69065143 C7.52370963,4.34739623 5.56035445,6.02376558 4.49357103,8.2653952 C4.32845825,8.61234632 3.91721015,8.75789206 3.57502268,8.59048072 C3.23283521,8.42306937 3.08928781,8.00609621 3.25440059,7.65914509 C4.49336656,5.05570865 6.77676829,3.10607433 9.58495703,2.34314741 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M2.49794681,3.90217796 C2.49794681,3.51694863 2.80594913,3.20465855 3.18588925,3.20465855 C3.56582936,3.20465855 3.87383169,3.51694863 3.87383169,3.90217796 L3.87360558,7.52173176 L6.91980245,7.41555441 C7.2814361,7.4029357 7.58746725,7.67568116 7.62708143,8.03426422 L7.63099908,8.08867052 C7.64406681,8.47367193 7.34684021,8.79651819 6.96712488,8.80976784 L3.24117729,8.93977968 C2.86111038,8.95304159 2.53984537,8.66451926 2.50172057,8.28653895 L2.49800979,8.22097241 L2.49794681,3.90217796 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M12.3540269,17.3251877 C12.6431336,17.3251877 12.9561718,17.1659567 12.9561718,16.7838024 L12.9561718,16.1901404 C14.6843872,16.0054325 15.7076642,14.9990928 15.7076642,13.5341679 C15.7076642,12.2730587 14.9431377,11.50875 13.3562633,11.1648111 L12.0520711,10.8718262 C11.2361478,10.6934875 10.8378231,10.3240717 10.8378231,9.78268638 C10.8378231,9.13302405 11.4031872,8.66170039 12.289781,8.66170039 C13.0093353,8.66170039 13.5104536,8.90373146 14.0693931,9.5215476 C14.3520752,9.81453257 14.5705113,9.92280963 14.8660426,9.92280963 C15.2258197,9.92280963 15.5020772,9.67440933 15.5020772,9.30499349 C15.5020772,8.94831613 15.2900657,8.55979258 14.9302885,8.20948446 C14.4548686,7.76363776 13.7920916,7.47065278 12.9890176,7.36874497 L12.9890176,6.69989325 C12.9890176,6.32410818 12.6816811,6.16487722 12.3861499,6.16487722 C12.0970432,6.16487722 11.7838443,6.31773894 11.7838443,6.69989325 L11.7838443,7.34963725 C10.1198749,7.50249898 9.11603231,8.48973095 9.11603231,9.90370191 C9.11603231,11.1393342 9.88055881,11.960966 11.3453659,12.2857971 L12.6495582,12.5851513 C13.6003978,12.8080747 13.992298,13.1392751 13.992298,13.6997681 C13.992298,14.4258613 13.4205093,14.8844465 12.3989991,14.8844465 C11.6344726,14.8844465 10.9984379,14.5978307 10.4202246,13.9800146 C10.0925704,13.6551834 9.91268177,13.5851218 9.66854726,13.5851218 C9.27664712,13.5851218 8.98111587,13.8335221 8.98111587,14.2602611 C8.98111587,14.6360462 9.19955201,15.0245697 9.59145215,15.3621394 C10.1054195,15.8270938 10.852439,16.1137095 11.7454573,16.1965096 L11.7454573,16.7838024 C11.7454573,17.1659567 12.0584957,17.3251877 12.3540269,17.3251877 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/reorder.svg b/Telegram/Resources/icons/menu/reorder.svg
new file mode 100644
index 00000000000000..93139b367e1b7b
--- /dev/null
+++ b/Telegram/Resources/icons/menu/reorder.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / reorder</title>
+    <g id="Icon-/-Menu-/-reorder" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M20.4060728,15.0078431 C21.2543281,15.0078431 21.9419748,15.6954899 21.9419748,16.5437451 L21.9419748,19.064098 C21.9419748,19.9123532 21.2543281,20.6 20.4060728,20.6 L17.9103341,20.6 C17.0620789,20.6 16.3744321,19.9123532 16.3744321,19.064098 L16.3744321,16.5437451 C16.3744321,15.6954899 17.0620789,15.0078431 17.9103341,15.0078431 L20.4060728,15.0078431 Z M16.6624648,3.4 C18.1998993,3.4 19.4462362,4.64633689 19.4462362,6.18377135 L19.446,10.561 L21.5745455,8.42203928 C21.782239,8.21317523 22.105482,8.18912467 22.339778,8.35046222 L22.4230702,8.41965499 C22.6580423,8.65331023 22.6591098,9.03320772 22.4254545,9.26817977 L19.3380547,12.3729793 C19.0636746,12.6458372 18.6245193,12.6446032 18.3544177,12.3729793 L15.2670178,9.26817977 C15.0333625,9.03320772 15.03443,8.65331023 15.2694021,8.41965499 C15.5043741,8.18599974 15.8842716,8.18706723 16.1179268,8.42203928 L18.246,10.563 L18.2462362,6.18377135 C18.2462362,5.30907859 17.5371576,4.6 16.6624648,4.6 L6.36754271,4.6 C5.49284994,4.6 4.78377135,5.30907859 4.78377135,6.18377135 L4.783,15.007 L5.4316407,15.0078431 C6.27989595,15.0078431 6.96754271,15.6954899 6.96754271,16.5437451 L6.96754271,19.064098 C6.96754271,19.9123532 6.27989595,20.6 5.4316407,20.6 L2.93590201,20.6 C2.08764675,20.6 1.4,19.9123532 1.4,19.064098 L1.4,16.5437451 C1.4,15.6954899 2.08764675,15.0078431 2.93590201,15.0078431 L3.583,15.007 L3.58377135,6.18377135 C3.58377135,4.64633689 4.83010824,3.4 6.36754271,3.4 L16.6624648,3.4 Z M12.9188568,15.0078431 C13.767112,15.0078431 14.4547588,15.6954899 14.4547588,16.5437451 L14.4547588,19.064098 C14.4547588,19.9123532 13.767112,20.6 12.9188568,20.6 L10.4231181,20.6 C9.57486282,20.6 8.88721607,19.9123532 8.88721607,19.064098 L8.88721607,16.5437451 C8.88721607,15.6954899 9.57486282,15.0078431 10.4231181,15.0078431 L12.9188568,15.0078431 Z M20.4060728,16.2078431 L17.9103341,16.2078431 C17.7248206,16.2078431 17.5744321,16.3582316 17.5744321,16.5437451 L17.5744321,19.064098 C17.5744321,19.2496115 17.7248206,19.4 17.9103341,19.4 L20.4060728,19.4 C20.5915864,19.4 20.7419748,19.2496115 20.7419748,19.064098 L20.7419748,16.5437451 C20.7419748,16.3582316 20.5915864,16.2078431 20.4060728,16.2078431 Z M5.4316407,16.2078431 L2.93590201,16.2078431 C2.75038845,16.2078431 2.6,16.3582316 2.6,16.5437451 L2.6,19.064098 C2.6,19.2496115 2.75038845,19.4 2.93590201,19.4 L5.4316407,19.4 C5.61715425,19.4 5.76754271,19.2496115 5.76754271,19.064098 L5.76754271,16.5437451 C5.76754271,16.3582316 5.61715425,16.2078431 5.4316407,16.2078431 Z M12.9188568,16.2078431 L10.4231181,16.2078431 C10.2376045,16.2078431 10.0872161,16.3582316 10.0872161,16.5437451 L10.0872161,19.064098 C10.0872161,19.2496115 10.2376045,19.4 10.4231181,19.4 L12.9188568,19.4 C13.1043703,19.4 13.2547588,19.2496115 13.2547588,19.064098 L13.2547588,16.5437451 C13.2547588,16.3582316 13.1043703,16.2078431 12.9188568,16.2078431 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/rich/blockquote.svg b/Telegram/Resources/icons/menu/rich/blockquote.svg
new file mode 100644
index 00000000000000..7b99a191456aa4
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rich/blockquote.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="176 25 1750 1750" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 381.594 296.386 C 410.645 295.433 443.296 296.178 472.583 296.181 L 638.694 296.16 L 1150.39 296.157 L 1526.08 296.167 L 1645.64 296.085 C 1666.93 296.062 1688.83 295.751 1710.03 296.347 C 1724.43 297.103 1735.71 299.471 1747.4 308.203 C 1773.76 327.91 1780.11 366.464 1759.7 392.741 C 1747.15 408.905 1733.23 414.469 1713.23 416.945 C 1684.03 417.895 1650.82 417.13 1621.37 417.13 L 1448.97 417.128 L 927.915 417.121 L 561.582 417.146 L 443.244 417.156 C 425.352 417.156 396.674 418.632 379.436 416.771 C 304.588 408.689 301.485 305.408 381.594 296.386 z M 379.571 1384.39 C 385.115 1383.46 412.558 1383.87 419.226 1383.89 L 499.173 1383.97 L 805.998 1383.97 L 1412.93 1383.97 L 1612.71 1383.96 C 1645.03 1383.95 1677.61 1383.74 1709.94 1383.92 C 1722.23 1383.99 1735.87 1388.38 1745.99 1395.54 C 1759.41 1404.93 1768.46 1419.35 1771.1 1435.52 C 1773.53 1451.04 1769.61 1466.89 1760.2 1479.47 C 1748.68 1494.98 1733.92 1502.03 1715.26 1504.62 C 1692.9 1505.98 1660.84 1504.97 1637.92 1504.94 L 1499.55 1504.92 L 1060.41 1504.95 L 608.88 1504.95 L 461.022 1504.99 C 440.093 1505 419.154 1505.07 398.225 1504.99 C 378.436 1504.91 361.724 1504.83 345.676 1491.88 C 332.984 1481.82 324.858 1467.09 323.118 1450.99 C 319.354 1415.22 344.356 1387.44 379.571 1384.39 z M 986.57 659.423 C 995.068 658.388 1014.88 658.787 1023.74 658.8 L 1086.39 658.87 L 1303.27 658.845 L 1578.18 658.832 L 1664.95 658.84 C 1693.15 658.846 1726.71 654.386 1749.85 672.678 C 1762.02 682.183 1769.76 696.271 1771.24 711.644 C 1775.12 750.081 1749.6 775.831 1712.4 779.515 C 1661.76 781.02 1604.9 779.811 1553.88 779.818 L 1252.78 779.83 L 1074.15 779.813 C 1047.95 779.809 1021.73 779.871 995.533 779.687 C 978.09 779.565 961.597 777.932 948.143 765.47 C 905.851 726.299 928.093 663.606 986.57 659.423 z M 988.986 1021.45 L 1480.2 1021.37 L 1635.14 1021.36 C 1662.42 1021.36 1691.27 1020.69 1718.45 1022.38 C 1730.83 1023.15 1740.77 1027.55 1750.37 1035.58 C 1762.68 1046.06 1770.31 1061.02 1771.56 1077.14 C 1773.71 1104.41 1756.39 1131.69 1729.6 1139.19 C 1723.04 1141.02 1717.69 1141.38 1710.88 1141.91 C 1657.59 1143.22 1600.56 1142.23 1547.06 1142.22 L 1248.88 1142.24 L 1073.8 1142.24 C 1043.61 1142.24 1013.33 1142.71 983.174 1141.56 C 953.351 1140.43 928.906 1115.93 926.55 1086.45 C 925.417 1070.33 930.722 1054.42 941.301 1042.2 C 954.569 1027.15 969.769 1022.74 988.986 1021.45 z M 506.131 659.031 C 507.65 660.272 529.49 697.154 531.868 701.068 C 524.89 706.311 510.914 713.754 502.923 718.497 C 490.974 725.631 479.442 733.44 468.383 741.888 C 418.453 779.552 399.216 815.231 390.794 875.324 C 432.561 875.377 486.096 874.25 508.446 916.446 C 532.074 961.055 513.539 1013.58 470.046 1036.1 C 429.228 1050.58 369.621 1039.18 346.669 999.451 C 322.32 957.31 317.643 901.231 327.353 853.848 C 331.944 831.446 342.399 811.985 354.249 792.826 C 393.45 728.802 444.712 697.435 506.131 659.031 z M 767.337 659.978 C 772.342 661.749 788.25 693.832 794.27 701.346 C 722.576 742.192 660.121 784.83 653.102 875.137 C 680.36 875.815 701.361 873.552 728.078 882.343 C 797.957 905.338 797.13 1005.89 732.273 1035.64 C 712.255 1043.59 680.435 1042.84 659.894 1037.19 C 636.774 1030.84 618.359 1016.89 606.778 995.574 C 583.149 952.09 578.489 892.235 591.77 844.56 C 597.447 824.18 605.657 810.372 616.206 793.2 C 644.784 746.677 684.816 712.21 730.426 683.174 C 742.582 675.435 754.444 667.064 767.337 659.978 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/rich/bullet_list.svg b/Telegram/Resources/icons/menu/rich/bullet_list.svg
new file mode 100644
index 00000000000000..36fb9d099c435d
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rich/bullet_list.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="133 -13 1739 1739" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 742.94 1298.42 C 809.544 1297.7 877.257 1298.29 943.95 1298.31 L 1312.1 1298.3 L 1543.3 1298.29 C 1583.2 1298.29 1623.13 1298.09 1663.02 1298.5 C 1679.07 1298.67 1691.49 1301.54 1704.36 1311.32 C 1716.89 1321.03 1725.05 1335.32 1727.04 1351.05 C 1729.17 1367.39 1724.59 1383.89 1714.34 1396.78 C 1702.48 1411.47 1687.01 1417 1668.87 1419.02 C 1598.6 1419.92 1526.58 1419.18 1456.18 1419.18 L 1055.12 1419.19 L 844.558 1419.2 L 777.994 1419.21 C 750.68 1419.19 725.152 1422.95 702.763 1404.3 C 690.628 1394.23 683.106 1379.66 681.92 1363.93 C 680.573 1347.85 685.749 1331.91 696.282 1319.7 C 709.256 1304.58 723.701 1299.85 742.94 1298.42 z M 749.429 332.46 L 1364.75 332.423 L 1568.33 332.378 L 1630.83 332.375 C 1645.19 332.378 1658.47 332.346 1672.9 333.315 C 1723.42 336.707 1745.39 398.751 1710.28 434.452 C 1695.5 449.489 1682.39 452.61 1661.53 453.132 L 1031.44 453.112 L 835.065 453.134 L 775.197 453.141 C 762.649 453.15 750.514 453.238 737.934 452.579 C 686.999 449.907 663.787 387.885 698.229 351.076 C 713.372 334.892 728.436 333.219 749.429 332.46 z M 733.986 816.261 C 749.227 814.965 769.146 815.524 784.756 815.546 L 866.641 815.615 L 1129.69 815.602 L 1488.8 815.595 L 1605.25 815.601 C 1626.87 815.603 1648.17 815.572 1670.01 815.925 C 1695.47 815.762 1720.81 836.711 1725.93 861.642 C 1733.41 898.058 1712.2 927.712 1676.81 935.147 C 1665.66 936.647 1645.63 936.15 1633.77 936.145 L 1563.02 936.085 L 1317.4 936.091 L 932.104 936.105 L 806.031 936.111 C 783.79 936.109 761.121 936.329 738.883 935.762 C 727.845 935.48 716.862 931.561 707.699 925.354 C 694.57 916.379 685.578 902.524 682.728 886.878 C 676.015 851.044 699.2 822.67 733.986 816.261 z M 358.803 1258.41 C 403.013 1258.04 439.178 1293.53 439.646 1337.74 C 440.113 1381.95 404.706 1418.19 360.499 1418.76 C 316.152 1419.32 279.769 1383.78 279.3 1339.43 C 278.831 1295.09 314.454 1258.78 358.803 1258.41 z M 347.536 293.423 C 391.473 286.781 432.42 317.168 438.793 361.143 C 445.166 405.119 414.529 445.88 370.515 451.984 C 326.88 458.035 286.547 427.719 280.229 384.122 C 273.911 340.526 303.979 300.008 347.536 293.423 z M 347.172 776.497 C 390.945 769.694 431.93 799.709 438.654 843.494 C 445.379 887.28 415.29 928.211 371.493 934.857 C 327.807 941.486 287.002 911.491 280.294 867.816 C 273.586 824.142 303.509 783.283 347.172 776.497 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/rich/details.svg b/Telegram/Resources/icons/menu/rich/details.svg
new file mode 100644
index 00000000000000..2b5bc0c80cb781
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rich/details.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="-123 -111 2297 2297" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 246.414 1124.42 L 247.196 1124.39 C 282.826 1123.37 323.488 1124.3 359.551 1124.3 L 577.983 1124.31 L 1242.11 1124.32 L 1627.35 1124.29 L 1747.69 1124.29 C 1789.52 1124.29 1833.48 1117.53 1866.15 1148.47 C 1883.25 1164.45 1893.09 1186.7 1893.42 1210.09 C 1893.91 1233.41 1885.01 1255.95 1868.72 1272.65 C 1851.66 1290.03 1829.99 1297.96 1805.98 1298.33 L 733.059 1298.3 L 398.019 1298.35 L 291.066 1298.35 C 272.886 1298.35 253.852 1298.89 235.737 1297.91 C 193 1295.58 159.179 1259.52 156.316 1217.26 C 154.856 1194.09 162.751 1171.3 178.232 1154 C 197.759 1132.09 218.251 1126.12 246.414 1124.42 z M 234.316 777.332 C 249.087 775.668 284.999 776.616 301.118 776.633 L 426.433 776.684 L 849.622 776.682 L 1491.29 776.674 L 1699.95 776.658 C 1733.22 776.639 1778.09 775.335 1810.49 777.021 C 1827.93 777.852 1844.73 783.825 1858.78 794.187 C 1877.07 807.983 1889.18 828.442 1892.47 851.117 C 1895.97 873.724 1890.23 896.787 1876.55 915.122 C 1861.53 935.216 1841.91 946.491 1817.25 949.942 C 1784.25 951.517 1744.71 950.545 1711.39 950.543 L 1525 950.516 L 953.17 950.512 L 474.869 950.517 L 319.452 950.561 C 297.507 950.567 275.469 950.517 253.53 950.556 C 229.437 950.598 211.282 948.549 191.445 933.703 C 172.433 919.65 159.965 898.459 156.916 875.015 C 153.889 851.823 160.288 828.387 174.681 809.952 C 189.425 790.94 210.744 780.412 234.316 777.332 z M 1018.3 81.3706 C 1020.5 81.2739 1022.7 81.2119 1024.9 81.1847 C 1047.5 80.9564 1070.15 90.5762 1086.17 106.444 C 1097.96 118.359 1106.08 133.412 1109.56 149.81 C 1113.25 167.386 1111.69 214.772 1111.67 235.506 L 1111.76 393.594 C 1140.23 366.162 1167.43 336.974 1195.86 309.49 C 1219.37 286.765 1237.29 261.097 1271.2 254.796 C 1293.02 250.67 1315.58 255.569 1333.73 268.371 C 1353.26 281.967 1366.62 304.527 1370.89 327.76 C 1375.14 348.297 1369.06 380.582 1354.8 397.07 C 1329.32 426.512 1295.64 456.447 1267.85 484.095 L 1145.52 604.505 C 1126.27 623.645 1107.15 642.958 1087.76 661.966 C 1070.18 679.198 1057.94 686.04 1033.6 690.164 L 1029.63 690.255 C 984.78 691.042 967.574 668.015 937.965 638.37 L 893.696 594.239 L 737.822 441.296 C 707.441 411.839 677.893 389.949 677.519 344.308 C 677.37 319.271 687.22 295.209 704.882 277.462 C 720.509 261.874 741.727 253.192 763.799 253.355 C 806.894 253.528 832.72 288.317 860.866 316.466 L 938.015 393.7 L 938.035 236.591 C 938.004 217.146 936.811 168.142 939.679 152.066 C 942.259 137.74 948.398 124.293 957.534 112.961 C 972.736 93.7945 994.411 84.1162 1018.3 81.3706 z M 1016.54 1385.31 C 1041.51 1381.21 1069.01 1394.83 1086.33 1411.94 C 1107.15 1432.5 1127.66 1453.35 1148.47 1473.91 L 1269.49 1592.94 L 1322.94 1644.91 C 1333.39 1655.12 1348.15 1668.71 1356.19 1680.26 C 1366.27 1694.93 1371.82 1712.23 1372.15 1730.03 C 1372.69 1754.98 1363.13 1779.09 1345.64 1796.9 C 1329.71 1813.27 1310.21 1821.8 1287.35 1822.03 C 1272.28 1822.24 1257.45 1818.23 1244.53 1810.46 C 1228.56 1800.74 1202.16 1772.31 1187.97 1758.1 L 1111.71 1681.92 L 1111.71 1839.87 C 1111.73 1858.34 1112.87 1905.36 1110.3 1921.65 C 1108.25 1934.79 1103.14 1947.27 1095.41 1958.09 C 1080.18 1979.72 1059.56 1989.44 1034.2 1993.94 C 1031.48 1994.03 1028.77 1994.09 1026.05 1994.11 C 1002.68 1994.48 980.133 1985.47 963.45 1969.11 C 943.945 1949.64 937.44 1924.84 937.972 1898.13 C 938.345 1879.42 938.049 1860.25 938.052 1841.49 L 938.022 1681.73 C 910.058 1708.85 882.825 1737.5 854.951 1764.79 C 839.487 1778.54 824.628 1798.65 807.065 1809.44 C 751.216 1843.73 686.643 1804.69 678.287 1744.45 C 675.066 1720.1 681.664 1695.47 696.628 1675.99 C 703.422 1667 723.15 1648.27 732.204 1639.58 C 749.268 1623.34 766.151 1606.91 782.851 1590.29 L 905.023 1470.05 L 946.376 1428.71 C 969.891 1405.27 982.261 1390.28 1016.54 1385.31 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/rich/divider.svg b/Telegram/Resources/icons/menu/rich/divider.svg
new file mode 100644
index 00000000000000..7e392c330c270a
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rich/divider.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="84 92 1143 1143" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 293.896 716.313 C 338.733 714.584 393.269 716.003 438.884 716.004 L 715.015 716.009 L 915.242 716.002 L 978.122 715.963 C 996.286 715.948 1025.38 712.618 1038.96 725.361 C 1045.69 731.801 1049.54 740.682 1049.63 749.995 C 1050.01 778.442 1024.23 787.429 1000.87 785.066 C 996.236 784.598 989.004 785.069 984.15 785.07 L 918.08 785.067 L 690.732 785.132 C 688.302 863.424 692.751 946.408 690.158 1024.87 C 731.333 986.772 768.215 942.465 809.627 904.601 C 813.46 901.095 821.49 899.153 826.544 898.953 C 836.175 898.578 845.546 902.128 852.511 908.79 C 859.594 915.632 862.094 923.971 862.303 933.691 C 862.634 949.14 850.944 959.38 840.904 969.629 L 735.156 1077.79 C 716.426 1097 697.95 1117.08 678.292 1135.35 C 670.257 1143.96 649.253 1147.38 639.508 1139.22 C 614.781 1118.52 588.637 1090.74 565.898 1068.08 L 496.066 998.586 C 482.979 985.573 469.731 972.696 457.047 959.293 C 449.342 951.152 445.641 946.012 445.241 934.544 C 444.934 924.981 448.539 915.706 455.224 908.86 C 461.529 902.462 470.134 898.857 479.116 898.851 C 496.4 898.687 504.617 910.217 515.886 921.21 C 522.22 927.389 528.423 933.735 534.718 939.957 L 621.981 1026.54 L 621.994 785.187 C 547.538 784.218 471.358 785.055 396.784 785.059 L 332.243 785.061 C 317.238 785.061 289.262 787.296 277.289 779.005 C 269.731 773.691 264.557 765.628 262.876 756.544 C 259.09 735.526 273.487 719.32 293.896 716.313 z M 652.963 188.238 C 653.657 188.186 654.352 188.15 655.047 188.13 C 665.569 187.765 674.244 192.163 681.541 199.384 C 695.029 212.73 708.259 226.506 721.484 240.104 L 788.396 308.61 L 830.526 351.574 C 842.661 364.014 862.179 379.79 862.474 398.043 C 862.594 407.397 858.958 416.408 852.379 423.059 C 845.942 429.691 837.061 433.383 827.819 433.269 C 810.451 433.009 801.991 420.668 790.695 409.406 C 783.501 402.232 776.468 394.815 769.368 387.539 L 690.212 306.766 C 691.839 323.565 690.302 356.97 690.574 375.385 C 691.376 429.848 689.398 485.908 690.813 540.271 C 766.446 541.753 846.585 540.409 922.552 540.41 L 982.742 540.385 C 994.024 540.383 1011.2 539.942 1021.91 541.447 C 1028.41 542.382 1034.44 545.376 1039.1 549.989 C 1058.42 568.75 1050.05 602.831 1022.86 608.375 C 1012.31 610.525 991.826 609.376 980.348 609.376 L 908.23 609.373 L 653.5 609.334 L 404.787 609.308 L 333.783 609.4 C 315.738 609.455 286.729 612.928 273.289 600.15 C 266.466 593.761 262.552 584.859 262.457 575.512 C 262.348 560.656 273.14 543.861 288.692 541.549 C 301.782 539.603 317.886 540.363 331.312 540.375 L 396.661 540.385 L 621.934 540.523 L 622.103 305.332 C 615.554 312.442 605.721 321.319 598.627 328.286 L 557.222 369.563 L 522.257 404.381 C 514.959 411.663 507.853 419.435 499.994 425.88 C 480.414 441.935 450.218 429.993 445.851 405.348 C 444.473 398.786 445.489 387.123 449.731 381.692 C 461.109 367.125 475.845 353.54 488.973 340.508 L 552.686 277.131 L 607.478 222.464 C 621.001 209.052 633.905 191.755 652.963 188.238 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/rich/heading.svg b/Telegram/Resources/icons/menu/rich/heading.svg
new file mode 100644
index 00000000000000..a8f848b4f5381f
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rich/heading.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="63 76 1888 1888" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 318.798 235.434 C 320.317 235.384 321.836 235.343 323.355 235.311 C 360.334 234.51 400.282 235.272 437.443 235.277 L 663.297 235.262 L 777.422 235.243 C 791.056 235.241 823.364 234.447 835.498 235.976 C 849.33 237.846 862.209 244.072 872.266 253.751 C 884.446 265.813 891.426 282.159 891.714 299.298 C 891.911 316.782 885.028 333.603 872.632 345.935 C 864.612 354.084 854.457 359.807 843.332 362.446 C 826.258 366.338 786.752 365.053 767.719 365.045 L 653.105 365.076 C 652.336 430.967 653.063 498.526 653.064 564.541 L 653.078 956.022 L 1360.21 955.968 C 1361.01 879.736 1360.27 801.958 1360.28 725.588 L 1360.18 365.091 C 1310.44 364.258 1260.37 365.428 1210.49 365.046 C 1176.24 364.784 1151.11 364.591 1131.21 331.952 C 1116.84 308.4 1121.77 274.963 1140.74 255.507 C 1153.69 242.229 1170.91 235.065 1189.41 235.342 C 1227.73 235.225 1266.15 235.26 1304.48 235.262 L 1529.74 235.292 L 1641.93 235.235 C 1656.98 235.226 1688.88 234.361 1702.51 236.284 C 1715.67 238.14 1727.9 244.164 1737.4 253.474 C 1749.74 265.281 1756.78 281.582 1756.92 298.665 C 1757.31 332.223 1732.69 361.305 1698.75 364.096 C 1677.18 365.87 1654.41 365.05 1632.68 365.048 L 1518.92 364.985 C 1518.33 414.244 1518.87 464.68 1518.87 514.012 L 1518.87 805.05 L 1518.88 1676.85 L 1637.63 1676.82 C 1653.55 1676.8 1688.96 1675.97 1702.69 1678.12 C 1711.1 1679.47 1719.16 1682.52 1726.35 1687.09 C 1741.1 1696.3 1751.57 1710.99 1755.47 1727.93 C 1759.29 1744.75 1756.13 1762.41 1746.71 1776.85 C 1734.96 1794.88 1719.96 1801.78 1699.82 1806.16 L 1699 1806.18 C 1660.89 1807.16 1619.3 1806.37 1581 1806.37 L 1355.88 1806.36 L 1240.9 1806.35 C 1219.31 1806.35 1195.32 1807.34 1174.08 1804.78 C 1162.76 1803.41 1151.6 1796.64 1143.38 1788.76 C 1130.59 1776.57 1123.2 1759.78 1122.85 1742.11 C 1122.51 1720.14 1135.84 1697.11 1154.76 1686.23 C 1177.95 1672.9 1215.1 1676.78 1241.59 1676.8 L 1360.17 1676.8 C 1361.13 1610.79 1360.27 1542.5 1360.27 1476.34 L 1360.27 1085.87 C 1270.55 1084.81 1178.87 1085.75 1089.02 1085.74 L 653.057 1085.84 L 653.131 1676.75 C 714.06 1678.08 777.258 1674.8 838.22 1678.15 C 848.143 1678.69 863.162 1687.26 870.643 1693.94 C 883.355 1705.39 890.945 1721.46 891.716 1738.56 C 892.687 1755.82 886.628 1772.75 874.92 1785.48 C 862.461 1798.94 845.711 1806.2 827.512 1806.31 C 789.791 1806.55 751.942 1806.36 714.225 1806.34 L 499.466 1806.35 L 375.147 1806.37 C 355.515 1806.37 333.722 1806.78 314.224 1805.86 C 302.355 1805.3 285.954 1796.59 277.239 1788.2 C 265.019 1776.32 258.027 1760.07 257.807 1743.03 C 257.553 1725.38 263.59 1708.91 275.998 1696.44 C 291.121 1681.25 309.066 1676.81 329.944 1676.84 C 346.608 1676.86 363.218 1676.8 379.82 1676.8 L 494.7 1676.88 L 494.753 364.98 L 376.35 365.058 C 359.107 365.064 323.974 366.039 308.975 363.165 C 299.059 361.18 289.758 356.862 281.844 350.567 C 236.492 314.608 257.082 242.107 318.798 235.434 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/rich/math.svg b/Telegram/Resources/icons/menu/rich/math.svg
new file mode 100644
index 00000000000000..064f32eed301be
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rich/math.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="38 75 905 905" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 380.003 151.159 C 402.581 149.201 418.63 160.332 423.991 182.571 C 422.424 189.292 421.273 191.821 418.503 198.068 C 362.011 204.938 402.908 168.051 400.088 159.985 C 378.904 150.249 372.018 174.985 367.439 190.05 C 340.982 277.09 328.76 370.178 313.023 459.477 C 297.334 544.758 279.36 629.602 259.117 713.918 C 247.764 762.559 224.482 896.442 165.928 904.718 C 164.643 904.794 163.358 904.856 162.072 904.905 C 150.3 905.336 142.02 902.202 133.03 894.117 C 125.208 887.082 116.783 871.185 126.1 861.964 C 132.513 855.617 141.987 856.902 150.324 857.182 C 165.835 879.355 146.949 883.348 146.479 895.12 C 150.171 899.195 160.601 897.874 165.919 897.745 C 196.777 881.18 210.355 799.431 217.296 767.312 C 227.089 721.994 233.822 674.815 241.666 629.07 C 255.879 549.391 271.999 470.064 290.014 391.157 C 297.009 359.461 304.547 327.887 312.627 296.45 C 322.692 256.188 340.116 169.99 380.003 151.159 z M 666.512 375.432 C 669.178 375.333 670.968 374.925 673.135 376.328 C 678.983 390.298 612.073 591.301 626.502 605.291 C 631.204 606.657 636.86 605.973 641.834 605.705 C 656.4 590.556 653.756 576.252 663.307 559.505 C 663.805 558.631 665.522 559.16 666.449 559.279 L 668.061 561.407 C 668.325 565.712 665.753 576.731 664.476 581.22 C 657.681 605.098 650.954 608.146 631.473 619.267 C 615.888 609.603 609.196 612.535 601.924 592.056 C 595.392 598.642 589.607 604.076 581.823 609.139 C 577.978 610.706 559.818 618.238 557.048 618.136 C 549.372 617.854 531.568 609.17 526.604 602.917 C 514.899 588.172 512.046 573.132 513.248 555.179 C 515.153 526.746 529.962 499.841 551.28 481.466 C 563.853 470.628 579.478 461.583 596.601 463.187 C 612.701 464.696 616.496 471.032 626.055 482.346 C 630.339 460.931 642.019 419.587 648.382 398.219 C 637.688 388.934 628.025 387.872 614.466 384.586 C 620.158 383.246 628.015 382.888 634.245 381.637 C 645.106 379.455 655.487 375.883 666.512 375.432 z M 589.301 470.186 C 597.059 469.829 599.689 470.264 606.811 473.64 C 616.219 477.526 622.875 495.873 620.297 505.099 C 611.445 536.777 608.617 594.747 570.478 605.85 C 566.238 606.06 551.631 607.041 548.215 605.274 C 530.743 596.11 537.992 567.059 540.549 551.584 C 545.413 522.144 558.571 481.849 589.301 470.186 z M 742.441 463.337 C 769.892 461.236 769.746 467.889 786.065 484.845 C 789.503 483.649 796.101 474.506 801.045 470.864 C 814.41 461.02 825.476 462.301 840.646 464.326 C 848.798 471.144 855.965 476.944 854.653 488.892 C 852.535 508.181 819.872 512.21 823.038 488.815 C 824.06 481.268 835.578 475.192 841.516 471.509 C 817.498 468.877 801.777 470.302 793.555 495.781 C 787.514 514.504 763.314 590.743 776.866 603.942 C 783.86 607.522 796.563 606.075 804.797 605.723 C 819.566 596.254 825.621 587.456 832.466 571.431 C 834.337 567.051 836.458 561.928 839.902 558.672 L 841.646 558.839 L 842.978 560.873 C 843.802 579.213 827.116 601.001 811.638 610.204 C 808.872 611.849 798.879 614.455 794.967 615.989 C 792.847 617.549 792.488 617.886 789.941 618.467 C 772.273 615.499 761.601 606.653 751.407 592.474 C 738.537 614.444 730.128 608.837 717.48 619.835 C 707.617 614.169 693.741 612.234 687.105 601.556 C 677.942 586.81 695.395 577.195 705.743 570.707 C 711.062 575.53 713.016 577.664 717.478 583.3 C 714.797 598.331 714.135 592.161 706.75 603.835 L 707.144 605.379 C 711.729 607.116 725.91 605.785 731.382 605.327 C 736.133 601.11 739.799 596.375 742.734 590.736 C 751.867 573.187 772.177 502.171 765.909 483.269 C 764.334 478.519 761.4 474.003 756.75 471.815 C 751.445 469.319 743.978 469.851 738.605 471.825 C 719.418 478.872 712.382 498.702 704.76 515.521 C 700.266 518.844 697.615 518.998 694.448 514.004 C 694.176 509.593 697.001 506.938 699.106 503.131 C 709.134 484.998 720.938 468.186 742.441 463.337 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/rich/ordered_list.svg b/Telegram/Resources/icons/menu/rich/ordered_list.svg
new file mode 100644
index 00000000000000..5f9d9aa88051c6
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rich/ordered_list.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="247 137 1585 1585" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 553.996 1003.4 C 554.473 1003.34 554.95 1003.27 555.426 1003.21 C 650.32 996.904 732.751 1063.54 744.337 1157.43 C 754.813 1242.32 713.914 1289.59 666.38 1352.15 C 644.2 1381.34 623.392 1410.52 601.02 1438.85 L 645.347 1438.76 C 674.797 1438.73 699.893 1437.52 723.681 1458.78 C 736.341 1470.52 746.58 1492.41 746.39 1509.82 C 745.853 1559.09 708.721 1585.16 662.523 1584.88 C 605.477 1584.67 548.391 1584.89 491.345 1584.88 C 453.713 1584.88 430.944 1587.92 402.569 1560.56 C 384.971 1540.22 378.757 1515.9 386.33 1490.02 C 391.281 1473.11 421.732 1435.25 433.608 1419.41 L 546.586 1268.79 C 556.092 1256.03 565.676 1243.32 575.337 1230.67 C 582.178 1221.69 589.301 1212.82 595.088 1203.11 C 603.613 1188.81 603.623 1167.7 590.077 1156.37 C 581.904 1149.5 571.221 1146.39 560.639 1147.79 C 553.35 1148.71 546.497 1151.76 540.947 1156.58 C 518.335 1176.34 537.593 1208.93 513.039 1241.21 C 500.982 1256.91 483.154 1267.14 463.516 1269.64 C 447.323 1271.74 423.703 1265.06 411.149 1254.87 C 382.412 1231.53 380.77 1202.02 384.428 1167.93 C 388.528 1129.74 399.9 1098.23 424.596 1068.31 C 450.117 1037.39 485.208 1015.85 524.33 1007.09 C 533.214 1005.19 544.8 1004.29 553.996 1003.4 z M 894.673 1220.43 C 941.367 1218.56 998.019 1220.15 1045.45 1220.15 L 1335.58 1220.13 L 1526.25 1220.12 C 1558.96 1220.12 1593.22 1219.5 1625.88 1220.99 C 1638.56 1221.57 1652.47 1227.23 1662.74 1234.81 C 1678.53 1246.28 1689.1 1263.58 1692.09 1282.87 C 1696.92 1315.85 1677.52 1349.45 1646 1360.65 C 1637.43 1363.69 1630.82 1364.69 1621.77 1365.93 C 1567.41 1366.79 1510.94 1366.04 1456.44 1366.05 L 1138.65 1366.06 L 974.705 1366.06 C 946.014 1366.06 908.312 1367.98 880.655 1364.39 C 826.572 1357.38 800.099 1287.93 837.36 1246.45 C 854.613 1227.24 869.255 1222.6 894.673 1220.43 z M 902.461 856.439 C 954.165 855.054 1011.22 856.232 1063.24 856.236 L 1368.73 856.231 L 1535.09 856.234 C 1565.46 856.235 1597.82 855.308 1627.96 857.677 C 1643.32 858.885 1656.98 865.064 1668.6 875.343 C 1683.01 888.35 1691.7 906.525 1692.78 925.91 C 1694.47 957.318 1672.91 987.989 1643.2 997.679 C 1632.03 1001.32 1622.39 1001.59 1610.81 1002.14 L 1117.88 1002.16 L 968.64 1002.18 C 940.67 1002.19 912.534 1003.11 884.764 1000.82 C 825.995 995.979 798.68 922.748 839.35 880.147 C 858.066 860.541 876.602 857.589 902.461 856.439 z M 900.902 492.493 L 1395.88 492.462 L 1546.9 492.436 C 1568.05 492.418 1610.72 491.334 1630.18 493.836 C 1644.9 495.862 1658.66 502.34 1669.61 512.402 C 1698.83 539.523 1700.85 586.21 1672.81 614.732 C 1654.38 633.478 1637.61 637.432 1611.95 638.343 L 1114.19 638.353 L 966.494 638.354 C 939.628 638.359 910.415 639.758 884.177 636.996 C 825.364 630.803 798.789 558.303 840.046 515.479 C 858.122 496.717 876.075 493.323 900.902 492.493 z M 591.022 275.437 C 593.835 275.232 596.651 275.06 599.469 274.92 C 618.153 274.035 636.884 281.338 650.467 293.889 C 667.55 309.674 673.795 330.328 674.068 353.104 C 674.449 384.891 674.182 416.998 674.153 448.837 L 674.196 627.677 L 674.223 730.092 C 674.227 751.146 675.16 771.812 672.641 792.909 C 665.587 851.993 593.403 876.525 550.774 835.781 C 531.498 817.357 528.682 795.356 528.255 769.984 L 528.19 465.285 C 510.428 473.801 487.646 486.814 469.092 490.669 C 450.689 494.332 431.585 490.503 416.014 480.031 C 399.747 469.299 388.404 452.549 384.475 433.461 C 380.849 414.358 385.026 394.599 396.073 378.598 C 400.647 371.896 409.617 362.842 416.751 358.947 C 466.72 331.665 518.634 307.103 569.648 281.738 C 575.873 278.643 584.254 276.745 591.022 275.437 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/rich/pullquote.svg b/Telegram/Resources/icons/menu/rich/pullquote.svg
new file mode 100644
index 00000000000000..e6ee26c9cc85cd
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rich/pullquote.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="-142 -133 2312 2312" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 415.959 374.584 C 419.668 374.165 422.098 373.545 425.65 374.665 C 428.16 381.32 431.704 402.806 433.553 411.417 C 439.85 440.749 445.306 470.532 451.937 499.802 C 447.174 500.998 441.581 501.836 436.717 502.51 C 379.678 510.527 320.189 531.138 284.336 578.795 C 255.713 616.842 252.901 655.858 253.336 701.311 C 294.789 701.297 337.53 700.753 378.883 701.602 C 380.342 807.337 378.949 916.433 378.95 1022.44 C 324.801 1023.23 268.801 1022.5 214.5 1022.51 L 51.759 1022.43 C 50.6494 965.326 51.7957 905.627 51.6441 848.114 C 52.135 737.016 44.3687 620.888 103.557 521.505 C 172.839 405.175 291.506 381.135 415.959 374.584 z M 929.338 374.58 C 932.895 374.216 936.041 373.421 939.181 374.828 C 941.18 379.93 944.45 399.951 945.994 406.593 C 953.109 437.198 958.102 469.756 965.431 500.14 C 882.808 512.473 800.712 537.307 773.724 627.069 C 765.628 653.998 766.579 673.655 766.816 701.32 C 808.211 701.303 850.814 700.773 892.115 701.595 C 893.735 807.063 892.197 916.642 892.192 1022.44 C 837.418 1023.3 780.454 1022.5 725.5 1022.51 L 565.035 1022.43 L 564.953 846.398 C 564.944 722.22 557.581 585.24 644.474 482.834 C 698.475 419.192 777.964 390.99 858.38 379.981 C 883.196 376.584 904.602 376.156 929.338 374.58 z M 1648.43 1022.49 L 1971.14 1022.42 L 1971.21 1201.43 C 1971.22 1312.01 1977.93 1421.73 1920.87 1521.27 C 1881.88 1589.28 1820.54 1629.9 1746.25 1650.93 C 1714.06 1659.81 1681.09 1665.58 1647.8 1668.17 C 1631.02 1669.56 1614.55 1669.6 1597.67 1671.32 C 1593.93 1656.74 1590.79 1639.39 1587.72 1624.5 L 1571.11 1544.77 C 1654.16 1534.83 1738.19 1504.8 1763.25 1417.09 C 1770.53 1391.62 1770.62 1370.37 1769.58 1344.39 C 1728.73 1343.61 1685.09 1344.27 1644.04 1344.26 C 1644.03 1314.99 1642.44 1027.97 1645.01 1023.65 C 1645.75 1022.42 1647.14 1022.68 1648.43 1022.49 z M 1135.12 1022.5 C 1241.94 1021.34 1350.92 1022.47 1457.92 1022.47 L 1457.97 1201.52 C 1457.97 1308.67 1463.9 1417.33 1411.07 1514.73 C 1372.02 1586.72 1312.65 1626.79 1235.76 1650.05 C 1175.39 1667.39 1143.75 1666.69 1083.46 1671.22 C 1082.32 1659.64 1076.38 1633.06 1073.84 1620.91 C 1068.75 1596.64 1064.2 1568.89 1058.26 1545.08 C 1070.92 1542.25 1085.18 1541.07 1098.06 1538.47 C 1157.11 1526.55 1213.88 1498.47 1241.17 1441.93 C 1257.17 1408.77 1258.1 1380.4 1256.87 1344.39 C 1215.83 1343.6 1172 1344.27 1130.77 1344.26 L 1130.72 1140.75 C 1130.72 1128.25 1129.67 1027.06 1132.15 1023.03 L 1135.12 1022.5 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/rich/table.svg b/Telegram/Resources/icons/menu/rich/table.svg
new file mode 100644
index 00000000000000..ec34938fd87671
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rich/table.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="86 99 1870 1870" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 509.56 256.583 L 510.367 256.513 C 531.625 254.813 562.258 255.614 584.232 255.621 L 707.271 255.646 L 1099.73 255.648 L 1394.75 255.627 L 1480.79 255.603 C 1508.79 255.608 1537.68 255.247 1565.36 259.735 C 1615.89 268.115 1663.15 290.186 1702.02 323.548 C 1758.6 372.099 1793.53 441.175 1799.1 515.525 C 1800.9 541.862 1800.15 572.071 1800.14 598.808 L 1800.1 731.339 L 1800.11 1145.69 L 1800.13 1421.92 L 1800.14 1497.81 C 1800.15 1524.41 1800.63 1551.86 1796.32 1578.14 C 1787.88 1629.33 1765.4 1677.18 1731.38 1716.36 C 1681.67 1773.69 1610.84 1808.44 1535.08 1812.66 C 1509.05 1813.78 1479.16 1813.1 1452.81 1813.1 L 1307.95 1813.1 L 867.692 1813.09 L 622.784 1813.1 C 576.818 1813.1 519.365 1816.17 474.995 1808.8 C 346.731 1787.51 246.354 1670.79 244.342 1540.71 C 243.908 1512.7 243.923 1484.49 243.938 1456.29 L 243.945 1313.38 L 243.949 873.185 L 243.923 634.051 C 243.919 602.679 244.624 570.722 244.048 539.419 C 241.359 393.078 360.384 262.073 509.56 256.583 z M 510.361 386.373 C 514.381 385.717 522.772 385.616 527.089 385.583 L 1231 385.662 L 1435.78 385.609 C 1462.16 385.602 1488.71 385.835 1515.08 385.644 C 1558.09 385.332 1595.57 399.671 1626.42 430.309 C 1645.56 449.263 1659.16 473.086 1665.76 499.205 C 1672.73 526.51 1670.76 573.206 1670.75 602.73 L 1670.74 731.939 L 1535.5 731.916 L 373.562 731.87 C 372.326 683.952 374.085 635.084 373.397 587.036 C 373.044 562.445 371.988 529.162 376.846 505.636 C 381.746 482.817 391.787 461.416 406.205 443.063 C 432.871 409.734 468.203 391.073 510.361 386.373 z M 849.041 1337.2 L 1195.16 1337.21 L 1195.04 1683.65 L 848.948 1683.64 L 849.041 1337.2 z M 849.068 861.378 L 1195.16 861.392 L 1195.07 1207.81 L 848.948 1207.8 L 849.068 861.378 z M 373.439 861.386 L 719.239 861.382 L 719.137 1207.81 L 373.538 1207.72 C 372.751 1169.46 373.446 1128.4 373.44 1089.94 L 373.439 861.386 z M 1325.02 861.381 C 1439.03 861.3 1556.92 859.825 1670.62 861.589 C 1671.48 899.466 1670.7 940.494 1670.7 978.574 L 1670.74 1207.82 L 1324.89 1207.8 L 1325.02 861.381 z M 1324.99 1337.2 L 1670.61 1337.32 L 1670.66 1339.65 C 1671.21 1379.62 1670.88 1419.97 1670.74 1459.95 C 1670.49 1530.77 1679.49 1583.87 1625.84 1639.36 C 1625.22 1640 1624.6 1640.63 1623.97 1641.26 C 1574.86 1689.86 1521.42 1683.67 1458.69 1683.67 L 1324.89 1683.63 L 1324.99 1337.2 z M 373.437 1337.21 L 719.24 1337.21 L 719.115 1683.65 L 590.631 1683.68 C 561.099 1683.68 513.065 1685.65 486.26 1678.59 C 460.191 1671.62 436.448 1657.83 417.467 1638.65 C 398.45 1619.68 384.929 1595.92 378.342 1569.88 C 371.325 1542.3 373.437 1494.9 373.438 1464.76 L 373.437 1337.21 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/rich/task_list.svg b/Telegram/Resources/icons/menu/rich/task_list.svg
new file mode 100644
index 00000000000000..776fef8606a3f0
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rich/task_list.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="83 113 1881 1881" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 321.782 413.362 C 336.764 411.702 374.743 412.925 391.629 412.944 L 533.186 412.959 L 692.688 412.944 C 718.676 412.932 746.235 412.191 772.086 413.516 C 786.83 415.13 800.873 419.533 813.034 428.045 C 842.32 448.541 852.483 476.577 850.978 511.417 C 850.316 526.721 850.998 544.275 851.004 559.595 L 851.033 701.399 L 851.009 862.073 C 851.001 887.912 851.362 914.184 850.555 940.017 C 849.2 983.407 816.83 1015.18 774.251 1021.91 C 740.693 1023.12 703.226 1022.34 669.45 1022.34 L 484.298 1022.34 L 375.851 1022.38 C 332.465 1022.39 291.649 1028.29 261.322 990.229 C 252.951 979.725 244.708 964.358 243.498 950.805 C 241.085 923.777 242.017 895.923 242.038 868.755 L 242.079 721.589 L 242.036 567.913 C 242.034 542.331 240.533 512.933 243.105 487.691 C 247.418 445.37 282.241 418.551 321.782 413.362 z M 375.746 543.446 L 599.662 543.43 C 637.196 543.413 684.177 542.072 720.561 543.836 L 720.349 889.25 L 719.677 891.192 C 715.346 892.581 667.832 891.84 660.275 891.839 L 503.719 891.874 L 418.253 891.921 C 405.907 891.925 384.4 892.504 372.736 891.424 C 371.418 781.546 373.78 671.324 372.414 561.414 C 372.351 556.326 372.035 549.01 373.434 544.314 L 375.746 543.446 z M 777.186 1262.24 C 780.205 1262 783.229 1261.85 786.256 1261.79 C 821.038 1261.21 851.722 1291.9 850.932 1326.6 C 850.407 1349.65 843.346 1361.98 827.342 1378.01 C 757.889 1447.55 688.326 1516.96 618.836 1586.45 L 555.814 1649.6 C 534.236 1671.22 514.746 1697.18 481.781 1696.82 C 460.942 1696.59 447.268 1689.83 432.487 1675.3 C 420.364 1663.38 408.484 1651.46 396.542 1639.51 L 311.396 1554.28 L 278.655 1521.72 C 259.008 1502.17 240.482 1487.01 240.163 1456.55 C 240.085 1439.29 246.798 1422.7 258.852 1410.35 C 271.123 1397.89 287.852 1390.83 305.339 1390.73 C 327.427 1390.75 342.393 1400.29 357.345 1415.6 C 368.266 1426.78 379.666 1437.89 390.732 1448.97 L 481.16 1539.27 C 502.729 1518.91 525.406 1495.22 546.654 1473.98 L 670.317 1350.35 L 716.205 1304.37 C 737.789 1282.69 746.442 1269.26 777.186 1262.24 z M 1089.29 1501.42 C 1127.71 1499.66 1177.52 1501.21 1217.07 1501.2 L 1468.98 1501.19 L 1652.83 1501.19 C 1677.27 1501.19 1701.72 1501.09 1726.17 1501.2 C 1746.95 1501.3 1764.34 1500.77 1781.81 1513.4 C 1795.82 1523.41 1805.19 1538.66 1807.8 1555.68 C 1813.85 1597.65 1787.53 1625.81 1747.41 1631.78 C 1699.31 1632.74 1648.17 1631.91 1599.87 1631.91 L 1316.46 1631.94 L 1161.49 1631.97 C 1143.37 1631.97 1125.09 1631.8 1106.99 1631.96 C 1085.65 1632.14 1067.8 1631.58 1050.23 1617.71 C 1036.44 1606.8 1027.64 1590.79 1025.81 1573.31 C 1024.01 1555.89 1029.23 1538.46 1040.31 1524.9 C 1053.66 1508.71 1069.18 1503.28 1089.29 1501.42 z M 1082.79 979.274 C 1091.05 978.184 1106.84 978.513 1115.53 978.526 L 1167.75 978.619 L 1346.89 978.601 L 1615.2 978.575 L 1700.38 978.572 C 1727.43 978.567 1759.03 974.587 1781.93 991.18 C 1795.77 1001.07 1805.05 1016.09 1807.7 1032.89 C 1813.63 1071.75 1789.87 1102.89 1751.23 1108.67 C 1739.63 1109.69 1723.83 1109.29 1712.01 1109.27 L 1649.03 1109.21 L 1448.24 1109.23 L 1208.07 1109.24 L 1128.96 1109.25 C 1115.95 1109.24 1098.47 1109.68 1085.79 1108.89 C 1075.38 1108.29 1065.29 1105.14 1056.39 1099.7 C 1041.5 1090.44 1030.92 1075.61 1027.01 1058.52 C 1023.13 1041.18 1026.45 1023.01 1036.22 1008.18 C 1047.79 990.638 1062.94 983.38 1082.79 979.274 z M 1079.78 457.255 C 1092.16 456.115 1108.19 456.506 1120.86 456.526 L 1183.5 456.56 L 1388.89 456.548 L 1629.45 456.529 L 1705.83 456.538 C 1730.98 456.545 1755.43 453.131 1777.64 466.091 C 1808.55 484.126 1817.98 527.43 1798.81 556.857 C 1789.1 571.942 1773.67 582.432 1756.07 585.916 C 1741.64 588.192 1693.37 586.991 1675.6 586.977 L 1512.7 586.988 L 1227.61 587.009 L 1134.91 587.006 C 1110.34 587.004 1078.47 590.622 1057.18 577.809 C 1042.16 568.758 1031.37 554.1 1027.18 537.074 C 1023.12 520.246 1025.97 502.492 1035.08 487.777 C 1045.62 470.53 1060.63 461.87 1079.78 457.255 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/search_check.svg b/Telegram/Resources/icons/menu/search_check.svg
new file mode 100644
index 00000000000000..b5e6fa0dd2bd9d
--- /dev/null
+++ b/Telegram/Resources/icons/menu/search_check.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M10.4,3.4 C14.2660068,3.4 17.4,6.53399322 17.4,10.4 C17.4,12.0738498 16.8191498,13.6082996 15.8486249,14.8118249 L15.8486249,14.8118249 L21.0183712,19.9815712 C21.2527634,20.2159634 21.2527634,20.5960366 21.0183712,20.8304288 L20.8304288,21.0183712 C20.5960366,21.2527634 20.2159634,21.2527634 19.9815712,21.0183712 L19.9815712,21.0183712 L14.8118249,15.8486249 C13.6082996,16.8191498 12.0738498,17.4 10.4,17.4 C6.53399322,17.4 3.4,14.2660068 3.4,10.4 C3.4,6.53399322 6.53399322,3.4 10.4,3.4 Z M10.4,4.6 C7.19644661,4.6 4.6,7.19644661 4.6,10.4 C4.6,13.6035534 7.19644661,16.2 10.4,16.2 C13.6035534,16.2 16.2,13.6035534 16.2,10.4 C16.2,7.19644661 13.6035534,4.6 10.4,4.6 Z" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M13.2778175,8.12781746 C13.5121903,7.89344461 13.8922635,7.89344461 14.1266363,8.12781746 C14.3610092,8.3622103 14.3610092,8.74228354 14.1266363,8.97667638 L14.1266363,8.97667638 L9.92663635,13.1766764 C9.69226351,13.4110492 9.31219027,13.4110492 9.07781742,13.1766764 L9.07781742,13.1766764 L7.27781742,11.3766764 C7.04344458,11.1423035 7.04344458,10.7622303 7.27781742,10.5278575 C7.51219027,10.2934846 7.89226351,10.2934846 8.12663635,10.5278575 L8.12663635,10.5278575 L9.50222689,11.9034481 Z" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/share_off.svg b/Telegram/Resources/icons/menu/share_off.svg
new file mode 100644
index 00000000000000..96d32e3bda1171
--- /dev/null
+++ b/Telegram/Resources/icons/menu/share_off.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>General / menu_share_off</title>
+    <g id="General-/-menu_share_off" stroke="none" fill="none" fill-rule="evenodd" stroke-width="1">
+        <g id="Group-Copy" fill="#FFFFFF">
+            <path d="M13.5410475,10.3605877 L63.5410475,57.3605877 C64.4464699,58.2116848 64.4905093,59.6356251 63.6394123,60.5410475 C62.7883152,61.4464699 61.3643749,61.4905093 60.4589525,60.6394123 L10.4589525,13.6394123 C9.55353009,12.7883152 9.5094907,11.3643749 10.3605877,10.4589525 C11.2116848,9.55353009 12.6356251,9.5094907 13.5410475,10.3605877 Z M20.8697864,27.9167669 L24.2120013,31.0494419 C22.5720741,32.209287 20.97837,33.5705168 19.4634089,35.1234281 C14.9053119,39.7957062 11.9408626,45.1740812 10.5605883,51.3047505 L11.5051987,50.6015513 C16.0028436,47.2792607 19.5161459,45.0657707 22.0998368,43.9379122 C25.3941073,42.4998643 29.8873875,41.7830384 35.6139217,41.7402273 L39.7497201,45.6169821 L39.75,52.8610336 L43.6427201,49.2669821 L46.9337201,52.3519821 L41.5435504,57.3295353 C40.8508419,57.9689585 39.9427126,58.3240224 39,58.3240224 C36.9289322,58.3240224 35.25,56.6450902 35.25,54.5740224 L35.25,46.2445368 C30.2823664,46.3118224 26.4887541,46.9320902 23.9001632,48.0620878 C21.1038403,49.2827666 16.6790868,52.217586 10.7334856,56.8296594 C10.0454974,57.3626476 9.17248701,57.5974385 8.30996087,57.4814518 C6.53104748,57.2422354 5.28287643,55.606218 5.5220928,53.8273046 L5.82195865,51.5973762 L5.91112003,51.609366 C7.32643988,44.1287015 10.7867131,37.5733134 16.2423132,31.9810496 C17.7180145,30.4683817 19.2679346,29.1105456 20.8697864,27.9167669 Z M41.574499,10.6994311 L63.4340398,30.8770703 C63.5173005,30.9539264 63.5974393,31.0340651 63.6742803,31.1173096 C65.2663463,32.8420477 65.1587942,35.5308487 63.4340561,37.1229146 L55.0377201,44.8719821 L51.7467201,41.7869821 L60.1827844,34.0000018 L39.7914686,15.1776163 L39.8121759,19.4395349 L39.81008,21.9362814 C39.8076961,22.3780357 39.8040398,22.7522447 39.7990732,23.0599114 L39.7825303,23.7289937 C39.7787867,23.8265061 39.7745714,23.9114264 39.7697493,23.9851995 C39.7624707,24.096554 39.7535986,24.1918121 39.7385791,24.2928873 L39.661515,24.796446 C39.4402142,26.1576904 39.2505293,26.2209711 37.5424339,26.2531907 C36.8212,26.2667952 36.0924969,26.3233582 35.3590026,26.4220805 L31.3609553,22.6738894 C32.6774415,22.3146094 33.997132,22.0625163 35.3100594,21.9217361 L35.3094753,18.5338121 C35.304347,17.1233929 35.2942592,15.4381587 35.2792041,13.4782339 C35.2728525,12.5247482 35.6299537,11.6046499 36.2778705,10.9050936 C37.6851807,9.38561997 40.0578077,9.29469349 41.574499,10.6994311 Z" id="Shape" fill-rule="nonzero"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/share_on.svg b/Telegram/Resources/icons/menu/share_on.svg
new file mode 100644
index 00000000000000..bb8edfe99203e3
--- /dev/null
+++ b/Telegram/Resources/icons/menu/share_on.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>General / menu_share_on</title>
+    <g id="General-/-menu_share_on" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M70.5418968,45.3555412 C71.4743766,46.1769042 71.5644546,47.5986747 70.7430916,48.5311546 L57.3925886,63.6877603 C57.3238151,63.7641971 57.3238151,63.7641971 57.2518797,63.8376661 C55.9826757,65.1068701 53.9248896,65.1068701 52.6556856,63.8376661 L46.4090097,57.5909903 C45.5303301,56.7123106 45.5303301,55.2876894 46.4090097,54.4090097 C47.2876894,53.5303301 48.7123106,53.5303301 49.5909903,54.4090097 L54.896011,59.7140304 L67.3662834,45.556736 C68.1876464,44.6242562 69.6094169,44.5341782 70.5418968,45.3555412 Z M40.574499,6.69943107 L62.4340398,26.8770703 C62.5173005,26.9539264 62.5974393,27.0340651 62.6742803,27.1173096 C64.2663463,28.8420477 64.1587942,31.5308487 62.4340561,33.1229146 L40.5435504,53.3295353 C39.8508419,53.9689585 38.9427126,54.3240224 38,54.3240224 C35.9289322,54.3240224 34.25,52.6450902 34.25,50.5740224 L34.25,42.2445368 C29.2823664,42.3118224 25.4887541,42.9320902 22.9001632,44.0620878 C20.1038403,45.2827666 15.6790868,48.217586 9.73348561,52.8296594 C9.04549739,53.3626476 8.17248701,53.5974385 7.30996087,53.4814518 C5.53104748,53.2422354 4.28287643,51.606218 4.5220928,49.8273046 L4.82195865,47.5973762 L4.91112003,47.609366 C6.32643988,40.1287015 9.78671313,33.5733134 15.2423132,27.9810496 C20.9223073,22.1587705 27.7018464,18.6303097 34.3100594,17.9217361 C34.311043,17.7474678 34.3117992,17.5601548 34.3123494,17.3612422 L34.312932,17.1056401 L34.3131028,15.9634276 C34.3110268,14.3126951 34.2997338,12.1508586 34.2792041,9.47823391 C34.2728525,8.52474824 34.6299537,7.60464986 35.2778705,6.90509359 C36.6851807,5.38561997 39.0578077,5.29469349 40.574499,6.69943107 Z M38.7914686,11.1776163 C38.8038479,13.0150348 38.8109783,14.5636507 38.8129119,15.8271389 L38.8129621,17.0925577 C38.8127949,17.188613 38.812585,17.2823229 38.8123322,17.3736902 C38.8098628,18.2664023 38.8033194,18.9389672 38.7924819,19.3972354 C38.7866103,19.6455183 38.7793935,19.8376533 38.7697493,19.9851995 C38.7624707,20.096554 38.7535986,20.1918121 38.7385791,20.2928873 C38.4636206,22.1432446 38.4403177,22.2173911 36.5424339,22.2531907 C30.5168733,22.3668501 23.9699768,25.4789196 18.4634089,31.1234281 C13.9053119,35.7957062 10.9408626,41.1740812 9.56058826,47.3047505 C14.5138287,43.5897332 18.3379603,41.1435541 21.0998368,39.9379122 C24.7547558,38.3424304 29.8855842,37.6347299 36.5390895,37.7503396 L38.75,37.7887558 L38.75,48.8610336 L59.1827844,30.0000018 L38.7914686,11.1776163 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/shortcut.png b/Telegram/Resources/icons/menu/shortcut.png
new file mode 100644
index 00000000000000..e5e3389e979c58
Binary files /dev/null and b/Telegram/Resources/icons/menu/shortcut.png differ
diff --git a/Telegram/Resources/icons/menu/shortcut@2x.png b/Telegram/Resources/icons/menu/shortcut@2x.png
new file mode 100644
index 00000000000000..f50a5dc7103931
Binary files /dev/null and b/Telegram/Resources/icons/menu/shortcut@2x.png differ
diff --git a/Telegram/Resources/icons/menu/shortcut@3x.png b/Telegram/Resources/icons/menu/shortcut@3x.png
new file mode 100644
index 00000000000000..5eb87725c6892b
Binary files /dev/null and b/Telegram/Resources/icons/menu/shortcut@3x.png differ
diff --git a/Telegram/Resources/icons/menu/spoiler_off.png b/Telegram/Resources/icons/menu/spoiler_off.png
deleted file mode 100644
index c694fd15da85df..00000000000000
Binary files a/Telegram/Resources/icons/menu/spoiler_off.png and /dev/null differ
diff --git a/Telegram/Resources/icons/menu/spoiler_off@2x.png b/Telegram/Resources/icons/menu/spoiler_off@2x.png
deleted file mode 100644
index 9400628b8ddbe3..00000000000000
Binary files a/Telegram/Resources/icons/menu/spoiler_off@2x.png and /dev/null differ
diff --git a/Telegram/Resources/icons/menu/spoiler_off@3x.png b/Telegram/Resources/icons/menu/spoiler_off@3x.png
deleted file mode 100644
index ce6598ad85244d..00000000000000
Binary files a/Telegram/Resources/icons/menu/spoiler_off@3x.png and /dev/null differ
diff --git a/Telegram/Resources/icons/menu/star.png b/Telegram/Resources/icons/menu/star.png
new file mode 100644
index 00000000000000..4bb1ea334b886b
Binary files /dev/null and b/Telegram/Resources/icons/menu/star.png differ
diff --git a/Telegram/Resources/icons/menu/star@2x.png b/Telegram/Resources/icons/menu/star@2x.png
new file mode 100644
index 00000000000000..a63b6a439a1115
Binary files /dev/null and b/Telegram/Resources/icons/menu/star@2x.png differ
diff --git a/Telegram/Resources/icons/menu/star@3x.png b/Telegram/Resources/icons/menu/star@3x.png
new file mode 100644
index 00000000000000..d2829cba8c124a
Binary files /dev/null and b/Telegram/Resources/icons/menu/star@3x.png differ
diff --git a/Telegram/Resources/icons/menu/stars_share.png b/Telegram/Resources/icons/menu/stars_share.png
new file mode 100644
index 00000000000000..30871b111bd470
Binary files /dev/null and b/Telegram/Resources/icons/menu/stars_share.png differ
diff --git a/Telegram/Resources/icons/menu/stars_share@2x.png b/Telegram/Resources/icons/menu/stars_share@2x.png
new file mode 100644
index 00000000000000..e431b7ce48b3f3
Binary files /dev/null and b/Telegram/Resources/icons/menu/stars_share@2x.png differ
diff --git a/Telegram/Resources/icons/menu/stars_share@3x.png b/Telegram/Resources/icons/menu/stars_share@3x.png
new file mode 100644
index 00000000000000..2e7d149736db07
Binary files /dev/null and b/Telegram/Resources/icons/menu/stars_share@3x.png differ
diff --git a/Telegram/Resources/icons/menu/sticker_add.png b/Telegram/Resources/icons/menu/sticker_add.png
new file mode 100644
index 00000000000000..0a4ee1dbc7bf85
Binary files /dev/null and b/Telegram/Resources/icons/menu/sticker_add.png differ
diff --git a/Telegram/Resources/icons/menu/sticker_add@2x.png b/Telegram/Resources/icons/menu/sticker_add@2x.png
new file mode 100644
index 00000000000000..72c830ca7419b0
Binary files /dev/null and b/Telegram/Resources/icons/menu/sticker_add@2x.png differ
diff --git a/Telegram/Resources/icons/menu/sticker_add@3x.png b/Telegram/Resources/icons/menu/sticker_add@3x.png
new file mode 100644
index 00000000000000..2bfe690b77290c
Binary files /dev/null and b/Telegram/Resources/icons/menu/sticker_add@3x.png differ
diff --git a/Telegram/Resources/icons/menu/sticker_select.png b/Telegram/Resources/icons/menu/sticker_select.png
new file mode 100644
index 00000000000000..788a9a317c0a51
Binary files /dev/null and b/Telegram/Resources/icons/menu/sticker_select.png differ
diff --git a/Telegram/Resources/icons/menu/sticker_select@2x.png b/Telegram/Resources/icons/menu/sticker_select@2x.png
new file mode 100644
index 00000000000000..19cec30c9ba2fa
Binary files /dev/null and b/Telegram/Resources/icons/menu/sticker_select@2x.png differ
diff --git a/Telegram/Resources/icons/menu/sticker_select@3x.png b/Telegram/Resources/icons/menu/sticker_select@3x.png
new file mode 100644
index 00000000000000..04238df9887f75
Binary files /dev/null and b/Telegram/Resources/icons/menu/sticker_select@3x.png differ
diff --git a/Telegram/Resources/icons/menu/tag_add.svg b/Telegram/Resources/icons/menu/tag_add.svg
new file mode 100644
index 00000000000000..8ad0a1cb90889f
--- /dev/null
+++ b/Telegram/Resources/icons/menu/tag_add.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / menu_tag_add</title>
+    <g id="Icon-/-Menu-/-menu_tag_add" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M16.599856,4.56363636 C17.535585,4.56363636 18.4029715,5.05848397 18.895196,5.86914299 L22.2846438,11.4513241 C22.7051187,12.1438167 22.7051187,13.0198196 22.2846438,13.7123122 L18.895196,19.2944934 C18.4029715,20.1051524 17.535585,20.6 16.599856,20.6 L7.25495844,20.6 C5.42706662,20.6 3.95240838,19.0820888 3.95240838,17.2181818 L3.95240838,11.5364421 C3.95240838,11.2050712 4.22103753,10.9364421 4.55240838,10.9364421 C4.88377923,10.9364421 5.15240838,11.2050712 5.15240838,11.5364421 L5.15240838,17.2181818 C5.15240838,18.4269864 6.09769589,19.4 7.25495844,19.4 L16.599856,19.4 C17.1136128,19.4 17.5934712,19.1262387 17.8694727,18.6716839 L21.2589205,13.0895027 C21.4470265,12.7797053 21.4470265,12.3839311 21.2589205,12.0741337 L17.8694727,6.49195251 C17.5934712,6.03739762 17.1136128,5.76363636 16.599856,5.76363636 L10.24363,5.76363636 C9.91225919,5.76363636 9.64363004,5.49500721 9.64363004,5.16363636 C9.64363004,4.83226551 9.91225919,4.56363636 10.24363,4.56363636 L16.599856,4.56363636 Z M16.2634586,11.1909091 C17.0097472,11.1909091 17.6147336,11.8136403 17.6147336,12.5818182 C17.6147336,13.3499961 17.0097472,13.9727273 16.2634586,13.9727273 C15.51717,13.9727273 14.9121836,13.3499961 14.9121836,12.5818182 C14.9121836,11.8136403 15.51717,11.1909091 16.2634586,11.1909091 Z M4.43002129,2.4 C4.76139214,2.4 5.03002129,2.66862915 5.03002129,3 L5.02908502,5.233 L7.26004258,5.23333333 C7.59141343,5.23333333 7.86004258,5.50196248 7.86004258,5.83333333 C7.86004258,6.16470418 7.59141343,6.43333333 7.26004258,6.43333333 L5.02908502,6.433 L5.03002129,8.66666667 C5.03002129,8.99803752 4.76139214,9.26666667 4.43002129,9.26666667 C4.09865044,9.26666667 3.83002129,8.99803752 3.83002129,8.66666667 L3.82908502,6.433 L1.6,6.43333333 C1.26862915,6.43333333 1,6.16470418 1,5.83333333 C1,5.50196248 1.26862915,5.23333333 1.6,5.23333333 L3.82908502,5.233 L3.83002129,3 C3.83002129,2.66862915 4.09865044,2.4 4.43002129,2.4 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/tag_edit.svg b/Telegram/Resources/icons/menu/tag_edit.svg
new file mode 100644
index 00000000000000..fec18ee156b22b
--- /dev/null
+++ b/Telegram/Resources/icons/menu/tag_edit.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / menu_tag_edit</title>
+    <g id="Icon-/-Menu-/-menu_tag_edit" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M16.599856,4.56363636 C17.535585,4.56363636 18.4029715,5.05848397 18.895196,5.86914299 L22.2846438,11.4513241 C22.7051187,12.1438167 22.7051187,13.0198196 22.2846438,13.7123122 L18.895196,19.2944934 C18.4029715,20.1051524 17.535585,20.6 16.599856,20.6 L7.25495844,20.6 C5.42706662,20.6 3.95240838,19.0820888 3.95240838,17.2181818 L3.95240838,14.6702947 C3.95240838,14.3389239 4.22103753,14.0702947 4.55240838,14.0702947 C4.88377923,14.0702947 5.15240838,14.3389239 5.15240838,14.6702947 L5.15240838,17.2181818 C5.15240838,18.4269864 6.09769589,19.4 7.25495844,19.4 L16.599856,19.4 C17.1136128,19.4 17.5934712,19.1262387 17.8694727,18.6716839 L21.2589205,13.0895027 C21.4470265,12.7797053 21.4470265,12.3839311 21.2589205,12.0741337 L17.8694727,6.49195251 C17.5934712,6.03739762 17.1136128,5.76363636 16.599856,5.76363636 L14.031014,5.76363636 C13.6996432,5.76363636 13.431014,5.49500721 13.431014,5.16363636 C13.431014,4.83226551 13.6996432,4.56363636 14.031014,4.56363636 L16.599856,4.56363636 Z M16.2634586,11.1909091 C17.0097472,11.1909091 17.6147336,11.8136403 17.6147336,12.5818182 C17.6147336,13.3499961 17.0097472,13.9727273 16.2634586,13.9727273 C15.51717,13.9727273 14.9121836,13.3499961 14.9121836,12.5818182 C14.9121836,11.8136403 15.51717,11.1909091 16.2634586,11.1909091 Z M9.83896948,2.96952606 L11.6623203,4.84566378 C12.0985241,5.29466176 12.0985241,6.00915906 11.6623203,6.45815704 L6.52054212,11.7507481 C6.31002174,11.9674432 6.02309451,12.0932021 5.72108049,12.1011485 L3.59699439,12.157036 C3.11196702,12.1697977 2.70842924,11.7869508 2.69566752,11.3019234 L2.75052739,9.04653645 C2.75775533,8.75547719 2.87444695,8.47784136 3.0773236,8.26901415 L8.2028283,2.99317397 C8.64810602,2.53483587 9.38063138,2.52424834 9.83896948,2.96952606 Z M7.00385646,5.94974937 L3.94974021,9.093133 L3.90366423,10.9485518 L5.67202981,10.9020238 L8.76590842,7.71849906 C8.69791967,7.68828862 8.63444899,7.64484068 8.57943411,7.58821217 L7.07780938,6.04254349 C7.04964358,6.01355156 7.02499515,5.98244405 7.00385646,5.94974937 Z M9.03272284,3.86106211 L7.81747041,5.11015524 C7.8608342,5.13627396 7.90157846,5.16835024 7.93851179,5.20636686 L9.44013652,6.75203554 C9.48642883,6.79968564 9.52321964,6.85305056 9.55054286,6.90978429 L10.7725408,5.65191041 L9.03272284,3.86106211 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/tag_sell.png b/Telegram/Resources/icons/menu/tag_sell.png
new file mode 100644
index 00000000000000..5afc94207683ed
Binary files /dev/null and b/Telegram/Resources/icons/menu/tag_sell.png differ
diff --git a/Telegram/Resources/icons/menu/tag_sell@2x.png b/Telegram/Resources/icons/menu/tag_sell@2x.png
new file mode 100644
index 00000000000000..bd0cc198f07b63
Binary files /dev/null and b/Telegram/Resources/icons/menu/tag_sell@2x.png differ
diff --git a/Telegram/Resources/icons/menu/tag_sell@3x.png b/Telegram/Resources/icons/menu/tag_sell@3x.png
new file mode 100644
index 00000000000000..da06c7bf1ca44a
Binary files /dev/null and b/Telegram/Resources/icons/menu/tag_sell@3x.png differ
diff --git a/Telegram/Resources/icons/menu/text_style_framed.svg b/Telegram/Resources/icons/menu/text_style_framed.svg
new file mode 100644
index 00000000000000..de5e3ff7281bf3
--- /dev/null
+++ b/Telegram/Resources/icons/menu/text_style_framed.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / text_framed</title>
+    <g id="Icon-/-Menu-/-text_framed" stroke="none" fill="none" fill-rule="evenodd" stroke-width="1">
+        <g id="Group-Copy" transform="translate(2.5, 2.5)" fill="#FFFFFF">
+            <path d="M14,-0.599999989 C17.0927946,-0.599999989 19.6,1.9072054 19.6,5 L19.6,14 C19.6,17.0927946 17.0927946,19.6 14,19.6 L5,19.6 C1.9072054,19.6 -0.6,17.0927946 -0.6,14 L-0.6,5 C-0.6,1.9072054 1.9072054,-0.599999989 5,-0.599999989 L14,-0.599999989 Z M14,0.6 L5,0.6 L4.55012557,0.622716709 C2.33139882,0.848040676 0.6,2.72182541 0.6,5 L0.6,14 C0.6,16.4300529 2.5699471,18.4 5,18.4 L14,18.4 C16.4300529,18.4 18.4,16.4300529 18.4,14 L18.4,5 C18.4,2.5699471 16.4300529,0.6 14,0.6 Z M9.97655065,4.03401385 C10.3593484,4.17343225 10.6607815,4.47517036 10.7998126,4.85810895 L14.110978,13.9781761 C14.233488,14.3156099 14.0592578,14.688468 13.7218239,14.810978 C13.3843901,14.933488 13.011532,14.7592578 12.889022,14.4218239 L11.966,11.88 L7.036,11.88 L6.11075332,14.4224419 C5.98790207,14.7597516 5.61486788,14.9336046 5.27755814,14.8107533 C4.94024839,14.6879021 4.76639543,14.3148679 4.88924668,13.9775581 L8.21110911,4.85679966 C8.4714163,4.14208042 9.2618314,3.77370666 9.97655065,4.03401385 Z M9.43261575,5.30168339 L7.509,10.58 L11.494,10.58 L9.57785654,5.30175685 C9.57005611,5.28027185 9.55314403,5.26334264 9.53166693,5.25552049 C9.49156717,5.2409158 9.44722044,5.26158363 9.43261575,5.30168339 Z" id="Shape" fill-rule="nonzero"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/text_style_plain.svg b/Telegram/Resources/icons/menu/text_style_plain.svg
new file mode 100644
index 00000000000000..72acd4859609c3
--- /dev/null
+++ b/Telegram/Resources/icons/menu/text_style_plain.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / text_plain</title>
+    <g id="Icon-/-Menu-/-text_plain" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M12.5653175,4.74076496 C13.033686,4.90830287 13.4021688,5.27715336 13.5692393,5.74568882 L17.7064322,17.3481001 C17.8455527,17.7382518 17.6420516,18.1673117 17.2518999,18.3064322 C16.8617482,18.4455527 16.4326883,18.2420516 16.2935678,17.8518999 L15.1227957,14.570379 L8.87979566,14.570379 L7.70618054,17.8526045 C7.56667093,18.2426173 7.13740824,18.4456902 6.74739549,18.3061805 C6.35738275,18.1666709 6.15430984,17.7374082 6.29381946,17.3473955 L10.4443687,5.74413013 C10.7529809,4.88137467 11.702562,4.43215278 12.5653175,4.74076496 Z M11.8567298,6.24933915 L9.41579566,13.070379 L14.5877957,13.070379 L12.1563749,6.24948861 C12.1403545,6.20456056 12.1050205,6.16919133 12.0601085,6.15312605 C11.9773785,6.1235331 11.8863228,6.16660918 11.8567298,6.24933915 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/text_style_semi.svg b/Telegram/Resources/icons/menu/text_style_semi.svg
new file mode 100644
index 00000000000000..95cca3188ff004
--- /dev/null
+++ b/Telegram/Resources/icons/menu/text_style_semi.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / text_semi</title>
+    <g id="Icon-/-Menu-/-text_semi" stroke="none" fill="none">
+        <path d="M8,2 L16,2 C19.3137085,2 22,4.6862915 22,8 L22,16 C22,19.3137085 19.3137085,22 16,22 L8,22 C4.6862915,22 2,19.3137085 2,16 L2,8 C2,4.76160306 4.56557489,2.12242824 7.77506174,2.00413847 L8,2 Z" id="Rectangle" fill="#FFFFFF" fill-rule="evenodd" opacity="0.15"></path>
+        <path d="M12.4765507,6.53401385 C12.8593484,6.67343225 13.1607815,6.97517036 13.2998126,7.35810895 L16.610978,16.4781761 C16.733488,16.8156099 16.5592578,17.188468 16.2218239,17.310978 C15.8843901,17.433488 15.511532,17.2592578 15.389022,16.9218239 L14.4658231,14.38048 L9.53582311,14.38048 L8.61075332,16.9224419 C8.48790207,17.2597516 8.11486788,17.4336046 7.77755814,17.3107533 C7.44024839,17.1879021 7.26639543,16.8148679 7.38924668,16.4775581 L10.7111091,7.35679966 C10.9714163,6.64208042 11.7618314,6.27370666 12.4765507,6.53401385 Z M11.9326158,7.80168339 L10.0088231,13.08048 L13.9948231,13.08048 L12.0778565,7.80175685 C12.0700561,7.78027185 12.053144,7.76334264 12.0316669,7.75552049 C11.9915672,7.7409158 11.9472204,7.76158363 11.9326158,7.80168339 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/tradable.png b/Telegram/Resources/icons/menu/tradable.png
new file mode 100644
index 00000000000000..588ad29b9a7b09
Binary files /dev/null and b/Telegram/Resources/icons/menu/tradable.png differ
diff --git a/Telegram/Resources/icons/menu/tradable@2x.png b/Telegram/Resources/icons/menu/tradable@2x.png
new file mode 100644
index 00000000000000..096f5cf7dd1141
Binary files /dev/null and b/Telegram/Resources/icons/menu/tradable@2x.png differ
diff --git a/Telegram/Resources/icons/menu/tradable@3x.png b/Telegram/Resources/icons/menu/tradable@3x.png
new file mode 100644
index 00000000000000..fa9ab721330f6c
Binary files /dev/null and b/Telegram/Resources/icons/menu/tradable@3x.png differ
diff --git a/Telegram/Resources/icons/menu/unique.png b/Telegram/Resources/icons/menu/unique.png
new file mode 100644
index 00000000000000..8b1cc60872c3c1
Binary files /dev/null and b/Telegram/Resources/icons/menu/unique.png differ
diff --git a/Telegram/Resources/icons/menu/unique@2x.png b/Telegram/Resources/icons/menu/unique@2x.png
new file mode 100644
index 00000000000000..774852ecf11330
Binary files /dev/null and b/Telegram/Resources/icons/menu/unique@2x.png differ
diff --git a/Telegram/Resources/icons/menu/unique@3x.png b/Telegram/Resources/icons/menu/unique@3x.png
new file mode 100644
index 00000000000000..e660a8262ce266
Binary files /dev/null and b/Telegram/Resources/icons/menu/unique@3x.png differ
diff --git a/Telegram/Resources/icons/menu/users_stars.svg b/Telegram/Resources/icons/menu/users_stars.svg
new file mode 100644
index 00000000000000..0a068f774a1ded
--- /dev/null
+++ b/Telegram/Resources/icons/menu/users_stars.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / users_stars</title>
+    <g id="Icon-/-Menu-/-users_stars" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M10.6647222,14.6083333 C13.1679529,14.6083333 15.1972222,16.6376027 15.1972222,19.1408333 L15.1972222,19.1805556 C15.1972222,19.5119264 14.9285931,19.7805556 14.5972222,19.7805556 C14.2658514,19.7805556 13.9972222,19.5119264 13.9972222,19.1805556 L13.9972222,19.1408333 C13.9972222,17.3003444 12.5052112,15.8083333 10.6647222,15.8083333 L5.47983871,15.8083333 C3.75894714,15.8083333 2.36388889,17.2033916 2.36388889,18.9242832 C2.36388889,19.255654 2.09525974,19.5242832 1.76388889,19.5242832 C1.43251804,19.5242832 1.16388889,19.255654 1.16388889,18.9242832 C1.16388889,16.5406499 3.09620544,14.6083333 5.47983871,14.6083333 L10.6647222,14.6083333 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M8.47745116,3.81325275 C8.84434853,3.9691957 9.13648401,4.26133118 9.29242697,4.62822855 L9.837,5.91011111 L11.2536218,6.01848992 C12.0546381,6.07958882 12.6656371,6.74303885 12.6765549,7.53105369 L12.6721689,7.67131095 C12.640454,8.08709799 12.4414977,8.47225506 12.1207729,8.73875142 L11.07,9.61111111 L11.3938701,10.9206432 C11.5864903,11.7005519 11.1475494,12.4884712 10.4025244,12.745423 L10.2679383,12.785146 C9.87396987,12.8824474 9.45751925,12.8203294 9.10909531,12.6122923 L7.874,11.8751111 L6.65149995,12.6059661 C5.96413876,13.016376 5.08613461,12.8292111 4.62167189,12.196898 L4.53957882,12.0731599 C4.32863667,11.7198706 4.26783432,11.2968624 4.3707302,10.8984627 L4.60871396,9.97701978 C4.63955115,9.85762211 4.67934978,9.74174595 4.72741862,9.63019415 L4.781,9.51711111 C4.72402035,9.48693702 4.66830927,9.45442225 4.61377597,9.41969742 L4.45384681,9.30892937 L3.75085061,8.78062735 C3.07086182,8.2696154 2.93387902,7.30411853 3.44489097,6.62412974 C3.71113573,6.26984554 4.11709183,6.04742064 4.55898263,6.01371466 L5.912,5.91011111 L6.45757303,4.62822855 C6.79029762,3.84540525 7.69462787,3.48052816 8.47745116,3.81325275 Z M8.00805289,4.91763731 C7.83516435,4.84415422 7.63544068,4.92473827 7.5619576,5.09762682 L6.81242023,6.8611133 C6.762712,6.97806516 6.65195707,7.05755523 6.52524782,7.06722019 L4.65024959,7.21023893 C4.55265687,7.21768299 4.46300042,7.2668061 4.40419957,7.34505068 C4.29134126,7.49522796 4.32159427,7.70846043 4.47177155,7.82131874 L5.17476775,8.34962077 C5.44651754,8.55384088 5.78694643,8.64456615 6.12428682,8.60267031 L7.57841053,8.42207605 C7.70002725,8.40697192 7.81692252,8.4743167 7.86485999,8.58710305 C7.92415906,8.72662077 7.85912899,8.88779362 7.71961127,8.94709269 L6.4517079,9.48598834 C6.11405341,9.62950127 5.8623347,9.92186941 5.77058814,10.2771004 L5.53260437,11.1985433 C5.50987955,11.2865309 5.52330791,11.3799534 5.56989503,11.4579782 C5.66620013,11.6192716 5.87502492,11.671955 6.03631826,11.5756499 L7.70062419,10.5819253 C7.80803032,10.5177952 7.94196968,10.5177952 8.04937581,10.5819253 L9.72427701,11.5819761 C9.80122733,11.6279216 9.89320153,11.6416405 9.98021047,11.6201513 C10.1625874,11.5751082 10.2739185,11.3907479 10.2288754,11.208371 L9.77632428,9.37601536 C9.74506588,9.24945178 9.78889505,9.11615638 9.88916433,9.03284072 L11.3538674,7.81579097 C11.4247003,7.75693456 11.4686403,7.67187163 11.4756446,7.58004398 C11.4899322,7.3927312 11.3496676,7.2293018 11.1623548,7.21501419 L9.22475218,7.06722019 C9.09804293,7.05755523 8.987288,6.97806516 8.93757977,6.8611133 L8.1880424,5.09762682 C8.153602,5.01659659 8.08908313,4.95207771 8.00805289,4.91763731 Z" id="Star" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M18.0174227,5.90931057 C18.3486503,6.04652517 18.611812,6.3096869 18.7490266,6.64091449 L19.1044444,7.5 L20.0337984,7.57332883 C20.7344012,7.62815795 21.2683217,8.20775826 21.2801433,8.89635992 L21.2761548,9.02664858 C21.2481303,9.38474356 21.0787573,9.71696686 20.805417,9.94999576 L20.0974444,10.552 L20.3154363,11.4563406 C20.4799024,12.1395692 20.0937745,12.8265284 19.4425658,13.0506693 L19.3174274,13.0871582 C18.9686126,13.1711245 18.6007266,13.1129982 18.2947908,12.9255805 L17.4994444,12.438 L16.7339799,12.9079554 C16.1370798,13.2736191 15.3682309,13.1207349 14.9530722,12.5755767 L14.8749121,12.4613522 C14.6783232,12.1404454 14.6243898,11.7521195 14.7260855,11.389785 L14.9136874,10.721373 C14.9302657,10.6623057 14.9495081,10.6043097 14.9712932,10.5475329 L14.9924444,10.496 L14.8586084,10.4042198 L14.3173233,9.99771597 C13.7202762,9.54933497 13.5997585,8.701848 14.0481395,8.10480086 C14.2812853,7.79435268 14.6366446,7.59911993 15.0237072,7.56882844 L15.8944444,7.5 L16.2509734,6.64091449 C16.536738,5.95109613 17.3276044,5.6235459 18.0174227,5.90931057 Z M17.59643,6.9255611 C17.4678713,6.87230428 17.3204807,6.93334851 17.2672239,7.0619072 L16.7120856,8.40197687 C16.6758104,8.48954314 16.5934614,8.54934298 16.4989677,8.55673805 L15.1095308,8.66547529 C15.0373954,8.6711206 14.9711685,8.70750534 14.9277181,8.76536233 C14.8441551,8.87663162 14.8666155,9.03457438 14.9778848,9.11813736 L15.5191699,9.52464117 C15.7230236,9.67773481 15.9788884,9.7445585 16.2315688,9.71069694 L17.183292,9.58315701 C17.2805543,9.57012294 17.375435,9.61996727 17.4198915,9.70745139 C17.4776834,9.82117784 17.4323395,9.96022092 17.318613,10.0180128 L16.4184593,10.4754402 C16.2004755,10.5862121 16.0388382,10.7832041 15.9727639,11.0186219 L15.7851621,11.6870339 C15.7662094,11.7545607 15.7762608,11.8269315 15.8128983,11.8867376 C15.8855887,12.0053956 16.0407073,12.0426597 16.1593653,11.9699692 L17.3683823,11.2293199 C17.449152,11.17984 17.550848,11.17984 17.6316177,11.2293199 L18.8694054,11.9875943 C18.9264214,12.0225226 18.9949829,12.0333554 19.0599901,12.0177069 C19.1952788,11.9851403 19.2785516,11.8490667 19.245985,11.7137779 L18.9067247,10.304416 C18.8845188,10.212168 18.9160198,10.1152669 18.988225,10.0537103 L20.0917784,9.1129056 C20.1427197,9.06947694 20.1742851,9.00756181 20.1795079,8.94082508 C20.1903648,8.80209601 20.086704,8.68083261 19.9479749,8.66997568 L18.5010323,8.55673805 C18.4065386,8.54934298 18.3241896,8.48954314 18.2879144,8.40197687 L17.7327761,7.0619072 C17.707204,7.00017764 17.6581596,6.95113324 17.59643,6.9255611 Z" id="Star-Copy" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M18.2638889,14.6083333 C20.7890575,14.6083333 22.8361111,16.6553869 22.8361111,19.1805556 C22.8361111,19.5119264 22.567482,19.7805556 22.2361111,19.7805556 C21.9047403,19.7805556 21.6361111,19.5119264 21.6361111,19.1805556 C21.6361111,17.3181286 20.1263158,15.8083333 18.2638889,15.8083333 L15.8789648,15.8077138 C15.6342075,15.3537143 15.2908888,14.9468235 14.8660915,14.6068359 L18.2638889,14.6083333 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/zoom_in.svg b/Telegram/Resources/icons/menu/zoom_in.svg
new file mode 100644
index 00000000000000..ca234f9fba584e
--- /dev/null
+++ b/Telegram/Resources/icons/menu/zoom_in.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <g fill="none" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
+        <circle cx="10.7" cy="10.7" r="5.1"/>
+        <line x1="14.5" y1="14.5" x2="18.8" y2="18.8"/>
+        <line x1="8.2" y1="10.7" x2="13.2" y2="10.7"/>
+        <line x1="10.7" y1="8.2" x2="10.7" y2="13.2"/>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/menu/zoom_out.svg b/Telegram/Resources/icons/menu/zoom_out.svg
new file mode 100644
index 00000000000000..16d99d24c5d544
--- /dev/null
+++ b/Telegram/Resources/icons/menu/zoom_out.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <g fill="none" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
+        <circle cx="10.7" cy="10.7" r="5.1"/>
+        <line x1="14.5" y1="14.5" x2="18.8" y2="18.8"/>
+        <line x1="8.2" y1="10.7" x2="13.2" y2="10.7"/>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/mini_replace.svg b/Telegram/Resources/icons/mini_replace.svg
new file mode 100644
index 00000000000000..86d68953e655d5
--- /dev/null
+++ b/Telegram/Resources/icons/mini_replace.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Mini / mini_replace2</title>
+    <g id="Mini-/-mini_replace2" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M8.27981904,18.1901792 C8.35180301,18.2477663 8.41718661,18.3131499 8.47477379,18.3851339 L14.6887446,26.1525974 C14.9040856,26.4217737 14.8604435,26.8145527 14.5912672,27.0298938 C14.4805955,27.1184311 14.3430866,27.1666667 14.2013577,27.1666667 L9.42766478,27.1670537 C10.878665,33.9028527 16.8626042,38.95 24.0232121,38.95 C27.9154401,38.95 31.5678594,37.4552395 34.3277951,34.8190502 C35.1465138,34.0370401 36.4441608,34.0667983 37.2261709,34.885517 C38.0081809,35.7042357 37.9784227,37.0018828 37.159704,37.7838928 C33.6445004,41.1414863 28.981083,43.05 24.0232121,43.05 C14.5899526,43.05 6.76036297,36.1801958 5.25373571,27.166733 L0.798642328,27.1666667 C0.453928405,27.1666667 0.174482557,26.8872208 0.174482557,26.5425069 C0.174482557,26.400778 0.222718094,26.263269 0.311255431,26.1525974 L6.52522621,18.3851339 C6.95590837,17.8467812 7.74146633,17.759497 8.27981904,18.1901792 Z M24.0232121,4.95 C33.5722941,4.95 41.4780844,11.9895362 42.8453157,21.1662324 L47.2013577,21.1666667 C47.3430866,21.1666667 47.4805955,21.2149022 47.5912672,21.3034395 C47.8604435,21.5187806 47.9040856,21.9115596 47.6887446,22.180736 L41.4747738,29.9481994 C41.4171866,30.0201834 41.351803,30.085567 41.279819,30.1431542 C40.7414663,30.5738363 39.9559084,30.4865521 39.5252262,29.9481994 L33.3112554,22.180736 C33.2227181,22.0700643 33.1744826,21.9325553 33.1744826,21.7908264 C33.1744826,21.4461125 33.4539284,21.1666667 33.7986423,21.1666667 L38.6865289,21.1659705 C37.363877,14.2641899 31.3013507,9.05 24.0232121,9.05 C19.9913296,9.05 16.2185331,10.6547806 13.4323785,13.4617549 C12.6347893,14.2653042 11.3368101,14.2701357 10.5332608,13.4725465 C9.72971154,12.6749573 9.72487998,11.3769781 10.5224692,10.5734288 C14.070616,6.99876826 18.8872155,4.95 24.0232121,4.95 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/notify_toggle.lottie b/Telegram/Resources/icons/notify_toggle.lottie
new file mode 100644
index 00000000000000..e6004d6823fefc
--- /dev/null
+++ b/Telegram/Resources/icons/notify_toggle.lottie
@@ -0,0 +1 @@
+{"v":"5.12.1","fr":60,"ip":0,"op":80,"w":512,"h":512,"nm":"IC 2","ddd":0,"assets":[{"id":"comp_0","nm":"Mute_24","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Path","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[10.812,1.134,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[9.12,8.787],[-9.12,-8.787]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.67,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":3,"s":[100]},{"t":17,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":3,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[2133.333,2133.333],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":40,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Path","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-0.006,206.214,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.105,0],[0,1.105],[0,0]],"o":[[1.105,0],[0,0],[0,1.105]],"v":[[0,1],[2,-1],[-2,-1]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[2133.333,2133.333],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":40,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Union","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-7.118,-30.841,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"hasMask":true,"masksProperties":[{"inv":false,"mode":"a","pt":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":3,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[13.622,-14.091],[14.062,13.645],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[14.063,13.648],[-13.622,14.086],[0,0],[0,0]],"v":[[-248.877,286.845],[262.123,286.845],[262.123,-225.155],[-195.544,-225.155],[-161.724,-189.838],[-160.913,-139.609],[-211.044,-138.817],[-248.877,-178.009]],"c":true}]},{"t":17,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[13.622,-14.091],[14.062,13.645],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[14.063,13.648],[-13.622,14.086],[0,0],[0,0]],"v":[[-248.877,286.845],[262.123,286.845],[262.123,-225.155],[-195.544,-225.155],[236.258,193.93],[237.068,244.159],[186.937,244.951],[-248.877,-178.009]],"c":true}]}],"ix":1},"o":{"a":0,"k":100,"ix":3},"x":{"a":0,"k":0,"ix":4},"nm":"Mask 1"}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.644,0],[0,-0.644],[0,0],[-0.003,-0.033],[0,-3.522],[0,0],[0.027,-0.03],[0,0],[-1.708,0],[0,0],[1.148,1.265],[0,0],[0,0.041],[0,0],[3.091,0.677],[0,0.072]],"o":[[0,-0.644],[-0.644,0],[0,0],[0,0.034],[-3.411,0.409],[0,0],[0,0.041],[0,0],[-1.148,1.265],[0,0],[1.708,0],[0,0],[-0.027,-0.03],[0,0],[0,-3.294],[0.012,-0.068],[0,0]],"v":[[1.5,-8.055],[0.333,-9.222],[-0.833,-8.055],[-0.833,-7.722],[-0.828,-7.62],[-6.885,-0.786],[-6.885,3.651],[-6.928,3.762],[-8.897,5.93],[-7.44,9.222],[6.773,9.222],[8.896,5.93],[6.927,3.762],[6.884,3.651],[6.884,-0.786],[1.479,-7.511],[1.5,-7.722]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-2.88,0],[0,-2.88],[0,0],[-0.307,-0.337],[0,0],[0.259,0],[0,0],[-0.174,0.192],[0,0],[0,0.456]],"o":[[0,-2.88],[2.88,0],[0,0],[0,0.456],[0,0],[0.174,0.192],[0,0],[-0.259,0],[0,0],[0.307,-0.337],[0,0]],"v":[[-5.215,-0.786],[0,-6.001],[5.214,-0.786],[5.214,3.651],[5.691,4.885],[7.66,7.053],[7.439,7.552],[-7.44,7.552],[-7.66,7.053],[-5.691,4.885],[-5.215,3.651]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[2133.333,2133.333],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Union","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":40,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":3,"nm":"Top 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":2,"s":[0]},{"i":{"x":[0.302],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":8,"s":[-3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":19,"s":[5]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":28,"s":[-3]},{"t":36,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":0,"s":[255.088,261.008,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":6,"s":[255.088,241.008,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":17,"s":[255.088,281.008,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":26,"s":[255.088,247.008,0],"to":[0,0,0],"ti":[0,0,0]},{"t":34,"s":[255.088,261.008,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-0.918,5,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":5,"op":40,"st":0,"bm":0}]},{"id":"comp_1","nm":"Unmute_24","fr":60,"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Top 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.4],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":1,"s":[0]},{"i":{"x":[0.3],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":7,"s":[3]},{"i":{"x":[0.4],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":20,"s":[-5]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":29,"s":[3]},{"t":36,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":0,"s":[255.088,261.008,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.3,"y":1},"o":{"x":0.3,"y":0},"t":5,"s":[255.088,281.008,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":18,"s":[255.088,237.008,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":27,"s":[255.088,283.008,0],"to":[0,0,0],"ti":[0,0,0]},{"t":34,"s":[255.088,261.008,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-0.918,5,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":13,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Path","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[10.812,1.134,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[9.12,8.787],[-9.12,-8.787]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.67,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.6],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":3,"s":[0]},{"t":17,"s":[100]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":3,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[2133.333,2133.333],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":40,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Path","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-0.006,206.214,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.105,0],[0,1.105],[0,0]],"o":[[1.105,0],[0,0],[0,1.105]],"v":[[0,1],[2,-1],[-2,-1]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[2133.333,2133.333],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":40,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Union","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-7.118,-30.841,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"hasMask":true,"masksProperties":[{"inv":false,"mode":"a","pt":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":3,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[13.622,-14.091],[14.062,13.645],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[14.063,13.648],[-13.622,14.086],[0,0],[0,0]],"v":[[-248.877,286.845],[262.123,286.845],[262.123,-225.155],[-195.544,-225.155],[236.258,193.93],[237.068,244.159],[186.937,244.951],[-248.877,-178.009]],"c":true}]},{"t":17,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[13.622,-14.091],[14.062,13.645],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[14.063,13.648],[-13.622,14.086],[0,0],[0,0]],"v":[[-248.877,286.845],[262.123,286.845],[262.123,-225.155],[-195.544,-225.155],[-161.724,-189.838],[-160.913,-139.609],[-211.044,-138.817],[-248.877,-178.009]],"c":true}]}],"ix":1},"o":{"a":0,"k":100,"ix":3},"x":{"a":0,"k":0,"ix":4},"nm":"Mask 1"}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.644,0],[0,-0.644],[0,0],[-0.003,-0.033],[0,-3.522],[0,0],[0.027,-0.03],[0,0],[-1.708,0],[0,0],[1.148,1.265],[0,0],[0,0.041],[0,0],[3.091,0.677],[0,0.072]],"o":[[0,-0.644],[-0.644,0],[0,0],[0,0.034],[-3.411,0.409],[0,0],[0,0.041],[0,0],[-1.148,1.265],[0,0],[1.708,0],[0,0],[-0.027,-0.03],[0,0],[0,-3.294],[0.012,-0.068],[0,0]],"v":[[1.5,-8.055],[0.333,-9.222],[-0.833,-8.055],[-0.833,-7.722],[-0.828,-7.62],[-6.885,-0.786],[-6.885,3.651],[-6.928,3.762],[-8.897,5.93],[-7.44,9.222],[6.773,9.222],[8.896,5.93],[6.927,3.762],[6.884,3.651],[6.884,-0.786],[1.479,-7.511],[1.5,-7.722]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-2.88,0],[0,-2.88],[0,0],[-0.307,-0.337],[0,0],[0.259,0],[0,0],[-0.174,0.192],[0,0],[0,0.456]],"o":[[0,-2.88],[2.88,0],[0,0],[0,0.456],[0,0],[0.174,0.192],[0,0],[-0.259,0],[0,0],[0.307,-0.337],[0,0]],"v":[[-5.215,-0.786],[0,-6.001],[5.214,-0.786],[5.214,3.651],[5.691,4.885],[7.66,7.053],[7.439,7.552],[-7.44,7.552],[-7.66,7.053],[-5.691,4.885],[-5.215,3.651]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[2133.333,2133.333],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Union","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":40,"st":0,"ct":1,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Mute_24","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[256,256,0],"ix":2,"l":2},"a":{"a":0,"k":[256,256,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":512,"h":512,"ip":40,"op":80,"st":40,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"Unmute_24","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[256,256,0],"ix":2,"l":2},"a":{"a":0,"k":[256,256,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":512,"h":512,"ip":0,"op":40,"st":0,"bm":0}],"markers":[],"props":{}}
\ No newline at end of file
diff --git a/Telegram/Resources/icons/payments/premium_emoji.png b/Telegram/Resources/icons/payments/premium_emoji.png
new file mode 100644
index 00000000000000..e8b8fcf292b6f4
Binary files /dev/null and b/Telegram/Resources/icons/payments/premium_emoji.png differ
diff --git a/Telegram/Resources/icons/payments/premium_emoji@2x.png b/Telegram/Resources/icons/payments/premium_emoji@2x.png
new file mode 100644
index 00000000000000..8824f11b97c6f1
Binary files /dev/null and b/Telegram/Resources/icons/payments/premium_emoji@2x.png differ
diff --git a/Telegram/Resources/icons/payments/premium_emoji@3x.png b/Telegram/Resources/icons/payments/premium_emoji@3x.png
new file mode 100644
index 00000000000000..5bd6ad0133eb80
Binary files /dev/null and b/Telegram/Resources/icons/payments/premium_emoji@3x.png differ
diff --git a/Telegram/Resources/icons/payments/ton_emoji.svg b/Telegram/Resources/icons/payments/ton_emoji.svg
new file mode 100644
index 00000000000000..bc5b9f1ee5ee1a
--- /dev/null
+++ b/Telegram/Resources/icons/payments/ton_emoji.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>General / menu_ton</title>
+    <g id="General-/-menu_ton" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M26.0148187,12.0018928 L45.6469002,12.0007985 C48.1777253,12.0066542 49.5893649,12.0554519 50.8804395,12.462099 C52.179101,12.873841 53.3833619,13.5432922 54.423511,14.4349062 C55.5981446,15.4450073 56.4762152,16.8342664 58.2300327,19.6157469 L62.7287285,26.754584 C64.0735736,28.8873486 64.7445438,29.956693 64.9272453,31.0793566 C65.0878715,32.0687224 64.9815619,33.0847478 64.6179018,34.0178323 C64.2054439,35.0753281 63.3244687,35.9728665 61.5657134,37.7649812 L40.9297474,58.8112207 C39.2046857,60.5707515 38.3420097,61.4505169 37.3471729,61.7822803 C36.4722974,62.0725732 35.5277107,62.0725732 34.6525447,61.7822803 C33.6579983,61.4505169 32.7950318,60.5707515 31.0699702,58.8112207 L10.4340042,37.7649812 C8.67524887,35.9728665 7.79427365,35.0753281 7.38181574,34.0178323 C7.01844614,33.0847478 6.91213657,32.0687224 7.07276278,31.0793566 C7.2554642,29.9537309 7.92875816,28.8873486 9.27389376,26.754584 L13.7699754,19.6157469 C15.5237928,16.8342664 16.4018634,15.4450073 17.5764971,14.4349062 C18.6163557,13.5432922 19.8209071,12.873841 21.1192781,12.462099 C22.3516674,12.0739358 23.6941154,12.0118297 26.0148187,12.0018928 L26.0148187,12.0018928 Z M39.7838696,26.8434492 L31.9493683,29.8016705 C31.4490624,29.9905805 31.4492603,30.6983702 31.9496718,30.8870004 L39.7838696,33.8401019 L42.6683153,41.7951143 C42.8531134,42.3047691 43.5738691,42.3048571 43.7587917,41.7952475 L46.6454844,33.8401019 L54.4772842,30.8869792 C54.9776209,30.6983182 54.9778188,29.9906327 54.4775878,29.8016918 L46.6454844,26.8434492 L43.7587718,18.8907402 C43.5738178,18.3812036 42.8531647,18.3812916 42.6683351,18.8908734 L39.7838696,26.8434492 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/photo_editor/corners.svg b/Telegram/Resources/icons/photo_editor/corners.svg
new file mode 100644
index 00000000000000..09b04284330346
--- /dev/null
+++ b/Telegram/Resources/icons/photo_editor/corners.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 21 21">
+<g fill="none" fill-rule="evenodd" stroke="white" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" transform="translate(2 2)">
+<path d="m.5 4.5c0-2.209139 1.79086-4 4-4"/>
+<path d="m16.5 4.5c0-2.209139-1.79086-4-4-4"/>
+<path d="m16.5 12.5c0 2.209139-1.79086 4-4 4"/>
+<path d="m.5 12.5c0 2.209139 1.79086 4 4 4"/>
+</g>
+</svg>
diff --git a/Telegram/Resources/icons/photo_editor/ratio.svg b/Telegram/Resources/icons/photo_editor/ratio.svg
new file mode 100644
index 00000000000000..357b6dd6efc830
--- /dev/null
+++ b/Telegram/Resources/icons/photo_editor/ratio.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 21 21">
+<g fill="none" fill-rule="evenodd" stroke="white" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" transform="translate(2 2)">
+<path d="m16.5 14.5v-12c0-1.1045695-.8954305-2-2-2h-12c-1.1045695 0-2 .8954305-2 2v12c0 1.1045695.8954305 2 2 2h12c1.1045695 0 2-.8954305 2-2z"/>
+<path d="m.5 12.5h10c1.1045695 0 2-.8954305 2-2v-10"/>
+<path d="m.5 8.5h7c.55228475 0 1-.44771525 1-1v-7"/>
+</g>
+</svg>
diff --git a/Telegram/Resources/icons/player/player_settings.png b/Telegram/Resources/icons/player/player_settings.png
new file mode 100644
index 00000000000000..65a420de07ae22
Binary files /dev/null and b/Telegram/Resources/icons/player/player_settings.png differ
diff --git a/Telegram/Resources/icons/player/player_settings@2x.png b/Telegram/Resources/icons/player/player_settings@2x.png
new file mode 100644
index 00000000000000..af78b266614306
Binary files /dev/null and b/Telegram/Resources/icons/player/player_settings@2x.png differ
diff --git a/Telegram/Resources/icons/player/player_settings@3x.png b/Telegram/Resources/icons/player/player_settings@3x.png
new file mode 100644
index 00000000000000..da1ec8c72c34b0
Binary files /dev/null and b/Telegram/Resources/icons/player/player_settings@3x.png differ
diff --git a/Telegram/Resources/icons/poll/filled/filled_poll_add.svg b/Telegram/Resources/icons/poll/filled/filled_poll_add.svg
new file mode 100644
index 00000000000000..6e080bc9f866d2
--- /dev/null
+++ b/Telegram/Resources/icons/poll/filled/filled_poll_add.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Filled / filled_poll_add</title>
+    <g id="Filled-/-filled_poll_add" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M36,11 C49.8071187,11 61,22.1928813 61,36 C61,49.8071187 49.8071187,61 36,61 C22.1928813,61 11,49.8071187 11,36 C11,22.1928813 22.1928813,11 36,11 Z M36,21.8333333 C34.6192881,21.8333333 33.5,22.9526215 33.5,24.3333333 L33.4993333,33.4993333 L24.3333333,33.5 C22.9526215,33.5 21.8333333,34.6192881 21.8333333,36 C21.8333333,37.3807119 22.9526215,38.5 24.3333333,38.5 L33.4993333,38.4993333 L33.5,47.6666667 C33.5,49.0473785 34.6192881,50.1666667 36,50.1666667 C37.3807119,50.1666667 38.5,49.0473785 38.5,47.6666667 L38.4993333,38.4993333 L47.6666667,38.5 C49.0473785,38.5 50.1666667,37.3807119 50.1666667,36 C50.1666667,34.6192881 49.0473785,33.5 47.6666667,33.5 L38.4993333,33.4993333 L38.5,24.3333333 C38.5,22.9526215 37.3807119,21.8333333 36,21.8333333 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/poll/filled/filled_poll_correct.svg b/Telegram/Resources/icons/poll/filled/filled_poll_correct.svg
new file mode 100644
index 00000000000000..3ae580ee8c9032
--- /dev/null
+++ b/Telegram/Resources/icons/poll/filled/filled_poll_correct.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Filled / filled_poll_correct</title>
+    <g id="Filled-/-filled_poll_correct" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M47.2,12 C54.2692448,12 60,17.7307552 60,24.8 L60,47.2 C60,54.2692448 54.2692448,60 47.2,60 L24.8,60 C17.7307552,60 12,54.2692448 12,47.2 L12,24.8 C12,17.7307552 17.7307552,12 24.8,12 L47.2,12 Z M49.6564101,26.3327574 C48.6649568,25.3557475 47.0574935,25.3557475 46.0660402,26.3327574 L32.2666156,43.6360554 L25.9339598,37.3958969 C24.9425065,36.418887 23.3350432,36.418887 22.3435899,37.3958969 C21.3521367,38.3729068 21.3521367,39.9569529 22.3435899,40.9339628 L30.3390683,48.8129642 C31.4039625,49.8623453 33.1304972,49.8623453 34.1953915,48.8129642 L49.6564101,29.8708233 C50.6478633,28.8938134 50.6478633,27.3097674 49.6564101,26.3327574 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/poll/filled/filled_poll_country.svg b/Telegram/Resources/icons/poll/filled/filled_poll_country.svg
new file mode 100644
index 00000000000000..bf77eb160fcdfa
--- /dev/null
+++ b/Telegram/Resources/icons/poll/filled/filled_poll_country.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>Filled / filled_poll_country</title>
+    <defs>
+        <linearGradient id="filled_poll_country_gradient" x1="0%" y1="0%" x2="0%" y2="100%">
+            <stop offset="0%" stop-color="#0BC4BA"/>
+            <stop offset="100%" stop-color="#1196E4"/>
+        </linearGradient>
+    </defs>
+    <g id="Filled-/-filled_poll_country" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M36,9.33333333 C24.8,9.33333333 14.6666667,17.92 14.6666667,31.2 C14.6666667,39.68 21.2,51.7866667 34.24,63.28 C35.2533333,64.16 36.7733333,64.16 37.7866667,63.28 C50.8,51.7866667 57.3333333,39.68 57.3333333,31.2 C57.3333333,17.92 47.2,9.33333333 36,9.33333333 Z M36,37 C32.15,37 29,33.85 29,30 C29,26.15 32.15,23 36,23 C39.85,23 43,26.15 43,30 C43,33.85 39.85,37 36,37 Z" id="Shape" fill="url(#filled_poll_country_gradient)"/>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/poll/filled/filled_poll_deadline.svg b/Telegram/Resources/icons/poll/filled/filled_poll_deadline.svg
new file mode 100644
index 00000000000000..b7ce751224ca5c
--- /dev/null
+++ b/Telegram/Resources/icons/poll/filled/filled_poll_deadline.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Filled / filled_poll_deadline</title>
+    <g id="Filled-/-filled_poll_deadline" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M30.8333333,13.952381 C30.0305556,13.952381 29.3576389,13.664881 28.8145833,13.089881 C28.2715278,12.514881 28,11.802381 28,10.952381 C28,10.102381 28.2715278,9.38988095 28.8145833,8.81488095 C29.3576389,8.23988095 30.0305556,7.95238095 30.8333333,7.95238095 L42.1666667,7.95238095 C42.9694444,7.95238095 43.6423611,8.23988095 44.1854167,8.81488095 C44.7284722,9.38988095 45,10.102381 45,10.952381 C45,11.802381 44.7284722,12.514881 44.1854167,13.089881 C43.6423611,13.664881 42.9694444,13.952381 42.1666667,13.952381 L30.8333333,13.952381 Z M36.5,16.4285714 C39.0833333,16.4285714 41.5625,16.8412698 43.9375,17.6666667 C46.3125,18.4920635 48.5416667,19.6888889 50.625,21.2571429 L52.6433105,19.2929687 C53.1016439,18.8390005 54.907665,17.7189424 56.4968262,19.2929687 C58.0859874,20.8669951 56.9551595,22.8330783 56.4968262,23.2870466 L54.4785156,25.2512207 C56.061849,27.3147128 56.9166667,28.9952381 57.75,31.347619 C58.5833333,33.7 59,36.1555556 59,38.7142857 C59,41.768254 58.40625,44.6468254 57.21875,47.35 C56.03125,50.0531746 54.4166667,52.415873 52.375,54.4380952 C50.3333333,56.4603175 47.9479167,58.0595238 45.21875,59.2357143 C42.4895833,60.4119048 39.5833333,61 36.5,61 C33.4166667,61 30.5104167,60.4119048 27.78125,59.2357143 C25.0520833,58.0595238 22.6666667,56.4603175 20.625,54.4380952 C18.5833333,52.415873 16.96875,50.0531746 15.78125,47.35 C14.59375,44.6468254 14,41.768254 14,38.7142857 C14,35.6603175 14.59375,32.781746 15.78125,30.0785714 C16.96875,27.3753968 18.5833333,25.0126984 20.625,22.9904762 C22.6666667,20.968254 25.0520833,19.3690476 27.78125,18.1928571 C30.5104167,17.0166667 33.4166667,16.4285714 36.5,16.4285714 Z M36.5,25 C35.65,25 34.9375,25.2715278 34.3625,25.8145833 C33.7875,26.3576389 33.5,27.0305556 33.5,27.8333333 L33.5,39.1666667 C33.5,39.9694444 33.7875,40.6423611 34.3625,41.1854167 C34.9375,41.7284722 35.65,42 36.5,42 C37.35,42 38.0625,41.7284722 38.6375,41.1854167 C39.2125,40.6423611 39.5,39.9694444 39.5,39.1666667 L39.5,27.8333333 C39.5,27.0305556 39.2125,26.3576389 38.6375,25.8145833 C38.0625,25.2715278 37.35,25 36.5,25 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/poll/filled/filled_poll_multiple.svg b/Telegram/Resources/icons/poll/filled/filled_poll_multiple.svg
new file mode 100644
index 00000000000000..3b6e509f98051a
--- /dev/null
+++ b/Telegram/Resources/icons/poll/filled/filled_poll_multiple.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Filled / filled_poll_multiple</title>
+    <g id="Filled-/-filled_poll_multiple" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M16.5555556,17.4909091 L24.8888889,17.4909091 C27.9571375,17.4909091 30.4444444,19.978216 30.4444444,23.0464646 L30.4444444,33.2599327 C30.4444444,35.3054317 28.7862398,36.9636364 26.7407407,36.9636364 L16.5555556,36.9636364 C13.4873069,36.9636364 11,34.4763294 11,31.4080808 L11,23.0464646 C11,20.0512696 13.3702738,17.6096816 16.3374087,17.4951135 L16.5555556,17.4909091 Z M38.7777778,42.5272727 L48.962963,42.5272727 C52.0312116,42.5272727 54.5185185,45.0145797 54.5185185,48.0828283 L54.5185185,56.4444444 C54.5185185,59.5126931 52.0312116,62 48.962963,62 L40.6296296,62 C37.561381,62 35.0740741,59.5126931 35.0740741,56.4444444 L35.0740741,46.2309764 C35.0740741,44.1854774 36.7322787,42.5272727 38.7777778,42.5272727 Z M53.5925926,11 C57.6835907,11 61,14.3164093 61,18.4074074 L61,29.5185185 C61,33.6095167 57.6835907,36.9259259 53.5925926,36.9259259 L40.6296296,36.9259259 C37.561381,36.9259259 35.0740741,34.438619 35.0740741,31.3703704 L35.0740741,18.4074074 C35.0740741,14.3164093 38.3904833,11 42.4814815,11 L53.5925926,11 Z M55.6874997,18.2754929 C54.8942761,17.6298824 53.7278705,17.7495465 53.0822601,18.5427701 L45.961881,27.2911613 L42.6411074,23.4457067 C41.9726527,22.6716364 40.803255,22.586018 40.0291847,23.2544728 C39.2551144,23.9229275 39.169496,25.0923251 39.8379508,25.8663954 L44.5301306,31.2999379 C45.232008,32.1127117 46.4598755,32.202611 47.2726494,31.5007335 L47.3783678,31.402175 L47.5098592,31.2565065 L55.954777,20.8807325 C56.6003874,20.0875088 56.4807233,18.9211033 55.6874997,18.2754929 Z M18.4074074,42.5272727 L25.8148148,42.5272727 C27.8603139,42.5272727 29.5185185,44.1854774 29.5185185,46.2309764 L29.5185185,53.6612795 C29.5185185,56.2181533 27.4457627,58.2909091 24.8888889,58.2909091 L18.4074074,58.2909091 C15.8505336,58.2909091 13.7777778,56.2181533 13.7777778,53.6612795 L13.7777778,47.1569024 C13.7777778,44.6710528 15.7369798,42.6427994 18.1954893,42.5320367 L18.4074074,42.5272727 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/poll/filled/filled_poll_revote.svg b/Telegram/Resources/icons/poll/filled/filled_poll_revote.svg
new file mode 100644
index 00000000000000..caeedd891c69fb
--- /dev/null
+++ b/Telegram/Resources/icons/poll/filled/filled_poll_revote.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Filled / filled_poll_revote</title>
+    <g id="Filled-/-filled_poll_revote" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M16.7507988,28.8661257 C16.8389425,28.9366406 16.919004,29.0167022 16.9895189,29.1048458 L24.5984627,38.6160256 C24.8621457,38.9456293 24.8087064,39.4265832 24.4791027,39.6902661 C24.3435863,39.7986792 24.175208,39.8577431 24.0016625,39.8577431 L18.4910881,39.8576308 C20.2399531,48.0322807 27.4321212,54.15 36.0284229,54.15 C40.7008203,54.15 45.0859067,52.3395591 48.4025538,49.1436671 C49.5359903,48.0514976 51.3402004,48.0849512 52.4323698,49.2183877 C53.5245392,50.3518242 53.4910857,52.1560342 52.3576492,53.2482037 C47.9904523,57.4563963 42.1928815,59.85 36.0284229,59.85 C24.267193,59.85 14.5200422,51.1906554 12.6927481,39.8571048 L7.59017428,39.8577431 C7.1680756,39.8577431 6.82589701,39.5155645 6.82589701,39.0934658 C6.82589701,38.9199202 6.88496093,38.7515419 6.993374,38.6160256 L14.6023178,29.1048458 C15.1296837,28.4456385 16.0915914,28.3387598 16.7507988,28.8661257 Z M36.0284229,12.15 C47.9315923,12.15 57.7717756,21.0196149 59.4267845,32.5543871 L64.4098257,32.5540216 C64.5833713,32.5540216 64.7517496,32.6130855 64.8872659,32.7214986 C65.2168696,32.9851816 65.270309,33.4661354 65.006626,33.7957391 L57.3976822,43.3069189 C57.3271673,43.3950625 57.2471057,43.4751241 57.1589621,43.545639 C56.4997547,44.0730049 55.537847,43.9661263 55.0104811,43.3069189 L47.4015373,33.7957391 C47.2931242,33.6602228 47.2340603,33.4918445 47.2340603,33.3182989 C47.2340603,32.8962002 47.5762389,32.5540216 47.9983375,32.5540216 L53.648921,32.5542434 C52.0570804,24.1740704 44.7684992,17.85 36.0284229,17.85 C31.1883177,17.85 26.6584709,19.7937975 23.3100187,23.1970372 C22.2060923,24.319026 20.4016315,24.3336685 19.2796427,23.2297422 C18.1576539,22.1258158 18.1430114,20.321355 19.2469377,19.1993662 C23.6547728,14.71941 29.6425538,12.15 36.0284229,12.15 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/poll/filled/filled_poll_shuffle.svg b/Telegram/Resources/icons/poll/filled/filled_poll_shuffle.svg
new file mode 100644
index 00000000000000..5aaf664f55c0f7
--- /dev/null
+++ b/Telegram/Resources/icons/poll/filled/filled_poll_shuffle.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Filled / filled_poll_shuffle</title>
+    <g id="Filled-/-filled_poll_shuffle" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M21.5,11.5 C27.0228475,11.5 31.5,15.9771525 31.5,21.5 C31.5,26.9292399 27.1733292,31.3479317 21.7799048,31.4961582 L21.5,31.5 C15.9771525,31.5 11.5,27.0228475 11.5,21.5 C11.5,15.9771525 15.9771525,11.5 21.5,11.5 Z M50.5,40.3888889 C56.0228475,40.3888889 60.5,44.8660414 60.5,50.3888889 C60.5,55.8181288 56.1733292,60.2368206 50.7799048,60.3850471 L50.5,60.3888889 C44.9771525,60.3888889 40.5,55.9117364 40.5,50.3888889 C40.5,44.8660414 44.9771525,40.3888889 50.5,40.3888889 Z M22.786139,36.3751698 L30.4647439,44.0537747 C31.5191595,45.1081902 31.5191595,46.8177357 30.4647439,47.8721513 C29.4103283,48.9265669 27.7007828,48.9265669 26.6463672,47.8721513 L22.9218889,44.148 L22.9222222,51.5185185 C22.9222222,52.5842235 23.7861468,53.4481481 24.8518519,53.4481481 L32.2592593,53.4481481 C33.7504281,53.4481481 34.9592593,54.6569793 34.9592593,56.1481481 C34.9592593,57.639317 33.7504281,58.8481481 32.2592593,58.8481481 L24.8518519,58.8481481 C20.8038092,58.8481481 17.5222222,55.5665612 17.5222222,51.5185185 L17.5218889,44.148 L13.7980772,47.8721513 C12.7436616,48.9265669 11.0341162,48.9265669 9.97970058,47.8721513 C8.92528499,46.8177357 8.92528499,45.1081902 9.97970058,44.0537747 L17.6583054,36.3751698 C19.0743176,34.9591577 21.3701269,34.9591577 22.786139,36.3751698 Z M46.1481481,11.9296296 C50.1961908,11.9296296 53.4777778,15.2112166 53.4777778,19.2592593 L53.4768889,26.629 L57.2019228,22.9056265 C58.2563384,21.8512109 59.9658838,21.8512109 61.0202994,22.9056265 C62.074715,23.9600421 62.074715,25.6695875 61.0202994,26.7240031 L53.3416946,34.402608 C51.9256824,35.8186201 49.6298731,35.8186201 48.213861,34.402608 L40.5352561,26.7240031 C39.4808405,25.6695875 39.4808405,23.9600421 40.5352561,22.9056265 C41.5896717,21.8512109 43.2992172,21.8512109 44.3536328,22.9056265 L48.0768889,26.629 L48.0777778,19.2592593 C48.0777778,18.1935542 47.2138532,17.3296296 46.1481481,17.3296296 L38.7407407,17.3296296 C37.2495719,17.3296296 36.0407407,16.1207985 36.0407407,14.6296296 C36.0407407,13.1384608 37.2495719,11.9296296 38.7407407,11.9296296 L46.1481481,11.9296296 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/poll/filled/filled_poll_subscribers.svg b/Telegram/Resources/icons/poll/filled/filled_poll_subscribers.svg
new file mode 100644
index 00000000000000..52b73e4d19030a
--- /dev/null
+++ b/Telegram/Resources/icons/poll/filled/filled_poll_subscribers.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>Filled / filled_poll_subscribers</title>
+    <g id="Filled-/-filled_poll_subscribers" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M37.8519595,55.9901058 L12.721202,55.9901058 C10.9567905,55.9901058 9.72882062,55.6937689 9.03729237,55.1010952 C8.34576412,54.5084214 8,53.6705918 8,52.5876063 C8,51.1691958 8.40371843,49.6771286 9.21115528,48.1114047 C10.0185921,46.5456808 11.1756044,45.083174 12.6821921,43.7238842 C14.1887799,42.3645945 16.0058771,41.2577897 18.1334839,40.4034698 C20.2610906,39.5491498 22.6449518,39.1219899 25.2850674,39.1219899 C27.9251831,39.1219899 30.3074749,39.5491498 32.4319429,40.4034698 C34.556411,41.2577897 36.375526,42.3645945 37.8892879,43.7238842 C39.4030498,45.083174 40.5621359,46.5456808 41.3665462,48.1114047 C42.1709564,49.6771286 42.5731615,51.1691958 42.5731615,52.5876063 C42.5731615,53.6705918 42.2273413,54.5084214 41.535701,55.1010952 C40.8440606,55.6937689 39.6161468,55.9901058 37.8519595,55.9901058 Z M24.5707386,35.2383399 C22.9441021,35.2383399 21.4612492,34.8051733 20.1221797,33.9388401 C18.7831101,33.072507 17.7140307,31.905829 16.9149414,30.4388063 C16.115852,28.9717836 15.7163074,27.3235967 15.7163074,25.4942457 C15.7163074,23.7307072 16.1196783,22.1312815 16.9264201,20.6959685 C17.733162,19.2606555 18.8077417,18.1191658 20.1501591,17.2714995 C21.4925766,16.4238332 22.9661031,16 24.5707386,16 C26.1753741,16 27.6488408,16.4282606 28.9911387,17.2847817 C30.3334366,18.1413028 31.4080163,19.2909891 32.2148777,20.7338406 C33.0217391,22.1766922 33.4251698,23.7755795 33.4251698,25.5305024 C33.4184739,27.3356823 33.0155813,28.9717836 32.2164919,30.4388063 C31.4174026,31.905829 30.3461111,33.072507 29.0026175,33.9388401 C27.6591239,34.8051733 26.1818309,35.2383399 24.5707386,35.2383399 Z M60.001153,56 L45.0075786,56 C45.5691861,55.1381067 45.8683177,54.1102111 45.9049735,52.916313 C45.9416293,51.7224149 45.7426006,50.4576696 45.3078872,49.1220771 C44.8731739,47.7864846 44.2320334,46.4733066 43.3844657,45.1825433 C42.536898,43.89178 41.5086855,42.7183421 40.2998283,41.6622297 C41.3965882,40.9205324 42.6701257,40.3033064 44.1204405,39.8105517 C45.5707554,39.317797 47.1795759,39.0714196 48.9469019,39.0714196 C51.193556,39.0714196 53.2382668,39.4701796 55.0810343,40.2676996 C56.9238019,41.0652196 58.5113238,42.1123539 59.8436002,43.4091026 C61.1758767,44.7058514 62.2016791,46.1210249 62.9210074,47.6546232 C63.6403358,49.1882216 64,50.6843808 64,52.1431009 C64,53.3641164 63.7023256,54.3121868 63.1069769,54.9873121 C62.5116281,55.6624374 61.4763535,56 60.001153,56 Z M48.8634231,35.7209561 C47.4577528,35.7209561 46.1711747,35.3756832 45.0036888,34.6851375 C43.8362029,33.9945917 42.9026566,33.061349 42.2030498,31.8854093 C41.5034431,30.7094695 41.1536398,29.3936836 41.1536398,27.9380514 C41.1536398,26.520679 41.5051171,25.237106 42.2080718,24.0873325 C42.9110265,22.937559 43.8462468,22.0239409 45.0137327,21.3464782 C46.1812186,20.6690156 47.4644487,20.3302842 48.8634231,20.3302842 C50.2626365,20.3302842 51.5476004,20.6730284 52.7183147,21.3585169 C53.889029,22.0440053 54.8264016,22.9636702 55.5304324,24.1175116 C56.2344632,25.271353 56.5832503,26.5559704 56.5769671,27.9713638 C56.5769671,29.4127035 56.2263922,30.7193643 55.5255898,31.8913461 C54.8247874,33.0633279 53.8906432,33.9945917 52.7231573,34.6851375 C51.5556714,35.3756832 50.2690933,35.7209561 48.8634231,35.7209561 Z" id="Shape" fill="#FFFFFF"/>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/poll/filled/filled_poll_view.svg b/Telegram/Resources/icons/poll/filled/filled_poll_view.svg
new file mode 100644
index 00000000000000..514b04efbd41b1
--- /dev/null
+++ b/Telegram/Resources/icons/poll/filled/filled_poll_view.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Filled / filled_poll_view</title>
+    <g id="Filled-/-filled_poll_view" stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M36,14 C50.34375,14 63,28.6467438 63,35.5 C63,42.3532562 50.34375,57 36,57 C21.65625,57 9,42.2272172 9,35.5 C9,28.7727828 21.65625,14 36,14 Z M36,21.1666667 C28.2680135,21.1666667 22,27.5839186 22,35.5 C22,43.4160814 28.2680135,49.8333333 36,49.8333333 C43.7319865,49.8333333 50,43.4160814 50,35.5 C50,27.5839186 43.7319865,21.1666667 36,21.1666667 Z M36,26.2857143 C40.9705627,26.2857143 45,30.4110905 45,35.5 C45,40.5889095 40.9705627,44.7142857 36,44.7142857 C31.0294373,44.7142857 27,40.5889095 27,35.5 C27,30.4110905 31.0294373,26.2857143 36,26.2857143 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/poll/general/menu_poll_order.svg b/Telegram/Resources/icons/poll/general/menu_poll_order.svg
new file mode 100644
index 00000000000000..a680acd98c548b
--- /dev/null
+++ b/Telegram/Resources/icons/poll/general/menu_poll_order.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>General / menu_poll_order</title>
+    <g id="General-/-menu_poll_order" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M59.25,22 C59.25,23.2426407 58.2426407,24.25 57,24.25 L15,24.25 C13.7573593,24.25 12.75,23.2426407 12.75,22 C12.75,20.7573593 13.7573593,19.75 15,19.75 L57,19.75 C58.2426407,19.75 59.25,20.7573593 59.25,22 Z M59.25,36.0001 C59.25,37.2427407 58.2426407,38.2501 57,38.2501 L15,38.2501 C13.7573593,38.2501 12.75,37.2427407 12.75,36.0001 C12.75,34.7574593 13.7573593,33.7501 15,33.7501 L57,33.7501 C58.2426407,33.7501 59.25,34.7574593 59.25,36.0001 Z M59.25,50.0002 C59.25,51.2428407 58.2426407,52.2502 57,52.2502 L15,52.2502 C13.7573593,52.2502 12.75,51.2428407 12.75,50.0002 C12.75,48.7575593 13.7573593,47.7502 15,47.7502 L57,47.7502 C58.2426407,47.7502 59.25,48.7575593 59.25,50.0002 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/poll/general/outline_poll_add.svg b/Telegram/Resources/icons/poll/general/outline_poll_add.svg
new file mode 100644
index 00000000000000..afb9d1a4d92e9d
--- /dev/null
+++ b/Telegram/Resources/icons/poll/general/outline_poll_add.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>General / outline_poll_add</title>
+    <g id="General-/-outline_poll_add" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M36,14.6 C37.3254834,14.6 38.4,15.6745166 38.4,17 L38.4,33.599 L55,33.6 C56.3254834,33.6 57.4,34.6745166 57.4,36 C57.4,37.3254834 56.3254834,38.4 55,38.4 L38.4,38.399 L38.4,55 C38.4,56.3254834 37.3254834,57.4 36,57.4 C34.6745166,57.4 33.6,56.3254834 33.6,55 L33.6,38.399 L17,38.4 C15.6745166,38.4 14.6,37.3254834 14.6,36 C14.6,34.6745166 15.6745166,33.6 17,33.6 L33.6,33.599 L33.6,17 C33.6,15.6745166 34.6745166,14.6 36,14.6 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/poll/general/outline_poll_attach.svg b/Telegram/Resources/icons/poll/general/outline_poll_attach.svg
new file mode 100644
index 00000000000000..5e2de24f5ae12c
--- /dev/null
+++ b/Telegram/Resources/icons/poll/general/outline_poll_attach.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>General / outline_poll_attach</title>
+    <g id="General-/-outline_poll_attach" stroke="none" fill="none" stroke-linecap="round" stroke-width="4.7">
+        <path d="M15.238686,27.5983631 L27.7824856,15.0545635 C35.007185,7.82986412 46.7207371,7.82986412 53.9454365,15.0545635 C61.1701359,22.2792629 61.1701359,33.992815 53.9454365,41.2175144 L37.3646961,57.7982548 C32.2678495,62.8951014 24.0042284,62.8951014 18.9073818,57.7982548 C13.9035223,52.7943953 13.9035223,44.681536 18.9073818,39.6776765 C18.9629866,39.6220717 19.0191022,39.5669799 19.0757213,39.5124082 L36.1473675,23.0580944 C38.8308397,20.47166 43.0808084,20.4755332 45.7595618,23.0668544 C48.3005825,25.5249383 48.367816,29.5775132 45.9097321,32.1185338 C45.8463292,32.1840759 45.7815331,32.2482557 45.7153881,32.3110293 L28.3704571,48.7718787 L28.3704571,48.7718787" id="Attach" stroke="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/poll/general/outline_poll_emoji.svg b/Telegram/Resources/icons/poll/general/outline_poll_emoji.svg
new file mode 100644
index 00000000000000..2a52749d7d4df9
--- /dev/null
+++ b/Telegram/Resources/icons/poll/general/outline_poll_emoji.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>General / outline_poll_emoji</title>
+    <g id="General-/-outline_poll_emoji" stroke="none" fill="none" fill-rule="nonzero">
+        <path d="M36,7 C52.0162577,7 65,19.9837423 65,36 C65,52.0162577 52.0162577,65 36,65 C19.9837423,65 7,52.0162577 7,36 C7,19.9837423 19.9837423,7 36,7 Z M36,11.7 C22.5794806,11.7 11.7,22.5794806 11.7,36 C11.7,49.4205194 22.5794806,60.3 36,60.3 C49.4205194,60.3 60.3,49.4205194 60.3,36 C60.3,22.5794806 49.4205194,11.7 36,11.7 Z M48.8529415,40.9299989 C49.8673051,41.6219793 50.1286483,43.0052446 49.4366678,44.0196082 C46.3560807,48.5353937 41.3624832,51.2849169 35.9183931,51.2849169 C30.5877028,51.2849169 25.6851705,48.6491709 22.5874806,44.2887303 C21.8763436,43.2877035 22.1113457,41.8997205 23.1123725,41.1885834 C24.1133994,40.4774464 25.5013824,40.7124485 26.2125194,41.7134754 C28.4917077,44.9217582 32.0564155,46.8382502 35.9183931,46.8382502 C39.8628867,46.8382502 43.4955082,44.8380936 45.7633322,41.5137251 C46.4553127,40.4993615 47.8385779,40.2380184 48.8529415,40.9299989 Z M27.3,26.5266667 C29.1685634,26.5266667 30.6833333,28.474228 30.6833333,30.8766667 C30.6833333,33.2791053 29.1685634,35.2266667 27.3,35.2266667 C25.4314366,35.2266667 23.9166667,33.2791053 23.9166667,30.8766667 C23.9166667,28.474228 25.4314366,26.5266667 27.3,26.5266667 Z M44.7,26.5266667 C46.5685634,26.5266667 48.0833333,28.474228 48.0833333,30.8766667 C48.0833333,33.2791053 46.5685634,35.2266667 44.7,35.2266667 C42.8314366,35.2266667 41.3166667,33.2791053 41.3166667,30.8766667 C41.3166667,28.474228 42.8314366,26.5266667 44.7,26.5266667 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/poll/toast_hide_results.tgs b/Telegram/Resources/icons/poll/toast_hide_results.tgs
new file mode 100644
index 00000000000000..7e489655e3ec60
Binary files /dev/null and b/Telegram/Resources/icons/poll/toast_hide_results.tgs differ
diff --git a/Telegram/Resources/icons/poll/uploading.tgs b/Telegram/Resources/icons/poll/uploading.tgs
new file mode 100644
index 00000000000000..77973c55634fae
Binary files /dev/null and b/Telegram/Resources/icons/poll/uploading.tgs differ
diff --git a/Telegram/Resources/icons/profile/call.svg b/Telegram/Resources/icons/profile/call.svg
new file mode 100644
index 00000000000000..4882bb62286bb5
--- /dev/null
+++ b/Telegram/Resources/icons/profile/call.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path d="M19.035,15.184L16.561,14.901C15.786,14.771 14.725,15.259 13.376,16.365C13.315,16.416 13.142,16.533 12.95,16.54C12.764,16.547 12.56,16.444 12.493,16.408C10.162,15.134 8.734,13.687 7.467,11.306C7.435,11.247 7.356,11.086 7.38,10.938C7.402,10.802 7.524,10.676 7.567,10.624C8.595,9.364 9.108,8.299 9.108,7.429L8.826,4.974C8.709,3.99 7.881,3.25 6.887,3.25L5.202,3.25C4.101,3.25 3.185,4.166 3.254,5.267C3.77,13.586 10.424,20.23 18.733,20.746C19.834,20.815 20.75,19.899 20.75,18.798L20.75,17.113C20.76,16.129 20.019,15.301 19.035,15.184Z" fill="#FFFFFF"/>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/profile/gift.svg b/Telegram/Resources/icons/profile/gift.svg
new file mode 100644
index 00000000000000..0d6880abee5314
--- /dev/null
+++ b/Telegram/Resources/icons/profile/gift.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path d="M11.157,13.843L11.157,21.158L7.506,21.158C6.265,21.158 5.26,20.152 5.26,18.911L5.26,13.843L11.157,13.843ZM18.741,13.829L18.74,18.911C18.74,20.152 17.735,21.158 16.494,21.158L12.842,21.158L12.842,13.843L18.6,13.843C18.648,13.843 18.695,13.838 18.741,13.829ZM14.727,3.208C15.308,3.208 15.832,3.33 16.301,3.575C16.77,3.819 17.144,4.158 17.423,4.591C17.702,5.025 17.841,5.519 17.841,6.075C17.841,6.454 17.768,6.802 17.622,7.119C17.492,7.402 17.319,7.652 17.104,7.871L17.037,7.935L19.302,7.935C19.923,7.935 20.426,8.438 20.426,9.058L20.426,11.313C20.426,11.933 19.923,12.436 19.302,12.436L18.74,12.436L18.741,12.45C18.695,12.441 18.648,12.436 18.6,12.436L12.842,12.436L12.842,7.951L11.16,7.951L11.16,6.729C11.16,6.118 10.977,5.631 10.611,5.268C10.245,4.905 9.804,4.723 9.287,4.723C8.8,4.723 8.403,4.853 8.097,5.114C7.79,5.375 7.637,5.736 7.637,6.197C7.637,6.668 7.827,7.078 8.207,7.427C8.521,7.715 8.94,7.885 9.464,7.935L11.157,7.935L11.157,12.436L4.698,12.436C4.077,12.436 3.574,11.933 3.574,11.313L3.574,9.058C3.574,8.438 4.077,7.935 4.698,7.935L6.849,7.935C6.603,7.702 6.408,7.43 6.265,7.119C6.119,6.802 6.046,6.454 6.046,6.075C6.046,5.519 6.185,5.025 6.464,4.591C6.743,4.158 7.118,3.819 7.59,3.575C8.061,3.33 8.585,3.208 9.16,3.208C9.8,3.208 10.369,3.371 10.868,3.698C11.367,4.025 11.727,4.487 11.948,5.085C12.169,4.487 12.527,4.025 13.023,3.698C13.519,3.371 14.087,3.208 14.727,3.208ZM14.608,4.723C14.087,4.723 13.643,4.905 13.276,5.268C12.91,5.631 12.843,6.118 12.843,6.729L12.842,7.935L14.423,7.935C14.909,7.888 15.305,7.739 15.61,7.487L15.679,7.427C16.059,7.078 16.249,6.668 16.249,6.197C16.249,5.736 16.096,5.375 15.79,5.114C15.484,4.853 15.09,4.723 14.608,4.723Z" fill="#FFFFFF"/>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/profile/join.svg b/Telegram/Resources/icons/profile/join.svg
new file mode 100644
index 00000000000000..7c53bdae005b28
--- /dev/null
+++ b/Telegram/Resources/icons/profile/join.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path d="M17.176,12.972C19.682,12.972 21.713,15.004 21.713,17.509C21.713,20.015 19.682,22.046 17.176,22.046C14.67,22.046 12.639,20.015 12.639,17.509C12.639,15.004 14.67,12.972 17.176,12.972ZM11.343,12.729C11.998,12.729 12.619,12.78 13.209,12.881C11.869,14.011 11.019,15.701 11.019,17.59C11.019,18.624 11.273,19.598 11.723,20.453L5.218,20.453C4.358,20.453 3.759,20.317 3.422,20.046C3.085,19.774 2.917,19.391 2.917,18.895C2.917,18.245 3.113,17.562 3.505,16.845C3.897,16.128 4.462,15.459 5.2,14.836C5.938,14.214 6.824,13.707 7.86,13.316C8.895,12.925 10.056,12.729 11.343,12.729ZM17.176,14.593C16.848,14.593 16.582,14.858 16.582,15.186L16.582,16.915L14.853,16.915C14.525,16.915 14.259,17.181 14.259,17.509C14.259,17.837 14.525,18.103 14.853,18.103L16.582,18.103L16.582,19.832C16.582,20.16 16.848,20.426 17.176,20.426C17.504,20.426 17.77,20.16 17.77,19.832L17.77,18.103L19.499,18.103C19.827,18.103 20.093,17.837 20.093,17.509C20.093,17.181 19.827,16.915 19.499,16.915L17.77,16.915L17.77,15.186C17.77,14.858 17.504,14.593 17.176,14.593ZM11.343,10.974C12.117,10.974 12.822,10.784 13.459,10.405C14.096,10.025 14.605,9.514 14.985,8.872C15.365,8.229 15.556,7.507 15.556,6.706C15.556,5.934 15.364,5.233 14.98,4.605C14.596,3.976 14.085,3.476 13.446,3.105C12.807,2.733 12.106,2.548 11.343,2.548C10.579,2.548 9.878,2.735 9.239,3.111C8.601,3.486 8.089,3.989 7.705,4.621C7.322,5.253 7.13,5.953 7.13,6.722C7.133,7.513 7.325,8.229 7.705,8.872C8.085,9.514 8.595,10.025 9.234,10.405C9.873,10.784 10.576,10.974 11.343,10.974Z" fill="#FFFFFF" fill-rule="evenodd"/>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/profile/leave.svg b/Telegram/Resources/icons/profile/leave.svg
new file mode 100644
index 00000000000000..a91a104440aaee
--- /dev/null
+++ b/Telegram/Resources/icons/profile/leave.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path d="M12.329,3.574C13.94,3.574 15.245,4.88 15.245,6.491L15.245,7.463C15.245,8 14.81,8.435 14.273,8.435C13.736,8.435 13.301,8 13.301,7.463L13.301,6.491C13.301,5.954 12.866,5.519 12.329,5.519L6.171,5.519C5.634,5.519 5.199,5.954 5.199,6.491L5.199,17.509C5.199,18.046 5.634,18.481 6.171,18.481L12.329,18.481C12.866,18.481 13.301,18.046 13.301,17.509L13.301,16.537C13.301,16 13.736,15.565 14.273,15.565C14.81,15.565 15.245,16 15.245,16.537L15.245,17.509C15.245,19.12 13.94,20.426 12.329,20.426L6.171,20.426C4.56,20.426 3.255,19.12 3.255,17.509L3.255,6.491C3.255,4.88 4.56,3.574 6.171,3.574L12.329,3.574ZM19.045,7.945L21.927,11.13C22.374,11.624 22.374,12.376 21.927,12.87L19.045,16.055C18.685,16.453 18.07,16.484 17.672,16.124C17.274,15.763 17.243,15.149 17.603,14.751L19.212,12.972L10.06,12.972C9.523,12.972 9.088,12.537 9.088,12C9.088,11.463 9.523,11.028 10.06,11.028L19.212,11.028L17.603,9.249C17.257,8.867 17.272,8.285 17.626,7.921L17.672,7.876C18.07,7.516 18.685,7.547 19.045,7.945Z" fill="#FFFFFF" fill-rule="nonzero"/>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/profile/live_stream.svg b/Telegram/Resources/icons/profile/live_stream.svg
new file mode 100644
index 00000000000000..936e77506b8957
--- /dev/null
+++ b/Telegram/Resources/icons/profile/live_stream.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path d="M18.167,6.519C18.961,6.519 19.606,7.163 19.606,7.957L19.606,16.043C19.606,16.837 18.961,17.481 18.167,17.481C17.372,17.481 16.728,16.837 16.728,16.043L16.728,7.957C16.728,7.163 17.372,6.519 18.167,6.519ZM5.833,6.519C6.628,6.519 7.272,7.163 7.272,7.957L7.272,16.043C7.272,16.837 6.628,17.481 5.833,17.481C5.039,17.481 4.394,16.837 4.394,16.043L4.394,7.957C4.394,7.163 5.039,6.519 5.833,6.519ZM12,3.435C12.795,3.435 13.439,4.079 13.439,4.874L13.439,19.126C13.439,19.921 12.795,20.565 12,20.565C11.205,20.565 10.561,19.921 10.561,19.126L10.561,4.874C10.561,4.079 11.205,3.435 12,3.435Z" fill="#FFFFFF" fill-rule="evenodd"/>
+</svg>
diff --git a/Telegram/Resources/icons/profile/message.svg b/Telegram/Resources/icons/profile/message.svg
new file mode 100644
index 00000000000000..685cf25a68df6d
--- /dev/null
+++ b/Telegram/Resources/icons/profile/message.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path d="M12.009,2.759C17.307,2.759 21.602,6.688 21.602,11.533C21.602,16.379 17.307,20.307 12.009,20.307C10.566,20.307 9.197,20.016 7.969,19.494C7.602,19.784 7.273,20.004 6.98,20.154C6.092,20.609 5.496,20.772 4.144,20.914C3.778,20.952 3.534,20.625 3.819,20.34C4.452,19.708 4.793,18.577 4.966,17.49C3.384,15.925 2.417,13.833 2.417,11.533C2.417,6.688 6.711,2.759 12.009,2.759Z" fill="#FFFFFF" fill-rule="evenodd"/>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/profile/mute.svg b/Telegram/Resources/icons/profile/mute.svg
new file mode 100644
index 00000000000000..d9fea015edcfda
--- /dev/null
+++ b/Telegram/Resources/icons/profile/mute.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path d="M11.922,2.528C12.663,2.528 13.264,3.129 13.264,3.87L13.264,4.492C16.232,5.216 18.32,7.681 18.32,10.805L18.32,14.987C18.32,15.133 18.373,15.273 18.47,15.382L19.678,16.735C20.342,17.382 19.668,18.491 18.731,18.491L5.261,18.491C4.324,18.491 3.661,17.382 4.324,16.735L5.532,15.382C5.629,15.273 5.682,15.133 5.682,14.987L5.682,10.805C5.682,7.735 7.675,5.317 10.556,4.538L10.556,3.87C10.556,3.151 11.121,2.564 11.831,2.529L11.922,2.528ZM12.001,21.472C13.159,21.472 14.107,20.558 14.107,19.525L9.895,19.525C9.895,20.558 10.832,21.472 12.001,21.472Z" fill="#FFFFFF"/>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/profile/profile_manage.png b/Telegram/Resources/icons/profile/profile_manage.png
new file mode 100644
index 00000000000000..38f1a731dd7b2e
Binary files /dev/null and b/Telegram/Resources/icons/profile/profile_manage.png differ
diff --git a/Telegram/Resources/icons/profile/profile_manage@2x.png b/Telegram/Resources/icons/profile/profile_manage@2x.png
new file mode 100644
index 00000000000000..e5ab30a5183b9f
Binary files /dev/null and b/Telegram/Resources/icons/profile/profile_manage@2x.png differ
diff --git a/Telegram/Resources/icons/profile/profile_manage@3x.png b/Telegram/Resources/icons/profile/profile_manage@3x.png
new file mode 100644
index 00000000000000..8bf97111c72722
Binary files /dev/null and b/Telegram/Resources/icons/profile/profile_manage@3x.png differ
diff --git a/Telegram/Resources/icons/profile/profile_more.png b/Telegram/Resources/icons/profile/profile_more.png
new file mode 100644
index 00000000000000..a35e32ff9580cf
Binary files /dev/null and b/Telegram/Resources/icons/profile/profile_more.png differ
diff --git a/Telegram/Resources/icons/profile/profile_more@2x.png b/Telegram/Resources/icons/profile/profile_more@2x.png
new file mode 100644
index 00000000000000..c7ceb94e5875f0
Binary files /dev/null and b/Telegram/Resources/icons/profile/profile_more@2x.png differ
diff --git a/Telegram/Resources/icons/profile/profile_more@3x.png b/Telegram/Resources/icons/profile/profile_more@3x.png
new file mode 100644
index 00000000000000..3851073ed9f03b
Binary files /dev/null and b/Telegram/Resources/icons/profile/profile_more@3x.png differ
diff --git a/Telegram/Resources/icons/profile/report.svg b/Telegram/Resources/icons/profile/report.svg
new file mode 100644
index 00000000000000..2dc982d75f7e99
--- /dev/null
+++ b/Telegram/Resources/icons/profile/report.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path d="M12,2.833C17.063,2.833 21.167,6.937 21.167,12C21.167,17.063 17.063,21.167 12,21.167C6.937,21.167 2.833,17.063 2.833,12C2.833,6.937 6.937,2.833 12,2.833ZM12,14.444C11.347,14.444 10.813,14.957 10.779,15.602L10.778,15.689C10.778,16.364 11.325,16.911 12,16.911C12.653,16.911 13.187,16.398 13.221,15.754L13.222,15.667C13.222,14.992 12.675,14.444 12,14.444ZM12,7.111C11.404,7.111 10.922,7.594 10.922,8.19L10.922,11.995C10.922,12.591 11.404,13.074 12,13.074C12.596,13.074 13.078,12.591 13.078,11.995L13.078,8.19C13.078,7.594 12.596,7.111 12,7.111Z" fill="#FFFFFF" fill-rule="evenodd"/>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/profile/unmute.svg b/Telegram/Resources/icons/profile/unmute.svg
new file mode 100644
index 00000000000000..80bd6c2fa4ad0c
--- /dev/null
+++ b/Telegram/Resources/icons/profile/unmute.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path d="M14.107,19.525C14.107,20.558 13.159,21.472 12.001,21.472C10.832,21.472 9.895,20.558 9.895,19.525L14.107,19.525ZM3.505,3.471L20.618,19.654C20.962,19.979 20.977,20.52 20.652,20.864C20.327,21.207 19.786,21.222 19.443,20.898L2.329,4.714C1.986,4.389 1.971,3.848 2.295,3.505C2.62,3.161 3.162,3.146 3.505,3.471ZM5.718,10.105L14.585,18.491L5.261,18.491C4.324,18.491 3.661,17.382 4.324,16.735L5.532,15.382C5.629,15.273 5.682,15.133 5.682,14.987L5.682,10.805C5.682,10.568 5.694,10.334 5.718,10.105ZM11.922,2.528C12.663,2.528 13.264,3.129 13.264,3.87L13.264,4.492C16.232,5.216 18.32,7.681 18.32,10.805L18.32,14.987C18.32,15.133 18.373,15.273 18.47,15.382L18.781,15.73L8.174,5.699C8.862,5.176 9.666,4.779 10.556,4.538L10.556,3.87C10.556,3.151 11.121,2.564 11.831,2.529L11.922,2.528Z" fill="#FFFFFF" fill-rule="nonzero"/>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/send_media/send_media_cross.svg b/Telegram/Resources/icons/send_media/send_media_cross.svg
new file mode 100644
index 00000000000000..50abac8af803db
--- /dev/null
+++ b/Telegram/Resources/icons/send_media/send_media_cross.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>Icon / SendMedia / cross</title>
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M8.2,7.2 L7.2,8.2 L10.99,12 L7.2,15.8 L8.2,16.8 L12,13.01 L15.8,16.8 L16.8,15.8 L13.01,12 L16.8,8.2 L15.8,7.2 L12,10.99 L8.2,7.2 Z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/send_media/send_media_more.svg b/Telegram/Resources/icons/send_media/send_media_more.svg
new file mode 100644
index 00000000000000..b7ddcad3ec7173
--- /dev/null
+++ b/Telegram/Resources/icons/send_media/send_media_more.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>Icon / SendMedia / more_vertical</title>
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <circle fill="#FFFFFF" cx="12" cy="6.5" r="1.5"></circle>
+        <circle fill="#FFFFFF" cx="12" cy="12" r="1.5"></circle>
+        <circle fill="#FFFFFF" cx="12" cy="17.5" r="1.5"></circle>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/settings/birthday_add.svg b/Telegram/Resources/icons/settings/birthday_add.svg
new file mode 100644
index 00000000000000..a370aba0dc1ddc
--- /dev/null
+++ b/Telegram/Resources/icons/settings/birthday_add.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / birthday_add</title>
+    <g id="Icon-/-Menu-/-birthday_add" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M19.4857266,16.2888889 C19.8170975,16.2888889 20.0857266,16.557518 20.0857266,16.8888889 L20.0856667,18.7328889 L21.9305556,18.7333333 C22.2287893,18.7333333 22.4762023,18.9509229 22.5227026,19.2360102 L22.5305556,19.3333333 C22.5305556,19.6647042 22.2619264,19.9333333 21.9305556,19.9333333 L20.0856667,19.9328889 L20.0857266,21.7777778 C20.0857266,22.0760115 19.868137,22.3234245 19.5830498,22.3699248 L19.4857266,22.3777778 C19.1543558,22.3777778 18.8857266,22.1091486 18.8857266,21.7777778 L18.8856667,19.9328889 L17.0416667,19.9333333 C16.7434329,19.9333333 16.4960199,19.7157437 16.4495197,19.4306564 L16.4416667,19.3333333 C16.4416667,19.0019625 16.7102958,18.7333333 17.0416667,18.7333333 L18.8856667,18.7328889 L18.8857266,16.8888889 C18.8857266,16.5906551 19.1033163,16.3432421 19.3884035,16.2967419 L19.4857266,16.2888889 Z M8.41204757,10.3213892 C8.4968615,10.6417222 8.30593555,10.9701587 7.98560254,11.0549726 C6.00141779,11.5803212 4.96111111,12.4866846 4.96111111,13.4472478 C4.96111111,13.5837542 4.98907974,13.7199344 5.04305686,13.8546242 C5.05815315,13.8780132 5.06968916,13.9034625 5.07949993,13.9299664 C5.67337842,15.1862671 8.51737301,16.291625 12,16.291625 C15.9250424,16.291625 19.0388889,14.8875907 19.0388889,13.4472478 C19.0388889,12.5127848 18.0774561,11.638341 16.2036879,11.1068602 C15.8848931,11.0164364 15.6997618,10.684699 15.7901857,10.3659042 C15.8806095,10.0471093 16.2123468,9.86197804 16.5311417,9.95240189 C18.8627692,10.6137512 20.2388889,11.8653615 20.2388889,13.4472478 C20.2388889,13.979393 20.0501074,14.4768826 19.7060685,14.9283577 C19.6140075,14.9115452 19.5205276,14.9027778 19.425,14.9027778 C18.6281077,14.9027778 17.9737164,15.5128973 17.9034658,16.2914966 L17.9034247,16.3114033 C16.4008483,17.0540936 14.3028164,17.491625 12,17.491625 C9.47842329,17.491625 7.20238688,16.967017 5.68481102,16.0915954 L6.42111111,18.7214444 L6.44,18.7222222 L6.44511111,18.8074444 L6.45530551,18.8430624 L6.4709096,18.9292533 C6.76328017,19.9158038 9.09544378,20.8722222 12,20.8722222 C13.262879,20.8722222 14.4175503,20.6914166 15.3434009,20.4059417 C15.6196573,20.6869274 16.004765,20.8611111 16.4305556,20.8611111 L17.2836209,20.8606349 C16.0386964,21.6207641 14.1238391,22.0722222 12,22.0722222 C8.52835644,22.0722222 5.61510021,20.8659524 5.27347003,19.0770457 L3.95558458,14.3602924 C3.82830877,14.0698882 3.76111111,13.7647359 3.76111111,13.4472478 C3.76111111,11.8222874 5.22885268,10.5435228 7.67846416,9.89494413 C7.99879717,9.81013021 8.32723365,10.0010562 8.41204757,10.3213892 Z M12.4583333,7.42777778 C13.380342,7.42777778 14.1277778,8.17521351 14.1277778,9.09722222 L14.1277778,13.0694444 C14.1277778,13.9914532 13.380342,14.7388889 12.4583333,14.7388889 L11.8472222,14.7388889 C10.9252135,14.7388889 10.1777778,13.9914532 10.1777778,13.0694444 L10.1777778,9.09722222 C10.1777778,8.17521351 10.9252135,7.42777778 11.8472222,7.42777778 L12.4583333,7.42777778 Z M12.4583333,8.62777778 L11.8472222,8.62777778 C11.5879552,8.62777778 11.3777778,8.83795521 11.3777778,9.09722222 L11.3777778,13.0694444 C11.3777778,13.3287115 11.5879552,13.5388889 11.8472222,13.5388889 L12.4583333,13.5388889 C12.7176003,13.5388889 12.9277778,13.3287115 12.9277778,13.0694444 L12.9277778,9.09722222 C12.9277778,8.83795521 12.7176003,8.62777778 12.4583333,8.62777778 Z M12.0207549,1.46944444 C12.8988738,1.46944444 14.1277778,3.40600437 14.1277778,4.64408449 C14.1277778,6.06372135 13.4385567,6.82401696 12,6.82401696 C10.3912998,6.82401696 9.40287158,5.20228362 10.2271046,3.79129771 L10.3125678,3.6554701 C10.6068441,3.21972221 11.1748869,2.01278865 11.1599792,2.03824823 C11.3659094,1.68655903 11.6259528,1.46944444 12.0207549,1.46944444 Z M12.1011111,2.85144444 L12.0713457,2.91751396 L11.8811707,3.30172279 L11.6899023,3.66987931 C11.557639,3.91763569 11.4205876,4.1589191 11.3070312,4.32706715 C10.8867233,4.94943561 11.2769618,5.62401696 12,5.62401696 C12.7481114,5.62401696 12.9277778,5.42582286 12.9277778,4.64408449 C12.9277778,4.29594473 12.7310746,3.77237759 12.4219529,3.28525029 C12.3528553,3.1763634 12.281237,3.07447531 12.2108288,2.98385177 L12.1011111,2.85144444 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/settings/button_auction.png b/Telegram/Resources/icons/settings/button_auction.png
new file mode 100644
index 00000000000000..6fbaa5e019ad92
Binary files /dev/null and b/Telegram/Resources/icons/settings/button_auction.png differ
diff --git a/Telegram/Resources/icons/settings/button_auction@2x.png b/Telegram/Resources/icons/settings/button_auction@2x.png
new file mode 100644
index 00000000000000..c4c3ef1d8feaa6
Binary files /dev/null and b/Telegram/Resources/icons/settings/button_auction@2x.png differ
diff --git a/Telegram/Resources/icons/settings/button_auction@3x.png b/Telegram/Resources/icons/settings/button_auction@3x.png
new file mode 100644
index 00000000000000..c9c6b285615467
Binary files /dev/null and b/Telegram/Resources/icons/settings/button_auction@3x.png differ
diff --git a/Telegram/Resources/icons/settings/earn.png b/Telegram/Resources/icons/settings/earn.png
new file mode 100644
index 00000000000000..c2e73499e1950a
Binary files /dev/null and b/Telegram/Resources/icons/settings/earn.png differ
diff --git a/Telegram/Resources/icons/settings/earn@2x.png b/Telegram/Resources/icons/settings/earn@2x.png
new file mode 100644
index 00000000000000..53b7eec28c1a4e
Binary files /dev/null and b/Telegram/Resources/icons/settings/earn@2x.png differ
diff --git a/Telegram/Resources/icons/settings/earn@3x.png b/Telegram/Resources/icons/settings/earn@3x.png
new file mode 100644
index 00000000000000..33c71446904543
Binary files /dev/null and b/Telegram/Resources/icons/settings/earn@3x.png differ
diff --git a/Telegram/Resources/icons/settings/filled_verify_age.svg b/Telegram/Resources/icons/settings/filled_verify_age.svg
new file mode 100644
index 00000000000000..2b13be56ca34e9
--- /dev/null
+++ b/Telegram/Resources/icons/settings/filled_verify_age.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Filled / filled_verify_age</title>
+    <g id="Filled-/-filled_verify_age" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M36,34.9473684 C33.5842105,34.9473684 31.5592105,34.1302632 29.925,32.4960526 C28.2907895,30.8618421 27.4736842,28.8368421 27.4736842,26.4210526 C27.4736842,24.0526316 28.2907895,22.0394737 29.925,20.3815789 C31.5592105,18.7236842 33.5842105,17.8947368 36,17.8947368 C38.3684211,17.8947368 40.3815789,18.7236842 42.0394737,20.3815789 C43.6973684,22.0394737 44.5263158,24.0526316 44.5263158,26.4210526 C44.5263158,28.8368421 43.6973684,30.8618421 42.0394737,32.4960526 C40.3815789,34.1302632 38.3684211,34.9473684 36,34.9473684 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M18.9473684,49.6842105 L18.9473684,47.1263158 C18.9473684,46.1315789 19.1960526,45.1960526 19.6934211,44.3197368 C20.1907895,43.4434211 20.8657895,42.7447368 21.7184211,42.2236842 C23.8973684,40.9447368 26.1828947,39.9736842 28.575,39.3105263 C30.9671053,38.6473684 33.4421053,38.3157895 36,38.3157895 C38.5578947,38.3157895 41.0328947,38.6473684 43.425,39.3105263 C45.8171053,39.9736842 48.1026316,40.9447368 50.2815789,42.2236842 C51.1342105,42.7447368 51.8092105,43.4434211 52.3065789,44.3197368 C52.8039474,45.1960526 53.0526316,46.1315789 53.0526316,47.1263158 L53.0526316,49.6842105 C53.0526316,50.4894737 52.7802632,51.1644737 52.2355263,51.7092105 C51.6907895,52.2539474 51.0157895,52.5263158 50.2105263,52.5263158 L21.7894737,52.5263158 C20.9842105,52.5263158 20.3092105,52.2539474 19.7644737,51.7092105 C19.2197368,51.1644737 18.9473684,50.4894737 18.9473684,49.6842105 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M11.6842105,66 C10.1210526,66 8.78289474,65.4434211 7.66973684,64.3302632 C6.55657895,63.2171053 6,61.8789474 6,60.3157895 L6,51.7894737 C6,50.9842105 6.27236842,50.3092105 6.81710526,49.7644737 C7.36184211,49.2197368 8.03684211,48.9473684 8.84210526,48.9473684 C9.64736842,48.9473684 10.3223684,49.2197368 10.8671053,49.7644737 C11.4118421,50.3092105 11.6842105,50.9842105 11.6842105,51.7894737 L11.6842105,60.3157895 L20.2105263,60.3157895 C21.0157895,60.3157895 21.6907895,60.5881579 22.2355263,61.1328947 C22.7802632,61.6776316 23.0526316,62.3526316 23.0526316,63.1578947 C23.0526316,63.9631579 22.7802632,64.6381579 22.2355263,65.1828947 C21.6907895,65.7276316 21.0157895,66 20.2105263,66 L11.6842105,66 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M6,20.2105263 L6,11.6842105 C6,10.1210526 6.55657895,8.78289474 7.66973684,7.66973684 C8.78289474,6.55657895 10.1210526,6 11.6842105,6 L20.2105263,6 C21.0157895,6 21.6907895,6.27236842 22.2355263,6.81710526 C22.7802632,7.36184211 23.0526316,8.03684211 23.0526316,8.84210526 C23.0526316,9.64736842 22.7802632,10.3223684 22.2355263,10.8671053 C21.6907895,11.4118421 21.0157895,11.6842105 20.2105263,11.6842105 L11.6842105,11.6842105 L11.6842105,20.2105263 C11.6842105,21.0157895 11.4118421,21.6907895 10.8671053,22.2355263 C10.3223684,22.7802632 9.64736842,23.0526316 8.84210526,23.0526316 C8.03684211,23.0526316 7.36184211,22.7802632 6.81710526,22.2355263 C6.27236842,21.6907895 6,21.0157895 6,20.2105263 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M60.3157895,66 L51.7894737,66 C50.9842105,66 50.3092105,65.7276316 49.7644737,65.1828947 C49.2197368,64.6381579 48.9473684,63.9631579 48.9473684,63.1578947 C48.9473684,62.3526316 49.2197368,61.6776316 49.7644737,61.1328947 C50.3092105,60.5881579 50.9842105,60.3157895 51.7894737,60.3157895 L60.3157895,60.3157895 L60.3157895,51.7894737 C60.3157895,50.9842105 60.5881579,50.3092105 61.1328947,49.7644737 C61.6776316,49.2197368 62.3526316,48.9473684 63.1578947,48.9473684 C63.9631579,48.9473684 64.6381579,49.2197368 65.1828947,49.7644737 C65.7276316,50.3092105 66,50.9842105 66,51.7894737 L66,60.3157895 C66,61.8789474 65.4434211,63.2171053 64.3302632,64.3302632 C63.2171053,65.4434211 61.8789474,66 60.3157895,66 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M60.3157895,20.2105263 L60.3157895,11.6842105 L51.7894737,11.6842105 C50.9842105,11.6842105 50.3092105,11.4118421 49.7644737,10.8671053 C49.2197368,10.3223684 48.9473684,9.64736842 48.9473684,8.84210526 C48.9473684,8.03684211 49.2197368,7.36184211 49.7644737,6.81710526 C50.3092105,6.27236842 50.9842105,6 51.7894737,6 L60.3157895,6 C61.8789474,6 63.2171053,6.55657895 64.3302632,7.66973684 C65.4434211,8.78289474 66,10.1210526 66,11.6842105 L66,20.2105263 C66,21.0157895 65.7276316,21.6907895 65.1828947,22.2355263 C64.6381579,22.7802632 63.9631579,23.0526316 63.1578947,23.0526316 C62.3526316,23.0526316 61.6776316,22.7802632 61.1328947,22.2355263 C60.5881579,21.6907895 60.3157895,21.0157895 60.3157895,20.2105263 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/settings/gift.png b/Telegram/Resources/icons/settings/gift.png
new file mode 100644
index 00000000000000..8dacb6c7ebfb45
Binary files /dev/null and b/Telegram/Resources/icons/settings/gift.png differ
diff --git a/Telegram/Resources/icons/settings/gift@2x.png b/Telegram/Resources/icons/settings/gift@2x.png
new file mode 100644
index 00000000000000..996bd85d0ba414
Binary files /dev/null and b/Telegram/Resources/icons/settings/gift@2x.png differ
diff --git a/Telegram/Resources/icons/settings/gift@3x.png b/Telegram/Resources/icons/settings/gift@3x.png
new file mode 100644
index 00000000000000..240680269ed145
Binary files /dev/null and b/Telegram/Resources/icons/settings/gift@3x.png differ
diff --git a/Telegram/Resources/icons/settings/large_auctions.png b/Telegram/Resources/icons/settings/large_auctions.png
new file mode 100644
index 00000000000000..e56787624747ed
Binary files /dev/null and b/Telegram/Resources/icons/settings/large_auctions.png differ
diff --git a/Telegram/Resources/icons/settings/large_auctions@2x.png b/Telegram/Resources/icons/settings/large_auctions@2x.png
new file mode 100644
index 00000000000000..1a32e7584cd036
Binary files /dev/null and b/Telegram/Resources/icons/settings/large_auctions@2x.png differ
diff --git a/Telegram/Resources/icons/settings/large_auctions@3x.png b/Telegram/Resources/icons/settings/large_auctions@3x.png
new file mode 100644
index 00000000000000..652c413bc8d16f
Binary files /dev/null and b/Telegram/Resources/icons/settings/large_auctions@3x.png differ
diff --git a/Telegram/Resources/icons/settings/mini_gift.png b/Telegram/Resources/icons/settings/mini_gift.png
new file mode 100644
index 00000000000000..6e1f5660657275
Binary files /dev/null and b/Telegram/Resources/icons/settings/mini_gift.png differ
diff --git a/Telegram/Resources/icons/settings/mini_gift@2x.png b/Telegram/Resources/icons/settings/mini_gift@2x.png
new file mode 100644
index 00000000000000..7a5e301e1ad0f8
Binary files /dev/null and b/Telegram/Resources/icons/settings/mini_gift@2x.png differ
diff --git a/Telegram/Resources/icons/settings/mini_gift@3x.png b/Telegram/Resources/icons/settings/mini_gift@3x.png
new file mode 100644
index 00000000000000..d34d1b6deac2b9
Binary files /dev/null and b/Telegram/Resources/icons/settings/mini_gift@3x.png differ
diff --git a/Telegram/Resources/icons/settings/mini_gift_order_date.svg b/Telegram/Resources/icons/settings/mini_gift_order_date.svg
new file mode 100644
index 00000000000000..130d30310ff49d
--- /dev/null
+++ b/Telegram/Resources/icons/settings/mini_gift_order_date.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Mini / mini_gift_sorting2</title>
+    <g id="Mini-/-mini_gift_sorting2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M39.7913043,28.3413043 C40.9234881,28.3413043 41.8413043,29.2591206 41.8413043,30.3913043 L41.8413043,45 C41.8413043,46.1321837 40.9234881,47.05 39.7913043,47.05 C38.6591206,47.05 37.7413043,46.1321837 37.7413043,45 L37.7413043,30.3913043 C37.7413043,29.2591206 38.6591206,28.3413043 39.7913043,28.3413043 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M32.1330398,38.0495689 C32.9336146,38.8501437 34.2316028,38.8501437 35.0321776,38.0495689 L39.7906087,33.291 L44.5504311,38.0495689 C45.3088704,38.8080082 46.5137416,38.847926 47.3191738,38.1693225 L47.4495689,38.0495689 C48.2501437,37.2489941 48.2501437,35.9510059 47.4495689,35.1504311 L41.7573686,29.4582308 C40.6715413,28.3724035 38.9110674,28.3724035 37.8252401,29.4582308 L32.1330398,35.1504311 C31.332465,35.9510059 31.332465,37.2489941 32.1330398,38.0495689 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M36.5217391,5.3326087 C40.4153466,5.3326087 43.5717391,8.48900121 43.5717391,12.3826087 L43.5717391,21.7217391 C43.5717391,22.8539229 42.6539229,23.7717391 41.5217391,23.7717391 C40.3895554,23.7717391 39.4717391,22.8539229 39.4717391,21.7217391 L39.4717391,12.3826087 C39.4717391,10.7533687 38.1509791,9.4326087 36.5217391,9.4326087 L10,9.4326087 C8.37075999,9.4326087 7.05,10.7533687 7.05,12.3826087 L7.05,35.9826087 C7.05,37.6118487 8.37075999,38.9326087 10,38.9326087 L27.373913,38.9326087 C28.5060968,38.9326087 29.423913,39.850425 29.423913,40.9826087 C29.423913,42.1147924 28.5060968,43.0326087 27.373913,43.0326087 L10,43.0326087 C6.10639251,43.0326087 2.95,39.8762162 2.95,35.9826087 L2.95,12.3826087 C2.95,8.48900121 6.10639251,5.3326087 10,5.3326087 L36.5217391,5.3326087 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <polygon id="Path" fill="#FFFFFF" fill-rule="nonzero" points="6.09565217 20.3891304 40.426087 20.3891304 40.426087 16.2891304 6.09565217 16.2891304"></polygon>
+        <path d="M11.8434783,0.95 C12.975662,0.95 13.8934783,1.86781626 13.8934783,3 L13.8934783,6.65217391 C13.8934783,7.78435765 12.975662,8.70217391 11.8434783,8.70217391 C10.7112945,8.70217391 9.79347826,7.78435765 9.79347826,6.65217391 L9.79347826,3 C9.79347826,1.86781626 10.7112945,0.95 11.8434783,0.95 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M34.6782609,0.95 C35.8104446,0.95 36.7282609,1.86781626 36.7282609,3 L36.7282609,6.65217391 C36.7282609,7.78435765 35.8104446,8.70217391 34.6782609,8.70217391 C33.5460771,8.70217391 32.6282609,7.78435765 32.6282609,6.65217391 L32.6282609,3 C32.6282609,1.86781626 33.5460771,0.95 34.6782609,0.95 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/settings/mini_gift_order_number.svg b/Telegram/Resources/icons/settings/mini_gift_order_number.svg
new file mode 100644
index 00000000000000..37cc05f5722c61
--- /dev/null
+++ b/Telegram/Resources/icons/settings/mini_gift_order_number.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Mini / mini_gift_sorting3</title>
+    <g id="Mini-/-mini_gift_sorting3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M34.4778761,13.749192 C35.6376741,13.749192 36.5778761,14.689394 36.5778761,15.849192 C36.5778761,17.00899 35.6376741,17.949192 34.4778761,17.949192 L7.57258674,17.949192 C6.41278876,17.949192 5.47258674,17.00899 5.47258674,15.849192 C5.47258674,14.689394 6.41278876,13.749192 7.57258674,13.749192 L34.4778761,13.749192 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M30.923367,27.509546 C32.083165,27.509546 33.023367,28.4497481 33.023367,29.609546 C33.023367,30.769344 32.083165,31.709546 30.923367,31.709546 L4,31.709546 C2.84020203,31.709546 1.9,30.769344 1.9,29.609546 C1.9,28.4497481 2.84020203,27.509546 4,27.509546 L30.923367,27.509546 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M14.7584617,4.53380965 C15.0159315,3.40295129 16.1413939,2.69492999 17.2722522,2.9523998 C18.4031106,3.20986962 19.1111319,4.33533198 18.8536621,5.46619035 L10.9056841,40.3752813 C10.6482143,41.5061396 9.52275197,42.2141609 8.39189361,41.9566911 C7.26103524,41.6992213 6.55301394,40.5737589 6.81048375,39.4429006 L14.7584617,4.53380965 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M28.1811642,4.55038432 C28.4294801,3.41748072 29.5491797,2.70038069 30.6820833,2.94869657 C31.8149869,3.19701246 32.532087,4.31671208 32.2837711,5.44961568 L24.6322095,40.3587066 C24.3838936,41.4916102 23.264194,42.2087102 22.1312904,41.9603943 C20.9983868,41.7120785 20.2812868,40.5923788 20.5296027,39.4594752 L28.1811642,4.55038432 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M39.7913043,28.3413043 C40.9234881,28.3413043 41.8413043,29.2591206 41.8413043,30.3913043 L41.8413043,45 C41.8413043,46.1321837 40.9234881,47.05 39.7913043,47.05 C38.6591206,47.05 37.7413043,46.1321837 37.7413043,45 L37.7413043,30.3913043 C37.7413043,29.2591206 38.6591206,28.3413043 39.7913043,28.3413043 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M32.1330398,38.0495689 C32.9336146,38.8501437 34.2316028,38.8501437 35.0321776,38.0495689 L39.7906087,33.291 L44.5504311,38.0495689 C45.3088704,38.8080082 46.5137416,38.847926 47.3191738,38.1693225 L47.4495689,38.0495689 C48.2501437,37.2489941 48.2501437,35.9510059 47.4495689,35.1504311 L41.7573686,29.4582308 C40.6715413,28.3724035 38.9110674,28.3724035 37.8252401,29.4582308 L32.1330398,35.1504311 C31.332465,35.9510059 31.332465,37.2489941 32.1330398,38.0495689 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/settings/mini_gift_order_price.svg b/Telegram/Resources/icons/settings/mini_gift_order_price.svg
new file mode 100644
index 00000000000000..36409f6b4b3018
--- /dev/null
+++ b/Telegram/Resources/icons/settings/mini_gift_order_price.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Mini / mini_gift_sorting1</title>
+    <g id="Mini-/-mini_gift_sorting1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M23.4380165,1.95 C35.3025073,1.95 44.9260331,11.510317 44.9260331,23.3103448 C44.9260331,23.5919731 44.9205389,23.8730129 44.9095753,24.1533571 C44.8653322,25.2846761 43.9123508,26.1659251 42.7810319,26.121682 C41.6497129,26.0774389 40.7684638,25.1244576 40.812707,23.9931386 C40.8215831,23.7661706 40.8260331,23.5385471 40.8260331,23.3103448 C40.8260331,13.7807547 33.0441659,6.05 23.4380165,6.05 C13.8318671,6.05 6.05,13.7807547 6.05,23.3103448 C6.05,32.839935 13.8318671,40.5706897 23.4380165,40.5706897 C25.2657432,40.5706897 27.0529516,40.2914087 28.7555206,39.7492213 C29.8343232,39.4056738 30.9873658,40.0017158 31.3309133,41.0805185 C31.6744608,42.1593211 31.0784187,43.3123637 29.9996161,43.6559112 C27.8959061,44.3258431 25.6891219,44.6706897 23.4380165,44.6706897 C11.5735257,44.6706897 1.95,35.1103726 1.95,23.3103448 C1.95,11.510317 11.5735257,1.95 23.4380165,1.95 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M39.7913043,28.3413043 C40.9234881,28.3413043 41.8413043,29.2591206 41.8413043,30.3913043 L41.8413043,45 C41.8413043,46.1321837 40.9234881,47.05 39.7913043,47.05 C38.6591206,47.05 37.7413043,46.1321837 37.7413043,45 L37.7413043,30.3913043 C37.7413043,29.2591206 38.6591206,28.3413043 39.7913043,28.3413043 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M32.1330398,38.0495689 C32.9336146,38.8501437 34.2316028,38.8501437 35.0321776,38.0495689 L39.7906087,33.291 L44.5504311,38.0495689 C45.3088704,38.8080082 46.5137416,38.847926 47.3191738,38.1693225 L47.4495689,38.0495689 C48.2501437,37.2489941 48.2501437,35.9510059 47.4495689,35.1504311 L41.7573686,29.4582308 C40.6715413,28.3724035 38.9110674,28.3724035 37.8252401,29.4582308 L32.1330398,35.1504311 C31.332465,35.9510059 31.332465,37.2489941 32.1330398,38.0495689 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M23.8366211,35.9195313 C24.4958008,35.9195313 25.281738,35.5533203 25.281738,34.6744141 L25.281738,33.5025391 C29.2221677,33.0777344 31.4831055,30.7632813 31.4831055,27.3941406 C31.4831055,24.49375 29.7399414,22.7359375 26.1217773,21.9449219 L23.1481445,21.2710938 C21.287793,20.8609375 20.3795898,20.0113281 20.3795898,18.7662109 C20.3795898,17.2720703 21.6686523,16.1880859 23.6901367,16.1880859 C25.3307617,16.1880859 26.4733398,16.7447266 27.7477539,18.165625 C28.3922852,18.8394531 28.890332,19.0884766 29.5641602,19.0884766 C30.3844727,19.0884766 31.0143555,18.5171875 31.0143555,17.6675781 C31.0143555,16.8472656 30.530957,15.9537109 29.7106445,15.1480469 C28.6266602,14.1226563 27.2006837,13.4488281 25.369629,13.2144531 L25.369629,11.9986328 C25.369629,11.134375 24.5836914,10.7681641 23.9098633,10.7681641 C23.2506836,10.7681641 22.464746,11.1197266 22.464746,11.9986328 L22.464746,13.1705078 C18.6708007,13.5220703 16.4538086,15.7925781 16.4538086,19.0445313 C16.4538086,21.8863281 18.1969727,23.7759766 21.5368164,24.5230469 L24.5104492,25.2115234 C26.678418,25.7242188 27.5719727,26.4859375 27.5719727,27.775 C27.5719727,29.4449219 26.2682617,30.4996094 23.9391602,30.4996094 C22.1959961,30.4996094 20.7458008,29.8404297 19.4274414,28.4195313 C18.6803711,27.6724609 18.2702148,27.5113281 17.7135742,27.5113281 C16.8200195,27.5113281 16.1461914,28.0826172 16.1461914,29.0640625 C16.1461914,29.9283203 16.6442383,30.821875 17.537793,31.5982422 C18.709668,32.6675781 20.3407222,33.3267578 22.376855,33.5171875 L22.376855,34.6744141 C22.376855,35.5533203 23.162793,35.9195313 23.8366211,35.9195313 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/settings/premium/business/earn_stars.png b/Telegram/Resources/icons/settings/premium/business/earn_stars.png
new file mode 100644
index 00000000000000..84419b169f9806
Binary files /dev/null and b/Telegram/Resources/icons/settings/premium/business/earn_stars.png differ
diff --git a/Telegram/Resources/icons/settings/premium/business/earn_stars@2x.png b/Telegram/Resources/icons/settings/premium/business/earn_stars@2x.png
new file mode 100644
index 00000000000000..3f6b9e30f601af
Binary files /dev/null and b/Telegram/Resources/icons/settings/premium/business/earn_stars@2x.png differ
diff --git a/Telegram/Resources/icons/settings/premium/business/earn_stars@3x.png b/Telegram/Resources/icons/settings/premium/business/earn_stars@3x.png
new file mode 100644
index 00000000000000..19823b48b4e144
Binary files /dev/null and b/Telegram/Resources/icons/settings/premium/business/earn_stars@3x.png differ
diff --git a/Telegram/Resources/icons/settings/premium/checklist.svg b/Telegram/Resources/icons/settings/premium/checklist.svg
new file mode 100644
index 00000000000000..6cb5fac3f98505
--- /dev/null
+++ b/Telegram/Resources/icons/settings/premium/checklist.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Filled / checklist</title>
+    <g id="Icon-/-Filled-/-checklist" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M12,4 C16.416,4 20,7.584 20,12 C20,16.416 16.416,20 12,20 C7.584,20 4,16.416 4,12 C4,7.584 7.584,4 12,4 Z M16.4818432,9.54348643 C16.1872637,9.22288416 15.7053635,9.21829494 15.4054889,9.53323613 L10.7733532,14.3979954 L8.99451107,12.5296222 C8.69463652,12.2146811 8.21273632,12.2192703 7.91815685,12.5398725 C7.62357737,12.8604748 7.62786989,13.3756846 7.92774444,13.6906258 L10.1546212,16.0293878 C10.4981762,16.3902041 11.0487833,16.3902041 11.3923383,16.0293878 L16.4722556,10.6942397 C16.7721301,10.3792985 16.7764226,9.8640887 16.4818432,9.54348643 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/settings/premium/features/feature_color_profile.png b/Telegram/Resources/icons/settings/premium/features/feature_color_profile.png
new file mode 100644
index 00000000000000..33a6d47c9f12a7
Binary files /dev/null and b/Telegram/Resources/icons/settings/premium/features/feature_color_profile.png differ
diff --git a/Telegram/Resources/icons/settings/premium/features/feature_color_profile@2x.png b/Telegram/Resources/icons/settings/premium/features/feature_color_profile@2x.png
new file mode 100644
index 00000000000000..dcb515f56089eb
Binary files /dev/null and b/Telegram/Resources/icons/settings/premium/features/feature_color_profile@2x.png differ
diff --git a/Telegram/Resources/icons/settings/premium/features/feature_color_profile@3x.png b/Telegram/Resources/icons/settings/premium/features/feature_color_profile@3x.png
new file mode 100644
index 00000000000000..08f02966710524
Binary files /dev/null and b/Telegram/Resources/icons/settings/premium/features/feature_color_profile@3x.png differ
diff --git a/Telegram/Resources/icons/settings/premium/features/feature_profile_cover.png b/Telegram/Resources/icons/settings/premium/features/feature_profile_cover.png
new file mode 100644
index 00000000000000..657fd9390ae6f6
Binary files /dev/null and b/Telegram/Resources/icons/settings/premium/features/feature_profile_cover.png differ
diff --git a/Telegram/Resources/icons/settings/premium/features/feature_profile_cover@2x.png b/Telegram/Resources/icons/settings/premium/features/feature_profile_cover@2x.png
new file mode 100644
index 00000000000000..250be37750786b
Binary files /dev/null and b/Telegram/Resources/icons/settings/premium/features/feature_profile_cover@2x.png differ
diff --git a/Telegram/Resources/icons/settings/premium/features/feature_profile_cover@3x.png b/Telegram/Resources/icons/settings/premium/features/feature_profile_cover@3x.png
new file mode 100644
index 00000000000000..ae696a8f349dc2
Binary files /dev/null and b/Telegram/Resources/icons/settings/premium/features/feature_profile_cover@3x.png differ
diff --git a/Telegram/Resources/icons/settings/premium/large_lastseen.png b/Telegram/Resources/icons/settings/premium/large_lastseen.png
deleted file mode 100644
index e47bd7935bc38b..00000000000000
Binary files a/Telegram/Resources/icons/settings/premium/large_lastseen.png and /dev/null differ
diff --git a/Telegram/Resources/icons/settings/premium/large_lastseen@2x.png b/Telegram/Resources/icons/settings/premium/large_lastseen@2x.png
deleted file mode 100644
index 305b6a491966b1..00000000000000
Binary files a/Telegram/Resources/icons/settings/premium/large_lastseen@2x.png and /dev/null differ
diff --git a/Telegram/Resources/icons/settings/premium/large_lastseen@3x.png b/Telegram/Resources/icons/settings/premium/large_lastseen@3x.png
deleted file mode 100644
index 0cd1e12ab09dc2..00000000000000
Binary files a/Telegram/Resources/icons/settings/premium/large_lastseen@3x.png and /dev/null differ
diff --git a/Telegram/Resources/icons/settings/premium/large_readtime.png b/Telegram/Resources/icons/settings/premium/large_readtime.png
deleted file mode 100644
index c06294a82e44e2..00000000000000
Binary files a/Telegram/Resources/icons/settings/premium/large_readtime.png and /dev/null differ
diff --git a/Telegram/Resources/icons/settings/premium/large_readtime@2x.png b/Telegram/Resources/icons/settings/premium/large_readtime@2x.png
deleted file mode 100644
index f30a355ee8d7aa..00000000000000
Binary files a/Telegram/Resources/icons/settings/premium/large_readtime@2x.png and /dev/null differ
diff --git a/Telegram/Resources/icons/settings/premium/large_readtime@3x.png b/Telegram/Resources/icons/settings/premium/large_readtime@3x.png
deleted file mode 100644
index 1e7d022a30e991..00000000000000
Binary files a/Telegram/Resources/icons/settings/premium/large_readtime@3x.png and /dev/null differ
diff --git a/Telegram/Resources/icons/settings/premium/peer_colors.svg b/Telegram/Resources/icons/settings/premium/peer_colors.svg
new file mode 100644
index 00000000000000..0a3c1b0854f7e3
--- /dev/null
+++ b/Telegram/Resources/icons/settings/premium/peer_colors.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Filled / premium_themes</title>
+    <g id="Icon-/-Filled-/-premium_themes" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M8.65381112,10.7516786 L14.600547,16.5507975 C14.7950866,16.740508 14.7950866,17.0480895 14.600547,17.2378 L13.8655201,17.9545811 C13.6709805,18.1442916 13.3555695,18.1442916 13.1610299,17.9545811 C12.1129217,17.0843554 11.3456336,16.4119807 10.8591655,15.937457 C10.7682049,15.8487297 10.5422415,15.7847321 10.4567355,15.904017 L10.201902,16.2497487 L10.0193453,16.4884401 L9.83300263,16.7270352 L9.02218186,17.7460428 L8.75587192,18.0918034 L8.59549123,18.3121046 C7.91167738,19.2768629 6.91083947,19.1001271 6.35158932,18.5547593 C5.80232578,18.0191302 5.85863289,17.1049913 6.79138874,16.4035319 L6.85891507,16.3573404 C6.99427087,16.2669684 7.14265185,16.157786 7.30037755,16.0361677 L7.68363141,15.7328223 L8.38962036,15.1596258 L8.6312678,14.9665056 C8.79873654,14.8340204 8.96615336,14.7048192 9.13062469,14.5839136 C9.24335825,14.5010414 9.22165977,14.3680769 9.1319646,14.280627 L8.89532907,14.0428177 C8.55768805,13.6947027 8.13153904,13.2224438 7.61688206,12.6260412 L7.21429408,12.1554622 C7.01975448,11.9657517 7.01975448,11.6581702 7.21429408,11.4684597 L7.9493209,10.7516786 C8.1438605,10.5619681 8.45927152,10.5619681 8.65381112,10.7516786 Z M14.0750341,4.02554926 C14.1700659,4.05313428 14.2562711,4.10500261 14.3244531,4.17672529 L17.4193876,7.36611999 C17.5229412,7.47283414 17.5525486,7.63117292 17.4945519,7.76809496 L16.3521671,10.465106 C16.3075918,10.570342 16.3567671,10.6917881 16.4620031,10.7363634 C16.5226789,10.7620641 16.5919675,10.7573313 16.648585,10.7236188 L18.8014275,9.44172252 C18.9580015,9.3484915 19.1591462,9.38314731 19.2754925,9.52340059 L19.824657,10.1854078 C20.080453,10.493765 20.0450803,10.9495406 19.7447707,11.2147384 L15.2419116,15.19113 L10.0408804,10.1008505 C10.8928945,9.23732408 11.6272327,8.25187058 12.2438948,7.14448999 C12.7106069,6.30638457 13.08566,5.39611751 13.3690539,4.41368881 C13.456971,4.1116676 13.7729463,3.93786178 14.0750341,4.02554926 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/settings/premium_dollar.svg b/Telegram/Resources/icons/settings/premium_dollar.svg
new file mode 100644
index 00000000000000..96c384d7b26eb8
--- /dev/null
+++ b/Telegram/Resources/icons/settings/premium_dollar.svg
@@ -0,0 +1 @@
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M26.4857837,45.6899234 C27.1686622,47.0700421 27.8088176,48.0588176 28.40625,48.65625 C29.73375,49.98375 31.455,50.895 33.57,51.39 L33.57,52.5375 C33.57,53.1675 33.80625,53.71875 34.27875,54.19125 C34.75125,54.66375 35.3025,54.9 35.9325,54.9 C36.5625,54.9 37.11375,54.66375 37.58625,54.19125 C38.05875,53.71875 38.295,53.1675 38.295,52.5375 L38.295,51.525 C40.545,51.12 42.48,50.2425 44.1,48.8925 C45.72,47.5425 46.53,45.54 46.53,42.885 C46.53,40.995 45.99,39.2625 44.91,37.6875 C43.83,36.1125 41.67,34.74 38.43,33.57 C35.73,32.67 33.8625,31.8825 32.8275,31.2075 C31.7925,30.5325 31.275,29.61 31.275,28.44 C31.275,27.27 31.69125,26.3475 32.52375,25.6725 C33.35625,24.9975 34.56,24.66 36.135,24.66 C37.575,24.66 38.7,25.00875 39.51,25.70625 C39.7636523,25.9246729 40.0272336,26.2316287 40.3007438,26.6271176 C40.9566124,27.5710319 42.1791966,27.9350109 43.2435938,27.5011963 L43.425,27.4275 C44.496013,26.992401 45.0115231,25.7714559 44.5764241,24.7004429 C44.5310757,24.5888162 44.4761739,24.4813135 44.4123249,24.3791357 C43.883195,23.5322685 43.3628367,22.8833899 42.85125,22.4325 C41.52375,21.2625 40.05,20.61 38.43,20.475 L38.43,19.4625 C38.43,18.8325 38.19375,18.28125 37.72125,17.80875 C37.24875,17.33625 36.6975,17.1 36.0675,17.1 C35.4375,17.1 34.88625,17.33625 34.41375,17.80875 C33.94125,18.28125 33.705,18.8325 33.705,19.4625 L33.705,20.475 C31.455,20.97 29.7,21.96 28.44,23.445 C27.18,24.93 26.55,26.595 26.55,28.44 C26.55,30.555 27.16875,32.265 28.40625,33.57 C29.64375,34.875 31.59,36 34.245,36.945 C37.08,37.98 39.04875,38.9025 40.15125,39.7125 C41.25375,40.5225 41.805,41.58 41.805,42.885 C41.805,44.37 41.27625,45.46125 40.21875,46.15875 C39.16125,46.85625 37.89,47.205 36.405,47.205 C34.92,47.205 33.60375,46.74375 32.45625,45.82125 C31.9568335,45.4197583 31.4238546,44.6906333 30.8573132,43.633875 C30.2706452,42.5366454 28.9554862,42.0527711 27.7975635,42.5080811 L27.6975,42.5475 C26.522201,43.0104966 25.9447658,44.3385975 26.4077624,45.5138965 C26.4312966,45.5736371 26.4573359,45.6323602 26.4857837,45.6899234 Z M36,63 C32.265,63 28.755,62.29125 25.47,60.87375 C22.185,59.45625 19.3275,57.5325 16.8975,55.1025 C14.4675,52.6725 12.54375,49.815 11.12625,46.53 C9.70875,43.245 9,39.735 9,36 C9,32.265 9.70875,28.755 11.12625,25.47 C12.54375,22.185 14.4675,19.3275 16.8975,16.8975 C19.3275,14.4675 22.185,12.54375 25.47,11.12625 C28.755,9.70875 32.265,9 36,9 C39.735,9 43.245,9.70875 46.53,11.12625 C49.815,12.54375 52.6725,14.4675 55.1025,16.8975 C57.5325,19.3275 59.45625,22.185 60.87375,25.47 C62.29125,28.755 63,32.265 63,36 C63,39.735 62.29125,43.245 60.87375,46.53 C59.45625,49.815 57.5325,52.6725 55.1025,55.1025 C52.6725,57.5325 49.815,59.45625 46.53,60.87375 C43.245,62.29125 39.735,63 36,63 Z" fill="#FFFFFF"/></svg>
diff --git a/Telegram/Resources/icons/toast/auction.png b/Telegram/Resources/icons/toast/auction.png
new file mode 100644
index 00000000000000..41b34d5fe1d143
Binary files /dev/null and b/Telegram/Resources/icons/toast/auction.png differ
diff --git a/Telegram/Resources/icons/toast/auction@2x.png b/Telegram/Resources/icons/toast/auction@2x.png
new file mode 100644
index 00000000000000..e03d6a987f98a9
Binary files /dev/null and b/Telegram/Resources/icons/toast/auction@2x.png differ
diff --git a/Telegram/Resources/icons/toast/auction@3x.png b/Telegram/Resources/icons/toast/auction@3x.png
new file mode 100644
index 00000000000000..8bf2db0ab2df9d
Binary files /dev/null and b/Telegram/Resources/icons/toast/auction@3x.png differ
diff --git a/Telegram/Resources/icons/toast/check.svg b/Telegram/Resources/icons/toast/check.svg
new file mode 100644
index 00000000000000..fbb3381f90d3e9
--- /dev/null
+++ b/Telegram/Resources/icons/toast/check.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="-48 0 1608 1608" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 712.679 309.46 C 994.711 289.885 1239.18 502.726 1258.61 784.767 C 1278.04 1066.81 1065.08 1311.17 783.031 1330.46 C 501.179 1349.74 257.028 1136.96 237.608 855.119 C 218.188 573.276 430.846 329.02 712.679 309.46 z M 967.909 662.173 C 982.124 662.158 990.527 665.946 1001.08 675.338 C 1028.72 699.945 1017.83 725.703 994.865 748.755 C 974.663 769.038 953.972 788.738 933.545 808.699 L 810.286 929.421 L 740.428 998.187 C 725.888 1012.62 712.403 1027.09 696.606 1040.2 C 651.854 1077.33 617.094 1031.61 586.489 1001.07 L 527.05 942.312 C 508.931 924.753 471.682 895.7 479.446 867.346 C 485.714 839.343 512.97 826.729 539.672 834.932 C 557.533 840.419 587.863 875.346 602.47 889.516 C 620.486 906.993 646.727 929.858 658.81 950.449 C 667.709 940.687 681.671 929.352 691.853 919.157 L 813.593 799.487 L 894.751 719.881 C 913.806 701.234 942.629 667.935 967.909 662.173 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/toast_info.png b/Telegram/Resources/icons/toast/info.png
similarity index 100%
rename from Telegram/Resources/icons/toast_info.png
rename to Telegram/Resources/icons/toast/info.png
diff --git a/Telegram/Resources/icons/toast_info@2x.png b/Telegram/Resources/icons/toast/info@2x.png
similarity index 100%
rename from Telegram/Resources/icons/toast_info@2x.png
rename to Telegram/Resources/icons/toast/info@2x.png
diff --git a/Telegram/Resources/icons/toast_info@3x.png b/Telegram/Resources/icons/toast/info@3x.png
similarity index 100%
rename from Telegram/Resources/icons/toast_info@3x.png
rename to Telegram/Resources/icons/toast/info@3x.png
diff --git a/Telegram/Resources/icons/toast/star.svg b/Telegram/Resources/icons/toast/star.svg
new file mode 100644
index 00000000000000..2e8ad94b7ed8a1
--- /dev/null
+++ b/Telegram/Resources/icons/toast/star.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="50 52 1295 1295" xmlns="http://www.w3.org/2000/svg">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path d="M 694.697 200.371 C 696.934 200.212 699.175 200.111 701.418 200.068 C 745.508 199.473 758.948 257.705 773.748 289.53 C 794.345 333.821 811.886 379.596 832.298 423.998 C 847.934 458.014 855.763 490.419 883.531 517.19 C 903.098 522.497 925.281 521.666 945.47 523.584 C 979.491 526.816 1013.21 532.577 1047.36 534.65 C 1094.94 537.537 1154.44 533.159 1200.16 546.144 C 1216.27 550.718 1226.72 557.474 1234.93 572.371 C 1243.74 588.375 1243.82 603.784 1234.78 619.805 C 1221.66 643.03 1140.48 703.874 1114.65 724.87 C 1095.71 740.263 1077.5 756.481 1058.31 771.588 C 1039.48 786.416 1003.87 810.195 992.189 831.093 C 986.938 840.49 987.593 854.519 988.781 864.808 C 991.499 888.351 999.881 912.529 1005.73 935.545 L 1036.08 1056.49 C 1044.45 1089.37 1059.34 1133.81 1051.47 1167.7 C 1048.56 1176.62 1038.01 1187.14 1030.2 1191.32 C 993.542 1210.99 954.764 1179.59 923.854 1161.35 L 803.61 1090.76 C 776.417 1074.72 745.323 1054.5 716.286 1043.26 C 684.275 1030.88 640.041 1065.58 612.382 1081.18 C 570.231 1104.96 528.855 1131.52 486.309 1154.92 C 470.832 1164.86 454.312 1174.51 438.356 1183.66 C 411.204 1199.23 394.957 1198.04 366.384 1190.13 C 362.056 1180.35 357.375 1175.82 348.47 1170.13 C 344.363 1128.2 354.192 1104.38 364.813 1064.99 C 381.211 1004.18 391.922 938.255 444.589 896.651 C 476.246 871.644 516.54 854.894 552.836 837.24 C 594.367 816.757 636.055 796.593 677.895 776.749 C 690.118 770.929 704.429 761.062 715.04 756.628 C 715.232 747.952 715.281 739.274 715.187 730.597 C 707.969 727.62 697.02 721.113 689.051 721.779 C 660.503 724.166 630.946 728.307 602.422 731.286 C 584.032 733.207 563.84 739.737 545.86 741.351 C 510.314 744.541 476.718 749.761 441.818 756.89 C 382.766 766.871 328.604 752.74 280.295 717.147 C 256.88 699.568 233.837 681.498 211.181 662.951 C 198.898 652.734 185.839 642.705 175.494 630.442 C 168.729 622.423 161.996 612.481 160.511 601.851 C 158.669 588.657 164.684 573.239 172.798 563.003 C 199.402 529.44 316.297 537.298 357.863 534.154 C 387.762 531.893 417.619 527.297 447.464 524.222 C 466.969 522.212 486.818 521.895 506.226 519.397 C 514.431 518.34 518.24 516.514 523.868 510.477 C 530.893 502.942 537.029 493.735 541.909 484.667 C 552.383 465.204 559.981 443.305 568.842 423.011 L 630.739 279.975 C 644.543 248.186 654.976 205.06 694.697 200.371 z" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/Telegram/Resources/icons/tray_monochrome_attention.svg b/Telegram/Resources/icons/tray_monochrome_attention.svg
new file mode 100644
index 00000000000000..95b8c2cfafd378
--- /dev/null
+++ b/Telegram/Resources/icons/tray_monochrome_attention.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="plane" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M1.3311718,6.36592184 C5.3576954,4.67244493 8.04267511,3.5560013 9.38611094,3.01659096 C13.2218932,1.47646481 14.0189359,1.2089284 14.5384372,1.2 C14.6526967,1.19815119 14.9081723,1.22548649 15.0736587,1.35511219 C15.2133922,1.4645656 15.2518384,1.61242159 15.2702362,1.71619544 C15.288634,1.81996929 15.3115436,2.05636876 15.2933322,2.24108442 C15.0854698,4.34939964 14.1860526,9.46572464 13.7284802,11.8270738 C13.5348641,12.8262491 13.1536281,13.1612675 12.7845475,13.1940535 C11.9824498,13.265305 11.3733733,12.6823476 10.5965026,12.190753 C9.3808532,11.4215044 8.69408865,10.9426448 7.51409044,10.1920004 C6.15039834,9.32450079 7.03442319,8.84770795 7.81158733,8.06849502 C8.01497489,7.86457129 11.5490353,4.7615061 11.6174372,4.48000946 C11.625992,4.44480359 11.6339313,4.31357282 11.5531696,4.24427815 C11.472408,4.17498349 11.3532107,4.19867957 11.2671947,4.21752527 C11.1452695,4.24423848 9.20325394,5.48334063 5.44114787,7.93483171 C4.88991321,8.30022994 4.39062196,8.47826423 3.94327414,8.46893456 C3.45010907,8.45864936 2.50145729,8.19975808 1.79623221,7.97846422 C0.931244952,7.70703829 0.243770289,7.56353344 0.303633888,7.10256824 C0.334814555,6.86246904 0.677327192,6.61692024 1.3311718,6.36592184 Z" id="Path-3" fill="#FFFFFF"></path>
+    </g>
+    <circle class="error" fill="#f23c34" cx="3.9" cy="12.7" r="2.2"/>
+</svg>
diff --git a/Telegram/Resources/icons/tray_monochrome_mute.svg b/Telegram/Resources/icons/tray_monochrome_mute.svg
new file mode 100644
index 00000000000000..448f6990b2b772
--- /dev/null
+++ b/Telegram/Resources/icons/tray_monochrome_mute.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="plane" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M1.3311718,6.36592184 C5.3576954,4.67244493 8.04267511,3.5560013 9.38611094,3.01659096 C13.2218932,1.47646481 14.0189359,1.2089284 14.5384372,1.2 C14.6526967,1.19815119 14.9081723,1.22548649 15.0736587,1.35511219 C15.2133922,1.4645656 15.2518384,1.61242159 15.2702362,1.71619544 C15.288634,1.81996929 15.3115436,2.05636876 15.2933322,2.24108442 C15.0854698,4.34939964 14.1860526,9.46572464 13.7284802,11.8270738 C13.5348641,12.8262491 13.1536281,13.1612675 12.7845475,13.1940535 C11.9824498,13.265305 11.3733733,12.6823476 10.5965026,12.190753 C9.3808532,11.4215044 8.69408865,10.9426448 7.51409044,10.1920004 C6.15039834,9.32450079 7.03442319,8.84770795 7.81158733,8.06849502 C8.01497489,7.86457129 11.5490353,4.7615061 11.6174372,4.48000946 C11.625992,4.44480359 11.6339313,4.31357282 11.5531696,4.24427815 C11.472408,4.17498349 11.3532107,4.19867957 11.2671947,4.21752527 C11.1452695,4.24423848 9.20325394,5.48334063 5.44114787,7.93483171 C4.88991321,8.30022994 4.39062196,8.47826423 3.94327414,8.46893456 C3.45010907,8.45864936 2.50145729,8.19975808 1.79623221,7.97846422 C0.931244952,7.70703829 0.243770289,7.56353344 0.303633888,7.10256824 C0.334814555,6.86246904 0.677327192,6.61692024 1.3311718,6.36592184 Z" id="Path-3" fill="#FFFFFF"></path>
+    </g>
+    <circle fill="#888888" cx="3.9" cy="12.7" r="2.2"/>
+</svg>
diff --git a/Telegram/Resources/icons/voice_lock/input_round_s.png b/Telegram/Resources/icons/voice_lock/input_round_s.png
new file mode 100644
index 00000000000000..549dd1ab1823cc
Binary files /dev/null and b/Telegram/Resources/icons/voice_lock/input_round_s.png differ
diff --git a/Telegram/Resources/icons/voice_lock/input_round_s@2x.png b/Telegram/Resources/icons/voice_lock/input_round_s@2x.png
new file mode 100644
index 00000000000000..4ab801a465afd8
Binary files /dev/null and b/Telegram/Resources/icons/voice_lock/input_round_s@2x.png differ
diff --git a/Telegram/Resources/icons/voice_lock/input_round_s@3x.png b/Telegram/Resources/icons/voice_lock/input_round_s@3x.png
new file mode 100644
index 00000000000000..878aa7e6a1369b
Binary files /dev/null and b/Telegram/Resources/icons/voice_lock/input_round_s@3x.png differ
diff --git a/Telegram/Resources/iv_html/highlight.9.12.0.css b/Telegram/Resources/iv_html/highlight.9.12.0.css
deleted file mode 100644
index 7d8be18d058e99..00000000000000
--- a/Telegram/Resources/iv_html/highlight.9.12.0.css
+++ /dev/null
@@ -1 +0,0 @@
-.hljs{display:block;overflow-x:auto;padding:0.5em;background:#F0F0F0}.hljs,.hljs-subst{color:#444}.hljs-comment{color:#888888}.hljs-keyword,.hljs-attribute,.hljs-selector-tag,.hljs-meta-keyword,.hljs-doctag,.hljs-name{font-weight:bold}.hljs-type,.hljs-string,.hljs-number,.hljs-selector-id,.hljs-selector-class,.hljs-quote,.hljs-template-tag,.hljs-deletion{color:#880000}.hljs-title,.hljs-section{color:#880000;font-weight:bold}.hljs-regexp,.hljs-symbol,.hljs-variable,.hljs-template-variable,.hljs-link,.hljs-selector-attr,.hljs-selector-pseudo{color:#BC6060}.hljs-literal{color:#78A960}.hljs-built_in,.hljs-bullet,.hljs-code,.hljs-addition{color:#397300}.hljs-meta{color:#1f7199}.hljs-meta-string{color:#4d99bf}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:bold}
\ No newline at end of file
diff --git a/Telegram/Resources/iv_html/highlight.9.12.0.js b/Telegram/Resources/iv_html/highlight.9.12.0.js
deleted file mode 100644
index f30a334c9d15d3..00000000000000
--- a/Telegram/Resources/iv_html/highlight.9.12.0.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! highlight.js v9.12.0 | BSD3 License | git.io/hljslicense */
-!function(e){var t="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):t&&(t.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return t.hljs}))}(function(e){function t(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function r(e){return e.nodeName.toLowerCase()}function a(e,t){var r=e&&e.exec(t);return r&&0===r.index}function n(e){return E.test(e)}function i(e){var t,r,a,i,s=e.className+" ";if(s+=e.parentNode?e.parentNode.className:"",r=M.exec(s))return w(r[1])?r[1]:"no-highlight";for(s=s.split(/\s+/),t=0,a=s.length;a>t;t++)if(i=s[t],n(i)||w(i))return i}function s(e){var t,r={},a=Array.prototype.slice.call(arguments,1);for(t in e)r[t]=e[t];return a.forEach(function(e){for(t in e)r[t]=e[t]}),r}function c(e){var t=[];return function a(e,n){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?n+=i.nodeValue.length:1===i.nodeType&&(t.push({event:"start",offset:n,node:i}),n=a(i,n),r(i).match(/br|hr|img|input/)||t.push({event:"stop",offset:n,node:i}));return n}(e,0),t}function o(e,a,n){function i(){return e.length&&a.length?e[0].offset!==a[0].offset?e[0].offset<a[0].offset?e:a:"start"===a[0].event?e:a:e.length?e:a}function s(e){function a(e){return" "+e.nodeName+'="'+t(e.value).replace('"',"&quot;")+'"'}u+="<"+r(e)+N.map.call(e.attributes,a).join("")+">"}function c(e){u+="</"+r(e)+">"}function o(e){("start"===e.event?s:c)(e.node)}for(var l=0,u="",d=[];e.length||a.length;){var b=i();if(u+=t(n.substring(l,b[0].offset)),l=b[0].offset,b===e){d.reverse().forEach(c);do o(b.splice(0,1)[0]),b=i();while(b===e&&b.length&&b[0].offset===l);d.reverse().forEach(s)}else"start"===b[0].event?d.push(b[0].node):d.pop(),o(b.splice(0,1)[0])}return u+t(n.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(t){return s(e,{v:null},t)})),e.cached_variants||e.eW&&[s(e)]||[e]}function u(e){function t(e){return e&&e.source||e}function r(r,a){return new RegExp(t(r),"m"+(e.cI?"i":"")+(a?"g":""))}function a(n,i){if(!n.compiled){if(n.compiled=!0,n.k=n.k||n.bK,n.k){var s={},c=function(t,r){e.cI&&(r=r.toLowerCase()),r.split(" ").forEach(function(e){var r=e.split("|");s[r[0]]=[t,r[1]?Number(r[1]):1]})};"string"==typeof n.k?c("keyword",n.k):k(n.k).forEach(function(e){c(e,n.k[e])}),n.k=s}n.lR=r(n.l||/\w+/,!0),i&&(n.bK&&(n.b="\\b("+n.bK.split(" ").join("|")+")\\b"),n.b||(n.b=/\B|\b/),n.bR=r(n.b),n.e||n.eW||(n.e=/\B|\b/),n.e&&(n.eR=r(n.e)),n.tE=t(n.e)||"",n.eW&&i.tE&&(n.tE+=(n.e?"|":"")+i.tE)),n.i&&(n.iR=r(n.i)),null==n.r&&(n.r=1),n.c||(n.c=[]),n.c=Array.prototype.concat.apply([],n.c.map(function(e){return l("self"===e?n:e)})),n.c.forEach(function(e){a(e,n)}),n.starts&&a(n.starts,i);var o=n.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([n.tE,n.i]).map(t).filter(Boolean);n.t=o.length?r(o.join("|"),!0):{exec:function(){return null}}}}a(e)}function d(e,r,n,i){function s(e,t){var r,n;for(r=0,n=t.c.length;n>r;r++)if(a(t.c[r].bR,e))return t.c[r]}function c(e,t){if(a(e.eR,t)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?c(e.parent,t):void 0}function o(e,t){return!n&&a(t.iR,e)}function l(e,t){var r=v.cI?t[0].toLowerCase():t[0];return e.k.hasOwnProperty(r)&&e.k[r]}function p(e,t,r,a){var n=a?"":L.classPrefix,i='<span class="'+n,s=r?"":R;return i+=e+'">',i+t+s}function m(){var e,r,a,n;if(!N.k)return t(E);for(n="",r=0,N.lR.lastIndex=0,a=N.lR.exec(E);a;)n+=t(E.substring(r,a.index)),e=l(N,a),e?(M+=e[1],n+=p(e[0],t(a[0]))):n+=t(a[0]),r=N.lR.lastIndex,a=N.lR.exec(E);return n+t(E.substr(r))}function f(){var e="string"==typeof N.sL;if(e&&!x[N.sL])return t(E);var r=e?d(N.sL,E,!0,k[N.sL]):b(E,N.sL.length?N.sL:void 0);return N.r>0&&(M+=r.r),e&&(k[N.sL]=r.top),p(r.language,r.value,!1,!0)}function g(){C+=null!=N.sL?f():m(),E=""}function _(e){C+=e.cN?p(e.cN,"",!0):"",N=Object.create(e,{parent:{value:N}})}function h(e,t){if(E+=e,null==t)return g(),0;var r=s(t,N);if(r)return r.skip?E+=t:(r.eB&&(E+=t),g(),r.rB||r.eB||(E=t)),_(r,t),r.rB?0:t.length;var a=c(N,t);if(a){var n=N;n.skip?E+=t:(n.rE||n.eE||(E+=t),g(),n.eE&&(E=t));do N.cN&&(C+=R),N.skip||(M+=N.r),N=N.parent;while(N!==a.parent);return a.starts&&_(a.starts,""),n.rE?0:t.length}if(o(t,N))throw new Error('Illegal lexeme "'+t+'" for mode "'+(N.cN||"<unnamed>")+'"');return E+=t,t.length||1}var v=w(e);if(!v)throw new Error('Unknown language: "'+e+'"');u(v);var y,N=i||v,k={},C="";for(y=N;y!==v;y=y.parent)y.cN&&(C=p(y.cN,"",!0)+C);var E="",M=0;try{for(var B,S,$=0;;){if(N.t.lastIndex=$,B=N.t.exec(r),!B)break;S=h(r.substring($,B.index),B[0]),$=B.index+S}for(h(r.substr($)),y=N;y.parent;y=y.parent)y.cN&&(C+=R);return{r:M,value:C,language:e,top:N}}catch(A){if(A.message&&-1!==A.message.indexOf("Illegal"))return{r:0,value:t(r)};throw A}}function b(e,r){r=r||L.languages||k(x);var a={r:0,value:t(e)},n=a;return r.filter(w).forEach(function(t){var r=d(t,e,!1);r.language=t,r.r>n.r&&(n=r),r.r>a.r&&(n=a,a=r)}),n.language&&(a.second_best=n),a}function p(e){return L.tabReplace||L.useBR?e.replace(B,function(e,t){return L.useBR&&"\n"===e?"<br>":L.tabReplace?t.replace(/\t/g,L.tabReplace):""}):e}function m(e,t,r){var a=t?C[t]:r,n=[e.trim()];return e.match(/\bhljs\b/)||n.push("hljs"),-1===e.indexOf(a)&&n.push(a),n.join(" ").trim()}function f(e){var t,r,a,s,l,u=i(e);n(u)||(L.useBR?(t=document.createElementNS("http://www.w3.org/1999/xhtml","div"),t.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):t=e,l=t.textContent,a=u?d(u,l,!0):b(l),r=c(t),r.length&&(s=document.createElementNS("http://www.w3.org/1999/xhtml","div"),s.innerHTML=a.value,a.value=o(r,c(s),l)),a.value=p(a.value),e.innerHTML=a.value,e.className=m(e.className,u,a.language),e.result={language:a.language,re:a.r},a.second_best&&(e.second_best={language:a.second_best.language,re:a.second_best.r}))}function g(e){L=s(L,e)}function _(){if(!_.called){_.called=!0;var e=document.querySelectorAll("pre code");N.forEach.call(e,f)}}function h(){addEventListener("DOMContentLoaded",_,!1),addEventListener("load",_,!1)}function v(t,r){var a=x[t]=r(e);a.aliases&&a.aliases.forEach(function(e){C[e]=t})}function y(){return k(x)}function w(e){return e=(e||"").toLowerCase(),x[e]||x[C[e]]}var N=[],k=Object.keys,x={},C={},E=/^(no-?highlight|plain|text)$/i,M=/\blang(?:uage)?-([\w-]+)\b/i,B=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,R="</span>",L={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=d,e.highlightAuto=b,e.fixMarkup=p,e.highlightBlock=f,e.configure=g,e.initHighlighting=_,e.initHighlightingOnLoad=h,e.registerLanguage=v,e.listLanguages=y,e.getLanguage=w,e.inherit=s,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(t,r,a){var n=e.inherit({cN:"comment",b:t,e:r,c:[]},a||{});return n.c.push(e.PWM),n.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),n},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e.registerLanguage("apache",function(e){var t={cN:"number",b:"[\\$%]\\d+"};return{aliases:["apacheconf"],cI:!0,c:[e.HCM,{cN:"section",b:"</?",e:">"},{cN:"attribute",b:/\w+/,r:0,k:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{e:/$/,r:0,k:{literal:"on off all"},c:[{cN:"meta",b:"\\s\\[",e:"\\]$"},{cN:"variable",b:"[\\$%]\\{",e:"\\}",c:["self",t]},t,e.QSM]}}],i:/\S/}}),e.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},r={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/\b-?[a-z\._]+\b/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,r,a,t]}}),e.registerLanguage("coffeescript",function(e){var t={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super yield import export from as default await then unless until loop of by when and or is isnt not",literal:"true false null undefined yes no on off",built_in:"npm require console print module global window document"},r="[A-Za-z$_][0-9A-Za-z$_]*",a={cN:"subst",b:/#\{/,e:/}/,k:t},n=[e.BNM,e.inherit(e.CNM,{starts:{e:"(\\s*/)?",r:0}}),{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,a]},{b:/"/,e:/"/,c:[e.BE,a]}]},{cN:"regexp",v:[{b:"///",e:"///",c:[a,e.HCM]},{b:"//[gim]*",r:0},{b:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W|$)/}]},{b:"@"+r},{sL:"javascript",eB:!0,eE:!0,v:[{b:"```",e:"```"},{b:"`",e:"`"}]}];a.c=n;var i=e.inherit(e.TM,{b:r}),s="(\\(.*\\))?\\s*\\B[-=]>",c={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:t,c:["self"].concat(n)}]};return{aliases:["coffee","cson","iced"],k:t,i:/\/\*/,c:n.concat([e.C("###","###"),e.HCM,{cN:"function",b:"^\\s*"+r+"\\s*=\\s*"+s,e:"[-=]>",rB:!0,c:[i,c]},{b:/[:\(,=]\s*/,r:0,c:[{cN:"function",b:s,e:"[-=]>",rB:!0,c:[c]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[i]},i]},{b:r+":",e:":",rB:!0,rE:!0,r:0}])}}),e.registerLanguage("cpp",function(e){var t={cN:"keyword",b:"\\b[a-z\\d_]*_t\\b"},r={cN:"string",v:[{b:'(u8?|U)?L?"',e:'"',i:"\\n",c:[e.BE]},{b:'(u8?|U)?R"',e:'"',c:[e.BE]},{b:"'\\\\?.",e:"'",i:"."}]},a={cN:"number",v:[{b:"\\b(0b[01']+)"},{b:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{b:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],r:0},n={cN:"meta",b:/#\s*[a-z]+\b/,e:/$/,k:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},c:[{b:/\\\n/,r:0},e.inherit(r,{cN:"meta-string"}),{cN:"meta-string",b:/<[^\n>]*>/,e:/$/,i:"\\n"},e.CLCM,e.CBCM]},i=e.IR+"\\s*\\(",s={keyword:"int float while private char catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignof constexpr decltype noexcept static_assert thread_local restrict _Bool complex _Complex _Imaginary atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and or not",built_in:"std string cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr",literal:"true false nullptr NULL"},c=[t,e.CLCM,e.CBCM,a,r];return{aliases:["c","cc","h","c++","h++","hpp"],k:s,i:"</",c:c.concat([n,{b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:s,c:["self",t]},{b:e.IR+"::",k:s},{v:[{b:/=/,e:/;/},{b:/\(/,e:/\)/},{bK:"new throw return else",e:/;/}],k:s,c:c.concat([{b:/\(/,e:/\)/,k:s,c:c.concat(["self"]),r:0}]),r:0},{cN:"function",b:"("+e.IR+"[\\*&\\s]+)+"+i,rB:!0,e:/[{;=]/,eE:!0,k:s,i:/[^\w\s\*&]/,c:[{b:i,rB:!0,c:[e.TM],r:0},{cN:"params",b:/\(/,e:/\)/,k:s,r:0,c:[e.CLCM,e.CBCM,r,a,t]},e.CLCM,e.CBCM,n]},{cN:"class",bK:"class struct",e:/[{;:]/,c:[{b:/</,e:/>/,c:["self"]},e.TM]}]),exports:{preprocessor:n,strings:r,k:s}}}),e.registerLanguage("cs",function(e){var t={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long nameof object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let on orderby partial remove select set value var where yield",literal:"null false true"},r={cN:"string",b:'@"',e:'"',c:[{b:'""'}]},a=e.inherit(r,{i:/\n/}),n={cN:"subst",b:"{",e:"}",k:t},i=e.inherit(n,{i:/\n/}),s={cN:"string",b:/\$"/,e:'"',i:/\n/,c:[{b:"{{"},{b:"}}"},e.BE,i]},c={cN:"string",b:/\$@"/,e:'"',c:[{b:"{{"},{b:"}}"},{b:'""'},n]},o=e.inherit(c,{i:/\n/,c:[{b:"{{"},{b:"}}"},{b:'""'},i]});n.c=[c,s,r,e.ASM,e.QSM,e.CNM,e.CBCM],i.c=[o,s,a,e.ASM,e.QSM,e.CNM,e.inherit(e.CBCM,{i:/\n/})];var l={v:[c,s,r,e.ASM,e.QSM]},u=e.IR+"(<"+e.IR+"(\\s*,\\s*"+e.IR+")*>)?(\\[\\])?";return{aliases:["csharp"],k:t,i:/::/,c:[e.C("///","$",{rB:!0,c:[{cN:"doctag",v:[{b:"///",r:0},{b:"<!--|-->"},{b:"</?",e:">"}]}]}),e.CLCM,e.CBCM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},l,e.CNM,{bK:"class interface",e:/[{;=]/,i:/[^\s:]/,c:[e.TM,e.CLCM,e.CBCM]},{bK:"namespace",e:/[{;=]/,i:/[^\s:]/,c:[e.inherit(e.TM,{b:"[a-zA-Z](\\.?\\w)*"}),e.CLCM,e.CBCM]},{cN:"meta",b:"^\\s*\\[",eB:!0,e:"\\]",eE:!0,c:[{cN:"meta-string",b:/"/,e:/"/}]},{bK:"new return throw await else",r:0},{cN:"function",b:"("+u+"\\s+)+"+e.IR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:t,c:[{b:e.IR+"\\s*\\(",rB:!0,c:[e.TM],r:0},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:t,r:0,c:[l,e.CNM,e.CBCM]},e.CLCM,e.CBCM]}]}}),e.registerLanguage("css",function(e){var t="[a-zA-Z-][a-zA-Z0-9_-]*",r={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",i:/:/,c:[{cN:"keyword",b:/\w+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:t,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,r]}]}}),e.registerLanguage("diff",function(e){return{aliases:["patch"],c:[{cN:"meta",r:10,v:[{b:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"comment",v:[{b:/Index: /,e:/$/},{b:/={3,}/,e:/$/},{b:/^\-{3}/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+{3}/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"addition",b:"^\\!",e:"$"}]}}),e.registerLanguage("http",function(e){var t="HTTP/[0-9\\.]+";return{aliases:["https"],i:"\\S",c:[{b:"^"+t,e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{b:"^[A-Z]+ (.*?) "+t+"$",rB:!0,e:"$",c:[{cN:"string",b:" ",e:" ",eB:!0,eE:!0},{b:t},{cN:"keyword",b:"[A-Z]+"}]},{cN:"attribute",b:"^\\w",e:": ",eE:!0,i:"\\n|\\s|=",starts:{e:"$",r:0}},{b:"\\n\\n",starts:{sL:[],eW:!0}}]}}),e.registerLanguage("ini",function(e){var t={cN:"string",c:[e.BE],v:[{b:"'''",e:"'''",r:10},{b:'"""',e:'"""',r:10},{b:'"',e:'"'},{b:"'",e:"'"}]};return{aliases:["toml"],cI:!0,i:/\S/,c:[e.C(";","$"),e.HCM,{cN:"section",b:/^\s*\[+/,e:/\]+/},{b:/^[a-z0-9\[\]_-]+\s*=\s*/,e:"$",rB:!0,c:[{cN:"attr",b:/[a-z0-9\[\]_-]+/},{b:/=/,eW:!0,r:0,c:[{cN:"literal",b:/\bon|off|true|false|yes|no\b/},{cN:"variable",v:[{b:/\$[\w\d"][\w\d_]*/},{b:/\$\{(.*?)}/}]},t,{cN:"number",b:/([\+\-]+)?[\d]+_[\d_]+/},e.NM]}]}]}}),e.registerLanguage("java",function(e){var t="[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*",r=t+"(<"+t+"(\\s*,\\s*"+t+")*>)?",a="false synchronized int abstract float private char boolean static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",n="\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",i={cN:"number",b:n,r:0};return{aliases:["jsp"],k:a,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{r:0,c:[{b:/\w+@/,r:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"new throw return else",r:0},{cN:"function",b:"("+r+"\\s+)+"+e.UIR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:a,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,k:a,r:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},i,{cN:"meta",b:"@[A-Za-z]+"}]}}),e.registerLanguage("javascript",function(e){var t="[A-Za-z$_][0-9A-Za-z$_]*",r={keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await static import from as",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},a={cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},n={cN:"subst",b:"\\$\\{",e:"\\}",k:r,c:[]},i={cN:"string",b:"`",e:"`",c:[e.BE,n]};n.c=[e.ASM,e.QSM,i,a,e.RM];var s=n.c.concat([e.CBCM,e.CLCM]);return{aliases:["js","jsx"],k:r,c:[{cN:"meta",r:10,b:/^\s*['"]use (strict|asm)['"]/},{cN:"meta",b:/^#!/,e:/$/},e.ASM,e.QSM,i,e.CLCM,e.CBCM,a,{b:/[{,]\s*/,r:0,c:[{b:t+"\\s*:",rB:!0,r:0,c:[{cN:"attr",b:t,r:0}]}]},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+t+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:t},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:r,c:s}]}]},{b:/</,e:/(\/\w+|\w+\/)>/,sL:"xml",c:[{b:/<\w+\s*\/>/,skip:!0},{b:/<\w+/,e:/(\/\w+|\w+\/)>/,skip:!0,c:[{b:/<\w+\s*\/>/,skip:!0},"self"]}]}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:t}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:s}],i:/\[|%/},{b:/\$[(.]/},e.METHOD_GUARD,{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]},{bK:"constructor",e:/\{/,eE:!0}],i:/#(?!!)/}}),e.registerLanguage("json",function(e){var t={literal:"true false null"},r=[e.QSM,e.CNM],a={e:",",eW:!0,eE:!0,c:r,k:t},n={b:"{",e:"}",c:[{cN:"attr",b:/"/,e:/"/,c:[e.BE],i:"\\n"},e.inherit(a,{b:/:/})],i:"\\S"},i={b:"\\[",e:"\\]",c:[e.inherit(a)],i:"\\S"};return r.splice(r.length,0,n,i),{c:r,k:t,i:"\\S"}}),e.registerLanguage("makefile",function(e){var t={cN:"variable",v:[{b:"\\$\\("+e.UIR+"\\)",c:[e.BE]},{b:/\$[@%<?\^\+\*]/}]},r={cN:"string",b:/"/,e:/"/,c:[e.BE,t]},a={cN:"variable",b:/\$\([\w-]+\s/,e:/\)/,k:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},c:[t]},n={b:"^"+e.UIR+"\\s*[:+?]?=",i:"\\n",rB:!0,c:[{b:"^"+e.UIR,e:"[:+?]?=",eE:!0}]},i={cN:"meta",b:/^\.PHONY:/,e:/$/,k:{"meta-keyword":".PHONY"},l:/[\.\w]+/},s={cN:"section",b:/^[^\s]+:/,e:/$/,c:[t]};return{aliases:["mk","mak"],k:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath",l:/[\w-]+/,c:[e.HCM,t,r,a,n,i,s]}}),e.registerLanguage("xml",function(e){var t="[A-Za-z0-9\\._:-]+",r={eW:!0,i:/</,r:0,c:[{cN:"attr",b:t,r:0},{b:/=\s*/,r:0,c:[{cN:"string",endsParent:!0,v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s"'=<>`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist"],cI:!0,c:[{cN:"meta",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},e.C("<!--","-->",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0}]},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{name:"style"},c:[r],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{name:"script"},c:[r],starts:{e:"</script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"meta",v:[{b:/<\?xml/,e:/\?>/,r:10},{b:/<\?\w+/,e:/\?>/}]},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,r:0},r]}]}}),e.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"section",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"quote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"^```w*s*$",e:"^```s*$"},{b:"`.+?`"},{b:"^( {4}|	)",e:"$",r:0}]},{b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"string",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"symbol",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:/^\[[^\n]+\]:/,rB:!0,c:[{cN:"symbol",b:/\[/,e:/\]/,eB:!0,eE:!0},{cN:"link",b:/:\s*/,e:/$/,eB:!0}]}]}}),e.registerLanguage("nginx",function(e){var t={cN:"variable",v:[{b:/\$\d+/},{b:/\$\{/,e:/}/},{b:"[\\$\\@]"+e.UIR}]},r={eW:!0,l:"[a-z/_]+",k:{literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},r:0,i:"=>",c:[e.HCM,{cN:"string",c:[e.BE,t],v:[{b:/"/,e:/"/},{b:/'/,e:/'/}]},{b:"([a-z]+):/",e:"\\s",eW:!0,eE:!0,c:[t]},{cN:"regexp",c:[e.BE,t],v:[{b:"\\s\\^",e:"\\s|{|;",rE:!0},{b:"~\\*?\\s+",e:"\\s|{|;",rE:!0},{b:"\\*(\\.[a-z\\-]+)+"},{b:"([a-z\\-]+\\.)+\\*"}]},{cN:"number",b:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{cN:"number",b:"\\b\\d+[kKmMgGdshdwy]*\\b",r:0},t]};return{aliases:["nginxconf"],c:[e.HCM,{b:e.UIR+"\\s+{",rB:!0,e:"{",c:[{cN:"section",b:e.UIR}],r:0},{b:e.UIR+"\\s",e:";|{",rB:!0,c:[{cN:"attribute",b:e.UIR,starts:r}],r:0}],i:"[^\\s\\}]"}}),e.registerLanguage("objectivec",function(e){var t={cN:"built_in",b:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},r={keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},a=/[a-zA-Z@][a-zA-Z0-9_]*/,n="@interface @class @protocol @implementation";return{aliases:["mm","objc","obj-c"],k:r,l:a,i:"</",c:[t,e.CLCM,e.CBCM,e.CNM,e.QSM,{cN:"string",v:[{b:'@"',e:'"',i:"\\n",c:[e.BE]},{b:"'",e:"[^\\\\]'",i:"[^\\\\][^']"}]},{cN:"meta",b:"#",e:"$",c:[{cN:"meta-string",v:[{b:'"',e:'"'},{b:"<",e:">"}]}]},{cN:"class",b:"("+n.split(" ").join("|")+")\\b",e:"({|$)",eE:!0,k:n,l:a,c:[e.UTM]},{b:"\\."+e.UIR,r:0}]}}),e.registerLanguage("perl",function(e){var t="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when",r={cN:"subst",b:"[$@]\\{",e:"\\}",k:t},a={b:"->{",e:"}"},n={v:[{b:/\$\d/},{b:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{b:/[\$%@][^\s\w{]/,r:0}]},i=[e.BE,r,n],s=[n,e.HCM,e.C("^\\=\\w","\\=cut",{eW:!0}),a,{cN:"string",c:i,v:[{b:"q[qwxr]?\\s*\\(",e:"\\)",r:5},{b:"q[qwxr]?\\s*\\[",e:"\\]",r:5},{b:"q[qwxr]?\\s*\\{",e:"\\}",r:5},{b:"q[qwxr]?\\s*\\|",e:"\\|",r:5},{b:"q[qwxr]?\\s*\\<",e:"\\>",r:5},{b:"qw\\s+q",e:"q",r:5},{b:"'",e:"'",c:[e.BE]},{b:'"',e:'"'},{b:"`",e:"`",c:[e.BE]},{b:"{\\w+}",c:[],r:0},{b:"-?\\w+\\s*\\=\\>",c:[],r:0}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\/\\/|"+e.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",r:0,c:[e.HCM,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",r:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[e.BE],r:0}]},{cN:"function",bK:"sub",e:"(\\s*\\(.*?\\))?[;{]",eE:!0,r:5,c:[e.TM]},{b:"-\\w\\b",r:0},{b:"^__DATA__$",e:"^__END__$",sL:"mojolicious",c:[{b:"^@@.*",e:"$",cN:"comment"}]}];return r.c=s,a.c=s,{aliases:["pl","pm"],l:/[\w\.]+/,k:t,c:s}}),e.registerLanguage("php",function(e){var t={b:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},r={cN:"meta",b:/<\?(php)?|\?>/},a={cN:"string",c:[e.BE,r],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},n={v:[e.BNM,e.CNM]};return{aliases:["php3","php4","php5","php6"],cI:!0,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",c:[e.HCM,e.C("//","$",{c:[r]}),e.C("/\\*","\\*/",{c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.C("__halt_compiler.+?;",!1,{eW:!0,k:"__halt_compiler",l:e.UIR}),{cN:"string",b:/<<<['"]?\w+['"]?$/,e:/^\w+;?$/,c:[e.BE,{cN:"subst",v:[{b:/\$\w+/},{b:/\{\$/,e:/\}/}]}]},r,{cN:"keyword",b:/\$this\b/},t,{b:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{cN:"function",bK:"function",e:/[;{]/,eE:!0,i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",t,e.CBCM,a,n]}]},{cN:"class",bK:"class interface",e:"{",eE:!0,i:/[:\(\$"]/,c:[{bK:"extends implements"},e.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[e.UTM]},{bK:"use",e:";",c:[e.UTM]},{b:"=>"},a,n]}}),e.registerLanguage("python",function(e){var t={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10 None True False",built_in:"Ellipsis NotImplemented"},r={cN:"meta",b:/^(>>>|\.\.\.) /},a={cN:"subst",b:/\{/,e:/\}/,k:t,i:/#/},n={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[r],r:10},{b:/(u|b)?r?"""/,e:/"""/,c:[r],r:10},{b:/(fr|rf|f)'''/,e:/'''/,c:[r,a]},{b:/(fr|rf|f)"""/,e:/"""/,c:[r,a]},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},{b:/(fr|rf|f)'/,e:/'/,c:[a]},{b:/(fr|rf|f)"/,e:/"/,c:[a]},e.ASM,e.QSM]},i={cN:"number",r:0,v:[{b:e.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:e.CNR+"[lLjJ]?"}]},s={cN:"params",b:/\(/,e:/\)/,c:["self",r,i,n]};return a.c=[n,i,r],{aliases:["py","gyp"],k:t,i:/(<\/|->|\?)|=>/,c:[r,i,n,e.HCM,{v:[{cN:"function",bK:"def"},{cN:"class",bK:"class"}],e:/:/,i:/[${=;\n,]/,c:[e.UTM,s,{b:/->/,eW:!0,k:"None"}]},{cN:"meta",b:/^[\t ]*@/,e:/$/},{b:/\b(print|exec)\(/}]}}),e.registerLanguage("ruby",function(e){
-var t="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",r={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},a={cN:"doctag",b:"@[A-Za-z]+"},n={b:"#<",e:">"},i=[e.C("#","$",{c:[a]}),e.C("^\\=begin","^\\=end",{c:[a],r:10}),e.C("^__END__","\\n$")],s={cN:"subst",b:"#\\{",e:"}",k:r},c={cN:"string",c:[e.BE,s],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{b:/<<(-?)\w+$/,e:/^\s*\w+$/}]},o={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:r},l=[c,n,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(i)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:t}),o].concat(i)},{b:e.IR+"::"},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":(?!\\s)",c:[c,{b:t}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{cN:"params",b:/\|/,e:/\|/,k:r},{b:"("+e.RSR+"|unless)\\s*",k:"unless",c:[n,{cN:"regexp",c:[e.BE,s],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(i),r:0}].concat(i);s.c=l,o.c=l;var u="[>?]>",d="[\\w#]+\\(\\w+\\):\\d+:\\d+>",b="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",p=[{b:/^\s*=>/,starts:{e:"$",c:l}},{cN:"meta",b:"^("+u+"|"+d+"|"+b+")",starts:{e:"$",c:l}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:r,i:/\/\*/,c:i.concat(p).concat(l)}}),e.registerLanguage("shell",function(e){return{aliases:["console"],c:[{cN:"meta",b:"^\\s{0,3}[\\w\\d\\[\\]()@-]*[>%$#]",starts:{e:"$",sL:"bash"}}]}}),e.registerLanguage("sql",function(e){var t=e.C("--","$");return{cI:!0,i:/[<>{}*#]/,c:[{bK:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment",e:/;/,eW:!0,l:/[\w\.]+/,k:{keyword:"abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias allocate allow alter always analyze ancillary and any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second section securefile security seed segment select self sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null",built_in:"array bigint binary bit blob boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text varchar varying void"},c:[{cN:"string",b:"'",e:"'",c:[e.BE,{b:"''"}]},{cN:"string",b:'"',e:'"',c:[e.BE,{b:'""'}]},{cN:"string",b:"`",e:"`",c:[e.BE]},e.CNM,e.CBCM,t]},e.CBCM,t]}}),e});
\ No newline at end of file
diff --git a/Telegram/Resources/iv_html/morphdom-umd.min.2.7.2.js b/Telegram/Resources/iv_html/morphdom-umd.min.2.7.2.js
deleted file mode 100644
index 1e40c7eaee5998..00000000000000
--- a/Telegram/Resources/iv_html/morphdom-umd.min.2.7.2.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(global,factory){typeof exports==="object"&&typeof module!=="undefined"?module.exports=factory():typeof define==="function"&&define.amd?define(factory):(global=global||self,global.morphdom=factory())})(this,function(){"use strict";var DOCUMENT_FRAGMENT_NODE=11;function morphAttrs(fromNode,toNode){var toNodeAttrs=toNode.attributes;var attr;var attrName;var attrNamespaceURI;var attrValue;var fromValue;if(toNode.nodeType===DOCUMENT_FRAGMENT_NODE||fromNode.nodeType===DOCUMENT_FRAGMENT_NODE){return}for(var i=toNodeAttrs.length-1;i>=0;i--){attr=toNodeAttrs[i];attrName=attr.name;attrNamespaceURI=attr.namespaceURI;attrValue=attr.value;if(attrNamespaceURI){attrName=attr.localName||attrName;fromValue=fromNode.getAttributeNS(attrNamespaceURI,attrName);if(fromValue!==attrValue){if(attr.prefix==="xmlns"){attrName=attr.name}fromNode.setAttributeNS(attrNamespaceURI,attrName,attrValue)}}else{fromValue=fromNode.getAttribute(attrName);if(fromValue!==attrValue){fromNode.setAttribute(attrName,attrValue)}}}var fromNodeAttrs=fromNode.attributes;for(var d=fromNodeAttrs.length-1;d>=0;d--){attr=fromNodeAttrs[d];attrName=attr.name;attrNamespaceURI=attr.namespaceURI;if(attrNamespaceURI){attrName=attr.localName||attrName;if(!toNode.hasAttributeNS(attrNamespaceURI,attrName)){fromNode.removeAttributeNS(attrNamespaceURI,attrName)}}else{if(!toNode.hasAttribute(attrName)){fromNode.removeAttribute(attrName)}}}}var range;var NS_XHTML="http://www.w3.org/1999/xhtml";var doc=typeof document==="undefined"?undefined:document;var HAS_TEMPLATE_SUPPORT=!!doc&&"content"in doc.createElement("template");var HAS_RANGE_SUPPORT=!!doc&&doc.createRange&&"createContextualFragment"in doc.createRange();function createFragmentFromTemplate(str){var template=doc.createElement("template");template.innerHTML=str;return template.content.childNodes[0]}function createFragmentFromRange(str){if(!range){range=doc.createRange();range.selectNode(doc.body)}var fragment=range.createContextualFragment(str);return fragment.childNodes[0]}function createFragmentFromWrap(str){var fragment=doc.createElement("body");fragment.innerHTML=str;return fragment.childNodes[0]}function toElement(str){str=str.trim();if(HAS_TEMPLATE_SUPPORT){return createFragmentFromTemplate(str)}else if(HAS_RANGE_SUPPORT){return createFragmentFromRange(str)}return createFragmentFromWrap(str)}function compareNodeNames(fromEl,toEl){var fromNodeName=fromEl.nodeName;var toNodeName=toEl.nodeName;var fromCodeStart,toCodeStart;if(fromNodeName===toNodeName){return true}fromCodeStart=fromNodeName.charCodeAt(0);toCodeStart=toNodeName.charCodeAt(0);if(fromCodeStart<=90&&toCodeStart>=97){return fromNodeName===toNodeName.toUpperCase()}else if(toCodeStart<=90&&fromCodeStart>=97){return toNodeName===fromNodeName.toUpperCase()}else{return false}}function createElementNS(name,namespaceURI){return!namespaceURI||namespaceURI===NS_XHTML?doc.createElement(name):doc.createElementNS(namespaceURI,name)}function moveChildren(fromEl,toEl){var curChild=fromEl.firstChild;while(curChild){var nextChild=curChild.nextSibling;toEl.appendChild(curChild);curChild=nextChild}return toEl}function syncBooleanAttrProp(fromEl,toEl,name){if(fromEl[name]!==toEl[name]){fromEl[name]=toEl[name];if(fromEl[name]){fromEl.setAttribute(name,"")}else{fromEl.removeAttribute(name)}}}var specialElHandlers={OPTION:function(fromEl,toEl){var parentNode=fromEl.parentNode;if(parentNode){var parentName=parentNode.nodeName.toUpperCase();if(parentName==="OPTGROUP"){parentNode=parentNode.parentNode;parentName=parentNode&&parentNode.nodeName.toUpperCase()}if(parentName==="SELECT"&&!parentNode.hasAttribute("multiple")){if(fromEl.hasAttribute("selected")&&!toEl.selected){fromEl.setAttribute("selected","selected");fromEl.removeAttribute("selected")}parentNode.selectedIndex=-1}}syncBooleanAttrProp(fromEl,toEl,"selected")},INPUT:function(fromEl,toEl){syncBooleanAttrProp(fromEl,toEl,"checked");syncBooleanAttrProp(fromEl,toEl,"disabled");if(fromEl.value!==toEl.value){fromEl.value=toEl.value}if(!toEl.hasAttribute("value")){fromEl.removeAttribute("value")}},TEXTAREA:function(fromEl,toEl){var newValue=toEl.value;if(fromEl.value!==newValue){fromEl.value=newValue}var firstChild=fromEl.firstChild;if(firstChild){var oldValue=firstChild.nodeValue;if(oldValue==newValue||!newValue&&oldValue==fromEl.placeholder){return}firstChild.nodeValue=newValue}},SELECT:function(fromEl,toEl){if(!toEl.hasAttribute("multiple")){var selectedIndex=-1;var i=0;var curChild=fromEl.firstChild;var optgroup;var nodeName;while(curChild){nodeName=curChild.nodeName&&curChild.nodeName.toUpperCase();if(nodeName==="OPTGROUP"){optgroup=curChild;curChild=optgroup.firstChild}else{if(nodeName==="OPTION"){if(curChild.hasAttribute("selected")){selectedIndex=i;break}i++}curChild=curChild.nextSibling;if(!curChild&&optgroup){curChild=optgroup.nextSibling;optgroup=null}}}fromEl.selectedIndex=selectedIndex}}};var ELEMENT_NODE=1;var DOCUMENT_FRAGMENT_NODE$1=11;var TEXT_NODE=3;var COMMENT_NODE=8;function noop(){}function defaultGetNodeKey(node){if(node){return node.getAttribute&&node.getAttribute("id")||node.id}}function morphdomFactory(morphAttrs){return function morphdom(fromNode,toNode,options){if(!options){options={}}if(typeof toNode==="string"){if(fromNode.nodeName==="#document"||fromNode.nodeName==="HTML"||fromNode.nodeName==="BODY"){var toNodeHtml=toNode;toNode=doc.createElement("html");toNode.innerHTML=toNodeHtml}else{toNode=toElement(toNode)}}else if(toNode.nodeType===DOCUMENT_FRAGMENT_NODE$1){toNode=toNode.firstElementChild}var getNodeKey=options.getNodeKey||defaultGetNodeKey;var onBeforeNodeAdded=options.onBeforeNodeAdded||noop;var onNodeAdded=options.onNodeAdded||noop;var onBeforeElUpdated=options.onBeforeElUpdated||noop;var onElUpdated=options.onElUpdated||noop;var onBeforeNodeDiscarded=options.onBeforeNodeDiscarded||noop;var onNodeDiscarded=options.onNodeDiscarded||noop;var onBeforeElChildrenUpdated=options.onBeforeElChildrenUpdated||noop;var skipFromChildren=options.skipFromChildren||noop;var addChild=options.addChild||function(parent,child){return parent.appendChild(child)};var childrenOnly=options.childrenOnly===true;var fromNodesLookup=Object.create(null);var keyedRemovalList=[];function addKeyedRemoval(key){keyedRemovalList.push(key)}function walkDiscardedChildNodes(node,skipKeyedNodes){if(node.nodeType===ELEMENT_NODE){var curChild=node.firstChild;while(curChild){var key=undefined;if(skipKeyedNodes&&(key=getNodeKey(curChild))){addKeyedRemoval(key)}else{onNodeDiscarded(curChild);if(curChild.firstChild){walkDiscardedChildNodes(curChild,skipKeyedNodes)}}curChild=curChild.nextSibling}}}function removeNode(node,parentNode,skipKeyedNodes){if(onBeforeNodeDiscarded(node)===false){return}if(parentNode){parentNode.removeChild(node)}onNodeDiscarded(node);walkDiscardedChildNodes(node,skipKeyedNodes)}function indexTree(node){if(node.nodeType===ELEMENT_NODE||node.nodeType===DOCUMENT_FRAGMENT_NODE$1){var curChild=node.firstChild;while(curChild){var key=getNodeKey(curChild);if(key){fromNodesLookup[key]=curChild}indexTree(curChild);curChild=curChild.nextSibling}}}indexTree(fromNode);function handleNodeAdded(el){onNodeAdded(el);var curChild=el.firstChild;while(curChild){var nextSibling=curChild.nextSibling;var key=getNodeKey(curChild);if(key){var unmatchedFromEl=fromNodesLookup[key];if(unmatchedFromEl&&compareNodeNames(curChild,unmatchedFromEl)){curChild.parentNode.replaceChild(unmatchedFromEl,curChild);morphEl(unmatchedFromEl,curChild)}else{handleNodeAdded(curChild)}}else{handleNodeAdded(curChild)}curChild=nextSibling}}function cleanupFromEl(fromEl,curFromNodeChild,curFromNodeKey){while(curFromNodeChild){var fromNextSibling=curFromNodeChild.nextSibling;if(curFromNodeKey=getNodeKey(curFromNodeChild)){addKeyedRemoval(curFromNodeKey)}else{removeNode(curFromNodeChild,fromEl,true)}curFromNodeChild=fromNextSibling}}function morphEl(fromEl,toEl,childrenOnly){var toElKey=getNodeKey(toEl);if(toElKey){delete fromNodesLookup[toElKey]}if(!childrenOnly){if(onBeforeElUpdated(fromEl,toEl)===false){return}morphAttrs(fromEl,toEl);onElUpdated(fromEl);if(onBeforeElChildrenUpdated(fromEl,toEl)===false){return}}if(fromEl.nodeName!=="TEXTAREA"){morphChildren(fromEl,toEl)}else{specialElHandlers.TEXTAREA(fromEl,toEl)}}function morphChildren(fromEl,toEl){var skipFrom=skipFromChildren(fromEl,toEl);var curToNodeChild=toEl.firstChild;var curFromNodeChild=fromEl.firstChild;var curToNodeKey;var curFromNodeKey;var fromNextSibling;var toNextSibling;var matchingFromEl;outer:while(curToNodeChild){toNextSibling=curToNodeChild.nextSibling;curToNodeKey=getNodeKey(curToNodeChild);while(!skipFrom&&curFromNodeChild){fromNextSibling=curFromNodeChild.nextSibling;if(curToNodeChild.isSameNode&&curToNodeChild.isSameNode(curFromNodeChild)){curToNodeChild=toNextSibling;curFromNodeChild=fromNextSibling;continue outer}curFromNodeKey=getNodeKey(curFromNodeChild);var curFromNodeType=curFromNodeChild.nodeType;var isCompatible=undefined;if(curFromNodeType===curToNodeChild.nodeType){if(curFromNodeType===ELEMENT_NODE){if(curToNodeKey){if(curToNodeKey!==curFromNodeKey){if(matchingFromEl=fromNodesLookup[curToNodeKey]){if(fromNextSibling===matchingFromEl){isCompatible=false}else{fromEl.insertBefore(matchingFromEl,curFromNodeChild);if(curFromNodeKey){addKeyedRemoval(curFromNodeKey)}else{removeNode(curFromNodeChild,fromEl,true)}curFromNodeChild=matchingFromEl;curFromNodeKey=getNodeKey(curFromNodeChild)}}else{isCompatible=false}}}else if(curFromNodeKey){isCompatible=false}isCompatible=isCompatible!==false&&compareNodeNames(curFromNodeChild,curToNodeChild);if(isCompatible){morphEl(curFromNodeChild,curToNodeChild)}}else if(curFromNodeType===TEXT_NODE||curFromNodeType==COMMENT_NODE){isCompatible=true;if(curFromNodeChild.nodeValue!==curToNodeChild.nodeValue){curFromNodeChild.nodeValue=curToNodeChild.nodeValue}}}if(isCompatible){curToNodeChild=toNextSibling;curFromNodeChild=fromNextSibling;continue outer}if(curFromNodeKey){addKeyedRemoval(curFromNodeKey)}else{removeNode(curFromNodeChild,fromEl,true)}curFromNodeChild=fromNextSibling}if(curToNodeKey&&(matchingFromEl=fromNodesLookup[curToNodeKey])&&compareNodeNames(matchingFromEl,curToNodeChild)){if(!skipFrom){addChild(fromEl,matchingFromEl)}morphEl(matchingFromEl,curToNodeChild)}else{var onBeforeNodeAddedResult=onBeforeNodeAdded(curToNodeChild);if(onBeforeNodeAddedResult!==false){if(onBeforeNodeAddedResult){curToNodeChild=onBeforeNodeAddedResult}if(curToNodeChild.actualize){curToNodeChild=curToNodeChild.actualize(fromEl.ownerDocument||doc)}addChild(fromEl,curToNodeChild);handleNodeAdded(curToNodeChild)}}curToNodeChild=toNextSibling;curFromNodeChild=fromNextSibling}cleanupFromEl(fromEl,curFromNodeChild,curFromNodeKey);var specialElHandler=specialElHandlers[fromEl.nodeName];if(specialElHandler){specialElHandler(fromEl,toEl)}}var morphedNode=fromNode;var morphedNodeType=morphedNode.nodeType;var toNodeType=toNode.nodeType;if(!childrenOnly){if(morphedNodeType===ELEMENT_NODE){if(toNodeType===ELEMENT_NODE){if(!compareNodeNames(fromNode,toNode)){onNodeDiscarded(fromNode);morphedNode=moveChildren(fromNode,createElementNS(toNode.nodeName,toNode.namespaceURI))}}else{morphedNode=toNode}}else if(morphedNodeType===TEXT_NODE||morphedNodeType===COMMENT_NODE){if(toNodeType===morphedNodeType){if(morphedNode.nodeValue!==toNode.nodeValue){morphedNode.nodeValue=toNode.nodeValue}return morphedNode}else{morphedNode=toNode}}}if(morphedNode===toNode){onNodeDiscarded(fromNode)}else{if(toNode.isSameNode&&toNode.isSameNode(morphedNode)){return}morphEl(morphedNode,toNode,childrenOnly);if(keyedRemovalList){for(var i=0,len=keyedRemovalList.length;i<len;i++){var elToRemove=fromNodesLookup[keyedRemovalList[i]];if(elToRemove){removeNode(elToRemove,elToRemove.parentNode,false)}}}}if(!childrenOnly&&morphedNode!==fromNode&&fromNode.parentNode){if(morphedNode.actualize){morphedNode=morphedNode.actualize(fromNode.ownerDocument||doc)}fromNode.parentNode.replaceChild(morphedNode,fromNode)}return morphedNode}}var morphdom=morphdomFactory(morphAttrs);return morphdom});
\ No newline at end of file
diff --git a/Telegram/Resources/iv_html/page.css b/Telegram/Resources/iv_html/page.css
deleted file mode 100644
index cdbfc3108c830c..00000000000000
--- a/Telegram/Resources/iv_html/page.css
+++ /dev/null
@@ -1,1146 +0,0 @@
-:root {
-	--font-sans: -apple-system, BlinkMacSystemFont, avenir next, avenir, Segoe UI Variable Text, segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, tahoma, arial, sans-serif;
-	--font-serif: Iowan Old Style, Apple Garamond, Baskerville, Georgia, Times New Roman, Droid Serif, Times, Source Serif Pro, serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol;
-	--font-mono: Menlo, Cascadia Code, Consolas, Monaco, Liberation Mono, Lucida Console, monospace;
-}
-
-body {
-	font-family: var(--font-sans);
-	font-size: 17px;
-	line-height: 25px;
-	padding: 0;
-	margin: 0;
-	background-color: var(--td-window-bg);
-	color: var(--td-window-fg);
-	zoom: var(--td-zoom-percentage);
-}
-
-html.custom_scroll ::-webkit-scrollbar {
-	border-radius: 5px !important;
-	border: 3px solid transparent !important;
-	background-color: var(--td-scroll-bg) !important;
-	background-clip: content-box !important;
-	width: 10px !important;
-}
-html.custom_scroll ::-webkit-scrollbar:hover {
-	background-color: var(--td-scroll-bg-over) !important;
-}
-html.custom_scroll ::-webkit-scrollbar-thumb {
-	border-radius: 5px !important;
-	border: 3px solid transparent !important;
-	background-color: var(--td-scroll-bar-bg) !important;
-	background-clip: content-box !important;
-}
-html.custom_scroll ::-webkit-scrollbar-thumb:hover {
-	background-color: var(--td-scroll-bar-bg-over) !important;
-}
-
-.fixed_button {
-	position: fixed;
-	background-color: var(--td-history-to-down-bg);
-	border: none;
-	border-radius: 50%;
-	width: 32px;
-	height: 32px;
-	box-shadow: 0 0 3px 0px var(--td-history-to-down-shadow);
-	cursor: pointer;
-	outline: none;
-	z-index: 1000;
-	overflow: hidden;
-	user-select: none;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	padding: 0px;
-}
-.fixed_button:hover {
-	background-color: var(--td-history-to-down-bg-over);
-}
-.fixed_button svg {
-	fill: none;
-	position: relative;
-	z-index: 1;
-	width: 24px;
-	height: 24px;
-}
-.fixed_button .ripple .inner {
-	position: absolute;
-	border-radius: 50%;
-	transform: scale(0);
-	opacity: 1;
-	animation: ripple 650ms cubic-bezier(0.22, 1, 0.36, 1) forwards;
-	background-color: var(--td-history-to-down-bg-ripple);
-}
-.fixed_button .ripple.hiding {
-	animation: fadeOut 200ms linear forwards;
-}
-@keyframes ripple {
-	to {
-		transform: scale(2);
-	}
-}
-@keyframes fadeOut {
-	to {
-		opacity: 0;
-	}
-}
-@keyframes fadeIn {
-	to {
-		opacity: 1;
-	}
-}
-#menu_page_blocker {
-	z-index: 999;
-	position: fixed;
-	width: 100%;
-	height: 100%;
-}
-#top_shadow {
-	z-index: 999;
-	position: fixed;
-	top: 0;
-	height: 1px;
-	width: 100%;
-	left: 0;
-	background-color: var(--td-shadow-fg)
-}
-#bottom_up path {
-	stroke: var(--td-history-to-down-fg);
-}
-#bottom_up path {
-	stroke-width: 1.4;
-}
-#bottom_up:hover path {
-	stroke: var(--td-history-to-down-fg-over);
-}
-#bottom_up {
-	bottom: 10px;
-	right: 10px;
-	transition: bottom 200ms linear;
-}
-#bottom_up.hidden {
-	bottom: -36px;
-}
-
-.page-scroll {
-	position: absolute;
-	width: 100%;
-	height: 100%;
-	overflow-x: hidden;
-	overflow-y: auto;
-}
-.page-scroll:focus {
-	outline: none;
-}
-.page-slide {
-	position: relative;
-	width: 100%;
-	min-height: 100%;
-	margin-left: 0%;
-	transition: margin 240ms ease-in-out;
-}
-.page-footer {
-	height: 32px;
-	margin-top: -32px;
-	background: var(--td-window-bg-over);
-}
-.page-footer .content {
-	padding: 3px 18px;
-	font-size: 15px;
-	color: var(--td-window-sub-text-fg);
-	text-align: center;
-}
-.page-footer .wrong {
-	position: relative;
-	padding: 5px;
-	margin: -5px;
-	color: var(--td-window-sub-text-fg);
-	text-decoration: none;
-	cursor: pointer;
-}
-.page-footer .wrong:hover {
-	text-decoration: underline;
-}
-.hidden-left,
-.hidden-right {
-	pointer-events: none;
-}
-.hidden-left .page-slide {
-	margin-left: -100%;
-}
-.hidden-right .page-slide {
-	margin-left: 100%;
-}
-article {
-	padding-bottom: 40px;
-	overflow-y: hidden;
-	overflow-x: auto;
-	white-space: pre-wrap;
-	max-width: 732px;
-	margin: 0 auto;
-}
-article h1,
-article h2 {
-	font-family: var(--font-serif);
-	font-size: 28px;
-	line-height: 31px;
-	margin: 21px 18px 12px;
-	font-weight: normal;
-	min-height: 31px;
-}
-article h2 {
-	font-size: 24px;
-	line-height: 30px;
-	margin: -6px 18px 12px;
-	color: var(--td-window-sub-text-fg);
-}
-article h5 {
-	margin: 21px 18px 12px;
-}
-article address {
-	font-size: 15px;
-	color: var(--td-window-sub-text-fg);
-	margin: 12px 18px 21px;
-	font-style: normal;
-}
-article.rtl address {
-	direction: ltr;
-	text-align: right;
-}
-article address figure {
-	width: 25px;
-	height: 25px;
-	float: right;
-	margin: 0 0 0 12px;
-	background: no-repeat center;
-	background-size: cover;
-	border-radius: 50%;
-}
-article address a,
-article address a[href] {
-	color: var(--td-window-sub-text-fg);
-}
-article address a[href] {
-	text-decoration: underline;
-}
-article a[href] {
-	color: var(--td-window-active-text-fg);
-	text-decoration: none;
-}
-article a.internal-iv-link {
-	border-radius: 3px;
-	margin: 0px -3px;
-	padding: 0px 3px;
-	position: relative;
-	background: var(--td-light-button-bg-over);
-	color: var(--td-light-button-fg);
-}
-article span.reference {
-	border: dotted var(--td-window-sub-text-fg);
-	border-width: 1px 1px 1px 2px;
-	background: rgba(255, 255, 255, 0.7);
-	margin: 0 1px;
-	padding: 2px;
-	position: relative;
-}
-article.rtl span.reference {
-	border-width: 1px 0 1px 1px;
-}
-article code {
-	font-size: 0.94em;
-	background: var(--td-box-divider-bg);
-	border-radius: 2px;
-	padding: 0 3px 1px;
-}
-article mark {
-	background: var(--td-window-bg-over);
-	color: var(--td-window-fg);
-	border-radius: 2px;
-	padding: 0 3px 1px;
-}
-article sup,
-article sub {
-	font-size: 0.75em;
-	line-height: 1;
-}
-article p {
-	margin: 0 18px 12px;
-	word-wrap: break-word;
-}
-article ul p,
-article ol p {
-	margin: 0 0 6px;
-}
-article pre,
-article pre.hljs {
-	font-family: var(--font-mono);
-	margin: 14px 0;
-	padding: 7px 18px;
-	background: var(--td-box-divider-bg);
-	font-size: 16px;
-	white-space: pre-wrap;
-	word-wrap: break-word;
-	overflow-x: visible;
-	position: relative;
-}
-article ul pre,
-article ol pre,
-article ul pre.hljs,
-article ol pre.hljs {
-	margin: 6px 0 6px -18px;
-}
-article.rtl ul pre,
-article.rtl ol pre,
-article.rtl ul pre.hljs,
-article.rtl ol pre.hljs {
-	margin-right: -18px;
-	margin-left: 0;
-}
-article pre + pre {
-	margin-top: -14px;
-}
-article h3,
-article h4 {
-	font-family: var(--font-serif);
-	font-size: 24px;
-	line-height: 30px;
-	margin: 18px 18px 9px;
-	font-weight: normal;
-}
-article h4 {
-	font-size: 19px;
-	margin: 18px 18px 7px;
-}
-article ul h3,
-article ol h3 {
-	margin: 12px 0 7px;
-}
-article ul h4,
-article ol h4 {
-	margin: 10px 0 5px;
-}
-article blockquote {
-	font-family: var(--font-serif);
-	margin: 18px 18px 16px;
-	padding-left: 22px;
-	position: relative;
-	font-style: italic;
-	word-wrap: break-word;
-}
-article blockquote:before {
-	content: '';
-	position: absolute;
-	left: 1px;
-	top: 3px;
-	bottom: 3px;
-	width: 3px;
-	background-color: var(--td-window-bg-active);
-	border-radius: 3px;
-}
-article.rtl blockquote {
-	padding-right: 22px;
-	padding-left: 0;
-}
-article.rtl blockquote:before {
-	right: 1px;
-	left: auto;
-}
-article aside {
-	font-family: var(--font-serif);
-	margin: 18px 18px 16px;
-	padding: 0 18px;
-	text-align: center;
-	font-style: italic;
-}
-article ul blockquote,
-article ol blockquote,
-article ul aside,
-article ol aside {
-	margin: 12px 0 10px;
-}
-article blockquote cite,
-article aside cite,
-article footer cite,
-article .pullquote cite {
-	font-family: var(--font-sans);
-	font-size: 15px;
-	display: block;
-	color: var(--td-window-sub-text-fg);
-	line-height: 19px;
-	padding: 5px 0 2px;
-	font-style: normal;
-}
-article hr {
-	width: 50%;
-	margin: 36px auto 26px;
-	padding: 2px 0 10px;
-	border: none;
-}
-article ul hr,
-article ol hr {
-	margin: 18px auto;
-}
-article hr:before {
-	content: '';
-	display: block;
-	border-top: 1px solid var(--td-window-sub-text-fg);
-	padding: 0 0 2px;
-}
-article footer hr {
-	margin: 18px auto 6px;
-}
-article ul,
-article ol {
-	margin: 0 18px 12px;
-	padding-left: 18px;
-}
-article.rtl ul,
-article.rtl ol {
-	padding-right: 18px;
-	padding-left: 0;
-}
-/*article ul {
-	list-style: none;
-}*/
-article ul > li,
-article ol > li {
-	padding-left: 4px;
-}
-article.rtl ul > li,
-article.rtl ol > li {
-	padding-right: 4px;
-	padding-left: 0;
-}
-/*article ul > li {
-	position: relative;
-}
-article ul > li:before {
-	content: '\2022';
-	position: absolute;
-	display: block;
-	font-size: 163%;
-	left: -19px;
-	top: 1px;
-}
-article.rtl ul > li:before {
-	left: auto;
-	right: -19px;
-}*/
-article ul ul,
-article ul ol,
-article ol ul,
-article ol ol {
-	margin: 0 0 12px;
-}
-
-article table {
-	width: 100%;
-	border-collapse: collapse;
-}
-article table.bordered,
-article table.bordered td,
-article table.bordered th {
-	border: 1px solid var(--td-history-to-down-shadow);
-}
-article table.striped tr:nth-child(odd) td {
-	background-color: var(--td-box-divider-bg);
-}
-article table caption {
-	font-size: 15px;
-	line-height: 18px;
-	margin: 4px 0 7px;
-	text-align: left;
-	color: var(--td-window-sub-text-fg);
-}
-article.rtl table caption {
-	text-align: right;
-}
-article td,
-article th {
-	font-size: 15px;
-	line-height: 21px;
-	padding: 6px 5px 5px;
-	background-color: var(--td-window-bg);
-	vertical-align: middle;
-	font-weight: normal;
-	text-align: left;
-}
-article th {
-	background-color: var(--td-box-divider-bg);
-}
-article.rtl table td,
-article.rtl table th {
-	text-align: right;
-}
-article details {
-	position: relative;
-	margin: 0 0 12px;
-	padding: 0 0 1px;
-}
-article details:before {
-	content: '';
-	display: block;
-	border-bottom: 1px solid var(--td-history-to-down-shadow);
-	position: absolute;
-	left: 18px;
-	right: 0;
-	bottom: 0;
-}
-article.rtl details:before {
-	right: 18px;
-	left: 0;
-}
-article details + details {
-	margin-top: -12px;
-}
-article details > details:last-child {
-	margin-bottom: -1px;
-}
-article summary {
-	padding: 10px 18px 10px 42px;
-	line-height: 25px;
-	min-height: 25px;
-}
-article.rtl summary {
-	padding-left: 18px;
-	padding-right: 42px;
-}
-article summary:hover {
-	cursor: pointer;
-}
-article summary:focus {
-	outline: none;
-}
-article summary::-webkit-details-marker {
-	display: none;
-}
-article summary::marker {
-	content: '';
-}
-article summary:before {
-	content: '';
-	background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAICAYAAADN5B7xAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAH1JREFUeNqEjUEKgCAQRSfrNi1bdZFadJjsMC46SSAIHqjB5mcFqdFfhD3eUyKZtb6ln92O2janmXdvrRu+ZTfAgasu1jAHU4qiHAwc/Ff4oCQKsxxZ0NT33XrxUTjkWvgiXFf3TWkU6Vt+XihH515yFiQRpfLnEMUw3yHAABZNTT9emBrvAAAAAElFTkSuQmCC');
-	transition: all .2s ease;
-	display: inline-block;
-	position: absolute;
-	width: 12px;
-	height: 8px;
-	left: 18px;
-	top: 18px;
-}
-article.rtl summary:before {
-	right: 18px;
-	left: auto;
-}
-@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
-	article summary:before {
-	background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAQCAYAAAAMJL+VAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAPxJREFUeNq8lEESgiAUhgFbZ0epSW28gB2pZbrrSukBHDWto1TrwHih45AiaDOxesLP9w1PBlzXNfrLSNPqkGWV8ysHGMBqv4mAlyFC7MRPk+T51Z0Lh73AAJZgIoRFUR/bEMb4TggJPG9TTIUzxmIuWHWzOCLfQQgwRiedRMBpIsObFvn+NgSTLEE2bCiKm6eDQ0bAkS2v4AjYuPvJcqtEu9DDshaB665zFZzSV6yCfyr5JplLTOA9wZiEg/a+72Qic9nxubMOPijQSZraCK4UjEiezSVYmsBHBSrJAEIJ1wr0knG4kUAt0cONBX2JGXzGi1uG7SNmOt4CDADc4r+K4txg+wAAAABJRU5ErkJggg==');
-	background-size: 12px 8px;
-	}
-}
-article details[open] > summary:before {
-	/*transform: rotateZ(-180deg);*/
-	transform: scaleY(-1);
-}
-article li summary {
-	padding-left: 24px;
-}
-article li details:before,
-article li summary:before {
-	left: 0;
-}
-
-img,
-video,
-iframe {
-	max-width: 100%;
-	max-height: 480px;
-	vertical-align: top;
-}
-video {
-	width: 100%;
-}
-audio {
-	width: 100%;
-	width: calc(100% - 36px);
-	margin: 0 18px;
-	vertical-align: top;
-}
-img {
-	font-size: 12px;
-	line-height: 14px;
-	color: var(--td-window-sub-text-fg);
-}
-img.pic {
-	max-height: none;
-	font-size: inherit;
-	vertical-align: middle;
-	position: relative;
-	top: -0.1em;
-}
-img.pic.optional {
-	opacity: 0.4;
-}
-body:hover img.pic.optional {
-	opacity: 1;
-}
-iframe.autosize {
-	max-height: none;
-}
-.iframe-wrap {
-	max-width: 100%;
-	vertical-align: top;
-	display: inline-block;
-	position: relative;
-}
-.iframe-wrap iframe {
-	position: absolute;
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-}
-figure {
-	margin: 0 0 16px;
-	padding: 0;
-	text-align: center;
-	position: relative;
-}
-figure.nowide {
-	margin-left: 18px;
-	margin-right: 18px;
-}
-figure.nowide figcaption {
-	padding-left: 0;
-	padding-right: 0;
-}
-ul figure.nowide,
-ol figure.nowide {
-	margin: 0 0 12px;
-}
-figure > figure {
-	margin: 0;
-}
-figcaption {
-	font-size: 15px;
-	color: var(--td-window-sub-text-fg);
-	padding: 6px 18px 0;
-	line-height: 19px;
-	text-align: left;
-}
-article.rtl figcaption {
-	text-align: right;
-}
-ul figcaption,
-ol figcaption {
-	padding-left: 0;
-	padding-right: 0;
-}
-figcaption > cite {
-	font-family: var(--font-sans);
-	font-size: 12px;
-	display: block;
-	line-height: 15px;
-	padding: 2px 0 0;
-	font-style: normal;
-}
-footer {
-	margin: 12px 18px;
-	color: var(--td-window-sub-text-fg);
-}
-
-figure.slideshow-wrap {
-	position: relative;
-}
-figure.slideshow {
-	position: absolute;
-	top: 0px;
-	white-space: nowrap;
-	width: 100%;
-	background: #000;
-	overflow: hidden;
-}
-figure.slideshow a {
-	transition: margin 200ms ease-in-out;
-}
-figure.slideshow .photo-wrap,
-figure.slideshow .video-wrap {
-	position: static !important;
-	display: inline-block;
-	margin: 0;
-	vertical-align: middle;
-}
-.slideshow-buttons {
-	position: absolute;
-	width: 100%;
-	bottom: 10px;
-	white-space: nowrap;
-	overflow: hidden;
-	z-index: 5;
-}
-.slideshow-buttons > fieldset {
-	padding: 0;
-	margin: 0;
-	border: none;
-	line-height: 0;
-	overflow: hidden;
-	overflow-x: auto;
-	min-width: auto;
-}
-.slideshow-buttons label {
-	display: inline-block;
-	padding: 7px;
-	cursor: pointer;
-}
-.slideshow-buttons input {
-	position: absolute;
-	left: -10000px;
-}
-.slideshow-buttons label i {
-	display: inline-block;
-	background: #fff;
-	box-shadow: 0 0 3px rgba(0, 0, 0, .4);
-	border-radius: 3.5px;
-	width: 7px;
-	height: 7px;
-	opacity: .6;
-	transition: opacity .3s;
-}
-.slideshow-buttons input:checked ~ i {
-	opacity: 1;
-}
-.slideshow-next,
-.slideshow-prev {
-	position: absolute;
-	z-index: 4;
-	top: 0;
-	width: 25%;
-	max-width: 128px;
-	height: 100%;
-	cursor: pointer;
-	transition: opacity 200ms ease-in-out;
-	user-select: none;
-	opacity: 0.6;
-}
-.slideshow-next {
-	right: 0;
-	background: linear-gradient(to right, rgba(0,0,0,0) 0%, rgba(0,0,0,0.6) 100%);
-}
-.slideshow-prev {
-	left: 0;
-	background: linear-gradient(to left, rgba(0,0,0,0) 0%, rgba(0,0,0,0.6) 100%);
-}
-.slideshow-next:hover {
-	opacity: 1;
-}
-.slideshow-prev:hover {
-	opacity: 1;
-}
-.slideshow-prev svg,
-.slideshow-next svg {
-	fill: none;
-	top: calc(50% - 12px);
-	position: absolute;
-	z-index: 5;
-	width: 24px;
-	height: 24px;
-	pointer-events: none;
-}
-.slideshow-prev svg {
-	left: calc(min(50% - 12px, 20px));
-}
-.slideshow-next svg {
-	right: calc(min(50% - 12px, 20px));
-}
-.slideshow-prev path,
-.slideshow-next path {
-	stroke-width: 1.4;
-	stroke: #fff;
-}
-
-figure.collage-wrap {
-	margin: 0px 12px;
-}
-figure.collage-wrap figcaption {
-	padding: 6px 6px 0px;
-}
-figure.collage {
-	overflow: hidden;
-	border-radius: 6px;
-}
-figure.collage .photo-wrap,
-figure.collage .video-wrap {
-	position: absolute;
-}
-figure.collage .photo-wrap .photo {
-	background-size: cover;
-}
-figure.collage .video-wrap video {
-	object-fit: cover;
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	width: auto;
-	height: auto;
-	min-width: 100%;
-	min-height: 100%;
-	transform: translate(-50%, -50%);
-}
-figure.collage .video-wrap .video-small,
-video[autoplay] {
-	pointer-events: none;
-}
-
-figure.table-wrap {
-	overflow: auto;
-	-webkit-overflow-scrolling: touch;
-}
-figure.table {
-	display: table-cell;
-	padding: 0 18px;
-}
-article ol figure.table-wrap,
-article ul figure.table-wrap {
-	margin-top: 7px;
-}
-article ol figure.table,
-article ul figure.table {
-	padding: 0;
-}
-
-figure blockquote.embed-post {
-	text-align: left;
-	margin-bottom: 0;
-}
-article.rtl figure blockquote.embed-post {
-	text-align: right;
-}
-blockquote.embed-post address {
-	margin: 0;
-	padding: 5px 0 9px;
-	overflow: hidden;
-}
-blockquote.embed-post address figure {
-	width: 50px;
-	height: 50px;
-	float: left;
-	margin: 0 12px 0 0;
-	background: no-repeat center;
-	background-size: cover;
-	border-radius: 50%;
-}
-article.rtl blockquote.embed-post address figure {
-	float: right;
-	margin-left: 12px;
-	margin-right: 0;
-}
-blockquote.embed-post address a {
-	display: inline-block;
-	padding-top: 2px;
-	font-size: 17px;
-	font-weight: 600;
-	color: var(--td-window-fg);
-}
-blockquote.embed-post address time {
-	display: block;
-	line-height: 19px;
-}
-blockquote.embed-post p,
-blockquote.embed-post blockquote {
-	margin: 0 0 7px;
-	clear: left;
-}
-blockquote.embed-post figcaption {
-	padding-left: 0;
-	padding-right: 0;
-}
-blockquote.embed-post figure.collage {
-	margin-left: -2px;
-	margin-right: -2px;
-}
-blockquote.embed-post footer {
-	margin: 12px 0 0;
-	font-style: normal;
-}
-blockquote.embed-post footer hr {
-	display: none;
-}
-
-section.embed-post {
-	display: block;
-	width: auto;
-	height: auto;
-	background: var(--td-box-divider-bg);
-	margin: 0 18px 12px;
-	padding: 24px 18px;
-	text-align: center;
-}
-section.embed-post strong {
-	font-size: 21px;
-	font-weight: normal;
-	display: block;
-	color: var(--td-window-sub-text-fg);
-}
-section.embed-post small {
-	display: block;
-	color: var(--td-window-sub-text-fg);
-}
-
-
-section.related {
-	margin: 7px 0 12px;
-}
-section.related h4 {
-	font-family: var(--font-sans);
-	font-size: 17px;
-	line-height: 26px;
-	font-weight: 500;
-	display: block;
-	padding: 7px 18px;
-	background: var(--td-box-divider-bg);
-	margin: 0;
-	color: var(--td-window-fg);
-}
-section.related a.related-link {
-	display: block;
-	padding: 15px 18px 16px;
-	background: var(--td-window-bg);
-	position: relative;
-	overflow: hidden;
-}
-section.related a.related-link:after {
-	content: '';
-	display: block;
-	border-bottom: 1px solid var(--td-history-to-down-shadow);
-	position: absolute;
-	left: 18px;
-	right: 0;
-	bottom: 0;
-}
-section.related a.related-link:last-child:after {
-	border-bottom: 0px;
-}
-section.related .related-link-url {
-	display: block;
-	font-size: 15px;
-	line-height: 18px;
-	padding: 7px 0;
-	color: var(--td-window-sub-text-fg);
-	word-break: break-word;
-}
-section.related .related-link-thumb {
-	display: inline-block;
-	float: right;
-	width: 87px;
-	height: 87px;
-	border-radius: 4px;
-	background: no-repeat center;
-	background-size: cover;
-	margin-left: 15px;
-}
-section.related .related-link-content {
-	display: block;
-	margin: -3px 0;
-}
-section.related .related-link-title {
-	font-size: 15px;
-	font-weight: 500;
-	line-height: 18px;
-	display: block;
-	display: -webkit-box;
-	margin-bottom: 4px;
-	max-height: 36px;
-	-webkit-line-clamp: 2;
-	-webkit-box-orient: vertical;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: pre-wrap;
-	color: var(--td-window-fg);
-}
-section.related .related-link-desc {
-	font-size: 14px;
-	line-height: 17px;
-	display: block;
-	display: -webkit-box;
-	max-height: 51px;
-	-webkit-line-clamp: 3;
-	-webkit-box-orient: vertical;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: pre-wrap;
-	color: var(--td-window-fg);
-}
-section.related .related-link-source {
-	font-size: 13px;
-	line-height: 17px;
-	display: block;
-	overflow: hidden;
-	margin-top: 4px;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	color: var(--td-window-sub-text-fg);
-}
-
-section.message {
-	position: absolute;
-	display: table;
-	width: 100%;
-	height: 100%;
-}
-section.message.static {
-	position: static;
-	min-height: 200px;
-	height: 100vh;
-}
-section.message > aside {
-	display: table-cell;
-	vertical-align: middle;
-	text-align: center;
-	color: var(--td-window-sub-text-fg);
-	font-size: 24px;
-	pointer-events: none;
-}
-section.message > aside > cite {
-	display: block;
-	font-size: 14px;
-	padding: 10px 0 0;
-	font-style: normal;
-	color: var(--td-window-sub-text-fg);
-}
-
-section.channel {
-	margin-top: -16px;
-	margin-bottom: -9px;
-}
-section.channel:first-child {
-	margin-top: 0;
-}
-section.channel > a {
-	display: block;
-	background: var(--td-box-divider-bg);
-}
-section.channel > a > div.join {
-	color: var(--td-window-active-text-fg);
-	font-weight: 500;
-	padding: 7px 18px;
-	float: right;
-}
-section.channel.joined > a > div.join {
-	display: none;
-}
-section.channel > a > div.join:hover {
-	text-decoration: underline;
-}
-section.channel > a > div.join span:before {
-	content: var(--td-lng-iv-join-channel);
-}
-section.channel > a > h4 {
-	font-family: var(--font-sans);
-	font-size: 17px;
-	line-height: 26px;
-	font-weight: 500;
-	margin: 0;
-	color: var(--td-window-fg);
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	padding: 7px 18px;
-}
-
-.pullquote {
-	text-align: center;
-	max-width: 420px;
-	font-size: 19px;
-	display: block;
-	margin: 0 auto;
-}
-.media-outer {
-	margin-bottom: 16px;
-}
-.photo-wrap,
-.video-wrap {
-	width: 100%;
-	margin: 0 auto;
-	position: relative;
-	overflow: hidden;
-}
-.photo-bg,
-.video-bg {
-	background-size: cover;
-	background-position: center;
-	background-repeat: no-repeat;
-	position: absolute;
-	filter: blur(16px);
-	width: 100%;
-	height: 100%;
-}
-.video-bg,
-video {
-	position: absolute;
-	top: 0px;
-}
-.photo {
-	position: relative;
-	background-size: contain;
-	background-position: center;
-	background-repeat: no-repeat;
-}
-.photo,
-video {
-	opacity: 0;
-	transition: opacity 300ms ease-in-out;
-}
-.photo.loaded,
-video.loaded {
-	opacity: 1;
-}
-.video-play-outer {
-	position: relative;
-	width: 100%;
-	height: 100%;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-.video-play {
-	position: relative;
-	width: 48px;
-	height: 0;
-	padding-top: 48px;
-	max-width: 48px;
-	max-height: 48px;
-	background-color: rgba(0, 0, 0, 0.34);
-	border-radius: 50%;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	overflow: hidden;
-}
-.video-play::before {
-	content: '';
-	position: absolute;
-	margin: -48px -4px 0px 0px;
-	width: 0;
-	height: 0;
-	border-style: solid;
-	border-width: 10px 0 10px 16px;
-	border-color: transparent transparent transparent white;
-}
-
-.toast {
-	position: fixed;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%, -50%);
-	background-color: var(--td-toast-bg);
-	color: var(--td-toast-fg);
-	padding: 10px 20px;
-	border-radius: 6px;
-	z-index: 9999;
-	opacity: 0;
-	animation: fadeIn 200ms linear forwards;
-}
-.toast.hiding {
-	opacity: 1;
-	animation: fadeOut 1000ms linear forwards;
-}
diff --git a/Telegram/Resources/iv_html/page.js b/Telegram/Resources/iv_html/page.js
deleted file mode 100644
index fda34772fe060d..00000000000000
--- a/Telegram/Resources/iv_html/page.js
+++ /dev/null
@@ -1,656 +0,0 @@
-var IV = {
-	notify: function(message) {
-		if (window.external && window.external.invoke) {
-			window.external.invoke(JSON.stringify(message));
-		}
-	},
-	frameClickHandler: function(e) {
-		var target = e.target;
-		var context = '';
-		while (target) {
-			if (target.id == 'menu_page_blocker') {
-				IV.notify({ event: 'menu_page_blocker_click' });
-				IV.menuShown(false);
-				return;
-			}
-			if (target.tagName == 'AUDIO' || target.tagName == 'VIDEO') {
-				return;
-			}
-			if (context === ''
-				&& target.hasAttribute
-				&& target.hasAttribute('data-context')) {
-				context = String(target.getAttribute('data-context'));
-			}
-			if (target.tagName == 'A') {
-				break;
-			}
-			target = target.parentNode;
-		}
-		if (!target || (context === '' && !target.hasAttribute('href'))) {
-			return;
-		}
-		var base = document.createElement('A');
-		base.href = window.location.href;
-		if (base.origin != target.origin
-			|| base.pathname != target.pathname
-			|| base.search != target.search) {
-			IV.notify({
-				event: 'link_click',
-				url: target.href,
-				context: context,
-			});
-		} else if (target.hash.length < 2) {
-			IV.jumpToHash('');
-		} else {
-			IV.jumpToHash(decodeURIComponent(target.hash.substr(1)));
-		}
-		e.preventDefault();
-	},
-	getElementTop: function (element) {
-		var top = 0;
-		while (element && !element.classList.contains('page-scroll')) {
-			top += element.offsetTop;
-			element = element.offsetParent;
-		}
-		return top;
-	},
-	jumpToHash: function (hash, instant) {
-		var current = IV.computeCurrentState();
-		current.hash = hash;
-		window.history.replaceState(
-			current,
-			'',
-			'page' + IV.index + '.html');
-		if (hash == '') {
-			IV.scrollTo(0, instant);
-			return;
-		}
-
-		var element = document.getElementsByName(hash)[0];
-		if (element) {
-			IV.scrollTo(IV.getElementTop(element), instant);
-		}
-	},
-	frameKeyDown: function (e) {
-		const keyW = (e.key === 'w')
-			|| (e.code === 'KeyW')
-			|| (e.keyCode === 87);
-		const keyQ = (e.key === 'q')
-			|| (e.code === 'KeyQ')
-			|| (e.keyCode === 81);
-		const keyM = (e.key === 'm')
-			|| (e.code === 'KeyM')
-			|| (e.keyCode === 77);
-		if ((e.metaKey || e.ctrlKey) && (keyW || keyQ || keyM)) {
-			e.preventDefault();
-			IV.notify({
-				event: 'keydown',
-				modifier: e.ctrlKey ? 'ctrl' : 'cmd',
-				key: keyW ? 'w' : keyQ ? 'q' : 'm',
-			});
-		} else if (e.key === 'Escape' || e.keyCode === 27) {
-			e.preventDefault();
-			if (IV.position) {
-				window.history.back();
-			} else {
-				IV.notify({
-					event: 'keydown',
-					key: 'escape',
-				});
-			}
-		}
-	},
-	frameMouseEnter: function (e) {
-		IV.notify({ event: 'mouseenter' });
-	},
-	frameMouseUp: function (e) {
-		IV.notify({ event: 'mouseup' });
-	},
-	lastScrollTop: 0,
-	frameScrolled: function (e) {
-		const was = IV.lastScrollTop;
-		IV.lastScrollTop = IV.findPageScroll().scrollTop;
-		IV.updateJumpToTop(was < IV.lastScrollTop);
-		IV.checkVideos();
-	},
-	updateJumpToTop: function (scrolledDown) {
-		if (IV.lastScrollTop < 100) {
-			document.getElementById('bottom_up').classList.add('hidden');
-		} else if (scrolledDown && IV.lastScrollTop > 200) {
-			document.getElementById('bottom_up').classList.remove('hidden');
-		}
-	},
-	updateStyles: function (styles) {
-		if (IV.styles !== styles) {
-			IV.styles = styles;
-			document.getElementsByTagName('html')[0].style = styles;
-		}
-	},
-	toggleChannelJoined: function (id, joined) {
-		IV.channelsJoined['channel' + id] = joined;
-		IV.checkChannelButtons();
-	},
-	checkChannelButtons: function() {
-		const channels = document.getElementsByClassName('channel');
-		for (var i = 0; i < channels.length; ++i) {
-			const channel = channels[i];
-			const full = String(channel.getAttribute('data-context'));
-			const value = IV.channelsJoined[full];
-			if (value !== undefined) {
-				channel.classList.toggle('joined', value);
-			}
-		}
-	},
-	slideshowSlide: function(el, delta) {
-		var dir = window.getComputedStyle(el, null).direction || 'ltr';
-		var marginProp = dir == 'rtl' ? 'marginRight' : 'marginLeft';
-		if (delta) {
-			var form = el.parentNode.firstChild;
-			var s = form.s;
-			const next = +s.value + delta;
-			s.value = (next == s.length) ? 0 : (next == -1) ? (s.length - 1) : next;
-			form.nextSibling.firstChild.style[marginProp] = (-100 * s.value) + '%';
-		} else {
-			el.form.nextSibling.firstChild.style[marginProp] = (-100 * el.value) + '%';
-		}
-		return false;
-	},
-	initPreBlocks: function() {
-		if (!hljs) {
-			return;
-		}
-		var pres = document.getElementsByTagName('pre');
-		for (var i = 0; i < pres.length; i++) {
-			if (pres[i].hasAttribute('data-language')) {
-				hljs.highlightBlock(pres[i]);
-			}
-		}
-	},
-	initEmbedBlocks: function() {
-		var iframes = document.getElementsByTagName('iframe');
-		for (var i = 0; i < iframes.length; i++) {
-			(function(iframe) {
-				window.addEventListener('message', function(event) {
-					if (event.source !== iframe.contentWindow ||
-							event.origin != window.origin) {
-						return;
-					}
-					try {
-						var data = JSON.parse(event.data);
-					} catch(e) {
-						var data = {};
-					}
-					if (data.eventType == 'resize_frame') {
-						if (data.eventData.height) {
-							iframe.style.height = data.eventData.height + 'px';
-						}
-					}
-				}, false);
-			})(iframes[i]);
-		}
-	},
-	addRipple: function (button, x, y) {
-		const ripple = document.createElement('span');
-		ripple.classList.add('ripple');
-
-		const inner = document.createElement('span');
-		inner.classList.add('inner');
-		x -= button.offsetLeft;
-		y -= button.offsetTop;
-
-		const mx = button.clientWidth - x;
-		const my = button.clientHeight - y;
-		const sq1 = x * x + y * y;
-		const sq2 = mx * mx + y * y;
-		const sq3 = x * x + my * my;
-		const sq4 = mx * mx + my * my;
-		const radius = Math.sqrt(Math.max(sq1, sq2, sq3, sq4));
-
-		inner.style.width = inner.style.height = `${2 * radius}px`;
-		inner.style.left = `${x - radius}px`;
-		inner.style.top = `${y - radius}px`;
-		inner.classList.add('inner');
-
-		ripple.addEventListener('animationend', function (e) {
-			if (e.animationName === 'fadeOut') {
-				ripple.remove();
-			}
-		});
-
-		ripple.appendChild(inner);
-		button.appendChild(ripple);
-	},
-	stopRipples: function (button) {
-		const id = button.id ? button.id : button;
-		button = document.getElementById(id);
-		const ripples = button.getElementsByClassName('ripple');
-		for (var i = 0; i < ripples.length; ++i) {
-			const ripple = ripples[i];
-			if (!ripple.classList.contains('hiding')) {
-				ripple.classList.add('hiding');
-			}
-		}
-	},
-	init: function () {
-		var current = IV.computeCurrentState();
-		window.history.replaceState(current, '', IV.pageUrl(0));
-		IV.jumpToHash(current.hash, true);
-
-		IV.lastScrollTop = window.history.state.scroll;
-		IV.findPageScroll().onscroll = IV.frameScrolled;
-
-		const buttons = document.getElementsByClassName('fixed_button');
-		for (let i = 0; i < buttons.length; ++i) {
-			const button = buttons[i];
-			button.addEventListener('mousedown', function (e) {
-				IV.addRipple(e.currentTarget, e.clientX, e.clientY);
-			});
-			button.addEventListener('mouseup', function (e) {
-				const id = e.currentTarget.id;
-				setTimeout(function () {
-					IV.stopRipples(id);
-				}, 0);
-			});
-			button.addEventListener('mouseleave', function (e) {
-				IV.stopRipples(e.currentTarget);
-			});
-		}
-		IV.initMedia();
-		IV.notify({ event: 'ready' });
-
-		IV.forceScrollFocus();
-		IV.frameScrolled();
-	},
-	initMedia: function () {
-		var scroll = IV.findPageScroll();
-		const photos = scroll.getElementsByClassName('photo');
-		for (let i = 0; i < photos.length; ++i) {
-			const photo = photos[i];
-			if (photo.classList.contains('loaded')) {
-				continue;
-			}
-
-			const url = photo.style.backgroundImage;
-			if (!url || url.length < 7) {
-				continue;
-			}
-			var img = new Image();
-			img.onload = function () {
-				photo.classList.add('loaded');
-			}
-			img.src = url.substr(5, url.length - 7);
-			if (img.complete) {
-				photo.classList.add('loaded');
-				IV.stopAnimations(photo);
-			}
-		}
-		IV.videos = [];
-		const videos = scroll.getElementsByClassName('video');
-		for (let i = 0; i < videos.length; ++i) {
-			const element = videos[i];
-			IV.videos.push({
-				element: element,
-				src: String(element.getAttribute('data-src')),
-				autoplay: (element.getAttribute('data-autoplay') == '1'),
-				loop: (element.getAttribute('data-loop') == '1'),
-				small: (element.getAttribute('data-small') == '1'),
-				filled: (element.firstChild
-					&& element.firstChild.tagName == 'VIDEO'),
-			});
-		}
-	},
-	checkVideos: function () {
-		const visibleTop = IV.lastScrollTop;
-		const visibleBottom = visibleTop + IV.findPageScroll().offsetHeight;
-		const videos = IV.videos;
-		for (let i = 0; i < videos.length; ++i) {
-			const video = videos[i];
-			const element = video.element;
-			const wrap = element.offsetParent; // video-wrap
-			const top = IV.getElementTop(wrap);
-			const bottom = top + wrap.offsetHeight;
-			if (top < visibleBottom && bottom > visibleTop) {
-				if (!video.created) {
-					video.created = new Date();
-					video.loaded = false;
-					element.innerHTML = '<video muted class="'
-						+ (video.small ? 'video-small' : '')
-						+ '"'
-						+ (video.autoplay
-							? ' preload="auto" autoplay'
-							: (video.small
-								? ''
-								: ' controls'))
-						+ (video.loop ? ' loop' : '')
-						+ ' oncanplay="IV.checkVideos();"'
-						+ ' onloadeddata="IV.checkVideos();">'
-							+ '<source src="'
-							+ video.src
-							+ '" type="video/mp4" />'
-						+ '</video>';
-					var media = element.firstChild;
-					media.oncontextmenu = function () { return false; };
-					media.oncanplay = IV.checkVideos;
-					media.onloadeddata = IV.checkVideos;
-				}
-			} else if (video.created && video.autoplay) {
-				video.created = false;
-				element.innerHTML = '';
-			}
-			if (video.created && !video.loaded) {
-				var media = element.firstChild;
-				const HAVE_CURRENT_DATA = 2;
-				if (media && media.readyState >= HAVE_CURRENT_DATA) {
-					video.loaded = true;
-					media.classList.add('loaded');
-					if ((new Date() - video.created) < 100) {
-						IV.stopAnimations(media);
-					}
-				}
-			}
-		}
-	},
-	showTooltip: function (text) {
-		var toast = document.createElement('div');
-		toast.classList.add('toast');
-		toast.textContent = text;
-		document.body.appendChild(toast);
-		setTimeout(function () {
-			toast.classList.add('hiding');
-		}, 2000);
-		setTimeout(function () {
-			document.body.removeChild(toast);
-		}, 3000);
-	},
-	scrollTo: function (y, instant) {
-		if (y < 200) {
-			document.getElementById('bottom_up').classList.add('hidden');
-		}
-		IV.findPageScroll().scrollTo({
-			top: y || 0,
-			behavior: instant ? 'instant' : 'smooth'
-		});
-	},
-	computeCurrentState: function () {
-		var now = IV.findPageScroll();
-		return {
-			position: IV.position,
-			index: IV.index,
-			hash: ((!window.history.state
-				|| window.history.state.hash === undefined)
-				? window.location.hash.substr(1)
-				: window.history.state.hash),
-			scroll: now ? now.scrollTop : 0
-		};
-	},
-	pageUrl: function (index, hash) {
-		var result = 'page' + index + '.html';
-		if (hash) {
-			result += '#' + hash;
-		}
-		return result;
-	},
-	navigateTo: function (index, hash) {
-		if (!index && !IV.index) {
-			IV.navigateToDOM(IV.index, hash);
-			return;
-		}
-		IV.pending = [index, hash];
-		if (!IV.cache[index]) {
-			IV.loadPage(index);
-		} else if (IV.cache[index].dom) {
-			IV.navigateToDOM(index, hash);
-		} else if (IV.cache[index].content) {
-			IV.navigateToLoaded(index, hash);
-		}
-	},
-	applyUpdatedContent: function (index) {
-		if (IV.index != index) {
-			IV.cache[index].contentUpdated = (IV.cache[index].dom !== undefined);
-			return;
-		}
-		var data = JSON.parse(IV.cache[index].content);
-		var article = function (el) {
-			return el.getElementsByTagName('article')[0];
-		};
-		var footer = function (el) {
-			return el.getElementsByClassName('page-footer')[0];
-		};
-		var from = IV.findPageScroll();
-		var to = IV.makeScrolledContent(data.html);
-		morphdom(article(from), article(to), {
-			onBeforeElUpdated: function (fromEl, toEl) {
-				if (fromEl.classList.contains('video')
-					&& toEl.classList.contains('video')
-					&& fromEl.hasAttribute('data-src')
-					&& toEl.hasAttribute('data-src')
-					&& (fromEl.getAttribute('data-src')
-						== toEl.getAttribute('data-src'))) {
-					return false;
-				} else if (fromEl.tagName == 'SECTION'
-					&& fromEl.classList.contains('channel')
-					&& fromEl.hasAttribute('data-context')
-					&& toEl.tagName == 'SECTION'
-					&& toEl.classList.contains('channel')
-					&& toEl.hasAttribute('data-context')
-					&& (String(fromEl.getAttribute('data-context'))
-						== String(toEl.getAttribute('data-context')))) {
-					return false;
-				} else if (fromEl.classList.contains('loaded')) {
-					toEl.classList.add('loaded');
-				}
-				return !fromEl.isEqualNode(toEl);
-			}
-		});
-		morphdom(footer(from), footer(to));
-		IV.initMedia();
-		eval(data.js);
-	},
-	loadPage: function (index) {
-		if (!IV.cache[index]) {
-			IV.cache[index] = {};
-		}
-		IV.cache[index].loading = true;
-
-		let xhr = new XMLHttpRequest();
-		xhr.onload = function () {
-			IV.cache[index].loading = false;
-			IV.cache[index].content = xhr.responseText;
-			IV.applyUpdatedContent(index);
-			if (IV.pending && IV.pending[0] == index) {
-				IV.navigateToLoaded(index, IV.pending[1]);
-			}
-			if (IV.cache[index].reloadPending) {
-				IV.cache[index].reloadPending = false;
-				IV.reloadPage(index);
-			}
-		}
-
-		xhr.open('GET', 'page' + index + '.json');
-		xhr.send();
-	},
-	reloadPage: function (index) {
-		if (IV.cache[index] && IV.cache[index].loading) {
-			IV.cache[index].reloadPending = true;
-			return;
-		}
-		IV.loadPage(index);
-	},
-
-	makeScrolledContent: function (html) {
-		var result = document.createElement('div');
-		result.className = 'page-scroll';
-		result.tabIndex = '-1';
-		result.innerHTML = html.trim();
-		result.onscroll = IV.frameScrolled;
-		return result;
-	},
-	navigateToLoaded: function (index, hash) {
-		if (IV.cache[index].dom) {
-			IV.navigateToDOM(index, hash);
-		} else {
-			var data = JSON.parse(IV.cache[index].content);
-			IV.cache[index].dom = IV.makeScrolledContent(data.html);
-
-			IV.navigateToDOM(index, hash);
-			eval(data.js);
-		}
-	},
-	navigateToDOM: function (index, hash) {
-		IV.pending = null;
-		if (IV.index == index) {
-			IV.jumpToHash(hash);
-			IV.forceScrollFocus();
-			return;
-		}
-		window.history.replaceState(
-			IV.computeCurrentState(),
-			'',
-			IV.pageUrl(IV.index));
-
-		IV.position = IV.position + 1;
-		window.history.pushState(
-			{ position: IV.position, index: index, hash: hash },
-			'',
-			IV.pageUrl(index));
-		IV.showDOM(index, hash);
-	},
-	findPageScroll: function () {
-		var all = document.getElementsByClassName('page-scroll');
-		for (i = 0; i < all.length; ++i) {
-			if (!all[i].classList.contains('hidden-left')
-				&& !all[i].classList.contains('hidden-right')) {
-				return all[i];
-			}
-		}
-		return null;
-	},
-	showDOM: function (index, hash, scroll) {
-		IV.pending = null;
-		if (IV.index != index) {
-			var initial = !window.history.state
-				|| window.history.state.position === undefined;
-			var back = initial
-				|| IV.position > window.history.state.position;
-			IV.position = initial ? 0 : window.history.state.position;
-
-			var now = IV.cache[index].dom;
-			var was = IV.findPageScroll();
-			if (!IV.cache[IV.index]) {
-				IV.cache[IV.index] = {};
-			}
-			IV.cache[IV.index].dom = was;
-			was.parentNode.appendChild(now);
-			if (scroll !== undefined) {
-				now.scrollTop = scroll;
-				setTimeout(function () {
-					// When returning by history.back to an URL with a hash
-					// for the first time browser forces the scroll to the
-					// hash instead of the saved scroll position.
-					//
-					// This workaround prevents incorrect scroll position.
-					now.scrollTop = scroll;
-				}, 0);
-			}
-
-			now.classList.add(back ? 'hidden-left' : 'hidden-right');
-			now.classList.remove(back ? 'hidden-right' : 'hidden-left');
-			IV.stopAnimations(now.firstChild);
-
-			if (!was.listening) {
-				was.listening = true;
-				was.firstChild.addEventListener('transitionend', function (e) {
-					if (was.classList.contains('hidden-left')
-						|| was.classList.contains('hidden-right')) {
-						if (was.parentNode) {
-							was.parentNode.removeChild(was);
-							var videos = was.getElementsByClassName('video');
-							for (var i = 0; i < videos.length; ++i) {
-								videos[i].innerHTML = '';
-                            }
-						}
-					}
-				});
-			}
-
-			was.classList.add(back ? 'hidden-right' : 'hidden-left');
-			now.classList.remove(back ? 'hidden-left' : 'hidden-right');
-
-			IV.index = index;
-			IV.notify({
-				event: 'location_change',
-				index: IV.index,
-				position: IV.position,
-				hash: IV.computeCurrentState().hash,
-			});
-			if (IV.cache[index].contentUpdated) {
-				IV.cache[index].contentUpdated = false;
-				IV.applyUpdatedContent(index);
-			} else {
-				IV.initMedia();
-			}
-			IV.checkChannelButtons();
-			if (scroll === undefined) {
-				IV.jumpToHash(hash, true);
-			} else {
-				IV.lastScrollTop = scroll;
-				IV.updateJumpToTop(true);
-			}
-		} else if (scroll !== undefined) {
-			IV.scrollTo(scroll);
-			IV.lastScrollTop = scroll;
-			IV.updateJumpToTop(true);
-		} else {
-			IV.jumpToHash(hash);
-		}
-
-		IV.forceScrollFocus();
-		IV.frameScrolled();
-	},
-	forceScrollFocus: function () {
-		IV.findPageScroll().focus();
-		setTimeout(function () {
-			// Doesn't work on #hash-ed pages in Windows WebView2 otherwise.
-			IV.findPageScroll().focus();
-		}, 100);
-	},
-	stopAnimations: function (element) {
-		element.getAnimations().forEach(
-			(animation) => animation.finish());
-	},
-	menuShown: function (shown) {
-		var already = document.getElementById('menu_page_blocker');
-		if (already && shown) {
-			return;
-		} else if (already) {
-			document.body.removeChild(already);
-			return;
-		} else if (!shown) {
-			return;
-		}
-		var blocker = document.createElement('div');
-		blocker.id = 'menu_page_blocker';
-		document.body.appendChild(blocker);
-	},
-
-	videos: {},
-	videosPlaying: {},
-
-	cache: {},
-	channelsJoined: {},
-	index: 0,
-	position: 0
-};
-
-document.onclick = IV.frameClickHandler;
-document.onkeydown = IV.frameKeyDown;
-document.onmouseenter = IV.frameMouseEnter;
-document.onmouseup = IV.frameMouseUp;
-document.onresize = IV.checkVideos;
-window.onmessage = IV.postMessageHandler;
-window.addEventListener('popstate', function (e) {
-	if (e.state) {
-		IV.showDOM(e.state.index, e.state.hash, e.state.scroll);
-	}
-});
-document.addEventListener("DOMContentLoaded", IV.forceScrollFocus);
diff --git a/Telegram/Resources/langs/cloud_lang.strings b/Telegram/Resources/langs/cloud_lang.strings
index 16e9ea3572eabf..3776c023a4cc52 100644
--- a/Telegram/Resources/langs/cloud_lang.strings
+++ b/Telegram/Resources/langs/cloud_lang.strings
@@ -13,10 +13,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "cloud_lng_topup_purpose_subs" = "Buy **Stars** to keep your channel subscriptions.";
 
+"cloud_lng_age_verify_about_gb#one" = "To access such content, you must confirm that you are at least **{count}** year old as required by UK law.";
+"cloud_lng_age_verify_about_gb#other" = "To access such content, you must confirm that you are at least **{count}** years old as required by UK law.";
+
 "cloud_lng_passport_in_ar" = "Arabic";
 "cloud_lng_passport_in_az" = "Azerbaijani";
 "cloud_lng_passport_in_bg" = "Bulgarian";
-"cloud_lng_passport_in_bn" = "Bangla";
+"cloud_lng_passport_in_bn" = "Bengali";
 "cloud_lng_passport_in_cs" = "Czech";
 "cloud_lng_passport_in_da" = "Danish";
 "cloud_lng_passport_in_de" = "German";
@@ -64,7 +67,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "cloud_lng_translate_to_ar" = "Arabic";
 "cloud_lng_translate_to_az" = "Azerbaijani";
 "cloud_lng_translate_to_bg" = "Bulgarian";
-// "cloud_lng_translate_to_bn" = "Bangla";
+// "cloud_lng_translate_to_bn" = "Bengali";
 "cloud_lng_translate_to_cs" = "Czech";
 "cloud_lng_translate_to_da" = "Danish";
 "cloud_lng_translate_to_de" = "German";
@@ -109,50 +112,116 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "cloud_lng_translate_to_uz" = "Uzbek";
 "cloud_lng_translate_to_vi" = "Vietnamese";
 
+"cloud_lng_language_af" = "Afrikaans";
+"cloud_lng_language_am" = "Amharic";
 "cloud_lng_language_ar" = "Arabic";
 "cloud_lng_language_az" = "Azerbaijani";
+"cloud_lng_language_be" = "Belarusian";
 "cloud_lng_language_bg" = "Bulgarian";
-// "cloud_lng_language_bn" = "Bangla";
+"cloud_lng_language_bn" = "Bengali";
+"cloud_lng_language_bs" = "Bosnian";
+"cloud_lng_language_ca" = "Catalan";
+// "cloud_lng_language_ceb" = "Cebuano";
+"cloud_lng_language_co" = "Corsican";
 "cloud_lng_language_cs" = "Czech";
+"cloud_lng_language_cy" = "Welsh";
 "cloud_lng_language_da" = "Danish";
 "cloud_lng_language_de" = "German";
-// "cloud_lng_language_dv" = "Divehi";
-// "cloud_lng_language_dz" = "Dzongkha";
+"cloud_lng_language_dv" = "Divehi";
+"cloud_lng_language_dz" = "Dzongkha";
 "cloud_lng_language_el" = "Greek";
 "cloud_lng_language_en" = "English";
+"cloud_lng_language_eo" = "Esperanto";
 "cloud_lng_language_es" = "Spanish";
 "cloud_lng_language_et" = "Estonian";
+"cloud_lng_language_eu" = "Basque";
 "cloud_lng_language_fa" = "Persian";
+"cloud_lng_language_fi" = "Finnish";
 "cloud_lng_language_fr" = "French";
+"cloud_lng_language_fy" = "Frisian";
+"cloud_lng_language_ga" = "Irish";
+"cloud_lng_language_gd" = "Scots Gaelic";
+"cloud_lng_language_gl" = "Galician";
+"cloud_lng_language_gu" = "Gujarati";
+"cloud_lng_language_ha" = "Hausa";
+"cloud_lng_language_haw" = "Hawaiian";
 "cloud_lng_language_he" = "Hebrew";
+"cloud_lng_language_hi" = "Hindi";
+// "cloud_lng_language_hmn" = "Hmong";
 "cloud_lng_language_hr" = "Croatian";
+"cloud_lng_language_ht" = "Haitian Creole";
 "cloud_lng_language_hu" = "Hungarian";
 "cloud_lng_language_hy" = "Armenian";
 "cloud_lng_language_id" = "Indonesian";
+"cloud_lng_language_ig" = "Igbo";
 "cloud_lng_language_is" = "Icelandic";
 "cloud_lng_language_it" = "Italian";
+"cloud_lng_language_iw" = "Hebrew (Obsolete code)";
 "cloud_lng_language_ja" = "Japanese";
+"cloud_lng_language_jv" = "Javanese";
 "cloud_lng_language_ka" = "Georgian";
-// "cloud_lng_language_km" = "Khmer";
+"cloud_lng_language_kk" = "Kazakh";
+"cloud_lng_language_km" = "Khmer";
+"cloud_lng_language_kn" = "Kannada";
 "cloud_lng_language_ko" = "Korean";
+"cloud_lng_language_ku" = "Kurdish";
+"cloud_lng_language_ky" = "Kyrgyz";
+"cloud_lng_language_la" = "Latin";
+"cloud_lng_language_lb" = "Luxembourgish";
 "cloud_lng_language_lo" = "Lao";
 "cloud_lng_language_lt" = "Lithuanian";
 "cloud_lng_language_lv" = "Latvian";
+"cloud_lng_language_mg" = "Malagasy";
+"cloud_lng_language_mi" = "Maori";
 "cloud_lng_language_mk" = "Macedonian";
+"cloud_lng_language_ml" = "Malayalam";
 "cloud_lng_language_mn" = "Mongolian";
+"cloud_lng_language_mr" = "Marathi";
 "cloud_lng_language_ms" = "Malay";
+"cloud_lng_language_mt" = "Maltese";
 "cloud_lng_language_my" = "Burmese";
 "cloud_lng_language_ne" = "Nepali";
 "cloud_lng_language_nl" = "Dutch";
+"cloud_lng_language_no" = "Norwegian";
+"cloud_lng_language_ny" = "Nyanja";
+"cloud_lng_language_or" = "Odia (Oriya)";
+"cloud_lng_language_pa" = "Punjabi";
 "cloud_lng_language_pl" = "Polish";
+"cloud_lng_language_ps" = "Pashto";
 "cloud_lng_language_pt" = "Portuguese";
 "cloud_lng_language_ro" = "Romanian";
 "cloud_lng_language_ru" = "Russian";
+"cloud_lng_language_rw" = "Kinyarwanda";
+"cloud_lng_language_sd" = "Sindhi";
+"cloud_lng_language_si" = "Sinhala";
 "cloud_lng_language_sk" = "Slovak";
 "cloud_lng_language_sl" = "Slovenian";
+"cloud_lng_language_sm" = "Samoan";
+"cloud_lng_language_sn" = "Shona";
+"cloud_lng_language_so" = "Somali";
+"cloud_lng_language_sq" = "Albanian";
+"cloud_lng_language_sr" = "Serbian";
+"cloud_lng_language_st" = "Sesotho";
+"cloud_lng_language_su" = "Sundanese";
+"cloud_lng_language_sv" = "Swedish";
+"cloud_lng_language_sw" = "Swahili";
+"cloud_lng_language_ta" = "Tamil";
+"cloud_lng_language_te" = "Telugu";
+"cloud_lng_language_tg" = "Tajik";
 "cloud_lng_language_th" = "Thai";
 "cloud_lng_language_tk" = "Turkmen";
+"cloud_lng_language_tl" = "Tagalog";
 "cloud_lng_language_tr" = "Turkish";
+"cloud_lng_language_tt" = "Tatar";
+"cloud_lng_language_ug" = "Uyghur";
 "cloud_lng_language_uk" = "Ukrainian";
+"cloud_lng_language_ur" = "Urdu";
 "cloud_lng_language_uz" = "Uzbek";
 "cloud_lng_language_vi" = "Vietnamese";
+"cloud_lng_language_xh" = "Xhosa";
+"cloud_lng_language_yi" = "Yiddish";
+"cloud_lng_language_yo" = "Yoruba";
+"cloud_lng_language_zh" = "Chinese";
+// "cloud_lng_language_zh-CN" = "Chinese (Simplified)";
+// "cloud_lng_language_zh-TW" = "Chinese (Traditional)";
+"cloud_lng_language_zu" = "Zulu";
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 60c7a6413d8e7e..073cf6a978d342 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -18,9 +18,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_menu_activate" = "Use this account";
 "lng_menu_set_status" = "Set Emoji Status";
 "lng_menu_change_status" = "Change Emoji Status";
+"lng_menu_my_profile" = "My Profile";
 "lng_menu_my_stories" = "My Stories";
 "lng_menu_my_groups" = "My Groups";
 "lng_menu_my_channels" = "My Channels";
+"lng_main_menu" = "Main menu";
+"lng_filter_unread_chats#one" = "{text} ({count} unread chat)";
+"lng_filter_unread_chats#other" = "{text} ({count} unread chats)";
 
 "lng_disable_notifications_from_tray" = "Disable notifications";
 "lng_enable_notifications_from_tray" = "Enable notifications";
@@ -126,6 +130,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_cancel" = "Cancel";
 "lng_continue" = "Continue";
 "lng_close" = "Close";
+"lng_minimize_window" = "Minimize";
+"lng_maximize_window" = "Maximize";
+"lng_restore_window" = "Restore";
+"lng_go_back" = "Go back";
 "lng_connecting" = "Connecting...";
 "lng_reconnecting#one" = "Reconnect in {count} s...";
 "lng_reconnecting#other" = "Reconnect in {count} s...";
@@ -163,11 +171,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_chat_status_members_online" = "{members_count}, {online_count}";
 "lng_chat_status_subscribers#one" = "{count} subscriber";
 "lng_chat_status_subscribers#other" = "{count} subscribers";
+"lng_chat_status_direct" = "Direct messages";
 
 "lng_channel_status" = "channel";
 "lng_group_status" = "group";
 "lng_scam_badge" = "SCAM";
 "lng_fake_badge" = "FAKE";
+"lng_direct_badge" = "DIRECT";
 
 "lng_remember" = "Remember this choice";
 
@@ -288,8 +298,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_error_cant_add_member" = "Sorry, you can't add the bot to this group. Ask a group admin to do it.";
 "lng_error_cant_add_bot" = "Sorry, this bot can't be added to groups.";
 "lng_error_cant_add_admin_invite" = "You can't add this user as an admin because they are not a member of this group and you are not allowed to add them.";
+"lng_error_you_blocked_user" = "Sorry, you can't add this user or bot to groups because you've blocked them. Please unblock to proceed.";
+"lng_error_add_admin_not_member" = "You can't add this user as an admin because they are not a member of this group and you are not allowed to add them.";
+"lng_error_user_admin_invalid" = "You can't ban this user because they are an admin in this group and you are not allowed to demote them.";
+"lng_error_channel_bots_too_much" = "Sorry, this channel has too many bots.";
+"lng_error_group_bots_too_much" = "There are too many bots in this group. Please remove some of the bots you're not using first.";
 "lng_error_cant_add_admin_unban" = "Sorry, you can't add this user as an admin because they are in the Removed Users list and you can't unban them.";
 "lng_error_cant_ban_admin" = "You can't ban this user because they are an admin in this group and you are not allowed to demote them.";
+"lng_error_cant_reply_other" = "This message can't be replied in another chat.";
 "lng_error_admin_limit" = "Sorry, you've reached the maximum number of admins for this group.";
 "lng_error_admin_limit_channel" = "Sorry, you've reached the maximum number of admins for this channel.";
 "lng_error_post_link_invalid" = "Unfortunately, you can't access this message. You aren't a member of the chat where it was posted.";
@@ -297,7 +313,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_error_noforwards_channel" = "Sorry, forwarding from this channel is disabled by admins.";
 "lng_error_nocopy_group" = "Sorry, copying from this group is disabled by admins.";
 "lng_error_nocopy_channel" = "Sorry, copying from this channel is disabled by admins.";
+"lng_error_noforwards_user" = "Sorry, forwarding from this chat is restricted.";
+"lng_error_nocopy_user" = "Sorry, copying from this chat is restricted.";
 "lng_error_nocopy_story" = "Sorry, the creator of this story disabled copying.";
+"lng_error_schedule_limit" = "Sorry, you can't schedule more than 100 messages.";
 "lng_sure_add_admin_invite" = "This user is not a member of this group. Add them to the group and promote them to admin?";
 "lng_sure_add_admin_invite_channel" = "This user is not a subscriber of this channel. Add them to the channel and promote them to admin?";
 "lng_sure_add_admin_unremove" = "This user is currently restricted or removed. Are you sure you want to promote them?";
@@ -305,14 +324,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_sure_enable_socks" = "Are you sure you want to enable this proxy?\n\nServer: {server}\nPort: {port}\n\nYou can change your proxy server later in Settings > Advanced > Connection Type.";
 "lng_sure_enable" = "Enable";
 "lng_proxy_box_title" = "Enable proxy";
+"lng_proxy_box_table_title" = "Proxy Server";
+"lng_proxy_box_table_button" = "Connect Proxy";
+"lng_proxy_box_table_checking" = "Checking…";
+"lng_proxy_box_table_available" = "Available (ping: {ping} ms)";
+"lng_proxy_box_table_unavailable" = "Not Available";
 "lng_proxy_box_server" = "Server";
 "lng_proxy_box_port" = "Port";
 "lng_proxy_box_secret" = "Secret";
 "lng_proxy_box_status" = "Status";
+"lng_proxy_box_check_status" = "Check Status";
 "lng_proxy_box_username" = "Username";
 "lng_proxy_box_password" = "Password";
 "lng_proxy_invalid" = "The proxy link is invalid.";
 "lng_proxy_unsupported" = "Your Telegram Desktop version doesn't support this proxy type or the proxy link is invalid. Please update Telegram Desktop to the latest version.";
+"lng_proxy_incorrect_secret" = "This proxy link uses invalid **secret** parameter. Please contact the proxy provider and ask him to update MTProxy source code and configure it with a correct **secret** value. Then let him provide a new link.";
+"lng_proxy_check_ip_warning_title" = "Warning";
+"lng_proxy_check_ip_warning" = "This will expose your IP address to the admin of the proxy server.";
+"lng_proxy_check_ip_proceed" = "Proceed";
 
 "lng_edit_deleted" = "This message was deleted";
 "lng_edit_limit_reached#one" = "You've reached the message text limit. Please make the text shorter by {count} character.";
@@ -343,6 +372,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_edit_media_album_error" = "This file cannot be saved as a part of an album.";
 "lng_edit_media_invalid_file" = "Sorry, no way to use this file.";
+/*
+"lng_iv_editor_media_invalid_file" = "Sorry, only photos, video, and audio files are supported here.";
+*/
 "lng_edit_photo_editor_hint" = "Left-click on the photo to edit.";
 "lng_edit_caption_attach" = "Sorry, you can't attach new media while editing a message.";
 "lng_edit_caption_voice" = "Sorry, you can't edit messages when you have an unsent voice message.";
@@ -362,11 +394,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_intro_qr_step2" = "Go to Settings > Devices > Link Desktop Device";
 "lng_intro_qr_step3" = "Scan this image to Log In";
 "lng_intro_qr_skip" = "Or log in using your phone number";
+"lng_intro_qr_phone" = "Log in using phone number";
+"lng_intro_qr_passkey" = "Log in using passkey";
 
 "lng_intro_fragment_title" = "Enter code";
 "lng_intro_fragment_about" = "Get the code for {phone_number} in the Anonymous Numbers section on Fragment.";
 "lng_intro_fragment_button" = "Open Fragment";
 
+"lng_intro_email_setup_title" = "Choose a login email";
+"lng_intro_email_confirm_subtitle" = "Please check your email {email} (don't forget the spam folder) and enter the code we just sent you.";
+
 "lng_phone_title" = "Your Phone Number";
 "lng_phone_desc" = "Please confirm your country code\nand enter your phone number.";
 "lng_phone_to_qr" = "Quick log in using QR code";
@@ -375,6 +412,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_country_ph" = "Search";
 "lng_country_none" = "Country not found";
 "lng_country_select" = "Select Country";
+"lng_phone_number" = "Phone number";
 
 "lng_code_ph" = "Code";
 "lng_code_desc" = "We've sent an activation code to your phone.\nPlease enter it below.";
@@ -424,15 +462,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_dlg_new_channel_name" = "Channel name";
 "lng_dlg_new_bot_name" = "Bot name";
 "lng_no_chats" = "Your chats will be here";
+"lng_no_conversations" = "You have no\nconversations yet.";
+"lng_no_conversations_button" = "New Message";
+"lng_no_conversations_subtitle" = "Your contacts on Telegram";
 "lng_no_chats_filter" = "No chats currently belong to this folder.";
 "lng_no_saved_sublists" = "You can save messages from other chats here.";
 "lng_contacts_loading" = "Loading...";
 "lng_contacts_not_found" = "No contacts found";
 "lng_topics_not_found" = "No topics found.";
+"lng_forum_all_messages" = "All Messages";
+"lng_forum_create_new_topic" = "Create New Thread";
 "lng_dlg_search_for_messages" = "Search for messages";
 "lng_update_telegram" = "Update Telegram";
 "lng_dlg_search_in" = "Search messages in";
 "lng_dlg_search_from" = "From: {user}";
+"lng_chat_menu" = "Chat menu";
 
 "lng_settings_save" = "Save";
 "lng_settings_apply" = "Apply";
@@ -499,11 +543,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_notify_global" = "Global settings";
 "lng_settings_notify_title" = "Notifications for chats";
 "lng_settings_desktop_notify" = "Desktop notifications";
-"lng_settings_native_title" = "Native notifications";
+"lng_settings_master_volume_notifications" = "Volume";
+"lng_settings_native_title" = "System integration";
 "lng_settings_use_windows" = "Use Windows notifications";
+"lng_settings_skip_in_focus" = "Respect system Focus mode";
 "lng_settings_use_native_notifications" = "Use native notifications";
 "lng_settings_notifications_position" = "Location on the screen";
 "lng_settings_notifications_count" = "Notifications count";
+"lng_settings_notifications_display" = "Display for notifications";
+"lng_settings_notifications_display_default" = "Default";
 "lng_settings_sound_allowed" = "Allow sound";
 "lng_settings_alert_windows" = "Flash the taskbar icon";
 "lng_settings_alert_mac" = "Bounce the Dock icon";
@@ -529,6 +577,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_notification_private_chats" = "Private chats";
 "lng_notification_groups" = "Groups";
 "lng_notification_channels" = "Channels";
+"lng_notification_reactions" = "Reactions";
+"lng_notification_reactions_title" = "Notifications for reactions";
+"lng_notification_reactions_notify_about" = "Notify me about";
+"lng_notification_reactions_messages" = "Messages";
+"lng_notification_reactions_messages_full" = "Reactions to my messages";
+"lng_notification_reactions_poll_votes" = "Poll votes";
+"lng_notification_reactions_poll_votes_full" = "Votes in my polls";
+"lng_notification_reactions_from" = "Notify about reactions from";
+"lng_notification_reactions_from_nobody" = "Off";
+"lng_notification_reactions_from_contacts" = "From my contacts";
+"lng_notification_reactions_from_all" = "From everyone";
+"lng_notification_reactions_settings" = "Settings";
+"lng_notification_reactions_show_sender" = "Show sender's name";
 "lng_notification_click_to_change" = "Click here to change";
 "lng_notification_on" = "On, {exceptions}";
 "lng_notification_off" = "Off, {exceptions}";
@@ -538,12 +599,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_notification_title_private_chats" = "Notifications for private chats";
 "lng_notification_about_private_chats#one" = "Please note that **{count} chat** is listed as an exception and won't be affected by this change.";
 "lng_notification_about_private_chats#other" = "Please note that **{count} chats** are listed as exceptions and won't be affected by this change.";
+"lng_notification_volume_private_chats" = "Notifications volume for private chats";
 "lng_notification_title_groups" = "Notifications for groups";
 "lng_notification_about_groups#one" = "Please note that **{count} group** is listed as an exception and won't be affected by this change.";
 "lng_notification_about_groups#other" = "Please note that **{count} groups** are listed as exceptions and won't be affected by this change.";
+"lng_notification_volume_groups" = "Notifications volume for groups";
 "lng_notification_title_channels" = "Notifications for channels";
 "lng_notification_about_channels#one" = "Please note that **{count} channel** is listed as an exception and won't be affected by this change.";
 "lng_notification_about_channels#other" = "Please note that **{count} channels** are listed as exceptions and won't be affected by this change.";
+"lng_notification_volume_channel" = "Notifications volume for channels";
 "lng_notification_exceptions_view" = "View exceptions";
 "lng_notification_enable" = "Enable notifications";
 "lng_notification_sound" = "Sound";
@@ -573,6 +637,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_reaction_invoice" = "{reaction} to your invoice";
 "lng_reaction_gif" = "{reaction} to your GIF";
 
+"lng_poll_vote_option" = "voted for \"{option}\" in your poll";
+"lng_poll_vote" = "voted in your poll \"{title}\"";
+"lng_poll_vote_notext" = "voted in your poll";
+
 "lng_effect_add_title" = "Add an animated effect";
 "lng_effect_stickers_title" = "Effects from stickers";
 "lng_effect_send" = "Send with Effect";
@@ -595,6 +663,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_update_fail" = "Update check failed :(";
 "lng_settings_workmode_tray" = "Show tray icon";
 "lng_settings_workmode_window" = "Show taskbar icon";
+"lng_settings_window_close" = "When window closed";
+"lng_settings_run_in_background" = "Run in the background";
+"lng_settings_quit_on_close" = "Quit the application";
 "lng_settings_close_to_taskbar" = "Close to taskbar";
 "lng_settings_monochrome_icon" = "Use monochrome icon";
 "lng_settings_window_system" = "Window title bar";
@@ -618,6 +689,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_settings_section_chat_settings" = "Chat Settings";
 "lng_settings_replace_emojis" = "Replace emoji automatically";
+"lng_settings_system_text_replace" = "System text replacements";
 "lng_settings_suggest_emoji" = "Suggest emoji replacements";
 "lng_settings_suggest_animated_emoji" = "Suggest animated emoji";
 "lng_settings_suggest_by_emoji" = "Suggest popular stickers by emoji";
@@ -628,8 +700,63 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_send_cmdenter" = "Send with Cmd+Enter";
 "lng_settings_chat_quick_action_reply" = "Reply with double click";
 "lng_settings_chat_quick_action_react" = "Send reaction with double click";
+"lng_settings_chat_corner_reply" = "Reply button on messages";
 "lng_settings_chat_corner_reaction" = "Reaction button on messages";
 
+"lng_settings_shortcuts" = "Keyboard shortcuts";
+
+"lng_shortcuts_reset" = "Reset to default";
+"lng_shortcuts_recording" = "Recording...";
+"lng_shortcuts_add_another" = "Add another";
+
+"lng_shortcuts_close" = "Close the window";
+"lng_shortcuts_lock" = "Lock the application";
+"lng_shortcuts_minimize" = "Minimize the window";
+"lng_shortcuts_quit" = "Quit the application";
+"lng_shortcuts_media_play" = "Play the media";
+"lng_shortcuts_media_pause" = "Pause the media";
+"lng_shortcuts_media_play_pause" = "Toggle media playback";
+"lng_shortcuts_media_stop" = "Stop media playback";
+"lng_shortcuts_media_previous" = "Previous track";
+"lng_shortcuts_media_next" = "Next track";
+"lng_shortcuts_search" = "Search messages";
+"lng_shortcuts_chat_previous" = "Previous chat";
+"lng_shortcuts_chat_next" = "Next chat";
+"lng_shortcuts_chat_first" = "First chat";
+"lng_shortcuts_chat_last" = "Last chat";
+"lng_shortcuts_chat_self" = "Saved Messages";
+"lng_shortcuts_chat_pinned_n" = "Pinned chat #{index}";
+"lng_shortcuts_show_account_n" = "Account #{index}";
+"lng_shortcuts_show_all_chats" = "All Chats folder";
+"lng_shortcuts_show_folder_n" = "Folder #{index}";
+"lng_shortcuts_show_folder_last" = "Last folder";
+"lng_shortcuts_folder_next" = "Next folder";
+"lng_shortcuts_folder_previous" = "Previous folder";
+"lng_shortcuts_scheduled" = "Scheduled messages";
+"lng_shortcuts_archive" = "Archived chats";
+"lng_shortcuts_contacts" = "Contacts list";
+"lng_shortcuts_just_send" = "Just send";
+"lng_shortcuts_silent_send" = "Silent send";
+"lng_shortcuts_schedule" = "Schedule";
+"lng_shortcuts_ai_compose_apply" = "Apply AI style to text";
+"lng_shortcuts_toggle_link_preview" = "Toggle link preview";
+"lng_shortcuts_read_chat" = "Mark chat as read";
+"lng_shortcuts_archive_chat" = "Archive chat";
+"lng_shortcuts_media_fullscreen" = "Toggle video fullscreen";
+"lng_shortcuts_show_chat_menu" = "Show chat menu";
+"lng_shortcuts_show_chat_preview" = "Show chat preview";
+"lng_shortcuts_record_voice_message" = "Record Voice Message";
+"lng_shortcuts_record_round_message" = "Record Round Message";
+"lng_shortcuts_admin_log" = "Group/Channel Recent Actions";
+
+"lng_attach" = "Add attachment";
+"lng_attach_replace" = "Replace attachment";
+"lng_emoji_sticker_gif" = "Choose emoji, sticker or gif";
+"lng_bot_keyboard_show" = "Show bot keyboard";
+"lng_bot_keyboard_hide" = "Hide bot keyboard";
+"lng_bot_commands_start" = "Bot commands start";
+"lng_broadcast_silent" = "Silent broadcast";
+
 "lng_settings_chat_reactions_title" = "Quick Reaction";
 "lng_settings_chat_reactions_subtitle" = "Choose your favorite reaction";
 "lng_settings_chat_message_reply_from" = "Bob Harris";
@@ -667,6 +794,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_settings_language" = "Language";
 "lng_settings_default_scale" = "Default interface scale";
+"lng_settings_scale" = "Interface scale";
 "lng_settings_connection_type" = "Connection type";
 "lng_settings_downloading_update" = "Downloading update {progress}...";
 "lng_settings_privacy_title" = "Privacy";
@@ -681,7 +809,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_messages_privacy" = "Messages";
 "lng_settings_voices_privacy" = "Voice messages";
 "lng_settings_bio_privacy" = "Bio";
+"lng_settings_gifts_privacy" = "Gifts";
 "lng_settings_birthday_privacy" = "Date of Birth";
+"lng_settings_saved_music_privacy" = "Saved Music";
 "lng_settings_privacy_premium" = "Only subscribers of {link} can restrict receiving voice messages.";
 "lng_settings_privacy_premium_link" = "Telegram Premium";
 "lng_settings_passcode_disable" = "Disable passcode";
@@ -703,16 +833,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_username_add" = "Add username";
 "lng_settings_username_about" = "Username lets people contact you on Telegram without needing your phone number.";
 "lng_settings_birthday_label" = "Date of Birth";
+"lng_settings_birthday_title" = "Set your Birthday";
 "lng_settings_birthday_add" = "Add";
 "lng_settings_birthday_about" = "Choose who can see your birthday in {link}.";
 "lng_settings_birthday_about_link" = "Settings";
 "lng_settings_birthday_contacts" = "Only your contacts can see your birthday. {link}";
 "lng_settings_birthday_contacts_link" = "Change >";
 "lng_settings_birthday_saved" = "Your date of birth was updated.";
+"lng_settings_birthday_suggested" = "Date of birth was suggested to {user}";
 "lng_settings_birthday_reset" = "Remove";
 "lng_settings_channel_label" = "Personal channel";
 "lng_settings_channel_add" = "Add";
 "lng_settings_channel_remove" = "Remove";
+"lng_settings_channel_menu_remove" = "Remove Personal Channel";
 "lng_settings_channel_no_yet" = "You don't have any public channels yet.";
 "lng_settings_channel_start" = "Start a Channel";
 "lng_settings_channel_saved" = "Your personal channel was updated.";
@@ -728,6 +861,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_theme_tinted" = "Tinted";
 "lng_settings_theme_night" = "Night";
 "lng_settings_theme_accent_title" = "Choose accent color";
+"lng_settings_theme_system_accent_color" = "System accent color";
 "lng_settings_data_storage" = "Data and storage";
 "lng_settings_information" = "Edit profile";
 "lng_settings_my_account" = "My Account";
@@ -782,6 +916,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_disconnect" = "Disconnect";
 "lng_settings_connected_title" = "Connected websites";
 
+"lng_settings_suggestion_phone_number_title" = "Is {phone} still your number?";
+"lng_settings_suggestion_phone_number_about" = "Keep your number up to date to ensure you can always log into Telegram. {link}";
+"lng_settings_suggestion_phone_number_about_link" = "https://telegram.org/faq#q-i-have-a-new-phone-number-what-do-i-do";
+"lng_settings_suggestion_phone_number_change" = "Please change your phone number in the official Telegram app on your phone as soon as possible. {emoji}";
+"lng_settings_suggestion_password_title" = "Your password";
+"lng_settings_suggestion_password_about" = "Your account is protected by 2-Step Veritifaction. Do you still remember your password?";
+"lng_settings_suggestion_password_yes" = "Yes, definitely";
+"lng_settings_suggestion_password_no" = "Not sure";
+"lng_settings_suggestion_password_step_input_title" = "Enter your password";
+"lng_settings_suggestion_password_step_input_about" = "Do you still remember your password?";
+"lng_settings_suggestion_password_step_finish_title" = "Perfect!";
+"lng_settings_suggestion_password_step_finish_about" = "You still remember your password.";
+
 "lng_settings_power_menu" = "Battery and Animations";
 "lng_settings_power_title" = "Power Usage";
 "lng_settings_power_subtitle" = "Power saving options";
@@ -828,6 +975,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_cloud_password_email_confirm" = "Confirm and Finish";
 "lng_settings_cloud_password_reset_in" = "You can reset your password in {duration}.";
 
+"lng_settings_cloud_login_email_section_title" = "Login Email";
+"lng_settings_cloud_login_email_box_about" = "This email address will be used every time you log in to your Telegram account from a new device.";
+"lng_settings_cloud_login_email_box_ok" = "Change email";
+"lng_settings_cloud_login_email_title" = "Enter New Email";
+"lng_settings_cloud_login_email_placeholder" = "Enter Login Email";
+"lng_settings_cloud_login_email_about" = "You will receive Telegram login codes via email and not SMS. Please enter an email address to which you have access.";
+"lng_settings_cloud_login_email_confirm" = "Confirm";
+"lng_settings_cloud_login_email_code_title" = "Check Your New Email";
+"lng_settings_cloud_login_email_code_about" = "Please enter the code we have sent to your new email {email}";
+"lng_settings_cloud_login_email_success" = "Your email has been changed.";
+"lng_settings_cloud_login_email_set_success" = "Your login email has been set successfully.";
+"lng_settings_cloud_login_email_busy" = "Please set up login email in another window.";
+"lng_settings_error_email_not_alowed" = "Sorry, this email is not allowed";
+
 "lng_settings_ttl_title" = "Auto-Delete Messages";
 "lng_settings_ttl_about" = "Automatically delete messages for everyone after a period of time in all new chats you start.";
 "lng_settings_ttl_after" = "After {after_duration}";
@@ -874,6 +1035,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_font_family" = "Font family";
 
 "lng_settings_color_title" = "Color preview";
+"lng_settings_color_tab_profile" = "Profile";
+"lng_settings_color_tab_name" = "Name";
 "lng_settings_color_reply" = "Reply to your message";
 "lng_settings_color_reply_channel" = "Reply to your channel message";
 "lng_settings_color_text" = "Your name and replies to your messages will be shown in the selected color.";
@@ -888,9 +1051,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_color_emoji_off" = "Off";
 "lng_settings_color_emoji_about" = "Make replies to your messages stand out by adding custom patterns to them.";
 "lng_settings_color_emoji_about_channel" = "Select an icon to create a custom pattern for replies to your messages.";
-"lng_settings_color_subscribe" = "Subscribe to {link} to choose a custom color for your name.";
 "lng_settings_color_changed" = "Your name color has been updated!";
 "lng_settings_color_changed_channel" = "Your channel color has been updated!";
+"lng_settings_color_changed_profile" = "Your profile style has been updated!";
+"lng_settings_color_changed_profile_channel" = "Your channel profile style has been updated!";
+"lng_settings_color_apply" = "Apply Style";
+"lng_settings_color_wear" = "Wear Collectible";
+"lng_settings_color_profile_emoji" = "Add icons to Profile";
+"lng_settings_color_profile_emoji_channel" = "Profile Logo";
+"lng_settings_color_reset" = "Reset Profile Color";
+"lng_settings_color_profile_about" = "You can change the color of your name and customize replies to you. {link}";
+"lng_settings_color_profile_about_link" = "Change {emoji}";
+"lng_settings_color_choose_channel" = "Choose a color and a logo for your channel's profile";
+"lng_settings_color_choose_group" = "Choose a color and a logo for the group's profile";
+"lng_settings_color_group_boost_footer#one" = "The group has **{count}** boost. {link}";
+"lng_settings_color_group_boost_footer#other" = "The group has **{count}** boosts. {link}";
+"lng_settings_color_group_boost_footer_link" = "What are boosts?";
 
 "lng_suggest_hide_new_title" = "Hide new chats?";
 "lng_suggest_hide_new_about" = "You are receiving lots of new chats from users who are not in your Contact List.\n\nDo you want to have such chats **automatically muted** and **archived**?";
@@ -969,15 +1145,35 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_local_storage_round#other" = "{count} video messages";
 "lng_local_storage_animation#one" = "{count} GIF animation";
 "lng_local_storage_animation#other" = "{count} GIF animations";
+"lng_local_storage_image_title" = "Images";
+"lng_local_storage_sticker_title" = "Stickers";
+"lng_local_storage_voice_title" = "Voice messages";
+"lng_local_storage_round_title" = "Video messages";
+"lng_local_storage_animation_title" = "GIFs";
+"lng_local_storage_media_title" = "Other media";
 "lng_local_storage_media" = "Media cache";
 "lng_local_storage_size_limit" = "Total size limit: {size}";
 "lng_local_storage_media_limit" = "Media cache limit: {size}";
 "lng_local_storage_time_limit" = "Clear files older than: {limit}";
+"lng_local_storage_size_limit_title" = "Total size limit";
+"lng_local_storage_media_limit_title" = "Media cache limit";
+"lng_local_storage_time_limit_title" = "Clear files older than";
 "lng_local_storage_limit_never" = "Never";
 "lng_local_storage_summary" = "Summary";
 "lng_local_storage_clear_some" = "Clear";
 "lng_local_storage_clear" = "Clear all";
+"lng_local_storage_clear_selected" = "Clear selected";
 "lng_local_storage_clearing" = "Clearing...";
+"lng_local_storage_device_telegram" = "Telegram cache";
+"lng_local_storage_device_other" = "Other data";
+"lng_local_storage_device_free" = "Free";
+"lng_local_storage_device_total" = "Total";
+"lng_local_storage_device_usage" = "Telegram uses {percent} of your device storage.";
+"lng_local_storage_clearing_about" = "Please keep this window open while the cache is being cleared.";
+"lng_local_storage_cleared" = "{size} freed on your device!";
+"lng_local_storage_about" = "All media will stay in the Telegram cloud and can be re-downloaded if you need them again.";
+"lng_local_storage_manage_title" = "Manage limits";
+"lng_local_storage_max_size_about" = "If your cache size exceeds this limit, the oldest unused media will be removed from the device.";
 
 "lng_passcode_remove_button" = "Remove";
 
@@ -1068,6 +1264,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_proxy_use_system_settings" = "Use system proxy settings";
 "lng_proxy_use_custom" = "Use custom proxy";
 "lng_proxy_use_for_calls" = "Use proxy for calls";
+"lng_proxy_auto_switch" = "Auto-switch proxies";
+"lng_proxy_auto_switch_about" = "You can choose how quickly the app should auto-connect to the nearest active proxy if the current one stops working.";
+"lng_proxy_auto_switch_timeout#one" = "{count} s";
+"lng_proxy_auto_switch_timeout#other" = "{count} s";
 "lng_proxy_about" = "Proxy servers may be helpful in accessing Telegram if there is no connection in a specific region.";
 "lng_proxy_add" = "Add proxy";
 "lng_proxy_share" = "Share";
@@ -1081,6 +1281,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_proxy_menu_delete" = "Delete";
 "lng_proxy_menu_restore" = "Restore";
 "lng_proxy_edit_share" = "Share";
+"lng_proxy_edit_share_qr_box_title" = "Share proxy with QR code";
+"lng_proxy_edit_share_list_button" = "Share Proxy List";
+"lng_proxy_edit_share_list_toast" = "Proxy List copied to clipboard.";
 "lng_proxy_address_label" = "Socket address";
 "lng_proxy_credentials_optional" = "Credentials (optional)";
 "lng_proxy_credentials" = "Credentials";
@@ -1116,9 +1319,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_faq_button" = "Go to FAQ";
 "lng_settings_ask_ok" = "Ask a Volunteer";
 "lng_settings_faq" = "Telegram FAQ";
+"lng_settings_faq_subtitle" = "FAQ";
 "lng_settings_faq_link" = "https://telegram.org/faq#general-questions";
 "lng_settings_features" = "Telegram Features";
 "lng_settings_credits" = "My Stars";
+"lng_settings_currency" = "My Grams";
 "lng_settings_logout" = "Log out";
 "lng_sure_logout" = "Are you sure you want to log out?";
 
@@ -1126,6 +1331,67 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_restart_now" = "Restart";
 "lng_settings_restart_later" = "Later";
 
+"lng_settings_passkeys_title" = "Passkeys";
+"lng_settings_passkeys_about" = "Manage your passkey, stored safely in the cloud service you choose.";
+"lng_settings_passkeys_button" = "Add Passkey";
+"lng_settings_passkeys_button_about" = "Your passkey is stored securely in your password manager. {link}";
+"lng_settings_passkeys_delete_sure_title" = "Delete Passkey";
+"lng_settings_passkeys_delete_sure_about" = "Once deleted, this passkey can't be used to log in.";
+"lng_settings_passkeys_delete_sure_about2" = "Don't forget to remove it from your password manager too.";
+"lng_settings_passkeys_none_title" = "Protect your account";
+"lng_settings_passkeys_none_about" = "Log in safely and keep your account secure.";
+"lng_settings_passkeys_none_info1_title" = "Create a Passkey";
+"lng_settings_passkeys_none_info1_about" = "Make a passkey to sign in easily and safely.";
+"lng_settings_passkeys_none_info2_title" = "Log in with face recognition";
+"lng_settings_passkeys_none_info2_about" = "Use your face, fingerprint, or screen lock to sign in.";
+"lng_settings_passkeys_none_info3_title" = "Store Passkey securely";
+"lng_settings_passkeys_none_info3_about" = "Your passkey is stored safely in the cloud service you choose.";
+"lng_settings_passkeys_none_button" = "Create Passkey";
+"lng_settings_passkeys_none_button_unsupported" = "Unsupported";
+"lng_settings_passkeys_created" = "Created {date}";
+"lng_settings_passkeys_last_used" = "Last used {date}";
+"lng_settings_passkeys_unsigned_error" = "Passkeys are not available in unsigned builds. Please use an official signed version of Telegram Desktop.";
+"lng_settings_passkey_unknown" = "Passkey";
+
+"lng_settings_quick_dialog_action_title" = "Chat list quick action";
+"lng_settings_quick_dialog_action_about" = "Choose the action you want to perform when you middle-click or swipe left in the chat list.";
+"lng_settings_quick_dialog_action_both" = "Swipe left and Middle-click";
+"lng_settings_quick_dialog_action_swipe" = "Swipe left";
+"lng_settings_quick_dialog_action_mute" = "Mute";
+"lng_settings_quick_dialog_action_unmute" = "Unmute";
+"lng_settings_quick_dialog_action_pin" = "Pin";
+"lng_settings_quick_dialog_action_unpin" = "Unpin";
+"lng_settings_quick_dialog_action_read" = "Read";
+"lng_settings_quick_dialog_action_unread" = "Unread";
+"lng_settings_quick_dialog_action_archive" = "Archive";
+"lng_settings_quick_dialog_action_unarchive" = "Unarchive";
+"lng_settings_quick_dialog_action_delete" = "Delete";
+"lng_settings_quick_dialog_action_disabled" = "Change folder";
+
+"lng_quick_dialog_action_toast_mute_success" = "Notifications for this chat have been muted.";
+"lng_quick_dialog_action_toast_unmute_success" = "Notifications enabled for this chat.";
+"lng_quick_dialog_action_toast_pin_success" = "The chat has been pinned.";
+"lng_quick_dialog_action_toast_unpin_success" = "The chat has been unpinned.";
+"lng_quick_dialog_action_toast_read_success" = "The chat has been marked as read.";
+"lng_quick_dialog_action_toast_unread_success" = "The chat has been marked as unread.";
+"lng_quick_dialog_action_toast_archive_success" = "The chat has been archived.";
+"lng_quick_dialog_action_toast_unarchive_success" = "The chat has been unarchived.";
+
+"lng_archive_hint_title" = "This is your Archive";
+"lng_archive_hint_about" = "Archived chats will remain in the Archive when you receive a new message. {link}";
+"lng_archive_hint_about_unmuted" = "When you receive a new message, muted chats will remain in the Archive, while unmuted chats will be moved to Chats. {link}";
+"lng_archive_hint_about_link" = "Tap to change {emoji}";
+"lng_archive_hint_section_1" = "Archived Chats";
+"lng_archive_hint_section_1_info" = "Move any chat into your Archive and back by swiping on it.";
+"lng_archive_hint_section_2" = "Hiding Archive";
+"lng_archive_hint_section_2_info" = "Hide the Archive from your Main screen by swiping on it.";
+"lng_archive_hint_section_3" = "Stories";
+"lng_archive_hint_section_3_info" = "Archive Stories from your contacts separately from chats with them.";
+"lng_archive_hint_button" = "Got it";
+
+"lng_settings_generic_subscribe" = "Subscribe to {link} to use this setting.";
+"lng_settings_generic_subscribe_link" = "Telegram Premium";
+
 "lng_sessions_header" = "This device";
 "lng_sessions_other_header" = "Active Devices";
 "lng_sessions_other_desc" = "You can log in to Telegram from other mobile, tablet and desktop devices, using the same phone number. All your data will be instantly synchronized.";
@@ -1154,6 +1420,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_blocked_list_confirm_title" = "Block {name}";
 "lng_blocked_list_confirm_text" = "Do you want to block {name} from messaging and calling you on Telegram?";
 "lng_blocked_list_confirm_clear" = "Delete this chat";
+"lng_blocked_list_confirm_reply" = "Delete this reply";
+"lng_blocked_list_confirm_reply_all" = "Delete all replies from {user}";
 "lng_blocked_list_confirm_ok" = "Block";
 "lng_blocked_list_empty_title" = "No blocked users";
 "lng_blocked_list_empty_description" = "You haven't blocked anyone yet.";
@@ -1161,19 +1429,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_blocked_list_subtitle#other" = "{count} blocked users";
 
 "lng_edit_privacy_everyone" = "Everybody";
+"lng_edit_privacy_no_miniapps" = "Not Mini Apps";
 "lng_edit_privacy_contacts" = "My contacts";
 "lng_edit_privacy_close_friends" = "Close friends";
 "lng_edit_privacy_contacts_and_premium" = "Contacts & Premium";
+"lng_edit_privacy_paid" = "Paid";
+"lng_edit_privacy_contacts_and_miniapps" = "Contacts & Mini Apps";
 "lng_edit_privacy_nobody" = "Nobody";
 "lng_edit_privacy_premium" = "Premium users";
+"lng_edit_privacy_miniapps" = "Mini Apps";
 "lng_edit_privacy_exceptions" = "Add exceptions";
 "lng_edit_privacy_user_types" = "User types";
 "lng_edit_privacy_users_and_groups" = "Users and groups";
 "lng_edit_privacy_premium_status" = "all Telegram Premium subscribers";
+"lng_edit_privacy_miniapps_status" = "web mini apps that you use";
 
 "lng_edit_privacy_exceptions_count#one" = "{count} user";
 "lng_edit_privacy_exceptions_count#other" = "{count} users";
 "lng_edit_privacy_exceptions_premium_and" = "Premium & {users}";
+"lng_edit_privacy_exceptions_miniapps_and" = "Mini Apps & {users}";
 "lng_edit_privacy_exceptions_add" = "Add users";
 
 "lng_edit_privacy_phone_number_title" = "Phone number privacy";
@@ -1227,6 +1501,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_edit_privacy_birthday_yet" = "You haven't entered your date of birth yet.\n{link}";
 "lng_edit_privacy_birthday_yet_link" = "Add my birthday >";
 
+"lng_edit_privacy_gifts_title" = "Gifts";
+"lng_edit_privacy_gifts_header" = "Who can display gifts on my profile";
+"lng_edit_privacy_gifts_always_empty" = "Always allow";
+"lng_edit_privacy_gifts_never_empty" = "Never allow";
+"lng_edit_privacy_gifts_exceptions" = "Choose whether gifts from specific senders need your approval before they're visible to others on your profile.";
+"lng_edit_privacy_gifts_always_title" = "Always allow";
+"lng_edit_privacy_gifts_never_title" = "Never allow";
+
+"lng_edit_privacy_gifts_types" = "Accepted Gift Types";
+"lng_edit_privacy_gifts_premium" = "Premium Subscriptions";
+"lng_edit_privacy_gifts_unlimited" = "Unlimited";
+"lng_edit_privacy_gifts_limited" = "Limited-Edition";
+"lng_edit_privacy_gifts_unique" = "Unique";
+"lng_edit_privacy_gifts_channels" = "From Channels";
+"lng_edit_privacy_gifts_types_about" = "Choose the types of gifts that you accept.";
+"lng_edit_privacy_gifts_show_icon" = "Show Gift Icon in Chats";
+"lng_edit_privacy_gifts_show_icon_about" = "Display the {emoji}Gift icon in the message input field for both participants in all chats.";
+"lng_edit_privacy_gifts_restricted" = "This user doesn't accept gifts.";
+
 "lng_edit_privacy_calls_title" = "Calls";
 "lng_edit_privacy_calls_header" = "Who can call me";
 "lng_edit_privacy_calls_always_empty" = "Always allow";
@@ -1281,6 +1574,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_edit_privacy_voices_always_title" = "Always allow";
 "lng_edit_privacy_voices_never_title" = "Never Allow";
 
+"lng_edit_privacy_saved_music_title" = "Saved Music";
+"lng_edit_privacy_saved_music_header" = "Who can see my saved music in profile";
+"lng_edit_privacy_saved_music_always_empty" = "Always allow";
+"lng_edit_privacy_saved_music_never_empty" = "Never allow";
+"lng_edit_privacy_saved_music_exceptions" = "These users will or will not be able to see your saved music regardless of the settings above.";
+"lng_edit_privacy_saved_music_always_title" = "Always allow";
+"lng_edit_privacy_saved_music_never_title" = "Never allow";
+
 "lng_messages_privacy_title" = "Messages";
 "lng_messages_privacy_subtitle" = "Who can send me messages";
 "lng_messages_privacy_everyone" = "Everybody";
@@ -1290,6 +1591,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_messages_privacy_premium_about" = "Subscribe now to change this setting and get access to other exclusive features of Telegram Premium.";
 "lng_messages_privacy_premium" = "Only subscribers of {link} can select this option.";
 "lng_messages_privacy_premium_link" = "Telegram Premium";
+"lng_messages_privacy_charge" = "Charge for messages";
+"lng_messages_privacy_charge_about" = "Charge a fee for messages from people outside your contacts or those you haven't messaged first.";
+"lng_messages_privacy_price" = "Set your price per message";
+"lng_messages_privacy_price_about" = "You will receive {percent} of the selected fee ({amount}) for each incoming message.";
+"lng_messages_privacy_exceptions" = "Exceptions";
+"lng_messages_privacy_remove_fee" = "Remove Fee";
+"lng_messages_privacy_remove_about" = "Add users or entire groups who won't be charged for sending messages to you.";
 
 "lng_self_destruct_title" = "Account self-destruction";
 "lng_self_destruct_description" = "If you don't come online at least once within this period, your account will be deleted along with all groups, messages and contacts.";
@@ -1313,6 +1621,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_preview_loading" = "Getting Link Info...";
 "lng_preview_cant" = "Could not generate preview for this link.";
+"lng_markdown_preview_cant" = "Can't preview this Markdown file";
+"lng_markdown_preview_open_file" = "Open file";
 
 "lng_profile_settings_section" = "Settings";
 "lng_profile_bot_settings" = "Bot Settings";
@@ -1323,10 +1633,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_common_groups#other" = "{count} groups in common";
 "lng_profile_similar_channels#one" = "{count} similar channel";
 "lng_profile_similar_channels#other" = "{count} similar channels";
+"lng_profile_similar_bots#one" = "{count} similar bot";
+"lng_profile_similar_bots#other" = "{count} similar bots";
 "lng_profile_saved_messages#one" = "{count} saved message";
 "lng_profile_saved_messages#other" = "{count} saved messages";
 "lng_profile_peer_gifts#one" = "{count} gift";
 "lng_profile_peer_gifts#other" = "{count} gifts";
+"lng_profile_unofficial_warning" = "{icon} {name} uses an unofficial Telegram client — messages to this user may be less secure.";
 "lng_profile_participants_section" = "Members";
 "lng_profile_subscribers_section" = "Subscribers";
 "lng_profile_add_contact" = "Add Contact";
@@ -1350,8 +1663,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_hide_participants_about" = "Switch this on to hide the list of members in this group. Admins will remain visible.";
 "lng_profile_view_channel" = "View Channel";
 "lng_profile_view_discussion" = "View discussion";
+"lng_profile_direct_messages" = "Direct messages";
 "lng_profile_join_channel" = "Join Channel";
 "lng_profile_join_group" = "Join Group";
+
+"lng_pull_next_channel" = "Pull up to go to the next unread channel";
+"lng_release_next_channel" = "Release to go to the next unread channel";
+"lng_pull_no_unread_channels" = "You have no unread channels";
+
 "lng_profile_apply_to_join_group" = "Apply to Join Group";
 "lng_profile_kick" = "Remove";
 "lng_profile_delete_removed" = "Delete";
@@ -1367,6 +1686,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_photos#other" = "{count} photos";
 "lng_profile_gifs#one" = "{count} GIF";
 "lng_profile_gifs#other" = "{count} GIFs";
+"lng_profile_polls#one" = "{count} poll";
+"lng_profile_polls#other" = "{count} polls";
 "lng_profile_videos#one" = "{count} video";
 "lng_profile_videos#other" = "{count} videos";
 "lng_profile_songs#one" = "{count} audio file";
@@ -1384,6 +1705,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_administrators#one" = "{count} administrator";
 "lng_profile_administrators#other" = "{count} administrators";
 "lng_profile_manage" = "Channel settings";
+"lng_profile_topic_toast" = "This topic contains {name}";
 
 "lng_invite_upgrade_title" = "Upgrade to Premium";
 "lng_invite_upgrade_group_invite#one" = "{users} only accepts invitations to groups from Contacts and **Premium** users.";
@@ -1403,6 +1725,26 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_invite_upgrade_via_channel_about" = "You can send an invite link to the channel in a private message instead.";
 "lng_invite_status_disabled" = "available only to Premium users";
 
+"lng_leave_next_owner_box_title" = "Leave Channel?";
+"lng_leave_next_owner_box_title_group" = "Leave Group?";
+"lng_leave_next_owner_box_about" = "If you leave, **{user}** will become the new owner of **{chat}** in **1 week**.";
+"lng_leave_next_owner_box_about_admin" = "If you leave, **{user}** will become the new admin of **{chat}** in **1 week**.";
+"lng_leave_next_owner_box_about_legacy" = "If you leave, **{user}** will immediately become the new owner of **{chat}**.";
+"lng_leave_next_owner_box_about_admin_legacy" = "If you leave, **{user}** will immediately become the new admin of **{chat}**.";
+"lng_select_next_owner_box" = "Appoint Another Owner";
+"lng_select_next_owner_box_admin" = "Appoint Another Admin";
+"lng_select_next_owner_box_title" = "Appoint New Owner";
+"lng_select_next_owner_box_title_admin" = "Appoint New Admin";
+"lng_select_next_owner_box_confirm" = "Appoint and Leave Group";
+"lng_select_next_owner_box_sub_admins" = "Channel admins";
+"lng_select_next_owner_box_sub_admins_group" = "Group admins";
+"lng_select_next_owner_box_sub_members" = "Channel members";
+"lng_select_next_owner_box_sub_members_group" = "Group members";
+"lng_select_next_owner_box_status_joined" = "joined {date}";
+"lng_select_next_owner_box_status_promoted" = "promoted {date}";
+"lng_select_next_owner_box_empty_list" = "There are no eligible participants to appoint as owner.";
+"lng_select_next_owner_box_empty_list_admin" = "There are no eligible participants to appoint as admin.";
+
 "lng_via_link_group_one" = "**{user}** restricts adding them to groups.\nYou can send them an invite link as message instead.";
 "lng_via_link_group_many#one" = "**{count} user** restricts adding them to groups.\nYou can send them an invite link as message instead.";
 "lng_via_link_group_many#other" = "**{count} users** restrict adding them to groups.\nYou can send them an invite link as message instead.";
@@ -1432,8 +1774,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_info_birthday_today_years#other" = "{date}\n({count} years old)";
 "lng_info_birthday_today_label" = "Birthday today";
 "lng_info_birthday_today" = "{emoji} {date}";
+"lng_info_notes_label" = "Notes";
+"lng_info_notes_private" = "only visible to you";
+"lng_edit_note" = "Edit Note";
+"lng_delete_note" = "Delete Note";
 "lng_info_bio_label" = "Bio";
 "lng_info_link_label" = "Link";
+"lng_info_link_topic_label" = "This topic link will only work for group members";
 "lng_info_location_label" = "Location";
 "lng_info_about_label" = "Description";
 "lng_info_work_open" = "Open";
@@ -1455,16 +1802,29 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_info_group_title" = "Group Info";
 "lng_info_channel_title" = "Channel Info";
 "lng_info_topic_title" = "Topic Info";
+"lng_info_thread_title" = "Thread Info";
 "lng_profile_enable_notifications" = "Notifications";
 "lng_profile_send_message" = "Send Message";
 "lng_profile_open_app" = "Open App";
+"lng_profile_open_app_short" = "Open";
 "lng_profile_open_app_about" = "By launching this mini app, you agree to the {terms}.";
 "lng_profile_open_app_terms" = "Terms of Service for Mini Apps";
+"lng_profile_open_photo" = "Open Photo";
+"lng_profile_bot_permissions_title" = "Allow access to";
+"lng_profile_bot_emoji_status_access" = "Emoji Status";
 "lng_info_add_as_contact" = "Add to contacts";
 "lng_profile_shared_media" = "Shared media";
 "lng_profile_suggest_photo" = "Suggest Profile Photo";
+"lng_profile_suggest_photo_from_clipboard" = "Suggest From Clipboard";
 "lng_profile_set_photo_for" = "Set Profile Photo";
+"lng_profile_set_photo_for_group" = "Set Group Photo";
+"lng_profile_set_photo_for_channel" = "Set Channel Photo";
+"lng_profile_set_photo_for_from_clipboard" = "Set From Clipboard";
+"lng_profile_set_photo_for_about" = "You can replace {user}'s photo with another photo that only you will see.";
 "lng_profile_photo_reset" = "Reset to Original";
+"lng_profile_photo_reset_button" = "Reset";
+"lng_profile_photo_reset_sure" = "Are you sure you want to reset {user}'s photo to the original?";
+"lng_profile_photo_from_clipboard" = "From clipboard";
 "lng_profile_suggest_sure" = "You can suggest {user} to set this photo for their Telegram profile.";
 "lng_profile_suggest_button" = "Suggest";
 "lng_profile_set_personal_sure" = "Only you will see this photo and it will replace any photo {user} sets for themselves.";
@@ -1475,6 +1835,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_changed_photo_title" = "Photo updated";
 "lng_profile_changed_photo_about" = "You can change it in {link}.";
 "lng_profile_changed_photo_link" = "Settings";
+
+"lng_profile_action_short_message" = "Message";
+"lng_profile_action_short_channel" = "Channel";
+"lng_profile_action_short_mute" = "Mute";
+"lng_profile_action_short_unmute" = "Unmute";
+"lng_profile_action_short_call" = "Call";
+"lng_profile_action_short_discuss" = "Discuss";
+"lng_profile_action_short_gift" = "Gift";
+"lng_profile_action_short_join" = "Join";
+"lng_profile_action_short_report" = "Report";
+"lng_profile_action_short_leave" = "Leave";
+"lng_profile_action_short_more" = "More";
+"lng_profile_action_short_manage" = "Manage";
+"lng_profile_action_short_live_stream" = "Live stream";
+"lng_profile_action_short_video_chat" = "Video chat";
+
 "lng_media_type_photos" = "Photos";
 "lng_media_type_gifs" = "GIFs";
 "lng_media_type_videos" = "Videos";
@@ -1482,7 +1858,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_media_type_files" = "Files";
 "lng_media_type_audios" = "Voice messages";
 "lng_media_type_links" = "Shared links";
+"lng_media_type_polls" = "Polls";
+"lng_polls_search_none" = "No polls found";
 "lng_media_type_rounds" = "Video messages";
+"lng_media_zoom_in" = "Zoom In";
+"lng_media_zoom_out" = "Zoom Out";
+"lng_media_saved_music_your" = "Your playlist";
+"lng_media_saved_music_title" = "Playlist";
 "lng_profile_common_groups_section" = "Groups in common";
 "lng_info_edit_contact" = "Edit contact";
 "lng_info_delete_contact" = "Delete contact";
@@ -1492,6 +1874,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_block_user" = "Block user";
 "lng_profile_unblock_user" = "Unblock user";
 "lng_profile_export_chat" = "Export chat history";
+"lng_profile_export_topic" = "Export topic history";
 "lng_profile_gift_premium" = "Gift Premium";
 "lng_media_selected_photo#one" = "{count} Photo";
 "lng_media_selected_photo#other" = "{count} Photos";
@@ -1507,6 +1890,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_media_selected_audio#other" = "{count} Voice messages";
 "lng_media_selected_link#one" = "{count} shared link";
 "lng_media_selected_link#other" = "{count} shared links";
+"lng_media_selected_poll#one" = "{count} Poll";
+"lng_media_selected_poll#other" = "{count} Polls";
 "lng_media_photo_empty" = "No photos here yet";
 "lng_media_gif_empty" = "No GIFs here yet";
 "lng_media_video_empty" = "No videos here yet";
@@ -1522,6 +1907,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_manage_channel_title" = "Manage Channel";
 "lng_manage_bot_title" = "Manage Bot";
 "lng_manage_peer_recent_actions" = "Recent actions";
+"lng_manage_peer_star_ref" = "Affiliate programs";
 "lng_manage_peer_members" = "Members";
 "lng_manage_peer_subscribers" = "Subscribers";
 "lng_manage_peer_administrators" = "Administrators";
@@ -1560,7 +1946,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_manage_peer_reactions_max_about" = "Limit the number of different reactions that can be added to a post, including already published ones.";
 
 "lng_manage_peer_reactions_paid" = "Enable Paid Reactions";
-"lng_manage_peer_reactions_paid_about" = "Switch this on to let your subscribers react to posts with Telegram Stars, which you will be able to withdraw as TON. {link}";
+"lng_manage_peer_reactions_paid_about" = "Switch this on to let your subscribers react to posts with Telegram Stars, which you will be able to withdraw as Grams. {link}";
 "lng_manage_peer_reactions_paid_link" = "Learn more >";
 
 "lng_manage_peer_antispam" = "Aggressive Anti-Spam";
@@ -1584,20 +1970,209 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_manage_peer_send_only_members" = "Only members";
 "lng_manage_peer_send_only_members_about" = "Turn this on if you expect users to join your group before being able to send messages.";
 "lng_manage_peer_send_approve_members" = "Approve new members";
-"lng_manage_peer_send_approve_members_about" = "Turn this on if you want users to join the group only after they are approved by an admin.";
+"lng_manage_peer_send_approve_subscribers" = "Approve new subscribers";
+"lng_manage_peer_send_approve_members_about" = "Admins must approve anyone who wants to send a message in the group.";
+"lng_manage_peer_send_approve_members_about_channel" = "Admins must approve anyone who wants to subscribe to this channel.";
+"lng_manage_peer_send_approve_members_about_managed" = "Admins must approve anyone who wants to send a message in the group. Managed by {bot}.";
+"lng_manage_peer_send_approve_members_about_managed_channel" = "Admins must approve anyone who wants to subscribe to this channel. Managed by {bot}.";
+"lng_manage_peer_request_apply_title" = "Apply to existing invite links";
+"lng_manage_peer_request_apply_enable_group#one" = "Also enable **Approve New Members** for **{count} existing invite link** in this group?";
+"lng_manage_peer_request_apply_enable_group#other" = "Also enable **Approve New Members** for **{count} existing invite links** in this group?";
+"lng_manage_peer_request_apply_enable_channel#one" = "Also enable **Approve New Subscribers** for **{count} existing invite link** in this channel?";
+"lng_manage_peer_request_apply_enable_channel#other" = "Also enable **Approve New Subscribers** for **{count} existing invite links** in this channel?";
+"lng_manage_peer_request_apply_disable_group#one" = "Also disable **Approve New Members** for **{count} existing invite link** in this group?";
+"lng_manage_peer_request_apply_disable_group#other" = "Also disable **Approve New Members** for **{count} existing invite links** in this group?";
+"lng_manage_peer_request_apply_disable_channel#one" = "Also disable **Approve New Subscribers** for **{count} existing invite link** in this channel?";
+"lng_manage_peer_request_apply_disable_channel#other" = "Also disable **Approve New Subscribers** for **{count} existing invite links** in this channel?";
+"lng_manage_peer_request_apply_skip" = "Don't Apply";
+"lng_manage_peer_request_apply_confirm" = "Apply";
 "lng_manage_peer_no_forwards_title" = "Content protection";
 "lng_manage_peer_no_forwards" = "Restrict saving content";
 "lng_manage_peer_no_forwards_about" = "Members won't be able to copy, save or forward content from this group.";
 "lng_manage_peer_no_forwards_about_channel" = "Subscribers won't be able to copy, save or forward content from this channel.";
 
+"lng_disable_sharing" = "Disable Sharing";
+"lng_enable_sharing" = "Enable Sharing";
+"lng_disable_sharing_title" = "Disable Sharing";
+"lng_disable_sharing_no_forwarding" = "No Forwarding";
+"lng_disable_sharing_no_forwarding_about" = "Disable message forwarding to other chats.";
+"lng_disable_sharing_no_saving" = "No Saving";
+"lng_disable_sharing_no_saving_about" = "Disable copying texts and saving photos and videos to gallery.";
+"lng_disable_sharing_unlock" = "Unlock with Telegram Premium";
+"lng_disable_sharing_button" = "Disable Sharing";
+"lng_disable_sharing_toast" = "Sharing disabled for this chat.";
+"lng_enable_sharing_toast" = "Sharing enabled for this chat.";
+"lng_enable_sharing_request_title" = "Enable Sharing";
+"lng_enable_sharing_request_text" = "You need **{name}'s** approval to enable sharing. Send a request?";
+"lng_enable_sharing_request_button" = "Send Request";
+
+"lng_action_no_forwards_you_disabled" = "You disabled sharing in this chat";
+"lng_action_no_forwards_you_enabled" = "You enabled sharing in this chat";
+"lng_action_no_forwards_disabled" = "{from} disabled sharing in this chat";
+"lng_action_no_forwards_enabled" = "{from} enabled sharing in this chat";
+"lng_action_no_forwards_still_disabled" = "Sharing in this chat is still disabled";
+"lng_action_no_forwards_request" = "{from} would like to enable sharing in this chat, which includes:";
+"lng_action_no_forwards_request_you" = "You requested to enable sharing in this chat, which includes:";
+"lng_action_no_forwards_feature_forwarding" = "Forwarding messages";
+"lng_action_no_forwards_feature_saving" = "Saving photos and videos";
+"lng_action_no_forwards_feature_copying" = "Copying messages";
+"lng_action_no_forwards_accept" = "Accept";
+"lng_action_no_forwards_reject" = "Reject";
+"lng_action_no_forwards_request_expired" = "Sharing enable request has expired";
+
 "lng_manage_peer_bot_public_link" = "Public Link";
 "lng_manage_peer_bot_public_links" = "Public Links";
 "lng_manage_peer_bot_balance" = "Balance";
+"lng_manage_peer_bot_balance_currency" = "Toncoin";
+"lng_manage_peer_bot_balance_credits" = "Stars";
+"lng_manage_peer_bot_star_ref" = "Affiliate Program";
+"lng_manage_peer_bot_star_ref_off" = "Off";
+"lng_manage_peer_bot_star_ref_about" = "Share a link to {bot} with your friends and earn {amount} of their spending there.";
+"lng_manage_peer_bot_verify" = "Verify Accounts";
 "lng_manage_peer_bot_edit_intro" = "Edit Intro";
 "lng_manage_peer_bot_edit_commands" = "Edit Commands";
 "lng_manage_peer_bot_edit_settings" = "Change Bot Settings";
 "lng_manage_peer_bot_about" = "Use {bot} to manage this bot.";
 
+"lng_bot_verify_title" = "Choose Chat to Verify";
+"lng_bot_verify_bot_title" = "Verify Bot";
+"lng_bot_verify_bot_text" = "Do you want to verify {name} with your verification mark and description?";
+"lng_bot_verify_bot_about" = "You can customize your description for each bot.";
+"lng_bot_verify_bot_submit" = "Verify Bot";
+"lng_bot_verify_bot_sent" = "{name} has been notified and will receive your verification mark and description upon accepting.";
+"lng_bot_verify_bot_remove" = "This bot is already verified by you. Do you want to remove verification?";
+"lng_bot_verify_user_title" = "Verify User";
+"lng_bot_verify_user_text" = "Do you want to verify {name} with your verification mark and description?";
+"lng_bot_verify_user_about" = "You can customize your description for each account.";
+"lng_bot_verify_user_submit" = "Verify User";
+"lng_bot_verify_user_sent" = "{name} has been notified and will receive your verification mark and description upon accepting.";
+"lng_bot_verify_user_remove" = "This account is already verified by you. Do you want to remove verification?";
+"lng_bot_verify_channel_title" = "Verify Channel";
+"lng_bot_verify_channel_text" = "Do you want to verify {name} with your verification mark and description?";
+"lng_bot_verify_channel_about" = "You can customize your description for each channel.";
+"lng_bot_verify_channel_submit" = "Verify Channel";
+"lng_bot_verify_channel_sent" = "{name} has been notified and will receive your verification mark and description upon accepting.";
+"lng_bot_verify_channel_remove" = "This channel is already verified by you. Do you want to remove verification?";
+"lng_bot_verify_group_title" = "Verify Group";
+"lng_bot_verify_group_text" = "Do you want to verify {name} with your verification mark and description?";
+"lng_bot_verify_group_about" = "You can customize your description for each group.";
+"lng_bot_verify_group_submit" = "Verify Group";
+"lng_bot_verify_group_sent" = "{name} has been notified and will receive your verification mark and description upon accepting.";
+"lng_bot_verify_group_remove" = "This group is already verified by you. Do you want to remove verification?";
+"lng_bot_verify_description_label" = "Description";
+"lng_bot_verify_remove_title" = "Remove verification";
+"lng_bot_verify_remove_submit" = "Remove";
+"lng_bot_verify_remove_done" = "You've removed this verification.";
+
+"lng_star_ref_title" = "Affiliate Program";
+"lng_star_ref_about" = "Reward those who help grow your user base.";
+"lng_star_ref_share_title" = "Share revenue with affiliates";
+"lng_star_ref_share_about" = "Set the commission for revenue generated by users referred to you.";
+"lng_star_ref_launch_title" = "Launch your affiliate program";
+"lng_star_ref_launch_about" = "Telegram will feature your program for millions of potential affiliates.";
+"lng_star_ref_let_title" = "Let affiliate promote you";
+"lng_star_ref_let_about" = "Affiliates will share your referral link with their audience.";
+"lng_star_ref_commission_title" = "Commission";
+"lng_star_ref_commission_about" = "Define the percentage of star revenue your affiliates earn for referring users to your bot.";
+"lng_star_ref_duration_title" = "Duration";
+"lng_star_ref_duration_about" = "Set the duration for which affiliates will earn commissions from referred users.";
+"lng_star_ref_existing_title" = "View existing programs";
+"lng_star_ref_existing_about" = "Explore what other mini apps offer.";
+"lng_star_ref_add_bot" = "Add {bot}";
+"lng_star_ref_end" = "End Affiliate Program";
+"lng_star_ref_start" = "Start Affiliate Program";
+"lng_star_ref_start_disabled" = "Available in {time}";
+"lng_star_ref_start_info" = "By creating an affiliate program, you agree to the {terms} of Affiliate Programs.";
+"lng_star_ref_update" = "Update Affiliate Program";
+"lng_star_ref_update_info" = "By updating an affiliate program, you agree to the {terms} of Affiliate Programs.";
+"lng_star_ref_button_link" = "terms and conditions";
+"lng_star_ref_tos_url" = "https://telegram.org/tos/mini-apps";
+"lng_star_ref_warning_title" = "Warning";
+"lng_star_ref_warning_text" = "Once you start the affiliate program, you won't be able to decrease its commission or duration. You can only increase these parameters or end the program, which will disable all previously distributed referral links.";
+"lng_star_ref_warning_change" = "This change is irreversible. You won't be able to reduce commission or duration. You can only increase these parameters or end the program, which will disable all previously shared referral links.";
+"lng_star_ref_warning_start" = "Start";
+"lng_star_ref_warning_update" = "Update";
+"lng_star_ref_warning_if_end" = "If you end your affiliate program:";
+"lng_star_ref_warning_if_end1" = "Any referral links already shared will be disabled in **24** hours.";
+"lng_star_ref_warning_if_end2" = "All participating affiliates will be notified.";
+"lng_star_ref_warning_if_end3" = "You will be able to start a new affiliate program only in **24** hours.";
+"lng_star_ref_warning_end" = "End Anyway";
+"lng_star_ref_created_title" = "Affiliate program started";
+"lng_star_ref_created_text" = "Any Telegram user, channel owner or mini app developer can now join your program.";
+"lng_star_ref_updated_title" = "Affiliate program updated";
+"lng_star_ref_updated_text" = "Any Telegram user, channel owner or mini app developer can join your program.";
+"lng_star_ref_ended_title" = "Affiliate program ended";
+"lng_star_ref_ended_text" = "Participating affiliates have been notified. All referral links will be disabled in **24** hours.";
+"lng_star_ref_list_title" = "Affiliate Programs";
+"lng_star_ref_list_about_channel" = "Promote mini apps to your subscribers and earn a share of their revenue in Stars.";
+"lng_star_ref_list_text" = "Earn a commission each time a user who first accessed a mini app through your referral link spends **Stars** within it.";
+"lng_star_ref_list_my" = "My Programs";
+"lng_star_ref_list_my_open" = "Open App";
+"lng_star_ref_list_my_copy" = "Copy Link";
+"lng_star_ref_list_my_leave" = "Leave";
+"lng_star_ref_list_subtitle" = "Programs";
+"lng_star_ref_sort_text" = "Sort by {sort}";
+"lng_star_ref_sort_profitability" = "Profitability";
+"lng_star_ref_sort_date" = "Date";
+"lng_star_ref_sort_revenue" = "Revenue";
+"lng_star_ref_reliable_title" = "Reliable";
+"lng_star_ref_reliable_about" = "Receive guaranteed commissions for spending by users you refer.";
+"lng_star_ref_transparent_title" = "Transparent";
+"lng_star_ref_transparent_about" = "Track your commissions from referred users in real time.";
+"lng_star_ref_simple_title" = "Simple";
+"lng_star_ref_simple_about" = "Choose a mini app below, get your referral link, and start earning Stars.";
+"lng_star_ref_duration_forever" = "Forever";
+"lng_star_ref_one_about" = "{app} will share {amount} of the revenue from each user you refer to it {duration}.";
+"lng_star_ref_one_about_for_forever" = "for **lifetime**";
+"lng_star_ref_one_about_for_months#one" = "for **{count} month**";
+"lng_star_ref_one_about_for_months#other" = "for **{count} months**";
+"lng_star_ref_one_about_for_years#one" = "for **{count} year**";
+"lng_star_ref_one_about_for_years#other" = "for **{count} years**";
+"lng_star_ref_one_daily_revenue" = "Daily revenue per user: {amount}";
+"lng_star_ref_one_join" = "Join Program";
+"lng_star_ref_one_join_text" = "By joining this program, you agree to the {terms} of Affiliate Programs.";
+"lng_star_ref_joined_title" = "Program joined";
+"lng_star_ref_joined_text" = "You can now copy the referral link.";
+"lng_star_ref_link_title" = "Referral Link";
+"lng_star_ref_link_about_channel" = "Share this link with your subscribers to earn a {amount} commission on their spending in {app} {duration}.";
+"lng_star_ref_link_about_user" = "Share this link with your friends to earn a {amount} commission on their spending in {app} {duration}.";
+"lng_star_ref_link_about_bot" = "Share this link with your users to earn a {amount} commission on their spending in {app} {duration}.";
+"lng_star_ref_link_recipient" = "Commissions will be sent to:";
+"lng_star_ref_link_copy" = "Copy Link";
+"lng_star_ref_link_copy_none" = "No one have opened {app} through this link.";
+"lng_star_ref_link_copy_users#one" = "{count} user have opened {app} through this link.";
+"lng_star_ref_link_copy_users#other" = "{count} users have opened {app} through this link.";
+"lng_star_ref_link_copied_title" = "Link copied to clipboard";
+"lng_star_ref_link_copied_text" = "Share this link and earn {amount} of what people who use it spend in {app}!";
+"lng_star_ref_stopped" = "This affiliate link is no longer active.";
+"lng_star_ref_revoke_title" = "Revoke Link";
+"lng_star_ref_revoke_text" = "Are you sure you want to revoke the link of {bot}?";
+"lng_star_ref_revoked_title" = "Link removed";
+"lng_star_ref_revoked_text" = "It will no longer work.";
+
+"lng_stars_rating_title" = "Rating";
+"lng_stars_rating_future" = "Future Rating";
+"lng_stars_rating_updates#one" = "in {count} day";
+"lng_stars_rating_updates#other" = "in {count} days";
+"lng_stars_rating_pending#one" = "The rating will update {when}.\n{count} point is pending. {link}";
+"lng_stars_rating_pending#other" = "The rating will update {when}.\n{count} points are pending. {link}";
+"lng_stars_rating_pending_preview" = "Preview {arrow}";
+"lng_stars_rating_pending_back" = "Back {arrow}";
+"lng_stars_rating_negative_label" = "Negative Rating";
+"lng_stars_rating_negative" = "A negative rating indicates that **{name}'s** payments are unreliable.";
+"lng_stars_rating_negative_your#one" = "A negative rating indicates that your payments are unreliable. Spend **{count} Star** to fix this issue.";
+"lng_stars_rating_negative_your#other" = "A negative rating indicates that your payments are unreliable. Spend **{count} Stars** to fix this issue.";
+"lng_stars_rating_about" = "This rating reflects **{name}'s** activity on Telegram. What affects it:";
+"lng_stars_rating_about_your" = "This rating reflects your activity on Telegram. What affects it:";
+"lng_stars_title_gifts_telegram" = "Gifts from Telegram";
+"lng_stars_about_gifts_telegram" = "{emoji} 100% of the Stars spent on gifts purchased from Telegram.";
+"lng_stars_title_gifts_users" = "Gifts and Posts from Users";
+"lng_stars_about_gifts_users" = "{emoji} 20% of the Stars spent on resold gifts, paid messages and channel posts.";
+"lng_stars_title_refunds" = "Refunds and Conversions";
+"lng_stars_about_refunds" = "{emoji} 10x of refunded Stars and 85% of bought gifts converted to Stars.";
+"lng_stars_rating_added" = "Added";
+"lng_stars_rating_deducted" = "Deducted";
+"lng_stars_rating_understood" = "Understood";
 
 "lng_manage_discussion_group" = "Discussion";
 "lng_manage_discussion_group_add" = "Add a group";
@@ -1619,6 +2194,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_manage_linked_channel_posted" = "All new posts from this channel are forwarded to the group.";
 "lng_manage_discussion_group_warning" = "\"Chat history for new members\" will be switched to **Visible**.";
 
+"lng_manage_monoforum" = "Direct Messages";
+"lng_manage_monoforum_off" = "Off";
+"lng_manage_monoforum_free" = "Free";
+"lng_manage_monoforum_allow" = "Allow Channel Messages";
+"lng_manage_monoforum_price" = "Price for each message";
+"lng_manage_monoforum_about" = "Allow users to send messages to your channel, with the option to charge a fee for each message.";
+"lng_manage_monoforum_price_about" = "Your channel will receive {percent} of the selected fee ({amount}) for each incoming message.";
+"lng_manage_monoforum_link_subtitle" = "Link to direct messages";
+
 "lng_manage_history_visibility_title" = "Chat history for new members";
 "lng_manage_history_visibility_shown" = "Visible";
 "lng_manage_history_visibility_shown_about" = "New members will see messages that were sent before they joined.";
@@ -1746,6 +2330,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_sure_delete_contact" = "Are you sure you want to delete {contact} from your contact list?";
 "lng_sure_delete_history" = "Are you sure you want to delete all message history with {contact}?\n\nThis action cannot be undone.";
 "lng_sure_delete_group_history" = "Are you sure you want to delete all messages in \"{group}\"?\n\nThis action cannot be undone.";
+"lng_sure_delete_channel_history" = "Are you sure you want to delete all messages in \"{channel}\"?\n\n**This action cannot be undone.**";
 "lng_sure_delete_and_exit" = "Are you sure you want to delete all message history and leave «{group}»?\n\nThis action cannot be undone.";
 "lng_sure_leave_channel" = "Are you sure you want to leave\nthis channel?";
 "lng_sure_delete_channel" = "Are you sure you want to delete this channel? All subscribers will be removed and all messages will be lost.";
@@ -1802,6 +2387,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_changed_title" = "{from} changed group name to «{title}»";
 "lng_action_changed_title_channel" = "Channel name was changed to «{title}»";
 "lng_action_created_chat" = "{from} created the group «{title}»";
+"lng_action_created_monoforum" = "Direct messages were enabled in this channel.";
 "lng_action_ttl_changed" = "{from} set messages to auto-delete in {duration}";
 "lng_action_ttl_changed_you" = "You set messages to auto-delete in {duration}";
 "lng_action_ttl_changed_channel" = "Messages in this channel will be automatically deleted after {duration}";
@@ -1839,6 +2425,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_payment_init_recurring_for" = "You successfully transferred {amount} to {user} for {invoice} and allowed future recurring payments";
 "lng_action_payment_init_recurring" = "You successfully transferred {amount} to {user} and allowed future recurring payments";
 "lng_action_payment_used_recurring" = "You were charged {amount} via recurring payment";
+"lng_action_payment_bot_done" = "Bot connected to this account received {amount}";
+"lng_action_payment_bot_recurring" = "Bot connected to this account received {amount} via recurring payment";
 "lng_action_took_screenshot" = "{from} took a screenshot!";
 "lng_action_you_took_screenshot" = "You took a screenshot!";
 "lng_action_bot_allowed_from_domain" = "You allowed this bot to message you when you logged in on {domain}.";
@@ -1855,6 +2443,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_you_proximity_reached" = "You are now within {distance} from {user}";
 "lng_action_you_theme_changed" = "You changed the chat theme to {emoji}";
 "lng_action_theme_changed" = "{from} changed the chat theme to {emoji}";
+"lng_action_you_gift_theme_changed" = "You set {name} as a new theme for this chat.";
+"lng_action_gift_theme_changed" = "{from} set {name} as a new theme for this chat.";
 "lng_action_you_theme_disabled" = "You disabled the chat theme";
 "lng_action_theme_disabled" = "{from} disabled the chat theme";
 "lng_action_proximity_distance_m#one" = "{count} meter";
@@ -1863,25 +2453,93 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_proximity_distance_km#other" = "{count} km";
 "lng_action_webview_data_done" = "Data from the \"{text}\" button was transferred to the bot.";
 "lng_action_gift_received" = "{user} sent you a gift for {cost}";
+"lng_action_gift_received_sold" = "{user} sold you a gift for {cost}";
+"lng_action_gift_unique_received" = "{user} sent you a unique collectible item";
 "lng_action_gift_sent" = "You sent a gift for {cost}";
+"lng_action_gift_sent_sold" = "You sold a gift for {cost}";
+"lng_action_gift_unique_sent" = "You sent a unique collectible item";
+"lng_action_gift_upgraded" = "{user} turned the gift from you into a unique collectible";
+"lng_action_gift_upgraded_channel" = "{user} turned this gift to {channel} into a unique collectible";
+"lng_action_gift_upgraded_self_channel" = "You turned this gift to {channel} into a unique collectible";
+"lng_action_gift_upgraded_mine" = "You turned the gift from {user} into a unique collectible";
+"lng_action_gift_upgraded_self" = "You turned this gift into a unique collectible";
+"lng_action_gift_sent_upgrade_other" = "{from} sent an upgrade worth {cost} for the gift you received from {user}.";
+"lng_action_gift_sent_upgrade_self_other" = "You sent an upgrade worth {cost} for the gift {name} received from {user}.";
+"lng_action_gift_sent_upgrade" = "{from} sent an upgrade worth {cost} for your gift.";
+"lng_action_gift_sent_upgrade_self" = "You sent an upgrade worth {cost} for this gift.";
+"lng_action_gift_sent_upgrade_self_channel" = "You sent an upgrade worth {cost} for your gift to {name}.";
+"lng_action_gift_upgraded_helped" = "{user} unpacked the gift that you helped to upgrade.";
+"lng_action_gift_upgraded_helped_self" = "You unpacked the gift that {user} helped to upgrade.";
+"lng_action_gift_transferred" = "{user} transferred you a gift";
+"lng_action_gift_transferred_channel" = "{user} transferred a gift to {channel}";
+"lng_action_gift_transferred_unknown" = "Someone transferred you a gift";
+"lng_action_gift_transferred_unknown_channel" = "Someone transferred a gift to {channel}";
+"lng_action_gift_transferred_self" = "You transferred a unique collectible";
+"lng_action_gift_displayed_self" = "You've started displaying {name} on your Telegram profile page.";
+"lng_action_gift_transferred_self_channel" = "You transferred a gift to {channel}";
+"lng_action_gift_transferred_mine" = "You transferred a gift to {user}";
+"lng_action_gift_crafted" = "You crafted a new gift";
 "lng_action_gift_received_anonymous" = "Unknown user sent you a gift for {cost}";
+"lng_action_gift_sent_channel" = "{user} sent a gift to {name} for {cost}";
+"lng_action_gift_sent_self_channel" = "You sent a gift to {name} for {cost}";
+"lng_action_gift_self_bought" = "You bought a gift for {cost}";
+"lng_action_gift_self_auction" = "You've successfully bought a gift in the auction for {cost}.";
+"lng_action_gift_auction_won" = "You won the auction with a bid of {cost}.";
+"lng_action_gift_self_subtitle" = "Saved Gift";
+"lng_action_gift_crafted_subtitle" = "Crafted Gift";
+"lng_action_gift_self_about#one" = "Display this gift on your page or convert it to **{count}** Star.";
+"lng_action_gift_self_about#other" = "Display this gift on your page or convert it to **{count}** Stars.";
+"lng_action_gift_self_about_unique" = "You can display this gift on your page or turn it into unique collectible and send to others.";
+"lng_action_gift_channel_about#one" = "Display this gift in channel's Gifts or convert it to **{count}** Star.";
+"lng_action_gift_channel_about#other" = "Display this gift in channel's Gifts or convert it to **{count}** Stars.";
+"lng_action_gift_channel_about_unique" = "You can display this gift in channel's Gifts or turn it into unique collectible.";
 "lng_action_gift_for_stars#one" = "{count} Star";
 "lng_action_gift_for_stars#other" = "{count} Stars";
+"lng_action_gift_for_ton#one" = "{count} Gram";
+"lng_action_gift_for_ton#other" = "{count} Grams";
 "lng_action_gift_got_subtitle" = "Gift from {user}";
 "lng_action_gift_got_stars_text#one" = "Display this gift on your page or convert it to **{count}** Star.";
 "lng_action_gift_got_stars_text#other" = "Display this gift on your page or convert it to **{count}** Stars.";
+"lng_action_gift_got_upgradable_text" = "Upgrade this gift to a unique collectible.";
+"lng_action_gift_got_gift_text" = "You can keep this gift on your page.";
+"lng_action_gift_can_remove_text" = "You can remove this gift from your page.";
+"lng_action_gift_got_gift_channel" = "You can keep this gift in channel's Gifts.";
+"lng_action_gift_can_remove_channel" = "You can remove this gift from channel's Gifts.";
 "lng_action_gift_sent_subtitle" = "Gift for {user}";
 "lng_action_gift_sent_text#one" = "{user} can display this gift on their page or convert it to {count} Star.";
 "lng_action_gift_sent_text#other" = "{user} can display this gift on their page or convert it to {count} Stars.";
+"lng_action_gift_sent_upgradable" = "{user} can upgrade this gift to a unique collectible.";
 "lng_action_gift_premium_months#one" = "{count} Month Premium";
 "lng_action_gift_premium_months#other" = "{count} Months Premium";
 "lng_action_gift_premium_about" = "Subscription for exclusive Telegram features.";
+"lng_action_gift_refunded" = "This gift was downgraded because a request to refund the payment related to this gift was made, and the money was returned.";
+"lng_action_gift_got_ton" = "Use Grams to suggest posts to channels.";
+"lng_action_gift_offer_incoming" = "An offer to buy this gift for {amount}.";
+"lng_action_gift_offer_you" = "You offered {cost} for {name}.";
+"lng_action_gift_offer_state_expires" = "This offer expires in {time}.";
+"lng_action_gift_offer_time_large" = "{hours} h";
+"lng_action_gift_offer_time_medium" = "{hours} h {minutes} m";
+"lng_action_gift_offer_time_small" = "{minutes} m";
+"lng_action_gift_offer_state_accepted" = "This offer was accepted.";
+"lng_action_gift_offer_state_rejected" = "This offer was rejected.";
+"lng_action_gift_offer_state_expired" = "This offer has expired.";
+"lng_action_gift_offer_sold" = "{user} sold {name} for {cost}.";
+"lng_action_gift_offer_sold_you" = "You sold {name} for {cost}.";
+"lng_action_gift_offer_decline" = "Reject";
+"lng_action_gift_offer_accept" = "Accept";
+"lng_action_gift_offer_expired" = "The offer from {user} to buy your {name} for {cost} has expired.";
+"lng_action_gift_offer_expired_your" = "Your offer to buy {name} for {cost} has expired.";
+"lng_action_gift_offer_declined" = "{user} rejected your offer to buy {name} for {cost}.";
+"lng_action_gift_offer_declined_you" = "You rejected {user}'s offer to buy your {name} for {cost}.";
 "lng_action_suggested_photo_me" = "You suggested this photo for {user}'s Telegram profile.";
 "lng_action_suggested_photo" = "{user} suggests this photo for your Telegram profile.";
 "lng_action_suggested_photo_button" = "View Photo";
 "lng_action_suggested_video_me" = "You suggested this photo for {user}'s Telegram profile.";
 "lng_action_suggested_video" = "{user} suggests this photo for your Telegram profile.";
 "lng_action_suggested_video_button" = "View Photo";
+"lng_action_suggested_birthday_me" = "You suggest {user} add a date of birth:";
+"lng_action_suggested_birthday" = "{user} suggests you add your date of birth:";
+"lng_action_suggested_birtday_button" = "View";
 "lng_action_attach_menu_bot_allowed" = "You allowed this bot to message you when you added it to your attachment menu.";
 "lng_action_webapp_bot_allowed" = "You allowed this bot to message you in its web-app.";
 "lng_action_set_wallpaper_me" = "You set a new wallpaper for this chat";
@@ -1894,14 +2552,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_topic_created_inside" = "Topic created";
 "lng_action_topic_closed_inside" = "Topic closed";
 "lng_action_topic_reopened_inside" = "Topic reopened";
+"lng_action_topic_closed_inside_by" = "{from} closed the topic";
+"lng_action_topic_reopened_inside_by" = "{from} reopened the topic";
 "lng_action_topic_hidden_inside" = "Topic hidden";
 "lng_action_topic_unhidden_inside" = "Topic unhidden";
 "lng_action_topic_created" = "The topic \"{topic}\" was created";
 "lng_action_topic_closed" = "\"{topic}\" was closed";
 "lng_action_topic_reopened" = "\"{topic}\" was reopened";
+"lng_action_topic_closed_by" = "{from} closed \"{topic}\"";
+"lng_action_topic_reopened_by" = "{from} reopened \"{topic}\"";
 "lng_action_topic_hidden" = "\"{topic}\" was hidden";
 "lng_action_topic_unhidden" = "\"{topic}\" was unhidden";
 "lng_action_topic_placeholder" = "topic";
+"lng_action_topic_bot_thread" = "thread";
 "lng_action_topic_renamed" = "{from} renamed the {link} to \"{title}\"";
 "lng_action_topic_icon_changed" = "{from} changed the {link} icon to {emoji}";
 "lng_action_topic_icon_removed" = "{from} removed the {link} icon";
@@ -1924,10 +2587,98 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_giveaway_results_credits#other" = "{count} winners of the giveaway were randomly selected by Telegram and received their prize.";
 "lng_action_giveaway_results_credits_some" = "Some winners of the giveaway were randomly selected by Telegram and received their prize.";
 "lng_action_giveaway_results_none" = "No winners of the giveaway could be selected.";
+"lng_action_boost_apply_me" = "You boosted the group";
 "lng_action_boost_apply#one" = "{from} boosted the group";
 "lng_action_boost_apply#other" = "{from} boosted the group {count} times";
 "lng_action_set_chat_intro" = "{from} added the message below for all empty chats. How?";
 "lng_action_payment_refunded" = "{peer} refunded {amount}";
+"lng_action_paid_message_sent#one" = "You paid {count} Star to {action}";
+"lng_action_paid_message_sent#other" = "You paid {count} Stars to {action}";
+"lng_action_paid_message_one" = "send a message";
+"lng_action_paid_message_some#one" = "send {count} message";
+"lng_action_paid_message_some#other" = "send {count} messages";
+"lng_action_paid_message_got#one" = "You received {count} Star from {name}";
+"lng_action_paid_message_got#other" = "You received {count} Stars from {name}";
+"lng_action_paid_message_refund#one" = "{from} refunded {count} Star to you";
+"lng_action_paid_message_refund#other" = "{from} refunded {count} Stars to you";
+"lng_action_paid_message_refund_self#one" = "You refunded {count} Star to {name}";
+"lng_action_paid_message_refund_self#other" = "You refunded {count} Stars to {name}";
+"lng_action_message_price_free" = "Messages are now free in this group.";
+"lng_action_message_price_paid#one" = "Messages now cost {count} Star each in this group.";
+"lng_action_message_price_paid#other" = "Messages now cost {count} Stars each in this group.";
+"lng_action_direct_messages_enabled" = "Channel enabled Direct Messages.";
+"lng_action_direct_messages_paid#one" = "Channel allows Direct Messages for {count} Star each.";
+"lng_action_direct_messages_paid#other" = "Channel allows Direct Messages for {count} Stars each.";
+"lng_action_direct_messages_disabled" = "Channel disabled Direct Messages.";
+"lng_action_todo_marked_done" = "{from} marked {tasks} as done.";
+"lng_action_todo_marked_done_self" = "You marked {tasks} as done.";
+"lng_action_todo_marked_not_done" = "{from} marked {tasks} as not done.";
+"lng_action_todo_marked_not_done_self" = "You marked {tasks} as not done.";
+"lng_action_todo_added" = "{from} added {tasks} to the list.";
+"lng_action_todo_added_self" = "You added {tasks} to the list.";
+"lng_action_poll_added_answer" = "{from} added \"{option}\" to the poll.";
+"lng_action_poll_added_answer_self" = "You added \"{option}\" to the poll.";
+"lng_action_poll_deleted_answer" = "{from} removed \"{option}\" from the poll.";
+"lng_action_poll_deleted_answer_self" = "You removed \"{option}\" from the poll.";
+"lng_action_todo_tasks_fallback#one" = "task";
+"lng_action_todo_tasks_fallback#other" = "{count} tasks";
+"lng_action_todo_tasks_and_one" = "{tasks}, {task}";
+"lng_action_todo_tasks_and_last" = "{tasks} and {task}";
+"lng_action_suggest_success_stars#one" = "{from} has received {count} Star for publishing post.";
+"lng_action_suggest_success_stars#other" = "{from} has received {count} Stars for publishing post.";
+"lng_action_suggest_success_ton#one" = "{from} has received {count} Gram for publishing post.";
+"lng_action_suggest_success_ton#other" = "{from} has received {count} Grams for publishing post.";
+"lng_action_suggest_refund_user" = "User refunded the Stars so that post was deleted.";
+"lng_action_suggest_refund_admin" = "Admin deleted the post early so that the price was refunded to the user.";
+"lng_action_post_rejected" = "The post was rejected.";
+"lng_action_not_enough_funds" = "Transaction failed.";
+"lng_you_paid_stars#one" = "You paid {count} Star.";
+"lng_you_paid_stars#other" = "You paid {count} Stars.";
+"lng_action_stake_game_nothing" = "{from} didn't win anything";
+"lng_action_stake_game_nothing_you" = "You didn't win anything";
+"lng_action_stake_game_won" = "{from} won {amount}";
+"lng_action_stake_game_won_you" = "You won {amount}";
+"lng_action_stake_game_lost" = "{from} lost {amount}";
+"lng_action_stake_game_lost_you" = "You lost {amount}";
+"lng_action_change_creator" = "{from} made {user} the new main admin of the group.";
+"lng_action_new_creator_pending" = "{user} will become the new main admin in 7 days if {from} does not return.";
+"lng_action_managed_bot_created" = "{from} created a bot {bot}.";
+
+"lng_create_bot_title" = "Create Bot";
+"lng_create_bot_subtitle" = "{bot} would like to create and manage a chatbot on your behalf.";
+"lng_create_bot_name_placeholder" = "Bot Name";
+"lng_create_bot_username_placeholder" = "Bot Username";
+"lng_create_bot_username_available" = "{username} is available.";
+"lng_create_bot_username_link" = "Link: {link}";
+"lng_create_bot_username_taken" = "This username is already taken.";
+"lng_create_bot_username_bad_symbols" = "Username can only contain a-z, 0-9, and underscores.";
+"lng_create_bot_username_too_short" = "Username must be at least 5 characters.";
+"lng_create_bot_button" = "Create";
+"lng_managed_bot_label" = "{icon} Created and managed by {bot}.";
+"lng_managed_bot_ready" = "**{name}** is ready!\n\nClick **Start** below to test your new chatbot. Its behavior is defined by **{parent}**.";
+"lng_managed_bot_created_title" = "{name} created!";
+"lng_managed_bot_created_text" = "{parent_name} will manage this bot for you.";
+"lng_managed_bot_edit_photo" = "You can edit your bot's profile picture {link}";
+"lng_managed_bot_edit_photo_link" = "here {arrow}";
+"lng_managed_bot_set_photo" = "Set Profile Photo";
+
+"lng_create_bot_no_manage" = "{bot} doesn't have Bot Management Mode enabled.";
+
+"lng_bots_create_limit#one" = "Subscribe to {link} to create up to {premium_count} bots, or delete one of your **{count}** bot via {bot}.";
+"lng_bots_create_limit#other" = "Subscribe to {link} to create up to {premium_count} bots, or delete one of your **{count}** bots via {bot}.";
+"lng_bots_create_limit_link" = "Premium";
+"lng_bots_create_limit_final#one" = "You can create up to **{count}** bot. Delete your current ones via {bot}.";
+"lng_bots_create_limit_final#other" = "You can create up to **{count}** bots. Delete your current ones via {bot}.";
+
+"lng_stake_game_title" = "Emoji Stake";
+"lng_stake_game_beta" = "Beta";
+"lng_stake_game_about" = "A limited play-test of the upcoming emoji mini-game platform for a small group of users.";
+"lng_stake_game_results" = "Results and Returns";
+"lng_stake_game_resets" = "A streak resets after 3 {emoji} or a stake change.";
+"lng_stake_game_your" = "Your stake";
+"lng_stake_game_save_and_roll" = "Save and Roll";
+
+"lng_you_joined_group" = "You joined this group";
 
 "lng_similar_channels_title" = "Similar channels";
 "lng_similar_channels_view_all" = "View all";
@@ -1937,10 +2688,29 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_similar_channels_premium_all_link" = "Telegram Premium";
 "lng_similar_channels_show_more" = "Show more channels";
 
+"lng_similar_bots_title" = "Similar bots";
+"lng_similar_bots_premium_all#one" = "Subscribe to {link} to unlock up to **{count}** similar bot.";
+"lng_similar_bots_premium_all#other" = "Subscribe to {link} to unlock up to **{count}** similar bots.";
+"lng_similar_bots_show_more" = "Show more bots";
+
 "lng_peer_gifts_title" = "Gifts";
 "lng_peer_gifts_about" = "These gifts were sent to {user} by other users.";
 "lng_peer_gifts_about_mine" = "These gifts were sent to you by other users. Click on a gift to convert it to Stars or change its privacy settings.";
-
+"lng_peer_gifts_empty_search" = "No matching gifts";
+"lng_peer_gifts_view_all" = "View All Gifts";
+"lng_peer_gifts_notify" = "Notify About New Gifts";
+"lng_peer_gifts_notify_enabled" = "You will receive a message from Telegram when your channel receives a gift.";
+"lng_peer_gifts_filter_by_value" = "Sort by Value";
+"lng_peer_gifts_filter_by_date" = "Sort by Date";
+"lng_peer_gifts_filter_unlimited" = "Unlimited";
+"lng_peer_gifts_filter_upgradable" = "Upgradeable";
+"lng_peer_gifts_filter_limited" = "Limited";
+"lng_peer_gifts_filter_unique" = "Unique";
+"lng_peer_gifts_filter_saved" = "Displayed";
+"lng_peer_gifts_filter_unsaved" = "Hidden";
+
+"lng_premium_gift_duration_days#one" = "for {count} day";
+"lng_premium_gift_duration_days#other" = "for {count} days";
 "lng_premium_gift_duration_months#one" = "for {count} month";
 "lng_premium_gift_duration_months#other" = "for {count} months";
 "lng_premium_gift_duration_years#one" = "for {count} year";
@@ -2055,11 +2825,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_invite_qr_title" = "Invite by QR Code";
 "lng_group_invite_qr_about" = "Everyone on Telegram can scan this code to join your group.";
 "lng_group_invite_qr_copied" = "QR Code copied to clipboard.";
-"lng_group_invite_request_approve" = "Request admin approval";
-"lng_group_invite_about_approve" = "Turn this on if you want users to join only after they are approved by an admin.";
-"lng_group_invite_about_no_approve" = "Turn this on if you want users to join only after they are approved by an admin.";
-"lng_group_invite_about_approve_channel" = "Turn this on if you want users to join only after they are approved by an admin.";
-"lng_group_invite_about_no_approve_channel" = "Turn this on if you want users to join only after they are approved by an admin.";
+"lng_group_invite_request_approve" = "Approve New Members";
+"lng_group_invite_request_approve_channel" = "Approve New Subscribers";
+"lng_group_invite_about_approve" = "Require admin approval for people joining through this link.";
+"lng_group_invite_about_approve_managed" = "Require admin approval for people joining through this link. Managed by {bot}.";
+"lng_group_invite_about_no_approve" = "Require admin approval for people joining through this link.";
+"lng_group_invite_about_approve_channel" = "Require admin approval for people joining through this link.";
+"lng_group_invite_about_approve_managed_channel" = "Require admin approval for people joining through this link. Managed by {bot}.";
+"lng_group_invite_about_no_approve_channel" = "Require admin approval for people joining through this link.";
+"lng_group_invite_about_approve_disabled" = "This option is unavailable because anyone can join and send messages through the public group link.";
+"lng_group_invite_about_approve_disabled_channel" = "This option is unavailable because anyone can join the channel through the public channel link.";
+"lng_group_invite_approval_required" = "approval required";
 "lng_group_invite_subscription" = "Require Monthly Fee";
 "lng_group_invite_subscription_ph" = "Stars Amount per month";
 "lng_group_invite_subscription_price" = "~{cost} / month";
@@ -2081,6 +2857,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_request_about_channel" = "This channel accepts new subscribers only after they are approved by its admins.";
 "lng_group_request_sent" = "You will be added to the group once an admin approves your request.";
 "lng_group_request_sent_channel" = "You will be added to the channel once its admins approve your request.";
+"lng_group_request_declined" = "Your request to join the group was declined.";
+"lng_group_request_declined_channel" = "Your request to join the channel was declined.";
 "lng_group_requests_pending#one" = "{count} join request";
 "lng_group_requests_pending#other" = "{count} join requests";
 "lng_group_requests_pending_user" = "{user} requested to join";
@@ -2097,11 +2875,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_channel_public_link_copied" = "Link copied to clipboard.";
 "lng_context_about_private_link" = "This link will only work for members of this chat.";
+"lng_public_post_private_hint_ctrl" = "Use Ctrl+Click to copy a non-public link.";
+"lng_public_post_private_hint_cmd" = "Use Cmd+Click to copy a non-public link.";
 
 "lng_forwarded" = "Forwarded from {user}";
 "lng_forwarded_story" = "Story from {user}";
 "lng_forwarded_story_expired" = "This story has expired.";
 "lng_forwarded_date" = "Original: {date}";
+"lng_forwarded_forwarded_date" = "Forwarded date: {date}";
 "lng_forwarded_channel" = "Forwarded from {channel}";
 "lng_forwarded_psa_default" = "Forwarded from {channel}";
 "lng_forwarded_via" = "Forwarded from {user} via {inline_bot}";
@@ -2115,8 +2896,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_recommended_message_title" = "Recommended";
 "lng_edited" = "edited";
 "lng_commented" = "commented";
+"lng_approximate" = "appx.";
+"lng_repeated_daily" = "daily";
+"lng_repeated_weekly" = "weekly";
+"lng_repeated_biweekly" = "biweekly";
+"lng_repeated_monthly" = "monthly";
+"lng_repeated_every_month#one" = "{count}-monthly";
+"lng_repeated_every_month#other" = "{count}-monthly";
+"lng_repeated_yearly" = "yearly";
 "lng_edited_date" = "Edited: {date}";
 "lng_sent_date" = "Sent: {date}";
+"lng_edited_at" = "edited at {time}";
+"lng_edited_on" = "edited on {date} at {time}";
+"lng_sent_on" = "sent on {date} at {time}";
+"lng_approximate_about" = "Estimated date of video publishing.";
 "lng_views_tooltip#one" = "Views: {count}";
 "lng_views_tooltip#other" = "Views: {count}";
 "lng_forwards_tooltip#one" = "Shares: {count}";
@@ -2127,6 +2920,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_badge" = "channel";
 "lng_topic_author_badge" = "Topic Creator";
 "lng_fast_reply" = "Reply";
+"lng_fast_share_tooltip" = "Right-click to select a Recent Contact.";
 "lng_cancel_edit_post_sure" = "Cancel editing?";
 "lng_cancel_edit_post_yes" = "Yes";
 "lng_cancel_edit_post_no" = "No";
@@ -2137,6 +2931,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_allow_write_title" = "Allow messaging";
 "lng_bot_allow_write" = "Do you want to allow this bot to send you messages?";
 "lng_bot_allow_write_confirm" = "Allow";
+"lng_bot_new_chat" = "New Chat";
+"lng_bot_new_thread_title" = "New Thread";
+"lng_bot_new_thread_about" = "Type any message to create a new thread.";
+"lng_bot_show_threads_list" = "Show Threads List";
+"lng_bot_off_thread_ph" = "Off-thread message";
 
 "lng_attach_failed" = "Failed";
 "lng_attach_file" = "File";
@@ -2151,6 +2950,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_media_cancel" = "Cancel";
 "lng_media_video" = "Video";
 "lng_media_audio" = "Voice message";
+"lng_media_round" = "Video message";
 
 "lng_media_auto_settings" = "Automatic media download";
 "lng_media_auto_in_private" = "In private chats";
@@ -2158,6 +2958,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_media_auto_in_channels" = "In channels";
 "lng_media_auto_title" = "Automatically download";
 "lng_media_auto_play" = "Autoplay";
+"lng_media_auto_exceptions" = "Exceptions";
+"lng_media_auto_always" = "Always auto-download";
+"lng_media_auto_never" = "Never auto-download";
+"lng_media_auto_exceptions_add_users" = "Add users";
+"lng_media_auto_exceptions_add_groups" = "Add groups";
+"lng_media_auto_exceptions_add_channels" = "Add channels";
+"lng_media_auto_exceptions_users#one" = "{count} user";
+"lng_media_auto_exceptions_users#other" = "{count} users";
+"lng_media_auto_exceptions_groups#one" = "{count} group";
+"lng_media_auto_exceptions_groups#other" = "{count} groups";
+"lng_media_auto_exceptions_channels#one" = "{count} channel";
+"lng_media_auto_exceptions_channels#other" = "{count} channels";
+"lng_media_auto_always_title" = "Always auto-download";
+"lng_media_auto_never_title" = "Never auto-download";
 "lng_media_photo_title" = "Photos";
 "lng_media_video_title" = "Videos";
 "lng_media_video_messages_title" = "Round video messages";
@@ -2197,6 +3011,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_stickers_add" = "Choose sticker set";
 "lng_group_emoji" = "Select Emoji Pack";
 "lng_group_emoji_description" = "Choose an emoji pack that will be available to all members within the group.";
+"lng_collectible_emoji" = "Collectibles";
 
 "lng_premium" = "Premium";
 "lng_premium_free" = "Free";
@@ -2206,6 +3021,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_premium_unlock_emoji" = "Unlock Animated Emoji";
 "lng_premium_unlock_status" = "Unlock Emoji Status";
 
+"lng_premium_subscribe_months_24" = "2-Year";
 "lng_premium_subscribe_months_12" = "Annual";
 "lng_premium_subscribe_months_6" = "Semiannual";
 "lng_premium_subscribe_months_1" = "Monthly";
@@ -2225,8 +3041,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_premium_summary_title_subscribed" = "You are all set!";
 "lng_premium_summary_subtitle_gift#one" = "{user} has gifted you a {count}-month subscription to Telegram Premium.";
 "lng_premium_summary_subtitle_gift#other" = "{user} has gifted you a {count}-months subscription to Telegram Premium.";
+"lng_premium_summary_subtitle_gift_days#one" = "{user} has gifted you a {count}-day subscription to Telegram Premium.";
+"lng_premium_summary_subtitle_gift_days#other" = "{user} has gifted you a {count}-days subscription to Telegram Premium.";
 "lng_premium_summary_subtitle_gift_me#one" = "You gifted {user} a {count}-month subscription to Telegram Premium.";
 "lng_premium_summary_subtitle_gift_me#other" = "You gifted {user} a {count}-months subscription to Telegram Premium.";
+"lng_premium_summary_subtitle_gift_days_me#one" = "You gifted {user} a {count}-month subscription to Telegram Premium.";
+"lng_premium_summary_subtitle_gift_days_me#other" = "You gifted {user} a {count}-months subscription to Telegram Premium.";
 "lng_premium_summary_subtitle_wallpapers" = "Wallpapers for Both Sides";
 "lng_premium_summary_about_wallpapers" = "Set custom wallpapers for you and your chat partner.";
 "lng_premium_summary_subtitle_stories" = "Stories";
@@ -2267,11 +3087,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_premium_summary_about_business" = "Upgrade your account with business features such as location, opening hours and quick replies.";
 "lng_premium_summary_subtitle_effects" = "Message Effects";
 "lng_premium_summary_about_effects" = "Add over 500 animated effects to private messages.";
+"lng_premium_summary_subtitle_filter_tags" = "Tag Your Chats";
+"lng_premium_summary_about_filter_tags" = "Display folder names for each chat in the chat list.";
+"lng_premium_summary_subtitle_todo_lists" = "Checklists";
+"lng_premium_summary_about_todo_lists" = "Plan, assign, and complete tasks - seamlessly and efficiently.";
+"lng_premium_summary_subtitle_peer_colors" = "Name and Profile Colors";
+"lng_premium_summary_about_peer_colors" = "Choose a color and logo for your profile and replies to your messages.";
+"lng_premium_summary_subtitle_gifts" = "Telegram Gifts";
+"lng_premium_summary_about_gifts" = "Gifts are collectible items you can trade or showcase on your profile.";
+"lng_premium_summary_subtitle_no_forwards" = "Disable Sharing";
+"lng_premium_summary_about_no_forwards" = "Restrict forwarding, copying, and saving content from your private chats.";
+"lng_premium_summary_subtitle_ai_compose" = "AI Tools";
+"lng_premium_summary_about_ai_compose" = "Transform your messages and entire chats in your preferred style and language.";
 "lng_premium_summary_bottom_subtitle" = "About Telegram Premium";
 "lng_premium_summary_bottom_about" = "While the free version of Telegram already gives its users more than any other messaging application, **Telegram Premium** pushes its capabilities even further.\n\n**Telegram Premium** is a paid option, because most Premium Features require additional expenses from Telegram to third parties such as data center providers and server manufacturers. Contributions from **Telegram Premium** users allow us to cover such costs and also help Telegram stay free for everyone.";
 "lng_premium_summary_button" = "Subscribe for {cost} per month";
 
 "lng_premium_summary_new_badge" = "NEW";
+"lng_soon_badge" = "Soon";
 
 "lng_premium_success" = "You've successfully subscribed to Telegram Premium!";
 "lng_premium_unavailable" = "This feature requires subscription to **Telegram Premium**.\n\nUnfortunately, **Telegram Premium** is not available in your region.";
@@ -2338,6 +3171,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_premium_double_limits_subtitle_accounts" = "Connected Accounts";
 "lng_premium_double_limits_about_accounts#one" = "Connect {count} account with different mobile numbers";
 "lng_premium_double_limits_about_accounts#other" = "Connect {count} accounts with different mobile numbers";
+
+"lng_premium_double_limits_subtitle_similar_channels" = "Similar Channel";
+"lng_premium_double_limits_about_similar_channels#one" = "View up to {count} similar channel";
+"lng_premium_double_limits_about_similar_channels#other" = "View up to {count} similar channels";
 //
 
 "lng_premium_gift_title" = "Gift Telegram Premium";
@@ -2392,6 +3229,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_credits_summary_title" = "Telegram Stars";
 "lng_credits_summary_about" = "Buy Stars to unlock content and services in miniapps on Telegram.";
+"lng_credits_currency_summary_title" = "Gram Balance";
+"lng_credits_currency_summary_about" = "Offer Grams to submit post suggestions to channels on Telegram.";
+"lng_credits_currency_summary_subtitle" = "You can withdraw your Grams using Fragment.";
+"lng_credits_currency_summary_in_button" = "Top-up via Fragment";
+"lng_credits_currency_summary_in_subtitle" = "You can top-up your Grams balance via Fragment.";
 "lng_credits_summary_options_subtitle" = "Choose package";
 "lng_credits_summary_options_credits#one" = "{count} Star";
 "lng_credits_summary_options_credits#other" = "{count} Stars";
@@ -2399,12 +3241,31 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_summary_options_about" = "By proceeding and purchasing Stars, you agree with the {link}.";
 "lng_credits_summary_options_about_link" = "Terms and Conditions";
 "lng_credits_summary_options_about_url" = "https://telegram.org/tos/stars";
+"lng_credits_summary_earn_title" = "Earn Stars";
+"lng_credits_summary_earn_about" = "Distribute links to mini apps and earn a share of their revenue in Stars.";
 "lng_credits_summary_history_tab_full" = "All Transactions";
 "lng_credits_summary_history_tab_in" = "Incoming";
 "lng_credits_summary_history_tab_out" = "Outgoing";
 "lng_credits_summary_history_entry_inner_in" = "In-App Purchase";
 "lng_credits_summary_balance" = "Balance";
+"lng_credits_commission" = "{amount} commission";
+"lng_credits_paid_messages_fee_live_reaction" = "Fee for Live Story Reaction";
+"lng_credits_paid_messages_fee#one" = "Fee for {count} Message";
+"lng_credits_paid_messages_fee#other" = "Fee for {count} Messages";
+"lng_credits_paid_messages_fee_about" = "You receive {percent} of the price that you charge for each incoming message. {link}";
+"lng_credits_paid_messages_fee_about_link" = "Change Fee {emoji}";
+"lng_credits_paid_messages_full" = "Full Price";
+"lng_credits_premium_gift_duration" = "Duration";
+"lng_credits_more_options" = "More Options";
+"lng_credits_balance_me" = "your balance";
+"lng_credits_balance_me_count" = "Your balance: {emoji} {amount}";
+"lng_credits_buy_button" = "Top Up Balance";
+"lng_credits_topup_button" = "{emoji} Top Up Balance";
+"lng_credits_buy_button_short" = "Top Up";
+"lng_credits_stats_button_short" = "Stats";
+"lng_credits_stats_button" = "View Statistics";
 "lng_credits_gift_button" = "Gift Stars to Friends";
+"lng_credits_earn_button" = "Earn Stars from Mini Apps";
 "lng_credits_box_out_title" = "Confirm Your Purchase";
 "lng_credits_box_out_sure#one" = "Do you want to buy **\"{text}\"** in **{bot}** for **{count} Star**?";
 "lng_credits_box_out_sure#other" = "Do you want to buy **\"{text}\"** in **{bot}** for **{count} Stars**?";
@@ -2412,6 +3273,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_box_out_media#other" = "Do you want to unlock {media} in {chat} for **{count} Stars**?";
 "lng_credits_box_out_media_user#one" = "Do you want to unlock {media} from {user} for **{count} Star**?";
 "lng_credits_box_out_media_user#other" = "Do you want to unlock {media} from {user} for **{count} Stars**?";
+"lng_credits_box_out_subscription_bot#one" = "Do you want to subscribe to **{title}** in **{recipient}** for **{count}** star per month?";
+"lng_credits_box_out_subscription_bot#other" = "Do you want to subscribe to **{title}** in **{recipient}** for **{count}** stars per month?";
+"lng_credits_box_out_subscription_business#one" = "Do you want to subscribe to **{title}** from **{recipient}** for **{count}** star per month?";
+"lng_credits_box_out_subscription_business#other" = "Do you want to subscribe to **{title}** from **{recipient}** for **{count}** stars per month?";
+"lng_credits_box_out_subscription_confirm#one" = "Subscribe for {emoji} {count} / month";
+"lng_credits_box_out_subscription_confirm#other" = "Subscribe for {emoji} {count} / month";
 "lng_credits_box_out_photo" = "a photo";
 "lng_credits_box_out_photos#one" = "{count} photo";
 "lng_credits_box_out_photos#other" = "{count} photos";
@@ -2433,6 +3300,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_summary_in_toast_about#other" = "**{count}** Stars added to your balance.";
 "lng_credits_box_history_entry_peer" = "Recipient";
 "lng_credits_box_history_entry_peer_in" = "From";
+"lng_credits_box_history_entry_gift_from" = "Gift From";
 "lng_credits_box_history_entry_via" = "Via";
 "lng_credits_box_history_entry_play_market" = "Play Store";
 "lng_credits_box_history_entry_app_store" = "App Store";
@@ -2442,22 +3310,44 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_box_history_entry_giveaway_name" = "Received Prize";
 "lng_credits_box_history_entry_gift_sent" = "Sent Gift";
 "lng_credits_box_history_entry_gift_converted" = "Converted Gift";
+"lng_credits_box_history_entry_gift_transfer" = "Gift Transfer";
+"lng_credits_box_history_entry_gift_unavailable" = "Unavailable";
+"lng_credits_box_history_entry_gift_released" = "released by {name}";
+"lng_credits_box_history_entry_gift_sold_out" = "This gift has sold out";
 "lng_credits_box_history_entry_gift_out_about" = "With Stars, **{user}** will be able to unlock content and services on Telegram.\n{link}";
 "lng_credits_box_history_entry_gift_in_about" = "Use Stars to unlock content and services on Telegram. {link}";
 "lng_credits_box_history_entry_gift_about_link" = "See Examples {emoji}";
 "lng_credits_box_history_entry_gift_examples" = "Examples";
 "lng_credits_box_history_entry_ads" = "Ads Platform";
 "lng_credits_box_history_entry_premium_bot" = "Stars Top-Up";
+"lng_credits_box_history_entry_currency_in" = "Gram Top-Up";
+"lng_credits_box_history_entry_posts_search" = "Posts Search";
+"lng_credits_box_history_entry_api" = "Paid Broadcast";
+"lng_credits_box_history_entry_floodskip_about#one" = "{count} Message";
+"lng_credits_box_history_entry_floodskip_about#other" = "{count} Messages";
+"lng_credits_box_history_entry_floodskip_row" = "Messages";
 "lng_credits_box_history_entry_via_premium_bot" = "Premium Bot";
 "lng_credits_box_history_entry_id" = "Transaction ID";
 "lng_credits_box_history_entry_id_copied" = "Transaction ID copied to clipboard.";
+"lng_credits_box_history_entry_reason_star_ref" = "Affiliate Program";
+"lng_credits_box_history_entry_affiliate" = "Affiliate";
+"lng_credits_box_history_entry_miniapp" = "Mini App";
+"lng_credits_box_history_entry_referred" = "Referred User";
 "lng_credits_box_history_entry_success_date" = "Transaction date";
 "lng_credits_box_history_entry_success_url" = "Transaction link";
 "lng_credits_box_history_entry_media" = "Media";
+"lng_credits_box_history_entry_message" = "Message";
 "lng_credits_box_history_entry_about" = "You can dispute this transaction {link}.";
 "lng_credits_box_history_entry_about_link" = "here";
 "lng_credits_box_history_entry_reaction_name" = "Star Reaction";
 "lng_credits_box_history_entry_subscription" = "Monthly subscription fee";
+"lng_credits_box_history_entry_gift_upgrade" = "Collectible Upgrade";
+"lng_credits_box_history_entry_gift_sold" = "Gift Sale";
+"lng_credits_box_history_entry_gift_bought" = "Gift Purchase";
+"lng_credits_box_history_entry_gift_sold_to" = "To";
+"lng_credits_box_history_entry_gift_full_price" = "Full Price";
+"lng_credits_box_history_entry_gift_bought_from" = "From";
+"lng_credits_box_history_entry_gift_offer" = "Gift Offer";
 
 "lng_credits_subscription_section" = "My subscriptions";
 "lng_credits_box_subscription_title" = "Subscription";
@@ -2465,6 +3355,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_subscriber_subtitle" = "appx. {total} per month";
 
 "lng_credits_subscription_row_to" = "Subscription";
+"lng_credits_subscription_row_to_bot" = "Bot";
+"lng_credits_subscription_row_to_business" = "Business";
 "lng_credits_subscription_row_from" = "Subscribed";
 
 "lng_credits_subscription_row_next_on" = "Renews";
@@ -2475,20 +3367,29 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_subscription_on_about" = "If you cancel now, you will still be able to access your subscription until {date}.";
 
 "lng_credits_subscription_off_button" = "Renew Subscription";
+"lng_credits_subscription_off_rejoin_button" = "Subscribe again";
 "lng_credits_subscription_off_about" = "You have canceled your subscription.";
+"lng_credits_subscription_off_by_bot_about" = "{bot} has canceled your subscription.";
 
 "lng_credits_subscription_status_on" = "renews on {date}";
 "lng_credits_subscription_status_off" = "expires on {date}";
 "lng_credits_subscription_status_none" = "expired on {date}";
 "lng_credits_subscription_status_off_right" = "canceled";
 "lng_credits_subscription_status_none_right" = "expired";
+"lng_credits_subscription_status_off_by_bot_right" = "canceled\nby bot";
 
 "lng_credits_small_balance_title#one" = "{count} Star Needed";
 "lng_credits_small_balance_title#other" = "{count} Stars Needed";
 "lng_credits_small_balance_about" = "Buy **Stars** and use them on **{bot}** and other miniapps.";
 "lng_credits_small_balance_reaction" = "Buy **Stars** and send them to {channel} to support their posts.";
+"lng_credits_small_balance_video_stream" = "Buy **Stars** to send them to {name} to support their stream.";
 "lng_credits_small_balance_subscribe" = "Buy **Stars** and subscribe to **{channel}** and other channels.";
 "lng_credits_small_balance_star_gift" = "Buy **Stars** to send gifts to {user} and other contacts.";
+"lng_credits_small_balance_for_message" = "Buy **Stars** to send messages to {user}.";
+"lng_credits_small_balance_for_messages" = "Buy **Stars** to send messages.";
+"lng_credits_small_balance_for_suggest" = "Buy **Stars** to suggest post to {channel}.";
+"lng_credits_small_balance_for_offer" = "Buy **Stars** to offer for this gift.";
+"lng_credits_small_balance_for_search" = "Buy **Stars** to search through public posts.";
 "lng_credits_small_balance_fallback" = "Buy **Stars** to unlock content and services on Telegram.";
 "lng_credits_purchase_blocked" = "Sorry, you can't purchase this item with Telegram Stars.";
 "lng_credits_enough" = "You have enough stars at the moment. {link}";
@@ -2579,11 +3480,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_business_limit_reached#one" = "Limit of {count} message reached.";
 "lng_business_limit_reached#other" = "Limit of {count} messages reached.";
 
-"lng_chatbots_title" = "Chatbots";
-"lng_chatbots_about" = "Add a bot to your account to help you automatically process and respond to the messages you receive. {link}";
-"lng_chatbots_about_link" = "Learn more...";
 "lng_chatbots_placeholder" = "Enter bot URL or username";
-"lng_chatbots_add_about" = "Enter the link to the Telegram bot that you want to automatically process your chats.";
 "lng_chatbots_access_title" = "Chats accessible for the bot";
 "lng_chatbots_all_except" = "All 1-to-1 Chats Except...";
 "lng_chatbots_selected" = "Only Selected Chats";
@@ -2593,13 +3490,47 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_chatbots_include_button" = "Select Chats";
 "lng_chatbots_exclude_about" = "Select chats or entire chat categories which the bot will not have access to.";
 "lng_chatbots_permissions_title" = "Bot permissions";
+"lng_chatbots_warning_title" = "Warning";
+"lng_chatbots_warning_both_text" = "The bot {bot} will be able to **manage your gifts and stars**, including giving them away to other users.";
+"lng_chatbots_warning_gifts_text" = "The bot {bot} will be able to **manage your gifts**, including giving them away to other users.";
+"lng_chatbots_warning_stars_text" = "The bot {bot} will be able to **transfer your stars**.";
+"lng_chatbots_warning_username_text" = "The bot {bot} will be able to **set and remove usernames** for your account, which may result in the loss of your current username.";
+
+"lng_chatbots_manage_messages" = "Manage Messages";
+"lng_chatbots_read" = "Read Messages";
 "lng_chatbots_reply" = "Reply to Messages";
-"lng_chatbots_reply_about" = "The bot can only reply on your behalf in chats that were active during the last 24h.";
-"lng_chatbots_remove" = "Remove Bot";
+"lng_chatbots_mark_as_read" = "Mark Messages as Read";
+"lng_chatbots_delete_sent" = "Delete Sent Messages";
+"lng_chatbots_delete_received" = "Delete Received Messages";
+
+"lng_chatbots_manage_profile" = "Manage Profile";
+"lng_chatbots_edit_name" = "Edit Name";
+"lng_chatbots_edit_bio" = "Edit Bio";
+"lng_chatbots_edit_userpic" = "Edit Profile Picture";
+"lng_chatbots_edit_username" = "Edit Username";
+
+"lng_chatbots_manage_gifts" = "Manage Gifts and Stars";
+"lng_chatbots_view_gifts" = "View Gifts";
+"lng_chatbots_sell_gifts" = "Sell Gifts";
+"lng_chatbots_gift_settings" = "Change Gift Settings";
+"lng_chatbots_transfer_gifts" = "Transfer and Upgrade Gifts";
+"lng_chatbots_transfer_stars" = "Transfer Stars";
+
+"lng_chatbots_manage_stories" = "Manage Stories";
+
 "lng_chatbots_not_found" = "Chatbot not found.";
 "lng_chatbots_not_supported" = "This bot doesn't support Telegram Business yet.";
 "lng_chatbots_add" = "Add";
-"lng_chatbots_info_url" = "https://telegram.org/blog/telegram-business#chatbots-for-business";
+"lng_chatbots_remove_bot" = "Remove Bot";
+"lng_chatbots_leave_without_added_title" = "No Bot Added";
+"lng_chatbots_leave_without_added_text" = "You haven't added a bot to manage your account. Leave anyway?";
+"lng_chatbots_added_success" = "{bot} now manages your account.";
+
+"lng_chat_automation_title" = "Chat Automation";
+"lng_chat_automation_about" = "Add a bot to answer messages on your behalf.";
+"lng_chat_automation_add_about" = "Choose a bot to manage your chats automatically.";
+"lng_settings_chat_automation_label" = "Chat automation";
+"lng_settings_chat_automation_off" = "Off";
 "lng_chatbot_status_can_reply" = "bot manages this chat";
 "lng_chatbot_status_paused" = "bot paused";
 "lng_chatbot_status_views" = "bot has access to this chat";
@@ -2750,11 +3681,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_boost_group_needs_level_emoji#one" = "Your group needs to reach **Level {count}** to set emoji pack.";
 "lng_boost_group_needs_level_emoji#other" = "Your group needs to reach **Level {count}** to set emoji pack.";
 
+"lng_boost_channel_title_wear" = "Wear Item";
+"lng_boost_channel_needs_level_wear#one" = "Your channel needs **Level {count}** to wear collectibles.";
+"lng_boost_channel_needs_level_wear#other" = "Your channel needs **Level {count}** to wear collectibles.";
+
 "lng_boost_channel_ask" = "Ask your **Premium** subscribers to boost your channel with this link:";
 "lng_boost_channel_ask_button" = "Copy Link";
-"lng_boost_channel_or" = "or";
-"lng_boost_channel_gifting" = "Boost your channel by gifting your subscribers Telegram Premium. {link}";
-"lng_boost_channel_gifting_link" = "Get boosts >";
+//"lng_boost_channel_or" = "or";
+//"lng_boost_channel_gifting" = "Boost your channel by gifting your subscribers Telegram Premium. {link}";
+//"lng_boost_channel_gifting_link" = "Get boosts >";
+"lng_boost_group_ask" = "Ask your **Premium** members to boost your group with this link:";
+//"lng_boost_group_gifting" = "Boost your group by gifting your members Telegram Premium. {link}";
+
+"lng_boost_channel_title_autotranslate" = "Autotranslation of Messages";
+"lng_boost_channel_needs_level_autotranslate#one" = "Your channel needs to reach **Level {count}** to enable autotranslation of messages.";
+"lng_boost_channel_needs_level_autotranslate#other" = "Your channel needs to reach **Level {count}** to enable autotranslation of messages.";
 
 "lng_feature_stories#one" = "**{count}** Story Per Day";
 "lng_feature_stories#other" = "**{count}** Stories Per Day";
@@ -2774,6 +3715,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_feature_custom_background_group" = "Custom Group Background";
 "lng_feature_custom_emoji_pack" = "Custom Emoji Pack";
 "lng_feature_transcribe" = "Voice-to-Text Conversion";
+"lng_feature_autotranslate" = "Autotranslation of Messages";
+"lng_feature_profile_color_channel#one" = "**{count}** Color for Channel Cover";
+"lng_feature_profile_color_channel#other" = "**{count}** Colors for Channel Cover";
+"lng_feature_profile_color_group#one" = "**{count}** Color for Group Cover";
+"lng_feature_profile_color_group#other" = "**{count}** Colors for Group Cover";
+"lng_feature_profile_icon_channel" = "Custom Logo for Channel Cover";
+"lng_feature_profile_icon_group" = "Custom Logo for Group Cover";
+
+"lng_edit_topics_enable" = "Enable Topics";
+"lng_edit_topics_about" = "The group chat will be divided into topics created by admins or users.";
+"lng_edit_topics_layout" = "Topics layout";
+"lng_edit_topics_layout_about" = "Choose how topics appear for all members.";
+"lng_edit_topics_tabs" = "Tabs";
+"lng_edit_topics_list" = "List";
 
 "lng_giveaway_new_title" = "Boosts via Gifts";
 "lng_giveaway_new_about" = "Get more boosts for your channel by gifting Premium to your subscribers.";
@@ -2988,6 +3943,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_link_reason_unclaimed" = "Incomplete Giveaway";
 "lng_gift_link_reason_chosen" = "You were selected by the channel";
 "lng_gift_link_label_date" = "Date";
+"lng_gift_link_label_first_sale" = "First Sale";
+"lng_gift_link_label_last_sale" = "Last Sale";
+"lng_gift_link_label_value" = "Value";
 "lng_gift_link_also_send" = "You can also {link} to a friend as a gift.";
 "lng_gift_link_also_send_link" = "send this link";
 "lng_gift_link_use" = "Use Link";
@@ -3008,52 +3966,547 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_stars_incoming" = "Use Stars to unlock content and services on Telegram.";
 "lng_gift_until" = "Until";
 
+"lng_gift_ton_amount#one" = "{count} Gram";
+"lng_gift_ton_amount#other" = "{count} Grams";
+
+"lng_gift_premium_title" = "Premium Gift";
+"lng_gift_premium_text#one" = "Subscribe to **Telegram Premium** to send up to **{count}** of these gifts and unlock access to multiple additional features.";
+"lng_gift_premium_text#other" = "Subscribe to **Telegram Premium** to send up to **{count}** of these gifts and unlock access to multiple additional features.";
 "lng_gift_premium_or_stars" = "Gift Premium or Stars";
 "lng_gift_premium_subtitle" = "Gift Premium";
 "lng_gift_premium_about" = "Give {name} access to exclusive features with Telegram Premium. {features}";
 "lng_gift_premium_features" = "See Features >";
 "lng_gift_premium_label" = "Premium";
+"lng_gift_premium_by_stars" = "or {amount}";
 "lng_gift_stars_subtitle" = "Gift Stars";
 "lng_gift_stars_about" = "Give {name} gifts that can be kept on your profile or converted to Stars. {link}";
+"lng_gift_stars_about_collectibles" = "Collectible gifts are unique digital items you can exchange or sell. {link}";
 "lng_gift_stars_link" = "What are Stars >";
 "lng_gift_stars_limited" = "limited";
 "lng_gift_stars_sold_out" = "sold out";
+"lng_gift_stars_resale" = "resale";
+"lng_gift_stars_on_sale" = "on sale";
+"lng_gift_on_sale_for" = "On sale for {price}";
+"lng_gift_stars_premium" = "premium";
+"lng_gift_stars_auction" = "auction";
+"lng_gift_stars_auction_join" = "Join";
+"lng_gift_stars_auction_view" = "View";
+"lng_gift_stars_auction_soon" = "soon";
+"lng_gift_stars_auction_upgraded" = "upgraded";
+"lng_gift_stars_your_left#one" = "{count} left";
+"lng_gift_stars_your_left#other" = "{count} left";
+"lng_gift_stars_your_finished" = "none left";
 "lng_gift_stars_tabs_all" = "All Gifts";
-"lng_gift_stars_tabs_limited" = "Limited";
+"lng_gift_stars_tabs_my" = "My Gifts";
+"lng_gift_stars_tabs_my_empty" = "You don't have any gifts you can use as a profile cover.";
+"lng_gift_stars_tabs_my_empty_next" = "Browse gifts available for purchase {emoji}";
+"lng_gift_stars_tabs_collectibles" = "Collectibles";
 "lng_gift_send_title" = "Send a Gift";
 "lng_gift_send_message" = "Enter Message";
 "lng_gift_send_anonymous" = "Hide My Name";
+"lng_gift_send_pay_with_stars" = "Pay with {amount}";
+"lng_gift_send_stars_balance" = "Your balance is {amount}. {link}";
+"lng_gift_send_stars_balance_link" = "Get More Stars >";
+"lng_gift_send_anonymous_self" = "Hide my name and message from visitors to my profile.";
 "lng_gift_send_anonymous_about" = "You can hide your name and message from visitors to {user}'s profile. {recipient} will still see your name and message.";
+"lng_gift_send_anonymous_about_paid" = "You can hide your name from visitors to {user}'s profile. {recipient} will still see your name.";
+"lng_gift_send_anonymous_about_channel" = "You can hide your name and message from all visitors of this channel except its admins.";
+"lng_gift_send_unique" = "Make Unique for {price}";
+"lng_gift_send_unique_about" = "Enable this to let {user} turn your gift into a unique collectible. {link}";
+"lng_gift_send_unique_about_channel" = "Enable this to let the admins of {name} turn your gift into a unique collectible. {link}";
+"lng_gift_send_unique_link" = "Learn More >";
 "lng_gift_send_premium_about" = "Only {user} will see your message.";
+"lng_gift_send_limited_sold#one" = "{count} sold";
+"lng_gift_send_limited_sold#other" = "{count} sold";
+"lng_gift_send_limited_left#one" = "{count} left";
+"lng_gift_send_limited_left#other" = "{count} left";
 "lng_gift_send_button" = "Send a Gift for {cost}";
+"lng_gift_send_button_self" = "Buy a Gift for {cost}";
+"lng_gift_buy_resale_title" = "Buy {name}";
+"lng_gift_buy_resale_button" = "Buy for {cost}";
+"lng_gift_buy_resale_equals" = "Equals to {cost}";
+"lng_gift_buy_resale_only_ton" = "The seller only accepts Grams as payment.";
+"lng_gift_buy_resale_pay_stars" = "Pay in Stars";
+"lng_gift_buy_resale_pay_ton" = "Pay in Grams";
+"lng_gift_buy_resale_confirm" = "Do you want to buy {name} for {price} and gift it to {user}?";
+"lng_gift_buy_resale_confirm_self" = "Do you want to buy {name} for {price}?";
+"lng_gift_buy_price_change_title" = "Price change!";
+"lng_gift_buy_price_change_text" = "This gift price was changed and now is {price}. Do you still want to buy?";
 "lng_gift_sent_title" = "Gift Sent!";
+"lng_gift_sent_resale_done" = "{user} has been notified about your gift.";
+"lng_gift_sent_resale_done_self" = "{gift} is now yours.";
 "lng_gift_sent_about#one" = "You spent **{count}** Star from your balance.";
 "lng_gift_sent_about#other" = "You spent **{count}** Stars from your balance.";
+"lng_gift_sent_finished#one" = "You've already sent **{count}** of these gifts, and it's the limit.";
+"lng_gift_sent_finished#other" = "You've already sent **{count}** of these gifts, and it's the limit.";
+"lng_gift_sent_remains#one" = "You can send **{count}** more.";
+"lng_gift_sent_remains#other" = "You can send **{count}** more.";
 "lng_gift_limited_of_one" = "unique";
 "lng_gift_limited_of_count" = "1 of {amount}";
+"lng_gift_collectible_tag" = "gift";
+"lng_gift_burned_tag" = "burned";
+"lng_gift_crafted_tag" = "crafted";
+"lng_gift_uncommon_tag" = "uncommon";
+"lng_gift_rare_tag" = "rare";
+"lng_gift_epic_tag" = "epic";
+"lng_gift_legendary_tag" = "legendary";
+"lng_gift_view_unpack" = "Unpack";
 "lng_gift_anonymous_hint" = "Only you can see the sender's name.";
+"lng_gift_anonymous_hint_channel" = "Only admins of this channel can see the sender's name.";
 "lng_gift_hidden_hint" = "This gift is hidden. Only you can see it.";
-"lng_gift_visible_hint" = "This gift is visible to visitors of your page.";
+"lng_gift_hidden_unique" = "This gift is not displayed on your page.";
+"lng_gift_visible_hint" = "This gift is visible on your page.";
+"lng_gift_burned_message" = "This gift was burned in crafting.";
+"lng_gift_hidden_hint_channel" = "This gift is hidden from visitors of your channel.";
+"lng_gift_visible_hint_channel" = "This gift is visible in your channel's Gifts.";
+"lng_gift_in_blockchain" = "This gift is in TON blockchain. {link}";
+"lng_gift_in_blockchain_link_arrow" = "View {arrow}";
+"lng_gift_visible_hide_arrow" = "Hide {arrow}";
+"lng_gift_visible_show_arrow" = "Show {arrow}";
+"lng_gift_show_on_page" = "Display on my Page";
+"lng_gift_show_on_channel" = "Display in channel's Gifts";
 "lng_gift_availability" = "Availability";
 "lng_gift_from_hidden" = "Hidden User";
+"lng_gift_subtitle_birthdays" = "Birthdays";
+"lng_gift_recipient_search" = "Search people to send a gift to...";
+"lng_gift_list_birthday_status_today" = "{emoji} Birthday today";
+"lng_gift_list_birthday_status_yesterday" = "Birthday yesterday";
+"lng_gift_list_birthday_status_tomorrow" = "Birthday tomorrow";
+"lng_gift_self_status" = "buy yourself a gift";
+"lng_gift_self_title" = "Buy a Gift";
+"lng_gift_self_about" = "Buy yourself a gift to display on your page or reserve for later.\n\nLimited-edition gifts upgraded to collectibles can be gifted to others later.";
+"lng_gift_channel_title" = "Send a Gift";
+"lng_gift_channel_about" = "Select a gift to show appreciation for {name}.";
+"lng_gift_released_by" = "released by {name}";
+"lng_gift_unique_owner" = "Owner";
+"lng_gift_unique_address_copied" = "Address copied to clipboard.";
+"lng_gift_unique_telegram" = "Telegram";
+"lng_gift_unique_status" = "Status";
+"lng_gift_unique_status_non" = "Non-Unique";
+"lng_gift_unique_upgrade" = "Upgrade";
+"lng_gift_unique_upgrade_next" = "Upgrade Next Gift";
+"lng_gift_unique_gift_upgrade" = "Gift an Upgrade";
+"lng_gift_unique_number" = "Collectible #{index}";
+"lng_gift_unique_number_by" = "Collectible #{index} by {name}";
+"lng_gift_unique_model" = "Model";
+"lng_gift_unique_backdrop" = "Backdrop";
+"lng_gift_unique_symbol" = "Symbol";
+"lng_gift_unique_rarity" = "Only {percent} of such collectibles have this attribute.";
+"lng_gift_unique_sender" = "{from} sent you this gift on {date}";
+"lng_gift_unique_sender_you" = "You bought this gift on {date}";
+"lng_gift_unique_crafter_you" = "You crafted this gift on {date}";
+"lng_gift_unique_availability_label" = "Quantity";
+"lng_gift_unique_availability#one" = "{count} of {amount} issued";
+"lng_gift_unique_availability#other" = "{count} of {amount} issued";
+"lng_gift_unique_value" = "Value";
+"lng_gift_unique_value_learn_more" = "learn more";
+"lng_gift_unique_info" = "Gifted to {recipient} on {date}.";
+"lng_gift_unique_info_sender" = "Gifted by {from} to {recipient} on {date}.";
+"lng_gift_unique_info_sender_comment" = "Gifted by {from} to {recipient} on {date} with the comment \"{text}\".";
+"lng_gift_unique_info_reciever" = "Gifted to {recipient} on {date}.";
+"lng_gift_unique_info_reciever_comment" = "Gifted to {recipient} on {date} with the comment \"{text}\".";
+"lng_gift_unique_info_remove_title" = "Remove Description";
+"lng_gift_unique_info_remove_text" = "Do you want to permanently remove this description from your gift?";
+"lng_gift_unique_info_remove_confirm" = "Remove for {cost}";
+"lng_gift_unique_info_removed" = "Removed {name}'s Description!";
 "lng_gift_availability_left#one" = "{count} of {amount} left";
 "lng_gift_availability_left#other" = "{count} of {amount} left";
 "lng_gift_availability_none" = "None of {amount} left";
-"lng_gift_display_on_page" = "Display on my Page";
-"lng_gift_display_on_page_hide" = "Hide from my Page";
+"lng_gift_value_about_average" = "This is the average sale price of {gift} gifts on Telegram and Fragment over the past month.";
+"lng_gift_value_about_last" = "This is the price at which {gift} was last sold on {platform}.";
+"lng_gift_value_initial_sale" = "Initial Sale";
+"lng_gift_value_initial_price" = "Initial Price";
+"lng_gift_value_initial_price_value" = "{stars} ({amount})";
+"lng_gift_value_last_sale" = "Last Sale";
+"lng_gift_value_last_price" = "Last Price";
+"lng_gift_value_minimum_price" = "Minimum Price";
+"lng_gift_value_minimum_price_tooltip" = "{amount} is the floor price for {gift} gifts listed on Telegram and Fragment.";
+"lng_gift_vlaue_average_price" = "Average Price";
+"lng_gift_value_average_price_tooltip" = "{amount} is the average sale price of {gift} gifts on Telegram and Fragment over the past month.";
+"lng_gift_value_availability#one" = "{count} {emoji} for sale on {platform} {arrow}";
+"lng_gift_value_availability#other" = "{count} {emoji} for sale on {platform} {arrow}";
+"lng_gift_value_telegram" = "Telegram";
+"lng_gift_value_fragment" = "Fragment";
 "lng_gift_convert_to_stars#one" = "Convert to {count} Star";
 "lng_gift_convert_to_stars#other" = "Convert to {count} Stars";
 "lng_gift_convert_sure_title" = "Convert Gift to Stars";
-"lng_gift_convert_sure_text#one" = "Do you want to convert this gift from {user} to **{count} Star**?\n\nThis action cannot be undone.";
-"lng_gift_convert_sure_text#other" = "Do you want to convert this gift from {user} to **{count} Stars**?\n\nThis action cannot be undone.";
+"lng_gift_convert_sure_confirm#one" = "Do you want to convert this gift from {user} to **{count} Star**?";
+"lng_gift_convert_sure_confirm#other" = "Do you want to convert this gift from {user} to **{count} Stars**?";
+"lng_gift_convert_sure_confirm_channel#one" = "Do you want to convert this gift to {channel} to **{count} Star**?";
+"lng_gift_convert_sure_confirm_channel#other" = "Do you want to convert this gift to {channel} to **{count} Stars**?";
+"lng_gift_convert_sure_limit#one" = "Conversion is available for the next **{count} day**.";
+"lng_gift_convert_sure_limit#other" = "Conversion is available for the next **{count} days**.";
+"lng_gift_convert_sure_caution" = "This action cannot be undone. This will permanently destroy the gift.";
 "lng_gift_convert_sure" = "Convert";
 "lng_gift_display_done" = "The gift is now shown on your profile page.";
+"lng_gift_display_done_channel" = "The gift is now shown in channel's Gifts.";
 "lng_gift_display_done_hide" = "The gift is now hidden from your profile page.";
+"lng_gift_display_done_hide_channel" = "The gift is now hidden from channel's Gifts.";
+"lng_gift_pinned_done_title" = "{gift} pinned";
+"lng_gift_pinned_done" = "The gift will always be shown on top.";
+"lng_gift_pinned_done_replaced" = "replacing {gift}";
 "lng_gift_got_stars#one" = "You got **{count} Star** for this gift.";
 "lng_gift_got_stars#other" = "You got **{count} Stars** for this gift.";
+"lng_gift_channel_got#one" = "Channel got **{count} Star** for this gift.";
+"lng_gift_channel_got#other" = "Channel got **{count} Stars** for this gift.";
 "lng_gift_sold_out_title" = "Sold Out!";
 "lng_gift_sold_out_text#one" = "All {count} gift was already sold.";
 "lng_gift_sold_out_text#other" = "All {count} gifts were already sold.";
+"lng_gift_send_small" = "send a gift";
+"lng_gift_sell_small#one" = "sell for {count} Star";
+"lng_gift_sell_small#other" = "sell for {count} Stars";
+"lng_gift_upgrade_title" = "Upgrade Gift";
+"lng_gift_upgrade_about" = "Turn your gift into a unique collectible\nthat you can transfer or auction.";
+"lng_gift_upgrade_view_all" = "{emoji} View all variants {arrow}";
+"lng_gift_upgrade_preview_title" = "Make Unique";
+"lng_gift_upgrade_preview_about" = "Let {name} turn your gift into a unique collectible.";
+"lng_gift_upgrade_preview_about_channel" = "Let the admins of {name} turn your gift into a unique collectible.";
+"lng_gift_upgrade_unique_title" = "Unique";
+"lng_gift_upgrade_unique_about" = "Get a unique number, model, backdrop and symbol for your gift.";
+"lng_gift_upgrade_unique_about_user" = "{name} will get a unique number, model, backdrop and symbol for your gift.";
+"lng_gift_upgrade_unique_about_channel" = "Admins of {name} will get a unique number, model, backdrop and symbol for your gift.";
+"lng_gift_upgrade_transferable_title" = "Transferable";
+"lng_gift_upgrade_transferable_about" = "Send your upgraded gift to any of your friends on Telegram.";
+"lng_gift_upgrade_transferable_about_user" = "{name} will be able to send the gift to anyone on Telegram.";
+"lng_gift_upgrade_transferable_about_channel" = "Admins of {name} will be able to send the gift to anyone on Telegram.";
+"lng_gift_upgrade_tradable_title" = "Tradable";
+"lng_gift_upgrade_tradable_about" = "Sell or auction your gift on third-party NFT marketplaces.";
+"lng_gift_upgrade_tradable_about_user" = "{name} will be able to sell the gift on Telegram and NFT marketplaces.";
+"lng_gift_upgrade_tradable_about_channel" = "Admins of {name} will be able to sell the gift on Telegram and NFT marketplaces.";
+"lng_gift_upgrade_wearable_title" = "Wearable";
+"lng_gift_upgrade_wearable_about" = "Display gifts on your page and set them as profile covers or statuses.";
+"lng_gift_upgrade_button" = "Upgrade for {price}";
+"lng_gift_upgrade_decreases" = "Price decreases in {time}";
+"lng_gift_upgrade_see_table" = "See how this price will decrease {arrow}";
+"lng_gift_upgrade_prices_about" = "Upgrade cost drops every minute.";
+"lng_gift_upgrade_prices_title" = "Upgrade Cost";
+"lng_gift_upgrade_prices_subtitle" = "Users who upgrade their gifts first get collectibles with shorter numbers.";
+"lng_gift_upgrade_free" = "Upgrade for Free";
+"lng_gift_upgrade_confirm" = "Confirm";
+"lng_gift_upgrade_add_my" = "Add my name to the gift";
+"lng_gift_upgrade_add_my_comment" = "Add my name and comment";
+"lng_gift_upgrade_add_sender" = "Add sender's name to the gift";
+"lng_gift_upgrade_add_comment" = "Add sender's name and comment";
+"lng_gift_upgraded_title" = "Gift Upgraded";
+"lng_gift_upgraded_about" = "Your gift {name} now has unique attributes and can be transferred to others";
+"lng_gift_upgrade_gifted_title" = "Upgrade Gifted";
+"lng_gift_upgrade_gifted_about" = "Now {name} can turn your gift into a unique collectible.";
+"lng_gift_upgrade_gifted_about_channel" = "Now the admins of {name} can turn your gift into a unique collectible.";
+"lng_gift_transferred_title" = "Gift Transferred";
+"lng_gift_transferred_about" = "{name} was successfully transferred to {recipient}.";
+"lng_gift_transfer_title" = "Transfer {name}";
+"lng_gift_transfer_via_blockchain" = "Send via Blockchain";
+"lng_gift_transfer_password_title" = "Two-step verification";
+"lng_gift_transfer_password_description" = "Please enter your password to transfer.";
+"lng_gift_transfer_password_about" = "You can withdraw only if you have:";
+"lng_gift_transfer_confirm_title" = "Manage with Fragment";
+"lng_gift_transfer_confirm_text" = "You can use Fragment, a third-party service, to transfer {name} to your TON account. After that, you can manage it as an NFT with any TON wallet outside Telegram.\n\nYou can also move such NFTs back to your Telegram account via Fragment.";
+"lng_gift_transfer_confirm_button" = "Open Fragment";
+"lng_gift_transfer_unlocks_days#one" = "unlocks in {count} day";
+"lng_gift_transfer_unlocks_days#other" = "unlocks in {count} days";
+"lng_gift_transfer_unlocks_hours#one" = "unlocks in {count} hour";
+"lng_gift_transfer_unlocks_hours#other" = "unlocks in {count} hours";
+"lng_gift_transfer_unlocks_title" = "Unlocking in progress";
+"lng_gift_transfer_unlocks_about" = "{when}, you'll be able to send this collectible to any TON blockchain address outside Telegram for sale or auction.";
+"lng_gift_transfer_unlocks_when_days#one" = "In {count} day";
+"lng_gift_transfer_unlocks_when_days#other" = "In {count} days";
+"lng_gift_transfer_unlocks_when_hours#one" = "In {count} hour";
+"lng_gift_transfer_unlocks_when_hours#other" = "In {count} hours";
+"lng_gift_transfer_unlocks_update_title" = "Update required";
+"lng_gift_transfer_unlocks_update_about" = "Please update your Telegram application to the latest version.";
+"lng_gift_transfer_sure" = "Do you want to transfer ownership of {name} to {recipient}?";
+"lng_gift_transfer_sure_for" = "Do you want to transfer ownership of {name} to {recipient} for {price}?";
+"lng_gift_transfer_button" = "Transfer";
+"lng_gift_transfer_button_for" = "Transfer for {price}";
+"lng_gift_transfer_set_theme" = "Set as Theme in...";
+"lng_gift_transfer_choose" = "Choose Chat";
+"lng_gift_transfer_wear" = "Wear";
+"lng_gift_transfer_take_off" = "Take Off";
+"lng_gift_transfer_sell" = "Sell";
+"lng_gift_transfer_update" = "Change Price";
+"lng_gift_transfer_unlist" = "Unlist";
+"lng_gift_transfer_locked_title" = "Action Locked";
+"lng_gift_transfer_locked_text" = "Transfer this gift to your Telegram account on Fragment to unlock this action.";
+"lng_gift_offer_button" = "Offer to Buy";
+"lng_gift_offer_title" = "Offer to Buy";
+"lng_gift_offer_stars_about" = "Choose how many Stars you'd like to offer for {name}.";
+"lng_gift_offer_ton_about" = "Choose how many Grams you'd like to offer for {name}.";
+"lng_gift_offer_duration" = "Offer Duration";
+"lng_gift_offer_duration_about" = "Choose how long {user} can accept your offer. When the time expires, the amount will be refunded.";
+"lng_gift_offer_cost_button" = "Offer {cost}";
+"lng_gift_offer_reject_title" = "Reject Offer";
+"lng_gift_offer_confirm_reject" = "Are you sure you want to reject the offer from {user}?";
+"lng_gift_offer_confirm_accept" = "Do you want to sell {name} to {user} for {cost}?";
+"lng_gift_offer_you_get" = "You will receive {cost} after fees.";
+"lng_gift_offer_higher" = "The price you are offered is {percent} higher than the average price for {name}.";
+"lng_gift_offer_lower" = "The price you are offered is {percent} lower than the average price for {name}.";
+"lng_gift_offer_sell_for" = "Sell for {price}";
+"lng_gift_offer_confirm_title" = "Confirm Offer";
+"lng_gift_offer_confirm_text" = "Do you want to offer {cost} to {user} for {name}?";
+"lng_gift_offer_table_offer" = "Offer";
+"lng_gift_offer_table_fee" = "Fee";
+"lng_gift_offer_table_duration" = "Duration";
+"lng_gift_sell_unlist_title" = "Unlist {name}";
+"lng_gift_sell_unlist_sure" = "Are you sure you want to unlist your gift?";
+"lng_gift_sell_title" = "Price in Stars";
+"lng_gift_sell_about" = "You will receive {percent} of the selected amount.";
+"lng_gift_sell_amount#one" = "You will receive **{count}** Star.";
+"lng_gift_sell_amount#other" = "You will receive **{count}** Stars.";
+"lng_gift_sell_min_price#one" = "Minimum price is {count} Star.";
+"lng_gift_sell_min_price#other" = "Minimum price is {count} Stars.";
+"lng_gift_sell_only_ton" = "Only Accept Grams";
+"lng_gift_sell_only_ton_about" = "If the buyer pays you in Grams, there's no risk of refunds, unlike Stars payments.";
+"lng_gift_sell_amount_ton#one" = "You will receive **{count}** Gram.";
+"lng_gift_sell_amount_ton#other" = "You will receive **{count}** Grams.";
+"lng_gift_sell_min_price_ton#one" = "Minimum price is {count} Gram.";
+"lng_gift_sell_min_price_ton#other" = "Minimum price is {count} Grams.";
+"lng_gift_sell_title_ton" = "Price in Grams";
+"lng_gift_sell_put" = "Put for Sale";
+"lng_gift_sell_update" = "Update the Price";
+"lng_gift_sell_toast" = "{name} is now for sale!";
+"lng_gift_sell_updated" = "Sale price for {name} was updated.";
+"lng_gift_sell_removed" = "{name} is removed from sale.";
+"lng_gift_menu_show" = "Show";
+"lng_gift_menu_hide" = "Hide";
+"lng_gift_wear_title" = "Wear {name}";
+"lng_gift_wear_about" = "and get these benefits:";
+"lng_gift_wear_badge_title" = "Radiant Badge";
+"lng_gift_wear_badge_about" = "The glittering icon of this item will be displayed next to your name.";
+"lng_gift_wear_badge_about_channel" = "The glittering icon of this item will be displayed next to channel's name.";
+"lng_gift_wear_design_title" = "Unique Profile Design";
+"lng_gift_wear_design_about" = "Your profile page will get the color and the symbol of this item.";
+"lng_gift_wear_design_about_channel" = "Your channel page will get the color and the symbol of this item.";
+"lng_gift_wear_proof_title" = "Proof of Ownership";
+"lng_gift_wear_proof_about" = "Clicking the icon of this item next to your name will show its info and owner.";
+"lng_gift_wear_proof_about_channel" = "Clicking the icon of this item next to channel's name will show its info and owner.";
+"lng_gift_wear_start" = "Start Wearing";
+"lng_gift_wear_subscribe" = "Subscribe to {link} to wear collectibles.";
+"lng_gift_wear_start_toast" = "You put on {name}";
+"lng_gift_wear_end_toast" = "You took off {name}";
+"lng_gift_many_pinned_title" = "Too Many Pinned Gifts";
+"lng_gift_many_pinned_choose" = "Select a gift to unpin below";
+"lng_gift_resale_price" = "Price";
+"lng_gift_resale_number" = "Number";
+"lng_gift_resale_date" = "Date";
+"lng_gift_resale_count#one" = "{count} gift in resale";
+"lng_gift_resale_count#other" = "{count} gifts in resale";
+"lng_gift_resale_count_none" = "No listings";
+"lng_gift_resale_sort_price" = "Sort by Price";
+"lng_gift_resale_sort_date" = "Sort by Date";
+"lng_gift_resale_sort_number" = "Sort by Number";
+"lng_gift_resale_all_listings" = "All Listings";
+"lng_gift_resale_stars_only" = "For Stars Only";
+"lng_gift_resale_filter_all" = "Select All";
+"lng_gift_resale_model" = "Model";
+"lng_gift_resale_models#one" = "{count} Model";
+"lng_gift_resale_models#other" = "{count} Models";
+"lng_gift_resale_backdrop" = "Backdrop";
+"lng_gift_resale_backdrops#one" = "{count} Backdrop";
+"lng_gift_resale_backdrops#other" = "{count} Backdrops";
+"lng_gift_resale_symbol" = "Symbol";
+"lng_gift_resale_symbols#one" = "{count} Symbol";
+"lng_gift_resale_symbols#other" = "{count} Symbols";
+"lng_gift_resale_search_none" = "No gifts found for your search.";
+"lng_gift_resale_early" = "You will be able to resell this gift in {duration}.";
+"lng_gift_transfer_early" = "You will be able to transfer this gift in {duration}.";
+"lng_gift_resale_transfer_early_title" = "Try Later";
+"lng_gift_collection_add" = "Add Collection";
+"lng_gift_collection_new_title" = "Create a New Collection";
+"lng_gift_collection_new_button" = "New Collection";
+"lng_gift_collection_new_text" = "Choose a name for your collection and start adding your gifts there.";
+"lng_gift_collection_new_ph" = "Title";
+"lng_gift_collection_new_create" = "Create";
+"lng_gift_collection_empty_title" = "Organize Your Gifts";
+"lng_gift_collection_empty_text" = "Add some of your gifts to this collection.";
+"lng_gift_collection_all" = "All Gifts";
+"lng_gift_collection_add_title" = "Add Gifts";
+"lng_gift_collection_add_button" = "Add Gifts";
+"lng_gift_collection_share" = "Share Collection";
+"lng_gift_collection_edit" = "Edit Name";
+"lng_gift_collection_limit_title" = "Limit Reached";
+"lng_gift_collection_limit_text" = "Please remove one of the existing collections to add a new one.";
+"lng_gift_collection_delete" = "Delete Collection";
+"lng_gift_collection_delete_sure" = "Are you sure you want to delete this collection?";
+"lng_gift_collection_delete_button" = "Delete";
+"lng_gift_collection_add_to" = "Add to Collection";
+"lng_gift_collection_reorder" = "Reorder";
+"lng_gift_collection_reorder_exit" = "Apply Reorder";
+"lng_gift_collection_remove_from" = "Remove from Collection";
+"lng_gift_locked_title" = "Gift Locked";
+"lng_gift_craft_menu_button" = "Craft";
+"lng_gift_craft_info_title" = "Gift Crafting";
+"lng_gift_craft_info_about" = "Turn your gifts into rare, epic\nand legendary versions.";
+"lng_gift_craft_rare_title" = "Get Rare Models";
+"lng_gift_craft_rare_about" = "Select up to 4 gifts to craft a new exclusive model.";
+"lng_gift_craft_chance_title" = "Maximize Chances";
+"lng_gift_craft_chance_about" = "Combine more gifts to increase your odds of success.";
+"lng_gift_craft_affect_title" = "Affect the Result";
+"lng_gift_craft_affect_about" = "Use gifts with the same attribute to boost its chance.";
+"lng_gift_craft_start_button" = "Start Crafting";
+"lng_gift_craft_title" = "Craft Gift";
+"lng_gift_craft_about1" = "Add up to **4** gifts to craft new\n{gift}.";
+"lng_gift_craft_about2" = "If crafting fails, all used gifts\nwill be lost.";
+"lng_gift_craft_view_all" = "{emoji} View all craftable models {arrow}";
+"lng_gift_craft_chance_backdrop" = "{percent} chance the crafted gift will have **{name}** background.";
+"lng_gift_craft_chance_symbol" = "{percent} chance the crafted gift will have **{name}** symbol.";
+"lng_gift_craft_button" = "Craft {gift}";
+"lng_gift_craft_button_chance" = "{percent} Success Chance";
+"lng_gift_craft_select_title" = "Select Gifts";
+"lng_gift_craft_select_about" = "You need to add up to **3 gifts** from the same collection for crafting.";
+"lng_gift_craft_select_your" = "Your gifts";
+"lng_gift_craft_select_none" = "You don't have other gifts from this collection.";
+"lng_gift_craft_search_none" = "Could not find other gifts from this collection.";
+"lng_gift_craft_select_market#one" = "{count} suitable gift on sale";
+"lng_gift_craft_select_market#other" = "{count} suitable gifts on sale";
+"lng_gift_craft_progress" = "Crafting";
+"lng_gift_craft_progress_about" = "Crafting **{gift}**";
+"lng_gift_craft_progress_chance" = "{percent} success chance";
+"lng_gift_craft_progress_fails" = "If crafting fails, all used\ngifts will be lost.";
+"lng_gift_craft_failed" = "Crafting failed. Gifts consumed :(";
+"lng_gift_craft_failed_title" = "Crafting Failed";
+"lng_gift_craft_failed_about#one" = "This crafting attempt was unsuccessful.\n**{count}** gift was lost.";
+"lng_gift_craft_failed_about#other" = "This crafting attempt was unsuccessful.\n**{count}** gifts were lost.";
+"lng_gift_craft_new_button" = "Craft New Gift";
+"lng_gift_craft_another_button" = "Craft Another Gift";
+"lng_gift_craft_unavailable" = "Crafting unavailable";
+"lng_gift_craft_when" = "This gift will become available for crafting on {date} at {time}.";
+"lng_gift_craft_address_error" = "This gift has been exported to the blockchain and can't be used as the primary gift for crafting.";
+
+"lng_auction_about_title" = "Auction";
+"lng_auction_about_subtitle" = "Join the battle for exclusive gifts.";
+"lng_auction_about_top_title#one" = "Top {count} Bidder";
+"lng_auction_about_top_title#other" = "Top {count} Bidders";
+"lng_auction_about_top_rounds#one" = "{count} round";
+"lng_auction_about_top_rounds#other" = "{count} rounds";
+"lng_auction_about_top_bidders#one" = "top {count} bidder";
+"lng_auction_about_top_bidders#other" = "top {count} bidders";
+"lng_auction_about_top_about#one" = "{count} gift is dropped in {rounds} to the {bidders} by bid amount.";
+"lng_auction_about_top_about#other" = "{count} gifts are dropped in {rounds} to the {bidders} by bid amount.";
+"lng_auction_about_top_short#one" = "{count} gift is dropped to the {bidders} by bid amount. {link}";
+"lng_auction_about_top_short#other" = "{count} gifts are dropped to the {bidders} by bid amount. {link}";
+"lng_auction_about_bid_title" = "Bid Carryover";
+"lng_auction_about_bid_about#one" = "If your bid leaves the top {count}, it will automatically join the next round.";
+"lng_auction_about_bid_about#other" = "If your bid leaves the top {count}, it will automatically join the next round.";
+"lng_auction_about_missed_title" = "Missed Bidders";
+"lng_auction_about_missed_about" = "If your bid doesn't win after the final round, your Stars will be fully refunded.";
+"lng_auction_about_understood" = "Understood";
+"lng_auction_text#one" = "Top **{count}** bidder will get {name} gifts this round. {link}";
+"lng_auction_text#other" = "Top **{count}** bidders will get {name} gifts this round. {link}";
+"lng_auction_text_link" = "Learn more {arrow}";
+"lng_auction_text_ended" = "Auction ended.";
+"lng_auction_start_label" = "Started";
+"lng_auction_starts_label" = "Starts";
+"lng_auction_rounds_label" = "Rounds";
+"lng_auction_rounds_exact" = "Round {n}";
+"lng_auction_rounds_range" = "Rounds {n}-{last}";
+"lng_auction_rounds_seconds#one" = "{count} second each";
+"lng_auction_rounds_seconds#other" = "{count} seconds each";
+"lng_auction_rounds_minutes#one" = "{count} minute each";
+"lng_auction_rounds_minutes#other" = "{count} minutes each";
+"lng_auction_rounds_hours#one" = "{count} hour each";
+"lng_auction_rounds_hours#other" = "{count} hours each";
+"lng_auction_rounds_extended" = "{duration} + {increase} for late bids in top {n}";
+"lng_auction_end_label" = "Ends";
+"lng_auction_round_label" = "Current Round";
+"lng_auction_round_value" = "{n} of {amount}";
+"lng_auction_average_label" = "Average Price";
+"lng_auction_average_tooltip" = "{amount} is the average sale price for {gift} gifts.";
+"lng_auction_availability_label" = "Availability";
+"lng_auction_availability_value" = "{n} of {amount} left";
+"lng_auction_bought#one" = "{count} {emoji} item bought {arrow}";
+"lng_auction_bought#other" = "{count} {emoji} items bought {arrow}";
+"lng_auction_join_button" = "Join Auction";
+"lng_auction_join_bid" = "Place a Bid";
+"lng_auction_join_time_left" = "{time} left";
+"lng_auction_join_time_medium" = "{hours} h {minutes} m";
+"lng_auction_join_time_small" = "{minutes} m";
+"lng_auction_join_starts_in" = "starts in {time}";
+"lng_auction_join_early_bid" = "Place an Early Bid";
+"lng_auction_menu_about" = "About";
+"lng_auction_menu_copy_link" = "Copy Link";
+"lng_auction_menu_share" = "Share";
+"lng_auction_bid_title" = "Place a Bid";
+"lng_auction_bid_title_early" = "Place an Early Bid";
+"lng_auction_bid_subtitle#one" = "Top {count} bidder will win";
+"lng_auction_bid_subtitle#other" = "Top {count} bidders will win";
+"lng_auction_bid_your" = "your bid";
+"lng_auction_bid_custom" = "click to bid more";
+"lng_auction_bid_threshold#one" = "TOP {count}";
+"lng_auction_bid_threshold#other" = "TOP {count}";
+"lng_auction_bid_minimal#one" = "minimum bid";
+"lng_auction_bid_minimal#other" = "minimum bid";
+"lng_auction_bid_until" = "until next round";
+"lng_auction_bid_left#one" = "left";
+"lng_auction_bid_left#other" = "left";
+"lng_auction_bid_before_start" = "before start";
+"lng_auction_bid_your_title" = "Your bid will be";
+"lng_auction_bid_your_outbid" = "You've been outbid";
+"lng_auction_bid_your_winning" = "You're winning";
+"lng_auction_bid_winners_title" = "Top winners";
+"lng_auction_bid_place" = "Place a {stars} Bid";
+"lng_auction_bid_increase" = "Add {stars} to Your Bid";
+"lng_auction_bid_placed_title" = "Your bid has been placed";
+"lng_auction_bid_increased_title" = "Your bid has been increased";
+"lng_auction_bid_done_text#one" = "If you fall below the **top {count}**, your bid will roll over to the next round.";
+"lng_auction_bid_done_text#other" = "If you fall below the **top {count}**, your bid will roll over to the next round.";
+"lng_auction_bid_custom_title" = "Custom Amount";
+"lng_auction_preview_left#one" = "{count} left";
+"lng_auction_preview_left#other" = "{count} left";
+"lng_auction_preview_join" = "Join";
+"lng_auctino_preview_finished" = "Finished";
+"lng_auction_preview_sold_out" = "Sold Out";
+"lng_auction_preview_view_results" = "View Results";
+"lng_auction_bar_active" = "Active Auction";
+"lng_auction_bar_active_many#one" = "{count} Active Auction";
+"lng_auction_bar_active_many#other" = "{count} Active Auctions";
+"lng_auction_bar_winning#one" = "You're winning ({count}st place).";
+"lng_auction_bar_winning#other" = "You're winning ({count}th place).";
+"lng_auction_bar_outbid" = "You've been outbid.";
+"lng_auction_bar_winning_all" = "You're winning in all of them.";
+"lng_auction_bar_outbid_some#one" = "You've been outbid in {count} of them.";
+"lng_auction_bar_outbid_some#other" = "You've been outbid in {count} of them.";
+"lng_auction_bar_outbid_all" = "You've been outbid in all of them.";
+"lng_auction_bar_view" = "View";
+"lng_auction_bar_round" = "Round {n} of {amount}";
+"lng_auction_bar_bid_ranked" = "Your bid **{stars}** is ranked **#{n}**";
+"lng_auction_bar_bid_outbid" = "Your bid **{stars}** is outbid";
+"lng_auction_bar_raise_bid" = "Raise Bid";
+"lng_auction_bought_title#one" = "{count} Item Bought";
+"lng_auction_bought_title#other" = "{count} Items Bought";
+"lng_auction_bought_date" = "Date";
+"lng_auction_bought_bid" = "Accepted Bid";
+"lng_auction_bought_in_round" = "{name} in round {n}";
+"lng_auction_change_title" = "Change Recipient";
+"lng_auction_change_button" = "Change";
+"lng_auction_change_already" = "You've already placed a bid on this gift for {name}.";
+"lng_auction_change_to" = "Do you want to raise your bid and change the recipient to {name}?";
+"lng_auction_change_already_me" = "You've already placed a bid on this gift for yourself.";
+"lng_auction_change_to_me" =  "Do you want to raise your bid and change the recipient to yourself?";
+"lng_auction_preview_name" = "Upcoming Auction";
+"lng_auction_preview_learn_gifts" = "Learn more about Telegram Gifts {arrow}";
+"lng_auction_preview_variants#one" = "View {emoji} {count} Variant {arrow}";
+"lng_auction_preview_variants#other" = "View {emoji} {count} Variants {arrow}";
+"lng_auction_preview_random" = "Random Traits";
+"lng_auction_preview_selected" = "Selected Traits";
+"lng_auction_preview_randomize" = "Randomize Traits";
+"lng_auction_preview_model" = "model";
+"lng_auction_preview_models#one" = "This collectible features **{count}** unique model.";
+"lng_auction_preview_models#other" = "This collectible features **{count}** unique models.";
+"lng_auction_preview_models_button" = "Models";
+"lng_auction_preview_crafted#one" = "This collectible features **{count}** crafted model.";
+"lng_auction_preview_crafted#other" = "This collectible features **{count}** crafted models.";
+"lng_auction_preview_view_craftable" = "View craftable models {arrow}";
+"lng_auction_preview_view_primary" = "View primary models {arrow}";
+"lng_auction_preview_backdrop" = "backdrop";
+"lng_auction_preview_backdrops#one" = "This collectible features **{count}** unique backdrop.";
+"lng_auction_preview_backdrops#other" = "This collectible features **{count}** unique backdrops.";
+"lng_auction_preview_backdrops_button" = "Backdrops";
+"lng_auction_preview_symbol" = "symbol";
+"lng_auction_preview_symbols#one" = "This collectible features **{count}** unique symbol.";
+"lng_auction_preview_symbols#other" = "This collectible features **{count}** unique symbols.";
+"lng_auction_preview_symbols_button" = "Symbols";
+"lng_auction_preview_wear" = "More about wearing gifts {arrow}";
+"lng_auction_preview_free_upgrade" = "You can upgrade your gift for free, sell it on the market, or set it as your profile cover.";
 
 "lng_accounts_limit_title" = "Limit Reached";
 "lng_accounts_limit1#one" = "You have reached the limit of **{count}** connected account.";
@@ -3084,6 +4537,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_inline_bot_no_results" = "No results.";
 "lng_inline_bot_via" = "via {inline_bot}";
+"lng_guest_chat_for" = "for {user}";
 
 "lng_box_remove" = "Remove";
 
@@ -3111,6 +4565,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_masks_count#other" = "{count} masks";
 "lng_custom_emoji_count#one" = "{count} emoji";
 "lng_custom_emoji_count#other" = "{count} emoji";
+"lng_search_back_to_results" = "Back to search";
+"lng_search_results_header" = "Search Result";
 "lng_stickers_attached_sets" = "Sets of attached stickers";
 "lng_custom_emoji_used_sets" = "Sets of used emoji";
 "lng_custom_emoji_remove_pack_button" = "Remove Emoji";
@@ -3126,6 +4582,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_emoji_remove_group_set" = "Remove group emoji set?";
 "lng_emoji_group_from_your" = "Choose from your emoji";
 "lng_emoji_group_from_featured" = "Choose from trending emoji";
+"lng_emoji_group_badge" = "Group Emoji";
 "lng_masks_archive_pack" = "Archive Masks";
 "lng_masks_has_been_archived" = "Mask pack has been archived.";
 "lng_masks_installed" = "Mask pack has been installed.";
@@ -3134,16 +4591,57 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stickers_context_edit_name" = "Edit name";
 "lng_stickers_context_delete" = "Delete sticker";
 "lng_stickers_context_delete_sure" = "Are you sure you want to delete the sticker from your sticker set?";
+"lng_emoji_context_delete" = "Delete emoji";
+"lng_emoji_context_delete_sure" = "Are you sure you want to delete this emoji from your set?";
+"lng_stickers_context_delete_pack" = "Delete Pack";
+"lng_stickers_context_delete_pack_everyone" = "Delete for Everyone";
+"lng_stickers_context_delete_pack_self" = "Delete for Myself";
+"lng_stickers_delete_pack_sure" = "Are you sure you want to delete this sticker set for everyone? This cannot be undone.";
+"lng_stickers_bot_more_options" = "Check the {bot} bot for more options";
 "lng_stickers_box_edit_name_title" = "Edit Sticker Set Name";
 "lng_stickers_box_edit_name_about" = "Choose a name for your set.";
 "lng_stickers_creator_badge" = "edit";
 
+"lng_stickers_create_new" = "Create a New Sticker";
+"lng_stickers_add_existing" = "Add an Existing Sticker";
+"lng_emoji_create_new" = "Create a New Emoji";
+"lng_emoji_add_existing" = "Add an Existing Emoji";
+"lng_emoji_adapt_sticker" = "Adapt from a Sticker";
+"lng_emoji_adapt_no_video" = "Video stickers are not supported yet.";
+"lng_stickers_add_to_set" = "Add to Sticker Set";
+"lng_stickers_already_in_set" = "This Sticker is already in the Set.";
+"lng_stickers_set_is_full" = "This Sticker Set is full.";
+"lng_emoji_add_to_set" = "Add to Emoji Set";
+"lng_emoji_already_in_set" = "This Emoji is already in the Set.";
+"lng_emoji_set_is_full" = "This Emoji Set is full.";
+"lng_emoji_added" = "Emoji added.";
+"lng_emoji_create_image_title" = "New Emoji";
+"lng_emoji_create_emoji_about" = "Choose emojis that match your emoji";
+"lng_stickers_pack_choose_emoji_title" = "Choose Emoji";
+"lng_stickers_pack_choose_emoji_about" = "Pick an emoji that corresponds to this sticker.";
+"lng_stickers_pick_existing_title" = "Choose Sticker";
+"lng_stickers_pick_existing_about" = "Pick a sticker from your library to add it to this set.";
+"lng_stickers_pick_existing_empty" = "You don't have any stickers yet.";
+"lng_stickers_create_image_title" = "New Sticker";
+"lng_stickers_create_image_about" = "Choose an image to add as a sticker.";
+"lng_stickers_create_choose_image" = "Choose Image";
+"lng_stickers_create_image_filter" = "Images";
+"lng_stickers_create_open_failed" = "Could not load image.";
+"lng_stickers_create_too_small" = "The image must be at least {size} pixels on each side.";
+"lng_stickers_create_choose_emoji" = "Choose an emoji that corresponds to your sticker:";
+"lng_stickers_create_emoji_about" = "Choose emojis that match your sticker";
+"lng_stickers_create_emoji_required" = "Please choose an emoji.";
+"lng_stickers_create_uploading" = "Uploading sticker…";
+"lng_stickers_create_upload_failed" = "Sticker upload failed. Please try again.";
+"lng_stickers_create_added" = "Sticker added.";
+
 "lng_in_dlg_photo" = "Photo";
 "lng_in_dlg_album" = "Album";
 "lng_in_dlg_video" = "Video";
 "lng_in_dlg_audio_file" = "Audio file";
 "lng_in_dlg_contact" = "Contact";
 "lng_in_dlg_audio" = "Voice message";
+"lng_in_dlg_audio_unread" = "{emoji} Voice message";
 "lng_in_dlg_video_message" = "Video message";
 "lng_in_dlg_voice_message_ttl" = "One-time Voice Message";
 "lng_in_dlg_video_message_ttl" = "One-time Video Message";
@@ -3152,6 +4650,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_in_dlg_sticker_emoji" = "{emoji} Sticker";
 "lng_in_dlg_poll" = "Poll";
 "lng_in_dlg_story" = "Story";
+"lng_in_dlg_todo_list" = "Checklist";
 "lng_in_dlg_story_expired" = "Expired story";
 "lng_in_dlg_media_count#one" = "{count} media";
 "lng_in_dlg_media_count#other" = "{count} media";
@@ -3165,10 +4664,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_in_dlg_audio_count#other" = "{count} audio";
 
 "lng_ban_user" = "Ban User";
+"lng_ban_specific_user" = "Ban {user}";
 "lng_ban_users" = "Ban users";
 "lng_restrict_users" = "Restrict users";
 "lng_delete_all_from_user" = "Delete all from {user}";
-"lng_delete_all_from_users" = "Delete all from users";
+"lng_restrict_user#one" = "Restrict user";
+"lng_restrict_user#other" = "Restrict users";
 "lng_restrict_user_part" = "Partially restrict this user {emoji}";
 "lng_restrict_users_part" = "Partially restrict users {emoji}";
 "lng_restrict_user_full" = "Fully ban this user {emoji}";
@@ -3176,6 +4677,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_restrict_users_part_single_header" = "What can this user do?";
 "lng_restrict_users_part_header#one" = "What can {count} selected user do?";
 "lng_restrict_users_part_header#other" = "What can {count} selected users do?";
+"lng_restrict_users_kick_from_common_group" = "Also ban from:";
 "lng_report_spam" = "Report Spam";
 "lng_report_spam_and_leave" = "Report spam and leave";
 "lng_report_spam_done" = "Thank you for your report";
@@ -3195,6 +4697,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_new_contact_from_request_group" = "{user} is an admin of {name}, a group you requested to join.";
 "lng_new_contact_about_status" = "This account uses {emoji} as a custom status next to its\nname. Such emoji statuses are available to all\nsubscribers of {link}.";
 "lng_new_contact_about_status_link" = "Telegram Premium";
+"lng_new_contact_not_contact" = "Not a contact";
+"lng_new_contact_phone_number" = "Phone number";
+"lng_new_contact_registration" = "Registration";
+"lng_new_contact_common_groups" = "Common groups";
+"lng_new_contact_groups#one" = "{count} group {emoji} {arrow}";
+"lng_new_contact_groups#other" = "{count} groups {emoji} {arrow}";
+"lng_new_contact_not_official" = "Not an official account";
+"lng_new_contact_updated_name" = "User updated name {when}";
+"lng_new_contact_updated_photo" = "User updated photo {when}";
+"lng_new_contact_updated_now" = "less than an hour ago";
+"lng_new_contact_updated_hours#one" = "{count} hour ago";
+"lng_new_contact_updated_hours#other" = "{count} hours ago";
+"lng_new_contact_updated_days#one" = "{count} day ago";
+"lng_new_contact_updated_days#other" = "{count} days ago";
+"lng_new_contact_updated_months#one" = "{count} month ago";
+"lng_new_contact_updated_months#other" = "{count} months ago";
 "lng_from_request_title_channel" = "Response to your join request";
 "lng_from_request_title_group" = "Response to your join request";
 "lng_from_request_body" = "You received this message because you requested to join {name} on {date}.";
@@ -3216,6 +4734,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_reminder_message" = "Set a reminder";
 "lng_schedule_title" = "Send this message on...";
 "lng_remind_title" = "Remind me on...";
+"lng_schedule_notify_on" = "Recipients will be notified.";
+"lng_schedule_notify_off" = "Recipients will receive a silent notification.";
+"lng_schedule_repeat_label" = "Repeat:";
+"lng_schedule_repeat_never" = "Never";
+"lng_schedule_repeat_daily" = "Daily";
+"lng_schedule_repeat_weekly" = "Weekly";
+"lng_schedule_repeat_biweekly" = "Biweekly";
+"lng_schedule_repeat_monthly" = "Monthly";
+"lng_schedule_repeat_every_month#one" = "Every {count} month";
+"lng_schedule_repeat_every_month#other" = "Every {count} month";
+"lng_schedule_repeat_yearly" = "Yearly";
+"lng_schedule_repeat_promo" = "Subscribe to {link} to schedule repeating messages.";
+"lng_schedule_repeat_promo_link" = "Telegram Premium";
 "lng_schedule_at" = "at";
 "lng_message_ph" = "Write a message...";
 "lng_broadcast_ph" = "Broadcast a message...";
@@ -3223,6 +4754,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_send_anonymous_ph" = "Send anonymously...";
 "lng_story_reply_ph" = "Reply privately...";
 "lng_story_comment_ph" = "Comment story...";
+"lng_video_stream_comment_ph" = "Comment";
+"lng_video_stream_comment_paid_ph#one" = "Comment for {count} Star";
+"lng_video_stream_comment_paid_ph#other" = "Comment for {count} Stars";
+"lng_video_stream_comments_disabled" = "Comments disabled.";
+"lng_video_stream_stars" = "Add Stars to highlight your comment";
+"lng_video_stream_live" = "LIVE";
+"lng_video_stream_watched#one" = "{count} watching";
+"lng_video_stream_watched#other" = "{count} watching";
+"lng_video_stream_edit_stars" = "Edit Stars";
+"lng_video_stream_remove_stars" = "Remove Stars";
+"lng_message_stars_ph#one" = "Message for {count} Star";
+"lng_message_stars_ph#other" = "Message for {count} Stars";
 "lng_send_text_no" = "Text not allowed.";
 "lng_send_text_no_about" = "The admins of this group only allow sending {types}.";
 "lng_send_text_type_and_last" = "{types} and {last}";
@@ -3243,11 +4786,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_record_cancel" = "Release outside this field to cancel";
 "lng_record_cancel_stories" = "Release outside to cancel";
 "lng_record_lock_cancel_sure" = "Do you want to stop recording and discard your voice message?";
+"lng_record_lock_cancel_sure_round" = "Do you want to stop recording and discard your video message?";
 "lng_record_listen_cancel_sure" = "Do you want to discard your recorded voice message?";
+"lng_record_listen_cancel_sure_round" = "Do you want to discard your recorded video message?";
 "lng_record_lock_discard" = "Discard";
+"lng_record_lock" = "Lock recording";
+"lng_record_lock_resume" = "Resume recording";
+"lng_record_lock_delete" = "Delete recording";
+"lng_record_lock_play" = "Play recording";
+"lng_record_lock_pause" = "Pause recording";
+"lng_record_cancel_recording" = "Cancel recording";
 "lng_record_hold_tip" = "Please hold the mouse button pressed to record a voice message.";
+"lng_record_voice_tip" = "Hold to record audio. Click to switch to video.";
+"lng_record_video_tip" = "Hold to record video. Click to switch to audio.";
+"lng_record_audio_problem" = "Could not start audio recording. Please check your microphone.";
+"lng_record_video_problem" = "Could not start video recording. Please check your camera.";
 "lng_record_once_first_tooltip" = "Click to set this message to **Play Once**.";
 "lng_record_once_active_tooltip" = "The recipient will be able to listen only once.";
+"lng_record_once_active_video" = "The recipient will be able to watch only once.";
 "lng_will_be_notified" = "Subscribers will be notified when you post.";
 "lng_wont_be_notified" = "Subscribers will receive a silent notification.";
 "lng_willbe_history" = "Select a chat to start messaging";
@@ -3276,6 +4832,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_scheduled_send_now" = "Send message now?";
 "lng_scheduled_send_now_many#one" = "Send {count} message now?";
 "lng_scheduled_send_now_many#other" = "Send {count} messages now?";
+"lng_scheduled_video_tip_title" = "Improving video...";
+"lng_scheduled_video_tip_text" = "The video will be published after it's optimized for the best viewing experience.";
+"lng_scheduled_video_tip" = "Processing video may take a few minutes.";
+"lng_scheduled_video_published" = "Video Published.";
+"lng_scheduled_video_view" = "View";
 
 "lng_replies_view#one" = "View {count} Reply";
 "lng_replies_view#other" = "View {count} Replies";
@@ -3298,6 +4859,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_replies_no_comments" = "No comments here yet...";
 
 "lng_verification_codes" = "Verification Codes";
+"lng_verification_codes_about" = "Third-party services, like websites and stores, can send verification codes to your phone number via Telegram instead of SMS. Such codes will appear in this chat.\n\nIf you didn't request any codes — don't worry! Most likely, someone made a mistake when entering their number.";
 
 "lng_archived_name" = "Archived chats";
 "lng_archived_add" = "Archive";
@@ -3316,8 +4878,48 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_dialogs_skip_archive_in_search" = "Skip results from archive";
 "lng_dialogs_show_archive_in_search" = "With results from archive";
 
+"lng_dialogs_suggestions_birthday_title" = "Add your birthday! 🎂";
+"lng_dialogs_suggestions_birthday_about" = "Let your contacts know when you’re celebrating.";
+"lng_dialogs_suggestions_birthday_contact_title" = "It’s {text}'s **birthday** today! 🎂";
+"lng_dialogs_suggestions_birthday_contact_about" = "Send them a Gift.";
+"lng_dialogs_suggestions_birthday_contacts_title#one" = "{count} contact have **birthdays** today! 🎂";
+"lng_dialogs_suggestions_birthday_contacts_title#other" = "{count} contacts have **birthdays** today! 🎂";
+"lng_dialogs_suggestions_birthday_contacts_about" = "Send them a Gift.";
+"lng_dialogs_suggestions_birthday_contact_dismiss" = "You can send a Gift later in Settings";
+"lng_dialogs_suggestions_premium_annual_title" = "Telegram Premium with a {text} discount";
+"lng_dialogs_suggestions_premium_annual_about" = "Sign up for the annual payment plan for Telegram Premium now to get the discount.";
+"lng_dialogs_suggestions_premium_upgrade_title" = "Telegram Premium with a {text} discount";
+"lng_dialogs_suggestions_premium_upgrade_about" = "Upgrade to the annual payment plan for Telegram Premium now to get the discount.";
+"lng_dialogs_suggestions_premium_restore_title" = "Get Premium back with up to {text} off";
+"lng_dialogs_suggestions_premium_restore_about" = "Your Telegram Premium has recently expired. Tap here to extend it.";
+"lng_dialogs_suggestions_premium_grace_title" = "⚠️ Your Premium subscription is expiring!";
+"lng_dialogs_suggestions_premium_grace_about" = "Don’t lose access to exclusive features.";
+"lng_dialogs_suggestions_userpics_title" = "Add your photo! 📸";
+"lng_dialogs_suggestions_userpics_about" = "Help your friends spot you easily.";
+"lng_dialogs_suggestions_credits_sub_low_title#one" = "{emoji} {count} Star needed for {channels}";
+"lng_dialogs_suggestions_credits_sub_low_title#other" = "{emoji} {count} Stars needed for {channels}";
+"lng_dialogs_suggestions_credits_sub_low_about" = "Insufficient funds to cover your subscription.";
+
+"lng_unconfirmed_auth_title" = "Someone just got access to your messages!";
+"lng_unconfirmed_auth_confirm" = "Yes, it’s me";
+"lng_unconfirmed_auth_deny" = "No, it’s not me!";
+"lng_unconfirmed_auth_single" = "We detected a new login to your account from {from}, {country}. Is it you?";
+"lng_unconfirmed_auth_multiple#one" = "We detected new {count} login to your account. Is it you?";
+"lng_unconfirmed_auth_multiple#other" = "We detected new {count} logins to your account. Is it you?";
+"lng_unconfirmed_auth_multiple_from#one" = "We detected new {count} login to your account from {country}. Is it you?";
+"lng_unconfirmed_auth_multiple_from#other" = "We detected new {count} logins to your account from {country}. Is it you?";
+"lng_unconfirmed_auth_denied_title#one" = "New Login Prevented";
+"lng_unconfirmed_auth_denied_title#other" = "New Logins Prevented";
+"lng_unconfirmed_auth_denied_single" = "We have terminated the login attempt from {country}.";
+"lng_unconfirmed_auth_denied_multiple" = "We have terminated the login attempts from: {country}";
+"lng_unconfirmed_auth_denied_warning" = "Never send your login code to anyone or you can lose your Telegram account!";
+"lng_unconfirmed_auth_confirmed" = "New Login Allowed";
+"lng_unconfirmed_auth_confirmed_message" = "You can check the list of your active logins in {link}.";
+
 "lng_about_random" = "Send a {emoji} emoji to any chat to try your luck.";
 "lng_about_random_send" = "Send";
+"lng_about_random_stake" = "Stake: {amount}";
+"lng_about_random_stake_change" = "change";
 
 "lng_open_this_link" = "Open this link?";
 "lng_open_link" = "Open";
@@ -3328,6 +4930,27 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_url_auth_open_confirm" = "Do you want to open {link}?";
 "lng_url_auth_login_option" = "Log in to {domain} as {user}";
 "lng_url_auth_allow_messages" = "Allow {bot} to send me messages";
+"lng_url_auth_login_title" = "Log in to {domain}";
+"lng_url_auth_login_button" = "Log in";
+"lng_url_auth_site_access" = "This site will receive your **name**, **username** and **profile photo**.";
+"lng_url_auth_app_access" = "This app will receive your **name**, **username** and **profile photo**.";
+"lng_url_auth_unverified_app" = "Unverified App";
+"lng_url_auth_device_label" = "Device";
+"lng_url_auth_ip_label" = "IP Address";
+"lng_url_auth_login_attempt" = "This login attempt came from the device above.";
+"lng_url_auth_allow_messages_label" = "Allow Messages";
+"lng_url_auth_allow_messages_about" = "This will allow {bot} to message you";
+"lng_url_auth_phone_sure_title" = "Phone Number";
+"lng_url_auth_phone_sure_text" = "{domain} wants to access your phone number **{phone}**.\n\nAllow access?";
+"lng_url_auth_phone_sure_deny" = "Deny";
+"lng_url_auth_phone_toast_good_title" = "Login successful";
+"lng_url_auth_phone_toast_good" = "You're now logged in to {domain}.";
+"lng_url_auth_phone_toast_good_no_phone" = "You're now logged in to {domain}, but you didn't grant access to your phone number.";
+"lng_url_auth_phone_toast_bad_title" = "Login failed";
+"lng_url_auth_phone_toast_bad" = "Please try logging in to {domain} again.";
+"lng_url_auth_phone_toast_bad_expired" = "This link is expired.";
+"lng_url_auth_match_code_title" = "Tap the emoji shown on your other device";
+"lng_url_auth_match_code_info" = "Login request from {domain}";
 
 "lng_bot_start" = "Start";
 "lng_bot_choose_group" = "Select a Group";
@@ -3350,6 +4973,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_sure_add_text_group" = "Are you sure you want to add this bot as an admin in the group {group}? It will have access to the list of anonymous admins.";
 "lng_bot_sure_add_text_channel" = "Are you sure you want to add this bot as an admin in the channel {group}? It will have access to lists of channel admins and subscribers.";
 "lng_bot_no_webview" = "Unfortunately, you can't open this menu with your current system configuration.";
+"lng_bot_webview_failed" = "Could not initialize WebView.";
+"lng_bot_webview_crashed" = "Webview crashed.";
 "lng_bot_remove_from_menu" = "Remove from menu";
 "lng_bot_remove_from_menu_sure" = "Remove {bot} from the attachment menu?";
 "lng_bot_remove_from_menu_done" = "Bot removed from the menu.";
@@ -3359,6 +4984,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_settings" = "Settings";
 "lng_bot_open" = "Open Bot";
 "lng_bot_terms" = "Terms of Use";
+"lng_bot_privacy" = "Privacy Policy";
 "lng_bot_reload_page" = "Reload Page";
 "lng_bot_add_to_menu" = "{bot} asks your permission to be added as an option to your attachment menu so you can access it from any chat.";
 "lng_bot_add_to_menu_done" = "Bot added to the menu.";
@@ -3374,6 +5000,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_add_to_side_menu_done" = "Bot added to the main menu.";
 "lng_bot_no_scan_qr" = "QR Codes for bots are not supported on Desktop. Please use one of Telegram's mobile apps.";
 "lng_bot_no_share_story" = "Sharing to Stories is not supported on Desktop. Please use one of Telegram's mobile apps.";
+"lng_bot_emoji_status_confirm" = "Confirm";
+"lng_bot_emoji_status_title" = "Set Emoji Status";
+"lng_bot_emoji_status_text" = "Do you want to set this emoji status suggested by {bot}?";
+"lng_bot_emoji_status_access_text" = "{bot} requests access to set your **emoji status**. You will be able to revoke this access in the profile page of {name}.";
+"lng_bot_emoji_status_access_allow" = "Allow";
+"lng_bot_share_prepared_title" = "Share Message";
+"lng_bot_share_prepared_about" = "{bot} mini app suggests you to send this message to a chat you select.";
+"lng_bot_share_prepared_button" = "Share With...";
+"lng_bot_download_file" = "Download File";
+"lng_bot_download_file_sure" = "{bot} suggests you download the following file:";
+"lng_bot_download_file_button" = "Download";
+"lng_bot_download_starting" = "Starting...";
+"lng_bot_download_failed" = "Failed. {retry}";
+"lng_bot_download_retry" = "Retry";
 
 "lng_bot_status_users#one" = "{count} monthly user";
 "lng_bot_status_users#other" = "{count} monthly users";
@@ -3441,6 +5081,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_choose_image" = "Choose an image";
 "lng_choose_file" = "Choose a file";
 "lng_choose_files" = "Choose Files";
+"lng_choose_cover" = "Choose video cover";
+"lng_choose_cover_bad" = "Can't use this file as a caption.";
 "lng_game_tag" = "Game";
 
 "lng_context_new_window" = "Open in new window";
@@ -3449,6 +5091,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_view_group" = "View group info";
 "lng_context_view_channel" = "View channel info";
 "lng_context_view_topic" = "View topic info";
+"lng_context_view_thread" = "View thread info";
 "lng_context_hide_psa" = "Hide this announcement";
 "lng_context_pin_to_top" = "Pin";
 "lng_context_unpin_from_top" = "Unpin";
@@ -3457,14 +5100,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_mark_read_sure" = "Are you sure you want to mark all chats from this folder as read?";
 "lng_context_mark_read_all" = "Mark all chats as read";
 "lng_context_mark_read_all_sure" = "Are you sure you want to mark all chats as read?";
+"lng_context_mark_read_all_sure_2" = "**This action cannot be undone.**";
 "lng_context_mark_read_mentions_all" = "Mark all mentions as read";
 "lng_context_mark_read_reactions_all" = "Read all reactions";
+"lng_context_mark_read_poll_votes_all" = "Read all poll votes";
 "lng_context_archive_expand" = "Expand";
 "lng_context_archive_collapse" = "Collapse";
 "lng_context_archive_to_menu" = "Move to main menu";
 "lng_context_archive_to_list" = "Move to chat list";
 "lng_context_archive_to_menu_info" = "Archive moved to the main menu!\nRight click the archive button to return the Archive to your chat list.";
 "lng_context_archive_settings" = "Archive settings";
+"lng_context_archive_how_does_it_work" = "How does it work?";
 
 "lng_context_mute" = "Mute notifications";
 "lng_context_unmute" = "Unmute";
@@ -3473,9 +5119,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_edit_permissions" = "Edit admin rights";
 "lng_context_restrict_user" = "Restrict user";
 "lng_context_ban_user" = "Ban";
+"lng_context_delete_and_ban" = "Delete and ban";
 "lng_context_remove_from_group" = "Remove from group";
 "lng_context_add_to_group" = "Add to group";
 
+"lng_context_rate_transcription" = "Rate transcription";
+"lng_toast_sent_rate_transcription" = "Thank you for your feedback!";
+
 "lng_context_copy_link" = "Copy Link";
 "lng_context_copy_message_link" = "Copy Message Link";
 "lng_context_copy_post_link" = "Copy Post Link";
@@ -3495,6 +5145,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_pack_info" = "View Sticker Set";
 "lng_context_pack_add" = "Add Stickers";
 "lng_context_save_file" = "Save As...";
+"lng_context_save_music_to" = "Save to...";
+"lng_context_save_music_profile" = "... Profile";
+"lng_context_save_music_saved" = "... Saved Messages";
+"lng_context_save_music_folder" = "... Downloads";
+"lng_context_save_music_about" = "Choose where you want this audio to be saved.";
 "lng_context_copy_text" = "Copy Text";
 "lng_context_open_gif" = "Open GIF";
 "lng_context_save_gif" = "Add to GIFs";
@@ -3505,9 +5160,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_to_msg" = "Go To Message";
 "lng_context_reply_msg" = "Reply";
 "lng_context_quote_and_reply" = "Quote & Reply";
+"lng_context_reply_with_timecode" = "Reply with timecode";
+"lng_context_reply_to_task" = "Reply to Task";
+"lng_context_reply_to_poll_option" = "Reply to Option";
+"lng_context_copy_poll_option" = "Copy Option";
+"lng_context_copy_poll_option_link" = "Copy Option Link";
+"lng_context_delete_poll_option" = "Delete Item";
+"lng_context_poll_message_tab" = "Poll";
+"lng_context_poll_option_tab" = "Option";
 "lng_context_edit_msg" = "Edit";
+"lng_context_draw" = "Edit Image";
 "lng_context_add_factcheck" = "Add Fact Check";
 "lng_context_edit_factcheck" = "Edit Fact Check";
+"lng_context_add_offer" = "Add Offer";
 "lng_context_forward_msg" = "Forward";
 "lng_context_send_now_msg" = "Send Now";
 "lng_context_reschedule" = "Reschedule";
@@ -3519,8 +5184,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_pin_msg" = "Pin";
 "lng_context_unpin_msg" = "Unpin";
 "lng_context_cancel_upload" = "Cancel Upload";
+"lng_context_upload_edit_caption" = "Edit Caption";
 "lng_context_copy_selected" = "Copy Selected Text";
 "lng_context_copy_selected_items" = "Copy Selected as Text";
+"lng_context_copy_in_reply_to" = "in reply to {name}";
 "lng_context_forward_selected" = "Forward Selected";
 "lng_context_send_now_selected" = "Send selected now";
 "lng_context_reschedule_selected" = "Reschedule Selected";
@@ -3540,8 +5207,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_seen_watched_none" = "Nobody Listened";
 "lng_context_seen_reacted#one" = "{count} Reacted";
 "lng_context_seen_reacted#other" = "{count} Reacted";
+"lng_context_seen_reactions_count#one" = "{count} Reaction";
+"lng_context_seen_reactions_count#other" = "{count} Reactions";
 "lng_context_seen_reacted_none" = "Nobody Reacted";
 "lng_context_seen_reacted_all" = "Show All Reactions";
+"lng_context_sent_by" = "Sent by {user}";
+"lng_context_sent_today" = "Sent today at {time}";
+"lng_context_sent_yesterday" = "Sent yesterday at {time}";
+"lng_context_sent_date" = "Sent {date} at {time}";
 "lng_context_set_as_quick" = "Set As Quick";
 "lng_context_filter_by_tag" = "Filter by Tag";
 "lng_context_tag_add_name" = "Add Name";
@@ -3556,6 +5229,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_read_show" = "show when";
 "lng_context_edit_shortcut" = "Edit Shortcut";
 "lng_context_delete_shortcut" = "Delete Quick Reply";
+"lng_context_gift_send" = "Send Another Gift";
+"lng_context_charge_fee" = "Charge Fee";
+"lng_context_remove_fee" = "Remove Fee";
+"lng_context_fee_now" = "{name} pays {amount} per message.";
+"lng_context_fee_free" = "{name} can send messages for free.";
 
 "lng_add_tag_about" = "Tag this message with an emoji for quick search.";
 "lng_subscribe_tag_about" = "Organize your Saved Messages with tags. {link}";
@@ -3566,24 +5244,41 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_add_tag_phrase" = "to messages {arrow}";
 "lng_add_tag_phrase_long" = "to your Saved Messages {arrow}";
 "lng_unlock_tags" = "Unlock";
+"lng_add_tag_selector#one" = "You can add a tag to the message";
+"lng_add_tag_selector#other" = "You can add a tag to the messages";
+"lng_message_tagged_with" = "Message tagged with {emoji}";
+"lng_tagged_view_saved" = "View";
+
+"lng_add_channel_to_filter_selector" = "You can add a channel to your folder";
+"lng_add_group_to_filter_selector" = "You can add a group to your folder";
 
 "lng_context_animated_emoji" = "This message contains emoji from **{name} pack**.";
 "lng_context_animated_emoji_many#one" = "This message contains emoji from **{count} pack**.";
 "lng_context_animated_emoji_many#other" = "This message contains emoji from **{count} packs**.";
 "lng_context_animated_reaction" = "This reaction is from the **{name}** pack.";
+"lng_context_animated_emoji_preview" = "This emoji is from the **{name}** pack.";
 "lng_context_animated_tag" = "This tag is from **{name} pack**.";
 "lng_context_animated_reactions" = "Reactions contain emoji from **{name} pack**.";
 "lng_context_animated_reactions_many#one" = "Reactions contain emoji from **{count} pack**.";
 "lng_context_animated_reactions_many#other" = "Reactions contain emoji from **{count} packs**.";
+"lng_context_animated_poll_option" = "This option contains emoji from **{name} pack**.";
+"lng_context_animated_poll_option_many#one" = "This option contains emoji from **{count} pack**.";
+"lng_context_animated_poll_option_many#other" = "This option contains emoji from **{count} packs**.";
 
 "lng_context_noforwards_info_channel" = "Copying and forwarding is not allowed in this channel.";
 "lng_context_noforwards_info_group" = "Copying and forwarding is not allowed in this group.";
 "lng_context_noforwards_info_bot" = "Copying and forwarding is not allowed from this bot.";
+"lng_context_noforwards_info_his" = "{user} disabled copying and forwarding in this chat.";
+"lng_context_noforwards_info_mine" = "You disabled copying and forwarding in this chat.";
 
 "lng_context_spoiler_effect" = "Hide with Spoiler";
-"lng_context_disable_spoiler" = "Remove Spoiler";
 "lng_context_make_paid" = "Make This Content Paid";
 "lng_context_change_price" = "Change Price";
+"lng_context_edit_cover" = "Edit Cover";
+"lng_context_clear_cover" = "Clear Cover";
+
+"lng_context_mention" = "Mention";
+"lng_context_search_from" = "Search messages";
 
 "lng_factcheck_title" = "Fact Check";
 "lng_factcheck_placeholder" = "Add Facts or Context";
@@ -3611,14 +5306,31 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_paid_react_send" = "Send {price}";
 "lng_paid_react_agree" = "By sending stars, you agree to the {link}.";
 "lng_paid_react_agree_link" = "Terms of Service";
+"lng_paid_react_admin_cant" = "You can't send Stars to your own Live Story.";
 "lng_paid_react_toast#one" = "Star Sent!";
 "lng_paid_react_toast#other" = "Stars Sent!";
+"lng_paid_react_toast_anonymous#one" = "Star sent anonymously!";
+"lng_paid_react_toast_anonymous#other" = "Stars sent anonymously!";
 "lng_paid_react_toast_text#one" = "You reacted with **{count} Star**.";
 "lng_paid_react_toast_text#other" = "You reacted with **{count} Stars**.";
 "lng_paid_react_undo" = "Undo";
 "lng_paid_react_show_in_top" = "Show me in Top Senders";
 "lng_paid_react_anonymous" = "Anonymous";
 
+"lng_paid_comment_title" = "Highlight and Pin";
+"lng_paid_comment_about" = "Highlight and pin your message by adding Stars for {name}.";
+"lng_paid_comment_button" = "Add {stars}";
+"lng_paid_comment_pin_about" = "pin in chat";
+"lng_paid_comment_limit_about#one" = "character";
+"lng_paid_comment_limit_about#other" = "characters";
+"lng_paid_comment_emoji_about#one" = "emoji";
+"lng_paid_comment_emoji_about#other" = "emoji";
+"lng_paid_reaction_title" = "React with Stars";
+"lng_paid_reaction_about" = "Highlight and pin your message by sending Stars to {name}.";
+"lng_paid_reaction_button" = "Send {stars}";
+"lng_paid_admin_title" = "Receive Stars from Viewers";
+"lng_paid_admin_about" = "Viewers can send you Star Reactions.";
+
 "lng_sensitive_tag" = "18+";
 "lng_sensitive_title" = "18+";
 "lng_sensitive_text" = "This media may contain sensitive content suitable only for adults. Do you still want to view it?";
@@ -3627,6 +5339,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_sensitive_toast" = "You can update the visibility of sensitive media in **Settings > Chat Settings > Sensitive content**";
 
 "lng_translate_show_original" = "Show Original";
+"lng_translate_return_original" = "View Original ({language})";
 "lng_translate_bar_to" = "Translate to {name}";
 "lng_translate_bar_to_other" = "Translate to {name}";
 "lng_translate_menu_to" = "Translate To";
@@ -3640,6 +5353,23 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_translate_settings" = "Settings";
 "lng_translate_undo" = "Undo";
 
+"lng_translate_cocoon_menu" = "Translations are powered by\n**{emoji} Cocoon**. {link}";
+"lng_translate_cocoon_link" = "How does it work?";
+"lng_translate_cocoon_title" = "Cocoon";
+"lng_translate_cocoon_subtitle" = "**Cocoon** ({text}) handles AI tasks **safely** and **efficiently**.";
+"lng_translate_cocoon_explain" = "**Co**nfidential **Co**mpute **O**pen **N**etwork";
+"lng_translate_cocoon_private_title" = "Private";
+"lng_translate_cocoon_private_text" = "No third party can access any data, such as translations, inside {mention}.";
+"lng_translate_cocoon_private_mention" = "@cocoon";
+"lng_translate_cocoon_efficient_title" = "Efficient";
+"lng_translate_cocoon_efficient_text" = "Cocoon has allowed Telegram to reduce translation costs by 6x.";
+"lng_translate_cocoon_everyone_title" = "For Everyone";
+"lng_translate_cocoon_everyone_text" = "Any developer can use Cocoon for AI features. Learn more at {domain}.";
+"lng_translate_cocoon_everyone_domain" = "cocoon.org";
+"lng_translate_cocoon_text" = "Want to integrate Cocoon into your projects?\nReach out at {link}";
+"lng_translate_cocoon_text_link" = "t.me/cocoon?direct";
+"lng_translate_cocoon_done" = "Understood";
+
 "lng_downloads_section" = "Downloads";
 "lng_downloads_view_in_chat" = "View in chat";
 "lng_downloads_view_in_section" = "View in downloads";
@@ -3658,6 +5388,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_send_grouped" = "Group items";
 "lng_send_compressed_one" = "Compress the image";
 "lng_send_compressed" = "Compress images";
+"lng_send_high_quality" = "High Quality";
+"lng_send_as_documents_one" = "Send as a document";
+"lng_send_as_documents" = "Send as documents";
 "lng_send_media_invalid_files" = "Sorry, no valid files found.";
 "lng_send_image" = "Send an image";
 "lng_send_file" = "Send as a file";
@@ -3679,9 +5412,120 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_inline_switch_cant" = "Sorry, no way to write here :(";
 "lng_preview_reply_to" = "Reply to {name}";
 "lng_preview_reply_to_quote" = "Reply to quote from {name}";
+"lng_preview_reply_to_task" = "Reply to task from {title}";
+"lng_preview_reply_to_poll_option" = "Reply to poll option from {title}";
+
+"lng_suggest_bar_title" = "Suggest a Post Below";
+"lng_suggest_bar_text" = "Click to offer a price for publishing.";
+"lng_suggest_bar_priced" = "{amount} for publishing anytime.";
+"lng_suggest_bar_dated" = "Publish on {date}";
+"lng_suggest_options_title" = "Suggest a Message";
+"lng_suggest_options_change" = "Suggest Changes";
+"lng_suggest_options_stars_offer" = "Offer Stars";
+"lng_suggest_options_stars_request" = "Request Stars";
+"lng_suggest_options_stars_price" = "Enter Price in Stars";
+"lng_suggest_options_stars_price_about" = "Choose how many Stars to pay to publish this message.";
+"lng_suggest_options_ton_offer" = "Offer Grams";
+"lng_suggest_options_ton_request" = "Request Grams";
+"lng_suggest_options_ton_price" = "Enter Price in Grams";
+"lng_suggest_options_ton_price_about" = "Choose how many Grams to pay to publish this message.";
+"lng_suggest_options_date" = "Time";
+"lng_suggest_options_date_any" = "Anytime";
+"lng_suggest_options_date_publish" = "Publish";
+"lng_suggest_options_date_now" = "Publish Now";
+"lng_suggest_options_date_about" = "Select the date and time you want the message to be published. The post will remain available for at least 24 hours from this date.";
+"lng_suggest_options_you_get_stars#one" = "You will receive {count} Star ({percent}) for publishing this post.";
+"lng_suggest_options_you_get_stars#other" = "You will receive {count} Stars ({percent}) for publishing this post.";
+"lng_suggest_options_you_get_ton#one" = "You will receive {count} Gram ({percent}) for publishing this post.";
+"lng_suggest_options_you_get_ton#other" = "You will receive {count} Grams ({percent}) for publishing this post.";
+"lng_suggest_options_stars_warning" = "Transactions in **Stars** may be reversed by the payment provider within **21** days. Only accept Stars from people you trust.";
+"lng_suggest_options_offer" = "Offer {amount}";
+"lng_suggest_options_offer_free" = "Offer for Free";
+"lng_suggest_options_update" = "Update Terms";
+"lng_suggest_options_update_date" = "Update Time";
+
+"lng_suggest_action_decline" = "Decline";
+"lng_suggest_action_accept" = "Accept";
+"lng_suggest_action_change" = "Suggest Changes";
+"lng_suggest_action_your" = "You suggest to post this message.";
+"lng_suggest_action_his" = "{from} suggests to post this message.";
+"lng_suggest_action_price_label" = "Price";
+"lng_suggest_action_price_free" = "Free";
+"lng_suggest_action_time_label" = "Time";
+"lng_suggest_action_time_any" = "Anytime";
+"lng_suggest_action_agreement" = "Agreement reached!";
+"lng_suggest_action_agree_date" = "The post will be automatically published on {channel} {date}.";
+"lng_suggest_action_your_charged_stars#one" = "You have been charged **{count} Star**.";
+"lng_suggest_action_your_charged_stars#other" = "You have been charged **{count} Stars**.";
+"lng_suggest_action_your_charged_ton#one" = "You have been charged **{count} Gram**.";
+"lng_suggest_action_your_charged_ton#other" = "You have been charged **{count} Grams**.";
+"lng_suggest_action_his_charged_stars#one" = "{from} has been charged **{count} Star**.";
+"lng_suggest_action_his_charged_stars#other" = "{from} has been charged **{count} Stars**.";
+"lng_suggest_action_his_charged_ton#one" = "{from} has been charged **{count} Gram**.";
+"lng_suggest_action_his_charged_ton#other" = "{from} has been charged **{count} Grams**.";
+"lng_suggest_action_agree_receive_stars" = "{channel} will receive the Stars once the post has been live for 24 hours.";
+"lng_suggest_action_agree_receive_ton" = "{channel} will receive Grams once the post has been live for 24 hours.";
+"lng_suggest_action_agree_removed_stars" = "If {channel} removes the post before it has been live for 24 hours, the Stars will be refunded.";
+"lng_suggest_action_agree_removed_ton" = "If {channel} removes the post before it has been live for 24 hours, Grams will be refunded.";
+"lng_suggest_action_your_not_enough_stars" = "**Transaction failed** because you didn't have enough Stars.";
+"lng_suggest_action_your_not_enough_ton" = "**Transaction failed** because you didn't have enough Grams.";
+"lng_suggest_action_his_not_enough_stars" = "**Transaction failed** because the user didn't have enough Stars.";
+"lng_suggest_action_his_not_enough_ton" = "**Transaction failed** because the user didn't have enough Grams.";
+"lng_suggest_action_declined" = "{from} rejected the message.";
+"lng_suggest_action_declined_reason" = "{from} rejected the message with the comment.";
+"lng_suggest_change_price" = "{from} suggests a new price for the message.";
+"lng_suggest_change_time" = "{from} suggests a new time for the message.";
+"lng_suggest_change_price_time" = "{from} suggests a new price and time for the message.";
+"lng_suggest_change_content" = "{from} suggests changes for the message.";
+"lng_suggest_change_price_label" = "New Price";
+"lng_suggest_change_time_label" = "New Time";
+"lng_suggest_change_text_label" = "Check the suggested message below";
+"lng_suggest_menu_edit_message" = "Edit Message";
+"lng_suggest_menu_edit_price" = "Edit Price";
+"lng_suggest_menu_edit_time" = "Edit Time";
+"lng_suggest_decline_title" = "Decline";
+"lng_suggest_decline_text" = "Do you want to decline publishing this post from {from}?";
+"lng_suggest_decline_text_to" = "Do you want to decline publishing this post to {channel}?";
+"lng_suggest_decline_reason" = "Add a reason (optional)";
+"lng_suggest_accept_title" = "Accept Terms";
+"lng_suggest_accept_text" = "Do you want to publish this post from {from}?";
+"lng_suggest_accept_text_to" = "Do you want to publish this post to {channel}?";
+"lng_suggest_accept_receive_stars#one" = "{channel} will receive **{count} Star** ({percent}) for publishing {date}.";
+"lng_suggest_accept_receive_stars#other" = "{channel} will receive **{count} Stars** ({percent}) for publishing {date}.";
+"lng_suggest_accept_receive_ton#one" = "{channel} will receive **{count} Gram** ({percent}) for publishing {date}.";
+"lng_suggest_accept_receive_ton#other" = "{channel} will receive **{count} Grams** ({percent}) for publishing {date}.";
+"lng_suggest_accept_receive_now_stars#one" = "{channel} will receive **{count} Star** ({percent}) for publishing right now.";
+"lng_suggest_accept_receive_now_stars#other" = "{channel} will receive **{count} Stars** ({percent}) for publishing right now.";
+"lng_suggest_accept_receive_now_ton#one" = "{channel} will receive **{count} Gram** ({percent}) for publishing right now.";
+"lng_suggest_accept_receive_now_ton#other" = "{channel} will receive **{count} Grams** ({percent}) for publishing right now.";
+"lng_suggest_accept_receive_if" = "It must remain visible for at least **24** hours after publication.";
+"lng_suggest_accept_pay_stars#one" = "You will pay **{count} Star** for publishing {date}.";
+"lng_suggest_accept_pay_stars#other" = "You will pay **{count} Stars** for publishing {date}.";
+"lng_suggest_accept_pay_ton#one" = "You will pay **{count} Gram** for publishing {date}.";
+"lng_suggest_accept_pay_ton#other" = "You will pay **{count} Grams** for publishing {date}.";
+"lng_suggest_accept_pay_now_stars#one" = "You will pay **{count} Star** for publishing right now.";
+"lng_suggest_accept_pay_now_stars#other" = "You will pay **{count} Stars** for publishing right now.";
+"lng_suggest_accept_pay_now_ton#one" = "You will pay **{count} Gram** for publishing right now.";
+"lng_suggest_accept_pay_now_ton#other" = "You will pay **{count} Grams** for publishing right now.";
+"lng_suggest_accept_send" = "Publish";
+"lng_suggest_stars_amount#one" = "{count} Star";
+"lng_suggest_stars_amount#other" = "{count} Stars";
+"lng_suggest_ton_amount#one" = "{count} Gram";
+"lng_suggest_ton_amount#other" = "{count} Grams";
+"lng_suggest_warn_title_stars" = "Stars will be lost";
+"lng_suggest_warn_title_ton" = "Grams will be lost";
+"lng_suggest_warn_text_stars" = "You won't receive **Stars** for the post if you delete it now. The post must remain visible for at least **24 hours** after it was published.";
+"lng_suggest_warn_text_ton" = "You won't receive **Grams** for the post if you delete it now. The post must remain visible for at least **24 hours** after it was published.";
+"lng_suggest_warn_delete_anyway" = "Delete Anyway";
+"lng_suggest_low_ton_title" = "{amount} Grams Needed";
+"lng_suggest_low_ton_text" = "You can add funds to your balance via the third-party platform Fragment.";
+"lng_suggest_low_ton_fragment" = "Add Funds via Fragment";
+"lng_suggest_low_ton_fragment_url" = "https://fragment.com/ads/topup";
 
 "lng_reply_in_another_title" = "Reply in...";
 "lng_reply_in_another_chat" = "Reply in Another Chat";
+"lng_reply_in_author" = "Message author";
+"lng_reply_in_chats_list" = "Your chats";
 "lng_reply_show_in_chat" = "Show in Chat";
 "lng_reply_remove" = "Do Not Reply";
 "lng_reply_about_quote" = "You can select a specific part to quote.";
@@ -3698,6 +5542,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_link_move_down" = "Move Down";
 "lng_link_shrink_photo" = "Shrink Photo";
 "lng_link_enlarge_photo" = "Enlarge Photo";
+"lng_link_shrink_video" = "Shrink Video";
+"lng_link_enlarge_video" = "Enlarge Video";
 "lng_link_remove" = "Do Not Preview";
 "lng_link_about_choose" = "Click on a link to generate its preview.";
 
@@ -3706,13 +5552,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_reply_cant_forward" = "Sorry, you can't reply to a message that was sent before the group was upgraded to a supergroup. Do you wish to forward it and add your comment?";
 
 "lng_share_title" = "Share to";
+"lng_share_at_time_title" = "Share at {time} to";
 "lng_share_copy_link" = "Copy share link";
 "lng_share_confirm" = "Send";
 "lng_share_wrong_user" = "This game was opened from a different user.";
 "lng_share_game_link_copied" = "Game link copied to clipboard.";
 "lng_share_done" = "Done!";
-"lng_share_message_to_saved_messages" = "Message forwarded to **Saved Messages**.";
-"lng_share_messages_to_saved_messages" = "Messages forwarded to **Saved Messages**.";
+"lng_share_message_to_saved" = "Message forwarded to **{chat}**.";
+"lng_share_messages_to_saved" = "Messages forwarded to **{chat}**.";
 "lng_share_message_to_chat" = "Message forwarded to **{chat}**.";
 "lng_share_messages_to_chat" = "Messages forwarded to **{chat}**.";
 "lng_share_message_to_two_chats" = "Message forwarded to **{user}** and **{chat}**.";
@@ -3728,9 +5575,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_contact_phone_after" = "Phone number will be visible once {user} adds you as a contact.";
 "lng_contact_share_phone" = "Share my phone number";
 "lng_contact_phone_will_be_shared" = "You can make your phone visible to {user}.";
+"lng_contact_add_notes" = "Note";
+"lng_contact_add_notes_about" = "Notes are only visible to you.";
+"lng_contact_notes_limit_reached#one" = "You've reached the contact note limit. Please make the note shorter by {count} character.";
+"lng_contact_notes_limit_reached#other" = "You've reached the contact note limit. Please make the note shorter by {count} characters.";
+"lng_suggest_photo_for" = "Suggest Photo for {user}";
+"lng_suggest_birthday" = "Suggest Date of Birth";
+"lng_suggest_birthday_box_title" = "{user}'s Date of Birth";
+"lng_suggest_birthday_box_confirm" = "Suggest";
+"lng_set_photo_for_user" = "Set Photo for {user}";
+"lng_contact_photo_replace_info" = "You can replace {user}'s photo with another photo that only you will see.";
 "lng_edit_contact_title" = "Edit contact";
 "lng_edit_channel_title" = "Edit channel";
 "lng_edit_bot_title" = "Edit bot";
+"lng_edit_autotranslate" = "Auto-translate messages";
 "lng_edit_sign_messages" = "Sign messages";
 "lng_edit_sign_messages_about" = "Add names of admins to the messages they post.";
 "lng_edit_sign_profiles" = "Show authors' profiles";
@@ -3746,6 +5604,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_edit_channel_status_about" = "Choose a status that will be shown next to the channel's name.";
 "lng_edit_channel_status_group" = "Set Group Emoji Status";
 "lng_edit_channel_status_about_group" = "Choose a status that will be shown next to the group's name.";
+"lng_edit_channel_personal_channel" = "Set as Personal Channel";
 "lng_edit_self_title" = "Edit your name";
 "lng_confirm_contact_data" = "New Contact";
 "lng_add_contact" = "Create";
@@ -3766,10 +5625,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_drag_images_here" = "Drop images here";
 "lng_drag_photos_here" = "Drop photos here";
 "lng_drag_files_here" = "Drop files here";
+"lng_drag_media_here" = "Drop photos and videos";
 
 "lng_drag_to_send_quick" = "to send them in a quick way";
 "lng_drag_to_send_no_compression" = "to send them without compression";
 "lng_drag_to_send_files" = "to send them as documents";
+"lng_drag_to_send_media" = "to send them as media files";
+
+"lng_drag_proxy_here" = "Connect to a proxy";
+"lng_drag_proxy_about" = "Drop the link here";
 
 "lng_selected_clear" = "Cancel";
 "lng_selected_delete" = "Delete";
@@ -3780,6 +5644,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_selected_delete_sure_this" = "Do you want to delete this message?";
 "lng_selected_delete_sure#one" = "Do you want to delete {count} message?";
 "lng_selected_delete_sure#other" = "Do you want to delete {count} messages?";
+"lng_delete_title_message_one" = "Delete this message";
+"lng_delete_title_message_many#one" = "Delete {count} message";
+"lng_delete_title_message_many#other" = "Delete {count} messages";
+"lng_delete_title_reaction_this" = "Delete this reaction";
+"lng_delete_title_reaction_all" = "Delete all reactions";
+"lng_delete_label_also_this_reaction" = "Also delete this reaction.";
+"lng_delete_label_also_some_reactions" = "Also delete all reactions from some participants.";
+"lng_delete_label_also_all_reactions" = "Also delete all reactions.";
+"lng_delete_sub_messages" = "Delete all messages";
+"lng_delete_sub_reactions" = "Delete all reactions";
+"lng_context_delete_this_reaction" = "Delete this reaction";
+"lng_selected_remove_saved_music" = "Do you want to remove this file from your profile?";
+"lng_saved_music_added" = "Audio added to your Profile.";
+"lng_saved_music_removed" = "Audio removed from your Profile.";
 "lng_delete_photo_sure" = "Do you want to delete this photo?";
 "lng_delete_for_everyone_hint#one" = "This will delete it for everyone in this chat.";
 "lng_delete_for_everyone_hint#other" = "This will delete them for everyone in this chat.";
@@ -3821,11 +5699,128 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_search_messages_from" = "Show messages from";
 "lng_search_messages_n_of_amount" = "{n} of {amount}";
 "lng_search_messages_none" = "No results";
+"lng_search_filter_all" = "All chats";
+"lng_search_filter_private" = "Private chats";
+"lng_search_filter_group" = "Group chats";
+"lng_search_filter_channel" = "Channels";
+"lng_search_sponsored_button" = "Ad ⋮";
+"lng_sr_chat_channel" = "Channel";
+"lng_sr_chat_group" = "Group";
+"lng_sr_chat_bot" = "Bot";
+"lng_sr_chat_topic" = "Topic";
+"lng_sr_chat_folder" = "Folder";
+"lng_sr_chat_hashtag" = "Hashtag";
+"lng_sr_chat_service" = "Service Notifications";
+"lng_sr_chat_verified" = "Verified";
+"lng_sr_chat_scam" = "Scam";
+"lng_sr_chat_fake" = "Fake";
+"lng_sr_chat_pinned" = "Pinned";
+"lng_sr_chat_unread#one" = "{count} new message";
+"lng_sr_chat_unread#other" = "{count} new messages";
+"lng_sr_chat_mention" = "Mentioned";
+"lng_sr_chat_message_reactions" = "Reactions: {reactions}";
+"lng_sr_chat_reaction_star" = "star";
+"lng_sr_chat_reaction_custom" = "custom reaction";
+"lng_sr_chat_sending" = "Sending";
+"lng_sr_chat_sent" = "Sent";
+"lng_sr_chat_failed" = "Failed";
+"lng_sr_chat_received" = "Received";
+"lng_sr_chat_online" = "Online";
+"lng_sr_chat_sponsored" = "Sponsored";
+"lng_sr_chat_stories_unread#one" = "{count} unread story";
+"lng_sr_chat_stories_unread#other" = "{count} unread stories";
+"lng_sr_chat_stories_read" = "Has stories";
+"lng_sr_chat_autodelete" = "Auto-delete enabled";
+"lng_sr_chat_subscribed" = "Subscribed";
+"lng_sr_chat_forwarded" = "Forwarded";
+"lng_sr_chat_story_reply" = "Story reply";
+
+"lng_sr_chat_column_type" = "Type";
+"lng_sr_chat_column_name" = "Name";
+"lng_sr_chat_column_warning" = "Warning";
+"lng_sr_chat_column_premium" = "Premium";
+"lng_sr_chat_column_verified" = "Verified";
+"lng_sr_chat_column_activity" = "Activity";
+"lng_sr_chat_column_muted" = "Muted";
+"lng_sr_chat_column_pinned" = "Pinned";
+"lng_sr_chat_column_draft" = "Draft";
+"lng_sr_chat_column_unread" = "Unread";
+"lng_sr_chat_column_mention" = "Mention";
+"lng_sr_chat_column_sender" = "Sender";
+"lng_sr_chat_column_message" = "Message";
+"lng_sr_chat_column_delivery" = "Delivery";
+"lng_sr_chat_column_reactions" = "Reactions";
+"lng_sr_chat_column_time" = "Time";
+"lng_sr_chat_column_sponsored" = "Sponsored";
+"lng_sr_chat_column_stories" = "Stories";
+"lng_sr_chat_column_autodelete" = "Auto-delete";
+"lng_sr_chat_column_subscription" = "Subscription";
+"lng_sr_chat_column_closed" = "Closed";
+"lng_sr_chat_column_forward" = "Forward";
+"lng_sr_chat_column_folders" = "Folders";
+
+"lng_sr_message_list" = "Messages";
+"lng_sr_from_me" = "Me";
+"lng_sr_message_seen" = "Seen";
+"lng_sr_message_not_seen" = "Not seen";
+"lng_sr_message_played" = "Played";
+"lng_sr_message_not_played" = "Not played";
+"lng_sr_message_not_downloaded" = "Not downloaded";
+"lng_sr_message_downloading" = "Downloading";
+"lng_sr_message_reply_to" = "In reply to {name}: {text}";
+"lng_sr_message_custom_emoji" = "Custom emoji {emoji}";
+
+"lng_sr_message_column_media_type" = "Media type";
+"lng_sr_message_column_artist" = "Artist";
+"lng_sr_message_column_title" = "Title";
+"lng_sr_message_column_filename" = "Filename";
+"lng_sr_message_column_duration" = "Duration";
+"lng_sr_message_column_dimensions" = "Dimensions";
+"lng_sr_message_column_file_size" = "File size";
+"lng_sr_message_column_signature" = "Signature";
+"lng_sr_message_column_web_site" = "Website";
+"lng_sr_message_column_web_title" = "Link title";
+"lng_sr_message_column_web_description" = "Link description";
+"lng_sr_message_column_poll_question" = "Poll question";
+"lng_sr_message_column_poll_status" = "Poll status";
+"lng_sr_message_column_contact_name" = "Contact name";
+"lng_sr_message_column_contact_phone" = "Contact phone";
+"lng_sr_message_column_location" = "Location";
+"lng_sr_message_column_sticker_emoji" = "Sticker emoji";
+"lng_sr_message_column_game_title" = "Game title";
+"lng_sr_message_column_game_description" = "Game description";
+"lng_sr_message_column_invoice_title" = "Invoice title";
+"lng_sr_message_column_invoice_amount" = "Invoice amount";
+"lng_sr_message_column_spoiler" = "Spoiler";
+"lng_sr_message_column_dice" = "Dice";
+"lng_sr_message_column_giveaway" = "Giveaway";
+"lng_sr_message_column_gift" = "Gift";
+"lng_sr_message_column_todo_title" = "Todo title";
+"lng_sr_message_column_todo_items" = "Todo items";
+"lng_sr_message_column_factcheck" = "Fact check";
+"lng_sr_message_column_forward_date" = "Forward date";
+"lng_sr_message_column_forward_author" = "Forward author";
+"lng_sr_message_column_paid_reactions" = "Paid reactions";
+
+"lng_sr_message_spoiler" = "Hidden media";
+"lng_sr_message_todo_completed" = "Completed";
+"lng_sr_message_todo_not_completed" = "Not completed";
+"lng_sr_message_gift_premium#one" = "Premium gift, {count} day";
+"lng_sr_message_gift_premium#other" = "Premium gift, {count} days";
+"lng_sr_message_gift_credits#one" = "Star gift, {count} star";
+"lng_sr_message_gift_credits#other" = "Star gift, {count} stars";
+"lng_sr_message_invoice_paid" = "Paid";
+"lng_sr_message_invoice_unpaid" = "Unpaid";
+
+"lng_sr_folder_locked" = "{text}, Premium required";
+"lng_sr_folder_locked_about" = "Press to view subscription options.";
 
 "lng_media_save_progress" = "{ready} of {total} {mb}";
 "lng_mediaview_save_as" = "Save As...";
 "lng_mediaview_copy" = "Copy";
+"lng_mediaview_copy_frame" = "Copy Frame";
 "lng_mediaview_forward" = "Forward";
+"lng_mediaview_share_at_time" = "Share at {time}";
 "lng_mediaview_delete" = "Delete";
 "lng_mediaview_save_to_profile" = "Post to Profile";
 "lng_mediaview_pin_story_done" = "Story pinned";
@@ -3869,6 +5864,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_mediaview_downloads" = "Downloads";
 "lng_mediaview_playback_speed" = "Playback speed: {speed}";
 "lng_mediaview_rotate_video" = "Rotate video";
+"lng_mediaview_quality_auto" = "Auto";
+"lng_mediaview_quality_original" = "Original ({quality}p)";
 
 "lng_theme_preview_title" = "Theme Preview";
 "lng_theme_preview_generating" = "Generating color theme preview...";
@@ -3889,9 +5886,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_menu_formatting_blockquote" = "Quote";
 "lng_menu_formatting_monospace" = "Monospace";
 "lng_menu_formatting_spoiler" = "Spoiler";
+"lng_menu_formatting_date" = "Date";
 "lng_menu_formatting_link_create" = "Create link";
 "lng_menu_formatting_link_edit" = "Edit link";
 "lng_menu_formatting_clear" = "Clear formatting";
+"lng_formatting_date_title" = "Choose date and time";
 "lng_formatting_link_create_title" = "Create link";
 "lng_formatting_link_edit_title" = "Edit link";
 "lng_formatting_link_text" = "Text";
@@ -3903,6 +5902,40 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_text_copied" = "Text copied to clipboard.";
 "lng_code_copied" = "Code copied to clipboard.";
+"lng_date_copied" = "Date copied to clipboard.";
+
+"lng_date_relative_now" = "now";
+
+"lng_date_relative_seconds_ago#one" = "{count} second ago";
+"lng_date_relative_seconds_ago#other" = "{count} seconds ago";
+"lng_date_relative_minutes_ago#one" = "{count} minute ago";
+"lng_date_relative_minutes_ago#other" = "{count} minutes ago";
+"lng_date_relative_hours_ago#one" = "{count} hour ago";
+"lng_date_relative_hours_ago#other" = "{count} hours ago";
+"lng_date_relative_days_ago#one" = "{count} day ago";
+"lng_date_relative_days_ago#other" = "{count} days ago";
+"lng_date_relative_months_ago#one" = "{count} month ago";
+"lng_date_relative_months_ago#other" = "{count} months ago";
+"lng_date_relative_years_ago#one" = "{count} year ago";
+"lng_date_relative_years_ago#other" = "{count} years ago";
+
+"lng_date_relative_in_seconds#one" = "in {count} second";
+"lng_date_relative_in_seconds#other" = "in {count} seconds";
+"lng_date_relative_in_minutes#one" = "in {count} minute";
+"lng_date_relative_in_minutes#other" = "in {count} minutes";
+"lng_date_relative_in_hours#one" = "in {count} hour";
+"lng_date_relative_in_hours#other" = "in {count} hours";
+"lng_date_relative_in_days#one" = "in {count} day";
+"lng_date_relative_in_days#other" = "in {count} days";
+"lng_date_relative_in_months#one" = "in {count} month";
+"lng_date_relative_in_months#other" = "in {count} months";
+"lng_date_relative_in_years#one" = "in {count} year";
+"lng_date_relative_in_years#other" = "in {count} years";
+
+"lng_context_copy_date" = "Copy Date";
+"lng_context_add_to_calendar" = "Add to Calendar";
+"lng_context_set_reminder" = "Set a Reminder";
+"lng_reminder_scheduled_in" = "Reminder scheduled in {link}.";
 
 "lng_spellchecker_submenu" = "Spelling";
 "lng_spellchecker_add" = "Add to Dictionary";
@@ -3950,7 +5983,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_payments_webview_no_use" = "Unfortunately, you can't use payments with current system configuration.";
 "lng_payments_webview_install_edge" = "Please install {link}.";
-"lng_payments_webview_install_webkit" = "Please install WebKitGTK (webkitgtk-6.0/webkit2gtk-4.1/webkit2gtk-4.0) using your package manager.";
+"lng_payments_webview_install_webkit" = "Please install WebKitGTK (webkit2gtk-4.1/webkit2gtk-4.0) using your package manager.";
 "lng_payments_webview_update_windows" = "Please update your system to Windows 8.1 or later.";
 "lng_payments_sure_close" = "Are you sure you want to close this payment form? The changes you made will be lost.";
 "lng_payments_receipt_label" = "Receipt";
@@ -4029,6 +6062,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_call_status_failed" = "failed to connect";
 "lng_call_status_ringing" = "ringing...";
 "lng_call_status_busy" = "line busy";
+"lng_call_status_group_invite" = "Telegram Group Call";
 "lng_call_status_sure" = "Click on the Camera icon if you want to start a video call.";
 "lng_call_fingerprint_tooltip" = "If the emoji on {user}'s screen are the same, this call is 100% secure";
 
@@ -4038,6 +6072,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_call_error_camera_not_started" = "You can switch to video call once you're connected.";
 "lng_call_error_camera_outdated" = "{user}'s app does not support video calls. They need to update their app before you can call them.";
 "lng_call_error_audio_io" = "There seems to be a problem with your sound card. Please make sure that your computer's speakers and microphone are working and try again.";
+"lng_call_error_add_not_started" = "You can add more people once you're connected.";
 
 "lng_call_bar_hangup" = "End call";
 "lng_call_leave_to_other_sure" = "End your active call and join this video chat?";
@@ -4056,16 +6091,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_call_outgoing" = "Outgoing call";
 "lng_call_video_outgoing" = "Outgoing video call";
+"lng_call_group_outgoing" = "Outgoing group call";
 "lng_call_incoming" = "Incoming call";
 "lng_call_video_incoming" = "Incoming video call";
+"lng_call_group_incoming" = "Incoming group call";
 "lng_call_missed" = "Missed call";
 "lng_call_video_missed" = "Missed video call";
+"lng_call_group_missed" = "Missed group call";
 "lng_call_cancelled" = "Canceled call";
 "lng_call_video_cancelled" = "Canceled video call";
 "lng_call_declined" = "Declined call";
 "lng_call_video_declined" = "Declined video call";
+"lng_call_group_declined" = "Declined group call";
 "lng_call_duration_info" = "{time}, {duration}";
 "lng_call_type_and_duration" = "{type} ({duration})";
+"lng_call_invitation" = "Group call invitation";
+"lng_call_ongoing" = "Ongoing group call";
 
 "lng_call_rate_label" = "Please rate the quality of your call";
 "lng_call_rate_comment" = "Comment (optional)";
@@ -4074,6 +6115,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_call_start_video" = "Start Video";
 "lng_call_stop_video" = "Stop Video";
 "lng_call_screencast" = "Screencast";
+"lng_call_add_people" = "Add People";
 "lng_call_end_call" = "End Call";
 "lng_call_mute_audio" = "Mute";
 "lng_call_unmute_audio" = "Unmute";
@@ -4092,10 +6134,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_raised_hand_status" = "wants to speak";
 "lng_group_call_settings" = "Settings";
 "lng_group_call_video" = "Video";
+"lng_group_call_message" = "Message";
 "lng_group_call_screen_share_start" = "Share Screen";
 "lng_group_call_screen_share_stop" = "Stop Sharing";
 "lng_group_call_screen_title" = "Screen {index}";
 "lng_group_call_screen_share_audio" = "Share System Audio";
+"lng_group_call_sharing_screen_options" = "Sharing Options";
+"lng_group_call_choose_source" = "Choose Source";
 "lng_group_call_unmute" = "Unmute";
 "lng_group_call_unmute_sub" = "Hold space bar to temporarily unmute.";
 "lng_group_call_you_are_live" = "You are Live";
@@ -4105,8 +6150,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_connecting" = "Connecting...";
 "lng_group_call_leave" = "Leave";
 "lng_group_call_leave_title" = "Leave video chat";
+"lng_group_call_leave_title_call" = "Leave group call";
 "lng_group_call_leave_title_channel" = "Leave live stream";
 "lng_group_call_leave_sure" = "Do you want to leave this video chat?";
+"lng_group_call_leave_sure_call" = "Do you want to leave this group call?";
 "lng_group_call_leave_sure_channel" = "Are you sure you want to leave this live stream?";
 "lng_group_call_close" = "Close";
 "lng_group_call_close_sure" = "Video chat is scheduled. You can abort it or just close this panel.";
@@ -4136,16 +6183,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_also_end_channel" = "End live stream";
 "lng_group_call_settings_title" = "Settings";
 "lng_group_call_invite" = "Invite Members";
+"lng_group_call_invite_conf" = "Add People";
 "lng_group_call_invited_status" = "invited";
+"lng_group_call_calling_status" = "calling...";
+"lng_group_call_blockchain_only_status" = "listening";
 "lng_group_call_muted_by_me_status" = "muted for you";
 "lng_group_call_invite_title" = "Invite members";
 "lng_group_call_invite_button" = "Invite";
+"lng_group_call_confcall_add" = "Call";
 "lng_group_call_add_to_group_one" = "{user} isn't a member of «{group}». Add them to the group?";
 "lng_group_call_add_to_group_some" = "Some of those users aren't members of «{group}». Add them to the group?";
 "lng_group_call_add_to_group_all" = "Those users aren't members of «{group}». Add them to the group?";
 "lng_group_call_invite_members" = "Group members";
 "lng_group_call_invite_search_results" = "Search results";
+"lng_group_call_invite_limit" = "This is currently the maximum allowed number of participants.";
 "lng_group_call_new_muted" = "Mute new participants";
+"lng_group_call_enable_messages" = "Enable messages";
 "lng_group_call_speakers" = "Speakers";
 "lng_group_call_microphone" = "Microphone";
 "lng_group_call_push_to_talk" = "Push-to-Talk Shortcut";
@@ -4183,6 +6236,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_context_pin_screen" = "Pin screencast";
 "lng_group_call_context_unpin_screen" = "Unpin screencast";
 "lng_group_call_context_remove" = "Remove";
+"lng_group_call_context_cancel_invite" = "Discard invite";
+"lng_group_call_context_stop_ringing" = "Stop calling";
+"lng_group_call_context_ban_from_call" = "Ban from call";
 "lng_group_call_remove_channel" = "Remove {channel} from the video chat and ban them?";
 "lng_group_call_remove_channel_from_channel" = "Remove {channel} from the live stream?";
 "lng_group_call_mac_access" = "Telegram Desktop does not have access to system wide keyboard input required for Push to Talk.";
@@ -4291,8 +6347,55 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_rtmp_viewers#one" = "{count} viewer";
 "lng_group_call_rtmp_viewers#other" = "{count} viewers";
 
-"lng_no_mic_permission" = "Telegram needs microphone access so that you can make calls and record voice messages.";
+"lng_confcall_join_title" = "Group Call";
+"lng_confcall_join_text" = "You are invited to join a Telegram Call.";
+"lng_confcall_join_text_inviter" = "{user} is inviting you to join a Telegram Call.";
+"lng_confcall_already_joined_one" = "{user} already joined this call.";
+"lng_confcall_already_joined_two" = "{user} and {other} already joined this call.";
+"lng_confcall_already_joined_three" = "{user}, {other} and {third} already joined this call.";
+"lng_confcall_already_joined_many#one" = "{user}, {other} and **{count}** other person already joined this call.";
+"lng_confcall_already_joined_many#other" = "{user}, {other} and **{count}** other people already joined this call.";
+"lng_confcall_join_button" = "Join Group Call";
+"lng_confcall_create_call" = "Start New Call";
+"lng_confcall_create_call_description#one" = "You can add up to {count} participant to a call.";
+"lng_confcall_create_call_description#other" = "You can add up to {count} participants to a call.";
+"lng_confcall_create_title" = "New Call";
+"lng_confcall_create_link" = "Create Call Link";
+"lng_confcall_create_link_description" = "You can create a link that will allow your friends on Telegram to join the call.";
+"lng_confcall_link_revoke" = "Revoke link";
+"lng_confcall_link_revoked_title" = "Link Revoked";
+"lng_confcall_link_inactive" = "This link is no longer active.";
+"lng_confcall_link_revoked_text" = "A new link has been generated.";
+"lng_confcall_link_title" = "Call Link";
+"lng_confcall_link_about" = "Anyone on Telegram can join your call by following the link below.";
+"lng_confcall_link_or" = "or";
+"lng_confcall_link_join" = "Be the first to join the call and add people from there. {link}";
+"lng_confcall_link_join_link" = "Open call {arrow}";
+"lng_confcall_inactive_title" = "Start Group Call";
+"lng_confcall_inactive_about" = "This call is no longer active.\nYou can start a new one.";
+"lng_confcall_invite_done_user" = "You're calling {user} to join.";
+"lng_confcall_invite_done_many#one" = "You're calling **{count} person** to join.";
+"lng_confcall_invite_done_many#other" = "You're calling **{count} people** to join.";
+"lng_confcall_invite_already_user" = "{user} is already in the call.";
+"lng_confcall_invite_already_many#one" = "**{count} person** is already in the call.";
+"lng_confcall_invite_already_many#other" = "**{count} people** are already in the call.";
+"lng_confcall_invite_privacy_user" = "You cannot call {user} because of their privacy settings.";
+"lng_confcall_invite_privacy_many#one" = "You cannot call **{count} person** because of their privacy settings.";
+"lng_confcall_invite_privacy_many#other" = "You cannot call **{count} people** because of their privacy settings.";
+"lng_confcall_invite_fail_user" = "Couldn't call {user} to join.";
+"lng_confcall_invite_fail_many#one" = "Couldn't call **{count} person** to join.";
+"lng_confcall_invite_fail_many#other" = "Couldn't call **{count} people** to join.";
+"lng_confcall_invite_kicked_user" = "{user} was banned from the call.";
+"lng_confcall_invite_kicked_many#one" = "**{count} person** was removed from the call.";
+"lng_confcall_invite_kicked_many#other" = "**{count} people** were removed from the call.";
+"lng_confcall_not_accessible" = "This call is no longer accessible.";
+"lng_confcall_participants_limit" = "This call reached the participants limit.";
+"lng_confcall_sure_remove" = "Remove {user} from the call?";
+"lng_confcall_e2e_badge" = "End-to-End Encrypted";
+"lng_confcall_e2e_badge_small" = "E2E Encrypted";
+"lng_confcall_e2e_about" = "These four emoji represent the call's encryption key. They must match for all participants and change when someone joins or leaves.";
 
+"lng_no_mic_permission" = "Telegram needs microphone access so that you can make calls and record voice messages.";
 "lng_player_message_today" = "today at {time}";
 "lng_player_message_yesterday" = "yesterday at {time}";
 "lng_player_message_date" = "{date} at {time}";
@@ -4308,9 +6411,43 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_rights_edit_admin_header" = "What can this admin do?";
 "lng_rights_edit_admin_rank_name" = "Custom title";
 "lng_rights_edit_admin_rank_about" = "A title that members will see instead of '{title}'.";
+"lng_context_add_my_tag" = "Add tag";
+"lng_context_edit_my_tag" = "Edit tag";
+"lng_context_add_member_tag" = "Add member tag";
+"lng_context_edit_member_tag" = "Edit member tag";
+"lng_rights_edit_tag_title" = "Edit tag";
+"lng_rights_tag_about" = "Add short tag next to {name}'s name.";
+"lng_rights_tag_about_self" = "Share your role, title, or how you're known in this group. Your tag is visible to all members.";
+
+"lng_tag_info_title_user" = "Member Tags";
+"lng_tag_info_title_admin" = "Admin Tags";
+"lng_tag_info_title_owner" = "Owner Tags";
+"lng_tag_info_text_user" = "This grey tag {emoji} is {author}'s member tag in {group}.";
+"lng_tag_info_text_admin" = "This green tag {emoji} is {author}'s admin tag in {group}.";
+"lng_tag_info_text_owner" = "This purple tag {emoji} is {author}'s owner tag in {group}.";
+"lng_tag_info_preview_member" = "Member Tag";
+"lng_tag_info_preview_admin" = "Admin Tag";
+"lng_tag_info_preview_owner" = "Owner Tag";
+"lng_tag_info_add_my_tag" = "Add My Tag";
+"lng_tag_info_edit_my_tag" = "Edit My Tag";
+"lng_tag_info_admins_only" = "Only admins can change tags in this group.";
+
+"lng_rights_promote_member" = "Promote to Admin";
+"lng_rights_remove_member" = "Remove from Group";
+"lng_rights_dismiss_admin" = "Dismiss Admin";
 "lng_rights_about_add_admins_yes" = "This admin will be able to add new admins with equal or fewer rights.";
 "lng_rights_about_add_admins_no" = "This admin will not be able to add new admins.";
-"lng_rights_about_by" = "This admin promoted by {user} at {date}.";
+"lng_rights_about_process_join_requests" = "Allow this bot to approve new members using its own interfaces, such as captchas.";
+"lng_rights_about_by" = "This admin promoted by {user} on {date}.";
+
+"lng_guard_bot_approve_title" = "Approve New Members";
+"lng_guard_bot_approve_text" = "New members will now need approval from {bot} before they can send messages in this group.";
+"lng_guard_bot_approve_text_channel" = "New members will now need approval from {bot} before they can join this channel.";
+"lng_guard_bot_approve_confirm" = "Enable";
+"lng_guard_bot_replace_title" = "Replace Bot";
+"lng_guard_bot_replace_text" = "{from} is currently processing join requests. Switch to {to} instead?";
+"lng_guard_bot_replace_confirm" = "Use {bot}";
+"lng_guard_bot_replace_cancel" = "Keep {bot}";
 
 "lng_rights_about_admin_cant_edit" = "You can't edit the rights of this admin.";
 "lng_rights_about_restriction_cant_edit" = "You cannot change the restrictions for this user.";
@@ -4333,6 +6470,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_rights_boosts_no_restrict" = "Do not restrict boosters";
 "lng_rights_boosts_about" = "Turn this on to always allow users who boosted your group to send messages and media.";
 "lng_rights_boosts_about_on" = "Choose how many boosts a user must give to the group to bypass restrictions on sending messages.";
+"lng_rights_charge_stars" = "Charge Stars for Messages";
+"lng_rights_charge_stars_about" = "If you turn this on, regular members of the group will have to pay Stars to send messages.";
+"lng_rights_charge_price" = "Set price per message";
+"lng_rights_charge_price_about" = "Your group will receive {percent} of the selected fee ({amount}) for each incoming message.";
 
 "lng_slowmode_enabled" = "Slow Mode is active.\nYou can send your next message in {left}.";
 "lng_slowmode_no_many" = "Slow mode is enabled. You can't send more than one message at a time.";
@@ -4340,6 +6481,29 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_slowmode_seconds#one" = "{count} second";
 "lng_slowmode_seconds#other" = "{count} seconds";
 
+"lng_payment_confirm_title" = "Confirm payment";
+"lng_payment_confirm_text#one" = "{name} charges **{count}** Star per message.";
+"lng_payment_confirm_text#other" = "{name} charges **{count}** Stars per message.";
+"lng_payment_confirm_amount#one" = "**{count}** Star";
+"lng_payment_confirm_amount#other" = "**{count}** Stars";
+"lng_payment_confirm_users#one" = "You selected **{count}** user who charge Stars for messages.";
+"lng_payment_confirm_users#other" = "You selected **{count}** users who charge Stars for messages.";
+"lng_payment_confirm_chats#one" = "You selected **{count}** chat where you pay Stars for messages.";
+"lng_payment_confirm_chats#other" = "You selected **{count}** chats where you pay Stars for messages.";
+"lng_payment_confirm_sure#one" = "Would you like to pay {amount} to send **{count}** message?";
+"lng_payment_confirm_sure#other" = "Would you like to pay {amount} to send **{count}** messages?";
+"lng_payment_confirm_dont_ask" = "Don't ask me again";
+"lng_payment_confirm_button#one" = "Pay for {count} Message";
+"lng_payment_confirm_button#other" = "Pay for {count} Messages";
+"lng_payment_bar_text" = "{name} must pay {cost} for each message to you.";
+"lng_payment_bar_button" = "Remove Fee";
+"lng_payment_refund_title" = "Remove Fee";
+"lng_payment_refund_text" = "Are you sure you want to allow {name} to message you for free?";
+"lng_payment_refund_channel" = "Do you want to allow {name} to message the channel for free?";
+"lng_payment_refund_also#one" = "Refund already paid {count} Star";
+"lng_payment_refund_also#other" = "Refund already paid {count} Stars";
+"lng_payment_refund_confirm" = "Confirm";
+
 "lng_rights_gigagroup_title" = "Broadcast group";
 "lng_rights_gigagroup_convert" = "Convert to Broadcast Group";
 "lng_rights_gigagroup_about" = "Broadcast groups can have over 200,000 members, but only admins can send messages in them.";
@@ -4365,6 +6529,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_rights_channel_edit_stories" = "Edit stories of others";
 "lng_rights_channel_delete_stories" = "Delete stories of others";
 "lng_rights_channel_manage_calls" = "Manage live streams";
+"lng_rights_channel_manage_direct" = "Manage direct messages";
 "lng_rights_group_info" = "Change group info";
 "lng_rights_group_ban" = "Ban users";
 "lng_rights_group_invite_link" = "Invite users via link";
@@ -4372,15 +6537,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_rights_group_pin" = "Pin messages";
 "lng_rights_group_topics" = "Manage topics";
 "lng_rights_group_add_topics" = "Create topics";
+"lng_rights_group_edit_rank" = "Edit own tags";
+"lng_rights_group_edit_rank_single" = "Edit own tag";
 "lng_rights_group_manage_calls" = "Manage video chats";
 "lng_rights_group_delete" = "Delete messages";
 "lng_rights_group_anonymous" = "Remain anonymous";
+"lng_rights_group_manage_ranks" = "Edit member tags";
 "lng_rights_add_admins" = "Add new admins";
+"lng_rights_group_process_join_requests" = "Process join requests";
 "lng_rights_chat_send_text" = "Send messages";
 "lng_rights_chat_send_media" = "Send media";
 "lng_rights_chat_send_stickers" = "Send stickers & GIFs";
 "lng_rights_chat_send_links" = "Embed links";
-"lng_rights_chat_send_polls" = "Send polls";
+"lng_rights_chat_send_reactions" = "Reactions";
+"lng_rights_chat_send_polls" = "Polls";
 "lng_rights_chat_add_members" = "Add members";
 "lng_rights_chat_photos" = "Photos";
 "lng_rights_chat_videos" = "Video files";
@@ -4389,8 +6559,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_rights_chat_files" = "Files";
 "lng_rights_chat_voice_messages" = "Voice messages";
 "lng_rights_chat_video_messages" = "Video messages";
-"lng_rights_chat_restricted_by" = "Restricted by {user} at {date}.";
-"lng_rights_chat_banned_by" = "Banned by {user} at {date}.";
+"lng_rights_chat_restricted_by" = "Restricted by {user} on {date}.";
+"lng_rights_chat_banned_by" = "Banned by {user} on {date}.";
 "lng_rights_chat_banned_until_header" = "Restricted until";
 "lng_rights_chat_banned_forever" = "Forever";
 "lng_rights_chat_banned_day#one" = "For {count} day";
@@ -4404,6 +6574,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_rights_transfer_channel" = "Transfer channel ownership";
 "lng_rights_transfer_check" = "Security check";
 "lng_rights_transfer_check_about" = "You can transfer this group to {user} only if you have:";
+"lng_rights_transfer_check_about_channel" = "You can transfer this channel to {user} only if you have:";
 "lng_rights_transfer_check_password" = "• Enabled **Two-Step Verification** more than **7 days** ago.";
 "lng_rights_transfer_check_session" = "• Logged in on this device more than **24 hours** ago.";
 "lng_rights_transfer_check_later" = "Please come back later.";
@@ -4430,6 +6601,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_restricted_send_gifs" = "The admins of this group have restricted your ability to send GIFs.";
 "lng_restricted_send_inline" = "The admins of this group have restricted your ability to send inline content.";
 "lng_restricted_send_polls" = "The admins of this group have restricted your ability to send polls.";
+"lng_restricted_send_reactions_click" = "You cannot send reactions in this chat.";
 "lng_restricted_boost_group" = "Boost this group to send messages";
 
 "lng_restricted_send_message_until" = "The admins of this group have restricted you from sending messages until {date}, {time}.";
@@ -4457,6 +6629,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_restricted_send_polls_all" = "Sorry, sending polls is not allowed in this group.";
 
 "lng_restricted_send_public_polls" = "Sorry, polls with visible votes can't be forwarded to channels.";
+"lng_restricted_send_todo_lists" = "Sorry, Checklists can't be forwarded to channels.";
 "lng_restricted_send_paid_media" = "Sorry, paid media can't be sent to this channel.";
 
 "lng_restricted_send_voice_messages" = "{user} doesn't accept voice messages.";
@@ -4471,20 +6644,27 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_send_non_premium_message_toast" = "**{user}** only accepts messages from contacts and {link} subscribers.";
 "lng_send_non_premium_message_toast_link" = "Telegram Premium";
 
+"lng_send_charges_stars_channel" = "{channel} charges {amount} per message to its admin.";
+"lng_send_free_channel" = "Send a direct message to the administrator of {channel}.";
+"lng_send_charges_stars_text" = "{user} charges {amount} for each message.";
+"lng_send_charges_stars_go" = "Buy Stars";
+
 "lng_exceptions_list_title" = "Exceptions";
 "lng_removed_list_title" = "Removed users";
 
 "lng_admin_log_title_all" = "All actions";
 "lng_admin_log_title_selected" = "Selected actions";
-"lng_admin_log_filter" = "Filter";
 "lng_admin_log_filter_title" = "Filter";
 "lng_admin_log_filter_all_actions" = "All actions";
 "lng_admin_log_filter_actions_type_subtitle" = "Filter actions by type";
 "lng_admin_log_filter_actions_member_section" = "Members And Admins";
+"lng_admin_log_filter_actions_subscriber_section" = "Subscribers And Admins";
 "lng_admin_log_filter_restrictions" = "New restrictions";
 "lng_admin_log_filter_admins_new" = "Admin rights";
 "lng_admin_log_filter_members_new" = "New members";
+"lng_admin_log_filter_subscribers_new" = "New subscribers";
 "lng_admin_log_filter_actions_settings_section" = "Group Settings";
+"lng_admin_log_filter_actions_channel_settings_section" = "Channel Settings";
 "lng_admin_log_filter_info_group" = "Group info";
 "lng_admin_log_filter_info_channel" = "Channel info";
 "lng_admin_log_filter_actions_messages_section" = "Messages";
@@ -4495,12 +6675,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_admin_log_filter_voice_chats_channel" = "Live stream";
 "lng_admin_log_filter_invite_links" = "Invite links";
 "lng_admin_log_filter_members_removed" = "Members leaving";
+"lng_admin_log_filter_subscribers_removed" = "Subscribers leaving";
 "lng_admin_log_filter_topics" = "Topics";
 "lng_admin_log_filter_sub_extend" = "Subscription Renewals";
+"lng_admin_log_filter_edit_rank" = "Tag Changes";
 "lng_admin_log_filter_all_admins" = "All users and admins";
 "lng_admin_log_filter_actions_admins_subtitle" = "Filter actions by admins";
 "lng_admin_log_filter_actions_admins_section" = "Show Actions by All Admins";
-"lng_admin_log_about" = "What is this?";
 "lng_admin_log_about_text" = "This is a list of all notable actions by group members and admins in the last 48 hours.";
 "lng_admin_log_about_text_channel" = "This is a list of all service actions taken by the channel's admins in the last 48 hours.";
 "lng_admin_log_no_results_title" = "No actions found";
@@ -4552,6 +6733,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_admin_log_edited_message" = "{from} edited message:";
 "lng_admin_log_previous_message" = "Original message";
 "lng_admin_log_deleted_message" = "{from} deleted message:";
+"lng_admin_log_deleted_messages_collapsed#one" = "{from} deleted {count} message from {names} ({link}).";
+"lng_admin_log_deleted_messages_collapsed#other" = "{from} deleted {count} messages from {names} ({link}).";
+"lng_admin_log_show_all" = "Show all";
+"lng_admin_log_hide_all" = "Hide all";
+"lng_admin_log_expand_more#one" = "Show {count} More Message";
+"lng_admin_log_expand_more#other" = "Show {count} More Messages";
 "lng_admin_log_sent_message" = "{from} sent this message:";
 "lng_admin_log_participant_joined" = "{from} joined the group";
 "lng_admin_log_participant_joined_channel" = "{from} joined the channel";
@@ -4570,6 +6757,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_admin_log_stopped_poll" = "{from} stopped poll:";
 "lng_admin_log_invited" = "invited {user}";
 "lng_admin_log_banned" = "banned {user}";
+"lng_admin_log_banned_until" = "banned {user} {until}";
 "lng_admin_log_unbanned" = "unbanned {user}";
 "lng_admin_log_restricted" = "changed restrictions for {user} {until}";
 "lng_admin_log_promoted" = "changed privileges for {user}";
@@ -4605,6 +6793,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_admin_log_participant_volume_channel" = "{from} changed live stream volume for {user} to {percent}";
 "lng_admin_log_antispam_enabled" = "{from} enabled aggressive anti-spam";
 "lng_admin_log_antispam_disabled" = "{from} disabled aggressive anti-spam";
+"lng_admin_log_autotranslate_enabled" = "{from} enabled automatic translation";
+"lng_admin_log_autotranslate_disabled" = "{from} disabled automatic translation";
 "lng_admin_log_change_color" = "{from} changed channel color from {previous} to {color}";
 "lng_admin_log_set_background_emoji" = "{from} set channel background emoji to {emoji}";
 "lng_admin_log_change_background_emoji" = "{from} changed channel background emoji from {previous} to {emoji}";
@@ -4661,6 +6851,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_admin_log_banned_send_stickers" = "Send stickers & GIFs";
 "lng_admin_log_banned_embed_links" = "Embed links";
 "lng_admin_log_banned_send_polls" = "Send polls";
+"lng_admin_log_banned_send_reactions" = "Send reactions";
 "lng_admin_log_admin_change_info" = "Change info";
 "lng_admin_log_admin_post_messages" = "Post messages";
 "lng_admin_log_admin_edit_messages" = "Edit messages";
@@ -4673,13 +6864,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_admin_log_admin_invite_users" = "Add users";
 "lng_admin_log_admin_invite_link" = "Invite users via link";
 "lng_admin_log_admin_pin_messages" = "Pin messages";
+"lng_admin_log_banned_edit_rank" = "Edit own tags";
+"lng_admin_log_banned_edit_rank_single" = "Edit own tag";
 "lng_admin_log_admin_manage_topics" = "Manage topics";
 "lng_admin_log_admin_create_topics" = "Create topics";
 "lng_admin_log_admin_manage_calls" = "Manage video chats";
 "lng_admin_log_admin_manage_calls_channel" = "Manage live streams";
+"lng_admin_log_admin_manage_direct" = "Manage direct messages";
+"lng_admin_log_admin_manage_ranks" = "Edit member tags";
 "lng_admin_log_admin_add_admins" = "Add new admins";
 "lng_admin_log_subscription_extend" = "{name} renewed subscription until {date}";
 
+"lng_admin_log_changed_rank_from" = "{from} changed tag for {user} from \"{previous}\" to \"{tag}\"";
+"lng_admin_log_set_rank" = "{from} set tag for {user} to \"{tag}\"";
+"lng_admin_log_removed_rank" = "{from} removed tag for {user} (was \"{previous}\")";
+"lng_admin_log_changed_own_rank_from" = "{from} changed own tag from \"{previous}\" to \"{tag}\"";
+"lng_admin_log_set_own_rank" = "{from} set own tag to \"{tag}\"";
+"lng_admin_log_removed_own_rank" = "{from} removed own tag (was \"{previous}\")";
+
 "lng_admin_log_antispam_menu_report" = "Report False Positive";
 "lng_admin_log_antispam_menu_report_toast" = "You can manage anti-spam settings in {link}.";
 "lng_admin_log_antispam_menu_report_toast_link" = "Group Info > Administrators";
@@ -4714,6 +6916,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_forward_show_captions" = "Show captions";
 "lng_forward_change_recipient" = "Change recipient";
 "lng_forward_sender_names_removed" = "Sender names removed";
+"lng_forward_header_short" = "Forward";
+"lng_forward_action_show_sender" = "Show Sender Name";
+"lng_forward_action_show_senders" = "Show Sender Names";
+"lng_forward_action_hide_sender" = "Hide Sender Name";
+"lng_forward_action_hide_senders" = "Hide Sender Names";
+"lng_forward_action_show_caption" = "Show Caption";
+"lng_forward_action_show_captions" = "Show Captions";
+"lng_forward_action_hide_caption" = "Hide Caption";
+"lng_forward_action_hide_captions" = "Hide Captions";
+"lng_forward_action_change_recipient" = "Change Recipient";
+"lng_forward_action_remove" = "Do Not Forward";
 
 "lng_passport_title" = "Telegram Passport";
 "lng_passport_request1" = "{bot} requests access to your personal data";
@@ -4856,12 +7069,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_export_option_contacts_about" = "If you allow access, contacts are continuously synced with Telegram. You can adjust this in Settings > Privacy & Security on mobile devices.";
 "lng_export_option_stories" = "Story archive";
 "lng_export_option_stories_about" = "All stories you posted from Telegram mobile apps.";
+"lng_export_option_profile_music" = "Music on Profiles";
+"lng_export_option_profile_music_about" = "All tracks you saved to your playlist.";
 "lng_export_option_sessions" = "Active sessions";
 "lng_export_option_sessions_about" = "We may store this to display your connected devices in Settings > Privacy & Security > Show all sessions.";
 "lng_export_header_other" = "Other";
 "lng_export_option_other" = "Miscellaneous data";
 "lng_export_option_other_about" = "Other types of data not mentioned above (beta).";
 "lng_export_header_chats" = "Chat export settings";
+"lng_export_header_topic" = "Topic export settings";
 "lng_export_option_personal_chats" = "Personal chats";
 "lng_export_option_bot_chats" = "Bot chats";
 "lng_export_option_private_groups" = "Private groups";
@@ -4931,9 +7147,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_language_not_ready_link" = "translation platform";
 
 "lng_translate_box_error" = "Translate failed.";
+"lng_translate_box_error_language_pack_not_installed" = "Translation requires a local language pack. Download it in System Settings.";
 
 "lng_translate_settings_subtitle" = "Translate Messages";
 "lng_translate_settings_show" = "Show Translate Button";
+"lng_translate_settings_use_platform_mac" = "Use Apple Translations";
+"lng_translate_settings_use_platform_mac_about" = "Translation on macOS won't work until you download local language packs in System Settings.";
+"lng_translate_settings_use_platform_linux" = "Use KDE's Crow Translate";
 "lng_translate_settings_chat" = "Translate Entire Chats";
 "lng_translate_settings_choose" = "Do Not Translate";
 "lng_translate_settings_about" = "The 'Translate' button will appear in the context menu of messages containing text.";
@@ -4952,6 +7172,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_polls_public" = "Poll";
 "lng_polls_anonymous_quiz" = "Anonymous Quiz";
 "lng_polls_public_quiz" = "Quiz";
+"lng_polls_option_open_link_title" = "Open Link";
 "lng_polls_closed" = "Final results";
 "lng_polls_votes_count#one" = "{count} vote";
 "lng_polls_votes_count#other" = "{count} votes";
@@ -4960,21 +7181,122 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_polls_answers_count#other" = "{count} answers";
 "lng_polls_answers_none" = "No answers";
 "lng_polls_submit_votes" = "Vote";
+"lng_polls_view_stats" = "View Stats";
 "lng_polls_view_results" = "View results";
+"lng_polls_stats_title" = "Poll Stats";
+"lng_polls_view_votes#one" = "View Votes ({count})";
+"lng_polls_view_votes#other" = "View Votes ({count})";
+"lng_polls_admin_votes#one" = "{count} vote {arrow}";
+"lng_polls_admin_votes#other" = "{count} votes {arrow}";
+"lng_polls_admin_back_vote" = "{arrow} Vote";
+"lng_polls_ends_in_days#one" = "ends in {count} day";
+"lng_polls_ends_in_days#other" = "ends in {count} days";
+"lng_polls_results_in_days#one" = "results in {count} day";
+"lng_polls_results_in_days#other" = "results in {count} days";
+"lng_polls_ends_in_time" = "ends in {time}";
+"lng_polls_results_in_time" = "results in {time}";
+"lng_polls_results_after_close" = "Results will appear after the poll ends.";
 "lng_polls_retract" = "Retract vote";
 "lng_polls_stop" = "Stop poll";
 "lng_polls_stop_warning" = "If you stop this poll now, nobody will be able to vote in it anymore. This action cannot be undone.";
 "lng_polls_stop_sure" = "Stop";
+"lng_article_menu_item" = "Article";
+/*
+"lng_article_editor_title" = "Article";
+"lng_article_insert_heading" = "Heading";
+"lng_article_insert_heading1" = "Heading 1";
+"lng_article_insert_heading2" = "Heading 2";
+"lng_article_insert_heading3" = "Heading 3";
+"lng_article_insert_heading4" = "Heading 4";
+"lng_article_insert_heading5" = "Heading 5";
+"lng_article_insert_heading6" = "Heading 6";
+"lng_article_insert_emoji" = "Emoji";
+"lng_article_insert_blockquote" = "Blockquote";
+"lng_article_insert_code" = "Code Block";
+"lng_article_insert_math" = "Math";
+"lng_article_insert_divider" = "Divider";
+"lng_article_insert_ordered_list" = "Ordered List";
+"lng_article_insert_bullet_list" = "Bullet List";
+"lng_article_insert_task_list" = "Task List";
+"lng_article_insert_pullquote" = "Pullquote";
+"lng_article_insert_media" = "Attach Media";
+"lng_article_insert_details" = "Details";
+"lng_article_insert_table" = "Table";
+"lng_article_insert_map" = "Map";
+"lng_article_limit_length" = "The article is too long.";
+"lng_article_limit_depth" = "The article is nested too deeply.";
+"lng_article_limit_blocks" = "The article has too many blocks.";
+"lng_article_limit_columns" = "The article table has too many columns.";
+"lng_article_limit_media" = "The article has too many media files.";
+"lng_article_premium_required" = "Subscribe to {link} to be able to send rich articles.";
+"lng_article_premium_required_link" = "Telegram Premium";
+"lng_article_table_change" = "Change Table";
+"lng_article_table_add_row" = "Add Row";
+"lng_article_table_add_column" = "Add Column";
+"lng_article_table_header" = "Header";
+"lng_article_table_align_center" = "Align Center";
+"lng_article_table_align_right" = "Align Right";
+"lng_article_table_align_middle" = "Align Middle";
+"lng_article_table_align_bottom" = "Align Bottom";
+"lng_article_table_split_cell" = "Split Cell";
+"lng_article_table_unite_cells" = "Unite Cells";
+"lng_article_table_delete_row" = "Delete Row";
+"lng_article_table_delete_rows" = "Delete Rows";
+"lng_article_table_delete_column" = "Delete Column";
+"lng_article_table_delete_columns" = "Delete Columns";
+"lng_article_table_delete_table" = "Delete Table";
+"lng_article_table_bordered" = "Bordered Table";
+"lng_article_table_striped" = "Striped Table";
+*/
+"lng_polls_menu_item" = "Poll";
 "lng_polls_create" = "Create poll";
 "lng_polls_create_title" = "New poll";
 "lng_polls_create_question" = "Question";
 "lng_polls_create_question_placeholder" = "Ask a question";
+"lng_polls_create_description_placeholder" = "Add Description (optional)";
 "lng_polls_create_options" = "Poll options";
 "lng_polls_create_option_add" = "Add an option...";
+"lng_polls_create_option_link" = "Link";
+"lng_polls_create_option_link_title" = "Add link";
+"lng_polls_create_option_link_description" = "Attach a link to this option.";
+"lng_polls_create_option_link_placeholder" = "URL";
 "lng_polls_create_limit#one" = "You can add {count} more option.";
 "lng_polls_create_limit#other" = "You can add {count} more options.";
 "lng_polls_create_maximum" = "You have added the maximum number of options.";
 "lng_polls_create_settings" = "Settings";
+"lng_polls_create_show_who_voted" = "Show Who Voted";
+"lng_polls_create_show_who_voted_about" = "Display voter name on each option.";
+"lng_polls_create_allow_multiple_answers" = "Allow Multiple Answers";
+"lng_polls_create_allow_multiple_answers_about" = "Voters can select more than one option.";
+"lng_polls_create_allow_adding_options" = "Allow Adding Options";
+"lng_polls_create_allow_adding_options_about" = "Participants can suggest new options.";
+"lng_polls_create_allow_revoting" = "Allow Revoting";
+"lng_polls_create_allow_revoting_about" = "Voters can change their vote.";
+"lng_polls_create_shuffle_options" = "Shuffle Options";
+"lng_polls_create_shuffle_options_about" = "Answers appear in random order for each voter.";
+"lng_polls_create_set_correct_answer" = "Set Correct Answer";
+"lng_polls_create_set_correct_answer_about" = "Mark one option as the right answer.";
+"lng_polls_create_set_correct_answer_about_multi" = "Mark one or more options as the right answer.";
+"lng_polls_create_limit_duration" = "Limit Duration";
+"lng_polls_create_limit_duration_about" = "Automatically close the poll at a set time.";
+"lng_polls_create_poll_duration" = "Poll Duration";
+"lng_polls_create_poll_ends" = "Poll ends";
+"lng_polls_create_hide_results" = "Hide results";
+"lng_polls_create_hide_results_about" = "If you switch this on, results will appear only after the poll closes.";
+"lng_polls_create_restrict_to_subscribers" = "Restrict to Subscribers";
+"lng_polls_create_restrict_to_subscribers_about" = "Only subscribers who joined 24+ hours ago can vote.";
+"lng_polls_create_limit_by_country" = "Limit by Country";
+"lng_polls_create_limit_by_country_about" = "Only users from selected countries can vote.";
+"lng_polls_create_allowed_countries" = "Allowed Countries";
+"lng_polls_create_countries_count#one" = "{count} country";
+"lng_polls_create_countries_count#other" = "{count} countries";
+"lng_polls_create_choose_country" = "Please choose at least one country.";
+"lng_polls_create_countries_limit#one" = "You can choose up to {count} country.";
+"lng_polls_create_countries_limit#other" = "You can choose up to {count} countries.";
+"lng_polls_create_duration_custom" = "Custom";
+"lng_polls_create_deadline_title" = "Deadline";
+"lng_polls_create_deadline_button" = "Set Deadline";
+"lng_polls_create_deadline_expired" = "The poll deadline has already passed. Please choose a new time.";
 "lng_polls_create_anonymous" = "Anonymous Voting";
 "lng_polls_create_multiple_choice" = "Multiple Answers";
 "lng_polls_create_quiz_mode" = "Quiz Mode";
@@ -4986,19 +7308,75 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_polls_solution_title" = "Explanation";
 "lng_polls_solution_placeholder" = "Add a Comment (Optional)";
 "lng_polls_solution_about" = "Users will see this comment after choosing a wrong answer, good for educational purposes.";
+"lng_polls_media_uploading_toast_title" = "Please wait";
+"lng_polls_media_uploading_toast" = "Poll media is still uploading...";
+"lng_polls_vote_restricted_subscribers_channel" = "Only subscribers of {channel} can vote.";
+"lng_polls_vote_restricted_subscribers" = "Only subscribers can vote.";
+"lng_polls_vote_restricted_subscribers_recent" = "Only subscribers who joined more than 24 hours ago can vote.";
+"lng_polls_vote_restricted_countries_list" = "Only users from {countries} can vote.";
+"lng_polls_vote_restricted_countries" = "Only users from selected countries can vote.";
+"lng_polls_ends_toast" = "Results will appear after the poll ends.";
 
 "lng_polls_poll_results_title" = "Poll results";
 "lng_polls_quiz_results_title" = "Quiz results";
 "lng_polls_show_more#one" = "Show more ({count})";
 "lng_polls_show_more#other" = "Show more ({count})";
 "lng_polls_votes_collapse" = "Collapse";
+"lng_polls_vote_yesterday" = "yesterday";
+"lng_polls_option_added_by" = "Added by {user}";
+"lng_polls_context_ends" = "Results will appear after the poll ends.";
+"lng_polls_add_option" = "Add an Option";
+"lng_polls_add_option_placeholder" = "Option text...";
+"lng_polls_max_options_reached" = "Maximum number of options reached.";
+"lng_polls_add_option_duplicate" = "This option already exists.";
+"lng_polls_add_option_closed" = "This poll has been closed.";
+"lng_polls_add_option_error" = "Could not add the option. Please try again.";
+"lng_polls_add_option_save" = "Save";
+
+"lng_todo_title" = "Checklist";
+"lng_todo_title_group" = "Group Checklist";
+"lng_todo_title_user" = "Checklist";
+"lng_todo_completed#one" = "{count} of {total} completed";
+"lng_todo_completed#other" = "{count} of {total} completed";
+"lng_todo_completed_none" = "None of {total} completed";
+"lng_todo_menu_item" = "Checklist";
+"lng_todo_create" = "Create Checklist";
+"lng_todo_create_title" = "New Checklist";
+"lng_todo_create_title_placeholder" = "Title";
+"lng_todo_create_list" = "Tasks List";
+"lng_todo_create_list_add" = "Add a task...";
+"lng_todo_create_limit#one" = "You can add {count} more task.";
+"lng_todo_create_limit#other" = "You can add {count} more tasks.";
+"lng_todo_create_maximum" = "You have added the maximum number of tasks.";
+"lng_todo_create_settings" = "Settings";
+"lng_todo_create_allow_add" = "Allow Others to Add Tasks";
+"lng_todo_create_allow_mark" = "Allow Others to Mark As Done";
+"lng_todo_create_button" = "Create";
+"lng_todo_choose_title" = "Please enter a title.";
+"lng_todo_choose_tasks" = "Please enter at least one task.";
+
+"lng_todo_add_title" = "Add Tasks";
+"lng_todo_create_premium" = "Only subscribers of {link} can create Checklists.";
+"lng_todo_add_premium" = "Only subscribers of {link} can add tasks.";
+"lng_todo_mark_premium" = "Only subscribers of {link} can mark tasks as done.";
+"lng_todo_premium_link" = "Telegram Premium";
+"lng_todo_mark_restricted" = "{user} has restricted others from marking tasks as done.";
+"lng_todo_mark_forwarded" = "You can't change forwarded checklists.";
 
 "lng_outdated_title" = "PLEASE UPDATE YOUR OPERATING SYSTEM.";
 "lng_outdated_title_bits" = "PLEASE SWITCH TO A 64-BIT OPERATING SYSTEM.";
 "lng_outdated_soon" = "Otherwise, Telegram Desktop will stop updating on {date}.";
 "lng_outdated_now" = "So Telegram Desktop can update to newer versions.";
 
+"lng_screen_reader_bar_text" = "Telegram is working in Screen Reader mode.";
+"lng_screen_reader_bar_disable" = "Disable";
+"lng_screen_reader_confirm_text" = "Telegram detected accessibility software is being used in your system and it is working in Screen Reader friendly mode.\n\nThis may result in unexpected changes to the way Telegram user interface works.\n\nIf you do not use Screen Reader software with Telegram, please disable this mode.";
+"lng_screen_reader_confirm_disable" = "Disable";
+"lng_screen_reader_settings_title" = "Screen reader";
+"lng_screen_reader_settings_disable" = "Disable screen reader mode";
+
 "lng_filters_all" = "All chats";
+"lng_filters_all_short" = "All";
 "lng_filters_setup" = "Edit";
 "lng_filters_title" = "Folders";
 "lng_filters_subtitle" = "My folders";
@@ -5014,6 +7392,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_edit" = "Edit Folder";
 "lng_filters_setup_menu" = "Edit Folders";
 "lng_filters_new_name" = "Folder name";
+"lng_filters_enable_animations" = "Enable animations";
+"lng_filters_disable_animations" = "Disable animations";
 "lng_filters_add_chats" = "Add Chats";
 "lng_filters_remove_chats" = "Add Chats to Exclude";
 "lng_filters_include" = "Included chats";
@@ -5053,11 +7433,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_toast_add" = "{chat} added to {folder} folder";
 "lng_filters_toast_remove" = "{chat} removed from {folder} folder";
 "lng_filters_shareable_status" = "shareable folder";
+"lng_filters_view_subtitle" = "Tabs view";
+"lng_filters_vertical" = "Tabs on the left";
+"lng_filters_horizontal" = "Tabs at the top";
+"lng_filters_enable_tags" = "Show Folder Tags";
+"lng_filters_enable_tags_about" = "Display folder names for each chat in the chat list.";
+"lng_filters_enable_tags_about_premium" = "Subscribe to **{link}** to display folder names for each chat in the chat list.";
+"lng_filters_tag_color_subtitle" = "Folder color in chat list";
+"lng_filters_tag_color_about" = "Choose a color for the tag of this folder.";
+"lng_filters_tag_color_no" = "No Tag";
 
 "lng_filters_delete_sure" = "Are you sure you want to delete this folder? This will also deactivate all the invite links created to share this folder.";
 "lng_filters_link" = "Share Folder";
 "lng_filters_link_has" = "Invite links";
 
+"lng_filters_checkbox_remove_bot" = "Remove bot from all folders";
+"lng_filters_checkbox_remove_group" = "Remove group from all folders";
+"lng_filters_checkbox_remove_channel" = "Remove channel from all folders";
+
 "lng_filters_link_create" = "Create an Invite Link";
 "lng_filters_link_cant" = "You can’t share folders which include or exclude specific chat types like 'Groups', 'Contacts', etc.";
 "lng_filters_link_about" = "Share access to some of this folder's groups and channels with others.";
@@ -5130,11 +7523,26 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_chat_theme_change_wallpaper" = "Change Wallpaper";
 "lng_chat_theme_title" = "Select theme";
 "lng_chat_theme_cant_voice" = "Sorry, you can't change the chat theme while you have an unsent voice message.";
+"lng_chat_theme_gift_replace" = "This gift is already your theme in the chat with {name}. Remove it there and use it here instead?";
 
 "lng_photo_editor_menu_delete" = "Delete";
 "lng_photo_editor_menu_flip" = "Flip";
 "lng_photo_editor_menu_duplicate" = "Duplicate";
 
+"lng_photo_editor_text_style_plain" = "Plain";
+"lng_photo_editor_text_style_framed" = "Framed";
+"lng_photo_editor_text_style_semi_transparent" = "Semi-Transparent";
+
+"lng_photo_editor_crop_original" = "Original";
+"lng_photo_editor_crop_square" = "Square";
+"lng_photo_editor_crop_free" = "Free";
+
+"lng_photo_editor_corners_about" = "Choose how rounded the sticker corners should look.";
+"lng_photo_editor_corners_large" = "Large";
+"lng_photo_editor_corners_medium" = "Medium";
+"lng_photo_editor_corners_small" = "Small";
+"lng_photo_editor_corners_none" = "None";
+
 "lng_voice_speed_slow" = "Slow";
 "lng_voice_speed_normal" = "Normal";
 "lng_voice_speed_medium" = "Medium";
@@ -5158,12 +7566,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_view_button_boost" = "Boost";
 "lng_view_button_giftcode" = "Open";
 "lng_view_button_iv" = "Instant View";
+"lng_view_button_full_article" = "Show more";
 "lng_view_button_stickerset" = "View stickers";
 "lng_view_button_emojipack" = "View emoji";
+"lng_view_button_style" = "View Style";
+"lng_view_button_collectible" = "View collectible";
+"lng_view_button_call" = "Join call";
+"lng_view_button_storyalbum" = "View Album";
+"lng_view_button_collection" = "View Collection";
+"lng_view_button_newbot" = "Create Bot";
 
 "lng_sponsored_hide_ads" = "Hide";
 "lng_sponsored_title" = "What are sponsored messages?";
-"lng_sponsored_info_description1" = "Unlike other apps, Telegram never uses your private data to target ads. Sponsored messages on Telegram are based solely on the topic of the public channels in which they are shown. This means that no user data is mined or analyzed to display ads, and every user viewing a channel on Telegram sees the same sponsored messages.\n\nUnlike other apps, Telegram doesn't track whether you tapped on a sponsored message and doesn't profile you based on your activity. We also prevent external links in sponsored messages to ensure that third parties can’t spy on our users. We believe that everyone has the right to privacy, and technological platforms should respect that.\n\nTelegram offers a free and unlimited service to hundreds of millions of users, which involves significant server and traffic costs. In order to remain independent and stay true to its values, Telegram developed a paid tool to promote messages with user privacy in mind. We welcome responsible advertisers at:";
+"lng_sponsored_info_description1_linked" = "Unlike other apps, Telegram never uses your private data to target ads. {link}\n\nUnlike other apps, Telegram doesn't track whether you tapped on a sponsored message and doesn't profile you based on your activity. We also prevent external links in sponsored messages to ensure that third parties can’t spy on our users. We believe that everyone has the right to privacy, and technological platforms should respect that.\n\nTelegram offers free and unlimited service to hundreds of millions of users, which involves significant server and traffic costs. In order to remain independent and stay true to its values, Telegram developed a paid tool to promote messages with user privacy in mind. We welcome responsible advertisers at:";
+"lng_sponsored_info_description1_link" = "Learn more in the Privacy Policy";
+"lng_sponsored_info_description1_url" = "https://telegram.org/privacy#5-6-no-ads-based-on-user-data";
 "lng_sponsored_info_description2" = "Sponsored Messages are currently in test mode. Once they are fully launched and allow Telegram to cover its basic costs, we will start sharing ad revenue with the owners of public channels in which sponsored messages are displayed.\n\nOnline ads should no longer be synonymous with abuse of user privacy. Let us redefine how a tech company should operate – together.";
 "lng_sponsored_info_menu" = "Advertiser info";
 "lng_sponsored_info_submenu" = "Advertiser: {text}";
@@ -5172,13 +7589,23 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_sponsored_revenued_subtitle" = "Telegram Ads are very different from ads on other platforms. Ads such as this one:";
 "lng_sponsored_revenued_info1_title" = "Respect Your Privacy";
 "lng_sponsored_revenued_info1_description" = "Ads on Telegram do not use your personal information and are based on the channel in which you see them.";
+"lng_sponsored_revenued_info1_bot_description" = "Ads on Telegram do not use your personal information and are based on the mini app in which you see them.";
+"lng_sponsored_revenued_info1_search_description" = "Ads on Telegram do not use your personal information and are based on the search query you entered.";
 "lng_sponsored_revenued_info2_title" = "Help the Channel Creator";
+"lng_sponsored_revenued_info2_bot_title" = "Help the Bot Developer";
 "lng_sponsored_revenued_info2_description" = "50% of the revenue from Telegram Ads goes to the owner of the channel where they are displayed.";
+"lng_sponsored_revenued_info2_bot_description" = "50% of the revenue from Telegram Ads goes to the developer of the mini app where they are displayed.";
 "lng_sponsored_revenued_info3_title" = "Can Be Removed";
 "lng_sponsored_revenued_info3_description#one" = "You can turn off ads by subscribing to {link}, and Level {count} channels can remove them for their subscribers.";
 "lng_sponsored_revenued_info3_description#other" = "You can turn off ads by subscribing to {link}, and Level {count} channels can remove them for their subscribers.";
+"lng_sponsored_revenued_info3_bot_description" = "You can turn off ads in mini apps by subscribing to {link}.";
+"lng_sponsored_revenued_info3_search_description" = "You can turn off ads by subscribing to Telegram Premium. {link}";
+"lng_sponsored_revenued_info3_search_link" = "Subscribe {arrow}";
 "lng_sponsored_revenued_footer_title" = "Can I Launch an Ad?";
 "lng_sponsored_revenued_footer_description" = "Anyone can create an ad to display in this channel — with minimal budgets. Check out the **Telegram Ad Platform** for details. {link}";
+"lng_sponsored_revenued_footer_bot_description" = "Anyone can create an ad to display in this bot — with minimal budgets. Check out the **Telegram Ad Platform** for details. {link}";
+"lng_sponsored_revenued_footer_search_description" = "Anyone can create an ad to display in search results for any query. Check out the **Telegram Ad Platform** for details. {link}";
+"lng_sponsored_top_bar_hide" = "remove";
 
 "lng_telegram_features_url" = "https://t.me/TelegramTips";
 
@@ -5190,6 +7617,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_ringtones_box_title" = "Notification Sound";
 "lng_ringtones_box_cloud_subtitle" = "Choose your tone";
+"lng_ringtones_box_volume" = "Volume";
 "lng_ringtones_box_upload_choose" = "Choose a tone";
 "lng_ringtones_box_upload_button" = "Upload Sound";
 "lng_ringtones_box_about" = "Right click on any short voice note or MP3 file in chat and select \"Save for Notifications\". It will appear here.";
@@ -5199,6 +7627,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_ringtones_error_max_size" = "Sorry, but your file is too big. The maximum size for ringtones is {size}.";
 "lng_ringtones_error_max_duration" = "Sorry, but your file is too long. The maximum duration for ringtones is {duration}.";
 
+"lng_bot_thread_edit" = "Edit Thread";
+"lng_bot_thread_title" = "Thread Name";
+"lng_bot_thread_choose_title_and_icon" = "Choose a thread name and icon";
+
 "lng_forum_topic_new" = "New Topic";
 "lng_forum_topic_edit" = "Edit Topic";
 "lng_forum_topic_title" = "Topic Name";
@@ -5229,6 +7661,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_forum_messages#other" = "{count} messages";
 "lng_forum_show_topics_list" = "Show Topics List";
 
+"lng_monoforum_choose_to_reply" = "Choose a message to reply.";
+
 "lng_request_peer_requirements" = "Requirements";
 "lng_request_peer_rights" = "You must have these admin rights: {rights}.";
 "lng_request_peer_rights_and" = "{rights} and {last}";
@@ -5275,6 +7709,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_request_channel_delete_messages" = "delete messages";
 "lng_request_channel_add_subscribers" = "add subscribers";
 "lng_request_channel_manage_livestreams" = "manage live streams";
+"lng_request_channel_manage_direct" = "manage direct messages";
 "lng_request_channel_add_admins" = "add new admins";
 "lng_request_channel_create" = "Create a New Channel for This";
 
@@ -5284,6 +7719,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_my_name" = "My Story";
 "lng_stories_archive" = "Hide Stories";
 "lng_stories_unarchive" = "Unhide Stories";
+"lng_stories_view_anonymously" = "View Anonymously";
 "lng_stories_row_count#one" = "{count} Story";
 "lng_stories_row_count#other" = "{count} Stories";
 "lng_stories_views#one" = "{count} view";
@@ -5311,6 +7747,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_archive_title" = "Story Archive";
 "lng_stories_archive_about" = "Only you can see archived stories unless you choose to post them to your profile.";
 "lng_stories_channel_archive_about" = "Only admins of the channel can see archived stories unless they are posted to the channel page.";
+"lng_stories_empty" = "Your stories will be here.";
+"lng_stories_empty_channel" = "Channel posts will be here.";
 "lng_stories_reply_sent" = "Message sent.";
 "lng_stories_hidden_to_contacts" = "Stories from {user} were moved to the **Archive**.";
 "lng_stories_shown_in_chats" = "Stories from {user} were returned from the **Archive**.";
@@ -5346,6 +7784,26 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_save_promo" = "Subscribe to {link} to save other people's stories that are not protected.";
 "lng_stories_reaction_as_message" = "Send reaction as a private message";
 
+"lng_stories_album_add" = "Add Album";
+"lng_stories_album_new_title" = "Create a New Album";
+"lng_stories_album_new_button" = "New Album";
+"lng_stories_album_new_text" = "Choose a name for your album and start adding your stories there.";
+"lng_stories_album_new_ph" = "Title";
+"lng_stories_album_new_create" = "Create";
+"lng_stories_album_empty_title" = "Organize Your Stories";
+"lng_stories_album_empty_text" = "Add some of your stories to this album.";
+"lng_stories_album_all" = "All Stories";
+"lng_stories_album_add_title" = "Add Stories";
+"lng_stories_album_add_button" = "Add Stories";
+"lng_stories_album_share" = "Share Album";
+"lng_stories_album_edit" = "Edit Name";
+"lng_stories_album_limit_title" = "Limit Reached";
+"lng_stories_album_limit_text" = "Please remove one of the existing albums to add a new one.";
+"lng_stories_album_delete" = "Delete Album";
+"lng_stories_album_delete_sure" = "Are you sure you want to delete this album?";
+"lng_stories_album_delete_button" = "Delete";
+"lng_stories_album_add_to" = "Add to Album";
+
 "lng_stealth_mode_menu_item" = "Hide My View";
 "lng_stealth_mode_title" = "Stealth Mode";
 "lng_stealth_mode_unlock_about" = "Subscribe to Telegram Premium to watch stories without appearing in the list of viewers.";
@@ -5356,6 +7814,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stealth_mode_next_about" = "Hide my views for the next 25 minutes.";
 "lng_stealth_mode_unlock" = "Unlock Stealth Mode";
 "lng_stealth_mode_enable" = "Enable Stealth Mode";
+"lng_stealth_mode_enable_and_open" = "Enable and open the story";
 "lng_stealth_mode_cooldown_in" = "Available in {left}";
 "lng_stealth_mode_cooldown_tip" = "Please wait until **Stealth Mode** is ready to use again.";
 "lng_stealth_mode_enabled_tip_title" = "Stealth Mode On";
@@ -5365,6 +7824,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stealth_mode_already_about" = "The creators of stories you view in the next **{left}** won't see you in the viewers' lists.";
 
 "lng_stories_link_invalid" = "This link is broken or has expired.";
+"lng_stories_live_finished" = "The live story has ended.";
 
 "lng_stats_title" = "Statistics";
 "lng_stats_message_title" = "Message Statistic";
@@ -5470,6 +7930,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_boosts_list_tab_gifts#other" = "{count} Gifts";
 
 "lng_boosts_prepaid_giveaway_title" = "Prepaid giveaways";
+"lng_boosts_prepaid_giveaway_title_subtext" = "Select a giveaway you already paid for to set it up.";
 "lng_boosts_prepaid_giveaway_single" = "Prepaid giveaway";
 "lng_boosts_prepaid_giveaway_quantity#one" = "{count} Telegram Premium";
 "lng_boosts_prepaid_giveaway_quantity#other" = "{count} Telegram Premium";
@@ -5482,6 +7943,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_channel_earn_title" = "Monetization";
 "lng_channel_earn_about" = "Telegram shares 50% of the revenue from ads displayed in your channel as rewards. {link}";
+"lng_channel_earn_about_bot" = "Telegram shares 50% of the revenue from ads displayed in your bot. {link}";
 "lng_channel_earn_about_link" = "Learn more {emoji}";
 "lng_channel_earn_overview_title" = "Rewards overview";
 "lng_channel_earn_available" = "Rewards available for collection";
@@ -5514,8 +7976,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_earn_cpm#one" = "{emoji} {count} CPM";
 "lng_channel_earn_cpm#other" = "{emoji} {count} CPM";
 "lng_channel_earn_learn_title" = "Earn From Your Channel";
+"lng_channel_earn_bot_learn_title" = "Earn From Your Bot";
 "lng_channel_earn_learn_in_subtitle" = "Telegram Ads";
 "lng_channel_earn_learn_in_about" = "Telegram can display ads in your channel.";
+"lng_channel_earn_learn_bot_in_about" = "Telegram can display ads in your bot.";
 "lng_channel_earn_learn_split_subtitle" = "50:50 revenue split";
 "lng_channel_earn_learn_split_about" = "You can receive 50% of the ad revenue as rewards in TON.";
 "lng_channel_earn_learn_out_subtitle" = "Flexible withdrawals";
@@ -5526,6 +7990,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channel_earn_learn_coin_link" = "https://telegram.org/blog/monetization-for-channels";
 "lng_channel_earn_chart_top_hours" = "Ad impressions";
 "lng_channel_earn_chart_revenue" = "Ad rewards";
+"lng_channel_earn_chart_overriden_detail_credits" = "Rewards in Stars";
 "lng_channel_earn_chart_overriden_detail_currency" = "Rewards in TON";
 "lng_channel_earn_chart_overriden_detail_usd" = "Rewards in USD";
 "lng_channel_earn_currency_history" = "TON Transactions";
@@ -5536,6 +8001,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_earn_chart_revenue" = "Revenue";
 "lng_bot_earn_overview_title" = "Proceeds overview";
 "lng_bot_earn_available" = "Available balance";
+"lng_bot_earn_reward" = "Total balance";
 "lng_bot_earn_total" = "Total lifetime proceeds";
 "lng_bot_earn_balance_title" = "Available balance";
 "lng_bot_earn_balance_about" = "Stars from your total balance can be used for ads or withdrawn as rewards 21 days after they are earned.";
@@ -5546,22 +8012,31 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_earn_balance_button_locked" = "Withdraw";
 "lng_bot_earn_balance_button_buy_ads" = "Buy Ads";
 "lng_bot_earn_learn_credits_out_about" = "You can withdraw Stars using Fragment, or use Stars to advertise your bot. {link}";
+"lng_self_earn_learn_credits_out_about" = "You can withdraw from 10 Stars using Fragment. {link}";
 "lng_bot_earn_out_ph" = "Enter amount to withdraw";
+"lng_bot_earn_out_ph_max" = "Enter amount to withdraw (max. {amount})";
 "lng_bot_earn_balance_password_title" = "Two-step verification";
 "lng_bot_earn_balance_password_description" = "Please enter your password to collect.";
 "lng_bot_earn_credits_out_minimal" = "You cannot withdraw less than {link}.";
 "lng_bot_earn_credits_out_minimal_link#one" = "{count} star";
 "lng_bot_earn_credits_out_minimal_link#other" = "{count} stars";
+"lng_bot_copy_text_tooltip" = "Copy to Clipboard: {text}";
 
 "lng_contact_add" = "Add";
 "lng_contact_send_message" = "Message";
 
 "lng_iv_open_in_browser" = "Open in Browser";
+"lng_iv_click_to_view" = "Click to View";
 "lng_iv_share" = "Share";
 "lng_iv_join_channel" = "Join";
 "lng_iv_window_title" = "Instant View";
 "lng_iv_wrong_layout" = "Wrong layout?";
 "lng_iv_not_supported" = "This link appears to be invalid.";
+"lng_iv_not_found_in_message" = "This link appears to be invalid.";
+"lng_iv_details_state_expanded" = "Expanded";
+"lng_iv_details_state_collapsed" = "Collapsed";
+"lng_iv_zoom_tooltip_ctrl" = "Hold Ctrl to zoom by 5%.\nHold Alt to zoom by 1%.";
+"lng_iv_zoom_tooltip_cmd" = "Hold Cmd to zoom by 5%.\nHold Alt to zoom by 1%.";
 
 "lng_limit_download_title" = "Download speed limited";
 "lng_limit_download_subscribe" = "Subscribe to {link} to increase download speed {increase}.";
@@ -5591,6 +8066,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_recent_chats" = "Chats";
 "lng_recent_channels" = "Channels";
 "lng_recent_apps" = "Apps";
+"lng_recent_posts" = "Posts";
+"lng_all_photos" = "Photos";
+"lng_all_videos" = "Videos";
+"lng_all_downloads" = "Downloads";
+"lng_all_links" = "Links";
+"lng_all_files" = "Files";
+"lng_all_music" = "Music";
+"lng_all_voice" = "Voice";
 "lng_channels_none_title" = "No channels yet...";
 "lng_channels_none_about" = "You are not currently subscribed to any channels.";
 "lng_channels_your_title" = "Channels you joined";
@@ -5599,6 +8082,31 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_channels_recommended" = "Similar channels";
 "lng_bot_apps_your" = "Apps you use";
 "lng_bot_apps_popular" = "Grossing apps";
+"lng_bot_apps_which" = "Which apps are included here? {link}";
+"lng_bot_apps_which_link" = "Learn >";
+"lng_posts_title" = "Global Search";
+"lng_posts_start" = "Type a keyword to search all posts from public channels.";
+"lng_posts_subscribe" = "Subscribe to Premium";
+"lng_posts_need_subscribe" = "Global search is a Premium feature.";
+"lng_posts_search_button" = "Search {query}";
+"lng_posts_remaining#one" = "{count} free search remaining today";
+"lng_posts_remaining#other" = "{count} free searches remaining today";
+"lng_posts_subtitle_empty" = "Telegram News";
+"lng_posts_subtitle" = "Public posts";
+"lng_posts_limit_reached" = "Limit Reached";
+"lng_posts_limit_about#one" = "You can make up to {count} search query per day.";
+"lng_posts_limit_about#other" = "You can make up to {count} search queries per day.";
+"lng_posts_limit_search_paid" = "Search for {cost}";
+"lng_posts_limit_unlocks" = "free search unlocks in {duration}";
+"lng_posts_paid_spent#one" = "**{count} Star** spent on extra search.";
+"lng_posts_paid_spent#other" = "**{count} Stars** spent on extra search.";
+
+"lng_popular_apps_info_title" = "Top Mini Apps";
+"lng_popular_apps_info_text" = "This catalogue ranks mini apps based on their daily revenue, measured in Stars. To be listed, developers must set their main mini apps in {bot} (as described {link}), have over **1,000** daily users, and earn a daily revenue above **1,000** Stars, based on the weekly average.";
+"lng_popular_apps_info_bot" = "@botfather";
+"lng_popular_apps_info_here" = "here";
+"lng_popular_apps_info_url" = "https://core.telegram.org/bots/webapps#launching-the-main-mini-app";
+"lng_popular_apps_info_confirm" = "Understood";
 
 "lng_font_box_title" = "Choose font family";
 "lng_font_default" = "Default";
@@ -5615,6 +8123,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_search_tab_no_results_text" = "There were no results for \"{query}\".";
 "lng_search_tab_no_results_retry" = "Try another hashtag.";
 "lng_search_tab_by_hashtag" = "Enter a hashtag to find messages containing it.";
+"lng_search_tab_try_in_all" = "Search in All Messages";
 
 "lng_contact_details_button" = "View Contact";
 "lng_contact_details_title" = "Contact details";
@@ -5638,6 +8147,125 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_qr_box_transparent_background" = "Transparent Background";
 "lng_qr_box_font_size" = "Font size";
 
+"lng_frozen_bar_title" = "Your account is frozen!";
+"lng_frozen_bar_text" = "Click to view details {arrow}";
+"lng_frozen_restrict_title" = "Your account is frozen";
+"lng_frozen_restrict_text" = "Click to view details";
+"lng_frozen_title" = "Your Account is Frozen";
+"lng_frozen_subtitle1" = "Violation of Terms";
+"lng_frozen_text1" = "Your account was frozen for breaking Telegram's Terms and Conditions.";
+"lng_frozen_subtitle2" = "Read-Only Mode";
+"lng_frozen_text2" = "You can access your account but can't send messages or take actions.";
+"lng_frozen_subtitle3" = "Appeal Before Deactivation";
+"lng_frozen_text3" = "Appeal via {link} before {date}, or your account will be deleted.";
+"lng_frozen_appeal_button" = "Submit an Appeal";
+
+"lng_age_verify_title" = "Age Verification";
+"lng_age_verify_mobile" = "Please open this media in the official Telegram app for Android or iOS to verify your age.";
+"lng_age_verify_here" = "This is a one-time process using your phone's camera. Your selfie will not be stored by Telegram.";
+"lng_age_verify_button" = "Verify My Age";
+"lng_age_verify_sorry_title" = "Age Check Failed";
+"lng_age_verify_sorry_text" = "Sorry, you can't view 18+ content.";
+
+"lng_context_bank_card_copy" = "Copy Card Number";
+"lng_context_bank_card_copied" = "Card number copied to clipboard.";
+
+"lng_summarize_header_title" = "AI summary";
+"lng_summarize_header_about" = "Click to see original text";
+
+"lng_calendar" = "Calendar";
+
+"lng_new_window_tooltip_ctrl" = "Use Ctrl+Click to open in New Window.";
+"lng_new_window_tooltip_cmd" = "Use Cmd+Click to open in New Window.";
+
+"lng_rename_file" = "Rename file";
+
+"lng_sr_playback_order" = "Playback order";
+"lng_sr_player_close" = "Close media player";
+"lng_sr_group_call_menu" = "Video chat menu";
+"lng_sr_search_date" = "Search by date";
+"lng_sr_cancel_search" = "Cancel search";
+"lng_sr_clear_search" = "Clear search";
+"lng_sr_scroll_to_top" = "Scroll to top";
+"lng_sr_verified_badge" = "Verified";
+"lng_sr_bot_verified_badge" = "Verified Bot";
+"lng_sr_profile_menu" = "Profile menu";
+"lng_sr_close_panel" = "Close panel";
+
+"lng_ai_compose_title" = "AI Editor";
+"lng_ai_compose_apply" = "Apply";
+"lng_ai_compose_tab_translate" = "Translate";
+"lng_ai_compose_tab_style" = "Style";
+"lng_ai_compose_tab_fix" = "Fix";
+"lng_ai_compose_original" = "Original";
+"lng_ai_compose_result" = "Result";
+"lng_ai_compose_before" = "Before";
+"lng_ai_compose_after" = "After";
+"lng_ai_compose_to_language" = "To {language}";
+"lng_ai_compose_name_style" = "{name} ({style})";
+"lng_ai_compose_style_neutral" = "Neutral";
+"lng_ai_compose_emojify" = "emojify";
+"lng_ai_compose_error" = "AI request failed.";
+"lng_ai_compose_error_too_long" = "Sorry, this text is too long.";
+"lng_ai_compose_tone_invalid" = "This style was deleted or the link is invalid.";
+"lng_ai_compose_apply_unbound" = "No style bound to this shortcut. Open a style and toggle 'Apply with hotkey'.";
+"lng_ai_compose_apply_empty" = "Type something first.";
+"lng_ai_compose_bind_set_hotkey_short" = "Set apply hotkey…";
+"lng_ai_compose_bind_use_hotkey" = "Apply with {keys}";
+"lng_ai_compose_tooltip" = "Rewrite, translate, or correct your text using AI.";
+"lng_ai_compose_flood_title" = "Daily limit reached";
+"lng_ai_compose_flood_text" = "Get {link} for **50x** more AI text transformations per day.";
+"lng_ai_compose_flood_link" = "Telegram Premium";
+"lng_ai_compose_increase_limit" = "Increase Limit";
+"lng_ai_compose_select_style" = "Select Style";
+"lng_ai_compose_apply_style" = "Apply Style";
+"lng_ai_compose_style_tooltip" = "Choose Style";
+"lng_ai_compose_create_tone_title" = "New Style";
+"lng_ai_compose_edit_tone_title" = "Edit Style";
+"lng_ai_compose_tone_icon_title" = "Style Icon";
+"lng_ai_compose_tone_name" = "Name";
+"lng_ai_compose_tone_prompt" = "Prompt";
+"lng_ai_compose_tone_save" = "Save";
+"lng_ai_compose_tone_create" = "Create";
+"lng_ai_compose_tone_author" = "Add a link to my account";
+"lng_ai_compose_tone_name_placeholder" = "Style Name (for example, \"Pirate\")";
+"lng_ai_compose_tone_prompt_placeholder" = "Instructions (for example \"write in bold, nautical tone, light slang (aye, matey), vivid sea imagery, playful swagger, rhythmic phrasing, and adventurous mood\")";
+"lng_ai_compose_tone_edit" = "Edit Style";
+"lng_ai_compose_tone_share" = "Share Style";
+"lng_ai_compose_tone_remove" = "Remove Style";
+"lng_ai_compose_tone_delete" = "Delete Style";
+"lng_ai_compose_tone_remove_sure" = "Are you sure you want to remove this style?";
+"lng_ai_compose_tone_delete_sure" = "Are you sure you want to delete this style? It will be removed for everyone who installed it.";
+"lng_ai_compose_tone_link_copied" = "Style link copied.";
+"lng_ai_compose_author" = "Style by {user}";
+"lng_ai_compose_tone_warn_icon" = "Please choose an icon.";
+"lng_ai_compose_tone_warn_name" = "Please choose a name.";
+"lng_ai_compose_tone_warn_prompt" = "Please enter instructions.";
+"lng_ai_compose_tone_created" = "{title} Style Created!";
+"lng_ai_compose_tone_updated" = "{title} Style Updated!";
+"lng_ai_compose_tone_created_description" = "Right click the style to edit or share the link.";
+"lng_ai_compose_tone_preview_about" = "Add this style to instantly rewrite your messages.";
+"lng_ai_compose_tone_preview_add" = "Add Style";
+"lng_ai_compose_tone_preview_add_example" = "Another example";
+"lng_ai_compose_tone_preview_used_by#one" = "Used by {count} person.";
+"lng_ai_compose_tone_preview_used_by#other" = "Used by {count} people.";
+"lng_ai_compose_tone_preview_created_by" = "Created by {user}";
+"lng_ai_compose_tone_added" = "Style Added";
+"lng_ai_compose_tone_removed" = "Style removed.";
+"lng_ai_compose_tone_deleted" = "Style deleted.";
+"lng_ai_compose_tone_added_description" = "Tap \"AI\" → \"{name}\" when typing your next long message.";
+"lng_ai_compose_tone_saved_limit#one" = "Subscribe to {link} to save up to {premium_count} styles, or delete one of your **{count}** style to add another.";
+"lng_ai_compose_tone_saved_limit#other" = "Subscribe to {link} to save up to {premium_count} styles, or delete one of your **{count}** styles to add another.";
+"lng_ai_compose_tone_saved_limit_link" = "Premium";
+"lng_ai_compose_tone_saved_limit_final#one" = "You can save up to **{count}** style. Delete one to add another.";
+"lng_ai_compose_tone_saved_limit_final#other" = "You can save up to **{count}** styles. Delete one to add another.";
+"lng_sr_ai_compose_info" = "About AI Editor";
+"lng_sr_ai_compose_copy_result" = "Copy result";
+"lng_sr_ai_compose_expand_original" = "Expand original";
+"lng_sr_ai_compose_collapse_original" = "Collapse original";
+
+"lng_send_as_file_tooltip" = "Send text as a file.";
+
 // Wnd specific
 
 "lng_wnd_choose_program_menu" = "Choose Default Program...";
@@ -5692,14 +8320,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_mac_menu_new_channel" = "New Channel";
 "lng_mac_menu_show" = "Show Telegram";
 "lng_mac_menu_emoji_and_symbols" = "Emoji & Symbols";
+"lng_mac_menu_fullscreen" = "Toggle Full Screen";
 
 "lng_mac_menu_player_pause" = "Pause";
 "lng_mac_menu_player_resume" = "Resume";
 "lng_mac_menu_player_next" = "Next";
 "lng_mac_menu_player_previous" = "Previous";
+"lng_mac_menu_profiles" = "Profiles";
 
 "lng_mac_touchbar_favorite_stickers" = "Favorite stickers";
 
 "lng_mac_hold_to_quit" = "Hold {text} to Quit";
 
+"lng_sr_country_column_name" = "Country name";
+"lng_sr_languages_column_native" = "Native name";
+"lng_sr_languages_column_name" = "Language name";
+
 // Keys finished
diff --git a/Telegram/Resources/picker_html/picker.js b/Telegram/Resources/picker_html/picker.js
index e44fd51a95ef47..628a22463760fe 100644
--- a/Telegram/Resources/picker_html/picker.js
+++ b/Telegram/Resources/picker_html/picker.js
@@ -51,8 +51,8 @@ var LocationPicker = {
 	},
 	init: function (params) {
 		mapboxgl.accessToken = params.token;
-		if (params.protocol) {
-			mapboxgl.config.API_URL = params.protocol + '://domain/api.mapbox.com';
+		if (location.hostname != 'desktop-app-resource') {
+			mapboxgl.config.API_URL = location.protocol + '//' + location.host + '/api.mapbox.com';
 		}
 
 		var options = { container: 'map', config: {
diff --git a/Telegram/Resources/qrc/telegram/animations.qrc b/Telegram/Resources/qrc/telegram/animations.qrc
index ac6ff1dbf4660e..ffadf0ee799b89 100644
--- a/Telegram/Resources/qrc/telegram/animations.qrc
+++ b/Telegram/Resources/qrc/telegram/animations.qrc
@@ -1,6 +1,7 @@
 <RCC>
   <qresource prefix="/animations">
     <file alias="blocked_peers_empty.tgs">../../animations/blocked_peers_empty.tgs</file>
+    <file alias="change_number.tgs">../../animations/change_number.tgs</file>
     <file alias="filters.tgs">../../animations/filters.tgs</file>
     <file alias="cloud_filters.tgs">../../animations/cloud_filters.tgs</file>
     <file alias="local_passcode_enter.tgs">../../animations/local_passcode_enter.tgs</file>
@@ -8,6 +9,7 @@
     <file alias="cloud_password/password_input.tgs">../../animations/cloud_password/password_input.tgs</file>
     <file alias="cloud_password/hint.tgs">../../animations/cloud_password/hint.tgs</file>
     <file alias="cloud_password/email.tgs">../../animations/cloud_password/email.tgs</file>
+    <file alias="cloud_password/validate.tgs">../../animations/cloud_password/validate.tgs</file>
     <file alias="ttl.tgs">../../animations/ttl.tgs</file>
     <file alias="discussion.tgs">../../animations/discussion.tgs</file>
     <file alias="stats.tgs">../../animations/stats.tgs</file>
@@ -15,19 +17,65 @@
     <file alias="stats_earn.tgs">../../animations/stats_earn.tgs</file>
     <file alias="voice_ttl_idle.tgs">../../animations/voice_ttl_idle.tgs</file>
     <file alias="voice_ttl_start.tgs">../../animations/voice_ttl_start.tgs</file>
+    <file alias="chat/voice_to_video.tgs">../../animations/chat/voice_to_video.tgs</file>
+    <file alias="chat/video_to_voice.tgs">../../animations/chat/video_to_voice.tgs</file>
+    <file alias="chat/sparkles_emoji.tgs">../../animations/chat/sparkles_emoji.tgs</file>
+    <file alias="chat/white_flag_emoji.tgs">../../animations/chat/white_flag_emoji.tgs</file>
     <file alias="palette.tgs">../../animations/palette.tgs</file>
     <file alias="sleep.tgs">../../animations/sleep.tgs</file>
     <file alias="greeting.tgs">../../animations/greeting.tgs</file>
     <file alias="location.tgs">../../animations/location.tgs</file>
-    <file alias="robot.tgs">../../animations/robot.tgs</file>
+    <file alias="settings/chat_automation.tgs">../../animations/settings/chat_automation.tgs</file>
     <file alias="writing.tgs">../../animations/writing.tgs</file>
     <file alias="hours.tgs">../../animations/hours.tgs</file>
     <file alias="phone.tgs">../../animations/phone.tgs</file>
     <file alias="chat_link.tgs">../../animations/chat_link.tgs</file>
+    <file alias="diamond.tgs">../../animations/diamond.tgs</file>
     <file alias="collectible_username.tgs">../../animations/collectible_username.tgs</file>
     <file alias="collectible_phone.tgs">../../animations/collectible_phone.tgs</file>
     <file alias="search.tgs">../../animations/search.tgs</file>
     <file alias="noresults.tgs">../../animations/noresults.tgs</file>
+    <file alias="hello_status.tgs">../../animations/hello_status.tgs</file>
+    <file alias="starref_link.tgs">../../animations/starref_link.tgs</file>
+    <file alias="media_forbidden.tgs">../../animations/media_forbidden.tgs</file>
+    <file alias="topics.tgs">../../animations/edit_peers/topics.tgs</file>
+    <file alias="topics_tabs.tgs">../../animations/edit_peers/topics_tabs.tgs</file>
+    <file alias="topics_list.tgs">../../animations/edit_peers/topics_list.tgs</file>
+    <file alias="direct_messages.tgs">../../animations/edit_peers/direct_messages.tgs</file>
+    <file alias="no_chats.tgs">../../animations/no_chats.tgs</file>
+    <file alias="transcribe_loading.tgs">../../animations/transcribe_loading.tgs</file>
+    <file alias="cake.tgs">../../animations/cake.tgs</file>
+    <file alias="camera_outline.tgs">../../animations/camera_outline.tgs</file>
+    <file alias="photo_suggest_icon.tgs">../../animations/photo_suggest_icon.tgs</file>
+    <file alias="toast/saved_messages.tgs">../../animations/toast/saved_messages.tgs</file>
+    <file alias="toast/tagged.tgs">../../animations/toast/tagged.tgs</file>
+    <file alias="my_gifts_empty.tgs">../../animations/my_gifts_empty.tgs</file>
+    <file alias="toast/chats_filter_in.tgs">../../animations/toast/chats_filter_in.tgs</file>
+    <file alias="toast/save_to_gallery.tgs">../../animations/toast/save_to_gallery.tgs</file>
+    <file alias="toast/save_to_music.tgs">../../animations/toast/save_to_music.tgs</file>
+    <file alias="toast/delete.tgs">../../animations/toast/delete.tgs</file>
+    <file alias="toast/voip_invite.tgs">../../animations/toast/voip_invite.tgs</file>
+    <file alias="toast/copy.tgs">../../animations/toast/copy.tgs</file>
+    <file alias="toast/mute.tgs">../../animations/toast/mute.tgs</file>
+    <file alias="toast/unmute.tgs">../../animations/toast/unmute.tgs</file>
+    <file alias="toast/pin.tgs">../../animations/toast/pin.tgs</file>
+    <file alias="toast/unpin.tgs">../../animations/toast/unpin.tgs</file>
+    <file alias="toast/chats_archived.tgs">../../animations/toast/chats_archived.tgs</file>
+    <file alias="toast/star_premium_2.tgs">../../animations/toast/star_premium_2.tgs</file>
+    <file alias="toast/contact_check.tgs">../../animations/toast/contact_check.tgs</file>
+    <file alias="rtmp.tgs">../../animations/rtmp.tgs</file>
+    <file alias="show_or_premium_lastseen.tgs">../../animations/show_or_premium_lastseen.tgs</file>
+    <file alias="show_or_premium_readtime.tgs">../../animations/show_or_premium_readtime.tgs</file>
+    <file alias="passkeys.tgs">../../animations/passkeys.tgs</file>
+    <file alias="ban.tgs">../../animations/ban.tgs</file>
+    <file alias="cocoon.tgs">../../animations/cocoon.tgs</file>
+    <file alias="craft_failed.tgs">../../animations/craft_failed.tgs</file>
+    <file alias="stop.tgs">../../animations/stop.tgs</file>
+    <file alias="toast_hide_results.tgs">../../icons/poll/toast_hide_results.tgs</file>
+    <file alias="uploading.tgs">../../icons/poll/uploading.tgs</file>
+
+    <file alias="profile_muting.tgs">../../animations/profile/profile_muting.tgs</file>
+    <file alias="profile_unmuting.tgs">../../animations/profile/profile_unmuting.tgs</file>
 
     <file alias="dice_idle.tgs">../../animations/dice/dice_idle.tgs</file>
     <file alias="dart_idle.tgs">../../animations/dice/dart_idle.tgs</file>
@@ -39,6 +87,7 @@
     <file alias="slot_back.tgs">../../animations/dice/slot_back.tgs</file>
     <file alias="slot_pull.tgs">../../animations/dice/slot_pull.tgs</file>
     <file alias="winners.tgs">../../animations/dice/winners.tgs</file>
+    <file alias="dice_6.tgs">../../animations/dice/dice_6.tgs</file>
 
     <file alias="star_reaction_appear.tgs">../../animations/star_reaction/appear.tgs</file>
     <file alias="star_reaction_center.tgs">../../animations/star_reaction/center.tgs</file>
@@ -47,5 +96,24 @@
     <file alias="star_reaction_effect1.tgs">../../animations/star_reaction/effect1.tgs</file>
     <file alias="star_reaction_effect2.tgs">../../animations/star_reaction/effect2.tgs</file>
     <file alias="star_reaction_effect3.tgs">../../animations/star_reaction/effect3.tgs</file>
+
+    <file alias="photo_editor_pen.tgs">../../animations/photo_editor/pen.tgs</file>
+    <file alias="photo_editor_arrow.tgs">../../animations/photo_editor/arrow.tgs</file>
+    <file alias="photo_editor_marker.tgs">../../animations/photo_editor/marker.tgs</file>
+    <file alias="photo_editor_eraser.tgs">../../animations/photo_editor/eraser.tgs</file>
+    <file alias="photo_editor_blur.tgs">../../animations/photo_editor/blur.tgs</file>
+
+    <file alias="swipe_archive.tgs">../../animations/swipe_action/archive.tgs</file>
+    <file alias="swipe_unarchive.tgs">../../animations/swipe_action/unarchive.tgs</file>
+    <file alias="swipe_delete.tgs">../../animations/swipe_action/delete.tgs</file>
+    <file alias="swipe_disabled.tgs">../../animations/swipe_action/disabled.tgs</file>
+    <file alias="swipe_mute.tgs">../../animations/swipe_action/mute.tgs</file>
+    <file alias="swipe_unmute.tgs">../../animations/swipe_action/unmute.tgs</file>
+    <file alias="swipe_pin.tgs">../../animations/swipe_action/pin.tgs</file>
+    <file alias="swipe_unpin.tgs">../../animations/swipe_action/unpin.tgs</file>
+    <file alias="swipe_read.tgs">../../animations/swipe_action/read.tgs</file>
+    <file alias="swipe_unread.tgs">../../animations/swipe_action/unread.tgs</file>
+    <file alias="craft_progress.tgs">../../animations/craft_progress.tgs</file>
+    <file alias="cleaning_cache.tgs">../../animations/cleaning_cache.tgs</file>
   </qresource>
 </RCC>
diff --git a/Telegram/Resources/qrc/telegram/bot_webview_shell.qrc b/Telegram/Resources/qrc/telegram/bot_webview_shell.qrc
new file mode 100644
index 00000000000000..c19383ac049052
--- /dev/null
+++ b/Telegram/Resources/qrc/telegram/bot_webview_shell.qrc
@@ -0,0 +1,7 @@
+<RCC>
+  <qresource prefix="/bot_webview_shell">
+    <file alias="page.css">../../bot_webview_shell_html/page.css</file>
+    <file alias="page.js">../../bot_webview_shell_html/page.js</file>
+    <file alias="body.html">../../bot_webview_shell_html/body.html</file>
+  </qresource>
+</RCC>
diff --git a/Telegram/Resources/qrc/telegram/export.qrc b/Telegram/Resources/qrc/telegram/export.qrc
index 290d24a30bf842..e3656ae94415ba 100644
--- a/Telegram/Resources/qrc/telegram/export.qrc
+++ b/Telegram/Resources/qrc/telegram/export.qrc
@@ -31,6 +31,8 @@
     <file alias="images/section_contacts@2x.png">../../export_html/images/section_contacts@2x.png</file>
     <file alias="images/section_frequent.png">../../export_html/images/section_frequent.png</file>
     <file alias="images/section_frequent@2x.png">../../export_html/images/section_frequent@2x.png</file>
+    <file alias="images/section_music.png">../../export_html/images/section_music.png</file>
+    <file alias="images/section_music@2x.png">../../export_html/images/section_music@2x.png</file>
     <file alias="images/section_other.png">../../export_html/images/section_other.png</file>
     <file alias="images/section_other@2x.png">../../export_html/images/section_other@2x.png</file>
     <file alias="images/section_photos.png">../../export_html/images/section_photos.png</file>
diff --git a/Telegram/Resources/qrc/telegram/iv.qrc b/Telegram/Resources/qrc/telegram/iv.qrc
deleted file mode 100644
index 1c9e9eb6ab9d72..00000000000000
--- a/Telegram/Resources/qrc/telegram/iv.qrc
+++ /dev/null
@@ -1,9 +0,0 @@
-<RCC>
-  <qresource prefix="/iv">
-    <file alias="page.css">../../iv_html/page.css</file>
-    <file alias="page.js">../../iv_html/page.js</file>
-    <file alias="highlight.css">../../iv_html/highlight.9.12.0.css</file>
-    <file alias="highlight.js">../../iv_html/highlight.9.12.0.js</file>
-    <file alias="morphdom.js">../../iv_html/morphdom-umd.min.2.7.2.js</file>
-  </qresource>
-</RCC>
diff --git a/Telegram/Resources/qrc/telegram/sounds.qrc b/Telegram/Resources/qrc/telegram/sounds.qrc
index d9f7cf8b5a1de0..1ffc48b05210e6 100644
--- a/Telegram/Resources/qrc/telegram/sounds.qrc
+++ b/Telegram/Resources/qrc/telegram/sounds.qrc
@@ -10,5 +10,6 @@
     <file alias="group_call_connect.mp3">../../sounds/group_call_connect.mp3</file>
     <file alias="group_call_end.mp3">../../sounds/group_call_end.mp3</file>
     <file alias="group_call_allowed.mp3">../../sounds/group_call_allowed.mp3</file>
+    <file alias="group_call_recording_start.mp3">../../sounds/group_call_recording_start.mp3</file>
   </qresource>
 </RCC>
diff --git a/Telegram/Resources/qrc/telegram/telegram.qrc b/Telegram/Resources/qrc/telegram/telegram.qrc
index 09f8b0fac79f1a..fda0ed1ef4bc1c 100644
--- a/Telegram/Resources/qrc/telegram/telegram.qrc
+++ b/Telegram/Resources/qrc/telegram/telegram.qrc
@@ -4,9 +4,15 @@
     <file alias="art/bg_thumbnail.png">../../art/bg_thumbnail.png</file>
     <file alias="art/bg_initial.jpg">../../art/bg_initial.jpg</file>
     <file alias="art/business_logo.png">../../art/business_logo.png</file>
+    <file alias="art/affiliate_logo.png">../../art/affiliate_logo.png</file>
     <file alias="art/logo_256.png">../../art/logo_256.png</file>
     <file alias="art/logo_256_no_margin.png">../../art/logo_256_no_margin.png</file>
     <file alias="art/themeimage.jpg">../../art/themeimage.jpg</file>
+    <file alias="art/round_placeholder.jpg">../../art/round_placeholder.jpg</file>
+    <file alias="art/cocoon.webp">../../art/cocoon.webp</file>
+    <file alias="art/premium/flecks.png">../../art/premium/flecks.png</file>
+    <file alias="art/premium/star_texture.svg">../../art/premium/star_texture.svg</file>
+    <file alias="art/premium/coin_border.png">../../art/premium/coin_border.png</file>
     <file alias="day-blue.tdesktop-theme">../../day-blue.tdesktop-theme</file>
     <file alias="night.tdesktop-theme">../../night.tdesktop-theme</file>
     <file alias="night-green.tdesktop-theme">../../night-green.tdesktop-theme</file>
@@ -21,7 +27,10 @@
     <file alias="icons/settings/dino.svg">../../icons/settings/dino.svg</file>
     <file alias="icons/settings/star.svg">../../icons/settings/star.svg</file>
     <file alias="icons/settings/starmini.svg">../../icons/settings/starmini.svg</file>
+    <file alias="icons/settings/premium_dollar.svg">../../icons/settings/premium_dollar.svg</file>
     <file alias="icons/tray/monochrome.svg">../../icons/tray_monochrome.svg</file>
+    <file alias="icons/tray/monochrome_attention.svg">../../icons/tray_monochrome_attention.svg</file>
+    <file alias="icons/tray/monochrome_mute.svg">../../icons/tray_monochrome_mute.svg</file>
     <file alias="topic_icons/blue.svg">../../art/topic_icons/blue.svg</file>
     <file alias="topic_icons/yellow.svg">../../art/topic_icons/yellow.svg</file>
     <file alias="topic_icons/violet.svg">../../art/topic_icons/violet.svg</file>
@@ -32,10 +41,17 @@
     <file alias="topic_icons/general.svg">../../art/topic_icons/general.svg</file>
     <file alias="links_subscription.svg">../../icons/info/edit/links_subscription.svg</file>
     <file alias="plane_white.svg">../../icons/plane_white.svg</file>
+    <file alias="dice/dice1.svg">../../art/dice/dice1.svg</file>
+    <file alias="dice/dice2.svg">../../art/dice/dice2.svg</file>
+    <file alias="dice/dice3.svg">../../art/dice/dice3.svg</file>
+    <file alias="dice/dice4.svg">../../art/dice/dice4.svg</file>
+    <file alias="dice/dice5.svg">../../art/dice/dice5.svg</file>
+    <file alias="dice/dice6.svg">../../art/dice/dice6.svg</file>
   </qresource>
   <qresource prefix="/icons">
     <file alias="calls/hands.lottie">../../icons/calls/hands.lottie</file>
     <file alias="calls/voice.lottie">../../icons/calls/voice.lottie</file>
+    <file alias="notify_toggle.lottie">../../icons/notify_toggle.lottie</file>
     <file alias="settings/devices/device_desktop_mac.lottie">../../icons/settings/devices/device_desktop_mac.lottie</file>
     <file alias="settings/devices/device_desktop_win.lottie">../../icons/settings/devices/device_desktop_win.lottie</file>
     <file alias="settings/devices/device_linux.lottie">../../icons/settings/devices/device_linux.lottie</file>
diff --git a/Telegram/Resources/sounds/group_call_recording_start.mp3 b/Telegram/Resources/sounds/group_call_recording_start.mp3
new file mode 100644
index 00000000000000..0060e82c3737b9
Binary files /dev/null and b/Telegram/Resources/sounds/group_call_recording_start.mp3 differ
diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 798a9e2207c171..94c6a129e4edf2 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.6.3.0" />
+    Version="6.9.3.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index bddb3423bfaecd..b73eba45653842 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,6,3,0
- PRODUCTVERSION 5,6,3,0
+ FILEVERSION 6,9,3,0
+ PRODUCTVERSION 6,9,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.6.3.0"
-            VALUE "LegalCopyright", "Copyright (C) 2014-2024"
+            VALUE "FileVersion", "6.9.3.0"
+            VALUE "LegalCopyright", "Copyright (C) 2014-2026"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.6.3.0"
+            VALUE "ProductVersion", "6.9.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 84d811fbc8c1df..0703894f6a525d 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,6,3,0
- PRODUCTVERSION 5,6,3,0
+ FILEVERSION 6,9,3,0
+ PRODUCTVERSION 6,9,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "5.6.3.0"
-            VALUE "LegalCopyright", "Copyright (C) 2014-2024"
+            VALUE "FileVersion", "6.9.3.0"
+            VALUE "LegalCopyright", "Copyright (C) 2014-2026"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.6.3.0"
+            VALUE "ProductVersion", "6.9.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/_other/packer.cpp b/Telegram/SourceFiles/_other/packer.cpp
index e563e167534a53..4df8b238000087 100644
--- a/Telegram/SourceFiles/_other/packer.cpp
+++ b/Telegram/SourceFiles/_other/packer.cpp
@@ -283,7 +283,7 @@ int main(int argc, char *argv[])
 	cout << "Compression start, size: " << resultSize << "\n";
 
 	QByteArray compressed, resultCheck;
-#if defined Q_OS_WIN && !defined TDESKTOP_USE_PACKAGED // use Lzma SDK for win
+#if defined Q_OS_WIN && !defined PACKER_USE_PACKAGED // use Lzma SDK for win
 	const int32 hSigLen = 128, hShaLen = 20, hPropsLen = LZMA_PROPS_SIZE, hOriginalSizeLen = sizeof(int32), hSize = hSigLen + hShaLen + hPropsLen + hOriginalSizeLen; // header
 
 	compressed.resize(hSize + resultSize + 1024 * 1024); // rsa signature + sha1 + lzma props + max compressed size
diff --git a/Telegram/SourceFiles/_other/packer.h b/Telegram/SourceFiles/_other/packer.h
index 4e5fbfc7ac042e..2c200eefd748f8 100644
--- a/Telegram/SourceFiles/_other/packer.h
+++ b/Telegram/SourceFiles/_other/packer.h
@@ -27,7 +27,7 @@ extern "C" {
 #include <openssl/evp.h>
 } // extern "C"
 
-#if defined Q_OS_WIN && !defined TDESKTOP_USE_PACKAGED // use Lzma SDK for win
+#if defined Q_OS_WIN && !defined PACKER_USE_PACKAGED // use Lzma SDK for win
 #include <LzmaLib.h>
 #else
 #include <lzma.h>
diff --git a/Telegram/SourceFiles/_other/updater_linux.cpp b/Telegram/SourceFiles/_other/updater_linux.cpp
index 58bc10efadf615..67b74453e16a46 100644
--- a/Telegram/SourceFiles/_other/updater_linux.cpp
+++ b/Telegram/SourceFiles/_other/updater_linux.cpp
@@ -5,6 +5,7 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
+#define _GLIBCXX_USE_CXX11_ABI 0
 #include <cstdio>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/Telegram/SourceFiles/api/api_authorizations.cpp b/Telegram/SourceFiles/api/api_authorizations.cpp
index 78e463c116fa64..9652e7feddee20 100644
--- a/Telegram/SourceFiles/api/api_authorizations.cpp
+++ b/Telegram/SourceFiles/api/api_authorizations.cpp
@@ -9,10 +9,13 @@ For license and copyright information please follow this link:
 
 #include "apiwrap.h"
 #include "base/unixtime.h"
-#include "core/changelogs.h"
 #include "core/application.h"
+#include "core/changelogs.h"
 #include "core/core_settings.h"
 #include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session_settings.h"
+#include "main/main_session.h"
 
 namespace Api {
 namespace {
@@ -83,9 +86,21 @@ Authorizations::Entry ParseEntry(const MTPDauthorization &data) {
 } // namespace
 
 Authorizations::Authorizations(not_null<ApiWrap*> api)
-: _api(&api->instance()) {
+: _api(&api->instance())
+, _autoconfirmPeriod([=] {
+	constexpr auto kFallbackCount = 604800;
+	return api->session().appConfig().get<int>(
+		u"authorization_autoconfirm_period"_q,
+		kFallbackCount);
+})
+, _saveUnreviewed([=] {
+	api->session().settings().setUnreviewed(_unreviewed);
+	api->session().saveSettingsDelayed();
+}) {
+	_unreviewed = api->session().settings().unreviewed();
+	crl::on_main(&api->session(), [=] { removeExpiredUnreviewed(); });
 	Core::App().settings().deviceModelChanges(
-	) | rpl::start_with_next([=](const QString &model) {
+	) | rpl::on_next([=](const QString &model) {
 		auto changed = false;
 		for (auto &entry : _list) {
 			if (!entry.hash) {
@@ -119,6 +134,7 @@ void Authorizations::reload() {
 		) | ranges::views::transform([](const MTPAuthorization &auth) {
 			return ParseEntry(auth.data());
 		}) | ranges::to<List>;
+		removeExpiredUnreviewed();
 		refreshCallsDisabledHereFromCloud();
 		_listChanges.fire({});
 	}).fail([=] {
@@ -261,4 +277,129 @@ crl::time Authorizations::lastReceivedTime() {
 	return _lastReceived;
 }
 
+const std::vector<Data::UnreviewedAuth> &Authorizations::unreviewed() {
+	removeExpiredUnreviewed();
+	return _unreviewed;
+}
+
+void Authorizations::removeExpiredUnreviewed() {
+	const auto now = base::unixtime::now();
+	const auto period = _autoconfirmPeriod();
+
+	const auto oldSize = _unreviewed.size();
+	_unreviewed.erase(
+		std::remove_if(_unreviewed.begin(), _unreviewed.end(),
+			[=](const auto &auth) {
+				return (now - auth.date) >= period;
+			}),
+		_unreviewed.end());
+
+	if (_unreviewed.size() != oldSize) {
+		_saveUnreviewed();
+	}
+}
+
+void Authorizations::review(const std::vector<uint64> &hashes, bool confirm) {
+	for (const auto hash : hashes) {
+		if (const auto sent = _reviewRequests.take(hash)) {
+			_api.request(*sent).cancel();
+		}
+	}
+
+	const auto checkComplete = [=] {
+		if (_reviewRequests.empty()) {
+			_saveUnreviewed();
+			_unreviewedChanges.fire({});
+		}
+	};
+
+	for (const auto hash : hashes) {
+		const auto removeFromUnreviewed = [=] {
+			_unreviewed.erase(
+				std::remove_if(_unreviewed.begin(), _unreviewed.end(),
+					[hash](const auto &auth) { return auth.hash == hash; }),
+				_unreviewed.end());
+			_reviewRequests.remove(hash);
+			checkComplete();
+		};
+
+		if (confirm) {
+			using Flag = MTPaccount_ChangeAuthorizationSettings::Flag;
+			const auto id = _api.request(MTPaccount_ChangeAuthorizationSettings(
+				MTP_flags(Flag::f_confirmed),
+				MTP_long(hash),
+				MTPBool(), // encrypted_requests_disabled
+				MTPBool() // call_requests_disabled
+			)).done([=] {
+				removeFromUnreviewed();
+			}).fail([=] {
+				removeFromUnreviewed();
+			}).send();
+			_reviewRequests.emplace(hash, id);
+		} else {
+			const auto id = _api.request(MTPaccount_ResetAuthorization(
+				MTP_long(hash)
+			)).done([=](const MTPBool &result) {
+				if (mtpIsTrue(result)) {
+					_list.erase(
+						ranges::remove(_list, hash, &Entry::hash),
+						end(_list));
+					_listChanges.fire({});
+				}
+				removeFromUnreviewed();
+			}).fail([=] {
+				removeFromUnreviewed();
+			}).send();
+			_reviewRequests.emplace(hash, id);
+		}
+	}
+}
+
+rpl::producer<> Authorizations::unreviewedChanges() const {
+	return _unreviewedChanges.events();
+}
+
+void Authorizations::apply(const MTPUpdate &update) {
+	removeExpiredUnreviewed();
+	update.match([&](const MTPDupdateNewAuthorization &data) {
+		auto unreviewed = Data::UnreviewedAuth{
+			.hash = data.vhash().v,
+			.unconfirmed = data.is_unconfirmed(),
+			.date = data.vdate().value_or_empty(),
+			.device = qs(data.vdevice().value_or_empty()),
+			.location = qs(data.vlocation().value_or_empty())
+		};
+		if (!unreviewed.unconfirmed) {
+			const auto hash = unreviewed.hash;
+			const auto was = _unreviewed.size();
+			_unreviewed.erase(
+				std::remove_if(
+					_unreviewed.begin(),
+					_unreviewed.end(),
+					[hash](const auto &auth) { return auth.hash == hash; }),
+				_unreviewed.end());
+			if (was != _unreviewed.size()) {
+				_saveUnreviewed();
+				_unreviewedChanges.fire({});
+			}
+			return;
+		}
+
+		for (auto &auth : _unreviewed) {
+			if (auth.hash == unreviewed.hash) {
+				auth = std::move(unreviewed);
+				_saveUnreviewed();
+				_unreviewedChanges.fire({});
+				return;
+			}
+		}
+
+		_unreviewed.push_back(std::move(unreviewed));
+		_saveUnreviewed();
+		_unreviewedChanges.fire({});
+	}, [](auto&&) {
+		Unexpected("Update in Authorizations::apply.");
+	});
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_authorizations.h b/Telegram/SourceFiles/api/api_authorizations.h
index 5e2a41c9f90193..25c97f39457677 100644
--- a/Telegram/SourceFiles/api/api_authorizations.h
+++ b/Telegram/SourceFiles/api/api_authorizations.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "data/data_authorization.h"
 #include "mtproto/sender.h"
 
 class ApiWrap;
@@ -35,6 +36,8 @@ class Authorizations final {
 		Fn<void(const MTP::Error &error)> &&fail,
 		std::optional<uint64> hash = std::nullopt);
 
+	void apply(const MTPUpdate &update);
+
 	[[nodiscard]] crl::time lastReceivedTime();
 
 	[[nodiscard]] List list() const;
@@ -42,6 +45,11 @@ class Authorizations final {
 	[[nodiscard]] int total() const;
 	[[nodiscard]] rpl::producer<int> totalValue() const;
 
+	[[nodiscard]] const std::vector<Data::UnreviewedAuth> &unreviewed();
+	[[nodiscard]] rpl::producer<> unreviewedChanges() const;
+
+	void review(const std::vector<uint64> &hashes, bool confirm);
+
 	void updateTTL(int days);
 	[[nodiscard]] rpl::producer<int> ttlDays() const;
 
@@ -57,6 +65,7 @@ class Authorizations final {
 
 private:
 	void refreshCallsDisabledHereFromCloud();
+	void removeExpiredUnreviewed();
 
 	MTP::Sender _api;
 	mtpRequestId _requestId = 0;
@@ -64,10 +73,16 @@ class Authorizations final {
 	List _list;
 	rpl::event_stream<> _listChanges;
 
+	Fn<int()> _autoconfirmPeriod;
+	std::vector<Data::UnreviewedAuth> _unreviewed;
+	rpl::event_stream<> _unreviewedChanges;
+	Fn<void()> _saveUnreviewed;
+
 	mtpRequestId _ttlRequestId = 0;
 	rpl::variable<int> _ttlDays = 0;
 
 	base::flat_map<uint64, mtpRequestId> _toggleCallsDisabledRequests;
+	base::flat_map<uint64, mtpRequestId> _reviewRequests;
 	rpl::variable<bool> _callsDisabledHere;
 
 	crl::time _lastReceived = 0;
diff --git a/Telegram/SourceFiles/api/api_blocked_peers.cpp b/Telegram/SourceFiles/api/api_blocked_peers.cpp
index 0a79eb733ba5d4..1e7915e65e6486 100644
--- a/Telegram/SourceFiles/api/api_blocked_peers.cpp
+++ b/Telegram/SourceFiles/api/api_blocked_peers.cpp
@@ -83,7 +83,7 @@ void BlockedPeers::block(not_null<PeerData*> peer) {
 	}
 	const auto requestId = _api.request(MTPcontacts_Block(
 		MTP_flags(0),
-		peer->input
+		peer->input()
 	)).done([=] {
 		const auto data = _blockRequests.take(peer);
 		peer->setIsBlocked(true);
@@ -127,7 +127,7 @@ void BlockedPeers::unblock(
 	}
 	const auto requestId = _api.request(MTPcontacts_Unblock(
 		MTP_flags(0),
-		peer->input
+		peer->input()
 	)).done([=] {
 		const auto data = _blockRequests.take(peer);
 		peer->setIsBlocked(false);
@@ -204,7 +204,7 @@ auto BlockedPeers::slice() -> rpl::producer<BlockedPeers::Slice> {
 	}
 	return _slice
 		? _changes.events_starting_with_copy(*_slice)
-		: (_changes.events() | rpl::type_erased());
+		: (_changes.events() | rpl::type_erased);
 }
 
 void BlockedPeers::request(int offset, Fn<void(BlockedPeers::Slice)> done) {
diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp
index 5342cbd2e00450..8898ff605b2281 100644
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -10,10 +10,12 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "api/api_cloud_password.h"
 #include "api/api_send_progress.h"
-#include "boxes/share_box.h"
+#include "api/api_suggest_post.h"
+#include "boxes/peers/choose_peer_box.h"
+#include "boxes/peers/create_managed_bot_box.h"
 #include "boxes/passcode_box.h"
+#include "boxes/share_box.h"
 #include "boxes/url_auth_box.h"
-#include "boxes/peers/choose_peer_box.h"
 #include "lang/lang_keys.h"
 #include "chat_helpers/bot_command.h"
 #include "core/core_cloud_password.h"
@@ -38,7 +40,10 @@ For license and copyright information please follow this link:
 #include "ui/toast/toast.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
+#include <QtCore/QDataStream>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
 
@@ -90,7 +95,7 @@ void SendBotCallbackData(
 	const auto show = controller->uiShow();
 	button->requestId = api->request(MTPmessages_GetBotCallbackAnswer(
 		MTP_flags(flags),
-		history->peer->input,
+		history->peer->input(),
 		MTP_int(item->id),
 		MTP_bytes(sendData),
 		password ? password->result : MTP_inputCheckPasswordEmpty()
@@ -217,7 +222,7 @@ void SendBotCallbackDataWithPassword(
 			session,
 			tr::lng_bots_password_confirm_check_about(
 				tr::now,
-				Ui::Text::WithEntities));
+				tr::marked));
 		if (box) {
 			show->showBox(std::move(box), Ui::LayerOption::CloseOther);
 		} else {
@@ -226,7 +231,7 @@ void SendBotCallbackDataWithPassword(
 			api->cloudPassword().state(
 			) | rpl::take(
 				1
-			) | rpl::start_with_next([=](const Core::CloudPasswordState &state) mutable {
+			) | rpl::on_next([=](const Core::CloudPasswordState &state) mutable {
 				if (lifetime) {
 					base::take(lifetime)->destroy();
 				}
@@ -244,7 +249,7 @@ void SendBotCallbackDataWithPassword(
 				fields.customSubmitButton = tr::lng_passcode_submit();
 				fields.customCheckCallback = [=](
 						const Core::CloudPasswordResult &result,
-						QPointer<PasscodeBox> box) {
+						base::weak_qptr<PasscodeBox> box) {
 					if (const auto button = getButton()) {
 						if (button->requestId) {
 							return;
@@ -390,7 +395,7 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 
 	case ButtonType::RequestPoll: {
 		HideSingleUseKeyboard(controller, item);
-		auto chosen = PollData::Flags();
+		auto chosen = kDefaultPollCreateFlags;
 		auto disabled = PollData::Flags();
 		if (!button->data.isEmpty()) {
 			disabled |= PollData::Flag::Quiz;
@@ -399,10 +404,12 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 			}
 		}
 		const auto replyTo = FullReplyTo();
+		const auto suggest = SuggestOptions();
 		Window::PeerMenuCreatePoll(
 			controller,
 			item->history()->peer,
 			replyTo,
+			suggest,
 			chosen,
 			disabled);
 	} break;
@@ -417,14 +424,17 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 		const auto itemId = item->id;
 		const auto id = int32(button->buttonId);
 		const auto chosen = [=](std::vector<not_null<PeerData*>> result) {
+			using Flag = MTPmessages_SendBotRequestedPeer::Flag;
 			peer->session().api().request(MTPmessages_SendBotRequestedPeer(
-				peer->input,
+				MTP_flags(Flag::f_msg_id),
+				peer->input(),
 				MTP_int(itemId),
+				MTPstring(), // request_id
 				MTP_int(id),
 				MTP_vector_from_range(
 					result | ranges::views::transform([](
 							not_null<PeerData*> peer) {
-						return MTPInputPeer(peer->input);
+						return MTPInputPeer(peer->input());
 					}))
 			)).done([=](const MTPUpdates &result) {
 				peer->session().api().applyUpdates(result);
@@ -479,7 +489,7 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 	} break;
 
 	case ButtonType::Auth:
-		UrlAuthBox::Activate(item, row, column);
+		UrlAuthBox::ActivateButton(controller->uiShow(), item, row, column);
 		break;
 
 	case ButtonType::UserProfile: {
@@ -516,9 +526,86 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 		const auto text = QString::fromUtf8(button->data);
 		if (!text.isEmpty()) {
 			QGuiApplication::clipboard()->setText(text);
-			controller->showToast(tr::lng_text_copied(tr::now));
+			controller->showToast({
+				.text = { tr::lng_text_copied(tr::now) },
+				.iconLottie = u"toast/copy"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
 		}
 	} break;
+
+	case ButtonType::SuggestAccept: {
+		Api::AcceptClickHandler(item)->onClick(ClickContext{
+			Qt::LeftButton,
+			QVariant::fromValue(context),
+		});
+	} break;
+
+	case ButtonType::SuggestDecline: {
+		Api::DeclineClickHandler(item)->onClick(ClickContext{
+			Qt::LeftButton,
+			QVariant::fromValue(context),
+		});
+	} break;
+
+	case ButtonType::SuggestChange: {
+		Api::SuggestChangesClickHandler(item)->onClick(ClickContext{
+			Qt::LeftButton,
+			QVariant::fromValue(context),
+		});
+	} break;
+
+	case ButtonType::CreateBot: {
+		HideSingleUseKeyboard(controller, item);
+
+		auto suggestedName = QString();
+		auto suggestedUsername = QString();
+		{
+			auto stream = QDataStream(button->data);
+			stream >> suggestedName >> suggestedUsername;
+		}
+		const auto peer = item->history()->peer;
+		const auto itemId = item->id;
+		const auto id = int32(button->buttonId);
+		const auto bot = item->getMessageBot();
+		if (!bot) {
+			break;
+		}
+		ShowCreateManagedBotBox({
+			.show = controller->uiShow(),
+			.manager = bot,
+			.suggestedName = suggestedName,
+			.suggestedUsername = suggestedUsername,
+			.done = [=](not_null<UserData*> createdBot) {
+				using Flag = MTPmessages_SendBotRequestedPeer::Flag;
+				peer->session().api().request(
+					MTPmessages_SendBotRequestedPeer(
+						MTP_flags(Flag::f_msg_id),
+						peer->input(),
+						MTP_int(itemId),
+						MTPstring(),
+						MTP_int(id),
+						MTP_vector<MTPInputPeer>(
+							1,
+							createdBot->input()))
+				).done([=](const MTPUpdates &result) {
+					peer->session().api().applyUpdates(result);
+				}).send();
+				controller->showPeerHistory(createdBot);
+				controller->showToast({
+					.title = tr::lng_managed_bot_created_title(
+						tr::now,
+						lt_name,
+						createdBot->name()),
+					.text = { tr::lng_managed_bot_created_text(
+						tr::now,
+						lt_parent_name,
+						bot->name()) },
+					.icon = &st::toastCheckIcon,
+				});
+			},
+		});
+	} break;
 	}
 }
 
diff --git a/Telegram/SourceFiles/api/api_chat_filters.cpp b/Telegram/SourceFiles/api/api_chat_filters.cpp
index ee6b97b5849273..cbfacbc0a0108f 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters.cpp
@@ -7,11 +7,16 @@ For license and copyright information please follow this link:
 */
 #include "api/api_chat_filters.h"
 
+#include "api/api_text_entities.h"
 #include "apiwrap.h"
+#include "base/event_filter.h"
+#include "base/weak_ptr.h"
 #include "boxes/peer_list_box.h"
 #include "boxes/premium_limits_box.h"
 #include "boxes/filters/edit_filter_links.h" // FilterChatStatusText
 #include "core/application.h"
+#include "core/core_settings.h"
+#include "core/ui_integration.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_chat_filters.h"
@@ -22,14 +27,22 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/filter_link_header.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/layers/show.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/filter_icons.h"
+#include "ui/painter.h"
 #include "ui/vertical_list.h"
 #include "ui/ui_utility.h"
 #include "window/window_session_controller.h"
+#include "window/window_separate_id.h"
 #include "styles/style_filter_icons.h"
+#include "styles/style_info.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_settings.h"
 
 namespace Api {
@@ -40,6 +53,112 @@ enum class ToggleAction {
 	Removing,
 };
 
+class PreviewableRow final
+	: public PeerListRow
+	, public base::has_weak_ptr {
+public:
+	using PeerListRow::PeerListRow;
+
+	QSize rightActionSize() const override;
+	QMargins rightActionMargins() const override;
+	void rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) override;
+	void rightActionAddRipple(
+		QPoint point,
+		Fn<void()> updateCallback) override;
+	void rightActionStopLastRipple() override;
+
+	void setMenuShown(bool shown);
+
+	[[nodiscard]] QPoint buttonGlobalTopLeft() const {
+		return _buttonGlobalTopLeft;
+	}
+
+private:
+	std::unique_ptr<Ui::RippleAnimation> _actionRipple;
+	QPoint _buttonGlobalTopLeft;
+	bool _menuShown = false;
+
+};
+
+QSize PreviewableRow::rightActionSize() const {
+	const auto side = st::inviteLinkThreeDotsIcon.height();
+	return QSize(side, side);
+}
+
+QMargins PreviewableRow::rightActionMargins() const {
+	return QMargins(
+		0,
+		(st::filterLinkChatsList.item.height
+			- rightActionSize().height()) / 2,
+		st::inviteLinkThreeDotsSkip,
+		0);
+}
+
+void PreviewableRow::rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) {
+	if (_actionRipple) {
+		_actionRipple->paint(p, x, y, outerWidth);
+		if (_actionRipple->empty()) {
+			_actionRipple.reset();
+		}
+	}
+	const auto &icon = actionSelected
+		? st::inviteLinkThreeDotsIconOver
+		: st::inviteLinkThreeDotsIcon;
+	const auto size = rightActionSize();
+	icon.paint(
+		p,
+		x + (size.width() - icon.width()) / 2,
+		y + (size.height() - icon.height()) / 2,
+		outerWidth);
+}
+
+void PreviewableRow::rightActionAddRipple(
+		QPoint point,
+		Fn<void()> updateCallback) {
+	if (!_actionRipple) {
+		auto mask = Ui::RippleAnimation::EllipseMask(rightActionSize());
+		_actionRipple = std::make_unique<Ui::RippleAnimation>(
+			st::defaultRippleAnimation,
+			std::move(mask),
+			std::move(updateCallback));
+	}
+	_actionRipple->add(point);
+	_buttonGlobalTopLeft = QCursor::pos() - point;
+}
+
+void PreviewableRow::rightActionStopLastRipple() {
+	if (_menuShown) {
+		return;
+	}
+	crl::on_main(base::make_weak(this), [this] {
+		if (!_menuShown && _actionRipple) {
+			_actionRipple->lastStop();
+		}
+	});
+}
+
+void PreviewableRow::setMenuShown(bool shown) {
+	if (_menuShown == shown) {
+		return;
+	}
+	_menuShown = shown;
+	if (!shown && _actionRipple) {
+		_actionRipple->lastStop();
+	}
+}
+
 class ToggleChatsController final
 	: public PeerListController
 	, public base::has_weak_ptr {
@@ -47,12 +166,13 @@ class ToggleChatsController final
 	ToggleChatsController(
 		not_null<Window::SessionController*> window,
 		ToggleAction action,
-		const QString &title,
+		Data::ChatFilterTitle title,
 		std::vector<not_null<PeerData*>> chats,
 		std::vector<not_null<PeerData*>> additional);
 
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowRightActionClicked(not_null<PeerListRow*> row) override;
 	Main::Session &session() const override;
 
 	[[nodiscard]] auto selectedValue() const
@@ -73,7 +193,6 @@ class ToggleChatsController final
 	Ui::RpWidget *_addedBottomWidget = nullptr;
 
 	ToggleAction _action = ToggleAction::Adding;
-	QString _filterTitle;
 	base::flat_set<not_null<PeerData*>> _checkable;
 	std::vector<not_null<PeerData*>> _chats;
 	std::vector<not_null<PeerData*>> _additional;
@@ -104,54 +223,61 @@ class ToggleChatsController final
 
 [[nodiscard]] TextWithEntities AboutText(
 		Ui::FilterLinkHeaderType type,
-		const QString &title) {
+		TextWithEntities title) {
 	using Type = Ui::FilterLinkHeaderType;
-	auto boldTitle = Ui::Text::Bold(title);
+	auto boldTitle = Ui::Text::Wrapped(title, EntityType::Bold);
 	return (type == Type::AddingFilter)
 		? tr::lng_filters_by_link_sure(
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: (type == Type::AddingChats)
 		? tr::lng_filters_by_link_more_sure(
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: (type == Type::AllAdded)
 		? tr::lng_filters_by_link_already_about(
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: tr::lng_filters_by_link_remove_sure(
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
-			Ui::Text::WithEntities);
+			tr::marked);
 }
 
 void InitFilterLinkHeader(
 		not_null<PeerListBox*> box,
 		Fn<void(int minHeight, int maxHeight, int addedTopHeight)> adjust,
 		Ui::FilterLinkHeaderType type,
-		const QString &title,
-		const QString &iconEmoji,
-		rpl::producer<int> count) {
+		Data::ChatFilterTitle title,
+		QString iconEmoji,
+		rpl::producer<int> count,
+		bool horizontalFilters) {
 	const auto icon = Ui::LookupFilterIcon(
 		Ui::LookupFilterIconByEmoji(
 			iconEmoji
 		).value_or(Ui::FilterIcon::Custom)).active;
+	const auto isStatic = title.isStatic;
 	auto header = Ui::MakeFilterLinkHeader(box, {
 		.type = type,
 		.title = TitleText(type)(tr::now),
-		.about = AboutText(type, title),
-		.folderTitle = title,
+		.about = AboutText(type, title.text),
+		.aboutContext = Core::TextContext({
+			.session = &box->peerListUiShow()->session(),
+			.customEmojiLoopLimit = isStatic ? -1 : 0,
+		}),
+		.folderTitle = title.text,
 		.folderIcon = icon,
 		.badge = (type == Ui::FilterLinkHeaderType::AddingChats
 			? std::move(count)
 			: rpl::single(0)),
+		.horizontalFilters = horizontalFilters,
 	});
 	const auto widget = header.widget;
 	widget->resizeToWidth(st::boxWideWidth);
@@ -163,13 +289,13 @@ void InitFilterLinkHeader(
 	box->setAddedTopScrollSkip(max);
 	std::move(
 		header.wheelEvents
-	) | rpl::start_with_next([=](not_null<QWheelEvent*> e) {
+	) | rpl::on_next([=](not_null<QWheelEvent*> e) {
 		box->sendScrollViewportEvent(e);
 	}, widget->lifetime());
 
 	std::move(
 		header.closeRequests
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		box->closeBox();
 	}, widget->lifetime());
 
@@ -182,7 +308,7 @@ void InitFilterLinkHeader(
 	box->scrolls(
 	) | rpl::filter([=] {
 		return !state->processing;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		state->processing = true;
 		const auto guard = gsl::finally([&] { state->processing = false; });
 
@@ -226,7 +352,7 @@ void ImportInvite(
 		fail(error.type());
 	};
 	auto inputs = peers | ranges::views::transform([](auto peer) {
-		return MTPInputPeer(peer->input);
+		return MTPInputPeer(peer->input());
 	}) | ranges::to<QVector<MTPInputPeer>>();
 	if (!slug.isEmpty()) {
 		api->request(MTPchatlists_JoinChatlistInvite(
@@ -244,12 +370,11 @@ void ImportInvite(
 ToggleChatsController::ToggleChatsController(
 	not_null<Window::SessionController*> window,
 	ToggleAction action,
-	const QString &title,
+	Data::ChatFilterTitle title,
 	std::vector<not_null<PeerData*>> chats,
 	std::vector<not_null<PeerData*>> additional)
 : _window(window)
 , _action(action)
-, _filterTitle(title)
 , _chats(std::move(chats))
 , _additional(std::move(additional)) {
 	setStyleOverrides(&st::filterLinkChatsList);
@@ -266,12 +391,23 @@ void ToggleChatsController::prepare() {
 	};
 	const auto add = [&](not_null<PeerData*> peer, bool additional = false) {
 		const auto disable = disabled(peer);
-		auto row = (additional || !disable)
-			? std::make_unique<PeerListRow>(peer)
-			: MakeFilterChatRow(
-				peer,
-				tr::lng_filters_link_inaccessible(tr::now),
-				true);
+		const auto channel = peer->asChannel();
+		const auto willDisable = disable
+			|| (additional && _action == ToggleAction::Adding);
+		const auto previewable = channel
+			&& channel->hasUsername()
+			&& !willDisable;
+		auto row = [&]() -> std::unique_ptr<PeerListRow> {
+			if (!additional && disable) {
+				return MakeFilterChatRow(
+					peer,
+					tr::lng_filters_link_inaccessible(tr::now),
+					true);
+			} else if (previewable) {
+				return std::make_unique<PreviewableRow>(peer);
+			}
+			return std::make_unique<PeerListRow>(peer);
+		}();
 		if (delegate()->peerListFindRow(peer->id.value)) {
 			return;
 		}
@@ -333,6 +469,31 @@ void ToggleChatsController::rowClicked(not_null<PeerListRow*> row) {
 	_selected = std::move(selected);
 }
 
+void ToggleChatsController::rowRightActionClicked(
+		not_null<PeerListRow*> row) {
+	const auto peer = row->peer();
+	const auto previewRow = static_cast<PreviewableRow*>(row.get());
+	const auto parent = delegate()->peerListUiShow()->toastParent();
+	_menu = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	_menu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
+	const auto window = _window;
+	_menu->addAction(tr::lng_context_new_window(tr::now), [=] {
+		window->showInNewWindow(peer);
+	}, &st::menuIconNewWindow);
+	previewRow->setMenuShown(true);
+	_menu->setDestroyedCallback([weak = base::make_weak(previewRow)] {
+		if (weak) {
+			weak->setMenuShown(false);
+		}
+	});
+	const auto size = row->rightActionSize();
+	const auto bottomRight = previewRow->buttonGlobalTopLeft()
+		+ QPoint(size.width(), size.height());
+	_menu->popup(bottomRight);
+}
+
 void ToggleChatsController::setupAboveWidget() {
 	using namespace Settings;
 
@@ -460,7 +621,7 @@ void ToggleChatsController::adjust(
 void ToggleChatsController::setRealContentHeight(rpl::producer<int> value) {
 	std::move(
 		value
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		const auto desired = _desiredHeight.current();
 		if (height <= computeListSt().item.height) {
 			return;
@@ -525,7 +686,7 @@ void ShowImportError(
 
 void ShowImportToast(
 		base::weak_ptr<Window::SessionController> weak,
-		const QString &title,
+		Data::ChatFilterTitle title,
 		Ui::FilterLinkHeaderType type,
 		int added) {
 	const auto strong = weak.get();
@@ -536,22 +697,51 @@ void ShowImportToast(
 	const auto phrase = created
 		? tr::lng_filters_added_title
 		: tr::lng_filters_updated_title;
-	auto text = Ui::Text::Bold(phrase(tr::now, lt_folder, title));
+	auto text = Ui::Text::Wrapped(
+		phrase(tr::now, lt_folder, title.text, tr::marked),
+		EntityType::Bold);
 	if (added > 0) {
 		const auto phrase = created
 			? tr::lng_filters_added_also
 			: tr::lng_filters_updated_also;
 		text.append('\n').append(phrase(tr::now, lt_count, added));
 	}
-	strong->showToast(std::move(text));
+	const auto isStatic = title.isStatic;
+	strong->showToast({
+		.text = std::move(text),
+		.textContext = Core::TextContext({
+			.session = &strong->session(),
+			.customEmojiLoopLimit = isStatic ? -1 : 0,
+		})
+	});
+}
+
+void HandleEnterInBox(not_null<Ui::BoxContent*> box) {
+	const auto isEnter = [=](not_null<QEvent*> event) {
+		if (event->type() == QEvent::KeyPress) {
+			if (const auto k = static_cast<QKeyEvent*>(event.get())) {
+				return (k->key() == Qt::Key_Enter)
+					|| (k->key() == Qt::Key_Return);
+			}
+		}
+		return false;
+	};
+
+	base::install_event_filter(box, [=](not_null<QEvent*> event) {
+		if (isEnter(event)) {
+			box->triggerButton(0);
+			return base::EventFilterResult::Cancel;
+		}
+		return base::EventFilterResult::Continue;
+	});
 }
 
 void ProcessFilterInvite(
 		base::weak_ptr<Window::SessionController> weak,
 		const QString &slug,
 		FilterId filterId,
-		const QString &title,
-		const QString &iconEmoji,
+		Data::ChatFilterTitle title,
+		QString iconEmoji,
 		std::vector<not_null<PeerData*>> peers,
 		std::vector<not_null<PeerData*>> already) {
 	const auto strong = weak.get();
@@ -570,6 +760,8 @@ void ProcessFilterInvite(
 		title,
 		std::move(peers),
 		std::move(already));
+	const auto horizontalFilters = !strong->enoughSpaceForFilters()
+		|| Core::App().settings().chatFiltersHorizontal();
 	const auto raw = controller.get();
 	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->setStyle(st::filterInviteBox);
@@ -586,19 +778,24 @@ void ProcessFilterInvite(
 		});
 		InitFilterLinkHeader(box, [=](int min, int max, int addedTop) {
 			raw->adjust(min, max, addedTop);
-		}, type, title, iconEmoji, rpl::duplicate(badge));
+		}, type, title, iconEmoji, rpl::duplicate(badge), horizontalFilters);
 
 		raw->setRealContentHeight(box->heightValue());
 
+		const auto isStatic = title.isStatic;
 		auto owned = Ui::FilterLinkProcessButton(
 			box,
 			type,
-			title,
+			title.text,
+			Core::TextContext({
+				.session = &strong->session(),
+				.customEmojiLoopLimit = isStatic ? -1 : 0,
+			}),
 			std::move(badge));
 
 		const auto button = owned.data();
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto &padding = st::filterInviteBox.buttonPadding;
 			button->resizeToWidth(width
 				- padding.left()
@@ -608,13 +805,15 @@ void ProcessFilterInvite(
 
 		box->addButton(std::move(owned));
 
+		HandleEnterInBox(box);
+
 		struct State {
 			bool importing = false;
 		};
 		const auto state = box->lifetime().make_state<State>();
 
 		raw->selectedValue(
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				base::flat_set<not_null<PeerData*>> &&peers) {
 			button->setClickedCallback([=] {
 				if (peers.empty()) {
@@ -692,7 +891,7 @@ void CheckFilterInvite(
 		if (!strong) {
 			return;
 		}
-		auto title = QString();
+		auto title = Data::ChatFilterTitle();
 		auto iconEmoji = QString();
 		auto filterId = FilterId();
 		auto peers = std::vector<not_null<PeerData*>>();
@@ -711,7 +910,8 @@ void CheckFilterInvite(
 			return result;
 		};
 		result.match([&](const MTPDchatlists_chatlistInvite &data) {
-			title = qs(data.vtitle());
+			title.text = ParseTextWithEntities(session, data.vtitle());
+			title.isStatic = data.is_title_noanimate();
 			iconEmoji = data.vemoticon().value_or_empty();
 			peers = parseList(data.vpeers());
 		}, [&](const MTPDchatlists_chatlistInviteAlready &data) {
@@ -728,7 +928,7 @@ void CheckFilterInvite(
 		if (notLoaded) {
 			const auto lifetime = std::make_shared<rpl::lifetime>();
 			owner.chatsFilters().changed(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				lifetime->destroy();
 				ProcessFilterInvite(
 					weak,
@@ -776,8 +976,8 @@ void ProcessFilterUpdate(
 
 void ProcessFilterRemove(
 		base::weak_ptr<Window::SessionController> weak,
-		const QString &title,
-		const QString &iconEmoji,
+		Data::ChatFilterTitle title,
+		QString iconEmoji,
 		std::vector<not_null<PeerData*>> all,
 		std::vector<not_null<PeerData*>> suggest,
 		Fn<void(std::vector<not_null<PeerData*>>)> done) {
@@ -796,6 +996,8 @@ void ProcessFilterRemove(
 		title,
 		std::move(suggest),
 		std::move(all));
+	const auto horizontalFilters = !strong->enoughSpaceForFilters()
+		|| Core::App().settings().chatFiltersHorizontal();
 	const auto raw = controller.get();
 	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->setStyle(st::filterInviteBox);
@@ -807,17 +1009,22 @@ void ProcessFilterRemove(
 		});
 		InitFilterLinkHeader(box, [=](int min, int max, int addedTop) {
 			raw->adjust(min, max, addedTop);
-		}, type, title, iconEmoji, rpl::single(0));
+		}, type, title, iconEmoji, rpl::single(0), horizontalFilters);
 
+		const auto isStatic = title.isStatic;
 		auto owned = Ui::FilterLinkProcessButton(
 			box,
 			type,
-			title,
+			title.text,
+			Core::TextContext({
+				.session = &strong->session(),
+				.customEmojiLoopLimit = isStatic ? -1 : 0,
+			}),
 			std::move(badge));
 
 		const auto button = owned.data();
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto &padding = st::filterInviteBox.buttonPadding;
 			button->resizeToWidth(width
 				- padding.left()
@@ -827,8 +1034,10 @@ void ProcessFilterRemove(
 
 		box->addButton(std::move(owned));
 
+		HandleEnterInBox(box);
+
 		raw->selectedValue(
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				base::flat_set<not_null<PeerData*>> &&peers) {
 			button->setClickedCallback([=] {
 				done(peers | ranges::to_vector);
diff --git a/Telegram/SourceFiles/api/api_chat_filters.h b/Telegram/SourceFiles/api/api_chat_filters.h
index 9167a41db8c34b..34933a7db92d8d 100644
--- a/Telegram/SourceFiles/api/api_chat_filters.h
+++ b/Telegram/SourceFiles/api/api_chat_filters.h
@@ -17,6 +17,7 @@ class SessionController;
 
 namespace Data {
 class ChatFilter;
+struct ChatFilterTitle;
 } // namespace Data
 
 namespace Api {
@@ -36,8 +37,8 @@ void ProcessFilterUpdate(
 
 void ProcessFilterRemove(
 	base::weak_ptr<Window::SessionController> weak,
-	const QString &title,
-	const QString &iconEmoji,
+	Data::ChatFilterTitle title,
+	QString iconEmoji,
 	std::vector<not_null<PeerData*>> all,
 	std::vector<not_null<PeerData*>> suggest,
 	Fn<void(std::vector<not_null<PeerData*>>)> done);
diff --git a/Telegram/SourceFiles/api/api_chat_filters_remove_manager.cpp b/Telegram/SourceFiles/api/api_chat_filters_remove_manager.cpp
new file mode 100644
index 00000000000000..7839b59028f882
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_chat_filters_remove_manager.cpp
@@ -0,0 +1,128 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_chat_filters_remove_manager.h"
+
+#include "api/api_chat_filters.h"
+#include "apiwrap.h"
+#include "data/data_chat_filters.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/ui_utility.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_layers.h"
+
+namespace Api {
+namespace {
+
+void RemoveChatFilter(
+		not_null<Main::Session*> session,
+		FilterId filterId,
+		std::vector<not_null<PeerData*>> leave) {
+	const auto api = &session->api();
+	session->data().chatsFilters().apply(MTP_updateDialogFilter(
+		MTP_flags(MTPDupdateDialogFilter::Flag(0)),
+		MTP_int(filterId),
+		MTPDialogFilter()));
+	if (leave.empty()) {
+		api->request(MTPmessages_UpdateDialogFilter(
+			MTP_flags(MTPmessages_UpdateDialogFilter::Flag(0)),
+			MTP_int(filterId),
+			MTPDialogFilter()
+		)).send();
+	} else {
+		api->request(MTPchatlists_LeaveChatlist(
+			MTP_inputChatlistDialogFilter(MTP_int(filterId)),
+			MTP_vector<MTPInputPeer>(ranges::views::all(
+				leave
+			) | ranges::views::transform([](not_null<PeerData*> peer) {
+				return MTPInputPeer(peer->input());
+			}) | ranges::to<QVector<MTPInputPeer>>())
+		)).done([=](const MTPUpdates &result) {
+			api->applyUpdates(result);
+		}).send();
+	}
+}
+
+} // namespace
+
+RemoveComplexChatFilter::RemoveComplexChatFilter() = default;
+
+void RemoveComplexChatFilter::request(
+		base::weak_qptr<Ui::RpWidget> widget,
+		base::weak_ptr<Window::SessionController> weak,
+		FilterId id) {
+	const auto session = &weak->session();
+	const auto &list = session->data().chatsFilters().list();
+	const auto i = ranges::find(list, id, &Data::ChatFilter::id);
+	const auto filter = (i != end(list)) ? *i : Data::ChatFilter();
+	const auto has = filter.hasMyLinks();
+	const auto confirm = [=](Fn<void()> action, bool onlyWhenHas = false) {
+		if (!has && onlyWhenHas) {
+			action();
+			return;
+		}
+		weak->window().show(Ui::MakeConfirmBox({
+			.text = (has
+				? tr::lng_filters_delete_sure()
+				: tr::lng_filters_remove_sure()),
+			.confirmed = [=](Fn<void()> &&close) { close(); action(); },
+			.confirmText = (has
+				? tr::lng_box_delete()
+				: tr::lng_filters_remove_yes()),
+			.confirmStyle = &st::attentionBoxButton,
+		}));
+	};
+	const auto simple = [=] {
+		confirm([=] { RemoveChatFilter(session, id, {}); });
+	};
+	const auto suggestRemoving = Api::ExtractSuggestRemoving(filter);
+	if (suggestRemoving.empty()) {
+		simple();
+		return;
+	} else if (_removingRequestId) {
+		if (_removingId == id) {
+			return;
+		}
+		session->api().request(_removingRequestId).cancel();
+	}
+	_removingId = id;
+	_removingRequestId = session->api().request(
+		MTPchatlists_GetLeaveChatlistSuggestions(
+			MTP_inputChatlistDialogFilter(
+				MTP_int(id)))
+	).done(crl::guard(widget, [=, this](const MTPVector<MTPPeer> &result) {
+		_removingRequestId = 0;
+		const auto suggestRemovePeers = ranges::views::all(
+			result.v
+		) | ranges::views::transform([=](const MTPPeer &peer) {
+			return session->data().peer(peerFromMTP(peer));
+		}) | ranges::to_vector;
+		const auto chosen = crl::guard(widget, [=](
+				std::vector<not_null<PeerData*>> peers) {
+			RemoveChatFilter(session, id, std::move(peers));
+		});
+		confirm(crl::guard(widget, [=] {
+			Api::ProcessFilterRemove(
+				weak,
+				filter.title(),
+				filter.iconEmoji(),
+				suggestRemoving,
+				suggestRemovePeers,
+				chosen);
+		}), true);
+	})).fail(crl::guard(widget, [=, this] {
+		_removingRequestId = 0;
+		simple();
+	})).send();
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_chat_filters_remove_manager.h b/Telegram/SourceFiles/api/api_chat_filters_remove_manager.h
new file mode 100644
index 00000000000000..6bd6ce7fa3e8c7
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_chat_filters_remove_manager.h
@@ -0,0 +1,35 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Api {
+
+class RemoveComplexChatFilter final {
+public:
+	RemoveComplexChatFilter();
+
+	void request(
+		base::weak_qptr<Ui::RpWidget> widget,
+		base::weak_ptr<Window::SessionController> weak,
+		FilterId id);
+
+private:
+	FilterId _removingId = 0;
+	mtpRequestId _removingRequestId = 0;
+
+};
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_chat_invite.cpp b/Telegram/SourceFiles/api/api_chat_invite.cpp
index be07e72ac1d4f0..e1a855fa96a6a8 100644
--- a/Telegram/SourceFiles/api/api_chat_invite.cpp
+++ b/Telegram/SourceFiles/api/api_chat_invite.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "api/api_chat_invite.h"
 
 #include "apiwrap.h"
+#include "api/api_credits.h"
 #include "boxes/premium_limits_box.h"
 #include "core/application.h"
 #include "data/components/credits.h"
@@ -20,11 +21,13 @@ For license and copyright information please follow this link:
 #include "data/data_user.h"
 #include "info/channel_statistics/boosts/giveaway/boost_badge.h"
 #include "info/profile/info_profile_badge.h"
+#include "inline_bots/bot_attach_web_view.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/settings_credits_graphics.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/effects/credits_graphics.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_stars_colored.h"
 #include "ui/empty_userpic.h"
@@ -37,6 +40,7 @@ For license and copyright information please follow this link:
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_color_indices.h"
 #include "styles/style_credits.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
@@ -46,6 +50,69 @@ namespace Api {
 
 namespace {
 
+struct InviteParticipant {
+	not_null<UserData*> user;
+	Ui::PeerUserpicView userpic;
+};
+
+struct ChatInvite {
+	QString title;
+	QString about;
+	PhotoData *photo = nullptr;
+	int participantsCount = 0;
+	std::vector<InviteParticipant> participants;
+	bool isPublic = false;
+	bool isChannel = false;
+	bool isMegagroup = false;
+	bool isBroadcast = false;
+	bool isRequestNeeded = false;
+	bool isFake = false;
+	bool isScam = false;
+	bool isVerified = false;
+};
+
+[[nodiscard]] ChatInvite ParseInvite(
+		not_null<Main::Session*> session,
+		const MTPDchatInvite &data) {
+	auto participants = std::vector<InviteParticipant>();
+	if (const auto list = data.vparticipants()) {
+		participants.reserve(list->v.size());
+		for (const auto &participant : list->v) {
+			if (const auto user = session->data().processUser(participant)) {
+				participants.push_back(InviteParticipant{ user });
+			}
+		}
+	}
+	const auto photo = session->data().processPhoto(data.vphoto());
+	return {
+		.title = qs(data.vtitle()),
+		.about = data.vabout().value_or_empty(),
+		.photo = (photo->isNull() ? nullptr : photo.get()),
+		.participantsCount = data.vparticipants_count().v,
+		.participants = std::move(participants),
+		.isPublic = data.is_public(),
+		.isChannel = data.is_channel(),
+		.isMegagroup = data.is_megagroup(),
+		.isBroadcast = data.is_broadcast(),
+		.isRequestNeeded = data.is_request_needed(),
+		.isFake = data.is_fake(),
+		.isScam = data.is_scam(),
+		.isVerified = data.is_verified(),
+	};
+}
+
+[[nodiscard]] Info::Profile::BadgeType BadgeForInvite(
+		const ChatInvite &invite) {
+	using Type = Info::Profile::BadgeType;
+	return invite.isVerified
+		? Type::Verified
+		: invite.isScam
+		? Type::Scam
+		: invite.isFake
+		? Type::Fake
+		: Type::None;
+}
+
 void SubmitChatInvite(
 		base::weak_ptr<Window::SessionController> weak,
 		not_null<Main::Session*> session,
@@ -53,40 +120,52 @@ void SubmitChatInvite(
 		bool isGroup) {
 	session->api().request(MTPmessages_ImportChatInvite(
 		MTP_string(hash)
-	)).done([=](const MTPUpdates &result) {
-		session->api().applyUpdates(result);
+	)).done([=](const MTPmessages_ChatInviteJoinResult &result) {
 		const auto strongController = weak.get();
-		if (!strongController) {
-			return;
+		if (strongController) {
+			strongController->hideLayer();
 		}
 
-		strongController->hideLayer();
-		const auto handleChats = [&](const MTPVector<MTPChat> &chats) {
-			if (chats.v.isEmpty()) {
-				return;
-			}
-			const auto peerId = chats.v[0].match([](const MTPDchat &data) {
-				return peerFromChat(data.vid().v);
-			}, [](const MTPDchannel &data) {
-				return peerFromChannel(data.vid().v);
-			}, [](auto&&) {
-				return PeerId(0);
-			});
-			if (const auto peer = session->data().peerLoaded(peerId)) {
-				// Shows in the primary window anyway.
-				strongController->showPeerHistory(
-					peer,
-					Window::SectionShow::Way::Forward);
-			}
-		};
-		result.match([&](const MTPDupdates &data) {
-			handleChats(data.vchats());
-		}, [&](const MTPDupdatesCombined &data) {
-			handleChats(data.vchats());
-		}, [&](auto &&) {
-			LOG(("API Error: unexpected update cons %1 "
-				"(ApiWrap::importChatInvite)").arg(result.type()));
-		});
+		ProcessChatInviteJoinResult(
+			session,
+			strongController ? strongController->uiShow() : nullptr,
+			result,
+			[=](const MTPUpdates &updates) {
+				session->api().applyUpdates(updates);
+				if (!strongController) {
+					return;
+				}
+				const auto handleChats = [&](
+						const MTPVector<MTPChat> &chats) {
+					if (chats.v.isEmpty()) {
+						return;
+					}
+					const auto peerId = chats.v[0].match(
+						[](const MTPDchat &data) {
+							return peerFromChat(data.vid().v);
+						},
+						[](const MTPDchannel &data) {
+							return peerFromChannel(data.vid().v);
+						},
+						[](auto&&) {
+							return PeerId(0);
+						});
+					if (const auto peer = session->data().peerLoaded(peerId)) {
+						strongController->showPeerHistory(
+							peer,
+							Window::SectionShow::Way::Forward);
+					}
+				};
+				updates.match([&](const MTPDupdates &data) {
+					handleChats(data.vchats());
+				}, [&](const MTPDupdatesCombined &data) {
+					handleChats(data.vchats());
+				}, [&](auto &&) {
+					LOG(("API Error: unexpected update cons %1 "
+						"(ApiWrap::importChatInvite)").arg(updates.type()));
+				});
+			},
+			weak);
 	}).fail([=](const MTP::Error &error) {
 		const auto &type = error.type();
 
@@ -129,6 +208,7 @@ void ConfirmSubscriptionBox(
 	struct State final {
 		std::shared_ptr<Data::PhotoMedia> photoMedia;
 		std::unique_ptr<Ui::EmptyUserpic> photoEmpty;
+		QImage frame;
 
 		std::optional<MTP::Sender> api;
 		Ui::RpWidget* saveButton = nullptr;
@@ -139,120 +219,117 @@ void ConfirmSubscriptionBox(
 	const auto content = box->verticalLayout();
 
 	Ui::AddSkip(content, st::confirmInvitePhotoTop);
-	const auto userpicWrap = content->add(
-		object_ptr<Ui::CenterWrap<>>(
-			content,
-			object_ptr<Ui::RpWidget>(content)));
-	const auto userpic = userpicWrap->entity();
+	const auto userpic = content->add(
+		object_ptr<Ui::RpWidget>(content),
+		style::al_top);
 	const auto photoSize = st::confirmInvitePhotoSize;
 	userpic->resize(Size(photoSize));
+	userpic->setNaturalWidth(photoSize);
+	const auto creditsIconSize = photoSize / 3;
+	const auto creditsIconCallback =
+		Ui::PaintOutlinedColoredCreditsIconCallback(
+			creditsIconSize,
+			1.5);
+	state->frame = QImage(
+		Size(photoSize * style::DevicePixelRatio()),
+		QImage::Format_ARGB32_Premultiplied);
+	state->frame.setDevicePixelRatio(style::DevicePixelRatio());
 	const auto options = Images::Option::RoundCircle;
 	userpic->paintRequest(
-	) | rpl::start_with_next([=, small = Data::PhotoSize::Small] {
-		auto p = QPainter(userpic);
-		if (state->photoMedia) {
-			if (const auto image = state->photoMedia->image(small)) {
-				p.drawPixmap(
+	) | rpl::on_next([=, small = Data::PhotoSize::Small] {
+		state->frame.fill(Qt::transparent);
+		{
+			auto p = QPainter(&state->frame);
+			if (state->photoMedia) {
+				if (const auto image = state->photoMedia->image(small)) {
+					p.drawPixmap(
+						0,
+						0,
+						image->pix(Size(photoSize), { .options = options }));
+				}
+			} else if (state->photoEmpty) {
+				state->photoEmpty->paintCircle(
+					p,
 					0,
 					0,
-					image->pix(Size(photoSize), { .options = options }));
+					userpic->width(),
+					photoSize);
+			}
+			if (creditsIconCallback) {
+				p.translate(
+					photoSize - creditsIconSize,
+					photoSize - creditsIconSize);
+				creditsIconCallback(p);
 			}
-		} else if (state->photoEmpty) {
-			state->photoEmpty->paintCircle(
-				p,
-				0,
-				0,
-				userpic->width(),
-				photoSize);
 		}
-	}, userpicWrap->lifetime());
-	userpicWrap->setAttribute(Qt::WA_TransparentForMouseEvents);
+		auto p = QPainter(userpic);
+		p.drawImage(0, 0, state->frame);
+	}, userpic->lifetime());
+	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
 	if (photo) {
 		state->photoMedia = photo->createMediaView();
 		state->photoMedia->wanted(Data::PhotoSize::Small, Data::FileOrigin());
 		if (!state->photoMedia->image(Data::PhotoSize::Small)) {
 			session->downloaderTaskFinished(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				userpic->update();
-			}, userpicWrap->entity()->lifetime());
+			}, userpic->lifetime());
 		}
 	} else {
 		state->photoEmpty = std::make_unique<Ui::EmptyUserpic>(
-			Ui::EmptyUserpic::UserpicColor(0),
+			Ui::EmptyUserpic::UserpicColor(st::colorIndexRed),
 			name);
 	}
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 
-	{
-		const auto widget = Ui::CreateChild<Ui::RpWidget>(content);
-		using ColoredMiniStars = Ui::Premium::ColoredMiniStars;
-		const auto stars = widget->lifetime().make_state<ColoredMiniStars>(
-			widget,
-			false,
-			Ui::Premium::MiniStars::Type::BiStars);
-		stars->setColorOverride(Ui::Premium::CreditsIconGradientStops());
-		widget->resize(
-			st::boxWideWidth - photoSize,
-			photoSize * 2);
-		content->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
-			widget->moveToLeft(photoSize / 2, 0);
-			const auto starsRect = Rect(widget->size());
-			stars->setPosition(starsRect.topLeft());
-			stars->setSize(starsRect.size());
-			widget->lower();
-		}, widget->lifetime());
-		widget->paintRequest(
-		) | rpl::start_with_next([=](const QRect &r) {
-			auto p = QPainter(widget);
-			p.fillRect(r, Qt::transparent);
-			stars->paint(p);
-		}, widget->lifetime());
-	}
+	Settings::AddMiniStars(
+		content,
+		Ui::CreateChild<Ui::RpWidget>(content),
+		photoSize,
+		box->width(),
+		2.);
 
 	box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				tr::lng_channel_invite_subscription_title(),
-				st::inviteLinkSubscribeBoxTitle)));
+			tr::lng_channel_invite_subscription_title(),
+			st::inviteLinkSubscribeBoxTitle),
+		style::al_top);
 	box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				tr::lng_channel_invite_subscription_about(
-					lt_channel,
-					rpl::single(Ui::Text::Bold(name)),
-					lt_price,
-					tr::lng_credits_summary_options_credits(
-						lt_count,
-						rpl::single(amount) | tr::to_count(),
-						Ui::Text::Bold),
-					Ui::Text::WithEntities),
-				st::inviteLinkSubscribeBoxAbout)));
+			tr::lng_channel_invite_subscription_about(
+				lt_channel,
+				rpl::single(tr::bold(name)),
+				lt_price,
+				tr::lng_credits_summary_options_credits(
+					lt_count,
+					rpl::single(amount) | tr::to_count(),
+					tr::bold),
+				tr::marked),
+			st::inviteLinkSubscribeBoxAbout),
+		style::al_top);
 	Ui::AddSkip(content);
 	box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				tr::lng_channel_invite_subscription_terms(
-					lt_link,
-					rpl::combine(
-						tr::lng_paid_react_agree_link(),
-						tr::lng_group_invite_subscription_about_url()
-					) | rpl::map([](const QString &text, const QString &url) {
-						return Ui::Text::Link(text, url);
-					}),
-					Ui::Text::RichLangValue),
-				st::inviteLinkSubscribeBoxTerms)));
+			tr::lng_channel_invite_subscription_terms(
+				lt_link,
+				rpl::combine(
+					tr::lng_paid_react_agree_link(),
+					tr::lng_group_invite_subscription_about_url()
+				) | rpl::map([](const QString &text, const QString &url) {
+					return tr::link(text, url);
+				}),
+				tr::rich),
+			st::inviteLinkSubscribeBoxTerms),
+		style::al_top);
 
 	{
 		const auto balance = Settings::AddBalanceWidget(
 			content,
+			session,
 			session->credits().balanceValue(),
 			true);
 		session->credits().load(true);
@@ -260,7 +337,7 @@ void ConfirmSubscriptionBox(
 		rpl::combine(
 			balance->sizeValue(),
 			content->sizeValue()
-		) | rpl::start_with_next([=](const QSize &, const QSize &) {
+		) | rpl::on_next([=](const QSize &, const QSize &) {
 			balance->moveToRight(
 				st::creditsHistoryRightSkip * 2,
 				st::creditsHistoryRightSkip);
@@ -268,25 +345,44 @@ void ConfirmSubscriptionBox(
 		}, balance->lifetime());
 	}
 
-	const auto sendCredits = [=, weak = Ui::MakeWeak(box)] {
+	const auto sendCredits = [=, weak = base::make_weak(box)] {
 		const auto show = box->uiShow();
 		const auto buttonWidth = state->saveButton
 			? state->saveButton->width()
 			: 0;
+		const auto finish = [=] {
+			state->api = std::nullopt;
+			state->loading.force_assign(false);
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		};
 		state->api->request(
 			MTPpayments_SendStarsForm(
 				MTP_long(formId),
 				MTP_inputInvoiceChatInviteSubscription(MTP_string(hash)))
 		).done([=](const MTPpayments_PaymentResult &result) {
-			state->api = std::nullopt;
-			state->loading.force_assign(false);
 			result.match([&](const MTPDpayments_paymentResult &data) {
 				session->api().applyUpdates(data.vupdates());
 			}, [](const MTPDpayments_paymentVerificationNeeded &data) {
 			});
-			if (weak) {
-				box->closeBox();
+			const auto refill = session->data().activeCreditsSubsRebuilder();
+			const auto strong = weak.get();
+			if (!strong) {
+				return;
 			}
+			if (!refill) {
+				return finish();
+			}
+			const auto api
+				= strong->lifetime().make_state<Api::CreditsHistory>(
+					session->user(),
+					true,
+					true);
+			api->requestSubscriptions({}, [=](Data::CreditsStatusSlice d) {
+				refill->fire(std::move(d));
+				finish();
+			});
 		}).fail([=](const MTP::Error &error) {
 			const auto id = error.type();
 			if (weak) {
@@ -337,8 +433,239 @@ void ConfirmSubscriptionBox(
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
 
+void ConfirmInviteBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session,
+		const MTPDchatInvite *invitePtr,
+		ChannelData *invitePeekChannel,
+		Fn<void()> submit) {
+	auto invite = ParseInvite(session, *invitePtr);
+	const auto isChannel = invite.isChannel && !invite.isMegagroup;
+	const auto requestApprove = invite.isRequestNeeded;
+	const auto count = invite.participantsCount;
+
+	struct State {
+		std::shared_ptr<Data::PhotoMedia> photoMedia;
+		std::unique_ptr<Ui::EmptyUserpic> photoEmpty;
+		std::vector<InviteParticipant> participants;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	state->participants = std::move(invite.participants);
+
+	const auto status = [&] {
+		return invitePeekChannel
+			? tr::lng_channel_invite_private(tr::now)
+			: (!state->participants.empty()
+				&& int(state->participants.size()) < count)
+			? tr::lng_group_invite_members(tr::now, lt_count, count)
+			: (count > 0 && isChannel)
+			? tr::lng_chat_status_subscribers(
+				tr::now,
+				lt_count_decimal,
+				count)
+			: (count > 0)
+			? tr::lng_chat_status_members(tr::now, lt_count_decimal, count)
+			: isChannel
+			? tr::lng_channel_status(tr::now)
+			: tr::lng_group_status(tr::now);
+	}();
+
+	box->setNoContentMargin(true);
+	box->setWidth(st::boxWideWidth);
+	const auto content = box->verticalLayout();
+
+	Ui::AddSkip(content, st::confirmInvitePhotoTop);
+	const auto userpic = content->add(
+		object_ptr<Ui::RpWidget>(content),
+		style::al_top);
+	const auto photoSize = st::confirmInvitePhotoSize;
+	userpic->resize(Size(photoSize));
+	userpic->setNaturalWidth(photoSize);
+	userpic->paintRequest(
+	) | rpl::on_next([=, small = Data::PhotoSize::Small] {
+		auto p = QPainter(userpic);
+		if (state->photoMedia) {
+			if (const auto image = state->photoMedia->image(small)) {
+				p.drawPixmap(
+					0,
+					0,
+					image->pix(
+						Size(photoSize),
+						{ .options = Images::Option::RoundCircle }));
+			}
+		} else if (state->photoEmpty) {
+			state->photoEmpty->paintCircle(
+				p,
+				0,
+				0,
+				userpic->width(),
+				photoSize);
+		}
+	}, userpic->lifetime());
+	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+	if (const auto photo = invite.photo) {
+		state->photoMedia = photo->createMediaView();
+		state->photoMedia->wanted(
+			Data::PhotoSize::Small,
+			Data::FileOrigin());
+		if (!state->photoMedia->image(Data::PhotoSize::Small)) {
+			session->downloaderTaskFinished(
+			) | rpl::on_next([=] {
+				userpic->update();
+			}, userpic->lifetime());
+		}
+	} else {
+		state->photoEmpty = std::make_unique<Ui::EmptyUserpic>(
+			Ui::EmptyUserpic::UserpicColor(st::colorIndexRed),
+			invite.title);
+	}
+
+	Ui::AddSkip(content);
+	const auto title = box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			invite.title,
+			st::confirmInviteTitle),
+		style::al_top);
+
+	const auto badgeType = BadgeForInvite(invite);
+	if (badgeType != Info::Profile::BadgeType::None) {
+		const auto badgeParent = title->parentWidget();
+		const auto badge = box->lifetime().make_state<Info::Profile::Badge>(
+			badgeParent,
+			st::infoPeerBadge,
+			session,
+			rpl::single(Info::Profile::Badge::Content{ badgeType }),
+			nullptr,
+			[] { return false; });
+		title->geometryValue(
+		) | rpl::on_next([=](const QRect &r) {
+			badge->move(r.x() + r.width(), r.y(), r.y() + r.height());
+		}, title->lifetime());
+	}
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			status,
+			st::confirmInviteStatus),
+		style::al_top);
+
+	if (!invite.about.isEmpty()) {
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				invite.about,
+				st::confirmInviteAbout),
+			st::confirmInviteAboutPadding,
+			style::al_top);
+	}
+
+	if (requestApprove) {
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				(isChannel
+					? tr::lng_group_request_about_channel(tr::now)
+					: tr::lng_group_request_about(tr::now)),
+				st::confirmInviteStatus),
+			st::confirmInviteAboutRequestsPadding,
+			style::al_top);
+	}
+
+	if (!state->participants.empty()) {
+		while (state->participants.size() > 4) {
+			state->participants.pop_back();
+		}
+		const auto padding = (st::confirmInviteUsersWidth
+			- 4 * st::confirmInviteUserPhotoSize) / 10;
+		const auto userWidth = st::confirmInviteUserPhotoSize + 2 * padding;
+
+		auto strip = object_ptr<Ui::RpWidget>(content);
+		const auto rawStrip = strip.data();
+		rawStrip->resize(st::boxWideWidth, st::confirmInviteUserHeight);
+		rawStrip->setNaturalWidth(st::boxWideWidth);
+
+		const auto shown = int(state->participants.size());
+		const auto sumWidth = shown * userWidth;
+		const auto baseLeft = (st::boxWideWidth - sumWidth) / 2;
+		for (auto i = 0; i != shown; ++i) {
+			const auto &participant = state->participants[i];
+			const auto name = Ui::CreateChild<Ui::FlatLabel>(
+				rawStrip,
+				st::confirmInviteUserName);
+			name->resizeToWidth(
+				st::confirmInviteUserPhotoSize + padding);
+			name->setText(participant.user->firstName.isEmpty()
+				? participant.user->name()
+				: participant.user->firstName);
+			name->moveToLeft(
+				baseLeft + i * userWidth + (padding / 2),
+				st::confirmInviteUserNameTop - st::confirmInviteUserPhotoTop);
+		}
+
+		rawStrip->paintRequest(
+		) | rpl::on_next([=] {
+			auto p = Painter(rawStrip);
+			const auto total = int(state->participants.size());
+			const auto totalWidth = total * userWidth;
+			auto left = (rawStrip->width() - totalWidth) / 2;
+			for (auto &participant : state->participants) {
+				participant.user->paintUserpicLeft(
+					p,
+					participant.userpic,
+					left + (userWidth - st::confirmInviteUserPhotoSize) / 2,
+					0,
+					rawStrip->width(),
+					st::confirmInviteUserPhotoSize);
+				left += userWidth;
+			}
+		}, rawStrip->lifetime());
+
+		Ui::AddSkip(content, st::boxPadding.bottom());
+		content->add(std::move(strip), style::margins());
+	}
+
+	box->addButton((requestApprove
+		? tr::lng_group_request_to_join()
+		: isChannel
+		? tr::lng_profile_join_channel()
+		: tr::lng_profile_join_group()), submit);
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+}
+
 } // namespace
 
+void ProcessChatInviteJoinResult(
+		not_null<Main::Session*> session,
+		std::shared_ptr<Ui::Show> show,
+		const MTPmessages_ChatInviteJoinResult &result,
+		Fn<void(const MTPUpdates &updates)> done,
+		base::weak_ptr<Window::SessionController> controller) {
+	result.match([&](const MTPDmessages_chatInviteJoinResultOk &data) {
+		done(data.vupdates());
+	}, [&](const MTPDmessages_chatInviteJoinResultWebView &data) {
+		session->data().processUsers(data.vusers());
+		const auto bot = session->data().userLoaded(UserId(data.vbot_id().v));
+		if (!bot || !show) {
+			LOG(("API Error: guard bot %1 not loaded "
+				"(Api::ProcessChatInviteJoinResult)").arg(data.vbot_id().v));
+			return;
+		}
+		session->attachWebView().open({
+			.bot = not_null<UserData*>{ bot },
+			.parentShow = std::move(show),
+			.context = {
+				.controller = controller,
+				.maySkipConfirmation = false,
+			},
+			.source = InlineBots::WebViewSourceJoinChat{
+				.result = InlineBots::ParseWebViewResult(data.vwebview()),
+			},
+		});
+	});
+}
+
 void CheckChatInvite(
 		not_null<Window::SessionController*> controller,
 		const QString &hash,
@@ -380,16 +707,17 @@ void CheckChatInvite(
 					session,
 					hash,
 					&data))
-				: strong->show(Box<ConfirmInviteBox>(
+				: strong->show(Box(
+					ConfirmInviteBox,
 					session,
-					data,
+					&data,
 					invitePeekChannel,
 					[=] { SubmitChatInvite(weak, session, hash, isGroup); }));
 			if (invitePeekChannel) {
 				box->boxClosing(
 				) | rpl::filter([=] {
 					return !invitePeekChannel->amIn();
-				}) | rpl::start_with_next([=] {
+				}) | rpl::on_next([=] {
 					if (const auto strong = weak.get()) {
 						strong->clearSectionStack(Window::SectionShow(
 							Window::SectionShow::Way::ClearStack,
@@ -414,6 +742,12 @@ void CheckChatInvite(
 			}
 		});
 	}, [=](const MTP::Error &error) {
+		if (MTP::IsFloodError(error)) {
+			if (const auto strong = weak.get()) {
+				strong->show(Ui::MakeInformBox(tr::lng_flood_error()));
+			}
+			return;
+		}
 		if (error.code() != 400) {
 			return;
 		}
@@ -425,255 +759,3 @@ void CheckChatInvite(
 }
 
 } // namespace Api
-
-struct ConfirmInviteBox::Participant {
-	not_null<UserData*> user;
-	Ui::PeerUserpicView userpic;
-};
-
-ConfirmInviteBox::ConfirmInviteBox(
-	QWidget*,
-	not_null<Main::Session*> session,
-	const MTPDchatInvite &data,
-	ChannelData *invitePeekChannel,
-	Fn<void()> submit)
-: ConfirmInviteBox(
-	session,
-	Parse(session, data),
-	invitePeekChannel,
-	std::move(submit)) {
-}
-
-ConfirmInviteBox::ConfirmInviteBox(
-	not_null<Main::Session*> session,
-	ChatInvite &&invite,
-	ChannelData *invitePeekChannel,
-	Fn<void()> submit)
-: _session(session)
-, _submit(std::move(submit))
-, _title(this, st::confirmInviteTitle)
-, _badge(std::make_unique<Info::Profile::Badge>(
-	this,
-	st::infoPeerBadge,
-	_session,
-	rpl::single(Info::Profile::Badge::Content{ BadgeForInvite(invite) }),
-	nullptr,
-	[=] { return false; }))
-, _status(this, st::confirmInviteStatus)
-, _about(this, st::confirmInviteAbout)
-, _aboutRequests(this, st::confirmInviteStatus)
-, _participants(std::move(invite.participants))
-, _isChannel(invite.isChannel && !invite.isMegagroup)
-, _requestApprove(invite.isRequestNeeded) {
-	const auto count = invite.participantsCount;
-	const auto status = [&] {
-		return invitePeekChannel
-			? tr::lng_channel_invite_private(tr::now)
-			: (!_participants.empty() && _participants.size() < count)
-			? tr::lng_group_invite_members(tr::now, lt_count, count)
-			: (count > 0 && _isChannel)
-			? tr::lng_chat_status_subscribers(
-				tr::now,
-				lt_count_decimal,
-				count)
-			: (count > 0)
-			? tr::lng_chat_status_members(tr::now, lt_count_decimal, count)
-			: _isChannel
-			? tr::lng_channel_status(tr::now)
-			: tr::lng_group_status(tr::now);
-	}();
-	_title->setText(invite.title);
-	_status->setText(status);
-	if (!invite.about.isEmpty()) {
-		_about->setText(invite.about);
-	} else {
-		_about.destroy();
-	}
-	if (_requestApprove) {
-		_aboutRequests->setText(_isChannel
-			? tr::lng_group_request_about_channel(tr::now)
-			: tr::lng_group_request_about(tr::now));
-	} else {
-		_aboutRequests.destroy();
-	}
-
-	if (invite.photo) {
-		_photo = invite.photo->createMediaView();
-		_photo->wanted(Data::PhotoSize::Small, Data::FileOrigin());
-		if (!_photo->image(Data::PhotoSize::Small)) {
-			_session->downloaderTaskFinished(
-			) | rpl::start_with_next([=] {
-				update();
-			}, lifetime());
-		}
-	} else {
-		_photoEmpty = std::make_unique<Ui::EmptyUserpic>(
-			Ui::EmptyUserpic::UserpicColor(0),
-			invite.title);
-	}
-}
-
-ConfirmInviteBox::~ConfirmInviteBox() = default;
-
-ConfirmInviteBox::ChatInvite ConfirmInviteBox::Parse(
-		not_null<Main::Session*> session,
-		const MTPDchatInvite &data) {
-	auto participants = std::vector<Participant>();
-	if (const auto list = data.vparticipants()) {
-		participants.reserve(list->v.size());
-		for (const auto &participant : list->v) {
-			if (const auto user = session->data().processUser(participant)) {
-				participants.push_back(Participant{ user });
-			}
-		}
-	}
-	const auto photo = session->data().processPhoto(data.vphoto());
-	return {
-		.title = qs(data.vtitle()),
-		.about = data.vabout().value_or_empty(),
-		.photo = (photo->isNull() ? nullptr : photo.get()),
-		.participantsCount = data.vparticipants_count().v,
-		.participants = std::move(participants),
-		.isPublic = data.is_public(),
-		.isChannel = data.is_channel(),
-		.isMegagroup = data.is_megagroup(),
-		.isBroadcast = data.is_broadcast(),
-		.isRequestNeeded = data.is_request_needed(),
-		.isFake = data.is_fake(),
-		.isScam = data.is_scam(),
-		.isVerified = data.is_verified(),
-	};
-}
-
-[[nodiscard]] Info::Profile::BadgeType ConfirmInviteBox::BadgeForInvite(
-		const ChatInvite &invite) {
-	using Type = Info::Profile::BadgeType;
-	return invite.isVerified
-		? Type::Verified
-		: invite.isScam
-		? Type::Scam
-		: invite.isFake
-		? Type::Fake
-		: Type::None;
-}
-
-void ConfirmInviteBox::prepare() {
-	addButton(
-		(_requestApprove
-			? tr::lng_group_request_to_join()
-			: _isChannel
-			? tr::lng_profile_join_channel()
-			: tr::lng_profile_join_group()),
-		_submit);
-	addButton(tr::lng_cancel(), [=] { closeBox(); });
-
-	while (_participants.size() > 4) {
-		_participants.pop_back();
-	}
-
-	auto newHeight = st::confirmInviteStatusTop + _status->height() + st::boxPadding.bottom();
-	if (!_participants.empty()) {
-		int skip = (st::confirmInviteUsersWidth - 4 * st::confirmInviteUserPhotoSize) / 5;
-		int padding = skip / 2;
-		_userWidth = (st::confirmInviteUserPhotoSize + 2 * padding);
-		int sumWidth = _participants.size() * _userWidth;
-		int left = (st::boxWideWidth - sumWidth) / 2;
-		for (const auto &participant : _participants) {
-			auto name = new Ui::FlatLabel(this, st::confirmInviteUserName);
-			name->resizeToWidth(st::confirmInviteUserPhotoSize + padding);
-			name->setText(participant.user->firstName.isEmpty()
-				? participant.user->name()
-				: participant.user->firstName);
-			name->moveToLeft(left + (padding / 2), st::confirmInviteUserNameTop);
-			left += _userWidth;
-		}
-
-		newHeight += st::confirmInviteUserHeight;
-	}
-	if (_about) {
-		const auto padding = st::confirmInviteAboutPadding;
-		_about->resizeToWidth(st::boxWideWidth - padding.left() - padding.right());
-		newHeight += padding.top() + _about->height() + padding.bottom();
-	}
-	if (_aboutRequests) {
-		const auto padding = st::confirmInviteAboutRequestsPadding;
-		_aboutRequests->resizeToWidth(st::boxWideWidth - padding.left() - padding.right());
-		newHeight += padding.top() + _aboutRequests->height() + padding.bottom();
-	}
-	setDimensions(st::boxWideWidth, newHeight);
-}
-
-void ConfirmInviteBox::resizeEvent(QResizeEvent *e) {
-	BoxContent::resizeEvent(e);
-
-	const auto padding = st::boxRowPadding;
-	auto nameWidth = width() - padding.left() - padding.right();
-	auto badgeWidth = 0;
-	if (const auto widget = _badge->widget()) {
-		badgeWidth = st::infoVerifiedCheckPosition.x() + widget->width();
-		nameWidth -= badgeWidth;
-	}
-	_title->resizeToWidth(std::min(nameWidth, _title->textMaxWidth()));
-	_title->moveToLeft(
-		(width() - _title->width() - badgeWidth) / 2,
-		st::confirmInviteTitleTop);
-	const auto badgeLeft = _title->x() + _title->width();
-	const auto badgeTop = _title->y();
-	const auto badgeBottom = _title->y() + _title->height();
-	_badge->move(badgeLeft, badgeTop, badgeBottom);
-
-	_status->move(
-		(width() - _status->width()) / 2,
-		st::confirmInviteStatusTop);
-	auto bottom = _status->y()
-		+ _status->height()
-		+ st::boxPadding.bottom()
-		+ (_participants.empty() ? 0 : st::confirmInviteUserHeight);
-	if (_about) {
-		const auto padding = st::confirmInviteAboutPadding;
-		_about->move((width() - _about->width()) / 2, bottom + padding.top());
-		bottom += padding.top() + _about->height() + padding.bottom();
-	}
-	if (_aboutRequests) {
-		const auto padding = st::confirmInviteAboutRequestsPadding;
-		_aboutRequests->move((width() - _aboutRequests->width()) / 2, bottom + padding.top());
-	}
-}
-
-void ConfirmInviteBox::paintEvent(QPaintEvent *e) {
-	BoxContent::paintEvent(e);
-
-	Painter p(this);
-
-	if (_photo) {
-		if (const auto image = _photo->image(Data::PhotoSize::Small)) {
-			const auto size = st::confirmInvitePhotoSize;
-			p.drawPixmap(
-				(width() - size) / 2,
-				st::confirmInvitePhotoTop,
-				image->pix(
-					{ size, size },
-					{ .options = Images::Option::RoundCircle }));
-		}
-	} else if (_photoEmpty) {
-		_photoEmpty->paintCircle(
-			p,
-			(width() - st::confirmInvitePhotoSize) / 2,
-			st::confirmInvitePhotoTop,
-			width(),
-			st::confirmInvitePhotoSize);
-	}
-
-	int sumWidth = _participants.size() * _userWidth;
-	int left = (width() - sumWidth) / 2;
-	for (auto &participant : _participants) {
-		participant.user->paintUserpicLeft(
-			p,
-			participant.userpic,
-			left + (_userWidth - st::confirmInviteUserPhotoSize) / 2,
-			st::confirmInviteUserPhotoTop,
-			width(),
-			st::confirmInviteUserPhotoSize);
-		left += _userWidth;
-	}
-}
diff --git a/Telegram/SourceFiles/api/api_chat_invite.h b/Telegram/SourceFiles/api/api_chat_invite.h
index 94eeab5e92220d..ae3a580f20d0ce 100644
--- a/Telegram/SourceFiles/api/api_chat_invite.h
+++ b/Telegram/SourceFiles/api/api_chat_invite.h
@@ -7,32 +7,22 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "ui/layers/box_content.h"
+#include "base/weak_ptr.h"
 
-class UserData;
 class ChannelData;
 
-namespace Info::Profile {
-class Badge;
-enum class BadgeType;
-} // namespace Info::Profile
-
 namespace Main {
 class Session;
 } // namespace Main
 
+namespace Ui {
+class Show;
+} // namespace Ui
+
 namespace Window {
 class SessionController;
 } // namespace Window
 
-namespace Data {
-class PhotoMedia;
-} // namespace Data
-
-namespace Ui {
-class EmptyUserpic;
-} // namespace Ui
-
 namespace Api {
 
 void CheckChatInvite(
@@ -41,68 +31,11 @@ void CheckChatInvite(
 	ChannelData *invitePeekChannel = nullptr,
 	Fn<void()> loaded = nullptr);
 
-} // namespace Api
-
-class ConfirmInviteBox final : public Ui::BoxContent {
-public:
-	ConfirmInviteBox(
-		QWidget*,
-		not_null<Main::Session*> session,
-		const MTPDchatInvite &data,
-		ChannelData *invitePeekChannel,
-		Fn<void()> submit);
-	~ConfirmInviteBox();
+void ProcessChatInviteJoinResult(
+	not_null<Main::Session*> session,
+	std::shared_ptr<Ui::Show> show,
+	const MTPmessages_ChatInviteJoinResult &result,
+	Fn<void(const MTPUpdates &updates)> done,
+	base::weak_ptr<Window::SessionController> controller = {});
 
-protected:
-	void prepare() override;
-
-	void resizeEvent(QResizeEvent *e) override;
-	void paintEvent(QPaintEvent *e) override;
-
-private:
-	struct Participant;
-	struct ChatInvite {
-		QString title;
-		QString about;
-		PhotoData *photo = nullptr;
-		int participantsCount = 0;
-		std::vector<Participant> participants;
-		bool isPublic = false;
-		bool isChannel = false;
-		bool isMegagroup = false;
-		bool isBroadcast = false;
-		bool isRequestNeeded = false;
-		bool isFake = false;
-		bool isScam = false;
-		bool isVerified = false;
-	};
-	[[nodiscard]] static ChatInvite Parse(
-		not_null<Main::Session*> session,
-		const MTPDchatInvite &data);
-	[[nodiscard]] Info::Profile::BadgeType BadgeForInvite(
-		const ChatInvite &invite);
-
-	ConfirmInviteBox(
-		not_null<Main::Session*> session,
-		ChatInvite &&invite,
-		ChannelData *invitePeekChannel,
-		Fn<void()> submit);
-
-	const not_null<Main::Session*> _session;
-
-	Fn<void()> _submit;
-	object_ptr<Ui::FlatLabel> _title;
-	std::unique_ptr<Info::Profile::Badge> _badge;
-	object_ptr<Ui::FlatLabel> _status;
-	object_ptr<Ui::FlatLabel> _about;
-	object_ptr<Ui::FlatLabel> _aboutRequests;
-	std::shared_ptr<Data::PhotoMedia> _photo;
-	std::unique_ptr<Ui::EmptyUserpic> _photoEmpty;
-	std::vector<Participant> _participants;
-
-	bool _isChannel = false;
-	bool _requestApprove = false;
-
-	int _userWidth = 0;
-
-};
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_chat_participants.cpp b/Telegram/SourceFiles/api/api_chat_participants.cpp
index 10663d1de5e404..9e09257bbee7a4 100644
--- a/Telegram/SourceFiles/api/api_chat_participants.cpp
+++ b/Telegram/SourceFiles/api/api_chat_participants.cpp
@@ -51,40 +51,47 @@ std::vector<ChatParticipant> ParseList(
 void ApplyMegagroupAdmins(not_null<ChannelData*> channel, Members list) {
 	Expects(channel->isMegagroup());
 
-	const auto i = ranges::find_if(list, &Api::ChatParticipant::isCreator);
-	if (i != list.end()) {
-		i->tryApplyCreatorTo(channel);
-	} else {
-		channel->mgInfo->creator = nullptr;
-		channel->mgInfo->creatorRank = QString();
-	}
+	const auto creatorIt = ranges::find_if(
+		list,
+		&Api::ChatParticipant::isCreator);
 
-	auto adding = base::flat_map<UserId, QString>();
+	auto adding = base::flat_set<UserId>();
+	auto addingRanks = base::flat_map<UserId, QString>();
 	for (const auto &p : list) {
 		if (p.isUser()) {
-			adding.emplace(p.userId(), p.rank());
+			adding.emplace(p.userId());
+			if (!p.rank().isEmpty()) {
+				addingRanks.emplace(p.userId(), p.rank());
+			}
 		}
 	}
-	if (channel->mgInfo->creator) {
-		adding.emplace(
-			peerToUser(channel->mgInfo->creator->id),
-			channel->mgInfo->creatorRank);
+	if (creatorIt != list.end() && creatorIt->isUser()) {
+		adding.emplace(creatorIt->userId());
+		if (!creatorIt->rank().isEmpty()) {
+			addingRanks.emplace(creatorIt->userId(), creatorIt->rank());
+		}
 	}
 	auto removing = channel->mgInfo->admins;
 	if (removing.empty() && adding.empty()) {
-		// Add some admin-placeholder so we don't DDOS
-		// server with admins list requests.
 		LOG(("API Error: Got empty admins list from server."));
-		adding.emplace(0, QString());
+		adding.emplace(UserId(0));
 	}
 
 	Data::ChannelAdminChanges changes(channel);
-	for (const auto &[addingId, rank] : adding) {
-		if (!removing.remove(addingId)) {
-			changes.add(addingId, rank);
-		}
+	if (creatorIt != list.end()) {
+		creatorIt->tryApplyCreatorTo(channel);
+	} else {
+		channel->mgInfo->creator = nullptr;
+	}
+	for (const auto &addingId : adding) {
+		const auto r = addingRanks.find(addingId);
+		const auto rank = (r != end(addingRanks))
+			? r->second
+			: QString();
+		removing.remove(addingId);
+		changes.add(addingId, rank);
 	}
-	for (const auto &[removingId, rank] : removing) {
+	for (const auto &removingId : removing) {
 		changes.remove(removingId);
 	}
 }
@@ -112,6 +119,7 @@ void ApplyLastList(
 	channel->mgInfo->lastAdmins.clear();
 	channel->mgInfo->lastRestricted.clear();
 	channel->mgInfo->lastParticipants.clear();
+	channel->mgInfo->memberRanks.clear();
 	channel->mgInfo->lastParticipantsStatus
 		= MegagroupInfo::LastParticipantsUpToDate
 			| MegagroupInfo::LastParticipantsOnceReceived;
@@ -143,11 +151,13 @@ void ApplyLastList(
 			}
 			if (user->isBot()) {
 				channel->mgInfo->bots.insert(user);
-				if ((channel->mgInfo->botStatus != 0)
-					&& (channel->mgInfo->botStatus < 2)) {
-					channel->mgInfo->botStatus = 2;
+				if (channel->mgInfo->botStatus == Data::BotStatus::NoBots) {
+					channel->mgInfo->botStatus = Data::BotStatus::HasBots;
 				}
 			}
+			if (!p.rank().isEmpty()) {
+				channel->mgInfo->memberRanks[p.userId()] = p.rank();
+			}
 		}
 	}
 	//
@@ -178,7 +188,7 @@ void ApplyBotsList(
 		Members list) {
 	const auto history = channel->owner().historyLoaded(channel);
 	channel->mgInfo->bots.clear();
-	channel->mgInfo->botStatus = -1;
+	channel->mgInfo->botStatus = Data::BotStatus::NoBots;
 
 	auto needBotsInfos = false;
 	auto botStatus = channel->mgInfo->botStatus;
@@ -188,7 +198,7 @@ void ApplyBotsList(
 		const auto user = participant->asUser();
 		if (user && user->isBot()) {
 			channel->mgInfo->bots.insert(user);
-			botStatus = 2;// (botStatus > 0/* || !i.key()->botInfo->readsAllHistory*/) ? 2 : 1;
+			botStatus = Data::BotStatus::HasBots;
 			if (!user->botInfo->inited) {
 				needBotsInfos = true;
 			}
@@ -211,11 +221,10 @@ void ApplyBotsList(
 		Data::PeerUpdate::Flag::FullInfo);
 }
 
-[[nodiscard]] ChatParticipants::Channels ParseSimilar(
+[[nodiscard]] ChatParticipants::Peers ParseSimilarChannels(
 		not_null<Main::Session*> session,
 		const MTPmessages_Chats &chats) {
-	auto result = ChatParticipants::Channels();
-	std::vector<not_null<ChannelData*>>();
+	auto result = ChatParticipants::Peers();
 	chats.match([&](const auto &data) {
 		const auto &list = data.vchats().v;
 		result.list.reserve(list.size());
@@ -234,10 +243,29 @@ void ApplyBotsList(
 	return result;
 }
 
-[[nodiscard]] ChatParticipants::Channels ParseSimilar(
+[[nodiscard]] ChatParticipants::Peers ParseSimilarChannels(
 		not_null<ChannelData*> channel,
 		const MTPmessages_Chats &chats) {
-	return ParseSimilar(&channel->session(), chats);
+	return ParseSimilarChannels(&channel->session(), chats);
+}
+
+[[nodiscard]] ChatParticipants::Peers ParseSimilarBots(
+		not_null<Main::Session*> session,
+		const MTPusers_Users &users) {
+	auto result = ChatParticipants::Peers();
+	users.match([&](const auto &data) {
+		const auto &list = data.vusers().v;
+		result.list.reserve(list.size());
+		for (const auto &user : list) {
+			result.list.push_back(session->data().processUser(user));
+		}
+		if constexpr (MTPDusers_usersSlice::Is<decltype(data)>()) {
+			if (session->premiumPossible()) {
+				result.more = data.vcount().v - data.vusers().v.size();
+			}
+		}
+	});
+	return result;
 }
 
 } // namespace
@@ -269,12 +297,14 @@ ChatParticipant::ChatParticipant(
 		_type = Type::Member;
 		_date = data.vdate().v;
 		_by = peerToUser(peerFromUser(data.vinviter_id()));
+		_rank = qs(data.vrank().value_or_empty());
 		if (data.vsubscription_until_date()) {
 			_subscriptionDate = data.vsubscription_until_date()->v;
 		}
 	}, [&](const MTPDchannelParticipant &data) {
 		_type = Type::Member;
 		_date = data.vdate().v;
+		_rank = qs(data.vrank().value_or_empty());
 		if (data.vsubscription_until_date()) {
 			_subscriptionDate = data.vsubscription_until_date()->v;
 		}
@@ -282,6 +312,7 @@ ChatParticipant::ChatParticipant(
 		_restrictions = ChatRestrictionsInfo(data.vbanned_rights());
 		_by = peerToUser(peerFromUser(data.vkicked_by()));
 		_date = data.vdate().v;
+		_rank = qs(data.vrank().value_or_empty());
 
 		_type = (_restrictions.flags & ChatRestriction::ViewMessages)
 			? Type::Banned
@@ -313,7 +344,11 @@ void ChatParticipant::tryApplyCreatorTo(
 	if (isCreator() && isUser()) {
 		if (const auto info = channel->mgInfo.get()) {
 			info->creator = channel->owner().userLoaded(userId());
-			info->creatorRank = rank();
+			if (!rank().isEmpty()) {
+				info->memberRanks[userId()] = rank();
+			} else {
+				info->memberRanks.remove(userId());
+			}
 		}
 	}
 }
@@ -404,7 +439,7 @@ void ChatParticipants::requestForAdd(
 
 	_forAdd.channel = channel;
 	_forAdd.requestId = _api.request(MTPchannels_GetParticipants(
-		channel->inputChannel,
+		channel->inputChannel(),
 		MTP_channelParticipantsRecent(),
 		MTP_int(offset),
 		MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -432,7 +467,7 @@ void ChatParticipants::requestLast(not_null<ChannelData*> channel) {
 	const auto offset = 0;
 	const auto participantsHash = uint64(0);
 	const auto requestId = _api.request(MTPchannels_GetParticipants(
-		channel->inputChannel,
+		channel->inputChannel(),
 		MTP_channelParticipantsRecent(),
 		MTP_int(offset),
 		MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -462,7 +497,7 @@ void ChatParticipants::requestBots(not_null<ChannelData*> channel) {
 	const auto offset = 0;
 	const auto participantsHash = uint64(0);
 	const auto requestId = _api.request(MTPchannels_GetParticipants(
-		channel->inputChannel,
+		channel->inputChannel(),
 		MTP_channelParticipantsBots(),
 		MTP_int(offset),
 		MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -476,8 +511,15 @@ void ChatParticipants::requestBots(not_null<ChannelData*> channel) {
 			LOG(("API Error: "
 				"channels.channelParticipantsNotModified received!"));
 		});
-	}).fail([=] {
+	}).fail([=](const MTP::Error &error) {
 		_botsRequests.remove(channel);
+		if (error.type() == u"CHANNEL_MONOFORUM_UNSUPPORTED"_q) {
+			channel->mgInfo->bots.clear();
+			channel->mgInfo->botStatus = Data::BotStatus::NoBots;
+			channel->session().changes().peerUpdated(
+				channel,
+				Data::PeerUpdate::Flag::FullInfo);
+		}
 	}).send();
 
 	_botsRequests[channel] = requestId;
@@ -491,7 +533,7 @@ void ChatParticipants::requestAdmins(not_null<ChannelData*> channel) {
 	const auto offset = 0;
 	const auto participantsHash = uint64(0);
 	const auto requestId = _api.request(MTPchannels_GetParticipants(
-		channel->inputChannel,
+		channel->inputChannel(),
 		MTP_channelParticipantsAdmins(),
 		MTP_int(offset),
 		MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -530,8 +572,8 @@ void ChatParticipants::add(
 	if (const auto chat = peer->asChat()) {
 		for (const auto &user : users) {
 			_api.request(MTPmessages_AddChatUser(
-				chat->inputChat,
-				user->inputUser,
+				chat->inputChat(),
+				user->inputUser(),
 				MTP_int(passGroupHistory ? kForwardMessagesOnAdd : 0)
 			)).done([=](const MTPmessages_InvitedUsers &result) {
 				const auto &data = result.data();
@@ -562,7 +604,7 @@ void ChatParticipants::add(
 		const auto send = [&] {
 			const auto callback = base::take(done);
 			_api.request(MTPchannels_InviteToChannel(
-				channel->inputChannel,
+				channel->inputChannel(),
 				MTP_vector<MTPInputUser>(list)
 			)).done([=](const MTPmessages_InvitedUsers &result) {
 				const auto &data = result.data();
@@ -581,7 +623,7 @@ void ChatParticipants::add(
 			}).afterDelay(kSmallDelayMs).send();
 		};
 		for (const auto &user : users) {
-			list.push_back(user->inputUser);
+			list.push_back(user->inputUser());
 			if (list.size() == kMaxUsersPerInvite) {
 				send();
 				list.clear();
@@ -626,23 +668,20 @@ void ChatParticipants::Restrict(
 		ChatRestrictionsInfo oldRights,
 		ChatRestrictionsInfo newRights,
 		Fn<void()> onDone,
-		Fn<void()> onFail) {
+		Fn<void(const QString&)> onFail) {
 	channel->session().api().request(MTPchannels_EditBanned(
-		channel->inputChannel,
-		participant->input,
-		MTP_chatBannedRights(
-			MTP_flags(MTPDchatBannedRights::Flags::from_raw(
-				uint32(newRights.flags))),
-			MTP_int(newRights.until))
+		channel->inputChannel(),
+		participant->input(),
+		RestrictionsToMTP(newRights)
 	)).done([=](const MTPUpdates &result) {
 		channel->session().api().applyUpdates(result);
 		channel->applyEditBanned(participant, oldRights, newRights);
 		if (onDone) {
 			onDone();
 		}
-	}).fail([=] {
+	}).fail([=](const MTP::Error &error) {
 		if (onFail) {
-			onFail();
+			onFail(error.type());
 		}
 	}).send();
 }
@@ -670,7 +709,7 @@ void ChatParticipants::requestSelf(not_null<ChannelData*> channel) {
 	};
 	_selfParticipantRequests.emplace(channel);
 	_api.request(MTPchannels_GetParticipant(
-		channel->inputChannel,
+		channel->inputChannel(),
 		MTP_inputPeerSelf()
 	)).done([=](const MTPchannels_ChannelParticipant &result) {
 		_selfParticipantRequests.erase(channel);
@@ -720,8 +759,8 @@ void ChatParticipants::kick(
 
 	_api.request(MTPmessages_DeleteChatUser(
 		MTP_flags(0),
-		chat->inputChat,
-		participant->asUser()->inputUser
+		chat->inputChat(),
+		participant->asUser()->inputUser()
 	)).done([=](const MTPUpdates &result) {
 		chat->session().api().applyUpdates(result);
 	}).send();
@@ -736,12 +775,9 @@ void ChatParticipants::kick(
 
 	const auto rights = ChannelData::KickedRestrictedRights(participant);
 	const auto requestId = _api.request(MTPchannels_EditBanned(
-		channel->inputChannel,
-		participant->input,
-		MTP_chatBannedRights(
-			MTP_flags(
-				MTPDchatBannedRights::Flags::from_raw(uint32(rights.flags))),
-			MTP_int(rights.until))
+		channel->inputChannel(),
+		participant->input(),
+		RestrictionsToMTP(rights)
 	)).done([=](const MTPUpdates &result) {
 		channel->session().api().applyUpdates(result);
 
@@ -763,8 +799,8 @@ void ChatParticipants::unblock(
 	}
 
 	const auto requestId = _api.request(MTPchannels_EditBanned(
-		channel->inputChannel,
-		participant->input,
+		channel->inputChannel(),
+		participant->input(),
 		MTP_chatBannedRights(MTP_flags(0), MTP_int(0))
 	)).done([=](const MTPUpdates &result) {
 		channel->session().api().applyUpdates(result);
@@ -782,52 +818,65 @@ void ChatParticipants::unblock(
 	_kickRequests.emplace(kick, requestId);
 }
 
-void ChatParticipants::loadSimilarChannels(not_null<ChannelData*> channel) {
-	if (!channel->isBroadcast()) {
-		return;
-	} else if (const auto i = _similar.find(channel); i != end(_similar)) {
+void ChatParticipants::loadSimilarPeers(not_null<PeerData*> peer) {
+	if (const auto i = _similar.find(peer); i != end(_similar)) {
 		if (i->second.requestId
-			|| !i->second.channels.more
-			|| !channel->session().premium()) {
+			|| !i->second.peers.more
+			|| !peer->session().premium()) {
 			return;
 		}
 	}
-	using Flag = MTPchannels_GetChannelRecommendations::Flag;
-	_similar[channel].requestId = _api.request(
-		MTPchannels_GetChannelRecommendations(
-			MTP_flags(Flag::f_channel),
-			channel->inputChannel)
-	).done([=](const MTPmessages_Chats &result) {
-		auto &similar = _similar[channel];
-		similar.requestId = 0;
-		auto parsed = ParseSimilar(channel, result);
-		if (similar.channels == parsed) {
-			return;
-		}
-		similar.channels = std::move(parsed);
-		if (const auto history = channel->owner().historyLoaded(channel)) {
-			if (const auto item = history->joinedMessageInstance()) {
-				history->owner().requestItemResize(item);
+	if (const auto channel = peer->asBroadcast()) {
+		using Flag = MTPchannels_GetChannelRecommendations::Flag;
+		_similar[peer].requestId = _api.request(
+			MTPchannels_GetChannelRecommendations(
+				MTP_flags(Flag::f_channel),
+				channel->inputChannel())
+		).done([=](const MTPmessages_Chats &result) {
+			auto &similar = _similar[channel];
+			similar.requestId = 0;
+			auto parsed = ParseSimilarChannels(channel, result);
+			if (similar.peers == parsed) {
+				return;
 			}
-		}
-		_similarLoaded.fire_copy(channel);
-	}).send();
+			similar.peers = std::move(parsed);
+			if (const auto history = channel->owner().historyLoaded(channel)) {
+				if (const auto item = history->joinedMessageInstance()) {
+					history->owner().requestItemResize(item);
+				}
+			}
+			_similarLoaded.fire_copy(channel);
+		}).send();
+	} else if (const auto bot = peer->asBot()) {
+		_similar[peer].requestId = _api.request(
+			MTPbots_GetBotRecommendations(bot->inputUser())
+		).done([=](const MTPusers_Users &result) {
+			auto &similar = _similar[peer];
+			similar.requestId = 0;
+			auto parsed = ParseSimilarBots(&peer->session(), result);
+			if (similar.peers == parsed) {
+				return;
+			}
+			similar.peers = std::move(parsed);
+			_similarLoaded.fire_copy(peer);
+		}).send();
+	}
 }
 
-auto ChatParticipants::similar(not_null<ChannelData*> channel)
--> const Channels & {
-	const auto i = channel->isBroadcast()
-		? _similar.find(channel)
+auto ChatParticipants::similar(not_null<PeerData*> peer)
+-> const Peers & {
+	const auto i = (peer->isBroadcast() || peer->isBot())
+		? _similar.find(peer)
 		: end(_similar);
 	if (i != end(_similar)) {
-		return i->second.channels;
+		return i->second.peers;
 	}
-	static const auto empty = Channels();
+	static const auto empty = Peers();
 	return empty;
 }
 
 auto ChatParticipants::similarLoaded() const
--> rpl::producer<not_null<ChannelData*>> {
+-> rpl::producer<not_null<PeerData*>> {
 	return _similarLoaded.events();
 }
 
@@ -841,15 +890,15 @@ void ChatParticipants::loadRecommendations() {
 			MTP_inputChannelEmpty())
 	).done([=](const MTPmessages_Chats &result) {
 		_recommendations.requestId = 0;
-		auto parsed = ParseSimilar(_session, result);
-		_recommendations.channels = std::move(parsed);
-		_recommendations.channels.more = 0;
+		auto parsed = ParseSimilarChannels(_session, result);
+		_recommendations.peers = std::move(parsed);
+		_recommendations.peers.more = 0;
 		_recommendationsLoaded = true;
 	}).send();
 }
 
-const ChatParticipants::Channels &ChatParticipants::recommendations() const {
-	return _recommendations.channels;
+const ChatParticipants::Peers &ChatParticipants::recommendations() const {
+	return _recommendations.peers;
 }
 
 rpl::producer<> ChatParticipants::recommendationsLoaded() const {
diff --git a/Telegram/SourceFiles/api/api_chat_participants.h b/Telegram/SourceFiles/api/api_chat_participants.h
index df332522d806e1..4fedab7a758a8e 100644
--- a/Telegram/SourceFiles/api/api_chat_participants.h
+++ b/Telegram/SourceFiles/api/api_chat_participants.h
@@ -113,7 +113,7 @@ class ChatParticipants final {
 		ChatRestrictionsInfo oldRights,
 		ChatRestrictionsInfo newRights,
 		Fn<void()> onDone,
-		Fn<void()> onFail);
+		Fn<void(const QString&)> onFail);
 	void add(
 		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
@@ -138,27 +138,27 @@ class ChatParticipants final {
 		not_null<ChannelData*> channel,
 		not_null<PeerData*> participant);
 
-	void loadSimilarChannels(not_null<ChannelData*> channel);
+	void loadSimilarPeers(not_null<PeerData*> peer);
 
-	struct Channels {
-		std::vector<not_null<ChannelData*>> list;
+	struct Peers {
+		std::vector<not_null<PeerData*>> list;
 		int more = 0;
 
 		friend inline bool operator==(
-			const Channels &,
-			const Channels &) = default;
+			const Peers &,
+			const Peers &) = default;
 	};
-	[[nodiscard]] const Channels &similar(not_null<ChannelData*> channel);
+	[[nodiscard]] const Peers &similar(not_null<PeerData*> peer);
 	[[nodiscard]] auto similarLoaded() const
-		-> rpl::producer<not_null<ChannelData*>>;
+		-> rpl::producer<not_null<PeerData*>>;
 
 	void loadRecommendations();
-	[[nodiscard]] const Channels &recommendations() const;
+	[[nodiscard]] const Peers &recommendations() const;
 	[[nodiscard]] rpl::producer<> recommendationsLoaded() const;
 
 private:
-	struct SimilarChannels {
-		Channels channels;
+	struct SimilarPeers {
+		Peers peers;
 		mtpRequestId requestId = 0;
 	};
 
@@ -186,10 +186,10 @@ class ChatParticipants final {
 		not_null<PeerData*>>;
 	base::flat_map<KickRequest, mtpRequestId> _kickRequests;
 
-	base::flat_map<not_null<ChannelData*>, SimilarChannels> _similar;
-	rpl::event_stream<not_null<ChannelData*>> _similarLoaded;
+	base::flat_map<not_null<PeerData*>, SimilarPeers> _similar;
+	rpl::event_stream<not_null<PeerData*>> _similarLoaded;
 
-	SimilarChannels _recommendations;
+	SimilarPeers _recommendations;
 	rpl::variable<bool> _recommendationsLoaded = false;
 
 };
diff --git a/Telegram/SourceFiles/api/api_cloud_password.cpp b/Telegram/SourceFiles/api/api_cloud_password.cpp
index e974154b989cb3..359e9ad08f419c 100644
--- a/Telegram/SourceFiles/api/api_cloud_password.cpp
+++ b/Telegram/SourceFiles/api/api_cloud_password.cpp
@@ -68,7 +68,7 @@ void CloudPassword::clearUnconfirmedPassword() {
 rpl::producer<Core::CloudPasswordState> CloudPassword::state() const {
 	return _state
 		? _stateChanges.events_starting_with_copy(*_state)
-		: (_stateChanges.events() | rpl::type_erased());
+		: (_stateChanges.events() | rpl::type_erased);
 }
 
 auto CloudPassword::stateCurrent() const
@@ -544,4 +544,38 @@ auto CloudPassword::checkRecoveryEmailAddressCode(const QString &code)
 	};
 }
 
+void RequestLoginEmailCode(
+		MTP::Sender &api,
+		const QString &sendToEmail,
+		Fn<void(int length, const QString &pattern)> done,
+		Fn<void(const QString &error)> fail) {
+	api.request(MTPaccount_SendVerifyEmailCode(
+		MTP_emailVerifyPurposeLoginChange(),
+		MTP_string(sendToEmail)
+	)).done([=](const MTPaccount_SentEmailCode &result) {
+		done(result.data().vlength().v, qs(result.data().vemail_pattern()));
+	}).fail([=](const MTP::Error &error) {
+		fail(error.type());
+	}).send();
+}
+
+void VerifyLoginEmail(
+		MTP::Sender &api,
+		const QString &code,
+		Fn<void()> done,
+		Fn<void(const QString &error)> fail) {
+	api.request(MTPaccount_VerifyEmail(
+		MTP_emailVerifyPurposeLoginChange(),
+		MTP_emailVerificationCode(MTP_string(code))
+	)).done([=](const MTPaccount_EmailVerified &result) {
+		result.match([=](const MTPDaccount_emailVerified &data) {
+			done();
+		}, [=](const MTPDaccount_emailVerifiedLogin &data) {
+			fail(QString());
+		});
+	}).fail([=](const MTP::Error &error) {
+		fail(error.type());
+	}).send();
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_cloud_password.h b/Telegram/SourceFiles/api/api_cloud_password.h
index 30bc37938268eb..64b0d546174633 100644
--- a/Telegram/SourceFiles/api/api_cloud_password.h
+++ b/Telegram/SourceFiles/api/api_cloud_password.h
@@ -70,4 +70,15 @@ class CloudPassword final {
 
 };
 
+void RequestLoginEmailCode(
+	MTP::Sender &api,
+	const QString &sendToEmail,
+	Fn<void(int length, const QString &pattern)> done,
+	Fn<void(const QString &error)> fail);
+void VerifyLoginEmail(
+	MTP::Sender &api,
+	const QString &code,
+	Fn<void()> done,
+	Fn<void(const QString &error)> fail);
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_common.cpp b/Telegram/SourceFiles/api/api_common.cpp
index cfb1e72207fd19..9e86c94abff19a 100644
--- a/Telegram/SourceFiles/api/api_common.cpp
+++ b/Telegram/SourceFiles/api/api_common.cpp
@@ -14,6 +14,17 @@ For license and copyright information please follow this link:
 
 namespace Api {
 
+MTPSuggestedPost SuggestToMTP(SuggestOptions suggest) {
+	using Flag = MTPDsuggestedPost::Flag;
+	return suggest.exists
+		? MTP_suggestedPost(
+			MTP_flags((suggest.date ? Flag::f_schedule_date : Flag())
+				| (suggest.price().empty() ? Flag() : Flag::f_price)),
+			StarsAmountToTL(suggest.price()),
+			MTP_int(suggest.date))
+		: MTPSuggestedPost();
+}
+
 SendAction::SendAction(
 	not_null<Data::Thread*> thread,
 	SendOptions options)
diff --git a/Telegram/SourceFiles/api/api_common.h b/Telegram/SourceFiles/api/api_common.h
index 81f098d670c0e8..3b6884dcd93b1a 100644
--- a/Telegram/SourceFiles/api/api_common.h
+++ b/Telegram/SourceFiles/api/api_common.h
@@ -19,17 +19,25 @@ namespace Api {
 
 inline constexpr auto kScheduledUntilOnlineTimestamp = TimeId(0x7FFFFFFE);
 
+[[nodiscard]] MTPSuggestedPost SuggestToMTP(SuggestOptions suggest);
+
 struct SendOptions {
 	uint64 price = 0;
 	PeerData *sendAs = nullptr;
 	TimeId scheduled = 0;
+	TimeId scheduleRepeatPeriod = 0;
 	BusinessShortcutId shortcutId = 0;
 	EffectId effectId = 0;
+	QByteArray stakeSeedHash;
+	int64 stakeNanoTon = 0;
+	int starsApproved = 0;
 	bool silent = false;
 	bool handleSupportSwitch = false;
 	bool invertCaption = false;
 	bool hideViaBot = false;
+	bool mediaSpoiler = false;
 	crl::time ttlSeconds = 0;
+	SuggestOptions suggest;
 
 	friend inline bool operator==(
 		const SendOptions &,
@@ -74,7 +82,10 @@ struct MessageToSend {
 struct RemoteFileInfo {
 	MTPInputFile file;
 	std::optional<MTPInputFile> thumb;
+	std::optional<MTPInputPhoto> videoCover;
 	std::vector<MTPInputDocument> attachedStickers;
+	bool forceFile = false;
+
 };
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_compose_with_ai.cpp b/Telegram/SourceFiles/api/api_compose_with_ai.cpp
new file mode 100644
index 00000000000000..721a4e67e4357b
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_compose_with_ai.cpp
@@ -0,0 +1,307 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_compose_with_ai.h"
+
+#include "api/api_text_entities.h"
+#include "apiwrap.h"
+#include "base/options.h"
+#include "core/shortcuts.h"
+#include "data/data_ai_compose_tones.h"
+#include "data/data_session.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/layers/show.h"
+#include "ui/widgets/fields/input_field.h"
+
+namespace Api {
+namespace {
+
+base::options::option<QString> OptionAiApplyToneSlug({
+	.id = "ai-apply-tone-slug",
+	.name = "AI apply tone slug",
+	.description = "Slug of the AI compose tone bound to the in-place"
+		" apply hotkey. Empty means no tone is bound.",
+});
+
+[[nodiscard]] MTPTextWithEntities Serialize(
+		not_null<Main::Session*> session,
+		const TextWithEntities &text) {
+	return MTP_textWithEntities(
+		MTP_string(text.text),
+		EntitiesToMTP(session, text.entities, ConvertOption::SkipLocal));
+}
+
+} // namespace
+
+ComposeWithAi::ComposeWithAi(not_null<ApiWrap*> api)
+: _session(&api->session())
+, _api(&api->instance()) {
+}
+
+mtpRequestId ComposeWithAi::request(
+		Request request,
+		Fn<void(Result &&)> done,
+		Fn<void(const MTP::Error &)> fail) {
+	using Flag = MTPmessages_composeMessageWithAI::Flag;
+	auto flags = MTPmessages_composeMessageWithAI::Flags(0);
+	if (request.proofread) {
+		flags |= Flag::f_proofread;
+	}
+	if (!request.translateToLang.isEmpty()) {
+		flags |= Flag::f_translate_to_lang;
+	}
+	if (request.tone) {
+		flags |= Flag::f_tone;
+	}
+	if (request.emojify) {
+		flags |= Flag::f_emojify;
+	}
+	const auto session = _session;
+	return _api.request(MTPmessages_ComposeMessageWithAI(
+		MTP_flags(flags),
+		Serialize(session, request.text),
+		request.translateToLang.isEmpty()
+			? MTPstring()
+			: MTP_string(request.translateToLang),
+		request.tone
+			? (request.tone->id
+				? MTP_inputAiComposeToneID(
+					MTP_long(request.tone->id),
+					MTP_long(request.tone->accessHash))
+				: MTP_inputAiComposeToneDefault(
+					MTP_string(request.tone->defaultTone)))
+			: MTPInputAiComposeTone()
+	)).done([=, done = std::move(done)](
+			const MTPmessages_ComposedMessageWithAI &result) mutable {
+		const auto &data = result.data();
+		auto parsed = Result{
+			.resultText = ParseTextWithEntities(session, data.vresult_text()),
+		};
+		if (const auto diff = data.vdiff_text()) {
+			parsed.diffText = ParseDiff(session, *diff);
+		}
+		done(std::move(parsed));
+	}).fail([=, fail = std::move(fail)](const MTP::Error &error) mutable {
+		if (fail) {
+			fail(error);
+		}
+	}).send();
+}
+
+void ComposeWithAi::cancel(mtpRequestId requestId) {
+	if (requestId) {
+		_api.request(requestId).cancel();
+	}
+}
+
+ComposeWithAi::Diff ComposeWithAi::ParseDiff(
+		not_null<Main::Session*> session,
+		const MTPTextWithEntities &text) {
+	const auto &data = text.data();
+	auto result = Diff{
+		.text = ParseTextWithEntities(session, text),
+	};
+	const auto &entities = data.ventities().v;
+	result.entities.reserve(entities.size());
+	for (const auto &entity : entities) {
+		entity.match([&](const MTPDmessageEntityDiffInsert &data) {
+			result.entities.push_back({
+				.type = DiffEntity::Type::Insert,
+				.offset = data.voffset().v,
+				.length = data.vlength().v,
+			});
+		}, [&](const MTPDmessageEntityDiffReplace &data) {
+			result.entities.push_back({
+				.type = DiffEntity::Type::Replace,
+				.offset = data.voffset().v,
+				.length = data.vlength().v,
+				.oldText = qs(data.vold_text()),
+			});
+		}, [&](const MTPDmessageEntityDiffDelete &data) {
+			result.entities.push_back({
+				.type = DiffEntity::Type::Delete,
+				.offset = data.voffset().v,
+				.length = data.vlength().v,
+			});
+		}, [](const auto &) {
+		});
+	}
+	return result;
+}
+
+void ApplyAiInPlaceBySlug(
+		not_null<Main::Session*> session,
+		TextWithEntities text,
+		QString slug,
+		Fn<void(TextWithEntities)> done,
+		Fn<void(const MTP::Error &)> fail) {
+	auto apply = [=, text = std::move(text), done = std::move(done)](
+			ComposeWithAi::ToneRef tone) mutable {
+		(void)session->api().composeWithAi().request({
+			.text = std::move(text),
+			.tone = std::move(tone),
+		}, [done = std::move(done)](ComposeWithAi::Result &&result) {
+			if (done) {
+				done(std::move(result.resultText));
+			}
+		}, fail);
+	};
+	auto &tones = session->data().aiComposeTones();
+	for (const auto &cached : tones.list()) {
+		if (!cached.isDefault && cached.slug == slug) {
+			apply({ .id = cached.id, .accessHash = cached.accessHash });
+			return;
+		}
+	}
+	tones.resolve(slug, [apply = std::move(apply)](
+			Data::AiComposeTone tone) mutable {
+		if (tone.isDefault) {
+			apply({ .defaultTone = tone.defaultType });
+		} else {
+			apply({ .id = tone.id, .accessHash = tone.accessHash });
+		}
+	}, std::move(fail));
+}
+
+QString AiApplyBoundSlug() {
+	return OptionAiApplyToneSlug.value();
+}
+
+void SetAiApplyBoundSlug(const QString &slug) {
+	OptionAiApplyToneSlug.set(slug);
+}
+
+void ClearAiApplyBoundSlug() {
+	OptionAiApplyToneSlug.set(QString());
+}
+
+QString AiApplyShortcutText() {
+	for (const auto &[keys, commands] : Shortcuts::KeysCurrents()) {
+		if (commands.contains(Shortcuts::Command::ComposeAiApplyInPlace)) {
+			auto result = keys.toString();
+#ifdef Q_OS_MAC
+			result = result.replace(u"Ctrl+"_q, QString() + QChar(0x2318));
+			result = result.replace(u"Meta+"_q, QString() + QChar(0x2303));
+			result = result.replace(u"Alt+"_q, QString() + QChar(0x2325));
+			result = result.replace(u"Shift+"_q, QString() + QChar(0x21E7));
+#endif // Q_OS_MAC
+			return result;
+		}
+	}
+	return QString();
+}
+
+void TriggerAiApplyInPlace(
+		not_null<Main::Session*> session,
+		std::shared_ptr<Ui::Show> show,
+		not_null<QObject*> guard,
+		not_null<Ui::InputField*> field,
+		TextWithEntities fullFieldText,
+		Fn<void(TextWithTags textWithTags, int cursor)> applyToField) {
+	const auto slug = AiApplyBoundSlug();
+	if (slug.isEmpty()) {
+		show->showToast(tr::lng_ai_compose_apply_unbound(tr::now));
+		return;
+	}
+	const auto cursor = field->textCursor();
+	const auto hasSelection = cursor.hasSelection();
+	const auto selectionStart = cursor.selectionStart();
+	const auto selectionEnd = cursor.selectionEnd();
+	const auto savedCursorPosition = cursor.position();
+	auto text = TextWithEntities();
+	if (hasSelection) {
+		const auto part = field->getTextWithTagsPart(
+			selectionStart,
+			selectionEnd);
+		text = {
+			part.text,
+			TextUtilities::ConvertTextTagsToEntities(part.tags),
+		};
+	} else {
+		text = std::move(fullFieldText);
+	}
+	if (text.text.isEmpty()) {
+		show->showToast(tr::lng_ai_compose_apply_empty(tr::now));
+		return;
+	}
+	const auto fieldRaw = field.get();
+	ApplyAiInPlaceBySlug(
+		session,
+		std::move(text),
+		slug,
+		crl::guard(guard.get(), [=](TextWithEntities result) {
+			auto replacement = TextWithTags{
+				result.text,
+				TextUtilities::ConvertEntitiesToTextTags(result.entities),
+			};
+			auto full = TextWithTags();
+			auto restoreCursor = 0;
+			if (hasSelection) {
+				const auto fullLength = int(
+					fieldRaw->getTextWithTags().text.size());
+				const auto from = std::clamp(
+					selectionStart,
+					0,
+					fullLength);
+				const auto till = std::clamp(
+					selectionEnd,
+					from,
+					fullLength);
+				auto before = fieldRaw->getTextWithTagsPart(0, from);
+				auto after = fieldRaw->getTextWithTagsPart(till);
+				const auto shiftMiddle = int(before.text.size());
+				const auto shiftAfter = shiftMiddle
+					+ int(replacement.text.size());
+				full.text = before.text
+					+ replacement.text
+					+ after.text;
+				full.tags = std::move(before.tags);
+				full.tags.reserve(full.tags.size()
+					+ replacement.tags.size()
+					+ after.tags.size());
+				for (const auto &tag : replacement.tags) {
+					full.tags.push_back({
+						tag.offset + shiftMiddle,
+						tag.length,
+						tag.id,
+					});
+				}
+				for (const auto &tag : after.tags) {
+					full.tags.push_back({
+						tag.offset + shiftAfter,
+						tag.length,
+						tag.id,
+					});
+				}
+				restoreCursor = shiftAfter;
+			} else {
+				full = std::move(replacement);
+				restoreCursor = std::clamp(
+					savedCursorPosition,
+					0,
+					int(full.text.size()));
+			}
+			applyToField(std::move(full), restoreCursor);
+		}),
+		crl::guard(guard.get(), [=](const MTP::Error &error) {
+			if (MTP::IgnoreError(error)) {
+				return;
+			}
+			const auto type = error.type();
+			if (type == u"AICOMPOSE_TONE_SLUG_INVALID"_q
+				|| type == u"AICOMPOSE_TONE_INVALID"_q
+				|| type == u"TONE_NOT_FOUND"_q) {
+				ClearAiApplyBoundSlug();
+				show->showToast(tr::lng_ai_compose_tone_invalid(tr::now));
+			} else {
+				show->showToast(type);
+			}
+		}));
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_compose_with_ai.h b/Telegram/SourceFiles/api/api_compose_with_ai.h
new file mode 100644
index 00000000000000..acec75cf64b263
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_compose_with_ai.h
@@ -0,0 +1,114 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "mtproto/sender.h"
+#include "ui/text/text_entity.h"
+
+#include <optional>
+#include <vector>
+
+class ApiWrap;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class InputField;
+class Show;
+} // namespace Ui
+
+namespace Api {
+
+class ComposeWithAi final {
+public:
+	struct ToneRef {
+		QString defaultTone;
+		uint64 id = 0;
+		uint64 accessHash = 0;
+	};
+
+	struct Request {
+		TextWithEntities text;
+		QString translateToLang;
+		std::optional<ToneRef> tone;
+		bool proofread = false;
+		bool emojify = false;
+
+		void setDefaultTone(const QString &type) {
+			tone = ToneRef{ .defaultTone = type };
+		}
+		void setCustomTone(uint64 id, uint64 accessHash) {
+			tone = ToneRef{ .id = id, .accessHash = accessHash };
+		}
+	};
+
+	struct DiffEntity {
+		enum class Type {
+			Insert,
+			Replace,
+			Delete,
+		};
+
+		Type type = Type::Insert;
+		int offset = 0;
+		int length = 0;
+		QString oldText;
+	};
+
+	struct Diff {
+		TextWithEntities text;
+		std::vector<DiffEntity> entities;
+	};
+
+	struct Result {
+		TextWithEntities resultText;
+		std::optional<Diff> diffText;
+	};
+
+	explicit ComposeWithAi(not_null<ApiWrap*> api);
+
+	[[nodiscard]] mtpRequestId request(
+		Request request,
+		Fn<void(Result &&)> done,
+		Fn<void(const MTP::Error &)> fail = nullptr);
+	void cancel(mtpRequestId requestId);
+
+private:
+	[[nodiscard]] static Diff ParseDiff(
+		not_null<Main::Session*> session,
+		const MTPTextWithEntities &text);
+
+	const not_null<Main::Session*> _session;
+	MTP::Sender _api;
+
+};
+
+void ApplyAiInPlaceBySlug(
+	not_null<Main::Session*> session,
+	TextWithEntities text,
+	QString slug,
+	Fn<void(TextWithEntities)> done,
+	Fn<void(const MTP::Error &)> fail = nullptr);
+
+[[nodiscard]] QString AiApplyBoundSlug();
+void SetAiApplyBoundSlug(const QString &slug);
+void ClearAiApplyBoundSlug();
+
+[[nodiscard]] QString AiApplyShortcutText();
+
+void TriggerAiApplyInPlace(
+	not_null<Main::Session*> session,
+	std::shared_ptr<Ui::Show> show,
+	not_null<QObject*> guard,
+	not_null<Ui::InputField*> field,
+	TextWithEntities fullFieldText,
+	Fn<void(TextWithTags textWithTags, int cursor)> applyToField);
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_confirm_phone.cpp b/Telegram/SourceFiles/api/api_confirm_phone.cpp
index 3a42a793df602a..a080571a0ed8d8 100644
--- a/Telegram/SourceFiles/api/api_confirm_phone.cpp
+++ b/Telegram/SourceFiles/api/api_confirm_phone.cpp
@@ -87,7 +87,7 @@ void ConfirmPhone::resolve(
 				sentCodeLength,
 				fragmentUrl,
 				timeout);
-			const auto boxWeak = Ui::MakeWeak(box.data());
+			const auto boxWeak = base::make_weak(box.data());
 			using LoginCode = rpl::event_stream<QString>;
 			const auto codeHandles = box->lifetime().make_state<LoginCode>();
 			controller->session().account().setHandleLoginCode([=](
@@ -95,7 +95,7 @@ void ConfirmPhone::resolve(
 				codeHandles->fire_copy(code);
 			});
 			box->resendRequests(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_api.request(MTPauth_ResendCode(
 					MTP_flags(0),
 					MTP_string(phone),
@@ -110,7 +110,7 @@ void ConfirmPhone::resolve(
 			rpl::merge(
 				codeHandles->events(),
 				box->checkRequests()
-			) | rpl::start_with_next([=](const QString &code) {
+			) | rpl::on_next([=](const QString &code) {
 				if (_checkRequestId) {
 					return;
 				}
@@ -142,7 +142,7 @@ void ConfirmPhone::resolve(
 				}).handleFloodErrors().send();
 			}, box->lifetime());
 			box->boxClosing(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				controller->session().account().setHandleLoginCode(nullptr);
 			}, box->lifetime());
 
@@ -150,6 +150,9 @@ void ConfirmPhone::resolve(
 		}, [](const MTPDauth_sentCodeSuccess &) {
 			LOG(("API Error: Unexpected auth.sentCodeSuccess "
 				"(Api::ConfirmPhone)."));
+		}, [](const MTPDauth_sentCodePaymentRequired &) {
+			LOG(("API Error: Unexpected auth.sentCodePaymentRequired "
+				"(Api::ConfirmPhone)."));
 		});
 	}).fail([=](const MTP::Error &error) {
 		_sendRequestId = 0;
diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp
index 4ef4b09c85da9e..8711ab458e4226 100644
--- a/Telegram/SourceFiles/api/api_credits.cpp
+++ b/Telegram/SourceFiles/api/api_credits.cpp
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #include "api/api_credits.h"
 
+#include "api/api_credits_history_entry.h"
+#include "api/api_premium.h"
 #include "api/api_statistics_data_deserialize.h"
 #include "api/api_updates.h"
 #include "apiwrap.h"
@@ -26,115 +28,27 @@ namespace {
 
 constexpr auto kTransactionsLimit = 100;
 
-[[nodiscard]] Data::CreditsHistoryEntry HistoryFromTL(
-		const MTPStarsTransaction &tl,
-		not_null<PeerData*> peer) {
-	using HistoryPeerTL = MTPDstarsTransactionPeer;
-	using namespace Data;
-	const auto owner = &peer->owner();
-	const auto photo = tl.data().vphoto()
-		? owner->photoFromWeb(*tl.data().vphoto(), ImageLocation())
-		: nullptr;
-	auto extended = std::vector<CreditsHistoryMedia>();
-	if (const auto list = tl.data().vextended_media()) {
-		extended.reserve(list->v.size());
-		for (const auto &media : list->v) {
-			media.match([&](const MTPDmessageMediaPhoto &photo) {
-				if (const auto inner = photo.vphoto()) {
-					const auto photo = owner->processPhoto(*inner);
-					if (!photo->isNull()) {
-						extended.push_back(CreditsHistoryMedia{
-							.type = CreditsHistoryMediaType::Photo,
-							.id = photo->id,
-						});
-					}
-				}
-			}, [&](const MTPDmessageMediaDocument &document) {
-				if (const auto inner = document.vdocument()) {
-					const auto document = owner->processDocument(*inner);
-					if (document->isAnimation()
-						|| document->isVideoFile()
-						|| document->isGifv()) {
-						extended.push_back(CreditsHistoryMedia{
-							.type = CreditsHistoryMediaType::Video,
-							.id = document->id,
-						});
-					}
-				}
-			}, [&](const auto &) {});
-		}
-	}
-	const auto barePeerId = tl.data().vpeer().match([](
-			const HistoryPeerTL &p) {
-		return peerFromMTP(p.vpeer());
-	}, [](const auto &) {
-		return PeerId(0);
-	}).value;
-	const auto stargift = tl.data().vstargift();
-	const auto incoming = (int64(tl.data().vstars().v) >= 0);
-	return Data::CreditsHistoryEntry{
-		.id = qs(tl.data().vid()),
-		.title = qs(tl.data().vtitle().value_or_empty()),
-		.description = { qs(tl.data().vdescription().value_or_empty()) },
-		.date = base::unixtime::parse(tl.data().vdate().v),
-		.photoId = photo ? photo->id : 0,
-		.extended = std::move(extended),
-		.credits = tl.data().vstars().v,
-		.bareMsgId = uint64(tl.data().vmsg_id().value_or_empty()),
-		.barePeerId = barePeerId,
-		.bareGiveawayMsgId = uint64(
-			tl.data().vgiveaway_post_id().value_or_empty()),
-		.bareGiftStickerId = (stargift
-			? owner->processDocument(stargift->data().vsticker())->id
-			: 0),
-		.peerType = tl.data().vpeer().match([](const HistoryPeerTL &) {
-			return Data::CreditsHistoryEntry::PeerType::Peer;
-		}, [](const MTPDstarsTransactionPeerPlayMarket &) {
-			return Data::CreditsHistoryEntry::PeerType::PlayMarket;
-		}, [](const MTPDstarsTransactionPeerFragment &) {
-			return Data::CreditsHistoryEntry::PeerType::Fragment;
-		}, [](const MTPDstarsTransactionPeerAppStore &) {
-			return Data::CreditsHistoryEntry::PeerType::AppStore;
-		}, [](const MTPDstarsTransactionPeerUnsupported &) {
-			return Data::CreditsHistoryEntry::PeerType::Unsupported;
-		}, [](const MTPDstarsTransactionPeerPremiumBot &) {
-			return Data::CreditsHistoryEntry::PeerType::PremiumBot;
-		}, [](const MTPDstarsTransactionPeerAds &) {
-			return Data::CreditsHistoryEntry::PeerType::Ads;
-		}),
-		.subscriptionUntil = tl.data().vsubscription_period()
-			? base::unixtime::parse(base::unixtime::now()
-				+ tl.data().vsubscription_period()->v)
-			: QDateTime(),
-		.successDate = tl.data().vtransaction_date()
-			? base::unixtime::parse(tl.data().vtransaction_date()->v)
-			: QDateTime(),
-		.successLink = qs(tl.data().vtransaction_url().value_or_empty()),
-		.convertStars = int(stargift
-			? stargift->data().vconvert_stars().v
-			: 0),
-		.converted = stargift && incoming,
-		.reaction = tl.data().is_reaction(),
-		.refunded = tl.data().is_refund(),
-		.pending = tl.data().is_pending(),
-		.failed = tl.data().is_failed(),
-		.in = incoming,
-		.gift = tl.data().is_gift() || stargift.has_value(),
-	};
-}
-
 [[nodiscard]] Data::SubscriptionEntry SubscriptionFromTL(
-		const MTPStarsSubscription &tl) {
+		const MTPStarsSubscription &tl,
+		not_null<PeerData*> peer) {
 	return Data::SubscriptionEntry{
 		.id = qs(tl.data().vid()),
 		.inviteHash = qs(tl.data().vchat_invite_hash().value_or_empty()),
+		.title = qs(tl.data().vtitle().value_or_empty()),
+		.slug = qs(tl.data().vinvoice_slug().value_or_empty()),
 		.until = base::unixtime::parse(tl.data().vuntil_date().v),
 		.subscription = Data::PeerSubscription{
 			.credits = tl.data().vpricing().data().vamount().v,
 			.period = tl.data().vpricing().data().vperiod().v,
 		},
 		.barePeerId = peerFromMTP(tl.data().vpeer()).value,
+		.photoId = (tl.data().vphoto()
+			? peer->owner().photoFromWeb(
+				*tl.data().vphoto(),
+				ImageLocation())->id
+			: 0),
 		.cancelled = tl.data().is_canceled(),
+		.cancelledByBot = tl.data().is_bot_canceled(),
 		.expired = (base::unixtime::now() > tl.data().vuntil_date().v),
 		.canRefulfill = tl.data().is_can_refulfill(),
 	};
@@ -150,23 +64,24 @@ constexpr auto kTransactionsLimit = 100;
 	if (const auto history = data.vhistory()) {
 		entries.reserve(history->v.size());
 		for (const auto &tl : history->v) {
-			entries.push_back(HistoryFromTL(tl, peer));
+			entries.push_back(CreditsHistoryEntryFromTL(tl, peer));
 		}
 	}
 	auto subscriptions = std::vector<Data::SubscriptionEntry>();
 	if (const auto history = data.vsubscriptions()) {
 		subscriptions.reserve(history->v.size());
 		for (const auto &tl : history->v) {
-			subscriptions.push_back(SubscriptionFromTL(tl));
+			subscriptions.push_back(SubscriptionFromTL(tl, peer));
 		}
 	}
 	return Data::CreditsStatusSlice{
 		.list = std::move(entries),
 		.subscriptions = std::move(subscriptions),
-		.balance = status.data().vbalance().v,
+		.balance = CreditsAmountFromTL(status.data().vbalance()),
 		.subscriptionsMissingBalance
 			= status.data().vsubscriptions_missing_balance().value_or_empty(),
-		.allLoaded = !status.data().vnext_offset().has_value(),
+		.allLoaded = !status.data().vnext_offset().has_value()
+			&& !status.data().vsubscriptions_next_offset().has_value(),
 		.token = qs(status.data().vnext_offset().value_or_empty()),
 		.tokenSubscriptions = qs(
 			status.data().vsubscriptions_next_offset().value_or_empty()),
@@ -216,7 +131,7 @@ rpl::producer<rpl::no_value, QString> CreditsTopupOptions::request() {
 			using TLOption = MTPStarsGiftOption;
 			_api.request(MTPpayments_GetStarsGiftOptions(
 				MTP_flags(MTPpayments_GetStarsGiftOptions::Flag::f_user_id),
-				user->inputUser
+				user->inputUser()
 			)).done([=](const MTPVector<TLOption> &result) {
 				_options = optionsFromTL(result.v);
 				consumer.put_done();
@@ -246,11 +161,14 @@ void CreditsStatus::request(
 	using TLResult = MTPpayments_StarsStatus;
 
 	_requestId = _api.request(MTPpayments_GetStarsStatus(
-		_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input
+		MTP_flags(0),
+		_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input()
 	)).done([=](const TLResult &result) {
 		_requestId = 0;
-		const auto balance = result.data().vbalance().v;
-		_peer->session().credits().apply(_peer->id, balance);
+		const auto &balance = result.data().vbalance();
+		_peer->session().credits().apply(
+			_peer->id,
+			CreditsAmountFromTL(balance));
 		if (const auto onstack = done) {
 			onstack(StatusFromTL(result, _peer));
 		}
@@ -262,28 +180,34 @@ void CreditsStatus::request(
 	}).send();
 }
 
-CreditsHistory::CreditsHistory(not_null<PeerData*> peer, bool in, bool out)
+CreditsHistory::CreditsHistory(
+	not_null<PeerData*> peer,
+	bool in,
+	bool out,
+	bool currency)
 : _peer(peer)
-, _flags((in == out)
+, _flags(((in == out)
 	? HistoryTL::Flags(0)
 	: HistoryTL::Flags(0)
 		| (in ? HistoryTL::Flag::f_inbound : HistoryTL::Flags(0))
 		| (out ? HistoryTL::Flag::f_outbound : HistoryTL::Flags(0)))
+	| (currency ? HistoryTL::Flag::f_ton : HistoryTL::Flags(0)))
 , _api(&peer->session().api().instance()) {
 }
 
 void CreditsHistory::request(
 		const Data::CreditsStatusSlice::OffsetToken &token,
-		Fn<void(Data::CreditsStatusSlice)> done) {
+		Fn<void(Data::CreditsStatusSlice)> done,
+		int limit) {
 	if (_requestId) {
 		return;
 	}
 	_requestId = _api.request(MTPpayments_GetStarsTransactions(
 		MTP_flags(_flags),
 		MTPstring(), // subscription_id
-		_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input,
+		_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input(),
 		MTP_string(token),
-		MTP_int(kTransactionsLimit)
+		MTP_int((limit > 0) ? limit : kTransactionsLimit)
 	)).done([=](const MTPpayments_StarsStatus &result) {
 		_requestId = 0;
 		done(StatusFromTL(result, _peer));
@@ -295,13 +219,16 @@ void CreditsHistory::request(
 
 void CreditsHistory::requestSubscriptions(
 		const Data::CreditsStatusSlice::OffsetToken &token,
-		Fn<void(Data::CreditsStatusSlice)> done) {
+		Fn<void(Data::CreditsStatusSlice)> done,
+		bool missingBalance) {
 	if (_requestId) {
 		return;
 	}
 	_requestId = _api.request(MTPpayments_GetStarsSubscriptions(
-		MTP_flags(0),
-		_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input,
+		MTP_flags(missingBalance
+			? MTPpayments_getStarsSubscriptions::Flag::f_missing_balance
+			: MTPpayments_getStarsSubscriptions::Flags(0)),
+		_peer->isSelf() ? MTP_inputPeerSelf() : _peer->input(),
 		MTP_string(token)
 	)).done([=](const MTPpayments_StarsStatus &result) {
 		_requestId = 0;
@@ -329,7 +256,9 @@ rpl::producer<not_null<PeerData*>> PremiumPeerBot(
 		const auto api = lifetime.make_state<MTP::Sender>(&session->mtp());
 
 		api->request(MTPcontacts_ResolveUsername(
-			MTP_string(username)
+			MTP_flags(0),
+			MTP_string(username),
+			MTP_string()
 		)).done([=](const MTPcontacts_ResolvedPeer &result) {
 			session->data().processUsers(result.data().vusers());
 			session->data().processChats(result.data().vchats());
@@ -355,18 +284,21 @@ rpl::producer<rpl::no_value, QString> CreditsEarnStatistics::request() {
 		auto lifetime = rpl::lifetime();
 
 		const auto finish = [=](const QString &url) {
-			makeRequest(MTPpayments_GetStarsRevenueStats(
+			api().request(MTPpayments_GetStarsRevenueStats(
 				MTP_flags(0),
-				(_isUser ? user()->input : channel()->input)
+				(_isUser ? user()->input() : channel()->input())
 			)).done([=](const MTPpayments_StarsRevenueStats &result) {
 				const auto &data = result.data();
 				const auto &status = data.vstatus().data();
 				_data = Data::CreditsEarnStatistics{
 					.revenueGraph = StatisticalGraphFromTL(
 						data.vrevenue_graph()),
-					.currentBalance = status.vcurrent_balance().v,
-					.availableBalance = status.vavailable_balance().v,
-					.overallRevenue = status.voverall_revenue().v,
+					.currentBalance = CreditsAmountFromTL(
+						status.vcurrent_balance()),
+					.availableBalance = CreditsAmountFromTL(
+						status.vavailable_balance()),
+					.overallRevenue = CreditsAmountFromTL(
+						status.voverall_revenue()),
 					.usdRate = data.vusd_rate().v,
 					.isWithdrawalEnabled = status.is_withdrawal_enabled(),
 					.nextWithdrawalAt = status.vnext_withdrawal_at()
@@ -382,9 +314,9 @@ rpl::producer<rpl::no_value, QString> CreditsEarnStatistics::request() {
 			}).send();
 		};
 
-		makeRequest(
+		api().request(
 			MTPpayments_GetStarsRevenueAdsAccountUrl(
-				(_isUser ? user()->input : channel()->input))
+				(_isUser ? user()->input() : channel()->input()))
 		).done([=](const MTPpayments_StarsRevenueAdsAccountUrl &result) {
 			finish(qs(result.data().vurl()));
 		}).fail([=](const MTP::Error &error) {
@@ -453,4 +385,32 @@ Data::CreditsGiveawayOptions CreditsGiveawayOptions::options() const {
 	return _options;
 }
 
+void EditCreditsSubscription(
+		not_null<Main::Session*> session,
+		const QString &id,
+		bool cancel,
+		Fn<void()> done,
+		Fn<void(QString)> fail) {
+	using Flag = MTPpayments_ChangeStarsSubscription::Flag;
+	session->api().request(
+		MTPpayments_ChangeStarsSubscription(
+			MTP_flags(Flag::f_canceled),
+			MTP_inputPeerSelf(),
+			MTP_string(id),
+			MTP_bool(cancel)
+	)).done(done).fail([=](const MTP::Error &e) { fail(e.type()); }).send();
+}
+
+MTPInputSavedStarGift InputSavedStarGiftId(
+		const Data::SavedStarGiftId &id,
+		const std::shared_ptr<Data::UniqueGift> &unique) {
+	return (!id && unique)
+		? MTP_inputSavedStarGiftSlug(MTP_string(unique->slug))
+		: id.isUser()
+		? MTP_inputSavedStarGiftUser(MTP_int(id.userMessageId().bare))
+		: MTP_inputSavedStarGiftChat(
+			id.chat()->input(),
+			MTP_long(id.chatSavedId()));
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_credits.h b/Telegram/SourceFiles/api/api_credits.h
index d2e819e08327fc..9c676963bfd707 100644
--- a/Telegram/SourceFiles/api/api_credits.h
+++ b/Telegram/SourceFiles/api/api_credits.h
@@ -12,6 +12,10 @@ For license and copyright information please follow this link:
 #include "data/data_credits_earn.h"
 #include "mtproto/sender.h"
 
+namespace Data {
+class SavedStarGiftId;
+} // namespace Data
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -71,14 +75,20 @@ class CreditsStatus final {
 
 class CreditsHistory final {
 public:
-	CreditsHistory(not_null<PeerData*> peer, bool in, bool out);
+	CreditsHistory(
+		not_null<PeerData*> peer,
+		bool in,
+		bool out,
+		bool currency = false);
 
 	void request(
 		const Data::CreditsStatusSlice::OffsetToken &token,
-		Fn<void(Data::CreditsStatusSlice)> done);
+		Fn<void(Data::CreditsStatusSlice)> done,
+		int limit = 0);
 	void requestSubscriptions(
 		const Data::CreditsStatusSlice::OffsetToken &token,
-		Fn<void(Data::CreditsStatusSlice)> done);
+		Fn<void(Data::CreditsStatusSlice)> done,
+		bool missingBalance = false);
 
 private:
 	using HistoryTL = MTPpayments_GetStarsTransactions;
@@ -99,14 +109,23 @@ class CreditsEarnStatistics final : public StatisticsRequestSender {
 	[[nodiscard]] Data::CreditsEarnStatistics data() const;
 
 private:
+	const bool _isUser = false;
 	Data::CreditsEarnStatistics _data;
-	bool _isUser = false;
-
-	mtpRequestId _requestId = 0;
 
 };
 
 [[nodiscard]] rpl::producer<not_null<PeerData*>> PremiumPeerBot(
 	not_null<Main::Session*> session);
 
+void EditCreditsSubscription(
+	not_null<Main::Session*> session,
+	const QString &id,
+	bool cancel,
+	Fn<void()> done,
+	Fn<void(QString)> fail);
+
+[[nodiscard]] MTPInputSavedStarGift InputSavedStarGiftId(
+	const Data::SavedStarGiftId &id,
+	const std::shared_ptr<Data::UniqueGift> &unique = nullptr);
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_credits_history_entry.cpp b/Telegram/SourceFiles/api/api_credits_history_entry.cpp
new file mode 100644
index 00000000000000..e54537df0c0c33
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_credits_history_entry.cpp
@@ -0,0 +1,171 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_credits_history_entry.h"
+
+#include "api/api_premium.h"
+#include "base/unixtime.h"
+#include "data/data_channel.h"
+#include "data/data_credits.h"
+#include "data/data_document.h"
+#include "data/data_peer.h"
+#include "data/data_photo.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "main/main_session.h"
+
+namespace Api {
+
+Data::CreditsHistoryEntry CreditsHistoryEntryFromTL(
+		const MTPStarsTransaction &tl,
+		not_null<PeerData*> peer) {
+	using HistoryPeerTL = MTPDstarsTransactionPeer;
+	using namespace Data;
+	const auto owner = &peer->owner();
+	const auto photo = tl.data().vphoto()
+		? owner->photoFromWeb(*tl.data().vphoto(), ImageLocation())
+		: nullptr;
+	auto extended = std::vector<CreditsHistoryMedia>();
+	if (const auto list = tl.data().vextended_media()) {
+		extended.reserve(list->v.size());
+		for (const auto &media : list->v) {
+			media.match([&](const MTPDmessageMediaPhoto &data) {
+				if (const auto inner = data.vphoto()) {
+					const auto photo = owner->processPhoto(*inner);
+					if (!photo->isNull()) {
+						extended.push_back(CreditsHistoryMedia{
+							.type = CreditsHistoryMediaType::Photo,
+							.id = photo->id,
+						});
+					}
+				}
+			}, [&](const MTPDmessageMediaDocument &data) {
+				if (const auto inner = data.vdocument()) {
+					const auto document = owner->processDocument(
+						*inner,
+						data.valt_documents());
+					if (document->isAnimation()
+						|| document->isVideoFile()
+						|| document->isGifv()) {
+						extended.push_back(CreditsHistoryMedia{
+							.type = CreditsHistoryMediaType::Video,
+							.id = document->id,
+						});
+					}
+				}
+			}, [&](const auto &) {});
+		}
+	}
+	const auto barePeerId = tl.data().vpeer().match([](
+			const HistoryPeerTL &p) {
+		return peerFromMTP(p.vpeer());
+	}, [](const auto &) {
+		return PeerId(0);
+	}).value;
+	const auto stargift = tl.data().vstargift();
+	const auto nonUniqueGift = stargift
+		? stargift->match([&](const MTPDstarGift &data) {
+			return &data;
+		}, [](const auto &) { return (const MTPDstarGift*)nullptr; })
+		: nullptr;
+	const auto reaction = tl.data().is_reaction();
+	const auto amount = CreditsAmountFromTL(tl.data().vamount());
+	const auto starrefAmount = CreditsAmountFromTL(
+		tl.data().vstarref_amount());
+	const auto starrefCommission
+		= tl.data().vstarref_commission_permille().value_or_empty();
+	const auto starrefBarePeerId = tl.data().vstarref_peer()
+		? peerFromMTP(*tl.data().vstarref_peer()).value
+		: 0;
+	const auto incoming = (amount >= CreditsAmount());
+	const auto paidMessagesCount
+		= tl.data().vpaid_messages().value_or_empty();
+	const auto premiumMonthsForStars
+		= tl.data().vpremium_gift_months().value_or_empty();
+	const auto saveActorId = (reaction
+		|| !extended.empty()
+		|| paidMessagesCount) && incoming;
+	const auto parsedGift = stargift
+		? FromTL(&peer->session(), *stargift)
+		: std::optional<Data::StarGift>();
+	const auto giftStickerId = parsedGift ? parsedGift->document->id : 0;
+	return Data::CreditsHistoryEntry{
+		.id = qs(tl.data().vid()),
+		.title = qs(tl.data().vtitle().value_or_empty()),
+		.description = { qs(tl.data().vdescription().value_or_empty()) },
+		.date = base::unixtime::parse(
+			tl.data().vads_proceeds_from_date().value_or(
+				tl.data().vdate().v)),
+		.photoId = photo ? photo->id : 0,
+		.extended = std::move(extended),
+		.credits = CreditsAmountFromTL(tl.data().vamount()),
+		.bareMsgId = uint64(tl.data().vmsg_id().value_or_empty()),
+		.barePeerId = saveActorId ? peer->id.value : barePeerId,
+		.bareGiveawayMsgId = uint64(
+			tl.data().vgiveaway_post_id().value_or_empty()),
+		.bareGiftStickerId = giftStickerId,
+		.bareActorId = saveActorId ? barePeerId : uint64(0),
+		.uniqueGift = parsedGift ? parsedGift->unique : nullptr,
+		.starrefAmount = paidMessagesCount ? CreditsAmount() : starrefAmount,
+		.starrefCommission = paidMessagesCount ? 0 : starrefCommission,
+		.starrefRecipientId = paidMessagesCount ? 0 : starrefBarePeerId,
+		.peerType = tl.data().vpeer().match([](const HistoryPeerTL &) {
+			return Data::CreditsHistoryEntry::PeerType::Peer;
+		}, [](const MTPDstarsTransactionPeerPlayMarket &) {
+			return Data::CreditsHistoryEntry::PeerType::PlayMarket;
+		}, [](const MTPDstarsTransactionPeerFragment &) {
+			return Data::CreditsHistoryEntry::PeerType::Fragment;
+		}, [](const MTPDstarsTransactionPeerAppStore &) {
+			return Data::CreditsHistoryEntry::PeerType::AppStore;
+		}, [](const MTPDstarsTransactionPeerUnsupported &) {
+			return Data::CreditsHistoryEntry::PeerType::Unsupported;
+		}, [](const MTPDstarsTransactionPeerPremiumBot &) {
+			return Data::CreditsHistoryEntry::PeerType::PremiumBot;
+		}, [](const MTPDstarsTransactionPeerAds &) {
+			return Data::CreditsHistoryEntry::PeerType::Ads;
+		}, [](const MTPDstarsTransactionPeerAPI &) {
+			return Data::CreditsHistoryEntry::PeerType::API;
+		}),
+		.subscriptionUntil = tl.data().vsubscription_period()
+			? base::unixtime::parse(base::unixtime::now()
+				+ tl.data().vsubscription_period()->v)
+			: QDateTime(),
+		.adsProceedsToDate = tl.data().vads_proceeds_to_date()
+			? base::unixtime::parse(tl.data().vads_proceeds_to_date()->v)
+			: QDateTime(),
+		.successDate = tl.data().vtransaction_date()
+			? base::unixtime::parse(tl.data().vtransaction_date()->v)
+			: QDateTime(),
+		.successLink = qs(tl.data().vtransaction_url().value_or_empty()),
+		.paidMessagesCount = paidMessagesCount,
+		.paidMessagesAmount = (paidMessagesCount
+			? starrefAmount
+			: CreditsAmount()),
+		.paidMessagesCommission = paidMessagesCount ? starrefCommission : 0,
+		.limitedCount = parsedGift ? parsedGift->limitedCount : 0,
+		.limitedLeft = parsedGift ? parsedGift->limitedLeft : 0,
+		.starsConverted = int(nonUniqueGift
+			? nonUniqueGift->vconvert_stars().v
+			: 0),
+		.premiumMonthsForStars = premiumMonthsForStars,
+		.floodSkip = int(tl.data().vfloodskip_number().value_or(0)),
+		.converted = stargift && incoming,
+		.stargift = stargift.has_value(),
+		.postsSearch = tl.data().is_posts_search(),
+		.giftUpgraded = tl.data().is_stargift_upgrade(),
+		.giftResale = tl.data().is_stargift_resale(),
+		.giftOffer = tl.data().is_offer(),
+		.reaction = tl.data().is_reaction(),
+		.refunded = tl.data().is_refund(),
+		.pending = tl.data().is_pending(),
+		.failed = tl.data().is_failed(),
+		.in = incoming,
+		.gift = tl.data().is_gift() || stargift.has_value(),
+	};
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_credits_history_entry.h b/Telegram/SourceFiles/api/api_credits_history_entry.h
new file mode 100644
index 00000000000000..5b3762a851f657
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_credits_history_entry.h
@@ -0,0 +1,22 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class PeerData;
+
+namespace Data {
+struct CreditsHistoryEntry;
+} // namespace Data
+
+namespace Api {
+
+[[nodiscard]] Data::CreditsHistoryEntry CreditsHistoryEntryFromTL(
+	const MTPStarsTransaction &tl,
+	not_null<PeerData*> peer);
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_earn.cpp b/Telegram/SourceFiles/api/api_earn.cpp
index f05e5f61881930..a5c2a98a2f7567 100644
--- a/Telegram/SourceFiles/api/api_earn.cpp
+++ b/Telegram/SourceFiles/api/api_earn.cpp
@@ -25,7 +25,7 @@ void RestrictSponsored(
 		bool restricted,
 		Fn<void(QString)> failed) {
 	channel->session().api().request(MTPchannels_RestrictSponsoredMessages(
-		channel->inputChannel,
+		channel->inputChannel(),
 		MTP_bool(restricted))
 	).done([=](const MTPUpdates &updates) {
 		channel->session().api().applyUpdates(updates);
@@ -40,46 +40,49 @@ void HandleWithdrawalButton(
 		std::shared_ptr<Ui::Show> show) {
 	Expects(receiver.currencyReceiver
 		|| (receiver.creditsReceiver && receiver.creditsAmount));
+
 	struct State {
 		rpl::lifetime lifetime;
 		bool loading = false;
 	};
 
-	const auto channel = receiver.currencyReceiver;
-	const auto peer = receiver.creditsReceiver;
+	const auto currencyReceiver = receiver.currencyReceiver;
+	const auto creditsReceiver = receiver.creditsReceiver;
+	const auto isChannel = receiver.currencyReceiver
+		&& receiver.currencyReceiver->isChannel();
 
 	const auto state = button->lifetime().make_state<State>();
-	const auto session = (channel ? &channel->session() : &peer->session());
+	const auto session = (currencyReceiver
+		? &currencyReceiver->session()
+		: &creditsReceiver->session());
 
-	using ChannelOutUrl = MTPstats_BroadcastRevenueWithdrawalUrl;
 	using CreditsOutUrl = MTPpayments_StarsRevenueWithdrawalUrl;
 
 	session->api().cloudPassword().reload();
 	const auto processOut = [=] {
 		if (state->loading) {
 			return;
-		}
-		if (peer && !receiver.creditsAmount()) {
+		} else if (creditsReceiver && !receiver.creditsAmount()) {
 			return;
 		}
 		state->loading = true;
 		state->lifetime = session->api().cloudPassword().state(
 		) | rpl::take(
 			1
-		) | rpl::start_with_next([=](const Core::CloudPasswordState &pass) {
+		) | rpl::on_next([=](const Core::CloudPasswordState &pass) {
 			state->loading = false;
 
 			auto fields = PasscodeBox::CloudFields::From(pass);
-			fields.customTitle = channel
+			fields.customTitle = isChannel
 				? tr::lng_channel_earn_balance_password_title()
 				: tr::lng_bot_earn_balance_password_title();
-			fields.customDescription = channel
+			fields.customDescription = isChannel
 				? tr::lng_channel_earn_balance_password_description(tr::now)
 				: tr::lng_bot_earn_balance_password_description(tr::now);
 			fields.customSubmitButton = tr::lng_passcode_submit();
 			fields.customCheckCallback = crl::guard(button, [=](
 					const Core::CloudPasswordResult &result,
-					QPointer<PasscodeBox> box) {
+					base::weak_qptr<PasscodeBox> box) {
 				const auto done = [=](const QString &result) {
 					if (!result.isEmpty()) {
 						UrlClickHandler::Open(result);
@@ -89,21 +92,24 @@ void HandleWithdrawalButton(
 					}
 				};
 				const auto fail = [=](const MTP::Error &error) {
-					show->showToast(error.type());
+					const auto message = error.type();
+					if (box && !box->handleCustomCheckError(message)) {
+						show->showToast(message);
+					}
 				};
-				if (channel) {
-					session->api().request(
-						MTPstats_GetBroadcastRevenueWithdrawalUrl(
-							channel->inputChannel,
-							result.result
-					)).done([=](const ChannelOutUrl &r) {
-						done(qs(r.data().vurl()));
-					}).fail(fail).send();
-				} else if (peer) {
+				if (currencyReceiver || creditsReceiver) {
+					using F = MTPpayments_getStarsRevenueWithdrawalUrl::Flag;
 					session->api().request(
 						MTPpayments_GetStarsRevenueWithdrawalUrl(
-							peer->input,
-							MTP_long(receiver.creditsAmount()),
+							MTP_flags(currencyReceiver
+								? F::f_ton
+								: F::f_amount),
+							currencyReceiver
+								? currencyReceiver->input()
+								: creditsReceiver->input(),
+							MTP_long(creditsReceiver
+								? receiver.creditsAmount()
+								: 0),
 							result.result
 					)).done([=](const CreditsOutUrl &r) {
 						done(qs(r.data().vurl()));
@@ -131,17 +137,19 @@ void HandleWithdrawalButton(
 				processOut();
 			}
 		};
-		if (channel) {
-			session->api().request(
-				MTPstats_GetBroadcastRevenueWithdrawalUrl(
-					channel->inputChannel,
-					MTP_inputCheckPasswordEmpty()
-			)).fail(fail).send();
-		} else if (peer) {
+		if (currencyReceiver || creditsReceiver) {
+			using F = MTPpayments_getStarsRevenueWithdrawalUrl::Flag;
 			session->api().request(
 				MTPpayments_GetStarsRevenueWithdrawalUrl(
-					peer->input,
-					MTP_long(std::numeric_limits<int64_t>::max()),
+					MTP_flags(currencyReceiver
+						? F::f_ton
+						: F::f_amount),
+					currencyReceiver
+						? currencyReceiver->input()
+						: creditsReceiver->input(),
+					MTP_long(creditsReceiver
+						? receiver.creditsAmount()
+						: 0),
 					MTP_inputCheckPasswordEmpty()
 			)).fail(fail).send();
 		}
diff --git a/Telegram/SourceFiles/api/api_earn.h b/Telegram/SourceFiles/api/api_earn.h
index cbee5d25ab03a3..4142c9453c8770 100644
--- a/Telegram/SourceFiles/api/api_earn.h
+++ b/Telegram/SourceFiles/api/api_earn.h
@@ -22,7 +22,7 @@ void RestrictSponsored(
 	Fn<void(QString)> failed);
 
 struct RewardReceiver final {
-	ChannelData *currencyReceiver = nullptr;
+	PeerData *currencyReceiver = nullptr;
 	PeerData *creditsReceiver = nullptr;
 	Fn<uint64()> creditsAmount;
 };
diff --git a/Telegram/SourceFiles/api/api_editing.cpp b/Telegram/SourceFiles/api/api_editing.cpp
index 662bfc98013be9..25090a4be7d8c5 100644
--- a/Telegram/SourceFiles/api/api_editing.cpp
+++ b/Telegram/SourceFiles/api/api_editing.cpp
@@ -10,15 +10,19 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "api/api_media.h"
 #include "api/api_text_entities.h"
+#include "base/random.h"
 #include "ui/boxes/confirm_box.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/components/scheduled_messages.h"
 #include "data/data_file_origin.h"
 #include "data/data_histories.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
+#include "data/data_todo_list.h"
 #include "data/data_web_page.h"
 #include "history/view/controls/history_view_compose_media_edit_manager.h"
 #include "history/history.h"
+#include "history/history_item_components.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "mtproto/mtproto_response.h"
@@ -45,6 +49,244 @@ template <typename T>
 constexpr auto ErrorWithoutId
 	= is_callable_plain_v<T, QString>;
 
+[[nodiscard]] auto ComputeEditMessageFlags(
+		not_null<HistoryItem*> item,
+		const MTPVector<MTPMessageEntity> &sentEntities,
+		Data::WebPageDraft webpage,
+		SendOptions options,
+		bool withMessage,
+		bool withMedia,
+		bool withRichMessage)
+-> MTPmessages_EditMessage::Flags {
+	const auto emptyFlag = MTPmessages_EditMessage::Flag(0);
+	return emptyFlag
+		| (withMessage
+			? MTPmessages_EditMessage::Flag::f_message
+			: emptyFlag)
+		| (withMedia
+			? MTPmessages_EditMessage::Flag::f_media
+			: emptyFlag)
+		| (webpage.removed
+			? MTPmessages_EditMessage::Flag::f_no_webpage
+			: emptyFlag)
+		| (((!webpage.removed && !webpage.url.isEmpty() && webpage.invert)
+			|| options.invertCaption)
+			? MTPmessages_EditMessage::Flag::f_invert_media
+			: emptyFlag)
+		| (!sentEntities.v.isEmpty()
+			? MTPmessages_EditMessage::Flag::f_entities
+			: emptyFlag)
+		| (options.scheduled
+			? MTPmessages_EditMessage::Flag::f_schedule_date
+			: emptyFlag)
+		| ((options.scheduled && options.scheduleRepeatPeriod)
+			? MTPmessages_EditMessage::Flag::f_schedule_repeat_period
+			: emptyFlag)
+		| (item->isBusinessShortcut()
+			? MTPmessages_EditMessage::Flag::f_quick_reply_shortcut_id
+			: emptyFlag)
+		| (withRichMessage
+			? MTPmessages_EditMessage::Flag::f_rich_message
+			: emptyFlag);
+}
+
+[[nodiscard]] MsgId EditMessageRequestId(not_null<HistoryItem*> item) {
+	return item->isScheduled()
+		? item->history()->session().scheduledMessages().lookupId(item)
+		: item->isBusinessShortcut()
+		? item->history()->session().data().shortcutMessages().lookupId(item)
+		: item->id;
+}
+
+template <typename DoneCallback, typename FailCallback>
+mtpRequestId SuggestMessage(
+		not_null<HistoryItem*> item,
+		const TextWithEntities &textWithEntities,
+		Data::WebPageDraft webpage,
+		SendOptions options,
+		DoneCallback &&done,
+		FailCallback &&fail) {
+	Expects(options.suggest.exists);
+	Expects(!options.scheduled);
+
+	const auto session = &item->history()->session();
+	const auto api = &session->api();
+
+	const auto thread = item->history()->amMonoforumAdmin()
+		? item->savedSublist()
+		: (Data::Thread*)item->history();
+	auto action = SendAction(thread, options);
+	action.replyTo = FullReplyTo{
+		.messageId = item->fullId(),
+		.monoforumPeerId = (item->history()->amMonoforumAdmin()
+			? item->sublistPeerId()
+			: PeerId()),
+	};
+
+	auto message = MessageToSend(std::move(action));
+	message.textWithTags = TextWithTags{
+		textWithEntities.text,
+		TextUtilities::ConvertEntitiesToTextTags(textWithEntities.entities)
+	};
+	message.webPage = webpage;
+	api->sendMessage(std::move(message));
+
+	const auto requestId = -1;
+	crl::on_main(session, [=] {
+		const auto type = u"MESSAGE_NOT_MODIFIED"_q;
+		if constexpr (ErrorWithId<FailCallback>) {
+			fail(type, requestId);
+		} else if constexpr (ErrorWithoutId<FailCallback>) {
+			fail(type);
+		} else if constexpr (WithoutCallback<FailCallback>) {
+			fail();
+		} else {
+			t_bad_callback(fail);
+		}
+	});
+	return requestId;
+}
+
+template <typename DoneCallback, typename FailCallback>
+mtpRequestId SuggestMedia(
+		not_null<HistoryItem*> item,
+		const TextWithEntities &textWithEntities,
+		Data::WebPageDraft webpage,
+		SendOptions options,
+		DoneCallback &&done,
+		FailCallback &&fail,
+		std::optional<MTPInputMedia> inputMedia) {
+	Expects(options.suggest.exists);
+	Expects(!options.scheduled);
+
+	const auto session = &item->history()->session();
+	const auto api = &session->api();
+
+	const auto text = textWithEntities.text;
+	const auto sentEntities = EntitiesToMTP(
+		session,
+		textWithEntities.entities,
+		ConvertOption::SkipLocal);
+
+	const auto updateRecentStickers = inputMedia
+		? Api::HasAttachedStickers(*inputMedia)
+		: false;
+
+	const auto emptyFlag = MTPmessages_SendMedia::Flag(0);
+	auto replyTo = FullReplyTo{
+		.messageId = item->fullId(),
+		.monoforumPeerId = (item->history()->amMonoforumAdmin()
+			? item->sublistPeerId()
+			: PeerId()),
+	};
+	const auto flags = emptyFlag
+		| MTPmessages_SendMedia::Flag::f_reply_to
+		| MTPmessages_SendMedia::Flag::f_suggested_post
+		| (((!webpage.removed && !webpage.url.isEmpty() && webpage.invert)
+			|| options.invertCaption)
+			? MTPmessages_SendMedia::Flag::f_invert_media
+			: emptyFlag)
+		| (!sentEntities.v.isEmpty()
+			? MTPmessages_SendMedia::Flag::f_entities
+			: emptyFlag)
+		| (options.starsApproved
+			? MTPmessages_SendMedia::Flag::f_allow_paid_stars
+			: emptyFlag);
+	const auto randomId = base::RandomValue<uint64>();
+	return api->request(MTPmessages_SendMedia(
+		MTP_flags(flags),
+		item->history()->peer->input(),
+		ReplyToForMTP(item->history(), replyTo),
+		inputMedia.value_or(Data::WebPageForMTP(webpage, text.isEmpty())),
+		MTP_string(text),
+		MTP_long(randomId),
+		MTPReplyMarkup(),
+		sentEntities,
+		MTPint(), // schedule_date
+		MTPint(), // schedule_repeat_period
+		MTPInputPeer(), // send_as
+		MTPInputQuickReplyShortcut(), // quick_reply_shortcut
+		MTPlong(), // effect
+		MTP_long(options.starsApproved),
+		Api::SuggestToMTP(options.suggest)
+	)).done([=](
+			const MTPUpdates &result,
+			[[maybe_unused]] mtpRequestId requestId) {
+		const auto apply = [=] { api->applyUpdates(result); };
+
+		if constexpr (WithId<DoneCallback>) {
+			done(apply, requestId);
+		} else if constexpr (WithoutId<DoneCallback>) {
+			done(apply);
+		} else if constexpr (WithoutCallback<DoneCallback>) {
+			done();
+			apply();
+		} else {
+			t_bad_callback(done);
+		}
+
+		if (updateRecentStickers) {
+			api->requestSpecialStickersForce(false, false, true);
+		}
+	}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
+		if constexpr (ErrorWithId<FailCallback>) {
+			fail(error.type(), requestId);
+		} else if constexpr (ErrorWithoutId<FailCallback>) {
+			fail(error.type());
+		} else if constexpr (WithoutCallback<FailCallback>) {
+			fail();
+		} else {
+			t_bad_callback(fail);
+		}
+	}).send();
+}
+
+template <typename DoneCallback, typename FailCallback>
+mtpRequestId SuggestMessageOrMedia(
+		not_null<HistoryItem*> item,
+		const TextWithEntities &textWithEntities,
+		Data::WebPageDraft webpage,
+		SendOptions options,
+		DoneCallback &&done,
+		FailCallback &&fail,
+		std::optional<MTPInputMedia> inputMedia) {
+	const auto wasMedia = item->media();
+	if (!inputMedia && wasMedia && wasMedia->allowsEditCaption()) {
+		if (const auto photo = wasMedia->photo()) {
+			inputMedia = MTP_inputMediaPhoto(
+				MTP_flags(0),
+				photo->mtpInput(),
+				MTPint(), // ttl_seconds
+				MTPInputDocument()); // video
+		} else if (const auto document = wasMedia->document()) {
+			inputMedia = MTP_inputMediaDocument(
+				MTP_flags(0),
+				document->mtpInput(),
+				MTPInputPhoto(), // video_cover
+				MTPint(), // video_timestamp
+				MTPint(), // ttl_seconds
+				MTPstring()); // query
+		}
+	}
+	if (inputMedia) {
+		return SuggestMedia(
+			item,
+			textWithEntities,
+			webpage,
+			options,
+			std::move(done),
+			std::move(fail),
+			inputMedia);
+	}
+	return SuggestMessage(
+		item,
+		textWithEntities,
+		webpage,
+		options,
+		std::move(done),
+		std::move(fail));
+}
+
 template <typename DoneCallback, typename FailCallback>
 mtpRequestId EditMessage(
 		not_null<HistoryItem*> item,
@@ -54,6 +296,18 @@ mtpRequestId EditMessage(
 		DoneCallback &&done,
 		FailCallback &&fail,
 		std::optional<MTPInputMedia> inputMedia = std::nullopt) {
+	if (item->computeSuggestionActions()
+		== SuggestionActions::AcceptAndDecline) {
+		return SuggestMessageOrMedia(
+			item,
+			textWithEntities,
+			webpage,
+			options,
+			std::move(done),
+			std::move(fail),
+			inputMedia);
+	}
+
 	const auto session = &item->history()->session();
 	const auto api = &session->api();
 
@@ -68,49 +322,29 @@ mtpRequestId EditMessage(
 		? Api::HasAttachedStickers(*inputMedia)
 		: false;
 
-	const auto emptyFlag = MTPmessages_EditMessage::Flag(0);
-	const auto flags = emptyFlag
-	| ((!text.isEmpty() || media)
-		? MTPmessages_EditMessage::Flag::f_message
-		: emptyFlag)
-	| ((media && inputMedia.has_value())
-		? MTPmessages_EditMessage::Flag::f_media
-		: emptyFlag)
-	| (webpage.removed
-		? MTPmessages_EditMessage::Flag::f_no_webpage
-		: emptyFlag)
-	| ((!webpage.removed && !webpage.url.isEmpty())
-		? MTPmessages_EditMessage::Flag::f_media
-		: emptyFlag)
-	| (((!webpage.removed && !webpage.url.isEmpty() && webpage.invert)
-		|| options.invertCaption)
-		? MTPmessages_EditMessage::Flag::f_invert_media
-		: emptyFlag)
-	| (!sentEntities.v.isEmpty()
-		? MTPmessages_EditMessage::Flag::f_entities
-		: emptyFlag)
-	| (options.scheduled
-		? MTPmessages_EditMessage::Flag::f_schedule_date
-		: emptyFlag)
-	| (item->isBusinessShortcut()
-		? MTPmessages_EditMessage::Flag::f_quick_reply_shortcut_id
-		: emptyFlag);
-
-	const auto id = item->isScheduled()
-		? session->scheduledMessages().lookupId(item)
-		: item->isBusinessShortcut()
-		? session->data().shortcutMessages().lookupId(item)
-		: item->id;
+	const auto flags = ComputeEditMessageFlags(
+		item,
+		sentEntities,
+		webpage,
+		options,
+		(!text.isEmpty() || media),
+		((media && inputMedia.has_value())
+			|| (!webpage.removed && !webpage.url.isEmpty())),
+		false);
+
+	const auto id = EditMessageRequestId(item);
 	return api->request(MTPmessages_EditMessage(
 		MTP_flags(flags),
-		item->history()->peer->input,
+		item->history()->peer->input(),
 		MTP_int(id),
 		MTP_string(text),
 		inputMedia.value_or(Data::WebPageForMTP(webpage, text.isEmpty())),
 		MTPReplyMarkup(),
 		sentEntities,
 		MTP_int(options.scheduled),
-		MTP_int(item->shortcutId())
+		MTP_int(options.scheduleRepeatPeriod),
+		MTP_int(item->shortcutId()),
+		MTPInputRichMessage()
 	)).done([=](
 			const MTPUpdates &result,
 			[[maybe_unused]] mtpRequestId requestId) {
@@ -271,19 +505,28 @@ mtpRequestId EditTextMessage(
 				return MTP_inputMediaPhoto(
 					MTP_flags(flags),
 					photo->mtpInput(),
-					MTP_int(media->ttlSeconds()));
+					MTP_int(media->ttlSeconds()),
+					MTPInputDocument()); // video
 			};
 			takeFileReference = [=] { return photo->fileReference(); };
 		} else if (const auto document = media->document()) {
 			using Flag = MTPDinputMediaDocument::Flag;
+			const auto videoCover = media->videoCover();
+			const auto videoTimestamp = media->videoTimestamp();
 			const auto flags = Flag()
 				| (media->ttlSeconds() ? Flag::f_ttl_seconds : Flag())
-				| (spoilered ? Flag::f_spoiler : Flag());
+				| (spoilered ? Flag::f_spoiler : Flag())
+				| (videoTimestamp ? Flag::f_video_timestamp : Flag())
+				| (videoCover ? Flag::f_video_cover : Flag());
 			takeInputMedia = [=] {
 				return MTP_inputMediaDocument(
 					MTP_flags(flags),
 					document->mtpInput(),
+					(videoCover
+						? videoCover->mtpInput()
+						: MTPInputPhoto()),
 					MTP_int(media->ttlSeconds()),
+					MTP_int(videoTimestamp),
 					MTPstring()); // query
 			};
 			takeFileReference = [=] { return document->fileReference(); };
@@ -350,4 +593,86 @@ mtpRequestId EditTextMessage(
 		std::nullopt);
 }
 
+mtpRequestId EditRichMessage(
+		not_null<HistoryItem*> item,
+		Fn<std::optional<MTPInputRichMessage>()> richMessage,
+		SendOptions options,
+		Fn<void(mtpRequestId requestId)> done,
+		Fn<void(const QString &error, mtpRequestId requestId)> fail) {
+	const auto session = &item->history()->session();
+	const auto api = &session->api();
+	const auto sentEntities = MTPVector<MTPMessageEntity>();
+	const auto flags = ComputeEditMessageFlags(
+		item,
+		sentEntities,
+		Data::WebPageDraft(),
+		options,
+		false,
+		false,
+		true);
+	const auto id = EditMessageRequestId(item);
+	const auto origin = item->fullId();
+	const auto performRequest = [=](
+			const auto &repeatRequest,
+			mtpRequestId originalRequestId,
+			bool refreshed) -> mtpRequestId {
+		const auto current = richMessage ? richMessage() : std::nullopt;
+		const auto requestId = originalRequestId ? originalRequestId : 0;
+		if (!current) {
+			if (fail) {
+				fail(QString(), requestId);
+			}
+			return requestId;
+		}
+		return api->request(MTPmessages_EditMessage(
+			MTP_flags(flags),
+			item->history()->peer->input(),
+			MTP_int(id),
+			MTPstring(),
+			MTPInputMedia(),
+			MTPReplyMarkup(),
+			sentEntities,
+			MTP_int(options.scheduled),
+			MTP_int(options.scheduleRepeatPeriod),
+			MTP_int(item->shortcutId()),
+			*current
+		)).done([=](const MTPUpdates &result, mtpRequestId requestId) {
+			api->applyUpdates(result);
+			if (done) {
+				done(originalRequestId ? originalRequestId : requestId);
+			}
+		}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
+			if (!refreshed && error.type().startsWith(u"FILE_REFERENCE_"_q)) {
+				api->refreshFileReference(origin, [=](const auto &) {
+					repeatRequest(
+						repeatRequest,
+						originalRequestId ? originalRequestId : requestId,
+						true);
+				});
+			} else if (fail) {
+				fail(error.type(), originalRequestId ? originalRequestId : requestId);
+			}
+		}).send();
+	};
+	return performRequest(performRequest, 0, false);
+}
+
+void EditTodoList(
+		not_null<HistoryItem*> item,
+		const TodoListData &data,
+		SendOptions options,
+		Fn<void(mtpRequestId requestId)> done,
+		Fn<void(const QString &error, mtpRequestId requestId)> fail) {
+	const auto callback = [=](Fn<void()> applyUpdates, mtpRequestId id) {
+		applyUpdates();
+		done(id);
+	};
+	EditMessage(
+		item,
+		options,
+		callback,
+		fail,
+		MTP_inputMediaTodo(TodoListDataToMTP(&data)));
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_editing.h b/Telegram/SourceFiles/api/api_editing.h
index 630e1cd8d5a408..b551acab41bd20 100644
--- a/Telegram/SourceFiles/api/api_editing.h
+++ b/Telegram/SourceFiles/api/api_editing.h
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include <optional>
+
 class HistoryItem;
 
 namespace Data {
@@ -57,5 +59,18 @@ mtpRequestId EditTextMessage(
 	Fn<void(mtpRequestId requestId)> done,
 	Fn<void(const QString &error, mtpRequestId requestId)> fail,
 	bool spoilered);
+mtpRequestId EditRichMessage(
+	not_null<HistoryItem*> item,
+	Fn<std::optional<MTPInputRichMessage>()> richMessage,
+	SendOptions options,
+	Fn<void(mtpRequestId requestId)> done,
+	Fn<void(const QString &error, mtpRequestId requestId)> fail);
+
+void EditTodoList(
+	not_null<HistoryItem*> item,
+	const TodoListData &data,
+	SendOptions options,
+	Fn<void(mtpRequestId requestId)> done,
+	Fn<void(const QString &error, mtpRequestId requestId)> fail);
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_global_privacy.cpp b/Telegram/SourceFiles/api/api_global_privacy.cpp
index 83ad8d15657d25..82c35e5a7383d7 100644
--- a/Telegram/SourceFiles/api/api_global_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_global_privacy.cpp
@@ -8,11 +8,39 @@ For license and copyright information please follow this link:
 #include "api/api_global_privacy.h"
 
 #include "apiwrap.h"
+#include "data/components/promo_suggestions.h"
+#include "data/data_user.h"
 #include "main/main_session.h"
 #include "main/main_app_config.h"
 
 namespace Api {
 
+PeerId ParsePaidReactionShownPeer(
+		not_null<Main::Session*> session,
+		const MTPPaidReactionPrivacy &value) {
+	return value.match([&](const MTPDpaidReactionPrivacyDefault &) {
+		return session->userPeerId();
+	}, [](const MTPDpaidReactionPrivacyAnonymous &) {
+		return PeerId();
+	}, [&](const MTPDpaidReactionPrivacyPeer &data) {
+		return data.vpeer().match([&](const MTPDinputPeerSelf &) {
+			return session->userPeerId();
+		}, [](const MTPDinputPeerUser &data) {
+			return peerFromUser(data.vuser_id());
+		}, [](const MTPDinputPeerChat &data) {
+			return peerFromChat(data.vchat_id());
+		}, [](const MTPDinputPeerChannel &data) {
+			return peerFromChannel(data.vchannel_id());
+		}, [](const MTPDinputPeerUserFromMessage &data) -> PeerId {
+			Unexpected("From message peer in ParsePaidReactionShownPeer.");
+		}, [](const MTPDinputPeerChannelFromMessage &data) -> PeerId {
+			Unexpected("From message peer in ParsePaidReactionShownPeer.");
+		}, [](const MTPDinputPeerEmpty &) -> PeerId {
+			Unexpected("Empty peer in ParsePaidReactionShownPeer.");
+		});
+	});
+}
+
 GlobalPrivacy::GlobalPrivacy(not_null<ApiWrap*> api)
 : _session(&api->session())
 , _api(&api->instance()) {
@@ -40,7 +68,7 @@ void GlobalPrivacy::reload(Fn<void()> callback) {
 	}).send();
 
 	_session->appConfig().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_showArchiveAndMute = _session->appConfig().get<bool>(
 			u"autoarchive_setting_available"_q,
 			false);
@@ -74,13 +102,11 @@ rpl::producer<bool> GlobalPrivacy::showArchiveAndMute() const {
 }
 
 rpl::producer<> GlobalPrivacy::suggestArchiveAndMute() const {
-	return _session->appConfig().suggestionRequested(
-		u"AUTOARCHIVE_POPULAR"_q);
+	return _session->promoSuggestions().requested(u"AUTOARCHIVE_POPULAR"_q);
 }
 
 void GlobalPrivacy::dismissArchiveAndMuteSuggestion() {
-	_session->appConfig().dismissSuggestion(
-		u"AUTOARCHIVE_POPULAR"_q);
+	_session->promoSuggestions().dismiss(u"AUTOARCHIVE_POPULAR"_q);
 }
 
 void GlobalPrivacy::updateHideReadTime(bool hide) {
@@ -88,7 +114,9 @@ void GlobalPrivacy::updateHideReadTime(bool hide) {
 		archiveAndMuteCurrent(),
 		unarchiveOnNewMessageCurrent(),
 		hide,
-		newRequirePremiumCurrent());
+		newRequirePremiumCurrent(),
+		newChargeStarsCurrent(),
+		disallowedGiftTypesCurrent());
 }
 
 bool GlobalPrivacy::hideReadTimeCurrent() const {
@@ -99,43 +127,74 @@ rpl::producer<bool> GlobalPrivacy::hideReadTime() const {
 	return _hideReadTime.value();
 }
 
-void GlobalPrivacy::updateNewRequirePremium(bool value) {
+bool GlobalPrivacy::newRequirePremiumCurrent() const {
+	return _newRequirePremium.current();
+}
+
+rpl::producer<bool> GlobalPrivacy::newRequirePremium() const {
+	return _newRequirePremium.value();
+}
+
+int GlobalPrivacy::newChargeStarsCurrent() const {
+	return _newChargeStars.current();
+}
+
+rpl::producer<int> GlobalPrivacy::newChargeStars() const {
+	return _newChargeStars.value();
+}
+
+void GlobalPrivacy::updateMessagesPrivacy(
+		bool requirePremium,
+		int chargeStars) {
 	update(
 		archiveAndMuteCurrent(),
 		unarchiveOnNewMessageCurrent(),
 		hideReadTimeCurrent(),
-		value);
+		requirePremium,
+		chargeStars,
+		disallowedGiftTypesCurrent());
 }
 
-bool GlobalPrivacy::newRequirePremiumCurrent() const {
-	return _newRequirePremium.current();
+DisallowedGiftTypes GlobalPrivacy::disallowedGiftTypesCurrent() const {
+	return _disallowedGiftTypes.current();
 }
 
-rpl::producer<bool> GlobalPrivacy::newRequirePremium() const {
-	return _newRequirePremium.value();
+auto GlobalPrivacy::disallowedGiftTypes() const
+		-> rpl::producer<DisallowedGiftTypes> {
+	return _disallowedGiftTypes.value();
+}
+
+void GlobalPrivacy::updateDisallowedGiftTypes(DisallowedGiftTypes types) {
+	update(
+		archiveAndMuteCurrent(),
+		unarchiveOnNewMessageCurrent(),
+		hideReadTimeCurrent(),
+		newRequirePremiumCurrent(),
+		newChargeStarsCurrent(),
+		types);
 }
 
-void GlobalPrivacy::loadPaidReactionAnonymous() {
-	if (_paidReactionAnonymousLoaded) {
+void GlobalPrivacy::loadPaidReactionShownPeer() {
+	if (_paidReactionShownPeerLoaded) {
 		return;
 	}
-	_paidReactionAnonymousLoaded = true;
+	_paidReactionShownPeerLoaded = true;
 	_api.request(MTPmessages_GetPaidReactionPrivacy(
 	)).done([=](const MTPUpdates &result) {
 		_session->api().applyUpdates(result);
 	}).send();
 }
 
-void GlobalPrivacy::updatePaidReactionAnonymous(bool value) {
-	_paidReactionAnonymous = value;
+void GlobalPrivacy::updatePaidReactionShownPeer(PeerId shownPeer) {
+	_paidReactionShownPeer = shownPeer;
 }
 
-bool GlobalPrivacy::paidReactionAnonymousCurrent() const {
-	return _paidReactionAnonymous.current();
+PeerId GlobalPrivacy::paidReactionShownPeerCurrent() const {
+	return _paidReactionShownPeer.current();
 }
 
-rpl::producer<bool> GlobalPrivacy::paidReactionAnonymous() const {
-	return _paidReactionAnonymous.value();
+rpl::producer<PeerId> GlobalPrivacy::paidReactionShownPeer() const {
+	return _paidReactionShownPeer.value();
 }
 
 void GlobalPrivacy::updateArchiveAndMute(bool value) {
@@ -143,7 +202,9 @@ void GlobalPrivacy::updateArchiveAndMute(bool value) {
 		value,
 		unarchiveOnNewMessageCurrent(),
 		hideReadTimeCurrent(),
-		newRequirePremiumCurrent());
+		newRequirePremiumCurrent(),
+		newChargeStarsCurrent(),
+		disallowedGiftTypesCurrent());
 }
 
 void GlobalPrivacy::updateUnarchiveOnNewMessage(
@@ -152,19 +213,26 @@ void GlobalPrivacy::updateUnarchiveOnNewMessage(
 		archiveAndMuteCurrent(),
 		value,
 		hideReadTimeCurrent(),
-		newRequirePremiumCurrent());
+		newRequirePremiumCurrent(),
+		newChargeStarsCurrent(),
+		disallowedGiftTypesCurrent());
 }
 
 void GlobalPrivacy::update(
 		bool archiveAndMute,
 		UnarchiveOnNewMessage unarchiveOnNewMessage,
 		bool hideReadTime,
-		bool newRequirePremium) {
+		bool newRequirePremium,
+		int newChargeStars,
+		DisallowedGiftTypes disallowedGiftTypes) {
 	using Flag = MTPDglobalPrivacySettings::Flag;
+	using DisallowedFlag = MTPDdisallowedGiftsSettings::Flag;
 
 	_api.request(_requestId).cancel();
 	const auto newRequirePremiumAllowed = _session->premium()
 		|| _session->appConfig().newRequirePremiumFree();
+	const auto showGiftIcon
+		= (disallowedGiftTypes & DisallowedGiftType::SendHide);
 	const auto flags = Flag()
 		| (archiveAndMute
 			? Flag::f_archive_and_mute_new_noncontact_peers
@@ -178,35 +246,96 @@ void GlobalPrivacy::update(
 		| (hideReadTime ? Flag::f_hide_read_marks : Flag())
 		| ((newRequirePremium && newRequirePremiumAllowed)
 			? Flag::f_new_noncontact_peers_require_premium
-			: Flag());
+			: Flag())
+		| Flag::f_noncontact_peers_paid_stars
+		| (showGiftIcon ? Flag::f_display_gifts_button : Flag())
+		| Flag::f_disallowed_gifts;
+	const auto disallowedFlags = DisallowedFlag()
+		| ((disallowedGiftTypes & DisallowedGiftType::Premium)
+			? DisallowedFlag::f_disallow_premium_gifts
+			: DisallowedFlag())
+		| ((disallowedGiftTypes & DisallowedGiftType::Unlimited)
+			? DisallowedFlag::f_disallow_unlimited_stargifts
+			: DisallowedFlag())
+		| ((disallowedGiftTypes & DisallowedGiftType::Limited)
+			? DisallowedFlag::f_disallow_limited_stargifts
+			: DisallowedFlag())
+		| ((disallowedGiftTypes & DisallowedGiftType::Unique)
+			? DisallowedFlag::f_disallow_unique_stargifts
+			: DisallowedFlag())
+		| ((disallowedGiftTypes & DisallowedGiftType::FromChannels)
+			? DisallowedFlag::f_disallow_stargifts_from_channels
+			: DisallowedFlag());
+	const auto typesWas = _disallowedGiftTypes.current();
+	const auto typesChanged = (typesWas != disallowedGiftTypes);
 	_requestId = _api.request(MTPaccount_SetGlobalPrivacySettings(
-		MTP_globalPrivacySettings(MTP_flags(flags))
+		MTP_globalPrivacySettings(
+			MTP_flags(flags),
+			MTP_long(newChargeStars),
+			MTP_disallowedGiftsSettings(MTP_flags(disallowedFlags)))
 	)).done([=](const MTPGlobalPrivacySettings &result) {
 		_requestId = 0;
 		apply(result);
+		if (typesChanged) {
+			_session->user()->updateFullForced();
+		}
 	}).fail([=](const MTP::Error &error) {
 		_requestId = 0;
 		if (error.type() == u"PREMIUM_ACCOUNT_REQUIRED"_q) {
-			update(archiveAndMute, unarchiveOnNewMessage, hideReadTime, {});
+			update(
+				archiveAndMute,
+				unarchiveOnNewMessage,
+				hideReadTime,
+				false,
+				0,
+				DisallowedGiftTypes());
 		}
 	}).send();
 	_archiveAndMute = archiveAndMute;
 	_unarchiveOnNewMessage = unarchiveOnNewMessage;
 	_hideReadTime = hideReadTime;
 	_newRequirePremium = newRequirePremium;
+	_newChargeStars = newChargeStars;
+	_disallowedGiftTypes = disallowedGiftTypes;
 }
 
-void GlobalPrivacy::apply(const MTPGlobalPrivacySettings &data) {
-	data.match([&](const MTPDglobalPrivacySettings &data) {
-		_archiveAndMute = data.is_archive_and_mute_new_noncontact_peers();
-		_unarchiveOnNewMessage = data.is_keep_archived_unmuted()
-			? UnarchiveOnNewMessage::None
-			: data.is_keep_archived_folders()
-			? UnarchiveOnNewMessage::NotInFoldersUnmuted
-			: UnarchiveOnNewMessage::AnyUnmuted;
-		_hideReadTime = data.is_hide_read_marks();
-		_newRequirePremium = data.is_new_noncontact_peers_require_premium();
-	});
+void GlobalPrivacy::apply(const MTPGlobalPrivacySettings &settings) {
+	const auto &data = settings.data();
+	_archiveAndMute = data.is_archive_and_mute_new_noncontact_peers();
+	_unarchiveOnNewMessage = data.is_keep_archived_unmuted()
+		? UnarchiveOnNewMessage::None
+		: data.is_keep_archived_folders()
+		? UnarchiveOnNewMessage::NotInFoldersUnmuted
+		: UnarchiveOnNewMessage::AnyUnmuted;
+	_hideReadTime = data.is_hide_read_marks();
+	_newRequirePremium = data.is_new_noncontact_peers_require_premium();
+	_newChargeStars = data.vnoncontact_peers_paid_stars().value_or_empty();
+	if (const auto gifts = data.vdisallowed_gifts()) {
+		const auto &disallow = gifts->data();
+		_disallowedGiftTypes = DisallowedGiftType()
+			| (disallow.is_disallow_unlimited_stargifts()
+				? DisallowedGiftType::Unlimited
+				: DisallowedGiftType())
+			| (disallow.is_disallow_limited_stargifts()
+				? DisallowedGiftType::Limited
+				: DisallowedGiftType())
+			| (disallow.is_disallow_unique_stargifts()
+				? DisallowedGiftType::Unique
+				: DisallowedGiftType())
+			| (disallow.is_disallow_premium_gifts()
+				? DisallowedGiftType::Premium
+				: DisallowedGiftType())
+			| (disallow.is_disallow_stargifts_from_channels()
+				? DisallowedGiftType::FromChannels
+				: DisallowedGiftType())
+			| (data.is_display_gifts_button()
+				? DisallowedGiftType::SendHide
+				: DisallowedGiftType());
+	} else {
+		_disallowedGiftTypes = data.is_display_gifts_button()
+			? DisallowedGiftType::SendHide
+			: DisallowedGiftType();
+	}
 }
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_global_privacy.h b/Telegram/SourceFiles/api/api_global_privacy.h
index aa7bb28fe3050a..dcd86edddc618e 100644
--- a/Telegram/SourceFiles/api/api_global_privacy.h
+++ b/Telegram/SourceFiles/api/api_global_privacy.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/flags.h"
 #include "mtproto/sender.h"
 
 class ApiWrap;
@@ -23,6 +24,22 @@ enum class UnarchiveOnNewMessage {
 	AnyUnmuted,
 };
 
+enum class DisallowedGiftType : uchar {
+	Limited      = 0x01,
+	Unlimited    = 0x02,
+	Unique       = 0x04,
+	FromChannels = 0x08,
+	Premium      = 0x10,
+	SendHide     = 0x20,
+};
+inline constexpr bool is_flag_type(DisallowedGiftType) { return true; }
+
+using DisallowedGiftTypes = base::flags<DisallowedGiftType>;
+
+[[nodiscard]] PeerId ParsePaidReactionShownPeer(
+	not_null<Main::Session*> session,
+	const MTPPaidReactionPrivacy &value);
+
 class GlobalPrivacy final {
 public:
 	explicit GlobalPrivacy(not_null<ApiWrap*> api);
@@ -45,23 +62,34 @@ class GlobalPrivacy final {
 	[[nodiscard]] bool hideReadTimeCurrent() const;
 	[[nodiscard]] rpl::producer<bool> hideReadTime() const;
 
-	void updateNewRequirePremium(bool value);
 	[[nodiscard]] bool newRequirePremiumCurrent() const;
 	[[nodiscard]] rpl::producer<bool> newRequirePremium() const;
 
-	void loadPaidReactionAnonymous();
-	void updatePaidReactionAnonymous(bool value);
-	[[nodiscard]] bool paidReactionAnonymousCurrent() const;
-	[[nodiscard]] rpl::producer<bool> paidReactionAnonymous() const;
+	[[nodiscard]] int newChargeStarsCurrent() const;
+	[[nodiscard]] rpl::producer<int> newChargeStars() const;
+
+	void updateMessagesPrivacy(bool requirePremium, int chargeStars);
+
+	[[nodiscard]] DisallowedGiftTypes disallowedGiftTypesCurrent() const;
+	[[nodiscard]] auto disallowedGiftTypes() const
+		-> rpl::producer<DisallowedGiftTypes>;
+	void updateDisallowedGiftTypes(DisallowedGiftTypes types);
+
+	void loadPaidReactionShownPeer();
+	void updatePaidReactionShownPeer(PeerId shownPeer);
+	[[nodiscard]] PeerId paidReactionShownPeerCurrent() const;
+	[[nodiscard]] rpl::producer<PeerId> paidReactionShownPeer() const;
 
 private:
-	void apply(const MTPGlobalPrivacySettings &data);
+	void apply(const MTPGlobalPrivacySettings &settings);
 
 	void update(
 		bool archiveAndMute,
 		UnarchiveOnNewMessage unarchiveOnNewMessage,
 		bool hideReadTime,
-		bool newRequirePremium);
+		bool newRequirePremium,
+		int newChargeStars,
+		DisallowedGiftTypes disallowedGiftTypes);
 
 	const not_null<Main::Session*> _session;
 	MTP::Sender _api;
@@ -72,9 +100,11 @@ class GlobalPrivacy final {
 	rpl::variable<bool> _showArchiveAndMute = false;
 	rpl::variable<bool> _hideReadTime = false;
 	rpl::variable<bool> _newRequirePremium = false;
-	rpl::variable<bool> _paidReactionAnonymous = false;
+	rpl::variable<int> _newChargeStars = 0;
+	rpl::variable<DisallowedGiftTypes> _disallowedGiftTypes;
+	rpl::variable<PeerId> _paidReactionShownPeer = false;
 	std::vector<Fn<void()>> _callbacks;
-	bool _paidReactionAnonymousLoaded = false;
+	bool _paidReactionShownPeerLoaded = false;
 
 };
 
diff --git a/Telegram/SourceFiles/api/api_invite_links.cpp b/Telegram/SourceFiles/api/api_invite_links.cpp
index c896561032b885..7aceb74395bffb 100644
--- a/Telegram/SourceFiles/api/api_invite_links.cpp
+++ b/Telegram/SourceFiles/api/api_invite_links.cpp
@@ -101,7 +101,7 @@ void InviteLinks::performCreate(
 				: Flag(0))
 			| (requestApproval ? Flag::f_request_needed : Flag(0))
 			| (args.subscription ? Flag::f_subscription_pricing : Flag(0))),
-		args.peer->input,
+		args.peer->input(),
 		MTP_int(args.expireDate),
 		MTP_int(args.usageLimit),
 		MTP_string(args.label),
@@ -270,7 +270,7 @@ void InviteLinks::performEdit(
 			: Flag(0));
 	_api->request(MTPmessages_EditExportedChatInvite(
 		MTP_flags(editOnlyTitle ? Flag::f_title : flags),
-		peer->input,
+		peer->input(),
 		MTP_string(link),
 		MTP_int(expireDate),
 		MTP_int(usageLimit),
@@ -365,7 +365,7 @@ void InviteLinks::destroy(
 		callbacks.push_back(std::move(done));
 	}
 	_api->request(MTPmessages_DeleteExportedChatInvite(
-		peer->input,
+		peer->input(),
 		MTP_string(link)
 	)).done([=] {
 		const auto callbacks = _deleteCallbacks.take(key);
@@ -400,8 +400,8 @@ void InviteLinks::destroyAllRevoked(
 		callbacks.push_back(std::move(done));
 	}
 	_api->request(MTPmessages_DeleteRevokedExportedChatInvites(
-		peer->input,
-		admin->inputUser
+		peer->input(),
+		admin->inputUser()
 	)).done([=] {
 		if (const auto callbacks = _deleteRevokedCallbacks.take(peer)) {
 			for (const auto &callback : *callbacks) {
@@ -418,7 +418,7 @@ void InviteLinks::requestMyLinks(not_null<PeerData*> peer) {
 	}
 	const auto requestId = _api->request(MTPmessages_GetExportedChatInvites(
 		MTP_flags(0),
-		peer->input,
+		peer->input(),
 		MTP_inputUserSelf(),
 		MTPint(), // offset_date
 		MTPstring(), // offset_link
@@ -471,8 +471,8 @@ void InviteLinks::processRequest(
 	using Flag = MTPmessages_HideChatJoinRequest::Flag;
 	_api->request(MTPmessages_HideChatJoinRequest(
 		MTP_flags(approved ? Flag::f_approved : Flag(0)),
-		peer->input,
-		user->inputUser
+		peer->input(),
+		user->inputUser()
 	)).done([=](const MTPUpdates &result) {
 		if (const auto chat = peer->asChat()) {
 			if (chat->count > 0) {
@@ -601,7 +601,7 @@ void InviteLinks::requestJoinedFirstSlice(LinkKey key) {
 	}
 	const auto requestId = _api->request(MTPmessages_GetChatInviteImporters(
 		MTP_flags(MTPmessages_GetChatInviteImporters::Flag::f_link),
-		key.peer->input,
+		key.peer->input(),
 		MTP_string(key.link),
 		MTPstring(), // q
 		MTP_int(0), // offset_date
@@ -780,8 +780,8 @@ void InviteLinks::requestMoreLinks(
 	_api->request(MTPmessages_GetExportedChatInvites(
 		MTP_flags(Flag::f_offset_link
 			| (revoked ? Flag::f_revoked : Flag(0))),
-		peer->input,
-		admin->inputUser,
+		peer->input(),
+		admin->inputUser(),
 		MTP_int(lastDate),
 		MTP_string(lastLink),
 		MTP_int(kPerPage)
diff --git a/Telegram/SourceFiles/api/api_media.cpp b/Telegram/SourceFiles/api/api_media.cpp
index 22fc376312a9f8..582dc3e9b8e358 100644
--- a/Telegram/SourceFiles/api/api_media.cpp
+++ b/Telegram/SourceFiles/api/api_media.cpp
@@ -93,7 +93,8 @@ MTPInputMedia PrepareUploadedPhoto(
 		info.file,
 		MTP_vector<MTPInputDocument>(
 			ranges::to<QVector<MTPInputDocument>>(info.attachedStickers)),
-		MTP_int(ttlSeconds));
+		MTP_int(ttlSeconds),
+		MTPInputDocument()); // video
 }
 
 MTPInputMedia PrepareUploadedDocument(
@@ -110,8 +111,10 @@ MTPInputMedia PrepareUploadedDocument(
 	const auto flags = (spoiler ? Flag::f_spoiler : Flag())
 		| (info.thumb ? Flag::f_thumb : Flag())
 		| (item->groupId() ? Flag::f_nosound_video : Flag())
+		| (info.forceFile ? Flag::f_force_file : Flag())
 		| (info.attachedStickers.empty() ? Flag::f_stickers : Flag())
-		| (ttlSeconds ? Flag::f_ttl_seconds : Flag());
+		| (ttlSeconds ? Flag::f_ttl_seconds : Flag())
+		| (info.videoCover ? Flag::f_video_cover : Flag());
 	const auto document = item->media()->document();
 	return MTP_inputMediaUploadedDocument(
 		MTP_flags(flags),
@@ -121,6 +124,8 @@ MTPInputMedia PrepareUploadedDocument(
 		ComposeSendingDocumentAttributes(document),
 		MTP_vector<MTPInputDocument>(
 			ranges::to<QVector<MTPInputDocument>>(info.attachedStickers)),
+		info.videoCover.value_or(MTPInputPhoto()),
+		MTP_int(0), // video_timestamp
 		MTP_int(ttlSeconds));
 }
 
diff --git a/Telegram/SourceFiles/api/api_messages_search.cpp b/Telegram/SourceFiles/api/api_messages_search.cpp
index 4fbcaebf018901..ac348199bc358e 100644
--- a/Telegram/SourceFiles/api/api_messages_search.cpp
+++ b/Telegram/SourceFiles/api/api_messages_search.cpp
@@ -28,8 +28,8 @@ constexpr auto kSearchPerPage = 50;
 	auto result = MessageIdsList();
 	for (const auto &message : messages) {
 		const auto peerId = PeerFromMessage(message);
-		if (const auto peer = data->peerLoaded(peerId)) {
-			if (const auto lastDate = DateFromMessage(message)) {
+		if (data->peerLoaded(peerId)) {
+			if (DateFromMessage(message)) {
 				const auto item = data->addNewMessage(
 					message,
 					MessageFlags(),
@@ -58,9 +58,23 @@ constexpr auto kSearchPerPage = 50;
 			result += u"emoji"_q + tag.emoji();
 		}
 	}
+	switch (request.filter) {
+	case SearchFilter::NoFilter: break;
+	case SearchFilter::Pinned: result += u"\npinned"_q; break;
+	}
 	return result;
 }
 
+[[nodiscard]] MTPMessagesFilter PrepareFilter(SearchFilter filter) {
+	switch (filter) {
+	case SearchFilter::Pinned:
+		return MTP_inputMessagesFilterPinned();
+	case SearchFilter::NoFilter:
+		return MTP_inputMessagesFilterEmpty();
+	}
+	return MTP_inputMessagesFilterEmpty();
+}
+
 } // namespace
 
 MessagesSearch::MessagesSearch(not_null<History*> history)
@@ -103,16 +117,17 @@ void MessagesSearch::searchRequest() {
 		_requestId = _history->session().api().request(MTPmessages_Search(
 			MTP_flags((fromPeer ? Flag::f_from_id : Flag())
 				| (savedPeer ? Flag::f_saved_peer_id : Flag())
+				| (_request.topMsgId ? Flag::f_top_msg_id : Flag())
 				| (_request.tags.empty() ? Flag() : Flag::f_saved_reaction)),
-			_history->peer->input,
+			_history->peer->input(),
 			MTP_string(_request.query),
-			(fromPeer ? fromPeer->input : MTP_inputPeerEmpty()),
-			(savedPeer ? savedPeer->input : MTP_inputPeerEmpty()),
+			(fromPeer ? fromPeer->input() : MTP_inputPeerEmpty()),
+			(savedPeer ? savedPeer->input() : MTP_inputPeerEmpty()),
 			MTP_vector_from_range(_request.tags | ranges::views::transform(
 				Data::ReactionToMTP
 			)),
-			MTPint(), // top_msg_id
-			MTP_inputMessagesFilterEmpty(),
+			MTP_int(_request.topMsgId), // top_msg_id
+			PrepareFilter(_request.filter),
 			MTP_int(0), // min_date
 			MTP_int(0), // max_date
 			MTP_int(_offsetId), // offset_id
@@ -158,6 +173,7 @@ void MessagesSearch::searchReceived(
 			// Don't apply cached data!
 			owner.processUsers(data.vusers());
 			owner.processChats(data.vchats());
+			_history->peer->processTopics(data.vtopics());
 		}
 		auto items = HistoryItemsFromTL(&owner, data.vmessages().v);
 		const auto total = int(data.vmessages().v.size());
@@ -167,6 +183,7 @@ void MessagesSearch::searchReceived(
 			// Don't apply cached data!
 			owner.processUsers(data.vusers());
 			owner.processChats(data.vchats());
+			_history->peer->processTopics(data.vtopics());
 		}
 		auto items = HistoryItemsFromTL(&owner, data.vmessages().v);
 		// data.vnext_rate() is used only in global search.
@@ -177,17 +194,14 @@ void MessagesSearch::searchReceived(
 			// Don't apply cached data!
 			owner.processUsers(data.vusers());
 			owner.processChats(data.vchats());
-		}
-		if (const auto channel = _history->peer->asChannel()) {
-			channel->ptsReceived(data.vpts().v);
-			if (_requestId != 0) {
-				// Don't apply cached data!
-				channel->processTopics(data.vtopics());
+			if (const auto channel = _history->peer->asChannel()) {
+				channel->ptsReceived(data.vpts().v);
+			} else {
+				LOG(("API Error: "
+					"received messages.channelMessages when no channel "
+					"was passed!"));
 			}
-		} else {
-			LOG(("API Error: "
-				"received messages.channelMessages when no channel "
-				"was passed!"));
+			_history->peer->processTopics(data.vtopics());
 		}
 		auto items = HistoryItemsFromTL(&owner, data.vmessages().v);
 		const auto total = int(data.vcount().v);
diff --git a/Telegram/SourceFiles/api/api_messages_search.h b/Telegram/SourceFiles/api/api_messages_search.h
index 76046aaa91aacd..99b222b703a6d0 100644
--- a/Telegram/SourceFiles/api/api_messages_search.h
+++ b/Telegram/SourceFiles/api/api_messages_search.h
@@ -20,6 +20,11 @@ struct ReactionId;
 
 namespace Api {
 
+enum class SearchFilter {
+	NoFilter,
+	Pinned,
+};
+
 struct FoundMessages {
 	int total = -1;
 	MessageIdsList messages;
@@ -32,6 +37,8 @@ class MessagesSearch final {
 		QString query;
 		PeerData *from = nullptr;
 		std::vector<Data::ReactionId> tags;
+		MsgId topMsgId;
+		SearchFilter filter = SearchFilter::NoFilter;
 
 		friend inline bool operator==(
 			const Request &,
diff --git a/Telegram/SourceFiles/api/api_messages_search_merged.cpp b/Telegram/SourceFiles/api/api_messages_search_merged.cpp
index 8451232f6089d8..49bf50ce073130 100644
--- a/Telegram/SourceFiles/api/api_messages_search_merged.cpp
+++ b/Telegram/SourceFiles/api/api_messages_search_merged.cpp
@@ -36,7 +36,7 @@ MessagesSearchMerged::MessagesSearchMerged(not_null<History*> history)
 	};
 
 	_apiSearch.messagesFounds(
-	) | rpl::start_with_next([=](const FoundMessages &data) {
+	) | rpl::on_next([=](const FoundMessages &data) {
 		if (data.nextToken == _concatedFound.nextToken) {
 			addFound(data);
 			checkFull(data);
@@ -50,7 +50,7 @@ MessagesSearchMerged::MessagesSearchMerged(not_null<History*> history)
 
 	if (_migratedSearch) {
 		_migratedSearch->messagesFounds(
-		) | rpl::start_with_next([=](const FoundMessages &data) {
+		) | rpl::on_next([=](const FoundMessages &data) {
 			if (_isFull) {
 				addFound(data);
 			}
@@ -64,6 +64,12 @@ MessagesSearchMerged::MessagesSearchMerged(not_null<History*> history)
 	}
 }
 
+void MessagesSearchMerged::disableMigrated() {
+	_migratedSearch = std::nullopt;
+	_waitingForTotal = false;
+	_isFull = false;
+}
+
 void MessagesSearchMerged::addFound(const FoundMessages &data) {
 	for (const auto &message : data.messages) {
 		_concatedFound.messages.push_back(message);
@@ -74,14 +80,22 @@ const FoundMessages &MessagesSearchMerged::messages() const {
 	return _concatedFound;
 }
 
+const MessagesSearch::Request &MessagesSearchMerged::request() const {
+	return _request;
+}
+
 void MessagesSearchMerged::clear() {
 	_concatedFound = {};
 	_migratedFirstFound = {};
+	_waitingForTotal = false;
+	_isFull = false;
 }
 
 void MessagesSearchMerged::search(const Request &search) {
+	_request = search;
+	_isFull = false;
+	_waitingForTotal = (_migratedSearch != std::nullopt);
 	if (_migratedSearch) {
-		_waitingForTotal = true;
 		_migratedSearch->searchMessages(search);
 	}
 	_apiSearch.searchMessages(search);
diff --git a/Telegram/SourceFiles/api/api_messages_search_merged.h b/Telegram/SourceFiles/api/api_messages_search_merged.h
index d4c6fbc1c83cf6..1a949c6ed4d0b6 100644
--- a/Telegram/SourceFiles/api/api_messages_search_merged.h
+++ b/Telegram/SourceFiles/api/api_messages_search_merged.h
@@ -29,8 +29,10 @@ class MessagesSearchMerged final {
 	void clear();
 	void search(const Request &search);
 	void searchMore();
+	void disableMigrated();
 
 	[[nodiscard]] const FoundMessages &messages() const;
+	[[nodiscard]] const Request &request() const;
 
 	[[nodiscard]] rpl::producer<> newFounds() const;
 	[[nodiscard]] rpl::producer<> nextFounds() const;
@@ -39,6 +41,7 @@ class MessagesSearchMerged final {
 	void addFound(const FoundMessages &data);
 
 	MessagesSearch _apiSearch;
+	Request _request;
 
 	std::optional<MessagesSearch> _migratedSearch;
 	FoundMessages _migratedFirstFound;
diff --git a/Telegram/SourceFiles/api/api_peer_colors.cpp b/Telegram/SourceFiles/api/api_peer_colors.cpp
index 5f3fe12d202bef..330863d90d9acd 100644
--- a/Telegram/SourceFiles/api/api_peer_colors.cpp
+++ b/Telegram/SourceFiles/api/api_peer_colors.cpp
@@ -9,7 +9,9 @@ For license and copyright information please follow this link:
 
 #include "apiwrap.h"
 #include "data/data_peer.h"
+#include "window/themes/window_theme.h"
 #include "ui/chat/chat_style.h"
+#include "ui/color_int_conversion.h"
 
 namespace Api {
 namespace {
@@ -20,8 +22,9 @@ constexpr auto kRequestEach = 3600 * crl::time(1000);
 
 PeerColors::PeerColors(not_null<ApiWrap*> api)
 : _api(&api->instance())
-, _timer([=] { request(); }) {
+, _timer([=] { request(); requestProfile(); }) {
 	request();
+	requestProfile();
 	_timer.callEach(kRequestEach);
 }
 
@@ -45,6 +48,24 @@ void PeerColors::request() {
 	}).send();
 }
 
+void PeerColors::requestProfile() {
+	if (_profileRequestId) {
+		return;
+	}
+	_profileRequestId = _api.request(MTPhelp_GetPeerProfileColors(
+		MTP_int(_profileHash)
+	)).done([=](const MTPhelp_PeerColors &result) {
+		_profileRequestId = 0;
+		result.match([&](const MTPDhelp_peerColors &data) {
+			_profileHash = data.vhash().v;
+			applyProfile(data);
+		}, [](const MTPDhelp_peerColorsNotModified &) {
+		});
+	}).fail([=] {
+		_profileRequestId = 0;
+	}).send();
+}
+
 std::vector<uint8> PeerColors::suggested() const {
 	return _suggested.current();
 }
@@ -76,21 +97,27 @@ const base::flat_map<uint8, int> &PeerColors::requiredLevelsChannel() const {
 	return _requiredLevelsChannel;
 }
 
-int PeerColors::requiredGroupLevelFor(PeerId channel, uint8 index) const {
+int PeerColors::requiredLevelFor(
+		PeerId channel,
+		uint8 index,
+		bool isMegagroup,
+		bool profile) const {
 	if (Data::DecideColorIndex(channel) == index) {
 		return 0;
-	} else if (const auto i = _requiredLevelsGroup.find(index)
-		; i != end(_requiredLevelsGroup)) {
-		return i->second;
 	}
-	return 1;
-}
-
-int PeerColors::requiredChannelLevelFor(PeerId channel, uint8 index) const {
-	if (Data::DecideColorIndex(channel) == index) {
-		return 0;
-	} else if (const auto i = _requiredLevelsChannel.find(index)
-		; i != end(_requiredLevelsChannel)) {
+	if (profile) {
+		const auto it = _profileColors.find(index);
+		if (it != end(_profileColors)) {
+			return isMegagroup
+				? it->second.requiredLevelsGroup
+				: it->second.requiredLevelsChannel;
+		}
+		return 1;
+	}
+	const auto &levels = isMegagroup
+		? _requiredLevelsGroup
+		: _requiredLevelsChannel;
+	if (const auto i = levels.find(index); i != end(levels)) {
 		return i->second;
 	}
 	return 1;
@@ -165,4 +192,87 @@ void PeerColors::apply(const MTPDhelp_peerColors &data) {
 	_suggested = std::move(suggested);
 }
 
+void PeerColors::applyProfile(const MTPDhelp_peerColors &data) {
+	const auto parseColors = [](const MTPhelp_PeerColorSet &set) {
+		const auto toUint = [](const MTPint &c) {
+			return (uint32(1) << 24) | uint32(c.v);
+		};
+		return set.match([&](const MTPDhelp_peerColorSet &) {
+			LOG(("API Error: peerColorSet in profile colors result!"));
+			return Data::ColorProfileSet();
+		}, [&](const MTPDhelp_peerColorProfileSet &data) {
+			auto set = Data::ColorProfileSet();
+			set.palette.reserve(data.vpalette_colors().v.size());
+			set.bg.reserve(data.vbg_colors().v.size());
+			set.story.reserve(data.vstory_colors().v.size());
+			for (const auto &c : data.vpalette_colors().v) {
+				set.palette.push_back(Ui::ColorFromSerialized(toUint(c)));
+			}
+			for (const auto &c : data.vbg_colors().v) {
+				set.bg.push_back(Ui::ColorFromSerialized(toUint(c)));
+			}
+			for (const auto &c : data.vstory_colors().v) {
+				set.story.push_back(Ui::ColorFromSerialized(toUint(c)));
+			}
+			return set;
+		});
+	};
+
+	auto suggested = std::vector<Data::ColorProfileData>();
+	const auto &list = data.vcolors().v;
+	suggested.reserve(list.size());
+	for (const auto &color : list) {
+		const auto &data = color.data();
+		const auto colorIndexBare = data.vcolor_id().v;
+		if (colorIndexBare < 0 || colorIndexBare >= Ui::kColorIndexCount) {
+			LOG(("API Error: Bad color index: %1").arg(colorIndexBare));
+			continue;
+		}
+		const auto colorIndex = uint8(colorIndexBare);
+		auto result = ProfileColorOption();
+		result.isHidden = data.is_hidden();
+		if (const auto min = data.vgroup_min_level()) {
+			result.requiredLevelsGroup = min->v;
+		}
+		if (const auto min = data.vchannel_min_level()) {
+			result.requiredLevelsChannel = min->v;
+		}
+		if (const auto light = data.vcolors()) {
+			result.data.light = parseColors(*light);
+		}
+		if (const auto dark = data.vdark_colors()) {
+			result.data.dark = parseColors(*dark);
+		}
+		_profileColors[colorIndex] = std::move(result);
+	}
+}
+
+std::optional<Data::ColorProfileSet> PeerColors::colorProfileFor(
+		not_null<PeerData*> peer) const {
+	if (const auto colorProfileIndex = peer->colorProfileIndex()) {
+		return colorProfileFor(*colorProfileIndex);
+	}
+	return std::nullopt;
+}
+
+std::optional<Data::ColorProfileSet> PeerColors::colorProfileFor(
+		uint8 index) const {
+	const auto i = _profileColors.find(index);
+	if (i != end(_profileColors)) {
+		return Window::Theme::IsNightMode()
+			? i->second.data.dark
+			: i->second.data.light;
+	}
+	return std::nullopt;
+}
+
+std::vector<uint8> PeerColors::profileColorIndices() const {
+	auto result = std::vector<uint8>();
+	result.reserve(_profileColors.size());
+	for (const auto &[index, option] : _profileColors) {
+		result.push_back(index);
+	}
+	return result;
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_peer_colors.h b/Telegram/SourceFiles/api/api_peer_colors.h
index f8d379020bfa1d..690073d856d0b2 100644
--- a/Telegram/SourceFiles/api/api_peer_colors.h
+++ b/Telegram/SourceFiles/api/api_peer_colors.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "base/timer.h"
+#include "data/data_peer_colors.h"
 #include "mtproto/sender.h"
 
 class ApiWrap;
@@ -34,27 +35,45 @@ class PeerColors final {
 	[[nodiscard]] auto requiredLevelsChannel() const
 		-> const base::flat_map<uint8, int> &;
 
-	[[nodiscard]] int requiredGroupLevelFor(
-		PeerId channel,
-		uint8 index) const;
-	[[nodiscard]] int requiredChannelLevelFor(
+	[[nodiscard]] int requiredLevelFor(
 		PeerId channel,
+		uint8 index,
+		bool isMegagroup,
+		bool profile) const;
+
+	[[nodiscard]] std::optional<Data::ColorProfileSet> colorProfileFor(
+		not_null<PeerData*> peer) const;
+	[[nodiscard]] std::optional<Data::ColorProfileSet> colorProfileFor(
 		uint8 index) const;
 
+	[[nodiscard]] std::vector<uint8> profileColorIndices() const;
+
 private:
+	struct ProfileColorOption {
+		Data::ColorProfileData data;
+		int requiredLevelsChannel = 0;
+		int requiredLevelsGroup = 0;
+		bool isHidden = false;
+	};
+
 	void request();
+	void requestProfile();
 	void apply(const MTPDhelp_peerColors &data);
+	void applyProfile(const MTPDhelp_peerColors &data);
 
 	MTP::Sender _api;
 	int32 _hash = 0;
+	int32 _profileHash = 0;
 
 	mtpRequestId _requestId = 0;
+	mtpRequestId _profileRequestId = 0;
 	base::Timer _timer;
 	rpl::variable<std::vector<uint8>> _suggested;
 	base::flat_map<uint8, int> _requiredLevelsGroup;
 	base::flat_map<uint8, int> _requiredLevelsChannel;
 	rpl::event_stream<> _colorIndicesChanged;
 	std::unique_ptr<Ui::ColorIndicesCompressed> _colorIndicesCurrent;
+	base::flat_map<uint8, ProfileColorOption> _profileColors;
 
 };
 
diff --git a/Telegram/SourceFiles/api/api_peer_photo.cpp b/Telegram/SourceFiles/api/api_peer_photo.cpp
index 9c8a470fa9e79b..ebfe6df9e4e7a8 100644
--- a/Telegram/SourceFiles/api/api_peer_photo.cpp
+++ b/Telegram/SourceFiles/api/api_peer_photo.cpp
@@ -150,12 +150,37 @@ PeerPhoto::PeerPhoto(not_null<ApiWrap*> api)
 : _session(&api->session())
 , _api(&api->instance()) {
 	crl::on_main(_session, [=] {
+		auto &uploader = _session->uploader();
+
 		// You can't use _session->lifetime() in the constructor,
 		// only queued, because it is not constructed yet.
-		_session->uploader().photoReady(
-		) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
+		uploader.photoReady(
+		) | rpl::on_next([=](const Storage::UploadedMedia &data) {
 			ready(data.fullId, data.info.file, std::nullopt);
 		}, _session->lifetime());
+
+		uploader.photoProgress(
+		) | rpl::on_next([=](const FullMsgId &id) {
+			const auto i = _uploads.find(id);
+			if (i == end(_uploads) || !i->second.photoId) {
+				return;
+			}
+			const auto peer = i->second.peer;
+			const auto photo = _session->data().photo(
+				i->second.photoId);
+			_uploadProgress.fire({ peer, photo->progress() });
+		}, _session->lifetime());
+
+		uploader.photoFailed(
+		) | rpl::on_next([=](const FullMsgId &id) {
+			const auto i = _uploads.find(id);
+			if (i == end(_uploads)) {
+				return;
+			}
+			const auto peer = i->second.peer;
+			_uploads.erase(i);
+			_uploadFailed.fire_copy(peer);
+		}, _session->lifetime());
 	});
 }
 
@@ -222,17 +247,18 @@ void PeerPhoto::upload(
 		_session->uploader().cancel(already->first);
 		_uploads.erase(already);
 	}
-	_uploads.emplace(
+	const auto &[it, ok] = _uploads.emplace(
 		fakeId,
-		UploadValue{ peer, type, std::move(done) });
+		UploadValue{ peer, type, std::move(done), PhotoId(0) });
 	if (mtpMarkup) {
 		ready(fakeId, std::nullopt, mtpMarkup);
 	} else {
-		const auto ready = PreparePeerPhoto(
+		const auto prepared = PreparePeerPhoto(
 			_api.instance().mainDcId(),
 			peer->id,
 			base::take(photo.image));
-		_session->uploader().upload(fakeId, ready);
+		it->second.photoId = prepared->thumbId;
+		_session->uploader().upload(fakeId, prepared);
 	}
 }
 
@@ -240,15 +266,81 @@ void PeerPhoto::suggest(not_null<PeerData*> peer, UserPhoto &&photo) {
 	upload(peer, std::move(photo), UploadType::Suggestion, nullptr);
 }
 
+void PeerPhoto::subscribeToUpload(
+		not_null<PeerData*> peer,
+		rpl::lifetime &lifetime,
+		UploadCallbacks callbacks) {
+	uploadProgress(
+	) | rpl::filter([=](const UploadProgress &data) {
+		return (data.peer == peer);
+	}) | rpl::on_next([cb = callbacks.progress](const UploadProgress &data) {
+		if (cb) {
+			cb(data.progress);
+		}
+	}, lifetime);
+
+	uploadDone(
+	) | rpl::filter([=](not_null<PeerData*> p) {
+		return (p == peer);
+	}) | rpl::on_next([cb = callbacks.done](not_null<PeerData*>) {
+		if (cb) {
+			cb();
+		}
+	}, lifetime);
+
+	uploadFailed(
+	) | rpl::filter([=](not_null<PeerData*> p) {
+		return (p == peer);
+	}) | rpl::on_next([cb = callbacks.failed](not_null<PeerData*>) {
+		if (cb) {
+			cb();
+		}
+	}, lifetime);
+}
+
+auto PeerPhoto::uploadProgress() const
+-> rpl::producer<UploadProgress> {
+	return _uploadProgress.events();
+}
+
+auto PeerPhoto::uploadDone() const
+-> rpl::producer<not_null<PeerData*>> {
+	return _uploadDone.events();
+}
+
+auto PeerPhoto::uploadFailed() const
+-> rpl::producer<not_null<PeerData*>> {
+	return _uploadFailed.events();
+}
+
+void PeerPhoto::cancelUpload(not_null<PeerData*> peer) {
+	peer = peer->migrateToOrMe();
+	const auto i = ranges::find(
+		_uploads,
+		peer,
+		[](const auto &pair) { return pair.second.peer; });
+	if (i == end(_uploads)) {
+		return;
+	}
+	const auto fakeId = i->first;
+	_uploads.erase(i);
+	_session->uploader().cancel(fakeId);
+	_uploadFailed.fire_copy(peer);
+}
+
 void PeerPhoto::clear(not_null<PhotoData*> photo) {
 	const auto self = _session->user();
 	if (self->userpicPhotoId() == photo->id) {
+		const auto photoId = photo->id;
+		const auto peerId = self->id;
 		_api.request(MTPphotos_UpdateProfilePhoto(
 			MTP_flags(0),
 			MTPInputUser(), // bot
 			MTP_inputPhotoEmpty()
 		)).done([=](const MTPphotos_Photo &result) {
 			self->setPhoto(MTP_userProfilePhotoEmpty());
+			_session->storage().remove(
+				Storage::UserPhotosRemoveOne(peerToUser(peerId), photoId));
 		}).send();
 	} else if (photo->peer && photo->peer->userpicPhotoId() == photo->id) {
 		const auto applier = [=](const MTPUpdates &result) {
@@ -256,12 +348,12 @@ void PeerPhoto::clear(not_null<PhotoData*> photo) {
 		};
 		if (const auto chat = photo->peer->asChat()) {
 			_api.request(MTPmessages_EditChatPhoto(
-				chat->inputChat,
+				chat->inputChat(),
 				MTP_inputChatPhotoEmpty()
 			)).done(applier).send();
 		} else if (const auto channel = photo->peer->asChannel()) {
 			_api.request(MTPchannels_EditPhoto(
-				channel->inputChannel,
+				channel->inputChannel(),
 				MTP_inputChatPhotoEmpty()
 			)).done(applier).send();
 		}
@@ -290,7 +382,7 @@ void PeerPhoto::clear(not_null<PhotoData*> photo) {
 void PeerPhoto::clearPersonal(not_null<UserData*> user) {
 	_api.request(MTPphotos_UploadContactProfilePhoto(
 		MTP_flags(MTPphotos_UploadContactProfilePhoto::Flag::f_save),
-		user->inputUser,
+		user->inputUser(),
 		MTPInputFile(),
 		MTPInputFile(), // video
 		MTPdouble(), // video_start_ts
@@ -314,15 +406,20 @@ void PeerPhoto::set(not_null<PeerData*> peer, not_null<PhotoData*> photo) {
 		return;
 	}
 	if (peer == _session->user()) {
+		const auto photoId = photo->id;
+		const auto peerId = peer->id;
 		_api.request(MTPphotos_UpdateProfilePhoto(
 			MTP_flags(0),
 			MTPInputUser(), // bot
 			photo->mtpInput()
 		)).done([=](const MTPphotos_Photo &result) {
-			result.match([&](const MTPDphotos_photo &data) {
-				_session->data().processPhoto(data.vphoto());
-				_session->data().processUsers(data.vusers());
-			});
+			const auto newPhoto = _session->data().processPhoto(
+				result.data().vphoto());
+			_session->data().processUsers(result.data().vusers());
+			_session->storage().replace(Storage::UserPhotosReplace(
+				peerToUser(peerId),
+				photoId,
+				newPhoto->id));
 		}).send();
 	} else {
 		const auto applier = [=](const MTPUpdates &result) {
@@ -330,12 +427,12 @@ void PeerPhoto::set(not_null<PeerData*> peer, not_null<PhotoData*> photo) {
 		};
 		if (const auto chat = peer->asChat()) {
 			_api.request(MTPmessages_EditChatPhoto(
-				chat->inputChat,
+				chat->inputChat(),
 				MTP_inputChatPhoto(photo->mtpInput())
 			)).done(applier).send();
 		} else if (const auto channel = peer->asChannel()) {
 			_api.request(MTPchannels_EditPhoto(
-				channel->inputChannel,
+				channel->inputChannel(),
 				MTP_inputChatPhoto(photo->mtpInput())
 			)).done(applier).send();
 		}
@@ -353,16 +450,23 @@ void PeerPhoto::ready(
 	const auto peer = maybeUploadValue->peer;
 	const auto type = maybeUploadValue->type;
 	const auto done = maybeUploadValue->done;
-	const auto applier = [=](const MTPUpdates &result) {
-		_session->updates().applyUpdates(result);
+	const auto finish = [=] {
+		_uploadDone.fire_copy(peer);
 		if (done) {
 			done();
 		}
 	};
+	const auto fail = [=](const MTP::Error &error) {
+		_uploadFailed.fire_copy(peer);
+	};
+	const auto applier = [=](const MTPUpdates &result) {
+		_session->updates().applyUpdates(result);
+		finish();
+	};
 	const auto botUserInput = [&] {
 		const auto user = peer->asUser();
 		return (user && user->botInfo && user->botInfo->canEditInformation)
-			? std::make_optional<MTPInputUser>(user->inputUser)
+			? std::make_optional<MTPInputUser>(user->inputUser())
 			: std::nullopt;
 	}();
 	if (peer->isSelf() || botUserInput) {
@@ -386,17 +490,19 @@ void PeerPhoto::ready(
 				_session->storage().add(Storage::UserPhotosSetBack(
 					peerToUser(peer->id),
 					photoId));
+			} else {
+				_session->storage().add(Storage::UserPhotosAddNew(
+					peerToUser(peer->id),
+					photoId));
 			}
-			if (done) {
-				done();
-			}
-		}).send();
+			finish();
+		}).fail(fail).send();
 	} else if (const auto chat = peer->asChat()) {
 		const auto history = _session->data().history(chat);
 		using Flag = MTPDinputChatUploadedPhoto::Flag;
 		const auto none = MTPDinputChatUploadedPhoto::Flags(0);
 		history->sendRequestId = _api.request(MTPmessages_EditChatPhoto(
-			chat->inputChat,
+			chat->inputChat(),
 			MTP_inputChatUploadedPhoto(
 				MTP_flags((file ? Flag::f_file : none)
 					| (videoSize ? Flag::f_video_emoji_markup : none)),
@@ -404,13 +510,13 @@ void PeerPhoto::ready(
 				MTPInputFile(), // video
 				MTPdouble(), // video_start_ts
 				videoSize ? (*videoSize) : MTPVideoSize()) // video_emoji_markup
-		)).done(applier).afterRequest(history->sendRequestId).send();
+		)).done(applier).fail(fail).afterRequest(history->sendRequestId).send();
 	} else if (const auto channel = peer->asChannel()) {
 		using Flag = MTPDinputChatUploadedPhoto::Flag;
 		const auto none = MTPDinputChatUploadedPhoto::Flags(0);
 		const auto history = _session->data().history(channel);
 		history->sendRequestId = _api.request(MTPchannels_EditPhoto(
-			channel->inputChannel,
+			channel->inputChannel(),
 			MTP_inputChatUploadedPhoto(
 				MTP_flags((file ? Flag::f_file : none)
 					| (videoSize ? Flag::f_video_emoji_markup : none)),
@@ -418,7 +524,7 @@ void PeerPhoto::ready(
 				MTPInputFile(), // video
 				MTPdouble(), // video_start_ts
 				videoSize ? (*videoSize) : MTPVideoSize()) // video_emoji_markup
-		)).done(applier).afterRequest(history->sendRequestId).send();
+		)).done(applier).fail(fail).afterRequest(history->sendRequestId).send();
 	} else if (const auto user = peer->asUser()) {
 		using Flag = MTPphotos_UploadContactProfilePhoto::Flag;
 		const auto none = MTPphotos_UploadContactProfilePhoto::Flags(0);
@@ -428,7 +534,7 @@ void PeerPhoto::ready(
 				| ((type == UploadType::Suggestion)
 					? Flag::f_suggest
 					: Flag::f_save)),
-			user->inputUser,
+			user->inputUser(),
 			file ? (*file) : MTPInputFile(),
 			MTPInputFile(), // video
 			MTPdouble(), // video_start_ts
@@ -441,10 +547,8 @@ void PeerPhoto::ready(
 			if (type != UploadType::Suggestion) {
 				user->updateFullForced();
 			}
-			if (done) {
-				done();
-			}
-		}).send();
+			finish();
+		}).fail(fail).send();
 	}
 }
 
@@ -456,7 +560,7 @@ void PeerPhoto::requestUserPhotos(
 	}
 
 	const auto requestId = _api.request(MTPphotos_GetUserPhotos(
-		user->inputUser,
+		user->inputUser(),
 		MTP_int(0),
 		MTP_long(afterId),
 		MTP_int(kSharedMediaLimit)
diff --git a/Telegram/SourceFiles/api/api_peer_photo.h b/Telegram/SourceFiles/api/api_peer_photo.h
index 71d340a031f6b1..4f417f930e786f 100644
--- a/Telegram/SourceFiles/api/api_peer_photo.h
+++ b/Telegram/SourceFiles/api/api_peer_photo.h
@@ -41,6 +41,11 @@ class PeerPhoto final {
 		std::vector<QColor> markupColors;
 	};
 
+	struct UploadProgress {
+		not_null<PeerData*> peer;
+		float64 progress = 0.;
+	};
+
 	void upload(
 		not_null<PeerData*> peer,
 		UserPhoto &&photo,
@@ -55,6 +60,24 @@ class PeerPhoto final {
 	void clearPersonal(not_null<UserData*> user);
 	void set(not_null<PeerData*> peer, not_null<PhotoData*> photo);
 
+	struct UploadCallbacks {
+		Fn<void(float64)> progress;
+		Fn<void()> done;
+		Fn<void()> failed;
+	};
+	void subscribeToUpload(
+		not_null<PeerData*> peer,
+		rpl::lifetime &lifetime,
+		UploadCallbacks callbacks);
+
+	[[nodiscard]] auto uploadProgress() const
+		-> rpl::producer<UploadProgress>;
+	[[nodiscard]] auto uploadDone() const
+		-> rpl::producer<not_null<PeerData*>>;
+	[[nodiscard]] auto uploadFailed() const
+		-> rpl::producer<not_null<PeerData*>>;
+	void cancelUpload(not_null<PeerData*> peer);
+
 	void requestUserPhotos(not_null<UserData*> user, UserPhotoId afterId);
 
 	void requestEmojiList(EmojiListType type);
@@ -100,9 +123,13 @@ class PeerPhoto final {
 		not_null<PeerData*> peer;
 		UploadType type = UploadType::Default;
 		Fn<void()> done;
+		PhotoId photoId = 0;
 	};
 
 	base::flat_map<FullMsgId, UploadValue> _uploads;
+	rpl::event_stream<UploadProgress> _uploadProgress;
+	rpl::event_stream<not_null<PeerData*>> _uploadDone;
+	rpl::event_stream<not_null<PeerData*>> _uploadFailed;
 
 	base::flat_map<not_null<UserData*>, mtpRequestId> _userPhotosRequests;
 
diff --git a/Telegram/SourceFiles/api/api_peer_search.cpp b/Telegram/SourceFiles/api/api_peer_search.cpp
new file mode 100644
index 00000000000000..73a252ab12ce8f
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_peer_search.cpp
@@ -0,0 +1,171 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_peer_search.h"
+
+#include "api/api_single_message_search.h"
+#include "apiwrap.h"
+#include "data/data_session.h"
+#include "dialogs/ui/chat_search_in.h" // IsHashOrCashtagSearchQuery
+#include "main/main_session.h"
+
+namespace Api {
+namespace {
+
+constexpr auto kMinSponsoredQueryLength = 4;
+
+} // namespace
+
+PeerSearch::PeerSearch(not_null<Main::Session*> session, Type type)
+: _session(session)
+, _type(type) {
+}
+
+PeerSearch::~PeerSearch() {
+	clear();
+}
+
+void PeerSearch::request(
+		const QString &query,
+		Fn<void(PeerSearchResult)> callback,
+		RequestType type) {
+	using namespace Dialogs;
+	_query = Api::ConvertPeerSearchQuery(query);
+	_callback = callback;
+	if (_query.isEmpty()
+		|| IsHashOrCashtagSearchQuery(_query) != HashOrCashtag::None) {
+		finish(PeerSearchResult{});
+		return;
+	}
+	auto &cache = _cache[_query];
+	if (cache.peersReady && cache.sponsoredReady) {
+		finish(cache.result);
+		return;
+	} else if (type == RequestType::CacheOnly) {
+		_callback = nullptr;
+		return;
+	} else if (cache.requested) {
+		return;
+	}
+	cache.requested = true;
+	cache.result.query = _query;
+	if (_query.size() < kMinSponsoredQueryLength) {
+		cache.sponsoredReady = true;
+	} else if (_type == Type::WithSponsored) {
+		requestSponsored();
+	}
+	requestPeers();
+}
+
+void PeerSearch::requestPeers() {
+	const auto requestId = _session->api().request(MTPcontacts_Search(
+		MTP_flags(0),
+		MTP_string(_query),
+		MTP_int(SearchPeopleLimit)
+	)).done([=](const MTPcontacts_Found &result, mtpRequestId requestId) {
+		const auto &data = result.data();
+		_session->data().processUsers(data.vusers());
+		_session->data().processChats(data.vchats());
+		auto parsed = PeerSearchResult();
+		parsed.my.reserve(data.vmy_results().v.size());
+		for (const auto &id : data.vmy_results().v) {
+			const auto peerId = peerFromMTP(id);
+			parsed.my.push_back(_session->data().peer(peerId));
+		}
+		parsed.peers.reserve(data.vresults().v.size());
+		for (const auto &id : data.vresults().v) {
+			const auto peerId = peerFromMTP(id);
+			parsed.peers.push_back(_session->data().peer(peerId));
+		}
+		finishPeers(requestId, std::move(parsed));
+	}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
+		finishPeers(requestId, PeerSearchResult{});
+	}).send();
+	_peerRequests.emplace(requestId, _query);
+}
+
+void PeerSearch::requestSponsored() {
+	const auto requestId = _session->api().request(
+		MTPcontacts_GetSponsoredPeers(MTP_string(_query))
+	).done([=](
+			const MTPcontacts_SponsoredPeers &result,
+			mtpRequestId requestId) {
+		result.match([&](const MTPDcontacts_sponsoredPeersEmpty &) {
+			finishSponsored(requestId, PeerSearchResult{});
+		}, [&](const MTPDcontacts_sponsoredPeers &data) {
+			_session->data().processUsers(data.vusers());
+			_session->data().processChats(data.vchats());
+			auto parsed = PeerSearchResult();
+			parsed.sponsored.reserve(data.vpeers().v.size());
+			for (const auto &peer : data.vpeers().v) {
+				const auto &data = peer.data();
+				const auto peerId = peerFromMTP(data.vpeer());
+				parsed.sponsored.push_back({
+					.peer = _session->data().peer(peerId),
+					.randomId = data.vrandom_id().v,
+					.sponsorInfo = TextWithEntities::Simple(
+						qs(data.vsponsor_info().value_or_empty())),
+					.additionalInfo = TextWithEntities::Simple(
+						qs(data.vadditional_info().value_or_empty())),
+				});
+			}
+			finishSponsored(requestId, std::move(parsed));
+		});
+	}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
+		finishSponsored(requestId, PeerSearchResult{});
+	}).send();
+	_sponsoredRequests.emplace(requestId, _query);
+}
+
+void PeerSearch::finishPeers(
+		mtpRequestId requestId,
+		PeerSearchResult result) {
+	const auto query = _peerRequests.take(requestId);
+	Assert(query.has_value());
+
+	auto &cache = _cache[*query];
+	cache.peersReady = true;
+	cache.result.my = std::move(result.my);
+	cache.result.peers = std::move(result.peers);
+	if (cache.sponsoredReady && _query == *query) {
+		finish(cache.result);
+	}
+}
+
+void PeerSearch::finishSponsored(
+		mtpRequestId requestId,
+		PeerSearchResult result) {
+	const auto query = _sponsoredRequests.take(requestId);
+	Assert(query.has_value());
+
+	auto &cache = _cache[*query];
+	cache.sponsoredReady = true;
+	cache.result.sponsored = std::move(result.sponsored);
+	if (cache.peersReady && _query == *query) {
+		finish(cache.result);
+	}
+}
+
+void PeerSearch::finish(PeerSearchResult result) {
+	if (const auto onstack = base::take(_callback)) {
+		onstack(std::move(result));
+	}
+}
+
+void PeerSearch::clear() {
+	_query = QString();
+	_callback = nullptr;
+	_cache.clear();
+	for (const auto &[requestId, query] : base::take(_peerRequests)) {
+		_session->api().request(requestId).cancel();
+	}
+	for (const auto &[requestId, query] : base::take(_sponsoredRequests)) {
+		_session->api().request(requestId).cancel();
+	}
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_peer_search.h b/Telegram/SourceFiles/api/api_peer_search.h
new file mode 100644
index 00000000000000..c706429521efa3
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_peer_search.h
@@ -0,0 +1,76 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Api {
+
+struct SponsoredSearchResult {
+    not_null<PeerData*> peer;
+    QByteArray randomId;
+    TextWithEntities sponsorInfo;
+    TextWithEntities additionalInfo;
+};
+
+struct PeerSearchResult {
+    QString query;
+    std::vector<not_null<PeerData*>> my;
+    std::vector<not_null<PeerData*>> peers;
+    std::vector<SponsoredSearchResult> sponsored;
+};
+
+class PeerSearch final {
+public:
+    enum class Type {
+        WithSponsored,
+        JustPeers,
+    };
+    PeerSearch(not_null<Main::Session*> session, Type type);
+    ~PeerSearch();
+
+    enum class RequestType {
+        CacheOnly,
+        CacheOrRemote,
+    };
+    void request(
+        const QString &query,
+        Fn<void(PeerSearchResult)> callback,
+        RequestType type = RequestType::CacheOrRemote);
+    void clear();
+
+private:
+    struct CacheEntry {
+        PeerSearchResult result;
+        bool requested = false;
+        bool peersReady = false;
+        bool sponsoredReady = false;
+    };
+
+    void requestPeers();
+    void requestSponsored();
+
+	void finish(PeerSearchResult result);
+	void finishPeers(mtpRequestId requestId, PeerSearchResult result);
+    void finishSponsored(mtpRequestId requestId, PeerSearchResult result);
+
+    const not_null<Main::Session*> _session;
+    const Type _type;
+
+    QString _query;
+    Fn<void(PeerSearchResult)> _callback;
+
+	base::flat_map<QString, CacheEntry> _cache;
+	base::flat_map<mtpRequestId, QString> _peerRequests;
+	base::flat_map<mtpRequestId, QString> _sponsoredRequests;
+
+};
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_polls.cpp b/Telegram/SourceFiles/api/api_polls.cpp
index 52a5f6d6fd0414..6612bb3748cd24 100644
--- a/Telegram/SourceFiles/api/api_polls.cpp
+++ b/Telegram/SourceFiles/api/api_polls.cpp
@@ -8,28 +8,210 @@ For license and copyright information please follow this link:
 #include "api/api_polls.h"
 
 #include "api/api_common.h"
+#include "api/api_statistics_data_deserialize.h"
+#include "api/api_text_entities.h"
 #include "api/api_updates.h"
 #include "apiwrap.h"
+#include "base/call_delayed.h"
+#include "base/qt/qt_key_modifiers.h"
 #include "base/random.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/data_changes.h"
 #include "data/data_histories.h"
 #include "data/data_poll.h"
 #include "data/data_session.h"
+#include "data/data_statistics_chart.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_helpers.h" // ShouldSendSilent
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "styles/style_polls.h"
+#include "ui/toast/toast.h"
+#include "window/window_session_controller.h"
 
-namespace Api {
 namespace {
 
-[[nodiscard]] TimeId UnixtimeFromMsgId(mtpMsgId msgId) {
-	return TimeId(msgId >> 32);
+constexpr auto kVoteRestrictionToastDuration = 5 * crl::time(1000);
+
+const auto kSubscribersOnlyVoteErrorPatterns = std::array{
+	u"POLL_SUBSCRIBERS_ONLY"_q,
+	u"POLL_MEMBER_RESTRICTED"_q,
+	u"VOTE_SUBSCRIBERS_ONLY"_q,
+	u"SUBSCRIBERS_ONLY"_q,
+	u"SUBSCRIBER_REQUIRED"_q,
+	u"SUBSCRIBER_ONLY"_q,
+};
+
+const auto kSubscribersJoinedTooRecentlyVoteErrorPatterns = std::array{
+	u"POLL_SUBSCRIBERS_TOO_RECENT"_q,
+	u"VOTE_SUBSCRIBERS_TOO_RECENT"_q,
+	u"SUBSCRIBERS_TOO_RECENT"_q,
+	u"SUBSCRIBER_TOO_RECENT"_q,
+	u"JOINED_TOO_RECENTLY"_q,
+	u"24_HOURS"_q,
+};
+
+const auto kCountriesVoteErrorPatterns = std::array{
+	u"POLL_COUNTRIES_ISO2"_q,
+	u"VOTE_COUNTRIES_ISO2"_q,
+	u"COUNTRIES_ISO2"_q,
+	u"COUNTRY_RESTRICTED"_q,
+	u"COUNTRY_ISO2"_q,
+};
+
+template <size_t Size>
+[[nodiscard]] bool MatchesErrorPattern(
+		const QString &type,
+		const std::array<QString, Size> &patterns) {
+	for (const auto &pattern : patterns) {
+		if (!pattern.isEmpty()
+			&& type.contains(pattern, Qt::CaseInsensitive)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] PollData::VoteRestriction ParseVoteRestrictionError(
+		const QString &type) {
+	if (MatchesErrorPattern(
+			type,
+			kSubscribersJoinedTooRecentlyVoteErrorPatterns)) {
+		return PollData::VoteRestriction::SubscribersJoinedTooRecently;
+	} else if (MatchesErrorPattern(
+			type,
+			kSubscribersOnlyVoteErrorPatterns)) {
+		return PollData::VoteRestriction::SubscribersOnly;
+	} else if (MatchesErrorPattern(
+			type,
+			kCountriesVoteErrorPatterns)) {
+		return PollData::VoteRestriction::Countries;
+	}
+	return PollData::VoteRestriction::None;
+}
+
+void ShowVoteRestrictionToast(
+		not_null<PeerData*> peer,
+		not_null<const PollData*> poll,
+		PollData::VoteRestriction restriction) {
+	if (restriction == PollData::VoteRestriction::None) {
+		return;
+	}
+	auto text = PollVoteRestrictionText(restriction, peer, poll);
+	if (text.text.isEmpty()) {
+		return;
+	}
+	if (const auto window = peer->session().tryResolveWindow(peer)) {
+		window->showToast({
+			.text = std::move(text),
+			.iconLottie = u"ban"_q,
+			.iconLottieSize = st::pollToastIconSize,
+			.duration = kVoteRestrictionToastDuration,
+		});
+	}
+}
+
+#ifdef _DEBUG
+[[nodiscard]] Data::StatisticalGraph GenerateMockupPollStats(
+		const PollData &poll) {
+	auto chart = Data::StatisticalChart();
+	const auto colorKeys = std::array<QString, 10>{
+		u"BLUE"_q,
+		u"GREEN"_q,
+		u"RED"_q,
+		u"GOLDEN"_q,
+		u"LIGHTBLUE"_q,
+		u"LIGHTGREEN"_q,
+		u"ORANGE"_q,
+		u"INDIGO"_q,
+		u"PURPLE"_q,
+		u"CYAN"_q,
+	};
+
+	constexpr auto kPoints = 14;
+	constexpr auto kOneDay = float64(24 * 60 * 60 * 1000);
+	constexpr auto kStart = float64(1704067200000);
+	chart.x.reserve(kPoints);
+	for (auto i = 0; i != kPoints; ++i) {
+		chart.x.push_back(kStart + i * kOneDay);
+	}
+	chart.timeStep = kOneDay;
+
+	auto lineId = 0;
+	chart.lines.reserve(poll.answers.size());
+	for (const auto &answer : poll.answers) {
+		auto line = Data::StatisticalChart::Line();
+		line.id = ++lineId;
+		line.idString = u"answer_%1"_q.arg(line.id);
+		line.name = answer.text.text.trimmed();
+		if (line.name.isEmpty()) {
+			line.name = QString("#%1").arg(line.id);
+		}
+		line.colorKey = colorKeys[(line.id - 1) % int(colorKeys.size())];
+		line.y.reserve(kPoints);
+
+		auto seed = int64(13 * line.id + 17);
+		for (const auto byte : answer.option) {
+			seed += uchar(byte);
+		}
+		const auto base = std::max(int64(answer.votes), int64(1));
+		for (auto i = 0; i != kPoints; ++i) {
+			const auto wave = int64(
+				((i + line.id) % 5) * ((i + 2 * line.id) % 4));
+			const auto trend = int64((i * (line.id + 1)) / 3);
+			const auto noise = int64((seed + i * 7 + line.id * 11) % 6);
+			const auto value = std::max(
+				base + wave + trend + noise - 2,
+				int64(1));
+			line.y.push_back(value);
+			line.maxValue = std::max(line.maxValue, value);
+			line.minValue = std::min(line.minValue, value);
+		}
+		chart.lines.push_back(std::move(line));
+	}
+	if (chart.lines.empty()) {
+		auto line = Data::StatisticalChart::Line();
+		line.id = 1;
+		line.idString = u"votes"_q;
+		line.name = tr::lng_notification_reactions_poll_votes(tr::now);
+		line.colorKey = u"BLUE"_q;
+		line.y.reserve(kPoints);
+
+		const auto base = std::max(int64(poll.totalVoters), int64(1));
+		for (auto i = 0; i != kPoints; ++i) {
+			const auto value = std::max(
+				base + i * 2 + ((i * 5) % 7),
+				int64(1));
+			line.y.push_back(value);
+			line.maxValue = std::max(line.maxValue, value);
+			line.minValue = std::min(line.minValue, value);
+		}
+		chart.lines.push_back(std::move(line));
+	}
+
+	chart.defaultZoomXIndex = {
+		.min = std::max(0, kPoints - 8),
+		.max = kPoints - 1,
+	};
+	chart.measure();
+	if (chart.maxValue == chart.minValue) {
+		if (chart.minValue) {
+			chart.minValue = 0;
+		} else {
+			chart.maxValue = 1;
+		}
+	}
+	return {
+		.chart = std::move(chart),
+	};
 }
+#endif
 
 } // namespace
 
+namespace Api {
+
 Polls::Polls(not_null<ApiWrap*> api)
 : _session(&api->session())
 , _api(&api->instance()) {
@@ -37,9 +219,10 @@ Polls::Polls(not_null<ApiWrap*> api)
 
 void Polls::create(
 		const PollData &data,
-		const SendAction &action,
+		const TextWithEntities &text,
+		SendAction action,
 		Fn<void()> done,
-		Fn<void()> fail) {
+		Fn<void(bool fileReferenceExpired)> fail) {
 	_session->api().sendAction(action);
 
 	const auto history = action.history;
@@ -47,6 +230,7 @@ void Polls::create(
 	const auto topicRootId = action.replyTo.messageId
 		? action.replyTo.topicRootId
 		: 0;
+	const auto monoforumPeerId = action.replyTo.monoforumPeerId;
 	auto sendFlags = MTPmessages_SendMedia::Flags(0);
 	if (action.replyTo) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to;
@@ -54,16 +238,22 @@ void Polls::create(
 	const auto clearCloudDraft = action.clearDraft;
 	if (clearCloudDraft) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_clear_draft;
-		history->clearLocalDraft(topicRootId);
-		history->clearCloudDraft(topicRootId);
-		history->startSavingCloudDraft(topicRootId);
+		history->clearLocalDraft(topicRootId, monoforumPeerId);
+		history->clearCloudDraft(topicRootId, monoforumPeerId);
+		history->startSavingCloudDraft(topicRootId, monoforumPeerId);
 	}
 	const auto silentPost = ShouldSendSilent(peer, action.options);
+	const auto starsPaid = std::min(
+		peer->starsPerMessageChecked(),
+		action.options.starsApproved);
 	if (silentPost) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
 	}
 	if (action.options.scheduled) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_schedule_date;
+		if (action.options.scheduleRepeatPeriod) {
+			sendFlags |= MTPmessages_SendMedia::Flag::f_schedule_repeat_period;
+		}
 	}
 	if (action.options.shortcutId) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_quick_reply_shortcut;
@@ -71,10 +261,24 @@ void Polls::create(
 	if (action.options.effectId) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_effect;
 	}
+	if (action.options.suggest) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_suggested_post;
+	}
+	if (starsPaid) {
+		action.options.starsApproved -= starsPaid;
+		sendFlags |= MTPmessages_SendMedia::Flag::f_allow_paid_stars;
+	}
 	const auto sendAs = action.options.sendAs;
 	if (sendAs) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_send_as;
 	}
+	auto sentEntities = Api::EntitiesToMTP(
+		_session,
+		text.entities,
+		Api::ConvertOption::SkipLocal);
+	if (!sentEntities.v.isEmpty()) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_entities;
+	}
 	auto &histories = history->owner().histories();
 	const auto randomId = base::RandomValue<uint64>();
 	histories.sendPreparedMessage(
@@ -83,21 +287,25 @@ void Polls::create(
 		randomId,
 		Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 			MTP_flags(sendFlags),
-			peer->input,
+			peer->input(),
 			Data::Histories::ReplyToPlaceholder(),
 			PollDataToInputMedia(&data),
-			MTP_string(),
+			MTP_string(text.text),
 			MTP_long(randomId),
 			MTPReplyMarkup(),
-			MTPVector<MTPMessageEntity>(),
+			sentEntities,
 			MTP_int(action.options.scheduled),
-			(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
+			MTP_int(action.options.scheduleRepeatPeriod),
+			(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
 			Data::ShortcutIdToMTP(_session, action.options.shortcutId),
-			MTP_long(action.options.effectId)
+			MTP_long(action.options.effectId),
+			MTP_long(starsPaid),
+			SuggestToMTP(action.options.suggest)
 		), [=](const MTPUpdates &result, const MTP::Response &response) {
 		if (clearCloudDraft) {
 			history->finishSavingCloudDraft(
 				topicRootId,
+				monoforumPeerId,
 				UnixtimeFromMsgId(response.outerMsgId));
 		}
 		_session->changes().historyUpdated(
@@ -110,9 +318,12 @@ void Polls::create(
 		if (clearCloudDraft) {
 			history->finishSavingCloudDraft(
 				topicRootId,
+				monoforumPeerId,
 				UnixtimeFromMsgId(response.outerMsgId));
 		}
-		fail();
+		const auto expired = (error.code() == 400)
+			&& error.type().startsWith(u"FILE_REFERENCE_"_q);
+		fail(expired);
 	});
 }
 
@@ -128,6 +339,7 @@ void Polls::sendVotes(
 	if (!item) {
 		return;
 	}
+	const auto peer = item->history()->peer;
 
 	const auto showSending = poll && !options.empty();
 	const auto hideSending = [=] {
@@ -141,6 +353,12 @@ void Polls::sendVotes(
 	if (showSending) {
 		poll->sendingVotes = options;
 		_session->data().requestItemRepaint(item);
+	} else if (poll && options.empty() && poll->voted()) {
+		for (auto &answer : poll->answers) {
+			answer.chosen = false;
+		}
+		++poll->version;
+		_session->data().notifyPollUpdateDelayed(poll);
 	}
 
 	auto prepared = QVector<MTPbytes>();
@@ -150,16 +368,100 @@ void Polls::sendVotes(
 		ranges::back_inserter(prepared),
 		[](const QByteArray &option) { return MTP_bytes(option); });
 	const auto requestId = _api.request(MTPmessages_SendVote(
-		item->history()->peer->input,
+		peer->input(),
 		MTP_int(item->id),
 		MTP_vector<MTPbytes>(prepared)
 	)).done([=](const MTPUpdates &result) {
 		_pollVotesRequestIds.erase(itemId);
 		hideSending();
+		if (poll) {
+			if (poll->voteRestriction() != PollData::VoteRestriction::None) {
+				poll->setVoteRestriction(PollData::VoteRestriction::None);
+				_session->data().notifyPollUpdateDelayed(poll);
+			}
+		}
 		_session->updates().applyUpdates(result);
-	}).fail([=] {
+	}).fail([=](const MTP::Error &error) {
 		_pollVotesRequestIds.erase(itemId);
 		hideSending();
+		if (poll) {
+			const auto restriction = ParseVoteRestrictionError(error.type());
+			if (restriction != PollData::VoteRestriction::None) {
+				poll->setVoteRestriction(restriction);
+				_session->data().notifyPollUpdateDelayed(poll);
+				if (const auto item = _session->data().message(itemId)) {
+					_session->data().requestItemResize(item);
+				}
+				ShowVoteRestrictionToast(peer, poll, restriction);
+			}
+		}
+	}).send();
+	_pollVotesRequestIds.emplace(itemId, requestId);
+}
+
+void Polls::addAnswer(
+		FullMsgId itemId,
+		const TextWithEntities &text,
+		const PollMedia &media,
+		Fn<void()> done,
+		Fn<void(QString)> fail) {
+	if (_pollAddAnswerRequestIds.contains(itemId)) {
+		return;
+	}
+	const auto item = _session->data().message(itemId);
+	if (!item) {
+		return;
+	}
+	const auto sentEntities = Api::EntitiesToMTP(
+		_session,
+		text.entities,
+		Api::ConvertOption::SkipLocal);
+	using Flag = MTPDinputPollAnswer::Flag;
+	const auto flags = media
+		? Flag::f_media
+		: Flag();
+	const auto answer = MTP_inputPollAnswer(
+		MTP_flags(flags),
+		MTP_textWithEntities(
+			MTP_string(text.text),
+			sentEntities),
+		media ? PollMediaToMTP(media) : MTPInputMedia());
+	const auto requestId = _api.request(MTPmessages_AddPollAnswer(
+		item->history()->peer->input(),
+		MTP_int(item->id),
+		answer
+	)).done([=](const MTPUpdates &result) {
+		_pollAddAnswerRequestIds.erase(itemId);
+		_session->updates().applyUpdates(result);
+		if (done) {
+			done();
+		}
+	}).fail([=](const MTP::Error &error) {
+		_pollAddAnswerRequestIds.erase(itemId);
+		if (fail) {
+			fail(error.type());
+		}
+	}).send();
+	_pollAddAnswerRequestIds.emplace(itemId, requestId);
+}
+
+void Polls::deleteAnswer(FullMsgId itemId, const QByteArray &option) {
+	if (_pollVotesRequestIds.contains(itemId)) {
+		return;
+	}
+	const auto item = _session->data().message(itemId);
+	if (!item) {
+		return;
+	}
+	const auto requestId = _api.request(MTPmessages_DeletePollAnswer(
+		item->history()->peer->input(),
+		MTP_int(item->id),
+		MTP_bytes(option)
+	)).done([=](const MTPUpdates &result) {
+		_pollVotesRequestIds.erase(itemId);
+		_session->updates().applyUpdates(result);
+	}).fail([=] {
+		_pollVotesRequestIds.erase(itemId);
 	}).send();
 	_pollVotesRequestIds.emplace(itemId, requestId);
 }
@@ -176,14 +478,16 @@ void Polls::close(not_null<HistoryItem*> item) {
 	}
 	const auto requestId = _api.request(MTPmessages_EditMessage(
 		MTP_flags(MTPmessages_EditMessage::Flag::f_media),
-		item->history()->peer->input,
+		item->history()->peer->input(),
 		MTP_int(item->id),
 		MTPstring(),
 		PollDataToInputMedia(poll, true),
 		MTPReplyMarkup(),
 		MTPVector<MTPMessageEntity>(),
 		MTP_int(0), // schedule_date
-		MTPint() // quick_reply_shortcut_id
+		MTP_int(0), // schedule_repeat_period
+		MTPint(), // quick_reply_shortcut_id
+		MTPInputRichMessage()
 	)).done([=](const MTPUpdates &result) {
 		_pollCloseRequestIds.erase(itemId);
 		_session->updates().applyUpdates(result);
@@ -198,9 +502,13 @@ void Polls::reloadResults(not_null<HistoryItem*> item) {
 	if (!item->isRegular() || _pollReloadRequestIds.contains(itemId)) {
 		return;
 	}
+	const auto media = item->media();
+	const auto poll = media ? media->poll() : nullptr;
+	const auto pollHash = poll ? poll->hash : uint64(0);
 	const auto requestId = _api.request(MTPmessages_GetPollResults(
-		item->history()->peer->input,
-		MTP_int(item->id)
+		item->history()->peer->input(),
+		MTP_int(item->id),
+		MTP_long(pollHash)
 	)).done([=](const MTPUpdates &result) {
 		_pollReloadRequestIds.erase(itemId);
 		_session->updates().applyUpdates(result);
@@ -210,4 +518,65 @@ void Polls::reloadResults(not_null<HistoryItem*> item) {
 	_pollReloadRequestIds.emplace(itemId, requestId);
 }
 
+void Polls::requestStats(
+		FullMsgId itemId,
+		Fn<void(Data::StatisticalGraph)> done,
+		Fn<void(QString)> fail) {
+	const auto item = _session->data().message(itemId);
+	const auto media = item ? item->media() : nullptr;
+	const auto poll = media ? media->poll() : nullptr;
+	if (!item || !item->isRegular() || !poll) {
+		if (fail) {
+			fail(QString());
+		}
+		return;
+	}
+#ifdef _DEBUG
+	if (base::IsCtrlPressed()) {
+		auto callback = std::move(done);
+		if (callback) {
+			constexpr auto kMockupStatsDelay = 2 * crl::time(1000);
+			auto graph = GenerateMockupPollStats(*poll);
+			base::call_delayed(kMockupStatsDelay, _session, [=]() mutable {
+				callback(std::move(graph));
+			});
+		}
+		return;
+	}
+#endif
+	const auto requestGraph = [=](const QString &token) {
+		_api.request(MTPstats_LoadAsyncGraph(
+			MTP_flags(MTPstats_LoadAsyncGraph::Flag(0)),
+			MTP_string(token),
+			MTP_long(0)
+		)).done([=](const MTPStatsGraph &result) {
+			if (done) {
+				done(Api::StatisticalGraphFromTL(result));
+			}
+		}).fail([=](const MTP::Error &error) {
+			if (fail) {
+				fail(error.type());
+			}
+		}).send();
+	};
+	_api.request(MTPstats_GetPollStats(
+		MTP_flags(MTPstats_GetPollStats::Flags(0)),
+		item->history()->peer->input(),
+		MTP_int(item->id)
+	)).done([=](const MTPstats_PollStats &result) {
+		auto graph = Api::StatisticalGraphFromTL(result.data().vvotes_graph());
+		if (graph.chart || !graph.error.isEmpty() || graph.zoomToken.isEmpty()) {
+			if (done) {
+				done(std::move(graph));
+			}
+		} else {
+			requestGraph(graph.zoomToken);
+		}
+	}).fail([=](const MTP::Error &error) {
+		if (fail) {
+			fail(error.type());
+		}
+	}).send();
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_polls.h b/Telegram/SourceFiles/api/api_polls.h
index 2ff08a1ac35b1c..a7b1491d5f6cc6 100644
--- a/Telegram/SourceFiles/api/api_polls.h
+++ b/Telegram/SourceFiles/api/api_polls.h
@@ -8,10 +8,15 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "mtproto/sender.h"
+#include "ui/text/text_entity.h"
 
 class ApiWrap;
 class HistoryItem;
 struct PollData;
+struct PollMedia;
+namespace Data {
+struct StatisticalGraph;
+} // namespace Data
 
 namespace Main {
 class Session;
@@ -27,20 +32,33 @@ class Polls final {
 
 	void create(
 		const PollData &data,
-		const SendAction &action,
+		const TextWithEntities &text,
+		SendAction action,
 		Fn<void()> done,
-		Fn<void()> fail);
+		Fn<void(bool fileReferenceExpired)> fail);
 	void sendVotes(
 		FullMsgId itemId,
 		const std::vector<QByteArray> &options);
+	void addAnswer(
+		FullMsgId itemId,
+		const TextWithEntities &text,
+		const PollMedia &media,
+		Fn<void()> done,
+		Fn<void(QString)> fail);
+	void deleteAnswer(FullMsgId itemId, const QByteArray &option);
 	void close(not_null<HistoryItem*> item);
 	void reloadResults(not_null<HistoryItem*> item);
+	void requestStats(
+		FullMsgId itemId,
+		Fn<void(Data::StatisticalGraph)> done,
+		Fn<void(QString)> fail);
 
 private:
 	const not_null<Main::Session*> _session;
 	MTP::Sender _api;
 
 	base::flat_map<FullMsgId, mtpRequestId> _pollVotesRequestIds;
+	base::flat_map<FullMsgId, mtpRequestId> _pollAddAnswerRequestIds;
 	base::flat_map<FullMsgId, mtpRequestId> _pollCloseRequestIds;
 	base::flat_map<FullMsgId, mtpRequestId> _pollReloadRequestIds;
 
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 84ce45783b9e48..215c9640f5e5b9 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "api/api_text_entities.h"
 #include "apiwrap.h"
 #include "base/random.h"
+#include "data/data_channel.h"
 #include "data/data_document.h"
 #include "data/data_peer.h"
 #include "data/data_peer_values.h"
@@ -22,6 +23,7 @@ For license and copyright information please follow this link:
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "payments/payments_form.h"
+#include "ui/chat/chat_style.h" // ColorCollectible
 #include "ui/text/format_values.h"
 
 namespace Api {
@@ -34,7 +36,7 @@ namespace {
 		.giveawayId = data.vgiveaway_msg_id().value_or_empty(),
 		.date = data.vdate().v,
 		.used = data.vused_date().value_or_empty(),
-		.months = data.vmonths().v,
+		.days = data.vdays().v,
 		.giveaway = data.is_via_giveaway(),
 	};
 }
@@ -44,19 +46,48 @@ namespace {
 	auto options = PremiumSubscriptionOptionsFromTL(tlOptions);
 	for (auto i = 0; i < options.size(); i++) {
 		const auto &tlOption = tlOptions[i].data();
+		const auto currency = qs(tlOption.vcurrency());
 		const auto perUserText = Ui::FillAmountAndCurrency(
 			tlOption.vamount().v / float64(tlOption.vusers().v),
-			qs(tlOption.vcurrency()),
+			currency,
 			false);
 		options[i].costPerMonth = perUserText
 			+ ' '
 			+ QChar(0x00D7)
 			+ ' '
 			+ QString::number(tlOption.vusers().v);
+		options[i].total = Ui::FillAmountAndCurrency(
+			tlOption.vamount().v,
+			currency);
+		options[i].currency = currency;
 	}
 	return options;
 }
 
+[[nodiscard]] int FindStarsForResale(const MTPVector<MTPStarsAmount> *list) {
+	if (!list) {
+		return 0;
+	}
+	for (const auto &amount : list->v) {
+		if (amount.type() == mtpc_starsAmount) {
+			return int(amount.c_starsAmount().vamount().v);
+		}
+	}
+	return 0;
+}
+
+[[nodiscard]] int64 FindTonForResale(const MTPVector<MTPStarsAmount> *list) {
+	if (!list) {
+		return 0;
+	}
+	for (const auto &amount : list->v) {
+		if (amount.type() == mtpc_starsTonAmount) {
+			return int64(amount.c_starsTonAmount().vamount().v);
+		}
+	}
+	return 0;
+}
+
 } // namespace
 
 Premium::Premium(not_null<ApiWrap*> api)
@@ -67,7 +98,7 @@ Premium::Premium(not_null<ApiWrap*> api)
 		// only queued, because it is not constructed yet.
 		Data::AmPremiumValue(
 			_session
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			reload();
 			if (_session->premium()) {
 				reloadCloudSet();
@@ -337,7 +368,7 @@ void Premium::resolveGiveawayInfo(
 	_giveawayInfoPeer = peer;
 	_giveawayInfoMessageId = messageId;
 	_giveawayInfoRequestId = _api.request(MTPpayments_GetGiveawayInfo(
-		_giveawayInfoPeer->input,
+		_giveawayInfoPeer->input(),
 		MTP_int(_giveawayInfoMessageId.bare)
 	)).done([=](const MTPpayments_GiveawayInfo &result) {
 		_giveawayInfoRequestId = 0;
@@ -377,15 +408,15 @@ const Data::PremiumSubscriptionOptions &Premium::subscriptionOptions() const {
 	return _subscriptionOptions;
 }
 
-rpl::producer<> Premium::somePremiumRequiredResolved() const {
-	return _somePremiumRequiredResolved.events();
+rpl::producer<> Premium::someMessageMoneyRestrictionsResolved() const {
+	return _someMessageMoneyRestrictionsResolved.events();
 }
 
-void Premium::resolvePremiumRequired(not_null<UserData*> user) {
-	_resolvePremiumRequiredUsers.emplace(user);
-	if (!_premiumRequiredRequestScheduled
-		&& _resolvePremiumRequestedUsers.empty()) {
-		_premiumRequiredRequestScheduled = true;
+void Premium::resolveMessageMoneyRestrictions(not_null<UserData*> user) {
+	_resolveMessageMoneyRequiredUsers.emplace(user);
+	if (!_messageMoneyRequestScheduled
+		&& _resolveMessageMoneyRequestedUsers.empty()) {
+		_messageMoneyRequestScheduled = true;
 		crl::on_main(_session, [=] {
 			requestPremiumRequiredSlice();
 		});
@@ -393,50 +424,65 @@ void Premium::resolvePremiumRequired(not_null<UserData*> user) {
 }
 
 void Premium::requestPremiumRequiredSlice() {
-	_premiumRequiredRequestScheduled = false;
-	if (!_resolvePremiumRequestedUsers.empty()
-		|| _resolvePremiumRequiredUsers.empty()) {
+	_messageMoneyRequestScheduled = false;
+	if (!_resolveMessageMoneyRequestedUsers.empty()
+		|| _resolveMessageMoneyRequiredUsers.empty()) {
 		return;
 	}
 	constexpr auto kPerRequest = 100;
-	auto users = MTP_vector_from_range(_resolvePremiumRequiredUsers
+	auto users = MTP_vector_from_range(_resolveMessageMoneyRequiredUsers
 		| ranges::views::transform(&UserData::inputUser));
 	if (users.v.size() > kPerRequest) {
 		auto shortened = users.v;
 		shortened.resize(kPerRequest);
 		users = MTP_vector<MTPInputUser>(std::move(shortened));
-		const auto from = begin(_resolvePremiumRequiredUsers);
-		_resolvePremiumRequestedUsers = { from, from + kPerRequest };
-		_resolvePremiumRequiredUsers.erase(from, from + kPerRequest);
+		const auto from = begin(_resolveMessageMoneyRequiredUsers);
+		_resolveMessageMoneyRequestedUsers = { from, from + kPerRequest };
+		_resolveMessageMoneyRequiredUsers.erase(from, from + kPerRequest);
 	} else {
-		_resolvePremiumRequestedUsers
-			= base::take(_resolvePremiumRequiredUsers);
+		_resolveMessageMoneyRequestedUsers
+			= base::take(_resolveMessageMoneyRequiredUsers);
 	}
-	const auto finish = [=](const QVector<MTPBool> &list) {
-		constexpr auto me = UserDataFlag::MeRequiresPremiumToWrite;
-		constexpr auto known = UserDataFlag::RequirePremiumToWriteKnown;
-		constexpr auto mask = me | known;
+	const auto finish = [=](const QVector<MTPRequirementToContact> &list) {
 
 		auto index = 0;
-		for (const auto &user : base::take(_resolvePremiumRequestedUsers)) {
-			const auto require = (index < list.size())
-				&& mtpIsTrue(list[index++]);
-			user->setFlags((user->flags() & ~mask)
-				| known
-				| (require ? me : UserDataFlag()));
+		for (const auto &user : base::take(_resolveMessageMoneyRequestedUsers)) {
+			const auto set = [&](bool requirePremium, int stars) {
+				using Flag = UserDataFlag;
+				constexpr auto me = Flag::RequiresPremiumToWrite;
+				constexpr auto known = Flag::MessageMoneyRestrictionsKnown;
+				constexpr auto hasPrem = Flag::HasRequirePremiumToWrite;
+				constexpr auto hasStars = Flag::HasStarsPerMessage;
+				user->setStarsPerMessage(stars);
+				user->setFlags((user->flags() & ~me)
+					| known
+					| (requirePremium ? (me | hasPrem) : Flag())
+					| (stars ? hasStars : Flag()));
+			};
+			if (index >= list.size()) {
+				set(false, 0);
+				continue;
+			}
+			list[index++].match([&](const MTPDrequirementToContactEmpty &) {
+				set(false, 0);
+			}, [&](const MTPDrequirementToContactPremium &) {
+				set(true, 0);
+			}, [&](const MTPDrequirementToContactPaidMessages &data) {
+				set(false, data.vstars_amount().v);
+			});
 		}
-		if (!_premiumRequiredRequestScheduled
-			&& !_resolvePremiumRequiredUsers.empty()) {
-			_premiumRequiredRequestScheduled = true;
+		if (!_messageMoneyRequestScheduled
+			&& !_resolveMessageMoneyRequiredUsers.empty()) {
+			_messageMoneyRequestScheduled = true;
 			crl::on_main(_session, [=] {
 				requestPremiumRequiredSlice();
 			});
 		}
-		_somePremiumRequiredResolved.fire({});
+		_someMessageMoneyRestrictionsResolved.fire({});
 	};
 	_session->api().request(
-		MTPusers_GetIsPremiumRequiredToContact(std::move(users))
-	).done([=](const MTPVector<MTPBool> &result) {
+		MTPusers_GetRequirementsToContact(std::move(users))
+	).done([=](const MTPVector<MTPRequirementToContact> &result) {
 		finish(result.v);
 	}).fail([=] {
 		finish({});
@@ -457,16 +503,20 @@ rpl::producer<rpl::no_value, QString> PremiumGiftCodeOptions::request() {
 			MTP_flags(_peer->isChannel()
 				? MTPpayments_GetPremiumGiftCodeOptions::Flag::f_boost_peer
 				: MTPpayments_GetPremiumGiftCodeOptions::Flag(0)),
-			_peer->input
+			_peer->input()
 		)).done([=](const MTPVector<TLOption> &result) {
 			auto tlMapOptions = base::flat_map<Amount, QVector<TLOption>>();
 			for (const auto &tlOption : result.v) {
 				const auto &data = tlOption.data();
 				tlMapOptions[data.vusers().v].push_back(tlOption);
+				if (qs(data.vcurrency()) == Ui::kCreditsCurrency) {
+					continue;
+				}
 
 				const auto token = Token{ data.vusers().v, data.vmonths().v };
 				_stores[token] = Store{
 					.amount = data.vamount().v,
+					.currency = qs(data.vcurrency()),
 					.product = qs(data.vstore_product().value_or_empty()),
 					.quantity = data.vstore_quantity().value_or_empty(),
 				};
@@ -475,14 +525,14 @@ rpl::producer<rpl::no_value, QString> PremiumGiftCodeOptions::request() {
 				}
 			}
 			for (const auto &[amount, tlOptions] : tlMapOptions) {
-				if (amount == 1 && _optionsForOnePerson.currency.isEmpty()) {
-					_optionsForOnePerson.currency = qs(
-						tlOptions.front().data().vcurrency());
+				if (amount == 1 && _optionsForOnePerson.currencies.empty()) {
 					for (const auto &option : tlOptions) {
 						_optionsForOnePerson.months.push_back(
 							option.data().vmonths().v);
 						_optionsForOnePerson.totalCosts.push_back(
 							option.data().vamount().v);
+						_optionsForOnePerson.currencies.push_back(
+							qs(option.data().vcurrency()));
 					}
 				}
 				_subscriptionOptions[amount] = GiftCodesFromTL(tlOptions);
@@ -507,9 +557,9 @@ rpl::producer<rpl::no_value, QString> PremiumGiftCodeOptions::applyPrepaid(
 		}
 
 		_api.request(MTPpayments_LaunchPrepaidGiveaway(
-			_peer->input,
+			_peer->input(),
 			MTP_long(prepaidId),
-			invoice.creditsAmount
+			invoice.giveawayCredits
 				? Payments::InvoiceCreditsGiveawayToTL(invoice)
 				: Payments::InvoicePremiumGiftCodeGiveawayToTL(invoice)
 		)).done([=](const MTPUpdates &result) {
@@ -540,7 +590,7 @@ Payments::InvoicePremiumGiftCode PremiumGiftCodeOptions::invoice(
 	const auto token = Token{ users, months };
 	const auto &store = _stores[token];
 	return Payments::InvoicePremiumGiftCode{
-		.currency = _optionsForOnePerson.currency,
+		.currency = store.currency,
 		.storeProduct = store.product,
 		.randomId = randomId,
 		.amount = store.amount,
@@ -553,14 +603,15 @@ Payments::InvoicePremiumGiftCode PremiumGiftCodeOptions::invoice(
 std::vector<GiftOptionData> PremiumGiftCodeOptions::optionsForPeer() const {
 	auto result = std::vector<GiftOptionData>();
 
-	if (!_optionsForOnePerson.currency.isEmpty()) {
+	if (!_optionsForOnePerson.currencies.empty()) {
 		const auto count = int(_optionsForOnePerson.months.size());
 		result.reserve(count);
 		for (auto i = 0; i != count; ++i) {
 			Assert(i < _optionsForOnePerson.totalCosts.size());
+			Assert(i < _optionsForOnePerson.currencies.size());
 			result.push_back({
 				.cost = _optionsForOnePerson.totalCosts[i],
-				.currency = _optionsForOnePerson.currency,
+				.currency = _optionsForOnePerson.currencies[i],
 				.months = _optionsForOnePerson.months[i],
 			});
 		}
@@ -568,24 +619,32 @@ std::vector<GiftOptionData> PremiumGiftCodeOptions::optionsForPeer() const {
 	return result;
 }
 
-Data::PremiumSubscriptionOptions PremiumGiftCodeOptions::options(int amount) {
-	const auto it = _subscriptionOptions.find(amount);
+Data::PremiumSubscriptionOptions PremiumGiftCodeOptions::optionsForGiveaway(
+		int usersCount) {
+	const auto skipForStars = [&](Data::PremiumSubscriptionOptions options) {
+		const auto proj = &Data::PremiumSubscriptionOption::currency;
+		options.erase(
+			ranges::remove(options, Ui::kCreditsCurrency, proj),
+			end(options));
+		return options;
+	};
+	const auto it = _subscriptionOptions.find(usersCount);
 	if (it != end(_subscriptionOptions)) {
-		return it->second;
+		return skipForStars(it->second);
 	} else {
 		auto tlOptions = QVector<MTPPremiumGiftCodeOption>();
 		for (auto i = 0; i < _optionsForOnePerson.months.size(); i++) {
 			tlOptions.push_back(MTP_premiumGiftCodeOption(
 				MTP_flags(MTPDpremiumGiftCodeOption::Flags(0)),
-				MTP_int(amount),
+				MTP_int(usersCount),
 				MTP_int(_optionsForOnePerson.months[i]),
 				MTPstring(),
 				MTPint(),
-				MTP_string(_optionsForOnePerson.currency),
-				MTP_long(_optionsForOnePerson.totalCosts[i] * amount)));
+				MTP_string(_optionsForOnePerson.currencies[i]),
+				MTP_long(_optionsForOnePerson.totalCosts[i] * usersCount)));
 		}
-		_subscriptionOptions[amount] = GiftCodesFromTL(tlOptions);
-		return _subscriptionOptions[amount];
+		_subscriptionOptions[usersCount] = GiftCodesFromTL(tlOptions);
+		return skipForStars(_subscriptionOptions[usersCount]);
 	}
 }
 
@@ -598,10 +657,12 @@ auto PremiumGiftCodeOptions::requestStarGifts()
 			MTP_int(0)
 		)).done([=](const MTPpayments_StarGifts &result) {
 			result.match([&](const MTPDpayments_starGifts &data) {
+				_peer->owner().processUsers(data.vusers());
+				_peer->owner().processChats(data.vchats());
 				_giftsHash = data.vhash().v;
 				const auto &list = data.vgifts().v;
 				const auto session = &_peer->session();
-				auto gifts = std::vector<StarGift>();
+				auto gifts = std::vector<Data::StarGift>();
 				gifts.reserve(list.size());
 				for (const auto &gift : list) {
 					if (auto parsed = FromTL(session, gift)) {
@@ -620,7 +681,8 @@ auto PremiumGiftCodeOptions::requestStarGifts()
 	};
 }
 
-const std::vector<StarGift> &PremiumGiftCodeOptions::starGifts() const {
+auto PremiumGiftCodeOptions::starGifts() const
+-> const std::vector<Data::StarGift> & {
 	return _gifts;
 }
 
@@ -693,28 +755,38 @@ rpl::producer<rpl::no_value, QString> SponsoredToggle::setToggled(bool v) {
 	};
 }
 
-RequirePremiumState ResolveRequiresPremiumToWrite(
+MessageMoneyRestriction ResolveMessageMoneyRestrictions(
 		not_null<PeerData*> peer,
 		History *maybeHistory) {
+	if (const auto channel = peer->asChannel()) {
+		return {
+			.starsPerMessage = channel->starsPerMessageChecked(),
+			.known = true,
+		};
+	}
 	const auto user = peer->asUser();
-	if (!user
-		|| !user->someRequirePremiumToWrite()
-		|| user->session().premium()) {
-		return RequirePremiumState::No;
-	} else if (user->requirePremiumToWriteKnown()) {
-		return user->meRequiresPremiumToWrite()
-			? RequirePremiumState::Yes
-			: RequirePremiumState::No;
+	if (!user) {
+		return { .known = true };
+	} else if (user->messageMoneyRestrictionsKnown()) {
+		return {
+			.starsPerMessage = user->starsPerMessageChecked(),
+			.premiumRequired = (user->requiresPremiumToWrite()
+				&& !user->session().premium()),
+			.known = true,
+		};
+	} else if (user->hasStarsPerMessage()) {
+		return {};
+	} else if (!user->hasRequirePremiumToWrite()) {
+		return { .known = true };
 	} else if (user->flags() & UserDataFlag::MutualContact) {
-		return RequirePremiumState::No;
+		return { .known = true };
 	} else if (!maybeHistory) {
-		return RequirePremiumState::Unknown;
+		return {};
 	}
-
 	const auto update = [&](bool require) {
 		using Flag = UserDataFlag;
-		constexpr auto known = Flag::RequirePremiumToWriteKnown;
-		constexpr auto me = Flag::MeRequiresPremiumToWrite;
+		constexpr auto known = Flag::MessageMoneyRestrictionsKnown;
+		constexpr auto me = Flag::RequiresPremiumToWrite;
 		user->setFlags((user->flags() & ~me)
 			| known
 			| (require ? me : Flag()));
@@ -726,16 +798,19 @@ RequirePremiumState ResolveRequiresPremiumToWrite(
 			const auto item = view->data();
 			if (!item->out() && !item->isService()) {
 				update(false);
-				return RequirePremiumState::No;
+				return { .known = true };
 			}
 		}
 	}
 	if (user->isContact() // Here we know, that we're not in his contacts.
 		&& maybeHistory->loadedAtTop() // And no incoming messages.
 		&& maybeHistory->loadedAtBottom()) {
-		update(true);
+		return {
+			.premiumRequired = !user->session().premium(),
+			.known = true,
+		};
 	}
-	return RequirePremiumState::Unknown;
+	return {};
 }
 
 rpl::producer<DocumentData*> RandomHelloStickerValue(
@@ -758,56 +833,284 @@ rpl::producer<DocumentData*> RandomHelloStickerValue(
 	}) | rpl::take(1) | rpl::map(random));
 }
 
-std::optional<StarGift> FromTL(
+std::optional<Data::StarGift> FromTL(
 		not_null<Main::Session*> session,
 		const MTPstarGift &gift) {
-	const auto &data = gift.data();
-	const auto document = session->data().processDocument(
-		data.vsticker());
-	const auto remaining = data.vavailability_remains();
-	const auto total = data.vavailability_total();
-	if (!document->sticker()) {
-		return {};
-	}
-	return StarGift{
-		.id = uint64(data.vid().v),
-		.stars = int64(data.vstars().v),
-		.convertStars = int64(data.vconvert_stars().v),
-		.document = document,
-		.limitedLeft = remaining.value_or_empty(),
-		.limitedCount = total.value_or_empty(),
-	};
+	return gift.match([&](const MTPDstarGift &data) {
+		const auto document = session->data().processDocument(
+			data.vsticker());
+		const auto resellPrice = data.vresell_min_stars().value_or_empty();
+		const auto remaining = data.vavailability_remains();
+		const auto total = data.vavailability_total();
+		if (!document->sticker()) {
+			return std::optional<Data::StarGift>();
+		}
+		const auto releasedById = data.vreleased_by()
+			? peerFromMTP(*data.vreleased_by())
+			: PeerId();
+		const auto releasedBy = releasedById
+			? session->data().peer(releasedById).get()
+			: nullptr;
+		const auto background = [&] {
+			if (!data.vbackground()) {
+				return std::shared_ptr<Data::StarGiftBackground>();
+			}
+			const auto &fields = data.vbackground()->data();
+			using namespace Ui;
+			return std::make_shared<Data::StarGiftBackground>(
+				Data::StarGiftBackground{
+					.center = ColorFromSerialized(fields.vcenter_color()),
+					.edge = ColorFromSerialized(fields.vedge_color()),
+					.text = ColorFromSerialized(fields.vtext_color()),
+				});
+		};
+		return std::optional<Data::StarGift>(Data::StarGift{
+			.id = uint64(data.vid().v),
+			.background = background(),
+			.stars = int64(data.vstars().v),
+			.starsConverted = int64(data.vconvert_stars().v),
+			.starsToUpgrade = int64(data.vupgrade_stars().value_or_empty()),
+			.starsResellMin = int64(resellPrice),
+			.document = document,
+			.releasedBy = releasedBy,
+			.resellTitle = qs(data.vtitle().value_or_empty()),
+			.resellCount = int(data.vavailability_resale().value_or_empty()),
+			.auctionSlug = qs(data.vauction_slug().value_or_empty()),
+			.auctionGiftsPerRound = data.vgifts_per_round().value_or_empty(),
+			.auctionStartDate = data.vauction_start_date().value_or_empty(),
+			.limitedLeft = remaining.value_or_empty(),
+			.limitedCount = total.value_or_empty(),
+			.perUserTotal = data.vper_user_total().value_or_empty(),
+			.perUserRemains = data.vper_user_remains().value_or_empty(),
+			.upgradeVariants = data.vupgrade_variants().value_or_empty(),
+			.firstSaleDate = data.vfirst_sale_date().value_or_empty(),
+			.lastSaleDate = data.vlast_sale_date().value_or_empty(),
+			.lockedUntilDate = data.vlocked_until_date().value_or_empty(),
+			.requirePremium = data.is_require_premium(),
+			.peerColorAvailable = data.is_peer_color_available(),
+			.upgradable = data.vupgrade_stars().has_value(),
+			.birthday = data.is_birthday(),
+			.soldOut = data.is_sold_out(),
+		});
+	}, [&](const MTPDstarGiftUnique &data) {
+		const auto total = data.vavailability_total().v;
+		auto model = std::optional<Data::UniqueGiftModel>();
+		auto pattern = std::optional<Data::UniqueGiftPattern>();
+		for (const auto &attribute : data.vattributes().v) {
+			attribute.match([&](const MTPDstarGiftAttributeModel &data) {
+				model = FromTL(session, data);
+			}, [&](const MTPDstarGiftAttributePattern &data) {
+				pattern = FromTL(session, data);
+			}, [&](const MTPDstarGiftAttributeBackdrop &data) {
+			}, [&](const MTPDstarGiftAttributeOriginalDetails &data) {
+			});
+		}
+		if (!model
+			|| !model->document->sticker()
+			|| !pattern
+			|| !pattern->document->sticker()) {
+			return std::optional<Data::StarGift>();
+		}
+		const auto releasedById = data.vreleased_by()
+			? peerFromMTP(*data.vreleased_by())
+			: PeerId();
+		const auto themeUserId = data.vtheme_peer()
+			? peerFromMTP(*data.vtheme_peer())
+			: PeerId();
+		const auto releasedBy = releasedById
+			? session->data().peer(releasedById).get()
+			: nullptr;
+		const auto themeUser = themeUserId
+			? session->data().peer(themeUserId).get()
+			: nullptr;
+		const auto colorCollectible = (data.vpeer_color()
+			&& data.vpeer_color()->type() == mtpc_peerColorCollectible)
+			? std::make_shared<Ui::ColorCollectible>(
+				Data::ParseColorCollectible(
+					data.vpeer_color()->c_peerColorCollectible()))
+			: nullptr;
+		auto result = Data::StarGift{
+			.id = data.vid().v,
+			.unique = std::make_shared<Data::UniqueGift>(Data::UniqueGift{
+				.id = data.vid().v,
+				.initialGiftId = data.vgift_id().v,
+				.slug = qs(data.vslug()),
+				.title = qs(data.vtitle()),
+				.giftAddress = qs(data.vgift_address().value_or_empty()),
+				.ownerAddress = qs(data.vowner_address().value_or_empty()),
+				.ownerName = qs(data.vowner_name().value_or_empty()),
+				.ownerId = (data.vowner_id()
+					? peerFromMTP(*data.vowner_id())
+					: PeerId()),
+				.hostId = (data.vhost_id()
+					? peerFromMTP(*data.vhost_id())
+					: PeerId()),
+				.releasedBy = releasedBy,
+				.themeUser = themeUser,
+				.nanoTonForResale = FindTonForResale(data.vresell_amount()),
+				.craftChancePermille
+					= data.vcraft_chance_permille().value_or_empty(),
+				.starsForResale = FindStarsForResale(data.vresell_amount()),
+				.starsMinOffer = data.voffer_min_stars().value_or(-1),
+				.number = data.vnum().v,
+				.onlyAcceptTon = data.is_resale_ton_only(),
+				.canBeTheme = data.is_theme_available(),
+				.crafted = data.is_crafted(),
+				.burned = data.is_burned(),
+				.model = *model,
+				.pattern = *pattern,
+				.value = (data.vvalue_amount()
+					? std::make_shared<Data::UniqueGiftValue>(
+						Data::UniqueGiftValue{
+							.currency = qs(
+								data.vvalue_currency().value_or_empty()),
+							.valuePrice = int64(
+								data.vvalue_amount().value_or_empty()),
+							.valuePriceUsd = int64(
+								data.vvalue_usd_amount().value_or_empty()),
+						})
+					: nullptr),
+				.peerColor = colorCollectible,
+			}),
+			.document = model->document,
+			.releasedBy = releasedBy,
+			.limitedLeft = (total - data.vavailability_issued().v),
+			.limitedCount = total,
+			.resellTonOnly = data.is_resale_ton_only(),
+			.requirePremium = data.is_require_premium(),
+		};
+		const auto unique = result.unique.get();
+		for (const auto &attribute : data.vattributes().v) {
+			attribute.match([&](const MTPDstarGiftAttributeModel &data) {
+			}, [&](const MTPDstarGiftAttributePattern &data) {
+			}, [&](const MTPDstarGiftAttributeBackdrop &data) {
+				unique->backdrop = FromTL(data);
+			}, [&](const MTPDstarGiftAttributeOriginalDetails &data) {
+				unique->originalDetails = FromTL(session, data);
+			});
+		}
+		return std::make_optional(std::move(result));
+	});
 }
 
-std::optional<UserStarGift> FromTL(
-		not_null<UserData*> to,
-		const MTPuserStarGift &gift) {
+std::optional<Data::SavedStarGift> FromTL(
+		not_null<PeerData*> to,
+		const MTPsavedStarGift &gift) {
 	const auto session = &to->session();
 	const auto &data = gift.data();
 	auto parsed = FromTL(session, data.vgift());
 	if (!parsed) {
 		return {};
+	} else if (const auto unique = parsed->unique.get()) {
+		unique->starsForTransfer = data.vtransfer_stars().value_or(-1);
+		unique->exportAt = data.vcan_export_at().value_or_empty();
+		unique->canTransferAt = data.vcan_transfer_at().value_or_empty();
+		unique->canResellAt = data.vcan_resell_at().value_or_empty();
+		unique->canCraftAt = data.vcan_craft_at().value_or_empty();
 	}
-	return UserStarGift{
-		.gift = std::move(*parsed),
+	using Id = Data::SavedStarGiftId;
+	const auto hasUnique = parsed->unique != nullptr;
+	return Data::SavedStarGift{
+		.info = std::move(*parsed),
+		.manageId = (to->isUser()
+			? Id::User(data.vmsg_id().value_or_empty())
+			: Id::Chat(to, data.vsaved_id().value_or_empty())),
+		.collectionIds = (data.vcollection_id()
+			? (data.vcollection_id()->v
+				| ranges::views::transform(&MTPint::v)
+				| ranges::to_vector)
+			: std::vector<int>()),
 		.message = (data.vmessage()
-			? TextWithEntities{
-				.text = qs(data.vmessage()->data().vtext()),
-				.entities = Api::EntitiesFromMTP(
-					session,
-					data.vmessage()->data().ventities().v),
-			}
+			? Api::ParseTextWithEntities(
+				session,
+				*data.vmessage())
 			: TextWithEntities()),
-		.convertStars = int64(data.vconvert_stars().value_or_empty()),
+		.starsConverted = int64(data.vconvert_stars().value_or_empty()),
+		.starsUpgradedBySender = int64(
+			data.vupgrade_stars().value_or_empty()),
+		.starsForDetailsRemove = int64(
+			data.vdrop_original_details_stars().value_or_empty()),
+		.giftPrepayUpgradeHash = qs(
+			data.vprepaid_upgrade_hash().value_or_empty()),
 		.fromId = (data.vfrom_id()
-			? peerFromUser(data.vfrom_id()->v)
+			? peerFromMTP(*data.vfrom_id())
 			: PeerId()),
-		.messageId = data.vmsg_id().value_or_empty(),
 		.date = data.vdate().v,
+		.giftNum = data.vgift_num().value_or_empty(),
+		.upgradeSeparate = data.is_upgrade_separate(),
+		.upgradable = data.is_can_upgrade(),
 		.anonymous = data.is_name_hidden(),
+		.pinned = data.is_pinned_to_top() && hasUnique,
 		.hidden = data.is_unsaved(),
 		.mine = to->isSelf(),
 	};
 }
 
+int ParseRarity(const MTPStarGiftAttributeRarity &rarity) {
+	return rarity.match([&](const MTPDstarGiftAttributeRarity &data) {
+		return std::max(data.vpermille().v, 0);
+	}, [&](const MTPDstarGiftAttributeRarityUncommon &) {
+		return int(Data::UniqueGiftRarity::Uncommon);
+	}, [&](const MTPDstarGiftAttributeRarityRare &) {
+		return int(Data::UniqueGiftRarity::Rare);
+	}, [&](const MTPDstarGiftAttributeRarityEpic &) {
+		return int(Data::UniqueGiftRarity::Epic);
+	}, [&](const MTPDstarGiftAttributeRarityLegendary &) {
+		return int(Data::UniqueGiftRarity::Legendary);
+	});
+}
+
+Data::UniqueGiftModel FromTL(
+		not_null<Main::Session*> session,
+		const MTPDstarGiftAttributeModel &data) {
+	auto result = Data::UniqueGiftModel{
+		.document = session->data().processDocument(data.vdocument()),
+	};
+	result.name = qs(data.vname());
+	result.rarityValue = ParseRarity(data.vrarity());
+	return result;
+}
+
+Data::UniqueGiftPattern FromTL(
+		not_null<Main::Session*> session,
+		const MTPDstarGiftAttributePattern &data) {
+	auto result = Data::UniqueGiftPattern{
+		.document = session->data().processDocument(data.vdocument()),
+	};
+	result.document->overrideEmojiUsesTextColor(true);
+	result.name = qs(data.vname());
+	result.rarityValue = ParseRarity(data.vrarity());
+	return result;
+}
+
+Data::UniqueGiftBackdrop FromTL(const MTPDstarGiftAttributeBackdrop &data) {
+	auto result = Data::UniqueGiftBackdrop{ .id = data.vbackdrop_id().v };
+	result.name = qs(data.vname());
+	result.rarityValue = ParseRarity(data.vrarity());
+	result.centerColor = Ui::ColorFromSerialized(
+		data.vcenter_color());
+	result.edgeColor = Ui::ColorFromSerialized(
+		data.vedge_color());
+	result.patternColor = Ui::ColorFromSerialized(
+		data.vpattern_color());
+	result.textColor = Ui::ColorFromSerialized(
+		data.vtext_color());
+	return result;
+}
+
+Data::UniqueGiftOriginalDetails FromTL(
+		not_null<Main::Session*> session,
+		const MTPDstarGiftAttributeOriginalDetails &data) {
+	auto result = Data::UniqueGiftOriginalDetails();
+	result.date = data.vdate().v;
+	result.senderId = data.vsender_id()
+		? peerFromMTP(*data.vsender_id())
+		: PeerId();
+	result.recipientId = peerFromMTP(data.vrecipient_id());
+	result.message = data.vmessage()
+		? ParseTextWithEntities(session, *data.vmessage())
+		: TextWithEntities();
+	return result;
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_premium.h b/Telegram/SourceFiles/api/api_premium.h
index 805b68e03880ec..08b0f28b1bfbe1 100644
--- a/Telegram/SourceFiles/api/api_premium.h
+++ b/Telegram/SourceFiles/api/api_premium.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "data/data_premium_subscription_option.h"
+#include "data/data_star_gift.h"
 #include "mtproto/sender.h"
 
 class History;
@@ -29,11 +30,11 @@ struct GiftCode {
 	MsgId giveawayId = 0;
 	TimeId date = 0;
 	TimeId used = 0; // 0 if not used.
-	int months = 0;
+	int days = 0;
 	bool giveaway = false;
 
 	explicit operator bool() const {
-		return months != 0;
+		return days != 0;
 	}
 
 	friend inline bool operator==(
@@ -73,27 +74,6 @@ struct GiftOptionData {
 	int months = 0;
 };
 
-struct StarGift {
-	uint64 id = 0;
-	int64 stars = 0;
-	int64 convertStars = 0;
-	not_null<DocumentData*> document;
-	int limitedLeft = 0;
-	int limitedCount = 0;
-};
-
-struct UserStarGift {
-	StarGift gift;
-	TextWithEntities message;
-	int64 convertStars = 0;
-	PeerId fromId = 0;
-	MsgId messageId = 0;
-	TimeId date = 0;
-	bool anonymous = false;
-	bool hidden = false;
-	bool mine = false;
-};
-
 class Premium final {
 public:
 	explicit Premium(not_null<ApiWrap*> api);
@@ -136,8 +116,9 @@ class Premium final {
 	[[nodiscard]] auto subscriptionOptions() const
 		-> const Data::PremiumSubscriptionOptions &;
 
-	[[nodiscard]] rpl::producer<> somePremiumRequiredResolved() const;
-	void resolvePremiumRequired(not_null<UserData*> user);
+	[[nodiscard]] auto someMessageMoneyRestrictionsResolved() const
+		-> rpl::producer<>;
+	void resolveMessageMoneyRestrictions(not_null<UserData*> user);
 
 private:
 	void reloadPromo();
@@ -186,10 +167,10 @@ class Premium final {
 
 	Data::PremiumSubscriptionOptions _subscriptionOptions;
 
-	rpl::event_stream<> _somePremiumRequiredResolved;
-	base::flat_set<not_null<UserData*>> _resolvePremiumRequiredUsers;
-	base::flat_set<not_null<UserData*>> _resolvePremiumRequestedUsers;
-	bool _premiumRequiredRequestScheduled = false;
+	rpl::event_stream<> _someMessageMoneyRestrictionsResolved;
+	base::flat_set<not_null<UserData*>> _resolveMessageMoneyRequiredUsers;
+	base::flat_set<not_null<UserData*>> _resolveMessageMoneyRequestedUsers;
+	bool _messageMoneyRequestScheduled = false;
 
 };
 
@@ -199,7 +180,8 @@ class PremiumGiftCodeOptions final {
 
 	[[nodiscard]] rpl::producer<rpl::no_value, QString> request();
 	[[nodiscard]] std::vector<GiftOptionData> optionsForPeer() const;
-	[[nodiscard]] Data::PremiumSubscriptionOptions options(int amount);
+	[[nodiscard]] Data::PremiumSubscriptionOptions optionsForGiveaway(
+			int usersCount);
 	[[nodiscard]] const std::vector<int> &availablePresets() const;
 	[[nodiscard]] int monthsFromPreset(int monthsIndex);
 	[[nodiscard]] Payments::InvoicePremiumGiftCode invoice(
@@ -216,7 +198,7 @@ class PremiumGiftCodeOptions final {
 	[[nodiscard]] bool giveawayGiftsPurchaseAvailable() const;
 
 	[[nodiscard]] rpl::producer<rpl::no_value, QString> requestStarGifts();
-	[[nodiscard]] const std::vector<StarGift> &starGifts() const;
+	[[nodiscard]] const std::vector<Data::StarGift> &starGifts() const;
 
 private:
 	struct Token final {
@@ -228,6 +210,7 @@ class PremiumGiftCodeOptions final {
 	};
 	struct Store final {
 		uint64 amount = 0;
+		QString currency;
 		QString product;
 		int quantity = 0;
 	};
@@ -238,7 +221,7 @@ class PremiumGiftCodeOptions final {
 	struct {
 		std::vector<int> months;
 		std::vector<int64> totalCosts;
-		QString currency;
+		std::vector<QString> currencies;
 	} _optionsForOnePerson;
 
 	std::vector<int> _availablePresets;
@@ -246,7 +229,7 @@ class PremiumGiftCodeOptions final {
 	base::flat_map<Token, Store> _stores;
 
 	int32 _giftsHash = 0;
-	std::vector<StarGift> _gifts;
+	std::vector<Data::StarGift> _gifts;
 
 	MTP::Sender _api;
 
@@ -264,23 +247,43 @@ class SponsoredToggle final {
 
 };
 
-enum class RequirePremiumState {
-	Unknown,
-	Yes,
-	No,
+struct MessageMoneyRestriction {
+	int starsPerMessage = 0;
+	bool premiumRequired = false;
+	bool known = false;
+
+	explicit operator bool() const {
+		return starsPerMessage != 0 || premiumRequired;
+	}
+
+	friend inline bool operator==(
+		const MessageMoneyRestriction &,
+		const MessageMoneyRestriction &) = default;
 };
-[[nodiscard]] RequirePremiumState ResolveRequiresPremiumToWrite(
+[[nodiscard]] MessageMoneyRestriction ResolveMessageMoneyRestrictions(
 	not_null<PeerData*> peer,
 	History *maybeHistory);
 
 [[nodiscard]] rpl::producer<DocumentData*> RandomHelloStickerValue(
 	not_null<Main::Session*> session);
 
-[[nodiscard]] std::optional<StarGift> FromTL(
+[[nodiscard]] std::optional<Data::StarGift> FromTL(
 	not_null<Main::Session*> session,
 	const MTPstarGift &gift);
-[[nodiscard]] std::optional<UserStarGift> FromTL(
-	not_null<UserData*> to,
-	const MTPuserStarGift &gift);
+[[nodiscard]] std::optional<Data::SavedStarGift> FromTL(
+	not_null<PeerData*> to,
+	const MTPsavedStarGift &gift);
+
+[[nodiscard]] Data::UniqueGiftModel FromTL(
+	not_null<Main::Session*> session,
+	const MTPDstarGiftAttributeModel &data);
+[[nodiscard]] Data::UniqueGiftPattern FromTL(
+	not_null<Main::Session*> session,
+	const MTPDstarGiftAttributePattern &data);
+[[nodiscard]] Data::UniqueGiftBackdrop FromTL(
+	const MTPDstarGiftAttributeBackdrop &data);
+[[nodiscard]] Data::UniqueGiftOriginalDetails FromTL(
+	not_null<Main::Session*> session,
+	const MTPDstarGiftAttributeOriginalDetails &data);
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_premium_option.cpp b/Telegram/SourceFiles/api/api_premium_option.cpp
index bd3056a756b3a6..3acd9aca2b2213 100644
--- a/Telegram/SourceFiles/api/api_premium_option.cpp
+++ b/Telegram/SourceFiles/api/api_premium_option.cpp
@@ -15,24 +15,34 @@ constexpr auto kDiscountDivider = 1.;
 
 Data::PremiumSubscriptionOption CreateSubscriptionOption(
 		int months,
-		int monthlyAmount,
+		float64 monthlyAmount,
 		int64 amount,
 		const QString &currency,
 		const QString &botUrl) {
+	const auto baselineAmount = monthlyAmount * months;
 	const auto discount = [&] {
-		const auto percent = 1. - float64(amount) / (monthlyAmount * months);
-		return std::round(percent * 100. / kDiscountDivider)
+		const auto percent = 1. - float64(amount) / baselineAmount;
+		return base::SafeRound(percent * 100. / kDiscountDivider)
 			* kDiscountDivider;
 	}();
+	const auto hasDiscount = (discount > 0);
 	return {
+		.months = months,
 		.duration = Ui::FormatTTL(months * 86400 * 31),
-		.discount = discount
+		.discount = hasDiscount
 			? QString::fromUtf8("\xe2\x88\x92%1%").arg(discount)
 			: QString(),
 		.costPerMonth = Ui::FillAmountAndCurrency(
-			amount / float64(months),
+			int64(base::SafeRound(amount / float64(months))),
+			currency),
+		.costNoDiscount = hasDiscount
+			? Ui::FillAmountAndCurrency(
+				int64(base::SafeRound(baselineAmount)),
+				currency)
+			: QString(),
+		.costPerYear = Ui::FillAmountAndCurrency(
+			int64(base::SafeRound(amount / float64(months / 12.))),
 			currency),
-		.costTotal = Ui::FillAmountAndCurrency(amount, currency),
 		.botUrl = botUrl,
 	};
 }
diff --git a/Telegram/SourceFiles/api/api_premium_option.h b/Telegram/SourceFiles/api/api_premium_option.h
index afe66ac4acbf72..4b265f1fb375e7 100644
--- a/Telegram/SourceFiles/api/api_premium_option.h
+++ b/Telegram/SourceFiles/api/api_premium_option.h
@@ -13,7 +13,7 @@ namespace Api {
 
 [[nodiscard]] Data::PremiumSubscriptionOption CreateSubscriptionOption(
 	int months,
-	int monthlyAmount,
+	float64 monthlyAmount,
 	int64 amount,
 	const QString &currency,
 	const QString &botUrl);
@@ -24,15 +24,26 @@ template<typename Option>
 	if (tlOpts.isEmpty()) {
 		return {};
 	}
+	auto monthlyAmountPerCurrency = base::flat_map<QString, float64>();
 	auto result = Data::PremiumSubscriptionOptions();
-	const auto monthlyAmount = [&] {
+	const auto monthlyAmount = [&](const QString &currency) -> float64 {
+		const auto it = monthlyAmountPerCurrency.find(currency);
+		if (it != end(monthlyAmountPerCurrency)) {
+			return it->second;
+		}
 		const auto &min = ranges::min_element(
 			tlOpts,
 			ranges::less(),
-			[](const Option &o) { return o.data().vamount().v; }
+			[&](const Option &o) {
+				return currency == qs(o.data().vcurrency())
+					? o.data().vamount().v
+					: std::numeric_limits<int64_t>::max();
+			}
 		)->data();
-		return min.vamount().v / float64(min.vmonths().v);
-	}();
+		const auto monthly = min.vamount().v / float64(min.vmonths().v);
+		monthlyAmountPerCurrency.emplace(currency, monthly);
+		return monthly;
+	};
 	result.reserve(tlOpts.size());
 	for (const auto &tlOption : tlOpts) {
 		const auto &option = tlOption.data();
@@ -45,7 +56,7 @@ template<typename Option>
 		const auto currency = qs(option.vcurrency());
 		result.push_back(CreateSubscriptionOption(
 			months,
-			monthlyAmount,
+			monthlyAmount(currency),
 			amount,
 			currency,
 			botUrl));
diff --git a/Telegram/SourceFiles/api/api_reactions_notify_settings.cpp b/Telegram/SourceFiles/api/api_reactions_notify_settings.cpp
new file mode 100644
index 00000000000000..e28d52ff026039
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_reactions_notify_settings.cpp
@@ -0,0 +1,185 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_reactions_notify_settings.h"
+
+#include "apiwrap.h"
+#include "main/main_session.h"
+
+namespace Api {
+namespace {
+
+[[nodiscard]] ReactionsNotifyFrom ParseFrom(
+		const MTPReactionNotificationsFrom &from) {
+	return from.match([](const MTPDreactionNotificationsFromContacts &) {
+		return ReactionsNotifyFrom::Contacts;
+	}, [](const MTPDreactionNotificationsFromAll &) {
+		return ReactionsNotifyFrom::All;
+	});
+}
+
+[[nodiscard]] MTPReactionNotificationsFrom SerializeFrom(
+		ReactionsNotifyFrom from) {
+	switch (from) {
+	case ReactionsNotifyFrom::Contacts:
+		return MTP_reactionNotificationsFromContacts();
+	case ReactionsNotifyFrom::All:
+		return MTP_reactionNotificationsFromAll();
+	}
+	Unexpected("Value in SerializeFrom.");
+}
+
+} // namespace
+
+ReactionsNotifySettings::ReactionsNotifySettings(not_null<ApiWrap*> api)
+: _session(&api->session())
+, _api(&api->instance()) {
+}
+
+void ReactionsNotifySettings::reload(Fn<void()> callback) {
+	if (callback) {
+		_callbacks.push_back(std::move(callback));
+	}
+	if (_requestId) {
+		return;
+	}
+	_requestId = _api.request(MTPaccount_GetReactionsNotifySettings(
+	)).done([=](const MTPReactionsNotifySettings &result) {
+		_requestId = 0;
+		apply(result);
+		for (const auto &callback : base::take(_callbacks)) {
+			callback();
+		}
+	}).fail([=] {
+		_requestId = 0;
+		for (const auto &callback : base::take(_callbacks)) {
+			callback();
+		}
+	}).send();
+}
+
+void ReactionsNotifySettings::updateMessagesFrom(ReactionsNotifyFrom value) {
+	_messagesFrom = value;
+	save();
+}
+
+void ReactionsNotifySettings::updatePollVotesFrom(
+		ReactionsNotifyFrom value) {
+	_pollVotesFrom = value;
+	save();
+}
+
+void ReactionsNotifySettings::setAllFrom(ReactionsNotifyFrom value) {
+	_messagesFrom = value;
+	_pollVotesFrom = value;
+	save();
+}
+
+void ReactionsNotifySettings::updateShowPreviews(bool value) {
+	_showPreviews = value;
+	save();
+}
+
+ReactionsNotifyFrom ReactionsNotifySettings::messagesFromCurrent() const {
+	return _messagesFrom.current();
+}
+
+rpl::producer<ReactionsNotifyFrom> ReactionsNotifySettings::messagesFrom() const {
+	return _messagesFrom.value();
+}
+
+ReactionsNotifyFrom ReactionsNotifySettings::pollVotesFromCurrent() const {
+	return _pollVotesFrom.current();
+}
+
+rpl::producer<ReactionsNotifyFrom> ReactionsNotifySettings::pollVotesFrom() const {
+	return _pollVotesFrom.value();
+}
+
+bool ReactionsNotifySettings::showPreviewsCurrent() const {
+	return _showPreviews.current();
+}
+
+rpl::producer<bool> ReactionsNotifySettings::showPreviews() const {
+	return _showPreviews.value();
+}
+
+bool ReactionsNotifySettings::enabledCurrent() const {
+	return (_messagesFrom.current() != ReactionsNotifyFrom::None)
+		|| (_pollVotesFrom.current() != ReactionsNotifyFrom::None);
+}
+
+rpl::producer<bool> ReactionsNotifySettings::enabled() const {
+	return rpl::combine(
+		_messagesFrom.value(),
+		_pollVotesFrom.value()
+	) | rpl::map([](
+			ReactionsNotifyFrom messages,
+			ReactionsNotifyFrom pollVotes) {
+		return (messages != ReactionsNotifyFrom::None)
+			|| (pollVotes != ReactionsNotifyFrom::None);
+	}) | rpl::distinct_until_changed();
+}
+
+void ReactionsNotifySettings::apply(
+		const MTPReactionsNotifySettings &settings) {
+	const auto &data = settings.data();
+	const auto messages = data.vmessages_notify_from();
+	const auto stories = data.vstories_notify_from();
+	const auto pollVotes = data.vpoll_votes_notify_from();
+	_messagesFrom = messages
+		? ParseFrom(*messages)
+		: ReactionsNotifyFrom::None;
+	_storiesFrom = stories
+		? ParseFrom(*stories)
+		: ReactionsNotifyFrom::None;
+	_pollVotesFrom = pollVotes
+		? ParseFrom(*pollVotes)
+		: ReactionsNotifyFrom::None;
+	_showPreviews = mtpIsTrue(data.vshow_previews());
+}
+
+void ReactionsNotifySettings::save() {
+	using Flag = MTPDreactionsNotifySettings::Flag;
+	const auto messages = _messagesFrom.current();
+	const auto stories = _storiesFrom.current();
+	const auto pollVotes = _pollVotesFrom.current();
+	const auto previews = _showPreviews.current();
+	const auto flags = Flag()
+		| ((messages != ReactionsNotifyFrom::None)
+			? Flag::f_messages_notify_from
+			: Flag())
+		| ((stories != ReactionsNotifyFrom::None)
+			? Flag::f_stories_notify_from
+			: Flag())
+		| ((pollVotes != ReactionsNotifyFrom::None)
+			? Flag::f_poll_votes_notify_from
+			: Flag());
+	_api.request(base::take(_requestId)).cancel();
+	_requestId = _api.request(MTPaccount_SetReactionsNotifySettings(
+		MTP_reactionsNotifySettings(
+			MTP_flags(flags),
+			((messages != ReactionsNotifyFrom::None)
+				? SerializeFrom(messages)
+				: MTPReactionNotificationsFrom()),
+			((stories != ReactionsNotifyFrom::None)
+				? SerializeFrom(stories)
+				: MTPReactionNotificationsFrom()),
+			((pollVotes != ReactionsNotifyFrom::None)
+				? SerializeFrom(pollVotes)
+				: MTPReactionNotificationsFrom()),
+			MTP_notificationSoundDefault(),
+			MTP_bool(previews))
+	)).done([=](const MTPReactionsNotifySettings &result) {
+		_requestId = 0;
+		apply(result);
+	}).fail([=] {
+		_requestId = 0;
+	}).send();
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_reactions_notify_settings.h b/Telegram/SourceFiles/api/api_reactions_notify_settings.h
new file mode 100644
index 00000000000000..d29a1a67870001
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_reactions_notify_settings.h
@@ -0,0 +1,65 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "mtproto/sender.h"
+
+class ApiWrap;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Api {
+
+enum class ReactionsNotifyFrom : uchar {
+	None,
+	Contacts,
+	All,
+};
+
+class ReactionsNotifySettings final {
+public:
+	explicit ReactionsNotifySettings(not_null<ApiWrap*> api);
+
+	void reload(Fn<void()> callback = nullptr);
+
+	void updateMessagesFrom(ReactionsNotifyFrom value);
+	void updatePollVotesFrom(ReactionsNotifyFrom value);
+	void setAllFrom(ReactionsNotifyFrom value);
+	void updateShowPreviews(bool value);
+
+	[[nodiscard]] ReactionsNotifyFrom messagesFromCurrent() const;
+	[[nodiscard]] rpl::producer<ReactionsNotifyFrom> messagesFrom() const;
+	[[nodiscard]] ReactionsNotifyFrom pollVotesFromCurrent() const;
+	[[nodiscard]] rpl::producer<ReactionsNotifyFrom> pollVotesFrom() const;
+	[[nodiscard]] bool showPreviewsCurrent() const;
+	[[nodiscard]] rpl::producer<bool> showPreviews() const;
+
+	[[nodiscard]] bool enabledCurrent() const;
+	[[nodiscard]] rpl::producer<bool> enabled() const;
+
+private:
+	void apply(const MTPReactionsNotifySettings &settings);
+	void save();
+
+	const not_null<Main::Session*> _session;
+	MTP::Sender _api;
+	mtpRequestId _requestId = 0;
+	rpl::variable<ReactionsNotifyFrom> _messagesFrom
+		= ReactionsNotifyFrom::All;
+	rpl::variable<ReactionsNotifyFrom> _storiesFrom
+		= ReactionsNotifyFrom::All;
+	rpl::variable<ReactionsNotifyFrom> _pollVotesFrom
+		= ReactionsNotifyFrom::All;
+	rpl::variable<bool> _showPreviews = true;
+	std::vector<Fn<void()>> _callbacks;
+
+};
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_read_metrics.cpp b/Telegram/SourceFiles/api/api_read_metrics.cpp
new file mode 100644
index 00000000000000..8d2f03c3eff3f7
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_read_metrics.cpp
@@ -0,0 +1,73 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_read_metrics.h"
+
+#include "apiwrap.h"
+#include "data/data_peer.h"
+
+namespace Api {
+namespace {
+
+constexpr auto kSendTimeout = crl::time(5000);
+
+} // namespace
+
+ReadMetrics::ReadMetrics(not_null<ApiWrap*> api)
+: _api(&api->instance())
+, _timer([=] { send(); }) {
+}
+
+void ReadMetrics::add(
+		not_null<PeerData*> peer,
+		FinalizedReadMetric metric) {
+	_pending[peer].push_back(metric);
+	if (!_timer.isActive()) {
+		_timer.callOnce(kSendTimeout);
+	}
+}
+
+void ReadMetrics::send() {
+	for (auto i = _pending.begin(); i != _pending.end();) {
+		if (_requests.contains(i->first)) {
+			++i;
+			continue;
+		}
+
+		auto metrics = QVector<MTPInputMessageReadMetric>();
+		metrics.reserve(i->second.size());
+		for (const auto &m : i->second) {
+			metrics.push_back(MTP_inputMessageReadMetric(
+				MTP_int(m.msgId.bare),
+				MTP_long(m.viewId),
+				MTP_int(m.timeInViewMs),
+				MTP_int(m.activeTimeInViewMs),
+				MTP_int(m.heightToViewportRatioPermille),
+				MTP_int(m.seenRangeRatioPermille)));
+		}
+		const auto peer = i->first;
+		const auto finish = [=] {
+			_requests.erase(peer);
+			if (!_pending.empty() && !_timer.isActive()) {
+				_timer.callOnce(kSendTimeout);
+			}
+		};
+		const auto requestId = _api.request(MTPmessages_ReportReadMetrics(
+			peer->input(),
+			MTP_vector<MTPInputMessageReadMetric>(std::move(metrics))
+		)).done([=](const MTPBool &) {
+			finish();
+		}).fail([=](const MTP::Error &) {
+			finish();
+		}).send();
+
+		_requests.emplace(peer, requestId);
+		i = _pending.erase(i);
+	}
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_read_metrics.h b/Telegram/SourceFiles/api/api_read_metrics.h
new file mode 100644
index 00000000000000..dcac63db29e1bd
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_read_metrics.h
@@ -0,0 +1,45 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "mtproto/sender.h"
+#include "base/timer.h"
+
+class ApiWrap;
+class PeerData;
+
+namespace Api {
+
+struct FinalizedReadMetric {
+	MsgId msgId = 0;
+	uint64 viewId = 0;
+	int timeInViewMs = 0;
+	int activeTimeInViewMs = 0;
+	int heightToViewportRatioPermille = 0;
+	int seenRangeRatioPermille = 0;
+};
+
+class ReadMetrics final {
+public:
+	explicit ReadMetrics(not_null<ApiWrap*> api);
+
+	void add(not_null<PeerData*> peer, FinalizedReadMetric metric);
+
+private:
+	void send();
+
+	MTP::Sender _api;
+	base::flat_map<
+		not_null<PeerData*>,
+		std::vector<FinalizedReadMetric>> _pending;
+	base::flat_map<not_null<PeerData*>, mtpRequestId> _requests;
+	base::Timer _timer;
+
+};
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_report.cpp b/Telegram/SourceFiles/api/api_report.cpp
index 309e2d240cbf04..62f2458d6c1467 100644
--- a/Telegram/SourceFiles/api/api_report.cpp
+++ b/Telegram/SourceFiles/api/api_report.cpp
@@ -8,7 +8,9 @@ For license and copyright information please follow this link:
 #include "api/api_report.h"
 
 #include "apiwrap.h"
+#include "data/data_session.h"
 #include "data/data_peer.h"
+#include "data/data_channel.h"
 #include "data/data_photo.h"
 #include "data/data_report.h"
 #include "data/data_user.h"
@@ -40,29 +42,20 @@ MTPreportReason ReasonToTL(const Ui::ReportReason &reason) {
 
 } // namespace
 
-void SendReport(
+void SendPhotoReport(
 		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
 		Ui::ReportReason reason,
 		const QString &comment,
-		std::variant<v::null_t, not_null<PhotoData*>> data) {
-	auto done = [=] {
+		not_null<PhotoData*> photo) {
+	peer->session().api().request(MTPaccount_ReportProfilePhoto(
+		peer->input(),
+		photo->mtpInput(),
+		ReasonToTL(reason),
+		MTP_string(comment)
+	)).done([=] {
 		show->showToast(tr::lng_report_thanks(tr::now));
-	};
-	v::match(data, [&](v::null_t) {
-		peer->session().api().request(MTPaccount_ReportPeer(
-			peer->input,
-			ReasonToTL(reason),
-			MTP_string(comment)
-		)).done(std::move(done)).send();
-	}, [&](not_null<PhotoData*> photo) {
-		peer->session().api().request(MTPaccount_ReportProfilePhoto(
-			peer->input,
-			photo->mtpInput(),
-			ReasonToTL(reason),
-			MTP_string(comment)
-		)).done(std::move(done)).send();
-	});
+	}).send();
 }
 
 auto CreateReportMessagesOrStoriesCallback(
@@ -134,7 +127,7 @@ auto CreateReportMessagesOrStoriesCallback(
 		if (!reportInput.stories.empty()) {
 			state->requestId = peer->session().api().request(
 				MTPstories_Report(
-					peer->input,
+					peer->input(),
 					MTP_vector<MTPint>(apiIds),
 					MTP_bytes(reportInput.optionId),
 					MTP_string(reportInput.comment))
@@ -142,7 +135,7 @@ auto CreateReportMessagesOrStoriesCallback(
 		} else {
 			state->requestId = peer->session().api().request(
 				MTPmessages_Report(
-					peer->input,
+					peer->input(),
 					MTP_vector<MTPint>(apiIds),
 					MTP_bytes(reportInput.optionId),
 					MTP_string(reportInput.comment))
@@ -151,4 +144,57 @@ auto CreateReportMessagesOrStoriesCallback(
 	};
 }
 
+ReactionReportCapabilities GetReactionReportCapabilities(
+		not_null<PeerData*> group,
+		not_null<PeerData*> participant) {
+	const auto channel = group->asMegagroup();
+	return channel
+		? ReactionReportCapabilities{
+			.canReport = channel->isPublic() && !participant->isSelf(),
+			.canBan = channel->canRestrictParticipant(participant),
+		}
+		: ReactionReportCapabilities();
+}
+
+void ReportReaction(
+		std::shared_ptr<Ui::Show> show,
+		not_null<PeerData*> group,
+		MsgId messageId,
+		not_null<PeerData*> participant) {
+	group->session().api().request(MTPmessages_ReportReaction(
+		group->input(),
+		MTP_int(messageId.bare),
+		participant->input()
+	)).done([=] {
+		if (show) {
+			show->showToast(tr::lng_report_thanks(tr::now));
+		}
+	}).send();
+}
+
+void ReportSpam(
+		not_null<PeerData*> sender,
+		const MessageIdsList &ids) {
+	if (ids.empty()) {
+		return;
+	}
+	const auto peer = sender->owner().peer(ids.front().peer);
+	const auto channel = peer->asChannel();
+	if (!channel) {
+		return;
+	}
+
+	auto msgIds = QVector<MTPint>();
+	msgIds.reserve(ids.size());
+	for (const auto &fullId : ids) {
+		msgIds.push_back(MTP_int(fullId.msg));
+	}
+
+	sender->session().api().request(MTPchannels_ReportSpam(
+		channel->inputChannel(),
+		sender->input(),
+		MTP_vector<MTPint>(msgIds)
+	)).send();
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_report.h b/Telegram/SourceFiles/api/api_report.h
index f0c0320f3f9605..0b35c408dec63b 100644
--- a/Telegram/SourceFiles/api/api_report.h
+++ b/Telegram/SourceFiles/api/api_report.h
@@ -41,16 +41,35 @@ struct ReportResult final {
 	bool successful = false;
 };
 
-void SendReport(
+void SendPhotoReport(
 	std::shared_ptr<Ui::Show> show,
 	not_null<PeerData*> peer,
 	Ui::ReportReason reason,
 	const QString &comment,
-	std::variant<v::null_t, not_null<PhotoData*>> data);
+	not_null<PhotoData*> photo);
 
 [[nodiscard]] auto CreateReportMessagesOrStoriesCallback(
 	std::shared_ptr<Ui::Show> show,
 	not_null<PeerData*> peer)
 -> Fn<void(Data::ReportInput, Fn<void(ReportResult)>)>;
 
+struct ReactionReportCapabilities final {
+	bool canReport = false;
+	bool canBan = false;
+};
+
+[[nodiscard]] ReactionReportCapabilities GetReactionReportCapabilities(
+	not_null<PeerData*> group,
+	not_null<PeerData*> participant);
+
+void ReportReaction(
+	std::shared_ptr<Ui::Show> show,
+	not_null<PeerData*> group,
+	MsgId messageId,
+	not_null<PeerData*> participant);
+
+void ReportSpam(
+	not_null<PeerData*> sender,
+	const MessageIdsList &ids);
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_ringtones.cpp b/Telegram/SourceFiles/api/api_ringtones.cpp
index 307ba580a775a9..203984ab69042f 100644
--- a/Telegram/SourceFiles/api/api_ringtones.cpp
+++ b/Telegram/SourceFiles/api/api_ringtones.cpp
@@ -66,7 +66,7 @@ Ringtones::Ringtones(not_null<ApiWrap*> api)
 		// You can't use _session->lifetime() in the constructor,
 		// only queued, because it is not constructed yet.
 		_session->uploader().documentReady(
-		) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
+		) | rpl::on_next([=](const Storage::UploadedMedia &data) {
 			ready(data.fullId, data.info.file);
 		}, _session->lifetime());
 	});
diff --git a/Telegram/SourceFiles/api/api_send_progress.cpp b/Telegram/SourceFiles/api/api_send_progress.cpp
index 93d28792652ae3..206520e201e3b3 100644
--- a/Telegram/SourceFiles/api/api_send_progress.cpp
+++ b/Telegram/SourceFiles/api/api_send_progress.cpp
@@ -137,7 +137,7 @@ void SendProgressManager::send(const Key &key, int progress) {
 		MTP_flags(key.topMsgId
 			? MTPmessages_SetTyping::Flag::f_top_msg_id
 			: MTPmessages_SetTyping::Flag(0)),
-		key.history->peer->input,
+		key.history->peer->input(),
 		MTP_int(key.topMsgId),
 		action
 	)).done([=](const MTPBool &result, mtpRequestId requestId) {
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index a3003bab43a298..92166187b0018c 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -95,10 +95,15 @@ void SendSimpleMedia(SendAction action, MTPInputMedia inputMedia) {
 	const auto messagePostAuthor = peer->isBroadcast()
 		? session->user()->name()
 		: QString();
-
+	const auto starsPaid = std::min(
+		peer->starsPerMessageChecked(),
+		action.options.starsApproved);
 	if (action.options.scheduled) {
 		flags |= MessageFlag::IsOrWasScheduled;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_schedule_date;
+		if (action.options.scheduleRepeatPeriod) {
+			sendFlags |= MTPmessages_SendMedia::Flag::f_schedule_repeat_period;
+		}
 	}
 	if (action.options.shortcutId) {
 		flags |= MessageFlag::ShortcutMessage;
@@ -107,10 +112,17 @@ void SendSimpleMedia(SendAction action, MTPInputMedia inputMedia) {
 	if (action.options.effectId) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_effect;
 	}
+	if (action.options.suggest) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_suggested_post;
+	}
 	if (action.options.invertCaption) {
 		flags |= MessageFlag::InvertMedia;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_invert_media;
 	}
+	if (starsPaid) {
+		action.options.starsApproved -= starsPaid;
+		sendFlags |= MTPmessages_SendMedia::Flag::f_allow_paid_stars;
+	}
 
 	auto &histories = history->owner().histories();
 	histories.sendPreparedMessage(
@@ -119,7 +131,7 @@ void SendSimpleMedia(SendAction action, MTPInputMedia inputMedia) {
 		randomId,
 		Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 			MTP_flags(sendFlags),
-			peer->input,
+			peer->input(),
 			Data::Histories::ReplyToPlaceholder(),
 			std::move(inputMedia),
 			MTPstring(),
@@ -127,9 +139,12 @@ void SendSimpleMedia(SendAction action, MTPInputMedia inputMedia) {
 			MTPReplyMarkup(),
 			MTPvector<MTPMessageEntity>(),
 			MTP_int(action.options.scheduled),
-			(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
+			MTP_int(action.options.scheduleRepeatPeriod),
+			(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
 			Data::ShortcutIdToMTP(session, action.options.shortcutId),
-			MTP_long(action.options.effectId)
+			MTP_long(action.options.effectId),
+			MTP_long(starsPaid),
+			SuggestToMTP(action.options.suggest)
 		), [=](const MTPUpdates &result, const MTP::Response &response) {
 	}, [=](const MTP::Error &error, const MTP::Response &response) {
 		api->sendMessageFail(error, peer, randomId);
@@ -160,7 +175,7 @@ void SendExistingMedia(
 			? (*localMessageId)
 			: session->data().nextLocalMessageId());
 	const auto randomId = base::RandomValue<uint64>();
-	const auto &action = message.action;
+	auto &action = message.action;
 
 	auto flags = NewMessageFlags(peer);
 	auto sendFlags = MTPmessages_SendMedia::Flags(0);
@@ -190,10 +205,15 @@ void SendExistingMedia(
 		sendFlags |= MTPmessages_SendMedia::Flag::f_entities;
 	}
 	const auto captionText = caption.text;
-
+	const auto starsPaid = std::min(
+		peer->starsPerMessageChecked(),
+		action.options.starsApproved);
 	if (action.options.scheduled) {
 		flags |= MessageFlag::IsOrWasScheduled;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_schedule_date;
+		if (action.options.scheduleRepeatPeriod) {
+			sendFlags |= MTPmessages_SendMedia::Flag::f_schedule_repeat_period;
+		}
 	}
 	if (action.options.shortcutId) {
 		flags |= MessageFlag::ShortcutMessage;
@@ -202,10 +222,17 @@ void SendExistingMedia(
 	if (action.options.effectId) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_effect;
 	}
+	if (action.options.suggest) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_suggested_post;
+	}
 	if (action.options.invertCaption) {
 		flags |= MessageFlag::InvertMedia;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_invert_media;
 	}
+	if (starsPaid) {
+		action.options.starsApproved -= starsPaid;
+		sendFlags |= MTPmessages_SendMedia::Flag::f_allow_paid_stars;
+	}
 
 	session->data().registerMessageRandomId(randomId, newId);
 
@@ -215,9 +242,13 @@ void SendExistingMedia(
 		.from = NewMessageFromId(action),
 		.replyTo = action.replyTo,
 		.date = NewMessageDate(action.options),
+		.scheduleRepeatPeriod = action.options.scheduleRepeatPeriod,
 		.shortcutId = action.options.shortcutId,
+		.starsPaid = starsPaid,
 		.postAuthor = NewMessagePostAuthor(action),
 		.effectId = action.options.effectId,
+		.suggest = HistoryMessageSuggestInfo(action.options),
+		.mediaSpoiler = action.options.mediaSpoiler,
 	}, media, caption);
 
 	const auto performRequest = [=](const auto &repeatRequest) -> void {
@@ -230,7 +261,7 @@ void SendExistingMedia(
 			randomId,
 			Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 				MTP_flags(sendFlags),
-				peer->input,
+				peer->input(),
 				Data::Histories::ReplyToPlaceholder(),
 				inputMedia(),
 				MTP_string(captionText),
@@ -238,9 +269,12 @@ void SendExistingMedia(
 				MTPReplyMarkup(),
 				sentEntities,
 				MTP_int(action.options.scheduled),
-				(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
+				MTP_int(action.options.scheduleRepeatPeriod),
+				(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
 				Data::ShortcutIdToMTP(session, action.options.shortcutId),
-				MTP_long(action.options.effectId)
+				MTP_long(action.options.effectId),
+				MTP_long(starsPaid),
+				SuggestToMTP(action.options.suggest)
 			), [=](const MTPUpdates &result, const MTP::Response &response) {
 		}, [=](const MTP::Error &error, const MTP::Response &response) {
 			if (error.code() == 400
@@ -270,9 +304,13 @@ void SendExistingDocument(
 		std::optional<MsgId> localMessageId) {
 	const auto inputMedia = [=] {
 		return MTP_inputMediaDocument(
-			MTP_flags(0),
+			MTP_flags(message.action.options.mediaSpoiler
+				? MTPDinputMediaDocument::Flag::f_spoiler
+				: MTPDinputMediaDocument::Flags(0)),
 			document->mtpInput(),
+			MTPInputPhoto(), // video_cover
 			MTPint(), // ttl_seconds
+			MTPint(), // video_timestamp
 			MTPstring()); // query
 	};
 	SendExistingMedia(
@@ -295,7 +333,8 @@ void SendExistingPhoto(
 		return MTP_inputMediaPhoto(
 			MTP_flags(0),
 			photo->mtpInput(),
-			MTPint());
+			MTPint(), // ttl_seconds
+			MTPInputDocument()); // video
 	};
 	SendExistingMedia(
 		std::move(message),
@@ -338,8 +377,7 @@ bool SendDice(MessageToSend &message) {
 	message.action.clearDraft = false;
 	message.action.generateLocal = true;
 
-
-	const auto &action = message.action;
+	auto &action = message.action;
 	api->sendAction(action);
 
 	const auto newId = FullMsgId(
@@ -366,6 +404,9 @@ bool SendDice(MessageToSend &message) {
 	if (action.options.scheduled) {
 		flags |= MessageFlag::IsOrWasScheduled;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_schedule_date;
+		if (action.options.scheduleRepeatPeriod) {
+			sendFlags |= MTPmessages_SendMedia::Flag::f_schedule_repeat_period;
+		}
 	}
 	if (action.options.shortcutId) {
 		flags |= MessageFlag::ShortcutMessage;
@@ -374,42 +415,75 @@ bool SendDice(MessageToSend &message) {
 	if (action.options.effectId) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_effect;
 	}
+	if (action.options.suggest) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_suggested_post;
+	}
 	if (action.options.invertCaption) {
 		flags |= MessageFlag::InvertMedia;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_invert_media;
 	}
+	const auto starsPaid = std::min(
+		peer->starsPerMessageChecked(),
+		action.options.starsApproved);
+	if (starsPaid) {
+		action.options.starsApproved -= starsPaid;
+		sendFlags |= MTPmessages_SendMedia::Flag::f_allow_paid_stars;
+	}
 
 	session->data().registerMessageRandomId(randomId, newId);
 
+	auto seed = QByteArray(32, Qt::Uninitialized);
+	base::RandomFill(bytes::make_detached_span(seed));
+	const auto stake = action.options.stakeSeedHash.isEmpty()
+		? 0
+		: action.options.stakeNanoTon;
 	history->addNewLocalMessage({
 		.id = newId.msg,
 		.flags = flags,
 		.from = NewMessageFromId(action),
 		.replyTo = action.replyTo,
 		.date = NewMessageDate(action.options),
+		.scheduleRepeatPeriod = action.options.scheduleRepeatPeriod,
 		.shortcutId = action.options.shortcutId,
+		.starsPaid = starsPaid,
 		.postAuthor = NewMessagePostAuthor(action),
 		.effectId = action.options.effectId,
+		.suggest = HistoryMessageSuggestInfo(action.options),
 	}, TextWithEntities(), MTP_messageMediaDice(
+		MTP_flags(stake
+			? MTPDmessageMediaDice::Flag::f_game_outcome
+			: MTPDmessageMediaDice::Flag()),
 		MTP_int(0),
-		MTP_string(emoji)));
+		MTP_string(emoji),
+		MTP_messages_emojiGameOutcome(
+			MTP_bytes(seed),
+			MTP_long(stake),
+			MTP_long(0))));
 	histories.sendPreparedMessage(
 		history,
 		action.replyTo,
 		randomId,
 		Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 			MTP_flags(sendFlags),
-			peer->input,
+			peer->input(),
 			Data::Histories::ReplyToPlaceholder(),
-			MTP_inputMediaDice(MTP_string(emoji)),
+			(stake
+				? MTP_inputMediaStakeDice(
+					MTP_bytes(action.options.stakeSeedHash),
+					MTP_long(stake),
+					MTP_bytes(seed))
+				: MTP_inputMediaDice(MTP_string(emoji))),
 			MTP_string(),
 			MTP_long(randomId),
 			MTPReplyMarkup(),
 			MTP_vector<MTPMessageEntity>(),
 			MTP_int(action.options.scheduled),
-			(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
+			MTP_int(action.options.scheduleRepeatPeriod),
+			(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
 			Data::ShortcutIdToMTP(session, action.options.shortcutId),
-			MTP_long(action.options.effectId)
+			MTP_long(action.options.effectId),
+			MTP_long(starsPaid),
+			SuggestToMTP(action.options.suggest)
 		), [=](const MTPUpdates &result, const MTP::Response &response) {
 	}, [=](const MTP::Error &error, const MTP::Response &response) {
 		api->sendMessageFail(error, peer, randomId, newId);
@@ -456,6 +530,7 @@ void SendConfirmedFile(
 		not_null<Main::Session*> session,
 		const std::shared_ptr<FilePrepareResult> &file) {
 	const auto isEditing = (file->type != SendMediaType::Audio)
+		&& (file->type != SendMediaType::Round)
 		&& (file->to.replaceMediaOf != 0);
 	const auto newId = FullMsgId(
 		file->to.peer,
@@ -525,7 +600,8 @@ void SendConfirmedFile(
 		// Shortcut messages have no 'edited' badge.
 		flags |= MessageFlag::HideEdited;
 	}
-	if (file->type == SendMediaType::Audio) {
+	if (file->type == SendMediaType::Audio
+		|| file->type == SendMediaType::Round) {
 		if (!peer->isChannel() || peer->isMegagroup()) {
 			flags |= MessageFlag::MediaIsUnread;
 		}
@@ -540,39 +616,44 @@ void SendConfirmedFile(
 				MTP_flags(Flag::f_photo
 					| (file->spoiler ? Flag::f_spoiler : Flag())),
 				file->photo,
-				MTPint());
+				MTPint(), // ttl_seconds
+				MTPDocument()); // video
 		} else if (file->type == SendMediaType::File) {
 			using Flag = MTPDmessageMediaDocument::Flag;
 			return MTP_messageMediaDocument(
 				MTP_flags(Flag::f_document
-					| (file->spoiler ? Flag::f_spoiler : Flag())),
+					| (file->spoiler ? Flag::f_spoiler : Flag())
+					| (file->videoCover ? Flag::f_video_cover : Flag())),
 				file->document,
 				MTPVector<MTPDocument>(), // alt_documents
+				file->videoCover ? file->videoCover->photo : MTPPhoto(),
+				MTPint(), // video_timestamp
 				MTPint());
 		} else if (file->type == SendMediaType::Audio) {
 			const auto ttlSeconds = file->to.options.ttlSeconds;
-			const auto isVoice = [&] {
-				return file->document.match([](const MTPDdocumentEmpty &d) {
-					return false;
-				}, [](const MTPDdocument &d) {
-					return ranges::any_of(d.vattributes().v, [&](
-							const MTPDocumentAttribute &attribute) {
-						using Att = MTPDdocumentAttributeAudio;
-						return attribute.match([](const Att &data) -> bool {
-							return data.vflags().v & Att::Flag::f_voice;
-						}, [](const auto &) {
-							return false;
-						});
-					});
-				});
-			}();
 			using Flag = MTPDmessageMediaDocument::Flag;
 			return MTP_messageMediaDocument(
 				MTP_flags(Flag::f_document
-					| (isVoice ? Flag::f_voice : Flag())
-					| (ttlSeconds ? Flag::f_ttl_seconds : Flag())),
+					| Flag::f_voice
+					| (ttlSeconds ? Flag::f_ttl_seconds : Flag())
+					| (file->videoCover ? Flag::f_video_cover : Flag())),
+				file->document,
+				MTPVector<MTPDocument>(), // alt_documents
+				file->videoCover ? file->videoCover->photo : MTPPhoto(),
+				MTPint(), // video_timestamp
+				MTP_int(ttlSeconds));
+		} else if (file->type == SendMediaType::Round) {
+			using Flag = MTPDmessageMediaDocument::Flag;
+			const auto ttlSeconds = file->to.options.ttlSeconds;
+			return MTP_messageMediaDocument(
+				MTP_flags(Flag::f_document
+					| Flag::f_round
+					| (ttlSeconds ? Flag::f_ttl_seconds : Flag())
+					| (file->spoiler ? Flag::f_spoiler : Flag())),
 				file->document,
 				MTPVector<MTPDocument>(), // alt_documents
+				MTPPhoto(), // video_cover
+				MTPint(), // video_timestamp
 				MTP_int(ttlSeconds));
 		} else {
 			Unexpected("Type in sendFilesConfirmed.");
@@ -592,6 +673,7 @@ void SendConfirmedFile(
 		edition.useSameMarkup = true;
 		edition.useSameReplies = true;
 		edition.useSameReactions = true;
+		edition.useSameSuggest = true;
 		edition.savePreviousMedia = true;
 		itemToEdit->applyEdition(std::move(edition));
 	} else {
@@ -601,10 +683,15 @@ void SendConfirmedFile(
 			.from = NewMessageFromId(action),
 			.replyTo = file->to.replyTo,
 			.date = NewMessageDate(file->to.options),
+			.scheduleRepeatPeriod = file->to.options.scheduleRepeatPeriod,
 			.shortcutId = file->to.options.shortcutId,
+			.starsPaid = std::min(
+				history->peer->starsPerMessageChecked(),
+				file->to.options.starsApproved),
 			.postAuthor = NewMessagePostAuthor(action),
 			.groupedId = groupId,
 			.effectId = file->to.options.effectId,
+			.suggest = HistoryMessageSuggestInfo(file->to.options),
 		}, caption, media);
 	}
 
diff --git a/Telegram/SourceFiles/api/api_sensitive_content.cpp b/Telegram/SourceFiles/api/api_sensitive_content.cpp
index 31f83f5ebae907..e1e25950e8e441 100644
--- a/Telegram/SourceFiles/api/api_sensitive_content.cpp
+++ b/Telegram/SourceFiles/api/api_sensitive_content.cpp
@@ -25,7 +25,7 @@ SensitiveContent::SensitiveContent(not_null<ApiWrap*> api)
 }
 
 void SensitiveContent::preload() {
-	if (!_loaded) {
+	if (!_loaded && !_loadRequestId) {
 		reload();
 	}
 }
@@ -37,7 +37,6 @@ void SensitiveContent::reload(bool force) {
 		}
 		return;
 	}
-	_loaded = true;
 	_loadRequestId = _api.request(MTPaccount_GetContentSettings(
 	)).done([=](const MTPaccount_ContentSettings &result) {
 		_loadRequestId = 0;
@@ -50,6 +49,10 @@ void SensitiveContent::reload(bool force) {
 			_enabled = enabled;
 			_canChange = canChange;
 		}
+		if (!_loaded) {
+			_loaded = true;
+			_loadedChanged.fire({});
+		}
 		if (base::take(_appConfigReloadForce) || changed) {
 			_appConfigReloadTimer.callOnce(kRefreshAppConfigTimeout);
 		}
@@ -61,6 +64,19 @@ void SensitiveContent::reload(bool force) {
 	}).send();
 }
 
+bool SensitiveContent::loaded() const {
+	return _loaded;
+}
+
+rpl::producer<bool> SensitiveContent::loadedValue() const {
+	if (_loaded) {
+		return rpl::single(true);
+	}
+	return rpl::single(false) | rpl::then(
+		_loadedChanged.events() | rpl::map_to(true)
+	);
+}
+
 bool SensitiveContent::enabledCurrent() const {
 	return _enabled.current();
 }
@@ -69,6 +85,10 @@ rpl::producer<bool> SensitiveContent::enabled() const {
 	return _enabled.value();
 }
 
+bool SensitiveContent::canChangeCurrent() const {
+	return _canChange.current();
+}
+
 rpl::producer<bool> SensitiveContent::canChange() const {
 	return _canChange.value();
 }
diff --git a/Telegram/SourceFiles/api/api_sensitive_content.h b/Telegram/SourceFiles/api/api_sensitive_content.h
index 576bf275f3daef..e35f8cbf463882 100644
--- a/Telegram/SourceFiles/api/api_sensitive_content.h
+++ b/Telegram/SourceFiles/api/api_sensitive_content.h
@@ -26,12 +26,16 @@ class SensitiveContent final {
 	void reload(bool force = false);
 	void update(bool enabled);
 
+	[[nodiscard]] bool loaded() const;
+	[[nodiscard]] rpl::producer<bool> loadedValue() const;
 	[[nodiscard]] bool enabledCurrent() const;
 	[[nodiscard]] rpl::producer<bool> enabled() const;
+	[[nodiscard]] bool canChangeCurrent() const;
 	[[nodiscard]] rpl::producer<bool> canChange() const;
 
 private:
 	const not_null<Main::Session*> _session;
+	rpl::event_stream<> _loadedChanged;
 	MTP::Sender _api;
 	mtpRequestId _loadRequestId = 0;
 	mtpRequestId _saveRequestId = 0;
diff --git a/Telegram/SourceFiles/api/api_single_message_search.cpp b/Telegram/SourceFiles/api/api_single_message_search.cpp
index 0875091bc7cfd4..d95ff3227a04eb 100644
--- a/Telegram/SourceFiles/api/api_single_message_search.cpp
+++ b/Telegram/SourceFiles/api/api_single_message_search.cpp
@@ -99,7 +99,7 @@ std::optional<HistoryItem*> SingleMessageSearch::performLookupByChannel(
 		ready();
 	};
 	_requestId = _session->api().request(MTPchannels_GetMessages(
-		channel->inputChannel,
+		channel->inputChannel(),
 		MTP_vector<MTPInputMessage>(1, MTP_inputMessageID(MTP_int(postId)))
 	)).done([=](const MTPmessages_Messages &result) {
 		const auto received = Api::ParseSearchResult(
@@ -181,7 +181,9 @@ std::optional<HistoryItem*> SingleMessageSearch::performLookupByUsername(
 		ready();
 	};
 	_requestId = _session->api().request(MTPcontacts_ResolveUsername(
-		MTP_string(username)
+		MTP_flags(0),
+		MTP_string(username),
+		MTP_string()
 	)).done([=](const MTPcontacts_ResolvedPeer &result) {
 		result.match([&](const MTPDcontacts_resolvedPeer &data) {
 			_session->data().processUsers(data.vusers());
diff --git a/Telegram/SourceFiles/api/api_statistics.cpp b/Telegram/SourceFiles/api/api_statistics.cpp
index c960aca3335aba..ad0404dbea07fc 100644
--- a/Telegram/SourceFiles/api/api_statistics.cpp
+++ b/Telegram/SourceFiles/api/api_statistics.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "api/api_statistics.h"
 
+#include "api/api_credits_history_entry.h"
 #include "api/api_statistics_data_deserialize.h"
 #include "apiwrap.h"
 #include "base/unixtime.h"
@@ -14,6 +15,7 @@ For license and copyright information please follow this link:
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_story.h"
+#include "data/data_user.h"
 #include "history/history.h"
 #include "main/main_session.h"
 
@@ -208,7 +210,7 @@ rpl::producer<rpl::no_value, QString> Statistics::request() {
 		if (!channel()->isMegagroup()) {
 			makeRequest(MTPstats_GetBroadcastStats(
 				MTP_flags(MTPstats_GetBroadcastStats::Flags(0)),
-				channel()->inputChannel
+				channel()->inputChannel()
 			)).done([=](const MTPstats_BroadcastStats &result) {
 				_channelStats = ChannelStatisticsFromTL(result.data());
 				consumer.put_done();
@@ -218,7 +220,7 @@ rpl::producer<rpl::no_value, QString> Statistics::request() {
 		} else {
 			makeRequest(MTPstats_GetMegagroupStats(
 				MTP_flags(MTPstats_GetMegagroupStats::Flags(0)),
-				channel()->inputChannel
+				channel()->inputChannel()
 			)).done([=](const MTPstats_MegagroupStats &result) {
 				const auto &data = result.data();
 				_supergroupStats = SupergroupStatisticsFromTL(data);
@@ -312,7 +314,7 @@ void PublicForwards::request(
 				const auto msgId = IdFromMessage(message);
 				const auto peerId = PeerFromMessage(message);
 				const auto lastDate = DateFromMessage(message);
-				if (const auto peer = owner.peerLoaded(peerId)) {
+				if (owner.peerLoaded(peerId)) {
 					if (!lastDate) {
 						return;
 					}
@@ -341,22 +343,26 @@ void PublicForwards::request(
 			.token = nextToken,
 		});
 	};
+	const auto processFail = [=] {
+		_requestId = 0;
+		done({});
+	};
 
 	constexpr auto kLimit = tl::make_int(100);
 	if (_fullId.messageId) {
 		_requestId = makeRequest(MTPstats_GetMessagePublicForwards(
-			channel->inputChannel,
+			channel->inputChannel(),
 			MTP_int(_fullId.messageId.msg),
 			MTP_string(token),
 			kLimit
-		)).done(processResult).fail([=] { _requestId = 0; }).send();
+		)).done(processResult).fail(processFail).send();
 	} else if (_fullId.storyId) {
 		_requestId = makeRequest(MTPstats_GetStoryPublicForwards(
-			channel->input,
+			channel->input(),
 			MTP_int(_fullId.storyId.story),
 			MTP_string(token),
 			kLimit
-		)).done(processResult).fail([=] { _requestId = 0; }).send();
+		)).done(processResult).fail(processFail).send();
 	}
 }
 
@@ -381,7 +387,7 @@ Data::PublicForwardsSlice MessageStatistics::firstSlice() const {
 }
 
 void MessageStatistics::request(Fn<void(Data::MessageStatistics)> done) {
-	if (channel()->isMegagroup()) {
+	if (channel()->isMegagroup() && !_storyId) {
 		return;
 	}
 	const auto requestFirstPublicForwards = [=](
@@ -407,7 +413,7 @@ void MessageStatistics::request(Fn<void(Data::MessageStatistics)> done) {
 			const Data::StatisticalGraph &messageGraph,
 			const Data::StatisticalGraph &reactionsGraph) {
 		api().request(MTPchannels_GetMessages(
-			channel()->inputChannel,
+			channel()->inputChannel(),
 			MTP_vector<MTPInputMessage>(
 				1,
 				MTP_inputMessageID(MTP_int(_fullId.msg))))
@@ -462,7 +468,7 @@ void MessageStatistics::request(Fn<void(Data::MessageStatistics)> done) {
 			const Data::StatisticalGraph &messageGraph,
 			const Data::StatisticalGraph &reactionsGraph) {
 		api().request(MTPstories_GetStoriesByID(
-			channel()->input,
+			channel()->input(),
 			MTP_vector<MTPint>(1, MTP_int(_storyId.story)))
 		).done([=](const MTPstories_Stories &result) {
 			const auto &storyItem = result.data().vstories().v.front();
@@ -493,7 +499,7 @@ void MessageStatistics::request(Fn<void(Data::MessageStatistics)> done) {
 	if (_storyId) {
 		makeRequest(MTPstats_GetStoryStats(
 			MTP_flags(MTPstats_GetStoryStats::Flags(0)),
-			channel()->input,
+			channel()->input(),
 			MTP_int(_storyId.story)
 		)).done([=](const MTPstats_StoryStats &result) {
 			const auto &data = result.data();
@@ -506,7 +512,7 @@ void MessageStatistics::request(Fn<void(Data::MessageStatistics)> done) {
 	} else {
 		makeRequest(MTPstats_GetMessageStats(
 			MTP_flags(MTPstats_GetMessageStats::Flags(0)),
-			channel()->inputChannel,
+			channel()->inputChannel(),
 			MTP_int(_fullId.msg.bare)
 		)).done([=](const MTPstats_MessageStats &result) {
 			const auto &data = result.data();
@@ -533,7 +539,7 @@ rpl::producer<rpl::no_value, QString> Boosts::request() {
 		}
 
 		_api.request(MTPpremium_GetBoostsStatus(
-			_peer->input
+			_peer->input()
 		)).done([=](const MTPpremium_BoostsStatus &result) {
 			const auto &data = result.data();
 			channel->updateLevelHint(data.vlevel().v);
@@ -619,7 +625,7 @@ void Boosts::requestBoosts(
 		gifts
 			? MTP_flags(MTPpremium_GetBoostsList::Flag::f_gifts)
 			: MTP_flags(0),
-		_peer->input,
+		_peer->input(),
 		MTP_string(token.next),
 		token.next.isEmpty() ? kTlFirstSlice : kTlLimit
 	)).done([=](const MTPpremium_BoostsList &result) {
@@ -681,45 +687,70 @@ Data::BoostStatus Boosts::boostStatus() const {
 	return _boostStatus;
 }
 
-ChannelEarnStatistics::ChannelEarnStatistics(not_null<ChannelData*> channel)
-: StatisticsRequestSender(channel) {
+EarnStatistics::EarnStatistics(not_null<PeerData*> peer)
+: StatisticsRequestSender(peer)
+, _isUser(peer->isUser()) {
 }
 
-rpl::producer<rpl::no_value, QString> ChannelEarnStatistics::request() {
+rpl::producer<rpl::no_value, QString> EarnStatistics::request() {
 	return [=](auto consumer) {
 		auto lifetime = rpl::lifetime();
 
-		makeRequest(MTPstats_GetBroadcastRevenueStats(
-			MTP_flags(0),
-			channel()->inputChannel
-		)).done([=](const MTPstats_BroadcastRevenueStats &result) {
+		api().request(MTPpayments_GetStarsRevenueStats(
+			MTP_flags(MTPpayments_getStarsRevenueStats::Flag::f_ton),
+			(_isUser ? user()->input() : channel()->input())
+		)).done([=](const MTPpayments_StarsRevenueStats &result) {
 			const auto &data = result.data();
-			const auto &balances = data.vbalances().data();
+			const auto &balances = data.vstatus().data();
+			const auto amount = [](const auto &a) {
+				return CreditsAmountFromTL(a);
+			};
 			_data = Data::EarnStatistics{
-				.topHoursGraph = StatisticalGraphFromTL(
-					data.vtop_hours_graph()),
+				.topHoursGraph = data.vtop_hours_graph()
+					? StatisticalGraphFromTL(*data.vtop_hours_graph())
+					: Data::StatisticalGraph(),
 				.revenueGraph = StatisticalGraphFromTL(data.vrevenue_graph()),
-				.currentBalance = balances.vcurrent_balance().v,
-				.availableBalance = balances.vavailable_balance().v,
-				.overallRevenue = balances.voverall_revenue().v,
+				.currentBalance = amount(balances.vcurrent_balance()),
+				.availableBalance = amount(balances.vavailable_balance()),
+				.overallRevenue = amount(balances.voverall_revenue()),
 				.usdRate = data.vusd_rate().v,
 			};
 
 			requestHistory({}, [=](Data::EarnHistorySlice &&slice) {
 				_data.firstHistorySlice = std::move(slice);
 
-				api().request(
-					MTPchannels_GetFullChannel(channel()->inputChannel)
-				).done([=](const MTPmessages_ChatFull &result) {
-					result.data().vfull_chat().match([&](
-							const MTPDchannelFull &d) {
-						_data.switchedOff = d.is_restricted_sponsored();
-					}, [](const auto &) {
-					});
+				if (!_isUser) {
+					api().request(
+						MTPchannels_GetFullChannel(channel()->inputChannel())
+					).done([=](const MTPmessages_ChatFull &result) {
+						result.data().vfull_chat().match([&](
+								const MTPDchannelFull &d) {
+							// Not a full ApplyChannelUpdate() here: that would
+							// re-trigger an EarnStatistics request and loop. We
+							// only refresh the revenue-visibility flags that
+							// gate this screen, which may be stale if the
+							// program was enabled after the last full load.
+							using Flag = ChannelDataFlag;
+							const auto channel = this->channel();
+							channel->setFlags((channel->flags()
+								& ~(Flag::CanViewRevenue
+									| Flag::CanViewCreditsRevenue))
+								| (d.is_can_view_revenue()
+									? Flag::CanViewRevenue
+									: Flag())
+								| (d.is_can_view_stars_revenue()
+									? Flag::CanViewCreditsRevenue
+									: Flag()));
+							_data.switchedOff = d.is_restricted_sponsored();
+						}, [](const auto &) {
+						});
+						consumer.put_done();
+					}).fail([=](const MTP::Error &error) {
+						consumer.put_error_copy(error.type());
+					}).send();
+				} else {
 					consumer.put_done();
-				}).fail([=](const MTP::Error &error) {
-					consumer.put_error_copy(error.type());
-				}).send();
+				}
 			});
 		}).fail([=](const MTP::Error &error) {
 			consumer.put_error_copy(error.type());
@@ -729,68 +760,41 @@ rpl::producer<rpl::no_value, QString> ChannelEarnStatistics::request() {
 	};
 }
 
-void ChannelEarnStatistics::requestHistory(
+void EarnStatistics::requestHistory(
 		const Data::EarnHistorySlice::OffsetToken &token,
 		Fn<void(Data::EarnHistorySlice)> done) {
 	if (_requestId) {
 		return;
 	}
+
 	constexpr auto kTlFirstSlice = tl::make_int(kFirstSlice);
 	constexpr auto kTlLimit = tl::make_int(kLimit);
-	_requestId = api().request(MTPstats_GetBroadcastRevenueTransactions(
-		channel()->inputChannel,
-		MTP_int(token),
-		(!token) ? kTlFirstSlice : kTlLimit
-	)).done([=](const MTPstats_BroadcastRevenueTransactions &result) {
+
+	_requestId = api().request(MTPpayments_GetStarsTransactions(
+		MTP_flags(MTPpayments_getStarsTransactions::Flag::f_ton),
+		MTP_string(), // Subscription ID.
+		(_isUser ? user()->input() : channel()->input()),
+		MTP_string(token),
+		token.isEmpty() ? kTlFirstSlice : kTlLimit
+	)).done([=](const MTPpayments_StarsStatus &result) {
 		_requestId = 0;
 
-		const auto &tlTransactions = result.data().vtransactions().v;
-
-		auto list = std::vector<Data::EarnHistoryEntry>();
-		list.reserve(tlTransactions.size());
-		for (const auto &tlTransaction : tlTransactions) {
-			list.push_back(tlTransaction.match([&](
-					const MTPDbroadcastRevenueTransactionProceeds &d) {
-				return Data::EarnHistoryEntry{
-					.type = Data::EarnHistoryEntry::Type::In,
-					.amount = d.vamount().v,
-					.date = base::unixtime::parse(d.vfrom_date().v),
-					.dateTo = base::unixtime::parse(d.vto_date().v),
-				};
-			}, [&](const MTPDbroadcastRevenueTransactionWithdrawal &d) {
-				return Data::EarnHistoryEntry{
-					.type = Data::EarnHistoryEntry::Type::Out,
-					.status = d.is_pending()
-						? Data::EarnHistoryEntry::Status::Pending
-						: d.is_failed()
-						? Data::EarnHistoryEntry::Status::Failed
-						: Data::EarnHistoryEntry::Status::Success,
-					.amount = (std::numeric_limits<Data::EarnInt>::max()
-						- d.vamount().v
-						+ 1),
-					.date = base::unixtime::parse(d.vdate().v),
-					// .provider = qs(d.vprovider()),
-					.successDate = d.vtransaction_date()
-						? base::unixtime::parse(d.vtransaction_date()->v)
-						: QDateTime(),
-					.successLink = d.vtransaction_url()
-						? qs(*d.vtransaction_url())
-						: QString(),
-				};
-			}, [&](const MTPDbroadcastRevenueTransactionRefund &d) {
-				return Data::EarnHistoryEntry{
-					.type = Data::EarnHistoryEntry::Type::Return,
-					.amount = d.vamount().v,
-					.date = base::unixtime::parse(d.vdate().v),
-					// .provider = qs(d.vprovider()),
-				};
-			}));
-		}
-		const auto nextToken = token + tlTransactions.size();
+		const auto nextToken = result.data().vnext_offset().value_or_empty();
+
+		const auto tlTransactions
+			= result.data().vhistory().value_or_empty();
+
+		const auto peer = _isUser ? (PeerData*)user() : (PeerData*)channel();
+		auto list = ranges::views::all(
+			tlTransactions
+		) | ranges::views::transform([=](const auto &d) {
+			return CreditsHistoryEntryFromTL(d, peer);
+		}) | ranges::to_vector;
 		done(Data::EarnHistorySlice{
 			.list = std::move(list),
-			.total = result.data().vcount().v,
-			.allLoaded = (result.data().vcount().v == nextToken),
+			.total = int(tlTransactions.size()),
+			// .total = result.data().vcount().v,
+			.allLoaded = nextToken.isEmpty(),
 			.token = Data::EarnHistorySlice::OffsetToken(nextToken),
 		});
 	}).fail([=] {
@@ -799,7 +803,7 @@ void ChannelEarnStatistics::requestHistory(
 	}).send();
 }
 
-Data::EarnStatistics ChannelEarnStatistics::data() const {
+Data::EarnStatistics EarnStatistics::data() const {
 	return _data;
 }
 
diff --git a/Telegram/SourceFiles/api/api_statistics.h b/Telegram/SourceFiles/api/api_statistics.h
index 213ab92933b6bb..b60dd3d28ff5c5 100644
--- a/Telegram/SourceFiles/api/api_statistics.h
+++ b/Telegram/SourceFiles/api/api_statistics.h
@@ -75,13 +75,11 @@ class MessageStatistics final : public StatisticsRequestSender {
 
 	Data::PublicForwardsSlice _firstSlice;
 
-	mtpRequestId _requestId = 0;
-
 };
 
-class ChannelEarnStatistics final : public StatisticsRequestSender {
+class EarnStatistics final : public StatisticsRequestSender {
 public:
-	explicit ChannelEarnStatistics(not_null<ChannelData*> channel);
+	explicit EarnStatistics(not_null<PeerData*> peer);
 
 	[[nodiscard]] rpl::producer<rpl::no_value, QString> request();
 	void requestHistory(
@@ -94,6 +92,7 @@ class ChannelEarnStatistics final : public StatisticsRequestSender {
 	static constexpr auto kLimit = int(10);
 
 private:
+	const bool _isUser = false;
 	Data::EarnStatistics _data;
 
 	mtpRequestId _requestId = 0;
diff --git a/Telegram/SourceFiles/api/api_stickers_creator.cpp b/Telegram/SourceFiles/api/api_stickers_creator.cpp
new file mode 100644
index 00000000000000..7c387276705906
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_stickers_creator.cpp
@@ -0,0 +1,557 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_stickers_creator.h"
+
+#include "apiwrap.h"
+#include "base/random.h"
+#include "base/unixtime.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "data/data_document.h"
+#include "data/data_file_origin.h"
+#include "data/data_session.h"
+#include "data/stickers/data_stickers.h"
+#include "data/stickers/data_stickers_set.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "menu/menu_action_with_thumbnail.h"
+#include "storage/file_upload.h"
+#include "storage/localimageloader.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_widgets.h"
+#include "ui/dynamic_thumbnails.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_common.h"
+#include "ui/widgets/popup_menu.h"
+
+namespace Api {
+namespace {
+
+constexpr auto kStickerSide = 512;
+
+[[nodiscard]] int SideForType(Data::StickersType type) {
+	return (type == Data::StickersType::Emoji)
+		? kEmojiStickerSideMax
+		: kStickerSide;
+}
+
+[[nodiscard]] MTPInputStickerSetItem InputItem(
+		const MTPInputDocument &document,
+		const QString &emoji) {
+	return MTP_inputStickerSetItem(
+		MTP_flags(0),
+		document,
+		MTP_string(emoji),
+		MTPMaskCoords(),
+		MTPstring());
+}
+
+[[nodiscard]] std::shared_ptr<FilePrepareResult> PrepareStickerWebp(
+		MTP::DcId dcId,
+		DocumentId id,
+		const QByteArray &bytes,
+		Data::StickersType type) {
+	const auto side = SideForType(type);
+	const auto filename = (type == Data::StickersType::Emoji)
+		? u"emoji.webp"_q
+		: u"sticker.webp"_q;
+	auto attributes = QVector<MTPDocumentAttribute>(
+		1,
+		MTP_documentAttributeFilename(MTP_string(filename)));
+	attributes.push_back(MTP_documentAttributeImageSize(
+		MTP_int(side),
+		MTP_int(side)));
+
+	auto result = MakePreparedFile({
+		.id = id,
+		.type = SendMediaType::File,
+	});
+	result->filename = filename;
+	result->filemime = u"image/webp"_q;
+	result->content = bytes;
+	result->filesize = bytes.size();
+	result->setFileData(bytes);
+	result->document = MTP_document(
+		MTP_flags(0),
+		MTP_long(id),
+		MTP_long(0),
+		MTP_bytes(),
+		MTP_int(base::unixtime::now()),
+		MTP_string("image/webp"),
+		MTP_long(bytes.size()),
+		MTP_vector<MTPPhotoSize>(),
+		MTPVector<MTPVideoSize>(),
+		MTP_int(dcId),
+		MTP_vector<MTPDocumentAttribute>(std::move(attributes)));
+	return result;
+}
+
+void FeedSetIfFull(
+		not_null<Main::Session*> session,
+		const MTPmessages_StickerSet &result) {
+	result.match([&](const MTPDmessages_stickerSet &data) {
+		session->data().stickers().feedSetFull(data);
+		session->data().stickers().notifyUpdated(
+			Data::StickersType::Stickers);
+	}, [](const auto &) {
+	});
+}
+
+template <typename Callback>
+void EnumerateOwnedSets(
+		not_null<Main::Session*> session,
+		Data::StickersType type,
+		Callback &&callback) {
+	const auto &stickers = session->data().stickers();
+	const auto &sets = stickers.sets();
+	const auto &order = (type == Data::StickersType::Emoji)
+		? stickers.emojiSetsOrder()
+		: stickers.setsOrder();
+	for (const auto setId : order) {
+		const auto it = sets.find(setId);
+		if (it == sets.end()) {
+			continue;
+		}
+		const auto set = it->second.get();
+		if (!(set->flags & Data::StickersSetFlag::AmCreator)
+			|| (set->type() != type)) {
+			continue;
+		}
+		using namespace Data;
+		if constexpr (std::is_same_v<
+				bool,
+				std::invoke_result_t<Callback, not_null<StickersSet*>>>) {
+			if (!callback(set)) {
+				return;
+			}
+		} else {
+			callback(set);
+		}
+	}
+}
+
+void FillChooseOwnedSetMenu(
+		not_null<Ui::PopupMenu*> menu,
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<DocumentData*> document,
+		Data::StickersType type) {
+	const auto session = &show->session();
+	const auto emoji = StickerEmojiOrDefault(document);
+	const auto isEmoji = (type == Data::StickersType::Emoji);
+	const auto maxCount = isEmoji
+		? kEmojiInOwnedSetMax
+		: kStickersInOwnedSetMax;
+	const auto fullMessage = isEmoji
+		? tr::lng_emoji_set_is_full
+		: tr::lng_stickers_set_is_full;
+	const auto addedMessage = isEmoji
+		? tr::lng_emoji_added
+		: tr::lng_stickers_create_added;
+	const auto alreadyMessage = isEmoji
+		? tr::lng_emoji_already_in_set
+		: tr::lng_stickers_already_in_set;
+	const auto failToast = [=](QString err) {
+		show->showToast(err.isEmpty()
+			? tr::lng_attach_failed(tr::now)
+			: err);
+	};
+	EnumerateOwnedSets(session, type, [&](not_null<Data::StickersSet*> set) {
+		const auto identifier = set->identifier();
+		const auto coverDocument = set->lookupThumbnailDocument();
+		auto thumbnail = coverDocument
+			? Ui::MakeDocumentThumbnailFit(
+				coverDocument,
+				Data::FileOriginStickerSet(set->id, set->accessHash))
+			: nullptr;
+		const auto targetSetId = set->id;
+		const auto handler = crl::guard(session, [=] {
+			const auto &map = session->data().stickers().sets();
+			const auto i = map.find(targetSetId);
+			if (i != map.end() && i->second->count >= maxCount) {
+				show->showToast(fullMessage(tr::now));
+				return;
+			}
+			const auto oldCount = (i != map.end())
+				? i->second->count
+				: 0;
+			AddExistingStickerToSet(
+				session,
+				identifier,
+				document,
+				emoji,
+				crl::guard(session, [=](MTPmessages_StickerSet) {
+					const auto &map = session->data().stickers().sets();
+					const auto i = map.find(targetSetId);
+					const auto newCount = (i != map.end())
+						? i->second->count
+						: oldCount;
+					show->showToast(newCount > oldCount
+						? addedMessage(tr::now)
+						: alreadyMessage(tr::now));
+				}),
+				crl::guard(session, failToast));
+		});
+		const auto rawAction = Ui::Menu::CreateAction(
+			menu.get(),
+			set->title,
+			handler);
+		auto item = base::make_unique_q<Menu::ActionWithThumbnail>(
+			menu->menu(),
+			menu->menu()->st(),
+			rawAction,
+			std::move(thumbnail),
+			st::menuIconStickerAdd.width());
+		menu->addAction(std::move(item));
+	});
+}
+
+} // namespace
+
+void AddExistingStickerToSet(
+		not_null<Main::Session*> session,
+		const StickerSetIdentifier &set,
+		not_null<DocumentData*> document,
+		const QString &emoji,
+		Fn<void(MTPmessages_StickerSet)> done,
+		Fn<void(QString)> fail) {
+	session->api().request(MTPstickers_AddStickerToSet(
+		Data::InputStickerSet(set),
+		InputItem(document->mtpInput(), emoji))
+	).done([=](const MTPmessages_StickerSet &result) {
+		FeedSetIfFull(session, result);
+		if (done) {
+			done(result);
+		}
+	}).fail([=](const MTP::Error &error) {
+		if (fail) {
+			fail(error.type());
+		}
+	}).handleFloodErrors().send();
+}
+
+QString StickerEmojiOrDefault(not_null<DocumentData*> document) {
+	if (const auto sticker = document->sticker()) {
+		if (!sticker->alt.isEmpty()) {
+			return sticker->alt;
+		}
+	}
+	return QString::fromUtf8("\xF0\x9F\x99\x82");
+}
+
+bool HasOwnedStickerSets(not_null<Main::Session*> session) {
+	auto found = false;
+	EnumerateOwnedSets(
+		session,
+		Data::StickersType::Stickers,
+		[&](not_null<Data::StickersSet*>) {
+			found = true;
+			return false;
+		});
+	return found;
+}
+
+bool HasOwnedEmojiSets(not_null<Main::Session*> session) {
+	auto found = false;
+	EnumerateOwnedSets(
+		session,
+		Data::StickersType::Emoji,
+		[&](not_null<Data::StickersSet*>) {
+			found = true;
+			return false;
+		});
+	return found;
+}
+
+void FillChooseStickerSetMenu(
+		not_null<Ui::PopupMenu*> menu,
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<DocumentData*> document) {
+	using namespace Data;
+	FillChooseOwnedSetMenu(menu, show, document, StickersType::Stickers);
+}
+
+void FillChooseEmojiSetMenu(
+		not_null<Ui::PopupMenu*> menu,
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<DocumentData*> document) {
+	FillChooseOwnedSetMenu(menu, show, document, Data::StickersType::Emoji);
+}
+
+void AddAddToStickerSetAction(
+		const Ui::Menu::MenuCallback &addAction,
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<DocumentData*> document) {
+	const auto session = &show->session();
+	if (!HasOwnedStickerSets(session)) {
+		return;
+	}
+	addAction({
+		.text = tr::lng_stickers_add_to_set(tr::now),
+		.icon = &st::menuIconStickerAdd,
+		.fillSubmenu = [show, document](not_null<Ui::PopupMenu*> submenu) {
+			FillChooseStickerSetMenu(submenu, show, document);
+		},
+		.submenuSt = &st::popupMenuWithIcons,
+	});
+}
+
+void AddAddToEmojiSetAction(
+		const Ui::Menu::MenuCallback &addAction,
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<DocumentData*> document) {
+	const auto session = &show->session();
+	if (!HasOwnedEmojiSets(session)) {
+		return;
+	}
+	addAction({
+		.text = tr::lng_emoji_add_to_set(tr::now),
+		.icon = &st::menuIconEmoji,
+		.fillSubmenu = [show, document](not_null<Ui::PopupMenu*> submenu) {
+			FillChooseEmojiSetMenu(submenu, show, document);
+		},
+		.submenuSt = &st::popupMenuWithIcons,
+	});
+}
+
+void AddAddToOwnedSetAction(
+		const Ui::Menu::MenuCallback &addAction,
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<DocumentData*> document) {
+	const auto sticker = document->sticker();
+	const auto isLottie = sticker && sticker->isLottie();
+	const auto size = document->dimensions;
+	const auto fitsEmoji = !size.isEmpty()
+		&& (size.width() <= kEmojiStickerSideMax)
+		&& (size.height() <= kEmojiStickerSideMax);
+	if (isLottie || !fitsEmoji) {
+		AddAddToStickerSetAction(addAction, show, document);
+	}
+	if (isLottie || fitsEmoji) {
+		AddAddToEmojiSetAction(addAction, std::move(show), document);
+	}
+}
+
+void DeleteStickerSet(
+		not_null<Main::Session*> session,
+		const StickerSetIdentifier &set,
+		Fn<void()> done,
+		Fn<void(QString)> fail) {
+	session->api().request(MTPstickers_DeleteStickerSet(
+		Data::InputStickerSet(set))
+	).done([=] {
+		session->data().stickers().notifyUpdated(
+			Data::StickersType::Stickers);
+		if (done) {
+			done();
+		}
+	}).fail([=](const MTP::Error &error) {
+		if (fail) {
+			fail(error.type());
+		}
+	}).send();
+}
+
+StickerUpload::StickerUpload(
+	not_null<Main::Session*> session,
+	StickerSetIdentifier set,
+	QByteArray webpBytes,
+	QString emoji,
+	Data::StickersType type)
+: _session(session)
+, _set(std::move(set))
+, _bytes(std::move(webpBytes))
+, _emoji(std::move(emoji))
+, _type(type)
+, _api(&session->mtp()) {
+}
+
+StickerUpload::~StickerUpload() {
+	cancel();
+}
+
+void StickerUpload::start(
+		Fn<void(MTPmessages_StickerSet)> done,
+		Fn<void(QString)> fail,
+		Fn<void(int)> progress) {
+	Expects(!_uploadId);
+
+	_done = std::move(done);
+	_fail = std::move(fail);
+	_progress = std::move(progress);
+
+	_documentId = base::RandomValue<DocumentId>();
+	auto ready = PrepareStickerWebp(
+		_session->mtp().mainDcId(),
+		_documentId,
+		_bytes,
+		_type);
+	_uploadId = FullMsgId(
+		_session->userPeerId(),
+		_session->data().nextLocalMessageId());
+
+	const auto document = _session->data().document(_documentId);
+	document->uploadingData = std::make_unique<Data::UploadState>(
+		document->size > 0 ? document->size : int64(_bytes.size()));
+
+	_session->uploader().documentReady(
+	) | rpl::filter([=](const Storage::UploadedMedia &data) {
+		return data.fullId == _uploadId;
+	}) | rpl::on_next([=](const Storage::UploadedMedia &data) {
+		uploadReady(data.info.file);
+	}, _uploadLifetime);
+
+	_session->uploader().documentFailed(
+	) | rpl::filter([=](const FullMsgId &id) {
+		return id == _uploadId;
+	}) | rpl::on_next([=] {
+		uploadFailed();
+	}, _uploadLifetime);
+
+	if (_progress) {
+		_session->uploader().documentProgress(
+		) | rpl::filter([=](const FullMsgId &id) {
+			return id == _uploadId;
+		}) | rpl::on_next([=] {
+			uploadProgressed();
+		}, _uploadLifetime);
+	}
+
+	_session->uploader().upload(_uploadId, ready);
+}
+
+void StickerUpload::cancel() {
+	if (_uploadId) {
+		_session->uploader().cancel(_uploadId);
+		_uploadId = FullMsgId();
+	}
+	if (_addRequestId) {
+		_api.request(_addRequestId).cancel();
+		_addRequestId = 0;
+	}
+	_uploadLifetime.destroy();
+	_done = nullptr;
+	_fail = nullptr;
+	_progress = nullptr;
+}
+
+void StickerUpload::uploadProgressed() {
+	if (!_progress) {
+		return;
+	}
+	const auto document = _session->data().document(_documentId);
+	if (!document->uploading() || !document->uploadingData) {
+		return;
+	}
+	const auto size = document->uploadingData->size;
+	if (size <= 0) {
+		return;
+	}
+	const auto percent = int(
+		(document->uploadingData->offset * 100) / size);
+	if (percent != _lastReportedPercent) {
+		_lastReportedPercent = percent;
+		_progress(percent);
+	}
+}
+
+void StickerUpload::uploadFailed() {
+	const auto fail = std::move(_fail);
+	cancel();
+	if (fail) {
+		fail(QString());
+	}
+}
+
+void StickerUpload::uploadReady(const MTPInputFile &file) {
+	_uploadLifetime.destroy();
+	_uploadId = FullMsgId();
+
+	const auto side = SideForType(_type);
+	auto attributes = QVector<MTPDocumentAttribute>();
+	attributes.push_back(MTP_documentAttributeSticker(
+		MTP_flags(0),
+		MTP_string(_emoji),
+		MTP_inputStickerSetEmpty(),
+		MTPMaskCoords()));
+	attributes.push_back(MTP_documentAttributeImageSize(
+		MTP_int(side),
+		MTP_int(side)));
+
+	const auto media = MTP_inputMediaUploadedDocument(
+		MTP_flags(0),
+		file,
+		MTPInputFile(),
+		MTP_string("image/webp"),
+		MTP_vector<MTPDocumentAttribute>(std::move(attributes)),
+		MTP_vector<MTPInputDocument>(),
+		MTPInputPhoto(),
+		MTP_int(0),
+		MTP_int(0));
+
+	_addRequestId = _api.request(MTPmessages_UploadMedia(
+		MTP_flags(0),
+		MTPstring(),
+		MTP_inputPeerSelf(),
+		media
+	)).done(crl::guard(this, [=](const MTPMessageMedia &result) {
+		_addRequestId = 0;
+		auto inputDoc = (MTPInputDocument*)(nullptr);
+		auto storage = MTPInputDocument();
+		result.match([&](const MTPDmessageMediaDocument &data) {
+			if (const auto doc = data.vdocument()) {
+				doc->match([&](const MTPDdocument &d) {
+					storage = MTP_inputDocument(
+						d.vid(),
+						d.vaccess_hash(),
+						d.vfile_reference());
+					inputDoc = &storage;
+				}, [](const auto &) {
+				});
+			}
+		}, [](const auto &) {
+		});
+		if (inputDoc) {
+			requestAddSticker(*inputDoc);
+		} else if (const auto fail = std::move(_fail)) {
+			cancel();
+			fail(QString());
+		}
+	})).fail(crl::guard(this, [=](const MTP::Error &error) {
+		_addRequestId = 0;
+		const auto fail = std::move(_fail);
+		const auto type = error.type();
+		cancel();
+		if (fail) {
+			fail(type);
+		}
+	})).handleFloodErrors().send();
+}
+
+void StickerUpload::requestAddSticker(const MTPInputDocument &document) {
+	_addRequestId = _api.request(MTPstickers_AddStickerToSet(
+		Data::InputStickerSet(_set),
+		InputItem(document, _emoji))
+	).done(crl::guard(this, [=](const MTPmessages_StickerSet &result) {
+		_addRequestId = 0;
+		FeedSetIfFull(_session, result);
+		const auto done = std::move(_done);
+		cancel();
+		if (done) {
+			done(result);
+		}
+	})).fail(crl::guard(this, [=](const MTP::Error &error) {
+		_addRequestId = 0;
+		const auto fail = std::move(_fail);
+		const auto type = error.type();
+		cancel();
+		if (fail) {
+			fail(type);
+		}
+	})).handleFloodErrors().send();
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_stickers_creator.h b/Telegram/SourceFiles/api/api_stickers_creator.h
new file mode 100644
index 00000000000000..6d0478f7dbd97c
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_stickers_creator.h
@@ -0,0 +1,123 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/weak_ptr.h"
+#include "data/stickers/data_stickers.h"
+#include "mtproto/sender.h"
+
+class DocumentData;
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class PopupMenu;
+namespace Menu {
+struct MenuCallback;
+} // namespace Menu
+} // namespace Ui
+
+namespace Api {
+
+inline constexpr auto kStickersInOwnedSetMax = 120;
+inline constexpr auto kEmojiInOwnedSetMax = 200;
+inline constexpr auto kEmojiStickerSideMax = 100;
+
+void AddExistingStickerToSet(
+	not_null<Main::Session*> session,
+	const StickerSetIdentifier &set,
+	not_null<DocumentData*> document,
+	const QString &emoji,
+	Fn<void(MTPmessages_StickerSet)> done,
+	Fn<void(QString)> fail);
+
+void DeleteStickerSet(
+	not_null<Main::Session*> session,
+	const StickerSetIdentifier &set,
+	Fn<void()> done,
+	Fn<void(QString)> fail);
+
+[[nodiscard]] bool HasOwnedStickerSets(not_null<Main::Session*> session);
+[[nodiscard]] bool HasOwnedEmojiSets(not_null<Main::Session*> session);
+
+[[nodiscard]] QString StickerEmojiOrDefault(
+	not_null<DocumentData*> document);
+
+void FillChooseStickerSetMenu(
+	not_null<Ui::PopupMenu*> menu,
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<DocumentData*> document);
+
+void FillChooseEmojiSetMenu(
+	not_null<Ui::PopupMenu*> menu,
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<DocumentData*> document);
+
+void AddAddToStickerSetAction(
+	const Ui::Menu::MenuCallback &addAction,
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<DocumentData*> document);
+
+void AddAddToEmojiSetAction(
+	const Ui::Menu::MenuCallback &addAction,
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<DocumentData*> document);
+
+void AddAddToOwnedSetAction(
+	const Ui::Menu::MenuCallback &addAction,
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<DocumentData*> document);
+
+class StickerUpload final : public base::has_weak_ptr {
+public:
+	StickerUpload(
+		not_null<Main::Session*> session,
+		StickerSetIdentifier set,
+		QByteArray webpBytes,
+		QString emoji,
+		Data::StickersType type = Data::StickersType::Stickers);
+	~StickerUpload();
+
+	void start(
+		Fn<void(MTPmessages_StickerSet)> done,
+		Fn<void(QString)> fail,
+		Fn<void(int /*percent*/)> progress = nullptr);
+
+	void cancel();
+
+private:
+	void uploadReady(const MTPInputFile &file);
+	void uploadFailed();
+	void uploadProgressed();
+	void requestAddSticker(const MTPInputDocument &document);
+
+	const not_null<Main::Session*> _session;
+	StickerSetIdentifier _set;
+	QByteArray _bytes;
+	QString _emoji;
+	Data::StickersType _type = Data::StickersType::Stickers;
+	MTP::Sender _api;
+	rpl::lifetime _uploadLifetime;
+	FullMsgId _uploadId;
+	DocumentId _documentId = 0;
+	mtpRequestId _addRequestId = 0;
+
+	Fn<void(MTPmessages_StickerSet)> _done;
+	Fn<void(QString)> _fail;
+	Fn<void(int)> _progress;
+	int _lastReportedPercent = -1;
+
+};
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_suggest_post.cpp b/Telegram/SourceFiles/api/api_suggest_post.cpp
new file mode 100644
index 00000000000000..073d9dd9cccdc3
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_suggest_post.cpp
@@ -0,0 +1,704 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_suggest_post.h"
+
+#include "apiwrap.h"
+#include "base/unixtime.h"
+#include "boxes/transfer_gift_box.h"
+#include "chat_helpers/message_field.h"
+#include "core/click_handler_types.h"
+#include "data/components/credits.h"
+#include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_session.h"
+#include "data/data_saved_sublist.h"
+#include "history/view/controls/history_view_suggest_options.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
+#include "history/history_item_helpers.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "mainwindow.h"
+#include "settings/settings_credits_graphics.h"
+#include "ui/boxes/choose_date_time.h"
+#include "ui/layers/generic_box.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/boxes/emoji_stake_box.h" // InsufficientTonBox
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/popup_menu.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+
+namespace Api {
+namespace {
+
+void SendApproval(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<HistoryItem*> item,
+		TimeId scheduleDate = 0) {
+	using Flag = MTPmessages_ToggleSuggestedPostApproval::Flag;
+	const auto suggestion = item->Get<HistoryMessageSuggestion>();
+	if (!suggestion
+		|| suggestion->accepted
+		|| suggestion->rejected
+		|| suggestion->requestId) {
+		return;
+	}
+
+	const auto id = item->fullId();
+	const auto session = &show->session();
+	const auto finish = [=] {
+		if (const auto item = session->data().message(id)) {
+			const auto suggestion = item->Get<HistoryMessageSuggestion>();
+			if (suggestion) {
+				suggestion->requestId = 0;
+			}
+		}
+	};
+	suggestion->requestId = session->api().request(
+		MTPmessages_ToggleSuggestedPostApproval(
+			MTP_flags(scheduleDate ? Flag::f_schedule_date : Flag()),
+			item->history()->peer->input(),
+			MTP_int(item->id.bare),
+			MTP_int(scheduleDate),
+			MTPstring()) // reject_comment
+	).done([=](const MTPUpdates &result) {
+		session->api().applyUpdates(result);
+		finish();
+	}).fail([=](const MTP::Error &error) {
+		show->showToast(error.type());
+		finish();
+	}).send();
+}
+
+void ConfirmApproval(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<HistoryItem*> item,
+		TimeId scheduleDate = 0,
+		Fn<void()> accepted = nullptr) {
+	const auto suggestion = item->Get<HistoryMessageSuggestion>();
+	if (!suggestion
+		|| suggestion->accepted
+		|| suggestion->rejected
+		|| suggestion->requestId) {
+		return;
+	}
+	const auto id = item->fullId();
+	const auto price = suggestion->price;
+	const auto admin = item->history()->amMonoforumAdmin();
+	if (!admin && !price.empty()) {
+		const auto credits = &item->history()->session().credits();
+		if (price.ton()) {
+			if (!credits->tonLoaded()) {
+				credits->tonLoad();
+				return;
+			} else if (price > credits->tonBalance()) {
+				const auto session = &item->history()->session();
+				show->show(
+					Box(Ui::InsufficientTonBox, session, price));
+				return;
+			}
+		} else {
+			if (!credits->loaded()) {
+				credits->load();
+				return;
+			} else if (price > credits->balance()) {
+				using namespace Settings;
+				const auto peer = item->history()->peer;
+				const auto broadcast = peer->monoforumBroadcast();
+				const auto broadcastId = (broadcast ? broadcast : peer)->id;
+				const auto done = [=](SmallBalanceResult result) {
+					if (result == SmallBalanceResult::Success
+						|| result == SmallBalanceResult::Already) {
+						const auto item = peer->owner().message(id);
+						if (item) {
+							ConfirmApproval(
+								show,
+								item,
+								scheduleDate,
+								accepted);
+						}
+					}
+				};
+				MaybeRequestBalanceIncrease(
+					show,
+					int(base::SafeRound(price.value())),
+					SmallBalanceForSuggest{ broadcastId },
+					done);
+				return;
+			}
+		}
+	}
+	const auto peer = item->history()->peer;
+	const auto session = &peer->session();
+	const auto broadcast = peer->monoforumBroadcast();
+	const auto channelName = (broadcast ? broadcast : peer)->name();
+	const auto amount = admin
+		? HistoryView::PriceAfterCommission(session, price)
+		: price;
+	const auto commission = HistoryView::FormatAfterCommissionPercent(
+		session,
+		price);
+	const auto date = langDateTime(base::unixtime::parse(scheduleDate));
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		const auto callback = std::make_shared<Fn<void()>>();
+		auto text = admin
+			? tr::lng_suggest_accept_text(
+				tr::now,
+				lt_from,
+				tr::bold(item->from()->shortName()),
+				tr::marked)
+			: tr::lng_suggest_accept_text_to(
+				tr::now,
+				lt_channel,
+				tr::bold(channelName),
+				tr::marked);
+		if (price) {
+			text.append("\n\n").append(admin
+				? (scheduleDate
+					? (amount.stars()
+						? tr::lng_suggest_accept_receive_stars
+						: tr::lng_suggest_accept_receive_ton)(
+							tr::now,
+							lt_count_decimal,
+							amount.value(),
+							lt_channel,
+							tr::bold(channelName),
+							lt_percent,
+							TextWithEntities{ commission },
+							lt_date,
+							tr::bold(date),
+							tr::rich)
+					: (amount.stars()
+						? tr::lng_suggest_accept_receive_now_stars
+						: tr::lng_suggest_accept_receive_now_ton)(
+							tr::now,
+							lt_count_decimal,
+							amount.value(),
+							lt_channel,
+							tr::bold(channelName),
+							lt_percent,
+							TextWithEntities{ commission },
+							tr::rich))
+				: (scheduleDate
+					? (amount.stars()
+						? tr::lng_suggest_accept_pay_stars
+						: tr::lng_suggest_accept_pay_ton)(
+							tr::now,
+							lt_count_decimal,
+							amount.value(),
+							lt_date,
+							tr::bold(date),
+							tr::rich)
+					: (amount.stars()
+						? tr::lng_suggest_accept_pay_now_stars
+						: tr::lng_suggest_accept_pay_now_ton)(
+							tr::now,
+							lt_count_decimal,
+							amount.value(),
+							tr::rich)));
+			if (admin) {
+				text.append(' ').append(
+					tr::lng_suggest_accept_receive_if(
+						tr::now,
+						tr::rich));
+				if (price.stars()) {
+					text.append("\n\n").append(
+						tr::lng_suggest_options_stars_warning(
+							tr::now,
+							tr::rich));
+				}
+			}
+		}
+		Ui::ConfirmBox(box, {
+			.text = text,
+			.confirmed = [=](Fn<void()> close) { (*callback)(); close(); },
+			.confirmText = tr::lng_suggest_accept_send(),
+			.title = tr::lng_suggest_accept_title(),
+		});
+		*callback = [=, weak = base::make_weak(box)] {
+			if (const auto onstack = accepted) {
+				onstack();
+			}
+			const auto item = show->session().data().message(id);
+			if (!item) {
+				return;
+			}
+			SendApproval(show, item, scheduleDate);
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		};
+	}));
+}
+
+void SendDecline(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<HistoryItem*> item,
+		const QString &comment) {
+	using Flag = MTPmessages_ToggleSuggestedPostApproval::Flag;
+	const auto suggestion = item->Get<HistoryMessageSuggestion>();
+	if (!suggestion
+		|| suggestion->accepted
+		|| suggestion->rejected
+		|| suggestion->requestId) {
+		return;
+	}
+
+	const auto id = item->fullId();
+	const auto session = &show->session();
+	const auto finish = [=] {
+		if (const auto item = session->data().message(id)) {
+			const auto suggestion = item->Get<HistoryMessageSuggestion>();
+			if (suggestion) {
+				suggestion->requestId = 0;
+			}
+		}
+	};
+	suggestion->requestId = session->api().request(
+		MTPmessages_ToggleSuggestedPostApproval(
+			MTP_flags(Flag::f_reject
+				| (comment.isEmpty() ? Flag() : Flag::f_reject_comment)),
+			item->history()->peer->input(),
+			MTP_int(item->id.bare),
+			MTPint(), // schedule_date
+			MTP_string(comment))
+	).done([=](const MTPUpdates &result) {
+		session->api().applyUpdates(result);
+		finish();
+	}).fail([=](const MTP::Error &error) {
+		show->showToast(error.type());
+		finish();
+	}).send();
+}
+
+void RequestApprovalDate(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<HistoryItem*> item) {
+	const auto id = item->fullId();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
+	const auto close = [=] {
+		if (const auto strong = weak->get()) {
+			strong->closeBox();
+		}
+	};
+	const auto done = [=](TimeId result) {
+		if (const auto item = show->session().data().message(id)) {
+			ConfirmApproval(show, item, result, close);
+		} else {
+			close();
+		}
+	};
+	using namespace HistoryView;
+	auto dateBox = Box(ChooseSuggestTimeBox, SuggestTimeBoxArgs{
+		.session = &show->session(),
+		.done = done,
+		.mode = SuggestMode::Publish,
+	});
+	*weak = dateBox.data();
+	show->show(std::move(dateBox));
+}
+
+void RequestDeclineComment(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<HistoryItem*> item) {
+	const auto id = item->fullId();
+	const auto admin = item->history()->amMonoforumAdmin();
+	const auto peer = item->history()->peer;
+	const auto broadcast = peer->monoforumBroadcast();
+	const auto channelName = (broadcast ? broadcast : peer)->name();
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		const auto callback = std::make_shared<Fn<void()>>();
+		Ui::ConfirmBox(box, {
+			.text = (admin
+				? tr::lng_suggest_decline_text(
+					lt_from,
+					rpl::single(tr::bold(item->from()->shortName())),
+					tr::marked)
+				: tr::lng_suggest_decline_text_to(
+					lt_channel,
+					rpl::single(tr::bold(channelName)),
+					tr::marked)),
+			.confirmed = [=](Fn<void()> close) { (*callback)(); close(); },
+			.confirmText = tr::lng_suggest_action_decline(),
+			.confirmStyle = &st::attentionBoxButton,
+			.title = tr::lng_suggest_decline_title(),
+		});
+		const auto reason = box->addRow(object_ptr<Ui::InputField>(
+			box,
+			st::factcheckField,
+			Ui::InputField::Mode::NoNewlines,
+			tr::lng_suggest_decline_reason()));
+		box->setFocusCallback([=] {
+			reason->setFocusFast();
+		});
+		*callback = [=, weak = base::make_weak(box)] {
+			const auto item = show->session().data().message(id);
+			if (!item) {
+				return;
+			}
+			SendDecline(show, item, reason->getLastText().trimmed());
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		};
+		reason->submits(
+		) | rpl::on_next([=](Qt::KeyboardModifiers modifiers) {
+			if (!(modifiers & Qt::ShiftModifier)) {
+				(*callback)();
+			}
+		}, box->lifetime());
+	}));
+}
+
+struct SendSuggestState {
+	SendPaymentHelper sendPayment;
+};
+void SendSuggest(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<HistoryItem*> item,
+		std::shared_ptr<SendSuggestState> state,
+		Fn<void(SuggestOptions&)> modify,
+		Fn<void()> done = nullptr,
+		int starsApproved = 0) {
+	const auto suggestion = item->Get<HistoryMessageSuggestion>();
+	const auto id = item->fullId();
+	const auto withPaymentApproved = [=](int stars) {
+		if (const auto item = show->session().data().message(id)) {
+			SendSuggest(show, item, state, modify, done, stars);
+		}
+	};
+	const auto isForward = item->Get<HistoryMessageForwarded>();
+	auto action = SendAction(item->history());
+	action.options.suggest.exists = 1;
+	if (suggestion) {
+		action.options.suggest.date = suggestion->date;
+		action.options.suggest.priceWhole = suggestion->price.whole();
+		action.options.suggest.priceNano = suggestion->price.nano();
+		action.options.suggest.ton = suggestion->price.ton() ? 1 : 0;
+	}
+	modify(action.options.suggest);
+	action.options.starsApproved = starsApproved;
+	action.replyTo.monoforumPeerId = item->history()->amMonoforumAdmin()
+		? item->sublistPeerId()
+		: PeerId();
+	action.replyTo.messageId = item->fullId();
+
+	const auto checked = state->sendPayment.check(
+		show,
+		item->history()->peer,
+		action.options,
+		1,
+		withPaymentApproved);
+	if (!checked) {
+		return;
+	}
+
+	show->session().api().sendAction(action);
+	show->session().api().forwardMessages({
+		.items = { item },
+		.options = (isForward
+			? Data::ForwardOptions::PreserveInfo
+			: Data::ForwardOptions::NoSenderNames),
+		}, action);
+	if (const auto onstack = done) {
+		onstack();
+	}
+}
+
+void SuggestApprovalDate(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<HistoryItem*> item) {
+	const auto suggestion = item->Get<HistoryMessageSuggestion>();
+	if (!suggestion) {
+		return;
+	}
+	const auto id = item->fullId();
+	const auto state = std::make_shared<SendSuggestState>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
+	const auto done = [=](TimeId result) {
+		const auto item = show->session().data().message(id);
+		if (!item) {
+			return;
+		}
+		const auto close = [=] {
+			if (const auto strong = weak->get()) {
+				strong->closeBox();
+			}
+		};
+		SendSuggest(
+			show,
+			item,
+			state,
+			[=](SuggestOptions &options) { options.date = result; },
+			close);
+	};
+	using namespace HistoryView;
+	auto dateBox = Box(ChooseSuggestTimeBox, SuggestTimeBoxArgs{
+		.session = &show->session(),
+		.done = done,
+		.value = suggestion->date,
+		.mode = SuggestMode::Change,
+	});
+	*weak = dateBox.data();
+	show->show(std::move(dateBox));
+}
+
+void SuggestOfferForMessage(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<HistoryItem*> item,
+		SuggestOptions values,
+		HistoryView::SuggestMode mode) {
+	const auto id = item->fullId();
+	const auto state = std::make_shared<SendSuggestState>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
+	const auto done = [=](SuggestOptions result) {
+		const auto item = show->session().data().message(id);
+		if (!item) {
+			return;
+		}
+		const auto close = [=] {
+			if (const auto strong = weak->get()) {
+				strong->closeBox();
+			}
+		};
+		SendSuggest(
+			show,
+			item,
+			state,
+			[=](SuggestOptions &options) { options = result; },
+			close);
+	};
+	using namespace HistoryView;
+	auto priceBox = Box(ChooseSuggestPriceBox, SuggestPriceBoxArgs{
+		.peer = item->history()->peer,
+		.done = done,
+		.value = values,
+		.mode = mode,
+	});
+	*weak = priceBox.data();
+	show->show(std::move(priceBox));
+}
+
+void SuggestApprovalPrice(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<HistoryItem*> item) {
+	const auto suggestion = item->Get<HistoryMessageSuggestion>();
+	if (!suggestion) {
+		return;
+	}
+	using namespace HistoryView;
+	SuggestOfferForMessage(show, item, {
+		.exists = uint32(1),
+		.priceWhole = uint32(suggestion->price.whole()),
+		.priceNano = uint32(suggestion->price.nano()),
+		.ton = uint32(suggestion->price.ton() ? 1 : 0),
+		.date = suggestion->date,
+	}, SuggestMode::Change);
+}
+
+void ConfirmGiftSaleAccept(
+		not_null<Window::SessionController*> window,
+		not_null<HistoryItem*> item,
+		not_null<HistoryMessageSuggestion*> suggestion) {
+	ShowGiftSaleAcceptBox(window, item, suggestion);
+}
+
+void ConfirmGiftSaleDecline(
+		not_null<Window::SessionController*> window,
+		not_null<HistoryItem*> item,
+		not_null<HistoryMessageSuggestion*> suggestion) {
+	ShowGiftSaleRejectBox(window, item, suggestion);
+}
+
+void RespondToNoForwardsRequest(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item,
+		not_null<HistoryServiceNoForwardsRequest*> request,
+		bool accept) {
+	if (request->requestId) {
+		return;
+	}
+	const auto id = item->fullId();
+	const auto session = &item->history()->session();
+	const auto peer = item->history()->peer;
+	const auto msgId = item->id;
+	const auto finish = [=] {
+		if (const auto item = session->data().message(id)) {
+			if (const auto r = item->Get<HistoryServiceNoForwardsRequest>()) {
+				r->requestId = 0;
+			}
+		}
+	};
+	using Flag = MTPmessages_ToggleNoForwards::Flag;
+	request->requestId = session->api().request(MTPmessages_ToggleNoForwards(
+		MTP_flags(Flag::f_request_msg_id),
+		peer->input(),
+		MTP_bool(!accept),
+		MTP_int(msgId)
+	)).done([=](const MTPUpdates &result) {
+		session->api().applyUpdates(result);
+		finish();
+	}).fail([=](const MTP::Error &error) {
+		controller->showToast(error.type());
+		finish();
+	}).send();
+}
+
+} // namespace
+
+std::shared_ptr<ClickHandler> AcceptClickHandler(
+		not_null<HistoryItem*> item) {
+	const auto session = &item->history()->session();
+	const auto id = item->fullId();
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		const auto my = context.other.value<ClickHandlerContext>();
+		const auto controller = my.sessionWindow.get();
+		if (!controller || &controller->session() != session) {
+			return;
+		}
+		const auto item = session->data().message(id);
+		if (!item) {
+			return;
+		}
+		const auto show = controller->uiShow();
+		const auto suggestion = item->Get<HistoryMessageSuggestion>();
+		const auto nfRequest = item->Get<HistoryServiceNoForwardsRequest>();
+		if (!suggestion && !nfRequest) {
+			return;
+		} else if (nfRequest) {
+			RespondToNoForwardsRequest(controller, item, nfRequest, true);
+			return;
+		} else if (suggestion->gift) {
+			ConfirmGiftSaleAccept(controller, item, suggestion);
+		} else if (!suggestion->date) {
+			RequestApprovalDate(show, item);
+		} else {
+			ConfirmApproval(show, item);
+		}
+	});
+}
+
+std::shared_ptr<ClickHandler> DeclineClickHandler(
+		not_null<HistoryItem*> item) {
+	const auto session = &item->history()->session();
+	const auto id = item->fullId();
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		const auto my = context.other.value<ClickHandlerContext>();
+		const auto controller = my.sessionWindow.get();
+		if (!controller || &controller->session() != session) {
+			return;
+		}
+		const auto item = session->data().message(id);
+		if (!item) {
+			return;
+		}
+		const auto nfRequest = item->Get<HistoryServiceNoForwardsRequest>();
+		if (nfRequest) {
+			RespondToNoForwardsRequest(controller, item, nfRequest, false);
+			return;
+		}
+		const auto suggestion = item->Get<HistoryMessageSuggestion>();
+		if (suggestion && suggestion->gift) {
+			ConfirmGiftSaleDecline(controller, item, suggestion);
+		} else {
+			RequestDeclineComment(controller->uiShow(), item);
+		}
+	});
+}
+
+std::shared_ptr<ClickHandler> SuggestChangesClickHandler(
+		not_null<HistoryItem*> item) {
+	const auto session = &item->history()->session();
+	const auto id = item->fullId();
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		const auto my = context.other.value<ClickHandlerContext>();
+		const auto window = my.sessionWindow.get();
+		if (!window || &window->session() != session) {
+			return;
+		}
+		const auto item = session->data().message(id);
+		if (!item) {
+			return;
+		}
+		const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+			window->widget(),
+			st::popupMenuWithIcons);
+		if (HistoryView::CanEditSuggestedMessage(item)) {
+			menu->addAction(tr::lng_suggest_menu_edit_message(tr::now), [=] {
+				const auto item = session->data().message(id);
+				if (!item) {
+					return;
+				}
+				const auto suggestion = item->Get<HistoryMessageSuggestion>();
+				if (!suggestion) {
+					return;
+				}
+				const auto history = item->history();
+				const auto editData = PrepareEditText(item);
+				const auto cursor = MessageCursor{
+					int(editData.text.size()),
+					int(editData.text.size()),
+					Ui::kQFixedMax
+				};
+				const auto monoforumPeerId = history->amMonoforumAdmin()
+					? item->sublistPeerId()
+					: PeerId();
+				const auto previewDraft = Data::WebPageDraft::FromItem(item);
+				history->setLocalEditDraft(std::make_unique<Data::Draft>(
+					editData,
+					FullReplyTo{
+						.messageId = FullMsgId(history->peer->id, item->id),
+						.monoforumPeerId = monoforumPeerId,
+					},
+					SuggestOptions{
+						.exists = uint32(1),
+						.priceWhole = uint32(suggestion->price.whole()),
+						.priceNano = uint32(suggestion->price.nano()),
+						.ton = uint32(suggestion->price.ton() ? 1 : 0),
+						.date = suggestion->date,
+					},
+					cursor,
+					previewDraft));
+				history->session().changes().entryUpdated(
+					(monoforumPeerId
+						? item->savedSublist()
+						: (Data::Thread*)history.get()),
+					Data::EntryUpdate::Flag::LocalDraftSet);
+			}, &st::menuIconEdit);
+		}
+		menu->addAction(tr::lng_suggest_menu_edit_price(tr::now), [=] {
+			if (const auto item = session->data().message(id)) {
+				SuggestApprovalPrice(window->uiShow(), item);
+			}
+		}, &st::menuIconTagSell);
+		menu->addAction(tr::lng_suggest_menu_edit_time(tr::now), [=] {
+			if (const auto item = session->data().message(id)) {
+				SuggestApprovalDate(window->uiShow(), item);
+			}
+		}, &st::menuIconSchedule);
+		menu->popup(QCursor::pos());
+	});
+}
+
+void AddOfferToMessage(
+		std::shared_ptr<Main::SessionShow> show,
+		FullMsgId itemId) {
+	const auto session = &show->session();
+	const auto item = session->data().message(itemId);
+	if (!item || !HistoryView::CanAddOfferToMessage(item)) {
+		return;
+	}
+	SuggestOfferForMessage(show, item, {}, HistoryView::SuggestMode::New);
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_suggest_post.h b/Telegram/SourceFiles/api/api_suggest_post.h
new file mode 100644
index 00000000000000..582f0adca0ac15
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_suggest_post.h
@@ -0,0 +1,29 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class ClickHandler;
+
+namespace Main {
+class SessionShow;
+} // namespace Main
+
+namespace Api {
+
+[[nodiscard]] std::shared_ptr<ClickHandler> AcceptClickHandler(
+	not_null<HistoryItem*> item);
+[[nodiscard]] std::shared_ptr<ClickHandler> DeclineClickHandler(
+	not_null<HistoryItem*> item);
+[[nodiscard]] std::shared_ptr<ClickHandler> SuggestChangesClickHandler(
+	not_null<HistoryItem*> item);
+
+void AddOfferToMessage(
+	std::shared_ptr<Main::SessionShow> show,
+	FullMsgId itemId);
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_text_entities.cpp b/Telegram/SourceFiles/api/api_text_entities.cpp
index 067cc6c0c1ad7d..87af7a77a3114e 100644
--- a/Telegram/SourceFiles/api/api_text_entities.cpp
+++ b/Telegram/SourceFiles/api/api_text_entities.cpp
@@ -12,7 +12,10 @@ For license and copyright information please follow this link:
 #include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/stickers/data_stickers_set.h"
+#include "history/history.h"
+#include "history/history_item.h"
 #include "main/main_session.h"
+#include "ui/basic_click_handlers.h"
 
 namespace Api {
 namespace {
@@ -47,14 +50,23 @@ using namespace TextUtilities;
 	if (!parsed.userId || parsed.selfId != session->userId().bare) {
 		return {};
 	}
-	return MTP_inputMessageEntityMentionName(
-		offset,
-		length,
-		(parsed.userId == parsed.selfId
-			? MTP_inputUserSelf()
-			: MTP_inputUser(
-				MTP_long(parsed.userId),
-				MTP_long(parsed.accessHash))));
+	const auto user = session->data().user(UserId(parsed.userId));
+	const auto item = user->isLoaded()
+		? nullptr
+		: user->owner().messageWithPeer(user->id);
+	const auto input = item
+		? MTP_inputUserFromMessage(
+			item->history()->peer->input(),
+			MTP_int(item->id.bare),
+			MTP_long(parsed.userId))
+		: (parsed.userId == parsed.selfId)
+		? MTP_inputUserSelf()
+		: user->isLoaded()
+		? user->inputUser()
+		: MTP_inputUser(
+			MTP_long(parsed.userId),
+			MTP_long(parsed.accessHash));
+	return MTP_inputMessageEntityMentionName(offset, length, input);
 }
 
 } // namespace
@@ -202,7 +214,11 @@ EntitiesInText EntitiesFromMTP(
 				d.vlength().v,
 			});
 		}, [&](const MTPDmessageEntityBankCard &d) {
-			// Skipping cards. // #TODO entities
+			result.push_back({
+				EntityType::BankCard,
+				d.voffset().v,
+				d.vlength().v,
+			});
 		}, [&](const MTPDmessageEntitySpoiler &d) {
 			result.push_back({
 				EntityType::Spoiler,
@@ -223,13 +239,42 @@ EntitiesInText EntitiesFromMTP(
 				d.vlength().v,
 				d.is_collapsed() ? u"1"_q : QString(),
 			});
+		}, [&](const MTPDmessageEntityFormattedDate &d) {
+			auto flags = FormattedDateFlags();
+			if (d.is_relative()) {
+				flags |= FormattedDateFlag::Relative;
+			}
+			if (d.is_short_time()) {
+				flags |= FormattedDateFlag::ShortTime;
+			}
+			if (d.is_long_time()) {
+				flags |= FormattedDateFlag::LongTime;
+			}
+			if (d.is_short_date()) {
+				flags |= FormattedDateFlag::ShortDate;
+			}
+			if (d.is_long_date()) {
+				flags |= FormattedDateFlag::LongDate;
+			}
+			if (d.is_day_of_week()) {
+				flags |= FormattedDateFlag::DayOfWeek;
+			}
+			result.push_back({
+				EntityType::FormattedDate,
+				d.voffset().v,
+				d.vlength().v,
+				SerializeFormattedDateData(d.vdate().v, flags),
+			});
+		}, [&](const MTPDmessageEntityDiffInsert &) {
+		}, [&](const MTPDmessageEntityDiffReplace &) {
+		}, [&](const MTPDmessageEntityDiffDelete &) {
 		});
 	}
 	return result;
 }
 
 MTPVector<MTPMessageEntity> EntitiesToMTP(
-		not_null<Main::Session*> session,
+		Main::Session *session,
 		const EntitiesInText &entities,
 		ConvertOption option) {
 	auto v = QVector<MTPMessageEntity>();
@@ -250,7 +295,8 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(
 			&& entity.type() != EntityType::Spoiler
 			&& entity.type() != EntityType::MentionName
 			&& entity.type() != EntityType::CustomUrl
-			&& entity.type() != EntityType::CustomEmoji) {
+			&& entity.type() != EntityType::CustomEmoji
+			&& entity.type() != EntityType::FormattedDate) {
 			continue;
 		}
 
@@ -261,11 +307,15 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(
 			v.push_back(MTP_messageEntityUrl(offset, length));
 		} break;
 		case EntityType::CustomUrl: {
+			const auto external = UrlClickHandler::ExternalUrlFromInternalUrl(
+				entity.data());
 			v.push_back(
 				MTP_messageEntityTextUrl(
 					offset,
 					length,
-					MTP_string(entity.data())));
+					MTP_string(external.isEmpty()
+						? entity.data()
+						: external)));
 		} break;
 		case EntityType::Email: {
 			v.push_back(MTP_messageEntityEmail(offset, length));
@@ -273,6 +323,9 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(
 		case EntityType::Phone: {
 			v.push_back(MTP_messageEntityPhone(offset, length));
 		} break;
+		case EntityType::BankCard: {
+			v.push_back(MTP_messageEntityBankCard(offset, length));
+		} break;
 		case EntityType::Hashtag: {
 			v.push_back(MTP_messageEntityHashtag(offset, length));
 		} break;
@@ -283,6 +336,7 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(
 			v.push_back(MTP_messageEntityMention(offset, length));
 		} break;
 		case EntityType::MentionName: {
+			Assert(session != nullptr);
 			const auto valid = MentionNameEntity(
 				session,
 				offset,
@@ -339,9 +393,50 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(
 				v.push_back(*valid);
 			}
 		} break;
+		case EntityType::FormattedDate: {
+			const auto [date, dateFlags] = DeserializeFormattedDateData(
+				entity.data());
+			if (date) {
+				using Flag = MTPDmessageEntityFormattedDate::Flag;
+				auto mtpFlags = MTPDmessageEntityFormattedDate::Flags();
+				if (dateFlags & FormattedDateFlag::Relative) {
+					mtpFlags |= Flag::f_relative;
+				}
+				if (dateFlags & FormattedDateFlag::ShortTime) {
+					mtpFlags |= Flag::f_short_time;
+				}
+				if (dateFlags & FormattedDateFlag::LongTime) {
+					mtpFlags |= Flag::f_long_time;
+				}
+				if (dateFlags & FormattedDateFlag::ShortDate) {
+					mtpFlags |= Flag::f_short_date;
+				}
+				if (dateFlags & FormattedDateFlag::LongDate) {
+					mtpFlags |= Flag::f_long_date;
+				}
+				if (dateFlags & FormattedDateFlag::DayOfWeek) {
+					mtpFlags |= Flag::f_day_of_week;
+				}
+				v.push_back(MTP_messageEntityFormattedDate(
+					MTP_flags(mtpFlags),
+					offset,
+					length,
+					MTP_int(date)));
+			}
+		} break;
 		}
 	}
 	return MTP_vector<MTPMessageEntity>(std::move(v));
 }
 
+TextWithEntities ParseTextWithEntities(
+		Main::Session *session,
+		const MTPTextWithEntities &text) {
+	const auto &data = text.data();
+	return {
+		.text = qs(data.vtext()),
+		.entities = EntitiesFromMTP(session, data.ventities().v),
+	};
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_text_entities.h b/Telegram/SourceFiles/api/api_text_entities.h
index 95348d61649928..a2d9adb88b9e8b 100644
--- a/Telegram/SourceFiles/api/api_text_entities.h
+++ b/Telegram/SourceFiles/api/api_text_entities.h
@@ -25,8 +25,12 @@ enum class ConvertOption {
 	const QVector<MTPMessageEntity> &entities);
 
 [[nodiscard]] MTPVector<MTPMessageEntity> EntitiesToMTP(
-	not_null<Main::Session*> session,
+	Main::Session *session,
 	const EntitiesInText &entities,
 	ConvertOption option = ConvertOption::WithLocal);
 
+[[nodiscard]] TextWithEntities ParseTextWithEntities(
+	Main::Session *session,
+	const MTPTextWithEntities &text);
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_todo_lists.cpp b/Telegram/SourceFiles/api/api_todo_lists.cpp
new file mode 100644
index 00000000000000..ecd02a20da983b
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_todo_lists.cpp
@@ -0,0 +1,257 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_todo_lists.h"
+
+#include "api/api_editing.h"
+#include "apiwrap.h"
+#include "base/random.h"
+#include "data/business/data_shortcut_messages.h" // ShortcutIdToMTP
+#include "data/data_changes.h"
+#include "data/data_histories.h"
+#include "data/data_todo_list.h"
+#include "data/data_session.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_helpers.h" // ShouldSendSilent
+#include "main/main_session.h"
+
+namespace Api {
+namespace {
+
+constexpr auto kSendTogglesDelay = 3 * crl::time(1000);
+
+} // namespace
+
+TodoLists::TodoLists(not_null<ApiWrap*> api)
+: _session(&api->session())
+, _api(&api->instance())
+, _sendTimer([=] { sendAccumulatedToggles(false); }) {
+}
+
+void TodoLists::create(
+		const TodoListData &data,
+		SendAction action,
+		Fn<void()> done,
+		Fn<void(QString)> fail) {
+	_session->api().sendAction(action);
+
+	const auto history = action.history;
+	const auto peer = history->peer;
+	const auto topicRootId = action.replyTo.messageId
+		? action.replyTo.topicRootId
+		: 0;
+	const auto monoforumPeerId = action.replyTo.monoforumPeerId;
+	auto sendFlags = MTPmessages_SendMedia::Flags(0);
+	if (action.replyTo) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to;
+	}
+	const auto clearCloudDraft = action.clearDraft;
+	if (clearCloudDraft) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_clear_draft;
+		history->clearLocalDraft(topicRootId, monoforumPeerId);
+		history->clearCloudDraft(topicRootId, monoforumPeerId);
+		history->startSavingCloudDraft(topicRootId, monoforumPeerId);
+	}
+	const auto silentPost = ShouldSendSilent(peer, action.options);
+	const auto starsPaid = std::min(
+		peer->starsPerMessageChecked(),
+		action.options.starsApproved);
+	if (silentPost) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
+	}
+	if (action.options.scheduled) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_schedule_date;
+		if (action.options.scheduleRepeatPeriod) {
+			sendFlags |= MTPmessages_SendMedia::Flag::f_schedule_repeat_period;
+		}
+	}
+	if (action.options.shortcutId) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_quick_reply_shortcut;
+	}
+	if (action.options.effectId) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_effect;
+	}
+	if (action.options.suggest) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_suggested_post;
+	}
+	if (starsPaid) {
+		action.options.starsApproved -= starsPaid;
+		sendFlags |= MTPmessages_SendMedia::Flag::f_allow_paid_stars;
+	}
+	const auto sendAs = action.options.sendAs;
+	if (sendAs) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_send_as;
+	}
+	auto &histories = history->owner().histories();
+	const auto randomId = base::RandomValue<uint64>();
+	histories.sendPreparedMessage(
+		history,
+		action.replyTo,
+		randomId,
+		Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
+			MTP_flags(sendFlags),
+			peer->input(),
+			Data::Histories::ReplyToPlaceholder(),
+			TodoListDataToInputMedia(&data),
+			MTP_string(),
+			MTP_long(randomId),
+			MTPReplyMarkup(),
+			MTPVector<MTPMessageEntity>(),
+			MTP_int(action.options.scheduled),
+			MTP_int(action.options.scheduleRepeatPeriod),
+			(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
+			Data::ShortcutIdToMTP(_session, action.options.shortcutId),
+			MTP_long(action.options.effectId),
+			MTP_long(starsPaid),
+			SuggestToMTP(action.options.suggest)
+		), [=](const MTPUpdates &result, const MTP::Response &response) {
+		if (clearCloudDraft) {
+			history->finishSavingCloudDraft(
+				topicRootId,
+				monoforumPeerId,
+				UnixtimeFromMsgId(response.outerMsgId));
+		}
+		_session->changes().historyUpdated(
+			history,
+			(action.options.scheduled
+				? Data::HistoryUpdate::Flag::ScheduledSent
+				: Data::HistoryUpdate::Flag::MessageSent));
+		if (const auto onstack = done) {
+			onstack();
+		}
+	}, [=](const MTP::Error &error, const MTP::Response &response) {
+		if (clearCloudDraft) {
+			history->finishSavingCloudDraft(
+				topicRootId,
+				monoforumPeerId,
+				UnixtimeFromMsgId(response.outerMsgId));
+		}
+		if (const auto onstack = fail) {
+			onstack(error.type());
+		}
+	});
+}
+
+void TodoLists::edit(
+		not_null<HistoryItem*> item,
+		const TodoListData &data,
+		SendOptions options,
+		Fn<void()> done,
+		Fn<void(QString)> fail) {
+	EditTodoList(item, data, options, [=](mtpRequestId) {
+		if (const auto onstack = done) {
+			onstack();
+		}
+	}, [=](const QString &error, mtpRequestId) {
+		if (const auto onstack = fail) {
+			onstack(error);
+		}
+	});
+}
+
+void TodoLists::add(
+		not_null<HistoryItem*> item,
+		const std::vector<TodoListItem> &items,
+		Fn<void()> done,
+		Fn<void(QString)> fail) {
+	if (items.empty()) {
+		return;
+	}
+	const auto session = _session;
+	_session->api().request(MTPmessages_AppendTodoList(
+		item->history()->peer->input(),
+		MTP_int(item->id.bare),
+		TodoListItemsToMTP(&item->history()->session(), items)
+	)).done([=](const MTPUpdates &result) {
+		session->api().applyUpdates(result);
+		if (const auto onstack = done) {
+			onstack();
+		}
+	}).fail([=](const MTP::Error &error) {
+		if (const auto onstack = fail) {
+			onstack(error.type());
+		}
+	}).send();
+}
+
+void TodoLists::toggleCompletion(FullMsgId itemId, int id, bool completed) {
+	auto &entry = _toggles[itemId];
+	if (completed) {
+		const auto changed1 = entry.completed.emplace(id).second;
+		const auto changed2 = entry.incompleted.remove(id);
+		if (!changed1 && !changed2) {
+			return;
+		}
+	} else {
+		const auto changed1 = entry.incompleted.emplace(id).second;
+		const auto changed2 = entry.completed.remove(id);
+		if (!changed1 && !changed2) {
+			return;
+		}
+	}
+	entry.scheduled = crl::now();
+	if (!entry.requestId && !_sendTimer.isActive()) {
+		_sendTimer.callOnce(kSendTogglesDelay);
+	}
+}
+
+void TodoLists::sendAccumulatedToggles(bool force) {
+	const auto now = crl::now();
+	auto nearest = crl::time(0);
+	for (auto &[itemId, entry] : _toggles) {
+		if (entry.requestId) {
+			continue;
+		}
+		const auto wait = entry.scheduled + kSendTogglesDelay - now;
+		if (wait <= 0) {
+			entry.scheduled = 0;
+			send(itemId, entry);
+		} else if (!nearest || nearest > wait) {
+			nearest = wait;
+		}
+	}
+	if (nearest > 0) {
+		_sendTimer.callOnce(nearest);
+	}
+}
+
+void TodoLists::send(FullMsgId itemId, Accumulated &entry) {
+	const auto item = _session->data().message(itemId);
+	if (!item) {
+		return;
+	}
+	auto completed = entry.completed
+		| ranges::views::transform([](int id) { return MTP_int(id); });
+	auto incompleted = entry.incompleted
+		| ranges::views::transform([](int id) { return MTP_int(id); });
+	entry.requestId = _api.request(MTPmessages_ToggleTodoCompleted(
+		item->history()->peer->input(),
+		MTP_int(item->id),
+		MTP_vector_from_range(completed),
+		MTP_vector_from_range(incompleted)
+	)).done([=](const MTPUpdates &result) {
+		_session->api().applyUpdates(result);
+		finishRequest(itemId);
+	}).fail([=](const MTP::Error &error) {
+		finishRequest(itemId);
+	}).send();
+	entry.completed.clear();
+	entry.incompleted.clear();
+}
+
+void TodoLists::finishRequest(FullMsgId itemId) {
+	auto &entry = _toggles[itemId];
+	entry.requestId = 0;
+	if (entry.completed.empty() && entry.incompleted.empty()) {
+		_toggles.remove(itemId);
+	} else {
+		sendAccumulatedToggles(false);
+	}
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_todo_lists.h b/Telegram/SourceFiles/api/api_todo_lists.h
new file mode 100644
index 00000000000000..92d6a634b23bfe
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_todo_lists.h
@@ -0,0 +1,69 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "mtproto/sender.h"
+
+class ApiWrap;
+class HistoryItem;
+struct TodoListItem;
+struct TodoListData;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Api {
+
+struct SendAction;
+struct SendOptions;
+
+class TodoLists final {
+public:
+	explicit TodoLists(not_null<ApiWrap*> api);
+
+	void create(
+		const TodoListData &data,
+		SendAction action,
+		Fn<void()> done,
+		Fn<void(QString)> fail);
+	void edit(
+		not_null<HistoryItem*> item,
+		const TodoListData &data,
+		SendOptions options,
+		Fn<void()> done,
+		Fn<void(QString)> fail);
+	void add(
+		not_null<HistoryItem*> item,
+		const std::vector<TodoListItem> &items,
+		Fn<void()> done,
+		Fn<void(QString)> fail);
+	void toggleCompletion(FullMsgId itemId, int id, bool completed);
+
+private:
+	struct Accumulated {
+		base::flat_set<int> completed;
+		base::flat_set<int> incompleted;
+		crl::time scheduled = 0;
+		mtpRequestId requestId = 0;
+	};
+
+	void sendAccumulatedToggles(bool force);
+	void send(FullMsgId itemId, Accumulated &entry);
+	void finishRequest(FullMsgId itemId);
+
+	const not_null<Main::Session*> _session;
+	MTP::Sender _api;
+
+	base::flat_map<FullMsgId, Accumulated> _toggles;
+	base::Timer _sendTimer;
+
+};
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_toggling_media.cpp b/Telegram/SourceFiles/api/api_toggling_media.cpp
index 65d2ce317ff92f..6c28df197d78f6 100644
--- a/Telegram/SourceFiles/api/api_toggling_media.cpp
+++ b/Telegram/SourceFiles/api/api_toggling_media.cpp
@@ -24,7 +24,7 @@ void ToggleExistingMedia(
 		Data::FileOrigin origin,
 		ToggleRequestCallback toggleRequest,
 		DoneCallback &&done) {
-	const auto api = &document->owner().session().api();
+	const auto api = &document->session().api();
 
 	auto performRequest = [=](const auto &repeatRequest) -> void {
 		const auto usedFileReference = document->fileReference();
diff --git a/Telegram/SourceFiles/api/api_transcribes.cpp b/Telegram/SourceFiles/api/api_transcribes.cpp
index dd983dc37b4cad..7c6b271ca594a4 100644
--- a/Telegram/SourceFiles/api/api_transcribes.cpp
+++ b/Telegram/SourceFiles/api/api_transcribes.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "api/api_transcribes.h"
 
 #include "apiwrap.h"
+#include "api/api_text_entities.h"
 #include "data/data_channel.h"
 #include "data/data_document.h"
 #include "data/data_peer.h"
@@ -15,8 +16,11 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_helpers.h"
+#include "lang/lang_keys.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
+#include "main/main_session_settings.h"
+#include "spellcheck/spellcheck_types.h"
 
 namespace Api {
 
@@ -25,6 +29,32 @@ Transcribes::Transcribes(not_null<ApiWrap*> api)
 , _api(&api->instance()) {
 }
 
+bool Transcribes::isRated(not_null<HistoryItem*> item) const {
+	const auto fullId = item->fullId();
+	for (const auto &[transcribeId, id] : _ids) {
+		if (id == fullId) {
+			return _session->settings().isTranscriptionRated(transcribeId);
+		}
+	}
+	return false;
+}
+
+void Transcribes::rate(not_null<HistoryItem*> item, bool isGood) {
+	const auto fullId = item->fullId();
+	for (const auto &[transcribeId, id] : _ids) {
+		if (id == fullId) {
+			_api.request(MTPmessages_RateTranscribedAudio(
+				item->history()->peer->input(),
+				MTP_int(item->id),
+				MTP_long(transcribeId),
+				MTP_bool(isGood))).send();
+			_session->settings().markTranscriptionAsRated(transcribeId);
+			_session->saveSettings();
+			return;
+		}
+	}
+}
+
 bool Transcribes::freeFor(not_null<HistoryItem*> item) const {
 	if (const auto channel = item->history()->peer->asMegagroup()) {
 		const auto owner = &channel->owner();
@@ -76,7 +106,6 @@ void Transcribes::toggle(not_null<HistoryItem*> item) {
 	auto i = _map.find(id);
 	if (i == _map.end()) {
 		load(item);
-		//_session->data().requestItemRepaint(item);
 		_session->data().requestItemResize(item);
 	} else if (!i->second.requestId) {
 		i->second.shown = !i->second.shown;
@@ -87,6 +116,25 @@ void Transcribes::toggle(not_null<HistoryItem*> item) {
 	}
 }
 
+void Transcribes::toggleSummary(not_null<HistoryItem*> item) {
+	const auto id = item->fullId();
+	auto i = _summaries.find(id);
+	if (i == _summaries.end()) {
+		summarize(item);
+	} else if (!i->second.loading) {
+		auto &entry = i->second;
+		if (entry.result.empty()) {
+			summarize(item);
+		} else {
+			entry.shown = entry.premiumRequired ? false : !entry.shown;
+			_session->data().requestItemResize(item);
+			if (entry.shown) {
+				_session->data().requestItemShowHighlight(item);
+			}
+		}
+	}
+}
+
 const Transcribes::Entry &Transcribes::entry(
 		not_null<HistoryItem*> item) const {
 	static auto empty = Entry();
@@ -94,6 +142,13 @@ const Transcribes::Entry &Transcribes::entry(
 	return (i != _map.end()) ? i->second : empty;
 }
 
+const SummaryEntry &Transcribes::summary(
+		not_null<const HistoryItem*> item) const {
+	static const auto empty = SummaryEntry();
+	const auto i = _summaries.find(item->fullId());
+	return (i != _summaries.end()) ? i->second : empty;
+}
+
 void Transcribes::apply(const MTPDupdateTranscribedAudio &update) {
 	const auto id = update.vtranscription_id().v;
 	const auto i = _ids.find(id);
@@ -131,7 +186,7 @@ void Transcribes::load(not_null<HistoryItem*> item) {
 	};
 	const auto id = item->fullId();
 	const auto requestId = _api.request(MTPmessages_TranscribeAudio(
-		item->history()->peer->input,
+		item->history()->peer->input(),
 		MTP_int(item->id)
 	)).done([=](const MTPmessages_TranscribedAudio &result) {
 		const auto &data = result.data();
@@ -181,4 +236,74 @@ void Transcribes::load(not_null<HistoryItem*> item) {
 	entry.pending = false;
 }
 
+void Transcribes::summarize(not_null<HistoryItem*> item) {
+	if (!item->isHistoryEntry() || item->isLocal()) {
+		return;
+	}
+
+	const auto id = item->fullId();
+	const auto translatedTo = item->history()->translatedTo();
+	const auto langCode = translatedTo
+		? translatedTo.twoLetterCode()
+		: QString();
+	const auto requestId = _api.request(MTPmessages_SummarizeText(
+		langCode.isEmpty()
+			? MTP_flags(0)
+			: MTP_flags(MTPmessages_summarizeText::Flag::f_to_lang),
+		item->history()->peer->input(),
+		MTP_int(item->id),
+		langCode.isEmpty() ? MTPstring() : MTP_string(langCode),
+		MTPstring() // tone
+	)).done([=](const MTPTextWithEntities &result) {
+		const auto &data = result.data();
+		auto &entry = _summaries[id];
+		entry.requestId = 0;
+		entry.loading = false;
+		entry.premiumRequired = false;
+		entry.languageId = translatedTo;
+		entry.result = TextWithEntities(
+			qs(data.vtext()),
+			Api::EntitiesFromMTP(_session, data.ventities().v));
+		if (const auto item = _session->data().message(id)) {
+			_session->data().requestItemTextRefresh(item);
+			_session->data().requestItemShowHighlight(item);
+		}
+	}).fail([=](const MTP::Error &error) {
+		auto &entry = _summaries[id];
+		if (error.type() == u"SUMMARY_FLOOD_PREMIUM"_q) {
+			entry.premiumRequired = true;
+		}
+		entry.requestId = 0;
+		entry.shown = false;
+		entry.loading = false;
+		if (const auto item = _session->data().message(id)) {
+			_session->data().requestItemTextRefresh(item);
+		}
+	}).send();
+
+	auto &entry = _summaries.emplace(id).first->second;
+	entry.requestId = requestId;
+	entry.shown = true;
+	entry.loading = true;
+
+	item->setHasSummaryEntry();
+	_session->data().requestItemResize(item);
+}
+
+void Transcribes::checkSummaryToTranslate(FullMsgId id) {
+	const auto i = _summaries.find(id);
+	if (i == _summaries.end() || i->second.result.empty()) {
+		return;
+	}
+	const auto item = _session->data().message(id);
+	if (!item) {
+		return;
+	}
+	const auto translatedTo = item->history()->translatedTo();
+	if (i->second.languageId != translatedTo) {
+		i->second.result = tr::lng_contacts_loading(tr::now, tr::italic);
+		summarize(item);
+	}
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_transcribes.h b/Telegram/SourceFiles/api/api_transcribes.h
index b074e42f13f3b5..7eef8a4fb6bc82 100644
--- a/Telegram/SourceFiles/api/api_transcribes.h
+++ b/Telegram/SourceFiles/api/api_transcribes.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "mtproto/sender.h"
+#include "spellcheck/spellcheck_types.h"
 
 class ApiWrap;
 
@@ -17,6 +18,15 @@ class Session;
 
 namespace Api {
 
+struct SummaryEntry {
+	TextWithEntities result;
+	LanguageId languageId;
+	bool shown = false;
+	bool loading = false;
+	bool premiumRequired = false;
+	mtpRequestId requestId = 0;
+};
+
 class Transcribes final {
 public:
 	explicit Transcribes(not_null<ApiWrap*> api);
@@ -34,9 +44,16 @@ class Transcribes final {
 	void toggle(not_null<HistoryItem*> item);
 	[[nodiscard]] const Entry &entry(not_null<HistoryItem*> item) const;
 
+	void toggleSummary(not_null<HistoryItem*> item);
+	[[nodiscard]] const SummaryEntry &summary(
+		not_null<const HistoryItem*> item) const;
+	void checkSummaryToTranslate(FullMsgId id);
+
 	void apply(const MTPDupdateTranscribedAudio &update);
 
 	[[nodiscard]] bool freeFor(not_null<HistoryItem*> item) const;
+	[[nodiscard]] bool isRated(not_null<HistoryItem*> item) const;
+	void rate(not_null<HistoryItem*> item, bool isGood);
 
 	[[nodiscard]] bool trialsSupport();
 	[[nodiscard]] TimeId trialsRefreshAt();
@@ -45,6 +62,7 @@ class Transcribes final {
 
 private:
 	void load(not_null<HistoryItem*> item);
+	void summarize(not_null<HistoryItem*> item);
 
 	const not_null<Main::Session*> _session;
 	MTP::Sender _api;
@@ -56,6 +74,8 @@ class Transcribes final {
 	base::flat_map<FullMsgId, Entry> _map;
 	base::flat_map<uint64, FullMsgId> _ids;
 
+	base::flat_map<FullMsgId, SummaryEntry> _summaries;
+
 };
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_unread_things.cpp b/Telegram/SourceFiles/api/api_unread_things.cpp
index dac998dfdce83c..e871b71faab8d9 100644
--- a/Telegram/SourceFiles/api/api_unread_things.cpp
+++ b/Telegram/SourceFiles/api/api_unread_things.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "data/data_peer.h"
 #include "data/data_channel.h"
 #include "data/data_forum_topic.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "main/main_session.h"
 #include "history/history.h"
@@ -31,7 +32,9 @@ UnreadThings::UnreadThings(not_null<ApiWrap*> api) : _api(api) {
 
 bool UnreadThings::trackMentions(Data::Thread *thread) const {
 	const auto peer = thread ? thread->peer().get() : nullptr;
-	return peer && (peer->isChat() || peer->isMegagroup());
+	return peer
+		&& (peer->isChat() || peer->isMegagroup())
+		&& !peer->isMonoforum();
 }
 
 bool UnreadThings::trackReactions(Data::Thread *thread) const {
@@ -39,6 +42,13 @@ bool UnreadThings::trackReactions(Data::Thread *thread) const {
 	return peer && (peer->isUser() || peer->isChat() || peer->isMegagroup());
 }
 
+bool UnreadThings::trackPollVotes(Data::Thread *thread) const {
+	const auto peer = thread ? thread->peer().get() : nullptr;
+	return peer
+		&& (peer->isChat() || peer->isMegagroup())
+		&& !peer->isMonoforum();
+}
+
 void UnreadThings::preloadEnough(Data::Thread *thread) {
 	if (trackMentions(thread)) {
 		preloadEnoughMentions(thread);
@@ -46,6 +56,9 @@ void UnreadThings::preloadEnough(Data::Thread *thread) {
 	if (trackReactions(thread)) {
 		preloadEnoughReactions(thread);
 	}
+	if (trackPollVotes(thread)) {
+		preloadEnoughPollVotes(thread);
+	}
 }
 
 void UnreadThings::mediaAndMentionsRead(
@@ -81,6 +94,15 @@ void UnreadThings::preloadEnoughReactions(not_null<Data::Thread*> thread) {
 	}
 }
 
+void UnreadThings::preloadEnoughPollVotes(not_null<Data::Thread*> thread) {
+	const auto fullCount = thread->unreadPollVotes().count();
+	const auto loadedCount = thread->unreadPollVotes().loadedCount();
+	const auto allLoaded = (fullCount >= 0) && (loadedCount >= fullCount);
+	if (fullCount >= 0 && loadedCount < kPreloadIfLess && !allLoaded) {
+		requestPollVotes(thread, loadedCount);
+	}
+}
+
 void UnreadThings::cancelRequests(not_null<Data::Thread*> thread) {
 	if (const auto requestId = _mentionsRequests.take(thread)) {
 		_api->request(*requestId).cancel();
@@ -88,12 +110,15 @@ void UnreadThings::cancelRequests(not_null<Data::Thread*> thread) {
 	if (const auto requestId = _reactionsRequests.take(thread)) {
 		_api->request(*requestId).cancel();
 	}
+	if (const auto requestId = _pollVotesRequests.take(thread)) {
+		_api->request(*requestId).cancel();
+	}
 }
 
 void UnreadThings::requestMentions(
 		not_null<Data::Thread*> thread,
 		int loaded) {
-	if (_mentionsRequests.contains(thread)) {
+	if (_mentionsRequests.contains(thread) || thread->asSublist()) {
 		return;
 	}
 	const auto offsetId = std::max(
@@ -108,7 +133,7 @@ void UnreadThings::requestMentions(
 	using Flag = MTPmessages_GetUnreadMentions::Flag;
 	const auto requestId = _api->request(MTPmessages_GetUnreadMentions(
 		MTP_flags(topic ? Flag::f_top_msg_id : Flag()),
-		history->peer->input,
+		history->peer->input(),
 		MTP_int(topic ? topic->rootId() : 0),
 		MTP_int(offsetId),
 		MTP_int(addOffset),
@@ -138,12 +163,15 @@ void UnreadThings::requestReactions(
 	const auto maxId = 0;
 	const auto minId = 0;
 	const auto history = thread->owningHistory();
+	const auto sublist = thread->asSublist();
 	const auto topic = thread->asTopic();
 	using Flag = MTPmessages_GetUnreadReactions::Flag;
 	const auto requestId = _api->request(MTPmessages_GetUnreadReactions(
-		MTP_flags(topic ? Flag::f_top_msg_id : Flag()),
-		history->peer->input,
+		MTP_flags((topic ? Flag::f_top_msg_id : Flag())
+			| (sublist ? Flag::f_saved_peer_id : Flag())),
+		history->peer->input(),
 		MTP_int(topic ? topic->rootId() : 0),
+		(sublist ? sublist->sublistPeer()->input() : MTPInputPeer()),
 		MTP_int(offsetId),
 		MTP_int(addOffset),
 		MTP_int(limit),
@@ -158,4 +186,38 @@ void UnreadThings::requestReactions(
 	_reactionsRequests.emplace(thread, requestId);
 }
 
+void UnreadThings::requestPollVotes(
+		not_null<Data::Thread*> thread,
+		int loaded) {
+	if (_pollVotesRequests.contains(thread) || thread->asSublist()) {
+		return;
+	}
+	const auto offsetId = loaded
+		? std::max(thread->unreadPollVotes().maxLoaded(), MsgId(1))
+		: MsgId(1);
+	const auto limit = loaded ? kNextRequestLimit : kFirstRequestLimit;
+	const auto addOffset = loaded ? -(limit + 1) : -limit;
+	const auto maxId = 0;
+	const auto minId = 0;
+	const auto history = thread->owningHistory();
+	const auto topic = thread->asTopic();
+	using Flag = MTPmessages_GetUnreadPollVotes::Flag;
+	const auto requestId = _api->request(MTPmessages_GetUnreadPollVotes(
+		MTP_flags(topic ? Flag::f_top_msg_id : Flag()),
+		history->peer->input(),
+		MTP_int(topic ? topic->rootId() : 0),
+		MTP_int(offsetId),
+		MTP_int(addOffset),
+		MTP_int(limit),
+		MTP_int(maxId),
+		MTP_int(minId)
+	)).done([=](const MTPmessages_Messages &result) {
+		_pollVotesRequests.remove(thread);
+		thread->unreadPollVotes().addSlice(result, loaded);
+	}).fail([=] {
+		_pollVotesRequests.remove(thread);
+	}).send();
+	_pollVotesRequests.emplace(thread, requestId);
+}
+
 } // namespace UnreadThings
diff --git a/Telegram/SourceFiles/api/api_unread_things.h b/Telegram/SourceFiles/api/api_unread_things.h
index f3c7e1711eb10c..dfc07459a5e4a0 100644
--- a/Telegram/SourceFiles/api/api_unread_things.h
+++ b/Telegram/SourceFiles/api/api_unread_things.h
@@ -23,6 +23,7 @@ class UnreadThings final {
 
 	[[nodiscard]] bool trackMentions(Data::Thread *thread) const;
 	[[nodiscard]] bool trackReactions(Data::Thread *thread) const;
+	[[nodiscard]] bool trackPollVotes(Data::Thread *thread) const;
 
 	void preloadEnough(Data::Thread *thread);
 
@@ -35,14 +36,17 @@ class UnreadThings final {
 private:
 	void preloadEnoughMentions(not_null<Data::Thread*> thread);
 	void preloadEnoughReactions(not_null<Data::Thread*> thread);
+	void preloadEnoughPollVotes(not_null<Data::Thread*> thread);
 
 	void requestMentions(not_null<Data::Thread*> thread, int loaded);
 	void requestReactions(not_null<Data::Thread*> thread, int loaded);
+	void requestPollVotes(not_null<Data::Thread*> thread, int loaded);
 
 	const not_null<ApiWrap*> _api;
 
 	base::flat_map<not_null<Data::Thread*>, mtpRequestId> _mentionsRequests;
 	base::flat_map<not_null<Data::Thread*>, mtpRequestId> _reactionsRequests;
+	base::flat_map<not_null<Data::Thread*>, mtpRequestId> _pollVotesRequests;
 
 };
 
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 3bbab8cf4abe64..e557ee9da9871e 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -21,13 +21,18 @@ For license and copyright information please follow this link:
 #include "mtproto/mtp_instance.h"
 #include "mtproto/mtproto_config.h"
 #include "mtproto/mtproto_dc_options.h"
+#include "chat_helpers/stickers_dice_pack.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/components/credits.h"
+#include "data/components/gift_auctions.h"
+#include "data/components/promo_suggestions.h"
 #include "data/components/scheduled_messages.h"
 #include "data/components/top_peers.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/stickers/data_stickers.h"
+#include "data/data_ai_compose_tones.h"
 #include "data/data_saved_messages.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_chat.h"
@@ -41,6 +46,7 @@ For license and copyright information please follow this link:
 #include "data/data_histories.h"
 #include "data/data_folder.h"
 #include "data/data_forum.h"
+#include "data/data_forum_topic.h"
 #include "data/data_send_action.h"
 #include "data/data_stories.h"
 #include "data/data_message_reactions.h"
@@ -50,6 +56,7 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_helpers.h"
+#include "history/history_streamed_drafts.h"
 #include "history/history_unread_things.h"
 #include "core/application.h"
 #include "storage/storage_account.h"
@@ -85,6 +92,90 @@ enum class DataIsLoadedResult {
 	Ok = 3,
 };
 
+[[nodiscard]] bool PeerDataIsLoaded(
+		not_null<Data::Session*> owner,
+		PeerId peerId) {
+	return !peerId || owner->peerLoaded(peerId);
+}
+
+[[nodiscard]] bool MentionUsersDataIsLoaded(
+		not_null<Data::Session*> owner,
+		const MTPVector<MTPMessageEntity> &entities) {
+	for (const auto &entity : entities.v) {
+		auto loaded = true;
+		entity.match([&](const MTPDmessageEntityMentionName &data) {
+			loaded = owner->userLoaded(data.vuser_id());
+		}, [&](const MTPDinputMessageEntityMentionName &data) {
+			data.vuser_id().match([&](const MTPDinputUser &data) {
+				loaded = owner->userLoaded(data.vuser_id());
+			}, [](const auto &) {
+			});
+		}, [](const auto &) {
+		});
+		if (!loaded) {
+			return false;
+		}
+	}
+	return true;
+}
+
+[[nodiscard]] bool ForwardedInfoDataIsLoaded(
+		not_null<Data::Session*> owner,
+		const MTPMessageFwdHeader &header) {
+	return header.match([&](const MTPDmessageFwdHeader &data) {
+		return (!data.vfrom_id()
+				|| PeerDataIsLoaded(owner, peerFromMTP(*data.vfrom_id())))
+			&& (!data.vsaved_from_peer()
+				|| PeerDataIsLoaded(owner, peerFromMTP(*data.vsaved_from_peer())))
+			&& (!data.vsaved_from_id()
+				|| PeerDataIsLoaded(owner, peerFromMTP(*data.vsaved_from_id())));
+	});
+}
+
+[[nodiscard]] bool ReplyDataIsLoaded(
+		not_null<Data::Session*> owner,
+		const MTPMessageReplyHeader &header) {
+	return header.match([&](const MTPDmessageReplyHeader &data) {
+		return (!data.vreply_to_peer_id()
+				|| PeerDataIsLoaded(owner, peerFromMTP(*data.vreply_to_peer_id())))
+			&& (!data.vreply_from()
+				|| ForwardedInfoDataIsLoaded(owner, *data.vreply_from()))
+			&& (!data.vquote_entities()
+				|| MentionUsersDataIsLoaded(owner, *data.vquote_entities()));
+	}, [&](const MTPDmessageReplyStoryHeader &data) {
+		return PeerDataIsLoaded(owner, peerFromMTP(data.vpeer()));
+	});
+}
+
+[[nodiscard]] bool DataIsLoaded(
+		not_null<Data::Session*> owner,
+		const MTPDupdateShortMessage &data) {
+	return owner->userLoaded(data.vuser_id())
+		&& (!data.vfwd_from()
+			|| ForwardedInfoDataIsLoaded(owner, *data.vfwd_from()))
+		&& (!data.vvia_bot_id()
+			|| owner->userLoaded(*data.vvia_bot_id()))
+		&& (!data.vreply_to()
+			|| ReplyDataIsLoaded(owner, *data.vreply_to()))
+		&& (!data.ventities()
+			|| MentionUsersDataIsLoaded(owner, *data.ventities()));
+}
+
+[[nodiscard]] bool DataIsLoaded(
+		not_null<Data::Session*> owner,
+		const MTPDupdateShortChatMessage &data) {
+	return owner->chatLoaded(data.vchat_id())
+		&& owner->userLoaded(data.vfrom_id())
+		&& (!data.vfwd_from()
+			|| ForwardedInfoDataIsLoaded(owner, *data.vfwd_from()))
+		&& (!data.vvia_bot_id()
+			|| owner->userLoaded(*data.vvia_bot_id()))
+		&& (!data.vreply_to()
+			|| ReplyDataIsLoaded(owner, *data.vreply_to()))
+		&& (!data.ventities()
+			|| MentionUsersDataIsLoaded(owner, *data.ventities()));
+}
+
 void ProcessScheduledMessageWithElapsedTime(
 		not_null<Main::Session*> session,
 		bool needToAdd,
@@ -132,100 +223,6 @@ bool HasForceLogoutNotification(const MTPUpdates &updates) {
 	return false;
 }
 
-bool ForwardedInfoDataLoaded(
-		not_null<Main::Session*> session,
-		const MTPMessageFwdHeader &header) {
-	return header.match([&](const MTPDmessageFwdHeader &data) {
-		if (const auto fromId = data.vfrom_id()) {
-			// Fully loaded is required in this case.
-			if (!session->data().peerLoaded(peerFromMTP(*fromId))) {
-				return false;
-			}
-		}
-		return true;
-	});
-}
-
-bool MentionUsersLoaded(
-		not_null<Main::Session*> session,
-		const MTPVector<MTPMessageEntity> &entities) {
-	for (const auto &entity : entities.v) {
-		auto type = entity.type();
-		if (type == mtpc_messageEntityMentionName) {
-			if (!session->data().userLoaded(entity.c_messageEntityMentionName().vuser_id())) {
-				return false;
-			}
-		} else if (type == mtpc_inputMessageEntityMentionName) {
-			auto &inputUser = entity.c_inputMessageEntityMentionName().vuser_id();
-			if (inputUser.type() == mtpc_inputUser) {
-				if (!session->data().userLoaded(inputUser.c_inputUser().vuser_id())) {
-					return false;
-				}
-			}
-		}
-	}
-	return true;
-}
-
-DataIsLoadedResult AllDataLoadedForMessage(
-		not_null<Main::Session*> session,
-		const MTPMessage &message) {
-	return message.match([&](const MTPDmessage &message) {
-		if (const auto fromId = message.vfrom_id()) {
-			if (!message.is_post()
-				&& !session->data().peerLoaded(peerFromMTP(*fromId))) {
-				return DataIsLoadedResult::FromNotLoaded;
-			}
-		}
-		if (const auto viaBotId = message.vvia_bot_id()) {
-			if (!session->data().userLoaded(*viaBotId)) {
-				return DataIsLoadedResult::NotLoaded;
-			}
-		}
-		if (const auto fwd = message.vfwd_from()) {
-			if (!ForwardedInfoDataLoaded(session, *fwd)) {
-				return DataIsLoadedResult::NotLoaded;
-			}
-		}
-		if (const auto entities = message.ventities()) {
-			if (!MentionUsersLoaded(session, *entities)) {
-				return DataIsLoadedResult::MentionNotLoaded;
-			}
-		}
-		return DataIsLoadedResult::Ok;
-	}, [&](const MTPDmessageService &message) {
-		if (const auto fromId = message.vfrom_id()) {
-			if (!message.is_post()
-				&& !session->data().peerLoaded(peerFromMTP(*fromId))) {
-				return DataIsLoadedResult::FromNotLoaded;
-			}
-		}
-		return message.vaction().match(
-		[&](const MTPDmessageActionChatAddUser &action) {
-			for (const auto &userId : action.vusers().v) {
-				if (!session->data().userLoaded(userId)) {
-					return DataIsLoadedResult::NotLoaded;
-				}
-			}
-			return DataIsLoadedResult::Ok;
-		}, [&](const MTPDmessageActionChatJoinedByLink &action) {
-			if (!session->data().userLoaded(action.vinviter_id())) {
-				return DataIsLoadedResult::NotLoaded;
-			}
-			return DataIsLoadedResult::Ok;
-		}, [&](const MTPDmessageActionChatDeleteUser &action) {
-			if (!session->data().userLoaded(action.vuser_id())) {
-				return DataIsLoadedResult::NotLoaded;
-			}
-			return DataIsLoadedResult::Ok;
-		}, [](const auto &) {
-			return DataIsLoadedResult::Ok;
-		});
-	}, [](const MTPDmessageEmpty &message) {
-		return DataIsLoadedResult::Ok;
-	});
-}
-
 } // namespace
 
 Updates::Updates(not_null<Main::Session*> session)
@@ -241,12 +238,12 @@ Updates::Updates(not_null<Main::Session*> session)
 	_ptsWaiter.setRequesting(true);
 
 	session->account().mtpUpdates(
-	) | rpl::start_with_next([=](const MTPUpdates &updates) {
+	) | rpl::on_next([=](const MTPUpdates &updates) {
 		mtpUpdateReceived(updates);
 	}, _lifetime);
 
 	session->account().mtpNewSessionCreated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		mtpNewSessionCreated();
 	}, _lifetime);
 
@@ -260,7 +257,7 @@ Updates::Updates(not_null<Main::Session*> session)
 		Data::PeerUpdate::Flag::FullInfo
 	) | rpl::filter([](const Data::PeerUpdate &update) {
 		return update.peer->isChat() || update.peer->isMegagroup();
-	}) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	}) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto peer = update.peer;
 		if (const auto list = _pendingSpeakingCallParticipants.take(peer)) {
 			if (const auto call = peer->groupCall()) {
@@ -303,25 +300,34 @@ void Updates::feedUpdateVector(
 	auto list = updates.v;
 	const auto hasGroupCallParticipantUpdates = ranges::contains(
 		list,
-		mtpc_updateGroupCallParticipants,
-		&MTPUpdate::type);
+		true,
+		[](const MTPUpdate &update) {
+			return update.type() == mtpc_updateGroupCallParticipants
+				|| update.type() == mtpc_updateGroupCallChainBlocks;
+		});
 	if (hasGroupCallParticipantUpdates) {
 		ranges::stable_sort(list, std::less<>(), [](const MTPUpdate &entry) {
-			if (entry.type() == mtpc_updateGroupCallParticipants) {
+			if (entry.type() == mtpc_updateGroupCallChainBlocks) {
 				return 0;
-			} else {
+			} else if (entry.type() == mtpc_updateGroupCallParticipants) {
 				return 1;
+			} else {
+				return 2;
 			}
 		});
 	} else if (policy == SkipUpdatePolicy::SkipExceptGroupCallParticipants) {
 		return;
 	}
+	if (policy == SkipUpdatePolicy::SkipNone) {
+		applyConvertToScheduledOnSend(updates);
+	}
 	for (const auto &entry : std::as_const(list)) {
 		const auto type = entry.type();
 		if ((policy == SkipUpdatePolicy::SkipMessageIds
 			&& type == mtpc_updateMessageID)
 			|| (policy == SkipUpdatePolicy::SkipExceptGroupCallParticipants
-				&& type != mtpc_updateGroupCallParticipants)) {
+				&& type != mtpc_updateGroupCallParticipants
+				&& type != mtpc_updateGroupCallChainBlocks)) {
 			continue;
 		}
 		feedUpdate(entry);
@@ -329,6 +335,15 @@ void Updates::feedUpdateVector(
 	session().data().sendHistoryChangeNotifications();
 }
 
+void Updates::checkForSentToScheduled(const MTPUpdates &updates) {
+	updates.match([&](const MTPDupdates &data) {
+		applyConvertToScheduledOnSend(data.vupdates(), true);
+	}, [&](const MTPDupdatesCombined &data) {
+		applyConvertToScheduledOnSend(data.vupdates(), true);
+	}, [](const auto &) {
+	});
+}
+
 void Updates::feedMessageIds(const MTPVector<MTPUpdate> &updates) {
 	for (const auto &update : updates.v) {
 		if (update.type() == mtpc_updateMessageID) {
@@ -432,6 +447,7 @@ void Updates::feedChannelDifference(
 	session().data().processChats(data.vchats());
 
 	_handlingChannelDifference = true;
+	applyConvertToScheduledOnSend(data.vother_updates());
 	feedMessageIds(data.vother_updates());
 	session().data().processMessages(
 		data.vnew_messages(),
@@ -596,6 +612,7 @@ void Updates::feedDifference(
 	Core::App().checkAutoLock();
 	session().data().processUsers(users);
 	session().data().processChats(chats);
+	applyConvertToScheduledOnSend(other);
 	feedMessageIds(other);
 	session().data().processMessages(msgs, NewMessageType::Unread);
 	feedUpdateVector(other, SkipUpdatePolicy::SkipMessageIds);
@@ -722,7 +739,7 @@ void Updates::getChannelDifference(
 	}
 	api().request(MTPupdates_GetChannelDifference(
 		MTP_flags(flags),
-		channel->inputChannel,
+		channel->inputChannel(),
 		filter,
 		MTP_int(channel->pts()),
 		MTP_int(kChannelGetDifferenceLimit)
@@ -741,7 +758,7 @@ void Updates::addActiveChat(rpl::producer<PeerData*> chat) {
 	const auto key = _activeChats.empty() ? 0 : _activeChats.back().first + 1;
 	std::move(
 		chat
-	) | rpl::start_with_next_done([=](PeerData *peer) {
+	) | rpl::on_next_done([=](PeerData *peer) {
 		auto &active = _activeChats[key];
 		const auto was = active.peer;
 		if (was != peer) {
@@ -801,7 +818,7 @@ void Updates::channelRangeDifferenceSend(
 			MTP_int(range.till - 1))));
 	const auto requestId = api().request(MTPupdates_GetChannelDifference(
 		MTP_flags(MTPupdates_GetChannelDifference::Flag::f_force),
-		channel->inputChannel,
+		channel->inputChannel(),
 		filter,
 		MTP_int(pts),
 		MTP_int(limit)
@@ -881,6 +898,51 @@ void Updates::mtpUpdateReceived(const MTPUpdates &updates) {
 	}
 }
 
+void Updates::applyConvertToScheduledOnSend(
+		const MTPVector<MTPUpdate> &other,
+		bool skipScheduledCheck) {
+	for (const auto &update : other.v) {
+		update.match([&](const MTPDupdateNewScheduledMessage &data) {
+			const auto &message = data.vmessage();
+			const auto id = IdFromMessage(message);
+			const auto scheduledMessages = &_session->scheduledMessages();
+			const auto scheduledId = scheduledMessages->localMessageId(id);
+			for (const auto &updateId : other.v) {
+				updateId.match([&](const MTPDupdateMessageID &dataId) {
+					if (dataId.vid().v == id) {
+						auto &owner = session().data();
+						if (skipScheduledCheck) {
+							const auto peerId = PeerFromMessage(message);
+							const auto history = owner.historyLoaded(peerId);
+							if (history) {
+								_session->data().sentToScheduled({
+									.history = history,
+									.scheduledId = scheduledId,
+								});
+							}
+							return;
+						}
+						const auto rand = dataId.vrandom_id().v;
+						const auto localId = owner.messageIdByRandomId(rand);
+						if (const auto local = owner.message(localId)) {
+							if (!local->isScheduled()) {
+								_session->data().sentToScheduled({
+									.history = local->history(),
+									.scheduledId = scheduledId,
+								});
+
+								// We've sent a non-scheduled message,
+								// but it was converted to a scheduled.
+								local->destroy();
+							}
+						}
+					}
+				}, [](const auto &) {});
+			}
+		}, [](const auto &) {});
+	}
+}
+
 void Updates::applyGroupCallParticipantUpdates(const MTPUpdates &updates) {
 	updates.match([&](const MTPDupdates &data) {
 		session().data().processUsers(data.vusers());
@@ -895,7 +957,8 @@ void Updates::applyGroupCallParticipantUpdates(const MTPUpdates &updates) {
 			data.vupdates(),
 			SkipUpdatePolicy::SkipExceptGroupCallParticipants);
 	}, [&](const MTPDupdateShort &data) {
-		if (data.vupdate().type() == mtpc_updateGroupCallParticipants) {
+		if (data.vupdate().type() == mtpc_updateGroupCallParticipants
+			|| data.vupdate().type() == mtpc_updateGroupCallChainBlocks) {
 			feedUpdate(data.vupdate());
 		}
 	}, [](const auto &) {
@@ -1029,6 +1092,9 @@ void Updates::handleSendActionUpdate(
 	const auto from = (fromId == session().userPeerId())
 		? session().user().get()
 		: session().data().peerLoaded(fromId);
+	const auto when = requestingDifference()
+		? 0
+		: base::unixtime::now();
 	if (action.type() == mtpc_speakingInGroupCallAction) {
 		handleSpeakingInCall(peer, fromId, from);
 	}
@@ -1041,10 +1107,15 @@ void Updates::handleSendActionUpdate(
 		const auto &data = action.c_sendMessageEmojiInteractionSeen();
 		handleEmojiInteraction(peer, qs(data.vemoticon()));
 		return;
+	} else if (action.type() == mtpc_sendMessageTextDraftAction) {
+		const auto &data = action.c_sendMessageTextDraftAction();
+		history->streamedDrafts().apply(rootId, fromId, when, data);
+		return;
+	} else if (action.type() == mtpc_sendMessageRichMessageDraftAction) {
+		const auto &data = action.c_sendMessageRichMessageDraftAction();
+		history->streamedDrafts().apply(rootId, fromId, when, data);
+		return;
 	}
-	const auto when = requestingDifference()
-		? 0
-		: base::unixtime::now();
 	session().data().sendActionManager().registerFor(
 		history,
 		rootId,
@@ -1137,11 +1208,13 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 					? peerToMTP(_session->userPeerId())
 					: MTP_peerUser(d.vuser_id())),
 				MTPint(), // from_boosts_applied
+				MTPstring(), // from_rank
 				MTP_peerUser(d.vuser_id()),
 				MTPPeer(), // saved_peer_id
 				d.vfwd_from() ? *d.vfwd_from() : MTPMessageFwdHeader(),
 				MTP_long(d.vvia_bot_id().value_or_empty()),
 				MTPlong(), // via_business_bot_id
+				MTPPeer(), // guestchat_via_from
 				d.vreply_to() ? *d.vreply_to() : MTPMessageReplyHeader(),
 				d.vdate(),
 				d.vmessage(),
@@ -1159,7 +1232,13 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 				MTP_int(d.vttl_period().value_or_empty()),
 				MTPint(), // quick_reply_shortcut_id
 				MTPlong(), // effect
-				MTPFactCheck()),
+				MTPFactCheck(),
+				MTPint(), // report_delivery_until_date
+				MTPlong(), // paid_message_stars
+				MTPSuggestedPost(),
+				MTPint(), // schedule_repeat_period
+				MTPstring(), // summary_from_language
+				MTPRichMessage()),
 			MessageFlags(),
 			NewMessageType::Unread);
 	} break;
@@ -1174,11 +1253,13 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 				d.vid(),
 				MTP_peerUser(d.vfrom_id()),
 				MTPint(), // from_boosts_applied
+				MTPstring(), // from_rank
 				MTP_peerChat(d.vchat_id()),
 				MTPPeer(), // saved_peer_id
 				d.vfwd_from() ? *d.vfwd_from() : MTPMessageFwdHeader(),
 				MTP_long(d.vvia_bot_id().value_or_empty()),
 				MTPlong(), // via_business_bot_id
+				MTPPeer(), // guestchat_via_from
 				d.vreply_to() ? *d.vreply_to() : MTPMessageReplyHeader(),
 				d.vdate(),
 				d.vmessage(),
@@ -1196,7 +1277,13 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 				MTP_int(d.vttl_period().value_or_empty()),
 				MTPint(), // quick_reply_shortcut_id
 				MTPlong(), // effect
-				MTPFactCheck()),
+				MTPFactCheck(),
+				MTPint(), // report_delivery_until_date
+				MTPlong(), // paid_message_stars
+				MTPSuggestedPost(),
+				MTPint(), // schedule_repeat_period
+				MTPstring(), // summary_from_language
+				MTPRichMessage()),
 			MessageFlags(),
 			NewMessageType::Unread);
 	} break;
@@ -1246,7 +1333,7 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 							user->madeAction(base::unixtime::now());
 						}
 					}
-					ClearMediaAsExpired(item);
+					item->clearMediaAsExpired();
 				}
 			} else {
 				// Perhaps it was an unread mention!
@@ -1430,18 +1517,13 @@ void Updates::applyUpdates(
 
 	case mtpc_updateShortMessage: {
 		auto &d = updates.c_updateShortMessage();
-		const auto viaBotId = d.vvia_bot_id();
-		const auto entities = d.ventities();
-		const auto fwd = d.vfwd_from();
-		if (!session().data().userLoaded(d.vuser_id())
-			|| (viaBotId && !session().data().userLoaded(*viaBotId))
-			|| (entities && !MentionUsersLoaded(&session(), *entities))
-			|| (fwd && !ForwardedInfoDataLoaded(&session(), *fwd))) {
+		if (!DataIsLoaded(&_session->data(), d)) {
 			MTP_LOG(0, ("getDifference "
-				"{ good - getting user for updateShortMessage }%1"
-				).arg(_session->mtp().isTestMode() ? " TESTMODE" : ""));
+				"{ good - after not all data loaded in updateShortMessage }%1"
+			).arg(_session->mtp().isTestMode() ? " TESTMODE" : ""));
 			return getDifference();
 		}
+		_session->data().fillMessagePeers(d);
 		if (updateAndApply(d.vpts().v, d.vpts_count().v, updates)) {
 			// Update date as well.
 			setState(0, d.vdate().v, _updatesQts, _updatesSeq);
@@ -1450,24 +1532,13 @@ void Updates::applyUpdates(
 
 	case mtpc_updateShortChatMessage: {
 		auto &d = updates.c_updateShortChatMessage();
-		const auto noFrom = !session().data().userLoaded(d.vfrom_id());
-		const auto chat = session().data().chatLoaded(d.vchat_id());
-		const auto viaBotId = d.vvia_bot_id();
-		const auto entities = d.ventities();
-		const auto fwd = d.vfwd_from();
-		if (!chat
-			|| noFrom
-			|| (viaBotId && !session().data().userLoaded(*viaBotId))
-			|| (entities && !MentionUsersLoaded(&session(), *entities))
-			|| (fwd && !ForwardedInfoDataLoaded(&session(), *fwd))) {
+		if (!DataIsLoaded(&_session->data(), d)) {
 			MTP_LOG(0, ("getDifference "
-				"{ good - getting user for updateShortChatMessage }%1"
-				).arg(_session->mtp().isTestMode() ? " TESTMODE" : ""));
-			if (chat && noFrom) {
-				session().api().requestFullPeer(chat);
-			}
+				"{ good - after not all data loaded in updateShortChatMessage }%1"
+			).arg(_session->mtp().isTestMode() ? " TESTMODE" : ""));
 			return getDifference();
 		}
+		_session->data().fillMessagePeers(d);
 		if (updateAndApply(d.vpts().v, d.vpts_count().v, updates)) {
 			// Update date as well.
 			setState(0, d.vdate().v, _updatesQts, _updatesSeq);
@@ -1497,13 +1568,7 @@ void Updates::applyUpdates(
 			const auto wasAlready = (lookupMessage() != nullptr);
 			feedUpdate(MTP_updateMessageID(d.vid(), MTP_long(randomId))); // ignore real date
 			if (const auto item = lookupMessage()) {
-				const auto list = d.ventities();
-				if (list && !MentionUsersLoaded(&session(), *list)) {
-					session().api().requestMessageData(
-						item->history()->peer,
-						item->id,
-						nullptr);
-				}
+				_session->data().fillMessagePeers(item->fullId(), d);
 				item->applySentMessage(sent.text, d, wasAlready);
 			}
 		}
@@ -1530,41 +1595,26 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 	// New messages.
 	case mtpc_updateNewMessage: {
 		auto &d = update.c_updateNewMessage();
-
-		const auto isDataLoaded = AllDataLoadedForMessage(&session(), d.vmessage());
-		if (!requestingDifference() && isDataLoaded != DataIsLoadedResult::Ok) {
-			MTP_LOG(0, ("getDifference "
-				"{ good - after not all data loaded in updateNewMessage }%1"
+		if (!requestingDifference()) {
+			const auto peerId = PeerFromMessage(d.vmessage());
+			const auto peer = session().data().peerLoaded(peerId);
+			if (peerId && !peer) {
+				MTP_LOG(0, ("getDifference "
+					"{ good - getting peer for updateNewMessage }%1"
 				).arg(_session->mtp().isTestMode() ? " TESTMODE" : ""));
-
-			// This can be if this update was created by grouping
-			// some short message update into an updates vector.
-			return getDifference();
+				return getDifference();
+			}
 		}
-
 		updateAndApply(d.vpts().v, d.vpts_count().v, update);
 	} break;
 
 	case mtpc_updateNewChannelMessage: {
 		auto &d = update.c_updateNewChannelMessage();
 		auto channel = session().data().channelLoaded(peerToChannel(PeerFromMessage(d.vmessage())));
-		const auto isDataLoaded = AllDataLoadedForMessage(&session(), d.vmessage());
-		if (!requestingDifference() && (!channel || isDataLoaded != DataIsLoadedResult::Ok)) {
+		if (!requestingDifference() && !channel) {
 			MTP_LOG(0, ("getDifference "
 				"{ good - after not all data loaded in updateNewChannelMessage }%1"
 				).arg(_session->mtp().isTestMode() ? " TESTMODE" : ""));
-
-			// Request last active supergroup participants if the 'from' user was not loaded yet.
-			// This will optimize similar getDifference() calls for almost all next messages.
-			if (isDataLoaded == DataIsLoadedResult::FromNotLoaded && channel && channel->isMegagroup()) {
-				if (channel->canViewMembers()
-					&& channel->mgInfo->lastParticipants.size() < _session->serverConfig().chatSizeMax
-					&& (channel->mgInfo->lastParticipants.empty()
-						|| channel->mgInfo->lastParticipants.size() < channel->membersCount())) {
-					session().api().chatParticipants().requestLast(channel);
-				}
-			}
-
 			if (!_byMinChannelTimer.isActive()) { // getDifference after timeout
 				_byMinChannelTimer.callOnce(PtsWaiter::kWaitForSkippedTimeout);
 			}
@@ -1609,13 +1659,21 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 								local->history()->peer,
 								local->date());
 						}
-						local->setRealId(d.vid().v);
+						local->setRealId(newId);
+						if (const auto topic = local->topic()) {
+							topic->applyMaybeLast(local);
+						}
+						if (const auto sublist = local->savedSublist()) {
+							sublist->applyMaybeLast(local);
+						}
 					}
 				}
 			} else {
 				owner.histories().checkTopicCreated(id, newId);
 			}
 			session().data().unregisterMessageRandomId(randomId);
+		} else {
+			Core::App().calls().handleUpdate(&session(), update);
 		}
 		session().data().unregisterMessageSentData(randomId);
 	} break;
@@ -1845,7 +1903,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 
 		// Update web page anyway.
 		session().data().processWebpage(d.vwebpage());
-		session().data().sendWebPageGamePollNotifications();
+		session().data().sendWebPageGamePollTodoListNotifications();
 
 		updateAndApply(d.vpts().v, d.vpts_count().v, update);
 	} break;
@@ -1855,7 +1913,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 
 		// Update web page anyway.
 		session().data().processWebpage(d.vwebpage());
-		session().data().sendWebPageGamePollNotifications();
+		session().data().sendWebPageGamePollTodoListNotifications();
 
 		auto channel = session().data().channelLoaded(d.vchannel_id());
 		if (channel && !_handlingChannelDifference) {
@@ -1871,14 +1929,60 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 	} break;
 
 	case mtpc_updateMessagePoll: {
-		session().data().applyUpdate(update.c_updateMessagePoll());
+		const auto &d = update.c_updateMessagePoll();
+		const auto wasRecentVoters = session().data().pollRecentVoters(
+			d.vpoll_id().v);
+		session().data().applyUpdate(d);
+		const auto notifyItem = session().data().findItemForPoll(
+			d.vpoll_id().v);
+		if (notifyItem) {
+			CheckPollVoteNotificationSchedule(
+				notifyItem,
+				wasRecentVoters);
+		}
+		if (const auto tlPeer = d.vpeer()) {
+			const auto &results = d.vresults();
+			const auto hasUnread = results.match([](
+					const MTPDpollResults &data) {
+				return data.is_has_unread_votes();
+			});
+			const auto isMin = results.match([](
+					const MTPDpollResults &data) {
+				return data.is_min();
+			});
+			const auto peer = peerFromMTP(*tlPeer);
+			const auto msgId = d.vmsg_id()->v;
+			if (const auto history = session().data().historyLoaded(peer)) {
+				if (const auto item = session().data().message(
+						peer,
+						msgId)) {
+					if (hasUnread) {
+						if (!item->hasUnreadPollVote()) {
+							item->setHasUnreadPollVote();
+							item->addToUnreadThings(
+								HistoryUnreadThings::AddType::New);
+						}
+					} else if (!isMin && item->hasUnreadPollVote()) {
+						item->markPollVotesRead();
+					}
+				} else {
+					if (history->unreadPollVotes().has()) {
+						if (hasUnread) {
+							history->unreadPollVotes().checkAdd(msgId);
+						}
+					}
+					history->owner().histories().requestDialogEntry(
+						history);
+				}
+			}
+		}
 	} break;
 
 	case mtpc_updateUserTyping: {
 		auto &d = update.c_updateUserTyping();
 		handleSendActionUpdate(
 			peerFromUser(d.vuser_id()),
-			0,
+			d.vtop_msg_id().value_or_empty(),
 			peerFromUser(d.vuser_id()),
 			d.vaction());
 	} break;
@@ -1917,6 +2021,10 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		session().data().applyUpdate(update.c_updateChatParticipantAdmin());
 	} break;
 
+	case mtpc_updateChatParticipantRank: {
+		session().data().applyUpdate(update.c_updateChatParticipantRank());
+	} break;
+
 	case mtpc_updateChatDefaultBannedRights: {
 		session().data().applyUpdate(update.c_updateChatDefaultBannedRights());
 	} break;
@@ -1998,6 +2106,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 
 	case mtpc_updateConfig: {
 		session().mtp().requestConfig();
+		session().promoSuggestions().invalidate();
 	} break;
 
 	case mtpc_updateUserPhone: {
@@ -2047,8 +2156,12 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 	case mtpc_updatePhoneCall:
 	case mtpc_updatePhoneCallSignalingData:
 	case mtpc_updateGroupCallParticipants:
+	case mtpc_updateGroupCallChainBlocks:
 	case mtpc_updateGroupCallConnection:
-	case mtpc_updateGroupCall: {
+	case mtpc_updateGroupCall:
+	case mtpc_updateGroupCallMessage:
+	case mtpc_updateGroupCallEncryptedMessage:
+	case mtpc_updateDeleteGroupCallMessages: {
 		Core::App().calls().handleUpdate(&session(), update);
 	} break;
 
@@ -2114,6 +2227,15 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		session().data().webViewResultSent({ .queryId = d.vquery_id().v });
 	} break;
 
+	case mtpc_updateJoinChatWebViewDecision: {
+		const auto &d = update.c_updateJoinChatWebViewDecision();
+		session().data().joinChatWebViewDecision({
+			.peerId = peerFromMTP(d.vpeer()),
+			.queryId = uint64(d.vquery_id().v),
+			.result = d.vresult(),
+		});
+	} break;
+
 	case mtpc_updateBotMenuButton: {
 		const auto &d = update.c_updateBotMenuButton();
 		if (const auto bot = session().data().userLoaded(d.vbot_id())) {
@@ -2138,6 +2260,10 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		}
 	} break;
 
+	case mtpc_updateNewAuthorization: {
+		session().api().authorizations().apply(update);
+	} break;
+
 	case mtpc_updateServiceNotification: {
 		const auto &d = update.c_updateServiceNotification();
 		const auto text = TextWithEntities {
@@ -2369,6 +2495,32 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		session().data().updateRepliesReadTill({ id, readTillId, true });
 	} break;
 
+	case mtpc_updateReadMonoForumInbox: {
+		const auto &d = update.c_updateReadMonoForumInbox();
+		const auto parentChatId = ChannelId(d.vchannel_id());
+		const auto sublistPeerId = peerFromMTP(d.vsaved_peer_id());
+		const auto readTillId = d.vread_max_id().v;
+		session().data().updateSublistReadTill({
+			parentChatId,
+			sublistPeerId,
+			readTillId,
+			false,
+		});
+	} break;
+
+	case mtpc_updateReadMonoForumOutbox: {
+		const auto &d = update.c_updateReadMonoForumOutbox();
+		const auto parentChatId = ChannelId(d.vchannel_id());
+		const auto sublistPeerId = peerFromMTP(d.vsaved_peer_id());
+		const auto readTillId = d.vread_max_id().v;
+		session().data().updateSublistReadTill({
+			parentChatId,
+			sublistPeerId,
+			readTillId,
+			true,
+		});
+	} break;
+
 	case mtpc_updateChannelAvailableMessages: {
 		auto &d = update.c_updateChannelAvailableMessages();
 		if (const auto channel = session().data().channelLoaded(d.vchannel_id())) {
@@ -2379,9 +2531,9 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		}
 	} break;
 
-	case mtpc_updateChannelPinnedTopic: {
-		const auto &d = update.c_updateChannelPinnedTopic();
-		const auto peerId = peerFromChannel(d.vchannel_id());
+	case mtpc_updatePinnedForumTopic: {
+		const auto &d = update.c_updatePinnedForumTopic();
+		const auto peerId = peerFromMTP(d.vpeer());
 		if (const auto peer = session().data().peerLoaded(peerId)) {
 			const auto rootId = d.vtopic_id().v;
 			if (const auto topic = peer->forumTopicFor(rootId)) {
@@ -2392,9 +2544,9 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		}
 	} break;
 
-	case mtpc_updateChannelPinnedTopics: {
-		const auto &d = update.c_updateChannelPinnedTopics();
-		const auto peerId = peerFromChannel(d.vchannel_id());
+	case mtpc_updatePinnedForumTopics: {
+		const auto &d = update.c_updatePinnedForumTopics();
+		const auto peerId = peerFromMTP(d.vpeer());
 		if (const auto peer = session().data().peerLoaded(peerId)) {
 			if (const auto forum = peer->forum()) {
 				const auto done = [&] {
@@ -2588,13 +2740,22 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		const auto &data = update.c_updateDraftMessage();
 		const auto peerId = peerFromMTP(data.vpeer());
 		const auto topicRootId = data.vtop_msg_id().value_or_empty();
+		const auto monoforumPeerId = data.vsaved_peer_id()
+			? peerFromMTP(*data.vsaved_peer_id())
+			: PeerId();
 		data.vdraft().match([&](const MTPDdraftMessage &data) {
-			Data::ApplyPeerCloudDraft(&session(), peerId, topicRootId, data);
+			Data::ApplyPeerCloudDraft(
+				&session(),
+				peerId,
+				topicRootId,
+				monoforumPeerId,
+				data);
 		}, [&](const MTPDdraftMessageEmpty &data) {
 			Data::ClearPeerCloudDraft(
 				&session(),
 				peerId,
 				topicRootId,
+				monoforumPeerId,
 				data.vdate().value_or_empty());
 		});
 	} break;
@@ -2623,6 +2784,10 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		session().api().ringtones().applyUpdate();
 	} break;
 
+	case mtpc_updateAiComposeTones: {
+		session().data().aiComposeTones().applyUpdate();
+	} break;
+
 	case mtpc_updateTranscribedAudio: {
 		const auto &data = update.c_updateTranscribedAudio();
 		_session->api().transcribes().apply(data);
@@ -2648,8 +2813,23 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 
 	case mtpc_updatePaidReactionPrivacy: {
 		const auto &data = update.c_updatePaidReactionPrivacy();
-		_session->api().globalPrivacy().updatePaidReactionAnonymous(
-			mtpIsTrue(data.vprivate()));
+		_session->api().globalPrivacy().updatePaidReactionShownPeer(
+			Api::ParsePaidReactionShownPeer(_session, data.vprivate()));
+	} break;
+
+	case mtpc_updateStarGiftAuctionState: {
+		const auto &data = update.c_updateStarGiftAuctionState();
+		_session->giftAuctions().apply(data);
+	} break;
+
+	case mtpc_updateStarGiftAuctionUserState: {
+		const auto &data = update.c_updateStarGiftAuctionUserState();
+		_session->giftAuctions().apply(data);
+	} break;
+
+	case mtpc_updateEmojiGameInfo: {
+		const auto &data = update.c_updateEmojiGameInfo();
+		_session->diceStickersPacks().apply(data);
 	} break;
 
 	}
diff --git a/Telegram/SourceFiles/api/api_updates.h b/Telegram/SourceFiles/api/api_updates.h
index 654e36b51c0ab1..4e07ac099e2ade 100644
--- a/Telegram/SourceFiles/api/api_updates.h
+++ b/Telegram/SourceFiles/api/api_updates.h
@@ -40,6 +40,8 @@ class Updates final {
 	void applyUpdatesNoPtsCheck(const MTPUpdates &updates);
 	void applyUpdateNoPtsCheck(const MTPUpdate &update);
 
+	void checkForSentToScheduled(const MTPUpdates &updates);
+
 	[[nodiscard]] int32 pts() const;
 
 	void updateOnline(crl::time lastNonIdleTime = 0);
@@ -65,6 +67,13 @@ class Updates final {
 	void addActiveChat(rpl::producer<PeerData*> chat);
 	[[nodiscard]] bool inActiveChats(not_null<PeerData*> peer) const;
 
+	[[nodiscard]] bool requestingDifference() const {
+		return _ptsWaiter.requesting();
+	}
+	[[nodiscard]] bool handlingChannelDifference() const {
+		return _handlingChannelDifference;
+	}
+
 private:
 	enum class ChannelDifferenceRequest {
 		Unknown,
@@ -97,9 +106,6 @@ class Updates final {
 	void getDifferenceByPts();
 	void getDifferenceAfterFail();
 
-	[[nodiscard]] bool requestingDifference() const {
-		return _ptsWaiter.requesting();
-	}
 	void getChannelDifference(
 		not_null<ChannelData*> channel,
 		ChannelDifferenceRequest from = ChannelDifferenceRequest::Unknown);
@@ -131,6 +137,9 @@ class Updates final {
 	// Doesn't call sendHistoryChangeNotifications itself.
 	void feedUpdate(const MTPUpdate &update);
 
+	void applyConvertToScheduledOnSend(
+		const MTPVector<MTPUpdate> &other,
+		bool skipScheduledCheck = false);
 	void applyGroupCallParticipantUpdates(const MTPUpdates &updates);
 
 	bool whenGetDiffChanged(
diff --git a/Telegram/SourceFiles/api/api_user_names.cpp b/Telegram/SourceFiles/api/api_user_names.cpp
index fa040f17ea0b4a..d697de749db598 100644
--- a/Telegram/SourceFiles/api/api_user_names.cpp
+++ b/Telegram/SourceFiles/api/api_user_names.cpp
@@ -28,7 +28,7 @@ namespace {
 		not_null<PeerData*> peer) {
 	const auto user = peer->asUser();
 	return (user && user->botInfo && user->botInfo->canEditInformation)
-		? std::make_optional<MTPInputUser>(user->inputUser)
+		? std::make_optional<MTPInputUser>(user->inputUser())
 		: std::nullopt;
 }
 
@@ -98,9 +98,9 @@ rpl::producer<Data::Usernames> Usernames::loadUsernames(
 		if (peer->isSelf()) {
 			requestUser(MTP_inputUserSelf());
 		} else if (const auto user = peer->asUser()) {
-			requestUser(user->inputUser);
+			requestUser(user->inputUser());
 		} else if (const auto channel = peer->asChannel()) {
-			requestChannel(channel->inputChannel);
+			requestChannel(channel->inputChannel());
 		}
 		return lifetime;
 	};
@@ -134,7 +134,7 @@ rpl::producer<rpl::no_value, Usernames::Error> Usernames::toggle(
 			if (list.empty()) {
 				if (error == Error::Unknown) {
 					it->second.done.fire_done();
-				} else if (error == Error::TooMuch) {
+				} else {
 					it->second.done.fire_error_copy(error);
 				}
 				_toggleRequests.remove(peerId);
@@ -149,6 +149,8 @@ rpl::producer<rpl::no_value, Usernames::Error> Usernames::toggle(
 		const auto type = error.type();
 		if (type == u"USERNAMES_ACTIVE_TOO_MUCH"_q) {
 			pop(Error::TooMuch);
+		} else if (type.startsWith(u"FLOOD_WAIT_"_q)) {
+			pop(Error::Flood);
 		} else {
 			pop(Error::Unknown);
 		}
@@ -158,19 +160,19 @@ rpl::producer<rpl::no_value, Usernames::Error> Usernames::toggle(
 		_api.request(MTPaccount_ToggleUsername(
 			MTP_string(username),
 			MTP_bool(active)
-		)).done(done).fail(fail).send();
+		)).done(done).fail(fail).handleFloodErrors().send();
 	} else if (const auto channel = peer->asChannel()) {
 		_api.request(MTPchannels_ToggleUsername(
-			channel->inputChannel,
+			channel->inputChannel(),
 			MTP_string(username),
 			MTP_bool(active)
-		)).done(done).fail(fail).send();
+		)).done(done).fail(fail).handleFloodErrors().send();
 	} else if (const auto botUserInput = BotUserInput(peer)) {
 		_api.request(MTPbots_ToggleUsername(
 			*botUserInput,
 			MTP_string(username),
 			MTP_bool(active)
-		)).done(done).fail(fail).send();
+		)).done(done).fail(fail).handleFloodErrors().send();
 	} else {
 		return rpl::never<rpl::no_value, Error>();
 	}
@@ -214,7 +216,7 @@ rpl::producer<> Usernames::reorder(
 			_reorderRequests.emplace(peerId, requestId);
 		} else if (const auto channel = peer->asChannel()) {
 			const auto requestId = _api.request(MTPchannels_ReorderUsernames(
-				channel->inputChannel,
+				channel->inputChannel(),
 				MTP_vector<MTPstring>(std::move(tlUsernames))
 			)).done(finish).fail(finish).send();
 			_reorderRequests.emplace(peerId, requestId);
@@ -249,7 +251,7 @@ void Usernames::requestToCache(not_null<PeerData*> peer) {
 	const auto lifetime = std::make_shared<rpl::lifetime>();
 	*lifetime = loadUsernames(
 		peer
-	) | rpl::start_with_next([=, id = peer->id](Data::Usernames usernames) {
+	) | rpl::on_next([=, id = peer->id](Data::Usernames usernames) {
 		_tinyCache = std::make_pair(id, std::move(usernames));
 		lifetime->destroy();
 	});
diff --git a/Telegram/SourceFiles/api/api_user_names.h b/Telegram/SourceFiles/api/api_user_names.h
index 54b59ac2947edc..a25da1b375f58a 100644
--- a/Telegram/SourceFiles/api/api_user_names.h
+++ b/Telegram/SourceFiles/api/api_user_names.h
@@ -23,6 +23,7 @@ class Usernames final {
 public:
 	enum class Error {
 		TooMuch,
+		Flood,
 		Unknown,
 	};
 
diff --git a/Telegram/SourceFiles/api/api_user_privacy.cpp b/Telegram/SourceFiles/api/api_user_privacy.cpp
index d0c17fa6b18469..3b9f64745bac83 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_user_privacy.cpp
@@ -15,7 +15,7 @@ For license and copyright information please follow this link:
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "main/main_session.h"
-#include "settings/settings_premium.h" // Settings::ShowPremium.
+#include "settings/sections/settings_premium.h" // Settings::ShowPremium.
 
 namespace Api {
 namespace {
@@ -33,7 +33,7 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
 		result.reserve(peers.size());
 		for (const auto &peer : peers) {
 			if (const auto user = peer->asUser()) {
-				result.push_back(user->inputUser);
+				result.push_back(user->inputUser());
 			}
 		}
 		return result;
@@ -69,6 +69,9 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
 		if (rule.always.premiums && (rule.option != Option::Everyone)) {
 			result.push_back(MTP_inputPrivacyValueAllowPremium());
 		}
+		if (rule.always.miniapps && (rule.option != Option::Everyone)) {
+			result.push_back(MTP_inputPrivacyValueAllowBots());
+		}
 	}
 	if (!rule.ignoreNever) {
 		const auto users = collectInputUsers(rule.never);
@@ -83,6 +86,9 @@ TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
 				MTP_inputPrivacyValueDisallowChatParticipants(
 					MTP_vector<MTPlong>(chats)));
 		}
+		if (rule.never.miniapps && (rule.option != Option::Nobody)) {
+			result.push_back(MTP_inputPrivacyValueDisallowBots());
+		}
 	}
 	result.push_back([&] {
 		switch (rule.option) {
@@ -124,6 +130,10 @@ UserPrivacy::Rule TLToRules(const TLRules &rules, Data::Session &owner) {
 			setOption(Option::CloseFriends);
 		}, [&](const MTPDprivacyValueAllowPremium &) {
 			result.always.premiums = true;
+		}, [&](const MTPDprivacyValueAllowBots &) {
+			result.always.miniapps = true;
+		}, [&](const MTPDprivacyValueDisallowBots &) {
+			result.never.miniapps = true;
 		}, [&](const MTPDprivacyValueAllowUsers &data) {
 			const auto &users = data.vusers().v;
 			always.reserve(always.size() + users.size());
@@ -199,6 +209,9 @@ MTPInputPrivacyKey KeyToTL(UserPrivacy::Key key) {
 	case Key::Voices: return MTP_inputPrivacyKeyVoiceMessages();
 	case Key::About: return MTP_inputPrivacyKeyAbout();
 	case Key::Birthday: return MTP_inputPrivacyKeyBirthday();
+	case Key::GiftsAutoSave: return MTP_inputPrivacyKeyStarGiftsAutoSave();
+	case Key::NoPaidMessages: return MTP_inputPrivacyKeyNoPaidMessages();
+	case Key::SavedMusic: return MTP_inputPrivacyKeySavedMusic();
 	}
 	Unexpected("Key in Api::UserPrivacy::KetToTL.");
 }
@@ -228,6 +241,12 @@ std::optional<UserPrivacy::Key> TLToKey(mtpTypeId type) {
 	case mtpc_inputPrivacyKeyAbout: return Key::About;
 	case mtpc_privacyKeyBirthday:
 	case mtpc_inputPrivacyKeyBirthday: return Key::Birthday;
+	case mtpc_privacyKeyStarGiftsAutoSave:
+	case mtpc_inputPrivacyKeyStarGiftsAutoSave: return Key::GiftsAutoSave;
+	case mtpc_privacyKeyNoPaidMessages:
+	case mtpc_inputPrivacyKeyNoPaidMessages: return Key::NoPaidMessages;
+	case mtpc_privacyKeySavedMusic:
+	case mtpc_inputPrivacyKeySavedMusic: return Key::SavedMusic;
 	}
 	return std::nullopt;
 }
diff --git a/Telegram/SourceFiles/api/api_user_privacy.h b/Telegram/SourceFiles/api/api_user_privacy.h
index 471f41f4809487..42a5b1e9463c03 100644
--- a/Telegram/SourceFiles/api/api_user_privacy.h
+++ b/Telegram/SourceFiles/api/api_user_privacy.h
@@ -31,6 +31,9 @@ class UserPrivacy final {
 		Voices,
 		About,
 		Birthday,
+		GiftsAutoSave,
+		NoPaidMessages,
+		SavedMusic,
 	};
 	enum class Option {
 		Everyone,
@@ -41,6 +44,7 @@ class UserPrivacy final {
 	struct Exceptions {
 		std::vector<not_null<PeerData*>> peers;
 		bool premiums = false;
+		bool miniapps = false;
 	};
 	struct Rule {
 		Option option = Option::Everyone;
diff --git a/Telegram/SourceFiles/api/api_views.cpp b/Telegram/SourceFiles/api/api_views.cpp
index e80f56e213b7b3..6e6ac4dd305693 100644
--- a/Telegram/SourceFiles/api/api_views.cpp
+++ b/Telegram/SourceFiles/api/api_views.cpp
@@ -95,7 +95,7 @@ void ViewsManager::viewsIncrement() {
 			ids.push_back(MTP_int(msgId));
 		}
 		const auto requestId = _api.request(MTPmessages_GetMessagesViews(
-			i->first->input,
+			i->first->input(),
 			MTP_vector<MTPint>(ids),
 			MTP_bool(true)
 		)).done([=](
@@ -183,7 +183,7 @@ void ViewsManager::sendPollRequests(
 			}
 		};
 		const auto requestId = _api.request(MTPmessages_GetExtendedMedia(
-			peer->input,
+			peer->input(),
 			MTP_vector<MTPint>(list)
 		)).done([=](const MTPUpdates &result, mtpRequestId id) {
 			_session->api().applyUpdates(result);
diff --git a/Telegram/SourceFiles/api/api_who_reacted.cpp b/Telegram/SourceFiles/api/api_who_reacted.cpp
index 6c9df39b2d9503..5cc833ec4161a3 100644
--- a/Telegram/SourceFiles/api/api_who_reacted.cpp
+++ b/Telegram/SourceFiles/api/api_who_reacted.cpp
@@ -116,6 +116,7 @@ struct Userpic {
 	TimeId date = 0;
 	bool dateReacted = false;
 	QString customEntityData;
+	ReactionId reaction;
 	mutable Ui::PeerUserpicView view;
 	mutable InMemoryKey uniqueKey;
 };
@@ -128,6 +129,26 @@ struct State {
 	bool scheduled = false;
 };
 
+[[nodiscard]] bool ApplyReactionsRemovedToCachedData(
+		PeersWithReactions &data,
+		const Data::ReactionsRemoved &update) {
+	const auto was = data.list.size();
+	data.list.erase(
+		ranges::remove_if(data.list, [&](const PeerWithReaction &entry) {
+			return !entry.reaction.empty()
+				&& entry.peerWithDate.peer == update.participant->id;
+		}),
+		end(data.list));
+	const auto removed = int(was - data.list.size());
+	if (!removed) {
+		return false;
+	}
+	data.fullReactionsCount = (data.fullReactionsCount > removed)
+		? (data.fullReactionsCount - removed)
+		: 0;
+	return true;
+}
+
 [[nodiscard]] auto Contexts()
 -> base::flat_map<not_null<QWidget*>, std::unique_ptr<Context>> & {
 	static auto result = base::flat_map<
@@ -174,7 +195,7 @@ struct State {
 	}
 	session->changes().messageUpdates(
 		Data::MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		const auto i = context->cachedRead.find(update.item);
 		if (i != end(context->cachedRead)) {
 			session->api().request(i->second.requestId).cancel();
@@ -188,11 +209,27 @@ struct State {
 			context->cachedReacted.erase(j);
 		}
 	}, context->subscriptions[session]);
+	session->data().reactionsRemoved(
+	) | rpl::on_next([=](const Data::ReactionsRemoved &update) {
+		for (auto &[item, map] : context->cachedReacted) {
+			if (item->history()->peer->id != update.peer->id) {
+				continue;
+			} else if (update.msgId && item->id != update.msgId) {
+				continue;
+			}
+			for (auto &entry : map) {
+				auto data = entry.second.data.current();
+				if (ApplyReactionsRemovedToCachedData(data, update)) {
+					entry.second.data = std::move(data);
+				}
+			}
+		}
+	}, context->subscriptions[session]);
 	Data::AmPremiumValue(
 		session
 	) | rpl::skip(1) | rpl::filter(
 		rpl::mappers::_1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &[item, cache] : context->cachedRead) {
 			if (cache.data.current().state == Ui::WhoReadState::MyHidden) {
 				cache.data = Peers{ .state = Ui::WhoReadState::Unknown };
@@ -202,7 +239,7 @@ struct State {
 	session->api().globalPrivacy().hideReadTime(
 	) | rpl::skip(1) | rpl::filter(
 		!rpl::mappers::_1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &[item, cache] : context->cachedRead) {
 			if (cache.data.current().state == Ui::WhoReadState::MyHidden) {
 				cache.data = Peers{ .state = Ui::WhoReadState::Unknown };
@@ -240,19 +277,19 @@ struct State {
 [[nodiscard]] rpl::producer<Peers> WhoReadIds(
 		not_null<HistoryItem*> item,
 		not_null<QWidget*> context) {
-	auto weak = QPointer<QWidget>(context.get());
+	auto weak = base::make_weak(context);
 	const auto session = &item->history()->session();
 	return [=](auto consumer) {
 		if (!weak) {
 			return rpl::lifetime();
 		}
-		const auto context = PreparedContextAt(weak.data(), session);
+		const auto context = PreparedContextAt(weak.get(), session);
 		auto &entry = context->cacheRead(item);
 		if (entry.requestId) {
 		} else if (const auto user = item->history()->peer->asUser()) {
 			entry.requestId = session->api().request(
 				MTPmessages_GetOutboxReadDate(
-					user->input,
+					user->input(),
 					MTP_int(item->id)
 				)
 			).done([=](const MTPOutboxReadDate &result) {
@@ -282,7 +319,7 @@ struct State {
 		} else {
 			entry.requestId = session->api().request(
 				MTPmessages_GetMessageReadParticipants(
-					item->history()->peer->input,
+					item->history()->peer->input(),
 					MTP_int(item->id)
 				)
 			).done([=](const MTPVector<MTPReadParticipantDate> &result) {
@@ -325,13 +362,13 @@ struct State {
 		not_null<HistoryItem*> item,
 		const ReactionId &reaction,
 		not_null<QWidget*> context) {
-	auto weak = QPointer<QWidget>(context.get());
+	auto weak = base::make_weak(context);
 	const auto session = &item->history()->session();
 	return [=](auto consumer) {
 		if (!weak) {
 			return rpl::lifetime();
 		}
-		const auto context = PreparedContextAt(weak.data(), session);
+		const auto context = PreparedContextAt(weak.get(), session);
 		auto &entry = context->cacheReacted(item, reaction);
 		if (!entry.requestId) {
 			using Flag = MTPmessages_GetMessageReactionsList::Flag;
@@ -340,7 +377,7 @@ struct State {
 					MTP_flags(reaction.empty()
 						? Flag(0)
 						: Flag::f_reaction),
-					item->history()->peer->input,
+					item->history()->peer->input(),
 					MTP_int(item->id),
 					ReactionToMTP(reaction),
 					MTPstring(), // offset
@@ -443,12 +480,22 @@ bool UpdateUserpics(
 		return resolved.peer != nullptr;
 	}) | ranges::to_vector;
 
-	const auto same = ranges::equal(
-		state->userpics,
-		peers,
-		ranges::equal_to(),
-		[](const Userpic &u) { return std::pair(u.peer.get(), u.date); },
-		[](const ResolvedPeer &r) { return std::pair(r.peer, r.date); });
+	const auto same = [&] {
+		if (state->userpics.size() != peers.size()) {
+			return false;
+		}
+		const auto count = state->userpics.size();
+		for (auto i = size_t(); i != count; ++i) {
+			const auto &userpic = state->userpics[i];
+			const auto &resolved = peers[i];
+			if ((userpic.peer.get() != resolved.peer)
+				|| (userpic.date != resolved.date)
+				|| (userpic.reaction != resolved.reaction)) {
+				return false;
+			}
+		}
+		return true;
+	}();
 	if (same) {
 		return false;
 	}
@@ -461,6 +508,7 @@ bool UpdateUserpics(
 		if (i != end(was) && i->view.cloud) {
 			i->date = resolved.date;
 			i->dateReacted = resolved.dateReacted;
+			i->reaction = resolved.reaction;
 			now.push_back(std::move(*i));
 			now.back().customEntityData = data;
 			continue;
@@ -470,6 +518,7 @@ bool UpdateUserpics(
 			.date = resolved.date,
 			.dateReacted = resolved.dateReacted,
 			.customEntityData = data,
+			.reaction = resolved.reaction,
 		});
 		auto &userpic = now.back();
 		userpic.uniqueKey = peer->userpicUniqueKey(userpic.view);
@@ -512,11 +561,15 @@ void RegenerateParticipants(not_null<State*> state, int small, int large) {
 		const auto peer = userpic.peer;
 		const auto date = userpic.date;
 		const auto id = peer->id.value;
+		const auto self = peer->isSelf();
 		const auto was = ranges::find(old, id, &Ui::WhoReadParticipant::id);
 		if (was != end(old)) {
 			was->name = peer->name();
 			was->date = FormatReadDate(date, currentDate);
 			was->dateReacted = userpic.dateReacted;
+			was->self = self;
+			was->customEntityData = userpic.customEntityData;
+			was->reaction = userpic.reaction;
 			now.push_back(std::move(*was));
 			continue;
 		}
@@ -524,7 +577,9 @@ void RegenerateParticipants(not_null<State*> state, int small, int large) {
 			.name = peer->name(),
 			.date = FormatReadDate(date, currentDate),
 			.dateReacted = userpic.dateReacted,
+			.self = self,
 			.customEntityData = userpic.customEntityData,
+			.reaction = userpic.reaction,
 			.userpicLarge = GenerateUserpic(userpic, large),
 			.userpicKey = userpic.uniqueKey,
 			.id = id,
@@ -590,7 +645,7 @@ rpl::producer<Ui::WhoReadContent> WhoReacted(
 		}
 		std::move(
 			idsWithReactions
-		) | rpl::start_with_next([=](PeersWithReactions &&peers) {
+		) | rpl::on_next([=](PeersWithReactions &&peers) {
 			if (peers.state == WhoReadState::Unknown) {
 				state->userpics.clear();
 				consumer.put_next(Ui::WhoReadContent{
@@ -624,7 +679,7 @@ rpl::producer<Ui::WhoReadContent> WhoReacted(
 		item->history()->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return state->someUserpicsNotLoaded && !state->scheduled;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			for (const auto &userpic : state->userpics) {
 				if (userpic.peer->userpicUniqueKey(userpic.view)
 					!= userpic.uniqueKey) {
@@ -666,12 +721,7 @@ QString FormatReadDate(TimeId date, const QDateTime &now) {
 	return tr::lng_mediaview_date_time(
 		tr::now,
 		lt_date,
-		tr::lng_month_day(
-			tr::now,
-			lt_month,
-			Lang::MonthDay(readDate.month())(tr::now),
-			lt_day,
-			QString::number(readDate.day())),
+		langDayOfMonthShort(readDate),
 		lt_time,
 		QLocale().toString(parsed.time(), QLocale::ShortFormat));
 }
@@ -712,7 +762,8 @@ bool WhoReadExists(not_null<HistoryItem*> item) {
 	const auto megagroup = peer->asMegagroup();
 	if ((!chat && !megagroup)
 		|| (megagroup
-			&& (megagroup->flags() & ChannelDataFlag::ParticipantsHidden))) {
+			&& (megagroup->flags() & ChannelDataFlag::ParticipantsHidden))
+		|| (megagroup && megagroup->isMonoforum())) {
 		return false;
 	}
 	const auto &appConfig = peer->session().appConfig();
@@ -757,4 +808,31 @@ rpl::producer<Ui::WhoReadContent> WhoReacted(
 	return WhoReacted(item, reaction, context, st, nullptr);
 }
 
+[[nodiscard]] rpl::producer<Ui::WhoReadContent> WhenDate(
+		not_null<PeerData*> author,
+		TimeId date,
+		Ui::WhoReadType type) {
+	return rpl::single(Ui::WhoReadContent{
+		.participants = { Ui::WhoReadParticipant{
+			.name = author->name(),
+			.date = FormatReadDate(date, QDateTime::currentDateTime()),
+			.id = author->id.value,
+		} },
+		.type = type,
+		.fullReadCount = 1,
+	});
+}
+
+rpl::producer<Ui::WhoReadContent> WhenEdited(
+		not_null<PeerData*> author,
+		TimeId date) {
+	return WhenDate(author, date, Ui::WhoReadType::Edited);
+}
+
+rpl::producer<Ui::WhoReadContent> WhenOriginal(
+		not_null<PeerData*> author,
+		TimeId date) {
+	return WhenDate(author, date, Ui::WhoReadType::Original);
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_who_reacted.h b/Telegram/SourceFiles/api/api_who_reacted.h
index 9a9100535c5269..8e1bc9a3bf02c2 100644
--- a/Telegram/SourceFiles/api/api_who_reacted.h
+++ b/Telegram/SourceFiles/api/api_who_reacted.h
@@ -61,5 +61,11 @@ struct WhoReadList {
 	const Data::ReactionId &reaction,
 	not_null<QWidget*> context, // Cache results for this lifetime.
 	const style::WhoRead &st);
+[[nodiscard]] rpl::producer<Ui::WhoReadContent> WhenEdited(
+	not_null<PeerData*> author,
+	TimeId date);
+[[nodiscard]] rpl::producer<Ui::WhoReadContent> WhenOriginal(
+	not_null<PeerData*> author,
+	TimeId date);
 
 } // namespace Api
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 5ef4af3d6c60ca..528577e93b63b7 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "api/api_authorizations.h"
 #include "api/api_attached_stickers.h"
 #include "api/api_blocked_peers.h"
+#include "api/api_chat_invite.h"
 #include "api/api_chat_links.h"
 #include "api/api_chat_participants.h"
 #include "api/api_cloud_password.h"
@@ -21,27 +22,37 @@ For license and copyright information please follow this link:
 #include "api/api_polls.h"
 #include "api/api_sending.h"
 #include "api/api_text_entities.h"
+#include "api/api_todo_lists.h"
 #include "api/api_self_destruct.h"
 #include "api/api_sensitive_content.h"
 #include "api/api_global_privacy.h"
+#include "api/api_reactions_notify_settings.h"
 #include "api/api_updates.h"
 #include "api/api_user_privacy.h"
+#include "api/api_read_metrics.h"
 #include "api/api_views.h"
 #include "api/api_confirm_phone.h"
 #include "api/api_unread_things.h"
 #include "api/api_ringtones.h"
+#include "api/api_compose_with_ai.h"
 #include "api/api_transcribes.h"
 #include "api/api_premium.h"
 #include "api/api_user_names.h"
 #include "api/api_websites.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/credits.h"
 #include "data/components/scheduled_messages.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_changes.h"
+#include "data/data_media_types.h"
 #include "data/data_web_page.h"
 #include "data/data_folder.h"
 #include "data/data_forum_topic.h"
 #include "data/data_forum.h"
+#include "data/data_message_reaction_id.h"
+#include "data/data_premium_limits.h"
+#include "data/data_saved_messages.h"
+#include "data/data_saved_music.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_search_controller.h"
 #include "data/data_session.h"
@@ -63,10 +74,13 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item_components.h"
 #include "history/history_item_helpers.h"
+#include "history/view/controls/history_view_forward_panel.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "main/main_account.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/boxes/emoji_stake_box.h"
+#include "ui/controls/ton_common.h"
 #include "boxes/sticker_set_box.h"
 #include "boxes/premium_limits_box.h"
 #include "window/notifications_manager.h"
@@ -80,7 +94,7 @@ For license and copyright information please follow this link:
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/toast/toast.h"
 #include "support/support_helper.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "storage/localimageloader.h"
 #include "storage/download_manager_mtproto.h"
 #include "storage/file_upload.h"
@@ -91,8 +105,6 @@ namespace {
 // Save draft to the cloud with 1 sec extra delay.
 constexpr auto kSaveCloudDraftTimeout = 1000;
 
-constexpr auto kTopPromotionInterval = TimeId(60 * 60);
-constexpr auto kTopPromotionMinDelay = TimeId(10);
 constexpr auto kSmallDelayMs = 5;
 constexpr auto kReadFeaturedSetsTimeout = crl::time(1000);
 constexpr auto kFileLoaderQueueStopTimeout = crl::time(5000);
@@ -106,10 +118,6 @@ using PhotoFileLocationId = Data::PhotoFileLocationId;
 using DocumentFileLocationId = Data::DocumentFileLocationId;
 using UpdatedFileReferences = Data::UpdatedFileReferences;
 
-[[nodiscard]] TimeId UnixtimeFromMsgId(mtpMsgId msgId) {
-	return TimeId(msgId >> 32);
-}
-
 [[nodiscard]] std::shared_ptr<ChatHelpers::Show> ShowForPeer(
 		not_null<PeerData*> peer) {
 	if (const auto window = Core::App().windowFor(peer)) {
@@ -142,8 +150,26 @@ void ShowChannelsLimitBox(not_null<PeerData*> peer) {
 		action.replaceMediaOf);
 }
 
+[[nodiscard]] QString FormatVideoTimestamp(TimeId seconds) {
+	const auto minutes = seconds / 60;
+	const auto hours = minutes / 60;
+	return hours
+		? u"%1h%2m%3s"_q.arg(hours).arg(minutes % 60).arg(seconds % 60)
+		: minutes
+		? u"%1m%2s"_q.arg(minutes).arg(seconds % 60)
+		: QString::number(seconds);
+}
+
 } // namespace
 
+namespace Api {
+
+TimeId UnixtimeFromMsgId(mtpMsgId msgId) {
+	return TimeId(msgId >> 32);
+}
+
+} // namespace Api
+
 ApiWrap::ApiWrap(not_null<Main::Session*> session)
 : MTP::Sender(&session->account().mtp())
 , _session(session)
@@ -153,7 +179,6 @@ ApiWrap::ApiWrap(not_null<Main::Session*> session)
 , _featuredSetsReadTimer([=] { readFeaturedSets(); })
 , _dialogsLoadState(std::make_unique<DialogsLoadState>())
 , _fileLoader(std::make_unique<TaskQueue>(kFileLoaderQueueStopTimeout))
-, _topPromotionTimer([=] { refreshTopPromotion(); })
 , _updateNotifyTimer([=] { sendNotifySettingsUpdates(); })
 , _statsSessionKillTimer([=] { checkStatsSessions(); })
 , _authorizations(std::make_unique<Api::Authorizations>(this))
@@ -163,16 +188,21 @@ ApiWrap::ApiWrap(not_null<Main::Session*> session)
 , _selfDestruct(std::make_unique<Api::SelfDestruct>(this))
 , _sensitiveContent(std::make_unique<Api::SensitiveContent>(this))
 , _globalPrivacy(std::make_unique<Api::GlobalPrivacy>(this))
+, _reactionsNotifySettings(
+	std::make_unique<Api::ReactionsNotifySettings>(this))
 , _userPrivacy(std::make_unique<Api::UserPrivacy>(this))
 , _inviteLinks(std::make_unique<Api::InviteLinks>(this))
 , _chatLinks(std::make_unique<Api::ChatLinks>(this))
 , _views(std::make_unique<Api::ViewsManager>(this))
+, _readMetrics(std::make_unique<Api::ReadMetrics>(this))
 , _confirmPhone(std::make_unique<Api::ConfirmPhone>(this))
 , _peerPhoto(std::make_unique<Api::PeerPhoto>(this))
 , _polls(std::make_unique<Api::Polls>(this))
+, _todoLists(std::make_unique<Api::TodoLists>(this))
 , _chatParticipants(std::make_unique<Api::ChatParticipants>(this))
 , _unreadThings(std::make_unique<Api::UnreadThings>(this))
 , _ringtones(std::make_unique<Api::Ringtones>(this))
+, _composeWithAi(std::make_unique<Api::ComposeWithAi>(this))
 , _transcribes(std::make_unique<Api::Transcribes>(this))
 , _premium(std::make_unique<Api::Premium>(this))
 , _usernames(std::make_unique<Api::Usernames>(this))
@@ -184,21 +214,38 @@ ApiWrap::ApiWrap(not_null<Main::Session*> session)
 		_session->data().chatsFilters().changed(
 		) | rpl::filter([=] {
 			return _session->data().chatsFilters().archiveNeeded();
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			requestMoreDialogsIfNeeded();
 		}, _session->lifetime());
 
+		_reactionsNotifySettings->reload();
 		setupSupportMode();
-
-		Core::App().settings().proxy().connectionTypeValue(
-		) | rpl::start_with_next([=] {
-			refreshTopPromotion();
-		}, _session->lifetime());
 	});
 }
 
 ApiWrap::~ApiWrap() = default;
 
+void ApiWrap::ProcessRecentSelfForwards(
+		not_null<Main::Session*> session,
+		const MTPUpdates &updates,
+		PeerId targetPeerId,
+		PeerId fromPeerId) {
+	auto newIds = MessageIdsList();
+	updates.match([&](const MTPDupdates &data) {
+		for (const auto &update : data.vupdates().v) {
+			update.match([&](const MTPDupdateMessageID &d) {
+				newIds.push_back(FullMsgId(targetPeerId, d.vid().v));
+			}, [](const auto &) {});
+		}
+	}, [](const auto &) {});
+	if (!newIds.empty()) {
+		session->data().addRecentSelfForwards({
+			.fromPeerId = fromPeerId,
+			.ids = newIds,
+		});
+	}
+}
+
 Main::Session &ApiWrap::session() const {
 	return *_session;
 }
@@ -217,7 +264,7 @@ void ApiWrap::setupSupportMode() {
 	}
 
 	_session->settings().supportChatsTimeSliceValue(
-	) | rpl::start_with_next([=](int seconds) {
+	) | rpl::on_next([=](int seconds) {
 		_dialogsLoadTill = seconds ? std::max(base::unixtime::now() - seconds, 0) : 0;
 		refreshDialogsLoadBlocked();
 	}, _session->lifetime());
@@ -233,73 +280,6 @@ void ApiWrap::requestChangelog(
 	//).send();
 }
 
-void ApiWrap::refreshTopPromotion() {
-	const auto now = base::unixtime::now();
-	const auto next = (_topPromotionNextRequestTime != 0)
-		? _topPromotionNextRequestTime
-		: now;
-	if (_topPromotionRequestId) {
-		getTopPromotionDelayed(now, next);
-		return;
-	}
-	const auto key = [&]() -> std::pair<QString, uint32> {
-		if (!Core::App().settings().proxy().isEnabled()) {
-			return {};
-		}
-		const auto &proxy = Core::App().settings().proxy().selected();
-		if (proxy.type != MTP::ProxyData::Type::Mtproto) {
-			return {};
-		}
-		return { proxy.host, proxy.port };
-	}();
-	if (_topPromotionKey == key && now < next) {
-		getTopPromotionDelayed(now, next);
-		return;
-	}
-	_topPromotionKey = key;
-	_topPromotionRequestId = request(MTPhelp_GetPromoData(
-	)).done([=](const MTPhelp_PromoData &result) {
-		_topPromotionRequestId = 0;
-		topPromotionDone(result);
-	}).fail([=] {
-		_topPromotionRequestId = 0;
-		const auto now = base::unixtime::now();
-		const auto next = _topPromotionNextRequestTime = now
-			+ kTopPromotionInterval;
-		if (!_topPromotionTimer.isActive()) {
-			getTopPromotionDelayed(now, next);
-		}
-	}).send();
-}
-
-void ApiWrap::getTopPromotionDelayed(TimeId now, TimeId next) {
-	_topPromotionTimer.callOnce(std::min(
-		std::max(next - now, kTopPromotionMinDelay),
-		kTopPromotionInterval) * crl::time(1000));
-};
-
-void ApiWrap::topPromotionDone(const MTPhelp_PromoData &proxy) {
-	_topPromotionNextRequestTime = proxy.match([&](const auto &data) {
-		return data.vexpires().v;
-	});
-	getTopPromotionDelayed(
-		base::unixtime::now(),
-		_topPromotionNextRequestTime);
-
-	proxy.match([&](const MTPDhelp_promoDataEmpty &data) {
-		_session->data().setTopPromoted(nullptr, QString(), QString());
-	}, [&](const MTPDhelp_promoData &data) {
-		_session->data().processChats(data.vchats());
-		_session->data().processUsers(data.vusers());
-		const auto peerId = peerFromMTP(data.vpeer());
-		const auto history = _session->data().history(peerId);
-		_session->data().setTopPromoted(
-			history,
-			data.vpsa_type().value_or_empty(),
-			data.vpsa_message().value_or_empty());
-	});
-}
-
 void ApiWrap::requestDeepLinkInfo(
 		const QString &path,
 		Fn<void(TextWithEntities message, bool updateRequired)> callback) {
@@ -386,7 +366,7 @@ void ApiWrap::checkChatInvite(
 	request(base::take(_checkInviteRequestId)).cancel();
 	_checkInviteRequestId = request(MTPmessages_CheckChatInvite(
 		MTP_string(hash)
-	)).done(std::move(done)).fail(std::move(fail)).send();
+	)).done(std::move(done)).fail(std::move(fail)).handleFloodErrors().send();
 }
 
 void ApiWrap::checkFilterInvite(
@@ -403,7 +383,7 @@ void ApiWrap::savePinnedOrder(Data::Folder *folder) {
 	const auto &order = _session->data().pinnedChatsOrder(folder);
 	const auto input = [](Dialogs::Key key) {
 		if (const auto history = key.history()) {
-			return MTP_inputDialogPeer(history->peer->input);
+			return MTP_inputDialogPeer(history->peer->input());
 		} else if (const auto folder = key.folder()) {
 			return MTP_inputDialogPeerFolder(MTP_int(folder->id()));
 		}
@@ -436,9 +416,9 @@ void ApiWrap::savePinnedOrder(not_null<Data::Forum*> forum) {
 		order,
 		ranges::back_inserter(topics),
 		input);
-	request(MTPchannels_ReorderPinnedForumTopics(
-		MTP_flags(MTPchannels_ReorderPinnedForumTopics::Flag::f_force),
-		forum->channel()->inputChannel,
+	request(MTPmessages_ReorderPinnedForumTopics(
+		MTP_flags(MTPmessages_ReorderPinnedForumTopics::Flag::f_force),
+		forum->peer()->input(),
 		MTP_vector(topics)
 	)).done([=](const MTPUpdates &result) {
 		applyUpdates(result);
@@ -446,10 +426,13 @@ void ApiWrap::savePinnedOrder(not_null<Data::Forum*> forum) {
 }
 
 void ApiWrap::savePinnedOrder(not_null<Data::SavedMessages*> saved) {
+	if (saved->parentChat()) {
+		return;
+	}
 	const auto &order = _session->data().pinnedChatsOrder(saved);
 	const auto input = [](Dialogs::Key key) {
 		if (const auto sublist = key.sublist()) {
-			return MTP_inputDialogPeer(sublist->peer()->input);
+			return MTP_inputDialogPeer(sublist->sublistPeer()->input());
 		}
 		Unexpected("Key type in pinnedDialogsOrder().");
 	};
@@ -478,7 +461,7 @@ void ApiWrap::toggleHistoryArchived(
 		MTP_vector<MTPInputFolderPeer>(
 			1,
 			MTP_inputFolderPeer(
-				history->peer->input,
+				history->peer->input(),
 				MTP_int(archived ? archiveId : 0)))
 	)).done([=](const MTPUpdates &result) {
 		applyUpdates(result);
@@ -513,13 +496,14 @@ void ApiWrap::sendMessageFail(
 		uint64 randomId,
 		FullMsgId itemId) {
 	const auto show = ShowForPeer(peer);
+	const auto paidStarsPrefix = u"ALLOW_PAYMENT_REQUIRED_"_q;
 	if (show && error == u"PEER_FLOOD"_q) {
 		show->showBox(
 			Ui::MakeInformBox(
 				PeerFloodErrorText(&session(), PeerFloodType::Send)),
 			Ui::LayerOption::CloseOther);
 	} else if (show && error == u"USER_BANNED_IN_CHANNEL"_q) {
-		const auto link = Ui::Text::Link(
+		const auto link = tr::link(
 			tr::lng_cant_more_info(tr::now),
 			session().createInternalLinkFull(u"spambot"_q));
 		show->showBox(
@@ -528,7 +512,7 @@ void ApiWrap::sendMessageFail(
 					tr::now,
 					lt_more_info,
 					link,
-					Ui::Text::WithEntities)),
+					tr::marked)),
 			Ui::LayerOption::CloseOther);
 	} else if (error.startsWith(u"SLOWMODE_WAIT_"_q)) {
 		const auto chop = u"SLOWMODE_WAIT_"_q.size();
@@ -556,9 +540,58 @@ void ApiWrap::sendMessageFail(
 	} else if (show && error == u"CHAT_FORWARDS_RESTRICTED"_q) {
 		show->showToast(peer->isBroadcast()
 			? tr::lng_error_noforwards_channel(tr::now)
+			: peer->isUser()
+			? tr::lng_error_noforwards_user(tr::now)
 			: tr::lng_error_noforwards_group(tr::now), kJoinErrorDuration);
 	} else if (error == u"PREMIUM_ACCOUNT_REQUIRED"_q) {
 		Settings::ShowPremium(&session(), "premium_stickers");
+	} else if (error == u"SCHEDULE_TOO_MUCH"_q) {
+		auto &scheduled = _session->scheduledMessages();
+		if (const auto item = scheduled.lookupItem(peer->id, itemId.msg)) {
+			scheduled.removeSending(item);
+		}
+		if (show) {
+			show->showToast(tr::lng_error_schedule_limit(tr::now));
+		}
+	} else if (error.startsWith(paidStarsPrefix)) {
+		if (show) {
+			show->showToast(
+				u"Payment requirements changed. Please, try again."_q);
+		}
+		if (const auto stars = error.mid(paidStarsPrefix.size()).toInt()) {
+			if (const auto user = peer->asUser()) {
+				user->setStarsPerMessage(stars);
+			} else if (const auto channel = peer->asChannel()) {
+				channel->setStarsPerMessage(stars);
+			}
+		}
+		peer->updateFull();
+	} else if (error == u"BALANCE_TOO_LOW"_q) {
+		const auto item = _session->data().message(itemId);
+		const auto stake = (item && item->media())
+			? item->media()->diceGameOutcome().stakeNanoTon
+			: int64(0);
+		if (stake > 0) {
+			const auto required = CreditsAmount(
+				stake / Ui::kNanosInOne,
+				stake % Ui::kNanosInOne,
+				CreditsType::Ton);
+			if (randomId) {
+				_session->data().unregisterMessageRandomId(randomId);
+			}
+			item->destroy();
+			if (show) {
+				show->show(Box(
+					Ui::InsufficientTonBox,
+					_session,
+					required));
+			}
+			return;
+		} else if (show) {
+			show->showToast(error);
+		}
+	} else if (show) {
+		show->showToast(error);
 	}
 	if (const auto item = _session->data().message(itemId)) {
 		Assert(randomId != 0);
@@ -652,7 +685,7 @@ void ApiWrap::resolveMessageDatas() {
 		if (!ids.isEmpty()) {
 			const auto channel = j->first;
 			const auto requestId = request(MTPchannels_GetMessages(
-				channel->inputChannel,
+				channel->inputChannel(),
 				MTP_vector<MTPInputMessage>(ids)
 			)).done([=](
 					const MTPmessages_Messages &result,
@@ -708,7 +741,9 @@ void ApiWrap::finalizeMessageDataRequest(
 
 QString ApiWrap::exportDirectMessageLink(
 		not_null<HistoryItem*> item,
-		bool inRepliesContext) {
+		bool inRepliesContext,
+		bool forceNonPublicLink,
+		std::optional<TimeId> videoTimestamp) {
 	Expects(item->history()->peer->isChannel());
 
 	const auto itemId = item->fullId();
@@ -731,7 +766,7 @@ QString ApiWrap::exportDirectMessageLink(
 				const auto sender = root
 					? root->discussionPostOriginalSender()
 					: nullptr;
-				if (sender && sender->hasUsername()) {
+				if (sender && sender->hasUsername() && !forceNonPublicLink) {
 					// Comment to a public channel.
 					const auto forwarded = root->Get<HistoryMessageForwarded>();
 					linkItemId = forwarded->savedFromMsgId;
@@ -747,7 +782,7 @@ QString ApiWrap::exportDirectMessageLink(
 				}
 			}
 		}
-		const auto base = linkChannel->hasUsername()
+		const auto base = (linkChannel->hasUsername() && !forceNonPublicLink)
 			? linkChannel->username()
 			: "c/" + QString::number(peerToChannel(linkChannel->id).bare);
 		const auto post = QString::number(linkItemId.bare);
@@ -760,20 +795,11 @@ QString ApiWrap::exportDirectMessageLink(
 				: linkThreadId
 				? (QString::number(linkThreadId.bare) + '/' + post)
 				: post);
-		if (linkChannel->hasUsername()
-			&& !linkChannel->isMegagroup()
-			&& !linkCommentId
-			&& !linkThreadId) {
-			if (const auto media = item->media()) {
-				if (const auto document = media->document()) {
-					if (document->isVideoMessage()) {
-						return u"https://telesco.pe/"_q + query;
-					}
-				}
-			}
-		}
 		return session().createInternalLinkFull(query);
 	};
+	if (forceNonPublicLink) {
+		return fallback();
+	}
 	const auto i = _unlikelyMessageLinks.find(itemId);
 	const auto current = (i != end(_unlikelyMessageLinks))
 		? i->second
@@ -782,7 +808,7 @@ QString ApiWrap::exportDirectMessageLink(
 		MTP_flags(inRepliesContext
 			? MTPchannels_ExportMessageLink::Flag::f_thread
 			: MTPchannels_ExportMessageLink::Flag(0)),
-		channel->inputChannel,
+		channel->inputChannel(),
 		MTP_int(item->id)
 	)).done([=](const MTPExportedMessageLink &result) {
 		const auto link = qs(result.data().vlink());
@@ -790,7 +816,14 @@ QString ApiWrap::exportDirectMessageLink(
 			_unlikelyMessageLinks.emplace_or_assign(itemId, link);
 		}
 	}).send();
-	return current;
+	const auto addTimestamp = channel->hasUsername()
+		&& !inRepliesContext
+		&& videoTimestamp.has_value();
+	const auto addedSeparator = (current.indexOf('?') >= 0) ? '&' : '?';
+	const auto addedTimestamp = addTimestamp
+		? (addedSeparator + u"t="_q + FormatVideoTimestamp(*videoTimestamp))
+		: QString();
+	return current + addedTimestamp;
 }
 
 QString ApiWrap::exportDirectStoryLink(not_null<Data::Story*> story) {
@@ -798,8 +831,10 @@ QString ApiWrap::exportDirectStoryLink(not_null<Data::Story*> story) {
 	const auto peer = story->peer();
 	const auto fallback = [&] {
 		const auto base = peer->username();
-		const auto story = QString::number(storyId.story);
-		const auto query = base + "/s/" + story;
+		const auto id = story->call()
+			? u"live"_q
+			: QString::number(storyId.story);
+		const auto query = base + "/s/" + id;
 		return session().createInternalLinkFull(query);
 	};
 	const auto i = _unlikelyStoryLinks.find(storyId);
@@ -807,7 +842,7 @@ QString ApiWrap::exportDirectStoryLink(not_null<Data::Story*> story) {
 		? i->second
 		: fallback();
 	request(MTPstories_ExportStoryLink(
-		peer->input,
+		peer->input(),
 		MTP_int(story->id())
 	)).done([=](const MTPExportedStoryLink &result) {
 		const auto link = qs(result.data().vlink());
@@ -874,7 +909,7 @@ void ApiWrap::requestMoreDialogs(Data::Folder *folder) {
 		MTP_int(state->offsetDate),
 		MTP_int(state->offsetId),
 		(state->offsetPeer
-			? state->offsetPeer->input
+			? state->offsetPeer->input()
 			: MTP_inputPeerEmpty()),
 		MTP_int(loadCount),
 		MTP_long(hash)
@@ -1125,6 +1160,8 @@ void ApiWrap::requestWallPaper(
 void ApiWrap::requestFullPeer(not_null<PeerData*> peer) {
 	if (_fullPeerRequests.contains(peer)) {
 		return;
+	} else if (!peer->isUser() && !peer->barSettings().has_value()) {
+		requestPeerSettings(peer);
 	}
 
 	const auto requestId = [&] {
@@ -1137,7 +1174,7 @@ void ApiWrap::requestFullPeer(not_null<PeerData*> peer) {
 				_session->supportHelper().refreshInfo(user);
 			}
 			return request(MTPusers_GetFullUser(
-				user->inputUser
+				user->inputUser()
 			)).done([=](const MTPusers_UserFull &result) {
 				result.match([&](const MTPDusers_userFull &data) {
 					_session->data().processUsers(data.vusers());
@@ -1147,13 +1184,13 @@ void ApiWrap::requestFullPeer(not_null<PeerData*> peer) {
 			}).fail(failHandler).send();
 		} else if (const auto chat = peer->asChat()) {
 			return request(MTPmessages_GetFullChat(
-				chat->inputChat
+				chat->inputChat()
 			)).done([=](const MTPmessages_ChatFull &result) {
 				gotChatFull(peer, result);
 			}).fail(failHandler).send();
 		} else if (const auto channel = peer->asChannel()) {
 			return request(MTPchannels_GetFullChannel(
-				channel->inputChannel
+				channel->inputChannel()
 			)).done([=](const MTPmessages_ChatFull &result) {
 				gotChatFull(peer, result);
 				migrateDone(channel, channel);
@@ -1225,9 +1262,13 @@ void ApiWrap::gotUserFull(
 void ApiWrap::requestPeerSettings(not_null<PeerData*> peer) {
 	if (!_requestedPeerSettings.emplace(peer).second) {
 		return;
+	} else if (peer->isMonoforum()) {
+		peer->setBarSettings(PeerBarSettings());
+		_requestedPeerSettings.erase(peer);
+		return;
 	}
 	request(MTPmessages_GetPeerSettings(
-		peer->input
+		peer->input()
 	)).done([=](const MTPmessages_PeerSettings &result) {
 		result.match([&](const MTPDmessages_peerSettings &data) {
 			_session->data().processUsers(data.vusers());
@@ -1236,6 +1277,7 @@ void ApiWrap::requestPeerSettings(not_null<PeerData*> peer) {
 			_requestedPeerSettings.erase(peer);
 		});
 	}).fail([=] {
+		peer->setBarSettings(PeerBarSettings());
 		_requestedPeerSettings.erase(peer);
 	}).send();
 }
@@ -1281,7 +1323,7 @@ void ApiWrap::migrateChat(
 	}
 
 	request(MTPmessages_MigrateChat(
-		chat->inputChat
+		chat->inputChat()
 	)).done([=](const MTPUpdates &result) {
 		applyUpdates(result);
 		session().changes().sendNotifications();
@@ -1353,7 +1395,7 @@ void ApiWrap::markContentsRead(
 	}
 	for (const auto &channelIds : channelMarkedIds) {
 		request(MTPchannels_ReadMessageContents(
-			channelIds.first->inputChannel,
+			channelIds.first->inputChannel(),
 			MTP_vector<MTPint>(channelIds.second)
 		)).send();
 	}
@@ -1366,7 +1408,7 @@ void ApiWrap::markContentsRead(not_null<HistoryItem*> item) {
 	const auto ids = MTP_vector<MTPint>(1, MTP_int(item->id));
 	if (const auto channel = item->history()->peer->asChannel()) {
 		request(MTPchannels_ReadMessageContents(
-			channel->inputChannel,
+			channel->inputChannel(),
 			ids
 		)).send();
 	} else {
@@ -1400,8 +1442,8 @@ void ApiWrap::deleteAllFromParticipantSend(
 		not_null<ChannelData*> channel,
 		not_null<PeerData*> from) {
 	request(MTPchannels_DeleteParticipantHistory(
-		channel->inputChannel,
-		from->input
+		channel->inputChannel(),
+		from->input()
 	)).done([=](const MTPmessages_AffectedHistory &result) {
 		const auto offset = applyAffectedHistory(channel, result);
 		if (offset > 0) {
@@ -1412,6 +1454,69 @@ void ApiWrap::deleteAllFromParticipantSend(
 	}).send();
 }
 
+void ApiWrap::deleteAllReactionsFromParticipant(
+		not_null<PeerData*> peer,
+		not_null<PeerData*> participant,
+		MsgId originMsgId,
+		const Data::ReactionId &originReaction) {
+	_session->data().removeReactionsFromParticipant(
+		peer,
+		0,
+		participant,
+		originReaction,
+		originMsgId);
+	request(MTPmessages_DeleteParticipantReactions(
+		peer->input(),
+		participant->input()
+	)).send();
+}
+
+void ApiWrap::deleteParticipantReaction(
+		not_null<PeerData*> peer,
+		MsgId msgId,
+		not_null<PeerData*> participant,
+		const Data::ReactionId &reaction) {
+	_session->data().removeReactionsFromParticipant(
+		peer,
+		msgId,
+		participant,
+		reaction,
+		0);
+	request(MTPmessages_DeleteParticipantReaction(
+		peer->input(),
+		MTP_int(msgId.bare),
+		participant->input()
+	)).done([=](const MTPUpdates &result) {
+		applyUpdates(result);
+	}).send();
+}
+
+void ApiWrap::deleteSublistHistory(
+		not_null<ChannelData*> channel,
+		not_null<PeerData*> sublistPeer) {
+	deleteSublistHistorySend(channel, sublistPeer);
+}
+
+void ApiWrap::deleteSublistHistorySend(
+		not_null<ChannelData*> parentChat,
+		not_null<PeerData*> sublistPeer) {
+	request(MTPmessages_DeleteSavedHistory(
+		MTP_flags(MTPmessages_DeleteSavedHistory::Flag::f_parent_peer),
+		parentChat->input(),
+		sublistPeer->input(),
+		MTP_int(0), // max_id
+		MTP_int(0), // min_date
+		MTP_int(0) // max_date
+	)).done([=](const MTPmessages_AffectedHistory &result) {
+		const auto offset = applyAffectedHistory(parentChat, result);
+		if (offset > 0) {
+			deleteSublistHistorySend(parentChat, sublistPeer);
+		} else if (const auto monoforum = parentChat->monoforum()) {
+			monoforum->applySublistDeleted(sublistPeer);
+		}
+	}).send();
+}
+
 void ApiWrap::scheduleStickerSetRequest(uint64 setId, uint64 access) {
 	if (!_stickerSetRequests.contains(setId)) {
 		_stickerSetRequests.emplace(setId, StickerSetRequest{ access });
@@ -1719,10 +1824,21 @@ void ApiWrap::joinChannel(not_null<ChannelData*> channel) {
 			Data::PeerUpdate::Flag::ChannelAmIn);
 	} else if (!_channelAmInRequests.contains(channel)) {
 		const auto requestId = request(MTPchannels_JoinChannel(
-			channel->inputChannel
-		)).done([=](const MTPUpdates &result) {
+			channel->inputChannel()
+		)).done([=](const MTPmessages_ChatInviteJoinResult &result) {
 			_channelAmInRequests.remove(channel);
-			applyUpdates(result);
+
+			Api::ProcessChatInviteJoinResult(
+				_session,
+				ShowForPeer(channel),
+				result,
+				[=](const MTPUpdates &updates) {
+					applyUpdates(updates);
+					session().data().addRecentJoinChat({
+						.fromPeerId = channel->id,
+						.joinedPeerId = channel->id,
+					});
+				});
 		}).fail([=](const MTP::Error &error) {
 			const auto &type = error.type();
 
@@ -1759,7 +1875,7 @@ void ApiWrap::joinChannel(not_null<ChannelData*> channel) {
 		_channelAmInRequests.emplace(channel, requestId);
 
 		using Flag = ChannelDataFlag;
-		chatParticipants().loadSimilarChannels(channel);
+		chatParticipants().loadSimilarPeers(channel);
 		channel->setFlags(channel->flags() | Flag::SimilarExpanded);
 	}
 }
@@ -1771,7 +1887,7 @@ void ApiWrap::leaveChannel(not_null<ChannelData*> channel) {
 			Data::PeerUpdate::Flag::ChannelAmIn);
 	} else if (!_channelAmInRequests.contains(channel)) {
 		auto requestId = request(MTPchannels_LeaveChannel(
-			channel->inputChannel
+			channel->inputChannel()
 		)).done([=](const MTPUpdates &result) {
 			_channelAmInRequests.remove(channel);
 			applyUpdates(result);
@@ -1814,12 +1930,14 @@ void ApiWrap::requestNotifySettings(const MTPInputNotifyPeer &peer) {
 			return PeerId(0);
 		}, [](const MTPDinputPeerChannel &data) {
 			return peerFromChannel(data.vchannel_id());
+		}, [](const MTPDinputPeerChannelFromMessage &data) {
+			return peerFromChannel(data.vchannel_id());
 		}, [](const MTPDinputPeerChat &data) {
 			return peerFromChat(data.vchat_id());
 		}, [](const MTPDinputPeerUser &data) {
 			return peerFromUser(data.vuser_id());
-		}, [](const auto &) -> PeerId {
-			Unexpected("Type in ApiRequest::requestNotifySettings peer.");
+		}, [](const MTPDinputPeerUserFromMessage &data) {
+			return peerFromUser(data.vuser_id());
 		});
 	};
 	const auto key = peer.match([](const MTPDinputNotifyUsers &) {
@@ -1873,7 +1991,7 @@ void ApiWrap::updateNotifySettingsDelayed(
 	}
 	if (_updateNotifyTopics.emplace(topic).second) {
 		topic->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_updateNotifyTopics.remove(topic);
 		}, _updateNotifyQueueLifetime);
 		_updateNotifyTimer.callOnce(kNotifySettingSaveTimeout);
@@ -1894,17 +2012,17 @@ void ApiWrap::updateNotifySettingsDelayed(Data::DefaultNotify type) {
 
 void ApiWrap::sendNotifySettingsUpdates() {
 	_updateNotifyQueueLifetime.destroy();
-	for (const auto topic : base::take(_updateNotifyTopics)) {
+	for (const auto &topic : base::take(_updateNotifyTopics)) {
 		request(MTPaccount_UpdateNotifySettings(
 			MTP_inputNotifyForumTopic(
-				topic->channel()->input,
+				topic->peer()->input(),
 				MTP_int(topic->rootId())),
 			topic->notify().serialize()
 		)).afterDelay(kSmallDelayMs).send();
 	}
-	for (const auto peer : base::take(_updateNotifyPeers)) {
+	for (const auto &peer : base::take(_updateNotifyPeers)) {
 		request(MTPaccount_UpdateNotifySettings(
-			MTP_inputNotifyPeer(peer->input),
+			MTP_inputNotifyPeer(peer->input()),
 			peer->notify().serialize()
 		)).afterDelay(kSmallDelayMs).send();
 	}
@@ -1983,8 +2101,8 @@ void ApiWrap::deleteConversation(not_null<PeerData*> peer, bool revoke) {
 	if (const auto chat = peer->asChat()) {
 		request(MTPmessages_DeleteChatUser(
 			MTP_flags(0),
-			chat->inputChat,
-			_session->user()->inputUser
+			chat->inputChat(),
+			_session->user()->inputUser()
 		)).done([=](const MTPUpdates &result) {
 			applyUpdates(result);
 			deleteHistory(peer, false, revoke);
@@ -2103,8 +2221,13 @@ void ApiWrap::saveCurrentDraftToCloud() {
 			_session->local().writeDrafts(history);
 
 			const auto topicRootId = thread->topicRootId();
-			const auto localDraft = history->localDraft(topicRootId);
-			const auto cloudDraft = history->cloudDraft(topicRootId);
+			const auto monoforumPeerId = thread->monoforumPeerId();
+			const auto localDraft = history->localDraft(
+				topicRootId,
+				monoforumPeerId);
+			const auto cloudDraft = history->cloudDraft(
+				topicRootId,
+				monoforumPeerId);
 			if (!Data::DraftsAreEqual(localDraft, cloudDraft)
 				&& !_session->supportMode()) {
 				saveDraftToCloudDelayed(thread);
@@ -2127,15 +2250,22 @@ void ApiWrap::saveDraftsToCloud() {
 
 		const auto history = thread->owningHistory();
 		const auto topicRootId = thread->topicRootId();
-		auto cloudDraft = history->cloudDraft(topicRootId);
-		auto localDraft = history->localDraft(topicRootId);
+		const auto monoforumPeerId = thread->monoforumPeerId();
+		auto cloudDraft = history->cloudDraft(topicRootId, monoforumPeerId);
+		auto localDraft = history->localDraft(topicRootId, monoforumPeerId);
 		if (cloudDraft && cloudDraft->saveRequestId) {
 			request(base::take(cloudDraft->saveRequestId)).cancel();
 		}
 		if (!_session->supportMode()) {
-			cloudDraft = history->createCloudDraft(topicRootId, localDraft);
+			cloudDraft = history->createCloudDraft(
+				topicRootId,
+				monoforumPeerId,
+				localDraft);
 		} else if (!cloudDraft) {
-			cloudDraft = history->createCloudDraft(topicRootId, nullptr);
+			cloudDraft = history->createCloudDraft(
+				topicRootId,
+				monoforumPeerId,
+				nullptr);
 		}
 
 		auto flags = MTPmessages_SaveDraft::Flags(0);
@@ -2145,37 +2275,48 @@ void ApiWrap::saveDraftsToCloud() {
 		} else if (!cloudDraft->webpage.url.isEmpty()) {
 			flags |= MTPmessages_SaveDraft::Flag::f_media;
 		}
-		if (cloudDraft->reply.messageId || cloudDraft->reply.topicRootId) {
+		if (cloudDraft->reply.messageId
+			|| cloudDraft->reply.topicRootId
+			|| cloudDraft->reply.monoforumPeerId) {
 			flags |= MTPmessages_SaveDraft::Flag::f_reply_to;
 		}
 		if (!textWithTags.tags.isEmpty()) {
 			flags |= MTPmessages_SaveDraft::Flag::f_entities;
 		}
+		if (cloudDraft->suggest) {
+			flags |= MTPmessages_SaveDraft::Flag::f_suggested_post;
+		}
 		auto entities = Api::EntitiesToMTP(
 			_session,
 			TextUtilities::ConvertTextTagsToEntities(textWithTags.tags),
 			Api::ConvertOption::SkipLocal);
 
-		history->startSavingCloudDraft(topicRootId);
+		history->startSavingCloudDraft(topicRootId, monoforumPeerId);
 		cloudDraft->saveRequestId = request(MTPmessages_SaveDraft(
 			MTP_flags(flags),
 			ReplyToForMTP(history, cloudDraft->reply),
-			history->peer->input,
+			history->peer->input(),
 			MTP_string(textWithTags.text),
 			entities,
 			Data::WebPageForMTP(
 				cloudDraft->webpage,
 				textWithTags.text.isEmpty()),
-			MTP_long(0) // effect
+			MTP_long(0), // effect
+			Api::SuggestToMTP(cloudDraft->suggest),
+			MTPInputRichMessage()
 		)).done([=](const MTPBool &result, const MTP::Response &response) {
 			const auto requestId = response.requestId;
 			history->finishSavingCloudDraft(
 				topicRootId,
-				UnixtimeFromMsgId(response.outerMsgId));
-			if (const auto cloudDraft = history->cloudDraft(topicRootId)) {
+				monoforumPeerId,
+				Api::UnixtimeFromMsgId(response.outerMsgId));
+			const auto cloudDraft = history->cloudDraft(
+				topicRootId,
+				monoforumPeerId);
+			if (cloudDraft) {
 				if (cloudDraft->saveRequestId == requestId) {
 					cloudDraft->saveRequestId = 0;
-					history->draftSavedToCloud(topicRootId);
+					history->draftSavedToCloud(topicRootId, monoforumPeerId);
 				}
 			}
 			const auto i = _draftsSaveRequestIds.find(weak);
@@ -2188,10 +2329,14 @@ void ApiWrap::saveDraftsToCloud() {
 			const auto requestId = response.requestId;
 			history->finishSavingCloudDraft(
 				topicRootId,
-				UnixtimeFromMsgId(response.outerMsgId));
-			if (const auto cloudDraft = history->cloudDraft(topicRootId)) {
+				monoforumPeerId,
+				Api::UnixtimeFromMsgId(response.outerMsgId));
+			const auto cloudDraft = history->cloudDraft(
+				topicRootId,
+				monoforumPeerId);
+			if (cloudDraft) {
 				if (cloudDraft->saveRequestId == requestId) {
-					history->clearCloudDraft(topicRootId);
+					history->clearCloudDraft(topicRootId, monoforumPeerId);
 				}
 			}
 			const auto i = _draftsSaveRequestIds.find(weak);
@@ -2327,7 +2472,7 @@ void ApiWrap::resolveWebPages() {
 	QVector<mtpRequestId> reqsByIndex(idsByChannel.size(), 0);
 	for (auto i = idsByChannel.cbegin(), e = idsByChannel.cend(); i != e; ++i) {
 		reqsByIndex[i->second.first] = request(MTPchannels_GetMessages(
-			i->first->inputChannel,
+			i->first->inputChannel(),
 			MTP_vector<MTPInputMessage>(i->second.second)
 		)).done([=, channel = i->first](
 				const MTPmessages_Messages &result,
@@ -2442,18 +2587,46 @@ void ApiWrap::refreshFileReference(
 	};
 	v::match(origin.data, [&](Data::FileOriginMessage data) {
 		if (const auto item = _session->data().message(data)) {
+			if (const auto iv = item->Get<HistoryMessageMediaForInstantView>()) {
+				if (!iv->url.isEmpty()) {
+					return refreshFileReference(
+						Data::FileOriginWebPage{ iv->url },
+						std::move(handler));
+				}
+			}
 			const auto media = item->media();
-			const auto storyId = media ? media->storyId() : FullStoryId();
+			const auto mediaStory = media ? media->storyId() : FullStoryId();
+			const auto storyId = mediaStory
+				? mediaStory
+				: FullStoryId{
+					(IsStoryMsgId(item->id)
+						? item->history()->peer->id
+						: PeerId()),
+					(IsStoryMsgId(item->id)
+						? StoryIdFromMsgId(item->id)
+						: StoryId())
+				};
 			if (storyId) {
 				request(MTPstories_GetStoriesByID(
-					_session->data().peer(storyId.peer)->input,
+					_session->data().peer(storyId.peer)->input(),
 					MTP_vector<MTPint>(1, MTP_int(storyId.story))));
 			} else if (item->isScheduled()) {
 				const auto realId = _session->scheduledMessages().lookupId(
 					item);
 				request(MTPmessages_GetScheduledMessages(
-					item->history()->peer->input,
+					item->history()->peer->input(),
 					MTP_vector<MTPint>(1, MTP_int(realId))));
+			} else if (item->isSavedMusicItem()) {
+				const auto user = item->history()->peer->asUser();
+				const auto media = item->media();
+				const auto document = media ? media->document() : nullptr;
+				if (user && document) {
+					request(MTPusers_GetSavedMusicByID(
+						user->inputUser(),
+						MTP_vector<MTPInputDocument>(1, document->mtpInput())));
+				} else {
+					fail();
+				}
 			} else if (item->isBusinessShortcut()) {
 				const auto &shortcuts = _session->data().shortcutMessages();
 				const auto realId = shortcuts.lookupId(item);
@@ -2464,7 +2637,7 @@ void ApiWrap::refreshFileReference(
 					MTP_long(0)));
 			} else if (const auto channel = item->history()->peer->asChannel()) {
 				request(MTPchannels_GetMessages(
-					channel->inputChannel,
+					channel->inputChannel(),
 					MTP_vector<MTPInputMessage>(
 						1,
 						MTP_inputMessageID(MTP_int(item->id)))));
@@ -2480,7 +2653,7 @@ void ApiWrap::refreshFileReference(
 	}, [&](Data::FileOriginUserPhoto data) {
 		if (const auto user = _session->data().user(data.userId)) {
 			request(MTPphotos_GetUserPhotos(
-				user->inputUser,
+				user->inputUser(),
 				MTP_int(-1),
 				MTP_long(data.photoId),
 				MTP_int(1)));
@@ -2489,12 +2662,20 @@ void ApiWrap::refreshFileReference(
 		}
 	}, [&](Data::FileOriginFullUser data) {
 		if (const auto user = _session->data().user(data.userId)) {
-			request(MTPusers_GetFullUser(user->inputUser));
+			request(MTPusers_GetFullUser(user->inputUser()));
 		} else {
 			fail();
 		}
 	}, [&](Data::FileOriginPeerPhoto data) {
-		fail();
+		const auto peer = _session->data().peer(data.peerId);
+		if (const auto channel = peer->asChannel()) {
+			request(MTPchannels_GetFullChannel(
+				channel->inputChannel()));
+		} else if (const auto chat = peer->asChat()) {
+			request(MTPmessages_GetFullChat(chat->inputChat()));
+		} else {
+			fail();
+		}
 	}, [&](Data::FileOriginStickerSet data) {
 		const auto isRecentAttached
 			= (data.setId == Data::Stickers::CloudRecentAttachedSetId);
@@ -2558,14 +2739,17 @@ void ApiWrap::refreshFileReference(
 			MTP_int(0)));
 	}, [&](Data::FileOriginStory data) {
 		request(MTPstories_GetStoriesByID(
-			_session->data().peer(data.peer)->input,
+			_session->data().peer(data.peer)->input(),
 			MTP_vector<MTPint>(1, MTP_int(data.story))));
 	}, [&](v::null_t) {
 		fail();
 	});
 }
 
-void ApiWrap::gotWebPages(ChannelData *channel, const MTPmessages_Messages &result, mtpRequestId req) {
+void ApiWrap::gotWebPages(
+		ChannelData *channel,
+		const MTPmessages_Messages &result,
+		mtpRequestId req) {
 	WebPageData::ApplyChanges(_session, channel, result);
 	for (auto i = _webPagesPending.begin(); i != _webPagesPending.cend();) {
 		if (i->second == req) {
@@ -2579,7 +2763,7 @@ void ApiWrap::gotWebPages(ChannelData *channel, const MTPmessages_Messages &resu
 			++i;
 		}
 	}
-	_session->data().sendWebPageGamePollNotifications();
+	_session->data().sendWebPageGamePollTodoListNotifications();
 }
 
 void ApiWrap::updateStickers() {
@@ -2625,7 +2809,7 @@ void ApiWrap::setGroupStickerSet(
 
 	megagroup->mgInfo->stickerSet = set;
 	request(MTPchannels_SetStickers(
-		megagroup->inputChannel,
+		megagroup->inputChannel(),
 		Data::InputStickerSet(set)
 	)).send();
 	_session->data().stickers().notifyUpdated(Data::StickersType::Stickers);
@@ -2638,7 +2822,7 @@ void ApiWrap::setGroupEmojiSet(
 
 	megagroup->mgInfo->emojiSet = set;
 	request(MTPchannels_SetEmojiStickers(
-		megagroup->inputChannel,
+		megagroup->inputChannel(),
 		Data::InputStickerSet(set)
 	)).send();
 	_session->changes().peerUpdated(
@@ -2969,17 +3153,27 @@ void ApiWrap::resolveJumpToDate(
 		Fn<void(not_null<PeerData*>, MsgId)> callback) {
 	if (const auto peer = chat.peer()) {
 		const auto topic = chat.topic();
-		const auto rootId = topic ? topic->rootId() : 0;
-		resolveJumpToHistoryDate(peer, rootId, date, std::move(callback));
+		const auto sublist = chat.sublist();
+		const auto rootId = topic ? topic->rootId() : MsgId();
+		const auto monoforumPeerId = sublist
+			? sublist->sublistPeer()->id
+			: PeerId();
+		resolveJumpToHistoryDate(
+			peer,
+			rootId,
+			monoforumPeerId,
+			date,
+			std::move(callback));
 	}
 }
 
 template <typename Callback>
 void ApiWrap::requestMessageAfterDate(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		const QDate &date,
-		Callback &&callback) {
+	not_null<PeerData*> peer,
+	MsgId topicRootId,
+	PeerId monoforumPeerId,
+	const QDate &date,
+	Callback &&callback) {
 	// API returns a message with date <= offset_date.
 	// So we request a message with offset_date = desired_date - 1 and add_offset = -1.
 	// This should give us the first message with date >= desired_date.
@@ -3003,17 +3197,19 @@ void ApiWrap::requestMessageAfterDate(
 			};
 			const auto list = result.match([&](
 					const MTPDmessages_messages &data) {
+				peer->processTopics(data.vtopics());
 				return handleMessages(data);
 			}, [&](const MTPDmessages_messagesSlice &data) {
+				peer->processTopics(data.vtopics());
 				return handleMessages(data);
 			}, [&](const MTPDmessages_channelMessages &data) {
 				if (const auto channel = peer->asChannel()) {
 					channel->ptsReceived(data.vpts().v);
-					channel->processTopics(data.vtopics());
 				} else {
 					LOG(("API Error: received messages.channelMessages when "
 						"no channel was passed! (ApiWrap::jumpToDate)"));
 				}
+				peer->processTopics(data.vtopics());
 				return handleMessages(data);
 			}, [&](const MTPDmessages_messagesNotModified &) {
 				LOG(("API Error: received messages.messagesNotModified! "
@@ -3036,7 +3232,7 @@ void ApiWrap::requestMessageAfterDate(
 	};
 	if (topicRootId) {
 		send(MTPmessages_GetReplies(
-			peer->input,
+			peer->input(),
 			MTP_int(topicRootId),
 			MTP_int(offsetId),
 			MTP_int(offsetDate),
@@ -3045,9 +3241,21 @@ void ApiWrap::requestMessageAfterDate(
 			MTP_int(maxId),
 			MTP_int(minId),
 			MTP_long(historyHash)));
+	} else if (monoforumPeerId) {
+		send(MTPmessages_GetSavedHistory(
+			MTP_flags(MTPmessages_GetSavedHistory::Flag::f_parent_peer),
+			peer->input(),
+			session().data().peer(monoforumPeerId)->input(),
+			MTP_int(offsetId),
+			MTP_int(offsetDate),
+			MTP_int(addOffset),
+			MTP_int(limit),
+			MTP_int(maxId),
+			MTP_int(minId),
+			MTP_long(historyHash)));
 	} else {
 		send(MTPmessages_GetHistory(
-			peer->input,
+			peer->input(),
 			MTP_int(offsetId),
 			MTP_int(offsetDate),
 			MTP_int(addOffset),
@@ -3061,28 +3269,41 @@ void ApiWrap::requestMessageAfterDate(
 void ApiWrap::resolveJumpToHistoryDate(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		const QDate &date,
 		Fn<void(not_null<PeerData*>, MsgId)> callback) {
 	if (const auto channel = peer->migrateTo()) {
 		return resolveJumpToHistoryDate(
 			channel,
 			topicRootId,
+			monoforumPeerId,
 			date,
 			std::move(callback));
 	}
 	const auto jumpToDateInPeer = [=] {
-		requestMessageAfterDate(peer, topicRootId, date, [=](MsgId itemId) {
-			callback(peer, itemId);
-		});
+		requestMessageAfterDate(
+			peer,
+			topicRootId,
+			monoforumPeerId,
+			date,
+			[=](MsgId itemId) { callback(peer, itemId); });
 	};
-	if (const auto chat = topicRootId ? nullptr : peer->migrateFrom()) {
-		requestMessageAfterDate(chat, 0, date, [=](MsgId itemId) {
-			if (itemId) {
-				callback(chat, itemId);
-			} else {
-				jumpToDateInPeer();
-			}
-		});
+	const auto migrated = (topicRootId || monoforumPeerId)
+		? nullptr
+		: peer->migrateFrom();
+	if (migrated) {
+		requestMessageAfterDate(
+			migrated,
+			MsgId(),
+			PeerId(),
+			date,
+			[=](MsgId itemId) {
+				if (itemId) {
+					callback(migrated, itemId);
+				} else {
+					jumpToDateInPeer();
+				}
+			});
 	} else {
 		jumpToDateInPeer();
 	}
@@ -3131,12 +3352,14 @@ void ApiWrap::requestHistory(
 void ApiWrap::requestSharedMedia(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		SharedMediaType type,
 		MsgId messageId,
 		SliceType slice) {
 	const auto key = SharedMediaRequest{
 		peer,
 		topicRootId,
+		monoforumPeerId,
 		type,
 		messageId,
 		slice,
@@ -3148,6 +3371,7 @@ void ApiWrap::requestSharedMedia(
 	const auto prepared = Api::PrepareSearchRequest(
 		peer,
 		topicRootId,
+		monoforumPeerId,
 		type,
 		QString(),
 		messageId,
@@ -3170,7 +3394,12 @@ void ApiWrap::requestSharedMedia(
 				messageId,
 				slice,
 				result);
-			sharedMediaDone(peer, topicRootId, type, std::move(parsed));
+			sharedMediaDone(
+				peer,
+				topicRootId,
+				monoforumPeerId,
+				type,
+				std::move(parsed));
 			finish();
 		}).fail([=] {
 			_sharedMediaRequests.remove(key);
@@ -3183,16 +3412,19 @@ void ApiWrap::requestSharedMedia(
 void ApiWrap::sharedMediaDone(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		SharedMediaType type,
 		Api::SearchResult &&parsed) {
 	const auto topic = peer->forumTopicFor(topicRootId);
-	if (topicRootId && !topic) {
+	const auto sublist = peer->monoforumSublistFor(monoforumPeerId);
+	if ((topicRootId && !topic) || (monoforumPeerId && !sublist)) {
 		return;
 	}
 	const auto hasMessages = !parsed.messageIds.empty();
 	_session->storage().add(Storage::SharedMediaAddSlice(
 		peer->id,
 		topicRootId,
+		monoforumPeerId,
 		type,
 		std::move(parsed.messageIds),
 		parsed.noSkipRange,
@@ -3203,9 +3435,37 @@ void ApiWrap::sharedMediaDone(
 		if (topic) {
 			topic->setHasPinnedMessages(true);
 		}
+		if (sublist) {
+			sublist->setHasPinnedMessages(true);
+		}
 	}
 }
 
+mtpRequestId ApiWrap::requestGlobalMedia(
+		Storage::SharedMediaType type,
+		const QString &query,
+		int32 offsetRate,
+		Data::MessagePosition offsetPosition,
+		Fn<void(Api::GlobalMediaResult)> done) {
+	auto prepared = Api::PrepareGlobalMediaRequest(
+		_session,
+		offsetRate,
+		offsetPosition,
+		type,
+		query);
+	if (!prepared) {
+		done({});
+		return 0;
+	}
+	return request(
+		std::move(*prepared)
+	).done([=](const Api::SearchRequestResult &result) {
+		done(Api::ParseGlobalMediaResult(_session, result));
+	}).fail([=] {
+		done({});
+	}).send();
+}
+
 void ApiWrap::sendAction(const SendAction &action) {
 	if (!action.options.scheduled
 		&& !action.options.shortcutId
@@ -3214,8 +3474,14 @@ void ApiWrap::sendAction(const SendAction &action) {
 		const auto topic = topicRootId
 			? action.history->peer->forumTopicFor(topicRootId)
 			: nullptr;
+		const auto monoforumPeerId = action.replyTo.monoforumPeerId;
+		const auto sublist = monoforumPeerId
+			? action.history->peer->monoforumSublistFor(monoforumPeerId)
+			: nullptr;
 		if (topic) {
 			topic->readTillEnd();
+		} else if (sublist) {
+			sublist->readTillEnd();
 		} else {
 			_session->data().histories().readInbox(action.history);
 		}
@@ -3227,20 +3493,23 @@ void ApiWrap::sendAction(const SendAction &action) {
 void ApiWrap::finishForwarding(const SendAction &action) {
 	const auto history = action.history;
 	const auto topicRootId = action.replyTo.topicRootId;
-	auto toForward = history->resolveForwardDraft(topicRootId);
+	const auto monoforumPeerId = action.replyTo.monoforumPeerId;
+	auto toForward = history->resolveForwardDraft(
+		topicRootId,
+		monoforumPeerId);
 	if (!toForward.items.empty()) {
-		const auto error = GetErrorTextForSending(
+		const auto error = GetErrorForSending(
 			history->peer,
 			{
 				.topicRootId = topicRootId,
 				.forward = &toForward.items,
 			});
-		if (!error.isEmpty()) {
+		if (error) {
 			return;
 		}
 
+		history->setForwardDraft(topicRootId, monoforumPeerId, {});
 		forwardMessages(std::move(toForward), action);
-		history->setForwardDraft(topicRootId, {});
 	}
 
 	_session->data().sendHistoryChangeNotifications();
@@ -3255,12 +3524,32 @@ void ApiWrap::finishForwarding(const SendAction &action) {
 
 void ApiWrap::forwardMessages(
 		Data::ResolvedForwardDraft &&draft,
-		const SendAction &action,
+		SendAction action,
 		FnMut<void()> &&successCallback) {
 	Expects(!draft.items.empty());
 
 	auto &histories = _session->data().histories();
 
+	for (auto i = begin(draft.items); i != end(draft.items);) {
+		const auto item = *i;
+		if (item->isSavedMusicItem()) {
+			SendExistingDocument(MessageToSend(action), item->media()->document());
+			i = draft.items.erase(i);
+		} else {
+			++i;
+		}
+	}
+	if (draft.items.empty()) {
+		if (successCallback) {
+			successCallback();
+		}
+		return;
+	}
+	draft.options = HistoryView::Controls::NormalizeForwardOptions(
+		_session,
+		draft.items,
+		draft.options);
+
 	struct SharedCallback {
 		int requestsLeft = 0;
 		FnMut<void()> callback;
@@ -3295,11 +3584,17 @@ void ApiWrap::forwardMessages(
 	if (action.options.scheduled) {
 		flags |= MessageFlag::IsOrWasScheduled;
 		sendFlags |= SendFlag::f_schedule_date;
+		if (action.options.scheduleRepeatPeriod) {
+			sendFlags |= SendFlag::f_schedule_repeat_period;
+		}
 	}
 	if (action.options.shortcutId) {
 		flags |= MessageFlag::ShortcutMessage;
 		sendFlags |= SendFlag::f_quick_reply_shortcut;
 	}
+	if (action.options.effectId) {
+		sendFlags |= SendFlag::f_effect;
+	}
 	if (draft.options != Data::ForwardOptions::PreserveInfo) {
 		sendFlags |= SendFlag::f_drop_author;
 	}
@@ -3309,6 +3604,9 @@ void ApiWrap::forwardMessages(
 	if (sendAs) {
 		sendFlags |= SendFlag::f_send_as;
 	}
+	if (action.options.suggest) {
+		sendFlags |= SendFlag::f_suggested_post;
+	}
 	const auto kGeneralId = Data::ForumTopic::kGeneralId;
 	const auto topicRootId = action.replyTo.topicRootId;
 	const auto topMsgId = (topicRootId == kGeneralId)
@@ -3317,6 +3615,13 @@ void ApiWrap::forwardMessages(
 	if (topMsgId) {
 		sendFlags |= SendFlag::f_top_msg_id;
 	}
+	const auto monoforumPeerId = action.replyTo.monoforumPeerId;
+	const auto monoforumPeer = monoforumPeerId
+		? session().data().peer(monoforumPeerId).get()
+		: nullptr;
+	if (monoforumPeer || (action.options.suggest && action.replyTo)) {
+		sendFlags |= SendFlag::f_reply_to;
+	}
 
 	auto forwardFrom = draft.items.front()->history()->peer;
 	auto ids = QVector<MTPint>();
@@ -3327,39 +3632,90 @@ void ApiWrap::forwardMessages(
 		if (shared) {
 			++shared->requestsLeft;
 		}
-		const auto requestType = Data::Histories::RequestType::Send;
 		const auto idsCopy = localIds;
-		histories.sendRequest(history, requestType, [=](Fn<void()> finish) {
-			history->sendRequestId = request(MTPmessages_ForwardMessages(
-				MTP_flags(sendFlags),
-				forwardFrom->input,
+		const auto scheduled = action.options.scheduled;
+		const auto starsPaid = std::min(
+			action.options.starsApproved,
+			int(ids.size() * peer->starsPerMessageChecked()));
+		auto oneFlags = sendFlags;
+		if (starsPaid) {
+			action.options.starsApproved -= starsPaid;
+			oneFlags |= SendFlag::f_allow_paid_stars;
+		}
+		auto buildMessage = [=](
+				not_null<History*> history,
+				FullReplyTo replyTo)
+			-> Data::Histories::PreparedMessage {
+			const auto kGeneralId = Data::ForumTopic::kGeneralId;
+			const auto realTopMsgId = (replyTo.topicRootId == kGeneralId)
+				? MsgId(0)
+				: replyTo.topicRootId;
+			auto flags = oneFlags;
+			if (realTopMsgId) {
+				flags |= SendFlag::f_top_msg_id;
+			} else {
+				flags &= ~SendFlag::f_top_msg_id;
+			}
+			return MTPmessages_ForwardMessages(
+				MTP_flags(flags),
+				forwardFrom->input(),
 				MTP_vector<MTPint>(ids),
 				MTP_vector<MTPlong>(randomIds),
-				peer->input,
-				MTP_int(topMsgId),
+				history->peer->input(),
+				MTP_int(realTopMsgId),
+				(action.options.suggest
+					? ReplyToForMTP(history, replyTo)
+					: monoforumPeer
+					? MTP_inputReplyToMonoForum(
+						monoforumPeer->input())
+					: MTPInputReplyTo()),
 				MTP_int(action.options.scheduled),
-				(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
-				Data::ShortcutIdToMTP(_session, action.options.shortcutId)
-			)).done([=](const MTPUpdates &result) {
-				applyUpdates(result);
+				MTP_int(action.options.scheduleRepeatPeriod),
+				(sendAs
+					? sendAs->input()
+					: MTP_inputPeerEmpty()),
+				Data::ShortcutIdToMTP(
+					&history->session(),
+					action.options.shortcutId),
+				MTP_long(action.options.effectId),
+				MTPint(),
+				MTP_long(starsPaid),
+				Api::SuggestToMTP(action.options.suggest));
+		};
+		histories.sendPreparedMessage(
+			history,
+			FullReplyTo{ .topicRootId = topicRootId },
+			uint64(0),
+			std::move(buildMessage),
+			[=](const MTPUpdates &result, const MTP::Response &) {
+				if (!scheduled) {
+					_session->api().updates().checkForSentToScheduled(
+						result);
+				}
 				if (shared && !--shared->requestsLeft) {
 					shared->callback();
 				}
-				finish();
-			}).fail([=](const MTP::Error &error) {
+				if (peer->isSelf() && _session->premium()) {
+					ProcessRecentSelfForwards(
+						_session,
+						result,
+						peer->id,
+						forwardFrom->id);
+				}
+			},
+			[=](const MTP::Error &error, const MTP::Response &) {
 				if (idsCopy) {
 					for (const auto &[randomId, itemId] : *idsCopy) {
-						sendMessageFail(error, peer, randomId, itemId);
+						_session->api().sendMessageFail(
+							error,
+							peer,
+							randomId,
+							itemId);
 					}
 				} else {
-					sendMessageFail(error, peer);
+					_session->api().sendMessageFail(error, peer);
 				}
-				finish();
-			}).afterRequest(
-				history->sendRequestId
-			).send();
-			return history->sendRequestId;
-		});
+			});
 
 		ids.resize(0);
 		randomIds.resize(0);
@@ -3368,7 +3724,7 @@ void ApiWrap::forwardMessages(
 
 	ids.reserve(count);
 	randomIds.reserve(count);
-	for (const auto item : draft.items) {
+	for (const auto &item : draft.items) {
 		const auto randomId = base::RandomValue<uint64>();
 		if (genClientSideMessage) {
 			const auto newId = FullMsgId(
@@ -3378,11 +3734,15 @@ void ApiWrap::forwardMessages(
 				.id = newId.msg,
 				.flags = flags,
 				.from = NewMessageFromId(action),
-				.replyTo = { .topicRootId = topMsgId },
+				.replyTo = {
+					.topicRootId = topMsgId,
+					.monoforumPeerId = monoforumPeerId,
+				},
 				.date = NewMessageDate(action.options),
 				.shortcutId = action.options.shortcutId,
+				.starsPaid = action.options.starsApproved,
 				.postAuthor = NewMessagePostAuthor(action),
-
+				.suggest = HistoryMessageSuggestInfo(action.options),
 				// forwarded messages don't have effects
 				//.effectId = action.options.effectId,
 			}, item);
@@ -3474,8 +3834,10 @@ void ApiWrap::sendSharedContact(
 		.replyTo = action.replyTo,
 		.date = NewMessageDate(action.options),
 		.shortcutId = action.options.shortcutId,
+		.starsPaid = action.options.starsApproved,
 		.postAuthor = NewMessagePostAuthor(action),
 		.effectId = action.options.effectId,
+		.suggest = HistoryMessageSuggestInfo(action.options),
 	}, TextWithEntities(), MTP_messageMediaContact(
 		MTP_string(phone),
 		MTP_string(firstName),
@@ -3502,16 +3864,20 @@ void ApiWrap::sendVoiceMessage(
 		QByteArray result,
 		VoiceWaveform waveform,
 		crl::time duration,
+		bool video,
 		const SendAction &action) {
 	const auto caption = TextWithTags();
 	const auto to = FileLoadTaskOptions(action);
-	_fileLoader->addTask(std::make_unique<FileLoadTask>(
-		&session(),
-		result,
-		duration,
-		waveform,
-		to,
-		caption));
+	_fileLoader->addTask(
+		std::make_unique<FileLoadTask>(FileLoadTask::VoiceArgs{
+			.session = &session(),
+			.voice = result,
+			.duration = duration,
+			.waveform = waveform,
+			.video = video,
+			.to = to,
+			.caption = caption,
+		}));
 }
 
 void ApiWrap::editMedia(
@@ -3522,35 +3888,60 @@ void ApiWrap::editMedia(
 	if (list.files.empty()) return;
 
 	auto &file = list.files.front();
-	const auto to = FileLoadTaskOptions(action);
-	_fileLoader->addTask(std::make_unique<FileLoadTask>(
-		&session(),
-		file.path,
-		file.content,
-		std::move(file.information),
-		type,
-		to,
-		caption,
-		file.spoiler));
+	auto to = FileLoadTaskOptions(action);
+	const auto existing = to.replaceMediaOf
+		? session().data().message(action.history->peer, to.replaceMediaOf)
+		: nullptr;
+	if (existing && existing->computeSuggestionActions()
+		== SuggestionActions::AcceptAndDecline) {
+		to.replyTo.messageId = {
+			action.history->peer->id,
+			to.replaceMediaOf
+		};
+		to.replyTo.monoforumPeerId = existing->sublistPeerId();
+		to.replaceMediaOf = MsgId();
+	}
+	const auto forceFile = (type == SendMediaType::File)
+		&& (file.type == Ui::PreparedFile::Type::Video);
+	_fileLoader->addTask(std::make_unique<FileLoadTask>(FileLoadTask::Args{
+		.session = &session(),
+		.filepath = file.path,
+		.content = file.content,
+		.information = std::move(file.information),
+		.videoCover = (file.videoCover
+			? std::make_unique<FileLoadTask>(FileLoadTask::Args{
+				.session = &session(),
+				.filepath = file.videoCover->path,
+				.content = file.videoCover->content,
+				.information = std::move(file.videoCover->information),
+				.videoCover = nullptr,
+				.type = SendMediaType::Photo,
+				.to = to,
+				.caption = TextWithTags(),
+				.spoiler = false,
+				.album = nullptr,
+				.forceFile = false,
+				.sendLargePhotos = false,
+				.idOverride = 0,
+			})
+			: nullptr),
+		.type = type,
+		.to = to,
+		.caption = caption,
+		.spoiler = file.spoiler,
+		.album = nullptr,
+		.forceFile = forceFile,
+		.sendLargePhotos = file.sendLargePhotos,
+		.idOverride = 0,
+		.displayName = file.displayName,
+	}));
 }
 
 void ApiWrap::sendFiles(
 		Ui::PreparedList &&list,
 		SendMediaType type,
-		TextWithTags &&caption,
 		std::shared_ptr<SendingAlbum> album,
 		const SendAction &action) {
-	const auto haveCaption = !caption.text.isEmpty();
-	if (haveCaption
-		&& !list.canAddCaption(
-			album != nullptr,
-			type == SendMediaType::Photo)) {
-		auto message = MessageToSend(action);
-		message.textWithTags = base::take(caption);
-		message.action.clearDraft = false;
-		sendMessage(std::move(message));
-	}
-
 	const auto to = FileLoadTaskOptions(action);
 	if (album) {
 		album->options = to.options;
@@ -3564,17 +3955,40 @@ void ApiWrap::sendFiles(
 				&& type != SendMediaType::File)
 			? SendMediaType::Photo
 			: SendMediaType::File;
-		tasks.push_back(std::make_unique<FileLoadTask>(
-			&session(),
-			file.path,
-			file.content,
-			std::move(file.information),
-			uploadWithType,
-			to,
-			caption,
-			file.spoiler,
-			album));
-		caption = TextWithTags();
+		const auto forceFile = (type == SendMediaType::File)
+			&& (file.type == Ui::PreparedFile::Type::Video);
+		tasks.push_back(std::make_unique<FileLoadTask>(FileLoadTask::Args{
+			.session = &session(),
+			.filepath = file.path,
+			.content = file.content,
+			.information = std::move(file.information),
+			.videoCover = (file.videoCover
+				? std::make_unique<FileLoadTask>(FileLoadTask::Args{
+					.session = &session(),
+					.filepath = file.videoCover->path,
+					.content = file.videoCover->content,
+					.information = std::move(file.videoCover->information),
+					.videoCover = nullptr,
+					.type = SendMediaType::Photo,
+					.to = to,
+					.caption = TextWithTags(),
+					.spoiler = false,
+					.album = nullptr,
+					.forceFile = false,
+					.sendLargePhotos = false,
+					.idOverride = 0,
+				})
+				: nullptr),
+			.type = uploadWithType,
+			.to = to,
+			.caption = std::move(file.caption),
+			.spoiler = file.spoiler,
+			.album = album,
+			.forceFile = forceFile,
+			.sendLargePhotos = file.sendLargePhotos,
+			.idOverride = 0,
+			.displayName = file.displayName,
+		}));
 	}
 	if (album) {
 		_sendingAlbums.emplace(album->groupId, album);
@@ -3593,16 +4007,20 @@ void ApiWrap::sendFile(
 	const auto to = FileLoadTaskOptions(action);
 	auto caption = TextWithTags();
 	const auto spoiler = false;
-	const auto information = nullptr;
-	_fileLoader->addTask(std::make_unique<FileLoadTask>(
-		&session(),
-		QString(),
-		fileContent,
-		information,
-		type,
-		to,
-		caption,
-		spoiler));
+	_fileLoader->addTask(std::make_unique<FileLoadTask>(FileLoadTask::Args{
+		.session = &session(),
+		.filepath = QString(),
+		.content = fileContent,
+		.information = nullptr,
+		.videoCover = nullptr,
+		.type = type,
+		.to = to,
+		.caption = caption,
+		.spoiler = spoiler,
+		.album = nullptr,
+		.forceFile = false,
+		.idOverride = 0
+	}));
 }
 
 void ApiWrap::sendUploadedPhoto(
@@ -3653,7 +4071,7 @@ void ApiWrap::sendShortcutMessages(
 	auto ids = QVector<MTPint>();
 	auto randomIds = QVector<MTPlong>();
 	request(MTPmessages_SendQuickReplyMessages(
-		peer->input,
+		peer->input(),
 		MTP_int(id),
 		MTP_vector<MTPint>(ids),
 		MTP_vector<MTPlong>(randomIds)
@@ -3663,7 +4081,124 @@ void ApiWrap::sendShortcutMessages(
 	}).send();
 }
 
-void ApiWrap::sendMessage(MessageToSend &&message) {
+void ApiWrap::sendRichMessage(
+		not_null<HistoryItem*> item,
+		const MTPInputRichMessage &richMessage,
+		SendAction action) {
+	Expects(item->history() == action.history);
+
+	const auto history = item->history();
+	const auto peer = history->peer;
+	action.generateLocal = true;
+	sendAction(action);
+
+	const auto clearCloudDraft = action.clearDraft;
+	const auto draftTopicRootId = action.replyTo.topicRootId;
+	const auto draftMonoforumPeerId = action.replyTo.monoforumPeerId;
+	const auto randomId = base::RandomValue<uint64>();
+	auto starsPaid = std::min(
+		peer->starsPerMessageChecked(),
+		action.options.starsApproved);
+	if (starsPaid) {
+		action.options.starsApproved -= starsPaid;
+	}
+	_session->data().registerMessageRandomId(randomId, item->fullId());
+	_session->data().registerMessageSentData(
+		randomId,
+		peer->id,
+		item->originalText().text);
+
+	using Flag = MTPmessages_SendMessage::Flag;
+	auto sendFlags = MTPmessages_SendMessage::Flags(0)
+		| Flag::f_rich_message;
+	if (action.replyTo) {
+		sendFlags |= Flag::f_reply_to;
+	}
+	if (ShouldSendSilent(peer, action.options)) {
+		sendFlags |= Flag::f_silent;
+	}
+	if (clearCloudDraft) {
+		sendFlags |= Flag::f_clear_draft;
+		history->clearCloudDraft(draftTopicRootId, draftMonoforumPeerId);
+		history->startSavingCloudDraft(
+			draftTopicRootId,
+			draftMonoforumPeerId);
+	}
+	if (action.options.sendAs) {
+		sendFlags |= Flag::f_send_as;
+	}
+	if (action.options.scheduled) {
+		sendFlags |= Flag::f_schedule_date;
+		if (action.options.scheduleRepeatPeriod) {
+			sendFlags |= Flag::f_schedule_repeat_period;
+		}
+	}
+	if (action.options.shortcutId) {
+		sendFlags |= Flag::f_quick_reply_shortcut;
+	}
+	if (action.options.effectId) {
+		sendFlags |= Flag::f_effect;
+	}
+	if (action.options.suggest) {
+		sendFlags |= Flag::f_suggested_post;
+	}
+	if (starsPaid) {
+		sendFlags |= Flag::f_allow_paid_stars;
+	}
+	const auto done = [=](
+			const MTPUpdates &result,
+			const MTP::Response &response) {
+		if (clearCloudDraft) {
+			history->finishSavingCloudDraft(
+				draftTopicRootId,
+				draftMonoforumPeerId,
+				Api::UnixtimeFromMsgId(response.outerMsgId));
+		}
+	};
+	const auto fail = [=](
+			const MTP::Error &error,
+			const MTP::Response &response) {
+		sendMessageFail(error, peer, randomId, item->fullId());
+		if (clearCloudDraft) {
+			history->finishSavingCloudDraft(
+				draftTopicRootId,
+				draftMonoforumPeerId,
+				Api::UnixtimeFromMsgId(response.outerMsgId));
+		}
+	};
+	const auto mtpShortcut = Data::ShortcutIdToMTP(
+		_session,
+		action.options.shortcutId);
+	history->owner().histories().sendPreparedMessage(
+		history,
+		action.replyTo,
+		randomId,
+		Data::Histories::PrepareMessage<MTPmessages_SendMessage>(
+			MTP_flags(sendFlags),
+			peer->input(),
+			Data::Histories::ReplyToPlaceholder(),
+			MTP_string(QString()),
+			MTP_long(randomId),
+			MTPReplyMarkup(),
+			MTPVector<MTPMessageEntity>(),
+			MTP_int(action.options.scheduled),
+			MTP_int(action.options.scheduleRepeatPeriod),
+			(action.options.sendAs
+				? action.options.sendAs->input()
+				: MTP_inputPeerEmpty()),
+			mtpShortcut,
+			MTP_long(action.options.effectId),
+			MTP_long(starsPaid),
+			Api::SuggestToMTP(action.options.suggest),
+			richMessage),
+		done,
+		fail);
+	finishForwarding(action);
+}
+
+void ApiWrap::sendMessage(
+		MessageToSend &&message,
+		std::optional<MsgId> localMessageId) {
 	const auto history = message.action.history;
 	const auto peer = history->peer;
 	auto &textWithTags = message.textWithTags;
@@ -3674,6 +4209,7 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 
 	const auto clearCloudDraft = action.clearDraft;
 	const auto draftTopicRootId = action.replyTo.topicRootId;
+	const auto draftMonoforumPeerId = action.replyTo.monoforumPeerId;
 	const auto replyTo = action.replyTo.messageId
 		? peer->owner().message(action.replyTo.messageId)
 		: nullptr;
@@ -3702,17 +4238,22 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 	HistoryItem *lastMessage = nullptr;
 
 	auto &histories = history->owner().histories();
+	const auto messageLengthLimit = Data::PremiumLimits(
+		&history->session()
+	).messageLengthCurrent();
 
 	const auto exactWebPage = !message.webPage.url.isEmpty();
 	auto isFirst = true;
-	while (TextUtilities::CutPart(sending, left, MaxMessageSize)
+	while (TextUtilities::CutPart(sending, left, messageLengthLimit)
 		|| (isFirst && exactWebPage)) {
 		TextUtilities::Trim(left);
 		const auto isLast = left.empty();
 
 		auto newId = FullMsgId(
 			peer->id,
-			_session->data().nextLocalMessageId());
+			localMessageId
+				? std::exchange(localMessageId, std::nullopt).value()
+				: _session->data().nextLocalMessageId());
 		auto randomId = base::RandomValue<uint64>();
 
 		TextUtilities::Trim(sending);
@@ -3783,8 +4324,10 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 		if (clearCloudDraft) {
 			sendFlags |= MTPmessages_SendMessage::Flag::f_clear_draft;
 			mediaFlags |= MTPmessages_SendMedia::Flag::f_clear_draft;
-			history->clearCloudDraft(draftTopicRootId);
-			history->startSavingCloudDraft(draftTopicRootId);
+			history->clearCloudDraft(draftTopicRootId, draftMonoforumPeerId);
+			history->startSavingCloudDraft(
+				draftTopicRootId,
+				draftMonoforumPeerId);
 		}
 		const auto sendAs = action.options.sendAs;
 		if (sendAs) {
@@ -3795,6 +4338,10 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 			flags |= MessageFlag::IsOrWasScheduled;
 			sendFlags |= MTPmessages_SendMessage::Flag::f_schedule_date;
 			mediaFlags |= MTPmessages_SendMedia::Flag::f_schedule_date;
+			if (action.options.scheduleRepeatPeriod) {
+				sendFlags |= MTPmessages_SendMessage::Flag::f_schedule_repeat_period;
+				mediaFlags |= MTPmessages_SendMedia::Flag::f_schedule_repeat_period;
+			}
 		}
 		if (action.options.shortcutId) {
 			flags |= MessageFlag::ShortcutMessage;
@@ -3805,15 +4352,30 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 			sendFlags |= MTPmessages_SendMessage::Flag::f_effect;
 			mediaFlags |= MTPmessages_SendMedia::Flag::f_effect;
 		}
+		if (action.options.suggest) {
+			sendFlags |= MTPmessages_SendMessage::Flag::f_suggested_post;
+			mediaFlags |= MTPmessages_SendMedia::Flag::f_suggested_post;
+		}
+		const auto starsPaid = std::min(
+			peer->starsPerMessageChecked(),
+			action.options.starsApproved);
+		if (starsPaid) {
+			action.options.starsApproved -= starsPaid;
+			sendFlags |= MTPmessages_SendMessage::Flag::f_allow_paid_stars;
+			mediaFlags |= MTPmessages_SendMedia::Flag::f_allow_paid_stars;
+		}
 		lastMessage = history->addNewLocalMessage({
 			.id = newId.msg,
 			.flags = flags,
 			.from = NewMessageFromId(action),
 			.replyTo = action.replyTo,
 			.date = NewMessageDate(action.options),
+			.scheduleRepeatPeriod = action.options.scheduleRepeatPeriod,
 			.shortcutId = action.options.shortcutId,
+			.starsPaid = starsPaid,
 			.postAuthor = NewMessagePostAuthor(action),
 			.effectId = action.options.effectId,
+			.suggest = HistoryMessageSuggestInfo(action.options),
 		}, sending, media);
 		const auto done = [=](
 				const MTPUpdates &result,
@@ -3821,7 +4383,8 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 			if (clearCloudDraft) {
 				history->finishSavingCloudDraft(
 					draftTopicRootId,
-					UnixtimeFromMsgId(response.outerMsgId));
+					draftMonoforumPeerId,
+					Api::UnixtimeFromMsgId(response.outerMsgId));
 			}
 		};
 		const auto fail = [=](
@@ -3835,7 +4398,8 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 			if (clearCloudDraft) {
 				history->finishSavingCloudDraft(
 					draftTopicRootId,
-					UnixtimeFromMsgId(response.outerMsgId));
+					draftMonoforumPeerId,
+					Api::UnixtimeFromMsgId(response.outerMsgId));
 			}
 		};
 		const auto mtpShortcut = Data::ShortcutIdToMTP(
@@ -3850,7 +4414,7 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 				randomId,
 				Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 					MTP_flags(mediaFlags),
-					peer->input,
+					peer->input(),
 					Data::Histories::ReplyToPlaceholder(),
 					Data::WebPageForMTP(message.webPage, true),
 					msgText,
@@ -3858,9 +4422,12 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 					MTPReplyMarkup(),
 					sentEntities,
 					MTP_int(action.options.scheduled),
-					(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
+					MTP_int(action.options.scheduleRepeatPeriod),
+					(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
 					mtpShortcut,
-					MTP_long(action.options.effectId)
+					MTP_long(action.options.effectId),
+					MTP_long(starsPaid),
+					Api::SuggestToMTP(action.options.suggest)
 				), done, fail);
 		} else {
 			histories.sendPreparedMessage(
@@ -3869,16 +4436,20 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 				randomId,
 				Data::Histories::PrepareMessage<MTPmessages_SendMessage>(
 					MTP_flags(sendFlags),
-					peer->input,
+					peer->input(),
 					Data::Histories::ReplyToPlaceholder(),
 					msgText,
 					MTP_long(randomId),
 					MTPReplyMarkup(),
 					sentEntities,
 					MTP_int(action.options.scheduled),
-					(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
+					MTP_int(action.options.scheduleRepeatPeriod),
+					(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
 					mtpShortcut,
-					MTP_long(action.options.effectId)
+					MTP_long(action.options.effectId),
+					MTP_long(starsPaid),
+					Api::SuggestToMTP(action.options.suggest),
+					MTPInputRichMessage()
 				), done, fail);
 		}
 		isFirst = false;
@@ -3918,8 +4489,8 @@ void ApiWrap::sendBotStart(
 		info->startToken = QString();
 	}
 	request(MTPmessages_StartBot(
-		bot->inputUser,
-		chat ? chat->input : MTP_inputPeerEmpty(),
+		bot->inputUser(),
+		chat ? chat->input() : MTP_inputPeerEmpty(),
 		MTP_long(randomId),
 		MTP_string(token)
 	)).done([=](const MTPUpdates &result) {
@@ -3935,8 +4506,9 @@ void ApiWrap::sendBotStart(
 void ApiWrap::sendInlineResult(
 		not_null<UserData*> bot,
 		not_null<InlineBots::Result*> data,
-		const SendAction &action,
-		std::optional<MsgId> localMessageId) {
+		SendAction action,
+		std::optional<MsgId> localMessageId,
+		Fn<void(bool)> done) {
 	sendAction(action);
 
 	const auto history = action.history;
@@ -3950,6 +4522,7 @@ void ApiWrap::sendInlineResult(
 	const auto topicRootId = action.replyTo.messageId
 		? action.replyTo.topicRootId
 		: 0;
+	const auto monoforumPeerId = action.replyTo.monoforumPeerId;
 
 	using SendFlag = MTPmessages_SendInlineBotResult::Flag;
 	auto flags = NewMessageFlags(peer);
@@ -3974,6 +4547,13 @@ void ApiWrap::sendInlineResult(
 	if (action.options.hideViaBot) {
 		sendFlags |= SendFlag::f_hide_via;
 	}
+	const auto starsPaid = std::min(
+		peer->starsPerMessageChecked(),
+		action.options.starsApproved);
+	if (starsPaid) {
+		action.options.starsApproved -= starsPaid;
+		sendFlags |= SendFlag::f_allow_paid_stars;
+	}
 
 	const auto sendAs = action.options.sendAs;
 	if (sendAs) {
@@ -3988,14 +4568,15 @@ void ApiWrap::sendInlineResult(
 		.replyTo = action.replyTo,
 		.date = NewMessageDate(action.options),
 		.shortcutId = action.options.shortcutId,
+		.starsPaid = starsPaid,
 		.viaBotId = ((bot && !action.options.hideViaBot)
 			? peerToUser(bot->id)
 			: UserId()),
 		.postAuthor = NewMessagePostAuthor(action),
 	});
 
-	history->clearCloudDraft(topicRootId);
-	history->startSavingCloudDraft(topicRootId);
+	history->clearCloudDraft(topicRootId, monoforumPeerId);
+	history->startSavingCloudDraft(topicRootId, monoforumPeerId);
 
 	auto &histories = history->owner().histories();
 	histories.sendPreparedMessage(
@@ -4004,23 +4585,32 @@ void ApiWrap::sendInlineResult(
 		randomId,
 		Data::Histories::PrepareMessage<MTPmessages_SendInlineBotResult>(
 			MTP_flags(sendFlags),
-			peer->input,
+			peer->input(),
 			Data::Histories::ReplyToPlaceholder(),
 			MTP_long(randomId),
 			MTP_long(data->getQueryId()),
 			MTP_string(data->getId()),
 			MTP_int(action.options.scheduled),
-			(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
-			Data::ShortcutIdToMTP(_session, action.options.shortcutId)
+			(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
+			Data::ShortcutIdToMTP(_session, action.options.shortcutId),
+			MTP_long(starsPaid)
 		), [=](const MTPUpdates &result, const MTP::Response &response) {
 		history->finishSavingCloudDraft(
 			topicRootId,
-			UnixtimeFromMsgId(response.outerMsgId));
+			monoforumPeerId,
+			Api::UnixtimeFromMsgId(response.outerMsgId));
+		if (done) {
+			done(true);
+		}
 	}, [=](const MTP::Error &error, const MTP::Response &response) {
 		sendMessageFail(error, peer, randomId, newId);
 		history->finishSavingCloudDraft(
 			topicRootId,
-			UnixtimeFromMsgId(response.outerMsgId));
+			monoforumPeerId,
+			Api::UnixtimeFromMsgId(response.outerMsgId));
+		if (done) {
+			done(false);
+		}
 	});
 	finishForwarding(action);
 }
@@ -4036,7 +4626,7 @@ void ApiWrap::uploadAlbumMedia(
 	request(MTPmessages_UploadMedia(
 		MTP_flags(0),
 		MTPstring(), // business_connection_id
-		item->history()->peer->input,
+		item->history()->peer->input(),
 		media
 	)).done([=](const MTPMessageMedia &result) {
 		const auto item = _session->data().message(localId);
@@ -4073,7 +4663,8 @@ void ApiWrap::uploadAlbumMedia(
 					fields.vid(),
 					fields.vaccess_hash(),
 					fields.vfile_reference()),
-				MTP_int(data.vttl_seconds().value_or_empty()));
+				MTP_int(data.vttl_seconds().value_or_empty()),
+				MTPInputDocument()); // video
 			sendAlbumWithUploaded(item, groupId, media);
 		} break;
 
@@ -4085,16 +4676,29 @@ void ApiWrap::uploadAlbumMedia(
 				return;
 			}
 			const auto &fields = document->c_document();
+			const auto mtpCover = data.vvideo_cover();
+			const auto cover = (mtpCover && mtpCover->type() == mtpc_photo)
+				? &(mtpCover->c_photo())
+				: (const MTPDphoto*)nullptr;
 			using Flag = MTPDinputMediaDocument::Flag;
 			const auto flags = Flag()
 				| (data.vttl_seconds() ? Flag::f_ttl_seconds : Flag())
-				| (spoiler ? Flag::f_spoiler : Flag());
+				| (spoiler ? Flag::f_spoiler : Flag())
+				| (data.vvideo_timestamp() ? Flag::f_video_timestamp : Flag())
+				| (cover ? Flag::f_video_cover : Flag());
 			const auto media = MTP_inputMediaDocument(
 				MTP_flags(flags),
 				MTP_inputDocument(
 					fields.vid(),
 					fields.vaccess_hash(),
 					fields.vfile_reference()),
+				(cover
+					? MTP_inputPhoto(
+						cover->vid(),
+						cover->vaccess_hash(),
+						cover->vfile_reference())
+					: MTPInputPhoto()),
+				MTP_int(data.vvideo_timestamp().value_or_empty()),
 				MTP_int(data.vttl_seconds().value_or_empty()),
 				MTPstring()); // query
 			sendAlbumWithUploaded(item, groupId, media);
@@ -4124,6 +4728,7 @@ void ApiWrap::sendMediaWithRandomId(
 		Fn<void(bool)> done) {
 	const auto history = item->history();
 	const auto replyTo = item->replyTo();
+	const auto peer = history->peer;
 
 	auto caption = item->originalText();
 	TextUtilities::Trim(caption);
@@ -4133,6 +4738,12 @@ void ApiWrap::sendMediaWithRandomId(
 		Api::ConvertOption::SkipLocal);
 
 	const auto updateRecentStickers = Api::HasAttachedStickers(media);
+	const auto starsPaid = std::min(
+		peer->starsPerMessageChecked(),
+		options.starsApproved);
+	if (starsPaid) {
+		options.starsApproved -= starsPaid;
+	}
 
 	using Flag = MTPmessages_SendMedia::Flag;
 	const auto flags = Flag(0)
@@ -4142,13 +4753,17 @@ void ApiWrap::sendMediaWithRandomId(
 			: Flag(0))
 		| (!sentEntities.v.isEmpty() ? Flag::f_entities : Flag(0))
 		| (options.scheduled ? Flag::f_schedule_date : Flag(0))
+		| ((options.scheduled && options.scheduleRepeatPeriod)
+			? Flag::f_schedule_repeat_period
+			: Flag(0))
 		| (options.sendAs ? Flag::f_send_as : Flag(0))
 		| (options.shortcutId ? Flag::f_quick_reply_shortcut : Flag(0))
 		| (options.effectId ? Flag::f_effect : Flag(0))
-		| (options.invertCaption ? Flag::f_invert_media : Flag(0));
+		| (options.suggest ? Flag::f_suggested_post : Flag(0))
+		| (options.invertCaption ? Flag::f_invert_media : Flag(0))
+		| (starsPaid ? Flag::f_allow_paid_stars : Flag(0));
 
 	auto &histories = history->owner().histories();
-	const auto peer = history->peer;
 	const auto itemId = item->fullId();
 	histories.sendPreparedMessage(
 		history,
@@ -4156,7 +4771,7 @@ void ApiWrap::sendMediaWithRandomId(
 		randomId,
 		Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 			MTP_flags(flags),
-			peer->input,
+			peer->input(),
 			Data::Histories::ReplyToPlaceholder(),
 			(options.price
 				? MTPInputMedia(MTP_inputMediaPaidMedia(
@@ -4170,9 +4785,12 @@ void ApiWrap::sendMediaWithRandomId(
 			MTPReplyMarkup(),
 			sentEntities,
 			MTP_int(options.scheduled),
-			(options.sendAs ? options.sendAs->input : MTP_inputPeerEmpty()),
+			MTP_int(options.scheduleRepeatPeriod),
+			(options.sendAs ? options.sendAs->input() : MTP_inputPeerEmpty()),
 			Data::ShortcutIdToMTP(_session, options.shortcutId),
-			MTP_long(options.effectId)
+			MTP_long(options.effectId),
+			MTP_long(starsPaid),
+			Api::SuggestToMTP(options.suggest)
 		), [=](const MTPUpdates &result, const MTP::Response &response) {
 		if (done) done(true);
 		if (updateRecentStickers) {
@@ -4191,7 +4809,7 @@ void ApiWrap::sendMultiPaidMedia(
 	Expects(album->options.price > 0);
 
 	const auto groupId = album->groupId;
-	const auto &options = album->options;
+	auto &options = album->options;
 	const auto randomId = album->items.front().randomId;
 	auto medias = album->items | ranges::view::transform([](
 			const SendingAlbum::Item &part) {
@@ -4201,6 +4819,7 @@ void ApiWrap::sendMultiPaidMedia(
 
 	const auto history = item->history();
 	const auto replyTo = item->replyTo();
+	const auto peer = history->peer;
 
 	auto caption = item->originalText();
 	TextUtilities::Trim(caption);
@@ -4208,6 +4827,12 @@ void ApiWrap::sendMultiPaidMedia(
 		_session,
 		caption.entities,
 		Api::ConvertOption::SkipLocal);
+	const auto starsPaid = std::min(
+		peer->starsPerMessageChecked(),
+		options.starsApproved);
+	if (starsPaid) {
+		options.starsApproved -= starsPaid;
+	}
 
 	using Flag = MTPmessages_SendMedia::Flag;
 	const auto flags = Flag(0)
@@ -4217,21 +4842,26 @@ void ApiWrap::sendMultiPaidMedia(
 			: Flag(0))
 		| (!sentEntities.v.isEmpty() ? Flag::f_entities : Flag(0))
 		| (options.scheduled ? Flag::f_schedule_date : Flag(0))
+		| (options.scheduleRepeatPeriod
+			? Flag::f_schedule_repeat_period
+			: Flag(0))
 		| (options.sendAs ? Flag::f_send_as : Flag(0))
 		| (options.shortcutId ? Flag::f_quick_reply_shortcut : Flag(0))
 		| (options.effectId ? Flag::f_effect : Flag(0))
-		| (options.invertCaption ? Flag::f_invert_media : Flag(0));
+		| (options.suggest ? Flag::f_suggested_post : Flag(0))
+		| (options.invertCaption ? Flag::f_invert_media : Flag(0))
+		| (starsPaid ? Flag::f_allow_paid_stars : Flag(0));
 
 	auto &histories = history->owner().histories();
-	const auto peer = history->peer;
 	const auto itemId = item->fullId();
+	album->sent = true;
 	histories.sendPreparedMessage(
 		history,
 		replyTo,
 		randomId,
 		Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 			MTP_flags(flags),
-			peer->input,
+			peer->input(),
 			Data::Histories::ReplyToPlaceholder(),
 			MTP_inputMediaPaidMedia(
 				MTP_flags(0),
@@ -4243,9 +4873,12 @@ void ApiWrap::sendMultiPaidMedia(
 			MTPReplyMarkup(),
 			sentEntities,
 			MTP_int(options.scheduled),
-			(options.sendAs ? options.sendAs->input : MTP_inputPeerEmpty()),
+			MTP_int(options.scheduleRepeatPeriod),
+			(options.sendAs ? options.sendAs->input() : MTP_inputPeerEmpty()),
 			Data::ShortcutIdToMTP(_session, options.shortcutId),
-			MTP_long(options.effectId)
+			MTP_long(options.effectId),
+			MTP_long(starsPaid),
+			Api::SuggestToMTP(options.suggest)
 		), [=](const MTPUpdates &result, const MTP::Response &response) {
 		if (const auto album = _sendingAlbums.take(groupId)) {
 			const auto copy = (*album)->items;
@@ -4296,6 +4929,9 @@ void ApiWrap::sendAlbumWithCancelled(
 }
 
 void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
+	if (album->sent) {
+		return;
+	}
 	const auto groupId = album->groupId;
 	if (album->items.empty()) {
 		_sendingAlbums.remove(groupId);
@@ -4320,6 +4956,7 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 		return;
 	} else if (medias.size() < 2) {
 		const auto &single = medias.front().data();
+		album->sent = true;
 		sendMediaWithRandomId(
 			sample,
 			single.vmedia(),
@@ -4331,6 +4968,12 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 	const auto history = sample->history();
 	const auto replyTo = sample->replyTo();
 	const auto sendAs = album->options.sendAs;
+	const auto starsPaid = std::min(
+		history->peer->starsPerMessageChecked() * int(medias.size()),
+		album->options.starsApproved);
+	if (starsPaid) {
+		album->options.starsApproved -= starsPaid;
+	}
 	using Flag = MTPmessages_SendMultiMedia::Flag;
 	const auto flags = Flag(0)
 		| (replyTo ? Flag::f_reply_to : Flag(0))
@@ -4338,27 +4981,34 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 			? Flag::f_silent
 			: Flag(0))
 		| (album->options.scheduled ? Flag::f_schedule_date : Flag(0))
+		//| (album->options.scheduleRepeatPeriod
+		//	? Flag::f_schedule_repeat_period
+		//	: Flag(0))
 		| (sendAs ? Flag::f_send_as : Flag(0))
 		| (album->options.shortcutId
 			? Flag::f_quick_reply_shortcut
 			: Flag(0))
 		| (album->options.effectId ? Flag::f_effect : Flag(0))
-		| (album->options.invertCaption ? Flag::f_invert_media : Flag(0));
+		| (album->options.invertCaption ? Flag::f_invert_media : Flag(0))
+		| (starsPaid ? Flag::f_allow_paid_stars : Flag(0));
 	auto &histories = history->owner().histories();
 	const auto peer = history->peer;
+	album->sent = true;
 	histories.sendPreparedMessage(
 		history,
 		replyTo,
 		uint64(0), // randomId
 		Data::Histories::PrepareMessage<MTPmessages_SendMultiMedia>(
 			MTP_flags(flags),
-			peer->input,
+			peer->input(),
 			Data::Histories::ReplyToPlaceholder(),
 			MTP_vector<MTPInputSingleMedia>(medias),
 			MTP_int(album->options.scheduled),
-			(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
+			//MTP_int(album->options.scheduleRepeatPeriod),
+			(sendAs ? sendAs->input() : MTP_inputPeerEmpty()),
 			Data::ShortcutIdToMTP(_session, album->options.shortcutId),
-			MTP_long(album->options.effectId)
+			MTP_long(album->options.effectId),
+			MTP_long(starsPaid)
 		), [=](const MTPUpdates &result, const MTP::Response &response) {
 		_sendingAlbums.remove(groupId);
 	}, [=](const MTP::Error &error, const MTP::Response &response) {
@@ -4392,7 +5042,7 @@ rpl::producer<bool> ApiWrap::contactSignupSilent() const {
 	return _contactSignupSilent
 		? _contactSignupSilentChanges.events_starting_with_copy(
 			*_contactSignupSilent)
-		: (_contactSignupSilentChanges.events() | rpl::type_erased());
+		: (_contactSignupSilentChanges.events() | rpl::type_erased);
 }
 
 std::optional<bool> ApiWrap::contactSignupSilentCurrent() const {
@@ -4437,7 +5087,7 @@ void ApiWrap::requestBotCommonGroups(
 	};
 	const auto limit = 100;
 	request(MTPmessages_GetCommonChats(
-		bot->inputUser,
+		bot->inputUser(),
 		MTP_long(0), // max_id
 		MTP_int(limit)
 	)).done([=](const MTPmessages_Chats &result) {
@@ -4536,6 +5186,10 @@ Api::GlobalPrivacy &ApiWrap::globalPrivacy() {
 	return *_globalPrivacy;
 }
 
+Api::ReactionsNotifySettings &ApiWrap::reactionsNotifySettings() {
+	return *_reactionsNotifySettings;
+}
+
 Api::UserPrivacy &ApiWrap::userPrivacy() {
 	return *_userPrivacy;
 }
@@ -4552,6 +5206,10 @@ Api::ViewsManager &ApiWrap::views() {
 	return *_views;
 }
 
+Api::ReadMetrics &ApiWrap::readMetrics() {
+	return *_readMetrics;
+}
+
 Api::ConfirmPhone &ApiWrap::confirmPhone() {
 	return *_confirmPhone;
 }
@@ -4564,6 +5222,10 @@ Api::Polls &ApiWrap::polls() {
 	return *_polls;
 }
 
+Api::TodoLists &ApiWrap::todoLists() {
+	return *_todoLists;
+}
+
 Api::ChatParticipants &ApiWrap::chatParticipants() {
 	return *_chatParticipants;
 }
@@ -4576,6 +5238,10 @@ Api::Ringtones &ApiWrap::ringtones() {
 	return *_ringtones;
 }
 
+Api::ComposeWithAi &ApiWrap::composeWithAi() {
+	return *_composeWithAi;
+}
+
 Api::Transcribes &ApiWrap::transcribes() {
 	return *_transcribes;
 }
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index 7259c410d34e84..a1609c7a625cff 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -14,6 +14,7 @@ For license and copyright information please follow this link:
 #include "data/data_messages.h"
 
 class TaskQueue;
+class HistoryItem;
 struct MessageGroupId;
 struct SendingAlbum;
 enum class SendMediaType;
@@ -25,10 +26,11 @@ class Session;
 } // namespace Main
 
 namespace Data {
+struct ReactionId;
 struct UpdatedFileReferences;
 class WallPaper;
 struct ResolvedForwardDraft;
-enum class DefaultNotify;
+enum class DefaultNotify : uint8_t;
 enum class StickersType : uchar;
 class Forum;
 class ForumTopic;
@@ -59,6 +61,7 @@ class Show;
 namespace Api {
 
 struct SearchResult;
+struct GlobalMediaResult;
 
 class Updates;
 class Authorizations;
@@ -68,6 +71,7 @@ class CloudPassword;
 class SelfDestruct;
 class SensitiveContent;
 class GlobalPrivacy;
+class ReactionsNotifySettings;
 class UserPrivacy;
 class InviteLinks;
 class ChatLinks;
@@ -76,11 +80,14 @@ class ConfirmPhone;
 class PeerPhoto;
 class PeerColors;
 class Polls;
+class TodoLists;
 class ChatParticipants;
 class UnreadThings;
 class Ringtones;
+class ComposeWithAi;
 class Transcribes;
 class Premium;
+class ReadMetrics;
 class Usernames;
 class Websites;
 
@@ -127,6 +134,8 @@ QString RequestKey(Types &&...values) {
 	return result;
 }
 
+[[nodiscard]] TimeId UnixtimeFromMsgId(mtpMsgId msgId);
+
 } // namespace Api
 
 class ApiWrap final : public MTP::Sender {
@@ -164,7 +173,9 @@ class ApiWrap final : public MTP::Sender {
 	void requestMessageData(PeerData *peer, MsgId msgId, Fn<void()> done);
 	QString exportDirectMessageLink(
 		not_null<HistoryItem*> item,
-		bool inRepliesContext);
+		bool inRepliesContext,
+		bool forceNonPublicLink = false,
+		std::optional<TimeId> videoTimestamp = {});
 	QString exportDirectStoryLink(not_null<Data::Story*> item);
 
 	void requestContacts();
@@ -197,7 +208,6 @@ class ApiWrap final : public MTP::Sender {
 	void requestChangelog(
 		const QString &sinceVersion,
 		Fn<void(const MTPUpdates &result)> callback);
-	void refreshTopPromotion();
 	void requestDeepLinkInfo(
 		const QString &path,
 		Fn<void(TextWithEntities message, bool updateRequired)> callback);
@@ -229,6 +239,19 @@ class ApiWrap final : public MTP::Sender {
 	void deleteAllFromParticipant(
 		not_null<ChannelData*> channel,
 		not_null<PeerData*> from);
+	void deleteAllReactionsFromParticipant(
+		not_null<PeerData*> peer,
+		not_null<PeerData*> participant,
+		MsgId originMsgId,
+		const Data::ReactionId &originReaction);
+	void deleteParticipantReaction(
+		not_null<PeerData*> peer,
+		MsgId msgId,
+		not_null<PeerData*> participant,
+		const Data::ReactionId &reaction);
+	void deleteSublistHistory(
+		not_null<ChannelData*> parentChat,
+		not_null<PeerData*> sublistPeer);
 
 	void requestWebPageDelayed(not_null<WebPageData*> page);
 	void clearWebPageRequest(not_null<WebPageData*> page);
@@ -284,9 +307,16 @@ class ApiWrap final : public MTP::Sender {
 	void requestSharedMedia(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		Storage::SharedMediaType type,
 		MsgId messageId,
 		SliceType slice);
+	mtpRequestId requestGlobalMedia(
+		Storage::SharedMediaType type,
+		const QString &query,
+		int32 offsetRate,
+		Data::MessagePosition offsetPosition,
+		Fn<void(Api::GlobalMediaResult)> done);
 
 	void readFeaturedSetDelayed(uint64 setId);
 
@@ -297,7 +327,7 @@ class ApiWrap final : public MTP::Sender {
 	void finishForwarding(const SendAction &action);
 	void forwardMessages(
 		Data::ResolvedForwardDraft &&draft,
-		const SendAction &action,
+		SendAction action,
 		FnMut<void()> &&successCallback = nullptr);
 	void shareContact(
 		const QString &phone,
@@ -317,11 +347,11 @@ class ApiWrap final : public MTP::Sender {
 		QByteArray result,
 		VoiceWaveform waveform,
 		crl::time duration,
+		bool video,
 		const SendAction &action);
 	void sendFiles(
 		Ui::PreparedList &&list,
 		SendMediaType type,
-		TextWithTags &&caption,
 		std::shared_ptr<SendingAlbum> album,
 		const SendAction &action);
 	void sendFile(
@@ -349,7 +379,13 @@ class ApiWrap final : public MTP::Sender {
 	void sendShortcutMessages(
 		not_null<PeerData*> peer,
 		BusinessShortcutId id);
-	void sendMessage(MessageToSend &&message);
+	void sendRichMessage(
+		not_null<HistoryItem*> item,
+		const MTPInputRichMessage &richMessage,
+		SendAction action);
+	void sendMessage(
+		MessageToSend &&message,
+		std::optional<MsgId> localMessageId = std::nullopt);
 	void sendBotStart(
 		std::shared_ptr<Ui::Show> show,
 		not_null<UserData*> bot,
@@ -358,8 +394,9 @@ class ApiWrap final : public MTP::Sender {
 	void sendInlineResult(
 		not_null<UserData*> bot,
 		not_null<InlineBots::Result*> data,
-		const SendAction &action,
-		std::optional<MsgId> localMessageId);
+		SendAction action,
+		std::optional<MsgId> localMessageId,
+		Fn<void(bool)> done = nullptr);
 	void sendMessageFail(
 		const MTP::Error &error,
 		not_null<PeerData*> peer,
@@ -392,16 +429,20 @@ class ApiWrap final : public MTP::Sender {
 	[[nodiscard]] Api::SelfDestruct &selfDestruct();
 	[[nodiscard]] Api::SensitiveContent &sensitiveContent();
 	[[nodiscard]] Api::GlobalPrivacy &globalPrivacy();
+	[[nodiscard]] Api::ReactionsNotifySettings &reactionsNotifySettings();
 	[[nodiscard]] Api::UserPrivacy &userPrivacy();
 	[[nodiscard]] Api::InviteLinks &inviteLinks();
 	[[nodiscard]] Api::ChatLinks &chatLinks();
 	[[nodiscard]] Api::ViewsManager &views();
+	[[nodiscard]] Api::ReadMetrics &readMetrics();
 	[[nodiscard]] Api::ConfirmPhone &confirmPhone();
 	[[nodiscard]] Api::PeerPhoto &peerPhoto();
 	[[nodiscard]] Api::Polls &polls();
+	[[nodiscard]] Api::TodoLists &todoLists();
 	[[nodiscard]] Api::ChatParticipants &chatParticipants();
 	[[nodiscard]] Api::UnreadThings &unreadThings();
 	[[nodiscard]] Api::Ringtones &ringtones();
+	[[nodiscard]] Api::ComposeWithAi &composeWithAi();
 	[[nodiscard]] Api::Transcribes &transcribes();
 	[[nodiscard]] Api::Premium &premium();
 	[[nodiscard]] Api::Usernames &usernames();
@@ -412,6 +453,12 @@ class ApiWrap final : public MTP::Sender {
 
 	static constexpr auto kJoinErrorDuration = 5 * crl::time(1000);
 
+	static void ProcessRecentSelfForwards(
+		not_null<Main::Session*> session,
+		const MTPUpdates &updates,
+		PeerId targetPeerId,
+		PeerId fromPeerId);
+
 private:
 	struct MessageDataRequest {
 		using Callbacks = std::vector<Fn<void()>>;
@@ -492,20 +539,27 @@ class ApiWrap final : public MTP::Sender {
 	void resolveJumpToHistoryDate(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		const QDate &date,
 		Fn<void(not_null<PeerData*>, MsgId)> callback);
 	template <typename Callback>
 	void requestMessageAfterDate(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		const QDate &date,
 		Callback &&callback);
 
 	void sharedMediaDone(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		SharedMediaType type,
 		Api::SearchResult &&parsed);
+	void globalMediaDone(
+		SharedMediaType type,
+		FullMsgId messageId,
+		Api::GlobalMediaResult &&parsed);
 
 	void sendSharedContact(
 		const QString &phone,
@@ -525,6 +579,9 @@ class ApiWrap final : public MTP::Sender {
 	void deleteAllFromParticipantSend(
 		not_null<ChannelData*> channel,
 		not_null<PeerData*> from);
+	void deleteSublistHistorySend(
+		not_null<ChannelData*> parentChat,
+		not_null<PeerData*> sublistPeer);
 
 	void uploadAlbumMedia(
 		not_null<HistoryItem*> item,
@@ -554,9 +611,6 @@ class ApiWrap final : public MTP::Sender {
 		not_null<SendingAlbum*> album,
 		Fn<void(bool)> done = nullptr);
 
-	void getTopPromotionDelayed(TimeId now, TimeId next);
-	void topPromotionDone(const MTPhelp_PromoData &proxy);
-
 	void sendNotifySettingsUpdates();
 
 	template <typename Request>
@@ -648,6 +702,7 @@ class ApiWrap final : public MTP::Sender {
 	struct SharedMediaRequest {
 		not_null<PeerData*> peer;
 		MsgId topicRootId = 0;
+		PeerId monoforumPeerId = 0;
 		SharedMediaType mediaType = {};
 		MsgId aroundId = 0;
 		SliceType sliceType = {};
@@ -669,6 +724,17 @@ class ApiWrap final : public MTP::Sender {
 	};
 	base::flat_set<HistoryRequest> _historyRequests;
 
+	struct GlobalMediaRequest {
+		SharedMediaType mediaType = {};
+		FullMsgId aroundId;
+		SliceType sliceType = {};
+
+		friend inline auto operator<=>(
+			const GlobalMediaRequest&,
+			const GlobalMediaRequest&) = default;
+	};
+	base::flat_set<GlobalMediaRequest> _globalMediaRequests;
+
 	std::unique_ptr<DialogsLoadState> _dialogsLoadState;
 	TimeId _dialogsLoadTill = 0;
 	rpl::variable<bool> _dialogsLoadMayBlockByDate = false;
@@ -683,11 +749,6 @@ class ApiWrap final : public MTP::Sender {
 	std::unique_ptr<TaskQueue> _fileLoader;
 	base::flat_map<uint64, std::shared_ptr<SendingAlbum>> _sendingAlbums;
 
-	mtpRequestId _topPromotionRequestId = 0;
-	std::pair<QString, uint32> _topPromotionKey;
-	TimeId _topPromotionNextRequestTime = TimeId(0);
-	base::Timer _topPromotionTimer;
-
 	base::flat_set<not_null<const Data::ForumTopic*>> _updateNotifyTopics;
 	base::flat_set<not_null<const PeerData*>> _updateNotifyPeers;
 	base::flat_set<Data::DefaultNotify> _updateNotifyDefaults;
@@ -729,16 +790,20 @@ class ApiWrap final : public MTP::Sender {
 	const std::unique_ptr<Api::SelfDestruct> _selfDestruct;
 	const std::unique_ptr<Api::SensitiveContent> _sensitiveContent;
 	const std::unique_ptr<Api::GlobalPrivacy> _globalPrivacy;
+	const std::unique_ptr<Api::ReactionsNotifySettings> _reactionsNotifySettings;
 	const std::unique_ptr<Api::UserPrivacy> _userPrivacy;
 	const std::unique_ptr<Api::InviteLinks> _inviteLinks;
 	const std::unique_ptr<Api::ChatLinks> _chatLinks;
 	const std::unique_ptr<Api::ViewsManager> _views;
+	const std::unique_ptr<Api::ReadMetrics> _readMetrics;
 	const std::unique_ptr<Api::ConfirmPhone> _confirmPhone;
 	const std::unique_ptr<Api::PeerPhoto> _peerPhoto;
 	const std::unique_ptr<Api::Polls> _polls;
+	const std::unique_ptr<Api::TodoLists> _todoLists;
 	const std::unique_ptr<Api::ChatParticipants> _chatParticipants;
 	const std::unique_ptr<Api::UnreadThings> _unreadThings;
 	const std::unique_ptr<Api::Ringtones> _ringtones;
+	const std::unique_ptr<Api::ComposeWithAi> _composeWithAi;
 	const std::unique_ptr<Api::Transcribes> _transcribes;
 	const std::unique_ptr<Api::Premium> _premium;
 	const std::unique_ptr<Api::Usernames> _usernames;
diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp
index 75674299f8d81c..9bf8912af4fe2b 100644
--- a/Telegram/SourceFiles/boxes/about_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_box.cpp
@@ -7,20 +7,27 @@ For license and copyright information please follow this link:
 */
 #include "boxes/about_box.h"
 
-#include "lang/lang_keys.h"
-#include "mainwidget.h"
-#include "mainwindow.h"
-#include "ui/boxes/confirm_box.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/labels.h"
-#include "ui/text/text_utilities.h"
 #include "base/platform/base_platform_info.h"
+#include "core/application.h"
 #include "core/file_utilities.h"
-#include "core/click_handler_types.h"
 #include "core/update_checker.h"
-#include "core/application.h"
+#include "core/version.h"
+#include "lang/lang_keys.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/text/text_utilities.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/wrap/vertical_layout.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
+#include "styles/style_channel_earn.h"
+#include "styles/style_chat.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
@@ -30,105 +37,99 @@ namespace {
 rpl::producer<TextWithEntities> Text1() {
 	return tr::lng_about_text1(
 		lt_api_link,
-		tr::lng_about_text1_api(
-		) | Ui::Text::ToLink("https://core.telegram.org/api"),
-		Ui::Text::WithEntities);
+		tr::lng_about_text1_api(tr::url(u"https://core.telegram.org/api"_q)),
+		tr::marked);
 }
 
 rpl::producer<TextWithEntities> Text2() {
 	return tr::lng_about_text2(
 		lt_gpl_link,
-		rpl::single(Ui::Text::Link(
+		rpl::single(tr::link(
 			"GNU GPL",
 			"https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE")),
 		lt_github_link,
-		rpl::single(Ui::Text::Link(
+		rpl::single(tr::link(
 			"GitHub",
 			"https://github.com/telegramdesktop/tdesktop")),
-		Ui::Text::WithEntities);
+		tr::marked);
 }
 
 rpl::producer<TextWithEntities> Text3() {
 	return tr::lng_about_text3(
 		lt_faq_link,
-		tr::lng_about_text3_faq() | Ui::Text::ToLink(telegramFaqLink()),
-		Ui::Text::WithEntities);
+		tr::lng_about_text3_faq(tr::url(telegramFaqLink())),
+		tr::marked);
 }
 
 } // namespace
 
-AboutBox::AboutBox(QWidget *parent)
-: _version(this, tr::lng_about_version(tr::now, lt_version, currentVersionText()), st::aboutVersionLink)
-, _text1(this, Text1(), st::aboutLabel)
-, _text2(this, Text2(), st::aboutLabel)
-, _text3(this, Text3(), st::aboutLabel) {
-}
-
-void AboutBox::prepare() {
-	setTitle(rpl::single(u"Telegram Desktop"_q));
+void AboutBox(not_null<Ui::GenericBox*> box) {
+	box->setTitle(u"Telegram Desktop"_q);
 
-	addButton(tr::lng_close(), [this] { closeBox(); });
+	auto layout = box->verticalLayout();
 
-	_text1->setLinksTrusted();
-	_text2->setLinksTrusted();
-	_text3->setLinksTrusted();
+	const auto version = layout->add(
+		object_ptr<Ui::LinkButton>(
+			box,
+			tr::lng_about_version(
+				tr::now,
+				lt_version,
+				currentVersionText()),
+			st::aboutVersionLink),
+		QMargins(
+			st::boxRowPadding.left(),
+			-st::lineWidth * 3,
+			st::boxRowPadding.right(),
+			st::boxRowPadding.bottom()));
+	version->setClickedCallback([=] {
+		if (cRealAlphaVersion()) {
+			auto url = u"https://tdesktop.com/"_q;
+			if (Platform::IsWindows32Bit()) {
+				url += u"win/%1.zip"_q;
+			} else if (Platform::IsWindows64Bit()) {
+				url += u"win64/%1.zip"_q;
+			} else if (Platform::IsWindowsARM64()) {
+				url += u"winarm/%1.zip"_q;
+			} else if (Platform::IsMac()) {
+				url += u"mac/%1.zip"_q;
+			} else if (Platform::IsLinux()) {
+				url += u"linux/%1.tar.xz"_q;
+			} else {
+				Unexpected("Platform value.");
+			}
+			url = url.arg(u"talpha%1_%2"_q
+				.arg(cRealAlphaVersion())
+				.arg(Core::countAlphaVersionSignature(cRealAlphaVersion())));
 
-	_version->setClickedCallback([this] { showVersionHistory(); });
-
-	setDimensions(st::aboutWidth, st::aboutTextTop + _text1->height() + st::aboutSkip + _text2->height() + st::aboutSkip + _text3->height());
-}
-
-void AboutBox::resizeEvent(QResizeEvent *e) {
-	BoxContent::resizeEvent(e);
-
-	const auto available = width()
-		- st::boxPadding.left()
-		- st::boxPadding.right();
-	_version->moveToLeft(st::boxPadding.left(), st::aboutVersionTop);
-	_text1->resizeToWidth(available);
-	_text1->moveToLeft(st::boxPadding.left(), st::aboutTextTop);
-	_text2->resizeToWidth(available);
-	_text2->moveToLeft(st::boxPadding.left(), _text1->y() + _text1->height() + st::aboutSkip);
-	_text3->resizeToWidth(available);
-	_text3->moveToLeft(st::boxPadding.left(), _text2->y() + _text2->height() + st::aboutSkip);
-}
+			QGuiApplication::clipboard()->setText(url);
 
-void AboutBox::showVersionHistory() {
-	if (cRealAlphaVersion()) {
-		auto url = u"https://tdesktop.com/"_q;
-		if (Platform::IsWindows32Bit()) {
-			url += u"win/%1.zip"_q;
-		} else if (Platform::IsWindows64Bit()) {
-			url += u"win64/%1.zip"_q;
-		} else if (Platform::IsWindowsARM64()) {
-			url += u"winarm/%1.zip"_q;
-		} else if (Platform::IsMac()) {
-			url += u"mac/%1.zip"_q;
-		} else if (Platform::IsLinux()) {
-			url += u"linux/%1.tar.xz"_q;
+			box->getDelegate()->show(
+				Ui::MakeInformBox(
+					"The link to the current private alpha "
+					"version of Telegram Desktop was copied "
+					"to the clipboard."));
 		} else {
-			Unexpected("Platform value.");
+			File::OpenUrl(Core::App().changelogLink());
 		}
-		url = url.arg(u"talpha%1_%2"_q.arg(cRealAlphaVersion()).arg(Core::countAlphaVersionSignature(cRealAlphaVersion())));
+	});
 
-		QGuiApplication::clipboard()->setText(url);
+	Ui::AddSkip(layout, st::aboutTopSkip);
 
-		getDelegate()->show(
-			Ui::MakeInformBox(
-				"The link to the current private alpha "
-				"version of Telegram Desktop was copied to the clipboard."),
-			Ui::LayerOption::CloseOther);
-	} else {
-		File::OpenUrl(Core::App().changelogLink());
-	}
-}
+	const auto addText = [&](rpl::producer<TextWithEntities> text) {
+		const auto label = layout->add(
+			object_ptr<Ui::FlatLabel>(box, std::move(text), st::aboutLabel),
+			st::boxRowPadding);
+		label->setLinksTrusted();
+		Ui::AddSkip(layout, st::aboutSkip);
+	};
 
-void AboutBox::keyPressEvent(QKeyEvent *e) {
-	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
-		closeBox();
-	} else {
-		BoxContent::keyPressEvent(e);
-	}
+	addText(Text1());
+	addText(Text2());
+	addText(Text3());
+
+	box->addButton(tr::lng_close(), [=] { box->closeBox(); });
+
+	box->setWidth(st::aboutWidth);
 }
 
 QString telegramFaqLink() {
@@ -160,5 +161,154 @@ QString currentVersionText() {
 	} else if (Platform::IsWindowsARM64()) {
 		result += " arm64";
 	}
+#ifdef _DEBUG
+	result += " DEBUG";
+#endif
 	return result;
 }
+
+void ArchiveHintBox(
+		not_null<Ui::GenericBox*> box,
+		bool unarchiveOnNewMessage,
+		Fn<void()> onUnarchive) {
+	box->setNoContentMargin(true);
+
+	const auto content = box->verticalLayout().get();
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto &icon = st::dialogsArchiveUserpic;
+		const auto rect = Rect(icon.size() * 2);
+		auto owned = object_ptr<Ui::RpWidget>(content);
+		owned->resize(rect.size());
+		owned->setNaturalWidth(rect.width());
+		const auto widget = box->addRow(std::move(owned), style::al_top);
+		widget->paintRequest(
+		) | rpl::on_next([=] {
+			auto p = Painter(widget);
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::activeButtonBg);
+			p.drawEllipse(rect);
+			icon.paintInCenter(p, rect);
+		}, widget->lifetime());
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_archive_hint_title(),
+			st::boxTitle),
+		style::al_top);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto label = box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				content,
+				(unarchiveOnNewMessage
+						? tr::lng_archive_hint_about_unmuted
+						: tr::lng_archive_hint_about)(
+					lt_link,
+					tr::lng_archive_hint_about_link(
+						lt_emoji,
+						rpl::single(
+							Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+						tr::rich
+					) | rpl::map([](TextWithEntities text) {
+						return tr::link(std::move(text), 1);
+					}),
+					tr::rich),
+				st::channelEarnHistoryRecipientLabel));
+		label->resizeToWidth(box->width()
+			- rect::m::sum::h(st::boxRowPadding));
+		label->setLink(
+			1,
+			std::make_shared<GenericClickHandler>([=](ClickContext context) {
+				if (context.button == Qt::LeftButton) {
+					onUnarchive();
+				}
+			}));
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto padding = QMargins(
+			st::settingsButton.padding.left(),
+			st::boxRowPadding.top(),
+			st::boxRowPadding.right(),
+			st::boxRowPadding.bottom());
+		const auto addEntry = [&](
+				rpl::producer<QString> title,
+				rpl::producer<QString> about,
+				const style::icon &icon) {
+			const auto top = content->add(
+				object_ptr<Ui::FlatLabel>(
+					content,
+					std::move(title),
+					st::channelEarnSemiboldLabel),
+				padding);
+			Ui::AddSkip(content, st::channelEarnHistoryThreeSkip);
+			content->add(
+				object_ptr<Ui::FlatLabel>(
+					content,
+					std::move(about),
+					st::channelEarnHistoryRecipientLabel),
+				padding);
+			const auto left = Ui::CreateChild<Ui::RpWidget>(
+				box->verticalLayout().get());
+			left->paintRequest(
+			) | rpl::on_next([=] {
+				auto p = Painter(left);
+				icon.paint(p, 0, 0, left->width());
+			}, left->lifetime());
+			left->resize(icon.size());
+			top->geometryValue(
+			) | rpl::on_next([=](const QRect &g) {
+				left->moveToLeft(
+					(g.left() - left->width()) / 2,
+					g.top() + st::channelEarnHistoryThreeSkip);
+			}, left->lifetime());
+		};
+		addEntry(
+			tr::lng_archive_hint_section_1(),
+			tr::lng_archive_hint_section_1_info(),
+			st::menuIconArchive);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+		addEntry(
+			tr::lng_archive_hint_section_2(),
+			tr::lng_archive_hint_section_2_info(),
+			st::menuIconStealth);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+		addEntry(
+			tr::lng_archive_hint_section_3(),
+			tr::lng_archive_hint_section_3_info(),
+			st::menuIconStoriesSavedSection);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto &st = st::premiumPreviewDoubledLimitsBox;
+		box->setStyle(st);
+		auto button = object_ptr<Ui::RoundButton>(
+			box,
+			tr::lng_archive_hint_button(),
+			st::defaultActiveButton);
+		button->resizeToWidth(box->width()
+			- st.buttonPadding.left()
+			- st.buttonPadding.left());
+		button->setClickedCallback([=] { box->closeBox(); });
+		box->addButton(std::move(button));
+	}
+}
+
diff --git a/Telegram/SourceFiles/boxes/about_box.h b/Telegram/SourceFiles/boxes/about_box.h
index e03b9970eca45f..60953aafd0f237 100644
--- a/Telegram/SourceFiles/boxes/about_box.h
+++ b/Telegram/SourceFiles/boxes/about_box.h
@@ -7,32 +7,13 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "ui/layers/box_content.h"
+#include "ui/layers/generic_box.h"
 
-namespace Ui {
-class LinkButton;
-class FlatLabel;
-} // namespace Ui
-
-class AboutBox : public Ui::BoxContent {
-public:
-	AboutBox(QWidget*);
-
-protected:
-	void prepare() override;
-
-	void resizeEvent(QResizeEvent *e) override;
-	void keyPressEvent(QKeyEvent *e) override;
-
-private:
-	void showVersionHistory();
-
-	object_ptr<Ui::LinkButton> _version;
-	object_ptr<Ui::FlatLabel> _text1;
-	object_ptr<Ui::FlatLabel> _text2;
-	object_ptr<Ui::FlatLabel> _text3;
-
-};
+void AboutBox(not_null<Ui::GenericBox*> box);
+void ArchiveHintBox(
+	not_null<Ui::GenericBox*> box,
+	bool unarchiveOnNewMessage,
+	Fn<void()> onUnarchive);
 
 QString telegramFaqLink();
 QString currentVersionText();
diff --git a/Telegram/SourceFiles/boxes/about_sponsored_box.cpp b/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
index 8c932df6af7ef2..e4af2b8a1acef9 100644
--- a/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "core/file_utilities.h"
 #include "lang/lang_keys.h"
 #include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "styles/style_boxes.h"
@@ -18,7 +19,7 @@ For license and copyright information please follow this link:
 namespace Ui {
 namespace {
 
-constexpr auto kUrl = "https://promote.telegram.org"_cs;
+constexpr auto kUrl = "https://ads.telegram.org"_cs;
 
 } // namespace
 
@@ -37,11 +38,10 @@ void AboutSponsoredBox(not_null<Ui::GenericBox*> box) {
 			st);
 		button->setBrushOverride(Qt::NoBrush);
 		button->setPenOverride(QPen(st::historyLinkInFg));
-		button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 		rpl::combine(
 			row->sizeValue(),
 			button->sizeValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QSize &rowSize,
 				const QSize &buttonSize) {
 			button->moveToLeft(
@@ -54,8 +54,16 @@ void AboutSponsoredBox(not_null<Ui::GenericBox*> box) {
 	};
 
 	const auto &stLabel = st::aboutLabel;
-	const auto info1 = box->addRow(object_ptr<FlatLabel>(box, stLabel));
-	info1->setText(tr::lng_sponsored_info_description1(tr::now));
+	auto text1 = tr::lng_sponsored_info_description1_linked(
+		lt_link,
+		rpl::combine(
+			tr::lng_sponsored_info_description1_link(),
+			tr::lng_sponsored_info_description1_url()
+		) | rpl::map([](const QString &text, const QString &url) {
+			return tr::link(text, url);
+		}),
+		tr::rich);
+	box->addRow(object_ptr<FlatLabel>(box, std::move(text1), stLabel));
 
 	box->addSkip(st::sponsoredUrlButtonSkip);
 	addUrl();
diff --git a/Telegram/SourceFiles/boxes/abstract_box.h b/Telegram/SourceFiles/boxes/abstract_box.h
index d48e93108f39a6..119875a2935159 100644
--- a/Telegram/SourceFiles/boxes/abstract_box.h
+++ b/Telegram/SourceFiles/boxes/abstract_box.h
@@ -37,11 +37,11 @@ void showBox(
 } // namespace internal
 
 template <typename BoxType>
-QPointer<BoxType> show(
+base::weak_qptr<BoxType> show(
 		object_ptr<BoxType> content,
 		Ui::LayerOptions options = Ui::LayerOption::CloseOther,
 		anim::type animated = anim::type::normal) {
-	auto result = QPointer<BoxType>(content.data());
+	auto result = base::weak_qptr<BoxType>(content.data());
 	internal::showBox(std::move(content), options, animated);
 	return result;
 }
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index 0aba9b6a5ee8df..815e2bbea923c7 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -42,6 +42,7 @@ For license and copyright information please follow this link:
 #include "api/api_peer_photo.h"
 #include "api/api_self_destruct.h"
 #include "main/main_session.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
@@ -111,6 +112,10 @@ void ChatCreateDone(
 					show,
 					chat,
 					CollectForbiddenUsers(&chat->session(), result));
+				chat->owner().addRecentJoinChat({
+					.fromPeerId = chat->id,
+					.joinedPeerId = chat->id,
+				});
 			}
 		};
 	if (!success) {
@@ -122,22 +127,12 @@ void ChatCreateDone(
 void MustBePublicDestroy(not_null<ChannelData*> channel) {
 	const auto session = &channel->session();
 	session->api().request(MTPchannels_DeleteChannel(
-		channel->inputChannel
+		channel->inputChannel()
 	)).done([=](const MTPUpdates &result) {
 		session->api().applyUpdates(result);
 	}).send();
 }
 
-void MustBePublicFailed(
-		not_null<Window::SessionNavigation*> navigation,
-		not_null<ChannelData*> channel) {
-	const auto text = channel->isMegagroup()
-		? "Can't create a public group :("
-		: "Can't create a public channel :(";
-	navigation->showToast(text);
-	MustBePublicDestroy(channel);
-}
-
 [[nodiscard]] Fn<void(not_null<PeerData*>)> WrapPeerDoneFromChannelDone(
 		Fn<void(not_null<ChannelData*>)> channelDone) {
 	if (!channelDone) {
@@ -156,7 +151,7 @@ void MustBePublicFailed(
 TextWithEntities PeerFloodErrorText(
 		not_null<Main::Session*> session,
 		PeerFloodType type) {
-	const auto link = Ui::Text::Link(
+	const auto link = tr::link(
 		tr::lng_cant_more_info(tr::now),
 		session->createInternalLinkFull(u"spambot"_q));
 	return ((type == PeerFloodType::InviteGroup)
@@ -165,7 +160,7 @@ TextWithEntities PeerFloodErrorText(
 			tr::now,
 			lt_more_info,
 			link,
-			Ui::Text::WithEntities);
+			tr::marked);
 }
 
 void ShowAddParticipantsError(
@@ -194,16 +189,16 @@ void ShowAddParticipantsError(
 			&& channel->canAddAdmins()) {
 			const auto makeAdmin = [=](Fn<void()> close) {
 				const auto user = forbidden.users.front();
-				const auto weak = std::make_shared<QPointer<EditAdminBox>>();
+				const auto weak = std::make_shared<base::weak_qptr<EditAdminBox>>();
 				const auto done = [=](auto&&...) {
-					if (const auto strong = weak->data()) {
+					if (const auto strong = weak->get()) {
 						strong->uiShow()->showToast(
 							tr::lng_box_done(tr::now));
 						strong->closeBox();
 					}
 				};
 				const auto fail = [=] {
-					if (const auto strong = weak->data()) {
+					if (const auto strong = weak->get()) {
 						strong->closeBox();
 					}
 				};
@@ -241,7 +236,7 @@ void ShowAddParticipantsError(
 			? PeerFloodType::InviteGroup
 			: PeerFloodType::InviteChannel;
 		const auto text = PeerFloodErrorText(&chat->session(), type);
-		Ui::show(Ui::MakeInformBox(text), Ui::LayerOption::KeepOther);
+		show->showBox(Ui::MakeInformBox(text), Ui::LayerOption::KeepOther);
 		return;
 	} else if (error == u"USER_PRIVACY_RESTRICTED"_q) {
 		ChatInviteForbidden(show, chat, forbidden);
@@ -262,10 +257,20 @@ void ShowAddParticipantsError(
 			return tr::lng_bot_already_in_group(tr::now);
 		} else if (error == u"BOT_GROUPS_BLOCKED"_q) {
 			return tr::lng_error_cant_add_bot(tr::now);
+		} else if (error == u"YOU_BLOCKED_USER"_q) {
+			return tr::lng_error_you_blocked_user(tr::now);
+		} else if (error == u"CHAT_ADMIN_INVITE_REQUIRED"_q) {
+			return tr::lng_error_add_admin_not_member(tr::now);
+		} else if (error == u"USER_ADMIN_INVALID"_q) {
+			return tr::lng_error_user_admin_invalid(tr::now);
+		} else if (error == u"BOTS_TOO_MUCH"_q) {
+			return (chat->isChannel()
+				? tr::lng_error_channel_bots_too_much
+				: tr::lng_error_group_bots_too_much)(tr::now);
 		} else if (error == u"ADMINS_TOO_MUCH"_q) {
-			return ((chat->isChat() || chat->isMegagroup())
-				? tr::lng_error_admin_limit
-				: tr::lng_error_admin_limit_channel)(tr::now);
+			return (chat->isBroadcast()
+				? tr::lng_error_admin_limit_channel
+				: tr::lng_error_admin_limit)(tr::now);
 		}
 		return tr::lng_failed_add_participant(tr::now);
 	}();
@@ -314,9 +319,9 @@ void AddContactBox::prepare() {
 
 	const auto submitted = [=] { submit(); };
 	_first->submits(
-	) | rpl::start_with_next(submitted, _first->lifetime());
+	) | rpl::on_next(submitted, _first->lifetime());
 	_last->submits(
-	) | rpl::start_with_next(submitted, _last->lifetime());
+	) | rpl::on_next(submitted, _last->lifetime());
 	connect(_phone, &Ui::PhoneInput::submitted, [=] { submit(); });
 
 	setDimensions(
@@ -440,7 +445,7 @@ void AddContactBox::save() {
 		firstName = lastName;
 		lastName = QString();
 	}
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto session = _session;
 	_sentName = firstName;
 	_contactId = base::RandomValue<uint64>();
@@ -448,10 +453,12 @@ void AddContactBox::save() {
 		MTP_vector<MTPInputContact>(
 			1,
 			MTP_inputPhoneContact(
+				MTP_flags(0),
 				MTP_long(_contactId),
 				MTP_string(phone),
 				MTP_string(firstName),
-				MTP_string(lastName)))
+				MTP_string(lastName),
+				MTPTextWithEntities())) // note
 	)).done(crl::guard(weak, [=](
 			const MTPcontacts_ImportedContacts &result) {
 		const auto &data = result.data();
@@ -553,7 +560,7 @@ void GroupInfoBox::prepare() {
 		&_navigation->parentController()->window(),
 		Ui::UserpicButton::Role::ChoosePhoto,
 		st::defaultUserpicButton,
-		(_type == Type::Forum));
+		(_type == Type::Forum) ? Ui::PeerUserpicShape::Forum : Ui::PeerUserpicShape::Auto);
 	_photo->showCustomOnChosen();
 	_title.create(
 		this,
@@ -565,7 +572,8 @@ void GroupInfoBox::prepare() {
 	_title->setMaxLength(Ui::EditPeer::kMaxGroupChannelTitle);
 	_title->setInstantReplaces(Ui::InstantReplaces::Default());
 	_title->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+		Core::App().settings().replaceEmojiValue(),
+		Core::App().settings().systemTextReplaceValue());
 	Ui::Emoji::SuggestionsController::Init(
 		getDelegate()->outerContainer(),
 		_title,
@@ -581,18 +589,19 @@ void GroupInfoBox::prepare() {
 		_description->setMaxLength(Ui::EditPeer::kMaxChannelDescription);
 		_description->setInstantReplaces(Ui::InstantReplaces::Default());
 		_description->setInstantReplacesEnabled(
-			Core::App().settings().replaceEmojiValue());
+			Core::App().settings().replaceEmojiValue(),
+			Core::App().settings().systemTextReplaceValue());
 		_description->setSubmitSettings(
 			Core::App().settings().sendSubmitWay());
 
 		_description->heightChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			descriptionResized();
 		}, _description->lifetime());
 		_description->submits(
-		) | rpl::start_with_next([=] { submit(); }, _description->lifetime());
+		) | rpl::on_next([=] { submit(); }, _description->lifetime());
 		_description->cancelled(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			closeBox();
 		}, _description->lifetime());
 
@@ -602,7 +611,7 @@ void GroupInfoBox::prepare() {
 			&_navigation->session());
 	}
 	_title->submits(
-	) | rpl::start_with_next([=] { submitName(); }, _title->lifetime());
+	) | rpl::on_next([=] { submitName(); }, _title->lifetime());
 
 	addButton(
 		((_type != Type::Group || _canAddBot)
@@ -710,7 +719,7 @@ TimeId GroupInfoBox::ttlPeriod() const {
 }
 
 void GroupInfoBox::createGroup(
-		QPointer<Ui::BoxContent> selectUsersBox,
+		base::weak_qptr<Ui::BoxContent> selectUsersBox,
 		const QString &title,
 		const std::vector<not_null<PeerData*>> &users) {
 	if (_creationRequestId) {
@@ -723,7 +732,7 @@ void GroupInfoBox::createGroup(
 		auto user = peer->asUser();
 		Assert(user != nullptr);
 		if (!user->isSelf()) {
-			inputs.push_back(user->inputUser);
+			inputs.push_back(user->inputUser());
 		}
 	}
 	_creationRequestId = _api.request(MTPmessages_CreateChat(
@@ -742,25 +751,25 @@ void GroupInfoBox::createGroup(
 	}).fail([=](const MTP::Error &error) {
 		const auto &type = error.type();
 		_creationRequestId = 0;
-		const auto controller = _navigation->parentController();
+		const auto show = uiShow();
 		if (type == u"NO_CHAT_TITLE"_q) {
-			const auto weak = Ui::MakeWeak(this);
-			if (const auto strong = selectUsersBox.data()) {
+			const auto weak = base::make_weak(this);
+			if (const auto strong = selectUsersBox.get()) {
 				strong->closeBox();
 			}
 			if (weak) {
 				_title->showError();
 			}
 		} else if (type == u"USERS_TOO_FEW"_q) {
-			controller->show(
+			show->showBox(
 				Ui::MakeInformBox(tr::lng_cant_invite_privacy()));
 		} else if (type == u"PEER_FLOOD"_q) {
-			controller->show(Ui::MakeInformBox(
+			show->showBox(Ui::MakeInformBox(
 				PeerFloodErrorText(
 					&_navigation->session(),
 					PeerFloodType::InviteGroup)));
 		} else if (type == u"USER_RESTRICTED"_q) {
-			controller->show(Ui::MakeInformBox(tr::lng_cant_do_this()));
+			show->showBox(Ui::MakeInformBox(tr::lng_cant_do_this()));
 		}
 	}).send();
 }
@@ -786,10 +795,10 @@ void GroupInfoBox::submit() {
 	} else if (_canAddBot) {
 		createGroup(nullptr, title, { not_null<PeerData*>(_canAddBot) });
 	} else {
-		auto initBox = [title, weak = Ui::MakeWeak(this)](
+		auto initBox = [title, weak = base::make_weak(this)](
 				not_null<PeerListBox*> box) {
 			auto create = [box, title, weak] {
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					strong->createGroup(
 						box.get(),
 						title,
@@ -799,7 +808,7 @@ void GroupInfoBox::submit() {
 			box->addButton(tr::lng_create_group_create(), std::move(create));
 			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 		};
-		Ui::show(
+		uiShow()->showBox(
 			Box<PeerListBox>(
 				std::make_unique<AddParticipantsBoxController>(
 					&_navigation->session()),
@@ -877,18 +886,14 @@ void GroupInfoBox::createChannel(
 	}).fail([this](const MTP::Error &error) {
 		const auto &type = error.type();
 		_creationRequestId = 0;
-		const auto controller = _navigation->parentController();
+		const auto show = uiShow();
 		if (type == u"NO_CHAT_TITLE"_q) {
 			_title->setFocus();
 			_title->showError();
 		} else if (type == u"USER_RESTRICTED"_q) {
-			controller->show(
-				Ui::MakeInformBox(tr::lng_cant_do_this()),
-				Ui::LayerOption::CloseOther);
+			show->showBox(Ui::MakeInformBox(tr::lng_cant_do_this()));
 		} else if (type == u"CHANNELS_TOO_MUCH"_q) {
-			controller->show(
-				Box(ChannelsLimitBox, &controller->session()),
-				Ui::LayerOption::CloseOther); // TODO
+			show->showBox(Box(ChannelsLimitBox, &_navigation->session()));
 		}
 	}).send();
 }
@@ -908,7 +913,7 @@ void GroupInfoBox::checkInviteLink() {
 		_createdChannel->session().changes().peerUpdates(
 			_createdChannel,
 			Data::PeerUpdate::Flag::FullInfo
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			checkInviteLink();
 		}, lifetime());
 	}
@@ -921,13 +926,14 @@ void GroupInfoBox::channelReady() {
 		closeBox();
 		callback(argument);
 	} else {
-		_navigation->parentController()->show(
+		uiShow()->showBox(
 			Box<SetupChannelBox>(
 				_navigation,
 				_createdChannel,
 				_mustBePublic,
 				_done),
-			Ui::LayerOption::CloseOther);
+			Ui::LayerOption::KeepOther);
+		closeBox();
 	}
 }
 
@@ -1022,7 +1028,7 @@ void SetupChannelBox::prepare() {
 	setMouseTracking(true);
 
 	_checkRequestId = _api.request(MTPchannels_CheckUsername(
-		_channel->inputChannel,
+		_channel->inputChannel(),
 		MTP_string("preston")
 	)).fail([=](const MTP::Error &error) {
 		_checkRequestId = 0;
@@ -1051,11 +1057,11 @@ void SetupChannelBox::prepare() {
 	_channel->session().changes().peerUpdates(
 		_channel,
 		Data::PeerUpdate::Flag::InviteLinks
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rtlupdate(_invitationLink);
 	}, lifetime());
 
-	boxClosing() | rpl::start_with_next([=] {
+	boxClosing() | rpl::on_next([=] {
 		if (!_mustBePublic) {
 			AddParticipantsBoxController::Start(_navigation, _channel);
 		}
@@ -1243,7 +1249,11 @@ void SetupChannelBox::mousePressEvent(QMouseEvent *e) {
 		return;
 	} else if (!_channel->inviteLink().isEmpty()) {
 		QGuiApplication::clipboard()->setText(_channel->inviteLink());
-		showToast(tr::lng_create_channel_link_copied(tr::now));
+		showToast({
+			.text = { tr::lng_create_channel_link_copied(tr::now) },
+			.iconLottie = u"toast/voip_invite"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	} else if (_channel->isFullLoaded() && !_creatingInviteLink) {
 		_creatingInviteLink = true;
 		_channel->session().api().inviteLinks().create({ _channel });
@@ -1269,7 +1279,7 @@ void SetupChannelBox::save() {
 	const auto saveUsername = [&](const QString &link) {
 		_sentUsername = link;
 		_saveRequestId = _api.request(MTPchannels_UpdateUsername(
-			_channel->inputChannel,
+			_channel->inputChannel(),
 			MTP_string(_sentUsername)
 		)).done([=] {
 			const auto done = _done;
@@ -1353,7 +1363,7 @@ void SetupChannelBox::check() {
 	if (link.size() >= Ui::EditPeer::kMinUsernameLength) {
 		_checkUsername = link;
 		_checkRequestId = _api.request(MTPchannels_CheckUsername(
-			_channel->inputChannel,
+			_channel->inputChannel(),
 			MTP_string(link)
 		)).done([=](const MTPBool &result) {
 			_checkRequestId = 0;
@@ -1381,7 +1391,7 @@ void SetupChannelBox::privacyChanged(Privacy value) {
 				_privacyGroup->setValue(Privacy::Public);
 				check();
 			});
-			Ui::show(
+			uiShow()->showBox(
 				Box(PublicLinksLimitBox, _navigation, callback),
 				Ui::LayerOption::KeepOther);
 			return;
@@ -1473,17 +1483,18 @@ void SetupChannelBox::showRevokePublicLinkBoxForEdit() {
 	const auto mustBePublic = _mustBePublic;
 	const auto done = _done;
 	const auto navigation = _navigation;
+	const auto show = uiShow();
 	const auto revoked = std::make_shared<bool>(false);
 	const auto callback = [=] {
 		*revoked = true;
-		navigation->parentController()->show(
+		show->showBox(
 			Box<SetupChannelBox>(navigation, channel, mustBePublic, done));
 	};
-	const auto revoker = navigation->parentController()->show(
+	const auto revoker = show->show(
 		Box(PublicLinksLimitBox, navigation, callback));
 	const auto session = &navigation->session();
 	revoker->boxClosing(
-	) | rpl::start_with_next(crl::guard(session, [=] {
+	) | rpl::on_next(crl::guard(session, [=] {
 		base::call_delayed(200, session, [=] {
 			if (*revoked) {
 				return;
@@ -1495,7 +1506,10 @@ void SetupChannelBox::showRevokePublicLinkBoxForEdit() {
 }
 
 void SetupChannelBox::mustBePublicFailed() {
-	MustBePublicFailed(_navigation, _channel);
+	showToast(_channel->isMegagroup()
+		? "Can't create a public group :("
+		: "Can't create a public channel :(");
+	MustBePublicDestroy(_channel);
 }
 
 void SetupChannelBox::firstCheckFail(UsernameResult result) {
@@ -1517,7 +1531,10 @@ void SetupChannelBox::firstCheckFail(UsernameResult result) {
 	}
 }
 
-EditNameBox::EditNameBox(QWidget*, not_null<UserData*> user)
+EditNameBox::EditNameBox(
+	QWidget*,
+	not_null<UserData*> user,
+	Focus focus)
 : _user(user)
 , _api(&_user->session().mtp())
 , _first(
@@ -1530,7 +1547,8 @@ EditNameBox::EditNameBox(QWidget*, not_null<UserData*> user)
 	st::defaultInputField,
 	tr::lng_signup_lastname(),
 	_user->lastName)
-, _invertOrder(langFirstNameGoesSecond()) {
+, _invertOrder(langFirstNameGoesSecond())
+, _focus(focus) {
 }
 
 void EditNameBox::prepare() {
@@ -1551,25 +1569,26 @@ void EditNameBox::prepare() {
 	_last->setMaxLength(Ui::EditPeer::kMaxUserFirstLastName);
 
 	_first->submits(
-	) | rpl::start_with_next([=] { submit(); }, _first->lifetime());
+	) | rpl::on_next([=] { submit(); }, _first->lifetime());
 	_last->submits(
-	) | rpl::start_with_next([=] { submit(); }, _last->lifetime());
-
-	_first->customTab(true);
-	_last->customTab(true);
+	) | rpl::on_next([=] { submit(); }, _last->lifetime());
 
 	_first->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=](not_null<bool*> handled) {
 		_last->setFocus();
+		*handled = true;
 	}, _first->lifetime());
 	_last->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=](not_null<bool*> handled) {
 		_first->setFocus();
+		*handled = true;
 	}, _last->lifetime());
 }
 
 void EditNameBox::setInnerFocus() {
-	(_invertOrder ? _last : _first)->setFocusFast();
+	const auto focusLast = (_focus == Focus::LastName)
+		|| (_focus == Focus::FirstName && _invertOrder);
+	(focusLast ? _last : _first)->setFocusFast();
 }
 
 void EditNameBox::submit() {
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.h b/Telegram/SourceFiles/boxes/add_contact_box.h
index 9bc7de65209c72..cb61dbdfd5390c 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.h
+++ b/Telegram/SourceFiles/boxes/add_contact_box.h
@@ -129,7 +129,7 @@ class GroupInfoBox : public Ui::BoxContent {
 private:
 	void createChannel(const QString &title, const QString &description);
 	void createGroup(
-		QPointer<Ui::BoxContent> selectUsersBox,
+		base::weak_qptr<Ui::BoxContent> selectUsersBox,
 		const QString &title,
 		const std::vector<not_null<PeerData*>> &users);
 	void submitName();
@@ -246,7 +246,14 @@ class SetupChannelBox final : public Ui::BoxContent {
 
 class EditNameBox : public Ui::BoxContent {
 public:
-	EditNameBox(QWidget*, not_null<UserData*> user);
+	enum class Focus {
+		FirstName,
+		LastName,
+	};
+	EditNameBox(
+		QWidget*,
+		not_null<UserData*> user,
+		Focus focus = Focus::FirstName);
 
 protected:
 	void setInnerFocus() override;
@@ -266,6 +273,7 @@ class EditNameBox : public Ui::BoxContent {
 	object_ptr<Ui::InputField> _last;
 
 	bool _invertOrder = false;
+	Focus _focus = Focus::FirstName;
 
 	mtpRequestId _requestId = 0;
 	QString _sentName;
diff --git a/Telegram/SourceFiles/boxes/auto_download_box.cpp b/Telegram/SourceFiles/boxes/auto_download_box.cpp
index 3617a9eb65eb58..db507d366eb7c1 100644
--- a/Telegram/SourceFiles/boxes/auto_download_box.cpp
+++ b/Telegram/SourceFiles/boxes/auto_download_box.cpp
@@ -7,9 +7,13 @@ For license and copyright information please follow this link:
 */
 #include "boxes/auto_download_box.h"
 
+#include "boxes/peer_list_box.h"
+#include "boxes/peer_list_controllers.h"
+#include "history/history.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_auto_download.h"
 #include "ui/vertical_list.h"
@@ -31,6 +35,103 @@ constexpr auto kDefaultDownloadLimit = 10 * kMegabyte;
 constexpr auto kDefaultAutoPlayLimit = 50 * kMegabyte;
 
 using Type = Data::AutoDownload::Type;
+using Source = Data::AutoDownload::Source;
+using Override = Data::AutoDownload::Override;
+
+[[nodiscard]] bool PeerMatchesSource(
+		not_null<PeerData*> peer,
+		Source source) {
+	if (peer->isSelf() || peer->isServiceUser() || peer->isRepliesChat()) {
+		return false;
+	}
+	switch (source) {
+	case Source::User: return peer->isUser();
+	case Source::Group: return peer->isChat() || peer->isMegagroup();
+	case Source::Channel:
+		return peer->isChannel() && !peer->isMegagroup();
+	}
+	Unexpected("Source in PeerMatchesSource.");
+}
+
+struct PeerBuckets {
+	base::flat_set<PeerId> always;
+	base::flat_set<PeerId> never;
+};
+
+[[nodiscard]] PeerBuckets BucketsForSource(
+		const Data::AutoDownload::Full &settings,
+		not_null<Data::Session*> owner,
+		Source source) {
+	auto result = PeerBuckets();
+	settings.enumeratePeerOverrides([&](PeerId peerId, Override value) {
+		const auto peer = owner->peer(peerId);
+		if (!PeerMatchesSource(peer, source)) {
+			return;
+		} else if (value == Override::ForceAllow) {
+			result.always.emplace(peerId);
+		} else if (value == Override::ForceDeny) {
+			result.never.emplace(peerId);
+		}
+	});
+	return result;
+}
+
+class ExceptionsBoxController final : public ChatsListBoxController {
+public:
+	ExceptionsBoxController(
+		not_null<Main::Session*> session,
+		Source source,
+		base::flat_set<PeerId> selected);
+
+	Main::Session &session() const override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+
+protected:
+	void prepareViewHook() override;
+	std::unique_ptr<Row> createRow(not_null<History*> history) override;
+
+private:
+	const not_null<Main::Session*> _session;
+	const Source _source;
+	base::flat_set<PeerId> _selected;
+
+};
+
+ExceptionsBoxController::ExceptionsBoxController(
+	not_null<Main::Session*> session,
+	Source source,
+	base::flat_set<PeerId> selected)
+: ChatsListBoxController(session)
+, _session(session)
+, _source(source)
+, _selected(std::move(selected)) {
+}
+
+Main::Session &ExceptionsBoxController::session() const {
+	return *_session;
+}
+
+void ExceptionsBoxController::rowClicked(not_null<PeerListRow*> row) {
+	delegate()->peerListSetRowChecked(row, !row->checked());
+}
+
+void ExceptionsBoxController::prepareViewHook() {
+	auto &owner = _session->data();
+	auto peers = std::vector<not_null<PeerData*>>();
+	peers.reserve(_selected.size());
+	for (const auto &peerId : _selected) {
+		peers.push_back(owner.peer(peerId));
+	}
+	delegate()->peerListAddSelectedPeers(peers);
+}
+
+auto ExceptionsBoxController::createRow(not_null<History*> history)
+-> std::unique_ptr<Row> {
+	const auto peer = history->peer;
+	return PeerMatchesSource(peer, _source)
+		? std::make_unique<Row>(history)
+		: nullptr;
+}
 
 not_null<int64*> AddSizeLimitSlider(
 		not_null<Ui::VerticalLayout*> container,
@@ -116,7 +217,7 @@ void AutoDownloadBox::setupContent() {
 		))->toggleOn(
 			rpl::single(value > 0)
 		)->toggledChanges(
-		) | rpl::start_with_next([=](bool enabled) {
+		) | rpl::on_next([=](bool enabled) {
 			(*values)[type] = enabled ? 1 : 0;
 		}, content->lifetime());
 		values->emplace(type, value);
@@ -157,6 +258,106 @@ void AutoDownloadBox::setupContent() {
 			: *downloadLimit;
 	};
 
+	const auto staged = content->lifetime().make_state<PeerBuckets>(
+		BucketsForSource(*settings, &_session->data(), _source));
+
+	AddSkip(content);
+	AddDivider(content);
+	AddSkip(content);
+	AddSubsectionTitle(content, tr::lng_media_auto_exceptions());
+
+	const auto countText = [source = _source](int count) {
+		switch (source) {
+		case Source::User:
+			return tr::lng_media_auto_exceptions_users(
+				tr::now,
+				lt_count,
+				count);
+		case Source::Group:
+			return tr::lng_media_auto_exceptions_groups(
+				tr::now,
+				lt_count,
+				count);
+		case Source::Channel:
+			return tr::lng_media_auto_exceptions_channels(
+				tr::now,
+				lt_count,
+				count);
+		}
+		Unexpected("Source in countText.");
+	};
+	const auto addText = [source = _source] {
+		switch (source) {
+		case Source::User:
+			return tr::lng_media_auto_exceptions_add_users(tr::now);
+		case Source::Group:
+			return tr::lng_media_auto_exceptions_add_groups(tr::now);
+		case Source::Channel:
+			return tr::lng_media_auto_exceptions_add_channels(tr::now);
+		}
+		Unexpected("Source in addText.");
+	};
+
+	const auto updates = content->lifetime().make_state<rpl::event_stream<>>();
+	const auto addExceptionButton = [&](
+			Override kind,
+			rpl::producer<QString> text,
+			rpl::producer<QString> title) {
+		auto label = updates->events_starting_with(
+			{}
+		) | rpl::map([=] {
+			const auto count = int((kind == Override::ForceAllow)
+				? staged->always.size()
+				: staged->never.size());
+			return count ? countText(count) : addText();
+		});
+		const auto button = AddButtonWithLabel(
+			content,
+			std::move(text),
+			std::move(label),
+			st::settingsButtonNoIcon);
+		button->setClickedCallback([=, title = std::move(title)]() mutable {
+			const auto &selected = (kind == Override::ForceAllow)
+				? staged->always
+				: staged->never;
+			auto controller = std::make_unique<ExceptionsBoxController>(
+				_session,
+				_source,
+				selected);
+			auto initBox = [=, this, title = std::move(title)](
+					not_null<PeerListBox*> box) mutable {
+				box->setTitle(std::move(title));
+				box->addButton(tr::lng_settings_save(), crl::guard(this, [=] {
+					auto &dest = (kind == Override::ForceAllow)
+						? staged->always
+						: staged->never;
+					auto &other = (kind == Override::ForceAllow)
+						? staged->never
+						: staged->always;
+					dest.clear();
+					for (const auto &peer : box->collectSelectedRows()) {
+						dest.emplace(peer->id);
+						other.remove(peer->id);
+					}
+					updates->fire({});
+					box->closeBox();
+				}));
+				box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+			};
+			getDelegate()->show(Box<PeerListBox>(
+				std::move(controller),
+				std::move(initBox)));
+		});
+	};
+	addExceptionButton(
+		Override::ForceAllow,
+		tr::lng_media_auto_always(),
+		tr::lng_media_auto_always_title());
+	addExceptionButton(
+		Override::ForceDeny,
+		tr::lng_media_auto_never(),
+		tr::lng_media_auto_never_title());
+
 	addButton(tr::lng_connection_save(), [=] {
 		auto &&values = ranges::views::concat(
 			*downloadValues,
@@ -190,6 +391,25 @@ void AutoDownloadBox::setupContent() {
 			return (now > 0) && (now != limitByType(type));
 		});
 
+		const auto current = BucketsForSource(
+			*settings,
+			&_session->data(),
+			_source);
+		const auto exceptionsChanged = (current.always != staged->always)
+			|| (current.never != staged->never);
+		const auto exceptionsAllowMore = ranges::any_of(
+			staged->always,
+			[&](PeerId id) { return !current.always.contains(id); }
+		) || ranges::any_of(
+			current.never,
+			[&](PeerId id) { return !staged->never.contains(id); });
+		const auto exceptionsAllowLess = ranges::any_of(
+			staged->never,
+			[&](PeerId id) { return !current.never.contains(id); }
+		) || ranges::any_of(
+			current.always,
+			[&](PeerId id) { return !staged->always.contains(id); });
+
 		if (changed) {
 			for (const auto &[type, enabled] : values) {
 				const auto value = enabled ? limitByType(type) : 0;
@@ -207,16 +427,35 @@ void AutoDownloadBox::setupContent() {
 				}
 			}
 		}
-		if (changed || hiddenChanged) {
+		if (exceptionsChanged) {
+			for (const auto &peerId : current.always) {
+				if (!staged->always.contains(peerId)) {
+					settings->setPeerOverride(peerId, Override::Default);
+				}
+			}
+			for (const auto &peerId : current.never) {
+				if (!staged->never.contains(peerId)) {
+					settings->setPeerOverride(peerId, Override::Default);
+				}
+			}
+			for (const auto &peerId : staged->always) {
+				settings->setPeerOverride(peerId, Override::ForceAllow);
+			}
+			for (const auto &peerId : staged->never) {
+				settings->setPeerOverride(peerId, Override::ForceDeny);
+			}
+		}
+		if (changed || hiddenChanged || exceptionsChanged) {
 			_session->saveSettingsDelayed();
 		}
-		if (allowMoreTypes.contains(Type::Photo)) {
+		if (allowMoreTypes.contains(Type::Photo) || exceptionsAllowMore) {
 			_session->data().photoLoadSettingsChanged();
 		}
-		if (ranges::any_of(allowMoreTypes, _1 != Type::Photo)) {
+		if (ranges::any_of(allowMoreTypes, _1 != Type::Photo)
+			|| exceptionsAllowMore) {
 			_session->data().documentLoadSettingsChanged();
 		}
-		if (less) {
+		if (less || exceptionsAllowLess) {
 			_session->data().checkPlayingAnimations();
 		}
 		closeBox();
diff --git a/Telegram/SourceFiles/boxes/auto_lock_box.cpp b/Telegram/SourceFiles/boxes/auto_lock_box.cpp
index cc7cdb427151cc..eb3d44bb85f3ce 100644
--- a/Telegram/SourceFiles/boxes/auto_lock_box.cpp
+++ b/Telegram/SourceFiles/boxes/auto_lock_box.cpp
@@ -102,7 +102,7 @@ void AutoLockBox::prepare() {
 	};
 
 	timeInput->focuses(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		group->setValue(kCustom);
 	}, lifetime());
 
@@ -119,7 +119,7 @@ void AutoLockBox::prepare() {
 			[=] { return group->current() == kCustom; }
 		),
 		timeInput->submitRequests()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto result = collect()) {
 			durationChanged(result);
 		} else {
diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
index 59729b7feddd2e..40cb7c2f858d3e 100644
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -211,12 +211,12 @@ void BackgroundBox::prepare() {
 	setInnerTopSkip(st::lineWidth);
 
 	_inner->chooseEvents(
-	) | rpl::start_with_next([=](const Data::WallPaper &paper) {
+	) | rpl::on_next([=](const Data::WallPaper &paper) {
 		chosen(paper);
 	}, _inner->lifetime());
 
 	_inner->removeRequests(
-	) | rpl::start_with_next([=](const Data::WallPaper &paper) {
+	) | rpl::on_next([=](const Data::WallPaper &paper) {
 		removePaper(paper);
 	}, _inner->lifetime());
 }
@@ -337,7 +337,7 @@ void BackgroundBox::resetForPeer() {
 	const auto api = &_controller->session().api();
 	api->request(MTPmessages_SetChatWallPaper(
 		MTP_flags(0),
-		_forPeer->input,
+		_forPeer->input(),
 		MTPInputWallPaper(),
 		MTPWallPaperSettings(),
 		MTPint()
@@ -345,7 +345,7 @@ void BackgroundBox::resetForPeer() {
 		api->applyUpdates(result);
 	}).send();
 
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	_forPeer->setWallPaper({});
 	if (weak) {
 		_controller->finishChatThemeEdit(_forPeer);
@@ -358,7 +358,7 @@ bool BackgroundBox::forChannel() const {
 
 void BackgroundBox::removePaper(const Data::WallPaper &paper) {
 	const auto session = &_controller->session();
-	const auto remove = [=, weak = Ui::MakeWeak(this)](Fn<void()> &&close) {
+	const auto remove = [=, weak = base::make_weak(this)](Fn<void()> &&close) {
 		close();
 		if (weak) {
 			weak->_inner->removePaper(paper);
@@ -396,30 +396,30 @@ BackgroundBox::Inner::Inner(
 			+ st::backgroundPadding));
 
 	Window::Theme::IsNightModeValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updatePapers();
 	}, lifetime());
 	requestPapers();
 
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_check->invalidateCache();
 	}, lifetime());
 
 	if (forChannel()) {
 		_session->data().cloudThemes().chatThemesUpdated(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updatePapers();
 		}, lifetime());
 	} else {
 		using Update = Window::Theme::BackgroundUpdate;
 		Window::Theme::Background()->updates(
-		) | rpl::start_with_next([=](const Update &update) {
+		) | rpl::on_next([=](const Update &update) {
 			if (update.type == Update::Type::New) {
 				sortPapers();
 				requestPapers();
@@ -451,12 +451,12 @@ auto BackgroundBox::Inner::resolveResetCustomPaper() const
 		return {};
 	}
 	const auto nonCustom = Window::Theme::Background()->paper();
-	const auto themeEmoji = _forPeer->themeEmoji();
-	if (forChannel() || themeEmoji.isEmpty()) {
+	const auto themeToken = _forPeer->themeToken();
+	if (forChannel() || themeToken.isEmpty()) {
 		return nonCustom;
 	}
 	const auto &themes = _forPeer->owner().cloudThemes();
-	const auto theme = themes.themeForEmoji(themeEmoji);
+	const auto theme = themes.themeForToken(themeToken);
 	if (!theme) {
 		return nonCustom;
 	}
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 828b2d095090ed..f6646b3ebf3711 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -41,12 +41,13 @@ For license and copyright information please follow this link:
 #include "data/data_file_origin.h"
 #include "data/data_peer_values.h"
 #include "data/data_premium_limits.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "storage/file_upload.h"
 #include "storage/localimageloader.h"
 #include "window/window_session_controller.h"
 #include "window/themes/window_themes_embedded.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 
@@ -161,7 +162,7 @@ constexpr auto kMaxWallPaperSlugLength = 255;
 		return paper;
 	}
 	const auto &themes = session->data().cloudThemes();
-	if (const auto theme = themes.themeForEmoji(paper.emojiId())) {
+	if (const auto theme = themes.themeForToken(paper.emojiId())) {
 		using Type = Data::CloudThemeType;
 		const auto type = dark ? Type::Dark : Type::Light;
 		const auto i = theme->settings.find(type);
@@ -225,28 +226,28 @@ BackgroundPreviewBox::BackgroundPreviewBox(
 	}
 	generateBackground();
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	_appNightMode.changes(
-	) | rpl::start_with_next([=](bool night) {
+	) | rpl::on_next([=](bool night) {
 		_boxDarkMode = night;
 		update();
 	}, lifetime());
 
 	_boxDarkMode.changes(
-	) | rpl::start_with_next([=](bool dark) {
+	) | rpl::on_next([=](bool dark) {
 		applyDarkMode(dark);
 	}, lifetime());
 
 	const auto prepare = [=](bool dark, auto pointer) {
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		crl::async([=] {
 			auto result = std::make_unique<style::palette>();
 			Window::Theme::PreparePaletteCallback(dark, {})(*result);
 			crl::on_main([=, result = std::move(result)]() mutable {
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					strong->*pointer = std::move(result);
 					strong->paletteReady();
 				}
@@ -373,7 +374,7 @@ void BackgroundPreviewBox::createDimmingSlider(bool dark) {
 	_dimmingContent->resize(inner->size());
 
 	_dimmingContent->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(_dimmingContent);
 		const auto palette = (dark ? _darkPalette : _lightPalette).get();
 		p.fillRect(clip, equals ? st::boxBg : palette->boxBg());
@@ -386,13 +387,13 @@ void BackgroundPreviewBox::createDimmingSlider(bool dark) {
 			heightValue(),
 			_dimmingWrap->heightValue(),
 			rpl::mappers::_1 - rpl::mappers::_2
-		) | rpl::start_with_next([=](int top) {
+		) | rpl::on_next([=](int top) {
 			_dimmingWrap->move(0, top);
 		}, _dimmingWrap->lifetime());
 
 		_dimmingWrap->toggle(dark, anim::type::instant);
 		_dimmingHeight = _dimmingWrap->heightValue();
-		_dimmingHeight.changes() | rpl::start_with_next([=] {
+		_dimmingHeight.changes() | rpl::on_next([=] {
 			update();
 		}, _dimmingWrap->lifetime());
 	}
@@ -554,7 +555,7 @@ void BackgroundPreviewBox::recreateBlurCheckbox() {
 		sizeValue(),
 		_blur->sizeValue(),
 		_dimmingHeight.value()
-	) | rpl::start_with_next([=](QSize outer, QSize inner, int dimming) {
+	) | rpl::on_next([=](QSize outer, QSize inner, int dimming) {
 		const auto bottom = st::historyPaddingBottom;
 		_blur->move(
 			(outer.width() - inner.width()) / 2,
@@ -562,7 +563,7 @@ void BackgroundPreviewBox::recreateBlurCheckbox() {
 	}, _blur->lifetime());
 
 	_blur->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		checkBlurAnimationStart();
 		update();
 	}, _blur->lifetime());
@@ -607,7 +608,7 @@ void BackgroundPreviewBox::uploadForPeer(bool both) {
 		document->size);
 
 	session->uploader().documentProgress(
-	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+	) | rpl::on_next([=](const FullMsgId &fullId) {
 		if (fullId != _uploadId) {
 			return;
 		}
@@ -619,7 +620,7 @@ void BackgroundPreviewBox::uploadForPeer(bool both) {
 	}, _uploadLifetime);
 
 	session->uploader().documentReady(
-	) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
+	) | rpl::on_next([=](const Storage::UploadedMedia &data) {
 		if (data.fullId != _uploadId) {
 			return;
 		}
@@ -668,7 +669,7 @@ void BackgroundPreviewBox::setExistingForPeer(
 			| (_fromMessageId ? Flag() : Flag::f_wallpaper)
 			| (both ? Flag::f_for_both : Flag())
 			| Flag::f_settings),
-		_forPeer->input,
+		_forPeer->input(),
 		paper.mtpInput(&_controller->session()),
 		paper.mtpSettings(),
 		MTP_int(_fromMessageId.msg)
@@ -685,7 +686,7 @@ void BackgroundPreviewBox::checkLevelForChannel() {
 
 	const auto show = _controller->uiShow();
 	_forPeerLevelCheck = true;
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	CheckBoostLevel(show, _forPeer, [=](int level) {
 		if (!weak) {
 			return std::optional<Ui::AskBoostReason>();
@@ -742,13 +743,13 @@ void BackgroundPreviewBox::applyForPeer() {
 		object_ptr<Ui::RpWidget>(this));
 	const auto overlay = _forBothOverlay->entity();
 
-	sizeValue() | rpl::start_with_next([=](QSize size) {
+	sizeValue() | rpl::on_next([=](QSize size) {
 		_forBothOverlay->setGeometry({ QPoint(), size });
 		overlay->setGeometry({ QPoint(), size });
 	}, _forBothOverlay->lifetime());
 
 	overlay->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(overlay);
 		p.drawImage(0, 0, bg);
 		p.fillRect(clip, QColor(0, 0, 0, 64));
@@ -787,17 +788,13 @@ void BackgroundPreviewBox::applyForPeer() {
 		const auto raw = _forBothOverlay.release();
 		raw->shownValue() | rpl::filter(
 			!rpl::mappers::_1
-		) | rpl::take(1) | rpl::start_with_next(crl::guard(raw, [=] {
+		) | rpl::take(1) | rpl::on_next(crl::guard(raw, [=] {
 			delete raw;
 		}), raw->lifetime());
 		raw->toggle(false, anim::type::normal);
 	});
-	forMe->setTextTransform(RoundButton::TextTransform::NoTransform);
-	forBoth->setTextTransform(RoundButton::TextTransform::NoTransform);
-	cancel->setTextTransform(RoundButton::TextTransform::NoTransform);
-
 	overlay->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto padding = st::backgroundConfirmPadding;
 		const auto width = size.width()
 			- padding.left()
@@ -842,7 +839,11 @@ void BackgroundPreviewBox::applyForEveryone() {
 void BackgroundPreviewBox::share() {
 	QGuiApplication::clipboard()->setText(
 		_paper.shareUrl(&_controller->session()));
-	showToast(tr::lng_background_link_copied(tr::now));
+	showToast({
+		.text = { tr::lng_background_link_copied(tr::now) },
+		.iconLottie = u"toast/voip_invite"_q,
+		.iconLottieSize = st::toastLottieIconSize,
+	});
 }
 
 void BackgroundPreviewBox::paintEvent(QPaintEvent *e) {
@@ -960,6 +961,7 @@ void BackgroundPreviewBox::paintTexts(Painter &p, crl::time ms) {
 		_chatStyle.get(),
 		rect(),
 		rect(),
+		rect(),
 		_controller->isGifPausedAtLeastFor(Window::GifPauseReason::Layer));
 	p.translate(0, textsTop());
 	if (_service) {
@@ -1063,7 +1065,7 @@ void BackgroundPreviewBox::updateServiceBg(const std::vector<QColor> &bg) {
 	}
 
 	_serviceBgLifetime = _paletteServiceBg.value(
-	) | rpl::start_with_next([=](QColor color) {
+	) | rpl::on_next([=](QColor color) {
 		_serviceBg = Ui::ThemeAdjustedColor(
 			color,
 			QColor(red / count, green / count, blue / count));
@@ -1078,7 +1080,9 @@ void BackgroundPreviewBox::updateServiceBg(const std::vector<QColor> &bg) {
 			? tr::lng_background_other_group(tr::now)
 			: forChannel()
 			? tr::lng_background_other_channel(tr::now)
-			: (_forPeer && !_fromMessageId)
+			: (_forPeer
+				&& !_fromMessageId
+				&& !_forPeer->starsPerMessageChecked())
 			? tr::lng_background_other_info(
 				tr::now,
 				lt_user,
diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 22e7da4a60ce30..dd52d99bbb3bc1 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -23,6 +23,16 @@ UserpicButton {
 	uploadBg: color;
 	uploadIcon: icon;
 	uploadIconPosition: point;
+	uploadProgressLine: pixels;
+	uploadProgressMargin: pixels;
+}
+UserpicsRow {
+	button: UserpicButton;
+	bg: color;
+	shift: pixels;
+	stroke: pixels;
+	complex: bool;
+	invert: bool;
 }
 ShortInfoBox {
 	label: FlatLabel;
@@ -64,6 +74,8 @@ defaultUserpicButton: UserpicButton {
 	uploadBg: msgDateImgBgOver;
 	uploadIcon: defaultUploadUserpicIcon;
 	uploadIconPosition: point(-1px, 1px);
+	uploadProgressLine: 3px;
+	uploadProgressMargin: 8px;
 }
 uploadUserpicSize: 32px;
 uploadUserpicButton: UserpicButton(defaultUserpicButton) {
@@ -73,13 +85,14 @@ uploadUserpicButton: UserpicButton(defaultUserpicButton) {
 	changeIconPosition: point(4px, 4px);
 }
 uploadUserpicButtonBorder: 2px;
+userpicUploadCancel: icon {{ "history_file_cancel", historyFileThumbIconFg }};
 restoreUserpicIcon: UserpicButton(defaultUserpicButton) {
 	size: size(22px, 22px);
 	photoSize: 22px;
 }
 
 confirmInviteTitle: FlatLabel(defaultFlatLabel) {
-	align: align(center);
+	align: align(top);
 	minWidth: 320px;
 	maxHeight: 24px;
 	textFg: windowBoldFg;
@@ -88,9 +101,8 @@ confirmInviteTitle: FlatLabel(defaultFlatLabel) {
 	}
 }
 confirmInviteAbout: FlatLabel(boxLabel) {
-	align: align(center);
+	align: align(top);
 	minWidth: 320px;
-	maxHeight: 60px;
 	style: TextStyle(boxLabelStyle) {
 		lineHeight: 19px;
 	}
@@ -102,10 +114,8 @@ confirmInviteStatus: FlatLabel(confirmInviteAbout) {
 }
 confirmInviteAboutPadding: margins(36px, 4px, 36px, 10px);
 confirmInviteAboutRequestsPadding: margins(36px, 9px, 36px, 15px);
-confirmInviteTitleTop: 141px;
 confirmInvitePhotoSize: 96px;
 confirmInvitePhotoTop: 33px;
-confirmInviteStatusTop: 164px;
 confirmInviteUserHeight: 100px;
 confirmInviteUserPhotoSize: 50px;
 confirmInviteUserPhotoTop: 210px;
@@ -154,13 +164,25 @@ contactsSortButton: IconButton(defaultIconButton) {
 	iconPosition: point(10px, -1px);
 	rippleAreaPosition: point(1px, 6px);
 	rippleAreaSize: 42px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 contactsSortOnlineIcon: icon{{ "contacts_online", boxTitleCloseFg }};
 contactsSortOnlineIconOver: icon{{ "contacts_online", boxTitleCloseFgOver }};
 
+contactsSortHeaderHeight: 29px;
+contactsSortHeaderFont: font(13px);
+contactsSortHeaderPosition: point(16px, 7px);
+contactsSortHeaderFg: windowSubTextFg;
+
+peerListIndexWidth: 22px;
+peerListIndexApproach: 32px;
+peerListIndexSlotHeight: 15px;
+peerListIndexMinSlotHeight: 12px;
+peerListIndexVerticalInset: 10px;
+peerListIndexFont: font(bold 11px);
+peerListIndexFg: windowSubTextFg;
+peerListIndexActiveFg: windowActiveTextFg;
+
 membersMarginTop: 10px;
 membersMarginBottom: 10px;
 
@@ -189,7 +211,6 @@ peerListBox: PeerList(defaultPeerList) {
 }
 
 localStorageRowHeight: 50px;
-localStorageRowPadding: margins(22px, 5px, 20px, 5px);
 localStorageRowTitle: FlatLabel(defaultFlatLabel) {
 	textFg: windowBoldFg;
 	maxHeight: 20px;
@@ -208,12 +229,100 @@ localStorageClear: defaultBoxButton;
 localStorageLimitLabel: LabelSimple(defaultLabelSimple) {
 	font: boxTextFont;
 }
+localStorageLimitValue: LabelSimple(localStorageLimitLabel) {
+	textFg: windowActiveTextFg;
+}
 localStorageLimitLabelMargin: margins(22px, 10px, 20px, 5px);
 localStorageLimitSlider: MediaSlider(defaultContinuousSlider) {
 	seekSize: size(15px, 15px);
 }
 localStorageLimitMargin: margins(22px, 5px, 20px, 10px);
 
+localStorageChartHeight: 200px;
+localStorageChartDiameter: 172px;
+localStorageChartThickness: 38px;
+localStorageChartThicknessThin: 12px;
+localStorageChartSelectGrow: 9px;
+localStorageChartSizeFont: font(32px semibold);
+localStorageChartUnitFont: font(13px);
+localStorageChartLabelFont: font(13px);
+localStorageChartPercentFont: font(15px semibold);
+localStorageChartParticle: 15px;
+localStorageCompleteStar1: 18px;
+localStorageCompleteStar2: 12px;
+localStorageCompleteStar3: 10px;
+localStorageCompleteExclude: 80px;
+localStorageCompleteField: 150px;
+localStorageCompleteSpeed: 4px;
+localStorageParticlePhotos: icon{{ "local_storage/photos-72x72", windowFg }};
+localStorageParticleVideos: icon{{ "local_storage/videos-72x72", windowFg }};
+localStorageParticleDocuments: icon{{ "local_storage/documents-72x72", windowFg }};
+localStorageParticleMusic: icon{{ "local_storage/music-72x72", windowFg }};
+localStorageParticleStickers: icon{{ "local_storage/stickers-72x72", windowFg }};
+
+localStorageIslandMargin: margins(12px, 10px, 12px, 0px);
+localStorageIslandRadius: 12px;
+localStorageIslandPadding: 6px;
+localStorageBottomSkip: 12px;
+
+localStorageCategoryHeight: 44px;
+localStorageCategoryPadding: margins(22px, 0px, 20px, 0px);
+localStorageCategoryCheckSkip: 14px;
+localStorageCategoryPercentSkip: 8px;
+localStorageCategoryCheck: Check(defaultCheck) {
+	diameter: 20px;
+}
+localStorageClearMargin: margins(12px, 6px, 12px, 9px);
+localStorageClearHeight: 38px;
+localStorageClearFont: font(13px semibold);
+localStorageClearSkip: 7px;
+localStorageCategoryName: FlatLabel(defaultFlatLabel) {
+	textFg: windowBoldFg;
+	maxHeight: 20px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(13px);
+	}
+}
+localStorageCategoryPercent: FlatLabel(localStorageCategoryName) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(13px semibold);
+	}
+}
+localStorageCategorySize: FlatLabel(localStorageCategoryName) {
+	textFg: windowActiveTextFg;
+}
+
+localStorageUsageTopSkip: 2px;
+localStorageUsageBarSkip: 9px;
+localStorageUsageBarWidth: 174px;
+localStorageUsageBarHeight: 4px;
+localStorageUsageBottomSkip: 6px;
+localStorageUsageBarMargin: margins(6px, 6px, 6px, 6px);
+localStorageUsageTooltipMaxWidth: 240px;
+localStorageUsageTooltipSkip: 8px;
+localStorageAboutMargin: margins(28px, 9px, 28px, 12px);
+localStorageAbout: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	minWidth: 240px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(13px);
+	}
+}
+localStorageUsageSubtitle: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	align: align(top);
+	style: TextStyle(defaultTextStyle) {
+		font: font(13px);
+	}
+}
+
+localStorageClearingSpinner: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) {
+	color: activeButtonBg;
+	thickness: 3px;
+	size: size(48px, 48px);
+}
+localStorageClearingSpinnerPadding: margins(0px, 20px, 0px, 14px);
+
 shareRowsTop: 12px;
 shareRowHeight: 108px;
 sharePhotoTop: 6px;
@@ -338,12 +447,11 @@ themeWarningHeight: 150px;
 themeWarningTextTop: 60px;
 
 aboutWidth: 390px;
-aboutVersionTop: -3px;
 aboutVersionLink: LinkButton(defaultLinkButton) {
 	color: windowSubTextFg;
 	overColor: windowSubTextFg;
 }
-aboutTextTop: 34px;
+aboutTopSkip: 19px;
 aboutSkip: 14px;
 aboutLabel: FlatLabel(defaultFlatLabel) {
 	minWidth: 300px;
@@ -372,12 +480,9 @@ connectionPortInputField: InputField(defaultInputField) {
 	width: 55px;
 }
 connectionUserInputField: InputField(defaultInputField) {
-	width: 95px;
 }
 connectionPasswordInputField: InputField(defaultInputField) {
-	width: 120px;
 }
-connectionIPv6Skip: 11px;
 
 autolockWidth: 256px;
 autolockButton: Checkbox(defaultBoxCheckbox) {
@@ -416,9 +521,7 @@ calendarPrevious: IconButton {
 
 	rippleAreaPosition: point(2px, 2px);
 	rippleAreaSize: 44px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 calendarPreviousDisabled: icon {{ "calendar_down-flip_vertical", menuIconFg }};
 calendarNext: IconButton(calendarPrevious) {
@@ -522,9 +625,9 @@ colorResultInput: InputField(colorValueInput) {
 changePhoneButton: RoundButton(defaultActiveButton) {
 	width: 256px;
 }
-changePhoneButtonPadding: margins(0px, 32px, 0px, 44px);
 changePhoneTitle: FlatLabel(boxTitle) {
 }
+localStorageClearingLottieSize: size(150px, 150px);
 changePhoneTitlePadding: margins(0px, 8px, 0px, 8px);
 changePhoneDescription: FlatLabel(defaultFlatLabel) {
 	minWidth: 332px;
@@ -533,7 +636,6 @@ changePhoneDescription: FlatLabel(defaultFlatLabel) {
 }
 changePhoneDescriptionPadding: margins(0px, 1px, 0px, 8px);
 changePhoneIconPadding: margins(0px, 39px, 0px, 5px);
-changePhoneIconSize: 120px;
 changePhoneLabel: FlatLabel(defaultFlatLabel) {
 	minWidth: 275px;
 	textFg: windowSubTextFg;
@@ -542,18 +644,8 @@ changePhoneError: FlatLabel(changePhoneLabel) {
 	textFg: boxTextFgError;
 }
 
-adminLogFilterUserpicLeft: 15px;
-adminLogFilterLittleSkip: 16px;
-adminLogFilterCheckbox: Checkbox(defaultBoxCheckbox) {
-	style: TextStyle(boxTextStyle) {
-		font: font(boxFontSize semibold);
-	}
-}
-adminLogFilterSkip: 32px;
-adminLogFilterUserCheckbox: Checkbox(defaultBoxCheckbox) {
-	margin: margins(8px, 6px, 8px, 6px);
-	checkPosition: point(8px, 6px);
-}
+normalBoxLottieSize: size(120px, 120px);
+
 rightsCheckbox: Checkbox(defaultCheckbox) {
 	textPosition: point(10px, 1px);
 	rippleBg: attentionButtonBgOver;
@@ -577,10 +669,10 @@ rightsButton: SettingsButton(defaultSettingsButton) {
 	toggleSkip: 20px;
 }
 rightsButtonToggleWidth: 70px;
+rightsButtonArrowSkip: 5px;
 rightsDividerMargin: margins(0px, 0px, 0px, 20px);
 rightsHeaderMargin: margins(22px, 13px, 22px, 7px);
 rightsToggleMargin: margins(22px, 8px, 22px, 8px);
-rightsAboutMargin: margins(22px, 8px, 22px, 8px);
 rightsPhotoButton: UserpicButton(defaultUserpicButton) {
 	size: size(60px, 60px);
 	photoSize: 60px;
@@ -616,9 +708,7 @@ proxyTryIPv6Padding: margins(22px, 8px, 22px, 5px);
 proxyRowPadding: margins(22px, 8px, 8px, 8px);
 proxyRowIconSkip: 32px;
 proxyRowSkip: 2px;
-proxyRowRipple: RippleAnimation(defaultRippleAnimation) {
-	color: windowBgOver;
-}
+proxyRowRipple: defaultRippleAnimationBgOver;
 proxyRowTitleFg: windowFg;
 proxyRowTitlePalette: TextPalette(defaultTextPalette) {
 	linkFg: windowSubTextFg;
@@ -654,8 +744,8 @@ proxyCheckingAnimation: InfiniteRadialAnimation(defaultInfiniteRadialAnimation)
 	thickness: 1px;
 	size: size(8px, 8px);
 }
-proxyDropdownDownPosition: point(-2px, 35px);
-proxyDropdownUpPosition: point(-2px, 20px);
+proxyDropdownDownPosition: point(2px, 35px);
+proxyDropdownUpPosition: point(2px, 20px);
 
 proxyAboutPadding: margins(22px, 7px, 22px, 14px);
 proxyAboutSponsorPadding: margins(22px, 7px, 22px, 0px);
@@ -663,6 +753,41 @@ proxyAboutSponsorPadding: margins(22px, 7px, 22px, 0px);
 proxyApplyBoxLabel : FlatLabel(defaultFlatLabel) {
 	maxHeight: 30px;
 }
+proxyApplyBoxTable: Table(defaultTable) {
+	labelMinWidth: 91px;
+}
+proxyApplyBoxTableMargin: margins(24px, 4px, 24px, 4px);
+proxyApplyBoxTableLabelMargin: margins(13px, 10px, 13px, 10px);
+proxyApplyBoxTableValueMargin: margins(13px, 9px, 13px, 9px);
+proxyApplyBoxValueMultiline: FlatLabel(defaultTableValue) {
+	minWidth: 128px;
+	maxHeight: 100px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(10px);
+		linkUnderline: kLinkUnderlineNever;
+	}
+}
+proxyApplyBoxSponsorLabel: FlatLabel(defaultFlatLabel) {
+	textFg: windowBoldFg;
+	minWidth: 100px;
+	align: align(top);
+	style: TextStyle(defaultTextStyle) {
+		font: font(11px);
+	}
+}
+proxyApplyBoxSponsorMargin: margins(13px, 8px, 13px, 8px);
+proxyApplyBoxButton: RoundButton(defaultActiveButton) {
+	height: 38px;
+	textTop: 10px;
+	style: semiboldTextStyle;
+}
+proxyApplyBox: Box(defaultBox) {
+	buttonPadding: margins(22px, 11px, 22px, 22px);
+	buttonHeight: 38px;
+	buttonWide: true;
+	button: proxyApplyBoxButton;
+	shadowIgnoreTopSkip: true;
+}
 
 markdownLinkFieldPadding: margins(22px, 0px, 22px, 10px);
 
@@ -683,84 +808,23 @@ themesMenuToggle: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(4px, 4px);
 	rippleAreaSize: 36px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
-themesMenuPosition: point(-2px, 25px);
+themesMenuPosition: point(2px, 25px);
 
-createPollField: InputField(defaultInputField) {
-	textMargins: margins(0px, 4px, 0px, 4px);
-	textAlign: align(left);
-	heightMin: 36px;
-	heightMax: 86px;
-	placeholderFg: placeholderFg;
-	placeholderFgActive: placeholderFgActive;
-	placeholderFgError: placeholderFgActive;
-	placeholderMargins: margins(2px, 0px, 2px, 0px);
-	placeholderAlign: align(topleft);
-	placeholderScale: 0.;
-	placeholderFont: boxTextFont;
-	placeholderShift: -50px;
-	border: 0px;
-	borderActive: 0px;
-	duration: 100;
-}
-createPollFieldPadding: margins(22px, 5px, 22px, 5px);
-createPollOptionField: InputField(createPollField) {
-	textMargins: margins(22px, 11px, 40px, 11px);
-	placeholderMargins: margins(2px, 0px, 2px, 0px);
-	heightMax: 68px;
-}
-createPollOptionFieldPremium: InputField(createPollOptionField) {
-	textMargins: margins(22px, 11px, 68px, 11px);
-}
-createPollOptionFieldPremiumEmojiPosition: point(15px, -1px);
-createPollSolutionField: InputField(createPollField) {
-	textMargins: margins(0px, 4px, 0px, 4px);
-	border: 1px;
-	borderActive: 2px;
-}
-createPollLimitPadding: margins(22px, 10px, 22px, 16px);
-createPollOptionRemove: CrossButton {
-	width: 22px;
-	height: 22px;
-
-	cross: CrossAnimation {
-		size: 22px;
-		skip: 6px;
-		stroke: 1.5;
-		minScale: 0.3;
-	}
-	crossFg: boxTitleCloseFg;
-	crossFgOver: boxTitleCloseFgOver;
-	crossPosition: point(0px, 0px);
+sendGifWithCaptionEmojiPosition: point(-30px, 23px);
 
-	duration: 150;
-	loadingPeriod: 1000;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+notesFieldWithEmoji: InputField(defaultInputField) {
+	textMargins: margins(0px, 28px, 30px, 4px);
+//	border: 0px;
+//	borderActive: 0px;
 }
-createPollOptionRemovePosition: point(11px, 9px);
-createPollOptionEmojiPositionSkip: 4px;
-createPollWarning: FlatLabel(defaultFlatLabel) {
-	textFg: windowSubTextFg;
-	palette: TextPalette(defaultTextPalette) {
-		linkFg: boxTextFgError;
-	}
-}
-createPollWarningPosition: point(16px, 6px);
-createPollCheckboxMargin: margins(22px, 10px, 22px, 10px);
-createPollFieldTitlePadding: margins(22px, 7px, 10px, 6px);
-
-sendGifWithCaptionEmojiPosition: point(-30px, 23px);
 
 backgroundCheckbox: Checkbox(defaultCheckbox) {
 	textFg: msgServiceFg;
 	textFgActive: msgServiceFg;
 
-	width: -50px;
+	width: -10px;
 	margin: margins(0px, 0px, 0px, 0px);
 
 	textPosition: point(0px, 6px);
@@ -803,12 +867,42 @@ backgroundConfirmCancel: RoundButton(backgroundConfirm) {
 		color: shadowFg;
 	}
 }
+urlAuthBox: Box(defaultBox) {
+	buttonPadding: margins(0px, 0px, 0px, 12px);
+	buttonHeight: 0px;
+}
 urlAuthCheckbox: Checkbox(defaultBoxCheckbox) {
 	width: 240px;
 }
+urlAuthCodesTitle: FlatLabel(defaultPeerListAbout) {
+	textFg: boxTitleFg;
+	style: TextStyle(defaultTextStyle) {
+		font: boxTitleFont;
+	}
+}
+urlAuthCheckboxAbout: FlatLabel(defaultPeerListAbout) {
+	style: TextStyle(boxTextStyle) {
+		font: font(12px);
+	}
+}
+urlAuthCodesButton: RoundButton(defaultLightButton) {
+	height: 58px;
+	textTop: 19px;
+	style: TextStyle(semiboldTextStyle) {
+		font: font(20px semibold);
+	}
+}
+urlAuthBoxRowTopLabel: FlatLabel(boxLabel) {
+	maxHeight: 30px;
+}
+urlAuthBoxRowBottomLabel: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	maxHeight: 30px;
+}
 
 addContactFieldMargin: margins(19px, 0px, 19px, 10px);
 addContactWarningMargin: margins(19px, 10px, 19px, 5px);
+editContactSuggestBirthday: icon{{ "settings/birthday_add-22x22", lightButtonFg }};
 blockUserConfirmation: FlatLabel(boxLabel) {
 	minWidth: 240px;
 }
@@ -824,7 +918,7 @@ boostsUnrestrictLabel: FlatLabel(defaultFlatLabel) {
 }
 
 customBadgeField: InputField(defaultInputField) {
-	textMargins: margins(2px, 7px, 2px, 0px);
+	textMargins: margins(2px, 0px, 2px, 0px);
 
 	placeholderFg: placeholderFg;
 	placeholderFgActive: placeholderFgActive;
@@ -833,33 +927,15 @@ customBadgeField: InputField(defaultInputField) {
 	placeholderScale: 0.;
 	placeholderFont: normalFont;
 
-	heightMin: 32px;
-}
+	border: 0px;
+	borderActive: 0px;
 
-pollResultsQuestion: FlatLabel(defaultFlatLabel) {
-	minWidth: 320px;
-	textFg: windowBoldFg;
-	style: TextStyle(defaultTextStyle) {
-		font: font(16px semibold);
-	}
-}
-pollResultsVotesCount: FlatLabel(defaultFlatLabel) {
-	textFg: windowSubTextFg;
+	heightMin: 32px;
 }
-pollResultsHeaderPadding: margins(22px, 22px, 22px, 8px);
-pollResultsShowMore: SettingsButton(defaultSettingsButton) {
-	textFg: lightButtonFg;
-	textFgOver: lightButtonFgOver;
-	textBg: windowBg;
-	textBgOver: windowBgOver;
-
-	style: semiboldTextStyle;
 
-	height: 20px;
-	padding: margins(71px, 10px, 8px, 8px);
-
-	ripple: defaultRippleAnimation;
-}
+tagPreviewLineHeight: 8px;
+tagPreviewLineSpacing: 4px;
+tagPreviewInputSkip: 16px;
 
 inviteViaLinkButton: SettingsButton(defaultSettingsButton) {
 	textFg: lightButtonFg;
@@ -888,6 +964,13 @@ peerListWithInviteViaLink: PeerList(peerListBox) {
 peerListSingleRow: PeerList(peerListBox) {
 	padding: margins(0px, 0px, 0px, 0px);
 }
+peerListSmallSkips: PeerList(peerListBox) {
+	padding: margins(
+		0px,
+		defaultVerticalListSkip,
+		0px,
+		defaultVerticalListSkip);
+}
 
 scheduleHeight: 95px;
 scheduleDateTop: 38px;
@@ -908,6 +991,8 @@ scheduleDateWidth: 136px;
 scheduleTimeWidth: 72px;
 scheduleAtSkip: 24px;
 scheduleAtTop: 42px;
+scheduleNotifyIconSize: 24px;
+scheduleNotifyTooltipShift: 5px;
 scheduleAtLabel: FlatLabel(defaultFlatLabel) {
 }
 scheduleTimeSeparator: FlatLabel(defaultFlatLabel) {
@@ -916,6 +1001,24 @@ scheduleTimeSeparator: FlatLabel(defaultFlatLabel) {
 	}
 }
 scheduleTimeSeparatorPadding: margins(2px, 0px, 2px, 0px);
+scheduleRepeatDropdownLock: IconEmoji {
+	icon: icon {{ "emoji/premium_lock", windowSubTextFg }};
+	padding: margins(1px, 1px, 0px, 0px);
+}
+scheduleRepeatDropdownArrow: IconEmoji {
+	icon: icon {{ "arrows_select", windowSubTextFg }};
+	padding: margins(6px, 5px, 0px, 0px);
+}
+scheduleRepeatHeight: 28px;
+scheduleRepeatRadius: 14px;
+scheduleRepeatTextPadding: 12px;
+scheduleRepeatMargin: margins(0px, -4px, 0px, 10px);
+scheduleRepeatLabel: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(13px);
+	}
+	textFg: windowBoldFg;
+}
 
 muteBoxTimeField: InputField(scheduleDateField) {
 	textMargins: margins(0px, 0px, 0px, 0px);
@@ -951,9 +1054,7 @@ sponsoredUrlButton: RoundButton(defaultActiveButton) {
 	textTop: 7px;
 	style: defaultTextStyle;
 
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 
 requestPeerRestriction: FlatLabel(defaultFlatLabel) {
@@ -987,9 +1088,8 @@ contactsWithStories: PeerList(peerListBox) {
 		statusPosition: point(70px, 27px);
 
 		checkbox: RoundImageCheckbox(defaultPeerListCheckbox) {
-			selectExtendTwice: 1px;
 			imageRadius: 21px;
-			imageSmallRadius: 19px;
+			imageSmallRadius: 18px;
 			check: RoundCheckbox(defaultPeerListCheck) {
 				size: 0px;
 			}
@@ -997,8 +1097,6 @@ contactsWithStories: PeerList(peerListBox) {
 		nameFgChecked: contactsNameFg;
 	}
 }
-storiesReadLineTwice: 2px;
-storiesUnreadLineTwice: 4px;
 requestsAcceptButton: RoundButton(defaultActiveButton) {
 	width: -28px;
 	height: 30px;
@@ -1083,7 +1181,6 @@ collectibleHeaderPadding: margins(24px, 16px, 24px, 12px);
 collectibleOwnerPadding: margins(24px, 4px, 24px, 8px);
 collectibleInfo: inviteForbiddenInfo;
 collectibleInfoPadding: margins(24px, 12px, 24px, 12px);
-collectibleInfoTonMargins: margins(0px, 3px, 0px, 0px);
 collectibleMore: RoundButton(defaultActiveButton) {
 	height: 36px;
 	textTop: 9px;
@@ -1106,15 +1203,30 @@ moderateBoxUserpic: UserpicButton(defaultUserpicButton) {
 	photoSize: 34px;
 	photoPosition: point(0px, 4px);
 }
-moderateBoxExpand: icon {{ "chat/reply_type_group", boxTextFg }};
+moderateBoxExpand: IconEmoji {
+	icon: icon {{ "chat/reply_type_group", boxTextFg }};
+	padding: margins(1px, 3px, 1px, 0px);
+	useIconColor: true;
+}
 moderateBoxExpandHeight: 20px;
 moderateBoxExpandRight: 10px;
 moderateBoxExpandInnerSkip: 2px;
 moderateBoxExpandFont: font(11px);
+moderateBoxExpandTextStyle: TextStyle(boxTextStyle) {
+	font: moderateBoxExpandFont;
+}
 moderateBoxExpandToggleSize: 4px;
 moderateBoxExpandToggleFourStrokes: 3px;
-moderateBoxExpandIcon: icon{{ "info/edit/expand_arrow_small-flip_vertical", windowActiveTextFg }};
-moderateBoxExpandIconDown: icon{{ "info/edit/expand_arrow_small", windowActiveTextFg }};
+moderateBoxExpandIcon: IconEmoji{
+	icon: icon{{ "info/edit/expand_arrow_small-flip_vertical", windowActiveTextFg }};
+	padding: margins(-2px, -1px, 0px, 0px);
+	useIconColor: true;
+}
+moderateBoxExpandIconDown: IconEmoji{
+	icon: icon{{ "info/edit/expand_arrow_small", windowActiveTextFg }};
+	padding: margins(-2px, -1px, 0px, 0px);
+	useIconColor: true;
+}
 moderateBoxDividerLabel: FlatLabel(boxDividerLabel) {
 	palette: TextPalette(defaultTextPalette) {
 		selectLinkFg: windowActiveTextFg;
@@ -1122,8 +1234,327 @@ moderateBoxDividerLabel: FlatLabel(boxDividerLabel) {
 }
 
 profileQrFont: font(fsize bold);
-profileQrCenterSize: 34px;
 profileQrBackgroundRadius: 12px;
 profileQrIcon: icon{{ "qr_mini", windowActiveTextFg }};
 profileQrBackgroundMargins: margins(36px, 12px, 36px, 12px);
 profileQrBackgroundPadding: margins(0px, 24px, 0px, 24px);
+
+foldersMenu: PopupMenu(popupMenuWithIcons) {
+	maxHeight: 320px;
+	menu: Menu(menuWithIcons) {
+		itemPadding: margins(54px, 8px, 44px, 8px);
+	}
+}
+
+moderateCommonGroupsCheckbox: RoundImageCheckbox(defaultPeerListCheckbox) {
+	imageRadius: 12px;
+	imageSmallRadius: 11px;
+	selectWidth: 2px;
+	check: RoundCheckbox(defaultPeerListCheck) {
+		size: 16px;
+		sizeSmall: 0.3;
+		bgInactive: overviewCheckBg;
+		bgActive: overviewCheckBgActive;
+		check: icon {{
+			"default_checkbox_check",
+			overviewCheckFgActive,
+			point(1px, 4px)
+		}};
+	}
+}
+
+futureOwnerBox: Box(defaultBox) {
+	buttonPadding: margins(0px, 0px, 0px, 14px);
+	buttonHeight: 0px;
+}
+futureOwnerBoxSelect: collectibleBox;
+guardBotReplaceBox: Box(futureOwnerBox) {
+}
+
+localAutomationBox: Box(defaultBox) {
+	buttonPadding: margins(0px, 0px, 0px, 12px);
+	buttonHeight: 0px;
+}
+
+disableSharingIconPadding: margins(12px, 12px, 12px, 8px);
+disableSharingButtonLock: IconEmoji {
+	icon: icon {{ "emoji/premium_lock", activeButtonFg }};
+	padding: margins(-2px, 1px, 0px, 0px);
+}
+
+createBotBox: Box(defaultBox) {
+	shadowIgnoreTopSkip: true;
+}
+createBotUserpicPadding: margins(0px, 16px, 0px, 10px);
+createBotTitlePadding: margins(0px, 0px, 0px, 8px);
+createBotSubtitlePadding: margins(0px, 0px, 0px, 4px);
+createBotCenteredText: FlatLabel(defaultFlatLabel) {
+	align: align(top);
+	minWidth: 40px;
+}
+createBotFieldSpacing: 8px;
+createBotUsernameField: InputField(defaultInputField) {
+	textMargins: margins(0px, 28px, 0px, 4px);
+}
+createBotUsernamePrefix: FlatLabel(defaultFlatLabel) {
+	style: boxTextStyle;
+}
+createBotUsernameSuffix: FlatLabel(createBotUsernamePrefix) {
+	textFg: windowSubTextFg;
+}
+
+managedBotIconEmoji: IconEmoji {
+	icon: icon {{ "chat/code_tags", windowSubTextFg }};
+	padding: margins(-2px, -2px, -2px, 0px);
+}
+
+createBotStatusLabel: FlatLabel(aboutRevokePublicLabel) {
+	maxHeight: 20px;
+}
+
+aiComposeBoxStyleTabsSkip: 8px;
+aiComposeContentMargin: margins(16px, 0px, 16px, 0px);
+
+aiComposeButtonBgActive: windowActiveTextFg;
+aiComposeButtonBgActiveOpacity: 0.1;
+aiComposeButtonFg: windowBoldFg;
+aiComposeButtonFgActive: windowActiveTextFg;
+aiComposeButtonRippleInactive: RippleAnimation(defaultRippleAnimation) {
+	color: windowBoldFg;
+}
+aiComposeButtonRippleInactiveOpacity: 0.1;
+aiComposeButtonRippleActive: RippleAnimation(defaultRippleAnimation) {
+	color: windowActiveTextFg;
+}
+aiComposeButtonRippleActiveOpacity: 0.1;
+
+aiComposeTabsBg: boxBg;
+aiComposeTabsHeight: 58px;
+aiComposeTabsRadius: 29px;
+aiComposeTabsPadding: margins(6px, 6px, 6px, 6px);
+aiComposeTabsSkip: 4px;
+aiComposeTabButtonBgActive: aiComposeButtonBgActive;
+aiComposeTabLabelFg: aiComposeButtonFg;
+aiComposeTabLabelFgActive: aiComposeButtonFgActive;
+aiComposeTabLabelFont: font(12px semibold);
+aiComposeTabIconTop: 6px;
+aiComposeTabLabelTop: 26px;
+aiComposeTabTranslateIcon: icon {{ "menu/translate", aiComposeButtonFg }};
+aiComposeTabTranslateIconActive: icon {{ "menu/translate", aiComposeButtonFgActive }};
+aiComposeTabStyleIcon: icon {{ "menu/edit_stars", aiComposeButtonFg }};
+aiComposeTabStyleIconActive: icon {{ "menu/edit_stars", aiComposeButtonFgActive }};
+aiComposeTabFixIcon: icon {{ "menu/search_check", aiComposeButtonFg }};
+aiComposeTabFixIconActive: icon {{ "menu/search_check", aiComposeButtonFgActive }};
+
+aiComposeStyleTabsBg: boxBg;
+aiComposeStyleTabsHeight: 64px;
+aiComposeStyleTabsRadius: 14px;
+aiComposeStyleTabsPadding: margins(6px, 6px, 6px, 6px);
+aiComposeStyleTabsSkip: 4px;
+aiComposeStyleButtonBgActive: aiComposeButtonBgActive;
+aiComposeStyleLabelFg: aiComposeButtonFg;
+aiComposeStyleLabelFgActive: aiComposeButtonFgActive;
+aiComposeStyleEmojiTop: 5px;
+aiComposeStyleLabelTop: 30px;
+aiComposeStyleLabelFont: font(12px semibold);
+aiComposeStyleTabsScroll: ScrollArea(defaultScrollArea) {
+	barHidden: true;
+}
+aiComposeStyleButtonPadding: margins(12px, 0px, 12px, 0px);
+aiComposeStyleFadeWidth: 24px;
+aiComposeBadge: RoundButton(customEmojiTextBadge) {
+	textFg: activeButtonBg;
+	textBg: activeButtonFg;
+	width: -8px;
+	height: 16px;
+	radius: 4px;
+	textTop: 1px;
+	style: TextStyle(semiboldTextStyle) {
+		font: font(10px semibold);
+	}
+}
+aiComposeBadgeMargin: margins(0px, 2px, 0px, 0px);
+
+aiComposeAddStyleIcon: icon {{ "menu/edit_stars_add", aiComposeButtonFg }};
+aiComposeAddStyleIconOver: icon {{ "menu/edit_stars_add", aiComposeButtonFgActive }};
+
+aiToneIconPreviewSize: 80px;
+aiToneIconPreviewBottomSkip: 12px;
+aiToneIconPreviewTopSkip: 4px;
+aiToneIconPreviewBg: boxBg;
+aiToneIconPreviewInnerSize: 54px;
+
+aiToneIconPreviewPlaceholder: icon {{ "chat/ai_style_tone", windowSubTextFg }};
+
+aiToneFieldBg: boxBg;
+aiToneFieldRadius: 12px;
+aiToneFieldPadding: margins(16px, 12px, 16px, 12px);
+aiToneFieldsMargin: margins(16px, 0px, 16px, 0px);
+aiToneFieldsSkip: 8px;
+
+aiToneNameField: InputField(defaultInputField) {
+	textBg: transparent;
+	textBgActive: transparent;
+	textMargins: margins(16px, 12px, 16px, 12px);
+	border: 0px;
+	borderActive: 0px;
+	heightMin: 44px;
+}
+aiTonePromptField: InputField(newGroupDescription) {
+	textBg: transparent;
+	textBgActive: transparent;
+	textMargins: margins(16px, 12px, 16px, 12px);
+	border: 0px;
+	borderActive: 0px;
+	heightMin: 140px;
+	heightMax: 240px;
+}
+aiTonePlaceholderLabel: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	minWidth: 80px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(14px);
+	}
+}
+aiToneAuthorCheckboxMargin: margins(0px, 12px, 0px, 8px);
+aiToneDeleteButton: RoundButton(defaultActiveButton) {
+	textFg: attentionButtonFg;
+	textFgOver: attentionButtonFg;
+	textBg: boxBg;
+	textBgOver: boxBg;
+	height: 42px;
+	textTop: 12px;
+	style: semiboldTextStyle;
+	ripple: defaultRippleAnimation;
+}
+aiToneDeleteButtonMargin: margins(16px, 8px, 16px, 0px);
+aiComposeToneToastIconSize: size(32px, 32px);
+aiComposeToneToastIconPadding: margins(12px, 6px, 12px, 6px);
+
+aiTonePreviewTitleLabel: FlatLabel(defaultFlatLabel) {
+	textFg: windowFg;
+	minWidth: 0px;
+	maxHeight: 28px;
+	align: align(top);
+	style: TextStyle(semiboldTextStyle) {
+		font: font(17px semibold);
+	}
+}
+aiTonePreviewTitleMargin: margins(16px, 6px, 16px, 0px);
+
+aiTonePreviewAboutLabel: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	minWidth: 20px;
+	align: align(top);
+	style: TextStyle(defaultTextStyle) {
+		font: font(14px);
+	}
+}
+aiTonePreviewAboutMargin: margins(28px, 6px, 28px, 6px);
+
+aiTonePreviewAttributionLabel: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	minWidth: 0px;
+	align: align(top);
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+		linkUnderline: kLinkUnderlineActive;
+	}
+}
+aiTonePreviewAttributionMargin: margins(16px, 10px, 16px, 8px);
+
+aiTonePreviewExampleCardBg: boxBg;
+aiTonePreviewExampleCardRadius: 22px;
+aiTonePreviewExampleCardPadding: margins(14px, 12px, 16px, 12px);
+aiTonePreviewExampleCardSectionSkip: 24px;
+aiTonePreviewExampleCardTitleSkip: 6px;
+aiTonePreviewExampleCardMargin: margins(16px, 6px, 16px, 0px);
+aiTonePreviewBottomSkip: 6px;
+
+aiTonePreviewAnotherExampleButton: RoundButton(defaultLightButton) {
+	width: -12px;
+	height: 26px;
+	radius: 8px;
+	textTop: 4px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px semibold);
+	}
+}
+aiTonePreviewAnotherExampleIcon: IconEmoji {
+	icon: icon {{ "chat/refresh-18x18", lightButtonFg }};
+	padding: margins(0px, 1px, 4px, 0px);
+}
+aiComposeToneRemovedToastIcon: icon {{ "menu/delete", toastFg }};
+
+aiComposeCardBg: boxBg;
+aiComposeCardRadius: 22px;
+aiComposeCardPadding: margins(12px, 16px, 16px, 16px);
+aiComposeCardSectionSkip: 12px;
+aiComposeCardControlSkip: 8px;
+aiComposeCardTitle: FlatLabel(defaultSubsectionTitle) {
+	textFg: windowFg;
+	minWidth: 0px;
+	maxHeight: 22px;
+}
+aiComposeEmojifyCheckbox: Checkbox(defaultBoxCheckbox) {
+	textFg: windowSubTextFg;
+	textFgActive: windowSubTextFg;
+	width: 0px;
+}
+
+aiComposeExpandIcon: icon{{ "info/edit/expand_arrow_small", windowActiveTextFg }};
+aiComposeCollapseIcon: icon{{ "info/edit/expand_arrow_small-flip_vertical", windowActiveTextFg }};
+aiComposeExpandButton: IconButton(defaultIconButton) {
+	width: 32px;
+	height: 32px;
+	icon: aiComposeExpandIcon;
+	iconOver: aiComposeExpandIcon;
+	iconPosition: point(5px, 5px);
+	rippleAreaPosition: point(0px, 0px);
+	rippleAreaSize: 32px;
+	ripple: defaultRippleAnimationBgOver;
+}
+
+aiComposeCopyIcon: icon{{ "menu/copy", windowActiveTextFg }};
+aiComposeCopyButton: IconButton(aiComposeExpandButton) {
+	icon: aiComposeCopyIcon;
+	iconOver: aiComposeCopyIcon;
+}
+
+aiComposeAuthorLabel: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	minWidth: 0px;
+	maxHeight: 20px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+		linkUnderline: kLinkUnderlineActive;
+	}
+}
+aiComposeAuthorLabelTop: 8px;
+
+aiComposeBoxButton: RoundButton(defaultActiveButton) {
+	height: 42px;
+	textTop: 12px;
+	style: semiboldTextStyle;
+}
+aiComposeBox: Box(defaultBox) {
+	buttonPadding: margins(16px, 12px, 16px, 12px);
+	buttonHeight: 42px;
+	buttonWide: true;
+	button: aiComposeBoxButton;
+	shadowIgnoreTopSkip: true;
+	bg: boxDividerBg;
+}
+aiComposeBoxWithSend: Box(aiComposeBox) {
+	buttonPadding: margins(16px, 12px, 66px, 12px);
+}
+aiComposeSendButtonSkip: 8px;
+aiComposeBoxClose: IconButton(boxTitleClose) {
+	ripple: defaultRippleAnimation;
+}
+aiComposeBoxInfoButton: IconButton(boxTitleClose) {
+	icon: icon {{ "menu/info", boxTitleCloseFg }};
+	iconOver: icon {{ "menu/info", boxTitleCloseFgOver }};
+	ripple: defaultRippleAnimation;
+}
+aiComposeShadowOpacity: 0.3;
diff --git a/Telegram/SourceFiles/boxes/choose_filter_box.cpp b/Telegram/SourceFiles/boxes/choose_filter_box.cpp
index 4e99a01ba855d5..d705ca392109f9 100644
--- a/Telegram/SourceFiles/boxes/choose_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/choose_filter_box.cpp
@@ -8,32 +8,123 @@ For license and copyright information please follow this link:
 #include "boxes/choose_filter_box.h"
 
 #include "apiwrap.h"
+#include "boxes/filters/edit_filter_box.h"
 #include "boxes/premium_limits_box.h"
 #include "core/application.h" // primaryWindow
+#include "core/ui_integration.h"
 #include "data/data_chat_filters.h"
+#include "data/data_premium_limits.h"
 #include "data/data_session.h"
+#include "data/data_channel.h"
+#include "data/data_user.h"
 #include "history/history.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "ui/text/text_utilities.h" // Ui::Text::Bold
+#include "ui/empty_userpic.h"
+#include "ui/filter_icons.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/text/text_utilities.h" // tr::bold
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/menu/menu_action.h"
 #include "ui/widgets/popup_menu.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
+#include "main/main_session_settings.h"
+#include "styles/style_dialogs.h"
 #include "styles/style_media_player.h" // mediaPlayerMenuCheck
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
 
 namespace {
 
+[[nodiscard]] QImage Icon(const Data::ChatFilter &f) {
+	constexpr auto kScale = 0.75;
+	const auto icon = Ui::LookupFilterIcon(Ui::ComputeFilterIcon(f)).normal;
+	const auto originalWidth = icon->width();
+	const auto originalHeight = icon->height();
+
+	const auto scaledWidth = int(originalWidth * kScale);
+	const auto scaledHeight = int(originalHeight * kScale);
+
+	auto image = QImage(
+		scaledWidth * style::DevicePixelRatio(),
+		scaledHeight * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(style::DevicePixelRatio());
+	image.fill(Qt::transparent);
+
+	{
+		auto p = QPainter(&image);
+		auto hq = PainterHighQualityEnabler(p);
+
+		const auto x = int((scaledWidth - originalWidth * kScale) / 2);
+		const auto y = int((scaledHeight - originalHeight * kScale) / 2);
+
+		p.scale(kScale, kScale);
+		icon->paint(p, x, y, scaledWidth, st::dialogsUnreadBgMuted->c);
+		if (const auto color = f.colorIndex()) {
+			p.resetTransform();
+			const auto circleSize = scaledWidth / 3.;
+			const auto r = QRectF(
+				x + scaledWidth - circleSize,
+				y + scaledHeight - circleSize - circleSize / 3.,
+				circleSize,
+				circleSize);
+			p.setPen(Qt::NoPen);
+			p.setCompositionMode(QPainter::CompositionMode_Clear);
+			p.setBrush(Qt::transparent);
+			p.drawEllipse(r + Margins(st::lineWidth * 1.5));
+			p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+			p.setBrush(Ui::EmptyUserpic::UserpicColor(*color).color2);
+			p.drawEllipse(r);
+		}
+	}
+
+	return image;
+}
+
+class FilterAction : public Ui::Menu::Action {
+public:
+	using Ui::Menu::Action::Action;
+
+	void setIcon(QImage &&image) {
+		_icon = std::move(image);
+	}
+
+protected:
+	void paintEvent(QPaintEvent *event) override {
+		Ui::Menu::Action::paintEvent(event);
+		if (!_icon.isNull()) {
+			const auto size = _icon.size() / style::DevicePixelRatio();
+			auto p = QPainter(this);
+			p.drawImage(
+				width()
+					- size.width()
+					- st::menuWithIcons.itemPadding.right(),
+				(height() - size.height()) / 2,
+				_icon);
+		}
+	}
+
+private:
+	QImage _icon;
+
+};
+
 Data::ChatFilter ChangedFilter(
 		const Data::ChatFilter &filter,
 		not_null<History*> history,
 		bool add) {
 	auto always = base::duplicate(filter.always());
+	auto pinned = filter.pinned();
 	auto never = base::duplicate(filter.never());
 	if (add) {
 		never.remove(history);
 	} else {
 		always.remove(history);
+		pinned.erase(ranges::remove(pinned, history), end(pinned));
 	}
 	const auto result = Data::ChatFilter(
 		filter.id(),
@@ -42,7 +133,7 @@ Data::ChatFilter ChangedFilter(
 		filter.colorIndex(),
 		filter.flags(),
 		std::move(always),
-		filter.pinned(),
+		pinned,
 		std::move(never));
 	const auto in = result.contains(history);
 	if (in == add) {
@@ -62,7 +153,7 @@ Data::ChatFilter ChangedFilter(
 		filter.colorIndex(),
 		filter.flags(),
 		std::move(always),
-		filter.pinned(),
+		std::move(pinned),
 		std::move(never));
 }
 
@@ -85,17 +176,27 @@ void ChangeFilterById(
 		)).done([=, chat = history->peer->name(), name = filter.title()] {
 			const auto account = not_null(&history->session().account());
 			if (const auto controller = Core::App().windowFor(account)) {
-				controller->showToast((add
-					? tr::lng_filters_toast_add
-					: tr::lng_filters_toast_remove)(
-						tr::now,
-						lt_chat,
-						Ui::Text::Bold(chat),
-						lt_folder,
-						Ui::Text::Bold(name),
-						Ui::Text::WithEntities));
+				const auto isStatic = name.isStatic;
+				controller->showToast({
+					.text = (add
+						? tr::lng_filters_toast_add
+						: tr::lng_filters_toast_remove)(
+							tr::now,
+							lt_chat,
+							tr::bold(chat),
+							lt_folder,
+							Ui::Text::Wrapped(name.text, EntityType::Bold),
+							tr::marked),
+					.textContext = Core::TextContext({
+						.session = &history->session(),
+						.customEmojiLoopLimit = isStatic ? -1 : 0,
+					}),
+				});
 			}
 		}).fail([=](const MTP::Error &error) {
+			LOG(("API Error: failed to %1 a dialog to a folder. %2")
+				.arg(add ? u"add"_q : u"remove"_q)
+				.arg(error.type()));
 			// Revert filter on fail.
 			history->owner().chatsFilters().set(was);
 		}).send();
@@ -117,15 +218,24 @@ bool ChooseFilterValidator::canAdd() const {
 	return false;
 }
 
+bool ChooseFilterValidator::canAdd(FilterId filterId) const {
+	Expects(filterId != 0);
+
+	const auto list = _history->owner().chatsFilters().list();
+	const auto i = ranges::find(list, filterId, &Data::ChatFilter::id);
+	if (i != end(list)) {
+		return !i->contains(_history);
+	}
+	return false;
+}
+
 bool ChooseFilterValidator::canRemove(FilterId filterId) const {
 	Expects(filterId != 0);
 
 	const auto list = _history->owner().chatsFilters().list();
 	const auto i = ranges::find(list, filterId, &Data::ChatFilter::id);
 	if (i != end(list)) {
-		const auto &filter = *i;
-		return filter.contains(_history)
-			&& ((filter.always().size() > 1) || filter.flags());
+		return Data::CanRemoveFromChatFilter(*i, _history);
 	}
 	return false;
 }
@@ -161,14 +271,15 @@ void FillChooseFilterMenu(
 		not_null<History*> history) {
 	const auto weak = base::make_weak(controller);
 	const auto validator = ChooseFilterValidator(history);
-	for (const auto &filter : history->owner().chatsFilters().list()) {
+	const auto &list = history->owner().chatsFilters().list();
+	const auto showColors = history->owner().chatsFilters().tagsEnabled();
+	for (const auto &filter : list) {
 		const auto id = filter.id();
 		if (!id) {
 			continue;
 		}
 
-		const auto contains = filter.contains(history);
-		const auto action = menu->addAction(filter.title(), [=] {
+		auto callback = [=] {
 			const auto toAdd = !filter.contains(history);
 			const auto r = validator.limitReached(id, toAdd);
 			if (r.reached) {
@@ -185,13 +296,284 @@ void FillChooseFilterMenu(
 					validator.remove(id);
 				}
 			}
-		}, contains ? &st::mediaPlayerMenuCheck : nullptr);
+		};
+
+		const auto contains = filter.contains(history);
+		const auto title = filter.title();
+		auto item = base::make_unique_q<FilterAction>(
+			menu->menu(),
+			menu->st().menu,
+			Ui::Menu::CreateAction(
+				menu.get(),
+				Ui::Text::FixAmpersandInAction(title.text.text),
+				std::move(callback)),
+			contains ? &st::mediaPlayerMenuCheck : nullptr,
+			contains ? &st::mediaPlayerMenuCheck : nullptr);
+		item->setMarkedText(title.text, QString(), Core::TextContext({
+			.session = &history->session(),
+			.repaint = [raw = item.get()] { raw->update(); },
+			.customEmojiLoopLimit = title.isStatic ? -1 : 0,
+		}));
+
+		item->setIcon(Icon(showColors ? filter : filter.withColorIndex({})));
+		const auto action = menu->addAction(std::move(item));
 		action->setEnabled(contains
 			? validator.canRemove(id)
 			: validator.canAdd());
 	}
+
+	const auto limit = [session = &controller->session()] {
+		return Data::PremiumLimits(session).dialogFiltersCurrent();
+	};
+	if ((list.size() - 1) < limit()) {
+		menu->addAction(tr::lng_filters_create(tr::now), [=] {
+			const auto strong = weak.get();
+			if (!strong) {
+				return;
+			}
+			const auto session = &strong->session();
+			const auto &list = session->data().chatsFilters().list();
+			if ((list.size() - 1) >= limit()) {
+				return;
+			}
+			const auto chooseNextId = [&] {
+				auto id = 2;
+				while (ranges::contains(list, id, &Data::ChatFilter::id)) {
+					++id;
+				}
+				return id;
+			};
+			auto filter =
+				Data::ChatFilter({}, {}, {}, {}, {}, { history }, {}, {});
+			const auto send = [=](const Data::ChatFilter &filter) {
+				session->api().request(MTPmessages_UpdateDialogFilter(
+					MTP_flags(MTPmessages_UpdateDialogFilter::Flag::f_filter),
+					MTP_int(chooseNextId()),
+					filter.tl()
+				)).done([=] {
+					session->data().chatsFilters().reload();
+				}).send();
+			};
+			strong->uiShow()->show(
+				Box(EditFilterBox, strong, std::move(filter), send, nullptr));
+		}, &st::menuIconShowInFolder);
+	}
+
 	history->owner().chatsFilters().changed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
+		menu->hideMenu();
+	}, menu->lifetime());
+}
+
+bool FillChooseFilterWithAdminedGroupsMenu(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::PopupMenu*> menu,
+		not_null<UserData*> user,
+		std::shared_ptr<rpl::event_stream<>> listUpdates,
+		std::vector<not_null<PeerData*>> common,
+		std::shared_ptr<std::vector<PeerId>> collectCommon) {
+	const auto weak = base::make_weak(controller);
+	const auto session = &controller->session();
+	const auto &list = session->data().chatsFilters().list();
+	const auto showColors = session->data().chatsFilters().tagsEnabled();
+	auto added = 0;
+	for (const auto &filter : list) {
+		const auto id = filter.id();
+		if (!id) {
+			continue;
+		}
+		auto canRestrictList = std::vector<not_null<PeerData*>>();
+		const auto maybeAppend = [&](not_null<History*> chat) {
+			const auto channel = chat->peer->asChannel();
+			if (channel && channel->canRestrictParticipant(user)) {
+				if (channel->isGroupAdmin(user) && !channel->amCreator()) {
+					return;
+				}
+				canRestrictList.push_back(chat->peer);
+			}
+		};
+		for (const auto &chat : filter.always()) {
+			maybeAppend(chat);
+		}
+		for (const auto &chat : filter.pinned()) {
+			maybeAppend(chat);
+		}
+		if (canRestrictList.empty()) {
+			continue;
+		}
+
+		const auto checked = std::make_shared<bool>(false);
+
+		const auto contains = false;
+		const auto title = filter.title();
+		auto item = base::make_unique_q<FilterAction>(
+			menu->menu(),
+			menu->st().menu,
+			new QAction(
+				Ui::Text::FixAmpersandInAction(title.text.text),
+				menu.get()),
+			contains ? &st::mediaPlayerMenuCheck : nullptr,
+			contains ? &st::mediaPlayerMenuCheck : nullptr);
+		const auto triggered = [=, raw = item.get()] {
+			*checked = !*checked;
+			if (*checked) {
+				for (const auto &peer : canRestrictList) {
+					if (ranges::contains(common, peer)) {
+						collectCommon->push_back(peer->id);
+					}
+				}
+			} else {
+				for (const auto &peer : canRestrictList) {
+					if (const auto i = ranges::find(*collectCommon, peer->id);
+							i != collectCommon->end()) {
+						collectCommon->erase(i);
+					}
+				}
+			}
+			raw->Ui::Menu::Action::setIcon(
+				*checked ? &st::mediaPlayerMenuCheck : nullptr,
+				*checked ? &st::mediaPlayerMenuCheck : nullptr);
+			listUpdates->fire({});
+		};
+		item->setActionTriggered([=] {
+			triggered();
+
+			auto groups = session->settings().moderateCommonGroups();
+			if (*checked && !ranges::contains(groups, id)) {
+				groups.push_back(id);
+			} else if (!*checked) {
+				groups.erase(ranges::remove(groups, id), groups.end());
+			}
+			session->settings().setModerateCommonGroups(groups);
+			session->saveSettingsDelayed();
+		});
+		if (ranges::contains(
+				session->settings().moderateCommonGroups(),
+				id)) {
+			triggered();
+		}
+		item->setPreventClose(true);
+		item->setMarkedText(title.text, QString(), Core::TextContext({
+			.session = session,
+			.repaint = [raw = item.get()] { raw->update(); },
+			.customEmojiLoopLimit = title.isStatic ? -1 : 0,
+		}));
+
+		item->setIcon(Icon(showColors ? filter : filter.withColorIndex({})));
+		menu->addAction(std::move(item));
+		added++;
+	}
+
+	session->data().chatsFilters().changed(
+	) | rpl::on_next([=] {
 		menu->hideMenu();
 	}, menu->lifetime());
+
+	return added;
+}
+
+History *HistoryFromMimeData(
+		const QMimeData *mime,
+		not_null<Main::Session*> session) {
+	const auto mimeFormat = u"application/x-telegram-dialog"_q;
+	if (mime->hasFormat(mimeFormat)) {
+		auto peerId = int64(-1);
+		auto isTestMode = false;
+		auto stream = QDataStream(mime->data(mimeFormat));
+		stream >> peerId;
+		stream >> isTestMode;
+		if (isTestMode != session->isTestMode()) {
+			return nullptr;
+		}
+		return session->data().historyLoaded(PeerId(peerId));
+	}
+	if (mime->hasText()) {
+		auto text = mime->text().trimmed();
+		if (text.startsWith('@')) {
+			text = text.mid(1);
+		} else if (text.startsWith(u"https://t.me/"_q)) {
+			text = text.mid(13);
+		} else {
+			return nullptr;
+		}
+		if (const auto peer = session->data().peerByUsername(text)) {
+			return session->data().historyLoaded(peer->id);
+		}
+	}
+	return nullptr;
+}
+
+void SetupFilterDragAndDrop(
+		not_null<Ui::RpWidget*> outer,
+		not_null<Main::Session*> session,
+		Fn<std::optional<FilterId>(QPoint)> filterIdAtPosition,
+		Fn<FilterId()> activeFilterId,
+		Fn<void(FilterId)> selectByFilterId) {
+	const auto hasAction = [=](not_null<QDropEvent*> drop, bool perform) {
+		const auto mimeData = drop->mimeData();
+		const auto filterId = filterIdAtPosition(
+			outer->mapToGlobal(drop->pos()));
+		if (!filterId) {
+			return false;
+		}
+		const auto id = *filterId;
+		if (const auto h = HistoryFromMimeData(mimeData, session)) {
+			auto v = ChooseFilterValidator(h);
+			if (id) {
+				if (v.canAdd(id)) {
+					if (!v.limitReached(id, true).reached) {
+						if (perform) {
+							v.add(id);
+						}
+						selectByFilterId(perform ? FilterId(-1) : id);
+						return true;
+					}
+				}
+			} else {
+				if (const auto active = activeFilterId();
+						active && v.canRemove(active)) {
+					if (perform) {
+						v.remove(active);
+					}
+					selectByFilterId(perform ? FilterId(-1) : active);
+					return true;
+				}
+			}
+		}
+		selectByFilterId(-1);
+		return false;
+	};
+	outer->setAcceptDrops(true);
+	outer->events(
+	) | rpl::filter([](not_null<QEvent*> e) {
+		return e->type() == QEvent::DragEnter
+			|| e->type() == QEvent::DragMove
+			|| e->type() == QEvent::DragLeave
+			|| e->type() == QEvent::Drop;
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::DragEnter) {
+			const auto de = static_cast<QDragEnterEvent*>(e.get());
+			if (hasAction(de, false)) {
+				de->acceptProposedAction();
+			} else {
+				de->ignore();
+			}
+		} else if (e->type() == QEvent::DragMove) {
+			const auto dm = static_cast<QDragMoveEvent*>(e.get());
+			if (hasAction(dm, false)) {
+				dm->acceptProposedAction();
+			} else {
+				dm->ignore();
+			}
+		} else if (e->type() == QEvent::DragLeave) {
+			selectByFilterId(-1);
+		} else if (e->type() == QEvent::Drop) {
+			const auto drop = static_cast<QDropEvent*>(e.get());
+			if (hasAction(drop, true)) {
+				drop->acceptProposedAction();
+			} else {
+				drop->ignore();
+			}
+		}
+	}, outer->lifetime());
 }
diff --git a/Telegram/SourceFiles/boxes/choose_filter_box.h b/Telegram/SourceFiles/boxes/choose_filter_box.h
index e6c5ad3353157f..59cff9633304b3 100644
--- a/Telegram/SourceFiles/boxes/choose_filter_box.h
+++ b/Telegram/SourceFiles/boxes/choose_filter_box.h
@@ -7,7 +7,12 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+namespace Main {
+class Session;
+} // namespace Main
+
 namespace Ui {
+class RpWidget;
 class PopupMenu;
 } // namespace Ui
 
@@ -26,6 +31,7 @@ class ChooseFilterValidator final {
 	};
 
 	[[nodiscard]] bool canAdd() const;
+	[[nodiscard]] bool canAdd(FilterId filterId) const;
 	[[nodiscard]] bool canRemove(FilterId filterId) const;
 	[[nodiscard]] LimitData limitReached(
 		FilterId filterId,
@@ -43,3 +49,22 @@ void FillChooseFilterMenu(
 	not_null<Window::SessionController*> controller,
 	not_null<Ui::PopupMenu*> menu,
 	not_null<History*> history);
+
+bool FillChooseFilterWithAdminedGroupsMenu(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::PopupMenu*> menu,
+	not_null<UserData*> user,
+	std::shared_ptr<rpl::event_stream<>> listUpdates,
+	std::vector<not_null<PeerData*>> common,
+	std::shared_ptr<std::vector<PeerId>> collectCommon);
+
+void SetupFilterDragAndDrop(
+	not_null<Ui::RpWidget*> outer,
+	not_null<Main::Session*> session,
+	Fn<std::optional<FilterId>(QPoint)> filterIdAtPosition,
+	Fn<FilterId()> activeFilterId,
+	Fn<void(FilterId)> selectByFilterId);
+
+[[nodiscard]] History *HistoryFromMimeData(
+	const QMimeData *mime,
+	not_null<Main::Session*> session);
diff --git a/Telegram/SourceFiles/boxes/compose_ai_box.cpp b/Telegram/SourceFiles/boxes/compose_ai_box.cpp
new file mode 100644
index 00000000000000..862e3796bf9983
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/compose_ai_box.cpp
@@ -0,0 +1,1963 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/compose_ai_box.h"
+
+#include "api/api_compose_with_ai.h"
+#include "apiwrap.h"
+#include "boxes/create_ai_tone_box.h"
+#include "core/shortcuts.h"
+#include "menu/menu_check_item.h"
+#include "settings/sections/settings_shortcuts.h"
+#include "ui/widgets/checkbox.h"
+#include "window/window_session_controller.h"
+#include "boxes/premium_preview_box.h"
+#include "boxes/share_box.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "chat_helpers/stickers_lottie.h"
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "core/core_settings.h"
+#include "core/ui_integration.h"
+#include "data/data_ai_compose_tones.h"
+#include "data/data_document.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "lang/lang_keys.h"
+#include "main/session/session_show.h"
+#include "main/main_session.h"
+#include "settings/sections/settings_premium.h"
+#include "spellcheck/platform/platform_language.h"
+#include "ui/boxes/about_cocoon_box.h"
+#include "ui/boxes/choose_language_box.h"
+#include "ui/chat/chat_style.h"
+#include "ui/controls/labeled_emoji_tabs.h"
+#include "ui/controls/send_button.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/effects/skeleton_animation.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "ui/text/custom_emoji_text_badge.h"
+#include "ui/text/text_extended_data.h"
+#include "ui/text/text_utilities.h"
+#include "ui/vertical_list.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/menu/menu_action.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/tooltip.h"
+#include "styles/style_basic.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_widgets.h"
+
+#include <algorithm>
+#include <array>
+
+namespace HistoryView::Controls {
+namespace {
+
+constexpr auto kAiComposeStyleTooltipHiddenPref = "ai_compose_style_tooltip_hidden"_cs;
+
+enum class ComposeAiMode {
+	Translate,
+	Style,
+	Fix,
+};
+
+enum class CardState {
+	Waiting,
+	Loading,
+	Ready,
+	Failed,
+};
+
+[[nodiscard]] QColor ComposeAiColorWithAlpha(
+		const style::color &color,
+		float64 alpha) {
+	auto result = color->c;
+	result.setAlphaF(result.alphaF() * alpha);
+	return result;
+}
+
+[[nodiscard]] TextWithEntities HighlightDiff(TextWithEntities text) {
+	return Ui::Text::Colorized(
+		Ui::Text::Wrapped(std::move(text), EntityType::Underline), 1);
+}
+
+[[nodiscard]] TextWithEntities StrikeOutDiff(TextWithEntities text) {
+	return Ui::Text::Colorized(
+		Ui::Text::Wrapped(std::move(text), EntityType::StrikeOut), 2);
+}
+
+[[nodiscard]] TextWithEntities BuildDiffDisplay(
+		const Api::ComposeWithAi::Diff &diff) {
+	auto result = TextWithEntities();
+	auto entities = diff.entities;
+	std::stable_sort(
+		entities.begin(),
+		entities.end(),
+		[](const auto &a, const auto &b) {
+			return a.offset < b.offset;
+		});
+	const auto size = int(diff.text.text.size());
+	auto taken = 0;
+	for (const auto &entity : entities) {
+		const auto offset = std::clamp(entity.offset, 0, size);
+		const auto length = std::clamp(entity.length, 0, size - offset);
+		if (offset > taken) {
+			result.append(Ui::Text::Mid(diff.text, taken, offset - taken));
+		}
+		auto part = Ui::Text::Mid(diff.text, offset, length);
+		switch (entity.type) {
+		case Api::ComposeWithAi::DiffEntity::Type::Insert:
+			result.append(HighlightDiff(std::move(part)));
+			break;
+		case Api::ComposeWithAi::DiffEntity::Type::Replace:
+			if (!entity.oldText.isEmpty()) {
+				result.append(
+					StrikeOutDiff(
+						TextWithEntities::Simple(entity.oldText)));
+			}
+			result.append(HighlightDiff(std::move(part)));
+			break;
+		case Api::ComposeWithAi::DiffEntity::Type::Delete:
+			result.append(StrikeOutDiff(std::move(part)));
+			break;
+		}
+		taken = std::max(taken, offset + length);
+	}
+	if (taken < size) {
+		result.append(Ui::Text::Mid(diff.text, taken));
+	}
+	return result;
+}
+
+[[nodiscard]] QString FromTitle(LanguageId id) {
+	return tr::lng_ai_compose_original(tr::now);
+}
+
+[[nodiscard]] TextWithEntities ToTitle(
+		LanguageId id,
+		const QString &style) {
+	const auto name = style.isEmpty()
+		? tr::link(Ui::LanguageName(id))
+		: tr::link(tr::lng_ai_compose_name_style(
+			tr::now,
+			lt_name,
+			tr::marked(Ui::LanguageName(id)),
+			lt_style,
+			tr::marked(style),
+			tr::marked));
+	return tr::lng_ai_compose_to_language(
+		tr::now,
+		lt_language,
+		name,
+		tr::marked);
+}
+
+[[nodiscard]] LanguageId DefaultAiTranslateTo(LanguageId offeredFrom) {
+	const auto current = LanguageId{
+		QLocale(Lang::LanguageIdOrDefault(Lang::Id())).language()
+	};
+	if (current && (current != offeredFrom)) {
+		return current;
+	}
+	const auto english = LanguageId{ QLocale::English };
+	if (english != offeredFrom) {
+		return english;
+	}
+	return LanguageId{ QLocale::Spanish };
+}
+
+[[nodiscard]] const style::icon &ModeIcon(
+		ComposeAiMode mode,
+		bool active) {
+	switch (mode) {
+	case ComposeAiMode::Translate:
+		return active
+			? st::aiComposeTabTranslateIconActive
+			: st::aiComposeTabTranslateIcon;
+	case ComposeAiMode::Style:
+		return active
+			? st::aiComposeTabStyleIconActive
+			: st::aiComposeTabStyleIcon;
+	case ComposeAiMode::Fix:
+		return active
+			? st::aiComposeTabFixIconActive
+			: st::aiComposeTabFixIcon;
+	}
+	return active
+		? st::aiComposeTabTranslateIconActive
+		: st::aiComposeTabTranslateIcon;
+}
+
+[[nodiscard]] qreal ComposeAiPillRadius(int height) {
+	return height / 2.;
+}
+
+[[nodiscard]] QColor ComposeAiActiveBackgroundColor(
+		const style::color &color) {
+	return ComposeAiColorWithAlpha(
+		color,
+		st::aiComposeButtonBgActiveOpacity);
+}
+
+[[nodiscard]] QColor ComposeAiRippleColor(
+		const style::RippleAnimation &ripple,
+		float64 opacity) {
+	return ComposeAiColorWithAlpha(
+		ripple.color,
+		opacity);
+}
+
+[[nodiscard]] Ui::LabeledEmojiTab ResolveStyleDescriptor(
+		const Data::AiComposeTone &tone) {
+	return {
+		.id = tone.isDefault ? tone.defaultType : QString::number(tone.id),
+		.label = tone.title,
+		.customEmojiData = tone.emojiId
+			? Data::SerializeCustomEmojiId(tone.emojiId)
+			: QString(),
+	};
+}
+
+[[nodiscard]] std::vector<Ui::LabeledEmojiTab> ResolveStyleDescriptors(
+		const std::vector<Data::AiComposeTone> &tones) {
+	auto result = std::vector<Ui::LabeledEmojiTab>();
+	result.reserve(tones.size());
+	for (const auto &tone : tones) {
+		result.push_back(ResolveStyleDescriptor(tone));
+	}
+	return result;
+}
+
+[[nodiscard]] std::vector<Ui::LabeledEmojiTab> ResolveTranslateStyleDescriptors(
+		not_null<Main::Session*> session,
+		const std::vector<Ui::LabeledEmojiTab> &styles) {
+	const auto neutral = ChatHelpers::GenerateLocalTgsSticker(
+		session,
+		u"chat/white_flag_emoji"_q);
+	auto result = std::vector<Ui::LabeledEmojiTab>();
+	result.reserve(styles.size() + 1);
+	result.push_back({
+		.id = QString(),
+		.label = tr::lng_ai_compose_style_neutral(tr::now),
+		.customEmojiData = Data::SerializeCustomEmojiId(neutral->id),
+	});
+	result.insert(end(result), begin(styles), end(styles));
+	return result;
+}
+
+[[nodiscard]] auto WithAddStyleTab(std::vector<Ui::LabeledEmojiTab> tabs)
+-> std::vector<Ui::LabeledEmojiTab> {
+	tabs.push_back({
+		.id = u"_add_style"_q,
+		.label = tr::lng_ai_compose_tone_create(tr::now),
+		.icon = &st::aiComposeAddStyleIcon,
+		.iconActive = &st::aiComposeAddStyleIconOver,
+	});
+	return tabs;
+}
+
+[[nodiscard]] TextWithEntities LoadingTitleSparkle(
+		not_null<Main::Session*> session) {
+	const auto sparkles = ChatHelpers::GenerateLocalTgsSticker(
+		session,
+		u"chat/sparkles_emoji"_q);
+	return tr::marked(u" "_q)
+		.append(Data::SingleCustomEmoji(sparkles->id));
+}
+
+class ComposeAiModeButton final : public Ui::RippleButton {
+public:
+	ComposeAiModeButton(
+		QWidget *parent,
+		ComposeAiMode mode,
+		QString label);
+
+	void setSelected(bool selected);
+	[[nodiscard]] ComposeAiMode mode() const;
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	[[nodiscard]] QImage prepareRippleMask() const override;
+
+private:
+	const ComposeAiMode _mode;
+	const QString _label;
+	bool _selected = false;
+
+};
+
+class ComposeAiModeTabs final : public Ui::RpWidget {
+public:
+	ComposeAiModeTabs(QWidget *parent);
+
+	void setActive(ComposeAiMode mode);
+	void setChangedCallback(Fn<void(ComposeAiMode)> callback);
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	const not_null<ComposeAiModeButton*> _translate;
+	const not_null<ComposeAiModeButton*> _style;
+	const not_null<ComposeAiModeButton*> _fix;
+	Fn<void(ComposeAiMode)> _changed;
+	ComposeAiMode _active = ComposeAiMode::Style;
+
+};
+
+class ComposeAiPreviewCard final : public Ui::RpWidget {
+public:
+	ComposeAiPreviewCard(
+		QWidget *parent,
+		not_null<Main::Session*> session,
+		TextWithEntities original,
+		std::shared_ptr<Ui::ChatStyle> chatStyle);
+
+	void setResizeCallback(Fn<void()> callback);
+	void setChooseCallback(Fn<void()> callback);
+	void setCopyCallback(Fn<void()> callback);
+	void setEmojifyChangedCallback(Fn<void(bool)> callback);
+	void setOriginalTitle(const QString &title);
+	void setOriginalVisible(bool visible);
+	void setResultTitle(const TextWithEntities &title);
+	void setEmojifyVisible(bool visible);
+	void setEmojifyChecked(bool checked);
+	void setState(CardState state);
+	void setResultText(TextWithEntities text);
+	void setShow(std::shared_ptr<Ui::Show> show);
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	void refreshGeometry();
+	void updateOriginalToggleIcon();
+
+	const Ui::Text::MarkedContext _context;
+	const TextWithEntities _original;
+	const not_null<Ui::FlatLabel*> _originalTitle;
+	const not_null<Ui::FlatLabel*> _originalBody;
+	const not_null<Ui::IconButton*> _originalToggle;
+	const not_null<Ui::FlatLabel*> _resultTitle;
+	const not_null<Ui::FlatLabel*> _resultBody;
+	const not_null<Ui::IconButton*> _copy;
+	const not_null<Ui::Checkbox*> _emojify;
+	Fn<void()> _resized;
+	Fn<void()> _chooseCallback;
+	Fn<void()> _copyCallback;
+	Fn<void(bool)> _emojifyChanged;
+	bool _ignoreResizedCallback = false;
+	bool _originalExpanded = false;
+	bool _originalVisible = true;
+	bool _emojifyVisible = false;
+	bool _dividerVisible = false;
+	int _dividerTop = 0;
+	CardState _state = CardState::Waiting;
+	Ui::SkeletonAnimation _skeleton;
+	std::array<Ui::Text::SpecialColor, 2> _diffColors;
+
+};
+
+class ComposeAiContent final : public Ui::RpWidget {
+public:
+	ComposeAiContent(
+		QWidget *parent,
+		not_null<Ui::GenericBox*> box,
+		ComposeAiBoxArgs args);
+	~ComposeAiContent();
+
+	[[nodiscard]] bool hasResult() const;
+	[[nodiscard]] const TextWithEntities &result() const;
+	[[nodiscard]] const std::vector<Ui::LabeledEmojiTab> &stylesData() const;
+	[[nodiscard]] const std::vector<Data::AiComposeTone> &tones() const;
+	void setReadyChangedCallback(Fn<void(bool)> callback);
+	void setLoadingChangedCallback(Fn<void(bool)> callback);
+	void setPremiumFloodCallback(Fn<void()> callback);
+	void setModeChangedCallback(Fn<void(ComposeAiMode)> callback);
+	void setStyleSelectedCallback(Fn<void()> callback);
+	[[nodiscard]] ComposeAiMode mode() const;
+	[[nodiscard]] bool hasStyleSelection() const;
+	void setModeTabs(not_null<ComposeAiModeTabs*> tabs);
+	void setStyleTabs(not_null<Ui::SlideWrap<Ui::LabeledEmojiScrollTabs>*> stylesWrap);
+	void refreshTones();
+	void selectToneById(uint64 id);
+	void start();
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+
+private:
+	void refreshLayout();
+	void chooseLanguage();
+	void copyResult();
+	void setMode(ComposeAiMode mode);
+	void updateTitles();
+	void updatePinnedTabs(anim::type animated);
+	void cancelRequest();
+	void request();
+	void resetState(CardState state);
+	void applyResult(Api::ComposeWithAi::Result &&result);
+	void showError(const QString &error = {});
+	void setAuthorId(UserId authorId);
+	void notifyLoadingChanged();
+	void notifyReadyChanged();
+	[[nodiscard]] QString currentTranslateStyle() const;
+	[[nodiscard]] QString currentTranslateStyleLabel() const;
+
+	const not_null<Ui::GenericBox*> _box;
+	const not_null<Main::Session*> _session;
+	const TextWithEntities _original;
+	const LanguageId _detectedFrom;
+	LanguageId _to;
+	std::vector<Data::AiComposeTone> _tones;
+	std::vector<Ui::LabeledEmojiTab> _stylesData;
+	std::vector<Ui::LabeledEmojiTab> _translateStylesData;
+	QPointer<ComposeAiModeTabs> _tabs;
+	QPointer<Ui::LabeledEmojiScrollTabs> _styles;
+	QPointer<Ui::SlideWrap<Ui::LabeledEmojiScrollTabs>> _stylesWrap;
+	const not_null<ComposeAiPreviewCard*> _preview;
+	const not_null<Ui::FlatLabel*> _authorLabel;
+	Fn<void(bool)> _readyChanged;
+	Fn<void(bool)> _loadingChanged;
+	Fn<void()> _premiumFlood;
+	Fn<void(ComposeAiMode)> _modeChanged;
+	Fn<void()> _styleSelected;
+	ComposeAiMode _mode = ComposeAiMode::Style;
+	int _styleIndex = -1;
+	int _translateStyleIndex = 0;
+	UserId _authorId = UserId(0);
+	bool _emojify = false;
+	CardState _state = CardState::Waiting;
+	mtpRequestId _requestId = 0;
+	int _requestToken = 0;
+	TextWithEntities _result;
+
+};
+
+// ComposeAiModeButton
+
+ComposeAiModeButton::ComposeAiModeButton(
+	QWidget *parent,
+	ComposeAiMode mode,
+	QString label)
+: RippleButton(parent, st::aiComposeButtonRippleInactive)
+, _mode(mode)
+, _label(std::move(label)) {
+	setCursor(style::cur_pointer);
+	setAccessibleName(_label);
+}
+
+void ComposeAiModeButton::setSelected(bool selected) {
+	if (_selected == selected) {
+		return;
+	}
+	_selected = selected;
+	update();
+}
+
+ComposeAiMode ComposeAiModeButton::mode() const {
+	return _mode;
+}
+
+void ComposeAiModeButton::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	PainterHighQualityEnabler hq(p);
+
+	const auto radius = ComposeAiPillRadius(height());
+	if (_selected) {
+		p.setPen(Qt::NoPen);
+		p.setBrush(ComposeAiActiveBackgroundColor(
+			st::aiComposeTabButtonBgActive));
+		p.drawRoundedRect(
+			rect(),
+			radius,
+			radius);
+	}
+	const auto ripple = ComposeAiRippleColor(
+		_selected
+			? st::aiComposeButtonRippleActive
+			: st::aiComposeButtonRippleInactive,
+		_selected
+			? st::aiComposeButtonRippleActiveOpacity
+			: st::aiComposeButtonRippleInactiveOpacity);
+	paintRipple(p, 0, 0, &ripple);
+
+	const auto &icon = ModeIcon(_mode, _selected);
+	const auto iconLeft = (width() - icon.width()) / 2;
+	icon.paint(p, iconLeft, st::aiComposeTabIconTop, width());
+
+	p.setPen(_selected
+		? st::aiComposeTabLabelFgActive
+		: st::aiComposeTabLabelFg);
+	p.setFont(st::aiComposeTabLabelFont);
+	p.drawText(
+		QRect(
+			0,
+			st::aiComposeTabLabelTop,
+			width(),
+			height() - st::aiComposeTabLabelTop),
+		Qt::AlignHCenter | Qt::AlignTop,
+		_label);
+}
+
+QImage ComposeAiModeButton::prepareRippleMask() const {
+	return Ui::RippleAnimation::MaskByDrawer(size(), false, [&](QPainter &p) {
+		p.setPen(Qt::NoPen);
+		p.setBrush(Qt::white);
+		const auto radius = ComposeAiPillRadius(height());
+		p.drawRoundedRect(
+			rect(),
+			radius,
+			radius);
+	});
+}
+
+// ComposeAiModeTabs
+
+ComposeAiModeTabs::ComposeAiModeTabs(QWidget *parent)
+: RpWidget(parent)
+, _translate(Ui::CreateChild<ComposeAiModeButton>(
+	this,
+	ComposeAiMode::Translate,
+	tr::lng_ai_compose_tab_translate(tr::now)))
+, _style(Ui::CreateChild<ComposeAiModeButton>(
+	this,
+	ComposeAiMode::Style,
+	tr::lng_ai_compose_tab_style(tr::now)))
+, _fix(Ui::CreateChild<ComposeAiModeButton>(
+	this,
+	ComposeAiMode::Fix,
+	tr::lng_ai_compose_tab_fix(tr::now))) {
+	const auto bind = [=](not_null<ComposeAiModeButton*> button) {
+		button->setClickedCallback([=] {
+			setActive(button->mode());
+			if (_changed) {
+				_changed(button->mode());
+			}
+		});
+	};
+	bind(_translate);
+	bind(_style);
+	bind(_fix);
+	setActive(ComposeAiMode::Style);
+}
+
+void ComposeAiModeTabs::setActive(ComposeAiMode mode) {
+	_active = mode;
+	_translate->setSelected(mode == ComposeAiMode::Translate);
+	_style->setSelected(mode == ComposeAiMode::Style);
+	_fix->setSelected(mode == ComposeAiMode::Fix);
+}
+
+void ComposeAiModeTabs::setChangedCallback(Fn<void(ComposeAiMode)> callback) {
+	_changed = std::move(callback);
+}
+
+int ComposeAiModeTabs::resizeGetHeight(int newWidth) {
+	const auto padding = st::aiComposeTabsPadding;
+	const auto skip = st::aiComposeTabsSkip;
+	const auto innerWidth = newWidth - padding.left() - padding.right();
+	const auto buttonWidth = (innerWidth - (2 * skip)) / 3;
+	const auto buttonHeight = st::aiComposeTabsHeight
+		- padding.top()
+		- padding.bottom();
+	const auto top = padding.top();
+	auto left = padding.left();
+	for (const auto &button : { _translate, _style, _fix }) {
+		button->setGeometry(left, top, buttonWidth, buttonHeight);
+		left += buttonWidth + skip;
+	}
+	return st::aiComposeTabsHeight;
+}
+
+void ComposeAiModeTabs::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	PainterHighQualityEnabler hq(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(st::aiComposeTabsBg);
+	const auto radius = st::aiComposeTabsRadius;
+	p.drawRoundedRect(
+		rect(),
+		radius,
+		radius);
+}
+
+// ComposeAiPreviewCard
+
+ComposeAiPreviewCard::ComposeAiPreviewCard(
+	QWidget *parent,
+	not_null<Main::Session*> session,
+	TextWithEntities original,
+	std::shared_ptr<Ui::ChatStyle> chatStyle)
+: RpWidget(parent)
+, _context(Core::TextContext({ .session = session }))
+, _original(std::move(original))
+, _originalTitle(Ui::CreateChild<Ui::FlatLabel>(
+	this,
+	st::aiComposeCardTitle))
+, _originalBody(Ui::CreateChild<Ui::FlatLabel>(
+	this,
+	st::aiComposeBodyLabel))
+, _originalToggle(Ui::CreateChild<Ui::IconButton>(
+	this,
+	st::aiComposeExpandButton))
+, _resultTitle(Ui::CreateChild<Ui::FlatLabel>(
+	this,
+	st::aiComposeCardTitle))
+, _resultBody(Ui::CreateChild<Ui::FlatLabel>(
+	this,
+	st::aiComposeBodyLabel))
+, _copy(Ui::CreateChild<Ui::IconButton>(
+	this,
+	st::aiComposeCopyButton))
+, _emojify(
+	Ui::CreateChild<Ui::Checkbox>(
+		this,
+		tr::lng_ai_compose_emojify(tr::now),
+		st::aiComposeEmojifyCheckbox,
+		std::make_unique<Ui::RoundCheckView>(st::defaultCheck,false)))
+, _skeleton(_resultBody) {
+	_originalBody->setSelectable(true);
+	_originalBody->setMarkedText(_original, _context);
+	_resultTitle->setClickHandlerFilter([=](const auto &...) {
+		if (_chooseCallback) {
+			_chooseCallback();
+		}
+		return false;
+	});
+	_resultBody->setSelectable(true);
+	const auto watchHeight = [=](not_null<Ui::FlatLabel*> label) {
+		label->heightValue(
+		) | rpl::skip(1) | rpl::on_next([=] {
+			if (_resized && !_ignoreResizedCallback) {
+				_resized();
+			}
+		}, lifetime());
+	};
+	watchHeight(_originalBody);
+	watchHeight(_resultBody);
+	_diffColors[0] = { &st::boxTextFgGood->p, &st::boxTextFgGood->p };
+	_diffColors[1] = { &st::attentionButtonFg->p, &st::attentionButtonFg->p };
+	_resultBody->setColors(_diffColors);
+	_originalToggle->setClickedCallback([=] {
+		_originalExpanded = !_originalExpanded;
+		updateOriginalToggleIcon();
+		if (_resized) {
+			_resized();
+		}
+	});
+	_copy->setClickedCallback([=] {
+		if (_copyCallback) {
+			_copyCallback();
+		}
+	});
+	_copy->setAccessibleName(tr::lng_sr_ai_compose_copy_result(tr::now));
+	_emojify->checkedChanges(
+	) | rpl::on_next([=](bool checked) {
+		if (_emojifyChanged) {
+			_emojifyChanged(checked);
+		}
+	}, _emojify->lifetime());
+	setOriginalTitle(tr::lng_ai_compose_original(tr::now));
+	setResultTitle(tr::lng_ai_compose_result(tr::now, tr::marked));
+	_resultBody->setMarkedText(_original, _context);
+	_copy->setVisible(false);
+	updateOriginalToggleIcon();
+	if (chatStyle) {
+		const auto style = chatStyle;
+		const auto s = session.get();
+		const auto setupCaches = [=](not_null<Ui::FlatLabel*> label) {
+			label->setPreCache([=] {
+				return style->messageStyle(false, false).preCache.get();
+			});
+			label->setBlockquoteCache([=] {
+				return style->coloredQuoteCache(
+					false,
+					s->user()->colorIndex());
+			});
+		};
+		setupCaches(_originalBody);
+		setupCaches(_resultBody);
+	}
+}
+
+void ComposeAiPreviewCard::setResizeCallback(Fn<void()> callback) {
+	_resized = std::move(callback);
+}
+
+void ComposeAiPreviewCard::setChooseCallback(Fn<void()> callback) {
+	_chooseCallback = std::move(callback);
+}
+
+void ComposeAiPreviewCard::setCopyCallback(Fn<void()> callback) {
+	_copyCallback = std::move(callback);
+}
+
+void ComposeAiPreviewCard::setEmojifyChangedCallback(Fn<void(bool)> callback) {
+	_emojifyChanged = std::move(callback);
+}
+
+void ComposeAiPreviewCard::setOriginalTitle(const QString &title) {
+	_originalTitle->setText(title);
+	refreshGeometry();
+}
+
+void ComposeAiPreviewCard::setOriginalVisible(bool visible) {
+	if (_originalVisible == visible) {
+		return;
+	}
+	_originalVisible = visible;
+	_originalTitle->setVisible(visible);
+	_originalBody->setVisible(visible);
+	_originalToggle->setVisible(false);
+	refreshGeometry();
+}
+
+void ComposeAiPreviewCard::setResultTitle(const TextWithEntities &title) {
+	_resultTitle->setMarkedText(title);
+	refreshGeometry();
+}
+
+void ComposeAiPreviewCard::setEmojifyVisible(bool visible) {
+	_emojifyVisible = visible;
+	_emojify->setVisible(visible);
+	refreshGeometry();
+}
+
+void ComposeAiPreviewCard::setEmojifyChecked(bool checked) {
+	_emojify->setChecked(checked, Ui::Checkbox::NotifyAboutChange::DontNotify);
+	refreshGeometry();
+}
+
+void ComposeAiPreviewCard::setState(CardState state) {
+	if (_state == state) {
+		return;
+	}
+	const auto wasLoading = (_state == CardState::Loading);
+	_state = state;
+	switch (_state) {
+	case CardState::Waiting:
+	case CardState::Failed:
+		_resultBody->setMarkedText(_original, _context);
+		_copy->setVisible(false);
+		if (wasLoading) {
+			_skeleton.stop();
+		}
+		break;
+	case CardState::Loading:
+		_resultBody->setMarkedText(_original, _context);
+		_copy->setVisible(false);
+		_skeleton.start();
+		break;
+	case CardState::Ready:
+		_copy->setVisible(true);
+		if (wasLoading) {
+			_skeleton.stop();
+		}
+		break;
+	}
+	refreshGeometry();
+}
+
+void ComposeAiPreviewCard::setResultText(TextWithEntities text) {
+	_resultBody->setMarkedText(std::move(text), _context);
+	refreshGeometry();
+}
+
+void ComposeAiPreviewCard::setShow(std::shared_ptr<Ui::Show> show) {
+	const auto setupFilter = [&](not_null<Ui::FlatLabel*> label) {
+		label->setClickHandlerFilter([=](
+				const ClickHandlerPtr &handler,
+				Qt::MouseButton button) {
+			if (dynamic_cast<Ui::Text::PreClickHandler*>(handler.get())) {
+				ActivateClickHandler(label, handler, ClickContext{
+					.button = button,
+					.other = QVariant::fromValue(ClickHandlerContext{
+						.show = show,
+					})
+				});
+				return false;
+			}
+			return true;
+		});
+	};
+	setupFilter(_originalBody);
+	setupFilter(_resultBody);
+}
+
+int ComposeAiPreviewCard::resizeGetHeight(int newWidth) {
+	const auto padding = st::aiComposeCardPadding;
+	const auto contentWidth = newWidth - padding.left() - padding.right();
+	auto y = padding.top();
+
+	_dividerVisible = false;
+	if (_originalVisible) {
+		_originalTitle->show();
+		_originalBody->show();
+		_originalTitle->resizeToWidth(contentWidth);
+		_originalToggle->setVisible(false);
+
+		const auto toggleTop = y
+			+ (_originalTitle->height() - _originalToggle->height()) / 2;
+		_originalToggle->moveToRight(padding.right(), toggleTop, newWidth);
+		const auto originalTitleWidth = contentWidth
+			- _originalToggle->width()
+			- st::aiComposeCardControlSkip;
+		_originalTitle->setGeometryToLeft(
+			padding.left(),
+			y,
+			std::max(originalTitleWidth, 0),
+			_originalTitle->height(),
+			newWidth);
+		y = std::max(
+			y + _originalTitle->height(),
+			toggleTop + _originalToggle->height());
+
+		_ignoreResizedCallback = true;
+		const auto wasOriginalSize = _originalBody->size();
+		_originalBody->resizeToWidth(contentWidth);
+		const auto fullOriginalHeight = _originalBody->height();
+		_originalBody->resize(wasOriginalSize);
+		_ignoreResizedCallback = false;
+
+		const auto lineHeight = _originalBody->st().style.lineHeight;
+		const auto originalHeight = _originalExpanded
+			? fullOriginalHeight
+			: std::min(fullOriginalHeight, lineHeight);
+		_originalBody->setGeometryToLeft(
+			padding.left(),
+			y,
+			contentWidth,
+			originalHeight,
+			newWidth);
+		const auto expandable = fullOriginalHeight > lineHeight;
+		_originalToggle->setVisible(expandable);
+		y += originalHeight + st::aiComposeCardSectionSkip;
+		_dividerTop = y;
+		_dividerVisible = true;
+		y += st::lineWidth + st::aiComposeCardSectionSkip;
+	} else {
+		_originalTitle->hide();
+		_originalBody->hide();
+		_originalToggle->hide();
+	}
+
+	_resultTitle->show();
+	auto controlsWidth = 0;
+	if (_emojifyVisible) {
+		_emojify->show();
+		_emojify->resizeToNaturalWidth(contentWidth);
+		controlsWidth += _emojify->width()
+			+ st::aiComposeCardControlSkip;
+	} else {
+		_emojify->hide();
+	}
+	const auto resultTitleWidth = std::max(
+		contentWidth - controlsWidth,
+		0);
+	_resultTitle->resizeToWidth(resultTitleWidth);
+	auto right = padding.right();
+	if (_emojifyVisible) {
+		_emojify->moveToRight(right, y, newWidth);
+		right += _emojify->width() + st::aiComposeCardControlSkip;
+	}
+	_resultTitle->setGeometryToLeft(
+		padding.left(),
+		y,
+		resultTitleWidth,
+		_resultTitle->height(),
+		newWidth);
+	y = std::max(
+		y + _resultTitle->height(),
+		(_emojifyVisible
+			? (y - _emojify->getMargins().top() + _emojify->height())
+			: 0));
+
+	const auto lineHeight = _resultBody->st().style.lineHeight
+		? _resultBody->st().style.lineHeight
+		: _resultBody->st().style.font->height;
+	if (!_copy->isHidden()) {
+		_resultBody->setSkipBlock(_copy->width(), lineHeight);
+	} else {
+		_resultBody->setSkipBlock(0, 0);
+	}
+	_resultBody->resizeToWidth(contentWidth);
+	_resultBody->setGeometryToLeft(
+		padding.left(),
+		y,
+		contentWidth,
+		_resultBody->height(),
+		newWidth);
+	if (!_copy->isHidden()) {
+		_copy->moveToRight(
+			padding.right(),
+			y + _resultBody->height() - lineHeight,
+			newWidth);
+	}
+	y += _resultBody->height();
+
+	return y + padding.bottom();
+}
+
+void ComposeAiPreviewCard::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	PainterHighQualityEnabler hq(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(st::aiComposeCardBg);
+	p.drawRoundedRect(
+		rect(),
+		st::aiComposeCardRadius,
+		st::aiComposeCardRadius);
+	if (_dividerVisible) {
+		p.setBrush(Qt::NoBrush);
+		auto color = st::windowSubTextFg->c;
+		color.setAlphaF(st::aiComposeShadowOpacity);
+		p.setPen(color);
+		p.drawLine(
+			st::aiComposeCardPadding.left(),
+			_dividerTop,
+			width() - st::aiComposeCardPadding.right(),
+			_dividerTop);
+	}
+}
+
+void ComposeAiPreviewCard::refreshGeometry() {
+	if (width() > 0) {
+		resizeToWidth(width());
+	}
+	if (_resized) {
+		_resized();
+	}
+}
+
+void ComposeAiPreviewCard::updateOriginalToggleIcon() {
+	_originalToggle->setIconOverride(
+		_originalExpanded ? &st::aiComposeCollapseIcon : nullptr,
+		_originalExpanded ? &st::aiComposeCollapseIcon : nullptr);
+	_originalToggle->setAccessibleName(_originalExpanded
+		? tr::lng_sr_ai_compose_collapse_original(tr::now)
+		: tr::lng_sr_ai_compose_expand_original(tr::now));
+}
+
+// ComposeAiContent
+
+ComposeAiContent::ComposeAiContent(
+	QWidget *parent,
+	not_null<Ui::GenericBox*> box,
+	ComposeAiBoxArgs args)
+: RpWidget(parent)
+, _box(box)
+, _session(args.session)
+, _original(std::move(args.text))
+, _detectedFrom(Platform::Language::Recognize(_original.text))
+, _to(DefaultAiTranslateTo(_detectedFrom))
+, _tones(_session->data().aiComposeTones().list())
+, _stylesData(ResolveStyleDescriptors(_tones))
+, _translateStylesData(ResolveTranslateStyleDescriptors(_session, _stylesData))
+, _preview(
+	Ui::CreateChild<ComposeAiPreviewCard>(
+		this,
+		_session,
+		_original,
+		args.chatStyle))
+, _authorLabel(Ui::CreateChild<Ui::FlatLabel>(
+	this,
+	st::aiComposeAuthorLabel)) {
+	_preview->setResizeCallback([=] { refreshLayout(); });
+	_preview->setChooseCallback([=] { chooseLanguage(); });
+	_preview->setCopyCallback([=] { copyResult(); });
+	_preview->setEmojifyChangedCallback([=](bool checked) {
+		_emojify = checked;
+		if (_mode != ComposeAiMode::Fix) {
+			request();
+		}
+	});
+	_preview->setShow(_box->uiShow());
+	_authorLabel->setVisible(false);
+	_authorLabel->heightValue(
+	) | rpl::skip(1) | rpl::on_next([=] {
+		refreshLayout();
+	}, lifetime());
+	const auto show = _box->uiShow();
+	_authorLabel->setClickHandlerFilter([=](
+			const ClickHandlerPtr &handler,
+			Qt::MouseButton button) {
+		if (dynamic_cast<Ui::Text::PreClickHandler*>(handler.get())) {
+			ActivateClickHandler(_authorLabel, handler, ClickContext{
+				.button = button,
+				.other = QVariant::fromValue(ClickHandlerContext{
+					.show = show,
+				})
+			});
+			return false;
+		}
+		return true;
+	});
+}
+
+ComposeAiContent::~ComposeAiContent() {
+	cancelRequest();
+}
+
+bool ComposeAiContent::hasResult() const {
+	return _state == CardState::Ready;
+}
+
+const TextWithEntities &ComposeAiContent::result() const {
+	return _result;
+}
+
+const std::vector<Ui::LabeledEmojiTab> &ComposeAiContent::stylesData() const {
+	return _stylesData;
+}
+
+const std::vector<Data::AiComposeTone> &ComposeAiContent::tones() const {
+	return _tones;
+}
+
+void ComposeAiContent::setReadyChangedCallback(Fn<void(bool)> callback) {
+	_readyChanged = std::move(callback);
+}
+
+void ComposeAiContent::setLoadingChangedCallback(Fn<void(bool)> callback) {
+	_loadingChanged = std::move(callback);
+	notifyLoadingChanged();
+}
+
+void ComposeAiContent::setModeTabs(not_null<ComposeAiModeTabs*> tabs) {
+	_tabs = tabs;
+	_tabs->setChangedCallback([=](ComposeAiMode mode) {
+		setMode(mode);
+	});
+	_tabs->setActive(_mode);
+}
+
+void ComposeAiContent::setStyleTabs(
+		not_null<Ui::SlideWrap<Ui::LabeledEmojiScrollTabs>*> stylesWrap) {
+	_stylesWrap = stylesWrap;
+	_stylesWrap->setDuration(0);
+	_styles = stylesWrap->entity();
+	_styles->setChangedCallback([=](int index) {
+		if (index >= 0 && index < int(_tones.size())) {
+			const auto wasNoSelection = (_styleIndex < 0);
+			_styleIndex = index;
+			updateTitles();
+			if (_mode == ComposeAiMode::Style) {
+				request();
+				if (wasNoSelection && _styleSelected) {
+					_styleSelected();
+				}
+			}
+		} else if (index == int(_tones.size())) {
+			_styles->setActive(_styleIndex);
+			_box->uiShow()->show(Box(
+				CreateAiToneBox,
+				_session,
+				crl::guard(this, [=](Data::AiComposeTone tone) {
+					selectToneById(tone.id);
+				})));
+		}
+	});
+	_styles->setActive(_styleIndex);
+	_stylesWrap->toggle(_mode == ComposeAiMode::Style, anim::type::instant);
+}
+
+void ComposeAiContent::refreshTones() {
+	auto previousKey = QString();
+	auto hadSelection = false;
+	if (_styleIndex >= 0 && _styleIndex < int(_tones.size())) {
+		const auto &prev = _tones[_styleIndex];
+		previousKey = prev.isDefault
+			? prev.defaultType
+			: QString::number(prev.id);
+		hadSelection = true;
+	}
+	_tones = _session->data().aiComposeTones().list();
+	_stylesData = ResolveStyleDescriptors(_tones);
+	_translateStylesData = ResolveTranslateStyleDescriptors(
+		_session,
+		_stylesData);
+	auto remapped = -1;
+	if (hadSelection) {
+		for (auto i = 0; i != int(_tones.size()); ++i) {
+			const auto &tone = _tones[i];
+			const auto key = tone.isDefault
+				? tone.defaultType
+				: QString::number(tone.id);
+			if (key == previousKey) {
+				remapped = i;
+				break;
+			}
+		}
+	}
+	_styleIndex = remapped;
+	if (_mode == ComposeAiMode::Style && hadSelection && _styleIndex < 0) {
+		request();
+	}
+}
+
+void ComposeAiContent::selectToneById(uint64 id) {
+	for (auto i = 0; i != int(_tones.size()); ++i) {
+		const auto &tone = _tones[i];
+		if (!tone.isDefault && tone.id == id) {
+			const auto wasNoSelection = (_styleIndex < 0);
+			_styleIndex = i;
+			updateTitles();
+			if (_styles) {
+				_styles->setActive(_styleIndex);
+				_styles->scrollToActive();
+			}
+			if (_mode == ComposeAiMode::Style) {
+				request();
+				if (wasNoSelection && _styleSelected) {
+					_styleSelected();
+				}
+			}
+			return;
+		}
+	}
+}
+
+void ComposeAiContent::start() {
+	updatePinnedTabs(anim::type::instant);
+	updateTitles();
+	request();
+}
+
+int ComposeAiContent::resizeGetHeight(int newWidth) {
+	_preview->resizeToWidth(newWidth);
+	_preview->moveToLeft(0, 0, newWidth);
+	auto y = _preview->height();
+	if (!_authorLabel->isHidden()) {
+		_authorLabel->resizeToWidth(newWidth);
+		_authorLabel->moveToLeft(
+			0,
+			y + st::aiComposeAuthorLabelTop,
+			newWidth);
+		y += st::aiComposeAuthorLabelTop + _authorLabel->height();
+	}
+	return y;
+}
+
+void ComposeAiContent::refreshLayout() {
+	if (width() > 0) {
+		resizeToWidth(width());
+	}
+}
+
+void ComposeAiContent::chooseLanguage() {
+	if (_mode != ComposeAiMode::Translate) {
+		return;
+	}
+	const auto weak = QPointer<ComposeAiContent>(this);
+	const auto session = _session;
+	const auto styles = _translateStylesData;
+	const auto selectedStyle = std::make_shared<int>(_translateStyleIndex);
+	_box->uiShow()->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+		const auto apply = [=](LanguageId id, int styleIndex) {
+			if (!weak) {
+				return;
+			}
+			weak->_to = id;
+			if (const auto count = int(weak->_translateStylesData.size())) {
+				weak->_translateStyleIndex = std::clamp(styleIndex, 0, count - 1);
+			}
+			weak->updateTitles();
+			weak->request();
+		};
+		Ui::ChooseLanguageBox(
+			box,
+			tr::lng_languages(),
+			[=](std::vector<LanguageId> ids) {
+				if (ids.empty()) {
+					return;
+				}
+				apply(ids.front(), *selectedStyle);
+			},
+			{ _to },
+			false,
+			nullptr);
+		const auto bottom = box->setPinnedToBottomContent(
+			object_ptr<Ui::VerticalLayout>(box));
+		const auto skip = st::defaultSubsectionTitlePadding.left();
+		const auto tabs = bottom->add(
+			object_ptr<Ui::LabeledEmojiScrollTabs>(
+				bottom,
+				styles,
+				session->data().customEmojiManager().factory(
+					Data::CustomEmojiSizeTag::Large)),
+			QMargins(
+				(skip - st::aiComposeStyleTabsPadding.left()),
+				0,
+				(skip - st::aiComposeStyleTabsPadding.right()),
+				0));
+		tabs->setPaintOuterCorners(false);
+		tabs->setChangedCallback([=](int index) {
+			if (index >= 0 && index < int(styles.size())) {
+				*selectedStyle = index;
+				apply(_to, index);
+				box->closeBox();
+			}
+		});
+		tabs->setActive(std::clamp(*selectedStyle, 0, int(styles.size()) - 1));
+		tabs->scrollToActive();
+	}));
+}
+
+void ComposeAiContent::copyResult() {
+	if (_state != CardState::Ready) {
+		return;
+	}
+	TextUtilities::SetClipboardText(
+		TextForMimeData::WithExpandedLinks(_result));
+}
+
+void ComposeAiContent::setMode(ComposeAiMode mode) {
+	if (_mode == mode) {
+		return;
+	}
+	if (mode != ComposeAiMode::Style) {
+		_styleIndex = -1;
+	}
+	_mode = mode;
+	_state = CardState::Waiting;
+	_preview->setState(CardState::Waiting);
+	setAuthorId(UserId(0));
+	notifyLoadingChanged();
+	if (_modeChanged) {
+		_modeChanged(_mode);
+	}
+	updatePinnedTabs(anim::type::normal);
+	updateTitles();
+	refreshLayout();
+	request();
+}
+
+void ComposeAiContent::updateTitles() {
+	const auto hasResult = (_state == CardState::Loading)
+		|| (_state == CardState::Ready);
+	_preview->setOriginalVisible(hasResult);
+	_preview->setOriginalTitle(
+		(_mode == ComposeAiMode::Translate)
+			? FromTitle(_detectedFrom)
+			: tr::lng_ai_compose_original(tr::now));
+	_preview->setResultTitle(
+		hasResult
+			? ((_mode == ComposeAiMode::Translate)
+				? ToTitle(_to, currentTranslateStyleLabel())
+				: tr::lng_ai_compose_result(tr::now, tr::marked))
+			: tr::lng_ai_compose_original(tr::now, tr::marked));
+	const auto emojifyOnlyMode = !hasResult
+		&& (_mode == ComposeAiMode::Style)
+		&& (_styleIndex < 0);
+	_preview->setEmojifyVisible(
+		(hasResult && (_mode != ComposeAiMode::Fix))
+		|| emojifyOnlyMode);
+	_preview->setEmojifyChecked(_emojify);
+}
+
+void ComposeAiContent::updatePinnedTabs(anim::type animated) {
+	if (_tabs) {
+		_tabs->setActive(_mode);
+	}
+	if (_styles) {
+		_styles->setActive(_styleIndex);
+	}
+	if (_stylesWrap) {
+		_stylesWrap->toggle(_mode == ComposeAiMode::Style, animated);
+	}
+}
+
+void ComposeAiContent::cancelRequest() {
+	++_requestToken;
+	if (_requestId) {
+		_session->api().composeWithAi().cancel(_requestId);
+		_requestId = 0;
+	}
+}
+
+void ComposeAiContent::request() {
+	cancelRequest();
+	if (_mode == ComposeAiMode::Style && _styleIndex < 0 && !_emojify) {
+		if (_state != CardState::Waiting) {
+			resetState(CardState::Waiting);
+		}
+		return;
+	}
+	resetState(CardState::Loading);
+
+	auto request = Api::ComposeWithAi::Request{
+		.text = _original,
+		.emojify = (_mode != ComposeAiMode::Fix) && _emojify,
+	};
+	switch (_mode) {
+	case ComposeAiMode::Translate: {
+		request.translateToLang = _to.twoLetterCode();
+		const auto style = currentTranslateStyle();
+		if (!style.isEmpty()) {
+			request.setDefaultTone(style);
+		}
+	} break;
+	case ComposeAiMode::Style:
+		if (_styleIndex >= 0 && _styleIndex < int(_tones.size())) {
+			const auto &tone = _tones[_styleIndex];
+			if (tone.isDefault) {
+				request.setDefaultTone(tone.defaultType);
+			} else {
+				request.setCustomTone(tone.id, tone.accessHash);
+			}
+		}
+		break;
+	case ComposeAiMode::Fix:
+		request.proofread = true;
+		break;
+	}
+
+	const auto token = ++_requestToken;
+	const auto weak = QPointer<ComposeAiContent>(this);
+	_requestId = _session->api().composeWithAi().request(
+		std::move(request),
+		[=](Api::ComposeWithAi::Result &&result) {
+			if (!weak || weak->_requestToken != token) {
+				return;
+			}
+			weak->_requestId = 0;
+			weak->applyResult(std::move(result));
+		},
+		[=](const MTP::Error &error) {
+			if (!weak || weak->_requestToken != token) {
+				return;
+			}
+			weak->_requestId = 0;
+			if (MTP::IgnoreError(error)) {
+				weak->resetState(CardState::Waiting);
+				return;
+			}
+			weak->showError(error.type());
+		});
+}
+
+void ComposeAiContent::setAuthorId(UserId authorId) {
+	if (_authorId == authorId) {
+		return;
+	}
+	_authorId = authorId;
+	if (const auto user = _session->data().userLoaded(authorId)) {
+		const auto name = user->shortName();
+		auto mention = tr::marked(name);
+		mention.entities.push_back(EntityInText(
+			EntityType::MentionName,
+			0,
+			name.size(),
+			TextUtilities::MentionNameDataFromFields({
+				.selfId = _session->userId().bare,
+				.userId = authorId.bare,
+				.accessHash = user->accessHash(),
+			})));
+		_authorLabel->setMarkedText(
+			tr::lng_ai_compose_author(
+				tr::now,
+				lt_user,
+				std::move(mention),
+				tr::marked),
+			Core::TextContext({ .session = _session }));
+		_authorLabel->setVisible(true);
+	} else {
+		_authorLabel->setMarkedText({});
+		_authorLabel->setVisible(false);
+		_authorId = UserId(0);
+	}
+	refreshLayout();
+}
+
+void ComposeAiContent::resetState(CardState state) {
+	_state = state;
+	_result = {};
+	setAuthorId(UserId(0));
+	_preview->setState(state);
+	notifyLoadingChanged();
+	updateTitles();
+	notifyReadyChanged();
+}
+
+void ComposeAiContent::applyResult(Api::ComposeWithAi::Result &&result) {
+	_result = std::move(result.resultText);
+	if (_result.text.isEmpty()) {
+		showError({});
+		return;
+	}
+	auto display = (_mode == ComposeAiMode::Fix && result.diffText)
+		? BuildDiffDisplay(*result.diffText)
+		: _result;
+	_state = _result.text.isEmpty() ? CardState::Failed : CardState::Ready;
+	_preview->setState(_state);
+	notifyLoadingChanged();
+	if (_state == CardState::Ready) {
+		_preview->setResultText(std::move(display));
+		if (_mode == ComposeAiMode::Style
+			&& _styleIndex >= 0
+			&& _styleIndex < int(_tones.size())) {
+			setAuthorId(_tones[_styleIndex].authorId);
+		} else {
+			setAuthorId(UserId(0));
+		}
+	}
+	updateTitles();
+	notifyReadyChanged();
+	refreshLayout();
+}
+
+void ComposeAiContent::showError(const QString &error) {
+	_state = CardState::Failed;
+	setAuthorId(UserId(0));
+	_preview->setState(CardState::Failed);
+	notifyLoadingChanged();
+	updateTitles();
+	notifyReadyChanged();
+	refreshLayout();
+	if (error == u"AICOMPOSE_FLOOD_PREMIUM"_q) {
+		const auto show = Main::MakeSessionShow(
+			_box->uiShow(),
+			_session);
+		Settings::ShowPremiumPromoToast(
+			show,
+			ChatHelpers::ResolveWindowDefault(),
+			tr::lng_ai_compose_flood_text(
+				tr::now,
+				lt_link,
+				tr::link(tr::lng_ai_compose_flood_link(tr::now, tr::bold)),
+				tr::rich),
+			u"ai_compose"_q);
+		if (_premiumFlood) {
+			_premiumFlood();
+		}
+		return;
+	} else if (error == u"INPUT_TEXT_TOO_LONG"_q) {
+		_box->showToast(tr::lng_ai_compose_error_too_long(tr::now));
+		return;
+	}
+	_box->showToast(error.isEmpty()
+		? tr::lng_ai_compose_error(tr::now)
+		: error);
+}
+
+void ComposeAiContent::notifyLoadingChanged() {
+	if (_loadingChanged) {
+		_loadingChanged(_state == CardState::Loading);
+	}
+}
+
+void ComposeAiContent::notifyReadyChanged() {
+	if (_readyChanged) {
+		_readyChanged(_state == CardState::Ready);
+	}
+}
+
+void ComposeAiContent::setPremiumFloodCallback(Fn<void()> callback) {
+	_premiumFlood = std::move(callback);
+}
+
+void ComposeAiContent::setModeChangedCallback(
+		Fn<void(ComposeAiMode)> callback) {
+	_modeChanged = std::move(callback);
+}
+
+void ComposeAiContent::setStyleSelectedCallback(Fn<void()> callback) {
+	_styleSelected = std::move(callback);
+}
+
+QString ComposeAiContent::currentTranslateStyle() const {
+	return (_translateStyleIndex >= 0
+		&& _translateStyleIndex < int(_translateStylesData.size()))
+		? _translateStylesData[_translateStyleIndex].id
+		: QString();
+}
+
+QString ComposeAiContent::currentTranslateStyleLabel() const {
+	if (const auto style = currentTranslateStyle(); !style.isEmpty()) {
+		return (_translateStyleIndex >= 0
+			&& _translateStyleIndex < int(_translateStylesData.size()))
+			? _translateStylesData[_translateStyleIndex].label
+			: QString();
+	}
+	return QString();
+}
+
+ComposeAiMode ComposeAiContent::mode() const {
+	return _mode;
+}
+
+bool ComposeAiContent::hasStyleSelection() const {
+	return _styleIndex >= 0;
+}
+
+struct StyleTooltipHandle {
+	QPointer<Ui::ImportantTooltip> tooltip;
+	Fn<void(bool)> updateVisibility;
+};
+
+[[nodiscard]] StyleTooltipHandle SetupStyleTooltip(
+		not_null<Ui::GenericBox*> box,
+		not_null<Ui::RpWidget*> pinnedToTop,
+		not_null<Ui::RpWidget*> stylesWrap,
+		Fn<ComposeAiMode()> currentMode) {
+	const auto tooltip = Ui::CreateChild<Ui::ImportantTooltip>(
+		box,
+		object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
+			box,
+			Ui::MakeNiceTooltipLabel(
+				box,
+				tr::lng_ai_compose_style_tooltip(tr::rich),
+				st::historyMessagesTTLLabel.minWidth,
+				st::ttlMediaImportantTooltipLabel),
+			st::historyRecordTooltip.padding),
+		st::historyRecordTooltip);
+	tooltip->toggleFast(false);
+
+	struct State {
+		bool shown = false;
+		bool shownOnce = false;
+	};
+	const auto state = box->lifetime().make_state<State>();
+
+	const auto updateGeometry = [=] {
+		const auto local = stylesWrap->geometry();
+		if (local.isEmpty()) {
+			return;
+		}
+		const auto geometry = Ui::MapFrom(box, pinnedToTop, local);
+		const auto countPosition = [=](QSize size) {
+			const auto left = geometry.x()
+				+ (geometry.width() - size.width()) / 2;
+			return QPoint(
+				std::max(std::min(left, box->width() - size.width()), 0),
+				(geometry.y()
+					+ geometry.height()
+					- st::historyRecordTooltip.arrow
+					- (st::aiComposeBoxStyleTabsSkip / 2)));
+		};
+		tooltip->pointAt(geometry, RectPart::Bottom, countPosition);
+	};
+
+	const auto updateVisibility = [=](bool visible) {
+		const auto show = visible
+			&& !Core::App().settings().readPref<bool>(
+				kAiComposeStyleTooltipHiddenPref);
+		if (state->shown != show) {
+			state->shown = show;
+			if (show) {
+				updateGeometry();
+				tooltip->raise();
+			}
+			if (show && !state->shownOnce) {
+				state->shownOnce = true;
+				tooltip->toggleFast(true);
+			} else {
+				tooltip->toggleAnimated(show);
+			}
+		}
+	};
+
+	stylesWrap->geometryValue(
+	) | rpl::on_next([=](const QRect &geometry) {
+		if (!geometry.isEmpty()) {
+			if (state->shown) {
+				updateGeometry();
+			} else {
+				updateVisibility(currentMode() == ComposeAiMode::Style);
+			}
+		}
+	}, tooltip->lifetime());
+
+	return { tooltip, updateVisibility };
+}
+
+} // namespace
+
+void ComposeAiBox(not_null<Ui::GenericBox*> box, ComposeAiBoxArgs &&args) {
+	const auto sendButtonHeight = st::aiComposeSendButton.inner.height;
+	const auto buttonHeight = st::aiComposeSendButton.inner.icon.height()
+		+ 2 * st::aiComposeSendButton.sendIconFillPadding;
+	const auto boxStyle = [&](const style::Box &base) {
+		const auto result = box->lifetime().make_state<style::Box>(base);
+		result->button.height = buttonHeight;
+		result->buttonHeight = buttonHeight;
+		result->button.textTop = base.button.textTop
+			- (base.button.height - buttonHeight) / 2;
+		return result;
+	};
+	const auto boxStyleNoSend = boxStyle(st::aiComposeBox);
+	const auto boxStyleWithSend = boxStyle(st::aiComposeBoxWithSend);
+	box->setStyle(*boxStyleNoSend);
+	box->setNoContentMargin(true);
+	box->setWidth(st::boxWideWidth);
+	const auto session = args.session;
+	box->addTopButton(st::aiComposeBoxClose, [=] {
+		box->closeBox();
+	})->setAccessibleName(tr::lng_close(tr::now));
+	box->addTopButton(st::aiComposeBoxInfoButton, [=] {
+		box->uiShow()->show(Box(Ui::AboutCocoonBox));
+	})->setAccessibleName(tr::lng_sr_ai_compose_info(tr::now));
+
+	const auto body = box->verticalLayout();
+	const auto tabsSkip = QMargins(0, 0, 0, st::aiComposeBoxStyleTabsSkip);
+	const auto pinnedToTop = box->setPinnedToTopContent(
+		object_ptr<Ui::VerticalLayout>(box));
+	const auto tabs = pinnedToTop->add(
+		object_ptr<ComposeAiModeTabs>(pinnedToTop),
+		st::aiComposeContentMargin + tabsSkip);
+	const auto content = body->add(
+		object_ptr<ComposeAiContent>(box, box, args),
+		st::aiComposeContentMargin);
+	const auto contextMenu = box->lifetime().make_state<
+		base::unique_qptr<Ui::PopupMenu>>();
+	const auto stylesWrapHolder = box->lifetime().make_state<
+		QPointer<Ui::SlideWrap<Ui::LabeledEmojiScrollTabs>>>();
+	const auto styleTooltipHolder = box->lifetime().make_state<
+		QPointer<Ui::ImportantTooltip>>();
+	const auto styleTooltipUpdater = box->lifetime().make_state<
+		Fn<void(bool)>>();
+
+	content->setModeTabs(tabs);
+
+	const auto rebuildStylesWrap = [=] {
+		auto savedScroll = -1;
+		if (const auto old = stylesWrapHolder->data()) {
+			savedScroll = old->entity()->scrollLeft();
+			delete old;
+		}
+		if (const auto old = styleTooltipHolder->data()) {
+			delete old;
+		}
+		auto emojiFactory = session->data().customEmojiManager().factory(
+			Data::CustomEmojiSizeTag::Large);
+		auto wrap = object_ptr<Ui::SlideWrap<Ui::LabeledEmojiScrollTabs>>(
+			pinnedToTop,
+			object_ptr<Ui::LabeledEmojiScrollTabs>(
+				pinnedToTop,
+				WithAddStyleTab(content->stylesData()),
+				std::move(emojiFactory)),
+			tabsSkip);
+		const auto ptr = wrap.data();
+		pinnedToTop->add(std::move(wrap), st::aiComposeContentMargin);
+		*stylesWrapHolder = ptr;
+		ptr->entity()->setContextMenuCallback([=](int index, QPoint globalPos) {
+			const auto &tones = content->tones();
+			if (index < 0 || index >= int(tones.size())) {
+				return;
+			}
+			const auto &tone = tones[index];
+			if (tone.isDefault) {
+				return;
+			}
+			*contextMenu = base::make_unique_q<Ui::PopupMenu>(
+				ptr->entity(),
+				st::popupMenuWithIcons);
+			const auto toneCopy = tone;
+			if (!toneCopy.slug.isEmpty()) {
+				const auto shortcutText = Api::AiApplyShortcutText();
+				if (shortcutText.isEmpty()) {
+					const auto resolve = ChatHelpers::ResolveWindowDefault();
+					(*contextMenu)->addAction(
+						tr::lng_ai_compose_bind_set_hotkey_short(tr::now),
+						[=] {
+							if (const auto window = resolve(session)) {
+								window->setHighlightControlId(
+									Settings::ShortcutsHighlightId(
+										Shortcuts::Command
+											::ComposeAiApplyInPlace));
+								window->showSettings(
+									Settings::ShortcutsId());
+							}
+						},
+						&st::menuIconShortcut);
+				} else {
+					const auto label = tr::lng_ai_compose_bind_use_hotkey(
+						tr::now,
+						lt_keys,
+						shortcutText);
+					const auto checked
+						= (Api::AiApplyBoundSlug() == toneCopy.slug);
+					auto item = base::make_unique_q<Menu::ItemWithCheck>(
+						(*contextMenu)->menu(),
+						st::popupMenuWithIcons.menu,
+						Ui::CreateChild<QAction>(
+							(*contextMenu)->menu().get()),
+						nullptr,
+						nullptr);
+					item->action()->setText(label);
+					item->init(checked);
+					item->checkView()->checkedChanges(
+					) | rpl::on_next([=](bool toggled) {
+						if (toggled) {
+							Api::SetAiApplyBoundSlug(toneCopy.slug);
+						} else if (Api::AiApplyBoundSlug()
+								== toneCopy.slug) {
+							Api::ClearAiApplyBoundSlug();
+						}
+					}, item->lifetime());
+					(*contextMenu)->addAction(std::move(item));
+				}
+			}
+			if (toneCopy.creator) {
+				(*contextMenu)->addAction(
+					tr::lng_ai_compose_tone_edit(tr::now),
+					[=] {
+						box->uiShow()->show(Box(
+							EditAiToneBox,
+							session,
+							toneCopy,
+							crl::guard(content, [=](Data::AiComposeTone tone) {
+								content->selectToneById(tone.id);
+							})));
+					},
+					&st::menuIconEdit);
+			}
+			(*contextMenu)->addAction(
+				tr::lng_ai_compose_tone_share(tr::now),
+				[=] {
+					const auto url = session->createInternalLinkFull(
+						"addstyle/" + toneCopy.slug);
+					FastShareLink(
+						Main::MakeSessionShow(box->uiShow(), session),
+						url);
+				},
+				&st::menuIconShare);
+			(*contextMenu)->addAction(base::make_unique_q<Ui::Menu::Action>(
+				(*contextMenu)->menu(),
+				st::menuWithIconsAttention,
+				Ui::Menu::CreateAction(
+					(*contextMenu)->menu().get(),
+					toneCopy.creator
+						? tr::lng_ai_compose_tone_delete(tr::now)
+						: tr::lng_ai_compose_tone_remove(tr::now),
+					[=] {
+						ConfirmDeleteAiTone(
+							box->uiShow(),
+							session,
+							toneCopy);
+					}),
+				&st::menuIconDeleteAttention,
+				&st::menuIconDeleteAttention));
+			(*contextMenu)->popup(globalPos);
+		});
+		content->setStyleTabs(ptr);
+		if (savedScroll >= 0) {
+			ptr->entity()->setScrollLeft(savedScroll);
+		}
+		auto handle = SetupStyleTooltip(
+			box,
+			pinnedToTop,
+			ptr,
+			[=] { return content->mode(); });
+		*styleTooltipHolder = handle.tooltip;
+		*styleTooltipUpdater = std::move(handle.updateVisibility);
+	};
+	rebuildStylesWrap();
+
+	session->data().aiComposeTones().updated(
+	) | rpl::on_next([=] {
+		content->refreshTones();
+		rebuildStylesWrap();
+	}, box->lifetime());
+
+	const auto sparkle = LoadingTitleSparkle(session);
+	const auto loading = box->lifetime().make_state<
+		rpl::variable<bool>>();
+
+	content->setLoadingChangedCallback([=](bool value) {
+		*loading = value;
+	});
+
+	box->setTitle(rpl::combine(
+		loading->value(),
+		tr::lng_ai_compose_title(tr::marked)
+	) | rpl::map([=](bool loading, TextWithEntities title) {
+		return loading ? title.append(sparkle) : title;
+	}), Core::TextContext({ .session = session }));
+
+	auto premiumFlooded = std::make_shared<bool>(false);
+	auto sendButton = std::make_shared<QPointer<Ui::SendButton>>();
+
+	const auto applyAndClose = [=] {
+		if (!content->hasResult()) {
+			return;
+		}
+		args.apply(TextWithEntities(content->result()));
+		box->closeBox();
+	};
+	const auto sendResult = [=](Api::SendOptions options) {
+		if (!args.send || !content->hasResult()) {
+			return;
+		}
+		args.send(
+			TextWithEntities(content->result()),
+			options,
+			crl::guard(box, [=] {
+				box->closeBox();
+			}));
+	};
+	const auto addApplyButton = [=](
+			const style::Box &style,
+			rpl::producer<QString> text,
+			Fn<void()> callback) {
+		box->setStyle(style);
+		const auto result = box->addButton(std::move(text), std::move(callback));
+		result->setFullRadius(true);
+		return result;
+	};
+	const auto disableButton = [=](not_null<Ui::RoundButton*> button) {
+		button->clearState();
+		button->setDisabled(true);
+		button->setAttribute(Qt::WA_TransparentForMouseEvents);
+		button->setTextFgOverride(
+			anim::color(st::activeButtonBg, st::activeButtonFg, 0.5));
+		button->setClickedCallback([] {
+		});
+	};
+
+	const auto rebuildButtons = [=] {
+		if (*sendButton) {
+			delete sendButton->data();
+		}
+		*sendButton = nullptr;
+		box->clearButtons();
+		box->addTopButton(st::aiComposeBoxClose, [=] {
+			box->closeBox();
+		})->setAccessibleName(tr::lng_close(tr::now));
+		box->addTopButton(st::aiComposeBoxInfoButton, [=] {
+			box->uiShow()->show(Box(Ui::AboutCocoonBox));
+		})->setAccessibleName(tr::lng_sr_ai_compose_info(tr::now));
+
+		if (*premiumFlooded) {
+			auto helper = Ui::Text::CustomEmojiHelper();
+			const auto badge = helper.paletteDependent(
+				Ui::Text::CustomEmojiTextBadge(
+					u"x50"_q,
+					st::aiComposeBadge,
+					st::aiComposeBadgeMargin));
+			const auto btn = addApplyButton(
+				*boxStyleNoSend,
+				tr::lng_ai_compose_increase_limit(), nullptr);
+			btn->setContext(helper.context());
+			btn->setText(rpl::single(
+				tr::lng_ai_compose_increase_limit(tr::now, tr::marked)
+					.append(' ')
+					.append(badge)));
+			const auto resolve = ChatHelpers::ResolveWindowDefault();
+			const auto close = crl::guard(box, [=] {
+				box->closeBox();
+			});
+			btn->setClickedCallback([=] {
+				if (const auto controller = resolve(session)) {
+					ShowPremiumPreviewBox(
+						controller,
+						PremiumFeature::AiCompose);
+				}
+				close();
+			});
+		} else if (content->mode() == ComposeAiMode::Style
+				&& !content->hasStyleSelection()
+				&& !content->hasResult()) {
+			const auto btn = addApplyButton(
+				*boxStyleNoSend,
+				tr::lng_ai_compose_select_style(), nullptr);
+			disableButton(btn);
+		} else if (content->hasResult()) {
+			const auto isStyle =
+				(content->mode() == ComposeAiMode::Style);
+			const auto btn = addApplyButton(
+				args.send ? *boxStyleWithSend : *boxStyleNoSend,
+				isStyle
+					? tr::lng_ai_compose_apply_style()
+					: tr::lng_ai_compose_apply(),
+				applyAndClose);
+			if (args.send) {
+				const auto send = Ui::CreateChild<Ui::SendButton>(
+					btn->parentWidget(),
+					st::aiComposeSendButton);
+				send->setState({ .type = Ui::SendButton::Type::Send });
+				send->setAccessibleName(tr::lng_send_button(tr::now));
+				send->show();
+				btn->geometryValue(
+				) | rpl::on_next([=](QRect geometry) {
+					const auto size = sendButtonHeight;
+					send->resize(size, size);
+					send->moveToLeft(
+						geometry.x() + geometry.width()
+							+ st::aiComposeSendButtonSkip,
+						geometry.y() + (geometry.height() - size) / 2);
+				}, send->lifetime());
+				send->setClickedCallback([=] {
+					sendResult({});
+				});
+				if (args.setupMenu) {
+					args.setupMenu(
+						send,
+						[=](Api::SendOptions options) {
+							sendResult(options);
+						});
+				}
+				*sendButton = send;
+			}
+		} else {
+			const auto isStyle =
+				(content->mode() == ComposeAiMode::Style);
+			const auto btn = addApplyButton(
+				*boxStyleNoSend,
+				isStyle
+					? tr::lng_ai_compose_apply_style()
+					: tr::lng_ai_compose_apply(),
+				nullptr);
+			disableButton(btn);
+		}
+	};
+
+	content->setReadyChangedCallback([=](bool) {
+		rebuildButtons();
+	});
+	content->setPremiumFloodCallback([=] {
+		*premiumFlooded = true;
+		rebuildButtons();
+	});
+	content->setModeChangedCallback([=](ComposeAiMode mode) {
+		rebuildButtons();
+		(*styleTooltipUpdater)(mode == ComposeAiMode::Style);
+	});
+	content->setStyleSelectedCallback([=] {
+		rebuildButtons();
+		if (!Core::App().settings().readPref<bool>(kAiComposeStyleTooltipHiddenPref)) {
+			Core::App().settings().writePref<bool>(kAiComposeStyleTooltipHiddenPref, true);
+		}
+		(*styleTooltipUpdater)(false);
+	});
+
+	rebuildButtons();
+	content->start();
+}
+
+void ShowComposeAiBox(
+		std::shared_ptr<Ui::Show> show,
+		ComposeAiBoxArgs &&args) {
+	show->show(Box(ComposeAiBox, std::move(args)));
+}
+
+} // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/boxes/compose_ai_box.h b/Telegram/SourceFiles/boxes/compose_ai_box.h
new file mode 100644
index 00000000000000..f7e23ac0b6da7a
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/compose_ai_box.h
@@ -0,0 +1,39 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "api/api_common.h"
+#include "base/object_ptr.h"
+#include "ui/text/text_entity.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class ChatStyle;
+class GenericBox;
+class RpWidget;
+class Show;
+} // namespace Ui
+
+namespace HistoryView::Controls {
+
+struct ComposeAiBoxArgs {
+	not_null<Main::Session*> session;
+	TextWithEntities text;
+	std::shared_ptr<Ui::ChatStyle> chatStyle;
+	Fn<void(TextWithEntities)> apply;
+	Fn<void(TextWithEntities, Api::SendOptions, Fn<void()>)> send;
+	Fn<void(not_null<Ui::RpWidget*>, Fn<void(Api::SendOptions)>)> setupMenu;
+};
+
+void ComposeAiBox(not_null<Ui::GenericBox*> box, ComposeAiBoxArgs &&args);
+void ShowComposeAiBox(std::shared_ptr<Ui::Show> show, ComposeAiBoxArgs &&args);
+
+} // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp
index 621fd2c41e25cb..6d99e31da3e112 100644
--- a/Telegram/SourceFiles/boxes/connection_box.cpp
+++ b/Telegram/SourceFiles/boxes/connection_box.cpp
@@ -8,17 +8,25 @@ For license and copyright information please follow this link:
 #include "boxes/connection_box.h"
 
 #include "base/call_delayed.h"
+#include "base/qt/qt_key_modifiers.h"
 #include "base/qthelp_regex.h"
 #include "base/qthelp_url.h"
+#include "base/weak_ptr.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "core/local_url_handlers.h"
 #include "lang/lang_keys.h"
 #include "main/main_account.h"
+#include "main/main_session.h"
 #include "mtproto/facade.h"
+#include "mtproto/mtproto_config.h"
+#include "mtproto/proxy_check.h"
+#include "qr/qr_generate.h"
+#include "settings/settings_common.h"
 #include "storage/localstorage.h"
 #include "ui/basic_click_handlers.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/boxes/peer_qr_box.h"
 #include "ui/effects/animations.h"
 #include "ui/effects/radial_animation.h"
 #include "ui/painter.h"
@@ -28,25 +36,32 @@ For license and copyright information please follow this link:
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/dropdown_menu.h"
+#include "ui/widgets/discrete_sliders.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/fields/number_input.h"
 #include "ui/widgets/fields/password_input.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/table_layout.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/vertical_list.h"
 #include "ui/ui_utility.h"
 #include "boxes/abstract_box.h" // Ui::show().
 #include "window/window_session_controller.h"
-#include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_info.h"
+#include "styles/style_intro.h"
+#include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
+#include <QtWidgets/QTextEdit>
 
 namespace {
 
@@ -54,6 +69,254 @@ constexpr auto kSaveSettingsDelayedTimeout = crl::time(1000);
 
 using ProxyData = MTP::ProxyData;
 
+[[nodiscard]] int ClosestProxyRotationTimeoutSection(int value) {
+	auto result = 0;
+	auto bestDistance = 0;
+	for (auto i = 0; i != int(Core::SettingsProxy::kProxyRotationTimeouts.size()); ++i) {
+		const auto current = Core::SettingsProxy::kProxyRotationTimeouts[i];
+		const auto distance = (current > value) ? (current - value) : (value - current);
+		if ((i == 0) || (distance < bestDistance)) {
+			result = i;
+			bestDistance = distance;
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] std::vector<QString> ExtractLinkCandidates(const QString &input) {
+	auto urls = std::vector<QString>();
+	static const auto urlRegex = QRegularExpression(
+		R"((?:https?:\/\/[^\s]+|tg:\/\/[^\s]+|(?:www\.)?(?:t\.me|telegram\.me|telegram\.dog)\/[^\s]+))",
+		QRegularExpression::CaseInsensitiveOption);
+
+	auto it = urlRegex.globalMatch(input);
+	while (it.hasNext()) {
+		urls.push_back(it.next().captured(0));
+	}
+
+	return urls;
+}
+
+[[nodiscard]] bool ProxyDataIsShareable(const ProxyData &proxy) {
+	using Type = ProxyData::Type;
+	return (proxy.type == Type::Socks5)
+		|| (proxy.type == Type::Mtproto);
+}
+
+[[nodiscard]] QString ProxyDataToQueryPath(const ProxyData &proxy) {
+	using Type = ProxyData::Type;
+	const auto path = [&] {
+		switch (proxy.type) {
+		case Type::Socks5: return u"socks"_q;
+		case Type::Mtproto: return u"proxy"_q;
+		case Type::None:
+		case Type::Http: return QString();
+		}
+		Unexpected("Proxy type in ProxyDataToQueryPath.");
+	}();
+	if (path.isEmpty()) {
+		return QString();
+	}
+	return path
+		+ "?server=" + proxy.host + "&port=" + QString::number(proxy.port)
+		+ ((proxy.type == Type::Socks5 && !proxy.user.isEmpty())
+			? "&user=" + qthelp::url_encode(proxy.user) : "")
+		+ ((proxy.type == Type::Socks5 && !proxy.password.isEmpty())
+			? "&pass=" + qthelp::url_encode(proxy.password) : "")
+		+ ((proxy.type == Type::Mtproto && !proxy.password.isEmpty())
+			? "&secret=" + proxy.password : "");
+}
+
+[[nodiscard]] QString ProxyDataToLocalLink(const ProxyData &proxy) {
+	const auto queryPath = ProxyDataToQueryPath(proxy);
+	return queryPath.isEmpty() ? QString() : (u"tg://"_q + queryPath);
+}
+
+[[nodiscard]] QString ProxyDataToPublicLink(
+		not_null<Main::Account*> account,
+		const ProxyData &proxy) {
+	const auto queryPath = ProxyDataToQueryPath(proxy);
+	if (queryPath.isEmpty()) {
+		return QString();
+	}
+	if (const auto session = account->maybeSession()) {
+		return session->createInternalLinkFull(queryPath);
+	}
+	auto domain = MTP::ConfigFields(
+		account->mtp().environment()
+	).internalLinksDomain;
+	if (domain.endsWith('/') && queryPath.startsWith('/')) {
+		domain.chop(1);
+	} else if (!domain.endsWith('/') && !queryPath.startsWith('/')) {
+		domain += '/';
+	}
+	return domain + queryPath;
+}
+
+[[nodiscard]] QColor ProxyQrActiveColor() {
+	return QColor(0x40, 0xA7, 0xE3);
+}
+
+[[nodiscard]] QImage ProxyQr(const Qr::Data &data, int pixel, int max = 0) {
+	Expects(data.size > 0);
+
+	const auto available = max
+		? std::max(max - 2 * st::introQrBackgroundSkip, 1)
+		: 0;
+	if (available > 0 && data.size * pixel > available) {
+		pixel = std::max(available / data.size, 1);
+	}
+	return Qr::Generate(
+		data,
+		pixel * style::DevicePixelRatio(),
+		Qt::black,
+		Qt::white);
+}
+
+[[nodiscard]] QImage ProxyQrLogo() {
+	const auto size = QSize(st::introQrCenterSize, st::introQrCenterSize);
+	auto result = QImage(
+		size * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	result.fill(Qt::transparent);
+	result.setDevicePixelRatio(style::DevicePixelRatio());
+	{
+		auto p = QPainter(&result);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(ProxyQrActiveColor());
+		p.setPen(Qt::NoPen);
+		p.drawEllipse(QRect(QPoint(), size));
+		st::introQrPlane.paintInCenter(p, QRect(QPoint(), size));
+	}
+	return result;
+}
+
+[[nodiscard]] QImage ProxyQrTile(const QString &link, int max = 0) {
+	const auto data = Qr::Encode(link, Qr::Redundancy::Quartile);
+	const auto qr = ProxyQr(
+		data,
+		st::introQrPixel,
+		max);
+	const auto qrSize = qr.width() / style::DevicePixelRatio();
+	const auto skip = st::introQrBackgroundSkip;
+	const auto size = QSize(qrSize + 2 * skip, qrSize + 2 * skip);
+	auto result = QImage(
+		size * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	result.fill(Qt::transparent);
+	result.setDevicePixelRatio(style::DevicePixelRatio());
+	{
+		auto p = QPainter(&result);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(Qt::white);
+		p.drawRoundedRect(
+			QRect(QPoint(), size),
+			st::introQrBackgroundRadius,
+			st::introQrBackgroundRadius);
+		p.drawImage(QRect(skip, skip, qrSize, qrSize), qr);
+		const auto logo = ProxyQrLogo();
+		p.drawImage(
+			QRect(
+				(size.width() - st::introQrCenterSize) / 2,
+				(size.height() - st::introQrCenterSize) / 2,
+				st::introQrCenterSize,
+				st::introQrCenterSize),
+			logo);
+	}
+	return result;
+}
+
+[[nodiscard]] QImage ProxyQrForShare(const QString &link) {
+	return ProxyQrTile(
+		link,
+		st::boxWidth - st::boxRowPadding.left() - st::boxRowPadding.right());
+}
+
+void ShowProxyQrBox(std::shared_ptr<Ui::Show> show, const QString &link) {
+	show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(tr::lng_proxy_edit_share_qr_box_title());
+		box->addButton(tr::lng_about_done(), [=] { box->closeBox(); });
+
+		const auto copyCallback = [=, image = ProxyQrForShare(link)] {
+			QGuiApplication::clipboard()->setImage(image);
+			show->showToast({
+				.text = { tr::lng_group_invite_qr_copied(tr::now) },
+				.iconLottie = u"toast/copy"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		};
+
+		const auto qr = ProxyQrTile(
+			link,
+			st::boxWidth
+				- st::boxRowPadding.left()
+				- st::boxRowPadding.right());
+		const auto size = qr.width() / style::DevicePixelRatio();
+		const auto height = st::inviteLinkQrSkip * 2 + size;
+		const auto container = box->addRow(
+			object_ptr<Ui::BoxContentDivider>(box, height),
+			st::inviteLinkQrMargin);
+		const auto button = Ui::CreateChild<Ui::AbstractButton>(container);
+		button->resize(size, size);
+		button->paintRequest(
+		) | rpl::on_next([=] {
+			QPainter(button).drawImage(QRect(0, 0, size, size), qr);
+		}, button->lifetime());
+		container->widthValue(
+		) | rpl::on_next([=](int width) {
+			button->move((width - size) / 2, st::inviteLinkQrSkip);
+		}, button->lifetime());
+		button->setClickedCallback(copyCallback);
+
+		box->addLeftButton(tr::lng_group_invite_context_copy(), copyCallback);
+	}));
+}
+
+void ShareProxy(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Main::Account*> account,
+		const ProxyData &proxy,
+		bool qr) {
+	if (!ProxyDataIsShareable(proxy)) {
+		return;
+	}
+	const auto qrLink = ProxyDataToLocalLink(proxy);
+	if (qrLink.isEmpty()) {
+		return;
+	}
+	if (qr) {
+		if (account->sessionExists()) {
+			show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+				Ui::FillPeerQrBox(
+					box,
+					nullptr,
+					qrLink,
+					rpl::single(QString()));
+				box->setTitle(tr::lng_proxy_edit_share_qr_box_title());
+			}));
+		} else {
+			ShowProxyQrBox(show, qrLink);
+		}
+		return;
+	}
+	const auto internal = base::IsCtrlPressed()
+		|| base::IsAltPressed()
+		|| base::IsShiftPressed();
+	const auto shareLink = internal
+		? qrLink
+		: ProxyDataToPublicLink(account, proxy);
+	if (shareLink.isEmpty()) {
+		return;
+	}
+	TextUtilities::SetClipboardText(TextForMimeData::Simple(shareLink));
+	show->showToast({
+		.text = { tr::lng_username_copied(tr::now) },
+		.iconLottie = u"toast/voip_invite"_q,
+		.iconLottieSize = st::toastLottieIconSize,
+	});
+}
+
 [[nodiscard]] ProxyData ProxyDataFromFields(
 		ProxyData::Type type,
 		const QMap<QString, QString> &fields) {
@@ -70,6 +333,131 @@ using ProxyData = MTP::ProxyData;
 	return proxy;
 };
 
+[[nodiscard]] ProxyData ProxyDataFromLocalUrl(const QString &local) {
+	const auto protocol = u"tg://"_q;
+	const auto proxyString = u"proxy"_q;
+	const auto socksString = u"socks"_q;
+	if (!local.startsWith(protocol + proxyString, Qt::CaseInsensitive)
+		&& !local.startsWith(protocol + socksString, Qt::CaseInsensitive)) {
+		return ProxyData();
+	}
+	const auto command = base::StringViewMid(local, protocol.size(), 8192);
+	using namespace qthelp;
+	const auto options = RegExOption::CaseInsensitive;
+	for (const auto &[expression, _] : Core::LocalUrlHandlers()) {
+		const auto midExpression = base::StringViewMid(expression, 1);
+		const auto isSocks = midExpression.startsWith(socksString);
+		if (!midExpression.startsWith(proxyString) && !isSocks) {
+			continue;
+		}
+		const auto match = regex_match(expression, command, options);
+		if (!match) {
+			continue;
+		}
+		const auto type = isSocks
+			? ProxyData::Type::Socks5
+			: ProxyData::Type::Mtproto;
+		auto fields = url_parse_params(
+			match->captured(1),
+			qthelp::UrlParamNameTransform::ToLower);
+		if (type == ProxyData::Type::Mtproto) {
+			auto &secret = fields[u"secret"_q];
+			secret.replace('+', '-').replace('/', '_');
+		}
+		return ProxyDataFromFields(type, fields);
+	}
+	return ProxyData();
+}
+
+[[nodiscard]] ProxyData ProxyDataFromClipboard() {
+	const auto candidates = ExtractLinkCandidates(
+		QGuiApplication::clipboard()->text());
+	if (candidates.size() != 1) {
+		return ProxyData();
+	}
+	const auto trimmed = candidates.front().trimmed();
+	const auto converted = Core::TryConvertUrlToLocal(trimmed);
+	const auto local = converted.isEmpty() ? trimmed : converted;
+	const auto proxy = ProxyDataFromLocalUrl(local);
+	return proxy.valid() ? proxy : ProxyData();
+}
+
+void AddProxyFromClipboard(
+		not_null<ProxiesBoxController*> controller,
+		std::shared_ptr<Ui::Show> show) {
+	const auto proxyString = u"proxy"_q;
+	const auto socksString = u"socks"_q;
+	const auto protocol = u"tg://"_q;
+
+	const auto maybeUrls = ExtractLinkCandidates(
+		QGuiApplication::clipboard()->text());
+	const auto isSingle = maybeUrls.size() == 1;
+
+	enum class Result {
+		Success,
+		Failed,
+		Unsupported,
+		IncorrectSecret,
+		Invalid,
+	};
+
+	const auto proceedUrl = [=](const QString &local) {
+		const auto isProxyLink
+			= local.startsWith(protocol + proxyString, Qt::CaseInsensitive)
+			|| local.startsWith(protocol + socksString, Qt::CaseInsensitive);
+		if (!isProxyLink) {
+			return Result::Failed;
+		}
+		const auto proxy = ProxyDataFromLocalUrl(local);
+		if (proxy.type == ProxyData::Type::None) {
+			return Result::Success;
+		} else if (!proxy) {
+			const auto status = proxy.status();
+			return (status == ProxyData::Status::Unsupported)
+				? Result::Unsupported
+				: (status == ProxyData::Status::IncorrectSecret)
+				? Result::IncorrectSecret
+				: Result::Invalid;
+		}
+		const auto contains = controller->contains(proxy);
+		const auto toast = (contains
+			? tr::lng_proxy_add_from_clipboard_existing_toast
+			: tr::lng_proxy_add_from_clipboard_good_toast)(tr::now);
+		if (isSingle) {
+			show->showToast(toast);
+		}
+		if (!contains) {
+			controller->addNewItem(proxy);
+		}
+		return Result::Success;
+	};
+
+	auto success = Result::Failed;
+	for (const auto &maybeUrl : maybeUrls) {
+		const auto trimmed = maybeUrl.trimmed();
+		const auto local = Core::TryConvertUrlToLocal(trimmed);
+		const auto check = local.isEmpty() ? trimmed : local;
+		const auto result = proceedUrl(check);
+		if (success != Result::Success) {
+			success = result;
+		}
+	}
+
+	if (success != Result::Success) {
+		if (success == Result::Failed) {
+			show->showToast(
+				tr::lng_proxy_add_from_clipboard_failed_toast(tr::now));
+		} else {
+			show->showBox(Ui::MakeInformBox(
+				((success == Result::IncorrectSecret)
+					? tr::lng_proxy_incorrect_secret(tr::now, tr::rich)
+					: (success == Result::Unsupported)
+					? tr::lng_proxy_unsupported(tr::now, tr::rich)
+					: tr::lng_proxy_invalid(tr::now, tr::rich))));
+		}
+	}
+}
+
 class HostInput : public Ui::MaskedInputField {
 public:
 	HostInput(
@@ -177,6 +565,7 @@ class ProxyRow : public Ui::RippleButton {
 	rpl::producer<> restoreClicks() const;
 	rpl::producer<> editClicks() const;
 	rpl::producer<> shareClicks() const;
+	rpl::producer<> showQrClicks() const;
 
 protected:
 	int resizeGetHeight(int newWidth) override;
@@ -198,6 +587,7 @@ class ProxyRow : public Ui::RippleButton {
 	rpl::event_stream<> _restoreClicks;
 	rpl::event_stream<> _editClicks;
 	rpl::event_stream<> _shareClicks;
+	rpl::event_stream<> _showQrClicks;
 	base::unique_qptr<Ui::DropdownMenu> _menu;
 
 	bool _set = false;
@@ -218,10 +608,13 @@ class ProxiesBox : public Ui::BoxContent {
 	ProxiesBox(
 		QWidget*,
 		not_null<ProxiesBoxController*> controller,
-		Core::SettingsProxy &settings);
+		Core::SettingsProxy &settings,
+		const QString &highlightId = QString());
 
 protected:
 	void prepare() override;
+	void showFinished() override;
+	void keyPressEvent(QKeyEvent *e) override;
 
 private:
 	void setupContent();
@@ -232,12 +625,16 @@ class ProxiesBox : public Ui::BoxContent {
 	void setupButtons(int id, not_null<ProxyRow*> button);
 	int rowHeight() const;
 	void refreshProxyForCalls();
+	void refreshProxyRotation();
 
 	not_null<ProxiesBoxController*> _controller;
 	Core::SettingsProxy &_settings;
 	QPointer<Ui::Checkbox> _tryIPv6;
 	std::shared_ptr<Ui::RadioenumGroup<ProxyData::Settings>> _proxySettings;
 	QPointer<Ui::SlideWrap<Ui::Checkbox>> _proxyForCalls;
+	QPointer<Ui::SlideWrap<Ui::Checkbox>> _proxyRotation;
+	QPointer<Ui::SlideWrap<Ui::VerticalLayout>> _proxyRotationOptions;
+	QPointer<Ui::SettingsSlider> _proxyRotationTimeout;
 	QPointer<Ui::DividerLabel> _about;
 	base::unique_qptr<Ui::RpWidget> _noRows;
 	object_ptr<Ui::VerticalLayout> _initialWrap;
@@ -246,6 +643,10 @@ class ProxiesBox : public Ui::BoxContent {
 
 	base::flat_map<int, base::unique_qptr<ProxyRow>> _rows;
 
+	QPointer<Ui::RpWidget> _addProxyButton;
+	QPointer<Ui::RpWidget> _shareListButton;
+	QString _highlightId;
+
 };
 
 class ProxyBox final : public Ui::BoxContent {
@@ -278,6 +679,7 @@ class ProxyBox final : public Ui::BoxContent {
 		not_null<Ui::VerticalLayout*> parent,
 		const QString &text) const;
 
+	const bool _allowShare = false;
 	Fn<void(ProxyData)> _callback;
 	Fn<void(ProxyData)> _shareCallback;
 
@@ -319,6 +721,10 @@ rpl::producer<> ProxyRow::shareClicks() const {
 	return _shareClicks.events();
 }
 
+rpl::producer<> ProxyRow::showQrClicks() const {
+	return _showQrClicks.events();
+}
+
 void ProxyRow::setupControls(View &&view) {
 	updateFields(std::move(view));
 	_toggled.stop();
@@ -346,7 +752,7 @@ void ProxyRow::updateFields(View &&view) {
 		TextWithEntities()
 			.append(_view.type)
 			.append(' ')
-			.append(Ui::Text::Link(endpoint, QString())),
+			.append(tr::link(endpoint, QString())),
 		Ui::ItemTextDefaultOptions());
 
 	const auto state = _view.state;
@@ -563,6 +969,9 @@ void ProxyRow::showMenu() {
 		addAction(tr::lng_proxy_edit_share(tr::now), [=] {
 			_shareClicks.fire({});
 		}, &st::menuIconShare);
+		addAction(tr::lng_group_invite_context_qr(tr::now), [=] {
+			_showQrClicks.fire({});
+		}, &st::menuIconQrCode);
 	}
 	if (_view.deleted) {
 		addAction(tr::lng_proxy_menu_restore(tr::now), [=] {
@@ -607,92 +1016,90 @@ void ProxyRow::showMenu() {
 ProxiesBox::ProxiesBox(
 	QWidget*,
 	not_null<ProxiesBoxController*> controller,
-	Core::SettingsProxy &settings)
+	Core::SettingsProxy &settings,
+	const QString &highlightId)
 : _controller(controller)
 , _settings(settings)
-, _initialWrap(this) {
+, _initialWrap(this)
+, _highlightId(highlightId) {
 	_controller->views(
-	) | rpl::start_with_next([=](View &&view) {
+	) | rpl::on_next([=](View &&view) {
 		applyView(std::move(view));
 	}, lifetime());
 }
 
+void ProxiesBox::keyPressEvent(QKeyEvent *e) {
+	if (e->key() == Qt::Key_Copy
+		|| (e->key() == Qt::Key_C && e->modifiers() == Qt::ControlModifier)) {
+		_controller->shareItems();
+	} else if (e->key() == Qt::Key_Paste
+		|| (e->key() == Qt::Key_V && e->modifiers() == Qt::ControlModifier)) {
+		AddProxyFromClipboard(_controller, uiShow());
+	} else {
+		BoxContent::keyPressEvent(e);
+	}
+}
+
 void ProxiesBox::prepare() {
 	setTitle(tr::lng_proxy_settings());
 
-	addButton(tr::lng_proxy_add(), [=] { addNewProxy(); });
+	_addProxyButton = addButton(tr::lng_proxy_add(), [=] { addNewProxy(); });
 	addButton(tr::lng_close(), [=] { closeBox(); });
 
 	setupTopButton();
 	setupContent();
 }
 
+void ProxiesBox::showFinished() {
+	if (_highlightId == u"proxy/add-proxy"_q) {
+		if (_addProxyButton) {
+			_highlightId = QString();
+			Settings::HighlightWidget(
+				_addProxyButton,
+				{ .rippleShape = true });
+		}
+	} else if (_highlightId == u"proxy/share-list"_q) {
+		if (_shareListButton) {
+			_highlightId = QString();
+			Settings::HighlightWidget(_shareListButton);
+		}
+	}
+}
+
 void ProxiesBox::setupTopButton() {
 	const auto top = addTopButton(st::infoTopBarMenu);
 	const auto menu
 		= top->lifetime().make_state<base::unique_qptr<Ui::PopupMenu>>();
-	const auto callback = [=] {
-		const auto maybeUrl = QGuiApplication::clipboard()->text();
-		const auto local = Core::TryConvertUrlToLocal(maybeUrl);
-
-		const auto proxyString = u"proxy"_q;
-		const auto socksString = u"socks"_q;
-		const auto protocol = u"tg://"_q;
-		const auto command = base::StringViewMid(
-			local,
-			protocol.size(),
-			8192);
-
-		if (local.startsWith(protocol + proxyString)
-			|| local.startsWith(protocol + socksString)) {
-
-			using namespace qthelp;
-			const auto options = RegExOption::CaseInsensitive;
-			for (const auto &[expression, _] : Core::LocalUrlHandlers()) {
-				const auto midExpression = base::StringViewMid(
-					expression,
-					1);
-				const auto isSocks = midExpression.startsWith(
-					socksString);
-				if (!midExpression.startsWith(proxyString)
-					&& !isSocks) {
-					continue;
-				}
-				const auto match = regex_match(
-					expression,
-					command,
-					options);
-				if (!match) {
-					continue;
-				}
-				const auto type = isSocks
-					? ProxyData::Type::Socks5
-					: ProxyData::Type::Mtproto;
-				const auto fields = url_parse_params(
-					match->captured(1),
-					qthelp::UrlParamNameTransform::ToLower);
-				const auto proxy = ProxyDataFromFields(type, fields);
-				const auto contains = _controller->contains(proxy);
-				const auto toast = (contains
-					? tr::lng_proxy_add_from_clipboard_existing_toast
-					: tr::lng_proxy_add_from_clipboard_good_toast)(tr::now);
-				uiShow()->showToast(toast);
-				if (!contains) {
-					_controller->addNewItem(proxy);
-				}
-				break;
-			}
-		} else {
-			uiShow()->showToast(
-				tr::lng_proxy_add_from_clipboard_failed_toast(tr::now));
-		}
-	};
+
 	top->setClickedCallback([=] {
-		*menu = base::make_unique_q<Ui::PopupMenu>(top, st::defaultPopupMenu);
-		(*menu)->addAction(
-			tr::lng_proxy_add_from_clipboard(tr::now),
-			callback);
-		(*menu)->popup(QCursor::pos());
+		*menu = base::make_unique_q<Ui::PopupMenu>(
+			top,
+			st::popupMenuWithIcons);
+		const auto raw = menu->get();
+		const auto addAction = Ui::Menu::CreateAddActionCallback(raw);
+		addAction({
+			.text = tr::lng_proxy_add_from_clipboard(tr::now),
+			.handler = [=] { AddProxyFromClipboard(_controller, uiShow()); },
+			.icon = &st::menuIconImportTheme,
+		});
+		if (!_rows.empty()) {
+			addAction({
+				.text = tr::lng_group_invite_context_delete_all(tr::now),
+				.handler = [=] { _controller->deleteItems(); },
+				.icon = &st::menuIconDeleteAttention,
+				.isAttention = true,
+			});
+		}
+		raw->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
+		top->setForceRippled(true);
+		raw->setDestroyedCallback([=] {
+			if (const auto strong = top.data()) {
+				strong->setForceRippled(false);
+			}
+		});
+		raw->popup(
+			top->mapToGlobal(
+				QPoint(top->width(), top->height() - st::lineWidth * 3)));
 		return true;
 	});
 }
@@ -747,6 +1154,47 @@ void ProxiesBox::setupContent() {
 			0,
 			st::proxyTryIPv6Padding.right(),
 			st::proxyTryIPv6Padding.top()));
+	_proxyRotation = inner->add(
+		object_ptr<Ui::SlideWrap<Ui::Checkbox>>(
+			inner,
+			object_ptr<Ui::Checkbox>(
+				inner,
+				tr::lng_proxy_auto_switch(tr::now),
+				_settings.proxyRotationEnabled()),
+			style::margins(
+				0,
+				st::proxyUsePadding.top(),
+				0,
+				st::proxyUsePadding.bottom())),
+		style::margins(
+			st::proxyTryIPv6Padding.left(),
+			0,
+			st::proxyTryIPv6Padding.right(),
+			st::proxyTryIPv6Padding.top()));
+	_proxyRotationOptions = inner->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			inner,
+			object_ptr<Ui::VerticalLayout>(inner)));
+	_proxyRotationTimeout = _proxyRotationOptions->entity()->add(
+		object_ptr<Ui::SettingsSlider>(
+			_proxyRotationOptions->entity(),
+			st::settingsSlider),
+		st::settingsBigScalePadding);
+	for (const auto seconds : Core::SettingsProxy::kProxyRotationTimeouts) {
+		_proxyRotationTimeout->addSection(
+			tr::lng_proxy_auto_switch_timeout(
+				tr::now,
+				lt_count,
+				seconds));
+	}
+	_proxyRotationTimeout->setActiveSectionFast(
+		ClosestProxyRotationTimeoutSection(_settings.proxyRotationTimeout()));
+	_proxyRotationOptions->entity()->add(
+		object_ptr<Ui::FlatLabel>(
+			_proxyRotationOptions->entity(),
+			tr::lng_proxy_auto_switch_about(tr::now),
+			st::boxDividerLabel),
+		st::proxyAboutPadding);
 
 	_about = inner->add(
 		object_ptr<Ui::DividerLabel>(
@@ -769,27 +1217,61 @@ void ProxiesBox::setupContent() {
 			addNewProxy();
 		}
 		refreshProxyForCalls();
+		refreshProxyRotation();
 	});
 	_tryIPv6->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		_controller->setTryIPv6(checked);
 	}, _tryIPv6->lifetime());
 
 	_controller->proxySettingsValue(
-	) | rpl::start_with_next([=](ProxyData::Settings value) {
+	) | rpl::on_next([=](ProxyData::Settings value) {
 		_proxySettings->setValue(value);
+		refreshProxyForCalls();
+		refreshProxyRotation();
 	}, inner->lifetime());
 
 	_proxyForCalls->entity()->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		_controller->setProxyForCalls(checked);
 	}, _proxyForCalls->lifetime());
+	_proxyRotation->entity()->checkedChanges(
+	) | rpl::on_next([=](bool checked) {
+		_controller->setProxyRotationEnabled(checked);
+		refreshProxyRotation();
+	}, _proxyRotation->lifetime());
+	_proxyRotationTimeout->sectionActivated(
+	) | rpl::on_next([=](int section) {
+		_controller->setProxyRotationTimeout(
+			Core::SettingsProxy::kProxyRotationTimeouts[section]);
+	}, _proxyRotationTimeout->lifetime());
 
 	if (_rows.empty()) {
 		createNoRowsLabel();
 	}
 	refreshProxyForCalls();
+	refreshProxyRotation();
 	_proxyForCalls->finishAnimating();
+	_proxyRotation->finishAnimating();
+	_proxyRotationOptions->finishAnimating();
+
+	{
+		const auto wrap = inner->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				inner,
+				object_ptr<Ui::VerticalLayout>(inner)));
+		const auto shareList = Settings::AddButtonWithIcon(
+			wrap->entity(),
+			tr::lng_proxy_edit_share_list_button(),
+			st::settingsButton,
+			{ &st::menuIconCopy });
+		_shareListButton = shareList;
+		shareList->setClickedCallback([=] {
+			_controller->shareItems();
+		});
+		wrap->toggleOn(_controller->listShareableChanges());
+		wrap->finishAnimating();
+	}
 
 	inner->resizeToWidth(st::boxWideWidth);
 
@@ -801,7 +1283,7 @@ void ProxiesBox::setupContent() {
 				+ 3 * rowHeight()),
 			st::boxMaxListHeight);
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWideWidth, height);
 	}, inner->lifetime());
 }
@@ -816,6 +1298,20 @@ void ProxiesBox::refreshProxyForCalls() {
 		anim::type::normal);
 }
 
+void ProxiesBox::refreshProxyRotation() {
+	if (!_proxyRotation || !_proxyRotationOptions) {
+		return;
+	}
+	const auto visible = (_proxySettings->current()
+			== ProxyData::Settings::Enabled)
+		&& _settings.selected()
+		&& (_settings.list().size() > 1);
+	_proxyRotation->toggle(visible, anim::type::normal);
+	_proxyRotationOptions->toggle(
+		visible && _proxyRotation->entity()->checked(),
+		anim::type::normal);
+}
+
 int ProxiesBox::rowHeight() const {
 	return st::proxyRowPadding.top()
 		+ st::semiboldFont->height
@@ -858,6 +1354,7 @@ void ProxiesBox::applyView(View &&view) {
 	} else {
 		i->second->updateFields(std::move(view));
 	}
+	refreshProxyRotation();
 }
 
 void ProxiesBox::createNoRowsLabel() {
@@ -876,7 +1373,7 @@ void ProxiesBox::createNoRowsLabel() {
 		tr::lng_proxy_description(tr::now),
 		st::proxyEmptyListLabel);
 	_noRows->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		label->resizeToWidth(width);
 		label->moveToLeft(0, 0);
 	}, label->lifetime());
@@ -884,27 +1381,29 @@ void ProxiesBox::createNoRowsLabel() {
 
 void ProxiesBox::setupButtons(int id, not_null<ProxyRow*> button) {
 	button->deleteClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->deleteItem(id);
 	}, button->lifetime());
 
 	button->restoreClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->restoreItem(id);
 	}, button->lifetime());
 
 	button->editClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		getDelegate()->show(_controller->editItemBox(id));
 	}, button->lifetime());
 
-	button->shareClicks(
-	) | rpl::start_with_next([=] {
-		_controller->shareItem(id);
+	rpl::merge(
+		button->shareClicks() | rpl::map_to(false),
+		button->showQrClicks() | rpl::map_to(true)
+	) | rpl::on_next([=](bool qr) {
+		_controller->shareItem(id, qr);
 	}, button->lifetime());
 
 	button->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->applyItem(id);
 	}, button->lifetime());
 }
@@ -914,7 +1413,8 @@ ProxyBox::ProxyBox(
 	const ProxyData &data,
 	Fn<void(ProxyData)> callback,
 	Fn<void(ProxyData)> shareCallback)
-: _callback(std::move(callback))
+: _allowShare(data.type != Type::None)
+, _callback(std::move(callback))
 , _shareCallback(std::move(shareCallback))
 , _content(this) {
 	setupControls(data);
@@ -940,7 +1440,7 @@ void ProxyBox::prepare() {
 		});
 	});
 	_port.data()->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::KeyPress
 			&& (static_cast<QKeyEvent*>(e.get())->key() == Qt::Key_Backspace)
 			&& _port->cursorPosition() == 0) {
@@ -949,6 +1449,30 @@ void ProxyBox::prepare() {
 		}
 	}, _port->lifetime());
 
+	const auto submit = [=] {
+		if (_host->hasFocus()
+			&& !_host->getLastText().trimmed().isEmpty()) {
+			_port->setFocus();
+		} else if (_port->hasFocus()
+			&& !_port->getLastText().trimmed().isEmpty()) {
+			if (_type->current() == Type::Mtproto) {
+				_secret->setFocus();
+			} else {
+				_user->setFocus();
+			}
+		} else if (_user->hasFocus()) {
+			_password->setFocus();
+		} else {
+			save();
+		}
+	};
+	connect(_host.data(), &Ui::MaskedInputField::submitted, submit);
+	connect(_port.data(), &Ui::MaskedInputField::submitted, submit);
+	_user->submits(
+	) | rpl::on_next(submit, _user->lifetime());
+	connect(_password.data(), &Ui::MaskedInputField::submitted, submit);
+	connect(_secret.data(), &Ui::MaskedInputField::submitted, submit);
+
 	refreshButtons();
 	setDimensionsToContent(st::boxWideWidth, _content);
 }
@@ -959,7 +1483,8 @@ void ProxyBox::refreshButtons() {
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
 
 	const auto type = _type->current();
-	if (type == Type::Socks5 || type == Type::Mtproto) {
+	if (_allowShare
+		&& (type == Type::Socks5 || type == Type::Mtproto)) {
 		addLeftButton(tr::lng_proxy_share(), [=] { share(); });
 	}
 }
@@ -1006,10 +1531,10 @@ ProxyData ProxyBox::collectData() {
 }
 
 void ProxyBox::setupTypes() {
-	const auto types = std::map<Type, QString>{
-		{ Type::Http, "HTTP" },
-		{ Type::Socks5, "SOCKS5" },
-		{ Type::Mtproto, "MTPROTO" },
+	const auto types = std::vector<std::pair<Type, QString>>{
+		{ Type::Mtproto, u"MTPROTO"_q },
+		{ Type::Socks5, u"SOCKS5"_q },
+		{ Type::Http, u"HTTP"_q },
 	};
 	for (const auto &[type, label] : types) {
 		_content->add(
@@ -1050,7 +1575,7 @@ void ProxyBox::setupSocketAddress(const ProxyData &data) {
 		data.port ? QString::number(data.port) : QString(),
 		65535);
 	address->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_port->moveToRight(0, 0);
 		_host->resize(
 			width - _port->width() - st::proxyEditSkip,
@@ -1060,7 +1585,7 @@ void ProxyBox::setupSocketAddress(const ProxyData &data) {
 }
 
 void ProxyBox::setupCredentials(const ProxyData &data) {
-		_credentials = _content->add(
+	_credentials = _content->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			_content,
 			object_ptr<Ui::VerticalLayout>(_content)));
@@ -1082,11 +1607,11 @@ void ProxyBox::setupCredentials(const ProxyData &data) {
 		(data.type == Type::Mtproto) ? QString() : data.password);
 	_password->move(0, 0);
 	_password->heightValue(
-	) | rpl::start_with_next([=, wrap = passwordWrap.data()](int height) {
+	) | rpl::on_next([=, wrap = passwordWrap.data()](int height) {
 		wrap->resize(wrap->width(), height);
 	}, _password->lifetime());
 	passwordWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_password->resize(width, _password->height());
 	}, _password->lifetime());
 	credentials->add(std::move(passwordWrap), st::proxyEditInputPadding);
@@ -1108,11 +1633,11 @@ void ProxyBox::setupMtprotoCredentials(const ProxyData &data) {
 		(data.type == Type::Mtproto) ? data.password : QString());
 	_secret->move(0, 0);
 	_secret->heightValue(
-	) | rpl::start_with_next([=, wrap = secretWrap.data()](int height) {
+	) | rpl::on_next([=, wrap = secretWrap.data()](int height) {
 		wrap->resize(wrap->width(), height);
 	}, _secret->lifetime());
 	secretWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_secret->resize(width, _secret->height());
 	}, _secret->lifetime());
 	mtproto->add(std::move(secretWrap), st::proxyEditInputPadding);
@@ -1121,7 +1646,7 @@ void ProxyBox::setupMtprotoCredentials(const ProxyData &data) {
 void ProxyBox::setupControls(const ProxyData &data) {
 	_type = std::make_shared<Ui::RadioenumGroup<Type>>(
 		(data.type == Type::None
-			? Type::Socks5
+			? Type::Mtproto
 			: data.type));
 	_content.create(this);
 	_content->resizeToWidth(st::boxWideWidth);
@@ -1133,15 +1658,19 @@ void ProxyBox::setupControls(const ProxyData &data) {
 	setupMtprotoCredentials(data);
 
 	const auto handleType = [=](Type type) {
-		_credentials->toggle(
-			type == Type::Http || type == Type::Socks5,
-			anim::type::instant);
-		_mtprotoCredentials->toggle(
-			type == Type::Mtproto,
-			anim::type::instant);
-		_aboutSponsored->toggle(
-			type == Type::Mtproto,
-			anim::type::instant);
+		const auto credentialsShown
+			= (type == Type::Http || type == Type::Socks5);
+		const auto mtprotoShown = (type == Type::Mtproto);
+		_credentials->toggle(credentialsShown, anim::type::instant);
+		_mtprotoCredentials->toggle(mtprotoShown, anim::type::instant);
+		_aboutSponsored->toggle(mtprotoShown, anim::type::instant);
+		const auto credentialsPolicy = credentialsShown
+			? Qt::StrongFocus
+			: Qt::NoFocus;
+		_user->rawTextEdit()->setFocusPolicy(credentialsPolicy);
+		_password->setFocusPolicy(credentialsPolicy);
+		_secret->setFocusPolicy(
+			mtprotoShown ? Qt::StrongFocus : Qt::NoFocus);
 	};
 	_type->setChangedCallback([=](Type type) {
 		handleType(type);
@@ -1161,6 +1690,9 @@ void ProxyBox::addLabel(
 		st::proxyEditTitlePadding);
 }
 
+using Connection = MTP::details::AbstractConnection;
+using Checker = MTP::ProxyCheckConnection;
+
 } // namespace
 
 ProxiesBoxController::ProxiesBoxController(not_null<Main::Account*> account)
@@ -1174,7 +1706,7 @@ ProxiesBoxController::ProxiesBoxController(not_null<Main::Account*> account)
 	}) | ranges::to_vector;
 
 	_settings.connectionTypeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_proxySettingsChanges.fire_copy(_settings.settings());
 		const auto i = findByProxy(_settings.selected());
 		if (i != end(_list)) {
@@ -1193,10 +1725,13 @@ void ProxiesBoxController::ShowApplyConfirmation(
 		const QMap<QString, QString> &fields) {
 	const auto proxy = ProxyDataFromFields(type, fields);
 	if (!proxy) {
+		const auto status = proxy.status();
 		auto box = Ui::MakeInformBox(
-			(proxy.status() == ProxyData::Status::Unsupported
-				? tr::lng_proxy_unsupported(tr::now)
-				: tr::lng_proxy_invalid(tr::now)));
+			((status == ProxyData::Status::Unsupported)
+				? tr::lng_proxy_unsupported(tr::now, tr::rich)
+				: (status == ProxyData::Status::IncorrectSecret)
+				? tr::lng_proxy_incorrect_secret(tr::now, tr::rich)
+				: tr::lng_proxy_invalid(tr::now, tr::rich)));
 		if (controller) {
 			controller->uiShow()->showBox(std::move(box));
 		} else {
@@ -1222,45 +1757,237 @@ void ProxiesBoxController::ShowApplyConfirmation(
 		QString()
 	).replace(UrlEndRegExp, QString());
 	const auto box = [=](not_null<Ui::GenericBox*> box) {
-		box->setTitle(tr::lng_proxy_box_title());
-		if (type == Type::Mtproto) {
-			box->addRow(object_ptr<Ui::FlatLabel>(
-				box,
-				tr::lng_proxy_sponsor_warning(),
-				st::boxDividerLabel));
-			Ui::AddSkip(box->verticalLayout());
-			Ui::AddSkip(box->verticalLayout());
+		box->setTitle(tr::lng_proxy_box_table_title());
+		box->setStyle(st::proxyApplyBox);
+		box->addTopButton(st::boxTitleClose, [=] {
+			box->closeBox();
+		});
+
+		if (ProxyDataIsShareable(proxy)) {
+			const auto account = controller
+				? &controller->session().account()
+				: &Core::App().activeAccount();
+			const auto top = box->addTopButton(st::boxTitleMenu);
+			const auto menu = top->lifetime().make_state<
+				base::unique_qptr<Ui::PopupMenu>>();
+			top->setClickedCallback([=] {
+				*menu = base::make_unique_q<Ui::PopupMenu>(
+					top,
+					st::popupMenuWithIcons);
+				const auto raw = menu->get();
+				const auto addAction = Ui::Menu::CreateAddActionCallback(raw);
+				addAction({
+					.text = tr::lng_proxy_edit_share(tr::now),
+					.handler = [=] {
+						ShareProxy(box->uiShow(), account, proxy, false);
+					},
+					.icon = &st::menuIconShare,
+				});
+				addAction({
+					.text = tr::lng_group_invite_context_qr(tr::now),
+					.handler = [=] {
+						ShareProxy(box->uiShow(), account, proxy, true);
+					},
+					.icon = &st::menuIconQrCode,
+				});
+				raw->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
+				top->setForceRippled(true);
+				raw->setDestroyedCallback([=] {
+					if (const auto strong = top.data()) {
+						strong->setForceRippled(false);
+					}
+				});
+				raw->popup(top->mapToGlobal(QPoint(
+					top->width(),
+					top->height() - st::lineWidth * 3)));
+				return true;
+			});
 		}
-		const auto &stL = st::proxyApplyBoxLabel;
-		const auto &stSubL = st::boxDividerLabel;
-		const auto add = [&](const QString &s, tr::phrase<> phrase) {
-			if (!s.isEmpty()) {
-				box->addRow(object_ptr<Ui::FlatLabel>(box, s, stL));
-				box->addRow(object_ptr<Ui::FlatLabel>(box, phrase(), stSubL));
-				Ui::AddSkip(box->verticalLayout());
-				Ui::AddSkip(box->verticalLayout());
+
+		const auto table = box->addRow(
+			object_ptr<Ui::TableLayout>(
+				box,
+				st::proxyApplyBoxTable),
+			st::proxyApplyBoxTableMargin);
+		const auto addRow = [&](
+				rpl::producer<QString> label,
+				object_ptr<Ui::RpWidget> value) {
+			table->addRow(
+				object_ptr<Ui::FlatLabel>(
+					table,
+					std::move(label),
+					table->st().defaultLabel),
+				std::move(value),
+				st::proxyApplyBoxTableLabelMargin,
+				st::proxyApplyBoxTableValueMargin);
+		};
+		const auto add = [&](
+				const QString &value,
+				rpl::producer<QString> label) {
+			if (!value.isEmpty()) {
+				constexpr auto kOneLineCount = 20;
+				const auto oneLine = value.length() <= kOneLineCount;
+				auto widget = object_ptr<Ui::FlatLabel>(
+					table,
+					rpl::single(Ui::Text::Wrapped(
+						{ value },
+						EntityType::Code,
+						{})),
+					(oneLine
+						? table->st().defaultValue
+						: st::proxyApplyBoxValueMultiline),
+					st::defaultPopupMenu);
+				addRow(std::move(label), std::move(widget));
 			}
 		};
 		if (!displayServer.isEmpty()) {
-			add(displayServer, tr::lng_proxy_box_server);
+			add(displayServer, tr::lng_proxy_box_server());
 		}
-		add(QString::number(proxy.port), tr::lng_proxy_box_port);
+		add(QString::number(proxy.port), tr::lng_proxy_box_port());
 		if (type == Type::Socks5) {
-			add(proxy.user, tr::lng_proxy_box_username);
-			add(proxy.password, tr::lng_proxy_box_password);
+			add(proxy.user, tr::lng_proxy_box_username());
+			add(proxy.password, tr::lng_proxy_box_password());
 		} else if (type == Type::Mtproto) {
-			add(proxy.password, tr::lng_proxy_box_secret);
+			add(proxy.password, tr::lng_proxy_box_secret());
+		}
+
+		{
+			struct ProxyCheckStatusState {
+				Checker v4;
+				Checker v6;
+				rpl::variable<TextWithEntities> statusValue;
+				bool finished = false;
+			};
+			const auto state
+				= box->lifetime().make_state<ProxyCheckStatusState>();
+			state->statusValue = Ui::Text::Link(
+				tr::lng_proxy_box_check_status(tr::now));
+			const auto weak = base::make_weak(box);
+			auto statusWidget = object_ptr<Ui::FlatLabel>(
+				table,
+				state->statusValue.value(),
+				table->st().defaultValue,
+				st::defaultPopupMenu);
+			const auto statusLabel = statusWidget.data();
+			addRow(tr::lng_proxy_box_status(), std::move(statusWidget));
+			const auto relayout = [=] {
+				table->resizeToWidth(table->width());
+			};
+			const auto setUnavailable = [=] {
+				state->statusValue = TextWithEntities{
+					tr::lng_proxy_box_table_unavailable(tr::now),
+				};
+				statusLabel->setTextColorOverride(
+					st::proxyRowStatusFgOffline->c);
+				relayout();
+			};
+			const auto runCheck = [=] {
+				if (!weak) {
+					return;
+				}
+				const auto account = controller
+					? &controller->session().account()
+					: &Core::App().activeAccount();
+				state->finished = false;
+				state->statusValue = TextWithEntities{
+					tr::lng_proxy_box_table_checking(tr::now),
+				};
+				statusLabel->setTextColorOverride(st::proxyRowStatusFg->c);
+				relayout();
+				MTP::StartProxyCheck(
+					&account->mtp(),
+					proxy,
+					Core::App().settings().proxy().tryIPv6(),
+					state->v4,
+					state->v6,
+					[=](Connection *raw, int ping) {
+						if (!weak || state->finished) {
+							return;
+						}
+						MTP::DropProxyChecker(state->v4, state->v6, raw);
+						state->finished = true;
+						MTP::ResetProxyCheckers(state->v4, state->v6);
+						state->statusValue = TextWithEntities{
+							tr::lng_proxy_box_table_available(
+								tr::now,
+								lt_ping,
+								QString::number(ping)),
+						};
+						statusLabel->setTextColorOverride(
+							st::proxyRowStatusFgAvailable->c);
+						relayout();
+					},
+					[=](Connection *raw) {
+						if (!weak || state->finished) {
+							return;
+						}
+						MTP::DropProxyChecker(state->v4, state->v6, raw);
+						if (!MTP::HasProxyCheckers(state->v4, state->v6)) {
+							state->finished = true;
+							setUnavailable();
+						}
+					});
+				if (!MTP::HasProxyCheckers(state->v4, state->v6)) {
+					state->finished = true;
+					setUnavailable();
+				}
+			};
+			statusLabel->setClickHandlerFilter([=](const auto &...) {
+				auto &proxy = Core::App().settings().proxy();
+				if (proxy.checkIpWarningShown()) {
+					runCheck();
+				} else {
+					box->uiShow()->showBox(Ui::MakeConfirmBox({
+						.text = tr::lng_proxy_check_ip_warning(),
+						.confirmed = [=](Fn<void()> close) {
+							auto &proxy = Core::App().settings().proxy();
+							proxy.setCheckIpWarningShown(true);
+							Local::writeSettings();
+							close();
+							runCheck();
+						},
+						.confirmText = tr::lng_proxy_check_ip_proceed(),
+						.title = tr::lng_proxy_check_ip_warning_title(),
+					}));
+				}
+				return false;
+			});
 		}
-		box->addButton(tr::lng_sure_enable(), [=] {
-			auto &proxies = Core::App().settings().proxy().list();
-			if (!ranges::contains(proxies, proxy)) {
-				proxies.push_back(proxy);
+
+		if (type == Type::Mtproto) {
+			table->addRow(
+				object_ptr<Ui::FlatLabel>(
+					table,
+					tr::lng_proxy_sponsor_warning(),
+					st::proxyApplyBoxSponsorLabel),
+				object_ptr<Ui::RpWidget>(nullptr),
+				st::proxyApplyBoxSponsorMargin,
+				st::proxyApplyBoxSponsorMargin);
+		}
+
+		const auto enableButton = box->addButton(
+			tr::lng_proxy_box_table_button(),
+			[=] {
+				auto &settings = Core::App().settings().proxy();
+				if (settings.indexInList(proxy) < 0) {
+					settings.addToList(proxy);
+				}
+				Core::App().setCurrentProxy(
+					proxy,
+					ProxyData::Settings::Enabled);
+				Local::writeSettings();
+				box->closeBox();
+			});
+		enableButton->setFullRadius(true);
+		box->events() | rpl::on_next([=](not_null<QEvent*> e) {
+			if ((e->type() != QEvent::KeyPress) || !enableButton) {
+				return;
 			}
-			Core::App().setCurrentProxy(proxy, ProxyData::Settings::Enabled);
-			Local::writeSettings();
-			box->closeBox();
-		});
-		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+			const auto k = static_cast<QKeyEvent*>(e.get());
+			if (k->key() == Qt::Key_Enter || k->key() == Qt::Key_Return) {
+				enableButton->clicked({}, Qt::LeftButton);
+			}
+		}, box->lifetime());
 	};
 	if (controller) {
 		controller->uiShow()->showBox(Box(box));
@@ -1277,108 +2004,62 @@ auto ProxiesBoxController::proxySettingsValue() const
 }
 
 void ProxiesBoxController::refreshChecker(Item &item) {
-	using Variants = MTP::DcOptions::Variants;
-	const auto type = (item.data.type == Type::Http)
-		? Variants::Http
-		: Variants::Tcp;
-	const auto mtproto = &_account->mtp();
-	const auto dcId = mtproto->mainDcId();
-	const auto forFiles = false;
-
 	item.state = ItemState::Checking;
-	const auto setup = [&](Checker &checker, const bytes::vector &secret) {
-		checker = MTP::details::AbstractConnection::Create(
-			mtproto,
-			type,
-			QThread::currentThread(),
-			secret,
-			item.data);
-		setupChecker(item.id, checker);
-	};
-	if (item.data.type == Type::Mtproto) {
-		const auto secret = item.data.secretFromMtprotoPassword();
-		setup(item.checker, secret);
-		item.checker->connectToServer(
-			item.data.host,
-			item.data.port,
-			secret,
-			dcId,
-			forFiles);
-		item.checkerv6 = nullptr;
-	} else {
-		const auto options = mtproto->dcOptions().lookup(
-			dcId,
-			MTP::DcType::Regular,
-			true);
-		const auto connect = [&](
-				Checker &checker,
-				Variants::Address address) {
-			const auto &list = options.data[address][type];
-			if (list.empty()
-				|| ((address == Variants::IPv6)
-					&& !Core::App().settings().proxy().tryIPv6())) {
-				checker = nullptr;
+	const auto id = item.id;
+	MTP::StartProxyCheck(
+		&_account->mtp(),
+		item.data,
+		Core::App().settings().proxy().tryIPv6(),
+		item.checker,
+		item.checkerv6,
+		[=](Connection *raw, int pingTime) {
+			const auto item = ranges::find(
+				_list,
+				id,
+				[](const Item &item) { return item.id; });
+			if (item == end(_list)) {
 				return;
 			}
-			const auto &endpoint = list.front();
-			setup(checker, endpoint.secret);
-			checker->connectToServer(
-				QString::fromStdString(endpoint.ip),
-				endpoint.port,
-				endpoint.secret,
-				dcId,
-				forFiles);
-		};
-		connect(item.checker, Variants::IPv4);
-		connect(item.checkerv6, Variants::IPv6);
-		if (!item.checker && !item.checkerv6) {
-			item.state = ItemState::Unavailable;
-		}
+			MTP::DropProxyChecker(item->checker, item->checkerv6, raw);
+			MTP::ResetProxyCheckers(item->checker, item->checkerv6);
+			if (item->state == ItemState::Checking) {
+				item->state = ItemState::Available;
+				item->ping = pingTime;
+				updateView(*item);
+			}
+		},
+		[=](Connection *raw) {
+			const auto item = ranges::find(
+				_list,
+				id,
+				[](const Item &item) { return item.id; });
+			if (item == end(_list)) {
+				return;
+			}
+			MTP::DropProxyChecker(item->checker, item->checkerv6, raw);
+			if (!MTP::HasProxyCheckers(item->checker, item->checkerv6)
+				&& item->state == ItemState::Checking) {
+				item->state = ItemState::Unavailable;
+				updateView(*item);
+			}
+		});
+	if (!MTP::HasProxyCheckers(item.checker, item.checkerv6)) {
+		item.state = ItemState::Unavailable;
 	}
 }
 
-void ProxiesBoxController::setupChecker(int id, const Checker &checker) {
-	using Connection = MTP::details::AbstractConnection;
-	const auto pointer = checker.get();
-	pointer->connect(pointer, &Connection::connected, [=] {
-		const auto item = findById(id);
-		const auto pingTime = pointer->pingTime();
-		item->checker = nullptr;
-		item->checkerv6 = nullptr;
-		if (item->state == ItemState::Checking) {
-			item->state = ItemState::Available;
-			item->ping = pingTime;
-			updateView(*item);
-		}
-	});
-	const auto failed = [=] {
-		const auto item = findById(id);
-		if (item->checker == pointer) {
-			item->checker = nullptr;
-		} else if (item->checkerv6 == pointer) {
-			item->checkerv6 = nullptr;
-		}
-		if (!item->checker
-			&& !item->checkerv6
-			&& item->state == ItemState::Checking) {
-			item->state = ItemState::Unavailable;
-			updateView(*item);
-		}
-	};
-	pointer->connect(pointer, &Connection::disconnected, failed);
-	pointer->connect(pointer, &Connection::error, failed);
-}
-
 object_ptr<Ui::BoxContent> ProxiesBoxController::CreateOwningBox(
-		not_null<Main::Account*> account) {
+		not_null<Main::Account*> account,
+		const QString &highlightId) {
 	auto controller = std::make_unique<ProxiesBoxController>(account);
-	auto box = controller->create();
+	auto box = controller->create(highlightId);
 	Ui::AttachAsChild(box, std::move(controller));
 	return box;
 }
 
-object_ptr<Ui::BoxContent> ProxiesBoxController::create() {
-	auto result = Box<ProxiesBox>(this, _settings);
+object_ptr<Ui::BoxContent> ProxiesBoxController::create(
+		const QString &highlightId) {
+	auto result = Box<ProxiesBox>(this, _settings, highlightId);
 	_show = result->uiShow();
 	for (const auto &item : _list) {
 		updateView(item);
@@ -1407,12 +2088,39 @@ void ProxiesBoxController::deleteItem(int id) {
 	setDeleted(id, true);
 }
 
+void ProxiesBoxController::deleteItems() {
+	for (const auto &item : _list) {
+		setDeleted(item.id, true);
+	}
+}
+
 void ProxiesBoxController::restoreItem(int id) {
 	setDeleted(id, false);
 }
 
-void ProxiesBoxController::shareItem(int id) {
-	share(findById(id)->data);
+void ProxiesBoxController::shareItem(int id, bool qr) {
+	share(findById(id)->data, qr);
+}
+
+void ProxiesBoxController::shareItems() {
+	auto result = QString();
+	for (const auto &item : _list) {
+		if (!item.deleted && ProxyDataIsShareable(item.data)) {
+			const auto link = ProxyDataToPublicLink(_account, item.data);
+			if (!link.isEmpty()) {
+				result += (result.isEmpty() ? QString() : u"\n\n"_q) + link;
+			}
+		}
+	}
+	if (result.isEmpty()) {
+		return;
+	}
+	QGuiApplication::clipboard()->setText(result);
+	_show->showToast({
+		.text = { tr::lng_proxy_edit_share_list_toast(tr::now) },
+		.iconLottie = u"toast/copy"_q,
+		.iconLottieSize = st::toastLottieIconSize,
+	});
 }
 
 void ProxiesBoxController::applyItem(int id) {
@@ -1441,8 +2149,8 @@ void ProxiesBoxController::setDeleted(int id, bool deleted) {
 	item->deleted = deleted;
 
 	if (deleted) {
-		auto &proxies = _settings.list();
-		proxies.erase(ranges::remove(proxies, item->data), end(proxies));
+		const auto removed = _settings.removeFromList(item->data);
+		Assert(removed);
 
 		if (item->data == _settings.selected()) {
 			_lastSelectedProxy = _settings.selected();
@@ -1458,16 +2166,19 @@ void ProxiesBoxController::setDeleted(int id, bool deleted) {
 			}
 		}
 	} else {
-		auto &proxies = _settings.list();
-		if (ranges::find(proxies, item->data) == end(proxies)) {
+		if (_settings.indexInList(item->data) < 0) {
+			const auto &proxies = _settings.list();
 			auto insertBefore = item + 1;
 			while (insertBefore != end(_list) && insertBefore->deleted) {
 				++insertBefore;
 			}
-			auto insertBeforeIt = (insertBefore == end(_list))
-				? end(proxies)
-				: ranges::find(proxies, insertBefore->data);
-			proxies.insert(insertBeforeIt, item->data);
+			const auto foundIndex = (insertBefore == end(_list))
+				? int(proxies.size())
+				: _settings.indexInList(insertBefore->data);
+			const auto insertIndex = (foundIndex >= 0)
+				? foundIndex
+				: int(proxies.size());
+			_settings.insertToList(insertIndex, item->data);
 		}
 
 		if (!_settings.selected() && _lastSelectedProxy == item->data) {
@@ -1506,8 +2217,8 @@ object_ptr<Ui::BoxContent> ProxiesBoxController::editItemBox(int id) {
 void ProxiesBoxController::replaceItemWith(
 		std::vector<Item>::iterator which,
 		std::vector<Item>::iterator with) {
-	auto &proxies = _settings.list();
-	proxies.erase(ranges::remove(proxies, which->data), end(proxies));
+	const auto removed = _settings.removeFromList(which->data);
+	Assert(removed);
 
 	_views.fire({ which->id });
 	_list.erase(which);
@@ -1526,10 +2237,8 @@ void ProxiesBoxController::replaceItemValue(
 		restoreItem(which->id);
 	}
 
-	auto &proxies = _settings.list();
-	const auto i = ranges::find(proxies, which->data);
-	Assert(i != end(proxies));
-	*i = proxy;
+	const auto replaced = _settings.replaceInList(which->data, proxy);
+	Assert(replaced);
 	which->data = proxy;
 	refreshChecker(*which);
 
@@ -1538,7 +2247,8 @@ void ProxiesBoxController::replaceItemValue(
 }
 
 object_ptr<Ui::BoxContent> ProxiesBoxController::addNewItemBox() {
-	return Box<ProxyBox>(ProxyData(), [=](const ProxyData &result) {
+	const auto fromClipboard = ProxyDataFromClipboard();
+	return Box<ProxyBox>(fromClipboard, [=](const ProxyData &result) {
 		auto j = ranges::find(
 			_list,
 			result,
@@ -1565,8 +2275,7 @@ bool ProxiesBoxController::contains(const ProxyData &proxy) const {
 }
 
 void ProxiesBoxController::addNewItem(const ProxyData &proxy) {
-	auto &proxies = _settings.list();
-	proxies.push_back(proxy);
+	_settings.addToList(proxy);
 
 	_list.push_back({ ++_idCounter, proxy });
 	refreshChecker(_list.back());
@@ -1603,6 +2312,22 @@ void ProxiesBoxController::setProxyForCalls(bool enabled) {
 	saveDelayed();
 }
 
+void ProxiesBoxController::setProxyRotationEnabled(bool enabled) {
+	if (_settings.proxyRotationEnabled() == enabled) {
+		return;
+	}
+	_settings.setProxyRotationEnabled(enabled);
+	saveDelayed();
+}
+
+void ProxiesBoxController::setProxyRotationTimeout(int value) {
+	if (_settings.proxyRotationTimeout() == value) {
+		return;
+	}
+	_settings.setProxyRotationTimeout(value);
+	saveDelayed();
+}
+
 void ProxiesBoxController::setTryIPv6(bool enabled) {
 	if (Core::App().settings().proxy().tryIPv6() == enabled) {
 		return;
@@ -1614,6 +2339,7 @@ void ProxiesBoxController::setTryIPv6(bool enabled) {
 }
 
 void ProxiesBoxController::saveDelayed() {
+	Core::App().proxyRotationSettingsChanged();
 	_saveTimer.callOnce(kSaveSettingsDelayedTimeout);
 }
 
@@ -1621,6 +2347,17 @@ auto ProxiesBoxController::views() const -> rpl::producer<ItemView> {
 	return _views.events();
 }
 
+rpl::producer<bool> ProxiesBoxController::listShareableChanges() const {
+	return _views.events_starting_with(ItemView()) | rpl::map([=] {
+		for (const auto &item : _list) {
+			if (!item.deleted && ProxyDataIsShareable(item.data)) {
+				return true;
+			}
+		}
+		return false;
+	});
+}
+
 void ProxiesBoxController::updateView(const Item &item) {
 	const auto selected = (_settings.selected() == item.data);
 	const auto deleted = item.deleted;
@@ -1640,8 +2377,7 @@ void ProxiesBoxController::updateView(const Item &item) {
 		}
 		return ItemState::Connecting;
 	}();
-	const auto supportsShare = (item.data.type == Type::Socks5)
-		|| (item.data.type == Type::Mtproto);
+	const auto supportsShare = ProxyDataIsShareable(item.data);
 	const auto supportsCalls = item.data.supportsCalls();
 	_views.fire({
 		item.id,
@@ -1653,24 +2389,19 @@ void ProxiesBoxController::updateView(const Item &item) {
 		deleted,
 		!deleted && supportsShare,
 		supportsCalls,
-		state });
+		state,
+	});
 }
 
-void ProxiesBoxController::share(const ProxyData &proxy) {
-	if (proxy.type == Type::Http) {
-		return;
-	}
-	const auto link = u"https://t.me/"_q
-		+ (proxy.type == Type::Socks5 ? "socks" : "proxy")
-		+ "?server=" + proxy.host + "&port=" + QString::number(proxy.port)
-		+ ((proxy.type == Type::Socks5 && !proxy.user.isEmpty())
-			? "&user=" + qthelp::url_encode(proxy.user) : "")
-		+ ((proxy.type == Type::Socks5 && !proxy.password.isEmpty())
-			? "&pass=" + qthelp::url_encode(proxy.password) : "")
-		+ ((proxy.type == Type::Mtproto && !proxy.password.isEmpty())
-			? "&secret=" + proxy.password : "");
-	QGuiApplication::clipboard()->setText(link);
-	_show->showToast(tr::lng_username_copied(tr::now));
+void ProxiesBoxController::share(const ProxyData &proxy, bool qr) {
+	ShareProxy(_show, _account, proxy, qr);
+}
+
+void ProxiesBoxController::Show(
+		not_null<Window::SessionController*> controller,
+		const QString &highlightId) {
+	controller->show(
+		CreateOwningBox(&controller->session().account(), highlightId));
 }
 
 ProxiesBoxController::~ProxiesBoxController() {
diff --git a/Telegram/SourceFiles/boxes/connection_box.h b/Telegram/SourceFiles/boxes/connection_box.h
index 25da434586d8cf..5de98bc663bd64 100644
--- a/Telegram/SourceFiles/boxes/connection_box.h
+++ b/Telegram/SourceFiles/boxes/connection_box.h
@@ -47,8 +47,12 @@ class ProxiesBoxController {
 		const QMap<QString, QString> &fields);
 
 	static object_ptr<Ui::BoxContent> CreateOwningBox(
-		not_null<Main::Account*> account);
-	object_ptr<Ui::BoxContent> create();
+		not_null<Main::Account*> account,
+		const QString &highlightId = QString());
+	static void Show(
+		not_null<Window::SessionController*> controller,
+		const QString &highlightId = QString());
+	object_ptr<Ui::BoxContent> create(const QString &highlightId = QString());
 
 	enum class ItemState {
 		Connecting,
@@ -72,13 +76,17 @@ class ProxiesBoxController {
 	};
 
 	void deleteItem(int id);
+	void deleteItems();
 	void restoreItem(int id);
-	void shareItem(int id);
+	void shareItem(int id, bool qr);
+	void shareItems();
 	void applyItem(int id);
 	object_ptr<Ui::BoxContent> editItemBox(int id);
 	object_ptr<Ui::BoxContent> addNewItemBox();
 	bool setProxySettings(ProxyData::Settings value);
 	void setProxyForCalls(bool enabled);
+	void setProxyRotationEnabled(bool enabled);
+	void setProxyRotationTimeout(int value);
 	void setTryIPv6(bool enabled);
 	rpl::producer<ProxyData::Settings> proxySettingsValue() const;
 
@@ -87,6 +95,8 @@ class ProxiesBoxController {
 
 	rpl::producer<ItemView> views() const;
 
+	rpl::producer<bool> listShareableChanges() const;
+
 	~ProxiesBoxController();
 
 private:
@@ -106,10 +116,9 @@ class ProxiesBoxController {
 	std::vector<Item>::iterator findByProxy(const ProxyData &proxy);
 	void setDeleted(int id, bool deleted);
 	void updateView(const Item &item);
-	void share(const ProxyData &proxy);
+	void share(const ProxyData &proxy, bool qr = false);
 	void saveDelayed();
 	void refreshChecker(Item &item);
-	void setupChecker(int id, const Checker &checker);
 
 	void replaceItemWith(
 		std::vector<Item>::iterator which,
diff --git a/Telegram/SourceFiles/boxes/create_ai_tone_box.cpp b/Telegram/SourceFiles/boxes/create_ai_tone_box.cpp
new file mode 100644
index 00000000000000..c7ae9415e35427
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/create_ai_tone_box.cpp
@@ -0,0 +1,718 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/create_ai_tone_box.h"
+
+#include "chat_helpers/compose/compose_show.h"
+#include "chat_helpers/emoji_list_widget.h"
+#include "chat_helpers/stickers_lottie.h"
+#include "data/data_ai_compose_tones.h"
+#include "data/data_document.h"
+#include "data/data_document_media.h"
+#include "data/data_forum_icons.h"
+#include "data/data_premium_limits.h"
+#include "data/data_session.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "history/view/media/history_view_sticker_player.h"
+#include "lang/lang_keys.h"
+#include "main/session/session_show.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "settings/sections/settings_premium.h"
+#include "ui/abstract_button.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/controls/custom_emoji_toast_icon.h"
+#include "ui/controls/warning_tooltip.h"
+#include "ui/effects/animations.h"
+#include "ui/layers/generic_box.h"
+#include "ui/layers/show.h"
+#include "ui/painter.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_session_controller.h"
+
+#include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_layers.h"
+
+namespace {
+
+constexpr auto kAiComposeToneToastDuration = crl::time(4000);
+
+void ShowToneToast(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Main::Session*> session,
+		const Data::AiComposeTone &tone,
+		bool created) {
+	const auto size = QSize(
+		st::aiComposeToneToastIconSize.width(),
+		st::aiComposeToneToastIconSize.height());
+	show->showToast(Ui::Toast::Config{
+		.title = (created
+			? tr::lng_ai_compose_tone_created
+			: tr::lng_ai_compose_tone_updated)(
+				tr::now,
+				lt_title,
+				tone.title),
+		.text = tr::lng_ai_compose_tone_created_description(
+			tr::now,
+			Ui::Text::WithEntities),
+		.iconContent = Ui::MakeCustomEmojiToastIcon(
+			session,
+			tone.emojiId,
+			size),
+		.iconPadding = st::aiComposeToneToastIconPadding,
+		.duration = kAiComposeToneToastDuration,
+	});
+}
+
+void ChooseToneIconBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> controller,
+		Fn<void(DocumentId)> chosen) {
+	using namespace ChatHelpers;
+
+	box->setTitle(tr::lng_ai_compose_tone_icon_title());
+	box->setWidth(st::boxWideWidth);
+	box->setMaxHeight(st::editTopicMaxHeight);
+	box->setScrollStyle(st::reactPanelScroll);
+
+	const auto manager = &controller->session().data().customEmojiManager();
+	const auto icons = &controller->session().data().forumIcons();
+
+	auto factory = [=](DocumentId id, Fn<void()> repaint)
+	-> std::unique_ptr<Ui::Text::CustomEmoji> {
+		return manager->create(
+			id,
+			std::move(repaint),
+			Data::CustomEmojiManager::SizeTag::Large);
+	};
+
+	const auto top = box->setPinnedToTopContent(
+		object_ptr<Ui::VerticalLayout>(box));
+
+	const auto body = box->verticalLayout();
+	const auto selector = body->add(
+		object_ptr<EmojiListWidget>(body, EmojiListDescriptor{
+			.show = controller->uiShow(),
+			.mode = EmojiListWidget::Mode::TopicIcon,
+			.paused = Window::PausedIn(
+				controller,
+				Window::GifPauseReason::Layer),
+			.customRecentList = DocumentListToRecent(icons->list()),
+			.customRecentFactory = std::move(factory),
+			.st = &st::reactPanelEmojiPan,
+		}),
+		st::reactPanelEmojiPan.padding);
+
+	icons->requestDefaultIfUnknown();
+	icons->defaultUpdates(
+	) | rpl::on_next([=] {
+		selector->provideRecent(DocumentListToRecent(icons->list()));
+	}, selector->lifetime());
+
+	top->add(selector->createFooter());
+
+	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(box.get());
+	shadow->show();
+
+	rpl::combine(
+		top->heightValue(),
+		selector->widthValue()
+	) | rpl::on_next([=](int topHeight, int width) {
+		shadow->setGeometry(0, topHeight, width, st::lineWidth);
+	}, shadow->lifetime());
+
+	selector->refreshEmoji();
+
+	selector->scrollToRequests(
+	) | rpl::on_next([=](int y) {
+		box->scrollToY(y);
+		shadow->update();
+	}, selector->lifetime());
+
+	rpl::combine(
+		box->heightValue(),
+		top->heightValue(),
+		rpl::mappers::_1 - rpl::mappers::_2
+	) | rpl::on_next([=](int height) {
+		selector->setMinimalHeight(selector->width(), height);
+	}, body->lifetime());
+
+	selector->customChosen(
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+		chosen(data.document->id);
+		box->closeBox();
+	}, selector->lifetime());
+
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+}
+
+} // namespace
+
+not_null<Ui::AbstractButton*> AddAiToneIconPreview(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Main::Session*> session,
+		rpl::producer<DocumentId> emojiIdValue,
+		Fn<void(DocumentId)> emojiIdChosen) {
+	using StickerPlayer = HistoryView::StickerPlayer;
+	struct State {
+		DocumentId emojiId = 0;
+		std::shared_ptr<StickerPlayer> player;
+		bool playerUsesTextColor = false;
+	};
+
+	const auto outer = st::aiToneIconPreviewSize;
+	const auto inner = st::aiToneIconPreviewInnerSize;
+	const auto top = st::aiToneIconPreviewTopSkip;
+	const auto bottom = st::aiToneIconPreviewBottomSkip;
+	const auto holder = container->add(
+		object_ptr<Ui::FixedHeightWidget>(
+			container,
+			outer + top + bottom));
+	const auto button = Ui::CreateChild<Ui::AbstractButton>(holder);
+	button->resize(outer, outer);
+	button->show();
+
+	holder->widthValue(
+	) | rpl::on_next([=](int width) {
+		button->move((width - outer) / 2, top);
+	}, button->lifetime());
+
+	const auto state = button->lifetime().make_state<State>();
+	const auto emojiIdVar = button->lifetime().make_state<
+		rpl::variable<DocumentId>>(std::move(emojiIdValue));
+
+	emojiIdVar->value(
+	) | rpl::on_next([=](DocumentId id) {
+		state->emojiId = id;
+	}, button->lifetime());
+
+	emojiIdVar->value(
+	) | rpl::map([=](DocumentId id) -> rpl::producer<DocumentData*> {
+		if (!id) {
+			return rpl::single((DocumentData*)nullptr);
+		}
+		return session->data().customEmojiManager().resolve(
+			id
+		) | rpl::map([=](not_null<DocumentData*> document) {
+			return document.get();
+		}) | rpl::map_error_to_done();
+	}) | rpl::flatten_latest(
+	) | rpl::map([=](DocumentData *document)
+	-> rpl::producer<std::shared_ptr<StickerPlayer>> {
+		if (!document) {
+			return rpl::single(std::shared_ptr<StickerPlayer>());
+		}
+		const auto media = document->createMediaView();
+		media->checkStickerLarge();
+		media->goodThumbnailWanted();
+
+		return rpl::single() | rpl::then(
+			document->session().downloaderTaskFinished()
+		) | rpl::filter([=] {
+			return media->loaded();
+		}) | rpl::take(1) | rpl::map([=] {
+			auto result = std::shared_ptr<StickerPlayer>();
+			const auto sticker = document->sticker();
+			const auto size = QSize(inner, inner);
+			if (sticker && sticker->isLottie()) {
+				result = std::make_shared<HistoryView::LottiePlayer>(
+					ChatHelpers::LottiePlayerFromDocument(
+						media.get(),
+						ChatHelpers::StickerLottieSize::StickerSet,
+						size,
+						Lottie::Quality::High));
+			} else if (sticker && sticker->isWebm()) {
+				result = std::make_shared<HistoryView::WebmPlayer>(
+					media->owner()->location(),
+					media->bytes(),
+					size);
+			} else {
+				result = std::make_shared<HistoryView::StaticStickerPlayer>(
+					media->owner()->location(),
+					media->bytes(),
+					size);
+			}
+			result->setRepaintCallback([=] { button->update(); });
+			state->playerUsesTextColor
+				= media->owner()->emojiUsesTextColor();
+			return result;
+		});
+	}) | rpl::flatten_latest(
+	) | rpl::on_next([=](std::shared_ptr<StickerPlayer> player) {
+		state->player = std::move(player);
+		button->update();
+	}, button->lifetime());
+
+	button->paintRequest(
+	) | rpl::on_next([=] {
+		auto p = QPainter(button);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::aiToneIconPreviewBg);
+		p.drawEllipse(button->rect());
+		if (state->player && state->player->ready()) {
+			const auto color = state->playerUsesTextColor
+				? st::windowFg->c
+				: QColor(0, 0, 0, 0);
+			const auto frame = state->player->frame(
+				QSize(inner, inner),
+				color,
+				false,
+				crl::now(),
+				false).image;
+			const auto sz = frame.size() / style::DevicePixelRatio();
+			p.drawImage(
+				QRect(
+					(outer - sz.width()) / 2,
+					(outer - sz.height()) / 2,
+					sz.width(),
+					sz.height()),
+				frame);
+			state->player->markFrameShown();
+		} else if (!state->emojiId) {
+			st::aiToneIconPreviewPlaceholder.paintInCenter(
+				p,
+				button->rect());
+		}
+	}, button->lifetime());
+
+	if (emojiIdChosen) {
+		button->setClickedCallback([=] {
+			const auto controller = ChatHelpers::ResolveWindowDefault()(
+				session);
+			if (!controller) {
+				return;
+			}
+			controller->uiShow()->showBox(Box(
+				ChooseToneIconBox,
+				controller,
+				crl::guard(button, [=](DocumentId id) {
+					emojiIdChosen(id);
+				})));
+		});
+	} else {
+		button->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
+
+	return button;
+}
+
+namespace {
+
+void SetupToneBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session,
+		DocumentId initialEmojiId,
+		const QString &initialName,
+		const QString &initialPrompt,
+		bool initialDisplayAuthor,
+		rpl::producer<QString> title,
+		rpl::producer<QString> submitLabel,
+		Fn<void(DocumentId, QString, QString, bool)> submit,
+		Fn<void()> requestDelete = nullptr) {
+	box->setStyle(st::aiComposeBox);
+	box->setNoContentMargin(true);
+	box->setWidth(st::boxWideWidth);
+	box->addTopButton(st::aiComposeBoxClose, [=] { box->closeBox(); });
+	box->setTitle(std::move(title));
+
+	const auto container = box->verticalLayout();
+	const auto emojiId = container->lifetime().make_state<
+		rpl::variable<DocumentId>>(initialEmojiId);
+
+	const auto iconButton = AddAiToneIconPreview(
+		container,
+		session,
+		emojiId->value(),
+		[=](DocumentId id) { *emojiId = id; });
+
+	const auto name = box->addRow(
+		object_ptr<Ui::InputField>(
+			box,
+			st::aiToneNameField,
+			Ui::InputField::Mode::SingleLine,
+			rpl::producer<QString>(),
+			initialName),
+		st::aiToneFieldsMargin);
+	name->setMaxLength(session->appConfig().get<int>(
+		u"aicompose_tone_title_length_max"_q,
+		12));
+
+	Ui::AddSkip(container, st::aiToneFieldsSkip);
+
+	const auto promptSt = box->lifetime().make_state<style::InputField>(
+		st::aiTonePromptField);
+	{
+		const auto &placeholderStyle = st::aiTonePlaceholderLabel.style;
+		const auto fieldsMargin = st::aiToneFieldsMargin;
+		const auto contentWidth = st::boxWideWidth
+			- fieldsMargin.left() - fieldsMargin.right()
+			- promptSt->textMargins.left() - promptSt->textMargins.right();
+		auto measure = Ui::Text::String{ contentWidth / 2 };
+		measure.setText(
+			placeholderStyle,
+			tr::lng_ai_compose_tone_prompt_placeholder(tr::now));
+		const auto desiredMin = measure.countHeight(contentWidth)
+			+ promptSt->textMargins.top()
+			+ promptSt->textMargins.bottom();
+		if (promptSt->heightMin < desiredMin) {
+			promptSt->heightMin = desiredMin;
+		}
+		if (promptSt->heightMax < promptSt->heightMin) {
+			promptSt->heightMax = promptSt->heightMin;
+		}
+	}
+
+	const auto prompt = box->addRow(
+		object_ptr<Ui::InputField>(
+			box,
+			*promptSt,
+			Ui::InputField::Mode::MultiLine,
+			rpl::producer<QString>(),
+			initialPrompt),
+		st::aiToneFieldsMargin);
+	prompt->setSubmitSettings(Ui::InputField::SubmitSettings::None);
+	prompt->setMaxLength(session->appConfig().get<int>(
+		u"aicompose_tone_prompt_length_max"_q,
+		1024));
+
+	struct FieldDecor {
+		not_null<Ui::RpWidget*> bg;
+		not_null<Ui::FlatLabel*> placeholder;
+		Ui::Animations::Simple anim;
+		bool hidden = false;
+	};
+	const auto makeDecor = [=](
+			not_null<Ui::InputField*> field,
+			rpl::producer<QString> placeholderText) {
+		const auto parent = field->parentWidget();
+		const auto decor = field->lifetime().make_state<FieldDecor>(FieldDecor{
+			.bg = Ui::CreateChild<Ui::RpWidget>(parent),
+			.placeholder = Ui::CreateChild<Ui::FlatLabel>(
+				parent,
+				std::move(placeholderText),
+				st::aiTonePlaceholderLabel),
+		});
+		decor->bg->setAttribute(Qt::WA_TransparentForMouseEvents);
+		decor->placeholder->setAttribute(Qt::WA_TransparentForMouseEvents);
+		decor->bg->paintRequest(
+		) | rpl::on_next([bg = decor->bg] {
+			auto p = QPainter(bg);
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::aiToneFieldBg);
+			const auto r = st::aiToneFieldRadius;
+			p.drawRoundedRect(bg->rect(), r, r);
+		}, decor->bg->lifetime());
+		decor->bg->lower();
+		decor->placeholder->raise();
+
+		const auto applyPosition = [=] {
+			const auto pad = st::aiToneFieldPadding;
+			const auto progress = decor->anim.value(decor->hidden ? 1. : 0.);
+			const auto shift = int(base::SafeRound(
+				progress * (-st::defaultInputField.placeholderShift)));
+			decor->placeholder->moveToLeft(
+				field->x() + pad.left() + shift,
+				field->y() + pad.top());
+			decor->placeholder->setOpacity(1. - progress);
+		};
+		field->geometryValue(
+		) | rpl::on_next([=](QRect g) {
+			if (g.isEmpty()) {
+				return;
+			}
+			const auto pad = st::aiToneFieldPadding;
+			decor->bg->setGeometry(g);
+			decor->placeholder->resizeToWidth(
+				g.width() - pad.left() - pad.right());
+			applyPosition();
+		}, field->lifetime());
+
+		const auto animate = [=](bool hidden) {
+			if (decor->hidden == hidden) {
+				return;
+			}
+			decor->hidden = hidden;
+			decor->anim.start(
+				applyPosition,
+				hidden ? 0. : 1.,
+				hidden ? 1. : 0.,
+				st::defaultInputField.duration);
+		};
+		field->changes(
+		) | rpl::on_next([=] {
+			animate(!field->getLastText().isEmpty());
+		}, field->lifetime());
+		decor->hidden = !field->getLastText().isEmpty();
+		applyPosition();
+		return decor;
+	};
+	makeDecor(name, tr::lng_ai_compose_tone_name_placeholder());
+	const auto promptDecor = makeDecor(
+		prompt,
+		tr::lng_ai_compose_tone_prompt_placeholder());
+
+	const auto authorCheckbox = box->addRow(
+		object_ptr<Ui::Checkbox>(
+			box,
+			tr::lng_ai_compose_tone_author(tr::now),
+			st::aiComposeEmojifyCheckbox,
+			std::make_unique<Ui::RoundCheckView>(
+				st::defaultCheck,
+				initialDisplayAuthor)),
+		st::aiToneAuthorCheckboxMargin,
+		style::al_top);
+
+	const auto deleteButton = requestDelete
+		? box->addRow(
+			object_ptr<Ui::RoundButton>(
+				box,
+				tr::lng_ai_compose_tone_delete(),
+				st::aiToneDeleteButton),
+			st::aiToneDeleteButtonMargin)
+		: nullptr;
+	if (deleteButton) {
+		deleteButton->setFullRadius(true);
+		deleteButton->setClickedCallback(std::move(requestDelete));
+		box->widthValue(
+		) | rpl::on_next([=](int width) {
+			const auto &margin = st::aiToneDeleteButtonMargin;
+			deleteButton->setFullWidth(
+				width - margin.left() - margin.right());
+		}, deleteButton->lifetime());
+	}
+
+	rpl::combine(
+		prompt->topValue(),
+		promptDecor->placeholder->heightValue(),
+		box->getDelegate()->contentHeightMaxValue()
+	) | rpl::on_next([=](int top, int phHeight, int contentHeight) {
+		const auto pad = st::aiToneFieldPadding;
+		const auto deleteBlock = deleteButton
+			? (deleteButton->heightNoMargins()
+				+ st::aiToneDeleteButtonMargin.top()
+				+ st::aiToneDeleteButtonMargin.bottom())
+			: 0;
+		prompt->setMaxHeight(contentHeight
+			- top
+			- st::aiToneFieldsMargin.bottom()
+			- authorCheckbox->heightNoMargins()
+			- st::aiToneAuthorCheckboxMargin.top()
+			- st::aiToneAuthorCheckboxMargin.bottom()
+			- deleteBlock);
+		prompt->setMinHeight(phHeight + pad.top() + pad.bottom());
+	}, prompt->lifetime());
+
+	box->setFocusCallback([=] {
+		name->setFocusFast();
+	});
+
+	const auto warning = box->lifetime().make_state<Ui::WarningTooltip>();
+	const auto save = [=] {
+		const auto nameText = name->getLastText().trimmed();
+		const auto promptText = prompt->getLastText().trimmed();
+		const auto showWarning = [=](
+				not_null<QWidget*> target,
+				rpl::producer<TextWithEntities> text) {
+			warning->show({
+				.parent = box,
+				.target = target,
+				.text = std::move(text),
+			});
+		};
+		if (!emojiId->current()) {
+			showWarning(
+				iconButton,
+				tr::lng_ai_compose_tone_warn_icon(tr::marked));
+			return;
+		} else if (nameText.isEmpty()) {
+			name->showError();
+			showWarning(
+				name,
+				tr::lng_ai_compose_tone_warn_name(tr::marked));
+			return;
+		} else if (promptText.isEmpty()) {
+			prompt->showError();
+			showWarning(
+				prompt,
+				tr::lng_ai_compose_tone_warn_prompt(tr::marked));
+			return;
+		}
+		warning->hide(anim::type::normal);
+		submit(
+			emojiId->current(),
+			nameText,
+			promptText,
+			authorCheckbox->checked());
+	};
+
+	const auto submitBtn = box->addButton(std::move(submitLabel), save);
+	submitBtn->setFullRadius(true);
+}
+
+} // namespace
+
+void CreateAiToneBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session,
+		Fn<void(Data::AiComposeTone)> saved) {
+	SetupToneBox(
+		box,
+		session,
+		DocumentId(0),
+		QString(),
+		QString(),
+		false,
+		tr::lng_ai_compose_create_tone_title(),
+		tr::lng_ai_compose_tone_create(),
+		[=](DocumentId emojiId,
+				const QString &name,
+				const QString &prompt,
+				bool displayAuthor) {
+			session->data().aiComposeTones().create(
+				name,
+				prompt,
+				emojiId,
+				displayAuthor,
+				crl::guard(box, [=](Data::AiComposeTone tone) {
+					const auto show = box->uiShow();
+					box->closeBox();
+					ShowToneToast(show, session, tone, true);
+					if (saved) {
+						saved(tone);
+					}
+				}),
+				crl::guard(box, [=](const MTP::Error &error) {
+					if (error.type() == u"TONES_SAVED_TOO_MANY"_q) {
+						ShowAiComposeToneLimitError(box->uiShow(), session);
+					} else if (!MTP::IgnoreError(error)) {
+						box->showToast(error.type());
+					}
+				}));
+		},
+		nullptr);
+}
+
+void EditAiToneBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session,
+		const Data::AiComposeTone &tone,
+		Fn<void(Data::AiComposeTone)> saved) {
+	const auto toneCopy = tone;
+	SetupToneBox(
+		box,
+		session,
+		tone.emojiId,
+		tone.title,
+		tone.prompt,
+		tone.authorId != 0,
+		tr::lng_ai_compose_edit_tone_title(),
+		tr::lng_ai_compose_tone_save(),
+		[=](DocumentId emojiId,
+				const QString &name,
+				const QString &prompt,
+				bool displayAuthor) {
+			session->data().aiComposeTones().update(
+				toneCopy,
+				name,
+				prompt,
+				std::make_optional(emojiId),
+				std::make_optional(displayAuthor),
+				crl::guard(box, [=](Data::AiComposeTone updated) {
+					const auto show = box->uiShow();
+					box->closeBox();
+					ShowToneToast(show, session, updated, false);
+					if (saved) {
+						saved(updated);
+					}
+				}));
+		},
+		[=] {
+			ConfirmDeleteAiTone(
+				box->uiShow(),
+				session,
+				toneCopy,
+				[=] { box->closeBox(); });
+		});
+}
+
+void ConfirmDeleteAiTone(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Main::Session*> session,
+		const Data::AiComposeTone &tone,
+		Fn<void()> done) {
+	if (!tone.creator) {
+		show->show(Ui::MakeConfirmBox({
+			.text = tr::lng_ai_compose_tone_remove_sure(),
+			.confirmed = [=](Fn<void()> &&close) {
+				close();
+				session->data().aiComposeTones().save(
+					tone,
+					true,
+					done);
+			},
+			.confirmText = tr::lng_box_remove(),
+		}));
+		return;
+	}
+	show->show(Ui::MakeConfirmBox({
+		.text = tr::lng_ai_compose_tone_delete_sure(),
+		.confirmed = [=](Fn<void()> &&close) {
+			close();
+			session->data().aiComposeTones().remove(tone, done);
+		},
+		.confirmText = tr::lng_box_delete(),
+		.confirmStyle = &st::attentionBoxButton,
+		.title = tr::lng_ai_compose_tone_delete(),
+	}));
+}
+
+void ShowAiComposeToneLimitError(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Main::Session*> session) {
+	const auto limits = Data::PremiumLimits(session);
+	const auto premium = session->premium();
+	const auto premiumPossible = session->premiumPossible();
+	const auto defaultLimit = limits.aiComposeSavedTonesDefault();
+	const auto premiumLimit = limits.aiComposeSavedTonesPremium();
+	const auto current = premium ? premiumLimit : defaultLimit;
+	if (premium || !premiumPossible) {
+		show->showToast(tr::lng_ai_compose_tone_saved_limit_final(
+			tr::now,
+			lt_count,
+			current,
+			tr::rich));
+	} else {
+		Settings::ShowPremiumPromoToast(
+			Main::MakeSessionShow(show, session),
+			ChatHelpers::ResolveWindowDefault(),
+			tr::lng_ai_compose_tone_saved_limit(
+				tr::now,
+				lt_count,
+				defaultLimit,
+				lt_link,
+				tr::bold(tr::lng_ai_compose_tone_saved_limit_link(
+					tr::now,
+					tr::link)),
+				lt_premium_count,
+				tr::bold(QString::number(premiumLimit)),
+				tr::rich),
+			u"ai_compose_tones"_q);
+	}
+}
diff --git a/Telegram/SourceFiles/boxes/create_ai_tone_box.h b/Telegram/SourceFiles/boxes/create_ai_tone_box.h
new file mode 100644
index 00000000000000..4760eeaacb1160
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/create_ai_tone_box.h
@@ -0,0 +1,50 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+struct AiComposeTone;
+} // namespace Data
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class AbstractButton;
+class GenericBox;
+class Show;
+class VerticalLayout;
+} // namespace Ui
+
+not_null<Ui::AbstractButton*> AddAiToneIconPreview(
+	not_null<Ui::VerticalLayout*> container,
+	not_null<Main::Session*> session,
+	rpl::producer<DocumentId> emojiIdValue,
+	Fn<void(DocumentId)> emojiIdChosen = nullptr);
+
+void CreateAiToneBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Main::Session*> session,
+	Fn<void(Data::AiComposeTone)> saved = nullptr);
+
+void EditAiToneBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Main::Session*> session,
+	const Data::AiComposeTone &tone,
+	Fn<void(Data::AiComposeTone)> saved = nullptr);
+
+void ConfirmDeleteAiTone(
+	std::shared_ptr<Ui::Show> show,
+	not_null<Main::Session*> session,
+	const Data::AiComposeTone &tone,
+	Fn<void()> done = nullptr);
+
+void ShowAiComposeToneLimitError(
+	std::shared_ptr<Ui::Show> show,
+	not_null<Main::Session*> session);
diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index 223c5cab47041b..6ec3f0aa307246 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -7,44 +7,104 @@ For license and copyright information please follow this link:
 */
 #include "boxes/create_poll_box.h"
 
+#include "poll/poll_link_box.h"
+#include "poll/poll_link_thumbnail.h"
+#include "poll/poll_media_upload.h"
 #include "base/call_delayed.h"
+#include "base/qt/qt_key_modifiers.h"
+#include "base/unixtime.h"
+#include "boxes/premium_limits_box.h"
 #include "base/event_filter.h"
 #include "base/random.h"
 #include "base/unique_qptr.h"
+#include "countries/countries_instance.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "chat_helpers/message_field.h"
 #include "chat_helpers/tabbed_panel.h"
 #include "chat_helpers/tabbed_selector.h"
+#include "core/file_utilities.h"
+#include "core/mime_type.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "core/shortcuts.h"
+#include "core/ui_integration.h"
+#include "ui/power_saving.h"
+#include "data/data_cloud_file.h"
+#include "data/data_document.h"
+#include "data/data_file_origin.h"
+#include "data/data_location.h"
 #include "data/data_poll.h"
+#include "data/data_peer.h"
+#include "data/data_photo.h"
+#include "data/data_session.h"
 #include "data/data_user.h"
+#include "data/data_web_page.h"
 #include "data/stickers/data_custom_emoji.h"
+#include "history/view/controls/history_view_webpage_processor.h"
+#include "history/view/media/menu/history_view_poll_menu.h"
 #include "history/view/history_view_schedule_box.h"
+#include "info/channel_statistics/boosts/giveaway/select_countries_box.h"
 #include "lang/lang_keys.h"
+#include "layout/layout_document_generic_preview.h"
+#include "main/main_app_config.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
+#include "platform/platform_file_utilities.h"
 #include "main/main_session.h"
 #include "menu/menu_send.h"
+#include "settings/detailed_settings_button.h"
+#include "settings/settings_common.h"
+#include "storage/file_upload.h"
+#include "storage/localimageloader.h"
+#include "storage/storage_account.h"
+#include "storage/storage_media_prepare.h"
 #include "ui/controls/emoji_button.h"
 #include "ui/controls/emoji_button_factory.h"
+#include "ui/controls/location_picker.h"
+#include "ui/chat/attach/attach_prepare.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
+#include "ui/effects/radial_animation.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/effects/ttl_icon.h"
+#include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/dropdown_menu.h"
+#include "ui/widgets/menu/menu_action.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/labels.h"
+#include "ui/boxes/choose_date_time.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/format_values.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
+#include "ui/wrap/vertical_layout_reorder.h"
 #include "ui/ui_utility.h"
+#include "window/section_widget.h"
 #include "window/window_session_controller.h"
+#include "apiwrap.h"
 #include "styles/style_boxes.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h" // defaultComposeFiles.
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_overview.h"
+#include "styles/style_polls.h"
 #include "styles/style_settings.h"
 
+#include <QtCore/QBuffer>
+#include <QtCore/QMimeData>
+
 namespace {
 
 constexpr auto kQuestionLimit = 255;
@@ -55,29 +115,61 @@ constexpr auto kWarnOptionLimit = 30;
 constexpr auto kSolutionLimit = 200;
 constexpr auto kWarnSolutionLimit = 60;
 constexpr auto kErrorLimit = 99;
+constexpr auto kMediaUploadMaxAge = 45 * 60 * crl::time(1000);
+
+using PollMediaState = PollMediaUpload::PollMediaState;
+using PollMediaButton = PollMediaUpload::PollMediaButton;
+using PollMediaUploader = PollMediaUpload::PollMediaUploader;
+
+using PollMediaUpload::FileListFromMimeData;
+using PollMediaUpload::GenerateDocumentFilePreview;
+using PollMediaUpload::LocalImageThumbnail;
+using PollMediaUpload::PreparePollMediaTask;
+using PollMediaUpload::UploadContext;
+using PollMediaUpload::ValidateFileDragData;
 
 class Options {
 public:
+	using AttachCallback = Fn<void(
+		not_null<Ui::RpWidget*>,
+		std::shared_ptr<PollMediaState>)>;
+	using FieldDropCallback = Fn<void(
+		not_null<Ui::InputField*>,
+		std::shared_ptr<PollMediaState>)>;
+	using WidgetDropCallback = Fn<void(
+		not_null<QWidget*>,
+		std::shared_ptr<PollMediaState>)>;
+
 	Options(
 		not_null<Ui::BoxContent*> box,
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller,
 		ChatHelpers::TabbedPanel *emojiPanel,
-		bool chooseCorrectEnabled);
+		bool chooseCorrectEnabled,
+		AttachCallback attachCallback,
+		FieldDropCallback fieldDropCallback,
+		WidgetDropCallback widgetDropCallback);
 
 	[[nodiscard]] bool hasOptions() const;
 	[[nodiscard]] bool isValid() const;
 	[[nodiscard]] bool hasCorrect() const;
+	[[nodiscard]] bool hasUploadingMedia() const;
+	bool refreshStaleMedia(crl::time threshold);
 	[[nodiscard]] std::vector<PollAnswer> toPollAnswers() const;
 	void focusFirst();
 
-	void enableChooseCorrect(bool enabled);
+	void enableChooseCorrect(bool enabled, bool multiCorrect = false);
 
+	[[nodiscard]] not_null<Ui::RpWidget*> layoutWidget() const;
 	[[nodiscard]] rpl::producer<int> usedCount() const;
 	[[nodiscard]] rpl::producer<not_null<QWidget*>> scrollToWidget() const;
 	[[nodiscard]] rpl::producer<> backspaceInFront() const;
 	[[nodiscard]] rpl::producer<> tabbed() const;
 
+	void handlePaste(
+		not_null<Ui::InputField*> field,
+		const QStringList &list);
+
 private:
 	class Option {
 	public:
@@ -86,14 +178,18 @@ class Options {
 			not_null<Ui::VerticalLayout*> container,
 			not_null<Main::Session*> session,
 			int position,
-			std::shared_ptr<Ui::RadiobuttonGroup> group);
+			std::shared_ptr<Ui::RadiobuttonGroup> group,
+			AttachCallback attachCallback,
+			FieldDropCallback fieldDropCallback,
+			WidgetDropCallback widgetDropCallback);
 
 		Option(const Option &other) = delete;
 		Option &operator=(const Option &other) = delete;
 
-		void toggleRemoveAlways(bool toggled);
 		void enableChooseCorrect(
-			std::shared_ptr<Ui::RadiobuttonGroup> group);
+			std::shared_ptr<Ui::RadiobuttonGroup> group,
+			bool multiCorrect = false,
+			Fn<void()> checkboxChanged = nullptr);
 
 		void show(anim::type animated);
 		void destroy(FnMut<void()> done);
@@ -106,34 +202,41 @@ class Options {
 		[[nodiscard]] bool isGood() const;
 		[[nodiscard]] bool isTooLong() const;
 		[[nodiscard]] bool isCorrect() const;
+		[[nodiscard]] bool uploadingMedia() const;
+		bool refreshMediaIfStale(crl::time threshold);
 		[[nodiscard]] bool hasFocus() const;
 		void setFocus() const;
-		void clearValue();
 
 		void setPlaceholder() const;
 		void removePlaceholder() const;
+		void showAddIcon(bool show);
 
-		not_null<Ui::InputField*> field() const;
+		[[nodiscard]] not_null<Ui::InputField*> field() const;
+		[[nodiscard]] not_null<Ui::RpWidget*> wrapWidget() const;
 
 		[[nodiscard]] PollAnswer toPollAnswer(int index) const;
 
-		[[nodiscard]] rpl::producer<Qt::MouseButton> removeClicks() const;
+		[[nodiscard]] Ui::RpWidget *handleWidget() const;
 
 	private:
-		void createRemove();
+		void createAttach();
 		void createWarning();
-		void toggleCorrectSpace(bool visible);
+		void createHandle();
 		void updateFieldGeometry();
 
 		base::unique_qptr<Ui::SlideWrap<Ui::RpWidget>> _wrap;
 		not_null<Ui::RpWidget*> _content;
-		base::unique_qptr<Ui::FadeWrapScaled<Ui::Radiobutton>> _correct;
-		Ui::Animations::Simple _correctShown;
+		base::unique_qptr<Ui::FadeWrapScaled<Ui::Checkbox>> _correct;
+		base::unique_qptr<Ui::FadeWrapScaled<Ui::RpWidget>> _handle;
 		bool _hasCorrect = false;
 		Ui::InputField *_field = nullptr;
 		base::unique_qptr<Ui::PlainShadow> _shadow;
-		base::unique_qptr<Ui::CrossButton> _remove;
-		rpl::variable<bool> *_removeAlways = nullptr;
+		base::unique_qptr<PollMediaButton> _attach;
+		AttachCallback _attachCallback;
+		FieldDropCallback _fieldDropCallback;
+		WidgetDropCallback _widgetDropCallback;
+		std::shared_ptr<PollMediaState> _media;
+		Ui::FadeWrapScaled<Ui::RpWidget> *_addIcon = nullptr;
 
 	};
 
@@ -142,21 +245,36 @@ class Options {
 	void fixShadows();
 	void removeEmptyTail();
 	void addEmptyOption();
+	void insertOption(
+		int beforeIndex,
+		const QString &text,
+		anim::type animated);
+	void initOptionField(not_null<Ui::InputField*> field);
 	void checkLastOption();
 	void validateState();
 	void fixAfterErase();
 	void destroy(std::unique_ptr<Option> option);
 	void removeDestroyed(not_null<Option*> field);
 	int findField(not_null<Ui::InputField*> field) const;
+	int findLayoutPosition(not_null<Option*> option) const;
 	[[nodiscard]] auto createChooseCorrectGroup()
 		-> std::shared_ptr<Ui::RadiobuttonGroup>;
+	void setupReorder();
+	void restartReorder();
 
 	not_null<Ui::BoxContent*> _box;
 	not_null<Ui::VerticalLayout*> _container;
 	const not_null<Window::SessionController*> _controller;
 	ChatHelpers::TabbedPanel * const _emojiPanel;
+	const AttachCallback _attachCallback;
+	const FieldDropCallback _fieldDropCallback;
+	const WidgetDropCallback _widgetDropCallback;
 	std::shared_ptr<Ui::RadiobuttonGroup> _chooseCorrectGroup;
-	int _position = 0;
+	bool _multiCorrect = false;
+	Fn<void()> _multiCorrectChanged;
+	Ui::VerticalLayout *_optionsLayout = nullptr;
+	std::unique_ptr<Ui::VerticalLayoutReorder> _reorder;
+	int _reordering = 0;
 	std::vector<std::unique_ptr<Option>> _list;
 	std::vector<std::unique_ptr<Option>> _destroyed;
 	rpl::variable<int> _usedCount = 0;
@@ -173,10 +291,15 @@ class Options {
 void InitField(
 		not_null<QWidget*> container,
 		not_null<Ui::InputField*> field,
-		not_null<Main::Session*> session) {
-	field->setInstantReplaces(Ui::InstantReplaces::Default());
-	field->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+		not_null<Main::Session*> session,
+		std::shared_ptr<Main::SessionShow> show = nullptr,
+		base::flat_set<QString> markdownTags = {}) {
+	InitMessageFieldHandlers({
+		.session = session,
+		.show = std::move(show),
+		.field = field,
+		.allowMarkdownTags = std::move(markdownTags),
+	});
 	auto options = Ui::Emoji::SuggestionsController::Options();
 	options.suggestExactFirstWord = false;
 	Ui::Emoji::SuggestionsController::Init(
@@ -197,7 +320,7 @@ not_null<Ui::FlatLabel*> CreateWarningLabel(
 		st::createPollWarning);
 	result->setAttribute(Qt::WA_TransparentForMouseEvents);
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(field, [=] {
 			const auto length = field->getLastText().size();
 			const auto value = valueLimit - length;
@@ -222,12 +345,52 @@ void FocusAtEnd(not_null<Ui::InputField*> field) {
 	field->ensureCursorVisible();
 }
 
+[[nodiscard]] QStringList ParsePastedList(const QString &text) {
+	auto list = QStringView(text).split('\n');
+	for (auto i = list.begin(); i != list.end();) {
+		auto trimmed = i->trimmed();
+		if (trimmed.isEmpty() && (i + 1 != list.end())) {
+			i = list.erase(i);
+		} else {
+			*i++ = trimmed;
+		}
+	}
+	if (list.size() < 2) {
+		return {};
+	}
+	auto result = QStringList();
+	result.reserve(list.size());
+	for (const auto &view : list) {
+		result.push_back(view.toString());
+	}
+	return result;
+}
+
+not_null<DetailedSettingsButton*> AddPollToggleButton(
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<QString> title,
+		rpl::producer<QString> description,
+		Settings::IconDescriptor icon,
+		rpl::producer<bool> toggled,
+		const style::DetailedSettingsButtonStyle &rowStyle) {
+	return AddDetailedSettingsButton(
+		container,
+		std::move(title),
+		std::move(description),
+		std::move(icon),
+		std::move(toggled),
+		rowStyle);
+}
+
 Options::Option::Option(
 	not_null<QWidget*> outer,
 	not_null<Ui::VerticalLayout*> container,
 	not_null<Main::Session*> session,
 	int position,
-	std::shared_ptr<Ui::RadiobuttonGroup> group)
+	std::shared_ptr<Ui::RadiobuttonGroup> group,
+	AttachCallback attachCallback,
+	FieldDropCallback fieldDropCallback,
+	WidgetDropCallback widgetDropCallback)
 : _wrap(container->insert(
 	position,
 	object_ptr<Ui::SlideWrap<Ui::RpWidget>>(
@@ -237,45 +400,60 @@ Options::Option::Option(
 , _field(
 	Ui::CreateChild<Ui::InputField>(
 		_content.get(),
-		session->user()->isPremium()
-			? st::createPollOptionFieldPremium
-			: st::createPollOptionField,
-		Ui::InputField::Mode::NoNewlines,
-		tr::lng_polls_create_option_add())) {
+		st::createPollOptionFieldPremium,
+		Ui::InputField::Mode::MultiLine,
+		tr::lng_polls_create_option_add()))
+, _attachCallback(std::move(attachCallback))
+, _fieldDropCallback(std::move(fieldDropCallback))
+, _widgetDropCallback(std::move(widgetDropCallback))
+, _media(std::make_shared<PollMediaState>()) {
 	InitField(outer, _field, session);
 	_field->setMaxLength(kOptionLimit + kErrorLimit);
 	_field->show();
-	_field->customTab(true);
+	if (_fieldDropCallback) {
+		_fieldDropCallback(_field, _media);
+	}
 
 	_wrap->hide(anim::type::instant);
 
+	_content->paintRequest(
+	) | rpl::on_next([content = _content.get()] {
+		auto p = QPainter(content);
+		p.fillRect(content->rect(), st::boxBg);
+	}, _content->lifetime());
+
 	_content->widthValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateFieldGeometry();
 	}, _field->lifetime());
 
 	_field->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_content->resize(_content->width(), height);
 	}, _field->lifetime());
 
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(_field, [=] {
 			if (_hasCorrect) {
 				_correct->toggle(isGood(), anim::type::normal);
+			} else if (_handle) {
+				_handle->toggle(isGood(), anim::type::normal);
 			}
 		}));
 	}, _field->lifetime());
 
 	createShadow();
-	createRemove();
+	createAttach();
 	createWarning();
+	createHandle();
 	enableChooseCorrect(group);
-	_correctShown.stop();
 	if (_correct) {
 		_correct->finishAnimating();
 	}
+	if (_handle) {
+		_handle->finishAnimating();
+	}
 	updateFieldGeometry();
 }
 
@@ -292,7 +470,7 @@ void Options::Option::createShadow() {
 	_shadow.reset(Ui::CreateChild<Ui::PlainShadow>(field().get()));
 	_shadow->show();
 	field()->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto left = st::createPollFieldPadding.left();
 		_shadow->setGeometry(
 			left,
@@ -306,44 +484,33 @@ void Options::Option::destroyShadow() {
 	_shadow = nullptr;
 }
 
-void Options::Option::createRemove() {
-	using namespace rpl::mappers;
-
-	const auto field = this->field();
-	auto &lifetime = field->lifetime();
-
-	const auto remove = Ui::CreateChild<Ui::CrossButton>(
+void Options::Option::createAttach() {
+	const auto field = Option::field();
+	const auto attach = Ui::CreateChild<PollMediaButton>(
 		field.get(),
-		st::createPollOptionRemove);
-	remove->show(anim::type::instant);
-
-	const auto toggle = lifetime.make_state<rpl::variable<bool>>(false);
-	_removeAlways = lifetime.make_state<rpl::variable<bool>>(false);
-
-	field->changes(
-	) | rpl::start_with_next([field, toggle] {
-		// Don't capture 'this'! Because Option is a value type.
-		*toggle = !field->getLastText().isEmpty();
-	}, field->lifetime());
-#if 0
-	rpl::combine(
-		toggle->value(),
-		_removeAlways->value(),
-		_1 || _2
-	) | rpl::start_with_next([=](bool shown) {
-		remove->toggle(shown, anim::type::normal);
-	}, remove->lifetime());
-#endif
-
-	field->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		remove->moveToRight(
+		st::pollAttach,
+		_media);
+	attach->show();
+	field->sizeValue(
+	) | rpl::on_next([=](QSize size) {
+		attach->moveToRight(
 			st::createPollOptionRemovePosition.x(),
-			st::createPollOptionRemovePosition.y(),
-			width);
-	}, remove->lifetime());
-
-	_remove.reset(remove);
+			st::createPollOptionRemovePosition.y() - st::lineWidth * 2,
+			size.width());
+	}, attach->lifetime());
+	attach->clicks(
+	) | rpl::on_next([=](Qt::MouseButton button) {
+		if (button != Qt::LeftButton) {
+			return;
+		}
+		if (_attachCallback) {
+			_attachCallback(not_null<Ui::RpWidget*>(attach), _media);
+		}
+	}, attach->lifetime());
+	if (_widgetDropCallback) {
+		_widgetDropCallback(attach, _media);
+	}
+	_attach.reset(attach);
 }
 
 void Options::Option::createWarning() {
@@ -358,7 +525,7 @@ void Options::Option::createWarning() {
 	rpl::combine(
 		field->sizeValue(),
 		warning->sizeValue()
-	) | rpl::start_with_next([=](QSize size, QSize label) {
+	) | rpl::on_next([=](QSize size, QSize label) {
 		warning->moveToLeft(
 			(size.width()
 				- label.width()
@@ -370,6 +537,38 @@ void Options::Option::createWarning() {
 	}, warning->lifetime());
 }
 
+void Options::Option::createHandle() {
+	auto widget = object_ptr<Ui::RpWidget>(_content.get());
+	const auto raw = widget.data();
+	const auto &icon = st::pollBoxMenuPollOrderIcon;
+	raw->resize(icon.width(), icon.height());
+	raw->setCursor(Qt::SizeVerCursor);
+	raw->paintRequest(
+	) | rpl::on_next([=] {
+		auto p = QPainter(raw);
+		icon.paint(p, 0, 0, raw->width());
+	}, raw->lifetime());
+
+	const auto wrap = Ui::CreateChild<Ui::FadeWrapScaled<Ui::RpWidget>>(
+		_content.get(),
+		std::move(widget));
+	wrap->hide(anim::type::instant);
+
+	_content->sizeValue(
+	) | rpl::on_next([=](QSize size) {
+		const auto left = st::createPollFieldPadding.left();
+		wrap->moveToLeft(
+			left,
+			(size.height() - wrap->heightNoMargins()) / 2);
+	}, wrap->lifetime());
+
+	_handle.reset(wrap);
+}
+
+Ui::RpWidget *Options::Option::handleWidget() const {
+	return _handle ? _handle->entity() : nullptr;
+}
+
 bool Options::Option::isEmpty() const {
 	return field()->getLastText().trimmed().isEmpty();
 }
@@ -386,6 +585,22 @@ bool Options::Option::isCorrect() const {
 	return isGood() && _correct && _correct->entity()->Checkbox::checked();
 }
 
+bool Options::Option::uploadingMedia() const {
+	return _media->uploading;
+}
+
+bool Options::Option::refreshMediaIfStale(crl::time threshold) {
+	if (_media->media
+		&& _media->uploadedAt > 0
+		&& (!threshold
+			|| (crl::now() - _media->uploadedAt > threshold))
+		&& _media->reupload) {
+		_media->reupload();
+		return true;
+	}
+	return false;
+}
+
 bool Options::Option::hasFocus() const {
 	return field()->hasFocus();
 }
@@ -394,43 +609,47 @@ void Options::Option::setFocus() const {
 	FocusAtEnd(field());
 }
 
-void Options::Option::clearValue() {
-	field()->setText(QString());
-}
-
 void Options::Option::setPlaceholder() const {
 	field()->setPlaceholder(tr::lng_polls_create_option_add());
 }
 
-void Options::Option::toggleRemoveAlways(bool toggled) {
-	*_removeAlways = toggled;
-}
-
 void Options::Option::enableChooseCorrect(
-		std::shared_ptr<Ui::RadiobuttonGroup> group) {
-	if (!group) {
+		std::shared_ptr<Ui::RadiobuttonGroup> group,
+		bool multiCorrect,
+		Fn<void()> checkboxChanged) {
+	if (!group && !multiCorrect) {
+		_hasCorrect = false;
 		if (_correct) {
-			_hasCorrect = false;
 			_correct->hide(anim::type::normal);
-			toggleCorrectSpace(false);
+		}
+		if (_handle) {
+			_handle->toggle(isGood(), anim::type::normal);
 		}
 		return;
 	}
 	static auto Index = 0;
-	const auto button = Ui::CreateChild<Ui::FadeWrapScaled<Ui::Radiobutton>>(
-		_content.get(),
-		object_ptr<Ui::Radiobutton>(
+	auto checkbox = multiCorrect
+		? object_ptr<Ui::Checkbox>(
+			_content.get(),
+			QString(),
+			false,
+			st::defaultCheckbox,
+			st::defaultCheck)
+		: object_ptr<Ui::Checkbox>(object_ptr<Ui::Radiobutton>(
 			_content.get(),
 			group,
 			++Index,
 			QString(),
 			st::defaultCheckbox));
+	const auto button = Ui::CreateChild<Ui::FadeWrapScaled<Ui::Checkbox>>(
+		_content.get(),
+		std::move(checkbox));
 	button->entity()->resize(
 		button->entity()->height(),
 		button->entity()->height());
 	button->hide(anim::type::instant);
 	_content->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto left = st::createPollFieldPadding.left();
 		button->moveToLeft(
 			left,
@@ -438,43 +657,89 @@ void Options::Option::enableChooseCorrect(
 	}, button->lifetime());
 	_correct.reset(button);
 	_hasCorrect = true;
+	if (multiCorrect && checkboxChanged) {
+		button->entity()->checkedChanges(
+		) | rpl::on_next([=](bool) {
+			checkboxChanged();
+		}, button->lifetime());
+	}
 	if (isGood()) {
 		_correct->show(anim::type::normal);
 	} else {
 		_correct->hide(anim::type::instant);
 	}
-	toggleCorrectSpace(true);
-}
-
-void Options::Option::toggleCorrectSpace(bool visible) {
-	_correctShown.start(
-		[=] { updateFieldGeometry(); },
-		visible ? 0. : 1.,
-		visible ? 1. : 0.,
-		st::fadeWrapDuration);
+	if (_handle) {
+		_handle->hide(anim::type::normal);
+	}
 }
 
 void Options::Option::updateFieldGeometry() {
-	const auto shown = _correctShown.value(_hasCorrect ? 1. : 0.);
 	const auto skip = st::defaultRadio.diameter
 		+ st::defaultCheckbox.textPosition.x();
-	const auto left = anim::interpolate(0, skip, shown);
-	_field->resizeToWidth(_content->width() - left);
-	_field->moveToLeft(left, 0);
+	_field->resizeToWidth(_content->width() - skip);
+	_field->moveToLeft(skip, 0);
 }
 
 not_null<Ui::InputField*> Options::Option::field() const {
 	return _field;
 }
 
+not_null<Ui::RpWidget*> Options::Option::wrapWidget() const {
+	return _wrap.get();
+}
+
 void Options::Option::removePlaceholder() const {
 	field()->setPlaceholder(rpl::single(QString()));
 }
 
+void Options::Option::showAddIcon(bool show) {
+	if (show && !_addIcon) {
+		auto icon = Settings::Icon(Settings::IconDescriptor{
+			&st::settingsIconAdd,
+			Settings::IconType::Round,
+			&st::windowBgActive,
+		});
+		const auto iconSize = icon.size();
+		auto widget = object_ptr<Ui::RpWidget>(_content.get());
+		const auto raw = widget.data();
+		raw->resize(iconSize);
+		const auto iconPtr = std::make_shared<Settings::Icon>(
+			std::move(icon));
+		raw->paintOn([=](QPainter &p) {
+			iconPtr->paint(p, 0, 0);
+		});
+
+		const auto wrap =
+			Ui::CreateChild<Ui::FadeWrapScaled<Ui::RpWidget>>(
+				_content.get(),
+				std::move(widget));
+		wrap->hide(anim::type::instant);
+
+		_content->sizeValue(
+		) | rpl::on_next([=](QSize size) {
+			const auto &handleIcon = st::pollBoxMenuPollOrderIcon;
+			const auto left = st::createPollFieldPadding.left()
+				+ (handleIcon.width() - iconSize.width()) / 2;
+			wrap->moveToLeft(
+				left,
+				(size.height() - wrap->heightNoMargins()) / 2);
+		}, wrap->lifetime());
+
+		_addIcon = wrap;
+	}
+	if (_addIcon) {
+		if (show) {
+			_addIcon->show(anim::type::normal);
+		} else {
+			_addIcon->hide(anim::type::normal);
+		}
+	}
+}
+
 PollAnswer Options::Option::toPollAnswer(int index) const {
 	Expects(index >= 0 && index < kMaxOptionsCount);
 
-	const auto text = field()->getTextWithTags();
+	const auto text = field()->getTextWithAppliedMarkdown();
 
 	auto result = PollAnswer{
 		TextWithEntities{
@@ -483,34 +748,41 @@ PollAnswer Options::Option::toPollAnswer(int index) const {
 		},
 		QByteArray(1, ('0' + index)),
 	};
+	result.media = _media->media;
 	TextUtilities::Trim(result.text);
 	result.correct = _correct ? _correct->entity()->Checkbox::checked() : false;
 	return result;
 }
 
-rpl::producer<Qt::MouseButton> Options::Option::removeClicks() const {
-	return _remove->clicks();
-}
-
 Options::Options(
 	not_null<Ui::BoxContent*> box,
 	not_null<Ui::VerticalLayout*> container,
 	not_null<Window::SessionController*> controller,
 	ChatHelpers::TabbedPanel *emojiPanel,
-	bool chooseCorrectEnabled)
+	bool chooseCorrectEnabled,
+	AttachCallback attachCallback,
+	FieldDropCallback fieldDropCallback,
+	WidgetDropCallback widgetDropCallback)
 : _box(box)
 , _container(container)
 , _controller(controller)
 , _emojiPanel(emojiPanel)
+, _attachCallback(std::move(attachCallback))
+, _fieldDropCallback(std::move(fieldDropCallback))
+, _widgetDropCallback(std::move(widgetDropCallback))
 , _chooseCorrectGroup(chooseCorrectEnabled
 	? createChooseCorrectGroup()
-	: nullptr)
-, _position(_container->count()) {
+	: nullptr) {
+	auto optionsObj = object_ptr<Ui::VerticalLayout>(container);
+	_optionsLayout = optionsObj.data();
+	container->add(std::move(optionsObj));
+	setupReorder();
 	checkLastOption();
 }
 
 bool Options::full() const {
-	return (_list.size() == kMaxOptionsCount);
+	const auto limit = _controller->session().appConfig().pollOptionsLimit();
+	return (_list.size() >= limit);
 }
 
 bool Options::hasOptions() const {
@@ -525,6 +797,24 @@ bool Options::hasCorrect() const {
 	return _hasCorrect;
 }
 
+bool Options::hasUploadingMedia() const {
+	return ranges::any_of(_list, &Option::uploadingMedia);
+}
+
+bool Options::refreshStaleMedia(crl::time threshold) {
+	auto refreshed = false;
+	for (const auto &option : _list) {
+		if (option->refreshMediaIfStale(threshold)) {
+			refreshed = true;
+		}
+	}
+	return refreshed;
+}
+
+not_null<Ui::RpWidget*> Options::layoutWidget() const {
+	return _optionsLayout;
+}
+
 rpl::producer<int> Options::usedCount() const {
 	return _usedCount.value();
 }
@@ -586,14 +876,28 @@ std::shared_ptr<Ui::RadiobuttonGroup> Options::createChooseCorrectGroup() {
 	return result;
 }
 
-void Options::enableChooseCorrect(bool enabled) {
-	_chooseCorrectGroup = enabled
-		? createChooseCorrectGroup()
-		: nullptr;
-	for (auto &option : _list) {
-		option->enableChooseCorrect(_chooseCorrectGroup);
+void Options::enableChooseCorrect(bool enabled, bool multiCorrect) {
+	_multiCorrect = enabled && multiCorrect;
+	if (_multiCorrect) {
+		_chooseCorrectGroup = nullptr;
+		_multiCorrectChanged = [=] { validateState(); };
+		for (auto &option : _list) {
+			option->enableChooseCorrect(
+				nullptr,
+				true,
+				_multiCorrectChanged);
+		}
+	} else {
+		_multiCorrectChanged = nullptr;
+		_chooseCorrectGroup = enabled
+			? createChooseCorrectGroup()
+			: nullptr;
+		for (auto &option : _list) {
+			option->enableChooseCorrect(_chooseCorrectGroup);
+		}
 	}
 	validateState();
+	restartReorder();
 }
 
 bool Options::correctShadows() const {
@@ -642,6 +946,9 @@ void Options::removeEmptyTail() {
 }
 
 void Options::destroy(std::unique_ptr<Option> option) {
+	if (_reorder) {
+		_reorder->cancel();
+	}
 	const auto value = option.get();
 	option->destroy([=] { removeDestroyed(value); });
 	_destroyed.push_back(std::move(option));
@@ -652,10 +959,10 @@ void Options::fixAfterErase() {
 
 	const auto last = _list.end() - 1;
 	(*last)->setPlaceholder();
-	(*last)->toggleRemoveAlways(false);
+	(*last)->showAddIcon(true);
 	if (last != begin(_list)) {
 		(*(last - 1))->setPlaceholder();
-		(*(last - 1))->toggleRemoveAlways(false);
+		(*(last - 1))->showAddIcon(false);
 	}
 	fixShadows();
 }
@@ -666,18 +973,69 @@ void Options::addEmptyOption() {
 	} else if (!_list.empty() && _list.back()->isEmpty()) {
 		return;
 	}
-	if (_list.size() > 1) {
-		(*(_list.end() - 2))->removePlaceholder();
-		(*(_list.end() - 2))->toggleRemoveAlways(true);
+	const auto animated = _list.empty()
+		? anim::type::instant
+		: anim::type::normal;
+	insertOption(int(_list.size()), QString(), animated);
+}
+
+void Options::insertOption(
+		int beforeIndex,
+		const QString &text,
+		anim::type animated) {
+	if (full()) {
+		return;
+	}
+	Assert(beforeIndex >= 0 && beforeIndex <= int(_list.size()));
+
+	const auto isAppend = (beforeIndex == int(_list.size()));
+	if (isAppend) {
+		if (!_list.empty()) {
+			_list.back()->showAddIcon(false);
+		}
+		if (_list.size() > 1) {
+			(*(_list.end() - 2))->removePlaceholder();
+		}
 	}
-	_list.push_back(std::make_unique<Option>(
+
+	const auto layoutPosition = isAppend
+		? _optionsLayout->count()
+		: findLayoutPosition(_list[beforeIndex].get());
+
+	auto option = std::make_unique<Option>(
 		_box,
-		_container,
+		_optionsLayout,
 		&_controller->session(),
-		_position + _list.size() + _destroyed.size(),
-		_chooseCorrectGroup));
-	const auto field = _list.back()->field();
+		layoutPosition,
+		_chooseCorrectGroup,
+		_attachCallback,
+		_fieldDropCallback,
+		_widgetDropCallback);
+	const auto raw = option.get();
+	_list.insert(begin(_list) + beforeIndex, std::move(option));
+
+	if (_multiCorrect) {
+		raw->enableChooseCorrect(
+			nullptr,
+			true,
+			_multiCorrectChanged);
+	}
+	if (!text.isEmpty()) {
+		raw->field()->setText(text);
+	}
+	initOptionField(raw->field());
+
+	if (isAppend) {
+		raw->showAddIcon(true);
+	}
+	raw->show(animated);
+	fixShadows();
+	restartReorder();
+}
+
+void Options::initOptionField(not_null<Ui::InputField*> field) {
 	if (const auto emojiPanel = _emojiPanel) {
+		const auto isPremium = _controller->session().user()->isPremium();
 		const auto emojiToggle = Ui::AddEmojiToggleToField(
 			field,
 			_box,
@@ -686,50 +1044,60 @@ void Options::addEmptyOption() {
 			QPoint(
 				-st::createPollOptionFieldPremium.textMargins.right(),
 				st::createPollOptionEmojiPositionSkip));
-		emojiToggle->shownValue() | rpl::start_with_next([=](bool shown) {
+		emojiToggle->shownValue() | rpl::on_next([=](bool shown) {
 			if (!shown) {
 				return;
 			}
 			_emojiPanelLifetime.destroy();
 			emojiPanel->selector()->emojiChosen(
-			) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+			) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 				if (field->hasFocus()) {
 					Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
 				}
 			}, _emojiPanelLifetime);
-			emojiPanel->selector()->customEmojiChosen(
-			) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
-				if (field->hasFocus()) {
-					Data::InsertCustomEmoji(field, data.document);
-				}
-			}, _emojiPanelLifetime);
+			if (isPremium) {
+				emojiPanel->selector()->customEmojiChosen(
+				) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+					if (field->hasFocus()) {
+						Data::InsertCustomEmoji(field, data.document);
+					}
+				}, _emojiPanelLifetime);
+			}
 		}, emojiToggle->lifetime());
 	}
 	field->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto index = findField(field);
 		if (_list[index]->isGood() && index + 1 < _list.size()) {
 			_list[index + 1]->setFocus();
 		}
 	}, field->lifetime());
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
+		auto list = ParsePastedList(field->getLastText());
+		if (!list.empty()) {
+			field->setText(list.front());
+			field->forceProcessContentsChanges();
+			list.pop_front();
+			handlePaste(field, list);
+		}
 		Ui::PostponeCall(crl::guard(field, [=] {
 			validateState();
 		}));
 	}, field->lifetime());
 	field->focusedChanges(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		_scrollToWidget.fire_copy(field);
 	}, field->lifetime());
 	field->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=](not_null<bool*> handled) {
 		const auto index = findField(field);
 		if (index + 1 < _list.size()) {
 			_list[index + 1]->setFocus();
 		} else {
 			_tabbed.fire({});
 		}
+		*handled = true;
 	}, field->lifetime());
 	base::install_event_filter(field, [=](not_null<QEvent*> event) {
 		if (event->type() != QEvent::KeyPress
@@ -749,31 +1117,26 @@ void Options::addEmptyOption() {
 		}
 		return base::EventFilterResult::Cancel;
 	});
+}
 
-	_list.back()->removeClicks(
-	) | rpl::start_with_next([=] {
-		Ui::PostponeCall(crl::guard(field, [=] {
-			Expects(!_list.empty());
-
-			const auto item = begin(_list) + findField(field);
-			if (item == _list.end() - 1) {
-				(*item)->clearValue();
-				return;
-			}
-			if ((*item)->hasFocus()) {
-				(*(item + 1))->setFocus();
-			}
-			destroy(std::move(*item));
-			_list.erase(item);
-			fixAfterErase();
-			validateState();
-		}));
-	}, field->lifetime());
-
-	_list.back()->show((_list.size() == 1)
-		? anim::type::instant
-		: anim::type::normal);
-	fixShadows();
+void Options::handlePaste(
+		not_null<Ui::InputField*> field,
+		const QStringList &list) {
+	const auto index = findField(field);
+	for (auto i = 0, count = int(list.size()); i != count; ++i) {
+		insertOption(
+			index + 1 + i,
+			list[i],
+			anim::type::instant);
+	}
+	const auto last = std::min(
+		int(index + list.size()),
+		int(_list.size()) - 1);
+	const auto focus = _list[last]->field();
+	crl::on_main(focus, [=] {
+		focus->setCursorPosition(focus->getLastText().size());
+		focus->setFocus();
+	});
 }
 
 void Options::removeDestroyed(not_null<Option*> option) {
@@ -783,11 +1146,12 @@ void Options::removeDestroyed(not_null<Option*> option) {
 		&std::unique_ptr<Option>::get);
 	Assert(i != end(_destroyed));
 	_destroyed.erase(i);
+	restartReorder();
 }
 
 void Options::validateState() {
 	checkLastOption();
-	_hasOptions = (ranges::count_if(_list, &Option::isGood) > 1);
+	_hasOptions = (ranges::count_if(_list, &Option::isGood) > 0);
 	_isValid = _hasOptions && ranges::none_of(_list, &Option::isTooLong);
 	_hasCorrect = ranges::any_of(_list, &Option::isCorrect);
 
@@ -805,25 +1169,151 @@ int Options::findField(not_null<Ui::InputField*> field) const {
 	return result;
 }
 
+int Options::findLayoutPosition(not_null<Option*> option) const {
+	const auto widget = option->wrapWidget();
+	for (auto i = 0, count = _optionsLayout->count(); i != count; ++i) {
+		if (_optionsLayout->widgetAt(i).get() == widget.get()) {
+			return i;
+		}
+	}
+	Unexpected("Poll option widget missing in layout.");
+}
+
 void Options::checkLastOption() {
 	removeEmptyTail();
 	addEmptyOption();
 }
 
+void Options::setupReorder() {
+	_reorder = std::make_unique<Ui::VerticalLayoutReorder>(
+		_optionsLayout);
+	_reorder->setMouseEventProxy([=](int i)
+			-> not_null<Ui::RpWidget*> {
+		if (i < int(_list.size())) {
+			if (const auto handle = _list[i]->handleWidget()) {
+				return handle;
+			}
+		}
+		return _optionsLayout->widgetAt(i);
+	});
+	_reorder->updates(
+	) | rpl::on_next([=](Ui::VerticalLayoutReorder::Single data) {
+		using State = Ui::VerticalLayoutReorder::State;
+		if (data.state == State::Started) {
+			++_reordering;
+		} else {
+			Ui::PostponeCall(_optionsLayout, [=] {
+				--_reordering;
+			});
+			if (data.state == State::Applied) {
+				base::reorder(
+					_list,
+					data.oldPosition,
+					data.newPosition);
+				fixShadows();
+			}
+		}
+	}, _box->lifetime());
+}
+
+void Options::restartReorder() {
+	if (!_reorder) {
+		return;
+	}
+	_reorder->cancel();
+
+	if (!_destroyed.empty()) {
+		return;
+	}
+	if (_chooseCorrectGroup || _multiCorrect) {
+		return;
+	}
+
+	_reorder->clearPinnedIntervals();
+
+	const auto count = int(_list.size());
+	if (count < 2) {
+		return;
+	}
+	if (_list.back()->isEmpty()) {
+		_reorder->addPinnedInterval(count - 1, 1);
+	}
+	_reorder->start();
+}
+
+class DurationIconAction final : public Ui::Menu::Action {
+public:
+	DurationIconAction(
+		not_null<Ui::Menu::Menu*> parent,
+		const style::Menu &st,
+		not_null<QAction*> action,
+		const QString &tinyText);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	QString _tinyText;
+
+};
+
+DurationIconAction::DurationIconAction(
+	not_null<Ui::Menu::Menu*> parent,
+	const style::Menu &st,
+	not_null<QAction*> action,
+	const QString &tinyText)
+: Ui::Menu::Action(parent, st, action, nullptr, nullptr)
+, _tinyText(tinyText) {
+}
+
+void DurationIconAction::paintEvent(QPaintEvent *e) {
+	Ui::Menu::Action::paintEvent(e);
+
+	const auto &st = this->st();
+	const auto iconPos = st.itemIconPosition;
+	const auto size = st::createPollDurationIconSize;
+	const auto &pos = st::createPollDurationIconPosition;
+	const auto rect = QRect(
+		iconPos.x() + pos.x(),
+		iconPos.y() + pos.y(),
+		size,
+		size);
+	const auto innerRect = rect - st::createPollDurationIconMargins;
+
+	Painter p(this);
+	PainterHighQualityEnabler hq(p);
+
+	Ui::PaintTimerIcon(p, innerRect, _tinyText, st::menuIconColor->c);
+}
+
+void ShowMediaUploadingToast() {
+	Ui::Toast::Show({
+		.title = tr::lng_polls_media_uploading_toast_title(tr::now),
+		.text = tr::lng_polls_media_uploading_toast(tr::now, tr::marked),
+		.iconLottie = u"uploading"_q,
+		.iconLottieSize = st::pollToastUploadingIconSize,
+		.duration = crl::time(3000),
+	});
+}
+
 } // namespace
 
 CreatePollBox::CreatePollBox(
 	QWidget*,
 	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> peer,
 	PollData::Flags chosen,
 	PollData::Flags disabled,
+	rpl::producer<int> starsRequired,
 	Api::SendType sendType,
 	SendMenu::Details sendMenuDetails)
 : _controller(controller)
+, _peer(peer)
 , _chosen(chosen)
 , _disabled(disabled)
 , _sendType(sendType)
-, _sendMenuDetails([result = sendMenuDetails] { return result; }) {
+, _sendMenuDetails([result = sendMenuDetails] { return result; })
+, _starsRequired(std::move(starsRequired)) {
 }
 
 rpl::producer<CreatePollBox::Result> CreatePollBox::submitRequests() const {
@@ -838,6 +1328,13 @@ void CreatePollBox::submitFailed(const QString &error) {
 	showToast(error);
 }
 
+void CreatePollBox::submitMediaExpired() {
+	if (_refreshExpiredMedia) {
+		_refreshExpiredMedia();
+		ShowMediaUploadingToast();
+	}
+}
+
 not_null<Ui::InputField*> CreatePollBox::setupQuestion(
 		not_null<Ui::VerticalLayout*> container) {
 	using namespace Settings;
@@ -853,15 +1350,16 @@ not_null<Ui::InputField*> CreatePollBox::setupQuestion(
 			Ui::InputField::Mode::MultiLine,
 			tr::lng_polls_create_question_placeholder()),
 		st::createPollFieldPadding
-			+ (isPremium
-				? QMargins(0, 0, st::defaultComposeFiles.emoji.inner.width, 0)
-				: QMargins()));
-	InitField(getDelegate()->outerContainer(), question, session);
+			+ QMargins(0, 0, st::defaultComposeFiles.emoji.inner.width, 0));
+	InitField(
+		getDelegate()->outerContainer(),
+		question,
+		session,
+		_controller->uiShow());
 	question->setMaxLength(kQuestionLimit + kErrorLimit);
 	question->setSubmitSettings(Ui::InputField::SubmitSettings::Both);
-	question->customTab(true);
 
-	if (isPremium) {
+	{
 		using Selector = ChatHelpers::TabbedSelector;
 		const auto outer = getDelegate()->outerContainer();
 		_emojiPanel = base::make_unique_q<ChatHelpers::TabbedPanel>(
@@ -886,18 +1384,21 @@ not_null<Ui::InputField*> CreatePollBox::setupQuestion(
 			_controller,
 			emojiPanel,
 			st::createPollOptionFieldPremiumEmojiPosition);
+		emojiToggle->show();
 		emojiPanel->selector()->emojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+		) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 			if (question->hasFocus()) {
 				Ui::InsertEmojiAtCursor(question->textCursor(), data.emoji);
 			}
 		}, emojiToggle->lifetime());
-		emojiPanel->selector()->customEmojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
-			if (question->hasFocus()) {
-				Data::InsertCustomEmoji(question, data.document);
-			}
-		}, emojiToggle->lifetime());
+		if (isPremium) {
+			emojiPanel->selector()->customEmojiChosen(
+			) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+				if (question->hasFocus()) {
+					Data::InsertCustomEmoji(question, data.document);
+				}
+			}, emojiToggle->lifetime());
+		}
 	}
 
 	const auto warning = CreateWarningLabel(
@@ -908,7 +1409,7 @@ not_null<Ui::InputField*> CreatePollBox::setupQuestion(
 	rpl::combine(
 		question->geometryValue(),
 		warning->sizeValue()
-	) | rpl::start_with_next([=](QRect geometry, QSize label) {
+	) | rpl::on_next([=](QRect geometry, QSize label) {
 		warning->moveToLeft(
 			(container->width()
 				- label.width()
@@ -925,6 +1426,59 @@ not_null<Ui::InputField*> CreatePollBox::setupQuestion(
 	return question;
 }
 
+not_null<Ui::InputField*> CreatePollBox::setupDescription(
+		not_null<Ui::VerticalLayout*> container) {
+	const auto session = &_controller->session();
+	const auto isPremium = session->user()->isPremium();
+	const auto description = container->add(
+		object_ptr<Ui::InputField>(
+			container,
+			st::pollDescriptionField,
+			Ui::InputField::Mode::MultiLine,
+			tr::lng_polls_create_description_placeholder()),
+		st::pollDescriptionFieldPadding);
+	InitField(
+		getDelegate()->outerContainer(),
+		description,
+		session,
+		_controller->uiShow());
+	description->setSubmitSettings(Ui::InputField::SubmitSettings::Both);
+
+	if (const auto emojiPanel = _emojiPanel.get()) {
+		const auto emojiToggle = Ui::AddEmojiToggleToField(
+			description,
+			this,
+			_controller,
+			emojiPanel,
+			QPoint(
+				-st::pollDescriptionField.textMargins.right(),
+				-st::lineWidth));
+		emojiToggle->shownValue() | rpl::on_next([=](bool shown) {
+			if (!shown) {
+				return;
+			}
+			emojiPanel->selector()->emojiChosen(
+			) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
+				if (description->hasFocus()) {
+					Ui::InsertEmojiAtCursor(
+						description->textCursor(),
+						data.emoji);
+				}
+			}, emojiToggle->lifetime());
+			if (isPremium) {
+				emojiPanel->selector()->customEmojiChosen(
+				) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+					if (description->hasFocus()) {
+						Data::InsertCustomEmoji(description, data.document);
+					}
+				}, emojiToggle->lifetime());
+			}
+		}, emojiToggle->lifetime());
+	}
+
+	return description;
+}
+
 not_null<Ui::InputField*> CreatePollBox::setupSolution(
 		not_null<Ui::VerticalLayout*> container,
 		rpl::producer<bool> shown) {
@@ -934,7 +1488,7 @@ not_null<Ui::InputField*> CreatePollBox::setupSolution(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			container,
 			object_ptr<Ui::VerticalLayout>(container))
-	)->setDuration(0)->toggleOn(std::move(shown));
+	)->toggleOn(std::move(shown));
 	const auto inner = outer->entity();
 
 	const auto session = &_controller->session();
@@ -943,28 +1497,24 @@ not_null<Ui::InputField*> CreatePollBox::setupSolution(
 	const auto solution = inner->add(
 		object_ptr<Ui::InputField>(
 			inner,
-			st::createPollSolutionField,
+			st::pollMediaField,
 			Ui::InputField::Mode::MultiLine,
 			tr::lng_polls_solution_placeholder()),
 		st::createPollFieldPadding);
-	InitField(getDelegate()->outerContainer(), solution, session);
-	solution->setMaxLength(kSolutionLimit + kErrorLimit);
-	solution->setInstantReplaces(Ui::InstantReplaces::Default());
-	solution->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
-	solution->setMarkdownReplacesEnabled(rpl::single(
-		Ui::MarkdownEnabledState{ Ui::MarkdownEnabled{ {
+	InitField(
+		getDelegate()->outerContainer(),
+		solution,
+		session,
+		_controller->uiShow(),
+		{
 			Ui::InputField::kTagBold,
 			Ui::InputField::kTagItalic,
 			Ui::InputField::kTagUnderline,
 			Ui::InputField::kTagStrikeOut,
 			Ui::InputField::kTagCode,
 			Ui::InputField::kTagSpoiler,
-		} } }
-	));
-	solution->setEditLinkCallback(
-		DefaultEditLinkCallback(_controller->uiShow(), solution));
-	solution->customTab(true);
+		});
+	solution->setMaxLength(kSolutionLimit + kErrorLimit);
 
 	const auto warning = CreateWarningLabel(
 		inner,
@@ -974,7 +1524,7 @@ not_null<Ui::InputField*> CreatePollBox::setupSolution(
 	rpl::combine(
 		solution->geometryValue(),
 		warning->sizeValue()
-	) | rpl::start_with_next([=](QRect geometry, QSize label) {
+	) | rpl::on_next([=](QRect geometry, QSize label) {
 		warning->moveToLeft(
 			(inner->width()
 				- label.width()
@@ -988,12 +1538,9 @@ not_null<Ui::InputField*> CreatePollBox::setupSolution(
 			geometry.width());
 	}, warning->lifetime());
 
-	inner->add(
-		object_ptr<Ui::FlatLabel>(
-			inner,
-			tr::lng_polls_solution_about(),
-			st::boxDividerLabel),
-		st::createPollFieldTitlePadding);
+	Ui::AddDividerText(
+		inner,
+		tr::lng_polls_solution_about());
 
 	return solution;
 }
@@ -1002,12 +1549,1172 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 	using namespace Settings;
 
 	const auto id = base::RandomValue<uint64>();
-	const auto error = lifetime().make_state<Errors>(Error::Question);
+	struct UploadContext {
+		std::weak_ptr<PollMediaState> media;
+		uint64 token = 0;
+		QString filename;
+		QString filemime;
+		QVector<MTPDocumentAttribute> attributes;
+		bool forceFile = true;
+	};
+	using StartUploadFn = Fn<void(
+		std::shared_ptr<PollMediaState>,
+		Ui::PreparedFile)>;
+	struct State final {
+		Errors error = Error::Question;
+		std::unique_ptr<Options> options;
+		rpl::event_stream<bool> multipleForceOff;
+		rpl::event_stream<bool> addOptionsForceOff;
+		rpl::event_stream<bool> revotingForceOff;
+		rpl::event_stream<bool> quizForceOff;
+		rpl::event_stream<bool> showWhoVotedForceOn;
+		rpl::variable<int> closePeriod = 0;
+		rpl::variable<TimeId> closeDate = TimeId(0);
+		rpl::variable<std::vector<QString>> countriesValue;
+		std::shared_ptr<PollMediaState> descriptionMedia
+			= std::make_shared<PollMediaState>();
+		std::shared_ptr<PollMediaState> solutionMedia
+			= std::make_shared<PollMediaState>();
+		std::shared_ptr<HistoryView::Controls::WebpageResolver>
+			webpageResolver;
+		base::flat_map<PollMediaState*, rpl::lifetime> webPageLifetimes;
+		std::weak_ptr<PollMediaState> stickerTarget;
+		base::flat_map<FullMsgId, UploadContext> uploads;
+		base::unique_qptr<Ui::PopupMenu> mediaMenu;
+		base::unique_qptr<Ui::PopupMenu> durationMenu;
+		base::unique_qptr<ChatHelpers::TabbedPanel> stickerPanel;
+		std::unique_ptr<TaskQueue> prepareQueue;
+		StartUploadFn startPhotoUpload;
+		StartUploadFn startDocumentUpload;
+		StartUploadFn startVideoUpload;
+	};
+	const auto state = lifetime().make_state<State>();
+	state->prepareQueue = std::make_unique<TaskQueue>();
+	state->webpageResolver = std::make_shared<
+		HistoryView::Controls::WebpageResolver>(&_controller->session());
 
 	auto result = object_ptr<Ui::VerticalLayout>(this);
 	const auto container = result.data();
 
+	const auto updateMedia = [=](
+			const std::shared_ptr<PollMediaState> &media) {
+		if (media->update) {
+			media->update();
+		}
+	};
+	const auto setMedia = [=](
+			const std::shared_ptr<PollMediaState> &media,
+			PollMedia value,
+			std::shared_ptr<Ui::DynamicImage> thumbnail,
+			bool rounded) {
+		const auto wasUploading = media->uploading;
+		media->token++;
+		media->media = value;
+		media->thumbnail = std::move(thumbnail);
+		media->rounded = rounded;
+		media->progress = (media->uploading && media->media)
+			? 1.
+			: 0.;
+		media->uploadDataId = 0;
+		media->uploading = false;
+		if (wasUploading && value) {
+			media->uploadedAt = crl::now();
+		} else {
+			media->uploadedAt = 0;
+			media->reupload = nullptr;
+		}
+		updateMedia(media);
+	};
+	struct UploadedMedia final {
+		PollMedia input;
+		std::shared_ptr<Ui::DynamicImage> thumbnail;
+	};
+	const auto parseUploaded = [=](
+			const MTPMessageMedia &result,
+			FullMsgId fullId) {
+		auto parsed = UploadedMedia();
+		auto &owner = _controller->session().data();
+		result.match([&](const MTPDmessageMediaPhoto &media) {
+			if (const auto photo = media.vphoto()) {
+				photo->match([&](const MTPDphoto &) {
+					parsed.input.photo = owner.processPhoto(*photo);
+					parsed.thumbnail = Ui::MakePhotoThumbnail(
+						parsed.input.photo,
+						fullId);
+				}, [](const auto &) {
+				});
+			}
+		}, [&](const MTPDmessageMediaDocument &media) {
+			if (const auto document = media.vdocument()) {
+				document->match([&](const MTPDdocument &) {
+					parsed.input.document = owner.processDocument(
+						*document);
+					parsed.thumbnail
+						= Ui::MakeDocumentFilePreviewThumbnail(
+							parsed.input.document,
+							fullId);
+				}, [](const auto &) {
+				});
+			}
+		}, [](const auto &) {
+		});
+		return parsed;
+	};
+	const auto applyUploaded = [=](
+			const std::shared_ptr<PollMediaState> &media,
+			uint64 token,
+			FullMsgId fullId,
+			const MTPInputFile &file) {
+		const auto uploaded = MTP_inputMediaUploadedPhoto(
+			MTP_flags(0),
+			file,
+			MTP_vector<MTPInputDocument>(QVector<MTPInputDocument>()),
+			MTPint(),
+			MTPInputDocument());
+		_controller->session().api().request(MTPmessages_UploadMedia(
+			MTP_flags(0),
+			MTPstring(),
+			_peer->input(),
+			uploaded
+		)).done([=](const MTPMessageMedia &result) {
+			if (media->token != token) {
+				return;
+			}
+			auto parsed = parseUploaded(result, fullId);
+			if (!parsed.input) {
+				setMedia(media, PollMedia(), nullptr, false);
+				showToast(tr::lng_attach_failed(tr::now));
+				return;
+			}
+			setMedia(
+				media,
+				parsed.input,
+				media->thumbnail
+					? media->thumbnail
+					: std::move(parsed.thumbnail),
+				true);
+		}).fail([=](const MTP::Error &) {
+			if (media->token != token) {
+				return;
+			}
+			setMedia(media, PollMedia(), nullptr, false);
+			showToast(tr::lng_attach_failed(tr::now));
+		}).send();
+	};
+	const auto applyUploadedDocument = [=](
+			const std::shared_ptr<PollMediaState> &media,
+			uint64 token,
+			FullMsgId fullId,
+			const Api::RemoteFileInfo &info,
+			const UploadContext &context) {
+		using Flag = MTPDinputMediaUploadedDocument::Flag;
+		const auto flags = (context.forceFile ? Flag::f_force_file : Flag())
+			| (info.thumb ? Flag::f_thumb : Flag());
+		auto attributes = !context.attributes.isEmpty()
+			? context.attributes
+			: QVector<MTPDocumentAttribute>{
+				MTP_documentAttributeFilename(
+					MTP_string(context.filename)),
+			};
+		const auto uploaded = MTP_inputMediaUploadedDocument(
+			MTP_flags(flags),
+			info.file,
+			info.thumb.value_or(MTPInputFile()),
+			MTP_string(context.filemime),
+			MTP_vector<MTPDocumentAttribute>(std::move(attributes)),
+			MTP_vector<MTPInputDocument>(),
+			MTPInputPhoto(),
+			MTP_int(0),
+			MTP_int(0));
+		_controller->session().api().request(MTPmessages_UploadMedia(
+			MTP_flags(0),
+			MTPstring(),
+			_peer->input(),
+			uploaded
+		)).done([=](const MTPMessageMedia &result) {
+			if (media->token != token) {
+				return;
+			}
+			auto parsed = parseUploaded(result, fullId);
+			if (!parsed.input) {
+				setMedia(media, PollMedia(), nullptr, false);
+				showToast(tr::lng_attach_failed(tr::now));
+				return;
+			}
+			const auto isVideo = parsed.input.document
+				&& parsed.input.document->isVideoFile();
+			setMedia(
+				media,
+				parsed.input,
+				isVideo
+					? (media->thumbnail
+						? media->thumbnail
+						: std::move(parsed.thumbnail))
+					: std::move(parsed.thumbnail),
+				isVideo);
+		}).fail([=](const MTP::Error &) {
+			if (media->token != token) {
+				return;
+			}
+			setMedia(media, PollMedia(), nullptr, false);
+			showToast(tr::lng_attach_failed(tr::now));
+		}).send();
+	};
+	_controller->session().uploader().photoReady(
+	) | rpl::on_next([=](const Storage::UploadedMedia &data) {
+		const auto context = state->uploads.take(data.fullId);
+		if (!context) {
+			return;
+		}
+		const auto media = context->media.lock();
+		if (!media || (media->token != context->token)) {
+			return;
+		}
+		applyUploaded(media, context->token, data.fullId, data.info.file);
+	}, lifetime());
+	_controller->session().uploader().photoProgress(
+	) | rpl::on_next([=](const FullMsgId &id) {
+		const auto i = state->uploads.find(id);
+		if (i == state->uploads.end()) {
+			return;
+		}
+		const auto &context = i->second;
+		const auto media = context.media.lock();
+		if (!media
+			|| (media->token != context.token)
+			|| !media->uploadDataId) {
+			return;
+		}
+		media->progress = _controller->session().data().photo(
+			media->uploadDataId)->progress();
+		updateMedia(media);
+	}, lifetime());
+	_controller->session().uploader().photoFailed(
+	) | rpl::on_next([=](const FullMsgId &id) {
+		const auto context = state->uploads.take(id);
+		if (!context) {
+			return;
+		}
+		const auto media = context->media.lock();
+		if (!media || (media->token != context->token)) {
+			return;
+		}
+		setMedia(media, PollMedia(), nullptr, false);
+		showToast(tr::lng_attach_failed(tr::now));
+	}, lifetime());
+	_controller->session().uploader().documentReady(
+	) | rpl::on_next([=](const Storage::UploadedMedia &data) {
+		const auto context = state->uploads.take(data.fullId);
+		if (!context) {
+			return;
+		}
+		const auto media = context->media.lock();
+		if (!media || (media->token != context->token)) {
+			return;
+		}
+		applyUploadedDocument(
+			media,
+			context->token,
+			data.fullId,
+			data.info,
+			*context);
+	}, lifetime());
+	_controller->session().uploader().documentProgress(
+	) | rpl::on_next([=](const FullMsgId &id) {
+		const auto i = state->uploads.find(id);
+		if (i == state->uploads.end()) {
+			return;
+		}
+		const auto &context = i->second;
+		const auto media = context.media.lock();
+		if (!media
+			|| (media->token != context.token)
+			|| !media->uploadDataId) {
+			return;
+		}
+		media->progress = _controller->session().data().document(
+			media->uploadDataId)->progress();
+		updateMedia(media);
+	}, lifetime());
+	_controller->session().uploader().documentFailed(
+	) | rpl::on_next([=](const FullMsgId &id) {
+		const auto context = state->uploads.take(id);
+		if (!context) {
+			return;
+		}
+		const auto media = context->media.lock();
+		if (!media || (media->token != context->token)) {
+			return;
+		}
+		setMedia(media, PollMedia(), nullptr, false);
+		showToast(tr::lng_attach_failed(tr::now));
+	}, lifetime());
+	const auto emojiPaused = [=] {
+		using namespace Window;
+		return _controller->isGifPausedAtLeastFor(GifPauseReason::Any);
+	};
+	const auto updateStickerPanelGeometry = [=] {
+		if (!state->stickerPanel) {
+			return;
+		}
+		const auto panel = state->stickerPanel.get();
+		const auto parent = panel->parentWidget();
+		const auto left = std::max(
+			(parent->width() - panel->width()) / 2,
+			0);
+		const auto top = std::max(
+			(parent->height() - panel->height()) / 2,
+			0);
+		panel->moveTopRight(top, left + panel->width());
+	};
+	const auto showStickerPanel = [=](
+			not_null<Ui::RpWidget*>,
+			std::shared_ptr<PollMediaState> media) {
+		if (!state->stickerPanel) {
+			const auto body = getDelegate()->outerContainer();
+			state->stickerPanel = HistoryView::CreatePollStickerPanel(
+				body,
+				_controller);
+			state->stickerPanel->setDropDown(true);
+			base::install_event_filter(
+				body,
+				[=](not_null<QEvent*> event) {
+					const auto type = event->type();
+					if (type == QEvent::Move || type == QEvent::Resize) {
+						crl::on_main(this, updateStickerPanelGeometry);
+					}
+			return base::EventFilterResult::Continue;
+		},
+		lifetime());
+			state->stickerPanel->selector()->fileChosen(
+			) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+				if (Window::ShowSendPremiumError(
+						_controller,
+						data.document)) {
+					return;
+				}
+				const auto target = state->stickerTarget.lock();
+				if (!target) {
+					return;
+				}
+				setMedia(
+					target,
+					PollMedia{ .document = data.document },
+					Ui::MakeEmojiThumbnail(
+						&_controller->session().data(),
+						Data::SerializeCustomEmojiId(data.document),
+						emojiPaused),
+					false);
+				state->stickerPanel->hideAnimated();
+			}, state->stickerPanel->lifetime());
+		}
+		state->stickerTarget = media;
+		const auto panel = state->stickerPanel.get();
+		updateStickerPanelGeometry();
+		panel->toggleAnimated();
+	};
+	const auto asyncReupload = [=](
+			std::shared_ptr<PollMediaState> media,
+			Fn<Ui::PreparedList()> prepare,
+			Fn<bool(const Ui::PreparedList&)> validate,
+			const QString &name,
+			const StartUploadFn &startUpload) {
+		const auto reuploadToken = ++media->token;
+		media->media = PollMedia();
+		media->uploading = true;
+		media->progress = 0.;
+		media->uploadDataId = 0;
+		updateMedia(media);
+		const auto weak = QPointer<CreatePollBox>(this);
+		crl::async([=, prepare = std::move(prepare)] {
+			auto list = prepare();
+			crl::on_main([=, list = std::move(list)]() mutable {
+				if (!weak || media->token != reuploadToken) {
+					return;
+				}
+				if (list.error != Ui::PreparedList::Error::None
+					|| list.files.empty()
+					|| (validate && !validate(list))) {
+					setMedia(media, PollMedia(), nullptr, false);
+					showToast(tr::lng_attach_failed(tr::now));
+					return;
+				}
+				auto &f = list.files.front();
+				if (!name.isEmpty()) {
+					f.displayName = name;
+				}
+				startUpload(media, std::move(f));
+			});
+		});
+	};
+	const auto setFileReupload = [=](
+			std::shared_ptr<PollMediaState> media,
+			const QString &path,
+			const QString &name,
+			const StartUploadFn &startUpload) {
+		media->reupload = crl::guard(this, [=,
+				weak = std::weak_ptr(media)] {
+			const auto strong = weak.lock();
+			if (!strong) {
+				return;
+			}
+			if (path.isEmpty()) {
+				setMedia(strong, PollMedia(), nullptr, false);
+				showToast(tr::lng_attach_failed(tr::now));
+				return;
+			}
+			const auto premium = _controller->session().premium();
+			asyncReupload(
+				strong,
+				[=] {
+					return Storage::PrepareMediaList(
+						QStringList{ path },
+						st::sendMediaPreviewSize,
+						premium);
+				},
+				nullptr,
+				name,
+				startUpload);
+		});
+	};
+	const auto startPreparedPhotoUpload = [=](
+			std::shared_ptr<PollMediaState> media,
+			Ui::PreparedFile file) {
+		const auto sourceImage = (file.path.isEmpty()
+			&& file.content.isEmpty()
+			&& file.information)
+			? [&]() -> QImage {
+				const auto img = std::get_if<
+					Ui::PreparedFileInformation::Image>(
+						&file.information->media);
+				return (img && !img->data.isNull())
+					? img->data
+					: QImage();
+			}()
+			: QImage();
+		media->reupload = crl::guard(this, [=,
+				weak = std::weak_ptr(media),
+				path = file.path,
+				content = file.content,
+				name = file.displayName] {
+			const auto strong = weak.lock();
+			if (!strong) {
+				return;
+			}
+			const auto premium = _controller->session().premium();
+			asyncReupload(
+				strong,
+				[=] {
+					if (!path.isEmpty()) {
+						return Storage::PrepareMediaList(
+							QStringList{ path },
+							st::sendMediaPreviewSize,
+							premium);
+					}
+					if (!content.isEmpty()) {
+						auto image = QImage::fromData(content);
+						if (!image.isNull()) {
+							return Storage::PrepareMediaFromImage(
+								std::move(image),
+								QByteArray(content),
+								st::sendMediaPreviewSize);
+						}
+					} else if (!sourceImage.isNull()) {
+						auto bytes = QByteArray();
+						auto buffer = QBuffer(&bytes);
+						buffer.open(QIODevice::WriteOnly);
+						sourceImage.save(&buffer, "PNG");
+						return Storage::PrepareMediaFromImage(
+							QImage(sourceImage),
+							std::move(bytes),
+							st::sendMediaPreviewSize);
+					}
+					return Ui::PreparedList(
+						Ui::PreparedList::Error::EmptyFile,
+						QString());
+				},
+				[](const Ui::PreparedList &list) {
+					return list.files.front().type
+						== Ui::PreparedFile::Type::Photo;
+				},
+				name,
+				state->startPhotoUpload);
+		});
+		const auto token = ++media->token;
+		media->media = PollMedia();
+		media->thumbnail = std::make_shared<LocalImageThumbnail>(
+			std::move(file.preview));
+		media->rounded = true;
+		media->uploading = true;
+		media->progress = 0.;
+		media->uploadDataId = 0;
+		updateMedia(media);
+		using PreparePoll = PreparePollMediaTask;
+		state->prepareQueue->addTask(std::make_unique<PreparePoll>(
+			FileLoadTask::Args{
+				.session = &_controller->session(),
+				.filepath = file.path,
+				.content = file.content,
+				.information = std::move(file.information),
+				.videoCover = nullptr,
+				.type = SendMediaType::Photo,
+				.to = FileLoadTo(
+					_peer->id,
+					Api::SendOptions(),
+					FullReplyTo(),
+					MsgId()),
+				.caption = TextWithTags(),
+				.spoiler = false,
+				.album = nullptr,
+				.forceFile = false,
+				.idOverride = 0,
+				.displayName = file.displayName,
+			},
+			[=](std::shared_ptr<FilePrepareResult> prepared) {
+				if ((media->token != token)
+					|| !prepared
+					|| (prepared->type != SendMediaType::Photo)) {
+					if (media->token == token) {
+						setMedia(media, PollMedia(), nullptr, false);
+						showToast(tr::lng_attach_failed(tr::now));
+					}
+					return;
+				}
+				const auto uploadId = FullMsgId(
+					_peer->id,
+					_controller->session().data().nextLocalMessageId());
+				state->uploads.emplace(uploadId, UploadContext{
+					.media = media,
+					.token = token,
+				});
+				media->uploadDataId = prepared->id;
+				_controller->session().uploader().upload(
+					uploadId,
+					prepared);
+			}));
+	};
+	const auto startPreparedDocumentUpload = [=](
+			std::shared_ptr<PollMediaState> media,
+			Ui::PreparedFile file) {
+		const auto displayName = file.displayName.isEmpty()
+			? QFileInfo(file.path).fileName()
+			: file.displayName;
+		setFileReupload(
+			media,
+			file.path,
+			displayName,
+			state->startDocumentUpload);
+		auto audioAttributes = PollMediaUpload::ExtractAudioAttributes(file);
+		const auto isAudio = !audioAttributes.isEmpty();
+		const auto token = ++media->token;
+		media->media = PollMedia();
+		media->thumbnail = std::make_shared<LocalImageThumbnail>(
+			GenerateDocumentFilePreview(
+				displayName,
+				st::pollAttach.rippleAreaSize));
+		media->rounded = false;
+		media->uploading = true;
+		media->progress = 0.;
+		media->uploadDataId = 0;
+		updateMedia(media);
+		using PreparePoll = PreparePollMediaTask;
+		state->prepareQueue->addTask(std::make_unique<PreparePoll>(
+			FileLoadTask::Args{
+				.session = &_controller->session(),
+				.filepath = file.path,
+				.content = file.content,
+				.information = std::move(file.information),
+				.videoCover = nullptr,
+				.type = SendMediaType::File,
+				.to = FileLoadTo(
+					_peer->id,
+					Api::SendOptions(),
+					FullReplyTo(),
+					MsgId()),
+				.caption = TextWithTags(),
+				.spoiler = false,
+				.album = nullptr,
+				.forceFile = !isAudio,
+				.idOverride = 0,
+				.displayName = displayName,
+			},
+			[=, attributes = std::move(audioAttributes)](
+					std::shared_ptr<FilePrepareResult> prepared) {
+				if ((media->token != token) || !prepared) {
+					if (media->token == token) {
+						setMedia(media, PollMedia(), nullptr, false);
+						showToast(tr::lng_attach_failed(tr::now));
+					}
+					return;
+				}
+				const auto uploadId = FullMsgId(
+					_peer->id,
+					_controller->session().data().nextLocalMessageId());
+				state->uploads.emplace(uploadId, UploadContext{
+					.media = media,
+					.token = token,
+					.filename = prepared->filename,
+					.filemime = prepared->filemime,
+					.attributes = attributes,
+					.forceFile = !isAudio,
+				});
+				media->uploadDataId = prepared->id;
+				_controller->session().uploader().upload(
+					uploadId,
+					prepared);
+			}));
+	};
+	const auto startPreparedVideoUpload = [=](
+			std::shared_ptr<PollMediaState> media,
+			Ui::PreparedFile file) {
+		setFileReupload(
+			media,
+			file.path,
+			file.displayName,
+			state->startVideoUpload);
+		const auto token = ++media->token;
+		media->media = PollMedia();
+		media->thumbnail = std::make_shared<LocalImageThumbnail>(
+			std::move(file.preview));
+		media->rounded = true;
+		media->uploading = true;
+		media->progress = 0.;
+		media->uploadDataId = 0;
+		updateMedia(media);
+		using PreparePoll = PreparePollMediaTask;
+		state->prepareQueue->addTask(std::make_unique<PreparePoll>(
+			FileLoadTask::Args{
+				.session = &_controller->session(),
+				.filepath = file.path,
+				.content = file.content,
+				.information = std::move(file.information),
+				.videoCover = nullptr,
+				.type = SendMediaType::File,
+				.to = FileLoadTo(
+					_peer->id,
+					Api::SendOptions(),
+					FullReplyTo(),
+					MsgId()),
+				.caption = TextWithTags(),
+				.spoiler = false,
+				.album = nullptr,
+				.forceFile = false,
+				.idOverride = 0,
+				.displayName = file.displayName,
+			},
+			[=](std::shared_ptr<FilePrepareResult> prepared) {
+				if ((media->token != token) || !prepared) {
+					if (media->token == token) {
+						setMedia(media, PollMedia(), nullptr, false);
+						showToast(tr::lng_attach_failed(tr::now));
+					}
+					return;
+				}
+				auto attributes = QVector<MTPDocumentAttribute>();
+				prepared->document.match([&](const MTPDdocument &data) {
+					attributes = data.vattributes().v;
+				}, [](const auto &) {
+				});
+				const auto uploadId = FullMsgId(
+					_peer->id,
+					_controller->session().data().nextLocalMessageId());
+				state->uploads.emplace(uploadId, UploadContext{
+					.media = media,
+					.token = token,
+					.filename = prepared->filename,
+					.filemime = prepared->filemime,
+					.attributes = std::move(attributes),
+					.forceFile = false,
+				});
+				media->uploadDataId = prepared->id;
+				_controller->session().uploader().upload(
+					uploadId,
+					prepared);
+			}));
+	};
+	state->startPhotoUpload = startPreparedPhotoUpload;
+	state->startDocumentUpload = startPreparedDocumentUpload;
+	state->startVideoUpload = startPreparedVideoUpload;
+	const auto applyPreparedPhotoList = [=](
+			std::shared_ptr<PollMediaState> media,
+			Ui::PreparedList &&list) {
+		if (list.error != Ui::PreparedList::Error::None
+			|| (list.files.size() != 1)
+			|| (list.files.front().type != Ui::PreparedFile::Type::Photo)) {
+			return false;
+		}
+		startPreparedPhotoUpload(media, std::move(list.files.front()));
+		return true;
+	};
+	using ValidateFn = Fn<bool(not_null<const QMimeData*>)>;
+	using ApplyDropFn = Fn<bool(
+		std::shared_ptr<PollMediaState>,
+		not_null<const QMimeData*>)>;
+	const auto installDropToWidget = [=](
+			not_null<QWidget*> widget,
+			std::shared_ptr<PollMediaState> media,
+			ValidateFn validate,
+			ApplyDropFn apply) {
+		widget->setAcceptDrops(true);
+		base::install_event_filter(widget, [=](not_null<QEvent*> event) {
+			const auto type = event->type();
+			if (type != QEvent::DragEnter
+				&& type != QEvent::DragMove
+				&& type != QEvent::Drop) {
+				return base::EventFilterResult::Continue;
+			}
+			const auto drop = static_cast<QDropEvent*>(event.get());
+			const auto data = drop->mimeData();
+			if (!data || !validate(data)) {
+				return base::EventFilterResult::Continue;
+			}
+			if (type == QEvent::Drop && !apply(media, data)) {
+				return base::EventFilterResult::Continue;
+			}
+			drop->acceptProposedAction();
+			return base::EventFilterResult::Cancel;
+		});
+	};
+	const auto installDropToField = [=](
+			not_null<Ui::InputField*> field,
+			std::shared_ptr<PollMediaState> media,
+			ValidateFn validate,
+			ApplyDropFn apply) {
+		field->setMimeDataHook([=](
+				not_null<const QMimeData*> data,
+				Ui::InputField::MimeAction action) {
+			if (action == Ui::InputField::MimeAction::Check) {
+				return validate(data);
+			} else if (action == Ui::InputField::MimeAction::Insert) {
+				return apply(media, data);
+			}
+			Unexpected("Polls: action in MimeData hook.");
+		});
+	};
+	const auto applyPhotoOrVideoDrop = ApplyDropFn([=](
+			std::shared_ptr<PollMediaState> media,
+			not_null<const QMimeData*> data) {
+		auto list = FileListFromMimeData(
+			data,
+			_controller->session().premium());
+		if (list.error != Ui::PreparedList::Error::None
+			|| list.files.empty()) {
+			return false;
+		}
+		auto &file = list.files.front();
+		if (file.type == Ui::PreparedFile::Type::Photo) {
+			startPreparedPhotoUpload(media, std::move(file));
+			return true;
+		} else if (file.type == Ui::PreparedFile::Type::Video) {
+			startPreparedVideoUpload(media, std::move(file));
+			return true;
+		}
+		return false;
+	});
+	const auto validatePhotoOrVideo = ValidateFn([](
+			not_null<const QMimeData*> data) {
+		if (data->hasImage()) {
+			return true;
+		}
+		const auto urls = Core::ReadMimeUrls(data);
+		if (urls.size() != 1 || !urls.front().isLocalFile()) {
+			return false;
+		}
+		const auto file = Platform::File::UrlToLocal(urls.front());
+		const auto mime = Core::MimeTypeForFile(QFileInfo(file)).name();
+		return Core::IsMimeAcceptedForPhotoVideoAlbum(mime);
+	});
+	const auto installPhotoDropToWidget = [=](
+			not_null<QWidget*> widget,
+			std::shared_ptr<PollMediaState> media) {
+		installDropToWidget(
+			widget,
+			media,
+			validatePhotoOrVideo,
+			applyPhotoOrVideoDrop);
+	};
+	const auto installPhotoDropToField = [=](
+			not_null<Ui::InputField*> field,
+			std::shared_ptr<PollMediaState> media) {
+		field->setMimeDataHook([=](
+				not_null<const QMimeData*> data,
+				Ui::InputField::MimeAction action) {
+			using MimeAction = Ui::InputField::MimeAction;
+			const auto text = data->hasText()
+				? data->text()
+				: QString();
+			if (text.contains('\n')) {
+				if (action == MimeAction::Check) {
+					return true;
+				}
+				auto list = ParsePastedList(text);
+				if (list.empty()) {
+					return false;
+				}
+				field->setText(list.front());
+				field->forceProcessContentsChanges();
+				list.pop_front();
+				if (state->options) {
+					state->options->handlePaste(field, list);
+				}
+				return true;
+			}
+			if (action == MimeAction::Check) {
+				return validatePhotoOrVideo(data);
+			} else if (action == MimeAction::Insert) {
+				return applyPhotoOrVideoDrop(media, data);
+			}
+			Unexpected("Polls: action in MimeData hook.");
+		});
+	};
+	const auto applyFileDrop = ApplyDropFn([=](
+			std::shared_ptr<PollMediaState> media,
+			not_null<const QMimeData*> data) {
+		auto list = FileListFromMimeData(
+			data,
+			_controller->session().premium());
+		if (list.error == Ui::PreparedList::Error::TooLargeFile) {
+			const auto fileSize = list.files.empty()
+				? 0
+				: list.files.front().size;
+			_controller->show(Box(
+				FileSizeLimitBox,
+				&_controller->session(),
+				fileSize,
+				nullptr));
+			return false;
+		}
+		if (list.error != Ui::PreparedList::Error::None
+			|| list.files.empty()) {
+			return false;
+		}
+		auto &file = list.files.front();
+		if (file.type == Ui::PreparedFile::Type::Photo) {
+			startPreparedPhotoUpload(media, std::move(file));
+		} else if (file.type == Ui::PreparedFile::Type::Video) {
+			startPreparedVideoUpload(media, std::move(file));
+		} else {
+			startPreparedDocumentUpload(media, std::move(file));
+		}
+		return true;
+	});
+	const auto validateFile = ValidateFn(ValidateFileDragData);
+	const auto choosePhotoOrVideo = [=](
+			std::shared_ptr<PollMediaState> media) {
+		const auto callback = crl::guard(this, [=](
+				FileDialog::OpenResult &&result) {
+			const auto checkResult = [&](const Ui::PreparedList &list) {
+				using namespace Ui;
+				if (list.files.size() != 1) {
+					return false;
+				}
+				const auto type = list.files.front().type;
+				return (type == PreparedFile::Type::Photo)
+					|| (type == PreparedFile::Type::Video);
+			};
+			const auto showError = [=](tr::phrase<> text) {
+				showToast(text(tr::now));
+			};
+			auto list = Storage::PreparedFileFromFilesDialog(
+				std::move(result),
+				checkResult,
+				showError,
+				st::sendMediaPreviewSize,
+				_controller->session().premium());
+			if (!list) {
+				return;
+			}
+			auto &file = list->files.front();
+			if (file.type == Ui::PreparedFile::Type::Photo) {
+				applyPreparedPhotoList(media, std::move(*list));
+			} else {
+				startPreparedVideoUpload(media, std::move(file));
+			}
+		});
+		FileDialog::GetOpenPath(
+			this,
+			tr::lng_attach_photo_or_video(tr::now),
+			FileDialog::PhotoVideoFilesFilter(),
+			callback);
+	};
+	const auto chooseDocument = [=](std::shared_ptr<PollMediaState> media) {
+		const auto callback = crl::guard(this, [=](
+				FileDialog::OpenResult &&result) {
+			if (result.paths.isEmpty()) {
+				return;
+			}
+			auto list = Storage::PrepareMediaList(
+				result.paths.mid(0, 1),
+				st::sendMediaPreviewSize,
+				_controller->session().premium());
+			if (list.error == Ui::PreparedList::Error::TooLargeFile) {
+				const auto fileSize = list.files.empty()
+					? 0
+					: list.files.front().size;
+				_controller->show(Box(
+					FileSizeLimitBox,
+					&_controller->session(),
+					fileSize,
+					nullptr));
+				return;
+			} else if (list.error != Ui::PreparedList::Error::None
+				|| list.files.empty()) {
+				return;
+			}
+			startPreparedDocumentUpload(
+				media,
+				std::move(list.files.front()));
+		});
+		FileDialog::GetOpenPath(
+			this,
+			tr::lng_attach_file(tr::now),
+			FileDialog::AllFilesFilter(),
+			callback);
+	};
+	const auto applyResolvedWebPage = [=](
+			std::shared_ptr<PollMediaState> media,
+			not_null<WebPageData*> page) {
+		auto pollMedia = PollMedia();
+		pollMedia.webpage = page;
+		pollMedia.url = page->url.isEmpty() ? media->media.url : page->url;
+		auto thumbnail = page->photo
+			? Ui::MakePhotoThumbnailCenterCrop(page->photo, FullMsgId())
+			: Poll::MakeLinkThumbnail();
+		const auto rounded = (page->photo != nullptr);
+		setMedia(media, pollMedia, std::move(thumbnail), rounded);
+	};
+	const auto subscribeToWebPageUpdates = [=](
+			std::shared_ptr<PollMediaState> media,
+			not_null<WebPageData*> page) {
+		const auto raw = media.get();
+		const auto weak = std::weak_ptr<PollMediaState>(media);
+		_controller->session().data().webPageUpdates(
+		) | rpl::filter([=](not_null<WebPageData*> updated) {
+			const auto locked = weak.lock();
+			return locked
+				&& (updated == page)
+				&& (locked->media.webpage == page);
+		}) | rpl::on_next([=] {
+			if (const auto locked = weak.lock()) {
+				applyResolvedWebPage(locked, page);
+			}
+		}, state->webPageLifetimes[raw]);
+	};
+	const auto resolveLink = [=](
+			std::shared_ptr<PollMediaState> media,
+			QString url) {
+		const auto raw = media.get();
+		const auto weak = std::weak_ptr<PollMediaState>(media);
+		state->webPageLifetimes[raw].destroy();
+		const auto token = media->token;
+		const auto apply = [=](const QString &resolvedUrl) {
+			const auto locked = weak.lock();
+			if (!locked || locked->token != token || resolvedUrl != url) {
+				return;
+			}
+			const auto cached = state->webpageResolver->lookup(url);
+			if (!cached || !*cached) {
+				return;
+			}
+			const auto page = *cached;
+			applyResolvedWebPage(locked, page);
+			subscribeToWebPageUpdates(locked, page);
+		};
+		if (const auto cached = state->webpageResolver->lookup(url)) {
+			if (*cached) {
+				applyResolvedWebPage(media, *cached);
+				subscribeToWebPageUpdates(media, *cached);
+			}
+			return;
+		}
+		state->webPageLifetimes[raw]
+			= state->webpageResolver->resolved(
+			) | rpl::filter([=](const QString &resolvedUrl) {
+				const auto locked = weak.lock();
+				return locked
+					&& (resolvedUrl == url)
+					&& (locked->token == token);
+			}) | rpl::take(1) | rpl::on_next(apply);
+		state->webpageResolver->request(url);
+	};
+	const auto chooseLink = [=](std::shared_ptr<PollMediaState> media) {
+		const auto initial = media->media.url;
+		const auto callback = crl::guard(this, [=](QString url) {
+			auto pollMedia = PollMedia();
+			pollMedia.url = url;
+			setMedia(
+				media,
+				pollMedia,
+				Poll::MakeLinkThumbnail(),
+				false);
+			resolveLink(media, url);
+		});
+		_controller->show(Box(
+			Poll::AddPollOptionLinkBox,
+			initial,
+			callback));
+	};
+	const auto clearMedia = [=](std::shared_ptr<PollMediaState> media) {
+		auto toCancel = std::vector<FullMsgId>();
+		for (auto i = state->uploads.begin(); i != state->uploads.end();) {
+			if (i->second.media.lock() == media) {
+				toCancel.push_back(i->first);
+				i = state->uploads.erase(i);
+			} else {
+				++i;
+			}
+		}
+		for (const auto &id : toCancel) {
+			_controller->session().uploader().cancel(id);
+		}
+		state->webPageLifetimes.remove(media.get());
+		setMedia(media, PollMedia(), nullptr, false);
+	};
+	const auto chooseLocation = [=](
+			std::shared_ptr<PollMediaState> media) {
+		const auto session = &_controller->session();
+		const auto &appConfig = session->appConfig();
+		auto map = appConfig.get<base::flat_map<QString, QString>>(
+			u"tdesktop_config_map"_q,
+			base::flat_map<QString, QString>());
+		const auto config = Ui::LocationPickerConfig{
+			.mapsToken = map[u"maps"_q],
+			.geoToken = map[u"geo"_q],
+		};
+		const auto applyGeo = [=](float64 lat, float64 lon) {
+			const auto point = Data::LocationPoint(
+				lat,
+				lon,
+				Data::LocationPoint::NoAccessHash);
+			auto pollMedia = PollMedia();
+			pollMedia.geo = point;
+			const auto cloudImage = session->data().location(point);
+			auto thumbnail = Ui::MakeGeoThumbnailWithPin(
+				cloudImage,
+				session,
+				Data::FileOrigin());
+			setMedia(media, pollMedia, std::move(thumbnail), true);
+		};
+		if (base::IsCtrlPressed()) {
+			const auto lat = 48.8566 + base::RandomValue<uint32>()
+				/ float64(std::numeric_limits<uint32>::max()) * 0.02 - 0.01;
+			const auto lon = 2.3522 + base::RandomValue<uint32>()
+				/ float64(std::numeric_limits<uint32>::max()) * 0.02 - 0.01;
+			applyGeo(lat, lon);
+			return;
+		}
+		if (!Ui::LocationPicker::Available(config)) {
+			return;
+		}
+		Ui::LocationPicker::Show({
+			.parent = _controller->widget().get(),
+			.config = config,
+			.chooseLabel = tr::lng_maps_point_send(),
+			.session = session,
+			.callback = crl::guard(this, [=](Data::InputVenue venue) {
+				applyGeo(venue.lat, venue.lon);
+			}),
+			.quit = [] { Shortcuts::Launch(Shortcuts::Command::Quit); },
+			.storageId = session->local().resolveStorageIdBots(),
+			.closeRequests = _controller->content()->death(),
+		});
+	};
+	const auto showMediaMenu = [=](
+			not_null<Ui::RpWidget*> button,
+			std::shared_ptr<PollMediaState> media,
+			bool allowDocuments = false,
+			bool allowStickers = true) {
+		if (HistoryView::ShowPollMediaPreview(_controller, media, {
+			.choosePhotoOrVideo = [=] { choosePhotoOrVideo(media); },
+			.chooseDocument = [=] { chooseDocument(media); },
+			.chooseSticker = [=] {
+				showStickerPanel(button, media);
+			},
+			.editPhoto = crl::guard(this, [=](Ui::PreparedList list) {
+				applyPreparedPhotoList(media, std::move(list));
+			}),
+			.remove = [=] { clearMedia(media); },
+		})) {
+			return;
+		}
+		state->mediaMenu = base::make_unique_q<Ui::PopupMenu>(
+			button,
+			st::popupMenuWithIcons);
+		state->mediaMenu->setForcedOrigin(
+			Ui::PanelAnimation::Origin::TopRight);
+		state->mediaMenu->addAction(
+			tr::lng_attach_photo_or_video(tr::now),
+			[=] { choosePhotoOrVideo(media); },
+			&st::menuIconPhoto);
+		if (allowDocuments) {
+			state->mediaMenu->addAction(
+				tr::lng_attach_file(tr::now),
+				[=] { chooseDocument(media); },
+				&st::menuIconFile);
+		}
+		{
+			const auto &appConfig = _controller->session().appConfig();
+			auto map = appConfig.get<base::flat_map<QString, QString>>(
+				u"tdesktop_config_map"_q,
+				base::flat_map<QString, QString>());
+			const auto config = Ui::LocationPickerConfig{
+				.mapsToken = map[u"maps"_q],
+				.geoToken = map[u"geo"_q],
+			};
+			if (Ui::LocationPicker::Available(config)) {
+				state->mediaMenu->addAction(
+					tr::lng_maps_point(tr::now),
+					[=] { chooseLocation(media); },
+					&st::menuIconAddress);
+			}
+		}
+		if (allowStickers) {
+			state->mediaMenu->addAction(
+				tr::lng_chat_intro_choose_sticker(tr::now),
+				[=] { showStickerPanel(button, media); },
+				&st::menuIconStickers);
+		}
+		state->mediaMenu->addAction(
+			tr::lng_polls_create_option_link(tr::now),
+			[=] { chooseLink(media); },
+			&st::menuIconLink);
+		if (media->media || media->uploading) {
+			state->mediaMenu->addAction(
+				tr::lng_box_remove(tr::now),
+				[=] { clearMedia(media); },
+				&st::menuIconDelete);
+		}
+		state->mediaMenu->popup(QCursor::pos());
+	};
+	const auto addMediaButton = [=](
+			not_null<Ui::InputField*> field,
+			std::shared_ptr<PollMediaState> media) {
+		const auto button = Ui::CreateChild<PollMediaButton>(
+			field,
+			st::pollAttach,
+			media);
+		button->show();
+		installDropToField(field, media, validateFile, applyFileDrop);
+		installDropToWidget(button, media, validateFile, applyFileDrop);
+		field->sizeValue(
+		) | rpl::on_next([=](QSize size) {
+			button->moveToRight(
+				st::createPollAttachPosition.x(),
+				st::createPollAttachPosition.y(),
+				size.width());
+		}, button->lifetime());
+		button->clicks(
+		) | rpl::on_next([=](Qt::MouseButton buttonType) {
+			if (buttonType != Qt::LeftButton) {
+				return;
+			}
+			showMediaMenu(button, media, true, false);
+		}, button->lifetime());
+	};
+
 	const auto question = setupQuestion(container);
+	const auto description = setupDescription(container);
+	addMediaButton(description, state->descriptionMedia);
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
 	container->add(
@@ -1016,18 +2723,24 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			tr::lng_polls_create_options(),
 			st::defaultSubsectionTitle),
 		st::createPollFieldTitlePadding);
-	const auto options = lifetime().make_state<Options>(
+	state->options = std::make_unique<Options>(
 		this,
 		container,
 		_controller,
 		_emojiPanel ? _emojiPanel.get() : nullptr,
-		(_chosen & PollData::Flag::Quiz));
+		(_chosen & PollData::Flag::Quiz),
+		showMediaMenu,
+		installPhotoDropToField,
+		installPhotoDropToWidget);
+	const auto options = state->options.get();
 	auto limit = options->usedCount() | rpl::after_next([=](int count) {
 		setCloseByEscape(!count);
 		setCloseByOutsideClick(!count);
 	}) | rpl::map([=](int count) {
-		return (count < kMaxOptionsCount)
-			? tr::lng_polls_create_limit(tr::now, lt_count, kMaxOptionsCount - count)
+		const auto appConfig = &_controller->session().appConfig();
+		const auto max = appConfig->pollOptionsLimit();
+		return (count < max)
+			? tr::lng_polls_create_limit(tr::now, lt_count, max - count)
 			: tr::lng_polls_create_maximum(tr::now);
 	}) | rpl::after_next([=] {
 		container->resizeToWidth(container->widthNoMargins());
@@ -1042,48 +2755,311 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			st::createPollLimitPadding));
 
 	question->tabbed(
-	) | rpl::start_with_next([=] {
-		options->focusFirst();
+	) | rpl::on_next([=](not_null<bool*> handled) {
+		description->setFocus();
+		*handled = true;
 	}, question->lifetime());
 
+	description->tabbed(
+	) | rpl::on_next([=](not_null<bool*> handled) {
+		options->focusFirst();
+		*handled = true;
+	}, description->lifetime());
+
 	Ui::AddSkip(container);
 	Ui::AddSubsectionTitle(container, tr::lng_polls_create_settings());
+	const auto isBroadcastChannel = _peer->isChannel()
+		&& !_peer->isMegagroup();
 
-	const auto anonymous = (!(_disabled & PollData::Flag::PublicVotes))
-		? container->add(
-			object_ptr<Ui::Checkbox>(
-				container,
-				tr::lng_polls_create_anonymous(tr::now),
-				!(_chosen & PollData::Flag::PublicVotes),
-				st::defaultCheckbox),
-			st::createPollCheckboxMargin)
+	const auto showWhoVoted = (!(_disabled & PollData::Flag::PublicVotes))
+		? AddPollToggleButton(
+			container,
+			tr::lng_polls_create_show_who_voted(),
+			tr::lng_polls_create_show_who_voted_about(),
+			{
+				.icon = &st::pollBoxFilledPollViewIcon,
+				.background = &st::settingsIconBg4,
+			},
+			rpl::single(!!(_chosen & PollData::Flag::PublicVotes))
+				| rpl::then(state->showWhoVotedForceOn.events()),
+			st::detailedSettingsButtonStyle).get()
+		: nullptr;
+	const auto multiple = AddPollToggleButton(
+		container,
+		tr::lng_polls_create_allow_multiple_answers(),
+		tr::lng_polls_create_allow_multiple_answers_about(),
+		{
+			.icon = &st::pollBoxFilledPollMultipleIcon,
+			.background = &st::settingsIconBg3,
+		},
+		rpl::single(!!(_chosen & PollData::Flag::MultiChoice))
+			| rpl::then(state->multipleForceOff.events()),
+		st::detailedSettingsButtonStyle);
+	const auto addOptions = (!(_disabled & PollData::Flag::OpenAnswers))
+		? AddPollToggleButton(
+			container,
+			tr::lng_polls_create_allow_adding_options(),
+			tr::lng_polls_create_allow_adding_options_about(),
+			{
+				.icon = &st::pollBoxFilledPollAddIcon,
+				.background = &st::settingsIconBg4,
+			},
+			rpl::single(!!(_chosen & PollData::Flag::OpenAnswers))
+				| rpl::then(state->addOptionsForceOff.events()),
+			st::detailedSettingsButtonStyle).get()
+		: nullptr;
+	const auto revoting = AddPollToggleButton(
+		container,
+		tr::lng_polls_create_allow_revoting(),
+		tr::lng_polls_create_allow_revoting_about(),
+		{
+			.icon = &st::pollBoxFilledPollRevoteIcon,
+			.background = &st::settingsIconBg6,
+		},
+		rpl::single(!(_chosen & PollData::Flag::RevotingDisabled))
+			| rpl::then(state->revotingForceOff.events()),
+		st::detailedSettingsButtonStyle);
+	const auto shuffle = AddPollToggleButton(
+		container,
+		tr::lng_polls_create_shuffle_options(),
+		tr::lng_polls_create_shuffle_options_about(),
+		{
+			.icon = &st::pollBoxFilledPollShuffleIcon,
+			.background = &st::settingsIconBg8,
+		},
+		rpl::single(!!(_chosen & PollData::Flag::ShuffleAnswers)),
+		st::detailedSettingsButtonStyle);
+	const auto quiz = AddPollToggleButton(
+		container,
+		tr::lng_polls_create_set_correct_answer(),
+		rpl::single(multiple->toggled()) | rpl::then(
+			multiple->toggledChanges()
+		) | rpl::map([](bool multi) {
+			return multi
+				? tr::lng_polls_create_set_correct_answer_about_multi(
+					tr::now)
+				: tr::lng_polls_create_set_correct_answer_about(tr::now);
+		}),
+		{
+			.icon = &st::pollBoxFilledPollCorrectIcon,
+			.background = &st::settingsIconBg2,
+		},
+		rpl::single(!!(_chosen & PollData::Flag::Quiz))
+			| rpl::then(state->quizForceOff.events()),
+		st::detailedSettingsButtonStyle);
+
+	const auto show = uiShow();
+
+	const auto restrictToSubscribers = isBroadcastChannel
+		? AddPollToggleButton(
+			container,
+			tr::lng_polls_create_restrict_to_subscribers(),
+			tr::lng_polls_create_restrict_to_subscribers_about(),
+			{
+				.icon = &st::pollBoxFilledPollSubscribersIcon,
+				.background = &st::settingsIconBg5,
+			},
+			rpl::single(!!(_chosen & PollData::Flag::SubscribersOnly)),
+			st::detailedSettingsButtonStyle).get()
+		: nullptr;
+	const auto limitByCountry = isBroadcastChannel
+		? AddPollToggleButton(
+			container,
+			tr::lng_polls_create_limit_by_country(),
+			tr::lng_polls_create_limit_by_country_about(),
+			{
+				.icon = &st::pollBoxFilledPollCountryIcon,
+				.background = &st::settingsIconBg4,
+			},
+			rpl::single(false),
+			st::detailedSettingsButtonStyle).get()
 		: nullptr;
-	const auto hasMultiple = !(_chosen & PollData::Flag::Quiz)
-		|| !(_disabled & PollData::Flag::Quiz);
-	const auto multiple = hasMultiple
+	const auto countriesWrap = limitByCountry
 		? container->add(
-			object_ptr<Ui::Checkbox>(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 				container,
-				tr::lng_polls_create_multiple_choice(tr::now),
-				(_chosen & PollData::Flag::MultiChoice),
-				st::defaultCheckbox),
-			st::createPollCheckboxMargin)
+				object_ptr<Ui::VerticalLayout>(container)))
 		: nullptr;
-	const auto quiz = container->add(
-		object_ptr<Ui::Checkbox>(
+	const auto countriesButton = [=] {
+		if (!countriesWrap) {
+			return (Ui::SettingsButton*)(nullptr);
+		}
+		const auto inner = countriesWrap->entity();
+		return AddButtonWithLabel(
+			inner,
+			tr::lng_polls_create_allowed_countries(),
+			state->countriesValue.value(
+			) | rpl::map([=](const std::vector<QString> &countries) {
+				if (countries.empty()) {
+					return QString();
+				}
+				if (countries.size() == 1) {
+					return Countries::Instance().countryNameByISO2(
+						countries.front(),
+						Countries::Naming::Polls);
+				}
+				return tr::lng_polls_create_countries_count(
+					tr::now,
+					lt_count,
+					countries.size());
+			}),
+			st::settingsButtonNoIcon).get();
+	}();
+	if (countriesWrap) {
+		countriesWrap->toggleOn(
+			rpl::single(limitByCountry->toggled())
+				| rpl::then(limitByCountry->toggledChanges()));
+	}
+	if (countriesButton) {
+		countriesButton->setClickedCallback([=] {
+			const auto done = [=](std::vector<QString> countries) {
+				state->countriesValue = std::move(countries);
+			};
+			const auto limit
+				= _controller->session().appConfig().pollCountriesMax();
+			const auto checkError = [=](int count) {
+				if (count >= limit) {
+					show->showToast(tr::lng_polls_create_countries_limit(
+						tr::now,
+						lt_count,
+						limit));
+					return true;
+				}
+				return false;
+			};
+			show->show(Box(
+				Ui::SelectCountriesBox,
+				state->countriesValue.current(),
+				done,
+				checkError,
+				Countries::Naming::Polls));
+		});
+	}
+
+	const auto duration = AddPollToggleButton(
+		container,
+		tr::lng_polls_create_limit_duration(),
+		tr::lng_polls_create_limit_duration_about(),
+		{
+			.icon = &st::pollBoxFilledPollDeadlineIcon,
+			.background = &st::settingsIconBg1,
+		},
+		rpl::single(false),
+		st::detailedSettingsButtonStyle);
+
+	const auto durationWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			container,
-			tr::lng_polls_create_quiz_mode(tr::now),
-			(_chosen & PollData::Flag::Quiz),
-			st::defaultCheckbox),
-		st::createPollCheckboxMargin);
+			object_ptr<Ui::VerticalLayout>(container))
+	)->toggleOn(
+		rpl::single(duration->toggled())
+			| rpl::then(duration->toggledChanges()));
+	const auto durationInner = durationWrap->entity();
+
+	auto pollEndsLabelText = state->closePeriod.value(
+	) | rpl::map([=](int) {
+		const auto date = state->closeDate.current();
+		if (date > 0) {
+			return langDateTime(base::unixtime::parse(date));
+		}
+		const auto period = state->closePeriod.current();
+		if (period > 0) {
+			const auto target = base::unixtime::now() + period;
+			return langDateTime(base::unixtime::parse(target));
+		}
+		return QString();
+	});
+	state->closeDate.value(
+	) | rpl::on_next([=](TimeId) {
+		state->closePeriod.force_assign(state->closePeriod.current());
+	}, durationInner->lifetime());
+
+	const auto pollEndsLabel = AddButtonWithLabel(
+		durationInner,
+		tr::lng_polls_create_poll_ends(),
+		std::move(pollEndsLabelText),
+		st::settingsButtonNoIcon);
+
+	pollEndsLabel->setClickedCallback([=] {
+		state->durationMenu = base::make_unique_q<Ui::PopupMenu>(
+			pollEndsLabel,
+			st::popupMenuWithIcons);
+		const auto &menuSt = state->durationMenu->st().menu;
+		const auto presets = {
+			3600,
+			3 * 3600,
+			8 * 3600,
+			24 * 3600,
+			72 * 3600,
+		};
+		for (const auto seconds : presets) {
+			const auto text = Ui::FormatMuteFor(seconds);
+			auto item = base::make_unique_q<DurationIconAction>(
+				state->durationMenu->menu(),
+				menuSt,
+				Ui::Menu::CreateAction(
+					state->durationMenu->menu().get(),
+					text,
+					[=] {
+						state->closePeriod = seconds;
+						state->closeDate = TimeId(0);
+					}),
+				Ui::FormatTTLTiny(seconds));
+			state->durationMenu->addAction(std::move(item));
+		}
+		state->durationMenu->addAction(
+			tr::lng_polls_create_duration_custom(tr::now),
+			[=] {
+				const auto now = base::unixtime::now();
+				const auto current = (state->closeDate.current() > now)
+					? state->closeDate.current()
+					: (state->closePeriod.current() > 0)
+					? (now + state->closePeriod.current())
+					: (now + 24 * 3600);
+				show->show(Box([=](not_null<Ui::GenericBox*> box) {
+					Ui::ChooseDateTimeBox(box, {
+						.title = tr::lng_polls_create_deadline_title(),
+						.submit = tr::lng_polls_create_deadline_button(),
+						.done = [=](TimeId time) {
+							state->closeDate = time;
+							state->closePeriod = 0;
+							box->closeBox();
+						},
+						.min = [=] { return base::unixtime::now() + 60; },
+						.time = current,
+						.max = [=] {
+							return base::unixtime::now() + 365 * 24 * 3600;
+						},
+					});
+				}));
+			},
+			&st::menuIconCustomize);
+		state->durationMenu->popup(QCursor::pos());
+	});
+
+	duration->toggledChanges(
+	) | rpl::on_next([=](bool checked) {
+		if (checked && state->closePeriod.current() == 0
+				&& state->closeDate.current() == 0) {
+			state->closePeriod = 24 * 3600;
+		}
+	}, duration->lifetime());
+
+	const auto hideResults = durationInner->add(
+		object_ptr<Ui::SettingsButton>(
+			durationInner,
+			tr::lng_polls_create_hide_results(),
+			st::settingsButtonNoIcon)
+	)->toggleOn(rpl::single(false));
 
 	const auto solution = setupSolution(
 		container,
-		rpl::single(quiz->checked()) | rpl::then(quiz->checkedChanges()));
+		rpl::single(quiz->toggled()) | rpl::then(quiz->toggledChanges()));
+	addMediaButton(solution, state->solutionMedia);
 
 	options->tabbed(
-	) | rpl::start_with_next([=] {
-		if (quiz->checked()) {
+	) | rpl::on_next([=] {
+		if (quiz->toggled()) {
 			solution->setFocus();
 		} else {
 			question->setFocus();
@@ -1091,53 +3067,89 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 	}, question->lifetime());
 
 	solution->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=](not_null<bool*> handled) {
 		question->setFocus();
+		*handled = true;
 	}, solution->lifetime());
 
-	quiz->setDisabled(_disabled & PollData::Flag::Quiz);
-	if (multiple) {
-		multiple->setDisabled((_disabled & PollData::Flag::MultiChoice)
-			|| (_chosen & PollData::Flag::Quiz));
-		multiple->events(
-		) | rpl::filter([=](not_null<QEvent*> e) {
-			return (e->type() == QEvent::MouseButtonPress)
-				&& quiz->checked();
-		}) | rpl::start_with_next([show = uiShow()] {
-			show->showToast(tr::lng_polls_create_one_answer(tr::now));
-		}, multiple->lifetime());
+	const auto updateAddOptionsLocked = [=] {
+		if (addOptions) {
+			const auto locked = (_disabled & PollData::Flag::OpenAnswers)
+				|| quiz->toggled()
+				|| (showWhoVoted && !showWhoVoted->toggled());
+			addOptions->setToggleLocked(locked);
+			if (locked) {
+				state->addOptionsForceOff.fire(false);
+			}
+		}
+	};
+	const auto updateQuizDependentLocks = [=](bool checked) {
+		updateAddOptionsLocked();
+		revoting->setToggleLocked(
+			_disabled & PollData::Flag::RevotingDisabled);
+	};
+	quiz->setToggleLocked(_disabled & PollData::Flag::Quiz);
+	shuffle->setToggleLocked(_disabled & PollData::Flag::ShuffleAnswers);
+	if (restrictToSubscribers) {
+		restrictToSubscribers->setToggleLocked(
+			_disabled & PollData::Flag::SubscribersOnly);
 	}
+	updateQuizDependentLocks(quiz->toggled());
 
 	using namespace rpl::mappers;
-	quiz->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
-		if (multiple) {
-			if (checked && multiple->checked()) {
-				multiple->setChecked(false);
-			}
-			multiple->setDisabled(checked
-				|| (_disabled & PollData::Flag::MultiChoice));
+	quiz->toggledChanges(
+	) | rpl::on_next([=](bool checked) {
+		if (checked && (_disabled & PollData::Flag::Quiz)) {
+			state->quizForceOff.fire(false);
+			return;
 		}
-		options->enableChooseCorrect(checked);
+		if (checked) {
+			state->addOptionsForceOff.fire(false);
+			state->revotingForceOff.fire(false);
+			solution->setFocus();
+		}
+		updateQuizDependentLocks(checked);
+		options->enableChooseCorrect(checked, multiple->toggled());
 	}, quiz->lifetime());
 
+	multiple->toggledChanges(
+	) | rpl::on_next([=](bool checked) {
+		if (quiz->toggled()) {
+			options->enableChooseCorrect(true, checked);
+		}
+	}, multiple->lifetime());
+
+	if (addOptions && showWhoVoted) {
+		updateAddOptionsLocked();
+		showWhoVoted->toggledChanges(
+		) | rpl::on_next([=](bool) {
+			updateAddOptionsLocked();
+		}, showWhoVoted->lifetime());
+	}
+
 	const auto isValidQuestion = [=] {
 		const auto text = question->getLastText().trimmed();
 		return !text.isEmpty() && (text.size() <= kQuestionLimit);
 	};
 	question->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (isValidQuestion()) {
-			options->focusFirst();
+			description->setFocus();
 		}
 	}, question->lifetime());
 
+	description->submits(
+	) | rpl::on_next([=] {
+		options->focusFirst();
+	}, description->lifetime());
+
 	_setInnerFocus = [=] {
 		question->setFocusFast();
 	};
 
 	const auto collectResult = [=] {
-		const auto textWithTags = question->getTextWithTags();
+		const auto textWithTags = question->getTextWithAppliedMarkdown();
+		const auto descriptionWithTags = description->getTextWithTags();
 		using Flag = PollData::Flag;
 		auto result = PollData(&_controller->session().data(), id);
 		result.question.text = textWithTags.text;
@@ -1145,64 +3157,184 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			textWithTags.tags);
 		TextUtilities::Trim(result.question);
 		result.answers = options->toPollAnswers();
-		const auto solutionWithTags = quiz->checked()
+		const auto solutionWithTags = quiz->toggled()
 			? solution->getTextWithAppliedMarkdown()
 			: TextWithTags();
 		result.solution = TextWithEntities{
 			solutionWithTags.text,
 			TextUtilities::ConvertTextTagsToEntities(solutionWithTags.tags)
 		};
-		const auto publicVotes = (anonymous && !anonymous->checked());
-		const auto multiChoice = (multiple && multiple->checked());
+		result.attachedMedia = state->descriptionMedia->media;
+		if (quiz->toggled()) {
+			result.solutionMedia = state->solutionMedia->media;
+		}
+		if (duration->toggled()) {
+			const auto closeDate = state->closeDate.current();
+			const auto closePeriod = state->closePeriod.current();
+			if (closeDate > 0) {
+				result.closeDate = closeDate;
+				result.closePeriod = closeDate - base::unixtime::now();
+			} else if (closePeriod > 0) {
+				result.closePeriod = closePeriod;
+				result.closeDate = base::unixtime::now() + closePeriod;
+			}
+		}
+		const auto publicVotes = (showWhoVoted && showWhoVoted->toggled());
+		const auto multiChoice = multiple->toggled();
+		const auto subscribersOnly = (restrictToSubscribers
+			&& restrictToSubscribers->toggled());
+		const auto hideResultsEnabled = duration->toggled()
+			&& hideResults->toggled();
+		result.countries = (limitByCountry
+			&& limitByCountry->toggled())
+			? state->countriesValue.current()
+			: std::vector<QString>();
 		result.setFlags(Flag(0)
 			| (publicVotes ? Flag::PublicVotes : Flag(0))
 			| (multiChoice ? Flag::MultiChoice : Flag(0))
-			| (quiz->checked() ? Flag::Quiz : Flag(0)));
-		return result;
+			| ((addOptions && addOptions->toggled()) ? Flag::OpenAnswers : Flag(0))
+			| (!revoting->toggled() ? Flag::RevotingDisabled : Flag(0))
+			| (shuffle->toggled() ? Flag::ShuffleAnswers : Flag(0))
+			| (quiz->toggled() ? Flag::Quiz : Flag(0))
+			| (subscribersOnly ? Flag::SubscribersOnly : Flag(0))
+			| (hideResultsEnabled
+				? Flag::HideResultsUntilClose
+				: Flag(0)));
+		auto text = TextWithEntities{
+			descriptionWithTags.text,
+			TextUtilities::ConvertTextTagsToEntities(
+				descriptionWithTags.tags),
+		};
+		TextUtilities::Trim(text);
+		return Result{
+			std::move(result),
+			std::move(text),
+			Api::SendOptions(),
+		};
 	};
 	const auto collectError = [=] {
 		if (isValidQuestion()) {
-			*error &= ~Error::Question;
+			state->error &= ~Error::Question;
 		} else {
-			*error |= Error::Question;
+			state->error |= Error::Question;
 		}
 		if (!options->hasOptions()) {
-			*error |= Error::Options;
+			state->error |= Error::Options;
 		} else if (!options->isValid()) {
-			*error |= Error::Other;
+			state->error |= Error::Other;
 		} else {
-			*error &= ~(Error::Options | Error::Other);
+			state->error &= ~(Error::Options | Error::Other);
 		}
-		if (quiz->checked() && !options->hasCorrect()) {
-			*error |= Error::Correct;
+		if (quiz->toggled() && !options->hasCorrect()) {
+			state->error |= Error::Correct;
 		} else {
-			*error &= ~Error::Correct;
+			state->error &= ~Error::Correct;
 		}
-		if (quiz->checked()
+		if (quiz->toggled()
 			&& solution->getLastText().trimmed().size() > kSolutionLimit) {
-			*error |= Error::Solution;
+			state->error |= Error::Solution;
+		} else {
+			state->error &= ~Error::Solution;
+		}
+		if (state->descriptionMedia->uploading
+			|| (quiz->toggled() && state->solutionMedia->uploading)
+			|| options->hasUploadingMedia()) {
+			state->error |= Error::Media;
+		} else {
+			state->error &= ~Error::Media;
+		}
+		if (duration->toggled()) {
+			const auto now = base::unixtime::now();
+			const auto closeDate = state->closeDate.current();
+			const auto closePeriod = state->closePeriod.current();
+			const auto deadline = (closeDate > 0)
+				? closeDate
+				: (closePeriod > 0)
+				? (now + closePeriod)
+				: 0;
+			if (deadline > 0 && deadline <= now) {
+				state->error |= Error::Deadline;
+			} else {
+				state->error &= ~Error::Deadline;
+			}
+		} else {
+			state->error &= ~Error::Deadline;
+		}
+		if (limitByCountry
+			&& limitByCountry->toggled()
+			&& state->countriesValue.current().empty()) {
+			state->error |= Error::Country;
 		} else {
-			*error &= ~Error::Solution;
+			state->error &= ~Error::Country;
 		}
 	};
 	const auto showError = [show = uiShow()](
 			tr::phrase<> text) {
 		show->showToast(text(tr::now));
 	};
+	_refreshExpiredMedia = [=] {
+		const auto forceRefresh = [](
+				const std::shared_ptr<PollMediaState> &m) {
+			if (m->media && m->reupload) {
+				m->reupload();
+			}
+		};
+		forceRefresh(state->descriptionMedia);
+		forceRefresh(state->solutionMedia);
+		options->refreshStaleMedia(0);
+	};
 	const auto send = [=](Api::SendOptions sendOptions) {
+		const auto kStaleTimeout = kMediaUploadMaxAge;
+		auto refreshedAny = false;
+		const auto tryRefresh = [&](
+				const std::shared_ptr<PollMediaState> &m) {
+			if (m->media
+				&& m->uploadedAt > 0
+				&& (crl::now() - m->uploadedAt > kStaleTimeout)
+				&& m->reupload) {
+				m->reupload();
+				refreshedAny = true;
+			}
+		};
+		tryRefresh(state->descriptionMedia);
+		if (quiz->toggled()) {
+			tryRefresh(state->solutionMedia);
+		}
+		if (options->refreshStaleMedia(kStaleTimeout)) {
+			refreshedAny = true;
+		}
+		if (refreshedAny) {
+			collectError();
+			if (state->error & Error::Media) {
+				ShowMediaUploadingToast();
+			}
+			return;
+		}
 		collectError();
-		if (*error & Error::Question) {
+		if (state->error & Error::Question) {
 			showError(tr::lng_polls_choose_question);
 			question->setFocus();
-		} else if (*error & Error::Options) {
+		} else if (state->error & Error::Options) {
 			showError(tr::lng_polls_choose_answers);
 			options->focusFirst();
-		} else if (*error & Error::Correct) {
+		} else if (state->error & Error::Correct) {
 			showError(tr::lng_polls_choose_correct);
-		} else if (*error & Error::Solution) {
+			scrollToWidget(options->layoutWidget());
+		} else if (state->error & Error::Solution) {
 			solution->showError();
-		} else if (!*error) {
-			_submitRequests.fire({ collectResult(), sendOptions });
+		} else if (state->error & Error::Media) {
+			ShowMediaUploadingToast();
+		} else if (state->error & Error::Deadline) {
+			showError(tr::lng_polls_create_deadline_expired);
+		} else if (state->error & Error::Country) {
+			showError(tr::lng_polls_create_choose_country);
+			if (countriesButton) {
+				scrollToWidget(countriesButton);
+			}
+		} else if (!state->error) {
+			auto result = collectResult();
+			result.options = sendOptions;
+			_submitRequests.fire(std::move(result));
 		}
 	};
 	const auto sendAction = SendMenu::DefaultCallback(
@@ -1210,13 +3342,13 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 		crl::guard(this, send));
 
 	options->scrollToWidget(
-	) | rpl::start_with_next([=](not_null<QWidget*> widget) {
+	) | rpl::on_next([=](not_null<QWidget*> widget) {
 		scrollToWidget(widget);
 	}, lifetime());
 
 	options->backspaceInFront(
-	) | rpl::start_with_next([=] {
-		FocusAtEnd(question);
+	) | rpl::on_next([=] {
+		FocusAtEnd(description);
 	}, lifetime());
 
 	const auto isNormal = (_sendType == Api::SendType::Normal);
@@ -1226,13 +3358,14 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			_sendMenuDetails());
 	};
 	const auto submit = addButton(
-		(isNormal
-			? tr::lng_polls_create_button()
-			: tr::lng_schedule_button()),
+		tr::lng_polls_create_button(),
 		[=] { isNormal ? send({}) : schedule(); });
+	submit->setText(PaidSendButtonText(_starsRequired.value(), isNormal
+		? tr::lng_polls_create_button()
+		: tr::lng_schedule_button()));
 	const auto sendMenuDetails = [=] {
 		collectError();
-		return (*error) ? SendMenu::Details() : _sendMenuDetails();
+		return (state->error) ? SendMenu::Details() : _sendMenuDetails();
 	};
 	SendMenu::SetupMenuAndShortcuts(
 		submit.data(),
@@ -1241,6 +3374,29 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 		sendAction);
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
 
+	if (showWhoVoted) {
+		showWhoVoted->finishAnimating();
+	}
+	multiple->finishAnimating();
+	if (addOptions) {
+		addOptions->finishAnimating();
+	}
+	revoting->finishAnimating();
+	shuffle->finishAnimating();
+	quiz->finishAnimating();
+	duration->finishAnimating();
+	durationWrap->finishAnimating();
+	hideResults->finishAnimating();
+	if (restrictToSubscribers) {
+		restrictToSubscribers->finishAnimating();
+	}
+	if (limitByCountry) {
+		limitByCountry->finishAnimating();
+	}
+	if (countriesWrap) {
+		countriesWrap->finishAnimating();
+	}
+
 	return result;
 }
 
@@ -1250,4 +3406,6 @@ void CreatePollBox::prepare() {
 	const auto inner = setInnerWidget(setupContent());
 
 	setDimensionsToContent(st::boxWideWidth, inner);
+
+	Ui::SetStickyBottomScroll(this, inner);
 }
diff --git a/Telegram/SourceFiles/boxes/create_poll_box.h b/Telegram/SourceFiles/boxes/create_poll_box.h
index 91fc290ca409bf..1bd25182003554 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.h
+++ b/Telegram/SourceFiles/boxes/create_poll_box.h
@@ -30,23 +30,29 @@ namespace SendMenu {
 struct Details;
 } // namespace SendMenu
 
+class PeerData;
+
 class CreatePollBox : public Ui::BoxContent {
 public:
 	struct Result {
 		PollData poll;
+		TextWithEntities text;
 		Api::SendOptions options;
 	};
 
 	CreatePollBox(
 		QWidget*,
 		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
 		PollData::Flags chosen,
 		PollData::Flags disabled,
+		rpl::producer<int> starsRequired,
 		Api::SendType sendType,
 		SendMenu::Details sendMenuDetails);
 
 	[[nodiscard]] rpl::producer<Result> submitRequests() const;
 	void submitFailed(const QString &error);
+	void submitMediaExpired();
 
 	void setInnerFocus() override;
 
@@ -60,6 +66,9 @@ class CreatePollBox : public Ui::BoxContent {
 		Correct  = 0x04,
 		Other    = 0x08,
 		Solution = 0x10,
+		Media    = 0x20,
+		Deadline = 0x40,
+		Country  = 0x80,
 	};
 	friend constexpr inline bool is_flag_type(Error) { return true; }
 	using Errors = base::flags<Error>;
@@ -67,17 +76,22 @@ class CreatePollBox : public Ui::BoxContent {
 	[[nodiscard]] object_ptr<Ui::RpWidget> setupContent();
 	[[nodiscard]] not_null<Ui::InputField*> setupQuestion(
 		not_null<Ui::VerticalLayout*> container);
+	[[nodiscard]] not_null<Ui::InputField*> setupDescription(
+		not_null<Ui::VerticalLayout*> container);
 	[[nodiscard]] not_null<Ui::InputField*> setupSolution(
 		not_null<Ui::VerticalLayout*> container,
 		rpl::producer<bool> shown);
 
 	const not_null<Window::SessionController*> _controller;
+	const not_null<PeerData*> _peer;
 	const PollData::Flags _chosen = PollData::Flags();
 	const PollData::Flags _disabled = PollData::Flags();
 	const Api::SendType _sendType = Api::SendType();
 	const Fn<SendMenu::Details()> _sendMenuDetails;
+	rpl::variable<int> _starsRequired;
 	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
 	Fn<void()> _setInnerFocus;
+	Fn<void()> _refreshExpiredMedia;
 	Fn<rpl::producer<bool>()> _dataIsValidValue;
 	rpl::event_stream<Result> _submitRequests;
 
diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.cpp b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
index 247cad699a4108..ab24f0359d02e1 100644
--- a/Telegram/SourceFiles/boxes/delete_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
@@ -8,8 +8,6 @@ For license and copyright information please follow this link:
 #include "boxes/delete_messages_box.h"
 
 #include "apiwrap.h"
-#include "api/api_chat_participants.h"
-#include "api/api_messages_search.h"
 #include "base/unixtime.h"
 #include "core/application.h"
 #include "core/core_settings.h"
@@ -21,31 +19,33 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "menu/menu_ttl_validator.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/labels.h"
+#include "ui/rect.h"
 #include "ui/wrap/slide_wrap.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 
+namespace {
+
+constexpr auto kDeleteMessagesBoxAnimationDuration = crl::time(80);
+
+} // namespace
+
 DeleteMessagesBox::DeleteMessagesBox(
 	QWidget*,
-	not_null<HistoryItem*> item,
-	bool suggestModerateActions)
+	not_null<HistoryItem*> item)
 : _session(&item->history()->session())
 , _ids(1, item->fullId()) {
-	if (suggestModerateActions) {
-		_moderateBan = item->suggestBanReport();
-		_moderateDeleteAll = item->suggestDeleteAllReport();
-		if (_moderateBan || _moderateDeleteAll) {
-			_moderateFrom = item->from();
-			_moderateInChannel = item->history()->peer->asChannel();
-		}
-	}
 }
 
 DeleteMessagesBox::DeleteMessagesBox(
@@ -78,6 +78,10 @@ DeleteMessagesBox::DeleteMessagesBox(
 , _wipeHistoryJustClear(justClear) {
 }
 
+crl::time DeleteMessagesBox::layerAnimationDuration() const {
+	return kDeleteMessagesBoxAnimationDuration;
+}
+
 void DeleteMessagesBox::prepare() {
 	auto details = TextWithEntities();
 	const auto appendDetails = [&](TextWithEntities &&text) {
@@ -96,7 +100,7 @@ void DeleteMessagesBox::prepare() {
 					lt_date,
 					TextWithEntities{
 						langDayOfMonthFull(_wipeHistoryFirstToDelete) },
-					Ui::Text::RichLangValue)
+					tr::rich)
 				: tr::lng_sure_delete_by_date_many(
 					tr::now,
 					lt_days,
@@ -105,20 +109,17 @@ void DeleteMessagesBox::prepare() {
 						lt_count,
 						_wipeHistoryFirstToDelete.daysTo(
 							_wipeHistoryLastToDelete) + 1,
-						Ui::Text::WithEntities),
-					Ui::Text::RichLangValue);
+						tr::marked),
+					tr::rich);
 			deleteStyle = &st::attentionBoxButton;
 		} else if (_wipeHistoryJustClear) {
-			const auto isChannel = peer->isBroadcast();
-			const auto isPublicGroup = peer->isMegagroup()
-				&& peer->asChannel()->isPublic();
-			if (isChannel || isPublicGroup) {
-				canDelete = false;
-			}
+			const auto isChannel = peer->isChannel() && !peer->isMegagroup();
+			_revokeJustClearForChannel = isChannel;
 			details.text = isChannel
-				? tr::lng_no_clear_history_channel(tr::now)
-				: isPublicGroup
-				? tr::lng_no_clear_history_group(tr::now)
+				? tr::lng_sure_delete_channel_history(
+					tr::now,
+					lt_channel,
+					peer->name())
 				: peer->isSelf()
 				? tr::lng_sure_delete_saved_messages(tr::now)
 				: peer->isUser()
@@ -130,7 +131,7 @@ void DeleteMessagesBox::prepare() {
 					tr::now,
 					lt_group,
 					peer->name());
-			details = Ui::Text::RichLangValue(details.text);
+			details = tr::rich(details.text);
 			deleteStyle = &st::attentionBoxButton;
 		} else {
 			details.text = peer->isSelf()
@@ -148,13 +149,14 @@ void DeleteMessagesBox::prepare() {
 				: peer->isMegagroup()
 				? tr::lng_sure_leave_group(tr::now)
 				: tr::lng_sure_leave_channel(tr::now);
-			details = Ui::Text::RichLangValue(details.text);
+			details = tr::rich(details.text);
 			if (!peer->isUser()) {
 				*deleteText = tr::lng_box_leave();
 			}
 			deleteStyle = &st::attentionBoxButton;
 		}
-		if (auto revoke = revokeText(peer)) {
+		if (_revokeJustClearForChannel) {
+		} else if (auto revoke = revokeText(peer)) {
 			_revoke.create(
 				this,
 				revoke->checkbox,
@@ -163,7 +165,7 @@ void DeleteMessagesBox::prepare() {
 			appendDetails(std::move(revoke->description));
 			if (!peer->isUser() && !_wipeHistoryJustClear) {
 				_revoke->checkedValue(
-				) | rpl::start_with_next([=](bool revokeForAll) {
+				) | rpl::on_next([=](bool revokeForAll) {
 					*deleteText = revokeForAll
 						? tr::lng_box_delete()
 						: tr::lng_box_leave();
@@ -176,60 +178,15 @@ void DeleteMessagesBox::prepare() {
 				tr::lng_delete_clear_for_me(tr::now)
 			});
 		}
-	} else if (_moderateFrom) {
-		Assert(_moderateInChannel != nullptr);
-
-		details.text = tr::lng_selected_delete_sure_this(tr::now);
-		if (_moderateBan) {
-			_banUser.create(
-				this,
-				tr::lng_ban_user(tr::now),
-				false,
-				st::defaultBoxCheckbox);
-		}
-		_reportSpam.create(
-			this,
-			tr::lng_report_spam(tr::now),
-			false,
-			st::defaultBoxCheckbox);
-		if (_moderateDeleteAll) {
-			const auto search = lifetime().make_state<Api::MessagesSearch>(
-				_session->data().message(_ids.front())->history());
-			_deleteAll.create(
-				this,
-				tr::lng_delete_all_from_user(
-					tr::now,
-					lt_user,
-					Ui::Text::Bold(_moderateFrom->name()),
-					Ui::Text::WithEntities),
-				false,
-				st::defaultBoxCheckbox);
-
-			*deleteText = rpl::combine(
-				rpl::single(
-					0
-				) | rpl::then(
-					search->messagesFounds(
-					) | rpl::map([](const Api::FoundMessages &found) {
-						return found.total;
-					})
-				),
-				_deleteAll->checkedValue()
-			) | rpl::map([](int total, bool checked) {
-				return tr::lng_box_delete(tr::now)
-					+ ((total <= 0 || !checked)
-						? QString()
-						: QString(" (%1)").arg(total));
-			});
-			search->searchMessages({ .from = _moderateFrom });
-		}
 	} else {
-		details.text = (_ids.size() == 1)
+		details.text = hasSavedMusicMessages()
+			? tr::lng_selected_remove_saved_music(tr::now)
+			: (_ids.size() == 1)
 			? tr::lng_selected_delete_sure_this(tr::now)
 			: tr::lng_selected_delete_sure(tr::now, lt_count, _ids.size());
 		if (const auto peer = checkFromSinglePeer()) {
 			auto count = int(_ids.size());
-			if (hasScheduledMessages()) {
+			if (hasScheduledMessages() || hasSavedMusicMessages()) {
 			} else if (auto revoke = revokeText(peer)) {
 				const auto &settings = Core::App().settings();
 				const auto revokeByDefault
@@ -248,13 +205,13 @@ void DeleteMessagesBox::prepare() {
 						st::defaultBoxCheckbox));
 				_revokeRemember->hide(anim::type::instant);
 				_revoke->checkedValue(
-				) | rpl::start_with_next([=](bool checked) {
+				) | rpl::on_next([=](bool checked) {
 					_revokeRemember->toggle(
 						checked != revokeByDefault,
 						anim::type::normal);
 				}, _revokeRemember->lifetime());
 				_revokeRemember->heightValue(
-				) | rpl::start_with_next([=](int h) {
+				) | rpl::on_next([=](int h) {
 					setDimensions(st::boxWidth, _fullHeight + h);
 				}, lifetime());
 				appendDetails(std::move(revoke->description));
@@ -271,7 +228,8 @@ void DeleteMessagesBox::prepare() {
 				appendDetails({
 					tr::lng_delete_for_me_chat_hint(tr::now, lt_count, count)
 				});
-			} else if (!peer->isSelf()) {
+			} else if (!peer->isSelf()
+				&& (!peer->isUser() || !peer->asUser()->isInaccessible())) {
 				if (const auto user = peer->asUser(); user && user->isBot()) {
 					_revokeForBot = true;
 				}
@@ -282,6 +240,7 @@ void DeleteMessagesBox::prepare() {
 		}
 	}
 	_text.create(this, rpl::single(std::move(details)), st::boxLabel);
+	_text->resizeToWidth(st::boxWidth - rect::m::sum::h(st::boxPadding));
 
 	if (_wipeHistoryJustClear && _wipeHistoryPeer) {
 		const auto validator = TTLMenu::TTLValidator(
@@ -311,28 +270,27 @@ void DeleteMessagesBox::prepare() {
 		addButton(tr::lng_about_done(), [=] { closeBox(); });
 	}
 
-	auto fullHeight = st::boxPadding.top()
-		+ _text->height()
-		+ st::boxPadding.bottom();
-	if (_moderateFrom) {
-		fullHeight += st::boxMediumSkip;
-		if (_banUser) {
-			fullHeight += _banUser->heightNoMargins() + st::boxLittleSkip;
+	const auto &padding = st::boxPadding;
+	rpl::combine(
+		widthValue(),
+		_text->naturalWidthValue()
+	) | rpl::on_next([=](int full, int) {
+		_text->resizeToNaturalWidth(full - padding.left() - padding.right());
+
+		auto fullHeight = st::boxPadding.top()
+			+ _text->height()
+			+ st::boxPadding.bottom();
+		if (_revoke) {
+			fullHeight += st::boxMediumSkip + _revoke->heightNoMargins();
 		}
-		fullHeight += _reportSpam->heightNoMargins();
-		if (_deleteAll) {
-			fullHeight += st::boxLittleSkip + _deleteAll->heightNoMargins();
+		if (_autoDeleteSettings) {
+			fullHeight += st::boxMediumSkip
+				+ _autoDeleteSettings->height()
+				+ st::boxLittleSkip;
 		}
-	} else if (_revoke) {
-		fullHeight += st::boxMediumSkip + _revoke->heightNoMargins();
-	}
-	if (_autoDeleteSettings) {
-		fullHeight += st::boxMediumSkip
-			+ _autoDeleteSettings->height()
-			+ st::boxLittleSkip;
-	}
-	setDimensions(st::boxWidth, fullHeight);
-	_fullHeight = fullHeight;
+		setDimensions(st::boxWidth, fullHeight);
+		_fullHeight = fullHeight;
+	}, lifetime());
 }
 
 bool DeleteMessagesBox::hasScheduledMessages() const {
@@ -346,6 +304,17 @@ bool DeleteMessagesBox::hasScheduledMessages() const {
 	return false;
 }
 
+bool DeleteMessagesBox::hasSavedMusicMessages() const {
+	for (const auto &fullId : _ids) {
+		if (const auto item = _session->data().message(fullId)) {
+			if (item->isSavedMusicItem()) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
 PeerData *DeleteMessagesBox::checkFromSinglePeer() const {
 	auto result = (PeerData*)nullptr;
 	for (const auto &fullId : _ids) {
@@ -372,7 +341,7 @@ auto DeleteMessagesBox::revokeText(not_null<PeerData*> peer) const
 				tr::now,
 				lt_user,
 				{ user->firstName },
-				Ui::Text::RichLangValue);
+				tr::rich);
 		} else {
 			result.checkbox.text = tr::lng_delete_for_everyone_check(tr::now);
 		}
@@ -405,7 +374,7 @@ auto DeleteMessagesBox::revokeText(not_null<PeerData*> peer) const
 				tr::now,
 				lt_user,
 				{ user->firstName },
-				Ui::Text::RichLangValue);
+				tr::rich);
 		} else {
 			result.checkbox.text = tr::lng_delete_for_everyone_check(tr::now);
 		}
@@ -417,27 +386,27 @@ auto DeleteMessagesBox::revokeText(not_null<PeerData*> peer) const
 				result.description = tr::lng_selected_unsend_about_user_one(
 					tr::now,
 					lt_user,
-					Ui::Text::Bold(user->shortName()),
-					Ui::Text::WithEntities);
+					tr::bold(user->shortName()),
+					tr::marked);
 			} else {
 				result.description = tr::lng_selected_unsend_about_user(
 					tr::now,
 					lt_count,
 					canRevokeOutgoingCount,
 					lt_user,
-					Ui::Text::Bold(user->shortName()),
-					Ui::Text::WithEntities);
+					tr::bold(user->shortName()),
+					tr::marked);
 			}
 		} else if (canRevokeOutgoingCount == 1) {
 			result.description = tr::lng_selected_unsend_about_group_one(
 				tr::now,
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.description = tr::lng_selected_unsend_about_group(
 				tr::now,
 				lt_count,
 				canRevokeOutgoingCount,
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 		return result;
 	}
@@ -450,20 +419,7 @@ void DeleteMessagesBox::resizeEvent(QResizeEvent *e) {
 	const auto &padding = st::boxPadding;
 	_text->moveToLeft(padding.left(), padding.top());
 	auto top = _text->bottomNoMargins() + st::boxMediumSkip;
-	if (_moderateFrom) {
-		if (_banUser) {
-			_banUser->moveToLeft(padding.left(), top);
-			top += _banUser->heightNoMargins() + st::boxLittleSkip;
-		}
-		_reportSpam->moveToLeft(padding.left(), top);
-		top += _reportSpam->heightNoMargins() + st::boxLittleSkip;
-		if (_deleteAll) {
-			const auto availableWidth = width() - 2 * padding.left();
-			_deleteAll->resizeToNaturalWidth(availableWidth);
-			_deleteAll->moveToLeft(padding.left(), top);
-			top += _deleteAll->heightNoMargins() + st::boxLittleSkip;
-		}
-	} else if (_revoke) {
+	if (_revoke) {
 		const auto availableWidth = width() - 2 * padding.left();
 		_revoke->resizeToNaturalWidth(availableWidth);
 		_revoke->moveToLeft(padding.left(), top);
@@ -491,7 +447,58 @@ void DeleteMessagesBox::keyPressEvent(QKeyEvent *e) {
 	}
 }
 
+PaidPostType DeleteMessagesBox::paidPostType() const {
+	auto result = PaidPostType::None;
+	const auto now = base::unixtime::now();
+	for (const auto &id : _ids) {
+		if (const auto item = _session->data().message(id)) {
+			const auto type = item->paidType();
+			if (type != PaidPostType::None) {
+				const auto date = item->date();
+				const auto config = &item->history()->session().appConfig();
+				const auto limit = config->suggestedPostAgeMin();
+				if (now < date || now - date <= limit) {
+					if (type == PaidPostType::Ton) {
+						return type;
+					} else if (type == PaidPostType::Stars) {
+						result = type;
+					}
+				}
+			}
+		}
+	}
+	return result;
+}
+
 void DeleteMessagesBox::deleteAndClear() {
+	const auto warnPaidType = _confirmedDeletePaidSuggestedPosts
+		? PaidPostType::None
+		: paidPostType();
+	if (warnPaidType != PaidPostType::None) {
+		const auto weak = base::make_weak(this);
+		const auto callback = [=](Fn<void()> close) {
+			close();
+			if (const auto strong = weak.get()) {
+				strong->_confirmedDeletePaidSuggestedPosts = true;
+				strong->deleteAndClear();
+			}
+		};
+		const auto ton = (warnPaidType == PaidPostType::Ton);
+		uiShow()->show(Ui::MakeConfirmBox({
+			.text = (ton
+				? tr::lng_suggest_warn_text_ton
+				: tr::lng_suggest_warn_text_stars)(
+					tr::now,
+					tr::rich),
+			.confirmed = callback,
+			.confirmText = tr::lng_suggest_warn_delete_anyway(tr::now),
+			.confirmStyle = &st::attentionBoxButton,
+			.title = (ton
+				? tr::lng_suggest_warn_title_ton
+				: tr::lng_suggest_warn_title_stars)(tr::now),
+		}));
+		return;
+	}
 	if (_revoke
 		&& _revokeRemember
 		&& _revokeRemember->toggled()
@@ -500,16 +507,25 @@ void DeleteMessagesBox::deleteAndClear() {
 			!_revoke->checked());
 		Core::App().saveSettingsDelayed();
 	}
-	const auto revoke = _revoke ? _revoke->checked() : _revokeForBot;
+	const auto revoke = _revoke
+		? _revoke->checked()
+		: (_revokeForBot || _revokeJustClearForChannel);
 	const auto session = _session;
 	const auto invokeCallbackAndClose = [&] {
 		// deleteMessages can initiate closing of the current section,
 		// which will cause this box to be destroyed.
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
+		if (hasSavedMusicMessages()) {
+			uiShow()->showToast({
+				.text = { tr::lng_saved_music_removed(tr::now) },
+				.iconLottie = u"toast/delete"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		}
 		if (const auto callback = _deleteConfirmedCallback) {
 			callback();
 		}
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	};
@@ -544,28 +560,6 @@ void DeleteMessagesBox::deleteAndClear() {
 		}
 		return;
 	}
-	if (_moderateFrom) {
-		if (_banUser && _banUser->checked()) {
-			_moderateInChannel->session().api().chatParticipants().kick(
-				_moderateInChannel,
-				_moderateFrom,
-				ChatRestrictionsInfo());
-		}
-		if (_reportSpam->checked()) {
-			_moderateInChannel->session().api().request(
-				MTPchannels_ReportSpam(
-					_moderateInChannel->inputChannel,
-					_moderateFrom->input,
-					MTP_vector<MTPint>(1, MTP_int(_ids[0].msg)))
-			).send();
-		}
-		if (_deleteAll && _deleteAll->checked()) {
-			_moderateInChannel->session().api().deleteAllFromParticipant(
-				_moderateInChannel,
-				_moderateFrom);
-		}
-	}
-
 	const auto ids = _ids;
 	invokeCallbackAndClose();
 	session->data().histories().deleteMessages(ids, revoke);
diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.h b/Telegram/SourceFiles/boxes/delete_messages_box.h
index 9987fd8b32dcfc..c09bed4a0468a0 100644
--- a/Telegram/SourceFiles/boxes/delete_messages_box.h
+++ b/Telegram/SourceFiles/boxes/delete_messages_box.h
@@ -9,6 +9,8 @@ For license and copyright information please follow this link:
 
 #include "ui/layers/box_content.h"
 
+enum class PaidPostType : uchar;
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -25,8 +27,7 @@ class DeleteMessagesBox final : public Ui::BoxContent {
 public:
 	DeleteMessagesBox(
 		QWidget*,
-		not_null<HistoryItem*> item,
-		bool suggestModerateActions);
+		not_null<HistoryItem*> item);
 	DeleteMessagesBox(
 		QWidget*,
 		not_null<Main::Session*> session,
@@ -41,6 +42,7 @@ class DeleteMessagesBox final : public Ui::BoxContent {
 	void setDeleteConfirmedCallback(Fn<void()> callback) {
 		_deleteConfirmedCallback = std::move(callback);
 	}
+	[[nodiscard]] crl::time layerAnimationDuration() const override;
 
 protected:
 	void prepare() override;
@@ -56,8 +58,10 @@ class DeleteMessagesBox final : public Ui::BoxContent {
 	void deleteAndClear();
 	[[nodiscard]] PeerData *checkFromSinglePeer() const;
 	[[nodiscard]] bool hasScheduledMessages() const;
+	[[nodiscard]] bool hasSavedMusicMessages() const;
 	[[nodiscard]] std::optional<RevokeConfig> revokeText(
 		not_null<PeerData*> peer) const;
+	[[nodiscard]] PaidPostType paidPostType() const;
 
 	const not_null<Main::Session*> _session;
 
@@ -66,22 +70,17 @@ class DeleteMessagesBox final : public Ui::BoxContent {
 	const QDate _wipeHistoryFirstToDelete;
 	const QDate _wipeHistoryLastToDelete;
 	const MessageIdsList _ids;
-	PeerData *_moderateFrom = nullptr;
-	ChannelData *_moderateInChannel = nullptr;
-	bool _moderateBan = false;
-	bool _moderateDeleteAll = false;
 
 	bool _revokeForBot = false;
+	bool _revokeJustClearForChannel = false;
 
 	object_ptr<Ui::FlatLabel> _text = { nullptr };
 	object_ptr<Ui::Checkbox> _revoke = { nullptr };
 	object_ptr<Ui::SlideWrap<Ui::Checkbox>> _revokeRemember = { nullptr };
-	object_ptr<Ui::Checkbox> _banUser = { nullptr };
-	object_ptr<Ui::Checkbox> _reportSpam = { nullptr };
-	object_ptr<Ui::Checkbox> _deleteAll = { nullptr };
 	object_ptr<Ui::LinkButton> _autoDeleteSettings = { nullptr };
 
 	int _fullHeight = 0;
+	bool _confirmedDeletePaidSuggestedPosts = false;
 
 	Fn<void()> _deleteConfirmedCallback;
 
diff --git a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
index 72cfd29c0d2eb7..2ab2889ab7aff2 100644
--- a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
+++ b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
@@ -143,7 +143,7 @@ auto AddButtonWithLoader(
 
 	std::move(
 		query
-	) | rpl::start_with_next([=](auto string) {
+	) | rpl::on_next([=](auto string) {
 		wrap->toggle(
 			ranges::any_of(indexList, [&](const QString &s) {
 				return s.startsWith(string, Qt::CaseInsensitive);
@@ -198,7 +198,7 @@ auto AddButtonWithLoader(
 	};
 
 	Spellchecker::GlobalLoaderChanged(
-	) | rpl::start_with_next([=](int langId) {
+	) | rpl::on_next([=](int langId) {
 		if (!langId && rawGlobalLoaderPtr()) {
 			setGlobalLoaderPtr(nullptr);
 		} else if (langId == id) {
@@ -211,18 +211,19 @@ auto AddButtonWithLoader(
 		buttonState->value() | rpl::map(StateDescription),
 		st::settingsUpdateState);
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	label->show();
 
 	rpl::combine(
 		button->widthValue(),
 		label->widthValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		label->moveToLeft(
 			st::settingsUpdateStatePosition.x(),
 			st::settingsUpdateStatePosition.y());
 	}, label->lifetime());
 
 	buttonState->value(
-	) | rpl::start_with_next([=](const DictState &state) {
+	) | rpl::on_next([=](const DictState &state) {
 		const auto isToggledSet = v::is<Active>(state);
 		const auto toggled = isToggledSet ? 1. : 0.;
 		const auto over = !button->isDisabled()
@@ -279,10 +280,10 @@ auto AddButtonWithLoader(
 	});
 
 	button->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		const auto &state = buttonState->current();
 		if (toggled && (v::is<Available>(state) || v::is<Failed>(state))) {
-			const auto weak = Ui::MakeWeak(button);
+			const auto weak = base::make_weak(button);
 			setLocalLoader(base::make_unique_q<Loader>(
 				QCoreApplication::instance(),
 				session,
@@ -344,24 +345,44 @@ void Inner::setupContent(
 	const auto queryStream = content->lifetime()
 		.make_state<rpl::event_stream<QStringView>>();
 
-	for (const auto &dict : Spellchecker::Dictionaries()) {
-		const auto id = dict.id;
-		const auto row = AddButtonWithLoader(
-			content,
-			session,
-			dict,
-			ranges::contains(enabledDictionaries, id),
-			queryStream->events());
-		row->toggledValue(
-		) | rpl::start_with_next([=](auto enabled) {
-			if (enabled) {
-				_enabledRows.push_back(id);
-			} else {
-				auto &rows = _enabledRows;
-				rows.erase(ranges::remove(rows, id), end(rows));
-			}
-		}, row->lifetime());
-	}
+	// Rows are created once, when Spellchecker::Dictionaries() becomes
+	// non-empty. Manifest is fetched lazily and may arrive after the box
+	// opens, so we subscribe to DictionariesChanged and populate rows
+	// then if we haven't already.
+	const auto built = content->lifetime().make_state<bool>(false);
+	const auto buildRows = [=] {
+		if (*built) {
+			return;
+		}
+		const auto dicts = Spellchecker::Dictionaries();
+		if (dicts.empty()) {
+			return;
+		}
+		*built = true;
+		for (const auto &dict : dicts) {
+			const auto id = dict.id;
+			const auto row = AddButtonWithLoader(
+				content,
+				session,
+				dict,
+				ranges::contains(enabledDictionaries, id),
+				queryStream->events());
+			row->toggledValue(
+			) | rpl::on_next([=](auto enabled) {
+				if (enabled) {
+					_enabledRows.push_back(id);
+				} else {
+					auto &rows = _enabledRows;
+					rows.erase(ranges::remove(rows, id), end(rows));
+				}
+			}, row->lifetime());
+		}
+	};
+
+	buildRows();
+	Spellchecker::DictionariesChanged(
+	) | rpl::on_next(buildRows, content->lifetime());
+	Spellchecker::RefreshDictionariesManifest(session);
 
 	_queryCallback = [=](const QString &query) {
 		if (query.size() >= kMaxQueryLength) {
@@ -403,11 +424,6 @@ void ManageDictionariesBox::prepare() {
 		multiSelect->setInnerFocus();
 	};
 
-	// The initial list of enabled rows may differ from the list of languages
-	// in settings, so we should store it when box opens
-	// and save it when box closes (don't do it when "Save" was pressed).
-	const auto initialEnabledRows = inner->enabledRows();
-
 	setTitle(tr::lng_settings_manage_dictionaries());
 
 	addButton(tr::lng_settings_save(), [=] {
@@ -420,9 +436,13 @@ void ManageDictionariesBox::prepare() {
 	});
 	addButton(tr::lng_close(), [=] { closeBox(); });
 
-	boxClosing() | rpl::start_with_next([=] {
-		Core::App().settings().setDictionariesEnabled(
-			FilterEnabledDict(initialEnabledRows));
+	boxClosing() | rpl::on_next([=] {
+		const auto &current = Core::App().settings().dictionariesEnabled();
+		const auto filtered = FilterEnabledDict(current);
+		if (filtered.size() == current.size()) {
+			return;
+		}
+		Core::App().settings().setDictionariesEnabled(filtered);
 		Core::App().saveSettingsDelayed();
 	}, lifetime());
 
@@ -434,7 +454,7 @@ void ManageDictionariesBox::prepare() {
 		inner->heightValue(),
 		multiSelect->heightValue(),
 		_1 + _2
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		using std::min;
 		accumulate_max(*max, height);
 		setDimensions(st::boxWidth, min(*max, st::boxMaxListHeight), true);
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 96d8fa7829ea20..e5b740e259c939 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 #include "base/event_filter.h"
 #include "boxes/premium_limits_box.h"
 #include "boxes/premium_preview_box.h"
+#include "boxes/send_files_box.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "chat_helpers/field_autocomplete.h"
 #include "chat_helpers/message_field.h"
@@ -35,7 +36,9 @@ For license and copyright information please follow this link:
 #include "history/history_drag_area.h"
 #include "history/history_item.h"
 #include "history/history.h"
+#include "history/view/controls/history_view_compose_ai_button.h"
 #include "lang/lang_keys.h"
+#include "menu/menu_checked_action.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "mainwidget.h" // controller->content() -> QWidget*
@@ -49,6 +52,7 @@ For license and copyright information please follow this link:
 #include "ui/chat/attach/attach_item_single_media_preview.h"
 #include "ui/chat/attach/attach_single_file_preview.h"
 #include "ui/chat/attach/attach_single_media_preview.h"
+#include "ui/controls/compose_ai_button_factory.h"
 #include "ui/controls/emoji_button.h"
 #include "ui/effects/scroll_content_shadow.h"
 #include "ui/image/image.h"
@@ -57,6 +61,7 @@ For license and copyright information please follow this link:
 #include "ui/ui_utility.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
@@ -65,6 +70,7 @@ For license and copyright information please follow this link:
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 
 #include <QtCore/QMimeData>
 
@@ -114,7 +120,11 @@ constexpr auto kChangesDebounceTimeout = crl::time(1000);
 	return Ui::AlbumType();
 }
 
-[[nodiscard]] bool CanBeCompressed(Ui::AlbumType type) {
+[[nodiscard]] bool CanToggleCompressed(Ui::AlbumType type) {
+	return (type == Ui::AlbumType::None);
+}
+
+[[nodiscard]] bool AlbumTypeCompressed(Ui::AlbumType type) {
 	return (type == Ui::AlbumType::None)
 		|| (type == Ui::AlbumType::PhotoVideo);
 }
@@ -178,6 +188,7 @@ void EditPhotoImage(
 		not_null<Window::SessionController*> controller,
 		std::shared_ptr<Data::PhotoMedia> media,
 		bool spoilered,
+		int sideLimit,
 		Fn<void(Ui::PreparedList)> done) {
 	const auto large = media
 		? media->image(Data::PhotoSize::Large)
@@ -204,7 +215,6 @@ void EditPhotoImage(
 		const auto image = std::get_if<ImageInfo>(&file.information->media);
 
 		image->modifications = mods;
-		const auto sideLimit = PhotoSideLimit();
 		Storage::UpdateImageDetails(file, previewWidth, sideLimit);
 		done(std::move(list));
 	};
@@ -232,13 +242,15 @@ EditCaptionBox::EditCaptionBox(
 	not_null<Window::SessionController*> controller,
 	not_null<HistoryItem*> item,
 	TextWithTags &&text,
+	SuggestOptions suggest,
 	bool spoilered,
 	bool invertCaption,
 	Ui::PreparedList &&list,
 	Fn<void()> saved)
 : _controller(controller)
 , _historyItem(item)
-, _isAllowedEditMedia(item->media() && item->media()->allowsEditMedia())
+, _suggest(suggest)
+, _isAllowedEditMedia(item->allowsEditMedia())
 , _albumType(ComputeAlbumType(item))
 , _controls(base::make_unique_q<Ui::VerticalLayout>(this))
 , _scroll(base::make_unique_q<Ui::ScrollArea>(this, st::boxScroll))
@@ -253,14 +265,17 @@ EditCaptionBox::EditCaptionBox(
 , _initialText(std::move(text))
 , _initialList(std::move(list))
 , _saved(std::move(saved)) {
-	Expects(item->media() != nullptr);
-	Expects(item->media()->allowsEditCaption());
+	Expects(!_initialList.files.empty());
+	Expects(item->allowsEditMedia());
+
+	_asFile = !AlbumTypeCompressed(_albumType);
+	_sendLargePhotos = Core::App().settings().sendFilesWay().sendLargePhotos();
 
 	_mediaEditManager.start(item, spoilered, invertCaption);
 
 	_controller->session().data().itemRemoved(
 		_historyItem->fullId()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeBox();
 	}, lifetime());
 }
@@ -271,6 +286,7 @@ void EditCaptionBox::StartMediaReplace(
 		not_null<Window::SessionController*> controller,
 		FullMsgId itemId,
 		TextWithTags text,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Fn<void()> saved) {
@@ -284,6 +300,7 @@ void EditCaptionBox::StartMediaReplace(
 			controller,
 			item,
 			std::move(text),
+			suggest,
 			spoilered,
 			invertCaption,
 			std::move(list),
@@ -300,6 +317,7 @@ void EditCaptionBox::StartMediaReplace(
 		FullMsgId itemId,
 		Ui::PreparedList &&list,
 		TextWithTags text,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Fn<void()> saved) {
@@ -335,6 +353,7 @@ void EditCaptionBox::StartMediaReplace(
 			controller,
 			item,
 			std::move(text),
+			suggest,
 			spoilered,
 			invertCaption,
 			std::move(list),
@@ -347,6 +366,7 @@ void EditCaptionBox::StartPhotoEdit(
 		std::shared_ptr<Data::PhotoMedia> media,
 		FullMsgId itemId,
 		TextWithTags text,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Fn<void()> saved) {
@@ -355,21 +375,26 @@ void EditCaptionBox::StartPhotoEdit(
 	if (!item) {
 		return;
 	}
-	EditPhotoImage(controller, media, spoilered, [=](
-			Ui::PreparedList &&list) mutable {
-		const auto item = session->data().message(itemId);
-		if (!item) {
-			return;
-		}
-		controller->show(Box<EditCaptionBox>(
-			controller,
-			item,
-			std::move(text),
-			spoilered,
-			invertCaption,
-			std::move(list),
-			std::move(saved)));
-	});
+	EditPhotoImage(
+		controller,
+		media,
+		spoilered,
+		PhotoSideLimit(true),
+		[=](Ui::PreparedList &&list) mutable {
+			const auto item = session->data().message(itemId);
+			if (!item) {
+				return;
+			}
+			controller->show(Box<EditCaptionBox>(
+				controller,
+				item,
+				std::move(text),
+				suggest,
+				spoilered,
+				invertCaption,
+				std::move(list),
+				std::move(saved)));
+		});
 }
 
 void EditCaptionBox::showFinished() {
@@ -403,10 +428,20 @@ void EditCaptionBox::prepare() {
 			: _mediaEditManager.invertCaption()
 			? SendMenu::CaptionState::Above
 			: SendMenu::CaptionState::Below;
+		result.photoQuality = !hasSendLargePhotosOption()
+			? SendMenu::PhotoQualityState::None
+			: _sendLargePhotos
+			? SendMenu::PhotoQualityState::High
+			: SendMenu::PhotoQualityState::Standard;
 		return result;
 	});
 	const auto callback = [=](SendMenu::Action action, const auto &) {
-		_mediaEditManager.apply(action);
+		using Type = SendMenu::ActionType;
+		switch (action.type) {
+		case Type::PhotoQualityOn: _sendLargePhotos = true; break;
+		case Type::PhotoQualityOff: _sendLargePhotos = false; break;
+		default: _mediaEditManager.apply(action); break;
+		}
 		rebuildPreview();
 	};
 	SendMenu::SetupMenuAndShortcuts(
@@ -422,7 +457,8 @@ void EditCaptionBox::prepare() {
 	setInitialText();
 
 	if (!setPreparedList(std::move(_initialList))) {
-		rebuildPreview();
+		crl::on_main(this, [=] { closeBox(); });
+		return;
 	}
 	setupEditEventHandler();
 	SetupShadowsToScrollContent(this, _scroll, _contentHeight.events());
@@ -448,7 +484,8 @@ void EditCaptionBox::rebuildPreview() {
 		const auto photo = media->photo();
 		const auto document = media->document();
 		_isPhoto = (photo != nullptr);
-		if (photo || document->isVideoFile() || document->isAnimation()) {
+		_isVideo = (document != nullptr) && document->isVideoFile();
+		if (_isPhoto || _isVideo || document->isAnimation()) {
 			const auto media = Ui::CreateChild<Ui::ItemSingleMediaPreview>(
 				this,
 				st::defaultComposeControls,
@@ -466,24 +503,17 @@ void EditCaptionBox::rebuildPreview() {
 		}
 	} else {
 		const auto &file = _preparedList.files.front();
-
+		_isVideo = file.isVideoFile();
 		const auto media = Ui::SingleMediaPreview::Create(
 			this,
 			st::defaultComposeControls,
 			gifPaused,
 			file,
-			[] { return true; },
 			Ui::AttachControls::Type::EditOnly);
 		_isPhoto = (media && media->isPhoto());
-		const auto withCheckbox = _isPhoto && CanBeCompressed(_albumType);
-		if (media && (!withCheckbox || !_asFile)) {
-			media->spoileredChanges(
-			) | rpl::start_with_next([=](bool spoilered) {
-				_mediaEditManager.apply({ .type = spoilered
-					? SendMenu::ActionType::SpoilerOn
-					: SendMenu::ActionType::SpoilerOff
-				});
-			}, media->lifetime());
+		if (media && !_asFile) {
+			media->setSendWay(currentSendWay());
+			media->setCanShowHighQualityBadge(file.canUseHighQualityPhoto());
 			_content.reset(media);
 		} else {
 			_content.reset(Ui::CreateChild<Ui::SingleFilePreview>(
@@ -500,7 +530,7 @@ void EditCaptionBox::rebuildPreview() {
 		_footerHeight.value(),
 		rpl::single(st::boxPhotoPadding.top()),
 		rpl::mappers::_1 + rpl::mappers::_2 + rpl::mappers::_3
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(
 			st::boxWideWidth,
 			std::min(st::sendMediaPreviewHeightMax, height),
@@ -516,6 +546,24 @@ void EditCaptionBox::rebuildPreview() {
 	_content->heightValue(
 	) | rpl::start_to_stream(_contentHeight, _content->lifetime());
 
+	if (const auto file = dynamic_cast<Ui::AbstractSingleFilePreview*>(
+			_content.get())) {
+		file->setRenameEnabled(!_preparedList.files.empty());
+		file->renameRequests(
+		) | rpl::on_next([=] {
+			renameCurrentFile();
+		}, _content->lifetime());
+	}
+
+	base::install_event_filter(_content.get(), [=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::ContextMenu) {
+			const auto mouse = static_cast<QContextMenuEvent*>(e.get());
+			showMenu(mouse->globalPos(), false);
+			return base::EventFilterResult::Cancel;
+		}
+		return base::EventFilterResult::Continue;
+	}, _content->lifetime());
+
 	_scroll->setOwnedWidget(
 		object_ptr<Ui::RpWidget>::fromRaw(_content.get()));
 
@@ -529,11 +577,16 @@ void EditCaptionBox::setupField() {
 	const auto allow = [=](not_null<DocumentData*> emoji) {
 		return Data::AllowEmojiWithoutPremium(peer, emoji);
 	};
-	InitMessageFieldHandlers(
-		_controller,
-		_field.get(),
-		Window::GifPauseReason::Layer,
-		allow);
+	const auto chatStyle = InitMessageFieldHandlers({
+		.session = &_controller->session(),
+		.show = _controller->uiShow(),
+		.field = _field.get(),
+		.customEmojiPaused = [=] {
+			return _controller->isGifPausedAtLeastFor(
+				Window::GifPauseReason::Layer);
+		},
+		.allowPremiumEmoji = allow,
+	});
 	setupFieldAutocomplete();
 	Ui::Emoji::SuggestionsController::Init(
 		getDelegate()->outerContainer(),
@@ -546,13 +599,13 @@ void EditCaptionBox::setupField() {
 	_field->setMaxHeight(st::defaultComposeFiles.caption.heightMax);
 
 	_field->submits(
-	) | rpl::start_with_next([=] { save(); }, _field->lifetime());
+	) | rpl::on_next([=] { save(); }, _field->lifetime());
 	_field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeBox();
 	}, _field->lifetime());
 	_field->heightChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		captionResized();
 	}, _field->lifetime());
 	_field->setMimeDataHook([=](
@@ -570,6 +623,14 @@ void EditCaptionBox::setupField() {
 		}
 		Unexpected("Action in MimeData hook.");
 	});
+
+	_aiButton = Ui::SetupCaptionAiButton({
+		.parent = this,
+		.field = _field.get(),
+		.session = &_controller->session(),
+		.show = _controller->uiShow(),
+		.chatStyle = chatStyle,
+	});
 }
 
 void EditCaptionBox::setupFieldAutocomplete() {
@@ -636,7 +697,7 @@ void EditCaptionBox::setInitialText() {
 		}
 	});
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_checkChangedTimer.callOnce(kChangesDebounceTimeout);
 		setCloseByOutsideClick(false);
 	}, _field->lifetime());
@@ -646,9 +707,9 @@ void EditCaptionBox::setupControls() {
 	auto hintLabelToggleOn = _previewRebuilds.events_starting_with(
 		{}
 	) | rpl::map([=] {
-		return _controller->session().settings().photoEditorHintShown()
-			? (_isPhoto && !_asFile)
-			: false;
+		return _isPhoto
+			&& !_asFile
+			&& _controller->session().settings().photoEditorHintShown();
 	});
 
 	_controls->add(object_ptr<Ui::SlideWrap<Ui::FlatLabel>>(
@@ -664,21 +725,21 @@ void EditCaptionBox::setupControls() {
 		this,
 		object_ptr<Ui::Checkbox>(
 			this,
-			tr::lng_send_compressed_one(tr::now),
-			true,
+			tr::lng_send_as_documents_one(tr::now),
+			_asFile,
 			st::defaultBoxCheckbox),
 		st::editMediaCheckboxMargins)
 	)->toggleOn(
 		_previewRebuilds.events_starting_with({}) | rpl::map([=] {
-			return _isPhoto
-				&& CanBeCompressed(_albumType)
+			return (_isPhoto || _isVideo)
+				&& CanToggleCompressed(_albumType)
 				&& !_preparedList.files.empty();
 		}),
 		anim::type::instant
 	)->entity()->checkedChanges(
-	) | rpl::start_with_next([&](bool checked) {
+	) | rpl::on_next([&](bool checked) {
 		applyChanges();
-		_asFile = !checked;
+		_asFile = checked;
 		rebuildPreview();
 	}, _controls->lifetime());
 
@@ -687,18 +748,112 @@ void EditCaptionBox::setupControls() {
 
 void EditCaptionBox::setupEditEventHandler() {
 	_editMediaClicks.events(
-	) | rpl::start_with_next([=] {
-		ChooseReplacement(_controller, _albumType, crl::guard(this, [=](
-				Ui::PreparedList &&list) {
-			setPreparedList(std::move(list));
-		}));
+	) | rpl::on_next([=] {
+		showMenu(QCursor::pos(), true);
 	}, lifetime());
 }
 
+void EditCaptionBox::showMenu(QPoint globalPos, bool forceTopRight) {
+	_previewMenu = base::make_unique_q<Ui::PopupMenu>(
+		this,
+		st::popupMenuWithIcons);
+	if (forceTopRight) {
+		_previewMenu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
+	}
+	if (_isAllowedEditMedia) {
+		_previewMenu->addAction(tr::lng_attach_replace(tr::now), [=] {
+			ChooseReplacement(
+				_controller,
+				_albumType,
+				crl::guard(this, [=](Ui::PreparedList &&list) {
+					setPreparedList(std::move(list));
+				}));
+		}, &st::menuIconReplace);
+	}
+	if (dynamic_cast<Ui::AbstractSingleFilePreview*>(_content.get())
+		&& !_preparedList.files.empty()) {
+		_previewMenu->addAction(tr::lng_rename_file(tr::now), [=] {
+			renameCurrentFile();
+		}, &st::menuIconEdit);
+	}
+	using Type = Ui::PreparedFile::Type;
+	const auto canDraw = !_preparedList.files.empty()
+		? (_preparedList.files.front().type == Type::Photo)
+		: (_isPhoto && !_asFile);
+	if (canDraw) {
+		_previewMenu->addAction(tr::lng_context_draw(tr::now), [=] {
+			_photoEditorOpens.fire({});
+		}, &st::menuIconDraw);
+	}
+	if (!_asFile && (_isPhoto || _isVideo)) {
+		if (hasSendLargePhotosOption()) {
+			const auto enabled = _sendLargePhotos;
+			Menu::AddCheckedAction(
+				_previewMenu.get(),
+				tr::lng_send_high_quality(tr::now),
+				[=] {
+					_sendLargePhotos = !enabled;
+					rebuildPreview();
+				},
+				&st::menuIconQualityHigh,
+				enabled);
+		}
+		if (_preparedList.hasSpoilerMenu(!_asFile)) {
+			const auto spoilered = hasSpoiler();
+			Menu::AddCheckedAction(
+				_previewMenu.get(),
+				tr::lng_context_spoiler_effect(tr::now),
+				[=] {
+					_mediaEditManager.apply({ .type = spoilered
+						? SendMenu::ActionType::SpoilerOff
+						: SendMenu::ActionType::SpoilerOn
+					});
+					rebuildPreview();
+				},
+				&st::menuIconSpoiler,
+				spoilered);
+		}
+		if (_isVideo && !_preparedList.files.empty()) {
+			_previewMenu->addAction(tr::lng_context_edit_cover(tr::now), [=] {
+				setupEditCoverHandler();
+			}, &st::menuIconEdit);
+			if (_preparedList.files.front().videoCover != nullptr) {
+				_previewMenu->addAction(
+					tr::lng_context_clear_cover(tr::now),
+					[=] { setupClearCoverHandler(); },
+					&st::menuIconCancel);
+			}
+		}
+	}
+	if (_previewMenu->empty()) {
+		_previewMenu = nullptr;
+	} else {
+		_previewMenu->popup(globalPos);
+	}
+}
+
+void EditCaptionBox::renameCurrentFile() {
+	if (_preparedList.files.empty()) {
+		return;
+	}
+	const auto &file = _preparedList.files.front();
+	const auto allowExtensionEdit = file.path.isEmpty();
+	_controller->show(Box(RenameFileBox, file.displayName, allowExtensionEdit, [=](
+			QString displayName) {
+		_preparedList.files.front().displayName = displayName;
+		if (const auto filePreview = dynamic_cast<Ui::AbstractSingleFilePreview*>(
+				_content.get())) {
+			filePreview->setDisplayName(displayName);
+		} else {
+			rebuildPreview();
+		}
+	}));
+}
+
 void EditCaptionBox::setupPhotoEditorEventHandler() {
 	const auto openedOnce = lifetime().make_state<bool>(false);
 	_photoEditorOpens.events(
-	) | rpl::start_with_next([=, controller = _controller] {
+	) | rpl::on_next([=, controller = _controller] {
 		if (_preparedList.files.empty()
 			&& (!_photoMedia
 				|| !_photoMedia->image(Data::PhotoSize::Large))) {
@@ -718,16 +873,105 @@ void EditCaptionBox::setupPhotoEditorEventHandler() {
 				controller->uiShow(),
 				&_preparedList.files.front(),
 				st::sendMediaPreviewSize,
-				[=] { rebuildPreview(); });
+				[=](bool ok) { if (ok) rebuildPreview(); },
+				PhotoSideLimit(true));
 		} else {
-			EditPhotoImage(_controller, _photoMedia, hasSpoiler(), [=](
-					Ui::PreparedList &&list) {
-				setPreparedList(std::move(list));
-			});
+			EditPhotoImage(
+				_controller,
+				_photoMedia,
+				hasSpoiler(),
+				PhotoSideLimit(true),
+				[=](Ui::PreparedList &&list) {
+					setPreparedList(std::move(list));
+				});
 		}
 	}, lifetime());
 }
 
+void EditCaptionBox::setupEditCoverHandler() {
+	if (_preparedList.files.empty()) {
+		return;
+	}
+	const auto &file = _preparedList.files.front();
+	if (!file.isVideoFile()) {
+		return;
+	}
+	const auto show = _controller->uiShow();
+	const auto replace = [=](Ui::PreparedList list) {
+		if (list.files.empty()) {
+			return;
+		}
+		auto &entry = _preparedList.files.front();
+		const auto video = entry.information
+			? std::get_if<Ui::PreparedFileInformation::Video>(
+				&entry.information->media)
+			: nullptr;
+		if (!video) {
+			return;
+		}
+		auto old = std::shared_ptr<Ui::PreparedFile>(
+			std::move(entry.videoCover));
+		entry.videoCover = std::make_unique<Ui::PreparedFile>(
+			std::move(list.files.front()));
+		Editor::OpenWithPreparedFile(
+			this,
+			show,
+			entry.videoCover.get(),
+			st::sendMediaPreviewSize,
+			crl::guard(this, [=](bool ok) {
+				if (!ok) {
+					_preparedList.files.front().videoCover = old
+						? std::make_unique<Ui::PreparedFile>(
+							std::move(*old))
+						: nullptr;
+				}
+				rebuildPreview();
+			}),
+			PhotoSideLimit(true),
+			video->thumbnail.size());
+	};
+	const auto checkResult = [=](const Ui::PreparedList &list) {
+		if (list.files.empty()) {
+			return true;
+		}
+		if (list.files.front().type != Ui::PreparedFile::Type::Photo) {
+			show->showToast(tr::lng_choose_cover_bad(tr::now));
+			return false;
+		}
+		return true;
+	};
+	const auto callback = [=](FileDialog::OpenResult &&result) {
+		const auto premium = show->session().premium();
+		const auto showError = [=](tr::phrase<> t) {
+			show->showToast(t(tr::now));
+		};
+		auto list = Storage::PreparedFileFromFilesDialog(
+			std::move(result),
+			checkResult,
+			showError,
+			st::sendMediaPreviewSize,
+			premium);
+		if (list) {
+			replace(std::move(*list));
+		}
+	};
+
+	FileDialog::GetOpenPath(
+		this,
+		tr::lng_choose_cover(tr::now),
+		FileDialog::ImagesFilter(),
+		crl::guard(this, callback));
+}
+
+void EditCaptionBox::setupClearCoverHandler() {
+	if (_preparedList.files.empty()) {
+		return;
+	}
+	auto &entry = _preparedList.files.front();
+	entry.videoCover = nullptr;
+	rebuildPreview();
+}
+
 void EditCaptionBox::setupDragArea() {
 	auto enterFilter = [=](not_null<const QMimeData*> data) {
 		return !_isAllowedEditMedia
@@ -738,7 +982,9 @@ void EditCaptionBox::setupDragArea() {
 	auto computeState = [=](const QMimeData *data) {
 		using DragState = Storage::MimeDataState;
 		const auto state = Storage::ComputeMimeDataState(data);
-		return (state == DragState::PhotoFiles || state == DragState::Image)
+		return (state == DragState::PhotoFiles
+			|| state == DragState::Image
+			|| state == DragState::MediaFiles)
 			? (_asFile ? DragState::Files : DragState::Image)
 			: state;
 	};
@@ -777,11 +1023,11 @@ void EditCaptionBox::setupEmojiPanel() {
 	_emojiPanel->hide();
 	_emojiPanel->selector()->setCurrentPeer(_historyItem->history()->peer);
 	_emojiPanel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(_field->textCursor(), data.emoji);
 	}, lifetime());
 	_emojiPanel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		const auto info = data.document->sticker();
 		if (info
 			&& info->setType == Data::StickersType::Emoji
@@ -863,6 +1109,32 @@ bool EditCaptionBox::hasSpoiler() const {
 	return _mediaEditManager.spoilered();
 }
 
+bool EditCaptionBox::hasSendLargePhotosOption() const {
+	const auto compressed = CanToggleCompressed(_albumType)
+		? (!_asFile)
+		: AlbumTypeCompressed(_albumType);
+	return compressed
+		&& !_preparedList.files.empty()
+		&& _preparedList.hasSendLargePhotosOption(compressed);
+}
+
+Ui::SendFilesWay EditCaptionBox::currentSendWay() const {
+	auto way = Core::App().settings().sendFilesWay();
+	way.setSendImagesAsPhotos(!_asFile);
+	way.setSendLargePhotos(_sendLargePhotos);
+	return way;
+}
+
+void EditCaptionBox::saveSendWaySettings() {
+	auto way = Core::App().settings().sendFilesWay();
+	if (way.sendLargePhotos() == _sendLargePhotos) {
+		return;
+	}
+	way.setSendLargePhotos(_sendLargePhotos);
+	Core::App().settings().setSendFilesWay(way);
+	Core::App().saveSettingsDelayed();
+}
+
 void EditCaptionBox::captionResized() {
 	updateBoxSize();
 	resizeEvent(0);
@@ -937,6 +1209,11 @@ void EditCaptionBox::resizeEvent(QResizeEvent *e) {
 		_field->y() + st::boxAttachEmojiTop);
 	_emojiToggle->update();
 
+	if (_aiButton) {
+		Ui::UpdateCaptionAiButtonGeometry(_aiButton, _field.get());
+		_aiButton->raise();
+	}
+
 	if (!_controls->isHidden()) {
 		_controls->resizeToWidth(width());
 		_controls->moveToLeft(
@@ -971,6 +1248,7 @@ bool EditCaptionBox::validateLength(const QString &text) const {
 void EditCaptionBox::applyChanges() {
 	if (!_preparedList.files.empty()) {
 		_preparedList.files.front().spoiler = _mediaEditManager.spoilered();
+		_preparedList.files.front().sendLargePhotos = _sendLargePhotos;
 	}
 }
 
@@ -997,6 +1275,7 @@ void EditCaptionBox::save() {
 	};
 
 	auto options = Api::SendOptions();
+	options.suggest = _suggest;
 	options.scheduled = item->isScheduled() ? item->date() : 0;
 	options.shortcutId = item->shortcutId();
 	options.invertCaption = _mediaEditManager.invertCaption();
@@ -1018,11 +1297,13 @@ void EditCaptionBox::save() {
 			applyChanges();
 		}
 
+		const auto compressed = CanToggleCompressed(_albumType)
+			? (!_asFile)
+			: AlbumTypeCompressed(_albumType);
+		saveSendWaySettings();
 		_controller->session().api().editMedia(
 			std::move(_preparedList),
-			(_isPhoto && !_asFile && CanBeCompressed(_albumType))
-				? SendMediaType::Photo
-				: SendMediaType::File,
+			(compressed ? SendMediaType::Photo : SendMediaType::File),
 			_field->getTextWithAppliedMarkdown(),
 			action);
 		closeAfterSave();
@@ -1062,7 +1343,7 @@ void EditCaptionBox::save() {
 }
 
 void EditCaptionBox::closeAfterSave() {
-	const auto weak = MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	if (_saved) {
 		_saved();
 	}
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.h b/Telegram/SourceFiles/boxes/edit_caption_box.h
index 74535061615f1b..7e11b5b2fe5ff3 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.h
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.h
@@ -24,10 +24,15 @@ namespace Data {
 class PhotoMedia;
 } // namespace Data
 
+namespace HistoryView::Controls {
+class ComposeAiButton;
+} // namespace HistoryView::Controls
+
 namespace Ui {
 class AbstractSinglePreview;
 class InputField;
 class EmojiButton;
+class PopupMenu;
 class VerticalLayout;
 enum class AlbumType;
 } // namespace Ui
@@ -39,6 +44,7 @@ class EditCaptionBox final : public Ui::BoxContent {
 		not_null<Window::SessionController*> controller,
 		not_null<HistoryItem*> item,
 		TextWithTags &&text,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Ui::PreparedList &&list,
@@ -49,6 +55,7 @@ class EditCaptionBox final : public Ui::BoxContent {
 		not_null<Window::SessionController*> controller,
 		FullMsgId itemId,
 		TextWithTags text,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Fn<void()> saved);
@@ -57,6 +64,7 @@ class EditCaptionBox final : public Ui::BoxContent {
 		FullMsgId itemId,
 		Ui::PreparedList &&list,
 		TextWithTags text,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Fn<void()> saved);
@@ -65,6 +73,7 @@ class EditCaptionBox final : public Ui::BoxContent {
 		std::shared_ptr<Data::PhotoMedia> media,
 		FullMsgId itemId,
 		TextWithTags text,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Fn<void()> saved);
@@ -82,7 +91,11 @@ class EditCaptionBox final : public Ui::BoxContent {
 private:
 	void rebuildPreview();
 	void setupEditEventHandler();
+	void showMenu(QPoint globalPos, bool forceTopRight);
+	void renameCurrentFile();
 	void setupPhotoEditorEventHandler();
+	void setupEditCoverHandler();
+	void setupClearCoverHandler();
 	void setupField();
 	void setupFieldAutocomplete();
 	void setupControls();
@@ -106,11 +119,15 @@ class EditCaptionBox final : public Ui::BoxContent {
 
 	[[nodiscard]] int errorTopSkip() const;
 	[[nodiscard]] bool hasSpoiler() const;
+	[[nodiscard]] bool hasSendLargePhotosOption() const;
+	[[nodiscard]] Ui::SendFilesWay currentSendWay() const;
+	void saveSendWaySettings();
 
 	bool setPreparedList(Ui::PreparedList &&list);
 
 	const not_null<Window::SessionController*> _controller;
 	const not_null<HistoryItem*> _historyItem;
+	const SuggestOptions _suggest;
 	const bool _isAllowedEditMedia;
 	const Ui::AlbumType _albumType;
 
@@ -118,10 +135,12 @@ class EditCaptionBox final : public Ui::BoxContent {
 	const base::unique_qptr<Ui::ScrollArea> _scroll;
 	const base::unique_qptr<Ui::InputField> _field;
 	const base::unique_qptr<Ui::EmojiButton> _emojiToggle;
+	HistoryView::Controls::ComposeAiButton *_aiButton = nullptr;
 
 	std::unique_ptr<ChatHelpers::FieldAutocomplete> _autocomplete;
 
 	base::unique_qptr<Ui::AbstractSinglePreview> _content;
+	base::unique_qptr<Ui::PopupMenu> _previewMenu;
 	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
 	base::unique_qptr<QObject> _emojiFilter;
 
@@ -138,7 +157,9 @@ class EditCaptionBox final : public Ui::BoxContent {
 
 	base::Timer _checkChangedTimer;
 	bool _isPhoto = false;
+	bool _isVideo = false;
 	bool _asFile = false;
+	bool _sendLargePhotos = false;
 
 	QString _error;
 
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index c9a9055e1a5cf1..a2b343f83bd5bc 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -8,41 +8,102 @@ For license and copyright information please follow this link:
 #include "boxes/edit_privacy_box.h"
 
 #include "api/api_global_privacy.h"
+#include "apiwrap.h"
 #include "boxes/filters/edit_filter_chats_list.h"
+#include "boxes/peers/edit_peer_invite_link.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_peer_values.h"
+#include "data/data_user.h"
+#include "history/history.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "settings/settings_common.h"
+#include "settings/sections/settings_premium.h"
+#include "settings/settings_privacy_controllers.h"
+#include "settings/sections/settings_privacy_security.h"
+#include "ui/boxes/peer_qr_box.h"
+#include "ui/controls/invite_link_buttons.h"
+#include "ui/controls/invite_link_label.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/layers/generic_box.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/shadow.h"
+#include "ui/painter.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
-#include "ui/wrap/slide_wrap.h"
-#include "ui/painter.h"
 #include "ui/vertical_list.h"
-#include "history/history.h"
-#include "boxes/peer_list_controllers.h"
-#include "settings/settings_premium.h"
-#include "settings/settings_privacy_security.h"
-#include "calls/calls_instance.h"
-#include "lang/lang_keys.h"
-#include "apiwrap.h"
-#include "main/main_app_config.h"
-#include "main/main_session.h"
-#include "data/data_user.h"
-#include "data/data_chat.h"
-#include "data/data_channel.h"
-#include "data/data_peer_values.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/slide_wrap.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
-#include "styles/style_settings.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+#include "styles/style_window.h"
 
 namespace {
 
 constexpr auto kPremiumsRowId = PeerId(FakeChatId(BareId(1))).value;
+constexpr auto kMiniAppsRowId = PeerId(FakeChatId(BareId(2))).value;
+constexpr auto kDefaultPrivateMessagesPrice = 10;
 
 using Exceptions = Api::UserPrivacy::Exceptions;
 
+enum class SpecialRowType {
+	Premiums,
+	MiniApps,
+};
+
+[[nodiscard]] PaintRoundImageCallback GeneratePremiumsUserpicCallback(
+		bool forceRound) {
+	return [=](QPainter &p, int x, int y, int outerWidth, int size) {
+		auto gradient = QLinearGradient(
+			QPointF(x, y),
+			QPointF(x + size, y + size));
+		gradient.setStops(Ui::Premium::ButtonGradientStops());
+
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(gradient);
+		if (forceRound) {
+			p.drawEllipse(x, y, size, size);
+		} else {
+			const auto radius = size * Ui::ForumUserpicRadiusMultiplier();
+			p.drawRoundedRect(x, y, size, size, radius, radius);
+		}
+		st::settingsPrivacyPremium.paintInCenter(p, QRect(x, y, size, size));
+	};
+}
+
+[[nodiscard]] PaintRoundImageCallback GenerateMiniAppsUserpicCallback(
+		bool forceRound) {
+	return [=](QPainter &p, int x, int y, int outerWidth, int size) {
+		const auto &color1 = st::historyPeer6UserpicBg;
+		const auto &color2 = st::historyPeer6UserpicBg2;
+
+		auto hq = PainterHighQualityEnabler(p);
+		auto gradient = QLinearGradient(x, y, x, y + size);
+		gradient.setStops({ { 0., color1->c }, { 1., color2->c } });
+
+		p.setPen(Qt::NoPen);
+		p.setBrush(gradient);
+		if (forceRound) {
+			p.drawEllipse(x, y, size, size);
+		} else {
+			const auto radius = size * Ui::ForumUserpicRadiusMultiplier();
+			p.drawRoundedRect(x, y, size, size, radius, radius);
+		}
+		st::windowFilterTypeBots.paintInCenter(p, QRect(x, y, size, size));
+	};
+}
+
 void CreateRadiobuttonLock(
 		not_null<Ui::RpWidget*> widget,
 		const style::Checkbox &st) {
@@ -52,11 +113,11 @@ void CreateRadiobuttonLock(
 	lock->resize(st::defaultRadio.diameter, st::defaultRadio.diameter);
 
 	widget->sizeValue(
-	) | rpl::start_with_next([=, &st](QSize size) {
+	) | rpl::on_next([=, &st](QSize size) {
 		lock->move(st.checkPosition);
 	}, lock->lifetime());
 
-	lock->paintRequest() | rpl::start_with_next([=] {
+	lock->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(lock);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto &icon = st::messagePrivacyLock;
@@ -79,7 +140,7 @@ void AddPremiumRequiredRow(
 	const auto row = Ui::CreateChild<Ui::AbstractButton>(widget.get());
 
 	widget->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		row->resize(s);
 	}, row->lifetime());
 	row->setClickedCallback(std::move(clickedCallback));
@@ -88,7 +149,7 @@ void AddPremiumRequiredRow(
 
 	Data::AmPremiumValue(
 		session
-	) | rpl::start_with_next([=](bool premium) {
+	) | rpl::on_next([=](bool premium) {
 		row->setVisible(!premium);
 		if (!premium) {
 			setDefaultOption();
@@ -102,7 +163,7 @@ class PrivacyExceptionsBoxController : public ChatsListBoxController {
 		not_null<Main::Session*> session,
 		rpl::producer<QString> title,
 		const Exceptions &selected,
-		bool allowChoosePremiums);
+		std::optional<SpecialRowType> allowChooseSpecial);
 
 	Main::Session &session() const override;
 	void rowClicked(not_null<PeerListRow*> row) override;
@@ -110,18 +171,20 @@ class PrivacyExceptionsBoxController : public ChatsListBoxController {
 	bool handleDeselectForeignRow(PeerListRowId itemId) override;
 
 	[[nodiscard]] bool premiumsSelected() const;
+	[[nodiscard]] bool miniAppsSelected() const;
 
 protected:
 	void prepareViewHook() override;
 	std::unique_ptr<Row> createRow(not_null<History*> history) override;
 
 private:
-	[[nodiscard]] object_ptr<Ui::RpWidget> preparePremiumsRowList();
+	[[nodiscard]] object_ptr<Ui::RpWidget> prepareSpecialRowList(
+		SpecialRowType type);
 
 	const not_null<Main::Session*> _session;
 	rpl::producer<QString> _title;
 	Exceptions _selected;
-	bool _allowChoosePremiums = false;
+	std::optional<SpecialRowType> _allowChooseSpecial;
 
 	PeerListContentDelegate *_typesDelegate = nullptr;
 	Fn<void(PeerListRowId)> _deselectOption;
@@ -133,9 +196,9 @@ struct RowSelectionChange {
 	bool checked = false;
 };
 
-class PremiumsRow final : public PeerListRow {
+class SpecialRow final : public PeerListRow {
 public:
-	PremiumsRow();
+	explicit SpecialRow(SpecialRowType type);
 
 	QString generateName() override;
 	QString generateShortName() override;
@@ -147,66 +210,61 @@ class PremiumsRow final : public PeerListRow {
 
 class TypesController final : public PeerListController {
 public:
-	TypesController(not_null<Main::Session*> session, bool premiums);
+	TypesController(not_null<Main::Session*> session, SpecialRowType type);
 
 	Main::Session &session() const override;
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
 
-	[[nodiscard]] bool premiumsSelected() const;
-	[[nodiscard]] rpl::producer<bool> premiumsChanges() const;
+	[[nodiscard]] bool specialSelected() const;
+	[[nodiscard]] rpl::producer<bool> specialChanges() const;
 	[[nodiscard]] auto rowSelectionChanges() const
 		-> rpl::producer<RowSelectionChange>;
 
 private:
 	const not_null<Main::Session*> _session;
+	const SpecialRowType _type;
 
 	rpl::event_stream<> _selectionChanged;
 	rpl::event_stream<RowSelectionChange> _rowSelectionChanges;
 
 };
 
-PremiumsRow::PremiumsRow() : PeerListRow(kPremiumsRowId) {
-	setCustomStatus(tr::lng_edit_privacy_premium_status(tr::now));
+SpecialRow::SpecialRow(SpecialRowType type)
+: PeerListRow((type == SpecialRowType::Premiums)
+	? kPremiumsRowId
+	: kMiniAppsRowId) {
+	setCustomStatus((id() == kPremiumsRowId)
+		? tr::lng_edit_privacy_premium_status(tr::now)
+		: tr::lng_edit_privacy_miniapps_status(tr::now));
 }
 
-QString PremiumsRow::generateName() {
-	return tr::lng_edit_privacy_premium(tr::now);
+QString SpecialRow::generateName() {
+	return (id() == kPremiumsRowId)
+		? tr::lng_edit_privacy_premium(tr::now)
+		: tr::lng_edit_privacy_miniapps(tr::now);
 }
 
-QString PremiumsRow::generateShortName() {
+QString SpecialRow::generateShortName() {
 	return generateName();
 }
 
-PaintRoundImageCallback PremiumsRow::generatePaintUserpicCallback(
+PaintRoundImageCallback SpecialRow::generatePaintUserpicCallback(
 		bool forceRound) {
-	return [=](QPainter &p, int x, int y, int outerWidth, int size) {
-		auto gradient = QLinearGradient(
-			QPointF(x, y),
-			QPointF(x + size, y + size));
-		gradient.setStops(Ui::Premium::ButtonGradientStops());
-
-		auto hq = PainterHighQualityEnabler(p);
-		p.setPen(Qt::NoPen);
-		p.setBrush(gradient);
-		if (forceRound) {
-			p.drawEllipse(x, y, size, size);
-		} else {
-			const auto radius = size * Ui::ForumUserpicRadiusMultiplier();
-			p.drawRoundedRect(x, y, size, size, radius, radius);
-		}
-		st::settingsPrivacyPremium.paintInCenter(p, QRect(x, y, size, size));
-	};
+	return (id() == kPremiumsRowId)
+		? GeneratePremiumsUserpicCallback(forceRound)
+		: GenerateMiniAppsUserpicCallback(forceRound);
 }
 
-bool PremiumsRow::useForumLikeUserpic() const {
+bool SpecialRow::useForumLikeUserpic() const {
 	return true;
 }
 
 TypesController::TypesController(
 	not_null<Main::Session*> session,
-	bool premiums)
-: _session(session) {
+	SpecialRowType type)
+: _session(session)
+, _type(type) {
 }
 
 Main::Session &TypesController::session() const {
@@ -214,12 +272,15 @@ Main::Session &TypesController::session() const {
 }
 
 void TypesController::prepare() {
-	delegate()->peerListAppendRow(std::make_unique<PremiumsRow>());
+	delegate()->peerListAppendRow(std::make_unique<SpecialRow>(_type));
 	delegate()->peerListRefreshRows();
 }
 
-bool TypesController::premiumsSelected() const {
-	const auto row = delegate()->peerListFindRow(kPremiumsRowId);
+bool TypesController::specialSelected() const {
+	const auto premiums = (_type == SpecialRowType::Premiums);
+	const auto row = delegate()->peerListFindRow(premiums
+		? kPremiumsRowId
+		: kMiniAppsRowId);
 	Assert(row != nullptr);
 
 	return row->checked();
@@ -231,10 +292,10 @@ void TypesController::rowClicked(not_null<PeerListRow*> row) {
 	_rowSelectionChanges.fire({ row, checked });
 }
 
-rpl::producer<bool> TypesController::premiumsChanges() const {
+rpl::producer<bool> TypesController::specialChanges() const {
 	return _rowSelectionChanges.events(
 	) | rpl::map([=] {
-		return premiumsSelected();
+		return specialSelected();
 	});
 }
 
@@ -247,12 +308,12 @@ PrivacyExceptionsBoxController::PrivacyExceptionsBoxController(
 	not_null<Main::Session*> session,
 	rpl::producer<QString> title,
 	const Exceptions &selected,
-	bool allowChoosePremiums)
+	std::optional<SpecialRowType> allowChooseSpecial)
 : ChatsListBoxController(session)
 , _session(session)
 , _title(std::move(title))
 , _selected(selected)
-, _allowChoosePremiums(allowChoosePremiums) {
+, _allowChooseSpecial(allowChooseSpecial) {
 }
 
 Main::Session &PrivacyExceptionsBoxController::session() const {
@@ -261,14 +322,18 @@ Main::Session &PrivacyExceptionsBoxController::session() const {
 
 void PrivacyExceptionsBoxController::prepareViewHook() {
 	delegate()->peerListSetTitle(std::move(_title));
-	if (_allowChoosePremiums || _selected.premiums) {
-		delegate()->peerListSetAboveWidget(preparePremiumsRowList());
+	if (_allowChooseSpecial || _selected.premiums || _selected.miniapps) {
+		delegate()->peerListSetAboveWidget(prepareSpecialRowList(
+			_allowChooseSpecial.value_or(_selected.premiums
+				? SpecialRowType::Premiums
+				: SpecialRowType::MiniApps)));
 	}
 	delegate()->peerListAddSelectedPeers(_selected.peers);
 }
 
 bool PrivacyExceptionsBoxController::isForeignRow(PeerListRowId itemId) {
-	return (itemId == kPremiumsRowId);
+	return (itemId == kPremiumsRowId)
+		|| (itemId == kMiniAppsRowId);
 }
 
 bool PrivacyExceptionsBoxController::handleDeselectForeignRow(
@@ -280,7 +345,8 @@ bool PrivacyExceptionsBoxController::handleDeselectForeignRow(
 	return false;
 }
 
-auto PrivacyExceptionsBoxController::preparePremiumsRowList()
+auto PrivacyExceptionsBoxController::prepareSpecialRowList(
+	SpecialRowType type)
 -> object_ptr<Ui::RpWidget> {
 	auto result = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
 	const auto container = result.data();
@@ -291,34 +357,43 @@ auto PrivacyExceptionsBoxController::preparePremiumsRowList()
 	_typesDelegate = lifetime.make_state<PeerListContentDelegateSimple>();
 	const auto controller = lifetime.make_state<TypesController>(
 		&session(),
-		_selected.premiums);
+		type);
 	const auto content = result->add(object_ptr<PeerListContent>(
 		container,
 		controller));
 	_typesDelegate->setContent(content);
 	controller->setDelegate(_typesDelegate);
 
+	const auto selectType = [&](PeerListRowId id) {
+		const auto row = _typesDelegate->peerListFindRow(id);
+		if (row) {
+			content->changeCheckState(row, true, anim::type::instant);
+			this->delegate()->peerListSetForeignRowChecked(
+				row,
+				true,
+				anim::type::instant);
+		}
+	};
 	if (_selected.premiums) {
-		const auto row = _typesDelegate->peerListFindRow(kPremiumsRowId);
-		Assert(row != nullptr);
-
-		content->changeCheckState(row, true, anim::type::instant);
-		this->delegate()->peerListSetForeignRowChecked(
-			row,
-			true,
-			anim::type::instant);
+		selectType(kPremiumsRowId);
+	} else if (_selected.miniapps) {
+		selectType(kMiniAppsRowId);
 	}
 	container->add(CreatePeerListSectionSubtitle(
 		container,
 		tr::lng_edit_privacy_users_and_groups()));
 
-	controller->premiumsChanges(
-	) | rpl::start_with_next([=](bool premiums) {
-		_selected.premiums = premiums;
+	controller->specialChanges(
+	) | rpl::on_next([=](bool chosen) {
+		if (type == SpecialRowType::Premiums) {
+			_selected.premiums = chosen;
+		} else {
+			_selected.miniapps = chosen;
+		}
 	}, lifetime);
 
 	controller->rowSelectionChanges(
-	) | rpl::start_with_next([=](RowSelectionChange update) {
+	) | rpl::on_next([=](RowSelectionChange update) {
 		this->delegate()->peerListSetForeignRowChecked(
 			update.row,
 			update.checked,
@@ -329,6 +404,8 @@ auto PrivacyExceptionsBoxController::preparePremiumsRowList()
 		if (const auto row = _typesDelegate->peerListFindRow(itemId)) {
 			if (itemId == kPremiumsRowId) {
 				_selected.premiums = false;
+			} else if (itemId == kMiniAppsRowId) {
+				_selected.miniapps = false;
 			}
 			_typesDelegate->peerListSetRowChecked(row, false);
 		}
@@ -337,10 +414,14 @@ auto PrivacyExceptionsBoxController::preparePremiumsRowList()
 	return result;
 }
 
-[[nodiscard]] bool PrivacyExceptionsBoxController::premiumsSelected() const {
+bool PrivacyExceptionsBoxController::premiumsSelected() const {
 	return _selected.premiums;
 }
 
+bool PrivacyExceptionsBoxController::miniAppsSelected() const {
+	return _selected.miniapps;
+}
+
 void PrivacyExceptionsBoxController::rowClicked(not_null<PeerListRow*> row) {
 	const auto peer = row->peer();
 
@@ -382,6 +463,145 @@ auto PrivacyExceptionsBoxController::createRow(not_null<History*> history)
 	return result;
 }
 
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeChargeStarsSlider(
+		QWidget *parent,
+		not_null<const style::MediaSlider*> sliderStyle,
+		not_null<const style::FlatLabel*> labelStyle,
+		int valuesCount,
+		Fn<int(int)> valueByIndex,
+		int value,
+		int minValue,
+		int maxValue,
+		Fn<void(int)> valueProgress,
+		Fn<void(int)> valueFinished) {
+	auto result = object_ptr<Ui::VerticalLayout>(parent);
+	const auto raw = result.data();
+
+	const auto labels = raw->add(object_ptr<Ui::RpWidget>(raw));
+	const auto min = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		Lang::FormatCountDecimal(minValue),
+		*labelStyle);
+	const auto max = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		Lang::FormatCountDecimal(maxValue),
+		*labelStyle);
+	const auto current = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		Lang::FormatCountDecimal(value),
+		*labelStyle);
+	min->setTextColorOverride(st::windowSubTextFg->c);
+	max->setTextColorOverride(st::windowSubTextFg->c);
+	const auto slider = raw->add(object_ptr<Ui::MediaSliderWheelless>(
+		raw,
+		*sliderStyle));
+	labels->resize(
+		labels->width(),
+		current->height() + st::defaultVerticalListSkip);
+	struct State {
+		int indexMin = 0;
+		int index = 0;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+	const auto updateByIndex = [=] {
+		const auto outer = labels->width();
+		const auto minWidth = min->width();
+		const auto maxWidth = max->width();
+		const auto currentWidth = current->width();
+		if (minWidth + maxWidth + currentWidth > outer) {
+			return;
+		}
+
+		min->moveToLeft(0, 0, outer);
+		max->moveToRight(0, 0, outer);
+		current->moveToLeft((outer - current->width()) / 2, 0, outer);
+	};
+	const auto updateByValue = [=](int value) {
+		current->setText(value > 0
+			? tr::lng_action_gift_for_stars(tr::now, lt_count_decimal, value)
+			: tr::lng_manage_monoforum_free(tr::now));
+
+		state->index = 0;
+		auto maxIndex = valuesCount - 1;
+		while (state->index < maxIndex) {
+			const auto mid = (state->index + maxIndex) / 2;
+			const auto midValue = valueByIndex(mid);
+			if (midValue == value) {
+				state->index = mid;
+				break;
+			} else if (midValue < value) {
+				state->index = mid + 1;
+			} else {
+				maxIndex = mid - 1;
+			}
+		}
+		updateByIndex();
+	};
+	const auto progress = [=](int value) {
+		updateByValue(value);
+		valueProgress(value);
+	};
+	const auto finished = [=](int value) {
+		updateByValue(value);
+		valueFinished(value);
+	};
+	style::PaletteChanged() | rpl::on_next([=] {
+		min->setTextColorOverride(st::windowSubTextFg->c);
+		max->setTextColorOverride(st::windowSubTextFg->c);
+	}, raw->lifetime());
+	updateByValue(value);
+	state->indexMin = 0;
+
+	slider->setPseudoDiscrete(
+		valuesCount,
+		valueByIndex,
+		value,
+		progress,
+		finished,
+		state->indexMin);
+	slider->resize(slider->width(), sliderStyle->seekSize.height());
+
+	raw->widthValue() | rpl::on_next([=](int width) {
+		labels->resizeToWidth(width);
+		updateByIndex();
+	}, slider->lifetime());
+
+	return result;
+}
+
+void EditNoPaidMessagesExceptions(
+		not_null<Window::SessionController*> window,
+		const Api::UserPrivacy::Rule &value) {
+	auto controller = std::make_unique<PrivacyExceptionsBoxController>(
+		&window->session(),
+		tr::lng_messages_privacy_remove_fee(),
+		value.always,
+		std::optional<SpecialRowType>());
+	auto initBox = [=, controller = controller.get()](
+			not_null<PeerListBox*> box) {
+		box->addButton(tr::lng_settings_save(), [=] {
+			auto copy = value;
+			auto &setTo = copy.always;
+			setTo.peers = box->collectSelectedRows();
+			setTo.premiums = false;
+			setTo.miniapps = false;
+			auto &removeFrom = copy.never;
+			for (const auto &peer : setTo.peers) {
+				removeFrom.peers.erase(
+					ranges::remove(removeFrom.peers, peer),
+					end(removeFrom.peers));
+			}
+			window->session().api().userPrivacy().save(
+				Api::UserPrivacy::Key::NoPaidMessages,
+				copy);
+			box->closeBox();
+		});
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	};
+	window->show(
+		Box<PeerListBox>(std::move(controller), std::move(initBox)));
+}
+
 } // namespace
 
 bool EditPrivacyController::hasOption(Option option) const {
@@ -412,6 +632,11 @@ EditPrivacyBox::EditPrivacyBox(
 		// If we switch from Everyone to Contacts or Nobody suggest Premiums.
 		_value.always.premiums = true;
 	}
+	if (_controller->allowMiniAppsToggle(Exception::Always)
+		&& _value.option == Option::Everyone) {
+		// If we switch from Everyone to Contacts or Nobody suggest MiniApps.
+		_value.always.miniapps = true;
+	}
 }
 
 void EditPrivacyBox::prepare() {
@@ -427,12 +652,18 @@ void EditPrivacyBox::editExceptions(
 		&_window->session(),
 		_controller->exceptionBoxTitle(exception),
 		exceptions(exception),
-		_controller->allowPremiumsToggle(exception));
+		(_controller->allowPremiumsToggle(exception)
+			? SpecialRowType::Premiums
+			: _controller->allowMiniAppsToggle(exception)
+			? SpecialRowType::MiniApps
+			: std::optional<SpecialRowType>()));
 	auto initBox = [=, controller = controller.get()](
 			not_null<PeerListBox*> box) {
 		box->addButton(tr::lng_settings_save(), crl::guard(this, [=] {
-			exceptions(exception).peers = box->collectSelectedRows();
-			exceptions(exception).premiums = controller->premiumsSelected();
+			auto &setTo = exceptions(exception);
+			setTo.peers = box->collectSelectedRows();
+			setTo.premiums = controller->premiumsSelected();
+			setTo.miniapps = controller->miniAppsSelected();
 			const auto type = [&] {
 				switch (exception) {
 				case Exception::Always: return Exception::Never;
@@ -440,11 +671,17 @@ void EditPrivacyBox::editExceptions(
 				}
 				Unexpected("Invalid exception value.");
 			}();
-			auto &removeFrom = exceptions(type).peers;
-			for (const auto peer : exceptions(exception).peers) {
-				removeFrom.erase(
-					ranges::remove(removeFrom, peer),
-					end(removeFrom));
+			auto &removeFrom = exceptions(type);
+			for (const auto &peer : exceptions(exception).peers) {
+				removeFrom.peers.erase(
+					ranges::remove(removeFrom.peers, peer),
+					end(removeFrom.peers));
+			}
+			if (setTo.premiums) {
+				removeFrom.premiums = false;
+			}
+			if (setTo.miniapps) {
+				removeFrom.miniapps = false;
 			}
 			done();
 			box->closeBox();
@@ -566,14 +803,21 @@ void EditPrivacyBox::setupContent() {
 					lt_count,
 					count)
 				: tr::lng_edit_privacy_exceptions_add(tr::now);
-			return !value.premiums
-				? users
-				: !count
-				? tr::lng_edit_privacy_premium(tr::now)
-				: tr::lng_edit_privacy_exceptions_premium_and(
-					tr::now,
-					lt_users,
-					users);
+			return value.premiums
+				? (!count
+					? tr::lng_edit_privacy_premium(tr::now)
+					: tr::lng_edit_privacy_exceptions_premium_and(
+						tr::now,
+						lt_users,
+						users))
+				: value.miniapps
+				? (!count
+					? tr::lng_edit_privacy_miniapps(tr::now)
+					: tr::lng_edit_privacy_exceptions_miniapps_and(
+						tr::now,
+						lt_users,
+						users))
+				: users;
 		});
 		_controller->handleExceptionsChange(
 			exception,
@@ -663,9 +907,11 @@ void EditPrivacyBox::setupContent() {
 		{ 0, st::settingsPrivacySkipTop, 0, 0 });
 	const auto always = addExceptionLink(Exception::Always);
 	const auto never = addExceptionLink(Exception::Never);
+	_always = always->entity();
+	_never = never->entity();
 	addLabel(
 		content,
-		_controller->exceptionsDescription() | Ui::Text::ToWithEntities(),
+		_controller->exceptionsDescription() | rpl::map(tr::marked),
 		st::defaultVerticalListSkip);
 
 	auto below = _controller->setupBelowWidget(
@@ -697,7 +943,7 @@ void EditPrivacyBox::setupContent() {
 		+ st::settingsButtonNoIcon.padding.bottom();
 
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		content->resizeToWidth(width);
 	}, content->lifetime());
 
@@ -705,32 +951,50 @@ void EditPrivacyBox::setupContent() {
 	) | rpl::map([=](int height) {
 		return height - always->height() - never->height() + 2 * linkHeight;
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWideWidth, height);
 	}, content->lifetime());
 }
 
+void EditPrivacyBox::showFinished() {
+	_window->checkHighlightControl(u"privacy/always"_q, _always.data());
+	_window->checkHighlightControl(u"privacy/never"_q, _never.data());
+	_controller->checkHighlightControls(_window);
+}
+
 void EditMessagesPrivacyBox(
 		not_null<Ui::GenericBox*> box,
-		not_null<Window::SessionController*> controller) {
+		not_null<Window::SessionController*> controller,
+		const QString &highlightControlId) {
 	box->setTitle(tr::lng_messages_privacy_title());
 	box->setWidth(st::boxWideWidth);
 
 	constexpr auto kOptionAll = 0;
 	constexpr auto kOptionPremium = 1;
+	constexpr auto kOptionCharge = 2;
 
+	const auto session = &controller->session();
 	const auto allowed = [=] {
-		return controller->session().premium()
-			|| controller->session().appConfig().newRequirePremiumFree();
+		return session->premium()
+			|| session->appConfig().newRequirePremiumFree();
 	};
-	const auto privacy = &controller->session().api().globalPrivacy();
+	const auto privacy = &session->api().globalPrivacy();
 	const auto inner = box->verticalLayout();
 	inner->add(object_ptr<Ui::PlainShadow>(box));
 
+	auto highlightCharged = (Ui::RpWidget*)nullptr;
+	auto highlightRemoveFee = (Ui::RpWidget*)nullptr;
+
 	Ui::AddSkip(inner, st::messagePrivacyTopSkip);
 	Ui::AddSubsectionTitle(inner, tr::lng_messages_privacy_subtitle());
 	const auto group = std::make_shared<Ui::RadiobuttonGroup>(
-		privacy->newRequirePremiumCurrent() ? kOptionPremium : kOptionAll);
+		(!allowed()
+			? kOptionAll
+			: privacy->newRequirePremiumCurrent()
+			? kOptionPremium
+			: privacy->newChargeStarsCurrent()
+			? kOptionCharge
+			: kOptionAll));
 	inner->add(
 		object_ptr<Ui::Radiobutton>(
 			inner,
@@ -752,18 +1016,107 @@ void EditMessagesPrivacyBox(
 			0,
 			st::messagePrivacyBottomSkip));
 
+	Ui::AddDividerText(inner, tr::lng_messages_privacy_about());
+
+	const auto available = session->appConfig().paidMessagesAvailable();
+
+	const auto charged = available
+		? inner->add(
+			object_ptr<Ui::Radiobutton>(
+				inner,
+				group,
+				kOptionCharge,
+				tr::lng_messages_privacy_charge(tr::now),
+				st::messagePrivacyCheck),
+			st::settingsSendTypePadding + style::margins(
+				0,
+				st::messagePrivacyBottomSkip,
+				0,
+				st::messagePrivacyBottomSkip))
+		: nullptr;
+	highlightCharged = charged;
+
+	struct State {
+		rpl::variable<int> stars;
+	};
+	const auto state = std::make_shared<State>();
+	const auto savedValue = privacy->newChargeStarsCurrent();
+
+	if (available) {
+		Ui::AddDividerText(inner, tr::lng_messages_privacy_charge_about());
+
+		const auto chargeWrap = inner->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				inner,
+				object_ptr<Ui::VerticalLayout>(inner)));
+		const auto chargeInner = chargeWrap->entity();
+
+		Ui::AddSkip(chargeInner);
+
+		state->stars = SetupChargeSlider(
+			chargeInner,
+			session->user(),
+			(savedValue > 0) ? savedValue : std::optional<int>(),
+			kDefaultPrivateMessagesPrice);
+
+		Ui::AddSkip(chargeInner);
+		Ui::AddSubsectionTitle(
+			chargeInner,
+			tr::lng_messages_privacy_exceptions());
+
+		const auto key = Api::UserPrivacy::Key::NoPaidMessages;
+		session->api().userPrivacy().reload(key);
+		auto label = session->api().userPrivacy().value(
+			key
+		) | rpl::map([=](const Api::UserPrivacy::Rule &value) {
+			using namespace Settings;
+			const auto always = ExceptionUsersCount(value.always.peers);
+			return always
+				? tr::lng_edit_privacy_exceptions_count(
+					tr::now,
+					lt_count,
+					always)
+				: tr::lng_edit_privacy_exceptions_add(tr::now);
+		});
+
+		const auto exceptions = Settings::AddButtonWithLabel(
+			chargeInner,
+			tr::lng_messages_privacy_remove_fee(),
+			std::move(label),
+			st::settingsButtonNoIcon);
+		highlightRemoveFee = exceptions;
+
+		const auto shower = exceptions->lifetime().make_state<rpl::lifetime>();
+		exceptions->setClickedCallback([=] {
+			*shower = session->api().userPrivacy().value(
+				key
+			) | rpl::take(
+				1
+			) | rpl::on_next([=](const Api::UserPrivacy::Rule &value) {
+				EditNoPaidMessagesExceptions(controller, value);
+			});
+		});
+		Ui::AddSkip(chargeInner);
+		Ui::AddDividerText(
+			chargeInner,
+			tr::lng_messages_privacy_remove_about());
+
+		using namespace rpl::mappers;
+		chargeWrap->toggleOn(group->value() | rpl::map(_1 == kOptionCharge));
+		chargeWrap->finishAnimating();
+	}
 	using WeakToast = base::weak_ptr<Ui::Toast::Instance>;
 	const auto toast = std::make_shared<WeakToast>();
 	const auto showToast = [=] {
-		auto link = Ui::Text::Link(
-			Ui::Text::Semibold(
+		auto link = tr::link(
+			tr::semibold(
 				tr::lng_messages_privacy_premium_link(tr::now)));
 		(*toast) = controller->showToast({
 			.text = tr::lng_messages_privacy_premium(
 				tr::now,
 				lt_link,
 				link,
-				Ui::Text::WithEntities),
+				tr::marked),
 			.filter = crl::guard(&controller->session(), [=](
 					const ClickHandlerPtr &,
 					Qt::MouseButton button) {
@@ -781,19 +1134,20 @@ void EditMessagesPrivacyBox(
 			}),
 		});
 	};
+
 	if (!allowed()) {
 		CreateRadiobuttonLock(restricted, st::messagePrivacyCheck);
+		if (charged) {
+			CreateRadiobuttonLock(charged, st::messagePrivacyCheck);
+		}
 
 		group->setChangedCallback([=](int value) {
-			if (value == kOptionPremium) {
+			if (value == kOptionPremium || value == kOptionCharge) {
 				group->setValue(kOptionAll);
 				showToast();
 			}
 		});
-	}
 
-	Ui::AddDividerText(inner, tr::lng_messages_privacy_about());
-	if (!allowed()) {
 		Ui::AddSkip(inner);
 		Settings::AddButtonWithIcon(
 			inner,
@@ -813,8 +1167,12 @@ void EditMessagesPrivacyBox(
 	} else {
 		box->addButton(tr::lng_settings_save(), [=] {
 			if (allowed()) {
-				privacy->updateNewRequirePremium(
-					group->current() == kOptionPremium);
+				const auto value = group->current();
+				const auto premiumRequired = (value == kOptionPremium);
+				const auto chargeStars = (value == kOptionCharge)
+					? state->stars.current()
+					: 0;
+				privacy->updateMessagesPrivacy(premiumRequired, chargeStars);
 				box->closeBox();
 			} else {
 				showToast();
@@ -824,4 +1182,233 @@ void EditMessagesPrivacyBox(
 			box->closeBox();
 		});
 	}
+
+	if (!highlightControlId.isEmpty()) {
+		box->showFinishes() | rpl::take(1) | rpl::on_next([=] {
+			if (highlightControlId == u"privacy/set-price"_q) {
+				Settings::HighlightWidget(
+					highlightCharged,
+					{ .radius = st::boxRadius });
+			} else if (highlightControlId == u"privacy/remove-fee"_q) {
+				Settings::HighlightWidget(highlightRemoveFee);
+			}
+		}, box->lifetime());
+	}
+}
+
+rpl::producer<int> SetupChargeSlider(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<PeerData*> peer,
+		std::optional<int> savedValue,
+		int defaultValue,
+		bool allowZero) {
+	struct State {
+		rpl::variable<int> stars;
+	};
+	const auto broadcast = peer->isBroadcast();
+	const auto group = !broadcast && !peer->isUser();
+	const auto state = container->lifetime().make_state<State>();
+	const auto chargeStars = savedValue.value_or(defaultValue);
+	state->stars = chargeStars;
+
+	Ui::AddSubsectionTitle(container, broadcast
+		? tr::lng_manage_monoforum_price()
+		: group
+		? tr::lng_rights_charge_price()
+		: tr::lng_messages_privacy_price());
+
+	auto values = std::vector<int>();
+	const auto minStars = allowZero ? 0 : 1;
+	const auto maxStars = peer->session().appConfig().paidMessageStarsMax();
+	if (chargeStars < minStars) {
+		values.push_back(chargeStars);
+	}
+	for (auto i = minStars; i < std::min(100, maxStars); ++i) {
+		values.push_back(i);
+	}
+	for (auto i = 100; i < std::min(1000, maxStars); i += 10) {
+		if (i < chargeStars + 10 && chargeStars < i) {
+			values.push_back(chargeStars);
+		}
+		values.push_back(i);
+	}
+	for (auto i = 1000; i < maxStars + 1; i += 100) {
+		if (i < chargeStars + 100 && chargeStars < i) {
+			values.push_back(chargeStars);
+		}
+		values.push_back(i);
+	}
+	const auto valuesCount = int(values.size());
+	const auto setStars = [=](int value) {
+		state->stars = value;
+	};
+	container->add(
+		MakeChargeStarsSlider(
+			container,
+			&st::settingsScale,
+			&st::settingsScaleLabel,
+			valuesCount,
+			[=](int index) { return values[index]; },
+			chargeStars,
+			minStars,
+			maxStars,
+			setStars,
+			setStars),
+		st::boxRowPadding);
+
+	const auto skip = 2 * st::defaultVerticalListSkip;
+	Ui::AddSkip(container, skip);
+
+	const auto details = container->add(
+		object_ptr<Ui::VerticalLayout>(container));
+	state->stars.value() | rpl::on_next([=](int stars) {
+		while (details->count()) {
+			delete details->widgetAt(0);
+		}
+		if (!stars) {
+			Ui::AddDivider(details);
+			return;
+		}
+		const auto &appConfig = peer->session().appConfig();
+		const auto percent = appConfig.paidMessageCommission();
+		const auto ratio = appConfig.starsWithdrawRate();
+		const auto dollars = int(base::SafeRound(stars * ratio));
+		const auto amount = Ui::FillAmountAndCurrency(dollars, u"USD"_q);
+		Ui::AddDividerText(
+			details,
+			(broadcast
+				? tr::lng_manage_monoforum_price_about
+				: group
+				? tr::lng_rights_charge_price_about
+				: tr::lng_messages_privacy_price_about)(
+					lt_percent,
+					rpl::single(QString::number(percent / 10.) + '%'),
+					lt_amount,
+					rpl::single('~' + amount)));
+	}, details->lifetime());
+	return state->stars.value();
+}
+
+void EditDirectMessagesPriceBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<ChannelData*> channel,
+		std::optional<int> savedValue,
+		Fn<void(std::optional<int>)> callback) {
+	box->setTitle(tr::lng_manage_monoforum());
+	box->setWidth(st::boxWideWidth);
+
+	const auto container = box->verticalLayout();
+
+	Settings::AddDividerTextWithLottie(container, {
+		.lottie = u"direct_messages"_q,
+		.lottieSize = st::settingsFilterIconSize,
+		.lottieMargins = st::settingsFilterIconPadding,
+		.showFinished = box->showFinishes(),
+		.about = tr::lng_manage_monoforum_about(
+			tr::rich
+		),
+		.aboutMargins = st::settingsFilterDividerLabelPadding,
+	});
+
+	Ui::AddSkip(container);
+
+	const auto toggle = container->add(object_ptr<Ui::SettingsButton>(
+		box,
+		tr::lng_manage_monoforum_allow(),
+		st::settingsButtonNoIcon));
+	toggle->toggleOn(rpl::single(savedValue.has_value()));
+
+	Ui::AddSkip(container);
+	Ui::AddDivider(container);
+	Ui::AddSkip(container);
+
+	const auto wrap = box->addRow(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			box,
+			object_ptr<Ui::VerticalLayout>(box)),
+		style::margins());
+	wrap->toggle(savedValue.has_value(), anim::type::instant);
+	wrap->toggleOn(toggle->toggledChanges());
+
+	const auto result = box->lifetime().make_state<int>(
+		savedValue.value_or(0));
+
+	const auto inner = wrap->entity();
+	Ui::AddSkip(inner);
+	SetupChargeSlider(
+		inner,
+		channel,
+		savedValue,
+		channel->session().appConfig().paidMessageChannelStarsDefault(),
+		true
+	) | rpl::on_next([=](int stars) {
+		*result = stars;
+	}, box->lifetime());
+
+	if (const auto username = channel->username(); !username.isEmpty()) {
+		Ui::AddSkip(inner);
+		Ui::AddSubsectionTitle(
+			inner,
+			tr::lng_manage_monoforum_link_subtitle());
+
+		constexpr auto kDirectParam = "?direct"_cs;
+		const auto link = channel->session().createInternalLinkFull(username)
+			+ kDirectParam.utf8();
+		const auto copyLink = [=] {
+			TextUtilities::SetClipboardText(TextForMimeData::Simple(link));
+			box->uiShow()->showToast({
+				.text = { tr::lng_group_invite_copied(tr::now) },
+				.iconLottie = u"toast/voip_invite"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		};
+		const auto shareLink = [=] {
+			box->uiShow()->showBox(ShareInviteLinkBox(channel, link));
+		};
+		const auto createMenu = [=] {
+			auto result = base::make_unique_q<Ui::PopupMenu>(
+				inner,
+				st::popupMenuWithIcons);
+			result->addAction(
+				tr::lng_group_invite_context_qr(tr::now),
+				[=] {
+					box->uiShow()->showBox(Box([=](
+							not_null<Ui::GenericBox*> qrBox) {
+						Ui::FillPeerQrBox(qrBox, channel, link, nullptr);
+					}));
+				},
+				&st::menuIconQrCode);
+			return result;
+		};
+
+		auto linkText = Ui::Text::StripUrlProtocol(link);
+		const auto label = inner->lifetime().make_state<Ui::InviteLinkLabel>(
+			inner,
+			rpl::single(std::move(linkText)),
+			createMenu);
+		inner->add(
+			label->take(),
+			st::inviteLinkFieldPadding);
+
+		label->clicks() | rpl::on_next(copyLink, label->lifetime());
+
+		Ui::AddSkip(inner);
+
+		AddCopyShareLinkButtons(inner, copyLink, shareLink);
+		Ui::AddSkip(inner);
+		Ui::AddSkip(inner);
+
+		Ui::AddDivider(inner);
+	}
+
+	box->addButton(tr::lng_settings_save(), [=] {
+		const auto weak = base::make_weak(box);
+		callback(toggle->toggled() ? *result : std::optional<int>());
+		if (const auto strong = weak.get()) {
+			strong->closeBox();
+		}
+	});
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
 }
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.h b/Telegram/SourceFiles/boxes/edit_privacy_box.h
index 3aae284032e9a2..4265cba9b19804 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.h
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.h
@@ -61,6 +61,10 @@ class EditPrivacyController {
 			Exception exception) const {
 		return false;
 	}
+	[[nodiscard]] virtual bool allowMiniAppsToggle(
+			Exception exception) const {
+		return false;
+	}
 	virtual void handleExceptionsChange(
 		Exception exception,
 		rpl::producer<int> value) {
@@ -100,6 +104,10 @@ class EditPrivacyController {
 		return nullptr;
 	}
 
+	virtual void checkHighlightControls(
+			not_null<Window::SessionController*> controller) {
+	}
+
 	virtual ~EditPrivacyController() = default;
 
 protected:
@@ -139,6 +147,7 @@ class EditPrivacyBox final : public Ui::BoxContent {
 
 protected:
 	void prepare() override;
+	void showFinished() override;
 
 private:
 	bool showExceptionLink(Exception exception) const;
@@ -159,9 +168,25 @@ class EditPrivacyBox final : public Ui::BoxContent {
 	const not_null<Window::SessionController*> _window;
 	std::unique_ptr<EditPrivacyController> _controller;
 	Value _value;
+	QPointer<QWidget> _always;
+	QPointer<QWidget> _never;
 
 };
 
 void EditMessagesPrivacyBox(
 	not_null<Ui::GenericBox*> box,
-	not_null<Window::SessionController*> controller);
+	not_null<Window::SessionController*> controller,
+	const QString &highlightControlId = QString());
+
+[[nodiscard]] rpl::producer<int> SetupChargeSlider(
+	not_null<Ui::VerticalLayout*> container,
+	not_null<PeerData*> peer,
+	std::optional<int> savedValue,
+	int defaultValue,
+	bool allowZero = false);
+
+void EditDirectMessagesPriceBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<ChannelData*> channel,
+	std::optional<int> savedValue,
+	Fn<void(std::optional<int>)> callback);
diff --git a/Telegram/SourceFiles/boxes/edit_todo_list_box.cpp b/Telegram/SourceFiles/boxes/edit_todo_list_box.cpp
new file mode 100644
index 00000000000000..118a969fb725ed
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/edit_todo_list_box.cpp
@@ -0,0 +1,1287 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/edit_todo_list_box.h"
+
+#include "base/call_delayed.h"
+#include "base/event_filter.h"
+#include "base/random.h"
+#include "base/unique_qptr.h"
+#include "chat_helpers/emoji_suggestions_widget.h"
+#include "chat_helpers/message_field.h"
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "data/data_changes.h"
+#include "data/data_media_types.h"
+#include "data/data_session.h"
+#include "data/data_todo_list.h"
+#include "data/data_user.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "history/view/history_view_schedule_box.h"
+#include "history/history_item.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "menu/menu_send.h"
+#include "ui/controls/emoji_button.h"
+#include "ui/controls/emoji_button_factory.h"
+#include "ui/rect.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/ui_utility.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h" // defaultComposeFiles.
+#include "styles/style_layers.h"
+#include "styles/style_polls.h"
+#include "styles/style_settings.h"
+
+namespace {
+
+constexpr auto kWarnTitleLimit = 12;
+constexpr auto kWarnTaskLimit = 24;
+constexpr auto kErrorLimit = 99;
+
+class Tasks {
+public:
+	Tasks(
+		not_null<Ui::BoxContent*> box,
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Window::SessionController*> controller,
+		ChatHelpers::TabbedPanel *emojiPanel,
+		std::vector<TodoListItem> existing = {},
+		bool existingLocked = false);
+
+	[[nodiscard]] bool hasTasks() const;
+	[[nodiscard]] bool isValid() const;
+	[[nodiscard]] std::vector<TodoListItem> toTodoListItems() const;
+	void focusFirst();
+
+	[[nodiscard]] rpl::producer<int> addedCount() const;
+	[[nodiscard]] rpl::producer<not_null<QWidget*>> scrollToWidget() const;
+	[[nodiscard]] rpl::producer<> backspaceInFront() const;
+	[[nodiscard]] rpl::producer<> tabbed() const;
+
+private:
+	class Task {
+	public:
+		Task(
+			not_null<QWidget*> outer,
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Main::Session*> session,
+			int id,
+			int position,
+			bool locked);
+
+		Task(const Task &other) = delete;
+		Task &operator=(const Task &other) = delete;
+
+		void toggleRemoveAlways(bool toggled);
+
+		void show(anim::type animated);
+		void destroy(FnMut<void()> done);
+
+		[[nodiscard]] bool hasShadow() const;
+		void createShadow();
+		void destroyShadow();
+
+		[[nodiscard]] int id() const;
+		[[nodiscard]] bool locked() const;
+		[[nodiscard]] bool isEmpty() const;
+		[[nodiscard]] bool isGood() const;
+		[[nodiscard]] bool isTooLong() const;
+		[[nodiscard]] bool hasFocus() const;
+		void setFocus() const;
+		void clearValue();
+
+		void setPlaceholder() const;
+		void removePlaceholder() const;
+
+		[[nodiscard]] not_null<Ui::InputField*> field() const;
+
+		[[nodiscard]] TodoListItem toTodoListItem(int nextId) const;
+
+		[[nodiscard]] rpl::producer<Qt::MouseButton> removeClicks() const;
+
+	private:
+		void createRemove();
+		void createWarning();
+		void updateFieldGeometry();
+
+		int _id = 0;
+		base::unique_qptr<Ui::SlideWrap<Ui::RpWidget>> _wrap;
+		not_null<Ui::RpWidget*> _content;
+		Ui::InputField *_field = nullptr;
+		base::unique_qptr<Ui::PlainShadow> _shadow;
+		base::unique_qptr<Ui::CrossButton> _remove;
+		rpl::variable<bool> *_removeAlways = nullptr;
+		int _limit = 0;
+
+	};
+
+	[[nodiscard]] bool full() const;
+	[[nodiscard]] bool correctShadows() const;
+	void fixShadows();
+	void removeEmptyTail();
+	void addEmptyTask();
+	void addTask(
+		int id,
+		TextWithEntities text,
+		anim::type animated);
+	void insertTask(
+		int beforeIndex,
+		int id,
+		TextWithEntities text,
+		anim::type animated);
+	void initTaskField(not_null<Task*> task, TextWithEntities text);
+	void checkLastTask();
+	void validateState();
+	void fixAfterErase();
+	void destroy(std::unique_ptr<Task> task);
+	void removeDestroyed(not_null<Task*> field);
+	int findField(not_null<Ui::InputField*> field) const;
+	void handlePaste(
+		not_null<Ui::InputField*> field,
+		const QStringList &list);
+
+	not_null<Ui::BoxContent*> _box;
+	not_null<Ui::VerticalLayout*> _container;
+	const not_null<Window::SessionController*> _controller;
+	const int _existingCount = 0;
+	const bool _existingLocked = false;
+	ChatHelpers::TabbedPanel * const _emojiPanel;
+	int _position = 0;
+	int _tasksLimit = 0;
+	std::vector<std::unique_ptr<Task>> _list;
+	std::vector<std::unique_ptr<Task>> _destroyed;
+	rpl::variable<int> _addedCount = 0;
+	bool _hasTasks = false;
+	bool _isValid = false;
+	rpl::event_stream<not_null<QWidget*>> _scrollToWidget;
+	rpl::event_stream<> _backspaceInFront;
+	rpl::event_stream<> _tabbed;
+	rpl::lifetime _emojiPanelLifetime;
+
+};
+
+void InitField(
+		not_null<QWidget*> container,
+		not_null<Ui::InputField*> field,
+		not_null<Main::Session*> session) {
+	field->setInstantReplaces(Ui::InstantReplaces::Default());
+	field->setInstantReplacesEnabled(
+		Core::App().settings().replaceEmojiValue(),
+		Core::App().settings().systemTextReplaceValue());
+	auto options = Ui::Emoji::SuggestionsController::Options();
+	options.suggestExactFirstWord = false;
+	Ui::Emoji::SuggestionsController::Init(
+		container,
+		field,
+		session,
+		options);
+}
+
+[[nodiscard]] QStringList ParsePastedList(const QString &text) {
+	auto list = QStringView(text).split('\n');
+	for (auto i = list.begin(); i != list.end();) {
+		auto text = i->trimmed();
+		if (text.isEmpty() && (i + 1 != list.end())) {
+			i = list.erase(i);
+		} else {
+			*i++ = text;
+		}
+	}
+	if (list.size() < 2) {
+		return {};
+	}
+	auto result = QStringList();
+	result.reserve(list.size());
+	for (const auto &view : list) {
+		result.push_back(view.toString());
+	}
+	return result;
+}
+
+not_null<Ui::FlatLabel*> CreateWarningLabel(
+		not_null<QWidget*> parent,
+		not_null<Ui::InputField*> field,
+		int valueLimit,
+		int warnLimit) {
+	const auto result = Ui::CreateChild<Ui::FlatLabel>(
+		parent.get(),
+		QString(),
+		st::createPollWarning);
+	result->setAttribute(Qt::WA_TransparentForMouseEvents);
+	field->changes(
+	) | rpl::on_next([=] {
+		Ui::PostponeCall(crl::guard(field, [=] {
+			const auto length = field->getLastText().size();
+			const auto value = valueLimit - length;
+			const auto shown = (value < warnLimit)
+				&& (field->height() > st::createPollOptionField.heightMin);
+			if (value >= 0) {
+				result->setText(QString::number(value));
+			} else {
+				constexpr auto kMinus = QChar(0x2212);
+				result->setMarkedText(Ui::Text::Colorized(
+					kMinus + QString::number(std::abs(value))));
+			}
+			result->setVisible(shown);
+		}));
+	}, field->lifetime());
+	return result;
+}
+
+void FocusAtEnd(not_null<Ui::InputField*> field) {
+	field->setFocus();
+	field->setCursorPosition(field->getLastText().size());
+	field->ensureCursorVisible();
+}
+
+[[nodiscard]] base::unique_qptr<ChatHelpers::TabbedPanel> MakeEmojiPanel(
+		not_null<QWidget*> outer,
+		not_null<Window::SessionController*> controller) {
+	auto result = base::make_unique_q<ChatHelpers::TabbedPanel>(
+		outer,
+		controller,
+		object_ptr<ChatHelpers::TabbedSelector>(
+			nullptr,
+			controller->uiShow(),
+			Window::GifPauseReason::Layer,
+			ChatHelpers::TabbedSelector::Mode::EmojiOnly));
+	result->setDesiredHeightValues(
+		1.,
+		st::emojiPanMinHeight / 2,
+		st::emojiPanMinHeight);
+	result ->hide();
+	result->selector()->setCurrentPeer(controller->session().user());
+	return result;
+}
+
+Tasks::Task::Task(
+	not_null<QWidget*> outer,
+	not_null<Ui::VerticalLayout*> container,
+	not_null<Main::Session*> session,
+	int id,
+	int position,
+	bool locked)
+: _id(id)
+, _wrap(container->insert(
+	position,
+	object_ptr<Ui::SlideWrap<Ui::RpWidget>>(
+		container,
+		object_ptr<Ui::RpWidget>(container))))
+, _content(_wrap->entity())
+, _field(
+	Ui::CreateChild<Ui::InputField>(
+		_content.get(),
+		session->user()->isPremium()
+			? st::createTodoOptionField
+			: st::createPollOptionField,
+		Ui::InputField::Mode::MultiLine,
+		tr::lng_todo_create_list_add()))
+, _limit(session->appConfig().todoListItemTextLimit()) {
+	InitField(outer, _field, session);
+
+	// Don't limit max length, because user can paste long list of items.
+	//_field->setMaxLength(_limit + kErrorLimit);
+
+	_field->show();
+	if (locked) {
+		_field->setDisabled(true);
+	}
+
+	_wrap->hide(anim::type::instant);
+
+	_content->widthValue(
+	) | rpl::on_next([=] {
+		updateFieldGeometry();
+	}, _field->lifetime());
+
+	_field->heightValue(
+	) | rpl::on_next([=](int height) {
+		_content->resize(_content->width(), height);
+	}, _field->lifetime());
+
+	createShadow();
+	if (!locked) {
+		createRemove();
+		createWarning();
+	}
+	updateFieldGeometry();
+}
+
+bool Tasks::Task::hasShadow() const {
+	return (_shadow != nullptr);
+}
+
+void Tasks::Task::createShadow() {
+	Expects(_content != nullptr);
+
+	if (_shadow) {
+		return;
+	}
+	_shadow.reset(Ui::CreateChild<Ui::PlainShadow>(field().get()));
+	_shadow->show();
+	field()->sizeValue(
+	) | rpl::on_next([=](QSize size) {
+		const auto left = st::createPollFieldPadding.left();
+		_shadow->setGeometry(
+			left,
+			size.height() - st::lineWidth,
+			size.width() - left,
+			st::lineWidth);
+	}, _shadow->lifetime());
+}
+
+void Tasks::Task::destroyShadow() {
+	_shadow = nullptr;
+}
+
+void Tasks::Task::createRemove() {
+	using namespace rpl::mappers;
+
+	const auto field = this->field();
+	auto &lifetime = field->lifetime();
+
+	const auto remove = Ui::CreateChild<Ui::CrossButton>(
+		field.get(),
+		st::createPollOptionRemove);
+	remove->show(anim::type::instant);
+
+	const auto toggle = lifetime.make_state<rpl::variable<bool>>(false);
+	_removeAlways = lifetime.make_state<rpl::variable<bool>>(false);
+
+	field->changes(
+	) | rpl::on_next([field, toggle] {
+		// Don't capture 'this'! Because Option is a value type.
+		*toggle = !field->getLastText().isEmpty();
+	}, field->lifetime());
+#if 0
+	rpl::combine(
+		toggle->value(),
+		_removeAlways->value(),
+		_1 || _2
+	) | rpl::on_next([=](bool shown) {
+		remove->toggle(shown, anim::type::normal);
+	}, remove->lifetime());
+#endif
+
+	field->widthValue(
+	) | rpl::on_next([=](int width) {
+		remove->moveToRight(
+			st::createPollOptionRemovePosition.x(),
+			st::createPollOptionRemovePosition.y(),
+			width);
+	}, remove->lifetime());
+
+	_remove.reset(remove);
+}
+
+void Tasks::Task::createWarning() {
+	using namespace rpl::mappers;
+
+	const auto field = this->field();
+	const auto warning = CreateWarningLabel(
+		field,
+		field,
+		_limit,
+		kWarnTaskLimit);
+	rpl::combine(
+		field->sizeValue(),
+		warning->sizeValue()
+	) | rpl::on_next([=](QSize size, QSize label) {
+		warning->moveToLeft(
+			(size.width()
+				- label.width()
+				- st::createPollWarningPosition.x()),
+			(size.height()
+				- label.height()
+				- st::createPollWarningPosition.y()),
+			size.width());
+	}, warning->lifetime());
+}
+
+bool Tasks::Task::isEmpty() const {
+	return field()->getLastText().trimmed().isEmpty();
+}
+
+bool Tasks::Task::isGood() const {
+	return !locked()
+		&& !field()->getLastText().trimmed().isEmpty()
+		&& !isTooLong();
+}
+
+bool Tasks::Task::isTooLong() const {
+	return (field()->getLastText().size() > _limit);
+}
+
+bool Tasks::Task::hasFocus() const {
+	return field()->hasFocus();
+}
+
+void Tasks::Task::setFocus() const {
+	if (!locked()) {
+		FocusAtEnd(field());
+	}
+}
+
+void Tasks::Task::clearValue() {
+	field()->setText(QString());
+}
+
+void Tasks::Task::setPlaceholder() const {
+	field()->setPlaceholder(tr::lng_todo_create_list_add());
+}
+
+void Tasks::Task::toggleRemoveAlways(bool toggled) {
+	if (_removeAlways) {
+		*_removeAlways = toggled;
+	}
+}
+
+void Tasks::Task::updateFieldGeometry() {
+	_field->resizeToWidth(_content->width());
+	_field->moveToLeft(0, 0);
+}
+
+not_null<Ui::InputField*> Tasks::Task::field() const {
+	return _field;
+}
+
+void Tasks::Task::removePlaceholder() const {
+	field()->setPlaceholder(rpl::single(QString()));
+}
+
+int Tasks::Task::id() const {
+	return _id;
+}
+
+bool Tasks::Task::locked() const {
+	return !_remove;
+}
+
+TodoListItem Tasks::Task::toTodoListItem(int nextId) const {
+	const auto text = field()->getTextWithTags();
+	auto result = TodoListItem{
+		.text = TextWithEntities{
+			.text = text.text,
+			.entities = TextUtilities::ConvertTextTagsToEntities(text.tags),
+		},
+		.id = _id ? _id : nextId,
+	};
+	TextUtilities::Trim(result.text);
+	return result;
+}
+
+rpl::producer<Qt::MouseButton> Tasks::Task::removeClicks() const {
+	return _remove ? _remove->clicks() : rpl::never<Qt::MouseButton>();
+}
+
+Tasks::Tasks(
+	not_null<Ui::BoxContent*> box,
+	not_null<Ui::VerticalLayout*> container,
+	not_null<Window::SessionController*> controller,
+	ChatHelpers::TabbedPanel *emojiPanel,
+	std::vector<TodoListItem> existing,
+	bool existingLocked)
+: _box(box)
+, _container(container)
+, _controller(controller)
+, _existingCount(existing.size())
+, _existingLocked(existingLocked)
+, _emojiPanel(emojiPanel)
+, _position(_container->count())
+, _tasksLimit(controller->session().appConfig().todoListItemsLimit()) {
+	for (const auto &task : existing) {
+		addTask(task.id, task.text, anim::type::instant);
+	}
+	validateState();
+}
+
+bool Tasks::full() const {
+	return (_list.size() >= _tasksLimit);
+}
+
+bool Tasks::hasTasks() const {
+	return _hasTasks;
+}
+
+bool Tasks::isValid() const {
+	return _isValid;
+}
+
+rpl::producer<int> Tasks::addedCount() const {
+	return _addedCount.value();
+}
+
+rpl::producer<not_null<QWidget*>> Tasks::scrollToWidget() const {
+	return _scrollToWidget.events();
+}
+
+rpl::producer<> Tasks::backspaceInFront() const {
+	return _backspaceInFront.events();
+}
+
+rpl::producer<> Tasks::tabbed() const {
+	return _tabbed.events();
+}
+
+void Tasks::Task::show(anim::type animated) {
+	_wrap->show(animated);
+}
+
+void Tasks::Task::destroy(FnMut<void()> done) {
+	if (anim::Disabled() || _wrap->isHidden()) {
+		Ui::PostponeCall(std::move(done));
+		return;
+	}
+	_wrap->hide(anim::type::normal);
+	base::call_delayed(
+		st::slideWrapDuration * 2,
+		_content.get(),
+		std::move(done));
+}
+
+std::vector<TodoListItem> Tasks::toTodoListItems() const {
+	auto result = std::vector<TodoListItem>();
+	result.reserve(_list.size());
+	auto usedId = 0;
+	for (const auto &task : _list) {
+		if (const auto id = task->id()) {
+			usedId = id > usedId ? id : usedId;
+		} else if (task->isGood()) {
+			++usedId;
+		}
+		if (task->isGood()) {
+			result.push_back(task->toTodoListItem(usedId));
+		}
+	}
+	return result;
+}
+
+void Tasks::focusFirst() {
+	const auto locked = _existingLocked ? _existingCount : 0;
+	Assert(locked < _list.size());
+	FocusAtEnd((_list.begin() + locked)->get()->field());
+}
+
+bool Tasks::correctShadows() const {
+	// Last one should be without shadow.
+	const auto noShadow = ranges::find(
+		_list,
+		true,
+		ranges::not_fn(&Task::hasShadow));
+	return (noShadow == end(_list) - 1);
+}
+
+void Tasks::fixShadows() {
+	if (correctShadows()) {
+		return;
+	}
+	for (auto &option : _list) {
+		option->createShadow();
+	}
+	_list.back()->destroyShadow();
+}
+
+void Tasks::removeEmptyTail() {
+	// Only one option at the end of options list can be empty.
+	// Remove all other trailing empty options.
+	// Only last empty and previous option have non-empty placeholders.
+	const auto focused = ranges::find_if(
+		_list,
+		&Task::hasFocus);
+	const auto end = _list.end();
+	const auto reversed = ranges::views::reverse(_list);
+	const auto emptyItem = ranges::find_if(
+		reversed,
+		ranges::not_fn(&Task::isEmpty)).base();
+	const auto focusLast = (focused > emptyItem) && (focused < end);
+	if (emptyItem == end) {
+		return;
+	}
+	if (focusLast) {
+		(*emptyItem)->setFocus();
+	}
+	for (auto i = emptyItem + 1; i != end; ++i) {
+		destroy(std::move(*i));
+	}
+	_list.erase(emptyItem + 1, end);
+	fixAfterErase();
+}
+
+void Tasks::destroy(std::unique_ptr<Task> task) {
+	const auto value = task.get();
+	task->destroy([=] { removeDestroyed(value); });
+	_destroyed.push_back(std::move(task));
+}
+
+void Tasks::fixAfterErase() {
+	Expects(!_list.empty());
+
+	const auto last = _list.end() - 1;
+	(*last)->setPlaceholder();
+	(*last)->toggleRemoveAlways(false);
+	if (last != begin(_list)) {
+		(*(last - 1))->setPlaceholder();
+		(*(last - 1))->toggleRemoveAlways(false);
+	}
+	fixShadows();
+}
+
+void Tasks::addEmptyTask() {
+	if (!_list.empty() && _list.back()->isEmpty()) {
+		return;
+	}
+	const auto locked = _existingLocked ? _existingCount : 0;
+	addTask(
+		0, // id
+		TextWithEntities(),
+		(locked < _list.size()) ? anim::type::normal : anim::type::instant);
+}
+
+void Tasks::addTask(
+		int id,
+		TextWithEntities text,
+		anim::type animated) {
+	insertTask(_list.size(), id, std::move(text), animated);
+}
+
+void Tasks::insertTask(
+		int beforeIndex,
+		int id,
+		TextWithEntities text,
+		anim::type animated) {
+	if (full()) {
+		return;
+	}
+	Assert(beforeIndex >= 0 && beforeIndex <= _list.size());
+	if (_list.size() > 1) {
+		(*(_list.end() - 2))->removePlaceholder();
+		(*(_list.end() - 2))->toggleRemoveAlways(true);
+	}
+	const auto locked = id && _existingLocked;
+	const auto i = _list.insert(
+		begin(_list) + beforeIndex,
+		std::make_unique<Task>(
+			_box,
+			_container,
+			&_controller->session(),
+			id,
+			_position + beforeIndex + _destroyed.size(),
+			locked));
+	const auto field = i->get()->field();
+	if (!locked) {
+		initTaskField(i->get(), std::move(text));
+	} else {
+		InitMessageFieldHandlers(
+			_controller,
+			field,
+			Window::GifPauseReason::Layer,
+			[](not_null<DocumentData*>) { return true; });
+		field->setTextWithTags({
+			text.text,
+			TextUtilities::ConvertEntitiesToTextTags(text.entities)
+		});
+	}
+	field->finishAnimating();
+	i->get()->show(animated);
+	fixShadows();
+}
+
+void Tasks::initTaskField(not_null<Task*> task, TextWithEntities text) {
+	const auto field = task->field();
+	if (const auto emojiPanel = _emojiPanel) {
+		const auto emojiToggle = Ui::AddEmojiToggleToField(
+			field,
+			_box,
+			_controller,
+			emojiPanel,
+			QPoint(
+				-st::createTodoOptionField.textMargins.right(),
+				st::createPollOptionEmojiPositionSkip));
+		emojiToggle->shownValue() | rpl::on_next([=](bool shown) {
+			if (!shown) {
+				return;
+			}
+			_emojiPanelLifetime.destroy();
+			emojiPanel->selector()->emojiChosen(
+			) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
+				if (field->hasFocus()) {
+					Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
+				}
+			}, _emojiPanelLifetime);
+			emojiPanel->selector()->customEmojiChosen(
+			) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+				if (field->hasFocus()) {
+					Data::InsertCustomEmoji(field, data.document);
+				}
+			}, _emojiPanelLifetime);
+		}, emojiToggle->lifetime());
+	}
+	field->setTextWithTags({
+		text.text,
+		TextUtilities::ConvertEntitiesToTextTags(text.entities)
+	});
+	field->submits(
+	) | rpl::on_next([=] {
+		const auto index = findField(field);
+		if (_list[index]->isGood() && index + 1 < _list.size()) {
+			_list[index + 1]->setFocus();
+		}
+	}, field->lifetime());
+	field->changes(
+	) | rpl::on_next([=] {
+		auto list = ParsePastedList(field->getLastText());
+		if (!list.empty()) {
+			field->setText(list.front());
+			field->forceProcessContentsChanges();
+
+			list.pop_front();
+			handlePaste(field, list);
+		}
+		Ui::PostponeCall(crl::guard(field, [=] {
+			validateState();
+		}));
+	}, field->lifetime());
+	field->focusedChanges(
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
+		_scrollToWidget.fire_copy(field);
+	}, field->lifetime());
+	field->tabbed(
+	) | rpl::on_next([=](not_null<bool*> handled) {
+		const auto index = findField(field);
+		if (index + 1 < _list.size()) {
+			_list[index + 1]->setFocus();
+		} else {
+			_tabbed.fire({});
+		}
+		*handled = true;
+	}, field->lifetime());
+	base::install_event_filter(field, [=](not_null<QEvent*> event) {
+		if (event->type() != QEvent::KeyPress
+			|| !field->getLastText().isEmpty()) {
+			return base::EventFilterResult::Continue;
+		}
+		const auto key = static_cast<QKeyEvent*>(event.get())->key();
+		if (key != Qt::Key_Backspace) {
+			return base::EventFilterResult::Continue;
+		}
+
+		const auto index = findField(field);
+		if (index > 0) {
+			_list[index - 1]->setFocus();
+		} else {
+			_backspaceInFront.fire({});
+		}
+		return base::EventFilterResult::Cancel;
+	});
+
+	task->removeClicks(
+	) | rpl::on_next([=] {
+		Ui::PostponeCall(crl::guard(field, [=] {
+			Expects(!_list.empty());
+
+			const auto item = begin(_list) + findField(field);
+			if (item == _list.end() - 1) {
+				(*item)->clearValue();
+				return;
+			}
+			if ((*item)->hasFocus()) {
+				(*(item + 1))->setFocus();
+			}
+			destroy(std::move(*item));
+			_list.erase(item);
+			fixAfterErase();
+			validateState();
+		}));
+	}, field->lifetime());
+}
+
+void Tasks::removeDestroyed(not_null<Task*> task) {
+	const auto i = ranges::find(
+		_destroyed,
+		task.get(),
+		&std::unique_ptr<Task>::get);
+	Assert(i != end(_destroyed));
+	_destroyed.erase(i);
+}
+
+void Tasks::validateState() {
+	checkLastTask();
+	_hasTasks = (ranges::count_if(_list, &Task::isGood) > 0);
+	_isValid = _hasTasks && ranges::none_of(_list, &Task::isTooLong);
+
+	const auto lastEmpty = !_list.empty() && _list.back()->isEmpty();
+	_addedCount = _list.size()
+		- (lastEmpty ? 1 : 0)
+		- (_existingLocked ? _existingCount : 0);
+}
+
+int Tasks::findField(not_null<Ui::InputField*> field) const {
+	const auto result = ranges::find(
+		_list,
+		field,
+		&Task::field) - begin(_list);
+
+	Ensures(result >= 0 && result < _list.size());
+	return result;
+}
+
+void Tasks::handlePaste(
+		not_null<Ui::InputField*> field,
+		const QStringList &list) {
+	const auto index = findField(field);
+	for (auto i = 0, count = int(list.size()); i != count; ++i) {
+		insertTask(
+			index + 1 + i,
+			0, // id
+			TextWithEntities{ list[i] },
+			anim::type::instant);
+	}
+	const auto last = std::min(
+		int(index + list.size()),
+		int(_list.size()) - 1);
+	const auto add = _list[last]->field();
+	crl::on_main(add, [=] {
+		add->setCursorPosition(add->getLastText().size());
+		add->setFocus();
+	});
+}
+
+void Tasks::checkLastTask() {
+	removeEmptyTail();
+	addEmptyTask();
+}
+
+} // namespace
+
+EditTodoListBox::EditTodoListBox(
+	QWidget*,
+	not_null<Window::SessionController*> controller,
+	rpl::producer<int> starsRequired,
+	Api::SendType sendType,
+	SendMenu::Details sendMenuDetails)
+: _controller(controller)
+, _sendType(sendType)
+, _sendMenuDetails([result = sendMenuDetails] { return result; })
+, _starsRequired(std::move(starsRequired))
+, _titleLimit(controller->session().appConfig().todoListTitleLimit()) {
+}
+
+EditTodoListBox::EditTodoListBox(
+	QWidget*,
+	not_null<Window::SessionController*> controller,
+	not_null<HistoryItem*> item)
+: _controller(controller)
+, _sendMenuDetails([] { return SendMenu::Details(); })
+, _editingItem(item)
+, _titleLimit(controller->session().appConfig().todoListTitleLimit()) {
+	_controller->session().changes().messageUpdates(
+		Data::MessageUpdate::Flag::Destroyed
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
+		if (update.item == item) {
+			closeBox();
+		}
+	}, lifetime());
+}
+
+auto EditTodoListBox::submitRequests() const -> rpl::producer<Result> {
+	return _submitRequests.events();
+}
+
+void EditTodoListBox::setInnerFocus() {
+	_setInnerFocus();
+}
+
+void EditTodoListBox::submitFailed(const QString &error) {
+	showToast(error);
+}
+
+not_null<Ui::InputField*> EditTodoListBox::setupTitle(
+		not_null<Ui::VerticalLayout*> container) {
+	using namespace Settings;
+
+	const auto session = &_controller->session();
+	const auto isPremium = session->premium();
+	const auto title = container->add(
+		object_ptr<Ui::InputField>(
+			container,
+			st::createPollField,
+			Ui::InputField::Mode::MultiLine,
+			tr::lng_todo_create_title_placeholder()),
+		st::createPollFieldPadding
+			+ (isPremium
+				? QMargins(0, 0, st::defaultComposeFiles.emoji.inner.width, 0)
+				: QMargins()));
+	InitField(getDelegate()->outerContainer(), title, session);
+	title->setMaxLength(_titleLimit + kErrorLimit);
+	title->setSubmitSettings(Ui::InputField::SubmitSettings::Both);
+
+	if (isPremium) {
+		_emojiPanel = MakeEmojiPanel(
+			getDelegate()->outerContainer(),
+			_controller);
+		const auto emojiToggle = Ui::AddEmojiToggleToField(
+			title,
+			this,
+			_controller,
+			_emojiPanel.get(),
+			st::createTodoOptionFieldEmojiPosition);
+		_emojiPanel->selector()->emojiChosen(
+		) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
+			if (title->hasFocus()) {
+				Ui::InsertEmojiAtCursor(title->textCursor(), data.emoji);
+			}
+		}, emojiToggle->lifetime());
+		_emojiPanel->selector()->customEmojiChosen(
+		) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+			if (title->hasFocus()) {
+				Data::InsertCustomEmoji(title, data.document);
+			}
+		}, emojiToggle->lifetime());
+	}
+
+	const auto media = _editingItem ? _editingItem->media() : nullptr;
+	if (const auto todolist = media ? media->todolist() : nullptr) {
+		const auto &text = todolist->title;
+		title->setTextWithTags({
+			text.text,
+			TextUtilities::ConvertEntitiesToTextTags(text.entities)
+		});
+	}
+
+	const auto warning = CreateWarningLabel(
+		container,
+		title,
+		_titleLimit,
+		kWarnTitleLimit);
+	rpl::combine(
+		title->geometryValue(),
+		warning->sizeValue()
+	) | rpl::on_next([=](QRect geometry, QSize label) {
+		warning->moveToLeft(
+			(container->width()
+				- label.width()
+				- st::createPollWarningPosition.x()),
+			(geometry.y()
+				- st::createPollFieldPadding.top()
+				- st::defaultSubsectionTitlePadding.bottom()
+				- st::defaultSubsectionTitle.style.font->height
+				+ st::defaultSubsectionTitle.style.font->ascent
+				- st::createPollWarning.style.font->ascent),
+			geometry.width());
+	}, warning->lifetime());
+
+	return title;
+}
+
+object_ptr<Ui::RpWidget> EditTodoListBox::setupContent() {
+	using namespace Settings;
+
+	const auto id = FullMsgId{
+		PeerId(),
+		_controller->session().data().nextNonHistoryEntryId(),
+	};
+	const auto error = lifetime().make_state<Errors>(Error::Title);
+
+	auto result = object_ptr<Ui::VerticalLayout>(this);
+	const auto container = result.data();
+
+	const auto title = setupTitle(container);
+	Ui::AddDivider(container);
+	Ui::AddSkip(container);
+	container->add(
+		object_ptr<Ui::FlatLabel>(
+			container,
+			tr::lng_todo_create_list(),
+			st::defaultSubsectionTitle),
+		st::createPollFieldTitlePadding);
+	const auto media = _editingItem ? _editingItem->media() : nullptr;
+	const auto todolist = media ? media->todolist() : nullptr;
+	const auto tasks = lifetime().make_state<Tasks>(
+		this,
+		container,
+		_controller,
+		_emojiPanel ? _emojiPanel.get() : nullptr,
+		todolist ? todolist->items : std::vector<TodoListItem>());
+	auto limit = tasks->addedCount() | rpl::after_next([=](int count) {
+		setCloseByEscape(!count);
+		setCloseByOutsideClick(!count);
+	}) | rpl::map([=](int count) {
+		const auto appConfig = &_controller->session().appConfig();
+		const auto max = appConfig->todoListItemsLimit();
+		return (count < max)
+			? tr::lng_todo_create_limit(tr::now, lt_count, max - count)
+			: tr::lng_todo_create_maximum(tr::now);
+	}) | rpl::after_next([=] {
+		container->resizeToWidth(container->widthNoMargins());
+	});
+	container->add(
+		object_ptr<Ui::DividerLabel>(
+			container,
+			object_ptr<Ui::FlatLabel>(
+				container,
+				std::move(limit),
+				st::boxDividerLabel),
+			st::createPollLimitPadding));
+
+	title->tabbed(
+	) | rpl::on_next([=](not_null<bool*> handled) {
+		tasks->focusFirst();
+		*handled = true;
+	}, title->lifetime());
+
+	Ui::AddSkip(container);
+	Ui::AddSubsectionTitle(container, tr::lng_todo_create_settings());
+
+	const auto allowAdd = container->add(
+		object_ptr<Ui::Checkbox>(
+			container,
+			tr::lng_todo_create_allow_add(tr::now),
+			!todolist || todolist->othersCanAppend(),
+			st::defaultCheckbox),
+		st::createPollCheckboxMargin);
+	const auto allowMark = container->add(
+		object_ptr<Ui::Checkbox>(
+			container,
+			tr::lng_todo_create_allow_mark(tr::now),
+			!todolist || todolist->othersCanComplete(),
+			st::defaultCheckbox),
+		st::createPollCheckboxMargin);
+
+	tasks->tabbed(
+	) | rpl::on_next([=] {
+		title->setFocus();
+	}, title->lifetime());
+
+	const auto isValidTitle = [=] {
+		const auto text = title->getLastText().trimmed();
+		return !text.isEmpty() && (text.size() <= _titleLimit);
+	};
+	title->submits(
+	) | rpl::on_next([=] {
+		if (isValidTitle()) {
+			tasks->focusFirst();
+		}
+	}, title->lifetime());
+
+	_setInnerFocus = [=] {
+		title->setFocusFast();
+	};
+
+	const auto collectResult = [=] {
+		const auto textWithTags = title->getTextWithTags();
+		using Flag = TodoListData::Flag;
+		auto result = TodoListData(&_controller->session().data(), id);
+		result.title.text = textWithTags.text;
+		result.title.entities = TextUtilities::ConvertTextTagsToEntities(
+			textWithTags.tags);
+		TextUtilities::Trim(result.title);
+		result.items = tasks->toTodoListItems();
+		const auto allowAddTasks = allowAdd->checked();
+		const auto allowMarkTasks = allowMark->checked();
+		result.setFlags(Flag(0)
+			| (allowAddTasks ? Flag::OthersCanAppend : Flag(0))
+			| (allowMarkTasks ? Flag::OthersCanComplete : Flag(0)));
+		return result;
+	};
+	const auto collectError = [=] {
+		if (isValidTitle()) {
+			*error &= ~Error::Title;
+		} else {
+			*error |= Error::Title;
+		}
+		if (!tasks->hasTasks()) {
+			*error |= Error::Tasks;
+		} else if (!tasks->isValid()) {
+			*error |= Error::Other;
+		} else {
+			*error &= ~(Error::Tasks | Error::Other);
+		}
+	};
+	const auto showError = [show = uiShow()](
+			tr::phrase<> text) {
+		show->showToast(text(tr::now));
+	};
+
+	const auto send = [=](Api::SendOptions sendOptions) {
+		collectError();
+		if (*error & Error::Title) {
+			showError(tr::lng_todo_choose_title);
+			title->setFocus();
+		} else if (*error & Error::Tasks) {
+			showError(tr::lng_todo_choose_tasks);
+			tasks->focusFirst();
+		} else if (!*error) {
+			if (_editingItem) {
+				sendOptions = {
+					.scheduled = (_editingItem->isScheduled()
+						? _editingItem->date()
+						: TimeId()),
+					.shortcutId = _editingItem->shortcutId(),
+				};
+			}
+			_submitRequests.fire({ collectResult(), sendOptions });
+		}
+	};
+	const auto sendAction = SendMenu::DefaultCallback(
+		_controller->uiShow(),
+		crl::guard(this, send));
+
+	tasks->scrollToWidget(
+	) | rpl::on_next([=](not_null<QWidget*> widget) {
+		scrollToWidget(widget);
+	}, lifetime());
+
+	tasks->backspaceInFront(
+	) | rpl::on_next([=] {
+		FocusAtEnd(title);
+	}, lifetime());
+
+	const auto isNormal = (_sendType == Api::SendType::Normal);
+	const auto schedule = [=] {
+		sendAction(
+			{ .type = SendMenu::ActionType::Schedule },
+			_sendMenuDetails());
+	};
+	const auto submit = addButton(
+		(_editingItem
+			? tr::lng_settings_save()
+			: tr::lng_todo_create_button()),
+		[=] { isNormal ? send({}) : schedule(); });
+	submit->setText(PaidSendButtonText(_starsRequired.value(), _editingItem
+		? tr::lng_settings_save()
+		: isNormal
+		? tr::lng_todo_create_button()
+		: tr::lng_schedule_button()));
+	const auto sendMenuDetails = [=] {
+		collectError();
+		return (*error) ? SendMenu::Details() : _sendMenuDetails();
+	};
+	SendMenu::SetupMenuAndShortcuts(
+		submit.data(),
+		_controller->uiShow(),
+		sendMenuDetails,
+		sendAction);
+	addButton(tr::lng_cancel(), [=] { closeBox(); });
+
+	return result;
+}
+
+void EditTodoListBox::prepare() {
+	setTitle(tr::lng_todo_create_title());
+
+	const auto inner = setInnerWidget(setupContent());
+
+	setDimensionsToContent(st::boxWideWidth, inner);
+}
+
+AddTodoListTasksBox::AddTodoListTasksBox(
+	QWidget*,
+	not_null<Window::SessionController*> controller,
+	not_null<HistoryItem*> item)
+: _controller(controller)
+, _item(item) {
+	_controller->session().changes().messageUpdates(
+		Data::MessageUpdate::Flag::Destroyed
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
+		if (update.item == item) {
+			closeBox();
+		}
+	}, lifetime());
+}
+
+void AddTodoListTasksBox::prepare() {
+	setTitle(tr::lng_todo_add_title());
+
+	const auto inner = setInnerWidget(setupContent());
+
+	setDimensionsToContent(st::boxWideWidth, inner);
+
+	scrollToY(ScrollMax);
+}
+
+object_ptr<Ui::RpWidget> AddTodoListTasksBox::setupContent() {
+	auto result = object_ptr<Ui::VerticalLayout>(this);
+	const auto container = result.data();
+
+	if (_controller->session().premium()) {
+		_emojiPanel = MakeEmojiPanel(
+			getDelegate()->outerContainer(),
+			_controller);
+	}
+
+	const auto media = _item->media();
+	const auto todolist = media ? media->todolist() : nullptr;
+	Assert(todolist != nullptr);
+	const auto tasks = lifetime().make_state<Tasks>(
+		this,
+		container,
+		_controller,
+		_emojiPanel ? _emojiPanel.get() : nullptr,
+		todolist->items,
+		true);
+	const auto already = int(todolist->items.size());
+	auto limit = tasks->addedCount() | rpl::after_next([=](int count) {
+		setCloseByEscape(!count);
+		setCloseByOutsideClick(!count);
+	}) | rpl::map([=](int count) {
+		const auto appConfig = &_controller->session().appConfig();
+		const auto max = appConfig->todoListItemsLimit();
+		const auto total = already + count;
+		return (total < max)
+			? tr::lng_todo_create_limit(tr::now, lt_count, max - total)
+			: tr::lng_todo_create_maximum(tr::now);
+	}) | rpl::after_next([=] {
+		container->resizeToWidth(container->widthNoMargins());
+	});
+	container->add(
+		object_ptr<Ui::DividerLabel>(
+			container,
+			object_ptr<Ui::FlatLabel>(
+				container,
+				std::move(limit),
+				st::boxDividerLabel),
+			st::createPollLimitPadding));
+
+	_setInnerFocus = [=] {
+		tasks->focusFirst();
+	};
+
+	tasks->scrollToWidget(
+	) | rpl::on_next([=](not_null<QWidget*> widget) {
+		scrollToWidget(widget);
+	}, lifetime());
+
+	const auto submit = addButton(tr::lng_settings_save(), [=] {
+		_submitRequests.fire({ tasks->toTodoListItems() });
+	});
+	addButton(tr::lng_cancel(), [=] { closeBox(); });
+
+	return result;
+}
+
+auto AddTodoListTasksBox::submitRequests() const -> rpl::producer<Result> {
+	return _submitRequests.events();
+}
+
+void AddTodoListTasksBox::setInnerFocus() {
+	_setInnerFocus();
+}
diff --git a/Telegram/SourceFiles/boxes/edit_todo_list_box.h b/Telegram/SourceFiles/boxes/edit_todo_list_box.h
new file mode 100644
index 00000000000000..45ec17f9d870ab
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/edit_todo_list_box.h
@@ -0,0 +1,112 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/layers/box_content.h"
+#include "api/api_common.h"
+#include "data/data_todo_list.h"
+#include "base/flags.h"
+
+struct TodoListData;
+
+namespace ChatHelpers {
+class TabbedPanel;
+} // namespace ChatHelpers
+
+namespace Ui {
+class VerticalLayout;
+} // namespace Ui
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace SendMenu {
+struct Details;
+} // namespace SendMenu
+
+class EditTodoListBox : public Ui::BoxContent {
+public:
+	struct Result {
+		TodoListData todolist;
+		Api::SendOptions options;
+	};
+
+	EditTodoListBox(
+		QWidget*,
+		not_null<Window::SessionController*> controller,
+		rpl::producer<int> starsRequired,
+		Api::SendType sendType,
+		SendMenu::Details sendMenuDetails);
+	EditTodoListBox(
+		QWidget*,
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item);
+
+	[[nodiscard]] rpl::producer<Result> submitRequests() const;
+	void submitFailed(const QString &error);
+
+	void setInnerFocus() override;
+
+protected:
+	void prepare() override;
+
+private:
+	enum class Error {
+		Title = 0x01,
+		Tasks = 0x02,
+		Other = 0x04,
+	};
+	friend constexpr inline bool is_flag_type(Error) { return true; }
+	using Errors = base::flags<Error>;
+
+	[[nodiscard]] object_ptr<Ui::RpWidget> setupContent();
+	[[nodiscard]] not_null<Ui::InputField*> setupTitle(
+		not_null<Ui::VerticalLayout*> container);
+
+	const not_null<Window::SessionController*> _controller;
+	const Api::SendType _sendType = Api::SendType();
+	const Fn<SendMenu::Details()> _sendMenuDetails;
+	HistoryItem *_editingItem = nullptr;
+	rpl::variable<int> _starsRequired;
+	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
+	Fn<void()> _setInnerFocus;
+	Fn<rpl::producer<bool>()> _dataIsValidValue;
+	rpl::event_stream<Result> _submitRequests;
+	int _titleLimit = 0;
+
+};
+
+class AddTodoListTasksBox : public Ui::BoxContent {
+public:
+	struct Result {
+		std::vector<TodoListItem> items;
+	};
+
+	AddTodoListTasksBox(
+		QWidget*,
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item);
+
+	[[nodiscard]] rpl::producer<Result> submitRequests() const;
+
+	void setInnerFocus() override;
+
+protected:
+	void prepare() override;
+
+private:
+	[[nodiscard]] object_ptr<Ui::RpWidget> setupContent();
+
+	const not_null<Window::SessionController*> _controller;
+	const not_null<HistoryItem*> _item;
+	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
+	Fn<void()> _setInnerFocus;
+	rpl::event_stream<Result> _submitRequests;
+
+};
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index df85e625443e04..34d4c044081c21 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -7,45 +7,62 @@ For license and copyright information please follow this link:
 */
 #include "boxes/filters/edit_filter_box.h"
 
+#include "apiwrap.h"
+#include "base/event_filter.h"
 #include "boxes/filters/edit_filter_chats_list.h"
 #include "boxes/filters/edit_filter_chats_preview.h"
 #include "boxes/filters/edit_filter_links.h"
 #include "boxes/premium_limits_box.h"
+#include "boxes/premium_preview_box.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
-#include "ui/layers/generic_box.h"
-#include "ui/text/text_utilities.h"
-#include "ui/text/text_options.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/fields/input_field.h"
-#include "ui/wrap/slide_wrap.h"
-#include "ui/effects/panel_animation.h"
-#include "ui/filter_icons.h"
-#include "ui/filter_icon_panel.h"
-#include "ui/painter.h"
-#include "ui/vertical_list.h"
+#include "chat_helpers/message_field.h"
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "core/ui_integration.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/stickers/data_stickers.h"
 #include "data/data_channel.h"
 #include "data/data_chat_filters.h"
+#include "data/data_document.h"
 #include "data/data_peer.h"
 #include "data/data_peer_values.h" // Data::AmPremiumValue.
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
-#include "core/application.h"
-#include "core/core_settings.h"
-#include "settings/settings_common.h"
-#include "base/event_filter.h"
-#include "lang/lang_keys.h"
 #include "history/history.h"
+#include "info/userpic/info_userpic_color_circle_button.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "window/window_session_controller.h"
+#include "settings/settings_common.h"
+#include "ui/chat/chats_filter_tag.h"
+#include "ui/controls/emoji_button_factory.h"
+#include "ui/controls/emoji_button.h"
+#include "ui/effects/animation_value_f.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/panel_animation.h"
+#include "ui/empty_userpic.h"
+#include "ui/filter_icon_panel.h"
+#include "ui/filter_icons.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/power_saving.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/wrap/slide_wrap.h"
 #include "window/window_controller.h"
-#include "apiwrap.h"
+#include "window/window_session_controller.h"
 #include "styles/style_settings.h"
 #include "styles/style_boxes.h"
+#include "styles/style_dialogs.h"
 #include "styles/style_layers.h"
 #include "styles/style_window.h"
 #include "styles/style_chat.h"
-#include "styles/style_menu_icons.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_info_userpic_builder.h"
 
 namespace {
 
@@ -77,7 +94,7 @@ not_null<FilterChatsPreview*> SetupChatsPreview(
 		(rules.*peers)()));
 
 	preview->flagRemoved(
-	) | rpl::start_with_next([=](Flag flag) {
+	) | rpl::on_next([=](Flag flag) {
 		const auto rules = data->current();
 		auto computed = Data::ChatFilter(
 			rules.id(),
@@ -93,7 +110,7 @@ not_null<FilterChatsPreview*> SetupChatsPreview(
 	}, preview->lifetime());
 
 	preview->peerRemoved(
-	) | rpl::start_with_next([=](not_null<History*> history) {
+	) | rpl::on_next([=](not_null<History*> history) {
 		const auto rules = data->current();
 		auto always = rules.always();
 		auto pinned = rules.pinned();
@@ -203,13 +220,13 @@ void CreateIconSelector(
 	data->value(
 	) | rpl::map([=](const Data::ChatFilter &filter) {
 		return Ui::ComputeFilterIcon(filter);
-	}) | rpl::start_with_next([=](Ui::FilterIcon icon) {
+	}) | rpl::on_next([=](Ui::FilterIcon icon) {
 		*type = icon;
 		toggle->update();
 	}, toggle->lifetime());
 
 	input->geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
+	) | rpl::on_next([=](QRect geometry) {
 		const auto left = geometry.x() + geometry.width() - toggle->width();
 		const auto position = st::windowFilterIconTogglePosition;
 		toggle->move(
@@ -218,7 +235,7 @@ void CreateIconSelector(
 	}, toggle->lifetime());
 
 	toggle->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(toggle);
 		const auto icons = Ui::LookupFilterIcon(*type);
 		icons.normal->paintInCenter(
@@ -236,7 +253,7 @@ void CreateIconSelector(
 	panel->chosen(
 	) | rpl::filter([=](Ui::FilterIcon icon) {
 		return icon != Ui::ComputeFilterIcon(data->current());
-	}) | rpl::start_with_next([=](Ui::FilterIcon icon) {
+	}) | rpl::on_next([=](Ui::FilterIcon icon) {
 		panel->hideAnimated();
 		const auto rules = data->current();
 		*data = Data::ChatFilter(
@@ -336,6 +353,8 @@ void EditFilterBox(
 			const Data::ChatFilter &data,
 			Fn<void(Data::ChatFilter)> next)> saveAnd) {
 	using namespace rpl::mappers;
+	constexpr auto kColorsCount = 8;
+	constexpr auto kNoTag = kColorsCount - 1;
 
 	struct State {
 		rpl::variable<Data::ChatFilter> rules;
@@ -343,20 +362,27 @@ void EditFilterBox(
 		rpl::variable<bool> hasLinks;
 		rpl::variable<bool> chatlist;
 		rpl::variable<bool> creating;
+		rpl::variable<TextWithEntities> title;
+		rpl::variable<bool> staticTitle;
+		rpl::variable<int> colorIndex;
+		base::unique_qptr<ChatHelpers::TabbedPanel> emojiPanel;
 	};
 	const auto owner = &window->session().data();
 	const auto state = box->lifetime().make_state<State>(State{
 		.rules = filter,
 		.chatlist = filter.chatlist(),
-		.creating = filter.title().isEmpty(),
+		.creating = filter.title().empty(),
+		.title = filter.titleText(),
+		.staticTitle = filter.staticTitle(),
 	});
+	state->colorIndex = filter.colorIndex().value_or(kNoTag);
 	state->links = owner->chatsFilters().chatlistLinks(filter.id()),
 	state->hasLinks = state->links.value() | rpl::map([=](const auto &v) {
 		return !v.empty();
 	});
 	state->hasLinks.value() | rpl::filter(
 		_1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->chatlist = true;
 	}, box->lifetime());
 
@@ -365,7 +391,7 @@ void EditFilterBox(
 	owner->chatsFilters().isChatlistChanged(
 	) | rpl::filter([=](FilterId id) {
 		return (id == data->current().id());
-	}) | rpl::start_with_next([=](FilterId id) {
+	}) | rpl::on_next([=](FilterId id) {
 		const auto filters = &owner->chatsFilters();
 		const auto &list = filters->list();
 		const auto i = ranges::find(list, id, &Data::ChatFilter::id);
@@ -385,43 +411,140 @@ void EditFilterBox(
 		tr::lng_filters_edit()));
 	box->setCloseByOutsideClick(false);
 
+	const auto session = &window->session();
 	Data::AmPremiumValue(
-		&window->session()
-	) | rpl::start_with_next([=] {
+		session
+	) | rpl::on_next([=] {
 		box->closeBox();
 	}, box->lifetime());
 
 	const auto content = box->verticalLayout();
+	const auto current = state->title.current();
 	const auto name = content->add(
 		object_ptr<Ui::InputField>(
 			box,
 			st::windowFilterNameInput,
-			tr::lng_filters_new_name(),
-			filter.title()),
+			Ui::InputField::Mode::SingleLine,
+			tr::lng_filters_new_name()),
 		st::markdownLinkFieldPadding);
-	name->setMaxLength(kMaxFilterTitleLength);
-	name->setInstantReplaces(Ui::InstantReplaces::Default());
-	name->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
-	Ui::Emoji::SuggestionsController::Init(
-		box->getDelegate()->outerContainer(),
+	InitMessageFieldHandlers(window, name, ChatHelpers::PauseReason::Layer);
+	name->setTextWithTags({
+		current.text,
+		TextUtilities::ConvertEntitiesToTextTags(current.entities),
+	}, Ui::InputField::HistoryAction::Clear);
+	Ui::AddLengthLimitLabel(
 		name,
-		&window->session());
+		kMaxFilterTitleLength,
+		Ui::LengthLimitLabelOptions{
+			.customThreshold = 0,
+			.customUpdatePosition = [=](QSize parent, QSize label) {
+				return QPoint(
+					parent.width()
+						- st::windowFilterNameCharsLimitRightPosition.x()
+						- label.width() / 2,
+					st::windowFilterNameCharsLimitRightPosition.y());
+			},
+			.customCharactersCount = [=] {
+				return Ui::ComputeFieldCharacterCount(name);
+			},
+		});
 
 	const auto nameEditing = box->lifetime().make_state<NameEditing>(
 		NameEditing{ name });
 
+	const auto staticTitle = Ui::CreateChild<Ui::LinkButton>(
+		name,
+		QString());
+	staticTitle->setClickedCallback([=] {
+		state->staticTitle = !state->staticTitle.current();
+	});
+	state->staticTitle.value() | rpl::on_next([=](bool value) {
+		staticTitle->setText(value
+			? tr::lng_filters_enable_animations(tr::now)
+			: tr::lng_filters_disable_animations(tr::now));
+		const auto paused = [=] {
+			using namespace Window;
+			return window->isGifPausedAtLeastFor(GifPauseReason::Layer);
+		};
+		name->setCustomTextContext(Core::TextContext({
+			.session = session,
+			.customEmojiLoopLimit = value ? -1 : 0,
+		}), [paused] {
+			return On(PowerSaving::kEmojiChat) || paused();
+		}, [paused] {
+			return On(PowerSaving::kChatSpoiler) || paused();
+		});
+		name->update();
+	}, staticTitle->lifetime());
+
+	rpl::combine(
+		staticTitle->widthValue(),
+		name->widthValue()
+	) | rpl::on_next([=](int inner, int outer) {
+		staticTitle->moveToRight(
+			st::windowFilterStaticTitlePosition.x(),
+			st::windowFilterStaticTitlePosition.y(),
+			outer);
+	}, staticTitle->lifetime());
+
 	state->creating.value(
-	) | rpl::filter(!_1) | rpl::start_with_next([=] {
+	) | rpl::filter(!_1) | rpl::on_next([=] {
 		nameEditing->custom = true;
 	}, box->lifetime());
 
+	using Selector = ChatHelpers::TabbedSelector;
+	state->emojiPanel = base::make_unique_q<ChatHelpers::TabbedPanel>(
+		box->getDelegate()->outerContainer(),
+		window,
+		object_ptr<Selector>(
+			nullptr,
+			window->uiShow(),
+			Window::GifPauseReason::Layer,
+			Selector::Mode::EmojiOnly));
+	state->emojiPanel->setDesiredHeightValues(
+		1.,
+		st::emojiPanMinHeight / 2,
+		st::emojiPanMinHeight);
+	state->emojiPanel->hide();
+	state->emojiPanel->selector()->setCurrentPeer(window->session().user());
+	state->emojiPanel->selector()->emojiChosen(
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
+		Ui::InsertEmojiAtCursor(name->textCursor(), data.emoji);
+	}, name->lifetime());
+	state->emojiPanel->selector()->customEmojiChosen(
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+		const auto info = data.document->sticker();
+		if (info
+			&& info->setType == Data::StickersType::Emoji
+			&& !window->session().premium()) {
+			ShowPremiumPreviewBox(
+				window,
+				PremiumFeature::AnimatedEmoji);
+		} else {
+			Data::InsertCustomEmoji(name, data.document);
+		}
+	}, name->lifetime());
+
+	const auto emojiButton = Ui::AddEmojiToggleToField(
+		name,
+		box,
+		window,
+		state->emojiPanel.get(),
+		st::windowFilterNameEmojiPosition);
+	emojiButton->show();
+
 	name->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!nameEditing->settingDefault) {
 			nameEditing->custom = true;
 		}
+		auto entered = name->getTextWithTags();
+		state->title = TextWithEntities{
+			std::move(entered.text),
+			TextUtilities::ConvertTextTagsToEntities(entered.tags),
+		};
 	}, name->lifetime());
+
 	const auto updateDefaultTitle = [=](const Data::ChatFilter &filter) {
 		if (nameEditing->custom) {
 			return;
@@ -434,6 +557,11 @@ void EditFilterBox(
 		}
 	};
 
+	state->title.value(
+	) | rpl::on_next([=](const TextWithEntities &value) {
+		staticTitle->setVisible(!value.entities.isEmpty());
+	}, staticTitle->lifetime());
+
 	const auto outer = box->getDelegate()->outerContainer();
 	CreateIconSelector(
 		outer,
@@ -504,10 +632,199 @@ void EditFilterBox(
 	Ui::AddDividerText(excludeInner, tr::lng_filters_exclude_about());
 	Ui::AddSkip(excludeInner);
 
+	{
+		const auto wrap = content->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				content,
+				object_ptr<Ui::VerticalLayout>(content)));
+		const auto colors = wrap->entity();
+		const auto session = &window->session();
+
+		wrap->toggleOn(
+			rpl::combine(
+				session->premiumPossibleValue(),
+				session->data().chatsFilters().tagsEnabledValue(),
+				Data::AmPremiumValue(session)
+			) | rpl::map([=] (bool possible, bool tagsEnabled, bool premium) {
+				return possible && (tagsEnabled || !premium);
+			}),
+			anim::type::instant);
+
+		const auto &padding = st::defaultSubsectionTitlePadding;
+		const auto isPremium = session->premium();
+		const auto titleWrap = colors->add(
+			object_ptr<Ui::FixedHeightWidget>(
+				colors,
+				rect::m::sum::v(padding)
+					+ st::defaultSubsectionTitle.style.font->height));
+		const auto title = Ui::CreateChild<Ui::FlatLabel>(
+			titleWrap,
+			tr::lng_filters_tag_color_subtitle(),
+			st::defaultSubsectionTitle);
+		title->move(rect::m::pos::tl(padding));
+		const auto preview = Ui::CreateChild<Ui::RpWidget>(titleWrap);
+		rpl::combine(
+			title->sizeValue(),
+			titleWrap->widthValue()
+		) | rpl::on_next([=](const QSize &s, int w) {
+			const auto h = st::normalFont->height;
+			const auto left = padding.left()
+				+ s.width()
+				+ st::settingsFilterTagPreviewSkip;
+			preview->setGeometry(
+				left,
+				padding.top() + (s.height() - h) / 2,
+				w - left,
+				h);
+		}, preview->lifetime());
+
+		struct TagState {
+			Ui::Animations::Simple animation;
+			Ui::ChatsFilterTagContext context;
+			QImage frame;
+			float64 alpha = 1.;
+		};
+		const auto tag = preview->lifetime().make_state<TagState>();
+		tag->context.textContext = Core::TextContext({ .session = session });
+		const auto shift = st::settingsFilterTagPreviewSkip / 2;
+		preview->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(preview);
+			p.setOpacity(tag->alpha);
+			const auto size = tag->frame.size() / style::DevicePixelRatio();
+			const auto rect = QRect(
+				preview->width()
+					- size.width()
+					- st::boxRowPadding.right()
+					- shift,
+				(st::normalFont->height - size.height()) / 2,
+				size.width(),
+				size.height());
+			p.drawImage(rect.topLeft(), tag->frame);
+			if (p.opacity() < 1) {
+				p.setOpacity(1. - p.opacity());
+				p.setFont(st::normalFont);
+				p.setPen(st::windowSubTextFg);
+				p.drawText(
+					preview->rect().translated(-shift, 0) - st::boxRowPadding,
+					tr::lng_filters_tag_color_no(tr::now),
+					style::al_right);
+			}
+		}, preview->lifetime());
+
+		const auto side = st::userpicBuilderEmojiAccentColorSize;
+		const auto line = colors->add(
+			Ui::CreateSkipWidget(colors, side),
+			st::boxRowPadding);
+		auto buttons = std::vector<not_null<UserpicBuilder::CircleButton*>>();
+		const auto palette = [](int i) {
+			return Ui::EmptyUserpic::UserpicColor(i).color2;
+		};
+		const auto upperTitle = [=] {
+			auto value = state->title.current();
+			value.text = value.text.toUpper();
+			return value;
+		};
+		state->title.changes(
+		) | rpl::on_next([=] {
+			tag->context.color = palette(state->colorIndex.current())->c;
+			tag->frame = Ui::ChatsFilterTag(
+				upperTitle(),
+				tag->context);
+			preview->update();
+		}, preview->lifetime());
+		for (auto i = 0; i < kColorsCount; ++i) {
+			const auto button = Ui::CreateChild<UserpicBuilder::CircleButton>(
+				line);
+			button->resize(side, side);
+			const auto progress = isPremium
+				? (state->colorIndex.current() == i)
+				: (i == kNoTag);
+			button->setSelectedProgress(progress);
+			const auto color = palette(i);
+			button->setBrush(color);
+			if (progress == 1) {
+				tag->context.color = color->c;
+				tag->frame = Ui::ChatsFilterTag(
+					upperTitle(),
+					tag->context);
+				if (i == kNoTag) {
+					tag->alpha = 0.;
+				}
+			}
+			buttons.push_back(button);
+		}
+		for (auto i = 0; i < kColorsCount; ++i) {
+			const auto &button = buttons[i];
+			button->setClickedCallback([=] {
+				const auto was = state->colorIndex.current();
+				const auto now = i;
+				if (was != now) {
+					const auto c1 = palette(was);
+					const auto c2 = palette(now);
+					const auto a1 = (was == kNoTag) ? 0. : 1.;
+					const auto a2 = (now == kNoTag) ? 0. : 1.;
+					tag->animation.stop();
+					tag->animation.start([=](float64 progress) {
+						if (was >= 0) {
+							buttons[was]->setSelectedProgress(1. - progress);
+						}
+						buttons[now]->setSelectedProgress(progress);
+						tag->context.color = anim::color(c1, c2, progress);
+						tag->frame = Ui::ChatsFilterTag(
+							upperTitle(),
+							tag->context);
+						tag->alpha = anim::interpolateF(a1, a2, progress);
+						preview->update();
+					}, 0., 1., st::universalDuration);
+				}
+				state->colorIndex = now;
+			});
+			if (!session->premium()) {
+				button->setClickedCallback([w = window] {
+					ShowPremiumPreviewToBuy(w, PremiumFeature::FilterTags);
+				});
+			}
+		}
+		line->sizeValue() | rpl::on_next([=](const QSize &size) {
+			const auto totalWidth = buttons.size() * side;
+			const auto spacing = (size.width() - totalWidth)
+				/ (buttons.size() - 1);
+			for (auto i = 0; i < kColorsCount; ++i) {
+				const auto &button = buttons[i];
+				button->moveToLeft(i * (side + spacing), 0);
+			}
+		}, line->lifetime());
+
+		{
+			const auto last = buttons.back();
+			const auto icon = Ui::CreateChild<Ui::RpWidget>(last);
+			icon->resize(side, side);
+			icon->paintRequest() | rpl::on_next([=] {
+				auto p = QPainter(icon);
+				(session->premium()
+					? st::windowFilterSmallRemove.icon
+					: st::historySendDisabledIcon).paintInCenter(
+						p,
+						QRectF(icon->rect()),
+						st::historyPeerUserpicFg->c);
+			}, icon->lifetime());
+			icon->setAttribute(Qt::WA_TransparentForMouseEvents);
+			last->setBrush(st::historyPeerArchiveUserpicBg);
+		}
+
+		Ui::AddSkip(colors);
+		Ui::AddSkip(colors);
+		Ui::AddDividerText(colors, tr::lng_filters_tag_color_about());
+		Ui::AddSkip(colors);
+	}
+
 	const auto collect = [=]() -> std::optional<Data::ChatFilter> {
-		const auto title = name->getLastText().trimmed();
+		auto title = state->title.current();
+		const auto staticTitle = !title.entities.isEmpty()
+			&& state->staticTitle.current();
 		const auto rules = data->current();
-		if (title.isEmpty()) {
+		if (Ui::ComputeFieldCharacterCount(name) > kMaxFilterTitleLength
+			|| title.empty()) {
 			name->showError();
 			box->scrollToY(0);
 			return {};
@@ -520,7 +837,13 @@ void EditFilterBox(
 			window->window().showToast(tr::lng_filters_default(tr::now));
 			return {};
 		}
-		return rules.withTitle(title);
+		const auto rawColorIndex = state->colorIndex.current();
+		const auto colorIndex = (rawColorIndex >= kNoTag
+			? std::nullopt
+			: std::make_optional(rawColorIndex));
+		return rules.withTitle(
+			{ std::move(title), staticTitle }
+		).withColorIndex(colorIndex);
 	};
 
 	Ui::AddSubsectionTitle(
@@ -530,7 +853,7 @@ void EditFilterBox(
 			tr::lng_filters_link_has(),
 			tr::lng_filters_link()));
 
-	state->hasLinks.changes() | rpl::start_with_next([=] {
+	state->hasLinks.changes() | rpl::on_next([=] {
 		content->resizeToWidth(content->widthNoMargins());
 	}, content->lifetime());
 
@@ -563,7 +886,7 @@ void EditFilterBox(
 		addLink->clicks()
 	) | rpl::filter(
 		(rpl::mappers::_1 == Qt::LeftButton)
-	) | rpl::start_with_next([=](Qt::MouseButton button) {
+	) | rpl::on_next([=](Qt::MouseButton button) {
 		const auto result = collect();
 		if (!result || !GoodForExportFilterLink(window, *result)) {
 			return;
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.h b/Telegram/SourceFiles/boxes/filters/edit_filter_box.h
index 695dbbe92af171..cfff9290719168 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.h
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.h
@@ -7,12 +7,14 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "ui/layers/generic_box.h"
-
 namespace Window {
 class SessionController;
 } // namespace Window
 
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
 namespace Data {
 class ChatFilter;
 } // namespace Data
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
index ff0226a8791949..0b3c2fe73cf264 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
@@ -7,7 +7,10 @@ For license and copyright information please follow this link:
 */
 #include "boxes/filters/edit_filter_chats_list.h"
 
+#include "core/ui_integration.h"
+#include "data/data_chat_filters.h"
 #include "data/data_premium_limits.h"
+#include "data/data_session.h"
 #include "history/history.h"
 #include "window/window_session_controller.h"
 #include "lang/lang_keys.h"
@@ -61,13 +64,27 @@ class TypeRow final : public PeerListRow {
 
 class ExceptionRow final : public ChatsListBoxController::Row {
 public:
-	explicit ExceptionRow(not_null<History*> history);
+	ExceptionRow(
+		not_null<History*> history,
+		not_null<PeerListDelegate*> delegate);
 
 	QString generateName() override;
 	QString generateShortName() override;
 	PaintRoundImageCallback generatePaintUserpicCallback(
 		bool forceRound) override;
 
+	void paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int availableWidth,
+		int outerWidth,
+		bool selected) override;
+
+private:
+	Ui::Text::String _filtersText;
+
 };
 
 class TypeController final : public PeerListController {
@@ -124,8 +141,33 @@ Flag TypeRow::flag() const {
 	return static_cast<Flag>(id() & 0xFFFF);
 }
 
-ExceptionRow::ExceptionRow(not_null<History*> history) : Row(history) {
-	if (peer()->isSelf()) {
+ExceptionRow::ExceptionRow(
+	not_null<History*> history,
+	not_null<PeerListDelegate*> delegate)
+: Row(history) {
+	auto filters = TextWithEntities();
+	for (const auto &filter : history->owner().chatsFilters().list()) {
+		if (filter.contains(history) && filter.id()) {
+			if (!filters.empty()) {
+				filters.append(u", "_q);
+			}
+			auto title = filter.title();
+			filters.append(title.isStatic
+				? Data::ForceCustomEmojiStatic(std::move(title.text))
+				: std::move(title.text));
+		}
+	}
+	if (!filters.empty()) {
+		const auto repaint = [=] { delegate->peerListUpdateRow(this); };
+		_filtersText.setMarkedText(
+			st::defaultTextStyle,
+			filters,
+			kMarkupTextOptions,
+			Core::TextContext({
+				.session = &history->session(),
+				.repaint = repaint,
+			}));
+	} else if (peer()->isSelf()) {
 		setCustomStatus(tr::lng_saved_forward_here(tr::now));
 	}
 }
@@ -166,6 +208,37 @@ PaintRoundImageCallback ExceptionRow::generatePaintUserpicCallback(
 	};
 }
 
+void ExceptionRow::paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int availableWidth,
+		int outerWidth,
+		bool selected) {
+	if (_filtersText.isEmpty()) {
+		Row::paintStatusText(
+			p,
+			st,
+			x,
+			y,
+			availableWidth,
+			outerWidth,
+			selected);
+	} else {
+		p.setPen(selected ? st.statusFgOver : st.statusFg);
+		_filtersText.draw(p, {
+			.position = { x, y },
+			.outerWidth = outerWidth,
+			.availableWidth = availableWidth,
+			.palette = &st::defaultTextPalette,
+			.now = crl::now(),
+			.pausedEmoji = false,
+			.elisionLines = 1,
+		});
+	}
+}
+
 TypeController::TypeController(
 	not_null<Main::Session*> session,
 	Flags options,
@@ -311,7 +384,7 @@ object_ptr<Ui::RpWidget> CreatePeerListSectionSubtitle(
 
 	const auto raw = result.data();
 	raw->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(raw);
 		p.fillRect(clip, st::searchedBarBg);
 	}, raw->lifetime());
@@ -321,7 +394,7 @@ object_ptr<Ui::RpWidget> CreatePeerListSectionSubtitle(
 		std::move(text),
 		st::windowFilterChatsSectionSubtitle);
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto padding = st::windowFilterChatsSectionSubtitlePadding;
 		const auto available = width - padding.left() - padding.right();
 		label->resizeToNaturalWidth(available);
@@ -408,7 +481,7 @@ void EditFilterChatsListController::prepareViewHook() {
 	const auto rows = std::make_unique<std::optional<ExceptionRow>[]>(count);
 	auto i = 0;
 	for (const auto &history : _peers) {
-		rows[i++].emplace(history);
+		rows[i++].emplace(history, delegate());
 	}
 	auto pointers = std::vector<ExceptionRow*>();
 	pointers.reserve(count);
@@ -460,12 +533,12 @@ object_ptr<Ui::RpWidget> EditFilterChatsListController::prepareTypesList() {
 		tr::lng_filters_edit_chats()));
 
 	controller->selectedChanges(
-	) | rpl::start_with_next([=](Flags selected) {
+	) | rpl::on_next([=](Flags selected) {
 		_selected = selected;
 	}, _lifetime);
 
 	controller->rowSelectionChanges(
-	) | rpl::start_with_next([=](RowSelectionChange update) {
+	) | rpl::on_next([=](RowSelectionChange update) {
 		this->delegate()->peerListSetForeignRowChecked(
 			update.row,
 			update.checked,
@@ -489,7 +562,7 @@ auto EditFilterChatsListController::createRow(not_null<History*> history)
 		return nullptr;
 	}
 	return history->inChatList()
-		? std::make_unique<ExceptionRow>(history)
+		? std::make_unique<ExceptionRow>(history, delegate())
 		: nullptr;
 }
 
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index 591bdf5144bd67..f15b69c94ec66c 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "boxes/peers/edit_peer_invite_link.h" // InviteLinkQrBox.
 #include "boxes/peer_list_box.h"
 #include "boxes/premium_limits_box.h"
+#include "core/ui_integration.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_chat_filters.h"
@@ -482,7 +483,7 @@ class LinkController final
 	const not_null<Window::SessionController*> _window;
 	InviteLinkData _data;
 
-	QString _filterTitle;
+	Data::ChatFilterTitle _filterTitle;
 	base::flat_set<not_null<History*>> _filterChats;
 	base::flat_map<not_null<PeerData*>, QString> _denied;
 	rpl::variable<base::flat_set<not_null<PeerData*>>> _selected;
@@ -530,27 +531,34 @@ void LinkController::addHeader(not_null<Ui::VerticalLayout*> container) {
 		},
 		st::settingsFilterIconPadding);
 	_showFinished.events(
-	) | rpl::start_with_next([animate = std::move(icon.animate)] {
+	) | rpl::on_next([animate = std::move(icon.animate)] {
 		animate(anim::repeat::once);
 	}, verticalLayout->lifetime());
 	verticalLayout->add(std::move(icon.widget));
 
+	const auto isStatic = _filterTitle.isStatic;
 	verticalLayout->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			verticalLayout,
-			object_ptr<Ui::FlatLabel>(
-				verticalLayout,
-				(_data.url.isEmpty()
-					? tr::lng_filters_link_no_about(Ui::Text::WithEntities)
-					: tr::lng_filters_link_share_about(
-						lt_folder,
-						rpl::single(Ui::Text::Bold(_filterTitle)),
-						Ui::Text::WithEntities)),
-				st::settingsFilterDividerLabel)),
-		st::filterLinkDividerLabelPadding);
+			(_data.url.isEmpty()
+				? tr::lng_filters_link_no_about(tr::marked)
+				: tr::lng_filters_link_share_about(
+					lt_folder,
+					rpl::single(Ui::Text::Wrapped(
+						_filterTitle.text,
+						EntityType::Bold)),
+					tr::marked)),
+			st::settingsFilterDividerLabel,
+			st::defaultPopupMenu,
+			Core::TextContext({
+				.session = &_window->session(),
+				.customEmojiLoopLimit = isStatic ? -1 : 0,
+			})),
+		st::filterLinkDividerLabelPadding,
+		style::al_top)->setTryMakeSimilarLines(true);
 
 	verticalLayout->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		divider->setGeometry(r);
 	}, divider->lifetime());
 }
@@ -573,7 +581,7 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 	using namespace Settings;
 
 	const auto link = _data.url;
-	const auto weak = Ui::MakeWeak(container);
+	const auto weak = base::make_weak(container);
 	const auto copyLink = crl::guard(weak, [=] {
 		CopyInviteLink(delegate()->peerListUiShow(), link);
 	});
@@ -639,7 +647,7 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 		st::inviteLinkFieldPadding);
 
 	label->clicks(
-	) | rpl::start_with_next(copyLink, label->lifetime());
+	) | rpl::on_next(copyLink, label->lifetime());
 
 	AddCopyShareLinkButtons(container, copyLink, shareLink);
 
@@ -777,7 +785,7 @@ void LinkController::setupAboveWidget() {
 		[=](bool select) { toggleAllSelected(select); });
 
 	// Fix label cutting on text change from smaller to longer.
-	_selected.changes() | rpl::start_with_next([=] {
+	_selected.changes() | rpl::on_next([=] {
 		container->resizeToWidth(container->widthNoMargins());
 	}, container->lifetime());
 
@@ -817,7 +825,7 @@ LinksController::LinksController(
 , _currentFilter(std::move(currentFilter))
 , _rows(std::move(content)) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &image : _icons) {
 			image = QImage();
 		}
@@ -826,7 +834,7 @@ LinksController::LinksController(
 
 void LinksController::prepare() {
 	_rows.value(
-	) | rpl::start_with_next([=](const std::vector<InviteLinkData> &rows) {
+	) | rpl::on_next([=](const std::vector<InviteLinkData> &rows) {
 		rebuild(rows);
 	}, _lifetime);
 }
@@ -1007,7 +1015,7 @@ void ExportFilterLink(
 	const auto front = peers.front();
 	const auto session = &front->session();
 	auto mtpPeers = peers | ranges::views::transform(
-		[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input); }
+		[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input()); }
 	) | ranges::to<QVector<MTPInputPeer>>();
 	session->api().request(MTPchatlists_ExportChatlistInvite(
 		MTP_inputChatlistDialogFilter(MTP_int(id)),
@@ -1040,7 +1048,7 @@ void EditLinkChats(
 	const auto front = peers.front();
 	const auto session = &front->session();
 	auto mtpPeers = peers | ranges::views::transform(
-		[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input); }
+		[](not_null<PeerData*> peer) { return MTPInputPeer(peer->input()); }
 	) | ranges::to<QVector<MTPInputPeer>>();
 	session->api().request(MTPchatlists_EditExportedInvite(
 		MTP_flags(MTPchatlists_EditExportedInvite::Flag::f_peers),
@@ -1070,7 +1078,7 @@ object_ptr<Ui::BoxContent> ShowLinkBox(
 
 		const auto saving = std::make_shared<bool>(false);
 		raw->hasChangesValue(
-		) | rpl::start_with_next([=](bool has) {
+		) | rpl::on_next([=](bool has) {
 			box->setCloseByOutsideClick(!has);
 			box->setCloseByEscape(!has);
 			box->clearButtons();
@@ -1174,7 +1182,7 @@ void AddFilterSubtitleWithToggles(
 	const auto canSelect = link->lifetime().make_state<rpl::variable<bool>>(
 		std::move(selectedCount) | rpl::map(_1 < selectableCount));
 	canSelect->value(
-	) | rpl::start_with_next([=](bool can) {
+	) | rpl::on_next([=](bool can) {
 		link->setText(can
 			? tr::lng_filters_by_link_select(tr::now)
 			: tr::lng_filters_by_link_deselect(tr::now));
@@ -1187,7 +1195,7 @@ void AddFilterSubtitleWithToggles(
 		container->widthValue(),
 		title->topValue(),
 		link->widthValue()
-	) | rpl::start_with_next([=](int outer, int y, int width) {
+	) | rpl::on_next([=](int outer, int y, int width) {
 		link->move(outer - st::boxRowPadding.right() - width, y);
 	}, link->lifetime());
 }
diff --git a/Telegram/SourceFiles/boxes/gift_credits_box.cpp b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
index f0ecd05f63a0b0..fe9f193e262869 100644
--- a/Telegram/SourceFiles/boxes/gift_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
@@ -8,7 +8,10 @@ For license and copyright information please follow this link:
 #include "boxes/gift_credits_box.h"
 
 #include "api/api_credits.h"
+#include "boxes/filters/edit_filter_chats_list.h"
 #include "boxes/peer_list_controllers.h"
+#include "boxes/star_gift_box.h" // CollectGiftFrequentUsers.
+#include "core/ui_integration.h" // TextContext.
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -23,7 +26,7 @@ For license and copyright information please follow this link:
 #include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
-#include "ui/widgets/label_with_custom_emoji.h"
+#include "ui/wrap/vertical_layout.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_channel_earn.h"
@@ -34,6 +37,77 @@ For license and copyright information please follow this link:
 #include "styles/style_premium.h"
 
 namespace Ui {
+namespace {
+
+[[nodiscard]] object_ptr<RpWidget> MakeFrequentRecipientsList(
+		not_null<Main::Session*> session,
+		std::vector<not_null<UserData*>> users,
+		Fn<void(not_null<PeerData*>)> chosen) {
+	class FrequentController final : public PeerListController {
+	public:
+		FrequentController(
+			not_null<Main::Session*> session,
+			std::vector<not_null<UserData*>> users,
+			Fn<void(not_null<PeerData*>)> chosen)
+		: _session(session)
+		, _users(std::move(users))
+		, _chosen(std::move(chosen)) {
+		}
+
+		void prepare() override {
+			for (const auto &user : _users) {
+				delegate()->peerListAppendRow(
+					std::make_unique<PeerListRow>(user));
+			}
+			delegate()->peerListRefreshRows();
+		}
+		void loadMoreRows() override {
+		}
+		void rowClicked(not_null<PeerListRow*> row) override {
+			_chosen(row->peer());
+		}
+		Main::Session &session() const override {
+			return *_session;
+		}
+
+	private:
+		const not_null<Main::Session*> _session;
+		const std::vector<not_null<UserData*>> _users;
+		const Fn<void(not_null<PeerData*>)> _chosen;
+
+	};
+
+	auto result = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	const auto container = result.data();
+
+	Ui::AddSkip(container);
+	container->add(CreatePeerListSectionSubtitle(
+		container,
+		tr::lng_settings_top_peers_title()));
+	Ui::AddSkip(container, st::defaultVerticalListSkip / 2);
+
+	const auto delegate
+		= container->lifetime().make_state<PeerListContentDelegateSimple>();
+	const auto controller
+		= container->lifetime().make_state<FrequentController>(
+			session,
+			std::move(users),
+			std::move(chosen));
+	controller->setStyleOverrides(&st::peerListSingleRow);
+	const auto content = container->add(
+		object_ptr<PeerListContent>(container, controller));
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
+
+	Ui::AddSkip(container);
+	container->add(CreatePeerListSectionSubtitle(
+		container,
+		tr::lng_contacts_header()));
+
+	return result;
+}
+
+} // namespace
 
 void GiftCreditsBox(
 		not_null<Ui::GenericBox*> box,
@@ -47,73 +121,46 @@ void GiftCreditsBox(
 	const auto content = box->setPinnedToTopContent(
 		object_ptr<Ui::VerticalLayout>(box));
 
+	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 	const auto &stUser = st::premiumGiftsUserpicButton;
 	const auto userpicWrap = content->add(
-		object_ptr<Ui::CenterWrap<>>(
-			content,
-			object_ptr<Ui::UserpicButton>(content, peer, stUser)));
+		object_ptr<Ui::UserpicButton>(content, peer, stUser),
+		style::al_top);
 	userpicWrap->setAttribute(Qt::WA_TransparentForMouseEvents);
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 
-	{
-		const auto widget = Ui::CreateChild<Ui::RpWidget>(content);
-		using ColoredMiniStars = Ui::Premium::ColoredMiniStars;
-		const auto stars = widget->lifetime().make_state<ColoredMiniStars>(
-			widget,
-			false,
-			Ui::Premium::MiniStars::Type::BiStars);
-		stars->setColorOverride(Ui::Premium::CreditsIconGradientStops());
-		widget->resize(
-			st::boxWidth - stUser.photoSize,
-			stUser.photoSize * 2);
-		content->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
-			widget->moveToLeft(stUser.photoSize / 2, 0);
-			const auto starsRect = Rect(widget->size());
-			stars->setPosition(starsRect.topLeft());
-			stars->setSize(starsRect.size());
-			widget->lower();
-		}, widget->lifetime());
-		widget->paintRequest(
-		) | rpl::start_with_next([=](const QRect &r) {
-			auto p = QPainter(widget);
-			p.fillRect(r, Qt::transparent);
-			stars->paint(p);
-		}, widget->lifetime());
-	}
+	Settings::AddMiniStars(
+		content,
+		Ui::CreateChild<Ui::RpWidget>(content),
+		stUser.photoSize,
+		box->width(),
+		2.);
 	{
 		Ui::AddSkip(content);
-		const auto arrow = Ui::Text::SingleCustomEmoji(
-			peer->owner().customEmojiManager().registerInternalEmoji(
-				st::topicButtonArrow,
-				st::channelEarnLearnArrowMargins,
-				false));
 		auto link = tr::lng_credits_box_history_entry_gift_about_link(
 			lt_emoji,
-			rpl::single(arrow),
-			Ui::Text::RichLangValue
+			rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+			tr::rich
 		) | rpl::map([](TextWithEntities text) {
-			return Ui::Text::Link(
+			return tr::link(
 				std::move(text),
 				u"internal:stars_examples"_q);
 		});
 		content->add(
-			object_ptr<Ui::CenterWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				content,
-				Ui::CreateLabelWithCustomEmoji(
-					content,
-					tr::lng_credits_box_history_entry_gift_out_about(
-						lt_user,
-						rpl::single(TextWithEntities{ peer->shortName() }),
-						lt_link,
-						std::move(link),
-						Ui::Text::RichLangValue),
-					{ .session = &peer->session() },
-					st::creditsBoxAbout)),
-			st::boxRowPadding);
+				tr::lng_credits_box_history_entry_gift_out_about(
+					lt_user,
+					rpl::single(TextWithEntities{ peer->shortName() }),
+					lt_link,
+					std::move(link),
+					tr::rich),
+				st::creditsBoxAbout),
+			st::boxRowPadding,
+			style::al_top);
 	}
 	Ui::AddSkip(content);
 	Ui::AddSkip(box->verticalLayout());
@@ -122,8 +169,11 @@ void GiftCreditsBox(
 		Main::MakeSessionShow(box->uiShow(), &peer->session()),
 		box->verticalLayout(),
 		peer,
-		0,
-		[=] { gifted(); box->uiShow()->hideLayer(); });
+		CreditsAmount(),
+		[=] { gifted(); box->uiShow()->hideLayer(); },
+		box->showFinishes(),
+		tr::lng_credits_summary_options_subtitle(),
+		{});
 
 	box->setPinnedToBottomContent(
 		object_ptr<Ui::VerticalLayout>(box));
@@ -139,7 +189,8 @@ void ShowGiftCreditsBox(
 			not_null<Main::Session*> session,
 			Fn<void(not_null<PeerData*>)> choose)
 		: ContactsBoxController(session)
-		, _choose(std::move(choose)) {
+		, _choose(std::move(choose))
+		, _frequentUsers(CollectGiftFrequentUsers(session)) {
 		}
 
 	protected:
@@ -151,15 +202,29 @@ void ShowGiftCreditsBox(
 				|| user->isInaccessible()) {
 				return nullptr;
 			}
+			if (ranges::contains(_frequentUsers, user)) {
+				return nullptr;
+			}
 			return ContactsBoxController::createRow(user);
 		}
 
+		void prepareViewHook() override {
+			if (_frequentUsers.empty()) {
+				return;
+			}
+			delegate()->peerListSetAboveWidget(MakeFrequentRecipientsList(
+				&session(),
+				_frequentUsers,
+				_choose));
+		}
+
 		void rowClicked(not_null<PeerListRow*> row) override {
 			_choose(row->peer());
 		}
 
 	private:
 		const Fn<void(not_null<PeerData*>)> _choose;
+		const std::vector<not_null<UserData*>> _frequentUsers;
 
 	};
 	auto initBox = [=](not_null<PeerListBox*> peersBox) {
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index fd640e49630fc9..b249a7b1ecf4ec 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -10,32 +10,48 @@ For license and copyright information please follow this link:
 #include "api/api_premium.h"
 #include "api/api_premium_option.h"
 #include "apiwrap.h"
+#include "base/event_filter.h"
+#include "base/timer_rpl.h"
 #include "base/unixtime.h"
 #include "base/weak_ptr.h"
 #include "boxes/peer_list_controllers.h" // ContactsBoxController.
 #include "boxes/peers/prepare_short_info_box.h"
 #include "boxes/peers/replace_boost_box.h" // BoostsForGift.
 #include "boxes/premium_preview_box.h" // ShowPremiumPreviewBox.
+#include "boxes/star_gift_box.h" // ShowStarGiftBox.
+#include "boxes/star_gift_preview_box.h" // StarGiftPreviewBox.
+#include "core/ui_integration.h"
+#include "data/components/gift_auctions.h"
 #include "data/data_boosts.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
 #include "data/data_credits.h"
+#include "data/data_document.h"
+#include "data/data_emoji_statuses.h"
 #include "data/data_media_types.h" // Data::GiveawayStart.
 #include "data/data_peer_values.h" // Data::PeerPremiumValue.
 #include "data/data_session.h"
 #include "data/data_premium_subscription_option.h"
 #include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
-#include "info/channel_statistics/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget.
+//#include "info/channel_statistics/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget.
+#include "info/channel_statistics/earn/earn_icons.h"
+//#include "info/profile/info_profile_badge.h"
+//#include "info/profile/info_profile_values.h"
 #include "lang/lang_keys.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "mainwidget.h"
 #include "payments/payments_checkout_process.h"
 #include "payments/payments_form.h"
-#include "settings/settings_premium.h"
+#include "settings/settings_credits_graphics.h"
+#include "settings/sections/settings_premium.h"
 #include "ui/basic_click_handlers.h" // UrlClickHandler::Open.
 #include "ui/boxes/boost_box.h" // StartFireworks.
+#include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/controls/table_rows.h"
+#include "ui/effects/credits_graphics.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_stars_colored.h"
 #include "ui/effects/premium_top_bar.h"
@@ -43,18 +59,24 @@ For license and copyright information please follow this link:
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/ui_utility.h"
 #include "ui/vertical_list.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/gradient_round_button.h"
-#include "ui/widgets/label_with_custom_emoji.h"
+#include "ui/widgets/tooltip.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/table_layout.h"
 #include "window/window_peer_menu.h" // ShowChooseRecipientBox.
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h"
 #include "styles/style_giveaway.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
@@ -64,6 +86,15 @@ For license and copyright information please follow this link:
 
 namespace {
 
+constexpr auto kTooltipDuration = 3 * crl::time(1000);
+constexpr auto kHorizontalBar = QChar(0x2015);
+constexpr auto kSpinnerRows = 6;
+constexpr auto kSpinDuration = crl::time(120);
+
+using Ui::AddTableRow;
+using Ui::TableRowTooltipData;
+using SpinnerState = Data::GiftUpgradeSpinner::State;
+
 [[nodiscard]] QString CreateMessageLink(
 		not_null<Main::Session*> session,
 		PeerId peerId,
@@ -82,6 +113,10 @@ namespace {
 	return QString();
 };
 
+[[nodiscard]] QString FixupTransactionId(QString origin) {
+	return origin.replace(kHorizontalBar, QChar('-'));
+}
+
 [[nodiscard]] Data::GiftCodeLink MakeGiftCodeLink(
 		not_null<Main::Session*> session,
 		const QString &slug) {
@@ -92,12 +127,39 @@ namespace {
 	};
 }
 
+[[nodiscard]] TextWithEntities FormatValuePrice(
+		int64 price,
+		QString currency,
+		bool approximately = false) {
+	auto result = TextWithEntities();
+	if (approximately) {
+		result.append('~');
+	}
+	return result.append(Ui::FillAmountAndCurrency(price, currency));
+}
+
+[[nodiscard]] TextWithEntities FormatValueDate(TimeId date) {
+	const auto parsed = base::unixtime::parse(date).date();
+	const auto day = parsed.day();
+	const auto month = parsed.month();
+	const auto year = parsed.year();
+	return { tr::lng_month_day_year(
+			tr::now,
+			lt_month,
+			Lang::MonthDay(month)(tr::now),
+			lt_day,
+			QString::number(day),
+			lt_year,
+			QString::number(year))
+	};
+}
+
 [[nodiscard]] object_ptr<Ui::RpWidget> MakeLinkCopyIcon(
 		not_null<QWidget*> parent) {
 	auto result = object_ptr<Ui::RpWidget>(parent);
 	const auto raw = result.data();
 
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		const auto &icon = st::giveawayGiftCodeLinkCopy;
 		const auto left = (raw->width() - icon.width()) / 2;
@@ -114,170 +176,558 @@ namespace {
 	return result;
 }
 
-[[nodiscard]] tr::phrase<lngtag_count> GiftDurationPhrase(int months) {
-	return (months < 12)
+[[nodiscard]] tr::phrase<lngtag_count> GiftDurationPhrase(int days) {
+	return (days < 30)
+		? tr::lng_premium_gift_duration_days
+		: (days < 30 * 12)
 		? tr::lng_premium_gift_duration_months
 		: tr::lng_premium_gift_duration_years;
 }
 
-[[nodiscard]] object_ptr<Ui::RpWidget> MakePeerTableValue(
-		not_null<QWidget*> parent,
-		not_null<Window::SessionNavigation*> controller,
-		PeerId id) {
-	auto result = object_ptr<Ui::AbstractButton>(parent);
-	const auto raw = result.data();
-
-	const auto &st = st::giveawayGiftCodeUserpic;
-	raw->resize(raw->width(), st.photoSize);
+[[nodiscard]] object_ptr<Ui::FlatLabel> MakeMaybeMultilineTokenValue(
+		not_null<Ui::TableLayout*> table,
+		QString token,
+		Settings::CreditsEntryBoxStyleOverrides st) {
+	constexpr auto kOneLineCount = 24;
+	token = token.replace(QChar('-'), kHorizontalBar);
+	const auto oneLine = token.length() <= kOneLineCount;
+	return object_ptr<Ui::FlatLabel>(
+		table,
+		rpl::single(
+			Ui::Text::Wrapped({ token }, EntityType::Code, {})),
+		(oneLine
+			? table->st().defaultValue
+			: st.tableValueMultiline
+			? *st.tableValueMultiline
+			: st::giveawayGiftCodeValueMultiline));
+}
 
-	const auto peer = controller->session().data().peer(id);
-	const auto userpic = Ui::CreateChild<Ui::UserpicButton>(raw, peer, st);
-	const auto label = Ui::CreateChild<Ui::FlatLabel>(
-		raw,
-		peer->name(),
-		st::giveawayGiftCodeValue);
-	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		const auto position = st::giveawayGiftCodeNamePosition;
-		label->resizeToNaturalWidth(width - position.x());
-		label->moveToLeft(position.x(), position.y(), width);
-		const auto top = (raw->height() - userpic->height()) / 2;
-		userpic->moveToLeft(0, top, width);
-	}, label->lifetime());
-
-	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+[[nodiscard]] object_ptr<Ui::RpWidget> MakePriceWithChangePercentValue(
+		not_null<Ui::TableLayout*> table,
+		const std::shared_ptr<Data::UniqueGiftValue> &value) {
+	auto label = object_ptr<Ui::FlatLabel>(
+		table,
+		rpl::single(FormatValuePrice(value->lastSalePrice, value->currency)),
+		table->st().defaultValue);
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
-	label->setTextColorOverride(st::windowActiveTextFg->c);
 
-	raw->setClickedCallback([=] {
-		controller->uiShow()->showBox(PrepareShortInfoBox(peer, controller));
-	});
+	const auto initial = value->initialSalePrice;
+	if (!initial) {
+		return label;
+	}
 
-	return result;
+	const auto diff = (100 * (value->lastSalePrice - initial))
+		/ float64(initial);
+	const auto use = (std::abs(diff) >= 10.)
+		? base::SafeRound(diff)
+		: (int(base::SafeRound(diff * 100)) / 100.);
+	const auto prefix = (use > 0) ? u"+"_q : QString();
+	const auto percent = Lang::FormatExactCountDecimal(use) + '%';
+	auto text = rpl::single(prefix + percent);
+	return MakeValueWithSmallButton(table, label, std::move(text)).widget;
 }
 
-[[nodiscard]] object_ptr<Ui::RpWidget> MakeHiddenPeerTableValue(
-		not_null<QWidget*> parent,
-		not_null<Window::SessionNavigation*> controller) {
-	auto result = object_ptr<Ui::RpWidget>(parent);
-	const auto raw = result.data();
-
-	const auto &st = st::giveawayGiftCodeUserpic;
-	raw->resize(raw->width(), st.photoSize);
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeMinimumPriceValue(
+		not_null<Ui::TableLayout*> table,
+		std::shared_ptr<TableRowTooltipData> tooltip,
+		const std::shared_ptr<Data::UniqueGift> &unique) {
+	const auto &value = unique->value;
+	const auto text = FormatValuePrice(value->minimumPrice, value->currency);
+	return Ui::MakeTableValueWithTooltip(
+		table,
+		std::move(tooltip),
+		text,
+		tr::lng_gift_value_minimum_price_tooltip(
+			tr::now,
+			lt_amount,
+			tr::bold(text.text),
+			lt_gift,
+			tr::bold(unique->title),
+			tr::marked)).widget;
+}
 
-	const auto userpic = Ui::CreateChild<Ui::RpWidget>(raw);
-	const auto usize = st.photoSize;
-	userpic->resize(usize, usize);
-	userpic->paintRequest() | rpl::start_with_next([=] {
-		auto p = QPainter(userpic);
-		Ui::EmptyUserpic::PaintHiddenAuthor(p, 0, 0, usize, usize);
-	}, userpic->lifetime());
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeAveragePriceValue(
+		not_null<Ui::TableLayout*> table,
+		std::shared_ptr<TableRowTooltipData> tooltip,
+		const std::shared_ptr<Data::UniqueGift> &unique) {
+	const auto &value = unique->value;
+	const auto text = FormatValuePrice(value->averagePrice, value->currency);
+	return Ui::MakeTableValueWithTooltip(
+		table,
+		std::move(tooltip),
+		text,
+		tr::lng_gift_value_average_price_tooltip(
+			tr::now,
+			lt_amount,
+			tr::bold(text.text),
+			lt_gift,
+			tr::bold(unique->title),
+			tr::marked)).widget;
+}
 
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeAttributeValue(
+		not_null<Ui::TableLayout*> table,
+		const Data::UniqueGiftAttribute &attribute,
+		Fn<void(not_null<Ui::RpWidget*>, int)> showTooltip) {
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
-		raw,
-		tr::lng_gift_from_hidden(),
-		st::giveawayGiftCodeValue);
-	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		const auto position = st::giveawayGiftCodeNamePosition;
-		label->resizeToNaturalWidth(width - position.x());
-		label->moveToLeft(position.x(), position.y(), width);
-		const auto top = (raw->height() - userpic->height()) / 2;
-		userpic->moveToLeft(0, top, width);
-	}, label->lifetime());
-
-	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+		table,
+		attribute.name,
+		table->st().defaultValue);
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
-	label->setTextColorOverride(st::windowFg->c);
 
-	return result;
+	const auto permille = attribute.rarityPermille();
+	const auto rarity = attribute.rarityType();
+	auto text = rpl::single(Data::UniqueGiftAttributeText(attribute));
+
+	const auto handler = [=](not_null<Ui::RpWidget*> button) {
+		showTooltip(button, permille);
+	};
+	auto result = MakeValueWithSmallButton(
+		table,
+		label,
+		std::move(text),
+		handler);
+	if (rarity != Data::UniqueGiftRarity::Default) {
+		const auto colors = Data::UniqueGiftRarityBadgeColors(rarity);
+		result.button->setBrushOverride(colors.bg);
+		result.button->setTextFgOverride(colors.fg);
+		result.button->setRippleOverride(colors.bg);
+	}
+	return std::move(result.widget);
 }
 
-void AddTableRow(
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeAttributeValue(
 		not_null<Ui::TableLayout*> table,
-		rpl::producer<QString> label,
-		object_ptr<Ui::RpWidget> value,
-		style::margins valueMargins) {
-	table->addRow(
-		(label
-			? object_ptr<Ui::FlatLabel>(
-				table,
-				std::move(label),
-				st::giveawayGiftCodeLabel)
-			: object_ptr<Ui::FlatLabel>(nullptr)),
-		std::move(value),
-		st::giveawayGiftCodeLabelMargin,
-		valueMargins);
+		const Data::UniqueGiftAttribute &attribute,
+		Fn<void(not_null<Ui::RpWidget*>, int)> showTooltip,
+		std::shared_ptr<Data::GiftUpgradeSpinner> spinner,
+		std::vector<Data::UniqueGiftAttribute> spinning,
+		SpinnerState finishedState) {
+	if (!spinner) {
+		return MakeAttributeValue(table, attribute, showTooltip);
+	}
+	auto result = object_ptr<Ui::RpWidget>(table);
+	const auto raw = result.get();
+
+	struct Row {
+		Data::UniqueGiftAttribute attribute;
+		object_ptr<Ui::RpWidget> widget;
+		QImage frame;
+	};
+	struct State {
+		int wasIndex = 0;
+		int nowIndex = 0;
+		std::vector<Row> rows;
+		Ui::Animations::Simple animation;
+		QImage fading;
+		Fn<void()> repaint;
+		bool finished = false;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+	state->repaint = [=] { raw->update(); };
+
+	const auto margin = st::giveawayGiftCodeValueMargin;
+	const auto startWithin = [=] {
+		Expects(!state->rows.empty());
+
+		state->wasIndex = state->nowIndex;
+		state->nowIndex = (state->nowIndex + 1) % state->rows.size();
+		state->animation.start(state->repaint, 0., 1., kSpinDuration);
+	};
+	const auto startToTarget = [=] {
+		if (state->nowIndex != 0) {
+			state->wasIndex = state->nowIndex;
+			state->nowIndex = 0;
+			state->animation.start(
+				state->repaint,
+				0.,
+				1.,
+				kSpinDuration * 3,
+				anim::easeOutCubic);
+		}
+	};
+
+	const auto add = [&](const Data::UniqueGiftAttribute &value) {
+		if (state->rows.size() >= kSpinnerRows) {
+			return false;
+		}
+		const auto already = ranges::contains(
+			state->rows,
+			value,
+			&Row::attribute);
+		if (!already) {
+			state->rows.push_back(Row{
+				.attribute = value,
+				.widget = MakeAttributeValue(table, value, showTooltip),
+			});
+			const auto widget = state->rows.back().widget.get();
+			widget->setParent(raw);
+			widget->hide();
+		}
+		return true;
+	};
+	add(attribute);
+	for (const auto &item : spinning) {
+		if (!add(item)) {
+			break;
+		}
+	}
+
+	raw->widthValue() | rpl::on_next([=](int width) {
+		auto height = 0;
+		const auto inner = width - margin.left() - margin.right();
+		if (inner > 0) {
+			for (const auto &row : state->rows) {
+				row.widget->resizeToWidth(inner);
+				row.widget->move(margin.left(), margin.top());
+				height = std::max(height, row.widget->height());
+			}
+		}
+		raw->resize(width, margin.top() + height + margin.bottom());
+		crl::on_main(raw, [=] {
+			for (const auto &row : state->rows) {
+				Ui::SendPendingMoveResizeEvents(row.widget.get());
+			}
+		});
+	}, raw->lifetime());
+
+	style::PaletteChanged() | rpl::on_next([=] {
+		for (auto &row : state->rows) {
+			row.frame = QImage();
+		}
+		state->fading = QImage();
+	}, raw->lifetime());
+
+	raw->paintOn([=](QPainter &p) {
+		if (state->finished) {
+			return;
+		}
+		auto progress = state->animation.value(1.);
+		if (progress >= 1.) {
+			const auto ending = (spinner->state.current() >= finishedState);
+			if (ending) {
+				startToTarget();
+			} else {
+				startWithin();
+			}
+			progress = state->animation.value(1.);
+			if (ending && progress >= 1.) {
+				state->rows.front().widget->show();
+				state->finished = true;
+				return;
+			}
+		}
+		const auto ratio = style::DevicePixelRatio();
+		const auto h = raw->height();
+		if (state->fading.height() != h * ratio) {
+			state->fading = QImage(
+				QSize(1, h) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			state->fading.setDevicePixelRatio(ratio);
+			state->fading.fill(Qt::transparent);
+			auto q = QPainter(&state->fading);
+			auto brush = QLinearGradient(0, 0, 0, margin.top());
+			brush.setStops({
+				{ 0., anim::with_alpha(st::boxBg->c, 1.) },
+				{ 1., anim::with_alpha(st::boxBg->c, 0.) },
+			});
+			q.fillRect(0, 0, 1, margin.top(), brush);
+			brush.setStart(0, h);
+			brush.setFinalStop(0, h - margin.bottom());
+			q.fillRect(0, h - margin.bottom(), 1, margin.bottom(), brush);
+		}
+		auto &was = state->rows[state->wasIndex];
+		auto &now = state->rows[state->nowIndex];
+		const auto validate = [&](Row &row) {
+			const auto size = row.widget->size();
+			if (row.frame.size() != size * ratio) {
+				row.frame = Ui::GrabWidgetToImage(row.widget.get());
+			}
+		};
+		validate(was);
+		validate(now);
+		const auto t = progress * (margin.top() + was.widget->height());
+		const auto b = progress * (now.widget->height() + margin.bottom());
+		p.drawImage(
+			margin.left(),
+			margin.top() - int(base::SafeRound(t)),
+			was.frame);
+		p.drawImage(
+			margin.left(),
+			raw->height() - int(base::SafeRound(b)),
+			now.frame);
+		p.drawImage(raw->rect(), state->fading);
+	});
+
+	startWithin();
+
+	return result;
 }
 
-not_null<Ui::FlatLabel*> AddTableRow(
+void AddUniqueGiftPropertyRows(
+		not_null<Ui::RpWidget*> container,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<Ui::TableLayout*> table,
-		rpl::producer<QString> label,
-		rpl::producer<TextWithEntities> value) {
-	auto widget = object_ptr<Ui::FlatLabel>(
+		std::shared_ptr<Data::UniqueGift> unique,
+		std::shared_ptr<Data::GiftUpgradeSpinner> spinner) {
+	const auto tooltip = std::make_shared<TableRowTooltipData>(
+		TableRowTooltipData{ .parent = container });
+	const auto showTooltip = [=](
+			not_null<Ui::RpWidget*> widget,
+			rpl::producer<TextWithEntities> text) {
+		ShowTableRowTooltip(
+			tooltip,
+			widget,
+			std::move(text),
+			kTooltipDuration);
+	};
+
+	struct VariantsList {
+		rpl::variable<Data::UniqueGiftAttributes> attributes;
+		bool requested = false;
+		bool inited = false;
+		rpl::lifetime clickLifetime;
+	};
+	const auto variants = container->lifetime().make_state<VariantsList>();
+
+	const auto session = &unique->model.document->session();
+	const auto giftId = unique->initialGiftId;
+	const auto initVariants = [=] {
+		if (variants->requested || variants->inited) {
+			return;
+		}
+		const auto auctions = &session->giftAuctions();
+		if (auto attributes = auctions->attributes(giftId)) {
+			variants->inited = true;
+			variants->attributes = std::move(*attributes);
+		} else {
+			variants->requested = true;
+			auctions->requestAttributes(giftId, crl::guard(container, [=] {
+				variants->inited = true;
+				variants->attributes.force_assign(
+					*auctions->attributes(giftId));
+			}));
+		}
+	};
+
+	const auto title = unique->title;
+	const auto showRarity = [=](Data::GiftAttributeId id) {
+		return [=](
+				not_null<Ui::RpWidget*> widget,
+				int rarityPermille) {
+			initVariants();
+
+			const auto weak = base::make_weak(widget);
+			variants->clickLifetime = variants->attributes.value(
+			) | rpl::filter([=] {
+				return variants->inited;
+			}) | rpl::take(1) | rpl::on_next([=](
+					const Data::UniqueGiftAttributes &list) {
+				if (!list.models.empty()) {
+					show->show(Box(
+						Ui::StarGiftPreviewBox,
+						title,
+						list,
+						id.type,
+						unique));
+				} else if (const auto widget = weak.get()) {
+					const auto percent = Data::UniqueGiftAttributeText(
+						{ .rarityValue = rarityPermille });
+					showTooltip(widget, tr::lng_gift_unique_rarity(
+						lt_percent,
+						rpl::single(tr::marked(percent)),
+						tr::marked));
+				}
+			});
+		};
+	};
+	const auto empty = std::vector<Data::UniqueGiftAttribute>();
+	const auto extract = [&](const auto &list) {
+		auto result = empty;
+		result.reserve(list.size());
+		for (const auto &item : list) {
+			result.push_back(item);
+		}
+		return result;
+	};
+	const auto attributes = spinner ? &spinner->attributes : nullptr;
+	const auto models = spinner ? extract(attributes->models) : empty;
+	const auto patterns = spinner ? extract(attributes->patterns) : empty;
+	const auto backdrops = spinner ? extract(attributes->backdrops) : empty;
+	const auto margin = spinner
+		? style::margins()
+		: st::giveawayGiftCodeValueMargin;
+	AddTableRow(
 		table,
-		std::move(value),
-		st::giveawayGiftCodeValue);
-	const auto result = widget.data();
+		tr::lng_gift_unique_model(),
+		MakeAttributeValue(
+			table,
+			unique->model,
+			showRarity(IdFor(unique->model)),
+			spinner,
+			models,
+			SpinnerState::FinishedModel),
+		margin);
 	AddTableRow(
 		table,
-		std::move(label),
-		std::move(widget),
-		st::giveawayGiftCodeValueMargin);
-	return result;
+		tr::lng_gift_unique_symbol(),
+		MakeAttributeValue(
+			table,
+			unique->pattern,
+			showRarity(IdFor(unique->pattern)),
+			spinner,
+			patterns,
+			SpinnerState::FinishedPattern),
+		margin);
+	AddTableRow(
+		table,
+		tr::lng_gift_unique_backdrop(),
+		MakeAttributeValue(
+			table,
+			unique->backdrop,
+			showRarity(IdFor(unique->backdrop)),
+			spinner,
+			backdrops,
+			SpinnerState::FinishedBackdrop),
+		margin);
 }
 
-void AddTableRow(
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeStarGiftStarsValue(
 		not_null<Ui::TableLayout*> table,
-		rpl::producer<QString> label,
-		not_null<Window::SessionNavigation*> controller,
-		PeerId id) {
-	if (!id) {
-		return;
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::CreditsHistoryEntry &entry,
+		Fn<void()> convertToStars) {
+	auto helper = Ui::Text::CustomEmojiHelper();
+	const auto addUpgradeToValue = !entry.credits.ton()
+		&& !entry.giftUpgradeGifted
+		&& !entry.giftUpgradeSeparate
+		&& entry.starsUpgradedBySender;
+	const auto amount = addUpgradeToValue
+		? CreditsAmount(
+			entry.credits.whole() + entry.starsUpgradedBySender,
+			entry.credits.nano())
+		: entry.credits;
+	const auto price = helper.paletteDependent(Ui::Earn::IconCreditsEmoji(
+	)).append(' ').append(Lang::FormatCreditsAmountDecimal(amount));
+	auto label = object_ptr<Ui::FlatLabel>(
+		table,
+		rpl::single(price),
+		table->st().defaultValue,
+		st::defaultPopupMenu,
+		helper.context());
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	if (!convertToStars) {
+		return label;
 	}
-	AddTableRow(
+	const auto handler = [=](not_null<Ui::RpWidget*> button) {
+		convertToStars();
+	};
+	auto text = tr::lng_gift_sell_small(
+		lt_count_decimal,
+		rpl::single(entry.starsConverted * 1.));
+	return MakeValueWithSmallButton(
+		table,
+		label.release(),
+		std::move(text),
+		handler).widget;
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeUniqueGiftValueValue(
+		not_null<Ui::TableLayout*> table,
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::CreditsHistoryEntry &entry,
+		Settings::CreditsEntryBoxStyleOverrides st) {
+	const auto unique = entry.uniqueGift;
+	const auto value = unique ? unique->value : nullptr;
+	const auto loading = std::make_shared<bool>(false);
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		table,
+		rpl::single(
+			FormatValuePrice(value->valuePrice, value->currency, true)),
+		table->st().defaultValue,
+		st::defaultPopupMenu);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	const auto handler = [=](not_null<Ui::RpWidget*> button) {
+		if (value->initialPriceStars) {
+			show->show(Box(Settings::UniqueGiftValueBox, show, entry, st));
+			return;
+		} else if (*loading) {
+			return;
+		}
+		*loading = true;
+		show->session().api().request(MTPpayments_GetUniqueStarGiftValueInfo(
+			MTP_string(unique->slug)
+		)).done([=](const MTPpayments_UniqueStarGiftValueInfo &result) {
+			*loading = false;
+
+			const auto &data = result.data();
+			value->currency = qs(data.vcurrency());
+			value->valuePrice = data.vvalue().v;
+			value->initialSaleDate = data.vinitial_sale_date().v;
+			value->initialPriceStars = CreditsAmount(
+				data.vinitial_sale_stars().v);
+			value->initialSalePrice = data.vinitial_sale_price().v;
+			value->lastSaleDate = data.vlast_sale_date().value_or_empty();
+			value->lastSalePrice = data.vlast_sale_price().value_or_empty();
+			value->lastSaleFragment = data.is_last_sale_on_fragment();
+			value->minimumPrice = data.vfloor_price().value_or_empty();
+			value->averagePrice = data.vaverage_price().value_or_empty();
+			value->forSaleOnTelegram = data.vlisted_count().value_or_empty();
+			value->forSaleOnFragment = int(
+				data.vfragment_listed_count().value_or_empty());
+			value->fragmentUrl = qs(
+				data.vfragment_listed_url().value_or_empty());
+
+			show->show(Box(Settings::UniqueGiftValueBox, show, entry, st));
+		}).send();
+	};
+	return MakeValueWithSmallButton(
 		table,
-		std::move(label),
-		MakePeerTableValue(table, controller, id),
-		st::giveawayGiftCodePeerMargin);
+		label,
+		tr::lng_gift_unique_value_learn_more(),
+		handler).widget;
 }
 
 void AddTable(
 		not_null<Ui::VerticalLayout*> container,
-		not_null<Window::SessionNavigation*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
+		Settings::CreditsEntryBoxStyleOverrides st,
 		const Api::GiftCode &current,
 		bool skipReason) {
 	auto table = container->add(
 		object_ptr<Ui::TableLayout>(
 			container,
-			st::giveawayGiftCodeTable),
+			st.table ? *st.table : st::giveawayGiftCodeTable),
 		st::giveawayGiftCodeTableMargin);
 	if (current.from) {
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_from(),
-			controller,
+			show,
 			current.from);
 	}
 	if (current.from && current.to) {
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_to(),
-			controller,
+			show,
 			current.to);
 	} else if (current.from) {
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_to(),
-			tr::lng_gift_link_label_to_unclaimed(Ui::Text::WithEntities));
+			tr::lng_gift_link_label_to_unclaimed(tr::marked));
 	}
 	AddTableRow(
 		table,
 		tr::lng_gift_link_label_gift(),
 		tr::lng_gift_link_gift_premium(
 			lt_duration,
-			GiftDurationValue(current.months) | Ui::Text::ToWithEntities(),
-			Ui::Text::WithEntities));
+			GiftDurationValue(current.days) | rpl::map(tr::marked),
+			tr::marked));
 	if (!skipReason && current.from) {
 		const auto reason = AddTableRow(
 			table,
@@ -285,20 +735,21 @@ void AddTable(
 			(current.giveawayId
 				? ((current.to
 					? tr::lng_gift_link_reason_giveaway
-					: tr::lng_gift_link_reason_unclaimed)(
-						) | Ui::Text::ToLink())
+					: tr::lng_gift_link_reason_unclaimed)(tr::link))
 				: current.giveaway
 				? ((current.to
 					? tr::lng_gift_link_reason_giveaway
 					: tr::lng_gift_link_reason_unclaimed)(
-						Ui::Text::WithEntities
-					) | rpl::type_erased())
-				: tr::lng_gift_link_reason_chosen(Ui::Text::WithEntities)));
+						tr::marked
+					) | rpl::type_erased)
+				: tr::lng_gift_link_reason_chosen(tr::marked)));
 		reason->setClickHandlerFilter([=](const auto &...) {
-			controller->showPeerHistory(
-				current.from,
-				Window::SectionShow::Way::Forward,
-				current.giveawayId);
+			if (const auto window = show->resolveWindow()) {
+				window->showPeerHistory(
+					current.from,
+					Window::SectionShow::Way::Forward,
+					current.giveawayId);
+			}
 			return false;
 		});
 	}
@@ -306,7 +757,7 @@ void AddTable(
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_date(),
-			rpl::single(Ui::Text::WithEntities(
+			rpl::single(tr::marked(
 				langDateTime(base::unixtime::parse(current.date)))));
 	}
 }
@@ -347,11 +798,11 @@ void ShowAlreadyPremiumToast(
 		.text = tr::lng_gift_link_already_about(
 			tr::now,
 			lt_date,
-			Ui::Text::Bold(langDateTime(base::unixtime::parse(date))),
+			tr::bold(langDateTime(base::unixtime::parse(date))),
 			lt_link,
-			Ui::Text::Link(
-				Ui::Text::Bold(tr::lng_gift_link_already_link(tr::now))),
-			Ui::Text::WithEntities),
+			tr::link(
+				tr::bold(tr::lng_gift_link_already_link(tr::now))),
+			tr::marked),
 		.filter = crl::guard(navigation, shareLink),
 		.duration = 6 * crl::time(1000),
 	});
@@ -359,17 +810,22 @@ void ShowAlreadyPremiumToast(
 
 } // namespace
 
-rpl::producer<QString> GiftDurationValue(int months) {
-	return GiftDurationPhrase(months)(
+rpl::producer<QString> GiftDurationValue(int days) {
+	return GiftDurationPhrase(days)(
 		lt_count,
-		rpl::single(float64((months < 12) ? months : (months / 12))));
+		rpl::single(float64((days < 30)
+			? days
+			: (days < 30 * 12)
+			? (days / 30)
+			: (days / (30 * 12)))));
 }
 
-QString GiftDuration(int months) {
-	return GiftDurationPhrase(months)(
-		tr::now,
-		lt_count,
-		(months < 12) ? months : (months / 12));
+QString GiftDuration(int days) {
+	return GiftDurationPhrase(days)(tr::now, lt_count, (days < 30)
+		? days
+		: (days < 30 * 12)
+		? (days / 30)
+		: (days / (30 * 12)));
 }
 
 void GiftCodeBox(
@@ -405,8 +861,8 @@ void GiftCodeBox(
 					tr::lng_gift_link_title()),
 				.about = rpl::conditional(
 					state->used.value(),
-					tr::lng_gift_link_used_about(Ui::Text::RichLangValue),
-					tr::lng_gift_link_about(Ui::Text::RichLangValue)),
+					tr::lng_gift_link_used_about(tr::rich),
+					tr::lng_gift_link_about(tr::rich)),
 				.light = true,
 			}));
 
@@ -426,11 +882,12 @@ void GiftCodeBox(
 			MakeLinkCopyIcon(box)),
 		st::giveawayGiftCodeLinkMargin);
 
-	AddTable(box->verticalLayout(), controller, state->data.current(), false);
+	const auto show = controller->uiShow();
+	AddTable(box->verticalLayout(), show, {}, state->data.current(), false);
 
 	auto shareLink = tr::lng_gift_link_also_send_link(
 	) | rpl::map([](const QString &text) {
-		return Ui::Text::Link(text);
+		return tr::link(text);
 	});
 	auto richDate = [](const Api::GiftCode &data) {
 		return TextWithEntities{
@@ -445,13 +902,14 @@ void GiftCodeBox(
 				tr::lng_gift_link_used_footer(
 					lt_date,
 					state->data.value() | rpl::map(richDate),
-					Ui::Text::WithEntities),
+					tr::marked),
 				tr::lng_gift_link_also_send(
 					lt_link,
 					std::move(shareLink),
-					Ui::Text::WithEntities)),
+					tr::marked)),
 			st::giveawayGiftCodeFooter),
-		st::giveawayGiftCodeFooterMargin);
+		st::giveawayGiftCodeFooterMargin,
+		style::al_top);
 	footer->setClickHandlerFilter([=](const auto &...) {
 		ShareWithFriend(controller, slug);
 		return false;
@@ -464,11 +922,11 @@ void GiftCodeBox(
 		box->closeBox();
 	});
 	box->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		close->moveToRight(0, 0);
 	}, box->lifetime());
 
-	const auto button = box->addButton(rpl::conditional(
+	box->addButton(rpl::conditional(
 		state->used.value(),
 		tr::lng_box_ok(),
 		tr::lng_gift_link_use()
@@ -497,18 +955,8 @@ void GiftCodeBox(
 			controller->session().api().premium().applyGiftCode(slug, done);
 		}
 	});
-	const auto buttonPadding = st::giveawayGiftCodeBox.buttonPadding;
-	const auto buttonWidth = st::boxWideWidth
-		- buttonPadding.left()
-		- buttonPadding.right();
-	button->widthValue() | rpl::filter([=] {
-		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
-		button->resizeToWidth(buttonWidth);
-	}, button->lifetime());
 }
 
-
 void GiftCodePendingBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Window::SessionNavigation*> controller,
@@ -540,8 +988,8 @@ void GiftCodePendingBox(
 					.title = tr::lng_gift_link_title(),
 					.about = tr::lng_gift_link_pending_about(
 						lt_user,
-						rpl::single(Ui::Text::Link(resultToName)),
-						Ui::Text::RichLangValue),
+						rpl::single(tr::link(resultToName)),
+						tr::rich),
 					.light = true,
 				}));
 
@@ -561,7 +1009,7 @@ void GiftCodePendingBox(
 			spoiler->update();
 		})->start();
 		linkLabel->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			spoiler->setGeometry(Rect(s));
 		}, spoiler->lifetime());
 		const auto spoilerCached = Ui::SpoilerMessCached(
@@ -569,7 +1017,7 @@ void GiftCodePendingBox(
 			st::giveawayGiftCodeLink.textFg->c);
 		const auto textHeight = st::giveawayGiftCodeLink.style.font->height;
 		spoiler->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(spoiler);
 			const auto rect = spoiler->rect();
 			const auto r = rect
@@ -586,14 +1034,16 @@ void GiftCodePendingBox(
 		spoiler->show();
 	}
 
-	AddTable(box->verticalLayout(), controller, data, true);
+	const auto show = controller->uiShow();
+	AddTable(box->verticalLayout(), show, {}, data, true);
 
 	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			tr::lng_gift_link_pending_footer(),
 			st::giveawayGiftCodeFooter),
-		st::giveawayGiftCodeFooterMargin);
+		st::giveawayGiftCodeFooterMargin,
+		style::al_top);
 
 	const auto close = Ui::CreateChild<Ui::IconButton>(
 		box.get(),
@@ -601,20 +1051,11 @@ void GiftCodePendingBox(
 	const auto closeCallback = [=] { box->closeBox(); };
 	close->setClickedCallback(closeCallback);
 	box->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		close->moveToRight(0, 0);
 	}, box->lifetime());
 
-	const auto button = box->addButton(tr::lng_close(), closeCallback);
-	const auto buttonPadding = st::giveawayGiftCodeBox.buttonPadding;
-	const auto buttonWidth = st::boxWideWidth
-		- buttonPadding.left()
-		- buttonPadding.right();
-	button->widthValue() | rpl::filter([=] {
-		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
-		button->resizeToWidth(buttonWidth);
-	}, button->lifetime());
+	box->addButton(tr::lng_close(), closeCallback);
 }
 
 void ResolveGiftCode(
@@ -632,9 +1073,9 @@ void ResolveGiftCode(
 			code.to = toId;
 			const auto self = (fromId == selfId);
 			const auto peer = session->data().peer(self ? toId : fromId);
-			const auto months = code.months;
+			const auto days = code.days;
 			const auto parent = controller->parentController();
-			Settings::ShowGiftPremium(parent, peer, months, self);
+			Settings::ShowGiftPremium(parent, peer, days, self);
 		} else {
 			controller->uiShow()->showBox(Box(GiftCodeBox, controller, slug));
 		}
@@ -671,20 +1112,20 @@ void GiveawayInfoBox(
 			lt_cup,
 			rpl::single(
 				TextWithEntities{ QString::fromUtf8("\xf0\x9f\x8f\x86") }),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: (info.credits)
 		? tr::lng_prizes_you_won_credits(
 			lt_amount,
 			tr::lng_prizes_you_won_credits_amount(
 				lt_count,
 				rpl::single(float64(info.credits)),
-				Ui::Text::Bold),
+				tr::bold),
 			lt_cup,
 			rpl::single(
 				TextWithEntities{ QString::fromUtf8("\xf0\x9f\x8f\x86") }),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: (info.state == State::Finished)
-		? tr::lng_prizes_you_didnt(Ui::Text::WithEntities)
+		? tr::lng_prizes_you_didnt(tr::marked)
 		: (rpl::producer<TextWithEntities>)(nullptr);
 
 	if (resultText) {
@@ -698,13 +1139,12 @@ void GiveawayInfoBox(
 			label->setTextColorOverride(st::windowActiveTextFg->c);
 		}
 		const auto result = box->addRow(
-			object_ptr<Ui::PaddingWrap<Ui::CenterWrap<Ui::FlatLabel>>>(
+			object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
 				box.get(),
-				object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
-					box.get(),
-					std::move(label)),
-				QMargins(0, skip, 0, skip)));
-		result->paintRequest() | rpl::start_with_next([=] {
+				std::move(label),
+				QMargins(0, skip, 0, skip)),
+			style::al_justify);
+		result->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(result);
 			p.setPen(Qt::NoPen);
 			p.setBrush(st::boxDividerBg);
@@ -737,14 +1177,14 @@ void GiveawayInfoBox(
 					: tr::lng_prizes_credits_admins)(
 						tr::now,
 						lt_channel,
-						Ui::Text::Bold(first),
+						tr::bold(first),
 						lt_amount,
 						tr::lng_prizes_credits_admins_amount(
 							tr::now,
 							lt_count_decimal,
 							float64(credits),
-							Ui::Text::Bold),
-						Ui::Text::RichLangValue)
+							tr::bold),
+						tr::rich)
 				: (group
 					? tr::lng_prizes_admins_group
 					: tr::lng_prizes_admins)(
@@ -752,11 +1192,11 @@ void GiveawayInfoBox(
 						lt_count,
 						quantity,
 						lt_channel,
-						Ui::Text::Bold(first),
+						tr::bold(first),
 						lt_duration,
-						TextWithEntities{ GiftDuration(months) },
-						Ui::Text::RichLangValue),
-			Ui::Text::RichLangValue));
+						TextWithEntities{ GiftDuration(months * 30) },
+						tr::rich),
+			tr::rich));
 	const auto many = start
 		? (start->channels.size() > 1)
 		: (results->additionalPeersCount > 0);
@@ -776,8 +1216,8 @@ void GiveawayInfoBox(
 				lt_count,
 				count,
 				lt_channel,
-				Ui::Text::Bold(first),
-				Ui::Text::RichLangValue)
+				tr::bold(first),
+				tr::rich)
 		: (many
 			? tr::lng_prizes_winners_new_of_many
 			: tr::lng_prizes_winners_new_of_one)(
@@ -785,11 +1225,11 @@ void GiveawayInfoBox(
 				lt_count,
 				count,
 				lt_channel,
-				Ui::Text::Bold(first),
+				tr::bold(first),
 				lt_start_date,
-				Ui::Text::Bold(
+				tr::bold(
 					langDateTime(base::unixtime::parse(info.startDate))),
-				Ui::Text::RichLangValue);
+				tr::rich);
 	const auto additionalPrize = results
 		? results->additionalPrize
 		: start->additionalPrize;
@@ -801,10 +1241,10 @@ void GiveawayInfoBox(
 				lt_count,
 				count,
 				lt_channel,
-				Ui::Text::Bold(first),
+				tr::bold(first),
 				lt_prize,
 				TextWithEntities{ additionalPrize },
-				Ui::Text::RichLangValue));
+				tr::rich));
 	}
 	const auto untilDate = start
 		? start->untilDate
@@ -814,17 +1254,17 @@ void GiveawayInfoBox(
 		: tr::lng_prizes_how_when_finish)(
 			tr::now,
 			lt_date,
-			Ui::Text::Bold(langDayOfMonthFull(
+			tr::bold(langDayOfMonthFull(
 				base::unixtime::parse(untilDate).date())),
 			lt_winners,
 			winners,
-			Ui::Text::RichLangValue));
+			tr::rich));
 	if (info.activatedCount > 0) {
 		text.append(' ').append(tr::lng_prizes_end_activated(
 			tr::now,
 			lt_count,
 			info.activatedCount,
-			Ui::Text::RichLangValue));
+			tr::rich));
 	}
 	if (!info.giftCode.isEmpty()
 		|| info.state == State::Finished
@@ -838,8 +1278,8 @@ void GiveawayInfoBox(
 				: tr::lng_prizes_how_no_admin)(
 					tr::now,
 					lt_channel,
-					Ui::Text::Bold(channel->name()),
-					Ui::Text::RichLangValue));
+					tr::bold(channel->name()),
+					tr::rich));
 		} else if (info.tooEarlyDate) {
 			const auto channel = controller->session().data().channel(
 				info.adminChannelId);
@@ -848,33 +1288,33 @@ void GiveawayInfoBox(
 				: tr::lng_prizes_how_no_joined)(
 					tr::now,
 					lt_date,
-					Ui::Text::Bold(
+					tr::bold(
 						langDateTime(
 							base::unixtime::parse(info.tooEarlyDate))),
-					Ui::Text::RichLangValue));
+					tr::rich));
 		} else if (!info.disallowedCountry.isEmpty()) {
 			text.append("\n\n").append(tr::lng_prizes_how_no_country(
 				tr::now,
-				Ui::Text::RichLangValue));
+				tr::rich));
 		} else if (info.participating) {
 			text.append("\n\n").append((many
 				? tr::lng_prizes_how_yes_joined_many
 				: tr::lng_prizes_how_yes_joined_one)(
 					tr::now,
 					lt_channel,
-					Ui::Text::Bold(first),
-					Ui::Text::RichLangValue));
+					tr::bold(first),
+					tr::rich));
 		} else {
 			text.append("\n\n").append((many
 				? tr::lng_prizes_how_participate_many
 				: tr::lng_prizes_how_participate_one)(
 					tr::now,
 					lt_channel,
-					Ui::Text::Bold(first),
+					tr::bold(first),
 					lt_date,
-					Ui::Text::Bold(langDayOfMonthFull(
+					tr::bold(langDayOfMonthFull(
 						base::unixtime::parse(untilDate).date())),
-					Ui::Text::RichLangValue));
+					tr::rich));
 		}
 	}
 	const auto padding = st::boxPadding;
@@ -896,11 +1336,12 @@ void GiveawayInfoBox(
 						: tr::lng_prizes_cancelled()),
 					st::giveawayRefundedLabel),
 				st::giveawayRefundedPadding),
-			{ padding.left(), 0, padding.right(), padding.bottom() });
+			{ padding.left(), 0, padding.right(), padding.bottom() },
+			style::al_top);
 		const auto bg = wrap->lifetime().make_state<Ui::RoundRect>(
 			st::boxRadius,
 			st::attentionBoxButton.textBgOver);
-		wrap->paintRequest() | rpl::start_with_next([=] {
+		wrap->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(wrap);
 			bg->paint(p, wrap->rect());
 		}, wrap->lifetime());
@@ -936,68 +1377,433 @@ void ResolveGiveawayInfo(
 		crl::guard(controller, show));
 }
 
+QString TonAddressUrl(
+		not_null<Main::Session*> session,
+		const QString &address) {
+	const auto prefix = session->appConfig().get<QString>(
+		u"ton_blockchain_explorer_url"_q,
+		u"https://tonviewer.com/"_q);
+	return prefix + address;
+}
+
+struct AddedUniqueDetails {
+	object_ptr<Ui::RpWidget> widget;
+	not_null<Ui::FlatLabel*> label;
+};
+[[nodiscard]] AddedUniqueDetails MakeUniqueDetails(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<QWidget*> parent,
+		rpl::producer<TextWithEntities> text,
+		Settings::CreditsEntryBoxStyleOverrides st,
+		Ui::Text::MarkedContext context,
+		int removeCost,
+		Fn<void(Fn<void()> removed)> remove) {
+	auto owned = object_ptr<Ui::FlatLabel>(
+		parent,
+		rpl::duplicate(text),
+		(st.tableValueMessage
+			? *st.tableValueMessage
+			: st::giveawayGiftMessage),
+		st::defaultPopupMenu,
+		context);
+	const auto label = owned.data();
+	if (!remove) {
+		return {
+			.widget = std::move(owned),
+			.label = label,
+		};
+	}
+	owned.release();
+
+	auto result = object_ptr<Ui::RpWidget>(parent);
+	const auto raw = result.data();
+
+	label->setParent(raw);
+	label->show();
+	const auto icon = Ui::CreateChild<Ui::IconButton>(
+		raw,
+		st::giveawayGiftMessageRemove);
+	raw->widthValue() | rpl::on_next([=](int outer) {
+		label->resizeToWidth(outer - icon->width());
+		const auto height = std::max(label->height(), icon->height());
+
+		icon->moveToRight(0, (height - icon->height()) / 2);
+		label->move(0, (height - label->height()) / 2);
+
+		raw->resize(outer, height);
+	}, raw->lifetime());
+	icon->setClickedCallback([=] {
+		const auto weak = base::make_weak(raw);
+		show->show(Box([=](not_null<Ui::GenericBox*> box) {
+			const auto confirming = base::make_weak(box);
+			const auto confirmed = [=] {
+				remove([=] {
+					delete weak.get();
+					if (const auto strong = confirming.get()) {
+						strong->closeBox();
+					}
+				});
+			};
+			Ui::ConfirmBox(box, {
+				.text = tr::lng_gift_unique_info_remove_text(),
+				.confirmed = confirmed,
+				.confirmText = tr::lng_gift_unique_info_remove_confirm(
+					lt_cost,
+					rpl::single(
+						Ui::Text::IconEmoji(&st::starIconEmoji).append(
+							Lang::FormatCountDecimal(removeCost))),
+					tr::rich),
+				.title = tr::lng_gift_unique_info_remove_title(),
+			});
+			box->addRow(
+				object_ptr<Ui::TableLayout>(
+					box,
+					st.table ? *st.table : st::giveawayGiftCodeTable)
+			)->addRow(
+				object_ptr<Ui::FlatLabel>(
+					parent,
+					rpl::duplicate(text),
+					(st.tableValueMessage
+						? *st.tableValueMessage
+						: st::giveawayGiftMessage),
+					st::defaultPopupMenu,
+					context),
+				nullptr,
+				st::giveawayGiftCodeLabelMargin,
+				st::giveawayGiftCodeValueMargin);
+		}));
+	});
+
+	return {
+		.widget = std::move(result),
+		.label = label,
+	};
+}
+
 void AddStarGiftTable(
-		not_null<Window::SessionNavigation*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<Ui::VerticalLayout*> container,
-		const Data::CreditsHistoryEntry &entry) {
-	auto table = container->add(
+		Settings::CreditsEntryBoxStyleOverrides st,
+		const Data::CreditsHistoryEntry &entry,
+		std::shared_ptr<Data::GiftUpgradeSpinner> spinner,
+		Fn<void()> convertToStars,
+		bool canStartUpgrade,
+		Fn<void(Fn<void()> removed)> removeDetails) {
+	const auto table = container->add(
 		object_ptr<Ui::TableLayout>(
 			container,
-			st::giveawayGiftCodeTable),
+			st.table ? *st.table : st::giveawayGiftCodeTable),
 		st::giveawayGiftCodeTableMargin);
 	const auto peerId = PeerId(entry.barePeerId);
-	if (peerId) {
+	const auto session = &show->session();
+	const auto unique = entry.uniqueGift.get();
+	const auto selfBareId = session->userPeerId().value;
+	const auto giftToSelf = (peerId == session->userPeerId())
+		&& (entry.in || entry.bareGiftOwnerId == selfBareId);
+	const auto giftToChannel = entry.giftChannelSavedId
+		&& peerIsChannel(PeerId(entry.bareEntryOwnerId));
+
+	const auto tooltip = std::make_shared<TableRowTooltipData>(
+		TableRowTooltipData{ .parent = container });
+	const auto showTooltip = [=](
+			not_null<Ui::RpWidget*> widget,
+			rpl::producer<TextWithEntities> text) {
+		ShowTableRowTooltip(tooltip, widget, std::move(text), kTooltipDuration);
+	};
+
+	if (unique && entry.bareGiftResaleRecipientId) {
+		AddTableRow(
+			table,
+			tr::lng_credits_box_history_entry_peer(),
+			MakePeerTableValue(
+				table,
+				show,
+				PeerId(entry.bareGiftResaleRecipientId)),
+			st::giveawayGiftCodePeerMargin);
+	} else if (unique && entry.bareGiftOwnerId) {
+		const auto ownerId = PeerId(entry.bareGiftOwnerId);
+		const auto was = std::make_shared<std::optional<CollectibleId>>();
+		const auto handleChange = [=](
+				not_null<Ui::RpWidget*> badge,
+				EmojiStatusId emojiStatusId) {
+			const auto id = emojiStatusId.collectible
+				? emojiStatusId.collectible->id
+				: 0;
+			const auto show = [&](const auto &phrase) {
+				showTooltip(badge, phrase(
+					lt_name,
+					rpl::single(tr::bold(UniqueGiftName(*unique))),
+					tr::marked));
+			};
+			if (!*was || *was == id) {
+				*was = id;
+				return;
+			} else if (*was == unique->id) {
+				show(tr::lng_gift_wear_end_toast);
+			} else if (id == unique->id) {
+				show(tr::lng_gift_wear_start_toast);
+			}
+			*was = id;
+		};
+		AddTableRow(
+			table,
+			tr::lng_gift_unique_owner(),
+			MakePeerWithStatusValue(table, show, ownerId, handleChange),
+			st::giveawayGiftCodePeerMargin);
+	} else if (unique) {
+		if (!unique->ownerName.isEmpty()) {
+			AddTableRow(
+				table,
+				tr::lng_gift_unique_owner(),
+				rpl::single(TextWithEntities{ unique->ownerName }));
+		} else if (auto address = unique->ownerAddress; !address.isEmpty()) {
+			auto label = MakeMaybeMultilineTokenValue(table, address, st);
+			label->setClickHandlerFilter([=](const auto &...) {
+				TextUtilities::SetClipboardText(
+					TextForMimeData::Simple(FixupTransactionId(address)));
+				show->showToast({
+					.text = { tr::lng_gift_unique_address_copied(tr::now) },
+					.iconLottie = u"toast/copy"_q,
+					.iconLottieSize = st::toastLottieIconSize,
+				});
+				return false;
+			});
+			AddTableRow(
+				table,
+				tr::lng_gift_unique_owner(),
+				std::move(label));
+		}
+
+		if (const auto hostId = PeerId(entry.bareGiftHostId)) {
+			const auto was = std::make_shared<std::optional<CollectibleId>>();
+			const auto handleChange = [=](
+					not_null<Ui::RpWidget*> badge,
+					EmojiStatusId emojiStatusId) {
+				const auto id = emojiStatusId.collectible
+					? emojiStatusId.collectible->id
+					: 0;
+				const auto show = [&](const auto &phrase) {
+					showTooltip(badge, phrase(
+						lt_name,
+						rpl::single(tr::bold(UniqueGiftName(*unique))),
+						tr::marked));
+				};
+				if (!*was || *was == id) {
+					*was = id;
+					return;
+				} else if (*was == unique->id) {
+					show(tr::lng_gift_wear_end_toast);
+				} else if (id == unique->id) {
+					show(tr::lng_gift_wear_start_toast);
+				}
+				*was = id;
+			};
+			AddTableRow(
+				table,
+				tr::lng_gift_unique_telegram(),
+				MakePeerWithStatusValue(table, show, hostId, handleChange),
+				st::giveawayGiftCodePeerMargin);
+		}
+
+	} else if (giftToChannel) {
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_peer_in(),
-			controller,
-			peerId);
-	} else {
+			(entry.bareActorId
+				? MakePeerTableValue(table, show, PeerId(entry.bareActorId))
+				: MakeHiddenPeerTableValue(table)),
+			st::giveawayGiftCodePeerMargin);
+		if (entry.bareEntryOwnerId) {
+			AddTableRow(
+				table,
+				tr::lng_credits_box_history_entry_peer(),
+				MakePeerTableValue(
+					table,
+					show,
+					PeerId(entry.bareEntryOwnerId)),
+				st::giveawayGiftCodePeerMargin);
+		}
+	} else if (entry.auction && entry.bareGiftOwnerId) {
+		AddTableRow(
+			table,
+			tr::lng_credits_box_history_entry_peer(),
+			MakePeerTableValue(
+				table,
+				show,
+				PeerId(entry.bareGiftOwnerId)),
+			st::giveawayGiftCodePeerMargin);
+	} else if (peerId && !giftToSelf) {
+		const auto user = session->data().peer(peerId)->asUser();
+		const auto withSendButton = entry.in && user && !user->isBot();
+		auto send = withSendButton ? tr::lng_gift_send_small() : nullptr;
+		auto handler = send ? Fn<void()>([=] {
+			if (const auto window = show->resolveWindow()) {
+				Ui::ShowStarGiftBox(window, user);
+			}
+		}) : nullptr;
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_peer_in(),
-			MakeHiddenPeerTableValue(table, controller),
+			MakePeerTableValue(table, show, peerId, send, handler),
+			st::giveawayGiftCodePeerMargin);
+	} else if (!entry.soldOutInfo && !giftToSelf) {
+		AddTableRow(
+			table,
+			tr::lng_credits_box_history_entry_peer_in(),
+			MakeHiddenPeerTableValue(table),
 			st::giveawayGiftCodePeerMargin);
 	}
-	if (!entry.date.isNull()) {
+	if (!unique && !entry.firstSaleDate.isNull()) {
+		AddTableRow(
+			table,
+			tr::lng_gift_link_label_first_sale(),
+			rpl::single(tr::marked(
+				langDateTime(entry.firstSaleDate))));
+	}
+	if (!unique && !entry.lastSaleDate.isNull()) {
+		AddTableRow(
+			table,
+			tr::lng_gift_link_label_last_sale(),
+			rpl::single(tr::marked(
+				langDateTime(entry.lastSaleDate))));
+	}
+	if (!unique && !entry.date.isNull()) {
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_date(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(entry.date))));
+			rpl::single(tr::marked(langDateTime(entry.date))));
 	}
-	if (entry.limitedCount > 0) {
+	if (unique) {
+		const auto shared = entry.uniqueGift;
+		AddUniqueGiftPropertyRows(container, show, table, shared, spinner);
+	} else {
+		AddTableRow(
+			table,
+			tr::lng_gift_link_label_value(),
+			MakeStarGiftStarsValue(
+				table,
+				show,
+				entry,
+				std::move(convertToStars)));
+	}
+	if (entry.limitedCount > 0 && !entry.giftRefunded) {
 		auto amount = rpl::single(TextWithEntities{
-			QString::number(entry.limitedCount)
+			Lang::FormatCountDecimal(entry.limitedCount)
 		});
+		const auto count = unique
+			? (entry.limitedCount - entry.limitedLeft)
+			: entry.limitedLeft;
 		AddTableRow(
 			table,
-			tr::lng_gift_availability(),
-			((entry.limitedLeft > 0)
-				? tr::lng_gift_availability_left(
-					lt_count,
-					rpl::single(entry.limitedLeft * 1.),
-					lt_amount,
-					std::move(amount),
-					Ui::Text::WithEntities)
-				: tr::lng_gift_availability_none(
+			(unique
+				? tr::lng_gift_unique_availability_label()
+				: tr::lng_gift_availability()),
+			((!unique && !count)
+				? tr::lng_gift_availability_none(
 					lt_amount,
 					std::move(amount),
-					Ui::Text::WithEntities)));
+					tr::marked)
+				: (unique
+					? tr::lng_gift_unique_availability
+					: tr::lng_gift_availability_left)(
+						lt_count_decimal,
+						rpl::single(count * 1.),
+						lt_amount,
+						std::move(amount),
+						tr::marked)));
 	}
-	if (!entry.description.empty()) {
-		const auto session = &controller->session();
-		const auto makeContext = [=](Fn<void()> update) {
-			return Core::MarkedTextContext{
-				.session = session,
-				.customEmojiRepaint = std::move(update),
+	if (!unique && !entry.soldOutInfo && canStartUpgrade) {
+		AddTableRow(
+			table,
+			tr::lng_gift_unique_status(),
+			tr::lng_gift_unique_status_non(tr::marked));
+	}
+	if (unique) {
+		if (unique->value) {
+			AddTableRow(
+				table,
+				tr::lng_gift_unique_value(),
+				MakeUniqueGiftValueValue(table, show, entry, st));
+		}
+		const auto &original = unique->originalDetails;
+		if (original.recipientId) {
+			const auto owner = &show->session().data();
+			const auto to = owner->peer(original.recipientId);
+			const auto from = original.senderId
+				? owner->peer(original.senderId).get()
+				: nullptr;
+			const auto date = base::unixtime::parse(original.date).date();
+			const auto dateText = TextWithEntities{ langDayOfMonth(date) };
+			auto details = from
+				? (original.message.empty()
+					? tr::lng_gift_unique_info_sender(
+						lt_from,
+						rpl::single(tr::link(from->name(), 2)),
+						lt_recipient,
+						rpl::single(tr::link(to->name(), 1)),
+						lt_date,
+						rpl::single(dateText),
+						tr::marked)
+					: tr::lng_gift_unique_info_sender_comment(
+						lt_from,
+						rpl::single(tr::link(from->name(), 2)),
+						lt_recipient,
+						rpl::single(tr::link(to->name(), 1)),
+						lt_date,
+						rpl::single(dateText),
+						lt_text,
+						rpl::single(original.message),
+						tr::marked))
+				: (original.message.empty()
+					? tr::lng_gift_unique_info_reciever(
+						lt_recipient,
+						rpl::single(tr::link(to->name(), 1)),
+						lt_date,
+						rpl::single(dateText),
+						tr::marked)
+					: tr::lng_gift_unique_info_reciever_comment(
+						lt_recipient,
+						rpl::single(tr::link(to->name(), 1)),
+						lt_date,
+						rpl::single(dateText),
+						lt_text,
+						rpl::single(original.message),
+						tr::marked));
+			const auto tmp = std::make_shared<Ui::RpWidget*>(nullptr);
+			auto made = MakeUniqueDetails(
+				show,
+				table,
+				std::move(details),
+				st,
+				Core::TextContext({ .session = session }),
+				entry.starsForDetailsRemove,
+				std::move(removeDetails));
+			const auto showBoxLink = [=](not_null<PeerData*> peer) {
+				return std::make_shared<LambdaClickHandler>([=] {
+					show->showBox(PrepareShortInfoBox(peer, show));
+				});
 			};
-		};
+			made.label->setLink(1, showBoxLink(to));
+			if (from) {
+				made.label->setLink(2, showBoxLink(from));
+			}
+			made.label->setSelectable(true);
+			*tmp = made.widget.data();
+			table->addRow(
+				std::move(made.widget),
+				nullptr,
+				st::giveawayGiftCodeLabelMargin,
+				st::giveawayGiftCodeValueMargin);
+		}
+	} else if (!entry.description.empty()) {
 		auto label = object_ptr<Ui::FlatLabel>(
 			table,
 			rpl::single(entry.description),
-			st::giveawayGiftMessage,
+			(st.tableValueMessage
+				? *st.tableValueMessage
+				: st::giveawayGiftMessage),
 			st::defaultPopupMenu,
-			makeContext);
+			Core::TextContext({ .session = session }));
 		label->setSelectable(true);
 		table->addRow(
 			nullptr,
@@ -1007,9 +1813,29 @@ void AddStarGiftTable(
 	}
 }
 
+void AddTransferGiftTable(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<Ui::VerticalLayout*> container,
+		std::shared_ptr<Data::UniqueGift> unique) {
+	const auto table = container->add(
+		object_ptr<Ui::TableLayout>(
+			container,
+			st::giveawayGiftCodeTable),
+		st::giveawayGiftCodeTableMargin);
+	AddUniqueGiftPropertyRows(container, show, table, unique, nullptr);
+	if (const auto value = unique->value.get()) {
+		AddTableRow(
+			table,
+			tr::lng_gift_unique_value(),
+			rpl::single(
+				FormatValuePrice(value->valuePrice, value->currency, true)));
+	}
+}
+
 void AddCreditsHistoryEntryTable(
-		not_null<Window::SessionNavigation*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<Ui::VerticalLayout*> container,
+		Settings::CreditsEntryBoxStyleOverrides st,
 		const Data::CreditsHistoryEntry &entry) {
 	if (!entry) {
 		return;
@@ -1017,15 +1843,90 @@ void AddCreditsHistoryEntryTable(
 	auto table = container->add(
 		object_ptr<Ui::TableLayout>(
 			container,
-			st::giveawayGiftCodeTable),
+			st.table ? *st.table : st::giveawayGiftCodeTable),
 		st::giveawayGiftCodeTableMargin);
 	const auto peerId = PeerId(entry.barePeerId);
-	const auto session = &controller->session();
-	if (peerId) {
-		auto text = entry.in
+	const auto actorId = PeerId(entry.bareActorId);
+	const auto starrefRecipientId = PeerId(entry.starrefRecipientId);
+	const auto session = &show->session();
+	if (entry.starrefCommission) {
+		if (entry.giftResale && entry.starrefCommission < 1000) {
+			const auto full = int(base::SafeRound(entry.credits.value()
+				/ (1. - (entry.starrefCommission / 1000.))));
+			auto value = Ui::Text::IconEmoji(&st::starIconEmojiColored);
+			const auto starsText = Lang::FormatCreditsAmountDecimal(
+				CreditsAmount{ full });
+			AddTableRow(
+				table,
+				tr::lng_credits_box_history_entry_gift_full_price(),
+				rpl::single(value.append(' ' + starsText)));
+		} else if (entry.starrefAmount) {
+			AddTableRow(
+				table,
+				tr::lng_star_ref_commission_title(),
+				rpl::single(TextWithEntities{
+					QString::number(entry.starrefCommission / 10.) + '%' }));
+		} else {
+			AddTableRow(
+				table,
+				tr::lng_gift_link_label_reason(),
+				tr::lng_credits_box_history_entry_reason_star_ref(
+					tr::marked));
+		}
+	}
+	if (starrefRecipientId && entry.starrefAmount && !entry.giftResale) {
+		AddTableRow(
+			table,
+			tr::lng_credits_box_history_entry_affiliate(),
+			show,
+			starrefRecipientId);
+	}
+	if (peerId && entry.starrefCommission) {
+		AddTableRow(
+			table,
+			(entry.giftResale
+				? tr::lng_credits_box_history_entry_gift_sold_to
+				: entry.starrefAmount
+				? tr::lng_credits_box_history_entry_referred
+				: tr::lng_credits_box_history_entry_miniapp)(),
+			show,
+			peerId);
+	}
+	if (!entry.postsSearch
+		&& (actorId || (!entry.starrefCommission && peerId))) {
+		auto text = entry.starrefCommission
+			? tr::lng_credits_box_history_entry_referred()
+			: entry.in
 			? tr::lng_credits_box_history_entry_peer_in()
+			: entry.giftResale
+			? tr::lng_credits_box_history_entry_gift_bought_from()
+			: entry.giftUpgraded
+			? tr::lng_credits_box_history_entry_gift_from()
 			: tr::lng_credits_box_history_entry_peer();
-		AddTableRow(table, std::move(text), controller, peerId);
+		const auto targetId = actorId ? actorId : peerId;
+		const auto isPeerDefault = !entry.starrefCommission
+			&& !entry.in
+			&& !entry.giftResale
+			&& !entry.giftUpgraded;
+		const auto user = isPeerDefault
+			? session->data().peer(targetId)->asUser()
+			: nullptr;
+		const auto withSendButton = user
+			&& !user->isInaccessible()
+			&& !user->isBot();
+		auto send = withSendButton ? tr::lng_gift_send_small() : nullptr;
+		auto handler = send
+			? Fn<void()>([=] {
+				if (const auto window = show->resolveWindow()) {
+					Ui::ShowStarGiftBox(window, user);
+				}
+			})
+			: nullptr;
+		AddTableRow(
+			table,
+			std::move(text),
+			MakePeerTableValue(table, show, targetId, send, handler),
+			st::giveawayGiftCodePeerMargin);
 	}
 	if (const auto msgId = MsgId(peerId ? entry.bareMsgId : 0)) {
 		const auto peer = session->data().peer(peerId);
@@ -1036,17 +1937,20 @@ void AddCreditsHistoryEntryTable(
 				entry.bareMsgId);
 			auto label = object_ptr<Ui::FlatLabel>(
 				table,
-				rpl::single(Ui::Text::Link(link)),
-				st::giveawayGiftCodeValue);
+				rpl::single(tr::link(link)),
+				table->st().defaultValue);
 			label->setClickHandlerFilter([=](const auto &...) {
-				controller->showPeerHistory(channel, {}, msgId);
+				if (const auto window = show->resolveWindow()) {
+					window->showPeerHistory(channel, {}, msgId);
+				}
 				return false;
 			});
 			AddTableRow(
 				table,
-				tr::lng_credits_box_history_entry_media(),
-				std::move(label),
-				st::giveawayGiftCodeValueMargin);
+				(entry.reaction
+					? tr::lng_credits_box_history_entry_message
+					: tr::lng_credits_box_history_entry_media)(),
+				std::move(label));
 		}
 	}
 	using Type = Data::CreditsHistoryEntry::PeerType;
@@ -1055,41 +1959,41 @@ void AddCreditsHistoryEntryTable(
 			table,
 			tr::lng_credits_box_history_entry_via(),
 			tr::lng_credits_box_history_entry_app_store(
-				Ui::Text::RichLangValue));
+				tr::rich));
 	} else if (entry.peerType == Type::PlayMarket) {
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_via(),
 			tr::lng_credits_box_history_entry_play_market(
-				Ui::Text::RichLangValue));
+				tr::rich));
 	} else if (entry.peerType == Type::Fragment) {
 		AddTableRow(
 			table,
 			(entry.gift
 				? tr::lng_credits_box_history_entry_peer_in
 				: tr::lng_credits_box_history_entry_via)(),
-			(entry.gift
+			((entry.gift && entry.credits.stars())
 				? tr::lng_credits_box_history_entry_anonymous
 				: tr::lng_credits_box_history_entry_fragment)(
-					Ui::Text::RichLangValue));
+					tr::rich));
 	} else if (entry.peerType == Type::Ads) {
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_via(),
-			tr::lng_credits_box_history_entry_ads(Ui::Text::RichLangValue));
+			tr::lng_credits_box_history_entry_ads(tr::rich));
 	} else if (entry.peerType == Type::PremiumBot) {
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_via(),
 			tr::lng_credits_box_history_entry_via_premium_bot(
-				Ui::Text::RichLangValue));
+				tr::rich));
 	}
 	if (entry.bareGiveawayMsgId) {
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_to(),
-			controller,
-			controller->session().userId());
+			show,
+			show->session().userId());
 	}
 	if (entry.bareGiveawayMsgId && entry.credits) {
 		AddTableRow(
@@ -1097,8 +2001,8 @@ void AddCreditsHistoryEntryTable(
 			tr::lng_gift_link_label_gift(),
 			tr::lng_gift_stars_title(
 				lt_count,
-				rpl::single(float64(entry.credits)),
-				Ui::Text::RichLangValue));
+				rpl::single(entry.credits.value()),
+				tr::rich));
 	}
 	{
 		const auto link = CreateMessageLink(
@@ -1111,57 +2015,101 @@ void AddCreditsHistoryEntryTable(
 				tr::lng_gift_link_label_reason(),
 				tr::lng_gift_link_reason_giveaway(
 				) | rpl::map([link](const QString &text) {
-					return Ui::Text::Link(text, link);
+					return tr::link(text, link);
 				}));
 		}
 	}
-	if (!entry.id.isEmpty()) {
-		constexpr auto kOneLineCount = 18;
-		const auto oneLine = entry.id.length() <= kOneLineCount;
-		auto label = object_ptr<Ui::FlatLabel>(
+	if (!entry.subscriptionUntil.isNull() && !entry.title.isEmpty()) {
+		AddTableRow(
 			table,
-			rpl::single(
-				Ui::Text::Wrapped({ entry.id }, EntityType::Code, {})),
-			oneLine
-				? st::giveawayGiftCodeValue
-				: st::giveawayGiftCodeValueMultiline);
+			tr::lng_gift_link_label_reason(),
+			tr::lng_credits_box_history_entry_subscription(
+				tr::marked));
+	}
+	if (entry.paidMessagesAmount) {
+		auto value = Ui::Text::IconEmoji(&st::starIconEmojiColored);
+		const auto full = (entry.in ? 1 : -1)
+			* (entry.credits + entry.paidMessagesAmount);
+		const auto starsText = Lang::FormatCreditsAmountDecimal(full);
+		AddTableRow(
+			table,
+			tr::lng_credits_paid_messages_full(),
+			rpl::single(value.append(' ' + starsText)));
+	}
+	if (const auto months = entry.premiumMonthsForStars) {
+		AddTableRow(
+			table,
+			tr::lng_credits_premium_gift_duration(),
+			tr::lng_months(
+				lt_count,
+				rpl::single(1. * months),
+				tr::marked));
+	}
+	if (!entry.id.isEmpty()) {
+		auto label = MakeMaybeMultilineTokenValue(table, entry.id, st);
 		label->setClickHandlerFilter([=](const auto &...) {
 			TextUtilities::SetClipboardText(
-				TextForMimeData::Simple(entry.id));
-			controller->showToast(
-				tr::lng_credits_box_history_entry_id_copied(tr::now));
+				TextForMimeData::Simple(FixupTransactionId(entry.id)));
+			show->showToast({
+				.text = {
+					tr::lng_credits_box_history_entry_id_copied(tr::now),
+				},
+				.iconLottie = u"toast/copy"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
 			return false;
 		});
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_id(),
-			std::move(label),
-			st::giveawayGiftCodeValueMargin);
+			std::move(label));
+	}
+	if (entry.floodSkip) {
+		AddTableRow(
+			table,
+			tr::lng_credits_box_history_entry_floodskip_row(),
+			rpl::single(
+				tr::marked(
+					Lang::FormatCountDecimal(entry.floodSkip))));
 	}
 	if (!entry.date.isNull()) {
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_date(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(entry.date))));
+			rpl::single(tr::marked(langDateTime(entry.date))));
 	}
 	if (!entry.successDate.isNull()) {
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_success_date(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(entry.date))));
+			rpl::single(tr::marked(langDateTime(entry.date))));
 	}
 	if (!entry.successLink.isEmpty()) {
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_success_url(),
 			rpl::single(
-				Ui::Text::Link(entry.successLink, entry.successLink)));
+				tr::link(entry.successLink, entry.successLink)));
+	}
+	if (entry.limitedCount > 0 && entry.limitedLeft >= 0) {
+		AddTableRow(
+			table,
+			tr::lng_gift_availability(),
+			tr::lng_gift_availability_left(
+				lt_count_decimal,
+				rpl::single(entry.limitedLeft) | tr::to_count(),
+				lt_amount,
+				rpl::single(TextWithEntities{
+					Lang::FormatCountDecimal(entry.limitedCount)
+				}),
+				tr::marked));
 	}
 }
 
 void AddSubscriptionEntryTable(
-		not_null<Window::SessionNavigation*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<Ui::VerticalLayout*> container,
+		Settings::CreditsEntryBoxStyleOverrides st,
 		const Data::SubscriptionEntry &s) {
 	if (!s) {
 		return;
@@ -1169,15 +2117,38 @@ void AddSubscriptionEntryTable(
 	auto table = container->add(
 		object_ptr<Ui::TableLayout>(
 			container,
-			st::giveawayGiftCodeTable),
+			st.table ? *st.table : st::giveawayGiftCodeTable),
 		st::giveawayGiftCodeTableMargin);
 	const auto peerId = PeerId(s.barePeerId);
+	const auto user = peerIsUser(peerId)
+		? show->session().data().peer(peerId)->asUser()
+		: nullptr;
 	AddTableRow(
 		table,
-		tr::lng_credits_subscription_row_to(),
-		controller,
+		(!s.title.isEmpty() && user && user->botInfo)
+			? tr::lng_credits_subscription_row_to_bot()
+			: (!s.title.isEmpty() && user && !user->botInfo)
+			? tr::lng_credits_subscription_row_to_business()
+			: tr::lng_credits_subscription_row_to(),
+		show,
 		peerId);
+	if (!s.title.isEmpty()) {
+		AddTableRow(
+			table,
+			tr::lng_credits_subscription_row_to(),
+			rpl::single(tr::marked(s.title)));
+	}
 	if (!s.until.isNull()) {
+		if (s.subscription.period > 0) {
+			const auto subscribed = s.until.addSecs(-s.subscription.period);
+			if (subscribed.isValid()) {
+				AddTableRow(
+					table,
+					tr::lng_group_invite_joined_row_date(),
+					rpl::single(
+						tr::marked(langDateTime(subscribed))));
+			}
+		}
 		AddTableRow(
 			table,
 			s.expired
@@ -1185,51 +2156,53 @@ void AddSubscriptionEntryTable(
 				: s.cancelled
 				? tr::lng_credits_subscription_row_next_off()
 				: tr::lng_credits_subscription_row_next_on(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(s.until))));
+			rpl::single(tr::marked(langDateTime(s.until))));
 	}
 }
 
 void AddSubscriberEntryTable(
-		not_null<Window::SessionNavigation*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<Ui::VerticalLayout*> container,
+		Settings::CreditsEntryBoxStyleOverrides st,
 		not_null<PeerData*> peer,
 		TimeId date) {
 	auto table = container->add(
 		object_ptr<Ui::TableLayout>(
 			container,
-			st::giveawayGiftCodeTable),
+			st.table ? *st.table : st::giveawayGiftCodeTable),
 		st::giveawayGiftCodeTableMargin);
 	AddTableRow(
 		table,
 		tr::lng_group_invite_joined_row_subscriber(),
-		controller,
+		show,
 		peer->id);
 	if (const auto d = base::unixtime::parse(date); !d.isNull()) {
 		AddTableRow(
 			table,
 			tr::lng_group_invite_joined_row_date(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(d))));
+			rpl::single(tr::marked(langDateTime(d))));
 	}
 }
 
 void AddCreditsBoostTable(
-		not_null<Window::SessionNavigation*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<Ui::VerticalLayout*> container,
+		Settings::CreditsEntryBoxStyleOverrides st,
 		const Data::Boost &b) {
 	auto table = container->add(
 		object_ptr<Ui::TableLayout>(
 			container,
-			st::giveawayGiftCodeTable),
+			st.table ? *st.table : st::giveawayGiftCodeTable),
 		st::giveawayGiftCodeTableMargin);
 	const auto peerId = b.giveawayMessage.peer;
 	if (!peerId) {
 		return;
 	}
-	const auto from = controller->session().data().peer(peerId);
+	const auto from = show->session().data().peer(peerId);
 	AddTableRow(
 		table,
 		tr::lng_credits_box_history_entry_peer_in(),
-		controller,
+		show,
 		from->id);
 	if (b.credits) {
 		AddTableRow(
@@ -1238,11 +2211,11 @@ void AddCreditsBoostTable(
 			tr::lng_gift_stars_title(
 				lt_count,
 				rpl::single(float64(b.credits)),
-				Ui::Text::RichLangValue));
+				tr::rich));
 	}
 	{
 		const auto link = CreateMessageLink(
-			&controller->session(),
+			&show->session(),
 			peerId,
 			b.giveawayMessage.msg.bare);
 		if (!link.isEmpty()) {
@@ -1251,7 +2224,7 @@ void AddCreditsBoostTable(
 				tr::lng_gift_link_label_reason(),
 				tr::lng_gift_link_reason_giveaway(
 				) | rpl::map([link](const QString &text) {
-					return Ui::Text::Link(text, link);
+					return tr::link(text, link);
 				}));
 		}
 	}
@@ -1259,12 +2232,106 @@ void AddCreditsBoostTable(
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_date(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(b.date))));
+			rpl::single(tr::marked(langDateTime(b.date))));
 	}
 	if (!b.expiresAt.isNull()) {
 		AddTableRow(
 			table,
 			tr::lng_gift_until(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(b.expiresAt))));
+			rpl::single(tr::marked(langDateTime(b.expiresAt))));
+	}
+}
+
+void AddChannelEarnTable(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Ui::VerticalLayout*> container,
+		const Data::CreditsHistoryEntry &entry) {
+	const auto table = container->add(
+		object_ptr<Ui::TableLayout>(
+			container,
+			st::giveawayGiftCodeTable),
+		st::giveawayGiftCodeTableMargin);
+	if (!entry.id.isEmpty()) {
+		auto label = MakeMaybeMultilineTokenValue(table, entry.id, {});
+		label->setClickHandlerFilter([=](const auto &...) {
+			TextUtilities::SetClipboardText(
+				TextForMimeData::Simple(FixupTransactionId(entry.id)));
+			show->showToast({
+				.text = {
+					tr::lng_credits_box_history_entry_id_copied(tr::now),
+				},
+				.iconLottie = u"toast/copy"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+			return false;
+		});
+		AddTableRow(
+			table,
+			tr::lng_credits_box_history_entry_id(),
+			std::move(label));
+	}
+}
+
+void AddUniqueGiftValueTable(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<Ui::VerticalLayout*> container,
+		Settings::CreditsEntryBoxStyleOverrides st,
+		const Data::CreditsHistoryEntry &entry) {
+	const auto value = entry.uniqueGift ? entry.uniqueGift->value : nullptr;
+	auto table = container->add(
+		object_ptr<Ui::TableLayout>(
+			container,
+			st.table ? *st.table : st::giveawayGiftCodeTable),
+		st::giveawayGiftCodeTableMargin);
+	if (value->initialSaleDate) {
+		AddTableRow(
+			table,
+			tr::lng_gift_value_initial_sale(),
+			rpl::single(FormatValueDate(value->initialSaleDate)));
+	}
+	auto helper = Ui::Text::CustomEmojiHelper();
+	auto starIcon = helper.paletteDependent(
+		Ui::Earn::IconCreditsEmoji());
+	AddTableRow(
+		table,
+		tr::lng_gift_value_initial_price(),
+		tr::lng_gift_value_initial_price_value(
+			lt_stars,
+			rpl::single(starIcon.append(' ').append(
+				Lang::FormatCreditsAmountDecimal(value->initialPriceStars)
+			)),
+			lt_amount,
+			rpl::single(FormatValuePrice(
+				value->initialSalePrice,
+				value->currency,
+				true)),
+			tr::marked),
+		helper.context());
+	if (value->lastSaleDate) {
+		AddTableRow(
+			table,
+			tr::lng_gift_value_last_sale(),
+			rpl::single(FormatValueDate(value->lastSaleDate)));
+	}
+	if (value->lastSalePrice) {
+		AddTableRow(
+			table,
+			tr::lng_gift_value_last_price(),
+			MakePriceWithChangePercentValue(table, value));
+	}
+
+	const auto tooltip = std::make_shared<TableRowTooltipData>(
+		TableRowTooltipData{ .parent = container });
+	if (value->minimumPrice) {
+		AddTableRow(
+			table,
+			tr::lng_gift_value_minimum_price(),
+			MakeMinimumPriceValue(table, tooltip, entry.uniqueGift));
+	}
+	if (value->averagePrice) {
+		AddTableRow(
+			table,
+			tr::lng_gift_vlaue_average_price(),
+			MakeAveragePriceValue(table, tooltip, entry.uniqueGift));
 	}
 }
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.h b/Telegram/SourceFiles/boxes/gift_premium_box.h
index 31ca5fcf2eaae2..39a3879fd3af92 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.h
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.h
@@ -13,15 +13,30 @@ namespace Api {
 struct GiftCode;
 } // namespace Api
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Data {
 struct Boost;
 struct CreditsHistoryEntry;
 struct GiveawayStart;
 struct GiveawayResults;
 struct SubscriptionEntry;
+struct UniqueGift;
+struct GiftUpgradeSpinner;
 } // namespace Data
 
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Settings {
+struct CreditsEntryBoxStyleOverrides;
+} // namespace Settings
+
 namespace Ui {
+class Show;
 class GenericBox;
 class VerticalLayout;
 } // namespace Ui
@@ -30,8 +45,8 @@ namespace Window {
 class SessionNavigation;
 } // namespace Window
 
-[[nodiscard]] rpl::producer<QString> GiftDurationValue(int months);
-[[nodiscard]] QString GiftDuration(int months);
+[[nodiscard]] rpl::producer<QString> GiftDurationValue(int days);
+[[nodiscard]] QString GiftDuration(int days);
 
 void GiftCodeBox(
 	not_null<Ui::GenericBox*> box,
@@ -54,26 +69,54 @@ void ResolveGiveawayInfo(
 	std::optional<Data::GiveawayStart> start,
 	std::optional<Data::GiveawayResults> results);
 
+[[nodiscard]] QString TonAddressUrl(
+	not_null<Main::Session*> session,
+	const QString &address);
+
 void AddStarGiftTable(
-	not_null<Window::SessionNavigation*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<Ui::VerticalLayout*> container,
-	const Data::CreditsHistoryEntry &entry);
+	Settings::CreditsEntryBoxStyleOverrides st,
+	const Data::CreditsHistoryEntry &entry,
+	std::shared_ptr<Data::GiftUpgradeSpinner> spinner,
+	Fn<void()> convertToStars,
+	bool canStartUpgrade,
+	Fn<void(Fn<void()> removed)> removeDetails);
+void AddTransferGiftTable(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<Ui::VerticalLayout*> container,
+	std::shared_ptr<Data::UniqueGift> unique);
 void AddCreditsHistoryEntryTable(
-	not_null<Window::SessionNavigation*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<Ui::VerticalLayout*> container,
+	Settings::CreditsEntryBoxStyleOverrides st,
 	const Data::CreditsHistoryEntry &entry);
 
 void AddSubscriptionEntryTable(
-	not_null<Window::SessionNavigation*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<Ui::VerticalLayout*> container,
+	Settings::CreditsEntryBoxStyleOverrides st,
 	const Data::SubscriptionEntry &s);
 void AddSubscriberEntryTable(
-	not_null<Window::SessionNavigation*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<Ui::VerticalLayout*> container,
+	Settings::CreditsEntryBoxStyleOverrides st,
 	not_null<PeerData*> peer,
 	TimeId date);
 
 void AddCreditsBoostTable(
-	not_null<Window::SessionNavigation*> controller,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<Ui::VerticalLayout*> container,
+	Settings::CreditsEntryBoxStyleOverrides st,
 	const Data::Boost &boost);
+
+void AddChannelEarnTable(
+	std::shared_ptr<Ui::Show> show,
+	not_null<Ui::VerticalLayout*> container,
+	const Data::CreditsHistoryEntry &entry);
+
+void AddUniqueGiftValueTable(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<Ui::VerticalLayout*> container,
+	Settings::CreditsEntryBoxStyleOverrides st,
+	const Data::CreditsHistoryEntry &entry);
diff --git a/Telegram/SourceFiles/boxes/language_box.cpp b/Telegram/SourceFiles/boxes/language_box.cpp
index b8a917316f86da..95fb8c3ffedc6d 100644
--- a/Telegram/SourceFiles/boxes/language_box.cpp
+++ b/Telegram/SourceFiles/boxes/language_box.cpp
@@ -7,49 +7,55 @@ For license and copyright information please follow this link:
 */
 #include "boxes/language_box.h"
 
+#include "base/platform/base_platform_info.h"
+#include "boxes/abstract_box.h"
+#include "boxes/premium_preview_box.h"
+#include "boxes/translate_box.h"
+#include "core/application.h"
 #include "data/data_peer_values.h"
+#include "lang/lang_cloud_manager.h"
+#include "lang/lang_instance.h"
 #include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "platform/platform_translate_provider.h"
+#include "settings/settings_common.h"
+#include "spellcheck/spellcheck_types.h"
+#include "storage/localstorage.h"
+#include "ui/accessible/ui_accessible_item.h"
 #include "ui/boxes/choose_language_box.h"
-#include "ui/widgets/checkbox.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/text/text_entity.h"
+#include "ui/text/text_options.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/box_content_divider.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/dropdown_menu.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/multi_select.h"
 #include "ui/widgets/scroll_area.h"
-#include "ui/widgets/dropdown_menu.h"
-#include "ui/widgets/box_content_divider.h"
-#include "ui/text/text_entity.h"
-#include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
-#include "ui/effects/ripple_animation.h"
-#include "ui/toast/toast.h"
-#include "ui/text/text_options.h"
+#include "ui/wrap/vertical_layout.h"
 #include "ui/painter.h"
-#include "ui/vertical_list.h"
+#include "ui/screen_reader_mode.h"
 #include "ui/ui_utility.h"
-#include "storage/localstorage.h"
-#include "boxes/abstract_box.h"
-#include "boxes/premium_preview_box.h"
-#include "boxes/translate_box.h"
-#include "ui/boxes/confirm_box.h"
-#include "main/main_session.h"
+#include "ui/vertical_list.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "core/application.h"
-#include "lang/lang_instance.h"
-#include "lang/lang_cloud_manager.h"
-#include "settings/settings_common.h"
-#include "spellcheck/spellcheck_types.h"
-#include "window/window_session_controller.h"
-#include "styles/style_layers.h"
+
 #include "styles/style_boxes.h"
-#include "styles/style_info.h"
-#include "styles/style_passport.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_passport.h"
 #include "styles/style_settings.h"
 
-#include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
+#include <QtGui/QGuiApplication>
 
 namespace {
 
@@ -68,11 +74,13 @@ class Rows : public Ui::RpWidget {
 
 	int count() const;
 	int selected() const;
+	int chosenIndex() const;
 	void setSelected(int selected);
 	rpl::producer<bool> hasSelection() const;
 	rpl::producer<bool> isEmpty() const;
 
 	void activateSelected();
+	void selectSkip(int dir);
 	rpl::producer<Language> activations() const;
 	void changeChosen(const QString &chosen);
 
@@ -80,10 +88,24 @@ class Rows : public Ui::RpWidget {
 
 	static int DefaultRowHeight();
 
+	QAccessible::Role accessibilityRole() override;
+	Qt::FocusPolicy accessibilityFocusPolicy() override;
+	QAccessible::Role accessibilityChildRole() const override;
+	QAccessible::State accessibilityChildState(int index) const override;
+	int accessibilityChildCount() const override;
+	QString accessibilityChildName(int index) const override;
+	QRect accessibilityChildRect(int index) const override;
+	int accessibilityChildColumnCount(int row) const override;
+	QAccessible::Role accessibilityChildSubItemRole() const override;
+	QString accessibilityChildSubItemName(int row, int column) const override;
+	QString accessibilityChildSubItemValue(int row, int column) const override;
+
 protected:
 	int resizeGetHeight(int newWidth) override;
 
+	void focusInEvent(QFocusEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
+	void keyPressEvent(QKeyEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
 	void mouseReleaseEvent(QMouseEvent *e) override;
@@ -151,6 +173,13 @@ class Rows : public Ui::RpWidget {
 	void repaintChecked(not_null<const Row*> row);
 	void activateByIndex(int index);
 
+	enum class Announce {
+		No,
+		OnChange,
+		Always,
+	};
+	void setSelected(int index, Announce announce);
+
 	void showMenu(int index);
 	void setForceRippled(not_null<Row*> row, bool rippled);
 	bool canShare(not_null<const Row*> row) const;
@@ -180,6 +209,26 @@ class Rows : public Ui::RpWidget {
 
 };
 
+[[nodiscard]] bool ForwardListNavigation(
+		not_null<QKeyEvent*> e,
+		not_null<Rows*> rows,
+		int pageHeight) {
+	const auto key = e->key();
+	if (key == Qt::Key_Down) {
+		rows->selectSkip(1);
+	} else if (key == Qt::Key_Up) {
+		rows->selectSkip(-1);
+	} else if (key == Qt::Key_PageDown || key == Qt::Key_PageUp) {
+		const auto perPage = std::max(
+			pageHeight / Rows::DefaultRowHeight(),
+			1);
+		rows->selectSkip((key == Qt::Key_PageDown) ? perPage : -perPage);
+	} else {
+		return false;
+	}
+	return true;
+}
+
 class Content : public Ui::RpWidget {
 public:
 	Content(
@@ -285,6 +334,44 @@ Rows::Rows(
 	resizeToWidth(width());
 	setAttribute(Qt::WA_MouseTracking);
 	update();
+
+	setAccessibleName(tr::lng_languages(tr::now));
+}
+
+void Rows::focusInEvent(QFocusEvent *e) {
+	if (selected() < 0 && count() > 0) {
+		const auto chosen = chosenIndex();
+		setSelected(chosen >= 0 ? chosen : 0, Announce::No);
+	}
+	RpWidget::focusInEvent(e);
+	const auto index = selected();
+	if (index >= 0) {
+		InvokeQueued(this, [=] {
+			if (selected() == index && hasFocus()) {
+				accessibilityChildFocused(index);
+			}
+		});
+	}
+}
+
+void Rows::keyPressEvent(QKeyEvent *e) {
+	const auto pageHeight = window() ? window()->height() : height();
+	if (ForwardListNavigation(e, this, pageHeight)) {
+		return;
+	}
+	const auto key = e->key();
+	if (key == Qt::Key_Home && count() > 0) {
+		setSelected(0, Announce::Always);
+	} else if (key == Qt::Key_End && count() > 0) {
+		setSelected(count() - 1, Announce::Always);
+	} else if (!e->isAutoRepeat()
+		&& (key == Qt::Key_Space
+			|| key == Qt::Key_Return
+			|| key == Qt::Key_Enter)) {
+		activateSelected();
+	} else {
+		RpWidget::keyPressEvent(e);
+	}
 }
 
 void Rows::mouseMoveEvent(QMouseEvent *e) {
@@ -427,7 +514,11 @@ bool Rows::hasMenu(not_null<const Row*> row) const {
 void Rows::share(not_null<const Row*> row) const {
 	const auto link = u"https://t.me/setlanguage/"_q + row->data.id;
 	QGuiApplication::clipboard()->setText(link);
-	Ui::Toast::Show(tr::lng_username_copied(tr::now));
+	Ui::Toast::Show({
+		.text = { tr::lng_username_copied(tr::now) },
+		.iconLottie = u"toast/voip_invite"_q,
+		.iconLottieSize = st::toastLottieIconSize,
+	});
 }
 
 void Rows::remove(not_null<Row*> row) {
@@ -552,7 +643,10 @@ void Rows::setForceRippled(not_null<Row*> row, bool rippled) {
 }
 
 void Rows::activateByIndex(int index) {
+	_chosen = rowByIndex(index).data.id;
 	_activations.fire_copy(rowByIndex(index).data);
+	accessibilityChildStateChanged(index, { .checked = true });
+	accessibilityChildNameChanged(index);
 }
 
 void Rows::leaveEventHook(QEvent *e) {
@@ -628,6 +722,15 @@ int Rows::selected() const {
 	return indexFromSelection(_selected);
 }
 
+int Rows::chosenIndex() const {
+	for (auto i = 0, n = count(); i < n; ++i) {
+		if (rowByIndex(i).data.id == _chosen) {
+			return i;
+		}
+	}
+	return -1;
+}
+
 void Rows::activateSelected() {
 	const auto index = selected();
 	if (index >= 0) {
@@ -635,24 +738,66 @@ void Rows::activateSelected() {
 	}
 }
 
+void Rows::selectSkip(int dir) {
+	const auto limit = count();
+	auto now = selected();
+	if (now < 0) {
+		now = chosenIndex();
+	}
+	if (now >= 0) {
+		const auto changed = now + dir;
+		if (changed < 0) {
+			setSelected(0, Announce::Always);
+		} else if (changed >= limit) {
+			setSelected(limit - 1, Announce::Always);
+		} else {
+			setSelected(changed, Announce::Always);
+		}
+	} else if (dir > 0) {
+		setSelected(0, Announce::Always);
+	}
+}
+
 rpl::producer<Language> Rows::activations() const {
 	return _activations.events();
 }
 
 void Rows::changeChosen(const QString &chosen) {
+	const auto oldIndex = chosenIndex();
+	_chosen = chosen;
 	for (const auto &row : _rows) {
 		row.check->setChecked(row.data.id == chosen, anim::type::normal);
 	}
+	const auto newIndex = chosenIndex();
+	if (newIndex != oldIndex && newIndex >= 0) {
+		accessibilityChildStateChanged(newIndex, { .checked = true });
+		accessibilityChildNameChanged(newIndex);
+	}
 }
 
 void Rows::setSelected(int selected) {
+	setSelected(selected, Announce::OnChange);
+}
+
+void Rows::setSelected(int selected, Announce announce) {
 	_mouseSelection = false;
 	const auto limit = count();
-	if (selected >= 0 && selected < limit) {
-		updateSelected(RowSelection{ selected });
+	const auto clamped = (selected >= 0 && selected < limit)
+		? selected
+		: -1;
+	const auto changed = (indexFromSelection(_selected) != clamped)
+		|| (clamped < 0 && !v::is_null(_selected));
+	if (clamped >= 0) {
+		updateSelected(RowSelection{ clamped });
 	} else {
 		updateSelected({});
 	}
+	const auto shouldAnnounce = (announce == Announce::Always)
+		|| (announce == Announce::OnChange && changed);
+	if (shouldAnnounce && clamped >= 0) {
+		accessibilityChildNameChanged(clamped);
+		accessibilityChildFocused(clamped);
+	}
 }
 
 rpl::producer<bool> Rows::hasSelection() const {
@@ -872,6 +1017,84 @@ void Rows::paintEvent(QPaintEvent *e) {
 	}
 }
 
+QAccessible::Role Rows::accessibilityRole() {
+	return QAccessible::List;
+}
+
+Qt::FocusPolicy Rows::accessibilityFocusPolicy() {
+	return Qt::TabFocus;
+}
+
+QAccessible::Role Rows::accessibilityChildRole() const {
+	return QAccessible::RadioButton;
+}
+
+QAccessible::State Rows::accessibilityChildState(int index) const {
+	QAccessible::State state;
+	if (Ui::ScreenReaderModeActive()) {
+		state.focusable = true;
+	}
+	state.checkable = true;
+	state.checked = (index == chosenIndex());
+	if (index == selected()) {
+		state.active = true;
+		if (hasFocus()) {
+			state.focused = true;
+		}
+	}
+	return state;
+}
+
+int Rows::accessibilityChildCount() const {
+	return count();
+}
+
+QString Rows::accessibilityChildName(int index) const {
+	if (index < 0 || index >= count()) {
+		return {};
+	}
+	const auto &row = rowByIndex(index);
+	return row.data.nativeName + u", "_q + row.data.name;
+}
+
+QRect Rows::accessibilityChildRect(int index) const {
+	if (index < 0 || index >= count()) {
+		return {};
+	}
+	const auto &row = rowByIndex(index);
+	return QRect(0, row.top, width(), row.height);
+}
+
+int Rows::accessibilityChildColumnCount(int row) const {
+	return 2;
+}
+
+QAccessible::Role Rows::accessibilityChildSubItemRole() const {
+	return QAccessible::Cell;
+}
+
+QString Rows::accessibilityChildSubItemName(int row, int column) const {
+	if (column == 0) {
+		return tr::lng_sr_languages_column_native(tr::now);
+	} else if (column == 1) {
+		return tr::lng_sr_languages_column_name(tr::now);
+	}
+	return {};
+}
+
+QString Rows::accessibilityChildSubItemValue(int row, int column) const {
+	if (row < 0 || row >= count()) {
+		return {};
+	}
+	const auto &data = rowByIndex(row).data;
+	if (column == 0) {
+		return data.nativeName;
+	} else if (column == 1) {
+		return data.name;
+	}
+	return {};
+}
+
 Content::Content(
 	QWidget *parent,
 	const Languages &recent,
@@ -908,7 +1131,7 @@ void Content::setupContent(
 			inner,
 			st::defaultBox.margin.top()));
 
-		rows->isEmpty() | rpl::start_with_next([=](bool empty) {
+		rows->isEmpty() | rpl::on_next([=](bool empty) {
 			wrap->toggle(!empty, anim::type::instant);
 		}, rows->lifetime());
 
@@ -931,7 +1154,7 @@ void Content::setupContent(
 		tr::lng_languages_none(),
 		st::membersAbout);
 	empty->entity()->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		label->move(
 			(size.width() - label->width()) / 2,
 			(size.height() - label->height()) / 2);
@@ -951,7 +1174,7 @@ void Content::setupContent(
 			main->isEmpty(),
 			other->isEmpty(),
 			_1 || _2
-		) | rpl::start_with_next([=](bool empty) {
+		) | rpl::on_next([=](bool empty) {
 			divider->toggle(!empty, anim::type::instant);
 		}, divider->lifetime());
 
@@ -959,7 +1182,7 @@ void Content::setupContent(
 			a->hasSelection(
 			) | rpl::filter(
 				_1
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				b->setSelected(-1);
 			}, a->lifetime());
 		};
@@ -1048,7 +1271,7 @@ void Content::setupContent(
 	};
 	_activations = [=] {
 		if (!main && !other) {
-			return rpl::never<Language>() | rpl::type_erased();
+			return rpl::never<Language>() | rpl::type_erased;
 		} else if (!main) {
 			return other->activations();
 		} else if (!other) {
@@ -1057,7 +1280,7 @@ void Content::setupContent(
 		return rpl::merge(
 			main->activations(),
 			other->activations()
-		) | rpl::type_erased();
+		) | rpl::type_erased;
 	};
 	_changeChosen = [=](const QString &chosen) {
 		if (main) {
@@ -1102,8 +1325,12 @@ Ui::ScrollToRequest Content::jump(int rows) {
 
 } // namespace
 
-LanguageBox::LanguageBox(QWidget*, Window::SessionController *controller)
-: _controller(controller) {
+LanguageBox::LanguageBox(
+	QWidget*,
+	Window::SessionController *controller,
+	const QString &highlightId)
+: _controller(controller)
+, _highlightId(highlightId) {
 }
 
 void LanguageBox::prepare() {
@@ -1134,12 +1361,12 @@ void LanguageBox::prepare() {
 		inner->heightValue(),
 		topContainer->heightValue(),
 		_1 + _2
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		accumulate_max(*max, height);
 		setDimensions(st::boxWidth, qMin(*max, st::boxMaxListHeight));
 	}, inner->lifetime());
 	topContainer->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setInnerTopSkip(height);
 	}, inner->lifetime());
 
@@ -1154,7 +1381,7 @@ void LanguageBox::prepare() {
 	});
 
 	inner->activations(
-	) | rpl::start_with_next([=](const Language &language) {
+	) | rpl::on_next([=](const Language &language) {
 		// "#custom" is applied each time it's passed to switchToLanguage().
 		// So we check that the language really has changed.
 		const auto currentId = [] {
@@ -1176,6 +1403,22 @@ void LanguageBox::prepare() {
 	};
 }
 
+void LanguageBox::showFinished() {
+	if (_controller && !_highlightId.isEmpty()) {
+		if (const auto window = Core::App().findWindow(this)) {
+			window->checkHighlightControl(
+				u"language/show-button"_q,
+				_showButtonToggle.data());
+			window->checkHighlightControl(
+				u"language/translate-chats"_q,
+				_translateChatsToggle.data());
+			window->checkHighlightControl(
+				u"language/do-not-translate"_q,
+				_doNotTranslateButton.data());
+		}
+	}
+}
+
 void LanguageBox::setupTop(not_null<Ui::VerticalLayout*> container) {
 	if (!_controller) {
 		return;
@@ -1186,15 +1429,50 @@ void LanguageBox::setupTop(not_null<Ui::VerticalLayout*> container) {
 			tr::lng_translate_settings_show(),
 			st::settingsButtonNoIcon))->toggleOn(
 				rpl::single(Core::App().settings().translateButtonEnabled()));
+	_showButtonToggle = translateEnabled;
 
 	translateEnabled->toggledValue(
 	) | rpl::filter([](bool checked) {
 		return (checked != Core::App().settings().translateButtonEnabled());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setTranslateButtonEnabled(checked);
 		Core::App().saveSettingsDelayed();
 	}, translateEnabled->lifetime());
 
+	if (Platform::IsTranslateProviderAvailable()) {
+		const auto platformTranslateWrap = container->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				container,
+				object_ptr<Ui::VerticalLayout>(container)));
+		platformTranslateWrap->toggle(
+			translateEnabled->toggled(),
+			anim::type::instant);
+		platformTranslateWrap->toggleOn(translateEnabled->toggledValue());
+		const auto platformTranslateEnabled = platformTranslateWrap->entity()->add(
+			object_ptr<Ui::SettingsButton>(
+				platformTranslateWrap->entity(),
+				Platform::IsMac()
+					? tr::lng_translate_settings_use_platform_mac()
+					: tr::lng_translate_settings_use_platform_linux(),
+				st::settingsButtonNoIcon))->toggleOn(
+					rpl::single(
+						Core::App().settings().usePlatformTranslation()));
+		platformTranslateEnabled->toggledValue(
+		) | rpl::filter([](bool checked) {
+			return (checked
+				!= Core::App().settings().usePlatformTranslation());
+		}) | rpl::on_next([=](bool checked) {
+			Core::App().settings().setUsePlatformTranslation(checked);
+			Core::App().saveSettingsDelayed();
+		}, platformTranslateEnabled->lifetime());
+		if (Platform::IsMac()) {
+			Ui::AddSkip(platformTranslateWrap->entity());
+			Ui::AddDividerText(
+				platformTranslateWrap->entity(),
+				tr::lng_translate_settings_use_platform_mac_about());
+		}
+	}
+
 	using namespace rpl::mappers;
 	auto premium = Data::AmPremiumValue(&_controller->session());
 	const auto translateChat = container->add(object_ptr<Ui::SettingsButton>(
@@ -1207,7 +1485,8 @@ void LanguageBox::setupTop(not_null<Ui::VerticalLayout*> container) {
 			rpl::duplicate(premium),
 			_1 && _2),
 		_translateChatTurnOff.events()));
-	std::move(premium) | rpl::start_with_next([=](bool value) {
+	_translateChatsToggle = translateChat;
+	std::move(premium) | rpl::on_next([=](bool value) {
 		translateChat->setToggleLocked(!value);
 	}, translateChat->lifetime());
 
@@ -1222,7 +1501,7 @@ void LanguageBox::setupTop(not_null<Ui::VerticalLayout*> container) {
 		}
 		return premium
 			&& (checked != Core::App().settings().translateChatEnabled());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setTranslateChatEnabled(checked);
 		Core::App().saveSettingsDelayed();
 	}, translateChat->lifetime());
@@ -1249,6 +1528,7 @@ void LanguageBox::setupTop(not_null<Ui::VerticalLayout*> container) {
 				: Ui::LanguageName(list.front());
 		}),
 		st::settingsButtonNoIcon);
+	_doNotTranslateButton = translateSkip;
 
 	translateSkip->setClickedCallback([=] {
 		uiShow()->showBox(Ui::EditSkipTranslationLanguages());
@@ -1288,7 +1568,9 @@ void LanguageBox::setInnerFocus() {
 	_setInnerFocus();
 }
 
-base::binary_guard LanguageBox::Show(Window::SessionController *controller) {
+base::binary_guard LanguageBox::Show(
+		Window::SessionController *controller,
+		const QString &highlightId) {
 	auto result = base::binary_guard();
 
 	auto &manager = Lang::CurrentCloudManager();
@@ -1300,17 +1582,17 @@ base::binary_guard LanguageBox::Show(Window::SessionController *controller) {
 		manager.languageListChanged(
 		) | rpl::take(
 			1
-		) | rpl::start_with_next([=]() mutable {
+		) | rpl::on_next([=]() mutable {
 			const auto show = guard->alive();
 			if (lifetime) {
 				base::take(lifetime)->destroy();
 			}
 			if (show) {
-				Ui::show(Box<LanguageBox>(weak.get()));
+				Ui::show(Box<LanguageBox>(weak.get(), highlightId));
 			}
 		}, *lifetime);
 	} else {
-		Ui::show(Box<LanguageBox>(controller));
+		Ui::show(Box<LanguageBox>(controller, highlightId));
 	}
 	manager.requestLanguageList();
 
diff --git a/Telegram/SourceFiles/boxes/language_box.h b/Telegram/SourceFiles/boxes/language_box.h
index 350b570a68743b..d3b89a509fa766 100644
--- a/Telegram/SourceFiles/boxes/language_box.h
+++ b/Telegram/SourceFiles/boxes/language_box.h
@@ -24,14 +24,20 @@ class SessionController;
 
 class LanguageBox : public Ui::BoxContent {
 public:
-	LanguageBox(QWidget*, Window::SessionController *controller);
+	LanguageBox(
+		QWidget*,
+		Window::SessionController *controller,
+		const QString &highlightId = QString());
 
 	void setInnerFocus() override;
 
-	static base::binary_guard Show(Window::SessionController *controller);
+	[[nodiscard]] static base::binary_guard Show(
+		Window::SessionController *controller,
+		const QString &highlightId = QString());
 
 protected:
 	void prepare() override;
+	void showFinished() override;
 
 	void keyPressEvent(QKeyEvent *e) override;
 
@@ -40,6 +46,10 @@ class LanguageBox : public Ui::BoxContent {
 	[[nodiscard]] int rowsInPage() const;
 
 	Window::SessionController *_controller = nullptr;
+	QString _highlightId;
+	QPointer<Ui::RpWidget> _showButtonToggle;
+	QPointer<Ui::RpWidget> _translateChatsToggle;
+	QPointer<Ui::RpWidget> _doNotTranslateButton;
 	rpl::event_stream<bool> _translateChatTurnOff;
 	Fn<void()> _setInnerFocus;
 	Fn<Ui::ScrollToRequest(int rows)> _jump;
diff --git a/Telegram/SourceFiles/boxes/local_storage_box.cpp b/Telegram/SourceFiles/boxes/local_storage_box.cpp
deleted file mode 100644
index fcdbd8d6d28686..00000000000000
--- a/Telegram/SourceFiles/boxes/local_storage_box.cpp
+++ /dev/null
@@ -1,598 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "boxes/local_storage_box.h"
-
-#include "boxes/abstract_box.h"
-#include "ui/wrap/vertical_layout.h"
-#include "ui/wrap/slide_wrap.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/shadow.h"
-#include "ui/widgets/continuous_sliders.h"
-#include "ui/effects/radial_animation.h"
-#include "ui/text/format_values.h"
-#include "ui/emoji_config.h"
-#include "storage/storage_account.h"
-#include "storage/cache/storage_cache_database.h"
-#include "data/data_session.h"
-#include "lang/lang_keys.h"
-#include "mainwindow.h"
-#include "main/main_session.h"
-#include "styles/style_layers.h"
-#include "styles/style_boxes.h"
-
-namespace {
-
-constexpr auto kMegabyte = int64(1024 * 1024);
-constexpr auto kTotalSizeLimitsCount = 18;
-constexpr auto kMediaSizeLimitsCount = 18;
-constexpr auto kMinimalSizeLimit = 100 * kMegabyte;
-constexpr auto kTimeLimitsCount = 16;
-constexpr auto kMaxTimeLimitValue = std::numeric_limits<size_type>::max();
-constexpr auto kFakeMediaCacheTag = uint16(0xFFFF);
-
-int64 TotalSizeLimitInMB(int index) {
-	if (index < 8) {
-		return int64(index + 2) * 100;
-	}
-	return int64(index - 7) * 1024;
-}
-
-int64 TotalSizeLimit(int index) {
-	return TotalSizeLimitInMB(index) * kMegabyte;
-}
-
-int64 MediaSizeLimitInMB(int index) {
-	if (index < 9) {
-		return int64(index + 1) * 100;
-	}
-	return int64(index - 8) * 1024;
-}
-
-int64 MediaSizeLimit(int index) {
-	return MediaSizeLimitInMB(index) * kMegabyte;
-}
-
-QString SizeLimitText(int64 limit) {
-	const auto mb = (limit / (1024 * 1024));
-	const auto gb = (mb / 1024);
-	return (gb > 0)
-		? (QString::number(gb) + " GB")
-		: (QString::number(mb) + " MB");
-}
-
-size_type TimeLimitInDays(int index) {
-	if (index < 3) {
-		const auto weeks = (index + 1);
-		return size_type(weeks) * 7;
-	} else if (index < 15) {
-		const auto month = (index - 2);
-		return (size_type(month) * 30)
-			+ ((month >= 12) ? 5 :
-				(month >= 10) ? 4 :
-				(month >= 8) ? 3 :
-				(month >= 7) ? 2 :
-				(month >= 5) ? 1 :
-				(month >= 3) ? 0 :
-				(month >= 2) ? -1 :
-				(month >= 1) ? 1 : 0);
-			//+ (month >= 1 ? 1 : 0)
-			//- (month >= 2 ? 2 : 0)
-			//+ (month >= 3 ? 1 : 0)
-			//+ (month >= 5 ? 1 : 0)
-			//+ (month >= 7 ? 1 : 0)
-			//+ (month >= 8 ? 1 : 0)
-			//+ (month >= 10 ? 1 : 0)
-			//+ (month >= 12 ? 1 : 0);
-	}
-	return 0;
-}
-
-size_type TimeLimit(int index) {
-	const auto days = TimeLimitInDays(index);
-	return days
-		? (days * 24 * 60 * 60)
-		: kMaxTimeLimitValue;
-}
-
-QString TimeLimitText(size_type limit) {
-	const auto days = (limit / (24 * 60 * 60));
-	const auto weeks = (days / 7);
-	const auto months = (days / 29);
-	return (months > 0)
-		? tr::lng_months(tr::now, lt_count, months)
-		: (limit > 0)
-		? tr::lng_weeks(tr::now, lt_count, weeks)
-		: tr::lng_local_storage_limit_never(tr::now);
-}
-
-size_type LimitToValue(size_type timeLimit) {
-	return timeLimit ? timeLimit : kMaxTimeLimitValue;
-}
-
-size_type ValueToLimit(size_type timeLimit) {
-	return (timeLimit != kMaxTimeLimitValue) ? timeLimit : 0;
-}
-
-} // namespace
-
-class LocalStorageBox::Row : public Ui::RpWidget {
-public:
-	Row(
-		QWidget *parent,
-		Fn<QString(size_type)> title,
-		rpl::producer<QString> clear,
-		const Database::TaggedSummary &data);
-
-	void update(const Database::TaggedSummary &data);
-	void toggleProgress(bool shown);
-
-	rpl::producer<> clearRequests() const;
-
-protected:
-	int resizeGetHeight(int newWidth) override;
-	void paintEvent(QPaintEvent *e) override;
-
-private:
-	QString titleText(const Database::TaggedSummary &data) const;
-	QString sizeText(const Database::TaggedSummary &data) const;
-	void radialAnimationCallback();
-
-	Fn<QString(size_type)> _titleFactory;
-	object_ptr<Ui::FlatLabel> _title;
-	object_ptr<Ui::FlatLabel> _description;
-	object_ptr<Ui::FlatLabel> _clearing = { nullptr };
-	object_ptr<Ui::RoundButton> _clear;
-	std::unique_ptr<Ui::InfiniteRadialAnimation> _progress;
-
-};
-
-LocalStorageBox::Row::Row(
-	QWidget *parent,
-	Fn<QString(size_type)> title,
-	rpl::producer<QString> clear,
-	const Database::TaggedSummary &data)
-: RpWidget(parent)
-, _titleFactory(std::move(title))
-, _title(
-	this,
-	titleText(data),
-	st::localStorageRowTitle)
-, _description(
-	this,
-	sizeText(data),
-	st::localStorageRowSize)
-, _clear(this, std::move(clear), st::localStorageClear) {
-	_clear->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-	_clear->setVisible(data.count != 0);
-}
-
-void LocalStorageBox::Row::update(const Database::TaggedSummary &data) {
-	if (data.count != 0) {
-		_title->setText(titleText(data));
-	}
-	_description->setText(sizeText(data));
-	_clear->setVisible(data.count != 0);
-}
-
-void LocalStorageBox::Row::toggleProgress(bool shown) {
-	if (!shown) {
-		_progress = nullptr;
-		_description->show();
-		_clearing.destroy();
-	} else if (!_progress) {
-		_progress = std::make_unique<Ui::InfiniteRadialAnimation>(
-			[=] { radialAnimationCallback(); },
-			st::proxyCheckingAnimation);
-		_progress->start();
-		_clearing = object_ptr<Ui::FlatLabel>(
-			this,
-			tr::lng_local_storage_clearing(tr::now),
-			st::localStorageRowSize);
-		_clearing->show();
-		_description->hide();
-		resizeToWidth(width());
-		RpWidget::update();
-	}
-}
-
-void LocalStorageBox::Row::radialAnimationCallback() {
-	if (!anim::Disabled()) {
-		RpWidget::update();
-	}
-}
-
-rpl::producer<> LocalStorageBox::Row::clearRequests() const {
-	return _clear->clicks() | rpl::to_empty;
-}
-
-int LocalStorageBox::Row::resizeGetHeight(int newWidth) {
-	const auto height = st::localStorageRowHeight;
-	const auto padding = st::localStorageRowPadding;
-	const auto available = newWidth - padding.left() - padding.right();
-	_title->resizeToWidth(available);
-	_description->resizeToWidth(available);
-	_title->moveToLeft(padding.left(), padding.top(), newWidth);
-	_description->moveToLeft(
-		padding.left(),
-		height - padding.bottom() - _description->height(),
-		newWidth);
-	if (_clearing) {
-		const auto progressShift = st::proxyCheckingPosition.x()
-			+ st::proxyCheckingAnimation.size.width()
-			+ st::proxyCheckingSkip;
-		_clearing->resizeToWidth(available - progressShift);
-		_clearing->moveToLeft(
-			padding.left(),// + progressShift,
-			_description->y(),
-			newWidth);
-	}
-	_clear->moveToRight(
-		st::layerBox.buttonPadding.right(),
-		(height - _clear->height()) / 2,
-		newWidth);
-	return height;
-}
-
-void LocalStorageBox::Row::paintEvent(QPaintEvent *e) {
-	if (!_progress || true) {
-		return;
-	}
-	auto p = QPainter(this);
-	const auto padding = st::localStorageRowPadding;
-	const auto height = st::localStorageRowHeight;
-	const auto bottom = height - padding.bottom() - _description->height();
-	_progress->draw(
-		p,
-		{
-			st::proxyCheckingPosition.x() + padding.left(),
-			st::proxyCheckingPosition.y() + bottom
-		},
-		width());
-}
-
-QString LocalStorageBox::Row::titleText(const Database::TaggedSummary &data) const {
-	return _titleFactory(data.count);
-}
-
-QString LocalStorageBox::Row::sizeText(const Database::TaggedSummary &data) const {
-	return data.totalSize
-		? Ui::FormatSizeText(data.totalSize)
-		: tr::lng_local_storage_empty(tr::now);
-}
-
-LocalStorageBox::LocalStorageBox(
-	QWidget*,
-	not_null<Main::Session*> session,
-	CreateTag)
-: _session(session)
-, _db(&session->data().cache())
-, _dbBig(&session->data().cacheBigFile()) {
-	const auto &settings = session->local().cacheSettings();
-	const auto &settingsBig = session->local().cacheBigFileSettings();
-	_totalSizeLimit = settings.totalSizeLimit + settingsBig.totalSizeLimit;
-	_mediaSizeLimit = settingsBig.totalSizeLimit;
-	_timeLimit = settings.totalTimeLimit;
-}
-
-void LocalStorageBox::Show(not_null<::Main::Session*> session) {
-	auto shared = std::make_shared<object_ptr<LocalStorageBox>>(
-		Box<LocalStorageBox>(session, CreateTag()));
-	const auto weak = shared->data();
-	rpl::combine(
-		session->data().cache().statsOnMain(),
-		session->data().cacheBigFile().statsOnMain()
-	) | rpl::start_with_next([=](
-			Database::Stats &&stats,
-			Database::Stats &&statsBig) {
-		weak->update(std::move(stats), std::move(statsBig));
-		if (auto &strong = *shared) {
-			Ui::show(std::move(strong));
-		}
-	}, weak->lifetime());
-}
-
-void LocalStorageBox::prepare() {
-	setTitle(tr::lng_local_storage_title());
-
-	addButton(tr::lng_box_ok(), [this] { closeBox(); });
-
-	setupControls();
-}
-
-void LocalStorageBox::updateRow(
-		not_null<Ui::SlideWrap<Row>*> row,
-		const Database::TaggedSummary *data) {
-	const auto summary = (_rows.find(0)->second == row);
-	const auto shown = (data && data->count && data->totalSize) || summary;
-	if (shown) {
-		row->entity()->update(*data);
-	}
-	row->toggle(shown, anim::type::normal);
-}
-
-void LocalStorageBox::update(
-		Database::Stats &&stats,
-		Database::Stats &&statsBig) {
-	_stats = std::move(stats);
-	_statsBig = std::move(statsBig);
-	if (const auto i = _rows.find(0); i != end(_rows)) {
-		i->second->entity()->toggleProgress(
-			_stats.clearing || _statsBig.clearing);
-	}
-	for (const auto &entry : _rows) {
-		if (entry.first == kFakeMediaCacheTag) {
-			updateRow(entry.second, &_statsBig.full);
-		} else if (entry.first) {
-			const auto i = _stats.tagged.find(entry.first);
-			updateRow(
-				entry.second,
-				(i != end(_stats.tagged)) ? &i->second : nullptr);
-		} else {
-			const auto full = summary();
-			updateRow(entry.second, &full);
-		}
-	}
-}
-
-auto LocalStorageBox::summary() const -> Database::TaggedSummary {
-	auto result = _stats.full;
-	result.count += _statsBig.full.count;
-	result.totalSize += _statsBig.full.totalSize;
-	return result;
-}
-
-void LocalStorageBox::clearByTag(uint16 tag) {
-	if (tag == kFakeMediaCacheTag) {
-		_dbBig->clear();
-	} else if (tag) {
-		_db->clearByTag(tag);
-	} else {
-		_db->clear();
-		_dbBig->clear();
-		Ui::Emoji::ClearIrrelevantCache();
-	}
-}
-
-void LocalStorageBox::setupControls() {
-	const auto container = setInnerWidget(
-		object_ptr<Ui::VerticalLayout>(this),
-		st::defaultMultiSelect.scroll);
-	const auto createRow = [&](
-			uint16 tag,
-			Fn<QString(size_type)> title,
-			rpl::producer<QString> clear,
-			const Database::TaggedSummary &data) {
-		auto result = container->add(object_ptr<Ui::SlideWrap<Row>>(
-			container,
-			object_ptr<Row>(
-				container,
-				std::move(title),
-				std::move(clear),
-				data)));
-		const auto shown = (data.count && data.totalSize) || !tag;
-		result->toggle(shown, anim::type::instant);
-		result->entity()->clearRequests(
-		) | rpl::start_with_next([=] {
-			clearByTag(tag);
-		}, result->lifetime());
-		_rows.emplace(tag, result);
-		return result;
-	};
-	auto tracker = Ui::MultiSlideTracker();
-	const auto createTagRow = [&](uint8 tag, auto &&titleFactory) {
-		static const auto empty = Database::TaggedSummary();
-		const auto i = _stats.tagged.find(tag);
-		const auto &data = (i != end(_stats.tagged)) ? i->second : empty;
-		auto factory = std::forward<decltype(titleFactory)>(titleFactory);
-		auto title = [factory = std::move(factory)](size_type count) {
-			return factory(tr::now, lt_count, count);
-		};
-		tracker.track(createRow(
-			tag,
-			std::move(title),
-			tr::lng_local_storage_clear_some(),
-			data));
-	};
-	auto summaryTitle = [](size_type) {
-		return tr::lng_local_storage_summary(tr::now);
-	};
-	auto mediaCacheTitle = [](size_type) {
-		return tr::lng_local_storage_media(tr::now);
-	};
-	createRow(
-		0,
-		std::move(summaryTitle),
-		tr::lng_local_storage_clear(),
-		summary());
-	setupLimits(container);
-	const auto shadow = container->add(object_ptr<Ui::SlideWrap<>>(
-		container,
-		object_ptr<Ui::PlainShadow>(container),
-		st::localStorageRowPadding));
-	createTagRow(Data::kImageCacheTag, tr::lng_local_storage_image);
-	createTagRow(Data::kStickerCacheTag, tr::lng_local_storage_sticker);
-	createTagRow(Data::kVoiceMessageCacheTag, tr::lng_local_storage_voice);
-	createTagRow(Data::kVideoMessageCacheTag, tr::lng_local_storage_round);
-	createTagRow(Data::kAnimationCacheTag, tr::lng_local_storage_animation);
-	tracker.track(createRow(
-		kFakeMediaCacheTag,
-		std::move(mediaCacheTitle),
-		tr::lng_local_storage_clear_some(),
-		_statsBig.full));
-	shadow->toggleOn(
-		std::move(tracker).atLeastOneShownValue()
-	);
-	container->resizeToWidth(st::boxWidth);
-	container->heightValue(
-	) | rpl::start_with_next([=](int height) {
-		setDimensions(st::boxWidth, height);
-	}, container->lifetime());
-}
-
-template <
-	typename Value,
-	typename Convert,
-	typename Callback,
-	typename>
-not_null<Ui::MediaSlider*> LocalStorageBox::createLimitsSlider(
-		not_null<Ui::VerticalLayout*> container,
-		int valuesCount,
-		Convert &&convert,
-		Value currentValue,
-		Callback &&callback) {
-	const auto label = container->add(
-		object_ptr<Ui::LabelSimple>(container, st::localStorageLimitLabel),
-		st::localStorageLimitLabelMargin);
-	callback(label, currentValue);
-	const auto slider = container->add(
-		object_ptr<Ui::MediaSlider>(container, st::localStorageLimitSlider),
-		st::localStorageLimitMargin);
-	slider->resize(st::localStorageLimitSlider.seekSize);
-	slider->setPseudoDiscrete(
-		valuesCount,
-		std::forward<Convert>(convert),
-		currentValue,
-		[=, callback = std::forward<Callback>(callback)](Value value) {
-			callback(label, value);
-		});
-	return slider;
-}
-
-void LocalStorageBox::updateMediaLimit() {
-	const auto good = [&](int64 mediaLimit) {
-		return (_totalSizeLimit - mediaLimit >= kMinimalSizeLimit);
-	};
-	if (good(_mediaSizeLimit) || !_mediaSlider || !_mediaLabel) {
-		return;
-	}
-	auto index = 1;
-	while ((index < kMediaSizeLimitsCount)
-		&& (MediaSizeLimit(index) * 2 <= _totalSizeLimit)) {
-		++index;
-	}
-	--index;
-	_mediaSizeLimit = MediaSizeLimit(index);
-	_mediaSlider->setValue(index / float64(kMediaSizeLimitsCount - 1));
-	updateMediaLabel();
-
-	Ensures(good(_mediaSizeLimit));
-}
-
-void LocalStorageBox::updateTotalLimit() {
-	const auto good = [&](int64 totalLimit) {
-		return (totalLimit - _mediaSizeLimit >= kMinimalSizeLimit);
-	};
-	if (good(_totalSizeLimit) || !_totalSlider || !_totalLabel) {
-		return;
-	}
-	auto index = kTotalSizeLimitsCount - 1;
-	while ((index > 0)
-		&& (TotalSizeLimit(index - 1) >= 2 * _mediaSizeLimit)) {
-		--index;
-	}
-	_totalSizeLimit = TotalSizeLimit(index);
-	_totalSlider->setValue(index / float64(kTotalSizeLimitsCount - 1));
-	updateTotalLabel();
-
-	Ensures(good(_totalSizeLimit));
-}
-
-void LocalStorageBox::updateTotalLabel() {
-	Expects(_totalLabel != nullptr);
-
-	const auto text = SizeLimitText(_totalSizeLimit);
-	_totalLabel->setText(tr::lng_local_storage_size_limit(tr::now, lt_size, text));
-}
-
-void LocalStorageBox::updateMediaLabel() {
-	Expects(_mediaLabel != nullptr);
-
-	const auto text = SizeLimitText(_mediaSizeLimit);
-	_mediaLabel->setText(tr::lng_local_storage_media_limit(tr::now, lt_size, text));
-}
-
-void LocalStorageBox::setupLimits(not_null<Ui::VerticalLayout*> container) {
-	container->add(
-		object_ptr<Ui::PlainShadow>(container),
-		st::localStorageRowPadding);
-
-	_totalSlider = createLimitsSlider(
-		container,
-		kTotalSizeLimitsCount,
-		TotalSizeLimit,
-		_totalSizeLimit,
-		[=](not_null<Ui::LabelSimple*> label, int64 limit) {
-			_totalSizeLimit = limit;
-			_totalLabel = label;
-			updateTotalLabel();
-			updateMediaLimit();
-			limitsChanged();
-		});
-
-	_mediaSlider = createLimitsSlider(
-		container,
-		kMediaSizeLimitsCount,
-		MediaSizeLimit,
-		_mediaSizeLimit,
-		[=](not_null<Ui::LabelSimple*> label, int64 limit) {
-			_mediaSizeLimit = limit;
-			_mediaLabel = label;
-			updateMediaLabel();
-			updateTotalLimit();
-			limitsChanged();
-		});
-
-	createLimitsSlider(
-		container,
-		kTimeLimitsCount,
-		TimeLimit,
-		LimitToValue(_timeLimit),
-		[=](not_null<Ui::LabelSimple*> label, size_type limit) {
-			_timeLimit = ValueToLimit(limit);
-			const auto text = TimeLimitText(_timeLimit);
-			label->setText(tr::lng_local_storage_time_limit(tr::now, lt_limit, text));
-			limitsChanged();
-		});
-}
-
-void LocalStorageBox::limitsChanged() {
-	const auto &settings = _session->local().cacheSettings();
-	const auto &settingsBig = _session->local().cacheBigFileSettings();
-	const auto sizeLimit = _totalSizeLimit - _mediaSizeLimit;
-	const auto changed = (settings.totalSizeLimit != sizeLimit)
-		|| (settingsBig.totalSizeLimit != _mediaSizeLimit)
-		|| (settings.totalTimeLimit != _timeLimit)
-		|| (settingsBig.totalTimeLimit != _timeLimit);
-	if (_limitsChanged != changed) {
-		_limitsChanged = changed;
-		clearButtons();
-		if (_limitsChanged) {
-			addButton(tr::lng_settings_save(), [=] { save(); });
-			addButton(tr::lng_cancel(), [=] { closeBox(); });
-		} else {
-			addButton(tr::lng_box_ok(), [=] { closeBox(); });
-		}
-	}
-}
-
-void LocalStorageBox::save() {
-	if (!_limitsChanged) {
-		closeBox();
-		return;
-	}
-	auto update = Storage::Cache::Database::SettingsUpdate();
-	update.totalSizeLimit = _totalSizeLimit - _mediaSizeLimit;
-	update.totalTimeLimit = _timeLimit;
-	auto updateBig = Storage::Cache::Database::SettingsUpdate();
-	updateBig.totalSizeLimit = _mediaSizeLimit;
-	updateBig.totalTimeLimit = _timeLimit;
-	_session->local().updateCacheSettings(update, updateBig);
-	_session->data().cache().updateSettings(update);
-	closeBox();
-}
diff --git a/Telegram/SourceFiles/boxes/max_invite_box.cpp b/Telegram/SourceFiles/boxes/max_invite_box.cpp
index 3159285f426d4a..cffd35fc827b85 100644
--- a/Telegram/SourceFiles/boxes/max_invite_box.cpp
+++ b/Telegram/SourceFiles/boxes/max_invite_box.cpp
@@ -20,6 +20,7 @@ For license and copyright information please follow this link:
 #include "ui/painter.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
@@ -77,7 +78,7 @@ void MaxInviteBox::prepare() {
 	_channel->session().changes().peerUpdates(
 		_channel,
 		Data::PeerUpdate::Flag::InviteLinks
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rtlupdate(_invitationLink);
 	}, lifetime());
 }
@@ -91,7 +92,11 @@ void MaxInviteBox::mousePressEvent(QMouseEvent *e) {
 	if (_linkOver) {
 		if (!_channel->inviteLink().isEmpty()) {
 			QGuiApplication::clipboard()->setText(_channel->inviteLink());
-			showToast(tr::lng_create_channel_link_copied(tr::now));
+			showToast({
+				.text = { tr::lng_create_channel_link_copied(tr::now) },
+				.iconLottie = u"toast/voip_invite"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
 		} else if (_channel->isFullLoaded() && !_creatingInviteLink) {
 			_creatingInviteLink = true;
 			_channel->session().api().inviteLinks().create({ _channel });
diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index 9c68881a1ea54e..e301b29bef45c6 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -10,8 +10,10 @@ For license and copyright information please follow this link:
 #include "api/api_blocked_peers.h"
 #include "api/api_chat_participants.h"
 #include "api/api_messages_search.h"
+#include "api/api_report.h"
 #include "apiwrap.h"
 #include "base/event_filter.h"
+#include "base/options.h"
 #include "base/timer.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/peers/edit_peer_permissions_box.h"
@@ -19,25 +21,31 @@ For license and copyright information please follow this link:
 #include "core/ui_integration.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
+#include "data/data_chat_filters.h"
 #include "data/data_chat_participant_status.h"
 #include "data/data_histories.h"
 #include "data/data_peer.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
 #include "main/main_session.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/ripple_animation.h"
+#include "ui/effects/toggle_arrow.h"
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/rect_part.h"
+#include "ui/text/text_lottie_custom_emoji.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/expandable_peer_list.h"
 #include "ui/widgets/participants_check_view.h"
@@ -47,35 +55,94 @@ For license and copyright information please follow this link:
 #include "styles/style_layers.h"
 #include "styles/style_window.h"
 
+#include "window/window_session_controller.h"
+#include "window/window_controller.h"
+#include "boxes/choose_filter_box.h"
+#include "boxes/peer_list_box.h"
+#include "main/main_session_settings.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_multiline_action.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/menu/menu_action.h"
+#include "base/qt/qt_key_modifiers.h"
+#include "ui/effects/round_checkbox.h"
+#include "styles/style_chat.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_info.h"
+#include "styles/style_media_player.h" // mediaPlayerMenuCheck
+
+base::options::toggle ModerateCommonGroups({
+	.id = kModerateCommonGroups,
+	.name = "Ban users from several groups at once.",
+});
+
+const char kModerateCommonGroups[] = "moderate-common-groups";
+
 namespace {
 
+constexpr auto kModerateMessagesBoxAnimationDuration = crl::time(80);
+
 struct ModerateOptions final {
-	bool allCanBan = false;
-	bool allCanDelete = false;
+	bool reportSpam = false;
+	bool deleteAllMessages = false;
+	bool deleteAllReactions = false;
+	bool banOrRestrict = false;
 	Participants participants;
 };
 
+[[nodiscard]] bool PeerCanDeleteMessages(not_null<PeerData*> peer) {
+	if (const auto chat = peer->asChat()) {
+		return chat->canDeleteMessages();
+	}
+	const auto channel = peer->asChannel();
+	return channel && channel->canDeleteMessages();
+}
+
+[[nodiscard]] bool IsExcludedModerateParticipant(
+		not_null<PeerData*> peer,
+		not_null<PeerData*> participant) {
+	if ((participant == peer) || participant->isSelf()) {
+		return true;
+	} else if (const auto channel = participant->asChannel()) {
+		return (channel->discussionLink() == peer);
+	}
+	return false;
+}
+
 ModerateOptions CalculateModerateOptions(const HistoryItemsList &items) {
 	Expects(!items.empty());
 
 	auto result = ModerateOptions{
-		.allCanBan = true,
-		.allCanDelete = true,
+		.deleteAllMessages = true,
+		.banOrRestrict = true,
 	};
 
 	const auto peer = items.front()->history()->peer;
 	for (const auto &item : items) {
-		if (!result.allCanBan && !result.allCanDelete) {
+		if (!result.deleteAllMessages && !result.banOrRestrict) {
 			return {};
 		}
 		if (peer != item->history()->peer) {
 			return {};
 		}
+		{
+			const auto author = item->author();
+			if (author == peer) {
+				return {};
+			} else if (const auto channel = author->asChannel()) {
+				if (channel->discussionLink() == peer) {
+					return {};
+				}
+			}
+		}
 		if (!item->suggestBanReport()) {
-			result.allCanBan = false;
+			result.banOrRestrict = false;
 		}
 		if (!item->suggestDeleteAllReport()) {
-			result.allCanDelete = false;
+			result.deleteAllMessages = false;
 		}
 		if (const auto p = item->from()) {
 			if (!ranges::contains(result.participants, not_null{ p })) {
@@ -83,42 +150,300 @@ ModerateOptions CalculateModerateOptions(const HistoryItemsList &items) {
 			}
 		}
 	}
+	result.deleteAllReactions = result.deleteAllMessages;
+	result.reportSpam = result.deleteAllMessages || result.banOrRestrict;
+	return result;
+}
+
+ModerateOptions CalculateModerateOptions(const ModerateReactionEntry &reaction) {
+	auto result = ModerateOptions{
+		.participants = { reaction.participant },
+	};
+	if (IsExcludedModerateParticipant(reaction.peer, reaction.participant)) {
+		return result;
+	}
+	result.reportSpam = Api::GetReactionReportCapabilities(
+		reaction.peer,
+		reaction.participant
+	).canReport || (reaction.peer->asChannel() != nullptr);
+	result.deleteAllReactions = PeerCanDeleteMessages(reaction.peer);
+	if (const auto channel = reaction.peer->asChannel()) {
+		result.deleteAllMessages = channel->canDeleteMessages();
+		result.banOrRestrict = channel->canRestrictParticipant(
+			reaction.participant);
+	}
 	return result;
 }
 
-[[nodiscard]] rpl::producer<int> MessagesCountValue(
+[[nodiscard]] bool HasModerateActions(const ModerateOptions &options) {
+	return options.reportSpam
+		|| options.deleteAllMessages
+		|| options.deleteAllReactions
+		|| options.banOrRestrict;
+}
+
+[[nodiscard]] TextWithEntities ParticipantsExpanderText(int count) {
+	return tr::marked()
+		.append(st::moderateBoxExpand)
+		.append(QString::number(count));
+}
+
+[[nodiscard]] TextWithEntities DeleteOptionsExpanderText(
+		int checkedCount,
+		int totalCount) {
+	return tr::marked(u"%1 / %2"_q.arg(checkedCount).arg(totalCount));
+}
+
+[[nodiscard]] rpl::producer<base::flat_map<PeerId, int>> MessagesCountValue(
 		not_null<History*> history,
-		not_null<PeerData*> from) {
+		std::vector<not_null<PeerData*>> from) {
 	return [=](auto consumer) {
 		auto lifetime = rpl::lifetime();
-		auto search = lifetime.make_state<Api::MessagesSearch>(history);
-		consumer.put_next(0);
-
-		search->messagesFounds(
-		) | rpl::start_with_next([=](const Api::FoundMessages &found) {
-			consumer.put_next_copy(found.total);
-		}, lifetime);
-		search->searchMessages({ .from = from });
+		struct State final {
+			base::flat_map<PeerId, int> messagesCounts;
+			int index = 0;
+			rpl::lifetime apiLifetime;
+		};
+		const auto search = lifetime.make_state<Api::MessagesSearch>(history);
+		const auto state = lifetime.make_state<State>();
+		const auto send = [=](auto repeat) -> void {
+			if (state->index >= from.size()) {
+				consumer.put_next_copy(state->messagesCounts);
+				return;
+			}
+			const auto peer = from[state->index];
+			const auto peerId = peer->id;
+			state->apiLifetime = search->messagesFounds(
+			) | rpl::on_next([=](const Api::FoundMessages &found) {
+				state->messagesCounts[peerId] = found.total;
+				state->index++;
+				repeat(repeat);
+			});
+			search->searchMessages({ .from = peer });
+		};
+		consumer.put_next({});
+		send(send);
 
 		return lifetime;
 	};
 }
 
+using CommonGroups = std::vector<not_null<PeerData*>>;
+using CollectCommon = std::shared_ptr<std::vector<PeerId>>;
+
+void FillMenuModerateCommonGroups(
+		not_null<Ui::PopupMenu*> menu,
+		CommonGroups common,
+		CollectCommon collectCommon,
+		not_null<UserData*> user,
+		Fn<void()> onDestroyedCallback) {
+	const auto resultList
+		= menu->lifetime().make_state<base::flat_set<PeerId>>();
+	const auto rememberCheckbox = Ui::CreateChild<Ui::Checkbox>(
+		menu,
+		QString());
+	auto multiline = base::make_unique_q<Ui::Menu::MultilineAction>(
+		menu->menu(),
+		menu->st().menu,
+		st::historyHasCustomEmoji,
+		st::historyHasCustomEmojiPosition,
+		tr::lng_restrict_users_kick_from_common_group(tr::now, tr::rich));
+	multiline->setAttribute(Qt::WA_TransparentForMouseEvents);
+	menu->addAction(std::move(multiline));
+	const auto session = &common.front()->session();
+	const auto settingsOnStart = session->settings().moderateCommonGroups();
+	const auto checkboxesUpdate = std::make_shared<rpl::event_stream<>>();
+	const auto save = [=] {
+		auto result = std::vector<PeerId>(
+			resultList->begin(),
+			resultList->end());
+		*collectCommon = std::move(result);
+	};
+	for (const auto &group : common) {
+		struct State {
+			std::optional<Ui::RoundImageCheckbox> checkbox;
+			Ui::RpWidget *checkboxWidget = nullptr;
+		};
+		auto item = base::make_unique_q<Ui::Menu::Action>(
+			menu->menu(),
+			menu->st().menu,
+			Ui::Menu::CreateAction(
+				menu->menu(),
+				group->name(),
+				[] {}),
+			nullptr,
+			nullptr);
+		const auto state = item->lifetime().make_state<State>();
+		const auto setChecked = [=, peerId = group->id](bool checked) {
+			state->checkbox->setChecked(checked);
+			if (state->checkbox->checked()) {
+				resultList->insert(peerId);
+			} else {
+				resultList->erase(peerId);
+			}
+			save();
+		};
+		item->setActionTriggered([=] {
+			setChecked(!state->checkbox->checked());
+		});
+		const auto raw = item.get();
+		checkboxesUpdate->events() | rpl::on_next([=, peerId = group->id] {
+			setChecked(ranges::contains(*collectCommon, peerId));
+		}, raw->lifetime());
+		state->checkboxWidget = Ui::CreateChild<Ui::RpWidget>(raw);
+		state->checkboxWidget->setAttribute(Qt::WA_TransparentForMouseEvents);
+		state->checkboxWidget->resize(item->width() * 2, item->height());
+		state->checkboxWidget->show();
+		state->checkbox.emplace(
+			st::moderateCommonGroupsCheckbox,
+			[=] { state->checkboxWidget->update(); },
+			PaintUserpicCallback(group, true),
+			[=](int size) { return (group->isForum() || group->isMonoforum())
+				? int(size * Ui::ForumUserpicRadiusMultiplier())
+				: std::optional<int>(); });
+		state->checkbox->setChecked(
+			/*ranges::contains(
+				session->settings().moderateCommonGroups(),
+				group->id)
+			|| */(collectCommon
+				&& ranges::contains(*collectCommon, group->id)),
+			anim::type::instant);
+		state->checkboxWidget->paintOn([=](QPainter &p) {
+			auto pp = Painter(state->checkboxWidget);
+			state->checkbox->paint(
+				pp,
+				st::menuWithIcons.itemIconPosition.x(),
+				st::menuWithIcons.itemIconPosition.y(),
+				raw->width());
+		});
+		menu->addAction(std::move(item));
+	}
+	menu->addSeparator();
+	if (const auto window = Core::App().findWindow(menu->parentWidget())) {
+		auto hasActions = false;
+		Ui::Menu::CreateAddActionCallback(menu)(Ui::Menu::MenuCallback::Args{
+			.text = tr::lng_restrict_users_kick_from_common_group(tr::now),
+			.handler = nullptr,
+			.icon = &st::menuIconAddToFolder,
+			.fillSubmenu = [&](not_null<Ui::PopupMenu*> menu) {
+				hasActions = FillChooseFilterWithAdminedGroupsMenu(
+					window->sessionController(),
+					menu,
+					user,
+					checkboxesUpdate,
+					common,
+					collectCommon);
+			},
+			.submenuSt = &st::foldersMenu,
+		});
+		if (!hasActions) {
+			menu->removeAction(menu->actions().size() - 1);
+			menu->removeAction(menu->actions().size() - 1); // Separator.
+		}
+	}
+	menu->addSeparator();
+	{
+		auto item = base::make_unique_q<Ui::Menu::Action>(
+			menu->menu(),
+			menu->st().menu,
+			Ui::Menu::CreateAction(
+				menu->menu(),
+				tr::lng_remember(tr::now),
+				[] {}),
+			nullptr,
+			nullptr);
+		item->setPreventClose(true);
+		item->setActionTriggered([=] {
+			rememberCheckbox->setChecked(!rememberCheckbox->checked());
+		});
+		rememberCheckbox->setParent(item.get());
+		rememberCheckbox->setAttribute(Qt::WA_TransparentForMouseEvents);
+		rememberCheckbox->move(st::lineWidth * 8, -st::lineWidth * 2);
+		rememberCheckbox->show();
+		menu->addAction(std::move(item));
+	}
+	menu->setDestroyedCallback([=] {
+		onDestroyedCallback();
+		if (!rememberCheckbox->checked()) {
+			session->settings().setModerateCommonGroups(settingsOnStart);
+			session->saveSettingsDelayed();
+		}
+	});
+}
+
+void ProccessCommonGroups(
+		const HistoryItemsList &items,
+		Fn<void(CommonGroups, not_null<UserData*>)> processHas) {
+	const auto moderateOptions = CalculateModerateOptions(items);
+	if (moderateOptions.participants.size() != 1
+		|| !moderateOptions.banOrRestrict) {
+		return;
+	}
+	const auto participant = moderateOptions.participants.front();
+	const auto user = participant->asUser();
+	if (!user) {
+		return;
+	}
+	const auto currentGroupId = items.front()->history()->peer->id;
+	user->session().api().requestBotCommonGroups(user, [=] {
+		const auto commonGroups = user->session().api().botCommonGroups(user);
+		if (!commonGroups || commonGroups->empty()) {
+			return;
+		}
+
+		auto filtered = CommonGroups();
+		for (const auto &group : *commonGroups) {
+			if (group->id == currentGroupId) {
+				continue;
+			}
+			const auto channel = group->asChannel();
+			if (channel && channel->canRestrictParticipant(user)) {
+				if (channel->isGroupAdmin(user) && !channel->amCreator()) {
+					continue;
+				}
+				filtered.push_back(group);
+			}
+		}
+
+		if (!filtered.empty()) {
+			processHas(filtered, user);
+		}
+	});
+}
+
 } // namespace
 
 void CreateModerateMessagesBox(
 		not_null<Ui::GenericBox*> box,
-		const HistoryItemsList &items,
-		Fn<void()> confirmed) {
+		ModerateMessagesBoxEntry entry,
+		Fn<void()> confirmed,
+		ModerateMessagesBoxOptions options) {
+	const auto &items = entry.items;
+	const auto reaction = entry.reaction;
+	Expects(!items.empty() || reaction.has_value());
+
+	box->setLayerAnimationDuration(kModerateMessagesBoxAnimationDuration);
+
+	const auto hasItems = !items.empty();
+	const auto hasReaction = reaction.has_value();
+	const auto itemsCount = hasItems ? int(items.size()) : 0;
+
 	using Controller = Ui::ExpandablePeerListController;
 
-	const auto [allCanBan, allCanDelete, participants]
-		= CalculateModerateOptions(items);
+	const auto moderateOptions = hasItems
+		? CalculateModerateOptions(items)
+		: CalculateModerateOptions(*reaction);
+	const auto reportSpam = moderateOptions.reportSpam;
+	const auto deleteAllMessages = moderateOptions.deleteAllMessages;
+	const auto deleteAllReactions = moderateOptions.deleteAllReactions;
+	const auto banOrRestrict = moderateOptions.banOrRestrict;
+	const auto &participants = moderateOptions.participants;
 	const auto inner = box->verticalLayout();
 
 	Assert(!participants.empty());
 
 	const auto confirms = inner->lifetime().make_state<rpl::event_stream<>>();
+	const auto collectCommon = std::make_shared<std::vector<PeerId>>();
 
 	const auto isSingle = participants.size() == 1;
 	const auto buttonPadding = isSingle
@@ -126,36 +451,183 @@ void CreateModerateMessagesBox(
 		: QMargins(
 			0,
 			0,
-			Ui::ParticipantsCheckView::ComputeSize(
-				participants.size()).width(),
+			Ui::ExpanderButton::ComputeSize(
+				ParticipantsExpanderText(int(participants.size()))).width(),
 			0);
 
-	const auto session = &items.front()->history()->session();
-	const auto historyPeerId = items.front()->history()->peer->id;
+	const auto firstItem = hasItems ? items.front().get() : nullptr;
+	const auto session = hasItems
+		? &firstItem->history()->session()
+		: &reaction->peer->session();
+	const auto peer = hasItems
+		? firstItem->history()->peer
+		: reaction->peer;
+	const auto history = hasItems
+		? firstItem->history().get()
+		: session->data().historyLoaded(peer);
+	const auto historyPeerId = peer->id;
+	const auto ids = hasItems
+		? session->data().itemsToIds(items)
+		: MessageIdsList{ FullMsgId(reaction->peer->id, reaction->msgId) };
+	const auto selectedMessagesByParticipant = [&] {
+		auto result = base::flat_map<PeerId, int>();
+		if (!hasItems && !hasReaction) {
+			return result;
+		}
+		if (hasItems) {
+			for (const auto &item : items) {
+				const auto from = item->from();
+				if (!from) {
+					continue;
+				}
+				const auto i = result.find(from->id);
+				if (i == result.end()) {
+					result.emplace(from->id, 1);
+				} else {
+					++i->second;
+				}
+			}
+		} else {
+			result.emplace(reaction->participant->id, 1);
+		}
+		return result;
+	}();
+	const auto participantIds = ranges::views::all(
+		participants
+	) | ranges::views::transform([](not_null<PeerData*> peer) {
+		return peer->id;
+	}) | ranges::to_vector;
+
+	if (hasItems) {
+		const auto remainingIds
+			= box->lifetime().make_state<base::flat_set<FullMsgId>>(
+				ids.begin(),
+				ids.end());
+		session->data().itemRemoved(
+		) | rpl::on_next([=](not_null<const HistoryItem*> item) {
+			remainingIds->erase(item->fullId());
+			if (remainingIds->empty()) {
+				box->closeBox();
+			}
+		}, box->lifetime());
+	}
+
+	if (hasItems
+		&& (ModerateCommonGroups.value() || session->supportMode())) {
+	ProccessCommonGroups(
+		items,
+		crl::guard(box, [=](CommonGroups groups, not_null<UserData*> user) {
+			using namespace Ui;
+			const auto top = box->addTopButton(st::infoTopBarMenu);
+			auto &lifetime = top->lifetime();
+			const auto menu
+				= lifetime.make_state<base::unique_qptr<Ui::PopupMenu>>();
+
+			{
+				const auto was = collectCommon->size();
+				*menu = base::make_unique_q<Ui::PopupMenu>(
+					top,
+					st::popupMenuExpandedSeparator);
+				FillMenuModerateCommonGroups(
+					*menu,
+					groups,
+					collectCommon,
+					user,
+					[]{});
+				*menu = nullptr;
+				if (was != collectCommon->size()) {
+					top->setIconOverride(
+						&st::infoTopBarMenuActive,
+						&st::infoTopBarMenuActive);
+					const auto minicheck = Ui::CreateChild<Ui::RpWidget>(top);
+					minicheck->paintRequest() | rpl::on_next([=] {
+						auto p = Painter(minicheck);
+						const auto rect = minicheck->rect();
+						const auto iconSize = QSize(
+							st::mediaPlayerMenuCheck.width(),
+							st::mediaPlayerMenuCheck.height());
+						const auto scale = std::min(
+							rect.width() / float64(iconSize.width()),
+							rect.height() / float64(iconSize.height()));
+						if (scale < 1.0) {
+							p.save();
+							p.translate(rect.center());
+							p.scale(scale, scale);
+							p.translate(-rect.center());
+						}
+						st::mediaPlayerMenuCheck.paintInCenter(
+							p,
+							rect,
+							st::windowActiveTextFg->c);
+						if (scale < 1.0) {
+							p.restore();
+						}
+					}, minicheck->lifetime());
+					minicheck->resize(
+						st::mediaPlayerMenuCheck.width() / 1.5,
+						st::mediaPlayerMenuCheck.width() / 1.5);
+					minicheck->show();
+					minicheck->moveToLeft(
+						top->width() - st::lineWidth * 26,
+						top->height() - st::lineWidth * 29);
+				}
+			}
+
+			top->setClickedCallback([=] {
+				top->setForceRippled(true);
+				*menu = base::make_unique_q<Ui::PopupMenu>(
+					top,
+					st::popupMenuExpandedSeparator);
+				const auto onDestroyedCallback = [=, weak = top] {
+					if (const auto strong = weak.data()) {
+						strong->setForceRippled(false);
+					}
+				};
+				FillMenuModerateCommonGroups(
+					*menu,
+					groups,
+					collectCommon,
+					user,
+					onDestroyedCallback);
+				(*menu)->setForcedOrigin(PanelAnimation::Origin::TopRight);
+				const auto point = QPoint(top->width(), top->height());
+				(*menu)->popup(top->mapToGlobal(point));
+			});
+		}));
+	}
 
 	using Request = Fn<void(not_null<PeerData*>, not_null<ChannelData*>)>;
 	const auto sequentiallyRequest = [=](
 			Request request,
-			Participants participants) {
+			Participants participants,
+			std::optional<std::vector<PeerId>> channelIds = {}) {
 		constexpr auto kSmallDelayMs = 5;
 		const auto participantIds = ranges::views::all(
 			participants
 		) | ranges::views::transform([](not_null<PeerData*> peer) {
 			return peer->id;
 		}) | ranges::to_vector;
+		const auto channelIdList = channelIds.value_or(
+			std::vector<PeerId>{ historyPeerId });
 		const auto lifetime = std::make_shared<rpl::lifetime>();
-		const auto counter = lifetime->make_state<int>(0);
+		const auto participantIndex = lifetime->make_state<int>(0);
+		const auto channelIndex = lifetime->make_state<int>(0);
 		const auto timer = lifetime->make_state<base::Timer>();
 		timer->setCallback(crl::guard(session, [=] {
-			if ((*counter) < participantIds.size()) {
-				const auto peer = session->data().peer(historyPeerId);
-				const auto channel = peer ? peer->asChannel() : nullptr;
-				const auto from = session->data().peer(
-					participantIds[*counter]);
-				if (channel && from) {
-					request(from, channel);
+			if ((*participantIndex) < participantIds.size()) {
+				if ((*channelIndex) < channelIdList.size()) {
+					const auto from = session->data().peer(
+						participantIds[*participantIndex]);
+					const auto channel = session->data().peer(
+						channelIdList[*channelIndex])->asChannel();
+					if (from && channel) {
+						request(from, channel);
+					}
+					(*channelIndex)++;
+				} else {
+					(*participantIndex)++;
+					*channelIndex = 0;
 				}
-				(*counter)++;
 			} else {
 				lifetime->destroy();
 			}
@@ -167,7 +639,7 @@ void CreateModerateMessagesBox(
 			not_null<Ui::Checkbox*> checkbox,
 			not_null<Controller*> controller,
 			Request request) {
-		confirms->events() | rpl::start_with_next([=] {
+		confirms->events() | rpl::on_next([=] {
 			if (checkbox->checked() && controller->collectRequests) {
 				sequentiallyRequest(request, controller->collectRequests());
 			}
@@ -192,9 +664,10 @@ void CreateModerateMessagesBox(
 		return base::EventFilterResult::Continue;
 	});
 
-	const auto handleSubmition = [=](not_null<Ui::Checkbox*> checkbox) {
-		base::install_event_filter(box, [=](not_null<QEvent*> event) {
-			if (!isEnter(event) || !checkbox->checked()) {
+	const auto handleSubmitionIf = [=](Fn<bool()> enabled) {
+		base::install_event_filter(box, [=, enabled = std::move(enabled)](
+				not_null<QEvent*> event) {
+			if (!isEnter(event) || !enabled()) {
 				return base::EventFilterResult::Continue;
 			}
 			box->uiShow()->show(Ui::MakeConfirmBox({
@@ -209,26 +682,62 @@ void CreateModerateMessagesBox(
 			return base::EventFilterResult::Cancel;
 		});
 	};
+	const auto handleSubmition = [=](not_null<Ui::Checkbox*> checkbox) {
+		handleSubmitionIf([=] {
+			return checkbox->checked();
+		});
+	};
+	Ui::Checkbox *deleteOptions = nullptr;
+	Ui::Checkbox *deleteMessages = nullptr;
+	Controller *deleteMessagesController = nullptr;
+	rpl::variable<base::flat_map<PeerId, int>> *deleteMessagesCounts = nullptr;
+	Ui::Checkbox *deleteReactions = nullptr;
+	Controller *deleteReactionsController = nullptr;
+	const auto effectiveCheckedParticipants = [](
+			Ui::Checkbox *checkbox,
+			Controller *controller) {
+		if (!checkbox || !controller || !controller->collectRequests) {
+			return Participants();
+		} else if (!checkbox->checked()
+			&& (controller->data.participants.size() == 1)) {
+			return Participants();
+		}
+		return controller->collectRequests();
+	};
+	const auto checkedParticipantsValue = [=](
+			not_null<Ui::Checkbox*> checkbox,
+			not_null<Controller*> controller)
+				-> rpl::producer<Participants> {
+		if (controller->data.participants.size() == 1) {
+			return checkbox->checkedValue() | rpl::map([=](bool) {
+				return effectiveCheckedParticipants(checkbox, controller);
+			});
+		}
+		return rpl::merge(
+			rpl::single(false),
+			controller->checkAllRequests.events(),
+			controller->toggleRequestsFromInner.events()
+		) | rpl::map([=](bool) {
+			return effectiveCheckedParticipants(checkbox, controller);
+		});
+	};
 
-	Ui::AddSkip(inner);
-	const auto title = box->addRow(
-		object_ptr<Ui::FlatLabel>(
+	const auto subtitle = box->addRow(
+		object_ptr<Ui::SlideWrap<Ui::FlatLabel>>(
 			box,
-			(items.size() == 1)
-				? tr::lng_selected_delete_sure_this()
-				: tr::lng_selected_delete_sure(
-					lt_count,
-					rpl::single(items.size()) | tr::to_count()),
-			st::boxLabel));
-	Ui::AddSkip(inner);
-	Ui::AddSkip(inner);
+			object_ptr<Ui::FlatLabel>(
+				box,
+				QString(),
+				st::boxLabel)));
+	subtitle->entity()->setTextColorOverride(st::windowSubTextFg->c);
+	subtitle->hide(anim::type::instant);
 	Ui::AddSkip(inner);
-	{
+	if (reportSpam) {
 		const auto report = box->addRow(
 			object_ptr<Ui::Checkbox>(
 				box,
 				tr::lng_report_spam(tr::now),
-				false,
+				options.reportSpam,
 				st::defaultBoxCheckbox),
 			st::boxRowPadding + buttonPadding);
 		const auto controller = box->lifetime().make_state<Controller>(
@@ -236,75 +745,515 @@ void CreateModerateMessagesBox(
 		Ui::AddExpandablePeerList(report, controller, inner);
 		handleSubmition(report);
 
-		const auto ids = items.front()->from()->owner().itemsToIds(items);
+		const auto show = box->uiShow();
 		handleConfirmation(report, controller, [=](
 				not_null<PeerData*> p,
 				not_null<ChannelData*> c) {
-			auto filtered = ranges::views::all(
-				ids
-			) | ranges::views::transform([](const FullMsgId &id) {
-				return MTP_int(id.msg);
-			}) | ranges::to<QVector<MTPint>>();
-			c->session().api().request(
-				MTPchannels_ReportSpam(
-					c->inputChannel,
-					p->input,
-					MTP_vector<MTPint>(std::move(filtered)))
-			).send();
+			if (reaction.has_value()
+				&& Api::GetReactionReportCapabilities(
+					reaction->peer,
+					p
+				).canReport) {
+				Api::ReportReaction(
+					show,
+					reaction->peer,
+					reaction->msgId,
+					p);
+			} else {
+				Api::ReportSpam(p, ids);
+			}
 		});
 	}
 
-	if (allCanDelete) {
+	const auto showMessagesCheckbox = deleteAllMessages;
+	const auto showReactionsCheckbox = deleteAllReactions;
+	const auto useSingleDeleteOptions = isSingle
+		&& showMessagesCheckbox
+		&& showReactionsCheckbox;
+	if (showMessagesCheckbox || showReactionsCheckbox) {
 		Ui::AddSkip(inner);
 		Ui::AddSkip(inner);
+		const auto checkedParticipants = options.deleteAll
+			? participantIds
+			: std::vector<PeerId>();
 
-		const auto deleteAll = inner->add(
-			object_ptr<Ui::Checkbox>(
+		if (useSingleDeleteOptions) {
+			const auto participant = participants.front();
+			Assert(history != nullptr);
+			deleteMessagesCounts = box->lifetime().make_state<
+				rpl::variable<base::flat_map<PeerId, int>>>(
+					base::flat_map<PeerId, int>());
+			MessagesCountValue(
+				history,
+				participants
+			) | rpl::on_next([=](base::flat_map<PeerId, int> counts) {
+				deleteMessagesCounts->force_assign(std::move(counts));
+			}, box->lifetime());
+			deleteMessagesController = box->lifetime().make_state<Controller>(
+				Controller::Data{
+					.messagesCounts = deleteMessagesCounts->value(),
+					.participants = Participants{ participant },
+					.checked = checkedParticipants,
+				});
+			deleteReactionsController = box->lifetime().make_state<Controller>(
+				Controller::Data{
+					.participants = Participants{ participant },
+					.checked = checkedParticipants,
+				});
+
+			const auto deleteOptionsSize = Ui::ExpanderButton::ComputeSize(
+				DeleteOptionsExpanderText(2, 2));
+			const auto deleteOptionsPadding = QMargins(
+				0,
+				0,
+				deleteOptionsSize.width(),
+				0);
+			deleteOptions = inner->add(
+				object_ptr<Ui::Checkbox>(
+					inner,
+					tr::lng_delete_all_from_user(
+						lt_user,
+						rpl::single(participant->shortName())),
+					options.deleteAll,
+					st::defaultBoxCheckbox),
+				st::boxRowPadding + deleteOptionsPadding);
+			const auto button = Ui::CreateChild<Ui::ExpanderButton>(
 				inner,
-				!(isSingle)
-					? tr::lng_delete_all_from_users(
+				DeleteOptionsExpanderText(2, 2));
+			button->resize(deleteOptionsSize);
+			deleteOptions->geometryValue(
+			) | rpl::on_next([=](const QRect &rect) {
+				button->moveToRight(
+					st::moderateBoxExpandRight,
+					rect.top() + (rect.height() - button->height()) / 2,
+					inner->width());
+				button->raise();
+			}, button->lifetime());
+
+			const auto wrap = inner->add(
+				object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+					inner,
+					object_ptr<Ui::VerticalLayout>(inner)));
+			wrap->toggle(false, anim::type::instant);
+			button->setClickedCallback([=] {
+				button->checkView()->setChecked(
+					!button->checkView()->checked(),
+					anim::type::normal);
+				wrap->toggle(
+					button->checkView()->checked(),
+					anim::type::normal);
+			});
+
+			const auto container = wrap->entity();
+			const auto optionCheckRect = deleteOptions->checkRect();
+			const auto childOptionPadding = st::boxRowPadding
+				+ QMargins(
+					optionCheckRect.width()
+						+ st::defaultBoxCheckbox.textPosition.x()
+						- optionCheckRect.x(),
+					0,
+					0,
+					0);
+			Ui::AddSkip(container);
+			Ui::AddSkip(container);
+			deleteMessages = container->add(
+				object_ptr<Ui::Checkbox>(
+					container,
+					tr::lng_delete_sub_messages(tr::now),
+					options.deleteAll,
+					st::defaultBoxCheckbox),
+				childOptionPadding);
+			Ui::AddSkip(container);
+			Ui::AddSkip(container);
+			deleteReactions = container->add(
+				object_ptr<Ui::Checkbox>(
+					container,
+					tr::lng_delete_sub_reactions(tr::now),
+					options.deleteAll,
+					st::defaultBoxCheckbox),
+				childOptionPadding);
+			deleteMessagesController->collectRequests = [=] {
+				return deleteMessages->checked()
+					? Participants{ participant }
+					: Participants();
+			};
+			deleteReactionsController->collectRequests = [=] {
+				return deleteReactions->checked()
+					? Participants{ participant }
+					: Participants();
+			};
+			const auto updateDeleteOptions = [=] {
+				const auto count = (deleteMessages->checked() ? 1 : 0)
+					+ (deleteReactions->checked() ? 1 : 0);
+				deleteOptions->setChecked(
+					count == 2,
+					Ui::Checkbox::NotifyAboutChange::DontNotify);
+				button->setText(DeleteOptionsExpanderText(count, 2));
+			};
+			deleteOptions->checkedChanges(
+			) | rpl::on_next([=](bool checked) {
+				deleteMessages->setChecked(checked);
+				deleteReactions->setChecked(checked);
+				updateDeleteOptions();
+			}, deleteOptions->lifetime());
+			deleteMessages->checkedChanges(
+			) | rpl::on_next(updateDeleteOptions, deleteMessages->lifetime());
+			deleteReactions->checkedChanges(
+			) | rpl::on_next(updateDeleteOptions, deleteReactions->lifetime());
+			updateDeleteOptions();
+			handleSubmitionIf([=] {
+				return deleteMessages->checked()
+					|| deleteReactions->checked();
+			});
+			handleConfirmation(
+				not_null{ deleteMessages },
+				not_null{ deleteMessagesController },
+				[=](
+					not_null<PeerData*> p,
+					not_null<ChannelData*> c) {
+					p->session().api().deleteAllFromParticipant(c, p);
+			});
+			confirms->events() | rpl::on_next([=] {
+				if (deleteReactions->checked()
+					&& deleteReactionsController->collectRequests
+					&& !effectiveCheckedParticipants(
+						deleteReactions,
+						deleteReactionsController).empty()) {
+					for (const auto &participant
+							: deleteReactionsController->collectRequests()) {
+						const auto useOriginReaction = reaction
+							&& (participant == reaction->participant);
+						const auto originMsgId = useOriginReaction
+							? reaction->msgId
+							: MsgId();
+						const auto originReaction = useOriginReaction
+							? reaction->reaction
+							: Data::ReactionId();
+						peer->session().api().deleteAllReactionsFromParticipant(
+							peer,
+							participant,
+							originMsgId,
+							originReaction);
+					}
+				}
+			}, deleteReactions->lifetime());
+		} else {
+			if (showMessagesCheckbox) {
+				Assert(history != nullptr);
+				deleteMessagesCounts = box->lifetime().make_state<
+					rpl::variable<base::flat_map<PeerId, int>>>(
+						base::flat_map<PeerId, int>());
+				MessagesCountValue(
+					history,
+					participants
+				) | rpl::on_next([=](base::flat_map<PeerId, int> counts) {
+					deleteMessagesCounts->force_assign(std::move(counts));
+				}, box->lifetime());
+				deleteMessagesController = box->lifetime().make_state<Controller>(
+					Controller::Data{
+						.messagesCounts = deleteMessagesCounts->value(),
+						.participants = participants,
+						.checked = checkedParticipants,
+					});
+				deleteMessages = inner->add(
+					object_ptr<Ui::Checkbox>(
+						inner,
+						tr::lng_delete_sub_messages(tr::now),
+						options.deleteAll,
+						st::defaultBoxCheckbox),
+					st::boxRowPadding + buttonPadding);
+				Ui::AddExpandablePeerList(
+					not_null{ deleteMessages },
+					not_null{ deleteMessagesController },
+					inner);
+				handleSubmition(not_null{ deleteMessages });
+				handleConfirmation(
+					not_null{ deleteMessages },
+					not_null{ deleteMessagesController },
+					[=](
+						not_null<PeerData*> p,
+						not_null<ChannelData*> c) {
+						p->session().api().deleteAllFromParticipant(c, p);
+				});
+			}
+
+			if (deleteMessages && showReactionsCheckbox) {
+				Ui::AddSkip(inner);
+				Ui::AddSkip(inner);
+			}
+
+			if (showReactionsCheckbox) {
+				deleteReactionsController = box->lifetime().make_state<Controller>(
+					Controller::Data{
+						.participants = participants,
+						.checked = checkedParticipants,
+					});
+				deleteReactions = inner->add(
+					object_ptr<Ui::Checkbox>(
+						inner,
+						tr::lng_delete_sub_reactions(tr::now),
+						options.deleteAll,
+						st::defaultBoxCheckbox),
+					st::boxRowPadding + buttonPadding);
+				Ui::AddExpandablePeerList(
+					not_null{ deleteReactions },
+					not_null{ deleteReactionsController },
+					inner);
+				handleSubmition(not_null{ deleteReactions });
+				confirms->events() | rpl::on_next([=] {
+					if (deleteReactions->checked()
+						&& deleteReactionsController->collectRequests
+						&& !effectiveCheckedParticipants(
+							deleteReactions,
+							deleteReactionsController).empty()) {
+						for (const auto &participant
+								: deleteReactionsController->collectRequests()) {
+							const auto useOriginReaction = reaction
+								&& (participant == reaction->participant);
+							peer->session().api()
+								.deleteAllReactionsFromParticipant(
+									peer,
+									participant,
+									useOriginReaction ? reaction->msgId : MsgId(),
+									useOriginReaction
+										? reaction->reaction
+										: Data::ReactionId());
+						}
+					}
+				}, deleteReactions->lifetime());
+			}
+		}
+	}
+	const auto makeTitleLoadingDescriptor = [] {
+		return Lottie::IconDescriptor{
+			.name = u"transcribe_loading"_q,
+			.color = &st::attentionButtonFg,
+			.sizeOverride = Size(st::historyTranscribeLoadingSize),
+			.colorizeUsingAlpha = true,
+		};
+	};
+	const auto titleLoadingEmojiData = Ui::Text::LottieEmojiData(
+		makeTitleLoadingDescriptor());
+	struct MessageTitleData final {
+		int count = 0;
+		bool resolved = false;
+	};
+	const auto baseMessagesCount = int(ids.size());
+	const auto langUpdated = rpl::single(
+		0
+	) | rpl::then(Lang::Updated() | rpl::map([] {
+		return 0;
+	}));
+	const auto makeMessageTitleData = [=](
+			const base::flat_map<PeerId, int> &messagesCounts,
+			const Participants &checked) {
+		auto result = MessageTitleData{
+			.count = baseMessagesCount,
+			.resolved = true,
+		};
+		for (const auto &peer : checked) {
+			const auto i = messagesCounts.find(peer->id);
+			if (i == end(messagesCounts)) {
+				result.resolved = false;
+			} else {
+				result.count += i->second;
+			}
+			if (const auto j = selectedMessagesByParticipant.find(peer->id);
+				j != end(selectedMessagesByParticipant)) {
+				result.count -= j->second;
+			}
+		}
+		return result;
+	};
+	auto title = [&]() -> rpl::producer<TextWithEntities> {
+		if (showMessagesCheckbox && !(hasReaction && !hasItems)) {
+			auto messageTitleData = rpl::combine(
+				deleteMessagesCounts->value(),
+				checkedParticipantsValue(
+					not_null{ deleteMessages },
+					not_null{ deleteMessagesController })
+			) | rpl::map(makeMessageTitleData);
+			return rpl::combine(
+				std::move(messageTitleData),
+				rpl::duplicate(langUpdated)
+			) | rpl::map([=](const MessageTitleData &data, int) {
+				const auto count = data.count;
+				const auto resolved = data.resolved;
+				const auto text = (count == 1)
+					? tr::lng_delete_title_message_one(tr::now)
+					: tr::lng_delete_title_message_many(
 						tr::now,
-						Ui::Text::WithEntities)
-					: tr::lng_delete_all_from_user(
+						lt_count,
+						count);
+				if (resolved || count != 0) {
+					return TextWithEntities{ text };
+				}
+				const auto zeroIndex = text.indexOf('0');
+				return (zeroIndex == -1)
+					? TextWithEntities{ text }
+					: TextWithEntities()
+						.append(text.mid(0, zeroIndex))
+						.append(Ui::Text::LottieEmoji(
+							makeTitleLoadingDescriptor()))
+						.append(text.mid(zeroIndex + 1));
+			});
+		} else if (hasReaction && showMessagesCheckbox) {
+			auto messageTitleData = rpl::combine(
+				deleteMessagesCounts->value(),
+				checkedParticipantsValue(
+					not_null{ deleteMessages },
+					not_null{ deleteMessagesController })
+			) | rpl::map(makeMessageTitleData);
+			auto deleteReactionsChecked = deleteReactions
+				? deleteReactions->checkedValue()
+				: rpl::single(false);
+			return rpl::combine(
+				deleteMessages->checkedValue(),
+				std::move(messageTitleData),
+				std::move(deleteReactionsChecked),
+				rpl::duplicate(langUpdated)
+			) | rpl::map([=](
+					bool deleteMessagesChecked,
+					const MessageTitleData &data,
+					bool deleteReactionsChecked,
+					int) {
+				if (!deleteMessagesChecked) {
+					return TextWithEntities{ deleteReactionsChecked
+						? tr::lng_delete_title_reaction_all(tr::now)
+						: tr::lng_delete_title_reaction_this(tr::now) };
+				}
+				const auto count = data.count;
+				const auto resolved = data.resolved;
+				const auto text = (count == 1)
+					? tr::lng_delete_title_message_one(tr::now)
+					: tr::lng_delete_title_message_many(
 						tr::now,
-						lt_user,
-						Ui::Text::Bold(items.front()->from()->name()),
-						Ui::Text::WithEntities),
-				false,
-				st::defaultBoxCheckbox),
-			st::boxRowPadding + buttonPadding);
-		if (isSingle) {
-			const auto history = items.front()->history();
-			tr::lng_selected_delete_sure(
-				lt_count,
-				rpl::combine(
-					MessagesCountValue(history, participants.front()),
-					deleteAll->checkedValue()
-				) | rpl::map([s = items.size()](int all, bool checked) {
-					return float64((checked && all) ? all : s);
-				})
-			) | rpl::start_with_next([=](const QString &text) {
-				title->setText(text);
-				title->resizeToWidth(inner->width()
-					- rect::m::sum::h(st::boxRowPadding));
-			}, title->lifetime());
+						lt_count,
+						count);
+				if (resolved || count != 0) {
+					return TextWithEntities{ text };
+				}
+				const auto zeroIndex = text.indexOf('0');
+				return (zeroIndex == -1)
+					? TextWithEntities{ text }
+					: TextWithEntities()
+						.append(text.mid(0, zeroIndex))
+						.append(Ui::Text::LottieEmoji(
+							makeTitleLoadingDescriptor()))
+						.append(text.mid(zeroIndex + 1));
+			});
+		} else if (hasItems) {
+			return rpl::duplicate(langUpdated) | rpl::map([=](int) {
+				return (itemsCount == 1)
+					? TextWithEntities{
+						tr::lng_delete_title_message_one(tr::now)
+					}
+					: TextWithEntities{
+						tr::lng_delete_title_message_many(
+							tr::now,
+							lt_count,
+							itemsCount)
+					};
+			});
+		} else if (deleteReactions) {
+			return rpl::combine(
+				deleteReactions->checkedValue(),
+				rpl::duplicate(langUpdated)
+			) | rpl::map([=](bool checked, int) {
+				return TextWithEntities{ checked
+					? tr::lng_delete_title_reaction_all(tr::now)
+					: tr::lng_delete_title_reaction_this(tr::now) };
+			});
 		}
-
-		const auto controller = box->lifetime().make_state<Controller>(
-			Controller::Data{ .participants = participants });
-		Ui::AddExpandablePeerList(deleteAll, controller, inner);
-		handleSubmition(deleteAll);
-
-		handleConfirmation(deleteAll, controller, [=](
-				not_null<PeerData*> p,
-				not_null<ChannelData*> c) {
-			p->session().api().deleteAllFromParticipant(c, p);
+		return rpl::duplicate(langUpdated) | rpl::map([](int) {
+			return TextWithEntities{
+				tr::lng_delete_title_reaction_this(tr::now)
+			};
 		});
+	}();
+	auto titleContext = Core::TextContext({ .session = session });
+	auto titleFactory = std::move(titleContext.customEmojiFactory);
+	titleContext.customEmojiFactory = [
+		titleFactory = std::move(titleFactory),
+		titleLoadingEmojiData,
+		makeTitleLoadingDescriptor
+	](QStringView data, const Ui::Text::MarkedContext &context)
+			-> std::unique_ptr<Ui::Text::CustomEmoji> {
+		if (data == titleLoadingEmojiData) {
+			return std::make_unique<Ui::Text::LottieCustomEmoji>(
+				makeTitleLoadingDescriptor(),
+				context.repaint);
+		}
+		return titleFactory(data, context);
+	};
+	box->getDelegate()->setTitle(std::move(title), std::move(titleContext));
+	enum class SubtitleKind {
+		None,
+		ThisReaction,
+		SomeReactions,
+		AllReactions,
+	};
+	if (hasItems || (hasReaction && showMessagesCheckbox)) {
+		const auto subtitleKind = box->lifetime().make_state<
+			rpl::variable<SubtitleKind>>(SubtitleKind::None);
+		auto reactionsCheckedValue = showReactionsCheckbox
+			? checkedParticipantsValue(
+				not_null{ deleteReactions },
+				not_null{ deleteReactionsController })
+			: rpl::single(Participants());
+		auto messageTitleShownValue = [&] {
+			return hasItems
+				? rpl::single(true)
+				: (hasReaction && showMessagesCheckbox)
+				? deleteMessages->checkedValue()
+				: rpl::single(false);
+		}();
+		rpl::combine(
+			subtitleKind->value(),
+			rpl::duplicate(langUpdated)
+		) | rpl::map([](SubtitleKind kind, int) {
+			switch (kind) {
+			case SubtitleKind::ThisReaction:
+				return tr::lng_delete_label_also_this_reaction(tr::now);
+			case SubtitleKind::SomeReactions:
+				return tr::lng_delete_label_also_some_reactions(tr::now);
+			case SubtitleKind::AllReactions:
+				return tr::lng_delete_label_also_all_reactions(tr::now);
+			case SubtitleKind::None:
+				return QString();
+			}
+			Unexpected("Bad subtitle kind.");
+		}) | rpl::on_next([=](const QString &text) {
+			subtitle->entity()->setText(text);
+		}, subtitle->lifetime());
+		rpl::combine(
+			std::move(reactionsCheckedValue),
+			std::move(messageTitleShownValue)
+		) | rpl::on_next([=](
+				const Participants &checked,
+				bool messageTitleShown) {
+			auto kind = SubtitleKind::None;
+			if (messageTitleShown) {
+				if (!checked.empty()) {
+					kind = (checked.size() == participants.size())
+						? SubtitleKind::AllReactions
+						: SubtitleKind::SomeReactions;
+				} else if (hasReaction) {
+					kind = SubtitleKind::ThisReaction;
+				}
+			}
+			subtitleKind->force_assign(kind);
+			subtitle->toggle(kind != SubtitleKind::None, anim::type::normal);
+		}, subtitle->lifetime());
 	}
-	if (allCanBan) {
-		auto ownedWrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			inner,
-			object_ptr<Ui::VerticalLayout>(inner));
+	if (banOrRestrict) {
+		auto ownedWrap = peer->isMonoforum()
+			? nullptr
+			: object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				inner,
+				object_ptr<Ui::VerticalLayout>(inner));
+		auto computeRestrictions = Fn<ChatRestrictions()>();
+		const auto wrap = ownedWrap.data();
 
 		Ui::AddSkip(inner);
 		Ui::AddSkip(inner);
@@ -312,13 +1261,19 @@ void CreateModerateMessagesBox(
 			object_ptr<Ui::Checkbox>(
 				box,
 				rpl::conditional(
-					ownedWrap->toggledValue(),
-					tr::lng_context_restrict_user(),
+					(ownedWrap
+						? ownedWrap->toggledValue()
+						: rpl::single(false) | rpl::type_erased),
+					tr::lng_restrict_user(
+						lt_count,
+						rpl::single(participants.size()) | tr::to_count()),
 					rpl::conditional(
 						rpl::single(isSingle),
-						tr::lng_ban_user(),
+						tr::lng_ban_specific_user(
+							lt_user,
+							rpl::single(participants.front()->shortName())),
 						tr::lng_ban_users())),
-				false,
+				options.banUser,
 				st::defaultBoxCheckbox),
 			st::boxRowPadding + buttonPadding);
 		const auto controller = box->lifetime().make_state<Controller>(
@@ -329,142 +1284,132 @@ void CreateModerateMessagesBox(
 		Ui::AddSkip(inner);
 		Ui::AddSkip(inner);
 
-		const auto wrap = inner->add(std::move(ownedWrap));
-		const auto container = wrap->entity();
-		wrap->toggle(false, anim::type::instant);
+		if (ownedWrap) {
+			inner->add(std::move(ownedWrap));
 
-		const auto session = &participants.front()->session();
-		const auto emojiMargin = QMargins(
-			-st::moderateBoxExpandInnerSkip,
-			-st::moderateBoxExpandInnerSkip / 2,
-			0,
-			0);
-		const auto emojiUp = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				st::moderateBoxExpandIcon,
-				emojiMargin,
-				false));
-		const auto emojiDown = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				st::moderateBoxExpandIconDown,
-				emojiMargin,
-				false));
-
-		auto label = object_ptr<Ui::FlatLabel>(
-			inner,
-			QString(),
-			st::moderateBoxDividerLabel);
-		const auto raw = label.data();
-
-		auto &lifetime = wrap->lifetime();
-		const auto scrollLifetime = lifetime.make_state<rpl::lifetime>();
-		label->setClickHandlerFilter([=](
-				const ClickHandlerPtr &handler,
-				Qt::MouseButton button) {
-			if (button != Qt::LeftButton) {
-				return false;
-			}
-			wrap->toggle(!wrap->toggled(), anim::type::normal);
-			{
-				inner->heightValue() | rpl::start_with_next([=] {
-					if (!wrap->animating()) {
-						scrollLifetime->destroy();
-						Ui::PostponeCall(crl::guard(box, [=] {
+			const auto container = wrap->entity();
+			wrap->toggle(false, anim::type::instant);
+
+			const auto emojiUp = Ui::Text::IconEmoji(
+				&st::moderateBoxExpandIcon);
+			const auto emojiDown = Ui::Text::IconEmoji(
+				&st::moderateBoxExpandIconDown);
+
+			auto label = object_ptr<Ui::FlatLabel>(
+				inner,
+				QString(),
+				st::moderateBoxDividerLabel);
+			const auto raw = label.data();
+
+			auto &lifetime = wrap->lifetime();
+			const auto scrollLifetime = lifetime.make_state<rpl::lifetime>();
+			label->setClickHandlerFilter([=](
+					const ClickHandlerPtr &handler,
+					Qt::MouseButton button) {
+				if (button != Qt::LeftButton) {
+					return false;
+				}
+				wrap->toggle(!wrap->toggled(), anim::type::normal);
+				{
+					inner->heightValue() | rpl::on_next([=] {
+						if (!wrap->animating()) {
+							scrollLifetime->destroy();
+							Ui::PostponeCall(crl::guard(box, [=] {
+								box->scrollToY(std::numeric_limits<int>::max());
+							}));
+						} else {
 							box->scrollToY(std::numeric_limits<int>::max());
-						}));
-					} else {
-						box->scrollToY(std::numeric_limits<int>::max());
-					}
-				}, *scrollLifetime);
-			}
-			return true;
-		});
-		wrap->toggledValue(
-		) | rpl::map([isSingle, emojiUp, emojiDown](bool toggled) {
-			return ((toggled && isSingle)
-				? tr::lng_restrict_user_part
-				: (toggled && !isSingle)
-				? tr::lng_restrict_users_part
-				: isSingle
-				? tr::lng_restrict_user_full
-				: tr::lng_restrict_users_full)(
-					lt_emoji,
-					rpl::single(toggled ? emojiUp : emojiDown),
-					Ui::Text::WithEntities);
-		}) | rpl::flatten_latest(
-		) | rpl::start_with_next([=](const TextWithEntities &text) {
-			raw->setMarkedText(
-				Ui::Text::Link(text, u"internal:"_q),
-				Core::MarkedTextContext{
-					.session = session,
-					.customEmojiRepaint = [=] { raw->update(); },
-				});
-		}, label->lifetime());
+						}
+					}, *scrollLifetime);
+				}
+				return true;
+			});
+			wrap->toggledValue(
+			) | rpl::map([isSingle, emojiUp, emojiDown](bool toggled) {
+				return ((toggled && isSingle)
+					? tr::lng_restrict_user_full
+					: (toggled && !isSingle)
+					? tr::lng_restrict_users_full
+					: isSingle
+					? tr::lng_restrict_user_part
+					: tr::lng_restrict_users_part)(
+						lt_emoji,
+						rpl::single(toggled ? emojiUp : emojiDown),
+						tr::marked);
+			}) | rpl::flatten_latest(
+			) | rpl::on_next([=](const TextWithEntities &text) {
+				raw->setMarkedText(tr::link(text, u"internal:"_q));
+			}, label->lifetime());
 
-		Ui::AddSkip(inner);
-		inner->add(object_ptr<Ui::DividerLabel>(
-			inner,
-			std::move(label),
-			st::defaultBoxDividerLabelPadding,
-			RectPart::Top | RectPart::Bottom));
-
-		using Flag = ChatRestriction;
-		using Flags = ChatRestrictions;
-		const auto peer = items.front()->history()->peer;
-		const auto chat = peer->asChat();
-		const auto channel = peer->asChannel();
-		const auto defaultRestrictions = chat
-			? chat->defaultRestrictions()
-			: channel->defaultRestrictions();
-		const auto prepareFlags = FixDependentRestrictions(
-			defaultRestrictions
-			| ((channel && channel->isPublic())
-				? (Flag::ChangeInfo | Flag::PinMessages)
-				: Flags(0)));
-		const auto disabledMessages = [&] {
-			auto result = base::flat_map<Flags, QString>();
-			{
-				const auto disabled = FixDependentRestrictions(
-					defaultRestrictions
-					| ((channel && channel->isPublic())
-						? (Flag::ChangeInfo | Flag::PinMessages)
-						: Flags(0)));
-				result.emplace(
-					disabled,
-					tr::lng_rights_restriction_for_all(tr::now));
-			}
-			return result;
-		}();
+			Ui::AddSkip(inner);
+			inner->add(object_ptr<Ui::DividerLabel>(
+				inner,
+				std::move(label),
+				st::defaultBoxDividerLabelPadding));
 
-		Ui::AddSubsectionTitle(
-			inner,
-			rpl::conditional(
-				rpl::single(isSingle),
-				tr::lng_restrict_users_part_single_header(),
-				tr::lng_restrict_users_part_header(
-					lt_count,
-					rpl::single(participants.size()) | tr::to_count())));
-		auto [checkboxes, getRestrictions, changes] = CreateEditRestrictions(
-			box,
-			prepareFlags,
-			disabledMessages,
-			{ .isForum = peer->isForum() });
-		std::move(changes) | rpl::start_with_next([=] {
-			ban->setChecked(true);
-		}, ban->lifetime());
-		Ui::AddSkip(container);
-		Ui::AddDivider(container);
-		Ui::AddSkip(container);
-		container->add(std::move(checkboxes));
+			using Flag = ChatRestriction;
+			using Flags = ChatRestrictions;
+			const auto chat = peer->asChat();
+			const auto channel = peer->asChannel();
+			const auto defaultRestrictions = chat
+				? chat->defaultRestrictions()
+				: channel->defaultRestrictions();
+			const auto prepareFlags = FixDependentRestrictions(
+				defaultRestrictions
+				| ((channel && channel->isPublic())
+					? (Flag::ChangeInfo | Flag::PinMessages)
+					: Flags(0)));
+			const auto disabledMessages = [&] {
+				auto result = base::flat_map<Flags, QString>();
+				{
+					const auto disabled = FixDependentRestrictions(
+						defaultRestrictions
+						| ((channel && channel->isPublic())
+							? (Flag::ChangeInfo | Flag::PinMessages)
+							: Flags(0)));
+					result.emplace(
+						disabled,
+						tr::lng_rights_restriction_for_all(tr::now));
+				}
+				return result;
+			}();
+
+			auto [checkboxes, getRestrictions, changes, highlightWidget] = CreateEditRestrictions(
+				box,
+				prepareFlags,
+				disabledMessages,
+				{ .isForum = peer->isForum(), .isUserSpecific = true });
+			computeRestrictions = getRestrictions;
+			std::move(changes) | rpl::on_next([=] {
+				ban->setChecked(true);
+			}, ban->lifetime());
+			Ui::AddSkip(container);
+			Ui::AddDivider(container);
+			Ui::AddSkip(container);
+			Ui::AddSubsectionTitle(
+				container,
+				rpl::conditional(
+					rpl::single(isSingle),
+					tr::lng_restrict_users_part_single_header(),
+					tr::lng_restrict_users_part_header(
+						lt_count,
+						rpl::single(participants.size()) | tr::to_count())));
+			container->add(std::move(checkboxes));
+		}
 
 		// Handle confirmation manually.
-		confirms->events() | rpl::start_with_next([=] {
+		confirms->events() | rpl::on_next([=] {
 			if (ban->checked() && controller->collectRequests) {
-				const auto kick = !wrap->toggled();
-				const auto restrictions = getRestrictions();
+				const auto kick = !wrap || !wrap->toggled();
+				const auto restrictions = computeRestrictions
+					? computeRestrictions()
+					: ChatRestrictions();
 				const auto request = [=](
 						not_null<PeerData*> peer,
 						not_null<ChannelData*> channel) {
+					if (base::IsAltPressed() || base::IsCtrlPressed()) {
+						return;
+					}
 					if (!kick) {
 						Api::ChatParticipants::Restrict(
 							channel,
@@ -474,48 +1419,66 @@ void CreateModerateMessagesBox(
 							nullptr,
 							nullptr);
 					} else {
-						channel->session().api().chatParticipants().kick(
-							channel,
-							peer,
-							{ channel->restrictions(), 0 });
+						const auto block = channel->isMonoforum()
+							? channel->monoforumBroadcast()
+							: channel.get();
+						if (block) {
+							block->session().api().chatParticipants().kick(
+								block,
+								peer,
+								{ block->restrictions(), 0 });
+						}
 					}
 				};
-				sequentiallyRequest(request, controller->collectRequests());
+				if (collectCommon && !collectCommon->empty()) {
+					sequentiallyRequest(
+						request,
+						controller->collectRequests(),
+						*collectCommon);
+				} else {
+					sequentiallyRequest(
+						request,
+						controller->collectRequests());
+				}
 			}
 		}, ban->lifetime());
 	}
 
 	const auto close = crl::guard(box, [=] { box->closeBox(); });
-	{
-		const auto data = &participants.front()->session().data();
-		const auto ids = data->itemsToIds(items);
-		box->addButton(tr::lng_box_delete(), [=] {
-			confirms->fire({});
-			if (confirmed) {
-				confirmed();
-			}
-			data->histories().deleteMessages(ids, true);
-			data->sendHistoryChangeNotifications();
-			close();
-		});
-	}
+	box->addButton(tr::lng_box_delete(), [=] {
+		confirms->fire({});
+		if (confirmed) {
+			confirmed();
+		}
+		if (hasItems) {
+			session->data().histories().deleteMessages(ids, true);
+			session->data().sendHistoryChangeNotifications();
+		}
+		const auto deleteThisReaction = reaction
+			&& !ranges::contains(
+				effectiveCheckedParticipants(
+					deleteReactions,
+					deleteReactionsController),
+				reaction->participant);
+		if (deleteThisReaction) {
+			session->api().deleteParticipantReaction(
+				reaction->peer,
+				reaction->msgId,
+				reaction->participant,
+				reaction->reaction);
+		}
+		close();
+	});
 	box->addButton(tr::lng_cancel(), close);
 }
 
 bool CanCreateModerateMessagesBox(const HistoryItemsList &items) {
 	const auto options = CalculateModerateOptions(items);
-	return (options.allCanBan || options.allCanDelete)
+	return HasModerateActions(options)
 		&& !options.participants.empty();
 }
 
-void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
-	const auto container = box->verticalLayout();
-
-	const auto maybeUser = peer->asUser();
-
-	Ui::AddSkip(container);
-	Ui::AddSkip(container);
-
+void SafeSubmitOnEnter(not_null<Ui::GenericBox*> box) {
 	base::install_event_filter(box, [=](not_null<QEvent*> event) {
 		if (event->type() == QEvent::KeyPress) {
 			if (const auto k = static_cast<QKeyEvent*>(event.get())) {
@@ -529,17 +1492,31 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 						},
 						.confirmText = tr::lng_box_yes(),
 						.cancelText = tr::lng_box_no(),
-					}));
+						}));
 				}
 			}
 		}
 		return base::EventFilterResult::Continue;
 	});
+}
+
+void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
+	const auto container = box->verticalLayout();
+
+	const auto userpicPeer = peer->userpicPaintingPeer();
+	const auto maybeUser = peer->asUser();
+	const auto isBot = maybeUser && maybeUser->isBot();
+
+	Ui::AddSkip(container);
+	Ui::AddSkip(container);
+
+	SafeSubmitOnEnter(box);
 
 	const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
 		container,
-		peer,
-		st::mainMenuUserpic);
+		userpicPeer,
+		st::mainMenuUserpic,
+		peer->userpicShape());
 	userpic->showSavedMessagesOnSelf(true);
 	Ui::IconWithTitle(
 		container,
@@ -547,12 +1524,12 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 		Ui::CreateChild<Ui::FlatLabel>(
 			container,
 			peer->isSelf()
-				? tr::lng_saved_messages() | Ui::Text::ToBold()
+				? tr::lng_saved_messages(tr::bold)
 				: maybeUser
-				? tr::lng_profile_delete_conversation() | Ui::Text::ToBold()
+				? tr::lng_profile_delete_conversation(tr::bold)
 				: rpl::single(
-					peer->name()
-				) | Ui::Text::ToBold() | rpl::type_erased(),
+					tr::bold(userpicPeer->name())
+				) | rpl::type_erased,
 			box->getDelegate()->style().title));
 
 	Ui::AddSkip(container);
@@ -586,16 +1563,16 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 						tr::now,
 						lt_user,
 						TextWithEntities{ maybeUser->firstName },
-						Ui::Text::RichLangValue)
+						tr::rich)
 					: tr::lng_delete_for_everyone_check(
 						tr::now,
-						Ui::Text::WithEntities),
+						tr::marked),
 				false,
 				st::defaultBoxCheckbox));
 	}();
 
 	const auto maybeBotCheckbox = [&]() -> Ui::Checkbox* {
-		if (!maybeUser || !maybeUser->isBot()) {
+		if (!isBot) {
 			return nullptr;
 		}
 		Ui::AddSkip(container);
@@ -603,7 +1580,41 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 		return box->addRow(
 			object_ptr<Ui::Checkbox>(
 				container,
-				tr::lng_profile_block_bot(tr::now, Ui::Text::WithEntities),
+				tr::lng_profile_block_bot(tr::now, tr::marked),
+				false,
+				st::defaultBoxCheckbox));
+	}();
+
+	const auto removeFromChatsFilters = [=](
+			not_null<History*> history) -> std::vector<FilterId> {
+		auto result = std::vector<FilterId>();
+		for (const auto &filter : peer->owner().chatsFilters().list()) {
+			if (filter.withoutAlways(history) != filter) {
+				result.push_back(filter.id());
+			}
+		}
+		return result;
+	};
+
+	const auto maybeChatsFiltersCheckbox = [&]() -> Ui::Checkbox* {
+		const auto history = (isBot || !maybeUser)
+			? peer->owner().history(peer).get()
+			: nullptr;
+		if (!history || removeFromChatsFilters(history).empty()) {
+			return nullptr;
+		}
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		return box->addRow(
+			object_ptr<Ui::Checkbox>(
+				container,
+				(maybeBotCheckbox
+					? tr::lng_filters_checkbox_remove_bot
+					: (peer->isChannel() && !peer->isMegagroup())
+					? tr::lng_filters_checkbox_remove_channel
+					: tr::lng_filters_checkbox_remove_group)(
+						tr::now,
+						tr::marked),
 				false,
 				st::defaultBoxCheckbox));
 	}();
@@ -622,10 +1633,35 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 	box->addButton(std::move(buttonText), [=] {
 		const auto revoke = maybeCheckbox && maybeCheckbox->checked();
 		const auto stopBot = maybeBotCheckbox && maybeBotCheckbox->checked();
+		const auto removeFromChats = maybeChatsFiltersCheckbox
+			&& maybeChatsFiltersCheckbox->checked();
 		Core::App().closeChatFromWindows(peer);
 		if (stopBot) {
 			peer->session().api().blockedPeers().block(peer);
 		}
+		if (removeFromChats) {
+			const auto history = peer->owner().history(peer).get();
+			const auto removeFrom = removeFromChatsFilters(history);
+			for (const auto &filter : peer->owner().chatsFilters().list()) {
+				if (!ranges::contains(removeFrom, filter.id())) {
+					continue;
+				}
+				const auto result = filter.withoutAlways(history);
+				if (result == filter) {
+					continue;
+				}
+				const auto tl = result.tl();
+				peer->owner().chatsFilters().apply(MTP_updateDialogFilter(
+					MTP_flags(MTPDupdateDialogFilter::Flag::f_filter),
+					MTP_int(filter.id()),
+					tl));
+				peer->session().api().request(MTPmessages_UpdateDialogFilter(
+					MTP_flags(MTPmessages_UpdateDialogFilter::Flag::f_filter),
+					MTP_int(filter.id()),
+					tl
+				)).send();
+			}
+		}
 		// Don't delete old history by default,
 		// because Android app doesn't.
 		//
@@ -637,3 +1673,64 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 	}, st::attentionBoxButton);
 	box->addButton(tr::lng_cancel(), close);
 }
+
+void DeleteSublistBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Data::SavedSublist*> sublist) {
+	const auto container = box->verticalLayout();
+
+	const auto weak = base::make_weak(sublist.get());
+	const auto peer = sublist->sublistPeer();
+
+	Ui::AddSkip(container);
+	Ui::AddSkip(container);
+
+	SafeSubmitOnEnter(box);
+
+	const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+		container,
+		peer,
+		st::mainMenuUserpic);
+	Ui::IconWithTitle(
+		container,
+		userpic,
+		Ui::CreateChild<Ui::FlatLabel>(
+			container,
+			tr::lng_profile_delete_conversation(tr::bold),
+			box->getDelegate()->style().title));
+
+	Ui::AddSkip(container);
+	Ui::AddSkip(container);
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			container,
+			tr::lng_sure_delete_history(
+				lt_contact,
+				rpl::single(peer->name())),
+			st::boxLabel));
+
+	Ui::AddSkip(container);
+
+	const auto close = crl::guard(box, [=] { box->closeBox(); });
+	box->addButton(tr::lng_box_delete(), [=] {
+		const auto strong = weak.get();
+		const auto parentChat = strong ? strong->parentChat() : nullptr;
+		if (!parentChat) {
+			return;
+		}
+		peer->session().api().deleteSublistHistory(parentChat, peer);
+		close();
+	}, st::attentionBoxButton);
+	box->addButton(tr::lng_cancel(), close);
+}
+
+ModerateMessagesBoxOptions DefaultModerateMessagesBoxOptions() {
+	return base::IsCtrlPressed()
+		? ModerateMessagesBoxOptions{
+			.reportSpam = true,
+			.deleteAll = true,
+			.banUser = true,
+		}
+		: ModerateMessagesBoxOptions{};
+}
diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.h b/Telegram/SourceFiles/boxes/moderate_messages_box.h
index eb240261259c69..bea05adcf8aa95 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.h
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.h
@@ -7,17 +7,49 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "data/data_message_reaction_id.h"
+
 class PeerData;
 
+namespace Data {
+class SavedSublist;
+} // namespace Data
+
 namespace Ui {
 class GenericBox;
 } // namespace Ui
 
+extern const char kModerateCommonGroups[];
+
+struct ModerateMessagesBoxOptions final {
+	bool reportSpam = false;
+	bool deleteAll = false;
+	bool banUser = false;
+};
+
+struct ModerateReactionEntry {
+	not_null<PeerData*> peer;
+	MsgId msgId;
+	not_null<PeerData*> participant;
+	Data::ReactionId reaction;
+};
+
+struct ModerateMessagesBoxEntry {
+	HistoryItemsList items;
+	std::optional<ModerateReactionEntry> reaction;
+};
+
+[[nodiscard]] ModerateMessagesBoxOptions DefaultModerateMessagesBoxOptions();
+
 void CreateModerateMessagesBox(
 	not_null<Ui::GenericBox*> box,
-	const HistoryItemsList &items,
-	Fn<void()> confirmed);
+	ModerateMessagesBoxEntry entry,
+	Fn<void()> confirmed,
+	ModerateMessagesBoxOptions options);
 
 [[nodiscard]] bool CanCreateModerateMessagesBox(const HistoryItemsList &);
 
 void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer);
+void DeleteSublistBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Data::SavedSublist*> sublist);
diff --git a/Telegram/SourceFiles/boxes/passcode_box.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp
index 840e4872d44d64..6e514a14b35c46 100644
--- a/Telegram/SourceFiles/boxes/passcode_box.cpp
+++ b/Telegram/SourceFiles/boxes/passcode_box.cpp
@@ -26,9 +26,10 @@ For license and copyright information please follow this link:
 #include "ui/widgets/labels.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "passport/passport_encryption.h"
 #include "passport/passport_panel_edit_contact.h"
-#include "settings/settings_privacy_security.h"
+#include "settings/sections/settings_privacy_security.h"
 #include "styles/style_layers.h"
 #include "styles/style_passport.h"
 #include "styles/style_boxes.h"
@@ -46,9 +47,9 @@ void SetCloudPassword(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session) {
 	session->api().cloudPassword().state(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		using namespace Settings;
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		if (CheckEditCloudPassword(session)) {
 			box->getDelegate()->show(
 				EditCloudPasswordBox(session));
@@ -72,17 +73,17 @@ void TransferPasswordError(
 	auto text = std::move(about).append('\n').append('\n').append(
 		tr::lng_rights_transfer_check_password(
 			tr::now,
-			Ui::Text::RichLangValue)
+			tr::rich)
 	).append('\n').append('\n').append(
 		tr::lng_rights_transfer_check_session(
 			tr::now,
-			Ui::Text::RichLangValue)
+			tr::rich)
 	);
 	if (error == PasswordErrorType::Later) {
 		text.append('\n').append('\n').append(
 			tr::lng_rights_transfer_check_later(
 				tr::now,
-				Ui::Text::RichLangValue));
+				tr::rich));
 	}
 	box->addRow(object_ptr<Ui::FlatLabel>(
 		box,
@@ -102,11 +103,11 @@ void StartPendingReset(
 		not_null<Main::Session*> session,
 		not_null<Ui::BoxContent*> context,
 		Fn<void()> close) {
-	const auto weak = Ui::MakeWeak(context.get());
+	const auto weak = base::make_weak(context.get());
 	auto lifetime = std::make_shared<rpl::lifetime>();
 
 	auto finish = [=](const QString &message) mutable {
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			if (!message.isEmpty()) {
 				strong->getDelegate()->show(Ui::MakeInformBox(message));
 			}
@@ -119,7 +120,7 @@ void StartPendingReset(
 	};
 
 	session->api().cloudPassword().resetPassword(
-	) | rpl::start_with_next_error_done([=](
+	) | rpl::on_next_error_done([=](
 			Api::CloudPassword::ResetRetryDate retryDate) {
 		constexpr auto kMinute = 60;
 		constexpr auto kHour = 3600;
@@ -135,7 +136,7 @@ void StartPendingReset(
 			: hours
 			? tr::lng_hours(tr::now, lt_count, hours)
 			: tr::lng_minutes(tr::now, lt_count, minutes);
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->getDelegate()->show(Ui::MakeInformBox(
 				tr::lng_cloud_password_reset_later(
 					tr::now,
@@ -171,8 +172,9 @@ PasscodeBox::PasscodeBox(
 	bool turningOff)
 : _session(session)
 , _api(&_session->mtp())
+, _textWidth(st::boxWidth - st::boxPadding.left() * 1.5)
 , _turningOff(turningOff)
-, _about(st::boxWidth - st::boxPadding.left() * 1.5)
+, _about(_textWidth)
 , _oldPasscode(this, st::defaultInputField, tr::lng_passcode_enter_old())
 , _newPasscode(
 	this,
@@ -193,10 +195,11 @@ PasscodeBox::PasscodeBox(
 	const CloudFields &fields)
 : _session(session)
 , _api(mtp)
+, _textWidth(st::boxWidth - st::boxPadding.left() * 1.5)
 , _turningOff(fields.turningOff)
 , _cloudPwd(true)
 , _cloudFields(fields)
-, _about(st::boxWidth - st::boxPadding.left() * 1.5)
+, _about(_textWidth)
 , _oldPasscode(this, st::defaultInputField, tr::lng_cloud_password_enter_old())
 , _newPasscode(
 	this,
@@ -274,7 +277,7 @@ void PasscodeBox::prepare() {
 			: _cloudPwd
 			? tr::lng_cloud_password_about(tr::now)
 			: tr::lng_passcode_about(tr::now)));
-	_aboutHeight = _about.countHeight(st::boxWidth - st::boxPadding.left() * 1.5);
+	_aboutHeight = _about.countHeight(_textWidth);
 	const auto onlyCheck = onlyCheckCurrent();
 	if (onlyCheck) {
 		_oldPasscode->show();
@@ -306,11 +309,11 @@ void PasscodeBox::prepare() {
 	connect(_newPasscode, &Ui::MaskedInputField::changed, [=] { newChanged(); });
 	connect(_reenterPasscode, &Ui::MaskedInputField::changed, [=] { newChanged(); });
 	_passwordHint->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		newChanged();
 	}, _passwordHint->lifetime());
 	_recoverEmail->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_emailError.isEmpty()) {
 			_emailError = QString();
 			update();
@@ -322,9 +325,9 @@ void PasscodeBox::prepare() {
 	connect(_newPasscode, &Ui::MaskedInputField::submitted, fieldSubmit);
 	connect(_reenterPasscode, &Ui::MaskedInputField::submitted, fieldSubmit);
 	_passwordHint->submits(
-	) | rpl::start_with_next(fieldSubmit, _passwordHint->lifetime());
+	) | rpl::on_next(fieldSubmit, _passwordHint->lifetime());
 	_recoverEmail->submits(
-	) | rpl::start_with_next(fieldSubmit, _recoverEmail->lifetime());
+	) | rpl::on_next(fieldSubmit, _recoverEmail->lifetime());
 
 	_recover->addClickHandler([=] { recoverByEmail(); });
 
@@ -382,28 +385,27 @@ void PasscodeBox::paintEvent(QPaintEvent *e) {
 
 	Painter p(this);
 
-	int32 w = st::boxWidth - st::boxPadding.left() * 1.5;
 	int32 abouty = (_passwordHint->isHidden() ? ((_reenterPasscode->isHidden() ? (_oldPasscode->y() + (_showRecoverLink && !_hintText.isEmpty() ? st::passcodeTextLine : 0)) : _reenterPasscode->y()) + st::passcodeSkip) : _passwordHint->y()) + _oldPasscode->height() + st::passcodeLittleSkip + st::passcodeAboutSkip;
 	p.setPen(st::boxTextFg);
-	_about.drawLeft(p, st::boxPadding.left(), abouty, w, width());
+	_about.drawLeft(p, st::boxPadding.left(), abouty, _textWidth, width());
 
 	if (!_hintText.isEmpty() && _oldError.isEmpty()) {
-		_hintText.drawLeftElided(p, st::boxPadding.left(), _oldPasscode->y() + _oldPasscode->height() + ((st::passcodeTextLine - st::normalFont->height) / 2), w, width(), 1, style::al_topleft);
+		_hintText.drawLeftElided(p, st::boxPadding.left(), _oldPasscode->y() + _oldPasscode->height() + ((st::passcodeTextLine - st::normalFont->height) / 2), _textWidth, width(), 1, style::al_topleft);
 	}
 
 	if (!_oldError.isEmpty()) {
 		p.setPen(st::boxTextFgError);
-		p.drawText(QRect(st::boxPadding.left(), _oldPasscode->y() + _oldPasscode->height(), w, st::passcodeTextLine), _oldError, style::al_left);
+		p.drawText(QRect(st::boxPadding.left(), _oldPasscode->y() + _oldPasscode->height(), _textWidth, st::passcodeTextLine), _oldError, style::al_left);
 	}
 
 	if (!_newError.isEmpty()) {
 		p.setPen(st::boxTextFgError);
-		p.drawText(QRect(st::boxPadding.left(), _reenterPasscode->y() + _reenterPasscode->height(), w, st::passcodeTextLine), _newError, style::al_left);
+		p.drawText(QRect(st::boxPadding.left(), _reenterPasscode->y() + _reenterPasscode->height(), _textWidth, st::passcodeTextLine), _newError, style::al_left);
 	}
 
 	if (!_emailError.isEmpty()) {
 		p.setPen(st::boxTextFgError);
-		p.drawText(QRect(st::boxPadding.left(), _recoverEmail->y() + _recoverEmail->height(), w, st::passcodeTextLine), _emailError, style::al_left);
+		p.drawText(QRect(st::boxPadding.left(), _recoverEmail->y() + _recoverEmail->height(), _textWidth, st::passcodeTextLine), _emailError, style::al_left);
 	}
 }
 
@@ -445,7 +447,7 @@ void PasscodeBox::recoverPasswordDone(
 		_replacedBy->closeBox();
 	}
 	_setRequest = 0;
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	_newAuthorization.fire_copy(result);
 	if (weak) {
 		_newPasswordSet.fire_copy(newPasswordBytes);
@@ -464,7 +466,7 @@ void PasscodeBox::setPasswordDone(const QByteArray &newPasswordBytes) {
 		_replacedBy->closeBox();
 	}
 	_setRequest = 0;
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	_newPasswordSet.fire_copy(newPasswordBytes);
 	if (weak) {
 		auto text = _reenterPasscode->isHidden()
@@ -565,9 +567,9 @@ void PasscodeBox::validateEmail(
 			} else if (error.type() == u"CODE_INVALID"_q) {
 				errors->fire(tr::lng_signin_wrong_code(tr::now));
 			} else if (error.type() == u"EMAIL_HASH_EXPIRED"_q) {
-				const auto weak = Ui::MakeWeak(this);
+				const auto weak = base::make_weak(this);
 				_clearUnconfirmedPassword.fire({});
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					strong->getDelegate()->show(
 						Ui::MakeInformBox(
 							Lang::Hard::EmailConfirmationExpired()),
@@ -605,7 +607,7 @@ void PasscodeBox::validateEmail(
 	box->boxClosing(
 	) | rpl::filter([=] {
 		return !*set;
-	}) | start_with_next([=, weak = Ui::MakeWeak(this)] {
+	}) | on_next([=, weak = base::make_weak(this)] {
 		if (weak) {
 			weak->_clearUnconfirmedPassword.fire({});
 		}
@@ -708,7 +710,7 @@ void PasscodeBox::save(bool force) {
 		}
 	} else {
 		closeReplacedBy();
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		cSetPasscodeBadTries(0);
 		_session->domain().local().setPasscode(pwd.toUtf8());
 		Core::App().localPasscodeChanged();
@@ -740,7 +742,7 @@ void PasscodeBox::submitOnlyCheckCloudPassword(const QString &oldPassword) {
 void PasscodeBox::sendOnlyCheckCloudPassword(const QString &oldPassword) {
 	checkPassword(oldPassword, [=](const Core::CloudPasswordResult &check) {
 		if (const auto onstack = _cloudFields.customCheckCallback) {
-			onstack(check, Ui::MakeWeak(this));
+			onstack(check, base::make_weak(this));
 		} else {
 			Assert(_cloudFields.turningOff);
 			sendClearCloudPassword(check);
@@ -1103,7 +1105,7 @@ void PasscodeBox::recover() {
 		return;
 	}
 
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto box = getDelegate()->show(Box<RecoverBox>(
 		&_api.instance(),
 		_session,
@@ -1115,7 +1117,7 @@ void PasscodeBox::recover() {
 	) | rpl::start_to_stream(_newPasswordSet, lifetime());
 
 	box->recoveryExpired(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		recoverExpired();
 	}, lifetime());
 
@@ -1141,11 +1143,20 @@ RecoverBox::RecoverBox(
 	Fn<void()> closeParent)
 : _session(session)
 , _api(mtp)
-, _pattern(st::normalFont->elided(tr::lng_signin_recover_hint(tr::now, lt_recover_email, pattern), st::boxWidth - st::boxPadding.left() * 1.5))
+, _textWidth(st::boxWidth - st::boxPadding.left() * 1.5)
 , _cloudFields(fields)
 , _recoverCode(this, st::defaultInputField, tr::lng_signin_code())
 , _noEmailAccess(this, tr::lng_signin_try_password(tr::now))
+, _patternLabel(
+	this,
+	tr::lng_signin_recover_hint(
+		lt_recover_email,
+		rpl::single(Ui::Text::WrapEmailPattern(pattern)),
+		tr::marked),
+	st::termsContent,
+	st::defaultPopupMenu)
 , _closeParent(std::move(closeParent)) {
+	_patternLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 	if (_cloudFields.pendingResetDate != 0 || !session) {
 		_noEmailAccess.destroy();
 	} else {
@@ -1176,26 +1187,31 @@ rpl::producer<> RecoverBox::recoveryExpired() const {
 	return _recoveryExpired.events();
 }
 
-void RecoverBox::prepare() {
-	setTitle(tr::lng_signin_recover_title());
-
-	addButton(tr::lng_passcode_submit(), [=] { submit(); });
-	addButton(tr::lng_cancel(), [=] { closeBox(); });
-
+void RecoverBox::updateHeight() {
 	setDimensions(
 		st::boxWidth,
 		(st::passcodePadding.top()
 			+ st::passcodePadding.bottom()
 			+ st::passcodeTextLine
 			+ _recoverCode->height()
+			+ _patternLabel->height()
 			+ st::passcodeTextLine));
+}
+
+void RecoverBox::prepare() {
+	setTitle(tr::lng_signin_recover_title());
+
+	addButton(tr::lng_passcode_submit(), [=] { submit(); });
+	addButton(tr::lng_cancel(), [=] { closeBox(); });
+
+	updateHeight();
 
 	_recoverCode->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		codeChanged();
 	}, _recoverCode->lifetime());
 	_recoverCode->submits(
-	) | rpl::start_with_next([=] { submit(); }, _recoverCode->lifetime());
+	) | rpl::on_next([=] { submit(); }, _recoverCode->lifetime());
 }
 
 void RecoverBox::paintEvent(QPaintEvent *e) {
@@ -1205,23 +1221,42 @@ void RecoverBox::paintEvent(QPaintEvent *e) {
 
 	p.setFont(st::normalFont);
 	p.setPen(st::boxTextFg);
-	int32 w = st::boxWidth - st::boxPadding.left() * 1.5;
-	p.drawText(QRect(st::boxPadding.left(), _recoverCode->y() - st::passcodeTextLine - st::passcodePadding.top(), w, st::passcodePadding.top() + st::passcodeTextLine), _pattern, style::al_left);
 
 	if (!_error.isEmpty()) {
 		p.setPen(st::boxTextFgError);
-		p.drawText(QRect(st::boxPadding.left(), _recoverCode->y() + _recoverCode->height(), w, st::passcodeTextLine), _error, style::al_left);
+		p.drawText(
+			QRect(
+				st::boxPadding.left(),
+				_recoverCode->y() + _recoverCode->height(),
+				_textWidth,
+				st::passcodeTextLine),
+			_error,
+			style::al_left);
 	}
 }
 
 void RecoverBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 
-	_recoverCode->resize(st::boxWidth - st::boxPadding.left() - st::boxPadding.right(), _recoverCode->height());
-	_recoverCode->moveToLeft(st::boxPadding.left(), st::passcodePadding.top() + st::passcodePadding.bottom() + st::passcodeTextLine);
+	_patternLabel->resizeToWidth(_textWidth);
+	_patternLabel->moveToLeft(
+		st::boxPadding.left(),
+		st::passcodePadding.top());
+
+	_recoverCode->resize(
+		st::boxWidth - st::boxPadding.left() - st::boxPadding.right(),
+		_recoverCode->height());
+	_recoverCode->moveToLeft(
+		st::boxPadding.left(),
+		rect::m::sum::v(st::passcodePadding) + _patternLabel->height());
 	if (_noEmailAccess) {
-		_noEmailAccess->moveToLeft(st::boxPadding.left(), _recoverCode->y() + _recoverCode->height() + (st::passcodeTextLine - _noEmailAccess->height()) / 2);
+		_noEmailAccess->moveToLeft(
+			st::boxPadding.left(),
+			rect::bottom(_recoverCode)
+				+ (st::passcodeTextLine - _noEmailAccess->height()) / 2);
 	}
+
+	updateHeight();
 }
 
 void RecoverBox::setInnerFocus() {
@@ -1307,8 +1342,8 @@ void RecoverBox::proceedToChange(const QString &code) {
 	auto box = Box<PasscodeBox>(_session, fields);
 
 	box->boxClosing(
-	) | rpl::start_with_next([=] {
-		const auto weak = Ui::MakeWeak(this);
+	) | rpl::on_next([=] {
+		const auto weak = base::make_weak(this);
 		if (const auto onstack = _closeParent) {
 			onstack();
 		}
@@ -1318,7 +1353,7 @@ void RecoverBox::proceedToChange(const QString &code) {
 	}, lifetime());
 
 	box->newPasswordSet(
-	) | rpl::start_with_next([=](QByteArray &&password) {
+	) | rpl::on_next([=](QByteArray &&password) {
 		_newPasswordSet.fire(std::move(password));
 	}, lifetime());
 
@@ -1364,7 +1399,7 @@ RecoveryEmailValidation ConfirmRecoveryEmail(
 	const auto errors = std::make_shared<rpl::event_stream<QString>>();
 	const auto resent = std::make_shared<rpl::event_stream<QString>>();
 	const auto requestId = std::make_shared<mtpRequestId>(0);
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto reloads = std::make_shared<rpl::event_stream<>>();
 	const auto cancels = std::make_shared<rpl::event_stream<>>();
 
diff --git a/Telegram/SourceFiles/boxes/passcode_box.h b/Telegram/SourceFiles/boxes/passcode_box.h
index b651cda64a8580..5ab6413fc25215 100644
--- a/Telegram/SourceFiles/boxes/passcode_box.h
+++ b/Telegram/SourceFiles/boxes/passcode_box.h
@@ -53,7 +53,7 @@ class PasscodeBox : public Ui::BoxContent {
 		// Check cloud password for some action.
 		using CustomCheck = Fn<void(
 			const Core::CloudPasswordResult &,
-			QPointer<PasscodeBox>)>;
+			base::weak_qptr<PasscodeBox>)>;
 		CustomCheck customCheckCallback;
 		rpl::producer<QString> customTitle;
 		std::optional<QString> customDescription;
@@ -154,10 +154,11 @@ class PasscodeBox : public Ui::BoxContent {
 
 	Main::Session *_session = nullptr;
 	MTP::Sender _api;
+	const int _textWidth;
 
 	QString _pattern;
 
-	QPointer<Ui::BoxContent> _replacedBy;
+	base::weak_qptr<Ui::BoxContent> _replacedBy;
 	bool _turningOff = false;
 	bool _cloudPwd = false;
 	CloudFields _cloudFields;
@@ -219,17 +220,18 @@ class RecoverBox final : public Ui::BoxContent {
 	void proceedToChange(const QString &code);
 	void checkSubmitFail(const MTP::Error &error);
 	void setError(const QString &error);
+	void updateHeight();
 
 	Main::Session *_session = nullptr;
 	MTP::Sender _api;
+	const int _textWidth;
 	mtpRequestId _submitRequest = 0;
 
-	QString _pattern;
-
 	PasscodeBox::CloudFields _cloudFields;
 
 	object_ptr<Ui::InputField> _recoverCode;
 	object_ptr<Ui::LinkButton> _noEmailAccess;
+	object_ptr<Ui::FlatLabel> _patternLabel;
 	Fn<void()> _closeParent;
 
 	QString _error;
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index b0f3c0a50cdefb..5d12821baae979 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #include "boxes/peer_list_box.h"
 
+#include "boxes/peer_list_section_headers.h"
+#include "boxes/peer_list_section_index.h"
 #include "history/history.h" // chatListNameSortKey.
 #include "main/session/session_show.h"
 #include "main/main_session.h"
@@ -30,6 +32,7 @@ For license and copyright information please follow this link:
 #include "data/data_chat.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "base/unixtime.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
@@ -105,21 +108,25 @@ PeerListBox::PeerListBox(
 void PeerListBox::createMultiSelect() {
 	Expects(_select == nullptr);
 
+	auto placeholder = _controller->searchPlaceholder();
 	auto entity = object_ptr<Ui::MultiSelect>(
 		this,
 		(_controller->selectSt()
 			? *_controller->selectSt()
 			: st::defaultMultiSelect),
-		tr::lng_participant_filter());
+		placeholder ? std::move(placeholder) : tr::lng_participant_filter());
 	_select.create(this, std::move(entity));
 	_select->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { updateScrollSkips(); },
 		lifetime());
 	_select->entity()->setSubmittedCallback([=](Qt::KeyboardModifiers) {
 		content()->submitted();
 	});
 	_select->entity()->setQueryChangedCallback([=](const QString &query) {
+		if (_customQueryChangedCallback) {
+			_customQueryChangedCallback(query);
+		}
 		searchQueryChanged(query);
 	});
 	_select->entity()->setItemRemovedCallback([=](uint64 itemId) {
@@ -135,11 +142,16 @@ void PeerListBox::createMultiSelect() {
 		}
 	});
 	_select->resizeToWidth(_controller->contentWidth());
-	_select->moveToLeft(0, 0);
+	_select->moveToLeft(0, topSelectSkip());
+}
+
+void PeerListBox::appendQueryChangedCallback(Fn<void(QString)> callback) {
+	_customQueryChangedCallback = std::move(callback);
 }
 
-void PeerListBox::setAddedTopScrollSkip(int skip) {
+void PeerListBox::setAddedTopScrollSkip(int skip, bool aboveSearch) {
 	_addedTopScrollSkip = skip;
+	_addedTopScrollAboveSearch = aboveSearch;
 	_scrollBottomFixed = false;
 	updateScrollSkips();
 }
@@ -148,7 +160,7 @@ void PeerListBox::showFinished() {
 	_controller->showFinished();
 }
 
-int PeerListBox::getTopScrollSkip() const {
+int PeerListBox::topScrollSkip() const {
 	auto result = _addedTopScrollSkip;
 	if (_select && !_select->isHidden()) {
 		result += _select->height();
@@ -156,12 +168,19 @@ int PeerListBox::getTopScrollSkip() const {
 	return result;
 }
 
+int PeerListBox::topSelectSkip() const {
+	return _addedTopScrollAboveSearch ? _addedTopScrollSkip : 0;
+}
+
 void PeerListBox::updateScrollSkips() {
 	// If we show / hide the search field scroll top is fixed.
 	// If we resize search field by bubbles scroll bottom is fixed.
-	setInnerTopSkip(getTopScrollSkip(), _scrollBottomFixed);
-	if (_select && !_select->animating()) {
-		_scrollBottomFixed = true;
+	setInnerTopSkip(topScrollSkip(), _scrollBottomFixed);
+	if (_select) {
+		_select->moveToLeft(0, topSelectSkip());
+		if (!_select->animating()) {
+			_scrollBottomFixed = true;
+		}
 	}
 }
 
@@ -176,7 +195,7 @@ void PeerListBox::prepare() {
 	_controller->setDelegate(this);
 
 	_controller->boxHeightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(_controller->contentWidth(), height);
 	}, lifetime());
 
@@ -188,13 +207,22 @@ void PeerListBox::prepare() {
 	}
 
 	content()->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		scrollToY(request.ymin, request.ymax);
 	}, lifetime());
 
 	if (_init) {
 		_init(this);
 	}
+
+	{
+		setDimensions(
+			_controller->contentWidth(),
+			std::clamp(
+				content()->height(),
+				st::boxMaxListHeight,
+				st::boxMaxListHeight * 3));
+	}
 }
 
 void PeerListBox::keyPressEvent(QKeyEvent *e) {
@@ -206,7 +234,9 @@ void PeerListBox::keyPressEvent(QKeyEvent *e) {
 		content()->selectSkipPage(height(), 1);
 	} else if (e->key() == Qt::Key_PageUp) {
 		content()->selectSkipPage(height(), -1);
-	} else if (e->key() == Qt::Key_Escape && _select && !_select->entity()->getQuery().isEmpty()) {
+	} else if (e->key() == Qt::Key_Escape
+			&& _select
+			&& !_select->entity()->getQuery().isEmpty()) {
 		_select->entity()->clearQuery();
 	} else {
 		BoxContent::keyPressEvent(e);
@@ -216,6 +246,80 @@ void PeerListBox::keyPressEvent(QKeyEvent *e) {
 void PeerListBox::searchQueryChanged(const QString &query) {
 	scrollToY(0);
 	content()->searchQueryChanged(query);
+	refreshSectionIndex();
+}
+
+void PeerListBox::peerListSetShowSectionHeaders(bool shown) {
+	PeerListContentDelegate::peerListSetShowSectionHeaders(shown);
+	if (!shown) {
+		if (_sectionIndex) {
+			_sectionIndex.destroy();
+		}
+		return;
+	}
+	if (!_sectionIndex) {
+		_sectionIndex.create(this);
+		_sectionIndex->setJumpCallback([=](
+				int contentTop,
+				anim::type animated) {
+			scrollTo({ contentTop, contentTop + scrollHeight() }, animated);
+		});
+		_sectionIndex->setScrollCallback([=](not_null<QWheelEvent*> e) {
+			sendScrollViewportEvent(e);
+		});
+		content()->heightValue(
+		) | rpl::on_next([=] {
+			refreshSectionIndex();
+		}, _sectionIndex->lifetime());
+		scrolls(
+		) | rpl::on_next([=] {
+			if (_sectionIndex && !_sectionIndex->isHidden()) {
+				_sectionIndex->setVisibleLetters(
+					content()->visibleSectionLetters());
+			}
+		}, _sectionIndex->lifetime());
+	}
+	refreshSectionIndex();
+}
+
+void PeerListBox::refreshSectionIndex() {
+	if (!_sectionIndex) {
+		return;
+	}
+	auto letters = content()->sectionLetters();
+	const auto shown = (letters.size() >= 2);
+	if (shown) {
+		auto entries = std::vector<PeerListSectionIndex::Entry>();
+		entries.reserve(letters.size());
+		for (auto &letter : letters) {
+			entries.push_back({
+				std::move(letter.letter),
+				letter.contentTop,
+			});
+		}
+		_sectionIndex->setLetters(std::move(entries));
+		_sectionIndex->setVisibleLetters(content()->visibleSectionLetters());
+		updateSectionIndexGeometry();
+	}
+	_sectionIndex->setVisible(shown);
+}
+
+void PeerListBox::updateSectionIndexGeometry() {
+	if (!_sectionIndex) {
+		return;
+	}
+	const auto skip = topScrollSkip();
+	const auto indexWidth = _sectionIndex->idealWidth();
+	const auto scrollBar = st::boxScroll.width;
+	const auto left = style::RightToLeft()
+		? scrollBar
+		: (width() - scrollBar - indexWidth);
+	_sectionIndex->setGeometry(
+		left,
+		skip,
+		indexWidth,
+		height() - skip);
+	_sectionIndex->raise();
 }
 
 void PeerListBox::resizeEvent(QResizeEvent *e) {
@@ -223,12 +327,11 @@ void PeerListBox::resizeEvent(QResizeEvent *e) {
 
 	if (_select) {
 		_select->resizeToWidth(width());
-		_select->moveToLeft(0, 0);
-
 		updateScrollSkips();
 	}
 
 	content()->resizeToWidth(width());
+	updateSectionIndexGeometry();
 }
 
 void PeerListBox::paintEvent(QPaintEvent *e) {
@@ -258,20 +361,21 @@ void PeerListBox::setInnerFocus() {
 void PeerListBox::peerListSetRowChecked(
 		not_null<PeerListRow*> row,
 		bool checked) {
+	const auto trackSelected = _controller->trackSelectedList();
 	if (checked) {
-		if (_controller->trackSelectedList()) {
+		if (trackSelected) {
 			addSelectItem(row, anim::type::normal);
 		}
 		PeerListContentDelegate::peerListSetRowChecked(row, checked);
 		peerListUpdateRow(row);
 
 		// This call deletes row from _searchRows.
-		if (_select) {
+		if (_select && trackSelected) {
 			_select->entity()->clearQuery();
 		}
 	} else {
 		// The itemRemovedCallback will call changeCheckState() here.
-		if (_select) {
+		if (_select && trackSelected) {
 			_select->entity()->removeItem(row->id());
 		} else {
 			PeerListContentDelegate::peerListSetRowChecked(row, checked);
@@ -334,6 +438,16 @@ const style::MultiSelect &PeerListController::computeSelectSt() const {
 	return _selectSt ? *_selectSt : st::defaultMultiSelect;
 }
 
+void PeerListController::showFinished() {
+	if (const auto onstack = _showFinished) {
+		onstack();
+	}
+}
+
+void PeerListController::setShowFinishedCallback(Fn<void()> callback) {
+	_showFinished = std::move(callback);
+}
+
 bool PeerListController::hasComplexSearch() const {
 	return (_searchController != nullptr);
 }
@@ -472,7 +586,7 @@ void PeerListBox::addSelectItem(
 void PeerListBox::addSelectItem(
 		uint64 itemId,
 		const QString &text,
-		Ui::MultiSelect::PaintRoundImage paintUserpic,
+		PaintRoundImageCallback paintUserpic,
 		anim::type animated) {
 	if (!_select) {
 		createMultiSelect();
@@ -543,6 +657,14 @@ auto PeerListBox::collectSelectedRows()
 	return result;
 }
 
+rpl::producer<int> PeerListBox::multiSelectHeightValue() const {
+	return _select ? _select->heightValue() : rpl::single(0);
+}
+
+rpl::producer<> PeerListBox::noSearchSubmits() const {
+	return content()->noSearchSubmits();
+}
+
 PeerListRow::PeerListRow(not_null<PeerData*> peer)
 : PeerListRow(peer, peer->id.value) {
 }
@@ -691,7 +813,7 @@ void PeerListRow::elementsPaint(
 }
 
 QString PeerListRow::generateName() {
-	return peer()->name();
+	return peer()->userpicPaintingPeer()->name();
 }
 
 QString PeerListRow::generateShortName() {
@@ -701,7 +823,7 @@ QString PeerListRow::generateShortName() {
 		? tr::lng_replies_messages(tr::now)
 		: _isVerifyCodesChat
 		? tr::lng_verification_codes(tr::now)
-		: peer()->shortName();
+		: peer()->userpicPaintingPeer()->shortName();
 }
 
 Ui::PeerUserpicView &PeerListRow::ensureUserpicView() {
@@ -717,7 +839,7 @@ PaintRoundImageCallback PeerListRow::generatePaintUserpicCallback(
 	const auto replies = _isRepliesMessagesChat;
 	const auto peer = this->peer();
 	auto userpic = saved ? Ui::PeerUserpicView() : ensureUserpicView();
-	if (forceRound && peer->isForum()) {
+	if (forceRound && (peer->isForum() || peer->isMonoforum())) {
 		return ForceRoundUserpicCallback(peer);
 	}
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
@@ -733,6 +855,17 @@ PaintRoundImageCallback PeerListRow::generatePaintUserpicCallback(
 }
 
 
+void PeerListRow::rememberUserpicKey() {
+	if (!special()) {
+		_userpicKey = peer()->userpicUniqueKey(ensureUserpicView());
+	}
+}
+
+bool PeerListRow::userpicKeyChanged() {
+	return !special()
+		&& (peer()->userpicUniqueKey(ensureUserpicView()) != _userpicKey);
+}
+
 auto PeerListRow::generateNameFirstLetters() const
 -> const base::flat_set<QChar> & {
 	return peer()->nameFirstLetters();
@@ -764,6 +897,7 @@ int PeerListRow::paintNameIconGetWidth(
 		int availableWidth,
 		int outerWidth,
 		bool selected) {
+	_statusIconRect = QRect();
 	if (_skipPeerBadge
 		|| special()
 		|| !_savedMessagesStatus.isEmpty()
@@ -771,31 +905,74 @@ int PeerListRow::paintNameIconGetWidth(
 		|| _isVerifyCodesChat) {
 		return 0;
 	}
-	return _badge.drawGetWidth(
-		p,
-		QRect(
+	const auto width = _badge.drawGetWidth(p, {
+		.peer = peer(),
+		.rectForName = QRect(
 			nameLeft,
 			nameTop,
 			availableWidth,
 			st::semiboldFont->height),
-		nameWidth,
-		outerWidth,
-		{
-			.peer = peer(),
-			.verified = &(selected
-				? st::dialogsVerifiedIconOver
-				: st::dialogsVerifiedIcon),
-			.premium = &(selected
-				? st::dialogsPremiumIcon.over
-				: st::dialogsPremiumIcon.icon),
-			.scam = &(selected ? st::dialogsScamFgOver : st::dialogsScamFg),
-			.premiumFg = &(selected
-				? st::dialogsVerifiedIconBgOver
-				: st::dialogsVerifiedIconBg),
-			.customEmojiRepaint = repaint,
-			.now = now,
-			.paused = false,
-		});
+		.nameWidth = nameWidth,
+		.outerWidth = outerWidth,
+		.verified = &(selected
+			? st::dialogsVerifiedIconOver
+			: st::dialogsVerifiedIcon),
+		.premium = &(selected
+			? st::dialogsPremiumIcon.over
+			: st::dialogsPremiumIcon.icon),
+		.scam = &(selected ? st::dialogsScamFgOver : st::dialogsScamFg),
+		.direct = &(selected
+			? st::windowSubTextFgOver
+			: st::windowSubTextFg),
+		.premiumFg = &(selected
+			? st::dialogsVerifiedIconBgOver
+			: st::dialogsVerifiedIconBg),
+		.customEmojiRepaint = repaint,
+		.now = now,
+		.paused = false,
+	});
+	_statusIconRect = _badge.emojiStatusRect();
+	return width;
+}
+
+int PeerListRow::paintNameIconGetLeadingWidth(
+		Painter &p,
+		Fn<void()> repaint,
+		crl::time now,
+		int nameLeft,
+		int nameTop,
+		int outerWidth,
+		bool selected) {
+	if (_skipPeerBadge
+		|| special()
+		|| !_savedMessagesStatus.isEmpty()
+		|| _isRepliesMessagesChat
+		|| _isVerifyCodesChat) {
+		return 0;
+	}
+	const auto info = peer()->botVerifyDetails();
+	if (!info) {
+		return 0;
+	}
+	if (!_badge.ready(info)) {
+		_badge.set(
+			info,
+			peer()->owner().customEmojiManager().factory(
+				Data::CustomEmojiSizeTag::Isolated),
+			std::move(repaint));
+	}
+	const auto &st = selected
+		? st::dialogsVerifiedColorsOver
+		: st::dialogsVerifiedColors;
+	const auto skip = _badge.drawVerified(
+		p,
+		QPoint(nameLeft, nameTop),
+		st);
+	return skip;// ? skip + st::dialogsChatTypeSkip) : 0;
+}
+
+void PeerListRow::paintStatusIcon(Painter &p, crl::time now, bool paused) {
+	_badge.paintEmojiStatusFrame(p, now, paused);
 }
 
 void PeerListRow::paintStatusText(
@@ -858,6 +1035,8 @@ void PeerListRow::paintUserpic(
 	} else if (const auto callback = generatePaintUserpicCallback(false)) {
 		callback(p, x, y, outerWidth, st.photoSize);
 	}
+	rememberUserpicKey();
+	paintUserpicOverlay(p, st, x, y, outerWidth);
 }
 
 // Emulates Ui::RoundImageCheckbox::paint() in a checked state.
@@ -897,7 +1076,13 @@ void PeerListRow::paintDisabledCheckUserpic(
 
 		p.setPen(userpicBorderPen);
 		p.setBrush(Qt::NoBrush);
-		p.drawEllipse(userpicEllipse);
+		if (peer()->forum()) {
+			const auto radius = userpicDiameter
+				* Ui::ForumUserpicRadiusMultiplier();
+			p.drawRoundedRect(userpicEllipse, radius, radius);
+		} else {
+			p.drawEllipse(userpicEllipse);
+		}
 
 		p.setPen(iconBorderPen);
 		p.setBrush(st.disabledCheckFg);
@@ -952,10 +1137,11 @@ void PeerListRow::setCheckedInternal(bool checked, anim::type animated) {
 }
 
 void PeerListRow::setCustomizedCheckSegments(
-		std::vector<Ui::OutlineSegment> segments) {
+		std::vector<Ui::OutlineSegment> segments,
+		bool liveBadge) {
 	Expects(_checkbox != nullptr);
 
-	_checkbox->setCustomizedSegments(std::move(segments));
+	_checkbox->setCustomizedSegments(std::move(segments), liveBadge);
 }
 
 void PeerListRow::finishCheckedAnimation() {
@@ -968,26 +1154,29 @@ PeerListContent::PeerListContent(
 : RpWidget(parent)
 , _st(controller->computeListSt())
 , _controller(controller)
-, _rowHeight(_st.item.height) {
+, _rowHeight(_st.item.height)
+, _rowsScrollCache([this] { update(); }) {
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
+		invalidateLoadedUserpics();
 		update();
 	}, lifetime());
 
 	using UpdateFlag = Data::PeerUpdate::Flag;
 	_controller->session().changes().peerUpdates(
 		UpdateFlag::Name | UpdateFlag::Photo | UpdateFlag::EmojiStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		if (update.flags & UpdateFlag::Name) {
 			handleNameChanged(update.peer);
 		}
 		if (update.flags & UpdateFlag::Photo) {
+			invalidateLoadedUserpics();
 			this->update();
 		}
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		invalidatePixmapsCache();
 	}, lifetime());
 
@@ -1207,9 +1396,11 @@ std::optional<QPoint> PeerListContent::lastRowMousePosition() const {
 	auto in = parentWidget()->rect().contains(
 		parentWidget()->mapFromGlobal(*_lastMousePosition));
 	auto rowsPointY = point.y() - rowsTop();
-	const auto index = (in
-		&& rowsPointY >= 0
-		&& rowsPointY < shownRowsCount() * _rowHeight)
+	const auto index = (!in || rowsPointY < 0)
+		? -1
+		: sectionsShown()
+		? _sections->rowFromY(rowsPointY)
+		: (rowsPointY < shownRowsCount() * _rowHeight)
 		? (rowsPointY / _rowHeight)
 		: -1;
 	return (index >= 0 && index == _selected.index.value)
@@ -1264,6 +1455,9 @@ void PeerListContent::clearAllContent() {
 		= _normalizedSearchQuery
 		= _mentionHighlight
 		= QString();
+	if (_controller->hasComplexSearch()) {
+		_controller->search(QString());
+	}
 }
 
 void PeerListContent::convertRowToSearchResult(not_null<PeerListRow*> row) {
@@ -1352,10 +1546,10 @@ void PeerListContent::initDecorateWidget(Ui::RpWidget *widget) {
 		widget->events(
 		) | rpl::filter([=](not_null<QEvent*> e) {
 			return (e->type() == QEvent::Enter) && widget->isVisible();
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			mouseLeftGeometry();
 		}, widget->lifetime());
-		widget->heightValue() | rpl::skip(1) | rpl::start_with_next([=] {
+		widget->heightValue() | rpl::skip(1) | rpl::on_next([=] {
 			resizeToWidth(width());
 		}, widget->lifetime());
 	}
@@ -1385,10 +1579,12 @@ int PeerListContent::labelHeight() const {
 
 void PeerListContent::refreshRows() {
 	if (!_hiddenRows.empty()) {
-		_filterResults.clear();
-		for (const auto &row : _rows) {
-			if (!row->hidden()) {
-				_filterResults.push_back(row.get());
+		if (!_ignoreHiddenRowsOnSearch || _normalizedSearchQuery.isEmpty()) {
+			_filterResults.clear();
+			for (const auto &row : _rows) {
+				if (!row->hidden()) {
+					_filterResults.push_back(row.get());
+				}
 			}
 		}
 	}
@@ -1424,7 +1620,8 @@ void PeerListContent::setSearchMode(PeerListSearchMode mode) {
 					_loadingAnimation = Ui::CreateLoadingPeerListItemWidget(
 						this,
 						_st.item,
-						2);
+						2,
+						_controller->computeListSt().bg->c);
 				}
 			}
 		} else {
@@ -1456,17 +1653,43 @@ void PeerListContent::paintEvent(QPaintEvent *e) {
 	const auto yTo = clip.y() + clip.height() - rowsTopCached;
 	p.translate(0, rowsTopCached);
 	const auto count = shownRowsCount();
-	if (count > 0) {
+	const auto handleRepaintAfter = [&](crl::time repaintAfter) {
+		if (repaintAfter > 0
+			&& (repaintAfterMin < 0
+				|| repaintAfterMin > repaintAfter)) {
+			repaintAfterMin = repaintAfter;
+		}
+	};
+	if (count > 0 && sectionsShown()) {
+		const auto headerHeight = st::contactsSortHeaderHeight;
+		for (auto index = 0; index != count; ++index) {
+			const auto top = _sections->contentTop(index);
+			if (top >= yTo) {
+				break;
+			}
+			const auto hasHeader = _sections->hasHeader(index);
+			const auto headerTop = hasHeader ? (top - headerHeight) : top;
+			if (top + _rowHeight <= yFrom && headerTop <= yFrom) {
+				continue;
+			}
+			if (hasHeader) {
+				p.translate(0, headerTop);
+				_sections->paint(
+					p,
+					width(),
+					getRow(RowIndex(index))->section());
+				p.translate(0, -headerTop);
+			}
+			p.translate(0, top);
+			handleRepaintAfter(paintRow(p, now, RowIndex(index)));
+			p.translate(0, -top);
+		}
+	} else if (count > 0) {
 		const auto from = floorclamp(yFrom, _rowHeight, 0, count);
 		const auto to = ceilclamp(yTo, _rowHeight, 0, count);
 		p.translate(0, from * _rowHeight);
 		for (auto index = from; index != to; ++index) {
-			const auto repaintAfter = paintRow(p, now, RowIndex(index));
-			if (repaintAfter > 0
-				&& (repaintAfterMin < 0
-					|| repaintAfterMin > repaintAfter)) {
-				repaintAfterMin = repaintAfter;
-			}
+			handleRepaintAfter(paintRow(p, now, RowIndex(index)));
 			p.translate(0, _rowHeight);
 		}
 	}
@@ -1479,6 +1702,7 @@ void PeerListContent::paintEvent(QPaintEvent *e) {
 int PeerListContent::resizeGetHeight(int newWidth) {
 	const auto rowsCount = shownRowsCount();
 	const auto hideAll = !rowsCount && _hideEmpty;
+	refreshSectionHeaders();
 	_aboveHeight = 0;
 	if (_aboveWidget) {
 		_aboveWidget->resizeToWidth(newWidth);
@@ -1502,7 +1726,7 @@ int PeerListContent::resizeGetHeight(int newWidth) {
 	}
 	const auto labelTop = rowsTop()
 		+ std::max(
-			shownRowsCount() * _rowHeight,
+			sectionsFullHeight(),
 			_controller->descriptionTopSkipMin());
 	const auto labelWidth = newWidth - 2 * st::contactsPadding.left();
 	if (_description) {
@@ -1660,6 +1884,10 @@ void PeerListContent::mousePressReleased(Qt::MouseButton button) {
 				_controller->rowClicked(row);
 			}
 		}
+	} else if (button == Qt::MiddleButton && pressed == _selected) {
+		if (auto row = getRow(pressed.index)) {
+			_controller->rowMiddleClicked(row);
+		}
 	}
 }
 
@@ -1762,7 +1990,6 @@ crl::time PeerListContent::paintRow(
 		? std::max(refreshStatusAt - now, crl::time(1))
 		: 0;
 
-	const auto peer = row->special() ? nullptr : row->peer().get();
 	const auto active = (_contexted.index.value >= 0)
 		? _contexted
 		: (_pressed.index.value >= 0)
@@ -1776,6 +2003,48 @@ crl::time PeerListContent::paintRow(
 		return refreshStatusIn;
 	}
 
+	const auto activeElement = (active.index == index) ? active.element : 0;
+	if (_rowsScrollCache.scrolling()
+		&& !selected
+		&& !activeElement
+		&& width() > 0
+		&& row->opacity() == 1.) {
+		const auto ratio = style::DevicePixelRatio();
+		_rowsScrollCache.paintRow(
+			p,
+			row->id(),
+			QSize(width(), _rowHeight) * ratio,
+			ratio,
+			[&](QImage &image) {
+				auto q = Painter(&image);
+				paintRowContent(q, now, index, false, 0);
+				const auto statusRect = row->statusIconRect();
+				if (!statusRect.isEmpty()) {
+					q.fillRect(statusRect, st.button.textBg);
+				}
+			});
+		if (!row->statusIconRect().isEmpty()) {
+			row->paintStatusIcon(p, now, false);
+		}
+		return refreshStatusIn;
+	}
+	paintRowContent(p, now, index, selected, activeElement);
+	return refreshStatusIn;
+}
+
+void PeerListContent::paintRowContent(
+		Painter &p,
+		crl::time now,
+		RowIndex index,
+		bool selected,
+		int activeElement) {
+	const auto row = getRow(index);
+	Assert(row != nullptr);
+
+	const auto &st = row->computeSt(_st.item);
+	const auto outerWidth = width();
+	const auto peer = row->special() ? nullptr : row->peer().get();
+
 	const auto opacity = row->opacity();
 	const auto &bg = selected
 		? st.button.textBgOver
@@ -1831,19 +2100,28 @@ crl::time PeerListContent::paintRow(
 			+ rightActionMargins.right()
 			- skipRight;
 	}
-	namew -= row->paintNameIconGetWidth(
+	const auto leading = row->paintNameIconGetLeadingWidth(
 		p,
 		[=] { updateRow(row); },
 		now,
 		namex,
 		namey,
+		width(),
+		selected);
+	namew -= leading;
+	namew -= row->paintNameIconGetWidth(
+		p,
+		[=] { updateRowStatus(row); },
+		now,
+		namex + leading,
+		namey,
 		name.maxWidth(),
 		namew,
 		width(),
 		selected);
 	auto nameCheckedRatio = row->disabled() ? 0. : row->checkedRatio();
 	p.setPen(anim::pen(st.nameFg, st.nameFgChecked, nameCheckedRatio));
-	name.drawLeftElided(p, namex, namey, namew, width());
+	name.drawLeftElided(p, namex + leading, namey, namew, width());
 
 	p.setFont(st::contactsStatusFont);
 	if (row->isSearchResult()
@@ -1878,9 +2156,7 @@ crl::time PeerListContent::paintRow(
 		p,
 		width(),
 		selected,
-		(active.index == index) ? active.element : 0);
-
-	return refreshStatusIn;
+		activeElement);
 }
 
 PeerListContent::SkipResult PeerListContent::selectSkip(int direction) {
@@ -1944,12 +2220,23 @@ PeerListContent::SkipResult PeerListContent::selectSkip(int direction) {
 		}
 	}
 
+	if (_controller->overrideKeyboardNavigation(
+			direction,
+			_selected.index.value,
+			newSelectedIndex)) {
+		return { _selected.index.value, _selected.index.value };
+	}
+
 	_selected.index.value = newSelectedIndex;
 	_selected.element = 0;
 	if (newSelectedIndex >= 0) {
-		auto top = (newSelectedIndex > 0) ? getRowTop(RowIndex(newSelectedIndex)) : 0;
+		auto top = (newSelectedIndex > 0) ? getRowTop(RowIndex(newSelectedIndex)) : _aboveHeight;
 		auto bottom = (newSelectedIndex + 1 < rowsCount) ? getRowTop(RowIndex(newSelectedIndex + 1)) : height();
 		_scrollToRequests.fire({ top, bottom });
+	} else if (!_selected.index.value && direction < 0) {
+		auto top = 0;
+		auto bottom = _aboveHeight;
+		_scrollToRequests.fire({ top, bottom });
 	}
 
 	update();
@@ -2037,6 +2324,32 @@ void PeerListContent::loadProfilePhotos() {
 	}
 }
 
+void PeerListContent::invalidateLoadedUserpics() {
+	if (!_rowsScrollCache.scrolling() || _visibleTop >= _visibleBottom) {
+		return;
+	}
+	const auto rowsCount = shownRowsCount();
+	if (rowsCount <= 0) {
+		return;
+	}
+	auto from = _visibleTop / _rowHeight;
+	if (from < 0) {
+		from = 0;
+	} else if (from >= rowsCount) {
+		return;
+	}
+	auto to = (_visibleBottom / _rowHeight) + 1;
+	if (to > rowsCount) {
+		to = rowsCount;
+	}
+	for (auto index = from; index != to; ++index) {
+		const auto row = getRow(RowIndex(index));
+		if (row->userpicKeyChanged()) {
+			_rowsScrollCache.invalidate(row->id());
+		}
+	}
+}
+
 void PeerListContent::checkScrollForPreload() {
 	if (_visibleBottom + PreloadHeightsCount * (_visibleBottom - _visibleTop) >= height()) {
 		_controller->loadMoreRows();
@@ -2046,10 +2359,13 @@ void PeerListContent::checkScrollForPreload() {
 void PeerListContent::searchQueryChanged(QString query) {
 	const auto searchWordsList = TextUtilities::PrepareSearchWords(query);
 	const auto normalizedQuery = searchWordsList.join(' ');
+	if (_ignoreHiddenRowsOnSearch && !normalizedQuery.isEmpty()) {
+		_filterResults.clear();
+	}
 	if (_normalizedSearchQuery != normalizedQuery) {
 		setSearchQuery(query, normalizedQuery);
 		if (_controller->searchInLocal() && !searchWordsList.isEmpty()) {
-			Assert(_hiddenRows.empty());
+			Assert(_hiddenRows.empty() || _ignoreHiddenRowsOnSearch);
 
 			auto minimalList = (const std::vector<not_null<PeerListRow*>>*)nullptr;
 			for (const auto &searchWord : searchWordsList) {
@@ -2171,6 +2487,9 @@ bool PeerListContent::submitted() {
 			_controller->rowClicked(row);
 			return true;
 		}
+	} else {
+		_noSearchSubmits.fire({});
+		return true;
 	}
 	return false;
 }
@@ -2185,9 +2504,17 @@ void PeerListContent::dragLeft() {
 	clearSelection();
 }
 
+void PeerListContent::setIgnoreHiddenRowsOnSearch(bool value) {
+	_ignoreHiddenRowsOnSearch = value;
+}
+
 void PeerListContent::visibleTopBottomUpdated(
 		int visibleTop,
 		int visibleBottom) {
+	if ((_visibleTop != visibleTop || _visibleBottom != visibleBottom)
+		&& _mode != Mode::Custom) {
+		_rowsScrollCache.markScrolling();
+	}
 	_visibleTop = visibleTop;
 	_visibleBottom = visibleBottom;
 	loadProfilePhotos();
@@ -2247,9 +2574,11 @@ void PeerListContent::selectByMouse(QPoint globalPosition) {
 	auto in = parentWidget()->rect().contains(parentWidget()->mapFromGlobal(globalPosition));
 	auto selected = Selected();
 	auto rowsPointY = point.y() - rowsTop();
-	selected.index.value = (in
-		&& rowsPointY >= 0
-		&& rowsPointY < shownRowsCount() * _rowHeight)
+	selected.index.value = (!in || rowsPointY < 0)
+		? -1
+		: sectionsShown()
+		? _sections->rowFromY(rowsPointY)
+		: (rowsPointY < shownRowsCount() * _rowHeight)
 		? (rowsPointY / _rowHeight)
 		: -1;
 	if (selected.index.value >= 0) {
@@ -2294,11 +2623,88 @@ int PeerListContent::rowsTop() const {
 
 int PeerListContent::getRowTop(RowIndex index) const {
 	if (index.value >= 0) {
-		return rowsTop() + index.value * _rowHeight;
+		return sectionsShown()
+			? (rowsTop() + _sections->contentTop(index.value))
+			: (rowsTop() + index.value * _rowHeight);
 	}
 	return -1;
 }
 
+bool PeerListContent::sectionsShown() const {
+	return _sections && !showingSearch();
+}
+
+void PeerListContent::setShowSectionHeaders(bool shown) {
+	if ((_sections != nullptr) == shown) {
+		return;
+	}
+	_sections = shown
+		? std::make_unique<PeerListSectionHeaders>()
+		: nullptr;
+	resizeToWidth(width());
+	update();
+}
+
+void PeerListContent::refreshSectionHeaders() {
+	if (!sectionsShown()) {
+		if (_sections) {
+			_sections->clear();
+		}
+		return;
+	}
+	_sections->rebuild(shownRowsCount(), _rowHeight, [&](int index) {
+		return getRow(RowIndex(index))->section();
+	});
+}
+
+int PeerListContent::sectionsFullHeight() const {
+	return sectionsShown()
+		? _sections->fullHeight()
+		: (shownRowsCount() * _rowHeight);
+}
+
+std::vector<PeerListContent::SectionLetter> PeerListContent::sectionLetters(
+		) const {
+	auto result = std::vector<SectionLetter>();
+	if (!sectionsShown()) {
+		return result;
+	}
+	const auto count = shownRowsCount();
+	for (auto i = 0; i != count; ++i) {
+		if (_sections->hasHeader(i)) {
+			result.push_back({
+				rowAt(i)->section(),
+				getRowTop(RowIndex(i)) - st::contactsSortHeaderHeight,
+			});
+		}
+	}
+	return result;
+}
+
+base::flat_set<QString> PeerListContent::visibleSectionLetters() const {
+	auto result = base::flat_set<QString>();
+	const auto count = shownRowsCount();
+	if (!sectionsShown() || !count) {
+		return result;
+	}
+	auto low = 0, high = count;
+	while (low < high) {
+		const auto middle = (low + high) / 2;
+		if (getRowTop(RowIndex(middle)) + _rowHeight <= _visibleTop) {
+			low = middle + 1;
+		} else {
+			high = middle;
+		}
+	}
+	for (auto i = low; i != count; ++i) {
+		if (getRowTop(RowIndex(i)) >= _visibleBottom) {
+			break;
+		}
+		result.emplace(rowAt(i)->section());
+	}
+	return result;
+}
+
 void PeerListContent::updateRow(not_null<PeerListRow*> row, RowIndex hint) {
 	updateRow(findRowIndex(row, hint));
 }
@@ -2321,6 +2727,19 @@ void PeerListContent::updateRow(RowIndex index) {
 	update(0, getRowTop(index), width(), _rowHeight);
 }
 
+void PeerListContent::updateRowStatus(not_null<PeerListRow*> row) {
+	const auto index = findRowIndex(row);
+	if (index.value < 0) {
+		return;
+	}
+	const auto rect = row->statusIconRect();
+	if (_rowsScrollCache.scrolling() && !rect.isEmpty()) {
+		update(rect.translated(0, getRowTop(index)));
+	} else {
+		updateRow(index);
+	}
+}
+
 template <typename Callback>
 bool PeerListContent::enumerateShownRows(Callback callback) {
 	return enumerateShownRows(0, shownRowsCount(), std::move(callback));
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 4c4374b84be91d..ca70e47a471723 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 #include "ui/userpic_view.h"
 #include "ui/layers/box_content.h"
 #include "base/timer.h"
+#include "boxes/peer_list_scroll_cache.h"
 
 namespace style {
 struct PeerList;
@@ -37,6 +38,9 @@ class PopupMenu;
 struct OutlineSegment;
 } // namespace Ui
 
+class PeerListSectionHeaders;
+class PeerListSectionIndex;
+
 using PaintRoundImageCallback = Fn<void(
 	Painter &p,
 	int x,
@@ -95,6 +99,13 @@ class PeerListRow {
 	[[nodiscard]] virtual QString generateShortName();
 	[[nodiscard]] virtual auto generatePaintUserpicCallback(
 		bool forceRound) -> PaintRoundImageCallback;
+	virtual void paintUserpicOverlay(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int outerWidth) {
+	}
 
 	[[nodiscard]] virtual auto generateNameFirstLetters() const
 		-> const base::flat_set<QChar> &;
@@ -120,6 +131,23 @@ class PeerListRow {
 		int outerWidth,
 		bool selected);
 
+	virtual int paintNameIconGetLeadingWidth(
+		Painter &p,
+		Fn<void()> repaint,
+		crl::time now,
+		int nameLeft,
+		int nameTop,
+		int outerWidth,
+		bool selected);
+
+	[[nodiscard]] QRect statusIconRect() const {
+		return _statusIconRect;
+	}
+	void paintStatusIcon(Painter &p, crl::time now, bool paused);
+
+	void rememberUserpicKey();
+	[[nodiscard]] bool userpicKeyChanged();
+
 	virtual QSize rightActionSize() const {
 		return QSize();
 	}
@@ -216,7 +244,8 @@ class PeerListRow {
 		setCheckedInternal(checked, animated);
 	}
 	void setCustomizedCheckSegments(
-		std::vector<Ui::OutlineSegment> segments);
+		std::vector<Ui::OutlineSegment> segments,
+		bool liveBadge);
 	void setHidden(bool hidden) {
 		_hidden = hidden;
 	}
@@ -258,6 +287,13 @@ class PeerListRow {
 		_skipPeerBadge = skip;
 	}
 
+	void setSection(const QString &section) {
+		_section = section;
+	}
+	[[nodiscard]] const QString &section() const {
+		return _section;
+	}
+
 	virtual void lazyInitialize(const style::PeerListItem &st);
 	virtual void paintStatusText(
 		Painter &p,
@@ -291,15 +327,18 @@ class PeerListRow {
 	PeerListRowId _id = 0;
 	PeerData *_peer = nullptr;
 	mutable Ui::PeerUserpicView _userpic;
+	std::pair<uint64, uint64> _userpicKey;
 	std::unique_ptr<Ui::RippleAnimation> _ripple;
 	std::unique_ptr<Ui::RoundImageCheckbox> _checkbox;
 	Ui::Text::String _name;
 	Ui::Text::String _status;
 	Ui::PeerBadge _badge;
+	QRect _statusIconRect;
 	StatusType _statusType = StatusType::Online;
 	crl::time _statusValidTill = 0;
 	base::flat_set<QChar> _nameFirstLetters;
 	QString _savedMessagesStatus;
+	QString _section;
 	int _absoluteIndex = -1;
 	State _disabledState = State::Active;
 	bool _hidden : 1 = false;
@@ -330,6 +369,8 @@ class PeerListDelegate {
 	virtual void peerListSetBelowWidget(object_ptr<Ui::RpWidget> belowWidget) = 0;
 	virtual void peerListMouseLeftGeometry() = 0;
 	virtual void peerListSetSearchMode(PeerListSearchMode mode) = 0;
+	virtual void peerListSetShowSectionHeaders(bool shown) {
+	}
 	virtual void peerListAppendRow(std::unique_ptr<PeerListRow> row) = 0;
 	virtual void peerListAppendSearchRow(std::unique_ptr<PeerListRow> row) = 0;
 	virtual void peerListAppendFoundRow(not_null<PeerListRow*> row) = 0;
@@ -357,12 +398,14 @@ class PeerListDelegate {
 	virtual int peerListPartitionRows(Fn<bool(const PeerListRow &a)> border) = 0;
 	virtual std::shared_ptr<Main::SessionShow> peerListUiShow() = 0;
 
+	virtual void peerListSelectSkip(int direction) = 0;
+
 	virtual void peerListPressLeftToContextMenu(bool shown) = 0;
 	virtual bool peerListTrackRowPressFromGlobal(QPoint globalPosition) = 0;
 
 	template <typename PeerDataRange>
 	void peerListAddSelectedPeers(PeerDataRange &&range) {
-		for (const auto peer : range) {
+		for (const auto &peer : range) {
 			peerListAddSelectedPeerInBunch(peer);
 		}
 		peerListFinishSelectedRowsBunch();
@@ -476,10 +519,12 @@ class PeerListController : public PeerListSearchDelegate {
 
 	virtual void prepare() = 0;
 
-	virtual void showFinished() {
-	}
+	virtual void showFinished();
+	void setShowFinishedCallback(Fn<void()> callback);
 
 	virtual void rowClicked(not_null<PeerListRow*> row) = 0;
+	virtual void rowMiddleClicked(not_null<PeerListRow*> row) {
+	}
 	virtual void rowRightActionClicked(not_null<PeerListRow*> row) {
 	}
 
@@ -553,6 +598,9 @@ class PeerListController : public PeerListSearchDelegate {
 	[[nodiscard]] virtual QString savedMessagesChatStatus() const {
 		return QString();
 	}
+	[[nodiscard]] virtual rpl::producer<QString> searchPlaceholder() const {
+		return nullptr;
+	}
 	[[nodiscard]] virtual int customRowHeight() {
 		Unexpected("PeerListController::customRowHeight.");
 	}
@@ -573,6 +621,13 @@ class PeerListController : public PeerListSearchDelegate {
 		Unexpected("PeerListController::customRowRippleMaskGenerator.");
 	}
 
+	virtual bool overrideKeyboardNavigation(
+			int direction,
+			int fromIndex,
+			int toIndex) {
+		return false;
+	}
+
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
@@ -602,6 +657,8 @@ class PeerListController : public PeerListSearchDelegate {
 	const style::PeerList *_listSt = nullptr;
 	const style::MultiSelect *_selectSt = nullptr;
 
+	Fn<void()> _showFinished;
+
 	rpl::lifetime _lifetime;
 
 };
@@ -649,6 +706,16 @@ class PeerListContent : public Ui::RpWidget {
 	PeerListRowId updateFromParentDrag(QPoint globalPosition);
 	void dragLeft();
 
+	void setIgnoreHiddenRowsOnSearch(bool value);
+	void setShowSectionHeaders(bool shown);
+
+	struct SectionLetter {
+		QString letter;
+		int contentTop = 0;
+	};
+	[[nodiscard]] std::vector<SectionLetter> sectionLetters() const;
+	[[nodiscard]] base::flat_set<QString> visibleSectionLetters() const;
+
 	// Interface for the controller.
 	void appendRow(std::unique_ptr<PeerListRow> row);
 	void appendSearchRow(std::unique_ptr<PeerListRow> row);
@@ -701,7 +768,7 @@ class PeerListContent : public Ui::RpWidget {
 		update();
 	}
 
-	std::unique_ptr<PeerListState> saveState() const;
+	[[nodiscard]] std::unique_ptr<PeerListState> saveState() const;
 	void restoreState(std::unique_ptr<PeerListState> state);
 
 	void showRowMenu(
@@ -709,10 +776,14 @@ class PeerListContent : public Ui::RpWidget {
 		bool highlightRow,
 		Fn<void(not_null<Ui::PopupMenu*>)> destroyed);
 
-	auto scrollToRequests() const {
+	[[nodiscard]] auto scrollToRequests() const {
 		return _scrollToRequests.events();
 	}
 
+	[[nodiscard]] auto noSearchSubmits() const {
+		return _noSearchSubmits.events();
+	}
+
 	~PeerListContent();
 
 protected:
@@ -788,10 +859,12 @@ class PeerListContent : public Ui::RpWidget {
 
 	void selectByMouse(QPoint globalPosition);
 	void loadProfilePhotos();
+	void invalidateLoadedUserpics();
 	void checkScrollForPreload();
 
 	void updateRow(not_null<PeerListRow*> row, RowIndex hint);
 	void updateRow(RowIndex row);
+	void updateRowStatus(not_null<PeerListRow*> row);
 	int getRowTop(RowIndex row) const;
 	PeerListRow *getRow(RowIndex element);
 	RowIndex findRowIndex(
@@ -810,6 +883,16 @@ class PeerListContent : public Ui::RpWidget {
 		Fn<void(not_null<Ui::PopupMenu*>)> destroyed = nullptr);
 
 	crl::time paintRow(Painter &p, crl::time now, RowIndex index);
+	void paintRowContent(
+		Painter &p,
+		crl::time now,
+		RowIndex index,
+		bool selected,
+		int activeElement);
+
+	[[nodiscard]] bool sectionsShown() const;
+	void refreshSectionHeaders();
+	[[nodiscard]] int sectionsFullHeight() const;
 
 	void addRowEntry(not_null<PeerListRow*> row);
 	void addToSearchIndex(not_null<PeerListRow*> row);
@@ -867,9 +950,12 @@ class PeerListContent : public Ui::RpWidget {
 	std::vector<not_null<PeerListRow*>> _filterResults;
 	base::flat_set<not_null<PeerListRow*>> _hiddenRows;
 
+	std::unique_ptr<PeerListSectionHeaders> _sections;
+
 	int _aboveHeight = 0;
 	int _belowHeight = 0;
 	bool _hideEmpty = false;
+	bool _ignoreHiddenRowsOnSearch = false;
 	object_ptr<Ui::RpWidget> _aboveWidget = { nullptr };
 	object_ptr<Ui::RpWidget> _aboveSearchWidget = { nullptr };
 	object_ptr<Ui::RpWidget> _belowWidget = { nullptr };
@@ -878,10 +964,14 @@ class PeerListContent : public Ui::RpWidget {
 	object_ptr<Ui::FlatLabel> _searchLoading = { nullptr };
 	object_ptr<Ui::RpWidget> _loadingAnimation = { nullptr };
 
+	rpl::event_stream<> _noSearchSubmits;
+
 	std::vector<std::unique_ptr<PeerListRow>> _searchRows;
 	base::Timer _repaintByStatus;
 	base::unique_qptr<Ui::PopupMenu> _contextMenu;
 
+	PeerListRowsScrollCache _rowsScrollCache;
+
 };
 
 class PeerListContentDelegate : public PeerListDelegate {
@@ -977,6 +1067,9 @@ class PeerListContentDelegate : public PeerListDelegate {
 	void peerListSetSearchMode(PeerListSearchMode mode) override {
 		_content->setSearchMode(mode);
 	}
+	void peerListSetShowSectionHeaders(bool shown) override {
+		_content->setShowSectionHeaders(shown);
+	}
 	void peerListMouseLeftGeometry() override {
 		_content->mouseLeftGeometry();
 	}
@@ -1016,6 +1109,10 @@ class PeerListContentDelegate : public PeerListDelegate {
 		bool highlightRow,
 		Fn<void(not_null<Ui::PopupMenu*>)> destroyed = nullptr) override;
 
+	void peerListSelectSkip(int direction) override {
+		_content->selectSkip(direction);
+	}
+
 	void peerListPressLeftToContextMenu(bool shown) override {
 		_content->pressLeftToContextMenu(shown);
 	}
@@ -1089,6 +1186,8 @@ class PeerListBox
 
 	[[nodiscard]] std::vector<PeerListRowId> collectSelectedIds();
 	[[nodiscard]] std::vector<not_null<PeerData*>> collectSelectedRows();
+	[[nodiscard]] rpl::producer<int> multiSelectHeightValue() const;
+	[[nodiscard]] rpl::producer<> noSearchSubmits() const;
 
 	void peerListSetTitle(rpl::producer<QString> title) override {
 		setTitle(std::move(title));
@@ -1097,6 +1196,7 @@ class PeerListBox
 		setAdditionalTitle(std::move(title));
 	}
 	void peerListSetSearchMode(PeerListSearchMode mode) override;
+	void peerListSetShowSectionHeaders(bool shown) override;
 	void peerListSetRowChecked(
 		not_null<PeerListRow*> row,
 		bool checked) override;
@@ -1109,10 +1209,12 @@ class PeerListBox
 	void peerListScrollToTop() override;
 	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
 
-	void setAddedTopScrollSkip(int skip);
+	void setAddedTopScrollSkip(int skip, bool aboveSearch = false);
 
 	void showFinished() override;
 
+	void appendQueryChangedCallback(Fn<void(QString)>);
+
 protected:
 	void prepare() override;
 	void setInnerFocus() override;
@@ -1143,16 +1245,22 @@ class PeerListBox
 		PaintRoundImageCallback paintUserpic,
 		anim::type animated);
 	void createMultiSelect();
-	int getTopScrollSkip() const;
+	[[nodiscard]] int topScrollSkip() const;
+	[[nodiscard]] int topSelectSkip() const;
 	void updateScrollSkips();
 	void searchQueryChanged(const QString &query);
+	void refreshSectionIndex();
+	void updateSectionIndexGeometry();
 
 	object_ptr<Ui::SlideWrap<Ui::MultiSelect>> _select = { nullptr };
+	object_ptr<PeerListSectionIndex> _sectionIndex = { nullptr };
 
 	const std::shared_ptr<Main::SessionShow> _show;
+	Fn<void(QString)> _customQueryChangedCallback;
 	std::unique_ptr<PeerListController> _controller;
 	Fn<void(PeerListBox*)> _init;
 	bool _scrollBottomFixed = false;
+	bool _addedTopScrollAboveSearch = false;
 	int _addedTopScrollSkip = 0;
 
 };
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 53d56080abbf55..3d62f96e18c49a 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -8,10 +8,11 @@ For license and copyright information please follow this link:
 #include "boxes/peer_list_controllers.h"
 
 #include "api/api_chat_participants.h"
-#include "api/api_premium.h"
+#include "api/api_premium.h" // MessageMoneyRestriction.
 #include "base/random.h"
 #include "boxes/filters/edit_filter_chats_list.h"
-#include "settings/settings_premium.h"
+#include "settings/settings_common.h"
+#include "settings/sections/settings_premium.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/effects/round_checkbox.h"
 #include "ui/text/text_utilities.h"
@@ -23,6 +24,8 @@ For license and copyright information please follow this link:
 #include "ui/ui_utility.h"
 #include "main/main_session.h"
 #include "data/data_peer_values.h"
+#include "data/data_saved_messages.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_channel.h"
@@ -41,14 +44,17 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item.h"
 #include "dialogs/dialogs_main_list.h"
+#include "payments/ui/payments_reaction_box.h"
 #include "ui/effects/outline_segments.h"
 #include "ui/wrap/slide_wrap.h"
+#include "window/window_separate_id.h"
 #include "window/window_session_controller.h" // showAddContact()
 #include "base/unixtime.h"
 #include "styles/style_boxes.h"
 #include "styles/style_profile.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_menu_icons.h"
 
 namespace {
 
@@ -58,12 +64,16 @@ constexpr auto kSearchPerPage = 50;
 } // namespace
 
 object_ptr<Ui::BoxContent> PrepareContactsBox(
-		not_null<Window::SessionController*> sessionController) {
+		not_null<Window::SessionController*> window) {
 	using Mode = ContactsBoxController::SortMode;
 	class Controller final : public ContactsBoxController {
 	public:
 		using ContactsBoxController::ContactsBoxController;
 
+		[[nodiscard]] rpl::producer<not_null<PeerData*>> wheelClicks() const {
+			return _wheelClicks.events();
+		}
+
 	protected:
 		std::unique_ptr<PeerListRow> createRow(
 				not_null<UserData*> user) override {
@@ -72,11 +82,20 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 				: nullptr;
 		}
 
+		void rowMiddleClicked(
+				not_null<PeerListRow*> row) override {
+			_wheelClicks.fire(row->peer());
+		}
+
+	private:
+		rpl::event_stream<not_null<PeerData*>> _wheelClicks;
+
 	};
 	auto controller = std::make_unique<Controller>(
-		&sessionController->session());
+		&window->session());
 	controller->setStyleOverrides(&st::contactsWithStories);
 	controller->setStoriesShown(true);
+	controller->setSectionHeadersShown(true);
 	const auto raw = controller.get();
 	auto init = [=](not_null<PeerListBox*> box) {
 		struct State {
@@ -89,7 +108,7 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
 		box->addLeftButton(
 			tr::lng_profile_add_contact(),
-			[=] { sessionController->showAddContact(); });
+			[=] { window->showAddContact(); });
 		state->toggleSort = box->addTopButton(st::contactsSortButton, [=] {
 			const auto online = (state->mode.current() == Mode::Online);
 			const auto mode = online ? Mode::Alphabet : Mode::Online;
@@ -100,6 +119,17 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 				online ? &st::contactsSortOnlineIconOver : nullptr);
 		});
 		raw->setSortMode(Mode::Online);
+
+		raw->wheelClicks() | rpl::on_next([=](not_null<PeerData*> p) {
+			window->showInNewWindow(p);
+		}, box->lifetime());
+
+		raw->setShowFinishedCallback([=] {
+			window->checkHighlightControl(
+				u"contacts/sort"_q,
+				state->toggleSort,
+				{ .rippleShape = true });
+		});
 	};
 	return Box<PeerListBox>(std::move(controller), std::move(init));
 }
@@ -112,27 +142,36 @@ QBrush PeerListStoriesGradient(const style::PeerList &st) {
 }
 
 std::vector<Ui::OutlineSegment> PeerListStoriesSegments(
-		int count,
-		int unread,
+		PeerListStoriesCounts counts,
 		const QBrush &unreadBrush) {
-	Expects(unread <= count);
-	Expects(count > 0);
+	Expects(counts.unread <= counts.count);
+	Expects(counts.count > 0);
 
 	auto result = std::vector<Ui::OutlineSegment>();
 	const auto add = [&](bool unread) {
 		result.push_back({
-			.brush = unread ? unreadBrush : st::dialogsUnreadBgMuted->b,
+			.brush = (counts.videoStream
+				? st::attentionButtonFg->b
+				: unread
+				? unreadBrush
+				: st::dialogsUnreadBgMuted->b),
 			.width = (unread
 				? st::dialogsStoriesFull.lineTwice / 2.
 				: st::dialogsStoriesFull.lineReadTwice / 2.),
 		});
 	};
-	result.reserve(count);
-	for (auto i = 0, till = count - unread; i != till; ++i) {
-		add(false);
-	}
-	for (auto i = 0; i != unread; ++i) {
+	if (counts.videoStream) {
 		add(true);
+	} else {
+		const auto count = counts.count;
+		const auto unread = counts.unread;
+		result.reserve(count);
+		for (auto i = 0, till = count - unread; i != till; ++i) {
+			add(false);
+		}
+		for (auto i = 0; i != unread; ++i) {
+			add(true);
+		}
 	}
 	return result;
 }
@@ -207,6 +246,7 @@ bool PeerListGlobalSearchController::searchInCache() {
 
 void PeerListGlobalSearchController::searchOnServer() {
 	_requestId = _api.request(MTPcontacts_Search(
+		MTP_flags(0),
 		MTP_string(_query),
 		MTP_int(SearchPeopleLimit)
 	)).done([=](const MTPcontacts_Found &result, mtpRequestId requestId) {
@@ -258,40 +298,71 @@ bool PeerListGlobalSearchController::isLoading() {
 	return _timer.isActive() || _requestId;
 }
 
+struct RecipientRow::Restriction {
+	Api::MessageMoneyRestriction value;
+	RestrictionBadgeCache cache;
+};
+
 RecipientRow::RecipientRow(
 	not_null<PeerData*> peer,
 	const style::PeerListItem *maybeLockedSt,
 	History *maybeHistory)
 : PeerListRow(peer)
 , _maybeHistory(maybeHistory)
-, _resolvePremiumRequired(maybeLockedSt != nullptr) {
-	if (maybeLockedSt
-		&& (Api::ResolveRequiresPremiumToWrite(peer, maybeHistory)
-			== Api::RequirePremiumState::Yes)) {
-		_lockedSt = maybeLockedSt;
+, _maybeLockedSt(maybeLockedSt) {
+	if (_maybeLockedSt) {
+		setRestriction(Api::ResolveMessageMoneyRestrictions(
+			peer,
+			maybeHistory));
 	}
 }
 
-PaintRoundImageCallback RecipientRow::generatePaintUserpicCallback(
-		bool forceRound) {
-	auto result = PeerListRow::generatePaintUserpicCallback(forceRound);
-	if (const auto st = _lockedSt) {
-		return [=](Painter &p, int x, int y, int outerWidth, int size) {
-			result(p, x, y, outerWidth, size);
-			PaintPremiumRequiredLock(p, st, x, y, outerWidth, size);
-		};
+Api::MessageMoneyRestriction RecipientRow::restriction() const {
+	return _restriction
+		? _restriction->value
+		: Api::MessageMoneyRestriction();
+}
+
+void RecipientRow::setRestriction(Api::MessageMoneyRestriction restriction) {
+	if (!restriction) {
+		_restriction = nullptr;
+		return;
+	} else if (!_restriction) {
+		_restriction = std::make_unique<Restriction>();
+	}
+	_restriction->value = restriction;
+}
+
+void RecipientRow::paintUserpicOverlay(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int outerWidth) {
+	if (const auto &r = _restriction) {
+		PaintRestrictionBadge(
+			p,
+			_maybeLockedSt,
+			r->value.starsPerMessage,
+			r->cache,
+			x,
+			y,
+			outerWidth,
+			st.photoSize);
 	}
-	return result;
 }
 
 bool RecipientRow::refreshLock(
 		not_null<const style::PeerListItem*> maybeLockedSt) {
 	if (const auto user = peer()->asUser()) {
-		const auto locked = _resolvePremiumRequired
-			&& (Api::ResolveRequiresPremiumToWrite(user, _maybeHistory)
-				== Api::RequirePremiumState::Yes);
-		if (this->locked() != locked) {
-			setLocked(locked ? maybeLockedSt.get() : nullptr);
+		using Restriction = Api::MessageMoneyRestriction;
+		const auto r = _maybeLockedSt
+			? Api::ResolveMessageMoneyRestrictions(
+				user,
+				_maybeHistory)
+			: Restriction();
+		if ((_restriction ? _restriction->value : Restriction()) != r) {
+			setRestriction(r);
 			return true;
 		}
 	}
@@ -301,23 +372,31 @@ bool RecipientRow::refreshLock(
 void RecipientRow::preloadUserpic() {
 	PeerListRow::preloadUserpic();
 
-	if (!_resolvePremiumRequired) {
+	if (!_maybeLockedSt) {
+		return;
+	}
+	const auto peer = this->peer();
+	const auto known = Api::ResolveMessageMoneyRestrictions(
+		peer,
+		_maybeHistory).known;
+	if (known) {
 		return;
-	} else if (Api::ResolveRequiresPremiumToWrite(peer(), _maybeHistory)
-		== Api::RequirePremiumState::Unknown) {
-		const auto user = peer()->asUser();
-		user->session().api().premium().resolvePremiumRequired(user);
+	} else if (const auto user = peer->asUser()) {
+		const auto api = &user->session().api();
+		api->premium().resolveMessageMoneyRestrictions(user);
+	} else if (const auto group = peer->asChannel()) {
+		group->updateFull();
 	}
 }
 
-void TrackPremiumRequiredChanges(
+void TrackMessageMoneyRestrictionsChanges(
 		not_null<PeerListController*> controller,
 		rpl::lifetime &lifetime) {
 	const auto session = &controller->session();
 	rpl::merge(
 		Data::AmPremiumValue(session) | rpl::to_empty,
-		session->api().premium().somePremiumRequiredResolved()
-	) | rpl::start_with_next([=] {
+		session->api().premium().someMessageMoneyRestrictionsResolved()
+	) | rpl::on_next([=] {
 		const auto st = &controller->computeListSt().item;
 		const auto delegate = controller->delegate();
 		const auto process = [&](not_null<PeerListRow*> raw) {
@@ -363,18 +442,18 @@ void ChatsListBoxController::prepare() {
 		session().data().chatsListLoadedEvents(
 		) | rpl::filter([=](Data::Folder *folder) {
 			return !folder;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			checkForEmptyRows();
 		}, lifetime());
 	}
 
 	session().data().chatsListChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuildRows();
 	}, lifetime());
 
 	session().data().contactsLoaded().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuildRows();
 	}, lifetime());
 }
@@ -462,18 +541,15 @@ void PeerListStories::updateColors() {
 	for (auto i = begin(_counts); i != end(_counts); ++i) {
 		if (const auto row = _delegate->peerListFindRow(i->first)) {
 			if (i->second.count >= 0 && i->second.unread >= 0) {
-				applyForRow(row, i->second.count, i->second.unread, true);
+				applyForRow(row, i->second, true);
 			}
 		}
 	}
 }
 
-void PeerListStories::updateFor(
-		uint64 id,
-		int count,
-		int unread) {
+void PeerListStories::updateFor(uint64 id, Counts counts) {
 	if (const auto row = _delegate->peerListFindRow(id)) {
-		applyForRow(row, count, unread);
+		applyForRow(row, counts);
 		_delegate->peerListUpdateRow(row);
 	}
 }
@@ -491,11 +567,14 @@ void PeerListStories::process(not_null<PeerListRow*> row) {
 		? 1
 		: 0;
 	const auto unread = source
-		? source->info().unreadCount
+		? int(source->info().unreadCount)
 		: user->hasUnreadStories()
 		? 1
 		: 0;
-	applyForRow(row, count, unread, true);
+	const auto videoStream = source
+		? bool(source->info().hasVideoStream)
+		: user->hasActiveVideoStream();
+	applyForRow(row, { count, unread, videoStream }, true);
 }
 
 bool PeerListStories::handleClick(not_null<PeerData*> peer) {
@@ -518,14 +597,14 @@ void PeerListStories::prepare(not_null<PeerListDelegate*> delegate) {
 	_delegate = delegate;
 
 	_unreadBrush = PeerListStoriesGradient(_controller->computeListSt());
-	style::PaletteChanged() | rpl::start_with_next([=] {
+	style::PaletteChanged() | rpl::on_next([=] {
 		_unreadBrush = PeerListStoriesGradient(_controller->computeListSt());
 		updateColors();
 	}, _lifetime);
 
 	_session->changes().peerUpdates(
 		Data::PeerUpdate::Flag::StoriesState
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto id = update.peer->id.value;
 		if (const auto row = _delegate->peerListFindRow(id)) {
 			process(row);
@@ -533,30 +612,33 @@ void PeerListStories::prepare(not_null<PeerListDelegate*> delegate) {
 	}, _lifetime);
 
 	const auto stories = &_session->data().stories();
-	stories->sourceChanged() | rpl::start_with_next([=](PeerId id) {
+	stories->sourceChanged() | rpl::on_next([=](PeerId id) {
 		const auto source = stories->source(id);
 		const auto info = source
 			? source->info()
 			: Data::StoriesSourceInfo();
-		updateFor(id.value, info.count, info.unreadCount);
+		updateFor(id.value, {
+			int(info.count),
+			int(info.unreadCount),
+			bool(info.hasVideoStream),
+		});
 	}, _lifetime);
 }
 
 void PeerListStories::applyForRow(
 		not_null<PeerListRow*> row,
-		int count,
-		int unread,
+		Counts counts,
 		bool force) {
-	auto &counts = _counts[row->id()];
-	if (!force && counts.count == count && counts.unread == unread) {
+	auto &existing = _counts[row->id()];
+	if (!force && existing == counts) {
 		return;
 	}
-	counts.count = count;
-	counts.unread = unread;
-	_delegate->peerListSetRowChecked(row, count > 0);
-	if (count > 0) {
+	existing = counts;
+	_delegate->peerListSetRowChecked(row, counts.count > 0);
+	if (counts.count > 0) {
 		row->setCustomizedCheckSegments(
-			PeerListStoriesSegments(count, unread, _unreadBrush));
+			PeerListStoriesSegments(counts, _unreadBrush),
+			counts.videoStream);
 	}
 }
 
@@ -591,7 +673,7 @@ void ContactsBoxController::prepare() {
 	}
 
 	session().data().contactsLoaded().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuildRows();
 	}, lifetime());
 }
@@ -653,7 +735,7 @@ void ContactsBoxController::setSortMode(SortMode mode) {
 		) | rpl::filter([=](const Data::PeerUpdate &update) {
 			return !_sortByOnlineTimer.isActive()
 				&& delegate()->peerListFindRow(update.peer->id.value);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			_sortByOnlineTimer.callOnce(kSortByOnlineThrottle);
 		}, _sortByOnlineLifetime);
 	} else {
@@ -662,18 +744,44 @@ void ContactsBoxController::setSortMode(SortMode mode) {
 	}
 }
 
+void ContactsBoxController::setSectionHeadersShown(bool shown) {
+	_sectionHeadersShown = shown;
+}
+
 void ContactsBoxController::setStoriesShown(bool shown) {
 	_stories = std::make_unique<PeerListStories>(this, _session);
 }
 
 void ContactsBoxController::sort() {
 	switch (_sortMode) {
-	case SortMode::Alphabet: sortByName(); break;
-	case SortMode::Online: sortByOnline(); break;
+	case SortMode::Alphabet:
+		sortByName();
+		if (_sectionHeadersShown) {
+			applySectionHeaders();
+		}
+		delegate()->peerListSetShowSectionHeaders(_sectionHeadersShown);
+		break;
+	case SortMode::Online:
+		sortByOnline();
+		delegate()->peerListSetShowSectionHeaders(false);
+		break;
 	default: Unexpected("SortMode in ContactsBoxController.");
 	}
 }
 
+void ContactsBoxController::applySectionHeaders() {
+	const auto count = delegate()->peerListFullRowsCount();
+	for (auto i = 0; i != count; ++i) {
+		const auto row = delegate()->peerListRowAt(i);
+		const auto peer = row->peer();
+		const auto &key = peer->owner().history(peer)->chatListNameSortKey();
+		const auto first = key.isEmpty() ? QChar() : key[0];
+		row->setSection(first.isLetter()
+			? QString(first.toUpper())
+			: u"#"_q);
+	}
+}
+
 void ContactsBoxController::sortByOnline() {
 	const auto now = base::unixtime::now();
 	const auto key = [&](const PeerListRow &row) {
@@ -709,7 +817,7 @@ std::unique_ptr<PeerListRow> ContactsBoxController::createRow(
 	return std::make_unique<PeerListRow>(user);
 }
 
-RecipientPremiumRequiredError WritePremiumRequiredError(
+RecipientMoneyRestrictionError WriteMoneyRestrictionError(
 		not_null<UserData*> user) {
 	return {
 		.text = tr::lng_send_non_premium_message_toast(
@@ -717,11 +825,11 @@ RecipientPremiumRequiredError WritePremiumRequiredError(
 			lt_user,
 			TextWithEntities{ user->shortName() },
 			lt_link,
-			Ui::Text::Link(
-				Ui::Text::Bold(
+			tr::link(
+				tr::bold(
 					tr::lng_send_non_premium_message_toast_link(
 						tr::now))),
-			Ui::Text::RichLangValue),
+			tr::rich),
 	};
 }
 
@@ -742,7 +850,7 @@ ChooseRecipientBoxController::ChooseRecipientBoxController(
 , _session(args.session)
 , _callback(std::move(args.callback))
 , _filter(std::move(args.filter))
-, _premiumRequiredError(std::move(args.premiumRequiredError)) {
+, _moneyRestrictionError(std::move(args.moneyRestrictionError)) {
 }
 
 Main::Session &ChooseRecipientBoxController::session() const {
@@ -752,14 +860,17 @@ Main::Session &ChooseRecipientBoxController::session() const {
 void ChooseRecipientBoxController::prepareViewHook() {
 	delegate()->peerListSetTitle(tr::lng_forward_choose());
 
-	if (_premiumRequiredError) {
-		TrackPremiumRequiredChanges(this, lifetime());
+	if (_moneyRestrictionError) {
+		TrackMessageMoneyRestrictionsChanges(this, lifetime());
 	}
 }
 
 bool ChooseRecipientBoxController::showLockedError(
 		not_null<PeerListRow*> row) {
-	return RecipientRow::ShowLockedError(this, row, _premiumRequiredError);
+	return RecipientRow::ShowLockedError(
+		this,
+		row,
+		_moneyRestrictionError);
 }
 
 void ChooseRecipientBoxController::rowClicked(not_null<PeerListRow*> row) {
@@ -769,8 +880,8 @@ void ChooseRecipientBoxController::rowClicked(not_null<PeerListRow*> row) {
 	auto guard = base::make_weak(this);
 	const auto peer = row->peer();
 	if (const auto forum = peer->forum()) {
-		const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
-		auto callback = [=](not_null<Data::ForumTopic*> topic) {
+		const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
+		auto callback = [=](not_null<Data::Thread*> thread) {
 			const auto exists = guard.get();
 			if (!exists) {
 				if (*weak) {
@@ -779,15 +890,15 @@ void ChooseRecipientBoxController::rowClicked(not_null<PeerListRow*> row) {
 				return;
 			}
 			auto onstack = std::move(_callback);
-			onstack(topic);
+			onstack(thread);
 			if (guard) {
 				_callback = std::move(onstack);
 			} else if (*weak) {
 				(*weak)->closeBox();
 			}
 		};
-		const auto filter = [=](not_null<Data::ForumTopic*> topic) {
-			return guard && (!_filter || _filter(topic));
+		const auto filter = [=](not_null<Data::Thread*> thread) {
+			return guard && (!_filter || _filter(thread));
 		};
 		auto owned = Box<PeerListBox>(
 			std::make_unique<ChooseTopicBoxController>(
@@ -800,7 +911,46 @@ void ChooseRecipientBoxController::rowClicked(not_null<PeerListRow*> row) {
 				});
 
 				forum->destroyed(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
+					box->closeBox();
+				}, box->lifetime());
+			});
+		*weak = owned.data();
+		delegate()->peerListUiShow()->showBox(std::move(owned));
+		return;
+	} else if (const auto monoforum = peer->monoforum()) {
+		const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
+		auto callback = [=](not_null<Data::SavedSublist*> sublist) {
+			const auto exists = guard.get();
+			if (!exists) {
+				if (*weak) {
+					(*weak)->closeBox();
+				}
+				return;
+			}
+			auto onstack = std::move(_callback);
+			onstack(sublist);
+			if (guard) {
+				_callback = std::move(onstack);
+			} else if (*weak) {
+				(*weak)->closeBox();
+			}
+		};
+		const auto filter = [=](not_null<Data::SavedSublist*> sublist) {
+			return guard && (!_filter || _filter(sublist));
+		};
+		auto owned = Box<PeerListBox>(
+			std::make_unique<ChooseSublistBoxController>(
+				monoforum,
+				std::move(callback),
+				filter),
+			[=](not_null<PeerListBox*> box) {
+				box->addButton(tr::lng_cancel(), [=] {
+					box->closeBox();
+				});
+
+				monoforum->destroyed(
+				) | rpl::on_next([=] {
 					box->closeBox();
 				}, box->lifetime());
 			});
@@ -819,8 +969,9 @@ void ChooseRecipientBoxController::rowClicked(not_null<PeerListRow*> row) {
 bool RecipientRow::ShowLockedError(
 		not_null<PeerListController*> controller,
 		not_null<PeerListRow*> row,
-		Fn<RecipientPremiumRequiredError(not_null<UserData*>)> error) {
-	if (!static_cast<RecipientRow*>(row.get())->locked()) {
+		Fn<RecipientMoneyRestrictionError(not_null<UserData*>)> error) {
+	const auto recipient = static_cast<RecipientRow*>(row.get());
+	if (!recipient->restriction().premiumRequired) {
 		return false;
 	}
 	::Settings::ShowPremiumPromoToast(
@@ -843,15 +994,15 @@ auto ChooseRecipientBoxController::createRow(
 		: ((peer->isBroadcast() && !Data::CanSendAnything(peer))
 			|| peer->isRepliesChat()
 			|| peer->isVerifyCodes()
-			|| (peer->isUser() && (_premiumRequiredError
-				? !peer->asUser()->canSendIgnoreRequirePremium()
+			|| (peer->isUser() && (_moneyRestrictionError
+				? !peer->asUser()->canSendIgnoreMoneyRestrictions()
 				: !Data::CanSendAnything(peer))));
 	if (skip) {
 		return nullptr;
 	}
 	auto result = std::make_unique<Row>(
 		history,
-		_premiumRequiredError ? &computeListSt().item : nullptr);
+		_moneyRestrictionError ? &computeListSt().item : nullptr);
 	return result;
 }
 
@@ -879,9 +1030,9 @@ void ChooseTopicSearchController::searchQuery(const QString &query) {
 }
 
 void ChooseTopicSearchController::searchOnServer() {
-	_requestId = _api.request(MTPchannels_GetForumTopics(
-		MTP_flags(MTPchannels_GetForumTopics::Flag::f_q),
-		_forum->channel()->inputChannel,
+	_requestId = _api.request(MTPmessages_GetForumTopics(
+		MTP_flags(MTPmessages_GetForumTopics::Flag::f_q),
+		_forum->peer()->input(),
 		MTP_string(_query),
 		MTP_int(_offsetDate),
 		MTP_int(_offsetId),
@@ -973,10 +1124,62 @@ auto ChooseTopicBoxController::Row::generateNameWords() const
 	return _topic->chatListNameWords();
 }
 
+QString ChooseTopicBoxController::AllMessagesRow::name() const {
+	return _userCreatesTopics
+		? tr::lng_forum_create_new_topic(tr::now)
+		: tr::lng_forum_all_messages(tr::now);
+}
+
+ChooseTopicBoxController::AllMessagesRow::AllMessagesRow(bool userCreatesTopics)
+: PeerListRow(PeerListRowId(0))
+, _userCreatesTopics(userCreatesTopics) {
+	const auto words = TextUtilities::PrepareSearchWords(name());
+	for (const auto &word : words) {
+		_nameWords.emplace(word);
+		_nameFirstLetters.emplace(word[0]);
+	}
+}
+
+QString ChooseTopicBoxController::AllMessagesRow::generateName() {
+	return name();
+}
+
+QString ChooseTopicBoxController::AllMessagesRow::generateShortName() {
+	return name();
+}
+
+auto ChooseTopicBoxController::AllMessagesRow::generatePaintUserpicCallback(
+	bool forceRound)
+-> PaintRoundImageCallback {
+	return [userCreatesTopics = _userCreatesTopics](
+			Painter &p,
+			int x,
+			int y,
+			int outerWidth,
+			int size) {
+		const auto &icon = userCreatesTopics
+			? st::menuIconDiscussion
+			: st::menuIconChats;
+		icon.paintInCenter(
+			p,
+			QRect(x, y - st::lineWidth, size, size));
+	};
+}
+
+auto ChooseTopicBoxController::AllMessagesRow::generateNameFirstLetters() const
+-> const base::flat_set<QChar> & {
+	return _nameFirstLetters;
+}
+
+auto ChooseTopicBoxController::AllMessagesRow::generateNameWords() const
+-> const base::flat_set<QString> & {
+	return _nameWords;
+}
+
 ChooseTopicBoxController::ChooseTopicBoxController(
 	not_null<Data::Forum*> forum,
-	FnMut<void(not_null<Data::ForumTopic*>)> callback,
-	Fn<bool(not_null<Data::ForumTopic*>)> filter)
+	FnMut<void(not_null<Data::Thread*>)> callback,
+	Fn<bool(not_null<Data::Thread*>)> filter)
 : PeerListController(std::make_unique<ChooseTopicSearchController>(forum))
 , _forum(forum)
 , _callback(std::move(callback))
@@ -984,12 +1187,12 @@ ChooseTopicBoxController::ChooseTopicBoxController(
 	setStyleOverrides(&st::chooseTopicList);
 
 	_forum->chatsListChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshRows();
 	}, lifetime());
 
 	_forum->topicDestroyed(
-	) | rpl::start_with_next([=](not_null<Data::ForumTopic*> topic) {
+	) | rpl::on_next([=](not_null<Data::ForumTopic*> topic) {
 		const auto id = PeerListRowId(topic->rootId().bare);
 		if (const auto row = delegate()->peerListFindRow(id)) {
 			delegate()->peerListRemoveRow(row);
@@ -1005,7 +1208,11 @@ Main::Session &ChooseTopicBoxController::session() const {
 void ChooseTopicBoxController::rowClicked(not_null<PeerListRow*> row) {
 	const auto weak = base::make_weak(this);
 	auto onstack = base::take(_callback);
-	onstack(static_cast<Row*>(row.get())->topic());
+	if (row->id() == PeerListRowId(0)) {
+		onstack(_forum->history());
+	} else {
+		onstack(static_cast<Row*>(row.get())->topic());
+	}
 	if (weak) {
 		_callback = std::move(onstack);
 	}
@@ -1019,7 +1226,7 @@ void ChooseTopicBoxController::prepare() {
 
 	session().changes().entryUpdates(
 		Data::EntryUpdate::Flag::Repaint
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		if (const auto topic = update.entry->asTopic()) {
 			if (topic->forum() == _forum) {
 				const auto id = topic->rootId().bare;
@@ -1033,6 +1240,15 @@ void ChooseTopicBoxController::prepare() {
 
 void ChooseTopicBoxController::refreshRows(bool initial) {
 	auto added = false;
+	if (_forum->bot()
+		&& !delegate()->peerListFindRow(PeerListRowId(0))
+		&& (!_filter || _filter(_forum->history()))) {
+		const auto userCreatesTopics = Data::IsBotUserCreatesTopics(
+			_forum->peer());
+		delegate()->peerListAppendRow(
+			std::make_unique<AllMessagesRow>(userCreatesTopics));
+		added = true;
+	}
 	for (const auto &row : _forum->topicsList()->indexed()->all()) {
 		if (const auto topic = row->topic()) {
 			const auto id = topic->rootId().bare;
@@ -1065,31 +1281,177 @@ std::unique_ptr<PeerListRow> ChooseTopicBoxController::createSearchRow(
 	return nullptr;
 }
 
+std::unique_ptr<PeerListRow> ChooseTopicBoxController::MakeRow(
+		not_null<Data::ForumTopic*> topic) {
+	return std::make_unique<Row>(topic);
+}
+
 auto ChooseTopicBoxController::createRow(not_null<Data::ForumTopic*> topic)
 -> std::unique_ptr<Row> {
 	const auto skip = _filter && !_filter(topic);
 	return skip ? nullptr : std::make_unique<Row>(topic);
 };
 
-void PaintPremiumRequiredLock(
+ChooseSublistBoxController::ChooseSublistBoxController(
+	not_null<Data::SavedMessages*> monoforum,
+	FnMut<void(not_null<Data::SavedSublist*>)> callback,
+	Fn<bool(not_null<Data::SavedSublist*>)> filter)
+: _monoforum(monoforum)
+, _callback(std::move(callback))
+, _filter(std::move(filter)) {
+	setStyleOverrides(&st::chooseTopicList);
+
+	_monoforum->chatsListChanges(
+	) | rpl::on_next([=] {
+		refreshRows();
+	}, lifetime());
+
+	_monoforum->sublistDestroyed(
+	) | rpl::on_next([=](not_null<Data::SavedSublist*> sublist) {
+		const auto id = sublist->sublistPeer()->id.value;
+		if (const auto row = delegate()->peerListFindRow(id)) {
+			delegate()->peerListRemoveRow(row);
+			delegate()->peerListRefreshRows();
+		}
+	}, lifetime());
+}
+
+Main::Session &ChooseSublistBoxController::session() const {
+	return _monoforum->session();
+}
+
+void ChooseSublistBoxController::rowClicked(not_null<PeerListRow*> row) {
+	const auto weak = base::make_weak(this);
+	auto onstack = base::take(_callback);
+	onstack(_monoforum->sublist(row->peer()));
+	if (weak) {
+		_callback = std::move(onstack);
+	}
+}
+
+void ChooseSublistBoxController::prepare() {
+	delegate()->peerListSetTitle(tr::lng_forward_choose());
+	setSearchNoResultsText(tr::lng_topics_not_found(tr::now));
+	delegate()->peerListSetSearchMode(PeerListSearchMode::Enabled);
+	refreshRows(true);
+
+	session().changes().entryUpdates(
+		Data::EntryUpdate::Flag::Repaint
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
+		if (const auto sublist = update.entry->asSublist()) {
+			if (sublist->parent() == _monoforum) {
+				const auto id = sublist->sublistPeer()->id.value;
+				if (const auto row = delegate()->peerListFindRow(id)) {
+					delegate()->peerListUpdateRow(row);
+				}
+			}
+		}
+	}, lifetime());
+}
+
+void ChooseSublistBoxController::refreshRows(bool initial) {
+	auto added = false;
+	for (const auto &row : _monoforum->chatsList()->indexed()->all()) {
+		if (const auto sublist = row->sublist()) {
+			const auto id = sublist->sublistPeer()->id.value;
+			auto already = delegate()->peerListFindRow(id);
+			if (initial || !already) {
+				if (auto created = createRow(sublist)) {
+					delegate()->peerListAppendRow(std::move(created));
+					added = true;
+				}
+			} else if (already->isSearchResult()) {
+				delegate()->peerListAppendFoundRow(already);
+				added = true;
+			}
+		}
+	}
+	if (added) {
+		delegate()->peerListRefreshRows();
+	}
+}
+
+void ChooseSublistBoxController::loadMoreRows() {
+	_monoforum->loadMore();
+}
+
+std::unique_ptr<PeerListRow> ChooseSublistBoxController::createSearchRow(
+		PeerListRowId id) {
+	const auto peer = session().data().peer(PeerId(id));
+	if (const auto sublist = _monoforum->sublistLoaded(peer)) {
+		auto result = std::make_unique<PeerListRow>(sublist->sublistPeer());
+		result->setCustomStatus(QString());
+		return result;
+	}
+	return nullptr;
+}
+
+auto ChooseSublistBoxController::createRow(
+	not_null<Data::SavedSublist*> sublist)
+-> std::unique_ptr<PeerListRow> {
+	if (_filter && !_filter(sublist)) {
+		return nullptr;
+	}
+	auto result = std::make_unique<PeerListRow>(sublist->sublistPeer());
+	result->setCustomStatus(QString());
+	return result;
+};
+
+void PaintRestrictionBadge(
 		Painter &p,
 		not_null<const style::PeerListItem*> st,
+		int stars,
+		RestrictionBadgeCache &cache,
 		int x,
 		int y,
 		int outerWidth,
 		int size) {
-	auto hq = PainterHighQualityEnabler(p);
+	const auto paletteVersion = style::PaletteVersion();
+	const auto good = !cache.badge.isNull()
+		&& (cache.stars == stars)
+		&& (cache.paletteVersion == paletteVersion);
 	const auto &check = st->checkbox.check;
-	auto pen = check.border->p;
-	pen.setWidthF(check.width);
-	p.setPen(pen);
-	p.setBrush(st::premiumButtonBg2);
-	const auto &icon = st::stickersPremiumLock;
-	const auto width = icon.width();
-	const auto height = icon.height();
-	const auto rect = QRect(
-		QPoint(x + size - width, y + size - height),
-		icon.size());
-	p.drawEllipse(rect);
-	icon.paintInCenter(p, rect);
+	const auto add = check.width;
+	if (!good) {
+		cache.stars = stars;
+		cache.paletteVersion = paletteVersion;
+		if (stars) {
+			const auto text = (stars >= 1000)
+				? (QString::number(stars / 1000) + 'K')
+				: QString::number(stars);
+			cache.badge = Ui::GenerateSmallBadgeImage(
+				text,
+				st::paidReactTopStarIcon,
+				check.bgActive->c,
+				st::premiumButtonFg->c,
+				&check);
+		} else {
+			auto hq = PainterHighQualityEnabler(p);
+			const auto &icon = st::stickersPremiumLock;
+			const auto width = icon.width();
+			const auto height = icon.height();
+			const auto rect = QRect(
+				QPoint(x + size - width, y + size - height),
+				icon.size());
+			const auto added = QMargins(add, add, add, add);
+			const auto ratio = style::DevicePixelRatio();
+			cache.badge = QImage(
+				(rect + added).size() * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			cache.badge.setDevicePixelRatio(ratio);
+			cache.badge.fill(Qt::transparent);
+			const auto inner = QRect(add, add, rect.width(), rect.height());
+			auto q = QPainter(&cache.badge);
+			auto pen = check.border->p;
+			pen.setWidthF(check.width);
+			q.setPen(pen);
+			q.setBrush(st::premiumButtonBg2);
+			q.drawEllipse(inner);
+			icon.paintInCenter(q, inner);
+		}
+	}
+	const auto cached = cache.badge.size() / cache.badge.devicePixelRatio();
+	const auto left = x + size + add - cached.width();
+	const auto top = stars ? (y - add) : (y + size + add - cached.height());
+	p.drawImage(left, top, cache.badge);
 }
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.h b/Telegram/SourceFiles/boxes/peer_list_controllers.h
index 20479c2b47393e..c110499c4880b2 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.h
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.h
@@ -19,10 +19,16 @@ namespace style {
 struct PeerListItem;
 } // namespace style
 
+namespace Api {
+struct MessageMoneyRestriction;
+} // namespace Api
+
 namespace Data {
 class Thread;
 class Forum;
 class ForumTopic;
+class SavedSublist;
+class SavedMessages;
 } // namespace Data
 
 namespace Ui {
@@ -36,9 +42,18 @@ class SessionController;
 [[nodiscard]] object_ptr<Ui::BoxContent> PrepareContactsBox(
 	not_null<Window::SessionController*> sessionController);
 [[nodiscard]] QBrush PeerListStoriesGradient(const style::PeerList &st);
+
+struct PeerListStoriesCounts {
+	int count = 0;
+	int unread = 0;
+	bool videoStream = false;
+
+	friend inline bool operator==(
+		const PeerListStoriesCounts &a,
+		const PeerListStoriesCounts &b) = default;
+};
 [[nodiscard]] std::vector<Ui::OutlineSegment> PeerListStoriesSegments(
-	int count,
-	int unread,
+	PeerListStoriesCounts counts,
 	const QBrush &unreadBrush);
 
 class PeerListRowWithLink : public PeerListRow {
@@ -93,13 +108,28 @@ class PeerListGlobalSearchController : public PeerListSearchController {
 
 };
 
-struct RecipientPremiumRequiredError {
+struct RecipientMoneyRestrictionError {
 	TextWithEntities text;
 };
 
-[[nodiscard]] RecipientPremiumRequiredError WritePremiumRequiredError(
+[[nodiscard]] RecipientMoneyRestrictionError WriteMoneyRestrictionError(
 	not_null<UserData*> user);
 
+struct RestrictionBadgeCache {
+	int paletteVersion = 0;
+	int stars = 0;
+	QImage badge;
+};
+void PaintRestrictionBadge(
+	Painter &p,
+	not_null<const style::PeerListItem*> st,
+	int stars,
+	RestrictionBadgeCache &cache,
+	int x,
+	int y,
+	int outerWidth,
+	int size);
+
 class RecipientRow : public PeerListRow {
 public:
 	explicit RecipientRow(
@@ -112,30 +142,33 @@ class RecipientRow : public PeerListRow {
 	[[nodiscard]] static bool ShowLockedError(
 		not_null<PeerListController*> controller,
 		not_null<PeerListRow*> row,
-		Fn<RecipientPremiumRequiredError(not_null<UserData*>)> error);
+		Fn<RecipientMoneyRestrictionError(not_null<UserData*>)> error);
 
 	[[nodiscard]] History *maybeHistory() const {
 		return _maybeHistory;
 	}
-	[[nodiscard]] bool locked() const {
-		return _lockedSt != nullptr;
-	}
-	void setLocked(const style::PeerListItem *lockedSt) {
-		_lockedSt = lockedSt;
-	}
-	PaintRoundImageCallback generatePaintUserpicCallback(
-		bool forceRound) override;
+	void paintUserpicOverlay(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int outerWidth) override;
 
 	void preloadUserpic() override;
 
+	[[nodiscard]] Api::MessageMoneyRestriction restriction() const;
+	void setRestriction(Api::MessageMoneyRestriction restriction);
+
 private:
+	struct Restriction;
+
 	History *_maybeHistory = nullptr;
-	const style::PeerListItem *_lockedSt = nullptr;
-	bool _resolvePremiumRequired = false;
+	const style::PeerListItem *_maybeLockedSt = nullptr;
+	std::shared_ptr<Restriction> _restriction;
 
 };
 
-void TrackPremiumRequiredChanges(
+void TrackMessageMoneyRestrictionsChanges(
 	not_null<PeerListController*> controller,
 	rpl::lifetime &lifetime);
 
@@ -187,17 +220,13 @@ class PeerListStories final {
 	bool handleClick(not_null<PeerData*> peer);
 
 private:
-	struct Counts {
-		int count = 0;
-		int unread = 0;
-	};
+	using Counts = PeerListStoriesCounts;
 
 	void updateColors();
-	void updateFor(uint64 id, int count, int unread);
+	void updateFor(uint64 id, Counts counts);
 	void applyForRow(
 		not_null<PeerListRow*> row,
-		int count,
-		int unread,
+		Counts counts,
 		bool force = false);
 
 	const not_null<PeerListController*> _controller;
@@ -231,6 +260,7 @@ class ContactsBoxController : public PeerListController {
 		Online,
 	};
 	void setSortMode(SortMode mode);
+	void setSectionHeadersShown(bool shown);
 	void setStoriesShown(bool shown);
 
 protected:
@@ -243,12 +273,14 @@ class ContactsBoxController : public PeerListController {
 private:
 	void sort();
 	void sortByOnline();
+	void applySectionHeaders();
 	void rebuildRows();
 	void checkForEmptyRows();
 	bool appendRow(not_null<UserData*> user);
 
 	const not_null<Main::Session*> _session;
 	SortMode _sortMode = SortMode::Alphabet;
+	bool _sectionHeadersShown = false;
 	base::Timer _sortByOnlineTimer;
 	rpl::lifetime _sortByOnlineLifetime;
 
@@ -261,8 +293,8 @@ struct ChooseRecipientArgs {
 	FnMut<void(not_null<Data::Thread*>)> callback;
 	Fn<bool(not_null<Data::Thread*>)> filter;
 
-	using PremiumRequiredError = RecipientPremiumRequiredError;
-	Fn<PremiumRequiredError(not_null<UserData*>)> premiumRequiredError;
+	using MoneyRestrictionError = RecipientMoneyRestrictionError;
+	Fn<MoneyRestrictionError(not_null<UserData*>)> moneyRestrictionError;
 };
 
 class ChooseRecipientBoxController
@@ -290,8 +322,8 @@ class ChooseRecipientBoxController
 	const not_null<Main::Session*> _session;
 	FnMut<void(not_null<Data::Thread*>)> _callback;
 	Fn<bool(not_null<Data::Thread*>)> _filter;
-	Fn<RecipientPremiumRequiredError(
-		not_null<UserData*>)> _premiumRequiredError;
+	Fn<RecipientMoneyRestrictionError(
+		not_null<UserData*>)> _moneyRestrictionError;
 
 };
 
@@ -325,8 +357,8 @@ class ChooseTopicBoxController final
 public:
 	ChooseTopicBoxController(
 		not_null<Data::Forum*> forum,
-		FnMut<void(not_null<Data::ForumTopic*>)> callback,
-		Fn<bool(not_null<Data::ForumTopic*>)> filter = nullptr);
+		FnMut<void(not_null<Data::Thread*>)> callback,
+		Fn<bool(not_null<Data::Thread*>)> filter = nullptr);
 
 	Main::Session &session() const override;
 	void rowClicked(not_null<PeerListRow*> row) override;
@@ -335,6 +367,9 @@ class ChooseTopicBoxController final
 	void loadMoreRows() override;
 	std::unique_ptr<PeerListRow> createSearchRow(PeerListRowId id) override;
 
+	[[nodiscard]] static std::unique_ptr<PeerListRow> MakeRow(
+		not_null<Data::ForumTopic*> topic);
+
 private:
 	class Row final : public PeerListRow {
 	public:
@@ -359,20 +394,62 @@ class ChooseTopicBoxController final
 
 	};
 
+	class AllMessagesRow final : public PeerListRow {
+	public:
+		explicit AllMessagesRow(bool userCreatesTopics);
+
+		QString generateName() override;
+		QString generateShortName() override;
+		PaintRoundImageCallback generatePaintUserpicCallback(
+			bool forceRound) override;
+
+		auto generateNameFirstLetters() const
+			-> const base::flat_set<QChar> & override;
+		auto generateNameWords() const
+			-> const base::flat_set<QString> & override;
+
+	private:
+		[[nodiscard]] QString name() const;
+
+		base::flat_set<QChar> _nameFirstLetters;
+		base::flat_set<QString> _nameWords;
+		bool _userCreatesTopics = false;
+
+	};
+
 	void refreshRows(bool initial = false);
 	[[nodiscard]] std::unique_ptr<Row> createRow(
 		not_null<Data::ForumTopic*> topic);
 
 	const not_null<Data::Forum*> _forum;
-	FnMut<void(not_null<Data::ForumTopic*>)> _callback;
-	Fn<bool(not_null<Data::ForumTopic*>)> _filter;
+	FnMut<void(not_null<Data::Thread*>)> _callback;
+	Fn<bool(not_null<Data::Thread*>)> _filter;
 
 };
 
-void PaintPremiumRequiredLock(
-	Painter &p,
-	not_null<const style::PeerListItem*> st,
-	int x,
-	int y,
-	int outerWidth,
-	int size);
+class ChooseSublistBoxController final
+	: public PeerListController
+	, public base::has_weak_ptr {
+public:
+	ChooseSublistBoxController(
+		not_null<Data::SavedMessages*> monoforum,
+		FnMut<void(not_null<Data::SavedSublist*>)> callback,
+		Fn<bool(not_null<Data::SavedSublist*>)> filter = nullptr);
+
+	Main::Session &session() const override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+
+	void prepare() override;
+	void loadMoreRows() override;
+	std::unique_ptr<PeerListRow> createSearchRow(PeerListRowId id) override;
+
+private:
+	void refreshRows(bool initial = false);
+	[[nodiscard]] std::unique_ptr<PeerListRow> createRow(
+		not_null<Data::SavedSublist*> sublist);
+
+	const not_null<Data::SavedMessages*> _monoforum;
+	FnMut<void(not_null<Data::SavedSublist*>)> _callback;
+	Fn<bool(not_null<Data::SavedSublist*>)> _filter;
+
+};
diff --git a/Telegram/SourceFiles/boxes/peer_list_scroll_cache.cpp b/Telegram/SourceFiles/boxes/peer_list_scroll_cache.cpp
new file mode 100644
index 00000000000000..0d537a840a837d
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peer_list_scroll_cache.cpp
@@ -0,0 +1,33 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/peer_list_scroll_cache.h"
+
+namespace {
+
+constexpr auto kStopTimeout = crl::time(120);
+
+} // namespace
+
+PeerListRowsScrollCache::PeerListRowsScrollCache(Fn<void()> stopped) {
+	_stopTimer.setCallback([=] {
+		_scrolling = false;
+		_images.clear();
+		stopped();
+	});
+}
+
+void PeerListRowsScrollCache::markScrolling() {
+	_scrolling = true;
+	_stopTimer.callOnce(kStopTimeout);
+}
+
+void PeerListRowsScrollCache::invalidate(uint64 rowId) {
+	if (const auto i = _images.find(rowId); i != end(_images)) {
+		_images.erase(i);
+	}
+}
diff --git a/Telegram/SourceFiles/boxes/peer_list_scroll_cache.h b/Telegram/SourceFiles/boxes/peer_list_scroll_cache.h
new file mode 100644
index 00000000000000..3f49e14400fe75
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peer_list_scroll_cache.h
@@ -0,0 +1,51 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "base/flat_map.h"
+
+class PeerListRowsScrollCache final {
+public:
+	explicit PeerListRowsScrollCache(Fn<void()> stopped);
+
+	void markScrolling();
+	[[nodiscard]] bool scrolling() const {
+		return _scrolling;
+	}
+
+	template <typename PaintToImage>
+	void paintRow(
+			QPainter &p,
+			uint64 rowId,
+			QSize physicalSize,
+			int ratio,
+			PaintToImage &&paintToImage) {
+		auto &image = _images[rowId];
+		if (image.size() != physicalSize) {
+			if (_images.size() > kLimit) {
+				_images.clear();
+				image = _images[rowId];
+			}
+			image = QImage(physicalSize, QImage::Format_RGB32);
+			image.setDevicePixelRatio(ratio);
+			paintToImage(image);
+		}
+		p.drawImage(0, 0, image);
+	}
+
+	void invalidate(uint64 rowId);
+
+private:
+	static constexpr auto kLimit = 256;
+
+	base::flat_map<uint64, QImage> _images;
+	base::Timer _stopTimer;
+	bool _scrolling = false;
+
+};
diff --git a/Telegram/SourceFiles/boxes/peer_list_section_headers.cpp b/Telegram/SourceFiles/boxes/peer_list_section_headers.cpp
new file mode 100644
index 00000000000000..88a22251fd6c16
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peer_list_section_headers.cpp
@@ -0,0 +1,88 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/peer_list_section_headers.h"
+
+#include "ui/painter.h"
+#include "styles/style_boxes.h"
+
+void PeerListSectionHeaders::rebuild(
+		int count,
+		int rowHeight,
+		Fn<QString(int index)> section) {
+	_count = count;
+	_rowHeight = rowHeight;
+	_total = 0;
+	_prefix.resize(count);
+	auto previous = QString();
+	for (auto i = 0; i != count; ++i) {
+		const auto letter = section(i);
+		const auto header = !letter.isEmpty()
+			&& (i == 0 || letter != previous);
+		if (header) {
+			++_total;
+		}
+		_prefix[i] = _total;
+		previous = letter;
+	}
+}
+
+void PeerListSectionHeaders::clear() {
+	_prefix.clear();
+	_total = 0;
+	_count = 0;
+}
+
+bool PeerListSectionHeaders::hasHeader(int index) const {
+	if (index < 0 || index >= int(_prefix.size())) {
+		return false;
+	}
+	return (index == 0)
+		? (_prefix[0] > 0)
+		: (_prefix[index] > _prefix[index - 1]);
+}
+
+int PeerListSectionHeaders::contentTop(int index) const {
+	const auto headers = (index >= 0 && index < int(_prefix.size()))
+		? _prefix[index]
+		: 0;
+	return index * _rowHeight + headers * st::contactsSortHeaderHeight;
+}
+
+int PeerListSectionHeaders::fullHeight() const {
+	return _count * _rowHeight + _total * st::contactsSortHeaderHeight;
+}
+
+int PeerListSectionHeaders::rowFromY(int y) const {
+	auto low = 0, high = _count;
+	while (low < high) {
+		const auto middle = (low + high) / 2;
+		if (contentTop(middle) <= y) {
+			low = middle + 1;
+		} else {
+			high = middle;
+		}
+	}
+	const auto index = low - 1;
+	if (index < 0 || index >= _count) {
+		return -1;
+	}
+	return (y < contentTop(index) + _rowHeight) ? index : -1;
+}
+
+void PeerListSectionHeaders::paint(
+		Painter &p,
+		int outerWidth,
+		const QString &text) const {
+	p.setFont(st::contactsSortHeaderFont);
+	p.setPen(st::contactsSortHeaderFg);
+	p.drawTextLeft(
+		st::contactsSortHeaderPosition.x(),
+		st::contactsSortHeaderPosition.y(),
+		outerWidth,
+		text);
+}
diff --git a/Telegram/SourceFiles/boxes/peer_list_section_headers.h b/Telegram/SourceFiles/boxes/peer_list_section_headers.h
new file mode 100644
index 00000000000000..e1a0cec6256af6
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peer_list_section_headers.h
@@ -0,0 +1,49 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class Painter;
+
+// Alphabetical section headers ("A", "B", ..., "#") shown above the first
+// row of every letter group. Pure layout/geometry helper: it owns the
+// per-row prefix counts and answers position / hit-test queries in
+// coordinates relative to the top of the rows region.
+class PeerListSectionHeaders final {
+public:
+	void rebuild(int count, int rowHeight, Fn<QString(int index)> section);
+	void clear();
+
+	[[nodiscard]] bool empty() const {
+		return !_count;
+	}
+	[[nodiscard]] int total() const {
+		return _total;
+	}
+
+	// Whether a header is drawn above the row with the given shown index.
+	[[nodiscard]] bool hasHeader(int index) const;
+
+	// Top of the row content, relative to the top of the rows region.
+	[[nodiscard]] int contentTop(int index) const;
+
+	// Full height of the rows region including all headers.
+	[[nodiscard]] int fullHeight() const;
+
+	// Shown row index at the given y (relative to the rows region top), or
+	// -1 when y falls into a header band or outside any row content.
+	[[nodiscard]] int rowFromY(int y) const;
+
+	void paint(Painter &p, int outerWidth, const QString &text) const;
+
+private:
+	std::vector<int> _prefix;
+	int _total = 0;
+	int _count = 0;
+	int _rowHeight = 0;
+
+};
diff --git a/Telegram/SourceFiles/boxes/peer_list_section_index.cpp b/Telegram/SourceFiles/boxes/peer_list_section_index.cpp
new file mode 100644
index 00000000000000..c7bb7fe3bf30a7
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peer_list_section_index.cpp
@@ -0,0 +1,290 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/peer_list_section_index.h"
+
+#include "ui/painter.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+
+namespace {
+
+constexpr auto kMaxBoost = 1.8;
+constexpr auto kEase = 0.6;
+constexpr auto kFisheyeReachSlots = 2.2;
+constexpr auto kBulgeReserveSlots = 2.5;
+
+} // namespace
+
+PeerListSectionIndex::PeerListSectionIndex(QWidget *parent)
+: RpWidget(parent) {
+	setMouseTracking(true);
+	_fisheye.init([=](crl::time) {
+		const auto moving = fisheyeFrame();
+		update();
+		return moving;
+	});
+}
+
+void PeerListSectionIndex::setLetters(std::vector<Entry> letters) {
+	_letters = std::move(letters);
+	relayout();
+	update();
+}
+
+void PeerListSectionIndex::setVisibleLetters(base::flat_set<QString> letters) {
+	if (_visible != letters) {
+		_visible = std::move(letters);
+		update();
+	}
+}
+
+void PeerListSectionIndex::setJumpCallback(
+		Fn<void(int, anim::type)> callback) {
+	_jump = std::move(callback);
+}
+
+void PeerListSectionIndex::setScrollCallback(
+		Fn<void(not_null<QWheelEvent*>)> callback) {
+	_scroll = std::move(callback);
+}
+
+int PeerListSectionIndex::idealWidth() const {
+	return st::peerListIndexWidth + st::peerListIndexApproach;
+}
+
+float64 PeerListSectionIndex::columnCenterX() const {
+	return style::RightToLeft()
+		? (st::peerListIndexWidth / 2.)
+		: (width() - st::peerListIndexWidth / 2.);
+}
+
+void PeerListSectionIndex::resizeEvent(QResizeEvent *e) {
+	relayout();
+}
+
+void PeerListSectionIndex::relayout() {
+	_slots.clear();
+	_current = -1;
+	const auto count = int(_letters.size());
+	if (!count || height() <= 0) {
+		_scale.clear();
+		return;
+	}
+	const auto itemHeight = st::peerListIndexSlotHeight;
+	const auto minHeight = st::peerListIndexMinSlotHeight;
+	const auto inset = st::peerListIndexVerticalInset;
+	const auto fullHeight = std::max(height() - 2 * inset, minHeight);
+	const auto reserve = int(kBulgeReserveSlots * itemHeight);
+	const auto usable = std::max(fullHeight - reserve, minHeight);
+	const auto maxFit = std::max(usable / minHeight, 1);
+	const auto skip = (count <= maxFit)
+		? 1
+		: ((count + maxFit - 1) / maxFit);
+	auto kept = std::vector<int>();
+	for (auto i = 0; i < count; i += skip) {
+		kept.push_back(i);
+	}
+	if (kept.back() != count - 1) {
+		kept.push_back(count - 1);
+	}
+	const auto actualCount = int(kept.size());
+	const auto pitch = std::min(itemHeight, usable / actualCount);
+	_pitch = pitch;
+	const auto totalHeight = actualCount * pitch;
+	const auto blockTop = inset + std::max(0, (fullHeight - totalHeight) / 2);
+	_slots.reserve(actualCount);
+	for (auto d = 0; d != actualCount; ++d) {
+		_slots.push_back({
+			_letters[kept[d]].letter,
+			kept[d],
+			blockTop + pitch * d + (pitch / 2),
+		});
+	}
+	_scale.assign(actualCount, 1.);
+}
+
+float64 PeerListSectionIndex::slotScale(int slotY) const {
+	if (_cursorY < 0 || !_pitch) {
+		return 1.;
+	}
+	const auto reach = kFisheyeReachSlots * _pitch;
+	const auto vertical = std::clamp(
+		std::abs(slotY - _cursorY) / reach,
+		0.,
+		1.);
+	const auto verticalFalloff = std::cos(M_PI_2 * vertical);
+
+	const auto approach = float64(st::peerListIndexApproach);
+	const auto edge = style::RightToLeft()
+		? float64(st::peerListIndexWidth)
+		: (width() - st::peerListIndexWidth);
+	const auto away = style::RightToLeft()
+		? std::clamp((_cursorX - edge) / approach, 0., 1.)
+		: std::clamp((edge - _cursorX) / approach, 0., 1.);
+	const auto horizontalFalloff = 1. - away * away * (3. - 2. * away);
+
+	return 1. + (kMaxBoost - 1.) * verticalFalloff * horizontalFalloff;
+}
+
+bool PeerListSectionIndex::updateCursorFromGlobal() {
+	const auto position = mapFromGlobal(QCursor::pos());
+	const auto scrollBar = st::boxScroll.width;
+	const auto rtl = style::RightToLeft();
+	const auto left = rtl ? -scrollBar : 0;
+	const auto right = rtl ? width() : (width() + scrollBar);
+	if (position.x() >= left
+		&& position.x() <= right
+		&& position.y() >= 0
+		&& position.y() <= height()) {
+		_cursorX = position.x();
+		_cursorY = position.y();
+		return true;
+	}
+	_cursorX = -1;
+	_cursorY = -1;
+	return false;
+}
+
+bool PeerListSectionIndex::fisheyeFrame() {
+	const auto wasX = _cursorX;
+	const auto wasY = _cursorY;
+	const auto influenced = updateCursorFromGlobal();
+	auto moving = false;
+	for (auto i = 0; i != int(_slots.size()); ++i) {
+		const auto target = slotScale(_slots[i].y);
+		const auto delta = target - _scale[i];
+		if (std::abs(delta) > 0.002) {
+			_scale[i] += delta * kEase;
+			moving = true;
+		} else {
+			_scale[i] = target;
+		}
+	}
+	if (moving || _cursorX != wasX || _cursorY != wasY) {
+		update();
+	}
+	return moving || influenced;
+}
+
+void PeerListSectionIndex::setCursor(QPoint position) {
+	_cursorX = position.x();
+	_cursorY = position.y();
+	if (!_fisheye.animating()) {
+		_fisheye.start();
+	}
+}
+
+int PeerListSectionIndex::slotAtY(int y) const {
+	auto best = -1;
+	auto bestDistance = 0;
+	for (auto i = 0; i != int(_slots.size()); ++i) {
+		const auto distance = std::abs(_slots[i].y - y);
+		if (best < 0 || distance < bestDistance) {
+			best = i;
+			bestDistance = distance;
+		}
+	}
+	return best;
+}
+
+void PeerListSectionIndex::scrubTo(int slot, anim::type animated) {
+	if (slot < 0 || slot == _current) {
+		return;
+	}
+	_current = slot;
+	if (_jump) {
+		_jump(_letters[_slots[slot].sourceIndex].contentTop, animated);
+	}
+	update();
+}
+
+void PeerListSectionIndex::mousePressEvent(QMouseEvent *e) {
+	_scrubbing = true;
+	setCursor(e->pos());
+	scrubTo(slotAtY(e->pos().y()), anim::type::normal);
+}
+
+void PeerListSectionIndex::mouseMoveEvent(QMouseEvent *e) {
+	setCursor(e->pos());
+	if (_scrubbing) {
+		scrubTo(slotAtY(e->pos().y()), anim::type::instant);
+	} else {
+		update();
+	}
+}
+
+void PeerListSectionIndex::mouseReleaseEvent(QMouseEvent *e) {
+	_scrubbing = false;
+	_current = -1;
+	update();
+}
+
+void PeerListSectionIndex::wheelEvent(QWheelEvent *e) {
+	if (_scroll) {
+		_scroll(e);
+	}
+}
+
+void PeerListSectionIndex::leaveEventHook(QEvent *e) {
+	if (!_fisheye.animating()) {
+		_fisheye.start();
+	}
+}
+
+void PeerListSectionIndex::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	const auto count = int(_slots.size());
+	if (!count) {
+		return;
+	}
+	const auto &font = st::peerListIndexFont;
+	p.setFont(font);
+	const auto centerX = columnCenterX();
+
+	auto centers = std::vector<float64>(count);
+	if (_cursorY < 0) {
+		for (auto i = 0; i != count; ++i) {
+			centers[i] = _slots[i].y;
+		}
+	} else {
+		auto expanded = 0.;
+		for (auto i = 0; i != count; ++i) {
+			expanded += _scale[i] * _pitch;
+		}
+		const auto inset = st::peerListIndexVerticalInset;
+		auto edge = inset + (height() - 2 * inset - expanded) / 2.;
+		for (auto i = 0; i != count; ++i) {
+			const auto size = _scale[i] * _pitch;
+			centers[i] = edge + size / 2.;
+			edge += size;
+		}
+	}
+
+	for (auto i = 0; i != count; ++i) {
+		const auto &slot = _slots[i];
+		const auto scale = _scale[i];
+		const auto active = (_current == i)
+			|| _visible.contains(slot.letter);
+		p.setPen(active
+			? st::peerListIndexActiveFg
+			: st::peerListIndexFg);
+		const auto centerY = centers[i];
+		const auto baseline = centerY + (font->ascent - font->descent) / 2.;
+		const auto x = centerX - (font->width(slot.letter) / 2.);
+		if (scale > 1.001) {
+			p.save();
+			p.translate(centerX, centerY);
+			p.scale(scale, scale);
+			p.translate(-centerX, -centerY);
+			p.drawText(QPointF(x, baseline), slot.letter);
+			p.restore();
+		} else {
+			p.drawText(QPointF(x, baseline), slot.letter);
+		}
+	}
+}
diff --git a/Telegram/SourceFiles/boxes/peer_list_section_index.h b/Telegram/SourceFiles/boxes/peer_list_section_index.h
new file mode 100644
index 00000000000000..08e18925109624
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peer_list_section_index.h
@@ -0,0 +1,67 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/effects/animations.h"
+
+// Right-edge A-Z fast-scroll index strip for the contacts box: thins letters
+// when they do not all fit and magnifies the one under the cursor Dock-like.
+class PeerListSectionIndex final : public Ui::RpWidget {
+public:
+	struct Entry {
+		QString letter;
+		int contentTop = 0;
+	};
+	explicit PeerListSectionIndex(QWidget *parent);
+
+	void setLetters(std::vector<Entry> letters);
+	void setVisibleLetters(base::flat_set<QString> letters);
+	void setJumpCallback(Fn<void(int contentTop, anim::type)> callback);
+	void setScrollCallback(Fn<void(not_null<QWheelEvent*>)> callback);
+
+	[[nodiscard]] int idealWidth() const;
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void wheelEvent(QWheelEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+
+private:
+	struct Slot {
+		QString letter;
+		int sourceIndex = 0;
+		int y = 0;
+	};
+	void relayout();
+	void setCursor(QPoint position);
+	void scrubTo(int slot, anim::type animated);
+	bool updateCursorFromGlobal();
+	bool fisheyeFrame();
+	[[nodiscard]] float64 slotScale(int slotY) const;
+	[[nodiscard]] int slotAtY(int y) const;
+	[[nodiscard]] float64 columnCenterX() const;
+
+	std::vector<Entry> _letters;
+	std::vector<Slot> _slots;
+	std::vector<float64> _scale;
+	base::flat_set<QString> _visible;
+	Fn<void(int, anim::type)> _jump;
+	Fn<void(not_null<QWheelEvent*>)> _scroll;
+	int _pitch = 0;
+	int _cursorX = -1;
+	int _cursorY = -1;
+	int _current = -1;
+	bool _scrubbing = false;
+	Ui::Animations::Basic _fisheye;
+
+};
diff --git a/Telegram/SourceFiles/boxes/peer_list_widgets.cpp b/Telegram/SourceFiles/boxes/peer_list_widgets.cpp
new file mode 100644
index 00000000000000..b2f5991b1e2962
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peer_list_widgets.cpp
@@ -0,0 +1,397 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/peer_list_widgets.h"
+
+#include "ui/painter.h"
+#include "ui/widgets/buttons.h"
+#include "ui/wrap/vertical_layout.h"
+#include "styles/style_boxes.h"
+
+namespace {
+
+using State = std::unique_ptr<PeerListState>;
+
+} // namespace
+
+PeerListWidgets::PeerListWidgets(
+	not_null<Ui::RpWidget*> parent,
+	not_null<PeerListController*> controller)
+: Ui::RpWidget(parent)
+, _controller(controller)
+, _st(controller->computeListSt()) {
+	_content = base::make_unique_q<Ui::VerticalLayout>(this);
+	parent->sizeValue() | rpl::on_next([this](const QSize &size) {
+		_content->resizeToWidth(size.width());
+		resize(size.width(), _content->height());
+	}, lifetime());
+}
+
+crl::time PeerListWidgets::paintRow(
+		Painter &p,
+		crl::time now,
+		bool selected,
+		not_null<PeerListRow*> row) {
+	const auto &st = row->computeSt(_st.item);
+
+	row->lazyInitialize(st);
+	const auto outerWidth = _content->width();
+	const auto w = outerWidth;
+
+	auto refreshStatusAt = row->refreshStatusTime();
+	if (refreshStatusAt > 0 && now >= refreshStatusAt) {
+		row->refreshStatus();
+		refreshStatusAt = row->refreshStatusTime();
+	}
+	const auto refreshStatusIn = (refreshStatusAt > 0)
+		? std::max(refreshStatusAt - now, crl::time(1))
+		: 0;
+
+	row->paintUserpic(
+		p,
+		st,
+		st.photoPosition.x(),
+		st.photoPosition.y(),
+		outerWidth);
+
+	p.setPen(st::contactsNameFg);
+
+	const auto skipRight = st.photoPosition.x();
+	const auto rightActionSize = row->rightActionSize();
+	const auto rightActionMargins = rightActionSize.isEmpty()
+		? QMargins()
+		: row->rightActionMargins();
+	const auto &name = row->name();
+	const auto namePosition = st.namePosition;
+	const auto namex = namePosition.x();
+	const auto namey = namePosition.y();
+	auto namew = outerWidth - namex - skipRight;
+	if (!rightActionSize.isEmpty()
+		&& (namey < rightActionMargins.top() + rightActionSize.height())
+		&& (namey + st.nameStyle.font->height
+			> rightActionMargins.top())) {
+		namew -= rightActionMargins.left()
+			+ rightActionSize.width()
+			+ rightActionMargins.right()
+			- skipRight;
+	}
+	const auto statusx = st.statusPosition.x();
+	const auto statusy = st.statusPosition.y();
+	auto statusw = outerWidth - statusx - skipRight;
+	if (!rightActionSize.isEmpty()
+		&& (statusy < rightActionMargins.top() + rightActionSize.height())
+		&& (statusy + st::contactsStatusFont->height
+			> rightActionMargins.top())) {
+		statusw -= rightActionMargins.left()
+			+ rightActionSize.width()
+			+ rightActionMargins.right()
+			- skipRight;
+	}
+	const auto leading = row->paintNameIconGetLeadingWidth(
+		p,
+		[=] { updateRow(row); },
+		now,
+		namex,
+		namey,
+		w,
+		selected);
+	namew -= leading;
+	namew -= row->paintNameIconGetWidth(
+		p,
+		[=] { updateRow(row); },
+		now,
+		namex + leading,
+		namey,
+		name.maxWidth(),
+		namew,
+		w,
+		selected);
+	auto nameCheckedRatio = row->disabled() ? 0. : row->checkedRatio();
+	p.setPen(anim::pen(st.nameFg, st.nameFgChecked, nameCheckedRatio));
+	name.drawLeftElided(p, namex + leading, namey, namew, w);
+
+	p.setFont(st::contactsStatusFont);
+	row->paintStatusText(p, st, statusx, statusy, statusw, w, selected);
+
+	row->elementsPaint(p, outerWidth, selected, 0);
+
+	return refreshStatusIn;
+}
+
+void PeerListWidgets::appendRow(std::unique_ptr<PeerListRow> row) {
+	Expects(row != nullptr);
+
+	if (_rowsById.find(row->id()) == _rowsById.cend()) {
+		const auto raw = row.get();
+		const auto &st = raw->computeSt(_st.item);
+		raw->setAbsoluteIndex(_rows.size());
+		_rows.push_back(std::move(row));
+
+		const auto widget = _content->add(
+			object_ptr<Ui::AbstractButton>::fromRaw(
+				Ui::CreateSimpleSettingsButton(
+					_content.get(),
+					st.button.ripple,
+					st.button.textBgOver)));
+		widget->resize(widget->width(), st.height);
+		widget->paintRequest() | rpl::on_next([=, this] {
+			auto p = Painter(widget);
+			const auto selected = widget->isOver() || widget->isDown();
+			paintRow(p, crl::now(), selected, raw);
+		}, widget->lifetime());
+
+		widget->setClickedCallback([this, raw] {
+			_controller->rowClicked(raw);
+		});
+	}
+}
+
+PeerListRow *PeerListWidgets::findRow(PeerListRowId id) {
+	const auto it = _rowsById.find(id);
+	return (it == _rowsById.cend()) ? nullptr : it->second.get();
+}
+
+void PeerListWidgets::updateRow(not_null<PeerListRow*> row) {
+	const auto it = ranges::find_if(
+		_rows,
+		[row](const auto &r) { return r.get() == row; });
+	if (it != _rows.end()) {
+		const auto index = std::distance(_rows.begin(), it);
+		if (const auto widget = _content->widgetAt(index)) {
+			widget->update();
+		}
+	}
+}
+
+int PeerListWidgets::fullRowsCount() {
+	return _rows.size();
+}
+
+[[nodiscard]] not_null<PeerListRow*> PeerListWidgets::rowAt(int index) {
+	Expects(index >= 0 && index < _rows.size());
+
+	return _rows[index].get();
+}
+
+void PeerListWidgets::refreshRows() {
+	_content->resizeToWidth(width());
+	resize(width(), _content->height());
+}
+
+void PeerListWidgetsDelegate::setContent(PeerListWidgets *content) {
+	_content = content;
+}
+
+void PeerListWidgetsDelegate::setUiShow(
+		std::shared_ptr<Main::SessionShow> uiShow) {
+	_uiShow = std::move(uiShow);
+}
+
+void PeerListWidgetsDelegate::peerListSetHideEmpty(bool hide) {
+	Unexpected("...PeerListWidgetsDelegate::peerListSetHideEmpty");
+}
+
+void PeerListWidgetsDelegate::peerListAppendRow(
+		std::unique_ptr<PeerListRow> row) {
+	_content->appendRow(std::move(row));
+}
+
+void PeerListWidgetsDelegate::peerListAppendSearchRow(
+		std::unique_ptr<PeerListRow> row) {
+	Unexpected("...PeerListWidgetsDelegate::peerListAppendSearchRow");
+}
+
+void PeerListWidgetsDelegate::peerListAppendFoundRow(
+		not_null<PeerListRow*> row) {
+	Unexpected("...PeerListWidgetsDelegate::peerListAppendFoundRow");
+}
+
+void PeerListWidgetsDelegate::peerListPrependRow(
+		std::unique_ptr<PeerListRow> row) {
+	Unexpected("...PeerListWidgetsDelegate::peerListPrependRow");
+}
+
+void PeerListWidgetsDelegate::peerListPrependRowFromSearchResult(
+		not_null<PeerListRow*> row) {
+	Unexpected(
+		"...PeerListWidgetsDelegate::peerListPrependRowFromSearchResult");
+}
+
+PeerListRow* PeerListWidgetsDelegate::peerListFindRow(PeerListRowId id) {
+	return _content->findRow(id);
+}
+
+auto PeerListWidgetsDelegate::peerListLastRowMousePosition()
+-> std::optional<QPoint> {
+	Unexpected("...PeerListWidgetsDelegate::peerListLastRowMousePosition");
+}
+
+void PeerListWidgetsDelegate::peerListUpdateRow(not_null<PeerListRow*> row) {
+	_content->updateRow(row);
+}
+
+void PeerListWidgetsDelegate::peerListRemoveRow(not_null<PeerListRow*> row) {
+	Unexpected("...PeerListWidgetsDelegate::peerListRemoveRow");
+}
+
+void PeerListWidgetsDelegate::peerListConvertRowToSearchResult(
+		not_null<PeerListRow*> row) {
+	Unexpected(
+		"...PeerListWidgetsDelegate::peerListConvertRowToSearchResult");
+}
+
+void PeerListWidgetsDelegate::peerListSetRowChecked(
+		not_null<PeerListRow*> row,
+		bool checked) {
+	Unexpected("...PeerListWidgetsDelegate::peerListSetRowChecked");
+}
+
+void PeerListWidgetsDelegate::peerListSetRowHidden(
+		not_null<PeerListRow*> row,
+		bool hidden) {
+	Unexpected("...PeerListWidgetsDelegate::peerListSetRowHidden");
+}
+
+void PeerListWidgetsDelegate::peerListSetForeignRowChecked(
+		not_null<PeerListRow*> row,
+		bool checked,
+		anim::type animated) {
+}
+
+int PeerListWidgetsDelegate::peerListFullRowsCount() {
+	return _content->fullRowsCount();
+}
+
+not_null<PeerListRow*> PeerListWidgetsDelegate::peerListRowAt(int index) {
+	return _content->rowAt(index);
+}
+
+int PeerListWidgetsDelegate::peerListSearchRowsCount() {
+	Unexpected("...PeerListWidgetsDelegate::peerListSearchRowsCount");
+}
+
+not_null<PeerListRow*> PeerListWidgetsDelegate::peerListSearchRowAt(int) {
+	Unexpected("...PeerListWidgetsDelegate::peerListSearchRowAt");
+}
+
+void PeerListWidgetsDelegate::peerListRefreshRows() {
+	_content->refreshRows();
+}
+
+void PeerListWidgetsDelegate::peerListSetDescription(
+		object_ptr<Ui::FlatLabel>) {
+	Unexpected("...PeerListWidgetsDelegate::peerListSetDescription");
+}
+
+void PeerListWidgetsDelegate::peerListSetSearchNoResults(
+		object_ptr<Ui::FlatLabel>) {
+	Unexpected("...PeerListWidgetsDelegate::peerListSetSearchNoResults");
+}
+
+void PeerListWidgetsDelegate::peerListSetAboveWidget(
+		object_ptr<Ui::RpWidget>) {
+	Unexpected("...PeerListWidgetsDelegate::peerListSetAboveWidget");
+}
+
+void PeerListWidgetsDelegate::peerListSetAboveSearchWidget(
+		object_ptr<Ui::RpWidget>) {
+	Unexpected("...PeerListWidgetsDelegate::peerListSetAboveSearchWidget");
+}
+
+void PeerListWidgetsDelegate::peerListSetBelowWidget(
+		object_ptr<Ui::RpWidget>) {
+	Unexpected("...PeerListWidgetsDelegate::peerListSetBelowWidget");
+}
+
+void PeerListWidgetsDelegate::peerListSetSearchMode(PeerListSearchMode mode) {
+	Unexpected("...PeerListWidgetsDelegate::peerListSetSearchMode");
+}
+
+void PeerListWidgetsDelegate::peerListMouseLeftGeometry() {
+	Unexpected("...PeerListWidgetsDelegate::peerListMouseLeftGeometry");
+}
+
+void PeerListWidgetsDelegate::peerListSortRows(
+		Fn<bool(const PeerListRow &, const PeerListRow &)>) {
+	Unexpected("...PeerListWidgetsDelegate::peerListSortRows");
+}
+
+int PeerListWidgetsDelegate::peerListPartitionRows(
+		Fn<bool(const PeerListRow &a)> border) {
+	Unexpected("...PeerListWidgetsDelegate::peerListPartitionRows");
+}
+
+State PeerListWidgetsDelegate::peerListSaveState() const {
+	Unexpected("...PeerListWidgetsDelegate::peerListSaveState");
+	return nullptr;
+}
+
+void PeerListWidgetsDelegate::peerListRestoreState(
+		std::unique_ptr<PeerListState> state) {
+	Unexpected("...PeerListWidgetsDelegate::peerListRestoreState");
+}
+
+void PeerListWidgetsDelegate::peerListShowRowMenu(
+		not_null<PeerListRow*> row,
+		bool highlightRow,
+		Fn<void(not_null<Ui::PopupMenu*>)> destroyed) {
+}
+
+void PeerListWidgetsDelegate::peerListSelectSkip(int direction) {
+	// _content->selectSkip(direction);
+}
+
+void PeerListWidgetsDelegate::peerListPressLeftToContextMenu(bool shown) {
+	Unexpected("...PeerListWidgetsDelegate::peerListPressLeftToContextMenu");
+}
+
+bool PeerListWidgetsDelegate::peerListTrackRowPressFromGlobal(QPoint) {
+	return false;
+}
+
+std::shared_ptr<Main::SessionShow> PeerListWidgetsDelegate::peerListUiShow() {
+	Expects(_uiShow != nullptr);
+	return _uiShow;
+}
+
+void PeerListWidgetsDelegate::peerListAddSelectedPeerInBunch(
+		not_null<PeerData*> peer) {
+	Unexpected("...PeerListWidgetsDelegate::peerListAddSelectedPeerInBunch");
+}
+
+void PeerListWidgetsDelegate::peerListAddSelectedRowInBunch(
+		not_null<PeerListRow*> row) {
+	Unexpected("...PeerListWidgetsDelegate::peerListAddSelectedRowInBunch");
+}
+
+void PeerListWidgetsDelegate::peerListFinishSelectedRowsBunch() {
+	Unexpected("...PeerListWidgetsDelegate::peerListFinishSelectedRowsBunch");
+}
+
+void PeerListWidgetsDelegate::peerListSetTitle(rpl::producer<QString> title) {
+	Unexpected("...PeerListWidgetsDelegate::peerListSetTitle");
+}
+
+void PeerListWidgetsDelegate::peerListSetAdditionalTitle(
+		rpl::producer<QString> title) {
+	Unexpected("...PeerListWidgetsDelegate::peerListSetAdditionalTitle");
+}
+
+bool PeerListWidgetsDelegate::peerListIsRowChecked(
+		not_null<PeerListRow*> row) {
+	Unexpected("...PeerListWidgetsDelegate::peerListIsRowChecked");
+	return false;
+}
+
+void PeerListWidgetsDelegate::peerListScrollToTop() {
+	Unexpected("...PeerListWidgetsDelegate::peerListScrollToTop");
+}
+
+int PeerListWidgetsDelegate::peerListSelectedRowsCount() {
+	Unexpected("...PeerListWidgetsDelegate::peerListSelectedRowsCount");
+	return 0;
+}
diff --git a/Telegram/SourceFiles/boxes/peer_list_widgets.h b/Telegram/SourceFiles/boxes/peer_list_widgets.h
new file mode 100644
index 00000000000000..d139487bcabaef
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peer_list_widgets.h
@@ -0,0 +1,110 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "boxes/peer_list_box.h"
+
+namespace Ui {
+class VerticalLayout;
+} // namespace Ui
+
+class PeerListWidgets : public Ui::RpWidget {
+public:
+	PeerListWidgets(
+		not_null<Ui::RpWidget*> parent,
+		not_null<PeerListController*> controller);
+
+	crl::time paintRow(
+		Painter &p,
+		crl::time now,
+		bool selected,
+		not_null<PeerListRow*> row);
+	void appendRow(std::unique_ptr<PeerListRow> row);
+	PeerListRow* findRow(PeerListRowId id);
+	void updateRow(not_null<PeerListRow*> row);
+	int fullRowsCount();
+	[[nodiscard]] not_null<PeerListRow*> rowAt(int index);
+	void refreshRows();
+
+private:
+	const not_null<PeerListController*> _controller;
+	const style::PeerList &_st;
+	base::unique_qptr<Ui::VerticalLayout> _content;
+
+	std::vector<std::unique_ptr<PeerListRow>> _rows;
+	std::map<PeerListRowId, not_null<PeerListRow*>> _rowsById;
+	std::map<PeerData*, std::vector<not_null<PeerListRow*>>> _rowsByPeer;
+};
+
+class PeerListWidgetsDelegate : public PeerListDelegate {
+public:
+	void setContent(PeerListWidgets *content);
+	void setUiShow(std::shared_ptr<Main::SessionShow> uiShow);
+
+	void peerListSetHideEmpty(bool hide) override;
+	void peerListAppendRow(std::unique_ptr<PeerListRow> row) override;
+	void peerListAppendSearchRow(std::unique_ptr<PeerListRow> row) override;
+	void peerListAppendFoundRow(not_null<PeerListRow*> row) override;
+	void peerListPrependRow(std::unique_ptr<PeerListRow> row) override;
+	void peerListPrependRowFromSearchResult(
+		not_null<PeerListRow*> row) override;
+	PeerListRow *peerListFindRow(PeerListRowId id) override;
+	std::optional<QPoint> peerListLastRowMousePosition() override;
+	void peerListUpdateRow(not_null<PeerListRow*> row) override;
+	void peerListRemoveRow(not_null<PeerListRow*> row) override;
+	void peerListConvertRowToSearchResult(
+		not_null<PeerListRow*> row) override;
+	void peerListSetRowChecked(
+		not_null<PeerListRow*> row,
+		bool checked) override;
+	void peerListSetRowHidden(
+		not_null<PeerListRow*> row,
+		bool hidden) override;
+	void peerListSetForeignRowChecked(
+		not_null<PeerListRow*> row,
+		bool checked,
+		anim::type animated) override;
+	int peerListFullRowsCount() override;
+	not_null<PeerListRow*> peerListRowAt(int index) override;
+	int peerListSearchRowsCount() override;
+	not_null<PeerListRow*> peerListSearchRowAt(int index) override;
+	void peerListRefreshRows() override;
+	void peerListSetDescription(object_ptr<Ui::FlatLabel>) override;
+	void peerListSetSearchNoResults(object_ptr<Ui::FlatLabel>) override;
+	void peerListSetAboveWidget(object_ptr<Ui::RpWidget>) override;
+	void peerListSetAboveSearchWidget(object_ptr<Ui::RpWidget>) override;
+	void peerListSetBelowWidget(object_ptr<Ui::RpWidget>) override;
+	void peerListSetSearchMode(PeerListSearchMode mode) override;
+	void peerListMouseLeftGeometry() override;
+	void peerListSortRows(
+		Fn<bool(const PeerListRow &, const PeerListRow &)>) override;
+	int peerListPartitionRows(Fn<bool(const PeerListRow &a)> border) override;
+	std::unique_ptr<PeerListState> peerListSaveState() const override;
+	void peerListRestoreState(std::unique_ptr<PeerListState> state) override;
+	void peerListShowRowMenu(
+		not_null<PeerListRow*> row,
+		bool highlightRow,
+		Fn<void(not_null<Ui::PopupMenu*>)> destroyed = nullptr) override;
+	void peerListSelectSkip(int direction) override;
+	void peerListPressLeftToContextMenu(bool shown) override;
+	bool peerListTrackRowPressFromGlobal(QPoint globalPosition) override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
+	void peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) override;
+	void peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) override;
+	void peerListFinishSelectedRowsBunch() override;
+	void peerListSetTitle(rpl::producer<QString> title) override;
+	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
+	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
+	void peerListScrollToTop() override;
+	int peerListSelectedRowsCount() override;
+
+private:
+	PeerListWidgets *_content = nullptr;
+	std::shared_ptr<Main::SessionShow> _uiShow;
+
+};
diff --git a/Telegram/SourceFiles/boxes/peer_lists_box.cpp b/Telegram/SourceFiles/boxes/peer_lists_box.cpp
index 9929840ab2aab1..156d259fa0096b 100644
--- a/Telegram/SourceFiles/boxes/peer_lists_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_lists_box.cpp
@@ -90,7 +90,7 @@ void PeerListsBox::createMultiSelect() {
 		tr::lng_participant_filter());
 	_select.create(this, std::move(entity));
 	_select->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { updateScrollSkips(); },
 		lifetime());
 	_select->entity()->setSubmittedCallback([=](Qt::KeyboardModifiers) {
@@ -146,19 +146,19 @@ void PeerListsBox::updateScrollSkips() {
 }
 
 void PeerListsBox::prepare() {
-	auto rows = setInnerWidget(
+	_rows = setInnerWidget(
 		object_ptr<Ui::VerticalLayout>(this),
 		st::boxScroll);
 	for (auto &list : _lists) {
-		const auto content = rows->add(object_ptr<PeerListContent>(
-			rows,
+		const auto content = _rows->add(object_ptr<PeerListContent>(
+			_rows,
 			list.controller.get()));
 		list.content = content;
 		list.delegate->setContent(content);
 		list.controller->setDelegate(list.delegate.get());
 
 		content->scrollToRequests(
-		) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
+		) | rpl::on_next([=](Ui::ScrollToRequest request) {
 			const auto skip = content->y();
 			scrollToY(
 				skip + request.ymin,
@@ -168,7 +168,7 @@ void PeerListsBox::prepare() {
 		content->selectedIndexValue(
 		) | rpl::filter([=](int index) {
 			return (index >= 0);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			for (const auto &list : _lists) {
 				if (list.content && list.content != content) {
 					list.content->clearSelection();
@@ -176,9 +176,16 @@ void PeerListsBox::prepare() {
 			}
 		}, lifetime());
 	}
-	rows->resizeToWidth(firstController()->contentWidth());
-
-	setDimensions(firstController()->contentWidth(), st::boxMaxListHeight);
+	_rows->resizeToWidth(firstController()->contentWidth());
+
+	{
+		setDimensions(
+			firstController()->contentWidth(),
+			std::clamp(
+				_rows->height(),
+				st::boxMaxListHeight,
+				st::boxMaxListHeight * 3));
+	}
 	if (_select) {
 		_select->finishAnimating();
 		Ui::SendPendingMoveResizeEvents(_select);
@@ -343,6 +350,23 @@ void PeerListsBox::Delegate::peerListSetForeignRowChecked(
 	}
 }
 
+not_null<Ui::RpWidget*> PeerListsBox::addSeparatorBefore(
+		int listIndex,
+		object_ptr<Ui::RpWidget> widget) {
+	Assert(!(listIndex < 0 || listIndex >= int(_lists.size()) || !_rows));
+	const auto position = listIndex * 2;
+	auto wrapped = object_ptr<Ui::SlideWrap<>>(
+		_rows,
+		std::move(widget));
+	_lists[listIndex].content->heightValue(
+	) | rpl::on_next([=, separator = wrapped.data()](int h) {
+		separator->toggle(h > 0, anim::type::instant);
+	}, wrapped->lifetime());
+	_lists[listIndex].separator = wrapped.data();
+	_rows->insert(position, std::move(wrapped));
+	return _lists[listIndex].separator;
+}
+
 void PeerListsBox::Delegate::peerListScrollToTop() {
 	_box->scrollToY(0);
 }
diff --git a/Telegram/SourceFiles/boxes/peer_lists_box.h b/Telegram/SourceFiles/boxes/peer_lists_box.h
index 20377548a4a470..182af18963cc45 100644
--- a/Telegram/SourceFiles/boxes/peer_lists_box.h
+++ b/Telegram/SourceFiles/boxes/peer_lists_box.h
@@ -9,6 +9,10 @@ For license and copyright information please follow this link:
 
 #include "boxes/peer_list_box.h"
 
+namespace Ui {
+class VerticalLayout;
+} // namespace Ui
+
 class PeerListsBox : public Ui::BoxContent {
 public:
 	PeerListsBox(
@@ -16,6 +20,10 @@ class PeerListsBox : public Ui::BoxContent {
 		std::vector<std::unique_ptr<PeerListController>> controllers,
 		Fn<void(not_null<PeerListsBox*>)> init);
 
+	not_null<Ui::RpWidget*> addSeparatorBefore(
+		int listIndex,
+		object_ptr<Ui::RpWidget> widget);
+
 	[[nodiscard]] std::vector<not_null<PeerData*>> collectSelectedRows();
 
 protected:
@@ -66,6 +74,7 @@ class PeerListsBox : public Ui::BoxContent {
 		std::unique_ptr<PeerListController> controller;
 		std::unique_ptr<Delegate> delegate;
 		PeerListContent *content = nullptr;
+		Ui::SlideWrap<Ui::RpWidget> *separator = nullptr;
 	};
 
 	friend class Delegate;
@@ -99,5 +108,6 @@ class PeerListsBox : public Ui::BoxContent {
 	std::vector<List> _lists;
 	Fn<void(PeerListsBox*)> _init;
 	bool _scrollBottomFixed = false;
+	Ui::VerticalLayout *_rows = nullptr;
 
 };
diff --git a/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp b/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp
index 14e00151b4931c..d8c6001d4cd9c8 100644
--- a/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp
@@ -65,7 +65,7 @@ Controller::Controller(
 , _callback(std::move(callback)) {
 	std::move(
 		add
-	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+	) | rpl::on_next([=](not_null<PeerData*> peer) {
 		if (_prepared) {
 			addRow(peer);
 		} else {
@@ -111,6 +111,9 @@ void AddBotToGroupBoxController::Start(
 		Scope scope,
 		const QString &token,
 		ChatAdminRights requestedRights) {
+	if (controller->showFrozenError()) {
+		return;
+	}
 	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->addButton(tr::lng_cancel(), [box] { box->closeBox(); });
 	};
@@ -160,8 +163,8 @@ void AddBotToGroupBoxController::requestExistingRights(
 	_bot->session().api().request(_existingRightsRequestId).cancel();
 	_existingRightsRequestId = _bot->session().api().request(
 		MTPchannels_GetParticipant(
-			_existingRightsChannel->inputChannel,
-			_bot->input)
+			_existingRightsChannel->inputChannel(),
+			_bot->input())
 	).done([=](const MTPchannels_ChannelParticipant &result) {
 		result.match([&](const MTPDchannels_channelParticipant &data) {
 			channel->owner().processUsers(data.vusers());
@@ -214,7 +217,7 @@ void AddBotToGroupBoxController::addBotToGroup(not_null<PeerData*> chat) {
 		controller->hideLayer();
 		controller->showPeerHistory(chat, Way::ClearStack, ShowAtUnreadMsgId);
 	};
-	const auto rights = requestedAddAdmin
+	const auto rights = (requestedAddAdmin && _requestedRights != 0)
 		? _requestedRights
 		: (chat->isBroadcast()
 			&& chat->asBroadcast()->canAddAdmins())
@@ -230,8 +233,8 @@ void AddBotToGroupBoxController::addBotToGroup(not_null<PeerData*> chat) {
 		const auto token = _token;
 		const auto done = [=](
 				ChatAdminRightsInfo newRights,
-				const QString &rank) {
-			if (scope == Scope::GroupAdmin) {
+				const std::optional<QString> &rank) {
+			if (scope == Scope::GroupAdmin && !token.isEmpty()) {
 				chat->session().api().sendBotStart(show, bot, chat, token);
 			}
 			close();
@@ -356,7 +359,7 @@ object_ptr<Ui::RpWidget> AddBotToGroupBoxController::prepareAdminnedChats() {
 		delegate->setContent(content);
 		controller->setDelegate(delegate);
 
-		items.events() | rpl::take(1) | rpl::start_with_next([=] {
+		items.events() | rpl::take(1) | rpl::on_next([=] {
 			wrap->show(anim::type::instant);
 		}, inner->lifetime());
 	};
@@ -370,7 +373,7 @@ object_ptr<Ui::RpWidget> AddBotToGroupBoxController::prepareAdminnedChats() {
 	rpl::merge(
 		_groups.events(),
 		_channels.events()
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		container->add(CreatePeerListSectionSubtitle(
 			container,
 			tr::lng_bot_groups()));
@@ -400,7 +403,7 @@ void AddBotToGroupBoxController::prepareViewHook() {
 	session().data().chatsListLoadedEvents(
 	) | rpl::filter([=](Data::Folder *folder) {
 		return !folder;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateLabels();
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
index ab48b6b8d826db..d6334476c512c7 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
@@ -9,10 +9,12 @@ For license and copyright information please follow this link:
 
 #include "api/api_chat_participants.h"
 #include "api/api_invite_links.h"
+#include "api/api_premium.h"
 #include "boxes/peers/edit_participant_box.h"
 #include "boxes/peers/edit_peer_type_box.h"
 #include "boxes/peers/replace_boost_box.h"
 #include "boxes/max_invite_box.h"
+#include "chat_helpers/message_field.h"
 #include "lang/lang_keys.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
@@ -22,11 +24,12 @@ For license and copyright information please follow this link:
 #include "data/data_changes.h"
 #include "data/data_peer_values.h"
 #include "history/history.h"
+#include "history/history_item_helpers.h"
 #include "dialogs/dialogs_indexed_list.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/boxes/show_or_premium_box.h"
 #include "ui/effects/premium_graphics.h"
-#include "ui/text/text_utilities.h" // Ui::Text::RichLangValue
+#include "ui/text/text_utilities.h" // tr::rich
 #include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
@@ -36,7 +39,7 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "main/main_session.h"
 #include "mtproto/mtproto_config.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "window/window_session_controller.h"
 #include "info/profile/info_profile_icon.h"
 #include "apiwrap.h"
@@ -52,16 +55,39 @@ constexpr auto kUserpicsLimit = 3;
 
 class ForbiddenRow final : public PeerListRow {
 public:
-	ForbiddenRow(not_null<PeerData*> peer, bool locked);
+	ForbiddenRow(
+		not_null<PeerData*> peer,
+		not_null<const style::PeerListItem*> lockSt,
+		bool locked);
 
 	PaintRoundImageCallback generatePaintUserpicCallback(
 		bool forceRound) override;
 
+	Api::MessageMoneyRestriction restriction() const;
+	void setRestriction(Api::MessageMoneyRestriction restriction);
+
+	void preloadUserpic() override;
+	void paintUserpicOverlay(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int outerWidth) override;
+
+	bool refreshLock();
+
 private:
+	struct Restriction {
+		Api::MessageMoneyRestriction value;
+		RestrictionBadgeCache cache;
+	};
+
 	const bool _locked = false;
+	const not_null<const style::PeerListItem*> _lockSt;
 	QImage _disabledFrame;
 	InMemoryKey _userpicKey;
 	int _paletteVersion = 0;
+	std::shared_ptr<Restriction> _restriction;
 
 };
 
@@ -81,6 +107,9 @@ class InviteForbiddenController final : public PeerListController {
 	[[nodiscard]] rpl::producer<int> selectedValue() const {
 		return _selected.value();
 	}
+	[[nodiscard]] rpl::producer<int> starsToSend() const {
+		return _starsToSend.value();
+	}
 
 	void send(
 		std::vector<not_null<PeerData*>> list,
@@ -89,10 +118,16 @@ class InviteForbiddenController final : public PeerListController {
 
 private:
 	void appendRow(not_null<UserData*> user);
-	[[nodiscard]] std::unique_ptr<PeerListRow> createRow(
+	[[nodiscard]] std::unique_ptr<ForbiddenRow> createRow(
 		not_null<UserData*> user) const;
 	[[nodiscard]] bool canInvite(not_null<PeerData*> peer) const;
 
+	void send(
+		std::vector<not_null<PeerData*>> list,
+		Ui::ShowPtr show,
+		Fn<void()> close,
+		Api::SendOptions options);
+
 	void setSimpleCover();
 	void setComplexCover();
 
@@ -101,8 +136,11 @@ class InviteForbiddenController final : public PeerListController {
 	const std::vector<not_null<UserData*>> &_users;
 	const bool _can = false;
 	rpl::variable<int> _selected;
+	rpl::variable<int> _starsToSend;
 	bool _sending = false;
 
+	rpl::lifetime _paymentCheckLifetime;
+
 };
 
 base::flat_set<not_null<UserData*>> GetAlreadyInFromPeer(PeerData *peer) {
@@ -141,6 +179,7 @@ void FillUpgradeToPremiumCover(
 		CreateUserpicsWithMoreBadge(
 			container,
 			rpl::single(std::move(userpicPeers)),
+			st::boostReplaceUserpicsRow,
 			kUserpicsLimit),
 		st::inviteForbiddenUserpicsPadding)
 	)->entity()->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -152,17 +191,17 @@ void FillUpgradeToPremiumCover(
 	for (auto i = 0; i != names; ++i) {
 		const auto name = userpicUsers[i]->shortName();
 		if (text.empty()) {
-			text = Ui::Text::Bold(name);
+			text = tr::bold(name);
 		} else if (i == names - 1 && !remaining) {
 			text = tr::lng_invite_upgrade_users_few(
 				tr::now,
 				lt_users,
 				text,
 				lt_last,
-				Ui::Text::Bold(name),
-				Ui::Text::RichLangValue);
+				tr::bold(name),
+				tr::rich);
 		} else {
-			text.append(", ").append(Ui::Text::Bold(name));
+			text.append(", ").append(tr::bold(name));
 		}
 	}
 	if (remaining > 0) {
@@ -172,7 +211,7 @@ void FillUpgradeToPremiumCover(
 			remaining,
 			lt_users,
 			text,
-			Ui::Text::RichLangValue);
+			tr::rich);
 	}
 	const auto inviteOnly = !forbidden.premiumAllowsInvite.empty()
 		&& (forbidden.premiumAllowsWrite.size() != forbidden.users.size());
@@ -188,13 +227,14 @@ void FillUpgradeToPremiumCover(
 				int(userpicUsers.size()),
 				lt_users,
 				text,
-				Ui::Text::RichLangValue);
+				tr::rich);
 	container->add(
 		object_ptr<Ui::FlatLabel>(
 			container,
 			rpl::single(text),
 			st::inviteForbiddenInfo),
-		st::inviteForbiddenInfoPadding);
+		st::inviteForbiddenInfoPadding,
+		style::al_top);
 }
 
 void SimpleForbiddenBox(
@@ -233,7 +273,7 @@ void SimpleForbiddenBox(
 
 	Data::AmPremiumValue(
 		&peer->session()
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		box->closeBox();
 	}, box->lifetime());
 }
@@ -256,11 +296,17 @@ Main::Session &InviteForbiddenController::session() const {
 	return _peer->session();
 }
 
-ForbiddenRow::ForbiddenRow(not_null<PeerData*> peer, bool locked)
+ForbiddenRow::ForbiddenRow(
+	not_null<PeerData*> peer,
+	not_null<const style::PeerListItem*> lockSt,
+	bool locked)
 : PeerListRow(peer)
-, _locked(locked) {
+, _locked(locked)
+, _lockSt(lockSt) {
 	if (_locked) {
 		setCustomStatus(tr::lng_invite_status_disabled(tr::now));
+	} else {
+		setRestriction(Api::ResolveMessageMoneyRestrictions(peer, nullptr));
 	}
 }
 
@@ -339,6 +385,76 @@ PaintRoundImageCallback ForbiddenRow::generatePaintUserpicCallback(
 	};
 }
 
+
+Api::MessageMoneyRestriction ForbiddenRow::restriction() const {
+	return _restriction
+		? _restriction->value
+		: Api::MessageMoneyRestriction();
+}
+
+void ForbiddenRow::setRestriction(Api::MessageMoneyRestriction restriction) {
+	if (!restriction || !restriction.starsPerMessage) {
+		_restriction = nullptr;
+		return;
+	} else if (!_restriction) {
+		_restriction = std::make_unique<Restriction>();
+	}
+	_restriction->value = restriction;
+}
+
+void ForbiddenRow::paintUserpicOverlay(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int outerWidth) {
+	if (const auto &r = _restriction) {
+		PaintRestrictionBadge(
+			p,
+			_lockSt,
+			r->value.starsPerMessage,
+			r->cache,
+			x,
+			y,
+			outerWidth,
+			st.photoSize);
+	}
+}
+
+bool ForbiddenRow::refreshLock() {
+	if (_locked) {
+		return false;
+	} else if (const auto user = peer()->asUser()) {
+		using Restriction = Api::MessageMoneyRestriction;
+		auto r = Api::ResolveMessageMoneyRestrictions(user, nullptr);
+		if (!r || !r.starsPerMessage) {
+			r = Restriction();
+		}
+		if ((_restriction ? _restriction->value : Restriction()) != r) {
+			setRestriction(r);
+			return true;
+		}
+	}
+	return false;
+}
+
+void ForbiddenRow::preloadUserpic() {
+	PeerListRow::preloadUserpic();
+
+	const auto peer = this->peer();
+	const auto known = Api::ResolveMessageMoneyRestrictions(
+		peer,
+		nullptr).known;
+	if (known) {
+		return;
+	} else if (const auto user = peer->asUser()) {
+		const auto api = &user->session().api();
+		api->premium().resolveMessageMoneyRestrictions(user);
+	} else if (const auto group = peer->asChannel()) {
+		group->updateFull();
+	}
+}
+
 void InviteForbiddenController::setSimpleCover() {
 	delegate()->peerListSetTitle(
 		_can ? tr::lng_profile_add_via_link() : tr::lng_via_link_cant());
@@ -358,11 +474,11 @@ void InviteForbiddenController::setSimpleCover() {
 		? phraseCounted(
 			lt_count,
 			rpl::single<float64>(count),
-			Ui::Text::RichLangValue)
+			tr::rich)
 		: phraseNamed(
 			lt_user,
 			rpl::single(TextWithEntities{ _users.front()->name() }),
-			Ui::Text::RichLangValue);
+			tr::rich);
 	delegate()->peerListSetAboveWidget(object_ptr<Ui::PaddingWrap<>>(
 		(QWidget*)nullptr,
 		object_ptr<Ui::FlatLabel>(
@@ -396,7 +512,8 @@ void InviteForbiddenController::setComplexCover() {
 		if (_can) {
 			container->add(
 				MakeShowOrLabel(container, tr::lng_invite_upgrade_or()),
-				st::inviteForbiddenOrLabelPadding);
+				st::inviteForbiddenOrLabelPadding,
+				style::al_justify);
 		}
 		container->add(
 			object_ptr<Ui::FlatLabel>(
@@ -405,36 +522,62 @@ void InviteForbiddenController::setComplexCover() {
 					? tr::lng_invite_upgrade_via_title()
 					: tr::lng_via_link_cant()),
 				st::inviteForbiddenTitle),
-			st::inviteForbiddenTitlePadding);
+			st::inviteForbiddenTitlePadding,
+			style::al_top);
 
 		const auto about = _can
 			? (_peer->isBroadcast()
 				? tr::lng_invite_upgrade_via_channel_about
 				: tr::lng_invite_upgrade_via_group_about)(
 					tr::now,
-					Ui::Text::WithEntities)
+					tr::marked)
 			: (_forbidden.users.size() == 1
 				? tr::lng_via_link_cant_one(
 					tr::now,
 					lt_user,
 					TextWithEntities{ _forbidden.users.front()->shortName() },
-					Ui::Text::RichLangValue)
+					tr::rich)
 				: tr::lng_via_link_cant_many(
 					tr::now,
 					lt_count,
 					int(_forbidden.users.size()),
-					Ui::Text::RichLangValue));
+					tr::rich));
 		container->add(
 			object_ptr<Ui::FlatLabel>(
 				container,
 				rpl::single(about),
 				st::inviteForbiddenInfo),
-			st::inviteForbiddenInfoPadding);
+			st::inviteForbiddenInfoPadding,
+			style::al_top);
 	}
 	delegate()->peerListSetAboveWidget(std::move(cover));
 }
 
 void InviteForbiddenController::prepare() {
+	session().api().premium().someMessageMoneyRestrictionsResolved(
+	) | rpl::on_next([=] {
+		auto stars = 0;
+		const auto process = [&](not_null<PeerListRow*> raw) {
+			const auto row = static_cast<ForbiddenRow*>(raw.get());
+			if (row->refreshLock()) {
+				delegate()->peerListUpdateRow(raw);
+			}
+			if (const auto r = row->restriction()) {
+				stars += r.starsPerMessage;
+			}
+		};
+		auto count = delegate()->peerListFullRowsCount();
+		for (auto i = 0; i != count; ++i) {
+			process(delegate()->peerListRowAt(i));
+		}
+		_starsToSend = stars;
+
+		count = delegate()->peerListSearchRowsCount();
+		for (auto i = 0; i != count; ++i) {
+			process(delegate()->peerListSearchRowAt(i));
+		}
+	}, lifetime());
+
 	if (session().premium()
 		|| (_forbidden.premiumAllowsInvite.empty()
 			&& _forbidden.premiumAllowsWrite.empty())) {
@@ -464,6 +607,11 @@ void InviteForbiddenController::rowClicked(not_null<PeerListRow*> row) {
 	const auto checked = row->checked();
 	delegate()->peerListSetRowChecked(row, !checked);
 	_selected = _selected.current() + (checked ? -1 : 1);
+	const auto r = static_cast<ForbiddenRow*>(row.get())->restriction();
+	if (r.starsPerMessage) {
+		_starsToSend = _starsToSend.current()
+			+ (checked ? -r.starsPerMessage : r.starsPerMessage);
+	}
 }
 
 void InviteForbiddenController::appendRow(not_null<UserData*> user) {
@@ -473,6 +621,9 @@ void InviteForbiddenController::appendRow(not_null<UserData*> user) {
 		delegate()->peerListAppendRow(std::move(row));
 		if (canInvite(user)) {
 			delegate()->peerListSetRowChecked(raw, true);
+			if (const auto r = raw->restriction()) {
+				_starsToSend = _starsToSend.current() + r.starsPerMessage;
+			}
 		}
 	}
 }
@@ -481,7 +632,64 @@ void InviteForbiddenController::send(
 		std::vector<not_null<PeerData*>> list,
 		Ui::ShowPtr show,
 		Fn<void()> close) {
-	if (_sending || list.empty()) {
+	send(list, show, close, {});
+}
+
+void InviteForbiddenController::send(
+		std::vector<not_null<PeerData*>> list,
+		Ui::ShowPtr show,
+		Fn<void()> close,
+		Api::SendOptions options) {
+	if (list.empty()) {
+		return;
+	}
+	_paymentCheckLifetime.destroy();
+
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = options;
+		copy.starsApproved = approved;
+		send(list, show, close, copy);
+	};
+	const auto messagesCount = 1;
+	const auto alreadyApproved = options.starsApproved;
+	auto paid = std::vector<not_null<PeerData*>>();
+	auto waiting = base::flat_set<not_null<PeerData*>>();
+	auto totalStars = 0;
+	for (const auto &peer : list) {
+		const auto details = ComputePaymentDetails(peer, messagesCount);
+		if (!details) {
+			waiting.emplace(peer);
+		} else if (details->stars > 0) {
+			totalStars += details->stars;
+			paid.push_back(peer);
+		}
+	}
+	if (!waiting.empty()) {
+		session().changes().peerUpdates(
+			Data::PeerUpdate::Flag::FullInfo
+		) | rpl::on_next([=](const Data::PeerUpdate &update) {
+			if (waiting.contains(update.peer)) {
+				withPaymentApproved(alreadyApproved);
+			}
+		}, _paymentCheckLifetime);
+
+		if (!session().credits().loaded()) {
+			session().credits().loadedValue(
+			) | rpl::filter(
+				rpl::mappers::_1
+			) | rpl::take(1) | rpl::on_next([=] {
+				withPaymentApproved(alreadyApproved);
+			}, _paymentCheckLifetime);
+		}
+		return;
+	} else if (totalStars > alreadyApproved) {
+		const auto sessionShow = Main::MakeSessionShow(show, &session());
+		ShowSendPaidConfirm(sessionShow, paid, SendPaymentDetails{
+			.messages = messagesCount,
+			.stars = totalStars,
+		}, [=] { withPaymentApproved(totalStars); });
+		return;
+	} else if (_sending) {
 		return;
 	}
 	_sending = true;
@@ -492,12 +700,18 @@ void InviteForbiddenController::send(
 		if (link.isEmpty()) {
 			return false;
 		}
+		auto full = options;
 		auto &api = _peer->session().api();
-		auto options = Api::SendOptions();
 		for (const auto &to : list) {
+			auto copy = full;
+			copy.starsApproved = std::min(
+				to->starsPerMessageChecked(),
+				full.starsApproved);
+			full.starsApproved -= copy.starsApproved;
+
 			const auto history = to->owner().history(to);
 			auto message = Api::MessageToSend(
-				Api::SendAction(history, options));
+				Api::SendAction(history, copy));
 			message.textWithTags = { link };
 			message.action.clearDraft = false;
 			api.sendMessage(std::move(message));
@@ -507,12 +721,12 @@ void InviteForbiddenController::send(
 				tr::now,
 				lt_user,
 				TextWithEntities{ list.front()->name() },
-				Ui::Text::RichLangValue)
+				tr::rich)
 			: tr::lng_via_link_shared_many(
 				tr::now,
 				lt_count,
 				int(list.size()),
-				Ui::Text::RichLangValue);
+				tr::rich);
 		close();
 		show->showToast(std::move(text));
 		return true;
@@ -536,16 +750,17 @@ void InviteForbiddenController::send(
 		_peer->session().changes().peerUpdates(
 			_peer,
 			Data::PeerUpdate::Flag::FullInfo
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			sendForFull();
 		}, lifetime());
 	}
 }
 
-std::unique_ptr<PeerListRow> InviteForbiddenController::createRow(
+std::unique_ptr<ForbiddenRow> InviteForbiddenController::createRow(
 		not_null<UserData*> user) const {
 	const auto locked = _can && !canInvite(user);
-	return std::make_unique<ForbiddenRow>(user, locked);
+	const auto lockSt = &computeListSt().item;
+	return std::make_unique<ForbiddenRow>(user, lockSt, locked);
 }
 
 } // namespace
@@ -584,8 +799,8 @@ void AddParticipantsBoxController::subscribeToMigration() {
 }
 
 void AddParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {
-	const auto premiumRequiredError = WritePremiumRequiredError;
-	if (RecipientRow::ShowLockedError(this, row, premiumRequiredError)) {
+	const auto moneyRestrictionError = WriteMoneyRestrictionError;
+	if (RecipientRow::ShowLockedError(this, row, moneyRestrictionError)) {
 		return;
 	}
 	const auto &serverConfig = session().serverConfig();
@@ -598,7 +813,7 @@ void AddParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {
 		updateTitle();
 	} else if (const auto channel = _peer ? _peer->asChannel() : nullptr) {
 		if (!_peer->isMegagroup()) {
-			showBox(Box<MaxInviteBox>(_peer->asChannel()));
+			showBox(Box<MaxInviteBox>(channel));
 		}
 	} else if (count >= serverConfig.chatSizeMax
 		&& count < serverConfig.megagroupSizeMax) {
@@ -614,7 +829,7 @@ void AddParticipantsBoxController::itemDeselectedHook(
 void AddParticipantsBoxController::prepareViewHook() {
 	updateTitle();
 
-	TrackPremiumRequiredChanges(this, lifetime());
+	TrackMessageMoneyRestrictionsChanges(this, lifetime());
 }
 
 int AddParticipantsBoxController::alreadyInCount() const {
@@ -687,9 +902,9 @@ bool AddParticipantsBoxController::needsInviteLinkButton() {
 	return _peer->asChat()->canHaveInviteLink();
 }
 
-QPointer<Ui::BoxContent> AddParticipantsBoxController::showBox(
+base::weak_qptr<Ui::BoxContent> AddParticipantsBoxController::showBox(
 		object_ptr<Ui::BoxContent> box) const {
-	const auto weak = Ui::MakeWeak(box.data());
+	const auto weak = base::make_weak(box.data());
 	delegate()->peerListUiShow()->showBox(std::move(box));
 	return weak;
 }
@@ -711,7 +926,7 @@ void AddParticipantsBoxController::addInviteLinkButton() {
 		st::inviteViaLinkIcon,
 		QPoint());
 	button->entity()->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		icon->moveToLeft(
 			st::inviteViaLinkIconPosition.x(),
 			(height - st::inviteViaLinkIcon.height()) / 2);
@@ -723,7 +938,7 @@ void AddParticipantsBoxController::addInviteLinkButton() {
 	button->entity()->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return (e->type() == QEvent::Enter);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		delegate()->peerListMouseLeftGeometry();
 	}, button->lifetime());
 	delegate()->peerListSetAboveWidget(std::move(button));
@@ -765,7 +980,7 @@ void AddParticipantsBoxController::inviteSelectedUsers(
 			tr::lng_participant_invite_history(),
 			true,
 			st::defaultBoxCheckbox);
-		const auto weak = Ui::MakeWeak(checkbox.data());
+		const auto weak = base::make_weak(checkbox.data());
 
 		auto text = (users.size() == 1)
 			? tr::lng_participant_invite_sure(
@@ -774,14 +989,14 @@ void AddParticipantsBoxController::inviteSelectedUsers(
 				{ users.front()->name()},
 				lt_group,
 				{ _peer->name()},
-				Ui::Text::RichLangValue)
+				tr::rich)
 			: tr::lng_participant_invite_sure_many(
 				tr::now,
 				lt_count,
 				int(users.size()),
 				lt_group,
 				{ _peer->name() },
-				Ui::Text::RichLangValue);
+				tr::rich);
 		Ui::ConfirmBox(box, {
 			.text = std::move(text),
 			.confirmed = crl::guard(weak, [=](Fn<void()> &&close) {
@@ -847,7 +1062,7 @@ void AddParticipantsBoxController::Start(
 			[=] { box->closeBox(); });
 		if (justCreated) {
 			const auto weak = base::make_weak(parent);
-			box->boxClosing() | rpl::start_with_next([=] {
+			box->boxClosing() | rpl::on_next([=] {
 				auto params = Window::SectionShow();
 				params.activation = anim::activation::background;
 				if (const auto strong = weak.get()) {
@@ -855,6 +1070,10 @@ void AddParticipantsBoxController::Start(
 						channel,
 						params,
 						ShowAtTheEndMsgId);
+					channel->owner().addRecentJoinChat({
+						.fromPeerId = channel->id,
+						.joinedPeerId = channel->id,
+					});
 				}
 			}, box->lifetime());
 		}
@@ -926,15 +1145,18 @@ bool ChatInviteForbidden(
 		) | rpl::map(
 			rpl::mappers::_1 > 0
 		) | rpl::distinct_until_changed(
-		) | rpl::start_with_next([=](bool has) {
+		) | rpl::on_next([=](bool has) {
 			box->clearButtons();
 			if (has) {
-				box->addButton(tr::lng_via_link_send(), [=] {
+				const auto send = box->addButton(tr::lng_via_link_send(), [=] {
 					weak->send(
 						box->collectSelectedRows(),
 						box->uiShow(),
 						crl::guard(box, [=] { box->closeBox(); }));
 				});
+				send->setText(PaidSendButtonText(
+					weak->starsToSend(),
+					tr::lng_via_link_send()));
 			}
 			box->addButton(tr::lng_create_group_skip(), [=] {
 				box->closeBox();
@@ -943,7 +1165,7 @@ bool ChatInviteForbidden(
 
 		Data::AmPremiumValue(
 			&peer->session()
-		) | rpl::skip(1) | rpl::start_with_next([=] {
+		) | rpl::skip(1) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	};
@@ -991,9 +1213,9 @@ void AddSpecialBoxController::migrate(
 	_additional.migrate(chat, channel);
 }
 
-QPointer<Ui::BoxContent> AddSpecialBoxController::showBox(
+base::weak_qptr<Ui::BoxContent> AddSpecialBoxController::showBox(
 		object_ptr<Ui::BoxContent> box) const {
-	const auto weak = Ui::MakeWeak(box.data());
+	const auto weak = base::make_weak(box.data());
 	delegate()->peerListUiShow()->showBox(std::move(box));
 	return weak;
 }
@@ -1050,7 +1272,7 @@ void AddSpecialBoxController::prepareChatRows(not_null<ChatData*> chat) {
 	chat->session().changes().peerUpdates(
 		chat,
 		UpdateFlag::Members | UpdateFlag::Admins
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		_additional.fillFromPeer();
 		if (update.flags & UpdateFlag::Members) {
 			rebuildChatRows(chat);
@@ -1108,7 +1330,7 @@ void AddSpecialBoxController::loadMoreRows() {
 	const auto channel = _peer->asChannel();
 
 	_loadRequestId = _api.request(MTPchannels_GetParticipants(
-		channel->inputChannel,
+		channel->inputChannel(),
 		MTP_channelParticipantsRecent(),
 		MTP_int(_offset),
 		MTP_int(perPage),
@@ -1171,8 +1393,8 @@ bool AddSpecialBoxController::checkInfoLoaded(
 	// We don't know what this user status is in the group.
 	const auto channel = _peer->asChannel();
 	_api.request(MTPchannels_GetParticipant(
-		channel->inputChannel,
-		participant->input
+		channel->inputChannel(),
+		participant->input()
 	)).done([=](const MTPchannels_ChannelParticipant &result) {
 		result.match([&](const MTPDchannels_channelParticipant &data) {
 			channel->owner().processUsers(data.vusers());
@@ -1278,14 +1500,14 @@ void AddSpecialBoxController::showAdmin(
 		_peer,
 		user,
 		currentRights,
-		_additional.adminRank(user),
+		_additional.memberRank(user),
 		_additional.adminPromotedSince(user),
 		_additional.adminPromotedBy(user));
 	const auto show = delegate()->peerListUiShow();
 	if (_additional.canAddOrEditAdmin(user)) {
 		const auto done = crl::guard(this, [=](
 				ChatAdminRightsInfo newRights,
-				const QString &rank) {
+				const std::optional<QString> &rank) {
 			editAdminDone(user, newRights, rank);
 		});
 		const auto fail = crl::guard(this, [=] {
@@ -1302,12 +1524,16 @@ void AddSpecialBoxController::showAdmin(
 void AddSpecialBoxController::editAdminDone(
 		not_null<UserData*> user,
 		ChatAdminRightsInfo rights,
-		const QString &rank) {
+		const std::optional<QString> &rank) {
 	if (_editParticipantBox) {
 		_editParticipantBox->closeBox();
 	}
 
-	_additional.applyAdminLocally(user, rights, rank);
+	_additional.applyAdminLocally(
+		user,
+		rights,
+		rank.value_or(_additional.memberRank(user)));
+	// _adminDoneCallback should call changes().chatAdminUpdated.
 	if (const auto callback = _adminDoneCallback) {
 		callback(user, rights, rank);
 	}
@@ -1359,6 +1585,7 @@ void AddSpecialBoxController::showRestricted(
 		user,
 		_additional.adminRights(user).has_value(),
 		currentRights,
+		_additional.memberRank(user),
 		_additional.restrictedBy(user),
 		_additional.restrictedSince(user));
 	if (_additional.canRestrictParticipant(user)) {
@@ -1371,8 +1598,9 @@ void AddSpecialBoxController::showRestricted(
 				_editParticipantBox->closeBox();
 			}
 		});
+		const auto show = delegate()->peerListUiShow();
 		box->setSaveCallback(
-			SaveRestrictedCallback(_peer, user, done, fail));
+			SaveRestrictedCallback(show, _peer, user, done, fail));
 	}
 	_editParticipantBox = showBox(std::move(box));
 }
@@ -1445,7 +1673,9 @@ void AddSpecialBoxController::kickUser(
 	const auto fail = crl::guard(this, [=] {
 		_editBox = nullptr;
 	});
+	const auto show = delegate()->peerListUiShow();
 	const auto callback = SaveRestrictedCallback(
+		show,
 		_peer,
 		participant,
 		done,
@@ -1577,7 +1807,7 @@ void AddSpecialBoxSearchController::requestParticipants() {
 	const auto channel = _peer->asChannel();
 
 	_requestId = _api.request(MTPchannels_GetParticipants(
-		channel->inputChannel,
+		channel->inputChannel(),
 		MTP_channelParticipantsSearch(MTP_string(_query)),
 		MTP_int(_offset),
 		MTP_int(perPage),
@@ -1669,6 +1899,7 @@ void AddSpecialBoxSearchController::requestGlobal() {
 
 	auto perPage = SearchPeopleLimit;
 	_requestId = _api.request(MTPcontacts_Search(
+		MTP_flags(0),
 		MTP_string(_query),
 		MTP_int(perPage)
 	)).done([=](const MTPcontacts_Found &result, mtpRequestId requestId) {
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.h b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
index 24d5e1031d8708..7a6aafa24e7c2f 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.h
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
@@ -56,7 +56,7 @@ class AddParticipantsBoxController : public ContactsBoxController {
 		base::flat_set<not_null<UserData*>> &&alreadyIn,
 		bool justCreated);
 
-	QPointer<Ui::BoxContent> showBox(object_ptr<Ui::BoxContent> box) const;
+	base::weak_qptr<Ui::BoxContent> showBox(object_ptr<Ui::BoxContent> box) const;
 
 	void addInviteLinkButton();
 	void inviteSelectedUsers(
@@ -101,7 +101,7 @@ class AddSpecialBoxController
 	using AdminDoneCallback = Fn<void(
 		not_null<UserData*> user,
 		ChatAdminRightsInfo adminRights,
-		const QString &rank)>;
+		const std::optional<QString> &rank)>;
 	using BannedDoneCallback = Fn<void(
 		not_null<PeerData*> participant,
 		ChatRestrictionsInfo bannedRights)>;
@@ -133,7 +133,7 @@ class AddSpecialBoxController
 	void editAdminDone(
 		not_null<UserData*> user,
 		ChatAdminRightsInfo rights,
-		const QString &rank);
+		const std::optional<QString> &rank);
 	void showRestricted(not_null<UserData*> user, bool sure = false);
 	void editRestrictedDone(
 		not_null<PeerData*> participant,
@@ -147,7 +147,7 @@ class AddSpecialBoxController
 	void subscribeToMigration();
 	void migrate(not_null<ChatData*> chat, not_null<ChannelData*> channel);
 
-	QPointer<Ui::BoxContent> showBox(object_ptr<Ui::BoxContent> box) const;
+	base::weak_qptr<Ui::BoxContent> showBox(object_ptr<Ui::BoxContent> box) const;
 
 	not_null<PeerData*> _peer;
 	MTP::Sender _api;
@@ -158,7 +158,7 @@ class AddSpecialBoxController
 	ParticipantsAdditionalData _additional;
 	std::unique_ptr<ParticipantsOnlineSorter> _onlineSorter;
 	Ui::BoxPointer _editBox;
-	QPointer<Ui::BoxContent> _editParticipantBox;
+	base::weak_qptr<Ui::BoxContent> _editParticipantBox;
 	AdminDoneCallback _adminDoneCallback;
 	BannedDoneCallback _bannedDoneCallback;
 
diff --git a/Telegram/SourceFiles/boxes/peers/channel_ownership_transfer.cpp b/Telegram/SourceFiles/boxes/peers/channel_ownership_transfer.cpp
new file mode 100644
index 00000000000000..2153db1df71770
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peers/channel_ownership_transfer.cpp
@@ -0,0 +1,147 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/peers/channel_ownership_transfer.h"
+
+#include "api/api_cloud_password.h"
+#include "apiwrap.h"
+#include "boxes/passcode_box.h"
+#include "core/core_cloud_password.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/layers/show.h"
+
+ChannelOwnershipTransfer::ChannelOwnershipTransfer(
+	not_null<PeerData*> peer,
+	not_null<UserData*> selectedUser,
+	std::shared_ptr<Ui::Show> show,
+	Fn<void(std::shared_ptr<Ui::Show>)> onSuccess)
+: _peer(peer)
+, _selectedUser(selectedUser)
+, _show(show)
+, _onSuccess(std::move(onSuccess)) {
+}
+
+bool ChannelOwnershipTransfer::handleTransferPasswordError(
+		const QString &error) {
+	const auto session = &_selectedUser->session();
+	auto about = (_peer->asChannel() && !_peer->isMegagroup()
+		? tr::lng_rights_transfer_check_about_channel
+		: tr::lng_rights_transfer_check_about)(
+			tr::now,
+			lt_user,
+			tr::bold(_selectedUser->shortName()),
+			tr::marked);
+	if (auto box = PrePasswordErrorBox(error, session, std::move(about))) {
+		_show->showBox(std::move(box));
+		return true;
+	}
+	return false;
+}
+
+void ChannelOwnershipTransfer::start() {
+	const auto api = &_peer->session().api();
+	api->cloudPassword().reload();
+	api->request(MTPmessages_EditChatCreator(
+		_peer->input(),
+		MTP_inputUserEmpty(),
+		MTP_inputCheckPasswordEmpty()
+	)).fail([=](const MTP::Error &error) {
+		const auto &type = error.type();
+		if (handleTransferPasswordError(type)) {
+			return;
+		}
+		const auto callback = crl::guard(_show->toastParent(), [=](
+				Fn<void()> &&close) {
+			requestPassword();
+			close();
+		});
+		_show->showBox(Ui::MakeConfirmBox({
+			.text = tr::lng_rights_transfer_about(
+				tr::now,
+				lt_group,
+				tr::bold(_peer->name()),
+				lt_user,
+				tr::bold(_selectedUser->shortName()),
+				tr::rich),
+			.confirmed = callback,
+			.confirmText = tr::lng_rights_transfer_sure(),
+		}));
+	}).send();
+}
+
+void ChannelOwnershipTransfer::requestPassword() {
+	_peer->session().api().cloudPassword().state(
+	) | rpl::take(
+		1
+	) | rpl::on_next([=](const Core::CloudPasswordState &state) {
+		auto fields = PasscodeBox::CloudFields::From(state);
+		fields.customTitle = tr::lng_rights_transfer_password_title();
+		fields.customDescription
+			= tr::lng_rights_transfer_password_description(tr::now);
+		fields.customSubmitButton = tr::lng_passcode_submit();
+		fields.customCheckCallback = [=](
+				const Core::CloudPasswordResult &result,
+				base::weak_qptr<PasscodeBox> box) {
+			sendRequest(box, result);
+		};
+		_show->showBox(Box<PasscodeBox>(&_peer->session(), fields));
+	}, _lifetime);
+}
+
+void ChannelOwnershipTransfer::sendRequest(
+		base::weak_qptr<PasscodeBox> box,
+		const Core::CloudPasswordResult &result) {
+	const auto api = &_peer->session().api();
+	api->request(MTPmessages_EditChatCreator(
+		_peer->input(),
+		_selectedUser->inputUser(),
+		result.result
+	)).done([=](const MTPUpdates &result) {
+		api->applyUpdates(result);
+		const auto currentShow = box ? box->uiShow() : _show;
+		currentShow->showToast(
+			(_peer->isBroadcast()
+				? tr::lng_rights_transfer_done_channel
+				: tr::lng_rights_transfer_done_group)(
+					tr::now,
+					lt_user,
+					_selectedUser->shortName()));
+		if (_onSuccess) {
+			_onSuccess(currentShow);
+		}
+	}).fail([=](const MTP::Error &error) {
+		if (box && box->handleCustomCheckError(error)) {
+			return;
+		}
+		const auto &type = error.type();
+		const auto problem = [&] {
+			if (type == u"CHANNELS_ADMIN_PUBLIC_TOO_MUCH"_q) {
+				return tr::lng_channels_too_much_public_other(tr::now);
+			} else if (type == u"CHANNELS_ADMIN_LOCATED_TOO_MUCH"_q) {
+				return tr::lng_channels_too_much_located_other(tr::now);
+			} else if (type == u"ADMINS_TOO_MUCH"_q) {
+				return (_peer->isBroadcast()
+					? tr::lng_error_admin_limit_channel
+					: tr::lng_error_admin_limit)(tr::now);
+			} else if (type == u"CHANNEL_INVALID"_q
+				|| type == u"CHAT_CREATOR_REQUIRED"_q
+				|| type == u"PARTICIPANT_MISSING"_q) {
+				return (_peer->isBroadcast()
+					? tr::lng_channel_not_accessible
+					: tr::lng_group_not_accessible)(tr::now);
+			}
+			return Lang::Hard::ServerError();
+		}();
+		_show->showBox(Ui::MakeInformBox(problem));
+		if (box) {
+			box->closeBox();
+		}
+	}).handleFloodErrors().send();
+}
diff --git a/Telegram/SourceFiles/boxes/peers/channel_ownership_transfer.h b/Telegram/SourceFiles/boxes/peers/channel_ownership_transfer.h
new file mode 100644
index 00000000000000..2fca0750fdb3bb
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peers/channel_ownership_transfer.h
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class UserData;
+
+namespace Ui {
+class Show;
+} // namespace Ui
+
+namespace Core {
+struct CloudPasswordResult;
+} // namespace Core
+
+class PasscodeBox;
+
+class ChannelOwnershipTransfer {
+public:
+	ChannelOwnershipTransfer(
+		not_null<PeerData*> peer,
+		not_null<UserData*> selectedUser,
+		std::shared_ptr<Ui::Show> show,
+		Fn<void(std::shared_ptr<Ui::Show>)> onSuccess = nullptr);
+
+	void start();
+
+private:
+	bool handleTransferPasswordError(const QString &error);
+	void requestPassword();
+	void sendRequest(
+		base::weak_qptr<PasscodeBox> box,
+		const Core::CloudPasswordResult &result);
+
+	const not_null<PeerData*> _peer;
+	const not_null<UserData*> _selectedUser;
+	const std::shared_ptr<Ui::Show> _show;
+	const Fn<void(std::shared_ptr<Ui::Show>)> _onSuccess;
+
+	rpl::lifetime _lifetime;
+
+};
diff --git a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
index 33ce09ac445a5d..ffa98e35d56bd4 100644
--- a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "boxes/add_contact_box.h"
 #include "boxes/peer_list_controllers.h"
 #include "boxes/premium_limits_box.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "data/data_chat.h"
 #include "data/data_channel.h"
 #include "data/data_peer.h"
@@ -37,7 +38,7 @@ class ChoosePeerBoxController final
 	, public base::has_weak_ptr {
 public:
 	ChoosePeerBoxController(
-		not_null<Window::SessionNavigation*> navigation,
+		not_null<Main::Session*> session,
 		not_null<UserData*> bot,
 		RequestPeerQuery query,
 		Fn<void(std::vector<not_null<PeerData*>>)> callback);
@@ -59,7 +60,7 @@ class ChoosePeerBoxController final
 
 	void prepareRestrictions();
 
-	const not_null<Window::SessionNavigation*> _navigation;
+	const not_null<Main::Session*> _session;
 	not_null<UserData*> _bot;
 	RequestPeerQuery _query;
 	base::flat_set<not_null<PeerData*>> _commonGroups;
@@ -75,16 +76,12 @@ using RightsMap = std::vector<std::pair<ChatAdminRight, tr::phrase<>>>;
 	using Flag = ChatAdminRight;
 	return {
 		{ Flag::ChangeInfo, tr::lng_request_group_change_info },
-		{
-			Flag::DeleteMessages,
-			tr::lng_request_group_delete_messages },
+		{ Flag::DeleteMessages, tr::lng_request_group_delete_messages },
 		{ Flag::BanUsers, tr::lng_request_group_ban_users },
 		{ Flag::InviteByLinkOrAdd, tr::lng_request_group_invite },
 		{ Flag::PinMessages, tr::lng_request_group_pin_messages },
 		{ Flag::ManageTopics, tr::lng_request_group_manage_topics },
-		{
-			Flag::ManageCall,
-			tr::lng_request_group_manage_video_chats },
+		{ Flag::ManageCall, tr::lng_request_group_manage_video_chats },
 		{ Flag::Anonymous, tr::lng_request_group_anonymous },
 		{ Flag::AddAdmins, tr::lng_request_group_add_admins },
 	};
@@ -94,22 +91,14 @@ using RightsMap = std::vector<std::pair<ChatAdminRight, tr::phrase<>>>;
 	using Flag = ChatAdminRight;
 	return {
 		{ Flag::ChangeInfo, tr::lng_request_channel_change_info },
-		{
-			Flag::PostMessages,
-			tr::lng_request_channel_post_messages },
-		{
-			Flag::EditMessages,
-			tr::lng_request_channel_edit_messages },
-		{
-			Flag::DeleteMessages,
-			tr::lng_request_channel_delete_messages },
-		{
-			Flag::InviteByLinkOrAdd,
-			tr::lng_request_channel_add_subscribers },
-		{
-			Flag::ManageCall,
-			tr::lng_request_channel_manage_livestreams },
+		{ Flag::PostMessages, tr::lng_request_channel_post_messages },
+		{ Flag::EditMessages, tr::lng_request_channel_edit_messages },
+		{ Flag::DeleteMessages, tr::lng_request_channel_delete_messages },
+		{ Flag::InviteByLinkOrAdd, tr::lng_request_channel_add_subscribers },
+		{ Flag::ManageCall, tr::lng_request_channel_manage_livestreams },
+		{ Flag::ManageDirect, tr::lng_request_channel_manage_direct },
 		{ Flag::AddAdmins, tr::lng_request_channel_add_admins },
+		{ Flag::BanUsers, tr::lng_request_group_ban_users },
 	};
 }
 
@@ -214,10 +203,10 @@ object_ptr<Ui::BoxContent> MakeConfirmBox(
 	auto text = tr::lng_request_peer_confirm(
 		tr::now,
 		lt_chat,
-		Ui::Text::Bold(name),
+		tr::bold(name),
 		lt_bot,
-		Ui::Text::Bold(botName),
-		Ui::Text::WithEntities);
+		tr::bold(botName),
+		tr::marked);
 	if (!peer->isUser()) {
 		const auto rights = peer->isBroadcast()
 			? BroadcastRightsText(query.botRights)
@@ -227,12 +216,12 @@ object_ptr<Ui::BoxContent> MakeConfirmBox(
 				tr::lng_request_peer_confirm_rights(
 					tr::now,
 					lt_bot,
-					Ui::Text::Bold(botName),
+					tr::bold(botName),
 					lt_chat,
-					Ui::Text::Bold(name),
+					tr::bold(name),
 					lt_rights,
 					TextWithEntities{ rights },
-					Ui::Text::WithEntities));
+					tr::marked));
 		} else if (!peer->isBroadcast() && query.isBotParticipant) {
 			const auto common = bot->session().api().botCommonGroups(bot);
 			if (!common || !ranges::contains(*common, peer)) {
@@ -240,10 +229,10 @@ object_ptr<Ui::BoxContent> MakeConfirmBox(
 					tr::lng_request_peer_confirm_add(
 						tr::now,
 						lt_bot,
-						Ui::Text::Bold(botName),
+						tr::bold(botName),
 						lt_chat,
-						Ui::Text::Bold(name),
-						Ui::Text::WithEntities));
+						tr::bold(name),
+						tr::marked));
 			}
 		}
 	}
@@ -259,10 +248,10 @@ object_ptr<Ui::BoxContent> CreatePeerByQueryBox(
 		not_null<UserData*> bot,
 		RequestPeerQuery query,
 		Fn<void(std::vector<not_null<PeerData*>>)> done) {
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto callback = [=](not_null<PeerData*> peer) {
 		done({ peer });
-		if (const auto strong = weak->data()) {
+		if (const auto strong = weak->get()) {
 			strong->closeBox();
 		}
 	};
@@ -336,12 +325,12 @@ object_ptr<Ui::BoxContent> CreatePeerByQueryBox(
 }
 
 ChoosePeerBoxController::ChoosePeerBoxController(
-	not_null<Window::SessionNavigation*> navigation,
+	not_null<Main::Session*> session,
 	not_null<UserData*> bot,
 	RequestPeerQuery query,
 	Fn<void(std::vector<not_null<PeerData*>>)> callback)
-: ChatsListBoxController(&navigation->session())
-, _navigation(navigation)
+: ChatsListBoxController(session)
+, _session(session)
 , _bot(bot)
 , _query(query)
 , _callback(std::move(callback)) {
@@ -351,7 +340,7 @@ ChoosePeerBoxController::ChoosePeerBoxController(
 }
 
 Main::Session &ChoosePeerBoxController::session() const {
-	return _navigation->session();
+	return *_session;
 }
 
 void ChoosePeerBoxController::prepareRestrictions() {
@@ -364,7 +353,7 @@ void ChoosePeerBoxController::prepareRestrictions() {
 			tr::lng_request_peer_requirements(),
 			{ 0, st::membersMarginTop, 0, 0 });
 		const auto skip = st::defaultSubsectionTitlePadding.left();
-		auto separator = QString::fromUtf8("\n\xE2\x80\xA2 ");
+		auto separator = '\n' + Ui::kQBullet + ' ';
 		raw->add(
 			object_ptr<Ui::FlatLabel>(
 				raw,
@@ -385,21 +374,29 @@ void ChoosePeerBoxController::prepareRestrictions() {
 			st,
 			QPoint());
 		button->heightValue(
-		) | rpl::start_with_next([=](int height) {
+		) | rpl::on_next([=](int height) {
 			icon->moveToLeft(
 				st::choosePeerCreateIconLeft,
 				(height - st::inviteViaLinkIcon.height()) / 2);
 		}, icon->lifetime());
 
 		button->setClickedCallback([=] {
-			_navigation->parentController()->show(
-				CreatePeerByQueryBox(_navigation, _bot, _query, _callback));
+			const auto controller = ChatHelpers::ResolveWindowDefault()(
+				_session);
+			if (controller) {
+				delegate()->peerListUiShow()->showBox(
+					CreatePeerByQueryBox(
+						controller,
+						_bot,
+						_query,
+						_callback));
+			}
 		});
 
 		button->events(
 		) | rpl::filter([=](not_null<QEvent*> e) {
 			return (e->type() == QEvent::Enter);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			delegate()->peerListMouseLeftGeometry();
 		}, button->lifetime());
 		return button;
@@ -453,7 +450,7 @@ void ChoosePeerBoxController::rowClicked(not_null<PeerListRow*> row) {
 		const auto onstack = callback;
 		onstack({ peer });
 	};
-	if (const auto user = peer->asUser()) {
+	if (peer->isUser()) {
 		done();
 	} else {
 		delegate()->peerListUiShow()->showBox(
@@ -506,35 +503,53 @@ void ShowChoosePeerBox(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<UserData*> bot,
 		RequestPeerQuery query,
-		Fn<void(std::vector<not_null<PeerData*>>)> chosen) {
+		Fn<void(std::vector<not_null<PeerData*>>)> chosen,
+		Fn<void()> cancelled) {
+	ShowChoosePeerBox(
+		navigation->uiShow(),
+		bot,
+		query,
+		std::move(chosen),
+		std::move(cancelled));
+}
+
+void ShowChoosePeerBox(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<UserData*> bot,
+		RequestPeerQuery query,
+		Fn<void(std::vector<not_null<PeerData*>>)> chosen,
+		Fn<void()> cancelled) {
+	const auto session = &show->session();
 	const auto needCommonGroups = query.isBotParticipant
 		&& (query.type == RequestPeerQuery::Type::Group)
 		&& !query.myRights;
-	if (needCommonGroups && !bot->session().api().botCommonGroups(bot)) {
-		const auto weak = base::make_weak(navigation);
-		bot->session().api().requestBotCommonGroups(bot, [=] {
-			if (const auto strong = weak.get()) {
-				ShowChoosePeerBox(strong, bot, query, chosen);
+	if (needCommonGroups && !session->api().botCommonGroups(bot)) {
+		const auto weak = std::weak_ptr(show);
+		session->api().requestBotCommonGroups(bot, [=] {
+			if (const auto strong = weak.lock()) {
+				ShowChoosePeerBox(strong, bot, query, chosen, cancelled);
 			}
 		});
 		return;
 	}
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
+	const auto sent = std::make_shared<bool>(false);
 	auto callback = [=, done = std::move(chosen)](
 			std::vector<not_null<PeerData*>> peers) {
+		*sent = true;
 		done(std::move(peers));
-		if (const auto strong = weak->data()) {
+		if (const auto strong = weak->get()) {
 			strong->closeBox();
 		}
 	};
 	const auto limit = query.maxQuantity;
 	auto controller = std::make_unique<ChoosePeerBoxController>(
-		navigation,
+		session,
 		bot,
 		query,
 		std::move(callback));
 	auto initBox = [=, ptr = controller.get()](not_null<PeerListBox*> box) {
-		ptr->selectedCountValue() | rpl::start_with_next([=](int count) {
+		ptr->selectedCountValue() | rpl::on_next([=](int count) {
 			box->clearButtons();
 			if (limit > 1) {
 				box->setAdditionalTitle(rpl::single(u"%1 / %2"_q.arg(count).arg(limit)));
@@ -552,7 +567,14 @@ void ShowChoosePeerBox(
 			});
 		}, box->lifetime());
 	};
-	*weak = navigation->parentController()->show(Box<PeerListBox>(
+	*weak = show->show(Box<PeerListBox>(
 		std::move(controller),
 		std::move(initBox)));
+	if (const auto strong = weak->get()) {
+		strong->boxClosing() | rpl::on_next([=] {
+			if (!*sent && cancelled) {
+				cancelled();
+			}
+		}, strong->lifetime());
+	}
 }
diff --git a/Telegram/SourceFiles/boxes/peers/choose_peer_box.h b/Telegram/SourceFiles/boxes/peers/choose_peer_box.h
index 982ec4784c9a23..890a94f534015f 100644
--- a/Telegram/SourceFiles/boxes/peers/choose_peer_box.h
+++ b/Telegram/SourceFiles/boxes/peers/choose_peer_box.h
@@ -9,6 +9,11 @@ For license and copyright information please follow this link:
 
 struct RequestPeerQuery;
 
+namespace Main {
+class Session;
+class SessionShow;
+} // namespace Main
+
 namespace Ui {
 class BoxContent;
 } // namespace Ui
@@ -21,4 +26,12 @@ void ShowChoosePeerBox(
 	not_null<Window::SessionNavigation*> navigation,
 	not_null<UserData*> bot,
 	RequestPeerQuery query,
-	Fn<void(std::vector<not_null<PeerData*>>)> chosen);
+	Fn<void(std::vector<not_null<PeerData*>>)> chosen,
+	Fn<void()> cancelled = nullptr);
+
+void ShowChoosePeerBox(
+	std::shared_ptr<Main::SessionShow> show,
+	not_null<UserData*> bot,
+	RequestPeerQuery query,
+	Fn<void(std::vector<not_null<PeerData*>>)> chosen,
+	Fn<void()> cancelled = nullptr);
diff --git a/Telegram/SourceFiles/boxes/peers/create_managed_bot_box.cpp b/Telegram/SourceFiles/boxes/peers/create_managed_bot_box.cpp
new file mode 100644
index 00000000000000..6fc3574f764bd4
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peers/create_managed_bot_box.cpp
@@ -0,0 +1,482 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/peers/create_managed_bot_box.h"
+
+#include "base/timer.h"
+#include "boxes/peers/edit_peer_common.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "data/data_premium_limits.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/session/session_show.h"
+#include "main/main_session.h"
+#include "mtproto/sender.h"
+#include "settings/sections/settings_premium.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/layers/generic_box.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/fields/special_fields.h"
+#include "ui/widgets/labels.h"
+#include "ui/vertical_list.h"
+
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+
+void CreateManagedBotBox(
+		not_null<Ui::GenericBox*> box,
+		CreateManagedBotDescriptor &&descriptor) {
+	struct State {
+		base::Timer checkTimer;
+		mtpRequestId checkRequestId = 0;
+		mtpRequestId createRequestId = 0;
+		QString checkUsername;
+		QString errorText;
+		QString goodText;
+		bool created = false;
+		bool hadOccupiedError = false;
+	};
+	const auto show = descriptor.show;
+	const auto session = &show->session();
+	const auto viaDeeplink = descriptor.viaDeeplink;
+	const auto done = std::move(descriptor.done);
+	const auto cancelled = std::move(descriptor.cancelled);
+	const auto manager = descriptor.manager;
+
+	const auto api = box->lifetime().make_state<MTP::Sender>(
+		&session->mtp());
+	const auto state = box->lifetime().make_state<State>();
+
+	box->setStyle(st::createBotBox);
+	box->setWidth(st::boxWidth);
+	box->setNoContentMargin(true);
+	box->addTopButton(st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+
+	auto userpic = object_ptr<Ui::UserpicButton>(
+		box,
+		manager,
+		st::defaultUserpicButton);
+	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+	box->addRow(
+		std::move(userpic),
+		st::boxRowPadding + st::createBotUserpicPadding,
+		style::al_top);
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_create_bot_title(),
+			st::boxTitle),
+		st::boxRowPadding + st::createBotTitlePadding,
+		style::al_top);
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_create_bot_subtitle(
+				lt_bot,
+				rpl::single(tr::bold(manager->name())),
+				tr::rich),
+			st::createBotCenteredText),
+		st::boxRowPadding + st::createBotSubtitlePadding,
+		style::al_top
+	)->setTryMakeSimilarLines(true);
+
+	const auto name = box->addRow(object_ptr<Ui::InputField>(
+		box,
+		st::defaultInputField,
+		tr::lng_create_bot_name_placeholder(),
+		descriptor.suggestedName));
+	name->setMaxLength(Ui::EditPeer::kMaxGroupChannelTitle);
+
+	Ui::AddSkip(box->verticalLayout(), st::createBotFieldSpacing);
+
+	const auto botPrefixText = u"@"_q;
+	const auto botSuffixText = u"bot"_q;
+	const auto suffixWidth
+		= st::createBotUsernameSuffix.style.font->width(botSuffixText);
+
+	auto initialUsername = descriptor.suggestedUsername;
+	while (initialUsername.startsWith(botPrefixText)) {
+		initialUsername.remove(0, botPrefixText.size());
+	}
+
+	const auto fieldSt = box->lifetime().make_state<style::InputField>(
+		st::createBotUsernameField);
+	fieldSt->textMargins.setLeft(
+		st::defaultFlatLabel.style.font->width(botPrefixText));
+	fieldSt->textMargins.setRight(suffixWidth);
+	fieldSt->placeholderMargins.setLeft(-fieldSt->textMargins.left());
+	fieldSt->placeholderMargins.setRight(-fieldSt->textMargins.right());
+	const auto usernameWrap = box->addRow(object_ptr<Ui::RpWidget>(box));
+	const auto username = Ui::CreateChild<Ui::UsernameInput>(
+		usernameWrap,
+		*fieldSt,
+		tr::lng_create_bot_username_placeholder(),
+		initialUsername,
+		QString());
+	username->setPlaceholderHidden(true);
+	username->setMaxLength(Ui::EditPeer::kMaxUsernameLength);
+	usernameWrap->widthValue() | rpl::on_next([=](int width) {
+		username->resizeToWidth(width);
+	}, username->lifetime());
+	username->heightValue() | rpl::on_next([=](int height) {
+		usernameWrap->resize(usernameWrap->width(), height);
+	}, username->lifetime());
+	username->finishAnimating();
+
+	const auto botPrefix = Ui::CreateChild<Ui::FlatLabel>(
+		username,
+		botPrefixText,
+		st::createBotUsernamePrefix);
+	const auto botSuffix = Ui::CreateChild<Ui::FlatLabel>(
+		username,
+		botSuffixText,
+		st::createBotUsernameSuffix);
+	botPrefix->setAttribute(Qt::WA_TransparentForMouseEvents);
+	botPrefix->show();
+	botSuffix->setAttribute(Qt::WA_TransparentForMouseEvents);
+	botSuffix->show();
+
+	const auto updatePositions = [=] {
+		const auto &margin = fieldSt->textMargins;
+		const auto &font = fieldSt->style.font;
+		const auto text = username->getLastText();
+		const auto textWidth = font->width(text);
+		const auto maxX = username->width() - margin.right();
+		const auto x = std::min(margin.left() + textWidth, maxX);
+		botPrefix->move(0, margin.top());
+		botSuffix->move(x, margin.top());
+	};
+
+	username->geometryValue(
+	) | rpl::on_next(updatePositions, username->lifetime());
+
+	const auto cleanedUsername = [=] {
+		auto raw = username->getLastText().trimmed();
+		while (raw.startsWith(botPrefixText)) {
+			raw = raw.mid(botPrefixText.size());
+		}
+		return raw;
+	};
+	// How many trailing characters of `value` already spell the beginning
+	// of "bot" (in any capitalization): "..b" -> 1, "..bo" -> 2, "..bot" -> 3.
+	const auto botOverlap = [=](const QString &value) {
+		const auto bound = std::min(
+			int(value.size()),
+			int(botSuffixText.size()));
+		for (auto k = bound; k > 0; --k) {
+			if (!value.right(k).compare(
+					botSuffixText.left(k),
+					Qt::CaseInsensitive)) {
+				return k;
+			}
+		}
+		return 0;
+	};
+	// The lowercase remainder of "bot" we will append on save: shown as the
+	// non-editable label and empty once the value already ends with "bot".
+	const auto missingSuffix = [=](const QString &value) {
+		return botSuffixText.mid(botOverlap(value));
+	};
+	const auto fullUsername = [=] {
+		const auto raw = cleanedUsername();
+		return raw + missingSuffix(raw);
+	};
+
+	const auto refreshSuffix = [=] {
+		const auto suffix = missingSuffix(cleanedUsername());
+		botSuffix->setText(suffix);
+		botSuffix->setVisible(!suffix.isEmpty());
+	};
+
+	// We keep as many entered characters as fit together with the minimal
+	// auto-added suffix (so "..b" leaves room for "ot", "..bo" for "t",
+	// "..bot" for nothing). setMaxLength can't express this: reserving space
+	// for the full "bot" would block typing the very "b" that shrinks it.
+	const auto enforceLength = [=] {
+		const auto text = username->getLastText();
+		auto fitted = text;
+		while (!fitted.isEmpty()
+			&& (int(fitted.size()) + int(missingSuffix(fitted).size())
+				> Ui::EditPeer::kMaxUsernameLength)) {
+			fitted.chop(1);
+		}
+		if (fitted != text) {
+			username->setText(fitted);
+			return true;
+		}
+		return false;
+	};
+
+	enforceLength();
+	refreshSuffix();
+
+	const auto statusWrapper = box->addRow(
+		object_ptr<Ui::RpWidget>(box),
+		st::boxRowPadding + QMargins(0, st::defaultVerticalListSkip, 0, 0));
+
+	const auto statusLabel = Ui::CreateChild<Ui::FlatLabel>(
+		statusWrapper,
+		st::createBotStatusLabel);
+	statusLabel->move(0, 0);
+
+	const auto maxHeight = box->lifetime().make_state<int>(0);
+	statusLabel->heightValue(
+	) | rpl::on_next([=](int height) {
+		const auto newMax = std::max({
+			*maxHeight,
+			height,
+			st::createBotStatusLabel.style.font->height,
+		});
+		if (*maxHeight != newMax) {
+			*maxHeight = newMax;
+			statusWrapper->resize(statusWrapper->width(), newMax);
+		}
+	}, statusWrapper->lifetime());
+
+	statusWrapper->widthValue(
+	) | rpl::on_next([=](int width) {
+		statusLabel->resizeToWidth(width);
+	}, statusWrapper->lifetime());
+
+	box->setFocusCallback([=] { name->setFocusFast(); });
+
+	const auto setError = [=](const QString &text) {
+		state->errorText = text;
+		state->goodText = QString();
+		statusLabel->setText(text);
+		statusLabel->setTextColorOverride(
+			text.isEmpty()
+				? std::optional<QColor>()
+				: st::boxTextFgError->c);
+		state->checkTimer.cancel();
+	};
+
+	const auto showLinkInfo = [=] {
+		const auto full = fullUsername();
+		const auto text = tr::lng_create_bot_username_link(
+			tr::now,
+			lt_link,
+			u"t.me/"_q + full);
+		state->errorText = QString();
+		state->goodText = text;
+		statusLabel->setText(text);
+		statusLabel->setTextColorOverride(st::usernameDefaultFg->c);
+	};
+
+	const auto checkUsername = [=] {
+		api->request(base::take(state->checkRequestId)).cancel();
+
+		const auto value = fullUsername();
+		if (value.size() < Ui::EditPeer::kMinUsernameLength) {
+			return;
+		}
+		state->checkUsername = value;
+		state->checkRequestId = api->request(MTPbots_CheckUsername(
+			MTP_string(value)
+		)).done([=](const MTPBool &result) {
+			state->checkRequestId = 0;
+			if (mtpIsTrue(result)) {
+				if (state->hadOccupiedError) {
+					state->errorText = QString();
+					state->goodText = tr::lng_create_bot_username_available(
+						tr::now,
+						lt_username,
+						state->checkUsername);
+					statusLabel->setText(state->goodText);
+					statusLabel->setTextColorOverride(st::boxTextFgGood->c);
+				} else {
+					showLinkInfo();
+				}
+			} else {
+				state->hadOccupiedError = true;
+				setError(tr::lng_create_bot_username_taken(tr::now));
+			}
+		}).fail([=](const MTP::Error &error) {
+			state->checkRequestId = 0;
+			state->hadOccupiedError = true;
+			setError(tr::lng_create_bot_username_taken(tr::now));
+		}).send();
+	};
+
+	state->checkTimer.setCallback(checkUsername);
+
+	const auto usernameChanged = [=] {
+		const auto value = username->getLastText().trimmed();
+		if (value.isEmpty()) {
+			setError(QString());
+			return;
+		}
+
+		const auto len = int(value.size());
+		for (auto i = 0; i < len; ++i) {
+			const auto ch = value.at(i);
+			if ((ch < 'A' || ch > 'Z')
+				&& (ch < 'a' || ch > 'z')
+				&& (ch < '0' || ch > '9')
+				&& ch != '_') {
+				setError(
+					tr::lng_create_bot_username_bad_symbols(tr::now));
+				return;
+			}
+		}
+
+		if (fullUsername().size() < Ui::EditPeer::kMinUsernameLength) {
+			setError(tr::lng_create_bot_username_too_short(tr::now));
+			return;
+		}
+
+		showLinkInfo();
+		state->checkTimer.callOnce(Ui::EditPeer::kUsernameCheckTimeout);
+	};
+
+	const auto submit = [=] {
+		if (state->createRequestId) {
+			return;
+		}
+
+		const auto nameValue = name->getLastText().trimmed();
+		if (nameValue.isEmpty()) {
+			name->showError();
+			return;
+		}
+
+		if (cleanedUsername().isEmpty()) {
+			username->showError();
+			return;
+		}
+		const auto usernameValue = fullUsername();
+
+		if (!state->errorText.isEmpty() || state->goodText.isEmpty()) {
+			username->showError();
+			return;
+		}
+
+		using Flag = MTPbots_CreateBot::Flag;
+		const auto flags = viaDeeplink ? Flag::f_via_deeplink : Flag(0);
+		const auto weak = base::make_weak(box);
+		state->createRequestId = api->request(MTPbots_CreateBot(
+			MTP_flags(flags),
+			MTP_string(nameValue),
+			MTP_string(usernameValue),
+			manager->inputUser()
+		)).done([=](const MTPUser &result) {
+			state->createRequestId = 0;
+			const auto user = session->data().processUser(result);
+			state->created = true;
+			if (done) {
+				done(user);
+			}
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		}).fail([=](const MTP::Error &error) {
+			state->createRequestId = 0;
+			const auto type = error.type();
+			if (type == u"USERNAME_OCCUPIED"_q
+				|| type == u"USERNAME_INVALID"_q) {
+				state->hadOccupiedError = true;
+				username->showError();
+				setError(tr::lng_create_bot_username_taken(tr::now));
+			} else if (type == u"BOT_CREATE_LIMIT_EXCEEDED"_q) {
+				const auto limits = Data::PremiumLimits(session);
+				const auto premium = session->premium();
+				const auto premiumPossible = session->premiumPossible();
+				const auto defaultLimit = limits.botsCreateDefault();
+				const auto premiumLimit = limits.botsCreatePremium();
+				const auto current = premium ? premiumLimit : defaultLimit;
+				const auto bot = tr::link(
+					u"@BotFather"_q,
+					u"https://t.me/botfather?start=deletebot"_q);
+				if (premium || !premiumPossible) {
+					using WeakToast = base::weak_ptr<Ui::Toast::Instance>;
+					const auto toast = std::make_shared<WeakToast>();
+					(*toast) = show->showToast({
+						.text = tr::lng_bots_create_limit_final(
+							tr::now,
+							lt_count,
+							current,
+							lt_bot,
+							tr::bold(bot),
+							tr::rich),
+						.filter = crl::guard(session, [=](
+								const ClickHandlerPtr &,
+								Qt::MouseButton button) {
+							if (button == Qt::LeftButton) {
+								if (const auto strong = toast->get()) {
+									strong->hideAnimated();
+									(*toast) = nullptr;
+								}
+							}
+							return true;
+						}),
+					});
+				} else {
+					Settings::ShowPremiumPromoToast(
+						show,
+						ChatHelpers::ResolveWindowDefault(),
+						tr::lng_bots_create_limit(
+							tr::now,
+							lt_count,
+							current,
+							lt_link,
+							tr::bold(
+								tr::lng_bots_create_limit_link(tr::now, tr::link)),
+							lt_premium_count,
+							tr::bold(QString::number(premiumLimit)),
+							lt_bot,
+							tr::bold(bot),
+							tr::rich),
+						u"managed_bots"_q);
+				}
+			} else if (MTP::IsFloodError(error)) {
+				show->showToast(tr::lng_flood_error(tr::now));
+			} else {
+				show->showToast(type);
+			}
+		}).handleFloodErrors().send();
+	};
+
+	QObject::connect(username, &Ui::UsernameInput::changed, [=] {
+		if (enforceLength()) {
+			return;
+		}
+		refreshSuffix();
+		usernameChanged();
+		updatePositions();
+	});
+
+	name->submits(
+	) | rpl::on_next([=](auto) {
+		username->setFocus();
+	}, name->lifetime());
+
+	QObject::connect(username, &Ui::UsernameInput::submitted, submit);
+
+	box->addButton(tr::lng_create_bot_button(), submit);
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+
+	if (!descriptor.suggestedUsername.isEmpty()) {
+		usernameChanged();
+	}
+
+	box->boxClosing() | rpl::on_next([=] {
+		if (!state->created && cancelled) {
+			cancelled();
+		}
+	}, box->lifetime());
+}
+
+void ShowCreateManagedBotBox(CreateManagedBotDescriptor &&descriptor) {
+	const auto show = descriptor.show;
+	show->showBox(Box(CreateManagedBotBox, std::move(descriptor)));
+}
diff --git a/Telegram/SourceFiles/boxes/peers/create_managed_bot_box.h b/Telegram/SourceFiles/boxes/peers/create_managed_bot_box.h
new file mode 100644
index 00000000000000..56dd50241bf57f
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peers/create_managed_bot_box.h
@@ -0,0 +1,34 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class UserData;
+
+namespace Main {
+class SessionShow;
+} // namespace Main
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+struct CreateManagedBotDescriptor {
+	std::shared_ptr<Main::SessionShow> show;
+	not_null<UserData*> manager;
+	QString suggestedName;
+	QString suggestedUsername;
+	bool viaDeeplink = false;
+	Fn<void(not_null<UserData*>)> done;
+	Fn<void()> cancelled;
+};
+
+void CreateManagedBotBox(
+	not_null<Ui::GenericBox*> box,
+	CreateManagedBotDescriptor &&descriptor);
+
+void ShowCreateManagedBotBox(CreateManagedBotDescriptor &&descriptor);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
index 4bc2848c787423..056b66d7f1bcf5 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
@@ -7,28 +7,71 @@ For license and copyright information please follow this link:
 */
 #include "boxes/peers/edit_contact_box.h"
 
-#include "data/data_user.h"
-#include "data/data_session.h"
+#include "api/api_peer_photo.h"
+#include "api/api_text_entities.h"
+#include "apiwrap.h"
+#include "base/call_delayed.h"
 #include "boxes/peers/edit_peer_common.h"
-#include "ui/wrap/vertical_layout.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/fields/input_field.h"
+#include "boxes/premium_preview_box.h"
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "core/ui_integration.h"
+#include "data/data_changes.h"
+#include "data/data_document.h"
+#include "data/data_premium_limits.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/stickers/data_stickers.h"
+#include "editor/photo_editor_common.h"
+#include "editor/photo_editor_layer_widget.h"
+#include "history/view/controls/history_view_characters_limit.h"
+#include "info/profile/info_profile_values.h"
+#include "ui/wrap/padding_wrap.h"
+#include "info/userpic/info_userpic_emoji_builder_common.h"
+#include "info/userpic/info_userpic_emoji_builder_menu_item.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_common.h"
+#include "lottie/lottie_frame_generator.h"
+#include "main/main_session.h"
+#include "settings/settings_common.h"
+#include "ui/animated_icon.h"
+#include "ui/controls/emoji_button_factory.h"
+#include "ui/controls/emoji_button.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/text/format_values.h" // Ui::FormatPhone
+#include "ui/text/text_entity.h"
 #include "ui/text/text_utilities.h"
-#include "info/profile/info_profile_cover.h"
-#include "lang/lang_keys.h"
-#include "window/window_controller.h"
 #include "ui/toast/toast.h"
-#include "main/main_session.h"
-#include "apiwrap.h"
-#include "api/api_peer_photo.h"
-#include "styles/style_layers.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/painter.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+#include "styles/style_widgets.h"
+
+#include <QtGui/QClipboard>
+#include <QtGui/QGuiApplication>
 
 namespace {
 
+constexpr auto kAnimationStartFrame = 0;
+constexpr auto kAnimationEndFrame = 21;
+
 QString UserPhone(not_null<UserData*> user) {
 	const auto phone = user->phone();
 	return phone.isEmpty()
@@ -37,23 +80,27 @@ QString UserPhone(not_null<UserData*> user) {
 }
 
 void SendRequest(
-		QPointer<Ui::GenericBox> box,
+		base::weak_qptr<Ui::GenericBox> box,
 		not_null<UserData*> user,
 		bool sharePhone,
 		const QString &first,
 		const QString &last,
 		const QString &phone,
-		Fn<void()> done) {
+		const TextWithEntities &note) {
 	const auto wasContact = user->isContact();
 	using Flag = MTPcontacts_AddContact::Flag;
 	user->session().api().request(MTPcontacts_AddContact(
-		MTP_flags(sharePhone
-			? Flag::f_add_phone_privacy_exception
-			: Flag(0)),
-		user->inputUser,
+		MTP_flags(Flag::f_note
+			| (sharePhone ? Flag::f_add_phone_privacy_exception : Flag(0))),
+		user->inputUser(),
 		MTP_string(first),
 		MTP_string(last),
-		MTP_string(phone)
+		MTP_string(phone),
+		note.text.isEmpty()
+			? MTPTextWithEntities()
+			: MTP_textWithEntities(
+				MTP_string(note.text),
+				Api::EntitiesToMTP(&user->session(), note.entities))
 	)).done([=](const MTPUpdates &result) {
 		user->setName(
 			first,
@@ -74,16 +121,104 @@ void SendRequest(
 			}
 			box->closeBox();
 		}
-		done();
 	}).send();
 }
 
+class Cover final : public Ui::FixedHeightWidget {
+public:
+	Cover(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller,
+		not_null<UserData*> user,
+		rpl::producer<QString> status);
+
+private:
+	void setupChildGeometry();
+	void initViewers(rpl::producer<QString> status);
+	void refreshNameGeometry(int newWidth);
+	void refreshStatusGeometry(int newWidth);
+
+	const style::InfoProfileCover &_st;
+	const not_null<UserData*> _user;
+
+	object_ptr<Ui::UserpicButton> _userpic;
+	object_ptr<Ui::FlatLabel> _name = { nullptr };
+	object_ptr<Ui::FlatLabel> _status = { nullptr };
+
+};
+
+Cover::Cover(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller,
+	not_null<UserData*> user,
+	rpl::producer<QString> status)
+: FixedHeightWidget(parent, st::infoEditContactCover.height)
+, _st(st::infoEditContactCover)
+, _user(user)
+, _userpic(
+		this,
+		controller,
+		_user,
+		Ui::UserpicButton::Role::OpenPhoto,
+		Ui::UserpicButton::Source::PeerPhoto,
+		_st.photo) {
+	_userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	_name = object_ptr<Ui::FlatLabel>(this, _st.name);
+	_name->setSelectable(true);
+	_name->setContextCopyText(tr::lng_profile_copy_fullname(tr::now));
+
+	_status = object_ptr<Ui::FlatLabel>(this, _st.status);
+	_status->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	initViewers(std::move(status));
+	setupChildGeometry();
+}
+
+void Cover::setupChildGeometry() {
+	widthValue(
+	) | rpl::on_next([this](int newWidth) {
+		_userpic->moveToLeft(_st.photoLeft, _st.photoTop, newWidth);
+		refreshNameGeometry(newWidth);
+		refreshStatusGeometry(newWidth);
+	}, lifetime());
+}
+
+void Cover::initViewers(rpl::producer<QString> status) {
+	Info::Profile::NameValue(
+		_user
+	) | rpl::on_next([=](const QString &name) {
+		_name->setText(name);
+		refreshNameGeometry(width());
+	}, lifetime());
+
+	std::move(
+		status
+	) | rpl::on_next([=](const QString &status) {
+		_status->setText(status);
+		refreshStatusGeometry(width());
+	}, lifetime());
+}
+
+void Cover::refreshNameGeometry(int newWidth) {
+	auto nameWidth = newWidth - _st.nameLeft - _st.rightSkip;
+	_name->resizeToNaturalWidth(nameWidth);
+	_name->moveToLeft(_st.nameLeft, _st.nameTop, newWidth);
+}
+
+void Cover::refreshStatusGeometry(int newWidth) {
+	auto statusWidth = newWidth - _st.statusLeft - _st.rightSkip;
+	_status->resizeToNaturalWidth(statusWidth);
+	_status->moveToLeft(_st.statusLeft, _st.statusTop, newWidth);
+}
+
 class Controller {
 public:
 	Controller(
 		not_null<Ui::GenericBox*> box,
 		not_null<Window::SessionController*> window,
-		not_null<UserData*> user);
+		not_null<UserData*> user,
+		bool focusOnNotes = false);
 
 	void prepare();
 
@@ -91,31 +226,55 @@ class Controller {
 	void setupContent();
 	void setupCover();
 	void setupNameFields();
+	void setupNotesField();
+	void setupPhotoButtons();
+	void setupDeleteContactButton();
 	void setupWarning();
 	void setupSharePhoneNumber();
 	void initNameFields(
 		not_null<Ui::InputField*> first,
 		not_null<Ui::InputField*> last,
 		bool inverted);
+	void showPhotoMenu(bool suggest);
+	void choosePhotoFile(bool suggest);
+	void processChosenPhoto(QImage &&image, bool suggest);
+	void processChosenPhotoWithMarkup(
+		UserpicBuilder::Result &&data,
+		bool suggest);
+	void executeWithDelay(
+		Fn<void()> callback,
+		bool suggest,
+		bool startAnimation = true);
+	void finishIconAnimation(bool suggest);
 
 	not_null<Ui::GenericBox*> _box;
 	not_null<Window::SessionController*> _window;
 	not_null<UserData*> _user;
+	bool _focusOnNotes = false;
 	Ui::Checkbox *_sharePhone = nullptr;
+	Ui::InputField *_notesField = nullptr;
+	Ui::InputField *_firstNameField = nullptr;
+	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
+	base::unique_qptr<Ui::PopupMenu> _photoMenu;
+	std::unique_ptr<Ui::AnimatedIcon> _suggestIcon;
+	std::unique_ptr<Ui::AnimatedIcon> _cameraIcon;
+	Ui::RpWidget *_suggestIconWidget = nullptr;
+	Ui::RpWidget *_cameraIconWidget = nullptr;
 	QString _phone;
 	Fn<void()> _focus;
 	Fn<void()> _save;
-	Fn<std::optional<QImage>()> _updatedPersonalPhoto;
 
 };
 
 Controller::Controller(
 	not_null<Ui::GenericBox*> box,
 	not_null<Window::SessionController*> window,
-	not_null<UserData*> user)
+	not_null<UserData*> user,
+	bool focusOnNotes)
 : _box(box)
 , _window(window)
 , _user(user)
+, _focusOnNotes(focusOnNotes)
 , _phone(UserPhone(user)) {
 }
 
@@ -134,33 +293,35 @@ void Controller::prepare() {
 void Controller::setupContent() {
 	setupCover();
 	setupNameFields();
+	setupNotesField();
+	setupPhotoButtons();
+	setupDeleteContactButton();
 	setupWarning();
 	setupSharePhoneNumber();
 }
 
 void Controller::setupCover() {
-	const auto cover = _box->addRow(
-		object_ptr<Info::Profile::Cover>(
+	_box->addRow(
+		object_ptr<Cover>(
 			_box,
 			_window,
 			_user,
-			Info::Profile::Cover::Role::EditContact,
 			(_phone.isEmpty()
 				? tr::lng_contact_mobile_hidden()
 				: rpl::single(Ui::FormatPhone(_phone)))),
 		style::margins());
-	_updatedPersonalPhoto = [=] { return cover->updatedPersonalPhoto(); };
 }
 
 void Controller::setupNameFields() {
 	const auto inverted = langFirstNameGoesSecond();
-	const auto first = _box->addRow(
+	_firstNameField = _box->addRow(
 		object_ptr<Ui::InputField>(
 			_box,
 			st::defaultInputField,
 			tr::lng_signup_firstname(),
 			_user->firstName),
 		st::addContactFieldMargin);
+	const auto first = _firstNameField;
 	auto preparedLast = object_ptr<Ui::InputField>(
 		_box,
 		st::defaultInputField,
@@ -188,6 +349,11 @@ void Controller::initNameFields(
 		_box->setTabOrder(last, first);
 	}
 	_focus = [=] {
+		if (_focusOnNotes && _notesField) {
+			_notesField->setFocusFast();
+			_notesField->setCursorPosition(_notesField->getLastText().size());
+			return;
+		}
 		const auto firstValue = getValue(first);
 		const auto lastValue = getValue(last);
 		const auto empty = firstValue.isEmpty() && lastValue.isEmpty();
@@ -203,29 +369,40 @@ void Controller::initNameFields(
 			(inverted ? last : first)->showError();
 			return;
 		}
-		const auto user = _user;
-		const auto personal = _updatedPersonalPhoto
-			? _updatedPersonalPhoto()
-			: std::nullopt;
-		const auto done = [=] {
-			if (personal) {
-				if (personal->isNull()) {
-					user->session().api().peerPhoto().clearPersonal(user);
-				} else {
-					user->session().api().peerPhoto().upload(
-						user,
-						{ base::duplicate(*personal) });
-				}
+
+		if (_notesField) {
+			const auto limit = Data::PremiumLimits(
+				&_user->session()).contactNoteLengthCurrent();
+			const auto remove = Ui::ComputeFieldCharacterCount(_notesField)
+				- limit;
+			if (remove > 0) {
+				_box->showToast(tr::lng_contact_notes_limit_reached(
+					tr::now,
+					lt_count,
+					remove));
+				_notesField->setFocus();
+				return;
 			}
-		};
+		}
+
+		const auto noteValue = _notesField
+			? [&] {
+				auto textWithTags = _notesField->getTextWithAppliedMarkdown();
+				return TextWithEntities{
+					base::take(textWithTags.text),
+					TextUtilities::ConvertTextTagsToEntities(
+						base::take(textWithTags.tags)),
+				};
+			}()
+			: TextWithEntities();
 		SendRequest(
-			Ui::MakeWeak(_box),
-			user,
+			base::make_weak(_box),
+			_user,
 			_sharePhone && _sharePhone->checked(),
 			firstValue,
 			lastValue,
 			_phone,
-			done);
+			noteValue);
 	};
 	const auto submit = [=] {
 		const auto firstValue = first->getLastText().trimmed();
@@ -239,8 +416,8 @@ void Controller::initNameFields(
 			_save();
 		}
 	};
-	first->submits() | rpl::start_with_next(submit, first->lifetime());
-	last->submits() | rpl::start_with_next(submit, last->lifetime());
+	first->submits() | rpl::on_next(submit, first->lifetime());
+	last->submits() | rpl::on_next(submit, last->lifetime());
 	first->setMaxLength(Ui::EditPeer::kMaxUserFirstLastName);
 	first->setMaxLength(Ui::EditPeer::kMaxUserFirstLastName);
 }
@@ -257,6 +434,345 @@ void Controller::setupWarning() {
 		st::addContactWarningMargin);
 }
 
+void Controller::setupNotesField() {
+	Ui::AddSkip(_box->verticalLayout());
+	Ui::AddDivider(_box->verticalLayout());
+	Ui::AddSkip(_box->verticalLayout());
+	_notesField = _box->addRow(
+		object_ptr<Ui::InputField>(
+			_box,
+			st::notesFieldWithEmoji,
+			Ui::InputField::Mode::MultiLine,
+			tr::lng_contact_add_notes(),
+			QString()),
+		st::addContactFieldMargin);
+	_notesField->setMarkdownSet(Ui::MarkdownSet::Notes);
+	_notesField->setCustomTextContext(Core::TextContext({
+		.session = &_user->session()
+	}));
+	_notesField->setTextWithTags({
+		_user->note().text,
+		TextUtilities::ConvertEntitiesToTextTags(_user->note().entities)
+	});
+
+	_notesField->setMarkdownReplacesEnabled(rpl::single(
+		Ui::MarkdownEnabledState{
+			Ui::MarkdownEnabled{
+				{
+					Ui::InputField::kTagBold,
+					Ui::InputField::kTagItalic,
+					Ui::InputField::kTagUnderline,
+					Ui::InputField::kTagStrikeOut,
+					Ui::InputField::kTagSpoiler
+				}
+			}
+		}
+	));
+
+	const auto container = _box->getDelegate()->outerContainer();
+	using Selector = ChatHelpers::TabbedSelector;
+	_emojiPanel = base::make_unique_q<ChatHelpers::TabbedPanel>(
+		container,
+		_window,
+		object_ptr<Selector>(
+			nullptr,
+			_window->uiShow(),
+			Window::GifPauseReason::Layer,
+			Selector::Mode::EmojiOnly));
+	_emojiPanel->setDesiredHeightValues(
+		1.,
+		st::emojiPanMinHeight / 2,
+		st::emojiPanMinHeight);
+	_emojiPanel->hide();
+	_emojiPanel->selector()->setCurrentPeer(_window->session().user());
+	_emojiPanel->selector()->emojiChosen(
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
+		Ui::InsertEmojiAtCursor(_notesField->textCursor(), data.emoji);
+	}, _notesField->lifetime());
+	_emojiPanel->selector()->customEmojiChosen(
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+		const auto info = data.document->sticker();
+		if (info
+			&& info->setType == Data::StickersType::Emoji
+			&& !_window->session().premium()) {
+			ShowPremiumPreviewBox(
+				_window,
+				PremiumFeature::AnimatedEmoji);
+		} else {
+			Data::InsertCustomEmoji(_notesField, data.document);
+		}
+	}, _notesField->lifetime());
+
+	const auto emojiButton = Ui::AddEmojiToggleToField(
+		_notesField,
+		_box,
+		_window,
+		_emojiPanel.get(),
+		st::sendGifWithCaptionEmojiPosition,
+		false);
+	emojiButton->show();
+
+	using Limit = HistoryView::Controls::CharactersLimitLabel;
+	struct LimitState {
+		base::unique_qptr<Limit> charsLimitation;
+	};
+	const auto limitState = _notesField->lifetime().make_state<LimitState>();
+
+	const auto checkCharsLimitation = [=, w = _notesField->window()] {
+		const auto limit = Data::PremiumLimits(
+			&_user->session()).contactNoteLengthCurrent();
+		const auto remove = Ui::ComputeFieldCharacterCount(_notesField)
+			- limit;
+		if (!limitState->charsLimitation) {
+			const auto border = _notesField->st().borderActive;
+			limitState->charsLimitation = base::make_unique_q<Limit>(
+				_box->verticalLayout(),
+				emojiButton,
+				style::al_top,
+				QMargins{ 0, -border - _notesField->st().border, 0, 0 });
+			rpl::combine(
+				limitState->charsLimitation->geometryValue(),
+				_notesField->geometryValue()
+			) | rpl::on_next([=](QRect limit, QRect field) {
+				limitState->charsLimitation->setVisible(
+					(w->mapToGlobal(limit.bottomLeft()).y() - border)
+						< w->mapToGlobal(field.bottomLeft()).y());
+				limitState->charsLimitation->raise();
+			}, limitState->charsLimitation->lifetime());
+		}
+		limitState->charsLimitation->setLeft(remove);
+	};
+
+	_notesField->changes() | rpl::on_next([=] {
+		checkCharsLimitation();
+	}, _notesField->lifetime());
+
+	Ui::AddDividerText(
+		_box->verticalLayout(),
+		tr::lng_contact_add_notes_about());
+}
+
+void Controller::setupPhotoButtons() {
+	if (!_user->isContact()) {
+		return;
+	}
+	const auto iconPlaceholder = st::restoreUserpicIcon.size * 2;
+	auto nameValue = _firstNameField
+		? rpl::merge(
+			rpl::single(_firstNameField->getLastText().trimmed()),
+			_firstNameField->changes() | rpl::map([=] {
+				return _firstNameField->getLastText().trimmed();
+		})) | rpl::map([=](const QString &text) {
+			return text.isEmpty() ? Ui::kQEllipsis : text;
+		})
+		: rpl::single(_user->shortName()) | rpl::type_erased;
+	const auto inner = _box->verticalLayout();
+	Ui::AddSkip(inner);
+
+	const auto suggestBirthdayWrap = inner->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			inner,
+			object_ptr<Ui::VerticalLayout>(inner)));
+
+	const auto suggestBirthdayButton = Settings::AddButtonWithIcon(
+		suggestBirthdayWrap->entity(),
+		tr::lng_suggest_birthday(),
+		st::settingsButtonLight,
+		{ &st::editContactSuggestBirthday });
+	suggestBirthdayButton->setClickedCallback([=] {
+		Core::App().openInternalUrl(
+			u"internal:edit_birthday:suggest:%1"_q.arg(
+				peerToUser(_user->id).bare),
+			QVariant::fromValue(ClickHandlerContext{
+				.sessionWindow = base::make_weak(_window),
+			}));
+	});
+	suggestBirthdayWrap->toggleOn(rpl::single(!_user->birthday().valid()
+		&& !_user->starsPerMessageChecked()));
+
+	_suggestIcon = Ui::MakeAnimatedIcon({
+		.generator = [] {
+			return std::make_unique<Lottie::FrameGenerator>(
+				Lottie::ReadContent(
+					QByteArray(),
+					u":/animations/photo_suggest_icon.tgs"_q));
+		},
+		.sizeOverride = iconPlaceholder,
+		.colorized = true,
+	});
+
+	_cameraIcon = Ui::MakeAnimatedIcon({
+		.generator = [] {
+			return std::make_unique<Lottie::FrameGenerator>(
+				Lottie::ReadContent(
+					QByteArray(),
+					u":/animations/camera_outline.tgs"_q));
+		},
+		.sizeOverride = iconPlaceholder,
+		.colorized = true,
+	});
+
+	const auto suggestButtonWrap = inner->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			inner,
+			object_ptr<Ui::VerticalLayout>(inner)));
+	suggestButtonWrap->toggleOn(
+		rpl::single(!_user->starsPerMessageChecked()));
+
+	const auto suggestButton = Settings::AddButtonWithIcon(
+		suggestButtonWrap->entity(),
+		tr::lng_suggest_photo_for(lt_user, rpl::duplicate(nameValue)),
+		st::settingsButtonLight,
+		{ nullptr });
+
+	_suggestIconWidget = Ui::CreateChild<Ui::RpWidget>(suggestButton);
+	_suggestIconWidget->resize(iconPlaceholder);
+	_suggestIconWidget->paintRequest() | rpl::on_next([=] {
+		if (_suggestIcon && _suggestIcon->valid()) {
+			auto p = QPainter(_suggestIconWidget);
+			const auto frame = _suggestIcon->frame(st::lightButtonFg->c);
+			p.drawImage(_suggestIconWidget->rect(), frame);
+		}
+	}, _suggestIconWidget->lifetime());
+
+	suggestButton->sizeValue() | rpl::on_next([=](QSize size) {
+		_suggestIconWidget->move(
+			st::settingsButtonLight.iconLeft - iconPlaceholder.width() / 4,
+			(size.height() - _suggestIconWidget->height()) / 2);
+	}, _suggestIconWidget->lifetime());
+
+	suggestButton->setClickedCallback([=] {
+		if (_suggestIcon && _suggestIcon->valid()) {
+			_suggestIcon->setCustomStartFrame(kAnimationStartFrame);
+			_suggestIcon->setCustomEndFrame(kAnimationEndFrame);
+			_suggestIcon->jumpToStart([=] { _suggestIconWidget->update(); });
+			_suggestIcon->animate([=] { _suggestIconWidget->update(); });
+		}
+		showPhotoMenu(true);
+	});
+
+	const auto setButton = Settings::AddButtonWithIcon(
+		inner,
+		tr::lng_set_photo_for_user(lt_user, rpl::duplicate(nameValue)),
+		st::settingsButtonLight,
+		{ nullptr });
+
+	_cameraIconWidget = Ui::CreateChild<Ui::RpWidget>(setButton);
+	_cameraIconWidget->resize(iconPlaceholder);
+	_cameraIconWidget->paintRequest() | rpl::on_next([=] {
+		if (_cameraIcon && _cameraIcon->valid()) {
+			auto p = QPainter(_cameraIconWidget);
+			const auto frame = _cameraIcon->frame(st::lightButtonFg->c);
+			p.drawImage(_cameraIconWidget->rect(), frame);
+		}
+	}, _cameraIconWidget->lifetime());
+
+	setButton->sizeValue() | rpl::on_next([=](QSize size) {
+		_cameraIconWidget->move(
+			st::settingsButtonLight.iconLeft - iconPlaceholder.width() / 4,
+			(size.height() - _cameraIconWidget->height()) / 2);
+	}, _cameraIconWidget->lifetime());
+
+	setButton->setClickedCallback([=] {
+		if (_cameraIcon && _cameraIcon->valid()) {
+			_cameraIcon->setCustomStartFrame(kAnimationStartFrame);
+			_cameraIcon->setCustomEndFrame(kAnimationEndFrame);
+			_cameraIcon->jumpToStart([=] { _cameraIconWidget->update(); });
+			_cameraIcon->animate([=] { _cameraIconWidget->update(); });
+		}
+		showPhotoMenu(false);
+	});
+
+	const auto resetButtonWrap = inner->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			inner,
+			object_ptr<Ui::VerticalLayout>(inner)));
+
+	const auto resetButton = Settings::AddButtonWithIcon(
+		resetButtonWrap->entity(),
+		tr::lng_profile_photo_reset(),
+		st::settingsButtonLight,
+		{ nullptr });
+
+	const auto userpicButton = Ui::CreateChild<Ui::UserpicButton>(
+		resetButton,
+		_window,
+		_user,
+		Ui::UserpicButton::Role::Custom,
+		Ui::UserpicButton::Source::NonPersonalIfHasPersonal,
+		st::restoreUserpicIcon);
+	userpicButton->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	resetButton->sizeValue(
+	) | rpl::on_next([=](QSize size) {
+		userpicButton->move(
+			st::settingsButtonLight.iconLeft,
+			(size.height() - userpicButton->height()) / 2);
+	}, userpicButton->lifetime());
+	resetButtonWrap->toggleOn(
+		_user->session().changes().peerFlagsValue(
+			_user,
+			Data::PeerUpdate::Flag::FullInfo | Data::PeerUpdate::Flag::Photo
+		) | rpl::map([=] {
+			return _user->hasPersonalPhoto();
+		}) | rpl::distinct_until_changed());
+
+	resetButton->setClickedCallback([=] {
+		_window->show(Ui::MakeConfirmBox({
+			.text = tr::lng_profile_photo_reset_sure(
+				tr::now,
+				lt_user,
+				_user->shortName()),
+			.confirmed = [=](Fn<void()> close) {
+				_window->session().api().peerPhoto().clearPersonal(_user);
+				close();
+			},
+			.confirmText = tr::lng_profile_photo_reset_button(tr::now),
+		}));
+	});
+
+	Ui::AddSkip(inner);
+
+	Ui::AddDividerText(
+		inner,
+		tr::lng_contact_photo_replace_info(lt_user, std::move(nameValue)));
+	Ui::AddSkip(inner);
+}
+
+void Controller::setupDeleteContactButton() {
+	if (!_user->isContact()) {
+		return;
+	}
+	const auto inner = _box->verticalLayout();
+	const auto deleteButton = Settings::AddButtonWithIcon(
+		inner,
+		tr::lng_info_delete_contact(),
+		st::settingsAttentionButton,
+		{ nullptr });
+	deleteButton->setClickedCallback([=] {
+		const auto text = tr::lng_sure_delete_contact(
+			tr::now,
+			lt_contact,
+			_user->name());
+		const auto deleteSure = [=](Fn<void()> &&close) {
+			close();
+			_user->session().api().request(MTPcontacts_DeleteContacts(
+				MTP_vector<MTPInputUser>(1, _user->inputUser())
+			)).done([=](const MTPUpdates &result) {
+				_user->session().api().applyUpdates(result);
+				_box->closeBox();
+			}).send();
+		};
+		_window->show(Ui::MakeConfirmBox({
+			.text = text,
+			.confirmed = deleteSure,
+			.confirmText = tr::lng_box_delete(),
+			.confirmStyle = &st::attentionBoxButton,
+		}));
+	});
+	Ui::AddSkip(inner);
+}
+
 void Controller::setupSharePhoneNumber() {
 	const auto settings = _user->barSettings();
 	if (!settings
@@ -279,11 +795,174 @@ void Controller::setupSharePhoneNumber() {
 
 }
 
+void Controller::showPhotoMenu(bool suggest) {
+	_photoMenu = base::make_unique_q<Ui::PopupMenu>(
+		_box,
+		st::popupMenuWithIcons);
+
+	QObject::connect(_photoMenu.get(), &QObject::destroyed, [=] {
+		finishIconAnimation(suggest);
+	});
+
+	_photoMenu->addAction(
+		tr::lng_attach_photo(tr::now),
+		[=] { executeWithDelay([=] { choosePhotoFile(suggest); }, suggest); },
+		&st::menuIconPhoto);
+
+	if (const auto data = QGuiApplication::clipboard()->mimeData()) {
+		if (data->hasImage()) {
+			auto callback = [=] {
+				Editor::PrepareProfilePhoto(
+					_box,
+					&_window->window(),
+					Editor::EditorData{
+						.about = (suggest
+							? tr::lng_profile_suggest_sure(
+								tr::now,
+								lt_user,
+								tr::bold(_user->shortName()),
+								tr::marked)
+							: tr::lng_profile_set_personal_sure(
+								tr::now,
+								lt_user,
+								tr::bold(_user->shortName()),
+								tr::marked)),
+						.confirm = (suggest
+							? tr::lng_profile_suggest_button(tr::now)
+							: tr::lng_profile_set_photo_button(tr::now)),
+						.cropType = Editor::EditorData::CropType::Ellipse,
+						.keepAspectRatio = true,
+					},
+					[=](QImage &&editedImage) {
+						processChosenPhoto(std::move(editedImage), suggest);
+					},
+					qvariant_cast<QImage>(data->imageData()));
+			};
+			_photoMenu->addAction(
+				tr::lng_profile_photo_from_clipboard(tr::now),
+				[=] { executeWithDelay(callback, suggest); },
+				&st::menuIconPhoto);
+		}
+	}
+
+	UserpicBuilder::AddEmojiBuilderAction(
+		_window,
+		_photoMenu.get(),
+		_window->session().api().peerPhoto().emojiListValue(
+			Api::PeerPhoto::EmojiListType::Profile),
+		[=](UserpicBuilder::Result data) {
+			processChosenPhotoWithMarkup(std::move(data), suggest);
+		},
+		false);
+
+	_photoMenu->popup(QCursor::pos());
+}
+
+void Controller::choosePhotoFile(bool suggest) {
+	Editor::PrepareProfilePhotoFromFile(
+		_box,
+		&_window->window(),
+		Editor::EditorData{
+			.about = (suggest
+				? tr::lng_profile_suggest_sure(
+					tr::now,
+					lt_user,
+					tr::bold(_user->shortName()),
+					tr::marked)
+				: tr::lng_profile_set_personal_sure(
+					tr::now,
+					lt_user,
+					tr::bold(_user->shortName()),
+					tr::marked)),
+			.confirm = (suggest
+				? tr::lng_profile_suggest_button(tr::now)
+				: tr::lng_profile_set_photo_button(tr::now)),
+			.cropType = Editor::EditorData::CropType::Ellipse,
+			.keepAspectRatio = true,
+		},
+		[=](QImage &&image) {
+			processChosenPhoto(std::move(image), suggest);
+		});
+}
+
+void Controller::processChosenPhoto(QImage &&image, bool suggest) {
+	Api::PeerPhoto::UserPhoto photo{
+		.image = base::duplicate(image),
+	};
+	if (suggest) {
+		_window->session().api().peerPhoto().suggest(_user, std::move(photo));
+		_window->showPeerHistory(_user->id);
+	} else {
+		_window->session().api().peerPhoto().upload(_user, std::move(photo));
+	}
+}
+
+void Controller::processChosenPhotoWithMarkup(
+		UserpicBuilder::Result &&data,
+		bool suggest) {
+	Api::PeerPhoto::UserPhoto photo{
+		.image = std::move(data.image),
+		.markupDocumentId = data.id,
+		.markupColors = std::move(data.colors),
+	};
+	if (suggest) {
+		_window->session().api().peerPhoto().suggest(_user, std::move(photo));
+		_window->showPeerHistory(_user->id);
+	} else {
+		_window->session().api().peerPhoto().upload(_user, std::move(photo));
+	}
+}
+
+void Controller::finishIconAnimation(bool suggest) {
+	const auto icon = suggest ? _suggestIcon.get() : _cameraIcon.get();
+	const auto widget = suggest ? _suggestIconWidget : _cameraIconWidget;
+	if (icon && icon->valid()) {
+		icon->setCustomStartFrame(icon->frameIndex());
+		icon->setCustomEndFrame(-1);
+		icon->animate([=] { widget->update(); });
+	}
+}
+
+void Controller::executeWithDelay(
+		Fn<void()> callback,
+		bool suggest,
+		bool startAnimation) {
+	const auto icon = suggest ? _suggestIcon.get() : _cameraIcon.get();
+	const auto widget = suggest ? _suggestIconWidget : _cameraIconWidget;
+
+	if (startAnimation && icon && icon->valid()) {
+		icon->setCustomStartFrame(icon->frameIndex());
+		icon->setCustomEndFrame(-1);
+		icon->animate([=] { widget->update(); });
+	}
+
+	if (icon && icon->valid() && icon->animating()) {
+		base::call_delayed(50, [=] {
+			executeWithDelay(callback, suggest, false);
+		});
+	} else {
+		callback();
+	}
+}
+
 } // namespace
 
 void EditContactBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Window::SessionController*> window,
 		not_null<UserData*> user) {
+	box->setWidth(st::boxWideWidth);
 	box->lifetime().make_state<Controller>(box, window, user)->prepare();
 }
+
+void EditContactNoteBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> window,
+		not_null<UserData*> user) {
+	box->setWidth(st::boxWideWidth);
+	box->lifetime().make_state<Controller>(
+		box,
+		window,
+		user,
+		true)->prepare();
+}
diff --git a/Telegram/SourceFiles/boxes/peers/edit_contact_box.h b/Telegram/SourceFiles/boxes/peers/edit_contact_box.h
index 3dc7d81f8964f1..8877134fd285d5 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_contact_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_contact_box.h
@@ -19,3 +19,8 @@ void EditContactBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Window::SessionController*> window,
 	not_null<UserData*> user);
+
+void EditContactNoteBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionController*> window,
+	not_null<UserData*> user);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_discussion_link_box.cpp
similarity index 89%
rename from Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
rename to Telegram/SourceFiles/boxes/peers/edit_discussion_link_box.cpp
index bae3d8a769add0..01c838b82c5a51 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_discussion_link_box.cpp
@@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "boxes/peers/edit_linked_chat_box.h"
+#include "boxes/peers/edit_discussion_link_box.h"
 
 #include "lang/lang_keys.h"
 #include "data/data_channel.h"
@@ -16,7 +16,7 @@ For license and copyright information please follow this link:
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/vertical_layout.h"
-#include "ui/text/text_utilities.h" // Ui::Text::RichLangValue
+#include "ui/text/text_utilities.h" // tr::rich
 #include "boxes/peer_list_box.h"
 #include "ui/boxes/confirm_box.h"
 #include "boxes/add_contact_box.h"
@@ -81,7 +81,7 @@ Controller::Controller(
 		Data::PeerUpdate::Flag::FullInfo
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer == _waitForFull);
-	}) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	}) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		choose(std::exchange(_waitForFull, nullptr));
 	}, lifetime());
 }
@@ -111,7 +111,7 @@ void Controller::prepare() {
 	if (_chat) {
 		appendRow(_chat);
 	} else {
-		for (const auto chat : _chats) {
+		for (const auto &chat : _chats) {
 			appendRow(chat);
 		}
 		if (_chats.size() >= kEnableSearchRowsCount) {
@@ -146,10 +146,10 @@ void Controller::choose(not_null<ChannelData*> chat) {
 	auto text = tr::lng_manage_discussion_group_sure(
 		tr::now,
 		lt_group,
-		Ui::Text::Bold(chat->name()),
+		tr::bold(chat->name()),
 		lt_channel,
-		Ui::Text::Bold(_channel->name()),
-		Ui::Text::WithEntities);
+		tr::bold(_channel->name()),
+		tr::marked);
 	if (!_channel->isPublic()) {
 		text.append(
 			"\n\n" + tr::lng_manage_linked_channel_private(tr::now));
@@ -161,7 +161,7 @@ void Controller::choose(not_null<ChannelData*> chat) {
 			text.append("\n\n");
 			text.append(tr::lng_manage_discussion_group_warning(
 				tr::now,
-				Ui::Text::RichLangValue));
+				tr::rich));
 		}
 	}
 	const auto sure = [=](Fn<void()> &&close) {
@@ -180,10 +180,10 @@ void Controller::choose(not_null<ChatData*> chat) {
 	auto text = tr::lng_manage_discussion_group_sure(
 		tr::now,
 		lt_group,
-		Ui::Text::Bold(chat->name()),
+		tr::bold(chat->name()),
 		lt_channel,
-		Ui::Text::Bold(_channel->name()),
-		Ui::Text::WithEntities);
+		tr::bold(_channel->name()),
+		tr::marked);
 	if (!_channel->isPublic()) {
 		text.append("\n\n" + tr::lng_manage_linked_channel_private(tr::now));
 	}
@@ -191,7 +191,7 @@ void Controller::choose(not_null<ChatData*> chat) {
 	text.append("\n\n");
 	text.append(tr::lng_manage_discussion_group_warning(
 		tr::now,
-		Ui::Text::RichLangValue));
+		tr::rich));
 	const auto sure = [=](Fn<void()> &&close) {
 		close();
 		const auto done = [=](not_null<ChannelData*> chat) {
@@ -213,18 +213,18 @@ void Controller::choose(not_null<ChatData*> chat) {
 	if (!channel->isBroadcast()) {
 		return tr::lng_manage_linked_channel_about(
 			lt_channel,
-			rpl::single(Ui::Text::Bold(chat->name())),
-			Ui::Text::WithEntities);
+			rpl::single(tr::bold(chat->name())),
+			tr::marked);
 	} else if (chat != nullptr) {
 		return tr::lng_manage_discussion_group_about_chosen(
 			lt_group,
-			rpl::single(Ui::Text::Bold(chat->name())),
-			Ui::Text::WithEntities);
+			rpl::single(tr::bold(chat->name())),
+			tr::marked);
 	}
-	return tr::lng_manage_discussion_group_about(Ui::Text::WithEntities);
+	return tr::lng_manage_discussion_group_about(tr::marked);
 }
 
-[[nodiscard]] object_ptr<Ui::BoxContent> EditLinkedChatBox(
+[[nodiscard]] object_ptr<Ui::BoxContent> EditDiscussionLinkBox(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<ChannelData*> channel,
 		ChannelData *chat,
@@ -272,8 +272,8 @@ void Controller::choose(not_null<ChatData*> chat) {
 			Settings::AddButtonWithIcon(
 				above,
 				tr::lng_manage_discussion_group_create(),
-				st::infoCreateLinkedChatButton,
-				{ &st::menuIconGroupCreate }
+				st::infoCreateDiscussionLinkButton,
+				{ &st::menuBlueIconGroupCreate }
 			)->addClickHandler([=, parent = above.data()] {
 				const auto guarded = crl::guard(parent, callback);
 				navigation->uiShow()->showBox(Box<GroupInfoBox>(
@@ -292,11 +292,11 @@ void Controller::choose(not_null<ChatData*> chat) {
 				(channel->isBroadcast()
 					? tr::lng_manage_discussion_group_unlink
 					: tr::lng_manage_linked_channel_unlink)(),
-				st::infoUnlinkChatButton,
-				{ &st::menuIconRemove }
+				st::infoUnlinkDiscussionLinkButton,
+				{ &st::menuIconRemoveAttention }
 			)->addClickHandler([=] { callback(nullptr); });
-			Ui::AddSkip(below);
 		}
+		Ui::AddSkip(below);
 		Ui::AddDividerText(
 			below,
 			(channel->isBroadcast()
@@ -327,12 +327,12 @@ void Controller::choose(not_null<ChatData*> chat) {
 
 } // namespace
 
-object_ptr<Ui::BoxContent> EditLinkedChatBox(
+object_ptr<Ui::BoxContent> EditDiscussionLinkBox(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<ChannelData*> channel,
 		std::vector<not_null<PeerData*>> &&chats,
 		Fn<void(ChannelData*)> callback) {
-	return EditLinkedChatBox(
+	return EditDiscussionLinkBox(
 		navigation,
 		channel,
 		nullptr,
@@ -341,13 +341,13 @@ object_ptr<Ui::BoxContent> EditLinkedChatBox(
 		callback);
 }
 
-object_ptr<Ui::BoxContent> EditLinkedChatBox(
+object_ptr<Ui::BoxContent> EditDiscussionLinkBox(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<ChannelData*> channel,
 		not_null<ChannelData*> chat,
 		bool canEdit,
 		Fn<void(ChannelData*)> callback) {
-	return EditLinkedChatBox(
+	return EditDiscussionLinkBox(
 		navigation,
 		channel,
 		chat,
@@ -361,5 +361,5 @@ void ShowForumForDiscussionError(
 	navigation->showToast(
 		tr::lng_forum_topics_no_discussion(
 			tr::now,
-			Ui::Text::RichLangValue));
+			tr::rich));
 }
diff --git a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.h b/Telegram/SourceFiles/boxes/peers/edit_discussion_link_box.h
similarity index 86%
rename from Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.h
rename to Telegram/SourceFiles/boxes/peers/edit_discussion_link_box.h
index 788f57757e6191..113a9ca1f57641 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_discussion_link_box.h
@@ -17,14 +17,14 @@ namespace Window {
 class SessionNavigation;
 } // namespace Window
 
-[[nodiscard]] object_ptr<Ui::BoxContent> EditLinkedChatBox(
+[[nodiscard]] object_ptr<Ui::BoxContent> EditDiscussionLinkBox(
 	not_null<Window::SessionNavigation*> navigation,
 	not_null<ChannelData*> channel,
 	not_null<ChannelData*> chat,
 	bool canEdit,
 	Fn<void(ChannelData*)> callback);
 
-[[nodiscard]] object_ptr<Ui::BoxContent> EditLinkedChatBox(
+[[nodiscard]] object_ptr<Ui::BoxContent> EditDiscussionLinkBox(
 	not_null<Window::SessionNavigation*> navigation,
 	not_null<ChannelData*> channel,
 	std::vector<not_null<PeerData*>> &&chats,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
index be668fcd3a8147..1fe646de7be235 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
@@ -12,7 +12,6 @@ For license and copyright information please follow this link:
 #include "ui/effects/emoji_fly_animation.h"
 #include "ui/abstract_button.h"
 #include "ui/vertical_list.h"
-#include "data/data_channel.h"
 #include "data/data_document.h"
 #include "data/data_forum.h"
 #include "data/data_forum_icons.h"
@@ -27,7 +26,7 @@ For license and copyright information please follow this link:
 #include "boxes/premium_preview_box.h"
 #include "main/main_session.h"
 #include "history/history.h"
-#include "history/view/history_view_replies_section.h"
+#include "history/view/history_view_chat_section.h"
 #include "history/view/history_view_sticker_toast.h"
 #include "lang/lang_keys.h"
 #include "info/profile/info_profile_emoji_status_panel.h"
@@ -74,10 +73,12 @@ DefaultIconEmoji::DefaultIconEmoji(
 	Fn<void()> repaint,
 	Data::CustomEmojiSizeTag tag)
 : _tag(tag) {
-	std::move(value) | rpl::start_with_next([=](DefaultIcon value) {
+	std::move(value) | rpl::on_next([=](DefaultIcon value) {
 		_icon = value;
 		_image = QImage();
-		repaint();
+		if (repaint) {
+			repaint();
+		}
 	}, _lifetime);
 }
 
@@ -93,11 +94,12 @@ void DefaultIconEmoji::paint(QPainter &p, const Context &context) {
 	const auto &st = (_tag == Data::CustomEmojiSizeTag::Normal)
 		? st::normalForumTopicIcon
 		: st::defaultForumTopicIcon;
+	const auto general = Data::IsForumGeneralIconTitle(_icon.title);
 	if (_image.isNull()) {
-		_image = Data::IsForumGeneralIconTitle(_icon.title)
+		_image = general
 			? Data::ForumTopicGeneralIconFrame(
 				st.size,
-				Data::ParseForumGeneralIconColor(_icon.colorId))
+				QColor(255, 255, 255))
 			: Data::ForumTopicIconFrame(_icon.colorId, _icon.title, st);
 	}
 	const auto full = (_tag == Data::CustomEmojiSizeTag::Normal)
@@ -106,7 +108,9 @@ void DefaultIconEmoji::paint(QPainter &p, const Context &context) {
 	const auto esize = full / style::DevicePixelRatio();
 	const auto customSize = Ui::Text::AdjustCustomEmojiSize(esize);
 	const auto skip = (customSize - st.size) / 2;
-	p.drawImage(context.position + QPoint(skip, skip), _image);
+	p.drawImage(context.position + QPoint(skip, skip), general
+		? style::colorizeImage(_image, context.textColor)
+		: _image);
 }
 
 void DefaultIconEmoji::unload() {
@@ -160,7 +164,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 
 	std::move(
 		iconId
-	) | rpl::start_with_next([=](DocumentId id) {
+	) | rpl::on_next([=](DocumentId id) {
 		const auto owner = &controller->session().data();
 		state->icon = id
 			? owner->customEmojiManager().create(
@@ -173,7 +177,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 
 	std::move(
 		defaultIcon
-	) | rpl::start_with_next([=](DefaultIcon icon) {
+	) | rpl::on_next([=](DefaultIcon icon) {
 		state->defaultIcon = Data::ForumTopicIconFrame(
 			icon.colorId,
 			icon.title,
@@ -185,7 +189,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 	result->paintRequest(
 	) | rpl::filter([=] {
 		return !paintIconFrame(result);
-	}) | rpl::start_with_next([=](QRect clip) {
+	}) | rpl::on_next([=](QRect clip) {
 		auto args = Ui::Text::CustomEmoji::Context{
 			.textColor = st::windowFg->c,
 			.now = crl::now(),
@@ -218,7 +222,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 
 	rpl::single(rpl::empty) | rpl::then(
 		style::PaletteChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->frame = Data::ForumTopicGeneralIconFrame(
 			st::largeForumTopicIcon.size,
 			st::windowSubTextFg->c);
@@ -227,7 +231,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 
 	result->resize(size, size);
 	result->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(result);
 		const auto skip = (size - st::largeForumTopicIcon.size) / 2;
 		p.drawImage(skip, skip, state->frame);
@@ -265,7 +269,7 @@ struct IconSelector {
 	const auto manager = &controller->session().data().customEmojiManager();
 
 	auto factory = [=](DocumentId id, Fn<void()> repaint)
-		-> std::unique_ptr<Ui::Text::CustomEmoji> {
+	-> std::unique_ptr<Ui::Text::CustomEmoji> {
 		const auto tag = Data::CustomEmojiManager::SizeTag::Large;
 		if (id == kDefaultIconId) {
 			return std::make_unique<DefaultIconEmoji>(
@@ -288,7 +292,7 @@ struct IconSelector {
 			.show = controller->uiShow(),
 			.mode = EmojiListWidget::Mode::TopicIcon,
 			.paused = Window::PausedIn(controller, PauseReason::Layer),
-			.customRecentList = recent(),
+			.customRecentList = DocumentListToRecent(recent()),
 			.customRecentFactory = std::move(factory),
 			.st = &st::reactPanelEmojiPan,
 		}),
@@ -296,8 +300,8 @@ struct IconSelector {
 
 	icons->requestDefaultIfUnknown();
 	icons->defaultUpdates(
-	) | rpl::start_with_next([=] {
-		selector->provideRecent(recent());
+	) | rpl::on_next([=] {
+		selector->provideRecent(DocumentListToRecent(recent()));
 	}, selector->lifetime());
 
 	placeFooter(selector->createFooter());
@@ -308,14 +312,14 @@ struct IconSelector {
 	rpl::combine(
 		rpl::duplicate(coverHeight),
 		selector->widthValue()
-	) | rpl::start_with_next([=](int top, int width) {
+	) | rpl::on_next([=](int top, int width) {
 		shadow->setGeometry(0, top, width, st::lineWidth);
 	}, shadow->lifetime());
 
 	selector->refreshEmoji();
 
 	selector->scrollToRequests(
-	) | rpl::start_with_next([=](int y) {
+	) | rpl::on_next([=](int y) {
 		box->scrollToY(y);
 		shadow->update();
 	}, selector->lifetime());
@@ -324,7 +328,7 @@ struct IconSelector {
 		box->heightValue(),
 		std::move(coverHeight),
 		rpl::mappers::_1 - rpl::mappers::_2
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		selector->setMinimalHeight(selector->width(), height);
 	}, body->lifetime());
 
@@ -341,7 +345,7 @@ struct IconSelector {
 	};
 
 	selector->customChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		const auto owner = &controller->session().data();
 		const auto document = data.document;
 		const auto id = document->id;
@@ -406,9 +410,12 @@ void EditForumTopicBox(
 	const auto topic = (!creating && forum->peer->forum())
 		? forum->peer->forum()->topicFor(rootId)
 		: nullptr;
+	const auto bot = forum->peer->isBot();
 	const auto created = topic && !topic->creating();
 	box->setTitle(creating
 		? tr::lng_forum_topic_new()
+		: bot
+		? tr::lng_bot_thread_edit()
 		: tr::lng_forum_topic_edit());
 
 	box->setMaxHeight(st::editTopicMaxHeight);
@@ -436,7 +443,9 @@ void EditForumTopicBox(
 		object_ptr<Ui::InputField>(
 			box,
 			st::defaultInputField,
-			tr::lng_forum_topic_title(),
+			(bot
+				? tr::lng_bot_thread_title()
+				: tr::lng_forum_topic_title()),
 			topic ? topic->title() : QString()),
 		st::editTopicTitleMargin);
 	box->setFocusCallback([=] {
@@ -456,14 +465,14 @@ void EditForumTopicBox(
 			paintIconFrame);
 
 	title->geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
+	) | rpl::on_next([=](QRect geometry) {
 		icon->move(
 			st::editTopicIconPosition.x(),
 			st::editTopicIconPosition.y());
 	}, icon->lifetime());
 
 	state->iconId.value(
-	) | rpl::start_with_next([=](DocumentId iconId) {
+	) | rpl::on_next([=](DocumentId iconId) {
 		icon->setAttribute(
 			Qt::WA_TransparentForMouseEvents,
 			created || (iconId != 0));
@@ -477,18 +486,20 @@ void EditForumTopicBox(
 		};
 	});
 	title->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->defaultIcon = DefaultIcon{
 			title->getLastText().trimmed(),
 			state->defaultIcon.current().colorId,
 		};
 	}, title->lifetime());
-	title->submits() | rpl::start_with_next([box] {
+	title->submits() | rpl::on_next([box] {
 		box->triggerButton(0);
 	}, title->lifetime());
 
 	if (!topic || !topic->isGeneral()) {
-		Ui::AddDividerText(top, tr::lng_forum_choose_title_and_icon());
+		Ui::AddDividerText(top, bot
+			? tr::lng_bot_thread_choose_title_and_icon()
+			: tr::lng_forum_choose_title_and_icon());
 
 		box->setScrollStyle(st::reactPanelScroll);
 
@@ -504,27 +515,28 @@ void EditForumTopicBox(
 		state->paintIconFrame = std::move(selector.paintIconFrame);
 		std::move(
 			selector.iconIdValue
-		) | rpl::start_with_next([=](DocumentId iconId) {
+		) | rpl::on_next([=](DocumentId iconId) {
 			state->iconId = (iconId != kDefaultIconId) ? iconId : 0;
 		}, box->lifetime());
 	}
 
 	const auto create = [=] {
-		const auto channel = forum->peer->asChannel();
-		if (!channel || !channel->isForum()) {
+		if (!forum->peer->isForum()) {
 			box->closeBox();
 			return;
 		} else if (title->getLastText().trimmed().isEmpty()) {
 			title->showError();
 			return;
 		}
+		using namespace HistoryView;
 		controller->showSection(
-			std::make_shared<HistoryView::RepliesMemento>(
-				forum,
-				channel->forum()->reserveCreatingId(
+			std::make_shared<ChatMemento>(ChatViewId{
+				.history = forum,
+				.repliesRootId = forum->peer->forum()->reserveCreatingId(
 					title->getLastText().trimmed(),
 					state->defaultIcon.current().colorId,
-					state->iconId.current())),
+					state->iconId.current()),
+			}),
 			Window::SectionShow::Way::ClearStack);
 	};
 
@@ -547,13 +559,13 @@ void EditForumTopicBox(
 			topic->applyIconId(state->iconId.current());
 			box->closeBox();
 		} else {
-			using Flag = MTPchannels_EditForumTopic::Flag;
+			using Flag = MTPmessages_EditForumTopic::Flag;
 			const auto api = &forum->session().api();
-			const auto weak = Ui::MakeWeak(box.get());
-			state->requestId = api->request(MTPchannels_EditForumTopic(
+			const auto weak = base::make_weak(box);
+			state->requestId = api->request(MTPmessages_EditForumTopic(
 				MTP_flags(Flag::f_title
 					| (topic->isGeneral() ? Flag() : Flag::f_icon_emoji_id)),
-				topic->channel()->inputChannel,
+				topic->peer()->input(),
 				MTP_int(rootId),
 				MTP_string(title->getLastText().trimmed()),
 				MTP_long(state->iconId.current()),
@@ -561,11 +573,11 @@ void EditForumTopicBox(
 				MTPBool() // hidden
 			)).done([=](const MTPUpdates &result) {
 				api->applyUpdates(result);
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					strong->closeBox();
 				}
 			}).fail([=](const MTP::Error &error) {
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					if (error.type() == u"TOPIC_NOT_MODIFIED") {
 						strong->closeBox();
 					} else {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
index 216a0431d77ad2..8d042eccfab210 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp
@@ -34,44 +34,50 @@ namespace {
 
 [[nodiscard]] object_ptr<Ui::RpWidget> CreateMembersVisibleButton(
 		not_null<ChannelData*> megagroup) {
-	auto result = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
-	const auto container = result.data();
-
 	const auto min = EnableHideMembersMin(megagroup);
-	if (!megagroup->canBanMembers() || megagroup->membersCount() < min) {
+	const auto showHideMembers = megagroup->canBanMembers()
+		&& megagroup->membersCount() >= min;
+	if (!showHideMembers) {
 		return { nullptr };
 	}
 
-	struct State {
-		rpl::event_stream<bool> toggled;
-	};
-	Ui::AddSkip(container);
-	const auto state = container->lifetime().make_state<State>();
-	const auto button = container->add(
-		EditPeerInfoBox::CreateButton(
+	auto result = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	const auto container = result.data();
+
+	if (showHideMembers) {
+		struct State {
+			rpl::event_stream<bool> toggled;
+		};
+		Ui::AddSkip(container);
+		const auto state = container->lifetime().make_state<State>();
+		const auto button = container->add(
+			EditPeerInfoBox::CreateButton(
+				container,
+				tr::lng_profile_hide_participants(),
+				rpl::single(QString()),
+				[] {},
+				st::manageGroupNoIconButton,
+				{}
+		))->toggleOn(rpl::single(
+			(megagroup->flags() & ChannelDataFlag::ParticipantsHidden) != 0
+		) | rpl::then(state->toggled.events()));
+		Ui::AddSkip(container);
+		Ui::AddDividerText(
 			container,
-			tr::lng_profile_hide_participants(),
-			rpl::single(QString()),
-			[] {},
-			st::manageGroupNoIconButton,
-			{}
-	))->toggleOn(rpl::single(
-		(megagroup->flags() & ChannelDataFlag::ParticipantsHidden) != 0
-	) | rpl::then(state->toggled.events()));
-	Ui::AddSkip(container);
-	Ui::AddDividerText(container, tr::lng_profile_hide_participants_about());
+			tr::lng_profile_hide_participants_about());
 
-	button->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
-		megagroup->session().api().request(
-			MTPchannels_ToggleParticipantsHidden(
-				megagroup->inputChannel,
-				MTP_bool(toggled)
-			)
-		).done([=](const MTPUpdates &result) {
-			megagroup->session().api().applyUpdates(result);
-		}).send();
-	}, button->lifetime());
+		button->toggledValue(
+		) | rpl::on_next([=](bool toggled) {
+			megagroup->session().api().request(
+				MTPchannels_ToggleParticipantsHidden(
+					megagroup->inputChannel(),
+					MTP_bool(toggled)
+				)
+			).done([=](const MTPUpdates &result) {
+				megagroup->session().api().applyUpdates(result);
+			}).send();
+		}, button->lifetime());
+	}
 
 	return result;
 }
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
index e4166a82c0d6e7..a337f9b3c43a10 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
@@ -7,6 +7,9 @@ For license and copyright information please follow this link:
 */
 #include "boxes/peers/edit_participant_box.h"
 
+#include "boxes/peers/edit_tag_control.h"
+#include "boxes/peers/edit_participants_box.h"
+#include "history/view/history_view_message.h"
 #include "lang/lang_keys.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/vertical_list.h"
@@ -24,32 +27,194 @@ For license and copyright information please follow this link:
 #include "ui/text/text_options.h"
 #include "ui/painter.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
-#include "settings/settings_privacy_security.h"
+#include "settings/sections/settings_privacy_security.h"
 #include "ui/boxes/choose_date_time.h"
 #include "ui/boxes/confirm_box.h"
-#include "boxes/passcode_box.h"
+#include "boxes/peers/channel_ownership_transfer.h"
 #include "boxes/peers/add_bot_to_chat_box.h"
 #include "boxes/peers/edit_peer_permissions_box.h"
 #include "boxes/peers/edit_peer_info_box.h"
+#include "boxes/peers/replace_boost_box.h"
+#include "settings/settings_common.h"
 #include "data/data_peer_values.h"
 #include "data/data_channel.h"
+#include "data/data_changes.h"
 #include "data/data_chat.h"
 #include "data/data_user.h"
-#include "core/core_cloud_password.h"
 #include "base/unixtime.h"
 #include "apiwrap.h"
-#include "api/api_cloud_password.h"
 #include "main/main_session.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_info.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
 
 namespace {
 
 constexpr auto kMaxRestrictDelayDays = 366;
 constexpr auto kSecondsInDay = 24 * 60 * 60;
 constexpr auto kSecondsInWeek = 7 * kSecondsInDay;
-constexpr auto kAdminRoleLimit = 16;
+
+[[nodiscard]] bool CanProcessJoinRequests(
+		not_null<PeerData*> peer,
+		not_null<UserData*> user) {
+	const auto info = user->botInfo.get();
+	return peer->isChannel()
+		&& user->isBot()
+		&& info
+		&& info->supportsGuard;
+}
+
+[[nodiscard]] object_ptr<Ui::GenericBox> GuardBotReplaceBox(
+		not_null<UserData*> current,
+		not_null<UserData*> replacement,
+		Fn<void(Fn<void()>)> confirmed) {
+	return Box([=](not_null<Ui::GenericBox*> box) {
+		box->setStyle(st::guardBotReplaceBox);
+		const auto content = box->verticalLayout();
+		const auto weak = base::make_weak(box);
+		content->add(
+			CreateUserpicsTransfer(
+				content,
+				rpl::single(std::vector{ not_null<PeerData*>(current) }),
+				replacement,
+				UserpicsTransferType::GuardBotReplace),
+			st::boxRowPadding + st::boostReplaceUserpicsPadding);
+		content->add(
+			object_ptr<Ui::FlatLabel>(
+				content,
+				tr::lng_guard_bot_replace_title(),
+				st::boostCenteredTitle),
+			st::boxRowPadding + st::starrefJoinTitlePadding,
+			style::al_top);
+		content->add(
+			object_ptr<Ui::FlatLabel>(
+				content,
+				rpl::single(tr::lng_guard_bot_replace_text(
+					tr::now,
+					lt_from,
+					tr::bold(current->name()),
+					lt_to,
+					tr::bold(replacement->name()),
+					tr::rich)),
+				st::boxLabel),
+			QMargins(
+				st::boxPadding.left(),
+				0,
+				st::boxPadding.right(),
+				st::boxPadding.bottom()));
+		Ui::AddSkip(content);
+		const auto use = content->add(
+			object_ptr<Ui::RoundButton>(
+				content,
+				rpl::single(tr::lng_guard_bot_replace_confirm(
+					tr::now,
+					lt_bot,
+					replacement->shortName())),
+				st::defaultLightButton),
+			st::boxRowPadding,
+			style::al_justify);
+		Ui::AddSkip(content);
+		const auto keep = content->add(
+			object_ptr<Ui::RoundButton>(
+				content,
+				rpl::single(tr::lng_guard_bot_replace_cancel(
+					tr::now,
+					lt_bot,
+					current->shortName())),
+				st::defaultLightButton),
+			st::boxRowPadding,
+			style::al_justify);
+		use->setClickedCallback([=] {
+			confirmed(crl::guard(weak, [=] { weak->closeBox(); }));
+		});
+		keep->setClickedCallback([=] {
+			box->closeBox();
+		});
+	});
+}
+
+[[nodiscard]] object_ptr<Ui::GenericBox> GuardBotApproveBox(
+		bool isGroup,
+		not_null<UserData*> bot,
+		Fn<void(Fn<void()>)> confirmed) {
+	const auto text = isGroup
+		? tr::lng_guard_bot_approve_text(
+			tr::now,
+			lt_bot,
+			tr::bold(bot->name()),
+			tr::rich)
+		: tr::lng_guard_bot_approve_text_channel(
+			tr::now,
+			lt_bot,
+			tr::bold(bot->name()),
+			tr::rich);
+	return Ui::MakeConfirmBox({
+		.text = text,
+		.confirmed = confirmed,
+		.confirmText = tr::lng_guard_bot_approve_confirm(),
+		.title = tr::lng_guard_bot_approve_title(),
+	});
+}
+
+class Cover final : public Ui::FixedHeightWidget {
+public:
+	Cover(QWidget *parent, not_null<UserData*> user, bool hasAdminRights);
+
+private:
+	void setupChildGeometry();
+
+	const style::InfoProfileCover &_st;
+	const not_null<UserData*> _user;
+	object_ptr<Ui::UserpicButton> _userpic;
+	object_ptr<Ui::FlatLabel> _name = { nullptr };
+	object_ptr<Ui::FlatLabel> _status = { nullptr };
+
+};
+
+Cover::Cover(
+	QWidget *parent,
+	not_null<UserData*> user,
+	bool hasAdminRights)
+: FixedHeightWidget(parent, st::infoEditContactCover.height)
+, _st(st::infoEditContactCover)
+, _user(user)
+, _userpic(this, _user, _st.photo) {
+	_userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	_name = object_ptr<Ui::FlatLabel>(this, _st.name);
+	_name->setText(_user->name());
+
+	const auto statusText = [&] {
+		if (_user->isBot()) {
+			const auto seesAllMessages = _user->botInfo->readsAllHistory
+				|| hasAdminRights;
+			return (seesAllMessages
+				? tr::lng_status_bot_reads_all
+				: tr::lng_status_bot_not_reads_all)(tr::now);
+		}
+		return Data::OnlineText(_user->lastseen(), base::unixtime::now());
+	}();
+	_status = object_ptr<Ui::FlatLabel>(this, _st.status);
+	_status->setText(statusText);
+	_status->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	setupChildGeometry();
+}
+
+void Cover::setupChildGeometry() {
+	widthValue(
+	) | rpl::on_next([this](int newWidth) {
+		_userpic->moveToLeft(_st.photoLeft, _st.photoTop, newWidth);
+		auto nameWidth = newWidth - _st.nameLeft - _st.rightSkip;
+		_name->resizeToNaturalWidth(nameWidth);
+		_name->moveToLeft(_st.nameLeft, _st.nameTop, newWidth);
+		auto statusWidth = newWidth - _st.statusLeft - _st.rightSkip;
+		_status->resizeToNaturalWidth(statusWidth);
+		_status->moveToLeft(_st.statusLeft, _st.statusTop, newWidth);
+	}, lifetime());
+}
 
 } // namespace
 
@@ -68,6 +233,8 @@ class EditParticipantBox::Inner : public Ui::RpWidget {
 		return _rows;
 	}
 
+	void setCoverMode(bool enabled);
+
 protected:
 	int resizeGetHeight(int newWidth) override;
 	void paintEvent(QPaintEvent *e) override;
@@ -78,6 +245,7 @@ class EditParticipantBox::Inner : public Ui::RpWidget {
 	object_ptr<Ui::UserpicButton> _userPhoto;
 	Ui::Text::String _userName;
 	bool _hasAdminRights = false;
+	bool _coverMode = false;
 	object_ptr<Ui::VerticalLayout> _rows;
 
 };
@@ -94,7 +262,7 @@ EditParticipantBox::Inner::Inner(
 , _hasAdminRights(hasAdminRights)
 , _rows(this) {
 	_rows->heightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		resizeToWidth(width());
 	}, lifetime());
 
@@ -112,7 +280,20 @@ Widget *EditParticipantBox::Inner::addControl(
 	return _rows->add(std::move(widget), margin);
 }
 
+void EditParticipantBox::Inner::setCoverMode(bool enabled) {
+	_coverMode = enabled;
+	if (enabled) {
+		_userPhoto->hide();
+	}
+	resizeToWidth(width());
+}
+
 int EditParticipantBox::Inner::resizeGetHeight(int newWidth) {
+	if (_coverMode) {
+		_rows->resizeToWidth(newWidth);
+		_rows->moveToLeft(0, 0, newWidth);
+		return _rows->heightNoMargins();
+	}
 	_userPhoto->moveToLeft(
 		st::rightsPhotoMargin.left(),
 		st::rightsPhotoMargin.top());
@@ -129,6 +310,10 @@ void EditParticipantBox::Inner::paintEvent(QPaintEvent *e) {
 
 	p.fillRect(e->rect(), st::boxBg);
 
+	if (_coverMode) {
+		return;
+	}
+
 	p.setPen(st::contactsNameFg);
 	auto namex = st::rightsPhotoMargin.left()
 		+ st::rightsPhotoButton.size .width()
@@ -200,6 +385,12 @@ bool EditParticipantBox::amCreator() const {
 	Unexpected("Peer type in EditParticipantBox::Inner::amCreator.");
 }
 
+void EditParticipantBox::setCoverMode(bool enabled) {
+	Expects(_inner != nullptr);
+
+	_inner->setCoverMode(enabled);
+}
+
 EditAdminBox::EditAdminBox(
 	QWidget*,
 	not_null<PeerData*> peer,
@@ -236,7 +427,11 @@ ChatAdminRightsInfo EditAdminBox::defaultRights() const {
 			| Flag::InviteByLinkOrAdd
 			| Flag::ManageTopics
 			| Flag::PinMessages
-			| Flag::ManageCall) }
+			| Flag::ManageCall
+			| Flag::ManageRanks
+			| (CanProcessJoinRequests(peer(), user())
+				? Flag::ProcessJoinRequests
+				: Flag())) }
 		: ChatAdminRightsInfo{ (Flag::ChangeInfo
 			| Flag::PostMessages
 			| Flag::EditMessages
@@ -245,7 +440,9 @@ ChatAdminRightsInfo EditAdminBox::defaultRights() const {
 			| Flag::EditStories
 			| Flag::DeleteStories
 			| Flag::InviteByLinkOrAdd
-			| Flag::ManageCall) };
+			| Flag::ManageCall
+			| Flag::ManageDirect
+			| Flag::BanUsers) };
 }
 
 void EditAdminBox::prepare() {
@@ -255,6 +452,11 @@ void EditAdminBox::prepare() {
 
 	EditParticipantBox::prepare();
 
+	setCoverMode(true);
+	addControl(
+		object_ptr<Cover>(this, user(), hasAdminRights()),
+		style::margins());
+
 	setTitle(_addingBot
 		? (_addingBot->existing
 			? tr::lng_rights_edit_admin()
@@ -280,7 +482,7 @@ void EditAdminBox::prepare() {
 					true)),
 			st::rightsToggleMargin + (st::rightsDividerMargin / 2));
 		_addAsAdmin->checkedChanges(
-		) | rpl::start_with_next([=](bool checked) {
+		) | rpl::on_next([=](bool checked) {
 			_adminControlsWrap->toggle(checked, anim::type::normal);
 			refreshButtons();
 		}, _addAsAdmin->lifetime());
@@ -299,11 +501,11 @@ void EditAdminBox::prepare() {
 			tr::lng_rights_about_by(
 				lt_user,
 				rpl::single(_by
-					? Ui::Text::Link(_by->name(), 1)
+					? tr::link(_by->name(), 1)
 					: TextWithEntities{ QString::fromUtf8("\U0001F47B") }),
 				lt_date,
 				rpl::single(TextWithEntities{ langDateTimeFull(parsed) }),
-				Ui::Text::WithEntities));
+				tr::marked));
 		if (_by) {
 			label->setLink(1, _by->createOpenLink());
 		}
@@ -315,6 +517,15 @@ void EditAdminBox::prepare() {
 
 	const auto chat = peer()->asChat();
 	const auto channel = peer()->asChannel();
+	const auto supportsProcessJoinRequests = canSave()
+		&& CanProcessJoinRequests(peer(), user());
+	const auto canProcessJoinRequests = supportsProcessJoinRequests
+		&& peer()->isMegagroup();
+	const auto guardBotRight = (canProcessJoinRequests
+		&& channel
+		&& (channel->guardBotId() == peerToUser(user()->id)))
+		? Flag::ProcessJoinRequests
+		: Flag();
 	const auto prepareRights = _addingBot
 		? ChatAdminRightsInfo(_oldRights.flags | _addingBot->existing)
 		: _oldRights.flags
@@ -327,9 +538,16 @@ void EditAdminBox::prepare() {
 		&& !_oldRights.flags
 		&& channel
 		&& !channel->amCreator();
+	const auto myEditableRights = channel
+		? (channel->adminRights()
+			| (canProcessJoinRequests
+				? Flag::ProcessJoinRequests
+				: Flag()))
+		: Flags();
 	const auto prepareFlags = disabledByDefaults
+		| guardBotRight
 		| (prepareRights.flags
-			& (filterByMyRights ? channel->adminRights() : ~Flag(0)));
+			& (filterByMyRights ? myEditableRights : ~Flag(0)));
 
 	const auto disabledMessages = [&] {
 		auto result = base::flat_map<Flags, QString>();
@@ -348,7 +566,7 @@ void EditAdminBox::prepare() {
 			} else if (const auto channel = peer()->asChannel()) {
 				if (!channel->amCreator()) {
 					result.emplace(
-						~channel->adminRights(),
+						~myEditableRights,
 						tr::lng_rights_permission_cant_edit(tr::now));
 				}
 			}
@@ -364,9 +582,10 @@ void EditAdminBox::prepare() {
 		.isGroup = isGroup,
 		.isForum = peer()->isForum(),
 		.anyoneCanAddMembers = anyoneCanAddMembers,
+		.canProcessJoinRequests = canProcessJoinRequests,
 	};
 	Ui::AddSubsectionTitle(inner, tr::lng_rights_edit_admin_header());
-	auto [checkboxes, getChecked, changes] = CreateEditAdminRights(
+	auto [checkboxes, getChecked, changes, highlightWidget] = CreateEditAdminRights(
 		inner,
 		prepareFlags,
 		disabledMessages,
@@ -395,29 +614,35 @@ void EditAdminBox::prepare() {
 		Ui::AddSkip(emptyAboutAddAdminsInner->entity());
 		if (hasRank) {
 			Ui::AddDivider(emptyAboutAddAdminsInner->entity());
-			Ui::AddSkip(emptyAboutAddAdminsInner->entity());
 		}
 		Ui::AddSkip(aboutAddAdminsInner->entity());
-		Ui::AddDividerText(
-			aboutAddAdminsInner->entity(),
-			rpl::duplicate(
-				selectedFlags
-			) | rpl::map(
-				(_1 & Flag::AddAdmins) != 0
-			) | rpl::distinct_until_changed(
-			) | rpl::map([=](bool canAddAdmins) -> rpl::producer<QString> {
-				const auto empty = (amCreator() && user()->isSelf());
-				aboutAddAdminsInner->toggle(!empty, anim::type::instant);
-				emptyAboutAddAdminsInner->toggle(empty, anim::type::instant);
-				if (empty) {
-					return rpl::single(QString());
-				} else if (!canSave()) {
-					return tr::lng_rights_about_admin_cant_edit();
-				} else if (canAddAdmins) {
-					return tr::lng_rights_about_add_admins_yes();
-				}
-				return tr::lng_rights_about_add_admins_no();
-			}) | rpl::flatten_latest());
+		if (canProcessJoinRequests) {
+			aboutAddAdminsInner->toggle(true, anim::type::instant);
+			Ui::AddDividerText(
+				aboutAddAdminsInner->entity(),
+				tr::lng_rights_about_process_join_requests());
+		} else {
+			Ui::AddDividerText(
+				aboutAddAdminsInner->entity(),
+				rpl::duplicate(
+					selectedFlags
+				) | rpl::map(
+					(_1 & Flag::AddAdmins) != 0
+				) | rpl::distinct_until_changed(
+				) | rpl::map([=](bool canAddAdmins) -> rpl::producer<QString> {
+					const auto empty = (amCreator() && user()->isSelf());
+					aboutAddAdminsInner->toggle(!empty, anim::type::instant);
+					emptyAboutAddAdminsInner->toggle(empty, anim::type::instant);
+					if (empty) {
+						return rpl::single(QString());
+					} else if (!canSave()) {
+						return tr::lng_rights_about_admin_cant_edit();
+					} else if (canAddAdmins) {
+						return tr::lng_rights_about_add_admins_yes();
+					}
+					return tr::lng_rights_about_add_admins_no();
+				}) | rpl::flatten_latest());
+		}
 	}
 
 	if (canTransferOwnership()) {
@@ -433,25 +658,87 @@ void EditAdminBox::prepare() {
 	}
 
 	if (canSave()) {
-		_rank = hasRank ? addRankInput(inner).get() : nullptr;
+		if (hasRank) {
+			const auto role = _oldRights.flags
+				? LookupBadgeRole(peer(), user())
+				: HistoryView::BadgeRole::Admin;
+			_tagControl = inner->add(
+				object_ptr<EditTagControl>(
+					inner,
+					&peer()->session(),
+					user(),
+					_oldRank,
+					role),
+				style::margins());
+		}
+		if (_tagControl) {
+			Ui::AddSkip(inner);
+			Ui::AddDividerText(
+				inner,
+				user()->isSelf()
+					? tr::lng_rights_tag_about_self()
+					: tr::lng_rights_tag_about(
+						lt_name,
+						rpl::single(user()->shortName())));
+		}
+		if (_oldRights.flags && !_addingBot) {
+			const auto isTargetCreator = (LookupBadgeRole(peer(), user())
+				== HistoryView::BadgeRole::Creator);
+			if (!isTargetCreator) {
+				if (!_tagControl) {
+					Ui::AddSkip(inner);
+					inner->add(
+						object_ptr<Ui::BoxContentDivider>(inner),
+						{ 0, st::infoProfileSkip, 0, st::infoProfileSkip });
+				}
+				Ui::AddSkip(inner);
+				const auto dismissButton = Settings::AddButtonWithIcon(
+					inner,
+					tr::lng_rights_dismiss_admin(),
+					st::settingsAttentionButton,
+					{ nullptr });
+				dismissButton->setClickedCallback([=] {
+					if (const auto callback = _saveCallback) {
+						const auto old = _oldRights;
+						const auto confirmed = [=](Fn<void()> close) {
+							callback(old, {}, {});
+							close();
+						};
+						uiShow()->showBox(
+							Ui::MakeConfirmBox({
+								.text = tr::lng_profile_sure_remove_admin(
+									tr::now,
+									lt_user,
+									user()->firstName),
+								.confirmed = confirmed,
+								.confirmText = tr::lng_box_remove(),
+							}));
+					}
+				});
+			}
+		}
 		_finishSave = [=, value = getChecked] {
 			const auto newFlags = (value() | ChatAdminRight::Other)
 				& ((!channel || channel->amCreator())
 					? ~Flags(0)
-					: channel->adminRights());
-			_saveCallback(
-				_oldRights,
-				ChatAdminRightsInfo(newFlags),
-				_rank ? _rank->getLastText().trimmed() : QString());
+					: myEditableRights);
+			confirmGuardBotSave(ChatAdminRightsInfo(newFlags), [=] {
+				_saveCallback(
+					_oldRights,
+					ChatAdminRightsInfo(newFlags),
+					_tagControl
+						? std::optional<QString>(_tagControl->currentRank())
+						: std::nullopt);
+			});
 		};
 		_save = [=] {
 			const auto show = uiShow();
 			if (!_saveCallback) {
 				return;
 			} else if (_addAsAdmin && !_addAsAdmin->checked()) {
-				const auto weak = Ui::MakeWeak(this);
+				const auto weak = base::make_weak(this);
 				AddBotToGroup(show, user(), peer(), _addingBot->token);
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					strong->closeBox();
 				}
 				return;
@@ -463,8 +750,8 @@ void EditAdminBox::prepare() {
 					phrase(
 						tr::now,
 						lt_group,
-						Ui::Text::Bold(peer()->name()),
-						Ui::Text::WithEntities),
+						tr::bold(peer()->name()),
+						tr::marked),
 					crl::guard(this, [=] { finishAddAdmin(); })
 				}));
 			} else {
@@ -477,9 +764,44 @@ void EditAdminBox::prepare() {
 }
 
 void EditAdminBox::finishAddAdmin() {
+	const auto confirmBox = _confirmBox;
+	_confirmBox = nullptr;
+	if (confirmBox) {
+		confirmBox->closeBox();
+	}
 	_finishSave();
-	if (_confirmBox) {
-		_confirmBox->closeBox();
+}
+
+void EditAdminBox::confirmGuardBotSave(
+		ChatAdminRightsInfo rights,
+		Fn<void()> done) {
+	using Flag = ChatAdminRight;
+
+	const auto channel = peer()->asChannel();
+	if (!channel
+		|| !(rights.flags & Flag::ProcessJoinRequests)
+		|| !CanProcessJoinRequests(peer(), user())) {
+		done();
+		return;
+	}
+
+	const auto confirmed = crl::guard(this, [=](Fn<void()> close) {
+		close();
+		done();
+	});
+	const auto current = channel->guardBot();
+	if (current && current != user().get()) {
+		_confirmBox = getDelegate()->show(GuardBotReplaceBox(
+			current,
+			user(),
+			confirmed));
+	} else if (!channel->requestToJoin()) {
+		_confirmBox = getDelegate()->show(GuardBotApproveBox(
+			channel->isMegagroup(),
+			user(),
+			confirmed));
+	} else {
+		done();
 	}
 }
 
@@ -497,56 +819,6 @@ void EditAdminBox::refreshButtons() {
 	}
 }
 
-not_null<Ui::InputField*> EditAdminBox::addRankInput(
-		not_null<Ui::VerticalLayout*> container) {
-	// Ui::AddDivider(container);
-
-	container->add(
-		object_ptr<Ui::FlatLabel>(
-			container,
-			tr::lng_rights_edit_admin_rank_name(),
-			st::rightsHeaderLabel),
-		st::rightsHeaderMargin);
-
-	const auto isOwner = [&] {
-		if (user()->isSelf() && amCreator()) {
-			return true;
-		} else if (const auto chat = peer()->asChat()) {
-			return chat->creator == peerToUser(user()->id);
-		} else if (const auto channel = peer()->asChannel()) {
-			return channel->mgInfo && channel->mgInfo->creator == user();
-		}
-		Unexpected("Peer type in EditAdminBox::addRankInput.");
-	}();
-	const auto result = container->add(
-		object_ptr<Ui::InputField>(
-			container,
-			st::customBadgeField,
-			(isOwner ? tr::lng_owner_badge : tr::lng_admin_badge)(),
-			TextUtilities::RemoveEmoji(_oldRank)),
-		st::rightsAboutMargin);
-	result->setMaxLength(kAdminRoleLimit);
-	result->setInstantReplaces(Ui::InstantReplaces::TextOnly());
-	result->changes(
-	) | rpl::start_with_next([=] {
-		const auto text = result->getLastText();
-		const auto removed = TextUtilities::RemoveEmoji(text);
-		if (removed != text) {
-			result->setText(removed);
-		}
-	}, result->lifetime());
-
-	Ui::AddSkip(container);
-	Ui::AddDividerText(
-		container,
-		tr::lng_rights_edit_admin_rank_about(
-			lt_title,
-			(isOwner ? tr::lng_owner_badge : tr::lng_admin_badge)()));
-	Ui::AddSkip(container);
-
-	return result;
-}
-
 bool EditAdminBox::canTransferOwnership() const {
 	if (user()->isInaccessible() || user()->isBot() || user()->isSelf()) {
 		return false;
@@ -585,155 +857,12 @@ not_null<Ui::SlideWrap<Ui::RpWidget>*> EditAdminBox::setupTransferButton(
 }
 
 void EditAdminBox::transferOwnership() {
-	if (_checkTransferRequestId) {
-		return;
-	}
-
-	const auto channel = peer()->isChannel()
-		? peer()->asChannel()->inputChannel
-		: MTP_inputChannelEmpty();
-	const auto api = &peer()->session().api();
-	api->cloudPassword().reload();
-	_checkTransferRequestId = api->request(MTPchannels_EditCreator(
-		channel,
-		MTP_inputUserEmpty(),
-		MTP_inputCheckPasswordEmpty()
-	)).fail([=](const MTP::Error &error) {
-		_checkTransferRequestId = 0;
-		if (!handleTransferPasswordError(error.type())) {
-			const auto callback = crl::guard(this, [=](Fn<void()> &&close) {
-				transferOwnershipChecked();
-				close();
-			});
-			getDelegate()->show(Ui::MakeConfirmBox({
-				.text = tr::lng_rights_transfer_about(
-					tr::now,
-					lt_group,
-					Ui::Text::Bold(peer()->name()),
-					lt_user,
-					Ui::Text::Bold(user()->shortName()),
-					Ui::Text::RichLangValue),
-				.confirmed = callback,
-				.confirmText = tr::lng_rights_transfer_sure(),
-			}));
-		}
-	}).send();
-}
-
-bool EditAdminBox::handleTransferPasswordError(const QString &error) {
-	const auto session = &user()->session();
-	auto about = tr::lng_rights_transfer_check_about(
-		tr::now,
-		lt_user,
-		Ui::Text::Bold(user()->shortName()),
-		Ui::Text::WithEntities);
-	if (auto box = PrePasswordErrorBox(error, session, std::move(about))) {
-		getDelegate()->show(std::move(box));
-		return true;
-	}
-	return false;
-}
-
-void EditAdminBox::transferOwnershipChecked() {
-	if (const auto chat = peer()->asChatNotMigrated()) {
-		peer()->session().api().migrateChat(chat, crl::guard(this, [=](
-				not_null<ChannelData*> channel) {
-			requestTransferPassword(channel);
-		}));
-	} else if (const auto channel = peer()->asChannelOrMigrated()) {
-		requestTransferPassword(channel);
-	} else {
-		Unexpected("Peer in SaveAdminCallback.");
-	}
-
-}
-
-void EditAdminBox::requestTransferPassword(not_null<ChannelData*> channel) {
-	peer()->session().api().cloudPassword().state(
-	) | rpl::take(
-		1
-	) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
-		auto fields = PasscodeBox::CloudFields::From(state);
-		fields.customTitle = tr::lng_rights_transfer_password_title();
-		fields.customDescription
-			= tr::lng_rights_transfer_password_description(tr::now);
-		fields.customSubmitButton = tr::lng_passcode_submit();
-		fields.customCheckCallback = crl::guard(this, [=](
-				const Core::CloudPasswordResult &result,
-				QPointer<PasscodeBox> box) {
-			sendTransferRequestFrom(box, channel, result);
-		});
-		getDelegate()->show(Box<PasscodeBox>(&channel->session(), fields));
-	}, lifetime());
-}
-
-void EditAdminBox::sendTransferRequestFrom(
-		QPointer<PasscodeBox> box,
-		not_null<ChannelData*> channel,
-		const Core::CloudPasswordResult &result) {
-	if (_transferRequestId) {
-		return;
-	}
-	const auto weak = Ui::MakeWeak(this);
-	const auto user = this->user();
-	const auto api = &channel->session().api();
-	_transferRequestId = api->request(MTPchannels_EditCreator(
-		channel->inputChannel,
-		user->inputUser,
-		result.result
-	)).done([=](const MTPUpdates &result) {
-		api->applyUpdates(result);
-		if (!box && !weak) {
-			return;
-		}
-		const auto show = box ? box->uiShow() : weak->uiShow();
-		show->showToast(
-			(channel->isBroadcast()
-				? tr::lng_rights_transfer_done_channel
-				: tr::lng_rights_transfer_done_group)(
-					tr::now,
-					lt_user,
-					user->shortName()));
-		show->hideLayer();
-	}).fail(crl::guard(this, [=](const MTP::Error &error) {
-		if (weak) {
-			_transferRequestId = 0;
-		}
-		if (box && box->handleCustomCheckError(error)) {
-			return;
-		}
-
-		const auto &type = error.type();
-		const auto problem = [&] {
-			if (type == u"CHANNELS_ADMIN_PUBLIC_TOO_MUCH"_q) {
-				return tr::lng_channels_too_much_public_other(tr::now);
-			} else if (type == u"CHANNELS_ADMIN_LOCATED_TOO_MUCH"_q) {
-				return tr::lng_channels_too_much_located_other(tr::now);
-			} else if (type == u"ADMINS_TOO_MUCH"_q) {
-				return (channel->isBroadcast()
-					? tr::lng_error_admin_limit_channel
-					: tr::lng_error_admin_limit)(tr::now);
-			} else if (type == u"CHANNEL_INVALID"_q) {
-				return (channel->isBroadcast()
-					? tr::lng_channel_not_accessible
-					: tr::lng_group_not_accessible)(tr::now);
-			}
-			return Lang::Hard::ServerError();
-		}();
-		const auto recoverable = [&] {
-			return (type == u"PASSWORD_MISSING"_q)
-				|| type.startsWith(u"PASSWORD_TOO_FRESH_"_q)
-				|| type.startsWith(u"SESSION_TOO_FRESH_"_q);
-		}();
-		const auto weak = Ui::MakeWeak(this);
-		getDelegate()->show(Ui::MakeInformBox(problem));
-		if (box) {
-			box->closeBox();
-		}
-		if (weak && !recoverable) {
-			closeBox();
-		}
-	})).handleFloodErrors().send();
+	_ownershipTransfer = std::make_unique<ChannelOwnershipTransfer>(
+		peer(),
+		user(),
+		uiShow(),
+		[](std::shared_ptr<Ui::Show> show) { show->hideLayer(); });
+	_ownershipTransfer->start();
 }
 
 EditRestrictedBox::EditRestrictedBox(
@@ -742,10 +871,12 @@ EditRestrictedBox::EditRestrictedBox(
 	not_null<UserData*> user,
 	bool hasAdminRights,
 	ChatRestrictionsInfo rights,
+	const QString &rank,
 	UserData *by,
 	TimeId since)
 : EditParticipantBox(nullptr, peer, user, hasAdminRights)
 , _oldRights(rights)
+, _oldRank(rank)
 , _by(by)
 , _since(since) {
 }
@@ -756,6 +887,11 @@ void EditRestrictedBox::prepare() {
 
 	EditParticipantBox::prepare();
 
+	setCoverMode(true);
+	addControl(
+		object_ptr<Cover>(this, user(), hasAdminRights()),
+		style::margins());
+
 	setTitle(tr::lng_rights_user_restrictions());
 
 	Ui::AddDivider(verticalLayout());
@@ -797,17 +933,40 @@ void EditRestrictedBox::prepare() {
 	Ui::AddSubsectionTitle(
 		verticalLayout(),
 		tr::lng_rights_user_restrictions_header());
-	auto [checkboxes, getRestrictions, changes] = CreateEditRestrictions(
+	auto [checkboxes, getRestrictions, changes, highlightWidget] = CreateEditRestrictions(
 		this,
 		prepareFlags,
 		disabledMessages,
-		{ .isForum = peer()->isForum() });
+		{ .isForum = peer()->isForum(), .isUserSpecific = true });
 	addControl(std::move(checkboxes), QMargins());
 
+	if (canSave() && peer()->canManageRanks()) {
+		Ui::AddSkip(verticalLayout());
+		Ui::AddDivider(verticalLayout());
+		_tagControl = addControl(
+			object_ptr<EditTagControl>(
+				this,
+				&peer()->session(),
+				user(),
+				_oldRank,
+				HistoryView::BadgeRole::User),
+			style::margins());
+		Ui::AddSkip(verticalLayout());
+		Ui::AddDividerText(
+			verticalLayout(),
+			user()->isSelf()
+				? tr::lng_rights_tag_about_self()
+				: tr::lng_rights_tag_about(
+					lt_name,
+					rpl::single(user()->shortName())));
+	}
+
 	_until = prepareRights.until;
-	addControl(
-		object_ptr<Ui::FixedHeightWidget>(this, st::defaultVerticalListSkip));
-	Ui::AddDivider(verticalLayout());
+	if (!_tagControl) {
+		addControl(
+			object_ptr<Ui::FixedHeightWidget>(this, st::defaultVerticalListSkip));
+		Ui::AddDivider(verticalLayout());
+	}
 	addControl(
 		object_ptr<Ui::FlatLabel>(
 			this,
@@ -835,24 +994,144 @@ void EditRestrictedBox::prepare() {
 				: tr::lng_rights_chat_restricted_by)(
 					lt_user,
 					rpl::single(_by
-						? Ui::Text::Link(_by->name(), 1)
+						? tr::link(_by->name(), 1)
 						: TextWithEntities{ QString::fromUtf8("\U0001F47B") }),
 					lt_date,
 					rpl::single(TextWithEntities{ langDateTimeFull(parsed) }),
-					Ui::Text::WithEntities));
+					tr::marked));
 		if (_by) {
 			label->setLink(1, _by->createOpenLink());
 		}
 	}
 
 	if (canSave()) {
+		Ui::AddSkip(verticalLayout());
+		Ui::AddDivider(verticalLayout());
+		Ui::AddSkip(verticalLayout());
+
+		const auto canAddAdmins = (chat && chat->canAddAdmins())
+			|| (channel && channel->canAddAdmins());
+		if (canAddAdmins) {
+			const auto promoteButton = Settings::AddButtonWithIcon(
+				verticalLayout(),
+				tr::lng_rights_promote_member(),
+				st::settingsButtonNoIcon,
+				{ nullptr });
+			promoteButton->setClickedCallback([=] {
+				const auto rank = _tagControl
+					? _tagControl->currentRank()
+					: _oldRank;
+				auto adminBox = Box<EditAdminBox>(
+					peer(),
+					user(),
+					ChatAdminRightsInfo(),
+					rank,
+					TimeId(0),
+					nullptr);
+				const auto adminBoxWeak = QPointer<Ui::BoxContent>(
+					adminBox.data());
+				const auto show = uiShow();
+				const auto restrictWeak = QPointer<EditRestrictedBox>(
+					this);
+				const auto closeBoth = [=] {
+					if (adminBoxWeak) {
+						adminBoxWeak->closeBox();
+					}
+					if (restrictWeak) {
+						restrictWeak->closeBox();
+					}
+				};
+				const auto savedUser = user();
+				const auto savedPeer = peer();
+				const auto done = [=](
+						ChatAdminRightsInfo newRights,
+						const std::optional<QString> &rank) {
+					closeBoth();
+					const auto effectiveRank = rank.value_or([&] {
+						const auto ch = savedPeer->asChannel();
+						if (!ch) {
+							return QString();
+						}
+						const auto info = ch->mgInfo.get();
+						if (!info) {
+							return QString();
+						}
+						const auto i = info->memberRanks.find(
+							peerToUser(savedUser->id));
+						return (i != end(info->memberRanks))
+							? i->second
+							: QString();
+					}());
+					savedUser->session().changes().chatAdminChanged(
+						savedPeer,
+						savedUser,
+						newRights.flags,
+						effectiveRank);
+				};
+				const auto fail = closeBoth;
+				adminBox->setSaveCallback(
+					SaveAdminCallback(
+						show,
+						peer(),
+						user(),
+						done,
+						fail));
+				show->showBox(std::move(adminBox));
+			});
+		}
+
+		const auto removeButton = Settings::AddButtonWithIcon(
+			verticalLayout(),
+			tr::lng_rights_remove_member(),
+			st::settingsAttentionButton,
+			{ nullptr });
+		removeButton->setClickedCallback([=] {
+			if (const auto callback = _saveCallback) {
+				const auto old = _oldRights;
+				const auto confirmed = [=](Fn<void()> close) {
+					callback(
+						old,
+						ChannelData::KickedRestrictedRights(user()));
+					close();
+				};
+				uiShow()->show(
+					Ui::MakeConfirmBox({
+						.text = tr::lng_profile_sure_kick(
+							tr::now,
+							lt_user,
+							user()->firstName),
+						.confirmed = confirmed,
+						.confirmText = tr::lng_box_remove(),
+					}));
+			}
+		});
+
 		const auto save = [=, value = getRestrictions] {
 			if (!_saveCallback) {
 				return;
 			}
+			const auto show = uiShow();
+			const auto rankPeer = peer();
+			const auto rankUser = user();
+			const auto rank = _tagControl
+				? _tagControl->currentRank()
+				: _oldRank;
+			const auto saveRank = (rank != _oldRank);
+
+			// May destroy the box.
 			_saveCallback(
 				_oldRights,
 				ChatRestrictionsInfo{ value(), getRealUntilValue() });
+
+			if (saveRank) {
+				SaveMemberRank(
+					show,
+					rankPeer,
+					rankUser,
+					rank,
+					nullptr,
+					nullptr);
+			}
 		};
 		addButton(tr::lng_settings_save(), save);
 		addButton(tr::lng_cancel(), [=] { closeBox(); });
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.h b/Telegram/SourceFiles/boxes/peers/edit_participant_box.h
index 1e5c9fd8ae5d43..d9931cf02bb313 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.h
@@ -22,11 +22,8 @@ template <typename Widget>
 class SlideWrap;
 } // namespace Ui
 
-namespace Core {
-struct CloudPasswordResult;
-} // namespace Core
-
-class PasscodeBox;
+class ChannelOwnershipTransfer;
+class EditTagControl;
 
 class EditParticipantBox : public Ui::BoxContent {
 public:
@@ -52,6 +49,8 @@ class EditParticipantBox : public Ui::BoxContent {
 	template <typename Widget>
 	Widget *addControl(object_ptr<Widget> widget, QMargins margin = {});
 
+	void setCoverMode(bool enabled);
+
 	bool hasAdminRights() const {
 		return _hasAdminRights;
 	}
@@ -87,7 +86,7 @@ class EditAdminBox : public EditParticipantBox {
 			Fn<void(
 				ChatAdminRightsInfo,
 				ChatAdminRightsInfo,
-				const QString &rank)> callback) {
+				const std::optional<QString> &rank)> callback) {
 		_saveCallback = std::move(callback);
 	}
 
@@ -97,22 +96,14 @@ class EditAdminBox : public EditParticipantBox {
 private:
 	[[nodiscard]] ChatAdminRightsInfo defaultRights() const;
 
-	not_null<Ui::InputField*> addRankInput(
-		not_null<Ui::VerticalLayout*> container);
 	void transferOwnership();
-	void transferOwnershipChecked();
-	bool handleTransferPasswordError(const QString &error);
-	void requestTransferPassword(not_null<ChannelData*> channel);
-	void sendTransferRequestFrom(
-		QPointer<PasscodeBox> box,
-		not_null<ChannelData*> channel,
-		const Core::CloudPasswordResult &result);
-	bool canSave() const {
+	[[nodiscard]] bool canSave() const {
 		return _saveCallback != nullptr;
 	}
 	void finishAddAdmin();
+	void confirmGuardBotSave(ChatAdminRightsInfo rights, Fn<void()> done);
 	void refreshButtons();
-	bool canTransferOwnership() const;
+	[[nodiscard]] bool canTransferOwnership() const;
 	not_null<Ui::SlideWrap<Ui::RpWidget>*> setupTransferButton(
 		not_null<Ui::VerticalLayout*> container,
 		bool isGroup);
@@ -122,20 +113,21 @@ class EditAdminBox : public EditParticipantBox {
 	Fn<void(
 		ChatAdminRightsInfo,
 		ChatAdminRightsInfo,
-		const QString &rank)> _saveCallback;
+		const std::optional<QString> &rank)> _saveCallback;
 
-	QPointer<Ui::BoxContent> _confirmBox;
+	base::weak_qptr<Ui::BoxContent> _confirmBox;
 	Ui::Checkbox *_addAsAdmin = nullptr;
 	Ui::SlideWrap<Ui::VerticalLayout> *_adminControlsWrap = nullptr;
-	Ui::InputField *_rank = nullptr;
-	mtpRequestId _checkTransferRequestId = 0;
-	mtpRequestId _transferRequestId = 0;
+	EditTagControl *_tagControl = nullptr;
+
 	Fn<void()> _save, _finishSave;
 
 	TimeId _promotedSince = 0;
 	UserData *_by = nullptr;
 	std::optional<EditAdminBotFields> _addingBot;
 
+	std::unique_ptr<ChannelOwnershipTransfer> _ownershipTransfer;
+
 };
 
 // Restricted box works with flags in the opposite way.
@@ -149,6 +141,7 @@ class EditRestrictedBox : public EditParticipantBox {
 		not_null<UserData*> user,
 		bool hasAdminRights,
 		ChatRestrictionsInfo rights,
+		const QString &rank,
 		UserData *by,
 		TimeId since);
 
@@ -174,6 +167,8 @@ class EditRestrictedBox : public EditParticipantBox {
 	TimeId getRealUntilValue() const;
 
 	const ChatRestrictionsInfo _oldRights;
+	const QString _oldRank;
+	EditTagControl *_tagControl = nullptr;
 	UserData *_by = nullptr;
 	TimeId _since = 0;
 	TimeId _until = 0;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index 345d9880ef1f09..6fb7678aaeac38 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "api/api_chat_participants.h"
 #include "boxes/peers/edit_participant_box.h"
+#include "boxes/peers/edit_tag_control.h"
 #include "boxes/peers/add_participants_box.h"
 #include "boxes/peers/prepare_short_info_box.h" // PrepareShortInfoBox
 #include "boxes/peers/edit_members_visible.h"
@@ -29,11 +30,20 @@ For license and copyright information please follow this link:
 #include "data/data_user.h"
 #include "data/data_changes.h"
 #include "base/unixtime.h"
+#include "ui/chat/chat_style.h"
 #include "ui/effects/outline_segments.h"
+#include "ui/layers/generic_box.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/menu/menu_multiline_action.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/text/text_utilities.h"
 #include "info/profile/info_profile_values.h"
 #include "window/window_session_controller.h"
 #include "history/history.h"
+#include "history/view/history_view_message.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat.h"
 #include "styles/style_menu_icons.h"
 
 namespace {
@@ -47,15 +57,18 @@ constexpr auto kParticipantsPerPage = 200;
 constexpr auto kSortByOnlineDelay = crl::time(1000);
 
 void RemoveAdmin(
+		std::shared_ptr<Ui::Show> show,
 		not_null<ChannelData*> channel,
 		not_null<UserData*> user,
 		ChatAdminRightsInfo oldRights,
 		Fn<void()> onDone,
 		Fn<void()> onFail) {
 	const auto newRights = MTP_chatAdminRights(MTP_flags(0));
+	using Flag = MTPchannels_editAdmin::Flag;
 	channel->session().api().request(MTPchannels_EditAdmin(
-		channel->inputChannel,
-		user->inputUser,
+		MTP_flags(Flag::f_rank),
+		channel->inputChannel(),
+		user->inputUser(),
 		newRights,
 		MTP_string(QString())
 	)).done([=](const MTPUpdates &result) {
@@ -64,7 +77,10 @@ void RemoveAdmin(
 		if (onDone) {
 			onDone();
 		}
-	}).fail([=] {
+	}).fail([=](const MTP::Error &error) {
+		if (show) {
+			show->showToast(error.type());
+		}
 		if (onFail) {
 			onFail();
 		}
@@ -78,8 +94,8 @@ void AddChatParticipant(
 		Fn<void()> onDone,
 		Fn<void()> onFail) {
 	chat->session().api().request(MTPmessages_AddChatUser(
-		chat->inputChat,
-		user->inputUser,
+		chat->inputChat(),
+		user->inputUser(),
 		MTP_int(kForwardMessagesOnAdd)
 	)).done([=](const MTPmessages_InvitedUsers &result) {
 		const auto &data = result.data();
@@ -108,8 +124,8 @@ void SaveChatAdmin(
 		Fn<void()> onFail,
 		bool retryOnNotParticipant = true) {
 	chat->session().api().request(MTPmessages_EditChatAdmin(
-		chat->inputChat,
-		user->inputUser,
+		chat->inputChat(),
+		user->inputUser(),
 		MTP_bool(isAdmin)
 	)).done([=] {
 		chat->applyEditAdmin(user, isAdmin);
@@ -131,8 +147,13 @@ void SaveChatAdmin(
 					onFail,
 					false);
 			}, onFail);
-		} else if (onFail) {
-			onFail();
+		} else {
+			if (show) {
+				show->showToast(error.type());
+			}
+			if (onFail) {
+				onFail();
+			}
 		}
 	}).send();
 }
@@ -143,18 +164,31 @@ void SaveChannelAdmin(
 		not_null<UserData*> user,
 		ChatAdminRightsInfo oldRights,
 		ChatAdminRightsInfo newRights,
-		const QString &rank,
+		const std::optional<QString> &rank,
 		Fn<void()> onDone,
 		Fn<void()> onFail) {
+	using Flag = MTPchannels_editAdmin::Flag;
+	const auto flags = Flag(0)
+		| (rank.has_value() ? Flag::f_rank : Flag(0));
 	channel->session().api().request(MTPchannels_EditAdmin(
-		channel->inputChannel,
-		user->inputUser,
-		MTP_chatAdminRights(MTP_flags(
-			MTPDchatAdminRights::Flags::from_raw(uint32(newRights.flags)))),
-		MTP_string(rank)
+		MTP_flags(flags),
+		channel->inputChannel(),
+		user->inputUser(),
+		AdminRightsToMTP(newRights),
+		rank ? MTP_string(*rank) : MTPstring()
 	)).done([=](const MTPUpdates &result) {
 		channel->session().api().applyUpdates(result);
-		channel->applyEditAdmin(user, oldRights, newRights, rank);
+		const auto effectiveRank = rank.value_or([&] {
+			if (const auto info = channel->mgInfo.get()) {
+				const auto i = info->memberRanks.find(
+					peerToUser(user->id));
+				if (i != end(info->memberRanks)) {
+					return i->second;
+				}
+			}
+			return QString();
+		}());
+		channel->applyEditAdmin(user, oldRights, newRights, effectiveRank);
 		if (onDone) {
 			onDone();
 		}
@@ -166,21 +200,94 @@ void SaveChannelAdmin(
 	}).send();
 }
 
+[[nodiscard]] ChatAdminRightsInfo StripLocalAdminRights(
+		ChatAdminRightsInfo rights) {
+	rights.flags &= ~ChatAdminRight::ProcessJoinRequests;
+	return rights;
+}
+
+void SaveGuardBot(
+		std::shared_ptr<Ui::Show> show,
+		not_null<ChannelData*> channel,
+		not_null<UserData*> user,
+		bool processJoinRequests,
+		Fn<void()> onDone,
+		Fn<void()> onFail) {
+	const auto info = user->botInfo.get();
+	const auto userId = peerToUser(user->id);
+	const auto guardBotId = channel->guardBotId();
+	if (!info || !info->supportsGuard) {
+		if (onDone) {
+			onDone();
+		}
+		return;
+	} else if (processJoinRequests
+		&& channel->requestToJoin()
+		&& guardBotId == userId) {
+		if (onDone) {
+			onDone();
+		}
+		return;
+	} else if (!processJoinRequests && guardBotId != userId) {
+		if (onDone) {
+			onDone();
+		}
+		return;
+	}
+
+	using Flag = MTPchannels_ToggleJoinRequest::Flag;
+	const auto keepRequests = processJoinRequests || channel->requestToJoin();
+	channel->session().api().request(MTPchannels_ToggleJoinRequest(
+		MTP_flags(Flag::f_guard_bot),
+		channel->inputChannel(),
+		MTP_bool(keepRequests),
+		processJoinRequests ? user->inputUser() : MTP_inputUserEmpty()
+	)).done([=](const MTPUpdates &result) {
+		channel->session().api().applyUpdates(result);
+		if (processJoinRequests) {
+			channel->addFlags(ChannelDataFlag::RequestToJoin);
+			channel->setGuardBotId(userId);
+		} else {
+			if (!keepRequests) {
+				channel->removeFlags(ChannelDataFlag::RequestToJoin);
+			}
+			channel->setGuardBotId(UserId());
+		}
+		channel->session().changes().peerUpdated(
+			channel,
+			Data::PeerUpdate::Flag::FullInfo);
+		if (onDone) {
+			onDone();
+		}
+	}).fail([=](const MTP::Error &error) {
+		if (show) {
+			show->showToast(error.type());
+		}
+		if (onFail) {
+			onFail();
+		}
+	}).send();
+}
+
 void SaveChatParticipantKick(
+		std::shared_ptr<Ui::Show> show,
 		not_null<ChatData*> chat,
 		not_null<UserData*> user,
 		Fn<void()> onDone,
 		Fn<void()> onFail) {
 	chat->session().api().request(MTPmessages_DeleteChatUser(
 		MTP_flags(0),
-		chat->inputChat,
-		user->inputUser
+		chat->inputChat(),
+		user->inputUser()
 	)).done([=](const MTPUpdates &result) {
 		chat->session().api().applyUpdates(result);
 		if (onDone) {
 			onDone();
 		}
-	}).fail([=] {
+	}).fail([=](const MTP::Error &error) {
+		if (show) {
+			show->showToast(error.type());
+		}
 		if (onFail) {
 			onFail();
 		}
@@ -189,41 +296,116 @@ void SaveChatParticipantKick(
 
 } // namespace
 
+void SaveMemberRank(
+		std::shared_ptr<Ui::Show> show,
+		not_null<PeerData*> peer,
+		not_null<UserData*> user,
+		const QString &rank,
+		Fn<void()> onDone,
+		Fn<void()> onFail) {
+	peer->session().api().request(MTPmessages_EditChatParticipantRank(
+		peer->input(),
+		user->input(),
+		MTP_string(rank)
+	)).done([=](const MTPUpdates &result) {
+		peer->session().api().applyUpdates(result);
+		if (const auto channel = peer->asChannel()) {
+			channel->applyEditMemberRank(user, rank);
+		} else if (const auto chat = peer->asChat()) {
+			const auto userId = peerToUser(user->id);
+			if (rank.isEmpty()) {
+				chat->memberRanks.remove(userId);
+			} else {
+				chat->memberRanks[userId] = rank;
+			}
+			if (userId != chat->session().userId()) {
+				if (const auto history = chat->owner().historyLoaded(chat)) {
+					auto changes = base::flat_set<UserId>();
+					changes.emplace(userId);
+					history->applyGroupAdminChanges(changes);
+				}
+			}
+			chat->session().changes().peerUpdated(
+				chat,
+				Data::PeerUpdate::Flag::Members);
+		}
+		peer->session().changes().chatMemberRankChanged(
+			peer,
+			user,
+			rank);
+		if (onDone) {
+			onDone();
+		}
+	}).fail([=](const MTP::Error &error) {
+		if (show) {
+			show->showToast(error.type());
+		}
+		if (onFail) {
+			onFail();
+		}
+	}).send();
+}
+
 Fn<void(
 	ChatAdminRightsInfo oldRights,
 	ChatAdminRightsInfo newRights,
-	const QString &rank)> SaveAdminCallback(
+	const std::optional<QString> &rank)> SaveAdminCallback(
 		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
 		not_null<UserData*> user,
 		Fn<void(
 			ChatAdminRightsInfo newRights,
-			const QString &rank)> onDone,
+			const std::optional<QString> &rank)> onDone,
 		Fn<void()> onFail) {
 	return [=](
 			ChatAdminRightsInfo oldRights,
 			ChatAdminRightsInfo newRights,
-			const QString &rank) {
-		const auto done = [=] { if (onDone) onDone(newRights, rank); };
+			const std::optional<QString> &rank) {
+		const auto processJoinRequests = ((newRights.flags
+			& ChatAdminRight::ProcessJoinRequests) != 0);
+		const auto manageGuardBot = peer->isMegagroup()
+			|| processJoinRequests;
+		const auto strippedOldRights = StripLocalAdminRights(oldRights);
+		const auto strippedNewRights = StripLocalAdminRights(newRights);
+		const auto done = [=] {
+			if (onDone) {
+				onDone(strippedNewRights, rank);
+			}
+		};
 		const auto saveForChannel = [=](not_null<ChannelData*> channel) {
 			SaveChannelAdmin(
 				show,
 				channel,
 				user,
-				oldRights,
-				newRights,
+				strippedOldRights,
+				strippedNewRights,
 				rank,
-				done,
+				[=] {
+					if (manageGuardBot) {
+						SaveGuardBot(
+							show,
+							channel,
+							user,
+							processJoinRequests,
+							done,
+							onFail);
+					} else {
+						done();
+					}
+				},
 				onFail);
 		};
 		if (const auto chat = peer->asChatNotMigrated()) {
 			const auto saveChatAdmin = [&](bool isAdmin) {
 				SaveChatAdmin(show, chat, user, isAdmin, done, onFail);
+				if (rank) {
+					SaveMemberRank(show, chat, user, *rank, [] {}, [] {});
+				}
 			};
-			if (newRights.flags == chat->defaultAdminRights(user).flags
-				&& rank.isEmpty()) {
+			if (strippedNewRights.flags
+				== chat->defaultAdminRights(user).flags) {
 				saveChatAdmin(true);
-			} else if (!newRights.flags) {
+			} else if (!strippedNewRights.flags) {
 				saveChatAdmin(false);
 			} else {
 				peer->session().api().migrateChat(chat, saveForChannel);
@@ -239,6 +421,7 @@ Fn<void(
 Fn<void(
 	ChatRestrictionsInfo oldRights,
 	ChatRestrictionsInfo newRights)> SaveRestrictedCallback(
+		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
 		not_null<PeerData*> participant,
 		Fn<void(ChatRestrictionsInfo newRights)> onDone,
@@ -254,12 +437,20 @@ Fn<void(
 				oldRights,
 				newRights,
 				done,
-				onFail);
+				[=](const QString &errorType) {
+					if (show) {
+						show->showToast(errorType);
+					}
+					if (onFail) {
+						onFail();
+					}
+				});
 		};
 		if (const auto chat = peer->asChatNotMigrated()) {
 			if (participant->isUser()
 				&& (newRights.flags & ChatRestriction::ViewMessages)) {
 				SaveChatParticipantKick(
+					show,
 					chat,
 					participant->asUser(),
 					done,
@@ -294,7 +485,7 @@ void SubscribeToMigration(
 				return (channel != nullptr);
 			}) | rpl::take(
 				1
-			) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
+			) | rpl::on_next([=](not_null<ChannelData*> channel) {
 				const auto onstack = base::duplicate(migrate);
 				onstack(channel);
 			}, lifetime);
@@ -381,10 +572,10 @@ auto ParticipantsAdditionalData::adminRights(
 		: std::nullopt;
 }
 
-QString ParticipantsAdditionalData::adminRank(
+QString ParticipantsAdditionalData::memberRank(
 		not_null<UserData*> user) const {
-	const auto i = _adminRanks.find(user);
-	return (i != end(_adminRanks)) ? i->second : QString();
+	const auto i = _memberRanks.find(user);
+	return (i != end(_memberRanks)) ? i->second : QString();
 }
 
 TimeId ParticipantsAdditionalData::adminPromotedSince(
@@ -501,6 +692,9 @@ void ParticipantsAdditionalData::fillFromChat(not_null<ChatData*> chat) {
 	}
 	_members = chat->participants;
 	_admins = chat->admins;
+	for (const auto &[uid, rank] : chat->memberRanks) {
+		_memberRanks[chat->owner().user(uid)] = rank;
+	}
 }
 
 void ParticipantsAdditionalData::fillFromChannel(
@@ -511,11 +705,10 @@ void ParticipantsAdditionalData::fillFromChannel(
 	}
 	if (information->creator) {
 		_creator = information->creator;
-		_adminRanks[information->creator] = information->creatorRank;
 	}
-	for (const auto user : information->lastParticipants) {
+	for (const auto &user : information->lastParticipants) {
 		const auto admin = information->lastAdmins.find(user);
-		const auto rank = information->admins.find(peerToUser(user->id));
+		const auto rank = information->memberRanks.find(peerToUser(user->id));
 		const auto restricted = information->lastRestricted.find(user);
 		if (admin != information->lastAdmins.cend()) {
 			_restrictedRights.erase(user);
@@ -527,9 +720,9 @@ void ParticipantsAdditionalData::fillFromChannel(
 				_adminCanEdit.erase(user);
 			}
 			_adminRights.emplace(user, admin->second.rights);
-			if (rank != end(information->admins)
+			if (rank != end(information->memberRanks)
 				&& !rank->second.isEmpty()) {
-				_adminRanks[user] = rank->second;
+				_memberRanks[user] = rank->second;
 			}
 		} else if (restricted != information->lastRestricted.cend()) {
 			_adminRights.erase(user);
@@ -606,6 +799,16 @@ void ParticipantsAdditionalData::applyBannedLocally(
 	}
 }
 
+void ParticipantsAdditionalData::applyMemberRankLocally(
+		not_null<UserData*> user,
+		const QString &rank) {
+	if (rank.isEmpty()) {
+		_memberRanks.remove(user);
+	} else {
+		_memberRanks[user] = rank;
+	}
+}
+
 PeerData *ParticipantsAdditionalData::applyParticipant(
 		const Api::ChatParticipant &data) {
 	return applyParticipant(data, _role);
@@ -622,43 +825,53 @@ PeerData *ParticipantsAdditionalData::applyParticipant(
 		return nullptr;
 	};
 
-	switch (data.type()) {
-	case Api::ChatParticipant::Type::Creator: {
-		if (overrideRole != Role::Profile
-			&& overrideRole != Role::Members
-			&& overrideRole != Role::Admins) {
-			return logBad();
+	const auto result = [&]() -> PeerData* {
+		switch (data.type()) {
+		case Api::ChatParticipant::Type::Creator: {
+			if (overrideRole != Role::Profile
+				&& overrideRole != Role::Members
+				&& overrideRole != Role::Admins) {
+				return logBad();
+			}
+			return applyCreator(data);
 		}
-		return applyCreator(data);
-	}
-	case Api::ChatParticipant::Type::Admin: {
-		if (overrideRole != Role::Profile
-			&& overrideRole != Role::Members
-			&& overrideRole != Role::Admins) {
-			return logBad();
+		case Api::ChatParticipant::Type::Admin: {
+			if (overrideRole != Role::Profile
+				&& overrideRole != Role::Members
+				&& overrideRole != Role::Admins) {
+				return logBad();
+			}
+			return applyAdmin(data);
 		}
-		return applyAdmin(data);
-	}
-	case Api::ChatParticipant::Type::Member: {
-		if (overrideRole != Role::Profile
-			&& overrideRole != Role::Members) {
+		case Api::ChatParticipant::Type::Member: {
+			if (overrideRole != Role::Profile
+				&& overrideRole != Role::Members) {
+				return logBad();
+			}
+			return applyRegular(data.userId());
+		}
+		case Api::ChatParticipant::Type::Restricted:
+		case Api::ChatParticipant::Type::Banned:
+			if (overrideRole != Role::Profile
+				&& overrideRole != Role::Members
+				&& overrideRole != Role::Restricted
+				&& overrideRole != Role::Kicked) {
+				return logBad();
+			}
+			return applyBanned(data);
+		case Api::ChatParticipant::Type::Left:
 			return logBad();
+		};
+		Unexpected("Api::ChatParticipant::type in applyParticipant.");
+	}();
+	if (const auto user = result ? result->asUser() : nullptr) {
+		if (!data.rank().isEmpty()) {
+			_memberRanks[user] = data.rank();
+		} else {
+			_memberRanks.remove(user);
 		}
-		return applyRegular(data.userId());
 	}
-	case Api::ChatParticipant::Type::Restricted:
-	case Api::ChatParticipant::Type::Banned:
-		if (overrideRole != Role::Profile
-			&& overrideRole != Role::Members
-			&& overrideRole != Role::Restricted
-			&& overrideRole != Role::Kicked) {
-			return logBad();
-		}
-		return applyBanned(data);
-	case Api::ChatParticipant::Type::Left:
-		return logBad();
-	};
-	Unexpected("Api::ChatParticipant::type in applyParticipant.");
+	return result;
 }
 
 UserData *ParticipantsAdditionalData::applyCreator(
@@ -671,11 +884,6 @@ UserData *ParticipantsAdditionalData::applyCreator(
 		} else {
 			_adminCanEdit.erase(user);
 		}
-		if (!data.rank().isEmpty()) {
-			_adminRanks[user] = data.rank();
-		} else {
-			_adminRanks.remove(user);
-		}
 		return user;
 	}
 	return nullptr;
@@ -686,7 +894,7 @@ UserData *ParticipantsAdditionalData::applyAdmin(
 	const auto user = _peer->owner().userLoaded(data.userId());
 	if (!user) {
 		return nullptr;
-	} else if (const auto chat = _peer->asChat()) {
+	} else if (_peer->isChat()) {
 		// This can come from saveAdmin callback.
 		_admins.emplace(user);
 		return user;
@@ -702,11 +910,6 @@ UserData *ParticipantsAdditionalData::applyAdmin(
 	} else {
 		_adminCanEdit.erase(user);
 	}
-	if (!data.rank().isEmpty()) {
-		_adminRanks[user] = data.rank();
-	} else {
-		_adminRanks.remove(user);
-	}
 	if (data.promotedSince()) {
 		_adminPromotedSince[user] = data.promotedSince();
 	} else {
@@ -730,7 +933,7 @@ UserData *ParticipantsAdditionalData::applyRegular(UserId userId) {
 	const auto user = _peer->owner().userLoaded(userId);
 	if (!user) {
 		return nullptr;
-	} else if (const auto chat = _peer->asChat()) {
+	} else if (_peer->isChat()) {
 		// This can come from saveAdmin or saveRestricted callback.
 		_admins.erase(user);
 		return user;
@@ -806,7 +1009,7 @@ ParticipantsOnlineSorter::ParticipantsOnlineSorter(
 , _sortByOnlineTimer([=] { sort(); }) {
 	peer->session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::OnlineStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto peerId = update.peer->id;
 		if (const auto row = _delegate->peerListFindRow(peerId.value)) {
 			row->refreshStatus();
@@ -872,12 +1075,16 @@ ParticipantsBoxController::ParticipantsBoxController(
 : ParticipantsBoxController(CreateTag(), navigation, peer, role) {
 }
 
+ParticipantsBoxController::~ParticipantsBoxController() = default;
+
 ParticipantsBoxController::ParticipantsBoxController(
 	CreateTag,
 	Window::SessionNavigation *navigation,
 	not_null<PeerData*> peer,
 	Role role)
 : PeerListController(CreateSearchController(peer, role, &_additional))
+, _chatStyle(
+	std::make_unique<Ui::ChatStyle>(peer->session().colorIndicesValue()))
 , _navigation(navigation)
 , _peer(peer)
 , _api(&_peer->session().mtp())
@@ -904,13 +1111,13 @@ void ParticipantsBoxController::setupListChangeViewers() {
 
 	channel->owner().megagroupParticipantAdded(
 		channel
-	) | rpl::start_with_next([=](not_null<UserData*> user) {
+	) | rpl::on_next([=](not_null<UserData*> user) {
 		if (delegate()->peerListFullRowsCount() > 0) {
 			if (delegate()->peerListRowAt(0)->peer() == user) {
 				return;
 			}
 		}
-		if (const auto row = delegate()->peerListFindRow(user->id.value)) {
+		if (delegate()->peerListFindRow(user->id.value)) {
 			delegate()->peerListPartitionRows([&](const PeerListRow &row) {
 				return (row.peer() == user);
 			});
@@ -929,7 +1136,7 @@ void ParticipantsBoxController::setupListChangeViewers() {
 
 	channel->owner().megagroupParticipantRemoved(
 		channel
-	) | rpl::start_with_next([=](not_null<UserData*> user) {
+	) | rpl::on_next([=](not_null<UserData*> user) {
 		if (const auto row = delegate()->peerListFindRow(user->id.value)) {
 			delegate()->peerListRemoveRow(row);
 		}
@@ -1027,7 +1234,7 @@ void ParticipantsBoxController::addNewItem() {
 	const auto adminDone = crl::guard(this, [=](
 			not_null<UserData*> user,
 			ChatAdminRightsInfo rights,
-			const QString &rank) {
+			const std::optional<QString> &rank) {
 		editAdminDone(user, rights, rank);
 	});
 	const auto restrictedDone = crl::guard(this, [=](
@@ -1088,18 +1295,20 @@ void ParticipantsBoxController::peerListSearchAddRow(
 
 std::unique_ptr<PeerListRow> ParticipantsBoxController::createSearchRow(
 		not_null<PeerData*> peer) {
-	if (const auto user = peer->asUser()) {
-		return createRow(user);
+	if (_role == Role::Profile
+		|| _role == Role::Members
+		|| _role == Role::Admins) {
+		if (const auto user = peer->asUser()) {
+			return createRow(user);
+		}
+		return nullptr;
 	}
-	return nullptr;
+	return createRow(peer);
 }
 
 std::unique_ptr<PeerListRow> ParticipantsBoxController::createRestoredRow(
 		not_null<PeerData*> peer) {
-	if (const auto user = peer->asUser()) {
-		return createRow(user);
-	}
-	return nullptr;
+	return createSearchRow(peer);
 }
 
 auto ParticipantsBoxController::saveState() const
@@ -1121,13 +1330,13 @@ auto ParticipantsBoxController::saveState() const
 		chat->session().changes().peerUpdates(
 			chat,
 			Data::PeerUpdate::Flag::Members
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			weak->controllerState = nullptr;
 		}, my->lifetime);
 	} else if (const auto channel = _peer->asMegagroup()) {
 		channel->owner().megagroupParticipantAdded(
 			channel
-		) | rpl::start_with_next([=](not_null<UserData*> user) {
+		) | rpl::on_next([=](not_null<UserData*> user) {
 			if (!weak->list.empty()) {
 				if (weak->list[0] == user) {
 					return;
@@ -1144,7 +1353,7 @@ auto ParticipantsBoxController::saveState() const
 
 		channel->owner().megagroupParticipantRemoved(
 			channel
-		) | rpl::start_with_next([=](not_null<UserData*> user) {
+		) | rpl::on_next([=](not_null<UserData*> user) {
 			weak->list.erase(std::remove(
 				weak->list.begin(),
 				weak->list.end(),
@@ -1251,7 +1460,7 @@ void ParticipantsBoxController::prepare() {
 		auto visible = _peer->isMegagroup()
 			? Info::Profile::CanViewParticipantsValue(_peer->asMegagroup())
 			: rpl::single(true);
-		std::move(visible) | rpl::start_with_next([=](bool visible) {
+		std::move(visible) | rpl::on_next([=](bool visible) {
 			if (!visible) {
 				_onlineCountValue = 0;
 				_onlineSorter = nullptr;
@@ -1267,6 +1476,47 @@ void ParticipantsBoxController::prepare() {
 	} else {
 		rebuild();
 	}
+
+	_peer->session().changes().chatAdminChanges(
+	) | rpl::on_next([=](const Data::ChatAdminChange &update) {
+		if (update.peer != _peer) {
+			return;
+		}
+		const auto user = update.user;
+		const auto rights = ChatAdminRightsInfo(update.rights);
+		const auto rank = update.rank;
+		_additional.applyAdminLocally(user, rights, rank);
+		if (!_additional.isCreator(user) || !user->isSelf()) {
+			if (!rights.flags) {
+				if (_role == Role::Admins) {
+					removeRow(user);
+				}
+			} else {
+				if (_role == Role::Admins) {
+					prependRow(user);
+				} else if (_role == Role::Kicked
+					|| _role == Role::Restricted) {
+					removeRow(user);
+				}
+			}
+		}
+		recomputeTypeFor(user);
+		refreshRows();
+	}, lifetime());
+
+	_peer->session().changes().chatMemberRankChanges(
+	) | rpl::on_next([=](const Data::ChatMemberRankChange &update) {
+		if (update.peer != _peer) {
+			return;
+		}
+		_additional.applyMemberRankLocally(update.user, update.rank);
+		recomputeTypeFor(update.user);
+		refreshRows();
+	}, lifetime());
+
+	style::PaletteChanged() | rpl::on_next([=] {
+		_pillCircleCache.clear();
+	}, lifetime());
 }
 
 void ParticipantsBoxController::unload() {
@@ -1291,9 +1541,9 @@ void ParticipantsBoxController::rebuild() {
 	refreshRows();
 }
 
-QPointer<Ui::BoxContent> ParticipantsBoxController::showBox(
+base::weak_qptr<Ui::BoxContent> ParticipantsBoxController::showBox(
 		object_ptr<Ui::BoxContent> box) const {
-	const auto weak = Ui::MakeWeak(box.data());
+	const auto weak = base::make_weak(box.data());
 	delegate()->peerListUiShow()->showBox(std::move(box));
 	return weak;
 }
@@ -1314,7 +1564,7 @@ void ParticipantsBoxController::prepareChatRows(not_null<ChatData*> chat) {
 	chat->session().changes().peerUpdates(
 		chat,
 		UpdateFlag::Members | UpdateFlag::Admins
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		_additional.fillFromPeer();
 		if ((update.flags & UpdateFlag::Members)
 			|| (_role == Role::Admins)) {
@@ -1417,7 +1667,7 @@ void ParticipantsBoxController::rebuildChatAdmins(
 		delegate()->peerListRemoveRow(
 			delegate()->peerListRowAt(0));
 	}
-	for (const auto user : list) {
+	for (const auto &user : list) {
 		if (auto row = createRow(user)) {
 			const auto raw = row.get();
 			delegate()->peerListAppendRow(std::move(row));
@@ -1440,14 +1690,11 @@ void ParticipantsBoxController::chatListReady() {
 }
 
 void ParticipantsBoxController::rebuildRowTypes() {
-	if (_role != Role::Profile) {
-		return;
-	}
 	const auto count = delegate()->peerListFullRowsCount();
 	for (auto i = 0; i != count; ++i) {
 		const auto row = static_cast<Row*>(
 			delegate()->peerListRowAt(i).get());
-		row->setType(computeType(row->user()));
+		row->setType(computeType(row->peer()));
 	}
 	refreshRows();
 }
@@ -1482,7 +1729,7 @@ void ParticipantsBoxController::loadMoreRows() {
 	const auto participantsHash = uint64(0);
 
 	_loadRequestId = _api.request(MTPchannels_GetParticipants(
-		channel->inputChannel,
+		channel->inputChannel(),
 		filter,
 		MTP_int(_offset),
 		MTP_int(perPage),
@@ -1577,7 +1824,7 @@ bool ParticipantsBoxController::feedMegagroupLastParticipants() {
 
 	auto added = false;
 	_additional.fillFromPeer();
-	for (const auto user : info->lastParticipants) {
+	for (const auto &user : info->lastParticipants) {
 		if (appendRow(user)) {
 			added = true;
 		}
@@ -1610,6 +1857,16 @@ void ParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {
 		&& (_peer->isChat() || _peer->isMegagroup())
 		&& user) {
 		showRestricted(user);
+	} else if (_role == Role::Members
+		&& user
+		&& (_additional.adminRights(user).has_value()
+			|| _additional.isCreator(user))
+		&& _additional.canAddOrEditAdmin(user)) {
+		showAdmin(user);
+	} else if (_role == Role::Members
+		&& user
+		&& _additional.canRestrictParticipant(participant)) {
+		showRestricted(user);
 	} else {
 		Assert(_navigation != nullptr);
 		if (_role != Role::Profile) {
@@ -1624,15 +1881,46 @@ void ParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {
 
 void ParticipantsBoxController::rowRightActionClicked(
 		not_null<PeerListRow*> row) {
+	rowElementClicked(row, Row::kRemoveElement);
+}
+
+void ParticipantsBoxController::rowElementClicked(
+		not_null<PeerListRow*> row,
+		int element) {
 	const auto participant = row->peer();
 	const auto user = participant->asUser();
-	if (_role == Role::Members || _role == Role::Profile) {
-		kickParticipant(participant);
-	} else if (_role == Role::Admins) {
-		Assert(user != nullptr);
-		removeAdmin(user);
-	} else {
-		removeKicked(row, participant);
+	const auto memberRow = static_cast<Row*>(row.get());
+	if (element == Row::kTagElement) {
+		if (!user) {
+			return;
+		}
+		if (memberRow->type().canAddTag || memberRow->type().canEditTag) {
+			const auto show = delegate()->peerListUiShow();
+			const auto peer = _peer;
+			const auto currentRank = _additional.memberRank(user);
+			const auto isSelf = user->isSelf();
+			show->show(Box(
+				EditCustomRankBox,
+				show,
+				peer,
+				user,
+				currentRank,
+				isSelf,
+				crl::guard(this, [=](const QString &rank) {
+					_additional.applyMemberRankLocally(user, rank);
+					recomputeTypeFor(user);
+					refreshRows();
+				})));
+		}
+	} else if (element == Row::kRemoveElement) {
+		if (_role == Role::Members || _role == Role::Profile) {
+			kickParticipant(participant);
+		} else if (_role == Role::Admins) {
+			Assert(user != nullptr);
+			removeAdmin(user);
+		} else {
+			removeKicked(row, participant);
+		}
 	}
 }
 
@@ -1645,6 +1933,51 @@ base::unique_qptr<Ui::PopupMenu> ParticipantsBoxController::rowContextMenu(
 	auto result = base::make_unique_q<Ui::PopupMenu>(
 		parent,
 		st::popupMenuWithIcons);
+	const auto addToEnd = gsl::finally([&] {
+		const auto addInfoAction = [&](
+				not_null<PeerData*> by,
+				tr::phrase<lngtag_user, lngtag_date> phrase,
+				TimeId since) {
+			auto text = phrase(
+				tr::now,
+				lt_user,
+				tr::bold(by->name()),
+				lt_date,
+				tr::bold(
+					langDateTimeFull(base::unixtime::parse(since))),
+				tr::marked);
+			auto button = base::make_unique_q<Ui::Menu::MultilineAction>(
+				result->menu(),
+				result->st().menu,
+				st::historyHasCustomEmoji,
+				st::historyHasCustomEmojiPosition,
+				std::move(text));
+			if (const auto n = _navigation) {
+				button->setActionTriggered([=] {
+					n->parentController()->show(PrepareShortInfoBox(by, n));
+				});
+			}
+			result->addSeparator();
+			result->addAction(std::move(button));
+		};
+
+		if (const auto by = _additional.restrictedBy(participant)) {
+			if (const auto since = _additional.restrictedSince(participant)) {
+				addInfoAction(
+					by,
+					_additional.isKicked(participant)
+						? tr::lng_rights_chat_banned_by
+						: tr::lng_rights_chat_restricted_by,
+					since);
+			}
+		} else if (user) {
+			if (const auto by = _additional.adminPromotedBy(user)) {
+				if (const auto since = _additional.adminPromotedSince(user)) {
+					addInfoAction(by, tr::lng_rights_about_by, since);
+				}
+			}
+		}
+	});
 	if (_navigation) {
 		result->addAction(
 			(participant->isUser()
@@ -1652,37 +1985,54 @@ base::unique_qptr<Ui::PopupMenu> ParticipantsBoxController::rowContextMenu(
 				: participant->isBroadcast()
 				? tr::lng_context_view_channel
 				: tr::lng_context_view_group)(tr::now),
-			crl::guard(this, [=] {
-				_navigation->showPeerInfo(participant); }),
+			crl::guard(this, [=, this] {
+				_navigation->parentController()->show(
+					PrepareShortInfoBox(participant, _navigation));
+			}),
 			(participant->isUser()
 				? &st::menuIconProfile
 				: &st::menuIconInfo));
 	}
-	if (const auto by = _additional.restrictedBy(participant)) {
-		result->addAction(
-			(_role == Role::Kicked
-				? tr::lng_channel_banned_status_removed_by
-				: tr::lng_channel_banned_status_restricted_by)(
-					tr::now,
-					lt_user,
-					by->name()),
-			crl::guard(this, [=] {
-				_navigation->parentController()->show(
-					PrepareShortInfoBox(by, _navigation));
-			}),
-			&st::menuIconAdmin);
-	} else if (user) {
-		if (const auto by = _additional.adminPromotedBy(user)) {
+	if (user && !_peer->isBroadcast()) {
+		const auto isSelf = user->isSelf();
+		const auto canEditSelf = isSelf
+			&& !_peer->amRestricted(ChatRestriction::EditRank);
+		const auto targetIsAdmin = _additional.adminRights(user).has_value()
+			|| _additional.isCreator(user);
+		const auto canEditTarget = !isSelf
+			&& _peer->canManageRanks()
+			&& (!targetIsAdmin || _additional.canEditAdmin(user));
+		if (canEditSelf || canEditTarget) {
+			const auto currentRank = _additional.memberRank(user);
+			const auto show = delegate()->peerListUiShow();
+			const auto peer = _peer;
+			const auto actionText = canEditSelf
+				? (currentRank.isEmpty()
+					? tr::lng_context_add_my_tag(tr::now)
+					: tr::lng_context_edit_my_tag(tr::now))
+				: (currentRank.isEmpty()
+					? tr::lng_context_add_member_tag(tr::now)
+					: tr::lng_context_edit_member_tag(tr::now));
+			const auto weak = base::make_weak(this);
 			result->addAction(
-				tr::lng_channel_admin_status_promoted_by(
-					tr::now,
-					lt_user,
-					by->name()),
-				crl::guard(this, [=] {
-					_navigation->parentController()->show(
-						PrepareShortInfoBox(by, _navigation));
-				}),
-				&st::menuIconAdmin);
+				actionText,
+				[=] {
+					show->show(Box(
+						EditCustomRankBox,
+						show,
+						peer,
+						user,
+						currentRank,
+						canEditSelf,
+						crl::guard(weak, [=](const QString &rank) {
+							_additional.applyMemberRankLocally(user, rank);
+							recomputeTypeFor(user);
+							refreshRows();
+						})));
+				},
+				(currentRank.isEmpty()
+					? &st::menuIconTagAdd
+					: &st::menuIconTagEdit));
 		}
 	}
 	if (_role == Role::Kicked) {
@@ -1748,13 +2098,13 @@ void ParticipantsBoxController::showAdmin(not_null<UserData*> user) {
 		_peer,
 		user,
 		currentRights,
-		_additional.adminRank(user),
+		_additional.memberRank(user),
 		_additional.adminPromotedSince(user),
 		_additional.adminPromotedBy(user));
 	if (_additional.canAddOrEditAdmin(user)) {
 		const auto done = crl::guard(this, [=](
 				ChatAdminRightsInfo newRights,
-				const QString &rank) {
+				const std::optional<QString> &rank) {
 			editAdminDone(user, newRights, rank);
 		});
 		const auto fail = crl::guard(this, [=] {
@@ -1772,28 +2122,20 @@ void ParticipantsBoxController::showAdmin(not_null<UserData*> user) {
 void ParticipantsBoxController::editAdminDone(
 		not_null<UserData*> user,
 		ChatAdminRightsInfo rights,
-		const QString &rank) {
+		const std::optional<QString> &rank) {
 	_addBox = nullptr;
 	if (_editParticipantBox) {
 		_editParticipantBox->closeBox();
 	}
 
-	_additional.applyAdminLocally(user, rights, rank);
-	if (!_additional.isCreator(user) || !user->isSelf()) {
-		if (!rights.flags) {
-			if (_role == Role::Admins) {
-				removeRow(user);
-			}
-		} else {
-			if (_role == Role::Admins) {
-				prependRow(user);
-			} else if (_role == Role::Kicked || _role == Role::Restricted) {
-				removeRow(user);
-			}
-		}
-	}
+	const auto effectiveRank = rank.value_or(
+		_additional.memberRank(user));
+	_additional.applyAdminLocally(user, rights, effectiveRank);
 	recomputeTypeFor(user);
 	refreshRows();
+
+	const auto flags = rights.flags;
+	user->session().changes().chatAdminChanged(_peer, user, flags, effectiveRank);
 }
 
 void ParticipantsBoxController::showRestricted(not_null<UserData*> user) {
@@ -1807,6 +2149,7 @@ void ParticipantsBoxController::showRestricted(not_null<UserData*> user) {
 		user,
 		hasAdminRights,
 		currentRights,
+		_additional.memberRank(user),
 		_additional.restrictedBy(user),
 		_additional.restrictedSince(user));
 	if (_additional.canRestrictParticipant(user)) {
@@ -1819,8 +2162,9 @@ void ParticipantsBoxController::showRestricted(not_null<UserData*> user) {
 				_editParticipantBox->closeBox();
 			}
 		});
+		const auto show = delegate()->peerListUiShow();
 		box->setSaveCallback(
-			SaveRestrictedCallback(_peer, user, done, fail));
+			SaveRestrictedCallback(show, _peer, user, done, fail));
 	}
 	_editParticipantBox = showBox(std::move(box));
 }
@@ -1852,8 +2196,7 @@ void ParticipantsBoxController::editRestrictedDone(
 			if (_role == Role::Restricted) {
 				prependRow(participant);
 			} else if (_role == Role::Kicked
-				|| _role == Role::Admins
-				|| _role == Role::Members) {
+				|| _role == Role::Admins) {
 				removeRow(participant);
 			}
 		}
@@ -1864,18 +2207,44 @@ void ParticipantsBoxController::editRestrictedDone(
 
 void ParticipantsBoxController::kickParticipant(not_null<PeerData*> participant) {
 	const auto user = participant->asUser();
+	const auto kickFrom = _peer;
+	const auto restrictedRights = _additional.restrictedRights(participant);
+	const auto removeLocal = crl::guard(this, [=] {
+		const auto id = participant->id;
+		if (const auto row = delegate()->peerListFindRow(id.value)) {
+			delegate()->peerListRemoveRow(row);
+			refreshRows();
+		}
+	});
+	const auto kick = [=] {
+		const auto currentRights = restrictedRights
+			? *restrictedRights
+			: ChatRestrictionsInfo();
+		removeLocal();
+		auto &session = kickFrom->session();
+		if (const auto chat = kickFrom->asChat()) {
+			session.api().chatParticipants().kick(chat, participant);
+		} else if (const auto channel = kickFrom->asChannel()) {
+			session.api().chatParticipants().kick(
+				channel,
+				participant,
+				currentRights);
+		}
+	};
+
+	if (user && user->isInaccessible()) {
+		return kick();
+	}
 	const auto text = ((_peer->isChat() || _peer->isMegagroup())
 		? tr::lng_profile_sure_kick
 		: tr::lng_profile_sure_kick_channel)(
 			tr::now,
 			lt_user,
 			user ? user->firstName : participant->name());
-	_editBox = showBox(
+	showBox(
 		Ui::MakeConfirmBox({
 			.text = text,
-			.confirmed = crl::guard(this, [=] {
-				kickParticipantSure(participant);
-			}),
+			.confirmed = [=](Fn<void()> close) { kick(); close(); },
 			.confirmText = tr::lng_box_remove(),
 		}));
 }
@@ -1890,30 +2259,6 @@ void ParticipantsBoxController::unkickParticipant(not_null<UserData*> user) {
 	_peer->session().api().chatParticipants().add(show, _peer, { 1, user });
 }
 
-void ParticipantsBoxController::kickParticipantSure(
-		not_null<PeerData*> participant) {
-	_editBox = nullptr;
-
-	const auto restrictedRights = _additional.restrictedRights(participant);
-	const auto currentRights = restrictedRights
-		? *restrictedRights
-		: ChatRestrictionsInfo();
-
-	if (const auto row = delegate()->peerListFindRow(participant->id.value)) {
-		delegate()->peerListRemoveRow(row);
-		refreshRows();
-	}
-	auto &session = _peer->session();
-	if (const auto chat = _peer->asChat()) {
-		session.api().chatParticipants().kick(chat, participant);
-	} else if (const auto channel = _peer->asChannel()) {
-		session.api().chatParticipants().kick(
-			channel,
-			participant,
-			currentRights);
-	}
-}
-
 void ParticipantsBoxController::removeAdmin(not_null<UserData*> user) {
 	_editBox = showBox(
 		Ui::MakeConfirmBox({
@@ -1932,21 +2277,16 @@ void ParticipantsBoxController::removeAdminSure(not_null<UserData*> user) {
 	if (const auto chat = _peer->asChat()) {
 		const auto show = delegate()->peerListUiShow();
 		SaveChatAdmin(show, chat, user, false, crl::guard(this, [=] {
-			editAdminDone(
-				user,
-				ChatAdminRightsInfo(),
-				QString());
+			editAdminDone(user, {}, {});
 		}), nullptr);
 	} else if (const auto channel = _peer->asChannel()) {
 		const auto adminRights = _additional.adminRights(user);
 		if (!adminRights) {
 			return;
 		}
-		RemoveAdmin(channel, user, *adminRights, crl::guard(this, [=] {
-			editAdminDone(
-				user,
-				ChatAdminRightsInfo(),
-				QString());
+		const auto show = delegate()->peerListUiShow();
+		RemoveAdmin(show, channel, user, *adminRights, crl::guard(this, [=] {
+			editAdminDone(user, {}, {});
 		}), nullptr);
 	}
 }
@@ -2044,64 +2384,129 @@ bool ParticipantsBoxController::removeRow(not_null<PeerData*> participant) {
 
 std::unique_ptr<PeerListRow> ParticipantsBoxController::createRow(
 		not_null<PeerData*> participant) const {
-	const auto user = participant->asUser();
 	if (_role == Role::Profile) {
-		Assert(user != nullptr);
-		return std::make_unique<Row>(user, computeType(user));
+		Assert(participant->asUser() != nullptr);
 	}
-	const auto chat = _peer->asChat();
-	const auto channel = _peer->asChannel();
-	auto row = std::make_unique<PeerListRowWithLink>(participant);
+	auto row = std::make_unique<Row>(participant, computeType(participant));
 	refreshCustomStatus(row.get());
-	if (_role == Role::Admins
-		&& user
-		&& !_additional.isCreator(user)
-		&& _additional.adminRights(user).has_value()
-		&& _additional.canEditAdmin(user)) {
-		row->setActionLink(tr::lng_profile_kick(tr::now));
-	} else if (_role == Role::Kicked || _role == Role::Restricted) {
-		if (_additional.canRestrictParticipant(participant)) {
-			row->setActionLink(tr::lng_profile_delete_removed(tr::now));
-		}
-	} else if (_role == Role::Members) {
-		Assert(user != nullptr);
-		if ((chat ? chat->canBanMembers() : channel->canBanMembers())
-			&& !_additional.isCreator(user)
-			&& (!_additional.adminRights(user)
-				|| _additional.canEditAdmin(user))) {
-			row->setActionLink(tr::lng_profile_kick(tr::now));
-		}
-		if (_role == Role::Members && user->isBot()) {
-			auto seesAllMessages = (user->botInfo->readsAllHistory || _additional.adminRights(user).has_value());
+	if (const auto user = participant->asUser()) {
+		if ((_role == Role::Members || _role == Role::Profile)
+				&& user->isBot()) {
+			const auto seesAllMessages =
+				(user->botInfo->readsAllHistory
+					|| _additional.adminRights(user).has_value());
 			row->setCustomStatus(seesAllMessages
 				? tr::lng_status_bot_reads_all(tr::now)
 				: tr::lng_status_bot_not_reads_all(tr::now));
 		}
 	}
+	const auto raw = row.get();
+	row->setRefreshCallback(crl::guard(this, [=] {
+		delegate()->peerListUpdateRow(raw);
+	}));
 	return row;
 }
 
 auto ParticipantsBoxController::computeType(
 		not_null<PeerData*> participant) const -> Type {
 	const auto user = participant->asUser();
-	auto result = Type();
+	auto result = Type{
+		.chatStyle = _chatStyle.get(),
+		.circleCache = &_pillCircleCache,
+	};
 	result.rights = (user && _additional.isCreator(user))
 		? Rights::Creator
 		: (user && _additional.adminRights(user).has_value())
 		? Rights::Admin
 		: Rights::Normal;
-	result.adminRank = user ? _additional.adminRank(user) : QString();
+
+	if (user) {
+		result.rank = _additional.memberRank(user);
+	}
+
+	const auto chat = _peer->asChat();
+	const auto channel = _peer->asChannel();
+
+	switch (_role) {
+	case Role::Profile: {
+		if (user
+			&& (chat
+				? chat->canBanMembers()
+				: (channel && channel->canBanMembers()))
+			&& !_additional.isCreator(user)
+			&& (!_additional.adminRights(user)
+				|| _additional.canEditAdmin(user))) {
+			result.canRemove = true;
+			result.removeText = tr::lng_profile_kick(tr::now);
+		} else if (_additional.canRemoveParticipant(participant)
+			&& user
+			&& user->isInaccessible()) {
+			result.canRemove = true;
+			result.rank = QString();
+			result.removeText = tr::lng_profile_delete_removed(tr::now);
+		}
+	} break;
+	case Role::Members: {
+		if (user
+			&& (chat
+				? chat->canBanMembers()
+				: channel->canBanMembers())
+			&& !_additional.isCreator(user)
+			&& (!_additional.adminRights(user)
+				|| _additional.canEditAdmin(user))) {
+			result.canRemove = true;
+			result.removeText = tr::lng_profile_kick(tr::now);
+		}
+	} break;
+	case Role::Admins: {
+		if (user
+			&& !_additional.isCreator(user)
+			&& _additional.adminRights(user).has_value()
+			&& _additional.canEditAdmin(user)) {
+			result.canRemove = true;
+			result.removeText = tr::lng_profile_kick(tr::now);
+		}
+	} break;
+	case Role::Restricted:
+	case Role::Kicked: {
+		if (_additional.canRestrictParticipant(participant)) {
+			result.canRemove = true;
+			result.removeText = tr::lng_profile_delete_removed(tr::now);
+		}
+	} break;
+	}
+
+	if (user && !_peer->isBroadcast()) {
+		const auto isSelf = user->isSelf();
+		const auto canEditSelf = isSelf
+			&& !_peer->amRestricted(ChatRestriction::EditRank);
+		const auto targetIsAdmin =
+			_additional.adminRights(user).has_value()
+			|| _additional.isCreator(user);
+		const auto canEditTarget = !isSelf
+			&& _peer->canManageRanks()
+			&& (!targetIsAdmin || _additional.canEditAdmin(user));
+		if (canEditSelf || canEditTarget) {
+			result.canEditTag = true;
+		}
+		if (isSelf
+			&& result.rank.isEmpty()
+			&& !result.canRemove
+			&& result.rights == Rights::Normal
+			&& canEditSelf) {
+			result.canAddTag = true;
+		}
+	}
+
 	return result;
 }
 
 void ParticipantsBoxController::recomputeTypeFor(
 		not_null<PeerData*> participant) {
-	if (_role != Role::Profile) {
-		return;
-	}
 	const auto row = delegate()->peerListFindRow(participant->id.value);
 	if (row) {
 		static_cast<Row*>(row)->setType(computeType(participant));
+		delegate()->peerListUpdateRow(row);
 	}
 }
 
@@ -2163,7 +2568,7 @@ void ParticipantsBoxController::subscribeToCreatorChange(
 		return (change.diff & ChannelDataFlag::Creator);
 	}) | rpl::filter([=] {
 		return (isCreator != channel->amCreator());
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (channel->isBroadcast()) {
 			fullListRefresh();
 			return;
@@ -2171,7 +2576,7 @@ void ParticipantsBoxController::subscribeToCreatorChange(
 		const auto weak = base::make_weak(this);
 		const auto api = &channel->session().api();
 		api->request(MTPchannels_GetParticipants(
-			channel->inputChannel,
+			channel->inputChannel(),
 			MTP_channelParticipantsRecent(),
 			MTP_int(0), // offset
 			MTP_int(channel->session().serverConfig().chatSizeMax),
@@ -2259,6 +2664,8 @@ void ParticipantsBoxSearchController::restoreState(
 		_allLoaded = my->allLoaded;
 		_offset = my->offset;
 		_query = my->query;
+		_timer.cancel();
+		_requestId = 0;
 		if (my->wasLoading) {
 			searchOnServer();
 		}
@@ -2316,7 +2723,7 @@ bool ParticipantsBoxSearchController::loadMoreRows() {
 	const auto participantsHash = uint64(0);
 
 	_requestId = _api.request(MTPchannels_GetParticipants(
-		_channel->inputChannel,
+		_channel->inputChannel(),
 		filter,
 		MTP_int(_offset),
 		MTP_int(perPage),
@@ -2397,3 +2804,65 @@ void ParticipantsBoxSearchController::searchDone(
 
 	delegate()->peerListSearchRefreshRows();
 }
+
+void EditCustomRankBox(
+		not_null<Ui::GenericBox*> box,
+		std::shared_ptr<Ui::Show> show,
+		not_null<PeerData*> peer,
+		not_null<UserData*> user,
+		const QString &currentRank,
+		bool isSelf,
+		Fn<void(QString rank)> onSaved) {
+	struct State {
+		bool saving = false;
+	};
+	const auto state = box->lifetime().make_state<State>();
+
+	box->setTitle(tr::lng_rights_edit_tag_title());
+
+	const auto role = LookupBadgeRole(peer, user);
+	const auto control = box->addRow(
+		object_ptr<EditTagControl>(
+			box,
+			&peer->session(),
+			user,
+			currentRank,
+			role),
+		style::margins());
+	Ui::AddSkip(box->verticalLayout());
+	Ui::AddDividerText(
+		box->verticalLayout(),
+		(isSelf
+			? tr::lng_rights_tag_about_self()
+			: tr::lng_rights_tag_about(
+				lt_name,
+				rpl::single(user->shortName()))));
+	const auto field = control->field();
+
+	box->setFocusCallback([=] { field->setFocusFast(); });
+
+	const auto close = crl::guard(box, [=] { box->closeBox(); });
+	const auto save = [=] {
+		if (state->saving) {
+			return;
+		}
+		state->saving = true;
+		const auto rank = control->currentRank();
+		SaveMemberRank(
+			show,
+			peer,
+			user,
+			rank,
+			[=] {
+				if (onSaved) {
+					onSaved(rank);
+				}
+				close();
+			},
+			[=] { state->saving = false; });
+	};
+	field->submits(
+	) | rpl::on_next([=] { save(); }, field->lifetime());
+	box->addButton(tr::lng_settings_save(), save);
+	box->addButton(tr::lng_cancel(), close);
+}
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
index b993c740c599f1..6d40bec4c27a01 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
@@ -32,23 +32,41 @@ class ChatParticipant;
 Fn<void(
 	ChatAdminRightsInfo oldRights,
 	ChatAdminRightsInfo newRights,
-	const QString &rank)> SaveAdminCallback(
+	const std::optional<QString> &rank)> SaveAdminCallback(
 		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
 		not_null<UserData*> user,
 		Fn<void(
 			ChatAdminRightsInfo newRights,
-			const QString &rank)> onDone,
+			const std::optional<QString> &rank)> onDone,
 		Fn<void()> onFail);
 
 Fn<void(
 	ChatRestrictionsInfo oldRights,
 	ChatRestrictionsInfo newRights)> SaveRestrictedCallback(
+		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
 		not_null<PeerData*> participant,
 		Fn<void(ChatRestrictionsInfo newRights)> onDone,
 		Fn<void()> onFail);
 
+void EditCustomRankBox(
+	not_null<Ui::GenericBox*> box,
+	std::shared_ptr<Ui::Show> show,
+	not_null<PeerData*> peer,
+	not_null<UserData*> user,
+	const QString &currentRank,
+	bool isSelf,
+	Fn<void(QString rank)> onSaved);
+
+void SaveMemberRank(
+	std::shared_ptr<Ui::Show> show,
+	not_null<PeerData*> peer,
+	not_null<UserData*> user,
+	const QString &rank,
+	Fn<void()> onDone,
+	Fn<void()> onFail);
+
 void SubscribeToMigration(
 	not_null<PeerData*> peer,
 	rpl::lifetime &lifetime,
@@ -106,7 +124,7 @@ class ParticipantsAdditionalData {
 		not_null<PeerData*> participant) const;
 	[[nodiscard]] std::optional<ChatAdminRightsInfo> adminRights(
 		not_null<UserData*> user) const;
-	[[nodiscard]] QString adminRank(not_null<UserData*> user) const;
+	[[nodiscard]] QString memberRank(not_null<UserData*> user) const;
 	[[nodiscard]] std::optional<ChatRestrictionsInfo> restrictedRights(
 		not_null<PeerData*> participant) const;
 	[[nodiscard]] bool isCreator(not_null<UserData*> user) const;
@@ -129,6 +147,9 @@ class ParticipantsAdditionalData {
 	void applyBannedLocally(
 		not_null<PeerData*> participant,
 		ChatRestrictionsInfo rights);
+	void applyMemberRankLocally(
+		not_null<UserData*> user,
+		const QString &rank);
 
 private:
 	UserData *applyCreator(const Api::ChatParticipant &data);
@@ -148,7 +169,7 @@ class ParticipantsAdditionalData {
 
 	// Data for channels.
 	base::flat_map<not_null<UserData*>, ChatAdminRightsInfo> _adminRights;
-	base::flat_map<not_null<UserData*>, QString> _adminRanks;
+	base::flat_map<not_null<UserData*>, QString> _memberRanks;
 	base::flat_map<not_null<UserData*>, TimeId> _adminPromotedSince;
 	base::flat_map<not_null<PeerData*>, TimeId> _restrictedSince;
 	base::flat_map<not_null<UserData*>, TimeId> _memberSince;
@@ -178,11 +199,15 @@ class ParticipantsBoxController
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<PeerData*> peer,
 		Role role);
+	~ParticipantsBoxController();
 
 	Main::Session &session() const override;
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
 	void rowRightActionClicked(not_null<PeerListRow*> row) override;
+	void rowElementClicked(
+		not_null<PeerListRow*> row,
+		int element) override;
 	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
 		QWidget *parent,
 		not_null<PeerListRow*> row) override;
@@ -206,8 +231,10 @@ class ParticipantsBoxController
 	void setStoriesShown(bool shown);
 
 protected:
-	// Allow child controllers not providing navigation.
-	// This is their responsibility to override all methods that use it.
+	using Row = Info::Profile::MemberListRow;
+	using Type = Row::Type;
+	using Rights = Row::Rights;
+
 	struct CreateTag {
 	};
 	ParticipantsBoxController(
@@ -219,10 +246,10 @@ class ParticipantsBoxController
 	virtual std::unique_ptr<PeerListRow> createRow(
 		not_null<PeerData*> participant) const;
 
+	std::unique_ptr<Ui::ChatStyle> _chatStyle;
+	mutable base::flat_map<QRgb, QImage> _pillCircleCache;
+
 private:
-	using Row = Info::Profile::MemberListRow;
-	using Type = Row::Type;
-	using Rights = Row::Rights;
 	struct SavedState : SavedStateBase {
 		explicit SavedState(const ParticipantsAdditionalData &additional);
 
@@ -240,7 +267,7 @@ class ParticipantsBoxController
 		Role role,
 		not_null<ParticipantsAdditionalData*> additional);
 
-	QPointer<Ui::BoxContent> showBox(object_ptr<Ui::BoxContent> box) const;
+	base::weak_qptr<Ui::BoxContent> showBox(object_ptr<Ui::BoxContent> box) const;
 
 	void prepareChatRows(not_null<ChatData*> chat);
 	void rebuildChatRows(not_null<ChatData*> chat);
@@ -260,7 +287,7 @@ class ParticipantsBoxController
 	void editAdminDone(
 		not_null<UserData*> user,
 		ChatAdminRightsInfo rights,
-		const QString &rank);
+		const std::optional<QString> &rank);
 	void showRestricted(not_null<UserData*> user);
 	void editRestrictedDone(
 		not_null<PeerData*> participant,
@@ -271,7 +298,6 @@ class ParticipantsBoxController
 	void removeKickedWithRow(not_null<PeerData*> participant);
 	void removeKicked(not_null<PeerData*> participant);
 	void kickParticipant(not_null<PeerData*> participant);
-	void kickParticipantSure(not_null<PeerData*> participant);
 	void unkickParticipant(not_null<UserData*> user);
 	void removeAdmin(not_null<UserData*> user);
 	void removeAdminSure(not_null<UserData*> user);
@@ -304,7 +330,7 @@ class ParticipantsBoxController
 	rpl::variable<int> _fullCountValue;
 	Ui::BoxPointer _editBox;
 	Ui::BoxPointer _addBox;
-	QPointer<Ui::BoxContent> _editParticipantBox;
+	base::weak_qptr<Ui::BoxContent> _editParticipantBox;
 
 	std::unique_ptr<PeerListStories> _stories;
 
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
index b2e292a3cbeeea..cd7b9e566369f3 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
@@ -13,9 +13,12 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "boxes/peers/replace_boost_box.h"
 #include "boxes/background_box.h"
+#include "boxes/premium_preview_box.h"
+#include "boxes/star_gift_box.h"
 #include "boxes/stickers_box.h"
+#include "boxes/transfer_gift_box.h"
 #include "chat_helpers/compose/compose_show.h"
-#include "core/ui_integration.h" // Core::MarkedTextContext.
+#include "core/ui_integration.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_changes.h"
@@ -24,14 +27,19 @@ For license and copyright information please follow this link:
 #include "data/data_emoji_statuses.h"
 #include "data/data_file_origin.h"
 #include "data/data_peer.h"
+#include "data/data_peer_values.h"
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
+#include "data/data_user.h"
 #include "data/data_web_page.h"
 #include "history/view/history_view_element.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "info/channel_statistics/boosts/info_boosts_widget.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
 #include "info/profile/info_profile_emoji_status_panel.h"
+#include "info/profile/info_profile_top_bar.h"
+#include "info/info_controller.h" // Key
 #include "info/info_memento.h"
 #include "iv/iv_data.h"
 #include "lang/lang_keys.h"
@@ -39,15 +47,21 @@ For license and copyright information please follow this link:
 #include "lottie/lottie_single_player.h"
 #include "main/main_session.h"
 #include "settings/settings_common.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "ui/boxes/boost_box.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
+#include "ui/controls/button_labels.h"
+#include "ui/controls/sub_tabs.h"
 #include "ui/effects/path_shift_gradient.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/layers/generic_box.h"
+#include "ui/peer/color_sample.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/pill_tabs.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/color_contrast.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/vertical_list.h"
@@ -55,6 +69,8 @@ For license and copyright information please follow this link:
 #include "window/section_widget.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
+#include "styles/style_credits.h"
+#include "styles/style_info.h" // defaultSubTabs.
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
 #include "styles/style_settings.h"
@@ -66,37 +82,89 @@ using namespace Settings;
 
 constexpr auto kFakeChannelId = ChannelId(0xFFFFFFF000ULL);
 constexpr auto kFakeWebPageId = WebPageId(0xFFFFFFFF00000000ULL);
-constexpr auto kSelectAnimationDuration = crl::time(150);
+constexpr auto kUnsetColorIndex = uint8(0xFF);
 
-class ColorSample final : public Ui::AbstractButton {
-public:
-	ColorSample(
-		not_null<QWidget*> parent,
-		std::shared_ptr<Ui::ChatStyle> style,
-		rpl::producer<uint8> colorIndex,
-		const QString &name);
-	ColorSample(
-		not_null<QWidget*> parent,
-		std::shared_ptr<Ui::ChatStyle> style,
-		uint8 colorIndex,
-		bool selected);
-
-	[[nodiscard]] uint8 index() const;
-	int naturalWidth() const override;
-
-	void setSelected(bool selected);
+base::unique_qptr<Ui::RpWidget> CreateEmptyPlaceholder(
+		not_null<Ui::RpWidget*> parent,
+		int width,
+		const QMargins &padding,
+		Fn<void()> switchToNextTab) {
+	const auto container = Ui::CreateChild<Ui::RpWidget>(parent);
+	auto result = base::unique_qptr<Ui::RpWidget>{ container };
 
-private:
-	void paintEvent(QPaintEvent *e) override;
+	auto icon = Settings::CreateLottieIcon(
+		container,
+		{
+			.name = u"my_gifts_empty"_q,
+			.sizeOverride = st::normalBoxLottieSize,
+		},
+		st::settingsBlockedListIconPadding);
+	const auto iconWidget = icon.widget.data();
+	iconWidget->show();
+
+	const auto emptyLabel = Ui::CreateChild<Ui::FlatLabel>(
+		container,
+		tr::lng_gift_stars_tabs_my_empty(),
+		st::giftBoxGiftEmptyLabel);
+	emptyLabel->setTryMakeSimilarLines(true);
+	emptyLabel->resizeToWidth(
+		width - st::boxRowPadding.left() - st::boxRowPadding.right());
+	emptyLabel->show();
+
+	const auto emptyNextLabel = switchToNextTab
+		? Ui::CreateChild<Ui::FlatLabel>(
+			container,
+			tr::lng_gift_stars_tabs_my_empty_next(
+				lt_emoji,
+				rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+				tr::link),
+			st::giftBoxGiftEmptyLabel)
+		: nullptr;
+	if (emptyNextLabel) {
+		emptyNextLabel->resizeToWidth(
+			width - st::boxRowPadding.left() - st::boxRowPadding.right());
+		emptyNextLabel->setClickHandlerFilter([=](auto...) {
+			switchToNextTab();
+			return false;
+		});
+	}
 
-	std::shared_ptr<Ui::ChatStyle> _style;
-	Ui::Text::String _name;
-	uint8 _index = 0;
-	Ui::Animations::Simple _selectAnimation;
-	bool _selected = false;
-	bool _simple = false;
+	icon.animate(anim::repeat::loop);
+
+	const auto labelHeight = emptyLabel->height();
+	const auto nextLabelHeight = emptyNextLabel
+		? emptyNextLabel->height()
+		: 0;
+	const auto totalHeight = iconWidget->height()
+		+ st::normalFont->height + labelHeight + nextLabelHeight
+		+ (nextLabelHeight ? st::normalFont->height : 0)
+		+ padding.top() + padding.bottom();
+	container->resize(width, totalHeight);
+
+	container->sizeValue(
+	) | rpl::on_next([=](QSize size) {
+		const auto totalContentHeight = iconWidget->height()
+			+ st::normalFont->height + emptyLabel->height()
+			+ (emptyNextLabel
+				? st::normalFont->height + emptyNextLabel->height()
+				: 0);
+		const auto iconY = (size.height() - totalContentHeight) / 2;
+		iconWidget->move(
+			(size.width() - iconWidget->width()) / 2,
+			iconY);
+		emptyLabel->move(
+			(size.width() - emptyLabel->width()) / 2,
+			iconY + iconWidget->height() + st::normalFont->height);
+		if (emptyNextLabel) {
+			emptyNextLabel->move(
+				(size.width() - emptyNextLabel->width()) / 2,
+				iconY + iconWidget->height() + st::normalFont->height
+					+ emptyLabel->height() + st::normalFont->height);
+		}
+	}, container->lifetime());
 
-};
+	return result;
+}
 
 class PreviewDelegate final : public HistoryView::DefaultElementDelegate {
 public:
@@ -123,7 +191,8 @@ class PreviewWrap final : public Ui::RpWidget {
 		std::shared_ptr<Ui::ChatTheme> theme,
 		not_null<PeerData*> peer,
 		rpl::producer<uint8> colorIndexValue,
-		rpl::producer<DocumentId> backgroundEmojiId);
+		rpl::producer<DocumentId> backgroundEmojiId,
+		rpl::producer<std::optional<Ui::ColorCollectible>> colorCollectible);
 	~PreviewWrap();
 
 private:
@@ -164,129 +233,13 @@ class LevelBadge final : public Ui::RpWidget {
 	void updateText();
 
 	const uint32 _level;
-	const TextWithEntities _icon;
-	const Core::MarkedTextContext _context;
+	const Ui::Text::MarkedContext _context;
 	Ui::Text::String _text;
 	bool _minimal = false;
 
 };
 
-ColorSample::ColorSample(
-	not_null<QWidget*> parent,
-	std::shared_ptr<Ui::ChatStyle> style,
-	rpl::producer<uint8> colorIndex,
-	const QString &name)
-: AbstractButton(parent)
-, _style(style)
-, _name(st::semiboldTextStyle, name) {
-	std::move(
-		colorIndex
-	) | rpl::start_with_next([=](uint8 index) {
-		_index = index;
-		update();
-	}, lifetime());
-}
-
-ColorSample::ColorSample(
-	not_null<QWidget*> parent,
-	std::shared_ptr<Ui::ChatStyle> style,
-	uint8 colorIndex,
-	bool selected)
-: AbstractButton(parent)
-, _style(style)
-, _index(colorIndex)
-, _selected(selected)
-, _simple(true) {
-}
-
-void ColorSample::setSelected(bool selected) {
-	if (_selected == selected) {
-		return;
-	}
-	_selected = selected;
-	_selectAnimation.start(
-		[=] { update(); },
-		_selected ? 0. : 1.,
-		_selected ? 1. : 0.,
-		kSelectAnimationDuration);
-}
-
-void ColorSample::paintEvent(QPaintEvent *e) {
-	auto p = Painter(this);
-	auto hq = PainterHighQualityEnabler(p);
-	const auto colors = _style->coloredValues(false, _index);
-	if (!_simple && !colors.outlines[1].alpha()) {
-		const auto radius = height() / 2;
-		p.setPen(Qt::NoPen);
-		p.setBrush(colors.bg);
-		p.drawRoundedRect(rect(), radius, radius);
-
-		const auto padding = st::settingsColorSamplePadding;
-		p.setPen(colors.name);
-		p.setBrush(Qt::NoBrush);
-		p.setFont(st::semiboldFont);
-		_name.drawLeftElided(
-			p,
-			padding.left(),
-			padding.top(),
-			width() - padding.left() - padding.right(),
-			width(),
-			1,
-			style::al_top);
-	} else {
-		const auto size = float64(width());
-		const auto half = size / 2.;
-		const auto full = QRectF(-half, -half, size, size);
-		p.translate(size / 2., size / 2.);
-		p.setPen(Qt::NoPen);
-		if (colors.outlines[1].alpha()) {
-			p.rotate(-45.);
-			p.setClipRect(-size, 0, 3 * size, size);
-			p.setBrush(colors.outlines[1]);
-			p.drawEllipse(full);
-			p.setClipRect(-size, -size, 3 * size, size);
-		}
-		p.setBrush(colors.outlines[0]);
-		p.drawEllipse(full);
-		p.setClipping(false);
-		if (colors.outlines[2].alpha()) {
-			const auto multiplier = size / st::settingsColorSampleSize;
-			const auto center = st::settingsColorSampleCenter * multiplier;
-			const auto radius = st::settingsColorSampleCenterRadius
-				* multiplier;
-			p.setBrush(colors.outlines[2]);
-			p.drawRoundedRect(
-				QRectF(-center / 2., -center / 2., center, center),
-				radius,
-				radius);
-		}
-		const auto selected = _selectAnimation.value(_selected ? 1. : 0.);
-		if (selected > 0) {
-			const auto line = st::settingsColorRadioStroke * 1.;
-			const auto thickness = selected * line;
-			auto pen = st::boxBg->p;
-			pen.setWidthF(thickness);
-			p.setBrush(Qt::NoBrush);
-			p.setPen(pen);
-			const auto skip = 1.5 * line;
-			p.drawEllipse(full.marginsRemoved({ skip, skip, skip, skip }));
-		}
-	}
-}
-
-uint8 ColorSample::index() const {
-	return _index;
-}
 
-int ColorSample::naturalWidth() const {
-	if (_name.isEmpty() || _style->colorPatternIndex(_index)) {
-		return st::settingsColorSampleSize;
-	}
-	const auto padding = st::settingsColorSamplePadding;
-	return std::max(
-		padding.left() + _name.maxWidth() + padding.right(),
-		padding.top() + st::semiboldFont->height + padding.bottom());
-}
 
 PreviewWrap::PreviewWrap(
 	not_null<Ui::GenericBox*> box,
@@ -294,7 +247,8 @@ PreviewWrap::PreviewWrap(
 	std::shared_ptr<Ui::ChatTheme> theme,
 	not_null<PeerData*> peer,
 	rpl::producer<uint8> colorIndexValue,
-	rpl::producer<DocumentId> backgroundEmojiId)
+	rpl::producer<DocumentId> backgroundEmojiId,
+	rpl::producer<std::optional<Ui::ColorCollectible>> colorCollectible)
 : RpWidget(box)
 , _box(box)
 , _peer(peer)
@@ -313,9 +267,11 @@ PreviewWrap::PreviewWrap(
 	WebPageCollage(),
 	nullptr, // iv
 	nullptr, // stickerSet
+	nullptr, // uniqueGift
 	0, // duration
 	QString(), // author
 	false, // hasLargeMedia
+	false, // photoIsVideoCover
 	0)) // pendingTill
 , _theme(theme)
 , _style(style)
@@ -357,19 +313,30 @@ PreviewWrap::PreviewWrap(
 	_style->apply(_theme.get());
 
 	_fake->setName(peer->name(), QString());
-	std::move(colorIndexValue) | rpl::start_with_next([=](uint8 index) {
-		_fake->changeColorIndex(index);
-		update();
+	std::move(colorIndexValue) | rpl::on_next([=](uint8 index) {
+		if (index != kUnsetColorIndex) {
+			_fake->changeColorIndex(index);
+			update();
+		}
 	}, lifetime());
-	std::move(backgroundEmojiId) | rpl::start_with_next([=](DocumentId id) {
+	std::move(backgroundEmojiId) | rpl::on_next([=](DocumentId id) {
 		_fake->changeBackgroundEmojiId(id);
 		update();
 	}, lifetime());
+	std::move(colorCollectible) | rpl::on_next([=](
+			std::optional<Ui::ColorCollectible> &&collectible) {
+		if (collectible) {
+			_fake->changeColorCollectible(std::move(*collectible));
+		} else {
+			_fake->clearColorCollectible();
+		}
+		update();
+	}, lifetime());
 
 	const auto session = &_history->session();
 	session->data().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const Element*> view) {
-		if (view == _element.get()) {
+	) | rpl::on_next([=](Data::RequestViewRepaint data) {
+		if (data.view == _element.get()) {
 			update();
 		}
 	}, lifetime());
@@ -397,6 +364,7 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 	auto context = _theme->preparePaintContext(
 		_style.get(),
 		rect(),
+		rect(),
 		clip,
 		!window()->isActiveWindow());
 
@@ -424,7 +392,7 @@ void PreviewWrap::initElements() {
 	widthValue(
 	) | rpl::filter([=](int width) {
 		return width > st::msgMinWidth;
-	}) | rpl::start_with_next([=](int width) {
+	}) | rpl::on_next([=](int width) {
 		const auto height = _position.y()
 			+ _element->resizeGetHeight(width)
 			+ st::msgMargin.top();
@@ -458,25 +426,18 @@ LevelBadge::LevelBadge(
 	uint32 level,
 	not_null<Main::Session*> session)
 : Ui::RpWidget(parent)
-, _level(level)
-, _icon(Ui::Text::SingleCustomEmoji(
-	session->data().customEmojiManager().registerInternalEmoji(
-		st::settingsLevelBadgeLock,
-		QMargins(0, st::settingsLevelBadgeLockSkip, 0, 0),
-		false)))
-, _context({ .session = session }) {
+, _level(level) {
 	updateText();
 }
 
 void LevelBadge::updateText() {
-	auto text = _icon;
-	text.append(' ');
+	auto text = Ui::Text::IconEmoji(&st::settingsLevelBadgeLock).append(' ');
 	if (!_minimal) {
 		text.append(tr::lng_boost_level(
 			tr::now,
 			lt_count,
 			_level,
-			Ui::Text::WithEntities));
+			tr::marked));
 	} else {
 		text.append(QString::number(_level));
 	}
@@ -485,7 +446,7 @@ void LevelBadge::updateText() {
 		st,
 		text,
 		kMarkupTextOptions,
-		_context);
+		Ui::Text::MarkedContext{ .repaint = [=] { update(); } });
 	const auto &padding = st::settingsColorSamplePadding;
 	QWidget::resize(
 		_text.maxWidth() + rect::m::sum::h(padding),
@@ -525,36 +486,79 @@ void LevelBadge::paintEvent(QPaintEvent *e) {
 struct SetValues {
 	uint8 colorIndex = 0;
 	DocumentId backgroundEmojiId = 0;
-	DocumentId statusId = 0;
+	std::optional<Ui::ColorCollectible> colorCollectible;
+	EmojiStatusId statusId;
 	TimeId statusUntil = 0;
 	bool statusChanged = false;
+	bool forProfile = false;
 };
 void Set(
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<PeerData*> peer,
-		SetValues values) {
-	const auto wasIndex = peer->colorIndex();
-	const auto wasEmojiId = peer->backgroundEmojiId();
-
-	const auto setLocal = [=](uint8 index, DocumentId emojiId) {
+		SetValues values,
+		bool showToast = true) {
+	const auto wasIndex = values.forProfile
+		? peer->colorProfileIndex().value_or(kUnsetColorIndex)
+		: peer->colorIndex();
+	const auto wasEmojiId = values.forProfile
+		? peer->profileBackgroundEmojiId()
+		: peer->backgroundEmojiId();
+	const auto &wasColorCollectible = peer->colorCollectible();
+
+	const auto setLocal = [=](
+			uint8 index,
+			DocumentId emojiId,
+			std::optional<Ui::ColorCollectible> colorCollectible) {
 		using UpdateFlag = Data::PeerUpdate::Flag;
-		peer->changeColorIndex(index);
-		peer->changeBackgroundEmojiId(emojiId);
+		if (values.forProfile) {
+			if (index == kUnsetColorIndex) {
+				peer->clearColorProfileIndex();
+			} else {
+				peer->changeColorProfileIndex(index);
+			}
+			peer->changeProfileBackgroundEmojiId(emojiId);
+		} else {
+			if (index == kUnsetColorIndex) {
+				peer->clearColorIndex();
+			} else {
+				peer->changeColorIndex(index);
+			}
+			if (colorCollectible) {
+				peer->changeColorCollectible(*colorCollectible);
+			} else {
+				peer->clearColorCollectible();
+			}
+			peer->changeBackgroundEmojiId(emojiId);
+		}
 		peer->session().changes().peerUpdated(
 			peer,
-			UpdateFlag::Color | UpdateFlag::BackgroundEmoji);
+			(UpdateFlag::BackgroundEmoji
+				| (values.forProfile
+					? UpdateFlag::ColorProfile
+					: UpdateFlag::Color)));
 	};
-	setLocal(values.colorIndex, values.backgroundEmojiId);
+	setLocal(
+		values.colorIndex,
+		values.backgroundEmojiId,
+		values.colorCollectible);
 
 	const auto done = [=] {
-		show->showToast(peer->isSelf()
-			? tr::lng_settings_color_changed(tr::now)
-			: tr::lng_settings_color_changed_channel(tr::now));
+		if (showToast) {
+			show->showToast(peer->isSelf()
+				? (values.forProfile
+					? tr::lng_settings_color_changed_profile(tr::now)
+					: tr::lng_settings_color_changed(tr::now))
+				: (values.forProfile
+					? tr::lng_settings_color_changed_profile_channel(tr::now)
+					: tr::lng_settings_color_changed_channel(tr::now)));
+		}
 	};
 	const auto fail = [=](const MTP::Error &error) {
 		const auto type = error.type();
 		if (type != u"CHAT_NOT_MODIFIED"_q) {
-			setLocal(wasIndex, wasEmojiId);
+			setLocal(wasIndex, wasEmojiId, wasColorCollectible
+				? *wasColorCollectible
+				: std::optional<Ui::ColorCollectible>());
 			show->showToast(type);
 		}
 	};
@@ -565,19 +569,44 @@ void Set(
 	};
 	if (peer->isSelf()) {
 		using Flag = MTPaccount_UpdateColor::Flag;
+		using ColorFlag = MTPDpeerColor::Flag;
 		send(MTPaccount_UpdateColor(
-			MTP_flags(Flag::f_color | Flag::f_background_emoji_id),
-			MTP_int(values.colorIndex),
-			MTP_long(values.backgroundEmojiId)));
-	} else if (peer->isMegagroup()) {
+			MTP_flags((values.forProfile ? Flag::f_for_profile : Flag(0))
+				| (((!values.forProfile && values.colorCollectible)
+					|| (values.colorIndex != kUnsetColorIndex))
+					? Flag::f_color
+					: Flag(0))),
+			((!values.forProfile && values.colorCollectible)
+				? MTP_inputPeerColorCollectible(
+					MTP_long(values.colorCollectible->collectibleId))
+				: MTP_peerColor(
+					MTP_flags(ColorFlag()
+						| ColorFlag::f_color
+						| (values.backgroundEmojiId
+							? ColorFlag::f_background_emoji_id
+							: ColorFlag(0))),
+					MTP_int(values.colorIndex),
+					MTP_long(values.backgroundEmojiId)))));
+		if (values.statusChanged
+			&& (values.statusId || peer->emojiStatusId())) {
+			peer->owner().emojiStatuses().set(
+				peer,
+				values.statusId,
+				values.statusUntil);
+		}
 	} else if (const auto channel = peer->asChannel()) {
-		using Flag = MTPchannels_UpdateColor::Flag;
-		send(MTPchannels_UpdateColor(
-			MTP_flags(Flag::f_color | Flag::f_background_emoji_id),
-			channel->inputChannel,
-			MTP_int(values.colorIndex),
-			MTP_long(values.backgroundEmojiId)));
-
+		if (peer->isBroadcast()) {
+			using Flag = MTPchannels_UpdateColor::Flag;
+			send(MTPchannels_UpdateColor(
+				MTP_flags((values.colorIndex != kUnsetColorIndex
+						? Flag::f_color
+						: Flag(0))
+					| Flag::f_background_emoji_id
+					| (values.forProfile ? Flag::f_for_profile : Flag(0))),
+				channel->inputChannel(),
+				MTP_int(values.colorIndex),
+				MTP_long(values.backgroundEmojiId)));
+		}
 		if (values.statusChanged
 			&& (values.statusId || peer->emojiStatusId())) {
 			peer->owner().emojiStatuses().set(
@@ -590,42 +619,56 @@ void Set(
 	}
 }
 
+bool ShowPremiumPreview(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer) {
+	if (!peer->isSelf() || show->session().premium()) {
+		return false;
+	}
+	if (const auto controller = show->resolveWindow()) {
+		ShowPremiumPreviewBox(controller, PremiumFeature::PeerColors);
+		return true;
+	}
+	return false;
+}
+
 void Apply(
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<PeerData*> peer,
 		SetValues values,
 		Fn<void()> close,
-		Fn<void()> cancel) {
-	const auto session = &peer->session();
-	if (peer->colorIndex() == values.colorIndex
-		&& peer->backgroundEmojiId() == values.backgroundEmojiId
+		Fn<void()> cancel,
+		bool showToast = true) {
+	const auto currentColorIndex = values.forProfile
+		? peer->colorProfileIndex().value_or(kUnsetColorIndex)
+		: peer->colorIndex();
+	const auto currentEmojiId = values.forProfile
+		? peer->profileBackgroundEmojiId()
+		: peer->backgroundEmojiId();
+
+	const auto colorMatch = (currentColorIndex == values.colorIndex);
+	const auto emojiMatch = (currentEmojiId == values.backgroundEmojiId);
+	const auto collectibleMatch = values.forProfile
+		|| ((!peer->colorCollectible() == !values.colorCollectible)
+			&& (!peer->colorCollectible()
+				|| (*peer->colorCollectible() == *values.colorCollectible)));
+
+	if (colorMatch
+		&& emojiMatch
+		&& collectibleMatch
 		&& !values.statusChanged) {
 		close();
-	} else if (peer->isSelf() && !session->premium()) {
-		Settings::ShowPremiumPromoToast(
-			show,
-			tr::lng_settings_color_subscribe(
-				tr::now,
-				lt_link,
-				Ui::Text::Link(
-					Ui::Text::Bold(
-						tr::lng_send_as_premium_required_link(tr::now))),
-				Ui::Text::WithEntities),
-			u"name_color"_q);
-		cancel();
 	} else if (peer->isSelf()) {
-		Set(show, peer, values);
+		Set(show, peer, values, showToast);
 		close();
 	} else {
 		CheckBoostLevel(show, peer, [=](int level) {
 			const auto peerColors = &peer->session().api().peerColors();
-			const auto colorRequired = peer->isMegagroup()
-				? peerColors->requiredGroupLevelFor(
-					peer->id,
-					values.colorIndex)
-				: peerColors->requiredChannelLevelFor(
-					peer->id,
-					values.colorIndex);
+			const auto colorRequired = peerColors->requiredLevelFor(
+				peer->id,
+				values.colorIndex,
+				peer->isMegagroup(),
+				values.forProfile);
 			const auto limits = Data::LevelLimits(&peer->session());
 			const auto iconRequired = values.backgroundEmojiId
 				? limits.channelBgIconLevelMin()
@@ -640,7 +683,7 @@ void Apply(
 				statusRequired,
 			});
 			if (level >= required) {
-				Set(show, peer, values);
+				Set(show, peer, values, showToast);
 				close();
 				return std::optional<Ui::AskBoostReason>();
 			}
@@ -660,111 +703,7 @@ void Apply(
 	}
 }
 
-class ColorSelector final : public Ui::RpWidget {
-public:
-	ColorSelector(
-		not_null<Ui::GenericBox*> box,
-		std::shared_ptr<Ui::ChatStyle> style,
-		rpl::producer<std::vector<uint8>> indices,
-		uint8 index,
-		Fn<void(uint8)> callback);
 
-private:
-	void fillFrom(std::vector<uint8> indices);
-
-	int resizeGetHeight(int newWidth) override;
-
-	const std::shared_ptr<Ui::ChatStyle> _style;
-	std::vector<std::unique_ptr<ColorSample>> _samples;
-	const Fn<void(uint8)> _callback;
-	uint8 _index = 0;
-
-};
-
-ColorSelector::ColorSelector(
-	not_null<Ui::GenericBox*> box,
-	std::shared_ptr<Ui::ChatStyle> style,
-	rpl::producer<std::vector<uint8>> indices,
-	uint8 index,
-	Fn<void(uint8)> callback)
-: RpWidget(box)
-, _style(style)
-, _callback(std::move(callback))
-, _index(index) {
-	std::move(
-		indices
-	) | rpl::start_with_next([=](std::vector<uint8> indices) {
-		fillFrom(std::move(indices));
-	}, lifetime());
-}
-
-void ColorSelector::fillFrom(std::vector<uint8> indices) {
-	auto samples = std::vector<std::unique_ptr<ColorSample>>();
-	const auto add = [&](uint8 index) {
-		auto i = ranges::find(_samples, index, &ColorSample::index);
-		if (i != end(_samples)) {
-			samples.push_back(std::move(*i));
-			_samples.erase(i);
-		} else {
-			samples.push_back(std::make_unique<ColorSample>(
-				this,
-				_style,
-				index,
-				index == _index));
-			samples.back()->show();
-			samples.back()->setClickedCallback([=] {
-				if (_index != index) {
-					_callback(index);
-
-					ranges::find(
-						_samples,
-						_index,
-						&ColorSample::index
-					)->get()->setSelected(false);
-					_index = index;
-					ranges::find(
-						_samples,
-						_index,
-						&ColorSample::index
-					)->get()->setSelected(true);
-				}
-			});
-		}
-	};
-	for (const auto index : indices) {
-		add(index);
-	}
-	if (!ranges::contains(indices, _index)) {
-		add(_index);
-	}
-	_samples = std::move(samples);
-	if (width() > 0) {
-		resizeToWidth(width());
-	}
-}
-
-int ColorSelector::resizeGetHeight(int newWidth) {
-	if (newWidth <= 0) {
-		return 0;
-	}
-	const auto count = int(_samples.size());
-	const auto columns = Ui::kSimpleColorIndexCount;
-	const auto skip = st::settingsColorRadioSkip;
-	const auto size = (newWidth - skip * (columns - 1)) / float64(columns);
-	const auto isize = int(base::SafeRound(size));
-	auto top = 0;
-	auto left = 0.;
-	for (auto i = 0; i != count; ++i) {
-		_samples[i]->resize(isize, isize);
-		_samples[i]->move(int(base::SafeRound(left)), top);
-		left += size + skip;
-		if (!((i + 1) % columns)) {
-			top += isize + skip;
-			left = 0.;
-		}
-	}
-	return (top - skip) + ((count % columns) ? (isize + skip) : 0);
-}
 
 [[nodiscard]] auto ButtonStyleWithAddedPadding(
 		not_null<Ui::RpWidget*> parent,
@@ -783,13 +722,18 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 		not_null<PeerData*> peer,
 		rpl::producer<uint8> colorIndexValue,
 		rpl::producer<DocumentId> emojiIdValue,
-		Fn<void(DocumentId)> emojiIdChosen) {
+		Fn<void(DocumentId)> emojiIdChosen,
+		bool profileIndices) {
 	const auto button = ButtonStyleWithRightEmoji(
 		parent,
 		tr::lng_settings_color_emoji_off(tr::now));
 	auto result = Settings::CreateButtonWithIcon(
 		parent,
-		tr::lng_settings_color_emoji(),
+		!profileIndices
+			? tr::lng_settings_color_emoji()
+			: peer->isChannel()
+			? tr::lng_settings_color_profile_emoji_channel()
+			: tr::lng_settings_color_profile_emoji(),
 		*button.st,
 		{ &st::menuBlueIconColorNames });
 	const auto raw = result.data();
@@ -806,11 +750,11 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 	};
 	const auto state = right->lifetime().make_state<State>();
 	state->panel.someCustomChosen(
-	) | rpl::start_with_next([=](EmojiStatusPanel::CustomChosen chosen) {
-		emojiIdChosen(chosen.id);
+	) | rpl::on_next([=](EmojiStatusPanel::CustomChosen chosen) {
+		emojiIdChosen(chosen.id.documentId);
 	}, raw->lifetime());
 
-	std::move(colorIndexValue) | rpl::start_with_next([=](uint8 index) {
+	std::move(colorIndexValue) | rpl::on_next([=](uint8 index) {
 		state->index = index;
 		if (state->emoji) {
 			right->update();
@@ -818,8 +762,8 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 	}, right->lifetime());
 
 	const auto session = &show->session();
-	const auto added = st::normalFont->spacew;
-	std::move(emojiIdValue) | rpl::start_with_next([=](DocumentId emojiId) {
+	const auto added = st::lineWidth * 2;
+	std::move(emojiIdValue) | rpl::on_next([=](DocumentId emojiId) {
 		state->emojiId = emojiId;
 		state->emoji = emojiId
 			? session->data().customEmojiManager().create(
@@ -835,23 +779,32 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 	rpl::combine(
 		raw->sizeValue(),
 		right->widthValue()
-	) | rpl::start_with_next([=](QSize outer, int width) {
+	) | rpl::on_next([=](QSize outer, int width) {
 		right->resize(width, outer.height());
 		const auto skip = st::settingsButton.padding.right();
 		right->moveToRight(skip - button.added, 0, outer.width());
 	}, right->lifetime());
 
 	right->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (state->panel.paintBadgeFrame(right)) {
 			return;
 		}
 		auto p = QPainter(right);
 		const auto height = right->height();
-		if (state->emoji) {
-			const auto colors = style->coloredValues(false, state->index);
+		if (state->emoji
+			&& (state->index != kUnsetColorIndex || profileIndices)) {
+			const auto profileSet = profileIndices
+				? peer->session().api().peerColors().colorProfileFor(
+					state->index)
+				: std::nullopt;
+			const auto textColor = profileSet && !profileSet->palette.empty()
+				? profileSet->palette.front()
+				: profileIndices
+				? style->windowActiveTextFg()->c
+				: style->coloredValues(false, state->index).name;
 			state->emoji->paint(p, {
-				.textColor = colors.name,
+				.textColor = textColor,
 				.position = QPoint(added, (height - button.emojiWidth) / 2),
 				.internal = {
 					.forceFirstFrame = true,
@@ -869,15 +822,25 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 
 	raw->setClickedCallback([=] {
 		const auto customTextColor = [=] {
+			if (state->index == kUnsetColorIndex) {
+				return style->windowActiveTextFg()->c;
+			}
+			if (profileIndices) {
+				const auto colorSet
+					= peer->session().api().peerColors().colorProfileFor(
+						state->index);
+				if (colorSet && !colorSet->palette.empty()) {
+					return colorSet->palette.front();
+				}
+			}
 			return style->coloredValues(false, state->index).name;
 		};
-		const auto controller = show->resolveWindow(
-			ChatHelpers::WindowUsage::PremiumPromo);
+		const auto controller = show->resolveWindow();
 		if (controller) {
 			state->panel.show({
 				.controller = controller,
 				.button = right,
-				.ensureAddedEmojiId = state->emojiId,
+				.ensureAddedEmojiId = { state->emojiId },
 				.customTextColor = customTextColor,
 				.backgroundEmojiMode = true,
 			});
@@ -885,8 +848,13 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 	});
 
 	if (const auto channel = peer->asChannel()) {
+		const auto limits = Data::LevelLimits(&channel->session());
 		AddLevelBadge(
-			Data::LevelLimits(&channel->session()).channelBgIconLevelMin(),
+			(!profileIndices
+				? limits.channelBgIconLevelMin()
+				: channel->isMegagroup()
+				? limits.groupProfileBgIconLevelMin()
+				: limits.channelProfileBgIconLevelMin()),
 			raw,
 			right,
 			channel,
@@ -901,8 +869,8 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 		not_null<Ui::RpWidget*> parent,
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<ChannelData*> channel,
-		rpl::producer<DocumentId> statusIdValue,
-		Fn<void(DocumentId,TimeId)> statusIdChosen,
+		rpl::producer<EmojiStatusId> statusIdValue,
+		Fn<void(EmojiStatusId,TimeId)> statusIdChosen,
 		bool group) {
 	const auto button = ButtonStyleWithRightEmoji(
 		parent,
@@ -924,20 +892,20 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 	struct State {
 		EmojiStatusPanel panel;
 		std::unique_ptr<Ui::Text::CustomEmoji> emoji;
-		DocumentId statusId = 0;
+		EmojiStatusId statusId;
 	};
 	const auto state = right->lifetime().make_state<State>();
 	state->panel.someCustomChosen(
-	) | rpl::start_with_next([=](EmojiStatusPanel::CustomChosen chosen) {
-		statusIdChosen(chosen.id, chosen.until);
+	) | rpl::on_next([=](EmojiStatusPanel::CustomChosen chosen) {
+		statusIdChosen({ chosen.id }, chosen.until);
 	}, raw->lifetime());
 
 	const auto session = &show->session();
-	std::move(statusIdValue) | rpl::start_with_next([=](DocumentId id) {
+	std::move(statusIdValue) | rpl::on_next([=](EmojiStatusId id) {
 		state->statusId = id;
 		state->emoji = id
 			? session->data().customEmojiManager().create(
-				id,
+				Data::EmojiStatusCustomId(id),
 				[=] { right->update(); })
 			: nullptr;
 		right->resize(
@@ -949,14 +917,14 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 	rpl::combine(
 		raw->sizeValue(),
 		right->widthValue()
-	) | rpl::start_with_next([=](QSize outer, int width) {
+	) | rpl::on_next([=](QSize outer, int width) {
 		right->resize(width, outer.height());
 		const auto skip = st::settingsButton.padding.right();
 		right->moveToRight(skip - button.added, 0, outer.width());
 	}, right->lifetime());
 
 	right->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (state->panel.paintBadgeFrame(right)) {
 			return;
 		}
@@ -985,13 +953,12 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 	}, right->lifetime());
 
 	raw->setClickedCallback([=] {
-		const auto controller = show->resolveWindow(
-			ChatHelpers::WindowUsage::PremiumPromo);
+		const auto controller = show->resolveWindow();
 		if (controller) {
 			state->panel.show({
 				.controller = controller,
 				.button = right,
-				.ensureAddedEmojiId = state->statusId,
+				.ensureAddedEmojiId = { state->statusId },
 				.channelStatusMode = true,
 			});
 		}
@@ -1043,7 +1010,7 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 	rpl::combine(
 		raw->sizeValue(),
 		right->widthValue()
-	) | rpl::start_with_next([=](QSize outer, int width) {
+	) | rpl::on_next([=](QSize outer, int width) {
 		right->resize(width, outer.height());
 		const auto skip = st::settingsButton.padding.right();
 		right->moveToRight(skip - button.added, 0, outer.width());
@@ -1052,7 +1019,7 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 	right->paintRequest(
 	) | rpl::filter([=] {
 		return state->icon != nullptr;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		auto p = QPainter(right);
 		const auto x = button.added;
 		const auto y = (right->height() - button.emojiWidth) / 2;
@@ -1112,7 +1079,7 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 			return wrapLoaded(sets->find(id));
 		}));
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](DocumentData *icon) {
+	) | rpl::on_next([=](DocumentData *icon) {
 		if (state->icon != icon) {
 			state->icon = icon;
 			state->custom = nullptr;
@@ -1131,6 +1098,522 @@ int ColorSelector::resizeGetHeight(int newWidth) {
 	return result;
 }
 
+struct ColorGiftTabsResult {
+	Fn<void()> switchToNext;
+	QPointer<Ui::SubTabs> tabs;
+};
+
+ColorGiftTabsResult AddColorGiftTabs(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Main::Session*> session,
+		Fn<void(uint64 giftId)> chosen,
+		bool profile) {
+	using namespace Info::PeerGifts;
+
+	struct State {
+		rpl::variable<std::vector<Data::StarGift>> list;
+		Ui::SubTabs *tabs = nullptr;
+	};
+	const auto state = container->lifetime().make_state<State>();
+
+	GiftsStars(
+		session,
+		session->user()
+	) | rpl::on_next([=](const std::vector<GiftTypeStars> &list) {
+		auto filtered = std::vector<Data::StarGift>();
+		for (const auto &gift : list) {
+			if ((profile || gift.info.peerColorAvailable) && gift.resale) {
+				filtered.push_back(gift.info);
+			}
+		}
+		state->list = std::move(filtered);
+	}, container->lifetime());
+
+	state->list.value(
+	) | rpl::on_next([=](const std::vector<Data::StarGift> &list) {
+		auto tabs = std::vector<Ui::SubTabs::Tab>();
+		tabs.push_back({
+			.id = u"my"_q,
+			.text = tr::lng_gift_stars_tabs_my(tr::now, tr::marked),
+		});
+		for (const auto &gift : list) {
+			auto text = TextWithEntities();
+			tabs.push_back({
+				.id = QString::number(gift.id),
+				.text = Data::SingleCustomEmoji(
+					gift.document).append(' ').append(gift.resellTitle),
+			});
+		}
+		const auto context = Core::TextContext({
+			.session = session,
+		});
+		if (!state->tabs) {
+			state->tabs = container->add(
+				object_ptr<Ui::SubTabs>(
+					container,
+					st::defaultSubTabs,
+					Ui::SubTabs::Options{
+						.selected = u"my"_q,
+						.centered = true,
+					},
+					std::move(tabs),
+					context));
+
+			state->tabs->activated(
+			) | rpl::on_next([=](const QString &id) {
+				state->tabs->setActiveTab(id);
+				chosen(id.toULongLong());
+			}, state->tabs->lifetime());
+		} else {
+			state->tabs->setTabs(std::move(tabs), context);
+		}
+		container->resizeToWidth(container->width());
+	}, container->lifetime());
+
+	return {
+		.switchToNext = [=]() {
+			const auto &list = state->list.current();
+			if (!list.empty()) {
+				if (state->tabs) {
+					state->tabs->setActiveTab(QString::number(list.front().id));
+				}
+				chosen(list.front().id);
+			}
+		},
+		.tabs = state->tabs,
+	};
+}
+
+void AddGiftSelector(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Main::Session*> session,
+		rpl::producer<uint64> showingGiftIdValue,
+		Fn<void(std::shared_ptr<Data::UniqueGift> selected)> chosen,
+		rpl::producer<uint64> selected,
+		bool profile,
+		rpl::producer<uint64> selectedGiftId = rpl::single(uint64(0)),
+		Fn<void()> switchToNextTab = nullptr) {
+	using namespace Info::PeerGifts;
+
+	const auto raw = container->add(
+		object_ptr<Ui::VisibleRangeWidget>(container));
+
+	struct List {
+		std::vector<GiftTypeStars> list;
+		rpl::lifetime loading;
+		QString offset;
+		bool loaded = false;
+	};
+	struct State {
+		std::optional<Delegate> delegate;
+		rpl::variable<uint64> showingGiftId;
+		base::flat_map<uint64, List> lists;
+		List *current = nullptr;
+		std::vector<bool> validated;
+		std::vector<std::unique_ptr<GiftButton>> buttons;
+		rpl::variable<Ui::VisibleRange> visibleRange;
+		rpl::variable<uint64> selected;
+		rpl::variable<uint64> selectedGiftId;
+		int perRow = 1;
+		base::unique_qptr<Ui::RpWidget> emptyPlaceholder;
+
+		Fn<void()> loadMore;
+		Fn<void()> resize;
+		Fn<void()> rebuild;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+	state->delegate.emplace(session, GiftButtonMode::Full);
+	state->showingGiftId = std::move(showingGiftIdValue);
+	state->selected = std::move(selected);
+	state->selectedGiftId = std::move(selectedGiftId);
+	const auto shadow = st::defaultDropdownMenu.wrap.shadow;
+	const auto extend = shadow.extend;
+	state->loadMore = [=] {
+		const auto selfId = session->userPeerId();
+		const auto shownGiftId = state->showingGiftId.current();
+		if (state->current->loaded || state->current->loading) {
+			return;
+		} else if (shownGiftId) {
+			state->current->loading = Data::ResaleGiftsSlice(
+				session,
+				shownGiftId,
+				{},
+				state->current->offset
+			) | rpl::on_next([=](Data::ResaleGiftsDescriptor slice) {
+				auto &entry = state->lists[shownGiftId];
+				entry.loading.destroy();
+				entry.offset = slice.offset;
+				entry.loaded = entry.offset.isEmpty();
+				if (state->showingGiftId.current() != shownGiftId) {
+					return;
+				}
+
+				auto &list = state->current->list;
+				for (const auto &gift : slice.list) {
+					if (gift.unique && (profile || gift.unique->peerColor)) {
+						list.push_back({
+							.info = gift,
+							.resale = true,
+							.mine = (gift.unique->ownerId == selfId),
+						});
+					}
+				}
+				state->resize();
+			});
+		} else {
+			state->current->loading = Data::MyUniqueGiftsSlice(
+				session,
+				Data::MyUniqueType::OwnedAndHosted,
+				state->current->offset
+			) | rpl::on_next([=](Data::MyGiftsDescriptor slice) {
+				auto &entry = state->lists[shownGiftId];
+				entry.loading.destroy();
+				entry.offset = slice.offset;
+				entry.loaded = entry.offset.isEmpty();
+				if (state->showingGiftId.current() != shownGiftId) {
+					return;
+				}
+
+				auto &list = state->current->list;
+				for (const auto &gift : slice.list) {
+					if (gift.info.unique
+						&& (profile || gift.info.unique->peerColor)) {
+						list.push_back({ .info = gift.info });
+					}
+				}
+				state->resize();
+			});
+		}
+	};
+	state->rebuild = [=] {
+		const auto shownGiftId = state->showingGiftId.current();
+		const auto width = st::boxWideWidth;
+		const auto padding = st::giftBoxPadding;
+		const auto available = width - padding.left() - padding.right();
+		const auto range = state->visibleRange.current();
+		const auto count = int(state->current->list.size());
+
+		auto &buttons = state->buttons;
+		if (buttons.size() < count) {
+			buttons.resize(count);
+		}
+		auto &validated = state->validated;
+		validated.resize(count);
+
+		auto x = padding.left();
+		auto y = padding.top();
+		const auto single = state->delegate->buttonSize();
+		const auto perRow = state->perRow;
+		const auto singlew = single.width() + st::giftBoxGiftSkip.x();
+		const auto singleh = single.height() + st::giftBoxGiftSkip.y();
+		const auto rowFrom = std::max(range.top - y, 0) / singleh;
+		const auto rowTill = (std::max(range.bottom - y + st::giftBoxGiftSkip.y(), 0) + singleh - 1)
+			/ singleh;
+		Assert(rowTill >= rowFrom);
+		const auto first = rowFrom * perRow;
+		const auto last = std::min(rowTill * perRow, count);
+		const auto selectedCollectibleId = state->selected.current();
+		const auto selectedGiftId = state->selectedGiftId.current();
+		auto checkedFrom = 0;
+		auto checkedTill = int(buttons.size());
+		const auto ensureButton = [&](int index) {
+			auto &button = buttons[index];
+			if (!button) {
+				validated[index] = false;
+				for (; checkedFrom != first; ++checkedFrom) {
+					if (buttons[checkedFrom]) {
+						button = std::move(buttons[checkedFrom]);
+						break;
+					}
+				}
+			}
+			if (!button) {
+				for (; checkedTill != last; ) {
+					--checkedTill;
+					if (buttons[checkedTill]) {
+						button = std::move(buttons[checkedTill]);
+						break;
+					}
+				}
+			}
+			if (!button) {
+				const auto delegate = &*state->delegate;
+				button = std::make_unique<GiftButton>(raw, delegate);
+			}
+			const auto raw = button.get();
+			if (validated[index]) {
+				return;
+			}
+			raw->show();
+			validated[index] = true;
+			const auto &gift = state->current->list[index];
+			raw->setDescriptor({ gift }, shownGiftId
+				? GiftButtonMode::Full
+				: GiftButtonMode::Minimal);
+			raw->setClickedCallback([=, unique = gift.info.unique] {
+				chosen(unique);
+			});
+			raw->setGeometry(QRect(QPoint(x, y), single), extend);
+			const auto isSelected = selectedCollectibleId
+				? (gift.info.unique->id == selectedCollectibleId)
+				: (gift.info.unique->id == selectedGiftId);
+			raw->toggleSelected(
+				isSelected,
+				GiftSelectionMode::Inset,
+				anim::type::instant);
+		};
+		y += rowFrom * singleh;
+		for (auto row = rowFrom; row != rowTill; ++row) {
+			for (auto col = 0; col != perRow; ++col) {
+				const auto index = row * perRow + col;
+				if (index >= count) {
+					break;
+				}
+				const auto last = !((col + 1) % perRow);
+				if (last) {
+					x = padding.left() + available - single.width();
+				}
+				ensureButton(index);
+				if (last) {
+					x = padding.left();
+					y += singleh;
+				} else {
+					x += singlew;
+				}
+			}
+		}
+		const auto till = std::min(int(buttons.size()), rowTill * perRow);
+		for (auto i = count; i < till; ++i) {
+			if (const auto button = buttons[i].get()) {
+				button->hide();
+			}
+		}
+
+		const auto find = [=](uint64 id) -> GiftButton* {
+			if (!id) {
+				return nullptr;
+			}
+			const auto count = int(state->current->list.size());
+			for (auto i = 0; i != count; ++i) {
+				const auto &gift = state->current->list[i];
+				if (gift.info.unique->id == id) {
+					return state->buttons[i].get();
+				}
+			}
+			return nullptr;
+		};
+
+		state->selected.value(
+		) | rpl::combine_previous() | rpl::on_next([=](
+				uint64 wasCollectibleId,
+				uint64 nowCollectibleId) {
+			if (wasCollectibleId) {
+				if (const auto button = find(wasCollectibleId)) {
+					button->toggleSelected(false, GiftSelectionMode::Inset);
+				}
+			}
+			if (nowCollectibleId) {
+				if (const auto button = find(nowCollectibleId)) {
+					button->toggleSelected(true, GiftSelectionMode::Inset);
+				}
+			}
+		}, raw->lifetime());
+
+		state->selectedGiftId.value(
+		) | rpl::combine_previous() | rpl::on_next([=](
+				uint64 wasGiftId,
+				uint64 nowGiftId) {
+			if (wasGiftId) {
+				if (const auto button = find(wasGiftId)) {
+					button->toggleSelected(false, GiftSelectionMode::Inset);
+				}
+			}
+			if (nowGiftId) {
+				if (const auto button = find(nowGiftId)) {
+					button->toggleSelected(true, GiftSelectionMode::Inset);
+				}
+			}
+		}, raw->lifetime());
+
+		const auto page = range.bottom - range.top;
+		if (page > 0 && range.bottom + page > raw->height()) {
+			state->loadMore();
+		}
+	};
+
+	const auto width = st::boxWideWidth;
+	const auto padding = st::giftBoxPadding;
+	const auto available = width - padding.left() - padding.right();
+	state->perRow = available / state->delegate->buttonSize().width();
+
+	state->resize = [=] {
+		const auto count = int(state->current->list.size());
+		state->validated.clear();
+
+		if (count == 0 && state->showingGiftId.current() == 0) {
+			if (!state->emptyPlaceholder) {
+				state->emptyPlaceholder = CreateEmptyPlaceholder(
+					raw,
+					width,
+					padding,
+					switchToNextTab);
+			}
+			state->emptyPlaceholder->show();
+			raw->resize(raw->width(), state->emptyPlaceholder->height());
+			return;
+		} else if (state->emptyPlaceholder) {
+			state->emptyPlaceholder = nullptr;
+		}
+
+		const auto rows = (count + state->perRow - 1) / state->perRow;
+		const auto height = padding.top()
+			+ (rows * state->delegate->buttonSize().height())
+			+ ((rows - 1) * st::giftBoxGiftSkip.y())
+			+ padding.bottom();
+		raw->resize(raw->width(), height);
+
+		state->rebuild();
+	};
+
+	state->showingGiftId.value(
+	) | rpl::on_next([=](uint64 showingId) {
+		state->current = &state->lists[showingId];
+		state->buttons.clear();
+		if (state->emptyPlaceholder) {
+			state->emptyPlaceholder = nullptr;
+		}
+		state->delegate.emplace(session, showingId
+			? GiftButtonMode::Full
+			: GiftButtonMode::Minimal);
+		state->resize();
+	}, raw->lifetime());
+
+	state->visibleRange = raw->visibleRange();
+	state->visibleRange.value(
+	) | rpl::on_next(state->rebuild, raw->lifetime());
+}
+
+Fn<void(int)> CreateTabsWidget(
+		not_null<Ui::VerticalLayout*> container,
+		const std::vector<QString> &labels,
+		const std::vector<Fn<void()>> &callbacks) {
+	const auto tabs = container->add(
+		object_ptr<Ui::PillTabs>(
+			container,
+			labels,
+			0,
+			st::giftBoxPillTabs),
+		st::boxRowPadding,
+		style::al_top);
+
+	tabs->activeIndexChanges(
+	) | rpl::on_next([=](int index) {
+		if (index >= 0 && index < int(callbacks.size()) && callbacks[index]) {
+			callbacks[index]();
+		}
+	}, tabs->lifetime());
+
+	return [=](int index) {
+		tabs->setActiveIndex(index);
+		if (index >= 0 && index < int(callbacks.size()) && callbacks[index]) {
+			callbacks[index]();
+		}
+	};
+}
+
+not_null<Info::Profile::TopBar*> CreateProfilePreview(
+		not_null<Ui::GenericBox*> box,
+		not_null<Ui::VerticalLayout*> container,
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer) {
+	const auto preview = container->add(
+		object_ptr<Info::Profile::TopBar>(
+			container,
+			Info::Profile::TopBar::Descriptor {
+				.controller = show->resolveWindow(),
+				.key = Info::Key(peer),
+				.wrap = rpl::single(Info::Wrap::Side),
+				.source = Info::Profile::TopBar::Source::Preview,
+				.peer = peer,
+				.backToggles = rpl::single(false),
+				.showFinished = box->showFinishes(),
+			}
+		));
+	preview->resize(
+		container->width(),
+		st::infoProfileTopBarNoActionsHeightMax);
+	preview->setAttribute(Qt::WA_TransparentForMouseEvents);
+	return preview;
+}
+
+void ProcessButton(not_null<Ui::RoundButton*> button) {
+	// Raise to be above right emoji from buttons.
+	crl::on_main(button, [=] { button->raise(); });
+}
+
+void CreateBoostLevelContainer(
+		not_null<Ui::VerticalLayout*> container,
+		int levelHint,
+		rpl::producer<std::optional<QColor>> colorProducer,
+		Fn<void()> callback) {
+	const auto boostLevelContainer = container->add(
+		object_ptr<Ui::RpWidget>(container));
+	boostLevelContainer->resize(
+		0,
+		st::infoProfileTopBarBoostFooter.style.font->height * 1.5);
+
+	struct State {
+		base::unique_qptr<Ui::FlatLabel> label;
+		std::optional<QColor> currentColor;
+	};
+	const auto state = boostLevelContainer->lifetime().make_state<State>();
+
+	boostLevelContainer->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(boostLevelContainer);
+		const auto bg = state->currentColor.value_or(st::boxDividerBg->c);
+		p.fillRect(boostLevelContainer->rect(), bg);
+		p.fillRect(boostLevelContainer->rect(), st::shadowFg);
+	}, boostLevelContainer->lifetime());
+
+	std::move(colorProducer) | rpl::on_next([=](
+			std::optional<QColor> color) {
+		const auto colorChanged = (state->currentColor != color)
+			|| !state->label;
+		state->currentColor = color;
+		boostLevelContainer->update();
+
+		if (colorChanged) {
+			const auto &style = color
+				? st::infoProfileTopBarBoostFooterColored
+				: st::infoProfileTopBarBoostFooter;
+			state->label = base::make_unique_q<Ui::FlatLabel>(
+				boostLevelContainer,
+				tr::lng_settings_color_group_boost_footer(
+					lt_count,
+					rpl::single(levelHint) | tr::to_count(),
+					lt_link,
+					tr::lng_settings_color_group_boost_footer_link(
+					) | rpl::map([=](QString t) {
+						using namespace Ui::Text;
+						return Link(std::move(t), u"internal:"_q);
+					}),
+					tr::rich),
+				style);
+			state->label->show();
+			boostLevelContainer->sizeValue(
+			) | rpl::on_next([=](QSize s) {
+				state->label->moveToLeft(
+					(s.width() - state->label->width()) / 2,
+					(s.height() - state->label->height()) / 2);
+			}, state->label->lifetime());
+			state->label->setClickHandlerFilter([=](auto...) {
+				callback();
+				return false;
+			});
+		}
+	}, boostLevelContainer->lifetime());
+}
+
 } // namespace
 
 void AddLevelBadge(
@@ -1153,7 +1636,7 @@ void AddLevelBadge(
 	rpl::combine(
 		button->sizeValue(),
 		std::move(text)
-	) | rpl::start_with_next([=](const QSize &s, const QString &) {
+	) | rpl::on_next([=](const QSize &s, const QString &) {
 		if (s.isNull()) {
 			return;
 		}
@@ -1166,62 +1649,215 @@ void AddLevelBadge(
 	}, badge->lifetime());
 }
 
-void EditPeerColorBox(
+struct ColorSectionHighlights {
+	QPointer<Ui::SettingsButton> emojiButton;
+	QPointer<Ui::SettingsButton> resetButton;
+	QPointer<Ui::SubTabs> giftTabs;
+};
+
+void EditPeerColorSection(
 		not_null<Ui::GenericBox*> box,
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Ui::RoundButton*> button,
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<PeerData*> peer,
 		std::shared_ptr<Ui::ChatStyle> style,
-		std::shared_ptr<Ui::ChatTheme> theme) {
+		std::shared_ptr<Ui::ChatTheme> theme,
+		ColorSectionHighlights *highlights) {
+	ProcessButton(button);
 	const auto group = peer->isMegagroup();
-	const auto container = box->verticalLayout();
-
-	box->setTitle(peer->isSelf()
-		? tr::lng_settings_color_title()
-		: tr::lng_edit_channel_color());
-	box->setWidth(st::boxWideWidth);
 
 	struct State {
 		rpl::variable<uint8> index;
 		rpl::variable<DocumentId> emojiId;
-		rpl::variable<DocumentId> statusId;
+		rpl::variable<EmojiStatusId> statusId;
+		rpl::variable<std::optional<Ui::ColorCollectible>> collectible;
+		rpl::variable<uint64> showingGiftId;
+		rpl::variable<uint8> profileIndex;
+		rpl::variable<DocumentId> profileEmojiId;
+		std::shared_ptr<Data::UniqueGift> buyCollectible;
+		Info::Profile::TopBar *preview = nullptr;
 		TimeId statusUntil = 0;
 		bool statusChanged = false;
 		bool changing = false;
 		bool applying = false;
 	};
-	const auto state = box->lifetime().make_state<State>();
-	state->index = peer->colorIndex();
+	const auto state = button->lifetime().make_state<State>();
+	state->index = peer->colorCollectible()
+		? kUnsetColorIndex
+		: peer->colorIndex();
 	state->emojiId = peer->backgroundEmojiId();
 	state->statusId = peer->emojiStatusId();
-	if (group) {
-		Settings::AddDividerTextWithLottie(box->verticalLayout(), {
-			.lottie = u"palette"_q,
-			.lottieSize = st::settingsCloudPasswordIconSize,
-			.lottieMargins = st::peerAppearanceIconPadding,
-			.showFinished = box->showFinishes(),
-			.about = tr::lng_boost_group_about(Ui::Text::WithEntities),
-			.aboutMargins = st::peerAppearanceCoverLabelMargin,
+	state->collectible = peer->colorCollectible()
+		? *peer->colorCollectible()
+		: std::optional<Ui::ColorCollectible>();
+	state->profileIndex = peer->colorProfileIndex().value_or(
+		kUnsetColorIndex);
+	state->profileEmojiId = peer->profileBackgroundEmojiId();
+
+	const auto appendProfileSettings = [=](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<ChannelData*> channel) {
+		state->preview = CreateProfilePreview(box, container, show, peer);
+		if (state->profileIndex.current() != kUnsetColorIndex) {
+			state->preview->setColorProfileIndex(
+				state->profileIndex.current());
+		}
+		if (state->profileEmojiId.current()) {
+			state->preview->setPatternEmojiId(
+				state->profileEmojiId.current());
+		}
+		state->statusId.value() | rpl::on_next([=](EmojiStatusId id) {
+			state->preview->setLocalEmojiStatusId(std::move(id));
+		}, state->preview->lifetime());
+		const auto peerColors = &peer->session().api().peerColors();
+		const auto profileIndices = peerColors->profileColorIndices();
+
+		if (group) {
+			auto colorProducer = state->profileIndex.value(
+			) | rpl::map([=, colors = &peer->session().api().peerColors()](
+					uint8 index) {
+				const auto colorSet = colors->colorProfileFor(index);
+				return (colorSet && !colorSet->bg.empty())
+					? std::make_optional(colorSet->bg.front())
+					: std::optional<QColor>();
+			});
+			CreateBoostLevelContainer(
+				container,
+				channel->levelHint(),
+				std::move(colorProducer),
+				[=] {
+					if (const auto strong = show->resolveWindow()) {
+						strong->resolveBoostState(channel);
+					}
+				});
+		}
+
+		const auto profileMargin = st::settingsColorRadioMargin;
+		const auto profileSkip = st::settingsColorRadioSkip;
+		const auto selector = container->add(
+			object_ptr<Ui::ColorSelector>(
+				container,
+				profileIndices,
+				state->profileIndex.current(),
+				[=](uint8 index) {
+					state->profileIndex = index;
+					if (state->preview) {
+						state->preview->setColorProfileIndex(
+							index == kUnsetColorIndex
+								? std::nullopt
+								: std::make_optional(index));
+					}
+				},
+				[=](uint8 index) {
+					return peerColors->colorProfileFor(index).value_or(
+						Data::ColorProfileSet{});
+				}),
+			{ profileMargin, profileSkip, profileMargin, profileSkip });
+
+		container->add(CreateEmojiIconButton(
+			container,
+			show,
+			style,
+			peer,
+			state->profileIndex.value(),
+			state->profileEmojiId.value(),
+			[=](DocumentId id) {
+				state->profileEmojiId = id;
+				if (state->preview) {
+					state->preview->setPatternEmojiId(id);
+				}
+			},
+			true));
+
+		state->profileIndex.value(
+		) | rpl::on_next([=](uint8 index) {
+			selector->updateSelection(index);
+		}, selector->lifetime());
+
+		Ui::AddSkip(container, st::settingsColorSampleSkip);
+
+		const auto resetWrap = container->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				container,
+				object_ptr<Ui::VerticalLayout>(container)));
+		const auto resetInner = resetWrap->entity();
+		const auto resetButton = resetInner->add(
+			object_ptr<Ui::SettingsButton>(
+				resetInner,
+				tr::lng_settings_color_reset(),
+				st::settingsButtonLightNoIcon));
+		Ui::AddSkip(resetInner, st::settingsColorSampleSkip);
+		resetButton->setClickedCallback([=] {
+			state->profileIndex = kUnsetColorIndex;
+			state->profileEmojiId = 0;
+			if (state->preview) {
+				state->preview->setColorProfileIndex(std::nullopt);
+				state->preview->setPatternEmojiId(0);
+			}
+			resetWrap->toggle(false, anim::type::normal);
 		});
+
+		resetWrap->toggleOn(state->profileIndex.value(
+		) | rpl::map(rpl::mappers::_1 != kUnsetColorIndex));
+		resetWrap->finishAnimating();
+
+		Ui::AddDividerText(
+			container,
+			group
+				? tr::lng_settings_color_choose_group()
+				: tr::lng_settings_color_choose_channel());
+		Ui::AddSkip(container, st::settingsColorSampleSkip);
+
+		container->add(CreateEmojiStatusButton(
+			container,
+			show,
+			channel,
+			state->statusId.value(),
+			[=](EmojiStatusId id, TimeId until) {
+				state->statusId = id;
+				state->statusUntil = until;
+				state->statusChanged = true;
+			},
+			group));
+		Ui::AddSkip(container, st::settingsColorSampleSkip);
+		Ui::AddDividerText(
+			container,
+			(group
+				? tr::lng_edit_channel_status_about_group()
+				: tr::lng_edit_channel_status_about()),
+			st::peerAppearanceDividerTextMargin);
+	};
+
+	if (group) {
+		appendProfileSettings(container, peer->asChannel());
 	} else {
-		box->addRow(object_ptr<PreviewWrap>(
+		container->add(object_ptr<PreviewWrap>(
 			box,
 			style,
 			theme,
 			peer,
 			state->index.value(),
-			state->emojiId.value()
-		), {});
+			state->emojiId.value(),
+			state->collectible.value()));
 
 		auto indices = peer->session().api().peerColors().suggestedValue();
 		const auto margin = st::settingsColorRadioMargin;
 		const auto skip = st::settingsColorRadioSkip;
-		box->addRow(
-			object_ptr<ColorSelector>(
-				box,
+		container->add(
+			object_ptr<Ui::ColorSelector>(
+				container,
 				style,
 				std::move(indices),
-				state->index.current(),
-				[=](uint8 index) { state->index = index; }),
+				state->index.value(),
+				[=](uint8 index) {
+					if (state->collectible.current()) {
+						state->buyCollectible = nullptr;
+						state->collectible = std::nullopt;
+						state->emojiId = 0;
+					}
+					state->index = index;
+				}),
 			{ margin, skip, margin, skip });
 
 		Ui::AddDividerText(
@@ -1231,24 +1867,39 @@ void EditPeerColorBox(
 				: tr::lng_settings_color_about_channel()),
 			st::peerAppearanceDividerTextMargin);
 
-		Ui::AddSkip(container, st::settingsColorSampleSkip);
+		const auto iconWrap = container->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				container,
+				object_ptr<Ui::VerticalLayout>(container)));
+		const auto iconInner = iconWrap->entity();
 
-		container->add(CreateEmojiIconButton(
-			container,
+		Ui::AddSkip(iconInner, st::settingsColorSampleSkip);
+		const auto emojiButton = iconInner->add(CreateEmojiIconButton(
+			iconInner,
 			show,
 			style,
 			peer,
 			state->index.value(),
 			state->emojiId.value(),
-			[=](DocumentId id) { state->emojiId = id; }));
+			[=](DocumentId id) { state->emojiId = id; },
+			false));
+		if (highlights) {
+			highlights->emojiButton = emojiButton;
+		}
 
-		Ui::AddSkip(container, st::settingsColorSampleSkip);
+		Ui::AddSkip(iconInner, st::settingsColorSampleSkip);
 		Ui::AddDividerText(
-			container,
+			iconInner,
 			(peer->isSelf()
 				? tr::lng_settings_color_emoji_about()
 				: tr::lng_settings_color_emoji_about_channel()),
 			st::peerAppearanceDividerTextMargin);
+
+		iconWrap->toggleOn(state->collectible.value(
+		) | rpl::map([](const std::optional<Ui::ColorCollectible> &value) {
+			return !value.has_value();
+		}));
+		iconWrap->finishAnimating();
 	}
 
 	if (const auto channel = peer->asChannel()) {
@@ -1263,8 +1914,7 @@ void EditPeerColorBox(
 			{ &st::menuBlueIconWallpaper }
 		);
 		button->setClickedCallback([=] {
-			const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
-			if (const auto strong = show->resolveWindow(usage)) {
+			if (const auto strong = show->resolveWindow()) {
 				show->show(Box<BackgroundBox>(strong, channel));
 			}
 		});
@@ -1315,48 +1965,569 @@ void EditPeerColorBox(
 		statuses->refreshChannelDefault();
 		statuses->refreshChannelColored();
 
+		if (!state->preview) {
+			Ui::AddSkip(container);
+			appendProfileSettings(container, channel);
+		}
+	} else if (peer->isSelf()) {
 		Ui::AddSkip(container, st::settingsColorSampleSkip);
-		container->add(CreateEmojiStatusButton(
+
+		const auto session = &peer->session();
+		const auto giftTabs = AddColorGiftTabs(
 			container,
-			show,
-			channel,
-			state->statusId.value(),
-			[=](DocumentId id, TimeId until) {
-				state->statusId = id;
-				state->statusUntil = until;
-				state->statusChanged = true;
-			},
-			group));
+			session,
+			[=](uint64 giftId) { state->showingGiftId = giftId; },
+			false);
+		if (highlights) {
+			highlights->giftTabs = giftTabs.tabs;
+		}
 
-		Ui::AddSkip(container, st::settingsColorSampleSkip);
-		Ui::AddDividerText(
+		auto showingGiftId = state->showingGiftId.value();
+		AddGiftSelector(
 			container,
-			(group
-				? tr::lng_edit_channel_status_about_group()
-				: tr::lng_edit_channel_status_about()),
-			st::peerAppearanceDividerTextMargin);
+			session,
+			std::move(showingGiftId),
+			[=](std::shared_ptr<Data::UniqueGift> selected) {
+				state->index = selected->peerColor ? kUnsetColorIndex : 0;
+				state->emojiId = selected->peerColor
+					? selected->peerColor->backgroundEmojiId
+					: 0;
+				state->buyCollectible = (selected->peerColor
+					&& (selected->ownerId != session->userPeerId())
+					&& selected->starsForResale > 0)
+					? selected
+					: nullptr;
+				state->collectible = selected->peerColor
+					? *selected->peerColor
+					: std::optional<Ui::ColorCollectible>();
+			},
+			state->collectible.value() | rpl::map([](
+					const std::optional<Ui::ColorCollectible> &value) {
+				return value ? value->collectibleId : 0;
+			}),
+			false,
+			rpl::single(uint64(0)),
+			giftTabs.switchToNext);
 	}
 
-	box->addButton(tr::lng_settings_apply(), [=] {
+	button->setClickedCallback([=] {
 		if (state->applying) {
 			return;
+		} else if (ShowPremiumPreview(show, peer)) {
+			return;
 		}
-		state->applying = true;
-		Apply(show, peer, {
+		const auto values = SetValues{
 			state->index.current(),
 			state->emojiId.current(),
+			state->collectible.current(),
 			state->statusId.current(),
 			state->statusUntil,
 			state->statusChanged,
-		}, crl::guard(box, [=] {
+		};
+		const auto profileValues = SetValues{
+			.colorIndex = state->profileIndex.current(),
+			.backgroundEmojiId = state->profileEmojiId.current(),
+			.colorCollectible = state->collectible.current(),
+			.statusId = {},
+			.statusUntil = 0,
+			.statusChanged = false,
+			.forProfile = true,
+		};
+		if (const auto buy = state->buyCollectible) {
+			const auto done = [=, weak = base::make_weak(box)](bool ok) {
+				if (ok) {
+					if (const auto strong = weak.get()) {
+						strong->closeBox();
+					}
+					Apply(show, peer, values, [] {}, [] {});
+				}
+			};
+			const auto to = peer->session().user();
+			ShowBuyResaleGiftBox(show, buy, false, to, done);
+			return;
+		}
+		state->applying = true;
+		if (peer->isChannel()) {
+			// First request: regular color data (without toast)
+			Apply(show, peer, values, [=] {
+				// Second request: profile color data (with toast)
+				Apply(show, peer, profileValues, crl::guard(box, [=] {
+					box->closeBox();
+				}), crl::guard(box, [=] {
+					state->applying = false;
+				}), true);
+			}, crl::guard(box, [=] {
+				state->applying = false;
+			}), false);
+			return;
+		}
+		Apply(show, peer, values, crl::guard(box, [=] {
 			box->closeBox();
 		}), crl::guard(box, [=] {
 			state->applying = false;
 		}));
 	});
-	box->addButton(tr::lng_cancel(), [=] {
+	state->collectible.value(
+	) | rpl::on_next([=] {
+		const auto buy = state->buyCollectible.get();
+		while (!button->children().isEmpty()) {
+			delete button->children().first();
+		}
+		if (!buy) {
+			button->setText(rpl::combine(
+				tr::lng_settings_color_apply(),
+				Data::AmPremiumValue(&peer->session())
+			) | rpl::map([=](const QString &text, bool premium) {
+				auto result = TextWithEntities();
+				if (!premium && peer->isSelf()) {
+					result.append(Ui::Text::IconEmoji(&st::giftBoxLock));
+				}
+				result.append(text);
+				return result;
+			}));
+		} else if (buy->onlyAcceptTon) {
+			button->setText(rpl::single(QString()));
+			Ui::SetButtonTwoLabels(
+				button,
+				tr::lng_gift_buy_resale_button(
+					lt_cost,
+					rpl::single(Data::FormatGiftResaleTon(*buy)),
+					tr::marked),
+				tr::lng_gift_buy_resale_equals(
+					lt_cost,
+					rpl::single(Ui::Text::IconEmoji(
+						&st::starIconEmojiSmall
+					).append(Lang::FormatCountDecimal(buy->starsForResale))),
+					tr::marked),
+				st::resaleButtonTitle,
+				st::resaleButtonSubtitle);
+		} else {
+			button->setText(tr::lng_gift_buy_resale_button(
+				lt_cost,
+				rpl::single(Ui::Text::IconEmoji(&st::starIconEmoji).append(
+					Lang::FormatCountDecimal(buy->starsForResale))),
+				tr::marked));
+		}
+	}, button->lifetime());
+}
+
+void EditPeerProfileColorSection(
+		not_null<Ui::GenericBox*> box,
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Ui::RoundButton*> button,
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer,
+		std::shared_ptr<Ui::ChatStyle> style,
+		std::shared_ptr<Ui::ChatTheme> theme,
+		Fn<void()> aboutCallback,
+		ColorSectionHighlights *highlights) {
+	Expects(peer->isSelf());
+
+	ProcessButton(button);
+
+	const auto preview = CreateProfilePreview(box, container, show, peer);
+
+	const auto peerColors = &peer->session().api().peerColors();
+	const auto indices = peerColors->profileColorIndices();
+
+	struct State {
+		rpl::variable<uint8> index = kUnsetColorIndex;
+		rpl::variable<DocumentId> patternEmojiId;
+		rpl::variable<EmojiStatusId> wearable;
+		rpl::variable<uint64> showingGiftId;
+		rpl::variable<uint64> selectedGiftId;
+		std::shared_ptr<Data::UniqueGift> buyCollectible;
+		Ui::ColorSelector *selector = nullptr;
+	};
+	const auto state = button->lifetime().make_state<State>();
+	state->patternEmojiId = peer->profileBackgroundEmojiId();
+	state->wearable = peer->emojiStatusId();
+
+	const auto resetUnique = [=] {
+		preview->setLocalEmojiStatusId({});
+		state->buyCollectible = nullptr;
+		state->wearable = {};
+	};
+
+	const auto setIndex = [=](uint8 index) {
+		state->index = index;
+		if (index != kUnsetColorIndex) {
+			resetUnique();
+		}
+		preview->setColorProfileIndex(index == kUnsetColorIndex
+			? std::nullopt
+			: std::make_optional(index));
+		preview->setPatternEmojiId(index == kUnsetColorIndex
+			? std::nullopt
+			: std::make_optional(state->patternEmojiId.current()));
+	};
+	setIndex(peer->emojiStatusId().collectible
+		? kUnsetColorIndex
+		: peer->colorProfileIndex().value_or(kUnsetColorIndex));
+
+	const auto margin = st::settingsColorRadioMargin;
+	const auto skip = st::settingsColorRadioSkip;
+	state->selector = container->add(
+		object_ptr<Ui::ColorSelector>(
+			box,
+			indices,
+			state->index.current(),
+			setIndex,
+			[=](uint8 index) {
+				return peerColors->colorProfileFor(index).value_or(
+					Data::ColorProfileSet{});
+			}),
+		{ margin, skip, margin, skip });
+
+	Ui::AddSkip(container, st::settingsColorSampleSkip);
+	const auto emojiButton = container->add(CreateEmojiIconButton(
+		container,
+		show,
+		style,
+		peer,
+		state->index.value(),
+		state->patternEmojiId.value(),
+		[=](DocumentId id) {
+			state->patternEmojiId = id;
+			preview->setPatternEmojiId(id);
+			resetUnique();
+		},
+		true));
+	if (highlights) {
+		highlights->emojiButton = emojiButton;
+	}
+
+	const auto resetWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto resetInner = resetWrap->entity();
+
+	Ui::AddSkip(resetInner, st::settingsColorSampleSkip);
+	const auto resetButton = resetInner->add(
+		object_ptr<Ui::SettingsButton>(
+			resetInner,
+			tr::lng_settings_color_reset(),
+			st::settingsButtonLightNoIcon));
+	if (highlights) {
+		highlights->resetButton = resetButton;
+	}
+	resetButton->setClickedCallback([=] {
+		state->index = kUnsetColorIndex;
+		state->patternEmojiId = 0;
+		preview->setColorProfileIndex(std::nullopt);
+		preview->setPatternEmojiId(0);
+		resetUnique();
+		resetWrap->toggle(false, anim::type::normal);
+	});
+
+	resetWrap->toggleOn(state->index.value(
+	) | rpl::map([](uint8 index) { return index != kUnsetColorIndex; }));
+	resetWrap->finishAnimating();
+
+	Ui::AddSkip(container, st::settingsColorSampleSkip);
+	const auto about = Ui::AddDividerText(
+		container,
+		tr::lng_settings_color_profile_about(
+			lt_link,
+			tr::lng_settings_color_profile_about_link(
+				lt_emoji,
+				rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+				tr::rich
+			) | rpl::map([=](TextWithEntities t) {
+				return tr::link(std::move(t), u"internal:"_q);
+			}),
+			tr::rich));
+	Ui::AddSkip(container, st::settingsColorSampleSkip);
+	about->setClickHandlerFilter([=](auto...) {
+		aboutCallback();
+		return false;
+	});
+
+	state->index.value(
+	) | rpl::on_next([=](uint8 index) {
+		if (state->selector) {
+			state->selector->updateSelection(index);
+		}
+	}, button->lifetime());
+
+	if (peer->isSelf()) {
+		Ui::AddSkip(container, st::settingsColorSampleSkip);
+
+		const auto session = &peer->session();
+		const auto giftTabs = AddColorGiftTabs(
+			container,
+			session,
+			[=](uint64 giftId) { state->showingGiftId = giftId; },
+			true);
+		if (highlights) {
+			highlights->giftTabs = giftTabs.tabs;
+		}
+
+		auto showingGiftId = state->showingGiftId.value();
+		AddGiftSelector(
+			container,
+			session,
+			std::move(showingGiftId),
+			[=](std::shared_ptr<Data::UniqueGift> selected) {
+				state->selectedGiftId = selected->id;
+				state->index = kUnsetColorIndex;
+				state->patternEmojiId = 0;
+				state->buyCollectible = (selected->peerColor
+					&& (selected->ownerId != session->userPeerId())
+					&& selected->starsForResale > 0)
+					? selected
+					: nullptr;
+				const auto statuses = &peer->owner().emojiStatuses();
+				state->wearable = statuses->fromUniqueGift(*selected);
+				preview->setColorProfileIndex(std::nullopt);
+				preview->setPatternEmojiId(selected->pattern.document->id);
+				preview->setLocalEmojiStatusId(state->wearable.current());
+				resetWrap->toggle(true, anim::type::normal);
+			},
+			state->wearable.value() | rpl::map([=](const EmojiStatusId &value) {
+				return value.collectible ? value.collectible->id : 0;
+			}),
+			true,
+			state->selectedGiftId.value(),
+			giftTabs.switchToNext);
+	}
+
+	struct ProfileState {
+		bool applying = false;
+	};
+	const auto profileState = button->lifetime().make_state<ProfileState>();
+
+	button->setClickedCallback([=] {
+		if (profileState->applying) {
+			return;
+		} else if (ShowPremiumPreview(show, peer)) {
+			return;
+		}
+		const auto statusId = peer->emojiStatusId();
+		const auto wearable = state->wearable.current();
+		const auto statusChanged = wearable.collectible
+			? (!statusId.collectible
+				|| statusId.collectible->id != wearable.collectible->id)
+			: (statusId.collectible != nullptr);
+		const auto values = SetValues{
+			.colorIndex = state->index.current(),
+			.backgroundEmojiId = state->patternEmojiId.current(),
+			.colorCollectible = std::nullopt,
+			.statusId = state->wearable.current(),
+			.statusUntil = 0,
+			.statusChanged = statusChanged,
+			.forProfile = true,
+		};
+		if (const auto buy = state->buyCollectible) {
+			const auto done = [=, weak = base::make_weak(box)](bool ok) {
+				if (ok) {
+					if (const auto strong = weak.get()) {
+						strong->closeBox();
+					}
+					Apply(show, peer, values, [] {}, [] {});
+				}
+			};
+			const auto to = peer->session().user();
+			ShowBuyResaleGiftBox(show, buy, false, to, done);
+			return;
+		}
+		profileState->applying = true;
+		Apply(show, peer, values, crl::guard(box, [=] {
+			box->closeBox();
+		}), crl::guard(box, [=] {
+			profileState->applying = false;
+		}));
+	});
+	state->wearable.value(
+	) | rpl::on_next([=](EmojiStatusId id) {
+		const auto buy = state->buyCollectible.get();
+		while (!button->children().isEmpty()) {
+			delete button->children().first();
+		}
+		if (!buy) {
+			button->setText(rpl::combine(
+				(id.collectible
+					? tr::lng_settings_color_wear()
+					: tr::lng_settings_color_apply()),
+				Data::AmPremiumValue(&peer->session())
+			) | rpl::map([=](const QString &text, bool premium) {
+				auto result = TextWithEntities();
+				if (!premium && peer->isSelf()) {
+					result.append(Ui::Text::IconEmoji(&st::giftBoxLock));
+				}
+				result.append(text);
+				return result;
+			}));
+		} else if (buy->onlyAcceptTon) {
+			button->setText(rpl::single(QString()));
+			Ui::SetButtonTwoLabels(
+				button,
+				tr::lng_gift_buy_resale_button(
+					lt_cost,
+					rpl::single(Data::FormatGiftResaleTon(*buy)),
+					tr::marked),
+				tr::lng_gift_buy_resale_equals(
+					lt_cost,
+					rpl::single(Ui::Text::IconEmoji(
+						&st::starIconEmojiSmall
+					).append(Lang::FormatCountDecimal(buy->starsForResale))),
+					tr::marked),
+				st::resaleButtonTitle,
+				st::resaleButtonSubtitle);
+		} else {
+			button->setText(tr::lng_gift_buy_resale_button(
+				lt_cost,
+				rpl::single(Ui::Text::IconEmoji(&st::starIconEmoji).append(
+					Lang::FormatCountDecimal(buy->starsForResale))),
+				tr::marked));
+		}
+	}, button->lifetime());
+}
+
+void EditPeerColorBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		std::shared_ptr<Ui::ChatStyle> style,
+		std::shared_ptr<Ui::ChatTheme> theme,
+		PeerColorTab initialTab) {
+	const auto show = controller->uiShow();
+	if (!style) {
+		style = std::make_shared<Ui::ChatStyle>(
+			peer->session().colorIndicesValue());
+	}
+	if (!theme) {
+		theme = std::shared_ptr<Ui::ChatTheme>(
+			Window::Theme::DefaultChatThemeOn(box->lifetime()));
+		style->apply(theme.get());
+	}
+	box->setTitle(peer->isSelf()
+		? tr::lng_settings_color_title()
+		: tr::lng_edit_channel_color());
+	box->setWidth(st::boxWideWidth);
+	box->setStyle(st::giftBox);
+	box->addTopButton(st::boxTitleClose, [=] {
 		box->closeBox();
 	});
+	if (peer->isChannel()) {
+		const auto button = box->addButton(
+			tr::lng_settings_color_apply(),
+			[] {});
+		EditPeerColorSection(box, box->verticalLayout(), button, show, peer, style, theme, nullptr);
+		return;
+	}
+	const auto buttonContainer = box->addButton(
+		rpl::single(QString()),
+		[] {});
+	const auto content = box->verticalLayout();
+
+	const auto profileButton = Ui::CreateChild<Ui::RoundButton>(
+		buttonContainer,
+		tr::lng_settings_color_apply(),
+		box->getDelegate()->style().button);
+	profileButton->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
+	const auto nameButton = Ui::CreateChild<Ui::RoundButton>(
+		buttonContainer,
+		tr::lng_settings_color_apply(),
+		box->getDelegate()->style().button);
+	nameButton->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
+	rpl::combine(
+		buttonContainer->widthValue(),
+		profileButton->sizeValue(),
+		nameButton->sizeValue()
+	) | rpl::on_next([=](int w, QSize, QSize) {
+		profileButton->resizeToWidth(w);
+		nameButton->resizeToWidth(w);
+	}, buttonContainer->lifetime());
+
+	auto nameOwned = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		content,
+		object_ptr<Ui::VerticalLayout>(content));
+	auto profileOwned = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		content,
+		object_ptr<Ui::VerticalLayout>(content));
+	const auto nameWrap = nameOwned.get();
+	const auto profileWrap = profileOwned.get();
+	const auto name = nameWrap->entity();
+	const auto profile = profileWrap->entity();
+
+	const auto showName = [=] {
+		nameWrap->toggle(true, anim::type::instant);
+		profileWrap->toggle(false, anim::type::instant);
+		profileButton->hide();
+		nameButton->show();
+	};
+
+	const auto switchTab = CreateTabsWidget(
+		content,
+		{
+			tr::lng_settings_color_tab_profile(tr::now),
+			tr::lng_settings_color_tab_name(tr::now),
+		},
+		{
+			[=] {
+				nameWrap->toggle(false, anim::type::instant);
+				profileWrap->toggle(true, anim::type::instant);
+				nameButton->hide();
+				profileButton->show();
+			},
+			showName,
+		});
+
+	Ui::AddSkip(content);
+	nameWrap->toggle(false, anim::type::instant);
+	profileWrap->toggle(true, anim::type::instant);
+	nameButton->hide();
+	content->add(std::move(profileOwned));
+	content->add(std::move(nameOwned));
+
+	struct HighlightState {
+		ColorSectionHighlights profile;
+		ColorSectionHighlights name;
+	};
+	const auto highlightState = box->lifetime().make_state<HighlightState>();
+
+	EditPeerProfileColorSection(
+		box,
+		profile,
+		profileButton,
+		show,
+		peer,
+		style,
+		theme,
+		[=] { switchTab(1); },
+		&highlightState->profile);
+
+	EditPeerColorSection(
+		box,
+		name,
+		nameButton,
+		show,
+		peer,
+		style,
+		theme,
+		&highlightState->name);
+
+	if (initialTab == PeerColorTab::Name) {
+		switchTab(1);
+	}
+
+	box->setShowFinishedCallback([=] {
+		const auto isProfileTab = (initialTab == PeerColorTab::Profile);
+		const auto &highlights = isProfileTab
+			? highlightState->profile
+			: highlightState->name;
+		controller->checkHighlightControl(
+			u"profile-color/add-icons"_q,
+			highlights.emojiButton.data());
+		controller->checkHighlightControl(
+			u"profile-color/use-gift"_q,
+			highlights.giftTabs.data());
+		controller->checkHighlightControl(
+			u"profile-color/reset"_q,
+			highlights.resetButton.data());
+	});
 }
 
 void SetupPeerColorSample(
@@ -1370,30 +2541,117 @@ void SetupPeerColorSample(
 	) | rpl::map([=] {
 		return peer->colorIndex();
 	});
-	const auto name = peer->shortName();
+	auto colorCollectibleValue = peer->session().changes().peerFlagsValue(
+		peer,
+		Data::PeerUpdate::Flag::Color
+	) | rpl::map([=] {
+		return peer->colorCollectible();
+	});
+	auto colorProfileIndexValue = peer->session().changes().peerFlagsValue(
+		peer,
+		Data::PeerUpdate::Flag::ColorProfile
+	) | rpl::map([=] {
+		return peer->colorProfileIndex();
+	});
+	auto emojiStatusIdValue = peer->session().changes().peerFlagsValue(
+		peer,
+		Data::PeerUpdate::Flag::EmojiStatus
+	) | rpl::map([=] {
+		return peer->emojiStatusId();
+	});
+	auto name = peer->session().changes().peerFlagsValue(
+		peer,
+		Data::PeerUpdate::Flag::Name
+	) | rpl::map([=] { return peer->shortName(); });
+
+	const auto sampleSize = st::settingsColorSampleSize;
 
-	const auto sample = Ui::CreateChild<ColorSample>(
+	const auto sample = Ui::CreateChild<Ui::ColorSample>(
 		button.get(),
+		[=] { return Core::TextContext({ .session = &peer->session() }); },
+		[=](auto id) { return Data::SingleCustomEmoji(id); },
 		style,
 		rpl::duplicate(colorIndexValue),
-		name);
+		rpl::duplicate(colorCollectibleValue),
+		rpl::duplicate(name));
 	sample->show();
 
+	struct ProfileSampleState {
+		Data::ColorProfileSet colorSet;
+	};
+	const auto profileState
+		= button->lifetime().make_state<ProfileSampleState>();
+
+	const auto profileSample = Ui::CreateChild<Ui::ColorSample>(
+		button.get(),
+		[=](uint8 index) { return profileState->colorSet; },
+		0,
+		false);
+	profileSample->hide();
+	profileSample->resize(sampleSize, sampleSize);
+
+	const auto emojiStatusWidget = Ui::CreateChild<Ui::RpWidget>(
+		button.get());
+	emojiStatusWidget->hide();
+	emojiStatusWidget->resize(sampleSize, sampleSize);
+	button->lifetime().make_state<std::unique_ptr<Ui::Text::CustomEmoji>>();
+
+	struct EmojiStatusState {
+		std::unique_ptr<Ui::Text::CustomEmoji> emoji;
+	};
+	const auto emojiState = button->lifetime().make_state<EmojiStatusState>();
+
 	rpl::combine(
 		button->widthValue(),
 		rpl::duplicate(label),
-		rpl::duplicate(colorIndexValue)
-	) | rpl::start_with_next([=](
+		rpl::duplicate(colorIndexValue),
+		rpl::duplicate(colorProfileIndexValue),
+		rpl::duplicate(emojiStatusIdValue),
+		rpl::duplicate(name)
+	) | rpl::on_next([=](
 			int width,
-			const QString &button,
-			int colorIndex) {
-		const auto sampleSize = st::settingsColorSampleSize;
+			const QString &buttonText,
+			int colorIndex,
+			std::optional<uint8> profileIndex,
+			EmojiStatusId emojiStatusId,
+			const QString &name) {
 		const auto available = width
 			- st::settingsButton.padding.left()
 			- (st::settingsColorButton.padding.right() - sampleSize)
-			- st::settingsButton.style.font->width(button)
+			- st::settingsButton.style.font->width(buttonText)
 			- st::settingsButtonRightSkip;
-		if (style->colorPatternIndex(colorIndex)) {
+
+		const auto hasEmojiStatus = emojiStatusId
+			&& emojiStatusId.collectible;
+		const auto hasProfile = profileIndex.has_value() || hasEmojiStatus;
+
+		if (hasEmojiStatus && emojiStatusId.collectible) {
+			const auto color = emojiStatusId.collectible->centerColor;
+			profileState->colorSet.palette = { color };
+			profileState->colorSet.bg = { color };
+			profileState->colorSet.story = { color };
+		} else if (hasProfile) {
+			const auto peerColors = &peer->session().api().peerColors();
+			profileState->colorSet
+				= peerColors->colorProfileFor(peer).value_or(
+					Data::ColorProfileSet{});
+		}
+
+		profileSample->setVisible(hasProfile);
+		emojiStatusWidget->setVisible(hasEmojiStatus);
+
+		if (hasEmojiStatus && !emojiState->emoji) {
+			emojiState->emoji
+				= peer->session().data().customEmojiManager().create(
+					Data::EmojiStatusCustomId(emojiStatusId),
+					[raw = emojiStatusWidget] { raw->update(); },
+					Data::CustomEmojiSizeTag::Normal);
+		} else if (!hasEmojiStatus) {
+			emojiState->emoji = nullptr;
+		}
+
+		sample->setForceCircle(hasProfile);
+		if (style->colorPatternIndex(colorIndex) || hasProfile) {
 			sample->resize(sampleSize, sampleSize);
 		} else {
 			const auto padding = st::settingsColorSamplePadding;
@@ -1404,13 +2662,27 @@ void SetupPeerColorSample(
 			sample->resize(std::min(wantedWidth, available), wantedHeight);
 		}
 		sample->update();
+		sample->setCutoutPadding(hasProfile
+			? st::settingsColorSampleCutout
+			: 0);
+		profileSample->update();
+		emojiStatusWidget->update();
 	}, sample->lifetime());
 
 	rpl::combine(
 		button->sizeValue(),
 		sample->sizeValue(),
-		std::move(colorIndexValue)
-	) | rpl::start_with_next([=](QSize outer, QSize inner, int colorIndex) {
+		rpl::duplicate(colorIndexValue),
+		rpl::duplicate(colorProfileIndexValue),
+		rpl::duplicate(emojiStatusIdValue)
+	) | rpl::on_next([=](
+			QSize outer,
+			QSize inner,
+			int colorIndex,
+			std::optional<uint8> profileIndex,
+			EmojiStatusId emojiStatusId) {
+		const auto hasColor = (colorIndex != 0);
+
 		const auto right = st::settingsColorButton.padding.right()
 			- st::settingsColorSampleSkip
 			- st::settingsColorSampleSize
@@ -1420,12 +2692,37 @@ void SetupPeerColorSample(
 		sample->move(
 			outer.width() - right - inner.width(),
 			(outer.height() - inner.height()) / 2);
+		const auto profilePos = sample->pos()
+			+ (hasColor
+				? QPoint(st::settingsColorProfileSampleShift
+					- st::settingsColorSampleSize
+					- st::lineWidth, 0)
+				: QPoint());
+		profileSample->move(profilePos);
+		emojiStatusWidget->move(profilePos);
 	}, sample->lifetime());
 
+	constexpr auto kScale = 0.7;
+	emojiStatusWidget->paintOn([=](QPainter &p) {
+		if (!emojiState->emoji) {
+			return;
+		}
+		const auto size = emojiStatusWidget->size();
+		const auto offset = (size * (1.0 - kScale)) / 2.0;
+		p.translate(offset.width(), offset.height());
+		p.scale(kScale, kScale);
+		emojiState->emoji->paint(p, {
+			.textColor = st::windowFg->c,
+			.now = crl::now(),
+		});
+	});
+
 	sample->setAttribute(Qt::WA_TransparentForMouseEvents);
+	profileSample->setAttribute(Qt::WA_TransparentForMouseEvents);
+	emojiStatusWidget->setAttribute(Qt::WA_TransparentForMouseEvents);
 }
 
-void AddPeerColorButton(
+not_null<Ui::SettingsButton*> AddPeerColorButton(
 		not_null<Ui::VerticalLayout*> container,
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<PeerData*> peer,
@@ -1450,8 +2747,17 @@ void AddPeerColorButton(
 	}
 
 	button->setClickedCallback([=] {
-		show->show(Box(EditPeerColorBox, show, peer, style, theme));
+		if (const auto controller = show->resolveWindow()) {
+			controller->show(Box(
+				EditPeerColorBox,
+				controller,
+				peer,
+				style,
+				theme,
+				PeerColorTab::Profile));
+		}
 	});
+	return button;
 }
 
 void CheckBoostLevel(
@@ -1460,7 +2766,7 @@ void CheckBoostLevel(
 		Fn<std::optional<Ui::AskBoostReason>(int level)> askMore,
 		Fn<void()> cancel) {
 	peer->session().api().request(MTPpremium_GetBoostsStatus(
-		peer->input
+		peer->input()
 	)).done([=](const MTPpremium_BoostsStatus &result) {
 		const auto &data = result.data();
 		if (const auto channel = peer->asChannel()) {
@@ -1471,8 +2777,7 @@ void CheckBoostLevel(
 			return;
 		}
 		const auto openStatistics = [=] {
-			if (const auto controller = show->resolveWindow(
-					ChatHelpers::WindowUsage::PremiumPromo)) {
+			if (const auto controller = show->resolveWindow()) {
 				controller->showSection(Info::Boosts::Make(peer));
 			}
 		};
@@ -1481,7 +2786,11 @@ void CheckBoostLevel(
 		show->show(Box(Ui::AskBoostBox, Ui::AskBoostBoxData{
 			.link = qs(data.vboost_url()),
 			.boost = counters,
+			.features = (peer->isChannel()
+				? LookupBoostFeatures(peer->asChannel())
+				: Ui::BoostFeatures()),
 			.reason = *reason,
+			.group = !peer->isBroadcast(),
 		}, openStatistics, nullptr));
 		cancel();
 	}).fail([=](const MTP::Error &error) {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
index 394a13aa884100..1dcad992e4f1ba 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.h
@@ -19,6 +19,10 @@ namespace ChatHelpers {
 class Show;
 } // namespace ChatHelpers
 
+namespace Window {
+class SessionController;
+} // namespace Window
+
 namespace Ui {
 class RpWidget;
 class GenericBox;
@@ -38,14 +42,20 @@ void AddLevelBadge(
 	const QMargins &padding,
 	rpl::producer<QString> text);
 
+enum class PeerColorTab {
+	Profile,
+	Name,
+};
+
 void EditPeerColorBox(
 	not_null<Ui::GenericBox*> box,
-	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer,
 	std::shared_ptr<Ui::ChatStyle> style = nullptr,
-	std::shared_ptr<Ui::ChatTheme> theme = nullptr);
+	std::shared_ptr<Ui::ChatTheme> theme = nullptr,
+	PeerColorTab initialTab = PeerColorTab::Profile);
 
-void AddPeerColorButton(
+not_null<Ui::SettingsButton*> AddPeerColorButton(
 	not_null<Ui::VerticalLayout*> container,
 	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<PeerData*> peer,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_common.h b/Telegram/SourceFiles/boxes/peers/edit_peer_common.h
index 3105a0ab8a9062..0e1191a4299f33 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_common.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_common.h
@@ -13,6 +13,7 @@ constexpr auto kMaxGroupChannelTitle = 128;
 constexpr auto kMaxUserFirstLastName = 64;
 constexpr auto kMaxChannelDescription = 255;
 constexpr auto kMinUsernameLength = 5;
+constexpr auto kMaxUsernameLength = 32;
 constexpr auto kUsernameCheckTimeout = crl::time(200);
 
 } // namespace Ui::EditPeer
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp
index 8883ad0a519da8..ac39eef76bd65c 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp
@@ -7,7 +7,9 @@ For license and copyright information please follow this link:
 */
 #include "boxes/peers/edit_peer_history_visibility_box.h"
 
+#include "base/event_filter.h"
 #include "lang/lang_keys.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/layers/generic_box.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
@@ -29,18 +31,45 @@ void EditPeerHistoryVisibilityBox(
 			HistoryVisibility v) {
 		const auto button = Ui::CreateChild<Ui::AbstractButton>(inner.get());
 		inner->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			button->resize(s);
 		}, button->lifetime());
 		button->setClickedCallback([=] { historyVisibility->setValue(v); });
 	};
 
+	const auto tryClose = [=] {
+		if (historyVisibility->current() == historyVisibilitySavedValue) {
+			box->closeBox();
+			return;
+		}
+		box->uiShow()->showBox(Ui::MakeConfirmBox({
+			.text = tr::lng_bot_close_warning(),
+			.confirmed = crl::guard(box, [=](Fn<void()> close) {
+				close();
+				box->closeBox();
+			}),
+			.confirmText = tr::lng_bot_close_warning_sure(),
+			.cancelText = tr::lng_create_group_back(),
+		}));
+	};
+
 	box->setTitle(tr::lng_manage_history_visibility_title());
 	box->addButton(tr::lng_settings_save(), [=] {
 		savedCallback(historyVisibility->current());
 		box->closeBox();
 	});
-	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	box->addButton(tr::lng_cancel(), tryClose);
+
+	box->setCloseByOutsideClick(false);
+	box->setCloseByEscape(false);
+	base::install_event_filter(box, [=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::KeyPress
+			&& static_cast<QKeyEvent*>(e.get())->key() == Qt::Key_Escape) {
+			tryClose();
+			return base::EventFilterResult::Cancel;
+		}
+		return base::EventFilterResult::Continue;
+	});
 
 	box->addSkip(st::editPeerHistoryVisibilityTopSkip);
 	const auto visible = box->addRow(object_ptr<Ui::VerticalLayout>(box));
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 4b11e3745d9739..4b2cef806dbcb3 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "api/api_credits.h"
 #include "api/api_peer_photo.h"
+#include "api/api_statistics.h"
 #include "api/api_user_names.h"
 #include "main/main_session.h"
 #include "ui/boxes/confirm_box.h"
@@ -21,11 +22,14 @@ For license and copyright information please follow this link:
 #include "boxes/peers/edit_peer_history_visibility_box.h"
 #include "boxes/peers/edit_peer_permissions_box.h"
 #include "boxes/peers/edit_peer_invite_links.h"
-#include "boxes/peers/edit_linked_chat_box.h"
+#include "boxes/peers/edit_discussion_link_box.h"
 #include "boxes/peers/edit_peer_requests_box.h"
 #include "boxes/peers/edit_peer_reactions.h"
 #include "boxes/peers/replace_boost_box.h"
+#include "boxes/peers/toggle_topics_box.h"
+#include "boxes/peers/verify_peers_box.h"
 #include "boxes/peer_list_controllers.h"
+#include "boxes/edit_privacy_box.h" // EditDirectMessagesPriceBox
 #include "boxes/stickers_box.h"
 #include "boxes/username_box.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
@@ -45,7 +49,12 @@ For license and copyright information please follow this link:
 #include "data/data_user.h"
 #include "history/admin_log/history_admin_log_section.h"
 #include "info/bot/earn/info_bot_earn_widget.h"
+#include "info/bot/starref/info_bot_starref_join_widget.h"
+#include "info/bot/starref/info_bot_starref_setup_widget.h"
 #include "info/channel_statistics/boosts/info_boosts_widget.h"
+#include "info/channel_statistics/earn/earn_format.h"
+#include "info/channel_statistics/earn/earn_icons.h"
+#include "info/channel_statistics/earn/info_channel_earn_widget.h"
 #include "info/profile/info_profile_values.h"
 #include "info/info_memento.h"
 #include "lang/lang_keys.h"
@@ -56,6 +65,7 @@ For license and copyright information please follow this link:
 #include "ui/controls/emoji_button.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/premium_graphics.h"
+#include "ui/new_badges.h"
 #include "ui/rect.h"
 #include "ui/rp_widget.h"
 #include "ui/vertical_list.h"
@@ -72,8 +82,10 @@ For license and copyright information please follow this link:
 #include "window/window_session_controller.h"
 #include "api/api_invite_links.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
 #include "styles/style_boxes.h"
 #include "styles/style_info.h"
 
@@ -122,7 +134,7 @@ void AddButtonWithCount(
 not_null<Ui::SettingsButton*> AddButtonWithText(
 		not_null<Ui::VerticalLayout*> parent,
 		rpl::producer<QString> &&text,
-		rpl::producer<QString> &&label,
+		rpl::producer<TextWithEntities> &&label,
 		Fn<void()> callback,
 		Settings::IconDescriptor &&descriptor) {
 	return parent->add(EditPeerInfoBox::CreateButton(
@@ -134,6 +146,20 @@ not_null<Ui::SettingsButton*> AddButtonWithText(
 		std::move(descriptor)));
 }
 
+not_null<Ui::SettingsButton*> AddButtonWithText(
+		not_null<Ui::VerticalLayout*> parent,
+		rpl::producer<QString> &&text,
+		rpl::producer<QString> &&label,
+		Fn<void()> callback,
+		Settings::IconDescriptor &&descriptor) {
+	return AddButtonWithText(
+		parent,
+		std::move(text),
+		std::move(label) | rpl::map(tr::marked),
+		std::move(callback),
+		std::move(descriptor));
+}
+
 void AddButtonDelete(
 		not_null<Ui::VerticalLayout*> parent,
 		rpl::producer<QString> &&text,
@@ -156,11 +182,8 @@ void SaveDefaultRestrictions(
 
 	const auto requestId = api->request(
 		MTPmessages_EditChatDefaultBannedRights(
-			peer->input,
-			MTP_chatBannedRights(
-				MTP_flags(
-					MTPDchatBannedRights::Flags::from_raw(uint32(rights))),
-				MTP_int(0)))
+			peer->input(),
+			RestrictionsToMTP({ rights, 0 }))
 	).done([=](const MTPUpdates &result) {
 		api->clearModifyRequest(key);
 		api->applyUpdates(result);
@@ -191,7 +214,7 @@ void SaveSlowmodeSeconds(
 	const auto key = Api::RequestKey("slowmode_seconds", channel->id);
 
 	const auto requestId = api->request(MTPchannels_ToggleSlowMode(
-		channel->inputChannel,
+		channel->inputChannel(),
 		MTP_int(seconds)
 	)).done([=](const MTPUpdates &result) {
 		api->clearModifyRequest(key);
@@ -210,6 +233,49 @@ void SaveSlowmodeSeconds(
 	api->registerModifyRequest(key, requestId);
 }
 
+void SaveStarsPerMessage(
+		std::shared_ptr<Ui::Show> show,
+		not_null<ChannelData*> channel,
+		int starsPerMessage,
+		Fn<void(bool)> done) {
+	const auto api = &channel->session().api();
+	const auto key = Api::RequestKey("stars_per_message", channel->id);
+
+	const auto broadcast = channel->isBroadcast();
+
+	using Flag = MTPchannels_UpdatePaidMessagesPrice::Flag;
+	const auto broadcastAllowed = broadcast && (starsPerMessage >= 0);
+	const auto requestId = api->request(MTPchannels_UpdatePaidMessagesPrice(
+		MTP_flags(broadcastAllowed
+			? Flag::f_broadcast_messages_allowed
+			: Flag(0)),
+		channel->inputChannel(),
+		MTP_long(starsPerMessage)
+	)).done([=](const MTPUpdates &result) {
+		api->clearModifyRequest(key);
+		api->applyUpdates(result);
+		if (!broadcast) {
+			channel->owner().editStarsPerMessage(channel, starsPerMessage);
+		}
+		done(true);
+	}).fail([=](const MTP::Error &error) {
+		api->clearModifyRequest(key);
+		if (error.type() != u"CHAT_NOT_MODIFIED"_q) {
+			show->showToast(error.type());
+			done(false);
+		} else {
+			if (!broadcast) {
+				channel->owner().editStarsPerMessage(
+					channel,
+					starsPerMessage);
+			}
+			done(true);
+		}
+	}).send();
+
+	api->registerModifyRequest(key, requestId);
+}
+
 void SaveBoostsUnrestrict(
 		not_null<ChannelData*> channel,
 		int boostsUnrestrict,
@@ -218,7 +284,7 @@ void SaveBoostsUnrestrict(
 	const auto key = Api::RequestKey("boosts_unrestrict", channel->id);
 	const auto requestId = api->request(
 		MTPchannels_SetBoostsToUnblockRestrictions(
-			channel->inputChannel,
+			channel->inputChannel(),
 			MTP_int(boostsUnrestrict))
 	).done([=](const MTPUpdates &result) {
 		api->clearModifyRequest(key);
@@ -244,6 +310,7 @@ void SaveBoostsUnrestrict(
 void ShowEditPermissions(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<PeerData*> peer) {
+	const auto show = navigation->uiShow();
 	auto createBox = [=](not_null<Ui::GenericBox*> box) {
 		const auto saving = box->lifetime().make_state<int>(0);
 		const auto save = [=](
@@ -262,6 +329,10 @@ void ShowEditPermissions(
 					channel,
 					result.boostsUnrestrict,
 					close);
+				const auto price = result.starsPerMessage;
+				SaveStarsPerMessage(show, channel, price, [=](bool ok) {
+					close();
+				});
 			}
 		};
 		auto done = [=](EditPeerPermissionsBoxResult result) {
@@ -273,7 +344,9 @@ void ShowEditPermissions(
 			const auto saveFor = peer->migrateToOrMe();
 			const auto chat = saveFor->asChat();
 			if (!chat
-				|| (!result.slowmodeSeconds && !result.boostsUnrestrict)) {
+				|| (!result.slowmodeSeconds
+					&& !result.boostsUnrestrict
+					&& !result.starsPerMessage)) {
 				save(saveFor, result);
 				return;
 			}
@@ -289,6 +362,14 @@ void ShowEditPermissions(
 	navigation->parentController()->show(Box(std::move(createBox)));
 }
 
+[[nodiscard]] int CurrentPricePerDirectMessage(
+		not_null<ChannelData*> broadcast) {
+	const auto monoforumLink = broadcast->monoforumLink();
+	return (monoforumLink && !monoforumLink->monoforumDisabled())
+		? monoforumLink->commonStarsPerMessage()
+		: -1;
+}
+
 class Controller : public base::has_weak_ptr {
 public:
 	Controller(
@@ -319,12 +400,16 @@ class Controller : public base::has_weak_ptr {
 		std::optional<QString> description;
 		std::optional<bool> hiddenPreHistory;
 		std::optional<bool> forum;
+		std::optional<bool> forumTabs;
+		std::optional<bool> autotranslate;
 		std::optional<bool> signatures;
 		std::optional<bool> signatureProfiles;
 		std::optional<bool> noForwards;
 		std::optional<bool> joinToWrite;
 		std::optional<bool> requestToJoin;
-		std::optional<ChannelData*> linkedChat;
+		std::optional<bool> requestToJoinApplyToInvites;
+		std::optional<ChannelData*> discussionLink;
+		std::optional<int> starsPerDirectMessage;
 	};
 
 	[[nodiscard]] object_ptr<Ui::RpWidget> createPhotoAndTitleEdit();
@@ -340,22 +425,28 @@ class Controller : public base::has_weak_ptr {
 	void refreshForumToggleLocked();
 	void showEditPeerTypeBox(
 		std::optional<rpl::producer<QString>> error = {});
-	void showEditLinkedChatBox();
+	void showEditDiscussionLinkBox();
+	void showEditDirectMessagesBox();
 	void fillPrivacyTypeButton();
-	void fillLinkedChatButton();
+	void fillDiscussionLinkButton();
+	void fillDirectMessagesButton();
 	//void fillInviteLinkButton();
 	void fillForumButton();
 	void fillColorIndexButton();
+	void fillAutoTranslateButton();
 	void fillSignaturesButton();
 	void fillHistoryVisibilityButton();
 	void fillManageSection();
 	void fillPendingRequestsButton();
 
 	void fillBotUsernamesButton();
-	void fillBotBalanceButton();
+	void fillBotCurrencyButton();
+	void fillBotCreditsButton();
+	void fillBotAffiliateProgram();
 	void fillBotEditIntroButton();
 	void fillBotEditCommandsButton();
 	void fillBotEditSettingsButton();
+	void fillBotVerifyAccounts();
 
 	void submitTitle();
 	void submitDescription();
@@ -366,11 +457,13 @@ class Controller : public base::has_weak_ptr {
 	[[nodiscard]] std::optional<Saving> validate() const;
 	[[nodiscard]] bool validateUsernamesOrder(Saving &to) const;
 	[[nodiscard]] bool validateUsername(Saving &to) const;
-	[[nodiscard]] bool validateLinkedChat(Saving &to) const;
+	[[nodiscard]] bool validateDiscussionLink(Saving &to) const;
+	[[nodiscard]] bool validateDirectMessagesPrice(Saving &to) const;
 	[[nodiscard]] bool validateTitle(Saving &to) const;
 	[[nodiscard]] bool validateDescription(Saving &to) const;
 	[[nodiscard]] bool validateHistoryVisibility(Saving &to) const;
 	[[nodiscard]] bool validateForum(Saving &to) const;
+	[[nodiscard]] bool validateAutotranslate(Saving &to) const;
 	[[nodiscard]] bool validateSignatures(Saving &to) const;
 	[[nodiscard]] bool validateForwards(Saving &to) const;
 	[[nodiscard]] bool validateJoinToWrite(Saving &to) const;
@@ -379,11 +472,13 @@ class Controller : public base::has_weak_ptr {
 	void save();
 	void saveUsernamesOrder();
 	void saveUsername();
-	void saveLinkedChat();
+	void saveDiscussionLink();
+	void saveDirectMessagesPrice();
 	void saveTitle();
 	void saveDescription();
 	void saveHistoryVisibility();
 	void saveForum();
+	void saveAutotranslate();
 	void saveSignatures();
 	void saveForwards();
 	void saveJoinToWrite();
@@ -404,12 +499,15 @@ class Controller : public base::has_weak_ptr {
 	void subscribeToMigration();
 	void migrate(not_null<ChannelData*> channel);
 
-	std::optional<ChannelData*> _linkedChatSavedValue;
-	ChannelData *_linkedChatOriginalValue = nullptr;
+	std::optional<ChannelData*> _discussionLinkSavedValue;
+	ChannelData *_discussionLinkOriginalValue = nullptr;
 	bool _channelHasLocationOriginalValue = false;
+	std::optional<rpl::variable<int>> _starsPerDirectMessageSavedValue;
 	std::optional<HistoryVisibility> _historyVisibilitySavedValue;
 	std::optional<EditPeerTypeData> _typeDataSavedValue;
 	std::optional<bool> _forumSavedValue;
+	std::optional<bool> _forumTabsSavedValue;
+	std::optional<bool> _autotranslateSavedValue;
 	std::optional<bool> _signaturesSavedValue;
 	std::optional<bool> _signatureProfilesSavedValue;
 
@@ -432,8 +530,8 @@ class Controller : public base::has_weak_ptr {
 	};
 
 	const rpl::event_stream<PrivacyAndForwards> _privacyTypeUpdates;
-	const rpl::event_stream<ChannelData*> _linkedChatUpdates;
-	mtpRequestId _linkedChatsRequestId = 0;
+	const rpl::event_stream<ChannelData*> _discussionLinkUpdates;
+	mtpRequestId _discussionLinksRequestId = 0;
 
 	rpl::lifetime _lifetime;
 
@@ -513,11 +611,11 @@ object_ptr<Ui::RpWidget> Controller::createPhotoAndTitleEdit() {
 		container,
 		createTitleEdit());
 	photoWrap->heightValue(
-	) | rpl::start_with_next([container](int height) {
+	) | rpl::on_next([container](int height) {
 		container->resize(container->width(), height);
 	}, photoWrap->lifetime());
 	container->widthValue(
-	) | rpl::start_with_next([titleEdit](int width) {
+	) | rpl::on_next([titleEdit](int width) {
 		const auto left = st::editPeerPhotoMargins.left()
 			+ st::defaultUserpicButton.size.width();
 		titleEdit->resizeToWidth(width - left);
@@ -565,14 +663,15 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 	result->entity()->setMaxLength(Ui::EditPeer::kMaxGroupChannelTitle);
 	result->entity()->setInstantReplaces(Ui::InstantReplaces::Default());
 	result->entity()->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+		Core::App().settings().replaceEmojiValue(),
+		Core::App().settings().systemTextReplaceValue());
 	Ui::Emoji::SuggestionsController::Init(
 		_wrap->window(),
 		result->entity(),
 		&_peer->session());
 
 	result->entity()->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		submitTitle();
 	}, result->entity()->lifetime());
 
@@ -602,7 +701,7 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 		emojiPanel->hide();
 		emojiPanel->selector()->setCurrentPeer(_peer);
 		emojiPanel->selector()->emojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+		) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 			Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
 			field->setFocus();
 		}, field->lifetime());
@@ -636,7 +735,7 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 			});
 		}());
 
-		field->widthValue() | rpl::start_with_next([=](int width) {
+		field->widthValue() | rpl::on_next([=](int width) {
 			const auto &p = st::editPeerTitleEmojiPosition;
 			emojiToggle->moveToRight(p.x(), p.y(), width);
 			updateEmojiPanelGeometry();
@@ -673,7 +772,8 @@ object_ptr<Ui::RpWidget> Controller::createDescriptionEdit() {
 	result->entity()->setMaxLength(Ui::EditPeer::kMaxChannelDescription);
 	result->entity()->setInstantReplaces(Ui::InstantReplaces::Default());
 	result->entity()->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+		Core::App().settings().replaceEmojiValue(),
+		Core::App().settings().systemTextReplaceValue());
 	result->entity()->setSubmitSettings(
 		Core::App().settings().sendSubmitWay());
 	Ui::Emoji::SuggestionsController::Init(
@@ -682,7 +782,7 @@ object_ptr<Ui::RpWidget> Controller::createDescriptionEdit() {
 		&_peer->session());
 
 	result->entity()->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		submitDescription();
 	}, result->entity()->lifetime());
 
@@ -773,8 +873,8 @@ void Controller::refreshHistoryVisibility() {
 	_controls.historyVisibilityWrap->toggle(
 		(!withUsername
 			&& !_channelHasLocationOriginalValue
-			&& (!_linkedChatSavedValue || !*_linkedChatSavedValue)
-			&& (!_forumSavedValue || !*_forumSavedValue)),
+			&& (!_discussionLinkSavedValue || !*_discussionLinkSavedValue)
+			&& !_forumSavedValue.value_or(_peer->isForum())),
 		anim::type::instant);
 }
 
@@ -785,8 +885,18 @@ void Controller::showEditPeerTypeBox(
 		_typeDataSavedValue = data;
 		refreshHistoryVisibility();
 	});
-	_typeDataSavedValue->hasLinkedChat
-		= (_linkedChatSavedValue.value_or(nullptr) != nullptr);
+	if (const auto channel = _peer->asChannel()) {
+		const auto guardBot = channel->guardBot();
+		const auto guardBotUsername = guardBot
+			? guardBot->username()
+			: QString();
+		_typeDataSavedValue->guardBotUsername = guardBotUsername;
+		_typeDataSavedValue->guardBotLink = guardBotUsername.isEmpty()
+			? QString()
+			: _peer->session().createInternalLink(guardBotUsername);
+	}
+	_typeDataSavedValue->hasDiscussionLink
+		= (_discussionLinkSavedValue.value_or(nullptr) != nullptr);
 	const auto box = _navigation->parentController()->show(
 		Box<EditPeerTypeBox>(
 			_navigation,
@@ -796,12 +906,12 @@ void Controller::showEditPeerTypeBox(
 			_typeDataSavedValue,
 			error));
 	box->boxClosing(
-	) | rpl::start_with_next([peer = _peer] {
+	) | rpl::on_next([peer = _peer] {
 		peer->session().api().usernames().requestToCache(peer);
 	}, box->lifetime());
 }
 
-void Controller::showEditLinkedChatBox() {
+void Controller::showEditDiscussionLinkBox() {
 	Expects(_peer->isChannel());
 
 	if (_forumSavedValue && *_forumSavedValue) {
@@ -809,14 +919,14 @@ void Controller::showEditLinkedChatBox() {
 		return;
 	}
 
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto box = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto channel = _peer->asChannel();
 	const auto callback = [=](ChannelData *result) {
 		if (*box) {
 			(*box)->closeBox();
 		}
-		*_linkedChatSavedValue = result;
-		_linkedChatUpdates.fire_copy(result);
+		*_discussionLinkSavedValue = result;
+		_discussionLinkUpdates.fire_copy(result);
 		refreshHistoryVisibility();
 		refreshForumToggleLocked();
 	};
@@ -827,31 +937,31 @@ void Controller::showEditLinkedChatBox() {
 			&& (!channel->hiddenPreHistory()
 				|| channel->canEditPreHistoryHidden()));
 
-	if (const auto chat = *_linkedChatSavedValue) {
-		*box = _navigation->parentController()->show(EditLinkedChatBox(
+	if (const auto chat = *_discussionLinkSavedValue) {
+		*box = _navigation->parentController()->show(EditDiscussionLinkBox(
 			_navigation,
 			channel,
 			chat,
 			canEdit,
 			callback));
 		return;
-	} else if (!canEdit || _linkedChatsRequestId) {
+	} else if (!canEdit || _discussionLinksRequestId) {
 		return;
 	} else if (channel->isMegagroup()) {
 		if (_forumSavedValue
 			&& *_forumSavedValue
-			&& _linkedChatOriginalValue) {
+			&& _discussionLinkOriginalValue) {
 			ShowForumForDiscussionError(_navigation);
 		} else {
-			// Restore original linked channel.
-			callback(_linkedChatOriginalValue);
+			// Restore original discussion link.
+			callback(_discussionLinkOriginalValue);
 		}
 		return;
 	}
-	_linkedChatsRequestId = _api.request(
+	_discussionLinksRequestId = _api.request(
 		MTPchannels_GetGroupsForDiscussion()
 	).done([=](const MTPmessages_Chats &result) {
-		_linkedChatsRequestId = 0;
+		_discussionLinksRequestId = 0;
 		const auto list = result.match([&](const auto &data) {
 			return data.vchats().v;
 		});
@@ -860,22 +970,40 @@ void Controller::showEditLinkedChatBox() {
 		for (const auto &item : list) {
 			chats.emplace_back(_peer->owner().processChat(item));
 		}
-		*box = _navigation->parentController()->show(EditLinkedChatBox(
+		*box = _navigation->parentController()->show(EditDiscussionLinkBox(
 			_navigation,
 			channel,
 			std::move(chats),
 			callback));
 	}).fail([=] {
-		_linkedChatsRequestId = 0;
+		_discussionLinksRequestId = 0;
 	}).send();
 }
 
+void Controller::showEditDirectMessagesBox() {
+	Expects(_peer->isBroadcast());
+	Expects(_starsPerDirectMessageSavedValue.has_value());
+
+	const auto stars = _starsPerDirectMessageSavedValue->current();
+	_navigation->parentController()->show(Box(
+		EditDirectMessagesPriceBox,
+		_peer->asChannel(),
+		(stars >= 0) ? stars : std::optional<int>(),
+		[=](std::optional<int> value) {
+			*_starsPerDirectMessageSavedValue = value.value_or(-1);
+		}));
+}
+
 void Controller::fillPrivacyTypeButton() {
 	Expects(_controls.buttonsLayout != nullptr);
 
 	// Create Privacy Button.
 	const auto hasLocation = _peer->isChannel()
 		&& _peer->asChannel()->hasLocation();
+	const auto guardBot = _peer->isChannel()
+		? _peer->asChannel()->guardBot()
+		: nullptr;
+	const auto guardBotUsername = guardBot ? guardBot->username() : QString();
 	_typeDataSavedValue = EditPeerTypeData{
 		.privacy = ((_peer->isChannel()
 			&& _peer->asChannel()->hasUsername())
@@ -890,8 +1018,12 @@ void Controller::fillPrivacyTypeButton() {
 		.noForwards = !_peer->allowsForwarding(),
 		.joinToWrite = (_peer->isMegagroup()
 			&& _peer->asChannel()->joinToWrite()),
-		.requestToJoin = (_peer->isMegagroup()
+		.requestToJoin = (_peer->isChannel()
 			&& _peer->asChannel()->requestToJoin()),
+		.guardBotUsername = guardBotUsername,
+		.guardBotLink = guardBotUsername.isEmpty()
+			? QString()
+			: _peer->session().createInternalLink(guardBotUsername),
 	};
 	const auto isGroup = (_peer->isChat() || _peer->isMegagroup());
 	AddButtonWithText(
@@ -932,12 +1064,14 @@ void Controller::fillPrivacyTypeButton() {
 	});
 }
 
-void Controller::fillLinkedChatButton() {
+void Controller::fillDiscussionLinkButton() {
 	Expects(_controls.buttonsLayout != nullptr);
 
-	_linkedChatSavedValue = _linkedChatOriginalValue = _peer->isChannel()
-		? _peer->asChannel()->linkedChat()
-		: nullptr;
+	_discussionLinkSavedValue
+		= _discussionLinkOriginalValue
+		= (_peer->isChannel()
+			? _peer->asChannel()->discussionLink()
+			: nullptr);
 
 	const auto isGroup = (_peer->isChat() || _peer->isMegagroup());
 	auto text = !isGroup
@@ -945,7 +1079,7 @@ void Controller::fillLinkedChatButton() {
 		: rpl::combine(
 			tr::lng_manage_linked_channel(),
 			tr::lng_manage_linked_channel_restore(),
-			_linkedChatUpdates.events()
+			_discussionLinkUpdates.events()
 		) | rpl::map([=](
 				const QString &edit,
 				const QString &restore,
@@ -953,23 +1087,53 @@ void Controller::fillLinkedChatButton() {
 			return chat ? edit : restore;
 		});
 	auto label = isGroup
-		? _linkedChatUpdates.events(
+		? _discussionLinkUpdates.events(
 		) | rpl::map([](ChannelData *chat) {
 			return chat ? chat->name() : QString();
-		}) | rpl::type_erased()
+		}) | rpl::type_erased
 		: rpl::combine(
 			tr::lng_manage_discussion_group_add(),
-			_linkedChatUpdates.events()
+			_discussionLinkUpdates.events()
 		) | rpl::map([=](const QString &add, ChannelData *chat) {
 			return chat ? chat->name() : add;
-		}) | rpl::type_erased();
+		}) | rpl::type_erased;
 	AddButtonWithText(
 		_controls.buttonsLayout,
 		std::move(text),
 		std::move(label),
-		[=] { showEditLinkedChatBox(); },
+		[=] { showEditDiscussionLinkBox(); },
 		{ isGroup ? &st::menuIconChannel : &st::menuIconGroups });
-	_linkedChatUpdates.fire_copy(*_linkedChatSavedValue);
+	_discussionLinkUpdates.fire_copy(*_discussionLinkSavedValue);
+}
+
+void Controller::fillDirectMessagesButton() {
+	Expects(_controls.buttonsLayout != nullptr);
+
+	if (!_peer->isBroadcast() || !_peer->asChannel()->canEditInformation()) {
+		return;
+	}
+
+	const auto perMessage = CurrentPricePerDirectMessage(_peer->asChannel());
+	_starsPerDirectMessageSavedValue = rpl::variable<int>(perMessage);
+
+	auto label = _starsPerDirectMessageSavedValue->value(
+	) | rpl::map([](int starsPerMessage) {
+		return (starsPerMessage < 0)
+			? tr::lng_manage_monoforum_off(tr::marked)
+			: !starsPerMessage
+			? tr::lng_manage_monoforum_free(tr::marked)
+			: rpl::single(Ui::Text::IconEmoji(
+				&st::starIconEmojiColored
+			).append(' ').append(
+				Lang::FormatCreditsAmountDecimal(
+					CreditsAmount{ starsPerMessage })));
+	}) | rpl::flatten_latest();
+	AddButtonWithText(
+		_controls.buttonsLayout,
+		tr::lng_manage_monoforum(),
+		std::move(label),
+		[=] { showEditDirectMessagesBox(); },
+		{ .icon = &st::menuIconChats, .newBadge = true });
 }
 //
 //void Controller::fillInviteLinkButton() {
@@ -989,22 +1153,31 @@ void Controller::fillLinkedChatButton() {
 void Controller::fillForumButton() {
 	Expects(_controls.buttonsLayout != nullptr);
 
+	_forumSavedValue = _peer->isForum();
+	_forumTabsSavedValue = !_peer->isChannel()
+		|| !_peer->isForum()
+		|| _peer->useSubsectionTabs();
+
+	const auto changes = std::make_shared<rpl::event_stream<>>();
+	const auto label = [=] {
+		return !*_forumSavedValue
+			? tr::lng_manage_monoforum_off(tr::now)
+			: *_forumTabsSavedValue
+			? tr::lng_edit_topics_tabs(tr::now)
+			: tr::lng_edit_topics_list(tr::now);
+	};
 	const auto button = _controls.forumToggle = _controls.buttonsLayout->add(
 		EditPeerInfoBox::CreateButton(
 			_controls.buttonsLayout,
 			tr::lng_forum_topics_switch(),
-			rpl::single(QString()),
+			changes->events_starting_with({}) | rpl::map(label),
 			[] {},
 			st::manageGroupTopicsButton,
-			{ &st::menuIconTopics }));
-	const auto unlocks = std::make_shared<rpl::event_stream<bool>>();
-	button->toggleOn(
-		rpl::single(_peer->isForum()) | rpl::then(unlocks->events())
-	)->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
-		if (_controls.forumToggleLocked && toggled) {
-			unlocks->fire(false);
-			if (_linkedChatSavedValue && *_linkedChatSavedValue) {
+			{ .icon = &st::menuIconTopics, .newBadge = true }));
+
+	button->setClickedCallback(crl::guard(this, [=] {
+		if (!*_forumSavedValue && _controls.forumToggleLocked) {
+			if (_discussionLinkSavedValue && *_discussionLinkSavedValue) {
 				ShowForumForDiscussionError(_navigation);
 			} else {
 				_navigation->showToast(
@@ -1012,16 +1185,24 @@ void Controller::fillForumButton() {
 						tr::now,
 						lt_count,
 						EnableForumMinMembers(_peer),
-						Ui::Text::RichLangValue));
+						tr::rich));
 			}
 		} else {
-			_forumSavedValue = toggled;
-			if (toggled) {
-				_savingData.hiddenPreHistory = false;
-			}
-			refreshHistoryVisibility();
+			_navigation->uiShow()->show(Box(
+				Ui::ToggleTopicsBox,
+				*_forumSavedValue,
+				*_forumTabsSavedValue,
+				crl::guard(this, [=](bool topics, bool topicsTabs) {
+					_forumSavedValue = topics;
+					_forumTabsSavedValue = !topics || topicsTabs;
+					if (topics) {
+						_savingData.hiddenPreHistory = false;
+					}
+					changes->fire({});
+					refreshHistoryVisibility();
+				})));
 		}
-	}, _controls.buttonsLayout->lifetime());
+	}));
 	refreshForumToggleLocked();
 }
 
@@ -1034,8 +1215,8 @@ void Controller::refreshForumToggleLocked() {
 	const auto channel = _peer->asChannel();
 	const auto notenough = !_peer->isForum()
 		&& ((chat ? chat->count : channel->membersCount()) < limit);
-	const auto linked = _linkedChatSavedValue
-		&& *_linkedChatSavedValue;
+	const auto linked = _discussionLinkSavedValue
+		&& *_discussionLinkSavedValue;
 	const auto locked = _controls.forumToggleLocked = notenough || linked;
 	_controls.forumToggle->setToggleLocked(locked);
 }
@@ -1043,7 +1224,6 @@ void Controller::refreshForumToggleLocked() {
 void Controller::fillColorIndexButton() {
 	Expects(_controls.buttonsLayout != nullptr);
 
-	const auto show = _navigation->uiShow();
 	AddPeerColorButton(
 		_controls.buttonsLayout,
 		_navigation->uiShow(),
@@ -1051,6 +1231,69 @@ void Controller::fillColorIndexButton() {
 		st::managePeerColorsButton);
 }
 
+void Controller::fillAutoTranslateButton() {
+	Expects(_controls.buttonsLayout != nullptr);
+
+	const auto channel = _peer->asBroadcast();
+	if (!channel) {
+		return;
+	}
+
+	const auto requiredLevel = Data::LevelLimits(&channel->session())
+		.channelAutoTranslateLevelMin();
+	const auto autotranslate = _controls.buttonsLayout->add(
+		EditPeerInfoBox::CreateButton(
+			_controls.buttonsLayout,
+			tr::lng_edit_autotranslate(),
+			rpl::single(QString()),
+			[] {},
+			st::manageGroupTopicsButton,
+			{ &st::menuIconTranslate }));
+	struct State {
+		rpl::event_stream<bool> toggled;
+		rpl::variable<bool> isLocked = false;
+	};
+	const auto state = autotranslate->lifetime().make_state<State>();
+	autotranslate->toggleOn(rpl::single(
+		channel->autoTranslation()
+	) | rpl::then(state->toggled.events()));
+	state->isLocked = (channel->levelHint() < requiredLevel);
+	const auto reason = Ui::AskBoostReason{
+		.data = Ui::AskBoostAutotranslate{ .requiredLevel = requiredLevel },
+	};
+
+	state->isLocked.value() | rpl::on_next([=](bool locked) {
+		autotranslate->setToggleLocked(locked);
+	}, autotranslate->lifetime());
+
+	autotranslate->toggledChanges(
+	) | rpl::on_next([=](bool value) {
+		if (!state->isLocked.current()) {
+			_autotranslateSavedValue = value;
+		} else if (value) {
+			state->toggled.fire(false);
+			auto weak = base::make_weak(autotranslate);
+			CheckBoostLevel(
+				_navigation->uiShow(),
+				_peer,
+				[=](int level) {
+					if (weak.get()) {
+						state->isLocked = (level < requiredLevel);
+					}
+					return (level < requiredLevel)
+						? std::make_optional(reason)
+						: std::nullopt;
+				},
+				[] {});
+		}
+	}, autotranslate->lifetime());
+
+	autotranslate->toggledValue(
+	) | rpl::on_next([=](bool toggled) {
+		_autotranslateSavedValue = toggled;
+	}, _controls.buttonsLayout->lifetime());
+}
+
 void Controller::fillSignaturesButton() {
 	Expects(_controls.buttonsLayout != nullptr);
 
@@ -1083,12 +1326,12 @@ void Controller::fillSignaturesButton() {
 	profiles->entity()->toggleOn(rpl::single(
 		channel->addsSignature() && channel->signatureProfiles()
 	))->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_signatureProfilesSavedValue = toggled;
 	}, profiles->entity()->lifetime());
 
 	signs->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_signaturesSavedValue = toggled;
 		if (!toggled) {
 			_signatureProfilesSavedValue = false;
@@ -1100,8 +1343,8 @@ void Controller::fillSignaturesButton() {
 		_controls.buttonsLayout,
 		rpl::conditional(
 			signs->toggledValue(),
-			tr::lng_edit_sign_profiles_about(Ui::Text::WithEntities),
-			tr::lng_edit_sign_messages_about(Ui::Text::WithEntities)));
+			tr::lng_edit_sign_profiles_about(tr::marked),
+			tr::lng_edit_sign_messages_about(tr::marked)));
 	Ui::AddSkip(_controls.buttonsLayout);
 }
 
@@ -1174,7 +1417,9 @@ void Controller::fillManageSection() {
 
 		::AddSkip(container, 0);
 		fillBotUsernamesButton();
-		fillBotBalanceButton();
+		fillBotCurrencyButton();
+		fillBotCreditsButton();
+		fillBotAffiliateProgram();
 		fillBotEditIntroButton();
 		fillBotEditCommandsButton();
 		fillBotEditSettingsButton();
@@ -1187,13 +1432,14 @@ void Controller::fillManageSection() {
 				container,
 				tr::lng_manage_peer_bot_about(
 					lt_bot,
-					rpl::single(Ui::Text::Link(
+					rpl::single(tr::link(
 						'@' + kBotManagerUsername.utf16(),
 						_peer->session().createInternalLinkFull(
 							kBotManagerUsername.utf16()))),
-					Ui::Text::RichLangValue),
+					tr::rich),
 				st::boxDividerLabel),
 			st::defaultBoxDividerLabelPadding));
+		fillBotVerifyAccounts();
 		return;
 	}
 
@@ -1210,6 +1456,8 @@ void Controller::fillManageSection() {
 	const auto canEditSignatures = isChannel
 		&& channel->canEditSignatures()
 		&& !channel->isMegagroup();
+	const auto canEditAutoTranslate = isChannel
+		&& channel->canEditAutoTranslate();
 	const auto canEditPreHistoryHidden = isChannel
 		? channel->canEditPreHistoryHidden()
 		: chat->canEditPreHistoryHidden();
@@ -1229,15 +1477,22 @@ void Controller::fillManageSection() {
 		? channel->canViewMembers()
 		: chat->amIn();
 	const auto canViewKicked = isChannel
-		&& (channel->isBroadcast() || channel->isGigagroup());
+		&& (channel->isMegagroup()
+			? (channel->isBroadcast() || channel->isGigagroup())
+			: true);
 	const auto hasRecentActions = isChannel
 		&& (channel->hasAdminRights() || channel->amCreator());
+	const auto hasStarRef = Info::BotStarRef::Join::Allowed(_peer)
+		&& isChannel
+		&& channel->canPostMessages();
 	const auto canEditStickers = isChannel && channel->canEditStickers();
 	const auto canDeleteChannel = isChannel && channel->canDelete();
 	const auto canEditColorIndex = isChannel && channel->canEditEmoji();
-	const auto canViewOrEditLinkedChat = isChannel
-		&& (channel->linkedChat()
+	const auto canViewOrEditDiscussionLink = isChannel
+		&& (channel->discussionLink()
 			|| (channel->isBroadcast() && channel->canEditInformation()));
+	const auto canEditDirectMessages = isChannel
+		&& (channel->isBroadcast() && channel->canEditInformation());
 
 	::AddSkip(_controls.buttonsLayout, 0);
 
@@ -1246,8 +1501,11 @@ void Controller::fillManageSection() {
 	//} else if (canEditInviteLinks) {
 	//	fillInviteLinkButton();
 	}
-	if (canViewOrEditLinkedChat) {
-		fillLinkedChatButton();
+	if (canViewOrEditDiscussionLink) {
+		fillDiscussionLinkButton();
+	}
+	if (canEditDirectMessages) {
+		fillDirectMessagesButton();
 	}
 	if (canEditPreHistoryHidden) {
 		fillHistoryVisibilityButton();
@@ -1258,13 +1516,16 @@ void Controller::fillManageSection() {
 	if (canEditColorIndex) {
 		fillColorIndexButton();
 	}
+	if (canEditAutoTranslate) {
+		fillAutoTranslateButton();
+	}
 	if (canEditSignatures) {
 		fillSignaturesButton();
 	} else if (canEditPreHistoryHidden
 		|| canEditForum
 		|| canEditColorIndex
 		//|| canEditInviteLinks
-		|| canViewOrEditLinkedChat
+		|| canViewOrEditDiscussionLink
 		|| canEditType) {
 		::AddSkip(_controls.buttonsLayout);
 	}
@@ -1288,6 +1549,8 @@ void Controller::fillManageSection() {
 				? tr::lng_manage_peer_reactions_on(tr::now)
 				: some
 				? QString::number(some)
+				: allowed.paidEnabled
+				? QString::number(1)
 				: tr::lng_manage_peer_reactions_off(tr::now);
 		});
 		AddButtonWithCount(
@@ -1414,10 +1677,21 @@ void Controller::fillManageSection() {
 		AddButtonWithCount(
 			_controls.buttonsLayout,
 			tr::lng_manage_peer_recent_actions(),
-			rpl::single(QString()), //Empty count.
+			rpl::single(QString()), // Empty count.
 			std::move(callback),
 			{ &st::menuIconGroupLog });
 	}
+	if (hasStarRef) {
+		auto callback = [=] {
+			_navigation->showSection(Info::BotStarRef::Join::Make(_peer));
+		};
+		AddButtonWithCount(
+			_controls.buttonsLayout,
+			tr::lng_manage_peer_star_ref(),
+			rpl::single(QString()), // Empty count.
+			std::move(callback),
+			{ .icon = &st::menuIconStarRefShare });
+	}
 
 	if (canEditStickers || canDeleteChannel) {
 		::AddSkip(_controls.buttonsLayout);
@@ -1464,7 +1738,7 @@ void Controller::editReactions() {
 	}
 	_controls.levelRequested = true;
 	_api.request(MTPpremium_GetBoostsStatus(
-		_peer->input
+		_peer->input()
 	)).done([=](const MTPpremium_BoostsStatus &result) {
 		_controls.levelRequested = false;
 		if (const auto channel = _peer->asChannel()) {
@@ -1482,7 +1756,11 @@ void Controller::editReactions() {
 				strong->show(Box(Ui::AskBoostBox, Ui::AskBoostBoxData{
 					.link = link,
 					.boost = counters,
+					.features = (_peer->isChannel()
+						? LookupBoostFeatures(_peer->asChannel())
+						: Ui::BoostFeatures()),
 					.reason = { Ui::AskBoostCustomReactions{ required } },
+					.group = !_peer->isBroadcast(),
 				}, openStatistics, nullptr));
 			}
 		};
@@ -1524,7 +1802,7 @@ void Controller::fillPendingRequestsButton() {
 		{ &st::menuIconInvite });
 	std::move(
 		pendingRequestsCount
-	) | rpl::start_with_next([=](int count) {
+	) | rpl::on_next([=](int count) {
 		wrap->toggle(count > 0, anim::type::instant);
 	}, wrap->lifetime());
 }
@@ -1583,7 +1861,71 @@ void Controller::fillBotUsernamesButton() {
 		{ &st::menuIconLinks });
 }
 
-void Controller::fillBotBalanceButton() {
+void Controller::fillBotCurrencyButton() {
+	Expects(_isBot);
+
+	struct State final {
+		rpl::variable<QString> balance;
+	};
+
+	auto &lifetime = _controls.buttonsLayout->lifetime();
+	const auto state = lifetime.make_state<State>();
+	const auto format = [=](const CreditsAmount &balance) {
+		return Lang::FormatCreditsAmountDecimal(balance);
+	};
+	const auto was = _peer->session().credits().balanceCurrency(
+		_peer->id);
+	if (was) {
+		state->balance = format(was);
+	}
+
+	const auto wrap = _controls.buttonsLayout->add(
+		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+			_controls.buttonsLayout,
+			EditPeerInfoBox::CreateButton(
+				_controls.buttonsLayout,
+				tr::lng_manage_peer_bot_balance_currency(),
+				state->balance.value(),
+				[controller = _navigation->parentController(), peer = _peer] {
+					controller->showSection(Info::ChannelEarn::Make(peer));
+				},
+				st::manageGroupButton,
+				{})));
+	wrap->toggle(!state->balance.current().isEmpty(), anim::type::instant);
+
+	const auto button = wrap->entity();
+	{
+		const auto currencyLoad
+			= button->lifetime().make_state<Api::EarnStatistics>(_peer);
+		currencyLoad->request(
+		) | rpl::on_error_done([=](const QString &error) {
+		}, [=] {
+			const auto balance = currencyLoad->data().currentBalance;
+			if (balance) {
+				wrap->toggle(true, anim::type::normal);
+			}
+			state->balance = format(balance);
+		}, button->lifetime());
+	}
+	{
+		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
+		icon->resize(st::menuIconLinks.size());
+		const auto image = Ui::Earn::MenuIconCurrency(icon->size());
+		icon->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(icon);
+			p.drawImage(0, 0, image);
+		}, icon->lifetime());
+
+		button->sizeValue(
+		) | rpl::on_next([=](const QSize &size) {
+			icon->moveToLeft(
+				button->st().iconLeft,
+				(size.height() - icon->height()) / 2);
+		}, icon->lifetime());
+	}
+}
+
+void Controller::fillBotCreditsButton() {
 	Expects(_isBot);
 
 	struct State final {
@@ -1593,7 +1935,7 @@ void Controller::fillBotBalanceButton() {
 	auto &lifetime = _controls.buttonsLayout->lifetime();
 	const auto state = lifetime.make_state<State>();
 	if (const auto balance = _peer->session().credits().balance(_peer->id)) {
-		state->balance = QString::number(balance);
+		state->balance = Lang::FormatCreditsAmountDecimal(balance);
 	}
 
 	const auto wrap = _controls.buttonsLayout->add(
@@ -1601,7 +1943,7 @@ void Controller::fillBotBalanceButton() {
 			_controls.buttonsLayout,
 			EditPeerInfoBox::CreateButton(
 				_controls.buttonsLayout,
-				tr::lng_manage_peer_bot_balance(),
+				tr::lng_manage_peer_bot_balance_credits(),
 				state->balance.value(),
 				[controller = _navigation->parentController(), peer = _peer] {
 					controller->showSection(Info::BotEarn::Make(peer));
@@ -1618,52 +1960,57 @@ void Controller::fillBotBalanceButton() {
 			if (data.balance) {
 				wrap->toggle(true, anim::type::normal);
 			}
-			state->balance = QString::number(data.balance);
+			state->balance = Lang::FormatCreditsAmountDecimal(data.balance);
 		});
 	}
 	{
-		constexpr auto kSizeShift = 3;
-		constexpr auto kStrokeWidth = 5;
-
 		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
-		icon->resize(Size(st::menuIconLinks.width() - kSizeShift));
-
-		auto colorized = [&] {
-			auto f = QFile(Ui::Premium::Svg());
-			if (!f.open(QIODevice::ReadOnly)) {
-				return QString();
-			}
-			return QString::fromUtf8(
-				f.readAll()).replace(u"#fff"_q, u"#ffffff00"_q);
-		}();
-		colorized.replace(
-			u"stroke=\"none\""_q,
-			u"stroke=\"%1\""_q.arg(st::menuIconColor->c.name()));
-		colorized.replace(
-			u"stroke-width=\"1\""_q,
-			u"stroke-width=\"%1\""_q.arg(kStrokeWidth));
-		const auto svg = icon->lifetime().make_state<QSvgRenderer>(
-			colorized.toUtf8());
-		svg->setViewBox(svg->viewBox() + Margins(kStrokeWidth));
-
-		const auto starSize = Size(icon->height());
-
-		icon->paintRequest(
-		) | rpl::start_with_next([=] {
+		const auto image = Ui::Earn::MenuIconCredits();
+		icon->resize(image.size() / style::DevicePixelRatio());
+		icon->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(icon);
-			svg->render(&p, Rect(starSize));
+			p.drawImage(0, 0, image);
 		}, icon->lifetime());
 
 		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
+		) | rpl::on_next([=](const QSize &size) {
 			icon->moveToLeft(
-				button->st().iconLeft + kSizeShift / 2.,
+				button->st().iconLeft,
 				(size.height() - icon->height()) / 2);
 		}, icon->lifetime());
 	}
 
 }
 
+void Controller::fillBotAffiliateProgram() {
+	Expects(_isBot);
+
+	if (!Info::BotStarRef::Setup::Allowed(_peer)) {
+		return;
+	}
+
+	const auto user = _peer->asUser();
+	auto label = user->session().changes().peerFlagsValue(
+		user,
+		Data::PeerUpdate::Flag::StarRefProgram
+	) | rpl::map([=] {
+		const auto commission = user->botInfo
+			? user->botInfo->starRefProgram.commission
+			: 0;
+		return commission
+			? Info::BotStarRef::FormatCommission(commission)
+			: tr::lng_manage_peer_bot_star_ref_off(tr::now);
+	});
+	AddButtonWithCount(
+		_controls.buttonsLayout,
+		tr::lng_manage_peer_bot_star_ref(),
+		std::move(label),
+		[controller = _navigation->parentController(), user] {
+			controller->showSection(Info::BotStarRef::Setup::Make(user));
+		},
+		{ .icon = &st::menuIconSharing });
+}
+
 void Controller::fillBotEditIntroButton() {
 	Expects(_isBot);
 
@@ -1700,6 +2047,39 @@ void Controller::fillBotEditSettingsButton() {
 		{ &st::menuIconSettings });
 }
 
+void Controller::fillBotVerifyAccounts() {
+	Expects(_isBot);
+
+	const auto user = _peer->asUser();
+	const auto wrap = _controls.buttonsLayout->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			_controls.buttonsLayout,
+			object_ptr<Ui::VerticalLayout>(
+				_controls.buttonsLayout)));
+	wrap->toggleOn(rpl::single(
+		rpl::empty
+	) | rpl::then(user->owner().botCommandsChanges(
+	) | rpl::filter(
+		rpl::mappers::_1 == _peer
+	) | rpl::to_empty) | rpl::map([=] {
+		const auto info = user->botInfo.get();
+		return info && info->verifierSettings;
+	}));
+
+	const auto inner = wrap->entity();
+	Ui::AddSkip(inner);
+	AddButtonWithCount(
+		inner,
+		tr::lng_manage_peer_bot_verify(),
+		rpl::never<QString>(),
+		[controller = _navigation->parentController(), user] {
+			controller->show(MakeVerifyPeersBox(controller, user));
+		},
+		{ &st::menuIconFactcheck });
+	Ui::AddSkip(inner);
+	Ui::AddDivider(inner);
+}
+
 void Controller::submitTitle() {
 	Expects(_controls.title != nullptr);
 
@@ -1728,11 +2108,13 @@ std::optional<Controller::Saving> Controller::validate() const {
 	auto result = Saving();
 	if (validateUsernamesOrder(result)
 		&& validateUsername(result)
-		&& validateLinkedChat(result)
+		&& validateDiscussionLink(result)
+		&& validateDirectMessagesPrice(result)
 		&& validateTitle(result)
 		&& validateDescription(result)
 		&& validateHistoryVisibility(result)
 		&& validateForum(result)
+		&& validateAutotranslate(result)
 		&& validateSignatures(result)
 		&& validateForwards(result)
 		&& validateJoinToWrite(result)
@@ -1769,11 +2151,19 @@ bool Controller::validateUsername(Saving &to) const {
 	return true;
 }
 
-bool Controller::validateLinkedChat(Saving &to) const {
-	if (!_linkedChatSavedValue) {
+bool Controller::validateDiscussionLink(Saving &to) const {
+	if (!_discussionLinkSavedValue) {
 		return true;
 	}
-	to.linkedChat = *_linkedChatSavedValue;
+	to.discussionLink = *_discussionLinkSavedValue;
+	return true;
+}
+
+bool Controller::validateDirectMessagesPrice(Saving &to) const {
+	if (!_starsPerDirectMessageSavedValue) {
+		return true;
+	}
+	to.starsPerDirectMessage = _starsPerDirectMessageSavedValue->current();
 	return true;
 }
 
@@ -1817,6 +2207,15 @@ bool Controller::validateForum(Saving &to) const {
 		return true;
 	}
 	to.forum = _forumSavedValue;
+	to.forumTabs = _forumTabsSavedValue;
+	return true;
+}
+
+bool Controller::validateAutotranslate(Saving &to) const {
+	if (!_autotranslateSavedValue.has_value()) {
+		return true;
+	}
+	to.autotranslate = _autotranslateSavedValue;
 	return true;
 }
 
@@ -1853,6 +2252,8 @@ bool Controller::validateRequestToJoin(Saving &to) const {
 		return true;
 	}
 	to.requestToJoin = _typeDataSavedValue->requestToJoin;
+	to.requestToJoinApplyToInvites
+		= _typeDataSavedValue->requestToJoinApplyToInvites;
 	return true;
 }
 
@@ -1866,11 +2267,13 @@ void Controller::save() {
 		_savingData = *saving;
 		pushSaveStage([=] { saveUsernamesOrder(); });
 		pushSaveStage([=] { saveUsername(); });
-		pushSaveStage([=] { saveLinkedChat(); });
+		pushSaveStage([=] { saveDiscussionLink(); });
+		pushSaveStage([=] { saveDirectMessagesPrice(); });
 		pushSaveStage([=] { saveTitle(); });
 		pushSaveStage([=] { saveDescription(); });
 		pushSaveStage([=] { saveHistoryVisibility(); });
 		pushSaveStage([=] { saveForum(); });
+		pushSaveStage([=] { saveAutotranslate(); });
 		pushSaveStage([=] { saveSignatures(); });
 		pushSaveStage([=] { saveForwards(); });
 		pushSaveStage([=] { saveJoinToWrite(); });
@@ -1903,22 +2306,27 @@ void Controller::saveUsernamesOrder() {
 	}
 	if (_savingData.usernamesOrder->empty()) {
 		_api.request(MTPchannels_DeactivateAllUsernames(
-			channel->inputChannel
+			channel->inputChannel()
 		)).done([=] {
-			channel->setUsernames(channel->editableUsername().isEmpty()
-				? Data::Usernames()
-				: Data::Usernames{
+			if (channel->editableUsername().isEmpty()) {
+				channel->setUsernames({});
+			} else {
+				channel->setUsernames({
 					{ channel->editableUsername(), true, true }
 				});
+			}
 			continueSave();
 		}).send();
 	} else {
+		const auto weakContinue = crl::guard(this, [=] {
+			continueSave();
+		});
 		const auto lifetime = std::make_shared<rpl::lifetime>();
 		const auto newUsernames = (*_savingData.usernamesOrder);
 		_peer->session().api().usernames().reorder(
 			_peer,
 			newUsernames
-		) | rpl::start_with_done([=] {
+		) | rpl::on_done([=] {
 			channel->setUsernames(ranges::views::all(
 				newUsernames
 			) | ranges::views::transform([&](QString username) {
@@ -1930,7 +2338,7 @@ void Controller::saveUsernamesOrder() {
 					.editable = editable,
 				};
 			}) | ranges::to_vector);
-			continueSave();
+			weakContinue();
 			lifetime->destroy();
 		}, *lifetime);
 	}
@@ -1957,7 +2365,7 @@ void Controller::saveUsername() {
 
 	const auto newUsername = (*_savingData.username);
 	_api.request(MTPchannels_UpdateUsername(
-		channel->inputChannel,
+		channel->inputChannel(),
 		MTP_string(newUsername)
 	)).done([=] {
 		channel->setName(
@@ -1988,40 +2396,64 @@ void Controller::saveUsername() {
 	}).send();
 }
 
-void Controller::saveLinkedChat() {
+void Controller::saveDiscussionLink() {
 	const auto channel = _peer->asChannel();
 	if (!channel) {
 		return continueSave();
 	}
-	if (!_savingData.linkedChat
-		|| *_savingData.linkedChat == channel->linkedChat()) {
+	if (!_savingData.discussionLink
+		|| *_savingData.discussionLink == channel->discussionLink()) {
 		return continueSave();
 	}
 
-	const auto chat = *_savingData.linkedChat;
+	const auto chat = *_savingData.discussionLink;
 	if (channel->isBroadcast() && chat && chat->hiddenPreHistory()) {
 		togglePreHistoryHidden(
 			chat,
 			false,
-			[=] { saveLinkedChat(); },
+			[=] { saveDiscussionLink(); },
 			[=] { cancelSave(); });
 		return;
 	}
 
-	const auto input = *_savingData.linkedChat
-		? (*_savingData.linkedChat)->inputChannel
+	const auto input = *_savingData.discussionLink
+		? (*_savingData.discussionLink)->inputChannel()
 		: MTP_inputChannelEmpty();
 	_api.request(MTPchannels_SetDiscussionGroup(
-		(channel->isBroadcast() ? channel->inputChannel : input),
-		(channel->isBroadcast() ? input : channel->inputChannel)
+		(channel->isBroadcast() ? channel->inputChannel() : input),
+		(channel->isBroadcast() ? input : channel->inputChannel())
 	)).done([=] {
-		channel->setLinkedChat(*_savingData.linkedChat);
+		channel->setDiscussionLink(*_savingData.discussionLink);
 		continueSave();
-	}).fail([=] {
+	}).fail([=](const MTP::Error &error) {
+		_navigation->showToast(error.type());
 		cancelSave();
 	}).send();
 }
 
+void Controller::saveDirectMessagesPrice() {
+	const auto channel = _peer->asChannel();
+	if (!channel) {
+		return continueSave();
+	}
+	const auto current = CurrentPricePerDirectMessage(channel);
+	const auto desired = _savingData.starsPerDirectMessage
+		? *_savingData.starsPerDirectMessage
+		: current;
+	if (desired == current) {
+		return continueSave();
+	}
+	const auto show = _navigation->uiShow();
+	const auto done = [=](bool ok) {
+		if (ok) {
+			continueSave();
+		} else {
+			cancelSave();
+		}
+	};
+	SaveStarsPerMessage(show, channel, desired, crl::guard(this, done));
+}
+
 void Controller::saveTitle() {
 	if (!_savingData.title || *_savingData.title == _peer->name()) {
 		return continueSave();
@@ -2048,20 +2480,22 @@ void Controller::saveTitle() {
 		_controls.title->showError();
 		if (type == u"NO_CHAT_TITLE"_q) {
 			_box->scrollToWidget(_controls.title);
+		} else {
+			_navigation->showToast(type);
 		}
 		cancelSave();
 	};
 
 	if (const auto channel = _peer->asChannel()) {
 		_api.request(MTPchannels_EditTitle(
-			channel->inputChannel,
+			channel->inputChannel(),
 			MTP_string(*_savingData.title)
 		)).done(std::move(onDone)
 		).fail(std::move(onFail)
 		).send();
 	} else if (const auto chat = _peer->asChat()) {
 		_api.request(MTPmessages_EditChatTitle(
-			chat->inputChat,
+			chat->inputChat(),
 			MTP_string(*_savingData.title)
 		)).done(std::move(onDone)
 		).fail(std::move(onFail)
@@ -2069,7 +2503,7 @@ void Controller::saveTitle() {
 	} else if (_isBot) {
 		_api.request(MTPbots_GetBotInfo(
 			MTP_flags(MTPbots_GetBotInfo::Flag::f_bot),
-			_peer->asUser()->inputUser,
+			_peer->asUser()->inputUser(),
 			MTPstring() // Lang code.
 		)).done([=](const MTPbots_BotInfo &result) {
 			const auto was = qs(result.data().vname());
@@ -2080,7 +2514,7 @@ void Controller::saveTitle() {
 			using Flag = MTPbots_SetBotInfo::Flag;
 			_api.request(MTPbots_SetBotInfo(
 				MTP_flags(Flag::f_bot | Flag::f_name),
-				_peer->asUser()->inputUser,
+				_peer->asUser()->inputUser(),
 				MTPstring(), // Lang code.
 				MTP_string(now), // Name.
 				MTPstring(), // About.
@@ -2108,7 +2542,7 @@ void Controller::saveDescription() {
 	if (_isBot) {
 		_api.request(MTPbots_GetBotInfo(
 			MTP_flags(MTPbots_GetBotInfo::Flag::f_bot),
-			_peer->asUser()->inputUser,
+			_peer->asUser()->inputUser(),
 			MTPstring() // Lang code.
 		)).done([=](const MTPbots_BotInfo &result) {
 			const auto was = qs(result.data().vabout());
@@ -2119,15 +2553,16 @@ void Controller::saveDescription() {
 			using Flag = MTPbots_SetBotInfo::Flag;
 			_api.request(MTPbots_SetBotInfo(
 				MTP_flags(Flag::f_bot | Flag::f_about),
-				_peer->asUser()->inputUser,
+				_peer->asUser()->inputUser(),
 				MTPstring(), // Lang code.
 				MTPstring(), // Name.
 				MTP_string(now), // About.
 				MTPstring() // Description.
 			)).done([=] {
 				successCallback();
-			}).fail([=] {
+			}).fail([=](const MTP::Error &error) {
 				_controls.description->showError();
+				_navigation->showToast(error.type());
 				cancelSave();
 			}).send();
 		}).fail([=] {
@@ -2136,7 +2571,7 @@ void Controller::saveDescription() {
 		return;
 	}
 	_api.request(MTPmessages_EditChatAbout(
-		_peer->input,
+		_peer->input(),
 		MTP_string(*_savingData.description)
 	)).done([=] {
 		successCallback();
@@ -2147,6 +2582,7 @@ void Controller::saveDescription() {
 			return;
 		}
 		_controls.description->showError();
+		_navigation->showToast(type);
 		cancelSave();
 	}).send();
 }
@@ -2180,7 +2616,9 @@ void Controller::saveHistoryVisibility() {
 void Controller::toggleBotManager(const QString &command) {
 	const auto controller = _navigation->parentController();
 	_api.request(MTPcontacts_ResolveUsername(
-		MTP_string(kBotManagerUsername.utf16())
+		MTP_flags(0),
+		MTP_string(kBotManagerUsername.utf16()),
+		MTP_string()
 	)).done([=](const MTPcontacts_ResolvedPeer &result) {
 		_peer->owner().processUsers(result.data().vusers());
 		_peer->owner().processChats(result.data().vchats());
@@ -2210,15 +2648,17 @@ void Controller::togglePreHistoryHidden(
 		done();
 	};
 	_api.request(MTPchannels_TogglePreHistoryHidden(
-		channel->inputChannel,
+		channel->inputChannel(),
 		MTP_bool(hidden)
 	)).done([=](const MTPUpdates &result) {
 		channel->session().api().applyUpdates(result);
 		apply();
 	}).fail([=](const MTP::Error &error) {
-		if (error.type() == u"CHAT_NOT_MODIFIED"_q) {
+		const auto type = error.type();
+		if (type == u"CHAT_NOT_MODIFIED"_q) {
 			apply();
 		} else {
+			_navigation->showToast(type);
 			fail();
 		}
 	}).send();
@@ -2226,8 +2666,13 @@ void Controller::togglePreHistoryHidden(
 
 void Controller::saveForum() {
 	const auto channel = _peer->asChannel();
+	const auto nowForum = _peer->isForum();
+	const auto nowForumTabs = !channel
+		|| !nowForum
+		|| channel->useSubsectionTabs();
 	if (!_savingData.forum
-		|| *_savingData.forum == _peer->isForum()) {
+		|| (*_savingData.forum == nowForum
+			&& *_savingData.forumTabs == nowForumTabs)) {
 		return continueSave();
 	} else if (!channel) {
 		const auto saveForChannel = [=](not_null<ChannelData*> channel) {
@@ -2243,8 +2688,9 @@ void Controller::saveForum() {
 		return;
 	}
 	_api.request(MTPchannels_ToggleForum(
-		channel->inputChannel,
-		MTP_bool(*_savingData.forum)
+		channel->inputChannel(),
+		MTP_bool(*_savingData.forum),
+		MTP_bool(*_savingData.forum && *_savingData.forumTabs)
 	)).done([=](const MTPUpdates &result) {
 		const auto weak = base::make_weak(this);
 		channel->session().api().applyUpdates(result);
@@ -2255,6 +2701,30 @@ void Controller::saveForum() {
 		if (error.type() == u"CHAT_NOT_MODIFIED"_q) {
 			continueSave();
 		} else {
+			_navigation->showToast(error.type());
+			cancelSave();
+		}
+	}).send();
+}
+
+void Controller::saveAutotranslate() {
+	const auto channel = _peer->asBroadcast();
+	if (!_savingData.autotranslate
+		|| !channel
+		|| (*_savingData.autotranslate == channel->autoTranslation())) {
+		return continueSave();
+	}
+	_api.request(MTPchannels_ToggleAutotranslation(
+		channel->inputChannel(),
+		MTP_bool(*_savingData.autotranslate)
+	)).done([=](const MTPUpdates &result) {
+		channel->session().api().applyUpdates(result);
+		continueSave();
+	}).fail([=](const MTP::Error &error) {
+		if (error.type() == u"CHAT_NOT_MODIFIED"_q) {
+			continueSave();
+		} else {
+			_navigation->showToast(error.type());
 			cancelSave();
 		}
 	}).send();
@@ -2281,7 +2751,7 @@ void Controller::saveSignatures() {
 			| (*_savingData.signatureProfiles
 				? Flag::f_profiles_enabled
 				: Flag())),
-		channel->inputChannel
+		channel->inputChannel()
 	)).done([=](const MTPUpdates &result) {
 		channel->session().api().applyUpdates(result);
 		continueSave();
@@ -2289,6 +2759,7 @@ void Controller::saveSignatures() {
 		if (error.type() == u"CHAT_NOT_MODIFIED"_q) {
 			continueSave();
 		} else {
+			_navigation->showToast(error.type());
 			cancelSave();
 		}
 	}).send();
@@ -2299,9 +2770,12 @@ void Controller::saveForwards() {
 		|| *_savingData.noForwards != _peer->allowsForwarding()) {
 		return continueSave();
 	}
+	using Flag = MTPmessages_ToggleNoForwards::Flag;
 	_api.request(MTPmessages_ToggleNoForwards(
-		_peer->input,
-		MTP_bool(*_savingData.noForwards)
+		MTP_flags(Flag()),
+		_peer->input(),
+		MTP_bool(*_savingData.noForwards),
+		MTPint()
 	)).done([=](const MTPUpdates &result) {
 		_peer->session().api().applyUpdates(result);
 		continueSave();
@@ -2309,6 +2783,7 @@ void Controller::saveForwards() {
 		if (error.type() == u"CHAT_NOT_MODIFIED"_q) {
 			continueSave();
 		} else {
+			_navigation->showToast(error.type());
 			cancelSave();
 		}
 	}).send();
@@ -2322,7 +2797,7 @@ void Controller::saveJoinToWrite() {
 		return continueSave();
 	}
 	_api.request(MTPchannels_ToggleJoinToSend(
-		_peer->asChannel()->inputChannel,
+		_peer->asChannel()->inputChannel(),
 		MTP_bool(*_savingData.joinToWrite)
 	)).done([=](const MTPUpdates &result) {
 		_peer->session().api().applyUpdates(result);
@@ -2331,21 +2806,29 @@ void Controller::saveJoinToWrite() {
 		if (error.type() == u"CHAT_NOT_MODIFIED"_q) {
 			continueSave();
 		} else {
+			_navigation->showToast(error.type());
 			cancelSave();
 		}
 	}).send();
 }
 
 void Controller::saveRequestToJoin() {
-	const auto requestToJoin = _peer->isMegagroup()
+	const auto requestToJoin = _peer->isChannel()
 		&& _peer->asChannel()->requestToJoin();
 	if (!_savingData.requestToJoin
 		|| *_savingData.requestToJoin == requestToJoin) {
 		return continueSave();
 	}
+	using Flag = MTPchannels_ToggleJoinRequest::Flag;
+	const auto channel = _peer->asChannel();
+	const auto flags = _savingData.requestToJoinApplyToInvites.value_or(false)
+		? Flag::f_apply_to_invites
+		: Flag();
 	_api.request(MTPchannels_ToggleJoinRequest(
-		_peer->asChannel()->inputChannel,
-		MTP_bool(*_savingData.requestToJoin)
+		MTP_flags(flags),
+		channel->inputChannel(),
+		MTP_bool(*_savingData.requestToJoin),
+		MTP_inputUserEmpty()
 	)).done([=](const MTPUpdates &result) {
 		_peer->session().api().applyUpdates(result);
 		continueSave();
@@ -2353,6 +2836,7 @@ void Controller::saveRequestToJoin() {
 		if (error.type() == u"CHAT_NOT_MODIFIED"_q) {
 			continueSave();
 		} else {
+			_navigation->showToast(error.type());
 			cancelSave();
 		}
 	}).send();
@@ -2403,7 +2887,7 @@ void Controller::deleteChannel() {
 		session->api().deleteConversation(chat, false);
 	}
 	session->api().request(MTPchannels_DeleteChannel(
-		channel->inputChannel
+		channel->inputChannel()
 	)).done([=](const MTPUpdates &result) {
 		session->api().applyUpdates(result);
 	//}).fail([=](const MTP::Error &error) {
@@ -2431,7 +2915,7 @@ void EditPeerInfoBox::prepare() {
 		this,
 		_peer);
 	_focusRequests.events(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[=] { controller->setFocus(); },
 		lifetime());
 	auto content = controller->createContent();
@@ -2448,12 +2932,35 @@ object_ptr<Ui::SettingsButton> EditPeerInfoBox::CreateButton(
 		Fn<void()> callback,
 		const style::SettingsCountButton &st,
 		Settings::IconDescriptor &&descriptor) {
+	return CreateButton(
+		parent,
+		std::move(text),
+		std::move(count) | rpl::map(tr::marked),
+		std::move(callback),
+		st,
+		std::move(descriptor));
+}
+
+object_ptr<Ui::SettingsButton> EditPeerInfoBox::CreateButton(
+		not_null<QWidget*> parent,
+		rpl::producer<QString> &&text,
+		rpl::producer<TextWithEntities> &&labelText,
+		Fn<void()> callback,
+		const style::SettingsCountButton &st,
+		Settings::IconDescriptor &&descriptor) {
 	auto result = object_ptr<Ui::SettingsButton>(
 		parent,
 		rpl::duplicate(text),
 		st.button);
 	const auto button = result.data();
 	button->addClickHandler(callback);
+
+	const auto badge = descriptor.newBadge
+		? Ui::NewBadge::CreateNewBadge(
+			button,
+			tr::lng_premium_summary_new_badge()).get()
+		: nullptr;
+
 	if (descriptor) {
 		AddButtonIcon(
 			button,
@@ -2461,38 +2968,62 @@ object_ptr<Ui::SettingsButton> EditPeerInfoBox::CreateButton(
 			std::move(descriptor));
 	}
 
-	auto labelText = rpl::combine(
-		std::move(text),
-		std::move(count),
-		button->widthValue()
-	) | rpl::map([&st](const QString &text, const QString &count, int width) {
-		const auto available = width
-			- st.button.padding.left()
-			- (st.button.style.font->spacew * 2)
-			- st.button.style.font->width(text)
-			- st.labelPosition.x();
-		const auto required = st.label.style.font->width(count);
-		return (required > available)
-			? st.label.style.font->elided(count, std::max(available, 0))
-			: count;
-	});
-
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
 		button,
-		std::move(labelText),
+		rpl::duplicate(labelText),
 		st.label);
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	label->show();
 
 	rpl::combine(
-		button->widthValue(),
-		label->widthValue()
-	) | rpl::start_with_next([=, &st](int outerWidth, int width) {
+		rpl::duplicate(text),
+		std::move(labelText),
+		button->widthValue()
+	) | rpl::on_next([&st, label](
+			const QString &text,
+			const TextWithEntities &labelText,
+			int width) {
+		const auto available = width
+			- st.button.padding.left()
+			- (st.button.style.font->spacew * 2)
+			- st.button.style.font->width(text)
+			- st.labelPosition.x();
+		const auto required = label->textMaxWidth();
+		label->resizeToWidth(std::min(required, available));
 		label->moveToRight(
 			st.labelPosition.x(),
 			st.labelPosition.y(),
-			outerWidth);
+			width);
 	}, label->lifetime());
 
+	if (badge) {
+		rpl::combine(
+			std::move(text),
+			label->widthValue(),
+			button->widthValue()
+		) | rpl::on_next([=](
+				const QString &text,
+				int labelWidth,
+				int width) {
+			const auto space = st.button.style.font->spacew;
+			const auto left = st.button.padding.left()
+				+ st.button.style.font->width(text)
+				+ space;
+			const auto right = st.labelPosition.x()
+				+ labelWidth
+				+ (space * 2);
+			const auto available = width - left - right;
+			badge->setVisible(available >= badge->width());
+			if (!badge->isHidden()) {
+				const auto top = st.button.padding.top()
+					+ st.button.style.font->ascent
+					- st::settingsPremiumNewBadge.style.font->ascent
+					- st::settingsPremiumNewBadgePadding.top();
+				badge->moveToLeft(left, top, width);
+			}
+		}, badge->lifetime());
+	}
+
 	return result;
 }
 
@@ -2509,7 +3040,9 @@ bool EditPeerInfoBox::Available(not_null<PeerData*> peer) {
 
 		// canViewAdmins() is removed, because in supergroups it is
 		// always true and in channels it is equal to canViewBanned().
-
+		if (channel->isMonoforum()) {
+			return false;
+		}
 		return false
 			//|| channel->canViewMembers()
 			//|| channel->canViewAdmins()
@@ -2522,3 +3055,9 @@ bool EditPeerInfoBox::Available(not_null<PeerData*> peer) {
 		return false;
 	}
 }
+
+void ShowEditChatPermissions(
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer) {
+	ShowEditPermissions(navigation, peer);
+}
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.h
index 9844320cfab655..f918547c1b7d04 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.h
@@ -46,6 +46,13 @@ class EditPeerInfoBox : public Ui::BoxContent {
 		Fn<void()> callback,
 		const style::SettingsCountButton &st,
 		Settings::IconDescriptor &&descriptor);
+	[[nodiscard]] static object_ptr<Ui::SettingsButton> CreateButton(
+		not_null<QWidget*> parent,
+		rpl::producer<QString> &&text,
+		rpl::producer<TextWithEntities> &&labelText,
+		Fn<void()> callback,
+		const style::SettingsCountButton &st,
+		Settings::IconDescriptor &&descriptor);
 
 protected:
 	void prepare() override;
@@ -56,3 +63,7 @@ class EditPeerInfoBox : public Ui::BoxContent {
 	not_null<PeerData*> _peer;
 
 };
+
+void ShowEditChatPermissions(
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index 8e1a110303551d..72b83293174d1b 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -12,20 +12,24 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "boxes/gift_premium_box.h"
 #include "boxes/peer_list_box.h"
+#include "boxes/peer_list_controllers.h"
 #include "boxes/share_box.h"
 #include "core/application.h"
-#include "core/ui_integration.h" // Core::MarkedTextContext.
+#include "core/ui_integration.h" // TextContext
 #include "data/components/credits.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
+#include "data/data_forum_topic.h"
 #include "data/data_histories.h"
 #include "data/data_peer.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "history/history.h"
-#include "history/history_item_helpers.h" // GetErrorTextForSending.
+#include "history/history_item_helpers.h" // GetErrorForSending.
 #include "history/view/history_view_group_call_bar.h" // GenerateUserpics...
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "qr/qr_generate.h"
@@ -39,6 +43,7 @@ For license and copyright information please follow this link:
 #include "ui/controls/userpic_button.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
@@ -50,7 +55,9 @@ For license and copyright information please follow this link:
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_credits.h"
+#include "styles/style_dialogs.h"
 #include "styles/style_giveaway.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h" // st::boxDividerLabel.
@@ -67,6 +74,7 @@ constexpr auto kFirstPage = 20;
 constexpr auto kPerPage = 100;
 // constexpr auto kShareQrSize = 768;
 // constexpr auto kShareQrPadding = 16;
+constexpr auto kMaxShownJoined = 3;
 
 using LinkData = Api::InviteLink;
 
@@ -243,6 +251,9 @@ class Controller final
 	const Role _role = Role::Joined;
 	rpl::variable<LinkData> _data;
 
+	Ui::Text::CustomEmojiHelper _emojiHelper;
+	TextWithEntities _creditsEmoji;
+
 	base::unique_qptr<Ui::PopupMenu> _menu;
 	rpl::event_stream<Processed> _processed;
 
@@ -264,8 +275,9 @@ class Controller final
 class SingleRowController final : public PeerListController {
 public:
 	SingleRowController(
-		not_null<PeerData*> peer,
-		rpl::producer<QString> status);
+		not_null<Data::Thread*> thread,
+		rpl::producer<QString> status,
+		Fn<void()> clicked);
 
 	void prepare() override;
 	void loadMoreRows() override;
@@ -273,8 +285,10 @@ class SingleRowController final : public PeerListController {
 	Main::Session &session() const override;
 
 private:
-	const not_null<PeerData*> _peer;
+	const not_null<Main::Session*> _session;
+	const base::weak_ptr<Data::Thread> _thread;
 	rpl::producer<QString> _status;
+	Fn<void()> _clicked;
 	rpl::lifetime _lifetime;
 
 };
@@ -367,11 +381,11 @@ void QrBox(
 	const auto button = Ui::CreateChild<Ui::AbstractButton>(container);
 	button->resize(size, size);
 	button->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		QPainter(button).drawImage(QRect(0, 0, size, size), qr);
 	}, button->lifetime());
 	container->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		button->move((width - size) / 2, st::inviteLinkQrSkip);
 	}, button->lifetime());
 	button->setClickedCallback(copyCallback);
@@ -401,6 +415,8 @@ Controller::Controller(
 	const auto current = _data.current();
 	_link = current.link;
 	_revoked = current.revoked;
+	_creditsEmoji = _emojiHelper.paletteDependent(
+		Ui::Earn::IconCreditsEmoji());
 }
 
 rpl::producer<LinkData> Controller::dataValue() const {
@@ -417,7 +433,7 @@ void Controller::addHeaderBlock(not_null<Ui::VerticalLayout*> container) {
 	const auto revoked = current.revoked;
 	const auto link = current.link;
 	const auto admin = current.admin;
-	const auto weak = Ui::MakeWeak(container);
+	const auto weak = base::make_weak(container);
 	const auto copyLink = crl::guard(weak, [=] {
 		CopyInviteLink(delegate()->peerListUiShow(), link);
 	});
@@ -492,7 +508,7 @@ void Controller::addHeaderBlock(not_null<Ui::VerticalLayout*> container) {
 		st::inviteLinkFieldPadding);
 
 	label->clicks(
-	) | rpl::start_with_next(copyLink, label->lifetime());
+	) | rpl::on_next(copyLink, label->lifetime());
 
 	const auto reactivateWrap = container->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
@@ -552,7 +568,7 @@ void Controller::addHeaderBlock(not_null<Ui::VerticalLayout*> container) {
 	Ui::AddSkip(container);
 
 	dataValue(
-	) | rpl::start_with_next([=](const LinkData &data) {
+	) | rpl::on_next([=](const LinkData &data) {
 		const auto now = base::unixtime::now();
 		const auto expired = IsExpiredLink(data, now);
 		reactivateWrap->toggle(
@@ -627,7 +643,7 @@ not_null<Ui::SlideWrap<>*> Controller::addRequestedListBlock(
 	controller->setDelegate(delegate);
 
 	controller->processed(
-	) | rpl::start_with_next([=](Processed processed) {
+	) | rpl::on_next([=](Processed processed) {
 		updateWithProcessed(processed);
 	}, lifetime());
 
@@ -718,33 +734,30 @@ void Controller::setupAboveJoinedWidget() {
 				? tr::lng_group_invite_subscription_info_title(
 					tr::now,
 					lt_emoji,
-					session().data().customEmojiManager().creditsEmoji(),
+					_creditsEmoji,
 					lt_price,
 					{ QString::number(current.subscription.credits) },
 					lt_multiplier,
 					TextWithEntities{ .text = QString(QChar(0x00D7)) },
 					lt_total,
 					{ QString::number(current.usage) },
-					Ui::Text::WithEntities)
+					tr::marked)
 				: tr::lng_group_invite_subscription_info_title_none(
 					tr::now,
 					lt_emoji,
-					session().data().customEmojiManager().creditsEmoji(),
+					_creditsEmoji,
 					lt_price,
 					{ QString::number(current.subscription.credits) },
-					Ui::Text::WithEntities),
+					tr::marked),
 			kMarkupTextOptions,
-			Core::MarkedTextContext{
-				.session = &session(),
-				.customEmojiRepaint = [=] { widget->update(); },
-			});
+			_emojiHelper.context([=] { widget->update(); }));
 		auto &lifetime = widget->lifetime();
 		const auto rateValue = lifetime.make_state<rpl::variable<float64>>(
 			session().credits().rateValue(_peer));
 		const auto currency = u"USD"_q;
 		const auto allCredits = current.subscription.credits * current.usage;
 		widget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = Painter(widget);
 			p.setBrush(Qt::NoBrush);
 			p.setPen(st.nameFg);
@@ -853,7 +866,7 @@ void Controller::setupAboveJoinedWidget() {
 		std::move(remainingText),
 		st::inviteLinkTitleRight);
 	dataValue(
-	) | rpl::start_with_next([=](const LinkData &data) {
+	) | rpl::on_next([=](const LinkData &data) {
 		remaining->setTextColorOverride(
 			(data.usageLimit && (data.usageLimit <= data.usage)
 				? std::make_optional(st::boxTextFgError->c)
@@ -871,7 +884,7 @@ void Controller::setupAboveJoinedWidget() {
 		listTitle->positionValue(),
 		remaining->widthValue(),
 		listHeader->widthValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			QPoint position,
 			int width,
 			int outerWidth) {
@@ -891,11 +904,11 @@ void Controller::loadMoreRows() {
 	_requestId = _api.request(MTPmessages_GetChatInviteImporters(
 		MTP_flags(Flag::f_link
 			| (_role == Role::Requested ? Flag::f_requested : Flag(0))),
-		_peer->input,
+		_peer->input(),
 		MTP_string(_link),
 		MTPstring(), // q
 		MTP_int(_lastUser ? _lastUser->date : 0),
-		_lastUser ? _lastUser->user->inputUser : MTP_inputUserEmpty(),
+		_lastUser ? _lastUser->user->inputUser() : MTP_inputUserEmpty(),
 		MTP_int(_lastUser ? kPerPage : kFirstPage)
 	)).done([=](const MTPmessages_ChatInviteImporters &result) {
 		_requestId = 0;
@@ -956,52 +969,46 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
 
-		const auto &stUser = st::boostReplaceUserpic;
+		const auto photoSize = st::boostReplaceUserpic.photoSize;
 		const auto session = &row->peer()->session();
-		content->add(object_ptr<Ui::CenterWrap<>>(
-			content,
-			object_ptr<Ui::UserpicButton>(content, channel, stUser))
-		)->setAttribute(Qt::WA_TransparentForMouseEvents);
+		content->add(
+			Settings::SubscriptionUserpic(content, channel, photoSize),
+			style::al_top);
 
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
 
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
+		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				tr::lng_credits_box_subscription_title(),
-				st::creditsBoxAboutTitle)));
+				st::creditsBoxAboutTitle),
+			style::al_top);
 
 		Ui::AddSkip(content);
 
 		const auto subtitle1 = box->addRow(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				box,
-				object_ptr<Ui::FlatLabel>(
-					box,
-					st::creditsTopupPrice)))->entity();
+				st::creditsTopupPrice),
+			style::al_top);
 		subtitle1->setMarkedText(
 			tr::lng_credits_subscription_subtitle(
 				tr::now,
 				lt_emoji,
-				session->data().customEmojiManager().creditsEmoji(),
+				_creditsEmoji,
 				lt_cost,
 				{ QString::number(data.subscription.credits) },
-				Ui::Text::WithEntities),
-			Core::MarkedTextContext{
-				.session = session,
-				.customEmojiRepaint = [=] { subtitle1->update(); },
-			});
+				tr::marked),
+			_emojiHelper.context());
 		const auto subtitle2 = box->addRow(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				box,
-				object_ptr<Ui::FlatLabel>(
-					box,
-					st::creditsTopupPrice)))->entity();
+				st::creditsTopupPrice),
+			style::al_top);
 		session->credits().rateValue(
 			channel
-		) | rpl::start_with_next([=, currency = u"USD"_q](float64 rate) {
+		) | rpl::on_next([=, currency = u"USD"_q](float64 rate) {
 			subtitle2->setText(
 				tr::lng_credits_subscriber_subtitle(
 					tr::now,
@@ -1014,33 +1021,26 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
 
-		AddSubscriberEntryTable(controller, content, row->peer(), data.date);
+		const auto show = controller->uiShow();
+		AddSubscriberEntryTable(show, content, {}, row->peer(), data.date);
 
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
 
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
+		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				tr::lng_credits_box_out_about(
 					lt_link,
-					tr::lng_payments_terms_link(
-					) | Ui::Text::ToLink(
-						tr::lng_credits_box_out_about_link(tr::now)),
-					Ui::Text::WithEntities),
-				st::creditsBoxAboutDivider)));
+					tr::lng_payments_terms_link(tr::url(
+						tr::lng_credits_box_out_about_link(tr::now))),
+					tr::marked),
+				st::creditsBoxAboutDivider),
+			style::al_top);
 
-		const auto button = box->addButton(tr::lng_box_ok(), [=] {
+		box->addButton(tr::lng_box_ok(), [=] {
 			box->closeBox();
 		});
-		const auto buttonWidth = st::boxWidth
-			- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
-		button->widthValue() | rpl::filter([=] {
-			return (button->widthNoMargins() != buttonWidth);
-		}) | rpl::start_with_next([=] {
-			button->resizeToWidth(buttonWidth);
-		}, button->lifetime());
 	}));
 }
 
@@ -1104,8 +1104,8 @@ void Controller::processRequest(
 				: tr::lng_group_requests_was_added)(
 					tr::now,
 					lt_user,
-					Ui::Text::Bold(user->name()),
-					Ui::Text::WithEntities));
+					tr::bold(user->name()),
+					tr::marked));
 		}
 	});
 	const auto fail = crl::guard(this, [=] {
@@ -1145,36 +1145,62 @@ int Controller::descriptionTopSkipMin() const {
 }
 
 SingleRowController::SingleRowController(
-	not_null<PeerData*> peer,
-	rpl::producer<QString> status)
-: _peer(peer)
-, _status(std::move(status)) {
+	not_null<Data::Thread*> thread,
+	rpl::producer<QString> status,
+	Fn<void()> clicked)
+: _session(&thread->session())
+, _thread(thread)
+, _status(std::move(status))
+, _clicked(std::move(clicked)) {
 }
 
 void SingleRowController::prepare() {
-	auto row = std::make_unique<PeerListRow>(_peer);
-
+	const auto strong = _thread.get();
+	if (!strong) {
+		return;
+	}
+	const auto topic = strong->asTopic();
+	const auto sublist = strong->asSublist();
+	auto row = topic
+		? ChooseTopicBoxController::MakeRow(topic)
+		: sublist
+		? std::make_unique<PeerListRow>(sublist->sublistPeer())
+		: std::make_unique<PeerListRow>(strong->peer());
 	const auto raw = row.get();
-	std::move(
-		_status
-	) | rpl::start_with_next([=](const QString &status) {
-		raw->setCustomStatus(status);
-		delegate()->peerListUpdateRow(raw);
-	}, _lifetime);
-
+	if (_status) {
+		std::move(
+			_status
+		) | rpl::on_next([=](const QString &status) {
+			raw->setCustomStatus(status);
+			delegate()->peerListUpdateRow(raw);
+		}, _lifetime);
+	}
 	delegate()->peerListAppendRow(std::move(row));
 	delegate()->peerListRefreshRows();
+
+	if (topic) {
+		topic->destroyed() | rpl::on_next([=] {
+			while (delegate()->peerListFullRowsCount()) {
+				delegate()->peerListRemoveRow(delegate()->peerListRowAt(0));
+			}
+			delegate()->peerListRefreshRows();
+		}, _lifetime);
+	}
 }
 
 void SingleRowController::loadMoreRows() {
 }
 
 void SingleRowController::rowClicked(not_null<PeerListRow*> row) {
-	ShowPeerInfoSync(row->peer());
+	if (const auto onstack = _clicked) {
+		onstack();
+	} else {
+		ShowPeerInfoSync(row->peer());
+	}
 }
 
 Main::Session &SingleRowController::session() const {
-	return _peer->session();
+	return *_session;
 }
 
 } // namespace
@@ -1187,14 +1213,29 @@ bool IsExpiredLink(const Api::InviteLink &data, TimeId now) {
 void AddSinglePeerRow(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<PeerData*> peer,
-		rpl::producer<QString> status) {
+		rpl::producer<QString> status,
+		Fn<void()> clicked) {
+	AddSinglePeerRow(
+		container,
+		peer->owner().history(peer),
+		std::move(status),
+		std::move(clicked));
+}
+
+void AddSinglePeerRow(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Data::Thread*> thread,
+		rpl::producer<QString> status,
+		Fn<void()> clicked) {
 	const auto delegate = container->lifetime().make_state<
 		PeerListContentDelegateSimple
 	>();
 	const auto controller = container->lifetime().make_state<
 		SingleRowController
-	>(peer, std::move(status));
-	controller->setStyleOverrides(&st::peerListSingleRow);
+	>(thread, std::move(status), std::move(clicked));
+	controller->setStyleOverrides(thread->asTopic()
+		? &st::chooseTopicList
+		: &st::peerListSingleRow);
 	const auto content = container->add(object_ptr<PeerListContent>(
 		container,
 		controller));
@@ -1235,7 +1276,7 @@ void AddPermanentLinkBlock(
 	} else {
 		rpl::duplicate(
 			fromList
-		) | rpl::start_with_next([=](const Api::InviteLink &link) {
+		) | rpl::on_next([=](const Api::InviteLink &link) {
 			*currentLinkFields = link;
 		}, container->lifetime());
 
@@ -1245,7 +1286,7 @@ void AddPermanentLinkBlock(
 			return LinkData{ link.link, link.usage };
 		});
 	}
-	const auto weak = Ui::MakeWeak(container);
+	const auto weak = base::make_weak(container);
 	const auto copyLink = crl::guard(weak, [=] {
 		if (const auto current = value->current(); !current.link.isEmpty()) {
 			CopyInviteLink(show, current.link);
@@ -1311,7 +1352,7 @@ void AddPermanentLinkBlock(
 		st::inviteLinkFieldPadding);
 
 	label->clicks(
-	) | rpl::start_with_next(copyLink, label->lifetime());
+	) | rpl::on_next(copyLink, label->lifetime());
 
 	AddCopyShareLinkButtons(container, copyLink, shareLink);
 
@@ -1348,9 +1389,10 @@ void AddPermanentLinkBlock(
 			data.link,
 			data.usage);
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](const Api::JoinedByLinkSlice &slice) {
+	) | rpl::on_next([=](const Api::JoinedByLinkSlice &slice) {
 		auto list = std::vector<HistoryView::UserpicInRow>();
-		list.reserve(slice.users.size());
+		const auto take = std::min(int(slice.users.size()), kMaxShownJoined);
+		list.reserve(take);
 		for (const auto &item : slice.users) {
 			const auto i = ranges::find(
 				state->list,
@@ -1361,6 +1403,9 @@ void AddPermanentLinkBlock(
 			} else {
 				list.push_back({ item.user });
 			}
+			if (list.size() == take) {
+				break;
+			}
 		}
 		state->count = slice.count;
 		state->list = std::move(list);
@@ -1370,7 +1415,7 @@ void AddPermanentLinkBlock(
 	peer->session().downloaderTaskFinished(
 	) | rpl::filter([=] {
 		return !state->allUserpicsLoaded;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		auto pushing = false;
 		state->allUserpicsLoaded = true;
 		for (const auto &element : state->list) {
@@ -1411,7 +1456,11 @@ void AddPermanentLinkBlock(
 
 void CopyInviteLink(std::shared_ptr<Ui::Show> show, const QString &link) {
 	QGuiApplication::clipboard()->setText(link);
-	show->showToast(tr::lng_group_invite_copied(tr::now));
+	show->showToast({
+		.text = { tr::lng_group_invite_copied(tr::now) },
+		.iconLottie = u"toast/voip_invite"_q,
+		.iconLottieSize = st::toastLottieIconSize,
+	});
 }
 
 object_ptr<Ui::BoxContent> ShareInviteLinkBox(
@@ -1426,7 +1475,7 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 		const QString &link,
 		const QString &copied) {
 	const auto sending = std::make_shared<bool>();
-	const auto box = std::make_shared<QPointer<ShareBox>>();
+	const auto box = std::make_shared<base::weak_qptr<ShareBox>>();
 
 	const auto showToast = [=](const QString &text) {
 		if (*box) {
@@ -1436,12 +1485,22 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 
 	auto copyCallback = [=] {
 		QGuiApplication::clipboard()->setText(link);
-		showToast(copied.isEmpty()
-			? tr::lng_group_invite_copied(tr::now)
-			: copied);
+		if (*box) {
+			(*box)->showToast({
+				.text = { copied.isEmpty()
+					? tr::lng_group_invite_copied(tr::now)
+					: copied },
+				.iconLottie = u"toast/voip_invite"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		}
+	};
+	auto countMessagesCallback = [=](const TextWithTags &comment) {
+		return 1;
 	};
 	auto submitCallback = [=](
 			std::vector<not_null<Data::Thread*>> &&result,
+			Fn<bool()> checkPaid,
 			TextWithTags &&comment,
 			Api::SendOptions options,
 			Data::ForwardOptions) {
@@ -1449,29 +1508,18 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 			return;
 		}
 
-		const auto error = [&] {
-			for (const auto thread : result) {
-				const auto error = GetErrorTextForSending(
-					thread,
-					{ .text = &comment });
-				if (!error.isEmpty()) {
-					return std::make_pair(error, thread);
-				}
-			}
-			return std::make_pair(QString(), result.front());
-		}();
-		if (!error.first.isEmpty()) {
-			auto text = TextWithEntities();
-			if (result.size() > 1) {
-				text.append(
-					Ui::Text::Bold(error.second->chatListName())
-				).append("\n\n");
-			}
-			text.append(error.first);
+		const auto errorWithThread = GetErrorForSending(
+			result,
+			{ .text = &comment });
+		if (errorWithThread.error) {
 			if (*box) {
-				(*box)->uiShow()->showBox(Ui::MakeInformBox(text));
+				(*box)->uiShow()->showBox(MakeSendErrorBox(
+					errorWithThread,
+					result.size() > 1));
 			}
 			return;
+		} else if (!checkPaid()) {
+			return;
 		}
 
 		*sending = true;
@@ -1485,7 +1533,7 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 			comment.text = link;
 		}
 		auto &api = session->api();
-		for (const auto thread : result) {
+		for (const auto &thread : result) {
 			auto message = Api::MessageToSend(
 				Api::SendAction(thread, options));
 			message.textWithTags = comment;
@@ -1499,7 +1547,7 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 	};
 	auto filterCallback = [](not_null<Data::Thread*> thread) {
 		if (const auto user = thread->peer()->asUser()) {
-			if (user->canSendIgnoreRequirePremium()) {
+			if (user->canSendIgnoreMoneyRestrictions()) {
 				return true;
 			}
 		}
@@ -1508,11 +1556,12 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 	auto object = Box<ShareBox>(ShareBox::Descriptor{
 		.session = session,
 		.copyCallback = std::move(copyCallback),
+		.countMessagesCallback = std::move(countMessagesCallback),
 		.submitCallback = std::move(submitCallback),
 		.filterCallback = std::move(filterCallback),
-		.premiumRequiredError = SharePremiumRequiredError(),
+		.moneyRestrictionError = ShareMessageMoneyRestrictionError(),
 	});
-	*box = Ui::MakeWeak(object.data());
+	*box = base::make_weak(object.data());
 	return object;
 }
 
@@ -1534,7 +1583,7 @@ object_ptr<Ui::BoxContent> EditLinkBox(
 	constexpr auto kPeriod = 3600 * 24 * 30;
 	constexpr auto kTestModePeriod = 300;
 	const auto creating = data.link.isEmpty();
-	const auto box = std::make_shared<QPointer<Ui::GenericBox>>();
+	const auto box = std::make_shared<base::weak_qptr<Ui::GenericBox>>();
 	using Fields = Ui::InviteLinkFields;
 	const auto done = [=](Fields result) {
 		const auto finish = [=](Api::InviteLink finished) {
@@ -1581,6 +1630,16 @@ object_ptr<Ui::BoxContent> EditLinkBox(
 	};
 	const auto isGroup = !peer->isBroadcast();
 	const auto isPublic = peer->isChannel() && peer->asChannel()->isPublic();
+	const auto globalRequestApproval = peer->isChannel()
+		&& peer->asChannel()->requestToJoin();
+	const auto guardBot = [&]() -> UserData* {
+		const auto channel = peer->asChannel();
+		return channel ? channel->guardBot() : nullptr;
+	}();
+	const auto guardBotUsername = guardBot ? guardBot->username() : QString();
+	const auto guardBotLink = guardBotUsername.isEmpty()
+		? QString()
+		: peer->session().createInternalLink(guardBotUsername);
 	auto object = Box([=](not_null<Ui::GenericBox*> box) {
 		const auto fill = isGroup
 			? Fn<Ui::InviteLinkSubscriptionToggle()>(nullptr)
@@ -1588,7 +1647,15 @@ object_ptr<Ui::BoxContent> EditLinkBox(
 				return Ui::FillCreateInviteLinkSubscriptionToggle(box, peer);
 			};
 		if (creating) {
-			Ui::CreateInviteLinkBox(box, fill, isGroup, isPublic, done);
+			Ui::CreateInviteLinkBox(
+				box,
+				fill,
+				isGroup,
+				isPublic,
+				globalRequestApproval,
+				guardBotUsername,
+				guardBotLink,
+				done);
 		} else {
 			Ui::EditInviteLinkBox(
 				box,
@@ -1602,11 +1669,14 @@ object_ptr<Ui::BoxContent> EditLinkBox(
 					.requestApproval = data.requestApproval,
 					.isGroup = isGroup,
 					.isPublic = isPublic,
+					.globalRequestApproval = globalRequestApproval,
+					.guardBotUsername = guardBotUsername,
+					.guardBotLink = guardBotLink,
 				},
 				done);
 		}
 	});
-	*box = Ui::MakeWeak(object.data());
+	*box = base::make_weak(object.data());
 	return object;
 }
 
@@ -1667,7 +1737,7 @@ object_ptr<Ui::BoxContent> ShowInviteLinkBox(
 		not_null<Ui::BoxContent*> box) {
 		rpl::duplicate(
 			data
-		) | rpl::start_with_next([=](const LinkData &link) {
+		) | rpl::on_next([=](const LinkData &link) {
 			if (ClosingLinkBox(link, revoked)) {
 				box->closeBox();
 				return;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
index e59ffdd5e9d20d..45abe3a4662fe7 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h
@@ -16,6 +16,10 @@ namespace Api {
 struct InviteLink;
 } // namespace Api
 
+namespace Data {
+class Thread;
+} // namespace Data
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -31,7 +35,14 @@ class BoxContent;
 void AddSinglePeerRow(
 	not_null<Ui::VerticalLayout*> container,
 	not_null<PeerData*> peer,
-	rpl::producer<QString> status);
+	rpl::producer<QString> status,
+	Fn<void()> clicked = nullptr);
+
+void AddSinglePeerRow(
+	not_null<Ui::VerticalLayout*> container,
+	not_null<Data::Thread*> thread,
+	rpl::producer<QString> status,
+	Fn<void()> clicked = nullptr);
 
 void AddPermanentLinkBlock(
 	std::shared_ptr<Ui::Show> show,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
index e3f387062d0b4b..9809b8fae82183 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp
@@ -173,7 +173,7 @@ class Row final : public PeerListRow {
 			link.usageLimit)
 		: tr::lng_group_invite_no_joined(tr::now);
 	const auto add = [&](const QString &text) {
-		result += QString::fromUtf8(" \xE2\x80\xA2 ") + text;
+		result += ' ' + Ui::kQBullet + ' ' + text;
 	};
 	if (revoked) {
 		return result;
@@ -209,6 +209,9 @@ class Row final : public PeerListRow {
 			add(QLocale().toString(time, QLocale::LongFormat));
 		}
 	}
+	if (link.requestApproval) {
+		add(tr::lng_group_invite_approval_required(tr::now));
+	}
 	return result;
 }
 
@@ -441,7 +444,7 @@ LinksController::LinksController(
 , _count(count)
 , _updateExpiringTimer([=] { expiringProgressTimer(); }) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &image : _icons) {
 			image = QImage();
 		}
@@ -450,7 +453,7 @@ LinksController::LinksController(
 	peer->session().api().inviteLinks().updates(
 		peer,
 		admin
-	) | rpl::start_with_next([=](const Api::InviteLinkUpdate &update) {
+	) | rpl::on_next([=](const Api::InviteLinkUpdate &update) {
 		const auto now = base::unixtime::now();
 		if (!update.now || update.now->revoked != _revoked) {
 			if (removeRow(update.was)) {
@@ -472,7 +475,7 @@ LinksController::LinksController(
 		peer->session().api().inviteLinks().allRevokedDestroyed(
 			peer,
 			admin
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_requesting = false;
 			_allLoaded = true;
 			while (delegate()->peerListFullRowsCount()) {
@@ -803,7 +806,7 @@ void AdminsController::prepare() {
 		return;
 	}
 	_requestId = session().api().request(MTPmessages_GetAdminsWithInvites(
-		_peer->input
+		_peer->input()
 	)).done([=](const MTPmessages_ChatAdminsWithInvites &result) {
 		result.match([&](const MTPDmessages_chatAdminsWithInvites &data) {
 			auto &owner = _peer->owner();
@@ -961,7 +964,7 @@ void ManageInviteLinksBox(
 	*countValue = controller->fullCountValue();
 
 	controller->permanentFound(
-	) | rpl::start_with_next([=](InviteLinkData &&data) {
+	) | rpl::on_next([=](InviteLinkData &&data) {
 		permanentFromList->fire(std::move(data));
 	}, container->lifetime());
 
@@ -1013,7 +1016,7 @@ void ManageInviteLinksBox(
 	rpl::combine(
 		revokedHeader->topValue(),
 		container->widthValue()
-	) | rpl::start_with_next([=](int top, int outerWidth) {
+	) | rpl::on_next([=](int top, int outerWidth) {
 		deleteAll->moveToRight(
 			st::inviteLinkRevokedTitlePadding.left(),
 			top + st::inviteLinkRevokedTitlePadding.top(),
@@ -1027,7 +1030,7 @@ void ManageInviteLinksBox(
 		list->heightValue(),
 		admins->heightValue(),
 		revoked->heightValue()
-	) | rpl::start_with_next([=](int list, int admins, int revoked) {
+	) | rpl::on_next([=](int list, int admins, int revoked) {
 		if (otherHeader) {
 			otherHeader->toggle(list > 0, anim::type::instant);
 		}
@@ -1058,7 +1061,7 @@ object_ptr<Ui::SettingsButton> MakeCreateLinkButton(
 	icon->resize(size, size);
 
 	raw->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		const auto &st = st::inviteLinkList.item;
 		icon->move(
 			st.photoPosition.x() + (st.photoSize - size) / 2,
@@ -1066,7 +1069,7 @@ object_ptr<Ui::SettingsButton> MakeCreateLinkButton(
 	}, icon->lifetime());
 
 	icon->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(icon);
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::windowBgActive);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
index 2258f6c215320e..f5875e68e95b35 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "history/admin_log/history_admin_log_filter.h"
 #include "core/ui_integration.h"
 #include "data/stickers/data_custom_emoji.h"
+#include "data/business/data_business_chatbots.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_session.h"
@@ -31,10 +32,12 @@ For license and copyright information please follow this link:
 #include "info/profile/info_profile_values.h"
 #include "boxes/peers/edit_participants_box.h"
 #include "boxes/peers/edit_peer_info_box.h"
+#include "boxes/edit_privacy_box.h"
 #include "settings/settings_power_saving.h"
 #include "window/window_session_controller.h"
 #include "window/window_controller.h"
 #include "main/main_session.h"
+#include "mtproto/mtproto_config.h" // megagroupSizeMax
 #include "apiwrap.h"
 #include "settings/settings_common.h"
 #include "styles/style_layers.h"
@@ -47,10 +50,10 @@ For license and copyright information please follow this link:
 
 namespace {
 
-constexpr auto kSlowmodeValues = 7;
+constexpr auto kSlowmodeValues = 8;
 constexpr auto kBoostsUnrestrictValues = 5;
-constexpr auto kSuggestGigagroupThreshold = 199000;
 constexpr auto kForceDisableTooltipDuration = 3 * crl::time(1000);
+constexpr auto kDefaultChargeStars = 10;
 
 [[nodiscard]] auto Dependencies(PowerSaving::Flags)
 -> std::vector<std::pair<PowerSaving::Flag, PowerSaving::Flag>> {
@@ -62,6 +65,11 @@ constexpr auto kForceDisableTooltipDuration = 3 * crl::time(1000);
 	return std::vector<std::pair<Flag, Flag>>{};
 }
 
+[[nodiscard]] auto Dependencies(Data::ChatbotsPermissions) {
+	using Flag = Data::ChatbotsPermission;
+	return std::vector<std::pair<Flag, Flag>>{};
+}
+
 [[nodiscard]] auto NestedRestrictionLabelsList(
 	Data::RestrictionsSetOptions options)
 -> std::vector<NestedEditFlagsLabels<ChatRestrictions>> {
@@ -83,11 +91,15 @@ constexpr auto kForceDisableTooltipDuration = 3 * crl::time(1000);
 			| Flag::SendInline, tr::lng_rights_chat_stickers(tr::now) },
 		{ Flag::EmbedLinks, tr::lng_rights_chat_send_links(tr::now) },
 		{ Flag::SendPolls, tr::lng_rights_chat_send_polls(tr::now) },
+		{ Flag::SendReactions, tr::lng_rights_chat_send_reactions(tr::now) },
 	};
 	auto second = std::vector<RestrictionLabel>{
 		{ Flag::AddParticipants, tr::lng_rights_chat_add_members(tr::now) },
 		{ Flag::CreateTopics, tr::lng_rights_group_add_topics(tr::now) },
 		{ Flag::PinMessages, tr::lng_rights_group_pin(tr::now) },
+		{ Flag::EditRank, (options.isUserSpecific
+			? tr::lng_rights_group_edit_rank_single
+			: tr::lng_rights_group_edit_rank)(tr::now) },
 		{ Flag::ChangeInfo, tr::lng_rights_group_info(tr::now) },
 	};
 	if (!options.isForum) {
@@ -128,9 +140,16 @@ constexpr auto kForceDisableTooltipDuration = 3 * crl::time(1000);
 		};
 		auto second = std::vector<AdminRightLabel>{
 			{ Flag::ManageCall, tr::lng_rights_group_manage_calls(tr::now) },
+			{ Flag::ManageRanks, tr::lng_rights_group_manage_ranks(tr::now) },
 			{ Flag::Anonymous, tr::lng_rights_group_anonymous(tr::now) },
 			{ Flag::AddAdmins, tr::lng_rights_add_admins(tr::now) },
 		};
+		if (options.canProcessJoinRequests) {
+			second.push_back({
+				Flag::ProcessJoinRequests,
+				tr::lng_rights_group_process_join_requests(tr::now),
+			});
+		}
 		if (!options.isForum) {
 			first.erase(
 				ranges::remove(
@@ -156,13 +175,24 @@ constexpr auto kForceDisableTooltipDuration = 3 * crl::time(1000);
 	auto stories = std::vector<AdminRightLabel>{
 		{ Flag::PostStories, tr::lng_rights_channel_post_stories(tr::now) },
 		{ Flag::EditStories, tr::lng_rights_channel_edit_stories(tr::now) },
-		{ Flag::DeleteStories, tr::lng_rights_channel_delete_stories(tr::now) },
+		{
+			Flag::DeleteStories,
+			tr::lng_rights_channel_delete_stories(tr::now),
+		},
 	};
 	auto second = std::vector<AdminRightLabel>{
 		{ Flag::InviteByLinkOrAdd, tr::lng_rights_group_invite(tr::now) },
 		{ Flag::ManageCall, tr::lng_rights_channel_manage_calls(tr::now) },
+		{ Flag::ManageDirect, tr::lng_rights_channel_manage_direct(tr::now) },
 		{ Flag::AddAdmins, tr::lng_rights_add_admins(tr::now) },
+		{ Flag::BanUsers, tr::lng_rights_group_ban(tr::now) },
 	};
+	if (options.canProcessJoinRequests) {
+		second.push_back({
+			Flag::ProcessJoinRequests,
+			tr::lng_rights_group_process_join_requests(tr::now),
+		});
+	}
 	return {
 		{ std::nullopt, std::move(first) },
 		{ tr::lng_rights_channel_manage(), std::move(messages) },
@@ -176,12 +206,13 @@ int SlowmodeDelayByIndex(int index) {
 
 	switch (index) {
 	case 0: return 0;
-	case 1: return 10;
-	case 2: return 30;
-	case 3: return 60;
-	case 4: return 5 * 60;
-	case 5: return 15 * 60;
-	case 6: return 60 * 60;
+	case 1: return 5;
+	case 2: return 10;
+	case 3: return 30;
+	case 4: return 60;
+	case 5: return 5 * 60;
+	case 6: return 15 * 60;
+	case 7: return 60 * 60;
 	}
 	Unexpected("Index in SlowmodeDelayByIndex.");
 }
@@ -287,6 +318,7 @@ ChatRestrictions NegateRestrictions(ChatRestrictions value) {
 		//| Flag::ViewMessages
 		| Flag::ChangeInfo
 		| Flag::EmbedLinks
+		| Flag::SendReactions
 		| Flag::AddParticipants
 		| Flag::CreateTopics
 		| Flag::PinMessages
@@ -301,7 +333,8 @@ ChatRestrictions NegateRestrictions(ChatRestrictions value) {
 		| Flag::SendMusic
 		| Flag::SendVoiceMessages
 		| Flag::SendFiles
-		| Flag::SendOther);
+		| Flag::SendOther
+		| Flag::EditRank);
 }
 
 auto Dependencies(ChatAdminRights)
@@ -393,14 +426,14 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 	{
 		const auto separator = Ui::CreateChild<Ui::RpWidget>(container.get());
 		separator->paintRequest(
-		) | rpl::start_with_next([=, bg = st.textBgOver] {
+		) | rpl::on_next([=, bg = st.textBgOver] {
 			auto p = QPainter(separator);
 			p.fillRect(separator->rect(), bg);
 		}, separator->lifetime());
 		const auto separatorHeight = 2 * st.toggle.border
 			+ st.toggle.diameter;
 		button->geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			const auto w = st::rightsButtonToggleWidth;
 			toggleButton->setGeometry(
 				r.x() + r.width() - w,
@@ -417,12 +450,12 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 		const auto checkWidget = Ui::CreateChild<Ui::RpWidget>(toggleButton);
 		checkWidget->resize(checkView->getSize());
 		checkWidget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(checkWidget);
 			checkView->paint(p, 0, 0, checkWidget->width());
 		}, checkWidget->lifetime());
 		toggleButton->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			checkWidget->moveToRight(
 				st.toggleSkip,
 				(s.height() - checkWidget->height()) / 2);
@@ -430,7 +463,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 	}
 	state->anyChanges.events_starting_with(
 		rpl::empty_value()
-	) | rpl::map(countChecked) | rpl::start_with_next([=](int count) {
+	) | rpl::map(countChecked) | rpl::on_next([=](int count) {
 		checkView->setChecked(count > 0, anim::type::normal);
 	}, toggleButton->lifetime());
 	checkView->setLocked(locked.has_value());
@@ -445,7 +478,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 				rpl::empty_value()
 			) | rpl::map(countChecked)
 		) | rpl::map([=](const QString &t, int checked) {
-			auto count = Ui::Text::Bold("  "
+			auto count = tr::bold("  "
 				+ QString::number(checked)
 				+ '/'
 				+ QString::number(totalInnerChecks));
@@ -457,7 +490,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 		const auto &icon = st::permissionsExpandIcon;
 		arrow->resize(icon.size());
 		arrow->paintRequest(
-		) | rpl::start_with_next([=, &icon] {
+		) | rpl::on_next([=, &icon] {
 			auto p = QPainter(arrow);
 			const auto center = QPointF(
 				icon.width() / 2.,
@@ -474,23 +507,31 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 			icon.paint(p, 0, 0, arrow->width());
 		}, arrow->lifetime());
 	}
-	button->sizeValue(
-	) | rpl::start_with_next([=, &st](const QSize &s) {
+	const auto reposition = [=, &st] {
+		const auto s = button->size();
 		const auto labelLeft = st.padding.left();
 		const auto labelRight = s.width() - toggleButton->width();
 
-		label->resizeToWidth(labelRight - labelLeft - arrow->width());
+		const auto arrowSkip = st::rightsButtonArrowSkip;
+		label->resizeToWidth(
+			labelRight - labelLeft - arrow->width() - arrowSkip);
 		label->moveToLeft(
 			labelLeft,
 			(s.height() - label->height()) / 2);
 		arrow->moveToLeft(
 			std::min(
-				labelLeft + label->textMaxWidth(),
+				labelLeft + label->textMaxWidth() + arrowSkip,
 				labelRight - arrow->width()),
 			(s.height() - arrow->height()) / 2);
+	};
+	rpl::merge(
+		button->sizeValue() | rpl::to_empty,
+		state->anyChanges.events_starting_with(rpl::empty_value())
+	) | rpl::on_next([=] {
+		reposition();
 	}, button->lifetime());
 	wrap->toggledValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::skip(1) | rpl::on_next([=](bool toggled) {
 		state->animation.start(
 			[=] { arrow->update(); },
 			toggled ? 0. : 1.,
@@ -507,14 +548,14 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 	};
 
 	button->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!handleLocked()) {
 			wrap->toggle(!wrap->toggled(), anim::type::normal);
 		}
 	}, button->lifetime());
 
 	toggleButton->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!handleLocked()) {
 			const auto checked = !checkView->checked();
 			for (const auto &innerCheck : state->innerChecks) {
@@ -549,7 +590,7 @@ template <typename Flags>
 		});
 
 		state->forceDisabled.value(
-		) | rpl::start_with_next([=](bool disabled) {
+		) | rpl::on_next([=](bool disabled) {
 			if (disabled) {
 				for (const auto &[flags, checkView] : state->checkViews) {
 					checkView->setChecked(false, anim::type::normal);
@@ -615,7 +656,7 @@ template <typename Flags>
 				rpl::combine(
 					verticalLayout->widthValue(),
 					checkbox->geometryValue()
-				) | rpl::start_with_next([=](int w, const QRect &r) {
+				) | rpl::on_next([=](int w, const QRect &r) {
 					button->setGeometry(0, r.y(), w, r.height());
 				}, button->lifetime());
 				checkbox->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -645,12 +686,12 @@ template <typename Flags>
 					[=] { toggle->update(); });
 				toggle->resize(checkView->getSize());
 				toggle->paintRequest(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					auto p = QPainter(toggle);
 					checkView->paint(p, 0, 0, toggle->width());
 				}, toggle->lifetime());
 				button->sizeValue(
-				) | rpl::start_with_next([=](const QSize &s) {
+				) | rpl::on_next([=](const QSize &s) {
 					toggle->moveToRight(
 						st.toggleSkip,
 						(s.height() - toggle->height()) / 2);
@@ -666,7 +707,7 @@ template <typename Flags>
 		}();
 		state->checkViews.emplace(flags, checkView);
 		checkView->checkedChanges(
-		) | rpl::start_with_next([=](bool checked) {
+		) | rpl::on_next([=](bool checked) {
 			if (checked && state->forceDisabled.current()) {
 				if (!state->toast) {
 					state->toast = Ui::Toast::Show(container, {
@@ -677,7 +718,7 @@ template <typename Flags>
 				checkView->setChecked(false, anim::type::instant);
 			} else if (locked.has_value()) {
 				if (checked != toggled) {
-					if (!state->toast) {
+					if (!state->toast && !locked->isEmpty()) {
 						state->toast = Ui::Toast::Show(container, {
 							.text = { *locked },
 							.duration = kForceDisableTooltipDuration,
@@ -698,6 +739,8 @@ template <typename Flags>
 
 		return checkView;
 	};
+	auto highlightWidget = QPointer<Ui::RpWidget>();
+	const auto highlightFlags = descriptor.highlightFlags;
 	for (const auto &nestedWithLabel : descriptor.labels) {
 		Assert(!nestedWithLabel.nested.empty());
 
@@ -709,16 +752,18 @@ template <typename Flags>
 			: object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>{ nullptr };
 		const auto verticalLayout = wrap ? wrap->entity() : container.get();
 		auto innerChecks = std::vector<not_null<Ui::AbstractCheckView*>>();
+		auto sectionFlags = Flags();
 		for (const auto &entry : nestedWithLabel.nested) {
 			const auto c = addCheckbox(verticalLayout, isInner, entry);
 			if (isInner) {
 				innerChecks.push_back(c);
+				sectionFlags |= entry.flags;
 			}
 		}
 		if (wrap) {
 			const auto raw = wrap.data();
 			raw->hide(anim::type::instant);
-			AddInnerToggle(
+			const auto toggle = AddInnerToggle(
 				container,
 				st,
 				innerChecks,
@@ -726,9 +771,12 @@ template <typename Flags>
 				*nestedWithLabel.nestingLabel,
 				std::nullopt,
 				{ nestedWithLabel.nested.front().icon });
+			if (highlightFlags && (sectionFlags & highlightFlags)) {
+				highlightWidget = toggle;
+			}
 			container->add(std::move(wrap));
 			container->widthValue(
-			) | rpl::start_with_next([=](int w) {
+			) | rpl::on_next([=](int w) {
 				raw->resizeToWidth(w);
 			}, raw->lifetime());
 		}
@@ -740,9 +788,10 @@ template <typename Flags>
 	}
 
 	return {
-		nullptr,
-		value,
-		state->anyChanges.events() | rpl::map(value)
+		.widget = nullptr,
+		.value = value,
+		.changes = state->anyChanges.events() | rpl::map(value),
+		.highlightWidget = highlightWidget,
 	};
 }
 
@@ -766,7 +815,7 @@ void AddSlowmodeLabels(
 		rpl::combine(
 			labels->widthValue(),
 			label->widthValue()
-		) | rpl::start_with_next([=](int outer, int inner) {
+		) | rpl::on_next([=](int outer, int inner) {
 			const auto skip = st::localStorageLimitMargin;
 			const auto size = st::localStorageLimitSlider.seekSize;
 			const auto available = outer
@@ -874,37 +923,22 @@ rpl::producer<int> AddSlowmodeSlider(
 	return secondsCount->value();
 }
 
-void AddBoostsUnrestrictLabels(
-		not_null<Ui::VerticalLayout*> container,
-		not_null<Main::Session*> session) {
+void AddBoostsUnrestrictLabels(not_null<Ui::VerticalLayout*> container) {
 	const auto labels = container->add(
 		object_ptr<Ui::FixedHeightWidget>(container, st::normalFont->height),
 		st::slowmodeLabelsMargin);
-	const auto manager = &session->data().customEmojiManager();
-	const auto one = Ui::Text::SingleCustomEmoji(
-		manager->registerInternalEmoji(
-			st::boostMessageIcon,
-			st::boostMessageIconPadding));
-	const auto many = Ui::Text::SingleCustomEmoji(
-		manager->registerInternalEmoji(
-			st::boostsMessageIcon,
-			st::boostsMessageIconPadding));
-	const auto context = Core::MarkedTextContext{
-		.session = session,
-		.customEmojiRepaint = [] {},
-		.customEmojiLoopLimit = 1,
-	};
+	const auto one = Ui::Text::IconEmoji(&st::boostMessageIcon);
+	const auto many = Ui::Text::IconEmoji(&st::boostsMessageIcon);
 	for (auto i = 0; i != kBoostsUnrestrictValues; ++i) {
 		const auto label = Ui::CreateChild<Ui::FlatLabel>(
 			labels,
 			st::boostsUnrestrictLabel);
 		label->setMarkedText(
-			TextWithEntities(i ? many : one).append(QString::number(i + 1)),
-			context);
+			TextWithEntities(i ? many : one).append(QString::number(i + 1)));
 		rpl::combine(
 			labels->widthValue(),
 			label->widthValue()
-		) | rpl::start_with_next([=](int outer, int inner) {
+		) | rpl::on_next([=](int outer, int inner) {
 			const auto skip = st::localStorageLimitMargin;
 			const auto size = st::localStorageLimitSlider.seekSize;
 			const auto available = outer
@@ -940,9 +974,7 @@ rpl::producer<int> AddBoostsUnrestrictSlider(
 	const auto boostsUnrestrict = lifetime.make_state<rpl::variable<int>>(
 		channel ? channel->boostsUnrestrict() : 0);
 
-	container->add(
-		object_ptr<Ui::BoxContentDivider>(container),
-		{ 0, st::infoProfileSkip, 0, st::infoProfileSkip });
+	Ui::AddSkip(container);
 
 	auto enabled = boostsUnrestrict->value(
 	) | rpl::map(_1 > 0);
@@ -951,7 +983,7 @@ rpl::producer<int> AddBoostsUnrestrictSlider(
 		tr::lng_rights_boosts_no_restrict(),
 		st::defaultSettingsButton
 	))->toggleOn(rpl::duplicate(enabled))->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		if (toggled && !boostsUnrestrict->current()) {
 			*boostsUnrestrict = 1;
 		} else if (!toggled && boostsUnrestrict->current()) {
@@ -968,7 +1000,7 @@ rpl::producer<int> AddBoostsUnrestrictSlider(
 
 	const auto inner = outer->entity();
 
-	AddBoostsUnrestrictLabels(inner, &peer->session());
+	AddBoostsUnrestrictLabels(inner);
 
 	const auto slider = inner->add(
 		object_ptr<Ui::MediaSlider>(inner, st::localStorageLimitSlider),
@@ -1006,19 +1038,20 @@ rpl::producer<int> AddBoostsUnrestrictWrapped(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			container,
 			object_ptr<Ui::VerticalLayout>(container)));
-	wrap->toggleOn(rpl::duplicate(shown), anim::type::normal);
+	wrap->toggleOn(std::move(shown), anim::type::normal);
 	wrap->finishAnimating();
 
-	auto result = AddBoostsUnrestrictSlider(wrap->entity(), peer);
-	const auto divider = container->add(
+	const auto inner = wrap->entity();
+
+	auto result = AddBoostsUnrestrictSlider(inner, peer);
+
+	const auto skip = st::defaultVerticalListSkip;
+	const auto divider = inner->add(
 		object_ptr<Ui::SlideWrap<Ui::BoxContentDivider>>(
-			container,
-			object_ptr<Ui::BoxContentDivider>(container),
-			QMargins{ 0, st::infoProfileSkip, 0, st::infoProfileSkip }));
-	divider->toggleOn(rpl::combine(
-		std::move(shown),
-		rpl::duplicate(result),
-		!rpl::mappers::_1 || !rpl::mappers::_2));
+			inner,
+			object_ptr<Ui::BoxContentDivider>(inner),
+			QMargins{ 0, skip, 0, skip }));
+	divider->toggleOn(rpl::duplicate(result) | rpl::map(!rpl::mappers::_1));
 	divider->finishAnimating();
 
 	return result;
@@ -1133,7 +1166,7 @@ void ShowEditPeerPermissionsBox(
 				result.emplace(
 					Flag::ChangeInfo | Flag::PinMessages,
 					tr::lng_rights_permission_unavailable(tr::now));
-			} else if (channel->isMegagroup() && channel->linkedChat()) {
+			} else if (channel->isMegagroup() && channel->discussionLink()) {
 				result.emplace(
 					Flag::ChangeInfo | Flag::PinMessages,
 					tr::lng_rights_permission_in_discuss(tr::now));
@@ -1145,7 +1178,7 @@ void ShowEditPeerPermissionsBox(
 	Ui::AddSubsectionTitle(
 		inner,
 		tr::lng_rights_default_restrictions_header());
-	auto [checkboxes, getRestrictions, changes] = CreateEditRestrictions(
+	auto [checkboxes, getRestrictions, changes, highlightWidget] = CreateEditRestrictions(
 		inner,
 		restrictions,
 		disabledMessages,
@@ -1157,8 +1190,46 @@ void ShowEditPeerPermissionsBox(
 		rpl::variable<int> slowmodeSeconds;
 		rpl::variable<int> boostsUnrestrict;
 		rpl::variable<bool> hasSendRestrictions;
+		rpl::variable<int> starsPerMessage;
 	};
+	const auto state = inner->lifetime().make_state<State>();
+	const auto channel = peer->asChannel();
+	const auto available = channel && channel->paidMessagesAvailable();
+
+	Ui::AddSkip(inner);
+	Ui::AddDivider(inner);
+	auto charging = (Ui::SettingsButton*)nullptr;
+	if (available) {
+		Ui::AddSkip(inner);
+		const auto starsPerMessage = peer->isChannel()
+			? peer->asChannel()->commonStarsPerMessage()
+			: 0;
+		charging = inner->add(object_ptr<Ui::SettingsButton>(
+			inner,
+			tr::lng_rights_charge_stars(),
+			st::settingsButtonNoIcon));
+		charging->toggleOn(rpl::single(starsPerMessage > 0));
+		Ui::AddSkip(inner);
+		Ui::AddDividerText(inner, tr::lng_rights_charge_stars_about());
+
+		const auto chargeWrap = inner->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				inner,
+				object_ptr<Ui::VerticalLayout>(inner)));
+		chargeWrap->toggleOn(charging->toggledValue());
+		chargeWrap->finishAnimating();
+		const auto chargeInner = chargeWrap->entity();
+
+		Ui::AddSkip(chargeInner);
+		state->starsPerMessage = SetupChargeSlider(
+			chargeInner,
+			peer,
+			(starsPerMessage > 0) ? starsPerMessage : std::optional<int>(),
+			kDefaultChargeStars);
+	}
+
 	static constexpr auto kSendRestrictions = Flag::EmbedLinks
+		| Flag::SendReactions
 		| Flag::SendGames
 		| Flag::SendGifs
 		| Flag::SendInline
@@ -1171,7 +1242,6 @@ void ShowEditPeerPermissionsBox(
 		| Flag::SendVoiceMessages
 		| Flag::SendFiles
 		| Flag::SendOther;
-	const auto state = inner->lifetime().make_state<State>();
 	state->hasSendRestrictions = ((restrictions & kSendRestrictions) != 0)
 		|| (peer->isChannel() && peer->asChannel()->slowmodeSeconds() > 0);
 	state->boostsUnrestrict = AddBoostsUnrestrictWrapped(
@@ -1189,8 +1259,11 @@ void ShowEditPeerPermissionsBox(
 	});
 
 	if (const auto channel = peer->asChannel()) {
+		constexpr auto kThresholdOffset = int(1000);
+		const auto threshold =  -kThresholdOffset
+			+ channel->session().serverConfig().megagroupSizeMax;
 		if (channel->amCreator()
-			&& channel->membersCount() >= kSuggestGigagroupThreshold) {
+			&& channel->membersCount() >= threshold) {
 			AddSuggestGigagroup(
 				inner,
 				AboutGigagroupCallback(
@@ -1209,10 +1282,14 @@ void ShowEditPeerPermissionsBox(
 		const auto boostsUnrestrict = hasRestrictions
 			? state->boostsUnrestrict.current()
 			: 0;
+		const auto starsPerMessage = (charging && charging->toggled())
+			? state->starsPerMessage.current()
+			: 0;
 		done({
 			restrictions,
 			slowmodeSeconds,
 			boostsUnrestrict,
+			starsPerMessage,
 		});
 	});
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
@@ -1232,7 +1309,7 @@ Fn<void()> AboutGigagroupCallback(
 		}
 		*converting = true;
 		channel->session().api().request(MTPchannels_ConvertToGigagroup(
-			channel->inputChannel
+			channel->inputChannel()
 		)).done([=](const MTPUpdates &result) {
 			channel->session().api().applyUpdates(result);
 			if (const auto strong = weak.get()) {
@@ -1254,7 +1331,7 @@ Fn<void()> AboutGigagroupCallback(
 				object_ptr<Ui::FlatLabel>(
 					box,
 					tr::lng_gigagroup_warning(
-					) | Ui::Text::ToRichLangValue(),
+					) | rpl::map(tr::rich),
 					st::infoAboutGigagroup));
 			box->addButton(tr::lng_gigagroup_convert_sure(), convertSure);
 			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
@@ -1269,7 +1346,7 @@ Fn<void()> AboutGigagroupCallback(
 			box->setTitle(tr::lng_gigagroup_convert_title());
 			const auto addFeature = [&](rpl::producer<QString> text) {
 				using namespace rpl::mappers;
-				const auto prefix = QString::fromUtf8("\xE2\x80\xA2 ");
+				const auto prefix = Ui::kQBullet + ' ';
 				box->addRow(
 					object_ptr<Ui::FlatLabel>(
 						box,
@@ -1410,7 +1487,9 @@ ChatAdminRights AdminRightsForOwnershipTransfer(
 		Data::AdminRightsSetOptions options) {
 	auto result = ChatAdminRights();
 	for (const auto &entry : AdminRightLabels(options)) {
-		if (!(entry.flags & ChatAdminRight::Anonymous)) {
+		if (!(entry.flags
+			& (ChatAdminRight::Anonymous
+				| ChatAdminRight::ProcessJoinRequests))) {
 			result |= entry.flags;
 		}
 	}
@@ -1420,10 +1499,12 @@ ChatAdminRights AdminRightsForOwnershipTransfer(
 EditFlagsControl<PowerSaving::Flags> CreateEditPowerSaving(
 		QWidget *parent,
 		PowerSaving::Flags flags,
-		rpl::producer<QString> forceDisabledMessage) {
+		rpl::producer<QString> forceDisabledMessage,
+		PowerSaving::Flags highlightFlags) {
 	auto widget = object_ptr<Ui::VerticalLayout>(parent);
 	auto descriptor = Settings::PowerSavingLabels();
 	descriptor.forceDisabledMessage = std::move(forceDisabledMessage);
+	descriptor.highlightFlags = highlightFlags;
 	auto result = CreateEditFlags(
 		widget.data(),
 		flags,
@@ -1447,3 +1528,20 @@ EditFlagsControl<AdminLog::FilterValue::Flags> CreateEditAdminLogFilter(
 
 	return result;
 }
+
+EditFlagsControl<Data::ChatbotsPermissions> CreateEditChatbotPermissions(
+		QWidget *parent,
+		Data::ChatbotsPermissions flags) {
+	auto widget = object_ptr<Ui::VerticalLayout>(parent);
+	auto descriptor = Data::ChatbotsPermissionsLabels();
+	descriptor.disabledMessages.emplace(
+		Data::ChatbotsPermission::ViewMessages,
+		QString());
+	auto result = CreateEditFlags(
+		widget.data(),
+		flags | Data::ChatbotsPermission::ViewMessages,
+		std::move(descriptor));
+	result.widget = std::move(widget);
+
+	return result;
+}
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.h
index ce45f4e680ff75..4d7ed413c7d757 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.h
@@ -27,6 +27,11 @@ enum Flag : uint32;
 using Flags = base::flags<Flag>;
 } // namespace PowerSaving
 
+namespace Data {
+enum class ChatbotsPermission;
+using ChatbotsPermissions = base::flags<ChatbotsPermission>;
+} // namespace Data
+
 template <typename Object>
 class object_ptr;
 
@@ -39,6 +44,7 @@ struct EditPeerPermissionsBoxResult final {
 	ChatRestrictions rights;
 	int slowmodeSeconds = 0;
 	int boostsUnrestrict = 0;
+	int starsPerMessage = 0;
 };
 
 void ShowEditPeerPermissionsBox(
@@ -63,6 +69,7 @@ struct EditFlagsControl {
 	object_ptr<Ui::RpWidget> widget;
 	Fn<Flags()> value;
 	rpl::producer<Flags> changes;
+	QPointer<Ui::RpWidget> highlightWidget;
 };
 
 template <typename Flags>
@@ -77,6 +84,7 @@ struct EditFlagsDescriptor {
 	base::flat_map<Flags, QString> disabledMessages;
 	const style::SettingsButton *st = nullptr;
 	rpl::producer<QString> forceDisabledMessage;
+	Flags highlightFlags = Flags();
 };
 
 using RestrictionLabel = EditFlagsLabel<ChatRestrictions>;
@@ -111,7 +119,8 @@ using AdminRightLabel = EditFlagsLabel<ChatAdminRights>;
 [[nodiscard]] auto CreateEditPowerSaving(
 	QWidget *parent,
 	PowerSaving::Flags flags,
-	rpl::producer<QString> forceDisabledMessage
+	rpl::producer<QString> forceDisabledMessage,
+	PowerSaving::Flags highlightFlags = PowerSaving::Flags()
 ) -> EditFlagsControl<PowerSaving::Flags>;
 
 [[nodiscard]] auto CreateEditAdminLogFilter(
@@ -119,3 +128,8 @@ using AdminRightLabel = EditFlagsLabel<ChatAdminRights>;
 	AdminLog::FilterValue::Flags flags,
 	bool isChannel
 ) -> EditFlagsControl<AdminLog::FilterValue::Flags>;
+
+[[nodiscard]] auto CreateEditChatbotPermissions(
+	QWidget *parent,
+	Data::ChatbotsPermissions flags
+) -> EditFlagsControl<Data::ChatbotsPermissions>;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
index f7b1a6b4c71c5c..5cb886fd3cfc2c 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "apiwrap.h"
 #include "base/event_filter.h"
+#include "chat_helpers/emoji_list_widget.h"
 #include "chat_helpers/tabbed_panel.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "core/ui_integration.h"
@@ -23,6 +24,7 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "ui/boxes/boost_box.h"
 #include "ui/layers/generic_box.h"
+#include "ui/text/text_custom_emoji.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/checkbox.h"
@@ -158,6 +160,23 @@ bool MaybeDisabledEmoji::readyInDefaultState() {
 	return { Data::ReactionId{ like }, Data::ReactionId{ dislike } };
 }
 
+[[nodiscard]] std::vector<Data::ReactionId> CollectAvailableReactions(
+		not_null<Main::Session*> session) {
+	const auto &all = session->data().reactions().list(
+		Data::Reactions::Type::Active);
+	if (all.empty()) {
+		return DefaultSelected();
+	}
+	auto result = std::vector<Data::ReactionId>();
+	result.reserve(all.size());
+	for (const auto &reaction : all) {
+		if (!reaction.id.paid()) {
+			result.push_back(reaction.id);
+		}
+	}
+	return result;
+}
+
 [[nodiscard]] bool RemoveNonCustomEmojiFragment(
 		not_null<QTextDocument*> document,
 		UniqueCustomEmojiContext &context) {
@@ -234,7 +253,7 @@ void SetupOnlyCustomEmojiField(
 	const auto state = field->lifetime().make_state<State>();
 
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->pending = true;
 		if (state->processing) {
 			return;
@@ -322,6 +341,7 @@ struct ReactionsSelectorArgs {
 	int customAllowed = 0;
 	int customHardLimit = 0;
 	bool all = false;
+	bool isGroup = false;
 };
 
 object_ptr<Ui::RpWidget> AddReactionsSelector(
@@ -362,26 +382,29 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 	const auto customEmojiPaused = [controller = args.controller] {
 		return controller->isGifPausedAtLeastFor(PauseReason::Layer);
 	};
-	auto factory = [=](QStringView data, Fn<void()> update)
-		-> std::unique_ptr<Ui::Text::CustomEmoji> {
+	auto simpleContext = Core::TextContext({
+		.session = session,
+		.repaint = [=] { raw->update(); },
+	});
+	auto context = simpleContext;
+	context.customEmojiFactory = [=](
+		QStringView data,
+		const Ui::Text::MarkedContext &context
+	) -> std::unique_ptr<Ui::Text::CustomEmoji> {
 		const auto id = Data::ParseCustomEmojiData(data);
-		auto result = owner->customEmojiManager().create(
-			data,
-			std::move(update));
+		auto result = Ui::Text::MakeCustomEmoji(data, simpleContext);
 		if (state->unifiedFactoryOwner->lookupReactionId(id).custom()) {
-			return std::make_unique<MaybeDisabledEmoji>(
+			return MakeWrappedEmoji<MaybeDisabledEmoji>(
 				std::move(result),
 				[=] { return state->allowed.contains(id); });
 		}
 		using namespace Ui::Text;
-		return std::make_unique<FirstFrameEmoji>(std::move(result));
+		return MakeWrappedEmoji<FirstFrameEmoji>(std::move(result));
 	};
-	raw->setCustomTextContext([=](Fn<void()> repaint) {
-		return std::any(Core::MarkedTextContext{
-			.session = session,
-			.customEmojiRepaint = std::move(repaint),
-		});
-	}, customEmojiPaused, customEmojiPaused, std::move(factory));
+	raw->setCustomTextContext(
+		std::move(context),
+		customEmojiPaused,
+		customEmojiPaused);
 
 	const auto callback = args.callback;
 	const auto isCustom = [=](DocumentId id) {
@@ -416,7 +439,7 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 	applyFromState();
 	std::move(
 		args.paid
-	) | rpl::start_with_next([=](bool paid) {
+	) | rpl::on_next([=](bool paid) {
 		const auto id = Data::ReactionId::Paid();
 		if (paid && !ranges::contains(state->reactions, id)) {
 			state->reactions.insert(begin(state->reactions), id);
@@ -436,14 +459,19 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 	using SelectorState = ReactionsSelectorState;
 	std::move(
 		args.stateValue
-	) | rpl::start_with_next([=](SelectorState value) {
+	) | rpl::on_next([=, all = args.all](SelectorState value) {
 		switch (value) {
 		case SelectorState::Active:
 			state->overlay = nullptr;
 			state->focusLifetime.destroy();
 			if (raw->empty()) {
 				raw->setTextWithTags(
-					ComposeEmojiList(reactions, DefaultSelected()));
+					ComposeEmojiList(
+						reactions,
+						all
+							? CollectAvailableReactions(
+								&args.controller->session())
+							: DefaultSelected()));
 			}
 			raw->setDisabled(false);
 			raw->setFocusFast();
@@ -451,10 +479,10 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 		case SelectorState::Disabled:
 			state->overlay = std::make_unique<Ui::RpWidget>(parent);
 			state->overlay->show();
-			raw->geometryValue() | rpl::start_with_next([=](QRect rect) {
+			raw->geometryValue() | rpl::on_next([=](QRect rect) {
 				state->overlay->setGeometry(rect);
 			}, state->overlay->lifetime());
-			state->overlay->paintRequest() | rpl::start_with_next([=](QRect clip) {
+			state->overlay->paintRequest() | rpl::on_next([=](QRect clip) {
 				auto color = st::boxBg->c;
 				color.setAlphaF(0.5);
 				QPainter(state->overlay.get()).fillRect(
@@ -468,7 +496,7 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 			}
 			raw->setDisabled(true);
 			raw->focusedChanges(
-			) | rpl::start_with_next([=](bool focused) {
+			) | rpl::on_next([=](bool focused) {
 				if (focused) {
 					raw->parentWidget()->setFocus();
 				}
@@ -491,14 +519,15 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 	panelList.erase(
 		ranges::remove(panelList, paid->selectAnimation->id),
 		end(panelList));
-	panel->selector()->provideRecentEmoji(panelList);
+	panel->selector()->provideRecentEmoji(
+		ChatHelpers::DocumentListToRecent(panelList));
 	panel->setDesiredHeightValues(
 		1.,
 		st::emojiPanMinHeight / 2,
 		st::emojiPanMinHeight);
 	panel->hide();
 	panel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		Data::InsertCustomEmoji(raw, data.document);
 	}, panel->lifetime());
 
@@ -535,7 +564,7 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 		panel->toggleAnimated();
 	});
 
-	raw->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	raw->geometryValue() | rpl::on_next([=](QRect geometry) {
 		toggle->move(
 			geometry.x() + geometry.width() - toggle->width(),
 			geometry.y() + geometry.height() - toggle->height());
@@ -567,9 +596,8 @@ void AddReactionsText(
 			inner,
 			tr::lng_manage_peer_reactions_own(
 				lt_link,
-				tr::lng_manage_peer_reactions_own_link(
-				) | Ui::Text::ToLink(),
-				Ui::Text::WithEntities),
+				tr::lng_manage_peer_reactions_own_link(tr::link),
+				tr::marked),
 			st::boxDividerLabel));
 	const auto weak = base::make_weak(navigation);
 	label->setClickHandlerFilter([=](const auto &...) {
@@ -590,11 +618,11 @@ void AddReactionsText(
 			count->value() | tr::to_count(),
 			lt_same_count,
 			std::move(countString),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		tr::lng_manage_peer_reactions_boost(
 			lt_link,
-			tr::lng_manage_peer_reactions_boost_link() | Ui::Text::ToLink(),
-			Ui::Text::RichLangValue)
+			tr::lng_manage_peer_reactions_boost_link(tr::link),
+			tr::rich)
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		a.append(' ').append(std::move(b));
 		return std::move(a);
@@ -664,7 +692,7 @@ void EditAllowedReactionsBox(
 	if (enabled) {
 		enabled->toggleOn(rpl::single(optionInitial != Option::None));
 		enabled->toggledValue(
-		) | rpl::start_with_next([=](bool value) {
+		) | rpl::on_next([=](bool value) {
 			state->selectorState = value
 				? SelectorState::Active
 				: SelectorState::Disabled;
@@ -732,9 +760,7 @@ void EditAllowedReactionsBox(
 
 	const auto all = args.list;
 	auto selected = (allowed.type != AllowedReactionsType::Some)
-		? (all
-			| ranges::views::transform(&Data::Reaction::id)
-			| ranges::to_vector)
+		? std::vector<Data::ReactionId>()
 		: allowed.some;
 	if (allowed.paidEnabled) {
 		selected.insert(begin(selected), Data::ReactionId::Paid());
@@ -754,7 +780,14 @@ void EditAllowedReactionsBox(
 				tr::lng_manage_peer_reactions_limit(tr::now));
 		}
 	};
-	changed(selected.empty() ? DefaultSelected() : std::move(selected), {});
+	changed(
+		!selected.empty()
+			? std::move(selected)
+			: !isGroup
+			? CollectAvailableReactions(
+				&args.navigation->parentController()->session())
+			: DefaultSelected(),
+		{});
 	Ui::AddSubsectionTitle(
 		reactions,
 		enabled
@@ -831,7 +864,7 @@ void EditAllowedReactionsBox(
 			left->sizeValue(),
 			center->sizeValue(),
 			right->sizeValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QSize &s,
 				const QSize &leftSize,
 				const QSize &centerSize,
@@ -896,7 +929,7 @@ void EditAllowedReactionsBox(
 			st::manageGroupNoIconButton.button));
 		paid->toggleOn(state->paidEnabled.value());
 		paid->toggledValue(
-		) | rpl::start_with_next([=](bool value) {
+		) | rpl::on_next([=](bool value) {
 			state->paidEnabled = value;
 		}, paid->lifetime());
 		Ui::AddSkip(inner);
@@ -906,11 +939,11 @@ void EditAllowedReactionsBox(
 			tr::lng_manage_peer_reactions_paid_about(
 				lt_link,
 				tr::lng_manage_peer_reactions_paid_link([=](QString text) {
-					return Ui::Text::Link(
+					return tr::link(
 						text,
 						u"https://telegram.org/tos/stars"_q);
 				}),
-				Ui::Text::WithEntities));
+				tr::marked));
 	}
 	const auto collect = [=] {
 		auto result = AllowedReactions();
@@ -981,7 +1014,7 @@ void SaveAllowedReactions(
 		MTP_flags(Flag()
 			| (maxCount ? Flag::f_reactions_limit : Flag())
 			| (editPaidEnabled ? Flag::f_paid_enabled : Flag())),
-		peer->input,
+		peer->input(),
 		updated,
 		MTP_int(maxCount),
 		MTP_bool(paidEnabled)
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp
index c28847bcc3ebb9..e7150ee0839236 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp
@@ -7,27 +7,30 @@ For license and copyright information please follow this link:
 */
 #include "boxes/peers/edit_peer_requests_box.h"
 
-#include "ui/effects/ripple_animation.h"
+#include "api/api_invite_links.h"
+#include "apiwrap.h"
+#include "base/unixtime.h"
 #include "boxes/peer_list_controllers.h"
 #include "boxes/peers/edit_participants_box.h" // SubscribeToMigration
 #include "boxes/peers/edit_peer_invite_link.h" // PrepareRequestedRowStatus
-#include "boxes/peers/prepare_short_info_box.h" // PrepareShortInfoBox
-#include "history/view/history_view_requests_bar.h" // kRecentRequestsLimit
-#include "data/data_peer.h"
-#include "data/data_user.h"
-#include "data/data_chat.h"
+#include "boxes/peers/edit_peer_requests_box.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_peer.h"
 #include "data/data_session.h"
-#include "base/unixtime.h"
+#include "data/data_user.h"
+#include "history/view/history_view_requests_bar.h" // kRecentRequestsLimit
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "info/requests_list/info_requests_list_widget.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "mtproto/sender.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/painter.h"
 #include "ui/round_rect.h"
 #include "ui/text/text_utilities.h"
-#include "ui/painter.h"
-#include "lang/lang_keys.h"
 #include "window/window_session_controller.h"
-#include "apiwrap.h"
-#include "api/api_invite_links.h"
 #include "styles/style_boxes.h"
 
 namespace {
@@ -262,14 +265,10 @@ RequestsBoxController::~RequestsBoxController() = default;
 void RequestsBoxController::Start(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<PeerData*> peer) {
-	auto controller = std::make_unique<RequestsBoxController>(
-		navigation,
-		peer->migrateToOrMe());
-	const auto initBox = [=](not_null<PeerListBox*> box) {
-		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
-	};
-	navigation->parentController()->show(
-		Box<PeerListBox>(std::move(controller), initBox));
+	navigation->showSection(
+		std::make_shared<Info::Memento>(
+			peer->migrateToOrMe(),
+			Info::Section::Type::RequestsList));
 }
 
 Main::Session &RequestsBoxController::session() const {
@@ -289,6 +288,58 @@ std::unique_ptr<PeerListRow> RequestsBoxController::createSearchRow(
 	return nullptr;
 }
 
+std::unique_ptr<PeerListRow> RequestsBoxController::createRestoredRow(
+		not_null<PeerData*> peer) {
+	if (const auto user = peer->asUser()) {
+		return createRow(user, _dates[user]);
+	}
+	return nullptr;
+}
+
+auto RequestsBoxController::saveState() const
+-> std::unique_ptr<PeerListState> {
+	auto result = PeerListController::saveState();
+
+	auto my = std::make_unique<SavedState>();
+	my->dates = _dates;
+	my->offsetDate = _offsetDate;
+	my->offsetUser = _offsetUser;
+	my->allLoaded = _allLoaded;
+	my->wasLoading = (_loadRequestId != 0);
+	if (const auto search = searchController()) {
+		my->searchState = search->saveState();
+	}
+	result->controllerState = std::move(my);
+	return result;
+}
+
+void RequestsBoxController::restoreState(
+		std::unique_ptr<PeerListState> state) {
+	auto typeErasedState = state
+		? state->controllerState.get()
+		: nullptr;
+	if (const auto my = dynamic_cast<SavedState*>(typeErasedState)) {
+		if (const auto requestId = base::take(_loadRequestId)) {
+			_api.request(requestId).cancel();
+		}
+		_dates = std::move(my->dates);
+		_offsetDate = my->offsetDate;
+		_offsetUser = my->offsetUser;
+		_allLoaded = my->allLoaded;
+		if (const auto search = searchController()) {
+			search->restoreState(std::move(my->searchState));
+		}
+		if (my->wasLoading) {
+			loadMoreRows();
+		}
+		PeerListController::restoreState(std::move(state));
+		if (delegate()->peerListFullRowsCount() || _allLoaded) {
+			refreshDescription();
+			delegate()->peerListRefreshRows();
+		}
+	}
+}
+
 void RequestsBoxController::prepare() {
 	delegate()->peerListSetSearchMode(PeerListSearchMode::Enabled);
 	delegate()->peerListSetTitle(_peer->isBroadcast()
@@ -311,11 +362,11 @@ void RequestsBoxController::loadMoreRows() {
 	using Flag = MTPmessages_GetChatInviteImporters::Flag;
 	_loadRequestId = _api.request(MTPmessages_GetChatInviteImporters(
 		MTP_flags(Flag::f_requested),
-		_peer->input,
+		_peer->input(),
 		MTPstring(), // link
 		MTPstring(), // q
 		MTP_int(_offsetDate),
-		_offsetUser ? _offsetUser->inputUser : MTP_inputUserEmpty(),
+		_offsetUser ? _offsetUser->inputUser() : MTP_inputUserEmpty(),
 		MTP_int(limit)
 	)).done([=](const MTPmessages_ChatInviteImporters &result) {
 		const auto firstLoad = !_offsetDate;
@@ -356,9 +407,7 @@ void RequestsBoxController::refreshDescription() {
 }
 
 void RequestsBoxController::rowClicked(not_null<PeerListRow*> row) {
-	_navigation->parentController()->show(PrepareShortInfoBox(
-		row->peer(),
-		_navigation));
+	_navigation->showPeerInfo(row->peer());
 }
 
 void RequestsBoxController::rowElementClicked(
@@ -387,8 +436,8 @@ void RequestsBoxController::processRequest(
 				: tr::lng_group_requests_was_added)(
 					tr::now,
 					lt_user,
-					Ui::Text::Bold(user->name()),
-					Ui::Text::WithEntities));
+					tr::bold(user->name()),
+					tr::marked));
 		}
 	});
 	const auto fail = crl::guard(this, remove);
@@ -405,6 +454,7 @@ void RequestsBoxController::appendRow(
 		not_null<UserData*> user,
 		TimeId date) {
 	if (!delegate()->peerListFindRow(user->id.value)) {
+		_dates.emplace(user, date);
 		if (auto row = createRow(user, date)) {
 			delegate()->peerListAppendRow(std::move(row));
 			setDescriptionText(QString());
@@ -503,6 +553,7 @@ std::unique_ptr<PeerListRow> RequestsBoxController::createRow(
 		const auto search = static_cast<RequestsBoxSearchController*>(
 			searchController());
 		date = search->dateForUser(user);
+		_dates.emplace(user, date);
 	}
 	return std::make_unique<Row>(_helper.get(), user, date);
 }
@@ -574,6 +625,36 @@ TimeId RequestsBoxSearchController::dateForUser(not_null<UserData*> user) {
 	return {};
 }
 
+auto RequestsBoxSearchController::saveState() const
+-> std::unique_ptr<SavedStateBase> {
+	auto result = std::make_unique<SavedState>();
+	result->query = _query;
+	result->offsetDate = _offsetDate;
+	result->offsetUser = _offsetUser;
+	result->allLoaded = _allLoaded;
+	result->wasLoading = (_requestId != 0);
+	return result;
+}
+
+void RequestsBoxSearchController::restoreState(
+		std::unique_ptr<SavedStateBase> state) {
+	if (auto my = dynamic_cast<SavedState*>(state.get())) {
+		if (auto requestId = base::take(_requestId)) {
+			_api.request(requestId).cancel();
+		}
+		_cache.clear();
+		_queries.clear();
+
+		_allLoaded = my->allLoaded;
+		_offsetDate = my->offsetDate;
+		_offsetUser = my->offsetUser;
+		_query = my->query;
+		if (my->wasLoading) {
+			searchOnServer();
+		}
+	}
+}
+
 bool RequestsBoxSearchController::searchInCache() {
 	const auto i = _cache.find(_query);
 	if (i != _cache.cend()) {
@@ -600,11 +681,11 @@ bool RequestsBoxSearchController::loadMoreRows() {
 	using Flag = MTPmessages_GetChatInviteImporters::Flag;
 	_requestId = _api.request(MTPmessages_GetChatInviteImporters(
 		MTP_flags(Flag::f_requested | Flag::f_q),
-		_peer->input,
+		_peer->input(),
 		MTPstring(), // link
 		MTP_string(_query),
 		MTP_int(_offsetDate),
-		_offsetUser ? _offsetUser->inputUser : MTP_inputUserEmpty(),
+		_offsetUser ? _offsetUser->inputUser() : MTP_inputUserEmpty(),
 		MTP_int(limit)
 	)).done([=](
 			const MTPmessages_ChatInviteImporters &result,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.h
index 005b83c8475b06..4db714bc3b79f6 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.h
@@ -35,15 +35,32 @@ class RequestsBoxController final
 	Main::Session &session() const override;
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
-	void rowElementClicked(not_null<PeerListRow*> row, int element) override;
+	void rowElementClicked(
+		not_null<PeerListRow*> row,
+		int element) override;
 	void loadMoreRows() override;
 
 	std::unique_ptr<PeerListRow> createSearchRow(
 		not_null<PeerData*> peer) override;
+	std::unique_ptr<PeerListRow> createRestoredRow(
+		not_null<PeerData*> peer) override;
+
+	std::unique_ptr<PeerListState> saveState() const override;
+	void restoreState(std::unique_ptr<PeerListState> state) override;
 
 private:
 	class RowHelper;
 
+	struct SavedState : SavedStateBase {
+		using SearchStateBase = PeerListSearchController::SavedStateBase;
+		std::unique_ptr<SearchStateBase> searchState;
+		base::flat_map<not_null<UserData*>, TimeId> dates;
+		TimeId offsetDate = 0;
+		UserData *offsetUser = nullptr;
+		bool allLoaded = false;
+		bool wasLoading = false;
+	};
+
 	static std::unique_ptr<PeerListSearchController> CreateSearchController(
 		not_null<PeerData*> peer);
 
@@ -63,6 +80,8 @@ class RequestsBoxController final
 	not_null<PeerData*> _peer;
 	MTP::Sender _api;
 
+	base::flat_map<not_null<UserData*>, TimeId> _dates;
+
 	TimeId _offsetDate = 0;
 	UserData *_offsetUser = nullptr;
 	mtpRequestId _loadRequestId = 0;
@@ -82,7 +101,17 @@ class RequestsBoxSearchController final : public PeerListSearchController {
 	void removeFromCache(not_null<UserData*> user);
 	[[nodiscard]] TimeId dateForUser(not_null<UserData*> user);
 
+	std::unique_ptr<SavedStateBase> saveState() const override;
+	void restoreState(std::unique_ptr<SavedStateBase> state) override;
+
 private:
+	struct SavedState : SavedStateBase {
+		QString query;
+		TimeId offsetDate = 0;
+		UserData *offsetUser = nullptr;
+		bool allLoaded = false;
+		bool wasLoading = false;
+	};
 	struct Item {
 		not_null<UserData*> user;
 		TimeId date = 0;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp
index b77a9e1d294e40..d883cfa9cd2b27 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp
@@ -36,6 +36,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/box_content_divider.h"
+#include "ui/text/text_utilities.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
@@ -49,6 +50,68 @@ For license and copyright information please follow this link:
 
 namespace {
 
+[[nodiscard]] TextWithEntities RequestToJoinAbout(
+		bool joinToWrite,
+		bool requestToJoin,
+		bool isGroup,
+		const QString &guardBotUsername,
+		const QString &guardBotLink) {
+	if (!joinToWrite) {
+		return TextWithEntities{
+			tr::lng_manage_peer_send_only_members_about(tr::now)
+		};
+	} else if (requestToJoin && !guardBotUsername.isEmpty()) {
+		return (isGroup
+			? tr::lng_manage_peer_send_approve_members_about_managed
+			: tr::lng_manage_peer_send_approve_members_about_managed_channel)(
+				tr::now,
+				lt_bot,
+				tr::link('@' + guardBotUsername, guardBotLink),
+				tr::marked);
+	}
+	return TextWithEntities{
+		(isGroup
+			? tr::lng_manage_peer_send_approve_members_about
+			: tr::lng_manage_peer_send_approve_members_about_channel)(
+				tr::now)
+	};
+}
+
+[[nodiscard]] TextWithEntities ApplyRequestToJoinToInvitesText(
+		bool enabled,
+		bool isGroup,
+		int count) {
+	if (enabled) {
+		return (isGroup
+			? tr::lng_manage_peer_request_apply_enable_group
+			: tr::lng_manage_peer_request_apply_enable_channel)(
+				tr::now,
+				lt_count,
+				count,
+				tr::rich);
+	}
+	return (isGroup
+		? tr::lng_manage_peer_request_apply_disable_group
+		: tr::lng_manage_peer_request_apply_disable_channel)(
+			tr::now,
+			lt_count,
+			count,
+			tr::rich);
+}
+
+[[nodiscard]] int InviteLinksCount(
+		const MTPmessages_ChatAdminsWithInvites &result) {
+	auto count = 0;
+	result.match([&](const MTPDmessages_chatAdminsWithInvites &data) {
+		for (const auto &admin : data.vadmins().v) {
+			admin.match([&](const MTPDchatAdminWithInvites &data) {
+				count += data.vinvites_count().v;
+			});
+		}
+	});
+	return count;
+}
+
 class Controller : public base::has_weak_ptr {
 public:
 	Controller(
@@ -87,13 +150,17 @@ class Controller : public base::has_weak_ptr {
 		return _controls.joinToWrite && _controls.joinToWrite->toggled();
 	}
 	[[nodiscard]] bool requestToJoin() const {
-		return _controls.requestToJoin && _controls.requestToJoin->toggled();
+		return _controls.requestToJoin
+			&& (_isGroup || getPrivacy() != Privacy::HasUsername)
+			&& _controls.requestToJoin->toggled();
 	}
 
 	[[nodiscard]] rpl::producer<int> scrollToRequests() const {
 		return _scrollToRequests.events();
 	}
 
+	void submit(Fn<void(EditPeerTypeData)> done);
+
 	void showError(rpl::producer<QString> text) {
 		_controls.usernameInput->showError();
 		showUsernameError(std::move(text));
@@ -122,6 +189,7 @@ class Controller : public base::has_weak_ptr {
 	object_ptr<Ui::RpWidget> createInviteLinkBlock();
 
 	void privacyChanged(Privacy value);
+	[[nodiscard]] bool requestsSectionShown(Privacy value) const;
 
 	void checkUsernameAvailability();
 	void askUsernameRevoke();
@@ -130,6 +198,12 @@ class Controller : public base::has_weak_ptr {
 	void showUsernameGood();
 	void showUsernamePending();
 	void showUsernameEmpty();
+	[[nodiscard]] EditPeerTypeData collectData() const;
+	void requestInviteLinksCount(Fn<void(int)> done);
+	void confirmApplyToInviteLinks(
+		EditPeerTypeData data,
+		int count,
+		Fn<void(EditPeerTypeData)> done);
 
 	void fillPrivaciesButtons(
 		not_null<Ui::VerticalLayout*> parent,
@@ -152,6 +226,7 @@ class Controller : public base::has_weak_ptr {
 	bool _useLocationPhrases = false;
 	bool _isGroup = false;
 	bool _goodUsername = false;
+	bool _originalRequestToJoin = false;
 
 	base::unique_qptr<Ui::VerticalLayout> _wrap;
 	base::Timer _checkUsernameTimer;
@@ -185,11 +260,106 @@ Controller::Controller(
 , _goodUsername(_dataSavedValue
 	? !_dataSavedValue->username.isEmpty()
 	: (_peer->isChannel() && !_peer->asChannel()->editableUsername().isEmpty()))
+, _originalRequestToJoin(_dataSavedValue
+	? _dataSavedValue->requestToJoin
+	: false)
 , _wrap(container)
 , _checkUsernameTimer([=] { checkUsernameAvailability(); }) {
 	_peer->updateFull();
 }
 
+EditPeerTypeData Controller::collectData() const {
+	const auto privacy = getPrivacy();
+	return EditPeerTypeData{
+		.privacy = privacy,
+		.username = (privacy == Privacy::HasUsername
+			? getUsernameInput()
+			: QString()),
+		.usernamesOrder = (privacy == Privacy::HasUsername
+			? usernamesOrder()
+			: std::vector<QString>()),
+		.hasDiscussionLink = _dataSavedValue
+			? _dataSavedValue->hasDiscussionLink
+			: false,
+		.noForwards = noForwards(),
+		.joinToWrite = joinToWrite(),
+		.requestToJoin = requestToJoin(),
+		.requestToJoinApplyToInvites = _dataSavedValue
+			? _dataSavedValue->requestToJoinApplyToInvites
+			: std::optional<bool>(),
+		.guardBotUsername = _dataSavedValue
+			? _dataSavedValue->guardBotUsername
+			: QString(),
+		.guardBotLink = _dataSavedValue
+			? _dataSavedValue->guardBotLink
+			: QString(),
+	};
+}
+
+void Controller::submit(Fn<void(EditPeerTypeData)> done) {
+	const auto privacy = getPrivacy();
+	if ((privacy == Privacy::HasUsername) && !goodUsername()) {
+		if (!getUsernameInput().isEmpty() || usernamesOrder().empty()) {
+			setFocusUsername();
+			return;
+		}
+	}
+
+	const auto data = collectData();
+	if (!_dataSavedValue
+		|| !_peer->isChannel()
+		|| _originalRequestToJoin == data.requestToJoin) {
+		done(data);
+		return;
+	}
+
+	requestInviteLinksCount([=](int count) {
+		if (count > 0) {
+			confirmApplyToInviteLinks(data, count, done);
+		} else {
+			done(data);
+		}
+	});
+}
+
+void Controller::requestInviteLinksCount(Fn<void(int)> done) {
+	_api.request(MTPmessages_GetAdminsWithInvites(
+		_peer->input()
+	)).done([=](const MTPmessages_ChatAdminsWithInvites &result) {
+		done(InviteLinksCount(result));
+	}).fail([=] {
+		done(0);
+	}).send();
+}
+
+void Controller::confirmApplyToInviteLinks(
+		EditPeerTypeData data,
+		int count,
+		Fn<void(EditPeerTypeData)> done) {
+	const auto finish = [=](bool apply) {
+		auto result = data;
+		result.requestToJoinApplyToInvites = apply;
+		done(result);
+	};
+	_show->showBox(Ui::MakeConfirmBox({
+		.text = ApplyRequestToJoinToInvitesText(
+			data.requestToJoin,
+			_isGroup,
+			count),
+		.confirmed = [=](Fn<void()> close) {
+			close();
+			finish(true);
+		},
+		.cancelled = [=](Fn<void()> close) {
+			close();
+			finish(false);
+		},
+		.confirmText = tr::lng_manage_peer_request_apply_confirm(),
+		.cancelText = tr::lng_manage_peer_request_apply_skip(),
+		.title = tr::lng_manage_peer_request_apply_title(),
+	}));
+}
+
 void Controller::createContent() {
 	_controls = Controls();
 
@@ -212,7 +382,7 @@ void Controller::createContent() {
 	using namespace Settings;
 
 	if (!_linkOnly) {
-		if (_peer->isMegagroup()) {
+		if (_peer->isChannel()) {
 			_controls.whoSendWrap = _wrap->add(
 				object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 					_wrap.get(),
@@ -220,7 +390,7 @@ void Controller::createContent() {
 			const auto wrap = _controls.whoSendWrap->entity();
 
 			Ui::AddSkip(wrap);
-			if (_dataSavedValue->hasLinkedChat) {
+			if (_peer->isMegagroup() && _dataSavedValue->hasDiscussionLink) {
 				Ui::AddSubsectionTitle(wrap, tr::lng_manage_peer_send_title());
 
 				_controls.joinToWrite = wrap->add(EditPeerInfoBox::CreateButton(
@@ -234,12 +404,12 @@ void Controller::createContent() {
 				_controls.joinToWrite->toggleOn(
 					rpl::single(_dataSavedValue->joinToWrite)
 				)->toggledValue(
-				) | rpl::start_with_next([=](bool toggled) {
+				) | rpl::on_next([=](bool toggled) {
 					_dataSavedValue->joinToWrite = toggled;
 				}, wrap->lifetime());
 			} else {
 				_controls.whoSendWrap->toggle(
-					(_controls.privacy->current() == Privacy::HasUsername),
+					true,
 					anim::type::instant);
 			}
 			auto joinToWrite = _controls.joinToWrite
@@ -251,7 +421,9 @@ void Controller::createContent() {
 					wrap,
 					EditPeerInfoBox::CreateButton(
 						wrap,
-						tr::lng_manage_peer_send_approve_members(),
+						(_isGroup
+							? tr::lng_manage_peer_send_approve_members
+							: tr::lng_manage_peer_send_approve_subscribers)(),
 						rpl::single(QString()),
 						[=] {},
 						st::peerPermissionsButton,
@@ -261,17 +433,25 @@ void Controller::createContent() {
 			_controls.requestToJoin->toggleOn(
 				rpl::single(_dataSavedValue->requestToJoin)
 			)->toggledValue(
-			) | rpl::start_with_next([=](bool toggled) {
+			) | rpl::on_next([=](bool toggled) {
 				_dataSavedValue->requestToJoin = toggled;
 			}, wrap->lifetime());
+			auto requestToJoin = _controls.requestToJoin->toggledValue();
 
 			Ui::AddSkip(wrap);
 			Ui::AddDividerText(
 				wrap,
-				rpl::conditional(
+				rpl::combine(
 					std::move(joinToWrite),
-					tr::lng_manage_peer_send_approve_members_about(),
-					tr::lng_manage_peer_send_only_members_about()));
+					std::move(requestToJoin)
+				) | rpl::map([=](bool join, bool approval) {
+					return RequestToJoinAbout(
+						join,
+						approval,
+						_isGroup,
+						_dataSavedValue->guardBotUsername,
+						_dataSavedValue->guardBotLink);
+				}));
 		}
 		Ui::AddSkip(_wrap.get());
 		Ui::AddSubsectionTitle(
@@ -287,7 +467,7 @@ void Controller::createContent() {
 		_controls.noForwards->toggleOn(
 			rpl::single(_dataSavedValue->noForwards)
 		)->toggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			_dataSavedValue->noForwards = toggled;
 		}, _wrap->lifetime());
 		Ui::AddSkip(_wrap.get());
@@ -296,6 +476,7 @@ void Controller::createContent() {
 			(_isGroup
 				? tr::lng_manage_peer_no_forwards_about
 				: tr::lng_manage_peer_no_forwards_about_channel)());
+
 	}
 	if (_linkOnly) {
 		_controls.inviteLinkWrap->show(anim::type::instant);
@@ -312,6 +493,11 @@ void Controller::createContent() {
 		_controls.usernameWrap->toggle(
 			(forShowing == Privacy::HasUsername),
 			anim::type::instant);
+		if (_controls.whoSendWrap) {
+			_controls.whoSendWrap->toggle(
+				requestsSectionShown(forShowing),
+				anim::type::instant);
+		}
 	}
 }
 
@@ -441,11 +627,11 @@ object_ptr<Ui::RpWidget> Controller::createUsernameEdit() {
 			username,
 			_peer->session().createInternalLink(QString())));
 	_controls.usernameInput->heightValue(
-	) | rpl::start_with_next([placeholder](int height) {
+	) | rpl::on_next([placeholder](int height) {
 		placeholder->resize(placeholder->width(), height);
 	}, placeholder->lifetime());
 	placeholder->widthValue(
-	) | rpl::start_with_next([this](int width) {
+	) | rpl::on_next([this](int width) {
 		_controls.usernameInput->resize(
 			width,
 			_controls.usernameInput->height());
@@ -497,8 +683,7 @@ void Controller::privacyChanged(Privacy value) {
 			return;
 		}
 		_controls.whoSendWrap->toggle(
-			(value == Privacy::HasUsername
-				|| (_dataSavedValue && _dataSavedValue->hasLinkedChat)),
+			requestsSectionShown(value),
 			anim::type::instant);
 	};
 	const auto refreshVisibilities = [&] {
@@ -536,6 +721,10 @@ void Controller::privacyChanged(Privacy value) {
 	setFocusUsername();
 }
 
+bool Controller::requestsSectionShown(Privacy value) const {
+	return _isGroup || value != Privacy::HasUsername;
+}
+
 void Controller::checkUsernameAvailability() {
 	if (!_controls.usernameInput) {
 		return;
@@ -553,7 +742,7 @@ void Controller::checkUsernameAvailability() {
 	const auto channel = _peer->migrateToOrMe()->asChannel();
 	const auto username = channel ? channel->editableUsername() : QString();
 	_checkUsernameRequestId = _api.request(MTPchannels_CheckUsername(
-		channel ? channel->inputChannel : MTP_inputChannelEmpty(),
+		channel ? channel->inputChannel() : MTP_inputChannelEmpty(),
 		MTP_string(checking)
 	)).done([=](const MTPBool &result) {
 		_checkUsernameRequestId = 0;
@@ -739,11 +928,11 @@ void EditPeerTypeBox::prepare() {
 		_useLocationPhrases,
 		_dataSavedValue);
 	controller->scrollToRequests(
-	) | rpl::start_with_next([=, raw = content.data()](int y) {
+	) | rpl::on_next([=, raw = content.data()](int y) {
 		scrollToY(raw->y() + y);
 	}, lifetime());
 	_focusRequests.events(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[=] {
 			controller->setFocusUsername();
 			if (_usernameError.has_value()) {
@@ -758,29 +947,11 @@ void EditPeerTypeBox::prepare() {
 
 	if (_savedCallback.has_value()) {
 		addButton(tr::lng_settings_save(), [=] {
-			const auto v = controller->getPrivacy();
-			if ((v == Privacy::HasUsername) && !controller->goodUsername()) {
-				if (!controller->getUsernameInput().isEmpty()
-					|| controller->usernamesOrder().empty()) {
-					controller->setFocusUsername();
-					return;
-				}
-			}
-
-			auto local = std::move(*_savedCallback);
-			local(EditPeerTypeData{
-				.privacy = v,
-				.username = (v == Privacy::HasUsername
-					? controller->getUsernameInput()
-					: QString()),
-				.usernamesOrder = (v == Privacy::HasUsername
-					? controller->usernamesOrder()
-					: std::vector<QString>()),
-				.noForwards = controller->noForwards(),
-				.joinToWrite = controller->joinToWrite(),
-				.requestToJoin = controller->requestToJoin(),
-			}); // We don't need username with private type.
-			closeBox();
+			controller->submit(crl::guard(this, [=](EditPeerTypeData data) {
+				auto local = std::move(*_savedCallback);
+				local(std::move(data));
+				closeBox();
+			}));
 		});
 		addButton(tr::lng_cancel(), [=] { closeBox(); });
 	} else {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.h
index ae778720749169..fefedb19849108 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.h
@@ -37,10 +37,13 @@ struct EditPeerTypeData {
 	Privacy privacy = Privacy::NoUsername;
 	QString username;
 	std::vector<QString> usernamesOrder;
-	bool hasLinkedChat = false;
+	bool hasDiscussionLink = false;
 	bool noForwards = false;
 	bool joinToWrite = false;
 	bool requestToJoin = false;
+	std::optional<bool> requestToJoinApplyToInvites;
+	QString guardBotUsername;
+	QString guardBotLink;
 };
 
 class EditPeerTypeBox : public Ui::BoxContent {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
index 7fcea45d2985a7..5b74ffeb751bb2 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp
@@ -7,24 +7,28 @@ For license and copyright information please follow this link:
 */
 #include "boxes/peers/edit_peer_usernames_list.h"
 
+#include "api/api_filter_updates.h"
 #include "api/api_user_names.h"
 #include "apiwrap.h"
 #include "base/event_filter.h"
+#include "data/data_changes.h"
 #include "data/data_peer.h"
 #include "data/data_user.h"
+#include "info/profile/info_profile_values.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/layers/show.h"
 #include "ui/painter.h"
-#include "ui/vertical_list.h"
-#include "ui/text/text_utilities.h" // Ui::Text::RichLangValue.
+#include "ui/text/text_utilities.h" // tr::rich.
 #include "ui/toast/toast.h"
+#include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/wrap/vertical_layout_reorder.h"
-#include "ui/ui_utility.h"
 #include "styles/style_boxes.h" // contactsStatusFont.
+#include "styles/style_chat_helpers.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
@@ -118,8 +122,13 @@ UsernamesList::Row::Row(
 			tr::lng_group_invite_context_copy(tr::now),
 			[=] {
 				QGuiApplication::clipboard()->setText(link);
-				show->showToast(
-					tr::lng_create_channel_link_copied(tr::now));
+				show->showToast({
+					.text = {
+						tr::lng_create_channel_link_copied(tr::now),
+					},
+					.iconLottie = u"toast/voip_invite"_q,
+					.iconLottieSize = st::toastLottieIconSize,
+				});
 			},
 			&st::menuIconCopy);
 		_menu->popup(QCursor::pos());
@@ -128,7 +137,7 @@ UsernamesList::Row::Row(
 
 	_rightAction->setVisible(data.active);
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		_rightAction->moveToLeft(
 			s.width() - _rightAction->width() - st::inviteLinkThreeDotsSkip,
 			(s.height() - _rightAction->height()) / 2);
@@ -208,12 +217,23 @@ UsernamesList::UsernamesList(
 		}
 	}
 	load();
+
+	rpl::merge(
+		peer->session().changes().peerFlagsValue(
+			peer,
+			Data::PeerUpdate::Flag::Username),
+		peer->session().changes().peerFlagsValue(
+			peer,
+			Data::PeerUpdate::Flag::Usernames)
+	) | rpl::on_next([=] {
+		load();
+	}, lifetime());
 }
 
 void UsernamesList::load() {
 	_loadLifetime = _peer->session().api().usernames().loadUsernames(
 		_peer
-	) | rpl::start_with_next([=](const Data::Usernames &usernames) {
+	) | rpl::on_next([=](const Data::Usernames &usernames) {
 		if (usernames.empty()) {
 			_container = nullptr;
 			resize(0, 0);
@@ -250,6 +270,8 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 			username.username);
 		const auto status = (username.editable && _focusCallback)
 			? tr::lng_usernames_edit(tr::now)
+			: (username.editable && !username.active)
+			? tr::lng_usernames_non_active(tr::now)
 			: username.active
 			? tr::lng_usernames_active(tr::now)
 			: tr::lng_usernames_non_active(tr::now);
@@ -265,8 +287,20 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 			if (username.editable) {
 				if (_focusCallback) {
 					_focusCallback();
+					return;
+				}
+				if (_isBot) {
+					const auto hasActiveAuction = ranges::any_of(
+						usernames,
+						[](const Data::Username &u) {
+							return !u.editable && u.active;
+						});
+					if (!hasActiveAuction && username.active) {
+						return;
+					}
+				} else {
+					return;
 				}
-				return;
 			}
 
 			auto text = _peer->isSelf()
@@ -292,13 +326,13 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 					_toggleLifetime = api.usernames().reorder(
 						_peer,
 						order()
-					) | rpl::start_with_done([=] {
+					) | rpl::on_done([=] {
 						auto &api = _peer->session().api();
 						_toggleLifetime = api.usernames().toggle(
 							_peer,
 							username.username,
 							!username.active
-						) | rpl::start_with_error_done([=](
+						) | rpl::on_error_done([=](
 								Api::Usernames::Error error) {
 							if (error == Api::Usernames::Error::TooMuch) {
 								constexpr auto kMaxUsernames = 10.;
@@ -307,12 +341,15 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 										tr::lng_usernames_activate_error(
 											lt_count,
 											rpl::single(kMaxUsernames),
-											Ui::Text::RichLangValue)));
+											tr::rich)));
+							}
+							if (error == Api::Usernames::Error::Flood) {
+								_show->showToast(
+									tr::lng_flood_error(tr::now));
 							}
 							load();
 							_toggleLifetime.destroy();
 						}, [=] {
-							load();
 							_toggleLifetime.destroy();
 						});
 					});
@@ -347,7 +384,7 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 	_reorder->start();
 
 	_reorder->updates(
-	) | rpl::start_with_next([=](Ui::VerticalLayoutReorder::Single data) {
+	) | rpl::on_next([=](Ui::VerticalLayoutReorder::Single data) {
 		using State = Ui::VerticalLayoutReorder::State;
 		if (data.state == State::Started) {
 			++_reordering;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_tag_control.cpp b/Telegram/SourceFiles/boxes/peers/edit_tag_control.cpp
new file mode 100644
index 00000000000000..0a9afa0237ddbe
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peers/edit_tag_control.cpp
@@ -0,0 +1,417 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/peers/edit_tag_control.h"
+
+#include "base/unixtime.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "history/admin_log/history_admin_log_item.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/view/history_view_element.h"
+#include "history/view/history_view_message.h"
+#include "history/view/media/history_view_media_generic.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/chat/chat_style.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/effects/path_shift_gradient.h"
+#include "ui/painter.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/fields/input_field.h"
+#include "window/section_widget.h"
+#include "window/themes/window_theme.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat.h"
+#include "styles/style_layers.h"
+
+namespace {
+
+constexpr auto kRankLimit = 16;
+constexpr auto kTextLinesAlpha = 0.1;
+
+using namespace HistoryView;
+
+class TextLinesPart final : public MediaGenericPart {
+public:
+	TextLinesPart(QMargins margins);
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
+private:
+	QMargins _margins;
+
+};
+
+TextLinesPart::TextLinesPart(QMargins margins)
+: _margins(margins) {
+}
+
+QSize TextLinesPart::countOptimalSize() {
+	const auto h = _margins.top()
+		+ 4 * st::tagPreviewLineHeight
+		+ 3 * st::tagPreviewLineSpacing
+		+ _margins.bottom();
+	return { st::msgMinWidth, h };
+}
+
+QSize TextLinesPart::countCurrentSize(int newWidth) {
+	return { newWidth, minHeight() };
+}
+
+void TextLinesPart::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	const auto &stm = context.messageStyle();
+	auto color = stm->historyTextFg->c;
+	color.setAlphaF(color.alphaF() * kTextLinesAlpha);
+	p.setPen(Qt::NoPen);
+	p.setBrush(color);
+	auto hq = PainterHighQualityEnabler(p);
+
+	const auto available = outerWidth - _margins.left() - _margins.right();
+	const auto lineHeight = st::tagPreviewLineHeight;
+	const auto radius = lineHeight / 2.0;
+	const auto fractions = { 1.0, 0.85, 0.65, 0.4 };
+	auto y = double(_margins.top());
+	for (const auto fraction : fractions) {
+		const auto w = available * fraction;
+		p.drawRoundedRect(
+			QRectF(_margins.left(), y, w, lineHeight),
+			radius,
+			radius);
+		y += lineHeight + st::tagPreviewLineSpacing;
+	}
+}
+
+class TagPreviewDelegate final : public DefaultElementDelegate {
+public:
+	TagPreviewDelegate(
+		not_null<QWidget*> parent,
+		not_null<Ui::ChatStyle*> st,
+		Fn<void()> update);
+
+	void setTagText(const QString &text);
+	[[nodiscard]] const QString &tagText() const;
+
+	bool elementAnimationsPaused() override;
+	not_null<Ui::PathShiftGradient*> elementPathShiftGradient() override;
+	Context elementContext() override;
+	QString elementAuthorRank(not_null<const Element*> view) override;
+
+private:
+	const not_null<QWidget*> _parent;
+	const std::unique_ptr<Ui::PathShiftGradient> _pathGradient;
+	QString _tagText;
+
+};
+
+TagPreviewDelegate::TagPreviewDelegate(
+	not_null<QWidget*> parent,
+	not_null<Ui::ChatStyle*> st,
+	Fn<void()> update)
+: _parent(parent)
+, _pathGradient(MakePathShiftGradient(st, std::move(update))) {
+}
+
+void TagPreviewDelegate::setTagText(const QString &text) {
+	_tagText = text;
+}
+
+const QString &TagPreviewDelegate::tagText() const {
+	return _tagText;
+}
+
+bool TagPreviewDelegate::elementAnimationsPaused() {
+	return _parent->window()->isActiveWindow();
+}
+
+auto TagPreviewDelegate::elementPathShiftGradient()
+-> not_null<Ui::PathShiftGradient*> {
+	return _pathGradient.get();
+}
+
+Context TagPreviewDelegate::elementContext() {
+	return Context::AdminLog;
+}
+
+QString TagPreviewDelegate::elementAuthorRank(
+		not_null<const Element*> view) {
+	return _tagText;
+}
+
+} // namespace
+
+HistoryView::BadgeRole LookupBadgeRole(
+		not_null<PeerData*> peer,
+		not_null<UserData*> user) {
+	if (const auto channel = peer->asMegagroup()) {
+		const auto info = channel->mgInfo.get();
+		if (info && info->creator == user) {
+			return HistoryView::BadgeRole::Creator;
+		}
+		const auto userId = peerToUser(user->id);
+		if (info && info->admins.contains(userId)) {
+			return HistoryView::BadgeRole::Admin;
+		}
+	} else if (const auto chat = peer->asChat()) {
+		if (peerToUser(user->id) == chat->creator) {
+			return HistoryView::BadgeRole::Creator;
+		} else if (chat->admins.contains(user)) {
+			return HistoryView::BadgeRole::Admin;
+		}
+	}
+	return HistoryView::BadgeRole::User;
+}
+
+class EditTagControl::PreviewWidget final : public Ui::RpWidget {
+public:
+	PreviewWidget(
+		QWidget *parent,
+		not_null<Main::Session*> session,
+		not_null<UserData*> user,
+		const QString &initialText,
+		HistoryView::BadgeRole role);
+	~PreviewWidget();
+
+	void setTagText(const QString &text);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	void createItem();
+	void applyBadge(const QString &text);
+
+	const not_null<History*> _history;
+	const not_null<UserData*> _user;
+	const HistoryView::BadgeRole _role;
+	const std::unique_ptr<Ui::ChatTheme> _theme;
+	const std::unique_ptr<Ui::ChatStyle> _style;
+	const std::unique_ptr<TagPreviewDelegate> _delegate;
+	AdminLog::OwnedItem _item;
+	int _topSkip = 0;
+	int _bottomSkip = 0;
+	Ui::PeerUserpicView _userpic;
+
+};
+
+EditTagControl::PreviewWidget::PreviewWidget(
+	QWidget *parent,
+	not_null<Main::Session*> session,
+	not_null<UserData*> user,
+	const QString &initialText,
+	HistoryView::BadgeRole role)
+: RpWidget(parent)
+, _history(session->data().history(PeerData::kServiceNotificationsId))
+, _user(user)
+, _role(role)
+, _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
+, _style(std::make_unique<Ui::ChatStyle>(
+	session->colorIndicesValue()))
+, _delegate(std::make_unique<TagPreviewDelegate>(
+	this,
+	_style.get(),
+	[=] { update(); }))
+, _topSkip(st::msgMargin.bottom() * 2)
+, _bottomSkip(st::msgMargin.bottom() + st::msgMargin.top()) {
+	_style->apply(_theme.get());
+	_delegate->setTagText(initialText);
+
+	_history->owner().viewRepaintRequest(
+	) | rpl::on_next([=](Data::RequestViewRepaint data) {
+		if (data.view == _item.get()) {
+			update();
+		}
+	}, lifetime());
+
+	createItem();
+
+	widthValue(
+	) | rpl::filter([=](int w) {
+		return w >= st::msgMinWidth;
+	}) | rpl::on_next([=](int w) {
+		const auto h = _topSkip
+			+ _item->resizeGetHeight(w)
+			+ _bottomSkip;
+		resize(w, h);
+	}, lifetime());
+
+	_history->owner().itemResizeRequest(
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
+		if (_item && item == _item->data() && width() >= st::msgMinWidth) {
+			const auto h = _topSkip
+				+ _item->resizeGetHeight(width())
+				+ _bottomSkip;
+			resize(width(), h);
+		}
+	}, lifetime());
+}
+
+EditTagControl::PreviewWidget::~PreviewWidget() {
+	_item = {};
+}
+
+void EditTagControl::PreviewWidget::createItem() {
+	const auto item = _history->addNewLocalMessage({
+		.id = _history->nextNonHistoryEntryId(),
+		.flags = (MessageFlag::FakeHistoryItem
+			| MessageFlag::HasFromId),
+		.from = _user->id,
+		.date = base::unixtime::now(),
+	}, TextWithEntities(), MTP_messageMediaEmpty());
+
+	auto owned = AdminLog::OwnedItem(_delegate.get(), item);
+	owned->overrideMedia(std::make_unique<HistoryView::MediaGeneric>(
+		owned.get(),
+		[](not_null<HistoryView::MediaGeneric*>,
+				Fn<void(std::unique_ptr<HistoryView::MediaGenericPart>)> push) {
+			push(std::make_unique<TextLinesPart>(st::msgPadding));
+		}));
+	_item = std::move(owned);
+	applyBadge(_delegate->tagText());
+	if (width() >= st::msgMinWidth) {
+		const auto h = _topSkip
+			+ _item->resizeGetHeight(width())
+			+ _bottomSkip;
+		resize(width(), h);
+	}
+}
+
+void EditTagControl::PreviewWidget::applyBadge(const QString &text) {
+	if (!_item) {
+		return;
+	}
+	auto badgeText = text;
+	if (badgeText.isEmpty()) {
+		if (_role == HistoryView::BadgeRole::Admin) {
+			badgeText = tr::lng_admin_badge(tr::now);
+		} else if (_role == HistoryView::BadgeRole::Creator) {
+			badgeText = tr::lng_owner_badge(tr::now);
+		}
+	}
+	_item->overrideRightBadge(badgeText, _role);
+}
+
+void EditTagControl::PreviewWidget::setTagText(const QString &text) {
+	_delegate->setTagText(text);
+	applyBadge(text);
+	update();
+}
+
+void EditTagControl::PreviewWidget::paintEvent(QPaintEvent *e) {
+	auto p = Painter(this);
+
+	const auto clip = e->rect();
+	if (!clip.isEmpty()) {
+		p.setClipRect(clip);
+		Window::SectionWidget::PaintBackground(
+			p,
+			_theme.get(),
+			QSize(width(), window()->height()),
+			clip);
+	}
+
+	auto context = _theme->preparePaintContext(
+		_style.get(),
+		rect(),
+		rect(),
+		e->rect(),
+		!window()->isActiveWindow());
+	p.translate(0, _topSkip);
+	_item->draw(p, context);
+
+	if (_item->displayFromPhoto()) {
+		auto userpicBottom = height()
+			- _bottomSkip
+			- _item->marginBottom()
+			- _item->marginTop();
+		const auto userpicTop = userpicBottom - st::msgPhotoSize;
+		_user->paintUserpicLeft(
+			p,
+			_userpic,
+			st::historyPhotoLeft,
+			userpicTop,
+			width(),
+			st::msgPhotoSize);
+	}
+}
+
+EditTagControl::EditTagControl(
+	QWidget *parent,
+	not_null<Main::Session*> session,
+	not_null<UserData*> user,
+	const QString &currentRank,
+	HistoryView::BadgeRole role)
+: RpWidget(parent)
+, _preview(Ui::CreateChild<PreviewWidget>(
+	this,
+	session,
+	user,
+	TextUtilities::RemoveEmoji(currentRank),
+	role))
+, _field(Ui::CreateChild<Ui::InputField>(
+	this,
+	st::customBadgeField,
+	(role == HistoryView::BadgeRole::Admin
+		? tr::lng_admin_badge()
+		: role == HistoryView::BadgeRole::Creator
+		? tr::lng_owner_badge()
+		: tr::lng_rights_edit_admin_rank_name()),
+	TextUtilities::RemoveEmoji(currentRank))) {
+	_field->setMaxLength(kRankLimit);
+	_field->setInstantReplaces(Ui::InstantReplaces::TextOnly());
+
+	_field->changes(
+	) | rpl::on_next([=] {
+		const auto text = _field->getLastText();
+		const auto removed = TextUtilities::RemoveEmoji(text);
+		if (removed != text) {
+			_field->setText(removed);
+		}
+		_preview->setTagText(_field->getLastText());
+	}, _field->lifetime());
+
+	widthValue(
+	) | rpl::on_next([=](int w) {
+		_preview->resizeToWidth(w);
+		const auto inputMargins = st::boxRowPadding;
+		_field->resizeToWidth(w - inputMargins.left() - inputMargins.right());
+		_field->moveToLeft(
+			inputMargins.left(),
+			_preview->height() + st::tagPreviewInputSkip);
+		resize(w, _field->y() + _field->height());
+	}, lifetime());
+
+	_preview->heightValue(
+	) | rpl::skip(1) | rpl::on_next([=] {
+		_field->moveToLeft(
+			st::boxRowPadding.left(),
+			_preview->height() + st::tagPreviewInputSkip);
+		resize(width(), _field->y() + _field->height());
+	}, lifetime());
+}
+
+EditTagControl::~EditTagControl() = default;
+
+QString EditTagControl::currentRank() const {
+	return TextUtilities::RemoveEmoji(
+		TextUtilities::SingleLine(_field->getLastText().trimmed()));
+}
+
+not_null<Ui::InputField*> EditTagControl::field() const {
+	return _field;
+}
diff --git a/Telegram/SourceFiles/boxes/peers/edit_tag_control.h b/Telegram/SourceFiles/boxes/peers/edit_tag_control.h
new file mode 100644
index 00000000000000..ba6e641d61a6d4
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peers/edit_tag_control.h
@@ -0,0 +1,50 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+
+namespace Ui {
+class InputField;
+} // namespace Ui
+
+namespace Main {
+class Session;
+} // namespace Main
+
+class PeerData;
+class UserData;
+
+namespace HistoryView {
+enum class BadgeRole : uchar;
+} // namespace HistoryView
+
+[[nodiscard]] HistoryView::BadgeRole LookupBadgeRole(
+	not_null<PeerData*> peer,
+	not_null<UserData*> user);
+
+class EditTagControl final : public Ui::RpWidget {
+public:
+	EditTagControl(
+		QWidget *parent,
+		not_null<Main::Session*> session,
+		not_null<UserData*> user,
+		const QString &currentRank,
+		HistoryView::BadgeRole role);
+	~EditTagControl();
+
+	[[nodiscard]] QString currentRank() const;
+	[[nodiscard]] not_null<Ui::InputField*> field() const;
+
+private:
+	class PreviewWidget;
+
+	not_null<PreviewWidget*> _preview;
+	not_null<Ui::InputField*> _field;
+
+};
diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
index 830dc13bdeb596..d42e478bab1116 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp
@@ -7,27 +7,36 @@ For license and copyright information please follow this link:
 */
 #include "boxes/peers/peer_short_info_box.h"
 
+#include "base/event_filter.h"
+#include "core/application.h"
+#include "info/profile/info_profile_text.h"
+#include "info/profile/info_profile_values.h"
+#include "lang/lang_keys.h"
+#include "media/streaming/media_streaming_instance.h"
+#include "media/streaming/media_streaming_player.h"
 #include "ui/effects/radial_animation.h"
+#include "ui/image/image_prepare.h"
+#include "ui/painter.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/widgets/scroll_area.h"
-#include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/wrap.h"
-#include "ui/image/image_prepare.h"
-#include "ui/text/text_utilities.h"
-#include "ui/painter.h"
-#include "info/profile/info_profile_text.h"
-#include "info/profile/info_profile_values.h"
-#include "media/streaming/media_streaming_instance.h"
-#include "media/streaming/media_streaming_player.h"
-#include "base/event_filter.h"
-#include "lang/lang_keys.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
-#include "styles/style_layers.h"
 #include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 
 namespace {
 
+using MenuCallback = Ui::Menu::MenuCallback;
+
 constexpr auto kShadowMaxAlpha = 80;
 constexpr auto kInactiveBarOpacity = 0.5;
 
@@ -97,6 +106,8 @@ PeerShortInfoCover::PeerShortInfoCover(
 , _statusStyle(std::make_unique<CustomLabelStyle>(_st.status))
 , _status(_widget.get(), std::move(status), _statusStyle->st)
 , _roundMask(Images::CornersMask(_st.radius))
+, _roundMaskRetina(
+	Images::CornersMask(_st.radius / style::DevicePixelRatio()))
 , _videoPaused(std::move(videoPaused)) {
 	_widget->setCursor(_cursor);
 
@@ -104,18 +115,18 @@ PeerShortInfoCover::PeerShortInfoCover(
 
 	std::move(
 		userpic
-	) | rpl::start_with_next([=](PeerShortInfoUserpic &&value) {
+	) | rpl::on_next([=](PeerShortInfoUserpic &&value) {
 		applyUserpic(std::move(value));
 		applyAdditionalStatus(value.additionalStatus);
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshBarImages();
 	}, lifetime());
 
 	_widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_widget.get());
 		paint(p);
 	}, lifetime());
@@ -181,7 +192,7 @@ void PeerShortInfoCover::paint(QPainter &p) {
 	if (!frame.isNull()) {
 		frame = Images::Round(
 			std::move(frame),
-			_roundMask,
+			_roundMaskRetina,
 			RectPart::TopLeft | RectPart::TopRight);
 	} else if (_userpicImage.isNull()) {
 		auto image = QImage(
@@ -217,10 +228,15 @@ void PeerShortInfoCover::paintCoverImage(QPainter &p, const QImage &image) {
 	const auto top = _widget->height() - fill;
 	const auto factor = style::DevicePixelRatio();
 	if (fill > 0) {
+		const auto t = roundedHeight + _scrollTop;
 		p.drawImage(
-			QRect(0, top, roundedWidth, fill),
+			QRect(0, t, roundedWidth, roundedWidth - t),
 			image,
-			QRect(0, top * factor, roundedWidth * factor, fill * factor));
+			QRect(
+				0,
+				t * factor,
+				roundedWidth * factor,
+				(roundedWidth - t) * factor));
 	}
 	if (covered <= 0) {
 		return;
@@ -231,7 +247,7 @@ void PeerShortInfoCover::paintCoverImage(QPainter &p, const QImage &image) {
 	q.drawImage(
 		QRect(0, 0, roundedWidth, rounded),
 		image,
-		QRect(0, from * factor, roundedWidth * factor, rounded * factor));
+		QRect(0, _scrollTop * factor, roundedWidth * factor, rounded * factor));
 	q.end();
 	_roundedTopImage = Images::Round(
 		std::move(_roundedTopImage),
@@ -462,7 +478,7 @@ void PeerShortInfoCover::applyUserpic(PeerShortInfoUserpic &&value) {
 		_videoStartPosition = value.videoStartPosition;
 		_videoInstance->lockPlayer();
 		_videoInstance->player().updates(
-		) | rpl::start_with_next_error([=](Update &&update) {
+		) | rpl::on_next_error([=](Update &&update) {
 			handleStreamingUpdate(std::move(update));
 		}, [=](Error &&error) {
 			handleStreamingError(std::move(error));
@@ -534,15 +550,16 @@ void PeerShortInfoCover::handleStreamingUpdate(
 
 	v::match(update.data, [&](Information &update) {
 		streamingReady(std::move(update));
-	}, [&](const PreloadedVideo &update) {
-	}, [&](const UpdateVideo &update) {
+	}, [](PreloadedVideo) {
+	}, [&](UpdateVideo update) {
 		_videoPosition = update.position;
 		_widget->update();
-	}, [&](const PreloadedAudio &update) {
-	}, [&](const UpdateAudio &update) {
-	}, [&](const WaitingForData &update) {
-	}, [&](MutedByOther) {
-	}, [&](Finished) {
+	}, [](PreloadedAudio) {
+	}, [](UpdateAudio) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
+	}, [](Finished) {
 	});
 }
 
@@ -668,7 +685,7 @@ PeerShortInfoBox::PeerShortInfoBox(
 	_rows->add(_cover.takeOwned());
 
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_cover.setScrollTop(_scroll->scrollTop());
 	}, _cover.lifetime());
 }
@@ -703,7 +720,7 @@ void PeerShortInfoBox::prepare() {
 
 	_topRoundBackground->resize(st::shortInfoWidth, st::boxRadius);
 	_topRoundBackground->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto use = fillRoundedTopHeight()) {
 			const auto width = _topRoundBackground->width();
 			const auto top = _topRoundBackground->height() - use;
@@ -734,7 +751,7 @@ void PeerShortInfoBox::prepareRows() {
 			const style::FlatLabel &textSt) {
 		auto line = CreateTextWithLabel(
 			_rows,
-			rpl::duplicate(label) | Ui::Text::ToWithEntities(),
+			rpl::duplicate(label) | rpl::map(tr::marked),
 			rpl::duplicate(text),
 			_st.label,
 			textSt,
@@ -746,7 +763,7 @@ void PeerShortInfoBox::prepareRows() {
 		rpl::combine(
 			std::move(label),
 			std::move(text)
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_rows->resizeToWidth(st::shortInfoWidth);
 		}, _rows->lifetime());
 
@@ -774,13 +791,17 @@ void PeerShortInfoBox::prepareRows() {
 		result->setContextCopyText(contextCopyText);
 		return result;
 	};
+	addInfoOneLine(
+		tr::lng_settings_channel_label(),
+		channelValue(),
+		tr::lng_context_copy_link(tr::now));
 	addInfoOneLine(
 		tr::lng_info_link_label(),
 		linkValue(),
 		tr::lng_context_copy_link(tr::now));
 	addInfoOneLine(
 		tr::lng_info_mobile_label(),
-		phoneValue() | Ui::Text::ToWithEntities(),
+		phoneValue() | rpl::map(tr::marked),
 		tr::lng_profile_copy_phone(tr::now));
 	auto label = _fields.current().isBio
 		? tr::lng_info_bio_label()
@@ -788,12 +809,16 @@ void PeerShortInfoBox::prepareRows() {
 	addInfoLine(std::move(label), aboutValue(), _st.labeled);
 	addInfoOneLine(
 		tr::lng_info_username_label(),
-		usernameValue() | Ui::Text::ToWithEntities(),
+		usernameValue(),
 		tr::lng_context_copy_mention(tr::now));
 	addInfoOneLine(
 		birthdayLabel(),
-		birthdayValue() | Ui::Text::ToWithEntities(),
+		birthdayValue() | rpl::map(tr::marked),
 		tr::lng_mediaview_copy(tr::now));
+	addInfoLine(
+		tr::lng_info_notes_label(),
+		noteValue(),
+		_st.labeled);
 }
 
 void PeerShortInfoBox::resizeEvent(QResizeEvent *e) {
@@ -828,6 +853,24 @@ void PeerShortInfoBox::refreshRoundedTopImage(const QColor &color) {
 		RectPart::TopLeft | RectPart::TopRight);
 }
 
+rpl::producer<MenuCallback> PeerShortInfoBox::fillMenuRequests() const {
+	return _fillMenuRequests.events();
+}
+
+void PeerShortInfoBox::contextMenuEvent(QContextMenuEvent *e) {
+	_menuHolder = nullptr;
+	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+		this,
+		st::popupMenuWithIcons);
+	_fillMenuRequests.fire(Ui::Menu::CreateAddActionCallback(menu));
+	_menuHolder.reset(menu);
+	if (menu->empty()) {
+		_menuHolder = nullptr;
+		return;
+	}
+	menu->popup(e->globalPos());
+}
+
 rpl::producer<QString> PeerShortInfoBox::nameValue() const {
 	return _fields.value(
 	) | rpl::map([](const PeerShortInfoFields &fields) {
@@ -835,10 +878,17 @@ rpl::producer<QString> PeerShortInfoBox::nameValue() const {
 	}) | rpl::distinct_until_changed();
 }
 
+rpl::producer<TextWithEntities> PeerShortInfoBox::channelValue() const {
+	return _fields.value(
+	) | rpl::map([](const PeerShortInfoFields &fields) {
+		return tr::link(fields.channelName, fields.channelLink);
+	}) | rpl::distinct_until_changed();
+}
+
 rpl::producer<TextWithEntities> PeerShortInfoBox::linkValue() const {
 	return _fields.value(
 	) | rpl::map([](const PeerShortInfoFields &fields) {
-		return Ui::Text::Link(fields.link, fields.link);
+		return tr::link(fields.link, fields.link);
 	}) | rpl::distinct_until_changed();
 }
 
@@ -849,10 +899,12 @@ rpl::producer<QString> PeerShortInfoBox::phoneValue() const {
 	}) | rpl::distinct_until_changed();
 }
 
-rpl::producer<QString> PeerShortInfoBox::usernameValue() const {
+rpl::producer<TextWithEntities> PeerShortInfoBox::usernameValue() const {
 	return _fields.value(
 	) | rpl::map([](const PeerShortInfoFields &fields) {
-		return fields.username;
+		return fields.usernameLink.isEmpty()
+			? TextWithEntities{ fields.username }
+			: tr::link(fields.username, fields.usernameLink);
 	}) | rpl::distinct_until_changed();
 }
 
@@ -875,3 +927,9 @@ rpl::producer<TextWithEntities> PeerShortInfoBox::aboutValue() const {
 		return fields.about;
 	}) | rpl::distinct_until_changed();
 }
+
+rpl::producer<TextWithEntities> PeerShortInfoBox::noteValue() const {
+	return _fields.value() | rpl::map([](const PeerShortInfoFields &fields) {
+		return fields.note;
+	}) | rpl::distinct_until_changed();
+}
diff --git a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
index cda68a99b468d4..16fa600b9384c6 100644
--- a/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
+++ b/Telegram/SourceFiles/boxes/peers/peer_short_info_box.h
@@ -15,6 +15,10 @@ struct ShortInfoCover;
 struct ShortInfoBox;
 } // namespace style
 
+namespace Ui::Menu {
+struct MenuCallback;
+} // namespace Ui::Menu
+
 namespace Media::Streaming {
 class Document;
 class Instance;
@@ -37,11 +41,15 @@ enum class PeerShortInfoType {
 
 struct PeerShortInfoFields {
 	QString name;
+	QString channelName;
+	QString channelLink;
 	QString phone;
 	QString link;
 	TextWithEntities about;
 	QString username;
+	QString usernameLink;
 	Data::Birthday birthday;
+	TextWithEntities note;
 	bool isBio = false;
 };
 
@@ -117,6 +125,7 @@ class PeerShortInfoCover final {
 	object_ptr<Ui::FlatLabel> _additionalStatus = { nullptr };
 
 	std::array<QImage, 4> _roundMask;
+	std::array<QImage, 4> _roundMaskRetina;
 	QImage _userpicImage;
 	QImage _roundedTopImage;
 	QImage _barSmall;
@@ -158,6 +167,11 @@ class PeerShortInfoBox final : public Ui::BoxContent {
 
 	[[nodiscard]] rpl::producer<> openRequests() const;
 	[[nodiscard]] rpl::producer<int> moveRequests() const;
+	[[nodiscard]] auto fillMenuRequests() const
+	-> rpl::producer<Ui::Menu::MenuCallback>;
+
+protected:
+	void contextMenuEvent(QContextMenuEvent *e) override;
 
 private:
 	void prepare() override;
@@ -169,12 +183,14 @@ class PeerShortInfoBox final : public Ui::BoxContent {
 	int fillRoundedTopHeight();
 
 	[[nodiscard]] rpl::producer<QString> nameValue() const;
+	[[nodiscard]] rpl::producer<TextWithEntities> channelValue() const;
 	[[nodiscard]] rpl::producer<TextWithEntities> linkValue() const;
 	[[nodiscard]] rpl::producer<QString> phoneValue() const;
-	[[nodiscard]] rpl::producer<QString> usernameValue() const;
+	[[nodiscard]] rpl::producer<TextWithEntities> usernameValue() const;
 	[[nodiscard]] rpl::producer<QString> birthdayLabel() const;
 	[[nodiscard]] rpl::producer<QString> birthdayValue() const;
 	[[nodiscard]] rpl::producer<TextWithEntities> aboutValue() const;
+	[[nodiscard]] rpl::producer<TextWithEntities> noteValue() const;
 
 	const style::ShortInfoBox &_st;
 	const PeerShortInfoType _type = PeerShortInfoType::User;
@@ -189,6 +205,9 @@ class PeerShortInfoBox final : public Ui::BoxContent {
 	not_null<Ui::VerticalLayout*> _rows;
 	PeerShortInfoCover _cover;
 
+	base::unique_qptr<Ui::RpWidget> _menuHolder;
+	rpl::event_stream<Ui::Menu::MenuCallback> _fillMenuRequests;
+
 	rpl::event_stream<> _openRequests;
 
 };
diff --git a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
index 363a2e9dc72717..e2d4aa8a76b68d 100644
--- a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp
@@ -7,26 +7,30 @@ For license and copyright information please follow this link:
 */
 #include "boxes/peers/prepare_short_info_box.h"
 
+#include "base/unixtime.h"
 #include "boxes/peers/peer_short_info_box.h"
+#include "core/application.h"
+#include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_file_origin.h"
 #include "data/data_peer.h"
+#include "data/data_peer_values.h"
 #include "data/data_photo.h"
 #include "data/data_photo_media.h"
+#include "data/data_session.h"
 #include "data/data_streaming.h"
-#include "data/data_file_origin.h"
 #include "data/data_user.h"
-#include "data/data_chat.h"
-#include "data/data_channel.h"
-#include "data/data_peer_values.h"
 #include "data/data_user_photos.h"
-#include "data/data_changes.h"
-#include "data/data_session.h"
-#include "main/main_session.h"
-#include "window/window_session_controller.h"
 #include "info/profile/info_profile_values.h"
-#include "ui/text/format_values.h"
-#include "base/unixtime.h"
 #include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/delayed_activation.h" // PreventDelayedActivation
+#include "ui/text/format_values.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "window/window_session_controller.h"
 #include "styles/style_info.h"
+#include "styles/style_menu_icons.h"
 
 namespace {
 
@@ -202,15 +206,29 @@ void ProcessFullPhoto(
 	return peer->session().changes().peerFlagsValue(
 		peer,
 		(UpdateFlag::Name
+			| UpdateFlag::PersonalChannel
 			| UpdateFlag::PhoneNumber
 			| UpdateFlag::Username
 			| UpdateFlag::About
-			| UpdateFlag::Birthday)
+			| UpdateFlag::Birthday
+			| UpdateFlag::ContactNote)
 	) | rpl::map([=] {
 		const auto user = peer->asUser();
 		const auto username = peer->username();
+		const auto channelId = user ? user->personalChannelId() : 0;
+		const auto channel = channelId
+			? user->owner().channel(channelId).get()
+			: nullptr;
+		const auto channelUsername = channel
+			? channel->username()
+			: QString();
+		const auto hasChannel = !channelUsername.isEmpty();
 		return PeerShortInfoFields{
 			.name = peer->name(),
+			.channelName = hasChannel ? channel->name() : QString(),
+			.channelLink = (hasChannel
+				? channel->session().createInternalLinkFull(channelUsername)
+				: QString()),
 			.phone = user ? Ui::FormatPhone(user->phone()) : QString(),
 			.link = ((user || username.isEmpty())
 				? QString()
@@ -219,7 +237,11 @@ void ProcessFullPhoto(
 			.username = ((user && !username.isEmpty())
 				? ('@' + username)
 				: QString()),
+			.usernameLink = ((user && !username.isEmpty())
+				? Info::Profile::UsernameUrl(peer, username, true)
+				: QString()),
 			.birthday = user ? user->birthday() : Data::Birthday(),
+			.note = user ? user->note() : TextWithEntities(),
 			.isBio = (user && !user->isBot()),
 		};
 	});
@@ -344,7 +366,7 @@ bool ProcessCurrent(
 			&& peer->asUser()->hasPersonalPhoto())
 		? tr::lng_profile_photo_by_you(tr::now)
 		: ((state->current.index == (state->current.count - 1))
-			&& SyncUserFallbackPhotoViewer(peer->asUser()))
+			&& SyncUserFallbackPhotoViewer(peer->asUser()) == state->photoId)
 		? tr::lng_profile_public_photo(tr::now)
 		: QString();
 	state->waitingLoad = false;
@@ -391,13 +413,13 @@ bool ProcessCurrent(
 			UpdateFlag::Photo | UpdateFlag::FullInfo
 		) | rpl::filter([=](const Data::PeerUpdate &update) {
 			return (update.flags & UpdateFlag::Photo) || state->waitingFull;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			push();
 		}, lifetime);
 
 		rpl::duplicate(
 			slices
-		) | rpl::start_with_next([=](UserPhotosSlice &&slice) {
+		) | rpl::on_next([=](UserPhotosSlice &&slice) {
 			state->userSlice = std::move(slice);
 			push();
 		}, lifetime);
@@ -405,7 +427,7 @@ bool ProcessCurrent(
 		moveRequests->events(
 		) | rpl::filter([=] {
 			return (state->current.count > 1);
-		}) | rpl::start_with_next([=](int shift) {
+		}) | rpl::on_next([=](int shift) {
 			state->current.index = std::clamp(
 				((state->current.index + shift + state->current.count)
 					% state->current.count),
@@ -420,7 +442,7 @@ bool ProcessCurrent(
 				&& (state->photoView
 					? (!!state->photoView->image(Data::PhotoSize::Large))
 					: (!Ui::PeerUserpicLoading(state->userpicView)));
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			push();
 		}, lifetime);
 
@@ -433,6 +455,7 @@ object_ptr<Ui::BoxContent> PrepareShortInfoBox(
 		not_null<PeerData*> peer,
 		Fn<void()> open,
 		Fn<bool()> videoPaused,
+		Fn<void(Ui::Menu::MenuCallback)> menuFiller,
 		const style::ShortInfoBox *stOverride) {
 	const auto type = peer->isSelf()
 		? PeerShortInfoType::Self
@@ -450,31 +473,59 @@ object_ptr<Ui::BoxContent> PrepareShortInfoBox(
 		std::move(videoPaused),
 		stOverride);
 
+	if (menuFiller) {
+		result->fillMenuRequests(
+		) | rpl::on_next([=](Ui::Menu::MenuCallback callback) {
+			menuFiller(std::move(callback));
+		}, result->lifetime());
+	}
+
 	result->openRequests(
-	) | rpl::start_with_next(open, result->lifetime());
+	) | rpl::on_next(open, result->lifetime());
 
 	result->moveRequests(
-	) | rpl::start_with_next(userpic.move, result->lifetime());
+	) | rpl::on_next(userpic.move, result->lifetime());
 
 	return result;
 }
 
 object_ptr<Ui::BoxContent> PrepareShortInfoBox(
 		not_null<PeerData*> peer,
-		not_null<Window::SessionNavigation*> navigation,
+		std::shared_ptr<ChatHelpers::Show> show,
 		const style::ShortInfoBox *stOverride) {
-	const auto open = [=] { navigation->showPeerHistory(peer); };
+	const auto open = [=] {
+		if (const auto window = show->resolveWindow()) {
+			window->showPeerHistory(peer);
+		}
+	};
 	const auto videoIsPaused = [=] {
-		return navigation->parentController()->isGifPausedAtLeastFor(
-			Window::GifPauseReason::Layer);
+		return show->paused(Window::GifPauseReason::Layer);
+	};
+	auto menuFiller = [=](Ui::Menu::MenuCallback addAction) {
+		const auto peerSeparateId = Window::SeparateId(peer);
+		const auto window = show->resolveWindow();
+		if (window && window->windowId() != peerSeparateId) {
+			addAction(tr::lng_context_new_window(tr::now), [=] {
+				Ui::PreventDelayedActivation();
+				window->showInNewWindow(peer);
+			}, &st::menuIconNewWindow);
+		}
 	};
 	return PrepareShortInfoBox(
 		peer,
 		open,
 		videoIsPaused,
+		std::move(menuFiller),
 		stOverride);
 }
 
+object_ptr<Ui::BoxContent> PrepareShortInfoBox(
+		not_null<PeerData*> peer,
+		not_null<Window::SessionNavigation*> navigation,
+		const style::ShortInfoBox *stOverride) {
+	return PrepareShortInfoBox(peer, navigation->uiShow(), stOverride);
+}
+
 rpl::producer<QString> PrepareShortInfoStatus(not_null<PeerData*> peer) {
 	return StatusValue(peer);
 }
@@ -508,7 +559,7 @@ PreparedShortInfoUserpic PrepareShortInfoFallbackUserpic(
 			1,
 			1,
 			1))
-		: (rpl::never<UserPhotosSlice>() | rpl::type_erased());
+		: (rpl::never<UserPhotosSlice>() | rpl::type_erased);
 	auto process = [=](not_null<UserpicState*> state) {
 		if (photoId) {
 			ProcessFullPhoto(peer, state, peer->owner().photo(*photoId));
diff --git a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.h b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.h
index 327ce373b3830b..2213f4da2501ae 100644
--- a/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.h
+++ b/Telegram/SourceFiles/boxes/peers/prepare_short_info_box.h
@@ -16,6 +16,14 @@ struct ShortInfoCover;
 struct ShortInfoBox;
 } // namespace style
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Ui::Menu {
+struct MenuCallback;
+} // namespace Ui::Menu
+
 namespace Ui {
 class BoxContent;
 } // namespace Ui
@@ -35,6 +43,12 @@ struct PreparedShortInfoUserpic {
 	not_null<PeerData*> peer,
 	Fn<void()> open,
 	Fn<bool()> videoPaused,
+	Fn<void(Ui::Menu::MenuCallback)> menuFiller,
+	const style::ShortInfoBox *stOverride = nullptr);
+
+[[nodiscard]] object_ptr<Ui::BoxContent> PrepareShortInfoBox(
+	not_null<PeerData*> peer,
+	std::shared_ptr<ChatHelpers::Show> show,
 	const style::ShortInfoBox *stOverride = nullptr);
 
 [[nodiscard]] object_ptr<Ui::BoxContent> PrepareShortInfoBox(
diff --git a/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp b/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
index a3bc8b69bd374a..4298a8c2b3acb7 100644
--- a/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
@@ -11,8 +11,9 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "base/event_filter.h"
 #include "base/unixtime.h"
-#include "data/data_premium_limits.h"
 #include "boxes/peer_list_box.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_premium_limits.h"
 #include "data/data_channel.h"
 #include "data/data_cloud_themes.h"
 #include "data/data_session.h"
@@ -32,8 +33,11 @@ For license and copyright information please follow this link:
 #include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/empty_userpic.h"
+#include "ui/dynamic_image.h"
 #include "ui/painter.h"
+#include "ui/top_background_gradient.h"
 #include "styles/style_boxes.h"
+#include "styles/style_credits.h"
 #include "styles/style_premium.h"
 
 namespace {
@@ -202,25 +206,27 @@ void Controller::prepare() {
 	const auto session = &_to->session();
 	auto above = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
 	above->add(
-		CreateBoostReplaceUserpics(
+		CreateUserpicsTransfer(
 			above.data(),
 			_selectedPeers.value(),
-			_to),
+			_to,
+			UserpicsTransferType::BoostReplace),
 		st::boxRowPadding + st::boostReplaceUserpicsPadding);
 	above->add(
 		object_ptr<Ui::FlatLabel>(
 			above.data(),
 			tr::lng_boost_reassign_text(
 				lt_channel,
-				rpl::single(Ui::Text::Bold(_to->name())),
+				rpl::single(tr::bold(_to->name())),
 				lt_gift,
 				tr::lng_boost_reassign_gift(
 					lt_count,
 					rpl::single(1. * BoostsForGift(session)),
-					Ui::Text::RichLangValue),
-				Ui::Text::RichLangValue),
+					tr::rich),
+				tr::rich),
 			st::boostReassignText),
-		st::boxRowPadding);
+		st::boxRowPadding,
+		style::al_top);
 	delegate()->peerListSetAboveWidget(std::move(above));
 
 	const auto now = base::unixtime::now();
@@ -272,7 +278,7 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 				tr::now,
 				lt_count,
 				BoostsForGift(&session()),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			.adaptive = true,
 		});
 		return;
@@ -325,14 +331,14 @@ object_ptr<Ui::BoxContent> ReassignBoostFloodBox(int seconds, bool group) {
 			? tr::lng_boost_error_flood_text_group
 			: tr::lng_boost_error_flood_text)(
 				lt_left,
-				rpl::single(Ui::Text::Bold((days > 1)
+				rpl::single(tr::bold((days > 1)
 					? tr::lng_days(tr::now, lt_count, days)
 					: (hours > 1)
 					? tr::lng_hours(tr::now, lt_count, hours)
 					: (minutes > 1)
 					? tr::lng_minutes(tr::now, lt_count, minutes)
 					: tr::lng_seconds(tr::now, lt_count, seconds))),
-				Ui::Text::RichLangValue),
+				tr::rich),
 		.title = tr::lng_boost_error_flood_title(),
 	});
 }
@@ -356,26 +362,27 @@ object_ptr<Ui::BoxContent> ReassignBoostSingleBox(
 		Ui::ConfirmBox(box, {
 			.text = tr::lng_boost_now_instead(
 				lt_channel,
-				rpl::single(Ui::Text::Bold(peer->name())),
+				rpl::single(tr::bold(peer->name())),
 				lt_other,
-				rpl::single(Ui::Text::Bold(to->name())),
-				Ui::Text::WithEntities),
+				rpl::single(tr::bold(to->name())),
+				tr::marked),
 			.confirmed = confirmed,
 			.confirmText = tr::lng_boost_now_replace(),
 			.labelPadding = st::boxRowPadding,
 		});
 		box->verticalLayout()->insert(
 			0,
-			CreateBoostReplaceUserpics(
+			CreateUserpicsTransfer(
 				box,
 				rpl::single(std::vector{ peer }),
-				to),
+				to,
+				UserpicsTransferType::BoostReplace),
 			st::boxRowPadding + st::boostReplaceUserpicsPadding);
 	});
 
 	result->boxClosing() | rpl::filter([=] {
 		return !*reassigned;
-	}) | rpl::start_with_next(cancel, result->lifetime());
+	}) | rpl::on_next(cancel, result->lifetime());
 
 	return result;
 }
@@ -426,6 +433,7 @@ Ui::BoostCounters ParseBoostCounters(
 Ui::BoostFeatures LookupBoostFeatures(not_null<ChannelData*> channel) {
 	auto nameColorsByLevel = base::flat_map<int, int>();
 	auto linkStylesByLevel = base::flat_map<int, int>();
+	auto profileColorsByLevel = base::flat_map<int, int>();
 	const auto group = channel->isMegagroup();
 	const auto peerColors = &channel->session().api().peerColors();
 	const auto &list = group
@@ -438,6 +446,29 @@ Ui::BoostFeatures LookupBoostFeatures(not_null<ChannelData*> channel) {
 		}
 		++linkStylesByLevel[level];
 	}
+	{
+		const auto profileIndices = peerColors->profileColorIndices();
+		auto lowestNonZeroLevel = std::numeric_limits<int>::max();
+		auto levels = std::vector<int>();
+		levels.reserve(profileIndices.size());
+
+		for (const auto index : profileIndices) {
+			const auto level = peerColors->requiredLevelFor(
+				channel->id,
+				index,
+				group,
+				true);
+			levels.push_back(level);
+			if (level) {
+				lowestNonZeroLevel = std::min(lowestNonZeroLevel, level);
+			}
+		}
+
+		for (const auto level : levels) {
+			++profileColorsByLevel[std::max(level, lowestNonZeroLevel)];
+		}
+	}
+
 	const auto &themes = channel->owner().cloudThemes().chatThemes();
 	if (themes.empty()) {
 		channel->owner().cloudThemes().refreshChatThemes();
@@ -446,7 +477,12 @@ Ui::BoostFeatures LookupBoostFeatures(not_null<ChannelData*> channel) {
 	return Ui::BoostFeatures{
 		.nameColorsByLevel = std::move(nameColorsByLevel),
 		.linkStylesByLevel = std::move(linkStylesByLevel),
+		.profileColorsByLevel = std::move(profileColorsByLevel),
 		.linkLogoLevel = group ? 0 : levelLimits.channelBgIconLevelMin(),
+		.profileIconLevel = group
+			? levelLimits.groupProfileBgIconLevelMin()
+			: levelLimits.channelProfileBgIconLevelMin(),
+		.autotranslateLevel = group ? 0 : levelLimits.channelAutoTranslateLevelMin(),
 		.transcribeLevel = group ? levelLimits.groupTranscribeLevelMin() : 0,
 		.emojiPackLevel = group ? levelLimits.groupEmojiStickersLevelMin() : 0,
 		.emojiStatusLevel = group
@@ -515,7 +551,7 @@ object_ptr<Ui::BoxContent> ReassignBoostsBox(
 	const auto raw = controller.get();
 	auto initBox = [=](not_null<Ui::BoxContent*> box) {
 		raw->selectedValue(
-		) | rpl::start_with_next([=](std::vector<int> slots) {
+		) | rpl::on_next([=](std::vector<int> slots) {
 			box->clearButtons();
 			if (!slots.empty()) {
 				const auto sources = SourcesCount(to, from, slots);
@@ -531,15 +567,17 @@ object_ptr<Ui::BoxContent> ReassignBoostsBox(
 
 		box->boxClosing() | rpl::filter([=] {
 			return !*reassigned;
-		}) | rpl::start_with_next(cancel, box->lifetime());
+		}) | rpl::on_next(cancel, box->lifetime());
 	};
 	return Box<PeerListBox>(std::move(controller), std::move(initBox));
 }
 
-object_ptr<Ui::RpWidget> CreateBoostReplaceUserpics(
+object_ptr<Ui::RpWidget> CreateUserpicsTransfer(
 		not_null<Ui::RpWidget*> parent,
 		rpl::producer<std::vector<not_null<PeerData*>>> from,
-		not_null<PeerData*> to) {
+		not_null<PeerData*> to,
+		UserpicsTransferType type) {
+	using Type = UserpicsTransferType;
 	struct State {
 		std::vector<not_null<PeerData*>> from;
 		std::vector<std::unique_ptr<Ui::UserpicButton>> buttons;
@@ -547,21 +585,35 @@ object_ptr<Ui::RpWidget> CreateBoostReplaceUserpics(
 		rpl::variable<int> count = 0;
 		bool painting = false;
 	};
-	const auto full = st::boostReplaceUserpic.size.height()
+	const auto st = &st::boostReplaceUserpicsRow;
+	const auto full = st->button.size.height()
 		+ st::boostReplaceIconAdd.y()
 		+ st::lineWidth;
 	auto result = object_ptr<Ui::FixedHeightWidget>(parent, full);
 	const auto raw = result.data();
-	const auto &st = st::boostReplaceUserpic;
-	const auto right = CreateChild<Ui::UserpicButton>(raw, to, st);
+	const auto right = CreateChild<Ui::UserpicButton>(raw, to, st->button);
 	const auto overlay = CreateChild<Ui::RpWidget>(raw);
+	const auto drawCornerPeer = (type == Type::ChannelFutureOwner)
+		? [&]() -> PaintRoundImageCallback {
+			using Peers = std::vector<not_null<PeerData*>>;
+			const auto snapshot = rpl::variable<Peers>(
+				rpl::duplicate(from)).current();
+			if (snapshot.size() == 2) {
+				return ForceRoundUserpicCallback(snapshot[1].get());
+			}
+			return nullptr;
+		}()
+		: (PaintRoundImageCallback)(nullptr);
 
 	const auto state = raw->lifetime().make_state<State>();
-	std::move(
-		from
-	) | rpl::start_with_next([=](
+	((type == Type::ChannelFutureOwner)
+		? std::move(from) | rpl::map([=](
+				const std::vector<not_null<PeerData*>> &list) {
+			return std::vector<not_null<PeerData*>>{ list.front() };
+		})
+		: std::move(from)
+	) | rpl::on_next([=](
 			const std::vector<not_null<PeerData*>> &list) {
-		const auto &st = st::boostReplaceUserpic;
 		auto was = base::take(state->from);
 		auto buttons = base::take(state->buttons);
 		state->from.reserve(list.size());
@@ -575,7 +627,7 @@ object_ptr<Ui::RpWidget> CreateBoostReplaceUserpics(
 				state->buttons.push_back(std::move(buttons[index]));
 			} else {
 				state->buttons.push_back(
-					std::make_unique<Ui::UserpicButton>(raw, peer, st));
+					std::make_unique<Ui::UserpicButton>(raw, peer, st->button));
 				const auto raw = state->buttons.back().get();
 				base::install_event_filter(raw, [=](not_null<QEvent*> e) {
 					return (e->type() == QEvent::Paint && !state->painting)
@@ -591,11 +643,11 @@ object_ptr<Ui::RpWidget> CreateBoostReplaceUserpics(
 	rpl::combine(
 		raw->widthValue(),
 		state->count.value()
-	) | rpl::start_with_next([=](int width, int count) {
+	) | rpl::on_next([=](int width, int count) {
 		const auto skip = st::boostReplaceUserpicsSkip;
 		const auto left = width - 2 * right->width() - skip;
 		const auto shift = std::min(
-			st::boostReplaceUserpicsShift,
+			st->shift,
 			(count > 1 ? (left / (count - 1)) : width));
 		const auto total = right->width()
 			+ (count ? (skip + right->width() + (count - 1) * shift) : 0);
@@ -614,7 +666,7 @@ object_ptr<Ui::RpWidget> CreateBoostReplaceUserpics(
 	overlay->paintRequest(
 	) | rpl::filter([=] {
 		return !state->buttons.empty();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		const auto outerw = overlay->width();
 		const auto ratio = style::DevicePixelRatio();
 		if (state->layer.size() != QSize(outerw, full) * ratio) {
@@ -625,9 +677,9 @@ object_ptr<Ui::RpWidget> CreateBoostReplaceUserpics(
 		}
 		state->layer.fill(Qt::transparent);
 
-		auto q = QPainter(&state->layer);
+		auto q = Painter(&state->layer);
 		auto hq = PainterHighQualityEnabler(q);
-		const auto stroke = st::boostReplaceIconOutline;
+		const auto stroke = st->stroke;
 		const auto half = stroke / 2.;
 		auto pen = st::windowBg->p;
 		pen.setWidthF(stroke * 2.);
@@ -641,21 +693,44 @@ object_ptr<Ui::RpWidget> CreateBoostReplaceUserpics(
 		}
 		state->painting = false;
 		const auto last = state->buttons.back().get();
-		const auto add = st::boostReplaceIconAdd;
-		const auto skip = st::boostReplaceIconSkip;
-		const auto w = st::boostReplaceIcon.width() + 2 * skip;
-		const auto h = st::boostReplaceIcon.height() + 2 * skip;
-		const auto x = last->x() + last->width() - w + add.x();
-		const auto y = last->y() + last->height() - h + add.y();
-
-		auto brush = QLinearGradient(QPointF(x + w, y + h), QPointF(x, y));
-		brush.setStops(Ui::Premium::ButtonGradientStops());
-		q.setBrush(brush);
-		pen.setWidthF(stroke);
-		q.setPen(pen);
-		q.drawEllipse(x - half, y - half, w + stroke, h + stroke);
-		st::boostReplaceIcon.paint(q, x + skip, y + skip, outerw);
-
+		if (type != Type::AuctionRecipient) {
+			const auto boosting = (type == Type::BoostReplace);
+			const auto guard = (type == Type::GuardBotReplace);
+			const auto gradient = boosting || guard;
+			const auto back = gradient ? last : right;
+			const auto add = st::boostReplaceIconAdd;
+			const auto &icon = guard
+				? st::guardBotReplaceIcon
+				: boosting
+				? st::boostReplaceIcon
+				: st::starrefJoinIcon;
+			const auto skip = gradient ? st::boostReplaceIconSkip : 0;
+			const auto w = icon.width() + 2 * skip;
+			const auto h = icon.height() + 2 * skip;
+			const auto x = back->x() + back->width() - w + add.x();
+			const auto y = back->y() + back->height() - h + add.y();
+
+			pen.setWidthF(drawCornerPeer ? stroke * 2 : stroke);
+			q.setPen(pen);
+			if (drawCornerPeer) {
+				q.setBrush(Qt::NoBrush);
+				q.drawEllipse(x - half, y - half, w + stroke, h + stroke);
+				drawCornerPeer(
+					q,
+					x - half,
+					y - half,
+					w + stroke,
+					w + stroke);
+			} else {
+				auto brush = QLinearGradient(
+					QPointF(x + w, y + h),
+					QPointF(x, y));
+				brush.setStops(Ui::Premium::ButtonGradientStops());
+				q.setBrush(brush);
+				q.drawEllipse(x - half, y - half, w + stroke, h + stroke);
+				icon.paint(q, x + skip, y + skip, outerw);
+			}
+		}
 		const auto size = st::boostReplaceArrow.size();
 		st::boostReplaceArrow.paint(
 			q,
@@ -664,7 +739,6 @@ object_ptr<Ui::RpWidget> CreateBoostReplaceUserpics(
 				+ (st::boostReplaceUserpicsSkip - size.width()) / 2),
 			(last->height() - size.height()) / 2,
 			outerw);
-
 		q.end();
 
 		auto p = QPainter(overlay);
@@ -676,6 +750,7 @@ object_ptr<Ui::RpWidget> CreateBoostReplaceUserpics(
 object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 		not_null<Ui::RpWidget*> parent,
 		rpl::producer<std::vector<not_null<PeerData*>>> peers,
+		const style::UserpicsRow &st,
 		int limit) {
 	struct State {
 		std::vector<not_null<PeerData*>> from;
@@ -685,9 +760,8 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 		rpl::variable<int> count = 0;
 		bool painting = false;
 	};
-	const auto full = st::boostReplaceUserpic.size.height()
-		+ st::boostReplaceIconAdd.y()
-		+ st::lineWidth;
+	const auto full = st.button.size.height()
+		+ (st.complex ? (st::boostReplaceIconAdd.y() + st::lineWidth) : 0);
 	auto result = object_ptr<Ui::FixedHeightWidget>(parent, full);
 	const auto raw = result.data();
 	const auto overlay = CreateChild<Ui::RpWidget>(raw);
@@ -695,9 +769,8 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 	const auto state = raw->lifetime().make_state<State>();
 	std::move(
 		peers
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=, &st](
 			const std::vector<not_null<PeerData*>> &list) {
-		const auto &st = st::boostReplaceUserpic;
 		auto was = base::take(state->from);
 		auto buttons = base::take(state->buttons);
 		state->from.reserve(list.size());
@@ -711,7 +784,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 				state->buttons.push_back(std::move(buttons[index]));
 			} else {
 				state->buttons.push_back(
-					std::make_unique<Ui::UserpicButton>(raw, peer, st));
+					std::make_unique<Ui::UserpicButton>(raw, peer, st.button));
 				const auto raw = state->buttons.back().get();
 				base::install_event_filter(raw, [=](not_null<QEvent*> e) {
 					return (e->type() == QEvent::Paint && !state->painting)
@@ -724,16 +797,21 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 		overlay->update();
 	}, raw->lifetime());
 
+	if (const auto count = state->count.current()) {
+		const auto single = st.button.size.width();
+		const auto used = std::min(count, int(state->buttons.size()));
+		const auto shift = st.shift;
+		raw->resize(used ? (single + (used - 1) * shift) : 0, raw->height());
+	}
 	rpl::combine(
 		raw->widthValue(),
 		state->count.value()
-	) | rpl::start_with_next([=](int width, int count) {
-		const auto &st = st::boostReplaceUserpic;
-		const auto single = st.size.width();
+	) | rpl::on_next([=, &st](int width, int count) {
+		const auto single = st.button.size.width();
 		const auto left = width - single;
 		const auto used = std::min(count, int(state->buttons.size()));
 		const auto shift = std::min(
-			st::boostReplaceUserpicsShift,
+			st.shift,
 			(used > 1 ? (left / (used - 1)) : width));
 		const auto total = used ? (single + (used - 1) * shift) : 0;
 		auto x = (width - total) / 2;
@@ -747,7 +825,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 	overlay->paintRequest(
 	) | rpl::filter([=] {
 		return !state->buttons.empty();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=, &st] {
 		const auto outerw = overlay->width();
 		const auto ratio = style::DevicePixelRatio();
 		if (state->layer.size() != QSize(outerw, full) * ratio) {
@@ -760,31 +838,40 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 
 		auto q = QPainter(&state->layer);
 		auto hq = PainterHighQualityEnabler(q);
-		const auto stroke = st::boostReplaceIconOutline;
+		const auto stroke = st.stroke;
 		const auto half = stroke / 2.;
-		auto pen = st::windowBg->p;
+		auto pen = st.bg->p;
 		pen.setWidthF(stroke * 2.);
 		state->painting = true;
-		for (const auto &button : state->buttons) {
+		const auto paintOne = [&](not_null<Ui::UserpicButton*> button) {
 			q.setPen(pen);
 			q.setBrush(Qt::NoBrush);
 			q.drawEllipse(button->geometry());
 			const auto position = button->pos();
 			button->render(&q, position, QRegion(), QWidget::DrawChildren);
+		};
+		if (st.invert) {
+			for (const auto &button : ranges::views::reverse(state->buttons)) {
+				paintOne(button.get());
+			}
+		} else {
+			for (const auto &button : state->buttons) {
+				paintOne(button.get());
+			}
 		}
 		state->painting = false;
-		const auto last = state->buttons.back().get();
-		const auto add = st::boostReplaceIconAdd;
-		const auto skip = st::boostReplaceIconSkip;
-		const auto w = st::boostReplaceIcon.width() + 2 * skip;
-		const auto h = st::boostReplaceIcon.height() + 2 * skip;
-		const auto x = last->x() + last->width() - w + add.x();
-		const auto y = last->y() + last->height() - h + add.y();
 
 		const auto text = (state->count.current() > limit)
 			? ('+' + QString::number(state->count.current() - limit))
 			: QString();
-		if (!text.isEmpty()) {
+		if (st.complex && !text.isEmpty()) {
+			const auto last = state->buttons.back().get();
+			const auto add = st::boostReplaceIconAdd;
+			const auto skip = st::boostReplaceIconSkip;
+			const auto w = st::boostReplaceIcon.width() + 2 * skip;
+			const auto h = st::boostReplaceIcon.height() + 2 * skip;
+			const auto x = last->x() + last->width() - w + add.x();
+			const auto y = last->y() + last->height() - h + add.y();
 			const auto &font = st::semiboldFont;
 			const auto width = font->width(text);
 			const auto padded = std::max(w, width + 2 * font->spacew);
@@ -811,3 +898,219 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 	}, overlay->lifetime());
 	return result;
 }
+
+class UniqueGiftBackground final : public Ui::DynamicImage {
+public:
+	UniqueGiftBackground(
+		not_null<Main::Session*> session,
+		std::shared_ptr<Data::UniqueGift> unique)
+	: _session(session)
+	, _unique(std::move(unique)) {
+	}
+
+	std::shared_ptr<Ui::DynamicImage> clone() override {
+		return std::make_shared<UniqueGiftBackground>(_session, _unique);
+	}
+
+	void subscribeToUpdates(Fn<void()> callback) override {
+		_repaint = std::move(callback);
+		if (!_repaint) {
+			_patternEmoji = nullptr;
+		}
+	}
+
+	QImage image(int size) override {
+		if (!_patternEmoji) {
+			_patternEmoji = _session->data().customEmojiManager().create(
+				_unique->pattern.document,
+				[=] { ready(); },
+				Data::CustomEmojiSizeTag::Large);
+			[[maybe_unused]] const auto preload = _patternEmoji->ready();
+		}
+		const auto inner = QRect(0, 0, size, size);
+		const auto ratio = style::DevicePixelRatio();
+		if (_backgroundCache.size() != inner.size() * ratio) {
+			_backgroundCache = QImage(
+				inner.size() * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			_backgroundCache.fill(Qt::transparent);
+			_backgroundCache.setDevicePixelRatio(ratio);
+
+			const auto radius = st::giftBoxGiftRadius;
+			auto p = QPainter(&_backgroundCache);
+			auto hq = PainterHighQualityEnabler(p);
+			auto gradient = QRadialGradient(
+				inner.center(),
+				inner.width() / 2);
+			gradient.setStops({
+				{ 0., _unique->backdrop.centerColor },
+				{ 1., _unique->backdrop.edgeColor },
+			});
+			p.setBrush(gradient);
+			p.setPen(Qt::NoPen);
+			p.drawRoundedRect(inner, radius, radius);
+			_backroundPatterned = false;
+		}
+		if (!_backroundPatterned && _patternEmoji->ready()) {
+			_backroundPatterned = true;
+			auto p = QPainter(&_backgroundCache);
+			p.setClipRect(inner);
+			const auto skip = inner.width() / 3;
+			Ui::PaintBgPoints(
+				p,
+				Ui::PatternBgPointsSmall(),
+				_patternCache,
+				_patternEmoji.get(),
+				*_unique,
+				QRect(-skip, 0, inner.width() + 2 * skip, inner.height()));
+		}
+		return _backgroundCache;
+	}
+
+private:
+	void ready() {
+		if (!_backroundPatterned && _repaint) {
+			_repaint();
+		}
+	}
+
+	const not_null<Main::Session*> _session;
+	const std::shared_ptr<Data::UniqueGift> _unique;
+	Fn<void()> _repaint;
+	std::unique_ptr<Ui::Text::CustomEmoji> _patternEmoji;
+	QImage _backgroundCache;
+	base::flat_map<float64, QImage> _patternCache;
+	bool _backroundPatterned = false;
+
+};
+
+[[nodiscard]] PaintRoundImageCallback GenerateGiftUniqueUserpicCallback(
+		not_null<Main::Session*> session,
+		std::shared_ptr<Data::UniqueGift> unique,
+		Fn<void()> update) {
+	struct State {
+		QImage layer;
+		std::shared_ptr<UniqueGiftBackground> bg;
+		std::shared_ptr<Ui::Text::CustomEmoji> sticker;
+	};
+	const auto state = std::make_shared<State>();
+	const auto repaint = [=] {
+		if (update) {
+			update();
+		}
+	};
+	state->bg = std::make_shared<UniqueGiftBackground>(session, unique);
+	state->bg->subscribeToUpdates(repaint);
+	const auto tag = Data::CustomEmojiSizeTag::Isolated;
+	state->sticker = session->data().customEmojiManager().create(
+		unique->model.document,
+		repaint,
+		tag);
+
+	return [=](QPainter &p, int x, int y, int outerw, int size) {
+		const auto ideal = st::boostReplaceUserpic.photoSize;
+		const auto scale = size / float64(ideal);
+		const auto ratio = style::DevicePixelRatio();
+		if (state->layer.size() != QSize(ideal, ideal) * ratio) {
+			state->layer = QImage(
+				QSize(ideal, ideal) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			state->layer.setDevicePixelRatio(ratio);
+		}
+		state->layer.fill(Qt::transparent);
+
+		auto q = QPainter(&state->layer);
+		auto hq = PainterHighQualityEnabler(q);
+		const auto esize = Data::FrameSizeFromTag(tag) / ratio;
+		q.drawImage(QRect(0, 0, ideal, ideal), state->bg->image(ideal));
+		state->sticker->paint(q, {
+			.textColor = st::windowFg->c,
+			.now = crl::now(),
+			.position = QPoint((ideal - esize) / 2, (ideal - esize) / 2),
+		});
+		q.end();
+
+		if (scale != 1.) {
+			p.save();
+			p.translate(x, y);
+			p.scale(scale, scale);
+			p.drawImage(0, 0, state->layer);
+			p.restore();
+		} else {
+			p.drawImage(x, y, state->layer);
+		}
+	};
+}
+
+object_ptr<Ui::RpWidget> CreateGiftTransfer(
+		not_null<Ui::RpWidget*> parent,
+		std::shared_ptr<Data::UniqueGift> unique,
+		not_null<PeerData*> to) {
+	struct State {
+		QImage layer;
+		QPoint giftPosition;
+		PaintRoundImageCallback paintGift;
+	};
+	const auto st = &st::boostReplaceUserpicsRow;
+	const auto full = st->button.size.height()
+		+ st::boostReplaceIconAdd.y()
+		+ st::lineWidth;
+	auto result = object_ptr<Ui::FixedHeightWidget>(parent, full);
+	const auto raw = result.data();
+	const auto right = CreateChild<Ui::UserpicButton>(raw, to, st->button);
+	const auto overlay = CreateChild<Ui::RpWidget>(raw);
+
+	const auto state = raw->lifetime().make_state<State>();
+	state->paintGift = GenerateGiftUniqueUserpicCallback(
+		&to->session(),
+		unique,
+		[=] { raw->update(); });
+
+	raw->widthValue(
+	) | rpl::on_next([=](int width) {
+		const auto skip = st::boostReplaceUserpicsSkip;
+		const auto total = right->width() + skip + right->width();
+		auto x = (width - total) / 2;
+		state->giftPosition = QPoint(x, 0);
+		x += right->width() + skip;
+		right->moveToLeft(x, 0);
+		overlay->setGeometry(QRect(0, 0, width, raw->height()));
+	}, raw->lifetime());
+
+	overlay->paintRequest(
+	) | rpl::on_next([=] {
+		const auto outerw = overlay->width();
+		const auto ratio = style::DevicePixelRatio();
+		if (state->layer.size() != QSize(outerw, full) * ratio) {
+			state->layer = QImage(
+				QSize(outerw, full) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			state->layer.setDevicePixelRatio(ratio);
+		}
+		state->layer.fill(Qt::transparent);
+
+		auto q = Painter(&state->layer);
+		auto hq = PainterHighQualityEnabler(q);
+		state->paintGift(
+			q,
+			state->giftPosition.x(),
+			state->giftPosition.y(),
+			outerw,
+			right->width());
+
+		const auto size = st::boostReplaceArrow.size();
+		st::boostReplaceArrow.paint(
+			q,
+			(state->giftPosition.x()
+				+ right->width()
+				+ (st::boostReplaceUserpicsSkip - size.width()) / 2),
+			(right->height() - size.height()) / 2,
+			outerw);
+
+		q.end();
+
+		auto p = QPainter(overlay);
+		p.drawImage(0, 0, state->layer);
+	}, overlay->lifetime());
+	return result;
+}
diff --git a/Telegram/SourceFiles/boxes/peers/replace_boost_box.h b/Telegram/SourceFiles/boxes/peers/replace_boost_box.h
index c84b0d306cbf9f..3c4d7c956759dd 100644
--- a/Telegram/SourceFiles/boxes/peers/replace_boost_box.h
+++ b/Telegram/SourceFiles/boxes/peers/replace_boost_box.h
@@ -9,8 +9,16 @@ For license and copyright information please follow this link:
 
 #include "base/object_ptr.h"
 
+namespace style {
+struct UserpicsRow;
+} // namespace style
+
 class ChannelData;
 
+namespace Data {
+struct UniqueGift;
+} // namespace Data
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -53,12 +61,38 @@ object_ptr<Ui::BoxContent> ReassignBoostsBox(
 	Fn<void(std::vector<int> slots, int groups, int channels)> reassign,
 	Fn<void()> cancel);
 
-[[nodiscard]] object_ptr<Ui::RpWidget> CreateBoostReplaceUserpics(
+enum class UserpicsTransferType {
+	BoostReplace,
+	StarRefJoin,
+	AuctionRecipient,
+	ChannelFutureOwner,
+	GuardBotReplace,
+};
+[[nodiscard]] object_ptr<Ui::RpWidget> CreateUserpicsTransfer(
 	not_null<Ui::RpWidget*> parent,
 	rpl::producer<std::vector<not_null<PeerData*>>> from,
-	not_null<PeerData*> to);
+	not_null<PeerData*> to,
+	UserpicsTransferType type);
 
 [[nodiscard]] object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 	not_null<Ui::RpWidget*> parent,
 	rpl::producer<std::vector<not_null<PeerData*>>> peers,
+	const style::UserpicsRow &st,
 	int limit);
+
+[[nodiscard]] object_ptr<Ui::RpWidget> CreateGiftTransfer(
+	not_null<Ui::RpWidget*> parent,
+	std::shared_ptr<Data::UniqueGift> unique,
+	not_null<PeerData*> to);
+
+using PaintRoundImageCallback = Fn<void(
+	Painter &p,
+	int x,
+	int y,
+	int outerWidth,
+	int size)>;
+
+[[nodiscard]] PaintRoundImageCallback GenerateGiftUniqueUserpicCallback(
+	not_null<Main::Session*> session,
+	std::shared_ptr<Data::UniqueGift> unique,
+	Fn<void()> update);
diff --git a/Telegram/SourceFiles/boxes/peers/tag_info_box.cpp b/Telegram/SourceFiles/boxes/peers/tag_info_box.cpp
new file mode 100644
index 00000000000000..ee125790189616
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peers/tag_info_box.cpp
@@ -0,0 +1,532 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/peers/tag_info_box.h"
+
+#include "boxes/peers/edit_participants_box.h"
+#include "boxes/peers/edit_tag_control.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_chat_participant_status.h"
+#include "data/data_peer.h"
+#include "data/data_user.h"
+#include "history/view/history_view_message.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/chat/chat_style.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "window/section_widget.h"
+#include "window/themes/window_theme.h"
+#include "styles/style_boxes.h"
+#include "styles/style_calls.h"
+#include "styles/style_chat.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_widgets.h"
+
+namespace {
+
+using HistoryView::BadgeRole;
+
+constexpr auto kTextLinesAlpha = 0.1;
+
+[[nodiscard]] QColor RoleColor(BadgeRole role) {
+	return (role == BadgeRole::Creator)
+		? st::rankOwnerFg->c
+		: (role == BadgeRole::Admin)
+		? st::rankAdminFg->c
+		: st::rankUserFg->c;
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeRoundColoredLogo(
+		not_null<QWidget*> parent,
+		BadgeRole role) {
+	const auto &icon = st::tagInfoIcon;
+	const auto &padding = st::tagInfoIconPadding;
+	const auto logoSize = icon.size();
+	const auto logoOuter = logoSize.grownBy(padding);
+	auto result = object_ptr<Ui::RpWidget>(parent);
+	const auto logo = result.data();
+	logo->resize(logo->width(), logoOuter.height());
+	logo->paintRequest() | rpl::on_next([=, &icon] {
+		if (logo->width() < logoOuter.width()) {
+			return;
+		}
+		auto p = QPainter(logo);
+		auto hq = PainterHighQualityEnabler(p);
+		const auto x = (logo->width() - logoOuter.width()) / 2;
+		const auto outer = QRect(QPoint(x, 0), logoOuter);
+		p.setBrush(RoleColor(role));
+		p.setPen(Qt::NoPen);
+		p.drawEllipse(outer);
+		icon.paintInCenter(p, outer);
+	}, logo->lifetime());
+	return result;
+}
+
+[[nodiscard]] Ui::Text::PaletteDependentEmoji MakeTagPillEmoji(
+		const QString &text,
+		BadgeRole role) {
+	return { .factory = [=] {
+		const auto color = RoleColor(role);
+		const auto &padding = st::msgTagBadgePadding;
+		auto string = Ui::Text::String(st::defaultTextStyle, text);
+		const auto textWidth = string.maxWidth();
+		const auto isUser = (role == BadgeRole::User);
+		const auto contentWidth = padding.left()
+			+ textWidth
+			+ padding.right();
+		const auto pillHeight = padding.top()
+			+ st::msgFont->height
+			+ padding.bottom();
+		const auto imgWidth = isUser
+			? textWidth
+			: std::max(contentWidth, pillHeight);
+		const auto imgHeight = isUser
+			? st::msgFont->height
+			: pillHeight;
+		const auto ratio = style::DevicePixelRatio();
+
+		auto result = QImage(
+			QSize(imgWidth, imgHeight) * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		result.setDevicePixelRatio(ratio);
+		result.fill(Qt::transparent);
+
+		auto p = QPainter(&result);
+		auto hq = PainterHighQualityEnabler(p);
+		if (!isUser) {
+			auto bgColor = color;
+			bgColor.setAlphaF(0.15);
+			p.setPen(Qt::NoPen);
+			p.setBrush(bgColor);
+			p.drawRoundedRect(
+				0,
+				0,
+				imgWidth,
+				imgHeight,
+				imgHeight / 2.,
+				imgHeight / 2.);
+		}
+		p.setPen(color);
+		string.draw(p, {
+			.position = QPoint(
+				isUser ? 0 : ((imgWidth - textWidth) / 2),
+				isUser ? 0 : padding.top()),
+			.availableWidth = textWidth,
+		});
+		p.end();
+		return result;
+	}, .margin = st::customEmojiTextBadgeMargin };
+}
+
+class TagPreviewsWidget final : public Ui::RpWidget {
+public:
+	TagPreviewsWidget(
+		QWidget *parent,
+		not_null<Main::Session*> session,
+		BadgeRole role);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	void paintPreview(
+		QPainter &p,
+		QRect rect,
+		BadgeRole previewRole) const;
+	void paintBubbleToImage(
+		QRect rect,
+		BadgeRole previewRole) const;
+	void invalidateCache();
+
+	const std::unique_ptr<Ui::ChatTheme> _theme;
+	std::unique_ptr<Ui::ChatStyle> _style;
+	BadgeRole _role = BadgeRole::User;
+	mutable QImage _leftCache;
+	mutable QImage _rightCache;
+
+};
+
+TagPreviewsWidget::TagPreviewsWidget(
+	QWidget *parent,
+	not_null<Main::Session*> session,
+	BadgeRole role)
+: RpWidget(parent)
+, _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
+, _style(std::make_unique<Ui::ChatStyle>(
+	session->colorIndicesValue()))
+, _role(role) {
+	_style->apply(_theme.get());
+	resize(width(), st::tagInfoPreviewHeight);
+
+	_theme->repaintBackgroundRequests(
+	) | rpl::on_next([=] {
+		invalidateCache();
+		update();
+	}, lifetime());
+
+	style::PaletteChanged() | rpl::on_next([=] {
+		invalidateCache();
+		update();
+	}, lifetime());
+
+	sizeValue() | rpl::skip(1) | rpl::on_next([=] {
+		invalidateCache();
+	}, lifetime());
+}
+
+void TagPreviewsWidget::invalidateCache() {
+	_leftCache = QImage();
+	_rightCache = QImage();
+}
+
+void TagPreviewsWidget::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	const auto gap = st::tagInfoPreviewGap;
+	const auto previewWidth = (width() - gap) / 2;
+	if (previewWidth <= 0) {
+		return;
+	}
+
+	const auto leftRect = QRect(0, 0, previewWidth, height());
+	const auto rightRect = QRect(
+		previewWidth + gap,
+		0,
+		width() - previewWidth - gap,
+		height());
+
+	paintPreview(p, leftRect, BadgeRole::User);
+
+	const auto rightRole = (_role == BadgeRole::User)
+		? BadgeRole::Admin
+		: _role;
+	paintPreview(p, rightRect, rightRole);
+}
+
+void TagPreviewsWidget::paintPreview(
+		QPainter &p,
+		QRect rect,
+		BadgeRole previewRole) const {
+	const auto previewRadius = st::tagInfoPreviewRadius;
+
+	p.save();
+	p.translate(rect.topLeft());
+
+	const auto local = QRect(0, 0, rect.width(), rect.height());
+	auto clipPath = QPainterPath();
+	clipPath.addRoundedRect(local, previewRadius, previewRadius);
+	p.setClipPath(clipPath);
+
+	Window::SectionWidget::PaintBackground(
+		p,
+		_theme.get(),
+		QSize(rect.width(), window()->height()),
+		local);
+
+	auto &cache = (previewRole == BadgeRole::User)
+		? _leftCache
+		: _rightCache;
+	if (cache.isNull()) {
+		paintBubbleToImage(rect, previewRole);
+	}
+	p.drawImage(0, 0, cache);
+
+	p.restore();
+}
+
+void TagPreviewsWidget::paintBubbleToImage(
+		QRect rect,
+		BadgeRole previewRole) const {
+	const auto ratio = style::DevicePixelRatio();
+	auto &cache = (previewRole == BadgeRole::User)
+		? _leftCache
+		: _rightCache;
+	cache = QImage(
+		rect.size() * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	cache.setDevicePixelRatio(ratio);
+	cache.fill(Qt::transparent);
+
+	const auto &stm = _style->messageStyle(false, false);
+	const auto &padding = st::tagInfoPreviewBubblePadding;
+	const auto radius = st::tagInfoPreviewBubbleRadius;
+	const auto rightMargin = st::tagInfoPreviewBubbleRightMargin;
+	const auto bubbleTop = padding.top();
+	const auto bubbleHeight = rect.height()
+		- padding.top()
+		- padding.bottom();
+	const auto bubbleRight = rect.width() - rightMargin;
+	const auto bubbleRect = QRect(
+		-radius,
+		bubbleTop,
+		bubbleRight + radius,
+		bubbleHeight);
+
+	auto p = QPainter(&cache);
+	{
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(stm.msgBg);
+		p.drawRoundedRect(bubbleRect, radius, radius);
+	}
+
+	const auto innerLeft = padding.left();
+	const auto innerRight = bubbleRight - padding.right();
+	const auto available = innerRight - innerLeft;
+
+	const auto badgeColor = RoleColor(previewRole);
+	const auto badgeText = (previewRole == BadgeRole::Creator)
+		? tr::lng_tag_info_preview_owner(tr::now)
+		: (previewRole == BadgeRole::Admin)
+		? tr::lng_tag_info_preview_admin(tr::now)
+		: tr::lng_tag_info_preview_member(tr::now);
+	auto badgeString = Ui::Text::String(st::defaultTextStyle, badgeText);
+	const auto badgeTextWidth = badgeString.maxWidth();
+	const auto &badgePadding = st::msgTagBadgePadding;
+	const auto badgeContentWidth = badgePadding.left()
+		+ badgeTextWidth
+		+ badgePadding.right();
+	const auto pillHeight = badgePadding.top()
+		+ st::msgFont->height
+		+ badgePadding.bottom();
+	const auto pillWidth = std::max(badgeContentWidth, pillHeight);
+
+	const auto badgeRight = innerRight;
+	const auto badgeLeft = badgeRight - pillWidth;
+	const auto badgeTop = bubbleTop + st::tagInfoPreviewBadgeTop;
+
+	if (previewRole != BadgeRole::User) {
+		auto bgColor = badgeColor;
+		bgColor.setAlphaF(0.15);
+		const auto pillRect = QRect(
+			badgeLeft,
+			badgeTop,
+			pillWidth,
+			pillHeight);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(bgColor);
+		p.drawRoundedRect(pillRect, pillHeight / 2., pillHeight / 2.);
+		p.setPen(badgeColor);
+		badgeString.draw(p, {
+			.position = QPoint(
+				badgeLeft + (pillWidth - badgeTextWidth) / 2,
+				badgeTop + badgePadding.top()),
+			.availableWidth = badgeTextWidth,
+		});
+	} else if (badgeTextWidth > 0) {
+		p.setPen(st::rankUserFg);
+		badgeString.draw(p, {
+			.position = QPoint(innerRight - badgeTextWidth, badgeTop),
+			.availableWidth = badgeTextWidth,
+		});
+	}
+
+	p.setFont(st::msgDateFont);
+	const auto timeText = u"12:00"_q;
+	const auto timeWidth = st::msgDateFont->width(timeText);
+	const auto timeX = innerRight - timeWidth;
+	const auto timeY = bubbleTop
+		+ bubbleHeight
+		- padding.bottom()
+		+ st::msgDateFont->ascent
+		- st::msgDateFont->height;
+	p.setPen(stm.msgDateFg);
+	p.drawText(timeX, timeY, timeText);
+
+	{
+		auto color = stm.historyTextFg->c;
+		color.setAlphaF(color.alphaF() * kTextLinesAlpha);
+		p.setPen(Qt::NoPen);
+		p.setBrush(color);
+		auto hq = PainterHighQualityEnabler(p);
+
+		const auto lineHeight = st::tagInfoPreviewLineHeight;
+		const auto lineSpacing = st::tagInfoPreviewLineSpacing;
+		const auto linesTop = badgeTop
+			+ pillHeight
+			+ lineSpacing;
+		const auto lineRadius = lineHeight / 2.0;
+		const auto timeAreaLeft = timeX - padding.right();
+		const auto fractions = { 1.0, 0.65, 0.65 };
+		auto y = double(linesTop);
+		auto lineIndex = 0;
+		for (const auto fraction : fractions) {
+			auto w = available * fraction;
+			const auto lineBottom = y + lineHeight;
+			if (lineIndex >= 1 && lineBottom > (timeY - lineSpacing)) {
+				w = std::min(w, double(timeAreaLeft - innerLeft));
+			}
+			p.drawRoundedRect(
+				QRectF(innerLeft, y, w, lineHeight),
+				lineRadius,
+				lineRadius);
+			y += lineHeight + lineSpacing;
+			++lineIndex;
+		}
+	}
+
+	const auto fadeWidth = st::tagInfoPreviewFadeWidth;
+	p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+	auto gradient = QLinearGradient(0, 0, fadeWidth, 0);
+	gradient.setStops({
+		{ 0., QColor(255, 255, 255, 0) },
+		{ 1., QColor(255, 255, 255, 255) },
+	});
+	p.fillRect(0, 0, fadeWidth, rect.height(), gradient);
+	p.end();
+}
+
+[[nodiscard]] QString LookupCurrentRank(not_null<PeerData*> peer) {
+	const auto selfId = peerToUser(peer->session().user()->id);
+	if (const auto channel = peer->asMegagroup()) {
+		if (const auto info = channel->mgInfo.get()) {
+			const auto it = info->memberRanks.find(selfId);
+			if (it != info->memberRanks.end()) {
+				return it->second;
+			}
+		}
+	} else if (const auto chat = peer->asChat()) {
+		const auto it = chat->memberRanks.find(selfId);
+		if (it != chat->memberRanks.end()) {
+			return it->second;
+		}
+	}
+	return QString();
+}
+
+} // namespace
+
+void TagInfoBox(
+		not_null<Ui::GenericBox*> box,
+		std::shared_ptr<Ui::Show> show,
+		not_null<PeerData*> peer,
+		not_null<PeerData*> author,
+		const QString &tagText,
+		HistoryView::BadgeRole role) {
+	box->setStyle(st::confcallJoinBox);
+	box->setWidth(st::boxWideWidth);
+	box->setNoContentMargin(true);
+	box->addTopButton(st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+
+	box->addRow(
+		MakeRoundColoredLogo(box, role),
+		st::boxRowPadding + st::confcallLinkHeaderIconPadding);
+
+	auto title = (role == BadgeRole::Creator)
+		? tr::lng_tag_info_title_owner()
+		: (role == BadgeRole::Admin)
+		? tr::lng_tag_info_title_admin()
+		: tr::lng_tag_info_title_user();
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(box, std::move(title), st::boxTitle),
+		st::boxRowPadding + st::confcallLinkTitlePadding,
+		style::al_top);
+
+	auto helper = Ui::Text::CustomEmojiHelper();
+	const auto tagPill = helper.paletteDependent(
+		MakeTagPillEmoji(tagText, role));
+	const auto authorName = author->shortName();
+	const auto groupName = peer->name();
+	const auto descText = (role == BadgeRole::Creator)
+		? tr::lng_tag_info_text_owner(
+			tr::now,
+			lt_emoji,
+			tagPill,
+			lt_author,
+			tr::bold(authorName),
+			lt_group,
+			tr::bold(groupName),
+			tr::rich)
+		: (role == BadgeRole::Admin)
+		? tr::lng_tag_info_text_admin(
+			tr::now,
+			lt_emoji,
+			tagPill,
+			lt_author,
+			tr::bold(authorName),
+			lt_group,
+			tr::bold(groupName),
+			tr::rich)
+		: tr::lng_tag_info_text_user(
+			tr::now,
+			lt_emoji,
+			tagPill,
+			lt_author,
+			tr::bold(authorName),
+			lt_group,
+			tr::bold(groupName),
+			tr::rich);
+	const auto context = helper.context();
+	const auto desc = box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			rpl::single(descText),
+			st::confcallLinkCenteredText,
+			st::defaultPopupMenu,
+			context),
+		st::boxRowPadding,
+		style::al_top);
+	desc->setTryMakeSimilarLines(true);
+
+	box->addRow(
+		object_ptr<TagPreviewsWidget>(
+			box,
+			&peer->session(),
+			role),
+		st::boxRowPadding + st::tagInfoPreviewPadding);
+
+	const auto selfUser = peer->session().user();
+	const auto selfRole = LookupBadgeRole(peer, selfUser);
+	const auto isAdmin = (selfRole != BadgeRole::User);
+	const auto canEditSelf = isAdmin
+		|| !peer->amRestricted(ChatRestriction::EditRank);
+	const auto channel = peer->asChannel();
+	const auto inGroup = peer->isChat() || (channel && channel->amIn());
+	if (canEditSelf && inGroup) {
+		const auto currentRank = LookupCurrentRank(peer);
+		auto buttonText = currentRank.isEmpty()
+			? tr::lng_tag_info_add_my_tag()
+			: tr::lng_tag_info_edit_my_tag();
+		box->addButton(std::move(buttonText), [=] {
+			box->closeBox();
+			show->show(Box(
+				EditCustomRankBox,
+				show,
+				peer,
+				selfUser,
+				currentRank,
+				true,
+				Fn<void(QString)>(nullptr)));
+		});
+	} else {
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_tag_info_admins_only(),
+				st::tagInfoAdminsOnlyLabel),
+			st::boxRowPadding + st::tagInfoAdminsOnlyPadding,
+			style::al_top);
+		box->addButton(
+			rpl::single(QString()),
+			[=] { box->closeBox(); }
+		)->setText(rpl::single(Ui::Text::IconEmoji(
+			&st::infoStarsUnderstood
+		).append(' ').append(
+			tr::lng_stars_rating_understood(tr::now))));
+	}
+}
diff --git a/Telegram/SourceFiles/boxes/peers/tag_info_box.h b/Telegram/SourceFiles/boxes/peers/tag_info_box.h
new file mode 100644
index 00000000000000..f54813eef0b780
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peers/tag_info_box.h
@@ -0,0 +1,27 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+class GenericBox;
+class Show;
+} // namespace Ui
+
+namespace HistoryView {
+enum class BadgeRole : uchar;
+} // namespace HistoryView
+
+class PeerData;
+
+void TagInfoBox(
+	not_null<Ui::GenericBox*> box,
+	std::shared_ptr<Ui::Show> show,
+	not_null<PeerData*> peer,
+	not_null<PeerData*> author,
+	const QString &tagText,
+	HistoryView::BadgeRole role);
diff --git a/Telegram/SourceFiles/boxes/peers/toggle_topics_box.cpp b/Telegram/SourceFiles/boxes/peers/toggle_topics_box.cpp
new file mode 100644
index 00000000000000..18602c886b6d18
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peers/toggle_topics_box.cpp
@@ -0,0 +1,228 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/peers/toggle_topics_box.h"
+
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "settings/settings_common.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/painter.h"
+#include "ui/vertical_list.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_settings.h"
+
+namespace Ui {
+namespace {
+
+enum class LayoutType {
+	Tabs,
+	List
+};
+
+class LayoutButton final : public Ui::RippleButton {
+public:
+	LayoutButton(
+		QWidget *parent,
+		LayoutType type,
+		std::shared_ptr<Ui::RadioenumGroup<LayoutType>> group);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	QImage prepareRippleMask() const override;
+
+	Ui::FlatLabel _text;
+	Ui::Animations::Simple _activeAnimation;
+	bool _active = false;
+
+};
+
+LayoutButton::LayoutButton(
+	QWidget *parent,
+	LayoutType type,
+	std::shared_ptr<Ui::RadioenumGroup<LayoutType>> group)
+: RippleButton(parent, st::defaultRippleAnimationBgOver)
+, _text(this, st::topicsLayoutButtonLabel)
+, _active(group->current() == type) {
+	_text.setText(type == LayoutType::Tabs
+		? tr::lng_edit_topics_tabs(tr::now)
+		: tr::lng_edit_topics_list(tr::now));
+	const auto iconColorOverride = [=] {
+		return anim::color(
+			st::windowSubTextFg,
+			st::windowActiveTextFg,
+			_activeAnimation.value(_active ? 1. : 0.));
+	};
+	const auto iconSize = st::topicsLayoutButtonIconSize;
+	auto [iconWidget, iconAnimate] = Settings::CreateLottieIcon(
+		this,
+		{
+			.name = (type == LayoutType::Tabs
+				? u"topics_tabs"_q
+				: u"topics_list"_q),
+			.color = &st::windowSubTextFg,
+			.sizeOverride = { iconSize, iconSize },
+			.colorizeUsingAlpha = true,
+		},
+		st::topicsLayoutButtonIconPadding,
+		iconColorOverride);
+	const auto icon = iconWidget.release();
+	setClickedCallback([=] {
+		group->setValue(type);
+		iconAnimate(anim::repeat::once);
+	});
+	group->value() | rpl::on_next([=](LayoutType value) {
+		const auto active = (value == type);
+		_text.setTextColorOverride(active
+			? st::windowFgActive->c
+			: std::optional<QColor>());
+
+		if (_active == active) {
+			return;
+		}
+		_active = active;
+		_text.update();
+		_activeAnimation.start([=] {
+			icon->update();
+		}, _active ? 0. : 1., _active ? 0. : 1., st::fadeWrapDuration);
+	}, lifetime());
+
+	_text.paintRequest() | rpl::on_next([=](QRect clip) {
+		if (_active) {
+			auto p = QPainter(&_text);
+			auto hq = PainterHighQualityEnabler(p);
+			const auto radius = _text.height() / 2.;
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::windowBgActive);
+			p.drawRoundedRect(_text.rect(), radius, radius);
+		}
+	}, _text.lifetime());
+
+	const auto padding = st::topicsLayoutButtonPadding;
+	const auto skip = st::topicsLayoutButtonSkip;
+	const auto text = _text.height();
+
+	resize(
+		padding.left() + icon->width() + padding.right(),
+		padding.top() + icon->height() + skip + text + padding.bottom());
+	icon->move(padding.left(), padding.top());
+	_text.move(
+		(width() - _text.width()) / 2,
+		padding.top() + icon->height() + skip);
+}
+
+void LayoutButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	const auto rippleBg = anim::color(
+		st::windowBgOver,
+		st::lightButtonBgOver,
+		_activeAnimation.value(_active ? 1. : 0.));
+	paintRipple(p, QPoint(), &rippleBg);
+}
+
+QImage LayoutButton::prepareRippleMask() const {
+	return Ui::RippleAnimation::RoundRectMask(size(), st::boxRadius);
+}
+
+} // namespace
+
+void ToggleTopicsBox(
+		not_null<Ui::GenericBox*> box,
+		bool enabled,
+		bool tabs,
+		Fn<void(bool enabled, bool tabs)> callback) {
+	box->setTitle(tr::lng_forum_topics_switch());
+	box->setWidth(st::boxWideWidth);
+
+	const auto container = box->verticalLayout();
+
+	Settings::AddDividerTextWithLottie(container, {
+		.lottie = u"topics"_q,
+		.lottieSize = st::settingsFilterIconSize,
+		.lottieMargins = st::settingsFilterIconPadding,
+		.showFinished = box->showFinishes(),
+		.about = tr::lng_edit_topics_about(
+			tr::rich
+		),
+		.aboutMargins = st::settingsFilterDividerLabelPadding,
+	});
+
+	Ui::AddSkip(container);
+
+	const auto toggle = container->add(
+		object_ptr<Ui::SettingsButton>(
+			container,
+			tr::lng_edit_topics_enable(),
+			st::settingsButtonNoIcon));
+	toggle->toggleOn(rpl::single(enabled));
+
+	Ui::AddSkip(container);
+	Ui::AddDivider(container);
+	Ui::AddSkip(container);
+
+	const auto group = std::make_shared<Ui::RadioenumGroup<LayoutType>>(tabs
+		? LayoutType::Tabs
+		: LayoutType::List);
+
+	const auto layoutWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto layout = layoutWrap->entity();
+
+	Ui::AddSubsectionTitle(layout, tr::lng_edit_topics_layout());
+	const auto buttons = layout->add(
+		object_ptr<Ui::RpWidget>(layout),
+		QMargins(0, 0, 0, st::defaultVerticalListSkip * 2));
+
+	const auto tabsButton = Ui::CreateChild<LayoutButton>(
+		buttons,
+		LayoutType::Tabs,
+		group);
+	const auto listButton = Ui::CreateChild<LayoutButton>(
+		buttons,
+		LayoutType::List,
+		group);
+
+	buttons->resize(container->width(), tabsButton->height());
+	buttons->widthValue() | rpl::on_next([=](int outer) {
+		const auto skip = st::boxRowPadding.left() - st::boxRadius;
+		tabsButton->moveToLeft(skip, 0, outer);
+		listButton->moveToRight(skip, 0, outer);
+	}, buttons->lifetime());
+
+	Ui::AddDividerText(
+		layout,
+		tr::lng_edit_topics_layout_about(tr::rich));
+
+	layoutWrap->toggle(enabled, anim::type::instant);
+	toggle->toggledChanges(
+	) | rpl::on_next([=](bool checked) {
+		layoutWrap->toggle(checked, anim::type::normal);
+	}, layoutWrap->lifetime());
+
+	box->addButton(tr::lng_settings_save(), [=] {
+		const auto enabledValue = toggle->toggled();
+		const auto tabsValue = (group->current() == LayoutType::Tabs);
+		callback(enabledValue, tabsValue);
+		box->closeBox();
+	});
+
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/peers/toggle_topics_box.h b/Telegram/SourceFiles/boxes/peers/toggle_topics_box.h
new file mode 100644
index 00000000000000..0bd4ad368536a8
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peers/toggle_topics_box.h
@@ -0,0 +1,20 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/layers/generic_box.h"
+
+namespace Ui {
+
+void ToggleTopicsBox(
+    not_null<Ui::GenericBox*> box,
+    bool enabled,
+    bool tabs,
+	Fn<void(bool enabled, bool tabs)> callback);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/peers/verify_peers_box.cpp b/Telegram/SourceFiles/boxes/peers/verify_peers_box.cpp
new file mode 100644
index 00000000000000..77aaa645b74654
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peers/verify_peers_box.cpp
@@ -0,0 +1,296 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/peers/verify_peers_box.h"
+
+#include "apiwrap.h"
+#include "boxes/peer_list_controllers.h"
+#include "data/data_user.h"
+#include "history/history.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/vertical_list.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+#include "styles/style_polls.h"
+
+namespace {
+
+constexpr auto kSetupVerificationToastDuration = 4 * crl::time(1000);
+
+class Controller final : public ChatsListBoxController {
+public:
+	Controller(not_null<Main::Session*> session, not_null<UserData*> bot)
+	: ChatsListBoxController(session)
+	, _bot(bot) {
+	}
+
+	Main::Session &session() const override;
+
+	void rowClicked(gsl::not_null<PeerListRow*> row) override;
+
+private:
+	std::unique_ptr<Row> createRow(not_null<History*> history) override;
+	void prepareViewHook() override;
+
+	void confirmAdd(not_null<PeerData*> peer);
+	void confirmRemove(not_null<PeerData*> peer);
+
+	const not_null<UserData*> _bot;
+
+};
+
+void Setup(
+		not_null<UserData*> bot,
+		not_null<PeerData*> peer,
+		QString description,
+		Fn<void(QString)> done) {
+	using Flag = MTPbots_SetCustomVerification::Flag;
+	bot->session().api().request(MTPbots_SetCustomVerification(
+		MTP_flags(Flag::f_bot
+			| Flag::f_enabled
+			| (description.isEmpty() ? Flag() : Flag::f_custom_description)),
+		bot->inputUser(),
+		peer->input(),
+		MTP_string(description)
+	)).done([=] {
+		done(QString());
+	}).fail([=](const MTP::Error &error) {
+		done(error.type());
+	}).send();
+}
+
+void Remove(
+		not_null<UserData*> bot,
+		not_null<PeerData*> peer,
+		Fn<void(QString)> done) {
+	bot->session().api().request(MTPbots_SetCustomVerification(
+		MTP_flags(MTPbots_SetCustomVerification::Flag::f_bot),
+		bot->inputUser(),
+		peer->input(),
+		MTPstring()
+	)).done([=] {
+		done(QString());
+	}).fail([=](const MTP::Error &error) {
+		done(error.type());
+	}).send();
+}
+
+Main::Session &Controller::session() const {
+	return _bot->session();
+}
+
+void Controller::rowClicked(gsl::not_null<PeerListRow*> row) {
+	const auto peer = row->peer();
+	const auto details = peer->botVerifyDetails();
+	const auto already = details && (details->botId == peerToUser(_bot->id));
+	if (already) {
+		confirmRemove(peer);
+	} else {
+		confirmAdd(peer);
+	}
+}
+
+void Controller::confirmAdd(not_null<PeerData*> peer) {
+	const auto bot = _bot;
+	const auto show = delegate()->peerListUiShow();
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		struct State {
+			Ui::InputField *field = nullptr;
+			QString description;
+			bool sent = false;
+		};
+		const auto settings = bot->botInfo
+			? bot->botInfo->verifierSettings.get()
+			: nullptr;
+		const auto modify = settings && settings->canModifyDescription;
+		const auto state = std::make_shared<State>(State{
+			.description = settings ? settings->customDescription : QString()
+		});
+
+		const auto limit = session().appConfig().get<int>(
+			u"bot_verification_description_length_limit"_q,
+			70);
+		const auto send = [=] {
+			if (modify && state->description.size() > limit) {
+				state->field->showError();
+				return;
+			} else if (state->sent) {
+				return;
+			}
+			state->sent = true;
+			const auto weak = base::make_weak(box);
+			const auto description = modify ? state->description : QString();
+			Setup(bot, peer, description, [=](QString error) {
+				if (error.isEmpty()) {
+					if (const auto strong = weak.get()) {
+						strong->closeBox();
+					}
+					show->showToast({
+						.text = PeerVerifyPhrases(peer).sent(
+							tr::now,
+							lt_name,
+							tr::bold(peer->shortName()),
+							tr::marked),
+						.duration = kSetupVerificationToastDuration,
+					});
+				} else {
+					state->sent = false;
+					show->showToast(error);
+				}
+			});
+		};
+
+		const auto phrases = PeerVerifyPhrases(peer);
+		Ui::ConfirmBox(box, {
+			.text = phrases.text(
+				lt_name,
+				rpl::single(tr::bold(peer->shortName())),
+				tr::marked),
+			.confirmed = send,
+			.confirmText = phrases.submit(),
+			.title = phrases.title(),
+		});
+		if (!modify) {
+			return;
+		}
+
+		Ui::AddSubsectionTitle(
+			box->verticalLayout(),
+			tr::lng_bot_verify_description_label(),
+			QMargins(0, 0, 0, -st::defaultSubsectionTitlePadding.bottom()));
+
+		const auto field = box->addRow(object_ptr<Ui::InputField>(
+			box,
+			st::createPollField,
+			Ui::InputField::Mode::NoNewlines,
+			rpl::single(state->description),
+			state->description
+		), st::createPollFieldPadding);
+		state->field = field;
+
+		box->setFocusCallback([=] {
+			field->setFocusFast();
+		});
+
+		Ui::AddSkip(box->verticalLayout());
+
+		field->changes() | rpl::on_next([=] {
+			state->description = field->getLastText();
+		}, field->lifetime());
+
+		field->setMaxLength(limit * 2);
+		Ui::AddLengthLimitLabel(field, limit);
+
+		Ui::AddDividerText(box->verticalLayout(), phrases.about());
+	}));
+}
+
+void Controller::confirmRemove(not_null<PeerData*> peer) {
+	const auto bot = _bot;
+	const auto show = delegate()->peerListUiShow();
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		const auto sent = std::make_shared<bool>();
+		const auto send = [=] {
+			if (*sent) {
+				return;
+			}
+			*sent = true;
+			const auto weak = base::make_weak(box);
+			Remove(bot, peer, [=](QString error) {
+				if (error.isEmpty()) {
+					if (const auto strong = weak.get()) {
+						strong->closeBox();
+					}
+					show->showToast(tr::lng_bot_verify_remove_done(tr::now));
+				} else {
+					*sent = false;
+					show->showToast(error);
+				}
+			});
+		};
+		Ui::ConfirmBox(box, {
+			.text = PeerVerifyPhrases(peer).remove(),
+			.confirmed = send,
+			.confirmText = tr::lng_bot_verify_remove_submit(),
+			.confirmStyle = &st::attentionBoxButton,
+			.title = tr::lng_bot_verify_remove_title(),
+		});
+	}));
+}
+
+auto Controller::createRow(not_null<History*> history)
+-> std::unique_ptr<Row> {
+	const auto peer = history->peer;
+	const auto may = peer->isUser() || peer->isChannel();
+	return may ? std::make_unique<Row>(history) : nullptr;
+}
+
+void Controller::prepareViewHook() {
+}
+
+} // namespace
+
+object_ptr<Ui::BoxContent> MakeVerifyPeersBox(
+		not_null<Window::SessionController*> window,
+		not_null<UserData*> bot) {
+	const auto session = &window->session();
+	auto controller = std::make_unique<Controller>(session, bot);
+	auto init = [=](not_null<PeerListBox*> box) {
+		box->setTitle(tr::lng_bot_verify_title());
+		box->addButton(tr::lng_box_done(), [=] {
+			box->closeBox();
+		});
+	};
+	return Box<PeerListBox>(std::move(controller), std::move(init));
+}
+
+BotVerifyPhrases PeerVerifyPhrases(not_null<PeerData*> peer) {
+	if (const auto user = peer->asUser()) {
+		if (user->isBot()) {
+			return {
+				.title = tr::lng_bot_verify_bot_title,
+				.text = tr::lng_bot_verify_bot_text,
+				.about = tr::lng_bot_verify_bot_about,
+				.submit = tr::lng_bot_verify_bot_submit,
+				.sent = tr::lng_bot_verify_bot_sent,
+				.remove = tr::lng_bot_verify_bot_remove,
+			};
+		} else {
+			return {
+				.title = tr::lng_bot_verify_user_title,
+				.text = tr::lng_bot_verify_user_text,
+				.about = tr::lng_bot_verify_user_about,
+				.submit = tr::lng_bot_verify_user_submit,
+				.sent = tr::lng_bot_verify_user_sent,
+				.remove = tr::lng_bot_verify_user_remove,
+			};
+		}
+	} else if (peer->isBroadcast()) {
+		return {
+			.title = tr::lng_bot_verify_channel_title,
+			.text = tr::lng_bot_verify_channel_text,
+			.about = tr::lng_bot_verify_channel_about,
+			.submit = tr::lng_bot_verify_channel_submit,
+			.sent = tr::lng_bot_verify_channel_sent,
+			.remove = tr::lng_bot_verify_channel_remove,
+		};
+	}
+	return {
+		.title = tr::lng_bot_verify_group_title,
+		.text = tr::lng_bot_verify_group_text,
+		.about = tr::lng_bot_verify_group_about,
+		.submit = tr::lng_bot_verify_group_submit,
+		.sent = tr::lng_bot_verify_group_sent,
+		.remove = tr::lng_bot_verify_group_remove,
+	};
+}
diff --git a/Telegram/SourceFiles/boxes/peers/verify_peers_box.h b/Telegram/SourceFiles/boxes/peers/verify_peers_box.h
new file mode 100644
index 00000000000000..6383255ee4aa3f
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peers/verify_peers_box.h
@@ -0,0 +1,36 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+#include "lang/lang_keys.h"
+
+class PeerData;
+class UserData;
+
+namespace Ui {
+class BoxContent;
+} // namespace Ui
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+[[nodiscard]] object_ptr<Ui::BoxContent> MakeVerifyPeersBox(
+	not_null<Window::SessionController*> window,
+	not_null<UserData*> bot);
+
+struct BotVerifyPhrases {
+	tr::phrase<> title;
+	tr::phrase<lngtag_name> text;
+	tr::phrase<> about;
+	tr::phrase<> submit;
+	tr::phrase<lngtag_name> sent;
+	tr::phrase<> remove;
+};
+[[nodiscard]] BotVerifyPhrases PeerVerifyPhrases(not_null<PeerData*> peer);
diff --git a/Telegram/SourceFiles/boxes/phone_banned_box.cpp b/Telegram/SourceFiles/boxes/phone_banned_box.cpp
index b29388e96c718d..918bc12d208130 100644
--- a/Telegram/SourceFiles/boxes/phone_banned_box.cpp
+++ b/Telegram/SourceFiles/boxes/phone_banned_box.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "ui/boxes/confirm_box.h"
 #include "core/click_handler_types.h" // UrlClickHandler
+#include "core/version.h"
 #include "base/qthelp_url.h" // qthelp::url_encode
 #include "base/platform/base_platform_info.h"
 #include "window/window_controller.h"
@@ -49,7 +50,7 @@ Locale: ") + ::Platform::SystemLanguage();
 void ShowPhoneBannedError(
 		not_null<Window::Controller*> controller,
 		const QString &phone) {
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto box = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto close = [=] {
 		if (*box) {
 			(*box)->closeBox();
diff --git a/Telegram/SourceFiles/boxes/pin_messages_box.cpp b/Telegram/SourceFiles/boxes/pin_messages_box.cpp
index 163e9dedc6f5f9..20ec978eb53b4e 100644
--- a/Telegram/SourceFiles/boxes/pin_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/pin_messages_box.cpp
@@ -24,10 +24,15 @@ namespace {
 [[nodiscard]] bool IsOldForPin(
 		MsgId id,
 		not_null<PeerData*> peer,
-		MsgId topicRootId) {
+		MsgId topicRootId,
+		PeerId monoforumPeerId) {
 	const auto normal = peer->migrateToOrMe();
 	const auto migrated = normal->migrateFrom();
-	const auto top = Data::ResolveTopPinnedId(normal, topicRootId, migrated);
+	const auto top = Data::ResolveTopPinnedId(
+		normal,
+		topicRootId,
+		monoforumPeerId,
+		migrated);
 	if (!top) {
 		return false;
 	} else if (peer == migrated) {
@@ -45,15 +50,22 @@ void PinMessageBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<HistoryItem*> item) {
 	struct State {
-		QPointer<Ui::Checkbox> pinForPeer;
-		QPointer<Ui::Checkbox> notify;
+		base::weak_qptr<Ui::Checkbox> pinForPeer;
+		base::weak_qptr<Ui::Checkbox> notify;
 		mtpRequestId requestId = 0;
 	};
 
 	const auto peer = item->history()->peer;
 	const auto msgId = item->id;
 	const auto topicRootId = item->topic() ? item->topicRootId() : MsgId();
-	const auto pinningOld = IsOldForPin(msgId, peer, topicRootId);
+	const auto monoforumPeerId = item->history()->peer->amMonoforumAdmin()
+		? item->sublistPeerId()
+		: PeerId();
+	const auto pinningOld = IsOldForPin(
+		msgId,
+		peer,
+		topicRootId,
+		monoforumPeerId);
 	const auto state = box->lifetime().make_state<State>();
 	const auto api = box->lifetime().make_state<MTP::Sender>(
 		&peer->session().mtp());
@@ -69,16 +81,18 @@ void PinMessageBox(
 				false,
 				st::urlAuthCheckbox);
 			object->setAllowTextLines();
-			state->pinForPeer = Ui::MakeWeak(object.data());
+			state->pinForPeer = base::make_weak(object.data());
 			return object;
-		} else if (!pinningOld && (peer->isChat() || peer->isMegagroup())) {
+		} else if (!pinningOld
+			&& (peer->isChat() || peer->isMegagroup())
+			&& !peer->isMonoforum()) {
 			auto object = object_ptr<Ui::Checkbox>(
 				box,
 				tr::lng_pinned_notify(tr::now),
 				true,
 				st::urlAuthCheckbox);
 			object->setAllowTextLines();
-			state->notify = Ui::MakeWeak(object.data());
+			state->notify = base::make_weak(object.data());
 			return object;
 		}
 		return { nullptr };
@@ -98,7 +112,7 @@ void PinMessageBox(
 		}
 		state->requestId = api->request(MTPmessages_UpdatePinnedMessage(
 			MTP_flags(flags),
-			peer->input,
+			peer->input(),
 			MTP_int(msgId)
 		)).done([=](const MTPUpdates &result) {
 			peer->session().api().applyUpdates(result);
diff --git a/Telegram/SourceFiles/boxes/polls.style b/Telegram/SourceFiles/boxes/polls.style
new file mode 100644
index 00000000000000..fd80488f47e129
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/polls.style
@@ -0,0 +1,308 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+using "ui/basic.style";
+
+using "ui/widgets/widgets.style";
+using "boxes/boxes.style";
+using "chat_helpers/chat_helpers.style";
+using "dialogs/dialogs.style";
+using "ui/chat/chat.style";
+
+historyPollQuestionFont: semiboldFont;
+historyPollQuestionStyle: TextStyle(defaultTextStyle) {
+	font: historyPollQuestionFont;
+}
+historyPollAnswerStyle: defaultTextStyle;
+historyPollQuestionTop: 7px;
+historyPollMediaHeight: 180px;
+historyPollMediaTopSkip: 1px;
+historyPollMediaSideSkip: 1px;
+historyPollMediaSkip: 10px;
+historyPollDescriptionSkip: 8px;
+historyPollSubtitleSkip: 4px;
+historyPollAnswerPadding: margins(32px, 6px, 0px, 6px);
+historyPollAnswerPaddingNoMedia: margins(32px, 10px, 0px, 10px);
+historyPollAnswersSkip: 2px;
+historyPollPercentFont: semiboldFont;
+historyPollPercentSkip: 5px;
+historyPollPercentTop: 0px;
+historyPollTotalVotesSkip: 5px;
+historyPollFillingMin: 4px;
+historyPollFillingHeight: 4px;
+historyPollFillingRadius: 2px;
+historyPollFillingBgOpacity: 0.15;
+historyPollFillingBottom: 2px;
+historyPollFillingTop: 6px;
+historyPollFillingRight: 4px;
+historyPollRadio: Radio(defaultRadio) {
+	bg: transparent;
+	untoggledFg: checkboxFg;
+	toggledFg: windowBgActive;
+	diameter: 18px;
+	thickness: 2px;
+	skip: 65px; // * 0.1
+	duration: universalDuration;
+	rippleAreaPadding: 8px;
+}
+historyPollCheckboxRadius: 3px;
+historyPollReplyIcon: IconEmoji {
+	icon: icon {{ "dialogs/dialogs_chatlist_poll-17x17", windowFg }};
+	padding: margins(0px, 0px, 3px, 0px);
+}
+historyPollRadioOpacity: 0.7;
+historyPollRadioOpacityOver: 1.;
+historyPollDuration: 300;
+historyPollRadialAnimation: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) {
+	thickness: 2px;
+	size: size(18px, 18px);
+}
+historyPollRippleOpacity: 0.3;
+historyPollRecentVotersSkip: 4px;
+historyPollRecentVoterSize: 18px;
+historyPollRecentVoterSkip: 13px;
+historyPollAnswerUserpics: GroupCallUserpics {
+	size: 16px;
+	shift: 5px;
+	stroke: 1px;
+	align: align(left);
+}
+historyPollAnswerUserpicsSkip: 4px;
+historyPollBottomButtonSkip: 15px;
+historyPollBottomButtonTop: 4px;
+historyPollExplanationSkip: 8px;
+historyPollExplanationTitleSkip: 4px;
+historyPollExplanationCloseSize: 20px;
+historyPollExplanationCloseIconSize: 8px;
+historyPollExplanationCloseStroke: 2px;
+historyPollExplanationMediaSkip: 6px;
+historyPollLinkPlaceholderIcon: icon {{ "info/edit/links_link", windowSubTextFg }};
+historyPollLinkInIcon: icon {{ "info/edit/links_link", historyFileInIconFg }};
+historyPollLinkInIconSelected: icon {{ "info/edit/links_link", historyFileInIconFgSelected }};
+historyPollLinkOutIcon: icon {{ "info/edit/links_link", historyFileOutIconFg }};
+historyPollLinkOutIconSelected: icon {{ "info/edit/links_link", historyFileOutIconFgSelected }};
+historyPollChoiceRight: icon {{ "poll_choice_right", activeButtonFg }};
+historyPollChoiceWrong: icon {{ "poll_choice_wrong", activeButtonFg }};
+historyPollOutChoiceRight: icon {{ "poll_choice_right", historyFileOutIconFg }};
+historyPollOutChoiceRightSelected: icon {{ "poll_choice_right", historyFileOutIconFgSelected }};
+historyPollInChoiceRight: icon {{ "poll_choice_right", historyFileInIconFg }};
+historyPollInChoiceRightSelected: icon {{ "poll_choice_right", historyFileInIconFgSelected }};
+historyPollOutChosen: icon {{ "poll_select_check", historyFileOutIconFg }};
+historyPollOutChosenSelected: icon {{ "poll_select_check", historyFileOutIconFgSelected }};
+historyPollInChosen: icon {{ "poll_select_check", historyFileInIconFg }};
+historyPollInChosenSelected: icon {{ "poll_select_check", historyFileInIconFgSelected }};
+
+historyPollAddOptionTop: 3px;
+historyPollAddOptionButtonSize: 26px;
+historyPollAddOptionEmojiLeft: -4px;
+historyPollAddOptionField: InputField(defaultInputField) {
+	textBg: transparent;
+	textFg: windowFg;
+	placeholderFg: placeholderFg;
+	placeholderFgActive: placeholderFgActive;
+	placeholderFgError: placeholderFgActive;
+	textMargins: margins(32px, 7px, 28px, 4px);
+	heightMin: 32px;
+	heightMax: 32px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(13px);
+	}
+	placeholderMargins: margins(0px, 1px, 0px, 0px);
+	placeholderFont: font(12px);
+	placeholderScale: 0.;
+	border: 0px;
+	borderActive: 0px;
+}
+historyPollAddOptionEmoji: IconButton(defaultIconButton) {
+	width: 26px;
+	height: 26px;
+	icon: icon {{ "poll/general/outline_poll_emoji-22x22", historyComposeIconFg }};
+	iconOver: icon {{ "poll/general/outline_poll_emoji-22x22", historyComposeIconFgOver }};
+	rippleAreaSize: 0px;
+}
+historyPollAddOptionAttach: IconButton(defaultIconButton) {
+	width: 26px;
+	height: 26px;
+	icon: icon {{ "poll/general/outline_poll_attach-22x22", historyComposeIconFg }};
+	iconOver: icon {{ "poll/general/outline_poll_attach-22x22", historyComposeIconFgOver }};
+	rippleAreaPosition: point(0px, 0px);
+	rippleAreaSize: 26px;
+	ripple: defaultRippleAnimationBgOver;
+}
+
+pollBoxOutlinePollAddIcon: icon{{ "poll/general/outline_poll_add-18x18", activeButtonFg }};
+pollBoxMenuPollOrderIcon: icon{{ "poll/general/menu_poll_order-24x24", historyComposeIconFg }};
+pollBoxFilledPollDeadlineIcon: icon{{ "poll/filled/filled_poll_deadline", activeButtonFg }};
+pollBoxFilledPollViewIcon: icon{{ "poll/filled/filled_poll_view", activeButtonFg }};
+pollBoxFilledPollAddIcon: icon{{ "poll/filled/filled_poll_add", activeButtonFg }};
+pollBoxFilledPollCorrectIcon: icon{{ "poll/filled/filled_poll_correct", activeButtonFg }};
+pollBoxFilledPollRevoteIcon: icon{{ "poll/filled/filled_poll_revote", activeButtonFg }};
+pollBoxFilledPollShuffleIcon: icon{{ "poll/filled/filled_poll_shuffle", activeButtonFg }};
+pollBoxFilledPollMultipleIcon: icon{{ "poll/filled/filled_poll_multiple", activeButtonFg }};
+pollBoxFilledPollSubscribersIcon: icon{{ "poll/filled/filled_poll_subscribers-20x20", activeButtonFg }};
+pollBoxFilledPollCountryIcon: icon{{ "poll/filled/filled_poll_country-20x20", activeButtonFg }};
+
+pollAttachTextSkip: 28px;
+pollAttachRadius: 7px;
+historyPollAnswerThumbRadius: 9px;
+
+pollOpenLinkUrlLabel: FlatLabel(defaultFlatLabel) {
+	minWidth: 1px;
+	align: align(center);
+	style: TextStyle(defaultTextStyle) {
+		font: font(15px);
+	}
+	maxHeight: 0px;
+}
+pollOpenLinkUrlInnerPadding: margins(16px, 12px, 16px, 12px);
+pollOpenLinkUrlOuterPadding: margins(22px, 4px, 22px, 14px);
+pollOpenLinkUrlRadius: 16px;
+pollOpenLinkPreviewOuterPadding: margins(11px, 0px, 11px, 5px);
+pollAttachProgressMargin: 4px;
+pollAttachCancel: icon {{ "history_audio_cancel", historyFileThumbIconFg }};
+pollAttachView: icon {{ "mediaview/views", historyFileThumbIconFg }};
+pollAttachLink: icon {{ "menu/link", historyFileThumbIconFg }};
+
+createPollField: InputField(defaultInputField) {
+	textMargins: margins(0px, 4px, 0px, 4px);
+	textAlign: align(left);
+	heightMin: 36px;
+	heightMax: 86px;
+	placeholderFg: placeholderFg;
+	placeholderFgActive: placeholderFgActive;
+	placeholderFgError: placeholderFgActive;
+	placeholderMargins: margins(2px, 0px, 2px, 0px);
+	placeholderAlign: align(topleft);
+	placeholderScale: 0.;
+	placeholderFont: boxTextFont;
+	placeholderShift: -50px;
+	border: 0px;
+	borderActive: 0px;
+	duration: 100;
+}
+createPollFieldPadding: margins(22px, 5px, 22px, 5px);
+createPollOptionField: InputField(createPollField) {
+	textMargins: margins(22px, 11px, 40px, 11px);
+	placeholderMargins: margins(2px, 0px, 2px, 0px);
+	heightMax: 68px;
+}
+createPollOptionFieldPremium: InputField(createPollOptionField) {
+	textMargins: margins(22px, 11px, 72px, 11px);
+}
+createPollOptionFieldPremiumEmojiPosition: point(13px, -1px);
+createPollSolutionField: InputField(createPollField) {
+	textMargins: margins(0px, 4px, 0px, 4px);
+	border: 1px;
+	borderActive: 2px;
+}
+createPollLimitPadding: margins(22px, 10px, 22px, 16px);
+createPollOptionRemove: CrossButton {
+	width: 22px;
+	height: 22px;
+
+	cross: CrossAnimation {
+		size: 22px;
+		skip: 6px;
+		stroke: 1.5;
+		minScale: 0.3;
+	}
+	crossFg: boxTitleCloseFg;
+	crossFgOver: boxTitleCloseFgOver;
+	crossPosition: point(0px, 0px);
+
+	duration: 150;
+	loadingPeriod: 1000;
+	ripple: defaultRippleAnimationBgOver;
+}
+createPollAttachPosition: point(0px, 0px);
+createPollOptionRemovePosition: point(11px, 9px);
+createPollOptionEmojiPositionSkip: 6px;
+createPollWarning: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	palette: TextPalette(defaultTextPalette) {
+		linkFg: boxTextFgError;
+	}
+}
+createPollWarningPosition: point(16px, 6px);
+createPollCheckboxMargin: margins(22px, 10px, 22px, 10px);
+createPollFieldTitlePadding: margins(22px, 7px, 10px, 6px);
+
+createPollLinkUrlField: InputField(dialogsFilter) {
+	textBgActive: filterInputInactiveBg;
+	textMargins: margins(14px, 8px, 14px, 5px);
+	placeholderMargins: margins(0px, 0px, 2px, 0px);
+	heightMin: 36px;
+}
+
+createTodoOptionField: InputField(createPollOptionField) {
+	textMargins: margins(22px, 11px, 68px, 11px);
+}
+createTodoOptionFieldEmojiPosition: point(13px, -1px);
+
+pollResultsQuestion: FlatLabel(defaultFlatLabel) {
+	minWidth: 320px;
+	textFg: windowBoldFg;
+	style: TextStyle(defaultTextStyle) {
+		font: font(16px semibold);
+	}
+}
+pollResultsVotesCount: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+}
+pollResultsHeaderPadding: margins(22px, 22px, 22px, 8px);
+pollResultsShowMore: SettingsButton(defaultSettingsButton) {
+	textFg: lightButtonFg;
+	textFgOver: lightButtonFgOver;
+	textBg: windowBg;
+	textBgOver: windowBgOver;
+
+	style: semiboldTextStyle;
+
+	height: 20px;
+	padding: margins(71px, 10px, 8px, 8px);
+
+	ripple: defaultRippleAnimation;
+}
+pollResultsVoteTimeFont: font(fsize);
+pollResultsVoteTimeDateFont: font(fsize);
+pollResultsVoteTimeRightSkip: 16px;
+pollResultsVoteTimeLeftSkip: 8px;
+pollResultsVoteTimeGap: 2px;
+
+pollAttach: IconButton(defaultIconButton) {
+	width: pollAttachTextSkip;
+	height: pollAttachTextSkip;
+
+	icon: icon {{ "poll/general/outline_poll_attach-26x26", historyComposeIconFg }};
+	iconOver: icon {{ "poll/general/outline_poll_attach-26x26", historyComposeIconFgOver }};
+
+	rippleAreaPosition: point(0px, 0px);
+	rippleAreaSize: pollAttachTextSkip;
+	ripple: defaultRippleAnimationBgOver;
+}
+
+createPollDurationIconSize: 20px;
+createPollDurationIconPosition: point(1px, 5px);
+createPollDurationIconMargins: margins(2px, 2px, 2px, 2px);
+
+pollDescriptionFieldPadding: margins(22px, 5px, 11px, 5px);
+pollDescriptionField: InputField(createPollField) {
+	textMargins: margins(0px, 4px, pollAttachTextSkip + pollAttachTextSkip + 1px, 4px);
+	border: 0px;
+	borderActive: 0px;
+}
+
+pollMediaField: InputField(createPollSolutionField) {
+	textMargins: margins(0px, 4px, pollAttachTextSkip, 4px);
+	border: 0px;
+	borderActive: 0px;
+}
+
+infoPollsNewButtonBottom: 19px;
+
+pollToastUploadingIconSize: size(30px, 30px);
+pollToastIconSize: size(22px, 22px);
diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.cpp b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
index 325e92c4438cde..938d3adbec722e 100644
--- a/Telegram/SourceFiles/boxes/premium_limits_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
@@ -30,7 +30,7 @@ For license and copyright information please follow this link:
 #include "data/data_folder.h"
 #include "data/data_premium_limits.h"
 #include "lang/lang_keys.h"
-#include "settings/settings_premium.h" // ShowPremium.
+#include "settings/sections/settings_premium.h" // ShowPremium.
 #include "base/unixtime.h"
 #include "apiwrap.h"
 #include "styles/style_premium.h"
@@ -366,11 +366,11 @@ void PublicsController::rowRightActionClicked(not_null<PeerListRow*> row) {
 		}
 		*once = true;
 		peer->session().api().request(MTPchannels_UpdateUsername(
-			peer->asChannel()->inputChannel,
+			peer->asChannel()->inputChannel(),
 			MTP_string()
 		)).done([=] {
 			peer->session().api().request(MTPchannels_DeactivateAllUsernames(
-				peer->asChannel()->inputChannel
+				peer->asChannel()->inputChannel()
 			)).done([=] {
 				closeBox();
 				close();
@@ -517,13 +517,13 @@ void SimplePinsLimitBox(
 		tr::lng_filter_pin_limit1(
 			lt_count,
 			rpl::single(premium ? premiumLimit : defaultLimit),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((premium || !premiumPossible)
 			? rpl::single(TextWithEntities())
 			: tr::lng_filter_pin_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -556,13 +556,13 @@ void ChannelsLimitBox(
 		tr::lng_channels_limit1(
 			lt_count,
 			rpl::single(current),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((premium || !premiumPossible)
-			? tr::lng_channels_limit2_final(Ui::Text::RichLangValue)
+			? tr::lng_channels_limit2_final(tr::rich)
 			: tr::lng_channels_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return a.append(QChar(' ')).append(std::move(b));
 	});
@@ -585,23 +585,23 @@ void ChannelsLimitBox(
 
 	const auto content = box->addRow(
 		object_ptr<PeerListContent>(box, controller),
-		{});
+		style::margins());
 	delegate->setContent(content);
 	controller->setDelegate(delegate);
 
 	const auto count = 100;
 	const auto placeholder = box->addRow(
 		object_ptr<PeerListDummy>(box, count, st::defaultPeerList),
-		{});
+		style::margins());
 
 	using namespace rpl::mappers;
 	controller->countValue(
-	) | rpl::filter(_1 > 0) | rpl::start_with_next([=] {
+	) | rpl::filter(_1 > 0) | rpl::on_next([=] {
 		delete placeholder;
 	}, placeholder->lifetime());
 
 	delegate->selectedCountChanges(
-	) | rpl::start_with_next([=](int count) {
+	) | rpl::on_next([=](int count) {
 		const auto leave = [=](const base::flat_set<PeerListRowId> &ids) {
 			for (const auto rowId : ids) {
 				const auto id = peerToChannel(PeerId(rowId));
@@ -646,13 +646,13 @@ void PublicLinksLimitBox(
 		tr::lng_links_limit1(
 			lt_count,
 			rpl::single(current),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((premium || !premiumPossible)
-			? tr::lng_links_limit2_final(Ui::Text::RichLangValue)
+			? tr::lng_links_limit2_final(tr::rich)
 			: tr::lng_links_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return a.append(QChar(' ')).append(std::move(b));
 	});
@@ -676,18 +676,18 @@ void PublicLinksLimitBox(
 
 	const auto content = box->addRow(
 		object_ptr<PeerListContent>(box, controller),
-		{});
+		style::margins());
 	delegate->setContent(content);
 	controller->setDelegate(delegate);
 
 	const auto count = defaultLimit;
 	const auto placeholder = box->addRow(
 		object_ptr<PeerListDummy>(box, count, st::defaultPeerList),
-		{});
+		style::margins());
 
 	using namespace rpl::mappers;
 	controller->countValue(
-	) | rpl::filter(_1 > 0) | rpl::start_with_next([=] {
+	) | rpl::filter(_1 > 0) | rpl::on_next([=] {
 		delete placeholder;
 	}, placeholder->lifetime());
 }
@@ -714,13 +714,13 @@ void FilterChatsLimitBox(
 			: tr::lng_filter_chats_exlude_limit1)(
 				lt_count,
 				rpl::single(premium ? premiumLimit : defaultLimit),
-				Ui::Text::RichLangValue),
+				tr::rich),
 		((premium || !premiumPossible)
 			? rpl::single(TextWithEntities())
 			: tr::lng_filter_chats_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -752,13 +752,13 @@ void FilterLinksLimitBox(
 		tr::lng_filter_links_limit1(
 			lt_count,
 			rpl::single(premium ? premiumLimit : defaultLimit),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((premium || !premiumPossible)
 			? rpl::single(TextWithEntities())
 			: tr::lng_filter_links_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -801,13 +801,13 @@ void FiltersLimitBox(
 		tr::lng_filters_limit1(
 			lt_count,
 			rpl::single(premium ? premiumLimit : defaultLimit),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((premium || !premiumPossible)
 			? rpl::single(TextWithEntities())
 			: tr::lng_filters_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -840,13 +840,13 @@ void ShareableFiltersLimitBox(
 		tr::lng_filter_shared_limit1(
 			lt_count,
 			rpl::single(premium ? premiumLimit : defaultLimit),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((premium || !premiumPossible)
 			? rpl::single(TextWithEntities())
 			: tr::lng_filter_shared_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -907,6 +907,7 @@ void PinsLimitBox(
 		limits.dialogsPinnedPremium(),
 		PinsCount(session->data().chatsList()));
 }
+
 void SublistsPinsLimitBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session) {
@@ -928,7 +929,7 @@ void ForumPinsLimitBox(
 	auto text = tr::lng_forum_pin_limit(
 		lt_count,
 		rpl::single(current),
-		Ui::Text::RichLangValue);
+		tr::rich);
 	SimpleLimitBox(
 		box,
 		nullptr,
@@ -961,13 +962,13 @@ void CaptionLimitBox(
 		tr::lng_caption_limit1(
 			lt_count,
 			rpl::single(currentLimit),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		(!premiumPossible
 			? rpl::single(TextWithEntities())
 			: tr::lng_caption_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -1034,14 +1035,14 @@ void FileSizeLimitBox(
 	auto text = rpl::combine(
 		tr::lng_file_size_limit1(
 			lt_size,
-			rpl::single(Ui::Text::Bold(gb(showLimit))),
-			Ui::Text::RichLangValue),
+			rpl::single(tr::bold(gb(showLimit))),
+			tr::rich),
 		(!premiumPossible
 			? rpl::single(TextWithEntities())
 			: tr::lng_file_size_limit2(
 				lt_size,
-				rpl::single(Ui::Text::Bold(gb(premiumGb))),
-				Ui::Text::RichLangValue))
+				rpl::single(tr::bold(gb(premiumGb))),
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return a.append(QChar(' ')).append(std::move(b));
 	});
@@ -1089,10 +1090,10 @@ void AccountsLimitBox(
 		tr::lng_accounts_limit1(
 			lt_count,
 			rpl::single<float64>(current),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((!premiumPossible || current > premiumLimit)
 			? rpl::single(TextWithEntities())
-			: tr::lng_accounts_limit2(Ui::Text::RichLangValue))
+			: tr::lng_accounts_limit2(tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -1114,18 +1115,20 @@ void AccountsLimitBox(
 		(!premiumPossible
 			? (current * 2)
 			: (current > defaultLimit)
-			? (current + 1)
+			? std::min(current + 1, premiumLimit)
 			: (defaultLimit * 2)),
 		ChooseBubbleType(premiumPossible),
 		std::nullopt,
 		&st::premiumIconAccounts);
 	Ui::AddSkip(top, st::premiumLineTextSkip);
 	if (premiumPossible) {
+		const auto nextMax = std::max(current, defaultLimit) + 1;
 		Ui::Premium::AddLimitRow(
 			top,
 			st::defaultPremiumLimits,
-			(QString::number(std::max(current, defaultLimit) + 1)
-				+ ((current + 1 == premiumLimit) ? "" : "+")),
+			((nextMax >= premiumLimit)
+				? QString::number(premiumLimit)
+				: (QString::number(nextMax) + QChar('+'))),
 			QString::number(defaultLimit));
 		Ui::AddSkip(top, st::premiumInfographicPadding.bottom());
 	}
@@ -1161,7 +1164,7 @@ void AccountsLimitBox(
 			return;
 		}
 		*switchingLifetime = session->domain().activeSessionChanges(
-		) | rpl::start_with_next([=](Main::Session *session) mutable {
+		) | rpl::on_next([=](Main::Session *session) mutable {
 			if (session) {
 				Settings::ShowPremium(session, ref);
 			}
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index f163be612296d7..ff78f6b3733008 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -16,11 +16,13 @@ For license and copyright information please follow this link:
 #include "data/data_streaming.h"
 #include "data/data_peer_values.h"
 #include "data/data_premium_limits.h"
+#include "info/profile/info_profile_icon.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "main/main_domain.h" // kMaxAccounts
 #include "ui/chat/chat_theme.h"
 #include "ui/chat/chat_style.h"
+#include "ui/controls/feature_list.h"
 #include "ui/layers/generic_box.h"
 #include "ui/effects/path_shift_gradient.h"
 #include "ui/effects/premium_graphics.h"
@@ -33,8 +35,8 @@ For license and copyright information please follow this link:
 #include "ui/boxes/confirm_box.h"
 #include "ui/painter.h"
 #include "ui/vertical_list.h"
-#include "settings/settings_business.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_business.h"
+#include "settings/sections/settings_premium.h"
 #include "lottie/lottie_single_player.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/view/history_view_element.h"
@@ -43,7 +45,10 @@ For license and copyright information please follow this link:
 #include "window/window_session_controller.h"
 #include "api/api_premium.h"
 #include "apiwrap.h"
+#include "styles/style_credits.h" // upgradeGiftSubtext
+#include "styles/style_info.h" // infoStarsUnderstood
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_premium.h"
 #include "styles/style_settings.h"
 
@@ -77,7 +82,7 @@ bool operator==(const Descriptor &a, const Descriptor &b) {
 struct Preload {
 	Descriptor descriptor;
 	std::shared_ptr<Data::DocumentMedia> media;
-	std::weak_ptr<ChatHelpers::Show> show;
+	std::weak_ptr<Main::SessionShow> show;
 };
 
 [[nodiscard]] std::vector<Preload> &Preloads() {
@@ -133,6 +138,16 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		return tr::lng_premium_summary_subtitle_business();
 	case PremiumFeature::Effects:
 		return tr::lng_premium_summary_subtitle_effects();
+	case PremiumFeature::TodoLists:
+		return tr::lng_premium_summary_subtitle_todo_lists();
+	case PremiumFeature::PeerColors:
+		return tr::lng_premium_summary_subtitle_peer_colors();
+	case PremiumFeature::Gifts:
+		return tr::lng_premium_summary_subtitle_gifts();
+	case PremiumFeature::NoForwards:
+		return tr::lng_premium_summary_subtitle_no_forwards();
+	case PremiumFeature::AiCompose:
+		return tr::lng_premium_summary_subtitle_ai_compose();
 
 	case PremiumFeature::BusinessLocation:
 		return tr::lng_business_subtitle_location();
@@ -150,6 +165,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		return tr::lng_business_subtitle_chat_intro();
 	case PremiumFeature::ChatLinks:
 		return tr::lng_business_subtitle_chat_links();
+	case PremiumFeature::FilterTags:
+		return tr::lng_premium_summary_subtitle_filter_tags();
 	}
 	Unexpected("PremiumFeature in SectionTitle.");
 }
@@ -196,6 +213,16 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		return tr::lng_premium_summary_about_business();
 	case PremiumFeature::Effects:
 		return tr::lng_premium_summary_about_effects();
+	case PremiumFeature::TodoLists:
+		return tr::lng_premium_summary_about_todo_lists();
+	case PremiumFeature::PeerColors:
+		return tr::lng_premium_summary_about_peer_colors();
+	case PremiumFeature::Gifts:
+		return tr::lng_premium_summary_about_gifts();
+	case PremiumFeature::NoForwards:
+		return tr::lng_premium_summary_about_no_forwards();
+	case PremiumFeature::AiCompose:
+		return tr::lng_premium_summary_about_ai_compose();
 
 	case PremiumFeature::BusinessLocation:
 		return tr::lng_business_about_location();
@@ -213,6 +240,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		return tr::lng_business_about_chat_intro();
 	case PremiumFeature::ChatLinks:
 		return tr::lng_business_about_chat_links();
+	case PremiumFeature::FilterTags:
+		return tr::lng_premium_summary_about_filter_tags();
 	}
 	Unexpected("PremiumFeature in SectionTitle.");
 }
@@ -225,7 +254,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	const auto raw = result.data();
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		p.drawImage(0, 0, back);
 	}, raw->lifetime());
@@ -249,7 +278,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	result->show();
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		result->setGeometry(QRect(
 			QPoint(
 				(size.width() - effectSize.width()) / 2,
@@ -303,8 +332,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 			result->update();
 		};
 		auto &lifetime = result->lifetime();
-		state->lottie->updates() | rpl::start_with_next(update, lifetime);
-		state->effect->updates() | rpl::start_with_next(update, lifetime);
+		state->lottie->updates() | rpl::on_next(update, lifetime);
+		state->effect->updates() | rpl::on_next(update, lifetime);
 	};
 	createLottieIfReady();
 	if (!state->lottie || !state->effect) {
@@ -321,7 +350,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		rpl::never<>());
 
 	result->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		createLottieIfReady();
 
 		auto p = QPainter(result);
@@ -379,7 +408,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	result->show();
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		result->setGeometry(QRect(QPoint(), size));
 	}, result->lifetime());
 	auto &lifetime = result->lifetime();
@@ -405,7 +434,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		outer->show();
 
 		result->sizeValue(
-		) | rpl::start_with_next([=](QSize size) {
+		) | rpl::on_next([=](QSize size) {
 			outer->resize(size);
 		}, outer->lifetime());
 
@@ -475,7 +504,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	result->shownValue(
 	) | rpl::filter([=](bool shown) {
 		return shown && state->toggleTimerPending;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		state->toggleTimerPending = false;
 		state->toggleTimer.callOnce(kToggleStickerTimeout);
 	}, result->lifetime());
@@ -495,7 +524,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	fill();
 	if (state->medias.empty()) {
 		premium->stickersUpdated(
-		) | rpl::take(1) | rpl::start_with_next(fill, lifetime);
+		) | rpl::take(1) | rpl::on_next(fill, lifetime);
 	}
 
 	return result;
@@ -534,6 +563,11 @@ struct VideoPreviewDocument {
 		case PremiumFeature::LastSeen: return "last_seen";
 		case PremiumFeature::MessagePrivacy: return "message_privacy";
 		case PremiumFeature::Effects: return "effects";
+		case PremiumFeature::TodoLists: return "todo";
+		case PremiumFeature::PeerColors: return "peer_colors";
+		case PremiumFeature::Gifts: return "gifts";
+		case PremiumFeature::NoForwards: return "no_forwards";
+		case PremiumFeature::AiCompose: return "ai_compose";
 
 		case PremiumFeature::BusinessLocation: return "business_location";
 		case PremiumFeature::BusinessHours: return "business_hours";
@@ -543,6 +577,7 @@ struct VideoPreviewDocument {
 		case PremiumFeature::BusinessBots: return "business_bots";
 		case PremiumFeature::ChatIntro: return "business_intro";
 		case PremiumFeature::ChatLinks: return "business_links";
+		case PremiumFeature::FilterTags: return "folder_tags";
 		}
 		return "";
 	}();
@@ -613,7 +648,7 @@ struct VideoPreviewDocument {
 	result->show();
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		result->setGeometry(parent->rect());
 	}, result->lifetime());
 	auto &lifetime = result->lifetime();
@@ -683,7 +718,7 @@ struct VideoPreviewDocument {
 		}
 	};
 	state->instance.player().updates(
-	) | rpl::start_with_next_error([=](Media::Streaming::Update &&update) {
+	) | rpl::on_next_error([=](Media::Streaming::Update &&update) {
 		if (v::is<Media::Streaming::Information>(update.data)
 			|| v::is<Media::Streaming::UpdateVideo>(update.data)) {
 			if (!state->readyInvoked && readyCallback) {
@@ -703,7 +738,7 @@ struct VideoPreviewDocument {
 	});
 
 	result->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(result);
 		const auto paintFrame = [&](QColor color, float64 thickness) {
 			auto hq = PainterHighQualityEnabler(p);
@@ -775,7 +810,7 @@ struct VideoPreviewDocument {
 	result->show();
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		result->setGeometry(QRect(QPoint(), size));
 	}, result->lifetime());
 	auto &lifetime = result->lifetime();
@@ -801,7 +836,7 @@ struct VideoPreviewDocument {
 	create();
 	if (!state->single) {
 		session->api().premium().videosUpdated(
-		) | rpl::take(1) | rpl::start_with_next(create, lifetime);
+		) | rpl::take(1) | rpl::on_next(create, lifetime);
 	}
 
 	return result;
@@ -850,7 +885,7 @@ struct VideoPreviewDocument {
 		const auto section = order[i];
 		const auto button = Ui::CreateChild<Ui::AbstractButton>(raw);
 		parent->widthValue(
-		) | rpl::start_with_next([=](int outer) {
+		) | rpl::on_next([=](int outer) {
 			const auto full = width * count;
 			const auto left = (outer - full) / 2 + (i * width);
 			button->setGeometry(left, 0, width, height);
@@ -859,7 +894,7 @@ struct VideoPreviewDocument {
 			*selected = section;
 		});
 		button->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(button);
 			auto hq = PainterHighQualityEnabler(p);
 			p.setBrush((selected->current() == section)
@@ -872,13 +907,38 @@ struct VideoPreviewDocument {
 				button->rect().marginsRemoved(st::premiumDotPadding));
 		}, button->lifetime());
 		selected->changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			button->update();
 		}, button->lifetime());
 	}
 	return result;
 }
 
+void AddGiftsInfoRows(not_null<Ui::VerticalLayout*> container) {
+	const auto features = std::vector<Ui::FeatureListEntry>{
+		{
+			st::menuIconUnique,
+			tr::lng_gift_upgrade_unique_title(tr::now),
+			tr::lng_gift_upgrade_unique_about(tr::now, tr::marked),
+		},
+		{
+			st::menuIconTradable,
+			tr::lng_gift_upgrade_tradable_title(tr::now),
+			tr::lng_gift_upgrade_tradable_about(tr::now, tr::marked),
+		},
+		{
+			st::menuIconNftWear,
+			tr::lng_gift_upgrade_wearable_title(tr::now),
+			tr::lng_gift_upgrade_wearable_about(tr::now, tr::marked),
+		},
+	};
+	for (const auto &feature : features) {
+		container->add(
+			Ui::MakeFeatureListEntry(container, feature),
+			st::boxRowPadding);
+	}
+}
+
 void PreviewBox(
 		not_null<Ui::GenericBox*> box,
 		std::shared_ptr<ChatHelpers::Show> show,
@@ -892,7 +952,7 @@ void PreviewBox(
 
 	const auto outer = box->addRow(
 		ChatBackPreview(box, size.height(), back),
-		{});
+		style::margins());
 
 	struct Hiding {
 		not_null<Ui::RpWidget*> widget;
@@ -941,22 +1001,32 @@ void PreviewBox(
 		st::settingsPremiumTopBarClose);
 	close->setClickedCallback([=] { box->closeBox(); });
 
-	const auto left = Ui::CreateChild<Ui::IconButton>(
+	const auto gifts = (state->selected.current() == PremiumFeature::Gifts);
+
+	const auto left = gifts ? nullptr : Ui::CreateChild<Ui::IconButton>(
 		buttonsParent,
 		st::settingsPremiumMoveLeft);
-	left->setClickedCallback([=] { move(-1); });
+	if (left) {
+		left->setClickedCallback([=] { move(-1); });
+	}
 
-	const auto right = Ui::CreateChild<Ui::IconButton>(
+	const auto right = gifts ? nullptr : Ui::CreateChild<Ui::IconButton>(
 		buttonsParent,
 		st::settingsPremiumMoveRight);
-	right->setClickedCallback([=] { move(1); });
+	if (right) {
+		right->setClickedCallback([=] { move(1); });
+	}
 
 	buttonsParent->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto outerHeight = st::premiumPreviewHeight;
 		close->moveToRight(0, 0, width);
-		left->moveToLeft(0, (outerHeight - left->height()) / 2, width);
-		right->moveToRight(0, (outerHeight - right->height()) / 2, width);
+		if (left) {
+			left->moveToLeft(0, (outerHeight - left->height()) / 2, width);
+		}
+		if (right) {
+			right->moveToRight(0, (outerHeight - right->height()) / 2, width);
+		}
 	}, close->lifetime());
 
 	state->preload = [=] {
@@ -999,7 +1069,7 @@ void PreviewBox(
 
 	state->selected.value(
 	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](PremiumFeature was, PremiumFeature now) {
+	) | rpl::on_next([=](PremiumFeature was, PremiumFeature now) {
 		const auto animationCallback = [=] {
 			if (!state->animation.animating()) {
 				for (const auto &hiding : base::take(state->hiding)) {
@@ -1069,36 +1139,45 @@ void PreviewBox(
 	auto text = state->selected.value(
 	) | rpl::map(SectionAbout) | rpl::flatten_latest();
 
-	const auto padding = st::premiumPreviewAboutPadding;
-	const auto available = size.width() - padding.left() - padding.right();
-	auto titleLabel = object_ptr<Ui::FlatLabel>(
-		box,
-		std::move(title),
-		st::premiumPreviewAboutTitle);
-	titleLabel->resizeToWidth(available);
 	box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			std::move(titleLabel)),
-		st::premiumPreviewAboutTitlePadding);
-	auto textLabel = object_ptr<Ui::FlatLabel>(
-		box,
-		std::move(text),
-		st::premiumPreviewAbout);
-	textLabel->resizeToWidth(available);
-	box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(box, std::move(textLabel)),
-		padding);
+			std::move(title),
+			st::premiumPreviewAboutTitle),
+		st::premiumPreviewAboutTitlePadding,
+		style::al_top);
 	box->addRow(
-		CreateSwitch(box->verticalLayout(), &state->selected, state->order),
-		st::premiumDotsMargin);
+		object_ptr<Ui::FlatLabel>(
+			box,
+			std::move(text),
+			st::premiumPreviewAbout),
+		st::premiumPreviewAboutPadding,
+		style::al_top
+	)->setTryMakeSimilarLines(true);
+
+	if (gifts) {
+		box->setStyle(st::giftBox);
+		AddGiftsInfoRows(box->verticalLayout());
+	} else {
+		box->addRow(
+			CreateSwitch(box->verticalLayout(), &state->selected, state->order),
+			st::premiumDotsMargin);
+	}
 	const auto showFinished = [=] {
 		state->showFinished = true;
 		if (base::take(state->preloadScheduled)) {
 			state->preload();
 		}
 	};
-	if ((descriptor.fromSettings && show->session().premium())
+	if (gifts) {
+		box->setShowFinishedCallback(showFinished);
+		box->addButton(
+			rpl::single(QString()),
+			[=] { box->closeBox(); }
+		)->setText(rpl::single(Ui::Text::IconEmoji(
+			&st::infoStarsUnderstood
+		).append(' ').append(tr::lng_auction_about_understood(tr::now))));
+	} else if ((descriptor.fromSettings && show->session().premium())
 		|| descriptor.hideSubscriptionButton) {
 		box->setShowFinishedCallback(showFinished);
 		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
@@ -1134,8 +1213,7 @@ void PreviewBox(
 		button->resizeToWidth(width);
 		if (!descriptor.fromSettings) {
 			button->setClickedCallback([=] {
-				const auto window = show->resolveWindow(
-					ChatHelpers::WindowUsage::PremiumPromo);
+				const auto window = show->resolveWindow();
 				if (!window) {
 					return;
 				}
@@ -1154,13 +1232,13 @@ void PreviewBox(
 	if (descriptor.fromSettings) {
 		Data::AmPremiumValue(
 			&show->session()
-		) | rpl::skip(1) | rpl::start_with_next([=] {
+		) | rpl::skip(1) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	}
 
 	box->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::KeyPress) {
 			const auto key = static_cast<QKeyEvent*>(e.get())->key();
 			if (key == Qt::Key_Left) {
@@ -1172,7 +1250,7 @@ void PreviewBox(
 	}, box->lifetime());
 
 	if (const auto &hidden = descriptor.hiddenCallback) {
-		box->boxClosing() | rpl::start_with_next(hidden, box->lifetime());
+		box->boxClosing() | rpl::on_next(hidden, box->lifetime());
 	}
 }
 
@@ -1218,13 +1296,13 @@ void DecorateListPromoBox(
 	if (!descriptor.hideSubscriptionButton) {
 		Data::AmPremiumValue(
 			session
-		) | rpl::skip(1) | rpl::start_with_next([=] {
+		) | rpl::skip(1) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	}
 
 	if (const auto &hidden = descriptor.hiddenCallback) {
-		box->boxClosing() | rpl::start_with_next(hidden, box->lifetime());
+		box->boxClosing() | rpl::on_next(hidden, box->lifetime());
 	}
 
 	if (session->premium() || descriptor.hideSubscriptionButton) {
@@ -1244,7 +1322,7 @@ void DecorateListPromoBox(
 
 		box->setStyle(st::premiumPreviewDoubledLimitsBox);
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto &padding
 				= st::premiumPreviewDoubledLimitsBox.buttonPadding;
 			button->resizeToWidth(width
@@ -1392,7 +1470,7 @@ void PremiumUnavailableBox(not_null<Ui::GenericBox*> box) {
 	Ui::ConfirmBox(box, {
 		.text = tr::lng_premium_unavailable(
 			tr::now,
-			Ui::Text::RichLangValue),
+			tr::rich),
 		.inform = true,
 	});
 }
@@ -1411,7 +1489,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_channels(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.channelsDefault(),
 			premium,
 		});
@@ -1423,7 +1501,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_pins(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.dialogsPinnedDefault(),
 			premium,
 		});
@@ -1435,7 +1513,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_links(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.channelsPublicDefault(),
 			premium,
 		});
@@ -1447,7 +1525,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_gifs(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.gifsDefault(),
 			premium,
 		});
@@ -1459,7 +1537,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_stickers(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.stickersFavedDefault(),
 			premium,
 		});
@@ -1469,7 +1547,7 @@ void DoubledLimitsPreviewBox(
 		entries.push_back({
 			tr::lng_premium_double_limits_subtitle_bio(),
 			tr::lng_premium_double_limits_about_bio(
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.aboutLengthDefault(),
 			premium,
 		});
@@ -1479,7 +1557,7 @@ void DoubledLimitsPreviewBox(
 		entries.push_back({
 			tr::lng_premium_double_limits_subtitle_captions(),
 			tr::lng_premium_double_limits_about_captions(
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.captionLengthDefault(),
 			premium,
 		});
@@ -1491,7 +1569,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_folders(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.dialogFiltersDefault(),
 			premium,
 		});
@@ -1503,7 +1581,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_folder_chats(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.dialogFiltersChatsDefault(),
 			premium,
 		});
@@ -1517,11 +1595,23 @@ void DoubledLimitsPreviewBox(
 		tr::lng_premium_double_limits_about_accounts(
 			lt_count,
 			rpl::single(float64(Main::Domain::kPremiumMaxAccounts)),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		Main::Domain::kMaxAccounts,
 		Main::Domain::kPremiumMaxAccounts,
 		till,
 	});
+	{
+		const auto premium = limits.similarChannelsPremium();
+		entries.push_back({
+			tr::lng_premium_double_limits_subtitle_similar_channels(),
+			tr::lng_premium_double_limits_about_similar_channels(
+				lt_count,
+				rpl::single(float64(premium)),
+				tr::rich),
+			limits.similarChannelsDefault(),
+			premium,
+		});
+	}
 	Ui::Premium::ShowListBox(
 		box,
 		st::defaultPremiumLimits,
@@ -1642,6 +1732,11 @@ void TelegramBusinessPreviewBox(
 			tr::lng_business_about_chat_links,
 			st::settingsBusinessPromoChatLinks);
 			break;
+		case PremiumFeature::FilterTags: push(
+			tr::lng_premium_summary_subtitle_filter_tags,
+			tr::lng_premium_summary_about_filter_tags,
+			st::settingsPremiumIconTags);
+			break;
 		}
 	}
 
@@ -1666,7 +1761,7 @@ object_ptr<Ui::GradientButton> CreateUnlockButton(
 	rpl::combine(
 		result->widthValue(),
 		label->widthValue()
-	) | rpl::start_with_next([=](int outer, int width) {
+	) | rpl::on_next([=](int outer, int width) {
 		label->moveToLeft(
 			(outer - width) / 2,
 			st::premiumPreviewBox.button.textTop,
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.h b/Telegram/SourceFiles/boxes/premium_preview_box.h
index 4dae5c30d5f047..84e14877a8e9f1 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.h
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.h
@@ -71,6 +71,12 @@ enum class PremiumFeature {
 	MessagePrivacy,
 	Business,
 	Effects,
+	FilterTags,
+	TodoLists,
+	PeerColors,
+	Gifts,
+	NoForwards,
+	AiCompose,
 
 	// Business features.
 	BusinessLocation,
diff --git a/Telegram/SourceFiles/boxes/preview_ai_tone_box.cpp b/Telegram/SourceFiles/boxes/preview_ai_tone_box.cpp
new file mode 100644
index 00000000000000..ca20e6a68790c4
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/preview_ai_tone_box.cpp
@@ -0,0 +1,631 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/preview_ai_tone_box.h"
+
+#include "api/api_compose_with_ai.h"
+#include "boxes/create_ai_tone_box.h"
+#include "core/click_handler_types.h"
+#include "core/ui_integration.h"
+#include "data/data_ai_compose_tones.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "window/window_session_controller.h"
+#include "ui/controls/custom_emoji_toast_icon.h"
+#include "ui/effects/animation_value.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/skeleton_animation.h"
+#include "ui/layers/generic_box.h"
+#include "ui/layers/show.h"
+#include "ui/painter.h"
+#include "ui/text/text_custom_emoji.h"
+#include "ui/text/text_entity.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/vertical_list.h"
+
+#include <optional>
+
+#include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_layers.h"
+
+namespace {
+
+constexpr auto kToastDuration = crl::time(4000);
+constexpr auto kSpinDuration = crl::time(600);
+constexpr auto kWaitDuration = crl::time(1000);
+
+class RefreshSpinEmoji final : public Ui::Text::CustomEmoji {
+public:
+	RefreshSpinEmoji(
+		std::shared_ptr<rpl::variable<bool>> loading,
+		Fn<void()> repaint);
+
+	int width() override;
+	QString entityData() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	enum class Phase : uchar { Idle, Spinning, Waiting };
+
+	void handleLoading(bool now);
+	void tick(crl::time now);
+	[[nodiscard]] float64 angleDegrees(crl::time now) const;
+
+	rpl::variable<bool> _loading;
+	const Fn<void()> _repaint;
+	Ui::Animations::Basic _animation;
+	crl::time _phaseStarted = 0;
+	Phase _phase = Phase::Idle;
+	rpl::lifetime _lifetime;
+
+};
+
+RefreshSpinEmoji::RefreshSpinEmoji(
+	std::shared_ptr<rpl::variable<bool>> loading,
+	Fn<void()> repaint)
+: _loading(loading->value())
+, _repaint(std::move(repaint))
+, _animation([=](crl::time now) { tick(now); }) {
+	_loading.value(
+	) | rpl::on_next([=](bool value) {
+		handleLoading(value);
+	}, _lifetime);
+}
+
+int RefreshSpinEmoji::width() {
+	const auto &e = st::aiTonePreviewAnotherExampleIcon;
+	return e.padding.left() + e.icon.width() + e.padding.right();
+}
+
+QString RefreshSpinEmoji::entityData() {
+	return u"ai-tone-refresh"_q;
+}
+
+float64 RefreshSpinEmoji::angleDegrees(crl::time now) const {
+	if (_phase != Phase::Spinning) {
+		return 0.;
+	}
+	const auto elapsed = now - _phaseStarted;
+	const auto dt = std::clamp(
+		elapsed / float64(kSpinDuration),
+		0.,
+		1.);
+	return anim::easeOutBack(360., dt);
+}
+
+void RefreshSpinEmoji::paint(QPainter &p, const Context &context) {
+	const auto &e = st::aiTonePreviewAnotherExampleIcon;
+	const auto size = e.icon.size();
+	const auto pos = context.position
+		+ QPoint(e.padding.left(), e.padding.top());
+	const auto angle = angleDegrees(context.now);
+	auto hq = PainterHighQualityEnabler(p);
+	if (angle != 0.) {
+		const auto center = QPointF(pos)
+			+ QPointF(size.width() / 2.0, size.height() / 2.0);
+		p.save();
+		p.translate(center);
+		p.rotate(angle);
+		p.translate(-center);
+		e.icon.paint(p, pos, 0, context.textColor);
+		p.restore();
+	} else {
+		e.icon.paint(p, pos, 0, context.textColor);
+	}
+}
+
+void RefreshSpinEmoji::unload() {
+}
+
+bool RefreshSpinEmoji::ready() {
+	return true;
+}
+
+bool RefreshSpinEmoji::readyInDefaultState() {
+	return _phase == Phase::Idle;
+}
+
+void RefreshSpinEmoji::handleLoading(bool now) {
+	if (now) {
+		if (_phase == Phase::Idle) {
+			_phase = Phase::Spinning;
+			_phaseStarted = crl::now();
+			_animation.start();
+			if (_repaint) {
+				_repaint();
+			}
+		}
+	} else if (_phase == Phase::Waiting) {
+		_phase = Phase::Idle;
+		_animation.stop();
+		if (_repaint) {
+			_repaint();
+		}
+	}
+}
+
+void RefreshSpinEmoji::tick(crl::time now) {
+	const auto elapsed = now - _phaseStarted;
+	if (_phase == Phase::Spinning && elapsed >= kSpinDuration) {
+		if (_loading.current()) {
+			_phase = Phase::Waiting;
+			_phaseStarted = now;
+		} else {
+			_phase = Phase::Idle;
+			_animation.stop();
+		}
+	} else if (_phase == Phase::Waiting && elapsed >= kWaitDuration) {
+		if (_loading.current()) {
+			_phase = Phase::Spinning;
+			_phaseStarted = now;
+		} else {
+			_phase = Phase::Idle;
+			_animation.stop();
+		}
+	}
+	if (_repaint) {
+		_repaint();
+	}
+}
+
+class PreviewAiToneExampleCard final : public Ui::RpWidget {
+public:
+	PreviewAiToneExampleCard(
+		QWidget *parent,
+		not_null<Main::Session*> session,
+		std::shared_ptr<rpl::variable<bool>> loading);
+
+	void showExample(Data::AiComposeToneExample example);
+	void showSkeleton(bool shown);
+	void setAnotherVisible(bool visible);
+	[[nodiscard]] rpl::producer<> anotherExampleRequested() const;
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	const not_null<Main::Session*> _session;
+	const not_null<Ui::VerticalLayout*> _layout;
+	const not_null<Ui::FlatLabel*> _beforeTitle;
+	const not_null<Ui::FlatLabel*> _beforeBody;
+	const style::complex_color _shadowColor;
+	const not_null<Ui::PlainShadow*> _shadow;
+	const not_null<Ui::FlatLabel*> _afterTitle;
+	const not_null<Ui::FlatLabel*> _afterBody;
+	const not_null<Ui::RoundButton*> _another;
+	Ui::SkeletonAnimation _beforeSkeleton;
+	Ui::SkeletonAnimation _afterSkeleton;
+	rpl::event_stream<> _anotherExampleRequested;
+
+};
+
+PreviewAiToneExampleCard::PreviewAiToneExampleCard(
+	QWidget *parent,
+	not_null<Main::Session*> session,
+	std::shared_ptr<rpl::variable<bool>> loading)
+: RpWidget(parent)
+, _session(session)
+, _layout(Ui::CreateChild<Ui::VerticalLayout>(this))
+, _beforeTitle(_layout->add(
+	object_ptr<Ui::FlatLabel>(
+		_layout,
+		tr::lng_ai_compose_before(tr::now),
+		st::aiComposeCardTitle),
+	QMargins(
+		st::aiTonePreviewExampleCardPadding.left(),
+		st::aiTonePreviewExampleCardPadding.top(),
+		st::aiTonePreviewExampleCardPadding.right(),
+		0)))
+, _beforeBody(_layout->add(
+	object_ptr<Ui::FlatLabel>(_layout, st::aiComposeBodyLabel),
+	QMargins(
+		st::aiTonePreviewExampleCardPadding.left(),
+		st::aiTonePreviewExampleCardTitleSkip,
+		st::aiTonePreviewExampleCardPadding.right(),
+		0)))
+, _shadowColor([] {
+	auto color = st::windowSubTextFg->c;
+	color.setAlphaF(st::aiComposeShadowOpacity);
+	return color;
+})
+, _shadow(_layout->add(
+	object_ptr<Ui::PlainShadow>(_layout, _shadowColor.color()),
+	QMargins(
+		st::aiTonePreviewExampleCardPadding.left(),
+		st::aiTonePreviewExampleCardSectionSkip / 2,
+		st::aiTonePreviewExampleCardPadding.right(),
+		0)))
+, _afterTitle(_layout->add(
+	object_ptr<Ui::FlatLabel>(
+		_layout,
+		tr::lng_ai_compose_after(tr::now),
+		st::aiComposeCardTitle),
+	QMargins(
+		st::aiTonePreviewExampleCardPadding.left(),
+		st::aiTonePreviewExampleCardSectionSkip / 2,
+		st::aiTonePreviewExampleCardPadding.right(),
+		0)))
+, _afterBody(_layout->add(
+	object_ptr<Ui::FlatLabel>(_layout, st::aiComposeBodyLabel),
+	QMargins(
+		st::aiTonePreviewExampleCardPadding.left(),
+		st::aiTonePreviewExampleCardTitleSkip,
+		st::aiTonePreviewExampleCardPadding.right(),
+		st::aiTonePreviewExampleCardPadding.bottom())))
+, _another(Ui::CreateChild<Ui::RoundButton>(
+	this,
+	rpl::single(QString()),
+	st::aiTonePreviewAnotherExampleButton))
+, _beforeSkeleton(_beforeBody)
+, _afterSkeleton(_afterBody) {
+	_beforeBody->setSelectable(true);
+	_afterBody->setSelectable(true);
+	_another->raise();
+	rpl::combine(
+		widthValue(),
+		_beforeTitle->geometryValue(),
+		_another->widthValue()
+	) | rpl::on_next([=](int width, QRect titleGeometry, int) {
+		const auto right = st::aiTonePreviewExampleCardPadding.left();
+		const auto &button = st::aiTonePreviewAnotherExampleButton;
+		const auto &title = st::aiComposeCardTitle;
+		const auto shift = title.style.font->ascent
+			- button.style.font->ascent
+			- button.textTop
+			- button.padding.top();
+		_another->moveToRight(
+			right,
+			titleGeometry.top() + shift,
+			width);
+	}, lifetime());
+	auto context = Ui::Text::MarkedContext();
+	context.repaint = [raw = _another.get()] { raw->update(); };
+	context.customEmojiFactory = [loading = std::move(loading)](
+			QStringView data,
+			const Ui::Text::MarkedContext &context
+		) -> std::unique_ptr<Ui::Text::CustomEmoji> {
+		if (data != u"ai-tone-refresh"_q) {
+			return nullptr;
+		}
+		return std::make_unique<RefreshSpinEmoji>(loading, context.repaint);
+	};
+	_another->setContext(context);
+	_another->setText(rpl::single(
+		Ui::Text::SingleCustomEmoji(u"ai-tone-refresh"_q)
+			.append(tr::lng_ai_compose_tone_preview_add_example(tr::now))));
+	_another->setClickedCallback([=] {
+		_anotherExampleRequested.fire({});
+	});
+}
+
+void PreviewAiToneExampleCard::showExample(
+		Data::AiComposeToneExample example) {
+	const auto context = Core::TextContext({ .session = _session });
+	_beforeBody->setMarkedText(example.from, context);
+	_afterBody->setMarkedText(example.to, context);
+	_beforeSkeleton.stop();
+	_afterSkeleton.stop();
+	if (width() > 0) {
+		resizeToWidth(width());
+	}
+}
+
+void PreviewAiToneExampleCard::showSkeleton(bool shown) {
+	if (shown) {
+		_beforeSkeleton.start();
+		_afterSkeleton.start();
+	} else {
+		_beforeSkeleton.stop();
+		_afterSkeleton.stop();
+	}
+}
+
+void PreviewAiToneExampleCard::setAnotherVisible(bool visible) {
+	_another->setVisible(visible);
+}
+
+rpl::producer<> PreviewAiToneExampleCard::anotherExampleRequested() const {
+	return _anotherExampleRequested.events();
+}
+
+int PreviewAiToneExampleCard::resizeGetHeight(int newWidth) {
+	_layout->resizeToWidth(newWidth);
+	_layout->moveToLeft(0, 0, newWidth);
+	return _layout->heightNoMargins();
+}
+
+void PreviewAiToneExampleCard::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(st::aiTonePreviewExampleCardBg);
+	p.drawRoundedRect(
+		rect(),
+		st::aiTonePreviewExampleCardRadius,
+		st::aiTonePreviewExampleCardRadius);
+}
+
+void ShowToneAddedToast(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Main::Session*> session,
+		const Data::AiComposeTone &tone) {
+	const auto size = QSize(
+		st::aiComposeToneToastIconSize.width(),
+		st::aiComposeToneToastIconSize.height());
+	show->showToast(Ui::Toast::Config{
+		.title = tr::lng_ai_compose_tone_added(tr::now),
+		.text = tr::lng_ai_compose_tone_added_description(
+			tr::now,
+			lt_name,
+			tr::marked(tone.title),
+			tr::marked),
+		.iconContent = Ui::MakeCustomEmojiToastIcon(
+			session,
+			tone.emojiId,
+			size),
+		.iconPadding = st::aiComposeToneToastIconPadding,
+		.duration = kToastDuration,
+	});
+}
+
+void ShowToneRemovedToast(std::shared_ptr<Ui::Show> show, bool deleted) {
+	show->showToast(Ui::Toast::Config{
+		.text = { (deleted
+			? tr::lng_ai_compose_tone_deleted
+			: tr::lng_ai_compose_tone_removed)(tr::now) },
+		.icon = &st::aiComposeToneRemovedToastIcon,
+		.duration = kToastDuration,
+	});
+}
+
+[[nodiscard]] auto FindInstalledCustomTone(
+		not_null<Main::Session*> session,
+		const Data::AiComposeTone &tone)
+-> std::optional<Data::AiComposeTone> {
+	if (tone.isDefault) {
+		return std::nullopt;
+	}
+	for (const auto &installedTone : session->data().aiComposeTones().list()) {
+		if (!installedTone.isDefault && (installedTone.id == tone.id)) {
+			return installedTone;
+		}
+	}
+	return std::nullopt;
+}
+
+[[nodiscard]] bool BoundsToThisTone(const Data::AiComposeTone &tone) {
+	if (tone.slug.isEmpty()) {
+		return false;
+	}
+	const auto bound = Api::AiApplyBoundSlug();
+	return !bound.isEmpty() && (bound == tone.slug);
+}
+
+} // namespace
+
+void PreviewAiToneBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session,
+		Data::AiComposeTone tone,
+		base::weak_ptr<Window::SessionController> controller) {
+	box->setStyle(st::aiComposeBox);
+	box->setNoContentMargin(true);
+	box->setWidth(st::boxWideWidth);
+	box->addTopButton(st::aiComposeBoxClose, [=] { box->closeBox(); });
+
+	const auto top = box->setPinnedToTopContent(
+		object_ptr<Ui::VerticalLayout>(box));
+	Ui::AddSkip(top, st::defaultVerticalListSkip * 4);
+	AddAiToneIconPreview(top, session, rpl::single(tone.emojiId), nullptr);
+	top->add(
+		object_ptr<Ui::FlatLabel>(
+			top,
+			rpl::single(tone.title),
+			st::aiTonePreviewTitleLabel),
+		st::aiTonePreviewTitleMargin,
+		style::al_top);
+	top->add(
+		object_ptr<Ui::FlatLabel>(
+			top,
+			tr::lng_ai_compose_tone_preview_about(),
+			st::aiTonePreviewAboutLabel),
+		st::aiTonePreviewAboutMargin,
+		style::al_top
+	)->setTryMakeSimilarLines(true);
+
+	const auto body = box->verticalLayout();
+
+	struct State {
+		int examplesCount = 0;
+		std::shared_ptr<rpl::variable<bool>> requesting
+			= std::make_shared<rpl::variable<bool>>(false);
+	};
+	const auto state = box->lifetime().make_state<State>();
+	state->examplesCount = tone.firstExample ? 1 : 0;
+
+	const auto card = body->add(
+		object_ptr<PreviewAiToneExampleCard>(
+			body,
+			session,
+			state->requesting),
+		st::aiTonePreviewExampleCardMargin);
+	const auto maxExamples = session->appConfig().get<int>(
+		u"aicompose_tone_examples_num"_q,
+		3);
+	const auto updateAnother = [=] {
+		card->setAnotherVisible(state->examplesCount < maxExamples);
+	};
+	updateAnother();
+	const auto loadAnother = [=] {
+		if (state->requesting->current()) {
+			return;
+		}
+		*state->requesting = true;
+		card->showSkeleton(true);
+		const auto num = state->examplesCount;
+		session->data().aiComposeTones().getToneExample(
+			tone,
+			num,
+			crl::guard(box, [=](Data::AiComposeToneExample example) {
+				*state->requesting = false;
+				++state->examplesCount;
+				card->showExample(std::move(example));
+				updateAnother();
+			}),
+			crl::guard(box, [=](const MTP::Error &error) {
+				*state->requesting = false;
+				card->showSkeleton(false);
+				if (!MTP::IgnoreError(error)) {
+					box->showToast(error.type());
+				}
+			}));
+	};
+	card->anotherExampleRequested(
+	) | rpl::on_next(loadAnother, card->lifetime());
+
+	if (tone.firstExample) {
+		card->showExample(*tone.firstExample);
+	} else {
+		loadAnother();
+	}
+
+	auto text = tr::marked();
+	if (tone.installsCount > 0) {
+		text = tr::lng_ai_compose_tone_preview_used_by(
+			tr::now,
+			lt_count,
+			tone.installsCount,
+			tr::marked);
+	}
+	if (const auto user = session->data().userLoaded(tone.authorId)) {
+		const auto name = user->shortName();
+		auto mention = tr::marked(name);
+		mention.entities.push_back(EntityInText(
+			EntityType::MentionName,
+			0,
+			name.size(),
+			TextUtilities::MentionNameDataFromFields({
+				.selfId = session->userId().bare,
+				.userId = tone.authorId.bare,
+				.accessHash = user->accessHash(),
+			})));
+		auto createdBy = tr::lng_ai_compose_tone_preview_created_by(
+			tr::now,
+			lt_user,
+			std::move(mention),
+			tr::marked);
+		if (!text.empty()) {
+			text.append(' ').append(std::move(createdBy));
+		} else {
+			text = std::move(createdBy);
+		}
+	}
+	if (!text.empty()) {
+		const auto attribution = body->add(
+			object_ptr<Ui::FlatLabel>(body, st::aiTonePreviewAttributionLabel),
+			st::aiTonePreviewAttributionMargin,
+			style::al_top);
+		attribution->setMarkedText(
+			std::move(text),
+			Core::TextContext({ .session = session }));
+		attribution->setClickHandlerFilter([=](
+				const ClickHandlerPtr &handler,
+				Qt::MouseButton button) {
+			ActivateClickHandler(attribution, handler, ClickContext{
+				.button = button,
+				.other = QVariant::fromValue(ClickHandlerContext{
+					.sessionWindow = controller,
+				}),
+			});
+			return false;
+		});
+	}
+	if (const auto shortcutText = Api::AiApplyShortcutText()
+			; !tone.slug.isEmpty() && !shortcutText.isEmpty()) {
+		const auto label = tr::lng_ai_compose_bind_use_hotkey(
+			tr::now,
+			lt_keys,
+			shortcutText);
+		const auto checkbox = body->add(
+			object_ptr<Ui::Checkbox>(
+				body,
+				label,
+				st::aiComposeEmojifyCheckbox,
+				std::make_unique<Ui::RoundCheckView>(
+					st::defaultCheck,
+					BoundsToThisTone(tone))),
+			st::aiToneAuthorCheckboxMargin,
+			style::al_top);
+		checkbox->checkedChanges(
+		) | rpl::on_next([=](bool toggled) {
+			if (toggled) {
+				Api::SetAiApplyBoundSlug(tone.slug);
+			} else if (BoundsToThisTone(tone)) {
+				Api::ClearAiApplyBoundSlug();
+			}
+		}, checkbox->lifetime());
+	}
+
+	Ui::AddSkip(body, st::aiTonePreviewBottomSkip);
+
+	const auto installedTone = FindInstalledCustomTone(session, tone);
+
+	if (installedTone) {
+		const auto remove = box->addButton(
+			installedTone->creator
+				? tr::lng_ai_compose_tone_delete()
+				: tr::lng_ai_compose_tone_remove(),
+			[=] {
+				const auto show = box->uiShow();
+				ConfirmDeleteAiTone(
+					show,
+					session,
+					*installedTone,
+					crl::guard(box, [=] {
+						box->closeBox();
+						ShowToneRemovedToast(show, installedTone->creator);
+					}));
+			},
+			st::aiToneDeleteButton);
+		remove->setFullRadius(true);
+	} else {
+		const auto add = box->addButton(
+			tr::lng_ai_compose_tone_preview_add(),
+			[=] {
+				const auto show = box->uiShow();
+				session->data().aiComposeTones().save(
+					tone,
+					false,
+					crl::guard(box, [=] {
+						box->closeBox();
+						ShowToneAddedToast(show, session, tone);
+					}),
+					crl::guard(box, [=](const MTP::Error &error) {
+						if (error.type() == u"TONES_SAVED_TOO_MANY"_q) {
+							ShowAiComposeToneLimitError(show, session);
+						} else if (!MTP::IgnoreError(error)) {
+							box->showToast(error.type());
+						}
+					}));
+			});
+		add->setFullRadius(true);
+	}
+}
diff --git a/Telegram/SourceFiles/boxes/preview_ai_tone_box.h b/Telegram/SourceFiles/boxes/preview_ai_tone_box.h
new file mode 100644
index 00000000000000..d4d912231c8ac6
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/preview_ai_tone_box.h
@@ -0,0 +1,32 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/weak_ptr.h"
+
+namespace Data {
+struct AiComposeTone;
+} // namespace Data
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+void PreviewAiToneBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Main::Session*> session,
+	Data::AiComposeTone tone,
+	base::weak_ptr<Window::SessionController> controller);
diff --git a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
index 8a71e395b89d19..873a6f16e93c0c 100644
--- a/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
+++ b/Telegram/SourceFiles/boxes/reactions_settings_box.cpp
@@ -21,8 +21,10 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_fake_items.h"
 #include "lang/lang_keys.h"
 #include "boxes/premium_preview_box.h"
+#include "chat_helpers/emoji_list_widget.h"
+#include "chat_helpers/tabbed_selector.h"
 #include "main/main_session.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/effects/scroll_content_shadow.h"
@@ -35,9 +37,11 @@ For license and copyright information please follow this link:
 #include "ui/painter.h"
 #include "ui/vertical_list.h"
 #include "window/section_widget.h"
+#include "window/themes/window_theme.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 #include "styles/style_media_player.h" // mediaPlayerMenuCheck
 #include "styles/style_settings.h"
@@ -118,7 +122,7 @@ void AddMessage(
 	widget->widthValue(
 	) | rpl::filter(
 		rpl::mappers::_1 >= (st::historyMinimalWidth / 2)
-	) | rpl::start_with_next(updateWidgetSize, widget->lifetime());
+	) | rpl::on_next(updateWidgetSize, widget->lifetime());
 	updateWidgetSize(width);
 
 	const auto rightSize = st::settingsReactionCornerSize;
@@ -134,21 +138,26 @@ void AddMessage(
 			rightSize.height()).translated(st::settingsReactionCornerSkip);
 	};
 
+	using ThemePtr = std::unique_ptr<Ui::ChatTheme>;
+	const auto theme = widget->lifetime().make_state<ThemePtr>(
+		Window::Theme::DefaultChatThemeOn(widget->lifetime()));
 	widget->paintRequest(
-	) | rpl::start_with_next([=](const QRect &rect) {
+	) | rpl::on_next([=](const QRect &rect) {
+		Painter p(widget);
+		p.setClipRect(rect);
 		Window::SectionWidget::PaintBackground(
-			controller,
-			controller->defaultChatTheme().get(), // #TODO themes
-			widget,
+			p,
+			theme->get(),
+			QSize(widget->width(), widget->window()->height()),
 			rect);
 
-		Painter p(widget);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto theme = controller->defaultChatTheme().get();
 		auto context = theme->preparePaintContext(
 			state->style.get(),
 			widget->rect(),
 			widget->rect(),
+			widget->rect(),
 			controller->isGifPausedAtLeastFor(
 				Window::GifPauseReason::Layer));
 		context.outbg = view->hasOutLayout();
@@ -173,7 +182,7 @@ void AddMessage(
 	auto selectedId = rpl::duplicate(idValue);
 	std::move(
 		selectedId
-	) | rpl::start_with_next([
+	) | rpl::on_next([
 		=,
 		idValue = std::move(idValue),
 		iconSize = st::settingsReactionMessageSize
@@ -242,14 +251,14 @@ not_null<Ui::RpWidget*> AddReactionIconWrap(
 
 	std::move(
 		iconPositionValue
-	) | rpl::start_with_next([=](const QPoint &point) {
+	) | rpl::on_next([=](const QPoint &point) {
 		widget->moveToLeft(point.x(), point.y());
 	}, widget->lifetime());
 
 	const auto update = crl::guard(widget, [=] { widget->update(); });
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(widget);
 
 		if (state->finalAnimation.animating()) {
@@ -269,7 +278,7 @@ not_null<Ui::RpWidget*> AddReactionIconWrap(
 
 	std::move(
 		destroys
-	) | rpl::take(1) | rpl::start_with_next([=, from = 0., to = 1.] {
+	) | rpl::take(1) | rpl::on_next([=, from = 0., to = 1.] {
 		state->finalAnimation.start(
 			[=](float64 value) {
 				update();
@@ -316,7 +325,7 @@ void AddReactionAnimatedIcon(
 	state->select.media->checkStickerLarge();
 	rpl::single() | rpl::then(
 		reaction.appearAnimation->session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto check = [&](State::Entry &entry) {
 			if (!entry.media) {
 				return true;
@@ -330,6 +339,8 @@ void AddReactionAnimatedIcon(
 			return true;
 		};
 		if (check(state->select) && check(state->appear)) {
+			state->select.icon->setCustomEndFrame(1);
+			state->select.icon->animate([] {});
 			state->loadingLifetime.destroy();
 		}
 	}, state->loadingLifetime);
@@ -353,6 +364,11 @@ void AddReactionAnimatedIcon(
 		}
 		if (appear && appear->animating()) {
 			paintFrame(appear);
+			if (appear->frameIndex() == appear->framesCount() - 1) {
+				if (const auto select = state->select.icon.get()) {
+					select->setCustomEndFrame(select->framesCount() - 1);
+				}
+			}
 		} else if (const auto select = state->select.icon.get()) {
 			paintFrame(select);
 		}
@@ -367,7 +383,7 @@ void AddReactionAnimatedIcon(
 
 	std::move(
 		selects
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto select = state->select.icon.get();
 		if (select && !select->animating()) {
 			select->animate(crl::guard(widget, [=] { widget->update(); }));
@@ -441,11 +457,61 @@ void ReactionsSettingsBox(
 
 	const auto container = box->verticalLayout();
 
+	box->setTitle(tr::lng_settings_chat_reactions_title());
+	box->setWidth(st::boxWideWidth);
+	box->addButton(tr::lng_settings_save(), [=] {
+		const auto &data = controller->session().data();
+		const auto selectedId = state->selectedId.current();
+		if (data.reactions().favoriteId() != selectedId) {
+			data.reactions().setFavorite(selectedId);
+		}
+		box->closeBox();
+	});
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+
+	if (controller->session().premium()) {
+		using Selector = ChatHelpers::TabbedSelector;
+		const auto selector = container->add(
+			object_ptr<Selector>(
+				container,
+				controller->uiShow(),
+				Window::GifPauseReason::Layer,
+				Selector::Mode::FullReactions),
+			style::margins());
+		selector->setAllowEmojiWithoutPremium(false);
+		selector->setRoundRadius(0);
+		selector->resize(st::boxWideWidth, st::emojiPanMinHeight);
+
+		const auto docToReaction = box->lifetime().make_state<
+			base::flat_map<DocumentId, Data::ReactionId>>();
+		auto recentIds = std::vector<DocumentId>();
+		for (const auto &r
+			: reactions.list(Data::Reactions::Type::Active)) {
+			const auto docId = r.selectAnimation->id;
+			recentIds.push_back(docId);
+			docToReaction->emplace(docId, r.id);
+		}
+		selector->provideRecentEmoji(
+			ChatHelpers::DocumentListToRecent(recentIds));
+
+		selector->customEmojiChosen(
+		) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+			const auto docId = data.document->id;
+			const auto it = docToReaction->find(docId);
+			if (it != docToReaction->end()) {
+				state->selectedId = it->second;
+			} else {
+				state->selectedId = Data::ReactionId{ docId };
+			}
+		}, selector->lifetime());
+		return;
+	}
+
 	const auto check = Ui::CreateChild<Ui::RpWidget>(container.get());
 	check->resize(st::settingsReactionCornerSize);
 	check->setAttribute(Qt::WA_TransparentForMouseEvents);
 	check->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(check);
 		st::mediaPlayerMenuCheck.paintInCenter(p, check->rect());
 	}, check->lifetime());
@@ -510,21 +576,9 @@ void ReactionsSettingsBox(
 		firstCheckedButton->geometryValue(
 		) | rpl::filter([=](const QRect &r) {
 			return r.isValid();
-		}) | rpl::take(1) | rpl::start_with_next([=] {
+		}) | rpl::take(1) | rpl::on_next([=] {
 			checkButton(firstCheckedButton);
 		}, firstCheckedButton->lifetime());
 	}
 	check->raise();
-
-	box->setTitle(tr::lng_settings_chat_reactions_title());
-	box->setWidth(st::boxWideWidth);
-	box->addButton(tr::lng_settings_save(), [=] {
-		const auto &data = controller->session().data();
-		const auto selectedId = state->selectedId.current();
-		if (data.reactions().favoriteId() != selectedId) {
-			data.reactions().setFavorite(selectedId);
-		}
-		box->closeBox();
-	});
-	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
diff --git a/Telegram/SourceFiles/boxes/report_messages_box.cpp b/Telegram/SourceFiles/boxes/report_messages_box.cpp
index bac19fbf4c303f..08ac9e4f2f3e63 100644
--- a/Telegram/SourceFiles/boxes/report_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/report_messages_box.cpp
@@ -27,13 +27,11 @@ For license and copyright information please follow this link:
 
 namespace {
 
-[[nodiscard]] object_ptr<Ui::BoxContent> Report(
+[[nodiscard]] object_ptr<Ui::BoxContent> ReportPhoto(
 		not_null<PeerData*> peer,
-		std::variant<v::null_t, not_null<PhotoData*>> data,
+		not_null<PhotoData*> photo,
 		const style::ReportBox *stOverride) {
-	const auto source = v::match(data, [](const MessageIdsList &ids) {
-		return Ui::ReportSource::Message;
-	}, [&](not_null<PhotoData*> photo) {
+	const auto source = [&] {
 		return peer->isUser()
 			? (photo->hasVideo()
 				? Ui::ReportSource::ProfileVideo
@@ -45,19 +43,14 @@ namespace {
 			: (photo->hasVideo()
 				? Ui::ReportSource::ChannelVideo
 				: Ui::ReportSource::ChannelPhoto);
-	}, [&](StoryId id) {
-		return Ui::ReportSource::Story;
-	}, [](v::null_t) {
-		Unexpected("Bad source report.");
-		return Ui::ReportSource::Bot;
-	});
+	}();
 	const auto st = stOverride ? stOverride : &st::defaultReportBox;
 	return Box([=](not_null<Ui::GenericBox*> box) {
 		const auto show = box->uiShow();
 		Ui::ReportReasonBox(box, *st, source, [=](Ui::ReportReason reason) {
 			show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
 				Ui::ReportDetailsBox(box, *st, [=](const QString &text) {
-					Api::SendReport(show, peer, reason, text, data);
+					Api::SendPhotoReport(show, peer, reason, text, photo);
 					show->hideLayer();
 				});
 			}));
@@ -70,7 +63,7 @@ namespace {
 object_ptr<Ui::BoxContent> ReportProfilePhotoBox(
 		not_null<PeerData*> peer,
 		not_null<PhotoData*> photo) {
-	return Report(peer, photo, nullptr);
+	return ReportPhoto(peer, photo, nullptr);
 }
 
 void ShowReportMessageBox(
@@ -86,7 +79,6 @@ void ShowReportMessageBox(
 	auto performRequest = [=](
 			const auto &repeatRequest,
 			Data::ReportInput reportInput) -> void {
-		constexpr auto kToastDuration = crl::time(4000);
 		report(reportInput, [=](const Api::ReportResult &result) {
 			if (!result.error.isEmpty()) {
 				if (result.error == u"MESSAGE_ID_REQUIRED"_q) {
@@ -113,11 +105,9 @@ void ShowReportMessageBox(
 			}
 			if (!result.options.empty() || result.commentOption) {
 				show->show(Box([=](not_null<Ui::GenericBox*> box) {
-					box->setTitle(
-						rpl::single(
-							result.title.isEmpty()
-								? reportInput.optionText
-								: result.title));
+					box->setTitle(result.title.isEmpty()
+						? reportInput.optionText
+						: result.title);
 
 					for (const auto &option : result.options) {
 						const auto button = Ui::AddReportOptionButton(
@@ -155,8 +145,7 @@ void ShowReportMessageBox(
 							auto label = object_ptr<Ui::FlatLabel>(
 								container,
 								tr::lng_report_details_message_about(),
-								st::boxDividerLabel);
-							label->setTextColorOverride(st->dividerFg->c);
+								st->divider.label);
 							using namespace Ui;
 							const auto widget = container->add(
 								object_ptr<PaddingWrap<>>(
@@ -167,11 +156,11 @@ void ShowReportMessageBox(
 								= CreateChild<BoxContentDivider>(
 									widget,
 									st::boxDividerHeight,
-									st->dividerBg,
+									st->divider.bar,
 									RectPart::Top | RectPart::Bottom);
 							background->lower();
 							widget->sizeValue(
-							) | rpl::start_with_next([=](const QSize &s) {
+							) | rpl::on_next([=](const QSize &s) {
 								background->resize(s);
 							}, background->lifetime());
 						}
@@ -192,7 +181,7 @@ void ShowReportMessageBox(
 							repeatRequest(repeatRequest, std::move(copy));
 						};
 						details->submits(
-						) | rpl::start_with_next(submit, details->lifetime());
+						) | rpl::on_next(submit, details->lifetime());
 						box->addButton(tr::lng_report_button(), submit);
 					} else {
 						box->addButton(
@@ -206,6 +195,7 @@ void ShowReportMessageBox(
 					}
 				}));
 			} else if (result.successful) {
+				constexpr auto kToastDuration = crl::time(4000);
 				show->showToast(
 					tr::lng_report_thanks(tr::now),
 					kToastDuration);
diff --git a/Telegram/SourceFiles/boxes/ringtones_box.cpp b/Telegram/SourceFiles/boxes/ringtones_box.cpp
index 4c299c162b76cf..364cc1245af826 100644
--- a/Telegram/SourceFiles/boxes/ringtones_box.cpp
+++ b/Telegram/SourceFiles/boxes/ringtones_box.cpp
@@ -7,8 +7,11 @@ For license and copyright information please follow this link:
 */
 #include "boxes/ringtones_box.h"
 
+#include "data/notify/data_peer_notify_volume.h"
+#include "data/notify/data_peer_notify_settings.h"
 #include "api/api_ringtones.h"
 #include "apiwrap.h"
+#include "ui/widgets/continuous_sliders.h"
 #include "base/call_delayed.h"
 #include "base/event_filter.h"
 #include "base/timer_rpl.h"
@@ -21,11 +24,14 @@ For license and copyright information please follow this link:
 #include "data/data_document_media.h"
 #include "data/data_document_resolver.h"
 #include "data/data_thread.h"
+#include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/notify/data_notify_settings.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "main/main_session_settings.h"
 #include "media/audio/media_audio.h"
+#include "ui/wrap/slide_wrap.h"
 #include "platform/platform_notifications_manager.h"
 #include "settings/settings_common.h"
 #include "ui/boxes/confirm_box.h"
@@ -66,7 +72,7 @@ AudioCreator::AudioCreator()
 	});
 	base::timer_each(
 		kNoDetachTimeout
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Media::Audio::StopDetachIfNotUsedSafe();
 	}, _lifetime);
 }
@@ -111,7 +117,8 @@ void RingtonesBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session,
 		Data::NotifySound selected,
-		Fn<void(Data::NotifySound)> save) {
+		Fn<void(Data::NotifySound)> save,
+		Data::VolumeController volumeController) {
 	box->setTitle(tr::lng_ringtones_box_title());
 
 	const auto container = box->verticalLayout();
@@ -128,12 +135,17 @@ void RingtonesBox(
 		QPointer<Ui::Radiobutton> defaultButton;
 		QPointer<Ui::Radiobutton> chosenButton;
 		std::vector<QPointer<Ui::Radiobutton>> buttons;
+		ushort presavedVolume = 0;
 	};
 	const auto state = container->lifetime().make_state<State>(State{
 		.group = std::make_shared<Ui::RadiobuttonGroup>(),
 		.chosen = selected,
 	});
 
+	const auto volumeOverride = [volume = volumeController.volume] {
+		return volume ? (0.01 * volume()) : -1;
+	};
+
 	const auto addToGroup = [=](
 			not_null<Ui::VerticalLayout*> verticalLayout,
 			int value,
@@ -156,7 +168,10 @@ void RingtonesBox(
 		if (value == kDefaultValue) {
 			state->defaultButton = button;
 			button->setClickedCallback([=] {
-				Core::App().notifications().playSound(session, 0);
+				Core::App().notifications().playSound(
+					session,
+					0,
+					volumeOverride());
 			});
 		}
 		if (value < 0) {
@@ -170,7 +185,8 @@ void RingtonesBox(
 			if (media->loaded()) {
 				Core::App().notifications().playSound(
 					session,
-					media->owner()->id);
+					media->owner()->id,
+					volumeOverride());
 			}
 		});
 		base::install_event_filter(button, [=](not_null<QEvent*> e) {
@@ -194,7 +210,7 @@ void RingtonesBox(
 	};
 
 	session->api().ringtones().uploadFails(
-	) | rpl::start_with_next([=](const QString &error) {
+	) | rpl::on_next([=](const QString &error) {
 		if ((error == u"RINGTONE_DURATION_TOO_LONG"_q)) {
 			box->getDelegate()->show(Ui::MakeInformBox(
 				tr::lng_ringtones_error_max_duration(
@@ -258,10 +274,10 @@ void RingtonesBox(
 	};
 
 	session->api().ringtones().listUpdates(
-	) | rpl::start_with_next(rebuild, container->lifetime());
+	) | rpl::on_next(rebuild, container->lifetime());
 
 	session->api().ringtones().uploadDones(
-	) | rpl::start_with_next([=](DocumentId id) {
+	) | rpl::on_next([=](DocumentId id) {
 		state->chosen = Data::NotifySound{ .id = id };
 		rebuild();
 	}, container->lifetime());
@@ -320,6 +336,31 @@ void RingtonesBox(
 		}));
 	});
 
+	if (volumeController.volume && volumeController.saveVolume) {
+		auto saveAndTestVolume = [=](ushort currentVolume) {
+			state->presavedVolume = currentVolume;
+			const auto value = state->group->current();
+			if (value != kNoSoundValue) {
+				Core::App().notifications().playSound(
+					session,
+					(value == kDefaultValue)
+						? 0
+						: state->medias[value]->owner()->id,
+					0.01 * currentVolume);
+			}
+		};
+		Ui::AddRingtonesVolumeSlider(
+			container,
+			state->group->value() | rpl::map([=](int value) {
+				return value != kNoSoundValue;
+			}),
+			tr::lng_ringtones_box_volume(),
+			Data::VolumeController{
+				base::take(volumeController.volume),
+				std::move(saveAndTestVolume),
+			});
+	}
+
 	box->addSkip(st::ringtonesBoxSkip);
 	Ui::AddDividerText(container, tr::lng_ringtones_box_about());
 
@@ -333,6 +374,9 @@ void RingtonesBox(
 			: (value == kNoSoundValue)
 			? Data::NotifySound{ .none = true }
 			: Data::NotifySound{ .id = state->medias[value]->owner()->id };
+		if (state->presavedVolume) {
+			volumeController.saveVolume(state->presavedVolume);
+		}
 		save(sound);
 		box->closeBox();
 	});
@@ -345,5 +389,5 @@ void ThreadRingtonesBox(
 	const auto now = thread->owner().notifySettings().sound(thread);
 	RingtonesBox(box, &thread->session(), now, [=](Data::NotifySound sound) {
 		thread->owner().notifySettings().update(thread, {}, {}, sound);
-	});
+	}, Data::ThreadRingtonesVolumeController(thread));
 }
diff --git a/Telegram/SourceFiles/boxes/ringtones_box.h b/Telegram/SourceFiles/boxes/ringtones_box.h
index 13599efea0d187..bbc9349767d524 100644
--- a/Telegram/SourceFiles/boxes/ringtones_box.h
+++ b/Telegram/SourceFiles/boxes/ringtones_box.h
@@ -12,6 +12,8 @@ For license and copyright information please follow this link:
 namespace Data {
 struct NotifySound;
 class Thread;
+enum class DefaultNotify : uint8_t;
+struct VolumeController;
 } // namespace Data
 
 namespace Main {
@@ -28,7 +30,8 @@ void RingtonesBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Main::Session*> session,
 	Data::NotifySound selected,
-	Fn<void(Data::NotifySound)> save);
+	Fn<void(Data::NotifySound)> save,
+	Data::VolumeController volumeController);
 
 void ThreadRingtonesBox(
 	not_null<Ui::GenericBox*> box,
diff --git a/Telegram/SourceFiles/boxes/select_future_owner_box.cpp b/Telegram/SourceFiles/boxes/select_future_owner_box.cpp
new file mode 100644
index 00000000000000..6b7967ad4f8467
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/select_future_owner_box.cpp
@@ -0,0 +1,526 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/select_future_owner_box.h"
+
+#include "api/api_chat_participants.h"
+#include "api/api_cloud_password.h"
+#include "apiwrap.h"
+#include "base/unixtime.h"
+#include "boxes/filters/edit_filter_chats_list.h"
+#include "boxes/passcode_box.h"
+#include "boxes/peer_list_controllers.h"
+#include "boxes/peer_lists_box.h"
+#include "boxes/peers/replace_boost_box.h" // CreateUserpicsTransfer.
+#include "core/application.h"
+#include "core/core_cloud_password.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "dialogs/ui/chat_search_empty.h"
+#include "boxes/peers/channel_ownership_transfer.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "info/profile/info_profile_values.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/format_values.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+
+namespace {
+
+enum class ParticipantType {
+	Admins,
+	Members
+};
+
+class FutureOwnerController : public PeerListController {
+public:
+	void rowClicked(not_null<PeerListRow*> row) override;
+	void itemDeselectedHook(not_null<PeerData*> peer) override;
+
+	void setOnRowClicked(Fn<void()> callback);
+	rpl::producer<> itemDeselected() const;
+
+private:
+	Fn<void()> _onRowClicked;
+	rpl::event_stream<> _itemDeselected;
+
+};
+
+void FutureOwnerController::setOnRowClicked(Fn<void()> callback) {
+	_onRowClicked = callback;
+}
+
+void FutureOwnerController::rowClicked(not_null<PeerListRow*> row) {
+	delegate()->peerListSetRowChecked(
+		row,
+		!delegate()->peerListIsRowChecked(row));
+	for (auto i = 0; i < delegate()->peerListFullRowsCount(); ++i) {
+		auto r = delegate()->peerListRowAt(i);
+		if (r != row) {
+			delegate()->peerListSetRowChecked(r, false);
+		}
+	}
+	if (_onRowClicked) {
+		_onRowClicked();
+	}
+}
+
+void FutureOwnerController::itemDeselectedHook(not_null<PeerData*> peer) {
+	_itemDeselected.fire({});
+}
+
+rpl::producer<> FutureOwnerController::itemDeselected() const {
+	return _itemDeselected.events();
+}
+
+class ParticipantsController : public FutureOwnerController {
+public:
+	ParticipantsController(
+		not_null<ChannelData*> channel,
+		ParticipantType type);
+
+	Main::Session &session() const override;
+	void prepare() override;
+	void loadMoreRows() override;
+
+private:
+	const not_null<ChannelData*> _channel;
+	const ParticipantType _type;
+	MTP::Sender _api;
+
+	mtpRequestId _loadRequestId = 0;
+	int _offset = 0;
+	bool _allLoaded = false;
+
+};
+
+ParticipantsController::ParticipantsController(
+	not_null<ChannelData*> channel,
+	ParticipantType type)
+: _channel(channel)
+, _type(type)
+, _api(&channel->session().mtp()) {
+}
+
+Main::Session &ParticipantsController::session() const {
+	return _channel->session();
+}
+
+void ParticipantsController::prepare() {
+	loadMoreRows();
+}
+
+void ParticipantsController::loadMoreRows() {
+	if (_loadRequestId || _allLoaded) {
+		return;
+	}
+
+	const auto perPage = (_offset > 0) ? 200 : 50;
+	const auto participantsHash = uint64(0);
+	const auto filter = (_type == ParticipantType::Admins)
+		? MTP_channelParticipantsAdmins()
+		: MTP_channelParticipantsRecent();
+
+	_loadRequestId = _api.request(MTPchannels_GetParticipants(
+		_channel->inputChannel(),
+		filter,
+		MTP_int(_offset),
+		MTP_int(perPage),
+		MTP_long(participantsHash)
+	)).done([=](const MTPchannels_ChannelParticipants &result) {
+		_loadRequestId = 0;
+		auto added = false;
+
+		result.match([&](const MTPDchannels_channelParticipants &data) {
+			const auto &[availableCount, list] = Api::ChatParticipants::Parse(
+				_channel,
+				data);
+			for (const auto &participant : list) {
+				if (const auto user = _channel->owner().userLoaded(
+						participant.userId())) {
+					if (delegate()->peerListFindRow(user->id.value)) {
+						continue;
+					}
+					if (user->isBot()) {
+						continue;
+					}
+					using Type = Api::ChatParticipant::Type;
+					if ((participant.type() == Type::Creator)
+						|| (_type == ParticipantType::Members
+							&& (participant.type() == Type::Admin))) {
+						continue;
+					}
+					auto row = std::make_unique<PeerListRow>(user);
+					const auto promotedSince = participant.promotedSince();
+					row->setCustomStatus(
+						(promotedSince
+							? tr::lng_select_next_owner_box_status_promoted
+							: tr::lng_select_next_owner_box_status_joined)(
+							tr::now,
+							lt_date,
+							Ui::FormatDateTime(
+								base::unixtime::parse(promotedSince
+									? promotedSince
+									: participant.memberSince()))));
+					delegate()->peerListAppendRow(std::move(row));
+					added = true;
+				}
+			}
+			if (const auto size = list.size()) {
+				_offset += size;
+			} else {
+				_allLoaded = true;
+			}
+		}, [](const MTPDchannels_channelParticipantsNotModified &) {
+		});
+
+		if (!added && _offset > 0) {
+			_allLoaded = true;
+		}
+		delegate()->peerListRefreshRows();
+	}).fail([=] {
+		_loadRequestId = 0;
+	}).send();
+}
+
+class LegacyParticipantsController : public FutureOwnerController {
+public:
+	LegacyParticipantsController(
+		not_null<ChatData*> chat,
+		ParticipantType type);
+
+	Main::Session &session() const override;
+	void prepare() override;
+	void loadMoreRows() override;
+
+private:
+	const not_null<ChatData*> _chat;
+	const ParticipantType _type;
+
+};
+
+LegacyParticipantsController::LegacyParticipantsController(
+	not_null<ChatData*> chat,
+	ParticipantType type)
+: _chat(chat)
+, _type(type) {
+}
+
+Main::Session &LegacyParticipantsController::session() const {
+	return _chat->session();
+}
+
+void LegacyParticipantsController::prepare() {
+	if (_chat->noParticipantInfo()) {
+		_chat->updateFullForced();
+	}
+	const auto &source = (_type == ParticipantType::Admins)
+		? _chat->admins
+		: _chat->participants;
+	for (const auto &user : source) {
+		if (user->isBot()) {
+			continue;
+		}
+		if (user->id == peerFromUser(_chat->creator)) {
+			continue;
+		}
+		if (_type == ParticipantType::Members
+			&& _chat->admins.contains(user)) {
+			continue;
+		}
+		delegate()->peerListAppendRow(
+			std::make_unique<PeerListRow>(user));
+	}
+	delegate()->peerListRefreshRows();
+}
+
+void LegacyParticipantsController::loadMoreRows() {
+}
+
+} // namespace
+
+void SelectFutureOwnerbox(
+		not_null<Ui::GenericBox*> box,
+		not_null<PeerData*> peer,
+		not_null<UserData*> user) {
+	const auto content = box->verticalLayout();
+	const auto channel = peer->asChannel();
+	const auto chat = peer->asChat();
+	const auto isGroup = peer->isMegagroup() || peer->isChat();
+	const auto isLegacy = (chat != nullptr);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	content->add(
+		CreateUserpicsTransfer(
+			content,
+			rpl::single(std::vector<not_null<PeerData*>>{
+				user->session().user(),
+				peer,
+			}),
+			user,
+			UserpicsTransferType::ChannelFutureOwner),
+		st::boxRowPadding);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			isGroup
+				? tr::lng_leave_next_owner_box_title_group()
+				: tr::lng_leave_next_owner_box_title(),
+			box->getDelegate()->style().title),
+		st::boxRowPadding);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	const auto adminsCount = [&] {
+		if (channel) {
+			return channel->adminsCount();
+		} else if (chat) {
+			return int(chat->admins.size()) + 1;
+		}
+		return 0;
+	}();
+	const auto adminsAreEqual = (adminsCount <= 1);
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			(isLegacy
+				? (adminsAreEqual
+					? tr::lng_leave_next_owner_box_about_legacy
+					: tr::lng_leave_next_owner_box_about_admin_legacy)
+				: (adminsAreEqual
+					? tr::lng_leave_next_owner_box_about
+					: tr::lng_leave_next_owner_box_about_admin))(
+					lt_user,
+					Info::Profile::NameValue(user) | rpl::map(tr::marked),
+					lt_chat,
+					Info::Profile::NameValue(peer) | rpl::map(tr::marked),
+					tr::rich),
+			st::boxLabel),
+		st::boxRowPadding);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	const auto select = content->add(
+		object_ptr<Ui::RoundButton>(
+			content,
+			!adminsAreEqual
+				? tr::lng_select_next_owner_box()
+				: tr::lng_select_next_owner_box_admin(),
+			st::defaultLightButton),
+		st::boxRowPadding,
+		style::al_justify);
+	Ui::AddSkip(content);
+	const auto cancel = content->add(
+		object_ptr<Ui::RoundButton>(
+			content,
+			tr::lng_cancel(),
+			st::defaultLightButton),
+		st::boxRowPadding,
+		style::al_justify);
+	cancel->setClickedCallback([=] {
+		box->closeBox();
+	});
+	Ui::AddSkip(content);
+	const auto leave = content->add(
+		object_ptr<Ui::RoundButton>(
+			content,
+			isGroup
+				? tr::lng_profile_leave_group()
+				: tr::lng_profile_leave_channel(),
+			st::attentionBoxButton),
+		st::boxRowPadding,
+		style::al_justify);
+	leave->setClickedCallback([=, revoke = false] {
+		peer->session().api().deleteConversation(peer, revoke);
+		box->closeBox();
+	});
+	select->setClickedCallback([=] {
+		const auto window = Core::App().findWindow(box);
+		const auto sessionController = window
+			? window->sessionController()
+			: nullptr;
+		if (!sessionController) {
+			return;
+		}
+
+		using Pair = std::pair<
+			std::unique_ptr<FutureOwnerController>,
+			std::unique_ptr<FutureOwnerController>>;
+		auto makeControllers = [&]() -> Pair {
+			if (channel) {
+				return {
+					std::make_unique<ParticipantsController>(
+						channel,
+						ParticipantType::Admins),
+					std::make_unique<ParticipantsController>(
+						channel,
+						ParticipantType::Members),
+				};
+			} else {
+				return {
+					std::make_unique<LegacyParticipantsController>(
+						chat,
+						ParticipantType::Admins),
+					std::make_unique<LegacyParticipantsController>(
+						chat,
+						ParticipantType::Members),
+				};
+			}
+		};
+		auto [adminsOwned, membersOwned] = makeControllers();
+		const auto admins = adminsOwned.get();
+		const auto members = membersOwned.get();
+
+		auto initBox = [=](not_null<PeerListsBox*> selectBox) {
+			struct State {
+				base::unique_qptr<Dialogs::SearchEmpty> noLists;
+				rpl::event_stream<> selectionChanges;
+			};
+			const auto state = selectBox->lifetime().make_state<State>();
+			const auto uncheckOtherList = [=](
+					not_null<PeerListController*> otherController) {
+				auto delegate = otherController->delegate();
+				const auto full = delegate->peerListFullRowsCount();
+				for (auto i = 0; i < full; ++i) {
+					delegate->peerListSetRowChecked(
+						delegate->peerListRowAt(i),
+						false);
+				}
+				state->selectionChanges.fire({});
+			};
+			admins->setOnRowClicked([=] { uncheckOtherList(members); });
+			members->setOnRowClicked([=] { uncheckOtherList(admins); });
+			selectBox->setTitle(!adminsAreEqual
+				? tr::lng_select_next_owner_box_title()
+				: tr::lng_select_next_owner_box_title_admin());
+			const auto searchEnabled = PeerListSearchMode::Enabled;
+			admins->delegate()->peerListSetSearchMode(searchEnabled);
+			members->delegate()->peerListSetSearchMode(searchEnabled);
+			rpl::merge(
+				admins->itemDeselected(),
+				members->itemDeselected()
+			) | rpl::on_next([=] {
+				state->selectionChanges.fire({});
+			}, selectBox->lifetime());
+			const auto separatorAdmins = selectBox->addSeparatorBefore(
+				0,
+				CreatePeerListSectionSubtitle(
+					selectBox,
+					!isGroup
+						? tr::lng_select_next_owner_box_sub_admins()
+						: tr::lng_select_next_owner_box_sub_admins_group()));
+			const auto separatorMembers = selectBox->addSeparatorBefore(
+				1,
+				CreatePeerListSectionSubtitle(
+					selectBox,
+					!isGroup
+						? tr::lng_select_next_owner_box_sub_members()
+						: tr::lng_select_next_owner_box_sub_members_group()));
+			rpl::combine(
+				separatorAdmins->heightValue(),
+				separatorMembers->heightValue()
+			) | rpl::map(
+				(rpl::mappers::_1 + rpl::mappers::_2) > 0
+			) | rpl::distinct_until_changed() | rpl::on_next([=](bool has) {
+				qDebug() << "has" << has;
+				if (has) {
+					state->noLists = nullptr;
+					return;
+				}
+				using namespace Dialogs;
+				state->noLists = base::make_unique_q<SearchEmpty>(
+					selectBox,
+					SearchEmpty::Icon::NoResults,
+					(adminsAreEqual
+						? tr::lng_select_next_owner_box_empty_list
+						: tr::lng_select_next_owner_box_empty_list_admin)(
+							tr::rich));
+				state->noLists->show();
+				state->noLists->raise();
+				selectBox->sizeValue(
+				) | rpl::filter_size() | rpl::on_next([=](QSize s) {
+					state->noLists->setMinimalHeight(s.height() / 3);
+					state->noLists->resizeToWidth(s.width() / 3 * 2);
+					state->noLists->moveToLeft(
+						(s.width() - state->noLists->width()) / 2,
+						(s.height() - state->noLists->height()) / 2);
+				}, state->noLists->lifetime());
+				crl::on_main(state->noLists.get(), [=] {
+					state->noLists->animate();
+				});
+			}, selectBox->lifetime());
+			{
+				const auto &st = st::futureOwnerBoxSelect;
+				selectBox->setStyle(st);
+				auto button = object_ptr<Ui::RoundButton>(
+					selectBox,
+					rpl::conditional(
+						state->selectionChanges.events(
+						) | rpl::map([=] {
+							return !selectBox->collectSelectedRows().empty();
+						}),
+						tr::lng_select_next_owner_box_confirm(),
+						tr::lng_close()),
+					st::defaultActiveButton);
+				const auto raw = button.data();
+				rpl::combine(
+					state->selectionChanges.events() | rpl::map_to(0),
+					selectBox->widthValue()
+				) | rpl::on_next([=](int, int width) {
+					raw->resizeToWidth(width
+						- st.buttonPadding.left()
+						- st.buttonPadding.right());
+				}, selectBox->lifetime());
+				button->setFullRadius(true);
+				button->setClickedCallback([=] {
+					const auto selected = selectBox->collectSelectedRows();
+					if (selected.empty()) {
+						return selectBox->closeBox();
+					}
+					if (const auto user = selected.front()->asUser()) {
+						auto &lifetime = selectBox->lifetime();
+						lifetime.make_state<ChannelOwnershipTransfer>(
+							peer,
+							user,
+							selectBox->uiShow(),
+							[=](std::shared_ptr<Ui::Show> show) {
+								const auto revoke = false;
+								peer->session().api().deleteConversation(
+									peer,
+									revoke);
+								show->hideLayer();
+							})->start();
+					}
+				});
+				selectBox->addButton(std::move(button));
+				state->selectionChanges.fire({});
+			}
+		};
+
+		auto controllers = std::vector<std::unique_ptr<PeerListController>>();
+		controllers.reserve(2);
+		controllers.push_back(std::move(adminsOwned));
+		controllers.push_back(std::move(membersOwned));
+		box->uiShow()->showBox(
+			Box<PeerListsBox>(std::move(controllers), initBox));
+	});
+	for (const auto &b : { select, cancel, leave }) {
+		b->setFullRadius(true);
+	}
+	box->setStyle(st::futureOwnerBox);
+}
\ No newline at end of file
diff --git a/Telegram/SourceFiles/boxes/select_future_owner_box.h b/Telegram/SourceFiles/boxes/select_future_owner_box.h
new file mode 100644
index 00000000000000..a0e1aa716ba03b
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/select_future_owner_box.h
@@ -0,0 +1,21 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class PeerData;
+class UserData;
+
+namespace Ui {
+class GenericBox;
+class Show;
+} // namespace Ui
+
+void SelectFutureOwnerbox(
+	not_null<Ui::GenericBox*> box,
+	not_null<PeerData*> peer,
+	not_null<UserData*> user);
diff --git a/Telegram/SourceFiles/boxes/self_destruction_box.cpp b/Telegram/SourceFiles/boxes/self_destruction_box.cpp
index 21073506345e4c..5d96befeb74433 100644
--- a/Telegram/SourceFiles/boxes/self_destruction_box.cpp
+++ b/Telegram/SourceFiles/boxes/self_destruction_box.cpp
@@ -7,20 +7,90 @@ For license and copyright information please follow this link:
 */
 #include "boxes/self_destruction_box.h"
 
+#include "api/api_authorizations.h"
+#include "api/api_cloud_password.h"
+#include "api/api_self_destruct.h"
+#include "apiwrap.h"
+#include "boxes/passcode_box.h"
 #include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/rect.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/labels.h"
-#include "apiwrap.h"
-#include "api/api_self_destruct.h"
-#include "api/api_authorizations.h"
-#include "main/main_session.h"
-#include "styles/style_layers.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/popup_menu.h"
 #include "styles/style_boxes.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_widgets.h"
 
 namespace {
 
 using Type = SelfDestructionBox::Type;
 
+void AddDeleteAccount(
+		not_null<Ui::BoxContent*> box,
+		not_null<Main::Session*> session) {
+	if (!session->isTestMode()) {
+		return;
+	}
+	const auto maybeState = session->api().cloudPassword().stateCurrent();
+	if (!maybeState || !maybeState->hasPassword) {
+		return;
+	}
+	const auto top = box->addTopButton(st::infoTopBarMenu);
+	const auto menu
+		= top->lifetime().make_state<base::unique_qptr<Ui::PopupMenu>>();
+	const auto handler = [=] {
+		session->api().cloudPassword().state(
+		) | rpl::take(
+			1
+		) | rpl::on_next([=](const Core::CloudPasswordState &state) {
+			auto fields = PasscodeBox::CloudFields::From(state);
+			fields.customTitle = tr::lng_settings_destroy_title();
+			fields.customDescription = tr::lng_context_mark_read_all_sure_2(
+				tr::now,
+				tr::rich).text;
+			fields.customSubmitButton = tr::lng_theme_delete();
+			fields.customCheckCallback = [=](
+					const Core::CloudPasswordResult &result,
+					base::weak_qptr<PasscodeBox> box) {
+				session->api().request(MTPaccount_DeleteAccount(
+					MTP_flags(MTPaccount_DeleteAccount::Flag::f_password),
+					MTP_string("Manual"),
+					result.result
+				)).done([=] {
+					if (box) {
+						box->uiShow()->hideLayer();
+					}
+				}).fail([=](const MTP::Error &error) {
+					if (box) {
+						box->handleCustomCheckError(error.type());
+					}
+				}).send();
+			};
+			box->uiShow()->showBox(Box<PasscodeBox>(session, fields));
+		}, top->lifetime());
+	};
+	top->setClickedCallback([=] {
+		*menu = base::make_unique_q<Ui::PopupMenu>(
+			top,
+			st::popupMenuWithIcons);
+
+		const auto addAction = Ui::Menu::CreateAddActionCallback(menu->get());
+		addAction({
+			.text = tr::lng_settings_destroy_title(tr::now),
+			.handler = handler,
+			.icon = &st::menuIconDeleteAttention,
+			.isAttention = true,
+		});
+		(*menu)->popup(QCursor::pos());
+	});
+}
+
 [[nodiscard]] std::vector<int> Values(Type type) {
 	switch (type) {
 	case Type::Account: return { 30, 90, 180, 365, 548, 720 };
@@ -47,7 +117,7 @@ SelfDestructionBox::SelfDestructionBox(
 		preloaded
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=](int days) {
+	) | rpl::on_next([=](int days) {
 		gotCurrent(days);
 	}, lifetime());
 }
@@ -79,6 +149,8 @@ void SelfDestructionBox::showContent() {
 			: tr::lng_self_destruct_sessions_description(tr::now)),
 		st::boxLabel);
 	_description->moveToLeft(st::boxPadding.left(), y);
+	_description->resizeToWidth(st::boxWidth
+		- rect::m::sum::h(st::boxPadding));
 	y += _description->height() + st::boxMediumSkip;
 
 	for (const auto value : _ttlValues) {
@@ -131,6 +203,8 @@ void SelfDestructionBox::prepare() {
 			? tr::lng_self_destruct_description(tr::now)
 			: tr::lng_self_destruct_sessions_description(tr::now)),
 		st::boxLabel);
+	fake->resizeToWidth(st::boxWidth
+		- rect::m::sum::h(st::boxPadding));
 	const auto boxHeight = st::boxOptionListPadding.top()
 		+ fake->height() + st::boxMediumSkip
 		+ (_ttlValues.size()
@@ -151,4 +225,6 @@ void SelfDestructionBox::prepare() {
 	} else {
 		showContent();
 	}
+
+	AddDeleteAccount(this, _session);
 }
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 3ac13da2017d45..b3b237c0793ed1 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -9,7 +9,7 @@ For license and copyright information please follow this link:
 
 #include "api/api_credits.h"
 #include "apiwrap.h"
-#include "core/ui_integration.h" // Core::MarkedTextContext.
+#include "core/ui_integration.h" // TextContext
 #include "data/components/credits.h"
 #include "data/data_credits.h"
 #include "data/data_photo.h"
@@ -20,23 +20,29 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "info/channel_statistics/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget.
 #include "lang/lang_keys.h"
+#include "main/session/session_show.h"
 #include "main/main_session.h"
 #include "payments/payments_checkout_process.h"
 #include "payments/payments_form.h"
 #include "settings/settings_credits_graphics.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/effects/credits_graphics.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_top_bar.h" // Ui::Premium::ColorizedSvg.
 #include "ui/image/image_prepare.h"
 #include "ui/layers/generic_box.h"
+#include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/peer_bubble.h"
 #include "styles/style_boxes.h"
+#include "styles/style_chat.h"
 #include "styles/style_credits.h"
 #include "styles/style_giveaway.h"
+#include "styles/style_info.h" // inviteLinkSubscribeBoxTerms
 #include "styles/style_layers.h"
 #include "styles/style_premium.h"
 #include "styles/style_settings.h"
@@ -92,6 +98,44 @@ struct PaidMediaData {
 	};
 }
 
+void AddTerms(
+		not_null<Ui::BoxContent*> box,
+		not_null<Ui::RpWidget*> button,
+		const style::Box &stBox) {
+	const auto terms = Ui::CreateChild<Ui::FlatLabel>(
+		button->parentWidget(),
+		tr::lng_channel_invite_subscription_terms(
+			lt_link,
+			rpl::combine(
+				tr::lng_paid_react_agree_link(),
+				tr::lng_group_invite_subscription_about_url()
+			) | rpl::map([](const QString &text, const QString &url) {
+				return tr::link(text, url);
+			}),
+			tr::rich),
+		st::inviteLinkSubscribeBoxTerms);
+	const auto &buttonPadding = stBox.buttonPadding;
+	const auto style = box->lifetime().make_state<style::Box>(style::Box{
+		.buttonPadding = buttonPadding + QMargins(0, 0, 0, terms->height()),
+		.buttonHeight = stBox.buttonHeight,
+		.button = stBox.button,
+		.margin = stBox.margin,
+		.title = stBox.title,
+		.bg = stBox.bg,
+		.titleAdditionalFg = stBox.titleAdditionalFg,
+		.shadowIgnoreTopSkip = stBox.shadowIgnoreTopSkip,
+		.shadowIgnoreBottomSkip = stBox.shadowIgnoreBottomSkip,
+	});
+	button->geometryValue() | rpl::on_next([=](const QRect &rect) {
+		terms->resizeToWidth(box->width()
+			- rect::m::sum::h(st::boxRowPadding));
+		terms->moveToLeft(
+			rect.x() + (rect.width() - terms->width()) / 2,
+			rect::bottom(rect) + buttonPadding.bottom() / 2);
+	}, terms->lifetime());
+	box->setStyle(*style);
+}
+
 [[nodiscard]] rpl::producer<TextWithEntities> SendCreditsConfirmText(
 		not_null<Main::Session*> session,
 		not_null<Payments::CreditsFormData*> form) {
@@ -110,25 +154,25 @@ struct PaidMediaData {
 		auto photosBold = tr::lng_credits_box_out_photos(
 			lt_count,
 			rpl::single(photos) | tr::to_count(),
-			Ui::Text::Bold);
+			tr::bold);
 		auto videosBold = tr::lng_credits_box_out_videos(
 			lt_count,
 			rpl::single(videos) | tr::to_count(),
-			Ui::Text::Bold);
+			tr::bold);
 		auto media = (!videos)
 				? ((photos > 1)
 					? std::move(photosBold)
-					: tr::lng_credits_box_out_photo(Ui::Text::WithEntities))
+					: tr::lng_credits_box_out_photo(tr::marked))
 				: (!photos)
 				? ((videos > 1)
 					? std::move(videosBold)
-					: tr::lng_credits_box_out_video(Ui::Text::WithEntities))
+					: tr::lng_credits_box_out_video(tr::marked))
 				: tr::lng_credits_box_out_both(
 					lt_photo,
 					std::move(photosBold),
 					lt_video,
 					std::move(videosBold),
-					Ui::Text::WithEntities);
+					tr::marked);
 		if (const auto user = data.peer->asUser()) {
 			return tr::lng_credits_box_out_media_user(
 				lt_count,
@@ -136,8 +180,8 @@ struct PaidMediaData {
 				lt_media,
 				std::move(media),
 				lt_user,
-				rpl::single(Ui::Text::Bold(user->shortName())),
-				Ui::Text::RichLangValue);
+				rpl::single(tr::bold(user->shortName())),
+				tr::rich);
 		}
 		return tr::lng_credits_box_out_media(
 			lt_count,
@@ -145,11 +189,23 @@ struct PaidMediaData {
 			lt_media,
 			std::move(media),
 			lt_chat,
-			rpl::single(Ui::Text::Bold(data.peer->name())),
-			Ui::Text::RichLangValue);
+			rpl::single(tr::bold(data.peer->name())),
+			tr::rich);
 	}
 
 	const auto bot = session->data().user(form->botId);
+	if (form->invoice.subscriptionPeriod) {
+		return (bot->botInfo
+				? tr::lng_credits_box_out_subscription_bot
+				: tr::lng_credits_box_out_subscription_business)(
+			lt_count,
+			rpl::single(form->invoice.amount) | tr::to_count(),
+			lt_title,
+			rpl::single(TextWithEntities{ form->title }),
+			lt_recipient,
+			rpl::single(TextWithEntities{ bot->name() }),
+			tr::rich);
+	}
 	return tr::lng_credits_box_out_sure(
 		lt_count,
 		rpl::single(form->invoice.amount) | tr::to_count(),
@@ -157,7 +213,7 @@ struct PaidMediaData {
 		rpl::single(TextWithEntities{ form->title }),
 		lt_bot,
 		rpl::single(TextWithEntities{ bot->name() }),
-		Ui::Text::RichLangValue);
+		tr::rich);
 }
 
 [[nodiscard]] object_ptr<Ui::RpWidget> SendCreditsThumbnail(
@@ -190,12 +246,63 @@ struct PaidMediaData {
 		st::defaultUserpicButton);
 }
 
+[[nodiscard]] not_null<Ui::RpWidget*> SendCreditsBadge(
+		not_null<Ui::RpWidget*> parent,
+		int credits) {
+	const auto widget = Ui::CreateChild<Ui::RpWidget>(parent);
+	const auto &font = st::chatGiveawayBadgeFont;
+	const auto text = QString::number(credits);
+	const auto iconHeight = font->ascent - font->descent;
+	const auto iconWidth = iconHeight + st::lineWidth;
+	const auto width = font->width(text) + iconWidth + st::lineWidth;
+	const auto inner = QRect(0, 0, width, font->height);
+	const auto rect = inner + st::subscriptionCreditsBadgePadding;
+	const auto size = rect.size();
+	const auto svg = widget->lifetime().make_state<QSvgRenderer>(
+		Ui::Premium::Svg());
+	const auto half = st::chatGiveawayBadgeStroke / 2.;
+	const auto left = st::subscriptionCreditsBadgePadding.left();
+	const auto smaller = QRectF(rect.translated(-rect.topLeft()))
+		- Margins(half);
+	const auto radius = smaller.height() / 2.;
+	widget->resize(size);
+
+	widget->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(widget);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(QPen(st::premiumButtonFg, st::chatGiveawayBadgeStroke * 1.));
+		p.setBrush(st::creditsBg3);
+		p.drawRoundedRect(smaller, radius, radius);
+
+		p.translate(0, font->descent / 2);
+
+		p.setPen(st::premiumButtonFg);
+		p.setBrush(st::premiumButtonFg);
+		svg->render(
+			&p,
+			QRect(
+				left,
+				half + (inner.height() - iconHeight) / 2,
+				iconHeight,
+				iconHeight));
+
+		p.setFont(font);
+		p.drawText(
+			left + iconWidth,
+			st::subscriptionCreditsBadgePadding.top() + font->ascent,
+			text);
+
+	}, widget->lifetime());
+
+	return widget;
+}
+
 } // namespace
 
 void SendCreditsBox(
 		not_null<Ui::GenericBox*> box,
 		std::shared_ptr<Payments::CreditsFormData> form,
-		Fn<void()> sent) {
+		Fn<void(Settings::SmallBalanceResult)> sent) {
 	if (!form) {
 		return;
 	}
@@ -203,7 +310,8 @@ void SendCreditsBox(
 		rpl::variable<bool> confirmButtonBusy = false;
 	};
 	const auto state = box->lifetime().make_state<State>();
-	box->setStyle(st::giveawayGiftCodeBox);
+	const auto &stBox = st::giveawayGiftCodeBox;
+	box->setStyle(stBox);
 	box->setNoContentMargin(true);
 
 	const auto session = form->invoice.session;
@@ -220,17 +328,17 @@ void SendCreditsBox(
 		const auto ministars = box->lifetime().make_state<MiniStars>(
 			ministarsContainer,
 			false,
-			Ui::Premium::MiniStars::Type::BiStars);
+			Ui::Premium::MiniStarsType::BiStars);
 		ministars->setColorOverride(Ui::Premium::CreditsIconGradientStops());
 
 		ministarsContainer->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(ministarsContainer);
 			ministars->paint(p);
 		}, ministarsContainer->lifetime());
 
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			ministarsContainer->resize(width, fullHeight);
 			const auto w = fullHeight / 3 * 2;
 			ministars->setCenter(QRect(
@@ -241,34 +349,55 @@ void SendCreditsBox(
 		}, ministarsContainer->lifetime());
 	}
 
-	const auto thumb = box->addRow(object_ptr<Ui::CenterWrap<>>(
-		content,
-		SendCreditsThumbnail(content, session, form.get(), photoSize)));
+	const auto thumb = box->addRow(
+		SendCreditsThumbnail(content, session, form.get(), photoSize),
+		style::al_top);
 	thumb->setAttribute(Qt::WA_TransparentForMouseEvents);
+	if (form->invoice.subscriptionPeriod) {
+		const auto badge = SendCreditsBadge(content, form->invoice.amount);
+		thumb->geometryValue() | rpl::on_next([=](const QRect &r) {
+			badge->moveToLeft(
+				r.x() + (r.width() - badge->width()) / 2,
+				rect::bottom(r) - badge->height() / 2);
+		}, badge->lifetime());
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+	}
 
 	Ui::AddSkip(content);
-	box->addRow(object_ptr<Ui::CenterWrap<>>(
-		box,
+	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
-			tr::lng_credits_box_out_title(),
-			st::settingsPremiumUserTitle)));
+			form->invoice.subscriptionPeriod
+				? rpl::single(form->title)
+				: tr::lng_credits_box_out_title(),
+			st::settingsPremiumUserTitle),
+		style::al_top);
+	if (form->invoice.subscriptionPeriod && form->botId && form->photo) {
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+		const auto bot = session->data().user(form->botId);
+		box->addRow(
+			Ui::CreatePeerBubble(box, bot),
+			style::al_top);
+		Ui::AddSkip(content);
+	}
 	Ui::AddSkip(content);
-	box->addRow(object_ptr<Ui::CenterWrap<>>(
-		box,
+	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			SendCreditsConfirmText(session, form.get()),
-			st::creditsBoxAbout)));
+			st::creditsBoxAbout),
+		style::al_top);
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 
-	const auto button = box->addButton(rpl::single(QString()), [=] {
+	const auto sendStars = [=] {
 		if (state->confirmButtonBusy.current()) {
 			return;
 		}
 		const auto show = box->uiShow();
-		const auto weak = MakeWeak(box.get());
+		const auto weak = base::make_weak(box.get());
 		state->confirmButtonBusy = true;
 		session->api().request(
 			MTPpayments_SendStarsForm(
@@ -283,7 +412,7 @@ void SendCreditsBox(
 				state->confirmButtonBusy = false;
 				box->closeBox();
 			}
-			sent();
+			sent(Settings::SmallBalanceResult::Success);
 		}).fail([=](const MTP::Error &error) {
 			if (weak) {
 				state->confirmButtonBusy = false;
@@ -292,8 +421,8 @@ void SendCreditsBox(
 			if (id == u"BOT_PRECHECKOUT_FAILED"_q) {
 				auto error = ::Ui::MakeInformBox(
 					tr::lng_payments_precheckout_stars_failed(tr::now));
-				error->boxClosing() | rpl::start_with_next([=] {
-					if (const auto paybox = weak.data()) {
+				error->boxClosing() | rpl::on_next([=] {
+					if (const auto paybox = weak.get()) {
 						paybox->closeBox();
 					}
 				}, error->lifetime());
@@ -305,7 +434,26 @@ void SendCreditsBox(
 				show->showToast(id);
 			}
 		}).send();
+	};
+
+	const auto button = box->addButton(rpl::single(QString()), [=] {
+		Settings::MaybeRequestBalanceIncrease(
+			Main::MakeSessionShow(box->uiShow(), session),
+			form->invoice.credits,
+			SmallBalanceSourceFromForm(form),
+			[=](Settings::SmallBalanceResult result) {
+				if (result == Settings::SmallBalanceResult::Cancelled) {
+				} else if (result == Settings::SmallBalanceResult::Success
+					|| result == Settings::SmallBalanceResult::Already) {
+					sendStars();
+				} else {
+					sent(result);
+				}
+			});
 	});
+	if (form->invoice.subscriptionPeriod) {
+		AddTerms(box, button, stBox);
+	}
 	{
 		using namespace Info::Statistics;
 		const auto loadingAnimation = InfiniteRadialAnimationWidget(
@@ -317,39 +465,29 @@ void SendCreditsBox(
 	SetButtonMarkedLabel(
 		button,
 		rpl::combine(
-			tr::lng_credits_box_out_confirm(
-				lt_count,
-				rpl::single(form->invoice.amount) | tr::to_count(),
-				lt_emoji,
-				rpl::single(CreditsEmojiSmall(session)),
-				Ui::Text::RichLangValue),
+			(form->invoice.subscriptionPeriod
+				? tr::lng_credits_box_out_subscription_confirm
+				: tr::lng_credits_box_out_confirm)(
+					lt_count,
+					rpl::single(form->invoice.amount) | tr::to_count(),
+					lt_emoji,
+					rpl::single(CreditsEmojiSmall()),
+					tr::rich),
 			state->confirmButtonBusy.value()
 		) | rpl::map([](TextWithEntities &&text, bool busy) {
 			return busy ? TextWithEntities() : std::move(text);
 		}),
 		session,
 		st::creditsBoxButtonLabel,
-		box->getDelegate()->style().button.textFg->c);
-
-	const auto buttonWidth = st::boxWidth
-		- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
-	button->widthValue() | rpl::filter([=] {
-		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
-		button->resizeToWidth(buttonWidth);
-	}, button->lifetime());
+		&box->getDelegate()->style().button.textFg);
 
 	{
 		const auto close = Ui::CreateChild<Ui::IconButton>(
-			box.get(),
+			content,
 			st::boxTitleClose);
-		close->setClickedCallback([=] {
-			box->closeBox();
-		});
-		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		close->setClickedCallback([=] { box->closeBox(); });
+		content->widthValue() | rpl::on_next([=](int) {
 			close->moveToRight(0, 0);
-			close->raise();
 		}, close->lifetime());
 	}
 
@@ -357,12 +495,13 @@ void SendCreditsBox(
 		session->credits().load(true);
 		const auto balance = Settings::AddBalanceWidget(
 			content,
+			session,
 			session->credits().balanceValue(),
 			false);
 		rpl::combine(
 			balance->sizeValue(),
 			content->sizeValue()
-		) | rpl::start_with_next([=](const QSize &, const QSize &) {
+		) | rpl::on_next([=](const QSize &, const QSize &) {
 			balance->moveToLeft(
 				st::creditsHistoryRightSkip * 2,
 				st::creditsHistoryRightSkip);
@@ -371,48 +510,44 @@ void SendCreditsBox(
 	}
 }
 
-TextWithEntities CreditsEmoji(not_null<Main::Session*> session) {
-	return Ui::Text::SingleCustomEmoji(
-		session->data().customEmojiManager().registerInternalEmoji(
-			st::settingsPremiumIconStar,
-			QMargins{ 0, -st::moderateBoxExpandInnerSkip, 0, 0 },
-			true),
+TextWithEntities CreditsEmoji() {
+	return Ui::Text::IconEmoji(
+		&st::starIconEmojiLarge,
 		QString(QChar(0x2B50)));
 }
 
-TextWithEntities CreditsEmojiSmall(not_null<Main::Session*> session) {
-	return Ui::Text::SingleCustomEmoji(
-		session->data().customEmojiManager().registerInternalEmoji(
-			st::starIconSmall,
-			st::starIconSmallPadding,
-			true),
+TextWithEntities CreditsEmojiSmall() {
+	return Ui::Text::IconEmoji(
+		&st::starIconEmoji,
 		QString(QChar(0x2B50)));
 }
 
 not_null<FlatLabel*> SetButtonMarkedLabel(
 		not_null<RpWidget*> button,
 		rpl::producer<TextWithEntities> text,
-		Fn<std::any(Fn<void()> update)> context,
+		Text::MarkedContext context,
 		const style::FlatLabel &st,
-		std::optional<QColor> textFg) {
+		const style::color *textFg) {
 	const auto buttonLabel = Ui::CreateChild<Ui::FlatLabel>(
 		button,
 		rpl::single(QString()),
 		st);
+	context.repaint = [=] { buttonLabel->update(); };
 	rpl::duplicate(
 		text
 	) | rpl::filter([=](const TextWithEntities &text) {
 		return !text.text.isEmpty();
-	}) | rpl::start_with_next([=](const TextWithEntities &text) {
-		buttonLabel->setMarkedText(
-			text,
-			context([=] { buttonLabel->update(); }));
+	}) | rpl::on_next([=](const TextWithEntities &text) {
+		buttonLabel->setMarkedText(text, context);
 	}, buttonLabel->lifetime());
 	if (textFg) {
-		buttonLabel->setTextColorOverride(textFg);
+		buttonLabel->setTextColorOverride((*textFg)->c);
+		style::PaletteChanged() | rpl::on_next([=] {
+			buttonLabel->setTextColorOverride((*textFg)->c);
+		}, buttonLabel->lifetime());
 	}
 	button->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		buttonLabel->moveToLeft(
 			(size.width() - buttonLabel->width()) / 2,
 			(size.height() - buttonLabel->height()) / 2);
@@ -431,16 +566,13 @@ not_null<FlatLabel*> SetButtonMarkedLabel(
 		rpl::producer<TextWithEntities> text,
 		not_null<Main::Session*> session,
 		const style::FlatLabel &st,
-		std::optional<QColor> textFg) {
-	return SetButtonMarkedLabel(button, text, [=](Fn<void()> update) {
-		return Core::MarkedTextContext{
-			.session = session,
-			.customEmojiRepaint = update,
-		};
-	}, st, textFg);
+		const style::color *textFg) {
+	return SetButtonMarkedLabel(button, text, Core::TextContext({
+		.session = session,
+	}), st, textFg);
 }
 
-void SendStarGift(
+void SendStarsForm(
 		not_null<Main::Session*> session,
 		std::shared_ptr<Payments::CreditsFormData> data,
 		Fn<void(std::optional<QString>)> done) {
@@ -458,4 +590,16 @@ void SendStarGift(
 	}).send();
 }
 
+Settings::SmallBalanceSource SmallBalanceSourceFromForm(
+		std::shared_ptr<Payments::CreditsFormData> form) {
+	using namespace Payments;
+	using namespace Settings;
+	const auto starGift = std::get_if<InvoiceStarGift>(&form->id.value);
+	return !starGift
+		? SmallBalanceSource(SmallBalanceBot{ .botId = form->botId })
+		: SmallBalanceSource(SmallBalanceStarGift{
+			.recipientId = starGift->recipient->id,
+		});
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.h b/Telegram/SourceFiles/boxes/send_credits_box.h
index 08188ae22b0da3..d2bef3e54fca9c 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.h
+++ b/Telegram/SourceFiles/boxes/send_credits_box.h
@@ -21,6 +21,11 @@ namespace Payments {
 struct CreditsFormData;
 } // namespace Payments
 
+namespace Settings {
+enum class SmallBalanceResult;
+struct SmallBalanceSource;
+} // namespace Settings
+
 namespace Ui {
 
 class RpWidget;
@@ -30,31 +35,32 @@ class FlatLabel;
 void SendCreditsBox(
 	not_null<Ui::GenericBox*> box,
 	std::shared_ptr<Payments::CreditsFormData> data,
-	Fn<void()> sent);
+	Fn<void(Settings::SmallBalanceResult)> sent);
 
-[[nodiscard]] TextWithEntities CreditsEmoji(
-	not_null<Main::Session*> session);
+[[nodiscard]] TextWithEntities CreditsEmoji();
 
-[[nodiscard]] TextWithEntities CreditsEmojiSmall(
-	not_null<Main::Session*> session);
+[[nodiscard]] TextWithEntities CreditsEmojiSmall();
 
 not_null<FlatLabel*> SetButtonMarkedLabel(
 	not_null<RpWidget*> button,
 	rpl::producer<TextWithEntities> text,
-	Fn<std::any(Fn<void()> update)> context,
+	Text::MarkedContext context,
 	const style::FlatLabel &st,
-	std::optional<QColor> textFg = {});
+	const style::color *textFg = nullptr);
 
 not_null<FlatLabel*> SetButtonMarkedLabel(
 	not_null<RpWidget*> button,
 	rpl::producer<TextWithEntities> text,
 	not_null<Main::Session*> session,
 	const style::FlatLabel &st,
-	std::optional<QColor> textFg = {});
+	const style::color *textFg = nullptr);
 
-void SendStarGift(
+void SendStarsForm(
 	not_null<Main::Session*> session,
 	std::shared_ptr<Payments::CreditsFormData> data,
 	Fn<void(std::optional<QString>)> done);
 
+[[nodiscard]] Settings::SmallBalanceSource SmallBalanceSourceFromForm(
+	std::shared_ptr<Payments::CreditsFormData> form);
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 17cfeefb88a25f..d142df7b898a72 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "boxes/send_files_box.h"
 
 #include "lang/lang_keys.h"
+#include "storage/localimageloader.h"
 #include "storage/localstorage.h"
 #include "storage/storage_media_prepare.h"
 #include "iv/iv_instance.h"
@@ -17,6 +18,7 @@ For license and copyright information please follow this link:
 #include "main/main_session_settings.h"
 #include "mtproto/mtproto_config.h"
 #include "chat_helpers/message_field.h"
+#include "menu/menu_checked_action.h"
 #include "menu/menu_send.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "chat_helpers/field_autocomplete.h"
@@ -25,6 +27,7 @@ For license and copyright information please follow this link:
 #include "editor/photo_editor_layer_widget.h"
 #include "history/history_drag_area.h"
 #include "history/view/controls/history_view_characters_limit.h"
+#include "history/view/controls/history_view_compose_ai_button.h"
 #include "history/view/history_view_schedule_box.h"
 #include "core/mime_type.h"
 #include "core/ui_integration.h"
@@ -32,7 +35,9 @@ For license and copyright information please follow this link:
 #include "base/call_delayed.h"
 #include "boxes/premium_limits_box.h"
 #include "boxes/premium_preview_box.h"
+#include "boxes/send_gif_with_caption_box.h"
 #include "boxes/send_credits_box.h"
+#include "boxes/send_files_box_reply_header.h"
 #include "ui/effects/scroll_content_shadow.h"
 #include "ui/widgets/fields/number_input.h"
 #include "ui/widgets/checkbox.h"
@@ -44,6 +49,7 @@ For license and copyright information please follow this link:
 #include "ui/grouped_layout.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
+#include "ui/controls/compose_ai_button_factory.h"
 #include "ui/controls/emoji_button.h"
 #include "ui/painter.h"
 #include "ui/vertical_list.h"
@@ -57,17 +63,21 @@ For license and copyright information please follow this link:
 #include "data/stickers/data_stickers.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "window/window_session_controller.h"
+#include "window/window_controller.h"
 #include "core/application.h"
 #include "core/core_settings.h"
-#include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_layers.h"
+#include "styles/style_settings.h"
+#include "styles/style_menu_icons.h"
 
 #include <QtCore/QMimeData>
 
 namespace {
 
 constexpr auto kMaxMessageLength = 4096;
+constexpr auto kMaxDisplayNameLength = 64;
 
 using Ui::SendFilesWay;
 
@@ -103,14 +113,164 @@ void FileDialogCallback(
 	callback(std::move(*list));
 }
 
-rpl::producer<QString> FieldPlaceholder(
-		const Ui::PreparedList &list,
-		SendFilesWay way) {
-	return list.canAddCaption(
-			way.groupFiles() && way.sendImagesAsPhotos(),
-			way.sendImagesAsPhotos())
-		? tr::lng_photo_caption()
-		: tr::lng_photos_comment();
+} // namespace
+
+void RenameFileBox(
+		not_null<Ui::GenericBox*> box,
+		const QString &currentName,
+		bool allowExtensionEdit,
+		Fn<void(QString)> apply) {
+	box->setTitle(tr::lng_rename_file());
+	const auto field = box->addRow(object_ptr<Ui::InputField>(
+		box,
+		st::settingsDeviceName,
+		rpl::single(QString()),
+		currentName));
+	QString extension;
+	if (allowExtensionEdit) {
+		field->setMaxLength(kMaxDisplayNameLength);
+		field->setText(currentName);
+	} else {
+		extension = [&] {
+			if (currentName.isEmpty()) {
+				return u".png"_q;
+			}
+			const auto dot = currentName.lastIndexOf('.');
+			return (dot >= 0) ? currentName.mid(dot) : QString();
+		}();
+		const auto nameWithoutExt = extension.isEmpty()
+			? currentName
+			: currentName.left(currentName.size() - extension.size());
+		const auto maxNameLength = kMaxDisplayNameLength - extension.size();
+		field->setMaxLength((maxNameLength > 0) ? maxNameLength : 0);
+		field->setText(nameWithoutExt);
+	}
+	field->selectAll();
+	box->setFocusCallback([=] {
+		field->setFocusFast();
+	});
+	const auto save = [=] {
+		const auto newName = field->getLastText().trimmed();
+		if (newName.isEmpty()) {
+			field->showError();
+			return;
+		}
+		if (allowExtensionEdit) {
+			if (newName.size() > kMaxDisplayNameLength) {
+				field->showError();
+				return;
+			}
+		} else if ((newName.size() + extension.size())
+			> kMaxDisplayNameLength) {
+			field->showError();
+			return;
+		}
+		const auto weak = base::make_weak(box);
+		apply(allowExtensionEdit ? newName : (newName + extension));
+		if (const auto strong = weak.get()) {
+			strong->closeBox();
+		}
+	};
+	field->submits() | rpl::on_next([=] {
+		save();
+	}, box->lifetime());
+	box->addButton(tr::lng_settings_save(), save);
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+}
+
+namespace {
+
+void EditFileCaptionBox(
+		not_null<Ui::GenericBox*> box,
+		const style::ComposeControls &st,
+		PeerData *captionToPeer,
+		TextWithTags currentCaption,
+		Fn<bool(TextWithTags)> apply) {
+	box->setTitle(tr::lng_context_upload_edit_caption());
+	const auto window = Core::App().findWindow(box);
+	const auto controller = window ? window->sessionController() : nullptr;
+	const auto maxCaptionLength = [&] {
+		if (captionToPeer) {
+			return Data::PremiumLimits(
+				&captionToPeer->session()).captionLengthCurrent();
+		} else if (controller) {
+			return Data::PremiumLimits(
+				&controller->session()).captionLengthCurrent();
+		}
+		return kMaxMessageLength;
+	}();
+	const auto wrap = box->addRow(
+		object_ptr<Ui::RpWidget>(box),
+		st::boxRowPadding);
+	const auto field = Ui::CreateChild<Ui::InputField>(
+		wrap,
+		st.files.caption,
+		Ui::InputField::Mode::MultiLine,
+		tr::lng_photo_caption());
+	field->setMaxLength(maxCaptionLength);
+	field->setSubmitSettings(Core::App().settings().sendSubmitWay());
+	Ui::ResizeFitChild(wrap, field);
+	if (window) {
+		const auto allow = [=](not_null<DocumentData*> emoji) {
+			return captionToPeer
+				&& Data::AllowEmojiWithoutPremium(captionToPeer, emoji);
+		};
+		Ui::SetupCaptionFieldInBox(
+			box,
+			controller,
+			field,
+			captionToPeer,
+			allow,
+			PremiumFeature::EmojiStatus);
+		if (controller) {
+			const auto chatStyle = InitMessageFieldHandlers({
+				.session = &controller->session(),
+				.show = controller->uiShow(),
+				.field = field,
+				.customEmojiPaused = [=] {
+					return controller->isGifPausedAtLeastFor(
+						Window::GifPauseReason::Layer);
+				},
+				.allowPremiumEmoji = allow,
+				.fieldStyle = &st.files.caption,
+			});
+			const auto aiButton = Ui::SetupCaptionAiButton({
+				.parent = field->parentWidget(),
+				.field = field,
+				.session = &controller->session(),
+				.show = controller->uiShow(),
+				.chatStyle = chatStyle,
+			});
+			rpl::combine(
+				box->sizeValue(),
+				field->geometryValue()
+			) | rpl::on_next([=](QSize, QRect) {
+				Ui::UpdateCaptionAiButtonGeometry(aiButton, field);
+				aiButton->raise();
+			}, aiButton->lifetime());
+		}
+	}
+	field->setTextWithTags(std::move(currentCaption));
+
+	box->setFocusCallback([=] {
+		field->setFocusFast();
+	});
+	const auto save = [=] {
+		const auto text = field->getTextWithAppliedMarkdown();
+		if (!apply(text)) {
+			return;
+		}
+		box->closeBox();
+	};
+	field->submits() | rpl::on_next([=] {
+		save();
+	}, box->lifetime());
+	box->addButton(tr::lng_settings_save(), save);
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
 }
 
 void EditPriceBox(
@@ -140,11 +300,15 @@ void EditPriceBox(
 		price ? QString::number(price) : QString(),
 		limit);
 	const auto field = owned.data();
-	wrap->widthValue() | rpl::start_with_next([=](int width) {
+	wrap->widthValue() | rpl::on_next([=](int width) {
 		field->move(0, 0);
 		field->resize(width, field->height());
 		wrap->resize(width, field->height());
 	}, wrap->lifetime());
+	field->paintRequest() | rpl::on_next([=](QRect clip) {
+		auto p = QPainter(field);
+		st::paidStarIcon.paint(p, 0, st::paidStarIconTop, field->width());
+	}, field->lifetime());
 	field->selectAll();
 	box->setFocusCallback([=] {
 		field->setFocusFast();
@@ -154,8 +318,8 @@ void EditPriceBox(
 			box,
 			tr::lng_paid_about(
 				lt_link,
-				tr::lng_paid_about_link() | Ui::Text::ToLink(),
-				Ui::Text::WithEntities),
+				tr::lng_paid_about_link(tr::link),
+				tr::marked),
 			st::paidAmountAbout),
 		st::boxRowPadding + QMargins(0, st::sendMediaRowSkip, 0, 0));
 	about->setClickHandlerFilter([=](const auto &...) {
@@ -165,20 +329,15 @@ void EditPriceBox(
 		return false;
 	});
 
-	field->paintRequest() | rpl::start_with_next([=](QRect clip) {
-		auto p = QPainter(field);
-		st::paidStarIcon.paint(p, 0, st::paidStarIconTop, field->width());
-	}, field->lifetime());
-
 	const auto save = [=] {
 		const auto now = field->getLastText().toULongLong();
 		if (now > limit) {
 			field->showError();
 			return;
 		}
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		apply(now);
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	};
@@ -191,6 +350,15 @@ void EditPriceBox(
 	});
 }
 
+[[nodiscard]] bool SkipCaption(
+		const Ui::PreparedFile &file,
+		const Ui::SendFilesWay &way) {
+	return way.sendImagesAsPhotos()
+		? (file.type == Ui::PreparedFile::Type::Photo
+			|| file.type == Ui::PreparedFile::Type::Video)
+		: file.isSticker();
+}
+
 } // namespace
 
 SendFilesLimits DefaultLimitsForPeer(not_null<PeerData*> peer) {
@@ -220,7 +388,7 @@ SendFilesCheck DefaultCheckForPeer(
 }
 
 SendFilesCheck DefaultCheckForPeer(
-		std::shared_ptr<Ui::Show> show,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<PeerData*> peer) {
 	return [=](
 			const Ui::PreparedFile &file,
@@ -228,7 +396,7 @@ SendFilesCheck DefaultCheckForPeer(
 			bool silent) {
 		const auto error = Data::FileRestrictionError(peer, file, compress);
 		if (error && !silent) {
-			show->showToast(*error);
+			Data::ShowSendErrorToast(show, peer, error);
 		}
 		return !error.has_value();
 	};
@@ -240,9 +408,9 @@ SendFilesBox::Block::Block(
 	not_null<std::vector<Ui::PreparedFile>*> items,
 	int from,
 	int till,
+	const Ui::Text::MarkedContext &captionContext,
 	Fn<bool()> gifPaused,
-	SendFilesWay way,
-	Fn<bool()> canToggleSpoiler)
+	SendFilesWay way)
 : _items(items)
 , _from(from)
 , _till(till) {
@@ -259,24 +427,30 @@ SendFilesBox::Block::Block(
 			parent.get(),
 			st,
 			my,
-			way,
-			std::move(canToggleSpoiler));
+			captionContext,
+			way);
 		_preview.reset(preview);
 	} else {
-		const auto media = Ui::SingleMediaPreview::Create(
-			parent,
-			st,
-			gifPaused,
-			first,
-			std::move(canToggleSpoiler));
+		const auto media = way.sendImagesAsPhotos()
+			? Ui::SingleMediaPreview::Create(
+				parent,
+				st,
+				gifPaused,
+				first)
+			: nullptr;
 		if (media) {
 			_isSingleMedia = true;
+			media->setSendWay(way);
+			media->setCanShowHighQualityBadge(first.canUseHighQualityPhoto());
 			_preview.reset(media);
 		} else {
-			_preview.reset(Ui::CreateChild<Ui::SingleFilePreview>(
+			const auto single = Ui::CreateChild<Ui::SingleFilePreview>(
 				parent.get(),
 				st,
-				first));
+				first,
+				captionContext);
+			single->setRenameEnabled(!SkipCaption(first, way));
+			_preview.reset(single);
 		}
 	}
 	_preview->show();
@@ -286,6 +460,10 @@ int SendFilesBox::Block::fromIndex() const {
 	return _from;
 }
 
+bool SendFilesBox::Block::isSingleFile() const {
+	return !_isAlbum && !_isSingleMedia;
+}
+
 int SendFilesBox::Block::tillIndex() const {
 	return _till;
 }
@@ -344,6 +522,19 @@ rpl::producer<int> SendFilesBox::Block::itemModifyRequest() const {
 	}
 }
 
+rpl::producer<int> SendFilesBox::Block::itemRenameRequest() const {
+	using namespace rpl::mappers;
+
+	const auto preview = _preview.get();
+	const auto from = _from;
+	if (_isAlbum || _isSingleMedia) {
+		return rpl::never<int>();
+	} else {
+		const auto single = static_cast<Ui::SingleFilePreview*>(preview);
+		return single->renameRequests() | rpl::map_to(from);
+	}
+}
+
 rpl::producer<> SendFilesBox::Block::orderUpdated() const {
 	if (_isAlbum) {
 		const auto album = static_cast<Ui::AlbumPreview*>(_preview.get());
@@ -358,6 +549,10 @@ void SendFilesBox::Block::setSendWay(Ui::SendFilesWay way) {
 			const auto media = static_cast<Ui::SingleMediaPreview*>(
 				_preview.get());
 			media->setSendWay(way);
+		} else {
+			const auto single = static_cast<Ui::SingleFilePreview*>(
+				_preview.get());
+			single->setRenameEnabled(!SkipCaption((*_items)[_from], way));
 		}
 		return;
 	}
@@ -432,6 +627,32 @@ QImage SendFilesBox::Block::generatePriceTagBackground() const {
 	return QImage();
 }
 
+bool SendFilesBox::Block::setSingleFileDisplayName(
+		const QString &displayName) {
+	if (_isAlbum || _isSingleMedia) {
+		return false;
+	}
+	const auto single = static_cast<Ui::SingleFilePreview*>(_preview.get());
+	single->setDisplayName(displayName);
+	return true;
+}
+
+bool SendFilesBox::Block::setSingleFileCaption(
+		int index,
+		const TextWithTags &caption) {
+	if (_isSingleMedia || index < _from || index >= _till) {
+		return false;
+	}
+	if (_isAlbum) {
+		const auto album = static_cast<Ui::AlbumPreview*>(_preview.get());
+		album->setCaption(index - _from, caption);
+		return true;
+	}
+	const auto single = static_cast<Ui::SingleFilePreview*>(_preview.get());
+	single->setCaption(caption);
+	return true;
+}
+
 SendFilesBox::SendFilesBox(
 	QWidget*,
 	not_null<Window::SessionController*> controller,
@@ -444,7 +665,7 @@ SendFilesBox::SendFilesBox(
 	.show = controller->uiShow(),
 	.list = std::move(list),
 	.caption = caption,
-	.captionToPeer = toPeer,
+	.toPeer = toPeer,
 	.limits = DefaultLimitsForPeer(toPeer),
 	.check = DefaultCheckForPeer(controller, toPeer),
 	.sendType = sendType,
@@ -463,19 +684,72 @@ SendFilesBox::SendFilesBox(QWidget*, SendFilesBoxDescriptor &&descriptor)
 , _limits(descriptor.limits)
 , _sendMenuDetails(prepareSendMenuDetails(descriptor))
 , _sendMenuCallback(prepareSendMenuCallback())
-, _captionToPeer(descriptor.captionToPeer)
+, _toPeer(descriptor.toPeer)
 , _check(std::move(descriptor.check))
 , _confirmedCallback(std::move(descriptor.confirmed))
 , _cancelledCallback(std::move(descriptor.cancelled))
-, _caption(this, _st.files.caption, Ui::InputField::Mode::MultiLine)
+, _caption(
+	this,
+	_st.files.caption,
+	Ui::InputField::Mode::MultiLine,
+	tr::lng_photo_caption())
 , _prefilledCaptionText(std::move(descriptor.caption))
 , _scroll(this, st::boxScroll)
 , _inner(
 	_scroll->setOwnedWidget(
 		object_ptr<Ui::VerticalLayout>(_scroll.data()))) {
+	setReplyTo(descriptor.replyTo);
 	enqueueNextPrepare();
 }
 
+void SendFilesBox::setReplyTo(FullReplyTo replyTo) {
+	if (_replyTo == replyTo) {
+		return;
+	} else if (!replyTo.messageId || !replyTo.messageId.peer) {
+		_replyTo = {};
+		if (_replyHeader) {
+			_replyHeader->hideAnimated();
+		}
+		return;
+	}
+	_replyTo = replyTo;
+	if (_replyHeader) {
+		_replyHeader = nullptr;
+		_replyHeaderHeight = 0;
+	}
+	_replyHeader = std::make_unique<SendFiles::ReplyPillHeader>(
+		this,
+		_show,
+		std::move(replyTo));
+	_replyHeader->setRoundedShapeBelow(
+		!_blocks.empty() && !_blocks.front().isSingleFile());
+	_replyHeader->show();
+	_replyHeader->desiredHeight(
+	) | rpl::on_next([=](int height) {
+		if (_replyHeaderHeight.current() != height) {
+			_replyHeaderHeight = height;
+			updateBoxSize();
+			updateControlsGeometry();
+		}
+	}, _replyHeader->lifetime());
+	_replyHeader->closeRequests(
+	) | rpl::on_next([=] {
+		_replyTo = {};
+		if (_replyHeader) {
+			_replyHeader->hideAnimated();
+		}
+	}, _replyHeader->lifetime());
+	_replyHeader->hideFinished(
+	) | rpl::on_next([=] {
+		InvokeQueued(this, [=] {
+			_replyHeader = nullptr;
+			_replyHeaderHeight = 0;
+			updateBoxSize();
+			updateControlsGeometry();
+		});
+	}, _replyHeader->lifetime());
+}
+
 Fn<SendMenu::Details()> SendFilesBox::prepareSendMenuDetails(
 		const SendFilesBoxDescriptor &descriptor) {
 	auto initial = descriptor.sendMenuDetails;
@@ -487,15 +761,18 @@ Fn<SendMenu::Details()> SendFilesBox::prepareSendMenuDetails(
 			? SendMenu::SpoilerState::Enabled
 			: SendMenu::SpoilerState::Possible;
 		const auto way = _sendWay.current();
-		const auto canMoveCaption = _list.canMoveCaption(
-			way.groupFiles() && way.sendImagesAsPhotos(),
-			way.sendImagesAsPhotos()
-		) && _caption && HasSendText(_caption);
+		const auto canMoveCaption = canMoveCaptionInCurrentSendWay()
+			&& HasSendText(_caption);
 		result.caption = !canMoveCaption
 			? SendMenu::CaptionState::None
 			: _invertCaption
 			? SendMenu::CaptionState::Above
 			: SendMenu::CaptionState::Below;
+		result.photoQuality = !hasSendLargePhotosOption()
+			? SendMenu::PhotoQualityState::None
+			: way.sendLargePhotos()
+			? SendMenu::PhotoQualityState::High
+			: SendMenu::PhotoQualityState::Standard;
 		result.price = canChangePrice()
 			? _price.current()
 			: std::optional<uint64>();
@@ -510,6 +787,8 @@ auto SendFilesBox::prepareSendMenuCallback()
 		switch (action.type) {
 		case Type::CaptionDown: _invertCaption = false; break;
 		case Type::CaptionUp: _invertCaption = true; break;
+		case Type::PhotoQualityOn: setSendLargePhotos(true); break;
+		case Type::PhotoQualityOff: setSendLargePhotos(false); break;
 		case Type::SpoilerOn: toggleSpoilers(true); break;
 		case Type::SpoilerOff: toggleSpoilers(false); break;
 		case Type::ChangePrice: changePrice(); break;
@@ -539,7 +818,7 @@ void SendFilesBox::initPreview() {
 		_footerHeight.value(),
 		_titleHeight.value(),
 		_1 + _2 + _3
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(
 			st::boxWideWidth,
 			std::min(st::sendMediaPreviewHeightMax, height),
@@ -562,9 +841,9 @@ void SendFilesBox::enqueueNextPrepare() {
 	}
 	auto file = std::move(_list.filesToProcess.front());
 	_list.filesToProcess.pop_front();
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	_preparing = true;
-	const auto sideLimit = PhotoSideLimit(); // Get on main thread.
+	const auto sideLimit = PhotoSideLimit(_sendWay.current().sendLargePhotos());
 	crl::async([weak, sideLimit, file = std::move(file)]() mutable {
 		Storage::PrepareDetails(file, st::sendMediaPreviewSize, sideLimit);
 		crl::on_main([weak, file = std::move(file)]() mutable {
@@ -584,8 +863,8 @@ void SendFilesBox::prepare() {
 	SetupShadowsToScrollContent(this, _scroll, _inner->heightValue());
 	setCloseByOutsideClick(false);
 
-	boxClosing() | rpl::start_with_next([=] {
-		if (!_confirmed && _cancelledCallback) {
+	boxClosing() | rpl::on_next([=] {
+		if (!_confirmed && !_textTaken && _cancelledCallback) {
 			_cancelledCallback();
 		}
 	}, lifetime());
@@ -598,7 +877,9 @@ void SendFilesBox::setupDragArea() {
 	auto computeState = [=](const QMimeData *data) {
 		using DragState = Storage::MimeDataState;
 		const auto state = Storage::ComputeMimeDataState(data);
-		return (state == DragState::PhotoFiles || state == DragState::Image)
+		return (state == DragState::PhotoFiles
+			|| state == DragState::Image
+			|| state == DragState::MediaFiles)
 			? (_sendWay.current().sendImagesAsPhotos()
 				? DragState::Image
 				: DragState::Files)
@@ -613,7 +894,7 @@ void SendFilesBox::setupDragArea() {
 
 	const auto droppedCallback = [=](bool compress) {
 		return [=](const QMimeData *data) {
-			addFiles(data);
+			addFiles(data, compress);
 			_show->activate();
 		};
 	};
@@ -650,6 +931,30 @@ void SendFilesBox::refreshAllAfterChanges(int fromItem, Fn<void()> perform) {
 	captionResized();
 }
 
+bool SendFilesBox::setDisplayNameInSingleFilePreview(
+		int fileIndex,
+		const QString &displayName) {
+	for (auto &block : _blocks) {
+		if (fileIndex < block.fromIndex() || fileIndex >= block.tillIndex()) {
+			continue;
+		}
+		return block.setSingleFileDisplayName(displayName);
+	}
+	return false;
+}
+
+bool SendFilesBox::setCaptionInSingleFilePreview(
+		int fileIndex,
+		const TextWithTags &caption) {
+	for (auto &block : _blocks) {
+		if (fileIndex < block.fromIndex() || fileIndex >= block.tillIndex()) {
+			continue;
+		}
+		return block.setSingleFileCaption(fileIndex, caption);
+	}
+	return false;
+}
+
 void SendFilesBox::openDialogToAddFileToAlbum() {
 	const auto show = uiShow();
 	const auto checkResult = [=](const Ui::PreparedList &list) {
@@ -678,6 +983,10 @@ void SendFilesBox::openDialogToAddFileToAlbum() {
 		crl::guard(this, callback));
 }
 
+void SendFilesBox::refreshMessagesCount() {
+	_messagesCount = _list.files.size();
+}
+
 void SendFilesBox::refreshButtons() {
 	clearButtons();
 
@@ -686,14 +995,26 @@ void SendFilesBox::refreshButtons() {
 			? tr::lng_send_button()
 			: tr::lng_create_group_next()),
 		[=] { send({}); });
+	refreshMessagesCount();
+
+	const auto perMessage = _toPeer->starsPerMessageChecked();
+	if (perMessage > 0) {
+		_send->setText(PaidSendButtonText(_messagesCount.value(
+		) | rpl::map(rpl::mappers::_1 * perMessage)));
+	}
 	if (_sendType == Api::SendType::Normal) {
 		SendMenu::SetupMenuAndShortcuts(
 			_send,
 			_show,
 			_sendMenuDetails,
-			_sendMenuCallback);
+			_sendMenuCallback,
+			&_st.tabbed.menu,
+			&_st.tabbed.icons);
 	}
-	addButton(tr::lng_cancel(), [=] { closeBox(); });
+	addButton(tr::lng_cancel(), [=] {
+		requestToTakeTextWithTags();
+		closeBox();
+	});
 	_addFile = addLeftButton(
 		tr::lng_stickers_featured_add(),
 		base::fn_delayed(st::historyAttach.ripple.hideDuration, this, [=] {
@@ -706,7 +1027,9 @@ void SendFilesBox::refreshButtons() {
 bool SendFilesBox::hasSendMenu(const MenuDetails &details) const {
 	return (details.type != SendMenu::Type::Disabled)
 		|| (details.spoiler != SendMenu::SpoilerState::None)
-		|| (details.caption != SendMenu::CaptionState::None);
+		|| (details.caption != SendMenu::CaptionState::None)
+		|| (details.photoQuality != SendMenu::PhotoQualityState::None)
+		|| details.price.has_value();
 }
 
 bool SendFilesBox::hasSpoilerMenu() const {
@@ -714,11 +1037,31 @@ bool SendFilesBox::hasSpoilerMenu() const {
 		&& _list.hasSpoilerMenu(_sendWay.current().sendImagesAsPhotos());
 }
 
+bool SendFilesBox::hasSendLargePhotosOption() const {
+	return _list.hasSendLargePhotosOption(
+		_sendWay.current().sendImagesAsPhotos());
+}
+
+bool SendFilesBox::canMoveCaptionInCurrentSendWay() const {
+	const auto way = _sendWay.current();
+	if (!way.sendImagesAsPhotos() || !_list.canAddCaption(true)) {
+		return false;
+	}
+	const auto count = int(_list.files.size());
+	if (count < 1 || count > Ui::MaxAlbumItems()) {
+		return false;
+	}
+	const auto isPhotoOrVideo = [](const Ui::PreparedFile &file) {
+		return file.type == Ui::PreparedFile::Type::Photo
+			|| file.type == Ui::PreparedFile::Type::Video;
+	};
+	return (count == 1 || way.groupFiles())
+		&& ranges::all_of(_list.files, isPhotoOrVideo);
+}
+
 bool SendFilesBox::canChangePrice() const {
 	const auto way = _sendWay.current();
-	const auto broadcast = _captionToPeer
-		? _captionToPeer->asBroadcast()
-		: nullptr;
+	const auto broadcast = _toPeer->asBroadcast();
 	return broadcast
 		&& broadcast->canPostPaidMedia()
 		&& _list.canChangePrice(
@@ -746,8 +1089,17 @@ void SendFilesBox::toggleSpoilers(bool enabled) {
 	}
 }
 
+void SendFilesBox::setSendLargePhotos(bool enabled) {
+	auto way = _sendWay.current();
+	if (way.sendLargePhotos() == enabled) {
+		return;
+	}
+	way.setSendLargePhotos(enabled);
+	_sendWay = way;
+}
+
 void SendFilesBox::changePrice() {
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto session = &_show->session();
 	const auto now = _price.current();
 	_show->show(Box(EditPriceBox, session, now, [=](uint64 price) {
@@ -780,41 +1132,39 @@ void SendFilesBox::refreshPriceTag() {
 		const auto raw = _priceTag.get();
 
 		raw->show();
-		raw->paintRequest() | rpl::start_with_next([=] {
+		raw->paintRequest() | rpl::on_next([=] {
 			if (_priceTagBg.isNull()) {
 				_priceTagBg = preparePriceTagBg(raw->size());
 			}
 			QPainter(raw).drawImage(0, 0, _priceTagBg);
 		}, raw->lifetime());
 
-		const auto session = &_show->session();
 		auto price = _price.value() | rpl::map([=](uint64 amount) {
-			auto result = Ui::Text::Colorized(Ui::CreditsEmoji(session));
+			auto result = Ui::Text::Colorized(Ui::CreditsEmoji());
 			result.append(Lang::FormatCountDecimal(amount));
 			return result;
 		});
 		auto text = tr::lng_paid_price(
 			lt_price,
 			std::move(price),
-			Ui::Text::WithEntities);
+			tr::marked);
 		const auto label = Ui::CreateChild<Ui::FlatLabel>(
 			raw,
 			QString(),
 			st::paidTagLabel);
-		std::move(text) | rpl::start_with_next([=](TextWithEntities &&text) {
-			label->setMarkedText(text, Core::MarkedTextContext{
-				.session = session,
-				.customEmojiRepaint = [=] { label->update(); },
-			});
+		std::move(
+			text
+		) | rpl::on_next([=](const TextWithEntities &text) {
+			label->setMarkedText(text);
 		}, label->lifetime());
 		label->show();
-		label->sizeValue() | rpl::start_with_next([=](QSize size) {
+		label->sizeValue() | rpl::on_next([=](QSize size) {
 			const auto inner = QRect(QPoint(), size);
 			const auto rect = inner.marginsAdded(st::paidTagPadding);
 			raw->resize(rect.size());
 			label->move(-rect.topLeft());
 		}, label->lifetime());
-		_inner->sizeValue() | rpl::start_with_next([=](QSize size) {
+		_inner->sizeValue() | rpl::on_next([=](QSize size) {
 			raw->move(
 				(size.width() - raw->width()) / 2,
 				(size.height() - raw->height()) / 2);
@@ -868,6 +1218,7 @@ void SendFilesBox::addMenuButton() {
 	top->setClickedCallback([=] {
 		const auto &tabbed = _st.tabbed;
 		_menu = base::make_unique_q<Ui::PopupMenu>(top, tabbed.menu);
+		_menu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
 		const auto position = QCursor::pos();
 		SendMenu::FillSendMenu(
 			_menu.get(),
@@ -910,18 +1261,18 @@ void SendFilesBox::initSendWay() {
 		return result;
 	}();
 	_sendWay.changes(
-	) | rpl::start_with_next([=](SendFilesWay value) {
+	) | rpl::on_next([=](SendFilesWay value) {
 		const auto hidden = [&] {
-			return !_caption || _caption->isHidden();
+			return _caption->isHidden();
 		};
 		const auto was = hidden();
-		updateCaptionPlaceholder();
+		updateCaptionVisibility();
 		updateEmojiPanelGeometry();
-		for (auto &block : _blocks) {
-			block.setSendWay(value);
-		}
-		refreshButtons();
-		refreshPriceTag();
+		applyBlockChanges();
+		generatePreviewFrom(0);
+		_inner->resizeToWidth(st::boxWideWidth);
+		refreshControls();
+		captionResized();
 		if (was != hidden()) {
 			updateBoxSize();
 			updateControlsGeometry();
@@ -930,26 +1281,16 @@ void SendFilesBox::initSendWay() {
 	}, lifetime());
 }
 
-void SendFilesBox::updateCaptionPlaceholder() {
-	if (!_caption) {
-		return;
-	}
+void SendFilesBox::updateCaptionVisibility() {
 	const auto way = _sendWay.current();
-	if (!_list.canAddCaption(
-			way.groupFiles() && way.sendImagesAsPhotos(),
-			way.sendImagesAsPhotos())
-		&& ((_limits & SendFilesAllow::OnlyOne)
-			|| !(_limits & SendFilesAllow::Texts))) {
-		_caption->hide();
-		if (_emojiToggle) {
-			_emojiToggle->hide();
-		}
-	} else {
-		_caption->setPlaceholder(FieldPlaceholder(_list, way));
-		_caption->show();
-		if (_emojiToggle) {
-			_emojiToggle->show();
-		}
+	const auto can = _list.canAddCaption(way.sendImagesAsPhotos());
+	_caption->setVisible(can);
+	if (_emojiToggle) {
+		_emojiToggle->setVisible(can);
+	}
+	if (_aiButton) {
+		_aiButton->setVisible(can
+			&& Ui::HasEnoughLinesForAi(&_show->session(), _caption.data()));
 	}
 }
 
@@ -994,52 +1335,58 @@ void SendFilesBox::generatePreviewFrom(int fromBlock) {
 	if (albumStart >= 0) {
 		pushBlock(albumStart, _list.files.size());
 	}
+	if (_replyHeader) {
+		_replyHeader->setRoundedShapeBelow(
+			!_blocks.empty() && !_blocks.front().isSingleFile());
+	}
 }
 
 void SendFilesBox::pushBlock(int from, int till) {
 	const auto gifPaused = [show = _show] {
 		return show->paused(Window::GifPauseReason::Layer);
 	};
+	const auto captionContext = Core::TextContext({
+		.session = &_show->session(),
+	});
 	_blocks.emplace_back(
 		_inner.data(),
 		_st,
 		&_list.files,
 		from,
 		till,
+		captionContext,
 		gifPaused,
-		_sendWay.current(),
-		[=] { return !hasPrice(); });
+		_sendWay.current());
 	auto &block = _blocks.back();
 	const auto widget = _inner->add(
 		block.takeWidget(),
 		QMargins(0, _inner->count() ? st::sendMediaRowSkip : 0, 0, 0));
-
-	block.itemDeleteRequest(
-	) | rpl::filter([=] {
-		return !_removingIndex;
-	}) | rpl::start_with_next([=](int index) {
+	struct State {
+		base::unique_qptr<Ui::PopupMenu> menu;
+	};
+	const auto state = widget->lifetime().make_state<State>();
+	const auto openedOnce = widget->lifetime().make_state<bool>(false);
+	const auto openInPhotoEditor = [=, show = _show](int index) {
 		applyBlockChanges();
 
-		_removingIndex = index;
-		crl::on_main(this, [=] {
-			const auto index = base::take(_removingIndex).value_or(-1);
-			if (index < 0 || index >= _list.files.size()) {
-				return;
-			}
-			// Just close the box if it is the only one.
-			if (_list.files.size() == 1) {
-				closeBox();
-				return;
-			}
-			refreshAllAfterChanges(index, [&] {
-				_list.files.erase(_list.files.begin() + index);
-			});
-		});
-	}, widget->lifetime());
-
-	const auto show = uiShow();
-	block.itemReplaceRequest(
-	) | rpl::start_with_next([=](int index) {
+		if (!(*openedOnce)) {
+			show->session().settings().incrementPhotoEditorHintShown();
+			show->session().saveSettings();
+		}
+		*openedOnce = true;
+		Editor::OpenWithPreparedFile(
+			this,
+			show,
+			&_list.files[index],
+			st::sendMediaPreviewSize,
+			[=](bool ok) {
+				if (ok) {
+					refreshAllAfterChanges(from);
+				}
+			},
+			PhotoSideLimit(true));
+	};
+	const auto replaceAttachment = [=, show = _show](int index) {
 		applyBlockChanges();
 
 		const auto replace = [=](Ui::PreparedList list) {
@@ -1112,32 +1459,287 @@ void SendFilesBox::pushBlock(int from, int till) {
 			tr::lng_choose_file(tr::now),
 			FileDialog::AllOrImagesFilter(),
 			crl::guard(this, callback));
+	};
+	const auto editCover = [=, show = _show](int index) {
+		applyBlockChanges();
+
+		const auto replace = [=](Ui::PreparedList list) {
+			if (list.files.empty()) {
+				return;
+			}
+			auto &entry = _list.files[index];
+			const auto video = entry.information
+				? std::get_if<Ui::PreparedFileInformation::Video>(
+					&entry.information->media)
+				: nullptr;
+			if (!video) {
+				return;
+			}
+			auto old = std::shared_ptr<Ui::PreparedFile>(
+				std::move(entry.videoCover));
+			entry.videoCover = std::make_unique<Ui::PreparedFile>(
+				std::move(list.files.front()));
+			Editor::OpenWithPreparedFile(
+				this,
+				show,
+				entry.videoCover.get(),
+				st::sendMediaPreviewSize,
+				crl::guard(this, [=](bool ok) {
+					if (!ok) {
+						_list.files[index].videoCover = old
+							? std::make_unique<Ui::PreparedFile>(
+								std::move(*old))
+							: nullptr;
+					}
+					refreshAllAfterChanges(from);
+				}),
+				PhotoSideLimit(true),
+				video->thumbnail.size());
+		};
+		const auto checkResult = [=](const Ui::PreparedList &list) {
+			if (list.files.empty()) {
+				return true;
+			}
+			if (list.files.front().type != Ui::PreparedFile::Type::Photo) {
+				show->showToast(tr::lng_choose_cover_bad(tr::now));
+				return false;
+			}
+			return true;
+		};
+		const auto callback = [=](FileDialog::OpenResult &&result) {
+			const auto premium = _show->session().premium();
+			FileDialogCallback(
+				std::move(result),
+				checkResult,
+				replace,
+				premium,
+				show);
+		};
+
+		FileDialog::GetOpenPath(
+			this,
+			tr::lng_choose_cover(tr::now),
+			FileDialog::ImagesFilter(),
+			crl::guard(this, callback));
+	};
+	const auto clearCover = [=](int index) {
+		applyBlockChanges();
+		refreshAllAfterChanges(from, [&] {
+			auto &entry = _list.files[index];
+			entry.videoCover = nullptr;
+		});
+	};
+	const auto renameFile = [=](int fileIndex) {
+		if (fileIndex < 0 || fileIndex >= _list.files.size()) {
+			return;
+		}
+		const auto &file = _list.files[fileIndex];
+		const auto canEditFileData = !SkipCaption(
+			file,
+			_sendWay.current());
+		if (!canEditFileData) {
+			return;
+		}
+		const auto allowExtensionEdit = file.path.isEmpty();
+		_show->show(Box(
+			RenameFileBox,
+			file.displayName,
+			allowExtensionEdit,
+			[=](QString newName) {
+				const auto displayName = std::move(newName);
+				_list.files[fileIndex].displayName = displayName;
+				if (!setDisplayNameInSingleFilePreview(
+						fileIndex,
+						displayName)) {
+					refreshAllAfterChanges(from);
+				}
+			}));
+	};
+	const auto showContextMenu = [=](
+			int fileIndex,
+			QPoint globalPosition,
+			bool forceToLeft = false) {
+		if (from >= till
+			|| fileIndex < from
+			|| fileIndex >= till
+			|| fileIndex >= _list.files.size()) {
+			return false;
+		}
+		state->menu = base::make_unique_q<Ui::PopupMenu>(
+			widget,
+			_st.tabbed.menu);
+		if (forceToLeft) {
+			using Origin = Ui::PanelAnimation::Origin;
+			state->menu->setForcedOrigin(Origin::TopRight);
+		}
+		const auto &file = _list.files[fileIndex];
+		state->menu->addAction(tr::lng_attach_replace(tr::now), [=] {
+			replaceAttachment(fileIndex);
+		}, &st::menuIconReplace);
+		const auto canOpenPhotoEditor = true
+			&& _sendWay.current().sendImagesAsPhotos()
+			&& (file.type == Ui::PreparedFile::Type::Photo);
+		if (canOpenPhotoEditor) {
+			state->menu->addAction(tr::lng_context_draw(tr::now), [=] {
+				openInPhotoEditor(fileIndex);
+			}, &st::menuIconDraw);
+		}
+		const auto canEditFileData = !SkipCaption(
+			file,
+			_sendWay.current());
+		if (canEditFileData) {
+			state->menu->addAction(tr::lng_rename_file(tr::now), [=] {
+				renameFile(fileIndex);
+			}, &st::menuIconEdit);
+			state->menu->addAction(
+				tr::lng_context_upload_edit_caption(tr::now),
+				[=] {
+					auto &file = _list.files[fileIndex];
+					const auto count = int(_list.files.size());
+					const auto sync = (fileIndex + 1 == count);
+					_show->show(Box(
+						EditFileCaptionBox,
+						_st,
+						_toPeer,
+						sync ? fieldText() : file.caption,
+						[=](TextWithTags text) {
+							if (!validateLength(text.text)) {
+								return false;
+							}
+							if (sync) {
+								_caption->setTextWithTags(
+									base::take(text));
+							}
+							_list.files[fileIndex].caption = text;
+							if (!setCaptionInSingleFilePreview(
+									fileIndex,
+									text)) {
+								refreshAllAfterChanges(from);
+							}
+							return true;
+						}));
+				},
+					&st::menuIconCaptionShow);
+		}
+		const auto canToggleSpoiler = !hasPrice()
+			&& _sendWay.current().sendImagesAsPhotos()
+			&& (file.type == Ui::PreparedFile::Type::Photo
+				|| file.type == Ui::PreparedFile::Type::Video);
+		if (canToggleSpoiler) {
+			const auto spoilered = file.spoiler;
+			const auto &icons = _st.tabbed.icons;
+			Menu::AddCheckedAction(
+				state->menu.get(),
+				tr::lng_context_spoiler_effect(tr::now),
+				[=] {
+					applyBlockChanges();
+					refreshAllAfterChanges(from, [&] {
+						auto &entry = _list.files[fileIndex];
+						entry.spoiler = !spoilered;
+					});
+				},
+				&icons.menuSpoiler,
+				spoilered);
+		}
+		const auto canEditCover = file.isVideoFile()
+			&& (_toPeer->isBroadcast() || _toPeer->isSelf());
+		if (canEditCover) {
+			state->menu->addAction(tr::lng_context_edit_cover(tr::now), [=] {
+				editCover(fileIndex);
+			}, &st::menuIconEdit);
+
+			if (file.videoCover != nullptr) {
+				state->menu->addAction(
+					tr::lng_context_clear_cover(tr::now),
+					[=] { clearCover(fileIndex); },
+					&st::menuIconCancel);
+			}
+		}
+		if (state->menu->empty()) {
+			state->menu = nullptr;
+			return false;
+		}
+		state->menu->popup(globalPosition);
+		return true;
+	};
+
+	block.itemDeleteRequest(
+	) | rpl::filter([=] {
+		return !_removingIndex;
+	}) | rpl::on_next([=](int index) {
+		applyBlockChanges();
+
+		_removingIndex = index;
+		crl::on_main(this, [=] {
+			const auto index = base::take(_removingIndex).value_or(-1);
+			if (index < 0 || index >= _list.files.size()) {
+				return;
+			}
+			// Just close the box if it is the only one.
+			if (_list.files.size() == 1) {
+				requestToTakeTextWithTags();
+				closeBox();
+				return;
+			}
+			refreshAllAfterChanges(index, [&] {
+				_list.files.erase(_list.files.begin() + index);
+				if (index == _list.files.size()) {
+					auto &last = _list.files.back();
+					const auto was = base::take(last.caption);
+					if (fieldText().empty() && !last.isSticker()) {
+						_caption->setTextWithTags(was);
+					}
+				}
+			});
+		});
+	}, widget->lifetime());
+
+	block.itemReplaceRequest(
+	) | rpl::on_next([=](int index) {
+		showContextMenu(index, QCursor::pos(), true);
 	}, widget->lifetime());
 
-	const auto openedOnce = widget->lifetime().make_state<bool>(false);
 	block.itemModifyRequest(
-	) | rpl::start_with_next([=, show = _show](int index) {
-		applyBlockChanges();
+	) | rpl::on_next([=](int index) {
+		openInPhotoEditor(index);
+	}, widget->lifetime());
 
-		if (!(*openedOnce)) {
-			show->session().settings().incrementPhotoEditorHintShown();
-			show->session().saveSettings();
-		}
-		*openedOnce = true;
-		Editor::OpenWithPreparedFile(
-			this,
-			show,
-			&_list.files[index],
-			st::sendMediaPreviewSize,
-			[=] { refreshAllAfterChanges(from); });
+	block.itemRenameRequest(
+	) | rpl::on_next([=](int index) {
+		renameFile(index);
 	}, widget->lifetime());
 
-	block.orderUpdated() | rpl::start_with_next([=]{
+	block.orderUpdated() | rpl::on_next([=]{
 		if (_priceTag) {
 			_priceTagBg = QImage();
 			_priceTag->update();
 		}
 	}, widget->lifetime());
+
+	base::install_event_filter(widget, [=](
+			not_null<QEvent*> e) {
+		if (e->type() == QEvent::ContextMenu) {
+			const auto mouse = static_cast<QContextMenuEvent*>(e.get());
+			if (from >= till || from >= _list.files.size()) {
+				return base::EventFilterResult::Continue;
+			}
+			auto fileIndex = from;
+			if (const auto album = dynamic_cast<Ui::AlbumPreview*>(widget)) {
+				const auto indexInBlock = album->indexFromPoint(mouse->pos());
+				if (indexInBlock < 0) {
+					return base::EventFilterResult::Continue;
+				}
+				fileIndex += indexInBlock;
+			}
+			if (fileIndex >= till || fileIndex >= _list.files.size()) {
+				return base::EventFilterResult::Continue;
+			}
+			if (showContextMenu(fileIndex, mouse->globalPos())) {
+				return base::EventFilterResult::Cancel;
+			}
+		}
+		return base::EventFilterResult::Continue;
+	}, widget->lifetime());
 }
 
 void SendFilesBox::refreshControls(bool initial) {
@@ -1145,7 +1747,7 @@ void SendFilesBox::refreshControls(bool initial) {
 	refreshPriceTag();
 	refreshTitleText();
 	updateSendWayControls();
-	updateCaptionPlaceholder();
+	updateCaptionVisibility();
 }
 
 void SendFilesBox::setupSendWayControls() {
@@ -1159,19 +1761,19 @@ void SendFilesBox::setupSendWayControls() {
 		_st.files.check);
 	_sendImagesAsPhotos.create(
 		this,
-		tr::lng_send_compressed(tr::now),
-		_sendWay.current().sendImagesAsPhotos(),
+		tr::lng_send_as_documents(tr::now),
+		!_sendWay.current().sendImagesAsPhotos(),
 		_st.files.checkbox,
 		_st.files.check);
 
 	_sendWay.changes(
-	) | rpl::start_with_next([=](SendFilesWay value) {
+	) | rpl::on_next([=](SendFilesWay value) {
 		_groupFiles->setChecked(value.groupFiles());
-		_sendImagesAsPhotos->setChecked(value.sendImagesAsPhotos());
+		_sendImagesAsPhotos->setChecked(!value.sendImagesAsPhotos());
 	}, lifetime());
 
 	_groupFiles->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		auto sendWay = _sendWay.current();
 		if (sendWay.groupFiles() == checked) {
 			return;
@@ -1187,12 +1789,12 @@ void SendFilesBox::setupSendWayControls() {
 	}, lifetime());
 
 	_sendImagesAsPhotos->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		auto sendWay = _sendWay.current();
-		if (sendWay.sendImagesAsPhotos() == checked) {
+		if (sendWay.sendImagesAsPhotos() == !checked) {
 			return;
 		}
-		sendWay.setSendImagesAsPhotos(checked);
+		sendWay.setSendImagesAsPhotos(!checked);
 		if (checkWithWay(sendWay)) {
 			_sendWay = sendWay;
 		} else {
@@ -1212,9 +1814,10 @@ void SendFilesBox::setupSendWayControls() {
 	rpl::combine(
 		_groupFiles->checkedValue(),
 		_sendImagesAsPhotos->checkedValue()
-	) | rpl::start_with_next([=](bool groupFiles, bool asPhoto) {
+	) | rpl::on_next([=](bool groupFiles, bool asDocuments) {
 		_wayRemember->setVisible(
-			(groupFiles != groupFilesFirst) || (asPhoto != asPhotosFirst));
+			(groupFiles != groupFilesFirst)
+				|| ((!asDocuments) != asPhotosFirst));
 		captionResized();
 	}, lifetime());
 
@@ -1251,8 +1854,8 @@ void SendFilesBox::updateSendWayControls() {
 	_sendImagesAsPhotos->setVisible(
 		_list.hasSendImagesAsPhotosOption(onlyOne));
 	_sendImagesAsPhotos->setText((_list.files.size() > 1)
-		? tr::lng_send_compressed(tr::now)
-		: tr::lng_send_compressed_one(tr::now));
+		? tr::lng_send_as_documents(tr::now)
+		: tr::lng_send_as_documents_one(tr::now));
 
 	_hintLabel->setVisible(
 		_show->session().settings().photoEditorHintShown()
@@ -1262,12 +1865,10 @@ void SendFilesBox::updateSendWayControls() {
 
 void SendFilesBox::setupCaption() {
 	const auto allow = [=](not_null<DocumentData*> emoji) {
-		return _captionToPeer
-			? Data::AllowEmojiWithoutPremium(_captionToPeer, emoji)
-			: (_limits & SendFilesAllow::EmojiWithoutPremium);
+		return Data::AllowEmojiWithoutPremium(_toPeer, emoji);
 	};
 	const auto show = _show;
-	InitMessageFieldHandlers({
+	const auto chatStyle = InitMessageFieldHandlers({
 		.session = &show->session(),
 		.show = show,
 		.field = _caption.data(),
@@ -1299,21 +1900,23 @@ void SendFilesBox::setupCaption() {
 	}
 	_caption->setSubmitSettings(
 		Core::App().settings().sendSubmitWay());
-	_caption->setMaxLength(kMaxMessageLength);
+	_caption->setMaxLength(
+		Data::PremiumLimits(&_show->session()).captionLengthCurrent());
 
 	_caption->heightChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		captionResized();
 	}, _caption->lifetime());
 	_caption->submits(
-	) | rpl::start_with_next([=](Qt::KeyboardModifiers modifiers) {
+	) | rpl::on_next([=](Qt::KeyboardModifiers modifiers) {
 		const auto ctrlShiftEnter = modifiers.testFlag(Qt::ShiftModifier)
 			&& (modifiers.testFlag(Qt::ControlModifier)
 				|| modifiers.testFlag(Qt::MetaModifier));
 		send({}, ctrlShiftEnter);
 	}, _caption->lifetime());
 	_caption->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
+		requestToTakeTextWithTags();
 		closeBox();
 	}, _caption->lifetime());
 	_caption->setMimeDataHook([=](
@@ -1327,26 +1930,32 @@ void SendFilesBox::setupCaption() {
 		Unexpected("action in MimeData hook.");
 	});
 
-	updateCaptionPlaceholder();
+	updateCaptionVisibility();
 	setupEmojiPanel();
 
 	rpl::single(rpl::empty_value()) | rpl::then(
 		_caption->changes()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkCharsLimitation();
+		refreshMessagesCount();
 	}, _caption->lifetime());
+
+	_aiButton = Ui::SetupCaptionAiButton({
+		.parent = this,
+		.field = _caption.data(),
+		.session = &_show->session(),
+		.show = _show,
+		.chatStyle = chatStyle,
+	});
 }
 
 void SendFilesBox::setupCaptionAutocomplete() {
-	if (!_captionToPeer || !_caption) {
-		return;
-	}
 	const auto parent = getDelegate()->outerContainer();
 	ChatHelpers::InitFieldAutocomplete(_autocomplete, {
 		.parent = parent,
 		.show = _show,
 		.field = _caption.data(),
-		.peer = _captionToPeer,
+		.peer = _toPeer,
 		.features = [=] {
 			auto result = ChatHelpers::ComposeFeatures();
 			result.autocompleteCommands = false;
@@ -1390,11 +1999,15 @@ void SendFilesBox::setupCaptionAutocomplete() {
 	}
 }
 
-void SendFilesBox::checkCharsLimitation() {
-	const auto limits = Data::PremiumLimits(&_show->session());
-	const auto caption = (_caption && !_caption->isHidden())
+TextWithTags SendFilesBox::fieldText() const {
+	return !_caption->isHidden()
 		? _caption->getTextWithAppliedMarkdown()
 		: TextWithTags();
+}
+
+void SendFilesBox::checkCharsLimitation() {
+	const auto limits = Data::PremiumLimits(&_show->session());
+	const auto caption = fieldText();
 	const auto remove = caption.text.size() - limits.captionLengthCurrent();
 	if ((remove > 0) && _emojiToggle) {
 		if (!_charsLimitation) {
@@ -1405,7 +2018,7 @@ void SendFilesBox::checkCharsLimitation() {
 			_charsLimitation->show();
 			Data::AmPremiumValue(
 				&_show->session()
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				checkCharsLimitation();
 			}, _charsLimitation->lifetime());
 		}
@@ -1418,8 +2031,6 @@ void SendFilesBox::checkCharsLimitation() {
 }
 
 void SendFilesBox::setupEmojiPanel() {
-	Expects(_caption != nullptr);
-
 	const auto container = getDelegate()->outerContainer();
 	using Selector = ChatHelpers::TabbedSelector;
 	_emojiPanel = base::make_unique_q<ChatHelpers::TabbedPanel>(
@@ -1443,24 +2054,20 @@ void SendFilesBox::setupEmojiPanel() {
 		st::emojiPanMinHeight / 2,
 		st::emojiPanMinHeight);
 	_emojiPanel->hide();
-	_emojiPanel->selector()->setCurrentPeer(_captionToPeer);
+	_emojiPanel->selector()->setCurrentPeer(_toPeer);
 	_emojiPanel->selector()->setAllowEmojiWithoutPremium(
 		_limits & SendFilesAllow::EmojiWithoutPremium);
 	_emojiPanel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(_caption->textCursor(), data.emoji);
 	}, lifetime());
 	_emojiPanel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		const auto info = data.document->sticker();
 		if (info
 			&& info->setType == Data::StickersType::Emoji
 			&& !_show->session().premium()
-			&& !(_captionToPeer
-				? Data::AllowEmojiWithoutPremium(
-					_captionToPeer,
-					data.document)
-				: (_limits & SendFilesAllow::EmojiWithoutPremium))) {
+			&& !Data::AllowEmojiWithoutPremium(_toPeer, data.document)) {
 			ShowPremiumPreviewBox(_show, PremiumFeature::AnimatedEmoji);
 		} else {
 			Data::InsertCustomEmoji(_caption.data(), data.document);
@@ -1506,7 +2113,9 @@ void SendFilesBox::captionResized() {
 	update();
 }
 
-bool SendFilesBox::addFiles(not_null<const QMimeData*> data) {
+bool SendFilesBox::addFiles(
+		not_null<const QMimeData*> data,
+		std::optional<bool> overrideSendImagesAsPhotos) {
 	const auto premium = _show->session().premium();
 	auto list = [&] {
 		const auto urls = Core::ReadMimeUrls(data);
@@ -1528,13 +2137,30 @@ bool SendFilesBox::addFiles(not_null<const QMimeData*> data) {
 		}
 		return result;
 	}();
+	if (overrideSendImagesAsPhotos.has_value()) {
+		list.overrideSendImagesAsPhotos = overrideSendImagesAsPhotos;
+	}
 	return addFiles(std::move(list));
 }
 
+void SendFilesBox::applySendImagesAsPhotosOverride(
+		const Ui::PreparedList &list) {
+	if (!list.overrideSendImagesAsPhotos.has_value()) {
+		return;
+	}
+	_list.overrideSendImagesAsPhotos = list.overrideSendImagesAsPhotos;
+	auto candidate = _sendWay.current();
+	candidate.setSendImagesAsPhotos(*list.overrideSendImagesAsPhotos);
+	if (checkWith(list, candidate, true)) {
+		_sendWay = candidate;
+	}
+}
+
 bool SendFilesBox::addFiles(Ui::PreparedList list) {
 	if (list.error != Ui::PreparedList::Error::None) {
 		return false;
 	}
+	applySendImagesAsPhotosOverride(list);
 	const auto count = int(_list.files.size());
 	_list.filesToProcess.insert(
 		_list.filesToProcess.end(),
@@ -1615,9 +2241,10 @@ void SendFilesBox::refreshTitleText() {
 
 void SendFilesBox::updateBoxSize() {
 	auto footerHeight = 0;
-	if (_caption && !_caption->isHidden()) {
+	if (!_caption->isHidden()) {
 		footerHeight += st::boxPhotoCaptionSkip + _caption->height();
 	}
+	footerHeight += _replyHeaderHeight.current();
 	const auto pairs = std::array<std::pair<RpWidget*, int>, 4>{ {
 		{ _groupFiles.data(), st::boxPhotoCompressedSkip },
 		{ _sendImagesAsPhotos.data(), st::boxPhotoCompressedSkip },
@@ -1670,7 +2297,7 @@ void SendFilesBox::resizeEvent(QResizeEvent *e) {
 
 void SendFilesBox::updateControlsGeometry() {
 	auto bottom = height();
-	if (_caption && !_caption->isHidden()) {
+	if (!_caption->isHidden()) {
 		_caption->resize(st::sendMediaPreviewSize, _caption->height());
 		_caption->moveToLeft(
 			st::boxPhotoPadding.left(),
@@ -1685,6 +2312,10 @@ void SendFilesBox::updateControlsGeometry() {
 				_caption->y() + st::boxAttachEmojiTop);
 			_emojiToggle->update();
 		}
+		if (_aiButton) {
+			Ui::UpdateCaptionAiButtonGeometry(_aiButton, _caption.data());
+			_aiButton->raise();
+		}
 	}
 	const auto pairs = std::array<std::pair<RpWidget*, int>, 4>{ {
 		{ _hintLabel.data(), st::editMediaLabelMargins.top() },
@@ -1701,8 +2332,14 @@ void SendFilesBox::updateControlsGeometry() {
 			bottom -= pair.second + pointer->heightNoMargins();
 		}
 	}
-	_scroll->resize(width(), bottom - _titleHeight.current());
-	_scroll->move(0, _titleHeight.current());
+	const auto replyH = _replyHeaderHeight.current();
+	const auto replyTopOverlap = std::min(st::boxPhotoCaptionSkip, replyH);
+	const auto replyTop = _titleHeight.current() - replyTopOverlap;
+	if (_replyHeader) {
+		_replyHeader->setGeometry(0, replyTop, width(), replyH);
+	}
+	_scroll->resize(width(), bottom - replyTop - replyH);
+	_scroll->move(0, replyTop + replyH);
 }
 
 void SendFilesBox::showFinished() {
@@ -1713,22 +2350,42 @@ void SendFilesBox::showFinished() {
 	}
 }
 
+rpl::producer<TextWithTags> SendFilesBox::takeTextWithTagsRequests() const {
+	return _textWithTagsRequests.events();
+}
+
+void SendFilesBox::requestToTakeTextWithTags() {
+	if (_caption->isHidden()) {
+		return;
+	}
+	const auto text = _caption->getTextWithTags();
+	if (text.text.isEmpty()) {
+		return;
+	}
+	_textTaken = true;
+	_textWithTagsRequests.fire_copy(text);
+}
+
 void SendFilesBox::setInnerFocus() {
-	if (_caption && !_caption->isHidden()) {
+	if (!_caption->isHidden()) {
 		_caption->setFocusFast();
 	} else {
 		BoxContent::setInnerFocus();
 	}
 }
 
-void SendFilesBox::saveSendWaySettings() {
+void SendFilesBox::saveSendWaySettings(bool rememberAll) {
 	auto way = _sendWay.current();
 	auto oldWay = Core::App().settings().sendFilesWay();
-	if (_groupFiles->isHidden()) {
+	if (!rememberAll) {
+		way.setGroupFiles(oldWay.groupFiles());
+		way.setSendImagesAsPhotos(oldWay.sendImagesAsPhotos());
+	} else if (_groupFiles->isHidden()) {
 		way.setGroupFiles(oldWay.groupFiles());
 	}
-	if (_list.overrideSendImagesAsPhotos == way.sendImagesAsPhotos()
-		|| _sendImagesAsPhotos->isHidden()) {
+	if (rememberAll
+		&& (_list.overrideSendImagesAsPhotos == way.sendImagesAsPhotos()
+			|| _sendImagesAsPhotos->isHidden())) {
 		way.setSendImagesAsPhotos(oldWay.sendImagesAsPhotos());
 	}
 	if (way != oldWay) {
@@ -1741,11 +2398,7 @@ bool SendFilesBox::validateLength(const QString &text) const {
 	const auto session = &_show->session();
 	const auto limit = Data::PremiumLimits(session).captionLengthCurrent();
 	const auto remove = int(text.size()) - limit;
-	const auto way = _sendWay.current();
-	if (remove <= 0
-		|| !_list.canAddCaption(
-			way.groupFiles() && way.sendImagesAsPhotos(),
-			way.sendImagesAsPhotos())) {
+	if (remove <= 0) {
 		return true;
 	}
 	_show->showBox(
@@ -1762,6 +2415,7 @@ void SendFilesBox::send(
 		auto child = _sendMenuDetails();
 		child.spoiler = SendMenu::SpoilerState::None;
 		child.caption = SendMenu::CaptionState::None;
+		child.photoQuality = SendMenu::PhotoQualityState::None;
 		child.price = std::nullopt;
 		return SendMenu::DefaultCallback(_show, sendCallback())(
 			{ .type = SendMenu::ActionType::Schedule },
@@ -1774,25 +2428,31 @@ void SendFilesBox::send(
 		return;
 	}
 
-	if (_wayRemember && _wayRemember->checked()) {
-		saveSendWaySettings();
-	}
+	const auto way = _sendWay.current();
 
 	for (auto &item : _list.files) {
 		item.spoiler = false;
 	}
 	applyBlockChanges();
+	for (auto &item : _list.files) {
+		item.sendLargePhotos = way.sendLargePhotos();
+	}
 
 	Storage::ApplyModifications(_list);
 
 	_confirmed = true;
 	if (_confirmedCallback) {
-		auto caption = (_caption && !_caption->isHidden())
-			? _caption->getTextWithAppliedMarkdown()
-			: TextWithTags();
+		auto caption = fieldText();
 		if (!validateLength(caption.text)) {
 			return;
 		}
+		for (const auto &file : _list.files) {
+			if (!SkipCaption(file, way)
+				&& !validateLength(file.caption.text)) {
+				return;
+			}
+		}
+		saveSendWaySettings(_wayRemember && _wayRemember->checked());
 		options.invertCaption = _invertCaption;
 		options.price = hasPrice() ? _price.current() : 0;
 		if (options.price > 0) {
@@ -1800,12 +2460,37 @@ void SendFilesBox::send(
 				file.spoiler = false;
 			}
 		}
-		_confirmedCallback(
+		for (auto &file : _list.files) {
+			if (SkipCaption(file, way)) {
+				file.caption = {};
+			}
+		}
+
+		Assert(_list.filesToProcess.empty());
+
+		auto groups = DivideByGroups(
 			std::move(_list),
-			_sendWay.current(),
-			std::move(caption),
-			options,
+			way,
+			(_limits & SendFilesAllow::OnlyOne));
+		auto bundle = PrepareFilesBundle(
+			std::move(groups),
+			way,
 			ctrlShiftEnter);
+
+		if (!bundle->groups.empty()) {
+			auto &group = bundle->groups.back();
+			auto &files = group.list.files;
+			if (!files.empty()) {
+				auto &captioned = (group.type == Ui::AlbumType::PhotoVideo)
+					? files.front()
+					: files.back();
+				if (!captioned.isSticker() || way.sendImagesAsPhotos()) {
+					captioned.caption = std::move(caption);
+				}
+			}
+		}
+
+		_confirmedCallback(std::move(bundle), options, _replyTo);
 	}
 	closeBox();
 }
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index 6646ec10725239..4aad174c08cff2 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "base/flags.h"
+#include "data/data_msg_id.h"
 #include "ui/layers/box_content.h"
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/chat/attach/attach_send_files_way.h"
@@ -16,6 +17,10 @@ namespace style {
 struct ComposeControls;
 } // namespace style
 
+namespace Ui::Text {
+struct MarkedContext;
+} // namespace Ui::Text
+
 namespace Window {
 class SessionController;
 } // namespace Window
@@ -36,6 +41,7 @@ class Checkbox;
 class RoundButton;
 class InputField;
 struct GroupMediaLayout;
+struct PreparedBundle;
 class EmojiButton;
 class AlbumPreview;
 class VerticalLayout;
@@ -54,8 +60,13 @@ struct Action;
 
 namespace HistoryView::Controls {
 class CharactersLimitLabel;
+class ComposeAiButton;
 } // namespace HistoryView::Controls
 
+namespace SendFiles {
+class ReplyPillHeader;
+} // namespace SendFiles
+
 enum class SendFilesAllow {
 	OnlyOne = (1 << 0),
 	Photos = (1 << 1),
@@ -80,21 +91,24 @@ using SendFilesCheck = Fn<bool(
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer);
 [[nodiscard]] SendFilesCheck DefaultCheckForPeer(
-	std::shared_ptr<Ui::Show> show,
+	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<PeerData*> peer);
+void RenameFileBox(
+	not_null<Ui::GenericBox*> box,
+	const QString &currentName,
+	bool allowExtensionEdit,
+	Fn<void(QString)> apply);
 
 using SendFilesConfirmed = Fn<void(
-	Ui::PreparedList &&list,
-	Ui::SendFilesWay way,
-	TextWithTags &&caption,
-	Api::SendOptions options,
-	bool ctrlShiftEnter)>;
+	std::shared_ptr<Ui::PreparedBundle>,
+	Api::SendOptions,
+	FullReplyTo)>;
 
 struct SendFilesBoxDescriptor {
 	std::shared_ptr<ChatHelpers::Show> show;
 	Ui::PreparedList list;
 	TextWithTags caption;
-	PeerData *captionToPeer = nullptr;
+	not_null<PeerData*> toPeer;
 	SendFilesLimits limits = {};
 	SendFilesCheck check;
 	Api::SendType sendType = {};
@@ -102,6 +116,7 @@ struct SendFilesBoxDescriptor {
 	const style::ComposeControls *stOverride = nullptr;
 	SendFilesConfirmed confirmed;
 	Fn<void()> cancelled;
+	FullReplyTo replyTo;
 };
 
 class SendFilesBox : public Ui::BoxContent {
@@ -126,6 +141,9 @@ class SendFilesBox : public Ui::BoxContent {
 	void setCancelledCallback(Fn<void()> callback) {
 		_cancelledCallback = std::move(callback);
 	}
+	void setReplyTo(FullReplyTo replyTo);
+
+	[[nodiscard]] rpl::producer<TextWithTags> takeTextWithTagsRequests() const;
 
 	void showFinished() override;
 
@@ -151,19 +169,21 @@ class SendFilesBox : public Ui::BoxContent {
 			not_null<std::vector<Ui::PreparedFile>*> items,
 			int from,
 			int till,
+			const Ui::Text::MarkedContext &captionContext,
 			Fn<bool()> gifPaused,
-			Ui::SendFilesWay way,
-			Fn<bool()> canToggleSpoiler);
+			Ui::SendFilesWay way);
 		Block(Block &&other) = default;
 		Block &operator=(Block &&other) = default;
 
 		[[nodiscard]] int fromIndex() const;
 		[[nodiscard]] int tillIndex() const;
+		[[nodiscard]] bool isSingleFile() const;
 		[[nodiscard]] object_ptr<Ui::RpWidget> takeWidget();
 
 		[[nodiscard]] rpl::producer<int> itemDeleteRequest() const;
 		[[nodiscard]] rpl::producer<int> itemReplaceRequest() const;
 		[[nodiscard]] rpl::producer<int> itemModifyRequest() const;
+		[[nodiscard]] rpl::producer<int> itemRenameRequest() const;
 		[[nodiscard]] rpl::producer<> orderUpdated() const;
 
 		void setSendWay(Ui::SendFilesWay way);
@@ -171,6 +191,11 @@ class SendFilesBox : public Ui::BoxContent {
 		void applyChanges();
 
 		[[nodiscard]] QImage generatePriceTagBackground() const;
+		[[nodiscard]] bool setSingleFileDisplayName(
+			const QString &displayName);
+		[[nodiscard]] bool setSingleFileCaption(
+			int index,
+			const TextWithTags &caption);
 
 	private:
 		base::unique_qptr<Ui::RpWidget> _preview;
@@ -197,14 +222,16 @@ class SendFilesBox : public Ui::BoxContent {
 	void addMenuButton();
 	void applyBlockChanges();
 	void toggleSpoilers(bool enabled);
+	void setSendLargePhotos(bool enabled);
 	void changePrice();
 
-	[[nodiscard]] bool canChangePrice() const;
 	[[nodiscard]] bool hasPrice() const;
+	[[nodiscard]] bool hasSendLargePhotosOption() const;
+	[[nodiscard]] bool canMoveCaptionInCurrentSendWay() const;
+	[[nodiscard]] bool canChangePrice() const;
 	void refreshPriceTag();
 	[[nodiscard]] QImage preparePriceTagBg(QSize size) const;
 
-	bool validateLength(const QString &text) const;
 	void refreshButtons();
 	void refreshControls(bool initial = false);
 	void setupSendWayControls();
@@ -222,32 +249,47 @@ class SendFilesBox : public Ui::BoxContent {
 	void send(Api::SendOptions options, bool ctrlShiftEnter = false);
 	[[nodiscard]] Fn<void(Api::SendOptions)> sendCallback();
 	void captionResized();
-	void saveSendWaySettings();
+	void saveSendWaySettings(bool rememberAll);
 
 	void setupDragArea();
 	void refreshTitleText();
 	void updateBoxSize();
 	void updateControlsGeometry();
-	void updateCaptionPlaceholder();
+	void updateCaptionVisibility();
 
-	bool addFiles(not_null<const QMimeData*> data);
+	bool addFiles(
+		not_null<const QMimeData*> data,
+		std::optional<bool> overrideSendImagesAsPhotos = std::nullopt);
+	void applySendImagesAsPhotosOverride(const Ui::PreparedList &list);
 	bool addFiles(Ui::PreparedList list);
 	void addFile(Ui::PreparedFile &&file);
 	void pushBlock(int from, int till);
 
 	void openDialogToAddFileToAlbum();
 	void refreshAllAfterChanges(int fromItem, Fn<void()> perform = nullptr);
+	[[nodiscard]] bool setDisplayNameInSingleFilePreview(
+		int fileIndex,
+		const QString &displayName);
+	[[nodiscard]] bool setCaptionInSingleFilePreview(
+		int fileIndex,
+		const TextWithTags &caption);
 
 	void enqueueNextPrepare();
 	void addPreparedAsyncFile(Ui::PreparedFile &&file);
 
 	void checkCharsLimitation();
+	void refreshMessagesCount();
+
+	void requestToTakeTextWithTags();
+	bool validateLength(const QString &text) const;
 
 	[[nodiscard]] Fn<MenuDetails()> prepareSendMenuDetails(
 		const SendFilesBoxDescriptor &descriptor);
 	[[nodiscard]] auto prepareSendMenuCallback()
 		-> Fn<void(MenuAction, MenuDetails)>;
 
+	[[nodiscard]] TextWithTags fieldText() const;
+
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const style::ComposeControls &_st;
 	const Api::SendType _sendType = Api::SendType();
@@ -257,12 +299,13 @@ class SendFilesBox : public Ui::BoxContent {
 
 	Ui::PreparedList _list;
 	std::optional<int> _removingIndex;
+	rpl::variable<int> _messagesCount;
 
 	SendFilesLimits _limits = {};
 	Fn<MenuDetails()> _sendMenuDetails;
 	Fn<void(MenuAction, MenuDetails)> _sendMenuCallback;
 
-	PeerData *_captionToPeer = nullptr;
+	not_null<PeerData*> _toPeer;
 	SendFilesCheck _check;
 	SendFilesConfirmed _confirmedCallback;
 	Fn<void()> _cancelledCallback;
@@ -270,12 +313,14 @@ class SendFilesBox : public Ui::BoxContent {
 	std::unique_ptr<Ui::RpWidget> _priceTag;
 	QImage _priceTagBg;
 	bool _confirmed = false;
+	bool _textTaken = false;
 	bool _invertCaption = false;
 
-	object_ptr<Ui::InputField> _caption = { nullptr };
+	const object_ptr<Ui::InputField> _caption;
 	std::unique_ptr<ChatHelpers::FieldAutocomplete> _autocomplete;
 	TextWithTags _prefilledCaptionText;
 	object_ptr<Ui::EmojiButton> _emojiToggle = { nullptr };
+	HistoryView::Controls::ComposeAiButton *_aiButton = nullptr;
 	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
 	base::unique_qptr<QObject> _emojiFilter;
 	using CharactersLimitLabel = HistoryView::Controls::CharactersLimitLabel;
@@ -290,9 +335,13 @@ class SendFilesBox : public Ui::BoxContent {
 	rpl::variable<int> _footerHeight = 0;
 	rpl::lifetime _dimensionsLifetime;
 
+	std::unique_ptr<SendFiles::ReplyPillHeader> _replyHeader;
+	rpl::variable<int> _replyHeaderHeight = 0;
+	FullReplyTo _replyTo;
+
 	object_ptr<Ui::ScrollArea> _scroll;
 	QPointer<Ui::VerticalLayout> _inner;
-	std::vector<Block> _blocks;
+	std::deque<Block> _blocks;
 	Fn<void()> _whenReadySend;
 	bool _preparing = false;
 
@@ -301,4 +350,6 @@ class SendFilesBox : public Ui::BoxContent {
 	QPointer<Ui::RoundButton> _send;
 	QPointer<Ui::RoundButton> _addFile;
 
+	rpl::event_stream<TextWithTags> _textWithTagsRequests;
+
 };
diff --git a/Telegram/SourceFiles/boxes/send_files_box_reply_header.cpp b/Telegram/SourceFiles/boxes/send_files_box_reply_header.cpp
new file mode 100644
index 00000000000000..881ca1fb7f2dca
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/send_files_box_reply_header.cpp
@@ -0,0 +1,372 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/send_files_box_reply_header.h"
+
+#include "chat_helpers/compose/compose_show.h"
+#include "core/ui_integration.h"
+#include "data/data_changes.h"
+#include "data/data_media_types.h"
+#include "data/data_session.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/view/history_view_reply.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/chat/chat_style.h"
+#include "ui/effects/spoiler_mess.h"
+#include "ui/image/image.h"
+#include "ui/painter.h"
+#include "ui/text/text_options.h"
+#include "ui/power_saving.h"
+#include "ui/widgets/buttons.h"
+#include "window/window_session_controller.h"
+#include "apiwrap.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_dialogs.h"
+
+namespace SendFiles {
+namespace {
+
+constexpr auto kAnimationDuration = crl::time(180);
+
+} // namespace
+
+ReplyPillHeader::ReplyPillHeader(
+	QWidget *parent,
+	std::shared_ptr<ChatHelpers::Show> show,
+	FullReplyTo replyTo)
+: RpWidget(parent)
+, _show(std::move(show))
+, _data(&_show->session().data())
+, _replyTo(std::move(replyTo))
+, _cancel(Ui::CreateChild<Ui::IconButton>(this, st::sendFilesReplyCancel)) {
+	resize(
+		parent->width(),
+		st::boxPhotoCaptionSkip + st::historyReplyHeight);
+
+	_cancel->setAccessibleName(tr::lng_cancel(tr::now));
+	_cancel->setClickedCallback([=] {
+		hideAnimated();
+	});
+
+	setShownMessage(_data->message(_replyTo.messageId));
+
+	_data->session().changes().messageUpdates(
+		Data::MessageUpdate::Flag::Edited
+		| Data::MessageUpdate::Flag::Destroyed
+	) | rpl::filter([=](const Data::MessageUpdate &update) {
+		return (update.item == _shownMessage);
+	}) | rpl::on_next([=](const Data::MessageUpdate &update) {
+		if (update.flags & Data::MessageUpdate::Flag::Destroyed) {
+			_shownMessage = nullptr;
+			_shownMessageName.clear();
+			_shownMessageText.clear();
+			hideAnimated();
+		} else {
+			updateShownMessageText();
+			RpWidget::update();
+		}
+	}, lifetime());
+
+	animationCallback();
+}
+
+ReplyPillHeader::~ReplyPillHeader() = default;
+
+rpl::producer<> ReplyPillHeader::closeRequests() const {
+	return _closeRequests.events();
+}
+
+rpl::producer<> ReplyPillHeader::hideFinished() const {
+	return _hideFinished.value()
+		| rpl::filter(rpl::mappers::_1)
+		| rpl::to_empty;
+}
+
+rpl::producer<int> ReplyPillHeader::desiredHeight() const {
+	return _desiredHeight.value();
+}
+
+void ReplyPillHeader::setRoundedShapeBelow(bool value) {
+	if (_roundedShapeBelow == value) {
+		return;
+	}
+	_roundedShapeBelow = value;
+	update();
+}
+
+void ReplyPillHeader::hideAnimated() {
+	if (_hiding) {
+		return;
+	}
+	_hiding = true;
+	_closeRequests.fire({});
+	_showAnimation.start(
+		[=] { animationCallback(); },
+		1.,
+		0.,
+		kAnimationDuration);
+}
+
+void ReplyPillHeader::animationCallback() {
+	const auto full = st::boxPhotoCaptionSkip + st::historyReplyHeight;
+	const auto value = _showAnimation.value(_hiding ? 0. : 1.);
+	_desiredHeight = int(base::SafeRound(full * value));
+	update();
+	if (_hiding && !_showAnimation.animating()) {
+		_hideFinished = true;
+	}
+}
+
+void ReplyPillHeader::resolveMessageData() {
+	const auto id = _replyTo.messageId;
+	if (!id || !id.peer) {
+		return;
+	}
+	const auto peer = _data->peer(id.peer);
+	const auto itemId = id.msg;
+	const auto callback = crl::guard(this, [=] {
+		if (!_shownMessage) {
+			if (const auto message = _data->message(peer, itemId)) {
+				setShownMessage(message);
+			} else {
+				hideAnimated();
+			}
+		}
+	});
+	_data->session().api().requestMessageData(peer, itemId, callback);
+}
+
+void ReplyPillHeader::setShownMessage(HistoryItem *item) {
+	_shownMessage = item;
+	if (item) {
+		updateShownMessageText();
+		const auto context = Core::TextContext({
+			.session = &item->history()->session(),
+			.customEmojiLoopLimit = 1,
+		});
+		_shownMessageName.setMarkedText(
+			st::fwdTextStyle,
+			HistoryView::Reply::ComposePreviewName(
+				item->history(),
+				item,
+				_replyTo),
+			Ui::NameTextOptions(),
+			context);
+	} else {
+		_shownMessageName.clear();
+		_shownMessageText.clear();
+		resolveMessageData();
+	}
+	update();
+}
+
+void ReplyPillHeader::updateShownMessageText() {
+	Expects(_shownMessage != nullptr);
+
+	const auto context = Core::TextContext({
+		.session = &_data->session(),
+		.repaint = [=] { customEmojiRepaint(); },
+	});
+	_shownMessageText.setMarkedText(
+		st::messageTextStyle,
+		(_replyTo.quote.empty()
+			? _shownMessage->inReplyText()
+			: _replyTo.quote),
+		Ui::DialogTextOptions(),
+		context);
+}
+
+void ReplyPillHeader::customEmojiRepaint() {
+	if (_repaintScheduled) {
+		return;
+	}
+	_repaintScheduled = true;
+	update();
+}
+
+void ReplyPillHeader::resizeEvent(QResizeEvent *e) {
+	_cancel->moveToRight(
+		st::boxPhotoPadding.right() + st::sendBoxAlbumGroupSkipRight,
+		(st::historyReplyHeight - _cancel->height()) / 2);
+}
+
+void ReplyPillHeader::paintEvent(QPaintEvent *e) {
+	_repaintScheduled = false;
+
+	Painter p(this);
+	p.setInactive(_show->paused(Window::GifPauseReason::Layer));
+
+	const auto left = st::boxPhotoPadding.left();
+	const auto right = st::boxPhotoPadding.right();
+	const auto bottomSkip = st::boxPhotoCaptionSkip;
+	const auto pillHeight = height() - bottomSkip;
+	if (pillHeight <= 0) {
+		return;
+	}
+	const auto pillRect = QRect(
+		left,
+		0,
+		width() - left - right,
+		pillHeight);
+	if (pillRect.isEmpty()) {
+		return;
+	}
+
+	{
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::windowBgOver);
+		const auto topRadius = st::bubbleRadiusLarge;
+		const auto bottomRadius = _roundedShapeBelow
+			? st::bubbleRadiusSmall
+			: st::bubbleRadiusLarge;
+		const auto rectF = QRectF(pillRect);
+		auto path = QPainterPath();
+		path.moveTo(rectF.left() + topRadius, rectF.top());
+		path.lineTo(rectF.right() - topRadius, rectF.top());
+		path.arcTo(
+			rectF.right() - 2 * topRadius,
+			rectF.top(),
+			2 * topRadius,
+			2 * topRadius,
+			90, -90);
+		path.lineTo(rectF.right(), rectF.bottom() - bottomRadius);
+		path.arcTo(
+			rectF.right() - 2 * bottomRadius,
+			rectF.bottom() - 2 * bottomRadius,
+			2 * bottomRadius,
+			2 * bottomRadius,
+			0, -90);
+		path.lineTo(rectF.left() + bottomRadius, rectF.bottom());
+		path.arcTo(
+			rectF.left(),
+			rectF.bottom() - 2 * bottomRadius,
+			2 * bottomRadius,
+			2 * bottomRadius,
+			270, -90);
+		path.lineTo(rectF.left(), rectF.top() + topRadius);
+		path.arcTo(
+			rectF.left(),
+			rectF.top(),
+			2 * topRadius,
+			2 * topRadius,
+			180, -90);
+		path.closeSubpath();
+		p.fillPath(path, st::windowBgOver);
+	}
+
+	const auto iconPos = st::sendFilesReplyIconPosition
+		+ QPoint(pillRect.left(), pillRect.top());
+	if (!_replyTo.quote.empty()) {
+		st::historyQuoteIcon.paint(p, iconPos, width());
+	} else {
+		st::historyReplyIcon.paint(p, iconPos, width());
+		// Remove 'settings' mini-icon.
+		p.fillRect(
+			QRect(
+				QPoint(style::ConvertScale(16), style::ConvertScale(5))
+					+ iconPos,
+				QSize(style::ConvertScale(11), style::ConvertScale(8))),
+			st::windowBgOver);
+		p.fillRect(
+			QRect(
+				QPoint(style::ConvertScale(22), style::ConvertScale(13))
+					+ iconPos,
+				QSize(style::ConvertScale(5), style::ConvertScale(2))),
+			st::windowBgOver);
+	}
+
+	const auto replySkip = st::historyReplySkip;
+	const auto textLeft = pillRect.left() + replySkip;
+	const auto availableWidth = _cancel->x() - textLeft;
+	if (availableWidth <= 0) {
+		return;
+	}
+
+	const auto pillCenterY = pillRect.top()
+		+ st::historyReplyHeight / 2;
+
+	if (!_shownMessage) {
+		p.setFont(st::msgDateFont);
+		p.setPen(st::historyComposeAreaFgService);
+		const auto top = pillCenterY - st::msgDateFont->height / 2;
+		p.drawText(
+			textLeft,
+			top + st::msgDateFont->ascent,
+			st::msgDateFont->elided(
+				tr::lng_profile_loading(tr::now),
+				availableWidth));
+		return;
+	}
+
+	const auto media = _shownMessage->media();
+	const auto hasPreview = media && media->hasReplyPreview();
+	const auto preview = hasPreview ? media->replyPreview() : nullptr;
+	const auto spoilered = media && media->hasSpoiler();
+	if (!spoilered) {
+		_previewSpoiler = nullptr;
+	} else if (!_previewSpoiler) {
+		_previewSpoiler = std::make_unique<Ui::SpoilerAnimation>([=] {
+			update();
+		});
+	}
+	const auto previewSkipValue = st::historyReplyPreview + st::msgReplyBarSkip;
+	const auto previewSkip = (hasPreview && preview) ? previewSkipValue : 0;
+	const auto contentLeft = textLeft + previewSkip;
+	const auto contentAvailable = availableWidth - previewSkip;
+
+	if (preview) {
+		const auto to = QRect(
+			textLeft,
+			pillCenterY - st::historyReplyPreview / 2,
+			st::historyReplyPreview,
+			st::historyReplyPreview);
+		p.drawPixmap(to.x(), to.y(), preview->pixSingle(
+			preview->size() / style::DevicePixelRatio(),
+			{
+				.options = Images::Option::RoundSmall,
+				.outer = to.size(),
+			}));
+		if (_previewSpoiler) {
+			Ui::FillSpoilerRect(
+				p,
+				to,
+				Ui::DefaultImageSpoiler().frame(
+					_previewSpoiler->index(crl::now(), p.inactive())));
+		}
+	}
+
+	p.setPen(st::historyReplyNameFg);
+	p.setFont(st::msgServiceNameFont);
+	_shownMessageName.drawElided(
+		p,
+		contentLeft,
+		pillRect.top() + st::msgReplyPadding.top(),
+		contentAvailable);
+
+	p.setPen(st::historyComposeAreaFg);
+	_shownMessageText.draw(p, {
+		.position = QPoint(
+			contentLeft,
+			pillRect.top()
+				+ st::msgReplyPadding.top()
+				+ st::msgServiceNameFont->height),
+		.availableWidth = contentAvailable,
+		.palette = &st::historyComposeAreaPalette,
+		.spoiler = Ui::Text::DefaultSpoilerCache(),
+		.now = crl::now(),
+		.pausedEmoji = p.inactive() || On(PowerSaving::kEmojiChat),
+		.pausedSpoiler = p.inactive() || On(PowerSaving::kChatSpoiler),
+		.elisionLines = 1,
+	});
+}
+
+} // namespace SendFiles
diff --git a/Telegram/SourceFiles/boxes/send_files_box_reply_header.h b/Telegram/SourceFiles/boxes/send_files_box_reply_header.h
new file mode 100644
index 00000000000000..9515c896fdbbee
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/send_files_box_reply_header.h
@@ -0,0 +1,77 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/animations.h"
+#include "ui/rp_widget.h"
+#include "ui/text/text.h"
+
+class HistoryItem;
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Data {
+class Session;
+} // namespace Data
+
+namespace Ui {
+class IconButton;
+class SpoilerAnimation;
+} // namespace Ui
+
+namespace SendFiles {
+
+class ReplyPillHeader final : public Ui::RpWidget {
+public:
+	ReplyPillHeader(
+		QWidget *parent,
+		std::shared_ptr<ChatHelpers::Show> show,
+		FullReplyTo replyTo);
+	~ReplyPillHeader();
+
+	[[nodiscard]] rpl::producer<> closeRequests() const;
+	[[nodiscard]] rpl::producer<> hideFinished() const;
+	[[nodiscard]] rpl::producer<int> desiredHeight() const;
+
+	void setRoundedShapeBelow(bool value);
+	void hideAnimated();
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+
+private:
+	void resolveMessageData();
+	void setShownMessage(HistoryItem *item);
+	void updateShownMessageText();
+	void customEmojiRepaint();
+	void animationCallback();
+
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const not_null<Data::Session*> _data;
+	const FullReplyTo _replyTo;
+	const not_null<Ui::IconButton*> _cancel;
+
+	HistoryItem *_shownMessage = nullptr;
+	Ui::Text::String _shownMessageName;
+	Ui::Text::String _shownMessageText;
+	std::unique_ptr<Ui::SpoilerAnimation> _previewSpoiler;
+	bool _repaintScheduled = false;
+
+	Ui::Animations::Simple _showAnimation;
+	rpl::variable<int> _desiredHeight = 0;
+	rpl::event_stream<> _closeRequests;
+	rpl::variable<bool> _hideFinished = false;
+	bool _hiding = false;
+	bool _roundedShapeBelow = true;
+
+};
+
+} // namespace SendFiles
diff --git a/Telegram/SourceFiles/boxes/send_gif_with_caption_box.cpp b/Telegram/SourceFiles/boxes/send_gif_with_caption_box.cpp
index b2710287662bbe..0c47bc2e88a2a8 100644
--- a/Telegram/SourceFiles/boxes/send_gif_with_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_gif_with_caption_box.cpp
@@ -7,8 +7,10 @@ For license and copyright information please follow this link:
 */
 #include "boxes/send_gif_with_caption_box.h"
 
+#include "api/api_editing.h"
 #include "base/event_filter.h"
 #include "boxes/premium_preview_box.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "chat_helpers/field_autocomplete.h"
 #include "chat_helpers/message_field.h"
 #include "chat_helpers/tabbed_panel.h"
@@ -18,43 +20,142 @@ For license and copyright information please follow this link:
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_file_origin.h"
+#include "data/data_groups.h"
 #include "data/data_peer_values.h"
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/stickers/data_stickers.h"
+#include "history/history.h"
+#include "history/history_item.h"
 #include "history/view/controls/history_view_characters_limit.h"
+#include "history/view/controls/history_view_compose_ai_button.h"
+#include "history/view/history_view_message.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "media/clip/media_clip_reader.h"
+#include "menu/menu_checked_action.h"
 #include "menu/menu_send.h"
+#include "ui/controls/compose_ai_button_factory.h"
 #include "ui/controls/emoji_button.h"
 #include "ui/controls/emoji_button_factory.h"
+#include "ui/effects/spoiler_mess.h"
+#include "ui/image/image_prepare.h"
 #include "ui/layers/generic_box.h"
-#include "ui/widgets/fields/input_field.h"
 #include "ui/rect.h"
+#include "ui/text/text_entity.h"
 #include "ui/ui_utility.h"
 #include "ui/vertical_list.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/popup_menu.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 
 namespace Ui {
+
+void SetupCaptionFieldInBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::InputField*> field,
+		PeerData *panelPeer,
+		Fn<bool(not_null<DocumentData*>)> allowWithoutPremium,
+		PremiumFeature premiumFeature) {
+	using Limit = HistoryView::Controls::CharactersLimitLabel;
+	struct State final {
+		base::unique_qptr<ChatHelpers::TabbedPanel> emojiPanel;
+		base::unique_qptr<Limit> charsLimitation;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	const auto container = box->getDelegate()->outerContainer();
+	using Selector = ChatHelpers::TabbedSelector;
+	state->emojiPanel = base::make_unique_q<ChatHelpers::TabbedPanel>(
+		container,
+		controller,
+		object_ptr<Selector>(
+			nullptr,
+			controller->uiShow(),
+			Window::GifPauseReason::Layer,
+			Selector::Mode::EmojiOnly));
+	const auto emojiPanel = state->emojiPanel.get();
+	emojiPanel->setDesiredHeightValues(
+		1.,
+		st::emojiPanMinHeight / 2,
+		st::emojiPanMinHeight);
+	emojiPanel->hide();
+	emojiPanel->selector()->setCurrentPeer(
+		panelPeer ? panelPeer : controller->session().user());
+	emojiPanel->selector()->emojiChosen(
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
+		Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
+	}, field->lifetime());
+	emojiPanel->selector()->customEmojiChosen(
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+		const auto info = data.document->sticker();
+		if (info
+			&& info->setType == Data::StickersType::Emoji
+			&& !allowWithoutPremium(data.document)
+			&& !controller->session().premium()) {
+			ShowPremiumPreviewBox(controller, premiumFeature);
+		} else {
+			Data::InsertCustomEmoji(field, data.document);
+		}
+	}, field->lifetime());
+
+	const auto emojiButton = Ui::AddEmojiToggleToField(
+		field,
+		box,
+		controller,
+		emojiPanel,
+		st::sendGifWithCaptionEmojiPosition);
+	emojiButton->show();
+
+	const auto session = &controller->session();
+	const auto checkCharsLimitation = [=](auto repeat) -> void {
+		const auto remove = Ui::ComputeFieldCharacterCount(field)
+			- Data::PremiumLimits(session).captionLengthCurrent();
+		if (remove > 0) {
+			if (!state->charsLimitation) {
+				state->charsLimitation = base::make_unique_q<Limit>(
+					field,
+					emojiButton,
+					style::al_top);
+				state->charsLimitation->show();
+				Data::AmPremiumValue(session) | rpl::on_next([=] {
+					repeat(repeat);
+				}, state->charsLimitation->lifetime());
+			}
+			state->charsLimitation->setLeft(remove);
+			state->charsLimitation->show();
+		} else {
+			state->charsLimitation = nullptr;
+		}
+	};
+	field->changes() | rpl::on_next([=] {
+		checkCharsLimitation(checkCharsLimitation);
+	}, field->lifetime());
+}
+
 namespace {
 
-[[nodiscard]] not_null<Ui::RpWidget*> AddGifWidget(
+struct State final {
+	std::shared_ptr<Data::DocumentMedia> mediaView;
+	::Media::Clip::ReaderPointer gif;
+	std::unique_ptr<Ui::SpoilerAnimation> spoiler;
+	QImage firstFrame;
+	QImage blurredFrame;
+	bool hasSpoiler = false;
+	rpl::lifetime loadingLifetime;
+};
+
+[[nodiscard]] not_null<State*> AddGifWidget(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<DocumentData*> document,
 		int width) {
-	struct State final {
-		std::shared_ptr<Data::DocumentMedia> mediaView;
-		::Media::Clip::ReaderPointer gif;
-		rpl::lifetime loadingLifetime;
-	};
-
 	const auto state = container->lifetime().make_state<State>();
 	state->mediaView = document->createMediaView();
 	state->mediaView->automaticLoad(Data::FileOriginSavedGifs(), nullptr);
@@ -69,9 +170,40 @@ namespace {
 				std::numeric_limits<int>::max(),
 				Qt::KeepAspectRatio).height()),
 		st::boxRowPadding);
-	widget->paintRequest(
-	) | rpl::start_with_next([=] {
-		auto p = QPainter(widget);
+	widget->paintOn([=](QPainter &p) {
+		if (state->hasSpoiler) {
+			if (state->firstFrame.isNull()
+					&& state->gif
+					&& state->gif->ready()) {
+				state->firstFrame = state->gif->current(
+					{ .frame = widget->size() },
+					crl::now());
+				state->blurredFrame = Images::BlurLargeImage(
+					base::duplicate(state->firstFrame),
+					24);
+			}
+			if (!state->blurredFrame.isNull()) {
+				p.drawImage(0, 0, state->blurredFrame);
+			} else if (const auto thumb = state->mediaView->thumbnail()) {
+				p.drawImage(
+					widget->rect(),
+					thumb->pixNoCache(
+						widget->size() * style::DevicePixelRatio(),
+						{
+							.options = Images::Option::Blur,
+							.outer = widget->size(),
+						}).toImage());
+			}
+			if (!state->spoiler) {
+				state->spoiler = std::make_unique<Ui::SpoilerAnimation>(
+					[=] { widget->update(); });
+			}
+			const auto now = crl::now();
+			const auto index = state->spoiler->index(now, false);
+			const auto frame = Ui::DefaultImageSpoiler().frame(index);
+			Ui::FillSpoilerRect(p, widget->rect(), frame);
+			return;
+		}
 		if (state->gif && state->gif->started()) {
 			p.drawImage(
 				0,
@@ -93,7 +225,7 @@ namespace {
 						.outer = widget->size(),
 					}).toImage());
 		}
-	}, widget->lifetime());
+	});
 
 	const auto updateThumbnail = [=] {
 		if (document->dimensions.isEmpty()) {
@@ -115,8 +247,8 @@ namespace {
 		return true;
 	};
 	if (!updateThumbnail()) {
-		document->owner().session().downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		document->session().downloaderTaskFinished(
+		) | rpl::on_next([=] {
 			if (updateThumbnail()) {
 				state->loadingLifetime.destroy();
 				widget->update();
@@ -124,14 +256,40 @@ namespace {
 		}, state->loadingLifetime);
 	}
 
-	return widget;
+	base::install_event_filter(widget, [=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::ContextMenu) {
+			const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+				widget,
+				st::popupMenuWithIcons);
+			::Menu::AddCheckedAction(
+				menu,
+				tr::lng_context_spoiler_effect(tr::now),
+				[=] {
+					state->hasSpoiler = !state->hasSpoiler;
+					if (!state->hasSpoiler) {
+						state->spoiler = nullptr;
+						state->firstFrame = QImage();
+						state->blurredFrame = QImage();
+						if (state->gif && state->gif->ready()) {
+							state->gif->start({ .frame = widget->size() });
+						}
+					}
+					widget->update();
+				},
+				&st::menuIconSpoiler,
+				state->hasSpoiler);
+			menu->popup(QCursor::pos());
+			return base::EventFilterResult::Cancel;
+		}
+		return base::EventFilterResult::Continue;
+	});
+
+	return state;
 }
 
 [[nodiscard]] not_null<Ui::InputField*> AddInputField(
 		not_null<Ui::GenericBox*> box,
 		not_null<Window::SessionController*> controller) {
-	using Limit = HistoryView::Controls::CharactersLimitLabel;
-
 	const auto bottomContainer = box->setPinnedToBottomContent(
 		object_ptr<Ui::VerticalLayout>(box));
 	const auto wrap = bottomContainer->add(
@@ -143,121 +301,61 @@ namespace {
 		Ui::InputField::Mode::MultiLine,
 		tr::lng_photo_caption());
 	Ui::ResizeFitChild(wrap, input);
-
-	struct State final {
-		base::unique_qptr<ChatHelpers::TabbedPanel> emojiPanel;
-		base::unique_qptr<Limit> charsLimitation;
-	};
-	const auto state = box->lifetime().make_state<State>();
-
-	{
-		const auto container = box->getDelegate()->outerContainer();
-		using Selector = ChatHelpers::TabbedSelector;
-		state->emojiPanel = base::make_unique_q<ChatHelpers::TabbedPanel>(
-			container,
-			controller,
-			object_ptr<Selector>(
-				nullptr,
-				controller->uiShow(),
-				Window::GifPauseReason::Layer,
-				Selector::Mode::EmojiOnly));
-		const auto emojiPanel = state->emojiPanel.get();
-		emojiPanel->setDesiredHeightValues(
-			1.,
-			st::emojiPanMinHeight / 2,
-			st::emojiPanMinHeight);
-		emojiPanel->hide();
-		emojiPanel->selector()->setCurrentPeer(controller->session().user());
-		emojiPanel->selector()->emojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
-			Ui::InsertEmojiAtCursor(input->textCursor(), data.emoji);
-		}, input->lifetime());
-		emojiPanel->selector()->customEmojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
-			const auto info = data.document->sticker();
-			if (info
-				&& info->setType == Data::StickersType::Emoji
-				&& !controller->session().premium()) {
-				ShowPremiumPreviewBox(
-					controller,
-					PremiumFeature::AnimatedEmoji);
-			} else {
-				Data::InsertCustomEmoji(input, data.document);
-			}
-		}, input->lifetime());
-	}
-
-	const auto emojiButton = Ui::AddEmojiToggleToField(
-		input,
+	SetupCaptionFieldInBox(
 		box,
 		controller,
-		state->emojiPanel.get(),
-		st::sendGifWithCaptionEmojiPosition);
-	emojiButton->show();
-
-	const auto session = &controller->session();
-	const auto checkCharsLimitation = [=](auto repeat) -> void {
-		const auto remove = Ui::ComputeFieldCharacterCount(input)
-			- Data::PremiumLimits(session).captionLengthCurrent();
-		if (remove > 0) {
-			if (!state->charsLimitation) {
-				state->charsLimitation = base::make_unique_q<Limit>(
-					input,
-					emojiButton,
-					style::al_top);
-				state->charsLimitation->show();
-				Data::AmPremiumValue(session) | rpl::start_with_next([=] {
-					repeat(repeat);
-				}, state->charsLimitation->lifetime());
-			}
-			state->charsLimitation->setLeft(remove);
-			state->charsLimitation->show();
-		} else {
-			state->charsLimitation = nullptr;
-		}
-	};
-
-	input->changes() | rpl::start_with_next([=] {
-		checkCharsLimitation(checkCharsLimitation);
-	}, input->lifetime());
+		input,
+		controller->session().user(),
+		[](not_null<DocumentData*>) {
+			return false;
+		},
+		PremiumFeature::AnimatedEmoji);
 
 	return input;
 }
 
-} // namespace
-
-void SendGifWithCaptionBox(
+void CaptionBox(
 		not_null<Ui::GenericBox*> box,
-		not_null<DocumentData*> document,
+		rpl::producer<QString> confirmText,
+		TextWithTags initialText,
 		not_null<PeerData*> peer,
 		const SendMenu::Details &details,
-		Fn<void(Api::SendOptions, TextWithTags)> done) {
+		Fn<void(Api::SendOptions, TextWithTags)> done,
+		Fn<void(TextWithTags)> cancelled = nullptr) {
 	const auto window = Core::App().findWindow(box);
 	const auto controller = window ? window->sessionController() : nullptr;
 	if (!controller) {
 		return;
 	}
-	box->setTitle(tr::lng_send_gif_with_caption());
 	box->setWidth(st::boxWidth);
 	box->getDelegate()->setStyle(st::sendGifBox);
 
-	const auto container = box->verticalLayout();
-	[[maybe_unused]] const auto gifWidget = AddGifWidget(
-		container,
-		document,
-		st::boxWidth);
-
-	Ui::AddSkip(container);
-
 	const auto input = AddInputField(box, controller);
 	box->setFocusCallback([=] {
 		input->setFocus();
 	});
 
+	input->setTextWithTags(std::move(initialText));
 	input->setSubmitSettings(Core::App().settings().sendSubmitWay());
-	InitMessageField(controller, input, [=](not_null<DocumentData*>) {
-		return true;
+	const auto chatStyle = InitMessageField(
+		controller,
+		input,
+		[=](not_null<DocumentData*>) { return true; });
+
+	const auto aiButton = Ui::SetupCaptionAiButton({
+		.parent = input->parentWidget(),
+		.field = input,
+		.session = &controller->session(),
+		.show = controller->uiShow(),
+		.chatStyle = chatStyle,
 	});
+	rpl::combine(
+		box->sizeValue(),
+		input->geometryValue()
+	) | rpl::on_next([=](QSize, QRect) {
+		Ui::UpdateCaptionAiButtonGeometry(aiButton, input);
+		aiButton->raise();
+	}, aiButton->lifetime());
 
 	const auto sendMenuDetails = [=] { return details; };
 	struct Autocomplete {
@@ -314,11 +412,30 @@ void SendGifWithCaptionBox(
 		}
 	}
 
-	const auto send = [=](Api::SendOptions options) {
-		done(std::move(options), input->getTextWithTags());
+	const auto confirmed = box->lifetime().make_state<bool>(false);
+	const auto send = [=, show = controller->uiShow()](
+			Api::SendOptions options) {
+		const auto textWithTags = input->getTextWithTags();
+		const auto remove = Ui::ComputeFieldCharacterCount(input)
+			- Data::PremiumLimits(&show->session()).captionLengthCurrent();
+		if (remove > 0) {
+			show->showToast(
+				tr::lng_edit_limit_reached(tr::now, lt_count, remove));
+			return;
+		}
+		*confirmed = true;
+		done(std::move(options), textWithTags);
 	};
+	if (cancelled) {
+		box->boxClosing(
+		) | rpl::on_next([=] {
+			if (!*confirmed) {
+				cancelled(input->getTextWithTags());
+			}
+		}, box->lifetime());
+	}
 	const auto confirm = box->addButton(
-		tr::lng_send_button(),
+		std::move(confirmText),
 		[=] { send({}); });
 	SendMenu::SetupMenuAndShortcuts(
 		confirm,
@@ -336,7 +453,143 @@ void SendGifWithCaptionBox(
 		box->closeBox();
 	});
 	input->submits(
-	) | rpl::start_with_next([=] { send({}); }, input->lifetime());
+	) | rpl::on_next([=] { send({}); }, input->lifetime());
+}
+
+} // namespace
+
+void SendGifWithCaptionBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<DocumentData*> document,
+		not_null<PeerData*> peer,
+		const SendMenu::Details &details,
+		TextWithTags initialText,
+		Fn<void(Api::SendOptions, TextWithTags)> c,
+		Fn<void(TextWithTags)> cancelled) {
+	box->setTitle(tr::lng_send_gif_with_caption());
+	const auto state = AddGifWidget(
+		box->verticalLayout(),
+		document,
+		st::boxWidth);
+	Ui::AddSkip(box->verticalLayout());
+	const auto d = [=](Api::SendOptions o, TextWithTags t) {
+		o.mediaSpoiler = state->hasSpoiler;
+		document->owner().stickers().notifyGifWithCaptionSent();
+		c(std::move(o), std::move(t));
+	};
+	CaptionBox(
+		box,
+		tr::lng_send_button(),
+		std::move(initialText),
+		peer,
+		details,
+		std::move(d),
+		std::move(cancelled));
+}
+
+void SendGifWithCaption(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<Ui::InputField*> field,
+		not_null<DocumentData*> document,
+		not_null<PeerData*> peer,
+		const SendMenu::Details &details,
+		Fn<void(Api::SendOptions, TextWithTags)> send) {
+	show->show(Box(
+		SendGifWithCaptionBox,
+		document,
+		peer,
+		details,
+		field->getTextWithTags(),
+		crl::guard(field, [=](
+				Api::SendOptions options,
+				TextWithTags caption) {
+			field->setTextWithTags({});
+			show->hideLayer(anim::type::normal);
+			send(std::move(options), std::move(caption));
+		}),
+		crl::guard(field, [=](TextWithTags caption) {
+			if (!caption.text.isEmpty()) {
+				field->setTextWithTags(std::move(caption));
+			}
+		})));
+}
+
+void EditCaptionBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<HistoryView::Element*> view) {
+	using namespace TextUtilities;
+
+	box->setTitle(tr::lng_context_upload_edit_caption());
+
+	const auto data = &view->data()->history()->peer->owner();
+
+	struct State {
+		FullMsgId fullId;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	state->fullId = view->data()->fullId();
+
+	data->itemIdChanged(
+	) | rpl::on_next([=](Data::Session::IdChange event) {
+		if (event.oldId == state->fullId.msg) {
+			state->fullId = event.newId;
+		}
+	}, box->lifetime());
+
+	auto done = [=, show = box->uiShow()](
+			Api::SendOptions,
+			TextWithTags textWithTags) {
+		const auto item = data->message(state->fullId);
+		if (!item) {
+			show->showToast(tr::lng_message_not_found(tr::now));
+			return;
+		}
+		if (!(item->media() && item->media()->allowsEditCaption())) {
+			show->showToast(tr::lng_edit_error(tr::now));
+			return;
+		}
+		const auto textLength = textWithTags.text.size();
+		const auto limit = Data::PremiumLimits(
+			&item->history()->session()).captionLengthCurrent();
+		if (textLength > limit) {
+			show->showToast(tr::lng_edit_limit_reached(
+				tr::now,
+				lt_count,
+				textLength - limit));
+			return;
+		}
+		auto text = TextWithEntities{
+			std::move(textWithTags.text),
+			ConvertTextTagsToEntities(std::move(textWithTags.tags)),
+		};
+		if (item->isUploading()) {
+			item->setText(std::move(text));
+			data->requestViewResize(view);
+			if (item->groupId()) {
+				data->groups().refreshMessage(item, true);
+			}
+			box->closeBox();
+		} else {
+			Api::EditCaption(
+				item,
+				std::move(text),
+				{ .invertCaption = item->invertMedia() },
+				[=] { box->closeBox(); },
+				[=](const QString &e) { box->uiShow()->showToast(e); });
+		}
+	};
+
+	const auto item = view->data();
+	CaptionBox(
+		box,
+		tr::lng_settings_save(),
+		TextWithTags{
+			.text = item->originalText().text,
+			.tags = ConvertEntitiesToTextTags(item->originalText().entities),
+		},
+		item->history()->peer,
+		{},
+		std::move(done));
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/send_gif_with_caption_box.h b/Telegram/SourceFiles/boxes/send_gif_with_caption_box.h
index 0247cf5e3d93cd..4b4de706525299 100644
--- a/Telegram/SourceFiles/boxes/send_gif_with_caption_box.h
+++ b/Telegram/SourceFiles/boxes/send_gif_with_caption_box.h
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 class PeerData;
 class DocumentData;
+enum class PremiumFeature;
 
 namespace Api {
 struct SendOptions;
@@ -18,15 +19,50 @@ namespace SendMenu {
 struct Details;
 } // namespace SendMenu
 
+namespace HistoryView {
+class Element;
+} // namespace HistoryView
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Ui {
 
 class GenericBox;
+class InputField;
+
+void SetupCaptionFieldInBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::InputField*> field,
+	PeerData *panelPeer,
+	Fn<bool(not_null<DocumentData*>)> allowWithoutPremium,
+	PremiumFeature premiumFeature);
+
+void EditCaptionBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<HistoryView::Element*> view);
 
 void SendGifWithCaptionBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<DocumentData*> document,
 	not_null<PeerData*> peer,
 	const SendMenu::Details &details,
-	Fn<void(Api::SendOptions, TextWithTags)> done);
+	TextWithTags initialText,
+	Fn<void(Api::SendOptions, TextWithTags)> done,
+	Fn<void(TextWithTags)> cancelled);
+
+void SendGifWithCaption(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<Ui::InputField*> field,
+	not_null<DocumentData*> document,
+	not_null<PeerData*> peer,
+	const SendMenu::Details &details,
+	Fn<void(Api::SendOptions, TextWithTags)> send);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index bd154f8c4da5d9..c59329b57cb27d 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -14,6 +14,7 @@ For license and copyright information please follow this link:
 #include "storage/storage_account.h"
 #include "ui/boxes/confirm_box.h"
 #include "apiwrap.h"
+#include "ui/widgets/chat_filters_tabs_strip.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/multi_select.h"
 #include "ui/widgets/scroll_area.h"
@@ -22,6 +23,7 @@ For license and copyright information please follow this link:
 #include "ui/wrap/slide_wrap.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "chat_helpers/message_field.h"
@@ -30,19 +32,23 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_helpers.h"
+#include "history/view/controls/history_view_forward_panel.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_context_menu.h" // CopyPostLink.
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "window/window_session_controller.h"
 #include "boxes/peer_list_controllers.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "chat_helpers/share_message_phrase_factory.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/data_channel.h"
+#include "data/data_chat_filters.h"
 #include "data/data_game.h"
 #include "data/data_histories.h"
 #include "data/data_user.h"
 #include "data/data_peer_values.h"
+#include "data/data_saved_messages.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_folder.h"
 #include "data/data_forum.h"
@@ -51,6 +57,8 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "styles/style_calls.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_menu_icons.h"
@@ -81,11 +89,14 @@ class ShareBox::Inner final : public Ui::RpWidget {
 	void activateSkipColumn(int direction);
 	void activateSkipPage(int pageHeight, int direction);
 	void updateFilter(QString filter = QString());
+	[[nodiscard]] bool isFilterEmpty() const;
 	void selectActive();
 
 	rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
 	rpl::producer<> searchRequests() const;
 
+	void applyChatFilter(FilterId id);
+
 protected:
 	void visibleTopBottomUpdated(
 		int visibleTop,
@@ -108,16 +119,19 @@ class ShareBox::Inner final : public Ui::RpWidget {
 		not_null<History*> history;
 		not_null<PeerData*> peer;
 		Data::ForumTopic *topic = nullptr;
+		Data::SavedSublist *sublist = nullptr;
 		rpl::lifetime topicLifetime;
+		rpl::lifetime sublistLifetime;
 		Ui::RoundImageCheckbox checkbox;
 		Ui::Text::String name;
 		Ui::Animations::Simple nameActive;
-		bool locked = false;
+		Api::MessageMoneyRestriction restriction;
+		RestrictionBadgeCache badgeCache;
 	};
 
 	void invalidateCache();
 	bool showLockedError(not_null<Chat*> chat);
-	void refreshLockedRows();
+	void refreshRestrictedRows();
 
 	[[nodiscard]] int displayedChatsCount() const;
 	[[nodiscard]] not_null<Data::Thread*> chatThread(
@@ -126,7 +140,7 @@ class ShareBox::Inner final : public Ui::RpWidget {
 	void paintChat(Painter &p, not_null<Chat*> chat, int index);
 	void updateChat(not_null<PeerData*> peer);
 	void updateChatName(not_null<Chat*> chat);
-	void initChatLocked(not_null<Chat*> chat);
+	void initChatRestriction(not_null<Chat*> chat);
 	void repaintChat(not_null<PeerData*> peer);
 	int chatIndex(not_null<PeerData*> peer) const;
 	void repaintChatAtIndex(int index);
@@ -136,6 +150,7 @@ class ShareBox::Inner final : public Ui::RpWidget {
 	void preloadUserpic(not_null<Dialogs::Entry*> entry);
 	void changeCheckState(Chat *chat);
 	void chooseForumTopic(not_null<Data::Forum*> forum);
+	void chooseMonoforumSublist(not_null<Data::SavedMessages*> monoforum);
 	enum class ChangeStateWay {
 		Default,
 		SkipCallback,
@@ -166,7 +181,9 @@ class ShareBox::Inner final : public Ui::RpWidget {
 	int _upon = -1;
 	int _visibleTop = 0;
 
-	std::unique_ptr<Dialogs::IndexedList> _chatsIndexed;
+	std::unique_ptr<Dialogs::IndexedList> _defaultChatsIndexed;
+	std::unique_ptr<Dialogs::IndexedList> _customChatsIndexed;
+	not_null<Dialogs::IndexedList*> _chatsIndexed;
 	QString _filter;
 	std::vector<not_null<Dialogs::Row*>> _filtered;
 
@@ -190,16 +207,16 @@ ShareBox::ShareBox(QWidget*, Descriptor &&descriptor)
 , _api(&_descriptor.session->mtp())
 , _select(
 	this,
-	(_descriptor.stMultiSelect
-		? *_descriptor.stMultiSelect
+	(_descriptor.st.multiSelect
+		? *_descriptor.st.multiSelect
 		: st::defaultMultiSelect),
 	tr::lng_participant_filter())
 , _comment(
 	this,
 	object_ptr<Ui::InputField>(
 		this,
-		(_descriptor.stComment
-			? *_descriptor.stComment
+		(_descriptor.st.comment
+			? *_descriptor.st.comment
 			: st::shareComment),
 		Ui::InputField::Mode::MultiLine,
 		tr::lng_photos_comment()),
@@ -224,8 +241,8 @@ void ShareBox::prepareCommentField() {
 		_comment->heightValue(),
 		(_bottomWidget
 			? _bottomWidget->heightValue()
-			: (rpl::single(0) | rpl::type_erased()))
-	) | rpl::start_with_next([=](int height, int comment, int bottom) {
+			: (rpl::single(0) | rpl::type_erased))
+	) | rpl::on_next([=](int height, int comment, int bottom) {
 		_comment->moveToLeft(0, height - bottom - comment);
 		if (_bottomWidget) {
 			_bottomWidget->moveToLeft(0, height - bottom);
@@ -235,7 +252,7 @@ void ShareBox::prepareCommentField() {
 	const auto field = _comment->entity();
 
 	field->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		submit({});
 	}, field->lifetime());
 
@@ -244,12 +261,12 @@ void ShareBox::prepareCommentField() {
 			.session = _descriptor.session,
 			.show = Main::MakeSessionShow(show, _descriptor.session),
 			.field = field,
-			.fieldStyle = _descriptor.stLabel,
+			.fieldStyle = _descriptor.st.label,
 		});
 	}
 	field->setSubmitSettings(Core::App().settings().sendSubmitWay());
 
-	field->changes() | rpl::start_with_next([=] {
+	field->changes() | rpl::on_next([=] {
 		if (!field->getLastText().isEmpty()) {
 			setCloseByOutsideClick(false);
 		} else if (_inner->selected().empty()) {
@@ -269,7 +286,9 @@ void ShareBox::prepare() {
 	_select->resizeToWidth(st::boxWideWidth);
 	Ui::SendPendingMoveResizeEvents(_select);
 
-	setTitle(tr::lng_share_title());
+	setTitle(_descriptor.titleOverride
+		? std::move(_descriptor.titleOverride)
+		: tr::lng_share_title());
 
 	_inner = setInnerWidget(
 		object_ptr<Inner>(this, _descriptor, uiShow()),
@@ -282,6 +301,10 @@ void ShareBox::prepare() {
 
 	_select->setQueryChangedCallback([=](const QString &query) {
 		applyFilterUpdate(query);
+		if (_chatsFilters) {
+			updateScrollSkips();
+			scrollToY(0);
+		}
 	});
 	_select->setItemRemovedCallback([=](uint64 itemId) {
 		if (const auto peer = _descriptor.session->data().peerLoaded(PeerId(itemId))) {
@@ -303,18 +326,18 @@ void ShareBox::prepare() {
 		_comment->heightValue(),
 		(_bottomWidget
 			? _bottomWidget->heightValue()
-			: rpl::single(0) | rpl::type_erased())
-	) | rpl::start_with_next([=] {
+			: rpl::single(0) | rpl::type_erased)
+	) | rpl::on_next([=] {
 		updateScrollSkips();
 	}, _comment->lifetime());
 
 	_inner->searchRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		needSearchByUsername();
 	}, _inner->lifetime());
 
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &request) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 
@@ -337,10 +360,36 @@ void ShareBox::prepare() {
 		{ .suggestCustomEmoji = true });
 
 	_select->raise();
+
+	{
+		const auto chatsFilters = AddChatFiltersTabsStrip(
+			this,
+			_descriptor.session,
+			[this](FilterId id) {
+				_inner->applyChatFilter(id);
+				scrollToY(0);
+			},
+			Window::GifPauseReason::Layer,
+			nullptr,
+			false,
+			true);
+		chatsFilters->lower();
+		chatsFilters->heightValue() | rpl::on_next([this](int h) {
+			updateScrollSkips();
+			scrollToY(0);
+		}, lifetime());
+		_select->heightValue() | rpl::on_next([=](int h) {
+			chatsFilters->moveToLeft(0, h);
+		}, chatsFilters->lifetime());
+		_chatsFilters = chatsFilters;
+	}
 }
 
 int ShareBox::getTopScrollSkip() const {
-	return _select->isHidden() ? 0 : _select->height();
+	return (_select->isHidden() ? 0 : _select->height())
+		+ ((_chatsFilters && _inner && _inner->isFilterEmpty())
+			? _chatsFilters->height()
+			: 0);
 }
 
 int ShareBox::getBottomScrollSkip() const {
@@ -378,6 +427,7 @@ bool ShareBox::searchByUsername(bool searchCache) {
 			_peopleQuery = query;
 			_peopleFull = false;
 			_peopleRequest = _api.request(MTPcontacts_Search(
+				MTP_flags(0),
 				MTP_string(_peopleQuery),
 				MTP_int(SearchPeopleLimit)
 			)).done([=](const MTPcontacts_Found &result, mtpRequestId requestId) {
@@ -475,9 +525,19 @@ void ShareBox::keyPressEvent(QKeyEvent *e) {
 
 SendMenu::Details ShareBox::sendMenuDetails() const {
 	const auto selected = _inner->selected();
-	const auto type = ranges::all_of(
-		selected | ranges::views::transform(&Data::Thread::peer),
-		HistoryView::CanScheduleUntilOnline)
+	const auto hasPaid = [&] {
+		for (const auto &thread : selected) {
+			if (thread->peer()->starsPerMessageChecked()) {
+				return true;
+			}
+		}
+		return false;
+	}();
+	const auto type = hasPaid
+		? SendMenu::Type::SilentOnly
+		: ranges::all_of(
+			selected | ranges::views::transform(&Data::Thread::peer),
+			HistoryView::CanScheduleUntilOnline)
 		? SendMenu::Type::ScheduledToUser
 		: (selected.size() == 1 && selected.front()->peer()->isSelf())
 		? SendMenu::Type::Reminder
@@ -504,7 +564,7 @@ void ShareBox::showMenu(not_null<Ui::RpWidget*> parent) {
 				nullptr);
 			std::move(
 				text
-			) | rpl::start_with_next([action = item->action()](QString text) {
+			) | rpl::on_next([action = item->action()](QString text) {
 				action->setText(text);
 			}, item->lifetime());
 			item->init(checked);
@@ -527,15 +587,18 @@ void ShareBox::showMenu(not_null<Ui::RpWidget*> parent) {
 			submit(action.options);
 			return;
 		}
+		const auto st = _descriptor.st.scheduleBox
+			? *_descriptor.st.scheduleBox
+			: HistoryView::ScheduleBoxStyleArgs();
 		uiShow()->showBox(
 			HistoryView::PrepareScheduleBox(
 				this,
-				nullptr, // ChatHelpers::Show for effect attachment.
+				_descriptor.session,
 				sendMenuDetails(),
 				[=](Api::SendOptions options) { submit(options); },
 				action.options,
 				HistoryView::DefaultScheduleTime(),
-				_descriptor.scheduleBoxStyle));
+				st));
 	});
 	_menu->setForcedVerticalOrigin(Ui::PopupMenu::VerticalOrigin::Bottom);
 	const auto result = FillSendMenu(
@@ -564,11 +627,14 @@ void ShareBox::createButtons() {
 
 		send->setAcceptBoth();
 		send->clicks(
-		) | rpl::start_with_next([=](Qt::MouseButton button) {
+		) | rpl::on_next([=](Qt::MouseButton button) {
 			if (button == Qt::RightButton) {
 				showMenu(send);
 			}
 		}, send->lifetime());
+		send->setText(PaidSendButtonText(
+			_starsToSend.value(),
+			tr::lng_share_confirm()));
 	} else if (_descriptor.copyCallback) {
 		addButton(_copyLinkText.value(), [=] { copyLink(); });
 	}
@@ -584,15 +650,18 @@ void ShareBox::addPeerToMultiSelect(not_null<Data::Thread*> thread) {
 	auto addItemWay = Ui::MultiSelect::AddItemWay::Default;
 	const auto peer = thread->peer();
 	const auto topic = thread->asTopic();
+	const auto sublist = thread->asSublist();
 	_select->addItem(
 		peer->id.value,
 		(topic
 			? topic->title()
+			: sublist
+			? sublist->sublistPeer()->shortName()
 			: peer->isSelf()
 			? tr::lng_saved_short(tr::now)
 			: peer->shortName()),
 		st::activeButtonBg,
-		(topic
+		((topic || sublist)
 			? ForceRoundUserpicCallback(peer)
 			: PaintUserpicCallback(peer, true)),
 		addItemWay);
@@ -612,16 +681,86 @@ void ShareBox::innerSelectedChanged(
 }
 
 void ShareBox::submit(Api::SendOptions options) {
+	_submitLifetime.destroy();
+
+	auto threads = _inner->selected();
+	const auto weak = base::make_weak(this);
+	const auto field = _comment->entity();
+	auto comment = field->getTextWithAppliedMarkdown();
+	const auto checkPaid = [=] {
+		if (!_descriptor.countMessagesCallback) {
+			return true;
+		}
+		const auto withPaymentApproved = crl::guard(weak, [=](int approved) {
+			auto copy = options;
+			copy.starsApproved = approved;
+			submit(copy);
+		});
+		const auto messagesCount = _descriptor.countMessagesCallback(
+			comment);
+		const auto alreadyApproved = options.starsApproved;
+		auto paid = std::vector<not_null<PeerData*>>();
+		auto waiting = base::flat_set<not_null<PeerData*>>();
+		auto totalStars = 0;
+		for (const auto &thread : threads) {
+			const auto peer = thread->peer();
+			const auto details = ComputePaymentDetails(peer, messagesCount);
+			if (!details) {
+				waiting.emplace(peer);
+			} else if (details->stars > 0) {
+				totalStars += details->stars;
+				paid.push_back(peer);
+			}
+		}
+		if (!waiting.empty()) {
+			_descriptor.session->changes().peerUpdates(
+				Data::PeerUpdate::Flag::FullInfo
+			) | rpl::on_next([=](const Data::PeerUpdate &update) {
+				if (waiting.contains(update.peer)) {
+					withPaymentApproved(alreadyApproved);
+				}
+			}, _submitLifetime);
+
+			if (!_descriptor.session->credits().loaded()) {
+				_descriptor.session->credits().loadedValue(
+				) | rpl::filter(
+					rpl::mappers::_1
+				) | rpl::take(1) | rpl::on_next([=] {
+					withPaymentApproved(alreadyApproved);
+				}, _submitLifetime);
+			}
+			return false;
+		} else if (totalStars > alreadyApproved) {
+			const auto show = uiShow();
+			const auto session = _descriptor.session;
+			const auto sessionShow = Main::MakeSessionShow(show, session);
+			const auto scheduleBoxSt = _descriptor.st.scheduleBox.get();
+			ShowSendPaidConfirm(sessionShow, paid, SendPaymentDetails{
+				.messages = messagesCount,
+				.stars = totalStars,
+			}, [=] { withPaymentApproved(totalStars); }, PaidConfirmStyles{
+				.label = (scheduleBoxSt
+					? scheduleBoxSt->chooseDateTimeArgs.labelStyle
+					: nullptr),
+				.checkbox = _descriptor.st.checkbox,
+			});
+			return false;
+		}
+		return true;
+	};
 	if (const auto onstack = _descriptor.submitCallback) {
-		const auto forwardOptions = (_forwardOptions.captionsCount
-			&& _forwardOptions.dropCaptions)
+		const auto forwardOptions = !_descriptor.forwardOptions.show
+			? Data::ForwardOptions::PreserveInfo
+			: (_forwardOptions.captionsCount
+				&& _forwardOptions.dropCaptions)
 			? Data::ForwardOptions::NoNamesAndCaptions
 			: _forwardOptions.dropNames
 			? Data::ForwardOptions::NoSenderNames
 			: Data::ForwardOptions::PreserveInfo;
 		onstack(
-			_inner->selected(),
-			_comment->entity()->getTextWithAppliedMarkdown(),
+			std::move(threads),
+			checkPaid,
+			std::move(comment),
 			options,
 			forwardOptions);
 	}
@@ -641,9 +780,23 @@ void ShareBox::selectedChanged() {
 		_comment->toggle(_hasSelected, anim::type::normal);
 		_comment->resizeToWidth(st::boxWideWidth);
 	}
+	computeStarsCount();
 	update();
 }
 
+void ShareBox::computeStarsCount() {
+	auto perMessage = 0;
+	for (const auto &thread : _inner->selected()) {
+		perMessage += thread->peer()->starsPerMessageChecked();
+	}
+	const auto messagesCount = _descriptor.countMessagesCallback
+		? _descriptor.countMessagesCallback(_comment
+			? _comment->entity()->getTextWithTags()
+			: TextWithTags())
+		: 0;
+	_starsToSend = perMessage * messagesCount;
+}
+
 void ShareBox::scrollTo(Ui::ScrollToRequest request) {
 	scrollToY(request.ymin, request.ymax);
 	//auto scrollTop = scrollArea()->scrollTop(), scrollBottom = scrollTop + scrollArea()->height();
@@ -670,28 +823,31 @@ ShareBox::Inner::Inner(
 : RpWidget(parent)
 , _descriptor(descriptor)
 , _show(std::move(show))
-, _st(_descriptor.st ? *_descriptor.st : st::shareBoxList)
-, _chatsIndexed(
+, _st(_descriptor.st.peerList
+	? *_descriptor.st.peerList
+	: st::shareBoxList)
+, _defaultChatsIndexed(
 	std::make_unique<Dialogs::IndexedList>(
-		Dialogs::SortMode::Add)) {
+		Dialogs::SortMode::Add))
+, _chatsIndexed(_defaultChatsIndexed.get()) {
 	_rowsTop = st::shareRowsTop;
 	_rowHeight = st::shareRowHeight;
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
-	if (_descriptor.premiumRequiredError) {
+	if (_descriptor.moneyRestrictionError) {
 		const auto session = _descriptor.session;
 		rpl::merge(
 			Data::AmPremiumValue(session) | rpl::to_empty,
-			session->api().premium().somePremiumRequiredResolved()
-		) | rpl::start_with_next([=] {
-			refreshLockedRows();
+			session->api().premium().someMessageMoneyRestrictionsResolved()
+		) | rpl::on_next([=] {
+			refreshRestrictedRows();
 		}, lifetime());
 	}
 
 	const auto self = _descriptor.session->user();
 	const auto selfHistory = self->owner().history(self);
 	if (_descriptor.filterCallback(selfHistory)) {
-		_chatsIndexed->addToEnd(selfHistory);
+		_defaultChatsIndexed->addToEnd(selfHistory);
 	}
 	const auto addList = [&](not_null<Dialogs::IndexedList*> list) {
 		for (const auto &row : list->all()) {
@@ -699,7 +855,7 @@ ShareBox::Inner::Inner(
 				if (!history->peer->isSelf()
 					&& (history->asForum()
 						|| _descriptor.filterCallback(history))) {
-					_chatsIndexed->addToEnd(history);
+					_defaultChatsIndexed->addToEnd(history);
 				}
 			}
 		}
@@ -716,24 +872,24 @@ ShareBox::Inner::Inner(
 
 	_descriptor.session->changes().peerUpdates(
 		Data::PeerUpdate::Flag::Photo
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		updateChat(update.peer);
 	}, lifetime());
 
 	_descriptor.session->changes().realtimeNameUpdates(
-	) | rpl::start_with_next([=](const Data::NameUpdate &update) {
-		_chatsIndexed->peerNameChanged(
+	) | rpl::on_next([=](const Data::NameUpdate &update) {
+		_defaultChatsIndexed->peerNameChanged(
 			update.peer,
 			update.oldFirstLetters);
 	}, lifetime());
 
 	_descriptor.session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		invalidateCache();
 	}, lifetime());
 }
@@ -745,38 +901,36 @@ void ShareBox::Inner::invalidateCache() {
 }
 
 bool ShareBox::Inner::showLockedError(not_null<Chat*> chat) {
-	if (!chat->locked) {
+	if (!chat->restriction.premiumRequired) {
 		return false;
 	}
 	::Settings::ShowPremiumPromoToast(
 		Main::MakeSessionShow(_show, _descriptor.session),
 		ChatHelpers::ResolveWindowDefault(),
-		_descriptor.premiumRequiredError(chat->peer->asUser()).text,
+		_descriptor.moneyRestrictionError(chat->peer->asUser()).text,
 		u"require_premium"_q);
 	return true;
 }
 
-void ShareBox::Inner::refreshLockedRows() {
+void ShareBox::Inner::refreshRestrictedRows() {
 	auto changed = false;
 	for (const auto &[peer, data] : _dataMap) {
 		const auto history = data->history;
-		const auto locked = (Api::ResolveRequiresPremiumToWrite(
+		const auto restriction = Api::ResolveMessageMoneyRestrictions(
 			history->peer,
-			history
-		) == Api::RequirePremiumState::Yes);
-		if (data->locked != locked) {
-			data->locked = locked;
+			history);
+		if (data->restriction != restriction) {
+			data->restriction = restriction;
 			changed = true;
 		}
 	}
 	for (const auto &data : d_byUsernameFiltered) {
 		const auto history = data->history;
-		const auto locked = (Api::ResolveRequiresPremiumToWrite(
+		const auto restriction = Api::ResolveMessageMoneyRestrictions(
 			history->peer,
-			history
-		) == Api::RequirePremiumState::Yes);
-		if (data->locked != locked) {
-			data->locked = locked;
+			history);
+		if (data->restriction != restriction) {
+			data->restriction = restriction;
 			changed = true;
 		}
 	}
@@ -833,6 +987,8 @@ void ShareBox::Inner::updateChatName(not_null<Chat*> chat) {
 	const auto peer = chat->peer;
 	const auto text = chat->topic
 		? chat->topic->title()
+		: chat->sublist
+		? chat->sublist->sublistPeer()->name()
 		: peer->isSelf()
 		? tr::lng_saved_messages(tr::now)
 		: peer->isRepliesChat()
@@ -843,14 +999,14 @@ void ShareBox::Inner::updateChatName(not_null<Chat*> chat) {
 	chat->name.setText(_st.item.nameStyle, text, Ui::NameTextOptions());
 }
 
-void ShareBox::Inner::initChatLocked(not_null<Chat*> chat) {
-	if (_descriptor.premiumRequiredError) {
+void ShareBox::Inner::initChatRestriction(not_null<Chat*> chat) {
+	if (_descriptor.moneyRestrictionError) {
 		const auto history = chat->history;
-		if (Api::ResolveRequiresPremiumToWrite(
+		const auto restriction = Api::ResolveMessageMoneyRestrictions(
 			history->peer,
-			history
-		) == Api::RequirePremiumState::Yes) {
-			chat->locked = true;
+			history);
+		if (restriction || restriction.known) {
+			chat->restriction = restriction;
 		}
 	}
 }
@@ -976,14 +1132,15 @@ void ShareBox::Inner::loadProfilePhotos() {
 void ShareBox::Inner::preloadUserpic(not_null<Dialogs::Entry*> entry) {
 	entry->chatListPreloadData();
 	const auto history = entry->asHistory();
-	if (!_descriptor.premiumRequiredError || !history) {
+	if (!_descriptor.moneyRestrictionError || !history) {
 		return;
-	} else if (Api::ResolveRequiresPremiumToWrite(
-		history->peer,
-		history
-	) == Api::RequirePremiumState::Unknown) {
-		const auto user = history->peer->asUser();
-		_descriptor.session->api().premium().resolvePremiumRequired(user);
+	} else if (!Api::ResolveMessageMoneyRestrictions(
+			history->peer,
+			history).known) {
+		if (const auto user = history->peer->asUser()) {
+			const auto api = &_descriptor.session->api();
+			api->premium().resolveMessageMoneyRestrictions(user);
+		}
 	}
 }
 
@@ -1006,7 +1163,7 @@ auto ShareBox::Inner::getChat(not_null<Dialogs::Row*> row)
 			repaintChat(peer);
 		}));
 	updateChatName(i->second.get());
-	initChatLocked(i->second.get());
+	initChatRestriction(i->second.get());
 	row->attached = i->second.get();
 	return i->second.get();
 }
@@ -1040,10 +1197,12 @@ void ShareBox::Inner::paintChat(
 	auto photoTop = st::sharePhotoTop;
 	chat->checkbox.paint(p, x + photoLeft, y + photoTop, outerWidth);
 
-	if (chat->locked) {
-		PaintPremiumRequiredLock(
+	if (chat->restriction) {
+		PaintRestrictionBadge(
 			p,
 			&_st.item,
+			chat->restriction.starsPerMessage,
+			chat->badgeCache,
 			x + photoLeft,
 			y + photoTop,
 			outerWidth,
@@ -1069,7 +1228,7 @@ ShareBox::Inner::Chat::Chat(
 	st.checkbox,
 	updateCallback,
 	PaintUserpicCallback(peer, true),
-	[=](int size) { return peer->isForum()
+	[=](int size) { return (peer->isForum() || peer->isMonoforum())
 		? int(size * Ui::ForumUserpicRadiusMultiplier())
 		: std::optional<int>(); })
 , name(st.checkbox.imageRadius * 2) {
@@ -1163,6 +1322,12 @@ void ShareBox::Inner::updateUpon(const QPoint &pos) {
 	auto x = pos.x(), y = pos.y();
 	auto row = (y - _rowsTop) / _rowHeight;
 	auto column = qFloor((x - _rowsLeft) / _rowWidthReal);
+
+	if (column < 0 || column >= _columnCount) {
+		_upon = -1;
+		return;
+	}
+
 	auto left = _rowsLeft + qFloor(column * _rowWidthReal) + st::shareColumnSkip / 2;
 	auto top = _rowsTop + row * _rowHeight + st::sharePhotoTop;
 	auto xupon = (x >= left) && (x < left + (_rowWidth - st::shareColumnSkip));
@@ -1210,34 +1375,39 @@ void ShareBox::Inner::changeCheckState(Chat *chat) {
 
 	const auto checked = chat->checkbox.checked();
 	const auto forum = chat->peer->forum();
-	if (checked || !forum) {
+	const auto monoforum = chat->peer->monoforum();
+	if (checked || (!forum && !monoforum)) {
 		changePeerCheckState(chat, !checked);
-	} else {
-		chooseForumTopic(chat->peer->forum());
+	} else if (forum) {
+		chooseForumTopic(forum);
+	} else if (monoforum) {
+		chooseMonoforumSublist(monoforum);
 	}
 }
 
 void ShareBox::Inner::chooseForumTopic(not_null<Data::Forum*> forum) {
-	const auto guard = Ui::MakeWeak(this);
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
-	auto chosen = [=](not_null<Data::ForumTopic*> topic) {
+	const auto guard = base::make_weak(this);
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
+	auto chosen = [=](not_null<Data::Thread*> thread) {
 		if (const auto strong = *weak) {
 			strong->closeBox();
 		}
 		if (!guard) {
 			return;
 		}
-		const auto row = _chatsIndexed->getRow(topic->owningHistory());
+		const auto row = _chatsIndexed->getRow(thread->owningHistory());
 		if (!row) {
 			return;
 		}
 		const auto chat = getChat(row);
-		Assert(!chat->topic);
-		chat->topic = topic;
-		chat->topic->destroyed(
-		) | rpl::start_with_next([=] {
-			changePeerCheckState(chat, false);
-		}, chat->topicLifetime);
+		if (const auto topic = thread->asTopic()) {
+			Assert(!chat->topic);
+			chat->topic = topic;
+			chat->topic->destroyed(
+			) | rpl::on_next([=] {
+				changePeerCheckState(chat, false);
+			}, chat->topicLifetime);
+		}
 		updateChatName(chat);
 		changePeerCheckState(chat, true);
 	};
@@ -1247,12 +1417,12 @@ void ShareBox::Inner::chooseForumTopic(not_null<Data::Forum*> forum) {
 		});
 
 		forum->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	};
-	auto filter = [=](not_null<Data::ForumTopic*> topic) {
-		return guard && _descriptor.filterCallback(topic);
+	auto filter = [=](not_null<Data::Thread*> thread) {
+		return guard && _descriptor.filterCallback(thread);
 	};
 	auto box = Box<PeerListBox>(
 		std::make_unique<ChooseTopicBoxController>(
@@ -1264,6 +1434,54 @@ void ShareBox::Inner::chooseForumTopic(not_null<Data::Forum*> forum) {
 	_show->showBox(std::move(box));
 }
 
+void ShareBox::Inner::chooseMonoforumSublist(
+		not_null<Data::SavedMessages*> monoforum) {
+	const auto guard = base::make_weak(this);
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
+	auto chosen = [=](not_null<Data::SavedSublist*> sublist) {
+		if (const auto strong = *weak) {
+			strong->closeBox();
+		}
+		if (!guard) {
+			return;
+		}
+		const auto row = _chatsIndexed->getRow(sublist->owningHistory());
+		if (!row) {
+			return;
+		}
+		const auto chat = getChat(row);
+		Assert(!chat->sublist);
+		chat->sublist = sublist;
+		chat->sublist->destroyed(
+		) | rpl::on_next([=] {
+			changePeerCheckState(chat, false);
+		}, chat->sublistLifetime);
+		updateChatName(chat);
+		changePeerCheckState(chat, true);
+	};
+	auto initBox = [=](not_null<PeerListBox*> box) {
+		box->addButton(tr::lng_cancel(), [=] {
+			box->closeBox();
+		});
+
+		monoforum->destroyed(
+		) | rpl::on_next([=] {
+			box->closeBox();
+		}, box->lifetime());
+	};
+	auto filter = [=](not_null<Data::SavedSublist*> sublist) {
+		return guard && _descriptor.filterCallback(sublist);
+	};
+	auto box = Box<PeerListBox>(
+		std::make_unique<ChooseSublistBoxController>(
+			monoforum,
+			std::move(chosen),
+			std::move(filter)),
+		std::move(initBox));
+	*weak = box.data();
+	_show->showBox(std::move(box));
+}
+
 void ShareBox::Inner::peerUnselected(not_null<PeerData*> peer) {
 	if (const auto i = _dataMap.find(peer); i != end(_dataMap)) {
 		changePeerCheckState(
@@ -1294,6 +1512,11 @@ void ShareBox::Inner::changePeerCheckState(
 			chat->topic = nullptr;
 			updateChatName(chat);
 		}
+		if (chat->sublist) {
+			chat->sublistLifetime.destroy();
+			chat->sublist = nullptr;
+			updateChatName(chat);
+		}
 	}
 	if (useCallback != ChangeStateWay::SkipCallback
 		&& _peerSelectedChangedCallback) {
@@ -1331,6 +1554,10 @@ void ShareBox::Inner::updateFilter(QString filter) {
 	}
 }
 
+bool ShareBox::Inner::isFilterEmpty() const {
+	return _filter.isEmpty();
+}
+
 rpl::producer<Ui::ScrollToRequest> ShareBox::Inner::scrollToRequests() const {
 	return _scrollToRequests.events();
 }
@@ -1339,6 +1566,30 @@ rpl::producer<> ShareBox::Inner::searchRequests() const {
 	return _searchRequests.events();
 }
 
+void ShareBox::Inner::applyChatFilter(FilterId id) {
+	if (!id) {
+		_chatsIndexed = _defaultChatsIndexed.get();
+	} else {
+		_customChatsIndexed = std::make_unique<Dialogs::IndexedList>(
+			Dialogs::SortMode::Add);
+		_chatsIndexed = _customChatsIndexed.get();
+
+		const auto addList = [&](not_null<Dialogs::IndexedList*> list) {
+			for (const auto &row : list->all()) {
+				if (const auto history = row->history()) {
+					if (history->asForum()
+							|| _descriptor.filterCallback(history)) {
+						_customChatsIndexed->addToEnd(history);
+					}
+				}
+			}
+		};
+		const auto &data = _descriptor.session->data();
+		addList(data.chatsFilters().chatsList(id)->indexed());
+	}
+	update();
+}
+
 void ShareBox::Inner::peopleReceived(
 		const QString &query,
 		const QVector<MTPPeer> &my,
@@ -1370,7 +1621,7 @@ void ShareBox::Inner::peopleReceived(
 					_st.item,
 					[=] { repaintChat(peer); }));
 				updateChatName(d_byUsernameFiltered.back().get());
-				initChatLocked(d_byUsernameFiltered.back().get());
+				initChatRestriction(d_byUsernameFiltered.back().get());
 			}
 		}
 	};
@@ -1397,6 +1648,8 @@ not_null<Data::Thread*> ShareBox::Inner::chatThread(
 		not_null<Chat*> chat) const {
 	return chat->topic
 		? (Data::Thread*)chat->topic
+		: chat->sublist
+		? (Data::Thread*)chat->sublist
 		: chat->peer->owner().history(chat->peer).get();
 }
 
@@ -1423,48 +1676,54 @@ ChatHelpers::ForwardedMessagePhraseArgs CreateForwardedMessagePhraseArgs(
 	};
 }
 
+ShareBox::CountMessagesCallback ShareBox::DefaultForwardCountMessages(
+		not_null<History*> history,
+		MessageIdsList msgIds) {
+	return [=](const TextWithTags &comment) {
+		const auto items = history->owner().idsToItems(msgIds);
+		return int(items.size()) + (comment.empty() ? 0 : 1);
+	};
+}
+
 ShareBox::SubmitCallback ShareBox::DefaultForwardCallback(
 		std::shared_ptr<Ui::Show> show,
 		not_null<History*> history,
-		MessageIdsList msgIds) {
+		MessageIdsList msgIds,
+		std::optional<TimeId> videoTimestamp) {
 	struct State final {
 		base::flat_set<mtpRequestId> requests;
+		mtpRequestId nextRequestKey = 0;
 	};
 	const auto state = std::make_shared<State>();
 	return [=](
 			std::vector<not_null<Data::Thread*>> &&result,
-			TextWithTags &&comment,
+			Fn<bool()> checkPaid,
+			TextWithTags comment,
 			Api::SendOptions options,
 			Data::ForwardOptions forwardOptions) {
 		if (!state->requests.empty()) {
 			return; // Share clicked already.
 		}
+
 		const auto items = history->owner().idsToItems(msgIds);
 		const auto existingIds = history->owner().itemsToIds(items);
 		if (existingIds.empty() || result.empty()) {
 			return;
 		}
+		if (HistoryView::Controls::HasRichPage(items)) {
+			forwardOptions = HistoryView::Controls::NormalizeForwardOptions(
+				&history->session(),
+				items,
+				forwardOptions);
+		}
 
-		const auto error = [&] {
-			for (const auto thread : result) {
-				const auto error = GetErrorTextForSending(
-					thread,
-					{ .forward = &items, .text = &comment });
-				if (!error.isEmpty()) {
-					return std::make_pair(error, thread);
-				}
-			}
-			return std::make_pair(QString(), result.front());
-		}();
-		if (!error.first.isEmpty()) {
-			auto text = TextWithEntities();
-			if (result.size() > 1) {
-				text.append(
-					Ui::Text::Bold(error.second->chatListName())
-				).append("\n\n");
-			}
-			text.append(error.first);
-			show->showBox(Ui::MakeInformBox(text));
+		const auto error = GetErrorForSending(
+			result,
+			{ .forward = &items, .text = &comment });
+		if (error.error) {
+			show->showBox(MakeSendErrorBox(error, result.size() > 1));
+			return;
+		} else if (!checkPaid()) {
 			return;
 		}
 
@@ -1472,101 +1731,241 @@ ShareBox::SubmitCallback ShareBox::DefaultForwardCallback(
 		const auto commonSendFlags = Flag(0)
 			| Flag::f_with_my_score
 			| (options.scheduled ? Flag::f_schedule_date : Flag(0))
+			| ((options.scheduled && options.scheduleRepeatPeriod)
+				? Flag::f_schedule_repeat_period
+				: Flag(0))
 			| ((forwardOptions != Data::ForwardOptions::PreserveInfo)
 				? Flag::f_drop_author
 				: Flag(0))
 			| ((forwardOptions == Data::ForwardOptions::NoNamesAndCaptions)
 				? Flag::f_drop_media_captions
+				: Flag(0))
+			| (videoTimestamp.has_value()
+				? Flag::f_video_timestamp
 				: Flag(0));
 		auto mtpMsgIds = QVector<MTPint>();
 		mtpMsgIds.reserve(existingIds.size());
 		for (const auto &fullId : existingIds) {
 			mtpMsgIds.push_back(MTP_int(fullId.msg));
 		}
-		const auto generateRandom = [&] {
-			auto result = QVector<MTPlong>(existingIds.size());
-			for (auto &value : result) {
-				value = base::RandomValue<MTPlong>();
-			}
-			return result;
-		};
-		auto &api = history->owner().session().api();
+		auto &api = history->session().api();
 		auto &histories = history->owner().histories();
 		const auto donePhraseArgs = CreateForwardedMessagePhraseArgs(
 			result,
 			msgIds);
-		const auto requestType = Data::Histories::RequestType::Send;
-		for (const auto thread : result) {
+		const auto showRecentForwardsToSelf = result.size() == 1
+			&& result.front()->peer()->isSelf()
+			&& history->session().premium();
+		for (const auto &thread : result) {
+			const auto peer = thread->peer();
+			const auto threadHistory = thread->owningHistory();
+			const auto forum = threadHistory->asForum();
+			const auto needNewTopic = forum
+				&& forum->bot()
+				&& Data::IsBotUserCreatesTopics(peer)
+				&& !thread->asTopic();
+			const auto effectiveThread = [&]() -> not_null<Data::Thread*> {
+				if (needNewTopic) {
+					const auto topic = forum->reserveNewBotTopic();
+					Assert(topic != nullptr);
+					return topic;
+				}
+				return thread;
+			}();
+
 			if (!comment.text.isEmpty()) {
 				auto message = Api::MessageToSend(
-					Api::SendAction(thread, options));
+					Api::SendAction(effectiveThread, options));
 				message.textWithTags = comment;
 				message.action.clearDraft = false;
 				api.sendMessage(std::move(message));
 			}
-			const auto topicRootId = thread->topicRootId();
-			const auto kGeneralId = Data::ForumTopic::kGeneralId;
-			const auto topMsgId = (topicRootId == kGeneralId)
-				? MsgId(0)
-				: topicRootId;
-			const auto peer = thread->peer();
-			const auto threadHistory = thread->owningHistory();
-			histories.sendRequest(threadHistory, requestType, [=](
-					Fn<void()> finish) {
-				const auto session = &threadHistory->session();
-				auto &api = session->api();
-				const auto sendFlags = commonSendFlags
-					| (topMsgId ? Flag::f_top_msg_id : Flag(0))
-					| (ShouldSendSilent(peer, options)
-						? Flag::f_silent
-						: Flag(0))
-					| (options.shortcutId
-						? Flag::f_quick_reply_shortcut
-						: Flag(0));
-				threadHistory->sendRequestId = api.request(
-					MTPmessages_ForwardMessages(
-						MTP_flags(sendFlags),
-						history->peer->input,
-						MTP_vector<MTPint>(mtpMsgIds),
-						MTP_vector<MTPlong>(generateRandom()),
-						peer->input,
-						MTP_int(topMsgId),
-						MTP_int(options.scheduled),
-						MTP_inputPeerEmpty(), // send_as
-						Data::ShortcutIdToMTP(session, options.shortcutId)
-				)).done([=](const MTPUpdates &updates, mtpRequestId reqId) {
-					threadHistory->session().api().applyUpdates(updates);
-					state->requests.remove(reqId);
-					if (state->requests.empty()) {
-						if (show->valid()) {
-							auto phrase = rpl::variable<TextWithEntities>(
-								ChatHelpers::ForwardedMessagePhrase(
-									donePhraseArgs)).current();
-							show->showToast(std::move(phrase));
-							show->hideLayer();
+
+			const auto topicRootId = effectiveThread->topicRootId();
+			const auto sublistPeer = needNewTopic
+				? nullptr
+				: thread->maybeSublistPeer();
+			const auto fromPeer = history->peer;
+			const auto msgCount = int(existingIds.size());
+			const auto starsPaid = std::min(
+				peer->starsPerMessageChecked(),
+				options.starsApproved);
+			if (starsPaid) {
+				options.starsApproved -= starsPaid;
+			}
+			const auto sendFlags = commonSendFlags
+				| (ShouldSendSilent(peer, options)
+					? Flag::f_silent
+					: Flag(0))
+				| (options.shortcutId
+					? Flag::f_quick_reply_shortcut
+					: Flag(0))
+				| (starsPaid ? Flag::f_allow_paid_stars : Flag())
+				| (sublistPeer ? Flag::f_reply_to : Flag())
+				| (options.suggest ? Flag::f_suggested_post : Flag())
+				| (options.effectId ? Flag::f_effect : Flag());
+			auto buildMessage = [=](
+					not_null<History*> history,
+					FullReplyTo replyTo)
+				-> Data::Histories::PreparedMessage {
+				const auto kGeneralId
+					= Data::ForumTopic::kGeneralId;
+				const auto realTopMsgId
+					= (replyTo.topicRootId == kGeneralId)
+					? MsgId(0)
+					: replyTo.topicRootId;
+				auto flags = sendFlags;
+				if (realTopMsgId) {
+					flags |= Flag::f_top_msg_id;
+				} else {
+					flags &= ~Flag::f_top_msg_id;
+				}
+				auto randoms = QVector<MTPlong>(msgCount);
+				for (auto &value : randoms) {
+					value = base::RandomValue<MTPlong>();
+				}
+				return MTPmessages_ForwardMessages(
+					MTP_flags(flags),
+					fromPeer->input(),
+					MTP_vector<MTPint>(mtpMsgIds),
+					MTP_vector<MTPlong>(randoms),
+					history->peer->input(),
+					MTP_int(realTopMsgId),
+					(sublistPeer
+						? MTP_inputReplyToMonoForum(
+							sublistPeer->input())
+						: MTPInputReplyTo()),
+					MTP_int(options.scheduled),
+					MTP_int(options.scheduleRepeatPeriod),
+					MTP_inputPeerEmpty(),
+					Data::ShortcutIdToMTP(
+						&history->session(),
+						options.shortcutId),
+					MTP_long(options.effectId),
+					MTP_int(videoTimestamp.value_or(0)),
+					MTP_long(starsPaid),
+					Api::SuggestToMTP(options.suggest));
+			};
+			const auto requestDone = [=](
+					const MTPUpdates &updates,
+					mtpRequestId requestKey) {
+				if (showRecentForwardsToSelf) {
+					ApiWrap::ProcessRecentSelfForwards(
+						&threadHistory->session(),
+						updates,
+						peer->id,
+						history->peer->id);
+				}
+				state->requests.remove(requestKey);
+				if (state->requests.empty()) {
+					if (show->valid()) {
+						auto phrase = rpl::variable<
+							TextWithEntities>(
+							ChatHelpers::ForwardedMessagePhrase(
+								donePhraseArgs)).current();
+						if (!phrase.empty()) {
+							show->showToast({
+								.text = std::move(phrase),
+								.filter = ChatHelpers
+									::ForwardedToSavedMessagesFilter(
+										&history->session()),
+							});
 						}
+						show->hideLayer();
 					}
-					finish();
-				}).fail([=](const MTP::Error &error) {
-					if (error.type() == u"VOICE_MESSAGES_FORBIDDEN"_q) {
-						show->showToast(
-							tr::lng_restricted_send_voice_messages(
-								tr::now,
-								lt_user,
-								peer->name()));
+				}
+			};
+			const auto requestFail = [=](
+					const MTP::Error &error,
+					mtpRequestId requestKey) {
+				const auto type = error.type();
+				if (type.startsWith(
+						u"ALLOW_PAYMENT_REQUIRED_"_q)) {
+					show->showToast(
+						u"Payment requirements changed. "
+						"Please, try again."_q);
+				} else if (type
+					== u"VOICE_MESSAGES_FORBIDDEN"_q) {
+					show->showToast(
+						tr::lng_restricted_send_voice_messages(
+							tr::now,
+							lt_user,
+							peer->name()));
+				}
+				state->requests.remove(requestKey);
+				if (state->requests.empty()) {
+					if (show->valid()) {
+						show->hideLayer();
 					}
-					finish();
-				}).afterRequest(threadHistory->sendRequestId).send();
-				return threadHistory->sendRequestId;
-			});
-			state->requests.insert(threadHistory->sendRequestId);
+				}
+			};
+			const auto requestKey = ++state->nextRequestKey;
+			state->requests.insert(requestKey);
+			histories.sendPreparedMessage(
+				threadHistory,
+				FullReplyTo{ .topicRootId = topicRootId },
+				uint64(0),
+				std::move(buildMessage),
+				[=](const MTPUpdates &updates,
+						const MTP::Response &) {
+					requestDone(updates, requestKey);
+				},
+				[=](const MTP::Error &error,
+						const MTP::Response &) {
+					requestFail(error, requestKey);
+				});
+		}
+		if (state->requests.empty()) {
+			if (show->valid()) {
+				auto phrase = rpl::variable<TextWithEntities>(
+					ChatHelpers::ForwardedMessagePhrase(
+						donePhraseArgs)).current();
+				if (!phrase.empty()) {
+					show->showToast({
+						.text = std::move(phrase),
+						.filter = ChatHelpers
+							::ForwardedToSavedMessagesFilter(
+								&history->session()),
+					});
+				}
+				show->hideLayer();
+			}
 		}
 	};
 }
 
+ShareBoxStyleOverrides DarkShareBoxStyle() {
+	using namespace HistoryView;
+
+	const auto schedule = [&] {
+		auto date = Ui::ChooseDateTimeStyleArgs();
+		date.labelStyle = &st::groupCallBoxLabel;
+		date.dateFieldStyle = &st::groupCallScheduleDateField;
+		date.timeFieldStyle = &st::groupCallScheduleTimeField;
+		date.separatorStyle = &st::callMuteButtonLabel;
+		date.atStyle = &st::callMuteButtonLabel;
+		date.calendarStyle = &st::groupCallCalendarColors;
+
+		auto st = ScheduleBoxStyleArgs();
+		st.topButtonStyle = &st::groupCallMenuToggle;
+		st.popupMenuStyle = &st::groupCallPopupMenu;
+		st.chooseDateTimeArgs = std::move(date);
+		return st;
+	};
+	return {
+		.multiSelect = &st::groupCallMultiSelect,
+		.comment = &st::groupCallShareBoxComment,
+		.peerList = &st::groupCallShareBoxList,
+		.label = &st::groupCallField,
+		.checkbox = &st::groupCallCheckbox,
+		.scheduleBox = std::make_shared<ScheduleBoxStyleArgs>(schedule()),
+	};
+}
+
 void FastShareMessage(
 		std::shared_ptr<Main::SessionShow> show,
-		not_null<HistoryItem*> item) {
+		not_null<HistoryItem*> item,
+		ShareBoxStyleOverrides st) {
 	const auto history = item->history();
 	const auto owner = &history->owner();
 	const auto session = &history->session();
@@ -1587,6 +1986,9 @@ void FastShareMessage(
 		: ranges::all_of(items, [](auto item) {
 			return item->media() && item->media()->forceForwardedInfo();
 		});
+	const auto canShowRichForwardOptions
+		= !HistoryView::Controls::HasRichPage(items)
+		|| HistoryView::Controls::CanHideForwardAuthor(session, items);
 
 	auto copyCallback = [=] {
 		const auto item = owner->message(msgIds[0]);
@@ -1604,8 +2006,13 @@ void FastShareMessage(
 
 					QGuiApplication::clipboard()->setText(link);
 
-					show->showToast(
-						tr::lng_share_game_link_copied(tr::now));
+					show->showToast({
+						.text = {
+							tr::lng_share_game_link_copied(tr::now),
+						},
+						.iconLottie = u"toast/voip_invite"_q,
+						.iconLottieSize = st::toastLottieIconSize,
+					});
 				}
 			}
 		}
@@ -1615,7 +2022,7 @@ void FastShareMessage(
 	const auto requiresInline = item->requiresSendInlineRight();
 	auto filterCallback = [=](not_null<Data::Thread*> thread) {
 		if (const auto user = thread->peer()->asUser()) {
-			if (user->canSendIgnoreRequirePremium()) {
+			if (user->canSendIgnoreMoneyRestrictions()) {
 				return true;
 			}
 		}
@@ -1630,43 +2037,90 @@ void FastShareMessage(
 	show->show(Box<ShareBox>(ShareBox::Descriptor{
 		.session = session,
 		.copyCallback = std::move(copyLinkCallback),
+		.countMessagesCallback = ShareBox::DefaultForwardCountMessages(
+			history,
+			msgIds),
 		.submitCallback = ShareBox::DefaultForwardCallback(
 			show,
 			history,
 			msgIds),
 		.filterCallback = std::move(filterCallback),
+		.st = st,
 		.forwardOptions = {
 			.sendersCount = ItemsForwardSendersCount(items),
 			.captionsCount = ItemsForwardCaptionsCount(items),
-			.show = !hasOnlyForcedForwardedInfo,
+			.show = !hasOnlyForcedForwardedInfo
+				&& canShowRichForwardOptions,
 		},
-		.premiumRequiredError = SharePremiumRequiredError(),
+		.moneyRestrictionError = ShareMessageMoneyRestrictionError(),
 	}), Ui::LayerOption::CloseOther);
 }
 
+void FastShareMessageToSelf(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<HistoryItem*> item) {
+	const auto self = show->session().user();
+	auto &owner = self->owner();
+	const auto items = owner.idsToItems(owner.itemOrItsGroup(item));
+	const auto donePhraseArgs = ChatHelpers::ForwardedMessagePhraseArgs{
+		.toCount = 1,
+		.singleMessage = (items.size() == 1),
+		.to1 = self,
+		.to2 = nullptr,
+	};
+	auto sendAction = Api::SendAction(owner.history(self));
+	sendAction.clearDraft = false;
+	show->session().api().forwardMessages(
+		Data::ResolvedForwardDraft{ .items = items },
+		std::move(sendAction),
+		[=] {
+			auto phrase = rpl::variable<TextWithEntities>(
+				ChatHelpers::ForwardedMessagePhrase(
+					donePhraseArgs)).current();
+			if (!phrase.empty()) {
+				show->showToast({
+					.text = std::move(phrase),
+					.filter = ChatHelpers::ForwardedToSavedMessagesFilter(
+						&show->session()),
+				});
+			}
+		});
+}
+
 void FastShareMessage(
 		not_null<Window::SessionController*> controller,
-		not_null<HistoryItem*> item) {
-	FastShareMessage(controller->uiShow(), item);
+		not_null<HistoryItem*> item,
+		ShareBoxStyleOverrides st) {
+	FastShareMessage(controller->uiShow(), item, st);
 }
 
 void FastShareLink(
 		not_null<Window::SessionController*> controller,
-		const QString &url) {
-	FastShareLink(controller->uiShow(), url);
+		const QString &url,
+		ShareBoxStyleOverrides st) {
+	FastShareLink(controller->uiShow(), url, st);
 }
 
 void FastShareLink(
 		std::shared_ptr<Main::SessionShow> show,
-		const QString &url) {
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
+		const QString &url,
+		ShareBoxStyleOverrides st) {
+	const auto box = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto sending = std::make_shared<bool>();
 	auto copyCallback = [=] {
 		QGuiApplication::clipboard()->setText(url);
-		show->showToast(tr::lng_background_link_copied(tr::now));
+		show->showToast({
+			.text = { tr::lng_background_link_copied(tr::now) },
+			.iconLottie = u"toast/voip_invite"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
+	};
+	auto countMessagesCallback = [=](const TextWithTags &comment) {
+		return 1;
 	};
 	auto submitCallback = [=](
 			std::vector<not_null<::Data::Thread*>> &&result,
+			Fn<bool()> checkPaid,
 			TextWithTags &&comment,
 			Api::SendOptions options,
 			::Data::ForwardOptions) {
@@ -1674,32 +2128,17 @@ void FastShareLink(
 			return;
 		}
 
-		const auto error = [&] {
-			for (const auto thread : result) {
-				const auto error = GetErrorTextForSending(
-					thread,
-					{ .text = &comment });
-				if (!error.isEmpty()) {
-					return std::make_pair(error, thread);
-				}
-			}
-			return std::make_pair(QString(), result.front());
-		}();
-		if (!error.first.isEmpty()) {
-			auto text = TextWithEntities();
-			if (result.size() > 1) {
-				text.append(
-					Ui::Text::Bold(error.second->chatListName())
-				).append("\n\n");
-			}
-			text.append(error.first);
+		const auto error = GetErrorForSending(
+			result,
+			{ .text = &comment });
+		if (error.error) {
 			if (const auto weak = *box) {
-				weak->getDelegate()->show(Ui::MakeConfirmBox({
-					.text = text,
-					.inform = true,
-				}));
+				weak->getDelegate()->show(
+					MakeSendErrorBox(error, result.size() > 1));
 			}
 			return;
+		} else if (!checkPaid()) {
+			return;
 		}
 
 		*sending = true;
@@ -1713,7 +2152,7 @@ void FastShareLink(
 			comment.text = url;
 		}
 		auto &api = show->session().api();
-		for (const auto thread : result) {
+		for (const auto &thread : result) {
 			auto message = Api::MessageToSend(
 				Api::SendAction(thread, options));
 			message.textWithTags = comment;
@@ -1727,7 +2166,7 @@ void FastShareLink(
 	};
 	auto filterCallback = [](not_null<::Data::Thread*> thread) {
 		if (const auto user = thread->peer()->asUser()) {
-			if (user->canSendIgnoreRequirePremium()) {
+			if (user->canSendIgnoreMoneyRestrictions()) {
 				return true;
 			}
 		}
@@ -1737,15 +2176,17 @@ void FastShareLink(
 		Box<ShareBox>(ShareBox::Descriptor{
 			.session = &show->session(),
 			.copyCallback = std::move(copyCallback),
+			.countMessagesCallback = std::move(countMessagesCallback),
 			.submitCallback = std::move(submitCallback),
 			.filterCallback = std::move(filterCallback),
-			.premiumRequiredError = SharePremiumRequiredError(),
+			.st = st,
+			.moneyRestrictionError = ShareMessageMoneyRestrictionError(),
 		}),
 		Ui::LayerOption::KeepOther,
 		anim::type::normal);
 }
 
-auto SharePremiumRequiredError()
--> Fn<RecipientPremiumRequiredError(not_null<UserData*>)> {
-	return WritePremiumRequiredError;
+auto ShareMessageMoneyRestrictionError()
+-> Fn<RecipientMoneyRestrictionError(not_null<UserData*>)> {
+	return WriteMoneyRestrictionError;
 }
diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h
index d0bf28ce91e2ca..ec31a835b502ef 100644
--- a/Telegram/SourceFiles/boxes/share_box.h
+++ b/Telegram/SourceFiles/boxes/share_box.h
@@ -61,58 +61,81 @@ class PopupMenu;
 
 class ShareBox;
 
-void FastShareMessage(
+struct ShareBoxStyleOverrides {
+	const style::MultiSelect *multiSelect = nullptr;
+	const style::InputField *comment = nullptr;
+	const style::PeerList *peerList = nullptr;
+	const style::InputField *label = nullptr;
+	const style::Checkbox *checkbox = nullptr;
+	std::shared_ptr<HistoryView::ScheduleBoxStyleArgs> scheduleBox;
+};
+[[nodiscard]] ShareBoxStyleOverrides DarkShareBoxStyle();
+
+void FastShareMessageToSelf(
 	std::shared_ptr<Main::SessionShow> show,
 	not_null<HistoryItem*> item);
+void FastShareMessage(
+	std::shared_ptr<Main::SessionShow> show,
+	not_null<HistoryItem*> item,
+	ShareBoxStyleOverrides st = {});
 void FastShareMessage(
 	not_null<Window::SessionController*> controller,
-	not_null<HistoryItem*> item);
+	not_null<HistoryItem*> item,
+	ShareBoxStyleOverrides st = {});
 void FastShareLink(
 	not_null<Window::SessionController*> controller,
-	const QString &url);
+	const QString &url,
+	ShareBoxStyleOverrides st = {});
 void FastShareLink(
 	std::shared_ptr<Main::SessionShow> show,
-	const QString &url);
+	const QString &url,
+	ShareBoxStyleOverrides st = {});
 
-struct RecipientPremiumRequiredError;
-[[nodiscard]] auto SharePremiumRequiredError()
--> Fn<RecipientPremiumRequiredError(not_null<UserData*>)>;
+struct RecipientMoneyRestrictionError;
+[[nodiscard]] auto ShareMessageMoneyRestrictionError()
+-> Fn<RecipientMoneyRestrictionError(not_null<UserData*>)>;
 
 class ShareBox final : public Ui::BoxContent {
 public:
 	using CopyCallback = Fn<void()>;
+	using CountMessagesCallback = Fn<int(const TextWithTags&)>;
 	using SubmitCallback = Fn<void(
 		std::vector<not_null<Data::Thread*>>&&,
+		Fn<bool()> checkPaid,
 		TextWithTags&&,
 		Api::SendOptions,
 		Data::ForwardOptions)>;
 	using FilterCallback = Fn<bool(not_null<Data::Thread*>)>;
 
+	[[nodiscard]] static auto DefaultForwardCountMessages(
+		not_null<History*> history,
+		MessageIdsList msgIds) -> CountMessagesCallback;
 	[[nodiscard]] static SubmitCallback DefaultForwardCallback(
 		std::shared_ptr<Ui::Show> show,
 		not_null<History*> history,
-		MessageIdsList msgIds);
+		MessageIdsList msgIds,
+		std::optional<TimeId> videoTimestamp = {});
 
 	struct Descriptor {
 		not_null<Main::Session*> session;
 		CopyCallback copyCallback;
+		CountMessagesCallback countMessagesCallback;
 		SubmitCallback submitCallback;
 		FilterCallback filterCallback;
 		object_ptr<Ui::RpWidget> bottomWidget = { nullptr };
 		rpl::producer<QString> copyLinkText;
-		const style::MultiSelect *stMultiSelect = nullptr;
-		const style::InputField *stComment = nullptr;
-		const style::PeerList *st = nullptr;
-		const style::InputField *stLabel = nullptr;
+		rpl::producer<QString> titleOverride;
+		ShareBoxStyleOverrides st;
+		std::optional<TimeId> videoTimestamp;
 		struct {
 			int sendersCount = 0;
 			int captionsCount = 0;
 			bool show = false;
 		} forwardOptions;
-		HistoryView::ScheduleBoxStyleArgs scheduleBoxStyle;
 
-		using PremiumRequiredError = RecipientPremiumRequiredError;
-		Fn<PremiumRequiredError(not_null<UserData*>)> premiumRequiredError;
+		using MoneyRestrictionError = RecipientMoneyRestrictionError;
+		Fn<MoneyRestrictionError(
+			not_null<UserData*>)> moneyRestrictionError;
 	};
 	ShareBox(QWidget*, Descriptor &&descriptor);
 
@@ -137,6 +160,7 @@ class ShareBox final : public Ui::BoxContent {
 	void needSearchByUsername();
 	void applyFilterUpdate(const QString &query);
 	void selectedChanged();
+	void computeStarsCount();
 	void createButtons();
 	int getTopScrollSkip() const;
 	int getBottomScrollSkip() const;
@@ -168,12 +192,15 @@ class ShareBox final : public Ui::BoxContent {
 
 	bool _hasSelected = false;
 	rpl::variable<QString> _copyLinkText;
+	rpl::variable<int> _starsToSend;
 
 	base::Timer _searchTimer;
 	QString _peopleQuery;
 	bool _peopleFull = false;
 	mtpRequestId _peopleRequest = 0;
 
+	RpWidget *_chatsFilters = nullptr;
+
 	using PeopleCache = QMap<QString, MTPcontacts_Found>;
 	PeopleCache _peopleCache;
 
@@ -181,5 +208,6 @@ class ShareBox final : public Ui::BoxContent {
 	PeopleQueries _peopleQueries;
 
 	Ui::Animations::Simple _scrollAnimation;
+	rpl::lifetime _submitLifetime;
 
 };
diff --git a/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp b/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp
new file mode 100644
index 00000000000000..21b4a3230b0320
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/star_gift_auction_box.cpp
@@ -0,0 +1,2124 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/star_gift_auction_box.h"
+
+#include "api/api_text_entities.h"
+#include "base/random.h"
+#include "base/timer_rpl.h"
+#include "base/unixtime.h"
+#include "boxes/peers/replace_boost_box.h"
+#include "boxes/premium_preview_box.h"
+#include "boxes/send_credits_box.h" // CreditsEmojiSmall
+#include "boxes/share_box.h"
+#include "boxes/star_gift_box.h"
+#include "boxes/star_gift_preview_box.h"
+#include "boxes/star_gift_resale_box.h"
+#include "calls/group/calls_group_common.h"
+#include "core/application.h"
+#include "core/credits_amount.h"
+#include "core/ui_integration.h"
+#include "data/components/credits.h"
+#include "data/components/gift_auctions.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_document.h"
+#include "data/data_message_reactions.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "history/view/controls/history_view_suggest_options.h"
+#include "info/channel_statistics/earn/earn_icons.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "payments/ui/payments_reaction_box.h"
+#include "payments/payments_checkout_process.h"
+#include "settings/settings_credits_graphics.h"
+#include "storage/storage_account.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/boxes/emoji_stake_box.h" // AddStarsInputField
+#include "ui/controls/button_labels.h"
+#include "ui/controls/feature_list.h"
+#include "ui/controls/table_rows.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/effects/premium_bubble.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "ui/text/custom_emoji_text_badge.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/fields/number_input.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/wrap/table_layout.h"
+#include "ui/color_int_conversion.h"
+#include "ui/dynamic_thumbnails.h"
+#include "ui/vertical_list.h"
+#include "window/window_session_controller.h"
+#include "styles/style_calls.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h"
+#include "styles/style_giveaway.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
+#include "styles/style_widgets.h"
+
+#include <QtWidgets/QApplication>
+#include <QtGui/QClipboard>
+
+namespace Ui {
+namespace {
+
+constexpr auto kAuctionAboutShownPref = "gift_auction_about_shown"_cs;
+constexpr auto kBidPlacedToastDuration = 5 * crl::time(1000);
+constexpr auto kSwitchPreviewCoverInterval = 3 * crl::time(1000);
+constexpr auto kMaxShownBid = 30'000;
+constexpr auto kShowTopPlaces = 3;
+
+enum class BidType {
+	Setting,
+	Winning,
+	Loosing,
+};
+struct BidRowData {
+	UserData *user = nullptr;
+	int stars = 0;
+	int position = 0;
+	int winners = 0;
+	QString place;
+	BidType type = BidType::Setting;
+
+	friend inline bool operator==(
+		const BidRowData &,
+		const BidRowData &) = default;
+};
+
+struct BidSliderValues {
+	int min = 0;
+	int explicitlyAllowed = 0;
+	int max = 0;
+
+	friend inline bool operator==(
+		const BidSliderValues &,
+		const BidSliderValues &) = default;
+};
+
+[[nodiscard]] std::optional<QColor> BidColorOverride(int position, int per) {
+	return (position <= per)
+		? st::boxTextFgGood->c
+		: st::attentionButtonFg->c;
+	//switch (type) {
+	//case BidType::Setting: return {};
+	//case BidType::Winning: return st::boxTextFgGood->c;
+	//case BidType::Loosing: return st::attentionButtonFg->c;
+	//}
+	//Unexpected("Type in BidType.");
+}
+
+[[nodiscard]] rpl::producer<int> MinutesLeftTillValue(TimeId endDate) {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		const auto now = base::unixtime::now();
+		if (endDate <= now) {
+			consumer.put_next(0);
+			consumer.put_done();
+			return lifetime;
+		}
+
+		const auto timer = lifetime.make_state<base::Timer>();
+		const auto callback = [=] {
+			const auto now = base::unixtime::now();
+			const auto left = (endDate > now) ? endDate - now : 0;
+			const auto minutes = (left + 59) / 60;
+			consumer.put_next_copy(minutes);
+			if (minutes) {
+				const auto next = left % 60;
+				const auto wait = next ? next : 60;
+				timer->callOnce(wait * crl::time(1000));
+			} else {
+				consumer.put_done();
+			}
+		};
+		timer->setCallback(callback);
+		callback();
+
+		return lifetime;
+	};
+}
+
+[[nodiscard]] rpl::producer<int> SecondsLeftTillValue(TimeId endDate) {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		const auto now = base::unixtime::now();
+		const auto left = (endDate > now) ? endDate - now : 0;
+		if (!left) {
+			consumer.put_next(0);
+			consumer.put_done();
+			return lifetime;
+		}
+
+		const auto starts = crl::now();
+		const auto ends = starts + left * crl::time(1000);
+		const auto timer = lifetime.make_state<base::Timer>();
+		const auto callback = [=] {
+			const auto now = crl::now();
+			const auto left = (ends > now) ? ends - now : 0;
+			const auto seconds = (left + 999) / 1000;
+			consumer.put_next_copy(seconds);
+			if (seconds) {
+				const auto next = left % 1000;
+				const auto wait = next ? next : 1000;
+				timer->callOnce(wait);
+			} else {
+				consumer.put_done();
+			}
+		};
+		timer->setCallback(callback);
+		callback();
+
+		return lifetime;
+	};
+}
+
+[[nodiscard]] QString NiceCountdownText(int seconds) {
+	const auto minutes = seconds / 60;
+	const auto hours = minutes / 60;
+	return hours
+		? u"%1:%2:%3"_q
+		.arg(hours)
+		.arg((minutes % 60), 2, 10, QChar('0'))
+		.arg((seconds % 60), 2, 10, QChar('0'))
+		: u"%1:%2"_q.arg(minutes).arg((seconds % 60), 2, 10, QChar('0'));
+}
+
+[[nodiscard]] object_ptr<RpWidget> MakeBidRow(
+		not_null<RpWidget*> parent,
+		std::shared_ptr<ChatHelpers::Show> show,
+		rpl::producer<BidRowData> data) {
+	auto result = object_ptr<RpWidget>(parent.get());
+	const auto raw = result.data();
+
+	raw->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	struct State {
+		std::unique_ptr<FlatLabel> place;
+		std::unique_ptr<UserpicButton> userpic;
+		std::unique_ptr<FlatLabel> name;
+		std::unique_ptr<FlatLabel> stars;
+		UserData *user = nullptr;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+	state->place = std::make_unique<FlatLabel>(
+		raw,
+		rpl::duplicate(data) | rpl::map(&BidRowData::place),
+		st::auctionBidPlace);
+
+	auto name = rpl::duplicate(data) | rpl::map([](const BidRowData &bid) {
+		return bid.user ? bid.user->name() : QString();
+	});
+	state->name = std::make_unique<FlatLabel>(
+		raw,
+		std::move(name),
+		st::auctionBidName);
+
+	auto helper = Text::CustomEmojiHelper(Core::TextContext({
+		.session = &show->session(),
+	}));
+	const auto star = helper.paletteDependent(Ui::Earn::IconCreditsEmoji());
+	auto stars = rpl::duplicate(data) | rpl::map([=](const BidRowData &bid) {
+		return tr::marked(star).append(' ').append(
+			Lang::FormatCountDecimal(bid.stars));
+	});
+	state->stars = std::make_unique<FlatLabel>(
+		raw,
+		std::move(stars),
+		st::auctionBidStars,
+		st::defaultPopupMenu,
+		helper.context());
+
+	const auto kHuge = u"99999"_q;
+	const auto userpicLeft = st::auctionBidPlace.style.font->width(kHuge);
+
+	std::move(data) | rpl::on_next([=](BidRowData bid) {
+		state->place->setTextColorOverride(
+			BidColorOverride(bid.position, bid.winners));
+		if (state->user != bid.user) {
+			state->user = bid.user;
+			if (state->user) {
+				if (auto was = state->userpic.release()) {
+					was->hide();
+					crl::on_main(was, [=] { delete was; });
+				}
+				state->userpic = std::make_unique<UserpicButton>(
+					raw,
+					state->user,
+					st::auctionBidUserpic);
+				state->userpic->show();
+				state->userpic->moveToLeft(userpicLeft, 0);
+				raw->resize(raw->width(), state->userpic->height());
+			} else {
+				raw->resize(raw->width(), 0);
+			}
+		}
+	}, raw->lifetime());
+
+	rpl::combine(
+		raw->widthValue(),
+		state->stars->widthValue()
+	) | rpl::on_next([=](int outer, int stars) {
+		const auto userpicSize = st::auctionBidUserpic.size;
+		const auto top = (userpicSize.height() - st::normalFont->height) / 2;
+		state->place->moveToLeft(0, top, outer);
+		if (state->userpic) {
+			state->userpic->moveToLeft(userpicLeft, 0, outer);
+		}
+		state->stars->moveToRight(0, top, outer);
+
+		const auto userpicRight = userpicLeft + userpicSize.width();
+		const auto nameLeft = userpicRight + st::auctionBidSkip;
+		const auto nameRight = stars + st::auctionBidSkip;
+		state->name->resizeToWidth(outer - nameLeft - nameRight);
+		state->name->moveToLeft(nameLeft, top, outer);
+	}, raw->lifetime());
+
+	return result;
+}
+
+Fn<void(not_null<Ui::PopupMenu*>)> MakeAuctionFillMenuCallback(
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::GiftAuctionState &state) {
+	const auto url = show->session().createInternalLinkFull(
+		u"auction/"_q + state.gift->auctionSlug);
+	const auto rounds = state.totalRounds;
+	const auto perRound = state.gift->auctionGiftsPerRound;;
+	return [=](not_null<Ui::PopupMenu*> menu) {
+		menu->addAction(tr::lng_auction_menu_about(tr::now), [=] {
+			show->show(Box(AuctionAboutBox, rounds, perRound, nullptr));
+		}, &st::menuIconInfo);
+
+		menu->addAction(tr::lng_auction_menu_copy_link(tr::now), [=] {
+			QApplication::clipboard()->setText(url);
+			show->showToast({
+				.text = { tr::lng_username_copied(tr::now) },
+				.iconLottie = u"toast/voip_invite"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		}, &st::menuIconLink);
+
+		menu->addAction(tr::lng_auction_menu_share(tr::now), [=] {
+			FastShareLink(show, url);
+		}, &st::menuIconShare);
+	};
+}
+
+Fn<void()> MakeAuctionMenuCallback(
+		not_null<QWidget*> parent,
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::GiftAuctionState &state) {
+	const auto menu = std::make_shared<base::unique_qptr<PopupMenu>>();
+	return [=, fill = MakeAuctionFillMenuCallback(show, state)] {
+		*menu = base::make_unique_q<Ui::PopupMenu>(
+			parent,
+			st::popupMenuWithIcons);
+		fill(menu->get());
+		(*menu)->popup(QCursor::pos());
+	};
+}
+
+void PlaceAuctionBid(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> to,
+		int64 amount,
+		const Data::GiftAuctionState &state,
+		std::unique_ptr<Info::PeerGifts::GiftSendDetails> details,
+		Fn<void(Payments::CheckoutResult)> done) {
+	auto paymentDone = [=](
+			Payments::CheckoutResult result,
+			const MTPUpdates *updates) {
+		done(result);
+	};
+	const auto passDetails = (details || !state.my.bid);
+	const auto hideName = passDetails && details && details->anonymous;
+	const auto text = details ? details->text : TextWithEntities();
+
+	using Flag = MTPDinputInvoiceStarGiftAuctionBid::Flag;
+	const auto invoice = MTP_inputInvoiceStarGiftAuctionBid(
+		MTP_flags((state.my.bid ? Flag::f_update_bid : Flag())
+			| (passDetails ? Flag::f_peer : Flag())
+			| (passDetails ? Flag::f_message : Flag())
+			| (hideName ? Flag::f_hide_name : Flag())),
+		passDetails ? to->input() : MTP_inputPeerEmpty(),
+		MTP_long(state.gift->id),
+		MTP_long(amount),
+		MTP_textWithEntities(
+			MTP_string(text.text),
+			Api::EntitiesToMTP(&to->session(), text.entities)));
+	RequestOurForm(show, invoice, [=](
+			uint64 formId,
+			CreditsAmount price,
+			std::optional<Payments::CheckoutResult> failure) {
+		if (failure) {
+			paymentDone(*failure, nullptr);
+		} else {
+			SubmitStarsForm(
+				show,
+				invoice,
+				formId,
+				price.whole(),
+				paymentDone);
+		}
+	});
+}
+
+object_ptr<RpWidget> MakeAuctionInfoBlocks(
+		not_null<RpWidget*> box,
+		not_null<Main::Session*> session,
+		rpl::producer<Data::GiftAuctionState> stateValue,
+		Fn<void()> setMinimal) {
+	auto helper = Text::CustomEmojiHelper(Core::TextContext({
+		.session = session,
+	}));
+	const auto star = helper.paletteDependent(Ui::Earn::IconCreditsEmoji());
+
+	auto bidTitle = rpl::duplicate(
+		stateValue
+	) | rpl::map([=](const Data::GiftAuctionState &state) {
+		const auto count = int(state.my.minBidAmount
+			? state.my.minBidAmount
+			: state.minBidAmount);
+		const auto text = (count >= 10'000'000)
+			? Lang::FormatCountToShort(count).string
+			: (count >= 1000'000)
+			? Lang::FormatCountToShort(count, true).string
+			: Lang::FormatCountDecimal(count);
+		return tr::marked(star).append(' ').append(text);
+	});
+	auto minimal = rpl::duplicate(
+		stateValue
+	) | rpl::map([=](const Data::GiftAuctionState &state) {
+		return state.my.minBidAmount
+			? state.my.minBidAmount
+			: state.minBidAmount;
+	}) | tr::to_count();
+	auto untilTitle = rpl::duplicate(
+		stateValue
+	) | rpl::map([=](const Data::GiftAuctionState &state) {
+		return SecondsLeftTillValue(state.startDate) | rpl::then(
+			SecondsLeftTillValue(state.nextRoundAt
+				? state.nextRoundAt
+				: state.endDate));
+	}) | rpl::flatten_latest(
+	) | rpl::map(NiceCountdownText) | rpl::map(tr::marked);
+	auto untilSubtext = rpl::duplicate(
+		stateValue
+	) | rpl::map([=](const Data::GiftAuctionState &state) {
+		auto preview = SecondsLeftTillValue(
+			state.startDate
+		) | rpl::map(rpl::mappers::_1 > 0) | rpl::distinct_until_changed();
+		return rpl::conditional(
+			std::move(preview),
+			tr::lng_auction_bid_before_start(),
+			tr::lng_auction_bid_until());
+	}) | rpl::flatten_latest();
+	auto leftTitle = rpl::duplicate(
+		stateValue
+	) | rpl::map([=](const Data::GiftAuctionState &state) {
+		return Data::SingleCustomEmoji(
+			state.gift->document
+		).append(' ').append(Lang::FormatCountDecimal(state.giftsLeft));
+	});
+	auto left = rpl::duplicate(
+		stateValue
+	) | rpl::map([=](const Data::GiftAuctionState &state) {
+		return state.giftsLeft;
+	}) | tr::to_count();
+	return MakeStarSelectInfoBlocks(box, {
+		{
+			.title = std::move(bidTitle),
+			.subtext = tr::lng_auction_bid_minimal(
+				lt_count,
+				std::move(minimal)),
+			.click = setMinimal,
+		},
+		{
+			.title = std::move(untilTitle),
+			.subtext = std::move(untilSubtext),
+		},
+		{
+			.title = std::move(leftTitle),
+			.subtext = tr::lng_auction_bid_left(lt_count, std::move(left))
+		},
+	}, helper.context());
+}
+
+void AddBidPlaces(
+		not_null<GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
+		rpl::producer<Data::GiftAuctionState> value,
+		rpl::producer<int> chosen) {
+	struct My {
+		BidType type;
+		int position = 0;
+
+		inline bool operator==(const My &) const = default;
+	};
+	struct State {
+		rpl::variable<My> my;
+		rpl::variable<bool> started;
+		rpl::variable<std::vector<BidRowData>> top;
+		std::vector<Ui::PeerUserpicView> cache;
+		int winners = 0;
+	};
+	const auto state = box->lifetime().make_state<State>();
+
+	rpl::duplicate(
+		value
+	) | rpl::on_next([=](const Data::GiftAuctionState &value) {
+		auto cache = std::vector<Ui::PeerUserpicView>();
+		cache.reserve(value.topBidders.size());
+		for (const auto &user : value.topBidders) {
+			cache.push_back(user->createUserpicView());
+		}
+		state->winners = value.gift->auctionGiftsPerRound;
+		state->cache = std::move(cache);
+		state->started = SecondsLeftTillValue(
+			value.startDate
+		) | rpl::map(!rpl::mappers::_1);
+	}, box->lifetime());
+
+	state->my = rpl::combine(
+		rpl::duplicate(value),
+		rpl::duplicate(chosen)
+	) | rpl::map([=](const Data::GiftAuctionState &value, int chosen) {
+		const auto my = value.my.bid;
+		const auto &levels = value.bidLevels;
+
+		auto top = std::vector<BidRowData>();
+		top.reserve(kShowTopPlaces);
+		const auto pushTop = [&](auto i) {
+			const auto index = int(i - begin(levels));
+			if (top.size() >= kShowTopPlaces
+				|| index >= value.topBidders.size()) {
+				return false;
+			} else if (!value.topBidders[index]->isSelf()) {
+				top.push_back({ value.topBidders[index], int(i->amount) });
+			}
+			return true;
+		};
+
+		const auto setting = (chosen > my);
+		const auto finishWith = [&](int position) {
+			state->top = std::move(top);
+			const auto type = setting
+				? BidType::Setting
+				: (position <= value.gift->auctionGiftsPerRound)
+				? BidType::Winning
+				: BidType::Loosing;
+			return My{ type, position };
+		};
+
+		for (auto i = begin(levels), e = end(levels); i != e; ++i) {
+			if (i->amount < chosen
+				|| (!setting
+					&& i->amount == chosen
+					&& i->date >= value.my.date)) {
+				top.push_back({ show->session().user(), chosen });
+				for (auto j = i; j != e; ++j) {
+					if (!pushTop(j)) {
+						break;
+					}
+				}
+				return finishWith(i->position);
+			}
+			pushTop(i);
+		}
+		top.push_back({ show->session().user(), chosen });
+		return finishWith((levels.empty() ? 0 : levels.back().position) + 1);
+	});
+	auto myLabelText = rpl::combine(
+		state->my.value(),
+		state->started.value()
+	) | rpl::map([](My my, bool started) {
+		if (!started) {
+			return tr::lng_auction_bid_your_title();
+		}
+		switch (my.type) {
+		case BidType::Setting: return tr::lng_auction_bid_your_title();
+		case BidType::Winning: return tr::lng_auction_bid_your_winning();
+		case BidType::Loosing: return tr::lng_auction_bid_your_outbid();
+		}
+		Unexpected("Type in BidType.");
+	}) | rpl::flatten_latest();
+	const auto myLabel = AddSubsectionTitle(
+		box->verticalLayout(),
+		std::move(myLabelText));
+	state->my.value() | rpl::on_next([=](My my) {
+		myLabel->setTextColorOverride(
+			BidColorOverride(my.position, state->winners));
+	}, myLabel->lifetime());
+
+	auto bid = rpl::combine(
+		state->my.value(),
+		rpl::duplicate(chosen)
+	) | rpl::map([=, user = show->session().user()](My my, int stars) {
+		const auto position = my.position;
+		const auto winners = state->winners;
+		const auto place = QString::number(position);
+		return BidRowData{ user, stars, position, winners, place, my.type };
+	});
+	box->addRow(MakeBidRow(box, show, std::move(bid)));
+
+	AddSubsectionTitle(
+		box->verticalLayout(),
+		tr::lng_auction_bid_winners_title(),
+		{ 0, st::paidReactTitleSkip / 2, 0, 0 });
+	for (auto i = 0; i != kShowTopPlaces; ++i) {
+		auto icon = QString::fromUtf8("\xf0\x9f\xa5\x87");
+		icon.back().unicode() += i;
+
+		auto bid = state->top.value(
+		) | rpl::map([=](const std::vector<BidRowData> &top) {
+			auto result = (i < top.size()) ? top[i] : BidRowData();
+			result.place = icon;
+			return result;
+		});
+		box->addRow(MakeBidRow(box, show, std::move(bid)));
+	}
+}
+
+void EditCustomBid(
+		not_null<GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
+		Fn<void(int)> save,
+		rpl::producer<int> minBid,
+		int current) {
+	box->setTitle(tr::lng_auction_bid_custom_title());
+
+	const auto container = box->verticalLayout();
+
+	box->addTopButton(st::boxTitleClose, [=] { box->closeBox(); });
+
+	const auto starsField = AddStarsInputField(container, {
+		.value = current,
+	});
+
+	const auto min = box->lifetime().make_state<rpl::variable<int>>(
+		std::move(minBid));
+
+	box->setFocusCallback([=] {
+		starsField->setFocusFast();
+	});
+
+	const auto submit = [=] {
+		const auto value = starsField->getLastText().toLongLong();
+		if (value <= min->current() || value > 1'000'000'000) {
+			starsField->showError();
+			return;
+		}
+		save(value);
+		box->closeBox();
+	};
+	QObject::connect(starsField, &Ui::NumberInput::submitted, submit);
+
+	box->addButton(tr::lng_settings_save(), submit);
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+}
+
+void AuctionBidBox(not_null<GenericBox*> box, AuctionBidBoxArgs &&args) {
+	using namespace Info::PeerGifts;
+	struct State {
+		State(rpl::producer<Data::GiftAuctionState> value)
+		: value(std::move(value)) {
+		}
+
+		rpl::variable<Data::GiftAuctionState> value;
+		rpl::variable<BidSliderValues> sliderValues;
+		rpl::variable<int> chosen;
+		rpl::variable<QString> subtext;
+		rpl::variable<bool> started;
+		bool placing = false;
+	};
+	const auto state = box->lifetime().make_state<State>(
+		std::move(args.state));
+	state->started = state->value.value(
+	) | rpl::map([=](const Data::GiftAuctionState &value) {
+		return value.startDate;
+	}) | rpl::distinct_until_changed(
+	) | rpl::map([=](TimeId startTime) {
+		return SecondsLeftTillValue(
+			startTime
+		) | rpl::map([=](int seconds) {
+			return !seconds;
+		});
+	}) | rpl::flatten_latest();
+	state->sliderValues = state->value.value(
+	) | rpl::map([=](const Data::GiftAuctionState &value) {
+		const auto mine = int(value.my.bid);
+		const auto min = std::max(1, int(value.my.minBidAmount
+			? value.my.minBidAmount
+			: value.minBidAmount));
+		const auto last = value.bidLevels.empty()
+			? 0
+			: value.bidLevels.front().amount;
+		auto max = std::max({
+			min + 1,
+			kMaxShownBid,
+			int(base::SafeRound(mine * 1.2)),
+		});
+		if (max < last * 1.05) {
+			max = int(base::SafeRound(last * 1.2));
+		}
+		return BidSliderValues{
+			.min = min,
+			.explicitlyAllowed = mine,
+			.max = max,
+		};
+	});
+
+	const auto show = args.show;
+	const auto giftId = state->value.current().gift->id;
+	const auto &sliderValues = state->sliderValues.current();
+	state->chosen = sliderValues.explicitlyAllowed
+		? sliderValues.explicitlyAllowed
+		: sliderValues.min;
+
+	state->subtext = rpl::combine(
+		state->value.value(),
+		state->chosen.value()
+	) | rpl::map([=](
+			const Data::GiftAuctionState &value,
+			int chosen) {
+		if (value.my.bid == chosen) {
+			return tr::lng_auction_bid_your(tr::now);
+		} else if (chosen == state->sliderValues.current().max) {
+			return tr::lng_auction_bid_custom(tr::now);
+		} else if (value.my.bid && chosen > value.my.bid) {
+			const auto delta = chosen - value.my.bid;
+			return '+' + Lang::FormatCountDecimal(delta);
+		}
+		return QString();
+	});
+
+	args.peer->owner().giftAuctionGots(
+	) | rpl::on_next([=](const Data::GiftAuctionGot &update) {
+		if (update.giftId == giftId) {
+			box->closeBox();
+
+			if (const auto window = show->resolveWindow()) {
+				window->showPeerHistory(
+					update.to,
+					Window::SectionShow::Way::ClearStack,
+					ShowAtTheEndMsgId);
+			}
+		}
+	}, box->lifetime());
+
+	const auto details = args.details
+		? *args.details
+		: std::optional<GiftSendDetails>();
+	const auto colorings = show->session().appConfig().groupCallColorings();
+
+	box->setWidth(st::boxWideWidth);
+	box->setStyle(st::paidReactBox);
+	box->setNoContentMargin(true);
+
+	const auto content = box->verticalLayout();
+	AddSkip(content, st::boxTitleClose.height + st::paidReactBubbleTop);
+
+	const auto activeFgOverride = [=](int count) {
+		const auto coloring = Calls::Group::Ui::StarsColoringForCount(
+			colorings,
+			count);
+		return ColorFromSerialized(coloring.bgLight);
+	};
+	const auto sliderWrap = content->add(
+		object_ptr<VerticalLayout>(content));
+	state->sliderValues.value(
+	) | rpl::on_next([=](const BidSliderValues &values) {
+		const auto initial = !sliderWrap->count();
+		if (!initial) {
+			while (sliderWrap->count()) {
+				delete sliderWrap->widgetAt(0);
+			}
+			while (!sliderWrap->children().isEmpty()) {
+				delete sliderWrap->children().front();
+			}
+		}
+
+		const auto setCustom = [=] {
+			auto min = state->value.value(
+			) | rpl::map([=](const Data::GiftAuctionState &state) {
+				return std::max(1, int(state.my.minBidAmount
+					? state.my.minBidAmount
+					: state.minBidAmount));
+			});
+			show->show(Box(EditCustomBid, show, crl::guard(box, [=](int v) {
+				state->chosen = v;
+			}), std::move(min), state->chosen.current()));
+		};
+
+		const auto bubble = AddStarSelectBubble(
+			sliderWrap,
+			initial ? BoxShowFinishes(box) : nullptr,
+			state->chosen.value(),
+			values.max,
+			activeFgOverride);
+		bubble->setAttribute(Qt::WA_TransparentForMouseEvents, false);
+		bubble->setClickedCallback(setCustom);
+		state->subtext.value() | rpl::on_next([=](QString &&text) {
+			bubble->setSubtext(std::move(text));
+		}, bubble->lifetime());
+
+		PaidReactionSlider(
+			sliderWrap,
+			st::paidReactSlider,
+			values.min,
+			values.explicitlyAllowed,
+			state->chosen.value(),
+			values.max,
+			[=](int count) { state->chosen = count; },
+			activeFgOverride);
+
+		sliderWrap->resizeToWidth(st::boxWideWidth);
+
+		const auto custom = CreateChild<AbstractButton>(sliderWrap);
+		state->chosen.changes() | rpl::on_next([=] {
+			custom->update();
+		}, custom->lifetime());
+		custom->show();
+		custom->setClickedCallback(setCustom);
+		custom->resize(st::paidReactSlider.width, st::paidReactSlider.width);
+		custom->paintOn([=](QPainter &p) {
+			const auto rem = st::paidReactSlider.borderWidth * 2;
+			const auto inner = custom->width() - 2 * rem;
+			const auto sub = (inner - 1) / 2;
+			const auto stroke = inner - (2 * sub);
+			const auto color = activeFgOverride(state->chosen.current());
+			p.fillRect(rem + sub, rem, stroke, sub, color);
+			p.fillRect(rem, rem + sub, inner, stroke, color);
+			p.fillRect(rem + sub, rem + inner - sub, stroke, sub, color);
+		});
+		sliderWrap->sizeValue() | rpl::on_next([=](QSize size) {
+			custom->move(
+				size.width() - st::boxRowPadding.right() - custom->width(),
+				size.height() - custom->height());
+		}, custom->lifetime());
+	}, sliderWrap->lifetime());
+
+	box->addTopButton(
+		st::boxTitleClose,
+		[=] { box->closeBox(); });
+	if (const auto now = state->value.current(); !now.finished()) {
+		box->addTopButton(
+			st::boxTitleMenu,
+			MakeAuctionMenuCallback(box, show, now));
+	}
+
+	const auto skip = st::paidReactTitleSkip;
+	box->addRow(
+		object_ptr<FlatLabel>(
+			box,
+			rpl::conditional(
+				state->started.value(),
+				tr::lng_auction_bid_title(),
+				tr::lng_auction_bid_title_early()),
+			st::boostCenteredTitle),
+		st::boxRowPadding + QMargins(0, skip / 2, 0, 0),
+		style::al_top);
+
+	auto subtitle = tr::lng_auction_bid_subtitle(
+		lt_count,
+		state->value.value(
+		) | rpl::map([=](const Data::GiftAuctionState &state) {
+			return state.gift->auctionGiftsPerRound * 1.;
+		}));
+	box->addRow(
+		object_ptr<FlatLabel>(
+			box,
+			std::move(subtitle),
+			st::auctionCenteredSubtitle),
+		style::al_top);
+
+	const auto setMinimal = [=] {
+		const auto &now = state->value.current();
+		state->chosen = int(now.my.minBidAmount
+			? now.my.minBidAmount
+			: now.minBidAmount);
+	};
+	box->addRow(
+		MakeAuctionInfoBlocks(
+			box,
+			&show->session(),
+			state->value.value(),
+			setMinimal),
+		st::boxRowPadding + QMargins(0, skip / 2, 0, skip));
+
+	AddBidPlaces(box, show, state->value.value(), state->chosen.value());
+
+	AddSkip(content);
+	AddSkip(content);
+
+	const auto peer = args.peer;
+	const auto button = box->addButton(rpl::single(QString()), [=] {
+		const auto &current = state->value.current();
+		const auto amount = state->chosen.current();
+		if (amount <= current.my.bid) {
+			box->closeBox();
+			return;
+		} else if (state->placing) {
+			return;
+		}
+		state->placing = true;
+		const auto was = (current.my.bid > 0);
+		const auto perRound = current.gift->auctionGiftsPerRound;
+		const auto done = [=](Payments::CheckoutResult result) {
+			state->placing = false;
+			if (result == Payments::CheckoutResult::Paid) {
+				show->showToast({
+					.title = (was
+						? tr::lng_auction_bid_increased_title
+						: tr::lng_auction_bid_placed_title)(
+							tr::now),
+					.text = tr::lng_auction_bid_done_text(
+						tr::now,
+						lt_count,
+						perRound,
+						tr::rich),
+					.icon = &st::auctionBidToastIcon,
+					.iconPadding = st::auctionBidToast.padding,
+					.st = &st::auctionBidToast,
+					.attach = RectPart::Top,
+					.duration = kBidPlacedToastDuration,
+				});
+			}
+		};
+		auto owned = details
+			? std::make_unique<GiftSendDetails>(*details)
+			: nullptr;
+		PlaceAuctionBid(show, peer, amount, current, std::move(owned), done);
+	});
+
+	button->setText(rpl::combine(
+		state->value.value(),
+		state->chosen.value()
+	) | rpl::map([=](const Data::GiftAuctionState &state, int count) {
+		return !state.my.bid
+			? tr::lng_auction_bid_place(
+				lt_stars,
+				rpl::single(CreditsEmojiSmall().append(
+					Lang::FormatCountDecimal(count))),
+				tr::marked)
+			: (count <= state.my.bid)
+			? tr::lng_box_ok(tr::marked)
+			: tr::lng_auction_bid_increase(
+				lt_stars,
+				rpl::single(CreditsEmojiSmall().append(
+					Lang::FormatCountDecimal(count - state.my.bid))),
+				tr::marked);
+	}) | rpl::flatten_latest());
+
+	show->session().credits().load(true);
+	AddStarSelectBalance(
+		box,
+		&show->session(),
+		show->session().credits().balanceValue());
+}
+
+[[nodiscard]] object_ptr<RpWidget> MakeAveragePriceValue(
+		not_null<TableLayout*> table,
+		std::shared_ptr<TableRowTooltipData> tooltip,
+		const QString &name,
+		int64 amount) {
+	auto helper = Text::CustomEmojiHelper();
+	const auto price = helper.paletteDependent(Earn::IconCreditsEmoji(
+	)).append(' ').append(
+		Lang::FormatCreditsAmountDecimal(CreditsAmount{ amount }));
+	return MakeTableValueWithTooltip(
+		table,
+		std::move(tooltip),
+		price,
+		tr::lng_auction_average_tooltip(
+			tr::now,
+			lt_amount,
+			tr::bold(
+				Text::IconEmoji(&st::starIconEmojiInline).append(
+					Lang::FormatCountDecimal(amount))),
+			lt_gift,
+			tr::bold(name),
+			tr::marked),
+		helper.context()).widget;
+}
+
+[[nodiscard]] object_ptr<TableLayout> AuctionInfoTable(
+		not_null<QWidget*> parent,
+		not_null<VerticalLayout*> container,
+		rpl::producer<Data::GiftAuctionState> value) {
+	auto result = object_ptr<TableLayout>(parent.get(), st::defaultTable);
+	const auto raw = result.data();
+
+	struct State {
+		rpl::variable<Data::GiftAuctionState> value;
+		rpl::variable<bool> finished;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+	state->value = std::move(value);
+
+	const auto &now = state->value.current();
+	const auto preview = (now.startDate > base::unixtime::now());
+	const auto name = now.gift->resellTitle;
+	state->finished = now.finished()
+		? (rpl::single(true) | rpl::type_erased)
+		: (MinutesLeftTillValue(now.endDate) | rpl::map(!rpl::mappers::_1));
+
+	const auto date = [&](TimeId time) {
+		return rpl::single(
+			tr::marked(langDateTime(base::unixtime::parse(time))));
+	};
+	AddTableRow(
+		raw,
+		(preview
+			? tr::lng_auction_starts_label()
+			: rpl::conditional(
+				state->finished.value(),
+				tr::lng_gift_link_label_first_sale(),
+				tr::lng_auction_start_label())),
+		date(now.startDate));
+	AddTableRow(
+		raw,
+		rpl::conditional(
+			state->finished.value(),
+			tr::lng_gift_link_label_last_sale(),
+			tr::lng_auction_end_label()),
+		date(now.endDate));
+	if (preview) {
+		AddTableRow(
+			raw,
+			tr::lng_gift_unique_availability_label(),
+			rpl::single(tr::marked(
+				Lang::FormatCountDecimal(now.gift->limitedCount))));
+		AddTableRow(
+			raw,
+			tr::lng_auction_rounds_label(),
+			rpl::single(tr::marked(
+				Lang::FormatCountDecimal(now.totalRounds))));
+		const auto formatDuration = [&](TimeId value, bool exact) {
+			return (!(value % 3600))
+				? (exact ? tr::lng_hours : tr::lng_auction_rounds_hours)(
+					tr::now,
+					lt_count,
+					value / 3600)
+				: (!(value % 60))
+				? (exact ? tr::lng_minutes : tr::lng_auction_rounds_minutes)(
+					tr::now,
+					lt_count,
+					value / 60)
+				: (exact ? tr::lng_seconds : tr::lng_auction_rounds_seconds)(
+					tr::now,
+					lt_count,
+					value);
+		};
+		for (auto i = 0, n = int(now.roundParameters.size()); i != n; ++i) {
+			const auto &that = now.roundParameters[i];
+			const auto next = (i + 1 < n)
+				? now.roundParameters[i + 1]
+				: Data::GiftAuctionRound{ now.totalRounds + 1 };
+			const auto exact = (next.number == that.number + 1);
+			const auto extended = that.extendTop && that.extendDuration;
+			const auto duration = formatDuration(that.duration, exact);
+			const auto value = extended
+				? tr::lng_auction_rounds_extended(
+					tr::now,
+					lt_duration,
+					duration,
+					lt_increase,
+					formatDuration(that.extendDuration, true),
+					lt_n,
+					QString::number(that.extendTop))
+				: duration;
+			AddTableRow(
+				raw,
+				(exact
+					? tr::lng_auction_rounds_exact(
+						lt_n,
+						rpl::single(QString::number(that.number)))
+					: tr::lng_auction_rounds_range(
+						lt_n,
+						rpl::single(QString::number(that.number)),
+						lt_last,
+						rpl::single(QString::number(next.number - 1)))),
+				object_ptr<FlatLabel>(
+					raw,
+					value,
+					st::auctionInfoValueMultiline));
+		}
+	} else {
+		auto roundText = state->value.value(
+		) | rpl::map([](const Data::GiftAuctionState &state) {
+			const auto wrapped = [](int count) {
+				return rpl::single(tr::marked(Lang::FormatCountDecimal(count)));
+			};
+			return tr::lng_auction_round_value(
+				lt_n,
+				wrapped(state.currentRound),
+				lt_amount,
+				wrapped(state.totalRounds),
+				tr::marked);
+		}) | rpl::flatten_latest();
+		const auto round = AddTableRow(
+			raw,
+			tr::lng_auction_round_label(),
+			std::move(roundText));
+
+		auto availabilityText = state->value.value(
+		) | rpl::map([](const Data::GiftAuctionState &state) {
+			const auto wrapped = [](int count) {
+				return rpl::single(tr::marked(Lang::FormatCountDecimal(count)));
+			};
+			return tr::lng_auction_availability_value(
+				lt_n,
+				wrapped(state.giftsLeft),
+				lt_amount,
+				wrapped(state.gift->limitedCount),
+				tr::marked);
+		}) | rpl::flatten_latest();
+		AddTableRow(
+			raw,
+			tr::lng_auction_availability_label(),
+			std::move(availabilityText));
+
+		const auto tooltip = std::make_shared<TableRowTooltipData>(
+			TableRowTooltipData{ .parent = container });
+		state->value.value(
+		) | rpl::map([](const Data::GiftAuctionState &state) {
+			return state.averagePrice;
+		}) | rpl::filter(
+			rpl::mappers::_1 != 0
+		) | rpl::take(
+			1
+		) | rpl::on_next([=](int64 price) {
+			delete round;
+
+			raw->insertRow(
+				2,
+				object_ptr<FlatLabel>(
+					raw,
+					tr::lng_auction_average_label(),
+					raw->st().defaultLabel),
+				MakeAveragePriceValue(raw, tooltip, name, price),
+				st::giveawayGiftCodeLabelMargin,
+				st::giveawayGiftCodeValueMargin);
+			raw->resizeToWidth(raw->widthNoMargins());
+		}, raw->lifetime());
+	}
+	return result;
+}
+
+void AuctionGotGiftsBox(
+		not_null<GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::StarGift &gift,
+		std::vector<Data::GiftAcquired> list) {
+	Expects(!list.empty());
+
+	const auto count = int(list.size());
+	box->setTitle(
+		tr::lng_auction_bought_title(lt_count, rpl::single(count * 1.)));
+	box->setWidth(st::boxWideWidth);
+	box->setMaxHeight(st::boxWideWidth * 2);
+	box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); });
+	box->addTopButton(st::boxTitleClose, [=] { box->closeBox(); });
+
+	auto helper = Text::CustomEmojiHelper(Core::TextContext({
+		.session = &show->session(),
+	}));
+	const auto emoji = Data::SingleCustomEmoji(gift.document);
+	const auto container = box->verticalLayout();
+	ranges::sort(list, ranges::less(), &Data::GiftAcquired::round);
+	for (const auto &entry : list) {
+		const auto table = container->add(
+			object_ptr<Ui::TableLayout>(
+				container,
+				st::giveawayGiftCodeTable),
+			st::giveawayGiftCodeTableMargin);
+		const auto addFullWidth = [&](rpl::producer<TextWithEntities> text) {
+			table->addRow(
+				object_ptr<Ui::FlatLabel>(
+					table,
+					std::move(text),
+					st::giveawayGiftMessage,
+					st::defaultPopupMenu,
+					helper.context()),
+				nullptr,
+				st::giveawayGiftCodeLabelMargin,
+				st::giveawayGiftCodeValueMargin);
+		};
+
+		// Title "Gift #number in round #n"
+		addFullWidth(tr::lng_auction_bought_in_round(
+			lt_name,
+			rpl::single(tr::marked(
+				emoji
+			).append(' ').append(
+				Data::UniqueGiftName(gift.resellTitle, entry.number)
+			)),
+			lt_n,
+			rpl::single(tr::marked(QString::number(entry.round))),
+			tr::bold));
+
+		// Recipient
+		AddTableRow(
+			table,
+			tr::lng_credits_box_history_entry_peer(),
+			show,
+			entry.to->id);
+
+		// Date
+		AddTableRow(
+			table,
+			tr::lng_auction_bought_date(),
+			rpl::single(tr::marked(
+				langDateTime(base::unixtime::parse(entry.date)))));
+
+		// Accepted Bid
+		auto accepted = helper.paletteDependent(
+			Ui::Earn::IconCreditsEmoji()
+		).append(
+			Lang::FormatCountDecimal(entry.bidAmount)
+		).append(' ').append(
+			helper.paletteDependent(
+				Text::CustomEmojiTextBadge(
+					'#' + Lang::FormatCountDecimal(entry.position),
+					st::defaultTableSmallButton)));
+		AddTableRow(
+			table,
+			tr::lng_auction_bought_bid(),
+			rpl::single(accepted),
+			helper.context());
+
+		// Message
+		if (!entry.message.empty()) {
+			addFullWidth(rpl::single(entry.message));
+		}
+	}
+}
+
+[[nodiscard]] rpl::producer<UniqueGiftCover> MakePreviewAuctionStream(
+		const Data::StarGift &info,
+		rpl::producer<Data::UniqueGiftAttributes> attributes) {
+	Expects(attributes);
+
+	const auto cover = [](Data::UniqueGift gift) {
+		return UniqueGiftCover{ std::move(gift) };
+	};
+	auto initial = Data::UniqueGift{
+		.title = info.resellTitle,
+		.model = Data::UniqueGiftModel{
+			.document = info.document,
+		},
+		.pattern = Data::UniqueGiftPattern{
+			.document = info.document,
+		},
+		.backdrop = (info.background
+			? info.background->backdrop()
+			: Data::UniqueGiftBackdrop()),
+	};
+	return rpl::single(cover(initial)) | rpl::then(std::move(
+		attributes
+	) | rpl::map([=](const Data::UniqueGiftAttributes &values)
+	-> rpl::producer<UniqueGiftCover> {
+		if (values.backdrops.empty()
+			|| values.models.empty()
+			|| values.patterns.empty()) {
+			return rpl::never<UniqueGiftCover>();
+		}
+		return [=](auto consumer) {
+			auto lifetime = rpl::lifetime();
+
+			struct State {
+				Data::UniqueGiftAttributes data;
+				std::vector<int> modelIndices;
+				std::vector<int> patternIndices;
+				std::vector<int> backdropIndices;
+			};
+			const auto state = lifetime.make_state<State>(State{
+				.data = values,
+			});
+
+			const auto put = [=] {
+				const auto index = [](
+						std::vector<int> &indices,
+						const auto &v) {
+					const auto fill = [&] {
+						if (!indices.empty()) {
+							return;
+						}
+						indices = ranges::views::ints(
+							0
+						) | ranges::views::take(
+							v.size()
+						) | ranges::to_vector;
+						ranges::shuffle(indices);
+					};
+					fill();
+					const auto result = indices.back();
+					indices.pop_back();
+					fill();
+					if (indices.back() == result) {
+						std::swap(indices.front(), indices.back());
+					}
+					return result;
+				};
+				auto &models = state->data.models;
+				auto &patterns = state->data.patterns;
+				auto &backdrops = state->data.backdrops;
+				consumer.put_next(cover({
+					.title = info.resellTitle,
+					.model = models[index(state->modelIndices, models)],
+					.pattern = patterns[index(state->patternIndices, patterns)],
+					.backdrop = backdrops[index(state->backdropIndices, backdrops)],
+				}));
+			};
+
+			put();
+			base::timer_each(
+				kSwitchPreviewCoverInterval / 3
+			) | rpl::on_next(put, lifetime);
+
+			return lifetime;
+		};
+	}) | rpl::flatten_latest());
+}
+
+void AuctionInfoBox(
+		not_null<GenericBox*> box,
+		not_null<Window::SessionController*> window,
+		not_null<PeerData*> peer,
+		rpl::producer<Data::GiftAuctionState> value) {
+	using namespace Info::PeerGifts;
+
+	struct State {
+		explicit State(not_null<Main::Session*> session)
+		: delegate(session, GiftButtonMode::Minimal) {
+		}
+
+		Delegate delegate;
+		rpl::variable<Data::GiftAuctionState> value;
+		rpl::variable<int> minutesTillEnd;
+		rpl::variable<int> secondsTillStart;
+		rpl::variable<Data::UniqueGiftAttributes> attributes;
+
+		std::vector<Data::GiftAcquired> acquired;
+		bool acquiredRequested = false;
+
+		base::unique_qptr<PopupMenu> menu;
+
+		rpl::lifetime previewLifetime;
+		bool previewRequested = false;
+	};
+	const auto show = window->uiShow();
+	const auto state = box->lifetime().make_state<State>(&show->session());
+	state->value = std::move(value);
+	const auto &now = state->value.current();
+	const auto auctions = &show->session().giftAuctions();
+	const auto giftId = now.gift->id;
+	if (auto attributes = auctions->attributes(giftId)) {
+		state->attributes = std::move(*attributes);
+	}  else {
+		auctions->requestAttributes(giftId, crl::guard(box, [=] {
+			state->attributes.force_assign(*auctions->attributes(giftId));
+		}));
+	}
+	state->minutesTillEnd = MinutesLeftTillValue(now.endDate);
+	state->secondsTillStart = SecondsLeftTillValue(now.startDate);
+	const auto started = !state->secondsTillStart.current();
+
+	box->setStyle(st::giftBox);
+	box->setNoContentMargin(true);
+
+	const auto container = box->verticalLayout();
+	auto gift = MakePreviewAuctionStream(
+		*now.gift,
+		state->attributes.value());
+	AddUniqueGiftCover(container, std::move(gift), {
+		.pretitle = started ? nullptr : tr::lng_auction_preview_name(),
+		.subtitle = tr::lng_auction_preview_learn_gifts(
+			lt_arrow,
+			rpl::single(Text::IconEmoji(&st::textMoreIconEmoji)),
+			tr::link),
+		.subtitleClick = [=] {
+			ShowPremiumPreviewBox(window, PremiumFeature::Gifts);
+		},
+		.subtitleLinkColored = true,
+	});
+	AddSkip(container, st::defaultVerticalListSkip * 2);
+
+	Settings::AddUniqueCloseMoreButton(
+		box,
+		{},
+		now.finished() ? nullptr : MakeAuctionFillMenuCallback(show, now));
+
+	box->addRow(
+		AuctionInfoTable(box, box->verticalLayout(), state->value.value()),
+		st::boxRowPadding + st::auctionInfoTableMargin);
+
+	if (const auto got = now.my.gotCount) {
+		box->addRow(
+			object_ptr<FlatLabel>(
+				box,
+				tr::lng_auction_bought(
+					lt_count_decimal,
+					rpl::single(1. * got),
+					lt_emoji,
+					rpl::single(Data::SingleCustomEmoji(
+						state->value.current().gift->document)),
+					lt_arrow,
+					rpl::single(Text::IconEmoji(&st::textMoreIconEmoji)),
+					tr::link),
+				st::uniqueGiftValueAvailableLink,
+				st::defaultPopupMenu,
+				Core::TextContext({ .session = &show->session() })),
+			st::boxRowPadding + st::uniqueGiftValueAvailableMargin,
+			style::al_top
+		)->setClickHandlerFilter([=](const auto &...) {
+			const auto &value = state->value.current();
+			const auto &gift = *value.gift;
+			if (!value.my.gotCount) {
+				return false;
+			} else if (state->acquired.size() == value.my.gotCount) {
+				show->show(Box(
+					AuctionGotGiftsBox,
+					show,
+					gift,
+					state->acquired));
+			} else if (!state->acquiredRequested) {
+				state->acquiredRequested = true;
+				auctions->requestAcquired(
+					value.gift->id,
+					crl::guard(box, [=](
+							std::vector<Data::GiftAcquired> result) {
+						state->acquiredRequested = false;
+						state->acquired = std::move(result);
+						if (!state->acquired.empty()) {
+							show->show(Box(
+								AuctionGotGiftsBox,
+								show,
+								gift,
+								state->acquired));
+						}
+					}));
+			}
+			return false;
+		});
+	} else if (const auto variants = now.gift->upgradeVariants) {
+		using namespace Data;
+		state->attributes.value(
+		) | rpl::filter([](const UniqueGiftAttributes &list) {
+			return !list.models.empty();
+		}) | rpl::take(
+			1
+		) | rpl::on_next([=](const UniqueGiftAttributes &list) {
+			auto emoji = tr::marked();
+			const auto indices = RandomIndicesSubset(list.models.size(), 3);
+			for (const auto index : indices) {
+				emoji.append(Data::SingleCustomEmoji(
+					list.models[index].document));
+			}
+			box->addRow(
+				object_ptr<FlatLabel>(
+					box,
+					tr::lng_auction_preview_variants(
+						lt_count_decimal,
+						rpl::single(1. * variants),
+						lt_emoji,
+						rpl::single(emoji),
+						lt_arrow,
+						rpl::single(Text::IconEmoji(&st::textMoreIconEmoji)),
+						tr::link),
+					st::uniqueGiftValueAvailableLink,
+					st::defaultPopupMenu,
+					Core::TextContext({ .session = &show->session() })),
+				st::boxRowPadding + st::uniqueGiftValueAvailableMargin,
+				style::al_top
+			)->setClickHandlerFilter([=](const auto &...) {
+				const auto title = now.gift->resellTitle;
+				const auto type = Data::GiftAttributeIdType::Model;
+				const auto null = nullptr;
+				show->show(Box(StarGiftPreviewBox, title, list, type, null));
+				return false;
+			});
+		}, box->lifetime());
+	}
+	const auto button = box->addButton(rpl::single(QString()), [=] {
+		if (state->value.current().finished()
+			|| !state->minutesTillEnd.current()) {
+			box->closeBox();
+			return;
+		}
+		const auto sendBox = show->show(Box(
+			SendGiftBox,
+			window,
+			peer,
+			nullptr,
+			GiftTypeStars{ .info = *state->value.current().gift },
+			state->value.value()));
+		sendBox->boxClosing(
+		) | rpl::on_next([=] {
+			box->closeBox();
+		}, box->lifetime());
+	});
+
+	SetAuctionButtonCountdownText(
+		button,
+		AuctionButtonCountdownType::Join,
+		state->value.value());
+}
+
+base::weak_qptr<BoxContent> ChooseAndShowAuctionBox(
+		not_null<Window::SessionController*> window,
+		not_null<PeerData*> peer,
+		std::shared_ptr<rpl::variable<Data::GiftAuctionState>> state,
+		Fn<void()> boxClosed) {
+	const auto local = &peer->session().local();
+	const auto &current = state->current();
+	const auto now = base::unixtime::now();
+	const auto started = (current.startDate <= now);
+	const auto finished = current.finished() || (current.endDate <= now);
+	const auto showBidBox = current.my.bid
+		&& !finished
+		&& (!current.my.to || current.my.to == peer);
+	const auto showChangeRecipient = !showBidBox
+		&& current.my.bid
+		&& !finished;
+	const auto showInfoBox = !showBidBox
+		&& !showChangeRecipient
+		&& (!started
+			|| finished
+			|| local->readPref<bool>(kAuctionAboutShownPref));
+	auto box = base::weak_qptr<BoxContent>();
+	if (showBidBox) {
+		box = window->show(MakeAuctionBidBox({
+			.peer = peer,
+			.show = window->uiShow(),
+			.state = state->value(),
+		}));
+	} else if (showChangeRecipient) {
+		const auto change = [=](Fn<void()> close) {
+			const auto sendBox = window->show(Box(
+				SendGiftBox,
+				window,
+				peer,
+				nullptr,
+				Info::PeerGifts::GiftTypeStars{
+					.info = *current.gift,
+				},
+				state->value()));
+			sendBox->boxClosing(
+			) | rpl::on_next(close, sendBox->lifetime());
+		};
+		const auto from = current.my.to;
+		const auto text = (from->isSelf()
+			? tr::lng_auction_change_already_me(tr::now, tr::rich)
+			: tr::lng_auction_change_already(
+				tr::now,
+				lt_name,
+				tr::bold(from->name()),
+				tr::rich)).append(' ').append(peer->isSelf()
+					? tr::lng_auction_change_to_me(tr::now, tr::rich)
+					: tr::lng_auction_change_to(
+						tr::now,
+						lt_name,
+						tr::bold(peer->name()),
+						tr::rich));
+		box = window->show(Box([=](not_null<GenericBox*> box) {
+			box->addRow(
+				CreateUserpicsTransfer(
+					box,
+					rpl::single(std::vector{ not_null<PeerData*>(from) }),
+					peer,
+					UserpicsTransferType::AuctionRecipient),
+				st::boxRowPadding + st::auctionChangeRecipientPadding
+			)->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+			ConfirmBox(box, {
+				.text = text,
+				.confirmed = change,
+				.confirmText = tr::lng_auction_change_button(),
+				.title = tr::lng_auction_change_title(),
+			});
+		}));
+	} else if (showInfoBox) {
+		box = window->show(Box(
+			AuctionInfoBox,
+			window,
+			peer,
+			state->value()));
+	} else {
+		local->writePref<bool>(kAuctionAboutShownPref, true);
+		const auto understood = [=](Fn<void()> close) {
+			ChooseAndShowAuctionBox(window, peer, state, close);
+		};
+		box = window->show(Box(
+			AuctionAboutBox,
+			current.totalRounds,
+			current.gift->auctionGiftsPerRound,
+			understood));
+	}
+	if (const auto strong = box.get()) {
+		strong->boxClosing(
+		) | rpl::on_next(boxClosed, strong->lifetime());
+	} else {
+		boxClosed();
+	}
+	return box;
+}
+
+} // namespace
+
+rpl::lifetime ShowStarGiftAuction(
+		not_null<Window::SessionController*> controller,
+		PeerData *peer,
+		uint64 giftId,
+		Fn<void()> finishRequesting,
+		Fn<void()> boxClosed) {
+	const auto weak = base::make_weak(controller);
+	const auto session = &controller->session();
+	struct State {
+		rpl::variable<Data::GiftAuctionState> value;
+		base::weak_qptr<BoxContent> box;
+	};
+	const auto state = std::make_shared<State>();
+	auto result = session->giftAuctions().state(
+		giftId
+	) | rpl::on_next([=](Data::GiftAuctionState &&value) {
+		if (const auto onstack = finishRequesting) {
+			onstack();
+		}
+		const auto initial = !state->value.current().gift.has_value();
+		const auto already = value.my.to;
+		state->value = std::move(value);
+		if (initial) {
+			if (const auto strong = weak.get()) {
+				const auto to = peer
+					? peer
+					: already
+					? already
+					: strong->session().user();
+				state->box = ChooseAndShowAuctionBox(
+					strong,
+					to,
+					std::shared_ptr<rpl::variable<Data::GiftAuctionState>>(
+						state,
+						&state->value),
+					boxClosed);
+			} else {
+				boxClosed();
+			}
+		}
+	});
+	result.add([=] {
+		if (const auto strong = state->box.get()) {
+			strong->closeBox();
+		}
+	});
+	return result;
+}
+
+object_ptr<BoxContent> MakeAuctionBidBox(AuctionBidBoxArgs &&args) {
+	return Box(AuctionBidBox, std::move(args));
+}
+
+void SetAuctionButtonCountdownText(
+		not_null<RoundButton*> button,
+		AuctionButtonCountdownType type,
+		rpl::producer<Data::GiftAuctionState> value) {
+	struct State {
+		rpl::variable<Data::GiftAuctionState> value;
+		rpl::variable<int> minutesTillEnd;
+		rpl::variable<int> secondsTillStart;
+	};
+	const auto state = button->lifetime().make_state<State>();
+	state->value = std::move(value);
+
+	const auto &now = state->value.current();
+	const auto preview = (now.startDate > base::unixtime::now());
+	if (preview) {
+		state->secondsTillStart = SecondsLeftTillValue(now.startDate);
+	} else {
+		state->minutesTillEnd = MinutesLeftTillValue(now.endDate);
+	}
+
+	auto buttonTitle = rpl::combine(
+		state->value.value(),
+		(preview
+			? state->secondsTillStart.value()
+			: state->minutesTillEnd.value())
+	) | rpl::map([=](const Data::GiftAuctionState &state, int leftTill) {
+		return (state.finished() || (!preview && leftTill <= 0))
+			? tr::lng_box_ok(tr::marked)
+			: preview
+			? tr::lng_auction_join_early_bid(tr::marked)
+			: (type != AuctionButtonCountdownType::Place)
+			? tr::lng_auction_join_button(tr::marked)
+			: tr::lng_auction_join_bid(tr::marked);
+	}) | rpl::flatten_latest();
+
+	auto buttonSubtitle = rpl::combine(
+		state->value.value(),
+		(preview
+			? state->secondsTillStart.value()
+			: state->minutesTillEnd.value())
+	) | rpl::map([=](
+		const Data::GiftAuctionState &state,
+		int leftTill
+	) -> rpl::producer<TextWithEntities> {
+		if (state.finished() || leftTill <= 0) {
+			return rpl::single(TextWithEntities());
+		} else if (preview) {
+			const auto hours = (leftTill / 3600);
+			const auto minutes = (leftTill % 3600) / 60;
+			const auto seconds = (leftTill % 60);
+			const auto time = hours
+				? u"%1:%2:%3"_q
+				.arg(hours).arg(minutes, 2, 10, QChar('0'))
+				.arg(seconds, 2, 10, QChar('0'))
+				: u"%1:%2"_q.arg(minutes).arg(seconds, 2, 10, QChar('0'));
+			return tr::lng_auction_join_starts_in(
+				lt_time,
+				rpl::single(tr::marked(time)),
+				tr::marked);
+		}
+		const auto hours = (leftTill / 60);
+		const auto minutes = leftTill % 60;
+
+		auto value = [](int count) {
+			return rpl::single(tr::marked(QString::number(count)));
+		};
+		return tr::lng_auction_join_time_left(
+			lt_time,
+			(hours
+				? tr::lng_auction_join_time_medium(
+					lt_hours,
+					value(hours),
+					lt_minutes,
+					value(minutes),
+					tr::marked)
+				: tr::lng_auction_join_time_small(
+					lt_minutes,
+					value(minutes),
+					tr::marked)),
+			tr::marked);
+	}) | rpl::flatten_latest();
+
+	SetButtonTwoLabels(
+		button,
+		std::move(buttonTitle),
+		std::move(buttonSubtitle),
+		st::resaleButtonTitle,
+		st::resaleButtonSubtitle);
+}
+
+void AuctionAboutBox(
+		not_null<GenericBox*> box,
+		int rounds,
+		int giftsPerRound,
+		Fn<void(Fn<void()> close)> understood) {
+	box->setStyle(st::confcallJoinBox);
+	box->setWidth(st::boxWideWidth);
+	box->setNoContentMargin(true);
+	box->addTopButton(st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+	box->addRow(
+		Calls::Group::MakeRoundActiveLogo(
+			box,
+			st::auctionAboutLogo,
+			st::auctionAboutLogoPadding),
+		st::boxRowPadding + st::confcallLinkHeaderIconPadding);
+
+	box->addRow(
+		object_ptr<FlatLabel>(
+			box,
+			tr::lng_auction_about_title(),
+			st::boxTitle),
+		st::boxRowPadding,
+		style::al_top);
+	box->addRow(
+		object_ptr<FlatLabel>(
+			box,
+			tr::lng_auction_about_subtitle(tr::rich),
+			st::confcallLinkCenteredText),
+		st::boxRowPadding + st::auctionAboutTextPadding,
+		style::al_top
+	)->setTryMakeSimilarLines(true);
+
+	const auto features = std::vector<FeatureListEntry>{
+		{
+			st::menuIconAuctionDrop,
+			tr::lng_auction_about_top_title(
+				tr::now,
+				lt_count,
+				giftsPerRound),
+			tr::lng_auction_about_top_about(
+				tr::now,
+				lt_count,
+				giftsPerRound,
+				lt_rounds,
+				tr::lng_auction_about_top_rounds(
+					tr::now,
+					lt_count,
+					rounds,
+					tr::rich),
+				lt_bidders,
+				tr::lng_auction_about_top_bidders(
+					tr::now,
+					lt_count,
+					giftsPerRound,
+					tr::rich),
+				tr::rich),
+		},
+		{
+			st::menuIconStarsCarryover,
+			tr::lng_auction_about_bid_title(tr::now),
+			tr::lng_auction_about_bid_about(
+				tr::now,
+				lt_count,
+				giftsPerRound,
+				tr::rich),
+		},
+		{
+			st::menuIconStarsRefund,
+			tr::lng_auction_about_missed_title(tr::now),
+			tr::lng_auction_about_missed_about(tr::now, tr::rich),
+		},
+	};
+	for (const auto &feature : features) {
+		box->addRow(MakeFeatureListEntry(box, feature));
+	}
+
+	const auto close = Fn<void()>([weak = base::make_weak(box)] {
+		if (const auto strong = weak.get()) {
+			strong->closeBox();
+		}
+	});
+	box->addButton(
+		rpl::single(QString()),
+		understood ? [=] { understood(close); } : close
+	)->setText(rpl::single(Text::IconEmoji(
+		&st::infoStarsUnderstood
+	).append(' ').append(tr::lng_auction_about_understood(tr::now))));
+}
+
+TextWithEntities ActiveAuctionsTitle(const Data::ActiveAuctions &auctions) {
+	const auto &list = auctions.list;
+	if (list.size() == 1) {
+		const auto auction = list.front();
+		return Data::SingleCustomEmoji(
+			auction->gift->document
+		).append(' ').append(tr::lng_auction_bar_active(tr::now));
+	}
+	auto result = tr::marked();
+	for (const auto &auction : list | ranges::views::take(3)) {
+		result.append(Data::SingleCustomEmoji(auction->gift->document));
+	}
+	return result.append(' ').append(
+		tr::lng_auction_bar_active_many(tr::now, lt_count, list.size()));
+}
+
+ManyAuctionsState ActiveAuctionsState(const Data::ActiveAuctions &auctions) {
+	const auto &list = auctions.list;
+	const auto winning = [](not_null<Data::GiftAuctionState*> auction) {
+		const auto position = MyAuctionPosition(*auction);
+		return (position <= auction->gift->auctionGiftsPerRound)
+			? position
+			: 0;
+	};
+	if (list.size() == 1) {
+		const auto auction = list.front();
+		const auto position = winning(auction);
+		auto text = position
+			? tr::lng_auction_bar_winning(
+				tr::now,
+				lt_count,
+				position,
+				tr::marked)
+			: tr::lng_auction_bar_outbid(tr::now, tr::marked);
+		return { std::move(text), !position };
+	}
+	auto outbid = 0;
+	for (const auto &auction : list) {
+		if (!winning(auction)) {
+			++outbid;
+		}
+	}
+	auto text = (outbid == list.size())
+		? tr::lng_auction_bar_outbid_all(tr::now, tr::marked)
+		: outbid
+		? tr::lng_auction_bar_outbid_some(
+			tr::now,
+			lt_count,
+			outbid,
+			tr::marked)
+		: tr::lng_auction_bar_winning_all(tr::now, tr::marked);
+	return { std::move(text), outbid != 0 };
+}
+
+rpl::producer<TextWithEntities> ActiveAuctionsButton(
+		const Data::ActiveAuctions &auctions) {
+	const auto &list = auctions.list;
+	const auto withIcon = [](const QString &text) {
+		using namespace Ui::Text;
+		return IconEmoji(&st::auctionBidEmoji).append(' ').append(text);
+	};
+	if (list.size() == 1) {
+		const auto auction = auctions.list.front();
+		const auto end = auction->nextRoundAt
+			? auction->nextRoundAt
+			: auction->endDate;
+		return SecondsLeftTillValue(end)
+			| rpl::map(NiceCountdownText)
+			| rpl::map(withIcon);
+	}
+	return tr::lng_auction_bar_view() | rpl::map(withIcon);
+}
+
+struct Single {
+	uint64 giftId = 0;
+	not_null<DocumentData*> document;
+	int round = 0;
+	int total = 0;
+	int bid = 0;
+	int position = 0;
+	int winning = 0;
+	TimeId ends = 0;
+};
+
+object_ptr<Ui::RpWidget> MakeActiveAuctionRow(
+		not_null<QWidget*> parent,
+		not_null<Window::SessionController*> window,
+		not_null<DocumentData*> document,
+		uint64 giftId,
+		rpl::producer<Single> value) {
+	auto result = object_ptr<Ui::VerticalLayout>(parent);
+	const auto raw = result.data();
+
+	raw->add(object_ptr<Ui::RpWidget>(raw));
+
+	auto title = rpl::duplicate(value) | rpl::map([=](const Single &fields) {
+		return tr::lng_auction_bar_round(
+			tr::now,
+			lt_n,
+			QString::number(fields.round + 1),
+			lt_amount,
+			QString::number(fields.total));
+	});
+	raw->add(
+		object_ptr<Ui::FlatLabel>(
+			raw,
+			std::move(title),
+			st::auctionListTitle),
+		st::auctionListTitlePadding);
+
+	const auto tag = Data::CustomEmojiSizeTag::Isolated;
+	const auto sticker = std::shared_ptr<Ui::Text::CustomEmoji>(
+		document->owner().customEmojiManager().create(
+			document,
+			[=] { raw->update(); },
+			tag));
+
+	raw->paintRequest(
+	) | rpl::on_next([=] {
+		auto q = QPainter(raw);
+		sticker->paint(q, {
+			.textColor = st::windowFg->c,
+			.now = crl::now(),
+			.position = QPoint(),
+		});
+	}, raw->lifetime());
+
+	auto helper = Ui::Text::CustomEmojiHelper();
+	const auto star = helper.paletteDependent(Ui::Earn::IconCreditsEmoji());
+	auto text = rpl::duplicate(value) | rpl::map([=](const Single &fields) {
+		const auto stars = tr::marked(star).append(' ').append(
+			Lang::FormatCountDecimal(fields.bid));
+		const auto outbid = (fields.position > fields.winning);
+		return outbid
+			? tr::lng_auction_bar_bid_outbid(
+				tr::now,
+				lt_stars,
+				stars,
+				tr::rich)
+			: tr::lng_auction_bar_bid_ranked(
+				tr::now,
+				lt_stars,
+				stars,
+				lt_n,
+				tr::marked(QString::number(fields.position)),
+				tr::rich);
+	});
+	const auto subtitle = raw->add(
+		object_ptr<Ui::FlatLabel>(
+			raw,
+			std::move(text),
+			st::auctionListText,
+			st::defaultPopupMenu,
+			helper.context()),
+		st::auctionListTextPadding);
+	rpl::duplicate(value) | rpl::on_next([=](const Single &fields) {
+		const auto outbid = (fields.position > fields.winning);
+		subtitle->setTextColorOverride(outbid
+			? st::attentionButtonFg->c
+			: std::optional<QColor>());
+	}, subtitle->lifetime());
+
+	const auto button = raw->add(
+		object_ptr<Ui::RoundButton>(
+			raw,
+			rpl::single(QString()),
+			st::auctionListRaise),
+		st::auctionListRaisePadding);
+
+	auto secondsLeft = rpl::duplicate(
+		value
+	) | rpl::map([=](const Single &fields) {
+		return SecondsLeftTillValue(fields.ends);
+	}) | rpl::flatten_latest();
+	button->setText(rpl::combine(
+		std::move(secondsLeft),
+		tr::lng_auction_bar_raise_bid()
+	) | rpl::map([=](int seconds, const QString &text) {
+		return Ui::Text::IconEmoji(
+			&st::auctionBidEmoji
+		).append(' ').append(text).append(' ').append(
+			Ui::Text::Colorized(NiceCountdownText(seconds)));
+	}));
+	button->setClickedCallback([=] {
+		window->showStarGiftAuction(giftId);
+	});
+	button->setFullRadius(true);
+	raw->widthValue() | rpl::on_next([=](int width) {
+		button->setFullWidth(width);
+	}, button->lifetime());
+
+	return result;
+}
+
+Fn<void()> ActiveAuctionsCallback(
+		not_null<Window::SessionController*> window,
+		const Data::ActiveAuctions &auctions) {
+	const auto &list = auctions.list;
+	const auto count = int(list.size());
+	if (count == 1) {
+		const auto giftId = list.front()->gift->id;
+		return [=] {
+			window->showStarGiftAuction(giftId);
+		};
+	}
+	struct Auctions {
+		std::vector<rpl::variable<Single>> list;
+	};
+	const auto state = std::make_shared<Auctions>();
+	const auto singleFrom = [](const Data::GiftAuctionState &state) {
+		return Single{
+			.giftId = state.gift->id,
+			.document = state.gift->document,
+			.round = state.currentRound,
+			.total = state.totalRounds,
+			.bid = int(state.my.bid),
+			.position = MyAuctionPosition(state),
+			.winning = state.gift->auctionGiftsPerRound,
+			.ends = state.nextRoundAt ? state.nextRoundAt : state.endDate,
+		};
+	};
+	for (const auto &auction : list) {
+		state->list.push_back(singleFrom(*auction));
+	}
+	return [=] {
+		window->show(Box([=](not_null<Ui::GenericBox*> box) {
+			const auto rows = box->lifetime().make_state<
+				rpl::variable<int>
+			>(count);
+
+			box->setWidth(st::boxWideWidth);
+			box->setTitle(tr::lng_auction_bar_active_many(
+				lt_count,
+				rows->value() | tr::to_count()));
+
+			const auto auctions = &window->session().giftAuctions();
+			for (auto &entry : state->list) {
+				using Data::GiftAuctionState;
+
+				const auto &now = entry.current();
+				entry = auctions->state(
+					now.giftId
+				) | rpl::filter([=](const GiftAuctionState &state) {
+					return state.my.bid != 0;
+				}) | rpl::map(singleFrom);
+
+				const auto skip = st::auctionListEntrySkip;
+				const auto row = box->addRow(
+					MakeActiveAuctionRow(
+						box,
+						window,
+						now.document,
+						now.giftId,
+						entry.value()),
+					st::boxRowPadding + QMargins(0, skip, 0, skip));
+
+				auctions->state(
+					now.giftId
+				) | rpl::on_next([=](const GiftAuctionState &state) {
+					if (!state.my.bid) {
+						delete row;
+						if (const auto now = rows->current(); now > 1) {
+							*rows = (now - 1);
+						} else {
+							box->closeBox();
+						}
+					}
+				}, row->lifetime());
+			}
+
+			box->addTopButton(st::boxTitleClose, [=] { box->closeBox(); });
+			box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); });
+		}));
+	};
+}
+
+std::vector<int> RandomIndicesSubset(int total, int subset) {
+	const auto take = std::min(total, subset);
+	if (!take) {
+		return {};
+	}
+	auto result = std::vector<int>();
+	auto taken = base::flat_set<int>();
+	result.reserve(take);
+	taken.reserve(take);
+	for (auto i = 0; i < take; ++i) {
+		auto index = base::RandomIndex(total - i);
+		for (const auto already : taken) {
+			if (index >= already) {
+				++index;
+			} else {
+				break;
+			}
+		}
+		taken.emplace(index);
+		result.push_back(index);
+	}
+	return result;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_auction_box.h b/Telegram/SourceFiles/boxes/star_gift_auction_box.h
new file mode 100644
index 00000000000000..d72bbcd8b836f0
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/star_gift_auction_box.h
@@ -0,0 +1,82 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Data {
+struct GiftAuctionState;
+struct ActiveAuctions;
+struct StarGift;
+} // namespace Data
+
+namespace Info::PeerGifts {
+struct GiftSendDetails;
+} // namespace Info::PeerGifts
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+
+class BoxContent;
+class RoundButton;
+class GenericBox;
+
+[[nodiscard]] rpl::lifetime ShowStarGiftAuction(
+	not_null<Window::SessionController*> controller,
+	PeerData *peer,
+	uint64 giftId,
+	Fn<void()> finishRequesting,
+	Fn<void()> boxClosed);
+
+struct AuctionBidBoxArgs {
+	not_null<PeerData*> peer;
+	std::shared_ptr<ChatHelpers::Show> show;
+	rpl::producer<Data::GiftAuctionState> state;
+	std::unique_ptr<Info::PeerGifts::GiftSendDetails> details;
+};
+[[nodiscard]] object_ptr<BoxContent> MakeAuctionBidBox(
+	AuctionBidBoxArgs &&args);
+
+enum class AuctionButtonCountdownType {
+	Join,
+	Place,
+	Preview,
+};
+void SetAuctionButtonCountdownText(
+	not_null<RoundButton*> button,
+	AuctionButtonCountdownType type,
+	rpl::producer<Data::GiftAuctionState> value);
+
+void AuctionAboutBox(
+	not_null<GenericBox*> box,
+	int rounds,
+	int giftsPerRound,
+	Fn<void(Fn<void()> close)> understood);
+
+[[nodiscard]] TextWithEntities ActiveAuctionsTitle(
+	const Data::ActiveAuctions &auctions);
+struct ManyAuctionsState {
+	TextWithEntities text;
+	bool someOutbid = false;
+};
+[[nodiscard]] ManyAuctionsState ActiveAuctionsState(
+	const Data::ActiveAuctions &auctions);
+[[nodiscard]] rpl::producer<TextWithEntities> ActiveAuctionsButton(
+	const Data::ActiveAuctions &auctions);
+[[nodiscard]] Fn<void()> ActiveAuctionsCallback(
+	not_null<Window::SessionController*> window,
+	const Data::ActiveAuctions &auctions);
+
+[[nodiscard]] std::vector<int> RandomIndicesSubset(int total, int subset);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 5a863f6050df95..af8434b5a76bf2 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -7,138 +7,409 @@ For license and copyright information please follow this link:
 */
 #include "boxes/star_gift_box.h"
 
+#include "boxes/star_gift_cover_box.h"
+
+#include "apiwrap.h"
+#include "api/api_credits.h"
+#include "api/api_global_privacy.h"
+#include "api/api_premium.h"
+#include "api/api_text_entities.h"
 #include "base/event_filter.h"
+#include "base/qt_signal_producer.h"
 #include "base/random.h"
-#include "api/api_premium.h"
+#include "base/timer_rpl.h"
+#include "base/unixtime.h"
+#include "boxes/filters/edit_filter_chats_list.h"
+#include "boxes/peers/edit_peer_color_box.h"
+#include "boxes/peers/prepare_short_info_box.h"
+#include "boxes/gift_premium_box.h"
 #include "boxes/peer_list_controllers.h"
+#include "boxes/premium_preview_box.h"
 #include "boxes/send_credits_box.h"
+#include "boxes/star_gift_auction_box.h"
+#include "boxes/star_gift_preview_box.h"
+#include "boxes/star_gift_resale_box.h"
+#include "boxes/transfer_gift_box.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "chat_helpers/message_field.h"
 #include "chat_helpers/stickers_gift_box_pack.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "chat_helpers/tabbed_panel.h"
 #include "chat_helpers/tabbed_selector.h"
+#include "core/application.h"
+#include "core/click_handler_types.h"
 #include "core/ui_integration.h"
+#include "data/components/gift_auctions.h"
+#include "data/components/promo_suggestions.h"
+#include "data/components/top_peers.h"
+#include "data/data_birthday.h"
+#include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_credits.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
+#include "data/data_emoji_statuses.h"
+#include "data/data_file_origin.h"
+#include "data/data_peer_values.h"
+#include "data/data_premium_limits.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "history/admin_log/history_admin_log_item.h"
+#include "history/view/controls/history_view_suggest_options.h"
 #include "history/view/media/history_view_media_generic.h"
+#include "history/view/media/history_view_unique_gift.h"
 #include "history/view/history_view_element.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_helpers.h"
+#include "info/channel_statistics/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget.
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "info/peer_gifts/info_peer_gifts_common.h"
+#include "info/profile/info_profile_icon.h"
 #include "lang/lang_keys.h"
 #include "lottie/lottie_common.h"
 #include "lottie/lottie_single_player.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
+#include "menu/gift_resale_filter.h"
 #include "payments/payments_form.h"
 #include "payments/payments_checkout_process.h"
 #include "payments/payments_non_panel_process.h"
-#include "settings/settings_credits.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_credits.h"
+#include "settings/settings_credits_graphics.h"
+#include "settings/sections/settings_premium.h"
+#include "ui/boxes/about_cocoon_box.h" // Ui::AddUniqueCloseButton
+#include "ui/boxes/boost_box.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/boxes/emoji_stake_box.h" // InsufficientTonBox
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
+#include "ui/controls/button_labels.h"
 #include "ui/controls/emoji_button.h"
+#include "ui/controls/feature_list.h"
+#include "ui/controls/ton_common.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/path_shift_gradient.h"
+#include "ui/effects/premium_bubble.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_stars_colored.h"
+#include "ui/effects/ripple_animation.h"
 #include "ui/layers/generic_box.h"
+#include "ui/new_badges.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
+#include "ui/top_background_gradient.h"
+#include "ui/ui_utility.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/fields/number_input.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/table_layout.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
+#include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_credits.h"
+#include "styles/style_giveaway.h"
+#include "styles/style_info.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_premium.h"
 #include "styles/style_settings.h"
+#include "styles/style_widgets.h"
+
+#include <QtWidgets/QApplication>
 
 namespace Ui {
 namespace {
 
 constexpr auto kPriceTabAll = 0;
-constexpr auto kPriceTabLimited = -1;
-constexpr auto kGiftMessageLimit = 255;
+constexpr auto kPriceTabMy = -1;
+constexpr auto kPriceTabCollectibles = -2;
 constexpr auto kSentToastDuration = 3 * crl::time(1000);
+constexpr auto kSwitchUpgradeCoverInterval = 3 * crl::time(1000);
+constexpr auto kUpgradeDoneToastDuration = 4 * crl::time(1000);
+constexpr auto kResellPriceCacheLifetime = 60 * crl::time(1000);
 
 using namespace HistoryView;
 using namespace Info::PeerGifts;
 
+using Data::GiftAttributeId;
+using Data::GiftAttributeIdType;
+using Data::MyGiftsDescriptor;
+
+enum class PickType {
+	Activate,
+	SendMessage,
+	OpenProfile,
+};
+using PickCallback = Fn<void(not_null<PeerData*>, PickType)>;
+
 struct PremiumGiftsDescriptor {
 	std::vector<GiftTypePremium> list;
 	std::shared_ptr<Api::PremiumGiftCodeOptions> api;
 };
 
-struct GiftsDescriptor {
-	std::vector<GiftDescriptor> list;
-	std::shared_ptr<Api::PremiumGiftCodeOptions> api;
+struct SessionResalePrices {
+	explicit SessionResalePrices(not_null<Main::Session*> session)
+	: api(std::make_unique<Api::PremiumGiftCodeOptions>(session->user())) {
+	}
+
+	std::unique_ptr<Api::PremiumGiftCodeOptions> api;
+	base::flat_map<QString, int> prices;
+	std::vector<Fn<void()>> waiting;
+	rpl::lifetime requestLifetime;
+	crl::time lastReceived = 0;
 };
 
-struct GiftDetails {
-	GiftDescriptor descriptor;
-	TextWithEntities text;
-	uint64 randomId = 0;
-	bool anonymous = false;
+[[nodiscard]] not_null<SessionResalePrices*> ResalePrices(
+		not_null<Main::Session*> session) {
+	static auto result = base::flat_map<
+		not_null<Main::Session*>,
+		std::unique_ptr<SessionResalePrices>>();
+	if (const auto i = result.find(session); i != end(result)) {
+		return i->second.get();
+	}
+	const auto i = result.emplace(
+		session,
+		std::make_unique<SessionResalePrices>(session)).first;
+	session->lifetime().add([session] { result.remove(session); });
+	return i->second.get();
+}
+
+class PeerRow final : public PeerListRow {
+public:
+	using PeerListRow::PeerListRow;
+
+	QSize rightActionSize() const override;
+	QMargins rightActionMargins() const override;
+	void rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) override;
+
+	void rightActionAddRipple(
+		QPoint point,
+		Fn<void()> updateCallback) override;
+	void rightActionStopLastRipple() override;
+
+private:
+	std::unique_ptr<Ui::RippleAnimation> _actionRipple;
+
 };
 
+QSize PeerRow::rightActionSize() const {
+	return QSize(
+		st::inviteLinkThreeDotsIcon.width(),
+		st::inviteLinkThreeDotsIcon.height());
+}
+
+QMargins PeerRow::rightActionMargins() const {
+	return QMargins(
+		0,
+		(st::inviteLinkList.item.height - rightActionSize().height()) / 2,
+		st::inviteLinkThreeDotsSkip,
+		0);
+}
+
+void PeerRow::rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) {
+	if (_actionRipple) {
+		_actionRipple->paint(p, x, y, outerWidth);
+		if (_actionRipple->empty()) {
+			_actionRipple.reset();
+		}
+	}
+	(actionSelected
+		? st::inviteLinkThreeDotsIconOver
+		: st::inviteLinkThreeDotsIcon).paint(p, x, y, outerWidth);
+}
+
+void PeerRow::rightActionAddRipple(QPoint point, Fn<void()> updateCallback) {
+	if (!_actionRipple) {
+		auto mask = Ui::RippleAnimation::EllipseMask(
+			Size(st::inviteLinkThreeDotsIcon.height()));
+		_actionRipple = std::make_unique<Ui::RippleAnimation>(
+			st::defaultRippleAnimation,
+			std::move(mask),
+			std::move(updateCallback));
+	}
+	_actionRipple->add(point);
+}
+
+void PeerRow::rightActionStopLastRipple() {
+	if (_actionRipple) {
+		_actionRipple->lastStop();
+	}
+}
+
 class PreviewDelegate final : public DefaultElementDelegate {
 public:
 	PreviewDelegate(
 		not_null<QWidget*> parent,
-		not_null<Ui::ChatStyle*> st,
+		not_null<ChatStyle*> st,
 		Fn<void()> update);
 
 	bool elementAnimationsPaused() override;
-	not_null<Ui::PathShiftGradient*> elementPathShiftGradient() override;
+	not_null<PathShiftGradient*> elementPathShiftGradient() override;
 	Context elementContext() override;
 
 private:
 	const not_null<QWidget*> _parent;
-	const std::unique_ptr<Ui::PathShiftGradient> _pathGradient;
+	const std::unique_ptr<PathShiftGradient> _pathGradient;
 
 };
 
-class PreviewWrap final : public Ui::RpWidget {
+class PreviewWrap final : public RpWidget {
 public:
 	PreviewWrap(
 		not_null<QWidget*> parent,
-		not_null<Main::Session*> session,
-		rpl::producer<GiftDetails> details);
+		not_null<PeerData*> recipient,
+		rpl::producer<GiftSendDetails> details);
 	~PreviewWrap();
 
 private:
 	void paintEvent(QPaintEvent *e) override;
 
 	void resizeTo(int width);
-	void prepare(rpl::producer<GiftDetails> details);
+	void prepare(rpl::producer<GiftSendDetails> details);
 
 	const not_null<History*> _history;
-	const std::unique_ptr<Ui::ChatTheme> _theme;
-	const std::unique_ptr<Ui::ChatStyle> _style;
+	const not_null<PeerData*> _recipient;
+	const std::unique_ptr<ChatTheme> _theme;
+	const std::unique_ptr<ChatStyle> _style;
 	const std::unique_ptr<PreviewDelegate> _delegate;
 	AdminLog::OwnedItem _item;
 	QPoint _position;
 
 };
 
+class TextBubblePart final : public MediaGenericTextPart {
+public:
+	TextBubblePart(
+		TextWithEntities text,
+		QMargins margins,
+		const style::TextStyle &st = st::defaultTextStyle,
+		const base::flat_map<uint16, ClickHandlerPtr> &links = {},
+		const Ui::Text::MarkedContext &context = {},
+		style::align align = style::al_top);
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+
+private:
+	void setupPen(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context) const override;
+	int elisionLines() const override;
+
+};
+
+TextBubblePart::TextBubblePart(
+	TextWithEntities text,
+	QMargins margins,
+	const style::TextStyle &st,
+	const base::flat_map<uint16, ClickHandlerPtr> &links,
+	const Ui::Text::MarkedContext &context,
+	style::align align)
+: MediaGenericTextPart(std::move(text), margins, st, links, context, align) {
+}
+
+void TextBubblePart::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	p.setPen(Qt::NoPen);
+	p.setBrush(context.st->msgServiceBg());
+	const auto radius = height() / 2.;
+	const auto left = (outerWidth - width()) / 2;
+	const auto r = QRect(left, 0, width(), height());
+	p.drawRoundedRect(r, radius, radius);
+
+	MediaGenericTextPart::draw(p, owner, context, outerWidth);
+}
+
+void TextBubblePart::setupPen(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context) const {
+	auto pen = context.st->msgServiceFg()->c;
+	pen.setAlphaF(pen.alphaF() * 0.65);
+	p.setPen(pen);
+}
+
+int TextBubblePart::elisionLines() const {
+	return 1;
+}
+
+[[nodiscard]] bool SortForBirthday(not_null<PeerData*> peer) {
+	const auto user = peer->asUser();
+	if (!user) {
+		return false;
+	}
+	const auto birthday = user->birthday();
+	if (!birthday) {
+		return false;
+	}
+	const auto is = [&](const QDate &date) {
+		return (date.day() == birthday.day())
+			&& (date.month() == birthday.month());
+	};
+	const auto now = QDate::currentDate();
+	return is(now) || is(now.addDays(1)) || is(now.addDays(-1));
+}
+
+[[nodiscard]] bool IsSoldOut(const Data::StarGift &info) {
+	return info.limitedCount && !info.limitedLeft;
+}
+
+struct UpgradePrice {
+	TimeId date = 0;
+	int stars = 0;
+};
+
+[[nodiscard]] std::vector<UpgradePrice> ParsePrices(
+		const MTPVector<MTPStarGiftUpgradePrice> &list) {
+	return ranges::views::all(
+		list.v
+	) | ranges::views::transform([](const MTPStarGiftUpgradePrice &price) {
+		const auto &data = price.data();
+		return UpgradePrice{
+			.date = data.vdate().v,
+			.stars = int(data.vupgrade_stars().v),
+		};
+	}) | ranges::to_vector;
+}
+
 PreviewDelegate::PreviewDelegate(
 	not_null<QWidget*> parent,
-	not_null<Ui::ChatStyle*> st,
+	not_null<ChatStyle*> st,
 	Fn<void()> update)
 : _parent(parent)
 , _pathGradient(MakePathShiftGradient(st, update)) {
@@ -149,7 +420,7 @@ bool PreviewDelegate::elementAnimationsPaused() {
 }
 
 auto PreviewDelegate::elementPathShiftGradient()
--> not_null<Ui::PathShiftGradient*> {
+-> not_null<PathShiftGradient*> {
 	return _pathGradient.get();
 }
 
@@ -160,24 +431,31 @@ Context PreviewDelegate::elementContext() {
 auto GenerateGiftMedia(
 	not_null<Element*> parent,
 	Element *replacing,
-	const GiftDetails &data)
--> Fn<void(Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
-	return [=](Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
+	not_null<PeerData*> recipient,
+	const GiftSendDetails &data)
+-> Fn<void(
+		not_null<MediaGeneric*>,
+		Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](
+			not_null<MediaGeneric*> media,
+			Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
 		const auto &descriptor = data.descriptor;
 		auto pushText = [&](
 				TextWithEntities text,
 				QMargins margins = {},
 				const base::flat_map<uint16, ClickHandlerPtr> &links = {},
-				const std::any &context = {}) {
+				Ui::Text::MarkedContext context = {}) {
 			if (text.empty()) {
 				return;
 			}
 			push(std::make_unique<MediaGenericTextPart>(
 				std::move(text),
 				margins,
+				st::defaultTextStyle,
 				links,
-				context));
+				std::move(context)));
 		};
+
 		const auto sticker = [=] {
 			using Tag = ChatHelpers::StickerLottieSize;
 			const auto session = &parent->history()->session();
@@ -186,7 +464,7 @@ auto GenerateGiftMedia(
 				.sticker = sticker,
 				.size = st::chatIntroStickerSize,
 				.cacheTag = Tag::ChatIntroHelloSticker,
-				.singleTimePlayback = v::is<GiftTypePremium>(descriptor),
+				.stopOnLastFrame = v::is<GiftTypePremium>(descriptor),
 			};
 		};
 		push(std::make_unique<StickerInBubblePart>(
@@ -194,51 +472,106 @@ auto GenerateGiftMedia(
 			replacing,
 			sticker,
 			st::giftBoxPreviewStickerPadding));
-		const auto title = v::match(descriptor, [&](GiftTypePremium gift) {
+		auto title = v::match(descriptor, [&](GiftTypePremium gift) {
 			return tr::lng_action_gift_premium_months(
 				tr::now,
 				lt_count,
-				gift.months);
+				gift.months,
+				tr::bold);
 		}, [&](const GiftTypeStars &gift) {
-			return tr::lng_action_gift_got_subtitle(
-				tr::now,
-				lt_user,
-				parent->history()->session().user()->shortName());
+			return recipient->isSelf()
+				? ((gift.info.unique && gift.info.unique->crafted)
+					? tr::lng_action_gift_crafted_subtitle(tr::now, tr::bold)
+					: tr::lng_action_gift_self_subtitle(tr::now, tr::bold))
+				: tr::lng_action_gift_got_subtitle(
+					tr::now,
+					lt_user,
+					TextWithEntities()
+						.append(Text::SingleCustomEmoji(
+							recipient->owner().customEmojiManager(
+								).peerUserpicEmojiData(
+									recipient->session().user())))
+						.append(' ')
+						.append(recipient->session().user()->shortName()),
+					tr::bold);
 		});
 		auto textFallback = v::match(descriptor, [&](GiftTypePremium gift) {
 			return tr::lng_action_gift_premium_about(
 				tr::now,
-				Ui::Text::RichLangValue);
+				tr::rich);
 		}, [&](const GiftTypeStars &gift) {
-			return tr::lng_action_gift_got_stars_text(
-				tr::now,
-				lt_count,
-				gift.convertStars,
-				Ui::Text::RichLangValue);
+			return data.upgraded
+				? tr::lng_action_gift_got_upgradable_text(tr::now, tr::rich)
+				: (recipient->isSelf() && gift.info.starsToUpgrade)
+				? tr::lng_action_gift_self_about_unique(tr::now, tr::rich)
+				: (recipient->isBroadcast() && gift.info.starsToUpgrade)
+				? tr::lng_action_gift_channel_about_unique(tr::now, tr::rich)
+				: gift.info.auction()
+				? (recipient->isBroadcast()
+					? tr::lng_action_gift_got_gift_channel(tr::now, tr::rich)
+					: tr::lng_action_gift_got_gift_text(tr::now, tr::rich))
+				: (recipient->isSelf()
+					? tr::lng_action_gift_self_about
+					: recipient->isBroadcast()
+					? tr::lng_action_gift_channel_about
+					: tr::lng_action_gift_got_stars_text)(
+						tr::now,
+						lt_count,
+						gift.info.starsConverted,
+						tr::rich);
 		});
 		auto description = data.text.empty()
 			? std::move(textFallback)
 			: data.text;
-		pushText(Ui::Text::Bold(title), st::giftBoxPreviewTitlePadding);
+		const auto context = Core::TextContext({
+			.session = &parent->history()->session(),
+			.repaint = [parent] { parent->repaint(); },
+		});
+		pushText(
+			std::move(title),
+			st::giftBoxPreviewTitlePadding,
+			{},
+			context);
+
+		if (v::is<GiftTypeStars>(descriptor)) {
+			const auto &stars = v::get<GiftTypeStars>(descriptor);
+			if (const auto by = stars.info.releasedBy) {
+				push(std::make_unique<TextBubblePart>(
+					tr::lng_gift_released_by(
+						tr::now,
+						lt_name,
+						tr::link('@' + by->username()),
+						tr::marked),
+					st::giftBoxReleasedByMargin,
+					st::uniqueGiftReleasedBy.style));
+			}
+		}
+
 		pushText(
 			std::move(description),
 			st::giftBoxPreviewTextPadding,
 			{},
-			Core::MarkedTextContext{
-				.session = &parent->history()->session(),
-				.customEmojiRepaint = [parent] { parent->repaint(); },
-			});
+			context);
+
+		push(HistoryView::MakeGenericButtonPart(
+			(data.upgraded
+				? tr::lng_gift_view_unpack(tr::now)
+				: tr::lng_sticker_premium_view(tr::now)),
+			st::giftBoxButtonMargin,
+			[parent] { parent->repaint(); },
+			nullptr));
 	};
 }
 
 PreviewWrap::PreviewWrap(
 	not_null<QWidget*> parent,
-	not_null<Main::Session*> session,
-	rpl::producer<GiftDetails> details)
+	not_null<PeerData*> recipient,
+	rpl::producer<GiftSendDetails> details)
 : RpWidget(parent)
-, _history(session->data().history(session->userPeerId()))
+, _history(recipient->owner().history(recipient->session().userPeerId()))
+, _recipient(recipient)
 , _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
-, _style(std::make_unique<Ui::ChatStyle>(
+, _style(std::make_unique<ChatStyle>(
 	_history->session().colorIndicesValue()))
 , _delegate(std::make_unique<PreviewDelegate>(
 	parent,
@@ -248,14 +581,14 @@ PreviewWrap::PreviewWrap(
 	_style->apply(_theme.get());
 
 	using namespace HistoryView;
-	session->data().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const Element*> view) {
-		if (view == _item.get()) {
+	_history->owner().viewRepaintRequest(
+	) | rpl::on_next([=](Data::RequestViewRepaint data) {
+		if (data.view == _item.get()) {
 			update();
 		}
 	}, lifetime());
 
-	session->downloaderTaskFinished() | rpl::start_with_next([=] {
+	_history->session().downloaderTaskFinished() | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
@@ -264,7 +597,8 @@ PreviewWrap::PreviewWrap(
 
 void ShowSentToast(
 		not_null<Window::SessionController*> window,
-		const GiftDescriptor &descriptor) {
+		const GiftDescriptor &descriptor,
+		const GiftSendDetails &details) {
 	const auto &st = st::historyPremiumToast;
 	const auto skip = st.padding.top();
 	const auto size = st.style.font->height * 2;
@@ -275,13 +609,28 @@ void ShowSentToast(
 	auto text = v::match(descriptor, [&](const GiftTypePremium &gift) {
 		return tr::lng_action_gift_premium_about(
 			tr::now,
-			Ui::Text::RichLangValue);
+			tr::rich);
 	}, [&](const GiftTypeStars &gift) {
+		if (gift.info.perUserTotal && gift.info.perUserRemains < 2) {
+			return tr::lng_gift_sent_finished(
+				tr::now,
+				lt_count,
+				gift.info.perUserTotal,
+				tr::rich);
+		} else if (gift.info.perUserTotal) {
+			return tr::lng_gift_sent_remains(
+				tr::now,
+				lt_count,
+				gift.info.perUserRemains - 1,
+				tr::rich);
+		}
+		const auto amount = gift.info.stars
+			+ (details.upgraded ? gift.info.starsToUpgrade : 0);
 		return tr::lng_gift_sent_about(
 			tr::now,
 			lt_count,
-			gift.stars,
-			Ui::Text::RichLangValue);
+			amount,
+			tr::rich);
 	});
 	const auto strong = window->showToast({
 		.title = tr::lng_gift_sent_title(tr::now),
@@ -295,7 +644,7 @@ void ShowSentToast(
 		return;
 	}
 	const auto widget = strong->widget();
-	const auto preview = Ui::CreateChild<Ui::RpWidget>(widget.get());
+	const auto preview = CreateChild<RpWidget>(widget.get());
 	preview->moveToLeft(skip, skip);
 	preview->resize(size, size);
 	preview->show();
@@ -309,7 +658,7 @@ void ShowSentToast(
 		Lottie::Quality::Default);
 
 	preview->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!player->ready()) {
 			return;
 		}
@@ -323,7 +672,7 @@ void ShowSentToast(
 	}, preview->lifetime());
 
 	player->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		preview->update();
 	}, preview->lifetime());
 }
@@ -332,20 +681,45 @@ PreviewWrap::~PreviewWrap() {
 	_item = {};
 }
 
-void PreviewWrap::prepare(rpl::producer<GiftDetails> details) {
-	std::move(details) | rpl::start_with_next([=](GiftDetails details) {
+void PreviewWrap::prepare(rpl::producer<GiftSendDetails> details) {
+	std::move(details) | rpl::on_next([=](GiftSendDetails details) {
 		const auto &descriptor = details.descriptor;
 		const auto cost = v::match(descriptor, [&](GiftTypePremium data) {
-			return FillAmountAndCurrency(data.cost, data.currency, true);
+			const auto stars = (details.byStars && data.stars)
+				? data.stars
+				: (data.currency == kCreditsCurrency)
+				? data.cost
+				: 0;
+			return stars
+				? tr::lng_gift_stars_title(tr::now, lt_count, stars)
+				: FillAmountAndCurrency(data.cost, data.currency, true);
 		}, [&](GiftTypeStars data) {
-			return tr::lng_gift_stars_title(tr::now, lt_count, data.stars);
+			const auto stars = data.info.stars
+				+ (details.upgraded ? data.info.starsToUpgrade : 0);
+			return stars
+				? tr::lng_gift_stars_title(tr::now, lt_count, stars)
+				: QString();
 		});
-		const auto text = tr::lng_action_gift_received(
-			tr::now,
-			lt_user,
-			_history->session().user()->shortName(),
-			lt_cost,
-			cost);
+		const auto name = _history->session().user()->shortName();
+		const auto text = cost.isEmpty()
+			? tr::lng_action_gift_unique_received(tr::now, lt_user, name)
+			: _recipient->isSelf()
+			? tr::lng_action_gift_self_bought(tr::now, lt_cost, cost)
+			: _recipient->isBroadcast()
+			? tr::lng_action_gift_sent_channel(
+				tr::now,
+				lt_user,
+				name,
+				lt_name,
+				_recipient->name(),
+				lt_cost,
+				cost)
+			: tr::lng_action_gift_received(
+				tr::now,
+				lt_user,
+				name,
+				lt_cost,
+				cost);
 		const auto item = _history->makeMessage({
 			.id = _history->nextNonHistoryEntryId(),
 			.flags = (MessageFlag::FakeAboutView
@@ -357,9 +731,9 @@ void PreviewWrap::prepare(rpl::producer<GiftDetails> details) {
 		auto owned = AdminLog::OwnedItem(_delegate.get(), item);
 		owned->overrideMedia(std::make_unique<MediaGeneric>(
 			owned.get(),
-			GenerateGiftMedia(owned.get(), _item.get(), details),
+			GenerateGiftMedia(owned.get(), _item.get(), _recipient, details),
 			MediaGenericDescriptor{
-				.maxWidth = st::chatIntroWidth,
+				.maxWidth = st::chatGiftPreviewWidth,
 				.service = true,
 			}));
 		_item = std::move(owned);
@@ -372,9 +746,16 @@ void PreviewWrap::prepare(rpl::producer<GiftDetails> details) {
 	widthValue(
 	) | rpl::filter([=](int width) {
 		return width >= st::msgMinWidth;
-	}) | rpl::start_with_next([=](int width) {
+	}) | rpl::on_next([=](int width) {
 		resizeTo(width);
 	}, lifetime());
+
+	_history->owner().itemResizeRequest(
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
+		if (_item && item == _item->data() && width() >= st::msgMinWidth) {
+			resizeTo(width());
+		}
+	}, lifetime());
 }
 
 void PreviewWrap::resizeTo(int width) {
@@ -403,6 +784,7 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 	auto context = _theme->preparePaintContext(
 		_style.get(),
 		rect(),
+		rect(),
 		e->rect(),
 		!window()->isActiveWindow());
 	p.translate(_position);
@@ -430,7 +812,7 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 
 		using namespace Api;
 		const auto api = std::make_shared<PremiumGiftCodeOptions>(peer);
-		api->request() | rpl::start_with_error_done([=](QString error) {
+		api->request() | rpl::on_error_done([=](QString error) {
 			consumer.put_next({});
 		}, [=] {
 			const auto &options = api->optionsForPeer();
@@ -438,14 +820,27 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 			list.reserve(options.size());
 			auto minMonthsGift = GiftTypePremium();
 			for (const auto &option : options) {
-				list.push_back({
-					.cost = option.cost,
-					.currency = option.currency,
-					.months = option.months,
-				});
-				if (!minMonthsGift.months
-					|| option.months < minMonthsGift.months) {
-					minMonthsGift = list.back();
+				if (option.currency != kCreditsCurrency) {
+					list.push_back({
+						.cost = option.cost,
+						.currency = option.currency,
+						.months = option.months,
+					});
+					if (!minMonthsGift.months
+						|| option.months < minMonthsGift.months) {
+						minMonthsGift = list.back();
+					}
+				}
+			}
+			for (const auto &option : options) {
+				if (option.currency == kCreditsCurrency) {
+					const auto i = ranges::find(
+						list,
+						option.months,
+						&GiftTypePremium::months);
+					if (i != end(list)) {
+						i->stars = option.cost;
+					}
 				}
 			}
 			for (auto &gift : list) {
@@ -465,7 +860,7 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 			}
 			ranges::sort(list, ranges::less(), &GiftTypePremium::months);
 			auto &map = Map[session];
-			if (map.last.list != list) {
+			if (map.last.list != list || list.empty()) {
 				map.last = PremiumGiftsDescriptor{
 					std::move(list),
 					api,
@@ -478,79 +873,18 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 	};
 }
 
-[[nodiscard]] rpl::producer<std::vector<GiftTypeStars>> GiftsStars(
-		not_null<Main::Session*> session,
-		not_null<PeerData*> peer) {
-	struct Session {
-		std::vector<GiftTypeStars> last;
-	};
-	static auto Map = base::flat_map<not_null<Main::Session*>, Session>();
-
-	return [=](auto consumer) {
-		auto lifetime = rpl::lifetime();
-
-		auto i = Map.find(session);
-		if (i == end(Map)) {
-			i = Map.emplace(session, Session()).first;
-			session->lifetime().add([=] { Map.remove(session); });
-		}
-		if (!i->second.last.empty()) {
-			consumer.put_next_copy(i->second.last);
-		}
-
-		using namespace Api;
-		const auto api = lifetime.make_state<PremiumGiftCodeOptions>(peer);
-		api->requestStarGifts(
-		) | rpl::start_with_error_done([=](QString error) {
-			consumer.put_next({});
-		}, [=] {
-			auto list = std::vector<GiftTypeStars>();
-			const auto &gifts = api->starGifts();
-			list.reserve(gifts.size());
-			for (auto &gift : gifts) {
-				list.push_back({
-					.id = gift.id,
-					.stars = gift.stars,
-					.convertStars = gift.convertStars,
-					.document = gift.document,
-					.limitedCount = gift.limitedCount,
-					.limitedLeft = gift.limitedLeft,
-				});
-			}
-			auto &map = Map[session];
-			if (map.last != list) {
-				map.last = list;
-				consumer.put_next_copy(list);
-			}
-		}, lifetime);
-
-		return lifetime;
-	};
-}
-
-[[nodiscard]] Text::String TabTextForPrice(
-		not_null<Main::Session*> session,
-		int price) {
+[[nodiscard]] Text::String TabTextForPrice(int price) {
 	const auto simple = [](const QString &text) {
 		return Text::String(st::semiboldTextStyle, text);
 	};
 	if (price == kPriceTabAll) {
 		return simple(tr::lng_gift_stars_tabs_all(tr::now));
-	} else if (price == kPriceTabLimited) {
-		return simple(tr::lng_gift_stars_tabs_limited(tr::now));
+	} else if (price == kPriceTabMy) {
+		return simple(tr::lng_gift_stars_tabs_my(tr::now));
+	} else if (price == kPriceTabCollectibles) {
+		return simple(tr::lng_gift_stars_tabs_collectibles(tr::now));
 	}
-	auto &manager = session->data().customEmojiManager();
-	auto result = Text::String();
-	const auto context = Core::MarkedTextContext{
-		.session = session,
-		.customEmojiRepaint = [] {},
-	};
-	result.setMarkedText(
-		st::semiboldTextStyle,
-		manager.creditsEmoji().append(QString::number(price)),
-		kMarkupTextOptions,
-		context);
-	return result;
+	return {};
 }
 
 struct GiftPriceTabs {
@@ -558,9 +892,9 @@ struct GiftPriceTabs {
 	object_ptr<RpWidget> widget;
 };
 [[nodiscard]] GiftPriceTabs MakeGiftsPriceTabs(
-		not_null<Window::SessionController*> window,
 		not_null<PeerData*> peer,
-		rpl::producer<std::vector<GiftTypeStars>> gifts) {
+		rpl::producer<std::vector<GiftTypeStars>> gifts,
+		bool hasMyUnique) {
 	auto widget = object_ptr<RpWidget>((QWidget*)nullptr);
 	const auto raw = widget.data();
 
@@ -573,40 +907,52 @@ struct GiftPriceTabs {
 	struct State {
 		rpl::variable<std::vector<int>> prices;
 		rpl::variable<int> priceTab = kPriceTabAll;
+		rpl::variable<int> fullWidth;
 		std::vector<Button> buttons;
+		int dragx = 0;
+		int pressx = 0;
+		float64 dragscroll = 0.;
+		float64 scroll = 0.;
+		int scrollMax = 0;
+		int tabsShift = 0;
 		int selected = -1;
+		int pressed = -1;
 		int active = -1;
 	};
+	const auto user = peer->asUser();
+	const auto disallowed = user
+		? user->disallowedGiftTypes()
+		: Api::DisallowedGiftType();
+	if (disallowed & Api::DisallowedGiftType::Unique) {
+		hasMyUnique = false;
+	}
 	const auto state = raw->lifetime().make_state<State>();
+	const auto scroll = [=] {
+		return QPoint(int(base::SafeRound(state->scroll)), 0)
+			- QPoint(state->tabsShift, 0);
+	};
+
 	state->prices = std::move(
 		gifts
-	) | rpl::map([](const std::vector<GiftTypeStars> &gifts) {
+	) | rpl::map([=](const std::vector<GiftTypeStars> &gifts) {
 		auto result = std::vector<int>();
 		result.push_back(kPriceTabAll);
-		auto same = true;
-		auto sameKey = 0;
-		for (const auto &gift : gifts) {
-			if (same) {
-				const auto key = gift.stars * (gift.limitedCount ? -1 : 1);
-				if (!sameKey) {
-					sameKey = key;
-				} else if (sameKey != key) {
-					same = false;
+		auto hasCollectibles = false;
+		if (!(disallowed & Api::DisallowedGiftType::Unique)) {
+			for (const auto &gift : gifts) {
+				if (gift.resale
+					|| (gift.info.limitedCount && gift.info.upgradable)) {
+					hasCollectibles = true;
+					break;
 				}
 			}
-
-			if (gift.limitedCount
-				&& (result.size() < 2 || result[1] != kPriceTabLimited)) {
-				result.insert(begin(result) + 1, kPriceTabLimited);
-			}
-			if (!ranges::contains(result, gift.stars)) {
-				result.push_back(gift.stars);
-			}
 		}
-		if (same) {
-			return std::vector<int>();
+		if (hasMyUnique && !gifts.empty()) {
+			result.push_back(kPriceTabMy);
+		}
+		if (hasCollectibles) {
+			result.push_back(kPriceTabCollectibles);
 		}
-		ranges::sort(begin(result) + 1, end(result));
 		return result;
 	});
 
@@ -633,9 +979,8 @@ struct GiftPriceTabs {
 		state->priceTab = state->buttons[index].price;
 	};
 
-	const auto session = &peer->session();
 	state->prices.value(
-	) | rpl::start_with_next([=](const std::vector<int> &prices) {
+	) | rpl::on_next([=](const std::vector<int> &prices) {
 		auto x = st::giftBoxTabsMargin.left();
 		auto y = st::giftBoxTabsMargin.top();
 
@@ -652,7 +997,7 @@ struct GiftPriceTabs {
 			auto &button = state->buttons[i];
 			if (button.text.isEmpty() || button.price != price) {
 				button.price = price;
-				button.text = TabTextForPrice(session, price);
+				button.text = TabTextForPrice(price);
 			}
 			button.active = (price == currentPrice);
 			if (button.active) {
@@ -664,6 +1009,9 @@ struct GiftPriceTabs {
 			button.geometry = QRect(QPoint(x, y), r.size());
 			x += r.width() + st::giftBoxTabSkip;
 		}
+		state->fullWidth = x
+			- st::giftBoxTabSkip
+			+ st::giftBoxTabsMargin.right();
 		const auto height = state->buttons.empty()
 			? 0
 			: (y
@@ -673,13 +1021,36 @@ struct GiftPriceTabs {
 		raw->update();
 	}, raw->lifetime());
 
+	rpl::combine(
+		raw->widthValue(),
+		state->fullWidth.value()
+	) | rpl::on_next([=](int outer, int inner) {
+		state->scrollMax = std::max(0, inner - outer);
+		state->tabsShift = (outer - inner) / 2;
+	}, raw->lifetime());
+
 	raw->setMouseTracking(true);
-	raw->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	raw->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		switch (type) {
 		case QEvent::Leave: setSelected(-1); break;
 		case QEvent::MouseMove: {
-			const auto position = static_cast<QMouseEvent*>(e.get())->pos();
+			const auto me = static_cast<QMouseEvent*>(e.get());
+			const auto mousex = me->pos().x() - state->tabsShift;
+			const auto drag = QApplication::startDragDistance();
+			if (state->dragx > 0) {
+				state->scroll = std::clamp(
+					state->dragscroll + state->dragx - mousex,
+					0.,
+					state->scrollMax * 1.);
+				raw->update();
+				break;
+			} else if (state->pressx > 0
+				&& std::abs(state->pressx - mousex) > drag) {
+				state->dragx = state->pressx;
+				state->dragscroll = state->scroll;
+			}
+			const auto position = me->pos() + scroll();
 			for (auto i = 0, c = int(state->buttons.size()); i != c; ++i) {
 				if (state->buttons[i].geometry.contains(position)) {
 					setSelected(i);
@@ -687,28 +1058,44 @@ struct GiftPriceTabs {
 				}
 			}
 		} break;
+		case QEvent::Wheel: {
+			const auto me = static_cast<QWheelEvent*>(e.get());
+			state->scroll = std::clamp(
+				state->scroll - ScrollDeltaF(me).x(),
+				0.,
+				state->scrollMax * 1.);
+			raw->update();
+		} break;
 		case QEvent::MouseButtonPress: {
 			const auto me = static_cast<QMouseEvent*>(e.get());
 			if (me->button() != Qt::LeftButton) {
 				break;
 			}
-			const auto position = me->pos();
-			for (auto i = 0, c = int(state->buttons.size()); i != c; ++i) {
-				if (state->buttons[i].geometry.contains(position)) {
-					setActive(i);
-					break;
-				}
+			state->pressed = state->selected;
+			state->pressx = me->pos().x() - state->tabsShift;
+		} break;
+		case QEvent::MouseButtonRelease: {
+			const auto me = static_cast<QMouseEvent*>(e.get());
+			if (me->button() != Qt::LeftButton) {
+				break;
+			}
+			const auto dragx = std::exchange(state->dragx, 0);
+			const auto pressed = std::exchange(state->pressed, -1);
+			state->pressx = 0;
+			if (!dragx && pressed >= 0 && state->selected == pressed) {
+				setActive(pressed);
 			}
 		} break;
 		}
 	}, raw->lifetime());
 
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto padding = st::giftBoxTabPadding;
+		const auto shift = -scroll();
 		for (const auto &button : state->buttons) {
-			const auto geometry = button.geometry;
+			const auto geometry = button.geometry.translated(shift);
 			if (button.active) {
 				p.setBrush(st::giftBoxTabBgActive);
 				p.setPen(Qt::NoPen);
@@ -723,6 +1110,22 @@ struct GiftPriceTabs {
 				.availableWidth = button.text.maxWidth(),
 			});
 		}
+		{
+			const auto &icon = st::defaultEmojiSuggestions;
+			const auto w = icon.fadeRight.width();
+			const auto &c = st::boxDividerBg->c;
+			const auto r = QRect(0, 0, w, raw->height());
+			const auto s = std::abs(float64(shift.x()));
+			constexpr auto kF = 0.5;
+			const auto opacityRight = (state->scrollMax - s)
+				/ (icon.fadeRight.width() * kF);
+			p.setOpacity(std::clamp(std::abs(opacityRight), 0., 1.));
+			icon.fadeRight.fill(p, r.translated(raw->width() -  w, 0), c);
+
+			const auto opacityLeft = s / (icon.fadeLeft.width() * kF);
+			p.setOpacity(std::clamp(std::abs(opacityLeft), 0., 1.));
+			icon.fadeLeft.fill(p, r, c);
+		}
 	}, raw->lifetime());
 
 	return {
@@ -737,29 +1140,31 @@ struct GiftPriceTabs {
 		255);
 }
 
-[[nodiscard]] not_null<Ui::InputField*> AddPartInput(
+[[nodiscard]] not_null<InputField*> AddPartInput(
 		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
+		not_null<VerticalLayout*> container,
 		not_null<QWidget*> outer,
 		rpl::producer<QString> placeholder,
 		QString current,
 		int limit) {
 	const auto field = container->add(
-		object_ptr<Ui::InputField>(
+		object_ptr<InputField>(
 			container,
 			st::giftBoxTextField,
-			Ui::InputField::Mode::NoNewlines,
+			InputField::Mode::NoNewlines,
 			std::move(placeholder),
 			current),
 		st::giftBoxTextPadding);
 	field->setMaxLength(limit);
-	Ui::AddLengthLimitLabel(field, limit, std::nullopt, st::giftBoxLimitTop);
+	AddLengthLimitLabel(field, limit, {
+		.limitLabelTop = st::giftBoxLimitTop,
+	});
 
-	const auto toggle = Ui::CreateChild<Ui::EmojiButton>(
+	const auto toggle = CreateChild<EmojiButton>(
 		container,
 		st::defaultComposeFiles.emoji);
 	toggle->show();
-	field->geometryValue() | rpl::start_with_next([=](QRect r) {
+	field->geometryValue() | rpl::on_next([=](QRect r) {
 		toggle->move(
 			r.x() + r.width() - toggle->width(),
 			r.y() - st::giftBoxEmojiToggleTop);
@@ -781,11 +1186,11 @@ struct GiftPriceTabs {
 	panel->hide();
 	panel->selector()->setAllowEmojiWithoutPremium(true);
 	panel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
-		Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
+		InsertEmojiAtCursor(field->textCursor(), data.emoji);
 	}, field->lifetime());
 	panel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		Data::InsertCustomEmoji(field, data.document);
 	}, field->lifetime());
 
@@ -825,285 +1230,375 @@ void SendGift(
 		not_null<Window::SessionController*> window,
 		not_null<PeerData*> peer,
 		std::shared_ptr<Api::PremiumGiftCodeOptions> api,
-		const GiftDetails &details,
+		const GiftSendDetails &details,
 		Fn<void(Payments::CheckoutResult)> done) {
+	const auto processNonPanelPaymentFormFactory
+		= Payments::ProcessNonPanelPaymentFormFactory(window, done);
 	v::match(details.descriptor, [&](const GiftTypePremium &gift) {
-		auto invoice = api->invoice(1, gift.months);
-		invoice.purpose = Payments::InvoicePremiumGiftCodeUsers{
-			.users = { peer->asUser() },
-			.message = details.text,
-		};
-		Payments::CheckoutProcess::Start(std::move(invoice), done);
+		if (details.byStars && gift.stars) {
+			auto invoice = Payments::InvoicePremiumGiftCode{
+				.purpose = Payments::InvoicePremiumGiftCodeUsers{
+					.users = { peer->asUser() },
+					.message = details.text,
+				},
+				.currency = Ui::kCreditsCurrency,
+				.randomId = details.randomId,
+				.amount = uint64(gift.stars),
+				.storeQuantity = 1,
+				.users = 1,
+				.months = gift.months,
+			};
+			Payments::CheckoutProcess::Start(
+				std::move(invoice),
+				done,
+				processNonPanelPaymentFormFactory);
+		} else {
+			auto invoice = api->invoice(1, gift.months);
+			invoice.purpose = Payments::InvoicePremiumGiftCodeUsers{
+				.users = { peer->asUser() },
+				.message = details.text,
+			};
+			Payments::CheckoutProcess::Start(std::move(invoice), done);
+		}
 	}, [&](const GiftTypeStars &gift) {
-		const auto processNonPanelPaymentFormFactory
-			= Payments::ProcessNonPanelPaymentFormFactory(window, done);
 		Payments::CheckoutProcess::Start(Payments::InvoiceStarGift{
-			.giftId = gift.id,
+			.giftId = gift.info.id,
 			.randomId = details.randomId,
 			.message = details.text,
-			.user = peer->asUser(),
-			.limitedCount = gift.limitedCount,
+			.recipient = peer,
+			.limitedCount = gift.info.limitedCount,
+			.perUserLimit = gift.info.perUserTotal,
 			.anonymous = details.anonymous,
+			.upgraded = details.upgraded,
 		}, done, processNonPanelPaymentFormFactory);
 	});
 }
 
-void SendGiftBox(
-		not_null<Ui::GenericBox*> box,
+void ShowGiftUpgradedToast(
 		not_null<Window::SessionController*> window,
-		not_null<PeerData*> peer,
-		std::shared_ptr<Api::PremiumGiftCodeOptions> api,
-		const GiftDescriptor &descriptor) {
-	box->setStyle(st::giftBox);
-	box->setWidth(st::boxWideWidth);
-	box->setTitle(tr::lng_gift_send_title());
-	box->addTopButton(st::boxTitleClose, [=] {
-		box->closeBox();
+		not_null<Main::Session*> session,
+		std::shared_ptr<Data::UniqueGift> gift) {
+	Expects(gift != nullptr);
+
+	window->showToast({
+		.title = tr::lng_gift_upgraded_title(tr::now),
+		.text = tr::lng_gift_upgraded_about(
+			tr::now,
+			lt_name,
+			tr::bold(Data::UniqueGiftName(*gift)),
+			tr::marked),
+		.duration = kUpgradeDoneToastDuration,
 	});
+}
 
-	const auto session = &window->session();
-	auto cost = rpl::single([&] {
-		return v::match(descriptor, [&](const GiftTypePremium &data) {
-			if (data.currency == Ui::kCreditsCurrency) {
-				return Ui::CreditsEmojiSmall(session).append(
-					Lang::FormatCountDecimal(std::abs(data.cost)));
-			}
-			return TextWithEntities{
-				FillAmountAndCurrency(data.cost, data.currency),
-			};
-		}, [&](const GiftTypeStars &data) {
-			return Ui::CreditsEmojiSmall(session).append(
-				Lang::FormatCountDecimal(std::abs(data.stars)));
+void ShowUpgradeGiftedToast(
+		base::weak_ptr<Window::SessionController> weak,
+		not_null<PeerData*> peer) {
+	if (const auto strong = weak.get()) {
+		strong->showToast({
+			.title = tr::lng_gift_upgrade_gifted_title(tr::now),
+			.text = { (peer->isBroadcast()
+				? tr::lng_gift_upgrade_gifted_about_channel
+				: tr::lng_gift_upgrade_gifted_about)(
+					tr::now,
+					lt_name,
+					peer->shortName()) },
+			.duration = kUpgradeDoneToastDuration,
 		});
-	}());
+	}
+}
 
-	struct State {
-		rpl::variable<GiftDetails> details;
-		std::shared_ptr<Data::DocumentMedia> media;
-		bool submitting = false;
-	};
-	const auto state = box->lifetime().make_state<State>();
-	state->details = GiftDetails{
-		.descriptor = descriptor,
-		.randomId = base::RandomValue<uint64>(),
+void SendStarsFormRequest(
+		std::shared_ptr<Main::SessionShow> show,
+		Settings::SmallBalanceResult result,
+		uint64 formId,
+		MTPInputInvoice invoice,
+		Fn<void(Payments::CheckoutResult, const MTPUpdates *)> done) {
+	using BalanceResult = Settings::SmallBalanceResult;
+	const auto session = &show->session();
+	if (result == BalanceResult::Success
+		|| result == BalanceResult::Already) {
+		session->api().request(MTPpayments_SendStarsForm(
+			MTP_long(formId),
+			invoice
+		)).done([=](const MTPpayments_PaymentResult &result) {
+			result.match([&](const MTPDpayments_paymentResult &data) {
+				session->api().applyUpdates(data.vupdates());
+				session->credits().tonLoad(true);
+				session->credits().load(true);
+				done(Payments::CheckoutResult::Paid, &data.vupdates());
+			}, [&](const MTPDpayments_paymentVerificationNeeded &data) {
+				done(Payments::CheckoutResult::Failed, nullptr);
+			});
+		}).fail([=](const MTP::Error &error) {
+			if (!ShowGiftErrorToast(show, error)) {
+				show->showToast(error.type());
+			}
+			done(Payments::CheckoutResult::Failed, nullptr);
+		}).send();
+	} else if (result == BalanceResult::Cancelled) {
+		done(Payments::CheckoutResult::Cancelled, nullptr);
+	} else {
+		done(Payments::CheckoutResult::Failed, nullptr);
+	}
+}
+
+void UpgradeGift(
+		not_null<Window::SessionController*> window,
+		Data::SavedStarGiftId savedId,
+		bool keepDetails,
+		int stars,
+		Fn<void(bool, std::shared_ptr<Data::GiftUpgradeResult>)> done) {
+	//AssertIsDebug(); return;
+	const auto session = &window->session();
+	const auto weak = base::make_weak(window);
+	auto formDone = [=](
+			Payments::CheckoutResult result,
+			const MTPUpdates *updates) {
+		if (result != Payments::CheckoutResult::Paid) {
+			done(false, nullptr);
+			return;
+		}
+		const auto owner = savedId.isUser()
+			? session->user().get()
+			: savedId.chat();
+		if (owner) {
+			owner->owner().nextForUpgradeGiftInvalidate(owner);
+		}
+		const auto gift = updates
+			? FindUniqueGift(session, *updates)
+			: nullptr;
+		done(true, gift);
 	};
-	const auto document = LookupGiftSticker(&window->session(), descriptor);
-	if ((state->media = document ? document->createMediaView() : nullptr)) {
-		state->media->checkStickerLarge();
+	if (stars <= 0) {
+		using Flag = MTPpayments_UpgradeStarGift::Flag;
+		session->api().request(MTPpayments_UpgradeStarGift(
+			MTP_flags(keepDetails ? Flag::f_keep_original_details : Flag()),
+			Api::InputSavedStarGiftId(savedId)
+		)).done([=](const MTPUpdates &result) {
+			session->api().applyUpdates(result);
+			formDone(Payments::CheckoutResult::Paid, &result);
+		}).fail([=](const MTP::Error &error) {
+			if (const auto strong = weak.get()) {
+				if (!ShowGiftErrorToast(strong->uiShow(), error)) {
+					strong->showToast(error.type());
+				}
+			}
+			formDone(Payments::CheckoutResult::Failed, nullptr);
+		}).send();
+		return;
 	}
+	using Flag = MTPDinputInvoiceStarGiftUpgrade::Flag;
+	RequestStarsFormAndSubmit(
+		window->uiShow(),
+		MTP_inputInvoiceStarGiftUpgrade(
+			MTP_flags(keepDetails ? Flag::f_keep_original_details : Flag()),
+			Api::InputSavedStarGiftId(savedId)),
+		std::move(formDone));
+}
 
-	const auto container = box->verticalLayout();
-	container->add(object_ptr<PreviewWrap>(
-		container,
-		session,
-		state->details.value()));
+void GiftUpgrade(
+		not_null<Window::SessionController*> window,
+		not_null<PeerData*> peer,
+		QString giftPrepayUpgradeHash,
+		int stars,
+		Fn<void(bool)> done) {
+	const auto weak = base::make_weak(window);
+	auto formDone = [=](
+			Payments::CheckoutResult result,
+			const MTPUpdates *updates) {
+		const auto success = (result == Payments::CheckoutResult::Paid);
+		if (success) {
+			ShowUpgradeGiftedToast(weak, peer);
+		}
+		done(success);
+	};
+	RequestStarsFormAndSubmit(
+		window->uiShow(),
+		MTP_inputInvoiceStarGiftPrepaidUpgrade(
+			peer->input(),
+			MTP_string(giftPrepayUpgradeHash)),
+		std::move(formDone));
+}
 
-	const auto limit = StarGiftMessageLimit(&window->session());
-	const auto text = AddPartInput(
+void SoldOutBox(
+		not_null<GenericBox*> box,
+		not_null<Window::SessionController*> window,
+		const GiftTypeStars &gift) {
+	Settings::ReceiptCreditsBox(
+		box,
 		window,
-		container,
-		box->getDelegate()->outerContainer(),
-		tr::lng_gift_send_message(),
-		QString(),
-		limit);
-	text->changes() | rpl::start_with_next([=] {
-		auto now = state->details.current();
-		auto textWithTags = text->getTextWithAppliedMarkdown();
-		now.text = TextWithEntities{
-			std::move(textWithTags.text),
-			TextUtilities::ConvertTextTagsToEntities(textWithTags.tags)
-		};
-		state->details = std::move(now);
-	}, text->lifetime());
+		Data::CreditsHistoryEntry{
+			.firstSaleDate = base::unixtime::parse(gift.info.firstSaleDate),
+			.lastSaleDate = base::unixtime::parse(gift.info.lastSaleDate),
+			.credits = CreditsAmount(gift.info.stars),
+			.bareGiftStickerId = gift.info.document->id,
+			.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
+			.limitedCount = gift.info.limitedCount,
+			.limitedLeft = gift.info.limitedLeft,
+			.soldOutInfo = true,
+			.gift = true,
+		},
+		Data::SubscriptionEntry());
+}
 
-	box->setFocusCallback([=] {
-		text->setFocusFast();
-	});
+void AddUpgradeButton(
+		not_null<Ui::VerticalLayout*> container,
+		int cost,
+		not_null<PeerData*> peer,
+		Fn<void(bool)> toggled,
+		Fn<void()> preview) {
+	const auto button = container->add(
+		object_ptr<SettingsButton>(
+			container,
+			rpl::single(QString()),
+			st::settingsButtonNoIcon));
+	button->toggleOn(rpl::single(false))->toggledValue(
+	) | rpl::on_next(toggled, button->lifetime());
 
-	const auto allow = [=](not_null<DocumentData*> emoji) {
-		return true;
-	};
-	InitMessageFieldHandlers({
-		.session = &window->session(),
-		.show = window->uiShow(),
-		.field = text,
-		.customEmojiPaused = [=] {
-			using namespace Window;
-			return window->isGifPausedAtLeastFor(GifPauseReason::Layer);
-		},
-		.allowPremiumEmoji = allow,
-		.allowMarkdownTags = {
-			Ui::InputField::kTagBold,
-			Ui::InputField::kTagItalic,
-			Ui::InputField::kTagUnderline,
-			Ui::InputField::kTagStrikeOut,
-			Ui::InputField::kTagSpoiler,
-		}
-	});
-	Ui::Emoji::SuggestionsController::Init(
-		box->getDelegate()->outerContainer(),
-		text,
-		&window->session(),
-		{ .suggestCustomEmoji = true, .allowCustomWithoutPremium = allow });
-
-	if (v::is<GiftTypeStars>(descriptor)) {
-		AddDivider(container);
-		AddSkip(container);
-		container->add(
-			object_ptr<Ui::SettingsButton>(
-				container,
-				tr::lng_gift_send_anonymous(),
-				st::settingsButtonNoIcon)
-		)->toggleOn(rpl::single(false))->toggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
-			auto now = state->details.current();
-			now.anonymous = toggled;
-			state->details = std::move(now);
-		}, container->lifetime());
-		AddSkip(container);
-	}
-	v::match(descriptor, [&](const GiftTypePremium &) {
-		AddDividerText(container, tr::lng_gift_send_premium_about(
-			lt_user,
-			rpl::single(peer->shortName())));
-	}, [&](const GiftTypeStars &) {
-		AddDividerText(container, tr::lng_gift_send_anonymous_about(
-			lt_user,
-			rpl::single(peer->shortName()),
-			lt_recipient,
-			rpl::single(peer->shortName())));
-	});
+	auto helper = Ui::Text::CustomEmojiHelper();
+	auto star = helper.paletteDependent(Ui::Earn::IconCreditsEmoji());
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		button,
+		tr::lng_gift_send_unique(
+			lt_price,
+			rpl::single(star.append(' '
+				+ Lang::FormatCreditsAmountDecimal(
+					CreditsAmount{ cost }))),
+			tr::marked),
+		st::boxLabel,
+		st::defaultPopupMenu,
+		helper.context());
+	label->show();
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	button->widthValue() | rpl::on_next([=](int outer) {
+		const auto padding = st::settingsButtonNoIcon.padding;
+		const auto inner = outer
+			- padding.left()
+			- padding.right()
+			- st::settingsButtonNoIcon.toggleSkip
+			- 2 * st::settingsButtonNoIcon.toggle.border
+			- 2 * st::settingsButtonNoIcon.toggle.diameter
+			- 2 * st::settingsButtonNoIcon.toggle.width;
+		label->resizeToWidth(inner);
+		label->moveToLeft(padding.left(), padding.top(), outer);
+	}, label->lifetime());
 
-	const auto buttonWidth = st::boxWideWidth
-		- st::giftBox.buttonPadding.left()
-		- st::giftBox.buttonPadding.right();
-	const auto button = box->addButton(rpl::single(QString()), [=] {
-		if (state->submitting) {
-			return;
-		}
-		state->submitting = true;
-		const auto details = state->details.current();
-		const auto weak = Ui::MakeWeak(box);
-		const auto done = [=](Payments::CheckoutResult result) {
-			if (result == Payments::CheckoutResult::Paid) {
-				const auto copy = state->media;
-				window->showPeerHistory(peer);
-				ShowSentToast(window, descriptor);
-			}
-			if (const auto strong = weak.data()) {
-				box->closeBox();
-			}
-		};
-		SendGift(window, peer, api, details, done);
+	AddSkip(container);
+	const auto about = AddDividerText(
+		container,
+		(peer->isBroadcast()
+			? tr::lng_gift_send_unique_about_channel(
+				lt_name,
+				rpl::single(TextWithEntities{ peer->name() }),
+				lt_link,
+				tr::lng_gift_send_unique_link(tr::link),
+				tr::marked)
+			: tr::lng_gift_send_unique_about(
+				lt_user,
+				rpl::single(TextWithEntities{ peer->shortName() }),
+				lt_link,
+				tr::lng_gift_send_unique_link(tr::link),
+				tr::marked)));
+	about->setClickHandlerFilter([=](const auto &...) {
+		preview();
+		return false;
 	});
-	SetButtonMarkedLabel(
-		button,
-		tr::lng_gift_send_button(
-			lt_cost,
-			std::move(cost),
-			Ui::Text::WithEntities),
-		session,
-		st::creditsBoxButtonLabel,
-		st::giftBox.button.textFg->c);
-	button->resizeToWidth(buttonWidth);
-	button->widthValue() | rpl::start_with_next([=](int width) {
-		if (width != buttonWidth) {
-			button->resizeToWidth(buttonWidth);
-		}
-	}, button->lifetime());
 }
 
-[[nodiscard]] object_ptr<RpWidget> MakeGiftsList(
-		not_null<Window::SessionController*> window,
-		not_null<PeerData*> peer,
-		rpl::producer<GiftsDescriptor> gifts) {
-	auto result = object_ptr<RpWidget>((QWidget*)nullptr);
-	const auto raw = result.data();
-
+void AddSoldLeftSlider(
+		not_null<RpWidget*> above,
+		const GiftTypeStars &gift,
+		QMargins added = {}) {
+	const auto still = gift.info.limitedLeft;
+	const auto total = gift.info.limitedCount;
+	const auto slider = CreateChild<RpWidget>(above->parentWidget());
 	struct State {
-		Delegate delegate;
-		std::vector<std::unique_ptr<GiftButton>> buttons;
-		bool sending = false;
+		Text::String still;
+		Text::String sold;
+		int height = 0;
 	};
-	const auto state = raw->lifetime().make_state<State>(State{
-		.delegate = Delegate(window),
-	});
-	const auto single = state->delegate.buttonSize();
-	const auto shadow = st::defaultDropdownMenu.wrap.shadow;
-	const auto extend = shadow.extend;
-
-	auto &packs = window->session().giftBoxStickersPacks();
-	packs.updated() | rpl::start_with_next([=] {
-		for (const auto &button : state->buttons) {
-			button->update();
-		}
-	}, raw->lifetime());
-
-	std::move(
-		gifts
-	) | rpl::start_with_next([=](const GiftsDescriptor &gifts) {
-		const auto width = st::boxWideWidth;
-		const auto padding = st::giftBoxPadding;
-		const auto available = width - padding.left() - padding.right();
-		const auto perRow = available / single.width();
-
-		auto x = padding.left();
-		auto y = padding.top();
-		state->buttons.resize(gifts.list.size());
-		for (auto &button : state->buttons) {
-			if (!button) {
-				button = std::make_unique<GiftButton>(raw, &state->delegate);
-				button->show();
-			}
+	const auto state = slider->lifetime().make_state<State>();
+	const auto sold = total - still;
+	state->still.setText(
+		st::semiboldTextStyle,
+		tr::lng_gift_send_limited_left(tr::now, lt_count_decimal, still));
+	state->sold.setText(
+		st::semiboldTextStyle,
+		tr::lng_gift_send_limited_sold(tr::now, lt_count_decimal, sold));
+	state->height = st::giftLimitedPadding.top()
+		+ st::semiboldFont->height
+		+ st::giftLimitedPadding.bottom();
+	above->geometryValue() | rpl::on_next([=](QRect geometry) {
+		const auto space = st::giftLimitedBox.buttonPadding.top();
+		const auto skip = (space - state->height) / 2;
+		slider->setGeometry(
+			geometry.x() + added.left(),
+			geometry.y() - skip - state->height,
+			geometry.width() - added.left() - added.right(),
+			state->height);
+	}, slider->lifetime());
+	slider->paintRequest() | rpl::on_next([=] {
+		const auto &padding = st::giftLimitedPadding;
+		const auto left = (padding.left() * 2) + state->still.maxWidth();
+		const auto right = (padding.right() * 2) + state->sold.maxWidth();
+		const auto space = slider->width() - left - right;
+		if (space <= 0) {
+			return;
 		}
-		const auto api = gifts.api;
-		for (auto i = 0, count = int(gifts.list.size()); i != count; ++i) {
-			const auto button = state->buttons[i].get();
-			const auto &descriptor = gifts.list[i];
-			button->setDescriptor(descriptor);
+		const auto edge = left + ((space * still) / total);
 
-			const auto last = !((i + 1) % perRow);
-			if (last) {
-				x = padding.left() + available - single.width();
-			}
-			button->setGeometry(QRect(QPoint(x, y), single), extend);
-			if (last) {
-				x = padding.left();
-				y += single.height() + st::giftBoxGiftSkip.y();
-			} else {
-				x += single.width() + st::giftBoxGiftSkip.x();
-			}
+		const auto radius = st::buttonRadius;
+		auto p = QPainter(slider);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::windowBgOver);
+		p.drawRoundedRect(
+			edge - (radius * 3),
+			0,
+			slider->width() - (edge - (radius * 3)),
+			state->height,
+			radius,
+			radius);
+		p.setBrush(st::windowBgActive);
+		p.drawRoundedRect(0, 0, edge, state->height, radius, radius);
 
-			button->setClickedCallback([=] {
-				const auto star = std::get_if<GiftTypeStars>(&descriptor);
-				if (star && star->limitedCount && !star->limitedLeft) {
-					window->showToast({
-						.title = tr::lng_gift_sold_out_title(tr::now),
-						.text = tr::lng_gift_sold_out_text(
-							tr::now,
-							lt_count_decimal,
-							star->limitedCount,
-							Ui::Text::RichLangValue),
-					});
-				} else {
-					window->show(
-						Box(SendGiftBox, window, peer, api, descriptor));
-				}
-			});
-		}
-		if (gifts.list.size() % perRow) {
-			y += padding.bottom() + single.height();
-		} else {
-			y += padding.bottom() - st::giftBoxGiftSkip.y();
-		}
-		raw->resize(raw->width(), gifts.list.empty() ? 0 : y);
-	}, raw->lifetime());
+		p.setPen(st::windowFgActive);
+		state->still.draw(p, {
+			.position = { padding.left(), padding.top() },
+			.availableWidth = left,
+		});
+		p.setPen(st::windowSubTextFg);
+		state->sold.draw(p, {
+			.position = { left + space + padding.right(), padding.top() },
+			.availableWidth = right,
+		});
+	}, slider->lifetime());
+}
 
-	return result;
+void CheckMaybeGiftLocked(
+		not_null<Window::SessionController*> window,
+		uint64 giftId,
+		Fn<void()> send) {
+	const auto session = &window->session();
+	session->api().request(MTPpayments_CheckCanSendGift(
+		MTP_long(giftId)
+	)).done(crl::guard(window, [=](
+			const MTPpayments_CheckCanSendGiftResult &result) {
+		result.match([&](const MTPDpayments_checkCanSendGiftResultOk &) {
+			send();
+		}, [&](const MTPDpayments_checkCanSendGiftResultFail &data) {
+			window->show(Ui::MakeInformBox({
+				.text = Api::ParseTextWithEntities(session, data.vreason()),
+				.title = tr::lng_gift_locked_title(),
+			}));
+		});
+	})).fail(crl::guard(window, [=] {
+	})).send();
 }
 
 void FillBg(not_null<RpWidget*> box) {
-	box->paintRequest() | rpl::start_with_next([=] {
+	box->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(box);
 		auto hq = PainterHighQualityEnabler(p);
 
@@ -1133,13 +1628,15 @@ void AddBlock(
 			content,
 			std::move(args.subtitle),
 			st::giftBoxSubtitle),
-		st::giftBoxSubtitleMargin);
+		st::giftBoxSubtitleMargin,
+		style::al_top);
 	const auto about = content->add(
 		object_ptr<FlatLabel>(
 			content,
 			std::move(args.about),
 			st::giftBoxAbout),
-		st::giftBoxAboutMargin);
+		st::giftBoxAboutMargin,
+		style::al_top);
 	about->setClickHandlerFilter(std::move(args.aboutFilter));
 	content->add(std::move(args.content));
 }
@@ -1154,46 +1651,125 @@ void AddBlock(
 
 	state->gifts = GiftsPremium(&window->session(), peer);
 
-	auto result = MakeGiftsList(window, peer, state->gifts.value(
+	auto gifts = state->gifts.value(
 	) | rpl::map([=](const PremiumGiftsDescriptor &gifts) {
 		return GiftsDescriptor{
 			gifts.list | ranges::to<std::vector<GiftDescriptor>>,
 			gifts.api,
 		};
-	}));
+	});
+	auto result = MakeGiftsList({
+		.window = window,
+		.peer = peer,
+		.gifts = std::move(gifts),
+	});
 	result->lifetime().add([state = std::move(state)] {});
 	return result;
 }
 
 [[nodiscard]] object_ptr<RpWidget> MakeStarsGifts(
 		not_null<Window::SessionController*> window,
-		not_null<PeerData*> peer) {
+		not_null<PeerData*> peer,
+		MyGiftsDescriptor my,
+		Fn<void(int)> tabSelected) {
 	auto result = object_ptr<VerticalLayout>((QWidget*)nullptr);
 
 	struct State {
 		rpl::variable<std::vector<GiftTypeStars>> gifts;
 		rpl::variable<int> priceTab = kPriceTabAll;
+		rpl::event_stream<> myUpdated;
+		MyGiftsDescriptor my;
+		rpl::lifetime myLoading;
 	};
 	const auto state = result->lifetime().make_state<State>();
+	state->my = std::move(my);
 
 	state->gifts = GiftsStars(&window->session(), peer);
 
-	auto tabs = MakeGiftsPriceTabs(window, peer, state->gifts.value());
+	auto tabs = MakeGiftsPriceTabs(
+		peer,
+		state->gifts.value(),
+		!state->my.list.empty() && !peer->isSelf());
 	state->priceTab = std::move(tabs.priceTab);
+	state->priceTab.changes() | rpl::on_next([=](int tab) {
+		tabSelected(tab);
+	}, tabs.widget->lifetime());
 	result->add(std::move(tabs.widget));
-	result->add(MakeGiftsList(window, peer, rpl::combine(
+
+	auto gifts = rpl::combine(
 		state->gifts.value(),
-		state->priceTab.value()
-	) | rpl::map([=](std::vector<GiftTypeStars> &&gifts, int price) {
-		gifts.erase(ranges::remove_if(gifts, [&](const GiftTypeStars &gift) {
-			return (price == kPriceTabLimited)
-				? (!gift.limitedCount)
-				: (price && gift.stars != price);
-		}), end(gifts));
+		state->priceTab.value(),
+		rpl::single(rpl::empty) | rpl::then(state->myUpdated.events())
+	) | rpl::map([=](std::vector<GiftTypeStars> &&gifts, int price, auto) {
+		if (price == kPriceTabMy) {
+			gifts.clear();
+			for (const auto &gift : state->my.list) {
+				gifts.push_back({
+					.transferId = gift.manageId,
+					.info = gift.info,
+					.mine = true,
+				});
+			}
+		} else {
+			// First, gather information about which gifts are available on resale
+			base::flat_set<uint64> resaleGiftIds;
+			if (price != kPriceTabCollectibles) {
+				// Only need this info when not viewing the resale tab
+				for (const auto &gift : gifts) {
+					if (gift.resale) {
+						resaleGiftIds.insert(gift.info.id);
+					}
+				}
+			}
+
+			const auto pred = [&](const GiftTypeStars &gift) {
+				// Skip sold out gifts if they're available on resale
+				// (unless we're specifically viewing resale gifts)
+				if (price != kPriceTabCollectibles
+					&& IsSoldOut(gift.info)
+					&& !gift.resale
+					&& resaleGiftIds.contains(gift.info.id)) {
+					return true; // Remove this gift
+				} else if ((price != kPriceTabCollectibles) || gift.resale) {
+					return false;
+				}
+				return !gift.info.limitedCount
+					|| !gift.info.upgradable
+					|| IsSoldOut(gift.info);
+			};
+			gifts.erase(ranges::remove_if(gifts, pred), end(gifts));
+		}
 		return GiftsDescriptor{
 			gifts | ranges::to<std::vector<GiftDescriptor>>(),
 		};
-	})));
+	});
+	const auto loadMore = [=] {
+		if (state->priceTab.current() == kPriceTabMy
+			&& !state->my.offset.isEmpty()
+			&& !state->myLoading) {
+			state->myLoading = Data::MyUniqueGiftsSlice(
+				&peer->session(),
+				Data::MyUniqueType::OnlyOwned,
+				state->my.offset
+			) | rpl::on_next([=](MyGiftsDescriptor &&descriptor) {
+				state->myLoading.destroy();
+				state->my.offset = descriptor.list.empty()
+					? QString()
+					: descriptor.offset;
+				state->my.list.insert(
+					end(state->my.list),
+					std::make_move_iterator(begin(descriptor.list)),
+					std::make_move_iterator(end(descriptor.list)));
+				state->myUpdated.fire({});
+			});
+		}
+	};
+	result->add(MakeGiftsList({
+		.window = window,
+		.peer = peer,
+		.gifts = std::move(gifts),
+		.loadMore = loadMore,
+	}));
 
 	return result;
 }
@@ -1201,13 +1777,16 @@ void AddBlock(
 void GiftBox(
 		not_null<GenericBox*> box,
 		not_null<Window::SessionController*> window,
-		not_null<PeerData*> peer) {
+		not_null<PeerData*> peer,
+		MyGiftsDescriptor my) {
 	box->setWidth(st::boxWideWidth);
 	box->setStyle(st::creditsGiftBox);
 	box->setNoContentMargin(true);
 	box->setCustomCornersFilling(RectPart::FullTop);
 	box->addButton(tr::lng_create_group_back(), [=] { box->closeBox(); });
 
+	window->session().credits().load();
+
 	FillBg(box);
 
 	const auto &stUser = st::premiumGiftsUserpicButton;
@@ -1215,127 +1794,3419 @@ void GiftBox(
 
 	AddSkip(content, st::defaultVerticalListSkip * 5);
 
+	// Check disallowed gift types
+	const auto user = peer->asUser();
+	using Type = Api::DisallowedGiftType;
+	const auto disallowedTypes = user
+		? user->disallowedGiftTypes()
+		: Type::Premium;
+	const auto premiumDisallowed = peer->isSelf()
+		|| (disallowedTypes & Type::Premium);
+	const auto limitedDisallowed = !peer->isSelf()
+		&& (disallowedTypes & Type::Limited);
+	const auto unlimitedDisallowed = !peer->isSelf()
+		&& (disallowedTypes & Type::Unlimited);
+	const auto uniqueDisallowed = !peer->isSelf()
+		&& (disallowedTypes & Type::Unique);
+	const auto allStarsDisallowed = limitedDisallowed
+		&& unlimitedDisallowed
+		&& uniqueDisallowed;
+
 	content->add(
-		object_ptr<CenterWrap<>>(
-			content,
-			object_ptr<UserpicButton>(content, peer, stUser))
-	)->setAttribute(Qt::WA_TransparentForMouseEvents);
+		object_ptr<UserpicButton>(content, peer, stUser),
+		style::al_top
+	)->setClickedCallback([=] { window->showPeerInfo(peer); });
 	AddSkip(content);
 	AddSkip(content);
 
-	{
-		const auto widget = CreateChild<RpWidget>(content);
-		using ColoredMiniStars = Premium::ColoredMiniStars;
-		const auto stars = widget->lifetime().make_state<ColoredMiniStars>(
-			widget,
-			false,
-			Premium::MiniStars::Type::BiStars);
-		stars->setColorOverride(Premium::CreditsIconGradientStops());
-		widget->resize(
-			st::boxWidth - stUser.photoSize,
-			stUser.photoSize * 2);
-		content->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
-			widget->moveToLeft((size.width() - widget->width()) / 2, 0);
-			const auto starsRect = Rect(widget->size());
-			stars->setPosition(starsRect.topLeft());
-			stars->setSize(starsRect.size());
-			widget->lower();
-		}, widget->lifetime());
-		widget->paintRequest(
-		) | rpl::start_with_next([=](const QRect &r) {
-			auto p = QPainter(widget);
-			p.fillRect(r, Qt::transparent);
-			stars->paint(p);
-		}, widget->lifetime());
-	}
+	Settings::AddMiniStars(
+		content,
+		CreateChild<RpWidget>(content),
+		stUser.photoSize,
+		box->width(),
+		2.);
 	AddSkip(content);
 	AddSkip(box->verticalLayout());
 
-	const auto premiumClickHandlerFilter = [=](const auto &...) {
-		Settings::ShowPremium(window, u"gift_send"_q);
-		return false;
-	};
 	const auto starsClickHandlerFilter = [=](const auto &...) {
 		window->showSettings(Settings::CreditsId());
 		return false;
 	};
-	AddBlock(content, window, {
-		.subtitle = tr::lng_gift_premium_subtitle(),
-		.about = tr::lng_gift_premium_about(
-			lt_name,
-			rpl::single(Text::Bold(peer->shortName())),
-			lt_features,
-			tr::lng_gift_premium_features() | Text::ToLink(),
-			Text::WithEntities),
-		.aboutFilter = premiumClickHandlerFilter,
-		.content = MakePremiumGifts(window, peer),
-	});
-	AddBlock(content, window, {
-		.subtitle = tr::lng_gift_stars_subtitle(),
-		.about = tr::lng_gift_stars_about(
-			lt_name,
-			rpl::single(Text::Bold(peer->shortName())),
-			lt_link,
-			tr::lng_gift_stars_link() | Text::ToLink(),
-			Text::WithEntities),
-		.aboutFilter = starsClickHandlerFilter,
-		.content = MakeStarsGifts(window, peer),
-	});
+	if (peer->isUser() && !peer->isSelf() && !premiumDisallowed) {
+		const auto premiumClickHandlerFilter = [=](const auto &...) {
+			Settings::ShowPremium(window, u"gift_send"_q);
+			return false;
+		};
+
+		AddBlock(content, window, {
+			.subtitle = tr::lng_gift_premium_subtitle(),
+			.about = tr::lng_gift_premium_about(
+				lt_name,
+				rpl::single(tr::bold(peer->shortName())),
+				lt_features,
+				tr::lng_gift_premium_features(tr::link),
+				tr::marked),
+			.aboutFilter = premiumClickHandlerFilter,
+			.content = MakePremiumGifts(window, peer),
+		});
+	}
+
+	// Only add star gifts if at least one type is allowed
+	if (!allStarsDisallowed) {
+		const auto collectibles = content->lifetime().make_state<
+			rpl::variable<bool>
+		>();
+		auto tabSelected = [=](int tab) {
+			*collectibles = (tab == kPriceTabCollectibles);
+		};
+		AddBlock(content, window, {
+			.subtitle = (peer->isSelf()
+				? tr::lng_gift_self_title()
+				: peer->isBroadcast()
+				? tr::lng_gift_channel_title()
+				: tr::lng_gift_stars_subtitle()),
+			.about = (peer->isSelf()
+				? tr::lng_gift_self_about(tr::marked)
+				: peer->isBroadcast()
+				? tr::lng_gift_channel_about(
+					lt_name,
+					rpl::single(tr::bold(peer->name())),
+					tr::marked)
+				: rpl::conditional(
+					collectibles->value(),
+					tr::lng_gift_stars_about_collectibles(
+						lt_link,
+						tr::lng_gift_stars_link(tr::link),
+						tr::marked),
+					tr::lng_gift_stars_about(
+						lt_name,
+						rpl::single(tr::bold(peer->shortName())),
+						lt_link,
+						tr::lng_gift_stars_link(tr::link),
+						tr::marked))),
+			.aboutFilter = starsClickHandlerFilter,
+			.content = MakeStarsGifts(
+				window,
+				peer,
+				std::move(my),
+				std::move(tabSelected)),
+		});
+	}
 }
 
-} // namespace
+[[nodiscard]] base::unique_qptr<Ui::PopupMenu> CreateRowContextMenu(
+		QWidget *parent,
+		not_null<PeerData*> peer,
+		PickCallback pick) {
+	auto result = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	result->addAction(
+		tr::lng_context_send_message(tr::now),
+		[=] { pick(peer, PickType::SendMessage); },
+		&st::menuIconChatBubble);
+	result->addAction(
+		tr::lng_context_view_profile(tr::now),
+		[=] { pick(peer, PickType::OpenProfile); },
+		&st::menuIconProfile);
+	return result;
+}
 
-void ChooseStarGiftRecipient(
-		not_null<Window::SessionController*> controller) {
-	class Controller final : public ContactsBoxController {
+struct CustomList {
+	object_ptr<Ui::RpWidget> content = { nullptr };
+	Fn<bool(int, int, int)> overrideKey;
+	Fn<void()> activate;
+	Fn<bool()> hasSelection;
+};
+
+class Controller final : public ContactsBoxController {
+public:
+	Controller(not_null<Main::Session*> session, PickCallback pick);
+
+	void noSearchSubmit();
+
+	bool overrideKeyboardNavigation(
+		int direction,
+		int fromIndex,
+		int toIndex) override final;
+
+	[[nodiscard]] rpl::producer<QString> searchPlaceholder() const override;
+
+	void rowRightActionClicked(not_null<PeerListRow*> row) override final;
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override final;
+
+private:
+	std::unique_ptr<PeerListRow> createRow(
+		not_null<UserData*> user) override;
+
+	void prepareViewHook() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+
+	const PickCallback _pick;
+	const std::vector<UserId> _contactBirthdays;
+	const std::vector<not_null<UserData*>> _frequentUsers;
+	CustomList _selfOption;
+	CustomList _birthdayOptions;
+	CustomList _frequentOptions;
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
+	bool _skipUpDirectionSelect = false;
+
+};
+
+[[nodiscard]] CustomList MakeCustomList(
+		not_null<Main::Session*> session,
+		Fn<void(not_null<PeerListController*>)> fill,
+		PickCallback pick,
+		rpl::producer<QString> below,
+		int topSkip = st::defaultVerticalListSkip) {
+	class CustomController final : public PeerListController {
 	public:
-		Controller(
+		CustomController(
 			not_null<Main::Session*> session,
-			Fn<void(not_null<PeerData*>)> choose)
-		: ContactsBoxController(session)
-		, _choose(std::move(choose)) {
-		}
-
-	protected:
-		std::unique_ptr<PeerListRow> createRow(
-				not_null<UserData*> user) override {
-			if (user->isSelf()
-				|| user->isBot()
-				|| user->isServiceUser()
-				|| user->isInaccessible()) {
-				return nullptr;
-			}
-			return ContactsBoxController::createRow(user);
+			Fn<void(not_null<PeerListController*>)> fill,
+			PickCallback pick)
+		: _session(session)
+		, _pick(std::move(pick))
+		, _fill(std::move(fill)) {
 		}
 
+		void prepare() override {
+			if (_fill) {
+				_fill(this);
+			}
+		}
+		void loadMoreRows() override {
+		}
 		void rowClicked(not_null<PeerListRow*> row) override {
-			_choose(row->peer());
+			_pick(row->peer(), PickType::Activate);
+		}
+		Main::Session &session() const override {
+			return *_session;
+		}
+
+		void rowRightActionClicked(not_null<PeerListRow*> row) override {
+			delegate()->peerListShowRowMenu(row, true);
+		}
+
+		base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+				QWidget *parent,
+				not_null<PeerListRow*> row) override {
+			auto result = CreateRowContextMenu(parent, row->peer(), _pick);
+
+			if (result) {
+				base::take(_menu);
+
+				_menu = base::unique_qptr<Ui::PopupMenu>(result.get());
+			}
+
+			return result;
 		}
 
 	private:
-		const Fn<void(not_null<PeerData*>)> _choose;
+		const not_null<Main::Session*> _session;
+		PickCallback _pick;
+		Fn<void(not_null<PeerListController*>)> _fill;
+
+		base::unique_qptr<Ui::PopupMenu> _menu;
+
+	};
+
+	auto result = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	const auto container = result.data();
+
+	Ui::AddSkip(container, topSkip);
+
+	const auto delegate = container->lifetime().make_state<
+		PeerListContentDelegateSimple
+	>();
+	const auto controller
+		= container->lifetime().make_state<CustomController>(
+			session,
+			fill,
+			pick);
+
+	controller->setStyleOverrides(&st::peerListSingleRow);
+	const auto content = container->add(object_ptr<PeerListContent>(
+		container,
+		controller));
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
 
+	if (below) {
+		Ui::AddSkip(container);
+		container->add(CreatePeerListSectionSubtitle(
+			container,
+			std::move(below)));
+	}
+
+	const auto overrideKey = [=](int direction, int from, int to) {
+		if (!content->isVisible()) {
+			return false;
+		} else if (direction > 0 && from < 0 && to >= 0) {
+			if (content->hasSelection()) {
+				const auto was = content->selectedIndex();
+				const auto now = content->selectSkip(1).reallyMovedTo;
+				if (was != now) {
+					return true;
+				}
+				content->clearSelection();
+			} else {
+				content->selectSkip(1);
+				return true;
+			}
+		} else if (direction < 0 && to < 0) {
+			if (!content->hasSelection()) {
+				content->selectLast();
+			} else if (from >= 0 || content->hasSelection()) {
+				content->selectSkip(-1);
+			}
+		}
+		return false;
 	};
-	auto initBox = [=](not_null<PeerListBox*> peersBox) {
-		peersBox->setTitle(tr::lng_gift_premium_or_stars());
-		peersBox->addButton(tr::lng_cancel(), [=] { peersBox->closeBox(); });
+	const auto hasSelection = [=] {
+		return content->isVisible() && content->hasSelection();
 	};
 
-	auto listController = std::make_unique<Controller>(
-		&controller->session(),
-		[=](not_null<PeerData*> peer) {
-			ShowStarGiftBox(controller, peer);
-		});
-	controller->show(
-		Box<PeerListBox>(std::move(listController), std::move(initBox)),
-		LayerOption::KeepOther);
+	return {
+		.content = std::move(result),
+		.overrideKey = overrideKey,
+		.activate = [=] {
+			if (content->hasSelection()) {
+				pick(
+					content->rowAt(content->selectedIndex())->peer(),
+					PickType::Activate);
+			}
+		},
+		.hasSelection = hasSelection,
+	};
 }
 
-void ShowStarGiftBox(
-		not_null<Window::SessionController*> controller,
-		not_null<PeerData*> peer) {
-	controller->show(Box(GiftBox, controller, peer));
+Controller::Controller(not_null<Main::Session*> session, PickCallback pick)
+: ContactsBoxController(session)
+, _pick(std::move(pick))
+, _contactBirthdays(
+	session->promoSuggestions().knownContactBirthdays().value_or(
+		std::vector<UserId>{}))
+, _frequentUsers(CollectGiftFrequentUsers(session, _contactBirthdays))
+, _selfOption(
+	MakeCustomList(
+		session,
+		[=](not_null<PeerListController*> controller) {
+			auto row = std::make_unique<PeerListRow>(session->user());
+			row->setCustomStatus(tr::lng_gift_self_status(tr::now));
+			controller->delegate()->peerListAppendRow(std::move(row));
+			controller->delegate()->peerListRefreshRows();
+		},
+		_pick,
+		!_contactBirthdays.empty()
+			? tr::lng_gift_subtitle_birthdays()
+			: !_frequentUsers.empty()
+			? tr::lng_settings_top_peers_title()
+			: tr::lng_contacts_header()))
+, _birthdayOptions(
+	MakeCustomList(
+		session,
+		[=](not_null<PeerListController*> controller) {
+			const auto status = [=](const Data::Birthday &date) {
+				if (Data::IsBirthdayToday(date)) {
+					return tr::lng_gift_list_birthday_status_today(
+						tr::now,
+						lt_emoji,
+						Data::BirthdayCake());
+				}
+				const auto yesterday = QDate::currentDate().addDays(-1);
+				const auto tomorrow = QDate::currentDate().addDays(1);
+				if (date.day() == yesterday.day()
+						&& date.month() == yesterday.month()) {
+					return tr::lng_gift_list_birthday_status_yesterday(
+						tr::now);
+				} else if (date.day() == tomorrow.day()
+						&& date.month() == tomorrow.month()) {
+					return tr::lng_gift_list_birthday_status_tomorrow(
+						tr::now);
+				}
+				return QString();
+			};
+
+			auto usersWithBirthdays = ranges::views::all(
+				_contactBirthdays
+			) | ranges::views::transform([&](UserId userId) {
+				return session->data().user(userId);
+			}) | ranges::to_vector;
+
+			ranges::sort(usersWithBirthdays, [](UserData *a, UserData *b) {
+				const auto aBirthday = a->birthday();
+				const auto bBirthday = b->birthday();
+				const auto aIsToday = Data::IsBirthdayToday(aBirthday);
+				const auto bIsToday = Data::IsBirthdayToday(bBirthday);
+				if (aIsToday != bIsToday) {
+					return aIsToday > bIsToday;
+				}
+				if (aBirthday.month() != bBirthday.month()) {
+					return aBirthday.month() < bBirthday.month();
+				}
+				return aBirthday.day() < bBirthday.day();
+			});
+
+			for (const auto &user : usersWithBirthdays) {
+				auto row = std::make_unique<PeerRow>(user);
+				if (auto s = status(user->birthday()); !s.isEmpty()) {
+					row->setCustomStatus(std::move(s));
+				}
+				controller->delegate()->peerListAppendRow(std::move(row));
+			}
+
+			controller->delegate()->peerListRefreshRows();
+		},
+		_pick,
+		_contactBirthdays.empty()
+			? rpl::producer<QString>(nullptr)
+			: !_frequentUsers.empty()
+			? tr::lng_settings_top_peers_title()
+			: tr::lng_contacts_header()))
+, _frequentOptions(
+	MakeCustomList(
+		session,
+		[=](not_null<PeerListController*> controller) {
+			for (const auto &user : _frequentUsers) {
+				controller->delegate()->peerListAppendRow(
+					std::make_unique<PeerRow>(user));
+			}
+			controller->delegate()->peerListRefreshRows();
+		},
+		_pick,
+		_frequentUsers.empty()
+			? rpl::producer<QString>(nullptr)
+			: tr::lng_contacts_header(),
+		st::defaultVerticalListSkip / 4)) {
+	setStyleOverrides(&st::peerListSmallSkips);
+}
+
+void Controller::rowRightActionClicked(not_null<PeerListRow*> row) {
+	delegate()->peerListShowRowMenu(row, true);
+}
+
+base::unique_qptr<Ui::PopupMenu> Controller::rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	auto result = CreateRowContextMenu(parent, row->peer(), _pick);
+
+	if (result) {
+		// First clear _menu value, so that we don't check row positions yet.
+		base::take(_menu);
+
+		// Here unique_qptr is used like a shared pointer, where
+		// not the last destroyed pointer destroys the object, but the first.
+		_menu = base::unique_qptr<Ui::PopupMenu>(result.get());
+	}
+
+	return result;
+}
+
+void Controller::noSearchSubmit() {
+	for (const auto section : {
+			&_selfOption,
+			&_birthdayOptions,
+			&_frequentOptions
+		}) {
+		if (const auto onstack = section->activate) {
+			onstack();
+		}
+	}
+}
+
+bool Controller::overrideKeyboardNavigation(
+		int direction,
+		int from,
+		int to) {
+	if (direction == -1 && from == -1 && to == -1 && _skipUpDirectionSelect) {
+		return true;
+	}
+	_skipUpDirectionSelect = false;
+	const auto sections = std::array<CustomList*, 3>{
+		&_selfOption,
+		&_birthdayOptions,
+		&_frequentOptions,
+	};
+	const auto count = int(sections.size());
+	const auto selected = [&] {
+		for (auto i = 0; i != count; ++i) {
+			if (sections[i]->hasSelection && sections[i]->hasSelection()) {
+				return i;
+			}
+		}
+		return -1;
+	}();
+	if (direction > 0) {
+		if (selected < 0) {
+			return sections.front()->overrideKey(direction, from, to);
+		}
+		if (sections[selected]->overrideKey(direction, from, to)) {
+			return true;
+		}
+		for (auto i = selected + 1; i != count; ++i) {
+			if (sections[i]->overrideKey(direction, from, to)
+				&& sections[i]->hasSelection()) {
+				return true;
+			}
+		}
+		return false;
+	} else if (direction < 0) {
+		if (selected < 0) {
+			return sections.back()->overrideKey(direction, from, to);
+		}
+		if (sections[selected]->overrideKey(direction, from, to)) {
+			_skipUpDirectionSelect = sections[selected]->hasSelection();
+			return true;
+		}
+		for (auto i = selected - 1; i >= 0; --i) {
+			sections[i]->overrideKey(direction, from, to);
+			if (sections[i]->hasSelection()) {
+				_skipUpDirectionSelect = true;
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+std::unique_ptr<PeerListRow> Controller::createRow(
+		not_null<UserData*> user) {
+	if (const auto birthday
+			= user->session().promoSuggestions().knownContactBirthdays()) {
+		if (ranges::contains(*birthday, peerToUser(user->id))) {
+			return nullptr;
+		}
+	}
+	if (ranges::contains(_frequentUsers, user)) {
+		return nullptr;
+	}
+	if (user->isSelf()
+		|| user->isBot()
+		|| user->isServiceUser()
+		|| user->isInaccessible()) {
+		return nullptr;
+	}
+	return std::make_unique<PeerRow>(user);
+}
+
+void Controller::prepareViewHook() {
+	auto list = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	list->add(std::move(_selfOption.content));
+	list->add(std::move(_birthdayOptions.content));
+	list->add(std::move(_frequentOptions.content));
+	delegate()->peerListSetAboveWidget(std::move(list));
+}
+
+rpl::producer<QString> Controller::searchPlaceholder() const {
+	return tr::lng_gift_recipient_search();
+}
+
+void Controller::rowClicked(not_null<PeerListRow*> row) {
+	_pick(row->peer(), PickType::Activate);
+}
+
+} // namespace
+
+std::vector<not_null<UserData*>> CollectGiftFrequentUsers(
+		not_null<Main::Session*> session,
+		const std::vector<UserId> &exclude) {
+	auto result = std::vector<not_null<UserData*>>();
+	for (const auto &peer : session->topPeers().list()) {
+		const auto user = peer->asUser();
+		if (!user
+			|| user->isSelf()
+			|| user->isBot()
+			|| user->isServiceUser()
+			|| user->isInaccessible()) {
+			continue;
+		}
+		if (ranges::contains(exclude, peerToUser(user->id))) {
+			continue;
+		}
+		result.push_back(user);
+	}
+	return result;
+}
+
+void ChooseStarGiftRecipient(
+		not_null<Window::SessionController*> window) {
+	const auto session = &window->session();
+	session->promoSuggestions().requestContactBirthdays([=] {
+		auto controller = std::make_unique<Controller>(
+			session,
+			[=](not_null<PeerData*> peer, PickType type) {
+				if (type == PickType::Activate) {
+					ShowStarGiftBox(window, peer);
+				} else if (type == PickType::SendMessage) {
+					using Way = Window::SectionShow::Way;
+					window->showPeerHistory(peer, Way::Forward);
+				} else if (type == PickType::OpenProfile) {
+					window->show(PrepareShortInfoBox(peer, window));
+				}
+			});
+		const auto controllerRaw = controller.get();
+		auto initBox = [=](not_null<PeerListBox*> box) {
+			box->setTitle(tr::lng_gift_premium_or_stars());
+			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+
+			box->noSearchSubmits() | rpl::on_next([=] {
+				controllerRaw->noSearchSubmit();
+			}, box->lifetime());
+		};
+		window->show(
+			Box<PeerListBox>(std::move(controller), std::move(initBox)),
+			LayerOption::KeepOther);
+	});
+}
+
+void ShowStarGiftBox(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer) {
+	if (controller->showFrozenError()) {
+		return;
+	}
+
+	struct Session {
+		PeerData *peer = nullptr;
+		MyGiftsDescriptor my;
+		bool premiumGiftsReady = false;
+		bool starsGiftsReady = false;
+		bool fullReady = false;
+		bool myReady = false;
+
+		bool hasPremium = false;
+		bool hasUpgradable = false;
+		bool hasLimited = false;
+		bool hasUnlimited = false;
+
+		rpl::lifetime lifetime;
+
+		[[nodiscard]] bool ready() const {
+			return premiumGiftsReady
+				&& starsGiftsReady
+				&& fullReady
+				&& myReady;
+		}
+	};
+	static auto Map = base::flat_map<not_null<Main::Session*>, Session>();
+
+	const auto session = &controller->session();
+	auto i = Map.find(session);
+	if (i == end(Map)) {
+		i = Map.emplace(session).first;
+		session->lifetime().add([=] { Map.remove(session); });
+	} else if (i->second.peer == peer) {
+		return;
+	}
+	i->second = Session{ .peer = peer };
+
+	const auto weak = base::make_weak(controller);
+	const auto checkReady = [=] {
+		auto &entry = Map[session];
+		if (!entry.ready()) {
+			return;
+		}
+		auto was = std::move(entry);
+		entry = Session();
+		if (const auto strong = weak.get()) {
+			if (const auto user = peer->asUser(); user && !user->isSelf()) {
+				using Type = Api::DisallowedGiftType;
+				const auto disallowedTypes = user->disallowedGiftTypes();
+				const auto premium = (disallowedTypes & Type::Premium)
+					|| peer->isSelf();
+				const auto limited = (disallowedTypes & Type::Limited);
+				const auto unlimited = (disallowedTypes & Type::Unlimited);
+				const auto unique = (disallowedTypes & Type::Unique);
+				if ((unique || (!was.hasUpgradable && was.my.list.empty()))
+					&& (premium || !was.hasPremium)
+					&& (limited || !was.hasLimited)
+					&& (unlimited || !was.hasUnlimited)) {
+					strong->showToast(
+						tr::lng_edit_privacy_gifts_restricted(tr::now));
+					return;
+				}
+			}
+			strong->show(Box(GiftBox, strong, peer, std::move(was.my)));
+		}
+	};
+
+	const auto user = peer->asUser();
+	if (user && !user->isSelf()) {
+		GiftsPremium(
+			session,
+			peer
+		) | rpl::on_next([=](PremiumGiftsDescriptor &&gifts) {
+			auto &entry = Map[session];
+			entry.premiumGiftsReady = true;
+			entry.hasPremium = !gifts.list.empty();
+			checkReady();
+		}, i->second.lifetime);
+	} else {
+		i->second.hasPremium = false;
+		i->second.premiumGiftsReady = true;
+	}
+
+	if (peer->isFullLoaded()) {
+		i->second.fullReady = true;
+	} else {
+		peer->updateFull();
+		peer->session().changes().peerUpdates(
+			peer,
+			Data::PeerUpdate::Flag::FullInfo
+		) | rpl::take(1) | rpl::on_next([=] {
+			auto &entry = Map[session];
+			entry.fullReady = true;
+			checkReady();
+		}, i->second.lifetime);
+	}
+
+	GiftsStars(
+		session,
+		peer
+	) | rpl::on_next([=](std::vector<GiftTypeStars> &&gifts) {
+		auto &entry = Map[session];
+		entry.starsGiftsReady = true;
+		for (const auto &gift : gifts) {
+			if (gift.info.limitedCount) {
+				entry.hasLimited = true;
+				if (gift.info.starsToUpgrade) {
+					entry.hasUpgradable = true;
+				}
+			} else {
+				entry.hasUnlimited = true;
+			}
+		}
+		checkReady();
+	}, i->second.lifetime);
+
+	Data::MyUniqueGiftsSlice(
+		session,
+		Data::MyUniqueType::OnlyOwned
+	) | rpl::on_next([=](MyGiftsDescriptor &&gifts) {
+		auto &entry = Map[session];
+		entry.my = std::move(gifts);
+		entry.myReady = true;
+		checkReady();
+	}, i->second.lifetime);
+}
+
+void AddWearGiftCover(
+		not_null<VerticalLayout*> container,
+		const Data::UniqueGift &data,
+		not_null<PeerData*> peer) {
+	const auto cover = container->add(object_ptr<RpWidget>(container));
+
+	const auto title = CreateChild<FlatLabel>(
+		cover,
+		rpl::single(peer->name()),
+		st::uniqueGiftTitle);
+	title->setTextColorOverride(QColor(255, 255, 255));
+	const auto subtitle = CreateChild<FlatLabel>(
+		cover,
+		(peer->isChannel()
+			? tr::lng_chat_status_subscribers(
+				lt_count,
+				rpl::single(peer->asChannel()->membersCount() * 1.))
+			: tr::lng_status_online()),
+		st::uniqueGiftSubtitle);
+	subtitle->setTextColorOverride(data.backdrop.textColor);
+
+	struct State {
+		QImage gradient;
+		Data::UniqueGift gift;
+		Ui::PeerUserpicView view;
+		std::unique_ptr<Text::CustomEmoji> emoji;
+		base::flat_map<float64, QImage> emojis;
+		rpl::lifetime lifetime;
+	};
+	const auto state = cover->lifetime().make_state<State>(State{
+		.gift = data,
+	});
+	state->emoji = peer->owner().customEmojiManager().create(
+		state->gift.pattern.document,
+		[=] { cover->update(); },
+		Data::CustomEmojiSizeTag::Large);
+
+	cover->widthValue() | rpl::on_next([=](int width) {
+		const auto skip = st::uniqueGiftBottom;
+		if (width <= 3 * skip) {
+			return;
+		}
+		const auto available = width - 2 * skip;
+		title->resizeToWidth(available);
+		title->moveToLeft(skip, st::uniqueGiftTitleTop);
+
+		subtitle->resizeToWidth(available);
+		subtitle->moveToLeft(skip, st::uniqueGiftSubtitleTop);
+
+		cover->resize(width, subtitle->y() + subtitle->height() + skip);
+	}, cover->lifetime());
+
+	cover->paintRequest() | rpl::on_next([=] {
+		auto p = Painter(cover);
+
+		const auto width = cover->width();
+		const auto pointsHeight = st::uniqueGiftSubtitleTop;
+		const auto ratio = style::DevicePixelRatio();
+		if (state->gradient.size() != cover->size() * ratio) {
+			state->gradient = Ui::CreateTopBgGradient(
+				cover->size(),
+				state->gift);
+		}
+		p.drawImage(0, 0, state->gradient);
+
+		Ui::PaintBgPoints(
+			p,
+			Ui::PatternBgPoints(),
+			state->emojis,
+			state->emoji.get(),
+			state->gift,
+			QRect(0, 0, width, pointsHeight),
+			1.);
+
+		peer->paintUserpic(
+			p,
+			state->view,
+			(width - st::uniqueGiftUserpicSize) / 2,
+			st::uniqueGiftUserpicTop,
+			st::uniqueGiftUserpicSize);
+	}, cover->lifetime());
+}
+
+void AttachGiftSenderBadge(
+		not_null<GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> from,
+		const QDateTime &date,
+		bool crafted) {
+	const auto parent = box->getDelegate()->outerContainer();
+
+	const auto dateText = tr::bold(langDayOfMonth(date.date()));
+	const auto badge = CreateChild<FlatLabel>(
+		parent,
+		(from->isSelf()
+			? (crafted
+				? tr::lng_gift_unique_crafter_you
+				: tr::lng_gift_unique_sender_you)(
+					lt_date,
+					rpl::single(dateText),
+					tr::marked)
+			: tr::lng_gift_unique_sender(
+				lt_from,
+				rpl::single(tr::link(tr::bold(from->shortName()), 1)),
+				lt_date,
+				rpl::single(dateText),
+				tr::marked)),
+		st::uniqueGiftSenderBadge);
+
+	badge->paintOn([=](QPainter &p) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(st::radialBg);
+		p.setPen(Qt::NoPen);
+		const auto radius = badge->height() / 2.;
+		p.drawRoundedRect(badge->rect(), radius, radius);
+	});
+	badge->setLink(1, std::make_shared<LambdaClickHandler>([=] {
+		if (const auto window = show->resolveWindow()) {
+			window->showPeerHistory(from);
+		}
+	}));
+
+	auto widget = static_cast<QWidget*>(box);
+	while (widget->parentWidget() && widget->parentWidget() != parent) {
+		widget = widget->parentWidget();
+	}
+
+	const auto updateGeometry = [=] {
+		const auto outer = parent->rect();
+		const auto margin = st::msgServiceMargin;
+		const auto padding = st::msgServicePadding;
+		const auto available = outer.marginsRemoved(margin).width();
+		badge->resizeToWidth(std::min(
+			available - padding.left() - padding.right(),
+			badge->textMaxWidth()));
+		const auto inner = Ui::MapFrom(parent, box, box->rect());
+		const auto top = std::max(
+			inner.y() - badge->height() - margin.top(),
+			outer.y() + (margin.top() * 2));
+		const auto left = margin.left() + (available - badge->width()) / 2;
+		badge->move(left, top);
+	};
+	badge->naturalWidthValue(
+	) | rpl::on_next(updateGeometry, badge->lifetime());
+	for (auto w = static_cast<QWidget*>(box)
+		; w != widget
+		; w = w->parentWidget()) {
+		base::install_event_filter(w, [=](not_null<QEvent*> e) {
+			const auto type = e->type();
+			if (type == QEvent::Move || type == QEvent::Resize) {
+				PostponeCall(badge, updateGeometry);
+			}
+			return base::EventFilterResult::Continue;
+		}, badge->lifetime());
+	}
+
+	base::install_event_filter(widget, [=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type == QEvent::Show) {
+			badge->show();
+		} else if (type == QEvent::Hide) {
+			badge->hide();
+		} else if (type == QEvent::Move || type == QEvent::Resize) {
+			PostponeCall(badge, updateGeometry);
+		} else if (type == QEvent::ZOrderChange) {
+			PostponeCall(badge, [=] { badge->raise(); });
+		}
+		return base::EventFilterResult::Continue;
+	}, badge->lifetime());
+	badge->setVisible(!widget->isHidden());
+
+	base::install_event_filter(parent, [=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type == QEvent::ChildAdded) {
+			PostponeCall(badge, [=] { badge->raise(); });
+		} else if (e->type() == QEvent::Resize) {
+			PostponeCall(badge, updateGeometry);
+		}
+		return base::EventFilterResult::Continue;
+	}, badge->lifetime());
+	badge->raise();
+
+	box->boxClosing() | rpl::on_next([=] {
+		delete badge;
+	}, badge->lifetime());
+}
+
+void ShowUniqueGiftWearBox(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer,
+		const Data::UniqueGift &gift,
+		Settings::GiftWearBoxStyleOverride st) {
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		box->setNoContentMargin(true);
+
+		box->setWidth((st::boxWidth + st::boxWideWidth) / 2); // =)
+		box->setStyle(st.box ? *st.box : st::upgradeGiftBox);
+
+		const auto channel = peer->isChannel();
+		const auto content = box->verticalLayout();
+		AddWearGiftCover(content, gift, peer);
+
+		AddSkip(content, st::defaultVerticalListSkip * 2);
+
+		const auto infoRow = [&](
+				rpl::producer<QString> title,
+				rpl::producer<QString> text,
+				not_null<const style::icon*> icon) {
+			auto raw = content->add(
+				object_ptr<Ui::VerticalLayout>(content));
+			raw->add(
+				object_ptr<Ui::FlatLabel>(
+					raw,
+					std::move(title) | rpl::map(tr::bold),
+					st.infoTitle ? *st.infoTitle : st::defaultFlatLabel),
+				st::settingsPremiumRowTitlePadding);
+			raw->add(
+				object_ptr<Ui::FlatLabel>(
+					raw,
+					std::move(text),
+					st.infoAbout ? *st.infoAbout : st::upgradeGiftSubtext),
+				st::settingsPremiumRowAboutPadding);
+			object_ptr<Info::Profile::FloatingIcon>(
+				raw,
+				*icon,
+				st::starrefInfoIconPosition);
+		};
+
+		content->add(
+			object_ptr<Ui::FlatLabel>(
+				content,
+				tr::lng_gift_wear_title(
+					lt_name,
+					rpl::single(UniqueGiftName(gift))),
+				st.title ? *st.title : st::uniqueGiftTitle),
+			st::settingsPremiumRowTitlePadding,
+			style::al_top);
+		content->add(
+			object_ptr<Ui::FlatLabel>(
+				content,
+				tr::lng_gift_wear_about(),
+				st.subtitle ? *st.subtitle : st::uniqueGiftSubtitle),
+			st::settingsPremiumRowAboutPadding,
+			style::al_top);
+		infoRow(
+			tr::lng_gift_wear_badge_title(),
+			(channel
+				? tr::lng_gift_wear_badge_about_channel()
+				: tr::lng_gift_wear_badge_about()),
+			st.radiantIcon ? st.radiantIcon : &st::menuIconUnique);
+		infoRow(
+			tr::lng_gift_wear_design_title(),
+			(channel
+				? tr::lng_gift_wear_design_about_channel()
+				: tr::lng_gift_wear_design_about()),
+			st.profileIcon ? st.profileIcon : &st::menuIconUniqueProfile);
+		infoRow(
+			tr::lng_gift_wear_proof_title(),
+			(channel
+				? tr::lng_gift_wear_proof_about_channel()
+				: tr::lng_gift_wear_proof_about()),
+			st.proofIcon ? st.proofIcon : &st::menuIconFactcheck);
+
+		const auto session = &show->session();
+		const auto checking = std::make_shared<bool>();
+		const auto button = box->addButton(rpl::single(QString()), [=] {
+			const auto emojiStatuses = &session->data().emojiStatuses();
+			const auto id = emojiStatuses->fromUniqueGift(gift);
+			if (!peer->isSelf()) {
+				if (*checking) {
+					return;
+				}
+				*checking = true;
+				const auto weak = base::make_weak(box);
+				CheckBoostLevel(show, peer, [=](int level) {
+					const auto limits = Data::LevelLimits(&peer->session());
+					const auto wanted = limits.channelEmojiStatusLevelMin();
+					if (level >= wanted) {
+						if (const auto strong = weak.get()) {
+							strong->closeBox();
+						}
+						emojiStatuses->set(peer, id);
+						return std::optional<Ui::AskBoostReason>();
+					}
+					const auto reason = [&]() -> Ui::AskBoostReason {
+						return { Ui::AskBoostWearCollectible{
+							wanted
+						} };
+					}();
+					return std::make_optional(reason);
+				}, [=] { *checking = false; });
+			} else if (session->premium()) {
+				box->closeBox();
+				emojiStatuses->set(peer, id);
+			} else {
+				const auto link = tr::bold(
+					tr::lng_send_as_premium_required_link(tr::now));
+				Settings::ShowPremiumPromoToast(
+					show,
+					tr::lng_gift_wear_subscribe(
+						tr::now,
+						lt_link,
+						tr::link(link),
+						tr::marked),
+					u"wear_collectibles"_q);
+			}
+		});
+		const auto lock = Ui::Text::IconEmoji(&st::giftBoxLock);
+		auto label = rpl::combine(
+			tr::lng_gift_wear_start(),
+			Data::AmPremiumValue(&show->session())
+		) | rpl::map([=](const QString &text, bool premium) {
+			auto result = TextWithEntities();
+			if (!premium && peer->isSelf()) {
+				result.append(lock);
+			}
+			result.append(text);
+			return result;
+		});
+		SetButtonMarkedLabel(
+			button,
+			std::move(label),
+			session,
+			st::creditsBoxButtonLabel,
+			&st::giftBox.button.textFg);
+		Ui::AddUniqueCloseButton(box);
+	}));
+}
+
+void PreloadUniqueGiftResellPrices(not_null<Main::Session*> session) {
+	const auto entry = ResalePrices(session);
+	const auto now = crl::now();
+	const auto makeRequest = entry->prices.empty()
+		|| (now - entry->lastReceived >= kResellPriceCacheLifetime);
+	if (!makeRequest || entry->requestLifetime) {
+		return;
+	}
+	const auto finish = [=] {
+		entry->requestLifetime.destroy();
+		entry->lastReceived = crl::now();
+		for (const auto &callback : base::take(entry->waiting)) {
+			callback();
+		}
+	};
+	entry->requestLifetime = entry->api->requestStarGifts(
+	) | rpl::on_error_done(finish, [=] {
+		const auto &gifts = entry->api->starGifts();
+		entry->prices.reserve(gifts.size());
+		for (auto &gift : gifts) {
+			if (!gift.resellTitle.isEmpty() && gift.starsResellMin > 0) {
+				entry->prices[gift.resellTitle] = gift.starsResellMin;
+			}
+		}
+		finish();
+	});
+}
+
+void InvokeWithUniqueGiftResellPrice(
+		not_null<Main::Session*> session,
+		const QString &title,
+		Fn<void(int)> callback) {
+	PreloadUniqueGiftResellPrices(session);
+
+	const auto finish = [=] {
+		const auto entry = ResalePrices(session);
+		Assert(entry->lastReceived != 0);
+
+		const auto i = entry->prices.find(title);
+		callback((i != end(entry->prices)) ? i->second : 0);
+	};
+	const auto entry = ResalePrices(session);
+	if (entry->lastReceived) {
+		finish();
+	} else {
+		entry->waiting.push_back(finish);
+	}
+}
+
+void UpdateGiftSellPrice(
+		std::shared_ptr<ChatHelpers::Show> show,
+		std::shared_ptr<Data::UniqueGift> unique,
+		Data::SavedStarGiftId savedId,
+		CreditsAmount price) {
+	const auto wasOnResale = (unique->starsForResale > 0);
+	const auto session = &show->session();
+	session->api().request(MTPpayments_UpdateStarGiftPrice(
+		Api::InputSavedStarGiftId(savedId, unique),
+		(price
+			? StarsAmountToTL(price)
+			: MTP_starsAmount(MTP_long(0), MTP_int(0)))
+	)).done([=](const MTPUpdates &result) {
+		session->api().applyUpdates(result);
+		show->showToast((!price
+			? tr::lng_gift_sell_removed
+			: wasOnResale
+			? tr::lng_gift_sell_updated
+			: tr::lng_gift_sell_toast)(
+				tr::now,
+				lt_name,
+				Data::UniqueGiftName(*unique)));
+		const auto setStars = [&](CreditsAmount amount) {
+			unique->starsForResale = amount.whole();
+		};
+		const auto setTon = [&](CreditsAmount amount) {
+			unique->nanoTonForResale = amount.whole() * Ui::kNanosInOne
+				+ amount.nano();
+		};
+		if (!price) {
+			setStars({});
+			setTon({});
+			unique->onlyAcceptTon = false;
+		} else if (price.ton()) {
+			setStars(StarsFromTon(session, price));
+			setTon(price);
+			unique->onlyAcceptTon = true;
+		} else {
+			setStars(price);
+			setTon(TonFromStars(session, price));
+			unique->onlyAcceptTon = false;
+		}
+		session->data().notifyGiftUpdate({
+			.id = savedId,
+			.slug = unique->slug,
+			.action = Data::GiftUpdate::Action::ResaleChange,
+		});
+	}).fail([=](const MTP::Error &error) {
+		const auto earlyPrefix = u"STARGIFT_RESELL_TOO_EARLY_"_q;
+		const auto type = error.type();
+		if (type.startsWith(earlyPrefix)) {
+			const auto seconds = type.mid(earlyPrefix.size()).toInt();
+			const auto newAvailableAt = base::unixtime::now() + seconds;
+			unique->canResellAt = newAvailableAt;
+			ShowResaleGiftLater(show, unique);
+		} else if (!ShowGiftErrorToast(show, error)) {
+			show->showToast(type);
+		}
+	}).send();
+}
+
+void UniqueGiftSellBox(
+		not_null<Ui::GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
+		std::shared_ptr<Data::UniqueGift> unique,
+		Data::SavedStarGiftId savedId,
+		int price,
+		Settings::GiftWearBoxStyleOverride st) {
+	const auto session = &show->session();
+	const auto &appConfig = session->appConfig();
+	const auto starsMin = appConfig.giftResaleStarsMin();
+	const auto nanoTonMin = appConfig.giftResaleNanoTonMin();
+	const auto starsThousandths = appConfig.giftResaleStarsThousandths();
+	const auto nanoTonThousandths = appConfig.giftResaleNanoTonThousandths();
+
+	struct State {
+		rpl::variable<bool> onlyTon;
+		rpl::variable<CreditsAmount> price;
+		Fn<std::optional<CreditsAmount>()> computePrice;
+		rpl::event_stream<> errors;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	state->onlyTon = unique->onlyAcceptTon;
+	const auto priceNow = Data::UniqueGiftResaleAsked(*unique);
+	state->price = priceNow
+		? priceNow
+		: price
+		? CreditsAmount(price)
+		: CreditsAmount(starsMin);
+
+	box->setTitle(rpl::conditional(
+		state->onlyTon.value(),
+		tr::lng_gift_sell_title_ton(),
+		tr::lng_gift_sell_title()));
+	box->setStyle(st.box ? *st.box : st::upgradeGiftBox);
+	box->setWidth(st::boxWideWidth);
+
+	box->addTopButton(st.close ? *st.close : st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+	const auto name = Data::UniqueGiftName(*unique);
+	const auto slug = unique->slug;
+
+	const auto container = box->verticalLayout();
+	auto priceInput = HistoryView::AddStarsTonPriceInput(container, {
+		.session = session,
+		.showTon = state->onlyTon.value(),
+		.price = state->price.current(),
+		.starsMin = starsMin,
+		.starsMax = appConfig.giftResaleStarsMax(),
+		.nanoTonMin = nanoTonMin,
+		.nanoTonMax = appConfig.giftResaleNanoTonMax(),
+		.allowEmpty = true,
+	});
+	state->price = std::move(priceInput.result);
+	state->computePrice = std::move(priceInput.computeResult);
+	box->setFocusCallback(std::move(priceInput.focusCallback));
+
+	auto goods = rpl::merge(
+		rpl::single(rpl::empty) | rpl::map_to(true),
+		std::move(priceInput.updates) | rpl::map_to(true),
+		state->errors.events() | rpl::map_to(false)
+	) | rpl::start_spawning(box->lifetime());
+	auto text = rpl::duplicate(goods) | rpl::map([=](bool good) {
+		const auto value = state->computePrice();
+		const auto amount = value ? value->value() : 0.;
+		const auto tonMin = nanoTonMin / float64(Ui::kNanosInOne);
+		const auto enough = value
+			&& (amount >= (value->ton() ? tonMin : starsMin));
+		const auto receive = !value
+			? 0
+			: value->ton()
+			? ((amount * nanoTonThousandths) / 1000.)
+			: ((int64(amount) * starsThousandths) / 1000);
+		const auto thousandths = state->onlyTon.current()
+			? nanoTonThousandths
+			: starsThousandths;
+		return (!good || !value)
+			? (state->onlyTon.current()
+				? tr::lng_gift_sell_min_price_ton(
+					tr::now,
+					lt_count,
+					nanoTonMin / float64(Ui::kNanosInOne),
+					tr::rich)
+				: tr::lng_gift_sell_min_price(
+					tr::now,
+					lt_count,
+					starsMin,
+					tr::rich))
+			: enough
+			? (value->ton()
+				? tr::lng_gift_sell_amount_ton(
+					tr::now,
+					lt_count,
+					receive,
+					tr::rich)
+				: tr::lng_gift_sell_amount(
+					tr::now,
+					lt_count,
+					receive,
+					tr::rich))
+			: tr::lng_gift_sell_about(
+				tr::now,
+				lt_percent,
+				TextWithEntities{ u"%1%"_q.arg(thousandths / 10.) },
+				tr::rich);
+	});
+	const auto details = box->addRow(object_ptr<Ui::FlatLabel>(
+		box,
+		std::move(text) | rpl::after_next([=] {
+			box->verticalLayout()->resizeToWidth(box->width());
+		}),
+		st::boxLabel));
+
+	Ui::AddSkip(container);
+	Ui::AddSkip(container);
+	box->addRow(object_ptr<Ui::PlainShadow>(box));
+	Ui::AddSkip(container);
+	Ui::AddSkip(container);
+
+	const auto onlyTon = box->addRow(
+		object_ptr<Ui::Checkbox>(
+			box,
+			tr::lng_gift_sell_only_ton(tr::now),
+			state->onlyTon.current(),
+			st::defaultCheckbox));
+	state->onlyTon = onlyTon->checkedValue();
+
+	Ui::AddSkip(container);
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			container,
+			tr::lng_gift_sell_only_ton_about(tr::rich),
+			st::boxDividerLabel));
+	Ui::AddSkip(container);
+
+	rpl::duplicate(goods) | rpl::on_next([=](bool good) {
+		details->setTextColorOverride(
+			good ? st::windowSubTextFg->c : st::boxTextFgError->c);
+	}, details->lifetime());
+
+	const auto submit = [=] {
+		const auto value = state->computePrice();
+		if (!value) {
+			state->errors.fire({});
+			return;
+		}
+		box->closeBox();
+		UpdateGiftSellPrice(show, unique, savedId, *value);
+	};
+	std::move(
+		priceInput.submits
+	) | rpl::on_next(submit, details->lifetime());
+	auto submitText = priceNow
+		? tr::lng_gift_sell_update()
+		: tr::lng_gift_sell_put();
+	box->addButton(std::move(submitText), submit);
+}
+
+void ShowUniqueGiftSellBox(
+		std::shared_ptr<ChatHelpers::Show> show,
+		std::shared_ptr<Data::UniqueGift> unique,
+		Data::SavedStarGiftId savedId,
+		Settings::GiftWearBoxStyleOverride st) {
+	if (ShowResaleGiftLater(show, unique)) {
+		return;
+	}
+	const auto session = &show->session();
+	const auto &title = unique->title;
+	InvokeWithUniqueGiftResellPrice(session, title, [=](int price) {
+		show->show(Box(UniqueGiftSellBox, show, unique, savedId, price, st));
+	});
+}
+
+void SendOfferBuyGift(
+		std::shared_ptr<ChatHelpers::Show> show,
+		std::shared_ptr<Data::UniqueGift> unique,
+		SuggestOptions options,
+		int starsPerMessage,
+		Fn<void(bool)> done) {
+	const auto randomId = base::RandomValue<uint64>();
+	const auto owner = show->session().data().peer(unique->ownerId);
+
+	using Flag = MTPpayments_SendStarGiftOffer::Flag;
+	show->session().api().request(MTPpayments_SendStarGiftOffer(
+		MTP_flags(starsPerMessage ? Flag::f_allow_paid_stars : Flag()),
+		owner->input(),
+		MTP_string(unique->slug),
+		StarsAmountToTL(options.price()),
+		MTP_int(options.offerDuration),
+		MTP_long(randomId),
+		MTP_long(starsPerMessage)
+	)).done([=](const MTPUpdates &result) {
+		show->session().api().applyUpdates(result);
+		done(true);
+	}).fail([=](const MTP::Error &error) {
+		const auto type = error.type();
+		if (type == u""_q) {
+		} else if (!ShowGiftErrorToast(show, error)) {
+			show->showToast(type);
+		}
+		done(false);
+	}).send();
+}
+
+void ConfirmOfferBuyGift(
+		std::shared_ptr<ChatHelpers::Show> show,
+		std::shared_ptr<Data::UniqueGift> unique,
+		SuggestOptions options,
+		Fn<void()> done) {
+	const auto owner = show->session().data().peer(unique->ownerId);
+	const auto fee = owner->starsPerMessageChecked();
+	const auto price = options.price();
+	const auto sent = std::make_shared<bool>();
+	const auto send = [=](Fn<void()> close) {
+		if (*sent) {
+			return;
+		}
+		*sent = true;
+		SendOfferBuyGift(show, unique, options, fee, [=](bool ok) {
+			*sent = false;
+			if (ok) {
+				if (const auto window = show->resolveWindow()) {
+					window->showPeerHistory(owner->id);
+				}
+				done();
+				close();
+			}
+		});
+	};
+
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		Ui::ConfirmBox(box, {
+			.text = tr::lng_gift_offer_confirm_text(
+				tr::now,
+				lt_cost,
+				tr::bold(PrepareCreditsAmountText(options.price())),
+				lt_user,
+				tr::bold(owner->shortName()),
+				lt_name,
+				tr::bold(Data::UniqueGiftName(*unique)),
+				tr::marked),
+			.confirmed = send,
+			.confirmText = tr::lng_payments_pay_amount(
+				tr::now,
+				lt_amount,
+				Ui::Text::IconEmoji(price.ton()
+					? &st::buttonTonIconEmoji
+					: &st::buttonStarIconEmoji
+				).append(Lang::FormatCreditsAmountDecimal(price.ton()
+					? price
+					: CreditsAmount(price.whole() + fee))),
+				tr::marked),
+			.title = tr::lng_gift_offer_confirm_title(),
+		});
+
+		auto helper = Ui::Text::CustomEmojiHelper();
+		const auto starIcon = helper.paletteDependent(
+			Ui::Earn::IconCreditsEmoji());
+		const auto tonIcon = helper.paletteDependent(
+			Ui::Earn::IconCurrencyEmoji());
+		const auto context = helper.context();
+		const auto table = box->addRow(
+			object_ptr<Ui::TableLayout>(box, st::defaultTable),
+			st::boxPadding);
+		const auto add = [&](tr::phrase<> label, TextWithEntities value) {
+			table->addRow(
+				object_ptr<Ui::FlatLabel>(
+					table,
+					label(),
+					st::defaultTable.defaultLabel),
+				object_ptr<Ui::FlatLabel>(
+					table,
+					rpl::single(value),
+					st::defaultTable.defaultValue,
+					st::defaultPopupMenu,
+					context),
+				st::giveawayGiftCodeLabelMargin,
+				st::giveawayGiftCodeValueMargin);
+		};
+		add(tr::lng_gift_offer_table_offer, tr::marked(price.ton()
+			? tonIcon
+			: starIcon).append(Lang::FormatCreditsAmountDecimal(price)));
+		if (fee) {
+			add(tr::lng_gift_offer_table_fee, tr::marked(starIcon).append(
+				Lang::FormatCreditsAmountDecimal(CreditsAmount(fee))));
+		}
+		const auto hours = options.offerDuration / 3600;
+		const auto duration = hours
+			? tr::lng_hours(tr::now, lt_count, hours)
+			: tr::lng_minutes(tr::now, lt_count, options.offerDuration / 60);
+		add(tr::lng_gift_offer_table_duration, tr::marked(duration));
+	}));
+}
+
+void ShowOfferBuyBox(
+		std::shared_ptr<ChatHelpers::Show> show,
+		std::shared_ptr<Data::UniqueGift> unique) {
+	Expects(unique->starsMinOffer >= 0);
+
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
+	const auto done = [=](SuggestOptions result) {
+		ConfirmOfferBuyGift(show, unique, result, [=] {
+			if (const auto strong = weak->get()) {
+				strong->closeBox();
+			}
+		});
+	};
+	using namespace HistoryView;
+	const auto options = SuggestOptions{
+		.exists = 1,
+		.priceWhole = uint32(unique->starsMinOffer),
+	};
+	auto priceBox = Box(ChooseSuggestPriceBox, SuggestPriceBoxArgs{
+		.peer = show->session().data().peer(unique->ownerId),
+		.done = done,
+		.value = options,
+		.mode = SuggestMode::Gift,
+		.giftName = UniqueGiftName(*unique),
+	});
+	*weak = priceBox.data();
+	show->show(std::move(priceBox));
+}
+
+struct UpgradeArgs : StarGiftUpgradeArgs {
+	std::vector<Data::UniqueGiftModel> models;
+	std::vector<Data::UniqueGiftPattern> patterns;
+	std::vector<Data::UniqueGiftBackdrop> backdrops;
+	std::vector<UpgradePrice> prices;
+	std::vector<UpgradePrice> nextPrices;
+	Data::UniqueGiftAttributes all;
+};
+
+[[nodiscard]] rpl::producer<UniqueGiftCover> MakeUpgradeGiftStream(
+		const UpgradeArgs &args) {
+	if (args.models.empty()
+		|| args.patterns.empty()
+		|| args.backdrops.empty()) {
+		return rpl::never<UniqueGiftCover>();
+	}
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		struct State {
+			UpgradeArgs data;
+			std::vector<int> modelIndices;
+			std::vector<int> patternIndices;
+			std::vector<int> backdropIndices;
+		};
+		const auto state = lifetime.make_state<State>(State{
+			.data = args,
+		});
+
+		const auto put = [=] {
+			const auto index = [](std::vector<int> &indices, const auto &v) {
+				const auto fill = [&] {
+					if (!indices.empty()) {
+						return;
+					}
+					indices = ranges::views::ints(0) | ranges::views::take(
+						v.size()
+					) | ranges::to_vector;
+					ranges::shuffle(indices);
+				};
+				fill();
+				const auto result = indices.back();
+				indices.pop_back();
+				fill();
+				if (indices.back() == result) {
+					std::swap(indices.front(), indices.back());
+				}
+				return result;
+			};
+			auto &models = state->data.models;
+			auto &patterns = state->data.patterns;
+			auto &backdrops = state->data.backdrops;
+			consumer.put_next(UniqueGiftCover{ Data::UniqueGift{
+				.title = (state->data.savedId
+					? tr::lng_gift_upgrade_title(tr::now)
+					: tr::lng_gift_upgrade_preview_title(tr::now)),
+				.model = models[index(state->modelIndices, models)],
+				.pattern = patterns[index(state->patternIndices, patterns)],
+				.backdrop = backdrops[index(state->backdropIndices, backdrops)],
+			} });
+		};
+
+		put();
+		base::timer_each(
+			kSwitchUpgradeCoverInterval / 3
+		) | rpl::on_next(put, lifetime);
+
+		return lifetime;
+	};
+}
+
+void AddUpgradeGiftCover(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<VerticalLayout*> container,
+		const UpgradeArgs &args,
+		std::shared_ptr<Data::GiftUpgradeSpinner> upgradeSpinner,
+		rpl::producer<std::shared_ptr<Data::GiftUpgradeResult>> upgraded) {
+	struct State {
+		rpl::variable<std::shared_ptr<Data::GiftUpgradeResult>> upgraded;
+	};
+	const auto state = container->lifetime().make_state<State>();
+	state->upgraded = std::move(upgraded);
+
+	auto resalePrice = rpl::single(
+		CreditsAmount()
+	) | rpl::then(state->upgraded.changes(
+	) | rpl::map([=](std::shared_ptr<Data::GiftUpgradeResult> gift) {
+		return Settings::UniqueGiftResalePrice(gift->info.unique);
+	}) | rpl::flatten_latest());
+	auto resaleClick = [=] {
+		if (const auto upgraded = state->upgraded.current()) {
+			ShowUniqueGiftSellBox(
+				show,
+				upgraded->info.unique,
+				upgraded->manageId,
+				{});
+		}
+	};
+	auto gifts = state->upgraded.value(
+	) | rpl::map([=](std::shared_ptr<Data::GiftUpgradeResult> upgraded) {
+		return upgraded
+			? rpl::single(Ui::UniqueGiftCover{
+				.values = *upgraded->info.unique,
+				.spinner = true,
+			})
+			: MakeUpgradeGiftStream(args);
+	}) | rpl::flatten_latest();
+
+	auto emoji = tr::marked();
+	if (const auto &models = args.all.models; !models.empty()) {
+		const auto indices = RandomIndicesSubset(models.size(), 3);
+		for (const auto index : indices) {
+			auto single = Data::SingleCustomEmoji(models[index].document);
+			single.entities.front() = EntityInText(
+				single.entities.front().type(),
+				single.entities.front().offset(),
+				single.entities.front().length(),
+				u"scaled-custom:"_q + single.entities.front().data());
+			emoji.append(single).append(' ');
+		}
+	}
+
+	auto subtitle = state->upgraded.value(
+	) | rpl::map([=](std::shared_ptr<Data::GiftUpgradeResult> upgraded) {
+		return upgraded
+			? rpl::single(tr::marked())
+			: args.savedId
+			? (emoji.empty()
+				? tr::lng_gift_upgrade_about(tr::marked)
+				: tr::lng_gift_upgrade_view_all(
+					lt_emoji,
+					rpl::single(emoji),
+					lt_arrow,
+					rpl::single(Text::IconEmoji(&st::textMoreIconEmoji)),
+					tr::link))
+			: (args.peer->isBroadcast()
+				? tr::lng_gift_upgrade_preview_about_channel
+				: tr::lng_gift_upgrade_preview_about)(
+					lt_name,
+					rpl::single(tr::marked(args.peer->shortName())),
+					tr::marked);
+	}) | rpl::flatten_latest();
+	const auto hasAll = !args.all.models.empty();
+	const auto title = args.stargift.resellTitle;
+	const auto showAll = [=, list = args.all] {
+		const auto type = Data::GiftAttributeIdType::Model;
+		const auto null = nullptr;
+		show->show(Box(StarGiftPreviewBox, title, list, type, null));
+	};
+	auto numberText = state->upgraded.value(
+	) | rpl::map([](const std::shared_ptr<Data::GiftUpgradeResult> &v) {
+		return (v && v->info.unique && v->info.unique->number > 0)
+			? u"#"_q + Lang::FormatCountDecimal(v->info.unique->number)
+			: QString();
+	});
+	AddUniqueGiftCover(container, std::move(gifts), {
+		.numberText = std::move(numberText),
+		.subtitle = std::move(subtitle),
+		.subtitleClick = hasAll ? showAll : Fn<void()>(),
+		.subtitleLinkColored = hasAll,
+		.subtitleOutlined = hasAll,
+		.resalePrice = std::move(resalePrice),
+		.resaleClick = std::move(resaleClick),
+		.upgradeSpinner = upgradeSpinner,
+	});
+}
+
+Data::CreditsHistoryEntry EntryForUpgradedGift(
+		const std::shared_ptr<Data::GiftUpgradeResult> &gift,
+		uint64 nextToUpgradeStickerId,
+		Fn<void()> nextToUpgradeShow,
+		Fn<void()> craftAnother) {
+	Expects(gift != nullptr);
+
+	const auto unique = gift->info.unique;
+	const auto chatGiftPeer = gift->manageId.chat();
+	const auto selfId = gift->info.document->session().userPeerId();
+	return {
+		//.description = data.message,
+		.date = base::unixtime::parse(gift->date),
+		.credits = CreditsAmount(gift->info.stars),
+		.bareMsgId = uint64(gift->manageId.userMessageId().bare),
+		//.barePeerId = data.fromId.value,
+		.bareGiftStickerId = gift->info.document->id,
+		.bareGiftOwnerId = unique->ownerId.value,
+		.bareGiftHostId = unique->hostId.value,
+		//.bareActorId = data.fromId.value,
+		.bareEntryOwnerId = chatGiftPeer ? chatGiftPeer->id.value : 0,
+		.giftChannelSavedId = gift->manageId.chatSavedId(),
+		.stargiftId = gift->info.id,
+		.giftTitle = gift->info.resellTitle,
+		.uniqueGift = unique,
+		.nextToUpgradeStickerId = nextToUpgradeStickerId,
+		.nextToUpgradeShow = nextToUpgradeShow,
+		.craftAnotherCallback = craftAnother,
+		.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
+		.limitedCount = gift->info.limitedCount,
+		.limitedLeft = gift->info.limitedLeft,
+		.starsToUpgrade = int(gift->info.starsToUpgrade),
+		.starsForDetailsRemove = int(gift->starsForDetailsRemove),
+		.giftNumber = unique->number,
+		.converted = false,
+		.stargift = true,
+		.savedToProfile = gift->saved,
+		.in = (unique->ownerId == selfId),
+		.gift = true,
+	};
+}
+
+void SwitchToUpgradedAnimation(
+		not_null<Window::SessionController*> window,
+		std::shared_ptr<Data::GiftUpgradeResult> gift,
+		std::shared_ptr<Data::GiftUpgradeSpinner> spinner,
+		not_null<GenericBox*> box,
+		int contentStartIndex,
+		std::optional<Data::SavedStarGift> upgradeNext) {
+	Expects(gift != nullptr);
+	Expects(gift->info.unique != nullptr);
+
+	auto oldContent = QImage();
+	const auto content = box->verticalLayout();
+	const auto oldContentTill = content->height();
+	const auto oldContentFrom = (content->count() > contentStartIndex)
+		? content->widgetAt(contentStartIndex)->y()
+		: oldContentTill;
+	const auto oldContentHeight = oldContentTill - oldContentFrom;
+	if (oldContentHeight > 0) {
+		oldContent = GrabWidgetToImage(
+			content,
+			QRect(0, oldContentFrom, content->width(), oldContentHeight),
+			st::giveawayGiftCodeBox.bg->c);
+	}
+
+	box->setStyle(st::giveawayGiftCodeBox);
+	box->clearButtons();
+	box->addButton(tr::lng_create_group_skip(), [=] {
+		box->closeBox();
+	});
+
+	while (content->count() > contentStartIndex) {
+		delete content->widgetAt(contentStartIndex);
+	}
+
+	const auto show = window->uiShow();
+	const auto unique = gift->info.unique;
+	const auto nextToUpgradeStickerId = upgradeNext
+		? upgradeNext->info.document->id
+		: uint64();
+	const auto nextToUpgradeShow = upgradeNext
+		? [=] {
+			Settings::ShowSavedStarGiftBox(
+				window,
+				window->session().data().peer(unique->ownerId),
+				*upgradeNext);
+		}
+		: Fn<void()>();
+	const auto entry = EntryForUpgradedGift(
+		gift,
+		nextToUpgradeStickerId,
+		nextToUpgradeShow);
+	Settings::GenericCreditsEntryBody(box, show, entry, {}, spinner);
+
+	content->resizeToWidth(st::boxWideWidth);
+
+	const auto nowContentTill = content->height();
+	const auto nowContentFrom = (content->count() > contentStartIndex)
+		? content->widgetAt(contentStartIndex)->y()
+		: nowContentTill;
+	if (const auto height = nowContentTill - nowContentFrom; height > 0) {
+		const auto ratio = style::DevicePixelRatio();
+		const auto fadeOutSize = QSize(content->width(), height);
+		auto fadeOutImage = QImage(
+			fadeOutSize * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		fadeOutImage.fill(st::giveawayGiftCodeBox.bg->c);
+		if (oldContentHeight > 0) {
+			QPainter p(&fadeOutImage);
+			p.drawImage(0, 0, oldContent);
+		}
+		struct FadeOut {
+			RpWidget *widget = nullptr;
+			Animations::Simple animation;
+		};
+		const auto fadeOut = content->lifetime().make_state<FadeOut>();
+		fadeOut->widget = CreateChild<RpWidget>(content);
+		fadeOut->widget->show();
+		fadeOut->widget->setGeometry(
+			{ 0, nowContentFrom, content->width(), height });
+		fadeOut->widget->paintOn([=](QPainter &p) {
+			if (!fadeOut->animation.animating()) {
+				crl::on_main(fadeOut->widget, [widget = fadeOut->widget] {
+					delete widget;
+				});
+				return;
+			}
+			const auto progress = fadeOut->animation.value(1.);
+			p.setOpacity(1. - progress);
+
+			const auto shift = int(base::SafeRound(
+				st::defaultVerticalListSkip * progress));
+			if (shift > 0) {
+				p.fillRect(
+					QRect{ 0, 0, content->width(), shift },
+					st::giveawayGiftCodeBox.bg);
+			}
+			p.drawImage(0, shift, fadeOutImage);
+		});
+		fadeOut->animation.start([=] {
+			fadeOut->widget->update();
+		}, 0., 1., st::slideWrapDuration);
+	}
+}
+
+class UpgradePriceValue final {
+public:
+	UpgradePriceValue(
+		not_null<Main::Session*> session,
+		uint64 stargiftId,
+		int cost,
+		std::vector<UpgradePrice> all,
+		std::vector<UpgradePrice> next);
+
+	[[nodiscard]] int cost() const;
+	[[nodiscard]] rpl::producer<int> costValue() const;
+	[[nodiscard]] rpl::producer<TimeId> tillNextValue() const;
+
+private:
+	void update();
+	void refresh();
+
+	MTP::Sender _api;
+	uint64 _stargiftId = 0;
+	rpl::variable<int> _cost;
+	rpl::variable<TimeId> _tillNext;
+	std::vector<UpgradePrice> _all;
+	std::vector<UpgradePrice> _next;
+	base::Timer _timer;
+	bool _refreshing = false;
+	bool _finished = false;
+
+};
+
+UpgradePriceValue::UpgradePriceValue(
+	not_null<Main::Session*> session,
+	uint64 stargiftId,
+	int cost,
+	std::vector<UpgradePrice> all,
+	std::vector<UpgradePrice> next)
+: _api(&session->mtp())
+, _stargiftId(stargiftId)
+, _cost(cost)
+, _all(std::move(all))
+, _next(std::move(next))
+, _timer([=] { update(); })
+, _finished(_next.size() < 2) {
+	update();
+	_timer.callEach(1000);
+}
+
+int UpgradePriceValue::cost() const {
+	return _cost.current();
+}
+
+rpl::producer<int> UpgradePriceValue::costValue() const {
+	return _cost.value();
+}
+
+rpl::producer<TimeId> UpgradePriceValue::tillNextValue() const {
+	return _tillNext.value();
+}
+
+void UpgradePriceValue::update() {
+	if (_all.empty() || _next.empty()) {
+		_timer.cancel();
+		return;
+	}
+	const auto now = base::unixtime::now();
+	const auto i = ranges::upper_bound(
+		_all,
+		now,
+		ranges::less(),
+		&UpgradePrice::date);
+	const auto j = ranges::upper_bound(
+		_next,
+		now,
+		ranges::less(),
+		&UpgradePrice::date);
+	const auto full = (i == begin(_all)) ? i->stars : (i - 1)->stars;
+	const auto part = (j == begin(_next)) ? j->stars : (j - 1)->stars;
+	const auto fullDate = (i != end(_all)) ? i->date : TimeId();
+	const auto partDate = (j != end(_next)) ? j->date : TimeId();
+	_cost = std::min({ _cost.current(), part, full});
+	if (int(end(_next) - j) < 3) {
+		refresh();
+	}
+
+	const auto next = std::min({
+		partDate ? partDate : TimeId(INT_MAX),
+		fullDate ? fullDate : TimeId(INT_MAX),
+	});
+	if (next != TimeId(INT_MAX)) {
+		_tillNext = next - now;
+	} else {
+		_tillNext = 0;
+		_timer.cancel();
+	}
+}
+
+void UpgradePriceValue::refresh() {
+	if (_refreshing || _finished) {
+		return;
+	}
+	_api.request(MTPpayments_GetStarGiftUpgradePreview(
+		MTP_long(_stargiftId)
+	)).done([=](const MTPpayments_StarGiftUpgradePreview &result) {
+		const auto &data = result.data();
+		_all = ParsePrices(data.vprices());
+		_next = ParsePrices(data.vnext_prices());
+	}).fail([=] {
+		_finished = true;
+	}).send();
+}
+
+void PricesBox(
+		not_null<Ui::GenericBox*> box,
+		const std::vector<UpgradePrice> &list,
+		rpl::producer<int> cost) {
+	const auto top = box->setPinnedToTopContent(
+		object_ptr<Ui::VerticalLayout>(box));
+	box->setWidth(st::boxWideWidth);
+	box->setStyle(st::boostBox);
+
+	struct State {
+		rpl::variable<int> cost;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	state->cost = std::move(cost);
+	const auto min = list.back().stars;
+	const auto max = std::max(min + 2, list.front().stars);
+	const auto from = 0;
+	const auto till = max - min;
+
+	const auto addSkip = [&](int skip) {
+		top->add(object_ptr<Ui::FixedHeightWidget>(top, skip));
+	};
+
+	const auto ratio = [=](int current) {
+		current = std::clamp(current, from, till);
+		const auto count = (till - from);
+		const auto index = (current - from);
+		if (count <= 2) {
+			return 0.5;
+		}
+		const auto available = st::boxWideWidth
+			- st::boxPadding.left()
+			- st::boxPadding.right();
+		const auto average = available / float64(count);
+		const auto levelWidth = [&](int stars) {
+			return st::normalFont->width(Lang::FormatCountDecimal(stars));
+		};
+		const auto paddings = 2 * st::premiumLineTextSkip;
+		const auto labelLeftWidth = paddings + levelWidth(min);
+		const auto labelRightWidth = paddings + levelWidth(max);
+		const auto first = std::max(average, labelLeftWidth * 1.);
+		const auto last = std::max(average, labelRightWidth * 1.);
+		const auto other = (available - first - last) / (count - 2);
+		return (first + (index - 1) * other) / available;
+	};
+
+	auto bubbleRowState = state->cost.value(
+	) | rpl::map([=](int value) {
+		return Premium::BubbleRowState{
+			.counter = max - value,
+			.ratio = ratio(max - value),
+			.dynamic = true,
+		};
+	});
+	Premium::AddBubbleRow(
+		top,
+		st::starRatingBubble,
+		box->showFinishes(),
+		rpl::duplicate(bubbleRowState),
+		Ui::Premium::BubbleType::StarRating,
+		[=](int value) {
+			return Premium::BubbleText{
+				.counter = Lang::FormatCountDecimal(max - value),
+			};
+		},
+		&st::paidReactBubbleIcon,
+		st::boxRowPadding);
+	addSkip(st::premiumLineTextSkip);
+
+	auto limitState = std::move(
+		bubbleRowState
+	) | rpl::map([=](const Premium::BubbleRowState &state) {
+		return Premium::LimitRowState{
+			.ratio = state.ratio,
+			.dynamic = state.dynamic
+		};
+	});
+	auto left = rpl::single(Lang::FormatCountDecimal(max));
+	auto right = rpl::single(Lang::FormatCountDecimal(min));
+	Premium::AddLimitRow(
+		top,
+		st::upgradePriceLimits,
+		Premium::LimitRowLabels{
+			.leftLabel = std::move(left),
+			.rightLabel = std::move(right),
+			.activeLineBg = [=] { return st::windowBgActive->b; },
+		},
+		std::move(limitState),
+		st::boxRowPadding);
+
+	top->add(
+		object_ptr<Ui::FlatLabel>(
+			top,
+			tr::lng_gift_upgrade_prices_title(),
+			st::infoStarsTitle),
+		st::boxRowPadding + QMargins(0, st::boostTitleSkip / 2, 0, 0),
+		style::al_top);
+	top->add(
+		object_ptr<Ui::FlatLabel>(
+			top,
+			tr::lng_gift_upgrade_prices_subtitle(),
+			st::boostText),
+		(st::boxRowPadding
+			+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)),
+		style::al_top
+	)->setTryMakeSimilarLines(true);
+
+	auto helper = Ui::Text::CustomEmojiHelper();
+	const auto creditsIcon = helper.paletteDependent(
+		Ui::Earn::IconCreditsEmoji());
+	const auto context = helper.context();
+	const auto table = box->addRow(
+		object_ptr<Ui::TableLayout>(box, st::defaultTable),
+		st::boxPadding);
+	for (const auto &price : list) {
+		const auto parsed = base::unixtime::parse(price.date);
+		const auto time = QLocale().toString(
+			parsed.time(),
+			QLocale::ShortFormat);
+		const auto date = tr::lng_month_day(
+			tr::now,
+			lt_month,
+			Lang::MonthSmall(parsed.date().month())(tr::now),
+			lt_day,
+			QString::number(parsed.date().day()));
+		table->addRow(
+			object_ptr<Ui::FlatLabel>(
+				table,
+				time + u", "_q + date,
+				st::defaultTable.defaultLabel),
+			object_ptr<Ui::FlatLabel>(
+				table,
+				rpl::single(
+					base::duplicate(creditsIcon).append(' ').append(
+						Lang::FormatCountDecimal(price.stars))),
+				st::defaultTable.defaultValue,
+				st::defaultPopupMenu,
+				context),
+			st::giveawayGiftCodeLabelMargin,
+			st::giveawayGiftCodeValueMargin);
+	}
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_gift_upgrade_prices_about(),
+			st::resalePriceAbout),
+		style::al_top);
+	box->addSkip(st::boxPadding.top());
+
+	box->setMaxHeight(st::boxWideWidth);
+
+	box->addButton(rpl::single(QString()), [=] {
+		box->closeBox();
+	})->setText(rpl::single(Ui::Text::IconEmoji(
+		&st::infoStarsUnderstood
+	).append(' ').append(tr::lng_stars_rating_understood(tr::now))));
+}
+
+void UpgradeBox(
+		not_null<GenericBox*> box,
+		not_null<Window::SessionController*> controller,
+		UpgradeArgs &&args) {
+	struct State {
+		base::Timer timer;
+		std::unique_ptr<UpgradePriceValue> cost;
+		rpl::variable<bool> upgrading = false;
+		rpl::event_stream<std::shared_ptr<Data::GiftUpgradeResult>> upgraded;
+		Ui::FlatLabel *pricesLink = nullptr;
+		bool preserveDetails = false;
+		bool sent = false;
+	};
+	const auto state = std::make_shared<State>();
+
+	box->setNoContentMargin(true);
+	box->setWidth(st::boxWideWidth);
+
+	const auto show = controller->uiShow();
+	const auto container = box->verticalLayout();
+	const auto spinner = std::make_shared<Data::GiftUpgradeSpinner>();
+	spinner->attributes = Data::UniqueGiftAttributes{
+		.models = args.models,
+		.backdrops = args.backdrops,
+		.patterns = args.patterns,
+	};
+
+	AddUpgradeGiftCover(
+		show,
+		container,
+		args,
+		spinner,
+		state->upgraded.events());
+	const auto contentIndex = container->count();
+
+	AddSkip(container, st::defaultVerticalListSkip * 2);
+
+	const auto features = std::vector<Ui::FeatureListEntry>{
+		{
+			st::menuIconUnique,
+			tr::lng_gift_upgrade_unique_title(tr::now),
+			(args.savedId
+				? tr::lng_gift_upgrade_unique_about(tr::now, tr::marked)
+				: (args.peer->isBroadcast()
+					? tr::lng_gift_upgrade_unique_about_channel
+					: tr::lng_gift_upgrade_unique_about_user)(
+						tr::now,
+						lt_name,
+						tr::marked(args.peer->shortName()),
+						tr::marked)),
+		},
+		{
+			st::menuIconReplace,
+			tr::lng_gift_upgrade_transferable_title(tr::now),
+			(args.savedId
+				? tr::lng_gift_upgrade_transferable_about(
+					tr::now,
+					tr::marked)
+				: (args.peer->isBroadcast()
+					? tr::lng_gift_upgrade_transferable_about_channel
+					: tr::lng_gift_upgrade_transferable_about_user)(
+						tr::now,
+						lt_name,
+						tr::marked(args.peer->shortName()),
+						tr::marked)),
+		},
+		{
+			st::menuIconTradable,
+			tr::lng_gift_upgrade_tradable_title(tr::now),
+			(args.savedId
+				? tr::lng_gift_upgrade_tradable_about(tr::now, tr::marked)
+				: (args.peer->isBroadcast()
+					? tr::lng_gift_upgrade_tradable_about_channel
+					: tr::lng_gift_upgrade_tradable_about_user)(
+						tr::now,
+						lt_name,
+						tr::marked(args.peer->shortName()),
+						tr::marked)),
+		},
+	};
+	for (const auto &feature : features) {
+		container->add(
+			Ui::MakeFeatureListEntry(container, feature),
+			st::boxRowPadding);
+	}
+
+	const auto gifting = !args.savedId
+		&& !args.giftPrepayUpgradeHash.isEmpty();
+	const auto preview = !args.savedId && !gifting;
+	const auto showPrices = !preview
+		&& (args.cost > 0)
+		&& (args.prices.size() > 1)
+		&& (args.nextPrices.size() > 1);
+	auto prices = args.prices;
+	state->cost = std::make_unique<UpgradePriceValue>(
+		&controller->session(),
+		args.stargift.id,
+		args.cost,
+		std::move(args.prices),
+		std::move(args.nextPrices));
+	if (!preview && !gifting) {
+		const auto skip = st::defaultVerticalListSkip;
+		container->add(
+			object_ptr<PlainShadow>(container),
+			st::boxRowPadding + QMargins(0, skip, 0, skip));
+		const auto checkbox = container->add(
+			object_ptr<Checkbox>(
+				container,
+				(args.canAddComment
+					? tr::lng_gift_upgrade_add_comment(tr::now)
+					: args.canAddSender
+					? tr::lng_gift_upgrade_add_sender(tr::now)
+					: args.canAddMyComment
+					? tr::lng_gift_upgrade_add_my_comment(tr::now)
+					: tr::lng_gift_upgrade_add_my(tr::now)),
+				args.addDetailsDefault),
+			st::defaultCheckbox.margin,
+			style::al_top);
+		checkbox->checkedValue() | rpl::on_next([=](bool checked) {
+			state->preserveDetails = checked;
+		}, checkbox->lifetime());
+	}
+
+	box->setStyle(preview
+		? st::giftBox
+		: showPrices
+		? st::upgradeGiftWithPricesBox
+		: st::upgradeGiftBox);
+	if (gifting) {
+		box->setWidth(st::boxWideWidth);
+	}
+	auto buttonText = preview ? tr::lng_box_ok() : rpl::single(QString());
+	const auto button = box->addButton(std::move(buttonText), [=] {
+		if (preview) {
+			box->closeBox();
+			return;
+		} else if (state->sent) {
+			return;
+		}
+		state->sent = true;
+		const auto weakBox = base::make_weak(box);
+		const auto session = &controller->session();
+		const auto weakWindow = base::make_weak(controller);
+		const auto cost = state->cost->cost();
+		const auto keepDetails = state->preserveDetails;
+		if (gifting) {
+			const auto done = [=](bool success) {
+				state->upgrading = false;
+				if (!success) {
+					state->sent = false;
+				} else {
+					if (const auto window = weakWindow.get()) {
+						window->showPeerHistory(args.peer);
+					}
+					if (const auto strong = weakBox.get()) {
+						strong->closeBox();
+					}
+				}
+			};
+			GiftUpgrade(
+				controller,
+				args.peer,
+				args.giftPrepayUpgradeHash,
+				cost,
+				done);
+		} else {
+			const auto done = [=](
+					bool success,
+					std::shared_ptr<Data::GiftUpgradeResult> gift) {
+				const auto ownerId = (gift && gift->info.unique)
+					? gift->info.unique->ownerId
+					: PeerId();
+				const auto owner = ownerId
+					? session->data().peer(ownerId).get()
+					: nullptr;
+				if (!success) {
+					if (weakBox) {
+						state->upgrading = false;
+						state->sent = false;
+					}
+				} else if (owner) {
+					using State = Data::GiftUpgradeSpinner::State;
+					if (const auto onstack = args.upgraded) {
+						onstack();
+					}
+					if (weakBox.get()) {
+						spinner->target = gift->info.unique;
+						spinner->state = State::Preparing;
+					}
+					if (weakWindow.get()) {
+						session->data().nextForUpgradeGiftRequest(
+							owner,
+							[=](std::optional<Data::SavedStarGift> next) {
+								if (const auto box = weakBox.get()) {
+									spinner->state.value() | rpl::filter(
+										rpl::mappers::_1 == State::Prepared
+									) | rpl::take(1) | rpl::on_next([=] {
+										state->upgrading = false;
+										state->upgraded.fire_copy(gift);
+
+										delete base::take(state->pricesLink);
+										SwitchToUpgradedAnimation(
+											weakWindow.get(),
+											gift,
+											spinner,
+											box,
+											contentIndex,
+											next);
+									}, box->lifetime());
+								} else if (const auto w = weakWindow.get()) {
+									ShowGiftUpgradedToast(
+										w,
+										session,
+										gift->info.unique);
+								}
+							});
+					}
+				} else {
+					if (const auto window = weakWindow.get()) {
+						window->showPeerHistory(args.peer);
+					}
+					if (const auto strong = weakBox.get()) {
+						strong->closeBox();
+					}
+				}
+			};
+			state->upgrading = true;
+			UpgradeGift(controller, args.savedId, keepDetails, cost, done);
+
+			//AssertIsDebug();
+			//const auto modelIndex = base::RandomIndex(args.models.size());
+			//const auto patternIndex = base::RandomIndex(args.patterns.size());
+			//const auto backdropIndex = base::RandomIndex(args.backdrops.size());
+			//const auto result = std::make_shared<Data::GiftUpgradeResult>(Data::GiftUpgradeResult{
+			//	.info = args.stargift,
+			//	.manageId = Data::SavedStarGiftId::User(123),
+			//	.date = base::unixtime::now(),
+			//	.starsForDetailsRemove = 119,
+			//	.saved = true,
+			//});
+			//result->info.unique = std::make_shared<Data::UniqueGift>(Data::UniqueGift{
+			//	.id = 1,
+			//	.initialGiftId = args.stargift.id,
+			//	.slug = u"hello_world"_q,
+			//	.title = u"Shard Test"_q,
+			//	.ownerId = session->userPeerId(),
+			//	.releasedBy = show->session().user(),
+			//	.model = args.models[modelIndex],
+			//	.pattern = args.patterns[patternIndex],
+			//	.backdrop = args.backdrops[backdropIndex],
+			//});
+			//base::call_delayed(3000, [=] {
+			//	done(true, result);
+			//});
+		}
+	});
+	if (!preview) {
+		using namespace Info::Statistics;
+		const auto loadingAnimation = InfiniteRadialAnimationWidget(
+			button,
+			st::giveawayGiftCodeStartButton.height / 2);
+		AddChildToWidgetCenter(button.data(), loadingAnimation);
+		loadingAnimation->showOn(state->upgrading.value());
+
+		auto costText = [=] {
+			return state->cost->costValue(
+			) | rpl::map([](int cost) {
+				if (!cost) {
+					return tr::lng_gift_upgrade_confirm(
+						tr::marked);
+				}
+				return tr::lng_gift_upgrade_button(
+					lt_price,
+					rpl::single(Ui::Text::IconEmoji(
+						&st::starIconEmoji
+					).append(Lang::FormatCreditsAmountDecimal(
+						CreditsAmount{ cost }))),
+					tr::marked);
+			}) | rpl::flatten_latest();
+		};
+		auto subtext = state->cost->tillNextValue(
+		) | rpl::map([](TimeId left) {
+			if (!left) {
+				return QString();
+			}
+			const auto hours = left / 3600;
+			const auto minutes = (left % 3600) / 60;
+			const auto seconds = left % 60;
+			const auto padded = [](int value) {
+				return u"%1"_q.arg(value, 2, 10, QChar('0'));
+			};
+			const auto text = hours
+				? u"%1:%2:%3"_q
+				.arg(hours).arg(padded(minutes)).arg(padded(seconds))
+				: u"%2:%3"_q.arg(padded(minutes)).arg(padded(seconds));
+			return tr::lng_gift_upgrade_decreases(tr::now, lt_time, text);
+		}) | rpl::map(tr::marked);
+		Ui::SetButtonTwoLabels(
+			button,
+			rpl::conditional(
+				state->upgrading.value(),
+				rpl::single(tr::marked()),
+				costText()),
+			rpl::conditional(
+				(showPrices
+					? state->upgrading.value()
+					: (rpl::single(true) | rpl::type_erased)),
+				rpl::single(tr::marked()),
+				std::move(subtext)),
+			st::resaleButtonTitle,
+			st::resaleButtonSubtitle);
+	}
+	if (showPrices) {
+		const auto link = state->pricesLink = Ui::CreateChild<Ui::FlatLabel>(
+			button->parentWidget(),
+			tr::lng_gift_upgrade_see_table(
+				lt_arrow,
+				rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+				[](QString text) { return tr::link(text); }),
+			st::resalePriceTableLink);
+		link->setTryMakeSimilarLines(true);
+		button->geometryValue() | rpl::on_next([=](QRect geometry) {
+			const auto outer = button->parentWidget()->height();
+			const auto top = geometry.y() + geometry.height();
+			const auto available = outer - top - st::boxRadius;
+			link->resizeToWidth(geometry.width());
+			link->move(geometry.x(), top + (available - link->height()) / 2);
+		}, link->lifetime());
+		link->setClickHandlerFilter([=, list = prices](const auto &...) {
+			controller->show(Box(PricesBox, list, state->cost->costValue()));
+			return false;
+		});
+	}
+
+	Ui::AddUniqueCloseButton(box);
+
+	spinner->state.value() | rpl::filter(
+		rpl::mappers::_1 == Data::GiftUpgradeSpinner::State::Finished
+	) | rpl::take(1) | rpl::on_next([=] {
+		Ui::StartFireworks(box->parentWidget());
+	}, box->lifetime());
+}
+
+void GetVariantsAndShowUpgradeBox(UpgradeArgs &&args) {
+	const auto weak = base::make_weak(args.controller);
+	const auto session = &args.peer->session();
+	const auto auctions = &session->giftAuctions();
+	const auto guard = base::make_weak(args.controller);
+	const auto done = crl::guard(args.controller, [](UpgradeArgs &&args) {
+		const auto onstack = args.ready;
+		const auto window = args.controller;
+		window->show(Box(UpgradeBox, window, std::move(args)));
+		if (onstack) {
+			onstack(true);
+		}
+	});
+	const auto giftId = args.stargift.id;
+	if (auto attributes = auctions->attributes(args.stargift.id)) {
+		args.all = std::move(*attributes);
+		done(std::move(args));
+	} else {
+		auctions->requestAttributes(giftId, crl::guard(guard, [=] {
+			auto copy = args;
+			copy.all = std::move(*auctions->attributes(giftId));
+			done(std::move(copy));
+		}));
+	}
+}
+
+void ShowStarGiftUpgradeBox(StarGiftUpgradeArgs &&args) {
+	const auto weak = base::make_weak(args.controller);
+	const auto session = &args.peer->session();
+	session->api().request(MTPpayments_GetStarGiftUpgradePreview(
+		MTP_long(args.stargift.id)
+	)).done([=](const MTPpayments_StarGiftUpgradePreview &result) {
+		const auto strong = weak.get();
+		if (!strong) {
+			if (const auto onstack = args.ready) {
+				onstack(false);
+			}
+			return;
+		}
+		const auto &data = result.data();
+		auto upgrade = UpgradeArgs{ args };
+		upgrade.prices = ParsePrices(data.vprices());
+		upgrade.nextPrices = ParsePrices(data.vnext_prices());
+		for (const auto &attribute : data.vsample_attributes().v) {
+			attribute.match([&](const MTPDstarGiftAttributeModel &data) {
+				upgrade.models.push_back(Api::FromTL(session, data));
+			}, [&](const MTPDstarGiftAttributePattern &data) {
+				upgrade.patterns.push_back(Api::FromTL(session, data));
+			}, [&](const MTPDstarGiftAttributeBackdrop &data) {
+				upgrade.backdrops.push_back(Api::FromTL(data));
+			}, [](const auto &) {});
+		}
+		GetVariantsAndShowUpgradeBox(std::move(upgrade));
+	}).fail([=](const MTP::Error &error) {
+		if (const auto strong = weak.get()) {
+			strong->showToast(error.type());
+		}
+		if (const auto onstack = args.ready) {
+			onstack(false);
+		}
+	}).send();
+}
+
+void SubmitStarsForm(
+		std::shared_ptr<Main::SessionShow> show,
+		MTPInputInvoice invoice,
+		uint64 formId,
+		uint64 price,
+		Fn<void(Payments::CheckoutResult, const MTPUpdates *)> done) {
+	const auto ready = [=](Settings::SmallBalanceResult result) {
+		SendStarsFormRequest(show, result, formId, invoice, done);
+	};
+	Settings::MaybeRequestBalanceIncrease(
+		show,
+		price,
+		Settings::SmallBalanceDeepLink{},
+		ready);
+}
+
+void SubmitTonForm(
+		std::shared_ptr<Main::SessionShow> show,
+		MTPInputInvoice invoice,
+		uint64 formId,
+		CreditsAmount ton,
+		Fn<void(Payments::CheckoutResult, const MTPUpdates *)> done) {
+	const auto ready = [=] {
+		SendStarsFormRequest(
+			show,
+			Settings::SmallBalanceResult::Already,
+			formId,
+			invoice,
+			done);
+	};
+	struct State {
+		rpl::lifetime lifetime;
+		bool success = false;
+	};
+	const auto state = std::make_shared<State>();
+
+	const auto session = &show->session();
+	session->credits().tonLoad();
+	session->credits().tonLoadedValue(
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
+		state->lifetime.destroy();
+
+		if (session->credits().tonBalance() < ton) {
+			show->show(Box(Ui::InsufficientTonBox, session, ton));
+		} else {
+			ready();
+		}
+	}, state->lifetime);
+}
+
+void RequestOurForm(
+	std::shared_ptr<Main::SessionShow> show,
+	MTPInputInvoice invoice,
+	Fn<void(
+		uint64 formId,
+		CreditsAmount price,
+		std::optional<Payments::CheckoutResult> failure)> done) {
+	const auto fail = [=](Payments::CheckoutResult failure) {
+		done(0, {}, failure);
+	};
+	show->session().api().request(MTPpayments_GetPaymentForm(
+		MTP_flags(0),
+		invoice,
+		MTPDataJSON() // theme_params
+	)).done([=](const MTPpayments_PaymentForm &result) {
+		result.match([&](const MTPDpayments_paymentFormStarGift &data) {
+			const auto &invoice = data.vinvoice().data();
+			const auto prices = invoice.vprices().v;
+			if (show->valid() && !prices.isEmpty()) {
+				const auto price = prices.front().data().vamount().v;
+				const auto currency = qs(invoice.vcurrency());
+				const auto amount = (currency == Ui::kCreditsCurrency)
+					? CreditsAmount(price)
+					: (currency == u"TON"_q)
+					? CreditsAmount(
+						price / Ui::kNanosInOne,
+						price % Ui::kNanosInOne,
+						CreditsType::Ton)
+					: std::optional<CreditsAmount>();
+				if (amount) {
+					done(data.vform_id().v, *amount, std::nullopt);
+				} else {
+					fail(Payments::CheckoutResult::Failed);
+				}
+			} else {
+				fail(Payments::CheckoutResult::Failed);
+			}
+		}, [&](const MTPDpayments_paymentFormStars &data) {
+			show->session().data().processUsers(data.vusers());
+			const auto currency = qs(data.vinvoice().data().vcurrency());
+			const auto &prices = data.vinvoice().data().vprices().v;
+			if (!prices.empty()) {
+				const auto price = prices.front().data().vamount().v;
+				const auto amount = (currency == Ui::kCreditsCurrency)
+					? CreditsAmount(price)
+					: (currency == u"TON"_q)
+					? CreditsAmount(
+						price / Ui::kNanosInOne,
+						price % Ui::kNanosInOne,
+						CreditsType::Ton)
+					: std::optional<CreditsAmount>();
+				if (amount) {
+					done(data.vform_id().v, *amount, std::nullopt);
+				} else {
+					fail(Payments::CheckoutResult::Failed);
+				}
+			} else {
+				fail(Payments::CheckoutResult::Failed);
+			}
+		}, [&](const auto &) {
+			fail(Payments::CheckoutResult::Failed);
+		});
+	}).fail([=](const MTP::Error &error) {
+		const auto type = error.type();
+		if (type == u"STARGIFT_EXPORT_IN_PROGRESS"_q) {
+			fail(Payments::CheckoutResult::Cancelled);
+		} else if (type == u"NO_PAYMENT_NEEDED"_q) {
+			fail(Payments::CheckoutResult::Free);
+		} else if (type == u"USER_DISALLOWED_STARGIFTS"_q) {
+			show->showToast(tr::lng_edit_privacy_gifts_restricted(tr::now));
+			fail(Payments::CheckoutResult::Cancelled);
+		} else {
+			if (!ShowGiftErrorToast(show, error)) {
+				show->showToast(type);
+			}
+			fail(Payments::CheckoutResult::Failed);
+		}
+	}).send();
+}
+
+void RequestStarsFormAndSubmit(
+		std::shared_ptr<Main::SessionShow> show,
+		MTPInputInvoice invoice,
+		Fn<void(Payments::CheckoutResult, const MTPUpdates *)> done) {
+	RequestOurForm(show, invoice, [=](
+			uint64 formId,
+			CreditsAmount price,
+			std::optional<Payments::CheckoutResult> failure) {
+		if (failure) {
+			done(*failure, nullptr);
+		} else if (!price.stars()) {
+			done(Payments::CheckoutResult::Failed, nullptr);
+		} else {
+			SubmitStarsForm(show, invoice, formId, price.whole(), done);
+		}
+	});
+}
+
+void ShowGiftTransferredToast(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<PeerData*> to,
+		const Data::UniqueGift &gift) {
+	show->showToast({
+		.title = tr::lng_gift_transferred_title(tr::now),
+		.text = tr::lng_gift_transferred_about(
+			tr::now,
+				lt_name,
+				tr::bold(Data::UniqueGiftName(gift)),
+				lt_recipient,
+				tr::bold(to->shortName()),
+				tr::marked),
+		.duration = kUpgradeDoneToastDuration,
+	});
+}
+
+bool ShowGiftErrorToast(
+		std::shared_ptr<Ui::Show> show,
+		const MTP::Error &error) {
+	if (error.type() == u"STARGIFT_ALREADY_BURNED"_q) {
+		show->showToast(tr::lng_gift_burned_message(tr::now));
+		return true;
+	}
+	return false;
+}
+
+CreditsAmount StarsFromTon(
+		not_null<Main::Session*> session,
+		CreditsAmount ton) {
+	const auto appConfig = &session->appConfig();
+	const auto starsRate = appConfig->starsSellRate() / 100.;
+	const auto tonRate = appConfig->currencySellRate();
+	if (!starsRate) {
+		return {};
+	}
+	const auto count = (ton.value() * tonRate) / starsRate;
+	return CreditsAmount(int(base::SafeRound(count)));
+}
+
+CreditsAmount TonFromStars(
+		not_null<Main::Session*> session,
+		CreditsAmount stars) {
+	const auto appConfig = &session->appConfig();
+	const auto starsRate = appConfig->starsSellRate() / 100.;
+	const auto tonRate = appConfig->currencySellRate();
+	if (!tonRate) {
+		return {};
+	}
+	const auto count = (stars.value() * starsRate) / tonRate;
+	const auto whole = int(std::floor(count));
+	const auto cents = int(base::SafeRound((count - whole) * 100));
+	return CreditsAmount(
+		whole,
+		cents * (Ui::kNanosInOne / 100),
+		CreditsType::Ton);
+}
+
+struct DefaultGiftHandlerState {
+	not_null<Window::SessionController*> window;
+	not_null<PeerData*> peer;
+	std::shared_ptr<Api::PremiumGiftCodeOptions> api;
+	std::shared_ptr<Data::UniqueGift> transferRequested;
+	uint64 resaleRequestingId = 0;
+	rpl::lifetime resaleLifetime;
+
+	base::has_weak_ptr guard;
+};
+
+void DefaultGiftHandler(
+		not_null<Window::SessionController*> window,
+		not_null<DefaultGiftHandlerState*> state,
+		Info::PeerGifts::GiftDescriptor descriptor) {
+	const auto star = std::get_if<GiftTypeStars>(&descriptor);
+	const auto send = crl::guard(&state->guard, [=] {
+		window->show(Box(
+			SendGiftBox,
+			window,
+			state->peer,
+			state->api,
+			descriptor,
+			nullptr));
+	});
+	const auto peer = state->peer;
+	const auto unique = star ? star->info.unique : nullptr;
+	const auto premiumNeeded = star && star->info.requirePremium;
+	if (unique && star->resale) {
+		window->show(Box(
+			Settings::GlobalStarGiftBox,
+			window->uiShow(),
+			star->info,
+			Settings::StarGiftResaleInfo{
+				.recipientId = peer->id,
+				.forceTon = star->forceTon,
+			},
+			Settings::CreditsEntryBoxStyleOverrides()));
+	} else if (unique && star->mine && !peer->isSelf()) {
+		if (ShowTransferGiftLater(window->uiShow(), unique)) {
+			return;
+		}
+		const auto done = [=] {
+			window->session().credits().load(true);
+			window->showPeerHistory(peer);
+		};
+		if (state->transferRequested == unique) {
+			return;
+		}
+		state->transferRequested = unique;
+		const auto savedId = star->transferId;
+		using Payments::CheckoutResult;
+		const auto formReady = [=](
+				uint64 formId,
+				CreditsAmount price,
+				std::optional<CheckoutResult> failure) {
+			state->transferRequested = nullptr;
+			if (!failure && !price.stars()) {
+				LOG(("API Error: Bad transfer invoice currenct."));
+			} else if (!failure
+				|| *failure == CheckoutResult::Free) {
+				unique->starsForTransfer = failure
+					? 0
+					: price.whole();
+				ShowTransferToBox(
+					window,
+					peer,
+					unique,
+					savedId,
+					done);
+			} else if (*failure == CheckoutResult::Cancelled) {
+				done();
+			}
+		};
+		RequestOurForm(
+			window->uiShow(),
+			MTP_inputInvoiceStarGiftTransfer(
+				Api::InputSavedStarGiftId(savedId, unique),
+				peer->input()),
+			formReady);
+	} else if (star && star->resale) {
+		const auto id = star->info.id;
+		if (state->resaleRequestingId == id) {
+			return;
+		}
+		state->resaleRequestingId = id;
+		state->resaleLifetime = ShowStarGiftResale(
+			window,
+			peer,
+			id,
+			star->info.resellTitle,
+			[=] { state->resaleRequestingId = 0; });
+	} else if (star && star->info.auction()) {
+		if (!IsSoldOut(star->info)
+			&& premiumNeeded
+			&& !peer->session().premium()) {
+			Settings::ShowPremiumGiftPremium(window, star->info);
+		} else {
+			const auto id = star->info.id;
+			if (state->resaleRequestingId == id) {
+				return;
+			}
+			state->resaleRequestingId = id;
+			state->resaleLifetime = ShowStarGiftAuction(
+				window,
+				peer,
+				id,
+				[=] { state->resaleRequestingId = 0; },
+				crl::guard(&state->guard, [=] {
+					state->resaleLifetime.destroy();
+				}));
+		}
+	} else if (star && IsSoldOut(star->info)) {
+		window->show(Box(SoldOutBox, window, *star));
+	} else if (premiumNeeded && !peer->session().premium()) {
+		Settings::ShowPremiumGiftPremium(window, star->info);
+	} else if (star
+		&& star->info.lockedUntilDate
+		&& star->info.lockedUntilDate > base::unixtime::now()) {
+		const auto ready = crl::guard(window, [=] {
+			if (premiumNeeded && !peer->session().premium()) {
+				Settings::ShowPremiumGiftPremium(
+					window,
+					v::get<GiftTypeStars>(descriptor).info);
+			} else {
+				send();
+			}
+		});
+		CheckMaybeGiftLocked(window, star->info.id, ready);
+	} else if (star
+			&& star->info.perUserTotal
+			&& !star->info.perUserRemains) {
+		window->showToast({
+			.text = tr::lng_gift_sent_finished(
+				tr::now,
+				lt_count,
+				star->info.perUserTotal,
+				tr::rich),
+		});
+	} else {
+		send();
+	}
+}
+
+object_ptr<RpWidget> MakeGiftsList(GiftsListArgs &&args) {
+	using namespace Info::PeerGifts;
+
+	auto result = object_ptr<VisibleRangeWidget>((QWidget*)nullptr);
+	const auto raw = result.data();
+
+	const auto mode = args.mode;
+	const auto peer = args.peer;
+	const auto window = args.window;
+	const auto session = &window->session();
+
+	Data::AmPremiumValue(session) | rpl::on_next([=] {
+		raw->update();
+	}, raw->lifetime());
+
+	struct State {
+		Delegate delegate;
+		DefaultGiftHandlerState handlerState;
+		std::vector<int> order;
+		std::vector<bool> validated;
+		std::vector<GiftDescriptor> list;
+		std::vector<std::unique_ptr<GiftButton>> buttons;
+		rpl::variable<VisibleRange> visibleRange;
+		bool sending = false;
+		int perRow = 1;
+	};
+	const auto buttonMode = (mode == GiftsListMode::Craft)
+		? GiftButtonMode::Craft
+		: (mode == GiftsListMode::CraftResale)
+		? GiftButtonMode::CraftResale
+		: GiftButtonMode::Full;
+	const auto state = raw->lifetime().make_state<State>(State{
+		.delegate = Delegate(session, buttonMode),
+		.handlerState = {
+			.window = window,
+			.peer = peer,
+		},
+	});
+	const auto single = state->delegate.buttonSize();
+	const auto shadow = st::defaultDropdownMenu.wrap.shadow;
+	const auto extend = shadow.extend;
+
+	const auto handler = args.handler
+		? args.handler
+		: crl::guard(raw, [=](const GiftDescriptor &descriptor) {
+			DefaultGiftHandler(window, &state->handlerState, descriptor);
+		});
+
+	auto &packs = session->giftBoxStickersPacks();
+	packs.updated() | rpl::on_next([=] {
+		for (const auto &button : state->buttons) {
+			if (const auto raw = button.get()) {
+				raw->update();
+			}
+		}
+	}, raw->lifetime());
+
+	const auto loadMore = args.loadMore;
+	const auto alreadySelected = args.selected;
+	const auto rebuild = [=] {
+		const auto width = st::boxWideWidth;
+		const auto padding = st::giftBoxPadding;
+		const auto available = width - padding.left() - padding.right();
+		const auto range = state->visibleRange.current();
+		const auto count = int(state->list.size());
+
+		auto &buttons = state->buttons;
+		if (buttons.size() < count) {
+			buttons.resize(count);
+		}
+		auto &validated = state->validated;
+		validated.resize(count);
+
+		auto x = padding.left();
+		auto y = padding.top();
+		const auto perRow = state->perRow;
+		const auto singlew = single.width() + st::giftBoxGiftSkip.x();
+		const auto singleh = single.height() + st::giftBoxGiftSkip.y();
+		const auto rangeFrom = range.top - y;
+		const auto rowFrom = std::max(rangeFrom, 0) / singleh;
+		const auto rangeTill = range.bottom - y + st::giftBoxGiftSkip.y();
+		const auto rowTill = (std::max(rangeTill, 0) + singleh - 1)
+			/ singleh;
+		Assert(rowTill >= rowFrom);
+		const auto first = rowFrom * perRow;
+		const auto last = std::min(rowTill * perRow, count);
+		auto checkedFrom = 0;
+		auto checkedTill = int(buttons.size());
+		const auto ensureButton = [&](int index) {
+			auto &button = buttons[index];
+			if (!button) {
+				validated[index] = false;
+				for (; checkedFrom != first; ++checkedFrom) {
+					if (buttons[checkedFrom]) {
+						button = std::move(buttons[checkedFrom]);
+						break;
+					}
+				}
+			}
+			if (!button) {
+				for (; checkedTill != last; ) {
+					--checkedTill;
+					if (buttons[checkedTill]) {
+						button = std::move(buttons[checkedTill]);
+						break;
+					}
+				}
+			}
+			if (!button) {
+				button = std::make_unique<GiftButton>(raw, &state->delegate);
+			}
+			const auto raw = button.get();
+			if (validated[index]) {
+				return;
+			}
+			raw->show();
+			validated[index] = true;
+			const auto &descriptor = state->list[state->order[index]];
+			if (mode == GiftsListMode::Craft) {
+				const auto already = ranges::contains(
+					alreadySelected,
+					v::get<GiftTypeStars>(descriptor).info.unique->slug,
+					&Data::UniqueGift::slug);
+				raw->toggleSelected(
+					already,
+					GiftSelectionMode::Inset,
+					anim::type::instant);
+				raw->setAttribute(Qt::WA_TransparentForMouseEvents, already);
+			}
+			raw->setDescriptor(descriptor, buttonMode);
+			raw->setClickedCallback([=] {
+				handler(descriptor);
+			});
+			raw->setGeometry(QRect(QPoint(x, y), single), extend);
+		};
+		y += rowFrom * singleh;
+		for (auto row = rowFrom; row != rowTill; ++row) {
+			for (auto col = 0; col != perRow; ++col) {
+				const auto index = row * perRow + col;
+				if (index >= count) {
+					break;
+				}
+				const auto last = !((col + 1) % perRow);
+				if (last) {
+					x = padding.left() + available - single.width();
+				}
+				ensureButton(index);
+				if (last) {
+					x = padding.left();
+					y += singleh;
+				} else {
+					x += singlew;
+				}
+			}
+		}
+		const auto till = std::min(int(buttons.size()), rowTill * perRow);
+		for (auto i = count; i < till; ++i) {
+			if (const auto button = buttons[i].get()) {
+				button->hide();
+			}
+		}
+
+		const auto page = range.bottom - range.top;
+		if (loadMore && page > 0 && range.bottom + page > raw->height()) {
+			loadMore();
+		}
+	};
+
+	state->visibleRange = raw->visibleRange();
+	state->visibleRange.value(
+	) | rpl::on_next(rebuild, raw->lifetime());
+
+	std::move(
+		args.gifts
+	) | rpl::on_next([=](const GiftsDescriptor &gifts) {
+		const auto width = st::boxWideWidth;
+		const auto padding = st::giftBoxPadding;
+		const auto available = width - padding.left() - padding.right();
+		state->perRow = available / single.width();
+		state->list = std::move(gifts.list);
+		state->handlerState.api = gifts.api;
+
+		const auto count = int(state->list.size());
+		state->order = ranges::views::ints
+			| ranges::views::take(count)
+			| ranges::to_vector;
+		state->validated.clear();
+
+		if (SortForBirthday(peer)) {
+			ranges::stable_partition(state->order, [&](int i) {
+				const auto &gift = state->list[i];
+				const auto stars = std::get_if<GiftTypeStars>(&gift);
+				return stars && stars->info.birthday && !stars->info.unique;
+			});
+		}
+
+		const auto rows = (count + state->perRow - 1) / state->perRow;
+		const auto height = padding.top()
+			+ (rows * single.height())
+			+ ((rows - 1) * st::giftBoxGiftSkip.y())
+			+ padding.bottom();
+		raw->resize(raw->width(), height);
+		rebuild();
+	}, raw->lifetime());
+
+	return result;
+}
+
+void SendGiftBox(
+		not_null<GenericBox*> box,
+		not_null<Window::SessionController*> window,
+		not_null<PeerData*> peer,
+		std::shared_ptr<Api::PremiumGiftCodeOptions> api,
+		const GiftDescriptor &descriptor,
+		rpl::producer<Data::GiftAuctionState> auctionState) {
+	const auto stars = std::get_if<GiftTypeStars>(&descriptor);
+	const auto auction = !!auctionState;
+	const auto limited = stars
+		&& (stars->info.limitedCount > stars->info.limitedLeft)
+		&& (stars->info.limitedLeft > 0);
+	const auto costToUpgrade = stars ? stars->info.starsToUpgrade : 0;
+	const auto user = peer->asUser();
+	const auto disallowed = user
+		? user->disallowedGiftTypes()
+		: Api::DisallowedGiftTypes();
+	const auto disallowLimited = !peer->isSelf()
+		&& (disallowed & Api::DisallowedGiftType::Limited);
+	const auto disallowUnique = !peer->isSelf()
+		&& (disallowed & Api::DisallowedGiftType::Unique);
+	box->setStyle((limited && !auction) ? st::giftLimitedBox : st::giftBox);
+	box->setWidth(st::boxWideWidth);
+	box->setTitle(tr::lng_gift_send_title());
+	box->addTopButton(st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+
+	const auto session = &window->session();
+
+	struct State {
+		rpl::variable<GiftSendDetails> details;
+		rpl::variable<bool> messageAllowed;
+		std::shared_ptr<Data::DocumentMedia> media;
+		rpl::variable<Data::GiftAuctionState> auction;
+		bool submitting = false;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	if (auctionState) {
+		state->auction = std::move(auctionState);
+	}
+	state->details = GiftSendDetails{
+		.descriptor = descriptor,
+		.randomId = base::RandomValue<uint64>(),
+		.upgraded = disallowLimited && (costToUpgrade > 0) && !disallowUnique,
+	};
+	peer->updateFull();
+	state->messageAllowed = peer->session().changes().peerFlagsValue(
+		peer,
+		Data::PeerUpdate::Flag::StarsPerMessage
+	) | rpl::map([=] {
+		return peer->starsPerMessageChecked() == 0;
+	});
+
+	auto cost = state->details.value(
+	) | rpl::map([](const GiftSendDetails &details) {
+		return v::match(details.descriptor, [&](const GiftTypePremium &data) {
+			const auto stars = (details.byStars && data.stars)
+				? data.stars
+				: (data.currency == kCreditsCurrency)
+				? data.cost
+				: 0;
+			if (stars) {
+				return CreditsEmojiSmall().append(
+					Lang::FormatCountDecimal(std::abs(stars)));
+			}
+			return TextWithEntities{
+				FillAmountAndCurrency(data.cost, data.currency),
+			};
+		}, [&](const GiftTypeStars &data) {
+			const auto amount = std::abs(data.info.stars)
+				+ (details.upgraded ? data.info.starsToUpgrade : 0);
+			return CreditsEmojiSmall().append(
+				Lang::FormatCountDecimal(amount));
+		});
+	});
+
+	const auto document = LookupGiftSticker(session, descriptor);
+	if ((state->media = document ? document->createMediaView() : nullptr)) {
+		state->media->checkStickerLarge();
+	}
+
+	const auto container = box->verticalLayout();
+	container->add(object_ptr<PreviewWrap>(
+		container,
+		peer,
+		state->details.value()));
+
+	const auto messageWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	messageWrap->toggleOn(state->messageAllowed.value());
+	messageWrap->finishAnimating();
+	const auto messageInner = messageWrap->entity();
+	const auto limit = StarGiftMessageLimit(session);
+	const auto text = AddPartInput(
+		window,
+		messageInner,
+		box->getDelegate()->outerContainer(),
+		tr::lng_gift_send_message(),
+		QString(),
+		limit);
+	text->changes() | rpl::on_next([=] {
+		auto now = state->details.current();
+		auto textWithTags = text->getTextWithAppliedMarkdown();
+		now.text = TextWithEntities{
+			std::move(textWithTags.text),
+			TextUtilities::ConvertTextTagsToEntities(textWithTags.tags)
+		};
+		state->details = std::move(now);
+	}, text->lifetime());
+
+	box->setFocusCallback([=] {
+		text->setFocusFast();
+	});
+
+	const auto allow = [=](not_null<DocumentData*> emoji) {
+		return true;
+	};
+	InitMessageFieldHandlers({
+		.session = session,
+		.show = window->uiShow(),
+		.field = text,
+		.customEmojiPaused = [=] {
+			using namespace Window;
+			return window->isGifPausedAtLeastFor(GifPauseReason::Layer);
+		},
+		.allowPremiumEmoji = allow,
+		.allowMarkdownTags = {
+			InputField::kTagBold,
+			InputField::kTagItalic,
+			InputField::kTagUnderline,
+			InputField::kTagStrikeOut,
+			InputField::kTagSpoiler,
+		}
+	});
+	Emoji::SuggestionsController::Init(
+		box->getDelegate()->outerContainer(),
+		text,
+		session,
+		{ .suggestCustomEmoji = true, .allowCustomWithoutPremium = allow });
+	if (stars) {
+		if (costToUpgrade > 0 && !peer->isSelf() && !disallowLimited && !disallowUnique) {
+			const auto stargiftInfo = stars->info;
+			const auto showing = std::make_shared<bool>();
+			AddDivider(container);
+			AddSkip(container);
+			AddUpgradeButton(container, costToUpgrade, peer, [=](bool on) {
+				auto now = state->details.current();
+				now.upgraded = on;
+				state->details = std::move(now);
+			}, [=] {
+				if (*showing) {
+					return;
+				}
+				*showing = true;
+				ShowStarGiftUpgradeBox({
+					.controller = window,
+					.stargift = stargiftInfo,
+					.ready = [=](bool) { *showing = false; },
+					.peer = peer,
+					.cost = int(costToUpgrade),
+				});
+			});
+		} else {
+			AddDivider(container);
+		}
+		AddSkip(container);
+		container->add(
+			object_ptr<SettingsButton>(
+				container,
+				tr::lng_gift_send_anonymous(),
+				st::settingsButtonNoIcon)
+		)->toggleOn(rpl::single(peer->isSelf()))->toggledValue(
+		) | rpl::on_next([=](bool toggled) {
+			auto now = state->details.current();
+			now.anonymous = toggled;
+			state->details = std::move(now);
+		}, container->lifetime());
+		AddSkip(container);
+	}
+	v::match(descriptor, [&](const GiftTypePremium &data) {
+		AddDividerText(messageInner, tr::lng_gift_send_premium_about(
+			lt_user,
+			rpl::single(peer->shortName())));
+
+		if (const auto byStars = data.stars) {
+			const auto star = Ui::Text::IconEmoji(&st::starIconEmojiColored);
+			AddSkip(container);
+			container->add(
+				object_ptr<SettingsButton>(
+					container,
+					tr::lng_gift_send_pay_with_stars(
+						lt_amount,
+						rpl::single(base::duplicate(star).append(Lang::FormatCountDecimal(byStars))),
+						tr::marked),
+						st::settingsButtonNoIcon)
+			)->toggleOn(rpl::single(false))->toggledValue(
+			) | rpl::on_next([=](bool toggled) {
+				auto now = state->details.current();
+				now.byStars = toggled;
+				state->details = std::move(now);
+			}, container->lifetime());
+			AddSkip(container);
+
+			const auto balance = AddDividerText(
+				container,
+				tr::lng_gift_send_stars_balance(
+					lt_amount,
+					peer->session().credits().balanceValue(
+					) | rpl::map([=](CreditsAmount amount) {
+						return base::duplicate(star).append(
+							Lang::FormatCreditsAmountDecimal(amount));
+					}),
+					lt_link,
+					tr::lng_gift_send_stars_balance_link(tr::link),
+					tr::marked));
+			struct State {
+				Settings::BuyStarsHandler buyStars;
+				rpl::variable<bool> loading;
+			};
+			const auto state = balance->lifetime().make_state<State>();
+			state->loading = state->buyStars.loadingValue();
+			balance->setClickHandlerFilter([=](const auto &...) {
+				if (!state->loading.current()) {
+					state->buyStars.handler(window->uiShow())();
+				}
+				return false;
+			});
+		}
+	}, [&](const GiftTypeStars &) {
+		AddDividerText(container, peer->isSelf()
+			? tr::lng_gift_send_anonymous_self()
+			: peer->isBroadcast()
+			? tr::lng_gift_send_anonymous_about_channel()
+			: rpl::conditional(
+				state->messageAllowed.value(),
+				tr::lng_gift_send_anonymous_about(
+					lt_user,
+					rpl::single(peer->shortName()),
+					lt_recipient,
+					rpl::single(peer->shortName())),
+				tr::lng_gift_send_anonymous_about_paid(
+					lt_user,
+					rpl::single(peer->shortName()),
+					lt_recipient,
+					rpl::single(peer->shortName()))));
+	});
+
+	const auto button = box->addButton(rpl::single(QString()), [=] {
+		if (state->submitting) {
+			return;
+		}
+		state->submitting = true;
+		auto details = state->details.current();
+		if (!state->messageAllowed.current()) {
+			details.text = {};
+		}
+		const auto stars = std::get_if<GiftTypeStars>(&details.descriptor);
+		if (stars && stars->info.auction()) {
+			const auto bidBox = window->show(MakeAuctionBidBox({
+				.peer = peer,
+				.show = window->uiShow(),
+				.state = state->auction.value(),
+				.details = std::make_unique<GiftSendDetails>(details),
+			}));
+			bidBox->boxClosing(
+			) | rpl::on_next([=] {
+				box->closeBox();
+			}, box->lifetime());
+			return;
+		}
+		const auto copy = state->media; // Let media outlive the box.
+		const auto weak = base::make_weak(box);
+		const auto done = [=](Payments::CheckoutResult result) {
+			if (result == Payments::CheckoutResult::Paid) {
+				if (details.byStars
+					|| v::is<GiftTypeStars>(details.descriptor)) {
+					window->session().credits().load(true);
+				}
+				const auto another = copy; // Let media outlive the box.
+				window->showPeerHistory(peer);
+				ShowSentToast(window, details.descriptor, details);
+			}
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		};
+		SendGift(window, peer, api, details, done);
+	});
+	if (limited) {
+		if (auction) {
+			const auto &now = state->auction.current();
+			const auto rounds = now.totalRounds;
+			const auto perRound = now.gift->auctionGiftsPerRound;
+			auto owned = object_ptr<Ui::FlatLabel>(
+				container,
+				rpl::single(tr::lng_auction_about_top_short(
+					tr::now,
+					lt_count,
+					perRound,
+					lt_bidders,
+					tr::lng_auction_about_top_bidders(
+						tr::now,
+						lt_count,
+						perRound,
+						tr::rich),
+					lt_link,
+					tr::lng_auction_text_link(
+						tr::now,
+						lt_arrow,
+						Text::IconEmoji(&st::textMoreIconEmoji),
+						tr::link),
+					tr::rich)),
+				st::defaultDividerLabel.label);
+			const auto label = owned.data();
+			const auto about = container->add(
+				object_ptr<Ui::DividerLabel>(
+					container,
+					std::move(owned),
+					st::defaultBoxDividerLabelPadding),
+				{ 0, st::giftLimitedBox.buttonPadding.top(), 0, 0 });
+			AddSoldLeftSlider(about, *stars, st::boxRowPadding);
+
+			const auto show = window->uiShow();
+			label->setClickHandlerFilter([=](const auto &...) {
+				show->show(Box(AuctionAboutBox, rounds, perRound, nullptr));
+				return false;
+			});
+		} else {
+			AddSoldLeftSlider(button, *stars);
+		}
+	}
+	if (stars && stars->info.auction()) {
+		SetAuctionButtonCountdownText(
+			button,
+			AuctionButtonCountdownType::Place,
+			state->auction.value());
+	} else {
+		SetButtonMarkedLabel(
+			button,
+			(peer->isSelf()
+				? tr::lng_gift_send_button_self
+				: tr::lng_gift_send_button)(
+					lt_cost,
+					std::move(cost),
+					tr::marked),
+			session,
+			st::creditsBoxButtonLabel,
+			&st::giftBox.button.textFg);
+	}
+}
+
+std::shared_ptr<Data::GiftUpgradeResult> FindUniqueGift(
+		not_null<Main::Session*> session,
+		const MTPUpdates &updates) {
+	auto result = std::shared_ptr<Data::GiftUpgradeResult>();
+	const auto checkAction = [&](const MTPDmessageService &message) {
+		const auto &action = message.vaction();
+		action.match([&](const MTPDmessageActionStarGiftUnique &data) {
+			if (const auto gift = Api::FromTL(session, data.vgift())) {
+				const auto to = data.vpeer()
+					? peerFromMTP(*data.vpeer())
+					: PeerId();
+				const auto service = data.vfrom_id()
+					&& session->data().peer(
+						peerFromMTP(*data.vfrom_id()))->isServiceUser();
+				const auto channel = (service && peerIsChannel(to))
+					? session->data().channel(peerToChannel(to)).get()
+					: nullptr;
+				const auto channelSavedId = channel
+					? data.vsaved_id().value_or_empty()
+					: uint64();
+				const auto realGiftMsgId = (peerIsUser(to) && data.vsaved_id())
+					? MsgId(data.vsaved_id().value_or_empty())
+					: MsgId(message.vid().v);
+
+				result = std::make_shared<Data::GiftUpgradeResult>(
+					Data::GiftUpgradeResult{
+						.info = *gift,
+						.manageId = (channel && channelSavedId)
+							? Data::SavedStarGiftId::Chat(
+								channel,
+								channelSavedId)
+							: Data::SavedStarGiftId::User(realGiftMsgId),
+						.date = message.vdate().v,
+						.starsForDetailsRemove = int(
+							data.vdrop_original_details_stars(
+							).value_or_empty()),
+						.saved = data.is_saved(),
+					});
+			}
+		}, [](const auto &) {});
+	};
+	updates.match([&](const MTPDupdates &data) {
+		for (const auto &update : data.vupdates().v) {
+			update.match([&](const MTPDupdateNewMessage &data) {
+				data.vmessage().match([&](const MTPDmessageService &data) {
+					checkAction(data);
+				}, [](const auto &) {});
+			}, [](const auto &) {});
+		}
+	}, [](const auto &) {});
+	return result;
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.h b/Telegram/SourceFiles/boxes/star_gift_box.h
index e1ae249a3dd4a0..76919971c7621a 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.h
+++ b/Telegram/SourceFiles/boxes/star_gift_box.h
@@ -7,17 +7,204 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "boxes/star_gift_cover_box.h"
+#include "data/data_peer_id.h"
+#include "data/data_star_gift.h"
+
+class UserData;
+
+namespace Api {
+class PremiumGiftCodeOptions;
+} // namespace Api
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Data {
+struct UniqueGift;
+struct GiftCode;
+struct CreditsHistoryEntry;
+class SavedStarGiftId;
+struct GiftAuctionState;
+} // namespace Data
+
+namespace Info::PeerGifts {
+struct GiftDescriptor;
+} // namespace Info::PeerGifts
+
+namespace Main {
+class Session;
+class SessionShow;
+} // namespace Main
+
+namespace Payments {
+enum class CheckoutResult;
+} // namespace Payments
+
+namespace MTP {
+class Error;
+} // namespace MTP
+
+namespace Settings {
+struct GiftWearBoxStyleOverride;
+struct CreditsEntryBoxStyleOverrides;
+} // namespace Settings
+
 namespace Window {
 class SessionController;
 } // namespace Window
 
+namespace Ui::Text {
+class CustomEmoji;
+} // namespace Ui::Text
+
 namespace Ui {
 
+class RpWidget;
+class PopupMenu;
+class GenericBox;
+class Show;
+class VerticalLayout;
+
 void ChooseStarGiftRecipient(
 	not_null<Window::SessionController*> controller);
 
+[[nodiscard]] std::vector<not_null<UserData*>> CollectGiftFrequentUsers(
+	not_null<Main::Session*> session,
+	const std::vector<UserId> &exclude = {});
+
 void ShowStarGiftBox(
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer);
 
+void AddWearGiftCover(
+	not_null<VerticalLayout*> container,
+	const Data::UniqueGift &data,
+	not_null<PeerData*> peer);
+
+void AttachGiftSenderBadge(
+	not_null<GenericBox*> box,
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<PeerData*> from,
+	const QDateTime &date,
+	bool crafted);
+
+void ShowUniqueGiftWearBox(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<PeerData*> peer,
+	const Data::UniqueGift &gift,
+	Settings::GiftWearBoxStyleOverride st);
+
+void PreloadUniqueGiftResellPrices(not_null<Main::Session*> session);
+
+void UpdateGiftSellPrice(
+	std::shared_ptr<ChatHelpers::Show> show,
+	std::shared_ptr<Data::UniqueGift> unique,
+	Data::SavedStarGiftId savedId,
+	CreditsAmount price);
+void ShowUniqueGiftSellBox(
+	std::shared_ptr<ChatHelpers::Show> show,
+	std::shared_ptr<Data::UniqueGift> unique,
+	Data::SavedStarGiftId savedId,
+	Settings::GiftWearBoxStyleOverride st);
+
+void ShowOfferBuyBox(
+	std::shared_ptr<ChatHelpers::Show> show,
+	std::shared_ptr<Data::UniqueGift> unique);
+
+struct StarGiftUpgradeArgs {
+	not_null<Window::SessionController*> controller;
+	Data::StarGift stargift;
+	Fn<void(bool)> ready;
+	Fn<void()> upgraded;
+	not_null<PeerData*> peer;
+	Data::SavedStarGiftId savedId;
+	QString giftPrepayUpgradeHash;
+	int cost = 0;
+	bool canAddSender = false;
+	bool canAddComment = false;
+	bool canAddMyComment = false;
+	bool addDetailsDefault = false;
+};
+void ShowStarGiftUpgradeBox(StarGiftUpgradeArgs &&args);
+
+void SubmitStarsForm(
+	std::shared_ptr<Main::SessionShow> show,
+	MTPInputInvoice invoice,
+	uint64 formId,
+	uint64 price,
+	Fn<void(Payments::CheckoutResult, const MTPUpdates *)> done);
+void SubmitTonForm(
+	std::shared_ptr<Main::SessionShow> show,
+	MTPInputInvoice invoice,
+	uint64 formId,
+	CreditsAmount ton,
+	Fn<void(Payments::CheckoutResult, const MTPUpdates *)> done);
+void RequestOurForm(
+	std::shared_ptr<Main::SessionShow> show,
+	MTPInputInvoice invoice,
+	Fn<void(
+		uint64 formId,
+		CreditsAmount price,
+		std::optional<Payments::CheckoutResult> failure)> done);
+void RequestStarsFormAndSubmit(
+	std::shared_ptr<Main::SessionShow> show,
+	MTPInputInvoice invoice,
+	Fn<void(Payments::CheckoutResult, const MTPUpdates *)> done);
+
+void ShowGiftTransferredToast(
+	std::shared_ptr<Main::SessionShow> show,
+	not_null<PeerData*> to,
+	const Data::UniqueGift &gift);
+
+[[nodiscard]] bool ShowGiftErrorToast(
+	std::shared_ptr<Ui::Show> show,
+	const MTP::Error &error);
+
+[[nodiscard]] CreditsAmount StarsFromTon(
+	not_null<Main::Session*> session,
+	CreditsAmount ton);
+[[nodiscard]] CreditsAmount TonFromStars(
+	not_null<Main::Session*> session,
+	CreditsAmount stars);
+
+struct GiftsDescriptor {
+	std::vector<Info::PeerGifts::GiftDescriptor> list;
+	std::shared_ptr<Api::PremiumGiftCodeOptions> api;
+};
+enum class GiftsListMode {
+	Send,
+	Craft,
+	CraftResale,
+};
+struct GiftsListArgs {
+	not_null<Window::SessionController*> window;
+	GiftsListMode mode = GiftsListMode::Send;
+	not_null<PeerData*> peer;
+	rpl::producer<GiftsDescriptor> gifts;
+	std::vector<std::shared_ptr<Data::UniqueGift>> selected;
+	Fn<void()> loadMore;
+	Fn<void(Info::PeerGifts::GiftDescriptor)> handler;
+};
+[[nodiscard]] object_ptr<RpWidget> MakeGiftsList(GiftsListArgs &&args);
+
+void SendGiftBox(
+	not_null<GenericBox*> box,
+	not_null<Window::SessionController*> window,
+	not_null<PeerData*> peer,
+	std::shared_ptr<Api::PremiumGiftCodeOptions> api,
+	const Info::PeerGifts::GiftDescriptor &descriptor,
+	rpl::producer<Data::GiftAuctionState> auctionState);
+
+[[nodiscard]] Data::CreditsHistoryEntry EntryForUpgradedGift(
+	const std::shared_ptr<Data::GiftUpgradeResult> &gift,
+	uint64 nextToUpgradeStickerId = 0,
+	Fn<void()> nextToUpgradeShow = nullptr,
+	Fn<void()> craftAnother = nullptr);
+
+[[nodiscard]] std::shared_ptr<Data::GiftUpgradeResult> FindUniqueGift(
+	not_null<Main::Session*> session,
+	const MTPUpdates &updates);
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_cover_box.cpp b/Telegram/SourceFiles/boxes/star_gift_cover_box.cpp
new file mode 100644
index 00000000000000..b38d1f48080cc0
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/star_gift_cover_box.cpp
@@ -0,0 +1,1348 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/star_gift_cover_box.h"
+
+#include "chat_helpers/stickers_lottie.h"
+#include "core/application.h"
+#include "core/ui_integration.h"
+#include "main/main_session.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "data/data_document.h"
+#include "data/data_file_origin.h"
+#include "data/data_document_media.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_common.h"
+#include "lottie/lottie_single_player.h"
+#include "ui/effects/premium_stars_colored.h"
+#include "ui/painter.h"
+#include "ui/text/format_values.h"
+#include "ui/top_background_gradient.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/widgets/labels.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
+#include "styles/style_chat.h"
+#include "styles/style_credits.h"
+#include "styles/style_giveaway.h"
+#include "styles/style_layers.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kCrossfadeDuration = crl::time(400);
+constexpr auto kGradientButtonBgOpacity = 0.6;
+
+constexpr auto kSpinnerBackdrops = 6;
+constexpr auto kSpinnerPatterns = 6;
+constexpr auto kSpinnerModels = 6;
+
+constexpr auto kBackdropSpinDuration = crl::time(300);
+constexpr auto kBackdropStopsAt = crl::time(2.5 * 1000);
+constexpr auto kPatternSpinDuration = crl::time(600);
+constexpr auto kPatternStopsAt = crl::time(4 * 1000);
+constexpr auto kModelSpinDuration = crl::time(160);
+constexpr auto kModelStopsAt = crl::time(5.5 * 1000);
+constexpr auto kModelScaleFrom = 0.7;
+
+struct AttributeSpin {
+	AttributeSpin(crl::time duration) : duration(duration) {
+	}
+
+	Animations::Simple animation;
+	crl::time duration = 0;
+	int wasIndex = -1;
+	int nowIndex = -1;
+	int willIndex = -1;
+
+	[[nodiscard]] float64 progress() const {
+		return animation.value(1.);
+	}
+	void startWithin(int count, Fn<void()> update) {
+		Expects(count > 0);
+
+		wasIndex = nowIndex;
+		nowIndex = willIndex;
+		willIndex = (willIndex < 0 ? 1 : (willIndex + 1)) % count;
+		animation.start(update, 0., 1., duration);
+	}
+	void startToTarget(Fn<void()> update, int slowdown = 1) {
+		if (willIndex != 0) {
+			wasIndex = nowIndex;
+			nowIndex = willIndex;
+			willIndex = 0;
+			animation.start(
+				update,
+				0.,
+				1.,
+				duration * 3 * slowdown,
+				anim::easeOutCubic);
+		}
+	}
+};
+
+struct Released {
+	Released() : link(QColor(255, 255, 255)) {
+	}
+
+	rpl::variable<TextWithEntities> subtitleText;
+	std::optional<Premium::ColoredMiniStars> stars;
+	style::owned_color link;
+	style::FlatLabel st;
+	rpl::variable<PeerData*> by;
+	base::unique_qptr<FlatLabel> subtitle;
+	base::unique_qptr<AbstractButton> subtitleButton;
+	rpl::variable<int> subtitleHeight;
+	rpl::variable<bool> subtitleCustom;
+	bool outlined = false;
+	QColor bg;
+	QColor fg;
+};
+
+} // namespace
+
+struct UniqueGiftCoverWidget::BackdropView {
+	Data::UniqueGiftBackdrop colors;
+	QImage gradient;
+};
+
+struct UniqueGiftCoverWidget::PatternView {
+	DocumentData *document = nullptr;
+	std::unique_ptr<Text::CustomEmoji> emoji;
+	base::flat_map<int, base::flat_map<float64, QImage>> emojis;
+};
+
+struct UniqueGiftCoverWidget::ModelView {
+	std::shared_ptr<Data::DocumentMedia> media;
+	std::unique_ptr<Lottie::SinglePlayer> lottie;
+	rpl::lifetime lifetime;
+};
+
+struct UniqueGiftCoverWidget::GiftView {
+	std::optional<Data::UniqueGift> gift;
+	BackdropView backdrop;
+	PatternView pattern;
+	ModelView model;
+	bool forced = false;
+};
+
+struct UniqueGiftCoverWidget::State {
+	std::shared_ptr<Data::GiftUpgradeSpinner> spinner;
+	Fn<void()> checkSpinnerStart;
+	GiftView now;
+	GiftView next;
+	Animations::Simple crossfade;
+	Animations::Simple heightAnimation;
+	std::vector<BackdropView> spinnerBackdrops;
+	std::vector<PatternView> spinnerPatterns;
+	std::vector<ModelView> spinnerModels;
+	AttributeSpin backdropSpin = kBackdropSpinDuration;
+	AttributeSpin patternSpin = kPatternSpinDuration;
+	AttributeSpin modelSpin = kModelSpinDuration;
+	crl::time spinStarted = 0;
+	int heightFinal = 0;
+	bool crossfading = false;
+	bool updateAttributesPending = false;
+
+	Released released;
+
+	FlatLabel *pretitle = nullptr;
+	FlatLabel *title = nullptr;
+	RpWidget *attrs = nullptr;
+
+	Fn<void(const Data::UniqueGift &)> updateAttrs;
+	Fn<void(float64)> updateColors;
+	Fn<void(const BackdropView &, const BackdropView &, float64)>
+		updateColorsFromBackdrops;
+	Fn<void(ModelView &, const Data::UniqueGiftModel &)> setupModel;
+	Fn<void(PatternView &, const Data::UniqueGiftPattern &)> setupPattern;
+
+	FlatLabel *number = nullptr;
+	rpl::variable<int> numberTextWidth;
+	QImage craftedBadge;
+	Info::PeerGifts::GiftBadge craftedBadgeKey;
+	rpl::variable<CreditsAmount> resaleAmount;
+	Fn<void()> resaleClick;
+
+};
+
+UniqueGiftCoverWidget::UniqueGiftCoverWidget(
+	QWidget *parent,
+	rpl::producer<UniqueGiftCover> data,
+	UniqueGiftCoverArgs &&args)
+: RpWidget(parent)
+, _state(std::make_unique<State>()) {
+	using SpinnerState = Data::GiftUpgradeSpinner::State;
+
+	_state->spinner = std::move(args.upgradeSpinner);
+
+	_state->setupModel = [this](
+			ModelView &to,
+			const Data::UniqueGiftModel &model) {
+		to.lifetime.destroy();
+
+		const auto document = model.document;
+		to.media = document->createMediaView();
+		to.media->automaticLoad(document->stickerSetOrigin(), nullptr);
+		rpl::single() | rpl::then(
+			document->session().downloaderTaskFinished()
+		) | rpl::filter([&to] {
+			return to.media->loaded();
+		}) | rpl::on_next([this, &to] {
+			const auto lottieSize = st::creditsHistoryEntryStarGiftSize;
+			to.lottie = ChatHelpers::LottiePlayerFromDocument(
+				to.media.get(),
+				ChatHelpers::StickerLottieSize::MessageHistory,
+				QSize(lottieSize, lottieSize),
+				Lottie::Quality::High);
+
+			to.lifetime.destroy();
+			const auto lottie = to.lottie.get();
+			lottie->updates() | rpl::on_next([this, lottie] {
+				if (_state->now.model.lottie.get() == lottie
+					|| _state->crossfade.animating()) {
+					update();
+				}
+				if (const auto onstack = _state->checkSpinnerStart) {
+					onstack();
+				}
+			}, to.lifetime);
+		}, to.lifetime);
+	};
+
+	_state->setupPattern = [this](
+			PatternView &to,
+			const Data::UniqueGiftPattern &pattern) {
+		const auto document = pattern.document;
+		const auto callback = [this, document] {
+			if (_state->now.pattern.document == document
+				|| _state->crossfade.animating()) {
+				update();
+			}
+			if (const auto onstack = _state->checkSpinnerStart) {
+				onstack();
+			}
+		};
+		to.document = document;
+		to.emoji = document->owner().customEmojiManager().create(
+			document,
+			callback,
+			Data::CustomEmojiSizeTag::Large);
+		[[maybe_unused]] const auto preload = to.emoji->ready();
+	};
+
+	if (const auto spinner = _state->spinner.get()) {
+		const auto fillBackdrops = [this, spinner] {
+			_state->spinnerBackdrops.clear();
+			_state->spinnerBackdrops.reserve(kSpinnerBackdrops);
+			const auto push = [this](const Data::UniqueGiftBackdrop &backdrop) {
+				if (_state->spinnerBackdrops.size() >= kSpinnerBackdrops) {
+					return false;
+				}
+				const auto already = ranges::contains(
+					_state->spinnerBackdrops,
+					backdrop,
+					&BackdropView::colors);
+				if (!already) {
+					_state->spinnerBackdrops.push_back({ backdrop });
+				}
+				return true;
+			};
+			push(spinner->target->backdrop);
+			for (const auto &backdrop : spinner->attributes.backdrops) {
+				if (!push(backdrop)) {
+					break;
+				}
+			}
+		};
+		const auto fillPatterns = [this, spinner] {
+			_state->spinnerPatterns.clear();
+			_state->spinnerPatterns.reserve(kSpinnerPatterns);
+			const auto push = [this](const Data::UniqueGiftPattern &pattern) {
+				if (_state->spinnerPatterns.size() >= kSpinnerPatterns) {
+					return false;
+				}
+				const auto already = ranges::contains(
+					_state->spinnerPatterns,
+					pattern.document.get(),
+					&PatternView::document);
+				if (!already) {
+					_state->setupPattern(
+						_state->spinnerPatterns.emplace_back(),
+						pattern);
+				}
+				return true;
+			};
+			push(spinner->target->pattern);
+			for (const auto &pattern : spinner->attributes.patterns) {
+				if (!push(pattern)) {
+					break;
+				}
+			}
+		};
+		const auto fillModels = [this, spinner] {
+			_state->spinnerModels.clear();
+			_state->spinnerModels.reserve(kSpinnerModels);
+			const auto push = [this](const Data::UniqueGiftModel &model) {
+				if (_state->spinnerModels.size() >= kSpinnerModels) {
+					return false;
+				}
+				const auto already = ranges::contains(
+					_state->spinnerModels,
+					model.document,
+					[](const ModelView &view) {
+						return view.media->owner();
+					});
+				if (!already) {
+					_state->setupModel(
+						_state->spinnerModels.emplace_back(),
+						model);
+				}
+				return true;
+			};
+			push(spinner->target->model);
+			for (const auto &model : spinner->attributes.models) {
+				if (!push(model)) {
+					break;
+				}
+			}
+		};
+		_state->checkSpinnerStart = [this, spinner] {
+			if (spinner->state.current() != SpinnerState::Loading
+				|| _state->crossfading) {
+				return;
+			}
+			for (const auto &pattern : _state->spinnerPatterns) {
+				if (!pattern.emoji->ready()) {
+					return;
+				}
+			}
+			for (const auto &model : _state->spinnerModels) {
+				if (!model.lottie || !model.lottie->ready()) {
+					return;
+				}
+			}
+			spinner->state = SpinnerState::Prepared;
+			_state->checkSpinnerStart = nullptr;
+		};
+		spinner->state.value() | rpl::on_next([=](SpinnerState now) {
+			if (now == SpinnerState::Preparing) {
+				fillBackdrops();
+				fillPatterns();
+				fillModels();
+				spinner->state = SpinnerState::Loading;
+				if (!_state->crossfading) {
+					_state->next = {};
+				}
+				_state->checkSpinnerStart();
+			} else if (now == SpinnerState::Started) {
+				const auto repaint = [this] { update(); };
+				_state->backdropSpin.startWithin(
+					_state->spinnerBackdrops.size(),
+					repaint);
+				_state->patternSpin.startWithin(
+					_state->spinnerPatterns.size(),
+					repaint);
+				_state->modelSpin.startWithin(
+					_state->spinnerModels.size(),
+					repaint);
+				_state->spinStarted = crl::now();
+			}
+		}, lifetime());
+	}
+
+	rpl::duplicate(
+		data
+	) | rpl::on_next([this](const UniqueGiftCover &now) {
+		const auto setup = [&](GiftView &to) {
+			Expects(!now.spinner);
+
+			to = {};
+			to.gift = now.values;
+			to.forced = now.force;
+			to.backdrop.colors = now.values.backdrop;
+			_state->setupModel(to.model, now.values.model);
+			_state->setupPattern(to.pattern, now.values.pattern);
+		};
+
+		const auto spinner = _state->spinner.get();
+		if (!_state->now.gift) {
+			setup(_state->now);
+			update();
+		} else if (now.spinner) {
+			Assert(spinner != nullptr);
+			Assert(spinner->state.current() == SpinnerState::Prepared);
+
+			spinner->state = SpinnerState::Started;
+		} else if (!_state->next.gift || now.force) {
+			const auto spinnerState = spinner
+				? spinner->state.current()
+				: SpinnerState::Initial;
+			if (spinnerState == SpinnerState::Initial) {
+				setup(_state->next);
+			}
+		}
+	}, lifetime());
+
+	auto subtitleCustomText = args.subtitle
+		? std::move(args.subtitle)
+		: rpl::single(tr::marked());
+	_state->released.subtitleCustom = rpl::duplicate(
+		subtitleCustomText
+	) | rpl::map([](const TextWithEntities &custom) {
+		return !custom.empty();
+	});
+
+	const auto repaintedHook = args.repaintedHook;
+	const auto updateLinkFg = args.subtitleLinkColored;
+	_state->updateColorsFromBackdrops = [this, updateLinkFg](
+			const BackdropView &from,
+			const BackdropView &to,
+			float64 progress) {
+		_state->released.bg = (progress == 0.)
+			? from.colors.patternColor
+			: (progress == 1.)
+			? to.colors.patternColor
+			: anim::color(
+				from.colors.patternColor,
+				to.colors.patternColor,
+				progress);
+		const auto color = (progress == 0.)
+			? from.colors.textColor
+			: (progress == 1.)
+			? to.colors.textColor
+			: anim::color(
+				from.colors.textColor,
+				to.colors.textColor,
+				progress);
+		if (updateLinkFg) {
+			const auto &subtitleCustom = _state->released.subtitleCustom;
+			_state->released.link.update(subtitleCustom.current()
+				? color
+				: QColor(255, 255, 255));
+		}
+		_state->released.fg = color;
+		const auto onSale = !_state->released.subtitleCustom.current()
+			&& _state->resaleAmount.current()
+			&& _state->resaleAmount.current().value() > 0;
+		_state->released.subtitle->setTextColorOverride(
+			onSale ? QColor(255, 255, 255) : color);
+		if (_state->number) {
+			_state->number->setTextColorOverride(color);
+		}
+	};
+	_state->updateColors = [this, repaintedHook](float64 progress) {
+		if (repaintedHook) {
+			repaintedHook(_state->now.gift, _state->next.gift, progress);
+		}
+		_state->updateColorsFromBackdrops(
+			_state->now.backdrop,
+			_state->next.backdrop,
+			progress);
+	};
+
+	if (args.resalePrice) {
+		std::move(args.resalePrice) | rpl::on_next([this](CreditsAmount value) {
+			_state->resaleAmount = value;
+		}, lifetime());
+	}
+	_state->resaleClick = std::move(args.resaleClick);
+
+	_state->pretitle = args.pretitle
+		? CreateChild<FlatLabel>(
+			this,
+			std::move(args.pretitle),
+			st::uniqueGiftPretitle)
+		: nullptr;
+	if (_state->pretitle) {
+		_state->released.stars.emplace(
+			this,
+			true,
+			Premium::MiniStarsType::SlowStars);
+		const auto white = QColor(255, 255, 255);
+		_state->released.stars->setColorOverride(QGradientStops{
+			{ 0., anim::with_alpha(white, .3) },
+			{ 1., white },
+		});
+		_state->pretitle->geometryValue() | rpl::on_next([this](QRect rect) {
+			const auto half = rect.height() / 2;
+			_state->released.stars->setCenter(rect - QMargins(half, 0, half, 0));
+		}, _state->pretitle->lifetime());
+		_state->pretitle->setAttribute(Qt::WA_TransparentForMouseEvents);
+		_state->pretitle->setTextColorOverride(QColor(255, 255, 255));
+		_state->pretitle->paintOn([this](QPainter &p) {
+			auto hq = PainterHighQualityEnabler(p);
+			const auto radius = _state->pretitle->height() / 2.;
+			p.setPen(Qt::NoPen);
+			auto bg = _state->released.bg;
+			bg.setAlphaF(kGradientButtonBgOpacity * bg.alphaF());
+			p.setBrush(bg);
+			p.drawRoundedRect(_state->pretitle->rect(), radius, radius);
+			p.translate(-_state->pretitle->pos());
+			_state->released.stars->paint(p);
+		});
+	}
+
+	_state->title = CreateChild<FlatLabel>(
+		this,
+		rpl::duplicate(
+			data
+		) | rpl::map([](const UniqueGiftCover &now) {
+			return now.values.title;
+		}),
+		st::uniqueGiftTitle);
+	_state->title->setTextColorOverride(QColor(255, 255, 255));
+
+	auto numberTextDup = args.numberText
+		? rpl::duplicate(args.numberText)
+		: rpl::producer<QString>();
+	_state->number = args.numberText
+		? CreateChild<FlatLabel>(
+			this,
+			std::move(args.numberText),
+			st::uniqueGiftNumber)
+		: nullptr;
+	if (_state->number) {
+		_state->number->setTextColorOverride(QColor(255, 255, 255));
+		std::move(
+			numberTextDup
+		) | rpl::on_next([this](const QString &text) {
+			_state->numberTextWidth = text.isEmpty() ? 0 : 1;
+		}, lifetime());
+	}
+
+	_state->released.by = rpl::duplicate(
+		data
+	) | rpl::map([](const UniqueGiftCover &cover) {
+		return cover.values.releasedBy;
+	});
+	_state->released.subtitleText = rpl::combine(
+		std::move(subtitleCustomText),
+		_state->resaleAmount.value(),
+		rpl::duplicate(data)
+	) | rpl::map([](
+			TextWithEntities custom,
+			CreditsAmount resalePrice,
+			const UniqueGiftCover &cover) {
+		if (!custom.empty()) {
+			return custom;
+		}
+		const auto &gift = cover.values;
+		if (resalePrice && resalePrice.value() > 0) {
+			auto priceText = resalePrice.ton()
+				? Text::IconEmoji(&st::tonIconEmojiOnSale).append(
+					Lang::FormatCreditsAmountDecimal(resalePrice))
+				: Text::IconEmoji(&st::starIconEmojiSmall).append(
+					Lang::FormatCountDecimal(resalePrice.whole()));
+			return tr::lng_gift_on_sale_for(
+				tr::now,
+				lt_price,
+				priceText,
+				tr::marked);
+		}
+		if (gift.releasedBy) {
+			return tr::lng_gift_released_by(
+				tr::now,
+				lt_name,
+				tr::link('@' + gift.releasedBy->username()),
+				tr::marked);
+		}
+		return tr::marked(gift.model.name);
+	});
+
+	const auto subtitleOutlined = args.subtitleOutlined;
+	const auto subtitleClick = args.subtitleClick;
+	rpl::combine(
+		_state->released.by.value(),
+		_state->released.subtitleCustom.value(),
+		_state->resaleAmount.value()
+	) | rpl::on_next([=](PeerData *by, bool subtitleCustom, CreditsAmount resale) {
+		const auto hasResale = resale && resale.value() > 0;
+		_state->released.outlined = (subtitleCustom && subtitleOutlined)
+			|| (!subtitleCustom && (hasResale || by));
+		_state->released.st = !_state->released.outlined
+			? st::uniqueGiftSubtitle
+			: (!subtitleCustom && hasResale)
+			? st::uniqueGiftOnSale
+			: st::uniqueGiftReleasedBy;
+		_state->released.st.palette.linkFg = _state->released.link.color();
+
+		const auto session = &_state->now.gift->model.document->session();
+		_state->released.subtitle = base::make_unique_q<FlatLabel>(
+			this,
+			_state->released.subtitleText.value(),
+			_state->released.st,
+			st::defaultPopupMenu,
+			Core::TextContext({ .session = session }));
+		const auto subtitle = _state->released.subtitle.get();
+		subtitle->show();
+
+		widthValue(
+		) | rpl::on_next([=](int width) {
+			const auto skip = st::uniqueGiftBottom;
+			if (width <= 3 * skip) {
+				return;
+			}
+			const auto available = width - 2 * skip;
+			subtitle->resizeToWidth(available);
+		}, subtitle->lifetime());
+		_state->released.subtitleHeight.force_assign(subtitle->height());
+		_state->released.subtitleHeight = subtitle->heightValue();
+
+		const auto handler = subtitleCustom
+			? (subtitleClick ? subtitleClick : Fn<void()>())
+			: hasResale
+			? _state->resaleClick
+			: by
+			? Fn<void()>([=] { GiftReleasedByHandler(by); })
+			: Fn<void()>();
+
+		if (!_state->released.outlined && handler) {
+			subtitle->setClickHandlerFilter([=](const auto &...) {
+				handler();
+				return false;
+			});
+		} else if (_state->released.outlined) {
+			_state->released.subtitleButton = base::make_unique_q<AbstractButton>(
+				this);
+			const auto button = _state->released.subtitleButton.get();
+
+			button->show();
+			subtitle->raise();
+			subtitle->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+			if (handler) {
+				button->setClickedCallback(handler);
+			} else {
+				button->setAttribute(Qt::WA_TransparentForMouseEvents);
+			}
+			subtitle->geometryValue(
+			) | rpl::on_next([=](QRect geometry) {
+				button->setGeometry(
+					geometry.marginsAdded(st::giftBoxReleasedByMargin));
+			}, button->lifetime());
+			button->paintRequest() | rpl::on_next([=] {
+				auto p = QPainter(button);
+				auto hq = PainterHighQualityEnabler(p);
+				const auto use = subtitle->textMaxWidth();
+				const auto add = button->width() - subtitle->width();
+				const auto full = use + add;
+				const auto left = (button->width() - full) / 2;
+				const auto height = button->height();
+				const auto radius = height / 2.;
+				p.setPen(Qt::NoPen);
+				p.setBrush(_state->released.bg);
+				p.setOpacity(0.5);
+				p.drawRoundedRect(left, 0, full, height, radius, radius);
+			}, button->lifetime());
+		} else {
+			_state->released.subtitleButton = nullptr;
+		}
+		_state->updateColors(_state->crossfade.value(
+			_state->crossfading ? 1. : 0.));
+	}, _state->title->lifetime());
+
+	_state->attrs = args.attributesInfo
+		? CreateChild<RpWidget>(this)
+		: nullptr;
+	_state->updateAttrs = [](const Data::UniqueGift &) {};
+	if (_state->attrs) {
+		struct AttributeState {
+			Text::String name;
+			Text::String type;
+			Text::String percent;
+		};
+		struct AttributesState {
+			AttributeState model;
+			AttributeState pattern;
+			AttributeState backdrop;
+		};
+		const auto astate = lifetime().make_state<AttributesState>();
+		const auto setType = [&](AttributeState &state, tr::phrase<> text) {
+			state.type = Text::String(
+				st::uniqueAttributeType,
+				text(tr::now));
+		};
+		setType(astate->model, tr::lng_auction_preview_model);
+		setType(astate->pattern, tr::lng_auction_preview_symbol);
+		setType(astate->backdrop, tr::lng_auction_preview_backdrop);
+
+		_state->updateAttrs = [this, astate](const Data::UniqueGift &gift) {
+			const auto set = [&](
+					AttributeState &state,
+					const Data::UniqueGiftAttribute &value) {
+				state.name = Text::String(
+					st::uniqueAttributeName,
+					value.name);
+				state.percent = Text::String(
+					st::uniqueAttributePercent,
+					Data::UniqueGiftAttributeText(value));
+			};
+			set(astate->model, gift.model);
+			set(astate->pattern, gift.pattern);
+			set(astate->backdrop, gift.backdrop);
+			_state->attrs->update();
+		};
+		const auto attrsHeight = st::uniqueAttributeTop
+			+ st::uniqueAttributePadding.top()
+			+ st::uniqueAttributeName.font->height
+			+ st::uniqueAttributeType.font->height
+			+ st::uniqueAttributePadding.bottom();
+		_state->attrs->resize(_state->attrs->width(), attrsHeight);
+		_state->attrs->paintOn([this, astate, attrsHeight](QPainter &p) {
+			const auto boxPadding = st::giftBoxPadding;
+			const auto skip = st::giftBoxGiftSkip.x();
+			const auto available = _state->attrs->width()
+				- boxPadding.left()
+				- boxPadding.right()
+				- 2 * skip;
+			const auto single = available / 3;
+			if (single <= 0) {
+				return;
+			}
+			auto hq = PainterHighQualityEnabler(p);
+			auto bg = _state->released.bg;
+			bg.setAlphaF(kGradientButtonBgOpacity * bg.alphaF());
+			const auto innert = st::uniqueAttributeTop;
+			const auto innerh = attrsHeight - innert;
+			const auto radius = innerh / 3.;
+			const auto paint = [&](int x, const AttributeState &state) {
+				p.setPen(Qt::NoPen);
+				p.setBrush(bg);
+				p.drawRoundedRect(x, innert, single, innerh, radius, radius);
+				p.setPen(QColor(255, 255, 255));
+				const auto padding = st::uniqueAttributePadding;
+				const auto inner = single - padding.left() - padding.right();
+				const auto namew = std::min(inner, state.name.maxWidth());
+				state.name.draw(p, {
+					.position = QPoint(
+						x + (single - namew) / 2,
+						innert + padding.top()),
+					.availableWidth = namew,
+					.elisionLines = 1,
+				});
+				p.setPen(_state->released.fg);
+				const auto typew = std::min(inner, state.type.maxWidth());
+				state.type.draw(p, {
+					.position = QPoint(
+						x + (single - typew) / 2,
+						innert + padding.top() + state.name.minHeight()),
+					.availableWidth = typew,
+				});
+				p.setPen(Qt::NoPen);
+				p.setBrush(anim::color(_state->released.bg, _state->released.fg, 0.3));
+				const auto r = st::uniqueAttributePercent.font->height / 2.;
+				const auto left = x + single - state.percent.maxWidth();
+				const auto top = st::uniqueAttributePercentPadding.top();
+				const auto percent = QRect(
+					left,
+					top,
+					state.percent.maxWidth(),
+					st::uniqueAttributeType.font->height);
+				p.drawRoundedRect(
+					percent.marginsAdded(st::uniqueAttributePercentPadding),
+					r,
+					r);
+				p.setPen(QColor(255, 255, 255));
+				state.percent.draw(p, {
+					.position = percent.topLeft(),
+				});
+			};
+			auto left = boxPadding.left();
+			paint(left, astate->model);
+			paint(left + single + skip, astate->backdrop);
+			paint(_state->attrs->width() - single - boxPadding.right(), astate->pattern);
+		});
+	}
+	_state->updateAttrs(*_state->now.gift);
+
+	rpl::combine(
+		widthValue(),
+		_state->released.subtitleHeight.value(),
+		_state->numberTextWidth.value()
+	) | rpl::on_next([this](int width, int subtitleHeight, int) {
+		const auto skip = st::uniqueGiftBottom;
+		if (width <= 3 * skip) {
+			return;
+		}
+		const auto available = width - 2 * skip;
+		auto top = st::uniqueGiftTitleTop;
+		if (_state->pretitle) {
+			_state->title->resizeToWidth(available);
+			_state->pretitle->move((width - _state->pretitle->width()) / 2, top);
+			top += _state->pretitle->height()
+				+ (st::uniqueGiftSubtitleTop - st::uniqueGiftTitleTop)
+				- _state->title->height();
+		}
+
+		if (_state->number && _state->number->textMaxWidth() > 0) {
+			const auto titleWidth = _state->title->textMaxWidth();
+			_state->title->resizeToWidth(titleWidth);
+			const auto numberWidth = _state->number->textMaxWidth();
+			_state->number->resizeToWidth(numberWidth);
+			const auto gap = st::normalFont->spacew;
+			const auto totalWidth = titleWidth + gap + numberWidth;
+			const auto groupLeft = (width - totalWidth) / 2;
+			_state->title->moveToLeft(groupLeft, top);
+			const auto &stTitle = _state->title->st();
+			const auto &stNumber = _state->number->st();
+			_state->number->moveToLeft(
+				groupLeft + titleWidth + gap,
+				(top
+					+ stTitle.style.font->ascent
+					- stNumber.style.font->ascent));
+		} else {
+			_state->title->resizeToWidth(available);
+			_state->title->moveToLeft(skip, top);
+		}
+		if (_state->pretitle) {
+			top += _state->title->height() + st::defaultVerticalListSkip;
+		} else {
+			top += st::uniqueGiftSubtitleTop - st::uniqueGiftTitleTop;
+		}
+
+		_state->released.subtitle->moveToLeft(skip, top);
+		top += subtitleHeight + (skip / 2);
+
+		if (_state->attrs) {
+			_state->attrs->resizeToWidth(width);
+			_state->attrs->moveToLeft(0, top);
+			top += _state->attrs->height() + (skip / 2);
+		} else {
+			top += (skip / 2);
+		}
+		if (!height() || height() == top) {
+			resize(width, top);
+		} else {
+			_state->heightFinal = top;
+			_state->heightAnimation.start([this, width, top] {
+				resize(
+					width,
+					int(base::SafeRound(_state->heightAnimation.value(top))));
+			}, height(), top, st::slideWrapDuration);
+		}
+	}, lifetime());
+}
+
+void UniqueGiftCoverWidget::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	auto progress = _state->crossfade.value(_state->crossfading ? 1. : 0.);
+	if (_state->updateAttributesPending && progress >= 0.5) {
+		_state->updateAttributesPending = false;
+		_state->updateAttrs(*_state->next.gift);
+	} else if (_state->updateAttributesPending
+		&& !_state->crossfade.animating()) {
+		_state->updateAttributesPending = false;
+		_state->updateAttrs(*_state->now.gift);
+	}
+	if (_state->crossfading) {
+		_state->updateColors(progress);
+	}
+	if (progress == 1.) {
+		_state->crossfading = false;
+		_state->now = base::take(_state->next);
+		progress = 0.;
+	}
+
+	const auto context = PaintContext{
+		.width = width(),
+		.patternAreaHeight = st::uniqueGiftSubtitleTop,
+	};
+	if (_state->spinStarted) {
+		paintSpinnerAnimation(p, context);
+	} else {
+		paintNormalAnimation(p, context, progress);
+	}
+}
+
+UniqueGiftCoverWidget::~UniqueGiftCoverWidget() = default;
+
+QImage UniqueGiftCoverWidget::prepareBackdrop(
+		BackdropView &backdrop,
+		const PaintContext &context) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto gradientSize = QSize(
+		context.width,
+		std::max(height(), _state->heightFinal));
+	if (backdrop.gradient.size() != gradientSize * ratio) {
+		backdrop.gradient = CreateTopBgGradient(
+			gradientSize,
+			backdrop.colors);
+	}
+	return backdrop.gradient;
+}
+
+void UniqueGiftCoverWidget::paintBackdrop(
+		QPainter &p,
+		BackdropView &backdrop,
+		const PaintContext &context) {
+	p.drawImage(0, 0, prepareBackdrop(backdrop, context));
+}
+
+void UniqueGiftCoverWidget::paintPattern(
+		QPainter &p,
+		PatternView &pattern,
+		const BackdropView &backdrop,
+		const PaintContext &context,
+		float64 shown) {
+	const auto color = backdrop.colors.patternColor;
+	const auto key = (color.red() << 16)
+		| (color.green() << 8)
+		| color.blue();
+	PaintBgPoints(
+		p,
+		PatternBgPoints(),
+		pattern.emojis[key],
+		pattern.emoji.get(),
+		color,
+		QRect(0, 0, context.width, context.patternAreaHeight),
+		shown);
+}
+
+bool UniqueGiftCoverWidget::paintModel(
+		QPainter &p,
+		ModelView &model,
+		const PaintContext &context,
+		float64 scale,
+		bool paused) {
+	const auto lottieSize = st::creditsHistoryEntryStarGiftSize;
+	const auto lottie = model.lottie.get();
+	const auto factor = style::DevicePixelRatio();
+	const auto request = Lottie::FrameRequest{
+		.box = QSize(lottieSize, lottieSize) * factor,
+	};
+	const auto frame = (lottie && lottie->ready())
+		? lottie->frameInfo(request)
+		: Lottie::Animation::FrameInfo();
+	if (frame.image.isNull()) {
+		return false;
+	}
+	const auto size = frame.image.size() / factor;
+	const auto rect = QRect(
+		QPoint((context.width - size.width()) / 2, st::uniqueGiftModelTop),
+		size);
+	if (scale < 1.) {
+		const auto origin = rect.center();
+		p.translate(origin);
+		p.scale(scale, scale);
+		p.translate(-origin);
+	}
+	p.drawImage(rect, frame.image);
+	const auto count = lottie->framesCount();
+	const auto finished = lottie->frameIndex() == (count - 1);
+	if (!paused) {
+		lottie->markFrameShown();
+	}
+	return finished;
+}
+
+QRect UniqueGiftCoverWidget::prepareCraftFrame(
+		QImage &canvas,
+		const CraftContext &context) {
+	const auto full = this->size();
+	const auto ratio = style::DevicePixelRatio();
+
+	if (canvas.size() != full * ratio) {
+		canvas = QImage(full * ratio, QImage::Format_ARGB32_Premultiplied);
+		canvas.setDevicePixelRatio(ratio);
+	}
+
+	LOG(("FULL: %1x%2").arg(full.width()).arg(full.height()));
+
+	const auto expand = context.expandProgress;
+	const auto size = QSize(
+		anim::interpolate(context.initial.width(), full.width(), expand),
+		anim::interpolate(context.initial.height(), full.height(), expand));
+	const auto rect = QRect(QPoint(), size);
+	auto p = QPainter(&canvas);
+	auto hq = PainterHighQualityEnabler(p);
+	const auto radius = st::boxRadius * expand;
+	const auto bgProgress = context.fadeInProgress;
+
+	auto gradient = QRadialGradient(
+		rect.center(),
+		size.height() / 2);
+	const auto center = anim::color(
+		context.initialBg,
+		_state->now.backdrop.colors.centerColor,
+		bgProgress);
+	const auto edge = anim::color(
+		context.initialBg,
+		_state->now.backdrop.colors.edgeColor,
+		bgProgress);
+	gradient.setStops({ { 0., center }, { 1., edge } });
+	p.setPen(Qt::NoPen);
+	if (radius > 0.) {
+		const auto more = qCeil(radius * 2);
+		p.setCompositionMode(QPainter::CompositionMode_Source);
+		p.fillRect(0, 0, more, more, Qt::transparent);
+		p.fillRect(rect.width() - more, 0, more, more, Qt::transparent);
+		p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		p.setBrush(gradient);
+		p.drawRoundedRect(
+			rect.marginsAdded({ 0, 0, 0, more }),
+			radius,
+			radius);
+	} else {
+		p.fillRect(rect, gradient);
+	}
+
+	const auto lottieSize = st::creditsHistoryEntryStarGiftSize;
+	const auto paused = (expand == 0.);
+	const auto modelScale = expand
+		+ ((st::giftBoxStickerTiny.width() / float64(lottieSize))
+			* (1. - expand));
+	const auto finalShift = (size.height() - lottieSize) / 2;
+	const auto shift = (1. - expand) * (finalShift - st::uniqueGiftModelTop);
+	p.translate(0, shift);
+	paintModel(p, _state->now.model, {
+		.width = size.width(),
+	}, modelScale, paused);
+	p.translate(0, -shift);
+
+	const auto skip = anim::interpolate(size.width() / 3, 0, expand);
+	const auto pointsHeight = anim::interpolate(
+		context.initial.height(),
+		st::uniqueGiftSubtitleTop,
+		expand);
+	p.translate(-skip, 0);
+	paintPattern(p, _state->now.pattern, _state->now.backdrop, {
+		.width = size.width() + 2 * skip,
+		.patternAreaHeight = pointsHeight,
+	}, bgProgress);
+
+	return QRect(QPoint(), size * ratio);
+}
+
+bool UniqueGiftCoverWidget::paintGift(
+		QPainter &p,
+		GiftView &gift,
+		const PaintContext &context,
+		float64 shown) {
+	Expects(gift.gift.has_value());
+
+	paintBackdrop(p, gift.backdrop, context);
+	if (gift.gift->pattern.document != gift.gift->model.document) {
+		paintPattern(p, gift.pattern, gift.backdrop, context, shown);
+	}
+	const auto finished = paintModel(p, gift.model, context);
+	if (gift.gift->crafted) {
+		const auto padding = st::chatUniqueGiftBadgePadding;
+		auto badge = Info::PeerGifts::GiftBadge{
+			.text = tr::lng_gift_crafted_tag(tr::now),
+			.bg1 = gift.gift->backdrop.edgeColor,
+			.bg2 = gift.gift->backdrop.patternColor,
+			.fg = gift.gift->backdrop.textColor,
+		};
+		if (_state->craftedBadge.isNull()
+			|| _state->craftedBadgeKey != badge) {
+			_state->craftedBadgeKey = badge;
+			_state->craftedBadge = Info::PeerGifts::ValidateRotatedBadge(
+				badge, padding, true);
+		}
+		p.drawImage(0, 0, _state->craftedBadge);
+	}
+	return finished;
+}
+
+QColor UniqueGiftCoverWidget::backgroundColor() const {
+	return _state->released.bg;
+}
+
+QColor UniqueGiftCoverWidget::foregroundColor() const {
+	return _state->released.fg;
+}
+
+void UniqueGiftCoverWidget::paintSpinnerAnimation(
+		QPainter &p,
+		const PaintContext &context) {
+	using SpinnerState = Data::GiftUpgradeSpinner::State;
+
+	const auto select = [&](auto &&list, int index, auto &fallback)
+	-> decltype(auto) {
+		return (index >= 0) ? list[index] : fallback;
+	};
+
+	const auto now = crl::now();
+	const auto elapsed = now - _state->spinStarted;
+	auto current = _state->spinner->state.current();
+	const auto stateTo = [&](SpinnerState to) {
+		if (int(current) < int(to)) {
+			_state->spinner->state = current = to;
+		}
+	};
+	const auto switchTo = [&](SpinnerState to, crl::time at) {
+		if (elapsed >= at) {
+			stateTo(to);
+		}
+	};
+	const auto actualize = [&](
+			AttributeSpin &spin,
+			auto &&list,
+			SpinnerState checkState,
+			SpinnerState finishState,
+			int slowdown = 1) {
+		if (spin.progress() < 1.) {
+			return;
+		} else if (current >= checkState) {
+			spin.startToTarget([this] { update(); }, slowdown);
+			stateTo(finishState);
+		} else {
+			spin.startWithin(list.size(), [this] { update(); });
+		}
+	};
+	if (anim::Disabled() && current < SpinnerState::FinishedModel) {
+		stateTo(SpinnerState::FinishedModel);
+		_state->backdropSpin.startToTarget([this] { update(); });
+		_state->patternSpin.startToTarget([this] { update(); });
+		_state->modelSpin.startToTarget([this] { update(); });
+	}
+	if (_state->backdropSpin.willIndex != 0) {
+		switchTo(SpinnerState::FinishBackdrop, kBackdropStopsAt);
+	}
+	actualize(
+		_state->backdropSpin,
+		_state->spinnerBackdrops,
+		SpinnerState::FinishBackdrop,
+		SpinnerState::FinishedBackdrop);
+
+	if (current == SpinnerState::FinishedBackdrop
+		&& _state->patternSpin.willIndex != 0) {
+		switchTo(SpinnerState::FinishPattern, kPatternStopsAt);
+	}
+	actualize(
+		_state->patternSpin,
+		_state->spinnerPatterns,
+		SpinnerState::FinishPattern,
+		SpinnerState::FinishedPattern);
+
+	if (current == SpinnerState::FinishedPattern
+		&& _state->modelSpin.willIndex != 0) {
+		switchTo(SpinnerState::FinishModel, kModelStopsAt);
+	}
+	actualize(
+		_state->modelSpin,
+		_state->spinnerModels,
+		SpinnerState::FinishModel,
+		SpinnerState::FinishedModel,
+		2);
+
+	auto &backdropNow = select(
+		_state->spinnerBackdrops,
+		_state->backdropSpin.nowIndex,
+		_state->now.backdrop);
+	auto &backdropWill = select(
+		_state->spinnerBackdrops,
+		_state->backdropSpin.willIndex,
+		_state->now.backdrop);
+	const auto backdropProgress = _state->backdropSpin.progress();
+	_state->updateColorsFromBackdrops(
+		backdropNow,
+		backdropWill,
+		backdropProgress);
+
+	auto &patternNow = select(
+		_state->spinnerPatterns,
+		_state->patternSpin.nowIndex,
+		_state->now.pattern);
+	auto &patternWill = select(
+		_state->spinnerPatterns,
+		_state->patternSpin.willIndex,
+		_state->now.pattern);
+	const auto patternProgress = _state->patternSpin.progress();
+	const auto paintPatterns = [&](
+			QPainter &p,
+			const BackdropView &backdrop) {
+		if (patternProgress >= 1.) {
+			paintPattern(p, patternWill, backdrop, context, 1.);
+		} else {
+			paintPattern(p, patternNow, backdrop, context, 1. - patternProgress);
+			if (patternProgress > 0.) {
+				paintPattern(p, patternWill, backdrop, context, patternProgress);
+			}
+		}
+	};
+
+	if (backdropProgress >= 1.) {
+		p.drawImage(0, 0, prepareBackdrop(backdropWill, context));
+		paintPatterns(p, backdropWill);
+	} else {
+		p.drawImage(0, 0, prepareBackdrop(backdropNow, context));
+		paintPatterns(p, backdropNow);
+
+		const auto fade = context.width / 2;
+		const auto from = anim::interpolate(
+			-fade,
+			context.width,
+			backdropProgress);
+		if (const auto till = from + fade; till > 0) {
+			auto faded = prepareBackdrop(backdropWill, context);
+			auto q = QPainter(&faded);
+			paintPatterns(q, backdropWill);
+
+			q.setCompositionMode(
+				QPainter::CompositionMode_DestinationIn);
+			auto brush = QLinearGradient(from, 0, till, 0);
+			brush.setStops({
+				{ 0., QColor(255, 255, 255, 255) },
+				{ 1., QColor(255, 255, 255, 0) },
+			});
+			const auto ratio = int(faded.devicePixelRatio());
+			const auto imgHeight = faded.height() / ratio;
+			q.fillRect(from, 0, fade, imgHeight, brush);
+			q.end();
+
+			p.drawImage(
+				QRect(0, 0, till, imgHeight),
+				faded,
+				QRect(0, 0, till * ratio, faded.height()));
+		}
+	}
+
+	auto &modelWas = select(
+		_state->spinnerModels,
+		_state->modelSpin.wasIndex,
+		_state->now.model);
+	auto &modelNow = select(
+		_state->spinnerModels,
+		_state->modelSpin.nowIndex,
+		_state->now.model);
+	auto &modelWill = select(
+		_state->spinnerModels,
+		_state->modelSpin.willIndex,
+		_state->now.model);
+	const auto modelProgress = _state->modelSpin.progress();
+	const auto paintOneModel = [&](ModelView &view, float64 progress) {
+		if (progress >= 1. || progress <= -1.) {
+			return;
+		}
+		auto scale = 1.;
+		if (progress != 0.) {
+			const auto shift = progress * context.width / 2.;
+			const auto shown = 1. - std::abs(progress);
+			scale = kModelScaleFrom + shown * (1. - kModelScaleFrom);
+			p.save();
+			p.setOpacity(shown);
+			p.translate(int(base::SafeRound(shift)), 0);
+		}
+		paintModel(p, view, context, scale, true);
+		if (progress != 0.) {
+			p.restore();
+		}
+	};
+	const auto initial = (_state->modelSpin.nowIndex < 0);
+	const auto ending = (current == SpinnerState::FinishedModel)
+		&& !_state->modelSpin.willIndex;
+	const auto willProgress = ending
+		? (modelProgress - 1.)
+		: (-1. + modelProgress * 2 / 3.);
+	const auto nowProgress = ending
+		? (modelProgress * 4 / 3. - 1 / 3.)
+		: initial
+		? (modelProgress * 1 / 3.)
+		: (willProgress + 2 / 3.);
+	const auto wasProgress = ending
+		? std::min(nowProgress + 2 / 3., 1.)
+		: 1. + (modelProgress - 1.) * 2 / 3.;
+	if (!initial) {
+		paintOneModel(modelWas, wasProgress);
+	}
+	paintOneModel(modelNow, nowProgress);
+	paintOneModel(modelWill, willProgress);
+
+	if (anim::Disabled()
+		|| (ending
+			&& modelProgress >= 1.
+			&& backdropProgress >= 1.
+			&& patternProgress >= 1.)) {
+		const auto take = [&](auto &&list) {
+			auto result = std::move(list.front());
+			list.clear();
+			return result;
+		};
+		_state->now.gift = *_state->spinner->target;
+		_state->now.backdrop = take(_state->spinnerBackdrops);
+		_state->now.pattern = take(_state->spinnerPatterns);
+		_state->now.model = take(_state->spinnerModels);
+		_state->now.forced = true;
+		_state->spinStarted = 0;
+		_state->spinner->state = SpinnerState::Finished;
+	}
+}
+
+void UniqueGiftCoverWidget::paintNormalAnimation(
+		QPainter &p,
+		const PaintContext &context,
+		float64 progress) {
+	if (progress < 1.) {
+		const auto finished = paintGift(p, _state->now, context, 1. - progress)
+			|| (_state->next.forced
+				&& (!_state->crossfading
+					|| !_state->crossfade.animating()));
+		const auto next = finished
+			? _state->next.model.lottie.get()
+			: nullptr;
+		if (next && next->ready()) {
+			_state->crossfading = true;
+			_state->updateAttributesPending = true;
+			_state->crossfade.start([this] {
+				update();
+			}, 0., 1., kCrossfadeDuration);
+		} else if (finished) {
+			if (const auto onstack = _state->checkSpinnerStart) {
+				onstack();
+			}
+		}
+	}
+	if (progress > 0.) {
+		p.setOpacity(progress);
+		paintGift(p, _state->next, context, progress);
+	}
+}
+
+void GiftReleasedByHandler(not_null<PeerData*> peer) {
+	const auto session = &peer->session();
+	const auto window = session->tryResolveWindow(peer);
+	if (window) {
+		window->showPeerHistory(peer);
+		return;
+	}
+	const auto account = not_null(&session->account());
+	if (const auto window = Core::App().windowFor(account)) {
+		window->invokeForSessionController(
+			&session->account(),
+			peer,
+			[=](not_null<Window::SessionController*> window) {
+				window->showPeerHistory(peer);
+			});
+	}
+}
+
+object_ptr<UniqueGiftCoverWidget> MakeUniqueGiftCover(
+		QWidget *parent,
+		rpl::producer<UniqueGiftCover> data,
+		UniqueGiftCoverArgs &&args) {
+	return object_ptr<UniqueGiftCoverWidget>(
+		parent,
+		std::move(data),
+		std::move(args));
+}
+
+void AddUniqueGiftCover(
+		not_null<VerticalLayout*> container,
+		rpl::producer<UniqueGiftCover> data,
+		UniqueGiftCoverArgs &&args) {
+	container->add(
+		MakeUniqueGiftCover(container, std::move(data), std::move(args)));
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_cover_box.h b/Telegram/SourceFiles/boxes/star_gift_cover_box.h
new file mode 100644
index 00000000000000..4e425e073a8d8f
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/star_gift_cover_box.h
@@ -0,0 +1,128 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "data/data_star_gift.h"
+#include "ui/rp_widget.h"
+
+namespace Data {
+struct UniqueGift;
+struct GiftUpgradeSpinner;
+} // namespace Data
+
+namespace Ui {
+
+class RpWidget;
+class VerticalLayout;
+
+struct UniqueGiftCoverArgs {
+	rpl::producer<QString> pretitle;
+	rpl::producer<QString> numberText;
+	rpl::producer<TextWithEntities> subtitle;
+	Fn<void()> subtitleClick;
+	bool subtitleLinkColored = false;
+	bool subtitleOutlined = false;
+	rpl::producer<CreditsAmount> resalePrice;
+	Fn<void()> resaleClick;
+	bool attributesInfo = false;
+	Fn<void(
+		std::optional<Data::UniqueGift> now,
+		std::optional<Data::UniqueGift> next,
+		float64 progress)> repaintedHook;
+	std::shared_ptr<Data::GiftUpgradeSpinner> upgradeSpinner;
+};
+
+struct UniqueGiftCover {
+	Data::UniqueGift values;
+	bool spinner = false;
+	bool force = false;
+};
+
+void GiftReleasedByHandler(not_null<PeerData*> peer);
+
+class UniqueGiftCoverWidget final : public RpWidget {
+public:
+	UniqueGiftCoverWidget(
+		QWidget *parent,
+		rpl::producer<UniqueGiftCover> data,
+		UniqueGiftCoverArgs &&args);
+	~UniqueGiftCoverWidget();
+
+	struct PaintContext {
+		int width = 0;
+		int patternAreaHeight = 0;
+	};
+
+	struct CraftContext {
+		QSize initial;
+		QColor initialBg;
+		float64 fadeInProgress = 0.;
+		float64 expandProgress = 0.;
+	};
+	[[nodiscard]] QRect prepareCraftFrame(
+		QImage &canvas,
+		const CraftContext &context);
+
+	[[nodiscard]] QColor backgroundColor() const;
+	[[nodiscard]] QColor foregroundColor() const;
+
+private:
+	struct BackdropView;
+	struct PatternView;
+	struct ModelView;
+	struct GiftView;
+
+	void paintEvent(QPaintEvent *e) override;
+
+	[[nodiscard]] QImage prepareBackdrop(
+		BackdropView &backdrop,
+		const PaintContext &context);
+	void paintBackdrop(
+		QPainter &p,
+		BackdropView &backdrop,
+		const PaintContext &context);
+	void paintPattern(
+		QPainter &p,
+		PatternView &pattern,
+		const BackdropView &backdrop,
+		const PaintContext &context,
+		float64 shown);
+	bool paintModel(
+		QPainter &p,
+		ModelView &model,
+		const PaintContext &context,
+		float64 scale = 1.,
+		bool paused = false);
+	bool paintGift(
+		QPainter &p,
+		GiftView &gift,
+		const PaintContext &context,
+		float64 shown);
+
+	void paintSpinnerAnimation(QPainter &p, const PaintContext &context);
+	void paintNormalAnimation(
+		QPainter &p,
+		const PaintContext &context,
+		float64 progress);
+
+	struct State;
+	const std::unique_ptr<State> _state;
+
+};
+
+[[nodiscard]] object_ptr<UniqueGiftCoverWidget> MakeUniqueGiftCover(
+	QWidget *parent,
+	rpl::producer<UniqueGiftCover> data,
+	UniqueGiftCoverArgs &&args);
+
+void AddUniqueGiftCover(
+	not_null<VerticalLayout*> container,
+	rpl::producer<UniqueGiftCover> data,
+	UniqueGiftCoverArgs &&args);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_craft_animation.cpp b/Telegram/SourceFiles/boxes/star_gift_craft_animation.cpp
new file mode 100644
index 00000000000000..9f0aa64bd04075
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/star_gift_craft_animation.cpp
@@ -0,0 +1,1996 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/star_gift_craft_animation.h"
+
+#include "base/call_delayed.h"
+#include "base/unixtime.h"
+#include "boxes/star_gift_box.h"
+#include "boxes/star_gift_cover_box.h"
+#include "boxes/star_gift_craft_box.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "chat_helpers/stickers_lottie.h"
+#include "data/data_credits.h"
+#include "data/data_document.h"
+#include "data/data_document_media.h"
+#include "data/data_session.h"
+#include "history/view/media/history_view_sticker_player.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
+#include "lang/lang_keys.h"
+#include "lang/lang_tag.h"
+#include "lottie/lottie_common.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_session.h"
+#include "settings/settings_credits_graphics.h"
+#include "ui/boxes/boost_box.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/image/image_prepare.h"
+#include "ui/layers/generic_box.h"
+#include "ui/widgets/gradient_round_button.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/top_background_gradient.h"
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "styles/style_boxes.h"
+#include "styles/style_credits.h"
+#include "styles/style_layers.h"
+
+namespace Ui {
+namespace {
+
+using namespace Info::PeerGifts;
+
+constexpr auto kFrameDuration = 1000. / 60.;
+constexpr auto kFlightDuration = crl::time(400);
+constexpr auto kLoadingFadeInDuration = crl::time(150);
+constexpr auto kLoadingFadeOutDuration = crl::time(300);
+constexpr auto kLoadingMinDuration = crl::time(600);
+constexpr auto kFailureFadeDuration = crl::time(400);
+constexpr auto kSuccessFadeInDuration = crl::time(300);
+constexpr auto kSuccessExpandDuration = crl::time(400);
+constexpr auto kSuccessExpandStart = crl::time(100);
+constexpr auto kProgressFadeInDuration = crl::time(300);
+
+[[nodiscard]] QString FormatPercent(int permille) {
+	const auto rounded = (permille + 5) / 10;
+	return QString::number(rounded) + '%';
+}
+
+struct Rotation {
+	float64 x = 0.;
+	float64 y = 0.;
+
+	Rotation operator+(Rotation other) const {
+		return { x + other.x, y + other.y };
+	}
+	Rotation operator*(float64 scale) const {
+		return { x * scale, y * scale };
+	}
+};
+
+using RotationFn = Fn<Rotation(Rotation initial, crl::time t)>;
+
+[[nodiscard]] int Slowing() {
+	return anim::SlowMultiplier();
+}
+
+[[nodiscard]] RotationFn DecayingRotation(Rotation impulse, float64 decay) {
+	const auto lambda = -std::log(decay) / kFrameDuration;
+	return [=](Rotation initial, crl::time t) {
+		const auto factor = (1. - std::exp(-lambda * t)) / lambda / 1000.;
+		return initial + impulse * factor;
+	};
+}
+
+[[nodiscard]] RotationFn DecayingEndRotation(
+		Rotation impulse,
+		float64 decay,
+		Rotation target,
+		crl::time duration) {
+	const auto lambda = -std::log(decay) / kFrameDuration;
+	target = target * M_PI;
+	return [=](Rotation initial, crl::time t) {
+		const auto factor = (1. - std::exp(-lambda * t)) / lambda / 1000.;
+		const auto result = initial + impulse * factor;
+		if (t <= duration - 200) {
+			return result;
+		} else if (t >= duration) {
+			return target;
+		}
+		const auto progress = (duration - t) / 200.;
+		return result * progress + target * (1. - progress);
+	};
+}
+
+struct GiftAnimationConfig {
+	RotationFn rotation;
+	crl::time duration = 0;
+	crl::time revealTime = 0;
+	int targetFaceIndex = 0;
+	int targetFaceRotation = 0;
+};
+
+const auto kGiftAnimations = std::array<GiftAnimationConfig, 7>{{ {
+	.rotation = DecayingEndRotation({ 4.1, -8.2 }, 0.98, { 1, -2 }, 2200),
+	.duration = 2200,
+	.revealTime = 600,
+	.targetFaceIndex = 1,
+	.targetFaceRotation = 180,
+}, {
+	.rotation = DecayingRotation({ 3.2, -5.9 }, 0.97),
+	.duration = 1200,
+	.revealTime = 0,
+	.targetFaceIndex = 4,
+	.targetFaceRotation = 180,
+}, {
+	.rotation = DecayingEndRotation({ 6.2, 7.8 }, 0.98, { 2, 1 }, 2200),
+	.duration = 2200,
+	.revealTime = 1000,
+	.targetFaceIndex = 1,
+	.targetFaceRotation = 0,
+}, {
+	.rotation = DecayingRotation({ 7.0, 4.5 }, 0.97),
+	.duration = 1200,
+	.revealTime = 200,
+	.targetFaceIndex = 5,
+	.targetFaceRotation = 0,
+}, {
+	.rotation = DecayingEndRotation({ -6.5, 5.0 }, 0.98, { 0, 1 }, 2200),
+	.duration = 2200,
+	.revealTime = 800,
+	.targetFaceIndex = 1,
+	.targetFaceRotation = 0,
+}, {
+	.rotation = DecayingRotation({ -2.5, 3.5 }, 0.98),
+	.duration = 1200,
+	.revealTime = 200,
+	.targetFaceIndex = 2,
+	.targetFaceRotation = 180,
+}, {
+	.rotation = DecayingEndRotation({ -4.4, -8.2 }, 0.98, { 0, -1.5 }, 2200),
+	.duration = 2200,
+	.revealTime = 600,
+	.targetFaceIndex = 3,
+	.targetFaceRotation = 0,
+} }};
+
+[[nodiscard]] QImage CreateBgGradient(
+		QSize size,
+		const Data::UniqueGiftBackdrop &backdrop) {
+	const auto ratio = style::DevicePixelRatio();
+	auto result = QImage(size * ratio, QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(ratio);
+
+	auto p = QPainter(&result);
+	auto hq = PainterHighQualityEnabler(p);
+	auto gradient = QRadialGradient(
+		QPoint(size.width() / 2, size.height() / 2),
+		size.height() / 2);
+	gradient.setStops({
+		{ 0., backdrop.centerColor },
+		{ 1., backdrop.edgeColor },
+	});
+	p.setBrush(gradient);
+	p.setPen(Qt::NoPen);
+	p.drawRect(0, 0, size.width(), size.height());
+	p.end();
+
+	const auto mask = Images::CornersMask(st::boxRadius);
+	return Images::Round(std::move(result), mask);
+}
+
+[[nodiscard]] std::optional<std::array<QPointF, 4>> ComputeCubeFaceCorners(
+		QPointF center,
+		float64 size,
+		float64 rotationX,
+		float64 rotationY,
+		int faceIndex) {
+	struct Vec3 {
+		float64 x, y, z;
+
+		Vec3 operator+(const Vec3 &o) const {
+			return { x + o.x, y + o.y, z + o.z };
+		}
+		Vec3 operator-(const Vec3 &o) const {
+			return { x - o.x, y - o.y, z - o.z };
+		}
+		Vec3 operator*(float64 s) const {
+			return { x * s, y * s, z * s };
+		}
+		[[nodiscard]] Vec3 cross(const Vec3 &o) const {
+			return {
+				y * o.z - z * o.y,
+				z * o.x - x * o.z,
+				x * o.y - y * o.x
+			};
+		}
+		[[nodiscard]] float64 dot(const Vec3 &o) const {
+			return x * o.x + y * o.y + z * o.z;
+		}
+		[[nodiscard]] Vec3 normalized() const {
+			const auto len = std::sqrt(x * x + y * y + z * z);
+			return (len > 0.) ? Vec3{ x / len, y / len, z / len } : *this;
+		}
+	};
+
+	const auto rotateY = [](Vec3 v, float64 angle) {
+		const auto c = std::cos(angle);
+		const auto s = std::sin(angle);
+		return Vec3{ v.x * c + v.z * s, v.y, -v.x * s + v.z * c };
+	};
+	const auto rotateX = [](Vec3 v, float64 angle) {
+		const auto c = std::cos(angle);
+		const auto s = std::sin(angle);
+		return Vec3{ v.x, v.y * c - v.z * s, v.y * s + v.z * c };
+	};
+
+	const auto half = size / 2.;
+	constexpr auto kFocalLength = 800.;
+
+	struct FaceDefinition {
+		std::array<Vec3, 4> corners;
+		Vec3 normal;
+	};
+
+	const auto faces = std::array<FaceDefinition, 6>{{
+		{{{{ -half, -half, -half },
+		   {  half, -half, -half },
+		   {  half,  half, -half },
+		   { -half,  half, -half }}},
+		 { 0., 0., -1. }},
+
+		{{{{  half, -half,  half },
+		   { -half, -half,  half },
+		   { -half,  half,  half },
+		   {  half,  half,  half }}},
+		 { 0., 0., 1. }},
+
+		{{{{ -half, -half,  half },
+		   { -half, -half, -half },
+		   { -half,  half, -half },
+		   { -half,  half,  half }}},
+		 { -1., 0., 0. }},
+
+		{{{{  half, -half, -half },
+		   {  half, -half,  half },
+		   {  half,  half,  half },
+		   {  half,  half, -half }}},
+		 { 1., 0., 0. }},
+
+		{{{{ -half, -half,  half },
+		   {  half, -half,  half },
+		   {  half, -half, -half },
+		   { -half, -half, -half }}},
+		 { 0., -1., 0. }},
+
+		{{{{ -half,  half, -half },
+		   {  half,  half, -half },
+		   {  half,  half,  half },
+		   { -half,  half,  half }}},
+		 { 0., 1., 0. }},
+	}};
+
+	if (faceIndex < 0 || faceIndex >= 6) {
+		return std::nullopt;
+	}
+
+	const auto &face = faces[faceIndex];
+
+	const auto transformedNormal = rotateX(
+		rotateY(face.normal, rotationY),
+		rotationX);
+	if (transformedNormal.z >= 0.) {
+		return std::nullopt;
+	}
+
+	auto result = std::array<QPointF, 4>();
+	for (auto i = 0; i != 4; ++i) {
+		const auto p = rotateX(
+			rotateY(face.corners[i], rotationY),
+			rotationX);
+
+		const auto viewZ = p.z + half + kFocalLength;
+		if (viewZ <= 0.) {
+			return std::nullopt;
+		}
+
+		const auto scale = kFocalLength / viewZ;
+		result[i] = QPointF(
+			center.x() + p.x * scale,
+			center.y() + p.y * scale);
+	}
+
+	return result;
+}
+
+void PaintCubeFace(
+		QPainter &p,
+		const std::array<QPointF, 4> &corners,
+		const QImage &face,
+		QSize faceSize = QSize(),
+		const QRect &source = QRect(),
+		int rotation = 0) {
+	if (face.isNull()) {
+		return;
+	}
+
+	const auto ratio = style::DevicePixelRatio();
+	const auto origin = source.isEmpty() ? face.size() : source.size();
+	if (faceSize.isEmpty()) {
+		faceSize = origin / ratio;
+	}
+	const auto w = faceSize.width();
+	const auto h = faceSize.height();
+
+	const auto srcRect = QPolygonF({
+		QPointF(0, 0),
+		QPointF(w, 0),
+		QPointF(w, h),
+		QPointF(0, h)
+	});
+
+	const auto rotationSteps = (rotation / 90) % 4;
+	auto rotatedCorners = corners;
+	for (auto i = 0; i < rotationSteps; ++i) {
+		rotatedCorners = {
+			rotatedCorners[1],
+			rotatedCorners[2],
+			rotatedCorners[3],
+			rotatedCorners[0],
+		};
+	}
+
+	const auto dstRect = QPolygonF({
+		rotatedCorners[0],
+		rotatedCorners[1],
+		rotatedCorners[2],
+		rotatedCorners[3]
+	});
+
+	auto transform = QTransform();
+	if (!QTransform::quadToQuad(srcRect, dstRect, transform)) {
+		return;
+	}
+
+	PainterHighQualityEnabler hq(p);
+	p.save();
+	p.setTransform(transform, true);
+	const auto delta = source.isEmpty()
+		? QPointF()
+		: QPointF(
+			((origin.width() / ratio) - faceSize.width()) / 2.,
+			((origin.height() / ratio) - faceSize.height()) / 2.);
+	p.drawImage(QRectF(-delta, QSizeF(origin) / ratio), face, source);
+	p.restore();
+}
+
+[[nodiscard]] std::vector<int> GetVisibleCubeFaces(
+		float64 rotationX,
+		float64 rotationY) {
+	struct Vec3 {
+		float64 x, y, z;
+
+		Vec3 operator*(float64 s) const {
+			return { x * s, y * s, z * s };
+		}
+	};
+
+	const auto rotateY = [](Vec3 v, float64 angle) {
+		const auto c = std::cos(angle);
+		const auto s = std::sin(angle);
+		return Vec3{ v.x * c + v.z * s, v.y, -v.x * s + v.z * c };
+	};
+	const auto rotateX = [](Vec3 v, float64 angle) {
+		const auto c = std::cos(angle);
+		const auto s = std::sin(angle);
+		return Vec3{ v.x, v.y * c - v.z * s, v.y * s + v.z * c };
+	};
+
+	constexpr auto normals = std::array<Vec3, 6>{{
+		{ 0., 0., -1. },
+		{ 0., 0., 1. },
+		{ -1., 0., 0. },
+		{ 1., 0., 0. },
+		{ 0., -1., 0. },
+		{ 0., 1., 0. },
+	}};
+
+	struct FaceDepth {
+		int index;
+		float64 z;
+	};
+	auto visible = std::vector<FaceDepth>();
+	visible.reserve(3);
+
+	for (auto i = 0; i != 6; ++i) {
+		const auto transformed = rotateX(
+			rotateY(normals[i], rotationY),
+			rotationX);
+		if (transformed.z < 0.) {
+			visible.push_back({ i, transformed.z });
+		}
+	}
+
+	ranges::sort(visible, ranges::greater(), &FaceDepth::z);
+
+	auto result = std::vector<int>();
+	result.reserve(visible.size());
+	for (const auto &face : visible) {
+		result.push_back(face.index);
+	}
+	return result;
+}
+
+void PaintCubeFirstFlight(
+		QPainter &p,
+		not_null<const CraftAnimationState*> state,
+		float64 progress,
+		bool skipForgeIcon = false) {
+	const auto shared = state->shared.get();
+
+	const auto overlayBg = shared->forgeBgOverlay;
+	auto sideBg = shared->forgeBg1;
+	sideBg.setAlphaF(progress);
+
+	auto hq = PainterHighQualityEnabler(p);
+	const auto forge = shared->forgeRect;
+	const auto radius = (1. - progress) * st::boxRadius;
+	p.setPen(Qt::NoPen);
+	p.setBrush(overlayBg);
+	p.drawRoundedRect(forge, radius, radius);
+	p.setBrush(sideBg);
+	p.drawRoundedRect(forge, radius, radius);
+
+	if (!skipForgeIcon) {
+		st::craftForge.paintInCenter(p, forge, st::white->c);
+	}
+}
+
+std::unique_ptr<CraftFailAnimation> SetupFailureAnimation(
+		not_null<RpWidget*> canvas,
+		not_null<CraftAnimationState*> state) {
+	auto result = std::make_unique<CraftFailAnimation>();
+	result->lottie = Lottie::MakeIcon({
+		.name = u"craft_failed"_q,
+		.sizeOverride = st::craftFailLottieSize,
+	});
+	return result;
+}
+
+void FailureAnimationCheck(
+		not_null<CraftAnimationState*> state,
+		not_null<RpWidget*> canvas,
+		crl::time now) {
+	const auto animation = state->failureAnimation.get();
+	if (!animation || animation->started) {
+		return;
+	}
+	const auto elapsed = (now - state->animationStartTime);
+	const auto left = (state->animationDuration * Slowing()) - elapsed;
+	if (left <= 0 || left > kFailureFadeDuration * Slowing()) {
+		return;
+	}
+	animation->started = true;
+	auto &covers = state->shared->covers;
+	for (auto i = 0; i != 5; ++i) {
+		auto &cover = covers[i];
+		if (!cover.shown) {
+			animation->finalCoverIndex = i;
+			if (i != 4) {
+				auto &last = covers.back();
+				cover.backdrop = last.backdrop;
+				cover.pattern = std::move(last.pattern);
+				cover.button1 = last.button1;
+				cover.button2 = last.button2;
+			}
+			cover.shown = true;
+			cover.shownAnimation.start([=] {
+				canvas->update();
+			}, 0., 1., left);
+			break;
+		}
+	}
+
+	const auto lottie = animation->lottie.get();
+	if (lottie->framesCount() > 1) {
+		lottie->animate([=] {
+			canvas->update();
+		}, 0, lottie->framesCount() - 1);
+	}
+
+	state->failureShown = true;
+	state->progressShown = false;
+}
+
+void FailureAnimationPrepareFrame(
+		not_null<CraftAnimationState*> state,
+		not_null<RpWidget*> canvas,
+		int faceIndex) {
+	if (!state->failureAnimation) {
+		state->failureAnimation = SetupFailureAnimation(
+			canvas,
+			state);
+	}
+	const auto shared = state->shared.get();
+	const auto animation = state->failureAnimation.get();
+	if (animation->frame.isNull()) {
+		animation->frame = shared->forgeSides[faceIndex].frame;
+	}
+	const auto lastIndex = animation->finalCoverIndex;
+	const auto progress = (lastIndex >= 0)
+		? shared->covers[lastIndex].shownAnimation.value(1.)
+		: 0.;
+	const auto bg = anim::color(
+		shared->forgeSides[faceIndex].bg,
+		shared->forgeFail,
+		progress);
+	const auto radius = progress * st::boxRadius;
+	const auto rounded = (radius > 0.);
+	if (rounded) {
+		animation->frame.fill(Qt::transparent);
+	}
+
+	auto p = QPainter(&animation->frame);
+	const auto size = shared->forgeRect.size();
+	const auto rect = QRect(QPoint(), size);
+	if (rounded) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(bg);
+		p.setPen(Qt::NoPen);
+		p.drawRoundedRect(rect, radius, radius);
+	} else {
+		p.fillRect(rect, bg);
+	}
+	animation->lottie->paintInCenter(p, rect);
+	p.setOpacity(progress);
+	p.drawImage(
+		st::craftForgePadding,
+		st::craftForgePadding,
+		state->shared->lostRadial);
+}
+
+[[nodiscard]] QRect PrepareCraftFrame(
+		not_null<CraftAnimationState*> state,
+		int faceIndex,
+		crl::time now) {
+	Expects(state->successAnimation != nullptr);
+
+	const auto &shared = state->shared.get();
+	const auto success = state->successAnimation.get();
+	const auto elapsed = now - state->animationStartTime;
+	const auto end = state->animationDuration * Slowing();
+	const auto left = end - elapsed;
+	const auto fadeDuration = kSuccessFadeInDuration * Slowing();
+	const auto fadeInProgress = std::clamp(
+		(1. - (left / float64(fadeDuration))),
+		0.,
+		1.);
+	const auto expandStart = kSuccessExpandStart * Slowing();
+	const auto expanding = kSuccessExpandDuration * Slowing();
+	const auto expandProgress = std::clamp(
+		(expandStart - left) / float64(expanding),
+		0.,
+		1.);
+	if (expandProgress == 1. && !success->finished) {
+		success->finished = true;
+	}
+	const auto expanded = anim::easeOutCubic(1., expandProgress);
+	success->expanded = expanded;
+	return success->widget->prepareCraftFrame(success->frame, {
+		.initial = shared->forgeRect.size(),
+		.initialBg = shared->forgeSides[faceIndex].bg,
+		.fadeInProgress = fadeInProgress,
+		.expandProgress = expanded,
+	});
+}
+
+void PaintCube(
+		QPainter &p,
+		not_null<CraftAnimationState*> state,
+		not_null<RpWidget*> canvas,
+		QPointF center,
+		float64 size) {
+	const auto shared = state->shared.get();
+
+	const auto now = crl::now();
+	FailureAnimationCheck(state, canvas, now);
+
+	const auto success = state->successAnimation.get();
+	const auto failure = state->failureAnimation.get();
+
+	const auto finalCoverIndex = failure ? failure->finalCoverIndex : -1;
+	const auto finishingFailure = (finalCoverIndex >= 0)
+		? shared->covers[finalCoverIndex].shownAnimation.value(1.)
+		: 0.;
+
+	if (!state->nextFaceRevealed
+		&& state->currentPhaseIndex >= 0) {
+		const auto &config = kGiftAnimations[state->currentPhaseIndex];
+		const auto elapsed = (crl::now() - state->animationStartTime);
+		if (elapsed >= config.revealTime * Slowing()) {
+			state->nextFaceRevealed = true;
+		}
+	}
+
+	const auto faces = GetVisibleCubeFaces(
+		state->rotationX,
+		state->rotationY);
+
+	auto paintFailure = Fn<void()>();
+	for (const auto faceIndex : faces) {
+		const auto corners = ComputeCubeFaceCorners(
+			center,
+			size,
+			state->rotationX,
+			state->rotationY,
+			faceIndex);
+		if (!corners) {
+			continue;
+		}
+
+		const auto thisFaceRevealed = state->nextFaceRevealed
+			&& (faceIndex == state->nextFaceIndex);
+		auto faceSize = shared->forgeRect.size();
+		auto faceImage = shared->forgeSides[faceIndex].frame;
+		auto faceSource = QRect();
+		auto faceRotation = thisFaceRevealed
+			? state->nextFaceRotation
+			: 0;
+
+		for (auto i = 0; i < 4; ++i) {
+			if (i != state->currentlyFlying
+				&& state->giftToSide[i].face == faceIndex
+				&& shared->corners[i].giftButton) {
+				faceSize = QSize(); // Take from the frame.
+				faceImage = shared->corners[i].gift(1.);
+				faceRotation = state->giftToSide[i].rotation;
+				break;
+			}
+		}
+
+		if (thisFaceRevealed && state->allGiftsLanded) {
+			const auto cover = success ? success->widget : nullptr;
+			if (cover) {
+				faceSource = PrepareCraftFrame(state, faceIndex, now);
+				faceImage = success->frame;
+			} else {
+				FailureAnimationPrepareFrame(
+					state,
+					canvas,
+					faceIndex);
+				faceImage = state->failureAnimation->frame;
+			}
+		}
+		if (finishingFailure > 0.) {
+			p.setOpacity((faceIndex != state->nextFaceIndex)
+				? (1. - finishingFailure)
+				: 1.);
+		}
+		PaintCubeFace(
+			p,
+			*corners,
+			faceImage,
+			faceSize,
+			faceSource,
+			faceRotation);
+	}
+	if (finishingFailure > 0.) {
+		p.setOpacity(1.);
+	}
+}
+
+struct GiftFlightPosition {
+	QPointF origin;
+	float64 scale;
+};
+
+[[nodiscard]] GiftFlightPosition ComputeGiftFlightPosition(
+		QRect originalRect,
+		QPointF targetCenter,
+		float64 targetSize,
+		float64 progress,
+		float64 startOffsetY) {
+	const auto eased = progress;
+
+	const auto startOrigin = QPointF(originalRect.topLeft())
+		+ QPointF(0, startOffsetY);
+	const auto targetOrigin = targetCenter
+		- QPointF(targetSize, targetSize) / 2.;
+	const auto currentOrigin = startOrigin
+		+ (targetOrigin - startOrigin) * eased;
+
+	const auto originalSize = std::max(
+		originalRect.width(),
+		originalRect.height());
+	const auto endScale = (originalSize > 0.)
+		? (targetSize / float64(originalSize))
+		: 1.;
+	const auto currentScale = 1. + (endScale - 1.) * eased;
+
+	return {
+		.origin = currentOrigin,
+		.scale = currentScale,
+	};
+}
+
+[[nodiscard]] FacePlacement GetCameraFacingFreeFace(
+		not_null<const CraftAnimationState*> state) {
+	struct Vec3 {
+		float64 x, y, z;
+	};
+
+	const auto rotateY = [](Vec3 v, float64 angle) {
+		const auto c = std::cos(angle);
+		const auto s = std::sin(angle);
+		return Vec3{ v.x * c + v.z * s, v.y, -v.x * s + v.z * c };
+	};
+	const auto rotateX = [](Vec3 v, float64 angle) {
+		const auto c = std::cos(angle);
+		const auto s = std::sin(angle);
+		return Vec3{ v.x, v.y * c - v.z * s, v.y * s + v.z * c };
+	};
+
+	constexpr auto normals = std::array<Vec3, 6>{{
+		{ 0., 0., -1. },
+		{ 0., 0., 1. },
+		{ -1., 0., 0. },
+		{ 1., 0., 0. },
+		{ 0., -1., 0. },
+		{ 0., 1., 0. },
+	}};
+
+	constexpr auto faceUpVectors = std::array<Vec3, 6>{{
+		{ 0., -1., 0. },
+		{ 0., -1., 0. },
+		{ 0., -1., 0. },
+		{ 0., -1., 0. },
+		{ 0., 0., -1. },
+		{ 0., 0., 1. },
+	}};
+
+	const auto isOccupied = [&](int faceIndex) {
+		for (const auto &placement : state->giftToSide) {
+			if (placement.face == faceIndex) {
+				return true;
+			}
+		}
+		return false;
+	};
+
+	auto bestFace = -1;
+	auto bestZ = 0.;
+
+	for (auto i = 0; i != 6; ++i) {
+		if (isOccupied(i)) {
+			continue;
+		}
+		const auto transformed = rotateX(
+			rotateY(normals[i], state->rotationY),
+			state->rotationX);
+		if (bestFace < 0 || transformed.z < bestZ) {
+			bestFace = i;
+			bestZ = transformed.z;
+		}
+	}
+
+	if (bestFace < 0) {
+		return {};
+	}
+
+	const auto faceUp = rotateX(
+		rotateY(faceUpVectors[bestFace], state->rotationY),
+		state->rotationX);
+
+	const auto screenUpY = faceUp.y;
+	const auto screenUpX = faceUp.x;
+
+	auto rotation = 0;
+	if (std::abs(screenUpY) >= std::abs(screenUpX)) {
+		rotation = (screenUpY < 0.) ? 0 : 180;
+	} else {
+		rotation = (screenUpX < 0.) ? 90 : 270;
+	}
+
+	return { .face = bestFace, .rotation = rotation };
+}
+
+[[nodiscard]] std::array<QPointF, 4> InterpolateQuadCorners(
+		const std::array<QPointF, 4> &from,
+		const std::array<QPointF, 4> &to,
+		float64 progress) {
+	return {
+		from[0] + (to[0] - from[0]) * progress,
+		from[1] + (to[1] - from[1]) * progress,
+		from[2] + (to[2] - from[2]) * progress,
+		from[3] + (to[3] - from[3]) * progress,
+	};
+}
+
+[[nodiscard]] std::array<QPointF, 4> RectToCorners(QRectF rect) {
+	return {
+		rect.topLeft(),
+		rect.topRight(),
+		rect.bottomRight(),
+		rect.bottomLeft(),
+	};
+}
+
+void PaintFlyingGiftWithQuad(
+		QPainter &p,
+		const CraftState::CornerSnapshot &corner,
+		const std::array<QPointF, 4> &corners,
+		float64 progress) {
+	if (!corner.giftButton) {
+		return;
+	}
+
+	const auto frame = corner.gift(progress);
+	PaintCubeFace(p, corners, frame);
+}
+
+void PaintFlyingGift(
+		QPainter &p,
+		const CraftState::CornerSnapshot &corner,
+		const GiftFlightPosition &position,
+		float64 progress) {
+	if (!corner.giftButton) {
+		return;
+	}
+
+	const auto ratio = style::DevicePixelRatio();
+	const auto frame = corner.gift(progress);
+	const auto giftSize = QSizeF(frame.size()) / ratio;
+	const auto scaledSize = giftSize * position.scale;
+	const auto giftTopLeft = position.origin;
+
+	auto hq = PainterHighQualityEnabler(p);
+	p.drawImage(QRectF(giftTopLeft, scaledSize), frame);
+}
+
+void PaintSlideOutCorner(
+		QPainter &p,
+		const CraftState::CornerSnapshot &corner,
+		float64 progress) {
+	if (corner.originalRect.isEmpty()) {
+		return;
+	}
+
+	const auto ratio = style::DevicePixelRatio();
+	const auto currentTopLeft = QPointF(corner.originalRect.topLeft());
+	if (corner.giftButton) {
+		const auto frame = corner.gift(0.);
+		const auto giftSize = QSizeF(frame.size()) / ratio;
+		const auto giftTopLeft = currentTopLeft;
+
+		const auto &extend = st::defaultDropdownMenu.wrap.shadow.extend;
+		const auto innerTopLeft = giftTopLeft
+			+ QPointF(extend.left(), extend.top());
+		const auto innerWidth = giftSize.width()
+			- extend.left()
+			- extend.right();
+
+		p.drawImage(giftTopLeft, frame);
+
+		const auto badgeFade = std::clamp(1. - progress / 0.7, 0., 1.);
+		if (!corner.percentBadge.isNull() && badgeFade > 0.) {
+			const auto badgeSize = QSizeF(corner.percentBadge.size())
+				/ ratio;
+			const auto badgePos = innerTopLeft
+				- QPointF(badgeSize.width() / 3., badgeSize.height() / 3.);
+			p.setOpacity(badgeFade);
+			p.drawImage(badgePos, corner.percentBadge);
+			p.setOpacity(1.);
+		}
+
+		if (!corner.removeButton.isNull() && badgeFade > 0.) {
+			const auto removeSize = QSizeF(corner.removeButton.size())
+				/ ratio;
+			const auto removePos = innerTopLeft
+				+ QPointF(
+					(innerWidth
+						- removeSize.width()
+						+ removeSize.width() / 3.),
+					-removeSize.height() / 3.);
+			p.setOpacity(badgeFade);
+			p.drawImage(removePos, corner.removeButton);
+			p.setOpacity(1.);
+		}
+	} else if (!corner.addButton.isNull()) {
+		const auto fadeProgress = std::clamp(progress * 1.5, 0., 1.);
+		const auto addTopLeft = currentTopLeft;
+		p.setOpacity(1. - fadeProgress);
+		p.drawImage(addTopLeft, corner.addButton);
+		p.setOpacity(1.);
+	}
+}
+
+void PaintSlideOutPhase(
+		QPainter &p,
+		not_null<CraftState*> shared,
+		QSize canvasSize,
+		float64 progress) {
+	const auto ratio = style::DevicePixelRatio();
+
+	if (!shared->bottomPart.isNull()) {
+		const auto slideDistance = QSizeF(shared->bottomPart.size()).height()
+			/ ratio;
+		const auto offsetY = slideDistance * progress;
+		const auto opacity = 1. - progress;
+
+		p.setOpacity(opacity);
+		p.drawImage(
+			QPointF(0, shared->bottomPartY + offsetY),
+			shared->bottomPart);
+		p.setOpacity(1.);
+	}
+
+	for (const auto &corner : shared->corners) {
+		PaintSlideOutCorner(p, corner, progress);
+	}
+
+	auto hq = PainterHighQualityEnabler(p);
+	const auto forge = shared->forgeRect;
+	const auto radius = st::boxRadius;
+	p.setPen(Qt::NoPen);
+	p.setBrush(shared->forgeBgOverlay);
+	p.drawRoundedRect(forge, radius, radius);
+	st::craftForge.paintInCenter(p, forge, st::white->c);
+	p.setOpacity(1. - progress);
+	p.drawImage(
+		forge.x() + st::craftForgePadding,
+		forge.y() + st::craftForgePadding,
+		shared->forgePercent);
+}
+
+void PaintFailureThumbnails(
+		QPainter &p,
+		not_null<const CraftState*> shared,
+		QSize canvasSize,
+		float64 fadeProgress) {
+	if (fadeProgress <= 0. || shared->lostGifts.empty()) {
+		return;
+	}
+
+	p.setOpacity(fadeProgress);
+
+	const auto width = canvasSize.width();
+	const auto giftsCount = int(shared->lostGifts.size());
+	const auto &firstCorner = shared->corners[
+		shared->lostGifts.front().cornerIndex];
+	if (!firstCorner.giftButton) {
+		p.setOpacity(1.);
+		return;
+	}
+	const auto thumbSize = firstCorner.giftButton->size();
+	const auto &extend = st::defaultDropdownMenu.wrap.shadow.extend;
+	const auto thumbSpacing = st::boxRowPadding.left() / 2;
+	const auto totalThumbWidth = giftsCount * thumbSize.width()
+		+ (giftsCount - 1) * thumbSpacing;
+	const auto available = width - extend.left() - extend.right();
+	const auto skip = (totalThumbWidth > available)
+		? (available - giftsCount * thumbSize.width()) / (giftsCount - 1)
+		: thumbSpacing;
+	const auto full = giftsCount * thumbSize.width()
+		+ (giftsCount - 1) * skip;
+	auto x = (width - full) / 2;
+	const auto y = shared->forgeRect.bottom() + st::craftFailureThumbsTop;
+	const auto rubberOut = st::lineWidth;
+
+	for (const auto &gift : shared->lostGifts) {
+		if (gift.cornerIndex < 0) {
+			x += thumbSize.width() + skip;
+			continue;
+		}
+		const auto &corner = shared->corners[gift.cornerIndex];
+		const auto giftFrame = corner.gift(0.);
+		if (!giftFrame.isNull()) {
+			const auto targetRect = QRect(QPoint(x, y), thumbSize);
+			p.drawImage(targetRect, giftFrame);
+
+			if (!gift.number.isEmpty()) {
+				if (gift.badgeCache.isNull()) {
+					const auto burnedBg = BurnedBadgeBg();
+					gift.badgeCache = ValidateRotatedBadge(GiftBadge{
+						.text = gift.number,
+						.bg1 = burnedBg,
+						.bg2 = burnedBg,
+						.fg = st::white->c,
+						.small = true,
+					}, QMargins());
+				}
+				const auto inner = targetRect.marginsRemoved(extend);
+				p.save();
+				p.setClipRect(inner.marginsAdded(
+					{ rubberOut, rubberOut, rubberOut, rubberOut }));
+				const auto badgeW = gift.badgeCache.width()
+					/ gift.badgeCache.devicePixelRatio();
+				p.drawImage(
+					inner.x() + inner.width() + rubberOut - badgeW,
+					inner.y() - rubberOut,
+					gift.badgeCache);
+				p.restore();
+			}
+		}
+		x += thumbSize.width() + skip;
+	}
+
+	p.setOpacity(1.);
+}
+
+[[nodiscard]] std::array<QPointF, 4> RotateCornersForFace(
+		std::array<QPointF, 4> corners,
+		int rotation) {
+	const auto steps = (rotation / 90) % 4;
+	for (auto i = 0; i < steps; ++i) {
+		corners = {
+			corners[1],
+			corners[2],
+			corners[3],
+			corners[0],
+		};
+	}
+	return corners;
+}
+
+void StartGiftFlight(
+		not_null<CraftAnimationState*> state,
+		not_null<RpWidget*> canvas,
+		int startIndex) {
+	const auto &corners = state->shared->corners;
+
+	auto nextGift = -1;
+	for (auto i = startIndex; i < 4; ++i) {
+		if (corners[i].giftButton) {
+			nextGift = i;
+			break;
+		}
+	}
+
+	if (nextGift < 0) {
+		return;
+	}
+
+	state->currentlyFlying = nextGift;
+	state->giftToSide[nextGift] = GetCameraFacingFreeFace(state);
+	state->flightTargetCorners = std::nullopt;
+
+	state->flightAnimation.start(
+		[=] { canvas->update(); },
+		0.,
+		1.,
+		kFlightDuration,
+		anim::easeInCubic);
+
+	if (!state->continuousAnimation.animating()) {
+		state->continuousAnimation.start();
+	}
+}
+
+void StartGiftFlightToFace(
+		not_null<CraftAnimationState*> state,
+		not_null<RpWidget*> canvas,
+		int targetFace) {
+	const auto shared = state->shared.get();
+	const auto &corners = shared->corners;
+
+	auto nextCorner = -1;
+	for (auto i = 0; i < 4; ++i) {
+		if (corners[i].giftButton && state->giftToSide[i].face < 0) {
+			nextCorner = i;
+			break;
+		}
+	}
+
+	if (nextCorner < 0) {
+		return;
+	}
+
+	state->currentlyFlying = nextCorner;
+
+	const auto faceRotation = state->nextFaceRotation;
+	state->giftToSide[nextCorner] = FacePlacement{
+		.face = targetFace,
+		.rotation = faceRotation,
+	};
+
+	if (state->currentPhaseIndex >= 0) {
+		const auto &config = kGiftAnimations[state->currentPhaseIndex];
+		const auto initial = Rotation{
+			state->initialRotationX,
+			state->initialRotationY,
+		};
+		const auto endRotation = config.rotation(initial, config.duration);
+
+		const auto cubeSize = float64(shared->forgeRect.width());
+		const auto cubeCenter = QPointF(shared->forgeRect.topLeft())
+			+ QPointF(cubeSize, cubeSize) / 2.;
+
+		const auto targetCorners = ComputeCubeFaceCorners(
+			cubeCenter,
+			cubeSize,
+			endRotation.x,
+			endRotation.y,
+			targetFace);
+		if (targetCorners) {
+			state->flightTargetCorners = RotateCornersForFace(
+				*targetCorners,
+				faceRotation);
+		} else {
+			state->flightTargetCorners = std::nullopt;
+		}
+	} else {
+		state->flightTargetCorners = std::nullopt;
+	}
+
+	state->flightAnimation.start([=] {
+		canvas->update();
+	}, 0., 1., kFlightDuration, anim::easeInCubic);
+
+	if (!state->continuousAnimation.animating()) {
+		state->continuousAnimation.start();
+	}
+}
+
+void LandCurrentGift(not_null<CraftAnimationState*> state, crl::time now) {
+	if (state->currentlyFlying < 0) {
+		return;
+	}
+
+	const auto giftNumber = ++state->giftsLanded;
+	const auto isLastGift
+		= state->allGiftsLanded
+		= (giftNumber >= state->totalGifts);
+
+	const auto configIndex = (giftNumber - 1) * 2 + (isLastGift ? 0 : 1);
+	Assert(configIndex < 7);
+
+	const auto &config = kGiftAnimations[configIndex];
+
+	state->currentlyFlying = -1;
+
+	state->initialRotationX = state->rotationX;
+	state->initialRotationY = state->rotationY;
+	state->currentPhaseIndex = configIndex;
+	state->currentPhaseFinished = false;
+	state->animationStartTime = now;
+	state->animationDuration = config.duration;
+	state->nextFaceIndex = config.targetFaceIndex;
+	state->nextFaceRotation = config.targetFaceRotation;
+	state->nextFaceRevealed = false;
+}
+
+void PaintLoadingAnimation(
+		QPainter &p,
+		not_null<CraftAnimationState*> state) {
+	const auto &loading = state->loadingAnimation;
+	if (!loading || !state->loadingStartedTime) {
+		return;
+	}
+
+	const auto loadingShown = state->loadingShownAnimation.value(
+		state->loadingFadingOut ? 0. : 1.);
+	if (loadingShown <= 0.) {
+		return;
+	}
+
+	const auto shared = state->shared.get();
+	const auto forge = shared->forgeRect;
+	const auto inner = forge.marginsRemoved({
+		st::craftForgePadding,
+		st::craftForgePadding,
+		st::craftForgePadding,
+		st::craftForgePadding,
+	});
+
+	const auto radial = loading->computeState();
+	const auto adjustedState = RadialState{
+		.shown = radial.shown * loadingShown,
+		.arcFrom = radial.arcFrom,
+		.arcLength = radial.arcLength,
+	};
+
+	auto pen = QPen(st::white->c);
+	pen.setCapStyle(Qt::RoundCap);
+	InfiniteRadialAnimation::Draw(
+		p,
+		adjustedState,
+		inner.topLeft(),
+		inner.size(),
+		inner.width(),
+		pen,
+		st::craftForgeLoading.thickness);
+}
+
+} // namespace
+
+QImage CraftState::CornerSnapshot::gift(float64 progress) const {
+	if (!giftButton) {
+		return QImage();
+	} else if (progress == 1. && giftFrameFinal) {
+		return giftFrame;
+	} else if (progress < 1.) {
+		giftFrameFinal = false;
+	}
+	if (giftButton->makeCraftFrameIsFinal(giftFrame, progress)) {
+		giftFrameFinal = true;
+	}
+	return giftFrame;
+}
+
+void CraftState::paint(
+		QPainter &p,
+		QSize size,
+		int craftingHeight,
+		float64 slideProgress) {
+	const auto width = size.width();
+	const auto getBackdrop = [&](BackdropView &backdrop) {
+		const auto ratio = style::DevicePixelRatio();
+		const auto gradientSize = size;
+		auto &gradient = backdrop.gradient;
+		if (gradient.size() != gradientSize * ratio) {
+			gradient = CreateBgGradient(gradientSize, backdrop.colors);
+		}
+		return gradient;
+	};
+	auto patternOffsetY = 0.;
+	const auto paintPattern = [&](
+			QPainter &q,
+			PatternView &pattern,
+			const BackdropView &backdrop,
+			float64 shown) {
+		const auto color = backdrop.colors.patternColor;
+		const auto key = (color.red() << 16)
+			| (color.green() << 8)
+			| color.blue();
+		if (patternOffsetY != 0.) {
+			q.translate(0, patternOffsetY);
+		}
+		PaintBgPoints(
+			q,
+			PatternBgPoints(),
+			pattern.emojis[key],
+			pattern.emoji.get(),
+			color,
+			QRect(0, 0, width, st::boxTitleHeight + craftingHeight),
+			shown);
+		if (patternOffsetY != 0.) {
+			q.translate(0, -patternOffsetY);
+		}
+	};
+	auto animating = false;
+	auto newEdgeColor = std::optional<QColor>();
+	auto newButton1 = QColor();
+	auto newButton2 = QColor();
+	for (auto i = 0; i != 5; ++i) {
+		auto &cover = covers[i];
+		if (cover.shownAnimation.animating()) {
+			animating = true;
+		}
+		const auto finalValue = cover.shown ? 1. : 0.;
+		const auto shown = cover.shownAnimation.value(finalValue);
+		if (shown <= 0.) {
+			break;
+		} else if (shown == 1.) {
+			const auto next = i + 1;
+			if (next < 4
+				&& covers[next].shown
+				&& !covers[next].shownAnimation.animating()) {
+				continue;
+			}
+		}
+		p.setOpacity(shown);
+		p.drawImage(0, 0, getBackdrop(cover.backdrop));
+		paintPattern(p, cover.pattern, cover.backdrop, 1.);
+		if (coversAnimate) {
+			const auto edge = cover.backdrop.colors.edgeColor;
+			if (!newEdgeColor) {
+				newEdgeColor = edge;
+				newButton1 = cover.button1;
+				newButton2 = cover.button2;
+			} else {
+				newEdgeColor = anim::color(*newEdgeColor, edge, shown);
+				newButton1 = anim::color(newButton1, cover.button1, shown);
+				newButton2 = anim::color(newButton2, cover.button2, shown);
+			}
+		}
+	}
+	if (newEdgeColor) {
+		edgeColor = *newEdgeColor;
+		button1 = newButton1;
+		button2 = newButton2;
+	}
+	if (animating) {
+		p.setOpacity(1.);
+	} else {
+		coversAnimate = false;
+	}
+}
+
+void CraftState::updateForGiftCount(int count, Fn<void()> repaint) {
+	for (auto i = 5; i != 0;) {
+		auto &cover = covers[--i];
+		const auto shown = (i < count);
+		if (cover.shown != shown) {
+			cover.shown = shown;
+			const auto from = shown ? 0. : 1.;
+			const auto to = shown ? 1. : 0.;
+			cover.shownAnimation.start(
+				repaint,
+				from,
+				to,
+				st::fadeWrapDuration);
+			coversAnimate = true;
+		}
+	}
+}
+
+CraftState::EmptySide CraftState::prepareEmptySide(int index) const {
+	const auto size = forgeRect.size();
+	const auto ratio = style::DevicePixelRatio();
+	auto result = QImage(size * ratio, QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(ratio);
+
+	const auto bg = anim::color(forgeBg1, forgeBg2, index / 5.);
+	result.fill(bg);
+
+	auto p = QPainter(&result);
+	st::craftForge.paintInCenter(p, QRect(QPoint(), size), st::white->c);
+
+//#if _DEBUG
+//	p.setFont(st::semiboldFont);
+//	p.setPen(st::white);
+//	p.drawText(
+//		size.width() / 10,
+//		size.width() / 10 + st::semiboldFont->ascent,
+//		QString::number(index));
+//#endif // _DEBUG
+
+	p.end();
+
+	return { .bg = bg, .frame = result };
+}
+
+void SetupCraftProgressTitle(
+		not_null<VerticalLayout*> container,
+		not_null<rpl::variable<float64>*> opacity) {
+	const auto row = container->add(
+		object_ptr<RpWidget>(container),
+		st::boxRowPadding + st::craftProgressTitleMargin,
+		style::al_top);
+
+	const auto label = CreateChild<FlatLabel>(
+		row,
+		tr::lng_gift_craft_progress(),
+		st::uniqueGiftTitle);
+	label->setTextColorOverride(st::white->c);
+
+	const auto iconSize = st::craftProgressIconSize;
+	const auto iconWidget = CreateChild<RpWidget>(row);
+	iconWidget->resize(iconSize);
+
+	auto owned = Lottie::MakeIcon({
+		.name = u"craft_progress"_q,
+		.sizeOverride = iconSize,
+		.limitFps = true,
+	});
+	const auto icon = owned.get();
+	iconWidget->lifetime().add([kept = std::move(owned)] {});
+
+	const auto startAnimation = [=] {
+		icon->animate(
+			[=] { iconWidget->update(); },
+			0,
+			icon->framesCount() - 1);
+	};
+	startAnimation();
+
+	iconWidget->paintRequest(
+	) | rpl::on_next([=] {
+		auto p = QPainter(iconWidget);
+		p.setOpacity(opacity->current());
+		icon->paint(p, 0, 0);
+		if (!icon->animating() && icon->frameIndex() > 0) {
+			startAnimation();
+		}
+	}, iconWidget->lifetime());
+
+	rpl::combine(
+		label->sizeValue(),
+		row->sizeValue()
+	) | rpl::on_next([=](QSize labelSize, QSize rowSize) {
+		const auto skip = st::craftProgressIconSkip;
+		const auto totalWidth = iconSize.width() + skip + labelSize.width();
+		const auto rowHeight = std::max(iconSize.height(), labelSize.height());
+		if (rowSize.height() != rowHeight) {
+			row->resize(rowSize.width(), rowHeight);
+			return;
+		}
+		const auto left = (rowSize.width() - totalWidth) / 2;
+		iconWidget->move(left, (rowHeight - iconSize.height()) / 2);
+		label->move(
+			left + iconSize.width() + skip,
+			(rowHeight - labelSize.height()) / 2);
+	}, row->lifetime());
+
+	opacity->value(
+	) | rpl::on_next([=](float64 value) {
+		label->setOpacity(value);
+		iconWidget->update();
+	}, row->lifetime());
+
+}
+
+void SetupProgressControls(
+		not_null<CraftAnimationState*> state,
+		not_null<RpWidget*> canvas) {
+	const auto add = [&](not_null<FlatLabel*> label) {
+		state->progressOpacity.value() | rpl::on_next([=](float64 opacity) {
+			label->setOpacity(opacity);
+		}, label->lifetime());
+	};
+
+	const auto controls = CreateChild<VerticalLayout>(canvas);
+	controls->resizeToWidth(canvas->width());
+	controls->move(0, state->shared->craftingBottom);
+
+	SetupCraftProgressTitle(controls, &state->progressOpacity);
+
+	const auto subColor = QColor(255, 255, 255, 178);
+	const auto about = controls->add(
+		object_ptr<FlatLabel>(
+			controls,
+			tr::lng_gift_craft_progress_about(
+				lt_gift,
+				rpl::single(tr::marked(state->shared->giftName)),
+				tr::rich),
+			st::uniqueGiftSubtitle),
+		st::boxRowPadding + st::craftProgressAboutMargin,
+		style::al_top);
+	add(about);
+	about->setTextColorOverride(subColor);
+
+	const auto warning = controls->add(
+		object_ptr<FlatLabel>(
+			controls,
+			tr::lng_gift_craft_progress_fails(),
+			st::craftAbout),
+		st::boxRowPadding + st::craftProgressWarningMargin,
+		style::al_top);
+	add(warning);
+	warning->setTextColorOverride(subColor);
+
+	const auto chance = controls->add(
+		object_ptr<FlatLabel>(
+			controls,
+			tr::lng_gift_craft_progress_chance(
+				tr::now,
+				lt_percent,
+				FormatPercent(state->shared->successPermille)),
+			st::craftChance),
+		st::boxRowPadding + st::craftProgressChanceMargin,
+		style::al_top);
+	add(chance);
+	chance->setTextColorOverride(st::white->c);
+	chance->paintOn([=](QPainter &p) {
+		if (const auto opacity = state->progressOpacity.current()) {
+			p.setPen(Qt::NoPen);
+			p.setOpacity(opacity);
+			p.setBrush(state->shared->forgeBgOverlay);
+			const auto radius = chance->height() / 2.;
+			p.drawRoundedRect(chance->rect(), radius, radius);
+		}
+	});
+
+	controls->showOn(state->progressOpacity.value(
+	) | rpl::map(
+		rpl::mappers::_1 > 0.
+	) | rpl::distinct_until_changed());
+}
+
+void SetupFailureControls(
+		not_null<CraftAnimationState*> state,
+		not_null<RpWidget*> canvas) {
+	const auto add = [&](not_null<FlatLabel*> label) {
+		state->failureOpacity.value() | rpl::on_next([=](float64 opacity) {
+			label->setOpacity(opacity);
+		}, label->lifetime());
+	};
+
+	const auto controls = CreateChild<VerticalLayout>(canvas);
+	controls->resizeToWidth(canvas->width());
+	controls->move(0, state->shared->craftingBottom);
+
+	const auto title = controls->add(
+		object_ptr<FlatLabel>(
+			controls,
+			tr::lng_gift_craft_failed_title(),
+			st::uniqueGiftTitle),
+		st::boxRowPadding + st::craftFailureTitleMargin,
+		style::al_top);
+	add(title);
+	title->setTextColorOverride(QColor(0xF8, 0x4A, 0x4A));
+
+	const auto about = controls->add(
+		object_ptr<FlatLabel>(
+			controls,
+			tr::lng_gift_craft_failed_about(
+				lt_count,
+				rpl::single(state->shared->lostGifts.size() * 1.),
+				tr::rich),
+			st::uniqueGiftSubtitle),
+		st::boxRowPadding + st::craftFailureAboutMargin,
+		style::al_top);
+	add(about);
+	about->setTextColorOverride(QColor(0xFF, 0xBC, 0x9B));
+
+	controls->showOn(state->failureOpacity.value(
+	) | rpl::map(
+		rpl::mappers::_1 > 0.
+	) | rpl::distinct_until_changed());
+}
+
+void SetupCraftNewButton(
+		not_null<CraftAnimationState*> state,
+		not_null<RpWidget*> canvas) {
+	const auto button = CreateChild<GradientButton>(
+		canvas,
+		QGradientStops{
+			{ 0., QColor(0xE2, 0x75, 0x19) },
+			{ 1., QColor(0xDD, 0x48, 0x19) },
+		});
+	button->setFullRadius(true);
+	button->setClickedCallback([=] {
+		state->retryWithNewGift();
+	});
+
+	const auto buttonLabel = CreateChild<FlatLabel>(
+		button,
+		tr::lng_gift_craft_new_button(),
+		st::creditsBoxButtonLabel);
+	buttonLabel->setTextColorOverride(st::white->c);
+	buttonLabel->setAttribute(
+		Qt::WA_TransparentForMouseEvents);
+	button->sizeValue() | rpl::on_next([=](QSize size) {
+		buttonLabel->moveToLeft(
+			(size.width() - buttonLabel->width()) / 2,
+			st::giftBox.button.textTop);
+	}, buttonLabel->lifetime());
+
+	const auto buttonWidth = canvas->width()
+		- st::craftBoxButtonPadding.left()
+		- st::craftBoxButtonPadding.right();
+	const auto buttonHeight = st::giftBox.button.height;
+	button->setNaturalWidth(buttonWidth);
+	button->setGeometry(
+		st::craftBoxButtonPadding.left(),
+		state->shared->originalButtonY,
+		buttonWidth,
+		buttonHeight);
+	button->show();
+
+	button->shownValue() | rpl::filter(
+		rpl::mappers::_1
+	) | rpl::take(1) | rpl::on_next([=] {
+		button->startGlareAnimation();
+	}, button->lifetime());
+}
+
+void StartCraftAnimation(
+		not_null<GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
+		std::shared_ptr<CraftState> shared,
+		Fn<void(Fn<void(CraftResult)> callback)> startRequest,
+		Fn<void(Fn<void()> closeCurrent)> retryWithNewGift) {
+	const auto container = box->verticalLayout();
+	while (container->count() > 0) {
+		delete container->widgetAt(0);
+	}
+
+	auto canvas = object_ptr<RpWidget>(container);
+	const auto raw = canvas.data();
+	const auto state = raw->lifetime().make_state<CraftAnimationState>();
+
+	state->retryWithNewGift = [=] {
+		retryWithNewGift(crl::guard(box, [=] { box->closeBox(); }));
+	};
+
+	const auto title = CreateChild<FlatLabel>(
+		raw,
+		tr::lng_gift_craft_title(),
+		st::uniqueGiftTitle);
+	title->naturalWidthValue() | rpl::on_next([=](int titleWidth) {
+		const auto width = st::boxWideWidth;
+		title->moveToLeft(
+			(width - titleWidth) / 2,
+			st::craftTitleMargin.top(),
+			width);
+	}, title->lifetime());
+	title->setTextColorOverride(st::white->c);
+
+	const auto height = shared->containerHeight;
+	const auto craftingHeight = shared->craftingBottom - shared->craftingTop;
+	state->shared = std::move(shared);
+	state->shared->craftingStarted = true;
+
+	const auto craftingSize = QSize(container->width(), height);
+	raw->resize(craftingSize);
+
+	for (auto &corner : state->shared->corners) {
+		if (corner.giftButton) {
+			++state->totalGifts;
+		}
+	}
+
+	state->loadingAnimation = std::make_unique<InfiniteRadialAnimation>(
+		[=] { raw->update(); },
+		st::craftForgeLoading);
+
+	SetupProgressControls(state, raw);
+	SetupFailureControls(state, raw);
+
+	state->progressShown.value(
+	) | rpl::combine_previous(
+	) | rpl::on_next([=](bool wasShown, bool nowShown) {
+		if (wasShown == nowShown) {
+			return;
+		}
+		const auto from = wasShown ? 1. : 0.;
+		const auto to = nowShown ? 1. : 0.;
+		state->progressFadeIn.start([=] {
+			raw->update();
+		}, from, to, kProgressFadeInDuration, anim::easeOutCubic);
+	}, raw->lifetime());
+
+	state->failureShown.value(
+	) | rpl::combine_previous(
+	) | rpl::on_next([=](bool wasShown, bool nowShown) {
+		if (wasShown == nowShown) {
+			return;
+		}
+		const auto from = wasShown ? 1. : 0.;
+		const auto to = nowShown ? 1. : 0.;
+		state->failureFadeIn.start([=] {
+			raw->update();
+			if (!state->failureFadeIn.animating()) {
+				SetupCraftNewButton(state, raw);
+			}
+		}, from, to, kFailureFadeDuration, anim::easeOutCubic);
+	}, raw->lifetime());
+
+	raw->paintOn([=](QPainter &p) {
+		const auto shared = state->shared.get();
+		const auto success = state->successAnimation.get();
+		const auto failure = state->failureAnimation.get();
+		const auto slideProgress = state->slideOutAnimation.value(1.);
+		if (slideProgress < 1. || (failure && failure->started)) {
+			shared->paint(p, craftingSize, craftingHeight, slideProgress);
+		} else {
+			if (shared->craftBg.isNull()) {
+				const auto ratio = style::DevicePixelRatio();
+				shared->craftBg = QImage(
+					craftingSize * ratio,
+					QImage::Format_ARGB32_Premultiplied);
+				shared->craftBg.setDevicePixelRatio(ratio);
+				shared->craftBg.fill(Qt::transparent);
+
+				auto q = QPainter(&shared->craftBg);
+				shared->paint(q, craftingSize, craftingHeight, 1.);
+			}
+			if (success && success->hiding) {
+				p.setOpacity(1. - success->heightAnimation.value(1.));
+			}
+			p.drawImage(0, 0, shared->craftBg);
+			if (success && success->hiding) {
+				p.setOpacity(1.);
+			}
+		}
+
+		if (slideProgress < 1.) {
+			PaintSlideOutPhase(p, shared, craftingSize, slideProgress);
+		} else {
+			const auto craftingOffsetY = success
+				? (-success->coverShift * success->expanded)
+				: 0.;
+			if (success && success->expanded > 0.) {
+				const auto width = st::boxWideWidth;
+				const auto top = st::craftTitleMargin.top();
+				title->moveToLeft(
+					(width - title->naturalWidth()) / 2,
+					top - (success->expanded * (top + title->height())),
+					width);
+			}
+			const auto cubeSize = float64(shared->forgeRect.width());
+			const auto cubeCenter = QPointF(shared->forgeRect.topLeft())
+				+ QPointF(cubeSize, cubeSize) / 2.
+				+ QPointF(0, craftingOffsetY);
+
+			for (auto i = 0; i < 4; ++i) {
+				const auto &corner = shared->corners[i];
+				if (corner.giftButton && state->giftToSide[i].face < 0) {
+					const auto giftTopLeft = QPointF()
+						+ QPointF(corner.originalRect.topLeft())
+						+ QPointF(0, craftingOffsetY);
+					p.drawImage(giftTopLeft, corner.gift(0));
+				}
+			}
+
+			const auto flying = state->currentlyFlying;
+			const auto firstFlyProgress = (flying == 0)
+				? state->flightAnimation.value(1.)
+				: state->giftsLanded
+				? 1.
+				: 0.;
+			const auto loadingShown = state->loadingStartedTime
+				&& !state->loadingFadingOut;
+			if (firstFlyProgress < 1.) {
+				const auto skipForgeIcon = loadingShown && anim::Disabled();
+				PaintCubeFirstFlight(
+					p,
+					state,
+					firstFlyProgress,
+					skipForgeIcon);
+			} else {
+				PaintCube(p, state, raw, cubeCenter, cubeSize);
+			}
+
+			if (flying >= 0) {
+				const auto &corner = shared->corners[flying];
+				const auto progress = (flying > 0)
+					? state->flightAnimation.value(1.)
+					: firstFlyProgress;
+
+				if (state->flightTargetCorners) {
+					const auto sourceRect = QRectF(corner.originalRect)
+						.translated(0, craftingOffsetY);
+					const auto sourceCorners = RectToCorners(sourceRect);
+					const auto interpolatedCorners = InterpolateQuadCorners(
+						sourceCorners,
+						*state->flightTargetCorners,
+						progress);
+					PaintFlyingGiftWithQuad(
+						p,
+						corner,
+						interpolatedCorners,
+						progress);
+				} else {
+					const auto position = ComputeGiftFlightPosition(
+						corner.originalRect,
+						cubeCenter,
+						cubeSize,
+						progress,
+						craftingOffsetY);
+					PaintFlyingGift(p, corner, position, progress);
+				}
+			}
+
+			PaintLoadingAnimation(p, state);
+
+			if (const auto opacity = state->failureOpacity.current()) {
+				PaintFailureThumbnails(
+					p,
+					shared,
+					craftingSize,
+					opacity);
+			}
+		}
+
+		state->progressOpacity = state->progressFadeIn.value(
+			state->progressShown.current() ? 1. : 0.);
+		state->failureOpacity = state->failureFadeIn.value(
+			state->failureShown.current() ? 1. : 0.);
+	});
+
+	const auto startFlying = [=] {
+		if (state->loadingStartedTime > 0) {
+			state->loadingFadingOut = true;
+			state->loadingShownAnimation.start(
+				[=] { raw->update(); },
+				1.,
+				0.,
+				kLoadingFadeOutDuration);
+		}
+		StartGiftFlight(state, raw, 0);
+	};
+
+	const auto tryStartFlying = [=] {
+		const auto slideFinished = !state->slideOutAnimation.animating();
+		const auto resultArrived = state->craftResult.has_value();
+		const auto notYetFlying = (state->currentlyFlying < 0)
+			&& (state->giftsLanded == 0);
+		if (!slideFinished || !notYetFlying) {
+			return;
+		}
+		if (!resultArrived) {
+			if (!state->loadingStartedTime) {
+				state->loadingStartedTime = crl::now();
+				state->loadingAnimation->start();
+				state->loadingShownAnimation.start(
+					[=] { raw->update(); },
+					0.,
+					1.,
+					kLoadingFadeInDuration);
+			}
+			return;
+		}
+		if (!state->loadingStartedTime) {
+			startFlying();
+			return;
+		}
+		const auto elapsed = crl::now() - state->loadingStartedTime;
+		if (elapsed >= kLoadingMinDuration) {
+			startFlying();
+		} else {
+			base::call_delayed(
+				kLoadingMinDuration - elapsed,
+				raw,
+				startFlying);
+		}
+	};
+
+	state->progressShown = true;
+
+	state->slideOutAnimation.start([=] {
+		raw->update();
+
+		const auto progress = state->slideOutAnimation.value(1.);
+		if (progress >= 1.) {
+			tryStartFlying();
+		}
+	}, 0., 1., crl::time(300), anim::easeOutCubic);
+
+	state->continuousAnimation.init([=](crl::time now) {
+		if (state->currentPhaseIndex >= 0) {
+			const auto &config = kGiftAnimations[state->currentPhaseIndex];
+			const auto elapsed = state->currentPhaseFinished
+				? (config.duration * Slowing())
+				: (now - state->animationStartTime);
+			const auto initial = Rotation{
+				state->initialRotationX,
+				state->initialRotationY,
+			};
+			const auto r = config.rotation(initial, elapsed / Slowing());
+			state->rotationX = r.x;
+			state->rotationY = r.y;
+		}
+
+		raw->update();
+
+		if (state->currentlyFlying >= 0
+			&& !state->flightAnimation.animating()) {
+			LandCurrentGift(state, now);
+		}
+
+		if (!state->flightAnimation.animating()
+			&& state->currentlyFlying < 0
+			&& state->giftsLanded > 0
+			&& state->giftsLanded < state->totalGifts
+			&& state->currentPhaseIndex >= 0) {
+			const auto elapsed = now - state->animationStartTime;
+			const auto start = state->animationDuration - kFlightDuration;
+			if (elapsed >= start * Slowing()) {
+				StartGiftFlightToFace(state, raw, state->nextFaceIndex);
+			}
+		}
+
+		const auto success = state->successAnimation.get();
+		if (!state->currentPhaseFinished
+			&& !state->flightAnimation.animating()
+			&& state->currentlyFlying < 0
+			&& state->giftsLanded >= state->totalGifts
+			&& state->totalGifts > 0
+			&& state->currentPhaseIndex >= 0) {
+			const auto elapsed = now - state->animationStartTime;
+			if (elapsed >= state->animationDuration * Slowing()) {
+				state->currentPhaseFinished = true;
+				if (success) {
+					const auto wasContent = box->height();
+					const auto wasTotal = box->parentWidget()->height();
+					const auto wasButtons = wasTotal - wasContent;
+
+					container->clear();
+					container->add(std::move(success->owned));
+
+					box->setStyle(st::giftBox);
+
+					auto craftAnotherCallback = crl::guard(box, [=] {
+						retryWithNewGift([=] { box->closeBox(); });
+					});
+
+					const auto entry = EntryForUpgradedGift(
+						*state->craftResult,
+						0,
+						nullptr,
+						craftAnotherCallback);
+					Settings::GenericCreditsEntryBody(box, show, entry);
+					container->resizeToWidth(st::boxWideWidth);
+
+					const auto nowContent = box->height();
+					const auto nowTotal = box->parentWidget()->height();
+					const auto nowButtons = nowTotal - nowContent;
+
+					box->animateHeightFrom(
+						wasContent + wasButtons - nowButtons);
+					success->hiding = true;
+					const auto duration = kSuccessExpandDuration
+						- kSuccessExpandStart;
+					success->heightAnimation.start([=] {
+						const auto height = anim::interpolate(
+							craftingSize.height(),
+							success->coverHeight,
+							success->heightAnimation.value(1.));
+						raw->resize(craftingSize.width(), height);
+					}, 0., 1., duration, anim::easeOutCubic);
+
+					raw->setParent(box->parentWidget());
+					raw->show();
+				}
+			}
+		}
+		if (success && success->finished) {
+			state->continuousAnimation.stop();
+			raw->hide();
+
+			StartFireworks(box->parentWidget());
+		}
+		return true;
+	});
+
+	container->add(std::move(canvas));
+
+	if (startRequest) {
+		const auto weak = base::make_weak(raw);
+		startRequest([=](CraftResult result) {
+			if (!weak) {
+				return;
+			} else if (v::is<CraftResultError>(result)) {
+				box->uiShow()->show(MakeInformBox({
+					.text = v::get<CraftResultError>(result).type,
+				}));
+				box->closeBox();
+				return;
+			} else if (v::is<CraftResultWait>(result)) {
+				const auto when = base::unixtime::now()
+					+ v::get<CraftResultWait>(result).seconds;
+				ShowCraftLaterError(box->uiShow(), when);
+				box->closeBox();
+				return;
+			}
+			using Result = std::shared_ptr<Data::GiftUpgradeResult>;
+			state->craftResult = v::get<Result>(result);
+			if (const auto result = state->craftResult->get()) {
+				auto numberText = (result->info.unique && result->info.unique->number > 0)
+					? rpl::single(u"#"_q + Lang::FormatCountDecimal(result->info.unique->number))
+					: rpl::producer<QString>();
+
+				state->successAnimation = std::make_unique<
+					CraftDoneAnimation
+				>(CraftDoneAnimation{
+					.owned = MakeUniqueGiftCover(
+						container,
+						rpl::single(UniqueGiftCover{ *result->info.unique }),
+						{ .numberText = std::move(numberText) }),
+				});
+				const auto success = state->successAnimation.get();
+
+				const auto raw = success->owned.get();
+				success->widget = raw;
+				raw->hide();
+				raw->resizeToWidth(st::boxWideWidth);
+				SendPendingMoveResizeEvents(raw);
+
+				success->coverHeight = raw->height();
+				success->coverShift = state->shared->forgeRect.y()
+					+ (state->shared->forgeRect.height() / 2)
+					- (raw->height() / 2);
+			}
+			tryStartFlying();
+		});
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_craft_animation.h b/Telegram/SourceFiles/boxes/star_gift_craft_animation.h
new file mode 100644
index 00000000000000..c1a1aa58e15056
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/star_gift_craft_animation.h
@@ -0,0 +1,223 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+#include "base/unique_qptr.h"
+#include "data/data_star_gift.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/radial_animation.h"
+#include "lottie/lottie_icon.h"
+#include "ui/text/text_custom_emoji.h"
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace HistoryView {
+class StickerPlayer;
+} // namespace HistoryView
+
+namespace Info::PeerGifts {
+class GiftButton;
+} // namespace Info::PeerGifts
+
+namespace Ui {
+
+class FlatLabel;
+class GenericBox;
+class RpWidget;
+class VerticalLayout;
+class UniqueGiftCoverWidget;
+
+struct CraftResultError {
+	QString type;
+};
+
+struct CraftResultWait {
+	TimeId seconds = 0;
+};
+
+using CraftResult = std::variant<
+	std::shared_ptr<Data::GiftUpgradeResult>,
+	CraftResultError,
+	CraftResultWait>;
+
+struct BackdropView {
+	Data::UniqueGiftBackdrop colors;
+	QImage gradient;
+};
+
+struct PatternView {
+	std::unique_ptr<Text::CustomEmoji> emoji;
+	base::flat_map<int, base::flat_map<float64, QImage>> emojis;
+};
+
+struct CraftState {
+	struct Cover {
+		BackdropView backdrop;
+		PatternView pattern;
+		QColor button1;
+		QColor button2;
+		Animations::Simple shownAnimation;
+		bool shown = false;
+	};
+
+	std::array<Cover, 5> covers; // Last one for failed background.
+	rpl::variable<QColor> edgeColor;
+	QColor button1;
+	QColor button2;
+	bool coversAnimate = false;
+	bool craftingStarted = false;
+	QImage craftBg;
+
+	QImage topPart;
+	QRect topPartRect;
+	QImage bottomPart;
+	int bottomPartY = 0;
+
+	struct CornerSnapshot {
+		base::unique_qptr<Info::PeerGifts::GiftButton> giftButton;
+		mutable QImage giftFrame;
+		QImage percentBadge;
+		QImage removeButton;
+		QImage addButton;
+		QRect originalRect;
+		mutable bool giftFrameFinal = false;
+
+		[[nodiscard]] QImage gift(float64 progress) const;
+	};
+	std::array<CornerSnapshot, 4> corners;
+
+	QRect forgeRect;
+
+	QColor forgeBgOverlay;
+	QColor forgeBg1;
+	QColor forgeBg2;
+	QColor forgeFail;
+	QImage forgePercent;
+
+	struct EmptySide {
+		QColor bg;
+		QImage frame;
+	};
+	std::array<EmptySide, 6> forgeSides;
+
+	Main::Session *session = nullptr;
+
+	int containerHeight = 0;
+	int craftingTop = 0;
+	int craftingBottom = 0;
+	int craftingAreaCenterY = 0;
+	int originalButtonY = 0;
+
+	QString giftName;
+	int successPermille = 0;
+	struct LostGift {
+		int cornerIndex = -1;
+		QString number;
+		mutable QImage badgeCache;
+	};
+	std::vector<LostGift> lostGifts;
+	QImage lostRadial;
+
+	void paint(
+		QPainter &p,
+		QSize size,
+		int craftingHeight,
+		float64 slideProgress = 0.);
+	void updateForGiftCount(int count, Fn<void()> repaint);
+	[[nodiscard]] EmptySide prepareEmptySide(int index) const;
+};
+
+struct FacePlacement {
+	int face = -1;
+	int rotation = 0;
+};
+
+struct CraftDoneAnimation {
+	object_ptr<UniqueGiftCoverWidget> owned;
+	UniqueGiftCoverWidget *widget = nullptr;
+	Animations::Simple shownAnimation;
+	Animations::Simple heightAnimation;
+	QImage frame;
+	int coverHeight = 0;
+	int coverShift = 0;
+	float64 expanded = 0.;
+	bool finished = false;
+	bool hiding = false;
+};
+
+struct CraftFailAnimation {
+	QImage frame;
+	std::unique_ptr<Lottie::Icon> lottie;
+	bool started = false;
+	int finalCoverIndex = -1;
+	rpl::lifetime lifetime;
+};
+
+struct CraftAnimationState {
+	std::shared_ptr<CraftState> shared;
+
+	Animations::Simple slideOutAnimation;
+	Animations::Basic continuousAnimation;
+
+	float64 rotationX = 0.;
+	float64 rotationY = 0.;
+
+	int currentlyFlying = -1;
+	int giftsLanded = 0;
+	int totalGifts = 0;
+	bool allGiftsLanded = false;
+	bool currentPhaseFinished = false;
+	std::array<FacePlacement, 4> giftToSide;
+	Animations::Simple flightAnimation;
+
+	int currentPhaseIndex = -1;
+	crl::time animationStartTime = 0;
+	crl::time animationDuration = 0;
+	float64 initialRotationX = 0.;
+	float64 initialRotationY = 0.;
+	int nextFaceIndex = 0;
+	int nextFaceRotation = 0;
+	bool nextFaceRevealed = false;
+
+	std::optional<std::array<QPointF, 4>> flightTargetCorners;
+
+	std::optional<std::shared_ptr<Data::GiftUpgradeResult>> craftResult;
+	std::unique_ptr<InfiniteRadialAnimation> loadingAnimation;
+	Animations::Simple loadingShownAnimation;
+	crl::time loadingStartedTime = 0;
+	bool loadingFadingOut = false;
+
+	std::unique_ptr<CraftDoneAnimation> successAnimation;
+	std::unique_ptr<CraftFailAnimation> failureAnimation;
+
+	rpl::variable<float64> progressOpacity;
+	Animations::Simple progressFadeIn;
+	rpl::variable<bool> progressShown;
+
+	rpl::variable<float64> failureOpacity;
+	Animations::Simple failureFadeIn;
+	rpl::variable<bool> failureShown;
+
+	Fn<void()> retryWithNewGift;
+};
+
+void StartCraftAnimation(
+	not_null<GenericBox*> box,
+	std::shared_ptr<ChatHelpers::Show> show,
+	std::shared_ptr<CraftState> state,
+	Fn<void(Fn<void(CraftResult)> callback)> startRequest,
+	Fn<void(Fn<void()> closeCurrent)> retryWithNewGift);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_craft_box.cpp b/Telegram/SourceFiles/boxes/star_gift_craft_box.cpp
new file mode 100644
index 00000000000000..6e30430ad0c89b
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/star_gift_craft_box.cpp
@@ -0,0 +1,1769 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/star_gift_craft_box.h"
+
+#include "base/call_delayed.h"
+#include "base/event_filter.h"
+#include "base/random.h"
+#include "base/timer_rpl.h"
+#include "base/unixtime.h"
+#include "boxes/star_gift_auction_box.h"
+#include "boxes/star_gift_craft_animation.h"
+#include "boxes/star_gift_preview_box.h"
+#include "boxes/star_gift_resale_box.h"
+#include "apiwrap.h"
+#include "api/api_credits.h"
+#include "api/api_premium.h"
+#include "boxes/star_gift_box.h"
+#include "data/components/gift_auctions.h"
+#include "core/ui_integration.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_document.h"
+#include "data/data_session.h"
+#include "data/data_star_gift.h"
+#include "data/data_user.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "ui/boxes/about_cocoon_box.h" // AddUniqueCloseButton.
+#include "ui/boxes/confirm_box.h"
+#include "ui/controls/button_labels.h"
+#include "ui/controls/feature_list.h"
+#include "ui/effects/numbers_animation.h"
+#include "ui/layers/generic_box.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/gradient_round_button.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/painter.h"
+#include "ui/top_background_gradient.h"
+#include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h" // stickerPanDeleteIconFg
+#include "styles/style_credits.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+
+namespace Ui {
+namespace {
+
+using namespace Info::PeerGifts;
+
+struct ColorScheme {
+	Data::UniqueGiftBackdrop backdrop;
+	QColor button1;
+	QColor button2;
+};
+
+[[nodiscard]] QColor ForgeBgOverlay() {
+	return QColor(0xBA, 0xDF, 0xFF, 32);
+}
+
+[[nodiscard]] QColor ForgeFailOverlay() {
+	return QColor(0xE1, 0x79, 0x23, 41);
+}
+
+[[nodiscard]] std::array<ColorScheme, 5> CraftBackdrops() {
+	struct Colors {
+		int center = 0;
+		int edge = 0;
+		int pattern = 0;
+		int button1 = 0;
+		int button2 = 0;
+	};
+	const auto hardcoded = [](Colors colors) {
+		auto result = ColorScheme();
+		const auto color = [](int value) {
+			return QColor(
+				(uint32(value) >> 16) & 0xFF,
+				(uint32(value) >> 8) & 0xFF,
+				(uint32(value)) & 0xFF);
+		};
+		result.backdrop.centerColor = color(colors.center);
+		result.backdrop.edgeColor = color(colors.edge);
+		result.backdrop.patternColor = color(colors.pattern);
+		result.button1 = color(colors.button1);
+		result.button2 = color(colors.button2);
+		return result;
+	};
+	return {
+		hardcoded({ 0x2C4359, 0x232E3F, 0x040C1A, 0x10A5DF, 0x2091E9 }),
+		hardcoded({ 0x2C4359, 0x232E3F, 0x040C1A, 0x10A5DF, 0x2091E9 }),
+		hardcoded({ 0x2C4359, 0x232E3F, 0x040C1A, 0x10A5DF, 0x2091E9 }),
+		hardcoded({ 0x1C4843, 0x1A2E37, 0x040C1A, 0x3ACA49, 0x007D9E }),
+		hardcoded({ 0x5D2E16, 0x371B1A, 0x040C1A, 0xE27519, 0xDD4819 }),
+	};
+}
+
+struct GiftForCraft {
+	std::shared_ptr<Data::UniqueGift> unique;
+	Data::SavedStarGiftId manageId;
+
+	[[nodiscard]] QString slugId() const {
+		return unique ? unique->slug : QString();
+	}
+
+	explicit operator bool() const {
+		return unique != nullptr;
+	}
+	friend inline bool operator==(
+		const GiftForCraft &,
+		const GiftForCraft &) = default;
+};
+
+struct CraftingView {
+	object_ptr<RpWidget> widget;
+	rpl::producer<int> editRequests;
+	rpl::producer<int> removeRequests;
+	Fn<void(std::shared_ptr<CraftState>)> grabForAnimation;
+};
+
+void ShowGiftCraftBox(
+	not_null<Window::SessionController*> controller,
+	std::vector<GiftForCraft> gifts,
+	bool autoStartCraft);
+
+[[nodiscard]] QString FormatPercent(int permille) {
+	const auto rounded = (permille + 5) / 10;
+	return QString::number(rounded) + '%';
+}
+
+[[nodiscard]] not_null<RpWidget*> MakeRadialPercent(
+		not_null<RpWidget*> parent,
+		const style::CraftRadialPercent &st,
+		rpl::producer<int> permille,
+		Fn<QString(int)> format = FormatPercent) {
+	auto raw = CreateChild<RpWidget>(parent);
+
+	struct State {
+		State(const style::CraftRadialPercent &st, Fn<void()> callback)
+		: numbers(st.font, std::move(callback)) {
+			numbers.setDisabledMonospace(true);
+		}
+
+		Animations::Simple animation;
+		NumbersAnimation numbers;
+		int permille = -1;
+	};
+	const auto state = raw->lifetime().make_state<State>(
+		st,
+		[=] { raw->update(); });
+
+	std::move(permille) | rpl::on_next([=](int value) {
+		if (state->permille == value) {
+			return;
+		}
+		state->animation.start([=] {
+			raw->update();
+		}, state->permille, value, st::slideWrapDuration);
+		state->permille = value;
+		state->numbers.setText(format(value), value);
+	}, raw->lifetime());
+	state->animation.stop();
+	state->numbers.finishAnimating();
+
+	raw->show();
+	raw->setAttribute(Qt::WA_TransparentForMouseEvents);
+	raw->paintOn([=, &st](QPainter &p) {
+		static constexpr auto kArcSkip = arc::kFullLength / 4;
+		static constexpr auto kArcStart = -(arc::kHalfLength - kArcSkip) / 2;
+		static constexpr auto kArcLength = arc::kFullLength - kArcSkip;
+
+		const auto paint = [&](QColor color, float64 permille) {
+			p.setPen(QPen(color, st.stroke, Qt::SolidLine, Qt::RoundCap));
+			p.setBrush(Qt::NoBrush);
+			const auto part = kArcLength * (permille / 1000.);
+			const auto length = int(base::SafeRound(part));
+			const auto inner = raw->rect().marginsRemoved(
+				{ st.stroke, st.stroke, st.stroke, st.stroke });
+			p.drawArc(inner, kArcStart + kArcLength - length, length);
+		};
+
+		auto hq = PainterHighQualityEnabler(p);
+
+		auto inactive = QColor(255, 255, 255, 64);
+		paint(inactive, 1000.);
+		paint(st::white->c, state->animation.value(state->permille));
+
+		state->numbers.paint(
+			p,
+			(raw->width() - state->numbers.countWidth()) / 2,
+			raw->height() - st.font->height,
+			raw->width());
+	});
+
+	return raw;
+}
+
+AbstractButton *MakeCornerButton(
+		not_null<RpWidget*> parent,
+		not_null<GiftButton*> button,
+		object_ptr<RpWidget> content,
+		style::align align,
+		const GiftForCraft &gift,
+		rpl::producer<QColor> edgeColor) {
+	Expects(content != nullptr);
+
+	const auto result = CreateChild<AbstractButton>(parent);
+	result->show();
+
+	const auto inner = content.release();
+	inner->setParent(result);
+	inner->show();
+	inner->sizeValue() | rpl::on_next([=](QSize size) {
+		result->resize(size);
+	}, result->lifetime());
+	inner->move(0, 0);
+
+	rpl::combine(
+		button->geometryValue(),
+		result->sizeValue()
+	) | rpl::on_next([=](QRect geometry, QSize size) {
+		const auto extend = st::defaultDropdownMenu.wrap.shadow.extend;
+		geometry = geometry.marginsRemoved(extend);
+		const auto out = QPoint(size.width(), size.height()) / 3;
+		const auto left = (align == style::al_left)
+			? (geometry.x() - out.x())
+			: (geometry.x() + geometry.width() - size.width() + out.x());
+		const auto top = geometry.y() - out.y();
+		result->move(left, top);
+	}, result->lifetime());
+
+	struct State {
+		rpl::variable<QColor> edgeColor;
+		QColor buttonEdgeColor;
+	};
+	const auto state = result->lifetime().make_state<State>();
+	state->edgeColor = std::move(edgeColor);
+	state->buttonEdgeColor = gift.unique->backdrop.edgeColor;
+	result->paintOn([=](QPainter &p) {
+		const auto right = result->width();
+		const auto bottom = result->height();
+		const auto add = QPoint(right, bottom) / 3;
+		const auto radius = bottom / 2.;
+		auto gradient = QLinearGradient(
+			(align == style::al_left) ? -add.x() : (right + add.x()),
+			-add.y(),
+			(align == style::al_left) ? (right + add.x()) : -add.x(),
+			bottom + add.y());
+		gradient.setColorAt(0, state->edgeColor.current());
+		gradient.setColorAt(1, state->buttonEdgeColor);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(gradient);
+		p.drawRoundedRect(result->rect(), radius, radius);
+	});
+
+	return result;
+}
+
+AbstractButton *MakePercentButton(
+		not_null<RpWidget*> parent,
+		not_null<GiftButton*> button,
+		const GiftForCraft &gift,
+		rpl::producer<QColor> edgeColor) {
+	auto label = object_ptr<FlatLabel>(
+		parent,
+		FormatPercent(gift.unique->craftChancePermille),
+		st::craftPercentLabel);
+	label->setTextColorOverride(st::white->c);
+	const auto result = MakeCornerButton(
+		parent,
+		button,
+		std::move(label),
+		style::al_left,
+		gift,
+		std::move(edgeColor));
+	result->setAttribute(Qt::WA_TransparentForMouseEvents);
+	return result;
+}
+
+AbstractButton *MakeRemoveButton(
+		not_null<RpWidget*> parent,
+		not_null<GiftButton*> button,
+		int size,
+		const GiftForCraft &gift,
+		Fn<void()> onClick,
+		rpl::producer<QColor> edgeColor,
+		const style::icon &icon) {
+	auto remove = object_ptr<RpWidget>(parent);
+	const auto add = (size - icon.width()) / 2;
+	remove->resize(icon.size() + QSize(add, add) * 2);
+	remove->paintOn([=, &icon](QPainter &p) {
+		icon.paint(p, add, add, add * 2 + icon.width(), st::white->c);
+	});
+	remove->setAttribute(Qt::WA_TransparentForMouseEvents);
+	const auto result = MakeCornerButton(
+		parent,
+		button,
+		std::move(remove),
+		style::al_right,
+		gift,
+		std::move(edgeColor));
+	result->setClickedCallback(std::move(onClick));
+	return result;
+}
+
+[[nodiscard]] CraftingView MakeCraftingView(
+		not_null<RpWidget*> parent,
+		not_null<Main::Session*> session,
+		rpl::producer<std::vector<GiftForCraft>> chosen,
+		rpl::producer<QColor> edgeColor) {
+	const auto width = st::boxWideWidth;
+
+	const auto buttonPadding = st::craftPreviewPadding;
+	const auto buttonSize = st::giftBoxGiftTiny;
+	const auto height = 2
+		* (buttonPadding.top() + buttonSize + buttonPadding.bottom());
+
+	auto widget = object_ptr<FixedHeightWidget>(parent, height);
+	const auto raw = widget.data();
+
+	struct Entry {
+		GiftForCraft gift;
+		GiftButton *button = nullptr;
+		AbstractButton *add = nullptr;
+		AbstractButton *percent = nullptr;
+		AbstractButton *remove = nullptr;
+	};
+	struct State {
+		explicit State(not_null<Main::Session*> session)
+		: delegate(session, GiftButtonMode::CraftPreview) {
+		}
+
+		Delegate delegate;
+		std::array<Entry, 4> entries;
+		Fn<void(int)> refreshButton;
+		rpl::event_stream<int> editRequests;
+		rpl::event_stream<int> removeRequests;
+		rpl::variable<int> chancePermille;
+		rpl::variable<QColor> edgeColor;
+		RpWidget *forgeRadial = nullptr;
+	};
+	const auto state = parent->lifetime().make_state<State>(session);
+	state->edgeColor = std::move(edgeColor);
+
+	state->refreshButton = [=](int index) {
+		Expects(index >= 0 && index < state->entries.size());
+
+		auto &entry = state->entries[index];
+		const auto single = state->delegate.buttonSize();
+		const auto geometry = QRect(
+			((index % 2)
+				? (width - buttonPadding.left() - single.width())
+				: buttonPadding.left()),
+			((index < 2)
+				? buttonPadding.top()
+				: (height - buttonPadding.top() - single.height())),
+			single.width(),
+			single.height());
+		delete base::take(entry.add);
+		delete base::take(entry.button);
+		delete base::take(entry.percent);
+		delete base::take(entry.remove);
+
+		if (entry.gift) {
+			entry.button = CreateChild<GiftButton>(raw, &state->delegate);
+			entry.button->setDescriptor(GiftTypeStars{
+				.info = {
+					.id = entry.gift.unique->initialGiftId,
+					.unique = entry.gift.unique,
+					.document = entry.gift.unique->model.document,
+				},
+			}, GiftButton::Mode::CraftPreview);
+			entry.button->show();
+			entry.button->setClickedCallback([=] {
+				state->editRequests.fire_copy(index);
+			});
+			entry.button->setGeometry(
+				geometry,
+				state->delegate.buttonExtend());
+
+			entry.percent = MakePercentButton(
+				raw,
+				entry.button,
+				entry.gift,
+				state->edgeColor.value());
+		} else {
+			entry.add = CreateChild<AbstractButton>(raw);
+			entry.add->show();
+			entry.add->paintOn([=](QPainter &p) {
+				auto hq = PainterHighQualityEnabler(p);
+				const auto radius = st::boxRadius;
+				p.setPen(Qt::NoPen);
+				p.setBrush(ForgeBgOverlay());
+
+				const auto rect = QRect(QPoint(), geometry.size());
+				p.drawRoundedRect(rect, radius, radius);
+
+				const auto &icon = st::craftAddIcon;
+				icon.paintInCenter(p, rect, st::white->c);
+			});
+			entry.add->setClickedCallback([=] {
+				state->editRequests.fire_copy(index);
+			});
+			entry.add->setGeometry(geometry);
+		}
+
+		const auto count = 4 - ranges::count(
+			state->entries,
+			nullptr,
+			&Entry::button);
+		const auto canRemove = (count > 1);
+		const auto secondHasAddress = state->entries[1].gift
+			&& !state->entries[1].gift.unique->giftAddress.isEmpty();
+		for (auto i = 0; i != 4; ++i) {
+			auto &entry = state->entries[i];
+			if (entry.button) {
+				delete base::take(entry.remove);
+				if (canRemove) {
+					const auto needReplace = (i == 0) && secondHasAddress;
+					const auto callback = [=] {
+						if (needReplace) {
+							state->editRequests.fire_copy(0);
+						} else {
+							state->removeRequests.fire_copy(i);
+						}
+					};
+					const auto &icon = needReplace
+						? st::craftReplaceIcon
+						: st::stickerPanDeleteIconFg;
+					entry.remove = MakeRemoveButton(
+						raw,
+						entry.button,
+						entry.percent->height(),
+						entry.gift,
+						callback,
+						state->edgeColor.value(),
+						icon);
+				}
+			}
+		}
+	};
+
+	std::move(
+		chosen
+	) | rpl::on_next([=](const std::vector<GiftForCraft> &gifts) {
+		auto chance = 0;
+		for (auto i = 0; i != 4; ++i) {
+			auto &entry = state->entries[i];
+			const auto gift = (i < gifts.size()) ? gifts[i] : GiftForCraft();
+			chance += gift.unique ? gift.unique->craftChancePermille : 0;
+			if (entry.gift == gift && (entry.button || entry.add)) {
+				continue;
+			}
+			entry.gift = gift;
+			state->refreshButton(i);
+		}
+		state->chancePermille = chance;
+	}, raw->lifetime());
+
+	const auto center = [&] {
+		const auto buttonPadding = st::craftPreviewPadding;
+		const auto buttonSize = st::giftBoxGiftTiny;
+		const auto left = buttonPadding.left()
+			+ buttonSize
+			+ buttonPadding.right();
+		const auto center = (width - 2 * left);
+		const auto top = (height - center) / 2;
+		return QRect(left, top, center, center);
+	}();
+	raw->paintOn([=](QPainter &p) {
+		auto hq = PainterHighQualityEnabler(p);
+
+		const auto radius = st::boxRadius;
+
+		p.setPen(Qt::NoPen);
+		p.setBrush(ForgeBgOverlay());
+
+		p.drawRoundedRect(center, radius, radius);
+
+		st::craftForge.paintInCenter(p, center, st::white->c);
+	});
+
+	state->forgeRadial = MakeRadialPercent(
+		raw,
+		st::craftForgePercent,
+		state->chancePermille.value());
+	state->forgeRadial->setGeometry(center.marginsRemoved({
+		st::craftForgePadding,
+		st::craftForgePadding,
+		st::craftForgePadding,
+		st::craftForgePadding,
+	}));
+
+	auto grabForAnimation = [=](std::shared_ptr<CraftState> craftState) {
+		craftState->forgeRect = center;
+		craftState->forgePercent = GrabWidgetToImage(state->forgeRadial);
+
+		auto giftsTotal = 0;
+		auto lostIndex = 0;
+		for (auto i = 0; i != 4; ++i) {
+			auto &entry = state->entries[i];
+			auto &corner = craftState->corners[i];
+
+			if (entry.button) {
+				corner.originalRect = entry.button->geometry();
+				if (entry.percent) {
+					corner.percentBadge = GrabWidgetToImage(entry.percent);
+				}
+				if (entry.remove) {
+					corner.removeButton = GrabWidgetToImage(entry.remove);
+				}
+				if (lostIndex < craftState->lostGifts.size()) {
+					craftState->lostGifts[lostIndex].cornerIndex = i;
+					++lostIndex;
+				}
+				corner.giftButton.reset(entry.button);
+				entry.button->setParent(parent);
+				base::take(entry.button)->hide();
+
+				++giftsTotal;
+			} else if (entry.add) {
+				corner.addButton = GrabWidgetToImage(entry.add);
+				corner.originalRect = entry.add->geometry();
+			}
+		}
+
+		const auto failedCount = MakeRadialPercent(
+			raw,
+			st::craftForgePercent,
+			rpl::single(0),
+			[=](int) { return QString::number(giftsTotal); });
+		failedCount->setGeometry(state->forgeRadial->geometry());
+		craftState->lostRadial = GrabWidgetToImage(failedCount);
+		delete failedCount;
+
+		const auto overlayBg = craftState->forgeBgOverlay = ForgeBgOverlay();
+		const auto backdrop = CraftBackdrops()[giftsTotal - 1].backdrop;
+		craftState->forgeBg1 = anim::color(
+			backdrop.centerColor,
+			QColor(overlayBg.red(), overlayBg.green(), overlayBg.blue()),
+			overlayBg.alphaF());
+		craftState->forgeBg2 = anim::color(
+			backdrop.edgeColor,
+			QColor(overlayBg.red(), overlayBg.green(), overlayBg.blue()),
+			overlayBg.alphaF());
+		const auto overlayFail = ForgeFailOverlay();
+		craftState->forgeFail = anim::color(
+			CraftBackdrops().back().backdrop.centerColor,
+			QColor(overlayFail.red(), overlayFail.green(), overlayFail.blue()),
+			overlayFail.alphaF());
+		for (auto i = 0; i != 6; ++i) {
+			craftState->forgeSides[i] = craftState->prepareEmptySide(i);
+		}
+	};
+
+	return {
+		.widget = std::move(widget),
+		.editRequests = state->editRequests.events(),
+		.removeRequests = state->removeRequests.events(),
+		.grabForAnimation = std::move(grabForAnimation),
+	};
+}
+
+void AddCraftGiftsList(
+		not_null<Window::SessionController*> window,
+		not_null<VerticalLayout*> container,
+		Data::CraftGiftsDescriptor descriptor,
+		const std::vector<GiftForCraft> &selected,
+		Fn<void(std::shared_ptr<Data::UniqueGift>)> chosen) {
+	struct State {
+		rpl::event_stream<> updated;
+		Data::CraftGiftsDescriptor data;
+		rpl::variable<bool> empty = true;
+		rpl::lifetime loading;
+	};
+	const auto state = container->lifetime().make_state<State>();
+	state->data = std::move(descriptor);
+
+	using Descriptor = Info::PeerGifts::GiftDescriptor;
+	using StarGift = Info::PeerGifts::GiftTypeStars;
+	auto handler = crl::guard(container, [=](Descriptor descriptor) {
+		Expects(v::is<StarGift>(descriptor));
+
+		const auto unique = v::get<StarGift>(descriptor).info.unique;
+		chosen(unique);
+	});
+
+	auto gifts = rpl::single(
+		rpl::empty
+	) | rpl::then(state->updated.events()) | rpl::map([=] {
+		auto result = GiftsDescriptor();
+		const auto selfId = window->session().userPeerId();
+		for (const auto &gift : state->data.list) {
+			result.list.push_back(Info::PeerGifts::GiftTypeStars{
+				.info = gift.info,
+				.resale = true,
+				.mine = (gift.info.unique->ownerId == selfId),
+				});
+		}
+		state->empty = result.list.empty();
+		return result;
+	});
+	const auto peer = window->session().user();
+	const auto loadMore = [=] {
+		if (!state->data.offset.isEmpty() && !state->loading) {
+			state->loading = Data::CraftGiftsSlice(
+				&peer->session(),
+				state->data.giftId,
+				state->data.offset
+			) | rpl::on_next([=](Data::CraftGiftsDescriptor &&slice) {
+				state->loading.destroy();
+				state->data.offset = slice.list.empty()
+					? QString()
+					: slice.offset;
+				state->data.list.insert(
+					end(state->data.list),
+					std::make_move_iterator(begin(slice.list)),
+					std::make_move_iterator(end(slice.list)));
+				state->updated.fire({});
+			});
+		}
+	};
+	container->add(MakeGiftsList({
+		.window = window,
+		.mode = GiftsListMode::Craft,
+		.peer = peer,
+		.gifts = std::move(gifts),
+		.selected = (selected
+			| ranges::views::transform(&GiftForCraft::unique)
+			| ranges::to_vector),
+		.loadMore = loadMore,
+		.handler = handler,
+	}));
+
+	const auto skip = st::defaultSubsectionTitlePadding.top();
+	const auto wrap = container->add(
+		object_ptr<SlideWrap<FlatLabel>>(
+			container,
+			object_ptr<FlatLabel>(
+				container,
+				tr::lng_gift_craft_select_none(),
+				st::craftYourListEmpty),
+			(st::boxRowPadding + QMargins(0, 0, 0, skip))),
+		style::al_top);
+	state->empty.value() | rpl::on_next([=](bool empty) {
+		// Scroll doesn't jump up if we show before rows are cleared,
+		// and we hide after rows are added.
+		if (empty) {
+			wrap->show(anim::type::instant);
+		} else {
+			crl::on_main(wrap, [=] {
+				if (!state->empty.current()) {
+					wrap->hide(anim::type::instant);
+				}
+			});
+		}
+	}, wrap->lifetime());
+	wrap->entity()->setTryMakeSimilarLines(true);
+}
+
+void ShowSelectGiftBox(
+		not_null<Window::SessionController*> controller,
+		uint64 giftId,
+		Fn<void(GiftForCraft)> chosen,
+		std::vector<GiftForCraft> selected,
+		Fn<void()> boxClosed,
+		bool firstSlot) {
+	struct Entry {
+		Data::SavedStarGift gift;
+		GiftButton *button = nullptr;
+	};
+	struct State {
+		std::vector<Entry> entries;
+
+		Data::CraftGiftsDescriptor craft;
+		Data::ResaleGiftsDescriptor resale;
+
+		rpl::lifetime craftLifetime;
+		rpl::lifetime resaleLifetime;
+	};
+
+	const auto session = &controller->session();
+	const auto state = std::make_shared<State>();
+
+	const auto make = [=](not_null<GenericBox*> box) {
+		box->setTitle(tr::lng_gift_craft_select_title());
+		box->setWidth(st::boxWideWidth);
+
+		box->boxClosing() | rpl::on_next(boxClosed, box->lifetime());
+
+		AddSubsectionTitle(
+			box->verticalLayout(),
+			tr::lng_gift_craft_select_your());
+
+		const auto got = crl::guard(box, [=](
+				std::shared_ptr<Data::UniqueGift> gift) {
+			if (ShowCraftLaterError(box->uiShow(), gift)
+				|| (firstSlot
+					&& ShowCraftAddressError(box->uiShow(), gift))) {
+				return;
+			}
+			chosen(GiftForCraft{ .unique = gift });
+			box->closeBox();
+		});
+
+		AddCraftGiftsList(
+			controller,
+			box->verticalLayout(),
+			state->craft,
+			selected,
+			got);
+
+		if (const auto count = state->resale.count) {
+			AddSubsectionTitle(
+				box->verticalLayout(),
+				tr::lng_gift_craft_select_market(
+					lt_count,
+					rpl::single(count * 1.)));
+
+			AddResaleGiftsList(
+				controller,
+				session->user(),
+				box->verticalLayout(),
+				state->resale,
+				nullptr,
+				got,
+				true);
+		}
+
+		box->addButton(tr::lng_box_ok(), [=] {
+			box->closeBox();
+		});
+		box->setMaxHeight(st::boxWideWidth);
+	};
+	const auto show = crl::guard(controller, [=] {
+		controller->show(Box(make));
+	});
+
+	state->craftLifetime = Data::CraftGiftsSlice(
+		session,
+		giftId
+	) | rpl::on_next([=](Data::CraftGiftsDescriptor &&info) {
+		state->craftLifetime.destroy();
+
+		state->craft = std::move(info);
+		if (state->resale.giftId) {
+			show();
+		}
+	});
+
+	state->resaleLifetime = Data::ResaleGiftsSlice(
+		session,
+		giftId,
+		{ .forCraft = true }
+	) | rpl::on_next([=](Data::ResaleGiftsDescriptor &&info) {
+		state->resaleLifetime.destroy();
+
+		state->resale = std::move(info);
+		if (state->craft.giftId) {
+			show();
+		}
+	});
+}
+
+[[nodiscard]] object_ptr<RpWidget> MakeRarityExpectancyPreview(
+		not_null<RpWidget*> parent,
+		not_null<Main::Session*> session,
+		rpl::producer<std::vector<GiftForCraft>> gifts) {
+	auto result = object_ptr<RpWidget>(parent);
+	const auto raw = result.data();
+
+	struct AttributeState {
+		rpl::variable<int> permille;
+		bool isBackdrop = false;
+		QString name;
+
+		Animations::Simple backdropAnimation;
+		Data::UniqueGiftBackdrop wasBackdrop;
+		Data::UniqueGiftBackdrop nowBackdrop;
+		QImage wasFrame;
+		QImage nowFrame;
+
+		Animations::Simple patternAnimation;
+		DocumentData *wasPattern = nullptr;
+		DocumentData *nowPattern = nullptr;
+		std::unique_ptr<Text::CustomEmoji> wasEmoji;
+		std::unique_ptr<Text::CustomEmoji> nowEmoji;
+
+		AbstractButton *button = nullptr;
+		RpWidget *radial = nullptr;
+	};
+
+	struct State {
+		std::array<AttributeState, 8> attrs;
+		int count = 0;
+		ImportantTooltip *tooltip = nullptr;
+	};
+
+	const auto state = raw->lifetime().make_state<State>();
+
+	const auto single = st::craftAttributeSize;
+	const auto skip = st::craftAttributeSkip;
+
+	for (auto i = 0; i != 8; ++i) {
+		auto &attr = state->attrs[i];
+		const auto btn = CreateChild<AbstractButton>(raw);
+		attr.button = btn;
+		btn->resize(single, single);
+		btn->hide();
+
+		const auto idx = i;
+		btn->paintOn([=](QPainter &p) {
+			auto &a = state->attrs[idx];
+			const auto sub = st::craftAttributePadding;
+			const auto inner = QRect(0, 0, single, single).marginsRemoved(
+				{ sub, sub, sub, sub });
+			if (a.isBackdrop) {
+				const auto progress = a.backdropAnimation.value(1.);
+				if (progress < 1.) {
+					p.drawImage(inner.topLeft(), a.wasFrame);
+					p.setOpacity(progress);
+				}
+				if (a.nowFrame.isNull()) {
+					const auto ratio = style::DevicePixelRatio();
+					a.nowFrame = QImage(
+						inner.size() * ratio,
+						QImage::Format_ARGB32_Premultiplied);
+					a.nowFrame.fill(Qt::transparent);
+					a.nowFrame.setDevicePixelRatio(ratio);
+					auto q = QPainter(&a.nowFrame);
+					auto hq = PainterHighQualityEnabler(q);
+					auto gradient = QLinearGradient(
+						QPointF(inner.width(), 0),
+						QPointF(0, inner.height()));
+					gradient.setColorAt(0., a.nowBackdrop.centerColor);
+					gradient.setColorAt(1., a.nowBackdrop.edgeColor);
+					q.setPen(Qt::NoPen);
+					q.setBrush(gradient);
+					q.drawEllipse(
+						0,
+						0,
+						inner.width(),
+						inner.height());
+
+					q.setCompositionMode(
+						QPainter::CompositionMode_Source);
+					q.setBrush(Qt::transparent);
+					const auto max = u"100%"_q;
+					const auto &font = st::craftAttributePercent.font;
+					const auto tw = font->width(max);
+					q.drawRoundedRect(
+						(inner.width() - tw) / 2,
+						inner.height() + sub - font->height,
+						tw,
+						font->height,
+						font->height / 2.,
+						font->height / 2.);
+				}
+				p.drawImage(inner.topLeft(), a.nowFrame);
+				p.setOpacity(1.);
+			} else {
+				const auto center = QRect(0, 0, single, single).center();
+				const auto emojiShift
+					= (single - Emoji::GetCustomSizeNormal()) / 2;
+				const auto pos = QPoint(emojiShift, emojiShift);
+				const auto progress = a.patternAnimation.value(1.);
+				if (progress < 1.) {
+					p.translate(center);
+					p.save();
+					p.setOpacity(1. - progress);
+					p.scale(1. - progress, 1. - progress);
+					p.translate(-center);
+					a.wasEmoji->paint(p, {
+						.textColor = st::white->c,
+						.position = pos,
+					});
+					p.restore();
+					p.scale(progress, progress);
+					p.setOpacity(progress);
+					p.translate(-center);
+				}
+				if (!a.nowEmoji) {
+					a.nowEmoji = session->data().customEmojiManager().create(
+						a.nowPattern,
+						[=] { btn->update(); });
+				}
+				a.nowEmoji->paint(p, {
+					.textColor = st::white->c,
+					.position = pos,
+				});
+			}
+		});
+
+		attr.radial = MakeRadialPercent(
+			btn,
+			st::craftAttributePercent,
+			attr.permille.value());
+		attr.radial->setGeometry(0, 0, single, single);
+
+		btn->setClickedCallback([=] {
+			auto &a = state->attrs[idx];
+			if (state->tooltip) {
+				state->tooltip->toggleAnimated(false);
+			}
+
+			auto text = a.isBackdrop
+				? tr::lng_gift_craft_chance_backdrop(
+					tr::now,
+					lt_percent,
+					TextWithEntities{ FormatPercent(a.permille.current()) },
+					lt_name,
+					TextWithEntities{ a.name },
+					Ui::Text::RichLangValue)
+				: tr::lng_gift_craft_chance_symbol(
+					tr::now,
+					lt_percent,
+					TextWithEntities{ FormatPercent(a.permille.current()) },
+					lt_name,
+					TextWithEntities{ a.name },
+					Ui::Text::RichLangValue);
+			const auto tooltip = CreateChild<ImportantTooltip>(
+				parent,
+				MakeNiceTooltipLabel(
+					parent,
+					rpl::single(std::move(text)),
+					st::boxWideWidth / 2,
+					st::defaultImportantTooltipLabel,
+					st::defaultPopupMenu),
+				st::defaultImportantTooltip);
+			tooltip->toggleFast(false);
+
+			base::install_event_filter(tooltip, qApp, [=](not_null<QEvent*> e) {
+				if (e->type() == QEvent::MouseButtonPress) {
+					tooltip->toggleAnimated(false);
+				}
+				return base::EventFilterResult::Continue;
+			});
+
+			const auto geometry = MapFrom(parent, btn, btn->rect());
+			const auto countPosition = [=](QSize size) {
+				const auto left = geometry.x()
+					+ (geometry.width() - size.width()) / 2;
+				const auto right = parent->width()
+					- st::normalFont->spacew;
+				return QPoint(
+					std::max(std::min(left, right - size.width()), 0),
+					geometry.y()
+						- size.height()
+						- st::normalFont->descent);
+			};
+			tooltip->pointAt(geometry, RectPart::Top, countPosition);
+			tooltip->toggleAnimated(true);
+
+			state->tooltip = tooltip;
+			tooltip->shownValue() | rpl::filter(
+				!rpl::mappers::_1
+			) | rpl::on_next([=] {
+				crl::on_main(tooltip, [=] {
+					if (tooltip->isHidden()) {
+						if (state->tooltip == tooltip) {
+							state->tooltip = nullptr;
+						}
+						delete tooltip;
+					}
+				});
+			}, tooltip->lifetime());
+
+			base::timer_once(
+				3000
+			) | rpl::on_next([=] {
+				tooltip->toggleAnimated(false);
+			}, tooltip->lifetime());
+		});
+	}
+
+	const auto relayout = [=](int count) {
+		const auto twoRows = (count > 5);
+		const auto row1 = twoRows ? ((count + 1) / 2) : count;
+		const auto row2 = twoRows ? (count - row1) : 0;
+		const auto rowWidth = [&](int n) {
+			return n * single + (n - 1) * skip;
+		};
+		const auto w1 = rowWidth(row1);
+		const auto w2 = row2 ? rowWidth(row2) : 0;
+		const auto naturalWidth = std::max(w1, w2);
+		const auto totalHeight = twoRows
+			? (2 * single + st::craftAttributeRowSkip)
+			: single;
+
+		for (auto i = 0; i != 8; ++i) {
+			auto &attr = state->attrs[i];
+			if (i < count) {
+				const auto inRow1 = (i < row1);
+				const auto rowItems = inRow1 ? row1 : row2;
+				const auto rowW = rowWidth(rowItems);
+				const auto indexInRow = inRow1 ? i : (i - row1);
+				const auto x = (naturalWidth - rowW) / 2
+					+ indexInRow * (single + skip);
+				const auto y = inRow1
+					? 0
+					: (single + st::craftAttributeRowSkip);
+				attr.button->setGeometry(x, y, single, single);
+				attr.button->show();
+			} else {
+				attr.button->hide();
+			}
+		}
+
+		raw->setNaturalWidth(naturalWidth);
+		raw->resize(naturalWidth, totalHeight);
+	};
+
+	const auto permilles = session->appConfig().craftAttributePermilles();
+	const auto computePermille = [=](int total, int count) {
+		Expects(total > 0);
+		Expects(count > 0);
+
+		const auto &list = (total <= permilles.size())
+			? permilles[total - 1]
+			: std::vector<int>();
+		return (count <= list.size()) ? list[count - 1] : 1000;
+	};
+
+	std::move(
+		gifts
+	) | rpl::on_next([=](const std::vector<GiftForCraft> &list) {
+		struct BackdropEntry {
+			Data::UniqueGiftBackdrop fields;
+			QString name;
+			int count = 0;
+		};
+		struct PatternEntry {
+			not_null<DocumentData*> document;
+			QString name;
+			int count = 0;
+		};
+		auto backdrops = std::vector<BackdropEntry>();
+		auto patterns = std::vector<PatternEntry>();
+		for (const auto &gift : list) {
+			const auto &backdrop = gift.unique->backdrop;
+			const auto &pattern = gift.unique->pattern;
+			const auto proj1 = &BackdropEntry::fields;
+			const auto i = ranges::find(backdrops, backdrop, proj1);
+			if (i != end(backdrops)) {
+				++i->count;
+			} else {
+				backdrops.push_back({ backdrop, backdrop.name, 1 });
+			}
+			const auto proj2 = &PatternEntry::document;
+			const auto j = ranges::find(
+				patterns,
+				pattern.document,
+				proj2);
+			if (j != end(patterns)) {
+				++j->count;
+			} else {
+				patterns.push_back({ pattern.document, pattern.name, 1 });
+			}
+		}
+		ranges::sort(backdrops, ranges::greater(), &BackdropEntry::count);
+		ranges::sort(patterns, ranges::greater(), &PatternEntry::count);
+
+		const auto total = int(list.size());
+		auto slotIndex = 0;
+		for (const auto &b : backdrops) {
+			if (slotIndex >= 8) break;
+			auto &a = state->attrs[slotIndex];
+			a.isBackdrop = true;
+			a.name = b.name;
+			a.permille = computePermille(total, b.count);
+			if (a.nowBackdrop != b.fields) {
+				if (!a.nowFrame.isNull()) {
+					a.wasBackdrop = a.nowBackdrop;
+					a.wasFrame = base::take(a.nowFrame);
+					a.backdropAnimation.stop();
+					a.backdropAnimation.start([=, btn = a.button] {
+						btn->update();
+					}, 0., 1., st::fadeWrapDuration);
+				}
+				a.nowBackdrop = b.fields;
+				a.nowFrame = QImage();
+			}
+			++slotIndex;
+		}
+		for (const auto &pt : patterns) {
+			if (slotIndex >= 8) break;
+			auto &a = state->attrs[slotIndex];
+			a.isBackdrop = false;
+			a.name = pt.name;
+			a.permille = computePermille(total, pt.count);
+			if (a.nowPattern != pt.document) {
+				if (a.nowEmoji) {
+					a.wasPattern = a.nowPattern;
+					a.wasEmoji = base::take(a.nowEmoji);
+					a.patternAnimation.stop();
+					a.patternAnimation.start([=, btn = a.button] {
+						btn->update();
+					}, 0., 1., st::fadeWrapDuration);
+				}
+				a.nowPattern = pt.document;
+				a.nowEmoji = nullptr;
+			}
+			++slotIndex;
+		}
+
+		const auto newCount = slotIndex;
+		if (state->count != newCount) {
+			state->count = newCount;
+			relayout(newCount);
+		}
+	}, raw->lifetime());
+
+	return result;
+}
+
+void Craft(
+		not_null<GenericBox*> box,
+		not_null<Window::SessionController*> controller,
+		std::shared_ptr<CraftState> state,
+		const std::vector<GiftForCraft> &gifts) {
+	auto show = controller->uiShow();
+	auto startRequest = [=](Fn<void(CraftResult)> done) {
+#if 0
+		constexpr auto kDelays = std::array<crl::time, 7>{
+			100, 200, 300, 400, 500, 1000, 2000
+		};
+		const auto delay = kDelays[base::RandomIndex(kDelays.size())];
+		const auto giftsCopy = gifts;
+
+		base::call_delayed(delay, box, [=] {
+			//static auto testing = 0;
+			const auto shouldSucceed = false;// (((++testing) / 4) % 2 == 0);
+			const auto count = int(giftsCopy.size());
+			if (shouldSucceed && count > 0) {
+				const auto &chosen = giftsCopy[base::RandomIndex(count)];
+				auto info = Data::StarGift{
+					.id = chosen.unique->initialGiftId,
+					.unique = chosen.unique,
+					.document = chosen.unique->model.document,
+				};
+				auto result = std::make_shared<Data::GiftUpgradeResult>(
+					Data::GiftUpgradeResult{
+						.info = std::move(info),
+						.manageId = chosen.manageId,
+					});
+				done(std::move(result));
+			} else {
+				done(nullptr);
+			}
+		});
+#endif
+
+		auto inputs = QVector<MTPInputSavedStarGift>();
+		for (const auto &gift : gifts) {
+			inputs.push_back(
+				Api::InputSavedStarGiftId(gift.manageId, gift.unique));
+		}
+		const auto weak = base::make_weak(controller);
+		const auto session = &controller->session();
+		session->api().request(MTPpayments_CraftStarGift(
+			MTP_vector<MTPInputSavedStarGift>(inputs)
+		)).done([=](const MTPUpdates &result) {
+			session->api().applyUpdates(result);
+			session->data().nextForUpgradeGiftInvalidate(session->user());
+			const auto gift = FindUniqueGift(session, result);
+			const auto slug = gift ? gift->info.unique->slug : QString();
+			for (const auto &input : gifts) {
+				const auto action = (slug == input.unique->slug)
+					? Data::GiftUpdate::Action::Upgraded
+					: Data::GiftUpdate::Action::Delete;
+				controller->session().data().notifyGiftUpdate({
+					.id = input.manageId,
+					.slug = input.unique->slug,
+					.action = action,
+				});
+			}
+			done(gift);
+		}).fail([=](const MTP::Error &error) {
+			const auto type = error.type();
+			const auto waitPrefix = u"STARGIFT_CRAFT_TOO_EARLY_"_q;
+			if (type.startsWith(waitPrefix)) {
+				done(CraftResultWait{
+					.seconds = type.mid(waitPrefix.size()).toInt(),
+				});
+			} else {
+				done(CraftResultError{ type });
+			}
+		}).send();
+	};
+	const auto requested = std::make_shared<bool>();
+	const auto giftId = gifts.front().unique->initialGiftId;
+	auto retryWithNewGift = [=](Fn<void()> closeCurrent) {
+		if (*requested) {
+			return;
+		}
+		*requested = true;
+		ShowSelectGiftBox(controller, giftId, [=](GiftForCraft chosen) {
+			ShowGiftCraftBox(controller, { chosen }, false);
+			closeCurrent();
+		}, {}, [=] { *requested = false; }, true);
+	};
+	StartCraftAnimation(
+		box,
+		std::move(show),
+		std::move(state),
+		std::move(startRequest),
+		std::move(retryWithNewGift));
+}
+
+void AddPreviewNewModels(
+		not_null<VerticalLayout*> container,
+		std::shared_ptr<Main::SessionShow> show,
+		const QString &giftName,
+		Data::UniqueGiftAttributes attributes,
+		rpl::producer<bool> visible) {
+	auto exceptional = std::vector<Data::UniqueGiftModel>();
+	for (const auto &model : attributes.models) {
+		if (Data::UniqueGiftAttributeHasSpecialRarity(model)) {
+			exceptional.push_back(model);
+		}
+	}
+	attributes.models = std::move(exceptional);
+
+	auto emoji = TextWithEntities();
+	const auto indices = RandomIndicesSubset(
+		int(attributes.models.size()),
+		std::min(3, int(attributes.models.size())));
+	for (const auto index : indices) {
+		emoji.append(Data::SingleCustomEmoji(
+			attributes.models[index].document));
+	}
+
+	auto badge = object_ptr<AbstractButton>(container);
+	const auto badgeRaw = badge.data();
+
+	const auto label = CreateChild<FlatLabel>(
+		badgeRaw,
+		tr::lng_gift_craft_view_all(
+			lt_emoji,
+			rpl::single(emoji),
+			lt_arrow,
+			rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+			Text::WithEntities),
+		st::uniqueGiftResalePrice,
+		st::defaultPopupMenu,
+		Core::TextContext({ .session = &show->session() }));
+	label->setTextColorOverride(st::white->c);
+
+	label->sizeValue() | rpl::on_next([=](QSize size) {
+		const auto padding = st::craftPreviewAllPadding;
+		badgeRaw->setNaturalWidth(
+			padding.left() + size.width() + padding.right());
+		badgeRaw->resize(
+			badgeRaw->naturalWidth(),
+			padding.top() + size.height() + padding.bottom());
+	}, label->lifetime());
+
+	badgeRaw->widthValue() | rpl::on_next([=](int width) {
+		const auto padding = st::craftPreviewAllPadding;
+		label->move(padding.left(), padding.top());
+	}, badgeRaw->lifetime());
+
+	badgeRaw->paintOn([=](QPainter &p) {
+		auto hq = PainterHighQualityEnabler(p);
+		const auto rect = badgeRaw->rect();
+		const auto radius = rect.height() / 2.;
+		p.setPen(Qt::NoPen);
+		p.setBrush(ForgeBgOverlay());
+		p.drawRoundedRect(rect, radius, radius);
+	});
+
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	badgeRaw->setClickedCallback([=] {
+		auto previewAttrs = attributes;
+		previewAttrs.models.erase(
+			ranges::remove_if(previewAttrs.models, [](const auto &m) {
+				return !Data::UniqueGiftAttributeHasSpecialRarity(m);
+			}),
+			end(previewAttrs.models));
+		show->show(Box(
+			StarGiftPreviewBox,
+			giftName,
+			previewAttrs,
+			Data::GiftAttributeIdType::Model,
+			nullptr));
+	});
+
+	const auto wrap = container->add(
+		object_ptr<SlideWrap<AbstractButton>>(
+			container,
+			std::move(badge),
+			st::craftPreviewAllMargin),
+		style::al_top);
+	std::move(visible) | rpl::on_next([=](bool shown) {
+		wrap->toggle(shown, anim::type::instant);
+	}, wrap->lifetime());
+}
+
+void MakeCraftContent(
+		not_null<GenericBox*> box,
+		not_null<Window::SessionController*> controller,
+		std::vector<GiftForCraft> gifts,
+		bool autoStartCraft) {
+	Expects(!gifts.empty());
+
+	struct State {
+		std::shared_ptr<CraftState> craftState;
+		GradientButton *button = nullptr;
+
+		FlatLabel *title = nullptr;
+		FlatLabel *about = nullptr;
+		RpWidget *attributes = nullptr;
+		RpWidget *craftingView = nullptr;
+		Fn<void(std::shared_ptr<CraftState>)> grabCraftingView;
+
+		rpl::variable<std::vector<GiftForCraft>> chosen;
+		rpl::variable<QString> name;
+		rpl::variable<int> successPercentPermille;
+		rpl::variable<QString> successPercentText;
+
+		int requestingIndex = -1;
+		bool crafting = false;
+	};
+	const auto session = &controller->session();
+	const auto giftId = gifts.front().unique->initialGiftId;
+	const auto state = box->lifetime().make_state<State>();
+
+	const auto auctions = &controller->session().giftAuctions();
+	auto attributes = auctions->attributes(giftId).value_or(
+		Data::UniqueGiftAttributes());
+
+	state->craftState = std::make_shared<CraftState>();
+	state->craftState->session = session;
+	state->craftState->coversAnimate = true;
+
+	{
+		auto backdrops = CraftBackdrops();
+		const auto emoji = Text::IconEmoji(&st::craftPattern);
+		const auto data = emoji.entities.front().data();
+		for (auto i = 0; i != backdrops.size(); ++i) {
+			auto &cover = state->craftState->covers[i];
+			cover.backdrop.colors = backdrops[i].backdrop;
+			cover.pattern.emoji = Text::TryMakeSimpleEmoji(data);
+			cover.button1 = backdrops[i].button1;
+			cover.button2 = backdrops[i].button2;
+		}
+	}
+
+	const auto giftName = gifts.front().unique->title;
+	state->chosen = std::move(gifts);
+	for (auto i = 0; i != int(state->chosen.current().size()); ++i) {
+		state->craftState->covers[i].shown = true;
+	}
+
+	state->name = state->chosen.value(
+	) | rpl::map([=](const std::vector<GiftForCraft> &gifts) {
+		return Data::UniqueGiftName(*gifts.front().unique);
+	});
+	state->successPercentPermille = state->chosen.value(
+	) | rpl::map([=](const std::vector<GiftForCraft> &gifts) {
+		auto result = 0;
+		for (const auto &entry : gifts) {
+			if (const auto gift = entry.unique.get()) {
+				result += gift->craftChancePermille;
+			}
+		}
+		return result;
+	});
+	state->successPercentText = state->successPercentPermille.value(
+	) | rpl::map(FormatPercent);
+
+	const auto raw = box->verticalLayout();
+
+	state->chosen.value(
+	) | rpl::on_next([=](const std::vector<GiftForCraft> &gifts) {
+		state->craftState->updateForGiftCount(int(gifts.size()), [=] {
+			raw->update();
+		});
+	}, box->lifetime());
+
+	const auto title = state->title = raw->add(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_gift_craft_title(),
+			st::uniqueGiftTitle),
+		st::craftTitleMargin,
+		style::al_top);
+	title->setTextColorOverride(QColor(255, 255, 255));
+
+	auto crafting = MakeCraftingView(
+		raw,
+		session,
+		state->chosen.value(),
+		state->craftState->edgeColor.value());
+	const auto craftingHeight = crafting.widget->height();
+	state->craftingView = crafting.widget.data();
+	state->grabCraftingView = std::move(crafting.grabForAnimation);
+	raw->add(std::move(crafting.widget));
+	std::move(crafting.removeRequests) | rpl::on_next([=](int index) {
+		auto chosen = state->chosen.current();
+		if (index < chosen.size()) {
+			chosen.erase(begin(chosen) + index);
+			state->chosen = std::move(chosen);
+		}
+	}, raw->lifetime());
+
+	std::move(
+		crafting.editRequests
+	) | rpl::on_next([=](int index) {
+		const auto guard = base::make_weak(raw);
+		if (state->requestingIndex >= 0) {
+			state->requestingIndex = index;
+			return;
+		}
+		state->requestingIndex = index;
+		const auto callback = [=](GiftForCraft chosen) {
+			auto copy = state->chosen.current();
+			if (state->requestingIndex < copy.size()) {
+				copy[state->requestingIndex] = chosen;
+			} else {
+				copy.push_back(chosen);
+			}
+			state->chosen = std::move(copy);
+		};
+		const auto first = (state->requestingIndex == 0);
+		ShowSelectGiftBox(
+			controller,
+			giftId,
+			crl::guard(raw, callback),
+			state->chosen.current(),
+			crl::guard(raw, [=] { state->requestingIndex = -1; }),
+			first);
+	}, raw->lifetime());
+
+	auto fullName = state->chosen.value(
+	) | rpl::map([=](const std::vector<GiftForCraft> &list) {
+		const auto unique = list.front().unique.get();
+		return Data::SingleCustomEmoji(
+			unique->model.document
+		).append(' ').append(tr::bold(Data::UniqueGiftName(*unique)));
+	});
+	auto aboutText = rpl::combine(
+		tr::lng_gift_craft_about1(lt_gift, fullName, tr::rich),
+		tr::lng_gift_craft_about2(tr::rich)
+	) | rpl::map([=](TextWithEntities &&a, TextWithEntities &&b) {
+		return a.append('\n').append('\n').append(b);
+	});
+	const auto about = state->about = raw->add(
+		object_ptr<FlatLabel>(
+			raw,
+			std::move(aboutText),
+			st::craftAbout,
+			st::defaultPopupMenu,
+			Core::TextContext({ .session = session })),
+		st::craftAboutMargin,
+		style::al_top);
+	about->setTextColorOverride(st::white->c);
+	about->setTryMakeSimilarLines(true);
+
+	state->attributes = raw->add(
+		MakeRarityExpectancyPreview(raw, session, state->chosen.value()),
+		st::craftAttributesMargin,
+		style::al_top);
+
+	auto viewAllVisible = state->chosen.value(
+	) | rpl::map([](const std::vector<GiftForCraft> &list) {
+		auto backdropIds = base::flat_set<int>();
+		auto patternPtrs = base::flat_set<DocumentData*>();
+		for (const auto &gift : list) {
+			backdropIds.emplace(gift.unique->backdrop.id);
+			patternPtrs.emplace(gift.unique->pattern.document.get());
+		}
+		return int(backdropIds.size() + patternPtrs.size()) <= 5;
+	});
+
+	AddPreviewNewModels(
+		raw,
+		controller->uiShow(),
+		giftName,
+		std::move(attributes),
+		std::move(viewAllVisible));
+
+	raw->paintOn([=](QPainter &p) {
+		const auto &cs = state->craftState;
+		if (cs->craftingStarted) {
+			return;
+		}
+		const auto wasButton1 = cs->button1;
+		const auto wasButton2 = cs->button2;
+		cs->paint(p, raw->size(), craftingHeight);
+		if (cs->button1 != wasButton1 || cs->button2 != wasButton2) {
+			state->button->setStops({
+				{ 0., cs->button1 },
+				{ 1., cs->button2 },
+			});
+		}
+	});
+
+	const auto button = state->button = raw->add(
+		object_ptr<GradientButton>(raw, QGradientStops()),
+		st::craftBoxButtonPadding);
+	button->setFullRadius(true);
+	button->startGlareAnimation();
+
+	const auto startCrafting = [=] {
+		if (state->crafting) {
+			return;
+		}
+		const auto &gifts = state->chosen.current();
+		if (!gifts.empty()
+			&& ShowCraftAddressError(box->uiShow(), gifts.front().unique)) {
+			return;
+		}
+		state->crafting = true;
+
+		const auto &cs = state->craftState;
+		cs->giftName = state->name.current();
+		cs->successPermille = state->successPercentPermille.current();
+
+		for (const auto &gift : gifts) {
+			if (gift.unique) {
+				cs->lostGifts.push_back({
+					.number = u"#"_q + Lang::FormatCountDecimal(gift.unique->number),
+				});
+			}
+		}
+
+		if (state->grabCraftingView) {
+			state->grabCraftingView(cs);
+		}
+
+		const auto craftingPos = state->craftingView->pos();
+		cs->craftingTop = craftingPos.y();
+		cs->craftingBottom = craftingPos.y() + state->craftingView->height();
+
+		for (auto &corner : cs->corners) {
+			corner.originalRect.translate(craftingPos);
+		}
+		cs->forgeRect.translate(craftingPos);
+		cs->craftingAreaCenterY = cs->forgeRect.center().y();
+
+		const auto aboutPos = state->about->pos();
+		const auto buttonY = state->button->pos().y();
+		const auto buttonBottom = buttonY + state->button->height();
+		cs->originalButtonY = buttonY;
+		const auto bottomRect = QRect(
+			0,
+			aboutPos.y(),
+			raw->width(),
+			buttonBottom - aboutPos.y());
+
+		const auto ratio = style::DevicePixelRatio();
+		auto bottomPart = QImage(
+			bottomRect.size() * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		bottomPart.fill(Qt::transparent);
+		bottomPart.setDevicePixelRatio(ratio);
+
+		const auto renderWidget = [&](QWidget *widget) {
+			const auto pos = widget->pos() - bottomRect.topLeft();
+			widget->render(&bottomPart, pos, {}, QWidget::DrawChildren);
+		};
+		renderWidget(state->about);
+		renderWidget(state->attributes);
+		renderWidget(state->button);
+
+		cs->bottomPart = std::move(bottomPart);
+		cs->bottomPartY = aboutPos.y();
+		cs->containerHeight = raw->height();
+
+		Craft(
+			box,
+			controller,
+			state->craftState,
+			state->chosen.current());
+	};
+	button->setClickedCallback(startCrafting);
+
+	SetButtonTwoLabels(
+		button,
+		st::giftBox.button.textTop,
+		tr::lng_gift_craft_button(
+			lt_gift,
+			state->name.value() | rpl::map(tr::marked),
+			tr::marked),
+		tr::lng_gift_craft_button_chance(
+			lt_percent,
+			state->successPercentText.value() | rpl::map(tr::marked),
+			tr::marked),
+		st::resaleButtonTitle,
+		st::resaleButtonSubtitle);
+
+	raw->widthValue() | rpl::on_next([=](int width) {
+		const auto padding = st::craftBoxButtonPadding;
+		button->setNaturalWidth(width - padding.left() - padding.right());
+		button->resize(button->naturalWidth(), st::giftBox.button.height);
+	}, raw->lifetime());
+
+	if (autoStartCraft) {
+//		base::call_delayed(crl::time(1000), raw, startCrafting);
+	}
+}
+
+void ShowGiftCraftBox(
+		not_null<Window::SessionController*> controller,
+		std::vector<GiftForCraft> gifts,
+		bool autoStartCraft) {
+	controller->show(Box([=](not_null<GenericBox*> box) {
+		box->setStyle(st::giftCraftBox);
+		box->setWidth(st::boxWideWidth);
+		box->setNoContentMargin(true);
+		MakeCraftContent(
+			box,
+			controller,
+			gifts,
+			autoStartCraft);
+		AddUniqueCloseButton(box);
+
+#if _DEBUG
+		if (autoStartCraft) {
+			static const auto full = gifts;
+			box->boxClosing() | rpl::on_next([=] {
+				base::call_delayed(1000, controller, [=] {
+					auto copy = gifts;
+					if (copy.size() > 1) {
+						copy.pop_back();
+					} else {
+						copy = full;
+					}
+					ShowGiftCraftBox(controller, copy, true);
+				});
+			}, box->lifetime());
+		}
+#endif
+	}));
+}
+
+} // namespace
+
+void ShowGiftCraftInfoBox(
+		not_null<Window::SessionController*> controller,
+		std::shared_ptr<Data::UniqueGift> gift,
+		Data::SavedStarGiftId savedId) {
+	controller->show(Box([=](not_null<GenericBox*> box) {
+		const auto container = box->verticalLayout();
+		auto cover = tr::lng_gift_craft_info_title(
+		) | rpl::map([=](const QString &title) {
+			auto result = UniqueGiftCover{ *gift };
+			result.values.title = title;
+			return result;
+		});
+		AddUniqueGiftCover(container, std::move(cover), {
+			.subtitle = tr::lng_gift_craft_info_about(tr::marked),
+		});
+		AddSkip(container);
+
+		AddUniqueCloseButton(box);
+
+		const auto features = std::vector<FeatureListEntry>{
+			{
+				st::menuIconUnique,
+				tr::lng_gift_craft_rare_title(tr::now),
+				tr::lng_gift_craft_rare_about(tr::now, tr::rich),
+			},
+			{
+				st::menuIconCraftTraits,
+				tr::lng_gift_craft_chance_title(tr::now),
+				tr::lng_gift_craft_chance_about(tr::now, tr::marked),
+			},
+			{
+				st::menuIconCraftChance,
+				tr::lng_gift_craft_affect_title(tr::now),
+				tr::lng_gift_craft_affect_about(tr::now, tr::marked),
+			},
+		};
+		for (const auto &feature : features) {
+			container->add(
+				MakeFeatureListEntry(container, feature),
+				st::boxRowPadding);
+		}
+
+		box->setStyle(st::giftBox);
+		box->setWidth(st::boxWideWidth);
+		box->setNoContentMargin(true);
+
+		box->addButton(tr::lng_gift_craft_start_button(), [=] {
+			const auto auctions = &controller->session().giftAuctions();
+			const auto show = crl::guard(box, [=] {
+				ShowGiftCraftBox(
+					controller,
+					{ GiftForCraft{ gift, savedId } },
+					false);
+				box->closeBox();
+			});
+			if (auctions->attributes(gift->initialGiftId)) {
+				show();
+			} else {
+				auctions->requestAttributes(gift->initialGiftId, show);
+			}
+		});
+	}));
+}
+
+void ShowTestGiftCraftBox(
+		not_null<Window::SessionController*> controller,
+		std::vector<GiftForCraftEntry> gifts) {
+	auto converted = std::vector<GiftForCraft>();
+	converted.reserve(gifts.size());
+	for (auto &gift : gifts) {
+		auto entry = GiftForCraft();
+		entry.unique = std::move(gift.unique);
+		entry.manageId = std::move(gift.manageId);
+		converted.push_back(std::move(entry));
+	}
+	ShowGiftCraftBox(controller, std::move(converted), true);
+}
+
+bool ShowCraftLaterError(
+		std::shared_ptr<Show> show,
+		std::shared_ptr<Data::UniqueGift> gift) {
+	const auto now = base::unixtime::now();
+	if (gift->canCraftAt <= now) {
+		return false;
+	}
+	ShowCraftLaterError(show, gift->canCraftAt);
+	return true;
+}
+
+void ShowCraftLaterError(
+		std::shared_ptr<Show> show,
+		TimeId when) {
+	const auto data = base::unixtime::parse(when);
+	const auto time = QLocale().toString(data.time(), QLocale::ShortFormat);
+	const auto date = langDayOfMonthShort(data.date());
+
+	show->show(MakeInformBox({
+		.text = tr::lng_gift_craft_when(
+			lt_date,
+			rpl::single(tr::bold(date)),
+			lt_time,
+			rpl::single(tr::bold(time)),
+			tr::marked),
+		.title = tr::lng_gift_craft_unavailable(),
+	}));
+}
+
+bool ShowCraftAddressError(
+		std::shared_ptr<Show> show,
+		std::shared_ptr<Data::UniqueGift> gift) {
+	if (gift->giftAddress.isEmpty()) {
+		return false;
+	}
+	show->show(MakeInformBox({
+		.text = tr::lng_gift_craft_address_error(tr::marked),
+		.title = tr::lng_gift_craft_unavailable(),
+	}));
+	return true;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_craft_box.h b/Telegram/SourceFiles/boxes/star_gift_craft_box.h
new file mode 100644
index 00000000000000..26eb5f2be736c7
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/star_gift_craft_box.h
@@ -0,0 +1,50 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "data/data_star_gift.h"
+
+namespace Data {
+struct UniqueGift;
+} // namespace Data
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+
+class Show;
+
+struct GiftForCraftEntry {
+	std::shared_ptr<Data::UniqueGift> unique;
+	Data::SavedStarGiftId manageId;
+};
+
+void ShowGiftCraftInfoBox(
+	not_null<Window::SessionController*> controller,
+	std::shared_ptr<Data::UniqueGift> gift,
+	Data::SavedStarGiftId savedId);
+
+void ShowTestGiftCraftBox(
+	not_null<Window::SessionController*> controller,
+	std::vector<GiftForCraftEntry> gifts);
+
+[[nodiscard]] bool ShowCraftLaterError(
+	std::shared_ptr<Show> show,
+	std::shared_ptr<Data::UniqueGift> gift);
+
+void ShowCraftLaterError(
+	std::shared_ptr<Show> show,
+	TimeId when);
+
+[[nodiscard]] bool ShowCraftAddressError(
+	std::shared_ptr<Show> show,
+	std::shared_ptr<Data::UniqueGift> gift);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_preview_box.cpp b/Telegram/SourceFiles/boxes/star_gift_preview_box.cpp
new file mode 100644
index 00000000000000..c6c9f65ac64d32
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/star_gift_preview_box.cpp
@@ -0,0 +1,1604 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/star_gift_preview_box.h"
+
+#include "base/random.h"
+#include "boxes/star_gift_box.h"
+#include "chat_helpers/stickers_lottie.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_document.h"
+#include "data/data_document_media.h"
+#include "data/data_session.h"
+#include "data/data_star_gift.h"
+#include "history/view/media/history_view_sticker_player.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/boxes/about_cocoon_box.h" // Ui::AddUniqueCloseButton
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_custom_emoji.h"
+#include "ui/widgets/buttons.h"
+#include "ui/painter.h"
+#include "ui/top_background_gradient.h"
+#include "settings/settings_credits_graphics.h"
+#include "styles/style_chat.h"
+#include "styles/style_credits.h"
+#include "styles/style_layers.h"
+
+namespace Ui {
+namespace {
+
+using Tab = Data::GiftAttributeIdType;
+using GiftModel = Data::UniqueGiftModel;
+using GiftPattern = Data::UniqueGiftPattern;
+using GiftBackdrop = Data::UniqueGiftBackdrop;
+constexpr auto kSwitchTimeout = 3 * crl::time(1000);
+constexpr auto kGiftsPerRow = 3;
+
+struct AttributeDescriptor
+	: std::variant<GiftModel, GiftPattern, GiftBackdrop> {
+
+	friend inline bool operator==(
+		const AttributeDescriptor &,
+		const AttributeDescriptor &) = default;
+};
+
+[[nodiscard]] DocumentData *Sticker(const AttributeDescriptor &value) {
+	using namespace Data;
+	if (const auto pattern = std::get_if<UniqueGiftPattern>(&value)) {
+		return pattern->document;
+	} else if (const auto model = std::get_if<UniqueGiftModel>(&value)) {
+		return model->document;
+	}
+	return nullptr;
+}
+
+struct BackdropPlayers {
+	HistoryView::StickerPlayer *now = nullptr;
+	HistoryView::StickerPlayer *next = nullptr;
+	float64 progress = 0.;
+};
+
+struct PatternEmoji {
+	std::shared_ptr<Text::CustomEmoji> now;
+	std::shared_ptr<Text::CustomEmoji> next;
+	float64 progress = 0.;
+};
+
+class AttributeDelegate {
+public:
+	[[nodiscard]] virtual QSize buttonSize() = 0;
+	[[nodiscard]] virtual QMargins buttonExtend() const = 0;
+	[[nodiscard]] virtual QImage background() = 0;
+	[[nodiscard]] virtual QImage cachePatternBackground(
+		int width,
+		int height,
+		QMargins extend) = 0;
+	[[nodiscard]] virtual QColor patternColor() = 0;
+	[[nodiscard]] virtual BackdropPlayers backdropPlayers() = 0;
+	[[nodiscard]] virtual PatternEmoji patternEmoji() = 0;
+};
+
+class AttributeButton final : public Ui::AbstractButton {
+public:
+	AttributeButton(
+		QWidget *parent,
+		not_null<AttributeDelegate*> delegate,
+		const AttributeDescriptor &descriptor);
+
+	void toggleSelected(bool selected, anim::type animated);
+
+	void setDescriptor(const AttributeDescriptor &descriptor);
+	void setGeometry(QRect inner, QMargins extend);
+
+private:
+	struct PatternCache {
+		base::flat_map<float64, QImage> map;
+		std::shared_ptr<Text::CustomEmoji> emoji;
+	};
+
+	void paintEvent(QPaintEvent *e) override;
+	void paintBackground(QPainter &p, const QImage &background);
+
+	void setup();
+	void validatePatternCache();
+	void setDocument(not_null<DocumentData*> document);
+
+	const not_null<AttributeDelegate*> _delegate;
+	QImage _hiddenBgCache;
+	AttributeDescriptor _descriptor;
+	Ui::Text::String _name;
+	Ui::Text::String _percent;
+	QImage _backgroundCache;
+	PatternCache _patternNow;
+	PatternCache _patternNext;
+	QImage _patternFrame;
+	QColor _patternColor;
+	Ui::Animations::Simple _selectedAnimation;
+	bool _selected : 1 = false;
+
+	QMargins _extend;
+
+	DocumentData *_document = nullptr;
+	DocumentData *_playerDocument = nullptr;
+	std::unique_ptr<HistoryView::StickerPlayer> _player;
+	rpl::lifetime _mediaLifetime;
+
+};
+
+class Delegate final : public AttributeDelegate {
+public:
+	explicit Delegate(Fn<void()> fullUpdate);
+
+	Delegate(Delegate &&other) = default;
+	~Delegate() = default;
+
+	void update(
+		const std::optional<Data::UniqueGift> &now,
+		const std::optional<Data::UniqueGift> &next,
+		float64 progress);
+
+	[[nodiscard]] QSize buttonSize() override;
+	[[nodiscard]] QMargins buttonExtend() const override;
+	[[nodiscard]] QImage background() override;
+	[[nodiscard]] QImage cachePatternBackground(
+		int width,
+		int height,
+		QMargins extend) override;
+	[[nodiscard]] QColor patternColor() override;
+	[[nodiscard]] BackdropPlayers backdropPlayers() override;
+	[[nodiscard]] PatternEmoji patternEmoji() override;
+
+private:
+	struct Sticker {
+		DocumentData *document = nullptr;
+		DocumentData *playerDocument = nullptr;
+		std::unique_ptr<HistoryView::StickerPlayer> player;
+		rpl::lifetime mediaLifetime;
+	};
+	struct Emoji {
+		DocumentData *document;
+		std::shared_ptr<Text::CustomEmoji> custom;
+	};
+
+	Fn<void()> _fullUpdate;
+	QSize _single;
+	QImage _bg;
+
+	GiftBackdrop _nowBackdrop;
+	GiftBackdrop _nextBackdrop;
+
+	Sticker _nowModel;
+	Sticker _nextModel;
+
+	Emoji _nowPatternEmoji;
+	Emoji _nextPatternEmoji;
+
+	float64 _progress = 0.;
+
+	GiftBackdrop _backdrop;
+	QImage _backdropCache;
+	bool _backdropDirty = false;
+
+};
+
+struct Selection {
+	int model = -1;
+	int pattern = -1;
+	int backdrop = -1;
+
+	friend inline bool operator==(Selection, Selection) = default;
+};
+
+class AttributesList final : public Ui::BoxContentDivider {
+public:
+	AttributesList(
+		QWidget *parent,
+		not_null<Delegate*> delegate,
+		not_null<const Data::UniqueGiftAttributes*> attributes,
+		std::vector<Data::UniqueGiftModel> otherModels,
+		rpl::producer<Tab> tab,
+		Selection initialSelection);
+
+	[[nodiscard]] rpl::producer<Selection> selected() const;
+	[[nodiscard]] auto modelsToggled() const
+		-> rpl::producer<std::vector<Data::UniqueGiftModel>>;
+
+private:
+	struct Entry {
+		AttributeDescriptor descriptor;
+		Selection value;
+	};
+	struct Entries {
+		std::vector<Entry> list;
+	};
+	struct View {
+		std::unique_ptr<AttributeButton> button;
+		DocumentData *document = nullptr;
+		int index = 0;
+	};
+
+	void visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) override;
+	void paintEvent(QPaintEvent *e) override;
+
+	void fill();
+	void refreshAbout();
+	void refreshButtons();
+	void validateButtons();
+
+	int resizeGetHeight(int width) override;
+	void clicked(int index);
+	void toggleModels();
+
+	const not_null<Delegate*> _delegate;
+	const not_null<const Data::UniqueGiftAttributes*> _attributes;
+	rpl::variable<Tab> _tab;
+	rpl::variable<Selection> _selected;
+
+	std::unique_ptr<Ui::RpWidget> _about;
+
+	Entries _models;
+	Entries _patterns;
+	Entries _backdrops;
+	not_null<Entries*> _entries;
+	not_null<std::vector<Entry>*> _list;
+
+	std::vector<View> _views;
+	int _viewsForWidth = 0;
+	int _viewsFromRow = 0;
+	int _viewsTillRow = 0;
+
+	QSize _singleMin;
+	QSize _single;
+	int _perRow = 0;
+	int _visibleFrom = 0;
+	int _visibleTill = 0;
+
+	bool _craftedModels = false;
+	std::vector<Data::UniqueGiftModel> _activeModels;
+	std::vector<Data::UniqueGiftModel> _otherModels;
+	std::unique_ptr<Ui::FlatLabel> _toggleLink;
+	rpl::event_stream<std::vector<Data::UniqueGiftModel>> _modelsToggled;
+
+};
+
+[[nodiscard]] QColor MakeOpaque(QColor color, QColor bg) {
+	return (color.alpha() == 255)
+		? color
+		: anim::color(
+			bg,
+			QColor(color.red(), color.green(), color.blue(), 255),
+			color.alphaF());
+}
+
+void CacheBackdropBackground(
+		not_null<GiftBackdrop*> backdrop,
+		int width,
+		int height,
+		QMargins extend,
+		QImage &cache,
+		bool force = false) {
+	const auto outer = QRect(0, 0, width, height);
+	const auto inner = outer.marginsRemoved(
+		extend
+	).translated(-extend.left(), -extend.top());
+	const auto ratio = style::DevicePixelRatio();
+	if (cache.size() != inner.size() * ratio) {
+		cache = QImage(
+			inner.size() * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		cache.setDevicePixelRatio(ratio);
+		force = true;
+	}
+	if (force) {
+		cache.fill(Qt::transparent);
+
+		const auto radius = st::giftBoxGiftRadius;
+		auto p = QPainter(&cache);
+		auto hq = PainterHighQualityEnabler(p);
+		auto gradient = QRadialGradient(inner.center(), inner.width() / 2);
+		gradient.setStops({
+			{ 0., backdrop->centerColor },
+			{ 1., backdrop->edgeColor },
+		});
+		p.setBrush(gradient);
+		p.setPen(Qt::NoPen);
+		p.drawRoundedRect(inner, radius, radius);
+	}
+}
+
+AttributeButton::AttributeButton(
+	QWidget *parent,
+	not_null<AttributeDelegate*> delegate,
+	const AttributeDescriptor &descriptor)
+: AbstractButton(parent)
+, _delegate(delegate)
+, _descriptor(descriptor) {
+	setup();
+}
+
+void AttributeButton::setup() {
+	v::match(_descriptor, [&](const auto &data) {
+		_name.setText(st::uniqueAttributeName, data.name);
+		_percent.setText(
+			st::uniqueAttributePercent,
+			Data::UniqueGiftAttributeText(data));
+	});
+
+	v::match(_descriptor, [&](const GiftBackdrop &data) {
+		const auto destroyed = base::take(_player);
+		_document = nullptr;
+		_playerDocument = nullptr;
+		_mediaLifetime.destroy();
+		_patternNow = {};
+		_patternNext = {};
+		_patternFrame = QImage();
+	}, [&](const GiftModel &data) {
+		setDocument(data.document);
+		_patternNow = {};
+		_patternNext = {};
+		_patternFrame = QImage();
+	}, [&](const GiftPattern &data) {
+		const auto document = data.document;
+		if (_document != document) {
+			setDocument(document);
+			const auto owner = &document->owner();
+			_patternNow.emoji = owner->customEmojiManager().create(
+				document,
+				[=] { update(); },
+				Data::CustomEmojiSizeTag::Large);
+			_patternNow.map.clear();
+			_patternColor = QColor();
+		}
+	});
+}
+
+void AttributeButton::setDescriptor(const AttributeDescriptor &descriptor) {
+	if (_descriptor == descriptor) {
+		return;
+	}
+	_descriptor = descriptor;
+	_backgroundCache = QImage();
+	setup();
+	update();
+}
+
+void AttributeButton::setDocument(not_null<DocumentData*> document) {
+	if (_document == document) {
+		return;
+	}
+	_document = document;
+
+	const auto media = document->createMediaView();
+	media->checkStickerLarge();
+	media->goodThumbnailWanted();
+
+	const auto destroyed = base::take(_player);
+	_playerDocument = nullptr;
+	_mediaLifetime = rpl::single() | rpl::then(
+		document->session().downloaderTaskFinished()
+	) | rpl::filter([=] {
+		return media->loaded();
+	}) | rpl::on_next([=] {
+		_mediaLifetime.destroy();
+
+		auto result = std::unique_ptr<HistoryView::StickerPlayer>();
+		const auto sticker = document->sticker();
+		if (sticker->isLottie()) {
+			result = std::make_unique<HistoryView::LottiePlayer>(
+				ChatHelpers::LottiePlayerFromDocument(
+					media.get(),
+					ChatHelpers::StickerLottieSize::InlineResults,
+					st::uniqueAttributeStickerSize,
+					Lottie::Quality::High));
+		} else if (sticker->isWebm()) {
+			result = std::make_unique<HistoryView::WebmPlayer>(
+				media->owner()->location(),
+				media->bytes(),
+				st::uniqueAttributeStickerSize);
+		} else {
+			result = std::make_unique<HistoryView::StaticStickerPlayer>(
+				media->owner()->location(),
+				media->bytes(),
+				st::uniqueAttributeStickerSize);
+		}
+		result->setRepaintCallback([=] { update(); });
+		_playerDocument = media->owner();
+		_player = std::move(result);
+		update();
+	});
+	if (_playerDocument) {
+		_mediaLifetime.destroy();
+	}
+}
+
+void AttributeButton::setGeometry(QRect inner, QMargins extend) {
+	_extend = extend;
+	AbstractButton::setGeometry(inner.marginsAdded(extend));
+}
+
+void AttributeButton::toggleSelected(bool selected, anim::type animated) {
+	if (_selected == selected) {
+		if (animated == anim::type::instant) {
+			_selectedAnimation.stop();
+		}
+		return;
+	}
+
+	const auto duration = st::defaultRoundCheckbox.duration;
+	_selected = selected;
+	if (animated == anim::type::instant) {
+		_selectedAnimation.stop();
+		return;
+	}
+	_selectedAnimation.start([=] {
+		update();
+	}, selected ? 0. : 1., selected ? 1. : 0., duration, anim::easeOutCirc);
+}
+
+void AttributeButton::paintBackground(
+		QPainter &p,
+		const QImage &background) {
+	const auto removed = QMargins();
+	const auto x = removed.left();
+	const auto y = removed.top();
+	const auto width = this->width() - x - removed.right();
+	const auto height = this->height() - y - removed.bottom();
+	const auto dpr = int(background.devicePixelRatio());
+	const auto bwidth = background.width() / dpr;
+	const auto bheight = background.height() / dpr;
+	const auto fillRow = [&](int yfrom, int ytill, int bfrom) {
+		const auto fill = [&](int xto, int wto, int xfrom, int wfrom = 0) {
+			const auto fheight = ytill - yfrom;
+			p.drawImage(
+				QRect(x + xto, y + yfrom, wto, fheight),
+				background,
+				QRect(
+					QPoint(xfrom, bfrom) * dpr,
+					QSize((wfrom ? wfrom : wto), fheight) * dpr));
+		};
+		if (width < bwidth) {
+			const auto xhalf = width / 2;
+			fill(0, xhalf, 0);
+			fill(xhalf, width - xhalf, bwidth - (width - xhalf));
+		} else if (width == bwidth) {
+			fill(0, width, 0);
+		} else {
+			const auto half = bwidth / (2 * dpr);
+			fill(0, half, 0);
+			fill(width - half, half, bwidth - half);
+			fill(half, width - 2 * half, half, 1);
+		}
+	};
+	if (height < bheight) {
+		fillRow(0, height / 2, 0);
+		fillRow(height / 2, height, bheight - (height - (height / 2)));
+	} else {
+		fillRow(0, height, 0);
+	}
+
+	auto hq = PainterHighQualityEnabler(p);
+	const auto progress = _selectedAnimation.value(_selected ? 1. : 0.);
+	if (progress < 0.01) {
+		return;
+	}
+	const auto pwidth = progress * st::defaultRoundCheckbox.width;
+	const auto model = std::get_if<GiftModel>(&_descriptor);
+	const auto color = (!model
+		|| (model->rarityType() == Data::UniqueGiftRarity::Default))
+		? st::defaultRoundCheckbox.bgActive->c
+		: Data::UniqueGiftRarityBadgeColors(model->rarityType()).fg;
+	p.setPen(QPen(color, pwidth));
+	p.setBrush(Qt::NoBrush);
+	const auto rounded = rect().marginsRemoved(_extend);
+	const auto phalf = pwidth / 2.;
+	const auto extended = QRectF(rounded).marginsRemoved(
+		{ phalf, phalf, phalf, phalf });
+	const auto xradius = removed.left() + st::giftBoxGiftRadius - phalf;
+	const auto yradius = removed.top() + st::giftBoxGiftRadius - phalf;
+	p.drawRoundedRect(extended, xradius, yradius);
+}
+
+void AttributeButton::validatePatternCache() {
+	if (_patternNow.emoji && _patternNow.emoji->ready()) {
+		const auto inner = QRect(0, 0,
+			this->width() - _extend.left() - _extend.right(),
+			this->height() - _extend.top() - _extend.bottom());
+		const auto size = inner.size();
+		const auto ratio = style::DevicePixelRatio();
+		if (_patternFrame.size() != size * ratio) {
+			_patternFrame = QImage(
+				size * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			_patternFrame.setDevicePixelRatio(ratio);
+			_patternColor = QColor();
+		}
+		const auto color = _delegate->patternColor();
+		if (_patternColor != color) {
+			_patternColor = color;
+			_patternNow.map.clear();
+			_patternFrame.fill(Qt::transparent);
+
+			auto p = QPainter(&_patternFrame);
+			const auto skip = inner.width() / 3;
+			Ui::PaintBgPoints(
+				p,
+				Ui::PatternBgPointsSmall(),
+				_patternNow.map,
+				_patternNow.emoji.get(),
+				color,
+				QRect(-skip, 0, inner.width() + 2 * skip, inner.height()));
+		}
+	} else if (!_patternFrame.isNull()) {
+		_patternFrame = QImage();
+	}
+}
+
+void AttributeButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	const auto model = std::get_if<GiftModel>(&_descriptor);
+	const auto pattern = std::get_if<GiftPattern>(&_descriptor);
+	const auto backdrop = std::get_if<GiftBackdrop>(&_descriptor);
+	const auto position = QPoint(_extend.left(), _extend.top());
+	const auto background = _delegate->background();
+	const auto width = this->width();
+	const auto dpr = int(background.devicePixelRatio());
+	paintBackground(p, background);
+	if (backdrop) {
+		CacheBackdropBackground(
+			backdrop,
+			width,
+			background.height() / dpr,
+			_extend,
+			_backgroundCache);
+		p.drawImage(_extend.left(), _extend.top(), _backgroundCache);
+
+		const auto inner = QRect(
+			_extend.left(),
+			_extend.top(),
+			this->width() - _extend.left() - _extend.right(),
+			this->height() - _extend.top() - _extend.bottom());
+		const auto skip = inner.width() / 3;
+		const auto emoji = _delegate->patternEmoji();
+		const auto paintSymbols = [&](
+				PatternCache &cache,
+				std::shared_ptr<Text::CustomEmoji> emoji,
+				float64 shown) {
+			if (shown == 0. || !emoji) {
+				return;
+			} else if (cache.emoji != emoji) {
+				cache.map.clear();
+				cache.emoji = emoji;
+			}
+			Ui::PaintBgPoints(
+				p,
+				Ui::PatternBgPointsSmall(),
+				cache.map,
+				emoji.get(),
+				backdrop->patternColor,
+				QRect(-skip, 0, inner.width() + 2 * skip, inner.height()),
+				shown);
+		};
+		p.setClipRect(inner);
+		paintSymbols(_patternNow, emoji.now, 1. - emoji.progress);
+		paintSymbols(_patternNext, emoji.next, emoji.progress);
+		p.setClipping(false);
+	} else if (pattern) {
+		p.drawImage(
+			_extend.left(),
+			_extend.top(),
+			_delegate->cachePatternBackground(
+				width,
+				background.height() / dpr,
+				_extend));
+		validatePatternCache();
+		if (!_patternFrame.isNull()) {
+			p.drawImage(_extend.left(), _extend.top(), _patternFrame);
+		}
+	}
+
+	const auto progress = _selectedAnimation.value(_selected ? 1. : 0.);
+	if (progress > 0) {
+		auto hq = PainterHighQualityEnabler(p);
+		auto pen = st::boxBg->p;
+		const auto thickness = style::ConvertScaleExact(2.);
+		pen.setWidthF(progress * thickness);
+		p.setPen(pen);
+		p.setBrush(Qt::NoBrush);
+		const auto height = background.height() / dpr;
+		const auto outer = QRectF(0, 0, width, height);
+		const auto shift = progress * thickness * 2;
+		const auto extend = QMarginsF(_extend)
+			+ QMarginsF(shift, shift, shift, shift);
+		const auto radius = st::giftBoxGiftRadius - shift;
+		p.drawRoundedRect(outer.marginsRemoved(extend), radius, radius);
+	}
+
+	const auto paused = !isOver();
+	const auto now = crl::now();
+	const auto colored = v::is<GiftPattern>(_descriptor)
+		? QColor(255, 255, 255)
+		: QColor(0, 0, 0, 0);
+	const auto frameSize = st::uniqueAttributeStickerSize;
+	const auto paintFrame = [&](HistoryView::StickerPlayer *player) {
+		if (!player || !player->ready()) {
+			return;
+		}
+		auto info = player->frame(frameSize, colored, false, now, paused);
+		const auto finished = (info.index + 1 == player->framesCount());
+		if (!finished || !paused) {
+			player->markFrameShown();
+		}
+		const auto size = info.image.size() / style::DevicePixelRatio();
+		p.drawImage(
+			QRect(
+				(width - size.width()) / 2,
+				st::giftBoxSmallStickerTop,
+				size.width(),
+				size.height()),
+			info.image);
+	};
+	if (backdrop) {
+		const auto backdropPlayers = _delegate->backdropPlayers();
+		if (backdropPlayers.progress == 0.) {
+			paintFrame(backdropPlayers.now);
+		} else if (backdropPlayers.progress == 1.) {
+			paintFrame(backdropPlayers.next);
+		} else {
+			p.setOpacity(1. - backdropPlayers.progress);
+			paintFrame(backdropPlayers.now);
+			p.setOpacity(backdropPlayers.progress);
+			paintFrame(backdropPlayers.next);
+			p.setOpacity(1.);
+		}
+	} else {
+		paintFrame(_player.get());
+	}
+
+	const auto singlew = width - _extend.left() - _extend.right();
+	if (model) {
+		p.setPen(st::windowBoldFg);
+	} else {
+		p.setPen(QColor(255, 255, 255));
+	}
+	_name.draw(p, {
+		.position = (position + QPoint(0, st::giftBoxPremiumTextTop)),
+		.availableWidth = singlew,
+		.align = style::al_top,
+	});
+
+	p.setPen(Qt::NoPen);
+	p.setBrush(backdrop
+		? backdrop->patternColor
+		: !model
+		? _delegate->patternColor()
+		: (model->rarityType() == Data::UniqueGiftRarity::Default)
+		? anim::color(st::windowBgOver, st::windowBgActive, progress)
+		: MakeOpaque(
+			Data::UniqueGiftRarityBadgeColors(model->rarityType()).bg,
+			st::boxBg->c));
+	const auto ppadding = st::uniqueAttributePercentPadding;
+	const auto add = int(std::ceil(style::ConvertScaleExact(6.)));
+	const auto pradius = std::max(st::giftBoxGiftRadius - add, 1);
+	const auto left = position.x()
+		+ singlew
+		- add
+		- ppadding.right()
+		- _percent.maxWidth();
+	const auto top = position.y() + add + ppadding.top();
+	const auto percent = QRect(
+		left,
+		top,
+		_percent.maxWidth(),
+		st::uniqueAttributeType.font->height);
+	p.drawRoundedRect(percent.marginsAdded(ppadding), pradius, pradius);
+	p.setPen(!model
+		? QColor(255, 255, 255)
+		: (model->rarityType() == Data::UniqueGiftRarity::Default)
+		? anim::color(st::windowSubTextFg, st::windowFgActive, progress)
+		: Data::UniqueGiftRarityBadgeColors(model->rarityType()).fg);
+	_percent.draw(p, {
+		.position = percent.topLeft(),
+	});
+}
+
+Delegate::Delegate(Fn<void()> fullUpdate)
+: _fullUpdate(std::move(fullUpdate)) {
+}
+
+void Delegate::update(
+		const std::optional<Data::UniqueGift> &now,
+		const std::optional<Data::UniqueGift> &next,
+		float64 progress) {
+	const auto wasDirty = _backdropDirty;
+	const auto badSticker = [&](
+			Sticker &model,
+			const std::optional<Data::UniqueGift> &gift) {
+		return gift && (model.document != gift->model.document);
+	};
+	const auto enforceSticker = [&](
+			Sticker &model,
+			const std::optional<Data::UniqueGift> &gift) {
+		Expects(gift.has_value());
+
+		const auto document = model.document = gift->model.document;
+		const auto media = document->createMediaView();
+		media->checkStickerLarge();
+		media->goodThumbnailWanted();
+
+		const auto destroyed = base::take(model.player);
+		model.playerDocument = nullptr;
+		model.mediaLifetime = rpl::single() | rpl::then(
+			document->session().downloaderTaskFinished()
+		) | rpl::filter([=] {
+			return media->loaded();
+		}) | rpl::on_next([=, &model] {
+			model.mediaLifetime.destroy();
+
+			auto result = std::unique_ptr<HistoryView::StickerPlayer>();
+			const auto sticker = document->sticker();
+			if (sticker->isLottie()) {
+				result = std::make_unique<HistoryView::LottiePlayer>(
+					ChatHelpers::LottiePlayerFromDocument(
+						media.get(),
+						ChatHelpers::StickerLottieSize::InlineResults,
+						st::uniqueAttributeStickerSize,
+						Lottie::Quality::High));
+			} else if (sticker->isWebm()) {
+				result = std::make_unique<HistoryView::WebmPlayer>(
+					media->owner()->location(),
+					media->bytes(),
+					st::uniqueAttributeStickerSize);
+			} else {
+				result = std::make_unique<HistoryView::StaticStickerPlayer>(
+					media->owner()->location(),
+					media->bytes(),
+					st::uniqueAttributeStickerSize);
+			}
+			result->setRepaintCallback(_fullUpdate);
+			model.playerDocument = media->owner();
+			model.player = std::move(result);
+			_fullUpdate();
+		});
+		if (model.playerDocument) {
+			model.mediaLifetime.destroy();
+		}
+	};
+	const auto validateSticker = [&](
+			Sticker &model,
+			const std::optional<Data::UniqueGift> &gift) {
+		if (badSticker(model, gift)) {
+			enforceSticker(model, gift);
+		}
+	};
+	const auto validatePatternEmoji = [&](
+			Emoji &emoji,
+			const std::optional<Data::UniqueGift> &gift) {
+		if (!gift) {
+			emoji = {};
+			return;
+		}
+		const auto document = gift->pattern.document;
+		if (emoji.document != document) {
+			emoji.document = document;
+			emoji.custom = document->owner().customEmojiManager().create(
+				document,
+				_fullUpdate,
+				Data::CustomEmojiSizeTag::Large);
+		}
+	};
+
+	if (progress == 1.) {
+		Assert(next.has_value());
+		if (_nextBackdrop != next->backdrop) {
+			_nextBackdrop = next->backdrop;
+			_backdropDirty = true;
+		}
+		validateSticker(_nextModel, next);
+		validatePatternEmoji(_nextPatternEmoji, next);
+		_nowModel = {};
+		_nowPatternEmoji = {};
+	} else {
+		Assert(now.has_value());
+		if (_nowBackdrop != now->backdrop) {
+			if (_nextBackdrop == now->backdrop) {
+				_nowBackdrop = base::take(_nextBackdrop);
+			} else {
+				_nowBackdrop = now->backdrop;
+				_backdropDirty = true;
+			}
+		}
+		if (badSticker(_nowModel, now)) {
+			if (_nextModel.document == now->model.document
+				&& !_nextModel.mediaLifetime) {
+				_nowModel = base::take(_nextModel);
+			} else {
+				enforceSticker(_nowModel, now);
+			}
+		}
+		validatePatternEmoji(_nowPatternEmoji, now);
+		if (progress > 0.) {
+			Assert(next.has_value());
+			if (_nextBackdrop != next->backdrop) {
+				_nextBackdrop = next->backdrop;
+				_backdropDirty = true;
+			}
+			validateSticker(_nextModel, next);
+			validatePatternEmoji(_nextPatternEmoji, next);
+		} else {
+			if (_nextModel.document) {
+				_nextModel = Sticker();
+			}
+			if (_nextPatternEmoji.document) {
+				_nextPatternEmoji = Emoji();
+			}
+		}
+	}
+	if (_progress != progress) {
+		_progress = progress;
+		_backdropDirty = true;
+	}
+	if (!wasDirty && _backdropDirty) {
+		_fullUpdate();
+	}
+}
+
+QSize Delegate::buttonSize() {
+	if (!_single.isEmpty()) {
+		return _single;
+	}
+	const auto width = st::boxWideWidth;
+	const auto padding = st::giftBoxPadding;
+	const auto available = width - padding.left() - padding.right();
+	const auto singlew = (available - 2 * st::giftBoxGiftSkip.x())
+		/ kGiftsPerRow;
+	_single = QSize(singlew, st::giftBoxGiftSmall);
+	return _single;
+}
+
+QMargins Delegate::buttonExtend() const {
+	return st::defaultDropdownMenu.wrap.shadow.extend;
+}
+
+QImage Delegate::background() {
+	if (!_bg.isNull()) {
+		return _bg;
+	}
+	const auto single = buttonSize();
+	const auto extend = buttonExtend();
+	const auto bgSize = single.grownBy(extend);
+	const auto ratio = style::DevicePixelRatio();
+	auto bg = QImage(
+		bgSize * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	bg.setDevicePixelRatio(ratio);
+	bg.fill(Qt::transparent);
+
+	const auto radius = st::giftBoxGiftRadius;
+	const auto rect = QRect(QPoint(), bgSize).marginsRemoved(extend);
+
+	{
+		auto p = QPainter(&bg);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setOpacity(0.3);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::windowShadowFg);
+		p.drawRoundedRect(
+			QRectF(rect).translated(0, radius / 12.),
+			radius,
+			radius);
+	}
+	bg = bg.scaled(
+		(bgSize * ratio) / 2,
+		Qt::IgnoreAspectRatio,
+		Qt::SmoothTransformation);
+	bg = Images::Blur(std::move(bg), true);
+	bg = bg.scaled(
+		bgSize * ratio,
+		Qt::IgnoreAspectRatio,
+		Qt::SmoothTransformation);
+	{
+		auto p = QPainter(&bg);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::windowBg);
+		p.drawRoundedRect(rect, radius, radius);
+	}
+
+	_bg = std::move(bg);
+	return _bg;
+}
+
+QImage Delegate::cachePatternBackground(
+		int width,
+		int height,
+		QMargins extend) {
+	if (_backdropDirty) {
+		_backdrop = GiftBackdrop();
+		if (_progress == 0.) {
+			_backdrop = _nowBackdrop;
+		} else if (_progress == 1.) {
+			_backdrop = _nextBackdrop;
+		} else {
+			_backdrop.centerColor = anim::color(
+				_nowBackdrop.centerColor,
+				_nextBackdrop.centerColor,
+				_progress);
+			_backdrop.edgeColor = anim::color(
+				_nowBackdrop.edgeColor,
+				_nextBackdrop.edgeColor,
+				_progress);
+			_backdrop.patternColor = anim::color(
+				_nowBackdrop.patternColor,
+				_nextBackdrop.patternColor,
+				_progress);
+		}
+	}
+	CacheBackdropBackground(
+		&_backdrop,
+		width,
+		height,
+		extend,
+		_backdropCache,
+		_backdropDirty);
+
+	_backdropDirty = false;
+	return _backdropCache;
+}
+
+QColor Delegate::patternColor() {
+	Expects(!_backdropDirty);
+
+	return _backdrop.patternColor;
+}
+
+BackdropPlayers Delegate::backdropPlayers() {
+	return {
+		.now = _nowModel.player.get(),
+		.next = _nextModel.player.get(),
+		.progress = _progress,
+	};
+}
+
+PatternEmoji Delegate::patternEmoji() {
+	return {
+		.now = _nowPatternEmoji.custom,
+		.next = _nextPatternEmoji.custom,
+		.progress = _progress,
+	};
+}
+
+AttributesList::AttributesList(
+	QWidget *parent,
+	not_null<Delegate*> delegate,
+	not_null<const Data::UniqueGiftAttributes*> attributes,
+	std::vector<Data::UniqueGiftModel> otherModels,
+	rpl::producer<Tab> tab,
+	Selection initialSelection)
+: BoxContentDivider(parent)
+, _delegate(delegate)
+, _attributes(attributes)
+, _tab(std::move(tab))
+, _selected(initialSelection)
+, _entries(&_models)
+, _list(&_entries->list) {
+	_singleMin = _delegate->buttonSize();
+	_activeModels.assign(
+		attributes->models.begin(),
+		attributes->models.end());
+	_otherModels = std::move(otherModels);
+
+	_craftedModels = !_activeModels.empty()
+		&& (_activeModels.front().rarityType()
+			!= Data::UniqueGiftRarity::Default);
+
+	fill();
+
+	_tab.value(
+	) | rpl::on_next([=](Tab tab) {
+		_entries = [&] {
+			switch (tab) {
+			case Tab::Model: return &_models;
+			case Tab::Pattern: return &_patterns;
+			case Tab::Backdrop: return &_backdrops;
+			}
+			Unexpected("Tab in AttributesList.");
+		}();
+		_list = &_entries->list;
+		refreshAbout();
+		refreshButtons();
+	}, lifetime());
+
+	_selected.value() | rpl::combine_previous() | rpl::on_next([=](
+			Selection was,
+			Selection now) {
+		const auto tab = _tab.current();
+		const auto button = [&](int index) {
+			const auto i = ranges::find(_views, index, &View::index);
+			return (i != end(_views)) ? i->button.get() : nullptr;
+		};
+		const auto update = [&](int was, int now) {
+			if (was != now) {
+				if (const auto deselect = button(was)) {
+					deselect->toggleSelected(false, anim::type::normal);
+				}
+				if (const auto select = button(now)) {
+					select->toggleSelected(true, anim::type::normal);
+				}
+			}
+		};
+		if (tab == Tab::Model) {
+			update(was.model, now.model);
+		} else if (tab == Tab::Pattern) {
+			update(was.pattern, now.pattern);
+		} else {
+			update(was.backdrop, now.backdrop);
+		}
+	}, lifetime());
+}
+
+auto AttributesList::selected() const -> rpl::producer<Selection> {
+	return _selected.value();
+}
+
+auto AttributesList::modelsToggled() const
+	-> rpl::producer<std::vector<Data::UniqueGiftModel>> {
+	return _modelsToggled.events();
+}
+
+void AttributesList::fill() {
+	const auto addEntries = [&](
+			const auto &source,
+			Entries &target,
+			const auto field) {
+		auto value = Selection();
+		target.list.clear();
+		target.list.reserve(source.size());
+		for (const auto &item : source) {
+			++(value.*field);
+			target.list.emplace_back(Entry{ { item }, { value } });
+		}
+	};
+	addEntries(_activeModels, _models, &Selection::model);
+	addEntries(_attributes->patterns, _patterns, &Selection::pattern);
+	addEntries(_attributes->backdrops, _backdrops, &Selection::backdrop);
+}
+
+void AttributesList::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	_visibleFrom = visibleTop;
+	_visibleTill = visibleBottom;
+	validateButtons();
+}
+
+void AttributesList::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	p.fillRect(rect(), st::boxDividerBg->c);
+	paintTop(p);
+	paintBottom(p);
+}
+
+void AttributesList::refreshButtons() {
+	_viewsForWidth = 0;
+	_viewsFromRow = 0;
+	_viewsTillRow = 0;
+	resizeToWidth(width());
+	validateButtons();
+}
+
+void AttributesList::validateButtons() {
+	if (!_perRow || !_about) {
+		return;
+	}
+	const auto padding = st::giftBoxPadding;
+	const auto vskip = st::giftListAboutMargin.top()
+		+ _about->height()
+		+ st::giftListAboutMargin.bottom();
+	const auto row = _single.height() + st::giftBoxGiftSkip.y();
+	const auto fromRow = std::max(_visibleFrom - vskip, 0) / row;
+	const auto tillRow = (_visibleTill - vskip + row - 1) / row;
+	Assert(tillRow >= fromRow);
+	if (_viewsFromRow == fromRow
+		&& _viewsTillRow == tillRow
+		&& _viewsForWidth == width()) {
+		return;
+	}
+	_viewsFromRow = fromRow;
+	_viewsTillRow = tillRow;
+	_viewsForWidth = width();
+
+	const auto available = _viewsForWidth - padding.left() - padding.right();
+	const auto skipw = st::giftBoxGiftSkip.x();
+	const auto fullw = _perRow * (_single.width() + skipw) - skipw;
+	const auto left = padding.left() + (available - fullw) / 2;
+	const auto oneh = _single.height() + st::giftBoxGiftSkip.y();
+	auto x = left;
+	auto y = vskip + fromRow * oneh;
+	auto views = std::vector<View>();
+	views.reserve((tillRow - fromRow) * _perRow);
+	const auto idUsed = [&](DocumentData *document, int column, int row) {
+		if (!document) {
+			return false;
+		}
+		for (auto j = row; j != tillRow; ++j) {
+			for (auto i = column; i != _perRow; ++i) {
+				const auto index = j * _perRow + i;
+				if (index >= _list->size()) {
+					return false;
+				} else if (Sticker((*_list)[index].descriptor) == document) {
+					return true;
+				}
+			}
+			column = 0;
+		}
+		return false;
+	};
+	const auto selected = [&] {
+		const auto values = _selected.current();
+		switch (_tab.current()) {
+		case Tab::Model: return values.model;
+		case Tab::Pattern: return values.pattern;
+		case Tab::Backdrop: return values.backdrop;
+		}
+		Unexpected("Tab in AttributesList::validateButtons.");
+	}();
+	const auto add = [&](int column, int row) {
+		const auto index = row * _perRow + column;
+		if (index >= _list->size()) {
+			return false;
+		}
+		const auto &entry = (*_list)[index];
+		const auto &descriptor = entry.descriptor;
+		const auto document = Sticker(descriptor);
+		const auto already = ranges::find_if(_views, [&](const View &view) {
+			return view.button && view.document == document;
+		});
+		if (already != end(_views)) {
+			views.push_back(base::take(*already));
+			views.back().button->setDescriptor(descriptor);
+		} else {
+			const auto unused = ranges::find_if(_views, [&](const View &v) {
+				return v.button && !idUsed(v.document, column, row);
+			});
+			if (unused != end(_views)) {
+				views.push_back(base::take(*unused));
+				views.back().document = document;
+				views.back().button->setDescriptor(descriptor);
+			} else {
+				views.push_back({
+					.button = std::make_unique<AttributeButton>(
+						this,
+						_delegate,
+						descriptor),
+					.document = document,
+				});
+				views.back().button->show();
+			}
+		}
+		auto &view = views.back();
+		view.index = index;
+		view.button->toggleSelected(index == selected, anim::type::instant);
+		view.button->setClickedCallback([=] {
+			clicked(index);
+		});
+		return true;
+	};
+	for (auto j = fromRow; j != tillRow; ++j) {
+		for (auto i = 0; i != _perRow; ++i) {
+			if (!add(i, j)) {
+				break;
+			}
+			const auto &view = views.back();
+			auto pos = QPoint(x, y);
+
+			view.button->setGeometry(
+				QRect(pos, _single),
+				_delegate->buttonExtend());
+			x += _single.width() + skipw;
+		}
+		x = left;
+		y += oneh;
+	}
+
+	std::swap(_views, views);
+}
+
+void AttributesList::clicked(int index) {
+	Expects(index >= 0 && index < _list->size());
+
+	auto now = _selected.current();
+	const auto value = (*_list)[index].value;
+	const auto check = [&](const auto field) {
+		if (value.*field >= 0) {
+			now.*field = (now.*field == value.*field) ? -1 : value.*field;
+		}
+	};
+	check(&Selection::model);
+	check(&Selection::pattern);
+	check(&Selection::backdrop);
+	_selected = now;
+}
+
+void AttributesList::refreshAbout() {
+	auto text = [&] {
+		switch (_tab.current()) {
+		case Tab::Model: return _craftedModels
+			? tr::lng_auction_preview_crafted
+			: tr::lng_auction_preview_models;
+		case Tab::Pattern: return tr::lng_auction_preview_symbols;
+		case Tab::Backdrop: return tr::lng_auction_preview_backdrops;
+		}
+		Unexpected("Tab in AttributesList::refreshAbout.");
+	}()(lt_count_decimal, rpl::single(_list->size() * 1.), tr::rich);
+	auto about = std::make_unique<Ui::FlatLabel>(
+		this,
+		std::move(text),
+		st::giftListAbout);
+	about->show();
+	_about = std::move(about);
+
+	if (_tab.current() == Tab::Model && !_otherModels.empty()) {
+		auto linkText = (_craftedModels
+			? tr::lng_auction_preview_view_primary
+			: tr::lng_auction_preview_view_craftable)(
+			lt_arrow,
+			rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+			tr::link);
+		auto link = std::make_unique<Ui::FlatLabel>(
+			this,
+			std::move(linkText),
+			st::giftListAboutToggle);
+		link->overrideLinkClickHandler([=] { toggleModels(); });
+		link->show();
+		_toggleLink = std::move(link);
+	} else {
+		_toggleLink = nullptr;
+	}
+
+	resizeToWidth(width());
+}
+
+void AttributesList::toggleModels() {
+	std::swap(_activeModels, _otherModels);
+	_craftedModels = !_craftedModels;
+	fill();
+	_entries = &_models;
+	_list = &_entries->list;
+	_modelsToggled.fire_copy(_activeModels);
+	auto sel = _selected.current();
+	sel.model = -1;
+	_selected.force_assign(sel);
+	refreshAbout();
+	refreshButtons();
+}
+
+int AttributesList::resizeGetHeight(int width) {
+	const auto padding = st::giftBoxPadding;
+	const auto count = int(_list->size());
+	const auto available = width - padding.left() - padding.right();
+	const auto skipw = st::giftBoxGiftSkip.x();
+	_perRow = std::min(
+		(available + skipw) / (_singleMin.width() + skipw),
+		std::max(count, 1));
+	if (!_perRow || !_about) {
+		return 0;
+	}
+	auto result = 0;
+
+	const auto margin = st::giftListAboutMargin;
+	const auto contentWidth = width - margin.left() - margin.right();
+	_about->resizeToWidth(contentWidth);
+	if (_toggleLink) {
+		_toggleLink->resizeToWidth(contentWidth);
+	}
+	const auto addedSpace = _toggleLink
+		? (st::giftListAboutToggleSkip + _toggleLink->height())
+		: 0;
+	const auto marginTop = margin.top() - addedSpace / 2;
+	const auto marginBottom = margin.bottom()
+		- (addedSpace - addedSpace / 2);
+	_about->moveToLeft(margin.left(), result + marginTop);
+	result += marginTop + _about->height();
+	if (_toggleLink) {
+		result += st::giftListAboutToggleSkip;
+		_toggleLink->moveToLeft(margin.left(), result);
+		result += _toggleLink->height();
+	}
+	result += marginBottom;
+
+	const auto singlew = std::min(
+		((available + skipw) / _perRow) - skipw,
+		2 * _singleMin.width());
+	Assert(singlew >= _singleMin.width());
+	const auto singleh = _singleMin.height();
+
+	_single = QSize(singlew, singleh);
+	const auto rows = (count + _perRow - 1) / _perRow;
+	const auto skiph = st::giftBoxGiftSkip.y();
+
+	result += rows
+		? (padding.bottom() + rows * (singleh + skiph) - skiph)
+		: 0;
+
+	return result;
+}
+
+} // namespace
+
+void StarGiftPreviewBox(
+		not_null<GenericBox*> box,
+		const QString &title,
+		Data::UniqueGiftAttributes attributes,
+		Data::GiftAttributeIdType tab,
+		std::shared_ptr<Data::UniqueGift> selected) {
+	Expects(!attributes.models.empty());
+	Expects(!attributes.patterns.empty());
+	Expects(!attributes.backdrops.empty());
+
+	const auto filter = [&](auto &list, auto attribute) {
+		const auto rarityProj = &Data::UniqueGiftAttribute::rarityType;
+		const auto simple = Data::UniqueGiftRarity::Default;
+		if (!selected || ((*selected).*attribute).rarityType() == simple) {
+			if (ranges::contains(list, simple, rarityProj)) {
+				list.erase(ranges::remove_if(list, [&](const auto &attribute) {
+					return attribute.rarityType() != simple;
+				}), end(list));
+			}
+		} else {
+			const auto rare = ((*selected).*attribute).rarityType();
+			if (ranges::contains(list, rare, rarityProj)) {
+				list.erase(ranges::remove_if(list, [&](const auto &attribute) {
+					return attribute.rarityType() == simple;
+				}), end(list));
+			}
+		}
+		Assert(!list.empty());
+	};
+	filter(attributes.patterns, &Data::UniqueGift::pattern);
+	filter(attributes.backdrops, &Data::UniqueGift::backdrop);
+
+	auto otherModels = std::vector<Data::UniqueGiftModel>();
+	{
+		const auto simple = Data::UniqueGiftRarity::Default;
+		const auto showCrafted = selected
+			&& (selected->model.rarityType() != simple);
+		auto defaultModels = std::vector<Data::UniqueGiftModel>();
+		auto craftedModels = std::vector<Data::UniqueGiftModel>();
+		for (auto &model : attributes.models) {
+			if (model.rarityType() == simple) {
+				defaultModels.push_back(std::move(model));
+			} else {
+				craftedModels.push_back(std::move(model));
+			}
+		}
+		if (!defaultModels.empty() && !craftedModels.empty()) {
+			if (showCrafted) {
+				attributes.models = std::move(craftedModels);
+				otherModels = std::move(defaultModels);
+			} else {
+				attributes.models = std::move(defaultModels);
+				otherModels = std::move(craftedModels);
+			}
+		} else if (!defaultModels.empty()) {
+			attributes.models = std::move(defaultModels);
+		} else {
+			attributes.models = std::move(craftedModels);
+		}
+	}
+
+	box->setStyle(st::uniqueAttributesBox);
+	box->setWidth(st::boxWideWidth);
+	box->setNoContentMargin(true);
+
+	struct State {
+		State(
+			QString title,
+			const Data::UniqueGiftAttributes &attributes,
+			Data::GiftAttributeIdType tab,
+			std::shared_ptr<Data::UniqueGift> selected)
+		: title(title)
+		, delegate([=] {
+			if (this->tab.current() != Tab::Model && list) {
+				list->update();
+			}
+		})
+		, attributes(attributes)
+		, tab(tab)
+		, gift(make())
+		, pushNextTimer([=] { push(); }) {
+			apply(selected);
+		}
+		void apply(std::shared_ptr<Data::UniqueGift> selected) {
+			if (!selected) {
+				return;
+			}
+			const auto up = [&](auto &list, const auto &attribute) {
+				ranges::stable_partition(list, [&](const auto &existing) {
+					return IdFor(attribute) == IdFor(existing);
+				});
+			};
+			up(attributes.models, selected->model);
+			up(attributes.patterns, selected->pattern);
+			up(attributes.backdrops, selected->backdrop);
+			fixed = { 0, 0, 0 };
+			paused = true;
+			gift = make();
+		}
+
+		void randomize() {
+			const auto choose = [](const auto &list, auto &indices) {
+				if (indices.empty()) {
+					ranges::copy(
+						ranges::views::ints(0, int(list.size())),
+						std::back_inserter(indices));
+				}
+				const auto which = base::RandomIndex(indices.size());
+				const auto index = indices[which];
+				indices.erase(begin(indices) + which);
+				return index;
+			};
+			index = {
+				.model = choose(attributes.models, models),
+				.pattern = choose(attributes.patterns, patterns),
+				.backdrop = choose(attributes.backdrops, backdrops),
+			};
+		}
+		[[nodiscard]] UniqueGiftCover make() {
+			randomize();
+
+			const auto choose = [](const auto &list, int index, int fixed) {
+				return list[(fixed >= 0) ? fixed : index];
+			};
+			return {
+				.values = {
+					.title = title,
+					.model = choose(
+						attributes.models,
+						index.model,
+						fixed.model),
+					.pattern = choose(
+						attributes.patterns,
+						index.pattern,
+						fixed.pattern),
+					.backdrop = choose(
+						attributes.backdrops,
+						index.backdrop,
+						fixed.backdrop),
+				},
+				.force = paused.current(),
+			};
+		}
+		void push() {
+			gift = make();
+		}
+
+		QString title;
+		Delegate delegate;
+		Data::UniqueGiftAttributes attributes;
+		std::vector<int> models;
+		std::vector<int> patterns;
+		std::vector<int> backdrops;
+		rpl::variable<Tab> tab = Tab::Model;
+		Selection index;
+		Selection fixed;
+		rpl::variable<bool> paused;
+
+		rpl::variable<UniqueGiftCover> gift;
+
+		AttributesList *list = nullptr;
+
+		base::Timer pushNextTimer;
+	};
+
+	const auto state = box->lifetime().make_state<State>(
+		title,
+		attributes,
+		tab,
+		selected);
+
+	const auto repaintedHook = [=](
+			std::optional<Data::UniqueGift> now,
+			std::optional<Data::UniqueGift> next,
+			float64 progress) {
+		state->delegate.update(now, next, progress);
+	};
+
+	const auto top = box->setPinnedToTopContent(
+		object_ptr<VerticalLayout>(box));
+	AddUniqueGiftCover(top, state->gift.value(), {
+		.subtitle = rpl::conditional(
+			state->paused.value(),
+			tr::lng_auction_preview_selected(tr::marked),
+			tr::lng_auction_preview_random(tr::marked)),
+		.attributesInfo = true,
+		.repaintedHook = repaintedHook,
+	});
+
+	Ui::AddUniqueCloseButton(box);
+
+	const auto container = box->verticalLayout();
+	state->list = container->add(object_ptr<AttributesList>(
+		box,
+		&state->delegate,
+		&state->attributes,
+		std::move(otherModels),
+		state->tab.value(),
+		state->fixed));
+	state->list->selected(
+	) | rpl::on_next([=](Selection value) {
+		state->fixed = value;
+		state->paused = (value.model >= 0)
+			|| (value.pattern >= 0)
+			|| (value.backdrop >= 0);
+		state->push();
+	}, box->lifetime());
+	state->list->modelsToggled(
+	) | rpl::on_next([=](std::vector<Data::UniqueGiftModel> models) {
+		state->attributes.models = std::move(models);
+		state->models.clear();
+	}, box->lifetime());
+
+	const auto button = box->addButton(rpl::single(u""_q), [] {});
+	const auto buttonsParent = button->parentWidget();
+	box->clearButtons();
+
+	const auto add = [&](
+			tr::phrase<> text,
+			const style::RoundButton &st,
+			const style::icon &active,
+			Tab tab) {
+		auto owned = object_ptr<RoundButton>(
+			buttonsParent,
+			text(),
+			st);
+		const auto raw = owned.data();
+
+		raw->setClickedCallback([=] {
+			state->tab = tab;
+		});
+		const auto icon = &active;
+		state->tab.value() | rpl::on_next([=](Tab now) {
+			raw->setTextFgOverride((now == tab)
+				? st::defaultActiveButton.textFg->c
+				: std::optional<QColor>());
+			raw->setBrushOverride((now == tab)
+				? st::defaultActiveButton.textBg->c
+				: std::optional<QColor>());
+			raw->setIconOverride((now == tab) ? icon : nullptr);
+		}, raw->lifetime());
+		box->addButton(std::move(owned));
+	};
+	add(
+		tr::lng_auction_preview_symbols_button,
+		st::uniqueAttributeSymbol,
+		st::uniqueAttributeSymbolActive,
+		Tab::Pattern);
+	add(
+		tr::lng_auction_preview_backdrops_button,
+		st::uniqueAttributeBackdrop,
+		st::uniqueAttributeBackdropActive,
+		Tab::Backdrop);
+	add(
+		tr::lng_auction_preview_models_button,
+		st::uniqueAttributeModel,
+		st::uniqueAttributeModelActive,
+		Tab::Model);
+
+	state->paused.value() | rpl::on_next([=](bool paused) {
+		if (paused) {
+			state->pushNextTimer.cancel();
+		} else {
+			state->pushNextTimer.callEach(kSwitchTimeout);
+		}
+	}, box->lifetime());
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_preview_box.h b/Telegram/SourceFiles/boxes/star_gift_preview_box.h
new file mode 100644
index 00000000000000..be3c0656083083
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/star_gift_preview_box.h
@@ -0,0 +1,32 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+struct StarGift;
+struct UniqueGift;
+struct UniqueGiftAttributes;
+enum class GiftAttributeIdType;
+} // namespace Data
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+
+class GenericBox;
+
+void StarGiftPreviewBox(
+	not_null<GenericBox*> box,
+	const QString &title,
+	Data::UniqueGiftAttributes attributes,
+	Data::GiftAttributeIdType tab,
+	std::shared_ptr<Data::UniqueGift> selected);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_resale_box.cpp b/Telegram/SourceFiles/boxes/star_gift_resale_box.cpp
new file mode 100644
index 00000000000000..23ef4000c9fda6
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/star_gift_resale_box.cpp
@@ -0,0 +1,841 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/star_gift_resale_box.h"
+
+#include "boxes/star_gift_box.h"
+#include "boxes/transfer_gift_box.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "core/ui_integration.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_star_gift.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
+#include "main/main_session.h"
+#include "menu/gift_resale_filter.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+
+#include <QtWidgets/QApplication>
+
+namespace Ui {
+namespace {
+
+constexpr auto kFiltersCount = 4;
+constexpr auto kResaleBoughtToastDuration = 4 * crl::time(1000);
+
+using Data::GiftAttributeId;
+using Data::GiftAttributeIdType;
+using Data::ResaleGiftsSort;
+using Data::ResaleGiftsFilter;
+using Data::ResaleGiftsDescriptor;
+//using Data::MyGiftsDescriptor;
+
+[[nodiscard]] Text::String ResaleTabText(QString text) {
+	auto result = Text::String();
+	result.setMarkedText(
+		st::semiboldTextStyle,
+		TextWithEntities{ text }.append(st::giftBoxResaleTabsDropdown),
+		kMarkupTextOptions);
+	return result;
+}
+
+[[nodiscard]] Text::String SortModeText(ResaleGiftsSort mode) {
+	auto text = [&] {
+		if (mode == ResaleGiftsSort::Number) {
+			return Ui::Text::IconEmoji(&st::giftBoxResaleMiniNumber).append(
+				tr::lng_gift_resale_number(tr::now));
+		} else if (mode == ResaleGiftsSort::Price) {
+			return Ui::Text::IconEmoji(&st::giftBoxResaleMiniPrice).append(
+				tr::lng_gift_resale_price(tr::now));
+		}
+		return Ui::Text::IconEmoji(&st::giftBoxResaleMiniDate).append(
+			tr::lng_gift_resale_date(tr::now));
+	}();
+	auto result = Text::String();
+	result.setMarkedText(
+		st::semiboldTextStyle,
+		text,
+		kMarkupTextOptions);
+	return result;
+}
+
+struct ResaleTabs {
+	rpl::producer<ResaleGiftsFilter> filter;
+	object_ptr<RpWidget> widget;
+};
+[[nodiscard]] ResaleTabs MakeResaleTabs(
+		std::shared_ptr<ChatHelpers::Show> show,
+		const ResaleGiftsDescriptor &info,
+		rpl::producer<ResaleGiftsFilter> filter) {
+	auto widget = object_ptr<RpWidget>((QWidget*)nullptr);
+	const auto raw = widget.data();
+
+	struct Button {
+		QRect geometry;
+		Text::String text;
+	};
+	struct State {
+		rpl::variable<ResaleGiftsFilter> filter;
+		rpl::variable<int> fullWidth;
+		std::vector<Button> buttons;
+		base::unique_qptr<Ui::PopupMenu> menu;
+		ResaleGiftsDescriptor lists;
+		int dragx = 0;
+		int pressx = 0;
+		float64 dragscroll = 0.;
+		float64 scroll = 0.;
+		int scrollMax = 0;
+		int selected = -1;
+		int pressed = -1;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+	state->filter = std::move(filter);
+
+	const auto forCraft = state->filter.current().forCraft;
+	const auto wrapName = [=](QString name, int count) {
+		auto result = tr::marked(name);
+		if (!forCraft) {
+			result.append(' ').append(tr::bold(
+				Lang::FormatCountDecimal(count)));
+		}
+		return result;
+	};
+
+	state->lists.backdrops = info.backdrops;
+	state->lists.models = info.models;
+	state->lists.patterns = info.patterns;
+	if (forCraft) {
+		using namespace Data;
+		const auto isRare = [](const UniqueGiftModelCount &entry) {
+			return entry.model.rarityType() != UniqueGiftRarity::Default;
+		};
+		state->lists.models.erase(
+			ranges::remove_if(state->lists.models, isRare),
+			end(state->lists.models));
+	}
+	ranges::stable_sort(
+		state->lists.models,
+		ranges::greater(),
+		&Data::UniqueGiftModelCount::count);
+	ranges::stable_sort(
+		state->lists.backdrops,
+		ranges::greater(),
+		&Data::UniqueGiftBackdropCount::count);
+	ranges::stable_sort(
+		state->lists.patterns,
+		ranges::greater(),
+		&Data::UniqueGiftPatternCount::count);
+
+	const auto scroll = [=] {
+		return QPoint(int(base::SafeRound(state->scroll)), 0);
+	};
+
+	static constexpr auto IndexToType = [](int index) {
+		Expects(index > 0 && index < 4);
+
+		return (index == 1)
+			? GiftAttributeIdType::Model
+			: (index == 2)
+			? GiftAttributeIdType::Backdrop
+			: GiftAttributeIdType::Pattern;
+	};
+
+	const auto setSelected = [=](int index) {
+		const auto was = (state->selected >= 0);
+		const auto now = (index >= 0);
+		state->selected = index;
+		if (was != now) {
+			raw->setCursor(now ? style::cur_pointer : style::cur_default);
+		}
+	};
+	const auto showMenu = [=](int index) {
+		if (state->menu) {
+			return;
+		}
+		state->menu = base::make_unique_q<Ui::PopupMenu>(
+			raw,
+			st::giftBoxResaleFilter);
+		const auto menu = state->menu.get();
+		const auto modify = [=](Fn<void(ResaleGiftsFilter&)> modifier) {
+			auto now = state->filter.current();
+			modifier(now);
+			state->filter = now;
+		};
+		const auto actionWithIcon = [=](
+				QString text,
+				Fn<void()> callback,
+				not_null<const style::icon*> icon,
+				bool checked = false) {
+			auto action = base::make_unique_q<Ui::GiftResaleFilterAction>(
+				menu->menu(),
+				menu->st().menu,
+				TextWithEntities{ text },
+				Ui::Text::MarkedContext(),
+				QString(),
+				icon);
+			action->setChecked(checked);
+			action->setActionTriggered(std::move(callback));
+			menu->addAction(std::move(action));
+		};
+		auto context = Core::TextContext({ .session = &show->session() });
+		context.customEmojiFactory = [original = context.customEmojiFactory](
+				QStringView data,
+				const Ui::Text::MarkedContext &context) {
+			return Ui::GiftResaleColorEmoji::Owns(data)
+				? std::make_unique<Ui::GiftResaleColorEmoji>(data)
+				: original(data, context);
+		};
+		const auto actionWithEmoji = [=](
+				TextWithEntities text,
+				Fn<void()> callback,
+				QString data,
+				bool checked) {
+			auto action = base::make_unique_q<Ui::GiftResaleFilterAction>(
+				menu->menu(),
+				menu->st().menu,
+				std::move(text),
+				context,
+				data,
+				nullptr);
+			action->setChecked(checked);
+			action->setActionTriggered(std::move(callback));
+			menu->addAction(std::move(action));
+		};
+		const auto actionWithDocument = [=](
+				TextWithEntities text,
+				Fn<void()> callback,
+				DocumentId id,
+				bool checked) {
+			actionWithEmoji(
+				std::move(text),
+				std::move(callback),
+				Data::SerializeCustomEmojiId(id),
+				checked);
+		};
+		const auto actionWithColor = [=](
+				TextWithEntities text,
+				Fn<void()> callback,
+				const QColor &color,
+				bool checked) {
+			actionWithEmoji(
+				std::move(text),
+				std::move(callback),
+				Ui::GiftResaleColorEmoji::DataFor(color),
+				checked);
+		};
+		if (!index) {
+			const auto sort = [=](ResaleGiftsSort value) {
+				modify([&](ResaleGiftsFilter &filter) {
+					filter.sort = value;
+				});
+			};
+			const auto is = [&](ResaleGiftsSort value) {
+				return state->filter.current().sort == value;
+			};
+			actionWithIcon(tr::lng_gift_resale_sort_price(tr::now), [=] {
+				sort(ResaleGiftsSort::Price);
+			}, &st::menuIconOrderPrice, is(ResaleGiftsSort::Price));
+			actionWithIcon(tr::lng_gift_resale_sort_date(tr::now), [=] {
+				sort(ResaleGiftsSort::Date);
+			}, &st::menuIconOrderDate, is(ResaleGiftsSort::Date));
+			actionWithIcon(tr::lng_gift_resale_sort_number(tr::now), [=] {
+				sort(ResaleGiftsSort::Number);
+			}, &st::menuIconOrderNumber, is(ResaleGiftsSort::Number));
+			menu->addSeparator();
+			const auto starsOnly = state->filter.current().starsOnly;
+			actionWithIcon(tr::lng_gift_resale_all_listings(tr::now), [=] {
+				modify([&](ResaleGiftsFilter &filter) {
+					filter.starsOnly = false;
+				});
+			}, &st::menuIconTopics, !starsOnly);
+			actionWithIcon(tr::lng_gift_resale_stars_only(tr::now), [=] {
+				modify([&](ResaleGiftsFilter &filter) {
+					filter.starsOnly = true;
+				});
+			}, &st::menuIconStar, starsOnly);
+		} else {
+			const auto now = state->filter.current().attributes;
+			const auto type = IndexToType(index);
+			const auto has = ranges::contains(
+				now,
+				type,
+				&GiftAttributeId::type);
+			if (has) {
+				actionWithIcon(tr::lng_gift_resale_filter_all(tr::now), [=] {
+					modify([&](ResaleGiftsFilter &filter) {
+						auto &list = filter.attributes;
+						for (auto i = begin(list); i != end(list);) {
+							if (i->type == type) {
+								i = list.erase(i);
+							} else {
+								++i;
+							}
+						}
+					});
+				}, &st::menuIconSelect);
+			}
+			const auto toggle = [=](GiftAttributeId id) {
+				modify([&](ResaleGiftsFilter &filter) {
+					auto &list = filter.attributes;
+					if (ranges::contains(list, id)) {
+						list.remove(id);
+					} else {
+						list.emplace(id);
+					}
+				});
+			};
+			const auto checked = [=](GiftAttributeId id) {
+				return !has || ranges::contains(now, id);
+			};
+			if (type == GiftAttributeIdType::Model) {
+				for (auto &entry : state->lists.models) {
+					const auto id = IdFor(entry.model);
+					const auto text = wrapName(
+						entry.model.name,
+						entry.count);
+					actionWithDocument(text, [=] {
+						toggle(id);
+					}, id.value, checked(id));
+				}
+			} else if (type == GiftAttributeIdType::Backdrop) {
+				for (auto &entry : state->lists.backdrops) {
+					const auto id = IdFor(entry.backdrop);
+					const auto text = wrapName(
+						entry.backdrop.name,
+						entry.count);
+					actionWithColor(text, [=] {
+						toggle(id);
+					}, entry.backdrop.centerColor, checked(id));
+				}
+			} else if (type == GiftAttributeIdType::Pattern) {
+				for (auto &entry : state->lists.patterns) {
+					const auto id = IdFor(entry.pattern);
+					const auto text = wrapName(
+						entry.pattern.name,
+						entry.count);
+					actionWithDocument(text, [=] {
+						toggle(id);
+					}, id.value, checked(id));
+				}
+			}
+		}
+		menu->popup(QCursor::pos());
+	};
+
+	state->filter.value(
+	) | rpl::on_next([=](const ResaleGiftsFilter &fields) {
+		auto x = st::giftBoxResaleTabsMargin.left();
+		auto y = st::giftBoxResaleTabsMargin.top();
+
+		setSelected(-1);
+		state->buttons.resize(kFiltersCount);
+		const auto &list = fields.attributes;
+		const auto setForIndex = [&](int i, auto many, auto one) {
+			const auto type = IndexToType(i);
+			const auto count = ranges::count(
+				list,
+				type,
+				&GiftAttributeId::type);
+			state->buttons[i].text = ResaleTabText((count > 0)
+				? many(tr::now, lt_count, count)
+				: one(tr::now));
+		};
+		state->buttons[0].text = SortModeText(fields.sort);
+		setForIndex(
+			1,
+			tr::lng_gift_resale_models,
+			tr::lng_gift_resale_model);
+		setForIndex(
+			2,
+			tr::lng_gift_resale_backdrops,
+			tr::lng_gift_resale_backdrop);
+		setForIndex(
+			3,
+			tr::lng_gift_resale_symbols,
+			tr::lng_gift_resale_symbol);
+
+		const auto padding = st::giftBoxTabPadding;
+		for (auto &button : state->buttons) {
+			const auto width = button.text.maxWidth();
+			const auto height = st::giftBoxTabStyle.font->height;
+			const auto r = QRect(0, 0, width, height).marginsAdded(padding);
+			button.geometry = QRect(QPoint(x, y), r.size());
+			x += r.width() + st::giftBoxResaleTabSkip;
+		}
+		state->fullWidth = x
+			- st::giftBoxTabSkip
+			+ st::giftBoxTabsMargin.right();
+		const auto height = state->buttons.empty()
+			? 0
+			: (y
+				+ state->buttons.back().geometry.height()
+				+ st::giftBoxTabsMargin.bottom());
+		raw->resize(raw->width(), height);
+		raw->update();
+	}, raw->lifetime());
+
+	rpl::combine(
+		raw->widthValue(),
+		state->fullWidth.value()
+	) | rpl::on_next([=](int outer, int inner) {
+		state->scrollMax = std::max(0, inner - outer);
+	}, raw->lifetime());
+
+	raw->setMouseTracking(true);
+	raw->events() | rpl::on_next([=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		switch (type) {
+		case QEvent::Leave: setSelected(-1); break;
+		case QEvent::MouseMove: {
+			const auto me = static_cast<QMouseEvent*>(e.get());
+			const auto mousex = me->pos().x();
+			const auto drag = QApplication::startDragDistance();
+			if (state->dragx > 0) {
+				state->scroll = std::clamp(
+					state->dragscroll + state->dragx - mousex,
+					0.,
+					state->scrollMax * 1.);
+				raw->update();
+				break;
+			} else if (state->pressx > 0
+				&& std::abs(state->pressx - mousex) > drag) {
+				state->dragx = state->pressx;
+				state->dragscroll = state->scroll;
+			}
+			const auto position = me->pos() + scroll();
+			for (auto i = 0, c = int(state->buttons.size()); i != c; ++i) {
+				if (state->buttons[i].geometry.contains(position)) {
+					setSelected(i);
+					break;
+				}
+			}
+		} break;
+		case QEvent::Wheel: {
+			const auto me = static_cast<QWheelEvent*>(e.get());
+			state->scroll = std::clamp(
+				state->scroll - ScrollDeltaF(me).x(),
+				0.,
+				state->scrollMax * 1.);
+			raw->update();
+		} break;
+		case QEvent::MouseButtonPress: {
+			const auto me = static_cast<QMouseEvent*>(e.get());
+			if (me->button() != Qt::LeftButton) {
+				break;
+			}
+			state->pressed = state->selected;
+			state->pressx = me->pos().x();
+		} break;
+		case QEvent::MouseButtonRelease: {
+			const auto me = static_cast<QMouseEvent*>(e.get());
+			if (me->button() != Qt::LeftButton) {
+				break;
+			}
+			const auto dragx = std::exchange(state->dragx, 0);
+			const auto pressed = std::exchange(state->pressed, -1);
+			state->pressx = 0;
+			if (!dragx && pressed >= 0 && state->selected == pressed) {
+				showMenu(pressed);
+			}
+		} break;
+		}
+	}, raw->lifetime());
+
+	raw->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(raw);
+		auto hq = PainterHighQualityEnabler(p);
+		const auto padding = st::giftBoxTabPadding;
+		const auto shift = -scroll();
+		for (const auto &button : state->buttons) {
+			const auto geometry = button.geometry.translated(shift);
+
+			p.setBrush(st::giftBoxTabBgActive);
+			p.setPen(Qt::NoPen);
+			const auto radius = geometry.height() / 2.;
+			p.drawRoundedRect(geometry, radius, radius);
+			p.setPen(st::giftBoxTabFgActive);
+
+			button.text.draw(p, {
+				.position = geometry.marginsRemoved(padding).topLeft(),
+				.availableWidth = button.text.maxWidth(),
+			});
+		}
+		{
+			const auto &icon = st::defaultEmojiSuggestions;
+			const auto w = icon.fadeRight.width();
+			const auto &c = st::boxDividerBg->c;
+			const auto r = QRect(0, 0, w, raw->height());
+			const auto s = std::abs(float64(shift.x()));
+			constexpr auto kF = 0.5;
+			const auto opacityRight = (state->scrollMax - s)
+				/ (icon.fadeRight.width() * kF);
+			p.setOpacity(std::clamp(std::abs(opacityRight), 0., 1.));
+			icon.fadeRight.fill(p, r.translated(raw->width() -  w, 0), c);
+
+			const auto opacityLeft = s / (icon.fadeLeft.width() * kF);
+			p.setOpacity(std::clamp(std::abs(opacityLeft), 0., 1.));
+			icon.fadeLeft.fill(p, r, c);
+		}
+	}, raw->lifetime());
+
+	return {
+		.filter = state->filter.value(),
+		.widget = std::move(widget),
+	};
+}
+
+void GiftResaleBox(
+		not_null<GenericBox*> box,
+		not_null<Window::SessionController*> window,
+		not_null<PeerData*> peer,
+		ResaleGiftsDescriptor descriptor) {
+	box->setWidth(st::boxWideWidth);
+
+	const auto titleWrap = box->setPinnedToTopContent(
+		object_ptr<Ui::VerticalLayout>(box.get()));
+
+	titleWrap->add(object_ptr<Ui::FixedHeightWidget>(
+		titleWrap,
+		st::defaultVerticalListSkip));
+
+	titleWrap->add(
+		object_ptr<Ui::FlatLabel>(
+			titleWrap,
+			rpl::single(descriptor.title),
+			st::boxTitle),
+		QMargins(st::boxRowPadding.left(), 0, st::boxRowPadding.right(), 0));
+
+	const auto countLabel = titleWrap->add(
+		object_ptr<Ui::FlatLabel>(
+			titleWrap,
+			(descriptor.count
+				? tr::lng_gift_resale_count(
+					tr::now,
+					lt_count,
+					descriptor.count)
+				: tr::lng_gift_resale_count_none(tr::now)),
+			st::defaultFlatLabel),
+		QMargins(
+			st::boxRowPadding.left(),
+			0,
+			st::boxRowPadding.right(),
+			st::defaultVerticalListSkip));
+	countLabel->setTextColorOverride(st::windowSubTextFg->c);
+
+	const auto content = box->verticalLayout();
+	content->paintRequest() | rpl::on_next([=](QRect clip) {
+		QPainter(content).fillRect(clip, st::boxDividerBg);
+	}, content->lifetime());
+
+	struct State {
+		rpl::variable<bool> starsOnly;
+		int lastMinHeight = 0;
+	};
+	const auto state = content->lifetime().make_state<State>();
+
+	box->addButton(tr::lng_create_group_back(), [=] { box->closeBox(); });
+
+	const auto filter = box->addLeftButton(rpl::single(QString()), [=] {
+		state->starsOnly = !state->starsOnly.current();
+	});
+	filter->setText(rpl::conditional(
+		state->starsOnly.value(),
+		tr::lng_gift_resale_all_listings(),
+		tr::lng_gift_resale_stars_only()));
+
+	box->heightValue() | rpl::on_next([=](int height) {
+		if (height > state->lastMinHeight) {
+			state->lastMinHeight = height;
+			box->setMinHeight(height);
+		}
+	}, content->lifetime());
+
+	AddResaleGiftsList(
+		window,
+		peer,
+		content,
+		std::move(descriptor),
+		&state->starsOnly,
+		nullptr,
+		false,
+		[=](int count) {
+			countLabel->setText(count
+				? tr::lng_gift_resale_count(
+					tr::now,
+					lt_count,
+					count)
+				: tr::lng_gift_resale_count_none(tr::now));
+		});
+}
+
+} // namespace
+
+void AddResaleGiftsList(
+		not_null<Window::SessionController*> window,
+		not_null<PeerData*> peer,
+		not_null<VerticalLayout*> container,
+		Data::ResaleGiftsDescriptor descriptor,
+		rpl::variable<bool> *starsOnly,
+		Fn<void(std::shared_ptr<Data::UniqueGift>)> bought,
+		bool forCraft,
+		Fn<void(int)> countChanged) {
+	struct State {
+		rpl::event_stream<> updated;
+		ResaleGiftsDescriptor data;
+		rpl::variable<ResaleGiftsFilter> filter;
+		rpl::variable<bool> empty = true;
+		rpl::lifetime loading;
+		int lastMinHeight = 0;
+	};
+	const auto state = container->lifetime().make_state<State>();
+	state->filter = ResaleGiftsFilter{ .forCraft = forCraft };
+	state->data = std::move(descriptor);
+
+	auto tabs = MakeResaleTabs(
+		window->uiShow(),
+		state->data,
+		state->filter.value());
+	state->filter = std::move(tabs.filter);
+	if (starsOnly) {
+		starsOnly->changes(
+		) | rpl::on_next([=](bool value) {
+			auto f = state->filter.current();
+			if (f.starsOnly != value) {
+				f.starsOnly = value;
+				state->filter = f;
+			}
+		}, container->lifetime());
+
+		state->filter.changes(
+		) | rpl::on_next([=](const ResaleGiftsFilter &f) {
+			if (starsOnly->current() != f.starsOnly) {
+				*starsOnly = f.starsOnly;
+			}
+		}, container->lifetime());
+
+		if (starsOnly->current()) {
+			auto f = state->filter.current();
+			f.starsOnly = true;
+			state->filter = f;
+		}
+	}
+	if (forCraft) {
+		const auto skip = st::giftBoxResaleTabsMargin.top()
+			- st::giftBoxTabsMargin.bottom();
+		const auto wrap = container->add(object_ptr<PaddingWrap<>>(
+			container,
+			std::move(tabs.widget),
+			QMargins(0, 0, 0, skip)));
+		wrap->paintOn([=](QPainter &p) {
+			p.fillRect(wrap->rect(), st::windowBgOver);
+		});
+	} else {
+		container->add(std::move(tabs.widget));
+	}
+
+	const auto session = &window->session();
+	state->filter.changes() | rpl::on_next([=](ResaleGiftsFilter value) {
+		state->data.offset = QString();
+		state->loading = ResaleGiftsSlice(
+			session,
+			state->data.giftId,
+			value,
+			QString()
+		) | rpl::on_next([=](ResaleGiftsDescriptor &&slice) {
+			state->loading.destroy();
+			state->data.offset = slice.list.empty()
+				? QString()
+				: slice.offset;
+			state->data.count = slice.count;
+			state->data.list = std::move(slice.list);
+			if (countChanged) {
+				countChanged(state->data.count);
+			}
+			state->updated.fire({});
+		});
+	}, container->lifetime());
+
+	session->data().giftUpdates(
+	) | rpl::on_next([=](const Data::GiftUpdate &update) {
+		using Action = Data::GiftUpdate::Action;
+		const auto action = update.action;
+		if (action != Action::Transfer && action != Action::ResaleChange) {
+			return;
+		}
+		const auto i = ranges::find(
+			state->data.list,
+			update.slug,
+			[](const Data::StarGift &gift) {
+				return gift.unique ? gift.unique->slug : QString();
+			});
+		if (i == end(state->data.list)) {
+			return;
+		} else if (action == Action::Transfer
+			|| !i->unique->starsForResale) {
+			state->data.list.erase(i);
+		}
+		state->updated.fire({});
+	}, container->lifetime());
+
+	using Descriptor = Info::PeerGifts::GiftDescriptor;
+	auto customHandler = Fn<void(Descriptor)>();
+	if (bought) {
+		using StarGift = Info::PeerGifts::GiftTypeStars;
+		customHandler = crl::guard(container, [=](Descriptor descriptor) {
+			Expects(v::is<StarGift>(descriptor));
+
+			const auto unique = v::get<StarGift>(descriptor).info.unique;
+			const auto done = crl::guard(container, [=](bool ok) {
+				if (ok) {
+					bought(unique);
+				}
+			});
+			const auto to = peer->session().user();
+			ShowBuyResaleGiftBox(window->uiShow(), unique, false, to, done);
+		});
+	}
+
+	auto gifts = rpl::single(
+		rpl::empty
+	) | rpl::then(
+		state->updated.events() | rpl::type_erased
+	) | rpl::map([=] {
+		auto result = GiftsDescriptor();
+		const auto selfId = window->session().userPeerId();
+		for (const auto &gift : state->data.list) {
+			const auto mine = (gift.unique->ownerId == selfId);
+			if (mine && forCraft) {
+				continue;
+			}
+			result.list.push_back(Info::PeerGifts::GiftTypeStars{
+				.info = gift,
+				.resale = true,
+				.mine = mine,
+				});
+		}
+		state->empty = result.list.empty();
+		return result;
+	});
+	const auto loadMore = [=] {
+		if (!state->data.offset.isEmpty()
+			&& !state->loading) {
+			state->loading = ResaleGiftsSlice(
+				&peer->session(),
+				state->data.giftId,
+				state->filter.current(),
+				state->data.offset
+			) | rpl::on_next([=](ResaleGiftsDescriptor &&slice) {
+				state->loading.destroy();
+				state->data.offset = slice.list.empty()
+					? QString()
+					: slice.offset;
+				state->data.list.insert(
+					end(state->data.list),
+					std::make_move_iterator(begin(slice.list)),
+					std::make_move_iterator(end(slice.list)));
+				state->updated.fire({});
+			});
+		}
+	};
+	container->add(MakeGiftsList({
+		.window = window,
+		.mode = forCraft ? GiftsListMode::CraftResale : GiftsListMode::Send,
+		.peer = peer,
+		.gifts = std::move(gifts),
+		.loadMore = loadMore,
+		.handler = customHandler,
+	}));
+
+	const auto skip = st::defaultSubsectionTitlePadding.top();
+	const auto wrap = container->add(
+		object_ptr<SlideWrap<FlatLabel>>(
+			container,
+			object_ptr<FlatLabel>(
+				container,
+				(forCraft
+					? tr::lng_gift_craft_search_none()
+					: tr::lng_gift_resale_search_none()),
+				st::craftYourListEmpty),
+			(st::boxRowPadding + QMargins(0, 0, 0, skip))),
+		style::al_top);
+	state->empty.value() | rpl::on_next([=](bool empty) {
+		// Scroll doesn't jump up if we show before rows are cleared,
+		// and we hide after rows are added.
+		if (empty) {
+			wrap->show(anim::type::instant);
+		} else {
+			crl::on_main(wrap, [=] {
+				if (!state->empty.current()) {
+					wrap->hide(anim::type::instant);
+				}
+			});
+		}
+	}, wrap->lifetime());
+	wrap->entity()->setTryMakeSimilarLines(true);
+}
+
+void ShowResaleGiftBoughtToast(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<PeerData*> to,
+		const Data::UniqueGift &gift) {
+	show->showToast({
+		.title = to->isSelf() ? QString() : tr::lng_gift_sent_title(tr::now),
+		.text = TextWithEntities{ (to->isSelf()
+			? tr::lng_gift_sent_resale_done_self(
+				tr::now,
+				lt_gift,
+				Data::UniqueGiftName(gift))
+			: tr::lng_gift_sent_resale_done(
+				tr::now,
+				lt_user,
+				to->shortName())),
+		},
+		.duration = kResaleBoughtToastDuration,
+	});
+}
+
+rpl::lifetime ShowStarGiftResale(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		uint64 giftId,
+		QString title,
+		Fn<void()> finishRequesting) {
+	const auto weak = base::make_weak(controller);
+	const auto session = &controller->session();
+	return Data::ResaleGiftsSlice(
+		session,
+		giftId
+	) | rpl::on_next([=](ResaleGiftsDescriptor &&info) {
+		if (const auto onstack = finishRequesting) {
+			onstack();
+		}
+		if (!info.giftId || !info.count) {
+			return;
+		}
+		info.title = title;
+		if (const auto strong = weak.get()) {
+			strong->show(Box(GiftResaleBox, strong, peer, std::move(info)));
+		}
+	});
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_resale_box.h b/Telegram/SourceFiles/boxes/star_gift_resale_box.h
new file mode 100644
index 00000000000000..7ff44e7519c52e
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/star_gift_resale_box.h
@@ -0,0 +1,54 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+struct UniqueGift;
+struct ResaleGiftsDescriptor;
+} // namespace Data
+
+namespace Info::PeerGifts {
+struct GiftTypeStars;
+} // namespace Info::PeerGifts
+
+namespace Main {
+class Session;
+class SessionShow;
+} // namespace Main
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+
+class VerticalLayout;
+
+void ShowResaleGiftBoughtToast(
+	std::shared_ptr<Main::SessionShow> show,
+	not_null<PeerData*> to,
+	const Data::UniqueGift &gift);
+
+[[nodiscard]] rpl::lifetime ShowStarGiftResale(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> peer,
+	uint64 giftId,
+	QString title,
+	Fn<void()> finishRequesting);
+
+void AddResaleGiftsList(
+	not_null<Window::SessionController*> window,
+	not_null<PeerData*> peer,
+	not_null<VerticalLayout*> container,
+	Data::ResaleGiftsDescriptor descriptor,
+	rpl::variable<bool> *starsOnly = nullptr,
+	Fn<void(std::shared_ptr<Data::UniqueGift>)> bought = nullptr,
+	bool forCraft = false,
+	Fn<void(int)> countChanged = nullptr);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/sticker_creator_box.cpp b/Telegram/SourceFiles/boxes/sticker_creator_box.cpp
new file mode 100644
index 00000000000000..aea862153823f0
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/sticker_creator_box.cpp
@@ -0,0 +1,571 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/sticker_creator_box.h"
+
+#include "api/api_stickers_creator.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "chat_helpers/emoji_picker_overlay.h"
+#include "core/file_utilities.h"
+#include "data/data_document.h"
+#include "data/data_document_media.h"
+#include "editor/editor_layer_widget.h"
+#include "editor/photo_editor.h"
+#include "editor/photo_editor_common.h"
+#include "editor/scene/scene.h"
+#include "editor/scene/scene_item_image.h"
+#include "info/channel_statistics/boosts/giveaway/boost_badge.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/emoji_config.h"
+#include "ui/image/image.h"
+#include "ui/image/image_prepare.h"
+#include "ui/layers/generic_box.h"
+#include "ui/layers/layer_widget.h"
+#include "ui/painter.h"
+#include "ui/rp_widget.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_editor.h"
+#include "styles/style_layers.h"
+
+#include <QtCore/QBuffer>
+#include <QtGui/QImageReader>
+
+namespace {
+
+constexpr auto kStickerSide = 512;
+constexpr auto kPreviewSide = 256;
+constexpr auto kWebpQuality = 95;
+constexpr auto kMaxEmojis = 7;
+
+[[nodiscard]] int SideForType(Data::StickersType type) {
+	return (type == Data::StickersType::Emoji)
+		? Api::kEmojiStickerSideMax
+		: kStickerSide;
+}
+
+[[nodiscard]] QImage LoadImageFromFile(const QString &path) {
+	auto reader = QImageReader(path);
+	reader.setAutoTransform(true);
+	auto image = reader.read();
+	if (image.format() != QImage::Format_ARGB32_Premultiplied
+		&& image.format() != QImage::Format_ARGB32) {
+		image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
+	}
+	return image;
+}
+
+class PreviewWidget final : public Ui::RpWidget {
+public:
+	PreviewWidget(QWidget *parent, QImage image)
+	: RpWidget(parent)
+	, _image(std::move(image)) {
+		resize(kPreviewSide, kPreviewSide);
+	}
+
+protected:
+	void paintEvent(QPaintEvent *e) override {
+		auto p = QPainter(this);
+		auto hq = PainterHighQualityEnabler(p);
+		const auto target = QRect(0, 0, width(), height());
+		p.drawImage(target, _image);
+	}
+
+private:
+	const QImage _image;
+
+};
+
+void OpenPhotoEditorForImage(
+		std::shared_ptr<ChatHelpers::Show> show,
+		QImage image,
+		int side,
+		Fn<void(QImage&&)> onDone) {
+	if (image.isNull()) {
+		show->showToast(tr::lng_stickers_create_open_failed(tr::now));
+		return;
+	}
+	const auto sessionController = show->resolveWindow();
+	if (!sessionController) {
+		show->showToast(tr::lng_stickers_create_open_failed(tr::now));
+		return;
+	}
+	const auto windowController = &sessionController->window();
+	const auto parentWidget = sessionController->widget();
+
+	if (image.width() <= 0
+		|| image.height() <= 0
+		|| (image.width() > 10 * image.height())
+		|| (image.height() > 10 * image.width())) {
+		show->showToast(tr::lng_stickers_create_open_failed(tr::now));
+		return;
+	}
+
+	auto canvas = QImage(
+		side,
+		side,
+		QImage::Format_ARGB32_Premultiplied);
+	canvas.fill(Qt::transparent);
+	const auto baseImage = std::make_shared<Image>(std::move(canvas));
+
+	auto scene = std::make_shared<Editor::Scene>(
+		QRectF(0, 0, side, side));
+
+	const auto userPixmap = QPixmap::fromImage(std::move(image));
+	const auto userSize = userPixmap.size();
+	const auto fitted = userSize.scaled(
+		QSize(side, side),
+		Qt::KeepAspectRatio);
+	const auto handle = st::photoEditorItemHandleSize;
+	const auto itemSize = (userSize.width() >= userSize.height())
+		? int((fitted.height() + handle)
+			* userSize.width() / float64(userSize.height()))
+		: (fitted.width() + handle);
+	auto itemData = Editor::ItemBase::Data{
+		.initialZoom = 1.0,
+		.zPtr = scene->lastZ(),
+		.size = itemSize,
+		.x = side / 2,
+		.y = side / 2,
+		.imageSize = userSize,
+	};
+	auto imageItem = std::make_shared<Editor::ItemImage>(
+		QPixmap(userPixmap),
+		std::move(itemData));
+	scene->addItem(std::move(imageItem));
+
+	auto modifications = Editor::PhotoModifications{
+		.crop = QRect(0, 0, side, side),
+		.paint = std::move(scene),
+	};
+
+	auto editor = base::make_unique_q<Editor::PhotoEditor>(
+		parentWidget,
+		windowController,
+		baseImage,
+		std::move(modifications),
+		Editor::EditorData{
+			.exactSize = QSize(side, side),
+			.cropType = Editor::EditorData::CropType::RoundedRect,
+			.cropMode = Editor::EditorData::CropMode::Mask,
+			.keepAspectRatio = true,
+			.fixedCrop = true,
+		});
+	const auto raw = editor.get();
+
+	auto applyModifications = [=, done = std::move(onDone)](
+			const Editor::PhotoModifications &mods) mutable {
+		auto result = Editor::ImageModified(baseImage->original(), mods);
+		if (result.size() != QSize(side, side)) {
+			result = result.scaled(
+				side,
+				side,
+				Qt::IgnoreAspectRatio,
+				Qt::SmoothTransformation);
+		}
+		Editor::ApplyShapeMask(result, mods);
+		done(std::move(result));
+	};
+
+	auto layer = std::make_unique<Editor::LayerWidget>(
+		parentWidget,
+		std::move(editor));
+	Editor::InitEditorLayer(layer.get(), raw, std::move(applyModifications));
+	windowController->showLayer(
+		std::move(layer),
+		Ui::LayerOption::KeepOther);
+}
+
+[[nodiscard]] QImage Sharpened(QImage image) {
+	constexpr auto kRadius = 1;
+	constexpr auto kAmount = 0.7;
+	if (image.isNull()) {
+		return image;
+	}
+	if (image.format() != QImage::Format_ARGB32_Premultiplied) {
+		image = std::move(image).convertToFormat(
+			QImage::Format_ARGB32_Premultiplied);
+	}
+	auto blurred = Images::BlurLargeImage(QImage(image), kRadius);
+	if (blurred.size() != image.size()) {
+		return image;
+	}
+	const auto width = image.width();
+	const auto height = image.height();
+	for (auto y = 0; y != height; ++y) {
+		const auto blur = reinterpret_cast<const QRgb*>(
+			blurred.constScanLine(y));
+		const auto line = reinterpret_cast<QRgb*>(image.scanLine(y));
+		for (auto x = 0; x != width; ++x) {
+			const auto origin = line[x];
+			const auto soft = blur[x];
+			const auto alpha = qAlpha(origin);
+			const auto sharp = [&](int channel, int blurChannel) {
+				const auto value = channel
+					+ int(kAmount * (channel - blurChannel));
+				return std::clamp(value, 0, alpha);
+			};
+			line[x] = qRgba(
+				sharp(qRed(origin), qRed(soft)),
+				sharp(qGreen(origin), qGreen(soft)),
+				sharp(qBlue(origin), qBlue(soft)),
+				alpha);
+		}
+	}
+	return image;
+}
+
+[[nodiscard]] QByteArray EncodeWebp(QImage image, int side) {
+	if (image.size() != QSize(side, side)) {
+		image = image.scaled(
+			side,
+			side,
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation);
+		image = Sharpened(std::move(image));
+	}
+	if (image.format() != QImage::Format_ARGB32) {
+		image = image.convertToFormat(QImage::Format_ARGB32);
+	}
+	auto bytes = QByteArray();
+	auto buffer = QBuffer(&bytes);
+	buffer.open(QIODevice::WriteOnly);
+	image.save(&buffer, "WEBP", kWebpQuality);
+	return bytes;
+}
+
+void LoadStickerImage(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<DocumentData*> document,
+		Fn<void(QImage)> done) {
+	struct State {
+		std::shared_ptr<Data::DocumentMedia> media;
+		rpl::lifetime lifetime;
+	};
+	const auto state = std::make_shared<State>();
+	state->media = document->createMediaView();
+	state->media->checkStickerLarge();
+	const auto finish = [=] {
+		const auto large = state->media->getStickerLarge();
+		auto image = large ? large->original() : QImage();
+		state->lifetime.destroy();
+		done(std::move(image));
+	};
+	if (state->media->loaded()) {
+		finish();
+		return;
+	}
+	show->session().downloaderTaskFinished(
+	) | rpl::filter([=] {
+		return state->media->loaded();
+	}) | rpl::on_next([=] {
+		finish();
+	}, state->lifetime);
+}
+
+} // namespace
+
+namespace Api {
+namespace {
+
+void CreateMediaBox(
+		not_null<Ui::GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
+		StickerSetIdentifier set,
+		QImage image,
+		Data::StickersType type,
+		Fn<void(MTPmessages_StickerSet)> done) {
+	const auto isEmoji = (type == Data::StickersType::Emoji);
+	const auto side = SideForType(type);
+	struct State {
+		rpl::variable<bool> uploading = false;
+		std::unique_ptr<StickerUpload> upload;
+		QPointer<Ui::RoundButton> addButton;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	const auto session = &show->session();
+
+	box->setTitle(isEmoji
+		? tr::lng_emoji_create_image_title()
+		: tr::lng_stickers_create_image_title());
+
+	const auto inner = box->verticalLayout();
+
+	auto pickerDescriptor = ChatHelpers::EmojiPickerOverlayDescriptor{
+		.aboutText = (isEmoji
+			? tr::lng_emoji_create_emoji_about(tr::now)
+			: tr::lng_stickers_create_emoji_about(tr::now)),
+		.maxSelected = kMaxEmojis,
+		.allowExpand = true,
+	};
+	const auto metrics = ChatHelpers::EmojiPickerOverlay::EstimateMetrics(
+		pickerDescriptor.aboutText);
+	const auto pickerCollapsed = metrics.collapsedHeight;
+	const auto pickerTotalExpanded = metrics.totalExpandedHeight;
+	const auto shadowExt = metrics.shadowExtent;
+
+	constexpr auto kStickerOverlap = 24;
+	const auto stickerTop = shadowExt.top()
+		+ pickerCollapsed
+		- kStickerOverlap;
+	const auto holderHeight = std::max(
+		stickerTop + kPreviewSide,
+		pickerTotalExpanded);
+
+	const auto previewHolder = inner->add(
+		object_ptr<Ui::RpWidget>(inner),
+		QMargins(0, 0, 0, 0),
+		style::al_top);
+	previewHolder->resize(st::boxWideWidth, holderHeight);
+	const auto preview = Ui::CreateChild<PreviewWidget>(
+		previewHolder,
+		image);
+
+	const auto picker = Ui::CreateChild<ChatHelpers::EmojiPickerOverlay>(
+		previewHolder,
+		std::move(pickerDescriptor));
+
+	auto layoutOverlay = [=] {
+		const auto bubbleW = std::min(
+			previewHolder->width()
+				- 2 * st::boxRowPadding.left()
+				- shadowExt.left() - shadowExt.right(),
+			int(kPreviewSide * 1.1));
+		const auto totalW = bubbleW + shadowExt.left() + shadowExt.right();
+		const auto x = (previewHolder->width() - totalW) / 2;
+		picker->setGeometry(x, 0, totalW, pickerTotalExpanded);
+		picker->raise();
+	};
+
+	previewHolder->widthValue(
+	) | rpl::on_next([=](int width) {
+		preview->move((width - kPreviewSide) / 2, stickerTop);
+		layoutOverlay();
+	}, preview->lifetime());
+
+	Ui::AddSkip(inner);
+
+	const auto startUpload = [=, set = std::move(set), done = std::move(done)](
+			) mutable {
+		if (state->uploading.current()) {
+			return;
+		}
+		auto emoji = QString();
+		for (const auto one : picker->selected()) {
+			emoji.append(one->text());
+		}
+		if (emoji.isEmpty()) {
+			show->showToast(
+				tr::lng_stickers_create_emoji_required(tr::now));
+			return;
+		}
+		const auto bytes = EncodeWebp(image, side);
+		if (bytes.isEmpty()) {
+			show->showToast(
+				tr::lng_stickers_create_upload_failed(tr::now));
+			return;
+		}
+
+		const auto lockedWidth = state->addButton
+			? state->addButton->width()
+			: 0;
+		state->uploading = true;
+		if (state->addButton && lockedWidth > 0) {
+			state->addButton->resizeToWidth(lockedWidth);
+		}
+		state->upload = std::make_unique<StickerUpload>(
+			session,
+			set,
+			bytes,
+			emoji,
+			type);
+
+		const auto doneCallback = done;
+		state->upload->start(
+			crl::guard(box, [=](MTPmessages_StickerSet result) {
+				state->upload = nullptr;
+				state->uploading = false;
+				show->showToast(isEmoji
+					? tr::lng_emoji_added(tr::now)
+					: tr::lng_stickers_create_added(tr::now));
+				if (doneCallback) {
+					doneCallback(result);
+				}
+				box->closeBox();
+			}),
+			crl::guard(box, [=](QString err) {
+				state->upload = nullptr;
+				state->uploading = false;
+				show->showToast(err.isEmpty()
+					? tr::lng_stickers_create_upload_failed(tr::now)
+					: err);
+			}));
+	};
+
+	const auto addButton = box->addButton(
+		rpl::conditional(
+			state->uploading.value(),
+			rpl::single(QString()),
+			tr::lng_box_done()),
+		startUpload);
+	state->addButton = addButton;
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+
+	{
+		using namespace Info::Statistics;
+		const auto loadingAnimation = InfiniteRadialAnimationWidget(
+			addButton,
+			addButton->height() / 2,
+			&st::editStickerSetNameLoading);
+		AddChildToWidgetCenter(addButton, loadingAnimation);
+		loadingAnimation->showOn(state->uploading.value());
+	}
+
+	box->setWidth(st::boxWideWidth);
+
+	box->boxClosing(
+	) | rpl::on_next([=] {
+		state->upload = nullptr;
+	}, box->lifetime());
+}
+
+void RunImageEditorAndCreate(
+		std::shared_ptr<ChatHelpers::Show> show,
+		StickerSetIdentifier set,
+		QImage image,
+		Data::StickersType type,
+		Fn<void(MTPmessages_StickerSet)> done) {
+	OpenPhotoEditorForImage(
+		show,
+		std::move(image),
+		kStickerSide,
+		[=, set = std::move(set), done = std::move(done)](
+				QImage &&prepared) mutable {
+			show->showBox(Box(
+				CreateMediaBox,
+				show,
+				std::move(set),
+				std::move(prepared),
+				type,
+				std::move(done)));
+		});
+}
+
+void ChooseImageThenCreate(
+		std::shared_ptr<ChatHelpers::Show> show,
+		StickerSetIdentifier set,
+		Data::StickersType type,
+		Fn<void(MTPmessages_StickerSet)> done) {
+	const auto parent = QPointer<QWidget>(show->toastParent());
+
+	const auto onChosen = [=, set = std::move(set), done = std::move(done)](
+			FileDialog::OpenResult &&result) mutable {
+		if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
+			return;
+		}
+		const auto path = result.paths.isEmpty()
+			? QString()
+			: result.paths.front();
+		auto image = path.isEmpty()
+			? QImage::fromData(result.remoteContent)
+			: LoadImageFromFile(path);
+		RunImageEditorAndCreate(
+			show,
+			std::move(set),
+			std::move(image),
+			type,
+			std::move(done));
+	};
+
+	FileDialog::GetOpenPath(
+		parent,
+		tr::lng_stickers_create_choose_image(tr::now),
+		FileDialog::ImagesFilter(),
+		std::move(onChosen));
+}
+
+} // namespace
+
+void OpenCreateStickerFlow(
+		std::shared_ptr<ChatHelpers::Show> show,
+		StickerSetIdentifier set,
+		Fn<void(MTPmessages_StickerSet)> done) {
+	ChooseImageThenCreate(
+		std::move(show),
+		std::move(set),
+		Data::StickersType::Stickers,
+		std::move(done));
+}
+
+void OpenCreateEmojiFlow(
+		std::shared_ptr<ChatHelpers::Show> show,
+		StickerSetIdentifier set,
+		Fn<void(MTPmessages_StickerSet)> done) {
+	ChooseImageThenCreate(
+		std::move(show),
+		std::move(set),
+		Data::StickersType::Emoji,
+		std::move(done));
+}
+
+bool AdaptStickerToEmoji(
+		std::shared_ptr<ChatHelpers::Show> show,
+		StickerSetIdentifier set,
+		not_null<DocumentData*> document,
+		Fn<void(MTPmessages_StickerSet)> done) {
+	const auto sticker = document->sticker();
+	if (!sticker || sticker->isWebm()) {
+		show->showToast(tr::lng_emoji_adapt_no_video(tr::now));
+		return false;
+	}
+	if (sticker->isLottie()) {
+		const auto emoji = StickerEmojiOrDefault(document);
+		AddExistingStickerToSet(
+			&show->session(),
+			set,
+			document,
+			emoji,
+			[=](MTPmessages_StickerSet result) {
+				show->showToast(tr::lng_emoji_added(tr::now));
+				if (done) {
+					done(result);
+				}
+			},
+			[=](QString err) {
+				show->showToast(err.isEmpty()
+					? tr::lng_attach_failed(tr::now)
+					: err);
+			});
+		return true;
+	}
+	LoadStickerImage(
+		show,
+		document,
+		[=, set = std::move(set), done = std::move(done)](
+				QImage image) mutable {
+			if (image.isNull()) {
+				show->showToast(
+					tr::lng_stickers_create_open_failed(tr::now));
+				return;
+			}
+			RunImageEditorAndCreate(
+				show,
+				std::move(set),
+				std::move(image),
+				Data::StickersType::Emoji,
+				std::move(done));
+		});
+	return true;
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/boxes/sticker_creator_box.h b/Telegram/SourceFiles/boxes/sticker_creator_box.h
new file mode 100644
index 00000000000000..2383e30d86e105
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/sticker_creator_box.h
@@ -0,0 +1,40 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "data/stickers/data_stickers.h"
+
+class DocumentData;
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+namespace Api {
+
+void OpenCreateStickerFlow(
+	std::shared_ptr<ChatHelpers::Show> show,
+	StickerSetIdentifier set,
+	Fn<void(MTPmessages_StickerSet)> done = nullptr);
+
+void OpenCreateEmojiFlow(
+	std::shared_ptr<ChatHelpers::Show> show,
+	StickerSetIdentifier set,
+	Fn<void(MTPmessages_StickerSet)> done = nullptr);
+
+[[nodiscard]] bool AdaptStickerToEmoji(
+	std::shared_ptr<ChatHelpers::Show> show,
+	StickerSetIdentifier set,
+	not_null<DocumentData*> document,
+	Fn<void(MTPmessages_StickerSet)> done = nullptr);
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 14902a9eeed641..3172733ca67152 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -8,14 +8,17 @@ For license and copyright information please follow this link:
 #include "boxes/sticker_set_box.h"
 
 #include "api/api_common.h"
+#include "api/api_stickers_creator.h"
 #include "api/api_toggling_media.h"
 #include "apiwrap.h"
 #include "base/unixtime.h"
 #include "boxes/premium_preview_box.h"
+#include "boxes/sticker_creator_box.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "chat_helpers/stickers_list_widget.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_file_origin.h"
@@ -33,7 +36,7 @@ For license and copyright information please follow this link:
 #include "media/clip/media_clip_reader.h"
 #include "menu/menu_send.h"
 #include "mtproto/sender.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "storage/storage_account.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/cached_round_corners.h"
@@ -52,10 +55,18 @@ For license and copyright information please follow this link:
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/gradient_round_button.h"
+#include "ui/widgets/menu/menu_action.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/menu/menu_multiline_action.h"
+#include "base/event_filter.h"
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "ui/widgets/inner_dropdown.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/scroll_area.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
 #include "styles/style_layers.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_info.h"
@@ -220,14 +231,14 @@ StickerPremiumMark::StickerPremiumMark(
 : _lockIcon(lockIcon)
 , _part(part) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_lockGray = QImage();
 		_star = QImage();
 	}, _lifetime);
 
 	Data::AmPremiumValue(
 		session
-	) | rpl::start_with_next([=](bool premium) {
+	) | rpl::on_next([=](bool premium) {
 		_premium = premium;
 	}, _lifetime);
 }
@@ -288,6 +299,7 @@ class StickerSetBox::Inner final : public Ui::RpWidget {
 	[[nodiscard]] uint64 setId() const;
 
 	void install();
+	void showPreviewForDocument(DocumentId documentId);
 	[[nodiscard]] rpl::producer<uint64> setInstalled() const;
 	[[nodiscard]] rpl::producer<uint64> setArchived() const;
 	[[nodiscard]] rpl::producer<> updateControls() const;
@@ -323,6 +335,7 @@ class StickerSetBox::Inner final : public Ui::RpWidget {
 	}
 
 	void applySet(const TLStickerSet &set);
+	void setOuterContainer(QPointer<QWidget> container);
 
 	~Inner();
 
@@ -380,6 +393,22 @@ class StickerSetBox::Inner final : public Ui::RpWidget {
 	void startOverAnimation(int index, float64 from, float64 to);
 	int stickerFromGlobalPos(const QPoint &p) const;
 
+	[[nodiscard]] bool hasAddCell() const;
+	[[nodiscard]] int totalCellsCount() const;
+	[[nodiscard]] QRect addCellRect() const;
+	[[nodiscard]] bool addCellFromGlobalPos(const QPoint &p) const;
+	void setAddCellHovered(bool hovered);
+	void paintAddCell(QPainter &p) const;
+	void showAddMenu(QPoint globalPos);
+	void startAddExistingStickerFlow();
+	void startCreateNewStickerFlow();
+	void startAddExistingEmojiFlow();
+	void startCreateNewEmojiFlow();
+	void startAdaptStickerToEmojiFlow();
+	[[nodiscard]] ChatHelpers::TabbedPanel *createPickerPanel(
+		ChatHelpers::TabbedSelector::Mode mode,
+		uint64 excludeSetId);
+
 	void installDone(const MTPmessages_StickerSetInstallResult &result);
 
 	void requestReorder(not_null<DocumentData*> document, int index);
@@ -463,11 +492,17 @@ class StickerSetBox::Inner final : public Ui::RpWidget {
 	mtpRequestId _installRequest = 0;
 
 	int _selected = -1;
+	bool _addCellHovered = false;
+	bool _addCellPressed = false;
 
 	base::Timer _previewTimer;
 	int _previewShown = -1;
+	DocumentId _previewDocumentId = 0;
+	bool _previewLocked = false;
 
 	base::unique_qptr<Ui::PopupMenu> _menu;
+	base::unique_qptr<ChatHelpers::TabbedPanel> _pickerPanel;
+	QPointer<QWidget> _outerContainer;
 
 	rpl::event_stream<uint64> _setInstalled;
 	rpl::event_stream<uint64> _setArchived;
@@ -480,11 +515,13 @@ StickerSetBox::StickerSetBox(
 	QWidget *parent,
 	std::shared_ptr<ChatHelpers::Show> show,
 	const StickerSetIdentifier &set,
-	Data::StickersType type)
+	Data::StickersType type,
+	DocumentId previewDocumentId)
 : _show(std::move(show))
 , _session(&_show->session())
 , _set(set)
-, _type(type) {
+, _type(type)
+, _previewDocumentId(previewDocumentId) {
 }
 
 StickerSetBox::StickerSetBox(
@@ -494,16 +531,18 @@ StickerSetBox::StickerSetBox(
 : StickerSetBox(parent, std::move(show), set->identifier(), set->type()) {
 }
 
-QPointer<Ui::BoxContent> StickerSetBox::Show(
+base::weak_qptr<Ui::BoxContent> StickerSetBox::Show(
 		std::shared_ptr<ChatHelpers::Show> show,
-		not_null<DocumentData*> document) {
+		not_null<DocumentData*> document,
+		DocumentId previewDocumentId) {
 	if (const auto sticker = document->sticker()) {
 		if (sticker->set) {
 			auto box = Box<StickerSetBox>(
 				show,
 				sticker->set,
-				sticker->setType);
-			const auto result = QPointer<Ui::BoxContent>(box.data());
+				sticker->setType,
+				previewDocumentId);
+			const auto result = base::make_weak(box.data());
 			show->showBox(std::move(box));
 			return result;
 		}
@@ -517,9 +556,13 @@ void StickerSetBox::prepare() {
 	_inner = setInnerWidget(
 		object_ptr<Inner>(this, _show, _set, _type),
 		st::stickersScroll);
+	_inner->setOuterContainer(getDelegate()->outerContainer());
+	if (const auto previewId = base::take(_previewDocumentId)) {
+		_inner->showPreviewForDocument(previewId);
+	}
 	_session->data().stickers().updated(
 		_type
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateButtons();
 	}, lifetime());
 
@@ -532,14 +575,18 @@ void StickerSetBox::prepare() {
 	updateTitleAndButtons();
 
 	_inner->updateControls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateTitleAndButtons();
 	}, lifetime());
 
 	_inner->setInstalled(
-	) | rpl::start_with_next([=](uint64 setId) {
+	) | rpl::on_next([=](uint64 setId) {
 		if (_inner->setType() == Data::StickersType::Masks) {
-			showToast(tr::lng_masks_installed(tr::now));
+			showToast({
+				.text = { tr::lng_masks_installed(tr::now) },
+				.iconLottie = u"toast/contact_check"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
 		} else if (_inner->setType() == Data::StickersType::Emoji) {
 			auto &stickers = _session->data().stickers();
 			stickers.notifyEmojiSetInstalled(setId);
@@ -551,12 +598,12 @@ void StickerSetBox::prepare() {
 	}, lifetime());
 
 	_inner->errors(
-	) | rpl::start_with_next([=](Error error) {
+	) | rpl::on_next([=](Error error) {
 		handleError(error);
 	}, lifetime());
 
 	_inner->setArchived(
-	) | rpl::start_with_next([=](uint64 setId) {
+	) | rpl::on_next([=](uint64 setId) {
 		const auto type = _inner->setType();
 		if (type == Data::StickersType::Emoji) {
 			return;
@@ -587,6 +634,13 @@ void StickerSetBox::prepare() {
 
 		closeBox();
 	}, lifetime());
+
+	boxClosing(
+	) | rpl::on_next([show = _show] {
+		if (const auto window = show->resolveWindow()) {
+			window->widget()->hideMediaPreview();
+		}
+	}, lifetime());
 }
 
 void StickerSetBox::addStickers() {
@@ -641,24 +695,17 @@ void ChangeSetNameBox(
 		const auto it = sets.find(input.id);
 		return (it == sets.end()) ? QString() : it->second->title;
 	}();
-	const auto wrap = box->addRow(object_ptr<Ui::FixedHeightWidget>(
+	const auto field = box->addRow(object_ptr<Ui::InputField>(
 		box,
-		st::editStickerSetNameField.heightMin));
-	auto owned = object_ptr<Ui::InputField>(
-		wrap,
 		st::editStickerSetNameField,
 		tr::lng_stickers_context_edit_name(),
-		wasName);
-	const auto field = owned.data();
-	wrap->widthValue() | rpl::start_with_next([=](int width) {
-		field->move(0, 0);
-		field->resize(width, field->height());
-		wrap->resize(width, field->height());
-	}, wrap->lifetime());
+		wasName));
 	field->selectAll();
 	constexpr auto kMaxSetNameLength = 50;
 	field->setMaxLength(kMaxSetNameLength);
-	Ui::AddLengthLimitLabel(field, kMaxSetNameLength, kMaxSetNameLength + 1);
+	Ui::AddLengthLimitLabel(field, kMaxSetNameLength, {
+		.customThreshold = kMaxSetNameLength + 1,
+	});
 	box->setFocusCallback([=] { field->setFocusFast(); });
 	const auto close = crl::guard(box, [=] { box->closeBox(); });
 	const auto save = [=, show = box->uiShow()] {
@@ -728,9 +775,13 @@ void StickerSetBox::updateButtons() {
 		const auto type = _inner->setType();
 		const auto share = [=] {
 			copyStickersLink();
-			showToast(type == Data::StickersType::Emoji
+			showToast({
+				.text = { type == Data::StickersType::Emoji
 					? tr::lng_stickers_copied_emoji(tr::now)
-					: tr::lng_stickers_copied(tr::now));
+					: tr::lng_stickers_copied(tr::now) },
+				.iconLottie = u"toast/voip_invite"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
 		};
 		const auto fillSetCreatorMenu = [&] {
 			using Filler = Fn<void(not_null<Ui::PopupMenu*>)>;
@@ -757,7 +808,99 @@ void StickerSetBox::updateButtons() {
 						_inner->setReorderState(true);
 						updateButtons();
 					},
-					&st::menuIconManage);
+					&st::menuIconReorder);
+			});
+		}();
+		const auto fillSetCreatorFooter = [&] {
+			using Filler = Fn<void(not_null<Ui::PopupMenu*>)>;
+			if (!_inner->amSetCreator()) {
+				return Filler(nullptr);
+			}
+			const auto data = &_session->data();
+			return Filler([=, show = _show, set = _set](
+					not_null<Ui::PopupMenu*> menu) {
+				const auto weak = base::weak_qptr<StickerSetBox>(this);
+				const auto deleteEveryone = [=] {
+					const auto confirm = [=](Fn<void()> close) {
+						Api::DeleteStickerSet(
+							&data->session(),
+							set,
+							[=] {
+								if (const auto strong = weak.get()) {
+									strong->closeBox();
+								}
+							},
+							[=](const QString &error) {
+								show->showToast(error);
+							});
+						close();
+					};
+					show->showBox(Ui::MakeConfirmBox({
+						.text = tr::lng_stickers_delete_pack_sure(tr::now),
+						.confirmed = confirm,
+						.confirmText
+							= tr::lng_stickers_remove_pack_confirm(),
+						.confirmStyle = &st::attentionBoxButton,
+					}));
+				};
+				const auto deleteSelf = [show, inner = _inner] {
+					const auto raw = inner.data();
+					if (!raw) {
+						return;
+					}
+					auto box = ChatHelpers::MakeConfirmRemoveSetBox(
+						&show->session(),
+						st::boxLabel,
+						raw->setId());
+					if (box) {
+						show->showBox(std::move(box));
+					}
+				};
+				const auto deleteAction = menu->addAction(
+					base::make_unique_q<Ui::Menu::Action>(
+						menu->menu(),
+						st::menuWithIconsAttention,
+						Ui::Menu::CreateAction(
+							menu->menu().get(),
+							tr::lng_stickers_context_delete_pack(tr::now),
+							nullptr),
+						&st::menuIconDeleteAttention,
+						&st::menuIconDeleteAttention));
+				deleteAction->setMenu(
+					Ui::CreateChild<QMenu>(menu->menu().get()));
+				const auto sub = menu->ensureSubmenu(
+					deleteAction,
+					st::popupMenuWithIcons);
+				const auto addSub = Ui::Menu::CreateAddActionCallback(sub);
+				addSub({
+					.text = tr::lng_stickers_context_delete_pack_everyone(
+						tr::now),
+					.handler = deleteEveryone,
+					.icon = &st::menuIconDeleteAttention,
+					.isAttention = true,
+				});
+				sub->addAction(
+					tr::lng_stickers_context_delete_pack_self(tr::now),
+					deleteSelf,
+					&st::menuIconRemove);
+				menu->addSeparator(&st::expandedMenuSeparator);
+				auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
+					menu->menu(),
+					st::defaultMenu,
+					st::historyHasCustomEmoji,
+					QPoint(
+						st::defaultMenu.itemPadding.left(),
+						st::defaultMenu.itemPadding.top()),
+					tr::lng_stickers_bot_more_options(
+						tr::now,
+						lt_bot,
+						Ui::Text::Colorized(tr::bold(u"@stickers"_q)),
+						Ui::Text::RichLangValue));
+				item->clicks(
+				) | rpl::on_next([] {
+					UrlClickHandler::Open(u"https://t.me/stickers"_q);
+				}, item->lifetime());
+				menu->addAction(std::move(item));
 			});
 		}();
 		if (_inner->notInstalled()) {
@@ -773,9 +916,7 @@ void StickerSetBox::updateButtons() {
 					- st.buttonPadding.left()
 					- st.buttonPadding.left());
 				button->setClickedCallback([=] {
-					using namespace ChatHelpers;
-					const auto usage = WindowUsage::PremiumPromo;
-					if (const auto window = _show->resolveWindow(usage)) {
+					if (const auto window = _show->resolveWindow()) {
 						Settings::ShowPremium(window, u"animated_emoji"_q);
 					}
 				});
@@ -792,16 +933,17 @@ void StickerSetBox::updateButtons() {
 
 			if (!_inner->shortName().isEmpty()) {
 				const auto top = addTopButton(st::infoTopBarMenu);
-				const auto menu
-					= std::make_shared<base::unique_qptr<Ui::PopupMenu>>();
+				const auto menu = top->lifetime().make_state<
+					base::unique_qptr<Ui::PopupMenu>>();
 				top->setClickedCallback([=] {
 					*menu = base::make_unique_q<Ui::PopupMenu>(
 						top,
 						st::popupMenuWithIcons);
+					const auto raw = menu->get();
 					if (fillSetCreatorMenu) {
-						fillSetCreatorMenu(*menu);
+						fillSetCreatorMenu(raw);
 					}
-					(*menu)->addAction(
+					raw->addAction(
 						((type == Data::StickersType::Emoji)
 							? tr::lng_stickers_share_emoji
 							: (type == Data::StickersType::Masks)
@@ -809,7 +951,22 @@ void StickerSetBox::updateButtons() {
 							: tr::lng_stickers_share_pack)(tr::now),
 						[=] { share(); closeBox(); },
 						&st::menuIconShare);
-					(*menu)->popup(QCursor::pos());
+					if (fillSetCreatorFooter) {
+						fillSetCreatorFooter(raw);
+					}
+					raw->setForcedOrigin(
+						Ui::PanelAnimation::Origin::TopRight);
+					top->setForceRippled(true);
+					raw->setDestroyedCallback([top] {
+						crl::on_main(top, [top] {
+							if (const auto strong = top.data()) {
+								strong->setForceRippled(false);
+							}
+						});
+					});
+					raw->popup(top->mapToGlobal(QPoint(
+						top->width(),
+						top->height() - st::lineWidth * 3)));
 					return true;
 				});
 			}
@@ -839,29 +996,52 @@ void StickerSetBox::updateButtons() {
 						_show->showBox(std::move(box));
 					}
 				};
-				const auto menu
-					= std::make_shared<base::unique_qptr<Ui::PopupMenu>>();
+				const auto menu = top->lifetime().make_state<
+					base::unique_qptr<Ui::PopupMenu>>();
 				top->setClickedCallback([=] {
 					*menu = base::make_unique_q<Ui::PopupMenu>(
 						top,
 						st::popupMenuWithIcons);
+					const auto raw = menu->get();
 					if (type == Data::StickersType::Emoji) {
-						(*menu)->addAction(
-							tr::lng_custom_emoji_remove_pack_button(tr::now),
-							remove,
-							&st::menuIconRemove);
+						if (fillSetCreatorMenu) {
+							fillSetCreatorMenu(raw);
+						}
+						if (fillSetCreatorFooter) {
+							fillSetCreatorFooter(raw);
+						} else {
+							raw->addAction(
+								tr::lng_custom_emoji_remove_pack_button(tr::now),
+								remove,
+								&st::menuIconRemove);
+						}
 					} else {
 						if (fillSetCreatorMenu) {
-							fillSetCreatorMenu(*menu);
+							fillSetCreatorMenu(raw);
 						}
-						(*menu)->addAction(
+						raw->addAction(
 							(type == Data::StickersType::Masks
 								? tr::lng_masks_archive_pack(tr::now)
 								: tr::lng_stickers_archive_pack(tr::now)),
 							archive,
 							&st::menuIconArchive);
+						if (fillSetCreatorFooter) {
+							fillSetCreatorFooter(raw);
+						}
 					}
-					(*menu)->popup(QCursor::pos());
+					raw->setForcedOrigin(
+						Ui::PanelAnimation::Origin::TopRight);
+					top->setForceRippled(true);
+					raw->setDestroyedCallback([top] {
+						crl::on_main(top, [top] {
+							if (const auto strong = top.data()) {
+								strong->setForceRippled(false);
+							}
+						});
+					});
+					raw->popup(top->mapToGlobal(QPoint(
+						top->width(),
+						top->height() - st::lineWidth * 3)));
 					return true;
 				});
 			}
@@ -915,7 +1095,7 @@ StickerSetBox::Inner::Inner(
 	_session->api().updateStickers();
 
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateItems();
 	}, lifetime());
 
@@ -1004,7 +1184,8 @@ void StickerSetBox::Inner::applySet(const TLStickerSet &set) {
 					& (SetFlag::Featured
 						| SetFlag::NotLoaded
 						| SetFlag::Unread
-						| SetFlag::Special);
+						| SetFlag::Special
+						| SetFlag::Installed);
 				_setFlags |= clientFlags;
 				set->flags = _setFlags;
 				set->installDate = _setInstallDate;
@@ -1021,15 +1202,18 @@ void StickerSetBox::Inner::applySet(const TLStickerSet &set) {
 		_errors.fire(Error::NotFound);
 		return;
 	}
+	_loaded = true;
 	_perRow = isEmojiSet() ? kEmojiPerRow : kStickersPerRow;
-	_rowsCount = (_pack.size() + _perRow - 1) / _perRow;
 	_singleSize = isEmojiSet() ? st::emojiSetSize : st::stickersSize;
+	_rowsCount = (totalCellsCount() + _perRow - 1) / _perRow;
 
 	resize(
 		_padding.left() + _perRow * _singleSize.width(),
 		_padding.top() + _rowsCount * _singleSize.height() + _padding.bottom());
 
-	_loaded = true;
+	if (const auto previewId = base::take(_previewDocumentId)) {
+		showPreviewForDocument(previewId);
+	}
 	updateSelected();
 	_updateControls.fire({});
 }
@@ -1146,9 +1330,21 @@ void StickerSetBox::Inner::installDone(
 }
 
 void StickerSetBox::Inner::mousePressEvent(QMouseEvent *e) {
+	if (_previewLocked) {
+		_previewLocked = false;
+		_previewShown = -1;
+		if (const auto window = _show->resolveWindow()) {
+			window->widget()->hideMediaPreview();
+		}
+		return;
+	}
 	if (e->button() != Qt::LeftButton) {
 		return;
 	}
+	if (addCellFromGlobalPos(e->globalPos())) {
+		_addCellPressed = !_dragging.enabled;
+		return;
+	}
 	const auto index = stickerFromGlobalPos(e->globalPos());
 	if (index < 0 || index >= _pack.size()) {
 		return;
@@ -1247,7 +1443,7 @@ void StickerSetBox::Inner::mouseMoveEvent(QMouseEvent *e) {
 		}
 		update();
 	}
-	if (_previewShown >= 0) {
+	if (_previewShown >= 0 && !_previewLocked) {
 		showPreviewAt(e->globalPos());
 	}
 }
@@ -1264,8 +1460,30 @@ void StickerSetBox::Inner::showPreviewAt(QPoint globalPos) {
 	}
 }
 
+void StickerSetBox::Inner::showPreviewForDocument(DocumentId documentId) {
+	if (!_loaded) {
+		_previewDocumentId = documentId;
+		return;
+	}
+	const auto it = ranges::find(
+		_pack,
+		documentId,
+		&DocumentData::id);
+	if (it != _pack.end()) {
+		const auto index = int(it - _pack.begin());
+		if (index != _previewShown) {
+			_previewShown = index;
+			_previewLocked = true;
+			_show->showMediaPreview(
+				Data::FileOriginStickerSet(_setId, _setAccessHash),
+				_pack[index]);
+		}
+	}
+}
+
 void StickerSetBox::Inner::leaveEventHook(QEvent *e) {
 	setSelected(-1);
+	setAddCellHovered(false);
 }
 
 void StickerSetBox::Inner::requestReorder(
@@ -1349,9 +1567,22 @@ void StickerSetBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 			kStickerMoveDuration);
 	}
 	if (_previewShown >= 0) {
+		if (_previewLocked) {
+			_previewLocked = false;
+			if (const auto window = _show->resolveWindow()) {
+				window->widget()->hideMediaPreview();
+			}
+		}
 		_previewShown = -1;
 		return;
 	}
+	if (_addCellPressed) {
+		_addCellPressed = false;
+		if (addCellFromGlobalPos(e->globalPos())) {
+			showAddMenu(e->globalPos());
+		}
+		return;
+	}
 	if (!_previewTimer.isActive()) {
 		return;
 	}
@@ -1423,6 +1654,25 @@ void StickerSetBox::Inner::contextMenuEvent(QContextMenuEvent *e) {
 				}
 			}, &st::menuIconCopy);
 		}
+		if (!amSetCreator()) {
+			Api::AddAddToEmojiSetAction(
+				Ui::Menu::CreateAddActionCallback(_menu.get()),
+				_show,
+				_pack[index]);
+		} else {
+			const auto addAction = Ui::Menu::CreateAddActionCallback(
+				_menu.get());
+			addAction({
+				.text = tr::lng_emoji_context_delete(tr::now),
+				.handler = [index, this, show = _show] {
+					show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+						fillDeleteStickerBox(box, index);
+					}));
+				},
+				.icon = &st::menuIconDeleteAttention,
+				.isAttention = true,
+			});
+		}
 	} else if (details.type != SendMenu::Type::Disabled) {
 		const auto document = _pack[index];
 		const auto send = crl::guard(this, [=](Api::SendOptions options) {
@@ -1454,6 +1704,12 @@ void StickerSetBox::Inner::contextMenuEvent(QContextMenuEvent *e) {
 			(isFaved
 				? &st::menuIconUnfave
 				: &st::menuIconFave));
+		if (!amSetCreator()) {
+			Api::AddAddToStickerSetAction(
+				Ui::Menu::CreateAddActionCallback(_menu.get()),
+				_show,
+				document);
+		}
 		if (amSetCreator()) {
 			const auto addAction = Ui::Menu::CreateAddActionCallback(
 				_menu.get());
@@ -1487,8 +1743,10 @@ void StickerSetBox::Inner::fillDeleteStickerBox(
 		int index) {
 	Expects(index >= 0 || index < _pack.size());
 	const auto document = _pack[index];
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto show = _show;
+	const auto type = setType();
+	const auto isEmoji = (type == Data::StickersType::Emoji);
 
 	const auto container = box->verticalLayout();
 	Ui::AddSkip(container);
@@ -1510,9 +1768,9 @@ void StickerSetBox::Inner::fillDeleteStickerBox(
 		animation->start();
 	}
 	sticker->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(sticker);
-		if (const auto strong = weak.data()) {
+		if ([[maybe_unused]] const auto strong = weak.get()) {
 			const auto paused = On(PowerSaving::kStickersPanel)
 				|| show->paused(ChatHelpers::PauseReason::Layer);
 			paintSticker(p, index, QPoint(), paused, crl::now());
@@ -1523,10 +1781,12 @@ void StickerSetBox::Inner::fillDeleteStickerBox(
 	}, sticker->lifetime());
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
 		line,
-		tr::lng_stickers_context_delete(),
+		isEmoji
+			? tr::lng_emoji_context_delete()
+			: tr::lng_stickers_context_delete(),
 		box->getDelegate()->style().title);
 	line->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		sticker->moveToLeft(st::boxRowPadding.left(), 0);
 		const auto skip = st::defaultBoxCheckbox.textPosition.x();
 		label->resizeToWidth(width
@@ -1547,33 +1807,34 @@ void StickerSetBox::Inner::fillDeleteStickerBox(
 	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			container,
-			tr::lng_stickers_context_delete_sure(),
+			isEmoji
+				? tr::lng_emoji_context_delete_sure()
+				: tr::lng_stickers_context_delete_sure(),
 			st::boxLabel));
 	const auto save = [=] {
 		if (state->requestId.current()) {
 			return;
 		}
-		const auto weakBox = Ui::MakeWeak(box);
+		const auto weakBox = base::make_weak(box);
 		const auto buttonWidth = state->saveButton
 			? state->saveButton->width()
 			: 0;
-		state->requestId = document->owner().session().api().request(
+		state->requestId = document->session().api().request(
 			MTPstickers_RemoveStickerFromSet(document->mtpInput()
 		)).done([=](const TLStickerSet &result) {
 			result.match([&](const MTPDmessages_stickerSet &d) {
 				document->owner().stickers().feedSetFull(d);
-				document->owner().stickers().notifyUpdated(
-					Data::StickersType::Stickers);
+				document->owner().stickers().notifyUpdated(type);
 			}, [](const auto &) {
 			});
-			if (const auto strong = weak.data()) {
+			if ([[maybe_unused]] const auto strong = weak.get()) {
 				applySet(result);
 			}
-			if (const auto strongBox = weakBox.data()) {
+			if (const auto strongBox = weakBox.get()) {
 				strongBox->closeBox();
 			}
 		}).fail([=](const MTP::Error &error) {
-			if (const auto strongBox = weakBox.data()) {
+			if (const auto strongBox = weakBox.get()) {
 				strongBox->uiShow()->showToast(error.type());
 			}
 		}).send();
@@ -1599,15 +1860,34 @@ void StickerSetBox::Inner::fillDeleteStickerBox(
 			state->requestId.value() | rpl::map(rpl::mappers::_1 > 0));
 	}
 	box->addButton(tr::lng_close(), [=] {
-		document->owner().session().api().request(
+		document->session().api().request(
 			state->requestId.current()).cancel();
 		box->closeBox();
 	});
 }
 
 void StickerSetBox::Inner::updateSelected() {
-	auto selected = stickerFromGlobalPos(QCursor::pos());
+	const auto cursor = QCursor::pos();
+	const auto onAddCell = addCellFromGlobalPos(cursor);
+	const auto selected = onAddCell
+		? -1
+		: stickerFromGlobalPos(cursor);
 	setSelected(setType() == Data::StickersType::Masks ? -1 : selected);
+	setAddCellHovered(onAddCell);
+}
+
+void StickerSetBox::Inner::setAddCellHovered(bool hovered) {
+	if (_addCellHovered == hovered) {
+		return;
+	}
+	_addCellHovered = hovered;
+	if (hasAddCell()) {
+		setCursor((hovered && !_dragging.enabled)
+			? style::cur_pointer
+			: style::cur_default);
+		const auto rect = addCellRect();
+		rtlupdate(rect.x(), rect.y(), rect.width(), rect.height());
+	}
 }
 
 void StickerSetBox::Inner::setSelected(int selected) {
@@ -1665,7 +1945,7 @@ not_null<Lottie::MultiPlayer*> StickerSetBox::Inner::getLottiePlayer() {
 			Lottie::Quality::Default,
 			Lottie::MakeFrameRenderer());
 		_lottiePlayer->updates(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateItems();
 		}, lifetime());
 	}
@@ -1746,6 +2026,10 @@ void StickerSetBox::Inner::paintEvent(QPaintEvent *e) {
 		paintSticker(p, _dragging.index, pos, paused, now);
 	}
 
+	if (hasAddCell()) {
+		paintAddCell(p);
+	}
+
 	if (_lottiePlayer && !paused) {
 		_lottiePlayer->markFrameShown();
 	}
@@ -2096,9 +2380,9 @@ bool StickerSetBox::Inner::official() const {
 
 rpl::producer<TextWithEntities> StickerSetBox::Inner::title() const {
 	if (!_loaded) {
-		return tr::lng_contacts_loading() | Ui::Text::ToWithEntities();
+		return tr::lng_contacts_loading(tr::marked);
 	} else if (_pack.isEmpty()) {
-		return tr::lng_attach_failed() | Ui::Text::ToWithEntities();
+		return tr::lng_attach_failed(tr::marked);
 	}
 	auto text = TextWithEntities{ _setTitle };
 	TextUtilities::ParseEntities(text, TextParseMentions);
@@ -2155,4 +2439,332 @@ void StickerSetBox::Inner::repaintItems(crl::time now) {
 	update();
 }
 
+bool StickerSetBox::Inner::hasAddCell() const {
+	if (!_loaded || !_amSetCreator || _pack.isEmpty()) {
+		return false;
+	}
+	const auto type = setType();
+	if (type == Data::StickersType::Emoji) {
+		return (_pack.size() < Api::kEmojiInOwnedSetMax);
+	} else if (type == Data::StickersType::Stickers) {
+		return (_pack.size() < Api::kStickersInOwnedSetMax);
+	}
+	return false;
+}
+
+int StickerSetBox::Inner::totalCellsCount() const {
+	return _pack.size() + (hasAddCell() ? 1 : 0);
+}
+
+QRect StickerSetBox::Inner::addCellRect() const {
+	const auto index = _pack.size();
+	const auto row = index / _perRow;
+	const auto column = index % _perRow;
+	return QRect(
+		_padding.left() + column * _singleSize.width(),
+		_padding.top() + row * _singleSize.height(),
+		_singleSize.width(),
+		_singleSize.height());
+}
+
+bool StickerSetBox::Inner::addCellFromGlobalPos(const QPoint &p) const {
+	if (!hasAddCell()) {
+		return false;
+	}
+	auto local = mapFromGlobal(p);
+	if (rtl()) {
+		local.setX(width() - local.x());
+	}
+	const auto rect = addCellRect();
+	return rect.contains(local);
+}
+
+void StickerSetBox::Inner::paintAddCell(QPainter &p) const {
+	const auto ltrRect = addCellRect();
+	const auto rect = rtl()
+		? QRect(
+			width() - ltrRect.x() - ltrRect.width(),
+			ltrRect.y(),
+			ltrRect.width(),
+			ltrRect.height())
+		: ltrRect;
+	const auto center = rect::center(rect);
+	const auto bgRadius = isEmojiSet()
+		? st::emojiSetAddCellBgRadius
+		: st::stickersAddCellBgRadius;
+	const auto plusSize = isEmojiSet()
+		? st::emojiSetAddCellPlusSize
+		: st::stickersAddCellPlusSize;
+	const auto inner = QRect(
+		center - QPoint(bgRadius, bgRadius),
+		Size(bgRadius * 2));
+
+	auto hq = PainterHighQualityEnabler(p);
+	const auto base = st::windowSubTextFg->c;
+	const auto bgAlpha = (_addCellHovered && !_dragging.enabled)
+		? 0.22
+		: 0.12;
+	p.setPen(Qt::NoPen);
+	p.setBrush(anim::with_alpha(base, bgAlpha));
+	p.drawEllipse(inner);
+
+	const auto plusHalf = plusSize / 2;
+	const auto thickness = st::stickersAddCellPlusThickness;
+	const auto plusH = QRectF(
+		center.x() - plusHalf,
+		center.y() - thickness / 2.,
+		plusHalf * 2,
+		thickness);
+	const auto plusV = QRectF(
+		center.x() - thickness / 2.,
+		center.y() - plusHalf,
+		thickness,
+		plusHalf * 2);
+	const auto radius = thickness / 2.;
+	p.setBrush(base);
+	p.drawRoundedRect(plusH, radius, radius);
+	p.drawRoundedRect(plusV, radius, radius);
+}
+
+void StickerSetBox::Inner::showAddMenu(QPoint globalPos) {
+	if (_dragging.enabled) {
+		return;
+	}
+	_menu = base::make_unique_q<Ui::PopupMenu>(
+		this,
+		st::popupMenuWithIcons);
+	if (setType() == Data::StickersType::Emoji) {
+		_menu->addAction(
+			tr::lng_emoji_create_new(tr::now),
+			crl::guard(this, [=] { startCreateNewEmojiFlow(); }),
+			&st::menuIconStickerCreate);
+		_menu->addAction(
+			tr::lng_emoji_add_existing(tr::now),
+			crl::guard(this, [=] { startAddExistingEmojiFlow(); }),
+			&st::menuIconEmoji);
+		_menu->addAction(
+			tr::lng_emoji_adapt_sticker(tr::now),
+			crl::guard(this, [=] { startAdaptStickerToEmojiFlow(); }),
+			&st::menuIconStickerAdd);
+	} else {
+		_menu->addAction(
+			tr::lng_stickers_create_new(tr::now),
+			crl::guard(this, [=] { startCreateNewStickerFlow(); }),
+			&st::menuIconStickerCreate);
+		_menu->addAction(
+			tr::lng_stickers_add_existing(tr::now),
+			crl::guard(this, [=] { startAddExistingStickerFlow(); }),
+			&st::menuIconStickerAdd);
+	}
+	_menu->popup(globalPos);
+}
+
+void StickerSetBox::Inner::setOuterContainer(QPointer<QWidget> container) {
+	_outerContainer = std::move(container);
+}
+
+ChatHelpers::TabbedPanel *StickerSetBox::Inner::createPickerPanel(
+		ChatHelpers::TabbedSelector::Mode mode,
+		uint64 excludeSetId) {
+	if (!_outerContainer) {
+		return nullptr;
+	}
+	const auto container = _outerContainer.data();
+	using Selector = ChatHelpers::TabbedSelector;
+	_pickerPanel = base::make_unique_q<ChatHelpers::TabbedPanel>(
+		container,
+		ChatHelpers::TabbedPanelDescriptor{
+			.ownedSelector = object_ptr<Selector>(
+				nullptr,
+				ChatHelpers::TabbedSelectorDescriptor{
+					.show = _show,
+					.st = st::defaultComposeControls.tabbed,
+					.level = Window::GifPauseReason::Layer,
+					.mode = mode,
+					.excludeStickerSetId = excludeSetId,
+				}),
+		});
+	const auto panel = _pickerPanel.get();
+	panel->setDesiredHeightValues(
+		1.,
+		st::emojiPanMinHeight / 2,
+		st::emojiPanMinHeight);
+	panel->setDropDown(true);
+	panel->setShowAnimationOrigin(Ui::PanelAnimation::Origin::TopLeft);
+	panel->hide();
+
+	const auto reposition = [=] {
+		const auto size = container->size();
+		const auto margins = st::emojiPanMargins;
+		const auto panelWidth = st::emojiPanWidth
+			+ margins.left()
+			+ margins.right();
+		const auto panelHeight = st::emojiPanMinHeight
+			+ margins.top()
+			+ margins.bottom();
+		const auto top = std::max(0, (size.height() - panelHeight) / 2);
+		const auto right = (size.width() + panelWidth) / 2;
+		panel->moveTopRight(top, right);
+	};
+	base::install_event_filter(panel, container, [=](
+			not_null<QEvent*> event) {
+		const auto type = event->type();
+		if (type == QEvent::Move || type == QEvent::Resize) {
+			crl::on_main(panel, reposition);
+		}
+		return base::EventFilterResult::Continue;
+	});
+	reposition();
+	return panel;
+}
+
+void StickerSetBox::Inner::startAddExistingStickerFlow() {
+	if (!hasAddCell()) {
+		return;
+	}
+	const auto panel = createPickerPanel(
+		ChatHelpers::TabbedSelector::Mode::StickersOnly,
+		_setId);
+	if (!panel) {
+		return;
+	}
+	const auto identifier = StickerSetIdentifier{
+		.id = _setId,
+		.accessHash = _setAccessHash,
+		.shortName = _setShortName,
+	};
+	const auto session = _session;
+	const auto show = _show;
+	panel->selector()->fileChosen(
+	) | rpl::on_next([=, this](const ChatHelpers::FileChosen &chosen) {
+		const auto document = chosen.document;
+		if (_pickerPanel) {
+			_pickerPanel->hideAnimated();
+		}
+		const auto emoji = Api::StickerEmojiOrDefault(document);
+		Api::AddExistingStickerToSet(
+			session,
+			identifier,
+			document,
+			emoji,
+			crl::guard(this, [=, this](MTPmessages_StickerSet result) {
+				applySet(result);
+				show->showToast(
+					tr::lng_stickers_create_added(tr::now));
+			}),
+			crl::guard(this, [=](QString err) {
+				show->showToast(err.isEmpty()
+					? tr::lng_attach_failed(tr::now)
+					: err);
+			}));
+	}, panel->lifetime());
+	panel->showAnimated();
+}
+
+void StickerSetBox::Inner::startAddExistingEmojiFlow() {
+	if (!hasAddCell()) {
+		return;
+	}
+	const auto panel = createPickerPanel(
+		ChatHelpers::TabbedSelector::Mode::CustomEmojiOnly,
+		0);
+	if (!panel) {
+		return;
+	}
+	const auto identifier = StickerSetIdentifier{
+		.id = _setId,
+		.accessHash = _setAccessHash,
+		.shortName = _setShortName,
+	};
+	const auto session = _session;
+	const auto show = _show;
+	panel->selector()->customEmojiChosen(
+	) | rpl::on_next([=, this](const ChatHelpers::FileChosen &chosen) {
+		const auto document = chosen.document;
+		if (_pickerPanel) {
+			_pickerPanel->hideAnimated();
+		}
+		const auto emoji = Api::StickerEmojiOrDefault(document);
+		Api::AddExistingStickerToSet(
+			session,
+			identifier,
+			document,
+			emoji,
+			crl::guard(this, [=, this](MTPmessages_StickerSet result) {
+				applySet(result);
+				show->showToast(tr::lng_emoji_added(tr::now));
+			}),
+			crl::guard(this, [=](QString err) {
+				show->showToast(err.isEmpty()
+					? tr::lng_attach_failed(tr::now)
+					: err);
+			}));
+	}, panel->lifetime());
+	panel->showAnimated();
+}
+
+void StickerSetBox::Inner::startCreateNewStickerFlow() {
+	if (!hasAddCell()) {
+		return;
+	}
+	const auto identifier = StickerSetIdentifier{
+		.id = _setId,
+		.accessHash = _setAccessHash,
+		.shortName = _setShortName,
+	};
+	const auto onDone = crl::guard(this, [=, this](
+			MTPmessages_StickerSet result) {
+		applySet(result);
+	});
+	Api::OpenCreateStickerFlow(_show, identifier, onDone);
+}
+
+void StickerSetBox::Inner::startCreateNewEmojiFlow() {
+	if (!hasAddCell()) {
+		return;
+	}
+	const auto identifier = StickerSetIdentifier{
+		.id = _setId,
+		.accessHash = _setAccessHash,
+		.shortName = _setShortName,
+	};
+	const auto onDone = crl::guard(this, [=, this](
+			MTPmessages_StickerSet result) {
+		applySet(result);
+	});
+	Api::OpenCreateEmojiFlow(_show, identifier, onDone);
+}
+
+void StickerSetBox::Inner::startAdaptStickerToEmojiFlow() {
+	if (!hasAddCell()) {
+		return;
+	}
+	const auto panel = createPickerPanel(
+		ChatHelpers::TabbedSelector::Mode::StickersOnly,
+		0);
+	if (!panel) {
+		return;
+	}
+	const auto identifier = StickerSetIdentifier{
+		.id = _setId,
+		.accessHash = _setAccessHash,
+		.shortName = _setShortName,
+	};
+	const auto show = _show;
+	panel->selector()->fileChosen(
+	) | rpl::on_next([=, this](const ChatHelpers::FileChosen &chosen) {
+		const auto accepted = Api::AdaptStickerToEmoji(
+			show,
+			identifier,
+			chosen.document,
+			crl::guard(this, [=, this](MTPmessages_StickerSet result) {
+				applySet(result);
+			}));
+		if (accepted && _pickerPanel) {
+			_pickerPanel->hideAnimated();
+		}
+	}, panel->lifetime());
+	panel->showAnimated();
+}
+
 StickerSetBox::Inner::~Inner() = default;
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.h b/Telegram/SourceFiles/boxes/sticker_set_box.h
index 07e0168e2b3baa..b4a88ce9306d69 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.h
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.h
@@ -64,15 +64,17 @@ class StickerSetBox final : public Ui::BoxContent {
 		QWidget*,
 		std::shared_ptr<ChatHelpers::Show> show,
 		const StickerSetIdentifier &set,
-		Data::StickersType type);
+		Data::StickersType type,
+		DocumentId previewDocumentId = 0);
 	StickerSetBox(
 		QWidget*,
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<Data::StickersSet*> set);
 
-	static QPointer<Ui::BoxContent> Show(
+	static base::weak_qptr<Ui::BoxContent> Show(
 		std::shared_ptr<ChatHelpers::Show> show,
-		not_null<DocumentData*> document);
+		not_null<DocumentData*> document,
+		DocumentId previewDocumentId = 0);
 
 protected:
 	void prepare() override;
@@ -97,5 +99,6 @@ class StickerSetBox final : public Ui::BoxContent {
 
 	class Inner;
 	QPointer<Inner> _inner;
+	DocumentId _previewDocumentId = 0;
 
 };
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 7509b898c315c9..feaf023bab4efe 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -355,7 +355,7 @@ StickersBox::CounterWidget::CounterWidget(
 
 	std::move(
 		count
-	) | rpl::start_with_next([=](int count) {
+	) | rpl::on_next([=](int count) {
 		setCounter(count);
 		update();
 	}, lifetime());
@@ -414,8 +414,7 @@ StickersBox::StickersBox(
 	std::shared_ptr<ChatHelpers::Show> show,
 	Section section,
 	bool masks)
-: _st(st::stickersRowItem)
-, _show(std::move(show))
+: _show(std::move(show))
 , _session(&_show->session())
 , _api(&_session->mtp())
 , _tabs(this, st::stickersTabs)
@@ -437,8 +436,7 @@ StickersBox::StickersBox(
 	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<ChannelData*> megagroup,
 	bool isEmoji)
-: _st(st::stickersRowItem)
-, _show(std::move(show))
+: _show(std::move(show))
 , _session(&_show->session())
 , _api(&_session->mtp())
 , _section(Section::Installed)
@@ -447,7 +445,7 @@ StickersBox::StickersBox(
 , _installed(0, this, _show, megagroup, isEmoji)
 , _megagroupSet(megagroup) {
 	_installed.widget()->scrollsToY(
-	) | rpl::start_with_next([=](int y) {
+	) | rpl::on_next([=](int y) {
 		scrollToY(y);
 	}, lifetime());
 }
@@ -456,8 +454,7 @@ StickersBox::StickersBox(
 	QWidget*,
 	std::shared_ptr<ChatHelpers::Show> show,
 	const QVector<MTPStickerSetCovered> &attachedSets)
-: _st(st::stickersRowItem)
-, _show(std::move(show))
+: _show(std::move(show))
 , _session(&_show->session())
 , _api(&_session->mtp())
 , _section(Section::Attached)
@@ -472,8 +469,7 @@ StickersBox::StickersBox(
 	QWidget*,
 	std::shared_ptr<ChatHelpers::Show> show,
 	const std::vector<StickerSetIdentifier> &emojiSets)
-: _st(st::stickersRowItem)
-, _show(std::move(show))
+: _show(std::move(show))
 , _session(&_show->session())
 , _api(&_session->mtp())
 , _section(Section::Attached)
@@ -607,7 +603,7 @@ void StickersBox::prepare() {
 		_tabs->sectionActivated(
 		) | rpl::filter([=] {
 			return !_ignoreTabActivation;
-		}) | rpl::start_with_next(
+		}) | rpl::on_next(
 			[this] { switchTab(); },
 			lifetime());
 		refreshTabs();
@@ -700,7 +696,7 @@ void StickersBox::prepare() {
 		: _isMasks
 		? Data::StickersType::Masks
 		: Data::StickersType::Stickers
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		handleStickersUpdated();
 	}, lifetime());
 
@@ -715,13 +711,13 @@ void StickersBox::prepare() {
 	for (const auto &widget : { _installed.widget(), _masks.widget() }) {
 		if (widget) {
 			widget->draggingScrollDelta(
-			) | rpl::start_with_next([=](int delta) {
+			) | rpl::on_next([=](int delta) {
 				scrollByDraggingDelta(delta);
 			}, widget->lifetime());
 		}
 	}
 	if (!_megagroupSet) {
-		boxClosing() | rpl::start_with_next([=] {
+		boxClosing() | rpl::on_next([=] {
 			saveChanges();
 		}, lifetime());
 	}
@@ -750,28 +746,28 @@ void StickersBox::refreshTabs() {
 		sections.push_back(tr::lng_stickers_masks_tab(tr::now));
 		_tabIndices.push_back(Section::Masks);
 	}
-	if (!stickers.featuredSetsOrder().isEmpty() && _featured.widget()) {
+	const auto showFeatured = _featured.widget()
+		&& (!stickers.featuredSetsOrder().isEmpty()
+			|| _section == Section::Featured);
+	if (showFeatured) {
 		sections.push_back(tr::lng_stickers_featured_tab(tr::now));
 		_tabIndices.push_back(Section::Featured);
 	}
-	if (!archivedSetsOrder().isEmpty() && _archived.widget()) {
+	const auto showArchived = _archived.widget()
+		&& (!archivedSetsOrder().isEmpty()
+			|| _section == Section::Archived);
+	if (showArchived) {
 		sections.push_back(tr::lng_stickers_archived_tab(tr::now));
 		_tabIndices.push_back(Section::Archived);
 	}
 	_tabs->setSections(sections);
-	if ((_tab == &_archived && !_tabIndices.contains(Section::Archived))
-		|| (_tab == &_featured && !_tabIndices.contains(Section::Featured))
-		|| (_tab == &_masks && !_tabIndices.contains(Section::Masks))) {
+	if ((_section == Section::Archived && !_tabIndices.contains(Section::Archived))
+		|| (_section == Section::Featured && !_tabIndices.contains(Section::Featured))
+		|| (_section == Section::Masks && !_tabIndices.contains(Section::Masks))) {
 		switchTab();
 	} else {
 		_ignoreTabActivation = true;
-		_tabs->setActiveSectionFast(_tabIndices.indexOf((_tab == &_archived)
-			? Section::Archived
-			: (_tab == &_featured)
-			? Section::Featured
-			: (_tab == &_masks)
-			? Section::Masks
-			: Section::Installed));
+		_tabs->setActiveSectionFast(_tabIndices.indexOf(_section));
 		_ignoreTabActivation = false;
 	}
 	updateTabsGeometry();
@@ -1305,7 +1301,7 @@ Main::Session &StickersBox::Inner::session() const {
 
 void StickersBox::Inner::setup() {
 	session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 		readVisibleSets();
 	}, lifetime());
@@ -1580,7 +1576,7 @@ void StickersBox::Inner::validateLottieAnimation(not_null<Row*> row) {
 	}
 	row->lottie = std::move(player);
 	row->lottie->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateRowThumbnail(row);
 	}, lifetime());
 }
@@ -1826,8 +1822,8 @@ void StickersBox::Inner::setPressed(SelectedRow pressed) {
 	if (_megagroupSet && pressedIndex >= 0 && pressedIndex < _rows.size()) {
 		update(0, _itemsTop + pressedIndex * _rowHeight, width(), _rowHeight);
 		auto &set = _rows[pressedIndex];
-		auto rippleMask = Ui::RippleAnimation::RectMask(QSize(width(), _rowHeight));
 		if (!set->ripple) {
+			auto rippleMask = Ui::RippleAnimation::RectMask(QSize(width(), _rowHeight));
 			set->ripple = std::make_unique<Ui::RippleAnimation>(st::defaultRippleAnimation, std::move(rippleMask), [this, pressedIndex] {
 				update(0, _itemsTop + pressedIndex * _rowHeight, width(), _rowHeight);
 			});
@@ -2058,7 +2054,7 @@ void StickersBox::Inner::checkGroupLevel(Fn<void()> done) {
 	}
 	_checkingGroupLevel = true;
 
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	CheckBoostLevel(_show, peer, [=](int level) {
 		if (!weak) {
 			return std::optional<Ui::AskBoostReason>();
diff --git a/Telegram/SourceFiles/boxes/stickers_box.h b/Telegram/SourceFiles/boxes/stickers_box.h
index 89b31ccf516537..a6a83da93ae46a 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.h
+++ b/Telegram/SourceFiles/boxes/stickers_box.h
@@ -143,7 +143,6 @@ class StickersBox final : public Ui::BoxContent {
 
 	std::array<Inner*, 5> widgets() const;
 
-	const style::PeerListItem &_st;
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const not_null<Main::Session*> _session;
 	MTP::Sender _api;
diff --git a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
new file mode 100644
index 00000000000000..7a093169f985ff
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
@@ -0,0 +1,1157 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/transfer_gift_box.h"
+
+#include "apiwrap.h"
+#include "api/api_credits.h"
+#include "api/api_cloud_password.h"
+#include "base/unixtime.h"
+#include "boxes/filters/edit_filter_chats_list.h" // CreatePe...tionSubtitle.
+#include "boxes/peers/replace_boost_box.h"
+#include "boxes/gift_premium_box.h"
+#include "boxes/passcode_box.h"
+#include "boxes/peer_list_box.h"
+#include "boxes/peer_list_controllers.h"
+#include "boxes/star_gift_box.h"
+#include "boxes/star_gift_resale_box.h"
+#include "data/data_cloud_themes.h"
+#include "data/data_session.h"
+#include "data/data_star_gift.h"
+#include "data/data_thread.h"
+#include "data/data_user.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "payments/payments_checkout_process.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/controls/sub_tabs.h"
+#include "ui/controls/ton_common.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/basic_click_handlers.h"
+#include "ui/empty_userpic.h"
+#include "ui/painter.h"
+#include "ui/vertical_list.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h" // peerListSingleRow.
+#include "styles/style_credits.h" // starIconEmoji.
+#include "styles/style_dialogs.h" // recentPeersSpecialName.
+#include "styles/style_info.h" // defaultSubTabs.
+#include "styles/style_layers.h" // boxLabel.
+
+namespace {
+
+struct ExportOption {
+	object_ptr<Ui::RpWidget> content = { nullptr };
+	Fn<bool(int, int, int)> overrideKey;
+	Fn<void()> activate;
+};
+
+class Controller final : public ContactsBoxController {
+public:
+	Controller(
+		not_null<Window::SessionController*> window,
+		std::shared_ptr<Data::UniqueGift> gift,
+		Data::SavedStarGiftId savedId,
+		Fn<void(not_null<PeerData*>, Fn<void()>)> choose);
+
+	void init(not_null<PeerListBox*> box);
+
+	void noSearchSubmit();
+
+private:
+	void prepareViewHook() override;
+
+	bool overrideKeyboardNavigation(
+		int direction,
+		int fromIndex,
+		int toIndex) override;
+
+	std::unique_ptr<PeerListRow> createRow(
+		not_null<UserData*> user) override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+
+	const not_null<Window::SessionController*> _window;
+	const std::shared_ptr<Data::UniqueGift> _gift;
+	const Data::SavedStarGiftId _giftId;
+	const Fn<void(not_null<PeerData*>, Fn<void()>)> _choose;
+	ExportOption _exportOption;
+	QPointer<PeerListBox> _box;
+
+};
+
+void ConfirmExportBox(
+		not_null<Ui::GenericBox*> box,
+		std::shared_ptr<Data::UniqueGift> gift,
+		Fn<void(Fn<void()> close)> confirmed) {
+	box->setTitle(tr::lng_gift_transfer_confirm_title());
+	box->addRow(object_ptr<Ui::FlatLabel>(
+		box,
+		tr::lng_gift_transfer_confirm_text(
+			lt_name,
+			rpl::single(tr::bold(UniqueGiftName(*gift))),
+			tr::marked),
+		st::boxLabel));
+	box->addButton(tr::lng_gift_transfer_confirm_button(), [=] {
+		confirmed([weak = base::make_weak(box)] {
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		});
+	});
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+}
+
+void ExportOnBlockchain(
+		not_null<Window::SessionController*> window,
+		not_null<Ui::RpWidget*> parent,
+		std::shared_ptr<Data::UniqueGift> gift,
+		Data::SavedStarGiftId giftId,
+		Fn<void()> boxShown,
+		Fn<void()> wentToUrl) {
+	struct State {
+		bool loading = false;
+		rpl::lifetime lifetime;
+	};
+	const auto state = std::make_shared<State>();
+	const auto session = &window->session();
+	const auto show = window->uiShow();
+	session->api().cloudPassword().reload();
+	session->api().request(
+		MTPpayments_GetStarGiftWithdrawalUrl(
+			Api::InputSavedStarGiftId(giftId),
+			MTP_inputCheckPasswordEmpty())
+	).fail([=](const MTP::Error &error) {
+		auto box = PrePasswordErrorBox(
+			error.type(),
+			session,
+			TextWithEntities{
+				tr::lng_gift_transfer_password_about(tr::now),
+			});
+		if (box) {
+			show->show(std::move(box));
+			boxShown();
+			return;
+		}
+		state->lifetime = session->api().cloudPassword().state(
+		) | rpl::take(
+			1
+		) | rpl::on_next([=](const Core::CloudPasswordState &pass) {
+			state->lifetime.destroy();
+
+			auto fields = PasscodeBox::CloudFields::From(pass);
+			fields.customTitle = tr::lng_gift_transfer_password_title();
+			fields.customDescription
+				= tr::lng_gift_transfer_password_description(tr::now);
+			fields.customSubmitButton = tr::lng_passcode_submit();
+			fields.customCheckCallback = crl::guard(parent, [=](
+					const Core::CloudPasswordResult &result,
+					base::weak_qptr<PasscodeBox> box) {
+				using ExportUrl = MTPpayments_StarGiftWithdrawalUrl;
+				session->api().request(
+					MTPpayments_GetStarGiftWithdrawalUrl(
+						Api::InputSavedStarGiftId(giftId),
+						result.result)
+				).done([=](const ExportUrl &result) {
+					UrlClickHandler::Open(qs(result.data().vurl()));
+					wentToUrl();
+					if (box) {
+						box->closeBox();
+					}
+				}).fail([=](const MTP::Error &error) {
+					const auto message = error.type();
+					if (box && !box->handleCustomCheckError(message)) {
+						show->showToast(message);
+					}
+				}).send();
+			});
+			show->show(Box<PasscodeBox>(session, fields));
+			boxShown();
+		});
+	}).send();
+}
+
+[[nodiscard]] ExportOption MakeExportOption(
+		not_null<Window::SessionController*> window,
+		not_null<PeerListBox*> box,
+		std::shared_ptr<Data::UniqueGift> gift,
+		Data::SavedStarGiftId giftId,
+		TimeId when) {
+	struct State {
+		bool exporting = false;
+	};
+	const auto state = std::make_shared<State>();
+	const auto activate = [=] {
+		const auto now = base::unixtime::now();
+		const auto weak = base::make_weak(box);
+		const auto left = (when > now) ? (when - now) : 0;
+		const auto hours = left ? std::max((left + 1800) / 3600, 1) : 0;
+		if (!hours) {
+			window->show(Box(ConfirmExportBox, gift, [=](Fn<void()> close) {
+				if (state->exporting) {
+					return;
+				}
+				state->exporting = true;
+				ExportOnBlockchain(window, box, gift, giftId, [=] {
+					state->exporting = false;
+					close();
+				}, [=] {
+					if (const auto strong = weak.get()) {
+						strong->closeBox();
+					}
+					close();
+				});
+			}));
+			return;
+		}
+		window->show(Ui::MakeInformBox({
+			.text = tr::lng_gift_transfer_unlocks_about(
+				lt_when,
+				((hours >= 24)
+					? tr::lng_gift_transfer_unlocks_when_days(
+						lt_count,
+						rpl::single((hours / 24) * 1.))
+					: tr::lng_gift_transfer_unlocks_when_hours(
+						lt_count,
+						rpl::single(hours * 1.)))),
+			.title = tr::lng_gift_transfer_unlocks_title(),
+		}));
+	};
+
+	class ExportRow final : public PeerListRow {
+	public:
+		explicit ExportRow(TimeId when)
+		: PeerListRow(Data::FakePeerIdForJustName("ton-export").value) {
+			const auto now = base::unixtime::now();
+			_available = (when <= now);
+			if (const auto left = when - now; left > 0) {
+				const auto hours = std::max((left + 1800) / 3600, 1);
+				const auto days = hours / 24;
+				setCustomStatus(days
+					? tr::lng_gift_transfer_unlocks_days(
+						tr::now,
+						lt_count,
+						days)
+					: tr::lng_gift_transfer_unlocks_hours(
+						tr::now,
+						lt_count,
+						hours));
+			}
+		}
+
+		QString generateName() override {
+			return tr::lng_gift_transfer_via_blockchain(tr::now);
+		}
+		QString generateShortName() override {
+			return generateName();
+		}
+		auto generatePaintUserpicCallback(bool forceRound)
+		-> PaintRoundImageCallback override {
+			return [=](
+					Painter &p,
+					int x,
+					int y,
+					int outerWidth,
+					int size) mutable {
+				Ui::EmptyUserpic::PaintCurrency(p, x, y, outerWidth, size);
+			};
+		}
+
+		const style::PeerListItem &computeSt(
+				const style::PeerListItem &st) const override {
+			_st = st;
+			_st.namePosition.setY(
+				st::recentPeersSpecialName.namePosition.y());
+			return _available ? _st : st;
+		}
+
+	private:
+		mutable style::PeerListItem _st;
+		bool _available = false;
+
+	};
+
+	class ExportController final : public PeerListController {
+	public:
+		ExportController(
+			not_null<Main::Session*> session,
+			TimeId when,
+			Fn<void()> activate)
+		: _session(session)
+		, _when(when)
+		, _activate(std::move(activate)) {
+		}
+
+		void prepare() override {
+			delegate()->peerListAppendRow(
+				std::make_unique<ExportRow>(_when));
+			delegate()->peerListRefreshRows();
+		}
+		void loadMoreRows() override {
+		}
+		void rowClicked(not_null<PeerListRow*> row) override {
+			_activate();
+		}
+		Main::Session &session() const override {
+			return *_session;
+		}
+
+	private:
+		const not_null<Main::Session*> _session;
+		TimeId _when = 0;
+		Fn<void()> _activate;
+
+	};
+
+	auto result = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	const auto container = result.data();
+
+	Ui::AddSkip(container);
+
+	const auto delegate = container->lifetime().make_state<
+		PeerListContentDelegateSimple
+	>();
+	const auto controller = container->lifetime().make_state<
+		ExportController
+	>(&window->session(), when, activate);
+	controller->setStyleOverrides(&st::peerListSingleRow);
+	const auto content = container->add(object_ptr<PeerListContent>(
+		container,
+		controller));
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
+
+	Ui::AddSkip(container);
+	container->add(CreatePeerListSectionSubtitle(
+		container,
+		tr::lng_contacts_header()));
+
+	const auto overrideKey = [=](int direction, int from, int to) {
+		if (!content->isVisible()) {
+			return false;
+		} else if (direction > 0 && from < 0 && to >= 0) {
+			if (content->hasSelection()) {
+				const auto was = content->selectedIndex();
+				const auto now = content->selectSkip(1).reallyMovedTo;
+				if (was != now) {
+					return true;
+				}
+				content->clearSelection();
+			} else {
+				content->selectSkip(1);
+				return true;
+			}
+		} else if (direction < 0 && to < 0) {
+			if (!content->hasSelection()) {
+				content->selectLast();
+			} else if (from >= 0 || content->hasSelection()) {
+				content->selectSkip(-1);
+			}
+		}
+		return false;
+	};
+
+	return {
+		.content = std::move(result),
+		.overrideKey = overrideKey,
+		.activate = activate,
+	};
+}
+
+Controller::Controller(
+	not_null<Window::SessionController*> window,
+	std::shared_ptr<Data::UniqueGift> gift,
+	Data::SavedStarGiftId giftId,
+	Fn<void(not_null<PeerData*>, Fn<void()>)> choose)
+: ContactsBoxController(&window->session())
+, _window(window)
+, _gift(std::move(gift))
+, _giftId(giftId)
+, _choose(std::move(choose)) {
+	if (_gift->exportAt) {
+		setStyleOverrides(&st::peerListSmallSkips);
+	}
+}
+
+void Controller::init(not_null<PeerListBox*> box) {
+	_box = box;
+	if (const auto when = _gift->exportAt) {
+		_exportOption = MakeExportOption(_window, box, _gift, _giftId, when);
+		delegate()->peerListSetAboveWidget(std::move(_exportOption.content));
+		delegate()->peerListRefreshRows();
+	}
+}
+
+void Controller::noSearchSubmit() {
+	if (const auto onstack = _exportOption.activate) {
+		onstack();
+	}
+}
+
+bool Controller::overrideKeyboardNavigation(
+		int direction,
+		int fromIndex,
+		int toIndex) {
+	return _exportOption.overrideKey
+		&& _exportOption.overrideKey(direction, fromIndex, toIndex);
+}
+
+void Controller::prepareViewHook() {
+	delegate()->peerListSetTitle(tr::lng_gift_transfer_title(
+		lt_name,
+		rpl::single(UniqueGiftName(*_gift))));
+}
+
+std::unique_ptr<PeerListRow> Controller::createRow(
+	not_null<UserData*> user) {
+	if (user->isSelf()
+		|| user->isBot()
+		|| user->isServiceUser()
+		|| user->isInaccessible()) {
+		return nullptr;
+	}
+	return ContactsBoxController::createRow(user);
+}
+
+void Controller::rowClicked(not_null<PeerListRow*> row) {
+	_choose(row->peer(), [parentBox = _box] {
+		if (const auto strong = parentBox.data()) {
+			strong->closeBox();
+		}
+	});
+}
+
+void TransferGift(
+		not_null<Window::SessionController*> window,
+		not_null<PeerData*> to,
+		std::shared_ptr<Data::UniqueGift> gift,
+		Data::SavedStarGiftId savedId,
+		Fn<void(Payments::CheckoutResult)> done,
+		bool skipPaymentForm = false) {
+	const auto session = &window->session();
+	const auto weak = base::make_weak(window);
+	auto formDone = [=](
+			Payments::CheckoutResult result,
+			const MTPUpdates *updates) {
+		if (result == Payments::CheckoutResult::Free) {
+			Assert(!skipPaymentForm);
+			TransferGift(window, to, gift, savedId, done, true);
+			return;
+		}
+		done(result);
+		if (result == Payments::CheckoutResult::Paid) {
+			session->data().notifyGiftUpdate({
+				.id = savedId,
+				.action = Data::GiftUpdate::Action::Transfer,
+			});
+			if (const auto strong = weak.get()) {
+				Ui::ShowGiftTransferredToast(strong->uiShow(), to, *gift);
+			}
+		}
+	};
+	if (skipPaymentForm) {
+		// We can't check (gift->starsForTransfer <= 0) here.
+		//
+		// Sometimes we don't know the price for transfer.
+		// Like when we transfer a gift from Resale tab.
+		session->api().request(MTPpayments_TransferStarGift(
+			Api::InputSavedStarGiftId(savedId, gift),
+			to->input()
+		)).done([=](const MTPUpdates &result) {
+			session->api().applyUpdates(result);
+			formDone(Payments::CheckoutResult::Paid, &result);
+		}).fail([=](const MTP::Error &error) {
+			formDone(Payments::CheckoutResult::Failed, nullptr);
+			const auto earlyPrefix = u"STARGIFT_TRANSFER_TOO_EARLY_"_q;
+			const auto type = error.type();
+			if (type.startsWith(earlyPrefix)) {
+				const auto seconds = type.mid(earlyPrefix.size()).toInt();
+				const auto newAvailableAt = base::unixtime::now() + seconds;
+				gift->canTransferAt = newAvailableAt;
+				if (const auto strong = weak.get()) {
+					ShowTransferGiftLater(strong->uiShow(), gift);
+				}
+			} else if (const auto strong = weak.get()) {
+				if (!Ui::ShowGiftErrorToast(strong->uiShow(), error)) {
+					strong->showToast(type);
+				}
+			}
+		}).send();
+	} else {
+		Ui::RequestStarsFormAndSubmit(
+			window->uiShow(),
+			MTP_inputInvoiceStarGiftTransfer(
+				Api::InputSavedStarGiftId(savedId, gift),
+				to->input()),
+			std::move(formDone));
+	}
+}
+
+void ResolveGiftSaleOffer(
+		not_null<Window::SessionController*> window,
+		MsgId id,
+		bool accept,
+		Fn<void(bool)> done) {
+	using Flag = MTPpayments_ResolveStarGiftOffer::Flag;
+	const auto session = &window->session();
+	const auto show = window->uiShow();
+	session->api().request(MTPpayments_ResolveStarGiftOffer(
+		MTP_flags(accept ? Flag() : Flag::f_decline),
+		MTP_int(id.bare)
+	)).done([=](const MTPUpdates &result) {
+		session->api().applyUpdates(result);
+		done(true);
+	}).fail([=](const MTP::Error &error) {
+		if (!Ui::ShowGiftErrorToast(show, error)) {
+			show->showToast(error.type());
+		}
+		done(false);
+	}).send();
+}
+
+void BuyResaleGift(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> to,
+		std::shared_ptr<Data::UniqueGift> gift,
+		CreditsType type,
+		Fn<void(Payments::CheckoutResult)> done) {
+	auto paymentDone = [=](
+			Payments::CheckoutResult result,
+			const MTPUpdates *updates) {
+		if (result == Payments::CheckoutResult::Paid) {
+			gift->starsForResale = 0;
+		}
+		done(result);
+		if (result == Payments::CheckoutResult::Paid) {
+			to->owner().notifyGiftUpdate({
+				.slug = gift->slug,
+				.action = Data::GiftUpdate::Action::ResaleChange,
+			});
+			Ui::ShowResaleGiftBoughtToast(show, to, *gift);
+		}
+	};
+
+	using Flag = MTPDinputInvoiceStarGiftResale::Flag;
+	const auto invoice = MTP_inputInvoiceStarGiftResale(
+		MTP_flags((type == CreditsType::Ton) ? Flag::f_ton : Flag()),
+		MTP_string(gift->slug),
+		to->input());
+
+	Ui::RequestOurForm(show, invoice, [=](
+			uint64 formId,
+			CreditsAmount price,
+			std::optional<Payments::CheckoutResult> failure) {
+		if ((type == CreditsType::Ton && price.stars())
+			|| (type == CreditsType::Stars && price.ton())) {
+			paymentDone(Payments::CheckoutResult::Failed, nullptr);
+			return;
+		}
+		const auto submit = [=] {
+			if (price.stars()) {
+				SubmitStarsForm(
+					show,
+					invoice,
+					formId,
+					price.whole(),
+					paymentDone);
+			} else {
+				SubmitTonForm(show, invoice, formId, price, paymentDone);
+			}
+		};
+		const auto was = (type == CreditsType::Ton)
+			? Data::UniqueGiftResaleTon(*gift)
+			: Data::UniqueGiftResaleStars(*gift);
+		if (failure) {
+			paymentDone(*failure, nullptr);
+		} else if (price != was) {
+			const auto cost = price.ton()
+				? Ui::Text::IconEmoji(&st::tonIconEmoji).append(
+					Lang::FormatCreditsAmountDecimal(price))
+				: Ui::Text::IconEmoji(&st::starIconEmoji).append(
+					Lang::FormatCountDecimal(price.whole()));
+			const auto cancelled = [=](Fn<void()> close) {
+				paymentDone(Payments::CheckoutResult::Cancelled, nullptr);
+				close();
+			};
+			show->show(Ui::MakeConfirmBox({
+				.text = tr::lng_gift_buy_price_change_text(
+					tr::now,
+					lt_price,
+					Ui::Text::Wrapped(cost, EntityType::Bold),
+					tr::marked),
+				.confirmed = [=](Fn<void()> close) { close(); submit(); },
+				.cancelled = cancelled,
+				.confirmText = tr::lng_gift_buy_resale_button(
+					lt_cost,
+					rpl::single(cost),
+					tr::marked),
+				.title = tr::lng_gift_buy_price_change_title(),
+			}));
+		} else {
+			submit();
+		}
+	});
+}
+
+} // namespace
+
+void ShowTransferToBox(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		std::shared_ptr<Data::UniqueGift> gift,
+		Data::SavedStarGiftId savedId,
+		Fn<void()> closeParentBox) {
+	const auto stars = gift->starsForTransfer;
+	controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+		auto transfer = (stars > 0)
+			? tr::lng_gift_transfer_button_for(
+				lt_price,
+				rpl::single(Ui::Text::IconEmoji(
+					&st::starIconEmoji
+				).append(Lang::FormatCreditsAmountDecimal(
+					CreditsAmount(stars)
+				))),
+				tr::marked)
+			: tr::lng_gift_transfer_button(tr::marked);
+
+		struct State {
+			bool sent = false;
+		};
+		const auto state = std::make_shared<State>();
+		auto callback = [=] {
+			if (state->sent) {
+				return;
+			}
+			state->sent = true;
+			const auto weak = base::make_weak(box);
+			const auto done = [=](Payments::CheckoutResult result) {
+				if (result == Payments::CheckoutResult::Cancelled) {
+					closeParentBox();
+					if (const auto strong = weak.get()) {
+						strong->closeBox();
+					}
+				} else if (result != Payments::CheckoutResult::Paid) {
+					state->sent = false;
+				} else {
+					if (savedId.isUser()) {
+						controller->showPeerHistory(peer);
+					}
+					closeParentBox();
+					if (const auto strong = weak.get()) {
+						strong->closeBox();
+					}
+				}
+			};
+			TransferGift(controller, peer, gift, savedId, done);
+		};
+
+		box->addRow(
+			CreateGiftTransfer(box->verticalLayout(), gift, peer),
+			QMargins(0, st::boxPadding.top(), 0, 0));
+
+		Ui::ConfirmBox(box, {
+			.text = (stars > 0)
+				? tr::lng_gift_transfer_sure_for(
+					lt_name,
+					rpl::single(tr::bold(UniqueGiftName(*gift))),
+					lt_recipient,
+					rpl::single(tr::bold(peer->shortName())),
+					lt_price,
+					tr::lng_action_gift_for_stars(
+						lt_count,
+						rpl::single(stars * 1.),
+						tr::bold),
+					tr::marked)
+				: tr::lng_gift_transfer_sure(
+					lt_name,
+					rpl::single(tr::bold(UniqueGiftName(*gift))),
+					lt_recipient,
+					rpl::single(tr::bold(peer->shortName())),
+					tr::marked),
+			.confirmed = std::move(callback),
+			.confirmText = std::move(transfer),
+		});
+
+		const auto show = controller->uiShow();
+		AddTransferGiftTable(show, box->verticalLayout(), gift);
+	}));
+}
+
+void ShowTransferGiftBox(
+		not_null<Window::SessionController*> window,
+		std::shared_ptr<Data::UniqueGift> gift,
+		Data::SavedStarGiftId savedId) {
+	if (ShowTransferGiftLater(window->uiShow(), gift)) {
+		return;
+	}
+	auto controller = std::make_unique<Controller>(
+		window,
+		gift,
+		savedId,
+		[=](not_null<PeerData*> peer, Fn<void()> done) {
+			ShowTransferToBox(window, peer, gift, savedId, done);
+		});
+	const auto controllerRaw = controller.get();
+	auto initBox = [=](not_null<PeerListBox*> box) {
+		controllerRaw->init(box);
+
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+
+		box->noSearchSubmits() | rpl::on_next([=] {
+			controllerRaw->noSearchSubmit();
+		}, box->lifetime());
+	};
+	window->show(
+		Box<PeerListBox>(std::move(controller), std::move(initBox)),
+		Ui::LayerOption::KeepOther);
+}
+
+void ShowGiftSaleAcceptBox(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item,
+		not_null<HistoryMessageSuggestion*> suggestion) {
+	const auto id = item->id;
+	const auto peer = item->history()->peer;
+	const auto gift = suggestion->gift;
+	const auto price = suggestion->price;
+
+	const auto &appConfig = controller->session().appConfig();
+	const auto starsThousandths = appConfig.giftResaleStarsThousandths();
+	const auto nanoTonThousandths = appConfig.giftResaleNanoTonThousandths();
+
+	controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+		struct State {
+			bool sent = false;
+		};
+		const auto state = std::make_shared<State>();
+		auto callback = [=] {
+			if (state->sent) {
+				return;
+			}
+			state->sent = true;
+			const auto weak = base::make_weak(controller);
+			const auto weakBox = base::make_weak(box);
+			ResolveGiftSaleOffer(controller, id, true, [=](bool ok) {
+				state->sent = false;
+				if (ok) {
+					if (const auto strong = weak.get()) {
+						strong->showPeerHistory(peer->id);
+					}
+					if (const auto strong = weakBox.get()) {
+						strong->closeBox();
+					}
+				}
+			});
+		};
+
+		const auto receive = price.ton()
+			? ((price.value() * nanoTonThousandths) / 1000.)
+			: ((int64(price.value()) * starsThousandths) / 1000);
+
+		auto button = tr::lng_gift_offer_sell_for(
+			lt_price,
+			rpl::single(Ui::Text::IconEmoji(price.ton()
+				? &st::buttonTonIconEmoji
+				: &st::buttonStarIconEmoji
+			).append(Lang::FormatExactCountDecimal(receive))),
+			tr::marked);
+
+		box->addRow(
+			CreateGiftTransfer(box->verticalLayout(), gift, peer),
+			QMargins(0, st::boxPadding.top(), 0, 0));
+
+		Ui::ConfirmBox(box, {
+			.text = tr::lng_gift_offer_confirm_accept(
+				tr::now,
+				lt_name,
+				tr::bold(UniqueGiftName(*gift)),
+				lt_user,
+				tr::bold(peer->shortName()),
+				lt_cost,
+				tr::bold(PrepareCreditsAmountText(price)),
+				tr::marked
+			).append(u"\n\n"_q).append(tr::lng_gift_offer_you_get(
+				tr::now,
+				lt_cost,
+				tr::bold(price.stars()
+					? tr::lng_action_gift_for_stars(
+						tr::now,
+						lt_count_decimal,
+						receive)
+					: tr::lng_action_gift_for_ton(
+						tr::now,
+						lt_count_decimal,
+						receive)),
+				tr::marked)),
+			.confirmed = std::move(callback),
+			.confirmText = std::move(button),
+		});
+
+		const auto show = controller->uiShow();
+		auto taken = base::take(gift->value);
+		AddTransferGiftTable(show, box->verticalLayout(), gift);
+		gift->value = std::move(taken);
+
+		if (gift->value.get()) {
+			const auto appConfig = &show->session().appConfig();
+			const auto rule = Ui::LookupCurrencyRule(u"USD"_q);
+			const auto value = (gift->value->valuePriceUsd > 0 ? 1 : -1)
+				* std::abs(gift->value->valuePriceUsd)
+				/ std::pow(10., rule.exponent);
+			if (std::abs(value) >= 0.01) {
+				const auto rate = price.ton()
+					? appConfig->currencySellRate()
+					: (appConfig->starsSellRate() / 100.);
+				const auto offered = receive * rate;
+				const auto diff = offered - value;
+				const auto percent = std::abs(diff / value * 100.);
+				if (percent >= 1) {
+					const auto higher = (diff > 0.);
+					const auto good = higher || (percent < 10);
+					const auto number = int(base::SafeRound(percent));
+					const auto percentText = QString::number(number) + '%';
+					box->addRow(
+						object_ptr<Ui::FlatLabel>(
+							box,
+							(higher
+								? tr::lng_gift_offer_higher
+								: tr::lng_gift_offer_lower)(
+									lt_percent,
+									rpl::single(tr::bold(percentText)),
+									lt_name,
+									rpl::single(tr::marked(gift->title)),
+									tr::marked),
+							(good ? st::offerValueGood : st::offerValueBad)),
+						st::boxRowPadding + st::offerValuePadding
+					)->setTryMakeSimilarLines(true);
+				}
+			}
+		}
+	}));
+}
+
+void ShowGiftSaleRejectBox(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item,
+		not_null<HistoryMessageSuggestion*> suggestion) {
+	struct State {
+		bool sent = false;
+	};
+	const auto id = item->id;
+	const auto state = std::make_shared<State>();
+	auto callback = [=](Fn<void()> close) {
+		if (state->sent) {
+			return;
+		}
+		state->sent = true;
+		const auto weak = base::make_weak(controller);
+		ResolveGiftSaleOffer(controller, id, false, [=](bool ok) {
+			state->sent = false;
+			if (ok) {
+				close();
+			}
+		});
+	};
+	controller->show(Ui::MakeConfirmBox({
+		.text = tr::lng_gift_offer_confirm_reject(
+			lt_user,
+			rpl::single(tr::bold(item->history()->peer->shortName())),
+			tr::marked),
+		.confirmed = std::move(callback),
+		.confirmText = tr::lng_action_gift_offer_decline(),
+		.confirmStyle = &st::attentionBoxButton,
+		.title = tr::lng_gift_offer_reject_title(),
+	}));
+}
+
+void SetThemeFromUniqueGift(
+		not_null<Window::SessionController*> window,
+		std::shared_ptr<Data::UniqueGift> unique) {
+	class Controller final : public ChooseRecipientBoxController {
+	public:
+		Controller(
+			not_null<Window::SessionController*> window,
+			std::shared_ptr<Data::UniqueGift> unique)
+		: ChooseRecipientBoxController({
+			.session = &window->session(),
+			.callback = [=](not_null<Data::Thread*> thread) {
+				const auto weak = base::make_weak(window);
+				const auto peer = thread->peer();
+				SendPeerThemeChangeRequest(window, peer, QString(), unique);
+				if (weak) window->showPeerHistory(peer);
+				if (weak) window->hideLayer(anim::type::normal);
+			},
+			.filter = [=](not_null<Data::Thread*> thread) {
+				return thread->peer()->isUser();
+			},
+			.moneyRestrictionError = WriteMoneyRestrictionError,
+		}) {
+		}
+
+	private:
+		void prepareViewHook() override {
+			ChooseRecipientBoxController::prepareViewHook();
+			delegate()->peerListSetTitle(tr::lng_gift_transfer_choose());
+		}
+
+	};
+
+	window->show(
+		Box<PeerListBox>(
+			std::make_unique<Controller>(window, std::move(unique)),
+			[](not_null<PeerListBox*> box) {
+				box->addButton(tr::lng_cancel(), [=] {
+					box->closeBox();
+				});
+			}));
+}
+
+void SendPeerThemeChangeRequest(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		const QString &token,
+		const std::shared_ptr<Data::UniqueGift> &unique,
+		bool locallySet) {
+	const auto api = &peer->session().api();
+
+	api->request(MTPmessages_SetChatWallPaper(
+		MTP_flags(0),
+		peer->input(),
+		MTPInputWallPaper(),
+		MTPWallPaperSettings(),
+		MTPint()
+	)).afterDelay(10).done([=](const MTPUpdates &result) {
+		api->applyUpdates(result);
+	}).send();
+
+	api->request(MTPmessages_SetChatTheme(
+		peer->input(),
+		(unique
+			? MTP_inputChatThemeUniqueGift(MTP_string(unique->slug))
+			: MTP_inputChatTheme(MTP_string(token)))
+	)).done([=](const MTPUpdates &result) {
+		api->applyUpdates(result);
+		if (!locallySet) {
+			peer->updateFullForced();
+		}
+	}).send();
+}
+
+void SetPeerTheme(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		const QString &token,
+		const std::shared_ptr<Ui::ChatTheme> &theme) {
+	const auto giftTheme = token.startsWith(u"gift:"_q)
+		? peer->owner().cloudThemes().themeForToken(token)
+		: std::optional<Data::CloudTheme>();
+
+	peer->setThemeToken(token);
+	const auto dropWallPaper = (peer->wallPaper() != nullptr);
+	if (dropWallPaper) {
+		peer->setWallPaper({});
+	}
+
+	if (theme) {
+		// Remember while changes propagate through event loop.
+		controller->pushLastUsedChatTheme(theme);
+	}
+
+	SendPeerThemeChangeRequest(
+		controller,
+		peer,
+		token,
+		giftTheme ? giftTheme->unique : nullptr,
+		true);
+}
+
+void ShowBuyResaleGiftBox(
+		std::shared_ptr<ChatHelpers::Show> show,
+		std::shared_ptr<Data::UniqueGift> gift,
+		bool forceTon,
+		not_null<PeerData*> to,
+		Fn<void(bool ok)> closeParentBox) {
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		struct State {
+			rpl::variable<bool> ton;
+			bool sent = false;
+		};
+		const auto state = std::make_shared<State>();
+		state->ton = gift->onlyAcceptTon || forceTon;
+
+		if (gift->onlyAcceptTon) {
+			box->addRow(
+				object_ptr<Ui::FlatLabel>(
+					box,
+					tr::lng_gift_buy_resale_only_ton(
+						tr::rich),
+					st::resaleConfirmTonOnly),
+				st::boxRowPadding + st::resaleConfirmTonOnlyMargin);
+		} else {
+			const auto tabs = box->addRow(
+				object_ptr<Ui::SubTabs>(
+					box,
+					st::defaultSubTabs,
+					Ui::SubTabsOptions{
+						.selected = (state->ton.current()
+							? u"ton"_q
+							: u"stars"_q),
+						.centered = true,
+					},
+					std::vector<Ui::SubTabsTab>{
+						{
+							u"stars"_q,
+							tr::lng_gift_buy_resale_pay_stars(
+								tr::now,
+								tr::marked),
+						},
+						{
+							u"ton"_q,
+							tr::lng_gift_buy_resale_pay_ton(
+								tr::now,
+								tr::marked),
+						},
+					}),
+				st::boxRowPadding + st::resaleConfirmTonOnlyMargin);
+			tabs->activated() | rpl::on_next([=](QString id) {
+				tabs->setActiveTab(id);
+				state->ton = (id == u"ton"_q);
+			}, tabs->lifetime());
+		}
+
+		auto transfer = state->ton.value() | rpl::map([=](bool ton) {
+			return tr::lng_gift_buy_resale_button(
+				lt_cost,
+				rpl::single(ton
+					? Data::FormatGiftResaleTon(*gift)
+					: Data::FormatGiftResaleStars(*gift)),
+				tr::marked);
+		}) | rpl::flatten_latest();
+
+		auto callback = [=](Fn<void()> close) {
+			if (state->sent) {
+				return;
+			}
+			state->sent = true;
+			const auto weak = base::make_weak(box);
+			const auto done = [=](Payments::CheckoutResult result) {
+				if (result == Payments::CheckoutResult::Cancelled) {
+					closeParentBox(false);
+					close();
+				} else if (result != Payments::CheckoutResult::Paid) {
+					state->sent = false;
+				} else {
+					closeParentBox(true);
+					close();
+				}
+			};
+			const auto type = state->ton.current()
+				? CreditsType::Ton
+				: CreditsType::Stars;
+			BuyResaleGift(show, to, gift, type, done);
+		};
+
+		auto price = state->ton.value() | rpl::map([=](bool ton) {
+			return ton
+				? tr::lng_action_gift_for_ton(
+					lt_count_decimal,
+					rpl::single(gift->nanoTonForResale
+						/ float64(Ui::kNanosInOne)),
+					tr::bold)
+				: tr::lng_action_gift_for_stars(
+					lt_count_decimal,
+					rpl::single(gift->starsForResale * 1.),
+					tr::bold);
+		}) | rpl::flatten_latest();
+		Ui::ConfirmBox(box, {
+			.text = to->isSelf()
+				? tr::lng_gift_buy_resale_confirm_self(
+					lt_name,
+					rpl::single(tr::bold(UniqueGiftName(*gift))),
+					lt_price,
+					std::move(price),
+					tr::marked)
+				: tr::lng_gift_buy_resale_confirm(
+					lt_name,
+					rpl::single(tr::bold(UniqueGiftName(*gift))),
+					lt_price,
+					std::move(price),
+					lt_user,
+					rpl::single(tr::bold(to->shortName())),
+					tr::marked),
+			.confirmed = std::move(callback),
+			.confirmText = std::move(transfer),
+		});
+	}));
+}
+
+bool ShowResaleGiftLater(
+		std::shared_ptr<ChatHelpers::Show> show,
+		std::shared_ptr<Data::UniqueGift> gift) {
+	const auto now = base::unixtime::now();
+	if (gift->canResellAt <= now) {
+		return false;
+	}
+	const auto seconds = gift->canResellAt - now;
+	const auto days = seconds / 86400;
+	const auto hours = seconds / 3600;
+	const auto minutes = std::max(seconds / 60, 1);
+	show->showToast({
+		.title = tr::lng_gift_resale_transfer_early_title(tr::now),
+		.text = { tr::lng_gift_resale_early(tr::now, lt_duration, days
+			? tr::lng_days(tr::now, lt_count, days)
+			: hours
+			? tr::lng_hours(tr::now, lt_count, hours)
+			: tr::lng_minutes(tr::now, lt_count, minutes)) },
+	});
+	return true;
+}
+
+bool ShowTransferGiftLater(
+		std::shared_ptr<ChatHelpers::Show> show,
+		std::shared_ptr<Data::UniqueGift> gift) {
+	const auto seconds = gift->canTransferAt - base::unixtime::now();
+	if (seconds <= 0) {
+		return false;
+	}
+	const auto days = seconds / 86400;
+	const auto hours = seconds / 3600;
+	const auto minutes = std::max(seconds / 60, 1);
+	show->showToast({
+		.title = tr::lng_gift_resale_transfer_early_title(tr::now),
+		.text = { tr::lng_gift_transfer_early(tr::now, lt_duration, days
+			? tr::lng_days(tr::now, lt_count, days)
+			: hours
+			? tr::lng_hours(tr::now, lt_count, hours)
+			: tr::lng_minutes(tr::now, lt_count, minutes)) },
+	});
+	return true;
+}
+
+void ShowActionLocked(
+		std::shared_ptr<ChatHelpers::Show> show,
+		const QString &slug) {
+	const auto open = [=] {
+		UrlClickHandler::Open(u"https://fragment.com/gift/"_q
+			+ slug
+			+ u"?collection=my"_q);
+	};
+	show->show(Ui::MakeConfirmBox({
+		.text = tr::lng_gift_transfer_locked_text(),
+		.confirmed = [=](Fn<void()> close) { open(); close(); },
+		.confirmText = tr::lng_gift_transfer_confirm_button(),
+		.title = tr::lng_gift_transfer_locked_title(),
+	}));
+}
diff --git a/Telegram/SourceFiles/boxes/transfer_gift_box.h b/Telegram/SourceFiles/boxes/transfer_gift_box.h
new file mode 100644
index 00000000000000..e1929260e9b8df
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/transfer_gift_box.h
@@ -0,0 +1,81 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+struct HistoryMessageSuggestion;
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Data {
+struct UniqueGift;
+class SavedStarGiftId;
+} // namespace Data
+
+namespace Ui {
+class ChatTheme;
+} // namespace Ui
+
+void ShowTransferToBox(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> peer,
+	std::shared_ptr<Data::UniqueGift> gift,
+	Data::SavedStarGiftId savedId,
+	Fn<void()> closeParentBox);
+
+void ShowTransferGiftBox(
+	not_null<Window::SessionController*> window,
+	std::shared_ptr<Data::UniqueGift> gift,
+	Data::SavedStarGiftId savedId);
+
+void ShowGiftSaleAcceptBox(
+	not_null<Window::SessionController*> controller,
+	not_null<HistoryItem*> item,
+	not_null<HistoryMessageSuggestion*> suggestion);
+void ShowGiftSaleRejectBox(
+	not_null<Window::SessionController*> controller,
+	not_null<HistoryItem*> item,
+	not_null<HistoryMessageSuggestion*> suggestion);
+
+void ShowBuyResaleGiftBox(
+	std::shared_ptr<ChatHelpers::Show> show,
+	std::shared_ptr<Data::UniqueGift> gift,
+	bool forceTon,
+	not_null<PeerData*> to,
+	Fn<void(bool ok)> closeParentBox);
+
+bool ShowResaleGiftLater(
+	std::shared_ptr<ChatHelpers::Show> show,
+	std::shared_ptr<Data::UniqueGift> gift);
+bool ShowTransferGiftLater(
+	std::shared_ptr<ChatHelpers::Show> show,
+	std::shared_ptr<Data::UniqueGift> gift);
+
+void SetThemeFromUniqueGift(
+	not_null<Window::SessionController*> window,
+	std::shared_ptr<Data::UniqueGift> unique);
+void SendPeerThemeChangeRequest(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> peer,
+	const QString &token,
+	const std::shared_ptr<Data::UniqueGift> &unique,
+	bool locallySet = false);
+void SetPeerTheme(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> peer,
+	const QString &token,
+	const std::shared_ptr<Ui::ChatTheme> &theme);
+
+void ShowActionLocked(
+	std::shared_ptr<ChatHelpers::Show> show,
+	const QString &slug);
diff --git a/Telegram/SourceFiles/boxes/translate_box.cpp b/Telegram/SourceFiles/boxes/translate_box.cpp
index 39380bd3ed5002..e91a5f4956f5de 100644
--- a/Telegram/SourceFiles/boxes/translate_box.cpp
+++ b/Telegram/SourceFiles/boxes/translate_box.cpp
@@ -6,8 +6,9 @@ For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "boxes/translate_box.h"
+#include "boxes/translate_box_content.h"
+#include "lang/translate_provider.h"
 
-#include "api/api_text_entities.h" // Api::EntitiesToMTP / EntitiesFromMTP.
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "core/ui_integration.h"
@@ -17,79 +18,17 @@ For license and copyright information please follow this link:
 #include "lang/lang_instance.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "mtproto/sender.h"
 #include "spellcheck/platform/platform_language.h"
 #include "ui/boxes/choose_language_box.h"
-#include "ui/effects/loading_element.h"
 #include "ui/layers/generic_box.h"
-#include "ui/text/text_utilities.h"
-#include "ui/vertical_list.h"
-#include "ui/painter.h"
-#include "ui/power_saving.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/labels.h"
 #include "ui/widgets/multi_select.h"
-#include "ui/wrap/fade_wrap.h"
-#include "ui/wrap/slide_wrap.h"
-#include "styles/style_boxes.h"
-#include "styles/style_chat_helpers.h"
-#include "styles/style_info.h" // inviteLinkListItem.
-#include "styles/style_layers.h"
-
-#include <QLocale>
+#include "ui/text/text_utilities.h"
 
 namespace Ui {
 namespace {
 
 constexpr auto kSkipAtLeastOneDuration = 3 * crl::time(1000);
 
-class ShowButton final : public RpWidget {
-public:
-	ShowButton(not_null<Ui::RpWidget*> parent);
-
-	[[nodiscard]] rpl::producer<Qt::MouseButton> clicks() const;
-
-protected:
-	void paintEvent(QPaintEvent *e) override;
-
-private:
-	LinkButton _button;
-
-};
-
-ShowButton::ShowButton(not_null<Ui::RpWidget*> parent)
-: RpWidget(parent)
-, _button(this, tr::lng_usernames_activate_confirm(tr::now)) {
-	_button.sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
-		resize(
-			s.width() + st::defaultEmojiSuggestions.fadeRight.width(),
-			s.height());
-		_button.moveToRight(0, 0);
-	}, lifetime());
-	_button.show();
-}
-
-void ShowButton::paintEvent(QPaintEvent *e) {
-	auto p = QPainter(this);
-	const auto clip = e->rect();
-
-	const auto &icon = st::defaultEmojiSuggestions.fadeRight;
-	const auto fade = QRect(0, 0, icon.width(), height());
-	if (fade.intersects(clip)) {
-		icon.fill(p, fade);
-	}
-	const auto fill = clip.intersected(
-		{ icon.width(), 0, width() - icon.width(), height() });
-	if (!fill.isEmpty()) {
-		p.fillRect(fill, st::boxBg);
-	}
-}
-
-rpl::producer<Qt::MouseButton> ShowButton::clicks() const {
-	return _button.clicks();
-}
-
 } // namespace
 
 void TranslateBox(
@@ -98,183 +37,53 @@ void TranslateBox(
 		MsgId msgId,
 		TextWithEntities text,
 		bool hasCopyRestriction) {
-	box->setWidth(st::boxWideWidth);
-	box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); });
-	const auto container = box->verticalLayout();
-
 	struct State {
-		State(not_null<Main::Session*> session) : api(&session->mtp()) {
+		State(not_null<Main::Session*> session)
+		: provider(CreateTranslateProvider(session)) {
 		}
 
-		MTP::Sender api;
+		std::unique_ptr<TranslateProvider> provider;
 		rpl::variable<LanguageId> to;
 	};
 	const auto state = box->lifetime().make_state<State>(&peer->session());
 	state->to = ChooseTranslateTo(peer->owner().history(peer));
-
-	if (!IsServerMsgId(msgId)) {
-		msgId = 0;
-	}
-
-	using Flag = MTPmessages_TranslateText::Flag;
-	const auto flags = msgId
-		? (Flag::f_peer | Flag::f_id)
-		: !text.text.isEmpty()
-		? Flag::f_text
-		: Flag(0);
-
-	const auto &stLabel = st::aboutLabel;
-	const auto lineHeight = stLabel.style.lineHeight;
-
-	Ui::AddSkip(container);
-	// Ui::AddSubsectionTitle(
-	// 	container,
-	// 	tr::lng_translate_box_original());
-
-	const auto animationsPaused = [] {
-		using Which = FlatLabel::WhichAnimationsPaused;
-		const auto emoji = On(PowerSaving::kEmojiChat);
-		const auto spoiler = On(PowerSaving::kChatSpoiler);
-		return emoji
-			? (spoiler ? Which::All : Which::CustomEmoji)
-			: (spoiler ? Which::Spoiler : Which::None);
-	};
-	const auto original = box->addRow(object_ptr<SlideWrap<FlatLabel>>(
-		box,
-		object_ptr<FlatLabel>(box, stLabel)));
-	{
-		if (hasCopyRestriction) {
-			original->entity()->setContextMenuHook([](auto&&) {
-			});
-		}
-		original->entity()->setAnimationsPausedCallback(animationsPaused);
-		original->entity()->setMarkedText(
-			text,
-			Core::MarkedTextContext{
-				.session = &peer->session(),
-				.customEmojiRepaint = [=] { original->entity()->update(); },
-			});
-		original->setMinimalHeight(lineHeight);
-		original->hide(anim::type::instant);
-
-		const auto show = Ui::CreateChild<FadeWrap<ShowButton>>(
-			container.get(),
-			object_ptr<ShowButton>(container));
-		show->hide(anim::type::instant);
-		rpl::combine(
-			container->widthValue(),
-			original->geometryValue()
-		) | rpl::start_with_next([=](int width, const QRect &rect) {
-			show->moveToLeft(
-				width - show->width() - st::boxRowPadding.right(),
-				rect.y() + std::abs(lineHeight - show->height()) / 2);
-		}, show->lifetime());
-		original->entity()->heightValue(
-		) | rpl::filter([](int height) {
-			return height > 0;
-		}) | rpl::take(1) | rpl::start_with_next([=](int height) {
-			if (height > lineHeight) {
-				show->show(anim::type::instant);
-			}
-		}, show->lifetime());
-		show->toggleOn(show->entity()->clicks() | rpl::map_to(false));
-		original->toggleOn(show->entity()->clicks() | rpl::map_to(true));
-	}
-	Ui::AddSkip(container);
-	Ui::AddSkip(container);
-	Ui::AddDivider(container);
-	Ui::AddSkip(container);
-
-	{
-		const auto padding = st::defaultSubsectionTitlePadding;
-		const auto subtitle = Ui::AddSubsectionTitle(
-			container,
-			state->to.value() | rpl::map(LanguageName));
-
-		// Workaround.
-		state->to.value() | rpl::start_with_next([=] {
-			subtitle->resizeToWidth(container->width()
-				- padding.left()
-				- padding.right());
-		}, subtitle->lifetime());
-	}
-
-	const auto translated = box->addRow(object_ptr<SlideWrap<FlatLabel>>(
-		box,
-		object_ptr<FlatLabel>(box, stLabel)));
-	translated->entity()->setSelectable(!hasCopyRestriction);
-	translated->entity()->setAnimationsPausedCallback(animationsPaused);
-
-	constexpr auto kMaxLines = 3;
-	container->resizeToWidth(box->width());
-	const auto loading = box->addRow(object_ptr<SlideWrap<RpWidget>>(
-		box,
-		CreateLoadingTextWidget(
-			box,
-			st::aboutLabel,
-			std::min(original->entity()->height() / lineHeight, kMaxLines),
-			state->to.value() | rpl::map([=](LanguageId id) {
-				return id.locale().textDirection() == Qt::RightToLeft;
-			}))));
-
-	const auto showText = [=](TextWithEntities text) {
-		const auto label = translated->entity();
-		label->setMarkedText(
-			text,
-			Core::MarkedTextContext{
-				.session = &peer->session(),
-				.customEmojiRepaint = [=] { label->update(); },
-			});
-		translated->show(anim::type::instant);
-		loading->hide(anim::type::instant);
-	};
-
-	const auto send = [=](LanguageId to) {
-		loading->show(anim::type::instant);
-		translated->hide(anim::type::instant);
-		state->api.request(MTPmessages_TranslateText(
-			MTP_flags(flags),
-			msgId ? peer->input : MTP_inputPeerEmpty(),
-			(msgId
-				? MTP_vector<MTPint>(1, MTP_int(msgId))
-				: MTPVector<MTPint>()),
-			(msgId
-				? MTPVector<MTPTextWithEntities>()
-				: MTP_vector<MTPTextWithEntities>(1, MTP_textWithEntities(
-					MTP_string(text.text),
-					Api::EntitiesToMTP(
-						&peer->session(),
-						text.entities,
-						Api::ConvertOption::SkipLocal)))),
-			MTP_string(to.twoLetterCode())
-		)).done([=](const MTPmessages_TranslatedText &result) {
-			const auto &data = result.data();
-			const auto &list = data.vresult().v;
-			if (list.isEmpty()) {
-				showText(
-					Ui::Text::Italic(tr::lng_translate_box_error(tr::now)));
-			} else {
-				showText(TextWithEntities{
-					.text = qs(list.front().data().vtext()),
-					.entities = Api::EntitiesFromMTP(
-						&peer->session(),
-						list.front().data().ventities().v),
+	const auto request = std::make_shared<TranslateProviderRequest>(
+		PrepareTranslateProviderRequest(
+			state->provider.get(),
+			peer,
+			msgId,
+			std::move(text)));
+
+	TranslateBoxContent(box, {
+		.text = request->text,
+		.hasCopyRestriction = hasCopyRestriction,
+		.textContext = Core::TextContext({ .session = &peer->session() }),
+		.to = state->to.value(),
+		.chooseTo = [=] {
+			box->uiShow()->showBox(ChooseTranslateToBox(
+				state->to.current(),
+				crl::guard(box, [=](LanguageId id) { state->to = id; })));
+		},
+		.request = [=](
+				LanguageId to,
+				Fn<void(TranslateBoxContentResult)> done) {
+			state->provider->request(
+				*request,
+				to,
+				[done = std::move(done)](TranslateProviderResult result) {
+					using ProviderError = TranslateProviderError;
+					using UiError = TranslateBoxContentError;
+					done(TranslateBoxContentResult{
+						.text = std::move(result.text),
+						.error = (result.error
+								== ProviderError::LocalLanguagePackMissing)
+							? UiError::LocalLanguagePackMissing
+							: (result.error == ProviderError::None)
+							? UiError::None
+							: UiError::Unknown,
+					});
 				});
-			}
-		}).fail([=](const MTP::Error &error) {
-			showText(
-				Ui::Text::Italic(tr::lng_translate_box_error(tr::now)));
-		}).send();
-	};
-	state->to.value() | rpl::start_with_next(send, box->lifetime());
-
-	box->addLeftButton(tr::lng_settings_language(), [=] {
-		if (loading->toggled()) {
-			return;
-		}
-		box->uiShow()->showBox(ChooseTranslateToBox(
-			state->to.current(),
-			crl::guard(box, [=](LanguageId id) { state->to = id; })));
+		},
 	});
 }
 
@@ -313,7 +122,7 @@ object_ptr<BoxContent> EditSkipTranslationLanguages() {
 	auto title = tr::lng_translate_settings_choose();
 	const auto selected = std::make_shared<std::vector<LanguageId>>(
 		Core::App().settings().skipTranslationLanguages());
-	const auto weak = std::make_shared<QPointer<BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<BoxContent>>();
 	const auto check = [=](LanguageId id) {
 		const auto already = ranges::contains(*selected, id);
 		if (already) {
@@ -322,7 +131,7 @@ object_ptr<BoxContent> EditSkipTranslationLanguages() {
 			selected->push_back(id);
 		}
 		if (already && selected->empty()) {
-			if (const auto strong = weak->data()) {
+			if (const auto strong = weak->get()) {
 				strong->showToast(
 					tr::lng_translate_settings_one(tr::now),
 					kSkipAtLeastOneDuration);
diff --git a/Telegram/SourceFiles/boxes/translate_box_content.cpp b/Telegram/SourceFiles/boxes/translate_box_content.cpp
new file mode 100644
index 00000000000000..1e86c1d585ee06
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/translate_box_content.cpp
@@ -0,0 +1,219 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/translate_box_content.h"
+
+#include "lang/lang_keys.h"
+#include "ui/boxes/choose_language_box.h"
+#include "ui/effects/loading_element.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/power_saving.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/slide_wrap.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_layers.h"
+
+namespace Ui {
+namespace {
+
+class ShowButton final : public RpWidget {
+public:
+	ShowButton(not_null<Ui::RpWidget*> parent);
+
+	[[nodiscard]] rpl::producer<Qt::MouseButton> clicks() const;
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	LinkButton _button;
+
+};
+
+ShowButton::ShowButton(not_null<Ui::RpWidget*> parent)
+: RpWidget(parent)
+, _button(this, tr::lng_usernames_activate_confirm(tr::now)) {
+	_button.sizeValue(
+	) | rpl::on_next([=](const QSize &s) {
+		resize(
+			s.width() + st::defaultEmojiSuggestions.fadeRight.width(),
+			s.height());
+		_button.moveToRight(0, 0);
+	}, lifetime());
+	_button.show();
+}
+
+void ShowButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	const auto clip = e->rect();
+
+	const auto &icon = st::defaultEmojiSuggestions.fadeRight;
+	const auto fade = QRect(0, 0, icon.width(), height());
+	if (fade.intersects(clip)) {
+		icon.fill(p, fade);
+	}
+	const auto fill = clip.intersected(
+		{ icon.width(), 0, width() - icon.width(), height() });
+	if (!fill.isEmpty()) {
+		p.fillRect(fill, st::boxBg);
+	}
+}
+
+rpl::producer<Qt::MouseButton> ShowButton::clicks() const {
+	return _button.clicks();
+}
+
+} // namespace
+
+void TranslateBoxContent(
+		not_null<GenericBox*> box,
+		TranslateBoxContentArgs &&args) {
+	box->setWidth(st::boxWideWidth);
+	box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); });
+	const auto container = box->verticalLayout();
+
+	const auto text = std::move(args.text);
+	const auto hasCopyRestriction = args.hasCopyRestriction;
+	const auto textContext = std::move(args.textContext);
+	const auto chooseTo = std::make_shared<Fn<void()>>(
+		std::move(args.chooseTo));
+	const auto request = std::make_shared<
+		Fn<void(LanguageId, Fn<void(TranslateBoxContentResult)>)>>(
+			std::move(args.request));
+
+	auto to = std::move(args.to) | rpl::start_spawning(box->lifetime());
+	const auto toTitle = rpl::duplicate(to) | rpl::map(LanguageName);
+	const auto toDirection = rpl::duplicate(to) | rpl::map([=](
+			LanguageId id) {
+		return id.locale().textDirection() == Qt::RightToLeft;
+	});
+
+	const auto &stLabel = st::aboutLabel;
+	const auto lineHeight = stLabel.style.lineHeight;
+
+	Ui::AddSkip(container);
+
+	const auto animationsPaused = [] {
+		using Which = FlatLabel::WhichAnimationsPaused;
+		const auto emoji = On(PowerSaving::kEmojiChat);
+		const auto spoiler = On(PowerSaving::kChatSpoiler);
+		return emoji
+			? (spoiler ? Which::All : Which::CustomEmoji)
+			: (spoiler ? Which::Spoiler : Which::None);
+	};
+	const auto original = box->addRow(object_ptr<SlideWrap<FlatLabel>>(
+		box,
+		object_ptr<FlatLabel>(box, stLabel)));
+	{
+		if (hasCopyRestriction) {
+			original->entity()->setContextMenuHook([](auto&&) {
+			});
+		}
+		original->entity()->setAnimationsPausedCallback(animationsPaused);
+		original->entity()->setMarkedText(text, textContext);
+		original->setMinimalHeight(lineHeight);
+		original->hide(anim::type::instant);
+
+		const auto show = Ui::CreateChild<FadeWrap<ShowButton>>(
+			container.get(),
+			object_ptr<ShowButton>(container));
+		show->hide(anim::type::instant);
+		rpl::combine(
+			container->widthValue(),
+			original->geometryValue()
+		) | rpl::on_next([=](int width, const QRect &rect) {
+			show->moveToLeft(
+				width - show->width() - st::boxRowPadding.right(),
+				rect.y() + std::abs(lineHeight - show->height()) / 2);
+		}, show->lifetime());
+		container->widthValue(
+		) | rpl::filter([](int width) {
+			return width > 0;
+		}) | rpl::take(1) | rpl::on_next([=](int width) {
+			if (original->entity()->textMaxWidth()
+				> (width - rect::m::sum::h(st::boxRowPadding))) {
+				show->show(anim::type::instant);
+			}
+		}, show->lifetime());
+		show->toggleOn(show->entity()->clicks() | rpl::map_to(false));
+		original->toggleOn(show->entity()->clicks() | rpl::map_to(true));
+	}
+	Ui::AddSkip(container);
+	Ui::AddSkip(container);
+	Ui::AddDivider(container);
+	Ui::AddSkip(container);
+
+	{
+		const auto padding = st::defaultSubsectionTitlePadding;
+		const auto subtitle = Ui::AddSubsectionTitle(container, std::move(toTitle));
+
+		rpl::duplicate(to) | rpl::on_next([=] {
+			subtitle->resizeToWidth(container->width()
+				- padding.left()
+				- padding.right());
+		}, subtitle->lifetime());
+	}
+
+	const auto translated = box->addRow(object_ptr<SlideWrap<FlatLabel>>(
+		box,
+		object_ptr<FlatLabel>(box, stLabel)));
+	translated->entity()->setSelectable(!hasCopyRestriction);
+	translated->entity()->setAnimationsPausedCallback(animationsPaused);
+
+	constexpr auto kMaxLines = 3;
+	container->resizeToWidth(box->width());
+	const auto loading = box->addRow(object_ptr<SlideWrap<RpWidget>>(
+		box,
+		CreateLoadingTextWidget(
+			box,
+			st::aboutLabel.style,
+			std::min(original->entity()->height() / lineHeight, kMaxLines),
+			std::move(toDirection))));
+
+	struct State {
+		int requestId = 0;
+	};
+	const auto state = box->lifetime().make_state<State>();
+
+	const auto showText = [=](TranslateBoxContentResult result) {
+		using UiError = TranslateBoxContentError;
+		auto value = result.text.value_or(
+			tr::italic(((result.error == UiError::LocalLanguagePackMissing)
+				? tr::lng_translate_box_error_language_pack_not_installed
+				: tr::lng_translate_box_error)(tr::now)));
+		translated->entity()->setMarkedText(value, textContext);
+		translated->show(anim::type::instant);
+		loading->hide(anim::type::instant);
+	};
+	const auto send = [=](LanguageId id) {
+		const auto requestId = ++state->requestId;
+		loading->show(anim::type::instant);
+		translated->hide(anim::type::instant);
+		(*request)(id, [=](TranslateBoxContentResult result) {
+			if (state->requestId != requestId) {
+				return;
+			}
+			showText(std::move(result));
+		});
+	};
+	std::move(to) | rpl::on_next(send, box->lifetime());
+
+	box->addLeftButton(tr::lng_settings_language(), [=] {
+		if (loading->toggled()) {
+			return;
+		}
+		(*chooseTo)();
+	});
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/translate_box_content.h b/Telegram/SourceFiles/boxes/translate_box_content.h
new file mode 100644
index 00000000000000..38e68804b74e07
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/translate_box_content.h
@@ -0,0 +1,44 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "spellcheck/platform/platform_language.h"
+
+namespace Ui::Text {
+struct MarkedContext;
+} // namespace Ui::Text
+
+namespace Ui {
+
+enum class TranslateBoxContentError {
+	None = 0,
+	Unknown,
+	LocalLanguagePackMissing,
+};
+
+struct TranslateBoxContentResult {
+	std::optional<TextWithEntities> text;
+	TranslateBoxContentError error = TranslateBoxContentError::None;
+};
+
+class GenericBox;
+
+struct TranslateBoxContentArgs {
+	TextWithEntities text;
+	bool hasCopyRestriction = false;
+	Text::MarkedContext textContext;
+	rpl::producer<LanguageId> to;
+	Fn<void()> chooseTo;
+	Fn<void(LanguageId, Fn<void(TranslateBoxContentResult)>)> request;
+};
+
+void TranslateBoxContent(
+	not_null<GenericBox*> box,
+	TranslateBoxContentArgs &&args);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/unconfirmed_auth_denied_box.cpp b/Telegram/SourceFiles/boxes/unconfirmed_auth_denied_box.cpp
new file mode 100644
index 00000000000000..65c0a46c0a0ed6
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/unconfirmed_auth_denied_box.cpp
@@ -0,0 +1,167 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/unconfirmed_auth_denied_box.h"
+
+#include "base/timer.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "settings/settings_common.h"
+#include "ui/effects/animation_value.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_boxes.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_layers.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
+
+namespace Dialogs {
+
+void ShowAuthDeniedBox(
+		not_null<Ui::GenericBox*> box,
+		float64 count,
+		const QString &messageText) {
+	box->setStyle(st::showOrBox);
+	box->setWidth(st::boxWideWidth);
+	const auto buttonPadding = QMargins(
+		st::showOrBox.buttonPadding.left(),
+		0,
+		st::showOrBox.buttonPadding.right(),
+		0);
+	auto icon = Settings::CreateLottieIcon(
+		box,
+		{
+			.name = u"ban"_q,
+			.sizeOverride = st::dialogsSuggestionDeniedAuthLottie,
+		},
+		st::dialogsSuggestionDeniedAuthLottieMargins);
+	Settings::AddLottieIconWithCircle(
+		box->verticalLayout(),
+		std::move(icon.widget),
+		st::settingsBlockedListIconPadding,
+		st::dialogsSuggestionDeniedAuthLottieCircle);
+	box->setShowFinishedCallback([=, animate = std::move(icon.animate)] {
+		animate(anim::repeat::once);
+	});
+	Ui::AddSkip(box->verticalLayout());
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_unconfirmed_auth_denied_title(
+				lt_count,
+				rpl::single(count)),
+			st::boostCenteredTitle),
+		st::showOrTitlePadding + buttonPadding,
+		style::al_top);
+	Ui::AddSkip(box->verticalLayout());
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			messageText,
+			st::boostText),
+		st::showOrAboutPadding + buttonPadding,
+		style::al_top);
+	Ui::AddSkip(box->verticalLayout());
+	const auto warning = box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_unconfirmed_auth_denied_warning(tr::bold),
+			st::boostText),
+		st::showOrAboutPadding + buttonPadding
+			+ QMargins(st::boostTextSkip, 0, st::boostTextSkip, 0),
+		style::al_top);
+	warning->setTextColorOverride(st::attentionButtonFg->c);
+	const auto warningBg = Ui::CreateChild<Ui::RpWidget>(
+		box->verticalLayout());
+	warning->geometryValue() | rpl::on_next([=](QRect r) {
+		warningBg->setGeometry(r + Margins(st::boostTextSkip));
+	}, warningBg->lifetime());
+	warningBg->paintOn([=](QPainter &p) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::attentionButtonBgOver);
+		p.drawRoundedRect(
+			warningBg->rect(),
+			st::buttonRadius,
+			st::buttonRadius);
+	});
+	warningBg->show();
+	warning->raise();
+	warningBg->stackUnder(warning);
+	const auto confirm = box->addButton(
+		object_ptr<Ui::RoundButton>(
+			box,
+			rpl::single(QString()),
+			st::defaultActiveButton));
+	confirm->setClickedCallback([=] {
+		box->closeBox();
+	});
+	confirm->resize(
+		st::showOrShowButton.width,
+		st::showOrShowButton.height);
+
+	const auto textLabel = Ui::CreateChild<Ui::FlatLabel>(
+		confirm,
+		tr::lng_archive_hint_button(),
+		st::defaultSubsectionTitle);
+	textLabel->setTextColorOverride(st::defaultActiveButton.textFg->c);
+	textLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	const auto timerLabel = Ui::CreateChild<Ui::FlatLabel>(
+		confirm,
+		rpl::single(QString()),
+		st::defaultSubsectionTitle);
+	timerLabel->setTextColorOverride(
+		anim::with_alpha(st::defaultActiveButton.textFg->c, 0.75));
+	timerLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	constexpr auto kTimer = 5;
+	const auto remaining = confirm->lifetime().make_state<int>(kTimer);
+	const auto timerLifetime
+		= confirm->lifetime().make_state<rpl::lifetime>();
+	const auto timer = timerLifetime->make_state<base::Timer>([=] {
+		if ((*remaining) > 0) {
+			timerLabel->setText(QString::number((*remaining)--));
+		} else {
+			timerLabel->hide();
+			confirm->setAttribute(Qt::WA_TransparentForMouseEvents, false);
+			box->setCloseByEscape(true);
+			box->setCloseByOutsideClick(true);
+			timerLifetime->destroy();
+		}
+	});
+	box->setCloseByEscape(false);
+	box->setCloseByOutsideClick(false);
+	confirm->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+	timerLabel->setText(QString::number((*remaining)));
+	timer->callEach(1000);
+
+	rpl::combine(
+		confirm->sizeValue(),
+		textLabel->sizeValue(),
+		timerLabel->sizeValue(),
+		timerLabel->shownValue()
+	) | rpl::on_next([=](QSize btn, QSize text, QSize timer, bool shown) {
+		const auto skip = st::normalFont->spacew;
+		const auto totalWidth = shown
+			? (text.width() + skip + timer.width())
+			: text.width();
+		const auto left = (btn.width() - totalWidth) / 2;
+		textLabel->moveToLeft(left, (btn.height() - text.height()) / 2);
+		timerLabel->moveToLeft(
+			left + text.width() + skip,
+			(btn.height() - timer.height()) / 2);
+	}, confirm->lifetime());
+}
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/boxes/unconfirmed_auth_denied_box.h b/Telegram/SourceFiles/boxes/unconfirmed_auth_denied_box.h
new file mode 100644
index 00000000000000..9ed87967cc8708
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/unconfirmed_auth_denied_box.h
@@ -0,0 +1,21 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+namespace Dialogs {
+
+void ShowAuthDeniedBox(
+	not_null<Ui::GenericBox*> box,
+	float64 count,
+	const QString &messageText);
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/boxes/url_auth_box.cpp b/Telegram/SourceFiles/boxes/url_auth_box.cpp
index ef72584cf5f168..13649dca8cef36 100644
--- a/Telegram/SourceFiles/boxes/url_auth_box.cpp
+++ b/Telegram/SourceFiles/boxes/url_auth_box.cpp
@@ -7,24 +7,219 @@ For license and copyright information please follow this link:
 */
 #include "boxes/url_auth_box.h"
 
-#include "boxes/abstract_box.h"
-#include "history/history.h"
-#include "history/history_item.h"
-#include "history/history_item_components.h"
+#include "apiwrap.h"
+#include "boxes/url_auth_box_content.h"
+#include "chat_helpers/stickers_emoji_pack.h"
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "data/data_peer.h"
 #include "data/data_session.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_user.h"
-#include "core/click_handler_types.h"
-#include "ui/text/text_utilities.h"
-#include "ui/wrap/vertical_layout.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/labels.h"
+#include "history/history_item_components.h"
+#include "history/history_item.h"
+#include "history/history.h"
+#include "info/profile/info_profile_values.h"
 #include "lang/lang_keys.h"
+#include "main/main_account.h"
+#include "main/main_domain.h"
 #include "main/main_session.h"
-#include "apiwrap.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/dynamic_thumbnails.h"
+#include "ui/emoji_config.h"
+#include "ui/layers/generic_box.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/menu/menu_action.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
+#include "styles/style_settings.h"
+#include "styles/style_premium.h"
+#include "styles/style_window.h"
+
+namespace UrlAuthBox {
+namespace {
+
+using AnotherSessionFactory = Fn<not_null<Main::Session*>()>;
+using OnUserChangedCallback = Fn<void(Fn<void()>)>;
+
+struct SwitchAccountResult {
+	Ui::RpWidget *widget = nullptr;
+	AnotherSessionFactory anotherSession;
+	OnUserChangedCallback setOnUserChanged;
+	Fn<void(UserId)> updateUserIdHint;
+};
+
+[[nodiscard]] std::shared_ptr<Ui::DynamicImage> MakeMatchCodeImage(
+		not_null<Main::Session*> session,
+		const QString &code) {
+	auto emojiLength = 0;
+	const auto emoji = Ui::Emoji::Find(code, &emojiLength);
+	if (!emoji || emojiLength != code.size()) {
+		return nullptr;
+	}
+	const auto makeFor = [&](not_null<Main::Session*> source) {
+		if (const auto sticker = source->emojiStickersPack()
+				.stickerForEmoji(emoji)) {
+			return Ui::MakeEmojiThumbnail(
+				&source->data(),
+				Data::SerializeCustomEmojiId(sticker.document),
+				nullptr,
+				nullptr,
+				1);
+		}
+		return std::shared_ptr<Ui::DynamicImage>();
+	};
+	if (session->isTestMode()) {
+		for (const auto &account : Core::App().domain().orderedAccounts()) {
+			if (!account->sessionExists()
+				|| account->session().isTestMode()) {
+				continue;
+			}
+			if (const auto image = makeFor(&account->session())) {
+				return image;
+			}
+		}
+	}
+	return makeFor(session);
+}
 
-void UrlAuthBox::Activate(
+[[nodiscard]] SwitchAccountResult AddAccountsMenu(
+		not_null<Ui::RpWidget*> parent,
+		UserId userIdHint = UserId()) {
+	const auto session = &Core::App().domain().active().session();
+	const auto widget = Ui::CreateChild<SwitchableUserpicButton>(
+		parent,
+		st::restoreUserpicIcon.photoSize + st::lineWidth * 8);
+	struct State {
+		base::unique_qptr<Ui::PopupMenu> menu;
+		UserData *currentUser = nullptr;
+		Fn<void()> onUserChanged;
+	};
+	const auto state = widget->lifetime().make_state<State>();
+
+	const auto isCurrentTest = session->isTestMode();
+	const auto findHintedUser = [&]() -> UserData* {
+		if (!userIdHint) {
+			return session->user().get();
+		}
+		for (const auto &account : Core::App().domain().orderedAccounts()) {
+			if (!account->sessionExists()
+				|| (account->session().isTestMode() != isCurrentTest)) {
+				continue;
+			}
+			if (account->session().userId() == userIdHint) {
+				return account->session().user();
+			}
+		}
+		return session->user().get();
+	};
+
+	state->currentUser = findHintedUser();
+	const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+		parent,
+		state->currentUser,
+		st::restoreUserpicIcon);
+	widget->setUserpic(userpic);
+	const auto filtered = [=] {
+		auto result = std::vector<not_null<Main::Session*>>();
+		for (const auto &account : Core::App().domain().orderedAccounts()) {
+			if (!account->sessionExists()
+				|| (account->session().user() == state->currentUser)
+				|| (account->session().isTestMode() != isCurrentTest)) {
+				continue;
+			}
+			result.push_back(&account->session());
+		}
+		return result;
+	};
+	const auto isSingle = filtered().empty();
+	widget->setExpanded(!isSingle);
+	widget->setAttribute(Qt::WA_TransparentForMouseEvents, isSingle);
+	widget->setClickedCallback([=] {
+		const auto &st = st::popupMenuWithIcons;
+		state->menu = base::make_unique_q<Ui::PopupMenu>(widget, st);
+		for (const auto &anotherSession : filtered()) {
+			const auto user = anotherSession->user();
+			const auto action = new QAction(user->name(), state->menu);
+			QObject::connect(action, &QAction::triggered, [=] {
+				state->currentUser = user;
+				const auto newUserpic = Ui::CreateChild<Ui::UserpicButton>(
+					parent,
+					user,
+					st::restoreUserpicIcon);
+				widget->setUserpic(newUserpic);
+				if (state->onUserChanged) {
+					state->onUserChanged();
+				}
+			});
+			auto owned = base::make_unique_q<Ui::Menu::Action>(
+				state->menu->menu(),
+				state->menu->menu()->st(),
+				action,
+				nullptr,
+				nullptr);
+			const auto menuUserpic = Ui::CreateChild<Ui::UserpicButton>(
+				owned.get(),
+				user,
+				st::lockSetupEmailUserpicSmall);
+			menuUserpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+			menuUserpic->move(st.menu.itemIconPosition);
+			state->menu->addAction(std::move(owned));
+		}
+
+		state->menu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
+		state->menu->popup(
+			widget->mapToGlobal(
+				QPoint(
+					widget->width()
+						+ Ui::BoxShadow::ExtendFor(st.shadow).right(),
+					widget->height())));
+	});
+	return {
+		widget,
+		[=] { return &state->currentUser->session(); },
+		[=](Fn<void()> callback) { state->onUserChanged = callback; },
+		[=](UserId newUserIdHint) {
+			const auto isCurrentTest = session->isTestMode();
+			for (const auto &acc : Core::App().domain().orderedAccounts()) {
+				if (!acc->sessionExists()
+					|| (acc->session().isTestMode() != isCurrentTest)) {
+					continue;
+				}
+				if (acc->session().userId() == newUserIdHint) {
+					state->currentUser = acc->session().user();
+					const auto next = Ui::CreateChild<Ui::UserpicButton>(
+						parent,
+						state->currentUser,
+						st::restoreUserpicIcon);
+					widget->setUserpic(next);
+					break;
+				}
+			}
+		},
+	};
+}
+
+} // namespace
+
+void RequestButton(
+	std::shared_ptr<Ui::Show> show,
+	const MTPDurlAuthResultRequest &request,
+	not_null<const HistoryItem*> message,
+	int row,
+	int column);
+void RequestUrl(
+	std::shared_ptr<Ui::Show> show,
+	const MTPDurlAuthResultRequest &request,
+	not_null<Main::Session*> session,
+	const QString &url,
+	QVariant context);
+
+void ActivateButton(
+		std::shared_ptr<Ui::Show> show,
 		not_null<const HistoryItem*> message,
 		int row,
 		int column) {
@@ -38,7 +233,7 @@ void UrlAuthBox::Activate(
 		return;
 	}
 	const auto session = &message->history()->session();
-	const auto inputPeer = message->history()->peer->input;
+	const auto inputPeer = message->history()->peer->input();
 	const auto buttonId = button->buttonId;
 	const auto url = QString::fromUtf8(button->data);
 
@@ -48,7 +243,8 @@ void UrlAuthBox::Activate(
 		inputPeer,
 		MTP_int(itemId.msg),
 		MTP_int(buttonId),
-		MTPstring() // #TODO auth url
+		MTPstring(), // #TODO auth url
+		MTPstring() // in_app_origin
 	)).done([=](const MTPUrlAuthResult &result) {
 		const auto button = HistoryMessageMarkupButton::Get(
 			&session->data(),
@@ -61,12 +257,14 @@ void UrlAuthBox::Activate(
 
 		button->requestId = 0;
 		result.match([&](const MTPDurlAuthResultAccepted &data) {
-			UrlClickHandler::Open(qs(data.vurl()));
+			if (const auto url = data.vurl()) {
+				UrlClickHandler::Open(qs(url->v));
+			}
 		}, [&](const MTPDurlAuthResultDefault &data) {
 			HiddenUrlClickHandler::Open(url);
 		}, [&](const MTPDurlAuthResultRequest &data) {
 			if (const auto item = session->data().message(itemId)) {
-				Request(data, item, row, column);
+				RequestButton(show, data, item, row, column);
 			}
 		});
 	}).fail([=] {
@@ -75,14 +273,17 @@ void UrlAuthBox::Activate(
 			itemId,
 			row,
 			column);
-		if (!button) return;
+		if (!button) {
+			return;
+		}
 
 		button->requestId = 0;
 		HiddenUrlClickHandler::Open(url);
 	}).send();
 }
 
-void UrlAuthBox::Activate(
+void ActivateUrl(
+		std::shared_ptr<Ui::Show> show,
 		not_null<Main::Session*> session,
 		const QString &url,
 		QVariant context) {
@@ -98,21 +299,28 @@ void UrlAuthBox::Activate(
 		MTPInputPeer(),
 		MTPint(), // msg_id
 		MTPint(), // button_id
-		MTP_string(url)
+		MTP_string(url),
+		MTPstring() // in_app_origin
 	)).done([=](const MTPUrlAuthResult &result) {
 		result.match([&](const MTPDurlAuthResultAccepted &data) {
-			UrlClickHandler::Open(qs(data.vurl()), context);
+			UrlClickHandler::Open(qs(data.vurl().value_or_empty()), context);
 		}, [&](const MTPDurlAuthResultDefault &data) {
 			HiddenUrlClickHandler::Open(url, context);
 		}, [&](const MTPDurlAuthResultRequest &data) {
-			Request(data, session, url, context);
+			RequestUrl(show, data, session, url, context);
 		});
-	}).fail([=] {
-		HiddenUrlClickHandler::Open(url, context);
+	}).fail([=](const MTP::Error &error) {
+		if (error.type() == u"URL_EXPIRED"_q) {
+			show->showToast(
+				tr::lng_url_auth_phone_toast_bad_expired(tr::now));
+		} else {
+			HiddenUrlClickHandler::Open(url, context);
+		}
 	}).send();
 }
 
-void UrlAuthBox::Request(
+void RequestButton(
+		std::shared_ptr<Ui::Show> show,
 		const MTPDurlAuthResultRequest &request,
 		not_null<const HistoryItem*> message,
 		int row,
@@ -123,42 +331,60 @@ void UrlAuthBox::Request(
 		itemId,
 		row,
 		column);
-	if (button->requestId || !message->isRegular()) {
+	if (!button || button->requestId || !message->isRegular()) {
 		return;
 	}
 	const auto session = &message->history()->session();
-	const auto inputPeer = message->history()->peer->input;
+	const auto inputPeer = message->history()->peer->input();
 	const auto buttonId = button->buttonId;
 	const auto url = QString::fromUtf8(button->data);
 
 	const auto bot = request.is_request_write_access()
 		? session->data().processUser(request.vbot()).get()
 		: nullptr;
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
-	const auto finishWithUrl = [=](const QString &url) {
+	const auto box = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
+	const auto finishWithUrl = [=](const QString &url, bool accepted) {
 		if (*box) {
 			(*box)->closeBox();
 		}
-		UrlClickHandler::Open(url);
+		if (url.isEmpty() && accepted) {
+			show->showToast(tr::lng_passport_success(tr::now));
+		} else {
+			UrlClickHandler::Open(url);
+		}
 	};
 	const auto callback = [=](Result result) {
-		if (result == Result::None) {
-			finishWithUrl(url);
-		} else if (const auto msg = session->data().message(itemId)) {
-			const auto allowWrite = (result == Result::AuthAndAllowWrite);
+		if (!result.auth) {
+			session->api().request(MTPmessages_DeclineUrlAuth(
+				MTP_string(url)
+			)).send();
+			finishWithUrl(url, false);
+		} else if (session->data().message(itemId)) {
 			using Flag = MTPmessages_AcceptUrlAuth::Flag;
-			const auto flags = (allowWrite ? Flag::f_write_allowed : Flag(0))
+			const auto flags = Flag(0)
+				| (result.allowWrite ? Flag::f_write_allowed : Flag(0))
+				| (result.sharePhone ? Flag::f_share_phone_number : Flag(0))
+				| (result.matchCode.isEmpty() ? Flag(0) : Flag::f_match_code)
 				| (Flag::f_peer | Flag::f_msg_id | Flag::f_button_id);
 			session->api().request(MTPmessages_AcceptUrlAuth(
 				MTP_flags(flags),
 				inputPeer,
 				MTP_int(itemId.msg),
 				MTP_int(buttonId),
-				MTPstring() // #TODO auth url
+				MTPstring(),
+				result.matchCode.isEmpty()
+					? MTPstring()
+					: MTP_string(result.matchCode)
 			)).done([=](const MTPUrlAuthResult &result) {
+				const auto accepted = result.match(
+				[](const MTPDurlAuthResultAccepted &data) {
+					return true;
+				}, [](const auto &) {
+					return false;
+				});
 				const auto to = result.match(
 				[&](const MTPDurlAuthResultAccepted &data) {
-					return qs(data.vurl());
+					return qs(data.vurl().value_or_empty());
 				}, [&](const MTPDurlAuthResultDefault &data) {
 					return url;
 				}, [&](const MTPDurlAuthResultRequest &data) {
@@ -166,50 +392,113 @@ void UrlAuthBox::Request(
 						"got urlAuthResultRequest after acceptUrlAuth."));
 					return url;
 				});
-				finishWithUrl(to);
+				finishWithUrl(to, accepted);
 			}).fail([=] {
-				finishWithUrl(url);
+				finishWithUrl(url, false);
 			}).send();
 		}
 	};
-	*box = Ui::show(
-		Box<UrlAuthBox>(session, url, qs(request.vdomain()), bot, callback),
+	const auto displayName = request.is_is_app()
+		? (request.vverified_app_name()
+			? qs(*request.vverified_app_name())
+			: tr::lng_url_auth_unverified_app(tr::now))
+		: qs(request.vdomain());
+	*box = show->show(
+		Box(
+			Show,
+			url,
+			displayName,
+			session->user()->name(),
+			bot ? bot->firstName : QString(),
+			callback),
 		Ui::LayerOption::KeepOther);
 }
 
-void UrlAuthBox::Request(
+void RequestUrl(
+		std::shared_ptr<Ui::Show> show,
 		const MTPDurlAuthResultRequest &request,
 		not_null<Main::Session*> session,
 		const QString &url,
 		QVariant context) {
+	struct State {
+		base::weak_qptr<Ui::BoxContent> box;
+		AnotherSessionFactory anotherSession = nullptr;
+		QString firstMatchCode;
+		rpl::lifetime boxDeclineLifetime;
+		rpl::lifetime matchCodesBoxDeclineLifetime;
+	};
 	const auto bot = request.is_request_write_access()
 		? session->data().processUser(request.vbot()).get()
 		: nullptr;
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
-	const auto finishWithUrl = [=](const QString &url) {
-		if (*box) {
-			(*box)->closeBox();
+	const auto requestPhone = request.is_request_phone_number();
+	const auto matchCodesFirst = request.is_match_codes_first();
+	const auto isApp = request.is_is_app();
+	const auto domain = isApp
+		? (request.vverified_app_name()
+			? qs(*request.vverified_app_name())
+			: tr::lng_url_auth_unverified_app(tr::now))
+		: qs(request.vdomain());
+	const auto userIdHint = request.vuser_id_hint()
+		? peerToUser(peerFromUser(*request.vuser_id_hint()))
+		: UserId();
+	const auto matchCodes = [&] {
+		auto result = QStringList();
+		if (const auto codes = request.vmatch_codes()) {
+			for (const auto &code : codes->v) {
+				result.push_back(qs(code));
+			}
+		}
+		return result;
+	}();
+	const auto state = std::make_shared<State>();
+	const auto finishWithUrl = [=](const QString &to, bool accepted) {
+		if (state->box) {
+			state->box->closeBox();
+		}
+
+		if ((to.isEmpty() && accepted) || (to == url)) {
+		} else {
+			UrlClickHandler::Open(to, context);
 		}
-		UrlClickHandler::Open(url, context);
 	};
-	const auto callback = [=](Result result) {
-		if (result == Result::None) {
-			finishWithUrl(url);
+	const auto resolveSession = [=] {
+		return state->anotherSession ? state->anotherSession() : session;
+	};
+	const auto requestDecline = [=] {
+		resolveSession()->api().request(MTPmessages_DeclineUrlAuth(
+			MTP_string(url)
+		)).send();
+	};
+	const auto sendRequest = [=](Result result) {
+		if (!result.auth) {
+			requestDecline();
+			finishWithUrl(url, false);
 		} else {
-			const auto allowWrite = (result == Result::AuthAndAllowWrite);
+			const auto sharePhone = result.sharePhone;
 			using Flag = MTPmessages_AcceptUrlAuth::Flag;
-			const auto flags = (allowWrite ? Flag::f_write_allowed : Flag(0))
-				| Flag::f_url;
-			session->api().request(MTPmessages_AcceptUrlAuth(
+			const auto flags = Flag::f_url
+				| (result.allowWrite ? Flag::f_write_allowed : Flag(0))
+				| (sharePhone ? Flag::f_share_phone_number : Flag(0))
+				| (result.matchCode.isEmpty() ? Flag(0) : Flag::f_match_code);
+			resolveSession()->api().request(MTPmessages_AcceptUrlAuth(
 				MTP_flags(flags),
 				MTPInputPeer(),
 				MTPint(), // msg_id
 				MTPint(), // button_id
-				MTP_string(url)
+				MTP_string(url),
+				result.matchCode.isEmpty()
+					? MTPstring()
+					: MTP_string(result.matchCode)
 			)).done([=](const MTPUrlAuthResult &result) {
+				const auto accepted = result.match(
+				[](const MTPDurlAuthResultAccepted &data) {
+					return true;
+				}, [](const auto &) {
+					return false;
+				});
 				const auto to = result.match(
 				[&](const MTPDurlAuthResultAccepted &data) {
-					return qs(data.vurl());
+					return qs(data.vurl().value_or_empty());
 				}, [&](const MTPDurlAuthResultDefault &data) {
 					return url;
 				}, [&](const MTPDurlAuthResultRequest &data) {
@@ -217,97 +506,198 @@ void UrlAuthBox::Request(
 						"got urlAuthResultRequest after acceptUrlAuth."));
 					return url;
 				});
-				finishWithUrl(to);
+				finishWithUrl(to, accepted);
+				const auto domainWrapped = isApp
+					? tr::bold(domain)
+					: tr::link(domain);
+				show->showToast(Ui::Toast::Config{
+					.title = tr::lng_url_auth_phone_toast_good_title(tr::now),
+					.text = ((requestPhone && !sharePhone)
+						? tr::lng_url_auth_phone_toast_good_no_phone
+						: tr::lng_url_auth_phone_toast_good)(
+							tr::now,
+							lt_domain,
+							domainWrapped,
+							tr::marked),
+					.duration = crl::time(4000),
+				});
 			}).fail([=] {
-				finishWithUrl(url);
+				const auto domainWrapped = isApp
+					? tr::bold(domain)
+					: tr::link(domain);
+				show->showToast(Ui::Toast::Config{
+					.title = tr::lng_url_auth_phone_toast_bad_title(tr::now),
+					.text = tr::lng_url_auth_phone_toast_bad(
+						tr::now,
+						lt_domain,
+						domainWrapped,
+						tr::marked),
+					.duration = crl::time(4000),
+				});
+				finishWithUrl(url, false);
 			}).send();
 		}
 	};
-	*box = Ui::show(
-		Box<UrlAuthBox>(session, url, qs(request.vdomain()), bot, callback),
-		Ui::LayerOption::KeepOther);
-}
-
-UrlAuthBox::UrlAuthBox(
-	QWidget*,
-	not_null<Main::Session*> session,
-	const QString &url,
-	const QString &domain,
-	UserData *bot,
-	Fn<void(Result)> callback)
-: _content(setupContent(session, url, domain, bot, std::move(callback))) {
-}
-
-void UrlAuthBox::prepare() {
-	setDimensionsToContent(st::boxWidth, _content);
-	addButton(tr::lng_open_link(), [=] { _callback(); });
-	addButton(tr::lng_cancel(), [=] { closeBox(); });
-}
+	const auto browser = qs(request.vbrowser().value_or("Unknown browser"));
+	const auto device = qs(request.vplatform().value_or("Unknown platform"));
+	const auto ip = qs(request.vip().value_or("Unknown IP"));
+	const auto region = qs(request.vregion().value_or("Unknown region"));
+	const auto showAuthBox = [=] {
+		state->box = show->show(Box([=](not_null<Ui::GenericBox*> box) {
+			const auto accountResult = box->lifetime().make_state<
+				SwitchAccountResult>(nullptr);
+			const auto matchCodesShared = box->lifetime().make_state<
+				rpl::variable<QStringList>>(matchCodes);
+			const auto reloadRequest = [=] {
+				using Flag = MTPmessages_RequestUrlAuth::Flag;
+				const auto currentSession = resolveSession();
+				currentSession->api().request(MTPmessages_RequestUrlAuth(
+					MTP_flags(Flag::f_url),
+					MTPInputPeer(),
+					MTPint(), // msg_id
+					MTPint(), // button_id
+					MTP_string(url),
+					MTPstring() // in_app_origin
+				)).done(crl::guard(box, [=](const MTPUrlAuthResult &result) {
+					result.match([&](const MTPDurlAuthResultRequest &data) {
+						const auto newUserId = data.vuser_id_hint()
+							? peerToUser(peerFromUser(*data.vuser_id_hint()))
+							: UserId();
+						accountResult->updateUserIdHint(newUserId);
+						auto newCodes = QStringList();
+						if (const auto codes = data.vmatch_codes()) {
+							for (const auto &code : codes->v) {
+								newCodes.push_back(qs(code));
+							}
+						}
+						*matchCodesShared = newCodes;
+					}, [](const auto &) {});
+				})).send();
+			};
+			const auto callback = [=](Result result) {
+				state->boxDeclineLifetime.destroy();
+				if (result.matchCode.isEmpty()
+					&& !state->firstMatchCode.isEmpty()) {
+					result.matchCode = state->firstMatchCode;
+				}
+				if (!requestPhone) {
+					return sendRequest(result);
+				}
+				box->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
+					box->setTitle(tr::lng_url_auth_phone_sure_title());
+					const auto confirm = [=](bool confirmed) {
+						return [=](Fn<void()> close) {
+							auto copy = result;
+							copy.sharePhone = confirmed;
+							sendRequest(copy);
+							close();
+						};
+					};
+					const auto currentSession = resolveSession();
+					const auto capitalized = [=](const QString &v) {
+						return v.left(1).toUpper() + v.mid(1).toLower();
+					};
+					using namespace Info::Profile;
+					Ui::ConfirmBox(
+						box,
+						Ui::ConfirmBoxArgs{
+							.text = tr::lng_url_auth_phone_sure_text(
+								lt_domain,
+								rpl::single(
+									tr::bold(isApp
+										? domain
+										: capitalized(domain))),
+								lt_phone,
+								PhoneValue(currentSession->user()),
+								tr::rich),
+							.confirmed = confirm(true),
+							.cancelled = confirm(false),
+							.confirmText = tr::lng_allow_bot(),
+							.cancelText = tr::lng_url_auth_phone_sure_deny(),
+						});
+				}));
+			};
+			ShowDetails(
+				box,
+				url,
+				domain,
+				[=](QString code) -> std::shared_ptr<Ui::DynamicImage> {
+					return MakeMatchCodeImage(resolveSession(), code);
+				},
+				callback,
+				(bot
+					? object_ptr<Ui::UserpicButton>(
+						box->verticalLayout(),
+						bot,
+						st::defaultUserpicButton,
+						Ui::PeerUserpicShape::Forum)
+					: nullptr),
+				bot ? Info::Profile::NameValue(bot) : nullptr,
+				browser,
+				device,
+				ip,
+				region,
+				(matchCodesFirst
+					? (rpl::single(QStringList()) | rpl::type_erased)
+					: matchCodesShared->value()),
+				isApp);
 
-not_null<Ui::RpWidget*> UrlAuthBox::setupContent(
-		not_null<Main::Session*> session,
-		const QString &url,
-		const QString &domain,
-		UserData *bot,
-		Fn<void(Result)> callback) {
-	const auto result = Ui::CreateChild<Ui::VerticalLayout>(this);
-	result->add(
-		object_ptr<Ui::FlatLabel>(
-			result,
-			tr::lng_url_auth_open_confirm(tr::now, lt_link, url),
-			st::boxLabel),
-		st::boxPadding);
-	const auto addCheckbox = [&](const TextWithEntities &text) {
-		const auto checkbox = result->add(
-			object_ptr<Ui::Checkbox>(
-				result,
-				text,
-				true,
-				st::urlAuthCheckbox),
-			style::margins(
-				st::boxPadding.left(),
-				st::boxPadding.bottom(),
-				st::boxPadding.right(),
-				st::boxPadding.bottom()));
-		checkbox->setAllowTextLines();
-		return checkbox;
+			*accountResult = AddAccountsMenu(
+				box->verticalLayout(),
+				userIdHint);
+			box->verticalLayout()->widthValue(
+			) | rpl::on_next([=, w = (*accountResult).widget] {
+				w->moveToRight(st::lineWidth * 4, 0);
+			}, (*accountResult).widget->lifetime());
+			state->anotherSession = (*accountResult).anotherSession;
+			(*accountResult).setOnUserChanged(reloadRequest);
+		}));
+		state->box->boxClosing() | rpl::on_next([=] {
+			requestDecline();
+		}, state->boxDeclineLifetime);
 	};
-	const auto auth = addCheckbox(
-		tr::lng_url_auth_login_option(
-			tr::now,
-			lt_domain,
-			Ui::Text::Bold(domain),
-			lt_user,
-			Ui::Text::Bold(session->user()->name()),
-			Ui::Text::WithEntities));
-	const auto allow = bot
-		? addCheckbox(tr::lng_url_auth_allow_messages(
-			tr::now,
-			lt_bot,
-			Ui::Text::Bold(bot->firstName),
-			Ui::Text::WithEntities))
-		: nullptr;
-	if (allow) {
-		rpl::single(
-			auth->checked()
-		) | rpl::then(
-			auth->checkedChanges()
-		) | rpl::start_with_next([=](bool checked) {
-			if (!checked) {
-				allow->setChecked(false);
-			}
-			allow->setDisabled(!checked);
-		}, auth->lifetime());
+	if (!matchCodesFirst || matchCodes.isEmpty()) {
+		showAuthBox();
+		return;
 	}
-	_callback = [=, callback = std::move(callback)]() {
-		const auto authed = auth->checked();
-		const auto allowed = (authed && allow && allow->checked());
-		const auto onstack = callback;
-		onstack(allowed
-			? Result::AuthAndAllowWrite
-			: authed
-			? Result::Auth
-			: Result::None);
-	};
-	return result;
+	auto matchCodesBox = base::weak_qptr<Ui::BoxContent>();
+	matchCodesBox = show->show(
+		Box([=](not_null<Ui::GenericBox*> matchBox) {
+			ShowMatchCodesBox(
+				matchBox,
+				[=](QString code) -> std::shared_ptr<Ui::DynamicImage> {
+					return MakeMatchCodeImage(resolveSession(), code);
+				},
+				domain,
+				matchCodes,
+				[=](QString matchCode) {
+					state->matchCodesBoxDeclineLifetime.destroy();
+					resolveSession()->api().request(
+						MTPmessages_CheckUrlAuthMatchCode(
+							MTP_string(url),
+							MTP_string(matchCode))
+					).done([=](const MTPBool &result) {
+						if (!mtpIsTrue(result)) {
+							show->showToast(
+								tr::lng_url_auth_phone_toast_bad_expired(
+									tr::now));
+							return;
+						}
+						state->firstMatchCode = std::move(matchCode);
+						showAuthBox();
+					}).fail([=](const MTP::Error &error) {
+						show->showToast((error.type() == u"URL_EXPIRED"_q)
+							? tr::lng_url_auth_phone_toast_bad_expired(
+								tr::now)
+							: error.type());
+					}).send();
+				},
+				isApp);
+		}),
+		Ui::LayerOption::KeepOther);
+	matchCodesBox->boxClosing() | rpl::on_next([=] {
+		requestDecline();
+	}, state->matchCodesBoxDeclineLifetime);
 }
+
+} // namespace UrlAuthBox
diff --git a/Telegram/SourceFiles/boxes/url_auth_box.h b/Telegram/SourceFiles/boxes/url_auth_box.h
index f48af2082696cd..09416d09089339 100644
--- a/Telegram/SourceFiles/boxes/url_auth_box.h
+++ b/Telegram/SourceFiles/boxes/url_auth_box.h
@@ -7,8 +7,6 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "ui/layers/box_content.h"
-
 class HistoryItem;
 struct HistoryMessageMarkupButton;
 
@@ -16,56 +14,22 @@ namespace Main {
 class Session;
 } // namespace Main
 
-class UrlAuthBox : public Ui::BoxContent {
-public:
-	static void Activate(
-		not_null<const HistoryItem*> message,
-		int row,
-		int column);
-	static void Activate(
-		not_null<Main::Session*> session,
-		const QString &url,
-		QVariant context);
-
-protected:
-	void prepare() override;
-
-private:
-	static void Request(
-		const MTPDurlAuthResultRequest &request,
-		not_null<const HistoryItem*> message,
-		int row,
-		int column);
-	static void Request(
-		const MTPDurlAuthResultRequest &request,
-		not_null<Main::Session*> session,
-		const QString &url,
-		QVariant context);
-
-	enum class Result {
-		None,
-		Auth,
-		AuthAndAllowWrite,
-	};
-
-public:
-	UrlAuthBox(
-		QWidget*,
-		not_null<Main::Session*> session,
-		const QString &url,
-		const QString &domain,
-		UserData *bot,
-		Fn<void(Result)> callback);
-
-private:
-	not_null<Ui::RpWidget*> setupContent(
-		not_null<Main::Session*> session,
-		const QString &url,
-		const QString &domain,
-		UserData *bot,
-		Fn<void(Result)> callback);
-
-	Fn<void()> _callback;
-	not_null<Ui::RpWidget*> _content;
-
-};
+namespace Ui {
+class GenericBox;
+class Show;
+} // namespace Ui
+
+namespace UrlAuthBox {
+
+void ActivateButton(
+	std::shared_ptr<Ui::Show> show,
+	not_null<const HistoryItem*> message,
+	int row,
+	int column);
+void ActivateUrl(
+	std::shared_ptr<Ui::Show> show,
+	not_null<Main::Session*> session,
+	const QString &url,
+	QVariant context);
+
+} // namespace UrlAuthBox
diff --git a/Telegram/SourceFiles/boxes/url_auth_box_content.cpp b/Telegram/SourceFiles/boxes/url_auth_box_content.cpp
new file mode 100644
index 00000000000000..726d7ceaef3aaf
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/url_auth_box_content.cpp
@@ -0,0 +1,597 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "boxes/url_auth_box_content.h"
+
+#include "base/qthelp_url.h"
+#include "lang/lang_keys.h"
+#include "ui/dynamic_image.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/layers/generic_box.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/horizontal_fit_container.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/emoji_config.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/ui_utility.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+
+namespace UrlAuthBox {
+namespace {
+
+constexpr auto kEmojiAnimationActiveFor = crl::time(250);
+
+void PrepareFullWidthRoundButton(
+		not_null<Ui::RoundButton*> button,
+		not_null<Ui::VerticalLayout*> content,
+		const style::margins &padding) {
+	button->setFullRadius(true);
+	const auto paddingHorizontal = padding.left() + padding.right();
+	content->widthValue() | rpl::on_next([=](int w) {
+		button->resize(w - paddingHorizontal, button->height());
+	}, button->lifetime());
+}
+
+} // namespace
+
+void ShowMatchCodesBox(
+		not_null<Ui::GenericBox*> box,
+		Fn<std::shared_ptr<Ui::DynamicImage>(QString)> emojiImageFactory,
+		const QString &domain,
+		const QStringList &codes,
+		Fn<void(QString)> callback,
+		bool isApp) {
+	box->setWidth(st::boxWidth);
+	box->setStyle(st::urlAuthBox);
+
+	const auto content = box->verticalLayout();
+
+	Ui::AddSkip(content);
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_url_auth_match_code_title(),
+			st::urlAuthCodesTitle),
+		st::boxRowPadding,
+		style::al_top);
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	const auto buttons = content->add(
+		object_ptr<Ui::HorizontalFitContainer>(
+			content,
+			st::boxRowPadding.left() * 2),
+		st::boxRowPadding);
+	buttons->resize(0, st::urlAuthCodesButton.height);
+
+	for (const auto &code : codes) {
+		auto emojiLength = 0;
+		const auto emoji = Ui::Emoji::Find(code, &emojiLength);
+		const auto emojiCode = (emoji && (emojiLength == code.size()));
+		const auto button = Ui::CreateChild<Ui::RoundButton>(
+			buttons,
+			rpl::single(emojiCode ? QString() : code),
+			st::urlAuthCodesButton);
+		if (emojiCode) {
+			button->setTextFgOverride(QColor(Qt::transparent));
+			const auto overlay = Ui::CreateChild<Ui::RpWidget>(button);
+			overlay->setAttribute(Qt::WA_TransparentForMouseEvents);
+			overlay->show();
+			struct State {
+				std::shared_ptr<Ui::DynamicImage> image;
+				bool hovered = false;
+				crl::time lastFrameUpdate = 0;
+			};
+			const auto state = overlay->lifetime().make_state<State>();
+			const auto animationActive = [=] {
+				return state->lastFrameUpdate
+					&& (crl::now() - state->lastFrameUpdate
+						<= kEmojiAnimationActiveFor);
+			};
+			const auto refreshImage = [=] {
+				if (state->image) {
+					state->image->subscribeToUpdates(nullptr);
+				}
+				state->image = emojiImageFactory
+					? emojiImageFactory(code)
+					: nullptr;
+				if (state->image) {
+					state->image->subscribeToUpdates([=] {
+						state->lastFrameUpdate = crl::now();
+						overlay->update();
+					});
+				}
+				overlay->update();
+			};
+			refreshImage();
+			overlay->lifetime().add([=] {
+				if (state->image) {
+					state->image->subscribeToUpdates(nullptr);
+				}
+			});
+			button->events() | rpl::on_next([=](not_null<QEvent*> e) {
+				switch (e->type()) {
+				case QEvent::Enter:
+					if (!state->hovered) {
+						state->hovered = true;
+						if (!animationActive()) {
+							refreshImage();
+						}
+					}
+					break;
+				case QEvent::Leave:
+					state->hovered = false;
+					break;
+				default:
+					break;
+				}
+			}, overlay->lifetime());
+			button->sizeValue() | rpl::on_next([=](QSize size) {
+				overlay->resize(size);
+			}, overlay->lifetime());
+			overlay->paintOn([=](QPainter &p) {
+				if (state->image) {
+					const auto side = st::urlAuthCodesButton.height;
+					const auto frame = state->image->image(side);
+					const auto visible = frame.isNull()
+						? 0
+						: (frame.width() / frame.devicePixelRatio());
+					p.drawImage(
+						QPoint(
+							(overlay->width() - visible) / 2,
+							(overlay->height() - visible) / 2),
+						frame);
+					return;
+				}
+				const auto size = Ui::Emoji::GetSizeLarge();
+				const auto visible = size / style::DevicePixelRatio();
+				Ui::Emoji::Draw(
+					p,
+					emoji,
+					size,
+					(overlay->width() - visible) / 2,
+					(overlay->height() - visible) / 2);
+			});
+		}
+		button->setFullRadius(true);
+		button->setClickedCallback([=] {
+			callback(code);
+			box->closeBox();
+		});
+		buttons->add(button);
+	}
+
+	Ui::AddSkip(content);
+
+	const auto domainUrl = isApp ? QString() : qthelp::validate_url(domain);
+	if (!domainUrl.isEmpty() || isApp) {
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+		content->add(
+			object_ptr<Ui::FlatLabel>(
+				content,
+				tr::lng_url_auth_login_title(
+					lt_domain,
+					rpl::single(isApp
+						? tr::bold(domain)
+						: Ui::Text::Link(domain, domainUrl)),
+					tr::marked),
+				st::urlAuthCheckboxAbout),
+			st::boxRowPadding,
+			style::al_top);
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto &padding = st::boxRowPadding;
+		const auto button = content->add(
+			object_ptr<Ui::RoundButton>(
+				content,
+				tr::lng_cancel(),
+				st::attentionBoxButton),
+			padding);
+		PrepareFullWidthRoundButton(button, content, padding);
+		button->setClickedCallback([=] {
+			box->closeBox();
+		});
+	}
+}
+
+SwitchableUserpicButton::SwitchableUserpicButton(
+	not_null<Ui::RpWidget*> parent,
+	int size)
+: RippleButton(parent, st::defaultRippleAnimation)
+, _size(size)
+, _userpicSize(st::restoreUserpicIcon.photoSize)
+, _skip((_size - _userpicSize) / 2) {
+	resize(_size, _size);
+}
+
+void SwitchableUserpicButton::setUserpic(not_null<Ui::RpWidget*> userpic) {
+	_userpic = userpic;
+	_userpic->setParent(this);
+	_userpic->moveToRight(_skip, _skip);
+	_userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_userpic->show();
+	update();
+}
+
+void SwitchableUserpicButton::setExpanded(bool expanded) {
+	if (_expanded == expanded) {
+		return;
+	}
+	_expanded = expanded;
+	const auto w = _expanded
+		? (_size * 2.5 - _userpicSize)
+		: _size;
+	resize(w, _size);
+	if (_userpic) {
+		_userpic->moveToRight(_skip, _skip);
+	}
+	update();
+}
+
+void SwitchableUserpicButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	paintRipple(p, 0, 0);
+
+	if (!_expanded) {
+		return;
+	}
+
+	const auto arrowSize = st::lineWidth * 10;
+	const auto center = QPoint(_size / 2, height() / 2 + st::lineWidth * 3);
+
+	auto pen = QPen(st::windowSubTextFg);
+	pen.setWidthF(st::lineWidth * 1.5);
+	p.setPen(pen);
+	p.setRenderHint(QPainter::Antialiasing);
+
+	p.drawLine(center, center + QPoint(-arrowSize / 2, -arrowSize / 2));
+	p.drawLine(center, center + QPoint(arrowSize / 2, -arrowSize / 2));
+}
+
+QImage SwitchableUserpicButton::prepareRippleMask() const {
+	return _expanded
+		? Ui::RippleAnimation::RoundRectMask(size(), height() / 2)
+		: Ui::RippleAnimation::EllipseMask(size());
+}
+
+QPoint SwitchableUserpicButton::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos());
+}
+
+void AddAuthInfoRow(
+		not_null<Ui::VerticalLayout*> container,
+		const QString &topText,
+		const QString &bottomText,
+		const QString &leftText,
+		const style::icon &icon) {
+	const auto row = container->add(
+		object_ptr<Ui::RpWidget>(container),
+		st::boxRowPadding);
+
+	const auto topLabel = Ui::CreateChild<Ui::FlatLabel>(
+		row,
+		topText,
+		st::urlAuthBoxRowTopLabel);
+	topLabel->setSelectable(true);
+	Ui::InstallTooltip(topLabel, [=] {
+		return (topLabel->textMaxWidth() > topLabel->width())
+			? topText
+			: QString();
+	});
+	const auto bottomLabel = Ui::CreateChild<Ui::FlatLabel>(
+		row,
+		bottomText,
+		st::urlAuthBoxRowBottomLabel);
+	bottomLabel->setSelectable(true);
+	Ui::InstallTooltip(bottomLabel, [=] {
+		return (bottomLabel->textMaxWidth() > bottomLabel->width())
+			? bottomText
+			: QString();
+	});
+	const auto leftLabel = Ui::CreateChild<Ui::FlatLabel>(
+		row,
+		leftText,
+		st::boxLabel);
+
+	rpl::combine(
+		row->widthValue(),
+		topLabel->sizeValue(),
+		bottomLabel->sizeValue()
+	) | rpl::on_next([=](int rowWidth, QSize topSize, QSize bottomSize) {
+		const auto totalHeight = topSize.height() + bottomSize.height();
+		row->resize(rowWidth, totalHeight);
+
+		const auto left = st::sessionValuePadding.left();
+		const auto availableWidth = rowWidth
+			- leftLabel->width()
+			- left
+			- st::defaultVerticalListSkip;
+
+		topLabel->resizeToNaturalWidth(availableWidth);
+		topLabel->moveToRight(0, 0);
+		bottomLabel->resizeToNaturalWidth(availableWidth);
+		bottomLabel->moveToRight(0, topSize.height());
+
+		leftLabel->moveToLeft(left, (totalHeight - leftLabel->height()) / 2);
+	}, row->lifetime());
+
+	{
+		const auto widget = Ui::CreateChild<Ui::RpWidget>(row);
+		widget->resize(icon.size());
+
+		rpl::combine(
+			row->widthValue(),
+			topLabel->sizeValue(),
+			bottomLabel->sizeValue()
+		) | rpl::on_next([=](int rowWidth, QSize topSize, QSize bottomSize) {
+			const auto totalHeight = topSize.height() + bottomSize.height();
+			widget->moveToLeft(0, (totalHeight - leftLabel->height()) / 2);
+		}, row->lifetime());
+
+		widget->paintRequest() | rpl::on_next([=, &icon] {
+			auto p = QPainter(widget);
+			icon.paintInCenter(p, widget->rect());
+		}, widget->lifetime());
+	}
+}
+
+void Show(
+		not_null<Ui::GenericBox*> box,
+		const QString &url,
+		const QString &domain,
+		const QString &selfName,
+		const QString &botName,
+		Fn<void(Result)> callback) {
+	box->setWidth(st::boxWidth);
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_url_auth_open_confirm(tr::now, lt_link, url),
+			st::boxLabel),
+		st::boxPadding);
+
+	const auto addCheckbox = [&](const TextWithEntities &text) {
+		const auto checkbox = box->addRow(
+			object_ptr<Ui::Checkbox>(
+				box,
+				text,
+				true,
+				st::urlAuthCheckbox),
+			style::margins(
+				st::boxPadding.left(),
+				st::boxPadding.bottom(),
+				st::boxPadding.right(),
+				st::boxPadding.bottom()));
+		checkbox->setAllowTextLines();
+		return checkbox;
+	};
+
+	const auto auth = addCheckbox(
+		tr::lng_url_auth_login_option(
+			tr::now,
+			lt_domain,
+			tr::bold(domain),
+			lt_user,
+			tr::bold(selfName),
+			tr::marked));
+
+	const auto allow = !botName.isEmpty()
+		? addCheckbox(tr::lng_url_auth_allow_messages(
+			tr::now,
+			lt_bot,
+			tr::bold(botName),
+			tr::marked))
+		: nullptr;
+
+	if (allow) {
+		rpl::single(
+			auth->checked()
+		) | rpl::then(
+			auth->checkedChanges()
+		) | rpl::on_next([=](bool checked) {
+			if (!checked) {
+				allow->setChecked(false);
+			}
+			allow->setDisabled(!checked);
+		}, auth->lifetime());
+	}
+
+	box->addButton(tr::lng_open_link(), [=] {
+		const auto authed = auth->checked();
+		const auto allowed = (authed && allow && allow->checked());
+		callback({
+			.auth = authed,
+			.allowWrite = allowed,
+		});
+	});
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+}
+
+void ShowDetails(
+		not_null<Ui::GenericBox*> box,
+		const QString &url,
+		const QString &domain,
+		Fn<std::shared_ptr<Ui::DynamicImage>(QString)> emojiImageFactory,
+		Fn<void(Result)> callback,
+		object_ptr<Ui::RpWidget> userpicOwned,
+		rpl::producer<QString> botName,
+		const QString &browser,
+		const QString &platform,
+		const QString &ip,
+		const QString &region,
+		rpl::producer<QStringList> matchCodes,
+		bool isApp) {
+	box->setWidth(st::boxWidth);
+	box->setStyle(st::urlAuthBox);
+
+	const auto content = box->verticalLayout();
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	if (userpicOwned) {
+		const auto userpic = content->add(
+			std::move(userpicOwned),
+			st::boxRowPadding,
+			style::al_top);
+		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+	}
+
+	const auto domainUrl = isApp ? QString() : qthelp::validate_url(domain);
+	const auto userpicButtonWidth = st::restoreUserpicIcon.photoSize;
+	const auto titlePadding = style::margins(
+		st::boxRowPadding.left(),
+		st::boxRowPadding.top(),
+		st::boxRowPadding.right() + userpicButtonWidth,
+		st::boxRowPadding.bottom());
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			(isApp
+				? tr::lng_url_auth_login_title(
+					lt_domain,
+					rpl::single(tr::bold(domain)),
+					tr::marked)
+				: domainUrl.isEmpty()
+					? tr::lng_url_auth_login_button(tr::marked)
+					: tr::lng_url_auth_login_title(
+						lt_domain,
+						rpl::single(Ui::Text::Link(domain, domainUrl)),
+						tr::marked)),
+			st::boxTitle),
+		titlePadding,
+		style::al_top);
+	Ui::AddSkip(content);
+
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			(isApp
+				? tr::lng_url_auth_app_access(tr::rich)
+				: tr::lng_url_auth_site_access(tr::rich)),
+			st::urlAuthCheckboxAbout),
+		st::boxRowPadding);
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	if (!platform.isEmpty() || !browser.isEmpty()) {
+		AddAuthInfoRow(
+			content,
+			platform,
+			browser,
+			tr::lng_url_auth_device_label(tr::now),
+			st::menuIconDevices);
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	if (!ip.isEmpty() || !region.isEmpty()) {
+		AddAuthInfoRow(
+			content,
+			ip,
+			region,
+			tr::lng_url_auth_ip_label(tr::now),
+			st::menuIconAddress);
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	Ui::AddDividerText(
+		content,
+		rpl::single(tr::lng_url_auth_login_attempt(tr::now)));
+	Ui::AddSkip(content);
+
+	auto allowMessages = (Ui::SettingsButton*)(nullptr);
+	if (botName) {
+		allowMessages = content->add(
+			object_ptr<Ui::SettingsButton>(
+				content,
+				tr::lng_url_auth_allow_messages_label()));
+		allowMessages->toggleOn(rpl::single(false));
+		Ui::AddSkip(content);
+		Ui::AddDividerText(
+			content,
+			tr::lng_url_auth_allow_messages_about(
+				lt_bot,
+				std::move(botName)));
+		Ui::AddSkip(content);
+	}
+
+	struct State {
+		QStringList matchCodes;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	std::move(matchCodes) | rpl::on_next([=](const QStringList &codes) {
+		state->matchCodes = codes;
+	}, box->lifetime());
+
+	Ui::AddSkip(content);
+	{
+		const auto &padding = st::boxRowPadding;
+		const auto button = content->add(
+			object_ptr<Ui::RoundButton>(
+				content,
+				tr::lng_url_auth_login_button(),
+				st::defaultLightButton),
+			padding);
+		PrepareFullWidthRoundButton(button, content, padding);
+		button->setClickedCallback([=] {
+			if (state->matchCodes.isEmpty()) {
+				callback({
+					.auth = true,
+					.allowWrite = (allowMessages && allowMessages->toggled()),
+				});
+				return;
+			}
+			box->uiShow()->show(Box([=](
+					not_null<Ui::GenericBox*> matchCodesBox) {
+				ShowMatchCodesBox(
+					matchCodesBox,
+					emojiImageFactory,
+					domain,
+					state->matchCodes,
+					[=](QString matchCode) {
+						callback({
+							.auth = true,
+							.allowWrite = (allowMessages
+								&& allowMessages->toggled()),
+							.matchCode = std::move(matchCode),
+						});
+					},
+					isApp);
+			}));
+		});
+	}
+	Ui::AddSkip(content);
+	{
+		const auto &padding = st::boxRowPadding;
+		const auto button = content->add(
+			object_ptr<Ui::RoundButton>(
+				content,
+				tr::lng_suggest_action_decline(),
+				st::attentionBoxButton),
+			padding);
+		PrepareFullWidthRoundButton(button, content, padding);
+		button->setClickedCallback([=] {
+			box->closeBox();
+		});
+	}
+}
+
+} // namespace UrlAuthBox
diff --git a/Telegram/SourceFiles/boxes/url_auth_box_content.h b/Telegram/SourceFiles/boxes/url_auth_box_content.h
new file mode 100644
index 00000000000000..838aac7e544059
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/url_auth_box_content.h
@@ -0,0 +1,87 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/buttons.h"
+
+namespace Ui {
+class DynamicImage;
+class GenericBox;
+class VerticalLayout;
+} // namespace Ui
+
+namespace UrlAuthBox {
+
+struct Result {
+	bool auth : 1 = false;
+	bool allowWrite : 1 = false;
+	bool sharePhone : 1 = false;
+	QString matchCode;
+};
+
+class SwitchableUserpicButton final : public Ui::RippleButton {
+public:
+	SwitchableUserpicButton(
+		not_null<Ui::RpWidget*> parent,
+		int size);
+
+	void setExpanded(bool expanded);
+	void setUserpic(not_null<Ui::RpWidget*>);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+	const int _size;
+	const int _userpicSize;
+	const int _skip;
+	bool _expanded = false;
+	Ui::RpWidget *_userpic = nullptr;
+
+};
+
+void AddAuthInfoRow(
+	not_null<Ui::VerticalLayout*> container,
+	const QString &topText,
+	const QString &bottomText,
+	const QString &leftText,
+	const style::icon &icon);
+
+void ShowMatchCodesBox(
+	not_null<Ui::GenericBox*> box,
+	Fn<std::shared_ptr<Ui::DynamicImage>(QString)> emojiImageFactory,
+	const QString &domain,
+	const QStringList &codes,
+	Fn<void(QString)> callback,
+	bool isApp = false);
+
+void Show(
+	not_null<Ui::GenericBox*> box,
+	const QString &url,
+	const QString &domain,
+	const QString &selfName,
+	const QString &botName,
+	Fn<void(Result)> callback);
+
+void ShowDetails(
+	not_null<Ui::GenericBox*> box,
+	const QString &url,
+	const QString &domain,
+	Fn<std::shared_ptr<Ui::DynamicImage>(QString)> emojiImageFactory,
+	Fn<void(Result)> callback,
+	object_ptr<Ui::RpWidget> userpicOwned,
+	rpl::producer<QString> botName,
+	const QString &browser,
+	const QString &platform,
+	const QString &ip,
+	const QString &region,
+	rpl::producer<QStringList> matchCodes = rpl::single(QStringList()),
+	bool isApp = false);
+
+} // namespace UrlAuthBox
diff --git a/Telegram/SourceFiles/boxes/username_box.cpp b/Telegram/SourceFiles/boxes/username_box.cpp
index 7df856d8dbd49e..03d70f0ef65799 100644
--- a/Telegram/SourceFiles/boxes/username_box.cpp
+++ b/Telegram/SourceFiles/boxes/username_box.cpp
@@ -312,9 +312,10 @@ QString UsernameEditor::getName() const {
 
 } // namespace
 
-void UsernamesBox(
+void FillUsernamesBox(
 		not_null<Ui::GenericBox*> box,
-		not_null<PeerData*> peer) {
+		not_null<PeerData*> peer,
+		Fn<void()> onSaved) {
 	const auto isBot = peer && peer->isUser() && peer->asUser()->isBot();
 	box->setTitle(isBot
 		? tr::lng_bot_username_title()
@@ -324,7 +325,7 @@ void UsernamesBox(
 
 	const auto editor = box->addRow(
 		object_ptr<UsernameEditor>(box, peer),
-		{});
+		style::margins());
 	editor->setEnabled(!isBot);
 	box->setFocusCallback([=] { editor->setInnerFocus(); });
 
@@ -333,20 +334,20 @@ void UsernamesBox(
 	auto description = [&]() -> rpl::producer<TextWithEntities> {
 		if (!isBot) {
 			return rpl::combine(
-				tr::lng_username_description1(Ui::Text::RichLangValue),
-				tr::lng_username_description2(Ui::Text::RichLangValue)
+				tr::lng_username_description1(tr::rich),
+				tr::lng_username_description2(tr::rich)
 			) | rpl::map([](TextWithEntities d1, TextWithEntities d2) {
 				return d1.append("\n\n").append(std::move(d2));
 			});
 		}
 		if (const auto url = AppConfig::FragmentLink(&peer->session())) {
-			const auto link = Ui::Text::Link(
+			const auto link = tr::link(
 				tr::lng_bot_username_description1_link(tr::now),
 				*url);
 			return tr::lng_bot_username_description1(
 				lt_link,
 				rpl::single(link),
-				Ui::Text::RichLangValue);
+				tr::rich);
 		}
 		return rpl::single<TextWithEntities>({});
 	}();
@@ -366,19 +367,22 @@ void UsernamesBox(
 			!isBot
 				? [=] { box->scrollToY(0); editor->setInnerFocus(); }
 				: Fn<void()>(nullptr)),
-		{});
+		style::margins());
 
 	const auto finish = [=] {
 		list->save(
-		) | rpl::start_with_done([=] {
+		) | rpl::on_done([=] {
 			editor->save(
-			) | rpl::start_with_done([=] {
+			) | rpl::on_done([=] {
+				if (onSaved) {
+					onSaved();
+				}
 				box->closeBox();
 			}, box->lifetime());
 		}, box->lifetime());
 	};
 	editor->submitted(
-	) | rpl::start_with_next(finish, editor->lifetime());
+	) | rpl::on_next(finish, editor->lifetime());
 
 	if (isBot) {
 		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
@@ -388,6 +392,19 @@ void UsernamesBox(
 	}
 }
 
+void UsernamesBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<PeerData*> peer) {
+	FillUsernamesBox(box, peer, nullptr);
+}
+
+void UsernamesBoxWithCallback(
+		not_null<Ui::GenericBox*> box,
+		not_null<PeerData*> peer,
+		Fn<void()> onSaved) {
+	FillUsernamesBox(box, peer, std::move(onSaved));
+}
+
 void AddUsernameCheckLabel(
 		not_null<Ui::VerticalLayout*> container,
 		rpl::producer<UsernameCheckInfo> checkInfo) {
@@ -410,7 +427,7 @@ void AddUsernameCheckLabel(
 	rpl::combine(
 		std::move(checkInfo),
 		container->widthValue()
-	) | rpl::start_with_next([=](const UsernameCheckInfo &info, int w) {
+	) | rpl::on_next([=](const UsernameCheckInfo &info, int w) {
 		using Type = UsernameCheckInfo::Type;
 		label->setMarkedText(info.text);
 		const auto &color = (info.type == Type::Good)
@@ -433,10 +450,10 @@ UsernameCheckInfo UsernameCheckInfo::PurchaseAvailable(
 			.text = tr::lng_username_purchase_available(
 				tr::now,
 				lt_link,
-				Ui::Text::Link(
+				tr::link(
 					tr::lng_username_purchase_available_link(tr::now),
 					(*fragmentLink) + u"/username/"_q + username),
-				Ui::Text::RichLangValue),
+				tr::rich),
 		};
 	} else {
 		return {
diff --git a/Telegram/SourceFiles/boxes/username_box.h b/Telegram/SourceFiles/boxes/username_box.h
index 9a845279f3f80d..cf1b060b0be159 100644
--- a/Telegram/SourceFiles/boxes/username_box.h
+++ b/Telegram/SourceFiles/boxes/username_box.h
@@ -18,6 +18,11 @@ void UsernamesBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<PeerData*> peer);
 
+void UsernamesBoxWithCallback(
+	not_null<Ui::GenericBox*> box,
+	not_null<PeerData*> peer,
+	Fn<void()> onSaved);
+
 struct UsernameCheckInfo final {
 	[[nodiscard]] static UsernameCheckInfo PurchaseAvailable(
 		const QString &username,
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 76b2e41dc182ee..cb6c7427988aa7 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -24,8 +24,8 @@ CallSignalBars {
 	inactiveOpacity: double;
 }
 
-callWidthMin: 300px;
-callHeightMin: 440px;
+callWidthMin: 380px;
+callHeightMin: 520px;
 callWidth: 720px;
 callHeight: 540px;
 
@@ -37,6 +37,7 @@ CallBodyLayout {
 	photoSize: pixels;
 	nameTop: pixels;
 	statusTop: pixels;
+	participantsTop: pixels;
 	muteStroke: pixels;
 	muteSize: pixels;
 	mutePosition: point;
@@ -48,9 +49,10 @@ callBodyLayout: CallBodyLayout {
 	photoSize: 160px;
 	nameTop: 221px;
 	statusTop: 254px;
+	participantsTop: 294px;
 	muteStroke: 3px;
 	muteSize: 36px;
-	mutePosition: point(142px, 135px);
+	mutePosition: point(140px, 135px);
 }
 callBodyWithPreview: CallBodyLayout {
 	height: 185px;
@@ -58,6 +60,7 @@ callBodyWithPreview: CallBodyLayout {
 	photoSize: 100px;
 	nameTop: 132px;
 	statusTop: 163px;
+	participantsTop: 193px;
 	muteStroke: 3px;
 	muteSize: 0px;
 	mutePosition: point(90px, 84px);
@@ -98,6 +101,7 @@ callButtonLabel: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(defaultTextStyle) {
 		font: font(11px);
 	}
+	maxHeight: 16px;
 }
 
 callAnswer: CallButton {
@@ -132,7 +136,6 @@ callHangup: CallButton(callAnswer) {
 	}
 	bg: callHangupBg;
 	outerBg: callHangupBg;
-	label: callButtonLabel;
 }
 callCancel: CallButton(callAnswer) {
 	button: IconButton(callButton) {
@@ -143,7 +146,6 @@ callCancel: CallButton(callAnswer) {
 	}
 	bg: callIconBgActive;
 	outerBg: callIconBgActive;
-	label: callButtonLabel;
 }
 callMicrophoneMute: CallButton(callAnswer) {
 	button: IconButton(callButton) {
@@ -154,7 +156,6 @@ callMicrophoneMute: CallButton(callAnswer) {
 	}
 	bg: callIconBg;
 	outerBg: callMuteRipple;
-	label: callButtonLabel;
 	cornerButtonPosition: point(40px, 4px);
 	cornerButtonBorder: 2px;
 }
@@ -183,6 +184,17 @@ callCameraUnmute: CallButton(callMicrophoneUnmute) {
 		}
 	}
 }
+callAddPeople: CallButton(callAnswer) {
+	button: IconButton(callButton) {
+		icon: icon {{ "calls/calls_add_people", callIconFg }};
+		iconPosition: point(-1px, 22px);
+		ripple: RippleAnimation(defaultRippleAnimation) {
+			color: callMuteRipple;
+		}
+	}
+	bg: callIconBg;
+	outerBg: callMuteRipple;
+}
 callCornerButtonInner: IconButton {
 	width: 20px;
 	height: 20px;
@@ -249,8 +261,10 @@ callMuteButtonLabel: FlatLabel(defaultFlatLabel) {
 	}
 }
 callMuteButtonActiveInner: IconButton {
-	width: 112px;
-	height: 138px;
+//	width: 112px;
+//	height: 138px;
+	width: 68px;
+	height: 79px;
 }
 callMuteButtonSmallActiveInner: IconButton {
 	width: 68px;
@@ -259,11 +273,15 @@ callMuteButtonSmallActiveInner: IconButton {
 callMuteButtonActive: CallButton {
 	button: callMuteButtonActiveInner;
 	bg: groupCallLive1;
-	bgSize: 77px;
-	bgPosition: point(18px, 18px);
-	outerRadius: 18px;
+//	bgSize: 77px;
+//	bgPosition: point(18px, 18px);
+//	outerRadius: 18px;
+	bgSize: 42px;
+	bgPosition: point(13px, 13px);
+	outerRadius: 13px;
 	outerBg: callAnswerBgOuter;
-	label: callMuteButtonLabel;
+	//label: callMuteButtonLabel;
+	label: callButtonLabel;
 }
 callMuteButton: CallMuteButton {
 	active: callMuteButtonActive;
@@ -275,10 +293,14 @@ callMuteButton: CallMuteButton {
 	sublabel: FlatLabel(defaultFlatLabel) {
 		textFg: groupCallMemberNotJoinedStatus;
 	}
-	labelsSkip: 8px;
-	sublabelSkip: 14px;
-	lottieSize: size(54px, 54px);
-	lottieTop: 31px;
+	labelsSkip: 0px;
+	sublabelSkip: 0px;
+//	labelsSkip: 8px;
+//	sublabelSkip: 14px;
+	lottieSize: size(36px, 36px);
+	lottieTop: 17px;
+//	lottieSize: size(54px, 54px);
+//	lottieTop: 31px;
 }
 callMuteButtonSmallActive: CallButton(callMuteButtonActive) {
 	button: callMuteButtonSmallActiveInner;
@@ -409,9 +431,7 @@ callRatingStar: IconButton {
 	icon: icon {{ "calls/call_rating", windowSubTextFg }};
 	iconPosition: point(-1px, -1px);
 
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 	rippleAreaPosition: point(0px, 0px);
 	rippleAreaSize: 36px;
 }
@@ -518,12 +538,8 @@ callTitle: WindowTitle(defaultWindowTitle) {
 callTitleShadowRight: icon {{ "calls/calls_shadow_controls", windowShadowFg }};
 callTitleShadowLeft: icon {{ "calls/calls_shadow_controls-flip_horizontal", windowShadowFg }};
 
-callErrorToast: Toast(defaultToast) {
-	minWidth: 240px;
-}
-
 groupCallWidth: 380px;
-groupCallHeight: 580px;
+groupCallHeight: 520px;
 groupCallWidthRtmp: 720px;
 groupCallWidthRtmpMin: 240px;
 groupCallHeightRtmp: 580px;
@@ -562,13 +578,19 @@ groupCallMenuShadow: Shadow(defaultEmptyShadow) {
 }
 groupCallPanelAnimation: PanelAnimation(defaultPanelAnimation) {
 	fadeBg: groupCallMenuBg;
-	shadow: groupCallMenuShadow;
 }
 groupCallPopupMenu: PopupMenu(defaultPopupMenu) {
-	shadow: groupCallMenuShadow;
+	shadowFallback: groupCallMenuBg;
 	menu: groupCallMenu;
 	animation: groupCallPanelAnimation;
 }
+groupCallPopupMenuWithIcons: PopupMenu(popupMenuWithIcons) {
+	shadowFallback: groupCallMenuBg;
+	menu: Menu(groupCallMenu, menuWithIcons) {
+		arrow: icon {{ "menu/submenu_arrow", groupCallMemberNotJoinedStatus }};
+	}
+	animation: groupCallPanelAnimation;
+}
 groupCallPopupMenuWithVolume: PopupMenu(groupCallPopupMenu) {
 	scrollPadding: margins(0px, 3px, 0px, 8px);
 	menu: Menu(groupCallMenu) {
@@ -598,13 +620,13 @@ groupCallMenuCover: ShortInfoCover(shortInfoCover) {
 	namePosition: point(17px, 28px);
 	statusPosition: point(17px, 8px);
 }
+groupCallTextPalette: TextPalette(defaultTextPalette) {
+	linkFg: groupCallActiveFg;
+}
 groupCallMenuAbout: FlatLabel(defaultFlatLabel) {
 	textFg: groupCallMemberNotJoinedStatus;
-	palette: TextPalette(defaultTextPalette) {
-		linkFg: groupCallActiveFg;
-	}
+	palette: groupCallTextPalette;
 	minWidth: 200px;
-	maxHeight: 92px;
 }
 callDeviceSelectionLabel: FlatLabel(defaultSubsectionTitle) {
 	textFg: groupCallActiveFg;
@@ -619,6 +641,23 @@ callDeviceSelectionMenu: PopupMenu(groupCallPopupMenu) {
 	}
 }
 
+createCallListButton: OutlineButton(defaultPeerListButton) {
+	font: normalFont;
+	padding: margins(11px, 5px, 11px, 5px);
+}
+createCallListItem: PeerListItem(defaultPeerListItem) {
+	button: createCallListButton;
+	height: 52px;
+	photoPosition: point(12px, 6px);
+	namePosition: point(63px, 7px);
+	statusPosition: point(63px, 26px);
+	photoSize: 40px;
+}
+createCallList: PeerList(defaultPeerList) {
+	item: createCallListItem;
+	padding: margins(0px, 6px, 0px, 6px);
+}
+
 groupCallRecordingTimerPadding: margins(0px, 4px, 0px, 4px);
 groupCallRecordingTimerFont: font(12px);
 
@@ -627,7 +666,7 @@ groupCallInnerDropdown: InnerDropdown(defaultInnerDropdown) {
 	animation: groupCallPanelAnimation;
 	bg: groupCallMenuBg;
 	scroll: defaultSolidScroll;
-	scrollPadding: margins(0px, 4px, 0px, 4px);
+	scrollPadding: margins(0px, 7px, 0px, 7px);
 }
 groupCallDropdownMenu: DropdownMenu(defaultDropdownMenu) {
 	wrap: groupCallInnerDropdown;
@@ -642,26 +681,18 @@ groupCallMembersListCheckbox: RoundImageCheckbox(defaultPeerListCheckbox) {
 	selectFg: groupCallActiveFg;
 	check: groupCallMembersListCheck;
 }
-groupCallMembersListItem: PeerListItem(defaultPeerListItem) {
-	button: OutlineButton(defaultPeerListButton) {
+groupCallMembersListItem: PeerListItem(createCallListItem) {
+	button: OutlineButton(createCallListButton) {
 		textBg: groupCallMembersBg;
 		textBgOver: groupCallMembersBgOver;
 
 		textFg: groupCallMemberInactiveStatus;
 		textFgOver: groupCallMemberInactiveStatus;
 
-		font: normalFont;
-		padding: margins(11px, 5px, 11px, 5px);
-
 		ripple: groupCallRipple;
 	}
 	disabledCheckFg: groupCallMemberNotJoinedStatus;
 	checkbox: groupCallMembersListCheckbox;
-	height: 52px;
-	photoPosition: point(12px, 6px);
-	namePosition: point(63px, 7px);
-	statusPosition: point(63px, 26px);
-	photoSize: 40px;
 	nameFg: groupCallMembersFg;
 	nameFgChecked: groupCallMembersFg;
 	statusFg: groupCallMemberInactiveStatus;
@@ -707,22 +738,6 @@ groupCallJoinAsList: PeerList(groupCallInviteMembersList) {
 		statusPosition: point(73px, 28px);
 	}
 }
-peerListJoinAsList: PeerList(peerListBox) {
-	item: PeerListItem(peerListBoxItem) {
-		height: 56px;
-		checkbox: RoundImageCheckbox(defaultPeerListCheckbox) {
-			check: RoundCheckbox(defaultRoundCheckbox) {
-				size: 0px;
-			}
-			imageRadius: 19px;
-			imageSmallRadius: 15px;
-		}
-		photoSize: 38px;
-		photoPosition: point(24px, 9px);
-		namePosition: point(73px, 9px);
-		statusPosition: point(73px, 28px);
-	}
-}
 groupCallMultiSelect: MultiSelect(defaultMultiSelect) {
 	bg: groupCallMembersBg;
 	item: MultiSelectItem(defaultMultiSelectItem) {
@@ -806,6 +821,7 @@ groupCallAddMember: SettingsButton(defaultSettingsButton) {
 	ripple: groupCallRipple;
 }
 groupCallAddMemberIcon: icon {{ "info/info_add_member", groupCallMemberInactiveIcon, point(0px, 3px) }};
+groupCallShareLinkIcon: icon {{ "menu/links_profile", groupCallMemberInactiveIcon, point(4px, 3px) }};
 groupCallSubtitleLabel: FlatLabel(defaultFlatLabel) {
 	maxHeight: 18px;
 	textFg: groupCallMemberNotJoinedStatus;
@@ -876,6 +892,8 @@ groupCallMemberColoredCrossLine: CrossLineAnimation(groupCallMemberInactiveCross
 	fg: groupCallMemberMutedIcon;
 	icon: icon {{ "calls/group_calls_unmuted", groupCallMemberActiveIcon }};
 }
+groupCallMemberCalling: icon {{ "calls/call_answer", groupCallMemberInactiveIcon }};
+groupCallMemberCallingPosition: point(0px, 8px);
 groupCallMemberInvited: icon {{ "calls/group_calls_invited", groupCallMemberInactiveIcon }};
 groupCallMemberInvitedPosition: point(2px, 12px);
 groupCallMemberRaisedHand: icon {{ "calls/group_calls_raised_hand", groupCallMemberInactiveStatus }};
@@ -900,6 +918,10 @@ groupCallHangupInner: IconButton(callButton) {
 		color: groupCallLeaveBgRipple;
 	}
 }
+groupCallMessageInner: IconButton(groupCallSettingsInner) {
+	icon: icon {{ "calls/call_message", groupCallIconFg }};
+	iconPosition: point(-1px, 16px);
+}
 groupCallSettings: CallButton(callMicrophoneMute) {
 	button: groupCallSettingsInner;
 }
@@ -915,11 +937,19 @@ groupCallVideoInnerActive: IconButton(groupCallVideoInner) {
 groupCallVideoActive: CallButton(groupCallVideo) {
 	button: groupCallVideoInnerActive;
 }
+groupCallMessage: CallButton(groupCallSettings) {
+	button: groupCallMessageInner;
+}
+groupCallMessageInnerActive: IconButton(groupCallMessageInner) {
+	icon: icon {{ "calls/call_message", groupCallIconFg }};
+}
+groupCallMessageActive: CallButton(groupCallMessage) {
+	button: groupCallMessageInnerActive;
+}
 groupCallHangup: CallButton(callHangup) {
 	button: groupCallHangupInner;
 	bg: groupCallLeaveBg;
 	outerBg: groupCallLeaveBg;
-	label: callButtonLabel;
 }
 groupCallSettingsSmall: CallButton(groupCallSettings) {
 	button: IconButton(groupCallSettingsInner) {
@@ -951,6 +981,20 @@ groupCallVideoActiveSmall: CallButton(groupCallVideoSmall) {
 		rippleAreaPosition: point(8px, 12px);
 	}
 }
+groupCallMessageSmall: CallButton(groupCallSettingsSmall) {
+	button: IconButton(groupCallMessageInner) {
+		width: 60px;
+		height: 68px;
+		rippleAreaPosition: point(8px, 12px);
+	}
+}
+groupCallMessageActiveSmall: CallButton(groupCallMessageSmall) {
+	button: IconButton(groupCallMessageInnerActive) {
+		width: 60px;
+		height: 68px;
+		rippleAreaPosition: point(8px, 12px);
+	}
+}
 groupCallScreenShareSmall: CallButton(groupCallSettingsSmall) {
 	button: IconButton(groupCallSettingsInner) {
 		icon: icon {{ "calls/calls_present", groupCallIconFg }};
@@ -1018,6 +1062,19 @@ groupCallBox: Box(defaultBox) {
 groupCallLayerBox: Box(groupCallBox) {
 	buttonPadding: margins(8px, 8px, 8px, 8px);
 }
+groupCallDividerBar: DividerBar {
+	bg: groupCallBg;
+	top: icon {{ "box_divider_top", groupCallMemberNotJoinedStatus }};
+	bottom: icon {{ "box_divider_bottom", groupCallMemberNotJoinedStatus }};
+}
+groupCallDividerLabel: DividerLabel {
+	bar: groupCallDividerBar;
+	label: FlatLabel(boxDividerLabel) {
+		textFg: groupCallVideoSubTextFg;
+		palette: groupCallTextPalette;
+	}
+}
+
 groupCallLevelMeter: LevelMeter(defaultLevelMeter) {
 	height: 18px;
 	lineWidth: 3px;
@@ -1311,6 +1368,7 @@ groupCallNarrowRaisedHand: icon {{ "calls/video_mini_speak", groupCallMemberInac
 groupCallNarrowCameraIcon: icon {{ "calls/video_mini_video", groupCallMemberNotJoinedStatus }};
 groupCallNarrowScreenIcon: icon {{ "calls/video_mini_screencast", groupCallMemberNotJoinedStatus }};
 groupCallNarrowInvitedIcon: icon {{ "calls/video_mini_invited", groupCallMemberNotJoinedStatus }};
+groupCallNarrowCallingIcon: icon {{ "calls/video_mini_invited", groupCallMemberNotJoinedStatus }};
 groupCallNarrowIconPosition: point(-4px, 2px);
 groupCallNarrowIconSkip: 15px;
 groupCallOutline: 2px;
@@ -1410,9 +1468,7 @@ groupCallRtmpShowButton: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(0px, 0px);
 	rippleAreaSize: 32px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 groupCallSettingsRtmpShowButton: IconButton(groupCallRtmpShowButton) {
 	ripple: groupCallRipple;
@@ -1428,8 +1484,6 @@ groupCallAttentionBoxButton: RoundButton(groupCallBoxButton) {
 groupCallRtmpUrlSkip: 1px;
 groupCallRtmpKeySubsectionTitleSkip: 8px;
 groupCallRtmpSubsectionTitleAddPadding: margins(0px, -1px, 0px, -4px);
-groupCallRtmpShowButtonPosition: point(21px, -5px);
-groupCallDividerBg: groupCallMembersBgRipple;
 
 groupCallScheduleDateField: InputField(groupCallField) {
 	textMargins: margins(2px, 0px, 2px, 0px);
@@ -1445,6 +1499,19 @@ groupCallScheduleTimeField: InputField(groupCallScheduleDateField) {
 	placeholderFont: font(14px);
 }
 
+groupCallVolumeSettings: Menu(groupCallPopupVolumeMenu) {
+	widthMin: 210px;
+	itemBg: groupCallMembersBg;
+	itemBgOver: groupCallMembersBgOver;
+}
+groupCallVolumeSettingsPadding: margins(24px, 8px, 24px, 6px);
+groupCallVolumeSettingsSlider: MediaSlider(groupCallMenuVolumeSlider) {
+	activeFg: groupCallMenuBg;
+	inactiveFg: groupCallMenuBg;
+	activeFgOver: groupCallMenuBg;
+	inactiveFgOver: groupCallMenuBg;
+}
+
 //
 groupCallCalendarPreviousDisabled: icon {{ "calendar_down-flip_vertical", groupCallMemberNotJoinedStatus }};
 groupCallCalendarNextDisabled: icon {{ "calendar_down", groupCallMemberNotJoinedStatus }};
@@ -1474,4 +1541,207 @@ groupCallCalendarColors: CalendarColors {
 
 	titleTextColor: groupCallMembersFg;
 }
-//
+
+createCallInviteLink: SettingsButton(defaultSettingsButton) {
+	textFg: windowActiveTextFg;
+	textFgOver: windowActiveTextFg;
+	textBg: windowBg;
+	textBgOver: windowBgOver;
+
+	style: TextStyle(defaultTextStyle) {
+		font: font(14px semibold);
+	}
+
+	height: 20px;
+	padding: margins(74px, 8px, 8px, 9px);
+}
+createCallInviteLinkIcon: icon {{ "info/edit/group_manage_links", windowActiveTextFg }};
+createCallInviteLinkIconPosition: point(23px, 2px);
+createCallVideo: IconButton {
+	width: 36px;
+	height: 52px;
+
+	icon: icon {{ "info/info_media_video", menuIconFg }};
+	iconOver: icon {{ "info/info_media_video", menuIconFgOver }};
+	iconPosition: point(-1px, -1px);
+
+	ripple: defaultRippleAnimation;
+	rippleAreaPosition: point(0px, 8px);
+	rippleAreaSize: 36px;
+}
+createCallVideoActive: icon {{ "info/info_media_video", windowActiveTextFg }};
+createCallVideoMargins: margins(0px, 0px, 10px, 0px);
+createCallAudio: IconButton(createCallVideo) {
+	icon: icon {{ "menu/phone", menuIconFg }};
+	iconOver: icon {{ "menu/phone", menuIconFgOver }};
+}
+createCallAudioActive: icon {{ "menu/phone", windowActiveTextFg }};
+createCallAudioMargins: margins(0px, 0px, 4px, 0px);
+
+confcallLinkButton: RoundButton(defaultActiveButton) {
+	height: 42px;
+	textTop: 12px;
+	style: semiboldTextStyle;
+}
+confcallLinkBoxInitial: Box(defaultBox) {
+	buttonPadding: margins(12px, 11px, 24px, 96px);
+	buttonHeight: 42px;
+	buttonWide: true;
+	button: confcallLinkButton;
+	shadowIgnoreTopSkip: true;
+}
+confcallLinkBox: Box(confcallLinkBoxInitial) {
+	buttonPadding: margins(12px, 11px, 24px, 24px);
+}
+confcallLinkCopyButton: RoundButton(confcallLinkButton) {
+	icon: icon {{ "info/edit/links_copy", activeButtonFg }};
+	iconOver: icon {{ "info/edit/links_copy", activeButtonFgOver }};
+	iconPosition: point(-1px, 5px);
+}
+confcallLinkShareButton: RoundButton(confcallLinkCopyButton) {
+	icon: icon {{ "info/edit/links_share", activeButtonFg }};
+	iconOver: icon {{ "info/edit/links_share", activeButtonFgOver }};
+}
+confcallLinkHeaderIconPadding: margins(0px, 32px, 0px, 10px);
+confcallLinkTitlePadding: margins(0px, 0px, 0px, 12px);
+confcallLinkCenteredText: FlatLabel(defaultFlatLabel) {
+	align: align(top);
+	minWidth: 40px;
+}
+confcallLinkFooterOr: FlatLabel(confcallLinkCenteredText) {
+	textFg: windowSubTextFg;
+}
+confcallLinkFooterOrTop: 12px;
+confcallLinkFooterOrSkip: 8px;
+confcallLinkFooterOrLineTop: 9px;
+confcallJoinBox: Box(confcallLinkBox) {
+	buttonPadding: margins(24px, 24px, 24px, 24px);
+}
+confcallJoinLogo: icon {{ "calls/group_call_logo", windowFgActive }};
+confcallJoinLogoPadding: margins(8px, 8px, 8px, 8px);
+confcallJoinSepPadding: margins(0px, 8px, 0px, 8px);
+confcallJoinUserpics: UserpicsRow {
+	button: UserpicButton(defaultUserpicButton) {
+		size: size(36px, 36px);
+		photoSize: 36px;
+	}
+	bg: boxBg;
+	shift: 16px;
+	stroke: 2px;
+	invert: true;
+}
+confcallJoinUserpicsPadding: margins(0px, 0px, 0px, 16px);
+confcallInviteUserpicsBg: groupCallMembersBg;
+confcallInviteUserpics: UserpicsRow {
+	button: UserpicButton(defaultUserpicButton) {
+		size: size(24px, 24px);
+		photoSize: 24px;
+	}
+	bg: confcallInviteUserpicsBg;
+	shift: 10px;
+	stroke: 2px;
+	invert: true;
+}
+confcallInviteParticipants: FlatLabel(defaultFlatLabel) {
+	textFg: callNameFg;
+}
+confcallInviteParticipantsPadding: margins(8px, 3px, 12px, 2px);
+confcallInviteVideo: IconButton(createCallVideo) {
+	icon: icon {{ "info/info_media_video", groupCallMemberInactiveIcon }};
+	iconOver: icon {{ "info/info_media_video", groupCallMemberInactiveIcon }};
+	ripple: groupCallRipple;
+}
+confcallInviteVideoActive: icon {{ "info/info_media_video", groupCallActiveFg }};
+confcallInviteAudio: IconButton(confcallInviteVideo) {
+	icon: icon {{ "menu/phone", groupCallMemberInactiveIcon }};
+	iconOver: icon {{ "menu/phone", groupCallMemberInactiveIcon }};
+}
+confcallInviteAudioActive: icon {{ "menu/phone", groupCallActiveFg }};
+
+groupCallLinkBox: Box(confcallLinkBox) {
+	bg: groupCallMembersBg;
+	title: FlatLabel(boxTitle) {
+		textFg: groupCallMembersFg;
+	}
+	titleAdditionalFg: groupCallMemberNotJoinedStatus;
+}
+groupCallLinkCenteredText: FlatLabel(confcallLinkCenteredText) {
+	textFg: groupCallMembersFg;
+}
+groupCallLinkPreview: InputField(defaultInputField) {
+	textBg: groupCallMembersBgOver;
+	textFg: groupCallMembersFg;
+	textMargins: margins(12px, 8px, 30px, 5px);
+	style: defaultTextStyle;
+	heightMin: 35px;
+}
+groupCallInviteLink: SettingsButton(createCallInviteLink) {
+	textFg: mediaviewTextLinkFg;
+	textFgOver: mediaviewTextLinkFg;
+	textBg: groupCallMembersBg;
+	textBgOver: groupCallMembersBgOver;
+
+	padding: margins(63px, 8px, 8px, 9px);
+
+	ripple: groupCallRipple;
+}
+groupCallInviteLinkIcon: icon {{ "info/edit/group_manage_links", mediaviewTextLinkFg }};
+
+groupCallMessagesScroll: ScrollArea(defaultScrollArea) {
+	barHidden: true;
+}
+groupCallMessagePadding: margins(8px, 3px, 8px, 2px);
+groupCallPricePadding: margins(5px, 0px, 5px, 0px);
+groupCallMessageSkip: 8px;
+groupCallMessagePalette: TextPalette(defaultTextPalette) {
+	linkFg: radialFg;
+	monoFg: radialFg;
+	spoilerFg: radialFg;
+}
+groupCallMessageBadge: RoundButton(defaultActiveButton) {
+	textBg: attentionButtonFg;
+	textBgOver: attentionButtonFg;
+	width: -6px;
+	height: 11px;
+	radius: 5px;
+	textTop: 0px;
+	style: TextStyle(semiboldTextStyle) {
+		font: font(8px semibold);
+	}
+}
+groupCallMessageBadgeMargin: margins(0px, 4px, 0px, 0px);
+groupCallUserpic: 20px;
+groupCallUserpicPadding: margins(2px, 2px, 4px, 2px);
+groupCallPinnedPadding: margins(10px, 4px, 10px, 2px);
+groupCallPinnedMaxWidth: 96px;
+groupCallPinnedUserpic: 22px;
+groupCallEffectPadding: margins(3px, 1px, 3px, 1px);
+groupCallEffectUserpicPadding: margins(1px, 1px, 3px, 1px);
+
+groupCallTopReactorBadge: RoundCheckbox(defaultRoundCheckbox) {
+	width: 1px;
+	border: groupCallMembersBg;
+}
+
+groupCallLinkMenu: IconButton(boxTitleMenu) {
+	icon: icon {{ "title_menu_dots", groupCallMemberInactiveIcon }};
+	iconOver: icon {{ "title_menu_dots", groupCallMemberInactiveIcon }};
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: groupCallMembersBgOver;
+	}
+}
+
+confcallFingerprintBottomSkip: 8px;
+confcallFingerprintMargins: margins(8px, 5px, 8px, 5px);
+confcallFingerprintTextMargins: margins(3px, 3px, 3px, 0px);
+confcallFingerprintText: FlatLabel(defaultFlatLabel) {
+	textFg: groupCallMembersFg;
+	style: TextStyle(defaultTextStyle) {
+		font: font(10px semibold);
+	}
+}
+confcallFingerprintSkip: 2px;
+confcallFingerprintTooltipLabel: defaultImportantTooltipLabel;
+confcallFingerprintTooltip: defaultImportantTooltip;
+confcallFingerprintTooltipSkip: 12px;
+confcallFingerprintTooltipMaxWidth: 220px;
diff --git a/Telegram/SourceFiles/calls/calls_box_controller.cpp b/Telegram/SourceFiles/calls/calls_box_controller.cpp
index a3d0d536948a6b..099c5f5df1b330 100644
--- a/Telegram/SourceFiles/calls/calls_box_controller.cpp
+++ b/Telegram/SourceFiles/calls/calls_box_controller.cpp
@@ -9,17 +9,26 @@ For license and copyright information please follow this link:
 
 #include "lang/lang_keys.h"
 #include "ui/effects/ripple_animation.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/wrap/slide_wrap.h"
 #include "ui/painter.h"
+#include "ui/vertical_list.h"
 #include "core/application.h"
+#include "calls/group/calls_group_common.h"
+#include "calls/group/calls_group_invite_controller.h"
 #include "calls/calls_instance.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_helpers.h"
 #include "mainwidget.h"
 #include "window/window_session_controller.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
@@ -32,6 +41,10 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "api/api_updates.h"
 #include "apiwrap.h"
+#include "info/profile/info_profile_icon.h"
+#include "settings/sections/settings_calls.h"
+#include "settings/settings_common.h"
+#include "styles/style_info.h" // infoTopBarMenu
 #include "styles/style_layers.h" // st::boxLabel.
 #include "styles/style_calls.h"
 #include "styles/style_boxes.h"
@@ -64,6 +77,16 @@ class GroupCallRow final : public PeerListRow {
 			bool selected) override {
 		return 0;
 	}
+	int paintNameIconGetLeadingWidth(
+			Painter &p,
+			Fn<void()> repaint,
+			crl::time now,
+			int nameLeft,
+			int nameTop,
+			int outerWidth,
+			bool selected) override {
+		return 0;
+	}
 	QSize rightActionSize() const override {
 		return peer()->isChannel() ? QSize(_st.width, _st.height) : QSize();
 	}
@@ -92,7 +115,7 @@ GroupCallRow::GroupCallRow(not_null<PeerData*> peer)
 : PeerListRow(peer)
 , _st(st::callGroupCall) {
 	if (const auto channel = peer->asChannel()) {
-		const auto status = (channel->isMegagroup()
+		const auto status = (!channel->isMegagroup()
 			? (channel->isPublic()
 				? tr::lng_create_public_channel_title
 				: tr::lng_create_private_channel_title)
@@ -150,7 +173,7 @@ void GroupCallRow::rightActionStopLastRipple() {
 
 namespace GroupCalls {
 
-ListController::ListController(not_null<Window::SessionController*> window)
+ListController::ListController(not_null<::Window::SessionController*> window)
 : _window(window) {
 	setStyleOverrides(&st::peerListSingleRow);
 }
@@ -195,7 +218,7 @@ void ListController::prepare() {
 
 	session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::GroupCall
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		processPeer(update.peer);
 		finishProcess();
 	}, lifetime());
@@ -227,7 +250,7 @@ void ListController::rowClicked(not_null<PeerListRow*> row) {
 	crl::on_main(window, [=, peer = row->peer()] {
 		window->showPeerHistory(
 			peer,
-			Window::SectionShow::Way::ClearStack);
+			::Window::SectionShow::Way::ClearStack);
 	});
 }
 
@@ -317,6 +340,16 @@ class BoxController::Row : public PeerListRow {
 			bool selected) override {
 		return 0;
 	}
+	int paintNameIconGetLeadingWidth(
+			Painter &p,
+			Fn<void()> repaint,
+			crl::time now,
+			int nameLeft,
+			int nameTop,
+			int outerWidth,
+			bool selected) override {
+		return 0;
+	}
 	QSize rightActionSize() const override {
 		return peer()->isUser() ? QSize(_st->width, _st->height) : QSize();
 	}
@@ -430,9 +463,9 @@ BoxController::Row::Type BoxController::Row::ComputeType(
 		return Type::Out;
 	} else if (auto media = item->media()) {
 		if (const auto call = media->call()) {
-			const auto reason = call->finishReason;
-			if (reason == Data::Call::FinishReason::Busy
-				|| reason == Data::Call::FinishReason::Missed) {
+			using State = Data::CallState;
+			const auto state = call->state;
+			if (state == State::Busy || state == State::Missed) {
 				return Type::Missed;
 			}
 		}
@@ -470,7 +503,7 @@ void BoxController::Row::rightActionStopLastRipple() {
 	}
 }
 
-BoxController::BoxController(not_null<Window::SessionController*> window)
+BoxController::BoxController(not_null<::Window::SessionController*> window)
 : _window(window)
 , _api(&_window->session().mtp()) {
 }
@@ -481,7 +514,7 @@ Main::Session &BoxController::session() const {
 
 void BoxController::prepare() {
 	session().data().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		if (const auto row = rowForItem(item)) {
 			row->itemRemoved(item);
 			if (!row->hasItems()) {
@@ -499,7 +532,7 @@ void BoxController::prepare() {
 	) | rpl::filter([=](const Data::MessageUpdate &update) {
 		const auto media = update.item->media();
 		return (media != nullptr) && (media->call() != nullptr);
-	}) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	}) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		insertRow(update.item, InsertWay::Prepend);
 	}, lifetime());
 
@@ -591,7 +624,7 @@ void BoxController::rowClicked(not_null<PeerListRow*> row) {
 	crl::on_main(window, [=, peer = row->peer()] {
 		window->showPeerHistory(
 			peer,
-			Window::SectionShow::Way::ClearStack,
+			::Window::SectionShow::Way::ClearStack,
 			itemId);
 	});
 }
@@ -600,7 +633,7 @@ void BoxController::rowRightActionClicked(not_null<PeerListRow*> row) {
 	auto user = row->peer()->asUser();
 	Assert(user != nullptr);
 
-	Core::App().calls().startOutgoingCall(user, false);
+	Core::App().calls().startOutgoingCall(user, {});
 }
 
 void BoxController::receivedCalls(const QVector<MTPMessage> &result) {
@@ -611,7 +644,7 @@ void BoxController::receivedCalls(const QVector<MTPMessage> &result) {
 	for (const auto &message : result) {
 		const auto msgId = IdFromMessage(message);
 		const auto peerId = PeerFromMessage(message);
-		if (const auto peer = session().data().peerLoaded(peerId)) {
+		if (session().data().peerLoaded(peerId)) {
 			const auto item = session().data().addNewMessage(
 				message,
 				MessageFlags(),
@@ -698,8 +731,8 @@ std::unique_ptr<PeerListRow> BoxController::createRow(
 
 void ClearCallsBox(
 		not_null<Ui::GenericBox*> box,
-		not_null<Window::SessionController*> window) {
-	const auto weak = Ui::MakeWeak(box);
+		not_null<::Window::SessionController*> window) {
+	const auto weak = base::make_weak(box);
 	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
@@ -742,7 +775,7 @@ void ClearCallsBox(
 					self(revoke, self);
 				} else {
 					api->session().data().destroyAllCallItems();
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->closeBox();
 					}
 				}
@@ -756,4 +789,141 @@ void ClearCallsBox(
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
 
+[[nodiscard]] not_null<Ui::SettingsButton*> AddCreateCallButton(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<::Window::SessionController*> controller,
+		Fn<void()> done) {
+	const auto result = container->add(object_ptr<Ui::SettingsButton>(
+		container,
+		tr::lng_confcall_create_call(),
+		st::inviteViaLinkButton), QMargins());
+	Ui::AddSkip(container);
+	Ui::AddDividerText(
+		container,
+		tr::lng_confcall_create_call_description(
+			lt_count,
+			rpl::single(controller->session().appConfig().confcallSizeLimit()
+				* 1.),
+			tr::marked));
+
+	const auto icon = Ui::CreateChild<Info::Profile::FloatingIcon>(
+		result,
+		st::inviteViaLinkIcon,
+		QPoint());
+	result->heightValue(
+	) | rpl::on_next([=](int height) {
+		icon->moveToLeft(
+			st::inviteViaLinkIconPosition.x(),
+			(height - st::inviteViaLinkIcon.height()) / 2);
+	}, icon->lifetime());
+
+	result->setClickedCallback([=] {
+		controller->show(Group::PrepareCreateCallBox(controller, done));
+	});
+
+	return result;
+}
+
+void ShowCallsBox(
+		not_null<::Window::SessionController*> window,
+		bool highlightStartCall) {
+	struct State {
+		State(not_null<::Window::SessionController*> window)
+		: callsController(window)
+		, groupCallsController(window) {
+		}
+		Calls::BoxController callsController;
+		PeerListContentDelegateSimple callsDelegate;
+
+		Calls::GroupCalls::ListController groupCallsController;
+		PeerListContentDelegateSimple groupCallsDelegate;
+
+		base::unique_qptr<Ui::PopupMenu> menu;
+	};
+
+	window->show(Box([=](not_null<Ui::GenericBox*> box) {
+		const auto state = box->lifetime().make_state<State>(window);
+
+		const auto groupCalls = box->addRow(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				box,
+				object_ptr<Ui::VerticalLayout>(box)),
+			style::margins());
+		groupCalls->hide(anim::type::instant);
+		groupCalls->toggleOn(state->groupCallsController.shownValue());
+
+		Ui::AddSubsectionTitle(
+			groupCalls->entity(),
+			tr::lng_call_box_groupcalls_subtitle());
+		state->groupCallsDelegate.setContent(groupCalls->entity()->add(
+			object_ptr<PeerListContent>(box, &state->groupCallsController)));
+		state->groupCallsController.setDelegate(&state->groupCallsDelegate);
+		Ui::AddSkip(groupCalls->entity());
+		Ui::AddDivider(groupCalls->entity());
+		Ui::AddSkip(groupCalls->entity());
+
+		const auto button = AddCreateCallButton(
+			box->verticalLayout(),
+			window,
+			crl::guard(box, [=] { box->closeBox(); }));
+		button->events(
+		) | rpl::filter([=](not_null<QEvent*> e) {
+			return (e->type() == QEvent::Enter);
+		}) | rpl::on_next([=] {
+			state->callsDelegate.peerListMouseLeftGeometry();
+		}, button->lifetime());
+
+		const auto content = box->addRow(
+			object_ptr<PeerListContent>(box, &state->callsController),
+			style::margins());
+		state->callsDelegate.setContent(content);
+		state->callsController.setDelegate(&state->callsDelegate);
+
+		box->setWidth(state->callsController.contentWidth());
+		state->callsController.boxHeightValue(
+		) | rpl::on_next([=](int height) {
+			box->setMinHeight(height);
+		}, box->lifetime());
+		box->setTitle(tr::lng_call_box_title());
+		box->addButton(tr::lng_close(), [=] {
+			box->closeBox();
+		});
+		const auto menuButton = box->addTopButton(st::infoTopBarMenu);
+		menuButton->setClickedCallback([=] {
+			state->menu = base::make_unique_q<Ui::PopupMenu>(
+				menuButton,
+				st::popupMenuWithIcons);
+			const auto showSettings = [=] {
+				window->showSettings(
+					Settings::CallsId(),
+					::Window::SectionShow(anim::type::instant));
+			};
+			const auto clearAll = crl::guard(box, [=] {
+				box->uiShow()->showBox(Box(Calls::ClearCallsBox, window));
+			});
+			state->menu->addAction(
+				tr::lng_settings_section_call_settings(tr::now),
+				showSettings,
+				&st::menuIconSettings);
+			if (state->callsDelegate.peerListFullRowsCount() > 0) {
+				Ui::Menu::CreateAddActionCallback(state->menu)({
+					.text = tr::lng_call_box_clear_all(tr::now),
+					.handler = clearAll,
+					.icon = &st::menuIconDeleteAttention,
+					.isAttention = true,
+				});
+			}
+			state->menu->popup(QCursor::pos());
+			return true;
+		});
+
+		if (highlightStartCall) {
+			box->showFinishes(
+			) | rpl::take(1) | rpl::on_next([=] {
+				Settings::HighlightWidget(button);
+			}, box->lifetime());
+		}
+	}));
+}
+
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_box_controller.h b/Telegram/SourceFiles/calls/calls_box_controller.h
index 860839cdf24ebb..d9ef0ccccbebc7 100644
--- a/Telegram/SourceFiles/calls/calls_box_controller.h
+++ b/Telegram/SourceFiles/calls/calls_box_controller.h
@@ -20,7 +20,7 @@ namespace GroupCalls {
 
 class ListController : public PeerListController {
 public:
-	explicit ListController(not_null<Window::SessionController*> window);
+	explicit ListController(not_null<::Window::SessionController*> window);
 
 	[[nodiscard]] rpl::producer<bool> shownValue() const;
 
@@ -30,7 +30,7 @@ class ListController : public PeerListController {
 	void rowRightActionClicked(not_null<PeerListRow*> row) override;
 
 private:
-	const not_null<Window::SessionController*> _window;
+	const not_null<::Window::SessionController*> _window;
 	base::flat_map<PeerId, not_null<PeerListRow*>> _groupCalls;
 	rpl::variable<int> _fullCount;
 
@@ -40,7 +40,7 @@ class ListController : public PeerListController {
 
 class BoxController : public PeerListController {
 public:
-	explicit BoxController(not_null<Window::SessionController*> window);
+	explicit BoxController(not_null<::Window::SessionController*> window);
 
 	Main::Session &session() const override;
 	void prepare() override;
@@ -68,7 +68,7 @@ class BoxController : public PeerListController {
 	std::unique_ptr<PeerListRow> createRow(
 		not_null<HistoryItem*> item) const;
 
-	const not_null<Window::SessionController*> _window;
+	const not_null<::Window::SessionController*> _window;
 	MTP::Sender _api;
 
 	MsgId _offsetId = 0;
@@ -79,6 +79,10 @@ class BoxController : public PeerListController {
 
 void ClearCallsBox(
 	not_null<Ui::GenericBox*> box,
-	not_null<Window::SessionController*> window);
+	not_null<::Window::SessionController*> window);
+
+void ShowCallsBox(
+	not_null<::Window::SessionController*> window,
+	bool highlightStartCall = false);
 
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 3a34f078369cd7..4edd70bedab289 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -12,10 +12,12 @@ For license and copyright information please follow this link:
 #include "base/platform/base_platform_info.h"
 #include "base/random.h"
 #include "boxes/abstract_box.h"
+#include "calls/group/calls_group_common.h"
 #include "calls/calls_instance.h"
 #include "calls/calls_panel.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "data/data_group_call.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "lang/lang_keys.h"
@@ -39,8 +41,6 @@ namespace tgcalls {
 class InstanceImpl;
 class InstanceV2Impl;
 class InstanceV2ReferenceImpl;
-class InstanceImplLegacy;
-void SetLegacyGlobalServerConfig(const std::string &serverConfig);
 } // namespace tgcalls
 
 namespace Calls {
@@ -55,7 +55,6 @@ const auto kDefaultVersion = "2.4.4"_q;
 const auto Register = tgcalls::Register<tgcalls::InstanceImpl>();
 const auto RegisterV2 = tgcalls::Register<tgcalls::InstanceV2Impl>();
 const auto RegV2Ref = tgcalls::Register<tgcalls::InstanceV2ReferenceImpl>();
-const auto RegisterLegacy = tgcalls::Register<tgcalls::InstanceImplLegacy>();
 
 [[nodiscard]] base::flat_set<int64> CollectEndpointIds(
 		const QVector<MTPPhoneConnection> &list) {
@@ -246,7 +245,52 @@ Call::Call(
 	setupOutgoingVideo();
 }
 
+Call::Call(
+	not_null<Delegate*> delegate,
+	not_null<UserData*> user,
+	CallId conferenceId,
+	MsgId conferenceInviteMsgId,
+	std::vector<not_null<PeerData*>> conferenceParticipants,
+	bool video)
+: _delegate(delegate)
+, _user(user)
+, _api(&_user->session().mtp())
+, _type(Type::Incoming)
+, _state(State::WaitingIncoming)
+, _discardByTimeoutTimer([=] { hangup(); })
+, _playbackDeviceId(
+	&Core::App().mediaDevices(),
+	Webrtc::DeviceType::Playback,
+	Webrtc::DeviceIdValueWithFallback(
+		Core::App().settings().callPlaybackDeviceIdValue(),
+		Core::App().settings().playbackDeviceIdValue()))
+, _captureDeviceId(
+	&Core::App().mediaDevices(),
+	Webrtc::DeviceType::Capture,
+	Webrtc::DeviceIdValueWithFallback(
+		Core::App().settings().callCaptureDeviceIdValue(),
+		Core::App().settings().captureDeviceIdValue()))
+, _cameraDeviceId(
+	&Core::App().mediaDevices(),
+	Webrtc::DeviceType::Camera,
+	Core::App().settings().cameraDeviceIdValue())
+, _id(base::RandomValue<CallId>())
+, _conferenceId(conferenceId)
+, _conferenceInviteMsgId(conferenceInviteMsgId)
+, _conferenceParticipants(std::move(conferenceParticipants))
+, _videoIncoming(
+	std::make_unique<Webrtc::VideoTrack>(
+		StartVideoState(video)))
+, _videoOutgoing(
+	std::make_unique<Webrtc::VideoTrack>(
+		StartVideoState(video))) {
+	startWaitingTrack();
+	setupOutgoingVideo();
+}
+
 void Call::generateModExpFirst(bytes::const_span randomSeed) {
+	Expects(!conferenceInvite());
+
 	auto first = MTP::CreateModExp(_dhConfig.g, _dhConfig.p, randomSeed);
 	if (first.modexp.empty()) {
 		LOG(("Call Error: Could not compute mod-exp first."));
@@ -272,6 +316,8 @@ bool Call::isIncomingWaiting() const {
 }
 
 void Call::start(bytes::const_span random) {
+	Expects(!conferenceInvite());
+
 	// Save config here, because it is possible that it changes between
 	// different usages inside the same call.
 	_dhConfig = _delegate->getDhConfig();
@@ -296,13 +342,14 @@ void Call::startOutgoing() {
 	Expects(_type == Type::Outgoing);
 	Expects(_state.current() == State::Requesting);
 	Expects(_gaHash.size() == kSha256Size);
+	Expects(!conferenceInvite());
 
 	const auto flags = _videoCapture
 		? MTPphone_RequestCall::Flag::f_video
 		: MTPphone_RequestCall::Flag(0);
 	_api.request(MTPphone_RequestCall(
 		MTP_flags(flags),
-		_user->inputUser,
+		_user->inputUser(),
 		MTP_int(base::RandomValue<int32>()),
 		MTP_bytes(_gaHash),
 		MTP_phoneCallProtocol(
@@ -349,6 +396,7 @@ void Call::startOutgoing() {
 void Call::startIncoming() {
 	Expects(_type == Type::Incoming);
 	Expects(_state.current() == State::Starting);
+	Expects(!conferenceInvite());
 
 	_api.request(MTPphone_ReceivedCall(
 		MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash))
@@ -362,6 +410,8 @@ void Call::startIncoming() {
 }
 
 void Call::applyUserConfirmation() {
+	Expects(!conferenceInvite());
+
 	if (_state.current() == State::WaitingUserConfirmation) {
 		setState(State::Requesting);
 	}
@@ -374,9 +424,51 @@ void Call::answer() {
 	}), video);
 }
 
+StartConferenceInfo Call::migrateConferenceInfo(StartConferenceInfo extend) {
+	extend.migrating = true;
+	extend.muted = muted();
+	extend.videoCapture = isSharingVideo() ? _videoCapture : nullptr;
+	extend.videoCaptureScreenId = screenSharingDeviceId();
+	return extend;
+}
+
+void Call::acceptConferenceInvite() {
+	Expects(conferenceInvite());
+
+	if (_state.current() != State::WaitingIncoming) {
+		return;
+	}
+	setState(State::ExchangingKeys);
+	const auto limit = 5;
+	const auto messageId = _conferenceInviteMsgId;
+	_api.request(MTPphone_GetGroupCall(
+		MTP_inputGroupCallInviteMessage(MTP_int(messageId.bare)),
+		MTP_int(limit)
+	)).done([=](const MTPphone_GroupCall &result) {
+		result.data().vcall().match([&](const auto &data) {
+			auto call = _user->owner().sharedConferenceCall(
+				data.vid().v,
+				data.vaccess_hash().v);
+			call->processFullCall(result);
+			Core::App().calls().startOrJoinConferenceCall(
+				migrateConferenceInfo({
+					.call = std::move(call),
+					.joinMessageId = messageId,
+				}));
+		});
+	}).fail([=](const MTP::Error &error) {
+		handleRequestError(error.type());
+	}).send();
+}
+
 void Call::actuallyAnswer() {
 	Expects(_type == Type::Incoming);
 
+	if (conferenceInvite()) {
+		acceptConferenceInvite();
+		return;
+	}
+
 	const auto state = _state.current();
 	if (state != State::Starting && state != State::WaitingIncoming) {
 		if (state != State::ExchangingKeys
@@ -434,9 +526,11 @@ void Call::setMuted(bool mute) {
 }
 
 void Call::setupMediaDevices() {
+	Expects(!conferenceInvite());
+
 	_playbackDeviceId.changes() | rpl::filter([=] {
 		return _instance && _setDeviceIdCallback;
-	}) | rpl::start_with_next([=](const Webrtc::DeviceResolvedId &deviceId) {
+	}) | rpl::on_next([=](const Webrtc::DeviceResolvedId &deviceId) {
 		_setDeviceIdCallback(deviceId);
 
 		// Value doesn't matter here, just trigger reading of the new value.
@@ -445,7 +539,7 @@ void Call::setupMediaDevices() {
 
 	_captureDeviceId.changes() | rpl::filter([=] {
 		return _instance && _setDeviceIdCallback;
-	}) | rpl::start_with_next([=](const Webrtc::DeviceResolvedId &deviceId) {
+	}) | rpl::on_next([=](const Webrtc::DeviceResolvedId &deviceId) {
 		_setDeviceIdCallback(deviceId);
 
 		// Value doesn't matter here, just trigger reading of the new value.
@@ -463,7 +557,7 @@ void Call::setupOutgoingVideo() {
 		_videoOutgoing->setState(Webrtc::VideoState::Inactive);
 	}
 	_videoOutgoing->stateValue(
-	) | rpl::start_with_next([=](Webrtc::VideoState state) {
+	) | rpl::on_next([=](Webrtc::VideoState state) {
 		if (state != Webrtc::VideoState::Inactive
 			&& cameraId().isEmpty()
 			&& !_videoCaptureIsScreencast) {
@@ -471,7 +565,8 @@ void Call::setupOutgoingVideo() {
 			_videoOutgoing->setState(Webrtc::VideoState::Inactive);
 		} else if (_state.current() != State::Established
 			&& (state != Webrtc::VideoState::Inactive)
-			&& (started == Webrtc::VideoState::Inactive)) {
+			&& (started == Webrtc::VideoState::Inactive)
+			&& !conferenceInvite()) {
 			_errors.fire({ ErrorType::NotStartedCall });
 			_videoOutgoing->setState(Webrtc::VideoState::Inactive);
 		} else if (state != Webrtc::VideoState::Inactive
@@ -503,7 +598,7 @@ void Call::setupOutgoingVideo() {
 	_cameraDeviceId.changes(
 	) | rpl::filter([=] {
 		return !_videoCaptureIsScreencast;
-	}) | rpl::start_with_next([=](Webrtc::DeviceResolvedId deviceId) {
+	}) | rpl::on_next([=](Webrtc::DeviceResolvedId deviceId) {
 		const auto &id = deviceId.value;
 		_videoCaptureDeviceId = id;
 		if (_videoCapture) {
@@ -527,24 +622,30 @@ crl::time Call::getDurationMs() const {
 	return _startTime ? (crl::now() - _startTime) : 0;
 }
 
-void Call::hangup() {
+void Call::hangup(Data::GroupCall *migrateCall, const QString &migrateSlug) {
 	const auto state = _state.current();
-	if (state == State::Busy) {
+	if (state == State::Busy
+		|| state == State::MigrationHangingUp) {
 		_delegate->callFinished(this);
 	} else {
 		const auto missed = (state == State::Ringing
 			|| (state == State::Waiting && _type == Type::Outgoing));
 		const auto declined = isIncomingWaiting();
-		const auto reason = missed
+		const auto reason = !migrateSlug.isEmpty()
+			? MTP_phoneCallDiscardReasonMigrateConferenceCall(
+				MTP_string(migrateSlug))
+			: missed
 			? MTP_phoneCallDiscardReasonMissed()
 			: declined
 			? MTP_phoneCallDiscardReasonBusy()
 			: MTP_phoneCallDiscardReasonHangup();
-		finish(FinishType::Ended, reason);
+		finish(FinishType::Ended, reason, migrateCall);
 	}
 }
 
 void Call::redial() {
+	Expects(!conferenceInvite());
+
 	if (_state.current() != State::Busy) {
 		return;
 	}
@@ -574,6 +675,8 @@ void Call::startWaitingTrack() {
 }
 
 void Call::sendSignalingData(const QByteArray &data) {
+	Expects(!conferenceInvite());
+
 	_api.request(MTPphone_SendSignalingData(
 		MTP_inputPhoneCall(
 			MTP_long(_id),
@@ -705,7 +808,7 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 		}
 		if (data.is_need_rating() && _id && _accessHash) {
 			const auto window = Core::App().windowFor(
-				Window::SeparateId(_user));
+				::Window::SeparateId(_user));
 			const auto session = &_user->session();
 			const auto callId = _id;
 			const auto callAccessHash = _accessHash;
@@ -719,7 +822,7 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 			box->sends(
 			) | rpl::take(
 				1 // Instead of keeping requestId.
-			) | rpl::start_with_next([=](const Ui::RateCallBox::Result &r) {
+			) | rpl::on_next([=](const Ui::RateCallBox::Result &r) {
 				sender->request(MTPphone_SetCallRating(
 					MTP_flags(0),
 					MTP_inputPhoneCall(
@@ -740,7 +843,10 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 			&& reason->type() == mtpc_phoneCallDiscardReasonDisconnect) {
 			LOG(("Call Info: Discarded with DISCONNECT reason."));
 		}
-		if (reason && reason->type() == mtpc_phoneCallDiscardReasonBusy) {
+		if (reason && reason->type() == mtpc_phoneCallDiscardReasonMigrateConferenceCall) {
+			const auto slug = qs(reason->c_phoneCallDiscardReasonMigrateConferenceCall().vslug());
+			finishByMigration(slug);
+		} else if (reason && reason->type() == mtpc_phoneCallDiscardReasonBusy) {
 			setState(State::Busy);
 		} else if (_type == Type::Outgoing
 			|| _state.current() == State::HangingUp) {
@@ -768,6 +874,35 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 	Unexpected("phoneCall type inside an existing call handleUpdate()");
 }
 
+void Call::finishByMigration(const QString &slug) {
+	Expects(!conferenceInvite());
+
+	if (_state.current() == State::MigrationHangingUp) {
+		return;
+	}
+	setState(State::MigrationHangingUp);
+	const auto limit = 5;
+	const auto session = &_user->session();
+	session->api().request(MTPphone_GetGroupCall(
+		MTP_inputGroupCallSlug(MTP_string(slug)),
+		MTP_int(limit)
+	)).done([=](const MTPphone_GroupCall &result) {
+		result.data().vcall().match([&](const auto &data) {
+			const auto call = session->data().sharedConferenceCall(
+				data.vid().v,
+				data.vaccess_hash().v);
+			call->processFullCall(result);
+			Core::App().calls().startOrJoinConferenceCall(
+				migrateConferenceInfo({
+					.call = call,
+					.linkSlug = slug,
+				}));
+		});
+	}).fail(crl::guard(this, [=] {
+		setState(State::Failed);
+	})).send();
+}
+
 void Call::updateRemoteMediaState(
 		tgcalls::AudioState audio,
 		tgcalls::VideoState video) {
@@ -808,6 +943,7 @@ bool Call::handleSignalingData(
 
 void Call::confirmAcceptedCall(const MTPDphoneCallAccepted &call) {
 	Expects(_type == Type::Outgoing);
+	Expects(!conferenceInvite());
 
 	if (_state.current() == State::ExchangingKeys
 		|| _instance) {
@@ -860,6 +996,7 @@ void Call::confirmAcceptedCall(const MTPDphoneCallAccepted &call) {
 
 void Call::startConfirmedCall(const MTPDphoneCall &call) {
 	Expects(_type == Type::Incoming);
+	Expects(!conferenceInvite());
 
 	const auto firstBytes = bytes::make_span(call.vg_a_or_b().v);
 	if (_gaHash != openssl::Sha256(firstBytes)) {
@@ -886,11 +1023,15 @@ void Call::startConfirmedCall(const MTPDphoneCall &call) {
 }
 
 void Call::createAndStartController(const MTPDphoneCall &call) {
+	Expects(!conferenceInvite());
+
 	_discardByTimeoutTimer.cancel();
 	if (!checkCallFields(call) || _authKey.size() != kAuthKeySize) {
 		return;
 	}
 
+	_conferenceSupported = call.is_conference_supported();
+
 	const auto &protocol = call.vprotocol().c_phoneCallProtocol();
 	const auto &serverConfig = _user->session().serverConfig();
 
@@ -1055,23 +1196,24 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 	raw->setIncomingVideoOutput(_videoIncoming->sink());
 	raw->setAudioOutputDuckingEnabled(settings.callAudioDuckingEnabled());
 
-	_state.value() | rpl::start_with_next([=](State state) {
+	_muted.value() | rpl::on_next([=](bool muted) {
+		Core::App().mediaDevices().setCaptureMuted(muted);
+	}, _instanceLifetime);
+
+	_state.value() | rpl::on_next([=](State state) {
 		const auto track = (state != State::FailedHangingUp)
 			&& (state != State::Failed)
 			&& (state != State::HangingUp)
+			&& (state != State::MigrationHangingUp)
 			&& (state != State::Ended)
 			&& (state != State::EndedByOtherDevice)
 			&& (state != State::Busy);
 		Core::App().mediaDevices().setCaptureMuteTracker(this, track);
 	}, _instanceLifetime);
 
-	_muted.value() | rpl::start_with_next([=](bool muted) {
-		Core::App().mediaDevices().setCaptureMuted(muted);
-	}, _instanceLifetime);
-
 #if 0
 	Core::App().batterySaving().value(
-	) | rpl::start_with_next([=](bool isSaving) {
+	) | rpl::on_next([=](bool isSaving) {
 		crl::on_main(weak, [=] {
 			if (_instance) {
 				_instance->setIsLowBatteryLevel(isSaving);
@@ -1082,6 +1224,8 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 }
 
 void Call::handleControllerStateChange(tgcalls::State state) {
+	Expects(!conferenceInvite());
+
 	switch (state) {
 	case tgcalls::State::WaitInit: {
 		DEBUG_LOG(("Call Info: State changed to WaitingInit."));
@@ -1175,6 +1319,11 @@ void Call::setState(State state) {
 		&& state != State::Failed) {
 		return;
 	}
+	if (was == State::MigrationHangingUp
+		&& state != State::Ended
+		&& state != State::Failed) {
+		return;
+	}
 	if (was != state) {
 		_state = state;
 
@@ -1284,7 +1433,9 @@ void Call::toggleCameraSharing(bool enabled) {
 	}), true);
 }
 
-void Call::toggleScreenSharing(std::optional<QString> uniqueId) {
+void Call::toggleScreenSharing(
+		std::optional<QString> uniqueId,
+		bool withAudio) {
 	if (!uniqueId) {
 		if (isSharingScreen()) {
 			if (_videoCapture) {
@@ -1294,13 +1445,20 @@ void Call::toggleScreenSharing(std::optional<QString> uniqueId) {
 		}
 		_videoCaptureDeviceId = QString();
 		_videoCaptureIsScreencast = false;
+		_screenWithAudio = false;
+		if (_systemAudioCapture) {
+			_systemAudioCapture->stop();
+			_systemAudioCapture = nullptr;
+		}
 		return;
-	} else if (screenSharingDeviceId() == *uniqueId) {
+	} else if (screenSharingDeviceId() == *uniqueId
+		&& _screenWithAudio == withAudio) {
 		return;
 	}
 	toggleCameraSharing(false);
 	_videoCaptureIsScreencast = true;
 	_videoCaptureDeviceId = *uniqueId;
+	_screenWithAudio = withAudio;
 	if (_videoCapture) {
 		_videoCapture->switchToDevice(uniqueId->toStdString(), true);
 		if (_instance) {
@@ -1308,6 +1466,34 @@ void Call::toggleScreenSharing(std::optional<QString> uniqueId) {
 		}
 	}
 	_videoOutgoing->setState(Webrtc::VideoState::Active);
+
+	if (_systemAudioCapture) {
+		_systemAudioCapture->stop();
+		_systemAudioCapture = nullptr;
+	}
+	if (withAudio && Webrtc::SystemAudioCaptureSupported()) {
+		_systemAudioCapture = Webrtc::CreateSystemAudioCapture(
+			[weak = base::make_weak(this)](std::vector<uint8_t> &&samples) {
+				crl::on_main(
+					weak,
+					[weak, samples = std::move(samples)]() mutable {
+						if (const auto strong = weak.get(); strong
+							&& strong->_instance
+							&& strong->_screenWithAudio) {
+							strong->_instance->addExternalAudioSamples(
+								std::move(samples));
+						}
+					});
+			});
+		if (_systemAudioCapture) {
+			_systemAudioCapture->start();
+		}
+	}
+}
+
+auto Call::peekVideoCapture() const
+-> std::shared_ptr<tgcalls::VideoCaptureInterface> {
+	return _videoCapture;
 }
 
 auto Call::playbackDeviceIdValue() const
@@ -1323,7 +1509,10 @@ rpl::producer<Webrtc::DeviceResolvedId> Call::cameraDeviceIdValue() const {
 	return _cameraDeviceId.value();
 }
 
-void Call::finish(FinishType type, const MTPPhoneCallDiscardReason &reason) {
+void Call::finish(
+		FinishType type,
+		const MTPPhoneCallDiscardReason &reason,
+		Data::GroupCall *migrateCall) {
 	Expects(type != FinishType::None);
 
 	setSignalBarCount(kSignalBarFinished);
@@ -1348,8 +1537,15 @@ void Call::finish(FinishType type, const MTPPhoneCallDiscardReason &reason) {
 		|| state == State::Ended
 		|| state == State::Failed) {
 		return;
-	}
-	if (!_id) {
+	} else if (conferenceInvite()) {
+		if (migrateCall) {
+			_delegate->callFinished(this);
+		} else {
+			Core::App().calls().declineIncomingConferenceInvites(_conferenceId);
+			setState(finalState);
+		}
+		return;
+	} else if (!_id) {
 		setState(finalState);
 		return;
 	}
@@ -1371,6 +1567,13 @@ void Call::finish(FinishType type, const MTPPhoneCallDiscardReason &reason) {
 
 	// We want to discard request still being sent and processed even if
 	// the call is already destroyed.
+	if (migrateCall) {
+		_user->owner().registerInvitedToCallUser(
+			migrateCall->id(),
+			migrateCall,
+			_user,
+			true);
+	}
 	const auto session = &_user->session();
 	const auto weak = base::make_weak(this);
 	session->api().request(MTPphone_DiscardCall( // We send 'discard' here.
@@ -1412,10 +1615,10 @@ void Call::handleRequestError(const QString &error) {
 		? Lang::Hard::CallErrorIncompatible().replace(
 			"{user}",
 			_user->name())
-		: QString();
+		: error;
 	if (!inform.isEmpty()) {
 		if (const auto window = Core::App().windowFor(
-				Window::SeparateId(_user))) {
+				::Window::SeparateId(_user))) {
 			window->show(Ui::MakeInformBox(inform));
 		} else {
 			Ui::show(Ui::MakeInformBox(inform));
@@ -1434,7 +1637,7 @@ void Call::handleControllerError(const QString &error) {
 		: QString();
 	if (!inform.isEmpty()) {
 		if (const auto window = Core::App().windowFor(
-				Window::SeparateId(_user))) {
+				::Window::SeparateId(_user))) {
 			window->show(Ui::MakeInformBox(inform));
 		} else {
 			Ui::show(Ui::MakeInformBox(inform));
@@ -1446,6 +1649,10 @@ void Call::handleControllerError(const QString &error) {
 void Call::destroyController() {
 	_instanceLifetime.destroy();
 	Core::App().mediaDevices().setCaptureMuteTracker(this, false);
+	if (_systemAudioCapture) {
+		_systemAudioCapture->stop();
+		_systemAudioCapture = nullptr;
+	}
 
 	if (_instance) {
 		_instance->stop([](tgcalls::FinalState) {
@@ -1463,7 +1670,6 @@ Call::~Call() {
 }
 
 void UpdateConfig(const std::string &data) {
-	tgcalls::SetLegacyGlobalServerConfig(data);
 }
 
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_call.h b/Telegram/SourceFiles/calls/calls_call.h
index 1d01d6d5f548ce..d40d0794c40e69 100644
--- a/Telegram/SourceFiles/calls/calls_call.h
+++ b/Telegram/SourceFiles/calls/calls_call.h
@@ -13,6 +13,11 @@ For license and copyright information please follow this link:
 #include "mtproto/sender.h"
 #include "mtproto/mtproto_auth_key.h"
 #include "webrtc/webrtc_device_resolver.h"
+#include "webrtc/webrtc_system_audio_capture.h"
+
+namespace Data {
+class GroupCall;
+} // namespace Data
 
 namespace Media {
 namespace Audio {
@@ -36,6 +41,8 @@ struct DeviceResolvedId;
 
 namespace Calls {
 
+struct StartConferenceInfo;
+
 struct DhConfig {
 	int32 version = 0;
 	int32 g = 0;
@@ -98,6 +105,13 @@ class Call final
 		not_null<UserData*> user,
 		Type type,
 		bool video);
+	Call(
+		not_null<Delegate*> delegate,
+		not_null<UserData*> user,
+		CallId conferenceId,
+		MsgId conferenceInviteMsgId,
+		std::vector<not_null<PeerData*>> conferenceParticipants,
+		bool video);
 
 	[[nodiscard]] Type type() const {
 		return _type;
@@ -108,6 +122,19 @@ class Call final
 	[[nodiscard]] CallId id() const {
 		return _id;
 	}
+	[[nodiscard]] bool conferenceInvite() const {
+		return _conferenceId != 0;
+	}
+	[[nodiscard]] CallId conferenceId() const {
+		return _conferenceId;
+	}
+	[[nodiscard]] MsgId conferenceInviteMsgId() const {
+		return _conferenceInviteMsgId;
+	}
+	[[nodiscard]] auto conferenceParticipants() const
+	-> const std::vector<not_null<PeerData*>> & {
+		return _conferenceParticipants;
+	}
 	[[nodiscard]] bool isIncomingWaiting() const;
 
 	void start(bytes::const_span random);
@@ -122,6 +149,7 @@ class Call final
 		FailedHangingUp,
 		Failed,
 		HangingUp,
+		MigrationHangingUp,
 		Ended,
 		EndedByOtherDevice,
 		ExchangingKeys,
@@ -143,6 +171,10 @@ class Call final
 		return _errors.events();
 	}
 
+	[[nodiscard]] rpl::producer<bool> confereceSupportedValue() const {
+		return _conferenceSupported.value();
+	}
+
 	enum class RemoteAudioState {
 		Muted,
 		Active,
@@ -198,7 +230,9 @@ class Call final
 
 	void applyUserConfirmation();
 	void answer();
-	void hangup();
+	void hangup(
+		Data::GroupCall *migrateCall = nullptr,
+		const QString &migrateSlug = QString());
 	void redial();
 
 	bool isKeyShaForFingerprintReady() const;
@@ -219,7 +253,14 @@ class Call final
 	[[nodiscard]] QString cameraSharingDeviceId() const;
 	[[nodiscard]] QString screenSharingDeviceId() const;
 	void toggleCameraSharing(bool enabled);
-	void toggleScreenSharing(std::optional<QString> uniqueId);
+	void toggleScreenSharing(
+		std::optional<QString> uniqueId,
+		bool withAudio = false);
+	[[nodiscard]] bool screenSharingWithAudio() const {
+		return _screenWithAudio;
+	}
+	[[nodiscard]] auto peekVideoCapture() const
+		-> std::shared_ptr<tgcalls::VideoCaptureInterface>;
 
 	[[nodiscard]] auto playbackDeviceIdValue() const
 		-> rpl::producer<Webrtc::DeviceResolvedId>;
@@ -246,7 +287,9 @@ class Call final
 	void finish(
 		FinishType type,
 		const MTPPhoneCallDiscardReason &reason
-			= MTP_phoneCallDiscardReasonDisconnect());
+			= MTP_phoneCallDiscardReasonDisconnect(),
+		Data::GroupCall *migrateCall = nullptr);
+	void finishByMigration(const QString &slug);
 	void startOutgoing();
 	void startIncoming();
 	void startWaitingTrack();
@@ -263,6 +306,7 @@ class Call final
 	bool checkCallFields(const MTPDphoneCallAccepted &call);
 
 	void actuallyAnswer();
+	void acceptConferenceInvite();
 	void confirmAcceptedCall(const MTPDphoneCallAccepted &call);
 	void startConfirmedCall(const MTPDphoneCall &call);
 	void setState(State state);
@@ -280,11 +324,15 @@ class Call final
 		tgcalls::AudioState audio,
 		tgcalls::VideoState video);
 
+	[[nodiscard]] StartConferenceInfo migrateConferenceInfo(
+		StartConferenceInfo extend);
+
 	const not_null<Delegate*> _delegate;
 	const not_null<UserData*> _user;
 	MTP::Sender _api;
 	Type _type = Type::Outgoing;
 	rpl::variable<State> _state = State::Starting;
+	rpl::variable<bool> _conferenceSupported = false;
 	rpl::variable<RemoteAudioState> _remoteAudioState
 		= RemoteAudioState::Active;
 	rpl::variable<Webrtc::VideoState> _remoteVideoState;
@@ -316,10 +364,16 @@ class Call final
 	uint64 _accessHash = 0;
 	uint64 _keyFingerprint = 0;
 
+	CallId _conferenceId = 0;
+	MsgId _conferenceInviteMsgId = 0;
+	std::vector<not_null<PeerData*>> _conferenceParticipants;
+
 	std::unique_ptr<tgcalls::Instance> _instance;
 	std::shared_ptr<tgcalls::VideoCaptureInterface> _videoCapture;
 	QString _videoCaptureDeviceId;
 	bool _videoCaptureIsScreencast = false;
+	bool _screenWithAudio = false;
+	std::unique_ptr<Webrtc::SystemAudioCapture> _systemAudioCapture;
 	const std::unique_ptr<Webrtc::VideoTrack> _videoIncoming;
 	const std::unique_ptr<Webrtc::VideoTrack> _videoOutgoing;
 
diff --git a/Telegram/SourceFiles/calls/calls_controller_webrtc.cpp b/Telegram/SourceFiles/calls/calls_controller_webrtc.cpp
index 6df83c2d5bf33f..1b10e6044ef9a0 100644
--- a/Telegram/SourceFiles/calls/calls_controller_webrtc.cpp
+++ b/Telegram/SourceFiles/calls/calls_controller_webrtc.cpp
@@ -150,7 +150,7 @@ void WebrtcController::setOnStateUpdated(
 		Fn<void(TgVoipState)> onStateUpdated) {
 	_stateUpdatedLifetime.destroy();
 	_impl->state().changes(
-	) | rpl::start_with_next([=](CallState state) {
+	) | rpl::on_next([=](CallState state) {
 		onStateUpdated([&] {
 			switch (state) {
 			case CallState::Initializing: return TgVoipState::WaitInit;
diff --git a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
index d6b6ca32a3ddd2..041837048128ef 100644
--- a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
+++ b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
@@ -7,20 +7,29 @@ For license and copyright information please follow this link:
 */
 #include "calls/calls_emoji_fingerprint.h"
 
+#include "base/random.h"
 #include "calls/calls_call.h"
 #include "calls/calls_signal_bars.h"
 #include "lang/lang_keys.h"
 #include "data/data_user.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/labels.h"
 #include "ui/widgets/tooltip.h"
+#include "ui/abstract_button.h"
 #include "ui/emoji_config.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
+#include "ui/ui_utility.h"
 #include "styles/style_calls.h"
 
 namespace Calls {
 namespace {
 
-constexpr auto kTooltipShowTimeoutMs = 1000;
+constexpr auto kTooltipShowTimeoutMs = crl::time(1000);
+constexpr auto kCarouselOneDuration = crl::time(100);
+constexpr auto kStartTimeShift = crl::time(50);
+constexpr auto kEmojiInFingerprint = 4;
+constexpr auto kEmojiInCarousel = 10;
 
 const ushort Data[] = {
 0xd83d, 0xde09, 0xd83d, 0xde0d, 0xd83d, 0xde1b, 0xd83d, 0xde2d, 0xd83d, 0xde31, 0xd83d, 0xde21,
@@ -109,8 +118,11 @@ const ushort Offsets[] = {
 620, 622, 624, 626, 628, 630, 632, 634, 636, 638, 640, 641,
 642, 643, 644, 646, 648, 650, 652, 654, 656, 658 };
 
+constexpr auto kEmojiCount = (base::array_size(Offsets) - 1);
+
 uint64 ComputeEmojiIndex(bytes::const_span bytes) {
 	Expects(bytes.size() == 8);
+
 	return ((gsl::to_integer<uint64>(bytes[0]) & 0x7F) << 56)
 		| (gsl::to_integer<uint64>(bytes[1]) << 48)
 		| (gsl::to_integer<uint64>(bytes[2]) << 40)
@@ -121,40 +133,41 @@ uint64 ComputeEmojiIndex(bytes::const_span bytes) {
 		| (gsl::to_integer<uint64>(bytes[7]));
 }
 
+[[nodiscard]] EmojiPtr EmojiByIndex(int index) {
+	Expects(index >= 0 && index < kEmojiCount);
+
+	const auto offset = Offsets[index];
+	const auto size = Offsets[index + 1] - offset;
+	const auto string = QString::fromRawData(
+		reinterpret_cast<const QChar*>(Data + offset),
+		size);
+	return Ui::Emoji::Find(string);
+}
+
 } // namespace
 
 std::vector<EmojiPtr> ComputeEmojiFingerprint(not_null<Call*> call) {
-	auto result = std::vector<EmojiPtr>();
-	constexpr auto EmojiCount = (base::array_size(Offsets) - 1);
-	for (auto index = 0; index != EmojiCount; ++index) {
-		auto offset = Offsets[index];
-		auto size = Offsets[index + 1] - offset;
-		auto string = QString::fromRawData(
-			reinterpret_cast<const QChar*>(Data + offset),
-			size);
-		auto emoji = Ui::Emoji::Find(string);
-		Assert(emoji != nullptr);
+	if (!call->isKeyShaForFingerprintReady()) {
+		return {};
 	}
-	if (call->isKeyShaForFingerprintReady()) {
-		auto sha256 = call->getKeyShaForFingerprint();
-		constexpr auto kPartSize = 8;
-		for (auto partOffset = 0; partOffset != sha256.size(); partOffset += kPartSize) {
-			auto value = ComputeEmojiIndex(gsl::make_span(sha256).subspan(partOffset, kPartSize));
-			auto index = value % EmojiCount;
-			auto offset = Offsets[index];
-			auto size = Offsets[index + 1] - offset;
-			auto string = QString::fromRawData(
-				reinterpret_cast<const QChar*>(Data + offset),
-				size);
-			auto emoji = Ui::Emoji::Find(string);
-			Assert(emoji != nullptr);
-			result.push_back(emoji);
-		}
+	return ComputeEmojiFingerprint(call->getKeyShaForFingerprint());
+}
+
+std::vector<EmojiPtr> ComputeEmojiFingerprint(
+		bytes::const_span fingerprint) {
+	auto result = std::vector<EmojiPtr>();
+	constexpr auto kPartSize = 8;
+	for (auto partOffset = 0
+		; partOffset != fingerprint.size()
+		; partOffset += kPartSize) {
+		const auto value = ComputeEmojiIndex(
+			fingerprint.subspan(partOffset, kPartSize));
+		result.push_back(EmojiByIndex(value % kEmojiCount));
 	}
 	return result;
 }
 
-object_ptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
+base::unique_qptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 		not_null<QWidget*> parent,
 		not_null<Call*> call) {
 	class EmojiTooltipShower final : public Ui::AbstractTooltipShower {
@@ -180,8 +193,8 @@ object_ptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 
 	};
 
-	auto result = object_ptr<Ui::RpWidget>(parent);
-	const auto raw = result.data();
+	auto result = base::make_unique_q<Ui::RpWidget>(parent);
+	const auto raw = result.get();
 
 	// Emoji tooltip.
 	const auto shower = raw->lifetime().make_state<EmojiTooltipShower>(
@@ -192,7 +205,7 @@ object_ptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 			call->user()->name()));
 	raw->setMouseTracking(true);
 	raw->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseMove) {
 			Ui::Tooltip::Show(kTooltipShowTimeoutMs, shower);
 		} else if (e->type() == QEvent::Leave) {
@@ -241,7 +254,7 @@ object_ptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 		rpl::single(rpl::empty),
 		Ui::Emoji::Updated(),
 		style::PaletteChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		background->fill(Qt::transparent);
 
 		// Prepare.
@@ -287,7 +300,7 @@ object_ptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 	}, raw->lifetime());
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(raw).drawImage(raw->rect(), *background);
 	}, raw->lifetime());
 
@@ -295,4 +308,530 @@ object_ptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 	return result;
 }
 
+FingerprintBadge SetupFingerprintBadge(
+		rpl::lifetime &on,
+		rpl::producer<QByteArray> fingerprint) {
+	struct State {
+		FingerprintBadgeState data;
+		Ui::Animations::Basic animation;
+		Fn<void(crl::time)> update;
+		rpl::event_stream<> repaints;
+	};
+	const auto state = on.make_state<State>();
+
+	state->data.speed = 1. / kCarouselOneDuration;
+	state->update = [=](crl::time now) {
+		// speed-up-duration = 2 * one / speed.
+		const auto one = 1.;
+		const auto speedUpDuration = 2 * kCarouselOneDuration;
+		const auto speed0 = one / kCarouselOneDuration;
+
+		auto updated = false;
+		auto animating = false;
+		for (auto &entry : state->data.entries) {
+			if (!entry.time) {
+				continue;
+			}
+			animating = true;
+			if (entry.time >= now) {
+				continue;
+			}
+
+			updated = true;
+			const auto elapsed = (now - entry.time) * 1.;
+			entry.time = now;
+
+			Assert(!entry.emoji || entry.sliding.size() > 1);
+			const auto slideCount = entry.emoji
+				? (int(entry.sliding.size()) - 1) * one
+				: (kEmojiInCarousel + (elapsed / kCarouselOneDuration));
+			const auto finalPosition = slideCount * one;
+			const auto distance = finalPosition - entry.position;
+
+			const auto accelerate0 = speed0 - entry.speed;
+			const auto decelerate0 = speed0;
+			const auto acceleration0 = speed0 / speedUpDuration;
+			const auto taccelerate0 = accelerate0 / acceleration0;
+			const auto tdecelerate0 = decelerate0 / acceleration0;
+			const auto paccelerate0 = entry.speed * taccelerate0
+				+ acceleration0 * taccelerate0 * taccelerate0 / 2.;
+			const auto pdecelerate0 = 0
+				+ acceleration0 * tdecelerate0 * tdecelerate0 / 2.;
+			const auto ttozero = entry.speed / acceleration0;
+			if (paccelerate0 + pdecelerate0 <= distance) {
+				// We have time to accelerate to speed0,
+				// maybe go some time on speed0 and then decelerate to 0.
+				const auto uaccelerate0 = std::min(taccelerate0, elapsed);
+				const auto left = distance - paccelerate0 - pdecelerate0;
+				const auto tconstant = left / speed0;
+				const auto uconstant = std::min(
+					tconstant,
+					elapsed - uaccelerate0);
+				const auto udecelerate0 = std::min(
+					tdecelerate0,
+					elapsed - uaccelerate0 - uconstant);
+				if (udecelerate0 >= tdecelerate0) {
+					Assert(entry.emoji != nullptr);
+					entry = { .emoji = entry.emoji };
+				} else {
+					entry.position += entry.speed * uaccelerate0
+						+ acceleration0 * uaccelerate0 * uaccelerate0 / 2.
+						+ speed0 * uconstant
+						+ speed0 * udecelerate0
+						- acceleration0 * udecelerate0 * udecelerate0 / 2.;
+					entry.speed += acceleration0
+						* (uaccelerate0 - udecelerate0);
+				}
+			} else if (acceleration0 * ttozero * ttozero / 2 <= distance) {
+				// We have time to accelerate at least for some time >= 0,
+				// and then decelerate to 0 to make it to final position.
+				//
+				// peak = entry.speed + acceleration0 * t
+				// tdecelerate = peak / acceleration0
+				// distance = entry.speed * t
+				//     + acceleration0 * t * t / 2
+				//     + acceleration0 * tdecelerate * tdecelerate / 2
+				const auto det = entry.speed * entry.speed / 2
+					+ distance * acceleration0;
+				const auto t = std::max(
+					(sqrt(det) - entry.speed) / acceleration0,
+					0.);
+
+				const auto taccelerate = t;
+				const auto uaccelerate = std::min(taccelerate, elapsed);
+				const auto tdecelerate = t + (entry.speed / acceleration0);
+				const auto udecelerate = std::min(
+					tdecelerate,
+					elapsed - uaccelerate);
+				if (udecelerate >= tdecelerate) {
+					Assert(entry.emoji != nullptr);
+					entry = { .emoji = entry.emoji };
+				} else {
+					const auto topspeed = entry.speed
+						+ acceleration0 * taccelerate;
+					entry.position += entry.speed * uaccelerate
+						+ acceleration0 * uaccelerate * uaccelerate / 2.
+						+ topspeed * udecelerate
+						- acceleration0 * udecelerate * udecelerate / 2.;
+					entry.speed += acceleration0
+						* (uaccelerate - udecelerate);
+				}
+			} else {
+				// We just need to decelerate to 0,
+				// faster than acceleration0.
+				Assert(entry.speed > 0);
+				const auto tdecelerate = 2 * distance / entry.speed;
+				const auto udecelerate = std::min(tdecelerate, elapsed);
+				if (udecelerate >= tdecelerate) {
+					Assert(entry.emoji != nullptr);
+					entry = { .emoji = entry.emoji };
+				} else {
+					const auto a = entry.speed / tdecelerate;
+					entry.position += entry.speed * udecelerate
+						- a * udecelerate * udecelerate / 2;
+					entry.speed -= a * udecelerate;
+				}
+			}
+
+			if (entry.position >= kEmojiInCarousel) {
+				entry.position -= qFloor(entry.position / kEmojiInCarousel)
+					* kEmojiInCarousel;
+			}
+			while (entry.position >= 1.) {
+				Assert(!entry.sliding.empty());
+				entry.position -= 1.;
+				entry.sliding.erase(begin(entry.sliding));
+				if (entry.emoji && entry.sliding.size() < 2) {
+					entry = { .emoji = entry.emoji };
+					break;
+				} else if (entry.sliding.empty()) {
+					const auto index = (entry.added++) % kEmojiInCarousel;
+					entry.sliding.push_back(entry.carousel[index]);
+				}
+			}
+			if (!entry.emoji
+				&& entry.position > 0.
+				&& entry.sliding.size() < 2) {
+				const auto index = (entry.added++) % kEmojiInCarousel;
+				entry.sliding.push_back(entry.carousel[index]);
+			}
+		}
+		if (!animating) {
+			state->animation.stop();
+		} else if (updated) {
+			state->repaints.fire({});
+		}
+	};
+	state->animation.init(state->update);
+	state->data.entries.resize(kEmojiInFingerprint);
+
+	const auto fillCarousel = [=](
+			int index,
+			base::BufferedRandom<uint32> &buffered) {
+		auto &entry = state->data.entries[index];
+		auto indices = std::vector<int>();
+		indices.reserve(kEmojiInCarousel);
+		auto count = kEmojiCount;
+		for (auto i = 0; i != kEmojiInCarousel; ++i, --count) {
+			auto index = base::RandomIndex(count, buffered);
+			for (const auto &already : indices) {
+				if (index >= already) {
+					++index;
+				}
+			}
+			indices.push_back(index);
+		}
+
+		entry.carousel.clear();
+		entry.carousel.reserve(kEmojiInCarousel);
+		for (const auto index : indices) {
+			entry.carousel.push_back(EmojiByIndex(index));
+		}
+	};
+
+	const auto startTo = [=](
+			int index,
+			EmojiPtr emoji,
+			crl::time now,
+			base::BufferedRandom<uint32> &buffered) {
+		auto &entry = state->data.entries[index];
+		if ((entry.emoji == emoji) && (emoji || entry.time)) {
+			return;
+		} else if (!entry.time) {
+			Assert(entry.sliding.empty());
+
+			if (entry.emoji) {
+				entry.sliding.push_back(entry.emoji);
+			} else if (emoji) {
+				// Just initialize if we get emoji right from the start.
+				entry.emoji = emoji;
+				return;
+			}
+			entry.time = now + index * kStartTimeShift;
+
+			fillCarousel(index, buffered);
+		}
+		entry.emoji = emoji;
+		if (entry.emoji) {
+			entry.sliding.push_back(entry.emoji);
+		} else {
+			const auto index = (entry.added++) % kEmojiInCarousel;
+			entry.sliding.push_back(entry.carousel[index]);
+		}
+	};
+
+	std::move(
+		fingerprint
+	) | rpl::on_next([=](const QByteArray &fingerprint) {
+		auto buffered = base::BufferedRandom<uint32>(
+			kEmojiInCarousel * kEmojiInFingerprint);
+		const auto now = crl::now();
+		const auto emoji = (fingerprint.size() >= 32)
+			? ComputeEmojiFingerprint(
+				bytes::make_span(fingerprint).subspan(0, 32))
+			: std::vector<EmojiPtr>();
+		state->update(now);
+
+		if (emoji.size() == kEmojiInFingerprint) {
+			for (auto i = 0; i != kEmojiInFingerprint; ++i) {
+				startTo(i, emoji[i], now, buffered);
+			}
+		} else {
+			for (auto i = 0; i != kEmojiInFingerprint; ++i) {
+				startTo(i, nullptr, now, buffered);
+			}
+		}
+		if (!state->animation.animating()) {
+			state->animation.start();
+		}
+	}, on);
+
+	return { .state = &state->data, .repaints = state->repaints.events() };
+}
+
+void SetupFingerprintTooltip(not_null<Ui::RpWidget*> widget) {
+	struct State {
+		std::unique_ptr<Ui::ImportantTooltip> tooltip;
+		Fn<void()> updateGeometry;
+		Fn<void(bool)> toggleTooltip;
+		bool tooltipShown = false;
+	};
+	const auto state = widget->lifetime().make_state<State>();
+	state->updateGeometry = [=] {
+		if (!state->tooltip.get()) {
+			return;
+		}
+		const auto geometry = Ui::MapFrom(
+			widget->window(),
+			widget,
+			widget->rect());
+		if (geometry.isEmpty()) {
+			state->toggleTooltip(false);
+			return;
+		}
+		const auto weak = QPointer<QWidget>(state->tooltip.get());
+		const auto countPosition = [=](QSize size) {
+			const auto result = geometry.bottomLeft()
+				+ QPoint(
+					geometry.width() / 2,
+					st::confcallFingerprintTooltipSkip)
+				- QPoint(size.width() / 2, 0);
+			return result;
+		};
+		state->tooltip.get()->pointAt(
+			geometry,
+			RectPart::Bottom,
+			countPosition);
+	};
+	state->toggleTooltip = [=](bool show) {
+		if (const auto was = state->tooltip.release()) {
+			was->toggleAnimated(false);
+		}
+		if (!show) {
+			return;
+		}
+		const auto text = tr::lng_confcall_e2e_about(
+			tr::now,
+			tr::marked);
+		if (text.empty()) {
+			return;
+		}
+		state->tooltip = std::make_unique<Ui::ImportantTooltip>(
+			widget->window(),
+			Ui::MakeNiceTooltipLabel(
+				widget,
+				rpl::single(text),
+				st::confcallFingerprintTooltipMaxWidth,
+				st::confcallFingerprintTooltipLabel),
+			st::confcallFingerprintTooltip);
+		const auto raw = state->tooltip.get();
+		const auto weak = base::make_weak(raw);
+		const auto destroy = [=] {
+			delete weak.get();
+		};
+		raw->setAttribute(Qt::WA_TransparentForMouseEvents);
+		raw->setHiddenCallback(destroy);
+		state->updateGeometry();
+		raw->toggleAnimated(true);
+	};
+
+	widget->events() | rpl::on_next([=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type == QEvent::Enter) {
+			// Enter events may come from widget destructors,
+			// in that case sync-showing tooltip (calling Grab)
+			// crashes the whole thing.
+			state->tooltipShown = true;
+			crl::on_main(widget, [=] {
+				if (state->tooltipShown) {
+					state->toggleTooltip(true);
+				}
+			});
+		} else if (type == QEvent::Leave) {
+			state->tooltipShown = false;
+			crl::on_main(widget, [=] {
+				if (!state->tooltipShown) {
+					state->toggleTooltip(false);
+				}
+			});
+		}
+	}, widget->lifetime());
+}
+
+QImage MakeVerticalShadow(int height) {
+	const auto ratio = style::DevicePixelRatio();
+	auto result = QImage(
+		QSize(1, height) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(ratio);
+	auto p = QPainter(&result);
+	auto g = QLinearGradient(0, 0, 0, height);
+	auto color = st::groupCallMembersBg->c;
+	auto trans = color;
+	trans.setAlpha(0);
+	g.setStops({
+		{ 0.0, color },
+		{ 0.4, trans },
+		{ 0.6, trans },
+		{ 1.0, color },
+	});
+	p.setCompositionMode(QPainter::CompositionMode_Source);
+	p.fillRect(0, 0, 1, height, g);
+	p.end();
+
+	return result;
+}
+
+void SetupFingerprintBadgeWidget(
+		not_null<Ui::RpWidget*> widget,
+		not_null<const FingerprintBadgeState*> state,
+		rpl::producer<> repaints) {
+	auto &lifetime = widget->lifetime();
+
+	const auto button = Ui::CreateChild<Ui::RpWidget>(widget);
+	button->show();
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		button,
+		QString(),
+		st::confcallFingerprintText);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	label->show();
+
+	const auto ratio = style::DevicePixelRatio();
+	const auto esize = Ui::Emoji::GetSizeNormal();
+	const auto size = esize / ratio;
+	widget->widthValue() | rpl::on_next([=](int width) {
+		static_assert(!(kEmojiInFingerprint % 2));
+
+		const auto available = width
+			- st::confcallFingerprintMargins.left()
+			- st::confcallFingerprintMargins.right()
+			- (kEmojiInFingerprint * size)
+			- (kEmojiInFingerprint - 2) * st::confcallFingerprintSkip
+			- st::confcallFingerprintTextMargins.left()
+			- st::confcallFingerprintTextMargins.right();
+		if (available <= 0) {
+			return;
+		}
+		label->setText(tr::lng_confcall_e2e_badge(tr::now));
+		if (label->textMaxWidth() > available) {
+			label->setText(tr::lng_confcall_e2e_badge_small(tr::now));
+		}
+		const auto use = std::min(available, label->textMaxWidth());
+		label->resizeToWidth(use);
+
+		const auto ontheleft = kEmojiInFingerprint / 2;
+		const auto ontheside = ontheleft * size
+			+ (ontheleft - 1) * st::confcallFingerprintSkip;
+		const auto text = QRect(
+			(width - use) / 2,
+			(st::confcallFingerprintMargins.top()
+				+ st::confcallFingerprintTextMargins.top()),
+			use,
+			label->height());
+		const auto textOuter = text.marginsAdded(
+			st::confcallFingerprintTextMargins);
+		const auto withEmoji = QRect(
+			textOuter.x() - ontheside,
+			textOuter.y(),
+			textOuter.width() + ontheside * 2,
+			size);
+		const auto outer = withEmoji.marginsAdded(
+			st::confcallFingerprintMargins);
+
+		button->setGeometry(outer);
+		label->moveToLeft(text.x() - outer.x(), text.y() - outer.y(), width);
+
+		widget->resize(
+			width,
+			button->height() + st::confcallFingerprintBottomSkip);
+	}, lifetime);
+
+	const auto cache = lifetime.make_state<FingerprintBadgeCache>();
+	button->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(button);
+
+		const auto outer = button->rect();
+		const auto radius = outer.height() / 2.;
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::groupCallMembersBg);
+		p.drawRoundedRect(outer, radius, radius);
+		p.setClipRect(outer);
+
+		const auto withEmoji = outer.marginsRemoved(
+			st::confcallFingerprintMargins);
+		p.translate(withEmoji.topLeft());
+
+		const auto text = label->geometry();
+		const auto textOuter = text.marginsAdded(
+			st::confcallFingerprintTextMargins);
+		const auto count = int(state->entries.size());
+		cache->entries.resize(count);
+		cache->shadow = MakeVerticalShadow(outer.height());
+		for (auto i = 0; i != count; ++i) {
+			const auto &entry = state->entries[i];
+			auto &cached = cache->entries[i];
+			const auto shadowed = entry.speed / state->speed;
+			PaintFingerprintEntry(p, entry, cached, esize);
+			if (shadowed > 0.) {
+				p.setOpacity(shadowed);
+				p.drawImage(
+					QRect(0, -st::confcallFingerprintMargins.top(), size, outer.height()),
+					cache->shadow);
+				p.setOpacity(1.);
+			}
+			if (i + 1 == count / 2) {
+				p.translate(size + textOuter.width(), 0);
+			} else {
+				p.translate(size + st::confcallFingerprintSkip, 0);
+			}
+		}
+	}, lifetime);
+
+	std::move(repaints) | rpl::on_next([=] {
+		button->update();
+	}, lifetime);
+
+	SetupFingerprintTooltip(button);
+}
+
+void PaintFingerprintEntry(
+		QPainter &p,
+		const FingerprintBadgeState::Entry &entry,
+		FingerprintBadgeCache::Entry &cache,
+		int esize) {
+	const auto stationary = !entry.time;
+	if (stationary) {
+		Ui::Emoji::Draw(p, entry.emoji, esize, 0, 0);
+		return;
+	}
+	const auto ratio = style::DevicePixelRatio();
+	const auto size = esize / ratio;
+	const auto add = 4;
+	const auto height = size + 2 * add;
+	const auto validateCache = [&](int index, EmojiPtr e) {
+		if (cache.emoji.size() <= index) {
+			cache.emoji.reserve(entry.carousel.size() + 2);
+			cache.emoji.resize(index + 1);
+		}
+		auto &emoji = cache.emoji[index];
+		if (emoji.ptr != e) {
+			emoji.ptr = e;
+			emoji.image = QImage(
+				QSize(size, height) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			emoji.image.setDevicePixelRatio(ratio);
+			emoji.image.fill(Qt::transparent);
+			auto q = QPainter(&emoji.image);
+			Ui::Emoji::Draw(q, e, esize, 0, add);
+			q.end();
+
+			//emoji.image = Images::Blur(
+			//	std::move(emoji.image),
+			//	false,
+			//	Qt::Vertical);
+		}
+		return &emoji;
+	};
+	auto shift = entry.position * height - add;
+	p.translate(0, shift);
+	for (const auto &e : entry.sliding) {
+		const auto index = [&] {
+			const auto i = ranges::find(entry.carousel, e);
+			if (i != end(entry.carousel)) {
+				return int(i - begin(entry.carousel));
+			}
+			return int(entry.carousel.size())
+				+ ((e == entry.sliding.back()) ? 1 : 0);
+		}();
+		const auto entry = validateCache(index, e);
+		p.drawImage(0, 0, entry->image);
+		p.translate(0, -height);
+		shift -= height;
+	}
+	p.translate(0, -shift);
+}
+
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.h b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.h
index 9ec4e9b6848c61..56776b8e1b2975 100644
--- a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.h
+++ b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.h
@@ -7,7 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "base/object_ptr.h"
+#include "base/unique_qptr.h"
 
 namespace Ui {
 class RpWidget;
@@ -19,9 +19,54 @@ class Call;
 
 [[nodiscard]] std::vector<EmojiPtr> ComputeEmojiFingerprint(
 	not_null<Call*> call);
+[[nodiscard]] std::vector<EmojiPtr> ComputeEmojiFingerprint(
+	bytes::const_span fingerprint);
 
-[[nodiscard]] object_ptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
+[[nodiscard]] base::unique_qptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 	not_null<QWidget*> parent,
 	not_null<Call*> call);
 
+struct FingerprintBadgeState {
+	struct Entry {
+		EmojiPtr emoji = nullptr;
+		std::vector<EmojiPtr> sliding;
+		std::vector<EmojiPtr> carousel;
+		crl::time time = 0;
+		float64 speed = 0.;
+		float64 position = 0.;
+		int added = 0;
+	};
+	std::vector<Entry> entries;
+	float64 speed = 1.;
+};
+struct FingerprintBadge {
+	not_null<const FingerprintBadgeState*> state;
+	rpl::producer<> repaints;
+};
+FingerprintBadge SetupFingerprintBadge(
+	rpl::lifetime &on,
+	rpl::producer<QByteArray> fingerprint);
+
+void SetupFingerprintBadgeWidget(
+	not_null<Ui::RpWidget*> widget,
+	not_null<const FingerprintBadgeState*> state,
+	rpl::producer<> repaints);
+
+struct FingerprintBadgeCache {
+	struct Emoji {
+		EmojiPtr ptr = nullptr;
+		QImage image;
+	};
+	struct Entry {
+		std::vector<Emoji> emoji;
+	};
+	std::vector<Entry> entries;
+	QImage shadow;
+};
+void PaintFingerprintEntry(
+	QPainter &p,
+	const FingerprintBadgeState::Entry &entry,
+	FingerprintBadgeCache::Entry &cache,
+	int esize);
+
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index 118532d165e076..42c7806086fcb4 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -12,9 +12,13 @@ For license and copyright information please follow this link:
 #include "calls/group/calls_choose_join_as.h"
 #include "calls/group/calls_group_call.h"
 #include "calls/group/calls_group_rtmp.h"
+#include "history/history.h"
+#include "history/history_item.h"
 #include "mtproto/mtproto_dh_utils.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "main/session/session_show.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "main/main_account.h"
 #include "apiwrap.h"
@@ -26,8 +30,10 @@ For license and copyright information please follow this link:
 #include "calls/calls_panel.h"
 #include "data/data_user.h"
 #include "data/data_group_call.h"
+#include "data/data_changes.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
+#include "data/data_histories.h"
 #include "data/data_session.h"
 #include "media/audio/media_audio_track.h"
 #include "platform/platform_specific.h"
@@ -103,6 +109,8 @@ void Instance::Delegate::callFailed(not_null<Call*> call) {
 }
 
 void Instance::Delegate::callRedial(not_null<Call*> call) {
+	Expects(!call->conferenceInvite());
+
 	if (_instance->_currentCall.get() == call) {
 		_instance->refreshDhConfig();
 	}
@@ -156,6 +164,8 @@ void Instance::Delegate::groupCallPlaySound(GroupCallSound sound) {
 		case GroupCallSound::Ended: return "group_call_end";
 		case GroupCallSound::AllowedToSpeak: return "group_call_allowed";
 		case GroupCallSound::Connecting: return "group_call_connect";
+		case GroupCallSound::RecordingStarted:
+			return "group_call_recording_start";
 		}
 		Unexpected("GroupCallSound in Instance::groupCallPlaySound.");
 	}());
@@ -186,7 +196,9 @@ Instance::~Instance() {
 	}
 }
 
-void Instance::startOutgoingCall(not_null<UserData*> user, bool video) {
+void Instance::startOutgoingCall(
+		not_null<UserData*> user,
+		StartOutgoingCallArgs args) {
 	if (activateCurrentCall()) {
 		return;
 	}
@@ -200,8 +212,8 @@ void Instance::startOutgoingCall(not_null<UserData*> user, bool video) {
 		return;
 	}
 	requestPermissionsOrFail(crl::guard(this, [=] {
-		createCall(user, Call::Type::Outgoing, video);
-	}), video);
+		createCall(user, Call::Type::Outgoing, args);
+	}), args.video);
 }
 
 void Instance::startOrJoinGroupCall(
@@ -230,6 +242,78 @@ void Instance::startOrJoinGroupCall(
 	});
 }
 
+void Instance::startOrJoinConferenceCall(StartConferenceInfo args) {
+	Expects(args.call || args.show);
+
+	const auto migrationInfo = (args.migrating
+		&& args.call
+		&& _currentCallPanel)
+		? _currentCallPanel->migrationInfo()
+		: ConferencePanelMigration();
+	if (!args.migrating) {
+		destroyCurrentCall();
+	}
+
+	const auto session = args.show
+		? &args.show->session()
+		: &args.call->session();
+	auto call = std::make_unique<GroupCall>(_delegate.get(), args);
+	const auto raw = call.get();
+
+	session->account().sessionChanges(
+	) | rpl::on_next([=] {
+		destroyGroupCall(raw);
+	}, raw->lifetime());
+
+	if (args.call) {
+		_currentGroupCallPanel = std::make_unique<Group::Panel>(
+			raw,
+			migrationInfo);
+		_currentGroupCall = std::move(call);
+		_currentGroupCallChanges.fire_copy(raw);
+		finishConferenceInvitations(args);
+		if (args.migrating) {
+			destroyCurrentCall(args.call.get(), args.linkSlug);
+		}
+	} else {
+		if (const auto was = base::take(_startingGroupCall)) {
+			destroyGroupCall(was.get());
+		}
+		_startingGroupCall = std::move(call);
+	}
+}
+
+void Instance::startedConferenceReady(
+		not_null<GroupCall*> call,
+		StartConferenceInfo args) {
+	if (_startingGroupCall.get() != call) {
+		return;
+	}
+	const auto migrationInfo = _currentCallPanel
+		? _currentCallPanel->migrationInfo()
+		: ConferencePanelMigration();
+	_currentGroupCallPanel = std::make_unique<Group::Panel>(
+		call,
+		migrationInfo);
+	_currentGroupCall = std::move(_startingGroupCall);
+	_currentGroupCallChanges.fire_copy(call);
+	const auto real = call->sharedCall().get();
+	const auto link = real->conferenceInviteLink();
+	const auto slug = Group::ExtractConferenceSlug(link);
+	finishConferenceInvitations(args);
+	destroyCurrentCall(real, slug);
+}
+
+void Instance::finishConferenceInvitations(const StartConferenceInfo &args) {
+	Expects(_currentGroupCallPanel != nullptr);
+
+	if (!args.invite.empty()) {
+		_currentGroupCallPanel->migrationInviteUsers(std::move(args.invite));
+	} else if (args.sharingLink) {
+		_currentGroupCallPanel->migrationShowShareLink();
+	}
+}
+
 void Instance::confirmLeaveCurrent(
 		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
@@ -310,7 +394,11 @@ void Instance::playSoundOnce(const QString &key) {
 
 void Instance::destroyCall(not_null<Call*> call) {
 	if (_currentCall.get() == call) {
-		_currentCallPanel->closeBeforeDestroy();
+		const auto groupCallWindow = _currentGroupCallPanel
+			? _currentGroupCallPanel->window().get()
+			: nullptr;
+		const auto reused = (_currentCallPanel->window() == groupCallWindow);
+		_currentCallPanel->closeBeforeDestroy(reused);
 		_currentCallPanel = nullptr;
 
 		auto taken = base::take(_currentCall);
@@ -326,8 +414,8 @@ void Instance::destroyCall(not_null<Call*> call) {
 
 void Instance::createCall(
 		not_null<UserData*> user,
-		Call::Type type,
-		bool isVideo) {
+		CallType type,
+		StartOutgoingCallArgs args) {
 	struct Performer final {
 		explicit Performer(Fn<void(bool, bool, const Performer &)> callback)
 		: callback(std::move(callback)) {
@@ -346,7 +434,7 @@ void Instance::createCall(
 		const auto raw = call.get();
 
 		user->session().account().sessionChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			destroyCall(raw);
 		}, raw->lifetime());
 
@@ -360,7 +448,7 @@ void Instance::createCall(
 		}
 		if (raw->state() == Call::State::WaitingUserConfirmation) {
 			_currentCallPanel->startOutgoingRequests(
-			) | rpl::start_with_next([=](bool video) {
+			) | rpl::on_next([=](bool video) {
 				repeater.callback(video, true, repeater);
 			}, raw->lifetime());
 		} else {
@@ -369,7 +457,7 @@ void Instance::createCall(
 		}
 		_currentCallChanges.fire_copy(raw);
 	});
-	performer.callback(isVideo, false, performer);
+	performer.callback(args.video, args.isConfirmed, performer);
 }
 
 void Instance::destroyGroupCall(not_null<GroupCall*> call) {
@@ -385,6 +473,8 @@ void Instance::destroyGroupCall(not_null<GroupCall*> call) {
 			LOG(("Calls::Instance doesn't prevent quit any more."));
 		}
 		Core::App().quitPreventFinished();
+	} else if (_startingGroupCall.get() == call) {
+		base::take(_startingGroupCall);
 	}
 }
 
@@ -400,7 +490,7 @@ void Instance::createGroupCall(
 	const auto raw = call.get();
 
 	info.peer->session().account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		destroyGroupCall(raw);
 	}, raw->lifetime());
 
@@ -411,6 +501,7 @@ void Instance::createGroupCall(
 
 void Instance::refreshDhConfig() {
 	Expects(_currentCall != nullptr);
+	Expects(!_currentCall->conferenceInvite());
 
 	const auto weak = base::make_weak(_currentCall);
 	_currentCall->user()->session().api().request(MTPmessages_GetDhConfig(
@@ -505,6 +596,16 @@ void Instance::handleUpdate(
 		handleGroupCallUpdate(session, update);
 	}, [&](const MTPDupdateGroupCallParticipants &data) {
 		handleGroupCallUpdate(session, update);
+	}, [&](const MTPDupdateGroupCallChainBlocks &data) {
+		handleGroupCallUpdate(session, update);
+	}, [&](const MTPDupdateGroupCallMessage &data) {
+		handleGroupCallUpdate(session, update);
+	}, [&](const MTPDupdateGroupCallEncryptedMessage &data) {
+		handleGroupCallUpdate(session, update);
+	}, [&](const MTPDupdateDeleteGroupCallMessages &data) {
+		handleGroupCallUpdate(session, update);
+	}, [&](const MTPDupdateMessageID &data) {
+		handleGroupCallUpdate(session, update);
 	}, [](const auto &) {
 		Unexpected("Update type in Calls::Instance::handleUpdate.");
 	});
@@ -542,6 +643,10 @@ FnMut<void()> Instance::addAsyncWaiter() {
 	};
 }
 
+void Instance::registerVideoStream(not_null<GroupCall*> call) {
+	_streams[&call->peer()->session()].push_back(call);
+}
+
 bool Instance::isSharingScreen() const {
 	return (_currentCall && _currentCall->isSharingScreen())
 		|| (_currentGroupCall && _currentGroupCall->isSharingScreen());
@@ -578,8 +683,7 @@ void Instance::handleCallUpdate(
 		if (inCall()
 			&& _currentCall->type() == Call::Type::Outgoing
 			&& _currentCall->user()->id == session->userPeerId()
-			&& (peerFromUser(phoneCall.vparticipant_id())
-				== _currentCall->user()->session().userPeerId())) {
+			&& (user->id == _currentCall->user()->session().userPeerId())) {
 			// Ignore call from the same running app, other account.
 			return;
 		}
@@ -600,7 +704,7 @@ void Instance::handleCallUpdate(
 			< base::unixtime::now()) {
 			LOG(("Ignoring too old call."));
 		} else {
-			createCall(user, Call::Type::Incoming, phoneCall.is_video());
+			createCall(user, Call::Type::Incoming, { phoneCall.is_video() });
 			_currentCall->handleUpdate(call);
 		}
 	} else if (!_currentCall
@@ -613,17 +717,60 @@ void Instance::handleCallUpdate(
 void Instance::handleGroupCallUpdate(
 		not_null<Main::Session*> session,
 		const MTPUpdate &update) {
-	if (_currentGroupCall
-		&& (&_currentGroupCall->peer()->session() == session)) {
+	if (const auto i = _streams.find(session); i != end(_streams)) {
+		for (auto j = begin(i->second); j != end(i->second);) {
+			if (const auto strong = j->get()) {
+				update.match([&](const MTPDupdateGroupCall &data) {
+					strong->handlePossibleCreateOrJoinResponse(data);
+					strong->handleUpdate(update);
+				}, [&](const MTPDupdateGroupCallConnection &data) {
+					strong->handlePossibleCreateOrJoinResponse(data);
+				}, [&](const MTPDupdateGroupCallMessage &data) {
+					strong->handleIncomingMessage(data);
+				}, [&](const MTPDupdateGroupCallEncryptedMessage &data) {
+					strong->handleIncomingMessage(data);
+				}, [&](const MTPDupdateDeleteGroupCallMessages &data) {
+					strong->handleDeleteMessages(data);
+				}, [&](const MTPDupdateMessageID &data) {
+					strong->handleMessageSent(data);
+				}, [&](const MTPDupdateGroupCallParticipants &data) {
+					strong->handleUpdate(update);
+				}, [&](const MTPDupdateGroupCallChainBlocks &data) {
+					strong->handleUpdate(update);
+				}, [](const auto &) {
+				});
+				++j;
+			} else {
+				j = i->second.erase(j);
+			}
+		}
+	}
+
+	const auto groupCall = _currentGroupCall
+		? _currentGroupCall.get()
+		: _startingGroupCall.get();
+	if (groupCall && (&groupCall->peer()->session() == session)) {
 		update.match([&](const MTPDupdateGroupCall &data) {
-			_currentGroupCall->handlePossibleCreateOrJoinResponse(data);
+			groupCall->handlePossibleCreateOrJoinResponse(data);
 		}, [&](const MTPDupdateGroupCallConnection &data) {
-			_currentGroupCall->handlePossibleCreateOrJoinResponse(data);
+			groupCall->handlePossibleCreateOrJoinResponse(data);
+		}, [&](const MTPDupdateGroupCallMessage &data) {
+			groupCall->handleIncomingMessage(data);
+		}, [&](const MTPDupdateGroupCallEncryptedMessage &data) {
+			groupCall->handleIncomingMessage(data);
+		}, [&](const MTPDupdateDeleteGroupCallMessages &data) {
+			groupCall->handleDeleteMessages(data);
+		}, [&](const MTPDupdateMessageID &data) {
+			groupCall->handleMessageSent(data);
 		}, [](const auto &) {
 		});
 	}
 
-	if (update.type() == mtpc_updateGroupCallConnection) {
+	if (update.type() == mtpc_updateGroupCallConnection
+		|| update.type() == mtpc_updateGroupCallMessage
+		|| update.type() == mtpc_updateGroupCallEncryptedMessage
+		|| update.type() == mtpc_updateDeleteGroupCallMessages
+		|| update.type() == mtpc_updateMessageID) {
 		return;
 	}
 	const auto callId = update.match([](const MTPDupdateGroupCall &data) {
@@ -633,11 +780,24 @@ void Instance::handleGroupCallUpdate(
 	}, [](const MTPDupdateGroupCallParticipants &data) {
 		return data.vcall().match([&](const MTPDinputGroupCall &data) {
 			return data.vid().v;
+		}, [](const auto &) -> CallId {
+			Unexpected("slug/msg in Instance::handleGroupCallUpdate");
+		});
+	}, [](const MTPDupdateGroupCallChainBlocks &data) {
+		return data.vcall().match([&](const MTPDinputGroupCall &data) {
+			return data.vid().v;
+		}, [](const auto &) -> CallId {
+			Unexpected("slug/msg in Instance::handleGroupCallUpdate");
 		});
 	}, [](const auto &) -> CallId {
 		Unexpected("Type in Instance::handleGroupCallUpdate.");
 	});
-	if (const auto existing = session->data().groupCall(callId)) {
+	if (update.type() == mtpc_updateGroupCallChainBlocks) {
+		const auto existing = session->data().groupCall(callId);
+		if (existing && groupCall && groupCall->lookupReal() == existing) {
+			groupCall->handleUpdate(update);
+		}
+	} else if (const auto existing = session->data().groupCall(callId)) {
 		existing->enqueueUpdate(update);
 	} else {
 		applyGroupCallUpdateChecked(session, update);
@@ -647,9 +807,11 @@ void Instance::handleGroupCallUpdate(
 void Instance::applyGroupCallUpdateChecked(
 		not_null<Main::Session*> session,
 		const MTPUpdate &update) {
-	if (_currentGroupCall
-		&& (&_currentGroupCall->peer()->session() == session)) {
-		_currentGroupCall->handleUpdate(update);
+	const auto groupCall = _currentGroupCall
+		? _currentGroupCall.get()
+		: _startingGroupCall.get();
+	if (groupCall && (&groupCall->peer()->session() == session)) {
+		groupCall->handleUpdate(update);
 	}
 }
 
@@ -669,7 +831,8 @@ bool Instance::inCall() const {
 		return false;
 	}
 	const auto state = _currentCall->state();
-	return (state != Call::State::Busy);
+	return (state != Call::State::Busy)
+		&& (state != Call::State::WaitingUserConfirmation);
 }
 
 bool Instance::inGroupCall() const {
@@ -683,19 +846,24 @@ bool Instance::inGroupCall() const {
 		&& (state != GroupCall::State::Failed);
 }
 
-void Instance::destroyCurrentCall() {
+void Instance::destroyCurrentCall(
+		Data::GroupCall *migrateCall,
+		const QString &migrateSlug) {
 	if (const auto current = currentCall()) {
-		current->hangup();
+		current->hangup(migrateCall, migrateSlug);
 		if (const auto still = currentCall()) {
 			destroyCall(still);
 		}
 	}
 	if (const auto current = currentGroupCall()) {
-		current->hangup();
-		if (const auto still = currentGroupCall()) {
-			destroyGroupCall(still);
+		if (!migrateCall || current->lookupReal() != migrateCall) {
+			current->hangup();
+			if (const auto still = currentGroupCall()) {
+				destroyGroupCall(still);
+			}
 		}
 	}
+	base::take(_startingGroupCall);
 }
 
 bool Instance::hasVisiblePanel(Main::Session *session) const {
@@ -849,4 +1017,188 @@ std::shared_ptr<tgcalls::VideoCaptureInterface> Instance::getVideoCapture(
 	return result;
 }
 
+const ConferenceInvites &Instance::conferenceInvites(
+		CallId conferenceId) const {
+	static const auto kEmpty = ConferenceInvites();
+	const auto i = _conferenceInvites.find(conferenceId);
+	return (i != end(_conferenceInvites)) ? i->second : kEmpty;
+}
+
+void Instance::registerConferenceInvite(
+		CallId conferenceId,
+		not_null<UserData*> user,
+		MsgId messageId,
+		bool incoming) {
+	auto &info = _conferenceInvites[conferenceId].users[user];
+	(incoming ? info.incoming : info.outgoing).emplace(messageId);
+}
+
+void Instance::unregisterConferenceInvite(
+		CallId conferenceId,
+		not_null<UserData*> user,
+		MsgId messageId,
+		bool incoming,
+		bool onlyStopCalling) {
+	const auto i = _conferenceInvites.find(conferenceId);
+	if (i == end(_conferenceInvites)) {
+		return;
+	}
+	const auto j = i->second.users.find(user);
+	if (j == end(i->second.users)) {
+		return;
+	}
+	auto &info = j->second;
+	if (!(incoming ? info.incoming : info.outgoing).remove(messageId)) {
+		return;
+	}
+	if (!incoming) {
+		user->owner().unregisterInvitedToCallUser(
+			conferenceId,
+			user,
+			onlyStopCalling);
+	}
+	if (info.incoming.empty() && info.outgoing.empty()) {
+		i->second.users.erase(j);
+		if (i->second.users.empty()) {
+			_conferenceInvites.erase(i);
+		}
+	}
+	if (_currentCall
+		&& _currentCall->user() == user
+		&& _currentCall->conferenceInviteMsgId() == messageId
+		&& _currentCall->state() == Call::State::WaitingIncoming) {
+		destroyCurrentCall();
+	}
+}
+
+void Instance::declineIncomingConferenceInvites(CallId conferenceId) {
+	const auto i = _conferenceInvites.find(conferenceId);
+	if (i == end(_conferenceInvites)) {
+		return;
+	}
+	for (auto j = begin(i->second.users); j != end(i->second.users);) {
+		const auto api = &j->first->session().api();
+		for (const auto &messageId : base::take(j->second.incoming)) {
+			api->request(MTPphone_DeclineConferenceCallInvite(
+				MTP_int(messageId.bare)
+			)).send();
+		}
+		if (j->second.outgoing.empty()) {
+			j = i->second.users.erase(j);
+		} else {
+			++j;
+		}
+	}
+	if (i->second.users.empty()) {
+		_conferenceInvites.erase(i);
+	}
+}
+
+void Instance::declineOutgoingConferenceInvite(
+		CallId conferenceId,
+		not_null<UserData*> user,
+		bool discard) {
+	const auto i = _conferenceInvites.find(conferenceId);
+	if (i == end(_conferenceInvites)) {
+		return;
+	}
+	const auto j = i->second.users.find(user);
+	if (j == end(i->second.users)) {
+		return;
+	}
+	const auto api = &user->session().api();
+	auto ids = base::take(j->second.outgoing);
+	auto inputs = QVector<MTPint>();
+	for (const auto &messageId : ids) {
+		if (discard) {
+			inputs.push_back(MTP_int(messageId.bare));
+		} else {
+			api->request(MTPphone_DeclineConferenceCallInvite(
+				MTP_int(messageId.bare)
+			)).send();
+		}
+	}
+	if (!inputs.empty()) {
+		user->owner().histories().deleteMessages(
+			user->owner().history(user),
+			std::move(inputs),
+			true);
+		for (const auto &messageId : ids) {
+			if (const auto item = user->owner().message(user, messageId)) {
+				item->destroy();
+			}
+		}
+	}
+	if (j->second.incoming.empty()) {
+		i->second.users.erase(j);
+		if (i->second.users.empty()) {
+			_conferenceInvites.erase(i);
+		}
+	}
+	user->owner().unregisterInvitedToCallUser(conferenceId, user, !discard);
+}
+
+void Instance::showConferenceInvite(
+		not_null<UserData*> user,
+		MsgId conferenceInviteMsgId) {
+	const auto item = user->owner().message(user, conferenceInviteMsgId);
+	const auto media = item ? item->media() : nullptr;
+	const auto call = media ? media->call() : nullptr;
+	const auto conferenceId = call ? call->conferenceId : 0;
+	const auto video = call->video;
+	if (!conferenceId
+		|| call->state != Data::CallState::Invitation
+		|| user->isSelf()
+		|| user->session().appConfig().callsDisabledForSession()) {
+		return;
+	} else if (_currentCall
+		&& _currentCall->conferenceId() == conferenceId) {
+		return;
+	} else if (inGroupCall()
+		&& _currentGroupCall->conference()
+		&& _currentGroupCall->sharedCall()->id() == conferenceId) {
+		return;
+	}
+
+	auto conferenceParticipants = call->otherParticipants;
+	if (!ranges::contains(conferenceParticipants, user)) {
+		conferenceParticipants.push_back(user);
+	}
+
+	const auto &config = user->session().serverConfig();
+	if (inCall() || inGroupCall()) {
+		declineIncomingConferenceInvites(conferenceId);
+	} else if (item->date() + (config.callRingTimeoutMs / 1000)
+		< base::unixtime::now()) {
+		declineIncomingConferenceInvites(conferenceId);
+		LOG(("Ignoring too old conference call invitation."));
+	} else {
+		const auto delegate = _delegate.get();
+		auto call = std::make_unique<Call>(
+			delegate,
+			user,
+			conferenceId,
+			conferenceInviteMsgId,
+			std::move(conferenceParticipants),
+			video);
+		const auto raw = call.get();
+
+		user->session().account().sessionChanges(
+		) | rpl::on_next([=] {
+			destroyCall(raw);
+		}, raw->lifetime());
+
+		if (_currentCall) {
+			_currentCallPanel->replaceCall(raw);
+			std::swap(_currentCall, call);
+			call->hangup();
+		} else {
+			_currentCallPanel = std::make_unique<Panel>(raw);
+			_currentCall = std::move(call);
+		}
+		_currentCallChanges.fire_copy(raw);
+	}
+}
+
+
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index d52a0e9a238a2d..4742827c69f614 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -13,6 +13,10 @@ namespace crl {
 class semaphore;
 } // namespace crl
 
+namespace Data {
+class GroupCall;
+} // namespace Data
+
 namespace Platform {
 enum class PermissionType;
 } // namespace Platform
@@ -31,6 +35,7 @@ class Show;
 
 namespace Calls::Group {
 struct JoinInfo;
+struct ConferenceInfo;
 class Panel;
 class ChooseJoinAsProcess;
 class StartRtmpProcess;
@@ -47,6 +52,13 @@ enum class CallType;
 class GroupCall;
 class Panel;
 struct DhConfig;
+struct InviteRequest;
+struct StartConferenceInfo;
+
+struct StartOutgoingCallArgs {
+	bool video = false;
+	bool isConfirmed = false;
+};
 
 struct StartGroupCallArgs {
 	enum class JoinConfirm {
@@ -59,16 +71,29 @@ struct StartGroupCallArgs {
 	bool scheduleNeeded = false;
 };
 
+struct ConferenceInviteMessages {
+	base::flat_set<MsgId> incoming;
+	base::flat_set<MsgId> outgoing;
+};
+
+struct ConferenceInvites {
+	base::flat_map<not_null<UserData*>, ConferenceInviteMessages> users;
+};
+
 class Instance final : public base::has_weak_ptr {
 public:
 	Instance();
 	~Instance();
 
-	void startOutgoingCall(not_null<UserData*> user, bool video);
+	void startOutgoingCall(not_null<UserData*> user, StartOutgoingCallArgs);
 	void startOrJoinGroupCall(
 		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,
 		StartGroupCallArgs args);
+	void startOrJoinConferenceCall(StartConferenceInfo args);
+	void startedConferenceReady(
+		not_null<GroupCall*> call,
+		StartConferenceInfo args);
 	void showStartWithRtmp(
 		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer);
@@ -103,8 +128,32 @@ class Instance final : public base::has_weak_ptr {
 		-> std::shared_ptr<tgcalls::VideoCaptureInterface>;
 	void requestPermissionsOrFail(Fn<void()> onSuccess, bool video = true);
 
+	[[nodiscard]] const ConferenceInvites &conferenceInvites(
+		CallId conferenceId) const;
+	void registerConferenceInvite(
+		CallId conferenceId,
+		not_null<UserData*> user,
+		MsgId messageId,
+		bool incoming);
+	void unregisterConferenceInvite(
+		CallId conferenceId,
+		not_null<UserData*> user,
+		MsgId messageId,
+		bool incoming,
+		bool onlyStopCalling = false);
+	void showConferenceInvite(
+		not_null<UserData*> user,
+		MsgId conferenceInviteMsgId);
+	void declineIncomingConferenceInvites(CallId conferenceId);
+	void declineOutgoingConferenceInvite(
+		CallId conferenceId,
+		not_null<UserData*> user,
+		bool discard = false);
+
 	[[nodiscard]] FnMut<void()> addAsyncWaiter();
 
+	void registerVideoStream(not_null<GroupCall*> call);
+
 	[[nodiscard]] bool isSharingScreen() const;
 	[[nodiscard]] bool isQuitPrevent();
 
@@ -115,8 +164,12 @@ class Instance final : public base::has_weak_ptr {
 	not_null<Media::Audio::Track*> ensureSoundLoaded(const QString &key);
 	void playSoundOnce(const QString &key);
 
-	void createCall(not_null<UserData*> user, CallType type, bool isVideo);
+	void createCall(
+		not_null<UserData*> user,
+		CallType type,
+		StartOutgoingCallArgs);
 	void destroyCall(not_null<Call*> call);
+	void finishConferenceInvitations(const StartConferenceInfo &args);
 
 	void createGroupCall(
 		Group::JoinInfo info,
@@ -136,7 +189,9 @@ class Instance final : public base::has_weak_ptr {
 	void refreshServerConfig(not_null<Main::Session*> session);
 	bytes::const_span updateDhConfig(const MTPmessages_DhConfig &data);
 
-	void destroyCurrentCall();
+	void destroyCurrentCall(
+		Data::GroupCall *migrateCall = nullptr,
+		const QString &migrateSlug = QString());
 	void handleCallUpdate(
 		not_null<Main::Session*> session,
 		const MTPPhoneCall &call);
@@ -159,6 +214,7 @@ class Instance final : public base::has_weak_ptr {
 	std::unique_ptr<Panel> _currentCallPanel;
 
 	std::unique_ptr<GroupCall> _currentGroupCall;
+	std::unique_ptr<GroupCall> _startingGroupCall;
 	rpl::event_stream<GroupCall*> _currentGroupCallChanges;
 	std::unique_ptr<Group::Panel> _currentGroupCallPanel;
 
@@ -167,8 +223,14 @@ class Instance final : public base::has_weak_ptr {
 	const std::unique_ptr<Group::ChooseJoinAsProcess> _chooseJoinAs;
 	const std::unique_ptr<Group::StartRtmpProcess> _startWithRtmp;
 
+	base::flat_map<CallId, ConferenceInvites> _conferenceInvites;
+
 	base::flat_set<std::unique_ptr<crl::semaphore>> _asyncWaiters;
 
+	base::flat_map<
+		not_null<Main::Session*>,
+		std::vector<base::weak_ptr<GroupCall>>> _streams;
+
 };
 
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index 6f0ab0f6a679b8..f89a7a0caf79fd 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #include "calls/calls_panel.h"
 
+#include "boxes/peers/replace_boost_box.h" // CreateUserpicsWithMoreBadge
+#include "calls/calls_panel_background.h"
 #include "data/data_photo.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -15,12 +17,15 @@ For license and copyright information please follow this link:
 #include "data/data_cloud_file.h"
 #include "data/data_changes.h"
 #include "calls/group/calls_group_common.h"
+#include "calls/group/calls_group_invite_controller.h"
 #include "calls/ui/calls_device_menu.h"
 #include "calls/calls_emoji_fingerprint.h"
+#include "calls/calls_instance.h"
 #include "calls/calls_signal_bars.h"
 #include "calls/calls_userpic.h"
 #include "calls/calls_video_bubble.h"
 #include "calls/calls_video_incoming.h"
+#include "calls/calls_window.h"
 #include "ui/platform/ui_platform_window_title.h"
 #include "ui/widgets/call_button.h"
 #include "ui/widgets/buttons.h"
@@ -42,8 +47,11 @@ For license and copyright information please follow this link:
 #include "ui/emoji_config.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/integration.h"
 #include "core/application.h"
+#include "core/core_settings.h"
 #include "lang/lang_keys.h"
+#include "main/session/session_show.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
 #include "platform/platform_specific.h"
@@ -52,6 +60,8 @@ For license and copyright information please follow this link:
 #include "base/power_save_blocker.h"
 #include "media/streaming/media_streaming_utility.h"
 #include "window/main_window.h"
+#include "window/window_controller.h"
+#include "webrtc/webrtc_create_adm.h"
 #include "webrtc/webrtc_environment.h"
 #include "webrtc/webrtc_video_track.h"
 #include "styles/style_calls.h"
@@ -65,6 +75,9 @@ For license and copyright information please follow this link:
 namespace Calls {
 namespace {
 
+constexpr auto kHideControlsTimeout = 5 * crl::time(1000);
+constexpr auto kHideControlsQuickTimeout = 2 * crl::time(1000);
+
 [[nodiscard]] QByteArray BatterySvg(
 		const QSize &s,
 		const QColor &c) {
@@ -93,44 +106,62 @@ namespace {
 Panel::Panel(not_null<Call*> call)
 : _call(call)
 , _user(call->user())
-, _layerBg(std::make_unique<Ui::LayerManager>(widget()))
-#ifndef Q_OS_MAC
-, _controls(Ui::Platform::SetupSeparateTitleControls(
-	window(),
-	st::callTitle,
-	[=](bool maximized) { toggleFullScreen(maximized); }))
-#endif // !Q_OS_MAC
+, _window(std::make_shared<Window>())
 , _bodySt(&st::callBodyLayout)
-, _answerHangupRedial(widget(), st::callAnswer, &st::callHangup)
-, _decline(widget(), object_ptr<Ui::CallButton>(widget(), st::callHangup))
-, _cancel(widget(), object_ptr<Ui::CallButton>(widget(), st::callCancel))
+, _answerHangupRedial(
+	std::in_place,
+	widget(),
+	st::callAnswer,
+	&st::callHangup)
+, _decline(
+	std::in_place,
+	widget(),
+	object_ptr<Ui::CallButton>(widget(), st::callHangup))
+, _cancel(
+	std::in_place,
+	widget(),
+	object_ptr<Ui::CallButton>(widget(), st::callCancel))
 , _screencast(
+	std::in_place,
 	widget(),
 	object_ptr<Ui::CallButton>(
 		widget(),
 		st::callScreencastOn,
 		&st::callScreencastOff))
-, _camera(widget(), st::callCameraMute, &st::callCameraUnmute)
+, _camera(std::in_place, widget(), st::callCameraMute, &st::callCameraUnmute)
 , _mute(
+	std::in_place,
 	widget(),
 	object_ptr<Ui::CallButton>(
 		widget(),
 		st::callMicrophoneMute,
 		&st::callMicrophoneUnmute))
-, _name(widget(), st::callName)
-, _status(widget(), st::callStatus) {
-	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
-	_layerBg->setHideByBackgroundClick(true);
-
+, _addPeople(
+	std::in_place,
+	widget(),
+	object_ptr<Ui::CallButton>(widget(), st::callAddPeople))
+, _name(std::in_place, widget(), st::callName)
+, _status(std::in_place, widget(), st::callStatus)
+, _hideControlsTimer([=] { requestControlsHidden(true); })
+, _controlsShownForceTimer([=] { controlsShownForce(false); }) {
 	_decline->setDuration(st::callPanelDuration);
 	_decline->entity()->setText(tr::lng_call_decline());
+	_decline->entity()->setAccessibleName(tr::lng_call_decline(tr::now));
 	_cancel->setDuration(st::callPanelDuration);
 	_cancel->entity()->setText(tr::lng_call_cancel());
+	_cancel->entity()->setAccessibleName(tr::lng_call_cancel(tr::now));
 	_screencast->setDuration(st::callPanelDuration);
+	_screencast->entity()->setAccessibleName(tr::lng_call_screencast(tr::now));
+	_addPeople->setDuration(st::callPanelDuration);
+	_addPeople->entity()->setText(tr::lng_call_add_people());
+	_addPeople->entity()->setAccessibleName(tr::lng_call_add_people(tr::now));
+	_camera->setAccessibleName(tr::lng_call_start_video(tr::now));
+	_mute->entity()->setAccessibleName(tr::lng_call_mute_audio(tr::now));
 
 	initWindow();
 	initWidget();
 	initControls();
+	initConferenceInvite();
 	initLayout();
 	initMediaDeviceToggles();
 	showAndActivate();
@@ -147,6 +178,40 @@ bool Panel::isActive() const {
 	return window()->isActiveWindow() && isVisible();
 }
 
+QRect Panel::panelGeometry() const {
+	const auto saved = Core::App().settings().callPanelPosition();
+	const auto adjusted = Core::AdjustToScale(saved, u"Call"_q);
+	const auto center = Core::App().getPointForCallPanelCenter();
+	const auto simple = QRect(0, 0, st::callWidth, st::callHeight);
+	const auto initial = simple.translated(center - simple.center());
+	const auto initialPosition = Core::WindowPosition{
+		.moncrc = 0,
+		.scale = cScale(),
+		.x = initial.x(),
+		.y = initial.y(),
+		.w = initial.width(),
+		.h = initial.height(),
+	};
+	return ::Window::CountInitialGeometry(
+		window(),
+		adjusted,
+		initialPosition,
+		{ st::callWidthMin, st::callHeightMin },
+		u"Call"_q);
+}
+
+ConferencePanelMigration Panel::migrationInfo() const {
+	return ConferencePanelMigration{ .window = _window };
+}
+
+std::shared_ptr<Main::SessionShow> Panel::sessionShow() {
+	return Main::MakeSessionShow(uiShow(), &_user->session());
+}
+
+std::shared_ptr<Ui::Show> Panel::uiShow() {
+	return _window->uiShow();
+}
+
 void Panel::showAndActivate() {
 	if (window()->isHidden()) {
 		window()->show();
@@ -173,6 +238,42 @@ void Panel::replaceCall(not_null<Call*> call) {
 	updateControlsGeometry();
 }
 
+void Panel::savePanelGeometry() {
+	if (!window()->windowHandle()) {
+		return;
+	}
+	const auto state = window()->windowHandle()->windowState();
+	if (state == Qt::WindowMinimized) {
+		return;
+	}
+	const auto &savedPosition = Core::App().settings().callPanelPosition();
+	auto realPosition = savedPosition;
+	if (state == Qt::WindowMaximized) {
+		realPosition.maximized = 1;
+		realPosition.moncrc = 0;
+	} else {
+		auto r = window()->body()->mapToGlobal(window()->body()->rect());
+		realPosition.x = r.x();
+		realPosition.y = r.y();
+		realPosition.w = r.width();
+		realPosition.h = r.height();
+		realPosition.scale = cScale();
+		realPosition.maximized = 0;
+		realPosition.moncrc = 0;
+	}
+	realPosition = ::Window::PositionWithScreen(
+		realPosition,
+		window(),
+		{ st::callWidthMin, st::callHeightMin },
+		u"Call"_q);
+	if (realPosition.w >= st::callWidthMin
+		&& realPosition.h >= st::callHeightMin
+		&& realPosition != savedPosition) {
+		Core::App().settings().setCallPanelPosition(realPosition);
+		Core::App().saveSettingsDelayed();
+	}
+}
+
 void Panel::initWindow() {
 	window()->setAttribute(Qt::WA_OpaquePaintEvent);
 	window()->setAttribute(Qt::WA_NoSystemBackground);
@@ -188,22 +289,37 @@ void Panel::initWindow() {
 				&& window()->isFullScreen()) {
 				window()->showNormal();
 			}
+		} else if (e->type() == QEvent::WindowStateChange) {
+			const auto state = window()->windowState();
+			_fullScreenOrMaximized = (state & Qt::WindowFullScreen)
+				|| (state & Qt::WindowMaximized);
+		} else if (e->type() == QEvent::Enter) {
+			_mouseInside = true;
+			Ui::Integration::Instance().registerLeaveSubscription(
+				window().get());
+			if (!_fullScreenOrMaximized.current()) {
+				requestControlsHidden(false);
+				_hideControlsTimer.cancel();
+			}
+		} else if (e->type() == QEvent::Leave) {
+			_mouseInside = false;
+			Ui::Integration::Instance().unregisterLeaveSubscription(
+				window().get());
+			if (!_fullScreenOrMaximized.current()) {
+				_hideControlsTimer.callOnce(kHideControlsQuickTimeout);
+			}
 		}
 		return base::EventFilterResult::Continue;
-	});
+	}, lifetime());
 
+	const auto guard = base::make_weak(this);
 	window()->setBodyTitleArea([=](QPoint widgetPoint) {
 		using Flag = Ui::WindowTitleHitTestFlag;
-		if (!widget()->rect().contains(widgetPoint)) {
+		if (!guard
+			|| !widget()->rect().contains(widgetPoint)
+			|| _window->controlsHasHitTest(widgetPoint)) {
 			return Flag::None | Flag(0);
 		}
-#ifndef Q_OS_MAC
-		using Result = Ui::Platform::HitTestResult;
-		const auto windowPoint = widget()->mapTo(window(), widgetPoint);
-		if (_controls->controls.hitTest(windowPoint) != Result::None) {
-			return Flag::None | Flag(0);
-		}
-#endif // !Q_OS_MAC
 		const auto buttonWidth = st::callCancel.button.width;
 		const auto buttonsWidth = buttonWidth * 4;
 		const auto inControls = (_fingerprint
@@ -218,12 +334,15 @@ void Panel::initWindow() {
 		if (inControls) {
 			return Flag::None | Flag(0);
 		}
-		const auto shown = _layerBg->topShownLayer();
+		const auto shown = _window->topShownLayer();
 		return (!shown || !shown->geometry().contains(widgetPoint))
 			? (Flag::Move | Flag::Menu | Flag::FullScreen)
 			: Flag::None;
 	});
 
+	_window->maximizeRequests() | rpl::on_next([=](bool maximized) {
+		toggleFullScreen(maximized);
+	}, lifetime());
 	// Don't do that, it looks awful :(
 //#ifdef Q_OS_WIN
 //	// On Windows we replace snap-to-top maximizing with fullscreen.
@@ -255,14 +374,14 @@ void Panel::initWidget() {
 	widget()->setMouseTracking(true);
 
 	widget()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		paint(clip);
-	}, widget()->lifetime());
+	}, lifetime());
 
 	widget()->sizeValue(
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		updateControlsGeometry();
-	}, widget()->lifetime());
+	}, lifetime());
 }
 
 void Panel::initControls() {
@@ -278,11 +397,18 @@ void Panel::initControls() {
 			return;
 		} else if (!env->desktopCaptureAllowed()) {
 			if (auto box = Group::ScreenSharingPrivacyRequestBox()) {
-				_layerBg->showBox(std::move(box));
+				uiShow()->showBox(std::move(box));
 			}
 		} else if (const auto source = env->uniqueDesktopCaptureSource()) {
 			if (!chooseSourceActiveDeviceId().isEmpty()) {
 				chooseSourceStop();
+			} else if (chooseSourceWithAudioSupported()) {
+				const auto sourceId = *source;
+				Group::ShowUniqueCaptureOptions(
+					uiShow(),
+					crl::guard(this, [=](bool audio) {
+						chooseSourceAccepted(sourceId, audio);
+					}));
 			} else {
 				chooseSourceAccepted(*source, false);
 			}
@@ -293,9 +419,42 @@ void Panel::initControls() {
 	_camera->setClickedCallback([=] {
 		if (!_call) {
 			return;
-		} else {
-			_call->toggleCameraSharing(!_call->isSharingCamera());
 		}
+		_call->toggleCameraSharing(!_call->isSharingCamera());
+	});
+	_addPeople->entity()->setClickedCallback([=] {
+		if (!_call || _call->state() != Call::State::Established) {
+			uiShow()->showToast(tr::lng_call_error_add_not_started(tr::now));
+			return;
+		}
+		const auto call = _call;
+		const auto creating = std::make_shared<bool>();
+		const auto create = [=](std::vector<InviteRequest> users) {
+			if (*creating) {
+				return;
+			}
+			*creating = true;
+			const auto sharingLink = users.empty();
+			Core::App().calls().startOrJoinConferenceCall({
+				.show = sessionShow(),
+				.invite = std::move(users),
+				.sharingLink = sharingLink,
+				.migrating = true,
+				.muted = call->muted(),
+				.videoCapture = (call->isSharingVideo()
+					? call->peekVideoCapture()
+					: nullptr),
+				.videoCaptureScreenId = call->screenSharingDeviceId(),
+			});
+		};
+		const auto invite = crl::guard(call, [=](
+				std::vector<InviteRequest> users) {
+			create(std::move(users));
+		});
+		const auto share = crl::guard(call, [=] {
+			create({});
+		});
+		uiShow()->showBox(Group::PrepareInviteBox(call, invite, share));
 	});
 
 	_updateDurationTimer.setCallback([this] {
@@ -342,6 +501,65 @@ void Panel::initControls() {
 	_screencast->finishAnimating();
 }
 
+void Panel::initConferenceInvite() {
+	const auto &participants = _call->conferenceParticipants();
+	const auto count = int(participants.size());
+	if (count < 2) {
+		return;
+	}
+	_conferenceParticipants = base::make_unique_q<Ui::RpWidget>(widget());
+	_conferenceParticipants->show();
+	const auto raw = _conferenceParticipants.get();
+
+	auto peers = std::vector<not_null<PeerData*>>();
+	for (const auto &peer : participants) {
+		if (peer == _user && count > 3) {
+			continue;
+		}
+		peers.push_back(peer);
+		if (peers.size() == 3) {
+			break;
+		}
+	}
+
+	const auto userpics = CreateUserpicsWithMoreBadge(
+		raw,
+		rpl::single(peers),
+		st::confcallInviteUserpics,
+		peers.size()).release();
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		tr::lng_group_call_members(tr::now, lt_count, count),
+		st::confcallInviteParticipants);
+	const auto padding = st::confcallInviteParticipantsPadding;
+	const auto add = padding.bottom();
+	const auto width = add
+		+ userpics->width()
+		+ padding.left()
+		+ label->width()
+		+ padding.right();
+	const auto height = add + userpics->height() + add;
+
+	_status->geometryValue() | rpl::on_next([=] {
+		const auto top = _bodyTop + _bodySt->participantsTop;
+		const auto left = (widget()->width() - width) / 2;
+		raw->setGeometry(left, top, width, height);
+		userpics->move(add, add);
+		label->move(add + userpics->width() + padding.left(), padding.top());
+	}, raw->lifetime());
+
+	raw->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(raw);
+		auto hq = PainterHighQualityEnabler(p);
+		const auto radius = raw->height() / 2.;
+
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::confcallInviteUserpicsBg);
+		p.drawRoundedRect(raw->rect(), radius, radius);
+	}, raw->lifetime());
+}
+
 void Panel::setIncomingSize(QSize size) {
 	if (_incomingFrameSize == size) {
 		return;
@@ -360,15 +578,11 @@ QString Panel::chooseSourceActiveDeviceId() {
 }
 
 bool Panel::chooseSourceActiveWithAudio() {
-	return false;// _call->screenSharingWithAudio();
+	return _call->screenSharingWithAudio();
 }
 
 bool Panel::chooseSourceWithAudioSupported() {
-//#ifdef Q_OS_WIN
-//	return true;
-//#else // Q_OS_WIN
-	return false;
-//#endif // Q_OS_WIN
+	return Webrtc::LoopbackAudioCaptureSupported();
 }
 
 rpl::lifetime &Panel::chooseSourceInstanceLifetime() {
@@ -385,7 +599,7 @@ rpl::producer<bool> Panel::startOutgoingRequests() const {
 void Panel::chooseSourceAccepted(
 		const QString &deviceId,
 		bool withAudio) {
-	_call->toggleScreenSharing(deviceId/*, withAudio*/);
+	_call->toggleScreenSharing(deviceId, withAudio);
 }
 
 void Panel::chooseSourceStop() {
@@ -415,33 +629,53 @@ void Panel::refreshIncomingGeometry() {
 void Panel::reinitWithCall(Call *call) {
 	_callLifetime.destroy();
 	_call = call;
+	const auto guard = gsl::finally([&] {
+		updateControlsShown();
+	});
 	if (!_call) {
+		_fingerprint = nullptr;
 		_incoming = nullptr;
 		_outgoingVideoBubble = nullptr;
-		_powerSaveBlocker = nullptr;
 		return;
 	}
 
 	_user = _call->user();
 
+	_background = std::make_unique<PanelBackground>(
+		_user,
+		[=] {
+			updateTextColors();
+			widget()->update();
+		});
+
+	_call->confereceSupportedValue(
+	) | rpl::on_next([=](bool supported) {
+		_conferenceSupported = supported;
+		_addPeople->toggle(_conferenceSupported
+			&& (_call->state() != State::WaitingUserConfirmation),
+			window()->isHidden() ? anim::type::instant : anim::type::normal);
+
+		updateHangupGeometry();
+	}, _callLifetime);
+
 	auto remoteMuted = _call->remoteAudioStateValue(
 	) | rpl::map(rpl::mappers::_1 == Call::RemoteAudioState::Muted);
 	rpl::duplicate(
 		remoteMuted
-	) | rpl::start_with_next([=](bool muted) {
+	) | rpl::on_next([=](bool muted) {
 		if (muted) {
 			createRemoteAudioMute();
 		} else {
-			_remoteAudioMute.destroy();
+			_remoteAudioMute = nullptr;
 			showRemoteLowBattery();
 		}
 	}, _callLifetime);
 	_call->remoteBatteryStateValue(
-	) | rpl::start_with_next([=](Call::RemoteBatteryState state) {
+	) | rpl::on_next([=](Call::RemoteBatteryState state) {
 		if (state == Call::RemoteBatteryState::Low) {
 			createRemoteLowBattery();
 		} else {
-			_remoteLowBattery.destroy();
+			_remoteLowBattery = nullptr;
 		}
 	}, _callLifetime);
 	_userpic = std::make_unique<Userpic>(
@@ -454,25 +688,76 @@ void Panel::reinitWithCall(Call *call) {
 	_incoming = std::make_unique<Incoming>(
 		widget(),
 		_call->videoIncoming(),
-		_window.backend());
+		_window->backend());
 	_incoming->widget()->hide();
 
+	_incoming->rp()->shownValue() | rpl::on_next([=] {
+		updateControlsShown();
+	}, _incoming->rp()->lifetime());
+
+	_hideControlsFilter = nullptr;
+	_fullScreenOrMaximized.value(
+	) | rpl::on_next([=](bool fullScreenOrMaximized) {
+		if (fullScreenOrMaximized) {
+			class Filter final : public QObject {
+			public:
+				explicit Filter(Fn<void(QObject*)> moved) : _moved(moved) {
+					qApp->installEventFilter(this);
+				}
+
+				bool eventFilter(QObject *watched, QEvent *event) {
+					if (event->type() == QEvent::MouseMove) {
+						_moved(watched);
+					}
+					return false;
+				}
+
+			private:
+				Fn<void(QObject*)> _moved;
+
+			};
+			_hideControlsFilter.reset(new Filter([=](QObject *what) {
+				_mouseInside = true;
+				if (what->isWidgetType()
+					&& window()->isAncestorOf(static_cast<QWidget*>(what))) {
+					_hideControlsTimer.callOnce(kHideControlsTimeout);
+					requestControlsHidden(false);
+					updateControlsShown();
+				}
+			}));
+			_hideControlsTimer.callOnce(kHideControlsTimeout);
+		} else {
+			_hideControlsFilter = nullptr;
+			_hideControlsTimer.cancel();
+			if (_mouseInside) {
+				requestControlsHidden(false);
+				updateControlsShown();
+			}
+		}
+	}, _incoming->rp()->lifetime());
+
 	_call->mutedValue(
-	) | rpl::start_with_next([=](bool mute) {
+	) | rpl::on_next([=](bool mute) {
 		_mute->entity()->setProgress(mute ? 1. : 0.);
 		_mute->entity()->setText(mute
 			? tr::lng_call_unmute_audio()
 			: tr::lng_call_mute_audio());
+		_mute->entity()->setAccessibleName(mute
+			? tr::lng_call_unmute_audio(tr::now)
+			: tr::lng_call_mute_audio(tr::now));
 	}, _callLifetime);
 
 	_call->videoOutgoing()->stateValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		{
 			const auto active = _call->isSharingCamera();
 			_camera->setProgress(active ? 0. : 1.);
 			_camera->setText(active
 				? tr::lng_call_stop_video()
 				: tr::lng_call_start_video());
+			_camera->setAccessibleName(active
+				? tr::lng_call_stop_video(tr::now)
+				: tr::lng_call_start_video(tr::now));
 		}
 		{
 			const auto active = _call->isSharingScreen();
@@ -483,12 +768,12 @@ void Panel::reinitWithCall(Call *call) {
 	}, _callLifetime);
 
 	_call->stateValue(
-	) | rpl::start_with_next([=](State state) {
+	) | rpl::on_next([=](State state) {
 		stateChanged(state);
 	}, _callLifetime);
 
 	_call->videoIncoming()->renderNextFrame(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto track = _call->videoIncoming();
 		setIncomingSize(track->state() == Webrtc::VideoState::Active
 			? track->frameSize()
@@ -505,14 +790,14 @@ void Panel::reinitWithCall(Call *call) {
 	}, _callLifetime);
 
 	_call->videoIncoming()->stateValue(
-	) | rpl::start_with_next([=](Webrtc::VideoState state) {
+	) | rpl::on_next([=](Webrtc::VideoState state) {
 		setIncomingSize((state == Webrtc::VideoState::Active)
 			? _call->videoIncoming()->frameSize()
 			: QSize());
 	}, _callLifetime);
 
 	_call->videoOutgoing()->renderNextFrame(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto incoming = incomingFrameGeometry();
 		const auto outgoing = outgoingFrameGeometry();
 		widget()->update(outgoing);
@@ -526,18 +811,19 @@ void Panel::reinitWithCall(Call *call) {
 		rpl::single(
 			rpl::empty_value()
 		) | rpl::then(_call->videoOutgoing()->renderNextFrame())
-	) | rpl::start_with_next([=](State state, auto) {
+	) | rpl::on_next([=](State state, auto) {
 		if (state != State::Ended
 			&& state != State::EndedByOtherDevice
 			&& state != State::Failed
 			&& state != State::FailedHangingUp
+			&& state != State::MigrationHangingUp
 			&& state != State::HangingUp) {
 			refreshOutgoingPreviewInBody(state);
 		}
 	}, _callLifetime);
 
 	_call->errors(
-	) | rpl::start_with_next([=](Error error) {
+	) | rpl::on_next([=](Error error) {
 		const auto text = [=] {
 			switch (error.type) {
 			case ErrorType::NoCamera:
@@ -556,14 +842,12 @@ void Panel::reinitWithCall(Call *call) {
 			}
 			Unexpected("Error type in _call->errors().");
 		}();
-		Ui::Toast::Show(widget(), Ui::Toast::Config{
-			.text = { text },
-			.st = &st::callErrorToast,
-		});
+		uiShow()->showToast(text);
 	}, _callLifetime);
 
 	_name->setText(_user->name());
 	updateStatusText(_call->state());
+	updateTextColors();
 
 	_answerHangupRedial->raise();
 	_decline->raise();
@@ -573,17 +857,13 @@ void Panel::reinitWithCall(Call *call) {
 		_startVideo->raise();
 	}
 	_mute->raise();
-
-	_powerSaveBlocker = std::make_unique<base::PowerSaveBlocker>(
-		base::PowerSaveBlockType::PreventDisplaySleep,
-		u"Video call is active"_q,
-		window()->windowHandle());
+	_addPeople->raise();
 
 	_incoming->widget()->lower();
 }
 
 void Panel::createRemoteAudioMute() {
-	_remoteAudioMute.create(
+	_remoteAudioMute = base::make_unique_q<Ui::PaddingWrap<Ui::FlatLabel>>(
 		widget(),
 		object_ptr<Ui::FlatLabel>(
 			widget(),
@@ -598,11 +878,13 @@ void Panel::createRemoteAudioMute() {
 	_remoteAudioMute->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	_remoteAudioMute->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_remoteAudioMute);
 		const auto r = _remoteAudioMute->rect();
 
 		auto hq = PainterHighQualityEnabler(p);
+		p.setOpacity(_controlsShownAnimation.value(
+			_controlsShown ? 1. : 0.));
 		p.setBrush(st::videoPlayIconBg);
 		p.setPen(Qt::NoPen);
 		p.drawRoundedRect(r, r.height() / 2, r.height() / 2);
@@ -618,7 +900,7 @@ void Panel::createRemoteAudioMute() {
 }
 
 void Panel::createRemoteLowBattery() {
-	_remoteLowBattery.create(
+	_remoteLowBattery = base::make_unique_q<Ui::PaddingWrap<Ui::FlatLabel>>(
 		widget(),
 		object_ptr<Ui::FlatLabel>(
 			widget(),
@@ -633,41 +915,46 @@ void Panel::createRemoteLowBattery() {
 	_remoteLowBattery->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
-		_remoteLowBattery.destroy();
+	) | rpl::on_next([=] {
+		_remoteLowBattery = nullptr;
 		createRemoteLowBattery();
 	}, _remoteLowBattery->lifetime());
 
 	constexpr auto kBatterySize = QSize(29, 13);
+	const auto scaledBatterySize = QSize(
+		style::ConvertScale(kBatterySize.width()),
+		style::ConvertScale(kBatterySize.height()));
 
 	const auto icon = [&] {
 		auto svg = QSvgRenderer(
 			BatterySvg(kBatterySize, st::videoPlayIconFg->c));
 		auto image = QImage(
-			kBatterySize * style::DevicePixelRatio(),
+			scaledBatterySize * style::DevicePixelRatio(),
 			QImage::Format_ARGB32_Premultiplied);
 		image.setDevicePixelRatio(style::DevicePixelRatio());
 		image.fill(Qt::transparent);
 		{
 			auto p = QPainter(&image);
-			svg.render(&p, Rect(kBatterySize));
+			svg.render(&p, Rect(scaledBatterySize));
 		}
 		return image;
 	}();
 
 	_remoteLowBattery->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_remoteLowBattery);
 		const auto r = _remoteLowBattery->rect();
 
 		auto hq = PainterHighQualityEnabler(p);
+		p.setOpacity(_controlsShownAnimation.value(
+			_controlsShown ? 1. : 0.));
 		p.setBrush(st::videoPlayIconBg);
 		p.setPen(Qt::NoPen);
 		p.drawRoundedRect(r, r.height() / 2, r.height() / 2);
 
 		p.drawImage(
 			st::callTooltipMutedIconPosition.x(),
-			(r.height() - kBatterySize.height()) / 2,
+			(r.height() - scaledBatterySize.height()) / 2,
 			icon);
 	}, _remoteLowBattery->lifetime());
 
@@ -694,14 +981,12 @@ void Panel::initLayout() {
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		// _user may change for the same Panel.
 		return (_call != nullptr) && (update.peer == _user);
-	}) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	}) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		_name->setText(_call->user()->name());
 		updateControlsGeometry();
-	}, widget()->lifetime());
+	}, lifetime());
 
-#ifndef Q_OS_MAC
-	_controls->wrap.raise();
-#endif // !Q_OS_MAC
+	_window->raiseControls();
 }
 
 void Panel::showControls() {
@@ -711,6 +996,7 @@ void Panel::showControls() {
 	_decline->setVisible(_decline->toggled());
 	_cancel->setVisible(_cancel->toggled());
 	_screencast->setVisible(_screencast->toggled());
+	_addPeople->setVisible(_addPeople->toggled());
 
 	const auto shown = !_incomingFrameSize.isEmpty();
 	_incoming->widget()->setVisible(shown);
@@ -723,22 +1009,28 @@ void Panel::showControls() {
 	showRemoteLowBattery();
 }
 
-void Panel::closeBeforeDestroy() {
-	window()->close();
+void Panel::closeBeforeDestroy(bool windowIsReused) {
+	if (!windowIsReused) {
+		window()->close();
+	}
 	reinitWithCall(nullptr);
+	_lifetime.destroy();
 }
 
 rpl::lifetime &Panel::lifetime() {
-	return window()->lifetime();
+	return _lifetime;
 }
 
 void Panel::initGeometry() {
-	const auto center = Core::App().getPointForCallPanelCenter();
-	const auto initRect = QRect(0, 0, st::callWidth, st::callHeight);
-	window()->setGeometry(initRect.translated(center - initRect.center()));
+	window()->setGeometry(panelGeometry());
 	window()->setMinimumSize({ st::callWidthMin, st::callHeightMin });
 	window()->show();
 	updateControlsGeometry();
+
+	_geometryLifetime = window()->geometryValue(
+	) | rpl::skip(1) | rpl::on_next([=](QRect r) {
+		savePanelGeometry();
+	});
 }
 
 void Panel::initMediaDeviceToggles() {
@@ -754,12 +1046,14 @@ void Panel::initMediaDeviceToggles() {
 			{ Webrtc::DeviceType::Camera, _call->cameraDeviceIdValue() },
 		});
 	});
+	_cameraDeviceToggle->setAccessibleName(tr::lng_settings_call_camera(tr::now));
 	_audioDeviceToggle->setClickedCallback([=] {
 		showDevicesMenu(_audioDeviceToggle, {
 			{ Webrtc::DeviceType::Playback, _call->playbackDeviceIdValue() },
 			{ Webrtc::DeviceType::Capture, _call->captureDeviceIdValue() },
 		});
 	});
+	_audioDeviceToggle->setAccessibleName(tr::lng_settings_call_section_output(tr::now));
 }
 
 void Panel::showDevicesMenu(
@@ -782,6 +1076,9 @@ void Panel::showDevicesMenu(
 		}
 		Core::App().saveSettingsDelayed();
 	};
+	controlsShownForce(true);
+	updateControlsShown();
+
 	_devicesMenu = MakeDeviceSelectionMenu(
 		widget(),
 		&Core::App().mediaDevices(),
@@ -791,6 +1088,9 @@ void Panel::showDevicesMenu(
 		Ui::PopupMenu::VerticalOrigin::Bottom);
 	_devicesMenu->popup(button->mapToGlobal(QPoint())
 		- QPoint(st::callDeviceSelectionMenu.menu.widthMin / 2, 0));
+	QObject::connect(_devicesMenu.get(), &QObject::destroyed, window(), [=] {
+		_controlsShownForceTimer.callOnce(kHideControlsQuickTimeout);
+	});
 }
 
 void Panel::refreshOutgoingPreviewInBody(State state) {
@@ -823,6 +1123,33 @@ QRect Panel::outgoingFrameGeometry() const {
 	return _outgoingVideoBubble->geometry();
 }
 
+void Panel::requestControlsHidden(bool hidden) {
+	_hideControlsRequested = hidden;
+	updateControlsShown();
+}
+
+void Panel::controlsShownForce(bool shown) {
+	_controlsShownForce = shown;
+	if (shown) {
+		_controlsShownForceTimer.cancel();
+	}
+	updateControlsShown();
+}
+
+void Panel::updateControlsShown() {
+	const auto shown = !_incoming
+		|| _incoming->widget()->isHidden()
+		|| _controlsShownForce
+		|| !_hideControlsRequested;
+	if (_controlsShown != shown) {
+		_controlsShown = shown;
+		_controlsShownAnimation.start([=] {
+			updateControlsGeometry();
+		}, shown ? 0. : 1., shown ? 1. : 0., st::slideDuration);
+		updateControlsGeometry();
+	}
+}
+
 void Panel::updateControlsGeometry() {
 	if (widget()->size().isEmpty()) {
 		return;
@@ -830,9 +1157,11 @@ void Panel::updateControlsGeometry() {
 	if (_incoming) {
 		refreshIncomingGeometry();
 	}
+	const auto shown = _controlsShownAnimation.value(
+		_controlsShown ? 1. : 0.);
 	if (_fingerprint) {
 #ifndef Q_OS_MAC
-		const auto controlsGeometry = _controls->controls.geometry();
+		const auto controlsGeometry = _window->controlsGeometry();
 		const auto halfWidth = widget()->width() / 2;
 		const auto minLeft = (controlsGeometry.center().x() < halfWidth)
 			? (controlsGeometry.width() + st::callFingerprintTop)
@@ -848,14 +1177,14 @@ void Panel::updateControlsGeometry() {
 		const auto minRight = 0;
 #endif // _controls
 		const auto desired = (widget()->width() - _fingerprint->width()) / 2;
+		const auto top = anim::interpolate(
+			-_fingerprint->height(),
+			st::callFingerprintTop,
+			shown);
 		if (minLeft) {
-			_fingerprint->moveToLeft(
-				std::max(desired, minLeft),
-				st::callFingerprintTop);
+			_fingerprint->moveToLeft(std::max(desired, minLeft), top);
 		} else {
-			_fingerprint->moveToRight(
-				std::max(desired, minRight),
-				st::callFingerprintTop);
+			_fingerprint->moveToRight(std::max(desired, minRight), top);
 		}
 	}
 	const auto innerHeight = std::max(widget()->height(), st::callHeightMin);
@@ -878,15 +1207,23 @@ void Panel::updateControlsGeometry() {
 		std::min(
 			bodyPreviewSizeMax.height(),
 			st::callOutgoingPreviewMax.height()));
-	const auto contentHeight = _bodySt->height
+	const auto bodyContentHeight = _bodySt->height
+		+ (_conferenceParticipants
+			? (_bodySt->participantsTop - _bodySt->statusTop)
+			: 0);
+	const auto contentHeight = bodyContentHeight
 		+ (_outgoingPreviewInBody ? bodyPreviewSize.height() : 0);
 	const auto remainingHeight = available - contentHeight;
 	const auto skipHeight = remainingHeight
 		/ (_outgoingPreviewInBody ? 3 : 2);
 
 	_bodyTop = availableTop + skipHeight;
-	_buttonsTop = availableTop + available;
-	const auto previewTop = _bodyTop + _bodySt->height + skipHeight;
+	_buttonsTopShown = availableTop + available;
+	_buttonsTop = anim::interpolate(
+		widget()->height(),
+		_buttonsTopShown,
+		shown);
+	const auto previewTop = _bodyTop + bodyContentHeight + skipHeight;
 
 	_userpic->setGeometry(
 		(widget()->width() - _bodySt->photoSize) / 2,
@@ -897,6 +1234,9 @@ void Panel::updateControlsGeometry() {
 		_bodySt->muteSize,
 		_bodySt->muteStroke);
 
+	if (_name->naturalWidth() > innerWidth) {
+		_name->resizeToWidth(innerWidth);
+	}
 	_name->moveToLeft(
 		(widget()->width() - _name->width()) / 2,
 		_bodyTop + _bodySt->nameTop);
@@ -908,6 +1248,8 @@ void Panel::updateControlsGeometry() {
 			(_buttonsTop
 				- st::callRemoteAudioMuteSkip
 				- _remoteAudioMute->height()));
+		_remoteAudioMute->update();
+		_remoteAudioMute->entity()->setOpacity(shown);
 	}
 	if (_remoteLowBattery) {
 		_remoteLowBattery->moveToLeft(
@@ -915,6 +1257,8 @@ void Panel::updateControlsGeometry() {
 			(_buttonsTop
 				- st::callRemoteAudioMuteSkip
 				- _remoteLowBattery->height()));
+		_remoteLowBattery->update();
+		_remoteLowBattery->entity()->setOpacity(shown);
 	}
 
 	if (_outgoingPreviewInBody) {
@@ -925,7 +1269,7 @@ void Panel::updateControlsGeometry() {
 				previewTop,
 				bodyPreviewSize.width(),
 				bodyPreviewSize.height()));
-	} else {
+	} else if (_outgoingVideoBubble) {
 		updateOutgoingVideoBubbleGeometry();
 	}
 
@@ -943,8 +1287,11 @@ void Panel::updateOutgoingVideoBubbleGeometry() {
 }
 
 void Panel::updateHangupGeometry() {
+	const auto isBusy = (_call
+		&& _call->state() == State::Busy);
 	const auto isWaitingUser = (_call
 		&& _call->state() == State::WaitingUserConfirmation);
+	const auto incomingWaiting = _call && _call->isIncomingWaiting();
 	const auto hangupProgress = isWaitingUser
 		? 0.
 		: _hangupShownProgress.value(_hangupShown ? 1. : 0.);
@@ -953,11 +1300,9 @@ void Panel::updateHangupGeometry() {
 	// Screencast - Camera - Cancel/Decline - Answer/Hangup/Redial - Mute.
 	const auto buttonWidth = st::callCancel.button.width;
 	const auto cancelWidth = buttonWidth * (1. - hangupProgress);
-	const auto cancelLeft = (isWaitingUser)
-		? ((widget()->width() - buttonWidth) / 2)
-		: (_mute->animating())
-		? ((widget()->width() - cancelWidth) / 2)
-		: ((widget()->width() / 2) - cancelWidth);
+	const auto cancelLeft = (widget()->width() - buttonWidth) / 2
+		- ((isBusy || incomingWaiting) ? buttonWidth : 0)
+		+ ((isWaitingUser || _conferenceSupported) ? 0 : (buttonWidth / 2));
 
 	_cancel->moveToLeft(cancelLeft, _buttonsTop);
 	_decline->moveToLeft(cancelLeft, _buttonsTop);
@@ -965,6 +1310,7 @@ void Panel::updateHangupGeometry() {
 	_screencast->moveToLeft(_camera->x() - buttonWidth, _buttonsTop);
 	_answerHangupRedial->moveToLeft(cancelLeft + cancelWidth, _buttonsTop);
 	_mute->moveToLeft(_answerHangupRedial->x() + buttonWidth, _buttonsTop);
+	_addPeople->moveToLeft(_mute->x() + buttonWidth, _buttonsTop);
 	if (_startVideo) {
 		_startVideo->moveToLeft(_camera->x(), _camera->y());
 	}
@@ -983,9 +1329,21 @@ void Panel::paint(QRect clip) {
 	if (!_incoming->widget()->isHidden()) {
 		region = region.subtracted(QRegion(_incoming->widget()->geometry()));
 	}
-	for (const auto &rect : region) {
-		p.fillRect(rect, st::callBgOpaque);
+
+	if (_background) {
+		_background->paint(
+			p,
+			widget()->size(),
+			_bodyTop,
+			_bodySt->photoTop,
+			_bodySt->photoSize,
+			region);
+	} else {
+		for (const auto &rect : region) {
+			p.fillRect(rect, st::callBgOpaque);
+		}
 	}
+
 	if (_incoming && _incoming->widget()->isHidden()) {
 		_call->videoIncoming()->markFrameShown();
 	}
@@ -993,18 +1351,34 @@ void Panel::paint(QRect clip) {
 
 bool Panel::handleClose() const {
 	if (_call) {
-		window()->hide();
+		if (_call->state() == Call::State::WaitingUserConfirmation
+			|| _call->state() == Call::State::Busy
+			|| _call->state() == Call::State::Starting
+			|| _call->state() == Call::State::WaitingIncoming) {
+			_call->hangup();
+		} else {
+			window()->hide();
+			if (Platform::IsWayland()) {
+				if (const auto handle = window()->windowHandle()) {
+					handle->destroy();
+				}
+			}
+		}
 		return true;
 	}
 	return false;
 }
 
 not_null<Ui::RpWindow*> Panel::window() const {
-	return _window.window();
+	return _window->window();
 }
 
 not_null<Ui::RpWidget*> Panel::widget() const {
-	return _window.widget();
+	return _window->widget();
+}
+
+not_null<UserData*> Panel::user() const {
+	return _user;
 }
 
 void Panel::stateChanged(State state) {
@@ -1012,35 +1386,36 @@ void Panel::stateChanged(State state) {
 
 	updateStatusText(state);
 
+	const auto isBusy = (state == State::Busy);
+	const auto isWaitingUser = (state == State::WaitingUserConfirmation);
+	_window->togglePowerSaveBlocker(!isBusy && !isWaitingUser);
+
 	if ((state != State::HangingUp)
+		&& (state != State::MigrationHangingUp)
 		&& (state != State::Ended)
 		&& (state != State::EndedByOtherDevice)
 		&& (state != State::FailedHangingUp)
 		&& (state != State::Failed)) {
-		const auto isBusy = (state == State::Busy);
-		const auto isWaitingUser = (state == State::WaitingUserConfirmation);
-		if (isBusy) {
-			_powerSaveBlocker = nullptr;
-		}
 		if (_startVideo && !isWaitingUser) {
 			_startVideo = nullptr;
 		} else if (!_startVideo && isWaitingUser) {
 			_startVideo = base::make_unique_q<Ui::CallButton>(
 				widget(),
 				st::callStartVideo);
+			_startVideo->show();
 			_startVideo->setText(tr::lng_call_start_video());
+			_startVideo->setAccessibleName(tr::lng_call_start_video(tr::now));
 			_startVideo->clicks() | rpl::map_to(true) | rpl::start_to_stream(
 				_startOutgoingRequests,
 				_startVideo->lifetime());
 		}
 		_camera->setVisible(!_startVideo);
 
+		const auto windowHidden = window()->isHidden();
 		const auto toggleButton = [&](auto &&button, bool visible) {
 			button->toggle(
 				visible,
-				window()->isHidden()
-				? anim::type::instant
-				: anim::type::normal);
+				(windowHidden ? anim::type::instant : anim::type::normal));
 		};
 		const auto incomingWaiting = _call->isIncomingWaiting();
 		if (incomingWaiting) {
@@ -1052,6 +1427,7 @@ void Panel::stateChanged(State state) {
 		toggleButton(
 			_screencast,
 			!(isBusy || isWaitingUser || incomingWaiting));
+		toggleButton(_addPeople, !isWaitingUser && _conferenceSupported);
 		const auto hangupShown = !_decline->toggled()
 			&& !_cancel->toggled();
 		if (_hangupShown != hangupShown) {
@@ -1075,7 +1451,7 @@ void Panel::stateChanged(State state) {
 			refreshAnswerHangupRedialLabel();
 		}
 		if (!_call->isKeyShaForFingerprintReady()) {
-			_fingerprint.destroy();
+			_fingerprint = nullptr;
 		} else if (!_fingerprint) {
 			_fingerprint = CreateFingerprintAndSignalBars(widget(), _call);
 			updateControlsGeometry();
@@ -1086,15 +1462,17 @@ void Panel::stateChanged(State state) {
 void Panel::refreshAnswerHangupRedialLabel() {
 	Expects(_answerHangupRedialState.has_value());
 
-	_answerHangupRedial->setText([&] {
+	const auto phrase = [&] {
 		switch (*_answerHangupRedialState) {
-		case AnswerHangupRedialState::Answer: return tr::lng_call_accept();
-		case AnswerHangupRedialState::Hangup: return tr::lng_call_end_call();
-		case AnswerHangupRedialState::Redial: return tr::lng_call_redial();
-		case AnswerHangupRedialState::StartCall: return tr::lng_call_start();
+		case AnswerHangupRedialState::Answer: return tr::lng_call_accept;
+		case AnswerHangupRedialState::Hangup: return tr::lng_call_end_call;
+		case AnswerHangupRedialState::Redial: return tr::lng_call_redial;
+		case AnswerHangupRedialState::StartCall: return tr::lng_call_start;
 		}
 		Unexpected("AnswerHangupRedialState value.");
-	}());
+	}();
+	_answerHangupRedial->setText(phrase());
+	_answerHangupRedial->setAccessibleName(phrase(tr::now));
 }
 
 void Panel::updateStatusText(State state) {
@@ -1102,7 +1480,8 @@ void Panel::updateStatusText(State state) {
 		switch (state) {
 		case State::Starting:
 		case State::WaitingInit:
-		case State::WaitingInitAck: return tr::lng_call_status_connecting(tr::now);
+		case State::WaitingInitAck:
+		case State::MigrationHangingUp: return tr::lng_call_status_connecting(tr::now);
 		case State::Established: {
 			if (_call) {
 				auto durationMs = _call->getDurationMs();
@@ -1120,7 +1499,10 @@ void Panel::updateStatusText(State state) {
 		case State::ExchangingKeys: return tr::lng_call_status_exchanging(tr::now);
 		case State::Waiting: return tr::lng_call_status_waiting(tr::now);
 		case State::Requesting: return tr::lng_call_status_requesting(tr::now);
-		case State::WaitingIncoming: return tr::lng_call_status_incoming(tr::now);
+		case State::WaitingIncoming:
+			return (_call->conferenceInvite()
+				? tr::lng_call_status_group_invite(tr::now)
+				: tr::lng_call_status_incoming(tr::now));
 		case State::Ringing: return tr::lng_call_status_ringing(tr::now);
 		case State::Busy: return tr::lng_call_status_busy(tr::now);
 		case State::WaitingUserConfirmation: return tr::lng_call_status_sure(tr::now);
@@ -1131,6 +1513,18 @@ void Panel::updateStatusText(State state) {
 	updateStatusGeometry();
 }
 
+void Panel::updateTextColors() {
+	if (!_background) {
+		_name->setTextColorOverride(std::nullopt);
+		_status->setTextColorOverride(std::nullopt);
+		return;
+	}
+	_name->setTextColorOverride(
+		_background->textColorOverride(st::callName.textFg));
+	_status->setTextColorOverride(
+		_background->textColorOverride(st::callStatus.textFg));
+}
+
 void Panel::startDurationUpdateTimer(crl::time currentDuration) {
 	auto msTillNextSecond = 1000 - (currentDuration % 1000);
 	_updateDurationTimer.callOnce(msTillNextSecond + 5);
diff --git a/Telegram/SourceFiles/calls/calls_panel.h b/Telegram/SourceFiles/calls/calls_panel.h
index e53045a445e2e6..aaed848f7fd2a7 100644
--- a/Telegram/SourceFiles/calls/calls_panel.h
+++ b/Telegram/SourceFiles/calls/calls_panel.h
@@ -7,14 +7,9 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "base/weak_ptr.h"
-#include "base/timer.h"
-#include "base/object_ptr.h"
-#include "base/unique_qptr.h"
 #include "calls/calls_call.h"
 #include "calls/group/ui/desktop_capture_choose_source.h"
 #include "ui/effects/animations.h"
-#include "ui/gl/gl_window.h"
 #include "ui/rp_widget.h"
 
 class Image;
@@ -27,7 +22,16 @@ namespace Data {
 class PhotoMedia;
 } // namespace Data
 
+namespace Main {
+class SessionShow;
+} // namespace Main
+
 namespace Ui {
+class Show;
+class BoxContent;
+class LayerWidget;
+enum class LayerOption;
+using LayerOptions = base::flags<LayerOption>;
 class IconButton;
 class CallButton;
 class LayerManager;
@@ -38,14 +42,17 @@ template <typename Widget>
 class PaddingWrap;
 class RpWindow;
 class PopupMenu;
-namespace GL {
-enum class Backend;
-} // namespace GL
-namespace Platform {
-struct SeparateTitleControls;
-} // namespace Platform
 } // namespace Ui
 
+namespace Ui::Toast {
+class Instance;
+struct Config;
+} // namespace Ui::Toast
+
+namespace Ui::Platform {
+struct SeparateTitleControls;
+} // namespace Ui::Platform
+
 namespace style {
 struct CallSignalBars;
 struct CallBodyLayout;
@@ -53,23 +60,35 @@ struct CallBodyLayout;
 
 namespace Calls {
 
+class Window;
 class Userpic;
 class SignalBars;
 class VideoBubble;
+class PanelBackground;
 struct DeviceSelection;
+struct ConferencePanelMigration;
 
-class Panel final : private Group::Ui::DesktopCapture::ChooseSourceDelegate {
+class Panel final
+	: public base::has_weak_ptr
+	, private Group::Ui::DesktopCapture::ChooseSourceDelegate {
 public:
 	Panel(not_null<Call*> call);
 	~Panel();
 
+	[[nodiscard]] not_null<Ui::RpWidget*> widget() const;
+	[[nodiscard]] not_null<UserData*> user() const;
 	[[nodiscard]] bool isVisible() const;
 	[[nodiscard]] bool isActive() const;
+	[[nodiscard]] QRect panelGeometry() const;
+
+	[[nodiscard]] ConferencePanelMigration migrationInfo() const;
+
 	void showAndActivate();
 	void minimize();
 	void toggleFullScreen();
 	void replaceCall(not_null<Call*> call);
-	void closeBeforeDestroy();
+	void savePanelGeometry();
+	void closeBeforeDestroy(bool windowIsReused = false);
 
 	QWidget *chooseSourceParent() override;
 	QString chooseSourceActiveDeviceId() override;
@@ -83,6 +102,11 @@ class Panel final : private Group::Ui::DesktopCapture::ChooseSourceDelegate {
 
 	[[nodiscard]] rpl::producer<bool> startOutgoingRequests() const;
 
+	[[nodiscard]] std::shared_ptr<Main::SessionShow> sessionShow();
+	[[nodiscard]] std::shared_ptr<Ui::Show> uiShow();
+
+	[[nodiscard]] not_null<Ui::RpWindow*> window() const;
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
@@ -96,14 +120,12 @@ class Panel final : private Group::Ui::DesktopCapture::ChooseSourceDelegate {
 		StartCall,
 	};
 
-	[[nodiscard]] not_null<Ui::RpWindow*> window() const;
-	[[nodiscard]] not_null<Ui::RpWidget*> widget() const;
-
 	void paint(QRect clip);
 
 	void initWindow();
 	void initWidget();
 	void initControls();
+	void initConferenceInvite();
 	void reinitWithCall(Call *call);
 	void initLayout();
 	void initMediaDeviceToggles();
@@ -111,6 +133,9 @@ class Panel final : private Group::Ui::DesktopCapture::ChooseSourceDelegate {
 
 	[[nodiscard]] bool handleClose() const;
 
+	void requestControlsHidden(bool hidden);
+	void controlsShownForce(bool shown);
+	void updateControlsShown();
 	void updateControlsGeometry();
 	void updateHangupGeometry();
 	void updateStatusGeometry();
@@ -118,6 +143,7 @@ class Panel final : private Group::Ui::DesktopCapture::ChooseSourceDelegate {
 	void stateChanged(State state);
 	void showControls();
 	void updateStatusText(State state);
+	void updateTextColors();
 	void startDurationUpdateTimer(crl::time currentDuration);
 	void setIncomingSize(QSize size);
 	void refreshIncomingGeometry();
@@ -139,46 +165,52 @@ class Panel final : private Group::Ui::DesktopCapture::ChooseSourceDelegate {
 	Call *_call = nullptr;
 	not_null<UserData*> _user;
 
-	Ui::GL::Window _window;
-	const std::unique_ptr<Ui::LayerManager> _layerBg;
+	std::shared_ptr<Window> _window;
 	std::unique_ptr<Incoming> _incoming;
 
-#ifndef Q_OS_MAC
-	std::unique_ptr<Ui::Platform::SeparateTitleControls> _controls;
-#endif // !Q_OS_MAC
-
-	std::unique_ptr<base::PowerSaveBlocker> _powerSaveBlocker;
-
 	QSize _incomingFrameSize;
 
 	rpl::lifetime _callLifetime;
 
 	not_null<const style::CallBodyLayout*> _bodySt;
-	object_ptr<Ui::CallButton> _answerHangupRedial;
-	object_ptr<Ui::FadeWrap<Ui::CallButton>> _decline;
-	object_ptr<Ui::FadeWrap<Ui::CallButton>> _cancel;
+	base::unique_qptr<Ui::CallButton> _answerHangupRedial;
+	base::unique_qptr<Ui::FadeWrap<Ui::CallButton>> _decline;
+	base::unique_qptr<Ui::FadeWrap<Ui::CallButton>> _cancel;
 	bool _hangupShown = false;
+	bool _conferenceSupported = false;
 	bool _outgoingPreviewInBody = false;
 	std::optional<AnswerHangupRedialState> _answerHangupRedialState;
 	Ui::Animations::Simple _hangupShownProgress;
-	object_ptr<Ui::FadeWrap<Ui::CallButton>> _screencast;
-	object_ptr<Ui::CallButton> _camera;
+	base::unique_qptr<Ui::FadeWrap<Ui::CallButton>> _screencast;
+	base::unique_qptr<Ui::CallButton> _camera;
 	Ui::CallButton *_cameraDeviceToggle = nullptr;
 	base::unique_qptr<Ui::CallButton> _startVideo;
-	object_ptr<Ui::FadeWrap<Ui::CallButton>> _mute;
+	base::unique_qptr<Ui::FadeWrap<Ui::CallButton>> _mute;
 	Ui::CallButton *_audioDeviceToggle = nullptr;
-	object_ptr<Ui::FlatLabel> _name;
-	object_ptr<Ui::FlatLabel> _status;
-	object_ptr<Ui::RpWidget> _fingerprint = { nullptr };
-	object_ptr<Ui::PaddingWrap<Ui::FlatLabel>> _remoteAudioMute = { nullptr };
-	object_ptr<Ui::PaddingWrap<Ui::FlatLabel>> _remoteLowBattery
-		= { nullptr };
+	base::unique_qptr<Ui::FadeWrap<Ui::CallButton>> _addPeople;
+	base::unique_qptr<Ui::FlatLabel> _name;
+	base::unique_qptr<Ui::FlatLabel> _status;
+	base::unique_qptr<Ui::RpWidget> _conferenceParticipants;
+	base::unique_qptr<Ui::RpWidget> _fingerprint;
+	base::unique_qptr<Ui::PaddingWrap<Ui::FlatLabel>> _remoteAudioMute;
+	base::unique_qptr<Ui::PaddingWrap<Ui::FlatLabel>> _remoteLowBattery;
 	std::unique_ptr<Userpic> _userpic;
 	std::unique_ptr<VideoBubble> _outgoingVideoBubble;
 	QPixmap _bottomShadow;
 	int _bodyTop = 0;
+	int _buttonsTopShown = 0;
 	int _buttonsTop = 0;
 
+	base::Timer _hideControlsTimer;
+	base::Timer _controlsShownForceTimer;
+	std::unique_ptr<QObject> _hideControlsFilter;
+	bool _hideControlsRequested = false;
+	rpl::variable<bool> _fullScreenOrMaximized;
+	Ui::Animations::Simple _controlsShownAnimation;
+	bool _controlsShownForce = false;
+	bool _controlsShown = true;
+	bool _mouseInside = false;
+
 	base::unique_qptr<Ui::PopupMenu> _devicesMenu;
 
 	base::Timer _updateDurationTimer;
@@ -186,6 +218,11 @@ class Panel final : private Group::Ui::DesktopCapture::ChooseSourceDelegate {
 
 	rpl::event_stream<bool> _startOutgoingRequests;
 
+	std::unique_ptr<PanelBackground> _background;
+
+	rpl::lifetime _geometryLifetime;
+	rpl::lifetime _lifetime;
+
 };
 
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_panel_background.cpp b/Telegram/SourceFiles/calls/calls_panel_background.cpp
new file mode 100644
index 00000000000000..709b14c33141db
--- /dev/null
+++ b/Telegram/SourceFiles/calls/calls_panel_background.cpp
@@ -0,0 +1,225 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "calls/calls_panel_background.h"
+
+#include "apiwrap.h"
+#include "api/api_peer_colors.h"
+#include "data/data_changes.h"
+#include "data/data_document.h"
+#include "data/data_emoji_statuses.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "main/main_session.h"
+#include "ui/color_contrast.h"
+#include "ui/top_background_gradient.h"
+#include "styles/style_calls.h"
+
+namespace Calls {
+
+PanelBackground::PanelBackground(
+	not_null<PeerData*> peer,
+	Fn<void()> updateCallback)
+: _peer(peer)
+, _updateCallback(std::move(updateCallback)) {
+	updateColors();
+	updateEmojiId();
+
+	_peer->session().changes().peerFlagsValue(
+		_peer,
+		Data::PeerUpdate::Flag::ColorProfile
+			| Data::PeerUpdate::Flag::EmojiStatus
+	) | rpl::on_next([=] {
+		updateColors();
+		_brushSize = QSize();
+		if (_updateCallback) {
+			_updateCallback();
+		}
+	}, _lifetime);
+
+	_peer->session().changes().peerFlagsValue(
+		_peer,
+		Data::PeerUpdate::Flag::BackgroundEmoji
+			| Data::PeerUpdate::Flag::EmojiStatus
+	) | rpl::on_next([=] {
+		updateEmojiId();
+		if (_updateCallback) {
+			_updateCallback();
+		}
+	}, _lifetime);
+}
+
+void PanelBackground::paint(
+		QPainter &p,
+		QSize widgetSize,
+		int bodyTop,
+		int photoTop,
+		int photoSize,
+		const QRegion &region) {
+	if (!_colors || _colors->bg.empty()) {
+		for (const auto &rect : region) {
+			p.fillRect(rect, st::callBgOpaque);
+		}
+		return;
+	}
+
+	const auto &colors = _colors->bg;
+	if (colors.size() == 1) {
+		for (const auto &rect : region) {
+			p.fillRect(rect, colors.front());
+		}
+	} else {
+		const auto center = QPoint(
+			widgetSize.width() / 2,
+			bodyTop + photoTop + photoSize / 2);
+		const auto radius = std::max(
+			std::hypot(center.x(), center.y()),
+			std::hypot(widgetSize.width() - center.x(),
+				widgetSize.height() - center.y()));
+		if (_brushSize != widgetSize) {
+			updateBrush(widgetSize, center, radius, colors);
+		}
+		for (const auto &rect : region) {
+			p.fillRect(rect, _brush);
+		}
+	}
+
+	const auto emojiId = _currentEmojiId;
+	if (!emojiId) {
+		_emoji = nullptr;
+		_cachedImage = QImage();
+		_cachedEmojiId = 0;
+		return;
+	}
+
+	const auto userpicX = (widgetSize.width() - photoSize) / 2;
+	const auto userpicY = bodyTop + photoTop;
+	const auto padding = photoSize;
+	const auto patternRect = QRect(
+		userpicX - padding,
+		userpicY - padding / 2,
+		photoSize + padding * 2,
+		photoSize + padding);
+
+	if (!_emoji
+		|| _emoji->entityData()
+			!= Data::SerializeCustomEmojiId(emojiId)) {
+		const auto document = _peer->owner().document(emojiId);
+		_emoji = document->owner().customEmojiManager().create(
+			document,
+			[=] {
+				_cachedImage = QImage();
+				if (_updateCallback) {
+					_updateCallback();
+				}
+			},
+			Data::CustomEmojiSizeTag::Large);
+		_cachedImage = QImage();
+		_cachedEmojiId = 0;
+	}
+
+	if (_emoji && _emoji->ready()) {
+		if (_cachedImage.isNull()
+			|| _cachedRect != patternRect
+			|| _cachedEmojiId != emojiId) {
+			renderPattern(patternRect, emojiId);
+		}
+		p.drawImage(patternRect, _cachedImage);
+	}
+}
+
+void PanelBackground::updateBrush(
+		QSize widgetSize,
+		QPoint center,
+		float64 radius,
+		const std::vector<QColor> &colors) {
+	_brushSize = widgetSize;
+	auto gradient = QRadialGradient(center, radius);
+	const auto step = 1.0 / (colors.size() - 1);
+	for (auto i = 0; i < colors.size(); ++i) {
+		gradient.setColorAt(i * step, colors[colors.size() - 1 - i]);
+	}
+	_brush = QBrush(gradient);
+}
+
+void PanelBackground::renderPattern(const QRect &rect, DocumentId emojiId) {
+	const auto ratio = style::DevicePixelRatio();
+	_cachedImage = QImage(
+		rect.size() * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	_cachedImage.setDevicePixelRatio(ratio);
+	_cachedImage.fill(Qt::transparent);
+
+	auto painter = QPainter(&_cachedImage);
+	const auto patternColor = QColor(0, 0, 0, int(0.6 * 255));
+	const auto &points = Ui::PatternBgPoints();
+	const auto localRect = QRect(QPoint(), rect.size());
+	Ui::PaintBgPoints(
+		painter,
+		points,
+		_cache,
+		_emoji.get(),
+		patternColor,
+		localRect,
+		1.);
+
+	_cachedRect = rect;
+	_cachedEmojiId = emojiId;
+}
+
+void PanelBackground::updateColors() {
+	const auto collectible = _peer->emojiStatusId().collectible;
+	if (collectible && collectible->centerColor.isValid()) {
+		_colors = Data::ColorProfileSet{
+			.bg = { collectible->edgeColor, collectible->centerColor },
+		};
+	} else {
+		_colors = _peer->session().api().peerColors().colorProfileFor(_peer);
+	}
+}
+
+void PanelBackground::updateEmojiId() {
+	const auto collectible = _peer->emojiStatusId().collectible;
+	_currentEmojiId = (collectible && collectible->patternDocumentId)
+		? collectible->patternDocumentId
+		: _peer->profileBackgroundEmojiId();
+}
+
+std::optional<QColor> PanelBackground::edgeColor() const {
+	const auto collectible = _peer->emojiStatusId().collectible;
+	if (collectible && collectible->edgeColor.isValid()) {
+		return collectible->edgeColor;
+	}
+	if (_colors && !_colors->bg.empty()) {
+		return _colors->bg.front();
+	}
+	return std::nullopt;
+}
+
+std::optional<QColor> PanelBackground::textColorOverride(
+		const style::color &defaultColor) const {
+	const auto collectible = _peer->emojiStatusId().collectible;
+	if (collectible && collectible->textColor.isValid()) {
+		return collectible->textColor;
+	}
+	const auto edge = edgeColor();
+	if (!edge) {
+		return std::nullopt;
+	}
+	constexpr auto kMinContrast = 5.5;
+	if (kMinContrast > Ui::CountContrast(defaultColor->c, *edge)) {
+		return st::groupCallMembersFg->c;
+	}
+	return std::nullopt;
+}
+
+rpl::lifetime &PanelBackground::lifetime() {
+	return _lifetime;
+}
+
+} // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_panel_background.h b/Telegram/SourceFiles/calls/calls_panel_background.h
new file mode 100644
index 00000000000000..e4c00770ea246a
--- /dev/null
+++ b/Telegram/SourceFiles/calls/calls_panel_background.h
@@ -0,0 +1,75 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "data/data_peer_colors.h"
+
+class DocumentData;
+class PeerData;
+
+namespace Data {
+class CustomEmoji;
+} // namespace Data
+
+namespace Ui {
+namespace Text {
+class CustomEmoji;
+} // namespace Text
+} // namespace Ui
+
+namespace Calls {
+
+class PanelBackground final {
+public:
+	explicit PanelBackground(
+		not_null<PeerData*> peer,
+		Fn<void()> updateCallback);
+
+	void paint(
+		QPainter &p,
+		QSize widgetSize,
+		int bodyTop,
+		int photoTop,
+		int photoSize,
+		const QRegion &region);
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
+	[[nodiscard]] std::optional<QColor> textColorOverride(
+		const style::color &defaultColor) const;
+
+private:
+	void updateBrush(
+		QSize widgetSize,
+		QPoint center,
+		float64 radius,
+		const std::vector<QColor> &colors);
+	void renderPattern(const QRect &rect, DocumentId emojiId);
+	void updateColors();
+	void updateEmojiId();
+	[[nodiscard]] std::optional<QColor> edgeColor() const;
+
+	const not_null<PeerData*> _peer;
+	const Fn<void()> _updateCallback;
+
+	QBrush _brush;
+	QSize _brushSize;
+
+	std::optional<Data::ColorProfileSet> _colors;
+
+	std::unique_ptr<Ui::Text::CustomEmoji> _emoji;
+	base::flat_map<float64, QImage> _cache;
+	QImage _cachedImage;
+	QRect _cachedRect;
+	DocumentId _cachedEmojiId = 0;
+	DocumentId _currentEmojiId = 0;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_signal_bars.cpp b/Telegram/SourceFiles/calls/calls_signal_bars.cpp
index 9d2f3c8703194e..94d2072670bd71 100644
--- a/Telegram/SourceFiles/calls/calls_signal_bars.cpp
+++ b/Telegram/SourceFiles/calls/calls_signal_bars.cpp
@@ -24,7 +24,7 @@ SignalBars::SignalBars(
 		_st.width + (_st.width + _st.skip) * (Call::kSignalBarCount - 1),
 		_st.max);
 	call->signalBarCountValue(
-	) | rpl::start_with_next([=](int count) {
+	) | rpl::on_next([=](int count) {
 		changed(count);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index dea58fd2f193c6..5cc36461ad1194 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -30,6 +30,7 @@ For license and copyright information please follow this link:
 #include "data/data_group_call.h"
 #include "data/data_peer.h"
 #include "data/data_changes.h"
+#include "data/data_session.h"
 #include "main/main_session.h"
 #include "boxes/abstract_box.h"
 #include "base/timer.h"
@@ -148,7 +149,7 @@ DebugInfoBox::DebugInfoBox(QWidget*, base::weak_ptr<Call> call)
 }
 
 void DebugInfoBox::prepare() {
-	setTitle(rpl::single(u"Call Debug"_q));
+	setTitle(u"Call Debug"_q);
 
 	addButton(tr::lng_close(), [this] { closeBox(); });
 	_text = setInnerWidget(
@@ -185,7 +186,7 @@ class Mute final : public Ui::IconButton {
 		installEventFilter(this);
 
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_crossLineMuteAnimation.invalidate();
 		}, lifetime());
 	}
@@ -228,14 +229,14 @@ class Mute final : public Ui::IconButton {
 
 TopBar::TopBar(
 	QWidget *parent,
-	const base::weak_ptr<Call> &call,
+	Call *call,
 	std::shared_ptr<Ui::Show> show)
 : TopBar(parent, show, call, nullptr) {
 }
 
 TopBar::TopBar(
 	QWidget *parent,
-	const base::weak_ptr<GroupCall> &call,
+	GroupCall *call,
 	std::shared_ptr<Ui::Show> show)
 : TopBar(parent, show, nullptr, call) {
 }
@@ -243,8 +244,8 @@ TopBar::TopBar(
 TopBar::TopBar(
 	QWidget *parent,
 	std::shared_ptr<Ui::Show> show,
-	const base::weak_ptr<Call> &call,
-	const base::weak_ptr<GroupCall> &groupCall)
+	Call *call,
+	GroupCall *groupCall)
 : RpWidget(parent)
 , _call(call)
 , _groupCall(groupCall)
@@ -318,12 +319,12 @@ void TopBar::initControls() {
 			_call->mutedValue() | rpl::map(mapToState),
 			rpl::single(GroupCall::InstanceState::Connected),
 			rpl::single(TimeId(0))
-		) | rpl::type_erased()
+		) | rpl::type_erased
 		: rpl::combine(
 			(_groupCall->mutedValue()
 				| MapPushToTalkToActive()
 				| rpl::distinct_until_changed()
-				| rpl::type_erased()),
+				| rpl::type_erased),
 			rpl::single(
 				_groupCall->instanceState()
 			) | rpl::then(_groupCall->instanceStateValue() | rpl::filter(
@@ -338,7 +339,7 @@ void TopBar::initControls() {
 		muted
 	) | rpl::map(
 		BarStateFromMuteState
-	) | rpl::start_with_next([=](BarState state) {
+	) | rpl::on_next([=](BarState state) {
 		_isGroupConnecting = (state == BarState::Connecting);
 		setMuted(state != BarState::Active);
 		update();
@@ -386,7 +387,7 @@ void TopBar::initControls() {
 		subscribeToMembersChanges(group);
 
 		_isGroupConnecting.value(
-		) | rpl::start_with_next([=](bool isConnecting) {
+		) | rpl::on_next([=](bool isConnecting) {
 			_mute->setAttribute(
 				Qt::WA_TransparentForMouseEvents,
 				isConnecting);
@@ -400,7 +401,7 @@ void TopBar::initControls() {
 		) | rpl::filter([=](const Data::PeerUpdate &update) {
 			// _user may change for the same Panel.
 			return (_call != nullptr) && (update.peer == _call->user());
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			updateInfoLabels();
 		}, lifetime());
 	}
@@ -424,7 +425,7 @@ void TopBar::initControls() {
 		if (const auto call = _call.get()) {
 			call->hangup();
 		} else if (const auto group = _groupCall.get()) {
-			if (!group->peer()->canManageGroupCall()) {
+			if (!group->canManage()) {
 				group->hangup();
 			} else {
 				_show->showBox(
@@ -490,7 +491,7 @@ void TopBar::initBlobsUnder(
 	});
 
 	group->stateValue(
-	) | rpl::start_with_next([=](Calls::GroupCall::State state) {
+	) | rpl::on_next([=](Calls::GroupCall::State state) {
 		if (state == Calls::GroupCall::State::HangingUp) {
 			_blobs->hide();
 		}
@@ -506,7 +507,7 @@ void TopBar::initBlobsUnder(
 	std::move(
 		hideBlobs
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool hide) {
+	) | rpl::on_next([=](bool hide) {
 		if (hide) {
 			state->paint.setLevel(0.);
 		}
@@ -529,7 +530,7 @@ void TopBar::initBlobsUnder(
 
 	std::move(
 		barGeometry
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		_blobs->resize(
 			rect.width(),
 			(int)state->paint.maxRadius());
@@ -537,12 +538,12 @@ void TopBar::initBlobsUnder(
 	}, lifetime());
 
 	shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		_blobs->setVisible(shown);
 	}, lifetime());
 
 	_blobs->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		const auto hidden = state->hideAnimation.value(
 			state->hideLastTime ? 1. : 0.);
 		if (hidden == 1.) {
@@ -562,7 +563,7 @@ void TopBar::initBlobsUnder(
 	group->levelUpdates(
 	) | rpl::filter([=](const LevelUpdate &update) {
 		return !state->hideLastTime && (update.value > state->lastLevel);
-	}) | rpl::start_with_next([=](const LevelUpdate &update) {
+	}) | rpl::on_next([=](const LevelUpdate &update) {
 		if (state->lastLevel == 0.) {
 			state->levelTimer.callEach(kBlobUpdateInterval);
 		}
@@ -580,28 +581,33 @@ void TopBar::initBlobsUnder(
 
 void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
 	const auto peer = call->peer();
-	peer->session().changes().peerFlagsValue(
-		peer,
-		Data::PeerUpdate::Flag::GroupCall
-	) | rpl::map([=] {
-		return peer->groupCall();
-	}) | rpl::filter([=](Data::GroupCall *real) {
-		const auto call = _groupCall.get();
-		return call && real && (real->id() == call->id());
-	}) | rpl::take(
-		1
+	const auto group = _groupCall.get();
+	const auto conference = group && group->conference();
+	auto realValue = conference
+		? (rpl::single(group->sharedCall().get()) | rpl::type_erased)
+		: peer->session().changes().peerFlagsValue(
+			peer,
+			Data::PeerUpdate::Flag::GroupCall
+		) | rpl::map([=] {
+			return peer->groupCall();
+		}) | rpl::filter([=](Data::GroupCall *real) {
+			const auto call = _groupCall.get();
+			return call && real && (real->id() == call->id());
+		}) | rpl::take(1);
+	std::move(
+		realValue
 	) | rpl::before_next([=](not_null<Data::GroupCall*> real) {
-		real->titleValue() | rpl::start_with_next([=] {
+		real->titleValue() | rpl::on_next([=] {
 			updateInfoLabels();
 		}, lifetime());
 	}) | rpl::map([=](not_null<Data::GroupCall*> real) {
-
 		return HistoryView::GroupCallBarContentByCall(
 			real,
 			st::groupCallTopBarUserpics.size);
 	}) | rpl::flatten_latest(
 	) | rpl::filter([=](const Ui::GroupCallBarContent &content) {
-		if (_users.size() != content.users.size()) {
+		if (_users.size() != content.users.size()
+			|| (conference && _usersCount != content.count)) {
 			return true;
 		}
 		for (auto i = 0, count = int(_users.size()); i != count; ++i) {
@@ -611,16 +617,20 @@ void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
 			}
 		}
 		return false;
-	}) | rpl::start_with_next([=](const Ui::GroupCallBarContent &content) {
+	}) | rpl::on_next([=](const Ui::GroupCallBarContent &content) {
 		_users = content.users;
+		_usersCount = content.count;
 		for (auto &user : _users) {
 			user.speaking = false;
 		}
 		_userpics->update(_users, !isHidden());
+		if (conference) {
+			updateInfoLabels();
+		}
 	}, lifetime());
 
 	_userpics->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_userpicsWidth = width;
 		updateControlsGeometry();
 	}, lifetime());
@@ -631,7 +641,7 @@ void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
 		// _peer may change for the same Panel.
 		const auto call = _groupCall.get();
 		return (call != nullptr) && (update.peer == call->peer());
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateInfoLabels();
 	}, lifetime());
 }
@@ -655,14 +665,62 @@ void TopBar::setInfoLabels() {
 	} else if (const auto group = _groupCall.get()) {
 		const auto peer = group->peer();
 		const auto real = peer->groupCall();
-		const auto name = peer->name();
-		const auto text = _isGroupConnecting.current()
-			? tr::lng_group_call_connecting(tr::now)
-			: (real && real->id() == group->id() && !real->title().isEmpty())
-			? real->title()
-			: name;
-		_fullInfoLabel->setText(text);
-		_shortInfoLabel->setText(text);
+		const auto connecting = _isGroupConnecting.current();
+		if (!group->conference()) {
+			_shortInfoLabel.destroy();
+		}
+		if (!group->conference() || connecting) {
+			const auto name = peer->name();
+			const auto title = (real && real->id() == group->id())
+				? real->title()
+				: QString();
+			const auto text = _isGroupConnecting.current()
+				? tr::lng_group_call_connecting(tr::now)
+				: !title.isEmpty()
+				? title
+				: name;
+			_fullInfoLabel->setText(text);
+			if (_shortInfoLabel) {
+				_shortInfoLabel->setText(text);
+			}
+		} else if (!_usersCount
+			|| _users.empty()
+			|| (_users.size() == 1
+				&& _users.front().id == peer->session().userPeerId().value
+				&& _usersCount == 1)) {
+			_fullInfoLabel->setText(tr::lng_confcall_join_title(tr::now));
+			_shortInfoLabel->setText(tr::lng_confcall_join_title(tr::now));
+		} else {
+			const auto textWithUserpics = [&](int userpics) {
+				const auto other = std::max(_usersCount - userpics, 0);
+				auto names = QStringList();
+				for (const auto &entry : _users) {
+					const auto user = peer->owner().peer(PeerId(entry.id));
+					names.push_back(user->shortName());
+					if (names.size() >= userpics) {
+						break;
+					}
+				}
+				if (other > 0) {
+					return tr::lng_forwarding_from(
+						tr::now,
+						lt_count,
+						other,
+						lt_user,
+						names.join(u", "_q));
+				} else if (userpics > 1) {
+					return tr::lng_forwarding_from_two(
+						tr::now,
+						lt_user,
+						names.mid(0, userpics - 1).join(u", "_q),
+						lt_second_user,
+						names.back());
+				}
+				return names.back();
+			};
+			_fullInfoLabel->setText(textWithUserpics(int(_users.size())));
+			_shortInfoLabel->setText(textWithUserpics(1));
+		}
 	}
 }
 
@@ -732,10 +790,8 @@ void TopBar::updateControlsGeometry() {
 		height());
 
 	auto fullWidth = _fullInfoLabel->textMaxWidth();
-	auto showFull = (left + fullWidth + right <= width());
-	_fullInfoLabel->setVisible(showFull);
-	_shortInfoLabel->setVisible(!showFull);
-
+	auto showFull = !_shortInfoLabel
+		|| (left + fullWidth + right <= width());
 	auto setInfoLabelGeometry = [this, left, right](auto &&infoLabel) {
 		auto minPadding = qMax(left, right);
 		auto infoWidth = infoLabel->textMaxWidth();
@@ -746,8 +802,13 @@ void TopBar::updateControlsGeometry() {
 		}
 		infoLabel->setGeometryToLeft(infoLeft, st::callBarLabelTop, infoWidth, st::callBarInfoLabel.style.font->height);
 	};
+
+	_fullInfoLabel->setVisible(showFull);
 	setInfoLabelGeometry(_fullInfoLabel);
-	setInfoLabelGeometry(_shortInfoLabel);
+	if (_shortInfoLabel) {
+		_shortInfoLabel->setVisible(!showFull);
+		setInfoLabelGeometry(_shortInfoLabel);
+	}
 
 	_gradients.set_points(
 		QPointF(0, st::callBarHeight / 2),
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.h b/Telegram/SourceFiles/calls/calls_top_bar.h
index 7b62e6673a1aeb..fbc6438a053c42 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.h
+++ b/Telegram/SourceFiles/calls/calls_top_bar.h
@@ -42,11 +42,11 @@ class TopBar : public Ui::RpWidget {
 public:
 	TopBar(
 		QWidget *parent,
-		const base::weak_ptr<Call> &call,
+		Call *call,
 		std::shared_ptr<Ui::Show> show);
 	TopBar(
 		QWidget *parent,
-		const base::weak_ptr<GroupCall> &call,
+		GroupCall *call,
 		std::shared_ptr<Ui::Show> show);
 	~TopBar();
 
@@ -64,8 +64,8 @@ class TopBar : public Ui::RpWidget {
 	TopBar(
 		QWidget *parent,
 		std::shared_ptr<Ui::Show> show,
-		const base::weak_ptr<Call> &call,
-		const base::weak_ptr<GroupCall> &groupCall);
+		Call *call,
+		GroupCall *groupCall);
 
 	void initControls();
 	void setupInitialBrush();
@@ -85,6 +85,7 @@ class TopBar : public Ui::RpWidget {
 
 	bool _muted = false;
 	std::vector<Ui::GroupCallUser> _users;
+	int _usersCount = 0;
 	std::unique_ptr<Ui::GroupCallUserpics> _userpics;
 	int _userpicsWidth = 0;
 	object_ptr<Ui::LabelSimple> _durationLabel;
@@ -99,6 +100,8 @@ class TopBar : public Ui::RpWidget {
 
 	rpl::variable<bool> _isGroupConnecting = false;
 
+	std::vector<not_null<PeerData*>> _conferenceFirstUsers;
+
 	QBrush _groupBrush;
 	anim::linear_gradients<BarState> _gradients;
 	Ui::Animations::Simple _switchStateAnimation;
diff --git a/Telegram/SourceFiles/calls/calls_userpic.cpp b/Telegram/SourceFiles/calls/calls_userpic.cpp
index a57b6ff19bfde4..e1f55025dfb67b 100644
--- a/Telegram/SourceFiles/calls/calls_userpic.cpp
+++ b/Telegram/SourceFiles/calls/calls_userpic.cpp
@@ -58,25 +58,25 @@ void Userpic::setup(rpl::producer<bool> muted) {
 	_content.setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	_content.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		paint();
 	}, lifetime());
 
 	std::move(
 		muted
-	) | rpl::start_with_next([=](bool muted) {
+	) | rpl::on_next([=](bool muted) {
 		setMuted(muted);
 	}, lifetime());
 
 	_peer->session().changes().peerFlagsValue(
 		_peer,
 		Data::PeerUpdate::Flag::Photo
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		processPhoto();
 	}, lifetime());
 
 	_peer->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshPhoto();
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/calls/calls_video_bubble.cpp b/Telegram/SourceFiles/calls/calls_video_bubble.cpp
index b6866e9fd4c4b0..733aad28146b59 100644
--- a/Telegram/SourceFiles/calls/calls_video_bubble.cpp
+++ b/Telegram/SourceFiles/calls/calls_video_bubble.cpp
@@ -30,17 +30,17 @@ void VideoBubble::setup() {
 	applyDragMode(_dragMode);
 
 	_content.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		paint();
 	}, lifetime());
 
 	_track->stateValue(
-	) | rpl::start_with_next([=](Webrtc::VideoState state) {
+	) | rpl::on_next([=](Webrtc::VideoState state) {
 		setState(state);
 	}, lifetime());
 
 	_track->renderNextFrame(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_track->frameSize().isEmpty()) {
 			_track->markFrameShown();
 		} else {
diff --git a/Telegram/SourceFiles/calls/calls_video_incoming.cpp b/Telegram/SourceFiles/calls/calls_video_incoming.cpp
index e1a52ebe9065d5..9e617d76291e1b 100644
--- a/Telegram/SourceFiles/calls/calls_video_incoming.cpp
+++ b/Telegram/SourceFiles/calls/calls_video_incoming.cpp
@@ -11,6 +11,8 @@ For license and copyright information please follow this link:
 #include "ui/gl/gl_shader.h"
 #include "ui/gl/gl_image.h"
 #include "ui/gl/gl_primitives.h"
+#include "ui/rhi/rhi_renderer.h"
+#include "ui/rhi/rhi_shader.h"
 #include "ui/painter.h"
 #include "media/view/media_view_pip.h"
 #include "webrtc/webrtc_video_track.h"
@@ -18,6 +20,9 @@ For license and copyright information please follow this link:
 
 #include <QOpenGLShader>
 #include <QOpenGLBuffer>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+#include <rhi/qrhi.h>
+#endif
 
 namespace Calls {
 namespace {
@@ -46,13 +51,9 @@ class Panel::Incoming::RendererGL final : public Ui::GL::Renderer {
 public:
 	explicit RendererGL(not_null<Incoming*> owner);
 
-	void init(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions &f) override;
+	void init(QOpenGLFunctions &f) override;
 
-	void deinit(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions *f) override;
+	void deinit(QOpenGLFunctions *f) override;
 
 	void paint(
 		not_null<QOpenGLWidget*> widget,
@@ -100,7 +101,7 @@ class Panel::Incoming::RendererSW final : public Ui::GL::Renderer {
 	explicit RendererSW(not_null<Incoming*> owner);
 
 	void paintFallback(
-		Painter &&p,
+		Painter &p,
 		const QRegion &clip,
 		Ui::GL::Backend backend) override;
 
@@ -118,14 +119,12 @@ class Panel::Incoming::RendererSW final : public Ui::GL::Renderer {
 Panel::Incoming::RendererGL::RendererGL(not_null<Incoming*> owner)
 : _owner(owner) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controlsShadowImage.invalidate();
 	}, _lifetime);
 }
 
-void Panel::Incoming::RendererGL::init(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions &f) {
+void Panel::Incoming::RendererGL::init(QOpenGLFunctions &f) {
 	constexpr auto kQuads = 2;
 	constexpr auto kQuadVertices = kQuads * 4;
 	constexpr auto kQuadValues = kQuadVertices * 4;
@@ -168,9 +167,8 @@ void Panel::Incoming::RendererGL::init(
 		}));
 }
 
-void Panel::Incoming::RendererGL::deinit(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions *f) {
+void Panel::Incoming::RendererGL::deinit(QOpenGLFunctions *f) {
+	_controlsShadowImage.destroy(f);
 	_textures.destroy(f);
 	_imageProgram = std::nullopt;
 	_texturedVertexShader = nullptr;
@@ -437,7 +435,7 @@ Panel::Incoming::RendererSW::RendererSW(not_null<Incoming*> owner)
 }
 
 void Panel::Incoming::RendererSW::paintFallback(
-		Painter &&p,
+		Painter &p,
 		const QRegion &clip,
 		Ui::GL::Backend backend) {
 	const auto markGuard = gsl::finally([&] {
@@ -540,6 +538,534 @@ void Panel::Incoming::RendererSW::fillBottomShadow(QPainter &p) {
 			factor * fill.height()));
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+struct IncomingShadowUniforms {
+	float viewport[2];
+	float shadow[3];
+	float _pad0;
+};
+static_assert(sizeof(IncomingShadowUniforms) == 24);
+
+class Panel::Incoming::RendererRhi final
+	: public Ui::GL::Renderer
+	, public Ui::Rhi::Renderer {
+public:
+	explicit RendererRhi(not_null<Incoming*> owner) : _owner(owner) {
+	}
+	~RendererRhi() {
+		releaseResources();
+	}
+
+	void initialize(
+			QRhi *rhi,
+			QRhiRenderTarget *rt,
+			QRhiCommandBuffer *cb) override {
+		if (_initialized && _rhi == rhi) {
+			return;
+		}
+		_rhi = rhi;
+		_vertexBuffer = rhi->newBuffer(
+			QRhiBuffer::Dynamic,
+			QRhiBuffer::VertexBuffer,
+			4 * 4 * sizeof(float));
+		_vertexBuffer->create();
+		_uniformBuffer = rhi->newBuffer(
+			QRhiBuffer::Dynamic,
+			QRhiBuffer::UniformBuffer,
+			256);
+		_uniformBuffer->create();
+		_sampler = rhi->newSampler(
+			QRhiSampler::Linear, QRhiSampler::Linear,
+			QRhiSampler::None,
+			QRhiSampler::ClampToEdge, QRhiSampler::ClampToEdge);
+		_sampler->create();
+		_placeholder = rhi->newTexture(QRhiTexture::BGRA8, QSize(1, 1));
+		_placeholder->create();
+
+		const auto rpDesc = rt->renderPassDescriptor();
+		const auto vs = Ui::Rhi::ShaderFromFile(
+			u":/shaders/argb32.vert.qsb"_q);
+		const auto argb32Fs = Ui::Rhi::ShaderFromFile(
+			u":/shaders/incoming_shadow.frag.qsb"_q);
+		const auto yuv420Fs = Ui::Rhi::ShaderFromFile(
+			u":/shaders/incoming_yuv420.frag.qsb"_q);
+
+		QRhiVertexInputLayout layout;
+		layout.setBindings({ { 4 * sizeof(float) } });
+		layout.setAttributes({
+			{ 0, 0, QRhiVertexInputAttribute::Float2, 0 },
+			{ 0, 1, QRhiVertexInputAttribute::Float2, 2 * sizeof(float) },
+		});
+
+		_argb32Srb = rhi->newShaderResourceBindings();
+		_argb32Srb->setBindings({
+			QRhiShaderResourceBinding::uniformBuffer(
+				0,
+				QRhiShaderResourceBinding::VertexStage
+					| QRhiShaderResourceBinding::FragmentStage,
+				_uniformBuffer),
+			QRhiShaderResourceBinding::sampledTexture(
+				1, QRhiShaderResourceBinding::FragmentStage,
+				_placeholder, _sampler),
+		});
+		_argb32Srb->create();
+
+		_argb32Pipeline = rhi->newGraphicsPipeline();
+		_argb32Pipeline->setShaderStages({
+			{ QRhiShaderStage::Vertex, vs },
+			{ QRhiShaderStage::Fragment, argb32Fs },
+		});
+		_argb32Pipeline->setVertexInputLayout(layout);
+		_argb32Pipeline->setTopology(
+			QRhiGraphicsPipeline::TriangleStrip);
+		_argb32Pipeline->setShaderResourceBindings(_argb32Srb);
+		_argb32Pipeline->setRenderPassDescriptor(rpDesc);
+		_argb32Pipeline->create();
+
+		_yuv420Srb = rhi->newShaderResourceBindings();
+		_yuv420Srb->setBindings({
+			QRhiShaderResourceBinding::uniformBuffer(
+				0,
+				QRhiShaderResourceBinding::VertexStage
+					| QRhiShaderResourceBinding::FragmentStage,
+				_uniformBuffer),
+			QRhiShaderResourceBinding::sampledTexture(
+				1, QRhiShaderResourceBinding::FragmentStage,
+				_placeholder, _sampler),
+			QRhiShaderResourceBinding::sampledTexture(
+				2, QRhiShaderResourceBinding::FragmentStage,
+				_placeholder, _sampler),
+			QRhiShaderResourceBinding::sampledTexture(
+				3, QRhiShaderResourceBinding::FragmentStage,
+				_placeholder, _sampler),
+		});
+		_yuv420Srb->create();
+
+		_yuv420Pipeline = rhi->newGraphicsPipeline();
+		_yuv420Pipeline->setShaderStages({
+			{ QRhiShaderStage::Vertex, vs },
+			{ QRhiShaderStage::Fragment, yuv420Fs },
+		});
+		_yuv420Pipeline->setVertexInputLayout(layout);
+		_yuv420Pipeline->setTopology(
+			QRhiGraphicsPipeline::TriangleStrip);
+		_yuv420Pipeline->setShaderResourceBindings(_yuv420Srb);
+		_yuv420Pipeline->setRenderPassDescriptor(rpDesc);
+		_yuv420Pipeline->create();
+
+#ifndef Q_OS_MAC
+		const auto shadowFs = Ui::Rhi::ShaderFromFile(
+			u":/shaders/argb32.frag.qsb"_q);
+
+		_shadowVertexBuffer = rhi->newBuffer(
+			QRhiBuffer::Dynamic,
+			QRhiBuffer::VertexBuffer,
+			4 * 4 * sizeof(float));
+		_shadowVertexBuffer->create();
+		_shadowUniformBuffer = rhi->newBuffer(
+			QRhiBuffer::Dynamic,
+			QRhiBuffer::UniformBuffer,
+			256);
+		_shadowUniformBuffer->create();
+
+		validateShadowImage();
+
+		_shadowSrb = rhi->newShaderResourceBindings();
+		_shadowSrb->setBindings({
+			QRhiShaderResourceBinding::uniformBuffer(
+				0,
+				QRhiShaderResourceBinding::VertexStage,
+				_shadowUniformBuffer),
+			QRhiShaderResourceBinding::sampledTexture(
+				1,
+				QRhiShaderResourceBinding::FragmentStage,
+				_shadowTexture, _sampler),
+		});
+		_shadowSrb->create();
+
+		QRhiGraphicsPipeline::TargetBlend blend;
+		blend.enable = true;
+		blend.srcColor = QRhiGraphicsPipeline::One;
+		blend.dstColor = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+		blend.srcAlpha = QRhiGraphicsPipeline::One;
+		blend.dstAlpha = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+		_shadowBlendPipeline = rhi->newGraphicsPipeline();
+		_shadowBlendPipeline->setShaderStages({
+			{ QRhiShaderStage::Vertex, vs },
+			{ QRhiShaderStage::Fragment, shadowFs },
+		});
+		_shadowBlendPipeline->setVertexInputLayout(layout);
+		_shadowBlendPipeline->setTargetBlends({ blend });
+		_shadowBlendPipeline->setTopology(
+			QRhiGraphicsPipeline::TriangleStrip);
+		_shadowBlendPipeline->setShaderResourceBindings(_shadowSrb);
+		_shadowBlendPipeline->setRenderPassDescriptor(rpDesc);
+		_shadowBlendPipeline->create();
+#endif
+
+		_initialized = true;
+	}
+
+	void render(
+			QRhi *rhi,
+			QRhiRenderTarget *rt,
+			QRhiCommandBuffer *cb) override {
+		_rhi = rhi;
+		const auto markGuard = gsl::finally([&] {
+			_owner->_track->markFrameShown();
+		});
+		const auto data = _owner->_track->frameWithInfo(false);
+		if (data.format == Webrtc::FrameFormat::None) {
+			auto *rub = rhi->nextResourceUpdateBatch();
+			cb->beginPass(rt, Qt::black, { 1.0f, 0 }, rub);
+			cb->endPass();
+			return;
+		}
+
+		auto *rub = rhi->nextResourceUpdateBatch();
+		const auto rgbaFrame =
+			(data.format == Webrtc::FrameFormat::ARGB32);
+		const auto upload = (_trackFrameIndex != data.index);
+		_trackFrameIndex = data.index;
+		const auto rotation = data.rotation;
+
+		auto *pipeline = _argb32Pipeline;
+		auto *srb = _argb32Srb;
+
+		if (rgbaFrame) {
+			Assert(!data.original.isNull());
+			const auto &image = data.original;
+			if (upload || !_rgbaTexture
+				|| _rgbaSize != image.size()) {
+				delete _rgbaTexture;
+				_rgbaTexture = rhi->newTexture(
+					QRhiTexture::BGRA8, image.size());
+				_rgbaTexture->create();
+				_rgbaSize = image.size();
+			}
+			if (upload) {
+				rub->uploadTexture(_rgbaTexture,
+					QRhiTextureUploadDescription(
+						QRhiTextureUploadEntry(0, 0,
+							QRhiTextureSubresourceUploadDescription(
+								image))));
+			}
+			srb->setBindings({
+				QRhiShaderResourceBinding::uniformBuffer(
+					0,
+					QRhiShaderResourceBinding::VertexStage
+						| QRhiShaderResourceBinding::FragmentStage,
+					_uniformBuffer),
+				QRhiShaderResourceBinding::sampledTexture(
+					1, QRhiShaderResourceBinding::FragmentStage,
+					_rgbaTexture, _sampler),
+			});
+		} else {
+			Assert(data.format == Webrtc::FrameFormat::YUV420);
+			Assert(!data.yuv420->size.isEmpty());
+			const auto yuv = data.yuv420;
+			pipeline = _yuv420Pipeline;
+			srb = _yuv420Srb;
+
+			if (upload) {
+				if (!_yTexture || _lumaSize != yuv->size) {
+					delete _yTexture;
+					_yTexture = rhi->newTexture(
+						QRhiTexture::R8, yuv->size);
+					_yTexture->create();
+					_lumaSize = yuv->size;
+				}
+				auto yDesc = QRhiTextureSubresourceUploadDescription(
+					yuv->y.data,
+					yuv->y.stride * yuv->size.height());
+				yDesc.setDataStride(yuv->y.stride);
+				rub->uploadTexture(_yTexture,
+					QRhiTextureUploadDescription(
+						QRhiTextureUploadEntry(0, 0, yDesc)));
+
+				if (!_uTexture || _chromaSize != yuv->chromaSize) {
+					delete _uTexture;
+					_uTexture = rhi->newTexture(
+						QRhiTexture::R8, yuv->chromaSize);
+					_uTexture->create();
+					delete _vTexture;
+					_vTexture = rhi->newTexture(
+						QRhiTexture::R8, yuv->chromaSize);
+					_vTexture->create();
+					_chromaSize = yuv->chromaSize;
+				}
+				auto uDesc = QRhiTextureSubresourceUploadDescription(
+					yuv->u.data,
+					yuv->u.stride * yuv->chromaSize.height());
+				uDesc.setDataStride(yuv->u.stride);
+				rub->uploadTexture(_uTexture,
+					QRhiTextureUploadDescription(
+						QRhiTextureUploadEntry(0, 0, uDesc)));
+				auto vDesc = QRhiTextureSubresourceUploadDescription(
+					yuv->v.data,
+					yuv->v.stride * yuv->chromaSize.height());
+				vDesc.setDataStride(yuv->v.stride);
+				rub->uploadTexture(_vTexture,
+					QRhiTextureUploadDescription(
+						QRhiTextureUploadEntry(0, 0, vDesc)));
+			}
+			srb->setBindings({
+				QRhiShaderResourceBinding::uniformBuffer(
+					0,
+					QRhiShaderResourceBinding::VertexStage
+						| QRhiShaderResourceBinding::FragmentStage,
+					_uniformBuffer),
+				QRhiShaderResourceBinding::sampledTexture(
+					1, QRhiShaderResourceBinding::FragmentStage,
+					_yTexture, _sampler),
+				QRhiShaderResourceBinding::sampledTexture(
+					2, QRhiShaderResourceBinding::FragmentStage,
+					_uTexture, _sampler),
+				QRhiShaderResourceBinding::sampledTexture(
+					3, QRhiShaderResourceBinding::FragmentStage,
+					_vTexture, _sampler),
+			});
+		}
+		srb->create();
+
+		const auto pw = float(rt->pixelSize().width());
+		const auto ph = float(rt->pixelSize().height());
+		const auto factor = style::DevicePixelRatio();
+
+		const auto widget = _owner->widget();
+		const auto bottomShadowArea = QRect(
+			0,
+			widget->parentWidget()->height()
+				- st::callBottomShadowSize,
+			widget->parentWidget()->width(),
+			st::callBottomShadowSize);
+		const auto bottomShadowFill = bottomShadowArea.intersected(
+			widget->geometry()).translated(-widget->pos());
+		const auto shadowHeight = bottomShadowFill.height();
+		const auto shadowAlpha = float(
+			shadowHeight * kBottomShadowAlphaMax)
+			/ float(st::callBottomShadowSize * 255);
+		const auto viewport = QSize(
+			int(pw / factor), int(ph / factor));
+		const auto shadowBottom = Ui::GL::TransformRect(
+			Ui::GL::Rect(bottomShadowFill),
+			viewport,
+			factor);
+
+		IncomingShadowUniforms uniforms{};
+		uniforms.viewport[0] = pw;
+		uniforms.viewport[1] = ph;
+		uniforms.shadow[0] = shadowHeight * factor;
+		uniforms.shadow[1] = shadowBottom.bottom();
+		uniforms.shadow[2] = shadowAlpha;
+		rub->updateDynamicBuffer(
+			_uniformBuffer, 0, sizeof(uniforms), &uniforms);
+
+		std::array<std::array<float, 2>, 4> texCoords = { {
+			{ { 0.f, 1.f } }, { { 1.f, 1.f } },
+			{ { 1.f, 0.f } }, { { 0.f, 0.f } },
+		} };
+		if (const auto shift = (rotation / 90); shift != 0) {
+			std::rotate(
+				texCoords.begin(),
+				texCoords.begin() + shift,
+				texCoords.end());
+		}
+		const float coords[] = {
+			0.f, ph, texCoords[3][0], texCoords[3][1],
+			pw,  ph, texCoords[2][0], texCoords[2][1],
+			0.f, 0.f, texCoords[0][0], texCoords[0][1],
+			pw,  0.f, texCoords[1][0], texCoords[1][1],
+		};
+		rub->updateDynamicBuffer(
+			_vertexBuffer, 0, sizeof(coords), coords);
+
+#ifndef Q_OS_MAC
+		prepareTitleShadow(rub, pw, ph);
+#endif
+
+		cb->beginPass(rt, Qt::black, { 1.0f, 0 }, rub);
+		cb->setGraphicsPipeline(pipeline);
+		cb->setShaderResources(srb);
+		cb->setViewport({ 0, 0, pw, ph });
+		const QRhiCommandBuffer::VertexInput vbuf(_vertexBuffer, 0);
+		cb->setVertexInput(0, 1, &vbuf);
+		cb->draw(4);
+
+#ifndef Q_OS_MAC
+		paintTitleShadow(cb, pw, ph);
+#endif
+
+		cb->endPass();
+	}
+
+	// Only records resource updates, must be called outside a render
+	// pass, the batch is then passed to beginPass.
+	void prepareTitleShadow(
+			QRhiResourceUpdateBatch *rub,
+			float pw,
+			float ph) {
+		if (!_shadowBlendPipeline) {
+			return;
+		}
+		ensureShadowUploaded(rub);
+		const auto factor = style::DevicePixelRatio();
+		const auto widget = _owner->widget();
+		const auto left = (_owner->_topControlsAlignment
+			== style::al_left);
+		const auto width = widget->parentWidget()->width();
+		const auto position = left
+			? QPoint()
+			: QPoint(
+				width - st::callTitleShadowRight.width(),
+				0);
+		const auto translated = position - widget->pos();
+		const auto shadowArea = QRect(
+			translated,
+			st::callTitleShadowLeft.size());
+		const auto viewport = QSize(
+			int(pw / factor), int(ph / factor));
+		const auto shadowRect = Ui::GL::TransformRect(
+			Ui::GL::Rect(shadowArea),
+			viewport,
+			factor);
+
+		const auto &texRect = left
+			? _shadowLeftRect : _shadowRightRect;
+		const auto atlasW = float(_shadowSize.width());
+		const auto atlasH = float(_shadowSize.height());
+		const auto tl = texRect.left() / atlasW;
+		const auto tr = texRect.right() / atlasW;
+		const auto tt = texRect.top() / atlasH;
+		const auto tb = texRect.bottom() / atlasH;
+
+		const float shadowCoords[] = {
+			shadowRect.left(), shadowRect.bottom(), tl, tt,
+			shadowRect.right(), shadowRect.bottom(), tr, tt,
+			shadowRect.left(), shadowRect.top(), tl, tb,
+			shadowRect.right(), shadowRect.top(), tr, tb,
+		};
+		rub->updateDynamicBuffer(
+			_shadowVertexBuffer, 0, sizeof(shadowCoords), shadowCoords);
+		const float viewport2[] = { pw, ph, 0.f, 0.f };
+		rub->updateDynamicBuffer(
+			_shadowUniformBuffer, 0, sizeof(viewport2), viewport2);
+	}
+
+	void paintTitleShadow(QRhiCommandBuffer *cb, float pw, float ph) {
+		if (!_shadowBlendPipeline) {
+			return;
+		}
+		cb->setGraphicsPipeline(_shadowBlendPipeline);
+		cb->setShaderResources(_shadowSrb);
+		cb->setViewport({ 0, 0, pw, ph });
+		const QRhiCommandBuffer::VertexInput vbuf2(_shadowVertexBuffer, 0);
+		cb->setVertexInput(0, 1, &vbuf2);
+		cb->draw(4);
+	}
+
+	void validateShadowImage() {
+		if (_shadowTexture) {
+			return;
+		}
+		const auto ifactor = int(std::ceil(
+			style::DevicePixelRatio()));
+		const auto size = st::callTitleShadowLeft.size();
+		const auto full = QSize(
+			size.width(), 2 * size.height()) * ifactor;
+		auto image = QImage(
+			full, QImage::Format_ARGB32_Premultiplied);
+		image.setDevicePixelRatio(ifactor);
+		image.fill(Qt::transparent);
+		{
+			auto p = QPainter(&image);
+			st::callTitleShadowLeft.paint(
+				p, 0, 0, size.width());
+			_shadowLeftRect = QRect(
+				0, 0, full.width(), full.height() / 2);
+			st::callTitleShadowRight.paint(
+				p, 0, size.height(), size.width());
+			_shadowRightRect = QRect(
+				0, full.height() / 2,
+				full.width(), full.height() / 2);
+		}
+		_shadowTexture = _rhi->newTexture(
+			QRhiTexture::BGRA8, full);
+		_shadowTexture->create();
+		_shadowSize = full;
+		_shadowUploadImage = std::move(image);
+	}
+
+	QImage _shadowUploadImage;
+
+	void ensureShadowUploaded(QRhiResourceUpdateBatch *rub) {
+		if (_shadowUploadImage.isNull()) {
+			return;
+		}
+		rub->uploadTexture(
+			_shadowTexture,
+			QRhiTextureUploadDescription(
+				QRhiTextureUploadEntry(0, 0,
+					QRhiTextureSubresourceUploadDescription(
+						_shadowUploadImage))));
+		_shadowUploadImage = QImage();
+	}
+
+	void releaseResources() override {
+		delete _argb32Pipeline; _argb32Pipeline = nullptr;
+		delete _yuv420Pipeline; _yuv420Pipeline = nullptr;
+		delete _shadowBlendPipeline; _shadowBlendPipeline = nullptr;
+		delete _argb32Srb; _argb32Srb = nullptr;
+		delete _yuv420Srb; _yuv420Srb = nullptr;
+		delete _shadowSrb; _shadowSrb = nullptr;
+		delete _shadowTexture; _shadowTexture = nullptr;
+		delete _shadowVertexBuffer; _shadowVertexBuffer = nullptr;
+		delete _shadowUniformBuffer; _shadowUniformBuffer = nullptr;
+		delete _rgbaTexture; _rgbaTexture = nullptr;
+		delete _yTexture; _yTexture = nullptr;
+		delete _uTexture; _uTexture = nullptr;
+		delete _vTexture; _vTexture = nullptr;
+		delete _placeholder; _placeholder = nullptr;
+		delete _vertexBuffer; _vertexBuffer = nullptr;
+		delete _uniformBuffer; _uniformBuffer = nullptr;
+		delete _sampler; _sampler = nullptr;
+		_initialized = false;
+	}
+
+	QColor rhiClearColor() override { return Qt::black; }
+
+private:
+	const not_null<Incoming*> _owner;
+	QRhi *_rhi = nullptr;
+	QRhiBuffer *_vertexBuffer = nullptr;
+	QRhiBuffer *_uniformBuffer = nullptr;
+	QRhiSampler *_sampler = nullptr;
+	QRhiTexture *_placeholder = nullptr;
+	QRhiTexture *_rgbaTexture = nullptr;
+	QSize _rgbaSize;
+	QRhiTexture *_yTexture = nullptr;
+	QRhiTexture *_uTexture = nullptr;
+	QRhiTexture *_vTexture = nullptr;
+	QSize _lumaSize;
+	QSize _chromaSize;
+	int _trackFrameIndex = 0;
+	QRhiGraphicsPipeline *_argb32Pipeline = nullptr;
+	QRhiGraphicsPipeline *_yuv420Pipeline = nullptr;
+	QRhiGraphicsPipeline *_shadowBlendPipeline = nullptr;
+	QRhiShaderResourceBindings *_argb32Srb = nullptr;
+	QRhiShaderResourceBindings *_yuv420Srb = nullptr;
+	QRhiShaderResourceBindings *_shadowSrb = nullptr;
+	QRhiTexture *_shadowTexture = nullptr;
+	QRhiBuffer *_shadowVertexBuffer = nullptr;
+	QRhiBuffer *_shadowUniformBuffer = nullptr;
+	QSize _shadowSize;
+	QRect _shadowLeftRect;
+	QRect _shadowRightRect;
+	bool _initialized = false;
+};
+#endif // Qt >= 6.7
+
 Panel::Incoming::Incoming(
 	not_null<QWidget*> parent,
 	not_null<Webrtc::VideoTrack*> track,
@@ -567,6 +1093,15 @@ void Panel::Incoming::setControlsAlignment(style::align align) {
 
 Ui::GL::ChosenRenderer Panel::Incoming::chooseRenderer(
 		Ui::GL::Backend backend) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (backend == Ui::GL::Backend::QRhi) {
+		_opengl = true;
+		return {
+			.renderer = std::make_unique<RendererRhi>(this),
+			.backend = Ui::GL::Backend::QRhi,
+		};
+	}
+#endif // Qt >= 6.7
 	_opengl = (backend == Ui::GL::Backend::OpenGL);
 	return {
 		.renderer = (_opengl
diff --git a/Telegram/SourceFiles/calls/calls_video_incoming.h b/Telegram/SourceFiles/calls/calls_video_incoming.h
index 65da54620eea45..9b8b14a70ef341 100644
--- a/Telegram/SourceFiles/calls/calls_video_incoming.h
+++ b/Telegram/SourceFiles/calls/calls_video_incoming.h
@@ -31,6 +31,7 @@ class Panel::Incoming final {
 private:
 	class RendererGL;
 	class RendererSW;
+	class RendererRhi;
 
 	[[nodiscard]] Ui::GL::ChosenRenderer chooseRenderer(
 		Ui::GL::Backend backend);
diff --git a/Telegram/SourceFiles/calls/calls_window.cpp b/Telegram/SourceFiles/calls/calls_window.cpp
new file mode 100644
index 00000000000000..16b754d660cc1f
--- /dev/null
+++ b/Telegram/SourceFiles/calls/calls_window.cpp
@@ -0,0 +1,250 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "calls/calls_window.h"
+
+#include "base/power_save_blocker.h"
+#include "ui/platform/ui_platform_window_title.h"
+#include "ui/widgets/rp_window.h"
+#include "ui/layers/layer_manager.h"
+#include "ui/layers/show.h"
+#include "styles/style_calls.h"
+
+namespace Calls {
+namespace {
+
+class Show final : public Ui::Show {
+public:
+	explicit Show(not_null<Window*> window);
+	~Show();
+
+	void showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<Ui::BoxContent>,
+			std::unique_ptr<Ui::LayerWidget>> &&layer,
+		Ui::LayerOptions options,
+		anim::type animated) const override;
+	[[nodiscard]] not_null<QWidget*> toastParent() const override;
+	[[nodiscard]] bool valid() const override;
+	operator bool() const override;
+
+private:
+	const base::weak_ptr<Window> _window;
+
+};
+
+Show::Show(not_null<Window*> window)
+: _window(base::make_weak(window)) {
+}
+
+Show::~Show() = default;
+
+void Show::showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<Ui::BoxContent>,
+			std::unique_ptr<Ui::LayerWidget>> &&layer,
+		Ui::LayerOptions options,
+		anim::type animated) const {
+	using UniqueLayer = std::unique_ptr<Ui::LayerWidget>;
+	using ObjectBox = object_ptr<Ui::BoxContent>;
+	if (auto layerWidget = std::get_if<UniqueLayer>(&layer)) {
+		if (const auto window = _window.get()) {
+			window->showLayer(std::move(*layerWidget), options, animated);
+		}
+	} else if (auto box = std::get_if<ObjectBox>(&layer)) {
+		if (const auto window = _window.get()) {
+			window->showBox(std::move(*box), options, animated);
+		}
+	} else if (const auto window = _window.get()) {
+		window->hideLayer(animated);
+	}
+}
+
+not_null<QWidget*> Show::toastParent() const {
+	const auto window = _window.get();
+	Assert(window != nullptr);
+	return window->widget();
+}
+
+bool Show::valid() const {
+	return !_window.empty();
+}
+
+Show::operator bool() const {
+	return valid();
+}
+
+} // namespace
+
+Window::Window()
+: _layerBg(std::make_unique<Ui::LayerManager>(widget()))
+#ifndef Q_OS_MAC
+, _controls(Ui::Platform::SetupSeparateTitleControls(
+	window(),
+	st::callTitle,
+	[=](bool maximized) { _maximizeRequests.fire_copy(maximized); },
+	_controlsTop.value()))
+#endif // !Q_OS_MAC
+{
+	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
+	_layerBg->setHideByBackgroundClick(true);
+}
+
+Window::~Window() = default;
+
+Ui::GL::Backend Window::backend() const {
+	return _window.backend();
+}
+
+not_null<Ui::RpWindow*> Window::window() const {
+	return _window.window();
+}
+
+not_null<Ui::RpWidget*> Window::widget() const {
+	return _window.widget();
+}
+
+void Window::raiseControls() {
+#ifndef Q_OS_MAC
+	_controls->wrap.raise();
+#endif // !Q_OS_MAC
+}
+
+void Window::setControlsStyle(const style::WindowTitle &st) {
+#ifndef Q_OS_MAC
+	_controls->controls.setStyle(st);
+#endif // Q_OS_MAC
+}
+
+void Window::setControlsShown(float64 shown) {
+#ifndef Q_OS_MAC
+	_controlsTop = anim::interpolate(-_controls->wrap.height(), 0, shown);
+#endif // Q_OS_MAC
+}
+
+int Window::controlsWrapTop() const {
+#ifndef Q_OS_MAC
+	return _controls->wrap.y();
+#else // Q_OS_MAC
+	return 0;
+#endif // Q_OS_MAC
+}
+
+QRect Window::controlsGeometry() const {
+#ifndef Q_OS_MAC
+	return _controls->controls.geometry();
+#else // Q_OS_MAC
+	return QRect();
+#endif // Q_OS_MAC
+}
+
+auto Window::controlsLayoutChanges() const
+-> rpl::producer<Ui::Platform::TitleLayout> {
+#ifndef Q_OS_MAC
+	return _controls->controls.layout().changes();
+#else // Q_OS_MAC
+	return rpl::never<Ui::Platform::TitleLayout>();
+#endif // Q_OS_MAC
+}
+
+bool Window::controlsHasHitTest(QPoint widgetPoint) const {
+#ifndef Q_OS_MAC
+	using Result = Ui::Platform::HitTestResult;
+	const auto windowPoint = widget()->mapTo(window(), widgetPoint);
+	return (_controls->controls.hitTest(windowPoint) != Result::None);
+#else // Q_OS_MAC
+	return false;
+#endif // Q_OS_MAC
+}
+
+rpl::producer<bool> Window::maximizeRequests() const {
+	return _maximizeRequests.events();
+}
+
+base::weak_ptr<Ui::Toast::Instance> Window::showToast(
+		const QString &text,
+		crl::time duration) {
+	return Show(this).showToast(text, duration);
+}
+
+base::weak_ptr<Ui::Toast::Instance> Window::showToast(
+		TextWithEntities &&text,
+		crl::time duration) {
+	return Show(this).showToast(std::move(text), duration);
+}
+
+base::weak_ptr<Ui::Toast::Instance> Window::showToast(
+		Ui::Toast::Config &&config) {
+	return Show(this).showToast(std::move(config));
+}
+
+void Window::raiseLayers() {
+	_layerBg->raise();
+}
+
+const Ui::LayerWidget *Window::topShownLayer() const {
+	return _layerBg->topShownLayer();
+}
+
+void Window::showBox(object_ptr<Ui::BoxContent> box) {
+	showBox(std::move(box), Ui::LayerOption::KeepOther, anim::type::normal);
+}
+
+void Window::showBox(
+		object_ptr<Ui::BoxContent> box,
+		Ui::LayerOptions options,
+		anim::type animated) {
+	_showingLayer.fire({});
+	if (window()->width() < st::groupCallWidth
+		|| window()->height() < st::groupCallWidth) {
+		window()->resize(
+			std::max(window()->width(), st::groupCallWidth),
+			std::max(window()->height(), st::groupCallWidth));
+	}
+	_layerBg->showBox(std::move(box), options, animated);
+}
+
+void Window::showLayer(
+		std::unique_ptr<Ui::LayerWidget> layer,
+		Ui::LayerOptions options,
+		anim::type animated) {
+	_showingLayer.fire({});
+	if (window()->width() < st::groupCallWidth
+		|| window()->height() < st::groupCallWidth) {
+		window()->resize(
+			std::max(window()->width(), st::groupCallWidth),
+			std::max(window()->height(), st::groupCallWidth));
+	}
+	_layerBg->showLayer(std::move(layer), options, animated);
+}
+
+void Window::hideLayer(anim::type animated) {
+	_layerBg->hideAll(animated);
+}
+
+bool Window::isLayerShown() const {
+	return _layerBg->topShownLayer() != nullptr;
+}
+
+std::shared_ptr<Ui::Show> Window::uiShow() {
+	return std::make_shared<Show>(this);
+}
+
+void Window::togglePowerSaveBlocker(bool enabled) {
+	if (!enabled) {
+		_powerSaveBlocker = nullptr;
+	} else if (!_powerSaveBlocker) {
+		_powerSaveBlocker = std::make_unique<base::PowerSaveBlocker>(
+			base::PowerSaveBlockType::PreventDisplaySleep,
+			u"Video call is active"_q,
+			window()->windowHandle());
+	}
+}
+
+} // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_window.h b/Telegram/SourceFiles/calls/calls_window.h
new file mode 100644
index 00000000000000..5963b4fc4da894
--- /dev/null
+++ b/Telegram/SourceFiles/calls/calls_window.h
@@ -0,0 +1,112 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+#include "ui/effects/animations.h"
+#include "ui/gl/gl_window.h"
+
+namespace base {
+class PowerSaveBlocker;
+} // namespace base
+
+namespace style {
+struct WindowTitle;
+} // namespace style
+
+namespace Ui {
+class BoxContent;
+class RpWindow;
+class RpWidget;
+class LayerManager;
+class LayerWidget;
+enum class LayerOption;
+using LayerOptions = base::flags<LayerOption>;
+class Show;
+} // namespace Ui
+
+namespace Ui::Platform {
+struct SeparateTitleControls;
+struct TitleLayout;
+} // namespace Ui::Platform
+
+namespace Ui::Toast {
+struct Config;
+class Instance;
+} // namespace Ui::Toast
+
+namespace Calls {
+
+class Window final : public base::has_weak_ptr {
+public:
+	Window();
+	~Window();
+
+	[[nodiscard]] Ui::GL::Backend backend() const;
+	[[nodiscard]] not_null<Ui::RpWindow*> window() const;
+	[[nodiscard]] not_null<Ui::RpWidget*> widget() const;
+
+	void raiseControls();
+	void setControlsStyle(const style::WindowTitle &st);
+	void setControlsShown(float64 shown);
+	[[nodiscard]] int controlsWrapTop() const;
+	[[nodiscard]] QRect controlsGeometry() const;
+	[[nodiscard]] auto controlsLayoutChanges() const
+		-> rpl::producer<Ui::Platform::TitleLayout>;
+	[[nodiscard]] bool controlsHasHitTest(QPoint widgetPoint) const;
+	[[nodiscard]] rpl::producer<bool> maximizeRequests() const;
+
+	void raiseLayers();
+	[[nodiscard]] const Ui::LayerWidget *topShownLayer() const;
+
+	base::weak_ptr<Ui::Toast::Instance> showToast(
+		const QString &text,
+		crl::time duration = 0);
+	base::weak_ptr<Ui::Toast::Instance> showToast(
+		TextWithEntities &&text,
+		crl::time duration = 0);
+	base::weak_ptr<Ui::Toast::Instance> showToast(
+		Ui::Toast::Config &&config);
+
+	void showBox(object_ptr<Ui::BoxContent> box);
+	void showBox(
+		object_ptr<Ui::BoxContent> box,
+		Ui::LayerOptions options,
+		anim::type animated = anim::type::normal);
+	void showLayer(
+		std::unique_ptr<Ui::LayerWidget> layer,
+		Ui::LayerOptions options,
+		anim::type animated = anim::type::normal);
+	void hideLayer(anim::type animated = anim::type::normal);
+	[[nodiscard]] bool isLayerShown() const;
+
+	[[nodiscard]] rpl::producer<> showingLayer() const {
+		return _showingLayer.events();
+	}
+
+	[[nodiscard]] std::shared_ptr<Ui::Show> uiShow();
+
+	void togglePowerSaveBlocker(bool enabled);
+
+private:
+	Ui::GL::Window _window;
+	const std::unique_ptr<Ui::LayerManager> _layerBg;
+
+#ifndef Q_OS_MAC
+	rpl::variable<int> _controlsTop = 0;
+	const std::unique_ptr<Ui::Platform::SeparateTitleControls> _controls;
+#endif // !Q_OS_MAC
+
+	std::unique_ptr<base::PowerSaveBlocker> _powerSaveBlocker;
+
+	rpl::event_stream<bool> _maximizeRequests;
+	rpl::event_stream<> _showingLayer;
+
+};
+
+} // namespace Calls
diff --git a/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp b/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
index a3f57de1014e73..c9b2ecb6245e1a 100644
--- a/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
@@ -28,6 +28,7 @@ For license and copyright information please follow this link:
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
 #include "styles/style_calls.h"
+#include "styles/style_chat_helpers.h"
 
 namespace Calls::Group {
 namespace {
@@ -224,7 +225,7 @@ void ChooseJoinAsBox(
 			&st::groupCallMultiSelect);
 	} else {
 		controller->setStyleOverrides(
-			&st::peerListJoinAsList,
+			&st::defaultChooseSendAs.list,
 			nullptr);
 	}
 	const auto content = box->addRow(
@@ -236,7 +237,7 @@ void ChooseJoinAsBox(
 	if ((context == Context::Create)
 		&& (peer->isChannel() && peer->asChannel()->hasAdminRights())) {
 		const auto makeLink = [](const QString &text) {
-			return Ui::Text::Link(text);
+			return tr::link(text);
 		};
 		const auto label = box->addRow(object_ptr<Ui::FlatLabel>(
 			box,
@@ -245,7 +246,7 @@ void ChooseJoinAsBox(
 				(livestream
 					? tr::lng_group_call_schedule_channel
 					: tr::lng_group_call_schedule)(makeLink),
-				Ui::Text::WithEntities),
+				tr::marked),
 			labelSt));
 		label->overrideLinkClickHandler([=] {
 			auto withJoinAs = info;
@@ -293,8 +294,8 @@ void ChooseJoinAsBox(
 		: tr::lng_group_call_join_confirm)(
 		tr::now,
 		lt_chat,
-		Ui::Text::Bold(name),
-		Ui::Text::WithEntities);
+		tr::bold(name),
+		tr::marked);
 }
 
 } // namespace
@@ -351,7 +352,7 @@ void ChooseJoinAsProcess::start(
 
 	createRequest();
 	session->account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_request = nullptr;
 	}, _request->lifetime);
 
@@ -361,7 +362,7 @@ void ChooseJoinAsProcess::start(
 void ChooseJoinAsProcess::requestList() {
 	const auto session = &_request->peer->session();
 	_request->id = session->api().request(MTPphone_GetGroupCallJoinAs(
-		_request->peer->input
+		_request->peer->input()
 	)).done([=](const MTPphone_JoinAsPeers &result) {
 		auto list = result.match([&](const MTPDphone_joinAsPeers &data) {
 			session->data().processUsers(data.vusers());
@@ -393,7 +394,7 @@ void ChooseJoinAsProcess::finish(JoinInfo info) {
 	const auto box = _request->box;
 	_request = nullptr;
 	done(std::move(info));
-	if (const auto strong = box.data()) {
+	if (const auto strong = box.get()) {
 		strong->closeBox();
 	}
 }
@@ -450,10 +451,10 @@ void ChooseJoinAsProcess::processList(
 				.append(tr::lng_group_call_or_schedule(
 				tr::now,
 				lt_link,
-				Ui::Text::Link((livestream
+				tr::link((livestream
 					? tr::lng_group_call_schedule_channel
 					: tr::lng_group_call_schedule)(tr::now)),
-				Ui::Text::WithEntities));
+				tr::marked));
 		}
 		const auto guard = base::make_weak(&_request->guard);
 		const auto safeFinish = crl::guard(guard, [=] { finish(info); });
@@ -475,7 +476,7 @@ void ChooseJoinAsProcess::processList(
 			.labelFilter = filter,
 		});
 		box->boxClosing(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_request = nullptr;
 		}, _request->lifetime);
 
@@ -489,7 +490,7 @@ void ChooseJoinAsProcess::processList(
 		std::move(info),
 		crl::guard(&_request->guard, [=](auto info) { finish(info); }));
 	box->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_request = nullptr;
 	}, _request->lifetime);
 
diff --git a/Telegram/SourceFiles/calls/group/calls_choose_join_as.h b/Telegram/SourceFiles/calls/group/calls_choose_join_as.h
index eb899b5568c186..673546ffa1d0fe 100644
--- a/Telegram/SourceFiles/calls/group/calls_choose_join_as.h
+++ b/Telegram/SourceFiles/calls/group/calls_choose_join_as.h
@@ -51,7 +51,7 @@ class ChooseJoinAsProcess final {
 		std::shared_ptr<Ui::Show> show;
 		Fn<void(JoinInfo)> done;
 		base::has_weak_ptr guard;
-		QPointer<Ui::BoxContent> box;
+		base::weak_qptr<Ui::BoxContent> box;
 		rpl::lifetime lifetime;
 		Context context = Context();
 		mtpRequestId id = 0;
diff --git a/Telegram/SourceFiles/calls/group/calls_cover_item.cpp b/Telegram/SourceFiles/calls/group/calls_cover_item.cpp
index dc77bbe289133d..8f8a44a292ca0b 100644
--- a/Telegram/SourceFiles/calls/group/calls_cover_item.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_cover_item.cpp
@@ -14,7 +14,7 @@ For license and copyright information please follow this link:
 namespace Calls {
 
 CoverItem::CoverItem(
-	not_null<RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &stMenu,
 	const style::ShortInfoCover &st,
 	rpl::producer<QString> name,
@@ -32,13 +32,13 @@ CoverItem::CoverItem(
 , _st(st) {
 	setPointerCursor(false);
 
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 	enableMouseSelecting();
 	enableMouseSelecting(_cover.widget());
 
 	_cover.widget()->move(0, 0);
 	_cover.moveRequests(
-	) | rpl::start_with_next(userpic.move, lifetime());
+	) | rpl::on_next(userpic.move, lifetime());
 }
 
 not_null<QAction*> CoverItem::action() const {
@@ -54,7 +54,7 @@ int CoverItem::contentHeight() const {
 }
 
 AboutItem::AboutItem(
-	not_null<RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &st,
 	TextWithEntities &&about)
 : Ui::Menu::ItemBase(parent, st)
@@ -66,13 +66,28 @@ AboutItem::AboutItem(
 , _dummyAction(new QAction(parent)) {
 	setPointerCursor(false);
 
-	initResizeHook(parent->sizeValue());
+	_text->setSelectable(true);
+
+	const auto added = st.itemPadding.left() + st.itemPadding.right();
+
+	sizeValue(
+	) | rpl::on_next([=](const QSize &s) {
+		if (s.width() <= added) {
+			return;
+		}
+		_text->resizeToWidth(s.width() - added);
+		_text->moveToLeft(st.itemPadding.left(), st.itemPadding.top());
+	}, lifetime());
+
+	_text->heightValue(
+	) | rpl::on_next([=] {
+		resize(width(), contentHeight());
+	}, lifetime());
+
+	_text->resizeToWidth(parent->width() - added);
+	fitToMenuWidth();
 	enableMouseSelecting();
 	enableMouseSelecting(_text.get());
-
-	_text->setSelectable(true);
-	_text->resizeToWidth(st::groupCallMenuAbout.minWidth);
-	_text->moveToLeft(st.itemPadding.left(), st.itemPadding.top());
 }
 
 not_null<QAction*> AboutItem::action() const {
diff --git a/Telegram/SourceFiles/calls/group/calls_cover_item.h b/Telegram/SourceFiles/calls/group/calls_cover_item.h
index 1d737db6912a99..5636897dbe2d5f 100644
--- a/Telegram/SourceFiles/calls/group/calls_cover_item.h
+++ b/Telegram/SourceFiles/calls/group/calls_cover_item.h
@@ -28,7 +28,7 @@ struct ParticipantState;
 class CoverItem final : public Ui::Menu::ItemBase {
 public:
 	CoverItem(
-		not_null<RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &stMenu,
 		const style::ShortInfoCover &st,
 		rpl::producer<QString> name,
@@ -50,7 +50,7 @@ class CoverItem final : public Ui::Menu::ItemBase {
 class AboutItem final : public Ui::Menu::ItemBase {
 public:
 	AboutItem(
-		not_null<RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &st,
 		TextWithEntities &&about);
 
diff --git a/Telegram/SourceFiles/calls/group/calls_group_call.cpp b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
index 9cc83200f780c7..70be0e306a9fff 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
@@ -8,6 +8,10 @@ For license and copyright information please follow this link:
 #include "calls/group/calls_group_call.h"
 
 #include "calls/group/calls_group_common.h"
+#include "calls/group/calls_group_messages.h"
+#include "calls/calls_instance.h"
+#include "main/session/session_show.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "api/api_send_progress.h"
 #include "api/api_updates.h"
@@ -15,6 +19,7 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "lang/lang_hardcoded.h"
 #include "boxes/peers/edit_participants_box.h" // SubscribeToMigration.
+#include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/ui_utility.h"
 #include "base/unixtime.h"
@@ -29,6 +34,8 @@ For license and copyright information please follow this link:
 #include "data/data_session.h"
 #include "base/global_shortcuts.h"
 #include "base/random.h"
+#include "tde2e/tde2e_api.h"
+#include "tde2e/tde2e_integration.h"
 #include "webrtc/webrtc_video_track.h"
 #include "webrtc/webrtc_create_adm.h"
 #include "webrtc/webrtc_environment.h"
@@ -52,15 +59,13 @@ constexpr auto kFixManualLargeVideoDuration = 5 * crl::time(1000);
 constexpr auto kFixSpeakingLargeVideoDuration = 3 * crl::time(1000);
 constexpr auto kFullAsMediumsCount = 4; // 1 Full is like 4 Mediums.
 constexpr auto kMaxMediumQualities = 16; // 4 Fulls or 16 Mediums.
+constexpr auto kShortPollChainBlocksPerRequest = 50;
 
 [[nodiscard]] const Data::GroupCallParticipant *LookupParticipant(
-		not_null<PeerData*> peer,
-		CallId id,
+		not_null<GroupCall*> call,
 		not_null<PeerData*> participantPeer) {
-	const auto call = peer->groupCall();
-	return (id && call && call->id() == id)
-		? call->participantByPeer(participantPeer)
-		: nullptr;
+	const auto real = call->lookupReal();
+	return real ? real->participantByPeer(participantPeer) : nullptr;
 }
 
 [[nodiscard]] double TimestampFromMsgId(mtpMsgId msgId) {
@@ -569,18 +574,40 @@ GroupCall::GroupCall(
 	not_null<Delegate*> delegate,
 	Group::JoinInfo info,
 	const MTPInputGroupCall &inputCall)
+: GroupCall(delegate, info, {}, inputCall) {
+}
+
+GroupCall::GroupCall(
+	not_null<Delegate*> delegate,
+	StartConferenceInfo info)
+: GroupCall(delegate, Group::JoinInfo{
+	.peer = info.call ? info.call->peer() : info.show->session().user(),
+	.joinAs = info.show ? info.show->session().user() : info.call->peer(),
+}, info, info.call
+	? info.call->input()
+	: MTP_inputGroupCall(MTP_long(0), MTP_long(0))) {
+}
+
+GroupCall::GroupCall(
+	not_null<Delegate*> delegate,
+	Group::JoinInfo join,
+	StartConferenceInfo startInfo,
+	const MTPInputGroupCall &inputCall)
 : _delegate(delegate)
-, _peer(info.peer)
+, _sharedCall(std::move(startInfo.call))
+, _peer(join.peer)
 , _history(_peer->owner().history(_peer))
 , _api(&_peer->session().mtp())
-, _joinAs(info.joinAs)
-, _possibleJoinAs(std::move(info.possibleJoinAs))
-, _joinHash(info.joinHash)
-, _rtmpUrl(info.rtmpInfo.url)
-, _rtmpKey(info.rtmpInfo.key)
+, _messages(std::make_unique<Group::Messages>(this, &_api))
+, _joinAs(join.joinAs)
+, _possibleJoinAs(std::move(join.possibleJoinAs))
+, _joinHash(join.joinHash)
+, _conferenceLinkSlug(startInfo.linkSlug)
+, _conferenceJoinMessageId(startInfo.joinMessageId)
+, _rtmpUrl(join.rtmpInfo.url)
+, _rtmpKey(join.rtmpInfo.key)
 , _canManage(Data::CanManageGroupCallValue(_peer))
-, _id(inputCall.c_inputGroupCall().vid().v)
-, _scheduleDate(info.scheduleDate)
+, _scheduleDate(join.scheduleDate)
 , _lastSpokeCheckTimer([=] { checkLastSpoke(); })
 , _checkJoinedTimer([=] { checkJoined(); })
 , _playbackDeviceId(
@@ -601,12 +628,14 @@ GroupCall::GroupCall(
 	Webrtc::DeviceIdOrDefault(Core::App().settings().cameraDeviceIdValue()))
 , _pushToTalkCancelTimer([=] { pushToTalkCancel(); })
 , _connectingSoundTimer([=] { playConnectingSoundOnce(); })
-, _listenersHidden(info.rtmp)
-, _rtmp(info.rtmp)
-, _rtmpVolume(Group::kDefaultVolume) {
+, _listenersHidden(join.rtmp)
+, _rtmp(join.rtmp)
+, _singleSourceVolume(Group::kDefaultVolume) {
+	applyInputCall(inputCall);
+
 	_muted.value(
 	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](MuteState previous, MuteState state) {
+	) | rpl::on_next([=](MuteState previous, MuteState state) {
 		if (_instance) {
 			updateInstanceMuteState();
 		}
@@ -620,7 +649,7 @@ GroupCall::GroupCall(
 	_instanceState.value(
 	) | rpl::filter([=] {
 		return _hadJoinedState;
-	}) | rpl::start_with_next([=](InstanceState state) {
+	}) | rpl::on_next([=](InstanceState state) {
 		if (state == InstanceState::Disconnected) {
 			playConnectingSound();
 		} else {
@@ -635,7 +664,7 @@ GroupCall::GroupCall(
 		if (!canManage() && real->joinMuted()) {
 			_muted = MuteState::ForceMuted;
 		}
-	} else {
+	} else if (!startInfo.migrating && !startInfo.show) {
 		_peer->session().changes().peerFlagsValue(
 			_peer,
 			Data::PeerUpdate::Flag::GroupCall
@@ -647,7 +676,7 @@ GroupCall::GroupCall(
 			return not_null{ real };
 		}) | rpl::take(
 			1
-		) | rpl::start_with_next([=](not_null<Data::GroupCall*> real) {
+		) | rpl::on_next([=](not_null<Data::GroupCall*> real) {
 			subscribeToReal(real);
 			_realChanges.fire_copy(real);
 		}, _lifetime);
@@ -655,23 +684,173 @@ GroupCall::GroupCall(
 
 	setupMediaDevices();
 	setupOutgoingVideo();
+	if (_sharedCall && conference()) {
+		setupConferenceCall();
+		initConferenceE2E();
+	} else if (!_sharedCall && (startInfo.migrating || startInfo.show)) {
+		initConferenceE2E();
+	}
+	if (startInfo.migrating || (startInfo.show && !_sharedCall)) {
+		if (!startInfo.muted) {
+			setMuted(MuteState::Active);
+		}
+		_startConferenceInfo = std::make_shared<StartConferenceInfo>(
+			std::move(startInfo));
+	}
 
-	if (_id) {
-		join(inputCall);
+	if (_id || (!_sharedCall && _startConferenceInfo)) {
+		initialJoin();
 	} else {
-		start(info.scheduleDate, info.rtmp);
+		start(join.scheduleDate, join.rtmp);
 	}
 	if (_scheduleDate) {
 		saveDefaultJoinAs(joinAs());
 	}
 }
 
+void GroupCall::processConferenceStart(StartConferenceInfo conference) {
+	if (!conference.videoCapture) {
+		return;
+	}
+	fillActiveVideoEndpoints();
+	const auto weak = base::make_weak(this);
+	if (!conference.videoCaptureScreenId.isEmpty()) {
+		_screenCapture = std::move(conference.videoCapture);
+		_screenDeviceId = conference.videoCaptureScreenId;
+		_screenCapture->setOnFatalError([=] {
+			crl::on_main(weak, [=] {
+				emitShareScreenError(Error::ScreenFailed);
+			});
+		});
+		_screenCapture->setOnPause([=](bool paused) {
+			crl::on_main(weak, [=] {
+				if (isSharingScreen()) {
+					_screenState = paused
+						? Webrtc::VideoState::Paused
+						: Webrtc::VideoState::Active;
+				}
+			});
+		});
+		_screenState = Webrtc::VideoState::Active;
+	} else {
+		_cameraCapture = std::move(conference.videoCapture);
+		_cameraCapture->setOnFatalError([=] {
+			crl::on_main(weak, [=] {
+				emitShareCameraError(Error::CameraFailed);
+			});
+		});
+		_cameraState = Webrtc::VideoState::Active;
+	}
+}
+
 GroupCall::~GroupCall() {
+	_e2e = nullptr;
 	destroyScreencast();
 	destroyController();
 	if (!_rtmp) {
 		Core::App().mediaDevices().setCaptureMuteTracker(this, false);
 	}
+	_messages->undoScheduledPaidOnDestroy();
+}
+
+void GroupCall::initConferenceE2E() {
+	if (!_e2eEncryptDecrypt) {
+		_e2eEncryptDecrypt = std::make_shared<TdE2E::EncryptDecrypt>();
+	}
+
+	for (auto &state : _subchains) {
+		_api.request(base::take(state.requestId)).cancel();
+		state = SubChainState();
+	}
+	_e2e = nullptr;
+	_pendingOutboundBlock = QByteArray();
+
+	const auto tde2eUserId = TdE2E::MakeUserId(_peer->session().user());
+	_e2e = std::make_unique<TdE2E::Call>(tde2eUserId);
+
+	_e2e->subchainRequests(
+	) | rpl::on_next([=](TdE2E::Call::SubchainRequest request) {
+		requestSubchainBlocks(request.subchain, request.height);
+	}, _e2e->lifetime());
+
+	_e2e->sendOutboundBlock(
+	) | rpl::on_next([=](QByteArray &&block) {
+		sendOutboundBlock(std::move(block));
+	}, _e2e->lifetime());
+
+	_e2e->failures() | rpl::on_next([=] {
+		LOG(("TdE2E: Got failure, scheduling rejoin!"));
+		crl::on_main(this, [=] { startRejoin(); });
+	}, _e2e->lifetime());
+
+	_e2e->registerEncryptDecrypt(_e2eEncryptDecrypt);
+
+	_emojiHash = _e2e->emojiHashValue();
+}
+
+void GroupCall::setupConferenceCall() {
+	Expects(_sharedCall != nullptr);
+
+	_sharedCall->staleParticipantIds(
+	) | rpl::on_next([=](const base::flat_set<UserId> &staleIds) {
+		removeConferenceParticipants(staleIds, true);
+	}, _lifetime);
+}
+
+void GroupCall::trackParticipantsWithAccess() {
+	if (!_sharedCall || !_e2e) {
+		return;
+	}
+
+	_e2e->participantsSetValue(
+	) | rpl::on_next([=](const TdE2E::ParticipantsSet &set) {
+		auto users = base::flat_set<UserId>();
+		users.reserve(set.list.size());
+		for (const auto &id : set.list) {
+			users.emplace(UserId(id.v));
+		}
+		_sharedCall->setParticipantsWithAccess(std::move(users));
+	}, _e2e->lifetime());
+}
+
+void GroupCall::removeConferenceParticipants(
+		const base::flat_set<UserId> userIds,
+		bool removingStale) {
+	Expects(_e2e != nullptr);
+	Expects(!userIds.empty());
+
+	auto inputs = QVector<MTPlong>();
+	inputs.reserve(userIds.size());
+	auto ids = base::flat_set<TdE2E::UserId>();
+	ids.reserve(userIds.size());
+	for (const auto &id : userIds) {
+		inputs.push_back(MTP_long(peerToUser(id).bare));
+		ids.emplace(TdE2E::MakeUserId(id));
+	}
+	const auto block = _e2e->makeRemoveBlock(ids);
+	if (block.data.isEmpty()) {
+		return;
+	}
+	using Flag = MTPphone_DeleteConferenceCallParticipants::Flag;
+	_api.request(MTPphone_DeleteConferenceCallParticipants(
+		MTP_flags(removingStale ? Flag::f_only_left : Flag::f_kick),
+		inputCall(),
+		MTP_vector<MTPlong>(std::move(inputs)),
+		MTP_bytes(block.data)
+	)).done([=](const MTPUpdates &result) {
+		_peer->session().api().applyUpdates(result);
+	}).fail([=](const MTP::Error &error) {
+		const auto type = error.type();
+		if (type == u"GROUPCALL_FORBIDDEN"_q) {
+			LOG(("Call Info: "
+				"Rejoin after error '%1' in delete confcall participants"
+				).arg(type));
+			startRejoin();
+		} else {
+			LOG(("Call Error: Could not remove confcall participants: %1"
+				).arg(type));
+		}
+	}).send();
 }
 
 bool GroupCall::isSharingScreen() const {
@@ -776,24 +955,33 @@ void GroupCall::setScheduledDate(TimeId date) {
 	const auto was = _scheduleDate;
 	_scheduleDate = date;
 	if (was && !date) {
-		join(inputCall());
+		initialJoin();
 	}
 }
 
+void GroupCall::setMessagesEnabled(bool enabled) {
+	_messagesEnabled = enabled && (!_rtmp || videoStream());
+}
+
 void GroupCall::subscribeToReal(not_null<Data::GroupCall*> real) {
 	_listenersHidden = real->listenersHidden();
 
 	real->scheduleDateValue(
-	) | rpl::start_with_next([=](TimeId date) {
+	) | rpl::on_next([=](TimeId date) {
 		setScheduledDate(date);
 	}, _lifetime);
 
+	real->messagesEnabledValue(
+	) | rpl::on_next([=](bool enabled) {
+		setMessagesEnabled(enabled);
+	}, _lifetime);
+
 	// Postpone creating video tracks, so that we know if Panel
 	// supports OpenGL and we don't need ARGB32 frames at all.
 	Ui::PostponeCall(this, [=] {
 		if (const auto real = lookupReal()) {
 			real->participantsReloaded(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				fillActiveVideoEndpoints();
 			}, _lifetime);
 			fillActiveVideoEndpoints();
@@ -802,7 +990,7 @@ void GroupCall::subscribeToReal(not_null<Data::GroupCall*> real) {
 
 	using Update = Data::GroupCall::ParticipantUpdate;
 	real->participantUpdated(
-	) | rpl::start_with_next([=](const Update &data) {
+	) | rpl::on_next([=](const Update &data) {
 		const auto regularEndpoint = [&](const std::string &endpoint)
 		-> const std::string & {
 			return (endpoint.empty()
@@ -879,7 +1067,7 @@ void GroupCall::subscribeToReal(not_null<Data::GroupCall*> real) {
 	}, _lifetime);
 
 	real->participantsResolved(
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 		not_null<const base::flat_map<
 			uint32,
 			Data::LastSpokeTimes>*> ssrcs) {
@@ -891,7 +1079,7 @@ void GroupCall::subscribeToReal(not_null<Data::GroupCall*> real) {
 	real->participantSpeaking(
 	) | rpl::filter([=] {
 		return _videoEndpointLarge.current();
-	}) | rpl::start_with_next([=](not_null<Data::GroupCallParticipant*> p) {
+	}) | rpl::on_next([=](not_null<Data::GroupCallParticipant*> p) {
 		const auto now = crl::now();
 		if (_videoEndpointLarge.current().peer == p->peer) {
 			_videoLargeTillTime = std::max(
@@ -955,8 +1143,8 @@ void GroupCall::setState(State state) {
 
 	if (state == State::Joined) {
 		stopConnectingSound();
-		if (const auto call = _peer->groupCall(); call && call->id() == _id) {
-			call->setInCall();
+		if (const auto real = lookupReal()) {
+			real->setInCall();
 		}
 	}
 
@@ -1011,8 +1199,18 @@ void GroupCall::playConnectingSoundOnce() {
 	_delegate->groupCallPlaySound(Delegate::GroupCallSound::Connecting);
 }
 
+not_null<PeerData*> GroupCall::messagesFrom() const {
+	if (!videoStream()) {
+		return joinAs();
+	} else if (const auto real = lookupReal()) {
+		return real->resolveSendAs();
+	}
+	return _peer->session().user();
+}
+
 bool GroupCall::showChooseJoinAs() const {
 	return !_rtmp
+		&& !videoStream()
 		&& ((_possibleJoinAs.size() > 1)
 			|| (_possibleJoinAs.size() == 1
 				&& !_possibleJoinAs.front()->isSelf()));
@@ -1029,6 +1227,31 @@ bool GroupCall::rtmp() const {
 	return _rtmp;
 }
 
+bool GroupCall::conference() const {
+	if (const auto raw = _sharedCall.get()) {
+		return (raw->origin() == Data::GroupCallOrigin::Conference);
+	} else if (_startConferenceInfo.get()) {
+		return true;
+	}
+	return false;
+}
+
+bool GroupCall::videoStream() const {
+	if (const auto raw = _sharedCall.get()) {
+		return (raw->origin() == Data::GroupCallOrigin::VideoStream);
+	}
+	return false;
+}
+
+Data::GroupCallOrigin GroupCall::origin() const {
+	if (const auto raw = _sharedCall.get()) {
+		return raw->origin();
+	} else if (_startConferenceInfo.get()) {
+		return Data::GroupCallOrigin::Conference;
+	}
+	return Data::GroupCallOrigin::Group;
+}
+
 bool GroupCall::listenersHidden() const {
 	return _listenersHidden;
 }
@@ -1042,7 +1265,7 @@ rpl::producer<bool> GroupCall::emptyRtmpValue() const {
 }
 
 int GroupCall::rtmpVolume() const {
-	return _rtmpVolume;
+	return _singleSourceVolume;
 }
 
 Calls::Group::RtmpInfo GroupCall::rtmpInfo() const {
@@ -1055,10 +1278,17 @@ void GroupCall::setRtmpInfo(const Calls::Group::RtmpInfo &value) {
 }
 
 Data::GroupCall *GroupCall::lookupReal() const {
+	if (const auto shared = _sharedCall.get()) {
+		return shared;
+	}
 	const auto real = _peer->groupCall();
 	return (real && real->id() == _id) ? real : nullptr;
 }
 
+std::shared_ptr<Data::GroupCall> GroupCall::sharedCall() const {
+	return _sharedCall;
+}
+
 rpl::producer<not_null<Data::GroupCall*>> GroupCall::real() const {
 	if (const auto real = lookupReal()) {
 		return rpl::single(not_null{ real });
@@ -1066,62 +1296,85 @@ rpl::producer<not_null<Data::GroupCall*>> GroupCall::real() const {
 	return _realChanges.events();
 }
 
+rpl::producer<QByteArray> GroupCall::emojiHashValue() const {
+	return _emojiHash.value();
+}
+
 void GroupCall::start(TimeId scheduleDate, bool rtmp) {
 	using Flag = MTPphone_CreateGroupCall::Flag;
 	_createRequestId = _api.request(MTPphone_CreateGroupCall(
 		MTP_flags((scheduleDate ? Flag::f_schedule_date : Flag(0))
 			| (rtmp ? Flag::f_rtmp_stream : Flag(0))),
-		_peer->input,
+		_peer->input(),
 		MTP_int(base::RandomValue<int32>()),
 		MTPstring(), // title
 		MTP_int(scheduleDate)
 	)).done([=](const MTPUpdates &result) {
+		_createRequestId = 0;
 		_reloadedStaleCall = true;
 		_acceptFields = true;
 		_peer->session().api().applyUpdates(result);
 		_acceptFields = false;
 	}).fail([=](const MTP::Error &error) {
+		_createRequestId = 0;
 		LOG(("Call Error: Could not create, error: %1"
 			).arg(error.type()));
 		hangup();
 	}).send();
 }
 
-void GroupCall::join(const MTPInputGroupCall &inputCall) {
+void GroupCall::applyInputCall(const MTPInputGroupCall &inputCall) {
 	inputCall.match([&](const MTPDinputGroupCall &data) {
 		_id = data.vid().v;
 		_accessHash = data.vaccess_hash().v;
+	}, [&](const auto &) {
+		Unexpected("slug/msg in GroupCall::join.");
 	});
-	setState(_scheduleDate ? State::Waiting : State::Joining);
+}
 
+void GroupCall::initialJoin() {
+	setState(_scheduleDate ? State::Waiting : State::Joining);
 	if (_scheduleDate) {
 		return;
 	}
 	rejoin();
+	if (_id) {
+		initialJoinRequested();
+	}
+}
 
+void GroupCall::initialJoinRequested() {
 	using Update = Data::GroupCall::ParticipantUpdate;
 	const auto real = lookupReal();
 	Assert(real != nullptr);
 	real->participantUpdated(
 	) | rpl::filter([=](const Update &update) {
 		return (_instance != nullptr);
-	}) | rpl::start_with_next([=](const Update &update) {
+	}) | rpl::on_next([=](const Update &update) {
 		if (!update.now) {
 			_instance->removeSsrcs({
 				update.was->ssrc,
 				GetAdditionalAudioSsrc(update.was->videoParams),
 			});
+		} else if (videoStream()) {
+			const auto value = singleSourceVolumeValue();
+			_instance->setVolume(update.now->ssrc, value);
 		} else if (!_rtmp) {
 			updateInstanceVolume(update.was, *update.now);
 		}
 	}, _lifetime);
 
+	if (_sharedCall && conference()) {
+		_canManage = _sharedCall->canManage();
+		return;
+	}
 	_peer->session().updates().addActiveChat(
 		_peerStream.events_starting_with_copy(_peer));
-	SubscribeToMigration(_peer, _lifetime, [=](not_null<ChannelData*> group) {
-		_peer = group;
+	_canManage = Data::CanManageGroupCallValue(_peer);
+	SubscribeToMigration(_peer, _lifetime, [=](not_null<ChannelData*> peer) {
+		_peer = peer;
 		_canManage = Data::CanManageGroupCallValue(_peer);
-		_peerStream.fire_copy(group);
+		_peerStream.fire_copy(peer);
 	});
 }
 
@@ -1219,7 +1472,7 @@ void GroupCall::markEndpointActive(
 		const auto track = &i->second->track;
 
 		track->renderNextFrame(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto activeTrack = _activeVideoTracks[endpoint].get();
 			const auto size = track->frameSize();
 			if (size.isEmpty()) {
@@ -1241,7 +1494,7 @@ void GroupCall::markEndpointActive(
 			) | rpl::filter([=](Webrtc::VideoState state) {
 				return (state == Webrtc::VideoState::Paused)
 					&& !_activeVideoTracks[endpoint]->shown;
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				_activeVideoTracks[endpoint]->shown = true;
 				markTrackShown(endpoint, true);
 			}, i->second->lifetime);
@@ -1293,6 +1546,21 @@ void GroupCall::markTrackPaused(const VideoEndpoint &endpoint, bool paused) {
 		: Webrtc::VideoState::Active);
 }
 
+void GroupCall::startRejoin() {
+	if (_joinState.action != JoinAction::None || _createRequestId) {
+		// Don't reset _e2e in that case, if rejoin() is a no-op.
+		return;
+	}
+	for (const auto &[task, part] : _broadcastParts) {
+		_api.request(part.requestId).cancel();
+	}
+	if (conference()) {
+		initConferenceE2E();
+	}
+	setState(State::Joining);
+	rejoin();
+}
+
 void GroupCall::rejoin() {
 	rejoin(joinAs());
 }
@@ -1316,8 +1584,8 @@ void GroupCall::setJoinAs(not_null<PeerData*> as) {
 void GroupCall::saveDefaultJoinAs(not_null<PeerData*> as) {
 	setJoinAs(as);
 	_api.request(MTPphone_SaveDefaultGroupCallJoinAs(
-		_peer->input,
-		joinAs()->input
+		_peer->input(),
+		joinAs()->input()
 	)).send();
 }
 
@@ -1326,7 +1594,7 @@ void GroupCall::rejoin(not_null<PeerData*> as) {
 		&& state() != State::Joined
 		&& state() != State::Connecting) {
 		return;
-	} else if (_joinState.action != JoinAction::None) {
+	} else if (_joinState.action != JoinAction::None || _createRequestId) {
 		return;
 	}
 
@@ -1338,6 +1606,7 @@ void GroupCall::rejoin(not_null<PeerData*> as) {
 	_joinState.action = JoinAction::Joining;
 	_joinState.ssrc = 0;
 	_initialMuteStateSent = false;
+	_systemMuteReconciled = false;
 	setState(State::Joining);
 	if (!tryCreateController()) {
 		setInstanceMode(InstanceMode::None);
@@ -1350,86 +1619,325 @@ void GroupCall::rejoin(not_null<PeerData*> as) {
 	const auto weak = base::make_weak(&_instanceGuard);
 	_instance->emitJoinPayload([=](tgcalls::GroupJoinPayload payload) {
 		crl::on_main(weak, [=, payload = std::move(payload)] {
-			if (state() != State::Joining) {
-				_joinState.finish();
-				checkNextJoinAction();
-				return;
-			}
-			const auto ssrc = payload.audioSsrc;
+			_joinState.payload = {
+				.ssrc = payload.audioSsrc,
+				.json = QByteArray::fromStdString(payload.json),
+			};
 			LOG(("Call Info: Join payload received, joining with ssrc: %1."
-				).arg(ssrc));
+				).arg(_joinState.payload.ssrc));
+			if (!_sharedCall && _startConferenceInfo) {
+				startConference();
+			} else if (conference()
+				&& _sharedCall
+				&& !_sharedCall->blockchainMayBeEmpty()
+				&& !_e2e->hasLastBlock0()) {
+				refreshLastBlockAndJoin();
+			} else {
+				sendJoinRequest();
+			}
+		});
+	});
+}
 
-			const auto json = QByteArray::fromStdString(payload.json);
-			const auto wasMuteState = muted();
-			const auto wasVideoStopped = !isSharingCamera();
-			using Flag = MTPphone_JoinGroupCall::Flag;
-			const auto flags = (wasMuteState != MuteState::Active
-				? Flag::f_muted
-				: Flag(0))
-				| (_joinHash.isEmpty()
-					? Flag(0)
-					: Flag::f_invite_hash)
-				| (wasVideoStopped
-					? Flag::f_video_stopped
-					: Flag(0));
-			_api.request(MTPphone_JoinGroupCall(
-				MTP_flags(flags),
-				inputCall(),
-				joinAs()->input,
-				MTP_string(_joinHash),
-				MTP_dataJSON(MTP_bytes(json))
-			)).done([=](
-					const MTPUpdates &updates,
-					const MTP::Response &response) {
-				_serverTimeMs = TimestampInMsFromMsgId(response.outerMsgId);
-				_serverTimeMsGotAt = crl::now();
-
-				_joinState.finish(ssrc);
-				_mySsrcs.emplace(ssrc);
+void GroupCall::sendJoinRequest() {
+	if (state() != State::Joining) {
+		_joinState.finish();
+		checkNextJoinAction();
+		return;
+	}
+	const auto joinBlock = _e2e ? _e2e->makeJoinBlock().data : QByteArray();
+	if (_e2e && joinBlock.isEmpty()) {
+		_joinState.finish();
+		LOG(("Call Error: Could not generate join block."));
+		hangup();
+		Ui::Toast::Show(u"Could not generate join block."_q);
+		return;
+	}
+	const auto wasMuteState = muted();
+	const auto wasVideoStopped = !isSharingCamera();
+	using Flag = MTPphone_JoinGroupCall::Flag;
+	const auto flags = (wasMuteState != MuteState::Active
+		? Flag::f_muted
+		: Flag(0))
+		| (_joinHash.isEmpty() ? Flag(0) : Flag::f_invite_hash)
+		| (wasVideoStopped ? Flag::f_video_stopped : Flag(0))
+		| (_e2e ? (Flag::f_public_key | Flag::f_block) : Flag());
+	_api.request(MTPphone_JoinGroupCall(
+		MTP_flags(flags),
+		inputCallSafe(),
+		joinAs()->input(),
+		MTP_string(_joinHash),
+		(_e2e ? TdE2E::PublicKeyToMTP(_e2e->myKey()) : MTPint256()),
+		MTP_bytes(joinBlock),
+		MTP_dataJSON(MTP_bytes(_joinState.payload.json))
+	)).done([=](
+			const MTPUpdates &result,
+			const MTP::Response &response) {
+		joinDone(
+			TimestampInMsFromMsgId(response.outerMsgId),
+			result,
+			wasMuteState,
+			wasVideoStopped);
+	}).fail([=](const MTP::Error &error) {
+		joinFail(error.type());
+	}).send();
+}
 
-				setState((_instanceState.current()
-					== InstanceState::Disconnected)
-					? State::Connecting
-					: State::Joined);
-				applyMeInCallLocally();
-				maybeSendMutedUpdate(wasMuteState);
-				_peer->session().api().applyUpdates(updates);
-				applyQueuedSelfUpdates();
-				checkFirstTimeJoined();
-				_screenJoinState.nextActionPending = true;
-				checkNextJoinAction();
-				if (wasVideoStopped == isSharingCamera()) {
-					sendSelfUpdate(SendUpdateType::CameraStopped);
-				}
-				if (isCameraPaused()) {
-					sendSelfUpdate(SendUpdateType::CameraPaused);
-				}
-				sendPendingSelfUpdates();
-				if (!_reloadedStaleCall
-					&& _state.current() != State::Joining) {
-					if (const auto real = lookupReal()) {
-						_reloadedStaleCall = true;
-						real->reloadIfStale();
-					}
-				}
-			}).fail([=](const MTP::Error &error) {
-				_joinState.finish();
+void GroupCall::refreshLastBlockAndJoin() {
+	Expects(_e2e != nullptr);
 
-				const auto type = error.type();
-				LOG(("Call Error: Could not join, error: %1").arg(type));
+	if (state() != State::Joining) {
+		_joinState.finish();
+		checkNextJoinAction();
+		return;
+	}
+	_api.request(MTPphone_GetGroupCallChainBlocks(
+		inputCallSafe(),
+		MTP_int(0),
+		MTP_int(-1),
+		MTP_int(1)
+	)).done([=](const MTPUpdates &result) {
+		if (result.type() != mtpc_updates) {
+			_joinState.finish();
+			LOG(("Call Error: Bad result in GroupCallChainBlocks."));
+			hangup();
+			Ui::Toast::Show(u"Bad Updates in GroupCallChainBlocks."_q);
+			return;
+		}
+		_e2e->refreshLastBlock0({});
+		const auto &data = result.c_updates();
+		for (const auto &update : data.vupdates().v) {
+			if (update.type() != mtpc_updateGroupCallChainBlocks) {
+				continue;
+			}
+			const auto &data = update.c_updateGroupCallChainBlocks();
+			const auto &blocks = data.vblocks().v;
+			if (!blocks.isEmpty()) {
+				_e2e->refreshLastBlock0(TdE2E::Block{ blocks.back().v });
+				break;
+			}
+		}
+		sendJoinRequest();
+	}).fail([=](const MTP::Error &error) {
+		_joinState.finish();
+		const auto &type = error.type();
+		LOG(("Call Error: Could not get last block, error: %1").arg(type));
+		hangup();
+		Ui::Toast::Show(error.type());
+	}).send();
+}
 
-				if (type == u"GROUPCALL_SSRC_DUPLICATE_MUCH") {
-					rejoin();
-					return;
-				}
+void GroupCall::startConference() {
+	Expects(_e2e != nullptr && _startConferenceInfo != nullptr);
+
+	const auto joinBlock = _e2e->makeJoinBlock().data;
+	Assert(!joinBlock.isEmpty());
+
+	const auto wasMuteState = muted();
+	const auto wasVideoStopped = !isSharingCamera();
+	using Flag = MTPphone_CreateConferenceCall::Flag;
+	const auto flags = Flag::f_join
+		| Flag::f_public_key
+		| Flag::f_block
+		| Flag::f_params
+		| ((wasMuteState != MuteState::Active) ? Flag::f_muted : Flag(0))
+		| (wasVideoStopped ? Flag::f_video_stopped : Flag(0));
+	_createRequestId = _api.request(MTPphone_CreateConferenceCall(
+		MTP_flags(flags),
+		MTP_int(base::RandomValue<int32>()),
+		TdE2E::PublicKeyToMTP(_e2e->myKey()),
+		MTP_bytes(joinBlock),
+		MTP_dataJSON(MTP_bytes(_joinState.payload.json))
+	)).done([=](
+			const MTPUpdates &result,
+			const MTP::Response &response) {
+		_createRequestId = 0;
+		_sharedCall = _peer->owner().sharedConferenceCallFind(result);
+		if (!_sharedCall) {
+			joinFail(u"Call not found!"_q);
+			return;
+		}
+		applyInputCall(_sharedCall->input());
+		_realChanges.fire_copy(_sharedCall.get());
+
+		initialJoinRequested();
+		joinDone(
+			TimestampInMsFromMsgId(response.outerMsgId),
+			result,
+			wasMuteState,
+			wasVideoStopped,
+			true);
+	}).fail([=](const MTP::Error &error) {
+		_createRequestId = 0;
+		LOG(("Call Error: Could not create, error: %1"
+			).arg(error.type()));
+		hangup();
+	}).send();
+}
+
+void GroupCall::joinDone(
+		int64 serverTimeMs,
+		const MTPUpdates &result,
+		MuteState wasMuteState,
+		bool wasVideoStopped,
+		bool justCreated) {
+	Expects(!justCreated || _startConferenceInfo != nullptr);
+
+	_serverTimeMs = serverTimeMs;
+	_serverTimeMsGotAt = crl::now();
+
+	_joinState.finish(_joinState.payload.ssrc);
+	_mySsrcs.emplace(_joinState.ssrc);
+
+	setState((_instanceState.current()
+		== InstanceState::Disconnected)
+		? State::Connecting
+		: State::Joined);
+	applyMeInCallLocally();
+	maybeSendMutedUpdate(wasMuteState);
+	_systemMuteReconciled = true;
+	if (!_rtmp) {
+		const auto state = muted();
+		const auto nowMuted = (state != MuteState::Active)
+			&& (state != MuteState::PushToTalk);
+		Core::App().mediaDevices().setCaptureMuted(nowMuted);
+	}
+
+	for (auto &state : _subchains) {
+		// Accept initial join blocks.
+		_api.request(base::take(state.requestId)).cancel();
+		state.inShortPoll = true;
+	}
+	_messages->setApplyingInitial(true);
+	_peer->session().api().applyUpdates(result);
+	_messages->setApplyingInitial(false);
+	for (auto &state : _subchains) {
+		state.inShortPoll = false;
+	}
+
+	if (justCreated) {
+		subscribeToReal(_sharedCall.get());
+		setupConferenceCall();
+		_conferenceLinkSlug = Group::ExtractConferenceSlug(
+			_sharedCall->conferenceInviteLink());
+		Core::App().calls().startedConferenceReady(
+			this,
+			*_startConferenceInfo);
+	}
+
+	trackParticipantsWithAccess();
+	applyQueuedSelfUpdates();
+	checkFirstTimeJoined();
+	_screenJoinState.nextActionPending = true;
+	checkNextJoinAction();
+	if (wasVideoStopped == isSharingCamera()) {
+		sendSelfUpdate(SendUpdateType::CameraStopped);
+	}
+	if (isCameraPaused()) {
+		sendSelfUpdate(SendUpdateType::CameraPaused);
+	}
+	sendPendingSelfUpdates();
+	if (!_reloadedStaleCall
+		&& _state.current() != State::Joining) {
+		if (const auto real = lookupReal()) {
+			_reloadedStaleCall = true;
+			real->reloadIfStale();
+		}
+	}
+	if (_e2e) {
+		_e2e->joined();
+		if (!_pendingOutboundBlock.isEmpty()) {
+			sendOutboundBlock(base::take(_pendingOutboundBlock));
+		}
+	}
+	if (const auto once = base::take(_startConferenceInfo)) {
+		processConferenceStart(*once);
+	}
+	for (const auto &callback : base::take(_rejoinedCallbacks)) {
+		callback();
+	}
+}
 
+void GroupCall::joinFail(const QString &error) {
+	if (_e2e) {
+		if (error.startsWith(u"CONF_WRITE_CHAIN_INVALID"_q)) {
+			if (_id) {
+				refreshLastBlockAndJoin();
+			} else {
 				hangup();
-				Ui::Toast::Show((type == u"GROUPCALL_FORBIDDEN"_q)
-					? tr::lng_group_not_accessible(tr::now)
-					: Lang::Hard::ServerError());
-			}).send();
-		});
-	});
+			}
+			return;
+		}
+	}
+	_joinState.finish();
+	LOG(("Call Error: Could not join, error: %1").arg(error));
+
+	if (_id && error == u"GROUPCALL_SSRC_DUPLICATE_MUCH") {
+		rejoin();
+		return;
+	}
+
+	hangup();
+	Ui::Toast::Show((error == u"GROUPCALL_FORBIDDEN"_q
+		|| error == u"GROUPCALL_INVALID"_q)
+		? tr::lng_confcall_not_accessible(tr::now)
+		: error);
+}
+
+void GroupCall::requestSubchainBlocks(int subchain, int height) {
+	Expects(subchain >= 0 && subchain < kSubChainsCount);
+
+	auto &state = _subchains[subchain];
+	_api.request(base::take(state.requestId)).cancel();
+	state.requestId = _api.request(MTPphone_GetGroupCallChainBlocks(
+		inputCall(),
+		MTP_int(subchain),
+		MTP_int(height),
+		MTP_int(kShortPollChainBlocksPerRequest)
+	)).done([=](const MTPUpdates &result) {
+		auto &state = _subchains[subchain];
+		state.requestId = 0;
+		state.inShortPoll = true;
+		_peer->session().api().applyUpdates(result);
+		state.inShortPoll = false;
+		for (const auto &data : base::take(state.pending)) {
+			applySubChainUpdate(subchain, data.blocks, data.next);
+		}
+		_e2e->subchainBlocksRequestFinished(subchain);
+	}).fail([=](const MTP::Error &error) {
+		auto &state = _subchains[subchain];
+		state.requestId = 0;
+		_e2e->subchainBlocksRequestFinished(subchain);
+		if (error.type() == u"GROUPCALL_FORBIDDEN"_q) {
+			LOG(("Call Info: Rejoin after error '%1' in get chain blocks."
+				).arg(error.type()));
+			startRejoin();
+		}
+	}).send();
+}
+
+void GroupCall::sendOutboundBlock(QByteArray block) {
+	_pendingOutboundBlock = QByteArray();
+	_api.request(MTPphone_SendConferenceCallBroadcast(
+		inputCall(),
+		MTP_bytes(block)
+	)).done([=](const MTPUpdates &result) {
+		_peer->session().api().applyUpdates(result);
+	}).fail([=](const MTP::Error &error) {
+		const auto type = error.type();
+		if (type == u"GROUPCALL_FORBIDDEN"_q) {
+			_pendingOutboundBlock = block;
+			LOG(("Call Info: Rejoin after error '%1' in send confcall block."
+				).arg(type));
+			startRejoin();
+		} else if (type == u"BLOCK_INVALID"_q
+			|| type.startsWith(u"CONF_WRITE_CHAIN_INVALID"_q)) {
+			LOG(("Call Error: Could not broadcast block: %1").arg(type));
+		} else {
+			LOG(("Call Error: Got '%1' in send confcall block.").arg(type));
+			sendOutboundBlock(block);
+		}
+	}).send();
 }
 
 void GroupCall::checkNextJoinAction() {
@@ -1606,7 +2114,8 @@ void GroupCall::applyMeInCallLocally() {
 					MTPstring(), // Don't update about text in local updates.
 					MTP_long(raisedHandRating),
 					MTPGroupCallParticipantVideo(),
-					MTPGroupCallParticipantVideo())),
+					MTPGroupCallParticipantVideo(),
+					MTPlong())),
 			MTP_int(0)).c_updateGroupCallParticipants());
 }
 
@@ -1614,7 +2123,7 @@ void GroupCall::applyParticipantLocally(
 		not_null<PeerData*> participantPeer,
 		bool mute,
 		std::optional<int> volume) {
-	const auto participant = LookupParticipant(_peer, _id, participantPeer);
+	const auto participant = LookupParticipant(this, participantPeer);
 	if (!participant || !participant->ssrc) {
 		return;
 	}
@@ -1638,7 +2147,7 @@ void GroupCall::applyParticipantLocally(
 		| (participant->raisedHandRating
 			? Flag::f_raise_hand_rating
 			: Flag(0));
-	_peer->groupCall()->applyLocalUpdate(
+	lookupReal()->applyLocalUpdate(
 		MTP_updateGroupCallParticipants(
 			inputCall(),
 			MTP_vector<MTPGroupCallParticipant>(
@@ -1653,7 +2162,8 @@ void GroupCall::applyParticipantLocally(
 					MTPstring(), // Don't update about text in local updates.
 					MTP_long(participant->raisedHandRating),
 					MTPGroupCallParticipantVideo(),
-					MTPGroupCallParticipantVideo())),
+					MTPGroupCallParticipantVideo(),
+					MTPlong())),
 			MTP_int(0)).c_updateGroupCallParticipants());
 }
 
@@ -1852,6 +2362,9 @@ void GroupCall::handlePossibleCreateOrJoinResponse(
 			const auto rtmp = data.is_rtmp_stream();
 			_rtmp = rtmp;
 			setScheduledDate(scheduleDate);
+			if (!conference()) {
+				setMessagesEnabled(data.is_messages_enabled());
+			}
 			if (const auto chat = _peer->asChat()) {
 				chat->setGroupCall(input, scheduleDate, rtmp);
 			} else if (const auto group = _peer->asChannel()) {
@@ -1859,13 +2372,17 @@ void GroupCall::handlePossibleCreateOrJoinResponse(
 			} else {
 				Unexpected("Peer type in GroupCall::join.");
 			}
-			join(input);
+			applyInputCall(input);
+			initialJoin();
 		}
 		return;
 	} else if (_id != data.vid().v || !_instance) {
 		return;
 	}
 	setScheduledDate(data.vschedule_date().value_or_empty());
+	if (!conference()) {
+		setMessagesEnabled(data.is_messages_enabled());
+	}
 	if (const auto streamDcId = data.vstream_dc_id()) {
 		_broadcastDcId = MTP::BareDcId(streamDcId->v);
 	}
@@ -1914,12 +2431,60 @@ void GroupCall::handlePossibleCreateOrJoinResponse(
 				setCameraEndpoint(endpoint ? endpoint->id : std::string());
 				_instance->setJoinResponsePayload(json.toStdString());
 			}
+			updateInstanceVolumes();
+			fillActiveVideoEndpoints();
 			updateRequestedVideoChannels();
 			checkMediaChannelDescriptions();
 		});
 	}
 }
 
+void GroupCall::handleIncomingMessage(
+		const MTPDupdateGroupCallMessage &data) {
+	const auto id = data.vcall().match([&](const MTPDinputGroupCall &data) {
+		return data.vid().v;
+	}, [](const auto &) -> CallId {
+		Unexpected("slug/msg in GroupCall::handleIncomingMessage");
+	});
+	if (id != _id || conference()) {
+		return;
+	}
+	_messages->received(data);
+}
+
+void GroupCall::handleIncomingMessage(
+		const MTPDupdateGroupCallEncryptedMessage &data) {
+	const auto id = data.vcall().match([&](const MTPDinputGroupCall &data) {
+		return data.vid().v;
+	}, [](const auto &) -> CallId {
+		Unexpected("slug/msg in GroupCall::handleIncomingMessage");
+	});
+	if (id != _id || !conference()) {
+		return;
+	}
+	_messages->received(data);
+}
+
+void GroupCall::handleDeleteMessages(
+		const MTPDupdateDeleteGroupCallMessages &data) {
+	const auto id = data.vcall().match([&](const MTPDinputGroupCall &data) {
+		return data.vid().v;
+	}, [](const auto &) -> CallId {
+		Unexpected("slug/msg in GroupCall::handleIncomingMessage");
+	});
+	if (id != _id || conference()) {
+		return;
+	}
+	_messages->deleted(data);
+}
+
+void GroupCall::handleMessageSent(const MTPDupdateMessageID &data) {
+	if (conference()) {
+		return;
+	}
+	_messages->sent(data);
+}
+
 void GroupCall::handlePossibleDiscarded(const MTPDgroupCallDiscarded &data) {
 	if (data.vid().v == _id) {
 		LOG(("Call Info: Hangup after groupCallDiscarded."));
@@ -1952,6 +2517,8 @@ void GroupCall::handleUpdate(const MTPUpdate &update) {
 		handleUpdate(data);
 	}, [&](const MTPDupdateGroupCallParticipants &data) {
 		handleUpdate(data);
+	}, [&](const MTPDupdateGroupCallChainBlocks &data) {
+		handleUpdate(data);
 	}, [](const auto &) {
 		Unexpected("Type in Instance::applyGroupCallUpdateChecked.");
 	});
@@ -1965,8 +2532,11 @@ void GroupCall::handleUpdate(const MTPDupdateGroupCall &data) {
 }
 
 void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
-	const auto callId = data.vcall().match([](const auto &data) {
+	const auto callId = data.vcall().match([](
+			const MTPDinputGroupCall &data) {
 		return data.vid().v;
+	}, [](const auto &) -> CallId {
+		Unexpected("slug/msg in GroupCall::handleUpdate.");
 	});
 	if (_id != callId) {
 		return;
@@ -1990,6 +2560,46 @@ void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
 	}
 }
 
+void GroupCall::handleUpdate(const MTPDupdateGroupCallChainBlocks &data) {
+	const auto callId = data.vcall().match([](
+			const MTPDinputGroupCall &data) {
+		return data.vid().v;
+	}, [](const auto &) -> CallId {
+		Unexpected("slug/msg in GroupCall::handleUpdate.");
+	});
+	if (_id != callId || !_e2e) {
+		return;
+	}
+	const auto subchain = data.vsub_chain_id().v;
+	if (subchain < 0 || subchain >= kSubChainsCount) {
+		return;
+	}
+	auto &entry = _subchains[subchain];
+	const auto &blocks = data.vblocks().v;
+	const auto next = data.vnext_offset().v;
+	if (entry.requestId) {
+		Assert(!entry.inShortPoll);
+		entry.pending.push_back({ blocks, next });
+	} else {
+		applySubChainUpdate(subchain, blocks, next);
+	}
+}
+
+void GroupCall::applySubChainUpdate(
+		int subchain,
+		const QVector<MTPbytes> &blocks,
+		int next) {
+	Expects(subchain >= 0 && subchain < kSubChainsCount);
+
+	auto &entry = _subchains[subchain];
+	auto raw = std::vector<TdE2E::Block>();
+	raw.reserve(blocks.size());
+	for (const auto &block : blocks) {
+		raw.push_back({ block.v });
+	}
+	_e2e->apply(subchain, next, raw, entry.inShortPoll);
+}
+
 void GroupCall::applyQueuedSelfUpdates() {
 	const auto weak = base::make_weak(this);
 	while (weak
@@ -2010,8 +2620,7 @@ void GroupCall::applySelfUpdate(const MTPDgroupCallParticipant &data) {
 			// I was removed from the call, rejoin.
 			LOG(("Call Info: "
 				"Rejoin after got 'left' with my ssrc."));
-			setState(State::Joining);
-			rejoin();
+			startRejoin();
 		}
 		return;
 	} else if (data.vsource().v != _joinState.ssrc) {
@@ -2038,8 +2647,7 @@ void GroupCall::applySelfUpdate(const MTPDgroupCallParticipant &data) {
 			: MuteState::ForceMuted);
 	} else if (_instanceMode == InstanceMode::Stream) {
 		LOG(("Call Info: Rejoin after unforcemute in stream mode."));
-		setState(State::Joining);
-		rejoin();
+		startRejoin();
 	} else if (mutedByAdmin()) {
 		setMuted(MuteState::Muted);
 		if (!_instanceTransitioning) {
@@ -2058,7 +2666,7 @@ void GroupCall::applyOtherParticipantUpdate(
 	}
 	const auto participantPeer = _peer->owner().peer(
 		peerFromMTP(data.vpeer()));
-	if (!LookupParticipant(_peer, _id, participantPeer)) {
+	if (!LookupParticipant(this, participantPeer)) {
 		return;
 	}
 	_otherParticipantStateValue.fire(Group::ParticipantState{
@@ -2071,7 +2679,7 @@ void GroupCall::applyOtherParticipantUpdate(
 void GroupCall::setupMediaDevices() {
 	_playbackDeviceId.changes() | rpl::filter([=] {
 		return _instance && _setDeviceIdCallback;
-	}) | rpl::start_with_next([=](const Webrtc::DeviceResolvedId &deviceId) {
+	}) | rpl::on_next([=](const Webrtc::DeviceResolvedId &deviceId) {
 		_setDeviceIdCallback(deviceId);
 
 		// Value doesn't matter here, just trigger reading of the new value.
@@ -2080,7 +2688,7 @@ void GroupCall::setupMediaDevices() {
 
 	_captureDeviceId.changes() | rpl::filter([=] {
 		return _instance && _setDeviceIdCallback;
-	}) | rpl::start_with_next([=](const Webrtc::DeviceResolvedId &deviceId) {
+	}) | rpl::on_next([=](const Webrtc::DeviceResolvedId &deviceId) {
 		_setDeviceIdCallback(deviceId);
 
 		// Value doesn't matter here, just trigger reading of the new value.
@@ -2089,18 +2697,18 @@ void GroupCall::setupMediaDevices() {
 
 	_cameraDeviceId.changes() | rpl::filter([=] {
 		return _cameraCapture != nullptr;
-	}) | rpl::start_with_next([=](const Webrtc::DeviceResolvedId &deviceId) {
+	}) | rpl::on_next([=](const Webrtc::DeviceResolvedId &deviceId) {
 		_cameraCapture->switchToDevice(deviceId.value.toStdString(), false);
 	}, _lifetime);
 
 	if (!_rtmp) {
-		_muted.value() | rpl::start_with_next([=](MuteState state) {
+		_muted.value() | rpl::on_next([=](MuteState state) {
 			const auto devices = &Core::App().mediaDevices();
 			const auto muted = (state != MuteState::Active)
 				&& (state != MuteState::PushToTalk);
 			const auto track = !muted || (state == MuteState::Muted);
-			devices->setCaptureMuteTracker(this, track);
 			devices->setCaptureMuted(muted);
+			devices->setCaptureMuteTracker(this, track);
 		}, _lifetime);
 	}
 }
@@ -2112,8 +2720,20 @@ void GroupCall::captureMuteChanged(bool mute) {
 			|| oldState == MuteState::RaisedHand
 			|| oldState == MuteState::Muted)) {
 		return;
+	} else if (!mute
+		&& (oldState == MuteState::ForceMuted
+			|| oldState == MuteState::RaisedHand)) {
+		crl::on_main(this, [] {
+			Core::App().mediaDevices().setCaptureMuted(true);
+		});
+		return;
 	} else if (!mute && oldState != MuteState::Muted) {
 		return;
+	} else if (!mute && !_systemMuteReconciled) {
+		crl::on_main(this, [] {
+			Core::App().mediaDevices().setCaptureMuted(true);
+		});
+		return;
 	}
 	setMutedAndUpdate(mute ? MuteState::Muted : MuteState::Active);
 }
@@ -2192,6 +2812,10 @@ void GroupCall::emitShareScreenError(Error error) {
 	_errors.fire_copy(error);
 }
 
+void GroupCall::playSoundRecordingStarted() const {
+	_delegate->groupCallPlaySound(Delegate::GroupCallSound::RecordingStarted);
+}
+
 void GroupCall::setupOutgoingVideo() {
 	using Webrtc::VideoState;
 
@@ -2200,7 +2824,7 @@ void GroupCall::setupOutgoingVideo() {
 	) | rpl::filter([=](VideoState previous, VideoState state) {
 		// Recursive entrance may happen if error happens when activating.
 		return (previous != state);
-	}) | rpl::start_with_next([=](VideoState previous, VideoState state) {
+	}) | rpl::on_next([=](VideoState previous, VideoState state) {
 		const auto wasActive = (previous != VideoState::Inactive);
 		const auto nowPaused = (state == VideoState::Paused);
 		const auto nowActive = (state != VideoState::Inactive);
@@ -2256,7 +2880,7 @@ void GroupCall::setupOutgoingVideo() {
 	) | rpl::filter([=](VideoState previous, VideoState state) {
 		// Recursive entrance may happen if error happens when activating.
 		return (previous != state);
-	}) | rpl::start_with_next([=](VideoState previous, VideoState state) {
+	}) | rpl::on_next([=](VideoState previous, VideoState state) {
 		const auto wasActive = (previous != VideoState::Inactive);
 		const auto nowPaused = (state == VideoState::Paused);
 		const auto nowActive = (state != VideoState::Inactive);
@@ -2369,6 +2993,15 @@ void GroupCall::toggleRecording(
 	}).send();
 }
 
+auto GroupCall::lookupVideoCodecPreferences() const
+-> std::vector<tgcalls::VideoCodecName> {
+	auto result = std::vector<tgcalls::VideoCodecName>();
+	if (_peer->session().appConfig().confcallPrioritizeVP8()) {
+		result.push_back(tgcalls::VideoCodecName::VP8);
+	}
+	return result;
+}
+
 bool GroupCall::tryCreateController() {
 	if (_instance) {
 		return false;
@@ -2475,6 +3108,7 @@ bool GroupCall::tryCreateController() {
 		.videoContentType = tgcalls::VideoContentType::Generic,
 		.initialEnableNoiseSuppression
 			= settings.groupCallNoiseSuppression(),
+		.videoCodecPreferences = lookupVideoCodecPreferences(),
 		.requestMediaChannelDescriptions = [=, call = base::make_weak(this)](
 			const std::vector<uint32_t> &ssrcs,
 			std::function<void(
@@ -2488,6 +3122,7 @@ bool GroupCall::tryCreateController() {
 			});
 			return result;
 		},
+		.e2eEncryptDecrypt = e2eEncryptDecrypt(),
 	};
 	if (Logs::DebugEnabled()) {
 		auto callLogFolder = cWorkingDir() + u"DebugLogs"_q;
@@ -2539,6 +3174,8 @@ bool GroupCall::tryCreateScreencast() {
 		.createAudioDeviceModule = Webrtc::LoopbackAudioDeviceModuleCreator(),
 		.videoCapture = _screenCapture,
 		.videoContentType = tgcalls::VideoContentType::Screencast,
+		.videoCodecPreferences = lookupVideoCodecPreferences(),
+		.e2eEncryptDecrypt = e2eEncryptDecrypt(),
 	};
 
 	LOG(("Call Info: Creating group screen instance"));
@@ -2604,11 +3241,7 @@ void GroupCall::broadcastPartStart(std::shared_ptr<LoadPartTask> task) {
 	}).fail([=](const MTP::Error &error, const MTP::Response &response) {
 		if (error.type() == u"GROUPCALL_JOIN_MISSING"_q
 			|| error.type() == u"GROUPCALL_FORBIDDEN"_q) {
-			for (const auto &[task, part] : _broadcastParts) {
-				_api.request(part.requestId).cancel();
-			}
-			setState(State::Joining);
-			rejoin();
+			startRejoin();
 			return;
 		}
 		const auto status = (MTP::IsFloodError(error)
@@ -2672,6 +3305,7 @@ bool GroupCall::mediaChannelDescriptionsFill(
 			add(Channel{
 				.type = Channel::Type::Audio,
 				.audioSsrc = ssrc,
+				.userId = int64_t(peerToUser(byAudio->id).bare),
 			});
 		} else if (!resolved) {
 			_unresolvedSsrcs.emplace(ssrc);
@@ -2727,11 +3361,7 @@ void GroupCall::requestCurrentTimeStart(
 
 		if (error.type() == u"GROUPCALL_JOIN_MISSING"_q
 			|| error.type() == u"GROUPCALL_FORBIDDEN"_q) {
-			for (const auto &[task, part] : _broadcastParts) {
-				_api.request(part.requestId).cancel();
-			}
-			setState(State::Joining);
-			rejoin();
+			startRejoin();
 		}
 	}).handleAllErrors().toDC(
 		MTP::groupCallStreamDcId(_broadcastDcId)
@@ -2808,6 +3438,7 @@ void GroupCall::updateRequestedVideoChannels() {
 		}
 		channels.push_back({
 			.audioSsrc = participant->ssrc,
+			.userId = int64_t(peerToUser(participant->peer->id).bare),
 			.endpointId = endpointId,
 			.ssrcGroups = (params->camera.endpointId == endpointId
 				? params->camera.ssrcGroups
@@ -2955,6 +3586,10 @@ void GroupCall::updateInstanceMuteState() {
 		&& state != MuteState::PushToTalk);
 }
 
+float64 GroupCall::singleSourceVolumeValue() const {
+	return _singleSourceVolume / float64(Group::kDefaultVolume);
+}
+
 void GroupCall::updateInstanceVolumes() {
 	const auto real = lookupReal();
 	if (!real) {
@@ -2962,8 +3597,12 @@ void GroupCall::updateInstanceVolumes() {
 	}
 
 	if (_rtmp) {
-		const auto value = _rtmpVolume / float64(Group::kDefaultVolume);
-		_instance->setVolume(1, value);
+		_instance->setVolume(1, singleSourceVolumeValue());
+	} else if (videoStream()) {
+		const auto value = singleSourceVolumeValue();
+		for (const auto &participant : real->participants()) {
+			_instance->setVolume(participant.ssrc, value);
+		}
 	} else {
 		const auto &participants = real->participants();
 		for (const auto &participant : participants) {
@@ -3137,7 +3776,7 @@ void GroupCall::checkJoined() {
 	}).fail([=](const MTP::Error &error) {
 		LOG(("Call Info: Full rejoin after error '%1' in checkGroupCall."
 			).arg(error.type()));
-		rejoin();
+		startRejoin();
 	}).send();
 }
 
@@ -3296,7 +3935,7 @@ void GroupCall::sendSelfUpdate(SendUpdateType type) {
 			? Flag::f_presentation_paused
 			: Flag::f_muted),
 		inputCall(),
-		joinAs()->input,
+		joinAs()->input(),
 		MTP_bool(muted() != MuteState::Active),
 		MTP_int(100000), // volume
 		MTP_bool(muted() == MuteState::RaisedHand),
@@ -3312,7 +3951,7 @@ void GroupCall::sendSelfUpdate(SendUpdateType type) {
 		if (error.type() == u"GROUPCALL_FORBIDDEN"_q) {
 			LOG(("Call Info: Rejoin after error '%1' in editGroupCallMember."
 				).arg(error.type()));
-			rejoin();
+			startRejoin();
 		}
 	}).send();
 }
@@ -3356,8 +3995,8 @@ void GroupCall::requestVideoQuality(
 }
 
 void GroupCall::toggleMute(const Group::MuteRequest &data) {
-	if (_rtmp) {
-		_rtmpVolume = data.mute ? 0 : Group::kDefaultVolume;
+	if (_rtmp || videoStream()) {
+		_singleSourceVolume = data.mute ? 0 : Group::kDefaultVolume;
 		updateInstanceVolumes();
 	} else if (data.locallyOnly) {
 		applyParticipantLocally(data.peer, data.mute, std::nullopt);
@@ -3367,8 +4006,8 @@ void GroupCall::toggleMute(const Group::MuteRequest &data) {
 }
 
 void GroupCall::changeVolume(const Group::VolumeRequest &data) {
-	if (_rtmp) {
-		_rtmpVolume = data.volume;
+	if (_rtmp || videoStream()) {
+		_singleSourceVolume = data.volume;
 		updateInstanceVolumes();
 	} else if (data.locallyOnly) {
 		applyParticipantLocally(data.peer, false, data.volume);
@@ -3381,7 +4020,7 @@ void GroupCall::editParticipant(
 		not_null<PeerData*> participantPeer,
 		bool mute,
 		std::optional<int> volume) {
-	const auto participant = LookupParticipant(_peer, _id, participantPeer);
+	const auto participant = LookupParticipant(this, participantPeer);
 	if (!participant) {
 		return;
 	}
@@ -3393,7 +4032,7 @@ void GroupCall::editParticipant(
 	_api.request(MTPphone_EditGroupCallParticipant(
 		MTP_flags(flags),
 		inputCall(),
-		participantPeer->input,
+		participantPeer->input(),
 		MTP_bool(mute),
 		MTP_int(std::clamp(volume.value_or(0), 1, Group::kMaxVolume)),
 		MTPBool(), // raise_hand
@@ -3406,50 +4045,118 @@ void GroupCall::editParticipant(
 		if (error.type() == u"GROUPCALL_FORBIDDEN"_q) {
 			LOG(("Call Info: Rejoin after error '%1' in editGroupCallMember."
 				).arg(error.type()));
-			rejoin();
+			startRejoin();
+		}
+	}).send();
+}
+
+void GroupCall::inviteToConference(
+		InviteRequest request,
+		Fn<not_null<InviteResult*>()> resultAddress,
+		Fn<void()> finishRequest) {
+	using Flag = MTPphone_InviteConferenceCallParticipant::Flag;
+	const auto user = request.user;
+	_api.request(MTPphone_InviteConferenceCallParticipant(
+		MTP_flags(request.video ? Flag::f_video : Flag()),
+		inputCall(),
+		user->inputUser()
+	)).done([=](const MTPUpdates &result) {
+		const auto call = _sharedCall.get();
+		user->owner().registerInvitedToCallUser(_id, call, user, true);
+		_peer->session().api().applyUpdates(result);
+		resultAddress()->invited.push_back(user);
+		finishRequest();
+	}).fail([=](const MTP::Error &error) {
+		const auto result = resultAddress();
+		const auto type = error.type();
+		if (type == u"USER_PRIVACY_RESTRICTED"_q) {
+			result->privacyRestricted.push_back(user);
+		} else if (type == u"USER_ALREADY_PARTICIPANT"_q) {
+			result->alreadyIn.push_back(user);
+		} else if (type == u"USER_WAS_KICKED"_q) {
+			result->kicked.push_back(user);
+		} else if (type == u"GROUPCALL_FORBIDDEN"_q) {
+			startRejoin();
+			_rejoinedCallbacks.push_back([=] {
+				inviteToConference(request, resultAddress, finishRequest);
+			});
+			return;
+		} else {
+			result->failed.push_back(user);
 		}
+		finishRequest();
 	}).send();
 }
 
-std::variant<int, not_null<UserData*>> GroupCall::inviteUsers(
-		const std::vector<not_null<UserData*>> &users) {
+void GroupCall::inviteUsers(
+		const std::vector<InviteRequest> &requests,
+		Fn<void(InviteResult)> done) {
 	const auto real = lookupReal();
 	if (!real) {
-		return 0;
+		if (done) {
+			done({});
+		}
+		return;
 	}
 	const auto owner = &_peer->owner();
 
-	auto count = 0;
+	struct State {
+		InviteResult result;
+		int requests = 0;
+	};
+	const auto state = std::make_shared<State>();
+	const auto finishRequest = [=] {
+		if (!--state->requests) {
+			if (done) {
+				done(std::move(state->result));
+			}
+		}
+	};
+
+	if (_sharedCall.get()) {
+		for (const auto &request : requests) {
+			inviteToConference(request, [=] {
+				return &state->result;
+			}, finishRequest);
+			++state->requests;
+		}
+		return;
+	}
+
+	auto usersSlice = std::vector<not_null<UserData*>>();
+	usersSlice.reserve(kMaxInvitePerSlice);
 	auto slice = QVector<MTPInputUser>();
-	auto result = std::variant<int, not_null<UserData*>>(0);
 	slice.reserve(kMaxInvitePerSlice);
 	const auto sendSlice = [&] {
-		count += slice.size();
 		_api.request(MTPphone_InviteToGroupCall(
 			inputCall(),
 			MTP_vector<MTPInputUser>(slice)
 		)).done([=](const MTPUpdates &result) {
 			_peer->session().api().applyUpdates(result);
+			for (const auto &user : usersSlice) {
+				state->result.invited.push_back(user);
+			}
+			finishRequest();
+		}).fail([=](const MTP::Error &error) {
+			finishRequest();
 		}).send();
+		++state->requests;
+
 		slice.clear();
+		usersSlice.clear();
 	};
-	for (const auto &user : users) {
-		if (!count && slice.empty()) {
-			result = user;
-		}
-		owner->registerInvitedToCallUser(_id, _peer, user);
-		slice.push_back(user->inputUser);
+	for (const auto &request : requests) {
+		const auto user = request.user;
+		owner->registerInvitedToCallUser(_id, _peer, user, false);
+		usersSlice.push_back(user);
+		slice.push_back(user->inputUser());
 		if (slice.size() == kMaxInvitePerSlice) {
 			sendSlice();
 		}
 	}
-	if (count != 0 || slice.size() != 1) {
-		result = int(count + slice.size());
-	}
 	if (!slice.empty()) {
 		sendSlice();
 	}
-	return result;
 }
 
 auto GroupCall::ensureGlobalShortcutManager()
@@ -3519,6 +4226,17 @@ void GroupCall::setNotRequireARGB32() {
 	_requireARGB32 = false;
 }
 
+std::function<std::vector<uint8_t>(
+		std::vector<uint8_t> const &,
+		int64_t, bool,
+		int32_t)> GroupCall::e2eEncryptDecrypt() const {
+	return _e2eEncryptDecrypt ? _e2eEncryptDecrypt->callback() : nullptr;
+}
+
+void GroupCall::sendMessage(TextWithTags message) {
+	_messages->send(std::move(message), 0);
+}
+
 auto GroupCall::otherParticipantStateValue() const
 -> rpl::producer<Group::ParticipantState> {
 	return _otherParticipantStateValue.events();
@@ -3527,9 +4245,16 @@ auto GroupCall::otherParticipantStateValue() const
 MTPInputGroupCall GroupCall::inputCall() const {
 	Expects(_id != 0);
 
-	return MTP_inputGroupCall(
-		MTP_long(_id),
-		MTP_long(_accessHash));
+	return MTP_inputGroupCall(MTP_long(_id), MTP_long(_accessHash));
+}
+
+MTPInputGroupCall GroupCall::inputCallSafe() const {
+	const auto inviteMsgId = _conferenceJoinMessageId.bare;
+	return inviteMsgId
+		? MTP_inputGroupCallInviteMessage(MTP_int(inviteMsgId))
+		: _conferenceLinkSlug.isEmpty()
+		? inputCall()
+		: MTP_inputGroupCallSlug(MTP_string(_conferenceLinkSlug));
 }
 
 void GroupCall::destroyController() {
@@ -3537,7 +4262,7 @@ void GroupCall::destroyController() {
 		DEBUG_LOG(("Call Info: Destroying call controller.."));
 		invalidate_weak_ptrs(&_instanceGuard);
 
-		_instance->stop();
+		_instance->stop(nullptr);
 		crl::async([
 			instance = base::take(_instance),
 			done = _delegate->groupCallAddAsyncWaiter()
@@ -3554,7 +4279,7 @@ void GroupCall::destroyScreencast() {
 		DEBUG_LOG(("Call Info: Destroying call screen controller.."));
 		invalidate_weak_ptrs(&_screenInstanceGuard);
 
-		_screenInstance->stop();
+		_screenInstance->stop(nullptr);
 		crl::async([
 			instance = base::take(_screenInstance),
 			done = _delegate->groupCallAddAsyncWaiter()
@@ -3566,4 +4291,87 @@ void GroupCall::destroyScreencast() {
 	}
 }
 
+TextWithEntities ComposeInviteResultToast(
+		const InviteResult &result) {
+	auto text = TextWithEntities();
+	const auto append = [&](TextWithEntities part) {
+		if (!text.empty()) {
+			text.append(u"\n\n"_q);
+		}
+		text.append(part);
+	};
+
+	const auto invited = int(result.invited.size());
+	const auto already = int(result.alreadyIn.size());
+	const auto restricted = int(result.privacyRestricted.size());
+	const auto kicked = int(result.kicked.size());
+	const auto failed = int(result.failed.size());
+	if (invited == 1) {
+		append(tr::lng_confcall_invite_done_user(
+			tr::now,
+			lt_user,
+			tr::bold(result.invited.front()->shortName()),
+			tr::rich));
+	} else if (invited > 1) {
+		append(tr::lng_confcall_invite_done_many(
+			tr::now,
+			lt_count,
+			invited,
+			tr::rich));
+	}
+	if (already == 1) {
+		append(tr::lng_confcall_invite_already_user(
+			tr::now,
+			lt_user,
+			tr::bold(result.alreadyIn.front()->shortName()),
+			tr::rich));
+	} else if (already > 1) {
+		append(tr::lng_confcall_invite_already_many(
+			tr::now,
+			lt_count,
+			already,
+			tr::rich));
+	}
+	if (restricted == 1) {
+		append(tr::lng_confcall_invite_fail_user(
+			tr::now,
+			lt_user,
+			tr::bold(result.privacyRestricted.front()->shortName()),
+			tr::rich));
+	} else if (restricted > 1) {
+		append(tr::lng_confcall_invite_fail_many(
+			tr::now,
+			lt_count,
+			restricted,
+			tr::rich));
+	}
+	if (kicked == 1) {
+		append(tr::lng_confcall_invite_kicked_user(
+			tr::now,
+			lt_user,
+			tr::bold(result.kicked.front()->shortName()),
+			tr::rich));
+	} else if (kicked > 1) {
+		append(tr::lng_confcall_invite_kicked_many(
+			tr::now,
+			lt_count,
+			kicked,
+			tr::rich));
+	}
+	if (failed == 1) {
+		append(tr::lng_confcall_invite_fail_user(
+			tr::now,
+			lt_user,
+			tr::bold(result.failed.front()->shortName()),
+			tr::rich));
+	} else if (failed > 1) {
+		append(tr::lng_confcall_invite_fail_many(
+			tr::now,
+			lt_count,
+			failed,
+			tr::rich));
+	}
+	return text;
+}
+
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/group/calls_group_call.h b/Telegram/SourceFiles/calls/group/calls_group_call.h
index 8f93793bd967fc..4e63e934821f06 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_call.h
@@ -23,6 +23,7 @@ struct GroupLevelsUpdate;
 struct GroupNetworkState;
 struct GroupParticipantDescription;
 class VideoCaptureInterface;
+enum class VideoCodecName;
 } // namespace tgcalls
 
 namespace base {
@@ -40,20 +41,32 @@ namespace Data {
 struct LastSpokeTimes;
 struct GroupCallParticipant;
 class GroupCall;
+enum class GroupCallOrigin : uchar;
 } // namespace Data
 
-namespace Calls {
+namespace TdE2E {
+class Call;
+class EncryptDecrypt;
+} // namespace TdE2E
 
-namespace Group {
+namespace Calls::Group {
 struct MuteRequest;
 struct VolumeRequest;
 struct ParticipantState;
 struct JoinInfo;
+struct ConferenceInfo;
 struct RejoinEvent;
 struct RtmpInfo;
 enum class VideoQuality;
 enum class Error;
-} // namespace Group
+class Messages;
+} // namespace Calls::Group
+
+namespace Calls {
+
+struct InviteRequest;
+struct InviteResult;
+struct StartConferenceInfo;
 
 enum class MuteState {
 	Active,
@@ -194,6 +207,7 @@ class GroupCall final
 			Connecting,
 			AllowedToSpeak,
 			Ended,
+			RecordingStarted,
 		};
 		virtual void groupCallPlaySound(GroupCallSound sound) = 0;
 		virtual auto groupCallGetVideoCapture(const QString &deviceId)
@@ -217,6 +231,7 @@ class GroupCall final
 		not_null<Delegate*> delegate,
 		Group::JoinInfo info,
 		const MTPInputGroupCall &inputCall);
+	GroupCall(not_null<Delegate*> delegate, StartConferenceInfo info);
 	~GroupCall();
 
 	[[nodiscard]] CallId id() const {
@@ -231,12 +246,19 @@ class GroupCall final
 	[[nodiscard]] rpl::producer<not_null<PeerData*>> joinAsValue() const {
 		return _joinAs.value();
 	}
+	[[nodiscard]] not_null<Group::Messages*> messages() const {
+		return _messages.get();
+	}
+	[[nodiscard]] not_null<PeerData*> messagesFrom() const;
 	[[nodiscard]] bool showChooseJoinAs() const;
 	[[nodiscard]] TimeId scheduleDate() const {
 		return _scheduleDate;
 	}
 	[[nodiscard]] bool scheduleStartSubscribed() const;
 	[[nodiscard]] bool rtmp() const;
+	[[nodiscard]] bool conference() const;
+	[[nodiscard]] bool videoStream() const;
+	[[nodiscard]] Data::GroupCallOrigin origin() const;
 	[[nodiscard]] bool listenersHidden() const;
 	[[nodiscard]] bool emptyRtmp() const;
 	[[nodiscard]] rpl::producer<bool> emptyRtmpValue() const;
@@ -247,34 +269,56 @@ class GroupCall final
 	void setRtmpInfo(const Group::RtmpInfo &value);
 
 	[[nodiscard]] Data::GroupCall *lookupReal() const;
+	[[nodiscard]] std::shared_ptr<Data::GroupCall> sharedCall() const;
 	[[nodiscard]] rpl::producer<not_null<Data::GroupCall*>> real() const;
+	[[nodiscard]] rpl::producer<QByteArray> emojiHashValue() const;
 
+	void applyInputCall(const MTPInputGroupCall &inputCall);
+	void startConference();
 	void start(TimeId scheduleDate, bool rtmp);
 	void hangup();
 	void discard();
 	void rejoinAs(Group::JoinInfo info);
 	void rejoinWithHash(const QString &hash);
-	void join(const MTPInputGroupCall &inputCall);
+	void initialJoin();
+	void initialJoinRequested();
 	void handleUpdate(const MTPUpdate &update);
 	void handlePossibleCreateOrJoinResponse(const MTPDupdateGroupCall &data);
 	void handlePossibleCreateOrJoinResponse(
 		const MTPDupdateGroupCallConnection &data);
+	void handleIncomingMessage(const MTPDupdateGroupCallMessage &data);
+	void handleIncomingMessage(
+		const MTPDupdateGroupCallEncryptedMessage &data);
+	void handleDeleteMessages(const MTPDupdateDeleteGroupCallMessages &data);
+	void handleMessageSent(const MTPDupdateMessageID &data);
 	void changeTitle(const QString &title);
 	void toggleRecording(
 		bool enabled,
 		const QString &title,
 		bool video,
 		bool videoPortrait);
+	void playSoundRecordingStarted() const;
 	[[nodiscard]] bool recordingStoppedByMe() const {
 		return _recordingStoppedByMe;
 	}
 	void startScheduledNow();
 	void toggleScheduleStartSubscribed(bool subscribed);
 	void setNoiseSuppression(bool enabled);
+	void removeConferenceParticipants(
+		const base::flat_set<UserId> userIds,
+		bool removingStale = false);
 
 	bool emitShareScreenError();
 	bool emitShareCameraError();
 
+	void joinDone(
+		int64 serverTimeMs,
+		const MTPUpdates &result,
+		MuteState wasMuteState,
+		bool wasVideoStopped,
+		bool justCreated = false);
+	void joinFail(const QString &error);
+
 	[[nodiscard]] rpl::producer<Group::Error> errors() const {
 		return _errors.events();
 	}
@@ -384,6 +428,12 @@ class GroupCall final
 	[[nodiscard]] rpl::producer<bool> videoIsWorkingValue() const {
 		return _videoIsWorking.value();
 	}
+	[[nodiscard]] bool messagesEnabled() const {
+		return _messagesEnabled.current();
+	}
+	[[nodiscard]] rpl::producer<bool> messagesEnabledValue() const {
+		return _messagesEnabled.value();
+	}
 
 	[[nodiscard]] bool isSharingScreen() const;
 	[[nodiscard]] rpl::producer<bool> isSharingScreenValue() const;
@@ -404,8 +454,10 @@ class GroupCall final
 
 	void toggleMute(const Group::MuteRequest &data);
 	void changeVolume(const Group::VolumeRequest &data);
-	std::variant<int, not_null<UserData*>> inviteUsers(
-		const std::vector<not_null<UserData*>> &users);
+
+	void inviteUsers(
+		const std::vector<InviteRequest> &requests,
+		Fn<void(InviteResult)> done);
 
 	std::shared_ptr<GlobalShortcutManager> ensureGlobalShortcutManager();
 	void applyGlobalShortcutChanges();
@@ -413,6 +465,13 @@ class GroupCall final
 	void pushToTalk(bool pressed, crl::time delay);
 	void setNotRequireARGB32();
 
+	[[nodiscard]] std::function<std::vector<uint8_t>(
+		std::vector<uint8_t> const &,
+		int64_t, bool,
+		int32_t)> e2eEncryptDecrypt() const;
+	void sendMessage(TextWithTags message);
+	[[nodiscard]] MTPInputGroupCall inputCall() const;
+
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
@@ -426,6 +485,7 @@ class GroupCall final
 	struct SinkPointer;
 
 	static constexpr uint32 kDisabledSsrc = uint32(-1);
+	static constexpr int kSubChainsCount = 2;
 
 	struct LoadingPart {
 		std::shared_ptr<LoadPartTask> task;
@@ -454,9 +514,14 @@ class GroupCall final
 		Joining,
 		Leaving,
 	};
+	struct JoinPayload {
+		uint32 ssrc = 0;
+		QByteArray json;
+	};
 	struct JoinState {
 		uint32 ssrc = 0;
 		JoinAction action = JoinAction::None;
+		JoinPayload payload;
 		bool nextActionPending = false;
 
 		void finish(uint32 updatedSsrc = 0) {
@@ -464,11 +529,26 @@ class GroupCall final
 			ssrc = updatedSsrc;
 		}
 	};
+	struct SubChainPending {
+		QVector<MTPbytes> blocks;
+		int next = 0;
+	};
+	struct SubChainState {
+		std::vector<SubChainPending> pending;
+		mtpRequestId requestId = 0;
+		bool inShortPoll = false;
+	};
 
 	friend inline constexpr bool is_flag_type(SendUpdateType) {
 		return true;
 	}
 
+	GroupCall(
+		not_null<Delegate*> delegate,
+		Group::JoinInfo join,
+		StartConferenceInfo conference,
+		const MTPInputGroupCall &inputCall);
+
 	void broadcastPartStart(std::shared_ptr<LoadPartTask> task);
 	void broadcastPartCancel(not_null<LoadPartTask*> task);
 	void mediaChannelDescriptionsStart(
@@ -490,6 +570,13 @@ class GroupCall final
 	void handlePossibleDiscarded(const MTPDgroupCallDiscarded &data);
 	void handleUpdate(const MTPDupdateGroupCall &data);
 	void handleUpdate(const MTPDupdateGroupCallParticipants &data);
+	void handleUpdate(const MTPDupdateGroupCallChainBlocks &data);
+	void applySubChainUpdate(
+		int subchain,
+		const QVector<MTPbytes> &blocks,
+		int next);
+	[[nodiscard]] auto lookupVideoCodecPreferences() const
+		-> std::vector<tgcalls::VideoCodecName>;
 	bool tryCreateController();
 	void destroyController();
 	bool tryCreateScreencast();
@@ -508,6 +595,7 @@ class GroupCall final
 		const std::optional<Data::GroupCallParticipant> &was,
 		const Data::GroupCallParticipant &now);
 	void applyMeInCallLocally();
+	void startRejoin();
 	void rejoin();
 	void leave();
 	void rejoin(not_null<PeerData*> as);
@@ -515,9 +603,14 @@ class GroupCall final
 	void saveDefaultJoinAs(not_null<PeerData*> as);
 	void subscribeToReal(not_null<Data::GroupCall*> real);
 	void setScheduledDate(TimeId date);
+	void setMessagesEnabled(bool enabled);
 	void rejoinPresentation();
 	void leavePresentation();
 	void checkNextJoinAction();
+	void sendJoinRequest();
+	void refreshLastBlockAndJoin();
+	void requestSubchainBlocks(int subchain, int height);
+	void sendOutboundBlock(QByteArray block);
 
 	void audioLevelsUpdated(const tgcalls::GroupLevelsUpdate &data);
 	void setInstanceConnected(tgcalls::GroupNetworkState networkState);
@@ -558,6 +651,9 @@ class GroupCall final
 
 	void setupMediaDevices();
 	void setupOutgoingVideo();
+	void initConferenceE2E();
+	void setupConferenceCall();
+	void trackParticipantsWithAccess();
 	void setScreenEndpoint(std::string endpoint);
 	void setCameraEndpoint(std::string endpoint);
 	void addVideoOutput(const std::string &endpoint, SinkPointer sink);
@@ -570,11 +666,25 @@ class GroupCall final
 	void markTrackPaused(const VideoEndpoint &endpoint, bool paused);
 	void markTrackShown(const VideoEndpoint &endpoint, bool shown);
 
+	void processConferenceStart(StartConferenceInfo conference);
+	void inviteToConference(
+		InviteRequest request,
+		Fn<not_null<InviteResult*>()> resultAddress,
+		Fn<void()> finishRequest);
+
+	[[nodiscard]] float64 singleSourceVolumeValue() const;
 	[[nodiscard]] int activeVideoSendersCount() const;
 
-	[[nodiscard]] MTPInputGroupCall inputCall() const;
+	[[nodiscard]] MTPInputGroupCall inputCallSafe() const;
 
 	const not_null<Delegate*> _delegate;
+	std::shared_ptr<Data::GroupCall> _sharedCall;
+	std::unique_ptr<TdE2E::Call> _e2e;
+	std::shared_ptr<TdE2E::EncryptDecrypt> _e2eEncryptDecrypt;
+	rpl::variable<QByteArray> _emojiHash;
+	QByteArray _pendingOutboundBlock;
+	std::shared_ptr<StartConferenceInfo> _startConferenceInfo;
+
 	not_null<PeerData*> _peer; // Can change in legacy group migration.
 	rpl::event_stream<PeerData*> _peerStream;
 	not_null<History*> _history; // Can change in legacy group migration.
@@ -583,6 +693,8 @@ class GroupCall final
 	rpl::variable<State> _state = State::Creating;
 	base::flat_set<uint32> _unresolvedSsrcs;
 	rpl::event_stream<Error> _errors;
+	std::vector<Fn<void()>> _rejoinedCallbacks;
+	const std::unique_ptr<Group::Messages> _messages;
 	bool _recordingStoppedByMe = false;
 	bool _requestedVideoChannelsUpdateScheduled = false;
 
@@ -601,6 +713,8 @@ class GroupCall final
 	rpl::variable<not_null<PeerData*>> _joinAs;
 	std::vector<not_null<PeerData*>> _possibleJoinAs;
 	QString _joinHash;
+	QString _conferenceLinkSlug;
+	MsgId _conferenceJoinMessageId;
 	int64 _serverTimeMs = 0;
 	crl::time _serverTimeMsGotAt = 0;
 
@@ -611,7 +725,9 @@ class GroupCall final
 	rpl::variable<bool> _canManage = false;
 	rpl::variable<bool> _videoIsWorking = false;
 	rpl::variable<bool> _emptyRtmp = false;
+	rpl::variable<bool> _messagesEnabled = false;
 	bool _initialMuteStateSent = false;
+	bool _systemMuteReconciled = false;
 	bool _acceptFields = false;
 
 	rpl::event_stream<Group::ParticipantState> _otherParticipantStateValue;
@@ -686,10 +802,15 @@ class GroupCall final
 	bool _listenersHidden = false;
 	bool _rtmp = false;
 	bool _reloadedStaleCall = false;
-	int _rtmpVolume = 0;
+	int _singleSourceVolume = 0;
+
+	SubChainState _subchains[kSubChainsCount];
 
 	rpl::lifetime _lifetime;
 
 };
 
+[[nodiscard]] TextWithEntities ComposeInviteResultToast(
+	const InviteResult &result);
+
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/group/calls_group_common.cpp b/Telegram/SourceFiles/calls/group/calls_group_common.cpp
index 487629893f94ca..6ea98ef9d419b1 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_common.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_common.cpp
@@ -7,13 +7,42 @@ For license and copyright information please follow this link:
 */
 #include "calls/group/calls_group_common.h"
 
+#include "apiwrap.h"
 #include "base/platform/base_platform_info.h"
+#include "base/random.h"
+#include "boxes/peers/replace_boost_box.h" // CreateUserpicsWithMoreBadge
+#include "boxes/share_box.h"
+#include "calls/calls_instance.h"
+#include "core/application.h"
+#include "core/local_url_handlers.h"
+#include "data/data_group_call.h"
+#include "data/data_session.h"
+#include "info/bot/starref/info_bot_starref_common.h"
+#include "tde2e/tde2e_api.h"
+#include "tde2e/tde2e_integration.h"
+#include "ui/boxes/boost_box.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/painter.h"
+#include "ui/vertical_list.h"
 #include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "window/window_session_controller.h"
+#include "styles/style_info.h"
 #include "styles/style_layers.h"
+#include "styles/style_media_view.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_calls.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+
+#include <QtWidgets/QApplication>
+#include <QtGui/QClipboard>
 
 namespace Calls::Group {
 
@@ -30,8 +59,8 @@ object_ptr<Ui::GenericBox> ScreenSharingPrivacyRequestBox() {
 					tr::lng_group_call_mac_screencast_access(),
 					tr::lng_group_call_mac_recording()
 				) | rpl::map([](QString a, QString b) {
-					auto result = Ui::Text::RichLangValue(a);
-					result.append("\n\n").append(Ui::Text::RichLangValue(b));
+					auto result = tr::rich(a);
+					result.append("\n\n").append(tr::rich(b));
 					return result;
 				}),
 				st::groupCallBoxLabel),
@@ -50,4 +79,456 @@ object_ptr<Ui::GenericBox> ScreenSharingPrivacyRequestBox() {
 #endif // Q_OS_MAC
 }
 
+void ShowUniqueCaptureOptions(
+		std::shared_ptr<Ui::Show> show,
+		Fn<void(bool withAudio)> done) {
+	show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(tr::lng_group_call_sharing_screen_options());
+		const auto withAudio = box->addRow(
+			object_ptr<Ui::Checkbox>(
+				box,
+				tr::lng_group_call_screen_share_audio(tr::now),
+				false,
+				st::groupCallCheckbox));
+		box->addButton(
+			tr::lng_group_call_choose_source(),
+			[=] {
+				const auto audio = withAudio->checked();
+				box->closeBox();
+				done(audio);
+			});
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	}));
+}
+
+object_ptr<Ui::RpWidget> MakeRoundActiveLogo(
+		not_null<QWidget*> parent,
+		const style::icon &icon,
+		const style::margins &padding) {
+	const auto logoSize = icon.size();
+	const auto logoOuter = logoSize.grownBy(padding);
+	auto result = object_ptr<Ui::RpWidget>(parent);
+	const auto logo = result.data();
+	logo->resize(logo->width(), logoOuter.height());
+	logo->paintRequest() | rpl::on_next([=, &icon] {
+		if (logo->width() < logoOuter.width()) {
+			return;
+		}
+		auto p = QPainter(logo);
+		auto hq = PainterHighQualityEnabler(p);
+		const auto x = (logo->width() - logoOuter.width()) / 2;
+		const auto outer = QRect(QPoint(x, 0), logoOuter);
+		p.setBrush(st::windowBgActive);
+		p.setPen(Qt::NoPen);
+		p.drawEllipse(outer);
+		icon.paintInCenter(p, outer);
+	}, logo->lifetime());
+	return result;
+}
+
+object_ptr<Ui::RpWidget> MakeJoinCallLogo(not_null<QWidget*> parent) {
+	return MakeRoundActiveLogo(
+		parent,
+		st::confcallJoinLogo,
+		st::confcallJoinLogoPadding);
+}
+
+void ConferenceCallJoinConfirm(
+		not_null<Ui::GenericBox*> box,
+		std::shared_ptr<Data::GroupCall> call,
+		UserData *maybeInviter,
+		Fn<void(Fn<void()> close)> join) {
+	box->setStyle(st::confcallJoinBox);
+	box->setWidth(st::boxWideWidth);
+	box->setNoContentMargin(true);
+	box->addTopButton(st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+
+	box->addRow(
+		MakeJoinCallLogo(box),
+		st::boxRowPadding + st::confcallLinkHeaderIconPadding);
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_confcall_join_title(),
+			st::boxTitle),
+		st::boxRowPadding + st::confcallLinkTitlePadding,
+		style::al_top);
+	const auto wrapName = [&](not_null<PeerData*> peer) {
+		return rpl::single(tr::bold(peer->shortName()));
+	};
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			(maybeInviter
+				? tr::lng_confcall_join_text_inviter(
+					lt_user,
+					wrapName(maybeInviter),
+					tr::rich)
+				: tr::lng_confcall_join_text(tr::rich)),
+			st::confcallLinkCenteredText),
+		st::boxRowPadding,
+		style::al_top
+	)->setTryMakeSimilarLines(true);
+
+	const auto &participants = call->participants();
+	const auto known = int(participants.size());
+	if (known) {
+		const auto sep = box->addRow(
+			object_ptr<Ui::RpWidget>(box),
+			st::boxRowPadding + st::confcallJoinSepPadding);
+		sep->resize(sep->width(), st::normalFont->height);
+		sep->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(sep);
+			const auto line = st::lineWidth;
+			const auto top = st::confcallLinkFooterOrLineTop;
+			const auto fg = st::windowSubTextFg->b;
+			p.setOpacity(0.2);
+			p.fillRect(0, top, sep->width(), line, fg);
+		}, sep->lifetime());
+
+		auto peers = std::vector<not_null<PeerData*>>();
+		for (const auto &participant : participants) {
+			peers.push_back(participant.peer);
+			if (peers.size() == 3) {
+				break;
+			}
+		}
+		box->addRow(
+			CreateUserpicsWithMoreBadge(
+				box,
+				rpl::single(peers),
+				st::confcallJoinUserpics,
+				known),
+			st::boxRowPadding + st::confcallJoinUserpicsPadding);
+
+		const auto wrapByIndex = [&](int index) {
+			Expects(index >= 0 && index < known);
+
+			return wrapName(participants[index].peer);
+		};
+		auto text = (known == 1)
+			? tr::lng_confcall_already_joined_one(
+				lt_user,
+				wrapByIndex(0),
+				tr::rich)
+			: (known == 2)
+			? tr::lng_confcall_already_joined_two(
+				lt_user,
+				wrapByIndex(0),
+				lt_other,
+				wrapByIndex(1),
+				tr::rich)
+			: (known == 3)
+			? tr::lng_confcall_already_joined_three(
+				lt_user,
+				wrapByIndex(0),
+				lt_other,
+				wrapByIndex(1),
+				lt_third,
+				wrapByIndex(2),
+				tr::rich)
+			: tr::lng_confcall_already_joined_many(
+				lt_count,
+				rpl::single(1. * (std::max(known, call->fullCount()) - 2)),
+				lt_user,
+				wrapByIndex(0),
+				lt_other,
+				wrapByIndex(1),
+				tr::rich);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				std::move(text),
+				st::confcallLinkCenteredText),
+			st::boxRowPadding,
+			style::al_top
+		)->setTryMakeSimilarLines(true);
+	}
+	box->addButton(tr::lng_confcall_join_button(), [=] {
+		join([weak = base::make_weak(box)] {
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		});
+	});
+}
+
+ConferenceCallLinkStyleOverrides DarkConferenceCallLinkStyle() {
+	return {
+		.box = &st::groupCallLinkBox,
+		.menuToggle = &st::groupCallLinkMenu,
+		.menu = &st::groupCallPopupMenuWithIcons,
+		.close = &st::storiesStealthBoxClose,
+		.centerLabel = &st::groupCallLinkCenteredText,
+		.linkPreview = &st::groupCallLinkPreview,
+		.contextRevoke = &st::mediaMenuIconRemove,
+		.shareBox = std::make_shared<ShareBoxStyleOverrides>(
+			DarkShareBoxStyle()),
+	};
+}
+
+void ShowConferenceCallLinkBox(
+		std::shared_ptr<Main::SessionShow> show,
+		std::shared_ptr<Data::GroupCall> call,
+		const ConferenceCallLinkArgs &args) {
+	const auto st = args.st;
+	const auto initial = args.initial;
+	const auto link = call->conferenceInviteLink();
+	show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+		struct State {
+			base::unique_qptr<Ui::PopupMenu> menu;
+			bool resetting = false;
+		};
+		const auto state = box->lifetime().make_state<State>();
+
+		box->setStyle(st.box
+			? *st.box
+			: initial
+			? st::confcallLinkBoxInitial
+			: st::confcallLinkBox);
+		box->setWidth(st::boxWideWidth);
+		box->setNoContentMargin(true);
+		const auto close = box->addTopButton(
+			st.close ? *st.close : st::boxTitleClose,
+			[=] { box->closeBox(); });
+
+		if (!args.initial && call->canManage()) {
+			const auto toggle = Ui::CreateChild<Ui::IconButton>(
+				close->parentWidget(),
+				st.menuToggle ? *st.menuToggle : st::boxTitleMenu);
+			const auto handler = [=] {
+				if (state->resetting) {
+					return;
+				}
+				state->resetting = true;
+				using Flag = MTPphone_ToggleGroupCallSettings::Flag;
+				const auto weak = base::make_weak(box);
+				call->session().api().request(
+					MTPphone_ToggleGroupCallSettings(
+						MTP_flags(Flag::f_reset_invite_hash),
+						call->input(),
+						MTPBool(), // join_muted
+						MTPBool(), // messages_enabled
+						MTPlong()) // send_paid_messages_stars
+				).done([=](const MTPUpdates &result) {
+					call->session().api().applyUpdates(result);
+					ShowConferenceCallLinkBox(show, call, args);
+					if (const auto strong = weak.get()) {
+						strong->closeBox();
+					}
+					show->showToast({
+						.title = tr::lng_confcall_link_revoked_title(
+							tr::now),
+						.text = {
+							tr::lng_confcall_link_revoked_text(tr::now),
+						},
+					});
+				}).send();
+			};
+			toggle->setClickedCallback([=] {
+				state->menu = base::make_unique_q<Ui::PopupMenu>(
+					toggle,
+					st.menu ? *st.menu : st::popupMenuWithIcons);
+				state->menu->addAction(
+					tr::lng_confcall_link_revoke(tr::now),
+					handler,
+					(st.contextRevoke
+						? st.contextRevoke
+						: &st::menuIconRemove));
+				state->menu->popup(QCursor::pos());
+			});
+
+			close->geometryValue(
+			) | rpl::on_next([=](QRect geometry) {
+				toggle->moveToLeft(
+					geometry.x() - toggle->width(),
+					geometry.y());
+			}, close->lifetime());
+		}
+
+		box->addRow(
+			Info::BotStarRef::CreateLinkHeaderIcon(box, &call->session()),
+			st::boxRowPadding + st::confcallLinkHeaderIconPadding);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_confcall_link_title(),
+				st.box ? st.box->title : st::boxTitle),
+			st::boxRowPadding + st::confcallLinkTitlePadding,
+			style::al_top);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_confcall_link_about(),
+				(st.centerLabel
+					? *st.centerLabel
+					: st::confcallLinkCenteredText)),
+			st::boxRowPadding,
+			style::al_top
+		)->setTryMakeSimilarLines(true);
+
+		Ui::AddSkip(box->verticalLayout(), st::defaultVerticalListSkip * 2);
+		const auto preview = box->addRow(
+			Info::BotStarRef::MakeLinkLabel(box, link, st.linkPreview));
+		Ui::AddSkip(box->verticalLayout());
+
+		const auto copyCallback = [=] {
+			QApplication::clipboard()->setText(link);
+			show->showToast({
+				.text = { tr::lng_username_copied(tr::now) },
+				.iconLottie = u"toast/voip_invite"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		};
+		const auto shareCallback = [=] {
+			FastShareLink(
+				show,
+				link,
+				st.shareBox ? *st.shareBox : ShareBoxStyleOverrides());
+		};
+		preview->setClickedCallback(copyCallback);
+		const auto share = box->addButton(
+			tr::lng_group_invite_share(),
+			shareCallback,
+			st::confcallLinkShareButton);
+		const auto copy = box->addButton(
+			tr::lng_group_invite_copy(),
+			copyCallback,
+			st::confcallLinkCopyButton);
+
+		rpl::combine(
+			box->widthValue(),
+			copy->widthValue(),
+			share->widthValue()
+		) | rpl::on_next([=] {
+			const auto width = st::boxWideWidth;
+			const auto padding = st::confcallLinkBox.buttonPadding;
+			const auto available = width - 2 * padding.right();
+			const auto buttonWidth = (available - padding.left()) / 2;
+			copy->resizeToWidth(buttonWidth);
+			share->resizeToWidth(buttonWidth);
+			copy->moveToLeft(padding.right(), copy->y(), width);
+			share->moveToRight(padding.right(), share->y(), width);
+		}, box->lifetime());
+
+		if (!initial) {
+			return;
+		}
+
+		const auto sep = Ui::CreateChild<Ui::FlatLabel>(
+			copy->parentWidget(),
+			tr::lng_confcall_link_or(),
+			st::confcallLinkFooterOr);
+		sep->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(sep);
+			const auto text = sep->textMaxWidth();
+			const auto white = (sep->width() - 2 * text) / 2;
+			const auto line = st::lineWidth;
+			const auto top = st::confcallLinkFooterOrLineTop;
+			const auto fg = st::windowSubTextFg->b;
+			p.setOpacity(0.4);
+			p.fillRect(0, top, white, line, fg);
+			p.fillRect(sep->width() - white, top, white, line, fg);
+		}, sep->lifetime());
+
+		const auto footer = Ui::CreateChild<Ui::FlatLabel>(
+			copy->parentWidget(),
+			tr::lng_confcall_link_join(
+				lt_link,
+				tr::lng_confcall_link_join_link(
+					lt_arrow,
+					rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+					[](QString v) { return tr::link(v); }),
+				tr::marked),
+			(st.centerLabel
+				? *st.centerLabel
+				: st::confcallLinkCenteredText));
+		footer->setTryMakeSimilarLines(true);
+		footer->setClickHandlerFilter([=](const auto &...) {
+			if (auto slug = ExtractConferenceSlug(link); !slug.isEmpty()) {
+				Core::App().calls().startOrJoinConferenceCall({
+					.call = call,
+					.linkSlug = std::move(slug),
+				});
+			}
+			return false;
+		});
+		copy->geometryValue() | rpl::on_next([=](QRect geometry) {
+			const auto width = st::boxWideWidth
+				- st::boxRowPadding.left()
+				- st::boxRowPadding.right();
+			footer->resizeToWidth(width);
+			const auto top = geometry.y()
+				+ geometry.height()
+				+ st::confcallLinkFooterOrTop;
+			sep->resizeToWidth(width / 2);
+			sep->move(
+				st::boxRowPadding.left() + (width - sep->width()) / 2,
+				top);
+			footer->moveToLeft(
+				st::boxRowPadding.left(),
+				top + sep->height() + st::confcallLinkFooterOrSkip);
+		}, footer->lifetime());
+	}));
+}
+
+void MakeConferenceCall(ConferenceFactoryArgs &&args) {
+	const auto show = std::move(args.show);
+	const auto finished = std::move(args.finished);
+	const auto session = &show->session();
+	const auto fail = [=](QString error) {
+		show->showToast(error);
+		if (const auto onstack = finished) {
+			onstack(false);
+		}
+	};
+	session->api().request(MTPphone_CreateConferenceCall(
+		MTP_flags(0),
+		MTP_int(base::RandomValue<int32>()),
+		MTPint256(), // public_key
+		MTPbytes(), // block
+		MTPDataJSON() // params
+	)).done([=](const MTPUpdates &result) {
+		auto call = session->data().sharedConferenceCallFind(result);
+		if (!call) {
+			fail(u"Call not found!"_q);
+			return;
+		}
+		session->api().applyUpdates(result);
+
+		const auto link = call ? call->conferenceInviteLink() : QString();
+		if (link.isEmpty()) {
+			fail(u"Call link not found!"_q);
+			return;
+		}
+		Calls::Group::ShowConferenceCallLinkBox(
+			show,
+			call,
+			{ .initial = true });
+		if (const auto onstack = finished) {
+			finished(true);
+		}
+	}).fail([=](const MTP::Error &error) {
+		fail(error.type());
+	}).send();
+}
+
+QString ExtractConferenceSlug(const QString &link) {
+	const auto local = Core::TryConvertUrlToLocal(link);
+	const auto parts1 = QStringView(local).split('#');
+	if (!parts1.isEmpty()) {
+		const auto parts2 = parts1.front().split('&');
+		if (!parts2.isEmpty()) {
+			const auto parts3 = parts2.front().split(u"slug="_q);
+			if (parts3.size() > 1) {
+				return parts3.back().toString();
+			}
+		}
+	}
+	return QString();
+}
+
 } // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_common.h b/Telegram/SourceFiles/calls/group/calls_group_common.h
index 670378aa7453e5..a75872c4bd50b4 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_common.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_common.h
@@ -8,13 +8,81 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "base/object_ptr.h"
+#include "base/weak_ptr.h"
 
 class UserData;
+struct ShareBoxStyleOverrides;
+
+namespace style {
+struct Box;
+struct FlatLabel;
+struct IconButton;
+struct InputField;
+struct PopupMenu;
+} // namespace style
+
+namespace Data {
+class GroupCall;
+} // namespace Data
+
+namespace Main {
+class SessionShow;
+} // namespace Main
 
 namespace Ui {
+class Show;
+class RpWidget;
 class GenericBox;
 } // namespace Ui
 
+namespace TdE2E {
+class Call;
+} // namespace TdE2E
+
+namespace tgcalls {
+class VideoCaptureInterface;
+} // namespace tgcalls
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Calls {
+
+class Window;
+
+struct InviteRequest {
+	not_null<UserData*> user;
+	bool video = false;
+};
+
+struct InviteResult {
+	std::vector<not_null<UserData*>> invited;
+	std::vector<not_null<UserData*>> alreadyIn;
+	std::vector<not_null<UserData*>> privacyRestricted;
+	std::vector<not_null<UserData*>> kicked;
+	std::vector<not_null<UserData*>> failed;
+};
+
+struct StartConferenceInfo {
+	std::shared_ptr<Main::SessionShow> show;
+	std::shared_ptr<Data::GroupCall> call;
+	QString linkSlug;
+	MsgId joinMessageId;
+	std::vector<InviteRequest> invite;
+	bool sharingLink = false;
+	bool migrating = false;
+	bool muted = false;
+	std::shared_ptr<tgcalls::VideoCaptureInterface> videoCapture;
+	QString videoCaptureScreenId;
+};
+
+struct ConferencePanelMigration {
+	std::shared_ptr<Window> window;
+};
+
+} // namespace Calls
+
 namespace Calls::Group {
 
 constexpr auto kDefaultVolume = 10000;
@@ -64,6 +132,7 @@ struct JoinInfo {
 enum class PanelMode {
 	Default,
 	Wide,
+	VideoStream,
 };
 
 enum class VideoQuality {
@@ -93,4 +162,52 @@ using StickedTooltips = base::flags<StickedTooltip>;
 
 [[nodiscard]] object_ptr<Ui::GenericBox> ScreenSharingPrivacyRequestBox();
 
+void ShowUniqueCaptureOptions(
+	std::shared_ptr<Ui::Show> show,
+	Fn<void(bool withAudio)> done);
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeRoundActiveLogo(
+	not_null<QWidget*> parent,
+	const style::icon &icon,
+	const style::margins &padding);
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeJoinCallLogo(
+	not_null<QWidget*> parent);
+
+void ConferenceCallJoinConfirm(
+	not_null<Ui::GenericBox*> box,
+	std::shared_ptr<Data::GroupCall> call,
+	UserData *maybeInviter,
+	Fn<void(Fn<void()> close)> join);
+
+struct ConferenceCallLinkStyleOverrides {
+	const style::Box *box = nullptr;
+	const style::IconButton *menuToggle = nullptr;
+	const style::PopupMenu *menu = nullptr;
+	const style::IconButton *close = nullptr;
+	const style::FlatLabel *centerLabel = nullptr;
+	const style::InputField *linkPreview = nullptr;
+	const style::icon *contextRevoke = nullptr;
+	std::shared_ptr<ShareBoxStyleOverrides> shareBox;
+};
+[[nodiscard]] ConferenceCallLinkStyleOverrides DarkConferenceCallLinkStyle();
+
+struct ConferenceCallLinkArgs {
+	ConferenceCallLinkStyleOverrides st;
+	bool initial = false;
+};
+void ShowConferenceCallLinkBox(
+	std::shared_ptr<Main::SessionShow> show,
+	std::shared_ptr<Data::GroupCall> call,
+	const ConferenceCallLinkArgs &args);
+
+struct ConferenceFactoryArgs {
+	std::shared_ptr<Main::SessionShow> show;
+	Fn<void(bool)> finished;
+	bool joining = false;
+	StartConferenceInfo info;
+};
+void MakeConferenceCall(ConferenceFactoryArgs &&args);
+
+[[nodiscard]] QString ExtractConferenceSlug(const QString &link);
+
 } // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
index bb8c908559fe68..537e7d3ed9196a 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
@@ -9,20 +9,35 @@ For license and copyright information please follow this link:
 
 #include "api/api_chat_participants.h"
 #include "calls/group/calls_group_call.h"
+#include "calls/group/calls_group_common.h"
 #include "calls/group/calls_group_menu.h"
+#include "calls/calls_call.h"
+#include "calls/calls_instance.h"
+#include "core/application.h"
 #include "boxes/peer_lists_box.h"
 #include "data/data_user.h"
 #include "data/data_channel.h"
 #include "data/data_session.h"
 #include "data/data_group_call.h"
+#include "info/profile/info_profile_icon.h"
+#include "main/session/session_show.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
+#include "ui/effects/ripple_animation.h"
 #include "ui/text/text_utilities.h"
 #include "ui/layers/generic_box.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/painter.h"
+#include "ui/vertical_list.h"
 #include "apiwrap.h"
 #include "lang/lang_keys.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h" // membersMarginTop
 #include "styles/style_calls.h"
 #include "styles/style_dialogs.h" // searchedBarHeight
+#include "styles/style_layers.h" // boxWideWidth
 
 namespace Calls::Group {
 namespace {
@@ -36,7 +51,7 @@ namespace {
 
 	const auto raw = result.data();
 	raw->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(raw);
 		p.fillRect(clip, st::groupCallMembersBgOver);
 	}, raw->lifetime());
@@ -46,7 +61,7 @@ namespace {
 		std::move(text),
 		st::groupCallBoxLabel);
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto padding = st::groupCallInviteDividerPadding;
 		const auto available = width - padding.left() - padding.right();
 		label->resizeToNaturalWidth(available);
@@ -56,6 +71,627 @@ namespace {
 	return result;
 }
 
+struct ConfInviteStyles {
+	const style::IconButton *video = nullptr;
+	const style::icon *videoActive = nullptr;
+	const style::IconButton *audio = nullptr;
+	const style::icon *audioActive = nullptr;
+	const style::SettingsButton *inviteViaLink = nullptr;
+	const style::icon *inviteViaLinkIcon = nullptr;
+};
+
+class ConfInviteRow final : public PeerListRow {
+public:
+	ConfInviteRow(not_null<UserData*> user, const ConfInviteStyles &st);
+
+	void setAlreadyIn(bool alreadyIn);
+	void setVideo(bool video);
+
+	int elementsCount() const override;
+	QRect elementGeometry(int element, int outerWidth) const override;
+	bool elementDisabled(int element) const override;
+	bool elementOnlySelect(int element) const override;
+	void elementAddRipple(
+		int element,
+		QPoint point,
+		Fn<void()> updateCallback) override;
+	void elementsStopLastRipple() override;
+	void elementsPaint(
+		Painter &p,
+		int outerWidth,
+		bool selected,
+		int selectedElement) override;
+
+private:
+	[[nodiscard]] const style::IconButton &buttonSt(int element) const;
+
+	const ConfInviteStyles &_st;
+	std::unique_ptr<Ui::RippleAnimation> _videoRipple;
+	std::unique_ptr<Ui::RippleAnimation> _audioRipple;
+	bool _alreadyIn = false;
+	bool _video = false;
+
+};
+
+struct PrioritizedSelector {
+	object_ptr<Ui::RpWidget> content = { nullptr };
+	Fn<void()> init;
+	Fn<bool(int, int, int)> overrideKey;
+	Fn<void(PeerListRowId)> deselect;
+	Fn<void()> activate;
+	rpl::producer<Ui::ScrollToRequest> scrollToRequests;
+};
+
+class ConfInviteController final : public ContactsBoxController {
+public:
+	ConfInviteController(
+		not_null<Main::Session*> session,
+		ConfInviteStyles st,
+		base::flat_set<not_null<UserData*>> alreadyIn,
+		Fn<void()> shareLink,
+		std::vector<not_null<UserData*>> prioritize);
+
+	[[nodiscard]] rpl::producer<bool> hasSelectedValue() const;
+	[[nodiscard]] std::vector<InviteRequest> requests(
+		const std::vector<not_null<PeerData*>> &peers) const;
+
+	void noSearchSubmit();
+	[[nodiscard]] auto prioritizeScrollRequests() const
+		-> rpl::producer<Ui::ScrollToRequest>;
+
+protected:
+	void prepareViewHook() override;
+
+	std::unique_ptr<PeerListRow> createRow(
+		not_null<UserData*> user) override;
+
+	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowElementClicked(not_null<PeerListRow*> row, int element) override;
+	bool handleDeselectForeignRow(PeerListRowId itemId) override;
+
+	bool overrideKeyboardNavigation(
+			int direction,
+			int fromIndex,
+			int toIndex) override;
+private:
+	[[nodiscard]] int fullCount() const;
+	void toggleRowSelected(not_null<PeerListRow*> row, bool video);
+	[[nodiscard]] bool toggleRowGetChecked(
+		not_null<PeerListRow*> row,
+		bool video);
+	void addShareLinkButton();
+	void addPriorityInvites();
+
+	const ConfInviteStyles _st;
+	const base::flat_set<not_null<UserData*>> _alreadyIn;
+	const std::vector<not_null<UserData*>> _prioritize;
+	const Fn<void()> _shareLink;
+	PrioritizedSelector _prioritizeRows;
+	rpl::event_stream<Ui::ScrollToRequest> _prioritizeScrollRequests;
+	base::flat_set<not_null<UserData*>> _skip;
+	rpl::variable<bool> _hasSelected;
+	base::flat_set<not_null<UserData*>> _withVideo;
+	bool _lastSelectWithVideo = false;
+
+};
+
+[[nodiscard]] ConfInviteStyles ConfInviteDarkStyles() {
+	return {
+		.video = &st::confcallInviteVideo,
+		.videoActive = &st::confcallInviteVideoActive,
+		.audio = &st::confcallInviteAudio,
+		.audioActive = &st::confcallInviteAudioActive,
+		.inviteViaLink = &st::groupCallInviteLink,
+		.inviteViaLinkIcon = &st::groupCallInviteLinkIcon,
+	};
+}
+
+[[nodiscard]] ConfInviteStyles ConfInviteDefaultStyles() {
+	return {
+		.video = &st::createCallVideo,
+		.videoActive = &st::createCallVideoActive,
+		.audio = &st::createCallAudio,
+		.audioActive = &st::createCallAudioActive,
+		.inviteViaLink = &st::createCallInviteLink,
+		.inviteViaLinkIcon = &st::createCallInviteLinkIcon,
+	};
+}
+
+ConfInviteRow::ConfInviteRow(not_null<UserData*> user, const ConfInviteStyles &st)
+: PeerListRow(user)
+, _st(st) {
+}
+
+void ConfInviteRow::setAlreadyIn(bool alreadyIn) {
+	_alreadyIn = alreadyIn;
+	setDisabledState(alreadyIn ? State::DisabledChecked : State::Active);
+}
+
+void ConfInviteRow::setVideo(bool video) {
+	_video = video;
+}
+
+const style::IconButton &ConfInviteRow::buttonSt(int element) const {
+	return (element == 1)
+		? (_st.video ? *_st.video : st::createCallVideo)
+		: (_st.audio ? *_st.audio : st::createCallAudio);
+}
+
+int ConfInviteRow::elementsCount() const {
+	return _alreadyIn ? 0 : 2;
+}
+
+QRect ConfInviteRow::elementGeometry(int element, int outerWidth) const {
+	if (_alreadyIn || (element != 1 && element != 2)) {
+		return QRect();
+	}
+	const auto &st = buttonSt(element);
+	const auto size = QSize(st.width, st.height);
+	const auto margins = (element == 1)
+		? st::createCallVideoMargins
+		: st::createCallAudioMargins;
+	const auto right = margins.right();
+	const auto top = margins.top();
+	const auto side = (element == 1)
+		? outerWidth
+		: elementGeometry(1, outerWidth).x();
+	const auto left = side - right - size.width();
+	return QRect(QPoint(left, top), size);
+}
+
+bool ConfInviteRow::elementDisabled(int element) const {
+	return _alreadyIn
+		|| (checked()
+			&& ((_video && element == 1) || (!_video && element == 2)));
+}
+
+bool ConfInviteRow::elementOnlySelect(int element) const {
+	return false;
+}
+
+void ConfInviteRow::elementAddRipple(
+		int element,
+		QPoint point,
+		Fn<void()> updateCallback) {
+	if (_alreadyIn || (element != 1 && element != 2)) {
+		return;
+	}
+	auto &ripple = (element == 1) ? _videoRipple : _audioRipple;
+	const auto &st = buttonSt(element);
+	if (!ripple) {
+		auto mask = Ui::RippleAnimation::EllipseMask(QSize(
+				st.rippleAreaSize,
+				st.rippleAreaSize));
+		ripple = std::make_unique<Ui::RippleAnimation>(
+			st.ripple,
+			std::move(mask),
+			std::move(updateCallback));
+	}
+	ripple->add(point - st.rippleAreaPosition);
+}
+
+void ConfInviteRow::elementsStopLastRipple() {
+	if (_videoRipple) {
+		_videoRipple->lastStop();
+	}
+	if (_audioRipple) {
+		_audioRipple->lastStop();
+	}
+}
+
+void ConfInviteRow::elementsPaint(
+		Painter &p,
+		int outerWidth,
+		bool selected,
+		int selectedElement) {
+	if (_alreadyIn) {
+		return;
+	}
+	const auto paintElement = [&](int element) {
+		const auto &st = buttonSt(element);
+		auto &ripple = (element == 1) ? _videoRipple : _audioRipple;
+		const auto active = checked() && ((element == 1) ? _video : !_video);
+		const auto geometry = elementGeometry(element, outerWidth);
+		if (ripple) {
+			ripple->paint(
+				p,
+				geometry.x() + st.rippleAreaPosition.x(),
+				geometry.y() + st.rippleAreaPosition.y(),
+				outerWidth);
+			if (ripple->empty()) {
+				ripple.reset();
+			}
+		}
+		const auto selected = (element == selectedElement);
+		const auto &icon = active
+			? (element == 1
+				? (_st.videoActive
+					? *_st.videoActive
+					: st::createCallVideoActive)
+				: (_st.audioActive
+					? *_st.audioActive
+					: st::createCallAudioActive))
+			: (selected ? st.iconOver : st.icon);
+		icon.paintInCenter(p, geometry);
+	};
+	paintElement(1);
+	paintElement(2);
+}
+
+[[nodiscard]] PrioritizedSelector PrioritizedInviteSelector(
+		const ConfInviteStyles &st,
+		std::vector<not_null<UserData*>> users,
+		Fn<bool(not_null<PeerListRow*>, bool, anim::type)> toggleGetChecked,
+		Fn<bool()> lastSelectWithVideo,
+		Fn<void(bool)> setLastSelectWithVideo) {
+	class PrioritizedController final : public PeerListController {
+	public:
+		PrioritizedController(
+			const ConfInviteStyles &st,
+			std::vector<not_null<UserData*>> users,
+			Fn<bool(
+				not_null<PeerListRow*>,
+				bool,
+				anim::type)> toggleGetChecked,
+			Fn<bool()> lastSelectWithVideo,
+			Fn<void(bool)> setLastSelectWithVideo)
+		: _st(st)
+		, _users(std::move(users))
+		, _toggleGetChecked(std::move(toggleGetChecked))
+		, _lastSelectWithVideo(std::move(lastSelectWithVideo))
+		, _setLastSelectWithVideo(std::move(setLastSelectWithVideo)) {
+			Expects(!_users.empty());
+		}
+
+		void prepare() override {
+			for (const auto &user : _users) {
+				delegate()->peerListAppendRow(
+					std::make_unique<ConfInviteRow>(user, _st));
+			}
+			delegate()->peerListRefreshRows();
+		}
+		void loadMoreRows() override {
+		}
+		void rowClicked(not_null<PeerListRow*> row) override {
+			toggleRowSelected(row, _lastSelectWithVideo());
+		}
+		void rowElementClicked(
+				not_null<PeerListRow*> row,
+				int element) override {
+			if (row->checked()) {
+				static_cast<ConfInviteRow*>(row.get())->setVideo(
+					element == 1);
+				_setLastSelectWithVideo(element == 1);
+			} else if (element == 1) {
+				toggleRowSelected(row, true);
+			} else if (element == 2) {
+				toggleRowSelected(row, false);
+			}
+		}
+
+		void toggleRowSelected(not_null<PeerListRow*> row, bool video) {
+			delegate()->peerListSetRowChecked(
+				row,
+				_toggleGetChecked(row, video, anim::type::normal));
+		}
+
+		Main::Session &session() const override {
+			return _users.front()->session();
+		}
+
+		void toggleFirst() {
+			rowClicked(delegate()->peerListRowAt(0));
+		}
+
+	private:
+		const ConfInviteStyles &_st;
+		std::vector<not_null<UserData*>> _users;
+		Fn<bool(not_null<PeerListRow*>, bool, anim::type)> _toggleGetChecked;
+		Fn<bool()> _lastSelectWithVideo;
+		Fn<void(bool)> _setLastSelectWithVideo;
+
+	};
+
+	auto result = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	const auto container = result.data();
+
+	const auto delegate = container->lifetime().make_state<
+		PeerListContentDelegateSimple
+	>();
+	const auto controller = container->lifetime(
+	).make_state<PrioritizedController>(
+		st,
+		users,
+		toggleGetChecked,
+		lastSelectWithVideo,
+		setLastSelectWithVideo);
+	controller->setStyleOverrides(&st::createCallList);
+	const auto content = container->add(object_ptr<PeerListContent>(
+		container,
+		controller));
+	const auto activate = [=] {
+		content->submitted();
+	};
+	content->noSearchSubmits() | rpl::on_next([=] {
+		controller->toggleFirst();
+	}, content->lifetime());
+
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
+
+	Ui::AddDivider(container);
+
+	const auto overrideKey = [=](int direction, int from, int to) {
+		if (!content->isVisible()) {
+			return false;
+		} else if (direction > 0 && from < 0 && to >= 0) {
+			if (content->hasSelection()) {
+				const auto was = content->selectedIndex();
+				const auto now = content->selectSkip(1).reallyMovedTo;
+				if (was != now) {
+					return true;
+				}
+				content->clearSelection();
+			} else {
+				content->selectSkip(1);
+				return true;
+			}
+		} else if (direction < 0 && to < 0) {
+			if (!content->hasSelection()) {
+				content->selectLast();
+			} else if (from >= 0 || content->hasSelection()) {
+				content->selectSkip(-1);
+			}
+		}
+		return false;
+	};
+
+	const auto deselect = [=](PeerListRowId rowId) {
+		if (const auto row = delegate->peerListFindRow(rowId)) {
+			delegate->peerListSetRowChecked(row, false);
+		}
+	};
+
+	const auto init = [=] {
+		for (const auto &user : users) {
+			if (const auto row = delegate->peerListFindRow(user->id.value)) {
+				delegate->peerListSetRowChecked(
+					row,
+					toggleGetChecked(row, false, anim::type::instant));
+			}
+		}
+	};
+
+	return {
+		.content = std::move(result),
+		.init = init,
+		.overrideKey = overrideKey,
+		.deselect = deselect,
+		.activate = activate,
+		.scrollToRequests = content->scrollToRequests(),
+	};
+}
+
+ConfInviteController::ConfInviteController(
+	not_null<Main::Session*> session,
+	ConfInviteStyles st,
+	base::flat_set<not_null<UserData*>> alreadyIn,
+	Fn<void()> shareLink,
+	std::vector<not_null<UserData*>> prioritize)
+: ContactsBoxController(session)
+, _st(st)
+, _alreadyIn(std::move(alreadyIn))
+, _prioritize(std::move(prioritize))
+, _shareLink(std::move(shareLink)) {
+	if (!_shareLink) {
+		_skip.reserve(_prioritize.size());
+		for (const auto &user : _prioritize) {
+			_skip.emplace(user);
+		}
+	}
+}
+
+rpl::producer<bool> ConfInviteController::hasSelectedValue() const {
+	return _hasSelected.value();
+}
+
+std::vector<InviteRequest> ConfInviteController::requests(
+		const std::vector<not_null<PeerData*>> &peers) const {
+	auto result = std::vector<InviteRequest>();
+	result.reserve(peers.size());
+	for (const auto &peer : peers) {
+		if (const auto user = peer->asUser()) {
+			result.push_back({ user, _withVideo.contains(user) });
+		}
+	}
+	return result;
+}
+
+std::unique_ptr<PeerListRow> ConfInviteController::createRow(
+		not_null<UserData*> user) {
+	if (user->isSelf()
+		|| user->isBot()
+		|| user->isServiceUser()
+		|| user->isInaccessible()
+		|| _skip.contains(user)) {
+		return nullptr;
+	}
+	auto result = std::make_unique<ConfInviteRow>(user, _st);
+	if (_alreadyIn.contains(user)) {
+		result->setAlreadyIn(true);
+	}
+	if (_withVideo.contains(user)) {
+		result->setVideo(true);
+	}
+	return result;
+}
+
+int ConfInviteController::fullCount() const {
+	return _alreadyIn.size()
+		+ delegate()->peerListSelectedRowsCount()
+		+ (_alreadyIn.contains(session().user()) ? 1 : 0);
+}
+
+void ConfInviteController::rowClicked(not_null<PeerListRow*> row) {
+	toggleRowSelected(row, _lastSelectWithVideo);
+}
+
+void ConfInviteController::rowElementClicked(
+		not_null<PeerListRow*> row,
+		int element) {
+	if (row->checked()) {
+		static_cast<ConfInviteRow*>(row.get())->setVideo(element == 1);
+		_lastSelectWithVideo = (element == 1);
+	} else if (element == 1) {
+		toggleRowSelected(row, true);
+	} else if (element == 2) {
+		toggleRowSelected(row, false);
+	}
+}
+
+bool ConfInviteController::handleDeselectForeignRow(PeerListRowId itemId) {
+	if (_prioritizeRows.deselect) {
+		const auto userId = peerToUser(PeerId(itemId));
+		if (ranges::contains(_prioritize, session().data().user(userId))) {
+			_prioritizeRows.deselect(itemId);
+			return true;
+		}
+	}
+	return false;
+}
+
+bool ConfInviteController::overrideKeyboardNavigation(
+		int direction,
+		int fromIndex,
+		int toIndex) {
+	return _prioritizeRows.overrideKey
+		&& _prioritizeRows.overrideKey(direction, fromIndex, toIndex);
+}
+
+void ConfInviteController::toggleRowSelected(
+		not_null<PeerListRow*> row,
+		bool video) {
+	delegate()->peerListSetRowChecked(row, toggleRowGetChecked(row, video));
+
+	// row may have been destroyed here, from search.
+	_hasSelected = (delegate()->peerListSelectedRowsCount() > 0);
+}
+
+bool ConfInviteController::toggleRowGetChecked(
+		not_null<PeerListRow*> row,
+		bool video) {
+	auto count = fullCount();
+	const auto conferenceLimit = session().appConfig().confcallSizeLimit();
+	if (!row->checked() && count >= conferenceLimit) {
+		delegate()->peerListUiShow()->showToast(
+			tr::lng_group_call_invite_limit(tr::now));
+		return false;
+	}
+	const auto real = static_cast<ConfInviteRow*>(row.get());
+	if (!row->checked()) {
+		real->setVideo(video);
+		_lastSelectWithVideo = video;
+	}
+	const auto user = row->peer()->asUser();
+	if (!row->checked() && video) {
+		_withVideo.emplace(user);
+	} else {
+		_withVideo.remove(user);
+	}
+	return !row->checked();
+}
+
+void ConfInviteController::noSearchSubmit() {
+	if (const auto onstack = _prioritizeRows.activate) {
+		onstack();
+	} else if (delegate()->peerListFullRowsCount() > 0) {
+		rowClicked(delegate()->peerListRowAt(0));
+	}
+}
+
+auto ConfInviteController::prioritizeScrollRequests() const
+-> rpl::producer<Ui::ScrollToRequest> {
+	return _prioritizeScrollRequests.events();
+}
+
+void ConfInviteController::prepareViewHook() {
+	if (_shareLink) {
+		addShareLinkButton();
+	} else if (!_prioritize.empty()) {
+		addPriorityInvites();
+	}
+}
+
+void ConfInviteController::addPriorityInvites() {
+	const auto toggleGetChecked = [=](
+			not_null<PeerListRow*> row,
+			bool video,
+			anim::type animated) {
+		const auto result = toggleRowGetChecked(row, video);
+		delegate()->peerListSetForeignRowChecked(
+			row,
+			result,
+			animated);
+
+		_hasSelected = (delegate()->peerListSelectedRowsCount() > 0);
+
+		return result;
+	};
+	_prioritizeRows = PrioritizedInviteSelector(
+		_st,
+		_prioritize,
+		toggleGetChecked,
+		[=] { return _lastSelectWithVideo; },
+		[=](bool video) { _lastSelectWithVideo = video; });
+	if (auto &scrollTo = _prioritizeRows.scrollToRequests) {
+		std::move(
+			scrollTo
+		) | rpl::start_to_stream(_prioritizeScrollRequests, lifetime());
+	}
+	if (const auto onstack = _prioritizeRows.init) {
+		onstack();
+
+		// Force finishing in instant adding checked rows bunch.
+		delegate()->peerListAddSelectedPeers(
+			std::vector<not_null<PeerData*>>());
+	}
+	delegate()->peerListSetAboveWidget(std::move(_prioritizeRows.content));
+}
+
+void ConfInviteController::addShareLinkButton() {
+	auto button = object_ptr<Ui::PaddingWrap<Ui::SettingsButton>>(
+		nullptr,
+		object_ptr<Ui::SettingsButton>(
+			nullptr,
+			tr::lng_profile_add_via_link(),
+			(_st.inviteViaLink
+				? *_st.inviteViaLink
+				: st::createCallInviteLink)),
+		style::margins(0, st::membersMarginTop, 0, 0));
+
+	const auto icon = Ui::CreateChild<Info::Profile::FloatingIcon>(
+		button->entity(),
+		(_st.inviteViaLinkIcon
+			? *_st.inviteViaLinkIcon
+			: st::createCallInviteLinkIcon),
+		QPoint());
+	button->entity()->heightValue(
+	) | rpl::on_next([=](int height) {
+		icon->moveToLeft(
+			st::createCallInviteLinkIconPosition.x(),
+			(height - st::groupCallInviteLinkIcon.height()) / 2);
+	}, icon->lifetime());
+
+	button->entity()->setClickedCallback(_shareLink);
+	button->entity()->events(
+	) | rpl::filter([=](not_null<QEvent*> e) {
+		return (e->type() == QEvent::Enter);
+	}) | rpl::on_next([=] {
+		delegate()->peerListMouseLeftGeometry();
+	}, button->lifetime());
+	delegate()->peerListSetAboveWidget(std::move(button));
+}
+
 } // namespace
 
 InviteController::InviteController(
@@ -111,7 +747,9 @@ std::unique_ptr<PeerListRow> InviteController::createRow(
 		|| user->isInaccessible()) {
 		return nullptr;
 	}
-	auto result = std::make_unique<PeerListRow>(user);
+	auto result = std::make_unique<Row>(
+		user,
+		Type{ .chatStyle = _chatStyle.get(), .circleCache = &_pillCircleCache });
 	_rowAdded.fire_copy(user);
 	_inGroup.emplace(user);
 	if (isAlreadyIn(user)) {
@@ -151,7 +789,7 @@ void InviteContactsController::prepareViewHook() {
 
 	std::move(
 		_discoveredInGroup
-	) | rpl::start_with_next([=](not_null<UserData*> user) {
+	) | rpl::on_next([=](not_null<UserData*> user) {
 		if (auto row = delegate()->peerListFindRow(user->id.value)) {
 			delegate()->peerListRemoveRow(row);
 		}
@@ -167,19 +805,73 @@ std::unique_ptr<PeerListRow> InviteContactsController::createRow(
 
 object_ptr<Ui::BoxContent> PrepareInviteBox(
 		not_null<GroupCall*> call,
-		Fn<void(TextWithEntities&&)> showToast) {
+		Fn<void(TextWithEntities&&)> showToast,
+		Fn<void()> shareConferenceLink) {
 	const auto real = call->lookupReal();
 	if (!real) {
 		return nullptr;
 	}
 	const auto peer = call->peer();
-	auto alreadyIn = peer->owner().invitedToCallUsers(real->id());
+	const auto conference = call->conference();
+	const auto weak = base::make_weak(call);
+	const auto &invited = peer->owner().invitedToCallUsers(real->id());
+	auto alreadyIn = base::flat_set<not_null<UserData*>>();
+	alreadyIn.reserve(invited.size() + real->participants().size() + 1);
+	alreadyIn.emplace(peer->session().user());
 	for (const auto &participant : real->participants()) {
 		if (const auto user = participant.peer->asUser()) {
 			alreadyIn.emplace(user);
 		}
 	}
-	alreadyIn.emplace(peer->session().user());
+	for (const auto &[user, calling] : invited) {
+		if (!conference || calling) {
+			alreadyIn.emplace(user);
+		}
+	}
+	if (conference) {
+		const auto close = std::make_shared<Fn<void()>>();
+		const auto shareLink = [=] {
+			Expects(shareConferenceLink != nullptr);
+
+			shareConferenceLink();
+			(*close)();
+		};
+		auto controller = std::make_unique<ConfInviteController>(
+			&real->session(),
+			ConfInviteDarkStyles(),
+			alreadyIn,
+			shareLink,
+			std::vector<not_null<UserData*>>());
+		const auto raw = controller.get();
+		raw->setStyleOverrides(
+			&st::groupCallInviteMembersList,
+			&st::groupCallMultiSelect);
+		auto initBox = [=](not_null<PeerListBox*> box) {
+			box->setTitle(tr::lng_group_call_invite_conf());
+			raw->hasSelectedValue() | rpl::on_next([=](bool has) {
+				box->clearButtons();
+				if (has) {
+					box->addButton(tr::lng_group_call_confcall_add(), [=] {
+						const auto call = weak.get();
+						if (!call) {
+							return;
+						}
+						const auto done = [=](InviteResult result) {
+							(*close)();
+							showToast({ ComposeInviteResultToast(result) });
+						};
+						call->inviteUsers(
+							raw->requests(box->collectSelectedRows()),
+							done);
+					});
+				}
+				box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+			}, box->lifetime());
+			*close = crl::guard(box, [=] { box->closeBox(); });
+		};
+		return Box<PeerListBox>(std::move(controller), initBox);
+	}
+
 	auto controller = std::make_unique<InviteController>(peer, alreadyIn);
 	controller->setStyleOverrides(
 		&st::groupCallInviteMembersList,
@@ -194,30 +886,31 @@ object_ptr<Ui::BoxContent> PrepareInviteBox(
 		&st::groupCallInviteMembersList,
 		&st::groupCallMultiSelect);
 
-	const auto weak = base::make_weak(call);
 	const auto invite = [=](const std::vector<not_null<UserData*>> &users) {
 		const auto call = weak.get();
 		if (!call) {
 			return;
 		}
-		const auto result = call->inviteUsers(users);
-		if (const auto user = std::get_if<not_null<UserData*>>(&result)) {
-			showToast(tr::lng_group_call_invite_done_user(
-				tr::now,
-				lt_user,
-				Ui::Text::Bold((*user)->firstName),
-				Ui::Text::WithEntities));
-		} else if (const auto count = std::get_if<int>(&result)) {
-			if (*count > 0) {
+		auto requests = ranges::views::all(
+			users
+		) | ranges::views::transform([](not_null<UserData*> user) {
+			return InviteRequest{ user };
+		}) | ranges::to_vector;
+		call->inviteUsers(std::move(requests), [=](InviteResult result) {
+			if (result.invited.size() == 1) {
+				showToast(tr::lng_group_call_invite_done_user(
+					tr::now,
+					lt_user,
+					tr::bold(result.invited.front()->firstName),
+					tr::marked));
+			} else if (result.invited.size() > 1) {
 				showToast(tr::lng_group_call_invite_done_many(
 					tr::now,
 					lt_count,
-					*count,
-					Ui::Text::RichLangValue));
+					result.invited.size(),
+					tr::rich));
 			}
-		} else {
-			Unexpected("Result in GroupCall::inviteUsers.");
-		}
+		});
 	};
 	const auto inviteWithAdd = [=](
 			std::shared_ptr<Ui::Show> show,
@@ -252,7 +945,7 @@ object_ptr<Ui::BoxContent> PrepareInviteBox(
 			: (nonMembers.size() < users.size())
 			? tr::lng_group_call_add_to_group_some(tr::now, lt_group, name)
 			: tr::lng_group_call_add_to_group_all(tr::now, lt_group, name);
-		const auto shared = std::make_shared<QPointer<Ui::GenericBox>>();
+		const auto shared = std::make_shared<base::weak_qptr<Ui::GenericBox>>();
 		const auto finishWithConfirm = [=] {
 			if (*shared) {
 				(*shared)->closeBox();
@@ -292,7 +985,7 @@ object_ptr<Ui::BoxContent> PrepareInviteBox(
 				return !controller->hasRowFor(user);
 			}) | ranges::to_vector;
 
-			const auto finish = [box = Ui::MakeWeak(box)]() {
+			const auto finish = [box = base::make_weak(box)]() {
 				if (box) {
 					box->closeBox();
 				}
@@ -308,4 +1001,215 @@ object_ptr<Ui::BoxContent> PrepareInviteBox(
 	return Box<PeerListsBox>(std::move(controllers), initBox);
 }
 
+object_ptr<Ui::BoxContent> PrepareInviteBox(
+		not_null<Call*> call,
+		Fn<void(std::vector<InviteRequest>)> inviteUsers,
+		Fn<void()> shareLink) {
+	const auto user = call->user();
+	const auto weak = base::make_weak(call);
+	auto alreadyIn = base::flat_set<not_null<UserData*>>{ user };
+	auto controller = std::make_unique<ConfInviteController>(
+		&user->session(),
+		ConfInviteDarkStyles(),
+		alreadyIn,
+		shareLink,
+		std::vector<not_null<UserData*>>());
+	const auto raw = controller.get();
+	raw->setStyleOverrides(
+		&st::groupCallInviteMembersList,
+		&st::groupCallMultiSelect);
+	auto initBox = [=](not_null<PeerListBox*> box) {
+		box->setTitle(tr::lng_group_call_invite_conf());
+		raw->hasSelectedValue() | rpl::on_next([=](bool has) {
+			box->clearButtons();
+			if (has) {
+				box->addButton(tr::lng_group_call_invite_button(), [=] {
+					const auto call = weak.get();
+					if (!call) {
+						return;
+					}
+					inviteUsers(raw->requests(box->collectSelectedRows()));
+				});
+			}
+			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+		}, box->lifetime());
+	};
+	return Box<PeerListBox>(std::move(controller), initBox);
+}
+
+not_null<Ui::RpWidget*> CreateReActivateHeader(not_null<QWidget*> parent) {
+	const auto result = Ui::CreateChild<Ui::VerticalLayout>(parent);
+	result->add(
+		MakeJoinCallLogo(result),
+		st::boxRowPadding + st::confcallLinkHeaderIconPadding);
+
+	result->add(
+		object_ptr<Ui::FlatLabel>(
+			result,
+			tr::lng_confcall_inactive_title(),
+			st::boxTitle),
+		st::boxRowPadding + st::confcallLinkTitlePadding,
+		style::al_top);
+	result->add(
+		object_ptr<Ui::FlatLabel>(
+			result,
+			tr::lng_confcall_inactive_about(),
+			st::confcallLinkCenteredText),
+		st::boxRowPadding + st::confcallLinkTitlePadding,
+		style::al_top
+	)->setTryMakeSimilarLines(true);
+	Ui::AddDivider(result);
+
+	return result;
+}
+
+void InitReActivate(not_null<PeerListBox*> box) {
+	box->setTitle(rpl::producer<TextWithEntities>(nullptr));
+	box->setNoContentMargin(true);
+
+	const auto header = CreateReActivateHeader(box);
+	header->resizeToWidth(st::boxWideWidth);
+	header->heightValue() | rpl::on_next([=](int height) {
+		box->setAddedTopScrollSkip(height, true);
+	}, header->lifetime());
+	header->moveToLeft(0, 0);
+}
+
+object_ptr<Ui::BoxContent> PrepareInviteToEmptyBox(
+		std::shared_ptr<Data::GroupCall> call,
+		MsgId inviteMsgId,
+		std::vector<not_null<UserData*>> prioritize) {
+	auto controller = std::make_unique<ConfInviteController>(
+		&call->session(),
+		ConfInviteDefaultStyles(),
+		base::flat_set<not_null<UserData*>>(),
+		nullptr,
+		std::move(prioritize));
+	const auto raw = controller.get();
+	raw->setStyleOverrides(&st::createCallList);
+	const auto initBox = [=](not_null<PeerListBox*> box) {
+		InitReActivate(box);
+
+		box->noSearchSubmits() | rpl::on_next([=] {
+			raw->noSearchSubmit();
+		}, box->lifetime());
+
+		raw->prioritizeScrollRequests(
+		) | rpl::on_next([=](Ui::ScrollToRequest request) {
+			box->scrollTo(request);
+		}, box->lifetime());
+
+		const auto join = [=] {
+			const auto weak = base::make_weak(box);
+			auto selected = raw->requests(box->collectSelectedRows());
+			Core::App().calls().startOrJoinConferenceCall({
+				.call = call,
+				.joinMessageId = inviteMsgId,
+				.invite = std::move(selected),
+			});
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		};
+		box->addButton(
+			rpl::conditional(
+				raw->hasSelectedValue(),
+				tr::lng_group_call_confcall_add(),
+				tr::lng_create_group_create()),
+			join);
+		box->addButton(tr::lng_close(), [=] {
+			box->closeBox();
+		});
+	};
+	return Box<PeerListBox>(std::move(controller), initBox);
+}
+
+object_ptr<Ui::BoxContent> PrepareCreateCallBox(
+		not_null<::Window::SessionController*> window,
+		Fn<void()> created,
+		MsgId discardedInviteMsgId,
+		std::vector<not_null<UserData*>> prioritize) {
+	struct State {
+		bool creatingLink = false;
+		QPointer<PeerListBox> box;
+	};
+	const auto state = std::make_shared<State>();
+	const auto finished = [=](bool ok) {
+		if (!ok) {
+			state->creatingLink = false;
+		} else {
+			if (const auto strong = state->box.data()) {
+				strong->closeBox();
+			}
+			if (const auto onstack = created) {
+				onstack();
+			}
+		}
+	};
+	const auto shareLink = [=] {
+		if (state->creatingLink) {
+			return;
+		}
+		state->creatingLink = true;
+		MakeConferenceCall({
+			.show = window->uiShow(),
+			.finished = finished,
+		});
+	};
+	auto controller = std::make_unique<ConfInviteController>(
+		&window->session(),
+		ConfInviteDefaultStyles(),
+		base::flat_set<not_null<UserData*>>(),
+		discardedInviteMsgId ? Fn<void()>() : shareLink,
+		std::move(prioritize));
+	const auto raw = controller.get();
+	if (discardedInviteMsgId) {
+		raw->setStyleOverrides(&st::createCallList);
+	}
+	const auto initBox = [=](not_null<PeerListBox*> box) {
+		if (discardedInviteMsgId) {
+			InitReActivate(box);
+		} else {
+			box->setTitle(tr::lng_confcall_create_title());
+		}
+
+		box->noSearchSubmits() | rpl::on_next([=] {
+			raw->noSearchSubmit();
+		}, box->lifetime());
+
+		raw->prioritizeScrollRequests(
+		) | rpl::on_next([=](Ui::ScrollToRequest request) {
+			box->scrollTo(request);
+		}, box->lifetime());
+
+		const auto create = [=] {
+			auto selected = raw->requests(box->collectSelectedRows());
+			if (selected.size() != 1 || discardedInviteMsgId) {
+				Core::App().calls().startOrJoinConferenceCall({
+					.show = window->uiShow(),
+					.invite = std::move(selected),
+				});
+			} else {
+				const auto &invite = selected.front();
+				Core::App().calls().startOutgoingCall(
+					invite.user,
+					{ invite.video });
+			}
+			finished(true);
+		};
+		box->addButton(
+			rpl::conditional(
+				raw->hasSelectedValue(),
+				tr::lng_group_call_confcall_add(),
+				tr::lng_create_group_create()),
+			create);
+		box->addButton(tr::lng_close(), [=] {
+			box->closeBox();
+		});
+	};
+	auto result = Box<PeerListBox>(std::move(controller), initBox);
+	state->box = result.data();
+	return result;
+}
+
 } // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.h b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.h
index e1e10ff4e7aeae..cbfac6af3e26b0 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.h
@@ -11,9 +11,15 @@ For license and copyright information please follow this link:
 #include "boxes/peers/add_participants_box.h"
 
 namespace Calls {
+class Call;
 class GroupCall;
+struct InviteRequest;
 } // namespace Calls
 
+namespace Data {
+class GroupCall;
+} // namespace Data
+
 namespace Calls::Group {
 
 class InviteController final : public ParticipantsBoxController {
@@ -77,6 +83,23 @@ class InviteContactsController final : public AddParticipantsBoxController {
 
 [[nodiscard]] object_ptr<Ui::BoxContent> PrepareInviteBox(
 	not_null<GroupCall*> call,
-	Fn<void(TextWithEntities&&)> showToast);
+	Fn<void(TextWithEntities&&)> showToast,
+	Fn<void()> shareConferenceLink = nullptr);
+
+[[nodiscard]] object_ptr<Ui::BoxContent> PrepareInviteBox(
+	not_null<Call*> call,
+	Fn<void(std::vector<InviteRequest>)> inviteUsers,
+	Fn<void()> shareLink);
+
+[[nodiscard]] object_ptr<Ui::BoxContent> PrepareInviteToEmptyBox(
+	std::shared_ptr<Data::GroupCall> call,
+	MsgId inviteMsgId,
+	std::vector<not_null<UserData*>> prioritize);
+
+[[nodiscard]] object_ptr<Ui::BoxContent> PrepareCreateCallBox(
+	not_null<::Window::SessionController*> window,
+	Fn<void()> created = nullptr,
+	MsgId discardedInviteMsgId = 0,
+	std::vector<not_null<UserData*>> prioritize = {});
 
 } // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_members.cpp b/Telegram/SourceFiles/calls/group/calls_group_members.cpp
index 2853340a532f4e..c3e4328e90063f 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_members.cpp
@@ -13,6 +13,8 @@ For license and copyright information please follow this link:
 #include "calls/group/calls_volume_item.h"
 #include "calls/group/calls_group_members_row.h"
 #include "calls/group/calls_group_viewport.h"
+#include "calls/calls_emoji_fingerprint.h"
+#include "calls/calls_instance.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_user.h"
@@ -107,6 +109,9 @@ class Members::Controller final
 	[[nodiscard]] std::unique_ptr<Row> createRow(
 		const Data::GroupCallParticipant &participant);
 	[[nodiscard]] std::unique_ptr<Row> createInvitedRow(
+		not_null<PeerData*> participantPeer,
+		bool calling);
+	[[nodiscard]] std::unique_ptr<Row> createWithAccessRow(
 		not_null<PeerData*> participantPeer);
 
 	[[nodiscard]] bool isMe(not_null<PeerData*> participantPeer) const;
@@ -128,7 +133,8 @@ class Members::Controller final
 	void updateRow(
 		not_null<Row*> row,
 		const std::optional<Data::GroupCallParticipant> &was,
-		const Data::GroupCallParticipant *participant);
+		const Data::GroupCallParticipant *participant,
+		Row::State noParticipantState = Row::State::Invited);
 	void updateRowInSoundingMap(
 		not_null<Row*> row,
 		bool wasSounding,
@@ -162,8 +168,13 @@ class Members::Controller final
 		const VideoEndpoint &endpoint,
 		bool active);
 
-	void appendInvitedUsers();
+	void partitionRows();
+	void setupInvitedUsers();
+	[[nodiscard]] bool appendInvitedUsers();
+	void setupWithAccessUsers();
+	[[nodiscard]] bool appendWithAccessUsers();
 	void scheduleRaisedHandStatusRemove();
+	void refreshWithAccessRows(base::flat_set<UserId> &&nowIds);
 
 	void hideRowsWithVideoExcept(const VideoEndpoint &large);
 	void showAllHiddenRows();
@@ -205,6 +216,8 @@ class Members::Controller final
 	Ui::RoundRect _narrowRoundRect;
 	QImage _narrowShadow;
 
+	base::flat_set<UserId> _withAccess;
+
 	rpl::lifetime _lifetime;
 
 };
@@ -228,7 +241,7 @@ Members::Controller::Controller(
 	st::groupCallMembersBgOver)
 , _narrowRoundRect(ImageRoundRadius::Large, st::groupCallMembersBg) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_inactiveCrossLine.invalidate();
 		_coloredCrossLine.invalidate();
 		_inactiveNarrowCrossLine.invalidate();
@@ -238,7 +251,7 @@ Members::Controller::Controller(
 	rpl::combine(
 		PowerSaving::OnValue(PowerSaving::kCalls),
 		Core::App().appDeactivatedValue()
-	) | rpl::start_with_next([=](bool disabled, bool deactivated) {
+	) | rpl::on_next([=](bool disabled, bool deactivated) {
 		const auto hide = disabled || deactivated;
 
 		if (!(hide && _soundingAnimationHideLastTime)) {
@@ -271,7 +284,7 @@ Members::Controller::Controller(
 
 	_peer->session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::About
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		if (const auto row = findRow(update.peer)) {
 			row->setAbout(update.peer->about());
 		}
@@ -284,12 +297,12 @@ Members::Controller::~Controller() {
 
 void Members::Controller::setupListChangeViewers() {
 	_call->real(
-	) | rpl::start_with_next([=](not_null<Data::GroupCall*> real) {
+	) | rpl::on_next([=](not_null<Data::GroupCall*> real) {
 		subscribeToChanges(real);
 	}, _lifetime);
 
 	_call->levelUpdates(
-	) | rpl::start_with_next([=](const LevelUpdate &update) {
+	) | rpl::on_next([=](const LevelUpdate &update) {
 		const auto i = _soundingRowBySsrc.find(update.ssrc);
 		if (i != end(_soundingRowBySsrc)) {
 			updateRowLevel(i->second, update.value);
@@ -297,7 +310,7 @@ void Members::Controller::setupListChangeViewers() {
 	}, _lifetime);
 
 	_call->videoEndpointLargeValue(
-	) | rpl::start_with_next([=](const VideoEndpoint &large) {
+	) | rpl::on_next([=](const VideoEndpoint &large) {
 		if (large) {
 			hideRowsWithVideoExcept(large);
 		} else {
@@ -309,7 +322,7 @@ void Members::Controller::setupListChangeViewers() {
 	) | rpl::filter([=](const VideoStateToggle &update) {
 		const auto &large = _call->videoEndpointLarge();
 		return large && (update.endpoint != large);
-	}) | rpl::start_with_next([=](const VideoStateToggle &update) {
+	}) | rpl::on_next([=](const VideoStateToggle &update) {
 		if (update.value) {
 			hideRowWithVideo(update.endpoint);
 		} else {
@@ -318,7 +331,7 @@ void Members::Controller::setupListChangeViewers() {
 	}, _lifetime);
 
 	_call->rejoinEvents(
-	) | rpl::start_with_next([=](const Group::RejoinEvent &event) {
+	) | rpl::on_next([=](const Group::RejoinEvent &event) {
 		const auto guard = gsl::finally([&] {
 			delegate()->peerListRefreshRows();
 		});
@@ -398,13 +411,13 @@ void Members::Controller::subscribeToChanges(not_null<Data::GroupCall*> real) {
 	_fullCount = real->fullCountValue();
 
 	real->participantsReloaded(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		prepareRows(real);
 	}, _lifetime);
 
 	using Update = Data::GroupCall::ParticipantUpdate;
 	real->participantUpdated(
-	) | rpl::start_with_next([=](const Update &update) {
+	) | rpl::on_next([=](const Update &update) {
 		Expects(update.was.has_value() || update.now.has_value());
 
 		const auto participantPeer = update.was
@@ -414,6 +427,9 @@ void Members::Controller::subscribeToChanges(not_null<Data::GroupCall*> real) {
 			if (const auto row = findRow(participantPeer)) {
 				if (isMe(participantPeer)) {
 					updateRow(row, update.was, nullptr);
+				} else if (_withAccess.contains(peerToUser(participantPeer->id))) {
+					updateRow(row, update.was, nullptr, Row::State::WithAccess);
+					partitionRows();
 				} else {
 					removeRow(row);
 					delegate()->peerListRefreshRows();
@@ -428,13 +444,9 @@ void Members::Controller::subscribeToChanges(not_null<Data::GroupCall*> real) {
 		toggleVideoEndpointActive(endpoint, true);
 	}
 	_call->videoStreamActiveUpdates(
-	) | rpl::start_with_next([=](const VideoStateToggle &update) {
+	) | rpl::on_next([=](const VideoStateToggle &update) {
 		toggleVideoEndpointActive(update.endpoint, update.value);
 	}, _lifetime);
-
-	if (_prepared) {
-		appendInvitedUsers();
-	}
 }
 
 void Members::Controller::toggleVideoEndpointActive(
@@ -481,13 +493,22 @@ void Members::Controller::toggleVideoEndpointActive(
 
 }
 
-void Members::Controller::appendInvitedUsers() {
+bool Members::Controller::appendInvitedUsers() {
+	auto changed = false;
 	if (const auto id = _call->id()) {
-		for (const auto &user : _peer->owner().invitedToCallUsers(id)) {
-			if (auto row = createInvitedRow(user)) {
+		const auto &invited = _peer->owner().invitedToCallUsers(id);
+		for (const auto &[user, calling] : invited) {
+			if (auto row = createInvitedRow(user, calling)) {
 				delegate()->peerListAppendRow(std::move(row));
+				changed = true;
 			}
 		}
+	}
+	return changed;
+}
+
+void Members::Controller::setupInvitedUsers() {
+	if (appendInvitedUsers()) {
 		delegate()->peerListRefreshRows();
 	}
 
@@ -495,23 +516,99 @@ void Members::Controller::appendInvitedUsers() {
 	_peer->owner().invitesToCalls(
 	) | rpl::filter([=](const Invite &invite) {
 		return (invite.id == _call->id());
-	}) | rpl::start_with_next([=](const Invite &invite) {
-		if (auto row = createInvitedRow(invite.user)) {
+	}) | rpl::on_next([=](const Invite &invite) {
+		const auto user = invite.user;
+		if (invite.removed) {
+			if (const auto row = findRow(user)) {
+				if (row->state() == Row::State::Invited
+					|| row->state() == Row::State::Calling) {
+					delegate()->peerListRemoveRow(row);
+					delegate()->peerListRefreshRows();
+				}
+			}
+		} else if (auto row = createInvitedRow(user, invite.calling)) {
 			delegate()->peerListAppendRow(std::move(row));
 			delegate()->peerListRefreshRows();
 		}
 	}, _lifetime);
 }
 
+bool Members::Controller::appendWithAccessUsers() {
+	auto changed = false;
+	for (const auto id : _withAccess) {
+		if (auto row = createWithAccessRow(_peer->owner().user(id))) {
+			changed = true;
+			delegate()->peerListAppendRow(std::move(row));
+		}
+	}
+	return changed;
+}
+
+void Members::Controller::setupWithAccessUsers() {
+	const auto conference = _call->sharedCall().get();
+	if (!_call->conference() || !conference) {
+		return;
+	}
+	conference->participantsWithAccessValue(
+	) | rpl::on_next([=](base::flat_set<UserId> &&nowIds) {
+		for (auto i = begin(_withAccess); i != end(_withAccess);) {
+			const auto oldId = *i;
+			if (nowIds.remove(oldId)) {
+				++i;
+				continue;
+			}
+			const auto user = _peer->owner().user(oldId);
+			if (const auto row = findRow(user)) {
+				if (row->state() == Row::State::WithAccess) {
+					removeRow(row);
+				}
+			}
+			i = _withAccess.erase(i);
+		}
+		auto partition = false;
+		auto partitionChecked = false;
+		for (const auto nowId : nowIds) {
+			const auto user = _peer->owner().user(nowId);
+			if (!findRow(user)) {
+				if (auto row = createWithAccessRow(user)) {
+					if (!partitionChecked) {
+						partitionChecked = true;
+						if (const auto count = delegate()->peerListFullRowsCount()) {
+							const auto last = delegate()->peerListRowAt(count - 1);
+							const auto state = static_cast<Row*>(last.get())->state();
+							if (state == Row::State::Invited
+								|| state == Row::State::Calling) {
+								partition = true;
+							}
+						}
+					}
+					delegate()->peerListAppendRow(std::move(row));
+				}
+			}
+			_withAccess.emplace(nowId);
+		}
+		if (partition) {
+			delegate()->peerListPartitionRows([](const PeerListRow &row) {
+				const auto state = static_cast<const Row&>(row).state();
+				return (state != Row::State::Invited)
+					&& (state != Row::State::Calling);
+			});
+		}
+		delegate()->peerListRefreshRows();
+	}, _lifetime);
+}
+
 void Members::Controller::updateRow(
 		const std::optional<Data::GroupCallParticipant> &was,
 		const Data::GroupCallParticipant &now) {
-	auto reorderIfInvitedBefore = 0;
+	auto reorderIfNonRealBefore = 0;
 	auto checkPosition = (Row*)nullptr;
 	auto addedToBottom = (Row*)nullptr;
 	if (const auto row = findRow(now.peer)) {
-		if (row->state() == Row::State::Invited) {
-			reorderIfInvitedBefore = row->absoluteIndex();
+		if (row->state() == Row::State::Invited
+			|| row->state() == Row::State::Calling
+			|| row->state() == Row::State::WithAccess) {
+			reorderIfNonRealBefore = row->absoluteIndex();
 		}
 		updateRow(row, was, &now);
 		if ((now.speaking && (!was || !was->speaking))
@@ -523,7 +620,7 @@ void Members::Controller::updateRow(
 		if (row->speaking()) {
 			delegate()->peerListPrependRow(std::move(row));
 		} else {
-			reorderIfInvitedBefore = delegate()->peerListFullRowsCount();
+			reorderIfNonRealBefore = delegate()->peerListFullRowsCount();
 			if (now.raisedHandRating != 0) {
 				checkPosition = row.get();
 			} else {
@@ -533,20 +630,21 @@ void Members::Controller::updateRow(
 		}
 		delegate()->peerListRefreshRows();
 	}
-	static constexpr auto kInvited = Row::State::Invited;
 	const auto reorder = [&] {
-		const auto count = reorderIfInvitedBefore;
+		const auto count = reorderIfNonRealBefore;
 		if (count <= 0) {
 			return false;
 		}
 		const auto row = delegate()->peerListRowAt(
-			reorderIfInvitedBefore - 1).get();
-		return (static_cast<Row*>(row)->state() == kInvited);
+			reorderIfNonRealBefore - 1).get();
+		using State = Row::State;
+		const auto state = static_cast<Row*>(row)->state();
+		return (state == State::Invited)
+			|| (state == State::Calling)
+			|| (state == State::WithAccess);
 	}();
 	if (reorder) {
-		delegate()->peerListPartitionRows([](const PeerListRow &row) {
-			return static_cast<const Row&>(row).state() != kInvited;
-		});
+		partitionRows();
 	}
 	if (checkPosition) {
 		checkRowPosition(checkPosition);
@@ -570,6 +668,27 @@ void Members::Controller::updateRow(
 	}
 }
 
+void Members::Controller::partitionRows() {
+	auto hadWithAccess = false;
+	delegate()->peerListPartitionRows([&](const PeerListRow &row) {
+		using State = Row::State;
+		const auto state = static_cast<const Row&>(row).state();
+		if (state == State::WithAccess) {
+			hadWithAccess = true;
+		}
+		return (state != State::Invited)
+			&& (state != State::Calling)
+			&& (state != State::WithAccess);
+	});
+	if (hadWithAccess) {
+		delegate()->peerListPartitionRows([](const PeerListRow &row) {
+			const auto state = static_cast<const Row&>(row).state();
+			return (state != Row::State::Invited)
+				&& (state != Row::State::Calling);
+		});
+	}
+}
+
 bool Members::Controller::allRowsAboveAreSpeaking(not_null<Row*> row) const {
 	const auto count = delegate()->peerListFullRowsCount();
 	for (auto i = 0; i != count; ++i) {
@@ -615,7 +734,7 @@ bool Members::Controller::needToReorder(not_null<Row*> row) const {
 
 	if (row->speaking()) {
 		return !allRowsAboveAreSpeaking(row);
-	} else if (!_peer->canManageGroupCall()) {
+	} else if (!_call->canManage()) {
 		// Raising hands reorder participants only for voice chat admins.
 		return false;
 	}
@@ -684,7 +803,7 @@ void Members::Controller::checkRowPosition(not_null<Row*> row) {
 			return proj(a) > proj(b);
 		};
 	};
-	delegate()->peerListSortRows(_peer->canManageGroupCall()
+	delegate()->peerListSortRows(_call->canManage()
 		? makeComparator(projForAdmin)
 		: makeComparator(projForOther));
 }
@@ -692,14 +811,21 @@ void Members::Controller::checkRowPosition(not_null<Row*> row) {
 void Members::Controller::updateRow(
 		not_null<Row*> row,
 		const std::optional<Data::GroupCallParticipant> &was,
-		const Data::GroupCallParticipant *participant) {
+		const Data::GroupCallParticipant *participant,
+		Row::State noParticipantState) {
 	const auto wasSounding = row->sounding();
 	const auto wasSsrc = was ? was->ssrc : 0;
 	const auto wasAdditionalSsrc = was
 		? GetAdditionalAudioSsrc(was->videoParams)
 		: 0;
 	row->setSkipLevelUpdate(_skipRowLevelUpdate);
-	row->updateState(participant);
+	if (participant) {
+		row->updateState(*participant);
+	} else if (noParticipantState == Row::State::WithAccess) {
+		row->updateStateWithAccess();
+	} else {
+		row->updateStateInvited(noParticipantState == Row::State::Calling);
+	}
 
 	const auto wasNoSounding = _soundingRowBySsrc.empty();
 	updateRowInSoundingMap(
@@ -842,7 +968,8 @@ void Members::Controller::prepare() {
 	}
 
 	loadMoreRows();
-	appendInvitedUsers();
+	setupWithAccessUsers();
+	setupInvitedUsers();
 	_prepared = true;
 
 	setupListChangeViewers();
@@ -893,6 +1020,12 @@ void Members::Controller::prepareRows(not_null<Data::GroupCall*> real) {
 			delegate()->peerListAppendRow(std::move(row));
 		}
 	}
+	if (appendWithAccessUsers()) {
+		changed = true;
+	}
+	if (appendInvitedUsers()) {
+		changed = true;
+	}
 	if (changed) {
 		delegate()->peerListRefreshRows();
 	}
@@ -919,7 +1052,7 @@ bool Members::Controller::rowIsMe(not_null<PeerData*> participantPeer) {
 }
 
 bool Members::Controller::rowCanMuteMembers() {
-	return _peer->canManageGroupCall();
+	return _call->canManage();
 }
 
 void Members::Controller::rowUpdateRow(not_null<Row*> row) {
@@ -973,15 +1106,21 @@ void Members::Controller::rowPaintIcon(
 		return;
 	}
 	const auto narrow = (state.style == MembersRowStyle::Narrow);
-	if (state.invited) {
+	if (state.invited || state.calling) {
 		if (narrow) {
-			st::groupCallNarrowInvitedIcon.paintInCenter(p, rect);
+			(state.invited
+				? st::groupCallNarrowInvitedIcon
+				: st::groupCallNarrowCallingIcon).paintInCenter(p, rect);
 		} else {
-			st::groupCallMemberInvited.paintInCenter(
+			const auto &icon = state.invited
+				? st::groupCallMemberInvited
+				: st::groupCallMemberCalling;
+			const auto shift = state.invited
+				? st::groupCallMemberInvitedPosition
+				: st::groupCallMemberCallingPosition;
+			icon.paintInCenter(
 				p,
-				QRect(
-					rect.topLeft() + st::groupCallMemberInvitedPosition,
-					st::groupCallMemberInvited.size()));
+				QRect(rect.topLeft() + shift, icon.size()));
 		}
 		return;
 	}
@@ -1189,9 +1328,12 @@ base::unique_qptr<Ui::PopupMenu> Members::Controller::createRowContextMenu(
 	const auto participantPeer = row->peer();
 	const auto real = static_cast<Row*>(row.get());
 	const auto muteState = real->state();
+	if (muteState == Row::State::WithAccess) {
+		return nullptr;
+	}
 	const auto muted = (muteState == Row::State::Muted)
 		|| (muteState == Row::State::RaisedHand);
-	const auto addCover = !_call->rtmp();
+	const auto addCover = !_call->rtmp() && !_call->videoStream();
 	const auto addVolumeItem = (!muted || isMe(participantPeer));
 	const auto admin = IsGroupCallAdmin(_peer, participantPeer);
 	const auto session = &_peer->session();
@@ -1204,36 +1346,36 @@ base::unique_qptr<Ui::PopupMenu> Members::Controller::createRowContextMenu(
 			: addVolumeItem
 			? st::groupCallPopupMenuWithVolume
 			: st::groupCallPopupMenu));
-	const auto weakMenu = Ui::MakeWeak(result.get());
+	const auto weakMenu = base::make_weak(result.get());
 	const auto withActiveWindow = [=](auto callback) {
 		if (const auto window = Core::App().activePrimaryWindow()) {
-			if (const auto menu = weakMenu.data()) {
+			if (const auto menu = weakMenu.get()) {
 				menu->discardParentReActivate();
 
 				// We must hide PopupMenu before we activate the MainWindow,
 				// otherwise we set focus in field inside MainWindow and then
 				// PopupMenu::hide activates back the group call panel :(
-				delete weakMenu;
+				delete weakMenu.get();
 			}
 			window->invokeForSessionController(
 				account,
 				participantPeer,
-				[&](not_null<Window::SessionController*> newController) {
+				[&](not_null<::Window::SessionController*> newController) {
 					callback(newController);
 					newController->widget()->activate();
 				});
 		}
 	};
 	const auto showProfile = [=] {
-		withActiveWindow([=](not_null<Window::SessionController*> window) {
+		withActiveWindow([=](not_null<::Window::SessionController*> window) {
 			window->showPeerInfo(participantPeer);
 		});
 	};
 	const auto showHistory = [=] {
-		withActiveWindow([=](not_null<Window::SessionController*> window) {
+		withActiveWindow([=](not_null<::Window::SessionController*> window) {
 			window->showPeerHistory(
 				participantPeer,
-				Window::SectionShow::Way::Forward);
+				::Window::SectionShow::Way::Forward);
 		});
 	};
 	const auto removeFromVoiceChat = crl::guard(this, [=] {
@@ -1310,14 +1452,14 @@ base::unique_qptr<Ui::PopupMenu> Members::Controller::createRowContextMenu(
 			}
 		}
 
-		if (_call->rtmp()) {
+		if (_call->rtmp() || _call->videoStream()) {
 			addMuteActionsToContextMenu(
 				result,
 				row->peer(),
 				false,
 				static_cast<Row*>(row.get()));
 		} else if (participant
-			&& (!isMe(participantPeer) || _peer->canManageGroupCall())
+			&& (!isMe(participantPeer) || _call->canManage())
 			&& (participant->ssrc != 0
 				|| GetAdditionalAudioSsrc(participant->videoParams) != 0)) {
 			addMuteActionsToContextMenu(
@@ -1340,6 +1482,30 @@ base::unique_qptr<Ui::PopupMenu> Members::Controller::createRowContextMenu(
 				removeHand);
 		}
 	} else {
+		const auto invited = (muteState == Row::State::Invited)
+			|| (muteState == Row::State::Calling);
+		const auto conference = _call->sharedCall().get();
+		if (_call->conference()
+			&& conference
+			&& participantPeer->isUser()
+			&& invited) {
+			const auto id = conference->id();
+			const auto cancelInvite = [=](bool discard) {
+				Core::App().calls().declineOutgoingConferenceInvite(
+					id,
+					participantPeer->asUser(),
+					discard);
+			};
+			if (muteState == Row::State::Calling) {
+				result->addAction(
+					tr::lng_group_call_context_stop_ringing(tr::now),
+					[=] { cancelInvite(false); });
+			}
+			result->addAction(
+				tr::lng_group_call_context_cancel_invite(tr::now),
+				[=] { cancelInvite(true); });
+			result->addSeparator();
+		}
 		result->addAction(
 			(participantPeer->isUser()
 				? tr::lng_context_view_profile(tr::now)
@@ -1354,9 +1520,12 @@ base::unique_qptr<Ui::PopupMenu> Members::Controller::createRowContextMenu(
 		}
 		const auto canKick = [&] {
 			const auto user = participantPeer->asUser();
-			if (static_cast<Row*>(row.get())->state()
-				== Row::State::Invited) {
+			if (muteState == Row::State::Invited
+				|| muteState == Row::State::Calling
+				|| muteState == Row::State::WithAccess) {
 				return false;
+			} else if (conference && _call->canManage()) {
+				return true;
 			} else if (const auto chat = _peer->asChat()) {
 				return chat->amCreator()
 					|| (user
@@ -1387,11 +1556,11 @@ void Members::Controller::addMuteActionsToContextMenu(
 		bool participantIsCallAdmin,
 		not_null<Row*> row) {
 	const auto muteUnmuteString = [=](bool muted, bool mutedByMe) {
-		return (muted && _peer->canManageGroupCall())
+		return (muted && _call->canManage())
 			? tr::lng_group_call_context_unmute(tr::now)
 			: mutedByMe
 			? tr::lng_group_call_context_unmute_for_me(tr::now)
-			: _peer->canManageGroupCall()
+			: _call->canManage()
 			? tr::lng_group_call_context_mute(tr::now)
 			: tr::lng_group_call_context_mute_for_me(tr::now);
 	};
@@ -1418,7 +1587,7 @@ void Members::Controller::addMuteActionsToContextMenu(
 		|| (muteState == Row::State::RaisedHand);
 	const auto mutedByMe = row->mutedByMe();
 
-	auto mutesFromVolume = rpl::never<bool>() | rpl::type_erased();
+	auto mutesFromVolume = rpl::never<bool>() | rpl::type_erased;
 
 	const auto addVolumeItem = (!muted || isMe(participantPeer));
 	if (addVolumeItem) {
@@ -1431,15 +1600,17 @@ void Members::Controller::addMuteActionsToContextMenu(
 		auto volumeItem = base::make_unique_q<MenuVolumeItem>(
 			menu->menu(),
 			st::groupCallPopupVolumeMenu,
+			st::groupCallMenuVolumeSlider,
 			otherParticipantStateValue,
 			_call->rtmp() ? _call->rtmpVolume() : row->volume(),
 			Group::kMaxVolume,
-			muted);
+			muted,
+			st::groupCallMenuVolumePadding);
 
 		mutesFromVolume = volumeItem->toggleMuteRequests();
 
 		volumeItem->toggleMuteRequests(
-		) | rpl::start_with_next([=](bool muted) {
+		) | rpl::on_next([=](bool muted) {
 			if (muted) {
 				// Slider value is changed after the callback is called.
 				// To capture good state inside the slider frame we postpone.
@@ -1451,19 +1622,19 @@ void Members::Controller::addMuteActionsToContextMenu(
 		}, volumeItem->lifetime());
 
 		volumeItem->toggleMuteLocallyRequests(
-		) | rpl::start_with_next([=](bool muted) {
+		) | rpl::on_next([=](bool muted) {
 			if (!isMe(participantPeer)) {
 				toggleMute(muted, true);
 			}
 		}, volumeItem->lifetime());
 
 		volumeItem->changeVolumeRequests(
-		) | rpl::start_with_next([=](int volume) {
+		) | rpl::on_next([=](int volume) {
 			changeVolume(volume, false);
 		}, volumeItem->lifetime());
 
 		volumeItem->changeVolumeLocallyRequests(
-		) | rpl::start_with_next([=](int volume) {
+		) | rpl::on_next([=](int volume) {
 			if (!isMe(participantPeer)) {
 				changeVolume(volume, true);
 			}
@@ -1475,18 +1646,23 @@ void Members::Controller::addMuteActionsToContextMenu(
 
 		menu->addAction(std::move(volumeItem));
 
-		if (!_call->rtmp() && !isMe(participantPeer)) {
+		if (!_call->rtmp()
+			&& !_call->videoStream()
+			&& !isMe(participantPeer)) {
 			menu->addSeparator();
 		}
 	};
 
 	const auto muteAction = [&]() -> QAction* {
 		if (muteState == Row::State::Invited
+			|| muteState == Row::State::Calling
+			|| muteState == Row::State::WithAccess
 			|| _call->rtmp()
+			|| _call->videoStream()
 			|| isMe(participantPeer)
 			|| (muteState == Row::State::Inactive
 				&& participantIsCallAdmin
-				&& _peer->canManageGroupCall())) {
+				&& _call->canManage())) {
 			return nullptr;
 		}
 		auto callback = [=] {
@@ -1504,7 +1680,7 @@ void Members::Controller::addMuteActionsToContextMenu(
 	if (muteAction) {
 		std::move(
 			mutesFromVolume
-		) | rpl::start_with_next([=](bool mutedFromVolume) {
+		) | rpl::on_next([=](bool mutedFromVolume) {
 			const auto state = _call->canManage()
 				? (mutedFromVolume
 					? (row->raisedHandRating()
@@ -1536,12 +1712,29 @@ std::unique_ptr<Row> Members::Controller::createRow(
 }
 
 std::unique_ptr<Row> Members::Controller::createInvitedRow(
+		not_null<PeerData*> participantPeer,
+		bool calling) {
+	if (const auto row = findRow(participantPeer)) {
+		if (row->state() == Row::State::Invited
+			|| row->state() == Row::State::Calling) {
+			row->updateStateInvited(calling);
+			delegate()->peerListUpdateRow(row);
+		}
+		return nullptr;
+	}
+	const auto state = calling ? Row::State::Calling : Row::State::Invited;
+	auto result = std::make_unique<Row>(this, participantPeer);
+	updateRow(result.get(), std::nullopt, nullptr, state);
+	return result;
+}
+
+std::unique_ptr<Row> Members::Controller::createWithAccessRow(
 		not_null<PeerData*> participantPeer) {
 	if (findRow(participantPeer)) {
 		return nullptr;
 	}
 	auto result = std::make_unique<Row>(this, participantPeer);
-	updateRow(result.get(), std::nullopt, nullptr);
+	updateRow(result.get(), std::nullopt, nullptr, Row::State::WithAccess);
 	return result;
 }
 
@@ -1557,6 +1750,9 @@ Members::Members(
 , _listController(std::make_unique<Controller>(call, parent, mode))
 , _layout(_scroll->setOwnedWidget(
 	object_ptr<Ui::VerticalLayout>(_scroll.data())))
+, _fingerprint(call->conference()
+	? _layout->add(object_ptr<Ui::RpWidget>(_layout.get()))
+	: nullptr)
 , _videoWrap(_layout->add(object_ptr<Ui::RpWidget>(_layout.get())))
 , _viewport(
 	std::make_unique<Viewport>(
@@ -1565,6 +1761,7 @@ Members::Members(
 		backend)) {
 	setupList();
 	setupAddMember(call);
+	setupFingerprint();
 	setContent(_list);
 	setupFakeRoundCorners();
 	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
@@ -1613,6 +1810,7 @@ rpl::producer<int> Members::desiredHeightValue() const {
 	return rpl::combine(
 		heightValue(),
 		_addMemberButton.value(),
+		_shareLinkButton.value(),
 		_listController->fullCountValue(),
 		_mode.value()
 	) | rpl::map([=] {
@@ -1624,21 +1822,27 @@ void Members::setupAddMember(not_null<GroupCall*> call) {
 	using namespace rpl::mappers;
 
 	const auto peer = call->peer();
+	const auto conference = call->conference();
 	const auto canAddByPeer = [=](not_null<PeerData*> peer) {
-		if (peer->isBroadcast()) {
-			return rpl::single(false) | rpl::type_erased();
+		if (conference) {
+			return rpl::single(true) | rpl::type_erased;
+		} else if (peer->isBroadcast()) {
+			return rpl::single(false) | rpl::type_erased;
 		}
 		return rpl::combine(
 			Data::CanSendValue(peer, ChatRestriction::SendOther, false),
 			_call->joinAsValue()
 		) | rpl::map([=](bool can, not_null<PeerData*> joinAs) {
 			return can && joinAs->isSelf();
-		}) | rpl::type_erased();
+		}) | rpl::type_erased;
 	};
 	const auto canInviteByLinkByPeer = [=](not_null<PeerData*> peer) {
+		if (conference) {
+			return rpl::single(true) | rpl::type_erased;
+		}
 		const auto channel = peer->asChannel();
 		if (!channel) {
-			return rpl::single(false) | rpl::type_erased();
+			return rpl::single(false) | rpl::type_erased;
 		}
 		return rpl::single(
 			false
@@ -1647,7 +1851,7 @@ void Members::setupAddMember(not_null<GroupCall*> call) {
 			return Data::PeerFlagValue(
 				channel,
 				ChannelDataFlag::Username);
-		}) | rpl::flatten_latest()) | rpl::type_erased();
+		}) | rpl::flatten_latest()) | rpl::type_erased;
 	};
 	_canAddMembers = canAddByPeer(peer);
 	_canInviteByLink = canInviteByLinkByPeer(peer);
@@ -1659,22 +1863,31 @@ void Members::setupAddMember(not_null<GroupCall*> call) {
 			_canInviteByLink = canInviteByLinkByPeer(channel);
 		});
 
+	const auto baseIndex = _layout->count() - 2;
+
 	rpl::combine(
 		_canAddMembers.value(),
 		_canInviteByLink.value(),
 		_mode.value()
-	) | rpl::start_with_next([=](bool add, bool invite, PanelMode mode) {
+	) | rpl::on_next([=](bool add, bool invite, PanelMode mode) {
 		if (!add && !invite) {
 			if (const auto old = _addMemberButton.current()) {
 				delete old;
 				_addMemberButton = nullptr;
 				updateControlsGeometry();
 			}
+			if (const auto old = _shareLinkButton.current()) {
+				delete old;
+				_shareLinkButton = nullptr;
+				updateControlsGeometry();
+			}
 			return;
 		}
 		auto addMember = Settings::CreateButtonWithIcon(
 			_layout.get(),
-			tr::lng_group_call_invite(),
+			(conference
+				? tr::lng_group_call_invite_conf()
+				: tr::lng_group_call_invite()),
 			st::groupCallAddMember,
 			{ .icon = &st::groupCallAddMemberIcon });
 		addMember->clicks(
@@ -1685,7 +1898,22 @@ void Members::setupAddMember(not_null<GroupCall*> call) {
 		addMember->resizeToWidth(_layout->width());
 		delete _addMemberButton.current();
 		_addMemberButton = addMember.data();
-		_layout->insert(3, std::move(addMember));
+		_layout->insert(baseIndex, std::move(addMember));
+		if (conference) {
+			auto shareLink = Settings::CreateButtonWithIcon(
+				_layout.get(),
+				tr::lng_group_invite_share(),
+				st::groupCallAddMember,
+				{ .icon = &st::groupCallShareLinkIcon });
+			shareLink->clicks() | rpl::to_empty | rpl::start_to_stream(
+				_shareLinkRequests,
+				shareLink->lifetime());
+			shareLink->show();
+			shareLink->resizeToWidth(_layout->width());
+			delete _shareLinkButton.current();
+			_shareLinkButton = shareLink.data();
+			_layout->insert(baseIndex + 1, std::move(shareLink));
+		}
 	}, lifetime());
 
 	updateControlsGeometry();
@@ -1711,13 +1939,15 @@ void Members::setMode(PanelMode mode) {
 }
 
 QRect Members::getInnerGeometry() const {
+	const auto shareLink = _shareLinkButton.current();
 	const auto addMembers = _addMemberButton.current();
+	const auto share = shareLink ? shareLink->height() : 0;
 	const auto add = addMembers ? addMembers->height() : 0;
 	return QRect(
 		0,
 		-_scroll->scrollTop(),
 		width(),
-		_list->y() + _list->height() + _bottomSkip->height() + add);
+		_list->y() + _list->height() + _bottomSkip->height() + add + share);
 }
 
 rpl::producer<int> Members::fullCountValue() const {
@@ -1732,7 +1962,7 @@ void Members::setupList() {
 				_layout.get(),
 				st::groupCallMembersTopSkip));
 		result->paintRequest(
-		) | rpl::start_with_next([=](QRect clip) {
+		) | rpl::on_next([=](QRect clip) {
 			QPainter(result).fillRect(clip, st::groupCallMembersBg);
 		}, result->lifetime());
 		return result;
@@ -1749,7 +1979,7 @@ void Members::setupList() {
 		_list->heightValue() | rpl::map(_1 > 0),
 		_addMemberButton.value() | rpl::map(_1 != nullptr)
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool hasList, bool hasAddMembers) {
+	) | rpl::on_next([=](bool hasList, bool hasAddMembers) {
 		_topSkip->resize(
 			_topSkip->width(),
 			hasList ? st::groupCallMembersTopSkip : 0);
@@ -1760,7 +1990,7 @@ void Members::setupList() {
 
 	const auto skip = _layout->add(object_ptr<Ui::RpWidget>(_layout.get()));
 	_mode.value(
-	) | rpl::start_with_next([=](PanelMode mode) {
+	) | rpl::on_next([=](PanelMode mode) {
 		skip->resize(skip->width(), (mode == PanelMode::Default)
 			? st::groupCallMembersBottomSkip
 			: 0);
@@ -1769,21 +1999,38 @@ void Members::setupList() {
 	rpl::combine(
 		_mode.value(),
 		_layout->heightValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		resizeToList();
 	}, _layout->lifetime());
 
 	rpl::combine(
 		_scroll->scrollTopValue(),
 		_scroll->heightValue()
-	) | rpl::start_with_next([=](int scrollTop, int scrollHeight) {
+	) | rpl::on_next([=](int scrollTop, int scrollHeight) {
 		_layout->setVisibleTopBottom(scrollTop, scrollTop + scrollHeight);
 	}, _scroll->lifetime());
 }
 
+void Members::setupFingerprint() {
+	if (const auto raw = _fingerprint) {
+		auto badge = SetupFingerprintBadge(
+			raw->lifetime(),
+			_call->emojiHashValue());
+		std::move(badge.repaints) | rpl::start_to_stream(
+			_fingerprintRepaints,
+			raw->lifetime());
+		_fingerprintState = badge.state;
+
+		SetupFingerprintBadgeWidget(
+			raw,
+			_fingerprintState,
+			_fingerprintRepaints.events());
+	}
+}
+
 void Members::trackViewportGeometry() {
 	_call->videoEndpointLargeValue(
-	) | rpl::start_with_next([=](const VideoEndpoint &large) {
+	) | rpl::on_next([=](const VideoEndpoint &large) {
 		_viewport->showLarge(large);
 	}, _viewport->lifetime());
 
@@ -1806,19 +2053,19 @@ void Members::trackViewportGeometry() {
 			std::min(_scroll->height(), _viewport->fullHeight()));
 	};
 	_layout->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_viewport->resizeToWidth(width);
 		resize();
 	}, _viewport->lifetime());
 
 	_scroll->heightValue(
-	) | rpl::skip(1) | rpl::start_with_next(resize, _viewport->lifetime());
+	) | rpl::skip(1) | rpl::on_next(resize, _viewport->lifetime());
 
 	_scroll->scrollTopValue(
-	) | rpl::skip(1) | rpl::start_with_next(move, _viewport->lifetime());
+	) | rpl::skip(1) | rpl::on_next(move, _viewport->lifetime());
 
 	_viewport->fullHeightValue(
-	) | rpl::start_with_next([=](int viewport) {
+	) | rpl::on_next([=](int viewport) {
 		_videoWrap->resize(_videoWrap->width(), viewport);
 		if (viewport > 0) {
 			move();
@@ -1877,7 +2124,7 @@ void Members::setupFakeRoundCorners() {
 		result->resize(size, size);
 		result->setAttribute(Qt::WA_TransparentForMouseEvents);
 		result->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			QPainter(result).drawImage(
 				result->rect(),
 				*image,
@@ -1892,16 +2139,22 @@ void Members::setupFakeRoundCorners() {
 	const auto bottomleft = create({ 0, shift });
 	const auto bottomright = create({ shift, shift });
 
+	const auto heightValue = [=](Ui::RpWidget *widget) {
+		topleft->raise();
+		topright->raise();
+		bottomleft->raise();
+		bottomright->raise();
+		return widget ? widget->heightValue() : rpl::single(0);
+	};
 	rpl::combine(
 		_list->geometryValue(),
-		_addMemberButton.value() | rpl::map([=](Ui::RpWidget *widget) {
-			topleft->raise();
-			topright->raise();
-			bottomleft->raise();
-			bottomright->raise();
-			return widget ? widget->heightValue() : rpl::single(0);
-		}) | rpl::flatten_latest()
-	) | rpl::start_with_next([=](QRect list, int addMembers) {
+		_addMemberButton.value() | rpl::map(
+			heightValue
+		) | rpl::flatten_latest(),
+		_shareLinkButton.value() | rpl::map(
+			heightValue
+		) | rpl::flatten_latest()
+	) | rpl::on_next([=](QRect list, int addMembers, int shareLink) {
 		const auto left = list.x();
 		const auto top = list.y() - _topSkip->height();
 		const auto right = left + list.width() - topright->width();
@@ -1910,6 +2163,7 @@ void Members::setupFakeRoundCorners() {
 			+ list.height()
 			+ _bottomSkip->height()
 			+ addMembers
+			+ shareLink
 			- bottomleft->height();
 		topleft->move(left, top);
 		topright->move(right, top);
@@ -1919,7 +2173,7 @@ void Members::setupFakeRoundCorners() {
 
 	refreshImage();
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshImage();
 		topleft->update();
 		topright->update();
diff --git a/Telegram/SourceFiles/calls/group/calls_group_members.h b/Telegram/SourceFiles/calls/group/calls_group_members.h
index 47cb0591438330..739cccc990300d 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_members.h
@@ -25,6 +25,7 @@ class GroupCall;
 
 namespace Calls {
 class GroupCall;
+struct FingerprintBadgeState;
 } // namespace Calls
 
 namespace Calls::Group {
@@ -59,6 +60,9 @@ class Members final
 	[[nodiscard]] rpl::producer<> addMembersRequests() const {
 		return _addMemberRequests.events();
 	}
+	[[nodiscard]] rpl::producer<> shareLinkRequests() const {
+		return _shareLinkRequests.events();
+	}
 
 	[[nodiscard]] MembersRow *lookupRow(not_null<PeerData*> peer) const;
 	[[nodiscard]] not_null<MembersRow*> rtmpFakeRow(
@@ -93,6 +97,7 @@ class Members final
 	void setupAddMember(not_null<GroupCall*> call);
 	void resizeToList();
 	void setupList();
+	void setupFingerprint();
 	void setupFakeRoundCorners();
 
 	void trackViewportGeometry();
@@ -103,13 +108,18 @@ class Members final
 	object_ptr<Ui::ScrollArea> _scroll;
 	std::unique_ptr<Controller> _listController;
 	not_null<Ui::VerticalLayout*> _layout;
+	Ui::RpWidget *_fingerprint = nullptr;
+	rpl::event_stream<> _fingerprintRepaints;
+	const FingerprintBadgeState *_fingerprintState = nullptr;
 	const not_null<Ui::RpWidget*> _videoWrap;
 	std::unique_ptr<Viewport> _viewport;
 	rpl::variable<Ui::RpWidget*> _addMemberButton = nullptr;
+	rpl::variable<Ui::RpWidget*> _shareLinkButton = nullptr;
 	RpWidget *_topSkip = nullptr;
 	RpWidget *_bottomSkip = nullptr;
 	ListWidget *_list = nullptr;
 	rpl::event_stream<> _addMemberRequests;
+	rpl::event_stream<> _shareLinkRequests;
 
 	mutable std::unique_ptr<MembersRow> _rtmpFakeRow;
 
diff --git a/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp b/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
index 02ae9cd685c3f0..977d547ee1bb9a 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_members_row.cpp
@@ -106,7 +106,7 @@ MembersRow::BlobsAnimation::BlobsAnimation(
 	float maxLevel)
 : blobs(std::move(blobDatas), levelDuration, maxLevel) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		userpicCache = QImage();
 	}, lifetime);
 }
@@ -138,41 +138,52 @@ void MembersRow::setSkipLevelUpdate(bool value) {
 	_skipLevelUpdate = value;
 }
 
-void MembersRow::updateState(
-		const Data::GroupCallParticipant *participant) {
-	setVolume(participant
-		? participant->volume
-		: Group::kDefaultVolume);
-	if (!participant) {
-		setState(State::Invited);
-		setSounding(false);
-		setSpeaking(false);
-		_mutedByMe = false;
-		_raisedHandRating = 0;
-	} else if (!participant->muted
-		|| (participant->sounding && participant->ssrc != 0)
-		|| (participant->additionalSounding
-			&& GetAdditionalAudioSsrc(participant->videoParams) != 0)) {
+void MembersRow::updateStateInvited(bool calling) {
+	setVolume(Group::kDefaultVolume);
+	setState(calling ? State::Calling : State::Invited);
+	setSounding(false);
+	setSpeaking(false);
+	_mutedByMe = false;
+	_raisedHandRating = 0;
+	refreshStatus();
+}
+
+void MembersRow::updateStateWithAccess() {
+	setVolume(Group::kDefaultVolume);
+	setState(State::WithAccess);
+	setSounding(false);
+	setSpeaking(false);
+	_mutedByMe = false;
+	_raisedHandRating = 0;
+	refreshStatus();
+}
+
+void MembersRow::updateState(const Data::GroupCallParticipant &participant) {
+	setVolume(participant.volume);
+	if (!participant.muted
+		|| (participant.sounding && participant.ssrc != 0)
+		|| (participant.additionalSounding
+			&& GetAdditionalAudioSsrc(participant.videoParams) != 0)) {
 		setState(State::Active);
-		setSounding((participant->sounding && participant->ssrc != 0)
-			|| (participant->additionalSounding
-				&& GetAdditionalAudioSsrc(participant->videoParams) != 0));
-		setSpeaking((participant->speaking && participant->ssrc != 0)
-			|| (participant->additionalSpeaking
-				&& GetAdditionalAudioSsrc(participant->videoParams) != 0));
-		_mutedByMe = participant->mutedByMe;
+		setSounding((participant.sounding && participant.ssrc != 0)
+			|| (participant.additionalSounding
+				&& GetAdditionalAudioSsrc(participant.videoParams) != 0));
+		setSpeaking((participant.speaking && participant.ssrc != 0)
+			|| (participant.additionalSpeaking
+				&& GetAdditionalAudioSsrc(participant.videoParams) != 0));
+		_mutedByMe = participant.mutedByMe;
 		_raisedHandRating = 0;
-	} else if (participant->canSelfUnmute) {
+	} else if (participant.canSelfUnmute) {
 		setState(State::Inactive);
 		setSounding(false);
 		setSpeaking(false);
-		_mutedByMe = participant->mutedByMe;
+		_mutedByMe = participant.mutedByMe;
 		_raisedHandRating = 0;
 	} else {
 		setSounding(false);
 		setSpeaking(false);
-		_mutedByMe = participant->mutedByMe;
-		_raisedHandRating = participant->raisedHandRating;
+		_mutedByMe = participant.mutedByMe;
+		_raisedHandRating = participant.raisedHandRating;
 		setState(_raisedHandRating ? State::RaisedHand : State::Muted);
 	}
 	refreshStatus();
@@ -204,7 +215,7 @@ void MembersRow::setSpeaking(bool speaking) {
 		_statusIcon->arcs.setStrokeRatio(kArcsStrokeRatio);
 		_statusIcon->arcsWidth = _statusIcon->arcs.finishedWidth();
 		_statusIcon->arcs.startUpdateRequests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (!_statusIcon->arcsAnimation.animating()) {
 				_statusIcon->wasArcsWidth = _statusIcon->arcsWidth;
 			}
@@ -450,6 +461,26 @@ void MembersRow::paintMuteIcon(
 	_delegate->rowPaintIcon(p, iconRect, computeIconState(style));
 }
 
+QString MembersRow::generateName() {
+	const auto result = peer()->name();
+	if (result.isEmpty()) {
+		DEBUG_LOG(("UnknownParticipant: %1, Loaded: %2, Name Version: %3"
+			).arg(peerToUser(peer()->id).bare
+			).arg(peer()->isLoaded() ? "TRUE" : "FALSE"
+			).arg(peer()->nameVersion()));
+	}
+	return result.isEmpty()
+		? u"User #%1"_q.arg(peerToUser(peer()->id).bare)
+		: result;
+}
+
+QString MembersRow::generateShortName() {
+	const auto result = peer()->shortName();
+	return result.isEmpty()
+		? u"User #%1"_q.arg(peerToUser(peer()->id).bare)
+		: result;
+}
+
 auto MembersRow::generatePaintUserpicCallback(bool forceRound)
 -> PaintRoundImageCallback {
 	return [=](Painter &p, int x, int y, int outerWidth, int size) {
@@ -613,11 +644,16 @@ void MembersRow::paintComplexStatusText(
 	availableWidth -= skip;
 	const auto &font = st::normalFont;
 	const auto useAbout = !_about.isEmpty()
+		&& (_state != State::WithAccess)
+		&& (_state != State::Invited)
+		&& (_state != State::Calling)
 		&& (style != MembersRowStyle::Video)
 		&& ((_state == State::RaisedHand && !_raisedHandStatus)
 			|| (_state != State::RaisedHand && !_speaking));
 	if (!useAbout
 		&& _state != State::Invited
+		&& _state != State::Calling
+		&& _state != State::WithAccess
 		&& !_mutedByMe) {
 		paintStatusIcon(p, x, y, st, font, selected, narrowMode);
 
@@ -663,6 +699,10 @@ void MembersRow::paintComplexStatusText(
 				? tr::lng_group_call_muted_by_me_status(tr::now)
 				: _delegate->rowIsMe(peer())
 				? tr::lng_status_connecting(tr::now)
+				: (_state == State::WithAccess)
+				? tr::lng_group_call_blockchain_only_status(tr::now)
+				: (_state == State::Calling)
+				? tr::lng_group_call_calling_status(tr::now)
 				: tr::lng_group_call_invited_status(tr::now)));
 	}
 }
@@ -676,6 +716,7 @@ QSize MembersRow::rightActionSize() const {
 bool MembersRow::rightActionDisabled() const {
 	return _delegate->rowIsMe(peer())
 		|| (_state == State::Invited)
+		|| (_state == State::Calling)
 		|| !_delegate->rowCanMuteMembers();
 }
 
@@ -701,7 +742,9 @@ void MembersRow::rightActionPaint(
 		size.width(),
 		size.height(),
 		outerWidth);
-	if (_state == State::Invited) {
+	if (_state == State::Invited
+		|| _state == State::Calling
+		|| _state == State::WithAccess) {
 		_actionRipple = nullptr;
 	}
 	if (_actionRipple) {
@@ -731,6 +774,7 @@ MembersRowDelegate::IconState MembersRow::computeIconState(
 		.mutedByMe = _mutedByMe,
 		.raisedHand = (_state == State::RaisedHand),
 		.invited = (_state == State::Invited),
+		.calling = (_state == State::Calling),
 		.style = style,
 	};
 }
diff --git a/Telegram/SourceFiles/calls/group/calls_group_members_row.h b/Telegram/SourceFiles/calls/group/calls_group_members_row.h
index 5ba910c8e23acb..2aab2ead48aa68 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members_row.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_members_row.h
@@ -24,7 +24,7 @@ struct PeerUserpicView;
 
 namespace Calls::Group {
 
-enum class MembersRowStyle {
+enum class MembersRowStyle : uchar {
 	Default,
 	Narrow,
 	Video,
@@ -40,6 +40,7 @@ class MembersRowDelegate {
 		bool mutedByMe = false;
 		bool raisedHand = false;
 		bool invited = false;
+		bool calling = false;
 		MembersRowStyle style = MembersRowStyle::Default;
 	};
 	virtual bool rowIsMe(not_null<PeerData*> participantPeer) = 0;
@@ -75,11 +76,15 @@ class MembersRow final : public PeerListRow {
 		Muted,
 		RaisedHand,
 		Invited,
+		Calling,
+		WithAccess,
 	};
 
 	void setAbout(const QString &about);
 	void setSkipLevelUpdate(bool value);
-	void updateState(const Data::GroupCallParticipant *participant);
+	void updateState(const Data::GroupCallParticipant &participant);
+	void updateStateInvited(bool calling);
+	void updateStateWithAccess();
 	void updateLevel(float level);
 	void updateBlobAnimation(crl::time now);
 	void clearRaisedHandStatus();
@@ -122,6 +127,8 @@ class MembersRow final : public PeerListRow {
 		bool selected,
 		bool actionSelected) override;
 
+	QString generateName() override;
+	QString generateShortName() override;
 	PaintRoundImageCallback generatePaintUserpicCallback(
 		bool forceRound) override;
 	void paintComplexUserpic(
diff --git a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp
index 51a9068a7396eb..354e9c0dea035d 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp
@@ -36,7 +36,7 @@ namespace {
 class JoinAsAction final : public Ui::Menu::ItemBase {
 public:
 	JoinAsAction(
-		not_null<Ui::RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &st,
 		not_null<PeerData*> peer,
 		Fn<void()> callback);
@@ -72,7 +72,7 @@ class JoinAsAction final : public Ui::Menu::ItemBase {
 class RecordingAction final : public Ui::Menu::ItemBase {
 public:
 	RecordingAction(
-		not_null<Ui::RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &st,
 		rpl::producer<QString> text,
 		rpl::producer<TimeId> startAtValues,
@@ -116,7 +116,7 @@ TextParseOptions MenuTextOptions = {
 };
 
 JoinAsAction::JoinAsAction(
-	not_null<Ui::RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &st,
 	not_null<PeerData*> peer,
 	Fn<void()> callback)
@@ -128,11 +128,11 @@ JoinAsAction::JoinAsAction(
 	+ st::groupCallJoinAsPhotoSize
 	+ st::groupCallJoinAsPadding.bottom()) {
 	setAcceptBoth(true);
-	initResizeHook(parent->sizeValue());
-	setClickedCallback(std::move(callback));
+	fitToMenuWidth();
+	setActionTriggered(std::move(callback));
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
@@ -182,7 +182,7 @@ void JoinAsAction::prepare() {
 	rpl::combine(
 		tr::lng_group_call_display_as_header(),
 		Info::Profile::NameValue(_peer)
-	) | rpl::start_with_next([=](QString text, QString name) {
+	) | rpl::on_next([=](QString text, QString name) {
 		const auto &padding = st::groupCallJoinAsPadding;
 		_text.setMarkedText(_st.itemStyle, { text }, MenuTextOptions);
 		_name.setMarkedText(_st.itemStyle, { name }, MenuTextOptions);
@@ -235,7 +235,7 @@ void JoinAsAction::handleKeyPress(not_null<QKeyEvent*> e) {
 }
 
 RecordingAction::RecordingAction(
-	not_null<Ui::RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &st,
 	rpl::producer<QString> text,
 	rpl::producer<TimeId> startAtValues,
@@ -253,7 +253,7 @@ RecordingAction::RecordingAction(
 	+ st::groupCallRecordingTimerPadding.bottom()) {
 	std::move(
 		startAtValues
-	) | rpl::start_with_next([=](TimeId startAt) {
+	) | rpl::on_next([=](TimeId startAt) {
 		_startAt = startAt;
 		_startedAt = crl::now();
 		_refreshTimer.cancel();
@@ -262,11 +262,11 @@ RecordingAction::RecordingAction(
 	}, lifetime());
 
 	setAcceptBoth(true);
-	initResizeHook(parent->sizeValue());
-	setClickedCallback(std::move(callback));
+	fitToMenuWidth();
+	setActionTriggered(std::move(callback));
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
@@ -344,7 +344,7 @@ void RecordingAction::prepare(rpl::producer<QString> text) {
 		_st.widthMax);
 	setMinWidth(w);
 
-	std::move(text) | rpl::start_with_next([=](QString text) {
+	std::move(text) | rpl::on_next([=](QString text) {
 		const auto &padding = _st.itemPadding;
 		_text.setMarkedText(_st.itemStyle, { text }, MenuTextOptions);
 		_textWidth = w - padding.left() - padding.right();
@@ -416,10 +416,13 @@ void LeaveBox(
 		not_null<GroupCall*> call,
 		bool discardChecked,
 		BoxContext context) {
+	const auto conference = call->conference();
 	const auto livestream = call->peer()->isBroadcast();
 	const auto scheduled = (call->scheduleDate() != 0);
 	if (!scheduled) {
-		box->setTitle(livestream
+		box->setTitle(conference
+			? tr::lng_group_call_leave_title_call()
+			: livestream
 			? tr::lng_group_call_leave_title_channel()
 			: tr::lng_group_call_leave_title());
 	}
@@ -431,12 +434,14 @@ void LeaveBox(
 				? (livestream
 					? tr::lng_group_call_close_sure_channel()
 					: tr::lng_group_call_close_sure())
-				: (livestream
+				: (conference
+					? tr::lng_group_call_leave_sure_call()
+					: livestream
 					? tr::lng_group_call_leave_sure_channel()
 					: tr::lng_group_call_leave_sure())),
 			(inCall ? st::groupCallBoxLabel : st::boxLabel)),
 		scheduled ? st::boxPadding : st::boxRowPadding);
-	const auto discard = call->peer()->canManageGroupCall()
+	const auto discard = call->canManage()
 		? box->addRow(object_ptr<Ui::Checkbox>(
 			box.get(),
 			(scheduled
@@ -490,22 +495,25 @@ void FillMenu(
 		Fn<void(object_ptr<Ui::BoxContent>)> showBox) {
 	const auto weak = base::make_weak(call);
 	const auto resolveReal = [=] {
-		const auto real = peer->groupCall();
-		const auto strong = weak.get();
-		return (real && strong && (real->id() == strong->id()))
-			? real
-			: nullptr;
+		if (const auto strong = weak.get()) {
+			if (const auto real = strong->lookupReal()) {
+				return real;
+			}
+		}
+		return (Data::GroupCall*)nullptr;
 	};
 	const auto real = resolveReal();
 	if (!real) {
 		return;
 	}
 
+	const auto conference = call->conference();
 	const auto addEditJoinAs = call->showChooseJoinAs();
-	const auto addEditTitle = call->canManage();
-	const auto addEditRecording = call->canManage() && !real->scheduleDate();
-	const auto addScreenCast = !wide
-		&& call->videoIsWorking()
+	const auto addEditTitle = !conference && call->canManage();
+	const auto addEditRecording = !conference
+		&& call->canManage()
+		&& !real->scheduleDate();
+	const auto addScreenCast = call->videoIsWorking()
 		&& !real->scheduleDate();
 	if (addEditJoinAs) {
 		menu->addAction(MakeJoinAsAction(
diff --git a/Telegram/SourceFiles/calls/group/calls_group_message_encryption.cpp b/Telegram/SourceFiles/calls/group/calls_group_message_encryption.cpp
new file mode 100644
index 00000000000000..04fd654e934613
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/calls_group_message_encryption.cpp
@@ -0,0 +1,367 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "calls/group/calls_group_message_encryption.h"
+
+#include <QtCore/QJsonValue>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+
+namespace Calls::Group {
+namespace {
+
+//[[nodiscard]] MTPJSONValue String(const QByteArray &value) {
+//	return MTP_jsonString(MTP_bytes(value));
+//}
+//
+//[[nodiscard]] MTPJSONValue Int(int value) {
+//	return MTP_jsonNumber(MTP_double(value));
+//}
+//
+//[[nodiscard]] MTPJSONObjectValue Value(
+//		const QByteArray &name,
+//		const MTPJSONValue &value) {
+//	return MTP_jsonObjectValue(MTP_bytes(name), value);
+//}
+//
+//[[nodiscard]] MTPJSONValue Object(
+//		const QByteArray &cons,
+//		QVector<MTPJSONObjectValue> &&values) {
+//	values.insert(values.begin(), Value("_", String(cons)));
+//	return MTP_jsonObject(MTP_vector<MTPJSONObjectValue>(std::move(values)));
+//}
+//
+//[[nodiscard]] MTPJSONValue Array(QVector<MTPJSONValue> &&values) {
+//	return MTP_jsonArray(MTP_vector<MTPJSONValue>(std::move(values)));
+//}
+//
+//template <typename MTPD>
+//[[nodiscard]] MTPJSONValue SimpleEntity(
+//		const QByteArray &name,
+//		const MTPD &data) {
+//	return Object(name, {
+//		Value("offset", Int(data.voffset().v)),
+//		Value("length", Int(data.vlength().v)),
+//	});
+//}
+//
+//[[nodiscard]] MTPJSONValue Entity(const MTPMessageEntity &entity) {
+//	return entity.match([](const MTPDmessageEntityBold &data) {
+//		return SimpleEntity("messageEntityBold", data);
+//	}, [](const MTPDmessageEntityItalic &data) {
+//		return SimpleEntity("messageEntityItalic", data);
+//	}, [](const MTPDmessageEntityUnderline &data) {
+//		return SimpleEntity("messageEntityUnderline", data);
+//	}, [](const MTPDmessageEntityStrike &data) {
+//		return SimpleEntity("messageEntityStrike", data);
+//	}, [](const MTPDmessageEntitySpoiler &data) {
+//		return SimpleEntity("messageEntitySpoiler", data);
+//	}, [](const MTPDmessageEntityCustomEmoji &data) {
+//		return Object("messageEntityCustomEmoji", {
+//			Value("offset", Int(data.voffset().v)),
+//			Value("length", Int(data.vlength().v)),
+//			Value(
+//				"document_id",
+//				String(QByteArray::number(int64(data.vdocument_id().v)))),
+//		});
+//	}, [](const auto &data) {
+//		return MTP_jsonNull();
+//	});
+//}
+//
+//[[nodiscard]] QVector<MTPJSONValue> Entities(
+//		const QVector<MTPMessageEntity> &list) {
+//	auto result = QVector<MTPJSONValue>();
+//	result.reserve(list.size());
+//	for (const auto &entity : list) {
+//		if (const auto e = Entity(entity); e.type() != mtpc_jsonNull) {
+//			result.push_back(e);
+//		}
+//	}
+//	return result;
+//}
+//
+//[[nodiscard]] QByteArray Serialize(const MTPJSONValue &value) {
+//	auto counter = ::tl::details::LengthCounter();
+//	value.write(counter);
+//	auto buffer = mtpBuffer();
+//	buffer.reserve(counter.length);
+//	value.write(buffer);
+//	return QByteArray(
+//		reinterpret_cast<const char*>(buffer.constData()),
+//		buffer.size() * sizeof(buffer.front()));
+//}
+
+[[nodiscard]] QJsonValue String(const QByteArray &value) {
+	return QJsonValue(QString::fromUtf8(value));
+}
+
+[[nodiscard]] QJsonValue Int(int value) {
+	return QJsonValue(double(value));
+}
+
+struct JsonObjectValue {
+	const char *name = nullptr;
+	QJsonValue value;
+};
+
+[[nodiscard]] JsonObjectValue Value(
+		const char *name,
+		const QJsonValue &value) {
+	return JsonObjectValue{ name, value };
+}
+
+[[nodiscard]] QJsonValue Object(
+		const char *cons,
+		QVector<JsonObjectValue> &&values) {
+	auto result = QJsonObject();
+	result.insert("_", cons);
+	for (const auto &value : values) {
+		result.insert(value.name, value.value);
+	}
+	return result;
+}
+
+[[nodiscard]] QJsonValue Array(QVector<QJsonValue> &&values) {
+	auto result = QJsonArray();
+	for (const auto &value : values) {
+		result.push_back(value);
+	}
+	return result;
+}
+
+template <typename MTPD>
+[[nodiscard]] QJsonValue SimpleEntity(
+		const char *name,
+		const MTPD &data) {
+	return Object(name, {
+		Value("offset", Int(data.voffset().v)),
+		Value("length", Int(data.vlength().v)),
+	});
+}
+
+[[nodiscard]] QJsonValue Entity(const MTPMessageEntity &entity) {
+	return entity.match([](const MTPDmessageEntityBold &data) {
+		return SimpleEntity("messageEntityBold", data);
+	}, [](const MTPDmessageEntityItalic &data) {
+		return SimpleEntity("messageEntityItalic", data);
+	}, [](const MTPDmessageEntityUnderline &data) {
+		return SimpleEntity("messageEntityUnderline", data);
+	}, [](const MTPDmessageEntityStrike &data) {
+		return SimpleEntity("messageEntityStrike", data);
+	}, [](const MTPDmessageEntitySpoiler &data) {
+		return SimpleEntity("messageEntitySpoiler", data);
+	}, [](const MTPDmessageEntityCustomEmoji &data) {
+		return Object("messageEntityCustomEmoji", {
+			Value("offset", Int(data.voffset().v)),
+			Value("length", Int(data.vlength().v)),
+			Value(
+				"document_id",
+				String(QByteArray::number(int64(data.vdocument_id().v)))),
+		});
+	}, [](const auto &data) {
+		return QJsonValue(QJsonValue::Null);
+	});
+}
+
+[[nodiscard]] QVector<QJsonValue> Entities(
+		const QVector<MTPMessageEntity> &list) {
+	auto result = QVector<QJsonValue>();
+	result.reserve(list.size());
+	for (const auto &entity : list) {
+		if (const auto e = Entity(entity); !e.isNull()) {
+			result.push_back(e);
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] QByteArray Serialize(const QJsonValue &value) {
+	return QJsonDocument(value.toObject()).toJson(QJsonDocument::Compact);
+}
+
+[[nodiscard]] std::optional<QJsonValue> GetValue(
+		const QJsonObject &object,
+		const char *name) {
+	const auto i = object.find(name);
+	return (i != object.end()) ? *i : std::optional<QJsonValue>();
+}
+
+[[nodiscard]] std::optional<int> GetInt(
+		const QJsonObject &object,
+		const char *name) {
+	if (const auto maybeValue = GetValue(object, name)) {
+		if (maybeValue->isDouble()) {
+			return int(base::SafeRound(maybeValue->toDouble()));
+		} else if (maybeValue->isString()) {
+			auto ok = false;
+			const auto result = maybeValue->toString().toInt(&ok);
+			return ok ? result : std::optional<int>();
+		}
+	}
+	return {};
+}
+
+[[nodiscard]] std::optional<uint64> GetLong(
+		const QJsonObject &object,
+		const char *name) {
+	if (const auto maybeValue = GetValue(object, name)) {
+		if (maybeValue->isDouble()) {
+			const auto value = maybeValue->toDouble();
+			return (value >= 0.)
+				? uint64(base::SafeRound(value))
+				: std::optional<uint64>();
+		} else if (maybeValue->isString()) {
+			auto ok = false;
+			const auto result = maybeValue->toString().toLongLong(&ok);
+			return ok ? uint64(result) : std::optional<uint64>();
+		}
+	}
+	return {};
+}
+
+
+[[nodiscard]] std::optional<QString> GetString(
+		const QJsonObject &object,
+		const char *name) {
+	const auto maybeValue = GetValue(object, name);
+	return (maybeValue && maybeValue->isString())
+		? maybeValue->toString()
+		: std::optional<QString>();
+}
+
+
+[[nodiscard]] std::optional<QString> GetCons(const QJsonObject &object) {
+	return GetString(object, "_");
+}
+
+[[nodiscard]] bool Unsupported(
+		const QJsonObject &object,
+		const QString &cons = QString()) {
+	const auto maybeMinLayer = GetInt(object, "_min_layer");
+	const auto layer = int(MTP::details::kCurrentLayer);
+	if (maybeMinLayer.value_or(layer) > layer) {
+		LOG(("E2E Error: _min_layer too large: %1 > %2").arg(*maybeMinLayer).arg(layer));
+		return true;
+	} else if (!cons.isEmpty() && GetCons(object) != cons) {
+		LOG(("E2E Error: Expected %1 here.").arg(cons));
+		return true;
+	}
+	return false;
+}
+
+[[nodiscard]] std::optional<MTPMessageEntity> GetEntity(
+		const QString &text,
+		const QJsonObject &object) {
+	const auto cons = GetCons(object).value_or(QString());
+	const auto offset = GetInt(object, "offset").value_or(-1);
+	const auto length = GetInt(object, "length").value_or(0);
+	if (Unsupported(object)
+		|| (offset < 0)
+		|| (length <= 0)
+		|| (offset >= text.size())
+		|| (length > text.size())
+		|| (offset + length > text.size())) {
+		return {};
+	}
+	const auto simple = [&](const auto &make) {
+		return make(MTP_int(offset), MTP_int(length));
+	};
+	if (cons == "messageEntityBold") {
+		return simple(MTP_messageEntityBold);
+	} else if (cons == "messageEntityItalic") {
+		return simple(MTP_messageEntityItalic);
+	} else if (cons == "messageEntityUnderline") {
+		return simple(MTP_messageEntityUnderline);
+	} else if (cons == "messageEntityStrike") {
+		return simple(MTP_messageEntityStrike);
+	} else if (cons == "messageEntitySpoiler") {
+		return simple(MTP_messageEntitySpoiler);
+	} else if (cons == "messageEntityCustomEmoji") {
+		const auto maybeDocumentId = GetLong(object, "document_id");
+		if (const auto documentId = maybeDocumentId.value_or(0)) {
+			return MTP_messageEntityCustomEmoji(
+				MTP_int(offset),
+				MTP_int(length),
+				MTP_long(documentId));
+		}
+	}
+	return {};
+}
+
+[[nodiscard]] QVector<MTPMessageEntity> GetEntities(
+		const QString &text,
+		const QJsonArray &list) {
+	auto result = QVector<MTPMessageEntity>();
+	result.reserve(list.size());
+	for (const auto &entry : list) {
+		if (const auto entity = GetEntity(text, entry.toObject())) {
+			result.push_back(*entity);
+		}
+	}
+	return result;
+}
+
+} // namespace
+
+QByteArray SerializeMessage(const PreparedMessage &data) {
+	return Serialize(Object("groupCallMessage", {
+		Value(
+			"random_id",
+			String(QByteArray::number(int64(data.randomId)))),
+		Value(
+			"message",
+			Object("textWithEntities", {
+				Value("text", String(data.message.data().vtext().v)),
+				Value(
+					"entities",
+					Array(Entities(data.message.data().ventities().v))),
+			})),
+	}));
+}
+
+std::optional<PreparedMessage> DeserializeMessage(
+		const QByteArray &data) {
+	auto error = QJsonParseError();
+	auto document = QJsonDocument::fromJson(data, &error);
+	if (error.error != QJsonParseError::NoError
+		|| !document.isObject()) {
+		LOG(("E2E Error: Bad json in Calls::Group::DeserializeMessage."));
+		return {};
+	}
+	const auto groupCallMessage = document.object();
+	if (Unsupported(groupCallMessage, "groupCallMessage")) {
+		return {};
+	}
+	const auto randomId = GetLong(groupCallMessage, "random_id").value_or(0);
+	if (!randomId) {
+		return {};
+	}
+	const auto message = groupCallMessage["message"].toObject();
+	if (Unsupported(message, "textWithEntities")) {
+		return {};
+	}
+	const auto maybeText = GetString(message, "text");
+	if (!maybeText) {
+		return {};
+	}
+	const auto &text = *maybeText;
+	const auto maybeEntities = GetValue(message, "entities");
+	if (!maybeEntities || !maybeEntities->isArray()) {
+		return {};
+	}
+	const auto entities = GetEntities(text, maybeEntities->toArray());
+	return PreparedMessage{
+		.randomId = randomId,
+		.message = MTP_textWithEntities(
+			MTP_string(text),
+			MTP_vector<MTPMessageEntity>(entities)),
+	};
+}
+
+} // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_message_encryption.h b/Telegram/SourceFiles/calls/group/calls_group_message_encryption.h
new file mode 100644
index 00000000000000..a71dd2894cb86b
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/calls_group_message_encryption.h
@@ -0,0 +1,21 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Calls::Group {
+
+struct PreparedMessage {
+	uint64 randomId = 0;
+	MTPTextWithEntities message;
+};
+
+[[nodiscard]] QByteArray SerializeMessage(const PreparedMessage &data);
+[[nodiscard]] std::optional<PreparedMessage> DeserializeMessage(
+	const QByteArray &data);
+
+} // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_message_field.cpp b/Telegram/SourceFiles/calls/group/calls_group_message_field.cpp
new file mode 100644
index 00000000000000..eabf30e62076c5
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/calls_group_message_field.cpp
@@ -0,0 +1,668 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "calls/group/calls_group_message_field.h"
+
+#include "base/event_filter.h"
+#include "boxes/premium_preview_box.h"
+#include "calls/group/calls_group_messages.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "chat_helpers/emoji_suggestions_widget.h"
+#include "chat_helpers/message_field.h"
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "core/ui_integration.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/stickers/data_stickers.h"
+#include "data/data_document.h"
+#include "data/data_session.h"
+#include "history/view/reactions/history_view_reactions_selector.h"
+#include "history/view/reactions/history_view_reactions_strip.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "ui/controls/emoji_button.h"
+#include "ui/controls/send_button.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "ui/userpic_view.h"
+#include "styles/style_calls.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_chat.h"
+#include "styles/style_media_view.h"
+
+namespace Calls::Group {
+namespace {
+
+constexpr auto kErrorLimit = 99;
+
+using Chosen = HistoryView::Reactions::ChosenReaction;
+
+} // namespace
+
+class ReactionPanel final {
+public:
+	ReactionPanel(
+		not_null<QWidget*> outer,
+		std::shared_ptr<ChatHelpers::Show> show,
+		rpl::producer<QRect> fieldGeometry);
+	~ReactionPanel();
+
+	[[nodiscard]] rpl::producer<Chosen> chosen() const;
+
+	void show();
+	void hide();
+	void raise();
+	void hideIfCollapsed();
+	void collapse();
+
+private:
+	struct Hiding;
+
+	void create();
+	void updateShowState();
+	void fadeOutSelector();
+	void startAnimation();
+
+	const not_null<QWidget*> _outer;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	std::unique_ptr<Ui::RpWidget> _parent;
+	std::unique_ptr<HistoryView::Reactions::Selector> _selector;
+	std::vector<std::unique_ptr<Hiding>> _hiding;
+	rpl::event_stream<Chosen> _chosen;
+	Ui::Animations::Simple _showing;
+	rpl::variable<float64> _shownValue;
+	rpl::variable<QRect> _fieldGeometry;
+	rpl::variable<bool> _expanded;
+	rpl::variable<bool> _shown = false;
+
+};
+
+struct ReactionPanel::Hiding {
+	explicit Hiding(not_null<QWidget*> parent) : widget(parent) {
+	}
+
+	Ui::RpWidget widget;
+	Ui::Animations::Simple animation;
+	QImage frame;
+};
+
+ReactionPanel::ReactionPanel(
+	not_null<QWidget*> outer,
+	std::shared_ptr<ChatHelpers::Show> show,
+	rpl::producer<QRect> fieldGeometry)
+: _outer(outer)
+, _show(std::move(show))
+, _fieldGeometry(std::move(fieldGeometry)) {
+}
+
+ReactionPanel::~ReactionPanel() = default;
+
+auto ReactionPanel::chosen() const -> rpl::producer<Chosen> {
+	return _chosen.events();
+}
+
+void ReactionPanel::show() {
+	if (_shown.current()) {
+		return;
+	}
+	create();
+	if (!_selector) {
+		return;
+	}
+	const auto duration = st::defaultPanelAnimation.heightDuration
+		* st::defaultPopupMenu.showDuration;
+	_shown = true;
+	_showing.start([=] { updateShowState(); }, 0., 1., duration);
+	updateShowState();
+	_parent->show();
+}
+
+void ReactionPanel::hide() {
+	if (!_selector) {
+		return;
+	}
+	_selector->beforeDestroy();
+	if (!anim::Disabled()) {
+		fadeOutSelector();
+	}
+	_shown = false;
+	_expanded = false;
+	_showing.stop();
+	_selector = nullptr;
+	_parent = nullptr;
+}
+
+void ReactionPanel::raise() {
+	if (_parent) {
+		_parent->raise();
+	}
+}
+
+void ReactionPanel::hideIfCollapsed() {
+	if (!_expanded.current()) {
+		hide();
+	}
+}
+
+void ReactionPanel::collapse() {
+	if (_expanded.current()) {
+		hide();
+		show();
+	}
+}
+
+void ReactionPanel::create() {
+	auto reactions = Data::LookupPossibleReactions(&_show->session());
+	if (reactions.recent.empty()) {
+		return;
+	}
+	_parent = std::make_unique<Ui::RpWidget>(_outer);
+	_parent->show();
+
+	_parent->events() | rpl::on_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::MouseButtonPress) {
+			const auto event = static_cast<QMouseEvent*>(e.get());
+			if (event->button() == Qt::LeftButton) {
+				if (!_selector
+					|| !_selector->geometry().contains(event->pos())) {
+					collapse();
+				}
+			}
+		}
+	}, _parent->lifetime());
+
+	_selector = std::make_unique<HistoryView::Reactions::Selector>(
+		_parent.get(),
+		st::storiesReactionsPan,
+		_show,
+		std::move(reactions),
+		TextWithEntities(),
+		[=](bool fast) { hide(); },
+		nullptr, // iconFactory
+		nullptr, // paused
+		true);
+
+	_selector->chosen(
+	) | rpl::on_next([=](Chosen reaction) {
+		if (reaction.id.custom() && !_show->session().premium()) {
+			ShowPremiumPreviewBox(
+				_show,
+				PremiumFeature::AnimatedEmoji);
+		} else {
+			_chosen.fire(std::move(reaction));
+			hide();
+		}
+	}, _selector->lifetime());
+
+	const auto desiredWidth = st::storiesReactionsWidth;
+	const auto maxWidth = desiredWidth * 2;
+	const auto width = _selector->countWidth(desiredWidth, maxWidth);
+	const auto margins = _selector->marginsForShadow();
+	const auto categoriesTop = _selector->extendTopForCategoriesAndAbout(
+		width);
+	const auto full = margins.left() + width + margins.right();
+
+	_shownValue = 0.;
+	rpl::combine(
+		_fieldGeometry.value(),
+		_shownValue.value(),
+		_expanded.value()
+	) | rpl::on_next([=](QRect field, float64 shown, bool expanded) {
+		const auto width = margins.left()
+			+ _selector->countAppearedWidth(shown)
+			+ margins.right();
+		const auto available = field.y();
+		const auto min = st::storiesReactionsBottomSkip
+			+ st::reactStripHeight;
+		const auto max = min
+			+ margins.top()
+			+ categoriesTop
+			+ st::storiesReactionsAddedTop;
+		const auto height = expanded ? std::min(available, max) : min;
+		const auto top = field.y() - height;
+		const auto shift = (width / 2);
+		const auto right = (field.x() + field.width() / 2 + shift);
+		_parent->setGeometry(QRect((right - width), top, full, height));
+		const auto innerTop = height
+			- st::storiesReactionsBottomSkip
+			- st::reactStripHeight;
+		const auto maxAdded = innerTop - margins.top() - categoriesTop;
+		const auto added = std::min(maxAdded, st::storiesReactionsAddedTop);
+		_selector->setSpecialExpandTopSkip(added);
+		_selector->initGeometry(innerTop);
+	}, _selector->lifetime());
+
+	_selector->willExpand(
+	) | rpl::on_next([=] {
+		_expanded = true;
+
+		const auto raw = _parent.get();
+		base::install_event_filter(raw, qApp, [=](not_null<QEvent*> e) {
+			if (e->type() == QEvent::MouseButtonPress) {
+				const auto event = static_cast<QMouseEvent*>(e.get());
+				if (event->button() == Qt::LeftButton) {
+					if (!_selector
+						|| !_selector->geometry().contains(
+							_parent->mapFromGlobal(event->globalPos()))) {
+						collapse();
+					}
+				}
+			}
+			return base::EventFilterResult::Continue;
+		});
+	}, _selector->lifetime());
+
+	_selector->escapes() | rpl::on_next([=] {
+		collapse();
+	}, _selector->lifetime());
+}
+
+void ReactionPanel::fadeOutSelector() {
+	const auto geometry = Ui::MapFrom(
+		_outer,
+		_parent.get(),
+		_selector->geometry());
+	_hiding.push_back(std::make_unique<Hiding>(_outer));
+	const auto raw = _hiding.back().get();
+	raw->frame = Ui::GrabWidgetToImage(_selector.get());
+	raw->widget.setGeometry(geometry);
+	raw->widget.show();
+	raw->widget.paintRequest(
+	) | rpl::on_next([=] {
+		if (const auto opacity = raw->animation.value(0.)) {
+			auto p = QPainter(&raw->widget);
+			p.setOpacity(opacity);
+			p.drawImage(0, 0, raw->frame);
+		}
+	}, raw->widget.lifetime());
+	Ui::PostponeCall(&raw->widget, [=] {
+		raw->animation.start([=] {
+			if (raw->animation.animating()) {
+				raw->widget.update();
+			} else {
+				const auto i = ranges::find(
+					_hiding,
+					raw,
+					&std::unique_ptr<Hiding>::get);
+				if (i != end(_hiding)) {
+					_hiding.erase(i);
+				}
+			}
+		}, 1., 0., st::slideWrapDuration);
+	});
+}
+
+void ReactionPanel::updateShowState() {
+	const auto progress = _showing.value(_shown.current() ? 1. : 0.);
+	const auto opacity = 1.;
+	const auto appearing = _showing.animating();
+	const auto toggling = false;
+	_shownValue = progress;
+	_selector->updateShowState(progress, opacity, appearing, toggling);
+}
+
+MessageField::MessageField(
+	not_null<QWidget*> parent,
+	std::shared_ptr<ChatHelpers::Show> show,
+	PeerData *peer)
+: _parent(parent)
+, _show(std::move(show))
+, _wrap(std::make_unique<Ui::RpWidget>(_parent))
+, _limit(_show->session().appConfig().groupCallMessageLengthLimit()) {
+	createControls(peer);
+}
+
+MessageField::~MessageField() = default;
+
+void MessageField::createControls(PeerData *peer) {
+	setupBackground();
+
+	const auto &st = st::storiesComposeControls;
+	_field = Ui::CreateChild<Ui::InputField>(
+		_wrap.get(),
+		st.field,
+		Ui::InputField::Mode::MultiLine,
+		tr::lng_message_ph());
+	_field->setMaxLength(_limit + kErrorLimit);
+	_field->setMinHeight(st.attach.height
+		- st.padding.top()
+		- st.padding.bottom());
+	_field->setMaxHeight(st::historyComposeFieldMaxHeight);
+	_field->setDocumentMargin(4.);
+	_field->setAdditionalMargin(style::ConvertScale(4) - 4);
+
+	_reactionPanel = std::make_unique<ReactionPanel>(
+		_parent,
+		_show,
+		_wrap->geometryValue());
+	_fieldFocused = _field->focusedChanges();
+	_fieldEmpty = _field->changes() | rpl::map([field = _field] {
+		return field->getLastText().trimmed().isEmpty();
+	});
+	rpl::combine(
+		_fieldFocused.value(),
+		_fieldEmpty.value()
+	) | rpl::on_next([=](bool focused, bool empty) {
+		if (!focused) {
+			_reactionPanel->hideIfCollapsed();
+		} else if (empty) {
+			_reactionPanel->show();
+		} else {
+			_reactionPanel->hide();
+		}
+	}, _field->lifetime());
+
+	_reactionPanel->chosen(
+	) | rpl::on_next([=](Chosen reaction) {
+		if (const auto customId = reaction.id.custom()) {
+			const auto document = _show->session().data().document(customId);
+			if (const auto sticker = document->sticker()) {
+				if (const auto alt = sticker->alt; !alt.isEmpty()) {
+					const auto length = int(alt.size());
+					const auto data = Data::SerializeCustomEmojiId(customId);
+					const auto tag = Ui::InputField::CustomEmojiLink(data);
+					_submitted.fire({ alt, { { 0, length, tag } } });
+				}
+			}
+		} else {
+			_submitted.fire({ reaction.id.emoji() });
+		}
+		_reactionPanel->hide();
+	}, _field->lifetime());
+
+	const auto show = _show;
+	const auto allow = [=](not_null<DocumentData*> emoji) {
+		if (peer && Data::AllowEmojiWithoutPremium(peer, emoji)) {
+			return true;
+		}
+		return false;
+	};
+	InitMessageFieldHandlers({
+		.session = &show->session(),
+		.show = show,
+		.field = _field,
+		.customEmojiPaused = [=] {
+			return show->paused(ChatHelpers::PauseReason::Layer);
+		},
+		.allowPremiumEmoji = allow,
+		.fieldStyle = &st.files.caption,
+		.allowMarkdownTags = {
+			Ui::InputField::kTagBold,
+			Ui::InputField::kTagItalic,
+			Ui::InputField::kTagUnderline,
+			Ui::InputField::kTagStrikeOut,
+			Ui::InputField::kTagSpoiler,
+		},
+	});
+	Ui::Emoji::SuggestionsController::Init(
+		_parent,
+		_field,
+		&_show->session(),
+		{
+			.suggestCustomEmoji = true,
+			.allowCustomWithoutPremium = allow,
+			.st = &st.suggestions,
+		});
+
+	_send = Ui::CreateChild<Ui::SendButton>(_wrap.get(), st.send);
+	_send->show();
+
+	using Selector = ChatHelpers::TabbedSelector;
+	_emojiPanel = std::make_unique<ChatHelpers::TabbedPanel>(
+		_parent,
+		ChatHelpers::TabbedPanelDescriptor{
+			.ownedSelector = object_ptr<Selector>(
+				nullptr,
+				ChatHelpers::TabbedSelectorDescriptor{
+					.show = _show,
+					.st = st.tabbed,
+					.level = ChatHelpers::PauseReason::Layer,
+					.mode = ChatHelpers::TabbedSelector::Mode::EmojiOnly,
+					.features = {
+						.stickersSettings = false,
+						.openStickerSets = false,
+					},
+				}),
+		});
+	const auto panel = _emojiPanel.get();
+	panel->setDesiredHeightValues(
+		1.,
+		st::emojiPanMinHeight / 2,
+		st::emojiPanMinHeight);
+	panel->hide();
+	panel->selector()->setCurrentPeer(peer);
+	panel->selector()->emojiChosen(
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
+		Ui::InsertEmojiAtCursor(_field->textCursor(), data.emoji);
+	}, lifetime());
+	panel->selector()->customEmojiChosen(
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+		const auto info = data.document->sticker();
+		if (info
+			&& info->setType == Data::StickersType::Emoji
+			&& !_show->session().premium()) {
+			ShowPremiumPreviewBox(
+				_show,
+				PremiumFeature::AnimatedEmoji);
+		} else {
+			Data::InsertCustomEmoji(_field, data.document);
+		}
+	}, lifetime());
+
+	_emojiToggle = Ui::CreateChild<Ui::EmojiButton>(_wrap.get(), st.emoji);
+	_emojiToggle->show();
+
+	_emojiToggle->installEventFilter(panel);
+	_emojiToggle->addClickHandler([=] {
+		panel->toggleAnimated();
+	});
+
+	_width.value(
+	) | rpl::filter(
+		rpl::mappers::_1 > 0
+	) | rpl::on_next([=](int newWidth) {
+		const auto &st = st::storiesComposeControls;
+		const auto fieldWidth = newWidth
+			- st.padding.top()
+			- _emojiToggle->width()
+			- _send->width();
+		_field->resizeToWidth(fieldWidth);
+		_field->moveToLeft(st.padding.top(), st.padding.top(), newWidth);
+		updateWrapSize(newWidth);
+	}, _lifetime);
+
+	rpl::combine(
+		_width.value(),
+		_field->heightValue()
+	) | rpl::on_next([=](int width, int height) {
+		if (width <= 0) {
+			return;
+		}
+		const auto &st = st::storiesComposeControls;
+		const auto minHeight = st.attach.height
+			- st.padding.top()
+			- st.padding.bottom();
+		_send->moveToRight(0, height - minHeight, width);
+		_emojiToggle->moveToRight(_send->width(), height - minHeight, width);
+		updateWrapSize();
+	}, _lifetime);
+
+	_field->cancelled() | rpl::on_next([=] {
+		_closeRequests.fire({});
+	}, _lifetime);
+
+	const auto updateLimitPosition = [=](QSize parent, QSize label) {
+		const auto &st = st::storiesComposeControls;
+		const auto skip = st.padding.top();
+		return QPoint(parent.width() - label.width() - skip, skip);
+	};
+	Ui::AddLengthLimitLabel(_field, _limit, {
+		.customParent = _wrap.get(),
+		.customUpdatePosition = updateLimitPosition,
+	});
+
+	rpl::merge(
+		_field->submits() | rpl::to_empty,
+		_send->clicks() | rpl::to_empty
+	) | rpl::on_next([=] {
+		auto text = _field->getTextWithTags();
+		if (text.text.size() <= _limit) {
+			_submitted.fire(std::move(text));
+		}
+	}, _lifetime);
+}
+
+void MessageField::updateEmojiPanelGeometry() {
+	const auto global = _emojiToggle->mapToGlobal({ 0, 0 });
+	const auto local = _parent->mapFromGlobal(global);
+	_emojiPanel->moveBottomRight(
+		local.y(),
+		local.x() + _emojiToggle->width() * 3);
+}
+
+void MessageField::setupBackground() {
+	_wrap->paintRequest() | rpl::on_next([=] {
+		const auto &st = st::storiesComposeControls;
+		const auto radius = st.attach.height / 2.;
+		auto p = QPainter(_wrap.get());
+		auto hq = PainterHighQualityEnabler(p);
+
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::storiesComposeBg);
+		p.drawRoundedRect(_wrap->rect(), radius, radius);
+	}, _lifetime);
+}
+
+void MessageField::resizeToWidth(int newWidth) {
+	_width = newWidth;
+	if (_wrap->isHidden()) {
+		Ui::SendPendingMoveResizeEvents(_wrap.get());
+	}
+	updateEmojiPanelGeometry();
+}
+
+void MessageField::move(int x, int y) {
+	_wrap->move(x, y);
+	if (_cache) {
+		_cache->move(x, y);
+	}
+}
+
+void MessageField::toggle(bool shown) {
+	if (_shown == shown) {
+		return;
+	} else if (shown) {
+		Assert(_width.current() > 0);
+		Ui::SendPendingMoveResizeEvents(_wrap.get());
+	} else if (Ui::InFocusChain(_field)) {
+		_parent->setFocus();
+	}
+	_shown = shown;
+	if (!anim::Disabled()) {
+		if (!_cache) {
+			auto image = Ui::GrabWidgetToImage(_wrap.get());
+			_cache = std::make_unique<Ui::RpWidget>(_parent);
+			const auto raw = _cache.get();
+			raw->paintRequest() | rpl::on_next([=] {
+				auto p = QPainter(raw);
+				auto hq = PainterHighQualityEnabler(p);
+				const auto scale = raw->height() / float64(_wrap->height());
+				const auto target = _wrap->rect();
+				const auto center = target.center();
+				p.translate(center);
+				p.scale(scale, scale);
+				p.translate(-center);
+				p.drawImage(target, image);
+			}, raw->lifetime());
+			raw->show();
+			raw->move(_wrap->pos());
+			raw->resize(_wrap->width(), 0);
+
+			_wrap->hide();
+		}
+		_shownAnimation.start(
+			[=] { shownAnimationCallback(); },
+			shown ? 0. : 1.,
+			shown ? 1. : 0.,
+			st::slideWrapDuration,
+			anim::easeOutCirc);
+	}
+	shownAnimationCallback();
+}
+
+void MessageField::raise() {
+	_wrap->raise();
+	if (_cache) {
+		_cache->raise();
+	}
+	if (_reactionPanel) {
+		_reactionPanel->raise();
+	}
+	if (_emojiPanel) {
+		_emojiPanel->raise();
+	}
+}
+
+void MessageField::updateWrapSize(int widthOverride) {
+	const auto &st = st::storiesComposeControls;
+	const auto width = widthOverride ? widthOverride : _wrap->width();
+	const auto height = _field->height()
+		+ st.padding.top()
+		+ st.padding.bottom();
+	_wrap->resize(width, height);
+	updateHeight();
+}
+
+void MessageField::updateHeight() {
+	_height = int(base::SafeRound(
+		_shownAnimation.value(_shown ? 1. : 0.) * _wrap->height()));
+}
+
+void MessageField::shownAnimationCallback() {
+	updateHeight();
+	if (_shownAnimation.animating()) {
+		Assert(_cache != nullptr);
+		_cache->resize(_cache->width(), _height.current());
+		_cache->update();
+	} else if (_shown) {
+		_cache = nullptr;
+		_wrap->show();
+		_field->setFocusFast();
+	} else {
+		_closed.fire({});
+	}
+}
+
+int MessageField::height() const {
+	return _height.current();
+}
+
+rpl::producer<int> MessageField::heightValue() const {
+	return _height.value();
+}
+
+rpl::producer<TextWithTags> MessageField::submitted() const {
+	return _submitted.events();
+}
+
+rpl::producer<> MessageField::closeRequests() const {
+	return _closeRequests.events();
+}
+
+rpl::producer<> MessageField::closed() const {
+	return _closed.events();
+}
+
+rpl::lifetime &MessageField::lifetime() {
+	return _lifetime;
+}
+
+} // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_message_field.h b/Telegram/SourceFiles/calls/group/calls_group_message_field.h
new file mode 100644
index 00000000000000..b1f7eb4534dbdf
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/calls_group_message_field.h
@@ -0,0 +1,88 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/animations.h"
+
+struct TextWithTags;
+
+namespace ChatHelpers {
+class Show;
+class TabbedPanel;
+} // namespace ChatHelpers
+
+namespace Ui {
+class EmojiButton;
+class InputField;
+class SendButton;
+class RpWidget;
+} // namespace Ui
+
+namespace Calls::Group {
+
+class ReactionPanel;
+
+class MessageField final {
+public:
+	MessageField(
+		not_null<QWidget*> parent,
+		std::shared_ptr<ChatHelpers::Show> show,
+		PeerData *peer);
+	~MessageField();
+
+	void resizeToWidth(int newWidth);
+	void move(int x, int y);
+	void toggle(bool shown);
+	void raise();
+
+	[[nodiscard]] int height() const;
+	[[nodiscard]] rpl::producer<int> heightValue() const;
+
+	[[nodiscard]] rpl::producer<TextWithTags> submitted() const;
+	[[nodiscard]] rpl::producer<> closeRequests() const;
+	[[nodiscard]] rpl::producer<> closed() const;
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
+private:
+	void createControls(PeerData *peer);
+	void setupBackground();
+	void shownAnimationCallback();
+	void updateEmojiPanelGeometry();
+	void updateWrapSize(int widthOverride = 0);
+	void updateHeight();
+
+	const not_null<QWidget*> _parent;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const std::unique_ptr<Ui::RpWidget> _wrap;
+
+	int _limit = 0;
+	Ui::InputField *_field = nullptr;
+	Ui::SendButton *_send = nullptr;
+	Ui::EmojiButton *_emojiToggle = nullptr;
+	std::unique_ptr<ChatHelpers::TabbedPanel> _emojiPanel;
+	std::unique_ptr<ReactionPanel> _reactionPanel;
+	rpl::variable<bool> _fieldFocused;
+	rpl::variable<bool> _fieldEmpty = true;
+
+	rpl::variable<int> _width;
+	rpl::variable<int> _height;
+
+	bool _shown = false;
+	Ui::Animations::Simple _shownAnimation;
+	std::unique_ptr<Ui::RpWidget> _cache;
+
+	rpl::event_stream<TextWithTags> _submitted;
+	rpl::event_stream<> _closeRequests;
+	rpl::event_stream<> _closed;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_messages.cpp b/Telegram/SourceFiles/calls/group/calls_group_messages.cpp
new file mode 100644
index 00000000000000..3275fdf115956b
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/calls_group_messages.cpp
@@ -0,0 +1,731 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "calls/group/calls_group_messages.h"
+
+#include "apiwrap.h"
+#include "api/api_blocked_peers.h"
+#include "api/api_chat_participants.h"
+#include "api/api_text_entities.h"
+#include "base/random.h"
+#include "base/unixtime.h"
+#include "calls/group/ui/calls_group_stars_coloring.h"
+#include "calls/group/calls_group_call.h"
+#include "calls/group/calls_group_message_encryption.h"
+#include "data/data_channel.h"
+#include "data/data_group_call.h"
+#include "data/data_message_reactions.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "mtproto/sender.h"
+#include "ui/text/text_utilities.h"
+#include "ui/ui_utility.h"
+
+namespace Calls::Group {
+namespace {
+
+constexpr auto kMaxShownVideoStreamMessages = 100;
+constexpr auto kStarsStatsShortPollDelay = 30 * crl::time(1000);
+
+[[nodiscard]] StarsTop ParseStarsTop(
+		not_null<Data::Session*> owner,
+		const MTPphone_GroupCallStars &stars) {
+	const auto &data = stars.data();
+	const auto &list = data.vtop_donors().v;
+	auto result = StarsTop{ .total = int(data.vtotal_stars().v) };
+	result.topDonors.reserve(list.size());
+	for (const auto &entry : list) {
+		const auto &fields = entry.data();
+		result.topDonors.push_back({
+			.peer = (fields.vpeer_id()
+				? owner->peer(peerFromMTP(*fields.vpeer_id())).get()
+				: nullptr),
+			.stars = int(fields.vstars().v),
+			.my = fields.is_my(),
+		});
+	}
+	return result;
+}
+
+[[nodiscard]] TimeId PinFinishDate(
+		not_null<PeerData*> peer,
+		TimeId date,
+		int stars) {
+	if (!date || !stars) {
+		return 0;
+	}
+	const auto &colorings = peer->session().appConfig().groupCallColorings();
+	return date + Ui::StarsColoringForCount(colorings, stars).secondsPin;
+}
+
+[[nodiscard]] TimeId PinFinishDate(const Message &message) {
+	return PinFinishDate(message.peer, message.date, message.stars);
+}
+
+} // namespace
+
+Messages::Messages(not_null<GroupCall*> call, not_null<MTP::Sender*> api)
+: _call(call)
+, _session(&call->peer()->session())
+, _api(api)
+, _destroyTimer([=] { checkDestroying(); })
+, _ttl(_session->appConfig().groupCallMessageTTL())
+, _starsStatsTimer([=] { requestStarsStats(); }) {
+	Ui::PostponeCall(_call, [=] {
+		_call->real(
+		) | rpl::on_next([=](not_null<Data::GroupCall*> call) {
+			_real = call;
+			if (ready()) {
+				sendPending();
+			} else {
+				Unexpected("Not ready call.");
+			}
+		}, _lifetime);
+
+		requestStarsStats();
+	});
+}
+
+Messages::~Messages() {
+	if (_paid.sending > 0) {
+		finishPaidSending({
+			.count = int(_paid.sending),
+			.valid = true,
+			.shownPeer = _paid.sendingShownPeer,
+		}, false);
+	}
+}
+
+void Messages::requestStarsStats() {
+	if (!_call->videoStream()) {
+		return;
+	}
+	_starsStatsTimer.cancel();
+	_starsTopRequestId = _api->request(MTPphone_GetGroupCallStars(
+		_call->inputCall()
+	)).done([=](const MTPphone_GroupCallStars &result) {
+		const auto &data = result.data();
+
+		const auto owner = &_session->data();
+		owner->processUsers(data.vusers());
+		owner->processChats(data.vchats());
+
+		_paid.top = ParseStarsTop(owner, result);
+		_paidChanges.fire({});
+
+		_starsStatsTimer.callOnce(kStarsStatsShortPollDelay);
+	}).fail([=](const MTP::Error &error) {
+		[[maybe_unused]] const auto &type = error.type();
+		_starsStatsTimer.callOnce(kStarsStatsShortPollDelay);
+	}).send();
+
+}
+
+bool Messages::ready() const {
+	return _real && (!_call->conference() || _call->e2eEncryptDecrypt());
+}
+
+void Messages::send(TextWithTags text, int stars) {
+	if (text.empty() && !stars) {
+		return;
+	} else if (!ready()) {
+		_pending.push_back({ std::move(text), stars });
+		return;
+	}
+
+	auto prepared = TextWithEntities{
+		text.text,
+		TextUtilities::ConvertTextTagsToEntities(text.tags)
+	};
+	auto serialized = MTPTextWithEntities(MTP_textWithEntities(
+		MTP_string(prepared.text),
+		Api::EntitiesToMTP(
+			&_real->session(),
+			prepared.entities,
+			Api::ConvertOption::SkipLocal)));
+
+	const auto localId = _call->peer()->owner().nextLocalMessageId();
+	const auto randomId = base::RandomValue<uint64>();
+	_sendingIdByRandomId.emplace(randomId, localId);
+
+	const auto from = _call->messagesFrom();
+	const auto creator = _real->creator();
+	const auto skip = skipMessage(prepared, stars);
+	if (skip) {
+		_skippedIds.emplace(localId);
+	} else {
+		_messages.push_back({
+			.id = localId,
+			.peer = from,
+			.text = std::move(prepared),
+			.stars = stars,
+			.admin = (from == _call->peer()) || (creator && from->isSelf()),
+			.mine = true,
+		});
+	}
+	if (!_call->conference()) {
+		using Flag = MTPphone_SendGroupCallMessage::Flag;
+		_api->request(MTPphone_SendGroupCallMessage(
+			MTP_flags(Flag::f_send_as
+				| (stars ? Flag::f_allow_paid_stars : Flag())),
+			_call->inputCall(),
+			MTP_long(randomId),
+			serialized,
+			MTP_long(stars),
+			from->input()
+		)).done([=](
+				const MTPUpdates &result,
+				const MTP::Response &response) {
+			_session->api().applyUpdates(result, randomId);
+		}).fail([=](const MTP::Error &, const MTP::Response &response) {
+			failed(randomId, response);
+		}).send();
+	} else {
+		const auto bytes = SerializeMessage({ randomId, serialized });
+		auto v = std::vector<std::uint8_t>(bytes.size());
+		bytes::copy(bytes::make_span(v), bytes::make_span(bytes));
+
+		const auto userId = peerToUser(from->id).bare;
+		const auto encrypt = _call->e2eEncryptDecrypt();
+		const auto encrypted = encrypt(v, int64_t(userId), true, 0);
+
+		_api->request(MTPphone_SendGroupCallEncryptedMessage(
+			_call->inputCall(),
+			MTP_bytes(bytes::make_span(encrypted))
+		)).done([=](const MTPBool &, const MTP::Response &response) {
+			sent(randomId, response);
+		}).fail([=](const MTP::Error &, const MTP::Response &response) {
+			failed(randomId, response);
+		}).send();
+	}
+
+	addStars(from, stars, true);
+	if (!skip) {
+		checkDestroying(true);
+	}
+}
+
+void Messages::setApplyingInitial(bool value) {
+	_applyingInitial = value;
+}
+
+void Messages::received(const MTPDupdateGroupCallMessage &data) {
+	if (!ready()) {
+		return;
+	}
+	const auto &fields = data.vmessage().data();
+	received(
+		fields.vid().v,
+		fields.vfrom_id(),
+		fields.vmessage(),
+		fields.vdate().v,
+		fields.vpaid_message_stars().value_or_empty(),
+		fields.is_from_admin());
+}
+
+void Messages::received(const MTPDupdateGroupCallEncryptedMessage &data) {
+	if (!ready()) {
+		return;
+	}
+	const auto fromId = data.vfrom_id();
+	const auto &bytes = data.vencrypted_message().v;
+	auto v = std::vector<std::uint8_t>(bytes.size());
+	bytes::copy(bytes::make_span(v), bytes::make_span(bytes));
+
+	const auto userId = peerToUser(peerFromMTP(fromId)).bare;
+	const auto decrypt = _call->e2eEncryptDecrypt();
+	const auto decrypted = decrypt(v, int64_t(userId), false, 0);
+
+	const auto deserialized = DeserializeMessage(QByteArray::fromRawData(
+		reinterpret_cast<const char*>(decrypted.data()),
+		decrypted.size()));
+	if (!deserialized) {
+		LOG(("API Error: Can't parse decrypted message"));
+		return;
+	}
+	const auto realId = ++_conferenceIdAutoIncrement;
+	const auto randomId = deserialized->randomId;
+	if (!_conferenceIdByRandomId.emplace(randomId, realId).second) {
+		// Already received.
+		return;
+	}
+	received(
+		realId,
+		fromId,
+		deserialized->message,
+		base::unixtime::now(), // date
+		0, // stars
+		false,
+		true); // checkCustomEmoji
+}
+
+void Messages::deleted(const MTPDupdateDeleteGroupCallMessages &data) {
+	const auto was = _messages.size();
+	for (const auto &id : data.vmessages().v) {
+		const auto i = ranges::find(_messages, id.v, &Message::id);
+		if (i != end(_messages)) {
+			_messages.erase(i);
+		}
+	}
+	if (_messages.size() < was) {
+		pushChanges();
+	}
+}
+
+void Messages::sent(const MTPDupdateMessageID &data) {
+	sent(data.vrandom_id().v, data.vid().v);
+}
+
+void Messages::sent(uint64 randomId, const MTP::Response &response) {
+	const auto realId = ++_conferenceIdAutoIncrement;
+	_conferenceIdByRandomId.emplace(randomId, realId);
+	sent(randomId, realId);
+
+	const auto i = ranges::find(_messages, realId, &Message::id);
+	if (i != end(_messages) && !i->date) {
+		i->date = Api::UnixtimeFromMsgId(response.outerMsgId);
+		i->pinFinishDate = PinFinishDate(*i);
+		checkDestroying(true);
+	}
+}
+
+void Messages::sent(uint64 randomId, MsgId realId) {
+	const auto i = _sendingIdByRandomId.find(randomId);
+	if (i == end(_sendingIdByRandomId)) {
+		return;
+	}
+	const auto localId = i->second;
+	_sendingIdByRandomId.erase(i);
+
+	const auto j = ranges::find(_messages, localId, &Message::id);
+	if (j == end(_messages)) {
+		_skippedIds.emplace(realId);
+		return;
+	}
+	j->id = realId;
+	crl::on_main(this, [=] {
+		const auto i = ranges::find(_messages, realId, &Message::id);
+		if (i != end(_messages) && !i->date) {
+			i->date = base::unixtime::now();
+			i->pinFinishDate = PinFinishDate(*i);
+			checkDestroying(true);
+		}
+	});
+	_idUpdates.fire({ .localId = localId, .realId = realId });
+}
+
+void Messages::received(
+		MsgId id,
+		const MTPPeer &from,
+		const MTPTextWithEntities &message,
+		TimeId date,
+		int stars,
+		bool fromAdmin,
+		bool checkCustomEmoji) {
+	const auto peer = _call->peer();
+	const auto i = ranges::find(_messages, id, &Message::id);
+	if (i != end(_messages)) {
+		const auto fromId = peerFromMTP(from);
+		const auto me1 = peer->session().userPeerId();
+		const auto me2 = _call->messagesFrom()->id;
+		if (((fromId == me1) || (fromId == me2)) && !i->date) {
+			i->date = date;
+			i->pinFinishDate = PinFinishDate(*i);
+			checkDestroying(true);
+		}
+		return;
+	} else if (_skippedIds.contains(id)) {
+		return;
+	}
+	auto allowedEntityTypes = std::vector<EntityType>{
+		EntityType::Code,
+		EntityType::Bold,
+		EntityType::Semibold,
+		EntityType::Spoiler,
+		EntityType::StrikeOut,
+		EntityType::Underline,
+		EntityType::Italic,
+		EntityType::CustomEmoji,
+	};
+	if (checkCustomEmoji && !peer->isSelf() && !peer->isPremium()) {
+		allowedEntityTypes.pop_back();
+	}
+	const auto author = peer->owner().peer(peerFromMTP(from));
+
+	auto text = Ui::Text::Filtered(
+		Api::ParseTextWithEntities(&author->session(), message),
+		allowedEntityTypes);
+	const auto mine = author->isSelf()
+		|| (author->isChannel() && author->asChannel()->amCreator());
+	const auto skip = skipMessage(text, stars);
+	if (skip) {
+		_skippedIds.emplace(id);
+	} else {
+		// Should check by sendAsPeers() list instead, but it may not be
+		// loaded here yet.
+		_messages.push_back({
+			.id = id,
+			.date = date,
+			.pinFinishDate = PinFinishDate(author, date, stars),
+			.peer = author,
+			.text = std::move(text),
+			.stars = stars,
+			.admin = fromAdmin,
+			.mine = mine,
+		});
+		ranges::sort(_messages, ranges::less(), &Message::id);
+	}
+	if (!_applyingInitial) {
+		addStars(author, stars, mine);
+	}
+	if (!skip) {
+		checkDestroying(true);
+	}
+}
+
+bool Messages::skipMessage(const TextWithEntities &text, int stars) const {
+	const auto real = _call->lookupReal();
+	return text.empty()
+		&& real
+		&& (stars < real->messagesMinPrice());
+}
+
+void Messages::checkDestroying(bool afterChanges) {
+	auto next = TimeId();
+	const auto now = base::unixtime::now();
+	const auto initial = int(_messages.size());
+	if (_call->videoStream()) {
+		if (initial > kMaxShownVideoStreamMessages) {
+			const auto remove = initial - kMaxShownVideoStreamMessages;
+			auto i = begin(_messages);
+			for (auto k = 0; k != remove; ++k) {
+				if (i->date && i->pinFinishDate <= now) {
+					i = _messages.erase(i);
+				} else if (!next || next > i->pinFinishDate - now) {
+					next = i->pinFinishDate - now;
+					++i;
+				} else {
+					++i;
+				}
+			}
+		}
+	} else for (auto i = begin(_messages); i != end(_messages);) {
+		const auto date = i->date;
+		//const auto ttl = i->stars
+		//	? (Ui::StarsColoringForCount(i->stars).minutesPin * 60)
+		//	: _ttl;
+		const auto ttl = _ttl;
+		if (!date) {
+			if (i->id < 0) {
+				++i;
+			} else {
+				i = _messages.erase(i);
+			}
+		} else if (date + ttl <= now) {
+			i = _messages.erase(i);
+		} else if (!next || next > date + ttl - now) {
+			next = date + ttl - now;
+			++i;
+		} else {
+			++i;
+		}
+	}
+	if (!next) {
+		_destroyTimer.cancel();
+	} else {
+		const auto delay = next * crl::time(1000);
+		if (!_destroyTimer.isActive()
+			|| (_destroyTimer.remainingTime() > delay)) {
+			_destroyTimer.callOnce(delay);
+		}
+	}
+	if (afterChanges || (_messages.size() < initial)) {
+		pushChanges();
+	}
+}
+
+rpl::producer<std::vector<Message>> Messages::listValue() const {
+	return _changes.events_starting_with_copy(_messages);
+}
+
+rpl::producer<MessageIdUpdate> Messages::idUpdates() const {
+	return _idUpdates.events();
+}
+
+void Messages::sendPending() {
+	Expects(_real != nullptr);
+
+	for (auto &pending : base::take(_pending)) {
+		send(std::move(pending.text), pending.stars);
+	}
+	if (_paidSendingPending) {
+		reactionsPaidSend();
+	}
+}
+
+void Messages::pushChanges() {
+	if (_changesScheduled) {
+		return;
+	}
+	_changesScheduled = true;
+	Ui::PostponeCall(this, [=] {
+		_changesScheduled = false;
+		_changes.fire_copy(_messages);
+	});
+}
+
+void Messages::failed(uint64 randomId, const MTP::Response &response) {
+	const auto i = _sendingIdByRandomId.find(randomId);
+	if (i == end(_sendingIdByRandomId)) {
+		return;
+	}
+	const auto localId = i->second;
+	_sendingIdByRandomId.erase(i);
+
+	const auto j = ranges::find(_messages, localId, &Message::id);
+	if (j != end(_messages) && !j->date) {
+		j->date = Api::UnixtimeFromMsgId(response.outerMsgId);
+		j->stars = 0;
+		j->failed = true;
+		checkDestroying(true);
+	}
+}
+
+int Messages::reactionsPaidScheduled() const {
+	return _paid.scheduled;
+}
+
+PeerId Messages::reactionsLocalShownPeer() const {
+	const auto minePaidShownPeer = [&] {
+		for (const auto &entry : _paid.top.topDonors) {
+			if (entry.my) {
+				return entry.peer ? entry.peer->id : PeerId();
+			}
+		}
+		return _call->messagesFrom()->id;
+		//const auto api = &_session->api();
+		//return api->globalPrivacy().paidReactionShownPeerCurrent();
+	};
+	return _paid.scheduledFlag
+		? _paid.scheduledShownPeer
+		: _paid.sendingFlag
+		? _paid.sendingShownPeer
+		: minePaidShownPeer();
+}
+
+void Messages::reactionsPaidAdd(int count) {
+	Expects(count >= 0);
+
+	_paid.scheduled += count;
+	_paid.scheduledFlag = 1;
+	_paid.scheduledShownPeer = _call->messagesFrom()->id;
+	if (count > 0) {
+		_session->credits().lock(CreditsAmount(count));
+	}
+	_call->peer()->owner().reactions().schedulePaid(_call);
+	_paidChanges.fire({});
+}
+
+void Messages::reactionsPaidScheduledCancel() {
+	if (!_paid.scheduledFlag) {
+		return;
+	}
+	if (const auto amount = int(_paid.scheduled)) {
+		_session->credits().unlock(
+			CreditsAmount(amount));
+	}
+	_paid.scheduled = 0;
+	_paid.scheduledFlag = 0;
+	_paid.scheduledShownPeer = 0;
+	_paidChanges.fire({});
+}
+
+Data::PaidReactionSend Messages::startPaidReactionSending() {
+	_paidSendingPending = false;
+	if (!_paid.scheduledFlag || !_paid.scheduled) {
+		return {};
+	} else if (_paid.sendingFlag || !ready()) {
+		_paidSendingPending = true;
+		return {};
+	}
+	_paid.sending = _paid.scheduled;
+	_paid.sendingFlag = _paid.scheduledFlag;
+	_paid.sendingShownPeer = _paid.scheduledShownPeer;
+	_paid.scheduled = 0;
+	_paid.scheduledFlag = 0;
+	_paid.scheduledShownPeer = 0;
+	return {
+		.count = int(_paid.sending),
+		.valid = true,
+		.shownPeer = _paid.sendingShownPeer,
+	};
+}
+
+void Messages::finishPaidSending(
+		Data::PaidReactionSend send,
+		bool success) {
+	Expects(send.count == _paid.sending);
+	Expects(send.valid == (_paid.sendingFlag == 1));
+	Expects(send.shownPeer == _paid.sendingShownPeer);
+
+	_paid.sending = 0;
+	_paid.sendingFlag = 0;
+	_paid.sendingShownPeer = 0;
+	if (const auto amount = send.count) {
+		if (success) {
+			const auto from = _session->data().peer(*send.shownPeer);
+			_session->credits().withdrawLocked(CreditsAmount(amount));
+
+			auto &donors = _paid.top.topDonors;
+			const auto i = ranges::find(donors, true, &StarsDonor::my);
+			if (i != end(donors)) {
+				i->peer = from;
+				i->stars += amount;
+			} else {
+				donors.push_back({
+					.peer = from,
+					.stars = amount,
+					.my = true,
+				});
+			}
+		} else {
+			_session->credits().unlock(CreditsAmount(amount));
+			_paidChanges.fire({});
+		}
+	}
+	if (_paidSendingPending) {
+		reactionsPaidSend();
+	}
+}
+
+void Messages::reactionsPaidSend() {
+	const auto send = startPaidReactionSending();
+	if (!send.valid || !send.count) {
+		return;
+	}
+
+	const auto localId = _call->peer()->owner().nextLocalMessageId();
+	const auto randomId = base::RandomValue<uint64>();
+	_sendingIdByRandomId.emplace(randomId, localId);
+
+	const auto from = _session->data().peer(*send.shownPeer);
+	const auto stars = int(send.count);
+	const auto skip = skipMessage({}, stars);
+	if (skip) {
+		_skippedIds.emplace(localId);
+	} else {
+		_messages.push_back({
+			.id = localId,
+			.peer = from,
+			.stars = stars,
+			.admin = (from == _call->peer()),
+			.mine = true,
+		});
+	}
+	using Flag = MTPphone_SendGroupCallMessage::Flag;
+	_api->request(MTPphone_SendGroupCallMessage(
+		MTP_flags(Flag::f_send_as | Flag::f_allow_paid_stars),
+		_call->inputCall(),
+		MTP_long(randomId),
+		MTP_textWithEntities(MTP_string(), MTP_vector<MTPMessageEntity>()),
+		MTP_long(stars),
+		from->input()
+	)).done([=](
+			const MTPUpdates &result,
+			const MTP::Response &response) {
+		finishPaidSending(send, true);
+		_session->api().applyUpdates(result, randomId);
+	}).fail([=](const MTP::Error &, const MTP::Response &response) {
+		finishPaidSending(send, false);
+		failed(randomId, response);
+	}).send();
+
+	addStars(from, stars, true);
+	if (!skip) {
+		checkDestroying(true);
+	}
+}
+
+void Messages::undoScheduledPaidOnDestroy() {
+	_call->peer()->owner().reactions().undoScheduledPaid(_call);
+}
+
+Messages::PaidLocalState Messages::starsLocalState() const {
+	const auto &donors = _paid.top.topDonors;
+	const auto i = ranges::find(donors, true, &StarsDonor::my);
+	const auto local = int(_paid.scheduled);
+	const auto my = (i != end(donors) ? i->stars : 0) + local;
+	const auto total = _paid.top.total + local;
+	return { .total = total, .my = my };
+}
+
+void Messages::deleteConfirmed(MessageDeleteRequest request) {
+	const auto eraseFrom = [&](auto iterator) {
+		if (iterator != end(_messages)) {
+			_messages.erase(iterator, end(_messages));
+			pushChanges();
+		}
+	};
+	const auto peer = _call->peer();
+	if (const auto from = request.deleteAllFrom) {
+		using Flag = MTPphone_DeleteGroupCallParticipantMessages::Flag;
+		_api->request(MTPphone_DeleteGroupCallParticipantMessages(
+			MTP_flags(request.reportSpam ? Flag::f_report_spam : Flag()),
+			_call->inputCall(),
+			from->input()
+		)).send();
+		eraseFrom(ranges::remove(_messages, not_null(from), &Message::peer));
+	} else {
+		using Flag = MTPphone_DeleteGroupCallMessages::Flag;
+		_api->request(MTPphone_DeleteGroupCallMessages(
+			MTP_flags(request.reportSpam ? Flag::f_report_spam : Flag()),
+			_call->inputCall(),
+			MTP_vector<MTPint>(1, MTP_int(request.id.bare))
+		)).send();
+		eraseFrom(ranges::remove(_messages, request.id, &Message::id));
+	}
+	if (const auto ban = request.ban) {
+		if (const auto channel = peer->asChannel()) {
+			ban->session().api().chatParticipants().kick(
+				channel,
+				ban,
+				ChatRestrictionsInfo());
+		} else {
+			ban->session().api().blockedPeers().block(ban);
+		}
+	}
+}
+
+void Messages::addStars(not_null<PeerData*> from, int stars, bool mine) {
+	if (stars <= 0) {
+		return;
+	}
+	_paid.top.total += stars;
+	const auto i = ranges::find(
+		_paid.top.topDonors,
+		from.get(),
+		&StarsDonor::peer);
+	if (i != end(_paid.top.topDonors)) {
+		i->stars += stars;
+	} else {
+		_paid.top.topDonors.push_back({
+			.peer = from,
+			.stars = stars,
+			.my = mine,
+		});
+	}
+	ranges::stable_sort(
+		_paid.top.topDonors,
+		ranges::greater(),
+		&StarsDonor::stars);
+	_paidChanges.fire({ .peer = from, .stars = stars });
+}
+
+} // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_messages.h b/Telegram/SourceFiles/calls/group/calls_group_messages.h
new file mode 100644
index 00000000000000..9633ea2a250cf8
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/calls_group_messages.h
@@ -0,0 +1,199 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "base/weak_ptr.h"
+
+namespace Calls {
+class GroupCall;
+} // namespace Calls
+
+namespace Data {
+class GroupCall;
+struct PaidReactionSend;
+} // namespace Data
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace MTP {
+class Sender;
+struct Response;
+} // namespace MTP
+
+namespace Calls::Group {
+
+struct Message {
+	MsgId id = 0;
+	TimeId date = 0;
+	TimeId pinFinishDate = 0;
+	not_null<PeerData*> peer;
+	TextWithEntities text;
+	int stars = 0;
+	bool failed = false;
+	bool admin = false;
+	bool mine = false;
+};
+
+struct MessageIdUpdate {
+	MsgId localId = 0;
+	MsgId realId = 0;
+};
+
+struct MessageDeleteRequest {
+	MsgId id = 0;
+	PeerData *deleteAllFrom = nullptr;
+	PeerData *ban = nullptr;
+	bool reportSpam = false;
+};
+
+struct StarsDonor {
+	PeerData *peer = nullptr;
+	int stars = 0;
+	bool my = false;
+
+	friend inline bool operator==(
+		const StarsDonor &,
+		const StarsDonor &) = default;
+};
+
+struct StarsTop {
+	std::vector<StarsDonor> topDonors;
+	int total = 0;
+
+	friend inline bool operator==(
+		const StarsTop &,
+		const StarsTop &) = default;
+};
+
+class Messages final : public base::has_weak_ptr {
+public:
+	Messages(not_null<GroupCall*> call, not_null<MTP::Sender*> api);
+	~Messages();
+
+	void send(TextWithTags text, int stars);
+
+	void setApplyingInitial(bool value);
+	void received(const MTPDupdateGroupCallMessage &data);
+	void received(const MTPDupdateGroupCallEncryptedMessage &data);
+	void deleted(const MTPDupdateDeleteGroupCallMessages &data);
+	void sent(const MTPDupdateMessageID &data);
+
+	[[nodiscard]] rpl::producer<std::vector<Message>> listValue() const;
+	[[nodiscard]] rpl::producer<MessageIdUpdate> idUpdates() const;
+
+	[[nodiscard]] int reactionsPaidScheduled() const;
+	[[nodiscard]] PeerId reactionsLocalShownPeer() const;
+	void reactionsPaidAdd(int count);
+	void reactionsPaidScheduledCancel();
+	void reactionsPaidSend();
+	void undoScheduledPaidOnDestroy();
+
+	struct PaidLocalState {
+		int total = 0;
+		int my = 0;
+	};
+	[[nodiscard]] PaidLocalState starsLocalState() const;
+	[[nodiscard]] rpl::producer<StarsDonor> starsValueChanges() const {
+		return _paidChanges.events();
+	}
+	[[nodiscard]] const StarsTop &starsTop() const {
+		return _paid.top;
+	}
+
+	void requestHiddenShow() {
+		_hiddenShowRequests.fire({});
+	}
+	[[nodiscard]] rpl::producer<> hiddenShowRequested() const {
+		return _hiddenShowRequests.events();
+	}
+
+	void deleteConfirmed(MessageDeleteRequest request);
+
+private:
+	struct Pending {
+		TextWithTags text;
+		int stars = 0;
+	};
+	struct Paid {
+		StarsTop top;
+		PeerId scheduledShownPeer = 0;
+		PeerId sendingShownPeer = 0;
+		uint32 scheduled : 30 = 0;
+		uint32 scheduledFlag : 1 = 0;
+		uint32 scheduledPrivacySet : 1 = 0;
+		uint32 sending : 30 = 0;
+		uint32 sendingFlag : 1 = 0;
+		uint32 sendingPrivacySet : 1 = 0;
+	};
+
+	[[nodiscard]] bool ready() const;
+	void sendPending();
+	void pushChanges();
+	void checkDestroying(bool afterChanges = false);
+
+	void received(
+		MsgId id,
+		const MTPPeer &from,
+		const MTPTextWithEntities &message,
+		TimeId date,
+		int stars,
+		bool fromAdmin,
+		bool checkCustomEmoji = false);
+	void sent(uint64 randomId, const MTP::Response &response);
+	void sent(uint64 randomId, MsgId realId);
+	void failed(uint64 randomId, const MTP::Response &response);
+
+	[[nodiscard]] bool skipMessage(
+		const TextWithEntities &text,
+		int stars) const;
+	[[nodiscard]] Data::PaidReactionSend startPaidReactionSending();
+	void finishPaidSending(
+		Data::PaidReactionSend send,
+		bool success);
+	void addStars(not_null<PeerData*> from, int stars, bool mine);
+	void requestStarsStats();
+
+	const not_null<GroupCall*> _call;
+	const not_null<Main::Session*> _session;
+	const not_null<MTP::Sender*> _api;
+
+	MsgId _conferenceIdAutoIncrement = 0;
+	base::flat_map<uint64, MsgId> _conferenceIdByRandomId;
+
+	base::flat_map<uint64, MsgId> _sendingIdByRandomId;
+
+	Data::GroupCall *_real = nullptr;
+
+	std::vector<Pending> _pending;
+
+	base::Timer _destroyTimer;
+	std::vector<Message> _messages;
+	base::flat_set<MsgId> _skippedIds;
+	rpl::event_stream<std::vector<Message>> _changes;
+	rpl::event_stream<MessageIdUpdate> _idUpdates;
+	bool _applyingInitial = false;
+
+	mtpRequestId _starsTopRequestId = 0;
+	Paid _paid;
+	rpl::event_stream<StarsDonor> _paidChanges;
+	bool _paidSendingPending = false;
+
+	TimeId _ttl = 0;
+	bool _changesScheduled = false;
+
+	rpl::event_stream<> _hiddenShowRequests;
+	base::Timer _starsStatsTimer;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_messages_ui.cpp b/Telegram/SourceFiles/calls/group/calls_group_messages_ui.cpp
new file mode 100644
index 00000000000000..45d74c95694551
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/calls_group_messages_ui.cpp
@@ -0,0 +1,1913 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "calls/group/calls_group_messages_ui.h"
+
+#include "base/unixtime.h"
+#include "boxes/peers/prepare_short_info_box.h"
+#include "boxes/premium_preview_box.h"
+#include "calls/group/ui/calls_group_stars_coloring.h"
+#include "calls/group/calls_group_messages.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "chat_helpers/emoji_suggestions_widget.h"
+#include "chat_helpers/message_field.h"
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "core/ui_integration.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/stickers/data_stickers.h"
+#include "data/data_document.h"
+#include "data/data_peer.h"
+#include "data/data_message_reactions.h"
+#include "data/data_message_reaction_id.h"
+#include "data/data_session.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/controls/emoji_button.h"
+#include "ui/controls/send_button.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/radial_animation.h"
+#include "ui/effects/reaction_fly_animation.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/custom_emoji_text_badge.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/menu/menu_item_base.h"
+#include "ui/widgets/menu/menu_action.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/elastic_scroll.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/color_int_conversion.h"
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "ui/userpic_view.h"
+#include "styles/style_calls.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_chat.h"
+#include "styles/style_credits.h"
+#include "styles/style_info_levels.h"
+#include "styles/style_media_view.h"
+#include "styles/style_menu_icons.h"
+
+#include <QtGui/QGuiApplication>
+#include <QtGui/QWindow>
+
+namespace Calls::Group {
+namespace {
+
+constexpr auto kMessageBgOpacity = 0.8;
+constexpr auto kDarkOverOpacity = 0.25;
+constexpr auto kColoredMessageBgOpacity = 0.65;
+constexpr auto kAdminBadgeTextOpacity = 0.6;
+
+[[nodiscard]] int CountMessageRadius() {
+	const auto minHeight = st::groupCallMessagePadding.top()
+		+ st::messageTextStyle.font->height
+		+ st::groupCallMessagePadding.bottom();
+	return minHeight / 2;
+}
+
+[[nodiscard]] int CountPriceRadius() {
+	const auto height = st::groupCallPricePadding.top()
+		+ st::normalFont->height
+		+ st::groupCallPricePadding.bottom();
+	return height / 2;
+}
+
+[[nodiscard]] int CountPinnedRadius() {
+	const auto height = st::groupCallUserpicPadding.top()
+		+ st::groupCallPinnedUserpic
+		+ st::groupCallUserpicPadding.bottom();
+	return height / 2;
+}
+
+[[nodiscard]] uint64 ColoringKey(const Ui::StarsColoring &value) {
+	return uint64(uint32(value.bgLight))
+		| (uint64(uint32(value.bgDark)) << 32);
+}
+
+void ReceiveSomeMouseEvents(
+		not_null<Ui::ElasticScroll*> scroll,
+		Fn<bool(QPoint)> handleClick) {
+	class EventFilter final : public QObject {
+	public:
+		explicit EventFilter(
+			not_null<Ui::ElasticScroll*> scroll,
+			Fn<bool(QPoint)> handleClick)
+		: QObject(scroll)
+		, _handleClick(std::move(handleClick)) {
+		}
+
+		bool eventFilter(QObject *watched, QEvent *event) {
+			if (event->type() == QEvent::MouseButtonPress) {
+				return mousePressFilter(
+					watched,
+					static_cast<QMouseEvent*>(event));
+			} else if (event->type() == QEvent::Wheel) {
+				return wheelFilter(
+					watched,
+					static_cast<QWheelEvent*>(event));
+			}
+			return false;
+		}
+
+		bool mousePressFilter(
+				QObject *watched,
+				not_null<QMouseEvent*> event) {
+			Expects(parent()->isWidgetType());
+
+			const auto scroll = static_cast<Ui::ElasticScroll*>(parent());
+			if (watched != scroll->window()->windowHandle()) {
+				return false;
+			}
+			const auto global = event->globalPos();
+			const auto local = scroll->mapFromGlobal(global);
+			if (!scroll->rect().contains(local)) {
+				return false;
+			}
+			return _handleClick(local + QPoint(0, scroll->scrollTop()));
+		}
+
+		bool wheelFilter(QObject *watched, not_null<QWheelEvent*> event) {
+			Expects(parent()->isWidgetType());
+
+			const auto scroll = static_cast<Ui::ElasticScroll*>(parent());
+			if (watched != scroll->window()->windowHandle()
+				|| !scroll->scrollTopMax()) {
+				return false;
+			}
+			const auto global = event->globalPosition().toPoint();
+			const auto local = scroll->mapFromGlobal(global);
+			if (!scroll->rect().contains(local)) {
+				return false;
+			}
+			auto e = QWheelEvent(
+				event->position(),
+				event->globalPosition(),
+				event->pixelDelta(),
+				event->angleDelta(),
+				event->buttons(),
+				event->modifiers(),
+				event->phase(),
+				event->inverted(),
+				event->source());
+			e.setTimestamp(crl::now());
+			QGuiApplication::sendEvent(scroll, &e);
+			return true;
+		}
+
+	private:
+		Fn<bool(QPoint)> _handleClick;
+
+	};
+
+	scroll->setAttribute(Qt::WA_TransparentForMouseEvents);
+	qApp->installEventFilter(
+		new EventFilter(scroll, std::move(handleClick)));
+}
+
+[[nodiscard]] base::unique_qptr<Ui::Menu::ItemBase> MakeMessageDateAction(
+		not_null<Ui::PopupMenu*> menu,
+		TimeId value) {
+	const auto parent = menu->menu();
+
+	const auto parsed = base::unixtime::parse(value);
+	const auto date = parsed.date();
+	const auto time = QLocale().toString(
+		parsed.time(),
+		QLocale::ShortFormat);
+	const auto today = QDateTime::currentDateTime().date();
+	const auto text = (date == today)
+		? tr::lng_context_sent_today(tr::now, lt_time, time)
+		: (date.addDays(1) == today)
+		? tr::lng_context_sent_yesterday(tr::now, lt_time, time)
+		: tr::lng_context_sent_date(
+			tr::now,
+			lt_date,
+			langDayOfMonthFull(date),
+			lt_time,
+			time);
+	const auto action = Ui::Menu::CreateAction(parent, text, [] {});
+	action->setDisabled(true);
+	return base::make_unique_q<Ui::Menu::Action>(
+		menu->menu(),
+		st::storiesCommentSentAt,
+		action,
+		nullptr,
+		nullptr);
+}
+
+void ShowDeleteMessageConfirmation(
+		std::shared_ptr<Ui::Show> show,
+		MsgId id,
+		not_null<PeerData*> from,
+		bool canModerate,
+		Fn<void(MessageDeleteRequest)> callback) {
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		struct State {
+			rpl::variable<bool> report;
+			rpl::variable<bool> all;
+			rpl::variable<bool> ban;
+		};
+		const auto state = box->lifetime().make_state<State>();
+		const auto confirmed = [=](Fn<void()> close) {
+			callback(MessageDeleteRequest{
+				.id = id,
+				.deleteAllFrom = state->all.current() ? from.get() : nullptr,
+				.ban = state->ban.current() ? from.get() : nullptr,
+				.reportSpam = state->report.current(),
+			});
+			close();
+		};
+		Ui::ConfirmBox(box, {
+			.text = tr::lng_selected_delete_sure_this(),
+			.confirmed = confirmed,
+			.confirmText = tr::lng_box_delete(),
+			.labelStyle = &st::groupCallBoxLabel,
+		});
+		if (canModerate) {
+			const auto check = [&](rpl::producer<QString> text) {
+				const auto add = st::groupCallCheckbox.margin;
+				const auto added = QMargins(0, add.top(), 0, add.bottom());
+				const auto margin = st::boxRowPadding + added;
+
+				return box->addRow(object_ptr<Ui::Checkbox>(
+					box,
+					std::move(text),
+					false,
+					st::groupCallCheckbox
+				), margin)->checkedValue();
+			};
+			state->report = check(tr::lng_report_spam());
+			state->all = check(tr::lng_delete_all_from_user(
+				lt_user,
+				rpl::single(from->shortName()))),
+			state->ban = check(tr::lng_ban_user());
+		}
+	}));
+}
+
+[[nodiscard]] QImage CrownMask(int place) {
+	const auto &icon = st::paidReactCrownSmall;
+	const auto size = icon.size();
+	const auto ratio = style::DevicePixelRatio();
+	const auto full = size * ratio;
+	auto result = QImage(full, QImage::Format_ARGB32_Premultiplied);
+	result.fill(Qt::transparent);
+	result.setDevicePixelRatio(ratio);
+
+	auto p = QPainter(&result);
+	icon.paint(p, 0, 0, size.width(), QColor(255, 255, 255));
+
+	const auto top = st::paidReactCrownSmallTop;
+	p.setCompositionMode(QPainter::CompositionMode_Source);
+	p.setPen(Qt::transparent);
+	p.setFont(st::levelStyle.font);
+	p.drawText(
+		QRect(0, top, icon.width(), icon.height()),
+		QString::number(place),
+		style::al_top);
+	p.end();
+
+	return result;
+}
+
+} // namespace
+
+struct MessagesUi::MessageView {
+	MsgId id = 0;
+	MsgId sendingId = 0;
+	not_null<PeerData*> from;
+	ClickHandlerPtr fromLink;
+	Ui::Animations::Simple toggleAnimation;
+	Ui::Animations::Simple sentAnimation;
+	Data::ReactionId reactionId;
+	std::unique_ptr<Ui::InfiniteRadialAnimation> sendingAnimation;
+	std::unique_ptr<Ui::ReactionFlyAnimation> reactionAnimation;
+	std::unique_ptr<Ui::RpWidget> reactionWidget;
+	QPoint reactionShift;
+	TextWithEntities original;
+	Ui::PeerUserpicView view;
+	Ui::Text::String name;
+	Ui::Text::String text;
+	Ui::Text::String price;
+	TimeId date = 0;
+	int stars = 0;
+	int place = 0;
+	int top = 0;
+	int width = 0;
+	int left = 0;
+	int height = 0;
+	int realHeight = 0;
+	int nameWidth = 0;
+	int textLeft = 0;
+	int textTop = 0;
+	bool removed = false;
+	bool sending = false;
+	bool failed = false;
+	bool simple = false;
+	bool admin = false;
+	bool mine = false;
+};
+
+struct MessagesUi::PinnedView {
+	MsgId id = 0;
+	not_null<PeerData*> from;
+	Ui::Animations::Simple toggleAnimation;
+	Ui::PeerUserpicView view;
+	Ui::Text::String text;
+	crl::time duration = 0;
+	crl::time end = 0;
+	int stars = 0;
+	int place = 0;
+	int top = 0;
+	int width = 0;
+	int left = 0;
+	int height = 0;
+	int realWidth = 0;
+	bool removed = false;
+	bool requiresSmooth = false;
+};
+
+MessagesUi::PayedBg::PayedBg(const Ui::StarsColoring &coloring)
+: light(Ui::ColorFromSerialized(coloring.bgLight))
+, dark(Ui::ColorFromSerialized(coloring.bgDark))
+, pinnedLight(CountPinnedRadius(), light.color())
+, pinnedDark(CountPinnedRadius(), dark.color())
+, messageLight(CountMessageRadius(), light.color())
+, priceDark(CountPriceRadius(), dark.color())
+, badgeDark(st::roundRadiusLarge, dark.color()) {
+}
+
+MessagesUi::MessagesUi(
+	not_null<QWidget*> parent,
+	std::shared_ptr<ChatHelpers::Show> show,
+	MessagesMode mode,
+	rpl::producer<std::vector<Message>> messages,
+	rpl::producer<std::vector<not_null<PeerData*>>> topDonorsValue,
+	rpl::producer<MessageIdUpdate> idUpdates,
+	rpl::producer<bool> canManageValue,
+	rpl::producer<bool> shown)
+: _parent(parent)
+, _show(std::move(show))
+, _mode(mode)
+, _canManage(std::move(canManageValue))
+, _messageBg([] {
+	auto result = st::groupCallBg->c;
+	result.setAlphaF(kMessageBgOpacity);
+	return result;
+})
+, _messageBgRect(CountMessageRadius(), _messageBg.color())
+, _crownHelper(Core::TextContext({ .session = &_show->session() }))
+, _topDonors(std::move(topDonorsValue))
+, _fadeHeight(st::normalFont->height * 2)
+, _fadeWidth(st::normalFont->height * 2)
+, _streamMode(_mode == MessagesMode::VideoStream) {
+	setupBadges();
+	setupList(std::move(messages), std::move(shown));
+	handleIdUpdates(std::move(idUpdates));
+}
+
+MessagesUi::~MessagesUi() = default;
+
+void MessagesUi::setupBadges() {
+	auto helper = Ui::Text::CustomEmojiHelper();
+	const auto liveText = helper.paletteDependent(
+		Ui::Text::CustomEmojiTextBadge(
+			tr::lng_video_stream_live(tr::now).toUpper(),
+			st::groupCallMessageBadge,
+			st::groupCallMessageBadgeMargin));
+	_liveBadge.setMarkedText(
+		st::messageTextStyle,
+		liveText,
+		kMarkupTextOptions,
+		helper.context());
+
+	_adminBadge.setText(st::messageTextStyle, tr::lng_admin_badge(tr::now));
+
+	_topDonors.value(
+	) | rpl::on_next([=] {
+		for (auto &entry : _views) {
+			const auto place = donorPlace(entry.from);
+			if (entry.place != place) {
+				entry.place = place;
+				if (!entry.failed) {
+					setContent(entry);
+				}
+			}
+		}
+		for (auto &entry : _pinnedViews) {
+			const auto place = donorPlace(entry.from);
+			if (entry.place != place) {
+				entry.place = place;
+				setContent(entry);
+			}
+		}
+		applyGeometry();
+	}, _lifetime);
+}
+
+void MessagesUi::setupList(
+		rpl::producer<std::vector<Message>> messages,
+		rpl::producer<bool> shown) {
+	rpl::combine(
+		std::move(messages),
+		std::move(shown)
+	) | rpl::on_next([=](std::vector<Message> &&list, bool shown) {
+		if (shown) {
+			_hidden = std::nullopt;
+		} else {
+			_hidden = base::take(list);
+		}
+		showList(list);
+	}, _lifetime);
+}
+
+void MessagesUi::showList(const std::vector<Message> &list) {
+	const auto now = base::unixtime::now();
+	auto from = begin(list);
+	auto till = end(list);
+	for (auto &entry : _views) {
+		if (entry.removed) {
+			continue;
+		}
+		const auto id = entry.id;
+		const auto i = ranges::find(
+			from,
+			till,
+			id,
+			&Message::id);
+		if (i == till) {
+			toggleMessage(entry, false);
+			continue;
+		} else if (entry.failed != i->failed) {
+			setContentFailed(entry);
+			updateMessageSize(entry);
+			repaintMessage(entry.id);
+		} else if (entry.sending != (i->date == 0)) {
+			animateMessageSent(entry);
+		}
+		entry.date = i->date;
+		if (i == from) {
+			appendPinned(*i, now);
+			++from;
+		}
+	}
+	auto addedSendingToBottom = false;
+	for (auto i = from; i != till; ++i) {
+		const auto j = ranges::find(_views, i->id, &MessageView::id);
+		if (j != end(_views)) {
+			if (!j->removed) {
+				continue;
+			}
+			if (j->failed != i->failed) {
+				setContentFailed(*j);
+				updateMessageSize(*j);
+				repaintMessage(j->id);
+			} else if (j->sending != (i->date == 0)) {
+				animateMessageSent(*j);
+			}
+			j->date = i->date;
+			toggleMessage(*j, true);
+		} else {
+			if (i + 1 == till && !i->date) {
+				addedSendingToBottom = true;
+			}
+			appendMessage(*i);
+			appendPinned(*i, now);
+		}
+	}
+	if (addedSendingToBottom) {
+		const auto from = _scroll->scrollTop();
+		const auto till = _scroll->scrollTopMax();
+		if (from >= till) {
+			return;
+		}
+		_scrollToAnimation.stop();
+		_scrollToAnimation.start([=] {
+			_scroll->scrollToY(_scroll->scrollTopMax()
+				- _scrollToAnimation.value(0));
+		}, till - from, 0, st::slideDuration, anim::easeOutCirc);
+	}
+}
+
+void MessagesUi::handleIdUpdates(rpl::producer<MessageIdUpdate> idUpdates) {
+	std::move(
+		idUpdates
+	) | rpl::on_next([=](MessageIdUpdate update) {
+		const auto i = ranges::find(
+			_views,
+			update.localId,
+			&MessageView::id);
+		if (i == end(_views)) {
+			return;
+		}
+		i->sendingId = update.localId;
+		i->id = update.realId;
+		if (_revealedSpoilerId == update.localId) {
+			_revealedSpoilerId = update.realId;
+		}
+	}, _lifetime);
+}
+
+void MessagesUi::animateMessageSent(MessageView &entry) {
+	const auto id = entry.id;
+	entry.sending = false;
+	entry.sentAnimation.start([=] {
+		repaintMessage(id);
+	}, 0., 1, st::slideDuration, anim::easeOutCirc);
+	repaintMessage(id);
+}
+
+void MessagesUi::updateMessageSize(MessageView &entry) {
+	const auto &padding = st::groupCallMessagePadding;
+	const auto &pricePadding = st::groupCallPricePadding;
+
+	const auto hasUserpic = !entry.failed;
+	const auto userpicPadding = st::groupCallUserpicPadding;
+	const auto userpicSize = st::groupCallUserpic;
+	const auto leftSkip = hasUserpic
+		? (userpicPadding.left() + userpicSize + userpicPadding.right())
+		: padding.left();
+	const auto widthSkip = leftSkip + padding.right();
+	const auto inner = _width - widthSkip;
+
+	const auto size = Ui::Text::CountOptimalTextSize(
+		entry.text,
+		std::min(st::groupCallWidth / 2, inner),
+		inner);
+	const auto price = entry.simple
+		? (pricePadding.left() + pricePadding.right() + entry.price.maxWidth())
+		: 0;
+	const auto space = st::normalFont->spacew;
+	const auto nameWidth = entry.name.isEmpty() ? 0 : entry.name.maxWidth();
+	const auto nameLineWidth = nameWidth
+		? (nameWidth
+			+ space
+			+ _liveBadge.maxWidth()
+			+ space
+			+ _adminBadge.maxWidth())
+		: 0;
+
+	const auto nameHeight = entry.name.isEmpty()
+		? 0
+		: st::messageTextStyle.font->height;
+	const auto textHeight = size.height();
+	entry.width = widthSkip
+		+ std::max(size.width() + price, std::min(nameLineWidth, inner));
+	entry.left = _streamMode ? 0 : (_width - entry.width) / 2;
+	entry.textLeft = leftSkip;
+	entry.textTop = padding.top() + nameHeight;
+	entry.nameWidth = std::min(
+		nameWidth,
+		(entry.width
+			- widthSkip
+			- space
+			- _liveBadge.maxWidth()
+			- space
+			- _adminBadge.maxWidth()));
+	updateReactionPosition(entry);
+
+	const auto contentHeight = entry.textTop + textHeight + padding.bottom();
+	const auto userpicHeight = hasUserpic
+		? (userpicPadding.top() + userpicSize + userpicPadding.bottom())
+		: 0;
+
+	const auto skip = st::groupCallMessageSkip;
+	entry.realHeight = skip + std::max(contentHeight, userpicHeight);
+}
+
+bool MessagesUi::updateMessageHeight(MessageView &entry) {
+	const auto height = entry.toggleAnimation.animating()
+		? anim::interpolate(
+			0,
+			entry.realHeight,
+			entry.toggleAnimation.value(entry.removed ? 0. : 1.))
+		: entry.realHeight;
+	if (entry.height == height) {
+		return false;
+	}
+	entry.height = height;
+	return true;
+}
+
+void MessagesUi::updatePinnedSize(PinnedView &entry) {
+	const auto &padding = st::groupCallPinnedPadding;
+
+	const auto userpicPadding = st::groupCallUserpicPadding;
+	const auto userpicSize = st::groupCallPinnedUserpic;
+	const auto leftSkip = userpicPadding.left()
+		+ userpicSize
+		+ userpicPadding.right();
+	const auto inner = std::min(
+		entry.text.maxWidth(),
+		st::groupCallPinnedMaxWidth);
+
+	entry.height = userpicPadding.top()
+		+ userpicSize
+		+ userpicPadding.bottom();
+	entry.top = 0;
+
+	const auto skip = st::groupCallMessageSkip;
+	entry.realWidth = skip + leftSkip + inner + padding.right();
+
+	const auto ratio = style::DevicePixelRatio();
+	entry.requiresSmooth = (entry.realWidth * ratio * 1000 > entry.duration);
+}
+
+bool MessagesUi::updatePinnedWidth(PinnedView &entry) {
+	const auto width = entry.toggleAnimation.animating()
+		? anim::interpolate(
+			0,
+			entry.realWidth,
+			entry.toggleAnimation.value(entry.removed ? 0. : 1.))
+		: entry.realWidth;
+	if (entry.width == width) {
+		return false;
+	}
+	entry.width = width;
+	return true;
+}
+
+void MessagesUi::setContentFailed(MessageView &entry) {
+	entry.failed = true;
+	entry.name = Ui::Text::String();
+	entry.text = Ui::Text::String(
+		st::messageTextStyle,
+		TextWithEntities().append(
+			QString::fromUtf8("\xe2\x9d\x97\xef\xb8\x8f")
+		).append(' ').append(
+			tr::italic(u"Failed to send the message."_q)),
+		kMarkupTextOptions,
+		st::groupCallWidth / 8);
+	entry.price = Ui::Text::String();
+}
+
+void MessagesUi::setContent(MessageView &entry) {
+	entry.simple = !entry.admin && entry.original.empty() && entry.stars > 0;
+
+	const auto name = nameText(entry.from, entry.place);
+	entry.name = entry.admin
+		? Ui::Text::String(
+			st::messageTextStyle,
+			name,
+			kMarkupTextOptions,
+			Ui::kQFixedMax,
+			_crownHelper.context())
+		: Ui::Text::String();
+	if (const auto stars = entry.stars) {
+		entry.price = Ui::Text::String(
+			entry.simple ? st::messageTextStyle : st::whoReadDateStyle,
+			Ui::Text::IconEmoji(
+				&st::starIconEmojiSmall
+			).append(Lang::FormatCountDecimal(stars)),
+			kMarkupTextOptions);
+	} else {
+		entry.price = Ui::Text::String();
+	}
+	auto composed = entry.admin
+		? entry.original
+		: tr::link(name, 1).append(' ').append(entry.original);
+	if (!entry.admin) {
+		composed.text.replace(QChar('\n'), QChar(' '));
+	}
+	entry.text = Ui::Text::String(
+		st::messageTextStyle,
+		composed,
+		kMarkupTextOptions,
+		st::groupCallWidth / 8,
+		_crownHelper.context([this, id = entry.id] { repaintMessage(id); }));
+	if (!entry.simple && !entry.price.isEmpty()) {
+		entry.text.updateSkipBlock(
+			entry.price.maxWidth(),
+			st::normalFont->height);
+	}
+	if (!entry.simple && !entry.admin) {
+		entry.text.setLink(1, entry.fromLink);
+	}
+	if (entry.text.hasSpoilers()) {
+		const auto id = entry.id;
+		const auto guard = base::make_weak(_messages);
+		entry.text.setSpoilerLinkFilter([=](const ClickContext &context) {
+			if (context.button != Qt::LeftButton || !guard) {
+				return false;
+			}
+			const auto i = ranges::find(
+				_views,
+				_revealedSpoilerId,
+				&MessageView::id);
+			if (i != end(_views) && _revealedSpoilerId != id) {
+				i->text.setSpoilerRevealed(false, anim::type::normal);
+			}
+			_revealedSpoilerId = id;
+			return true;
+		});
+	}
+}
+
+void MessagesUi::setContent(PinnedView &entry) {
+	const auto text = nameText(entry.from, entry.place);
+	entry.text.setMarkedText(
+		st::messageTextStyle,
+		text,
+		kMarkupTextOptions,
+		_crownHelper.context());
+}
+
+void MessagesUi::toggleMessage(MessageView &entry, bool shown) {
+	const auto id = entry.id;
+	entry.removed = !shown;
+	entry.toggleAnimation.start(
+		[=] { repaintMessage(id); },
+		shown ? 0. : 1.,
+		shown ? 1. : 0.,
+		st::slideWrapDuration,
+		shown ? anim::easeOutCirc : anim::easeInCirc);
+	repaintMessage(id);
+}
+
+void MessagesUi::repaintMessage(MsgId id) {
+	auto i = ranges::find(_views, id, &MessageView::id);
+	if (i == end(_views) && id < 0) {
+		i = ranges::find(_views, id, &MessageView::sendingId);
+	}
+	if (i == end(_views)) {
+		return;
+	} else if (i->removed && !i->toggleAnimation.animating()) {
+		const auto top = i->top;
+		i = _views.erase(i);
+		recountHeights(i, top);
+		return;
+	}
+	if (!i->sending && !i->sentAnimation.animating()) {
+		i->sendingAnimation = nullptr;
+	}
+	if (!i->toggleAnimation.animating() && id == _delayedHighlightId) {
+		highlightMessage(base::take(_delayedHighlightId));
+	}
+	if (i->toggleAnimation.animating() || i->height != i->realHeight) {
+		if (updateMessageHeight(*i)) {
+			recountHeights(i, i->top);
+			return;
+		}
+	}
+	_messages->update(0, i->top, _messages->width(), i->height);
+}
+
+void MessagesUi::recountHeights(
+		std::vector<MessageView>::iterator i,
+		int top) {
+	auto from = top;
+	for (auto e = end(_views); i != e; ++i) {
+		i->top = top;
+		top += i->height;
+		updateReactionPosition(*i);
+	}
+	if (_views.empty()) {
+		_scrollToAnimation.stop();
+		delete base::take(_messages);
+		_scroll = nullptr;
+	} else {
+		updateGeometries();
+		_messages->update(0, from, _messages->width(), top - from);
+	}
+}
+
+void MessagesUi::appendMessage(const Message &data) {
+	const auto top = _views.empty()
+		? 0
+		: (_views.back().top + _views.back().height);
+
+	if (!_scroll) {
+		setupMessagesWidget();
+	}
+
+	const auto id = data.id;
+	const auto peer = data.peer;
+	auto &entry = _views.emplace_back(MessageView{
+		.id = id,
+		.from = peer,
+		.original = data.text,
+		.date = data.date,
+		.stars = data.stars,
+		.place = donorPlace(peer),
+		.top = top,
+		.sending = !data.date,
+		.admin = data.admin && _streamMode,
+		.mine = data.mine,
+	});
+	const auto repaint = [=] {
+		repaintMessage(id);
+	};
+	entry.fromLink = std::make_shared<LambdaClickHandler>([=] {
+		_show->show(
+			PrepareShortInfoBox(peer, _show, &st::storiesShortInfoBox));
+	});
+	if (data.failed) {
+		setContentFailed(entry);
+	} else {
+		setContent(entry);
+	}
+	updateMessageSize(entry);
+	if (entry.sending) {
+		using namespace Ui;
+		const auto &st = st::defaultInfiniteRadialAnimation;
+		entry.sendingAnimation = std::make_unique<InfiniteRadialAnimation>(
+			repaint,
+			st);
+		entry.sendingAnimation->start(0);
+	}
+	entry.height = 0;
+	toggleMessage(entry, true);
+	checkReactionContent(entry, data.text);
+}
+
+void MessagesUi::togglePinned(PinnedView &entry, bool shown) {
+	const auto id = entry.id;
+	entry.removed = !shown;
+	entry.toggleAnimation.start(
+		[=] { repaintPinned(id); },
+		shown ? 0. : 1.,
+		shown ? 1. : 0.,
+		st::slideWrapDuration,
+		shown ? anim::easeOutCirc : anim::easeInCirc);
+	repaintPinned(id);
+}
+
+void MessagesUi::repaintPinned(MsgId id) {
+	const auto i = ranges::find(_pinnedViews, id, &PinnedView::id);
+	if (i == end(_pinnedViews)) {
+		return;
+	} else if (i->removed && !i->toggleAnimation.animating()) {
+		const auto left = i->left;
+		recountWidths(_pinnedViews.erase(i), left);
+		return;
+	}
+	if (i->toggleAnimation.animating() || i->width != i->realWidth) {
+		const auto was = i->width;
+		if (updatePinnedWidth(*i)) {
+			if (i->width > was) {
+				const auto larger = countPinnedScrollSkip(*i);
+				if (larger > _pinnedScrollSkip) {
+					setPinnedScrollSkip(larger);
+				}
+			} else {
+				applyGeometryToPinned();
+			}
+			recountWidths(i, i->left);
+			return;
+		}
+	}
+	_pinned->update(i->left, 0, i->width, _pinned->height());
+}
+
+void MessagesUi::recountWidths(
+		std::vector<PinnedView>::iterator i,
+		int left) {
+	auto from = left;
+	for (auto e = end(_pinnedViews); i != e; ++i) {
+		i->left = left;
+		left += i->width;
+	}
+	if (_pinnedViews.empty()) {
+		delete base::take(_pinned);
+		_pinnedScroll = nullptr;
+	} else {
+		updateGeometries();
+		_pinned->update(from, 0, left - from, _pinned->height());
+	}
+}
+
+void MessagesUi::appendPinned(const Message &data, TimeId now) {
+	if (!data.date
+		|| data.pinFinishDate <= data.date
+		|| data.pinFinishDate <= now
+		|| ranges::contains(
+			_pinnedViews,
+			data.id,
+			&PinnedView::id)) {
+		return;
+	}
+
+	const auto peer = data.peer;
+	const auto finishes = crl::now()
+		+ (data.pinFinishDate - now) * crl::time(1000);
+	const auto i = ranges::find(_pinnedViews, peer, &PinnedView::from);
+	if (i != end(_pinnedViews)) {
+		if (i->end > finishes) {
+			return;
+		}
+		const auto left = i->left;
+		recountWidths(_pinnedViews.erase(i), left);
+	}
+
+	if (!_pinnedScroll) {
+		setupPinnedWidget();
+	}
+	const auto j = ranges::lower_bound(
+		_pinnedViews,
+		data.stars,
+		ranges::greater(),
+		&PinnedView::stars);
+	const auto left = (j != end(_pinnedViews))
+		? j->left
+		: _pinnedViews.empty()
+		? 0
+		: (_pinnedViews.back().left + _pinnedViews.back().width);
+	auto &entry = *_pinnedViews.insert(j, PinnedView{
+		.id = data.id,
+		.from = peer,
+		.duration = (data.pinFinishDate - data.date) * crl::time(1000),
+		.end = finishes,
+		.stars = data.stars,
+		.place = donorPlace(peer),
+		.left = left,
+	});
+	setContent(entry);
+	updatePinnedSize(entry);
+	entry.width = 0;
+	togglePinned(entry, true);
+}
+
+int MessagesUi::donorPlace(not_null<PeerData*> peer) const {
+	const auto &donors = _topDonors.current();
+	const auto i = ranges::find(donors, peer);
+	if (i == end(donors)) {
+		return 0;
+	}
+	return static_cast<int>(std::distance(begin(donors), i)) + 1;
+}
+
+TextWithEntities MessagesUi::nameText(
+		not_null<PeerData*> peer,
+		int place) {
+	auto result = TextWithEntities();
+	if (place > 0) {
+		auto i = _crownEmojiDataCache.find(place);
+		if (i == _crownEmojiDataCache.end()) {
+			i = _crownEmojiDataCache.emplace(
+				place,
+				_crownHelper.imageData(Ui::Text::ImageEmoji{
+					.image = CrownMask(place),
+					.margin = st::paidReactCrownMargin,
+				})).first;
+		}
+		result.append(Ui::Text::SingleCustomEmoji(i->second)).append(' ');
+	}
+	result.append(tr::bold(peer->shortName()));
+	return result;
+}
+
+void MessagesUi::checkReactionContent(
+		MessageView &entry,
+		const TextWithEntities &text) {
+	auto outLength = 0;
+	using Type = Data::Reactions::Type;
+	const auto reactions = &_show->session().data().reactions();
+	const auto set = [&](Data::ReactionId id) {
+		reactions->preloadAnimationsFor(id);
+		entry.reactionId = std::move(id);
+	};
+	if (text.entities.size() == 1
+		&& text.entities.front().type() == EntityType::CustomEmoji
+		&& text.entities.front().offset() == 0
+		&& text.entities.front().length() == text.text.size()) {
+		set({ text.entities.front().data().toULongLong() });
+	} else if (const auto emoji = Ui::Emoji::Find(text.text, &outLength)) {
+		if (outLength < text.text.size()) {
+			return;
+		}
+		const auto &all = reactions->list(Type::All);
+		for (const auto &reaction : all) {
+			if (reaction.id.custom()) {
+				continue;
+			}
+			const auto &text = reaction.id.emoji();
+			if (Ui::Emoji::Find(text) != emoji) {
+				continue;
+			}
+			set(reaction.id);
+			break;
+		}
+	}
+}
+
+void MessagesUi::startReactionAnimation(MessageView &entry) {
+	entry.reactionWidget = std::make_unique<Ui::RpWidget>(_parent);
+	const auto raw = entry.reactionWidget.get();
+	raw->show();
+	raw->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	if (!_effectsLifetime) {
+		rpl::combine(
+			_scroll->scrollTopValue(),
+			_scroll->RpWidget::positionValue()
+		) | rpl::on_next([=](int yshift, QPoint point) {
+			_reactionBasePosition = point - QPoint(0, yshift);
+			for (auto &view : _views) {
+				updateReactionPosition(view);
+			}
+		}, _effectsLifetime);
+	}
+
+	entry.reactionAnimation = std::make_unique<Ui::ReactionFlyAnimation>(
+		&_show->session().data().reactions(),
+		Ui::ReactionFlyAnimationArgs{
+			.id = entry.reactionId,
+			.effectOnly = true,
+		},
+		[=] { raw->update(); },
+		st::reactionInlineImage);
+	updateReactionPosition(entry);
+
+	const auto effectSize = st::reactionInlineImage * 2;
+	const auto animation = entry.reactionAnimation.get();
+	raw->resize(effectSize, effectSize);
+	raw->paintRequest() | rpl::on_next([=] {
+		if (animation->finished()) {
+			crl::on_main(raw, [=] {
+				removeReaction(raw);
+			});
+			return;
+		}
+		auto p = QPainter(raw);
+		const auto size = raw->width();
+		const auto skip = (size - st::reactionInlineImage) / 2;
+		const auto target = QRect(
+			QPoint(skip, skip),
+			QSize(st::reactionInlineImage, st::reactionInlineImage));
+		animation->paintGetArea(
+			p,
+			QPoint(),
+			target,
+			st::radialFg->c,
+			QRect(),
+			crl::now());
+	}, raw->lifetime());
+}
+
+void MessagesUi::removeReaction(not_null<Ui::RpWidget*> widget) {
+	const auto i = ranges::find_if(_views, [&](const MessageView &entry) {
+		return entry.reactionWidget.get() == widget;
+	});
+	if (i != end(_views)) {
+		i->reactionId = {};
+		i->reactionWidget = nullptr;
+		i->reactionAnimation = nullptr;
+	};
+}
+
+void MessagesUi::updateReactionPosition(MessageView &entry) {
+	if (const auto widget = entry.reactionWidget.get()) {
+		if (entry.failed) {
+			widget->resize(0, 0);
+			return;
+		}
+		const auto padding = st::groupCallMessagePadding;
+		const auto userpicSize = st::groupCallUserpic;
+		const auto userpicPadding = st::groupCallUserpicPadding;
+		const auto esize = st::emojiSize;
+		const auto eleft = entry.text.maxWidth() - st::emojiPadding - esize;
+		const auto etop = (st::normalFont->height - esize) / 2;
+		const auto effectSize = st::reactionInlineImage * 2;
+		entry.reactionShift = QPoint(entry.left, entry.top)
+			+ QPoint(
+				userpicPadding.left() + userpicSize + userpicPadding.right(),
+				padding.top())
+			+ QPoint(eleft + (esize / 2), etop + (esize / 2))
+			- QPoint(effectSize / 2, effectSize / 2);
+		widget->move(_reactionBasePosition + entry.reactionShift);
+	}
+}
+
+void MessagesUi::updateTopFade() {
+	const auto topFadeShown = (_scroll->scrollTop() > 0);
+	if (_topFadeShown != topFadeShown) {
+		_topFadeShown = topFadeShown;
+		//const auto from = topFadeShown ? 0. : 1.;
+		//const auto till = topFadeShown ? 1. : 0.;
+		//_topFadeAnimation.start([=] {
+			_messages->update(
+				0,
+				_scroll->scrollTop(),
+				_messages->width(),
+				_fadeHeight);
+		//}, from, till, st::slideWrapDuration);
+	}
+}
+
+void MessagesUi::updateBottomFade() {
+	const auto max = _scroll->scrollTopMax();
+	const auto bottomFadeShown = (_scroll->scrollTop() < max);
+	if (_bottomFadeShown != bottomFadeShown) {
+		_bottomFadeShown = bottomFadeShown;
+		//const auto from = bottomFadeShown ? 0. : 1.;
+		//const auto till = bottomFadeShown ? 1. : 0.;
+		//_bottomFadeAnimation.start([=] {
+			_messages->update(
+				0,
+				_scroll->scrollTop() + _scroll->height() - _fadeHeight,
+				_messages->width(),
+				_fadeHeight);
+		//}, from, till, st::slideWrapDuration);
+	}
+}
+
+void MessagesUi::updateLeftFade() {
+	const auto leftFadeShown = (_pinnedScroll->scrollLeft() > 0);
+	if (_leftFadeShown != leftFadeShown) {
+		_leftFadeShown = leftFadeShown;
+		//const auto from = leftFadeShown ? 0. : 1.;
+		//const auto till = rightFadeShown ? 1. : 0.;
+		//_leftFadeAnimation.start([=] {
+			_pinned->update(
+				_pinnedScroll->scrollLeft(),
+				0,
+				_fadeWidth,
+				_pinned->height());
+		//}, from, till, st::slideWrapDuration);
+	}
+}
+
+void MessagesUi::updateRightFade() {
+	const auto max = _pinnedScroll->scrollLeftMax();
+	const auto rightFadeShown = (_pinnedScroll->scrollLeft() < max);
+	if (_rightFadeShown != rightFadeShown) {
+		_rightFadeShown = rightFadeShown;
+		//const auto from = rightFadeShown ? 0. : 1.;
+		//const auto till = rightFadeShown ? 1. : 0.;
+		//_rightFadeAnimation.start([=] {
+			_pinned->update(
+				(_pinnedScroll->scrollLeft()
+					+ _pinnedScroll->width()
+					- _fadeWidth),
+				0,
+				_fadeWidth,
+				_pinned->height());
+		//}, from, till, st::slideWrapDuration);
+	}
+}
+
+void MessagesUi::setupMessagesWidget() {
+	_scroll = std::make_unique<Ui::ElasticScroll>(
+		_parent,
+		st::groupCallMessagesScroll);
+	const auto scroll = _scroll.get();
+
+	_messages = scroll->setOwnedWidget(object_ptr<Ui::RpWidget>(scroll));
+	_messages->move(0, 0);
+	rpl::combine(
+		scroll->scrollTopValue(),
+		scroll->heightValue(),
+		_messages->heightValue()
+	) | rpl::on_next([=] {
+		updateTopFade();
+		updateBottomFade();
+	}, scroll->lifetime());
+
+	if (_mode == MessagesMode::GroupCall) {
+		receiveSomeMouseEvents();
+	} else {
+		receiveAllMouseEvents();
+	}
+
+	_messages->paintRequest() | rpl::on_next([=](QRect clip) {
+		const auto start = scroll->scrollTop();
+		const auto end = start + scroll->height();
+		const auto ratio = style::DevicePixelRatio();
+		const auto session = &_show->session();
+		const auto &colorings = session->appConfig().groupCallColorings();
+
+		if ((_canvas.width() < scroll->width() * ratio)
+			|| (_canvas.height() < scroll->height() * ratio)) {
+			_canvas = QImage(
+				scroll->size() * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			_canvas.setDevicePixelRatio(ratio);
+		}
+		auto p = Painter(&_canvas);
+
+		p.setCompositionMode(QPainter::CompositionMode_Clear);
+		p.fillRect(QRect(QPoint(), scroll->size()), QColor(0, 0, 0, 0));
+
+		p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		const auto now = crl::now();
+		const auto skip = st::groupCallMessageSkip;
+		const auto padding = st::groupCallMessagePadding;
+		p.translate(0, -start);
+		for (auto &entry : _views) {
+			if (entry.height <= skip || entry.top + entry.height <= start) {
+				continue;
+			} else if (entry.top >= end) {
+				break;
+			}
+			const auto x = entry.left;
+			const auto y = entry.top;
+			const auto use = entry.realHeight - skip;
+			const auto width = entry.width;
+			p.setPen(Qt::NoPen);
+			const auto scaled = (entry.height < entry.realHeight);
+			if (scaled) {
+				const auto used = entry.height - skip;
+				const auto mx = scaled ? (x + (width / 2)) : 0;
+				const auto my = scaled ? (y + (used / 2)) : 0;
+				const auto scale = used / float64(use);
+				p.save();
+				p.translate(mx, my);
+				p.scale(scale, scale);
+				p.setOpacity(scale);
+				p.translate(-mx, -my);
+			}
+			auto bg = (std::unique_ptr<PayedBg>*)nullptr;
+			if (!_streamMode) {
+				_messageBgRect.paint(p, { x, y, width, use });
+			} else if (entry.stars) {
+				const auto coloring = Ui::StarsColoringForCount(
+					colorings,
+					entry.stars);
+				bg = &_bgs[ColoringKey(coloring)];
+				if (!*bg) {
+					*bg = std::make_unique<PayedBg>(coloring);
+				}
+				p.setOpacity(kColoredMessageBgOpacity);
+				(*bg)->messageLight.paint(p, { x, y, width, use });
+				p.setOpacity(1.);
+				if (_highlightAnimation.animating()
+					&& entry.id == _highlightId) {
+					const auto radius = CountMessageRadius();
+					const auto progress = _highlightAnimation.value(3.);
+					p.setBrush(st::white);
+					p.setOpacity(
+						std::min((1.5 - std::abs(1.5 - progress)), 1.));
+					auto hq = PainterHighQualityEnabler(p);
+					p.drawRoundedRect(x, y, width, use, radius, radius);
+					p.setOpacity(1.);
+				}
+			} else if (entry.admin) {
+				_messageBgRect.paint(p, { x, y, width, use });
+			}
+
+			const auto textLeft = entry.textLeft;
+			const auto hasUserpic = !entry.failed;
+			if (hasUserpic) {
+				const auto userpicSize = st::groupCallUserpic;
+				const auto userpicPadding = st::groupCallUserpicPadding;
+				const auto position = QPoint(
+					x + userpicPadding.left(),
+					y + userpicPadding.top());
+				const auto rect = QRect(
+					position,
+					QSize(userpicSize, userpicSize));
+				entry.from->paintUserpic(p, entry.view, {
+					.position = position,
+					.size = userpicSize,
+					.shape = Ui::PeerUserpicShape::Circle,
+				});
+				if (const auto animation = entry.sendingAnimation.get()) {
+					auto hq = PainterHighQualityEnabler(p);
+					auto pen = st::groupCallBg->p;
+					const auto shift = userpicPadding.left();
+					pen.setWidthF(shift);
+					p.setPen(pen);
+					p.setBrush(Qt::NoBrush);
+					const auto state = animation->computeState();
+					const auto sent = entry.sending
+						? 0.
+						: entry.sentAnimation.value(1.);
+					p.setOpacity(state.shown * (1. - sent));
+					p.drawArc(
+						rect.marginsRemoved({ shift, shift, shift, shift }),
+						state.arcFrom,
+						state.arcLength);
+					p.setOpacity(1.);
+				}
+			}
+
+			p.setPen(st::white);
+			if (!entry.name.isEmpty()) {
+				const auto space = st::normalFont->spacew;
+				entry.name.draw(p, {
+					.position = {
+						x + textLeft,
+						y + padding.top(),
+					},
+					.availableWidth = entry.nameWidth,
+					.palette = &st::groupCallMessagePalette,
+					.elisionLines = 1,
+				});
+				const auto liveLeft = x + textLeft + entry.nameWidth + space;
+				_liveBadge.draw(p, {
+					.position = { liveLeft, y + padding.top() },
+				});
+
+				p.setOpacity(kAdminBadgeTextOpacity);
+				const auto adminLeft = x
+					+ entry.width
+					- padding.right()
+					- _adminBadge.maxWidth();
+				_adminBadge.draw(p, {
+					.position = { adminLeft, y + padding.top() },
+				});
+				p.setOpacity(1.);
+			}
+			const auto pricePadding = st::groupCallPricePadding;
+			const auto textRight = padding.right()
+				+ (entry.simple
+					? (entry.price.maxWidth()
+						+ pricePadding.left()
+						+ pricePadding.right())
+					: 0);
+			entry.text.draw(p, {
+				.position = {
+					x + textLeft,
+					y + entry.textTop,
+				},
+				.availableWidth = entry.width - textLeft - textRight,
+				.palette = &st::groupCallMessagePalette,
+				.spoiler = Ui::Text::DefaultSpoilerCache(),
+				.now = now,
+				.paused = !_messages->window()->isActiveWindow(),
+			});
+			if (!entry.price.isEmpty()) {
+				const auto priceRight = x
+					+ entry.width
+					- entry.price.maxWidth();
+				const auto priceLeft = entry.simple
+					? (priceRight
+						- (padding.top() - pricePadding.top())
+						- pricePadding.right())
+					: (priceRight - (padding.right() / 2));
+				const auto priceTop = entry.simple
+					? (y + entry.textTop)
+					: (y + use - st::normalFont->height);
+				if (entry.simple && bg) {
+					p.setOpacity(kDarkOverOpacity);
+					const auto r = QRect(
+						priceLeft,
+						priceTop,
+						entry.price.maxWidth(),
+						st::normalFont->height
+					).marginsAdded(pricePadding);
+					(*bg)->priceDark.paint(p, r);
+					p.setOpacity(1.);
+				}
+				entry.price.draw(p, {
+					.position = { priceLeft, priceTop },
+					.availableWidth = entry.price.maxWidth(),
+				});
+			}
+			if (!scaled && entry.reactionId && !entry.reactionAnimation) {
+				startReactionAnimation(entry);
+			}
+
+			if (scaled) {
+				p.restore();
+			}
+		}
+		p.translate(0, start);
+
+		p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+		p.setPen(Qt::NoPen);
+
+		const auto topFade = (//_topFadeAnimation.value(
+			_topFadeShown ? 1. : 0.);
+		if (topFade) {
+			auto gradientTop = QLinearGradient(0, 0, 0, _fadeHeight);
+			gradientTop.setStops({
+				{ 0., QColor(255, 255, 255, 0) },
+				{ 1., QColor(255, 255, 255, 255) },
+			});
+			p.setOpacity(topFade);
+			p.setBrush(gradientTop);
+			p.drawRect(0, 0, scroll->width(), _fadeHeight);
+			p.setOpacity(1.);
+		}
+		const auto bottomFade = (//_bottomFadeAnimation.value(
+			_bottomFadeShown ? 1. : 0.);
+		if (bottomFade) {
+			const auto till = scroll->height();
+			const auto from = till - _fadeHeight;
+			auto gradientBottom = QLinearGradient(0, from, 0, till);
+			gradientBottom.setStops({
+				{ 0., QColor(255, 255, 255, 255) },
+				{ 1., QColor(255, 255, 255, 0) },
+			});
+			p.setBrush(gradientBottom);
+			p.drawRect(0, from, scroll->width(), _fadeHeight);
+		}
+		QPainter(_messages).drawImage(
+			QRect(QPoint(0, start), scroll->size()),
+			_canvas,
+			QRect(QPoint(), scroll->size() * ratio));
+	}, _messages->lifetime());
+
+	scroll->show();
+	applyGeometry();
+}
+
+void MessagesUi::receiveSomeMouseEvents() {
+	ReceiveSomeMouseEvents(_scroll.get(), [=](QPoint point) {
+		for (const auto &entry : _views) {
+			if (entry.failed || entry.top + entry.height <= point.y()) {
+				continue;
+			} else if (entry.top < point.y()
+				&& entry.left < point.x()
+				&& entry.left + entry.width > point.x()) {
+				handleClick(entry, point);
+				return true;
+			}
+			break;
+		}
+		return false;
+	});
+}
+
+void MessagesUi::receiveAllMouseEvents() {
+	_messages->events() | rpl::on_next([=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type != QEvent::MouseButtonPress) {
+			return;
+		}
+		const auto m = static_cast<QMouseEvent*>(e.get());
+		const auto point = m->pos();
+		for (const auto &entry : _views) {
+			if (entry.failed || entry.top + entry.height <= point.y()) {
+				continue;
+			} else if (entry.top < point.y()
+				&& entry.left < point.x()
+				&& entry.left + entry.width > point.x()) {
+				if (m->button() == Qt::LeftButton) {
+					handleClick(entry, point);
+				} else {
+					showContextMenu(entry, m->globalPos());
+				}
+			}
+			break;
+		}
+	}, _messages->lifetime());
+}
+
+void MessagesUi::handleClick(const MessageView &entry, QPoint point) {
+	const auto padding = st::groupCallMessagePadding;
+	const auto userpicSize = st::groupCallUserpic;
+	const auto userpicPadding = st::groupCallUserpicPadding;
+	const auto userpic = QRect(
+		entry.left + userpicPadding.left(),
+		entry.top + userpicPadding.top(),
+		userpicSize,
+		userpicSize);
+	const auto name = entry.name.isEmpty()
+		? QRect()
+		: QRect(
+			entry.left + entry.textLeft,
+			entry.top + padding.top(),
+			entry.nameWidth,
+			st::messageTextStyle.font->height);
+	const auto link = (userpic.contains(point) || name.contains(point))
+		? entry.fromLink
+		: entry.text.getState(point - QPoint(
+			entry.left + entry.textLeft,
+			entry.top + entry.textTop
+		), entry.width - entry.textLeft - padding.right()).link;
+	if (link) {
+		ActivateClickHandler(_messages, link, Qt::LeftButton);
+	}
+}
+
+void MessagesUi::showContextMenu(
+		const MessageView &entry,
+		QPoint globalPoint) {
+	if (_menu || !entry.date || entry.failed) {
+		return;
+	}
+	_menu = base::make_unique_q<Ui::PopupMenu>(
+		_parent,
+		st::groupCallPopupMenuWithIcons);
+	_menu->addAction(MakeMessageDateAction(_menu.get(), entry.date));
+	const auto &original = entry.original;
+	const auto canCopy = !original.empty();
+	const auto canDelete = entry.mine || _canManage.current();
+	if (canCopy || canDelete) {
+		_menu->addSeparator(&st::mediaviewWideMenuSeparator);
+	}
+	if (canCopy) {
+		_menu->addAction(tr::lng_context_copy_text(tr::now), [=] {
+			TextUtilities::SetClipboardText(
+				TextForMimeData::WithExpandedLinks(original));
+		}, &st::mediaMenuIconCopy);
+	}
+	if (canDelete) {
+		const auto id = entry.id;
+		const auto from = entry.from;
+		const auto canModerate = _canManage.current() && !entry.mine;
+		_menu->addAction(tr::lng_context_delete_msg(tr::now), [=] {
+			ShowDeleteMessageConfirmation(_show, id, from, canModerate, [=](
+					MessageDeleteRequest request) {
+				_deleteRequests.fire_copy(request);
+			});
+		}, &st::mediaMenuIconDelete);
+	}
+	_menu->popup(globalPoint);
+}
+
+void MessagesUi::setupPinnedWidget() {
+	_pinnedScroll = std::make_unique<Ui::ElasticScroll>(
+		_parent,
+		st::groupCallMessagesScroll,
+		Qt::Horizontal);
+	const auto scroll = _pinnedScroll.get();
+
+	_pinned = scroll->setOwnedWidget(object_ptr<Ui::RpWidget>(scroll));
+	_pinned->move(0, 0);
+	rpl::combine(
+		scroll->scrollLeftValue(),
+		scroll->widthValue(),
+		_pinned->widthValue()
+	) | rpl::on_next([=] {
+		updateLeftFade();
+		updateRightFade();
+	}, scroll->lifetime());
+
+	struct Animation {
+		base::Timer seconds;
+		Ui::Animations::Simple smooth;
+		bool requiresSmooth = false;
+	};
+	const auto animation = _pinned->lifetime().make_state<Animation>();
+	animation->seconds.setCallback([=] {
+		const auto now = crl::now();
+		auto smooth = false;
+		auto off = base::flat_set<MsgId>();
+		for (auto &entry : _pinnedViews) {
+			if (entry.removed) {
+				continue;
+			} else if (entry.end <= now) {
+				off.emplace(entry.id);
+				entry.requiresSmooth = false;
+			} else if (entry.requiresSmooth) {
+				smooth = true;
+			}
+		}
+		if (smooth && !anim::Disabled()) {
+			animation->smooth.start([=] {
+				_pinned->update();
+			}, 0., 1., 900.);
+		} else {
+			_pinned->update();
+		}
+		for (const auto &id : off) {
+			const auto i = ranges::find(_pinnedViews, id, &PinnedView::id);
+			if (i != end(_pinnedViews)) {
+				togglePinned(*i, false);
+			}
+		}
+	});
+	animation->seconds.callEach(crl::time(1000));
+
+	_pinned->paintRequest() | rpl::on_next([=](QRect clip) {
+		const auto session = &_show->session();
+		const auto &colorings = session->appConfig().groupCallColorings();
+		const auto start = scroll->scrollLeft();
+		const auto end = start + scroll->width();
+		const auto ratio = style::DevicePixelRatio();
+
+		if ((_pinnedCanvas.width() < scroll->width() * ratio)
+			|| (_pinnedCanvas.height() < scroll->height() * ratio)) {
+			_pinnedCanvas = QImage(
+				scroll->size() * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			_pinnedCanvas.setDevicePixelRatio(ratio);
+		}
+		auto p = Painter(&_pinnedCanvas);
+
+		p.setCompositionMode(QPainter::CompositionMode_Clear);
+		p.fillRect(QRect(QPoint(), scroll->size()), QColor(0, 0, 0, 0));
+
+		p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		const auto now = crl::now();
+		const auto skip = st::groupCallMessageSkip;
+		const auto padding = st::groupCallPinnedPadding;
+		p.translate(-start, 0);
+		for (auto &entry : _pinnedViews) {
+			if (entry.width <= skip || entry.left + entry.width <= start) {
+				continue;
+			} else if (entry.left >= end) {
+				break;
+			}
+			const auto x = entry.left;
+			const auto y = entry.top;
+			const auto use = entry.realWidth - skip;
+			const auto height = entry.height;
+			p.setPen(Qt::NoPen);
+			const auto scaled = (entry.width < entry.realWidth);
+			if (scaled) {
+				const auto used = entry.width - skip;
+				const auto mx = scaled ? (x + (used / 2)) : 0;
+				const auto my = scaled ? (y + (height / 2)) : 0;
+				const auto scale = used / float64(use);
+				p.save();
+				p.translate(mx, my);
+				p.scale(scale, scale);
+				p.setOpacity(scale);
+				p.translate(-mx, -my);
+			}
+			const auto coloring = Ui::StarsColoringForCount(
+				colorings,
+				entry.stars);
+			auto &bg = _bgs[ColoringKey(coloring)];
+			if (!bg) {
+				bg = std::make_unique<PayedBg>(coloring);
+			}
+			const auto still = (entry.end - now) / float64(entry.duration);
+			const auto part = int(base::SafeRound(still * use));
+			const auto line = st::lineWidth;
+			if (part > 0) {
+				p.setOpacity(kColoredMessageBgOpacity);
+				bg->pinnedLight.paint(p, { x, y, use, height });
+			}
+			if (part < use) {
+				p.setClipRect(x + part, y, use - part + line, height);
+				p.setOpacity(kDarkOverOpacity);
+				bg->pinnedDark.paint(p, { x, y, use, height });
+			}
+			p.setClipping(false);
+			p.setOpacity(1.);
+
+			const auto userpicSize = st::groupCallPinnedUserpic;
+			const auto userpicPadding = st::groupCallUserpicPadding;
+			const auto position = QPoint(
+				x + userpicPadding.left(),
+				y + userpicPadding.top());
+			entry.from->paintUserpic(p, entry.view, {
+				.position = position,
+				.size = userpicSize,
+				.shape = Ui::PeerUserpicShape::Circle,
+			});
+			const auto leftSkip = userpicPadding.left()
+				+ userpicSize
+				+ userpicPadding.right();
+
+			p.setPen(st::white);
+			entry.text.draw(p, {
+				.position = { x + leftSkip, y + padding.top() },
+				.availableWidth = entry.width - leftSkip - padding.right(),
+				.elisionLines = 1,
+			});
+			if (scaled) {
+				p.restore();
+			}
+		}
+		p.translate(start, 0);
+
+		p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+		p.setPen(Qt::NoPen);
+
+		const auto leftFade = (//_leftFadeAnimation.value(
+			_leftFadeShown ? 1. : 0.);
+		if (leftFade) {
+			auto gradientLeft = QLinearGradient(0, 0, _fadeWidth, 0);
+			gradientLeft.setStops({
+				{ 0., QColor(255, 255, 255, 0) },
+				{ 1., QColor(255, 255, 255, 255) },
+			});
+			p.setOpacity(leftFade);
+			p.setBrush(gradientLeft);
+			p.drawRect(0, 0, _fadeWidth, scroll->height());
+			p.setOpacity(1.);
+		}
+		const auto rightFade = (//_rightFadeAnimation.value(
+			_rightFadeShown ? 1. : 0.);
+		if (rightFade) {
+			const auto till = scroll->width();
+			const auto from = till - _fadeWidth;
+			auto gradientRight = QLinearGradient(from, 0, till, 0);
+			gradientRight.setStops({
+				{ 0., QColor(255, 255, 255, 255) },
+				{ 1., QColor(255, 255, 255, 0) },
+			});
+			p.setBrush(gradientRight);
+			p.drawRect(from, 0, _fadeWidth, scroll->height());
+		}
+		QPainter(_pinned).drawImage(
+			QRect(QPoint(start, 0), scroll->size()),
+			_pinnedCanvas,
+			QRect(QPoint(), scroll->size() * ratio));
+	}, _pinned->lifetime());
+
+	_pinned->setMouseTracking(true);
+	const auto find = [=](QPoint position) {
+		if (position.y() < 0 || position.y() >= _pinned->height()) {
+			return MsgId();
+		} else for (const auto &entry : _pinnedViews) {
+			if (entry.left > position.x()) {
+				break;
+			} else if (entry.left + entry.width > position.x()) {
+				return entry.id;
+			}
+		}
+		return MsgId();
+	};
+	_pinned->events() | rpl::on_next([=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type == QEvent::MouseButtonPress) {
+			const auto pos = static_cast<QMouseEvent*>(e.get())->pos();
+			if (const auto id = find(pos)) {
+				if (_hidden) {
+					showList(*base::take(_hidden));
+					_hiddenShowRequested.fire({});
+				}
+				highlightMessage(id);
+			}
+		} else if (type == QEvent::MouseMove) {
+			const auto pos = static_cast<QMouseEvent*>(e.get())->pos();
+			_pinned->setCursor(find(pos)
+				? style::cur_pointer
+				: style::cur_default);
+		}
+	}, _pinned->lifetime());
+
+	scroll->show();
+	applyGeometry();
+}
+
+void MessagesUi::highlightMessage(MsgId id) {
+	if (!_scroll) {
+		return;
+	}
+	const auto i = ranges::find(_views, id, &MessageView::id);
+	if (i == end(_views) || i->top < 0) {
+		return;
+	} else if (i->toggleAnimation.animating()) {
+		_delayedHighlightId = id;
+		return;
+	}
+	_delayedHighlightId = 0;
+	const auto top = std::clamp(
+		i->top - ((_scroll->height() - i->realHeight) / 2),
+		0,
+		i->top);
+	const auto to = top - i->top;
+	const auto from = _scroll->scrollTop() - i->top;
+	if (from == to) {
+		startHighlight(id);
+		return;
+	}
+	_scrollToAnimation.stop();
+	_scrollToAnimation.start([=] {
+		const auto i = ranges::find(_views, id, &MessageView::id);
+		if (i == end(_views)) {
+			_scrollToAnimation.stop();
+			return;
+		}
+		_scroll->scrollToY(i->top + _scrollToAnimation.value(to));
+		if (!_scrollToAnimation.animating()) {
+			startHighlight(id);
+		}
+	}, from, to, st::slideDuration, anim::easeOutCirc);
+}
+
+void MessagesUi::startHighlight(MsgId id) {
+	_highlightId = id;
+	_highlightAnimation.start([=] {
+		repaintMessage(id);
+	}, 0., 3., 1000);
+}
+
+void MessagesUi::applyGeometry() {
+	if (_scroll) {
+		auto top = 0;
+		for (auto &entry : _views) {
+			entry.top = top;
+
+			updateMessageSize(entry);
+			updateMessageHeight(entry);
+
+			top += entry.height;
+		}
+	}
+	applyGeometryToPinned();
+	updateGeometries();
+}
+
+void MessagesUi::applyGeometryToPinned() {
+	if (!_pinnedScroll) {
+		setPinnedScrollSkip(0);
+		return;
+	}
+	const auto skip = st::groupCallMessageSkip;
+	auto maxHeight = 0;
+	auto left = 0;
+	for (auto &entry : _pinnedViews) {
+		entry.left = left;
+		updatePinnedSize(entry);
+		updatePinnedWidth(entry);
+		left += entry.width;
+
+		if (maxHeight < entry.height + skip) {
+			const auto possible = countPinnedScrollSkip(entry);
+			maxHeight = std::max(possible, maxHeight);
+		}
+	}
+	setPinnedScrollSkip(maxHeight);
+}
+
+int MessagesUi::countPinnedScrollSkip(const PinnedView &entry) const {
+	const auto skip = st::groupCallMessageSkip;
+	if (!entry.toggleAnimation.animating()) {
+		return entry.height + skip;
+	}
+	const auto used = ((entry.height + skip) * entry.width)
+		/ float64(entry.realWidth);
+	return int(base::SafeRound(used));
+}
+
+void MessagesUi::setPinnedScrollSkip(int skip) {
+	if (_pinnedScrollSkip != skip) {
+		_pinnedScrollSkip = skip;
+		updateGeometries();
+	}
+}
+
+void MessagesUi::updateGeometries() {
+	if (_pinnedScroll) {
+		const auto skip = st::groupCallMessageSkip;
+		const auto width = _pinnedViews.empty()
+			? 0
+			: (_pinnedViews.back().left + _pinnedViews.back().width - skip);
+		const auto height = _pinnedViews.empty()
+			? 0
+			: _pinnedViews.back().height;
+		const auto bottom = _bottom - st::groupCallMessageSkip;
+		_pinned->resize(width, height);
+
+		const auto min = std::min(width, _width);
+		_pinnedScroll->setGeometry(_left, bottom - height, min, height);
+	}
+	if (_scroll) {
+		const auto scrollBottom = (_scroll->scrollTop() + _scroll->height());
+		const auto atBottom = (scrollBottom >= _messages->height());
+		const auto bottom = _bottom - _pinnedScrollSkip;
+
+		const auto height = _views.empty()
+			? 0
+			: (_views.back().top + _views.back().height);
+		_messages->resize(_width, height);
+
+		const auto min = std::min(height, _availableHeight);
+		_scroll->setGeometry(_left, bottom - min, _width, min);
+
+		if (atBottom) {
+			_scroll->scrollToY(std::max(height - _scroll->height(), 0));
+		}
+	}
+}
+
+void MessagesUi::move(int left, int bottom, int width, int availableHeight) {
+	const auto min = st::groupCallWidth * 2 / 6;
+	if (width < min) {
+		const auto add = min - width;
+		width += add;
+		left -= add / 2;
+	}
+	if (_left != left
+		|| _bottom != bottom
+		|| _width != width
+		|| _availableHeight != availableHeight) {
+		_left = left;
+		_bottom = bottom;
+		_width = width;
+		_availableHeight = availableHeight;
+		applyGeometry();
+	}
+}
+
+void MessagesUi::raise() {
+	if (_scroll) {
+		_scroll->raise();
+	}
+	for (const auto &view : _views) {
+		if (const auto widget = view.reactionWidget.get()) {
+			widget->raise();
+		}
+	}
+}
+
+rpl::producer<> MessagesUi::hiddenShowRequested() const {
+	return _hiddenShowRequested.events();
+}
+
+rpl::producer<MessageDeleteRequest> MessagesUi::deleteRequests() const {
+	return _deleteRequests.events();
+}
+
+rpl::lifetime &MessagesUi::lifetime() {
+	return _lifetime;
+}
+
+} // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_messages_ui.h b/Telegram/SourceFiles/calls/group/calls_group_messages_ui.h
new file mode 100644
index 00000000000000..635be93661e024
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/calls_group_messages_ui.h
@@ -0,0 +1,202 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/unique_qptr.h"
+#include "ui/effects/animations.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "ui/round_rect.h"
+
+struct TextWithTags;
+
+namespace ChatHelpers {
+class Show;
+class TabbedPanel;
+} // namespace ChatHelpers
+
+namespace Data {
+struct ReactionId;
+} // namespace Data
+
+namespace Ui {
+class ElasticScroll;
+class EmojiButton;
+class InputField;
+class SendButton;
+class PopupMenu;
+class RpWidget;
+} // namespace Ui
+
+namespace Calls::Group::Ui {
+using namespace ::Ui;
+struct StarsColoring;
+} // namespace Calls::Group::Ui
+
+namespace Calls::Group {
+
+struct Message;
+struct MessageIdUpdate;
+struct MessageDeleteRequest;
+
+enum class MessagesMode {
+	GroupCall,
+	VideoStream,
+};
+
+class MessagesUi final {
+public:
+	MessagesUi(
+		not_null<QWidget*> parent,
+		std::shared_ptr<ChatHelpers::Show> show,
+		MessagesMode mode,
+		rpl::producer<std::vector<Message>> messages,
+		rpl::producer<std::vector<not_null<PeerData*>>> topDonorsValue,
+		rpl::producer<MessageIdUpdate> idUpdates,
+		rpl::producer<bool> canManageValue,
+		rpl::producer<bool> shown);
+	~MessagesUi();
+
+	void move(int left, int bottom, int width, int availableHeight);
+	void raise();
+
+	[[nodiscard]] rpl::producer<> hiddenShowRequested() const;
+	[[nodiscard]] rpl::producer<MessageDeleteRequest> deleteRequests() const;
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
+private:
+	struct MessageView;
+	struct PinnedView;
+	struct PayedBg {
+		explicit PayedBg(const Ui::StarsColoring &coloring);
+
+		style::owned_color light;
+		style::owned_color dark;
+		Ui::RoundRect pinnedLight;
+		Ui::RoundRect pinnedDark;
+		Ui::RoundRect messageLight;
+		Ui::RoundRect priceDark;
+		Ui::RoundRect badgeDark;
+	};
+
+	void setupBadges();
+	void setupList(
+		rpl::producer<std::vector<Message>> messages,
+		rpl::producer<bool> shown);
+	void showList(const std::vector<Message> &list);
+	void handleIdUpdates(rpl::producer<MessageIdUpdate> idUpdates);
+	void toggleMessage(MessageView &entry, bool shown);
+	void setContentFailed(MessageView &entry);
+	void setContent(MessageView &entry);
+	void setContent(PinnedView &entry);
+	void updateMessageSize(MessageView &entry);
+	bool updateMessageHeight(MessageView &entry);
+	void updatePinnedSize(PinnedView &entry);
+	bool updatePinnedWidth(PinnedView &entry);
+	void animateMessageSent(MessageView &entry);
+	void repaintMessage(MsgId id);
+	void highlightMessage(MsgId id);
+	void startHighlight(MsgId id);
+	void recountHeights(std::vector<MessageView>::iterator i, int top);
+	void appendMessage(const Message &data);
+	void checkReactionContent(
+		MessageView &entry,
+		const TextWithEntities &text);
+	void startReactionAnimation(MessageView &entry);
+	void updateReactionPosition(MessageView &entry);
+	void removeReaction(not_null<Ui::RpWidget*> widget);
+	void setupMessagesWidget();
+
+	void togglePinned(PinnedView &entry, bool shown);
+	void repaintPinned(MsgId id);
+	void recountWidths(std::vector<PinnedView>::iterator i, int left);
+	void appendPinned(const Message &data, TimeId now);
+	void setupPinnedWidget();
+
+	void applyGeometry();
+	void applyGeometryToPinned();
+	void updateGeometries();
+	[[nodiscard]] int countPinnedScrollSkip(const PinnedView &entry) const;
+	void setPinnedScrollSkip(int skip);
+
+	void updateTopFade();
+	void updateBottomFade();
+	void updateLeftFade();
+	void updateRightFade();
+
+	void receiveSomeMouseEvents();
+	void receiveAllMouseEvents();
+	void handleClick(const MessageView &entry, QPoint point);
+	void showContextMenu(const MessageView &entry, QPoint globalPoint);
+
+	[[nodiscard]] int donorPlace(not_null<PeerData*> peer) const;
+	[[nodiscard]] TextWithEntities nameText(
+		not_null<PeerData*> peer,
+		int place);
+
+	const not_null<QWidget*> _parent;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const MessagesMode _mode;
+	std::unique_ptr<Ui::ElasticScroll> _scroll;
+	Ui::Animations::Simple _scrollToAnimation;
+	Ui::RpWidget *_messages = nullptr;
+	QImage _canvas;
+
+	std::unique_ptr<Ui::ElasticScroll> _pinnedScroll;
+	Ui::RpWidget *_pinned = nullptr;
+	QImage _pinnedCanvas;
+	int _pinnedScrollSkip = 0;
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
+	rpl::variable<bool> _canManage;
+	rpl::event_stream<> _hiddenShowRequested;
+	rpl::event_stream<MessageDeleteRequest> _deleteRequests;
+	std::optional<std::vector<Message>> _hidden;
+	std::vector<MessageView> _views;
+	style::complex_color _messageBg;
+	Ui::RoundRect _messageBgRect;
+	MsgId _delayedHighlightId = 0;
+	MsgId _highlightId = 0;
+	Ui::Animations::Simple _highlightAnimation;
+
+	std::vector<PinnedView> _pinnedViews;
+	base::flat_map<uint64, std::unique_ptr<PayedBg>> _bgs;
+
+	QPoint _reactionBasePosition;
+	rpl::lifetime _effectsLifetime;
+
+	Ui::Text::String _liveBadge;
+	Ui::Text::String _adminBadge;
+
+	Ui::Text::CustomEmojiHelper _crownHelper;
+	base::flat_map<int, QString> _crownEmojiDataCache;
+	rpl::variable<std::vector<not_null<PeerData*>>> _topDonors;
+	//Ui::Animations::Simple _topFadeAnimation;
+	//Ui::Animations::Simple _bottomFadeAnimation;
+	//Ui::Animations::Simple _leftFadeAnimation;
+	//Ui::Animations::Simple _rightFadeAnimation;
+	int _fadeHeight = 0;
+	int _fadeWidth = 0;
+	bool _topFadeShown = false;
+	bool _bottomFadeShown = false;
+	bool _leftFadeShown = false;
+	bool _rightFadeShown = false;
+	bool _streamMode = false;
+
+	int _left = 0;
+	int _bottom = 0;
+	int _width = 0;
+	int _availableHeight = 0;
+
+	MsgId _revealedSpoilerId = 0;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
index 1e2e29e1add7d8..5bd6e595040eb1 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -8,15 +8,23 @@ For license and copyright information please follow this link:
 #include "calls/group/calls_group_panel.h"
 
 #include "calls/group/calls_group_common.h"
+#include "calls/group/calls_group_invite_controller.h"
 #include "calls/group/calls_group_members.h"
-#include "calls/group/calls_group_settings.h"
 #include "calls/group/calls_group_menu.h"
-#include "calls/group/calls_group_viewport.h"
+#include "calls/group/calls_group_message_field.h"
+#include "calls/group/calls_group_messages.h"
+#include "calls/group/calls_group_messages_ui.h"
+#include "calls/group/calls_group_settings.h"
 #include "calls/group/calls_group_toasts.h"
-#include "calls/group/calls_group_invite_controller.h"
+#include "calls/group/calls_group_viewport.h"
 #include "calls/group/ui/calls_group_scheduled_labels.h"
 #include "calls/group/ui/desktop_capture_choose_source.h"
-#include "ui/platform/ui_platform_window_title.h"
+#include "calls/calls_emoji_fingerprint.h"
+#include "calls/calls_window.h"
+#include "base/platform/base_platform_info.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "data/data_file_origin.h"
+#include "ui/platform/ui_platform_window_title.h" // TitleLayout
 #include "ui/platform/ui_platform_utility.h"
 #include "ui/controls/call_mute_button.h"
 #include "ui/widgets/buttons.h"
@@ -28,7 +36,6 @@ For license and copyright information please follow this link:
 #include "ui/widgets/rp_window.h"
 #include "ui/chat/group_call_bar.h"
 #include "ui/controls/userpic_button.h"
-#include "ui/layers/layer_manager.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
@@ -47,18 +54,21 @@ For license and copyright information please follow this link:
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "main/session/session_show.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
+#include "menu/menu_send.h"
 #include "base/event_filter.h"
 #include "base/unixtime.h"
 #include "base/qt_signal_producer.h"
 #include "base/timer_rpl.h"
-#include "base/power_save_blocker.h"
 #include "apiwrap.h" // api().kick.
 #include "api/api_chat_participants.h" // api().kick.
 #include "webrtc/webrtc_environment.h"
 #include "webrtc/webrtc_video_track.h"
 #include "webrtc/webrtc_audio_input_tester.h"
+#include "webrtc/webrtc_create_adm.h"
 #include "styles/style_calls.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 
 #include <QtWidgets/QApplication>
@@ -76,77 +86,6 @@ constexpr auto kControlsBackgroundOpacity = 0.8;
 constexpr auto kOverrideActiveColorBgAlpha = 172;
 constexpr auto kHideControlsTimeout = 5 * crl::time(1000);
 
-class Show final : public Main::SessionShow {
-public:
-	explicit Show(not_null<Panel*> panel);
-	~Show();
-
-	void showOrHideBoxOrLayer(
-		std::variant<
-			v::null_t,
-			object_ptr<Ui::BoxContent>,
-			std::unique_ptr<Ui::LayerWidget>> &&layer,
-		Ui::LayerOptions options,
-		anim::type animated) const override;
-	[[nodiscard]] not_null<QWidget*> toastParent() const override;
-	[[nodiscard]] bool valid() const override;
-	operator bool() const override;
-
-	[[nodiscard]] Main::Session &session() const override;
-
-private:
-	const base::weak_ptr<Panel> _panel;
-
-};
-
-Show::Show(not_null<Panel*> panel)
-: _panel(base::make_weak(panel)) {
-}
-
-Show::~Show() = default;
-
-void Show::showOrHideBoxOrLayer(
-		std::variant<
-			v::null_t,
-			object_ptr<Ui::BoxContent>,
-			std::unique_ptr<Ui::LayerWidget>> &&layer,
-		Ui::LayerOptions options,
-		anim::type animated) const {
-	using UniqueLayer = std::unique_ptr<Ui::LayerWidget>;
-	using ObjectBox = object_ptr<Ui::BoxContent>;
-	if (auto layerWidget = std::get_if<UniqueLayer>(&layer)) {
-		if (const auto panel = _panel.get()) {
-			panel->showLayer(std::move(*layerWidget), options, animated);
-		}
-	} else if (auto box = std::get_if<ObjectBox>(&layer)) {
-		if (const auto panel = _panel.get()) {
-			panel->showBox(std::move(*box), options, animated);
-		}
-	} else if (const auto panel = _panel.get()) {
-		panel->hideLayer(animated);
-	}
-}
-
-not_null<QWidget*> Show::toastParent() const {
-	const auto panel = _panel.get();
-	Assert(panel != nullptr);
-	return panel->widget();
-}
-
-bool Show::valid() const {
-	return !_panel.empty();
-}
-
-Show::operator bool() const {
-	return valid();
-}
-
-Main::Session &Show::session() const {
-	const auto panel = _panel.get();
-	Assert(panel != nullptr);
-	return panel->call()->peer()->session();
-}
-
 #ifdef Q_OS_WIN
 void UnpinMaximized(not_null<QWidget*> widget) {
 	SetWindowPos(
@@ -164,6 +103,96 @@ void UnpinMaximized(not_null<QWidget*> widget) {
 }
 #endif // Q_OS_WIN
 
+class Show final : public ChatHelpers::Show {
+public:
+	Show(not_null<Panel*> panel, std::shared_ptr<Ui::Show> base)
+	: _panel(panel)
+	, _base(std::move(base)) {
+	}
+
+	void activate() override {
+		if (const auto panel = _panel.get()) {
+			if (!panel->window()->isHidden()) {
+				panel->window()->activateWindow();
+			}
+		}
+	}
+
+	void showOrHideBoxOrLayer(
+			std::variant<
+				v::null_t,
+				object_ptr<Ui::BoxContent>,
+				std::unique_ptr<Ui::LayerWidget>> &&layer,
+			Ui::LayerOptions options,
+			anim::type animated) const override {
+		_base->showOrHideBoxOrLayer(
+			std::move(layer),
+			options,
+			anim::type::normal);
+	}
+	not_null<QWidget*> toastParent() const override {
+		return _base->toastParent();
+	}
+	bool valid() const override {
+		return _panel.get() != nullptr;
+	}
+	operator bool() const override {
+		return valid();
+	}
+
+	Main::Session &session() const override {
+		const auto panel = _panel.get();
+		Assert(panel != nullptr);
+
+		return panel->call()->peer()->session();
+	}
+	bool paused(ChatHelpers::PauseReason reason) const override {
+		const auto panel = _panel.get();
+		if (!panel) {
+			return false;
+		} else if (panel->window()->isHidden()
+			|| (!panel->window()->isFullScreen()
+				&& !panel->window()->isActiveWindow())) {
+			return true;
+		} else if (reason < ChatHelpers::PauseReason::Layer
+			&& panel->callWindow()->topShownLayer() != nullptr) {
+			return true;
+		}
+		return false;
+	}
+	rpl::producer<> pauseChanged() const override {
+		return rpl::never<>();
+	}
+
+	rpl::producer<bool> adjustShadowLeft() const override {
+		return rpl::single(false);
+	}
+	SendMenu::Details sendMenuDetails() const override {
+		return { SendMenu::Type::Disabled };
+	}
+
+	bool showMediaPreview(
+			Data::FileOrigin origin,
+			not_null<DocumentData*> document) const override {
+		return false; // #TODO stories
+	}
+	bool showMediaPreview(
+			Data::FileOrigin origin,
+			not_null<PhotoData*> photo) const override {
+		return false; // #TODO stories
+	}
+
+	void processChosenSticker(
+			ChatHelpers::FileChosen &&chosen) const override {
+		//_panel->emojiChosen(std::move(chosen));
+	}
+
+private:
+	const base::weak_ptr<Panel> _panel;
+	const std::shared_ptr<Ui::Show> _base;
+
+};
+
 } // namespace
 
 struct Panel::ControlsBackgroundNarrow {
@@ -174,25 +203,22 @@ struct Panel::ControlsBackgroundNarrow {
 
 	Ui::RpWidget shadow;
 	Ui::RpWidget blocker;
+	int shadowHeight = 0;
 };
 
 Panel::Panel(not_null<GroupCall*> call)
+: Panel(call, ConferencePanelMigration()) {
+}
+
+Panel::Panel(not_null<GroupCall*> call, ConferencePanelMigration info)
 : _call(call)
 , _peer(call->peer())
-, _layerBg(std::make_unique<Ui::LayerManager>(widget()))
-#ifndef Q_OS_MAC
-, _controls(Ui::Platform::SetupSeparateTitleControls(
-	window(),
-	st::groupCallTitle,
-	nullptr,
-	_controlsTop.value()))
-#endif // !Q_OS_MAC
-, _powerSaveBlocker(std::make_unique<base::PowerSaveBlocker>(
-	base::PowerSaveBlockType::PreventDisplaySleep,
-	u"Video chat is active"_q,
-	window()->windowHandle()))
+, _window(info.window ? info.window : std::make_shared<Window>())
 , _viewport(
-	std::make_unique<Viewport>(widget(), PanelMode::Wide, _window.backend()))
+	std::make_unique<Viewport>(
+		widget(),
+		PanelMode::Wide,
+		_window->backend()))
 , _mute(std::make_unique<Ui::CallMuteButton>(
 	widget(),
 	st::callMuteButton,
@@ -215,6 +241,15 @@ Panel::Panel(not_null<GroupCall*> call)
 , _hangup(widget(), st::groupCallHangup)
 , _stickedTooltipsShown(Core::App().settings().hiddenGroupCallTooltips()
 	& ~StickedTooltip::Microphone) // Always show tooltip about mic.
+, _messages(std::make_unique<MessagesUi>(
+	widget(),
+	uiShow(),
+	MessagesMode::GroupCall,
+	_call->messages()->listValue(),
+	nullptr,
+	_call->messages()->idUpdates(),
+	_call->canManageValue(),
+	_call->messagesEnabledValue()))
 , _toasts(std::make_unique<Toasts>(this))
 , _controlsBackgroundColor([] {
 	auto result = st::groupCallBg->c;
@@ -222,9 +257,6 @@ Panel::Panel(not_null<GroupCall*> call)
 	return result;
 })
 , _hideControlsTimer([=] { toggleWideControls(false); }) {
-	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
-	_layerBg->setHideByBackgroundClick(true);
-
 	_viewport->widget()->hide();
 	if (!_viewport->requireARGB32()) {
 		_call->setNotRequireARGB32();
@@ -239,7 +271,7 @@ Panel::Panel(not_null<GroupCall*> call)
 	initWindow();
 	initWidget();
 	initControls();
-	initLayout();
+	initLayout(info);
 	showAndActivate();
 }
 
@@ -250,7 +282,7 @@ Panel::~Panel() {
 
 void Panel::setupRealCallViewers() {
 	_call->real(
-	) | rpl::start_with_next([=](not_null<Data::GroupCall*> real) {
+	) | rpl::on_next([=](not_null<Data::GroupCall*> real) {
 		subscribeToChanges(real);
 	}, lifetime());
 }
@@ -268,25 +300,11 @@ bool Panel::isActive() const {
 	return window()->isActiveWindow() && isVisible();
 }
 
-base::weak_ptr<Ui::Toast::Instance> Panel::showToast(
-		const QString &text,
-		crl::time duration) {
-	return Show(this).showToast(text, duration);
-}
-
-base::weak_ptr<Ui::Toast::Instance> Panel::showToast(
-		TextWithEntities &&text,
-		crl::time duration) {
-	return Show(this).showToast(std::move(text), duration);
-}
-
-base::weak_ptr<Ui::Toast::Instance> Panel::showToast(
-		Ui::Toast::Config &&config) {
-	return Show(this).showToast(std::move(config));
-}
-
-std::shared_ptr<Main::SessionShow> Panel::uiShow() {
-	return std::make_shared<Show>(this);
+std::shared_ptr<ChatHelpers::Show> Panel::uiShow() {
+	if (!_cachedShow) {
+		_cachedShow = std::make_shared<Show>(this, _window->uiShow());
+	}
+	return _cachedShow;
 }
 
 void Panel::minimize() {
@@ -323,7 +341,7 @@ void Panel::migrate(not_null<ChannelData*> channel) {
 void Panel::subscribeToPeerChanges() {
 	Info::Profile::NameValue(
 		_peer
-	) | rpl::start_with_next([=](const QString &name) {
+	) | rpl::on_next([=](const QString &name) {
 		window()->setTitle(name);
 	}, _peerLifetime);
 }
@@ -341,11 +359,7 @@ bool Panel::chooseSourceActiveWithAudio() {
 }
 
 bool Panel::chooseSourceWithAudioSupported() {
-#ifdef Q_OS_WIN
-	return true;
-#else // Q_OS_WIN
-	return false;
-#endif // Q_OS_WIN
+	return Webrtc::LoopbackAudioCaptureSupported();
 }
 
 rpl::lifetime &Panel::chooseSourceInstanceLifetime() {
@@ -367,14 +381,28 @@ void Panel::initWindow() {
 	window()->setAttribute(Qt::WA_NoSystemBackground);
 	window()->setTitleStyle(st::groupCallTitle);
 
-	subscribeToPeerChanges();
+	if (_call->conference()) {
+		titleText() | rpl::on_next([=](const QString &text) {
+			window()->setTitle(text);
+		}, lifetime());
+	} else {
+		subscribeToPeerChanges();
+	}
 
+	const auto updateFullScreen = [=] {
+		const auto state = window()->windowState();
+		const auto full = (state & Qt::WindowFullScreen)
+			|| (state & Qt::WindowMaximized);
+		_rtmpFull = _call->rtmp() && full;
+		_fullScreenOrMaximized = full;
+	};
 	base::install_event_filter(window().get(), [=](not_null<QEvent*> e) {
-		if (e->type() == QEvent::Close && handleClose()) {
+		const auto type = e->type();
+		if (type == QEvent::Close && handleClose()) {
 			e->ignore();
 			return base::EventFilterResult::Cancel;
-		} else if (e->type() == QEvent::KeyPress
-			|| e->type() == QEvent::KeyRelease) {
+		} else if (_call->rtmp()
+			&& (type == QEvent::KeyPress || type == QEvent::KeyRelease)) {
 			const auto key = static_cast<QKeyEvent*>(e.get())->key();
 			if (key == Qt::Key_Space) {
 				_call->pushToTalk(
@@ -384,16 +412,19 @@ void Panel::initWindow() {
 				&& _fullScreenOrMaximized.current()) {
 				toggleFullScreen();
 			}
-		} else if (e->type() == QEvent::WindowStateChange && _call->rtmp()) {
-			const auto state = window()->windowState();
-			_fullScreenOrMaximized = (state & Qt::WindowFullScreen)
-				|| (state & Qt::WindowMaximized);
+		} else if (type == QEvent::WindowStateChange) {
+			updateFullScreen();
 		}
 		return base::EventFilterResult::Continue;
-	});
+	}, lifetime());
+	updateFullScreen();
 
+	const auto guard = base::make_weak(this);
 	window()->setBodyTitleArea([=](QPoint widgetPoint) {
 		using Flag = Ui::WindowTitleHitTestFlag;
+		if (!guard) {
+			return (Flag::None | Flag(0));
+		}
 		const auto titleRect = QRect(
 			0,
 			0,
@@ -409,44 +440,104 @@ void Panel::initWindow() {
 		if (!moveable) {
 			return (Flag::None | Flag(0));
 		}
-		const auto shown = _layerBg->topShownLayer();
+		const auto shown = _window->topShownLayer();
 		return (!shown || !shown->geometry().contains(widgetPoint))
 			? (Flag::Move | Flag::Menu | Flag::Maximize)
 			: Flag::None;
 	});
 
 	_call->hasVideoWithFramesValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateMode();
 	}, lifetime());
+
+	_window->maximizeRequests() | rpl::on_next([=](bool maximized) {
+		if (_call->rtmp()) {
+			toggleFullScreen(maximized);
+		} else {
+			window()->setWindowState(maximized
+				? Qt::WindowMaximized
+				: Qt::WindowNoState);
+		}
+	}, lifetime());
+
+	_window->showingLayer() | rpl::on_next([=] {
+		hideStickedTooltip(StickedTooltipHide::Unavailable);
+	}, lifetime());
+
+	_window->setControlsStyle(st::groupCallTitle);
+	_window->togglePowerSaveBlocker(true);
+
+	uiShow()->hideLayer(anim::type::instant);
 }
 
 void Panel::initWidget() {
 	widget()->setMouseTracking(true);
 
 	widget()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		paint(clip);
 	}, lifetime());
 
 	widget()->sizeValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](QSize size) {
+	) | rpl::skip(1) | rpl::on_next([=](QSize size) {
 		if (!updateMode()) {
 			updateControlsGeometry();
 		}
 
 		// some geometries depends on _controls->controls.geometry,
 		// which is not updated here yet.
-		crl::on_main(widget(), [=] { updateControlsGeometry(); });
+		crl::on_main(this, [=] { updateControlsGeometry(); });
 	}, lifetime());
 }
 
+void Panel::toggleMessageTyping() {
+	const auto typing = !_messageTyping.current();
+	if (_messageField) {
+		_messageField->toggle(typing);
+	} else if (typing) {
+		_messageField = std::make_unique<MessageField>(
+			widget(),
+			uiShow(),
+			_call->conference() ? nullptr : _call->peer().get());
+
+		updateButtonsGeometry();
+		_messageField->toggle(true);
+
+		_messageField->submitted(
+		) | rpl::on_next([=](TextWithTags text) {
+			_call->sendMessage(std::move(text));
+
+			_messageField->toggle(false);
+			_messageTyping = false;
+			updateWideControlsVisibility();
+		}, _messageField->lifetime());
+
+		_messageField->heightValue() | rpl::on_next([=] {
+			updateButtonsGeometry();
+		}, _messageField->lifetime());
+
+		_messageField->closeRequests() | rpl::on_next([=] {
+			if (_messageTyping.current()) {
+				toggleMessageTyping();
+			}
+		}, _messageField->lifetime());
+
+		_messageField->closed() | rpl::on_next([=] {
+			_messageField = nullptr;
+			updateButtonsGeometry();
+		}, _messageField->lifetime());
+	}
+	_messageTyping = typing;
+	updateWideControlsVisibility();
+}
+
 void Panel::endCall() {
 	if (!_call->canManage()) {
 		_call->hangup();
 		return;
 	}
-	showBox(Box(
+	uiShow()->showBox(Box(
 		LeaveBox,
 		_call,
 		false,
@@ -461,7 +552,7 @@ void Panel::startScheduledNow() {
 	} else if (now + kStartNoConfirmation >= date) {
 		_call->startScheduledNow();
 	} else {
-		const auto box = std::make_shared<QPointer<Ui::GenericBox>>();
+		const auto box = std::make_shared<base::weak_qptr<Ui::GenericBox>>();
 		const auto done = [=] {
 			if (*box) {
 				(*box)->closeBox();
@@ -476,7 +567,7 @@ void Panel::startScheduledNow() {
 			.confirmText = tr::lng_group_call_start_now(),
 		});
 		*box = owned.data();
-		showBox(std::move(owned));
+		uiShow()->showBox(std::move(owned));
 	}
 }
 
@@ -484,7 +575,7 @@ void Panel::initControls() {
 	_mute->clicks(
 	) | rpl::filter([=](Qt::MouseButton button) {
 		return (button == Qt::LeftButton);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (_call->scheduleDate()) {
 			if (_call->canManage()) {
 				startScheduledNow();
@@ -500,7 +591,9 @@ void Panel::initControls() {
 
 		const auto oldState = _call->muted();
 		const auto newState = (oldState == MuteState::ForceMuted)
-			? MuteState::RaisedHand
+			? (_call->conference()
+				? MuteState::ForceMuted
+				: MuteState::RaisedHand)
 			: (oldState == MuteState::RaisedHand)
 			? MuteState::RaisedHand
 			: (oldState == MuteState::Muted)
@@ -510,17 +603,19 @@ void Panel::initControls() {
 	}, _mute->lifetime());
 
 	initShareAction();
+	createMessageButton();
 	refreshLeftButton();
 	refreshVideoButtons();
 
 	rpl::combine(
 		_mode.value(),
 		_call->canManageValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshTopButton();
 	}, lifetime());
 
 	_hangup->setClickedCallback([=] { endCall(); });
+	_hangup->setAccessibleName(tr::lng_group_call_leave(tr::now));
 
 	const auto scheduleDate = _call->scheduleDate();
 	if (scheduleDate) {
@@ -543,12 +638,12 @@ void Panel::initControls() {
 				_peer,
 				Data::PeerUpdate::Flag::Username
 			) | rpl::skip(1) | rpl::to_empty
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshLeftButton();
 			updateControlsGeometry();
 		}, _callLifetime);
 
-		std::move(started) | rpl::start_with_next([=] {
+		std::move(started) | rpl::on_next([=] {
 			refreshVideoButtons();
 			updateButtonsStyles();
 			setupMembers();
@@ -563,19 +658,19 @@ void Panel::initControls() {
 			|| (state == State::Ended)
 			|| (state == State::FailedHangingUp)
 			|| (state == State::Failed);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		closeBeforeDestroy();
 	}, _callLifetime);
 
 	_call->levelUpdates(
 	) | rpl::filter([=](const LevelUpdate &update) {
 		return update.me;
-	}) | rpl::start_with_next([=](const LevelUpdate &update) {
+	}) | rpl::on_next([=](const LevelUpdate &update) {
 		_mute->setLevel(update.value);
 	}, _callLifetime);
 
 	_call->real(
-	) | rpl::start_with_next([=](not_null<Data::GroupCall*> real) {
+	) | rpl::on_next([=](not_null<Data::GroupCall*> real) {
 		setupRealMuteButtonState(real);
 	}, _callLifetime);
 
@@ -583,10 +678,15 @@ void Panel::initControls() {
 }
 
 void Panel::toggleFullScreen() {
-	if (_fullScreenOrMaximized.current() || window()->isFullScreen()) {
-		window()->showNormal();
-	} else {
+	toggleFullScreen(
+		!_fullScreenOrMaximized.current() && !window()->isFullScreen());
+}
+
+void Panel::toggleFullScreen(bool fullscreen) {
+	if (fullscreen) {
 		window()->showFullScreen();
+	} else {
+		window()->showNormal();
 	}
 }
 
@@ -601,12 +701,14 @@ void Panel::refreshLeftButton() {
 		_settings.destroy();
 		_callShare.create(widget(), st::groupCallShare);
 		_callShare->setClickedCallback(_callShareLinkCallback);
+		_callShare->setAccessibleName(tr::lng_group_call_invite(tr::now));
 	} else {
 		_callShare.destroy();
 		_settings.create(widget(), st::groupCallSettings);
 		_settings->setClickedCallback([=] {
-			showBox(Box(SettingsBox, _call));
+			uiShow()->showBox(Box(SettingsBox, _call));
 		});
+		_settings->setAccessibleName(tr::lng_group_call_settings_title(tr::now));
 		trackControls(_trackControls, true);
 	}
 	const auto raw = _callShare ? _callShare.data() : _settings.data();
@@ -615,6 +717,19 @@ void Panel::refreshLeftButton() {
 	updateButtonsStyles();
 }
 
+rpl::producer<Ui::CallButtonColors> Panel::toggleableOverrides(
+		rpl::producer<bool> active) {
+	return rpl::combine(
+		std::move(active),
+		_mute->colorOverrides()
+	) | rpl::map([](bool active, Ui::CallButtonColors colors) {
+		if (active && colors.bg) {
+			colors.bg->setAlpha(kOverrideActiveColorBgAlpha);
+		}
+		return colors;
+	});
+}
+
 void Panel::refreshVideoButtons(std::optional<bool> overrideWideMode) {
 	const auto create = overrideWideMode.value_or(mode() == PanelMode::Wide)
 		|| (!_call->scheduleDate() && _call->videoIsWorking());
@@ -629,17 +744,6 @@ void Panel::refreshVideoButtons(std::optional<bool> overrideWideMode) {
 		}
 		return;
 	}
-	auto toggleableOverrides = [&](rpl::producer<bool> active) {
-		return rpl::combine(
-			std::move(active),
-			_mute->colorOverrides()
-		) | rpl::map([](bool active, Ui::CallButtonColors colors) {
-			if (active && colors.bg) {
-				colors.bg->setAlpha(kOverrideActiveColorBgAlpha);
-			}
-			return colors;
-		});
-	};
 	if (!_video) {
 		_video.create(
 			widget(),
@@ -652,16 +756,20 @@ void Panel::refreshVideoButtons(std::optional<bool> overrideWideMode) {
 				StickedTooltipHide::Activated);
 			_call->toggleVideo(!_call->isSharingCamera());
 		});
+		_video->setAccessibleName(tr::lng_call_start_video(tr::now));
 		_video->setColorOverrides(
 			toggleableOverrides(_call->isSharingCameraValue()));
 		_call->isSharingCameraValue(
-		) | rpl::start_with_next([=](bool sharing) {
+		) | rpl::on_next([=](bool sharing) {
 			if (sharing) {
 				hideStickedTooltip(
 					StickedTooltip::Camera,
 					StickedTooltipHide::Activated);
 			}
 			_video->setProgress(sharing ? 1. : 0.);
+			_video->setAccessibleName(sharing
+				? tr::lng_call_stop_video(tr::now)
+				: tr::lng_call_start_video(tr::now));
 		}, _video->lifetime());
 	}
 	if (!_screenShare) {
@@ -670,17 +778,22 @@ void Panel::refreshVideoButtons(std::optional<bool> overrideWideMode) {
 		_screenShare->setClickedCallback([=] {
 			chooseShareScreenSource();
 		});
+		_screenShare->setAccessibleName(tr::lng_group_call_screen_share_start(tr::now));
 		_screenShare->setColorOverrides(
 			toggleableOverrides(_call->isSharingScreenValue()));
 		_call->isSharingScreenValue(
-		) | rpl::start_with_next([=](bool sharing) {
+		) | rpl::on_next([=](bool sharing) {
 			_screenShare->setProgress(sharing ? 1. : 0.);
+			_screenShare->setAccessibleName(sharing
+				? tr::lng_group_call_screen_share_stop(tr::now)
+				: tr::lng_group_call_screen_share_start(tr::now));
 		}, _screenShare->lifetime());
 	}
 	if (!_wideMenu) {
 		_wideMenu.create(widget(), st::groupCallMenuToggleSmall);
 		_wideMenu->show();
 		_wideMenu->setClickedCallback([=] { showMainMenu(); });
+		_wideMenu->setAccessibleName(tr::lng_sr_group_call_menu(tr::now));
 		_wideMenu->setColorOverrides(
 			toggleableOverrides(_wideMenuShown.value()));
 	}
@@ -689,6 +802,20 @@ void Panel::refreshVideoButtons(std::optional<bool> overrideWideMode) {
 	raiseControls();
 }
 
+void Panel::createMessageButton() {
+	if (!_message) {
+		_message.create(
+			widget(),
+			st::groupCallMessageSmall,
+			&st::groupCallMessageActiveSmall);
+		_message->show();
+		_message->setClickedCallback([=] { toggleMessageTyping(); });
+		_message->setAccessibleName(tr::lng_group_call_message(tr::now));
+		_message->setColorOverrides(
+			toggleableOverrides(_messageTyping.value()));
+	}
+}
+
 void Panel::hideStickedTooltip(StickedTooltipHide hide) {
 	if (!_stickedTooltipClose || !_niceTooltipControl) {
 		return;
@@ -754,7 +881,7 @@ void Panel::setupRealMuteButtonState(not_null<Data::GroupCall*> real) {
 	) | rpl::distinct_until_changed(
 	) | rpl::filter(
 		_2 != GroupCall::InstanceState::TransitionToRtc
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			MuteState mute,
 			GroupCall::InstanceState state,
 			TimeId scheduleDate,
@@ -765,8 +892,7 @@ void Panel::setupRealMuteButtonState(not_null<Data::GroupCall*> real) {
 		const auto wide = (mode == PanelMode::Wide);
 		using Type = Ui::CallMuteButtonType;
 		using ExpandType = Ui::CallMuteButtonExpandType;
-		_mute->setState(Ui::CallMuteButtonState{
-			.text = (wide
+		const auto text = (wide
 				? QString()
 				: scheduleDate
 				? (canManage
@@ -782,7 +908,10 @@ void Panel::setupRealMuteButtonState(not_null<Data::GroupCall*> real) {
 				? tr::lng_group_call_raised_hand(tr::now)
 				: mute == MuteState::Muted
 				? tr::lng_group_call_unmute(tr::now)
-				: tr::lng_group_call_you_are_live(tr::now)),
+				: tr::lng_group_call_you_are_live(tr::now));
+		_mute->outer()->setAccessibleName(text);
+		_mute->setState(Ui::CallMuteButtonState{
+			.text = text,
 			.tooltip = ((!scheduleDate && mute == MuteState::Muted)
 				? tr::lng_group_call_unmute_sub(tr::now)
 				: QString()),
@@ -795,7 +924,9 @@ void Panel::setupRealMuteButtonState(not_null<Data::GroupCall*> real) {
 				: state == GroupCall::InstanceState::Disconnected
 				? Type::Connecting
 				: mute == MuteState::ForceMuted
-				? Type::ForceMuted
+				? (_call->conference()
+					? Type::ConferenceForceMuted
+					: Type::ForceMuted)
 				: mute == MuteState::RaisedHand
 				? Type::RaisedHand
 				: mute == MuteState::Muted
@@ -852,7 +983,7 @@ void Panel::setupScheduledLabels(rpl::producer<TimeId> date) {
 	rpl::combine(
 		widget()->sizeValue(),
 		_startsIn->widthValue()
-	) | rpl::start_with_next([=](QSize size, int width) {
+	) | rpl::on_next([=](QSize size, int width) {
 		_startsIn->move(
 			(size.width() - width) / 2,
 			top() + st::groupCallStartsInTop);
@@ -861,7 +992,7 @@ void Panel::setupScheduledLabels(rpl::producer<TimeId> date) {
 	rpl::combine(
 		widget()->sizeValue(),
 		_startsWhen->widthValue()
-	) | rpl::start_with_next([=](QSize size, int width) {
+	) | rpl::on_next([=](QSize size, int width) {
 		_startsWhen->move(
 			(size.width() - width) / 2,
 			top() + st::groupCallStartsWhenTop);
@@ -870,7 +1001,7 @@ void Panel::setupScheduledLabels(rpl::producer<TimeId> date) {
 	rpl::combine(
 		widget()->sizeValue(),
 		_countdown->widthValue()
-	) | rpl::start_with_next([=](QSize size, int width) {
+	) | rpl::on_next([=](QSize size, int width) {
 		_countdown->move(
 			(size.width() - width) / 2,
 			top() + st::groupCallCountdownTop);
@@ -890,14 +1021,14 @@ void Panel::setupMembers() {
 	_countdown.destroy();
 	_startsWhen.destroy();
 
-	_members.create(widget(), _call, mode(), _window.backend());
+	_members.create(widget(), _call, mode(), _window->backend());
 
 	setupVideo(_viewport.get());
 	setupVideo(_members->viewport());
 	_viewport->mouseInsideValue(
 	) | rpl::filter([=] {
-		return !_fullScreenOrMaximized.current();
-	}) | rpl::start_with_next([=](bool inside) {
+		return !_rtmpFull;
+	}) | rpl::on_next([=](bool inside) {
 		toggleWideControls(inside);
 	}, _viewport->lifetime());
 
@@ -908,32 +1039,30 @@ void Panel::setupMembers() {
 	raiseControls();
 
 	_members->desiredHeightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateMembersGeometry();
 	}, _members->lifetime());
 
 	_members->toggleMuteRequests(
-	) | rpl::start_with_next([=](MuteRequest request) {
-		if (_call) {
-			_call->toggleMute(request);
-		}
+	) | rpl::on_next([=](MuteRequest request) {
+		_call->toggleMute(request);
 	}, _callLifetime);
 
 	_members->changeVolumeRequests(
-	) | rpl::start_with_next([=](VolumeRequest request) {
-		if (_call) {
-			_call->changeVolume(request);
-		}
+	) | rpl::on_next([=](VolumeRequest request) {
+		_call->changeVolume(request);
 	}, _callLifetime);
 
 	_members->kickParticipantRequests(
-	) | rpl::start_with_next([=](not_null<PeerData*> participantPeer) {
+	) | rpl::on_next([=](not_null<PeerData*> participantPeer) {
 		kickParticipant(participantPeer);
 	}, _callLifetime);
 
 	_members->addMembersRequests(
-	) | rpl::start_with_next([=] {
-		if (!_peer->isBroadcast()
+	) | rpl::on_next([=] {
+		if (_call->conference()) {
+			addMembers();
+		} else if (!_peer->isBroadcast()
 			&& Data::CanSend(_peer, ChatRestriction::SendOther, false)
 			&& _call->joinAs()->isSelf()) {
 			addMembers();
@@ -944,8 +1073,11 @@ void Panel::setupMembers() {
 		}
 	}, _callLifetime);
 
+	_members->shareLinkRequests(
+	) | rpl::on_next(shareConferenceLinkCallback(), _callLifetime);
+
 	_call->videoEndpointLargeValue(
-	) | rpl::start_with_next([=](const VideoEndpoint &large) {
+	) | rpl::on_next([=](const VideoEndpoint &large) {
 		if (large && mode() != PanelMode::Wide) {
 			enlargeVideo();
 		}
@@ -953,6 +1085,30 @@ void Panel::setupMembers() {
 	}, _callLifetime);
 }
 
+Fn<void()> Panel::shareConferenceLinkCallback() {
+	return [=] {
+		Expects(_call->conference());
+
+		ShowConferenceCallLinkBox(uiShow(), _call->sharedCall(), {
+			.st = DarkConferenceCallLinkStyle(),
+		});
+	};
+}
+
+void Panel::migrationShowShareLink() {
+	ShowConferenceCallLinkBox(
+		uiShow(),
+		_call->sharedCall(),
+		{ .st = DarkConferenceCallLinkStyle() });
+}
+
+void Panel::migrationInviteUsers(std::vector<InviteRequest> users) {
+	const auto done = [=](InviteResult result) {
+		uiShow()->showToast({ ComposeInviteResultToast(result) });
+	};
+	_call->inviteUsers(std::move(users), crl::guard(this, done));
+}
+
 void Panel::enlargeVideo() {
 	_lastSmallGeometry = window()->geometry();
 
@@ -1008,6 +1164,7 @@ void Panel::raiseControls() {
 		&_screenShare,
 		&_wideMenu,
 		&_video,
+		&_message,
 		&_hangup
 	};
 	for (const auto button : buttons) {
@@ -1035,7 +1192,11 @@ void Panel::raiseControls() {
 	if (_pinOnTop) {
 		_pinOnTop->raise();
 	}
-	_layerBg->raise();
+	_messages->raise();
+	if (_messageField) {
+		_messageField->raise();
+	}
+	_window->raiseLayers();
 	if (_niceTooltip) {
 		_niceTooltip->raise();
 	}
@@ -1067,7 +1228,7 @@ void Panel::setupVideo(not_null<Viewport*> viewport) {
 		setupTile(endpoint, track);
 	}
 	_call->videoStreamActiveUpdates(
-	) | rpl::start_with_next([=](const VideoStateToggle &update) {
+	) | rpl::on_next([=](const VideoStateToggle &update) {
 		if (update.value) {
 			// Add async (=> the participant row is definitely in Members).
 			const auto endpoint = update.endpoint;
@@ -1085,14 +1246,14 @@ void Panel::setupVideo(not_null<Viewport*> viewport) {
 	}, viewport->lifetime());
 
 	viewport->pinToggled(
-	) | rpl::start_with_next([=](bool pinned) {
+	) | rpl::on_next([=](bool pinned) {
 		_call->pinVideoEndpoint(pinned
 			? _call->videoEndpointLarge()
 			: VideoEndpoint{});
 	}, viewport->lifetime());
 
 	viewport->clicks(
-	) | rpl::start_with_next([=](VideoEndpoint &&endpoint) {
+	) | rpl::on_next([=](VideoEndpoint &&endpoint) {
 		if (_call->videoEndpointLarge() == endpoint) {
 			_call->showVideoEndpointLarge({});
 		} else if (_call->videoEndpointPinned()) {
@@ -1103,7 +1264,7 @@ void Panel::setupVideo(not_null<Viewport*> viewport) {
 	}, viewport->lifetime());
 
 	viewport->qualityRequests(
-	) | rpl::start_with_next([=](const VideoQualityRequest &request) {
+	) | rpl::on_next([=](const VideoQualityRequest &request) {
 		_call->requestVideoQuality(request.endpoint, request.quality);
 	}, viewport->lifetime());
 }
@@ -1113,18 +1274,19 @@ void Panel::toggleWideControls(bool shown) {
 		return;
 	}
 	_showWideControls = shown;
-	crl::on_main(widget(), [=] {
+	crl::on_main(this, [=] {
 		updateWideControlsVisibility();
 	});
 }
 
 void Panel::updateWideControlsVisibility() {
 	const auto shown = _showWideControls
-		|| (_stickedTooltipClose != nullptr);
+		|| (_stickedTooltipClose != nullptr)
+		|| _messageTyping.current();
 	if (_wideControlsShown == shown) {
 		return;
 	}
-	_viewport->setCursorShown(!_fullScreenOrMaximized.current() || shown);
+	_viewport->setCursorShown(!_rtmpFull || shown);
 	_wideControlsShown = shown;
 	_wideControlsAnimation.start(
 		[=] { updateButtonsGeometry(); },
@@ -1151,7 +1313,7 @@ void Panel::subscribeToChanges(not_null<Data::GroupCall*> real) {
 			const auto skip = st::groupCallRecordingMarkSkip;
 			_recordingMark->resize(size + 2 * skip, size + 2 * skip);
 			_recordingMark->setClickedCallback([=] {
-				showToast({ (livestream
+				uiShow()->showToast({ (livestream
 					? tr::lng_group_call_is_recorded_channel
 					: real->recordVideo()
 					? tr::lng_group_call_is_recorded_video
@@ -1171,7 +1333,7 @@ void Panel::subscribeToChanges(not_null<Data::GroupCall*> real) {
 			animate();
 
 			_recordingMark->paintRequest(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				auto p = QPainter(_recordingMark.data());
 				auto hq = PainterHighQualityEnabler(p);
 				p.setPen(Qt::NoPen);
@@ -1190,14 +1352,15 @@ void Panel::subscribeToChanges(not_null<Data::GroupCall*> real) {
 	) | rpl::map(
 		_1 != 0
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool recorded) {
+	) | rpl::on_next([=](bool recorded) {
 		const auto livestream = _call->peer()->isBroadcast();
 		const auto isVideo = real->recordVideo();
 		if (recorded) {
 			*startedAsVideo = isVideo;
+			_call->playSoundRecordingStarted();
 		}
 		validateRecordingMark(recorded);
-		showToast((recorded
+		uiShow()->showToast((recorded
 			? (livestream
 				? tr::lng_group_call_recording_started_channel
 				: isVideo
@@ -1211,27 +1374,32 @@ void Panel::subscribeToChanges(not_null<Data::GroupCall*> real) {
 				? tr::lng_group_call_recording_stopped_channel
 				: tr::lng_group_call_recording_stopped))(
 				tr::now,
-				Ui::Text::RichLangValue));
+				tr::rich));
 	}, lifetime());
 	validateRecordingMark(real->recordStartDate() != 0);
 
 	rpl::combine(
 		_call->videoIsWorkingValue(),
 		_call->isSharingCameraValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshVideoButtons();
 		showStickedTooltip();
 	}, lifetime());
 
+	_call->messagesEnabledValue() | rpl::on_next([=] {
+		updateButtonsGeometry();
+		raiseControls();
+	}, lifetime());
+
 	rpl::combine(
 		_call->videoIsWorkingValue(),
 		_call->isSharingScreenValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshTopButton();
 	}, lifetime());
 
 	_call->mutedValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](MuteState state) {
+	) | rpl::skip(1) | rpl::on_next([=](MuteState state) {
 		updateButtonsGeometry();
 		if (state == MuteState::Active
 			|| state == MuteState::PushToTalk) {
@@ -1258,19 +1426,23 @@ void Panel::createPinOnTop() {
 				pin ? &st::groupCallPinnedOnTop : nullptr,
 				pin ? &st::groupCallPinnedOnTop : nullptr);
 			if (!_pinOnTop->isHidden()) {
-				showToast({ pin
-					? tr::lng_group_call_pinned_on_top(tr::now)
-					: tr::lng_group_call_unpinned_on_top(tr::now) });
+				uiShow()->showToast({
+					.text = { pin
+						? tr::lng_group_call_pinned_on_top(tr::now)
+						: tr::lng_group_call_unpinned_on_top(tr::now) },
+					.iconLottie = pin
+						? u"toast/pin"_q
+						: u"toast/unpin"_q,
+					.iconLottieSize = st::toastLottieIconSize,
+				});
 			}
 		}
 	};
 	_fullScreenOrMaximized.value(
-	) | rpl::start_with_next([=](bool fullScreenOrMaximized) {
-#ifndef Q_OS_MAC
-		_controls->controls.setStyle(fullScreenOrMaximized
+	) | rpl::on_next([=](bool fullScreenOrMaximized) {
+		_window->setControlsStyle(fullScreenOrMaximized
 			? st::callTitle
 			: st::groupCallTitle);
-#endif // Q_OS_MAC
 
 		_pinOnTop->setVisible(!fullScreenOrMaximized);
 		if (fullScreenOrMaximized) {
@@ -1284,7 +1456,7 @@ void Panel::createPinOnTop() {
 			_viewport->rp()->events(
 			) | rpl::filter([](not_null<QEvent*> event) {
 				return (event->type() == QEvent::MouseMove);
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				_hideControlsTimer.callOnce(kHideControlsTimeout);
 				toggleWideControls(true);
 			}, _hideControlsTimerLifetime);
@@ -1328,6 +1500,7 @@ void Panel::refreshTopButton() {
 		if (!_menuToggle) {
 			_menuToggle.create(widget(), st::groupCallMenuToggle);
 			_menuToggle->show();
+			_menuToggle->setAccessibleName(tr::lng_sr_group_call_menu(tr::now));
 			_menuToggle->setClickedCallback([=] { showMainMenu(); });
 			updateControlsGeometry();
 			raiseControls();
@@ -1339,7 +1512,7 @@ void Panel::refreshTopButton() {
 		) | rpl::then(_call->rejoinEvents(
 		) | rpl::map([](const RejoinEvent &event) {
 			return event.nowJoinAs;
-		})) | rpl::start_with_next([=](not_null<PeerData*> joinAs) {
+		})) | rpl::on_next([=](not_null<PeerData*> joinAs) {
 			auto joinAsToggle = object_ptr<Ui::UserpicButton>(
 				widget(),
 				joinAs,
@@ -1360,7 +1533,7 @@ void Panel::refreshTopButton() {
 
 void Panel::screenSharingPrivacyRequest() {
 	if (auto box = ScreenSharingPrivacyRequestBox()) {
-		showBox(std::move(box));
+		uiShow()->showBox(std::move(box));
 	}
 }
 
@@ -1375,6 +1548,13 @@ void Panel::chooseShareScreenSource() {
 		} else if (const auto source = env->uniqueDesktopCaptureSource()) {
 			if (_call->isSharingScreen()) {
 				_call->toggleScreenSharing(std::nullopt);
+			} else if (chooseSourceWithAudioSupported()) {
+				const auto sourceId = *source;
+				ShowUniqueCaptureOptions(
+					uiShow(),
+					crl::guard(this, [=](bool audio) {
+						chooseSourceAccepted(sourceId, audio);
+					}));
 			} else {
 				chooseSourceAccepted(*source, false);
 			}
@@ -1398,7 +1578,7 @@ void Panel::chooseShareScreenSource() {
 		tr::now,
 		lt_user,
 		screencastFromPeer->shortName());
-	const auto shared = std::make_shared<QPointer<Ui::GenericBox>>();
+	const auto shared = std::make_shared<base::weak_qptr<Ui::GenericBox>>();
 	const auto done = [=] {
 		if (*shared) {
 			base::take(*shared)->closeBox();
@@ -1411,7 +1591,7 @@ void Panel::chooseShareScreenSource() {
 		.confirmText = tr::lng_continue(),
 	});
 	*shared = box.data();
-	showBox(std::move(box));
+	uiShow()->showBox(std::move(box));
 }
 
 void Panel::chooseJoinAs() {
@@ -1422,7 +1602,7 @@ void Panel::chooseJoinAs() {
 	_joinAsProcess.start(
 		_peer,
 		context,
-		std::make_shared<Show>(this),
+		uiShow(),
 		callback,
 		_call->joinAs());
 }
@@ -1443,7 +1623,7 @@ void Panel::showMainMenu() {
 		wide,
 		[=] { chooseJoinAs(); },
 		[=] { chooseShareScreenSource(); },
-		[=](auto box) { showBox(std::move(box)); });
+		[=](auto box) { uiShow()->showBox(std::move(box)); });
 	if (_menu->empty()) {
 		_wideMenuShown = false;
 		_menu.destroy();
@@ -1505,16 +1685,25 @@ void Panel::showMainMenu() {
 }
 
 void Panel::addMembers() {
+	const auto &appConfig = _call->peer()->session().appConfig();
+	const auto conferenceLimit = appConfig.confcallSizeLimit();
+	if (_call->conference()
+		&& _call->sharedCall()->fullCount() >= conferenceLimit) {
+		uiShow()->showToast({ tr::lng_group_call_invite_limit(tr::now) });
+	}
 	const auto showToastCallback = [=](TextWithEntities &&text) {
-		showToast(std::move(text));
+		uiShow()->showToast(std::move(text));
 	};
-	if (auto box = PrepareInviteBox(_call, showToastCallback)) {
-		showBox(std::move(box));
+	const auto link = _call->conference()
+		? shareConferenceLinkCallback()
+		: nullptr;
+	if (auto box = PrepareInviteBox(_call, showToastCallback, link)) {
+		uiShow()->showBox(std::move(box));
 	}
 }
 
 void Panel::kickParticipant(not_null<PeerData*> participantPeer) {
-	showBox(Box([=](not_null<Ui::GenericBox*> box) {
+	uiShow()->showBox(Box([=](not_null<Ui::GenericBox*> box) {
 		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box.get(),
@@ -1525,7 +1714,9 @@ void Panel::kickParticipant(not_null<PeerData*> participantPeer) {
 							tr::now,
 							lt_channel,
 							participantPeer->name())
-					: (_peer->isBroadcast()
+					: (_call->conference()
+						? tr::lng_confcall_sure_remove
+						: _peer->isBroadcast()
 						? tr::lng_profile_sure_kick_channel
 						: tr::lng_profile_sure_kick)(
 							tr::now,
@@ -1545,48 +1736,12 @@ void Panel::kickParticipant(not_null<PeerData*> participantPeer) {
 	}));
 }
 
-void Panel::showBox(object_ptr<Ui::BoxContent> box) {
-	showBox(std::move(box), Ui::LayerOption::KeepOther, anim::type::normal);
-}
-
-void Panel::showBox(
-		object_ptr<Ui::BoxContent> box,
-		Ui::LayerOptions options,
-		anim::type animated) {
-	hideStickedTooltip(StickedTooltipHide::Unavailable);
-	if (window()->width() < st::groupCallWidth
-		|| window()->height() < st::groupCallWidth) {
-		window()->resize(
-			std::max(window()->width(), st::groupCallWidth),
-			std::max(window()->height(), st::groupCallWidth));
-	}
-	_layerBg->showBox(std::move(box), options, animated);
-}
-
-void Panel::showLayer(
-		std::unique_ptr<Ui::LayerWidget> layer,
-		Ui::LayerOptions options,
-		anim::type animated) {
-	hideStickedTooltip(StickedTooltipHide::Unavailable);
-	if (window()->width() < st::groupCallWidth
-		|| window()->height() < st::groupCallWidth) {
-		window()->resize(
-			std::max(window()->width(), st::groupCallWidth),
-			std::max(window()->height(), st::groupCallWidth));
-	}
-	_layerBg->showLayer(std::move(layer), options, animated);
-}
-
-void Panel::hideLayer(anim::type animated) {
-	_layerBg->hideAll(animated);
-}
-
-bool Panel::isLayerShown() const {
-	return _layerBg->topShownLayer() != nullptr;
-}
-
 void Panel::kickParticipantSure(not_null<PeerData*> participantPeer) {
-	if (const auto chat = _peer->asChat()) {
+	if (_call->conference()) {
+		if (const auto user = participantPeer->asUser()) {
+			_call->removeConferenceParticipants({ peerToUser(user->id) });
+		}
+	} else if (const auto chat = _peer->asChat()) {
 		chat->session().api().chatParticipants().kick(chat, participantPeer);
 	} else if (const auto channel = _peer->asChannel()) {
 		const auto currentRestrictedRights = [&] {
@@ -1606,20 +1761,19 @@ void Panel::kickParticipantSure(not_null<PeerData*> participantPeer) {
 	}
 }
 
-void Panel::initLayout() {
-	initGeometry();
+void Panel::initLayout(ConferencePanelMigration info) {
+	initGeometry(info);
 
-#ifndef Q_OS_MAC
-	_controls->wrap.raise();
+	_window->raiseControls();
 
-	Ui::Platform::TitleControlsLayoutChanged(
-	) | rpl::start_with_next([=] {
+	_window->controlsLayoutChanges(
+	) | rpl::on_next([=] {
 		// _menuToggle geometry depends on _controls arrangement.
-		crl::on_main(widget(), [=] { updateControlsGeometry(); });
+		crl::on_main(this, [=] { updateControlsGeometry(); });
 	}, lifetime());
 
 	raiseControls();
-#endif // !Q_OS_MAC
+	updateControlsGeometry();
 }
 
 void Panel::showControls() {
@@ -1634,25 +1788,27 @@ void Panel::closeBeforeDestroy() {
 }
 
 rpl::lifetime &Panel::lifetime() {
-	return window()->lifetime();
+	return _lifetime;
 }
 
-void Panel::initGeometry() {
-	const auto center = Core::App().getPointForCallPanelCenter();
-	const auto width = _call->rtmp()
-		? st::groupCallWidthRtmp
-		: st::groupCallWidth;
-	const auto height = _call->rtmp()
-		? st::groupCallHeightRtmp
-		: st::groupCallHeight;
+void Panel::initGeometry(ConferencePanelMigration info) {
 	const auto minWidth = _call->rtmp()
 		? st::groupCallWidthRtmpMin
 		: st::groupCallWidth;
 	const auto minHeight = _call->rtmp()
 		? st::groupCallHeightRtmpMin
 		: st::groupCallHeight;
-	const auto rect = QRect(0, 0, width, height);
-	window()->setGeometry(rect.translated(center - rect.center()));
+	if (!info.window) {
+		const auto center = Core::App().getPointForCallPanelCenter();
+		const auto width = _call->rtmp()
+			? st::groupCallWidthRtmp
+			: st::groupCallWidth;
+		const auto height = _call->rtmp()
+			? st::groupCallHeightRtmp
+			: st::groupCallHeight;
+		const auto rect = QRect(0, 0, width, height);
+		window()->setGeometry(rect.translated(center - rect.center()));
+	}
 	window()->setMinimumSize({ minWidth, minHeight });
 	window()->show();
 }
@@ -1673,7 +1829,7 @@ QRect Panel::computeTitleRect() const {
 #ifdef Q_OS_MAC
 	return QRect(70, 0, width - remove - 70, 28);
 #else // Q_OS_MAC
-	const auto controls = _controls->controls.geometry();
+	const auto controls = _window->controlsGeometry();
 	const auto right = controls.x() + controls.width() + skip;
 	return (controls.center().x() < width / 2)
 		? QRect(right, 0, width - right - remove, controls.height())
@@ -1735,6 +1891,16 @@ void Panel::updateButtonsStyles() {
 			? rpl::single(QString())
 			: tr::lng_group_call_video());
 	}
+	if (_message) {
+		_message->setStyle(
+			wide ? st::groupCallMessageSmall : st::groupCallMessage,
+			(wide
+				? &st::groupCallMessageActiveSmall
+				: &st::groupCallMessageActive));
+		_message->setText(wide
+			? rpl::single(QString())
+			: tr::lng_group_call_message());
+	}
 	if (_settings) {
 		_settings->setText(wide
 			? rpl::single(QString())
@@ -1755,7 +1921,7 @@ void Panel::updateButtonsStyles() {
 
 void Panel::setupEmptyRtmp() {
 	_call->emptyRtmpValue(
-	) | rpl::start_with_next([=](bool empty) {
+	) | rpl::on_next([=](bool empty) {
 		if (!empty) {
 			_emptyRtmp.destroy();
 			return;
@@ -1786,13 +1952,13 @@ void Panel::setupEmptyRtmp() {
 		_emptyRtmp->setAttribute(Qt::WA_TransparentForMouseEvents);
 		_emptyRtmp->show();
 		_emptyRtmp->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(_emptyRtmp.data());
 			label->corners.paint(p, _emptyRtmp->rect());
 		}, _emptyRtmp->lifetime());
 
 		widget()->sizeValue(
-		) | rpl::start_with_next([=](QSize size) {
+		) | rpl::on_next([=](QSize size) {
 			const auto padding = st::groupCallWidth / 30;
 			const auto width = std::min(
 				size.width() - padding * 4,
@@ -1835,7 +2001,7 @@ void Panel::refreshControlsBackground() {
 }
 
 void Panel::refreshTitleBackground() {
-	if (!_fullScreenOrMaximized.current()) {
+	if (!_rtmpFull) {
 		_titleBackground.destroy();
 		return;
 	} else if (_titleBackground) {
@@ -1849,7 +2015,7 @@ void Panel::refreshTitleBackground() {
 		st::roundRadiusLarge,
 		_controlsBackgroundColor.color());
 	_titleBackground->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_titleBackground.data());
 		corners->paintSomeRounded(
 			p,
@@ -1870,12 +2036,13 @@ void Panel::setupControlsBackgroundNarrow() {
 	const auto height = std::max(
 		st::groupCallMembersShadowHeight,
 		st::groupCallMembersFadeSkip + st::groupCallMembersFadeHeight);
+	_controlsBackgroundNarrow->shadowHeight = height;
 	const auto full = lifetime.make_state<QImage>(
 		QSize(1, height * factor),
 		QImage::Format_ARGB32_Premultiplied);
 	rpl::single(rpl::empty) | rpl::then(
 		style::PaletteChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		full->fill(Qt::transparent);
 
 		auto p = QPainter(full);
@@ -1916,13 +2083,15 @@ void Panel::setupControlsBackgroundNarrow() {
 			- st::groupCallMembersMargin.right()),
 		height);
 	_controlsBackgroundNarrow->shadow.paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(&_controlsBackgroundNarrow->shadow);
 		clip = clip.intersected(_controlsBackgroundNarrow->shadow.rect());
 		const auto inner = _members->getInnerGeometry().translated(
 			_members->x() - _controlsBackgroundNarrow->shadow.x(),
 			_members->y() - _controlsBackgroundNarrow->shadow.y());
-		const auto faded = clip.intersected(inner);
+		const auto bottom = _controlsBackgroundNarrow->shadowHeight;
+		const auto faded = clip.intersected(inner).intersected(
+			QRect(clip.x(), 0, clip.width(), bottom));
 		if (!faded.isEmpty()) {
 			const auto factor = style::DevicePixelRatio();
 			p.drawImage(
@@ -1934,9 +2103,8 @@ void Panel::setupControlsBackgroundNarrow() {
 					full->width(),
 					faded.height() * factor));
 		}
-		const auto bottom = inner.y() + inner.height();
 		const auto after = clip.intersected(QRect(
-			0,
+			inner.x(),
 			bottom,
 			inner.width(),
 			_controlsBackgroundNarrow->shadow.height() - bottom));
@@ -1957,7 +2125,7 @@ void Panel::setupControlsBackgroundWide() {
 		st::groupCallControlsBackRadius,
 		_controlsBackgroundColor.color());
 	_controlsBackgroundWide->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_controlsBackgroundWide.data());
 		corners->paint(p, _controlsBackgroundWide->rect());
 	}, lifetime);
@@ -1969,18 +2137,35 @@ void Panel::trackControl(Ui::RpWidget *widget, rpl::lifetime &lifetime) {
 	if (!widget) {
 		return;
 	}
+	const auto over = std::make_shared<bool>();
 	widget->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
-		if (e->type() == QEvent::Enter) {
-			trackControlOver(widget, true);
-		} else if (e->type() == QEvent::Leave) {
-			trackControlOver(widget, false);
+	) | rpl::on_next([=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type == QEvent::Enter) {
+			// Enter events may come from widget destructors,
+			// in that case sync-showing tooltip (calling Grab)
+			// crashes the whole thing.
+			*over = true;
+			crl::on_main(widget, [=] {
+				if (*over) {
+					trackControlOver(widget, true);
+				}
+			});
+			toggleWideControls(true);
+		} else if (type == QEvent::Leave) {
+			*over = false;
+			crl::on_main(widget, [=] {
+				if (!*over) {
+					trackControlOver(widget, false);
+				}
+			});
+			toggleWideControls(false);
 		}
 	}, lifetime);
 }
 
 void Panel::trackControlOver(not_null<Ui::RpWidget*> control, bool over) {
-	if (_fullScreenOrMaximized.current()) {
+	if (_rtmpFull) {
 		return;
 	} else if (_stickedTooltipClose) {
 		if (!over) {
@@ -1995,7 +2180,6 @@ void Panel::trackControlOver(not_null<Ui::RpWidget*> control, bool over) {
 	} else {
 		Ui::Integration::Instance().unregisterLeaveSubscription(control);
 	}
-	toggleWideControls(over);
 }
 
 void Panel::showStickedTooltip() {
@@ -2021,7 +2205,7 @@ void Panel::showStickedTooltip() {
 		&& callReady
 		&& _mute
 		&& !_call->mutedByAdmin()
-		&& !_layerBg->topShownLayer()) {
+		&& !_window->topShownLayer()) {
 		if (_stickedTooltipClose) {
 			// Showing already.
 			return;
@@ -2068,6 +2252,8 @@ void Panel::showNiceTooltip(
 			return MuteButtonTooltip(_call);
 		} else if (control == _hangup.data()) {
 			return tr::lng_group_call_leave();
+		} else if (control == _message.data()) {
+			return tr::lng_group_call_message();
 		}
 		return rpl::producer<QString>();
 	}();
@@ -2097,7 +2283,7 @@ void Panel::showNiceTooltip(
 		rpl::combine(
 			label->sizeValue(),
 			button->sizeValue()
-		) | rpl::start_with_next([=](QSize text, QSize close) {
+		) | rpl::on_next([=](QSize text, QSize close) {
 			const auto height = std::max(text.height(), close.height());
 			container->resize(text.width() + close.width(), height);
 			label->move(0, (height - text.height()) / 2);
@@ -2117,9 +2303,9 @@ void Panel::showNiceTooltip(
 			? st::groupCallStickedTooltip
 			: st::groupCallNiceTooltip));
 	const auto tooltip = _niceTooltip.data();
-	const auto weak = QPointer<QWidget>(tooltip);
+	const auto weak = base::make_weak(tooltip);
 	const auto destroy = [=] {
-		delete weak.data();
+		delete weak.get();
 	};
 	if (type != NiceTooltipType::Sticked) {
 		tooltip->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -2128,7 +2314,7 @@ void Panel::showNiceTooltip(
 	base::qt_signal_producer(
 		control.get(),
 		&QObject::destroyed
-	) | rpl::start_with_next(destroy, tooltip->lifetime());
+	) | rpl::on_next(destroy, tooltip->lifetime());
 
 	_niceTooltipControl = control;
 	updateTooltipGeometry();
@@ -2143,9 +2329,9 @@ void Panel::updateTooltipGeometry() {
 		return;
 	}
 	const auto geometry = _niceTooltipControl->geometry();
-	const auto weak = QPointer<QWidget>(_niceTooltip);
+	const auto weak = base::make_weak(_niceTooltip);
 	const auto countPosition = [=](QSize size) {
-		const auto strong = weak.data();
+		const auto strong = weak.get();
 		const auto wide = (_mode.current() == PanelMode::Wide);
 		const auto top = geometry.y()
 			- (wide ? st::groupCallNiceTooltipTop : 0)
@@ -2204,6 +2390,7 @@ void Panel::trackControls(bool track, bool force) {
 	};
 	trackOne(_mute->outer());
 	trackOne(_video);
+	trackOne(_message);
 	trackOne(_screenShare);
 	trackOne(_wideMenu);
 	trackOne(_settings);
@@ -2224,10 +2411,10 @@ void Panel::updateControlsGeometry() {
 	const auto controlsOnTheLeft = true;
 	const auto controlsPadding = 0;
 #else // Q_OS_MAC
-	const auto center = _controls->controls.geometry().center();
+	const auto center = _window->controlsGeometry().center();
 	const auto controlsOnTheLeft = center.x()
 		< widget()->width() / 2;
-	const auto controlsPadding = _controls->wrap.y();
+	const auto controlsPadding = _window->controlsWrapTop();
 #endif // Q_OS_MAC
 	const auto menux = st::groupCallMenuTogglePosition.x();
 	const auto menuy = st::groupCallMenuTogglePosition.y();
@@ -2261,8 +2448,11 @@ void Panel::updateButtonsGeometry() {
 			widget->setVisible(shown);
 		}
 	};
+	const auto messagesEnabled = _call->messagesEnabled();
+	auto messagesBottomSkip = 0;
 	if (mode() == PanelMode::Wide) {
 		Assert(_video != nullptr);
+		Assert(_message != nullptr);
 		Assert(_screenShare != nullptr);
 		Assert(_wideMenu != nullptr);
 		Assert(_settings != nullptr);
@@ -2277,31 +2467,75 @@ void Panel::updateButtonsGeometry() {
 			_viewport->setControlsShown(rtmp ? 0. : shown);
 		}
 
-		const auto buttonsTop = widget()->height() - anim::interpolate(
-			0,
-			st::groupCallButtonBottomSkipWide,
-			shown);
 		const auto addSkip = st::callMuteButtonSmall.active.outerRadius;
 		const auto muteSize = _mute->innerSize().width() + 2 * addSkip;
 		const auto skip = st::groupCallButtonSkipSmall;
 		const auto fullWidth = (rtmp ? 0 : (_video->width() + skip))
-			+ (rtmp ? 0 : (_screenShare->width() + skip))
+			+ (rtmp ? 0 : (_message->width() + skip))
 			+ (muteSize + skip)
 			+ (_settings->width() + skip)
 			+ _hangup->width();
 		const auto membersSkip = st::groupCallNarrowSkip;
-		const auto membersWidth = _call->rtmp()
+		const auto membersWidth = rtmp
 			? membersSkip
 			: (st::groupCallNarrowMembersWidth + 2 * membersSkip);
 		auto left = membersSkip + (widget()->width()
 			- membersWidth
 			- membersSkip
 			- fullWidth) / 2;
-		toggle(_screenShare, !hidden && !rtmp);
-		if (!rtmp) {
+
+		const auto forMessagesLeft = left
+			- st::groupCallControlsBackMargin.left();
+		const auto forMessagesWidth = fullWidth
+			+ st::groupCallControlsBackMargin.left()
+			+ st::groupCallControlsBackMargin.right();
+		const auto existingBottomSkip = st::groupCallButtonBottomSkipWide
+			- _hangup->height()
+			- st::groupCallControlsBackMargin.bottom();
+		if (_messageField) {
+			_messageField->resizeToWidth(forMessagesWidth);
+			messagesBottomSkip += _messageField->height();
+
+			const auto y = widget()->height()
+				- messagesBottomSkip
+				- (existingBottomSkip / 2);
+			_messageField->move(forMessagesLeft, y);
+		}
+
+		const auto buttonsTop = widget()->height()
+			- messagesBottomSkip
+			- anim::interpolate(0, st::groupCallButtonBottomSkipWide, shown);
+		const auto muteTop = buttonsTop + addSkip;
+
+		const auto forMessagesBottom = buttonsTop
+			- st::groupCallControlsBackMargin.top()
+			- (existingBottomSkip / 6);
+		const auto forMessagesHeight = forMessagesBottom
+			- (st::groupCallWideVideoTop * 1.5);
+
+		_messages->move(
+			forMessagesLeft,
+			forMessagesBottom,
+			forMessagesWidth,
+			forMessagesHeight);
+
+		toggle(_screenShare, !hidden && !rtmp && !messagesEnabled);
+		toggle(_message, !hidden && !rtmp && messagesEnabled);
+		if (!rtmp && !messagesEnabled) {
 			_screenShare->moveToLeft(left, buttonsTop);
 			left += _screenShare->width() + skip;
+		} else if (!rtmp) {
+			_wideMenu->moveToLeft(left, buttonsTop);
+			_settings->moveToLeft(left, buttonsTop);
+			left += _settings->width() + skip;
 		}
+
+		const auto wideMenuShown = _call->canManage()
+			|| _call->showChooseJoinAs()
+			|| (!rtmp && messagesEnabled); // Screen share there.
+		toggle(_settings, !hidden && !wideMenuShown);
+		toggle(_wideMenu, !hidden && wideMenuShown);
+
 		toggle(_video, !hidden && !rtmp);
 		if (!rtmp) {
 			_video->moveToLeft(left, buttonsTop);
@@ -2312,13 +2546,12 @@ void Panel::updateButtonsGeometry() {
 			left += _settings->width() + skip;
 		}
 		toggle(_mute, !hidden);
-		_mute->moveInner({ left + addSkip, buttonsTop + addSkip });
+		_mute->moveInner({ left + addSkip, muteTop });
 		left += muteSize + skip;
-		const auto wideMenuShown = _call->canManage()
-			|| _call->showChooseJoinAs();
-		toggle(_settings, !hidden && !wideMenuShown);
-		toggle(_wideMenu, !hidden && wideMenuShown);
-		if (!rtmp) {
+		if (!rtmp && messagesEnabled) {
+			_message->moveToLeft(left, buttonsTop);
+			left += _message->width() + skip;
+		} else if (!rtmp) {
 			_wideMenu->moveToLeft(left, buttonsTop);
 			_settings->moveToLeft(left, buttonsTop);
 			left += _settings->width() + skip;
@@ -2335,37 +2568,95 @@ void Panel::updateButtonsGeometry() {
 			_controlsBackgroundWide->setGeometry(
 				rect.marginsAdded(st::groupCallControlsBackMargin));
 		}
-		if (_fullScreenOrMaximized.current()) {
+		if (_rtmpFull) {
 			refreshTitleGeometry();
 		}
 	} else {
-		const auto muteTop = widget()->height()
-			- st::groupCallMuteBottomSkip;
+		const auto addSkip = st::callMuteButton.active.outerRadius;
+		const auto muteSize = _mute->innerSize().width();
+		const auto single = (_settings ? _settings : _callShare)->width();
+		const auto showVideoButton = videoButtonInNarrowMode();
+		const auto four = !_callShare && !showVideoButton && messagesEnabled;
+		const auto five = !four && !_callShare && messagesEnabled;
+		const auto buttonSkip = four
+			? (st::groupCallButtonSkip / 2)
+			: five
+			? ((st::groupCallWidth - 5 * single) / 6)
+			: st::groupCallButtonSkip;
+		const auto fullWidth = five
+			? st::groupCallWidth
+			: four
+			? (4 * single + 3 * buttonSkip)
+			: (muteSize + 2 * (single + st::groupCallButtonSkip));
+		const auto forMessagesWidth = st::groupCallWidth
+			- st::groupCallMembersMargin.left()
+			- st::groupCallMembersMargin.right();
+		const auto forMessagesLeft = (widget()->width() - forMessagesWidth)
+			/ 2;
+		const auto existingBottomSkip = st::groupCallButtonBottomSkip
+			- _mute->innerSize().height();
+		if (_messageField) {
+			_messageField->resizeToWidth(forMessagesWidth);
+
+			const auto height = _messageField->height();
+			messagesBottomSkip += height;
+
+			const auto y = widget()->height()
+				- messagesBottomSkip
+				- (existingBottomSkip / 3);
+			_messageField->move(forMessagesLeft, y);
+		}
+
 		const auto buttonsTop = widget()->height()
+			- messagesBottomSkip
 			- st::groupCallButtonBottomSkip;
-		const auto muteSize = _mute->innerSize().width();
-		const auto fullWidth = muteSize
-			+ 2 * (_settings ? _settings : _callShare)->width()
-			+ 2 * st::groupCallButtonSkip;
+		const auto muteTop = buttonsTop + addSkip;
+		//const auto muteTop = widget()->height()
+		//	- messagesBottomSkip
+		//	- st::groupCallMuteBottomSkip;
+		const auto forMessagesBottom = muteTop
+			- (existingBottomSkip / 3);
+		const auto forMessagesHeight = forMessagesBottom
+			- st::groupCallMembersTop
+			- (st::normalFont->height / 2);
+
+		_messages->move(
+			forMessagesLeft,
+			forMessagesBottom,
+			forMessagesWidth,
+			forMessagesHeight);
+
 		toggle(_mute, true);
-		_mute->moveInner({ (widget()->width() - muteSize) / 2, muteTop });
-		const auto leftButtonLeft = (widget()->width() - fullWidth) / 2;
+		const auto leftButtonLeft = (widget()->width() - fullWidth) / 2
+			+ (five ? buttonSkip : 0);
+		const auto nextButtonLeft = leftButtonLeft
+			+ ((five || four) ? (single + buttonSkip) : 0);
+		const auto muteButtonLeft = four
+			? (nextButtonLeft + addSkip)
+			: ((widget()->width() - muteSize) / 2);
+		_mute->moveInner({ muteButtonLeft, muteTop });
 		toggle(_screenShare, false);
 		toggle(_wideMenu, false);
 		toggle(_callShare, true);
 		if (_callShare) {
 			_callShare->moveToLeft(leftButtonLeft, buttonsTop);
 		}
-		const auto showVideoButton = videoButtonInNarrowMode();
 		toggle(_video, !_callShare && showVideoButton);
 		if (_video) {
 			_video->setStyle(st::groupCallVideo, &st::groupCallVideoActive);
 			_video->moveToLeft(leftButtonLeft, buttonsTop);
 		}
-		toggle(_settings, !_callShare && !showVideoButton);
+		toggle(_settings, !_callShare && (five || !showVideoButton));
 		if (_settings) {
-			_settings->moveToLeft(leftButtonLeft, buttonsTop);
+			_settings->moveToLeft(
+				four ? leftButtonLeft : nextButtonLeft,
+				buttonsTop);
+		}
+		toggle(_message, !_callShare && messagesEnabled);
+		if (_message) {
+			_message->moveToRight(nextButtonLeft, buttonsTop);
 		}
+
 		toggle(_hangup, true);
 		_hangup->moveToRight(leftButtonLeft, buttonsTop);
 	}
@@ -2377,17 +2668,19 @@ void Panel::updateButtonsGeometry() {
 		_controlsBackgroundNarrow->shadow.setGeometry(
 			left,
 			(widget()->height()
+				- messagesBottomSkip
 				- st::groupCallMembersMargin.bottom()
-				- _controlsBackgroundNarrow->shadow.height()),
+				- _controlsBackgroundNarrow->shadowHeight),
 			width,
-			_controlsBackgroundNarrow->shadow.height());
+			messagesBottomSkip + _controlsBackgroundNarrow->shadowHeight);
 		_controlsBackgroundNarrow->blocker.setGeometry(
 			left,
 			(widget()->height()
+				- messagesBottomSkip
 				- st::groupCallMembersMargin.bottom()
 				- st::groupCallMembersBottomSkip),
 			width,
-			st::groupCallMembersBottomSkip);
+			messagesBottomSkip + st::groupCallMembersBottomSkip);
 	}
 	updateTooltipGeometry();
 }
@@ -2403,10 +2696,9 @@ void Panel::updateMembersGeometry() {
 	_members->setVisible(!_call->rtmp());
 	const auto desiredHeight = _members->desiredHeight();
 	if (mode() == PanelMode::Wide) {
-		const auto full = _fullScreenOrMaximized.current();
-		const auto skip = full ? 0 : st::groupCallNarrowSkip;
+		const auto skip = _rtmpFull ? 0 : st::groupCallNarrowSkip;
 		const auto membersWidth = st::groupCallNarrowMembersWidth;
-		const auto top = full ? 0 : st::groupCallWideVideoTop;
+		const auto top = _rtmpFull ? 0 : st::groupCallWideVideoTop;
 		_members->setGeometry(
 			widget()->width() - skip - membersWidth,
 			top,
@@ -2415,7 +2707,7 @@ void Panel::updateMembersGeometry() {
 		const auto viewportSkip = _call->rtmp()
 			? 0
 			: (skip + membersWidth);
-		_viewport->setGeometry(full, {
+		_viewport->setGeometry(_rtmpFull, {
 			skip,
 			top,
 			widget()->width() - viewportSkip - 2 * skip,
@@ -2445,19 +2737,26 @@ void Panel::updateMembersGeometry() {
 	}
 }
 
+rpl::producer<QString> Panel::titleText() {
+	if (_call->conference()) {
+		return tr::lng_confcall_join_title();
+	}
+	return rpl::combine(
+		Info::Profile::NameValue(_peer),
+		rpl::single(
+			QString()
+		) | rpl::then(_call->real(
+		) | rpl::map([=](not_null<Data::GroupCall*> real) {
+		return real->titleValue();
+	}) | rpl::flatten_latest())
+	) | rpl::map([=](const QString &name, const QString &title) {
+		return title.isEmpty() ? name : title;
+	});
+}
+
 void Panel::refreshTitle() {
 	if (!_title) {
-		auto text = rpl::combine(
-			Info::Profile::NameValue(_peer),
-			rpl::single(
-				QString()
-			) | rpl::then(_call->real(
-			) | rpl::map([=](not_null<Data::GroupCall*> real) {
-				return real->titleValue();
-			}) | rpl::flatten_latest())
-		) | rpl::map([=](const QString &name, const QString &title) {
-			return title.isEmpty() ? name : title;
-		}) | rpl::after_next([=] {
+		auto text = titleText() | rpl::after_next([=] {
 			refreshTitleGeometry();
 		});
 		_title.create(
@@ -2469,7 +2768,7 @@ void Panel::refreshTitle() {
 		if (_call->rtmp()) {
 			_titleSeparator.create(
 				widget(),
-				rpl::single(QString::fromUtf8("\xE2\x80\xA2")),
+				rpl::single(Ui::kQBullet),
 				st::groupCallTitleLabel);
 			_titleSeparator->show();
 			_titleSeparator->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -2495,7 +2794,7 @@ void Panel::refreshTitle() {
 
 		refreshTitleColors();
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshTitleColors();
 		}, _title->lifetime());
 	}
@@ -2557,9 +2856,8 @@ void Panel::refreshTitleGeometry() {
 		? st::groupCallTitleTop
 		: (st::groupCallWideVideoTop
 			- st::groupCallTitleLabel.style.font->height) / 2;
-	const auto shown = _fullScreenOrMaximized.current()
-		? _wideControlsAnimation.value(
-			_wideControlsShown ? 1. : 0.)
+	const auto shown = _rtmpFull
+		? _wideControlsAnimation.value(_wideControlsShown ? 1. : 0.)
 		: 1.;
 	const auto top = anim::interpolate(
 		-_title->height() - st::boxRadius,
@@ -2623,10 +2921,7 @@ void Panel::refreshTitleGeometry() {
 	} else {
 		layout(left + titleRect.width() - best);
 	}
-
-#ifndef Q_OS_MAC
-	_controlsTop = anim::interpolate(-_controls->wrap.height(), 0, shown);
-#endif // Q_OS_MAC
+	_window->setControlsShown(shown);
 }
 
 void Panel::refreshTitleColors() {
@@ -2657,17 +2952,26 @@ void Panel::paint(QRect clip) {
 bool Panel::handleClose() {
 	if (_call) {
 		window()->hide();
+		if (Platform::IsWayland()) {
+			if (const auto handle = window()->windowHandle()) {
+				handle->destroy();
+			}
+		}
 		return true;
 	}
 	return false;
 }
 
+not_null<Window*> Panel::callWindow() const {
+	return _window.get();
+}
+
 not_null<Ui::RpWindow*> Panel::window() const {
-	return _window.window();
+	return _window->window();
 }
 
 not_null<Ui::RpWidget*> Panel::widget() const {
-	return _window.widget();
+	return _window->widget();
 }
 
 } // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.h b/Telegram/SourceFiles/calls/group/calls_group_panel.h
index 851cc91d8f5400..6f2fa17533d7f7 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.h
@@ -7,25 +7,18 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "base/weak_ptr.h"
-#include "base/timer.h"
-#include "base/flags.h"
 #include "base/object_ptr.h"
-#include "base/unique_qptr.h"
 #include "calls/group/calls_group_call.h"
 #include "calls/group/calls_group_common.h"
 #include "calls/group/calls_choose_join_as.h"
 #include "calls/group/ui/desktop_capture_choose_source.h"
 #include "ui/effects/animations.h"
-#include "ui/gl/gl_window.h"
-#include "ui/layers/show.h"
-#include "ui/rp_widget.h"
 
 class Image;
 
-namespace base {
-class PowerSaveBlocker;
-} // namespace base
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
 
 namespace Data {
 class PhotoMedia;
@@ -33,10 +26,8 @@ class GroupCall;
 } // namespace Data
 
 namespace Ui {
+class Show;
 class BoxContent;
-class LayerWidget;
-enum class LayerOption;
-using LayerOptions = base::flags<LayerOption>;
 class AbstractButton;
 class ImportantTooltip;
 class DropdownMenu;
@@ -45,14 +36,15 @@ class CallMuteButton;
 class IconButton;
 class FlatLabel;
 class RpWidget;
+class RpWindow;
 template <typename Widget>
 class FadeWrap;
 template <typename Widget>
 class PaddingWrap;
 class ScrollArea;
 class GenericBox;
-class LayerManager;
 class GroupCallScheduledLeft;
+struct CallButtonColors;
 } // namespace Ui
 
 namespace Ui::Toast {
@@ -60,19 +52,17 @@ class Instance;
 struct Config;
 } // namespace Ui::Toast
 
-namespace Ui::Platform {
-struct SeparateTitleControls;
-} // namespace Ui::Platform
-
-namespace Main {
-class SessionShow;
-} // namespace Main
-
 namespace style {
 struct CallSignalBars;
 struct CallBodyLayout;
 } // namespace style
 
+namespace Calls {
+struct InviteRequest;
+struct ConferencePanelMigration;
+class Window;
+} // namespace Calls
+
 namespace Calls::Group {
 
 class Toasts;
@@ -81,12 +71,15 @@ class Viewport;
 enum class PanelMode;
 enum class StickedTooltip;
 class MicLevelTester;
+class MessageField;
+class MessagesUi;
 
 class Panel final
 	: public base::has_weak_ptr
 	, private Ui::DesktopCapture::ChooseSourceDelegate {
 public:
-	Panel(not_null<GroupCall*> call);
+	explicit Panel(not_null<GroupCall*> call);
+	Panel(not_null<GroupCall*> call, ConferencePanelMigration info);
 	~Panel();
 
 	[[nodiscard]] not_null<Ui::RpWidget*> widget() const;
@@ -94,34 +87,19 @@ class Panel final
 	[[nodiscard]] bool isVisible() const;
 	[[nodiscard]] bool isActive() const;
 
-	base::weak_ptr<Ui::Toast::Instance> showToast(
-		const QString &text,
-		crl::time duration = 0);
-	base::weak_ptr<Ui::Toast::Instance> showToast(
-		TextWithEntities &&text,
-		crl::time duration = 0);
-	base::weak_ptr<Ui::Toast::Instance> showToast(
-		Ui::Toast::Config &&config);
-
-	void showBox(object_ptr<Ui::BoxContent> box);
-	void showBox(
-		object_ptr<Ui::BoxContent> box,
-		Ui::LayerOptions options,
-		anim::type animated = anim::type::normal);
-	void showLayer(
-		std::unique_ptr<Ui::LayerWidget> layer,
-		Ui::LayerOptions options,
-		anim::type animated = anim::type::normal);
-	void hideLayer(anim::type animated = anim::type::normal);
-	[[nodiscard]] bool isLayerShown() const;
+	void migrationShowShareLink();
+	void migrationInviteUsers(std::vector<InviteRequest> users);
 
 	void minimize();
 	void toggleFullScreen();
+	void toggleFullScreen(bool fullscreen);
 	void close();
 	void showAndActivate();
 	void closeBeforeDestroy();
 
-	[[nodiscard]] std::shared_ptr<Main::SessionShow> uiShow();
+	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow();
+	[[nodiscard]] not_null<Window*> callWindow() const;
+	[[nodiscard]] not_null<Ui::RpWindow*> window() const;
 
 	rpl::lifetime &lifetime();
 
@@ -139,8 +117,6 @@ class Panel final
 		Discarded,
 	};
 
-	[[nodiscard]] not_null<Ui::RpWindow*> window() const;
-
 	[[nodiscard]] PanelMode mode() const;
 
 	void paint(QRect clip);
@@ -149,12 +125,13 @@ class Panel final
 	void initWidget();
 	void initControls();
 	void initShareAction();
-	void initLayout();
-	void initGeometry();
+	void initLayout(ConferencePanelMigration info);
+	void initGeometry(ConferencePanelMigration info);
 	void setupScheduledLabels(rpl::producer<TimeId> date);
 	void setupMembers();
 	void setupVideo(not_null<Viewport*> viewport);
 	void setupRealMuteButtonState(not_null<Data::GroupCall*> real);
+	[[nodiscard]] rpl::producer<QString> titleText();
 
 	bool handleClose();
 	void startScheduledNow();
@@ -183,6 +160,7 @@ class Panel final
 	void setupControlsBackgroundWide();
 	void setupControlsBackgroundNarrow();
 	void showControls();
+	void createMessageButton();
 	void refreshLeftButton();
 	void refreshVideoButtons(
 		std::optional<bool> overrideWideMode = std::nullopt);
@@ -192,6 +170,10 @@ class Panel final
 	void toggleWideControls(bool shown);
 	void updateWideControlsVisibility();
 	[[nodiscard]] bool videoButtonInNarrowMode() const;
+	[[nodiscard]] Fn<void()> shareConferenceLinkCallback();
+	void toggleMessageTyping();
+	[[nodiscard]] rpl::producer<Ui::CallButtonColors> toggleableOverrides(
+		rpl::producer<bool> active);
 
 	void endCall();
 
@@ -225,18 +207,11 @@ class Panel final
 	const not_null<GroupCall*> _call;
 	not_null<PeerData*> _peer;
 
-	Ui::GL::Window _window;
-	const std::unique_ptr<Ui::LayerManager> _layerBg;
+	std::shared_ptr<Window> _window;
 	rpl::variable<PanelMode> _mode;
 	rpl::variable<bool> _fullScreenOrMaximized = false;
 	bool _unpinnedMaximized = false;
-
-#ifndef Q_OS_MAC
-	rpl::variable<int> _controlsTop = 0;
-	const std::unique_ptr<Ui::Platform::SeparateTitleControls> _controls;
-#endif // !Q_OS_MAC
-
-	const std::unique_ptr<base::PowerSaveBlocker> _powerSaveBlocker;
+	bool _rtmpFull = false;
 
 	rpl::lifetime _callLifetime;
 
@@ -250,6 +225,7 @@ class Panel final
 	object_ptr<Ui::IconButton> _pinOnTop = { nullptr };
 	object_ptr<Ui::DropdownMenu> _menu = { nullptr };
 	rpl::variable<bool> _wideMenuShown = false;
+	rpl::variable<bool> _messageTyping = false;
 	object_ptr<Ui::AbstractButton> _joinAsToggle = { nullptr };
 	object_ptr<Members> _members = { nullptr };
 	std::unique_ptr<Viewport> _viewport;
@@ -276,6 +252,7 @@ class Panel final
 	object_ptr<Ui::CallButton> _callShare = { nullptr };
 	object_ptr<Ui::CallButton> _video = { nullptr };
 	object_ptr<Ui::CallButton> _screenShare = { nullptr };
+	object_ptr<Ui::CallButton> _message = { nullptr };
 	std::unique_ptr<Ui::CallMuteButton> _mute;
 	object_ptr<Ui::CallButton> _hangup;
 	object_ptr<Ui::ImportantTooltip> _niceTooltip = { nullptr };
@@ -284,6 +261,10 @@ class Panel final
 	StickedTooltips _stickedTooltipsShown;
 	Fn<void()> _callShareLinkCallback;
 
+	std::shared_ptr<ChatHelpers::Show> _cachedShow;
+	std::unique_ptr<MessageField> _messageField;
+	std::unique_ptr<MessagesUi> _messages;
+
 	const std::unique_ptr<Toasts> _toasts;
 
 	std::unique_ptr<MicLevelTester> _micLevelTester;
@@ -293,6 +274,7 @@ class Panel final
 	rpl::lifetime _hideControlsTimerLifetime;
 
 	rpl::lifetime _peerLifetime;
+	rpl::lifetime _lifetime;
 
 };
 
diff --git a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
index fded076144a48b..a11523da211a82 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
@@ -9,10 +9,14 @@ For license and copyright information please follow this link:
 
 #include "apiwrap.h"
 #include "calls/group/calls_group_common.h"
-#include "data/data_peer.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_user.h"
 #include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
 #include "main/main_account.h"
 #include "main/main_session.h"
+#include "settings/settings_common.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
@@ -23,6 +27,7 @@ For license and copyright information please follow this link:
 #include "ui/vertical_list.h"
 #include "styles/style_boxes.h"
 #include "styles/style_calls.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
@@ -33,8 +38,6 @@ For license and copyright information please follow this link:
 namespace Calls::Group {
 namespace {
 
-constexpr auto kPasswordCharAmount = 24;
-
 void StartWithBox(
 		not_null<Ui::GenericBox*> box,
 		Fn<void()> done,
@@ -46,6 +49,21 @@ void StartWithBox(
 	};
 	const auto state = box->lifetime().make_state<State>();
 
+	{
+		auto icon = Settings::CreateLottieIcon(
+			box->verticalLayout(),
+			{
+				.name = u"rtmp"_q,
+				.sizeOverride = st::normalBoxLottieSize,
+			},
+			{});
+		box->verticalLayout()->add(std::move(icon.widget), {}, style::al_top);
+		box->setShowFinishedCallback([animate = icon.animate] {
+			animate(anim::repeat::loop);
+		});
+		Ui::AddSkip(box->verticalLayout());
+	}
+
 	StartRtmpProcess::FillRtmpRows(
 		box->verticalLayout(),
 		true,
@@ -121,7 +139,7 @@ void StartRtmpProcess::start(
 			.done = std::move(done),
 		});
 	session->account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_request = nullptr;
 	}, _request->lifetime);
 
@@ -131,7 +149,7 @@ void StartRtmpProcess::start(
 void StartRtmpProcess::close() {
 	if (_request) {
 		_request->peer->session().api().request(_request->id).cancel();
-		if (const auto strong = _request->box.data()) {
+		if (const auto strong = _request->box.get()) {
 			strong->closeBox();
 		}
 		_request = nullptr;
@@ -141,7 +159,8 @@ void StartRtmpProcess::close() {
 void StartRtmpProcess::requestUrl(bool revoke) {
 	const auto session = &_request->peer->session();
 	_request->id = session->api().request(MTPphone_GetGroupCallStreamRtmpUrl(
-		_request->peer->input,
+		MTP_flags(0),
+		_request->peer->input(),
 		MTP_bool(revoke)
 	)).done([=](const MTPphone_GroupCallStreamRtmpUrl &result) {
 		auto data = result.match([&](
@@ -169,7 +188,12 @@ void StartRtmpProcess::finish(JoinInfo info) {
 void StartRtmpProcess::createBox() {
 	auto done = [=] {
 		const auto peer = _request->peer;
-		finish({ .peer = peer, .joinAs = peer, .rtmp = true });
+		const auto joinAs = (peer->isChat() && peer->asChat()->amCreator())
+			? peer
+			: (peer->isChannel() && peer->asChannel()->amCreator())
+			? peer
+			: peer->session().user();
+		finish({ .peer = peer, .joinAs = joinAs, .rtmp = true });
 	};
 	auto revoke = [=] {
 		const auto guard = base::make_weak(&_request->guard);
@@ -189,10 +213,10 @@ void StartRtmpProcess::createBox() {
 		_request->show,
 		_request->data.value());
 	object->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_request = nullptr;
 	}, _request->lifetime);
-	_request->box = Ui::MakeWeak(object.data());
+	_request->box = base::make_weak(object.data());
 	_request->show->showBox(std::move(object));
 }
 
@@ -207,7 +231,6 @@ void StartRtmpProcess::FillRtmpRows(
 		const style::RoundButton *attentionButtonStyle,
 		const style::PopupMenu *popupMenuStyle) {
 	struct State {
-		rpl::variable<bool> hidden = true;
 		rpl::variable<QString> key;
 		rpl::variable<QString> url;
 		bool warned = false;
@@ -215,8 +238,6 @@ void StartRtmpProcess::FillRtmpRows(
 
 	const auto &rowPadding = st::boxRowPadding;
 
-	const auto passChar = QChar(container->style()->styleHint(
-		QStyle::SH_LineEdit_PasswordCharacter));
 	const auto state = container->lifetime().make_state<State>();
 	state->key = rpl::duplicate(
 		data
@@ -225,9 +246,6 @@ void StartRtmpProcess::FillRtmpRows(
 		data
 	) | rpl::map([=](const auto &d) { return d.url; });
 
-	const auto showToast = [=](const QString &text) {
-		show->showToast(text);
-	};
 	const auto addButton = [&](
 			bool key,
 			rpl::producer<QString> &&text) {
@@ -236,31 +254,38 @@ void StartRtmpProcess::FillRtmpRows(
 			wrap.data(),
 			rpl::duplicate(text),
 			st::groupCallRtmpCopyButton);
-		button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 		button->setClickedCallback(key
 			? Fn<void()>([=] {
 				QGuiApplication::clipboard()->setText(state->key.current());
-				showToast(tr::lng_group_call_rtmp_key_copied(tr::now));
+				show->showToast({
+					.text = { tr::lng_group_call_rtmp_key_copied(tr::now) },
+					.iconLottie = u"toast/copy"_q,
+					.iconLottieSize = st::toastLottieIconSize,
+				});
 			})
 			: Fn<void()>([=] {
 				QGuiApplication::clipboard()->setText(state->url.current());
-				showToast(tr::lng_group_call_rtmp_url_copied(tr::now));
+				show->showToast({
+					.text = { tr::lng_group_call_rtmp_url_copied(tr::now) },
+					.iconLottie = u"toast/voip_invite"_q,
+					.iconLottieSize = st::toastLottieIconSize,
+				});
 			}));
 		Ui::AddSkip(container, st::groupCallRtmpCopyButtonTopSkip);
 		const auto weak = container->add(std::move(wrap), rowPadding);
 		Ui::AddSkip(container, st::groupCallRtmpCopyButtonBottomSkip);
 		button->heightValue(
-		) | rpl::start_with_next([=](int height) {
+		) | rpl::on_next([=](int height) {
 			weak->resize(weak->width(), height);
 		}, container->lifetime());
 		return weak;
 	};
 
-	const auto addLabel = [&](rpl::producer<QString> &&text) {
+	const auto addLabel = [&](v::text::data &&text) {
 		const auto label = container->add(
 			object_ptr<Ui::FlatLabel>(
 				container,
-				std::move(text),
+				v::text::take_marked(std::move(text)),
 				*labelStyle,
 				*popupMenuStyle),
 			st::boxRowPadding + QMargins(0, 0, showButtonStyle->width, 0));
@@ -295,47 +320,27 @@ void StartRtmpProcess::FillRtmpRows(
 		st::groupCallRtmpSubsectionTitleAddPadding,
 		subsectionTitleStyle);
 
-	auto keyLabelContent = rpl::combine(
-		state->hidden.value(),
-		state->key.value()
-	) | rpl::map([passChar](bool hidden, const QString &key) {
-		return key.isEmpty()
-			? QString()
-			: hidden
-			? QString().fill(passChar, kPasswordCharAmount)
-			: key;
+	auto keyLabelContent = state->key.value(
+	) | rpl::map([](const QString &key) {
+		const auto size = int(key.size());
+		auto result = TextWithEntities{ key };
+		if (size > 0) {
+			result.entities.push_back({ EntityType::Spoiler, 0, size });
+		}
+		return result;
 	}) | rpl::after_next([=] {
 		container->resizeToWidth(container->widthNoMargins());
 	});
 	const auto streamKeyLabel = addLabel(std::move(keyLabelContent));
-	streamKeyLabel->setSelectable(false);
-	const auto streamKeyButton = Ui::CreateChild<Ui::IconButton>(
-		container.get(),
-		*showButtonStyle);
-
-	streamKeyLabel->topValue(
-	) | rpl::start_with_next([=, right = rowPadding.right()](int top) {
-		streamKeyButton->moveToRight(
-			st::groupCallRtmpShowButtonPosition.x(),
-			top + st::groupCallRtmpShowButtonPosition.y());
-		streamKeyButton->raise();
-	}, container->lifetime());
-	streamKeyButton->addClickHandler([=] {
-		const auto toggle = [=] {
-			const auto newValue = !state->hidden.current();
-			state->hidden = newValue;
-			streamKeyLabel->setSelectable(!newValue);
-			streamKeyLabel->setAttribute(
-				Qt::WA_TransparentForMouseEvents,
-				newValue);
-		};
-		if (!state->warned && state->hidden.current()) {
+	streamKeyLabel->setClickHandlerFilter([=](
+			const ClickHandlerPtr &handler,
+			Qt::MouseButton button) {
+		if (button == Qt::LeftButton) {
 			show->showBox(Ui::MakeConfirmBox({
 				.text = tr::lng_group_call_rtmp_key_warning(
-					Ui::Text::RichLangValue),
+					tr::rich),
 				.confirmed = [=](Fn<void()> &&close) {
-					state->warned = true;
-					toggle();
+					handler->onClick({});
 					close();
 				},
 				.confirmText = tr::lng_from_request_understand(),
@@ -343,9 +348,8 @@ void StartRtmpProcess::FillRtmpRows(
 				.confirmStyle = attentionButtonStyle,
 				.labelStyle = labelStyle,
 			}));
-		} else {
-			toggle();
 		}
+		return false;
 	});
 
 	addButton(true, tr::lng_group_call_rtmp_key_copy());
diff --git a/Telegram/SourceFiles/calls/group/calls_group_rtmp.h b/Telegram/SourceFiles/calls/group/calls_group_rtmp.h
index eb5d4b5fa60a5f..c3cadab12da17c 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_rtmp.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_rtmp.h
@@ -64,7 +64,7 @@ class StartRtmpProcess final {
 		std::shared_ptr<Ui::Show> show;
 		Fn<void(JoinInfo)> done;
 		base::has_weak_ptr guard;
-		QPointer<Ui::BoxContent> box;
+		base::weak_qptr<Ui::BoxContent> box;
 		rpl::lifetime lifetime;
 		mtpRequestId id = 0;
 	};
diff --git a/Telegram/SourceFiles/calls/group/calls_group_settings.cpp b/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
index 4c60a3f886bcd4..b4b16d9f71a0e7 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "calls/group/calls_group_menu.h" // LeaveBox.
 #include "calls/group/calls_group_common.h"
 #include "calls/group/calls_choose_join_as.h"
+#include "calls/group/calls_volume_item.h"
 #include "calls/calls_instance.h"
 #include "ui/widgets/level_meter.h"
 #include "ui/widgets/continuous_sliders.h"
@@ -23,7 +24,7 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "boxes/share_box.h"
 #include "history/view/history_view_schedule_box.h"
-#include "history/history_item_helpers.h" // GetErrorTextForSending.
+#include "history/history_item_helpers.h" // GetErrorForSending.
 #include "history/history.h"
 #include "data/data_histories.h"
 #include "data/data_session.h"
@@ -43,10 +44,13 @@ For license and copyright information please follow this link:
 #include "core/core_settings.h"
 #include "webrtc/webrtc_audio_input_tester.h"
 #include "webrtc/webrtc_device_resolver.h"
-#include "settings/settings_calls.h"
+#include "settings/sections/settings_calls.h"
+#include "settings/settings_common.h"
+#include "settings/settings_credits_graphics.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
 #include "api/api_invite_links.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 #include "styles/style_calls.h"
 #include "styles/style_settings.h"
@@ -73,16 +77,43 @@ void SaveCallJoinMuted(
 	const auto call = peer->groupCall();
 	if (!call
 		|| call->id() != callId
+		|| peer->isUser()
 		|| !peer->canManageGroupCall()
 		|| !call->canChangeJoinMuted()
 		|| call->joinMuted() == joinMuted) {
 		return;
 	}
+	using Flag = MTPphone_ToggleGroupCallSettings::Flag;
 	call->setJoinMutedLocally(joinMuted);
 	peer->session().api().request(MTPphone_ToggleGroupCallSettings(
-		MTP_flags(MTPphone_ToggleGroupCallSettings::Flag::f_join_muted),
+		MTP_flags(Flag::f_join_muted),
 		call->input(),
-		MTP_bool(joinMuted)
+		MTP_bool(joinMuted),
+		MTPBool(), // messages_enabled
+		MTPlong() // send_paid_messages_stars
+	)).send();
+}
+
+void SaveCallMessagesEnabled(
+		not_null<PeerData*> peer,
+		CallId callId,
+		bool messagesEnabled) {
+	const auto call = peer->groupCall();
+	if (!call
+		|| call->id() != callId
+		|| !peer->canManageGroupCall()
+		|| !call->canChangeMessagesEnabled()
+		|| call->messagesEnabled() == messagesEnabled) {
+		return;
+	}
+	using Flag = MTPphone_ToggleGroupCallSettings::Flag;
+	call->setMessagesEnabledLocally(messagesEnabled);
+	peer->session().api().request(MTPphone_ToggleGroupCallSettings(
+		MTP_flags(Flag::f_messages_enabled),
+		call->input(),
+		MTPBool(), // join_muted
+		MTP_bool(messagesEnabled),
+		MTPlong() // send_paid_messages_stars
 	)).send();
 }
 
@@ -108,7 +139,7 @@ object_ptr<ShareBox> ShareInviteLinkBox(
 		const QString &linkListener,
 		std::shared_ptr<Ui::Show> show) {
 	const auto sending = std::make_shared<bool>();
-	const auto box = std::make_shared<QPointer<ShareBox>>();
+	const auto box = std::make_shared<base::weak_qptr<ShareBox>>();
 
 	auto bottom = linkSpeaker.isEmpty()
 		? nullptr
@@ -128,10 +159,18 @@ object_ptr<ShareBox> ShareInviteLinkBox(
 	};
 	auto copyCallback = [=] {
 		QGuiApplication::clipboard()->setText(currentLink());
-		show->showToast(tr::lng_group_invite_copied(tr::now));
+		show->showToast({
+			.text = { tr::lng_group_invite_copied(tr::now) },
+			.iconLottie = u"toast/voip_invite"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
+	};
+	auto countMessagesCallback = [=](const TextWithTags &comment) {
+		return 1;
 	};
 	auto submitCallback = [=](
 			std::vector<not_null<Data::Thread*>> &&result,
+			Fn<bool()> checkPaid,
 			TextWithTags &&comment,
 			Api::SendOptions options,
 			Data::ForwardOptions) {
@@ -139,32 +178,17 @@ object_ptr<ShareBox> ShareInviteLinkBox(
 			return;
 		}
 
-		const auto error = [&] {
-			for (const auto thread : result) {
-				const auto error = GetErrorTextForSending(
-					thread,
-					{ .text = &comment });
-				if (!error.isEmpty()) {
-					return std::make_pair(error, thread);
-				}
-			}
-			return std::make_pair(QString(), result.front());
-		}();
-		if (!error.first.isEmpty()) {
-			auto text = TextWithEntities();
-			if (result.size() > 1) {
-				text.append(
-					Ui::Text::Bold(error.second->chatListName())
-				).append("\n\n");
-			}
-			text.append(error.first);
+		const auto error = GetErrorForSending(
+			result,
+			{ .text = &comment });
+		if (error.error) {
 			if (const auto weak = *box) {
-				weak->getDelegate()->show(ConfirmBox({
-					.text = text,
-					.inform = true,
-				}));
+				weak->getDelegate()->show(
+					MakeSendErrorBox(error, result.size() > 1));
 			}
 			return;
+		} else if (!checkPaid()) {
+			return;
 		}
 
 		*sending = true;
@@ -179,7 +203,7 @@ object_ptr<ShareBox> ShareInviteLinkBox(
 			comment.text = link;
 		}
 		auto &api = peer->session().api();
-		for (const auto thread : result) {
+		for (const auto &thread : result) {
 			auto message = Api::MessageToSend(
 				Api::SendAction(thread, options));
 			message.textWithTags = comment;
@@ -193,32 +217,18 @@ object_ptr<ShareBox> ShareInviteLinkBox(
 	};
 	auto filterCallback = [](not_null<Data::Thread*> thread) {
 		if (const auto user = thread->peer()->asUser()) {
-			if (user->canSendIgnoreRequirePremium()) {
+			if (user->canSendIgnoreMoneyRestrictions()) {
 				return true;
 			}
 		}
 		return Data::CanSend(thread, ChatRestriction::SendOther);
 	};
 
-	const auto scheduleStyle = [&] {
-		auto date = Ui::ChooseDateTimeStyleArgs();
-		date.labelStyle = &st::groupCallBoxLabel;
-		date.dateFieldStyle = &st::groupCallScheduleDateField;
-		date.timeFieldStyle = &st::groupCallScheduleTimeField;
-		date.separatorStyle = &st::callMuteButtonLabel;
-		date.atStyle = &st::callMuteButtonLabel;
-		date.calendarStyle = &st::groupCallCalendarColors;
-
-		auto st = HistoryView::ScheduleBoxStyleArgs();
-		st.topButtonStyle = &st::groupCallMenuToggle;
-		st.popupMenuStyle = &st::groupCallPopupMenu;
-		st.chooseDateTimeArgs = std::move(date);
-		return st;
-	};
-
+	const auto st = ::Settings::DarkCreditsEntryBoxStyle();
 	auto result = Box<ShareBox>(ShareBox::Descriptor{
 		.session = &peer->session(),
 		.copyCallback = std::move(copyCallback),
+		.countMessagesCallback = std::move(countMessagesCallback),
 		.submitCallback = std::move(submitCallback),
 		.filterCallback = std::move(filterCallback),
 		.bottomWidget = std::move(bottom),
@@ -228,12 +238,8 @@ object_ptr<ShareBox> ShareInviteLinkBox(
 				: rpl::single(false)),
 			tr::lng_group_call_copy_speaker_link(),
 			tr::lng_group_call_copy_listener_link()),
-		.stMultiSelect = &st::groupCallMultiSelect,
-		.stComment = &st::groupCallShareBoxComment,
-		.st = &st::groupCallShareBoxList,
-		.stLabel = &st::groupCallField,
-		.scheduleBoxStyle = scheduleStyle(),
-		.premiumRequiredError = SharePremiumRequiredError(),
+		.st = st.shareBox ? *st.shareBox : ShareBoxStyleOverrides(),
+		.moneyRestrictionError = ShareMessageMoneyRestrictionError(),
 	});
 	*box = result.data();
 	return result;
@@ -247,7 +253,7 @@ void SettingsBox(
 	using namespace Settings;
 
 	const auto weakCall = base::make_weak(call);
-	const auto weakBox = Ui::MakeWeak(box);
+	const auto weakBox = base::make_weak(box);
 
 	struct State {
 		std::unique_ptr<Webrtc::DeviceResolver> deviceId;
@@ -260,7 +266,9 @@ void SettingsBox(
 	};
 	const auto peer = call->peer();
 	const auto state = box->lifetime().make_state<State>();
-	const auto real = peer->groupCall();
+	const auto real = call->conference()
+		? call->lookupReal()
+		: peer->groupCall();
 	const auto rtmp = call->rtmp();
 	const auto id = call->id();
 	const auto goodReal = (real && real->id() == id);
@@ -268,20 +276,28 @@ void SettingsBox(
 	const auto layout = box->verticalLayout();
 	const auto &settings = Core::App().settings();
 
-	const auto joinMuted = goodReal ? real->joinMuted() : false;
+	const auto joinMuted = !call->conference()
+		&& goodReal
+		&& real->joinMuted();
+	const auto messagesEnabled = goodReal && real->messagesEnabled();
 	const auto canChangeJoinMuted = !rtmp
 		&& goodReal
 		&& real->canChangeJoinMuted();
-	const auto addCheck = (peer->canManageGroupCall() && canChangeJoinMuted);
+	const auto canChangeMessagesEnabled = !rtmp
+		&& goodReal
+		&& real->canChangeMessagesEnabled();
+	const auto addCheck = canChangeJoinMuted && peer->canManageGroupCall();
+	const auto addMessages = canChangeMessagesEnabled
+		&& (call->conference() || peer->canManageGroupCall());
 
 	const auto addDivider = [&] {
 		layout->add(object_ptr<Ui::BoxContentDivider>(
 			layout,
 			st::boxDividerHeight,
-			st::groupCallDividerBg));
+			st::groupCallDividerBar));
 	};
 
-	if (addCheck) {
+	if (addCheck || addMessages) {
 		Ui::AddSkip(layout);
 	}
 	const auto muteJoined = addCheck
@@ -290,7 +306,14 @@ void SettingsBox(
 			tr::lng_group_call_new_muted(),
 			st::groupCallSettingsButton))->toggleOn(rpl::single(joinMuted))
 		: nullptr;
-	if (addCheck) {
+	const auto enableMessages = addMessages
+		? layout->add(object_ptr<Ui::SettingsButton>(
+			layout,
+			tr::lng_group_call_enable_messages(),
+			st::groupCallSettingsButton))->toggleOn(
+				rpl::single(messagesEnabled))
+		: nullptr;
+	if (addCheck || addMessages) {
 		Ui::AddSkip(layout);
 	}
 
@@ -360,7 +383,7 @@ void SettingsBox(
 		))->toggleOn(rpl::single(
 			settings.groupCallNoiseSuppression()
 		))->toggledChanges(
-		) | rpl::start_with_next([=](bool enabled) {
+		) | rpl::on_next([=](bool enabled) {
 			Core::App().settings().setGroupCallNoiseSuppression(enabled);
 			call->setNoiseSuppression(enabled);
 			Core::App().saveSettingsDelayed();
@@ -440,8 +463,8 @@ void SettingsBox(
 									? tr::lng_group_call_mac_input()
 									: tr::lng_group_call_mac_accessibility())
 							) | rpl::map([](QString a, QString b) {
-								auto result = Ui::Text::RichLangValue(a);
-								result.append("\n\n").append(Ui::Text::RichLangValue(b));
+								auto result = tr::rich(a);
+								result.append("\n\n").append(tr::rich(b));
 								return result;
 							}),
 							st::groupCallBoxLabel),
@@ -465,7 +488,7 @@ void SettingsBox(
 							kCheckAccessibilityInterval
 						) | rpl::filter([] {
 							return base::GlobalShortcutsAllowed();
-						}) | rpl::start_with_next([=] {
+						}) | rpl::on_next([=] {
 							box->closeBox();
 						}, box->lifetime());
 					}
@@ -562,7 +585,7 @@ void SettingsBox(
 				settings.groupCallPushToTalk(),
 				anim::type::instant);
 			pushToTalk->toggledChanges(
-			) | rpl::start_with_next([=](bool toggled) {
+			) | rpl::on_next([=](bool toggled) {
 				if (!toggled) {
 					stopRecording();
 				} else if (!ensureManager()) {
@@ -637,8 +660,13 @@ void SettingsBox(
 				}
 				QGuiApplication::clipboard()->setText(link);
 				if (weakBox) {
-					box->showToast(
-						tr::lng_create_channel_link_copied(tr::now));
+					box->showToast({
+						.text = {
+							tr::lng_create_channel_link_copied(tr::now),
+						},
+						.iconLottie = u"toast/voip_invite"_q,
+						.iconLottieSize = st::toastLottieIconSize,
+					});
 				}
 				return true;
 			};
@@ -676,7 +704,8 @@ void SettingsBox(
 			const auto session = &peer->session();
 			state->requestId = session->api().request(
 				MTPphone_GetGroupCallStreamRtmpUrl(
-					peer->input,
+					MTP_flags(0),
+					peer->input(),
 					MTP_bool(true)
 			)).done([=](const MTPphone_GroupCallStreamRtmpUrl &result) {
 				auto data = result.match([&](
@@ -748,8 +777,56 @@ void SettingsBox(
 		addDivider();
 		Ui::AddSkip(layout);
 	}
+	if (rtmp) {
+		const auto fakeMenu = layout->add(object_ptr<Ui::Menu::Menu>(
+			layout,
+			st::groupCallVolumeSettings));
+		auto volumeItem = base::make_unique_q<MenuVolumeItem>(
+			fakeMenu,
+			st::groupCallVolumeSettings,
+			st::groupCallVolumeSettingsSlider,
+			call->otherParticipantStateValue(
+			) | rpl::filter([=](const Group::ParticipantState &data) {
+				return data.peer == peer;
+			}),
+			call->rtmpVolume(),
+			Group::kMaxVolume,
+			false,
+			st::groupCallVolumeSettingsPadding);
+
+		const auto toggleMute = crl::guard(layout, [=](bool m, bool local) {
+			if (call) {
+				call->toggleMute({
+					.peer = peer,
+					.mute = m,
+					.locallyOnly = local,
+				});
+			}
+		});
+		const auto changeVolume = crl::guard(layout, [=](int v, bool local) {
+			if (call) {
+				call->changeVolume({
+					.peer = peer,
+					.volume = std::clamp(v, 1, Group::kMaxVolume),
+					.locallyOnly = local,
+				});
+			}
+		});
+
+		volumeItem->toggleMuteLocallyRequests(
+		) | rpl::on_next([=](bool muted) {
+			toggleMute(muted, true);
+		}, volumeItem->lifetime());
 
-	if (peer->canManageGroupCall()) {
+		volumeItem->changeVolumeLocallyRequests(
+		) | rpl::on_next([=](int volume) {
+			changeVolume(volume, true);
+		}, volumeItem->lifetime());
+
+		fakeMenu->addAction(std::move(volumeItem));
+	}
+
+	if (call->canManage()) {
 		layout->add(object_ptr<Ui::SettingsButton>(
 			layout,
 			(peer->isBroadcast()
@@ -787,12 +864,22 @@ void SettingsBox(
 
 	box->setTitle(tr::lng_group_call_settings_title());
 	box->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (canChangeJoinMuted
 			&& muteJoined
 			&& muteJoined->toggled() != joinMuted) {
 			SaveCallJoinMuted(peer, id, muteJoined->toggled());
 		}
+		if (canChangeMessagesEnabled
+			&& enableMessages
+			&& enableMessages->toggled() != messagesEnabled) {
+			const auto value = enableMessages->toggled();
+			if (!call->conference()) {
+				SaveCallMessagesEnabled(peer, id, value);
+			} else if (const auto real = call->lookupReal()) {
+				real->setMessagesEnabledLocally(value);
+			}
+		}
 	}, box->lifetime());
 	box->addButton(tr::lng_box_done(), [=] {
 		box->closeBox();
@@ -819,7 +906,7 @@ std::pair<Fn<void()>, rpl::lifetime> ShareInviteLinkAction(
 		bool generatingLink = false;
 	};
 	const auto state = lifetime.make_state<State>(&peer->session());
-	if (!peer->canManageGroupCall()) {
+	if (peer->isUser() || !peer->canManageGroupCall()) {
 		state->linkSpeaker = QString();
 	}
 
diff --git a/Telegram/SourceFiles/calls/group/calls_group_stars_box.cpp b/Telegram/SourceFiles/calls/group/calls_group_stars_box.cpp
new file mode 100644
index 00000000000000..e287398b0bca6c
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/calls_group_stars_box.cpp
@@ -0,0 +1,147 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "calls/group/calls_group_stars_box.h"
+
+#include "boxes/send_credits_box.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "data/data_message_reactions.h"
+#include "data/data_peer.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "payments/ui/payments_reaction_box.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/dynamic_thumbnails.h"
+#include "window/window_session_controller.h"
+
+namespace Calls::Group {
+namespace {
+
+constexpr auto kMaxStarsFallback = 10'000;
+constexpr auto kDefaultStars = 10;
+
+} // namespace
+
+int MaxVideoStreamStarsCount(not_null<Main::Session*> session) {
+	const auto appConfig = &session->appConfig();
+	return std::max(
+		appConfig->get<int>(
+			u"stars_groupcall_message_amount_max"_q,
+			kMaxStarsFallback),
+		2);
+}
+
+void VideoStreamStarsBox(
+		not_null<Ui::GenericBox*> box,
+		VideoStreamStarsBoxArgs &&args) {
+	args.show->session().credits().load();
+
+	const auto admin = args.admin;
+	const auto sending = args.sending;
+	auto submitText = [=](rpl::producer<int> amount) {
+		auto nice = std::move(amount) | rpl::map([=](int count) {
+			return Ui::CreditsEmojiSmall().append(
+				Lang::FormatCountDecimal(count));
+		});
+		return admin
+			? tr::lng_box_ok(tr::marked)
+			: (sending
+				? tr::lng_paid_reaction_button
+				: tr::lng_paid_comment_button)(
+					lt_stars,
+					std::move(nice),
+					tr::rich);
+	};
+	const auto &show = args.show;
+	const auto session = &show->session();
+	const auto max = std::max(args.min, MaxVideoStreamStarsCount(session));
+	const auto chosen = std::clamp(
+		args.current ? args.current : kDefaultStars,
+		args.min,
+		max);
+	auto top = std::vector<Ui::PaidReactionTop>();
+	const auto add = [&](const Data::MessageReactionsTopPaid &entry) {
+		const auto peer = entry.peer;
+		const auto name = peer
+			? peer->shortName()
+			: tr::lng_paid_react_anonymous(tr::now);
+		const auto open = [=] {
+			if (const auto controller = show->resolveWindow()) {
+				controller->showPeerInfo(peer);
+			}
+		};
+		top.push_back({
+			.name = name,
+			.photo = (peer
+				? Ui::MakeUserpicThumbnail(peer)
+				: Ui::MakeHiddenAuthorThumbnail()),
+			.barePeerId = peer ? uint64(peer->id.value) : 0,
+			.count = int(entry.count),
+			.click = peer ? open : Fn<void()>(),
+			.my = (entry.my == 1),
+		});
+	};
+
+	top.reserve(args.top.size() + 1);
+	for (const auto &entry : args.top) {
+		add(entry);
+	}
+
+	auto myAdded = base::flat_set<uint64>();
+	const auto i = ranges::find(top, true, &Ui::PaidReactionTop::my);
+	if (i != end(top)) {
+		myAdded.emplace(i->barePeerId);
+	}
+	const auto myCount = uint32((i != end(top)) ? i->count : 0);
+	const auto myAdd = [&](not_null<PeerData*> peer) {
+		const auto barePeerId = uint64(peer->id.value);
+		if (!myAdded.emplace(barePeerId).second) {
+			return;
+		}
+		add(Data::MessageReactionsTopPaid{
+			.peer = peer,
+			.count = myCount,
+			.my = true,
+		});
+	};
+	myAdd(session->user());
+	ranges::stable_sort(top, ranges::greater(), &Ui::PaidReactionTop::count);
+	const auto weak = base::make_weak(box);
+	Ui::PaidReactionsBox(box, {
+		.min = args.min,
+		.chosen = chosen,
+		.max = max,
+		.top = std::move(top),
+		.session = &show->session(),
+		.name = args.name,
+		.submit = std::move(submitText),
+		.colorings = show->session().appConfig().groupCallColorings(),
+		.balanceValue = session->credits().balanceValue(),
+		.send = [=, save = args.save](int count, uint64 barePeerId) {
+			if (!admin) {
+				save(count);
+			}
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		},
+		.videoStreamChoosing = !sending,
+		.videoStreamSending = sending,
+		.videoStreamAdmin = admin,
+		.dark = true,
+	});
+}
+
+object_ptr<Ui::BoxContent> MakeVideoStreamStarsBox(
+		VideoStreamStarsBoxArgs &&args) {
+	return Box(VideoStreamStarsBox, std::move(args));
+}
+
+} // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_stars_box.h b/Telegram/SourceFiles/calls/group/calls_group_stars_box.h
new file mode 100644
index 00000000000000..1b1af613715a63
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/calls_group_stars_box.h
@@ -0,0 +1,54 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Data {
+struct MessageReactionsTopPaid;
+} // namespace Data
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class BoxContent;
+class GenericBox;
+} // namespace Ui
+
+namespace Calls::Group::Ui {
+using namespace ::Ui;
+struct StarsColoring;
+} // namespace Calls::Group::Ui
+
+namespace Calls::Group {
+
+[[nodiscard]] int MaxVideoStreamStarsCount(not_null<Main::Session*> session);
+
+struct VideoStreamStarsBoxArgs {
+	std::shared_ptr<ChatHelpers::Show> show;
+	std::vector<Data::MessageReactionsTopPaid> top;
+	int min = 0;
+	int current = 0;
+	bool sending = false;
+	bool admin = false;
+	Fn<void(int)> save;
+	QString name;
+};
+
+void VideoStreamStarsBox(
+	not_null<Ui::GenericBox*> box,
+	VideoStreamStarsBoxArgs &&args);
+
+[[nodiscard]] object_ptr<Ui::BoxContent> MakeVideoStreamStarsBox(
+	VideoStreamStarsBoxArgs &&args);
+
+} // namespace Calls::Group
diff --git a/Telegram/SourceFiles/calls/group/calls_group_toasts.cpp b/Telegram/SourceFiles/calls/group/calls_group_toasts.cpp
index 55e67be95e025f..b3a8604c9731ee 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_toasts.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_toasts.cpp
@@ -10,8 +10,10 @@ For license and copyright information please follow this link:
 #include "calls/group/calls_group_call.h"
 #include "calls/group/calls_group_common.h"
 #include "calls/group/calls_group_panel.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "data/data_peer.h"
 #include "data/data_group_call.h"
+#include "ui/layers/show.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "lang/lang_keys.h"
@@ -48,14 +50,14 @@ void Toasts::setupJoinAsChanged() {
 		return _call->stateValue() | rpl::filter([](State state) {
 			return (state == State::Joined);
 		}) | rpl::take(1);
-	}) | rpl::flatten_latest() | rpl::start_with_next([=] {
-		_panel->showToast((_call->peer()->isBroadcast()
+	}) | rpl::flatten_latest() | rpl::on_next([=] {
+		_panel->uiShow()->showToast((_call->peer()->isBroadcast()
 			? tr::lng_group_call_join_as_changed_channel
 			: tr::lng_group_call_join_as_changed)(
 			tr::now,
 			lt_name,
-			Ui::Text::Bold(_call->joinAs()->name()),
-			Ui::Text::WithEntities));
+			tr::bold(_call->joinAs()->name()),
+			tr::marked));
 	}, _lifetime);
 }
 
@@ -68,22 +70,23 @@ void Toasts::setupTitleChanged() {
 		return peer->groupCall()->title().isEmpty()
 			? peer->name()
 			: peer->groupCall()->title();
-	}) | rpl::start_with_next([=](const QString &title) {
-		_panel->showToast((_call->peer()->isBroadcast()
+	}) | rpl::on_next([=](const QString &title) {
+		_panel->uiShow()->showToast((_call->peer()->isBroadcast()
 			? tr::lng_group_call_title_changed_channel
 			: tr::lng_group_call_title_changed)(
 			tr::now,
 			lt_title,
-			Ui::Text::Bold(title),
-			Ui::Text::WithEntities));
+			tr::bold(title),
+			tr::marked));
 	}, _lifetime);
 }
 
 void Toasts::setupAllowedToSpeak() {
 	_call->allowedToSpeakNotifications(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_panel->isActive()) {
-			_panel->showToast(tr::lng_group_call_can_speak_here(tr::now));
+			_panel->uiShow()->showToast(
+				tr::lng_group_call_can_speak_here(tr::now));
 		} else {
 			const auto real = _call->lookupReal();
 			const auto name = (real && !real->title().isEmpty())
@@ -93,8 +96,8 @@ void Toasts::setupAllowedToSpeak() {
 				.text = tr::lng_group_call_can_speak(
 					tr::now,
 					lt_chat,
-					Ui::Text::Bold(name),
-					Ui::Text::WithEntities),
+					tr::bold(name),
+					tr::marked),
 			});
 		}
 	}, _lifetime);
@@ -109,7 +112,7 @@ void Toasts::setupPinnedVideo() {
 	}) | rpl::flatten_latest(
 	) | rpl::filter([=] {
 		return (_call->shownVideoTracks().size() > 1);
-	}) | rpl::start_with_next([=](const VideoEndpoint &endpoint) {
+	}) | rpl::on_next([=](const VideoEndpoint &endpoint) {
 		const auto pinned = _call->videoEndpointPinned();
 		const auto peer = endpoint.peer;
 		if (!peer) {
@@ -137,16 +140,16 @@ void Toasts::setupPinnedVideo() {
 					: tr::lng_group_call_unpinned_screen);
 			return key(tr::now, lt_user, peer->shortName());
 		}();
-		_panel->showToast(text);
+		_panel->uiShow()->showToast(text);
 	}, _lifetime);
 }
 
 void Toasts::setupRequestedToSpeak() {
 	_call->mutedValue(
 	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](MuteState was, MuteState now) {
+	) | rpl::on_next([=](MuteState was, MuteState now) {
 		if (was == MuteState::ForceMuted && now == MuteState::RaisedHand) {
-			_panel->showToast(
+			_panel->uiShow()->showToast(
 				tr::lng_group_call_tooltip_raised_hand(tr::now));
 		}
 	}, _lifetime);
@@ -154,7 +157,7 @@ void Toasts::setupRequestedToSpeak() {
 
 void Toasts::setupError() {
 	_call->errors(
-	) | rpl::start_with_next([=](Error error) {
+	) | rpl::on_next([=](Error error) {
 		const auto key = [&] {
 			switch (error) {
 			case Error::NoCamera: return tr::lng_call_error_no_camera;
@@ -173,7 +176,7 @@ void Toasts::setupError() {
 			}
 			Unexpected("Error in Calls::Group::Toasts::setupErrorToasts.");
 		}();
-		_panel->showToast({ key(tr::now) }, kErrorDuration);
+		_panel->uiShow()->showToast({ key(tr::now) }, kErrorDuration);
 	}, _lifetime);
 }
 
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport.cpp
index dc890266ef77f0..2641d3a17bcf43 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport.cpp
@@ -10,6 +10,10 @@ For license and copyright information please follow this link:
 #include "calls/group/calls_group_viewport_tile.h"
 #include "calls/group/calls_group_viewport_opengl.h"
 #include "calls/group/calls_group_viewport_raster.h"
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+#include "calls/group/calls_group_viewport_rhi.h"
+#include "ui/rhi/rhi_renderer.h"
+#endif
 #include "calls/group/calls_group_common.h"
 #include "calls/group/calls_group_call.h"
 #include "calls/group/calls_group_members_row.h"
@@ -26,8 +30,9 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "styles/style_calls.h"
 
-#include <QtGui/QtEvents>
 #include <QOpenGLShader>
+#include <QtGui/QtEvents>
+#include <QOpenGLWidget>
 
 namespace Calls::Group {
 namespace {
@@ -51,23 +56,49 @@ namespace {
 Viewport::Viewport(
 	not_null<QWidget*> parent,
 	PanelMode mode,
-	Ui::GL::Backend backend)
+	Ui::GL::Backend backend,
+	Ui::RpWidgetWrap *borrowedRp,
+	bool borrowedOpenGL)
 : _mode(mode)
-, _content(Ui::GL::CreateSurface(parent, chooseRenderer(backend))) {
+, _opengl(borrowedOpenGL)
+, _qrhi(borrowedRp && (backend == Ui::GL::Backend::QRhi))
+, _content(borrowedRp
+	? nullptr
+	: Ui::GL::CreateSurface(parent, chooseRenderer(backend)))
+, _borrowed(borrowedRp) {
 	setup();
 }
 
-Viewport::~Viewport() = default;
+Viewport::~Viewport() {
+	if (_borrowed) {
+		if (_opengl) {
+			const auto w = static_cast<QOpenGLWidget*>(widget().get());
+			w->makeCurrent();
+			const auto context = w->context();
+			const auto valid = w->isValid()
+				&& context
+				&& (QOpenGLContext::currentContext() == context);
+			ensureBorrowedCleared(valid ? context->functions() : nullptr);
+		} else {
+			ensureBorrowedCleared();
+		}
+	}
+	_content.release();
+}
 
 not_null<QWidget*> Viewport::widget() const {
-	return _content->rpWidget();
+	return _borrowed ? _borrowed->rpWidget() : _content->rpWidget();
 }
 
 not_null<Ui::RpWidgetWrap*> Viewport::rp() const {
-	return _content.get();
+	return _borrowed ? _borrowed : _content.get();
 }
 
 void Viewport::setup() {
+	if (_borrowed) {
+		return;
+	}
+
 	const auto raw = widget();
 
 	raw->resize(0, 0);
@@ -76,13 +107,13 @@ void Viewport::setup() {
 
 	_content->sizeValue(
 	) | rpl::filter([=] {
-		return wide();
-	}) | rpl::start_with_next([=] {
+		return wide() || videoStream();
+	}) | rpl::on_next([=] {
 		updateTilesGeometry();
 	}, lifetime());
 
 	_content->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::Enter) {
 			Ui::Integration::Instance().registerLeaveSubscription(raw);
@@ -106,23 +137,29 @@ void Viewport::setup() {
 }
 
 void Viewport::setGeometry(bool fullscreen, QRect geometry) {
-	Expects(wide());
+	Expects(wide() || videoStream());
+
+	if (_borrowed) {
+		updateMyWidgetPart();
+		_borrowedGeometry = geometry;
+		updateMyWidgetPart();
+		updateTilesGeometry();
+		return;
+	}
 
 	const auto changed = (_fullscreen != fullscreen);
 	if (changed) {
 		_fullscreen = fullscreen;
 	}
 	if (widget()->geometry() != geometry) {
-		_geometryStaleAfterModeChange = false;
 		widget()->setGeometry(geometry);
-	} else if (_geometryStaleAfterModeChange || changed) {
-		_geometryStaleAfterModeChange = false;
+	} else if (changed) {
 		updateTilesGeometry();
 	}
 }
 
 void Viewport::resizeToWidth(int width) {
-	Expects(!wide());
+	Expects(!wide() && !videoStream());
 
 	updateTilesGeometry(width);
 }
@@ -139,6 +176,10 @@ bool Viewport::wide() const {
 	return (_mode == PanelMode::Wide);
 }
 
+bool Viewport::videoStream() const {
+	return (_mode == PanelMode::VideoStream);
+}
+
 void Viewport::setMode(PanelMode mode, not_null<QWidget*> parent) {
 	if (_mode == mode && widget()->parent() == parent) {
 		return;
@@ -153,7 +194,7 @@ void Viewport::setMode(PanelMode mode, not_null<QWidget*> parent) {
 			widget()->show();
 		}
 	}
-	if (!wide()) {
+	if (!wide() && !videoStream()) {
 		for (const auto &tile : _tiles) {
 			tile->toggleTopControlsShown(false);
 		}
@@ -173,7 +214,9 @@ void Viewport::handleMouseRelease(QPoint position, Qt::MouseButton button) {
 	setPressed({});
 	if (const auto tile = pressed.tile) {
 		if (pressed == _selected) {
-			if (button == Qt::RightButton) {
+			if (videoStream()) {
+				return;
+			} else if (button == Qt::RightButton) {
 				tile->row()->showContextMenu();
 			} else if (!wide()
 				|| (_hasTwoOrMore && !_large)
@@ -191,7 +234,7 @@ void Viewport::handleMouseMove(QPoint position) {
 }
 
 void Viewport::updateSelected(QPoint position) {
-	if (!widget()->rect().contains(position)) {
+	if (_borrowed || !widget()->rect().contains(position)) {
 		setSelected({});
 		return;
 	}
@@ -219,12 +262,23 @@ void Viewport::updateSelected(QPoint position) {
 }
 
 void Viewport::updateSelected() {
+	if (_borrowed) {
+		return;
+	}
 	updateSelected(widget()->mapFromGlobal(QCursor::pos()));
 }
 
 void Viewport::setControlsShown(float64 shown) {
 	_controlsShownRatio = shown;
-	widget()->update();
+	updateMyWidgetPart();
+}
+
+void Viewport::updateMyWidgetPart() {
+	if (!_borrowed) {
+		widget()->update();
+	} else if (!_borrowedGeometry.isEmpty()) {
+		widget()->update(_borrowedGeometry);
+	}
 }
 
 void Viewport::setCursorShown(bool shown) {
@@ -245,18 +299,18 @@ void Viewport::add(
 		track,
 		std::move(trackSize),
 		std::move(pinned),
-		[=] { widget()->update(); },
+		[=] { updateMyWidgetPart(); },
 		self));
 
 	_tiles.back()->trackSizeValue(
 	) | rpl::filter([](QSize size) {
 		return !size.isEmpty();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateTilesGeometry();
 	}, _tiles.back()->lifetime());
 
 	_tiles.back()->track()->stateValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateTilesGeometry();
 	}, _tiles.back()->lifetime());
 }
@@ -325,7 +379,8 @@ void Viewport::prepareLargeChangeAnimation() {
 void Viewport::startLargeChangeAnimation() {
 	Expects(!_largeChangeAnimation.animating());
 
-	if (!wide()
+	if (_borrowed
+		|| !wide()
 		|| anim::Disabled()
 		|| (_startTilesLayout.list.size() < 2)
 		|| !_opengl
@@ -415,7 +470,7 @@ Viewport::Layout Viewport::applyLarge(Layout layout) const {
 }
 
 void Viewport::updateTilesAnimated() {
-	if (!_largeChangeAnimation.animating()) {
+	if (_borrowed || !_largeChangeAnimation.animating()) {
 		updateTilesGeometry();
 		return;
 	}
@@ -539,7 +594,11 @@ Viewport::Layout Viewport::countWide(int outerWidth, int outerHeight) const {
 }
 
 void Viewport::showLarge(const VideoEndpoint &endpoint) {
-	// If a video get's switched off, GroupCall first unpins it,
+	if (_borrowed) {
+		return;
+	}
+
+	// If a video gets switched off, GroupCall first unpins it,
 	// then removes it from Large endpoint, then removes from active tracks.
 	//
 	// If we want to animate large video removal properly, we need to
@@ -566,7 +625,9 @@ void Viewport::showLarge(const VideoEndpoint &endpoint) {
 }
 
 void Viewport::updateTilesGeometry() {
-	updateTilesGeometry(widget()->width());
+	updateTilesGeometry(_borrowed
+		? _borrowedGeometry.width()
+		: widget()->width());
 }
 
 void Viewport::updateTilesGeometry(int outerWidth) {
@@ -575,16 +636,18 @@ void Viewport::updateTilesGeometry(int outerWidth) {
 		if (mouseInside) {
 			updateSelected();
 		}
-		widget()->update();
+		updateMyWidgetPart();
 	});
 
-	const auto outerHeight = widget()->height();
+	const auto outerHeight = _borrowed
+		? _borrowedGeometry.height()
+		: widget()->height();
 	if (_tiles.empty() || !outerWidth) {
 		_fullHeight = 0;
 		return;
 	}
 
-	if (wide()) {
+	if (wide() || videoStream()) {
 		updateTilesGeometryWide(outerWidth, outerHeight);
 		refreshHasTwoOrMore();
 		_fullHeight = 0;
@@ -734,13 +797,13 @@ void Viewport::updateTilesGeometryColumn(int outerWidth) {
 			top += height + st::groupCallVideoSmallSkip;
 		}
 	};
-	const auto topPeer = _large ? _large->row()->peer().get() : nullptr;
+	const auto topPeer = _large ? _large->peer().get() : nullptr;
 	const auto reorderNeeded = [&] {
 		if (!topPeer) {
 			return false;
 		}
 		for (const auto &tile : _tiles) {
-			if (tile.get() != _large && tile->row()->peer() == topPeer) {
+			if (tile.get() != _large && tile->peer() == topPeer) {
 				return (tile.get() != _tiles.front().get())
 					&& !tile->trackOrUserpicSize().isEmpty();
 			}
@@ -756,7 +819,7 @@ void Viewport::updateTilesGeometryColumn(int outerWidth) {
 		ranges::stable_partition(
 			_tilesForOrder,
 			[&](not_null<VideoTile*> tile) {
-				return (tile->row()->peer() == topPeer);
+				return (tile->peer() == topPeer);
 			});
 		for (const auto &tile : _tilesForOrder) {
 			layoutNext(tile);
@@ -777,8 +840,10 @@ void Viewport::setTileGeometry(not_null<VideoTile*> tile, QRect geometry) {
 	const auto kSmall = style::ConvertScale(240);
 	const auto &endpoint = tile->endpoint();
 	const auto forceThumbnailQuality = !wide()
+		&& !videoStream()
 		&& (ranges::count(_tiles, false, &VideoTile::hidden) > 1);
-	const auto forceFullQuality = wide() && (tile.get() == _large);
+	const auto forceFullQuality = videoStream()
+		|| (wide() && (tile.get() == _large));
 	const auto quality = forceThumbnailQuality
 		? VideoQuality::Thumbnail
 		: (forceFullQuality || min >= kMedium)
@@ -807,6 +872,9 @@ void Viewport::setSelected(Selection value) {
 }
 
 void Viewport::updateCursor() {
+	if (_borrowed) {
+		return;
+	}
 	const auto pointer = _selected.tile && (!wide() || _hasTwoOrMore);
 	widget()->setCursor(_cursorHidden
 		? Qt::BlankCursor
@@ -823,16 +891,42 @@ void Viewport::setPressed(Selection value) {
 }
 
 Ui::GL::ChosenRenderer Viewport::chooseRenderer(Ui::GL::Backend backend) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (backend == Ui::GL::Backend::QRhi) {
+		_opengl = true;
+		_qrhi = true;
+		return {
+			.renderer = std::make_unique<RendererRhi>(this),
+			.backend = Ui::GL::Backend::QRhi,
+		};
+	}
+#else
+	if (backend == Ui::GL::Backend::QRhi) {
+		return {
+			.renderer = std::make_unique<RendererSW>(this),
+			.backend = Ui::GL::Backend::QRhi,
+		};
+	}
+#endif
 	_opengl = (backend == Ui::GL::Backend::OpenGL);
 	return {
-		.renderer = (_opengl
-			? std::unique_ptr<Ui::GL::Renderer>(
-				std::make_unique<RendererGL>(this))
-			: std::make_unique<RendererSW>(this)),
+		.renderer = makeRenderer(),
 		.backend = backend,
 	};
 }
 
+std::unique_ptr<Ui::GL::Renderer> Viewport::makeRenderer() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (_qrhi) {
+		return std::make_unique<RendererRhi>(this);
+	}
+#endif
+	return _opengl
+		? std::unique_ptr<Ui::GL::Renderer>(
+			std::make_unique<RendererGL>(this))
+		: std::make_unique<RendererSW>(this);
+}
+
 bool Viewport::requireARGB32() const {
 	return !_opengl;
 }
@@ -861,8 +955,100 @@ rpl::producer<bool> Viewport::mouseInsideValue() const {
 	return _mouseInside.value();
 }
 
+void Viewport::ensureBorrowedRenderer(QOpenGLFunctions &f) {
+	Expects(_borrowed != nullptr);
+	Expects(_opengl);
+
+	if (_borrowedRenderer) {
+		return;
+	}
+	_borrowedRenderer = makeRenderer();
+	_borrowedRenderer->init(f);
+}
+
+void Viewport::ensureBorrowedCleared(QOpenGLFunctions *f) {
+	Expects(_borrowed != nullptr);
+	Expects(_opengl);
+
+	if (const auto renderer = base::take(_borrowedRenderer)) {
+		renderer->deinit(f);
+	}
+}
+
+void Viewport::borrowedPaint(QOpenGLFunctions &f) {
+	Expects(_borrowedRenderer != nullptr);
+	Expects(_opengl);
+
+	_borrowedRenderer->paint(static_cast<QOpenGLWidget*>(widget().get()), f);
+}
+
+void Viewport::ensureBorrowedRenderer() {
+	Expects(_borrowed != nullptr);
+	Expects(!_opengl);
+
+	if (_borrowedRenderer) {
+		return;
+	}
+	_borrowedRenderer = makeRenderer();
+}
+
+void Viewport::ensureBorrowedCleared() {
+	Expects(_borrowed != nullptr);
+	Expects(!_opengl);
+
+	base::take(_borrowedRenderer);
+}
+
+void Viewport::borrowedPaint(Painter &p, const QRegion &clip) {
+	Expects(_borrowedRenderer != nullptr);
+	Expects(!_opengl);
+
+	_borrowedRenderer->paintFallback(p, clip, Ui::GL::Backend::Raster);
+}
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+Ui::Rhi::Renderer *Viewport::ensureBorrowedRhi(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	Expects(_borrowed != nullptr);
+
+	if (!_borrowedRenderer) {
+		_borrowedRenderer = makeRenderer();
+	}
+	if (const auto r = dynamic_cast<Ui::Rhi::Renderer*>(
+			_borrowedRenderer.get())) {
+		r->initialize(rhi, rt, cb);
+		return r;
+	}
+	return nullptr;
+}
+
+void Viewport::borrowedPaintOffscreen(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (const auto r = ensureBorrowedRhi(rhi, rt, cb)) {
+		r->renderOffscreen(rhi, rt, cb);
+	}
+}
+
+void Viewport::borrowedPaintOnscreen(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (const auto r = ensureBorrowedRhi(rhi, rt, cb)) {
+		r->renderOnscreen(rhi, rt, cb);
+	}
+}
+#endif
+
+QPoint Viewport::borrowedOrigin() const {
+	return _borrowed ? _borrowedGeometry.topLeft() : QPoint();
+}
+
 rpl::lifetime &Viewport::lifetime() {
-	return _content->lifetime();
+	return _lifetime;
 }
 
 rpl::producer<QString> MuteButtonTooltip(not_null<GroupCall*> call) {
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport.h b/Telegram/SourceFiles/calls/group/calls_group_viewport.h
index 9d5021f85aa21c..c10a605021b79d 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport.h
@@ -10,15 +10,27 @@ For license and copyright information please follow this link:
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
 
+class Painter;
+class QOpenGLFunctions;
+class QRhi;
+class QRhiRenderTarget;
+class QRhiCommandBuffer;
+
 namespace Ui {
 class AbstractButton;
 class RpWidgetWrap;
-namespace GL {
+} // namespace Ui
+
+namespace Ui::Rhi {
+class Renderer;
+} // namespace Ui::Rhi
+
+namespace Ui::GL {
 enum class Backend;
 struct Capabilities;
 struct ChosenRenderer;
-} // namespace GL
-} // namespace Ui
+class Renderer;
+} // namespace Ui::GL
 
 namespace Calls {
 class GroupCall;
@@ -63,7 +75,9 @@ class Viewport final {
 	Viewport(
 		not_null<QWidget*> parent,
 		PanelMode mode,
-		Ui::GL::Backend backend);
+		Ui::GL::Backend backend,
+		Ui::RpWidgetWrap *borrowedRp = nullptr,
+		bool borrowedOpenGL = false);
 	~Viewport();
 
 	[[nodiscard]] not_null<QWidget*> widget() const;
@@ -93,6 +107,24 @@ class Viewport final {
 	[[nodiscard]] rpl::producer<VideoQualityRequest> qualityRequests() const;
 	[[nodiscard]] rpl::producer<bool> mouseInsideValue() const;
 
+	void ensureBorrowedRenderer(QOpenGLFunctions &f);
+	void ensureBorrowedCleared(QOpenGLFunctions *f);
+	void borrowedPaint(QOpenGLFunctions &f);
+
+	void ensureBorrowedRenderer();
+	void ensureBorrowedCleared();
+	void borrowedPaint(Painter &p, const QRegion &clip);
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	void borrowedPaintOffscreen(QRhi *rhi, QRhiRenderTarget *rt, QRhiCommandBuffer *cb);
+	void borrowedPaintOnscreen(QRhi *rhi, QRhiRenderTarget *rt, QRhiCommandBuffer *cb);
+private:
+	[[nodiscard]] Ui::Rhi::Renderer *ensureBorrowedRhi(QRhi *rhi, QRhiRenderTarget *rt, QRhiCommandBuffer *cb);
+public:
+#endif
+
+	[[nodiscard]] QPoint borrowedOrigin() const;
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 	static constexpr auto kShadowMaxAlpha = 80;
@@ -102,6 +134,7 @@ class Viewport final {
 	class VideoTile;
 	class RendererSW;
 	class RendererGL;
+	class RendererRhi;
 	using TileId = quintptr;
 
 	struct Geometry {
@@ -140,6 +173,7 @@ class Viewport final {
 
 	void setup();
 	[[nodiscard]] bool wide() const;
+	[[nodiscard]] bool videoStream() const;
 
 	void updateCursor();
 	void updateTilesGeometry();
@@ -168,11 +202,13 @@ class Viewport final {
 
 	[[nodiscard]] Ui::GL::ChosenRenderer chooseRenderer(
 		Ui::GL::Backend backend);
+	[[nodiscard]] std::unique_ptr<Ui::GL::Renderer> makeRenderer();
+	void updateMyWidgetPart();
 
 	PanelMode _mode = PanelMode();
 	bool _opengl = false;
-	bool _geometryStaleAfterModeChange = false;
-	const std::unique_ptr<Ui::RpWidgetWrap> _content;
+	bool _qrhi = false;
+	std::unique_ptr<Ui::RpWidgetWrap> _content;
 	std::vector<std::unique_ptr<VideoTile>> _tiles;
 	std::vector<not_null<VideoTile*>> _tilesForOrder;
 	rpl::variable<int> _fullHeight = 0;
@@ -194,6 +230,13 @@ class Viewport final {
 	Selection _pressed;
 	rpl::variable<bool> _mouseInside = false;
 
+	Ui::RpWidgetWrap * const _borrowed = nullptr;
+	QRect _borrowedGeometry;
+	std::unique_ptr<Ui::GL::Renderer> _borrowedRenderer;
+	QMetaObject::Connection _borrowedConnection;
+
+	rpl::lifetime _lifetime;
+
 };
 
 [[nodiscard]] QImage GenerateShadow(
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
index 9af2a36f47434e..94ce5cded80ef0 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
@@ -17,6 +17,7 @@ For license and copyright information please follow this link:
 #include "ui/painter.h"
 #include "data/data_peer.h"
 #include "styles/style_calls.h"
+#include "styles/style_media_view.h"
 
 #include <QOpenGLShader>
 
@@ -307,14 +308,12 @@ Viewport::RendererGL::RendererGL(not_null<Viewport*> owner)
 	st::radialBg) {
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_buttons.invalidate();
 	}, _lifetime);
 }
 
-void Viewport::RendererGL::init(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions &f) {
+void Viewport::RendererGL::init(QOpenGLFunctions &f) {
 	_frameBuffer.emplace();
 	_frameBuffer->setUsagePattern(QOpenGLBuffer::DynamicDraw);
 	_frameBuffer->create();
@@ -389,9 +388,7 @@ void Viewport::RendererGL::ensureARGB32Program() {
 		}));
 }
 
-void Viewport::RendererGL::deinit(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions *f) {
+void Viewport::RendererGL::deinit(QOpenGLFunctions *f) {
 	_frameBuffer = std::nullopt;
 	_frameVertexShader = nullptr;
 	_imageProgram = std::nullopt;
@@ -404,10 +401,12 @@ void Viewport::RendererGL::deinit(
 	_noiseFramebuffer.destroy(f);
 	for (auto &data : _tileData) {
 		data.textures.destroy(f);
+		data.framebuffers.destroy(f);
 	}
 	_tileData.clear();
 	_tileDataIndices.clear();
 	_buttons.destroy(f);
+	_names.destroy(f);
 }
 
 void Viewport::RendererGL::setDefaultViewport(QOpenGLFunctions &f) {
@@ -447,7 +446,7 @@ void Viewport::RendererGL::paint(
 }
 
 std::optional<QColor> Viewport::RendererGL::clearColor() {
-	return st::groupCallBg->c;
+	return _owner->videoStream() ? st::mediaviewBg->c : st::groupCallBg->c;
 }
 
 void Viewport::RendererGL::validateUserpicFrame(
@@ -461,7 +460,7 @@ void Viewport::RendererGL::validateUserpicFrame(
 	}
 	const auto size = tile->trackOrUserpicSize();
 	tileData.userpicFrame = PeerData::GenerateUserpicImage(
-		tile->row()->peer(),
+		tile->peer(),
 		tile->row()->ensureUserpicView(),
 		size.width(),
 		0);
@@ -489,7 +488,8 @@ void Viewport::RendererGL::paintTile(
 
 	_rgbaFrame = (data.format == Webrtc::FrameFormat::ARGB32)
 		|| _userpicFrame;
-	const auto geometry = tile->geometry();
+	const auto geometry = tile->geometry().translated(
+		_owner->borrowedOrigin());
 	const auto x = geometry.x();
 	const auto y = geometry.y();
 	const auto width = geometry.width();
@@ -788,12 +788,15 @@ void Viewport::RendererGL::paintTile(
 	program->setUniformValue("viewport", uniformViewport);
 	program->setUniformValue(
 		"frameBg",
-		fullscreen ? QColor(0, 0, 0) : st::groupCallBg->c);
+		fullscreen ? QColor(0, 0, 0) : *clearColor());
+	const auto radius = _owner->videoStream()
+		? st::storiesRadius
+		: st::roundRadiusLarge;
 	program->setUniformValue("radiusOutline", QVector2D(
-		GLfloat(st::roundRadiusLarge * _factor * (fullscreen ? 0. : 1.)),
+		GLfloat(radius * _factor * (fullscreen ? 0. : 1.)),
 		(outline > 0) ? (st::groupCallOutline * _factor) : 0.f));
 	program->setUniformValue("roundRect", Uniform(rect));
-	program->setUniformValue("roundBg", st::groupCallBg->c);
+	program->setUniformValue("roundBg", *clearColor());
 	program->setUniformValue("outlineFg", QVector4D(
 		st::groupCallMemberActiveIcon->c.redF(),
 		st::groupCallMemberActiveIcon->c.greenF(),
@@ -1236,7 +1239,7 @@ void Viewport::RendererGL::validateDatas() {
 			j->stale = false;
 			const auto index = (j - begin(_tileData));
 			_tileDataIndices[i] = index;
-			const auto peer = tiles[i]->row()->peer();
+			const auto peer = tiles[i]->peer();
 			if ((j->peer != peer)
 				|| (j->nameVersion != peer->nameVersion())
 				|| (j->nameRect.width() != width)) {
@@ -1260,7 +1263,7 @@ void Viewport::RendererGL::validateDatas() {
 			continue;
 		}
 		const auto id = quintptr(tiles[i]->track().get());
-		const auto peer = tiles[i]->row()->peer();
+		const auto peer = tiles[i]->peer();
 		const auto paused = (tiles[i]->track()->state()
 			== Webrtc::VideoState::Paused);
 		auto index = int(_tileData.size());
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.h b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.h
index 848174f86aaa59..6f31f2e3301f6a 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.h
@@ -28,13 +28,9 @@ class Viewport::RendererGL final : public Ui::GL::Renderer {
 public:
 	explicit RendererGL(not_null<Viewport*> owner);
 
-	void init(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions &f) override;
+	void init(QOpenGLFunctions &f) override;
 
-	void deinit(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions *f) override;
+	void deinit(QOpenGLFunctions *f) override;
 
 	void paint(
 		not_null<QOpenGLWidget*> widget,
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_raster.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_raster.cpp
index e8aa42ad810dca..9f006fa06442c0 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_raster.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_raster.cpp
@@ -37,7 +37,7 @@ Viewport::RendererSW::RendererSW(not_null<Viewport*> owner)
 }
 
 void Viewport::RendererSW::paintFallback(
-		Painter &&p,
+		Painter &p,
 		const QRegion &clip,
 		Ui::GL::Backend backend) {
 	auto bg = clip;
@@ -52,10 +52,14 @@ void Viewport::RendererSW::paintFallback(
 		}
 		paintTile(p, tile.get(), bounding, bg);
 	}
-	const auto fullscreen = _owner->_fullscreen;
-	const auto color = fullscreen ? QColor(0, 0, 0) : st::groupCallBg->c;
-	for (const auto &rect : bg) {
-		p.fillRect(rect, color);
+	if (_owner->borrowedOrigin().isNull()) {
+		const auto fullscreen = _owner->_fullscreen;
+		const auto color = fullscreen
+			? QColor(0, 0, 0)
+			: st::groupCallBg->c;
+		for (const auto &rect : bg) {
+			p.fillRect(rect, color);
+		}
 	}
 	for (auto i = _tileData.begin(); i != _tileData.end();) {
 		if (i->second.stale) {
@@ -78,7 +82,7 @@ void Viewport::RendererSW::validateUserpicFrame(
 	const auto size = tile->trackOrUserpicSize();
 	data.userpicFrame = Images::BlurLargeImage(
 		PeerData::GenerateUserpicImage(
-			tile->row()->peer(),
+			tile->peer(),
 			tile->row()->ensureUserpicView(),
 			size.width(),
 			0),
@@ -129,7 +133,8 @@ void Viewport::RendererSW::paintTile(
 	};
 
 	using namespace Media::View;
-	const auto geometry = tile->geometry();
+	const auto geometry = tile->geometry().translated(
+		_owner->borrowedOrigin());
 	const auto x = geometry.x();
 	const auto y = geometry.y();
 	const auto width = geometry.width();
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_raster.h b/Telegram/SourceFiles/calls/group/calls_group_viewport_raster.h
index 595a09b7a8c38c..3b3381c8aa8e74 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_raster.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_raster.h
@@ -20,7 +20,7 @@ class Viewport::RendererSW final : public Ui::GL::Renderer {
 	explicit RendererSW(not_null<Viewport*> owner);
 
 	void paintFallback(
-		Painter &&p,
+		Painter &p,
 		const QRegion &clip,
 		Ui::GL::Backend backend) override;
 
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_rhi.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_rhi.cpp
new file mode 100644
index 00000000000000..e34b8fa8bdabd3
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_rhi.cpp
@@ -0,0 +1,1798 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "calls/group/calls_group_viewport_rhi.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+#include "calls/group/calls_group_viewport_tile.h"
+#include "calls/group/calls_group_members_row.h"
+#include "webrtc/webrtc_video_track.h"
+#include "media/view/media_view_pip.h"
+#include "media/streaming/media_streaming_utility.h"
+#include "ui/rhi/rhi_shader.h"
+#include "ui/painter.h"
+#include "data/data_peer.h"
+#include "lang/lang_keys.h"
+#include "styles/style_calls.h"
+#include "styles/style_media_view.h"
+
+#include <rhi/qrhi.h>
+
+namespace Calls::Group {
+namespace {
+
+using namespace Ui::GL;
+
+constexpr auto kNoiseTextureSize = 256;
+constexpr auto kBlurTextureSizeFactor = 4.;
+constexpr auto kBlurOpacity = 0.65f;
+
+struct GroupFrameUniforms {
+	float viewport[2];
+	float _pad0[2];
+	float frameBg[4];
+	float shadow[4];
+	float paused;
+	float _pad1[3];
+	float roundRect[4];
+	float radiusOutline[2];
+	float _pad2[2];
+	float roundBg[4];
+	float outlineFg[4];
+};
+static_assert(sizeof(GroupFrameUniforms) == 128);
+
+struct BlurUniforms {
+	float texelOffset;
+	float _pad[3];
+};
+static_assert(sizeof(BlurUniforms) == 16);
+
+struct ImageUniforms {
+	float viewport[2];
+	float g_opacity;
+	float _pad;
+};
+static_assert(sizeof(ImageUniforms) == 16);
+
+[[nodiscard]] QShader LoadShader(const QString &name) {
+	return Ui::Rhi::ShaderFromFile(
+		u":/shaders/"_q + name + u".qsb"_q);
+}
+
+[[nodiscard]] bool UseExpandForCamera(QSize original, QSize viewport) {
+	using namespace ::Media::Streaming;
+	return DecideFrameResize(viewport, original).expanding;
+}
+
+[[nodiscard]] QSize NonEmpty(QSize size) {
+	return QSize(std::max(size.width(), 1), std::max(size.height(), 1));
+}
+
+[[nodiscard]] QSize CountBlurredSize(
+		QSize unscaled,
+		QSize outer,
+		float factor) {
+	factor *= kBlurTextureSizeFactor;
+	const auto area = outer / int(base::SafeRound(factor * cScale() / 100));
+	const auto scaled = unscaled.scaled(area, Qt::KeepAspectRatio);
+	return (scaled.width() > unscaled.width()
+		|| scaled.height() > unscaled.height())
+		? unscaled
+		: NonEmpty(scaled);
+}
+
+[[nodiscard]] QSize InterpolateScaledSize(
+		QSize unscaled,
+		QSize size,
+		float64 ratio) {
+	if (ratio == 0.) {
+		return NonEmpty(unscaled.scaled(size, Qt::KeepAspectRatio));
+	} else if (ratio == 1.) {
+		return NonEmpty(unscaled.scaled(
+			size,
+			Qt::KeepAspectRatioByExpanding));
+	}
+	const auto notExpanded = NonEmpty(unscaled.scaled(
+		size,
+		Qt::KeepAspectRatio));
+	const auto expanded = NonEmpty(unscaled.scaled(
+		size,
+		Qt::KeepAspectRatioByExpanding));
+	return QSize(
+		anim::interpolate(notExpanded.width(), expanded.width(), ratio),
+		anim::interpolate(notExpanded.height(), expanded.height(), ratio));
+}
+
+[[nodiscard]] std::array<std::array<float, 2>, 4> CountTexCoords(
+		QSize unscaled,
+		QSize size,
+		float64 expandRatio,
+		bool swap = false) {
+	const auto scaled = InterpolateScaledSize(unscaled, size, expandRatio);
+	const auto left = (size.width() - scaled.width()) / 2;
+	const auto top = (size.height() - scaled.height()) / 2;
+	auto dleft = float(left) / scaled.width();
+	auto dright = float(size.width() - left) / scaled.width();
+	auto dtop = float(top) / scaled.height();
+	auto dbottom = float(size.height() - top) / scaled.height();
+	if (swap) {
+		std::swap(dleft, dtop);
+		std::swap(dright, dbottom);
+	}
+	return { {
+		{ { -dleft, 1.f + dtop } },
+		{ { dright, 1.f + dtop } },
+		{ { dright, 1.f - dbottom } },
+		{ { -dleft, 1.f - dbottom } },
+	} };
+}
+
+} // namespace
+
+Viewport::RendererRhi::RendererRhi(not_null<Viewport*> owner)
+: _owner(owner)
+, _pinIcon(st::groupCallVideoTile.pin)
+, _muteIcon(st::groupCallVideoCrossLine)
+, _pinBackground(
+	(st::groupCallVideoTile.pinPadding.top()
+		+ st::groupCallVideoTile.pin.icon.height()
+		+ st::groupCallVideoTile.pinPadding.bottom()) / 2,
+	st::radialBg) {
+
+	style::PaletteChanged(
+	) | rpl::on_next([=] {
+		_buttons.invalidate();
+	}, _lifetime);
+}
+
+Viewport::RendererRhi::~RendererRhi() {
+	if (_initialized) {
+		releaseResources();
+	}
+}
+
+QColor Viewport::RendererRhi::rhiClearColor() {
+	return _owner->_fullscreen
+		? QColor(0, 0, 0)
+		: _owner->videoStream()
+		? st::mediaviewBg->c
+		: st::groupCallBg->c;
+}
+
+std::optional<QColor> Viewport::RendererRhi::clearColor() {
+	return rhiClearColor();
+}
+
+void Viewport::RendererRhi::initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (_initialized && _rhi == rhi) {
+		return;
+	}
+	releaseResources();
+
+	_rhi = rhi;
+	_rt = rt;
+	_cb = cb;
+
+	_offscreenVertexBuffer = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::VertexBuffer,
+		4 * 4 * sizeof(float));
+	_offscreenVertexBuffer->create();
+
+	_onscreenVertexBuffer = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::VertexBuffer,
+		kMaxOnscreenDraws * kOnscreenVertexSlot);
+	_onscreenVertexBuffer->create();
+
+	_uniformBuffer = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::UniformBuffer,
+		kMaxOnscreenDraws * kUniformSlot);
+	_uniformBuffer->create();
+
+	_linearSampler = rhi->newSampler(
+		QRhiSampler::Linear,
+		QRhiSampler::Linear,
+		QRhiSampler::None,
+		QRhiSampler::ClampToEdge,
+		QRhiSampler::ClampToEdge);
+	_linearSampler->create();
+
+	_nearestSampler = rhi->newSampler(
+		QRhiSampler::Nearest,
+		QRhiSampler::Nearest,
+		QRhiSampler::None,
+		QRhiSampler::ClampToEdge,
+		QRhiSampler::ClampToEdge);
+	_nearestSampler->create();
+
+	_noiseRepeatSampler = rhi->newSampler(
+		QRhiSampler::Nearest,
+		QRhiSampler::Nearest,
+		QRhiSampler::None,
+		QRhiSampler::Repeat,
+		QRhiSampler::Repeat);
+	_noiseRepeatSampler->create();
+
+	_placeholderTexture = rhi->newTexture(QRhiTexture::RGBA8, QSize(1, 1));
+	_placeholderTexture->create();
+
+	createPipelines();
+	_initialized = true;
+}
+
+void Viewport::RendererRhi::createPipelines() {
+	const auto rpDesc = _rt->renderPassDescriptor();
+
+	const auto passthroughVert = LoadShader(u"passthrough.vert"_q);
+	const auto argb32Vert = LoadShader(u"argb32.vert"_q);
+	const auto groupFrameVert = LoadShader(u"group_frame.vert"_q);
+	const auto argb32Frag = LoadShader(u"argb32.frag"_q);
+	const auto yuv420Frag = LoadShader(u"yuv420.frag"_q);
+	const auto blurHFrag = LoadShader(u"blur_h.frag"_q);
+	const auto blurVFrag = LoadShader(u"blur_v.frag"_q);
+	const auto groupFrameFrag = LoadShader(u"group_frame.frag"_q);
+	const auto controlsFrag = LoadShader(u"controls.frag"_q);
+
+	QRhiVertexInputLayout passthroughLayout;
+	passthroughLayout.setBindings({ { 4 * sizeof(float) } });
+	passthroughLayout.setAttributes({
+		{ 0, 0, QRhiVertexInputAttribute::Float2, 0 },
+		{ 0, 1, QRhiVertexInputAttribute::Float2, 2 * sizeof(float) },
+	});
+
+	QRhiVertexInputLayout argb32Layout;
+	argb32Layout.setBindings({ { 4 * sizeof(float) } });
+	argb32Layout.setAttributes({
+		{ 0, 0, QRhiVertexInputAttribute::Float2, 0 },
+		{ 0, 1, QRhiVertexInputAttribute::Float2, 2 * sizeof(float) },
+	});
+
+	QRhiVertexInputLayout groupFrameLayout;
+	groupFrameLayout.setBindings({ { 6 * sizeof(float) } });
+	groupFrameLayout.setAttributes({
+		{ 0, 0, QRhiVertexInputAttribute::Float2, 0 },
+		{ 0, 1, QRhiVertexInputAttribute::Float2, 2 * sizeof(float) },
+		{ 0, 2, QRhiVertexInputAttribute::Float2, 4 * sizeof(float) },
+	});
+
+	_downscaleArgb32Srb = _rhi->newShaderResourceBindings();
+	_downscaleArgb32Srb->setBindings({
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_linearSampler),
+	});
+	_downscaleArgb32Srb->create();
+
+	_downscaleYuv420Srb = _rhi->newShaderResourceBindings();
+	_downscaleYuv420Srb->setBindings({
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_linearSampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_linearSampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			3,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_linearSampler),
+	});
+	_downscaleYuv420Srb->create();
+
+	_blurHSrb = _rhi->newShaderResourceBindings();
+	_blurHSrb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			0,
+			sizeof(BlurUniforms)),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_nearestSampler),
+	});
+	_blurHSrb->create();
+
+	{
+		auto *tex = _rhi->newTexture(
+			QRhiTexture::RGBA8,
+			QSize(1, 1),
+			1,
+			QRhiTexture::RenderTarget);
+		tex->create();
+		auto colorAtt = QRhiColorAttachment(tex);
+		auto *offscreenRT = _rhi->newTextureRenderTarget(
+			QRhiTextureRenderTargetDescription(colorAtt));
+		_offscreenRpDesc = offscreenRT->newCompatibleRenderPassDescriptor();
+		offscreenRT->setRenderPassDescriptor(_offscreenRpDesc);
+		offscreenRT->create();
+		delete offscreenRT;
+		delete tex;
+	}
+
+	_downscaleArgb32Pipeline = _rhi->newGraphicsPipeline();
+	_downscaleArgb32Pipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, passthroughVert },
+		{ QRhiShaderStage::Fragment, argb32Frag },
+	});
+	_downscaleArgb32Pipeline->setVertexInputLayout(passthroughLayout);
+	_downscaleArgb32Pipeline->setTopology(
+		QRhiGraphicsPipeline::TriangleStrip);
+	_downscaleArgb32Pipeline->setShaderResourceBindings(_downscaleArgb32Srb);
+	_downscaleArgb32Pipeline->setRenderPassDescriptor(_offscreenRpDesc);
+	_downscaleArgb32Pipeline->create();
+
+	_downscaleYuv420Pipeline = _rhi->newGraphicsPipeline();
+	_downscaleYuv420Pipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, passthroughVert },
+		{ QRhiShaderStage::Fragment, yuv420Frag },
+	});
+	_downscaleYuv420Pipeline->setVertexInputLayout(passthroughLayout);
+	_downscaleYuv420Pipeline->setTopology(
+		QRhiGraphicsPipeline::TriangleStrip);
+	_downscaleYuv420Pipeline->setShaderResourceBindings(
+		_downscaleYuv420Srb);
+	_downscaleYuv420Pipeline->setRenderPassDescriptor(_offscreenRpDesc);
+	_downscaleYuv420Pipeline->create();
+
+	_blurHPipeline = _rhi->newGraphicsPipeline();
+	_blurHPipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, passthroughVert },
+		{ QRhiShaderStage::Fragment, blurHFrag },
+	});
+	_blurHPipeline->setVertexInputLayout(passthroughLayout);
+	_blurHPipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip);
+	_blurHPipeline->setShaderResourceBindings(_blurHSrb);
+	_blurHPipeline->setRenderPassDescriptor(_offscreenRpDesc);
+	_blurHPipeline->create();
+
+	_blurVPipeline = _rhi->newGraphicsPipeline();
+	_blurVPipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, passthroughVert },
+		{ QRhiShaderStage::Fragment, blurVFrag },
+	});
+	_blurVPipeline->setVertexInputLayout(passthroughLayout);
+	_blurVPipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip);
+	_blurVPipeline->setShaderResourceBindings(_blurHSrb);
+	_blurVPipeline->setRenderPassDescriptor(_offscreenRpDesc);
+	_blurVPipeline->create();
+
+	auto *frameSrb = _rhi->newShaderResourceBindings();
+	frameSrb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			0,
+			sizeof(GroupFrameUniforms)),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_linearSampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_linearSampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			3,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_noiseRepeatSampler),
+	});
+	frameSrb->create();
+	_perDrawSrbs.push_back(frameSrb);
+
+	_framePipeline = _rhi->newGraphicsPipeline();
+	_framePipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, groupFrameVert },
+		{ QRhiShaderStage::Fragment, groupFrameFrag },
+	});
+	_framePipeline->setVertexInputLayout(groupFrameLayout);
+	_framePipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip);
+	_framePipeline->setShaderResourceBindings(frameSrb);
+	_framePipeline->setRenderPassDescriptor(rpDesc);
+	_framePipeline->create();
+
+	auto *controlsSrb = _rhi->newShaderResourceBindings();
+	controlsSrb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			0,
+			sizeof(ImageUniforms)),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_linearSampler),
+	});
+	controlsSrb->create();
+	_perDrawSrbs.push_back(controlsSrb);
+
+	QRhiGraphicsPipeline::TargetBlend blend;
+	blend.enable = true;
+	blend.srcColor = QRhiGraphicsPipeline::One;
+	blend.dstColor = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+	blend.srcAlpha = QRhiGraphicsPipeline::One;
+	blend.dstAlpha = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+
+	_controlsPipeline = _rhi->newGraphicsPipeline();
+	_controlsPipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, argb32Vert },
+		{ QRhiShaderStage::Fragment, controlsFrag },
+	});
+	_controlsPipeline->setVertexInputLayout(argb32Layout);
+	_controlsPipeline->setTargetBlends({ blend });
+	_controlsPipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip);
+	_controlsPipeline->setShaderResourceBindings(controlsSrb);
+	_controlsPipeline->setRenderPassDescriptor(rpDesc);
+	_controlsPipeline->create();
+}
+
+void Viewport::RendererRhi::releaseResources() {
+	for (auto *srb : _perDrawSrbs) {
+		delete srb;
+	}
+	_perDrawSrbs.clear();
+
+	for (auto &entry : _texturePool) {
+		delete entry.texture;
+	}
+	_texturePool.clear();
+
+	for (auto &data : _tileData) {
+		delete data.rgbaTexture;
+		delete data.yTexture;
+		delete data.uTexture;
+		delete data.vTexture;
+		delete data.convertedTexture;
+		delete data.convertedRpDesc;
+		delete data.convertedRt;
+		delete data.downscaleTexture;
+		delete data.downscaleRpDesc;
+		delete data.downscaleRt;
+		delete data.blurHTexture;
+		delete data.blurHRpDesc;
+		delete data.blurHRt;
+		delete data.blurVTexture;
+		delete data.blurVRpDesc;
+		delete data.blurVRt;
+	}
+	_tileData.clear();
+	_tileDataIndices.clear();
+
+	delete _downscaleArgb32Pipeline; _downscaleArgb32Pipeline = nullptr;
+	delete _downscaleYuv420Pipeline; _downscaleYuv420Pipeline = nullptr;
+	delete _blurHPipeline; _blurHPipeline = nullptr;
+	delete _blurVPipeline; _blurVPipeline = nullptr;
+	delete _framePipeline; _framePipeline = nullptr;
+	delete _controlsPipeline; _controlsPipeline = nullptr;
+
+	delete _downscaleArgb32Srb; _downscaleArgb32Srb = nullptr;
+	delete _downscaleYuv420Srb; _downscaleYuv420Srb = nullptr;
+	delete _blurHSrb; _blurHSrb = nullptr;
+
+	delete _offscreenRpDesc; _offscreenRpDesc = nullptr;
+	delete _noiseTexture; _noiseTexture = nullptr;
+	delete _offscreenVertexBuffer; _offscreenVertexBuffer = nullptr;
+	delete _onscreenVertexBuffer; _onscreenVertexBuffer = nullptr;
+	delete _uniformBuffer; _uniformBuffer = nullptr;
+	delete _linearSampler; _linearSampler = nullptr;
+	delete _nearestSampler; _nearestSampler = nullptr;
+	delete _noiseRepeatSampler; _noiseRepeatSampler = nullptr;
+	delete _placeholderTexture; _placeholderTexture = nullptr;
+
+	_buttons.destroy();
+	_names.destroy();
+
+	_initialized = false;
+}
+
+QRhiTexture *Viewport::RendererRhi::acquirePoolTexture(QSize size) {
+	if (_nextPoolIndex < int(_texturePool.size())) {
+		auto &entry = _texturePool[_nextPoolIndex++];
+		if (entry.size == size) {
+			return entry.texture;
+		}
+		delete entry.texture;
+		entry.texture = _rhi->newTexture(QRhiTexture::BGRA8, size);
+		entry.texture->create();
+		entry.size = size;
+		return entry.texture;
+	}
+	auto *tex = _rhi->newTexture(QRhiTexture::BGRA8, size);
+	tex->create();
+	_texturePool.push_back({ tex, size });
+	_nextPoolIndex++;
+	return tex;
+}
+
+void Viewport::RendererRhi::render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	renderOffscreen(rhi, rt, cb);
+
+	_nextOnscreenSlot = 0;
+	_onscreenDraws.clear();
+	auto *screenRub = _rhi->nextResourceUpdateBatch();
+	if (_rub) {
+		screenRub->merge(_rub);
+	}
+	_rub = screenRub;
+	renderOnscreen(rhi, rt, cb);
+	cb->beginPass(rt, *clearColor(), { 1.0f, 0 }, _rub);
+	_rub = nullptr;
+	const auto pw = float(rt->pixelSize().width());
+	const auto ph = float(rt->pixelSize().height());
+	for (const auto &draw : _onscreenDraws) {
+		cb->setGraphicsPipeline(draw.pipeline);
+		cb->setShaderResources(draw.srb);
+		cb->setViewport({ 0, 0, pw, ph });
+		const QRhiCommandBuffer::VertexInput vbuf(
+			_onscreenVertexBuffer, draw.vertexOffset);
+		cb->setVertexInput(0, 1, &vbuf);
+		cb->draw(4);
+	}
+	_onscreenDraws.clear();
+	cb->endPass();
+}
+
+void Viewport::RendererRhi::renderOffscreen(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	_rhi = rhi;
+	_rt = rt;
+	_cb = cb;
+	_nextPoolIndex = 0;
+
+	const auto size = rt->pixelSize();
+	const auto factor = float(_owner->widget()->devicePixelRatioF());
+	if (_factor != factor) {
+		_factor = factor;
+		_ifactor = int(std::ceil(factor));
+		_buttons.invalidate();
+	}
+	_viewport = QSize(
+		int(size.width() / _factor),
+		int(size.height() / _factor));
+
+	validateDatas();
+	ensureNoiseTexture();
+
+	for (auto *srb : _perDrawSrbs) {
+		delete srb;
+	}
+	_perDrawSrbs.clear();
+
+	auto index = 0;
+	for (const auto &tile : _owner->_tiles) {
+		if (!tile->visible()) {
+			index++;
+			continue;
+		}
+		paintTileOffscreen(
+			tile.get(),
+			_tileData[_tileDataIndices[index++]]);
+	}
+}
+
+void Viewport::RendererRhi::renderOnscreen(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	_rhi = rhi;
+	_rt = rt;
+	_cb = cb;
+
+	const auto pw = float(rt->pixelSize().width());
+	const auto ph = float(rt->pixelSize().height());
+
+	auto index = 0;
+	for (const auto &tile : _owner->_tiles) {
+		if (!tile->visible()) {
+			index++;
+			continue;
+		}
+		paintTileOnscreen(
+			tile.get(),
+			_tileData[_tileDataIndices[index++]],
+			pw, ph);
+	}
+}
+
+void Viewport::RendererRhi::ensureNoiseTexture() {
+	if (_noiseTexture) {
+		return;
+	}
+
+	auto noiseImage = QImage(
+		kNoiseTextureSize,
+		kNoiseTextureSize,
+		QImage::Format_ARGB32_Premultiplied);
+	noiseImage.fill(Qt::transparent);
+
+	_noiseTexture = _rhi->newTexture(
+		QRhiTexture::RGBA8,
+		QSize(kNoiseTextureSize, kNoiseTextureSize));
+	_noiseTexture->create();
+
+	const auto fade = [](float t) {
+		return t * t * t * (t * (t * 6.f - 15.f) + 10.f);
+	};
+	const auto rnm = [](float x, float y) {
+		const auto noise = std::sin(
+			x * 12.9898f + y * 78.233f) * 43758.5453f;
+		return std::array<float, 4>{
+			std::fmod(noise, 1.f) * 2.f - 1.f,
+			std::fmod(noise * 1.2154f, 1.f) * 2.f - 1.f,
+			std::fmod(noise * 1.3453f, 1.f) * 2.f - 1.f,
+			std::fmod(noise * 1.4651f, 1.f) * 2.f - 1.f,
+		};
+	};
+	const auto pnoise3D = [&](float px, float py, float pz) {
+		const auto unit = 1.f / 256.f;
+		const auto half = 0.5f / 256.f;
+		const auto pix = unit * std::floor(px) + half;
+		const auto piy = unit * std::floor(py) + half;
+		const auto piz = unit * std::floor(pz) + half;
+		const auto pfx = px - std::floor(px);
+		const auto pfy = py - std::floor(py);
+		const auto pfz = pz - std::floor(pz);
+		const auto perm00 = rnm(pix, piy)[3];
+		const auto g000 = rnm(perm00, piz);
+		const auto n000 = g000[0]*pfx + g000[1]*pfy + g000[2]*pfz;
+		const auto g001 = rnm(perm00, piz + unit);
+		const auto n001 = g001[0]*pfx + g001[1]*pfy
+			+ g001[2]*(pfz - 1.f);
+		const auto perm01 = rnm(pix, piy + unit)[3];
+		const auto g010 = rnm(perm01, piz);
+		const auto n010 = g010[0]*pfx + g010[1]*(pfy - 1.f)
+			+ g010[2]*pfz;
+		const auto g011 = rnm(perm01, piz + unit);
+		const auto n011 = g011[0]*pfx + g011[1]*(pfy - 1.f)
+			+ g011[2]*(pfz - 1.f);
+		const auto perm10 = rnm(pix + unit, piy)[3];
+		const auto g100 = rnm(perm10, piz);
+		const auto n100 = g100[0]*(pfx - 1.f) + g100[1]*pfy
+			+ g100[2]*pfz;
+		const auto g101 = rnm(perm10, piz + unit);
+		const auto n101 = g101[0]*(pfx - 1.f) + g101[1]*pfy
+			+ g101[2]*(pfz - 1.f);
+		const auto perm11 = rnm(pix + unit, piy + unit)[3];
+		const auto g110 = rnm(perm11, piz);
+		const auto n110 = g110[0]*(pfx - 1.f) + g110[1]*(pfy - 1.f)
+			+ g110[2]*pfz;
+		const auto g111 = rnm(perm11, piz + unit);
+		const auto n111 = g111[0]*(pfx - 1.f) + g111[1]*(pfy - 1.f)
+			+ g111[2]*(pfz - 1.f);
+		const auto fx = fade(pfx);
+		const auto fy = fade(pfy);
+		const auto fz = fade(pfz);
+		const auto nx0 = n000 + (n100 - n000) * fx;
+		const auto nx1 = n001 + (n101 - n001) * fx;
+		const auto nx2 = n010 + (n110 - n010) * fx;
+		const auto nx3 = n011 + (n111 - n011) * fx;
+		const auto nxy0 = nx0 + (nx2 - nx0) * fy;
+		const auto nxy1 = nx1 + (nx3 - nx1) * fy;
+		return nxy0 + (nxy1 - nxy0) * fz;
+	};
+
+	constexpr auto grainsize = 1.3f;
+	constexpr auto rotation = 1.425f;
+	const auto sinR = std::sin(rotation);
+	const auto cosR = std::cos(rotation);
+
+	auto *noiseData = noiseImage.bits();
+	for (int py = 0; py < kNoiseTextureSize; ++py) {
+		for (int px = 0; px < kNoiseTextureSize; ++px) {
+			auto tx = float(px) / grainsize;
+			auto ty = float(py) / grainsize;
+			tx -= 0.5f * kNoiseTextureSize / grainsize;
+			ty -= 0.5f * kNoiseTextureSize / grainsize;
+			const auto rx = tx * cosR - ty * sinR;
+			const auto ry = tx * sinR + ty * cosR;
+			tx = rx + 0.5f * kNoiseTextureSize / grainsize;
+			ty = ry + 0.5f * kNoiseTextureSize / grainsize;
+			const auto noise = pnoise3D(tx, ty, 0.f) * 0.5f + 0.5f;
+			const auto v = quint8(std::clamp(noise, 0.f, 1.f) * 255.f);
+			auto *pixel = noiseData
+				+ (py * noiseImage.bytesPerLine())
+				+ (px * 4);
+			pixel[0] = v;
+			pixel[1] = v;
+			pixel[2] = v;
+			pixel[3] = 255;
+		}
+	}
+	_rub = _rhi->nextResourceUpdateBatch();
+	_rub->uploadTexture(
+		_noiseTexture,
+		QRhiTextureUploadDescription(
+			QRhiTextureUploadEntry(0, 0,
+				QRhiTextureSubresourceUploadDescription(noiseImage))));
+}
+
+void Viewport::RendererRhi::paintTileOffscreen(
+		not_null<VideoTile*> tile,
+		TileData &tileData) {
+	const auto track = tile->track();
+	const auto markGuard = gsl::finally([&] {
+		tile->track()->markFrameShown();
+	});
+	const auto data = track->frameWithInfo(false);
+	_userpicFrame = (data.format == Webrtc::FrameFormat::None);
+	validateUserpicFrame(tile, tileData);
+	const auto frameSize = _userpicFrame
+		? tileData.userpicFrame.size()
+		: data.yuv420
+		? data.yuv420->size
+		: data.original.size();
+	if (frameSize.isEmpty()) {
+		return;
+	}
+
+	_rgbaFrame = (data.format == Webrtc::FrameFormat::ARGB32)
+		|| _userpicFrame;
+
+	const auto geometry = tile->geometry().translated(
+		_owner->borrowedOrigin());
+	const auto unscaled = Media::View::FlipSizeByRotation(
+		frameSize,
+		_userpicFrame ? 0 : data.rotation);
+
+	validateOutlineAnimation(tile, tileData);
+	validatePausedAnimation(tile, tileData);
+
+	const auto blurSize = CountBlurredSize(
+		unscaled,
+		geometry.size(),
+		_factor);
+
+	uploadFrame(data, tileData);
+	if (!_rgbaFrame) {
+		drawYuv2RgbPass(tileData, frameSize);
+	}
+	prepareOffscreenTargets(tileData, blurSize);
+	drawDownscalePass(tileData, blurSize);
+	drawBlurPass(tileData, blurSize);
+}
+
+void Viewport::RendererRhi::paintTileOnscreen(
+		not_null<VideoTile*> tile,
+		TileData &tileData,
+		float pw,
+		float ph) {
+	const auto data = tile->track()->frameWithInfo(false);
+	_userpicFrame = (data.format == Webrtc::FrameFormat::None);
+	const auto frameSize = _userpicFrame
+		? tileData.userpicFrame.size()
+		: data.yuv420
+		? data.yuv420->size
+		: data.original.size();
+	if (frameSize.isEmpty()) {
+		return;
+	}
+	const auto frameRotation = _userpicFrame ? 0 : data.rotation;
+	_rgbaFrame = (data.format == Webrtc::FrameFormat::ARGB32)
+		|| _userpicFrame;
+
+	const auto geometry = tile->geometry().translated(
+		_owner->borrowedOrigin());
+	const auto unscaled = Media::View::FlipSizeByRotation(
+		frameSize,
+		frameRotation);
+	const auto blurSize = CountBlurredSize(
+		unscaled,
+		geometry.size(),
+		_factor);
+
+	drawFramePass(tile, tileData, blurSize);
+	drawControls(tile, tileData);
+}
+
+void Viewport::RendererRhi::uploadFrame(
+		const Webrtc::FrameWithInfo &data,
+		TileData &tileData) {
+	const auto imageIndex = _userpicFrame ? 0 : (data.index + 1);
+	const auto upload = (tileData.trackIndex != imageIndex);
+	tileData.trackIndex = imageIndex;
+	if (!upload) {
+		return;
+	}
+
+	_rub = _rhi->nextResourceUpdateBatch();
+
+	if (_rgbaFrame) {
+		const auto &image = _userpicFrame
+			? tileData.userpicFrame
+			: data.original;
+		if (!tileData.rgbaTexture
+			|| tileData.rgbaSize != image.size()) {
+			delete tileData.rgbaTexture;
+			tileData.rgbaTexture = _rhi->newTexture(
+				QRhiTexture::BGRA8, image.size());
+			tileData.rgbaTexture->create();
+			tileData.rgbaSize = image.size();
+		}
+		_rub->uploadTexture(
+			tileData.rgbaTexture,
+			QRhiTextureUploadDescription(
+				QRhiTextureUploadEntry(0, 0,
+					QRhiTextureSubresourceUploadDescription(image))));
+	} else {
+		const auto yuv = data.yuv420;
+		if (!tileData.yTexture || tileData.lumaSize != yuv->size) {
+			delete tileData.yTexture;
+			tileData.yTexture = _rhi->newTexture(
+				QRhiTexture::R8, yuv->size);
+			tileData.yTexture->create();
+			tileData.lumaSize = yuv->size;
+		}
+		auto yDesc = QRhiTextureSubresourceUploadDescription(
+			yuv->y.data,
+			yuv->y.stride * yuv->size.height());
+		yDesc.setDataStride(yuv->y.stride);
+		_rub->uploadTexture(
+			tileData.yTexture,
+			QRhiTextureUploadDescription(
+				QRhiTextureUploadEntry(0, 0, yDesc)));
+
+		if (!tileData.uTexture
+			|| tileData.chromaSize != yuv->chromaSize) {
+			delete tileData.uTexture;
+			tileData.uTexture = _rhi->newTexture(
+				QRhiTexture::R8, yuv->chromaSize);
+			tileData.uTexture->create();
+			delete tileData.vTexture;
+			tileData.vTexture = _rhi->newTexture(
+				QRhiTexture::R8, yuv->chromaSize);
+			tileData.vTexture->create();
+			tileData.chromaSize = yuv->chromaSize;
+		}
+		auto uDesc = QRhiTextureSubresourceUploadDescription(
+			yuv->u.data,
+			yuv->u.stride * yuv->chromaSize.height());
+		uDesc.setDataStride(yuv->u.stride);
+		_rub->uploadTexture(
+			tileData.uTexture,
+			QRhiTextureUploadDescription(
+				QRhiTextureUploadEntry(0, 0, uDesc)));
+		auto vDesc = QRhiTextureSubresourceUploadDescription(
+			yuv->v.data,
+			yuv->v.stride * yuv->chromaSize.height());
+		vDesc.setDataStride(yuv->v.stride);
+		_rub->uploadTexture(
+			tileData.vTexture,
+			QRhiTextureUploadDescription(
+				QRhiTextureUploadEntry(0, 0, vDesc)));
+	}
+}
+
+void Viewport::RendererRhi::prepareOffscreenTargets(
+		TileData &tileData,
+		QSize blurSize) {
+	if (tileData.blurSize == blurSize
+		&& tileData.downscaleRt
+		&& tileData.blurHRt
+		&& tileData.blurVRt) {
+		return;
+	}
+	tileData.blurSize = blurSize;
+
+	const auto createOffscreenRT = [&](
+			QRhiTexture *&tex,
+			QRhiTextureRenderTarget *&rt,
+			QRhiRenderPassDescriptor *&rpDesc) {
+		delete rt;
+		delete rpDesc;
+		delete tex;
+		tex = _rhi->newTexture(
+			QRhiTexture::RGBA8, blurSize, 1, QRhiTexture::RenderTarget);
+		tex->create();
+		auto colorAtt = QRhiColorAttachment(tex);
+		rt = _rhi->newTextureRenderTarget(
+			QRhiTextureRenderTargetDescription(colorAtt));
+		rpDesc = rt->newCompatibleRenderPassDescriptor();
+		rt->setRenderPassDescriptor(rpDesc);
+		rt->create();
+	};
+	createOffscreenRT(
+		tileData.downscaleTexture,
+		tileData.downscaleRt,
+		tileData.downscaleRpDesc);
+	createOffscreenRT(
+		tileData.blurHTexture,
+		tileData.blurHRt,
+		tileData.blurHRpDesc);
+	createOffscreenRT(
+		tileData.blurVTexture,
+		tileData.blurVRt,
+		tileData.blurVRpDesc);
+}
+
+void Viewport::RendererRhi::drawYuv2RgbPass(
+		TileData &tileData,
+		QSize frameSize) {
+	if (!tileData.convertedTexture
+		|| tileData.convertedSize != frameSize) {
+		delete tileData.convertedRt;
+		delete tileData.convertedRpDesc;
+		delete tileData.convertedTexture;
+		tileData.convertedTexture = _rhi->newTexture(
+			QRhiTexture::RGBA8,
+			frameSize,
+			1,
+			QRhiTexture::RenderTarget);
+		tileData.convertedTexture->create();
+		auto colorAtt = QRhiColorAttachment(tileData.convertedTexture);
+		tileData.convertedRt = _rhi->newTextureRenderTarget(
+			QRhiTextureRenderTargetDescription(colorAtt));
+		tileData.convertedRpDesc =
+			tileData.convertedRt->newCompatibleRenderPassDescriptor();
+		tileData.convertedRt->setRenderPassDescriptor(
+			tileData.convertedRpDesc);
+		tileData.convertedRt->create();
+		tileData.convertedSize = frameSize;
+	}
+
+	const auto coords = _rhi->isYUpInFramebuffer() ? std::array{
+		-1.f, -1.f, 0.f, 0.f,
+		 1.f, -1.f, 1.f, 0.f,
+		-1.f,  1.f, 0.f, 1.f,
+		 1.f,  1.f, 1.f, 1.f,
+	} : std::array{
+		-1.f, -1.f, 0.f, 1.f,
+		 1.f, -1.f, 1.f, 1.f,
+		-1.f,  1.f, 0.f, 0.f,
+		 1.f,  1.f, 1.f, 0.f,
+	};
+
+	if (!_rub) {
+		_rub = _rhi->nextResourceUpdateBatch();
+	}
+	_rub->updateDynamicBuffer(
+		_offscreenVertexBuffer, 0, coords.size(), coords.data());
+
+	auto *srb = _rhi->newShaderResourceBindings();
+	_perDrawSrbs.push_back(srb);
+	srb->setBindings({
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			tileData.yTexture,
+			_linearSampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::FragmentStage,
+			tileData.uTexture,
+			_linearSampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			3,
+			QRhiShaderResourceBinding::FragmentStage,
+			tileData.vTexture,
+			_linearSampler),
+	});
+	srb->create();
+
+	_cb->beginPass(
+		tileData.convertedRt, Qt::black, { 1.0f, 0 }, _rub);
+	_rub = nullptr;
+	_cb->setGraphicsPipeline(_downscaleYuv420Pipeline);
+	_cb->setShaderResources(srb);
+	_cb->setViewport({
+		0, 0, float(frameSize.width()), float(frameSize.height()) });
+	const QRhiCommandBuffer::VertexInput vbuf(
+		_offscreenVertexBuffer, 0);
+	_cb->setVertexInput(0, 1, &vbuf);
+	_cb->draw(4);
+	_cb->endPass();
+}
+
+void Viewport::RendererRhi::drawDownscalePass(
+		TileData &tileData,
+		QSize blurSize) {
+	const float w = float(blurSize.width());
+	const float h = float(blurSize.height());
+	const float coords[] = {
+		-1.f, -1.f, 0.f, 1.f,
+		 1.f, -1.f, 1.f, 1.f,
+		-1.f,  1.f, 0.f, 0.f,
+		 1.f,  1.f, 1.f, 0.f,
+	};
+
+	if (!_rub) {
+		_rub = _rhi->nextResourceUpdateBatch();
+	}
+	_rub->updateDynamicBuffer(
+		_offscreenVertexBuffer, 0, sizeof(coords), coords);
+
+	auto *srb = _rhi->newShaderResourceBindings();
+	_perDrawSrbs.push_back(srb);
+
+	// After drawYuv2RgbPass, YUV420 frames have convertedTexture (RGBA).
+	// Use ARGB32 pipeline for both cases in the downscale pass.
+	auto *srcTexture = _rgbaFrame
+		? tileData.rgbaTexture
+		: tileData.convertedTexture;
+	srb->setBindings({
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			srcTexture,
+			_linearSampler),
+	});
+	srb->create();
+
+	_cb->beginPass(tileData.downscaleRt, Qt::black, { 1.0f, 0 }, _rub);
+	_rub = nullptr;
+	_cb->setGraphicsPipeline(_downscaleArgb32Pipeline);
+	_cb->setShaderResources(srb);
+	_cb->setViewport({ 0, 0, w, h });
+	const QRhiCommandBuffer::VertexInput vbuf(
+		_offscreenVertexBuffer, 0);
+	_cb->setVertexInput(0, 1, &vbuf);
+	_cb->draw(4);
+	_cb->endPass();
+}
+
+void Viewport::RendererRhi::drawBlurPass(
+		TileData &tileData,
+		QSize blurSize) {
+	const float w = float(blurSize.width());
+	const float h = float(blurSize.height());
+	const float coords[] = {
+		-1.f, -1.f, 0.f, 1.f,
+		 1.f, -1.f, 1.f, 1.f,
+		-1.f,  1.f, 0.f, 0.f,
+		 1.f,  1.f, 1.f, 0.f,
+	};
+
+	{
+		BlurUniforms blurUniforms{};
+		blurUniforms.texelOffset = 1.f / w;
+		auto *rub = _rhi->nextResourceUpdateBatch();
+		rub->updateDynamicBuffer(
+			_offscreenVertexBuffer, 0, sizeof(coords), coords);
+		rub->updateDynamicBuffer(
+			_uniformBuffer, 0, sizeof(blurUniforms), &blurUniforms);
+
+		auto *srb = _rhi->newShaderResourceBindings();
+		_perDrawSrbs.push_back(srb);
+		srb->setBindings({
+			QRhiShaderResourceBinding::uniformBuffer(
+				0,
+				QRhiShaderResourceBinding::FragmentStage,
+				_uniformBuffer, 0, sizeof(BlurUniforms)),
+			QRhiShaderResourceBinding::sampledTexture(
+				1,
+				QRhiShaderResourceBinding::FragmentStage,
+				tileData.downscaleTexture,
+				_nearestSampler),
+		});
+		srb->create();
+
+		_cb->beginPass(
+			tileData.blurHRt, Qt::black, { 1.0f, 0 }, rub);
+		_cb->setGraphicsPipeline(_blurHPipeline);
+		_cb->setShaderResources(srb);
+		_cb->setViewport({ 0, 0, w, h });
+		const QRhiCommandBuffer::VertexInput vbuf(
+			_offscreenVertexBuffer, 0);
+		_cb->setVertexInput(0, 1, &vbuf);
+		_cb->draw(4);
+		_cb->endPass();
+	}
+
+	{
+		BlurUniforms blurUniforms{};
+		blurUniforms.texelOffset = 1.f / h;
+		auto *rub = _rhi->nextResourceUpdateBatch();
+		rub->updateDynamicBuffer(
+			_offscreenVertexBuffer, 0, sizeof(coords), coords);
+		rub->updateDynamicBuffer(
+			_uniformBuffer, 0, sizeof(blurUniforms), &blurUniforms);
+
+		auto *srb = _rhi->newShaderResourceBindings();
+		_perDrawSrbs.push_back(srb);
+		srb->setBindings({
+			QRhiShaderResourceBinding::uniformBuffer(
+				0,
+				QRhiShaderResourceBinding::FragmentStage,
+				_uniformBuffer, 0, sizeof(BlurUniforms)),
+			QRhiShaderResourceBinding::sampledTexture(
+				1,
+				QRhiShaderResourceBinding::FragmentStage,
+				tileData.blurHTexture,
+				_nearestSampler),
+		});
+		srb->create();
+
+		_cb->beginPass(
+			tileData.blurVRt, Qt::black, { 1.0f, 0 }, rub);
+		_cb->setGraphicsPipeline(_blurVPipeline);
+		_cb->setShaderResources(srb);
+		_cb->setViewport({ 0, 0, w, h });
+		const QRhiCommandBuffer::VertexInput vbuf(
+			_offscreenVertexBuffer, 0);
+		_cb->setVertexInput(0, 1, &vbuf);
+		_cb->draw(4);
+		_cb->endPass();
+	}
+}
+
+void Viewport::RendererRhi::drawFramePass(
+		not_null<VideoTile*> tile,
+		TileData &tileData,
+		QSize blurSize) {
+	const auto geometry = tile->geometry().translated(
+		_owner->borrowedOrigin());
+
+	const auto data = tile->track()->frameWithInfo(false);
+	const auto frameSize = _userpicFrame
+		? tileData.userpicFrame.size()
+		: data.yuv420
+		? data.yuv420->size
+		: data.original.size();
+	if (frameSize.isEmpty()) {
+		return;
+	}
+	const auto frameRotation = _userpicFrame ? 0 : data.rotation;
+	const auto unscaled = Media::View::FlipSizeByRotation(
+		frameSize,
+		frameRotation);
+	const auto tileSize = geometry.size();
+	const auto swap = (((frameRotation / 90) % 2) == 1);
+	const auto expand = isExpanded(tile, unscaled, tileSize);
+	const auto animation = tile->animation();
+	const auto expandRatio = (animation.ratio >= 0.)
+		? countExpandRatio(tile, unscaled, animation)
+		: expand
+		? 1.
+		: 0.;
+
+	auto texCoords = CountTexCoords(unscaled, tileSize, expandRatio, swap);
+	auto blurTexCoords = (expandRatio == 1. && !swap)
+		? texCoords
+		: CountTexCoords(unscaled, tileSize, 1.);
+
+	if (tile->mirror()) {
+		std::swap(texCoords[0], texCoords[1]);
+		std::swap(texCoords[2], texCoords[3]);
+		std::swap(blurTexCoords[0], blurTexCoords[1]);
+		std::swap(blurTexCoords[2], blurTexCoords[3]);
+	}
+	if (const auto shift = (frameRotation / 90); shift > 0) {
+		std::rotate(
+			texCoords.begin(),
+			texCoords.begin() + shift,
+			texCoords.end());
+		std::rotate(
+			blurTexCoords.begin(),
+			blurTexCoords.begin() + shift,
+			blurTexCoords.end());
+	}
+
+	const auto outline = tileData.outlined.value(
+		tileData.outline ? 1. : 0.);
+	const auto paused = tileData.paused.value(
+		tileData.pause ? 1. : 0.);
+	const auto &st = st::groupCallVideoTile;
+	const auto fullscreen = _owner->_fullscreen;
+	const auto shown = _owner->_controlsShownRatio;
+
+	const auto pw = float(_rt->pixelSize().width());
+	const auto ph = float(_rt->pixelSize().height());
+
+	const auto rect = transformRect(geometry);
+
+	const float frameCoords[] = {
+		rect.left(), rect.top(),
+		texCoords[0][0], texCoords[0][1],
+		blurTexCoords[0][0], blurTexCoords[0][1],
+
+		rect.right(), rect.top(),
+		texCoords[1][0], texCoords[1][1],
+		blurTexCoords[1][0], blurTexCoords[1][1],
+
+		rect.left(), rect.bottom(),
+		texCoords[3][0], texCoords[3][1],
+		blurTexCoords[3][0], blurTexCoords[3][1],
+
+		rect.right(), rect.bottom(),
+		texCoords[2][0], texCoords[2][1],
+		blurTexCoords[2][0], blurTexCoords[2][1],
+	};
+
+	GroupFrameUniforms uniforms{};
+	uniforms.viewport[0] = pw;
+	uniforms.viewport[1] = ph;
+
+	const auto bg = fullscreen ? QColor(0, 0, 0) : rhiClearColor();
+	uniforms.frameBg[0] = bg.redF();
+	uniforms.frameBg[1] = bg.greenF();
+	uniforms.frameBg[2] = bg.blueF();
+	uniforms.frameBg[3] = bg.alphaF();
+
+	const auto shadowHeight = st.shadowHeight * _factor;
+	const auto shadowAlpha = Viewport::kShadowMaxAlpha / 255.f;
+	uniforms.shadow[0] = shadowHeight;
+	uniforms.shadow[1] = shown;
+	uniforms.shadow[2] = shadowAlpha;
+	uniforms.shadow[3] = fullscreen ? 0.f : kBlurOpacity;
+
+	uniforms.paused = float(paused);
+
+	uniforms.roundRect[0] = rect.x();
+	uniforms.roundRect[1] = rect.y();
+	uniforms.roundRect[2] = rect.width();
+	uniforms.roundRect[3] = rect.height();
+
+	const auto radius = _owner->videoStream()
+		? st::storiesRadius
+		: st::roundRadiusLarge;
+	uniforms.radiusOutline[0] = float(
+		radius * _factor * (fullscreen ? 0. : 1.));
+	uniforms.radiusOutline[1] = (outline > 0)
+		? float(st::groupCallOutline * _factor)
+		: 0.f;
+
+	const auto roundBg = rhiClearColor();
+	uniforms.roundBg[0] = roundBg.redF();
+	uniforms.roundBg[1] = roundBg.greenF();
+	uniforms.roundBg[2] = roundBg.blueF();
+	uniforms.roundBg[3] = roundBg.alphaF();
+
+	uniforms.outlineFg[0] = st::groupCallMemberActiveIcon->c.redF();
+	uniforms.outlineFg[1] = st::groupCallMemberActiveIcon->c.greenF();
+	uniforms.outlineFg[2] = st::groupCallMemberActiveIcon->c.blueF();
+	uniforms.outlineFg[3] = st::groupCallMemberActiveIcon->c.alphaF()
+		* outline;
+
+	const auto slot = _nextOnscreenSlot++;
+	if (slot >= kMaxOnscreenDraws) {
+		return;
+	}
+	const auto vOffset = slot * kOnscreenVertexSlot;
+	const auto uOffset = slot * kUniformSlot;
+
+	_rub->updateDynamicBuffer(
+		_onscreenVertexBuffer, vOffset, sizeof(frameCoords), frameCoords);
+	_rub->updateDynamicBuffer(
+		_uniformBuffer, uOffset, sizeof(uniforms), &uniforms);
+
+	auto *srb = _rhi->newShaderResourceBindings();
+	_perDrawSrbs.push_back(srb);
+
+	auto *sTex = _rgbaFrame
+		? tileData.rgbaTexture
+		: tileData.convertedTexture;
+	srb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			uOffset,
+			sizeof(GroupFrameUniforms)),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			sTex ? sTex : _placeholderTexture,
+			_linearSampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::FragmentStage,
+			tileData.blurVTexture
+				? tileData.blurVTexture
+				: _placeholderTexture,
+			_linearSampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			3,
+			QRhiShaderResourceBinding::FragmentStage,
+			_noiseTexture ? _noiseTexture : _placeholderTexture,
+			_noiseRepeatSampler),
+	});
+	srb->create();
+
+	_onscreenDraws.push_back({ _framePipeline, srb, vOffset });
+}
+
+void Viewport::RendererRhi::drawControls(
+		not_null<VideoTile*> tile,
+		TileData &tileData) {
+	const auto geometry = tile->geometry().translated(
+		_owner->borrowedOrigin());
+	const auto x = geometry.x();
+	const auto y = geometry.y();
+	const auto width = geometry.width();
+	const auto height = geometry.height();
+	const auto &st = st::groupCallVideoTile;
+	const auto shown = _owner->_controlsShownRatio;
+	const auto fullNameShift = st.namePosition.y() + st::normalFont->height;
+	const auto nameShift = anim::interpolate(fullNameShift, 0, shown);
+	const auto row = tile->row();
+	const auto paused = tileData.paused.value(
+		tileData.pause ? 1. : 0.);
+
+	const auto nameTop = y + (height
+		- st.namePosition.y()
+		- st::semiboldFont->height);
+	const auto pinVisible = _owner->wide()
+		&& (tile->pinInner().translated(x, y).bottom() > y);
+	const auto nameVisible = (nameShift != fullNameShift);
+	const auto pausedVisible = (paused > 0.);
+
+	if (!nameVisible && !pinVisible && !pausedVisible) {
+		return;
+	}
+
+	ensureButtonsImage();
+	row->lazyInitialize(st::groupCallMembersListItem);
+
+	auto drawRasterOverlay = [&](
+			QRect rect,
+			Fn<void(Painter&)> method,
+			float opacity) {
+		paintUsingRaster(rect, std::move(method), opacity);
+	};
+
+	if (pausedVisible) {
+		const auto middle = (st::groupCallVideoPlaceholderHeight
+			- st::groupCallPaused.height()) / 2;
+		const auto pausedSpace = (nameTop - y)
+			- st::groupCallPaused.height()
+			- st::semiboldFont->height;
+		const auto pauseIconSkip = middle
+			- st::groupCallVideoPlaceholderIconTop;
+		const auto pauseTextSkip = st::groupCallVideoPlaceholderTextTop
+			- st::groupCallVideoPlaceholderIconTop;
+		const auto pauseIconTop = !_owner->wide()
+			? (y + (height - st::groupCallPaused.height()) / 2)
+			: (pausedSpace < 3 * st::semiboldFont->height)
+			? (pausedSpace / 3)
+			: std::min(
+				y + (height / 2) - pauseIconSkip,
+				(nameTop
+					- st::semiboldFont->height * 3
+					- st::groupCallPaused.height()));
+
+		const auto iconRect = QRect(
+			x + (width - st::groupCallPaused.width()) / 2,
+			pauseIconTop,
+			st::groupCallPaused.width(),
+			st::groupCallPaused.height());
+		drawRasterOverlay(iconRect, [&](Painter &p) {
+			st::groupCallPaused.paint(
+				p,
+				iconRect.x(),
+				iconRect.y(),
+				width);
+		}, float(paused));
+
+		if (_owner->wide()) {
+			const auto pauseTextTop =
+				(pausedSpace < 3 * st::semiboldFont->height)
+				? (nameTop - (pausedSpace / 3) - st::semiboldFont->height)
+				: std::min(
+					pauseIconTop + pauseTextSkip,
+					nameTop - st::semiboldFont->height * 2);
+			const auto pausedText =
+				tr::lng_group_call_video_paused(tr::now);
+			const auto textWidth =
+				st::semiboldFont->width(pausedText);
+			const auto textRect = QRect(
+				x + (width - textWidth) / 2,
+				pauseTextTop,
+				textWidth,
+				st::semiboldFont->height);
+			drawRasterOverlay(textRect, [&](Painter &p) {
+				p.setPen(st::groupCallVideoTextFg);
+				p.setFont(st::semiboldFont);
+				p.drawText(
+					textRect,
+					pausedText,
+					style::al_top);
+			}, float(paused));
+		}
+	}
+
+	if (pinVisible) {
+		const auto pinInner = tile->pinInner();
+		const auto pinRect = pinInner.translated(x, y);
+		drawRasterOverlay(pinRect, [&](Painter &p) {
+			auto hq = PainterHighQualityEnabler(p);
+			VideoTile::PaintPinButton(
+				p,
+				tile->pinned(),
+				pinRect.x(),
+				pinRect.y(),
+				_owner->widget()->width(),
+				&_pinBackground,
+				&_pinIcon);
+		}, 1.f);
+
+		const auto backInner = tile->backInner();
+		const auto backRect = backInner.translated(x, y);
+		drawRasterOverlay(backRect, [&](Painter &p) {
+			auto hq = PainterHighQualityEnabler(p);
+			VideoTile::PaintBackButton(
+				p,
+				backRect.x(),
+				backRect.y(),
+				_owner->widget()->width(),
+				&_pinBackground);
+		}, 1.f);
+	}
+
+	if (nameVisible) {
+		const auto &icon = st::groupCallVideoCrossLine.icon;
+		const auto iconLeft = x + width
+			- st.iconPosition.x() - icon.width();
+		const auto iconTop = y + (height
+			- st.iconPosition.y()
+			- icon.height()
+			+ nameShift);
+		const auto muteRect = QRect(
+			iconLeft,
+			iconTop,
+			icon.width(),
+			icon.height());
+		if (!muteRect.isEmpty()) {
+			drawRasterOverlay(muteRect, [&](Painter &p) {
+				row->paintMuteIcon(
+					p,
+					muteRect,
+					MembersRowStyle::Video);
+			}, 1.f);
+		}
+
+		const auto hasWidth = width
+			- st.iconPosition.x() - icon.width()
+			- st.namePosition.x();
+		const auto nameLeft = x + st.namePosition.x();
+		const auto nameRect = QRect(
+			nameLeft,
+			nameTop + nameShift,
+			hasWidth,
+			st::semiboldFont->height);
+		if (!nameRect.isEmpty()) {
+			drawRasterOverlay(nameRect, [&](Painter &p) {
+				p.setPen(st::groupCallVideoTextFg);
+				row->name().drawLeftElided(
+					p,
+					nameRect.x(),
+					nameRect.y(),
+					nameRect.width(),
+					nameRect.x() + nameRect.width());
+			}, 1.f);
+		}
+	}
+}
+
+void Viewport::RendererRhi::paintUsingRaster(
+		QRect rect,
+		Fn<void(Painter&)> method,
+		float opacity) {
+	if (!_controlsPipeline || rect.isEmpty()) {
+		return;
+	}
+
+	const auto size = rect.size() * _ifactor;
+	auto raster = QImage(size, QImage::Format_ARGB32_Premultiplied);
+	raster.setDevicePixelRatio(_factor);
+	raster.fill(Qt::transparent);
+	{
+		auto painter = Painter(&raster);
+		painter.translate(-rect.topLeft());
+		method(painter);
+	}
+
+	const auto slot = _nextOnscreenSlot++;
+	if (slot >= kMaxOnscreenDraws) {
+		return;
+	}
+	const auto vOffset = slot * kOnscreenVertexSlot;
+	const auto uOffset = slot * kUniformSlot;
+
+	auto *tex = acquirePoolTexture(size);
+	_rub->uploadTexture(
+		tex,
+		QRhiTextureUploadDescription(
+			QRhiTextureUploadEntry(0, 0,
+				QRhiTextureSubresourceUploadDescription(raster))));
+
+	ImageUniforms imgUniforms{};
+	const auto pw = float(_rt->pixelSize().width());
+	const auto ph = float(_rt->pixelSize().height());
+	imgUniforms.viewport[0] = pw;
+	imgUniforms.viewport[1] = ph;
+	imgUniforms.g_opacity = opacity;
+
+	_rub->updateDynamicBuffer(
+		_uniformBuffer, uOffset, sizeof(imgUniforms), &imgUniforms);
+
+	const auto rRect = transformRect(rect);
+	const float coords[] = {
+		rRect.left(), rRect.bottom(),
+		0.f, 0.f,
+
+		rRect.right(), rRect.bottom(),
+		1.f, 0.f,
+
+		rRect.left(), rRect.top(),
+		0.f, 1.f,
+
+		rRect.right(), rRect.top(),
+		1.f, 1.f,
+	};
+	_rub->updateDynamicBuffer(
+		_onscreenVertexBuffer, vOffset, sizeof(coords), coords);
+
+	auto *srb = _rhi->newShaderResourceBindings();
+	_perDrawSrbs.push_back(srb);
+	srb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			uOffset,
+			sizeof(ImageUniforms)),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			tex,
+			_linearSampler),
+	});
+	srb->create();
+
+	_onscreenDraws.push_back({ _controlsPipeline, srb, vOffset });
+}
+
+Rect Viewport::RendererRhi::transformRect(const QRect &raster) const {
+	return TransformRect(Rect(raster), _viewport, _factor);
+}
+
+Rect Viewport::RendererRhi::transformRect(const Rect &raster) const {
+	return TransformRect(raster, _viewport, _factor);
+}
+
+bool Viewport::RendererRhi::isExpanded(
+		not_null<VideoTile*> tile,
+		QSize unscaled,
+		QSize tileSize) const {
+	return !tile->screencast()
+		&& (!_owner->wide() || UseExpandForCamera(unscaled, tileSize));
+}
+
+float64 Viewport::RendererRhi::countExpandRatio(
+		not_null<VideoTile*> tile,
+		QSize unscaled,
+		const TileAnimation &animation) const {
+	const auto expandedFrom = isExpanded(tile, unscaled, animation.from);
+	const auto expandedTo = isExpanded(tile, unscaled, animation.to);
+	return (expandedFrom && expandedTo)
+		? 1.
+		: (!expandedFrom && !expandedTo)
+		? 0.
+		: expandedFrom
+		? (1. - animation.ratio)
+		: animation.ratio;
+}
+
+void Viewport::RendererRhi::ensureButtonsImage() {
+	if (_buttons) {
+		return;
+	}
+	const auto pinOnSize = VideoTile::PinInnerSize(true);
+	const auto pinOffSize = VideoTile::PinInnerSize(false);
+	const auto backSize = VideoTile::BackInnerSize();
+	const auto muteSize = st::groupCallVideoCrossLine.icon.size();
+	const auto pausedSize = st::groupCallPaused.size();
+
+	const auto fullSize = QSize(
+		std::max({
+			pinOnSize.width(),
+			pinOffSize.width(),
+			backSize.width(),
+			2 * muteSize.width(),
+			pausedSize.width(),
+		}),
+		(pinOnSize.height()
+			+ pinOffSize.height()
+			+ backSize.height()
+			+ muteSize.height()
+			+ pausedSize.height()));
+	const auto imageSize = fullSize * _ifactor;
+	auto image = _buttons.takeImage();
+	if (image.size() != imageSize) {
+		image = QImage(imageSize, QImage::Format_ARGB32_Premultiplied);
+	}
+	image.fill(Qt::transparent);
+	image.setDevicePixelRatio(_ifactor);
+	{
+		auto p = Painter(&image);
+		auto hq = PainterHighQualityEnabler(p);
+
+		_pinOn = QRect(QPoint(), pinOnSize * _ifactor);
+		VideoTile::PaintPinButton(
+			p, true, 0, 0, fullSize.width(),
+			&_pinBackground, &_pinIcon);
+
+		const auto pinOffTop = pinOnSize.height();
+		_pinOff = QRect(
+			QPoint(0, pinOffTop) * _ifactor,
+			pinOffSize * _ifactor);
+		VideoTile::PaintPinButton(
+			p, false, 0, pinOnSize.height(), fullSize.width(),
+			&_pinBackground, &_pinIcon);
+
+		const auto backTop = pinOffTop + pinOffSize.height();
+		_back = QRect(QPoint(0, backTop) * _ifactor, backSize * _ifactor);
+		VideoTile::PaintBackButton(
+			p, 0, backTop, fullSize.width(), &_pinBackground);
+
+		const auto muteTop = backTop + backSize.height();
+		_muteOn = QRect(
+			QPoint(0, muteTop) * _ifactor, muteSize * _ifactor);
+		_muteIcon.paint(p, { 0, muteTop }, 1.);
+
+		_muteOff = QRect(
+			QPoint(muteSize.width(), muteTop) * _ifactor,
+			muteSize * _ifactor);
+		_muteIcon.paint(p, { muteSize.width(), muteTop }, 0.);
+
+		const auto pausedTop = muteTop + muteSize.height();
+		_pausedIcon = QRect(
+			QPoint(0, pausedTop) * _ifactor,
+			pausedSize * _ifactor);
+		st::groupCallPaused.paint(p, 0, pausedTop, fullSize.width());
+	}
+	_buttons.setImage(std::move(image));
+}
+
+void Viewport::RendererRhi::validateDatas() {
+	const auto &tiles = _owner->_tiles;
+	const auto count = int(tiles.size());
+
+	for (auto &data : _tileData) {
+		data.stale = true;
+	}
+	_tileDataIndices.resize(count);
+	auto pending = std::vector<int>();
+	for (auto i = 0; i != count; ++i) {
+		tiles[i]->row()->lazyInitialize(st::groupCallMembersListItem);
+		const auto id = quintptr(tiles[i]->track().get());
+		const auto j = ranges::find(_tileData, id, &TileData::id);
+		if (j != end(_tileData)) {
+			j->stale = false;
+			_tileDataIndices[i] = int(j - begin(_tileData));
+			const auto peer = tiles[i]->peer();
+			if (j->peer != peer
+				|| j->nameVersion != peer->nameVersion()) {
+				j->peer = peer;
+				j->nameVersion = peer->nameVersion();
+			}
+		} else {
+			_tileDataIndices[i] = -1;
+			pending.push_back(i);
+		}
+	}
+	if (pending.empty()) {
+		return;
+	}
+	auto maybeStaleAfter = begin(_tileData);
+	const auto maybeStaleEnd = end(_tileData);
+	for (const auto i : pending) {
+		const auto id = quintptr(tiles[i]->track().get());
+		const auto peer = tiles[i]->peer();
+		const auto paused = (tiles[i]->track()->state()
+			== Webrtc::VideoState::Paused);
+		maybeStaleAfter = ranges::find(
+			maybeStaleAfter,
+			maybeStaleEnd,
+			true,
+			&TileData::stale);
+		if (maybeStaleAfter != maybeStaleEnd) {
+			maybeStaleAfter->id = id;
+			maybeStaleAfter->peer = peer;
+			maybeStaleAfter->nameVersion = peer->nameVersion();
+			maybeStaleAfter->stale = false;
+			maybeStaleAfter->pause = paused;
+			maybeStaleAfter->paused.stop();
+			maybeStaleAfter->outline = false;
+			maybeStaleAfter->outlined.stop();
+			maybeStaleAfter->userpicFrame = QImage();
+			maybeStaleAfter->trackIndex = -1;
+			_tileDataIndices[i] = int(
+				maybeStaleAfter - begin(_tileData));
+		} else {
+			_tileDataIndices[i] = int(_tileData.size());
+			_tileData.push_back({
+				.id = id,
+				.peer = peer,
+				.nameVersion = peer->nameVersion(),
+				.pause = paused,
+			});
+		}
+	}
+}
+
+void Viewport::RendererRhi::validateOutlineAnimation(
+		not_null<VideoTile*> tile,
+		TileData &data) {
+	const auto outline = tile->row()->speaking();
+	if (data.outline == outline) {
+		return;
+	}
+	data.outline = outline;
+	data.outlined.start(
+		[=] { _owner->widget()->update(); },
+		outline ? 0. : 1.,
+		outline ? 1. : 0.,
+		st::fadeWrapDuration);
+}
+
+void Viewport::RendererRhi::validatePausedAnimation(
+		not_null<VideoTile*> tile,
+		TileData &data) {
+	const auto paused = (_userpicFrame
+		&& tile->track()->frameSize().isEmpty())
+		|| (tile->track()->state() == Webrtc::VideoState::Paused);
+	if (data.pause == paused) {
+		return;
+	}
+	data.pause = paused;
+	data.paused.start(
+		[=] { _owner->widget()->update(); },
+		paused ? 0. : 1.,
+		paused ? 1. : 0.,
+		st::fadeWrapDuration);
+}
+
+void Viewport::RendererRhi::validateUserpicFrame(
+		not_null<VideoTile*> tile,
+		TileData &data) {
+	if (!_userpicFrame) {
+		data.userpicFrame = QImage();
+		return;
+	} else if (!data.userpicFrame.isNull()) {
+		return;
+	}
+	const auto size = tile->trackOrUserpicSize();
+	data.userpicFrame = PeerData::GenerateUserpicImage(
+		tile->peer(),
+		tile->row()->ensureUserpicView(),
+		size.width(),
+		0);
+}
+
+} // namespace Calls::Group
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_rhi.h b/Telegram/SourceFiles/calls/group/calls_group_viewport_rhi.h
new file mode 100644
index 00000000000000..5434d300a627a0
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_rhi.h
@@ -0,0 +1,255 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "calls/group/calls_group_viewport.h"
+#include "ui/gl/gl_surface.h"
+#include "ui/rhi/rhi_renderer.h"
+#include "ui/rhi/rhi_image.h"
+#include "ui/round_rect.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/cross_line.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+class QRhi;
+class QRhiBuffer;
+class QRhiTexture;
+class QRhiSampler;
+class QRhiGraphicsPipeline;
+class QRhiShaderResourceBindings;
+class QRhiResourceUpdateBatch;
+class QRhiTextureRenderTarget;
+class QRhiRenderPassDescriptor;
+
+namespace Webrtc {
+struct FrameWithInfo;
+} // namespace Webrtc
+
+namespace Calls::Group {
+
+class Viewport::RendererRhi final
+	: public Ui::GL::Renderer
+	, public Ui::Rhi::Renderer {
+public:
+	explicit RendererRhi(not_null<Viewport*> owner);
+	~RendererRhi();
+
+	void initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void renderOffscreen(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void renderOnscreen(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void releaseResources() override;
+
+	QColor rhiClearColor() override;
+
+	std::optional<QColor> clearColor() override;
+
+private:
+	struct TileData {
+		quintptr id = 0;
+		not_null<PeerData*> peer;
+		Ui::Animations::Simple outlined;
+		Ui::Animations::Simple paused;
+		QImage userpicFrame;
+		QRect nameRect;
+		int nameVersion = 0;
+		mutable int trackIndex = -1;
+
+		QRhiTexture *rgbaTexture = nullptr;
+		QSize rgbaSize;
+
+		QRhiTexture *yTexture = nullptr;
+		QRhiTexture *uTexture = nullptr;
+		QRhiTexture *vTexture = nullptr;
+		QSize lumaSize;
+		QSize chromaSize;
+
+		QRhiTexture *convertedTexture = nullptr;
+		QRhiTextureRenderTarget *convertedRt = nullptr;
+		QRhiRenderPassDescriptor *convertedRpDesc = nullptr;
+		QSize convertedSize;
+
+		QRhiTexture *downscaleTexture = nullptr;
+		QRhiTextureRenderTarget *downscaleRt = nullptr;
+		QRhiRenderPassDescriptor *downscaleRpDesc = nullptr;
+
+		QRhiTexture *blurHTexture = nullptr;
+		QRhiTextureRenderTarget *blurHRt = nullptr;
+		QRhiRenderPassDescriptor *blurHRpDesc = nullptr;
+
+		QRhiTexture *blurVTexture = nullptr;
+		QRhiTextureRenderTarget *blurVRt = nullptr;
+		QRhiRenderPassDescriptor *blurVRpDesc = nullptr;
+
+		QSize blurSize;
+		bool stale = false;
+		bool pause = false;
+		bool outline = false;
+	};
+
+	struct PoolTexture {
+		QRhiTexture *texture = nullptr;
+		QSize size;
+	};
+
+	void createPipelines();
+	void ensureNoiseTexture();
+	void validateDatas();
+	void validateOutlineAnimation(
+		not_null<VideoTile*> tile,
+		TileData &data);
+	void validatePausedAnimation(
+		not_null<VideoTile*> tile,
+		TileData &data);
+	void validateUserpicFrame(
+		not_null<VideoTile*> tile,
+		TileData &data);
+	void ensureButtonsImage();
+
+	void paintTileOffscreen(
+		not_null<VideoTile*> tile,
+		TileData &tileData);
+	void paintTileOnscreen(
+		not_null<VideoTile*> tile,
+		TileData &tileData,
+		float pw,
+		float ph);
+	void uploadFrame(
+		const Webrtc::FrameWithInfo &data,
+		TileData &tileData);
+	void drawYuv2RgbPass(
+		TileData &tileData,
+		QSize frameSize);
+	void prepareOffscreenTargets(
+		TileData &tileData,
+		QSize blurSize);
+	void drawDownscalePass(
+		TileData &tileData,
+		QSize blurSize);
+	void drawBlurPass(
+		TileData &tileData,
+		QSize blurSize);
+	void drawFramePass(
+		not_null<VideoTile*> tile,
+		TileData &tileData,
+		QSize blurSize);
+	void drawControls(
+		not_null<VideoTile*> tile,
+		TileData &tileData);
+
+	void paintUsingRaster(
+		QRect rect,
+		Fn<void(Painter&)> method,
+		float opacity = 1.f);
+
+	[[nodiscard]] QRhiTexture *acquirePoolTexture(QSize size);
+	[[nodiscard]] Ui::GL::Rect transformRect(const QRect &raster) const;
+	[[nodiscard]] Ui::GL::Rect transformRect(
+		const Ui::GL::Rect &raster) const;
+
+	[[nodiscard]] bool isExpanded(
+		not_null<VideoTile*> tile,
+		QSize unscaled,
+		QSize tileSize) const;
+	[[nodiscard]] float64 countExpandRatio(
+		not_null<VideoTile*> tile,
+		QSize unscaled,
+		const TileAnimation &animation) const;
+
+	const not_null<Viewport*> _owner;
+
+	QRhi *_rhi = nullptr;
+	QRhiRenderTarget *_rt = nullptr;
+	QRhiCommandBuffer *_cb = nullptr;
+	QRhiResourceUpdateBatch *_rub = nullptr;
+	QSize _viewport;
+	float _factor = 1.f;
+	int _ifactor = 1;
+	bool _rgbaFrame = false;
+	bool _userpicFrame = false;
+
+	static constexpr int kMaxOnscreenDraws = 64;
+	static constexpr int kOnscreenVertexSlot = 128;
+	static constexpr int kUniformSlot = 256;
+
+	struct OnscreenDraw {
+		QRhiGraphicsPipeline *pipeline = nullptr;
+		QRhiShaderResourceBindings *srb = nullptr;
+		int vertexOffset = 0;
+	};
+	std::vector<OnscreenDraw> _onscreenDraws;
+	int _nextOnscreenSlot = 0;
+
+	QRhiBuffer *_offscreenVertexBuffer = nullptr;
+	QRhiBuffer *_onscreenVertexBuffer = nullptr;
+	QRhiBuffer *_uniformBuffer = nullptr;
+	QRhiSampler *_linearSampler = nullptr;
+	QRhiSampler *_nearestSampler = nullptr;
+	QRhiSampler *_noiseRepeatSampler = nullptr;
+	QRhiTexture *_placeholderTexture = nullptr;
+
+	QRhiGraphicsPipeline *_downscaleArgb32Pipeline = nullptr;
+	QRhiGraphicsPipeline *_downscaleYuv420Pipeline = nullptr;
+	QRhiGraphicsPipeline *_blurHPipeline = nullptr;
+	QRhiGraphicsPipeline *_blurVPipeline = nullptr;
+	QRhiGraphicsPipeline *_framePipeline = nullptr;
+	QRhiGraphicsPipeline *_controlsPipeline = nullptr;
+
+	QRhiShaderResourceBindings *_downscaleArgb32Srb = nullptr;
+	QRhiShaderResourceBindings *_downscaleYuv420Srb = nullptr;
+	QRhiShaderResourceBindings *_blurHSrb = nullptr;
+
+	QRhiRenderPassDescriptor *_offscreenRpDesc = nullptr;
+
+	QRhiTexture *_noiseTexture = nullptr;
+
+	Ui::Rhi::Image _buttons;
+	QRect _pinOn;
+	QRect _pinOff;
+	QRect _back;
+	QRect _muteOn;
+	QRect _muteOff;
+	QRect _pausedIcon;
+
+	Ui::Rhi::Image _names;
+	QRect _pausedTextRect;
+	std::vector<TileData> _tileData;
+	std::vector<int> _tileDataIndices;
+
+	std::vector<PoolTexture> _texturePool;
+	int _nextPoolIndex = 0;
+
+	std::vector<QRhiShaderResourceBindings*> _perDrawSrbs;
+
+	Ui::CrossLineAnimation _pinIcon;
+	Ui::CrossLineAnimation _muteIcon;
+
+	Ui::RoundRect _pinBackground;
+
+	bool _initialized = false;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Calls::Group
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_tile.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_tile.cpp
index 1b31a2012b67ab..6e1f2cb29ade59 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_tile.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_tile.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "calls/group/calls_group_viewport_tile.h"
 
+#include "calls/group/calls_group_members_row.h"
 #include "webrtc/webrtc_video_track.h"
 #include "lang/lang_keys.h"
 #include "ui/round_rect.h"
@@ -33,17 +34,17 @@ Viewport::VideoTile::VideoTile(
 : _endpoint(endpoint)
 , _update(std::move(update))
 , _track(std::move(track))
+, _peer(_track.row->peer())
 , _trackSize(std::move(trackSize))
 , _rtmp(endpoint.rtmp())
 , _self(self) {
 	Expects(_track.track != nullptr);
-	Expects(_track.row != nullptr);
 
 	using namespace rpl::mappers;
 	_track.track->stateValue(
 	) | rpl::filter(
 		_1 == Webrtc::VideoState::Paused
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		_wasPaused = true;
 	}, _lifetime);
 
@@ -259,7 +260,7 @@ void Viewport::VideoTile::setup(rpl::producer<bool> pinned) {
 		pinned
 	) | rpl::filter([=](bool pinned) {
 		return (_pinned != pinned);
-	}) | rpl::start_with_next([=](bool pinned) {
+	}) | rpl::on_next([=](bool pinned) {
 		_pinned = pinned;
 		updateTopControlsSize();
 		if (!_hidden) {
@@ -269,7 +270,7 @@ void Viewport::VideoTile::setup(rpl::producer<bool> pinned) {
 	}, _lifetime);
 
 	_track.track->renderNextFrame(
-	) | rpl::start_with_next(_update, _lifetime);
+	) | rpl::on_next(_update, _lifetime);
 
 	updateTopControlsSize();
 }
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_tile.h b/Telegram/SourceFiles/calls/group/calls_group_viewport_tile.h
index 6f85f4a01bf95f..a7b537be464ece 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_tile.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_tile.h
@@ -37,6 +37,9 @@ class Viewport::VideoTile final {
 	[[nodiscard]] not_null<MembersRow*> row() const {
 		return _track.row;
 	}
+	[[nodiscard]] not_null<PeerData*> peer() const {
+		return _peer;
+	}
 	[[nodiscard]] bool rtmp() const {
 		return _rtmp;
 	}
@@ -113,8 +116,9 @@ class Viewport::VideoTile final {
 
 	const VideoEndpoint _endpoint;
 	const Fn<void()> _update;
+	const VideoTileTrack _track;
+	const not_null<PeerData*> _peer;
 
-	VideoTileTrack _track;
 	QRect _geometry;
 	TileAnimation _animation;
 	rpl::variable<QSize> _trackSize;
diff --git a/Telegram/SourceFiles/calls/group/calls_volume_item.cpp b/Telegram/SourceFiles/calls/group/calls_volume_item.cpp
index d34a5106046fd2..59e301f92a2989 100644
--- a/Telegram/SourceFiles/calls/group/calls_volume_item.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_volume_item.cpp
@@ -8,9 +8,11 @@ For license and copyright information please follow this link:
 #include "calls/group/calls_volume_item.h"
 
 #include "calls/group/calls_group_common.h"
+#include "ui/color_int_conversion.h"
 #include "ui/effects/animation_value.h"
 #include "ui/effects/cross_line.h"
 #include "ui/widgets/continuous_sliders.h"
+#include "ui/rect.h"
 #include "styles/style_calls.h"
 
 #include "ui/paint/arcs.h"
@@ -39,22 +41,23 @@ constexpr auto kVolumeStickedValues
 } // namespace
 
 MenuVolumeItem::MenuVolumeItem(
-	not_null<RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &st,
+	const style::MediaSlider &stSlider,
 	rpl::producer<Group::ParticipantState> participantState,
 	int startVolume,
 	int maxVolume,
-	bool muted)
+	bool muted,
+	const QMargins &padding)
 : Ui::Menu::ItemBase(parent, st)
 , _maxVolume(maxVolume)
 , _cloudMuted(muted)
 , _localMuted(muted)
-, _slider(base::make_unique_q<Ui::MediaSlider>(
-	this,
-	st::groupCallMenuVolumeSlider))
+, _slider(base::make_unique_q<Ui::MediaSlider>(this, stSlider))
 , _dummyAction(new QAction(parent))
 , _st(st)
 , _stCross(st::groupCallMuteCrossLine)
+, _padding(padding)
 , _crossLineMute(std::make_unique<Ui::CrossLineAnimation>(_stCross, true))
 , _arcs(std::make_unique<Ui::Paint::ArcsAnimation>(
 	st::groupCallSpeakerArcsAnimation,
@@ -62,16 +65,16 @@ MenuVolumeItem::MenuVolumeItem(
 	_localMuted ? 0. : (startVolume / float(maxVolume)),
 	Ui::Paint::ArcsAnimation::Direction::Right)) {
 
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 	enableMouseSelecting();
 	enableMouseSelecting(_slider.get());
 
 	_slider->setAlwaysDisplayMarker(true);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		const auto geometry = QRect(QPoint(), size);
-		_itemRect = geometry - st::groupCallMenuVolumePadding;
+		_itemRect = geometry - _padding;
 		_speakerRect = QRect(_itemRect.topLeft(), _stCross.icon.size());
 		_arcPosition = _speakerRect.center()
 			+ QPoint(0, st::groupCallMenuSpeakerArcsSkip);
@@ -87,7 +90,7 @@ MenuVolumeItem::MenuVolumeItem(
 	setCloudVolume(startVolume);
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(this);
 
 		const auto volume = _localMuted
@@ -164,7 +167,7 @@ MenuVolumeItem::MenuVolumeItem(
 
 	std::move(
 		participantState
-	) | rpl::start_with_next([=](const Group::ParticipantState &state) {
+	) | rpl::on_next([=](const Group::ParticipantState &state) {
 		const auto newMuted = state.mutedByMe;
 		const auto newVolume = state.volume.value_or(0);
 
@@ -207,7 +210,7 @@ void MenuVolumeItem::initArcsAnimation() {
 	});
 
 	_arcs->startUpdateRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_arcsAnimation.animating()) {
 			*lastTime = crl::now();
 			_arcsAnimation.start();
@@ -215,7 +218,7 @@ void MenuVolumeItem::initArcsAnimation() {
 	}, lifetime());
 
 	_arcs->stopUpdateRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_arcsAnimation.stop();
 	}, lifetime());
 }
@@ -252,23 +255,19 @@ void MenuVolumeItem::setSliderVolume(int volume) {
 
 void MenuVolumeItem::updateSliderColor(float64 value) {
 	value = std::clamp(value, 0., 1.);
-	const auto color = [](int rgb) {
-		return QColor(
-			int((rgb & 0xFF0000) >> 16),
-			int((rgb & 0x00FF00) >> 8),
-			int(rgb & 0x0000FF));
-	};
 	const auto colors = std::array<QColor, 4>{ {
-		color(0xF66464),
-		color(0xD0B738),
-		color(0x24CD80),
-		color(0x3BBCEC),
+		Ui::ColorFromSerialized(0xF66464),
+		Ui::ColorFromSerialized(0xD0B738),
+		Ui::ColorFromSerialized(0x24CD80),
+		Ui::ColorFromSerialized(0x3BBCEC),
 	} };
-	_slider->setActiveFgOverride((value < 0.25)
-		? anim::color(colors[0], colors[1], value / 0.25)
-		: (value < 0.5)
-		? anim::color(colors[1], colors[2], (value - 0.25) / 0.25)
-		: anim::color(colors[2], colors[3], (value - 0.5) / 0.5));
+	_slider->setColorOverrides({
+		.activeFg = (value < 0.25)
+			? anim::color(colors[0], colors[1], value / 0.25)
+			: (value < 0.5)
+			? anim::color(colors[1], colors[2], (value - 0.25) / 0.25)
+			: anim::color(colors[2], colors[3], (value - 0.5) / 0.5),
+	});
 }
 
 not_null<QAction*> MenuVolumeItem::action() const {
@@ -280,9 +279,7 @@ bool MenuVolumeItem::isEnabled() const {
 }
 
 int MenuVolumeItem::contentHeight() const {
-	return st::groupCallMenuVolumePadding.top()
-		+ st::groupCallMenuVolumePadding.bottom()
-		+ _stCross.icon.height();
+	return rect::m::sum::v(_padding) + _stCross.icon.height();
 }
 
 rpl::producer<bool> MenuVolumeItem::toggleMuteRequests() const {
diff --git a/Telegram/SourceFiles/calls/group/calls_volume_item.h b/Telegram/SourceFiles/calls/group/calls_volume_item.h
index 86eadd1f993a84..72ee6816a3f56c 100644
--- a/Telegram/SourceFiles/calls/group/calls_volume_item.h
+++ b/Telegram/SourceFiles/calls/group/calls_volume_item.h
@@ -29,12 +29,14 @@ struct ParticipantState;
 class MenuVolumeItem final : public Ui::Menu::ItemBase {
 public:
 	MenuVolumeItem(
-		not_null<RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &st,
+		const style::MediaSlider &stSlider,
 		rpl::producer<Group::ParticipantState> participantState,
 		int startVolume,
 		int maxVolume,
-		bool muted);
+		bool muted,
+		const QMargins &padding);
 
 	not_null<QAction*> action() const override;
 	bool isEnabled() const override;
@@ -71,6 +73,7 @@ class MenuVolumeItem final : public Ui::Menu::ItemBase {
 	const not_null<QAction*> _dummyAction;
 	const style::Menu &_st;
 	const style::CrossLineAnimation &_stCross;
+	const QMargins &_padding;
 
 	const std::unique_ptr<Ui::CrossLineAnimation> _crossLineMute;
 	Ui::Animations::Simple _crossLineAnimation;
diff --git a/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp b/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp
index 513fa203c9cf2a..90702ad6b7df45 100644
--- a/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp
+++ b/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp
@@ -121,7 +121,7 @@ RecordingInfo::RecordingInfo(not_null<Ui::RpWidget*> parent)
 : RpWidget(parent)
 , _container(this) {
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		_container->resizeToWidth(size.width());
 	}, _container->lifetime());
 }
@@ -140,7 +140,7 @@ void RecordingInfo::prepareAudio() {
 	audioIcon->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		audioIcon->moveToLeft((size.width() - audioIcon->width()) / 2, 0);
 	}, lifetime());
 }
@@ -175,7 +175,7 @@ void RecordingInfo::prepareVideo() {
 	};
 	for (const auto icon : icons) {
 		icon->clicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			for (const auto &i : icons) {
 				i->setToggled(icon == i);
 			}
@@ -184,7 +184,7 @@ void RecordingInfo::prepareVideo() {
 	}
 
 	wrap->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		const auto wHalf = size.width() / icons.size();
 		for (auto i = 0; i < icons.size(); i++) {
 			const auto &icon = icons[i];
@@ -196,22 +196,13 @@ void RecordingInfo::prepareVideo() {
 }
 
 void RecordingInfo::setLabel(const QString &text) {
-	const auto label = _container->add(
+	_container->add(
 		object_ptr<Ui::FlatLabel>(
 			_container,
 			text,
 			st::groupCallRecordingSubLabel),
-		st::groupCallRecordingSubLabelMargins);
-
-	rpl::combine(
-		sizeValue(),
-		label->sizeValue()
-	) | rpl::start_with_next([=](QSize my, QSize labelSize) {
-		label->moveToLeft(
-			(my.width() - labelSize.width()) / 2,
-			label->y(),
-			my.width());
-	}, label->lifetime());
+		st::groupCallRecordingSubLabelMargins,
+		style::al_top);
 }
 
 RecordingType RecordingInfo::type() const {
@@ -222,7 +213,10 @@ Switcher::Switcher(
 	not_null<Ui::RpWidget*> parent,
 	rpl::producer<bool> &&toggled)
 : RpWidget(parent)
-, _background(this, st::groupCallRecordingInfoHeight, st::groupCallBg)
+, _background(
+	this,
+	st::groupCallRecordingInfoHeight,
+	st::groupCallDividerBar)
 , _audio(this)
 , _video(this) {
 	_audio->prepareAudio();
@@ -236,7 +230,7 @@ Switcher::Switcher(
 	};
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		_audio->resize(size.width(), size.height());
 		_video->resize(size.width(), size.height());
 
@@ -248,7 +242,7 @@ Switcher::Switcher(
 
 	std::move(
 		toggled
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_toggled = toggled;
 		_animation.start(
 			updatePositions,
@@ -287,7 +281,7 @@ void EditGroupCallTitleBox(
 		box->closeBox();
 		done(result);
 	};
-	input->submits() | rpl::start_with_next(submit, input->lifetime());
+	input->submits() | rpl::on_next(submit, input->lifetime());
 	box->addButton(tr::lng_settings_save(), submit);
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
@@ -346,7 +340,7 @@ void AddTitleGroupCallRecordingBox(
 		box->closeBox();
 		done(result);
 	};
-	input->submits() | rpl::start_with_next(submit, input->lifetime());
+	input->submits() | rpl::on_next(submit, input->lifetime());
 	box->addButton(tr::lng_group_call_recording_start_button(), submit);
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
diff --git a/Telegram/SourceFiles/calls/group/ui/calls_group_scheduled_labels.cpp b/Telegram/SourceFiles/calls/group/ui/calls_group_scheduled_labels.cpp
index 708cf3cdebcdf7..ecdde9856feea6 100644
--- a/Telegram/SourceFiles/calls/group/ui/calls_group_scheduled_labels.cpp
+++ b/Telegram/SourceFiles/calls/group/ui/calls_group_scheduled_labels.cpp
@@ -42,7 +42,7 @@ rpl::producer<QString> StartsWhenText(rpl::producer<TimeId> date) {
 			rpl::single(langDayOfMonthFull(dateDay.date())),
 			lt_time,
 			rpl::single(time)
-		) | rpl::type_erased();
+		) | rpl::type_erased;
 		auto tomorrow = tr::lng_group_call_starts_short_tomorrow(
 			lt_time,
 			rpl::single(time));
@@ -56,7 +56,7 @@ rpl::producer<QString> StartsWhenText(rpl::producer<TimeId> date) {
 			std::min(tillAfter, kDay) * crl::time(1000)
 		) | rpl::map([=] {
 			return rpl::duplicate(exact);
-		})) | rpl::flatten_latest() | rpl::type_erased();
+		})) | rpl::flatten_latest() | rpl::type_erased;
 
 		auto tomorrowAndAfter = rpl::single(
 			std::move(tomorrow)
@@ -64,7 +64,7 @@ rpl::producer<QString> StartsWhenText(rpl::producer<TimeId> date) {
 			std::min(tillToday, kDay) * crl::time(1000)
 		) | rpl::map([=] {
 			return rpl::duplicate(todayAndAfter);
-		})) | rpl::flatten_latest() | rpl::type_erased();
+		})) | rpl::flatten_latest() | rpl::type_erased;
 
 		auto full = rpl::single(
 			rpl::duplicate(exact)
@@ -72,7 +72,7 @@ rpl::producer<QString> StartsWhenText(rpl::producer<TimeId> date) {
 			tillTomorrow * crl::time(1000)
 		) | rpl::map([=] {
 			return rpl::duplicate(tomorrowAndAfter);
-		})) | rpl::flatten_latest() | rpl::type_erased();
+		})) | rpl::flatten_latest() | rpl::type_erased;
 
 		if (tillTomorrow > 0) {
 			return full;
@@ -99,7 +99,7 @@ object_ptr<Ui::RpWidget> CreateGradientLabel(
 
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		state->path = QPainterPath();
 		const auto &font = st::groupCallCountdownFont;
 		state->path.addText(0, font->ascent, font->f, text);
@@ -116,7 +116,7 @@ object_ptr<Ui::RpWidget> CreateGradientLabel(
 	}, raw->lifetime());
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto skip = st::groupCallWidth / 20;
diff --git a/Telegram/SourceFiles/calls/group/ui/calls_group_stars_coloring.cpp b/Telegram/SourceFiles/calls/group/ui/calls_group_stars_coloring.cpp
new file mode 100644
index 00000000000000..9deb7a79fb0894
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/ui/calls_group_stars_coloring.cpp
@@ -0,0 +1,122 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "calls/group/ui/calls_group_stars_coloring.h"
+
+#include "base/object_ptr.h"
+#include "lang/lang_keys.h"
+#include "payments/ui/payments_reaction_box.h"
+#include "ui/widgets/labels.h"
+#include "ui/emoji_config.h"
+#include "ui/painter.h"
+#include "ui/rp_widget.h"
+#include "styles/style_credits.h"
+#include "styles/style_layers.h"
+#include "styles/style_premium.h"
+
+namespace Calls::Group::Ui {
+
+StarsColoring StarsColoringForCount(
+		const std::vector<StarsColoring> &colorings,
+		int stars) {
+	for (auto i = begin(colorings), e = end(colorings); i != e; ++i) {
+		if (i->fromStars > stars) {
+			Assert(i != begin(colorings));
+			return *(std::prev(i));
+		}
+	}
+	return colorings.back();
+}
+
+int StarsRequiredForMessage(
+		const std::vector<StarsColoring> &colorings,
+		const TextWithTags &text) {
+	Expects(!colorings.empty());
+
+	auto emojis = 0;
+	auto outLength = 0;
+	auto view = QStringView(text.text);
+	const auto length = int(view.size());
+	while (!view.isEmpty()) {
+		if (Emoji::Find(view, &outLength)) {
+			view = view.mid(outLength);
+			++emojis;
+		} else {
+			view = view.mid(1);
+		}
+	}
+	for (const auto &entry : colorings) {
+		if (emojis <= entry.emojiLimit && length <= entry.charactersMax) {
+			return entry.fromStars;
+		}
+	}
+	return colorings.back().fromStars + 1;
+}
+
+object_ptr<RpWidget> VideoStreamStarsLevel(
+		not_null<RpWidget*> box,
+		const std::vector<StarsColoring> &colorings,
+		rpl::producer<int> starsValue) {
+	struct State {
+		rpl::variable<int> stars;
+		rpl::variable<StarsColoring> coloring;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	state->stars = std::move(starsValue);
+	state->coloring = state->stars.value(
+	) | rpl::map([=](int stars) {
+		return StarsColoringForCount(colorings, stars);
+	});
+
+	auto pinTitle = state->coloring.value(
+	) | rpl::map([=](const StarsColoring &value) {
+		const auto seconds = value.secondsPin;
+		return (seconds >= 3600)
+			? tr::lng_hours_tiny(tr::now, lt_count, seconds / 3600)
+			: (seconds >= 60)
+			? tr::lng_minutes_tiny(tr::now, lt_count, seconds / 60)
+			: tr::lng_seconds_tiny(tr::now, lt_count, seconds);
+	});
+	auto limitTitle = state->coloring.value(
+	) | rpl::map([=](const StarsColoring &value) {
+		return QString::number(value.charactersMax);
+	});
+	auto limitSubtext = state->coloring.value(
+	) | rpl::map([=](const StarsColoring &value) {
+		return tr::lng_paid_comment_limit_about(
+			tr::now,
+			lt_count,
+			value.charactersMax);
+	});
+	auto emojiTitle = state->coloring.value(
+	) | rpl::map([=](const StarsColoring &value) {
+		return QString::number(value.emojiLimit);
+	});
+	auto emojiSubtext = state->coloring.value(
+	) | rpl::map([=](const StarsColoring &value) {
+		return tr::lng_paid_comment_emoji_about(
+			tr::now,
+			lt_count,
+			value.emojiLimit);
+	});
+	return MakeStarSelectInfoBlocks(box, {
+		{
+			.title = std::move(pinTitle) | rpl::map(tr::marked),
+			.subtext = tr::lng_paid_comment_pin_about(),
+		},
+		{
+			.title = std::move(limitTitle) | rpl::map(tr::marked),
+			.subtext = std::move(limitSubtext),
+		},
+		{
+			.title = std::move(emojiTitle) | rpl::map(tr::marked),
+			.subtext = std::move(emojiSubtext),
+		},
+	}, {}, true);
+}
+
+} // namespace Calls::Group::Ui
diff --git a/Telegram/SourceFiles/calls/group/ui/calls_group_stars_coloring.h b/Telegram/SourceFiles/calls/group/ui/calls_group_stars_coloring.h
new file mode 100644
index 00000000000000..c8ca71982f4f53
--- /dev/null
+++ b/Telegram/SourceFiles/calls/group/ui/calls_group_stars_coloring.h
@@ -0,0 +1,47 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Calls::Group::Ui {
+
+using namespace ::Ui;
+
+struct StarsColoring {
+	int bgLight = 0;
+	int bgDark = 0;
+	int fromStars = 0;
+	TimeId secondsPin = 0;
+	int charactersMax = 0;
+	int emojiLimit = 0;
+
+	friend inline auto operator<=>(
+		const StarsColoring &,
+		const StarsColoring &) = default;
+	friend inline bool operator==(
+		const StarsColoring &,
+		const StarsColoring &) = default;
+};
+
+[[nodiscard]] StarsColoring StarsColoringForCount(
+	const std::vector<StarsColoring> &colorings,
+	int stars);
+
+[[nodiscard]] int StarsRequiredForMessage(
+	const std::vector<StarsColoring> &colorings,
+	const TextWithTags &text);
+
+[[nodiscard]] object_ptr<Ui::RpWidget> VideoStreamStarsLevel(
+	not_null<Ui::RpWidget*> box,
+	const std::vector<StarsColoring> &colorings,
+	rpl::producer<int> starsValue);
+
+} // namespace Calls::Group::Ui
diff --git a/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp b/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
index 4e77023f235eb4..c0cd83b07d496b 100644
--- a/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
+++ b/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
@@ -73,8 +73,8 @@ class Source final {
 
 	SourceButton _widget;
 	FlatLabel _label;
-	RoundRect _selectedRect;
-	RoundRect _activeRect;
+	Ui::RoundRect _selectedRect;
+	Ui::RoundRect _activeRect;
 	tgcalls::DesktopCaptureSource _source;
 	std::unique_ptr<Preview> _preview;
 	rpl::event_stream<> _activations;
@@ -147,14 +147,14 @@ Source::Source(
 , _activeRect(ImageRoundRadius::Large, st::groupCallMuted1)
 , _source(source) {
 	_widget.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		paint();
 	}, _widget.lifetime());
 
 	_label.setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	_widget.sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto padding = st::desktopCapturePadding;
 		_label.resizeToNaturalWidth(
 			size.width() - padding.left() - padding.right());
@@ -237,7 +237,7 @@ void Source::paint() {
 void Source::setupPreview() {
 	_preview = std::make_unique<Preview>(_source);
 	_preview->track.renderNextFrame(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_preview->track.frameSize().isEmpty()) {
 			_preview->track.markFrameShown();
 		}
@@ -272,6 +272,8 @@ ChooseSourceProcess::ChooseSourceProcess(
 		tr::lng_group_call_screen_share_audio(tr::now),
 		false,
 		st::desktopCaptureWithAudio)) {
+	_submit->setTextTransform(RoundButtonTextTransform::ToUpper);
+	_finish->setTextTransform(RoundButtonTextTransform::ToUpper);
 	setupPanel();
 	setupSources();
 	activate();
@@ -313,11 +315,6 @@ void ChooseSourceProcess::activate() {
 }
 
 void ChooseSourceProcess::setupPanel() {
-#ifndef Q_OS_LINUX
-	//_window->setAttribute(Qt::WA_OpaquePaintEvent);
-#endif // Q_OS_LINUX
-	//_window->setAttribute(Qt::WA_NoSystemBackground);
-
 	_window->setWindowIcon(QIcon(
 		QPixmap::fromImage(Image::Empty()->original(), Qt::ColorOnly)));
 	_window->setTitleStyle(st::desktopCaptureSourceTitle);
@@ -341,7 +338,7 @@ void ChooseSourceProcess::setupPanel() {
 	_window->setStaysOnTop(true);
 
 	_window->body()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(_window->body()).fillRect(clip, st::groupCallMembersBg);
 	}, _window->lifetime());
 
@@ -351,18 +348,18 @@ void ChooseSourceProcess::setupPanel() {
 		if (_selectedId.isEmpty()) {
 			return;
 		}
-		const auto weak = MakeWeak(_window.get());
+		const auto weak = base::make_weak(_window.get());
 		_delegate->chooseSourceAccepted(
 			_selectedId,
 			!_withAudio->isHidden() && _withAudio->checked());
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->close();
 		}
 	});
 	_finish->setClickedCallback([=] {
-		const auto weak = MakeWeak(_window.get());
+		const auto weak = base::make_weak(_window.get());
 		_delegate->chooseSourceStop();
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->close();
 		}
 	});
@@ -370,6 +367,7 @@ void ChooseSourceProcess::setupPanel() {
 		_bottom.get(),
 		tr::lng_cancel(),
 		st::desktopCaptureCancel);
+	cancel->setTextTransform(RoundButtonTextTransform::ToUpper);
 	cancel->setClickedCallback([=] {
 		_window->close();
 	});
@@ -380,7 +378,7 @@ void ChooseSourceProcess::setupPanel() {
 		_finish->widthValue(),
 		_finish->shownValue(),
 		cancel->widthValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int submitWidth,
 			bool submitShown,
 			int finishWidth,
@@ -394,14 +392,14 @@ void ChooseSourceProcess::setupPanel() {
 	}, _bottom->lifetime());
 
 	_withAudio->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto top = (bottomHeight - _withAudio->heightNoMargins()) / 2;
 		_withAudio->moveToLeft(bottomSkip, top);
 	}, _withAudio->lifetime());
 
 	_withAudio->setChecked(_delegate->chooseSourceActiveWithAudio());
 	_withAudio->checkedChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateButtonsVisibility();
 	}, _withAudio->lifetime());
 
@@ -410,7 +408,7 @@ void ChooseSourceProcess::setupPanel() {
 	_submit->setVisible(!sharing);
 
 	_window->body()->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		_scroll->setGeometry(
 			0,
 			0,
@@ -419,7 +417,7 @@ void ChooseSourceProcess::setupPanel() {
 	}, _scroll->lifetime());
 
 	_scroll->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto rows = int(std::ceil(_sources.size() / float(kColumns)));
 		const auto innerHeight = margins.top()
 			+ rows * st::desktopCaptureSourceSize.height()
@@ -435,7 +433,7 @@ void ChooseSourceProcess::setupPanel() {
 	_window->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return e->type() == QEvent::Close;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		destroy();
 	}, _window->lifetime());
 }
@@ -481,7 +479,7 @@ void ChooseSourceProcess::fillSources() {
 		_sources.back()->activations(
 		) | rpl::filter([=] {
 			return (_selected != raw);
-		}) | rpl::start_with_next([=]{
+		}) | rpl::on_next([=]{
 			if (_selected) {
 				_selected->setActive(false);
 			}
@@ -524,7 +522,7 @@ void ChooseSourceProcess::setupSourcesGeometry() {
 		return;
 	}
 	_inner->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto rows = int(std::ceil(_sources.size() / float(kColumns)));
 		const auto margins = st::desktopCaptureMargins;
 		const auto skips = st::desktopCaptureSourceSkips;
@@ -554,7 +552,7 @@ void ChooseSourceProcess::setupSourcesGeometry() {
 	rpl::combine(
 		_scroll->scrollTopValue(),
 		_scroll->heightValue()
-	) | rpl::start_with_next([=](int scrollTop, int scrollHeight) {
+	) | rpl::on_next([=](int scrollTop, int scrollHeight) {
 		const auto rows = int(std::ceil(_sources.size() / float(kColumns)));
 		const auto margins = st::desktopCaptureMargins;
 		const auto skips = st::desktopCaptureSourceSkips;
diff --git a/Telegram/SourceFiles/calls/ui/calls_device_menu.cpp b/Telegram/SourceFiles/calls/ui/calls_device_menu.cpp
index 1db1941c0edaa8..6b3245075685f9 100644
--- a/Telegram/SourceFiles/calls/ui/calls_device_menu.cpp
+++ b/Telegram/SourceFiles/calls/ui/calls_device_menu.cpp
@@ -25,7 +25,7 @@ namespace {
 class Subsection final : public Ui::Menu::ItemBase {
 public:
 	Subsection(
-		not_null<RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &st,
 		const QString &text);
 
@@ -44,7 +44,7 @@ class Subsection final : public Ui::Menu::ItemBase {
 class Selector final : public Ui::Menu::ItemBase {
 public:
 	Selector(
-		not_null<RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &st,
 		rpl::producer<std::vector<Webrtc::DeviceInfo>> devices,
 		rpl::producer<Webrtc::DeviceResolvedId> chosen,
@@ -66,7 +66,7 @@ class Selector final : public Ui::Menu::ItemBase {
 };
 
 Subsection::Subsection(
-	not_null<RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &st,
 	const QString &text)
 : Ui::Menu::ItemBase(parent, st)
@@ -75,10 +75,10 @@ Subsection::Subsection(
 	this,
 	text,
 	st::callDeviceSelectionLabel))
-, _dummyAction(new QAction(parent)) {
+, _dummyAction(Ui::CreateChild<QAction>(parent)) {
 	setPointerCursor(false);
 
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 
 	_text->resizeToWidth(st::callDeviceSelectionLabel.minWidth);
 	_text->moveToLeft(st.itemPadding.left(), st.itemPadding.top());
@@ -99,7 +99,7 @@ int Subsection::contentHeight() const {
 }
 
 Selector::Selector(
-	not_null<RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &st,
 	rpl::producer<std::vector<Webrtc::DeviceInfo>> devices,
 	rpl::producer<Webrtc::DeviceResolvedId> chosen,
@@ -107,16 +107,16 @@ Selector::Selector(
 : Ui::Menu::ItemBase(parent, st)
 , _scroll(base::make_unique_q<Ui::ScrollArea>(this))
 , _list(_scroll->setOwnedWidget(object_ptr<Ui::VerticalLayout>(this)))
-, _dummyAction(new QAction(parent)) {
+, _dummyAction(Ui::CreateChild<QAction>(parent)) {
 	setPointerCursor(false);
 
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 
 	const auto padding = st.itemPadding;
 	const auto group = std::make_shared<Ui::RadiobuttonGroup>();
 	std::move(
 		chosen
-	) | rpl::start_with_next([=](Webrtc::DeviceResolvedId id) {
+	) | rpl::on_next([=](Webrtc::DeviceResolvedId id) {
 		const auto value = id.isDefault() ? 0 : registerId(id.value);
 		if (!group->hasValue() || group->current() != value) {
 			group->setValue(value);
@@ -138,7 +138,7 @@ Selector::Selector(
 
 	std::move(
 		devices
-	) | rpl::start_with_next([=](const std::vector<Webrtc::DeviceInfo> &v) {
+	) | rpl::on_next([=](const std::vector<Webrtc::DeviceInfo> &v) {
 		while (_list->count()) {
 			delete _list->widgetAt(0);
 		}
@@ -214,10 +214,13 @@ void AddDeviceSelection(
 		Unexpected("Type in AddDeviceSelection.");
 	}();
 	menu->addAction(
-		base::make_unique_q<Subsection>(menu, menu->st().menu, title));
+		base::make_unique_q<Subsection>(
+			menu->menu(),
+			menu->st().menu,
+			title));
 	menu->addAction(
 		base::make_unique_q<Selector>(
-			menu,
+			menu->menu(),
 			menu->st().menu,
 			environment->devicesValue(type.type),
 			std::move(type.chosen),
diff --git a/Telegram/SourceFiles/chat_helpers/bot_command.cpp b/Telegram/SourceFiles/chat_helpers/bot_command.cpp
index e827426020d220..7771bb3052a64c 100644
--- a/Telegram/SourceFiles/chat_helpers/bot_command.cpp
+++ b/Telegram/SourceFiles/chat_helpers/bot_command.cpp
@@ -40,8 +40,8 @@ QString WrapCommandInChat(
 		? peer->asChat()->botStatus
 		: peer->isMegagroup()
 		? peer->asChannel()->mgInfo->botStatus
-		: -1;
-	return ((command.indexOf('@') < 2) && (botStatus == 0 || botStatus == 2))
+		: Data::BotStatus::NoBots;
+	return ((command.indexOf('@') < 2) && (botStatus != Data::BotStatus::NoBots))
 		? command + '@' + bot->username()
 		: command;
 }
diff --git a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
index f455a965a3b15c..ff8ac3ce0ef88f 100644
--- a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
+++ b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
@@ -15,7 +15,9 @@ For license and copyright information please follow this link:
 #include "history/history_item_components.h"
 #include "main/main_session.h"
 #include "ui/cached_round_corners.h"
+#include "ui/chat/chat_style_radius.h"
 #include "ui/painter.h"
+#include "ui/round_rect.h"
 #include "ui/ui_utility.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
@@ -23,6 +25,13 @@ For license and copyright information please follow this link:
 
 namespace {
 
+const auto kBotKeyboardRounding = Ui::BubbleRounding{
+	Ui::BubbleCornerRounding::Large,
+	Ui::BubbleCornerRounding::Large,
+	Ui::BubbleCornerRounding::Large,
+	Ui::BubbleCornerRounding::Large,
+};
+
 class Style : public ReplyKeyboard::Style {
 public:
 	Style(
@@ -33,7 +42,6 @@ class Style : public ReplyKeyboard::Style {
 		Ui::BubbleRounding outer,
 		RectParts sides) const override;
 
-	void startPaint(QPainter &p, const Ui::ChatStyle *st) const override;
 	const style::TextStyle &textStyle() const override;
 	void repaint(not_null<const HistoryItem*> item) const override;
 
@@ -42,8 +50,13 @@ class Style : public ReplyKeyboard::Style {
 		QPainter &p,
 		const Ui::ChatStyle *st,
 		const QRect &rect,
+		HistoryMessageMarkupButton::Color color,
 		Ui::BubbleRounding rounding,
 		float64 howMuchOver) const override;
+	void paintButtonStart(
+		QPainter &p,
+		const Ui::ChatStyle *st,
+		HistoryMessageMarkupButton::Color color) const override;
 	void paintButtonIcon(
 		QPainter &p,
 		const Ui::ChatStyle *st,
@@ -54,6 +67,7 @@ class Style : public ReplyKeyboard::Style {
 		QPainter &p,
 		const Ui::ChatStyle *st,
 		const QRect &rect,
+		HistoryMessageMarkupButton::Color color,
 		int outerWidth,
 		Ui::BubbleRounding rounding) const override;
 	int minButtonWidth(HistoryMessageMarkupButton::Type type) const override;
@@ -69,8 +83,12 @@ Style::Style(
 : ReplyKeyboard::Style(st), _parent(parent) {
 }
 
-void Style::startPaint(QPainter &p, const Ui::ChatStyle *st) const {
-	p.setPen(st::botKbColor);
+void Style::paintButtonStart(
+		QPainter &p,
+		const Ui::ChatStyle *st,
+		HistoryMessageMarkupButton::Color color) const {
+	using Color = HistoryMessageMarkupButton::Color;
+	p.setPen((color == Color::Normal) ? st::botKbColor : st::white);
 	p.setFont(st::botKbStyle.font);
 }
 
@@ -86,16 +104,61 @@ Images::CornersMaskRef Style::buttonRounding(
 		Ui::BubbleRounding outer,
 		RectParts sides) const {
 	using namespace Images;
-	return CornersMaskRef(CornersMask(ImageRoundRadius::Small));
+	using namespace Ui;
+	using Radius = CachedCornerRadius;
+	using Corner = BubbleCornerRounding;
+	auto result = CornersMaskRef(CachedCornersMasks(Radius::BubbleSmall));
+	const auto &large = CachedCornersMasks(Radius::BubbleLarge);
+	const auto round = [&](
+			RectPart vertSide,
+			RectPart horizSide,
+			int index) {
+		if ((sides & vertSide)
+			&& (sides & horizSide)
+			&& (outer[index] == Corner::Large)) {
+			result.p[index] = &large[index];
+		}
+	};
+	round(RectPart::Top, RectPart::Left, kTopLeft);
+	round(RectPart::Top, RectPart::Right, kTopRight);
+	round(RectPart::Bottom, RectPart::Left, kBottomLeft);
+	round(RectPart::Bottom, RectPart::Right, kBottomRight);
+	return result;
 }
 
 void Style::paintButtonBg(
 		QPainter &p,
 		const Ui::ChatStyle *st,
 		const QRect &rect,
+		HistoryMessageMarkupButton::Color color,
 		Ui::BubbleRounding rounding,
 		float64 howMuchOver) const {
-	Ui::FillRoundRect(p, rect, st::botKbBg, Ui::BotKeyboardCorners);
+	using Color = HistoryMessageMarkupButton::Color;
+	using Corner = Ui::BubbleCornerRounding;
+	const auto bg = (color == Color::Normal)
+		? st::botKbBg->c
+		: (color == Color::Primary)
+		? st::botKbPrimaryBg->c
+		: (color == Color::Danger)
+		? st::botKbDangerBg->c
+		: st::botKbSuccessBg->c;
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(bg);
+	const auto large = Ui::BubbleRadiusLarge();
+	const auto small = Ui::BubbleRadiusSmall();
+	const auto radius = [&](int index) {
+		return (rounding[index] == Corner::Large) ? large : small;
+	};
+	const auto tl = radius(0);
+	const auto tr = radius(1);
+	const auto bl = radius(2);
+	const auto br = radius(3);
+	if ((tl == tr) && (tl == bl) && (tl == br)) {
+		p.drawRoundedRect(rect, tl, tl);
+	} else {
+		p.drawPath(Ui::ComplexRoundedRectPath(rect, tl, tr, bl, br));
+	}
 }
 
 void Style::paintButtonIcon(
@@ -111,6 +174,7 @@ void Style::paintButtonLoading(
 		QPainter &p,
 		const Ui::ChatStyle *st,
 		const QRect &rect,
+		HistoryMessageMarkupButton::Color color,
 		int outerWidth,
 		Ui::BubbleRounding rounding) const {
 	// Buttons with loading progress should not appear here.
@@ -126,7 +190,7 @@ int Style::minButtonWidth(HistoryMessageMarkupButton::Type type) const {
 BotKeyboard::BotKeyboard(
 	not_null<Window::SessionController*> controller,
 	QWidget *parent)
-: TWidget(parent)
+: RpWidget(parent)
 , _controller(controller)
 , _st(&st::botKbButton) {
 	setGeometry(0, 0, _st->margin, st::botKbScroll.deltat);
@@ -146,9 +210,10 @@ void BotKeyboard::paintEvent(QPaintEvent *e) {
 		_impl->paint(
 			p,
 			nullptr,
-			Ui::BubbleRounding(),
+			kBotKeyboardRounding,
 			width(),
-			clip.translated(-x, -st::botKbScroll.deltat));
+			clip.translated(-x, -st::botKbScroll.deltat),
+			_controller->isGifPausedAtLeastFor(Window::GifPauseReason::Any));
 	}
 }
 
@@ -254,7 +319,7 @@ void BotKeyboard::clickHandlerActiveChanged(const ClickHandlerPtr &p, bool activ
 
 void BotKeyboard::clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) {
 	if (!_impl) return;
-	_impl->clickHandlerPressedChanged(p, pressed, Ui::BubbleRounding());
+	_impl->clickHandlerPressedChanged(p, pressed, kBotKeyboardRounding);
 }
 
 bool BotKeyboard::updateMarkup(HistoryItem *to, bool force) {
diff --git a/Telegram/SourceFiles/chat_helpers/bot_keyboard.h b/Telegram/SourceFiles/chat_helpers/bot_keyboard.h
index 622bbd5bef1fb0..712d79b00980f2 100644
--- a/Telegram/SourceFiles/chat_helpers/bot_keyboard.h
+++ b/Telegram/SourceFiles/chat_helpers/bot_keyboard.h
@@ -21,7 +21,7 @@ class SessionController;
 } // namespace Window
 
 class BotKeyboard
-	: public TWidget
+	: public Ui::RpWidget
 	, public Ui::AbstractTooltipShower
 	, public ClickHandlerHost {
 public:
@@ -44,7 +44,7 @@ class BotKeyboard
 	void step_selected(crl::time ms, bool timer);
 	void resizeToWidth(int newWidth, int maxOuterHeight) {
 		_maxOuterHeight = maxOuterHeight;
-		return TWidget::resizeToWidth(newWidth);
+		return RpWidget::resizeToWidth(newWidth);
 	}
 
 	[[nodiscard]] bool maximizeSize() const;
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index d965b7f8a3449e..387612e2e142a0 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -40,6 +40,7 @@ TabbedSearch {
 
 ComposeIcons {
 	settings: icon;
+	collectibles: icon;
 
 	recent: icon;
 	recentActive: icon;
@@ -68,10 +69,11 @@ ComposeIcons {
 	menuSchedule: icon;
 	menuWhenOnline: icon;
 	menuSpoiler: icon;
-	menuSpoilerOff: icon;
 	menuBelow: icon;
 	menuAbove: icon;
+	menuQualityHigh: icon;
 	menuPrice: icon;
+	menuEditStars: icon;
 
 	stripBubble: icon;
 	stripExpandPanel: icon;
@@ -120,6 +122,23 @@ EmojiPan {
 	tabs: SettingsSlider;
 	search: TabbedSearch;
 	searchMargin: margins;
+	searchPacksTop: pixels;
+	searchPackWidth: pixels;
+	searchPackHeight: pixels;
+	searchPackSkip: pixels;
+	searchPackIconSize: pixels;
+	searchPackIconTop: pixels;
+	searchPackTextTop: pixels;
+	searchPackTextPadding: pixels;
+	searchPacksBottom: pixels;
+	searchResultsHeight: pixels;
+	searchResultsTextTop: pixels;
+	searchSwapDuration: int;
+	searchBackHeight: pixels;
+	searchBackIconLeft: pixels;
+	searchBackIconTop: pixels;
+	searchBackTextLeft: pixels;
+	searchBackTextTop: pixels;
 	colorAll: IconButton;
 	colorAllLabel: FlatLabel;
 	removeSet: IconButton;
@@ -147,10 +166,13 @@ EmojiButton {
 }
 
 SendButton {
+	sendIconPosition: point;
+	sendIconFillPadding: pixels;
 	inner: IconButton;
-	record: icon;
-	recordOver: icon;
+	stars: RoundButton;
+	recordSize: size;
 	sendDisabledFg: color;
+	sendIconFg: color;
 }
 
 RecordBarLock {
@@ -194,26 +216,55 @@ ComposeFiles {
 	statusFg: color;
 }
 
+SendAsButton {
+	width: pixels;
+	height: pixels;
+	size: pixels;
+	activeBg: color;
+	activeFg: color;
+	cross: CrossAnimation;
+	duration: int;
+}
+
+ChooseSendAs {
+	button: SendAsButton;
+	label: FlatLabel;
+	list: PeerList;
+}
+
 ComposeControls {
 	bg: color;
 	radius: pixels;
+	padding: margins;
 
 	field: InputField;
+	fieldLeft: pixels;
 	send: SendButton;
 	attach: IconButton;
 	emoji: EmojiButton;
 	like: IconButton;
 	liked: icon;
+	editStars: IconButton;
+	commentsShow: IconButton;
+	commentsShown: icon;
+	commentsSkip: pixels;
+	commentsUnreadSize: pixels;
+	commentsUnreadMargin: pixels;
+	commentsUnreadPosition: point;
+	starsReactionCounter: RoundButton;
+	starsSkip: pixels;
 	suggestions: EmojiSuggestions;
 	tabbed: EmojiPan;
 	tabbedHeightMin: pixels;
 	tabbedHeightMax: pixels;
 	record: RecordBar;
 	files: ComposeFiles;
+	photoQualityBadgeOuterSkip: pixels;
 	premium: PremiumLimits;
 	boxField: InputField;
 	restrictionLabel: FlatLabel;
 	premiumRequired: ComposePremiumRequired;
+	chooseSendAs: ChooseSendAs;
 }
 
 ReportBox {
@@ -221,8 +272,7 @@ ReportBox {
 	noIconButton: SettingsButton;
 	label: FlatLabel;
 	field: InputField;
-	dividerBg: color;
-	dividerFg: color;
+	divider: DividerLabel;
 	spam: icon;
 	fake: icon;
 	violence: icon;
@@ -265,6 +315,11 @@ whenReadPadding: margins(34px, 3px, 17px, 4px);
 whenReadIconPosition: point(8px, 0px);
 whenReadSkip: 3px;
 whenReadShowPadding: margins(6px, 0px, 6px, 2px);
+whoSentItem: Menu(defaultMenu) {
+	itemPadding: margins(17px, 3px, 17px, 4px);
+	itemRightSkip: 0px;
+	itemStyle: whenReadStyle;
+}
 
 switchPmButton: RoundButton(defaultBoxButton) {
 	width: 320px;
@@ -331,9 +386,7 @@ stickersRemove: IconButton(defaultIconButton) {
 
 	rippleAreaSize: 40px;
 	rippleAreaPosition: point(0px, 0px);
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 stickersUndoRemove: RoundButton(defaultLightButton) {
 	width: -16px;
@@ -388,6 +441,49 @@ stickersScroll: ScrollArea(boxScroll) {
 stickersRowDisabledOpacity: 0.4;
 stickersRowDuration: 200;
 
+stickersAddCellPlusSize: 22px;
+stickersAddCellPlusThickness: 2px;
+stickersAddCellBgRadius: 28px;
+emojiSetAddCellPlusSize: 13px;
+emojiSetAddCellBgRadius: 16px;
+
+stickersEmojiPickerExpandedRadius: 20px;
+stickersEmojiPickerBg: emojiPanBg;
+stickersEmojiPickerPadding: margins(12px, 8px, 12px, 0px);
+stickersEmojiPickerItemSize: 30px;
+stickersEmojiPickerItemSkip: 4px;
+stickersEmojiPickerStripHeight: 40px;
+stickersEmojiPickerExpandedHeight: 220px;
+stickersEmojiPickerStripBubble: icon{
+	{ "chat/reactions_bubble_shadow", windowShadowFg },
+	{ "chat/reactions_bubble", emojiPanBg },
+};
+stickersEmojiPickerStripBubbleRight: 20px;
+stickersEmojiPickerSelectedBg: windowBgActive;
+stickersEmojiPickerScroll: ScrollArea(boxScroll) {
+	width: 14px;
+	deltax: 5px;
+	deltat: 4px;
+	deltab: 18px;
+}
+stickersEmojiPickerAbout: FlatLabel(defaultFlatLabel) {
+	minWidth: 100px;
+	align: align(top);
+	textFg: windowSubTextFg;
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+}
+stickersEmojiPickerExpandIcon: icon {{ "intro_country_dropdown", windowSubTextFg }};
+stickersEmojiPickerCollapseIcon: icon {{ "intro_country_dropdown-flip_vertical", windowSubTextFg }};
+stickersEmojiPickerExpandSize: 24px;
+stickersEmojiPickerExpandBg: windowBgRipple;
+stickersEmojiPickerBoxShadow: BoxShadow {
+	blurRadius: 20px;
+	offset: point(0px, 6px);
+	opacity: 0.22;
+}
+
 emojiStatusDefault: icon {{ "emoji/stickers_premium", emojiIconFg }};
 
 filtersRemove: IconButton(stickersRemove) {
@@ -401,7 +497,6 @@ emojiTabs: defaultTabsSlider;
 emojiCategoryIconTop: 6px;
 emojiPanAnimation: PanelAnimation(defaultPanelAnimation) {
 	fadeBg: emojiPanBg;
-	shadow: boxRoundShadow;
 }
 emojiPanWidth: 345px;
 emojiPanMinHeight: 278px;
@@ -413,6 +508,9 @@ emojiPanHover: windowBgOver;
 emojiPanSlideDuration: 200;
 emojiPanArea: size(34px, 32px);
 emojiPanRadius: 8px;
+emojiPanReactionsPreviewPadding: margins(10px, 20px, 10px, 20px);
+emojiPanEmojiPreviewMinHeight: 160px;
+emojiPanEmojiPreviewRadius: 8px + 8px + 4px;
 
 defaultTabbedSearchCancel: CrossButton {
 	width: 33px;
@@ -477,7 +575,7 @@ emojiPanRemoveSkip: 10px;
 emojiPanRemoveTop: 10px;
 emojiPanColorAllSkip: 9px;
 
-emojiColorsPadding: 5px;
+emojiColorsPadding: 8px;
 emojiColorsSep: 1px;
 emojiColorsSepColor: shadowFg;
 
@@ -494,9 +592,7 @@ hashtagClose: IconButton {
 
 	rippleAreaPosition: point(5px, 5px);
 	rippleAreaSize: 20px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 
 stickerPanWidthMin: 64px;
@@ -515,9 +611,19 @@ stickerPanRemoveSet: IconButton(hashtagClose) {
 	iconPosition: point(-1px, -1px);
 	rippleAreaPosition: point(0px, 0px);
 }
+whoReadClose: IconButton(stickerPanRemoveSet) {
+	width: 20px;
+	height: 20px;
+	icon: smallCloseIconOver;
+	rippleAreaSize: 20px;
+}
+whoReadCloseVisibleRadius: 7px;
+whoReadCloseBlurPadding: 5px;
 stickerIconMove: 400;
 stickerPreviewDuration: 150;
 stickerPreviewMin: 0.1;
+stickerPanFirstAfterShortcutsSkip: 4px;
+mediaPreviewPhotoSkip: 48px;
 
 emojiPanColorAll: IconButton(stickerPanRemoveSet) {
 	width: 24px;
@@ -552,7 +658,7 @@ emojiEmpty: icon {{ "emoji_empty", windowSubTextFg }};
 
 editMediaButtonSize: 32px;
 
-editMediaButtonIconFile: icon {{ "send_media/send_media_replace", menuIconFg }};
+editMediaButtonIconFile: icon {{ "send_media/send_media_more", menuIconFg }};
 editMediaButton: IconButton(defaultIconButton) {
 	width: editMediaButtonSize;
 	height: editMediaButtonSize;
@@ -566,13 +672,13 @@ editMediaButton: IconButton(defaultIconButton) {
 sendBoxAlbumGroupEditInternalSkip: 8px;
 sendBoxAlbumGroupSkipRight: 5px;
 sendBoxAlbumGroupSkipTop: 5px;
-sendBoxAlbumGroupRadius: 4px;
-sendBoxAlbumGroupSize: size(62px, 25px);
+sendBoxAlbumGroupSize: size(48px, 26px);
 sendBoxAlbumGroupSizeVertical: size(30px, 50px);
 sendBoxAlbumSmallGroupSize: size(30px, 25px);
+sendBoxAlbumSmallGroupCircleSize: 27px;
 
 sendBoxFileGroupSkipTop: 2px;
-sendBoxFileGroupSkipRight: 5px;
+sendBoxFileGroupSkipRight: 1px;
 sendBoxFileGroupEditInternalSkip: -1px;
 
 sendBoxAlbumGroupButtonFile: IconButton(editMediaButton) {
@@ -581,14 +687,15 @@ sendBoxAlbumGroupButtonFile: IconButton(editMediaButton) {
 	}
 }
 sendBoxAlbumGroupEditButtonIconFile: editMediaButtonIconFile;
-sendBoxAlbumGroupDeleteButtonIconFile: icon {{ "send_media/send_media_delete", menuIconFg }};
+sendBoxAlbumGroupDeleteButtonIconFile: icon {{ "send_media/send_media_cross", menuIconFg }};
 
-sendBoxAlbumButtonMediaEdit: icon {{ "send_media/send_media_replace", roundedFg }};
-sendBoxAlbumGroupButtonMediaEdit: icon {{ "send_media/send_media_replace", roundedFg, point(4px, 1px) }};
-sendBoxAlbumGroupButtonMediaDelete: icon {{ "send_media/send_media_delete", roundedFg }};
+sendBoxAlbumButtonMediaMore: icon {{ "send_media/send_media_more", roundedFg }};
+sendBoxAlbumGroupButtonMediaMore: icon {{ "send_media/send_media_more", roundedFg, point(4px, 1px) }};
+sendBoxAlbumGroupButtonMediaDelete: icon {{ "send_media/send_media_cross", roundedFg }};
 
 defaultComposeIcons: ComposeIcons {
 	settings: icon {{ "emoji/emoji_settings", emojiIconFg }};
+	collectibles: icon {{ "menu/unique", emojiIconFg }};
 
 	recent: icon {{ "emoji/emoji_recent", emojiIconFg }};
 	recentActive: icon {{ "emoji/emoji_recent", emojiSubIconFgActive }};
@@ -617,9 +724,9 @@ defaultComposeIcons: ComposeIcons {
 	menuSchedule: menuIconSchedule;
 	menuWhenOnline: menuIconWhenOnline;
 	menuSpoiler: menuIconSpoiler;
-	menuSpoilerOff: menuIconSpoilerOff;
 	menuBelow: menuIconBelow;
 	menuAbove: menuIconAbove;
+	menuQualityHigh: menuIconQualityHigh;
 	menuPrice: menuIconEarn;
 
 	stripBubble: icon{
@@ -679,6 +786,23 @@ defaultEmojiPan: EmojiPan {
 	tabs: emojiTabs;
 	search: defaultTabbedSearch;
 	searchMargin: margins(1px, 11px, 2px, 5px);
+	searchPacksTop: 0px;
+	searchPackWidth: 70px;
+	searchPackHeight: 78px;
+	searchPackSkip: 6px;
+	searchPackIconSize: 42px;
+	searchPackIconTop: 8px;
+	searchPackTextTop: 55px;
+	searchPackTextPadding: 5px;
+	searchPacksBottom: 0px;
+	searchResultsHeight: 20px;
+	searchResultsTextTop: 3px;
+	searchSwapDuration: 100;
+	searchBackHeight: 36px;
+	searchBackIconLeft: 5px;
+	searchBackIconTop: 6px;
+	searchBackTextLeft: 40px;
+	searchBackTextTop: 10px;
 	colorAll: emojiPanColorAll;
 	colorAllLabel: emojiPanColorAllLabel;
 	removeSet: stickerPanRemoveSet;
@@ -808,6 +932,38 @@ reactPanelScrollRounded: ScrollArea(emojiScroll) {
 	deltat: 14px;
 	deltab: 14px;
 }
+selfForwardsTaggerStripSkip: 11px;
+
+toastLottieIconSize: size(20px, 20px);
+selfForwardsTaggerIconPadding: margins(14px, 2px, 8px, 2px);
+selfForwardsTaggerToast: Toast(defaultToast) {
+	minWidth: 160px;
+	maxWidth: 380px;
+	radius: 9px;
+	padding: margins(19px, 12px, 19px, 12px);
+}
+joinChatAddToFilterToast: Toast(defaultToast) {
+	minWidth: 160px;
+	maxWidth: 380px;
+	radius: 9px;
+	padding: margins(7px, 12px, 44px, 12px);
+}
+joinChatAddToFilterToastButton: IconButton(defaultIconButton) {
+	width: 40px;
+	height: 40px;
+
+	icon: icon{
+		{ "chat/reactions_round_small", toastFg },
+		{ "chat/reactions_expand_panel", toastBg },
+	};
+	iconOver: icon{
+		{ "chat/reactions_round_small", toastFg },
+		{ "chat/reactions_expand_panel", toastBg },
+	};
+	rippleAreaPosition: point(10px, 10px);
+	rippleAreaSize: 20px;
+	ripple: universalRippleAnimation;
+}
 
 choosePeerGroupIcon: icon {{ "info/edit/create_group", lightButtonFg }};
 choosePeerChannelIcon: icon {{ "info/edit/create_channel", lightButtonFg }};
@@ -855,6 +1011,21 @@ historyComposeButton: FlatButton {
 		color: historyComposeButtonBgRipple;
 	}
 }
+historyGiftToChannel: IconButton(defaultIconButton) {
+	width: 46px;
+	height: 46px;
+
+	icon: icon{{ "menu/gift_premium", windowActiveTextFg }};
+	iconOver: icon{{ "menu/gift_premium", windowActiveTextFg }};
+
+	rippleAreaPosition: point(3px, 3px);
+	rippleAreaSize: 40px;
+	ripple: universalRippleAnimation;
+}
+historyDirectMessage: IconButton(historyGiftToChannel) {
+	icon: icon{{ "menu/chat_discuss", windowActiveTextFg }};
+	iconOver: icon{{ "menu/chat_discuss", windowActiveTextFg }};
+}
 historyUnblock: FlatButton(historyComposeButton) {
 	color: attentionButtonFg;
 	overColor: attentionButtonFgOver;
@@ -880,6 +1051,16 @@ historyEmojiStatusInfoLabel: FlatLabel(historyContactStatusLabel) {
 }
 historyContactStatusMinSkip: 16px;
 
+historySetBotPhotoIcon: icon {{ "menu/photo_set", windowActiveTextFg }};
+historySetBotPhotoIconSize: 49px;
+historySetBotPhotoLabel: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+	textFg: windowActiveTextFg;
+	align: align(center);
+	maxHeight: 30px;
+}
+historySetBotPhotoLabelMarginRight: 20px;
+
 historyBusinessBotPhoto: UserpicButton(defaultUserpicButton) {
 	size: size(46px, 46px);
 	photoSize: 46px;
@@ -898,12 +1079,14 @@ historyBusinessBotSettings: IconButton(defaultIconButton) {
 	iconPosition: point(-1px, -1px);
 	rippleAreaSize: 40px;
 	rippleAreaPosition: point(4px, 9px);
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 	height: 58px;
 	width: 48px;
 }
+paysStatusLabel: FlatLabel(historyBusinessBotStatus) {
+	align: align(top);
+	minWidth: 240px;
+}
 
 historyReplyCancelIcon: icon {{ "box_button_close", historyReplyCancelFg }};
 historyReplyCancelIconOver: icon {{ "box_button_close", historyReplyCancelFgOver }};
@@ -927,14 +1110,25 @@ historyReplyCancel: IconButton {
 
 	rippleAreaPosition: point(4px, 4px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 historyPinnedShowAll: IconButton(historyReplyCancel) {
 	icon: icon {{ "pinned_show_all", historyReplyCancelFg }};
 	iconOver: icon {{ "pinned_show_all", historyReplyCancelFgOver }};
 }
+sendFilesReplyIconPosition: point(11px, 7px);
+sendFilesReplyCancelSize: 24px;
+sendFilesReplyCancel: IconButton(editMediaButton) {
+	width: sendFilesReplyCancelSize;
+	height: sendFilesReplyCancelSize;
+	icon: icon {{ "send_media/send_media_cross", historyReplyCancelFg }};
+	iconOver: icon {{ "send_media/send_media_cross", historyReplyCancelFgOver }};
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: windowBgRipple;
+	}
+
+	rippleAreaSize: sendFilesReplyCancelSize;
+}
 historyPinnedBotButton: RoundButton(defaultActiveButton) {
 	width: -34px;
 	height: 30px;
@@ -982,6 +1176,27 @@ historyToDownBadgeSize: 22px;
 historyToDownShownAfter: 480px;
 historyToDownDuration: 150;
 
+historyPullNextThreshold: 48px;
+historyPullNextExpand: 110px;
+historyPullNextMaxHeight: 150px;
+historyPullNextAvatar: 56px;
+historyPullNextSkip: 8px;
+historyPullNextArrowStroke: 2px;
+historyPullNextBadge: 20px;
+historyPullNextBadgeRing: 2px;
+historyPullNextInset: 16px;
+historyPullNextPadding: 4px;
+historyPullNextArrowSize: 24px;
+historyPullNextArrowRaise: 20px;
+historyPullNextRise: 36px;
+historyPullNextNameTop: 20px;
+historyPullNextNameRadius: 15px;
+historyPullNextHintSlide: 10px;
+historyPullNextBounce: 4px;
+historyPullNextBadgeFont: font(12px semibold);
+historyPullNextNameFont: font(13px semibold);
+historyPullNextHintFont: font(14px);
+
 dialogsToUpAbove: icon {{ "history_down_arrow-flip_vertical", historyToDownFg, point(0px, 1px) }};
 dialogsToUpAboveOver: icon {{ "history_down_arrow-flip_vertical", historyToDownFgOver, point(0px, 1px) }};
 
@@ -998,6 +1213,10 @@ historyUnreadReactions: TwoIconButton(historyToDown) {
 	iconAbove: icon {{ "history_unread_reaction", historyToDownFg }};
 	iconAboveOver: icon {{ "history_unread_reaction", historyToDownFgOver }};
 }
+historyUnreadPollVotes: TwoIconButton(historyToDown) {
+	iconAbove: icon {{ "history_unread_poll_vote-40x40", historyToDownFg, point(6px, 6px) }};
+	iconAboveOver: icon {{ "history_unread_poll_vote-40x40", historyToDownFgOver, point(6px, 6px) }};
+}
 historyUnreadThingsSkip: 4px;
 
 historyQuoteStyle: QuoteStyle(defaultQuoteStyle) {
@@ -1047,6 +1266,8 @@ historyComposeField: InputField(defaultInputField) {
 }
 historyComposeFieldMaxHeight: 224px;
 historyComposeFieldFadeHeight: 6px;
+historySendRight: 2px;
+historySendPadding: 9px;
 // historyMinHeight: 56px;
 
 historyAttach: IconButton(defaultIconButton) {
@@ -1058,9 +1279,7 @@ historyAttach: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(2px, 3px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 
 historyMessagesTTL: IconButtonWithText {
@@ -1082,9 +1301,15 @@ historyReplaceMedia: IconButton(historyAttach) {
 		color: lightButtonBgOver;
 	}
 }
+historyAddMedia: IconButton(historyAttach) {
+	icon: icon {{ "chat/input_attach", windowBgActive }};
+	iconOver: icon {{ "chat/input_attach", windowBgActive }};
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: lightButtonBgOver;
+	}
+}
 
 historyAttachEmojiActive: icon {{ "chat/input_smile_face", windowBgActive }};
-historyEmojiCircle: size(20px, 20px);
 historyEmojiCircleLine: 1.5;
 historyEmojiCircleFg: historyComposeIconFg;
 historyEmojiCircleFgOver: historyComposeIconFgOver;
@@ -1110,6 +1335,16 @@ historyScheduledToggle: IconButton(historyAttach) {
 		{ "chat/input_scheduled_dot", attentionButtonFg }
 	};
 }
+historyGiftToUser: IconButton(historyAttach) {
+	icon: icon {{ "chat/input_gift", historyComposeIconFg }};
+	iconOver: icon {{ "chat/input_gift", historyComposeIconFgOver }};
+}
+historySuggestPostToggle: IconButton(historyAttach) {
+	icon: icon{{ "chat/input_paid", historyComposeIconFg }};
+	iconOver: icon{{ "chat/input_paid", historyComposeIconFgOver }};
+}
+historySuggestIconPosition: point(4px, 4px);
+historySuggestIconActive: icon{{ "chat/input_paid", windowActiveTextFg }};
 
 historyAttachEmojiInner: IconButton(historyAttach) {
 	icon: icon {{ "chat/input_smile_face", historyComposeIconFg }};
@@ -1122,6 +1357,7 @@ historyAttachEmoji: EmojiButton {
 	lineFgOver: historyEmojiCircleFgOver;
 }
 boxAttachEmoji: EmojiButton(historyAttachEmoji) {
+	bg: transparent;
 	inner: IconButton(historyAttachEmojiInner) {
 		width: 30px;
 		height: 30px;
@@ -1132,7 +1368,6 @@ boxAttachEmojiTop: 20px;
 
 historySendIcon: icon {{ "chat/input_send", historySendIconFg }};
 historySendIconOver: icon {{ "chat/input_send", historySendIconFgOver }};
-historySendIconPosition: point(10px, 11px);
 historySendSize: size(44px, 46px);
 historyScheduleIcon: icon {{ "chat/input_schedule", historyComposeAreaBg }};
 historyScheduleIconPosition: point(7px, 8px);
@@ -1161,14 +1396,9 @@ historyRecordVoiceFgOver: historyComposeIconFgOver;
 historyRecordVoiceFgInactive: attentionButtonFg;
 historyRecordVoiceFgActive: windowBgActive;
 historyRecordVoiceFgActiveIcon: windowFgActive;
-historyRecordVoice: icon {{ "chat/input_record", historyRecordVoiceFg }};
-historyRecordVoiceOver: icon {{ "chat/input_record", historyRecordVoiceFgOver }};
 historyRecordVoiceOnceBg: icon {{ "voice_lock/audio_once_bg", historySendIconFg }};
-historyRecordVoiceOnceBgOver: icon {{ "voice_lock/audio_once_bg", historySendIconFgOver }};
 historyRecordVoiceOnceFg: icon {{ "voice_lock/audio_once_number", windowFgActive }};
-historyRecordVoiceOnceFgOver: icon {{ "voice_lock/audio_once_number", windowFgActive }};
 historyRecordVoiceOnceInactive: icon {{ "chat/audio_once", windowSubTextFg }};
-historyRecordVoiceActive: icon {{ "chat/input_record_filled", historyRecordVoiceFgActiveIcon }};
 historyRecordSendIconPosition: point(2px, 0px);
 historyRecordVoiceRippleBgActive: lightButtonBgOver;
 historyRecordSignalRadius: 5px;
@@ -1177,7 +1407,6 @@ historyRecordCancelActive: historySendIconFg;
 historyRecordFont: font(13px);
 historyRecordDurationSkip: 12px;
 historyRecordDurationFg: historyComposeAreaFg;
-historyRecordTTLLineWidth: 2px;
 
 historyRecordMainBlobMinRadius: 23px;
 historyRecordMainBlobMaxRadius: 37px;
@@ -1214,6 +1443,7 @@ historyRecordLockBody: icon {{ "voice_lock/record_lock_body", historyToDownBg }}
 historyRecordLockMargin: margins(4px, 4px, 4px, 4px);
 historyRecordLockArrow: icon {{ "voice_lock/voice_arrow", historyToDownFg }};
 historyRecordLockInput: icon {{ "voice_lock/input_mic_s", historyToDownFg }};
+historyRecordLockRound: icon {{ "voice_lock/input_round_s", historyToDownFg }};
 historyRecordLockRippleMargin: margins(6px, 6px, 6px, 6px);
 
 historyRecordDelete: IconButton(historyAttach) {
@@ -1221,16 +1451,25 @@ historyRecordDelete: IconButton(historyAttach) {
 	iconOver: icon {{ "voice_lock/recorded_delete", historyComposeIconFgOver }};
 	iconPosition: point(10px, 11px);
 }
-historyRecordWaveformRightSkip: 10px;
 historyRecordWaveformBgMargins: margins(5px, 8px, 5px, 9px);
+historyRecordWaveformBgRadius: 7px;
+historyRecordWaveformOutsideAlpha: 0.6;
+historyRecordWaveformInactiveAlpha: 0.7;
+historyRecordCenterControlHeight: 18px;
+historyRecordCenterControlIconScale: 0.6;
+historyRecordCenterControlPadding: 4px;
+historyRecordCenterControlTextSkip: 2px;
+historyRecordCenterControlMinimumProgressPadding: 5px;
 
 historyRecordWaveformBar: 3px;
+historyRecordTrimHandleWidth: 10px;
+historyRecordTrimHandleInnerSize: size(2px, 8px);
 
 historyRecordLockPosition: point(1px, 22px);
 
 historyRecordCancelButtonWidth: 100px;
-historyRecordCancelButtonFg: lightButtonFg;
 
+historyRecordTooltipSkip: 8px;
 historyRecordTooltip: ImportantTooltip(defaultImportantTooltip) {
 	padding: margins(4px, 4px, 4px, 4px);
 	radius: 11px;
@@ -1268,14 +1507,45 @@ defaultRecordBar: RecordBar {
 }
 
 historySend: SendButton {
+	sendIconPosition: point(10px, 11px);
 	inner: IconButton(historyAttach) {
 		icon: historySendIcon;
 		iconOver: historySendIconOver;
 	}
-	record: historyRecordVoice;
-	recordOver: historyRecordVoiceOver;
+	stars: RoundButton(defaultActiveButton) {
+		height: 28px;
+		padding: margins(0px, 0px, 6px, 0px);
+		textTop: 5px;
+		width: -8px;
+	}
+	recordSize: size(26px, 26px);
 	sendDisabledFg: historyComposeIconFg;
+	sendIconFg: historySendIconFg;
+}
+historyAiComposeButton: IconButton(historyAttach) {
+	width: 28px;
+	height: 28px;
+	rippleAreaSize: 28px;
+	rippleAreaPosition: point(0px, 0px);
+}
+historyAiComposeButtonLetters: icon{{ "chat/ai_letters-20x20", historyComposeIconFg }};
+historyAiComposeButtonStar1: icon{{ "chat/ai_star1-20x20", historyComposeIconFg }};
+historyAiComposeButtonStar2: icon{{ "chat/ai_star2-20x20", historyComposeIconFg }};
+historyAiComposeButtonPosition: point(-8px, -4px);
+historySendAsFileButton: IconButton(historyAiComposeButton) {
+	icon: icon {{ "chat/text_to_file-18x18", historyComposeIconFg }};
+	iconOver: icon {{ "chat/text_to_file-18x18", historyComposeIconFgOver }};
+}
+historyAiComposeTooltipSkip: 8px;
+importantTooltipHide: IconButton(defaultIconButton) {
+	width: 34px;
+	height: 20px;
+	iconPosition: point(-1px, -1px);
+	icon: icon {{ "calls/video_tooltip", importantTooltipFg }};
+	iconOver: icon {{ "calls/video_tooltip", importantTooltipFg }};
+	ripple: emptyRippleAnimation;
 }
+boxAiComposeButtonPosition: point(0px, -4px);
 
 defaultComposeFilesMenu: IconButton(defaultIconButton) {
 	width: 48px;
@@ -1287,13 +1557,12 @@ defaultComposeFilesMenu: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(1px, 6px);
 	rippleAreaSize: 42px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 defaultComposeFilesField: InputField(defaultInputField) {
 	textMargins: margins(1px, 26px, 31px, 4px);
 	heightMax: 158px;
+	style: historyTextStyle;
 }
 defaultComposeFiles: ComposeFiles {
 	check: defaultCheck;
@@ -1317,9 +1586,46 @@ defaultRestrictionLabel: FlatLabel(defaultFlatLabel) {
 	textFg: placeholderFg;
 	align: align(top);
 }
+defaultSendAsButton: SendAsButton {
+	width: 44px;
+	height: 46px;
+	size: 28px;
+	activeBg: activeButtonBg;
+	activeFg: activeButtonFg;
+	cross: CrossAnimation {
+		size: 28px;
+		skip: 10px;
+		stroke: 1.5;
+		minScale: 0.3;
+	}
+	duration: 150;
+}
+defaultChooseSendAs: ChooseSendAs {
+	button: defaultSendAsButton;
+	label: FlatLabel(defaultFlatLabel) {
+		minWidth: 272px;
+	}
+	list: PeerList(peerListBox) {
+		item: PeerListItem(peerListBoxItem) {
+			height: 56px;
+			checkbox: RoundImageCheckbox(defaultPeerListCheckbox) {
+				check: RoundCheckbox(defaultRoundCheckbox) {
+					size: 0px;
+				}
+				imageRadius: 19px;
+				imageSmallRadius: 15px;
+			}
+			photoSize: 38px;
+			photoPosition: point(24px, 9px);
+			namePosition: point(73px, 9px);
+			statusPosition: point(73px, 28px);
+		}
+	}
+}
 defaultComposeControls: ComposeControls {
 	bg: historyComposeAreaBg;
 	radius: 0px;
+	padding: margins(historySendRight, historySendPadding, historySendRight, historySendPadding);
 
 	field: historyComposeField;
 	send: historySend;
@@ -1331,9 +1637,11 @@ defaultComposeControls: ComposeControls {
 	tabbedHeightMax: emojiPanMaxHeight;
 	record: defaultRecordBar;
 	files: defaultComposeFiles;
+	photoQualityBadgeOuterSkip: 3px;
 	premium: defaultPremiumLimits;
 	boxField: defaultInputField;
 	restrictionLabel: defaultRestrictionLabel;
+	chooseSendAs: defaultChooseSendAs;
 }
 
 moreChatsBarHeight: 48px;
@@ -1349,9 +1657,7 @@ moreChatsBarClose: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(0px, 4px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 
 reportReasonTopSkip: 8px;
@@ -1368,8 +1674,7 @@ defaultReportBox: ReportBox {
 	}
 	label: boxLabel;
 	field: newGroupDescription;
-	dividerBg: boxDividerBg;
-	dividerFg: windowSubTextFg;
+	divider: defaultDividerLabel;
 	spam: menuIconDelete;
 	fake: menuIconFake;
 	violence: menuIconViolence;
@@ -1419,9 +1724,6 @@ editTagField: InputField(defaultInputField) {
 
 	heightMin: 36px;
 }
-editTagLimit: FlatLabel(defaultFlatLabel) {
-	textFg: windowSubTextFg;
-}
 
 editStickerSetNameField: InputField(defaultInputField) {
 	textMargins: margins(0px, 8px, 26px, 4px);
@@ -1517,3 +1819,115 @@ pickLocationChooseOnMap: RoundButton(defaultActiveButton) {
 sendGifBox: Box(defaultBox) {
 	shadowIgnoreBottomSkip: true;
 }
+
+processingVideoTipMaxWidth: 364px;
+processingVideoTipShift: 8px;
+processingVideoToast: Toast(defaultToast) {
+	minWidth: 32px;
+	maxWidth: 380px;
+	padding: margins(19px, 17px, 19px, 17px);
+}
+processingVideoPreviewSkip: 8px;
+processingVideoView: RoundButton(defaultActiveButton) {
+	width: -24px;
+	height: 52px;
+	textTop: 17px;
+	textFg: mediaviewTextLinkFg;
+	textFgOver: mediaviewTextLinkFg;
+	textBg: transparent;
+	textBgOver: transparent;
+	ripple: emptyRippleAnimation;
+}
+
+frozenBarTitle: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+	textFg: attentionButtonFg;
+}
+frozenRestrictionTitle: FlatLabel(frozenBarTitle) {
+	align: align(top);
+}
+frozenBarSubtitle: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+}
+frozenRestrictionSubtitle: FlatLabel(frozenBarSubtitle) {
+	align: align(top);
+}
+frozenInfoBox: Box(defaultBox) {
+	buttonPadding: margins(16px, 11px, 16px, 16px);
+	buttonHeight: 42px;
+	button: RoundButton(defaultActiveButton) {
+		height: 42px;
+		textTop: 12px;
+		style: semiboldTextStyle;
+	}
+	shadowIgnoreTopSkip: true;
+}
+
+menuTranscribeItemPadding: margins(0px, 10px, 0px, 10px);
+menuTranscribeDummyButton: IconButton(defaultIconButton) {
+	width: 40px;
+	height: 40px;
+
+	icon: icon {{ "chat/input_attach", historyComposeIconFgOver }};
+	iconOver: icon {{ "chat/input_attach", historyComposeIconFgOver }};
+
+	rippleAreaPosition: point(3px, 3px);
+	rippleAreaSize: 34px;
+	ripple: defaultRippleAnimationBgOver;
+}
+
+roundVideoFont: font(14px semibold);
+
+topPeersSelectorUserpicSize: 31px;
+topPeersSelectorUserpicGap: 8px;
+topPeersSelectorPadding: 6px;
+topPeersSelectorUserpicExpand: 0.1;
+topPeersSelectorSkip: point(9px, -5px);
+
+topPeersSelectorImportantTooltip: ImportantTooltip(defaultImportantTooltip) {
+	bg: msgServiceBg;
+	radius: 9px;
+}
+topPeersSelectorImportantTooltipLabel: FlatLabel(defaultImportantTooltipLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(semibold 12px);
+	}
+}
+
+aiComposeSendButton: SendButton(historySend) {
+	sendIconPosition: point(9px, 9px);
+	sendIconFillPadding: 5px;
+	inner: IconButton(historyAttach) {
+		width: 42px;
+		height: 42px;
+		icon: icon {{ "chat/input_send_round", windowFgActive }};
+		iconOver: icon {{ "chat/input_send_round", windowFgActive }};
+		rippleAreaSize: 40px;
+		rippleAreaPosition: point(1px, 1px);
+	}
+	sendIconFg: windowFgActive;
+}
+
+aiComposeBodyLabel: FlatLabel(defaultFlatLabel) {
+	minWidth: 300px;
+	align: align(topleft);
+	style: TextStyle(defaultTextStyle) {
+		lineHeight: 22px;
+		blockquote: QuoteStyle(historyQuoteStyle) {
+			padding: margins(10px, 2px, 20px, 2px);
+			icon: icon{{ "chat/mini_quote", windowFg }};
+			iconPosition: point(4px, 4px);
+			expand: icon{{ "intro_country_dropdown", windowFg }};
+			expandPosition: point(6px, 4px);
+			collapse: icon{{ "intro_country_dropdown-flip_vertical", windowFg }};
+			collapsePosition: point(6px, 4px);
+		}
+		pre: QuoteStyle(historyQuoteStyle) {
+			header: 20px;
+			headerPosition: point(10px, 2px);
+			scrollable: true;
+			icon: icon{{ "chat/mini_copy", windowFg }};
+			iconPosition: point(4px, 2px);
+		}
+	}
+}
diff --git a/Telegram/SourceFiles/chat_helpers/compose/compose_features.h b/Telegram/SourceFiles/chat_helpers/compose/compose_features.h
index 2f33d81633a8e2..67f816290a9c35 100644
--- a/Telegram/SourceFiles/chat_helpers/compose/compose_features.h
+++ b/Telegram/SourceFiles/chat_helpers/compose/compose_features.h
@@ -13,11 +13,13 @@ struct ComposeFeatures {
 	bool likes : 1 = false;
 	bool sendAs : 1 = true;
 	bool ttlInfo : 1 = true;
+	bool attachments : 1 = true;
 	bool botCommandSend : 1 = true;
 	bool silentBroadcastToggle : 1 = true;
 	bool attachBotsMenu : 1 = true;
 	bool inlineBots : 1 = true;
 	bool megagroupSet : 1 = true;
+	bool collectibleStatus : 1 = false;
 	bool stickersSettings : 1 = true;
 	bool openStickerSets : 1 = true;
 	bool autocompleteHashtags : 1 = true;
@@ -25,6 +27,10 @@ struct ComposeFeatures {
 	bool autocompleteCommands : 1 = true;
 	bool suggestStickersByEmoji : 1 = true;
 	bool commonTabbedPanel : 1 = true;
+	bool recordMediaMessage : 1 = true;
+	bool editMessageStars : 1 = false;
+	bool emojiOnlyPanel : 1 = false;
+	bool videoStream : 1 = false;
 };
 
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/compose/compose_show.cpp b/Telegram/SourceFiles/chat_helpers/compose/compose_show.cpp
index ba904b77c26a4f..872f4ef7afa0c1 100644
--- a/Telegram/SourceFiles/chat_helpers/compose/compose_show.cpp
+++ b/Telegram/SourceFiles/chat_helpers/compose/compose_show.cpp
@@ -19,15 +19,15 @@ rpl::producer<bool> Show::adjustShadowLeft() const {
 }
 
 ResolveWindow ResolveWindowDefault() {
-	return [](not_null<Main::Session*> session, WindowUsage usage)
+	return [](not_null<Main::Session*> session)
 	-> Window::SessionController* {
 		const auto check = [&](Window::Controller *window) {
-			if (const auto controller = window->sessionController()) {
-				if (&controller->session() == session) {
-					return controller;
-				}
-			}
-			return (Window::SessionController*)nullptr;
+			const auto controller = window
+				? window->sessionController()
+				: nullptr;
+			return (controller && (&controller->session() == session))
+				? controller
+				: nullptr;
 		};
 		auto &app = Core::App();
 		const auto account = not_null(&session->account());
@@ -37,6 +37,8 @@ ResolveWindow ResolveWindowDefault() {
 			return b;
 		} else if (const auto c = check(app.windowFor(account))) {
 			return c;
+		} else if (Core::Quitting()) {
+			return nullptr;
 		} else if (const auto d = check(app.ensureSeparateWindowFor(
 				account))) {
 			return d;
@@ -45,8 +47,8 @@ ResolveWindow ResolveWindowDefault() {
 	};
 }
 
-Window::SessionController *Show::resolveWindow(WindowUsage usage) const {
-	return ResolveWindowDefault()(&session(), usage);
+Window::SessionController *Show::resolveWindow() const {
+	return ResolveWindowDefault()(&session());
 }
 
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/compose/compose_show.h b/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
index 28fc7ff47a2698..95ed8046ea2c9b 100644
--- a/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
+++ b/Telegram/SourceFiles/chat_helpers/compose/compose_show.h
@@ -40,13 +40,8 @@ enum class PauseReason {
 using PauseReasons = base::flags<PauseReason>;
 inline constexpr bool is_flag_type(PauseReason) { return true; };
 
-enum class WindowUsage {
-	PremiumPromo,
-};
-
 using ResolveWindow = Fn<Window::SessionController*(
-	not_null<Main::Session*>,
-	WindowUsage)>;
+	not_null<Main::Session*>)>;
 [[nodiscard]] ResolveWindow ResolveWindowDefault();
 
 class Show : public Main::SessionShow {
@@ -68,8 +63,7 @@ class Show : public Main::SessionShow {
 
 	virtual void processChosenSticker(FileChosen &&chosen) const = 0;
 
-	[[nodiscard]] virtual Window::SessionController *resolveWindow(
-		WindowUsage) const;
+	[[nodiscard]] virtual Window::SessionController *resolveWindow() const;
 };
 
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_interactions.cpp b/Telegram/SourceFiles/chat_helpers/emoji_interactions.cpp
index 9f7fe7bb2803c8..48f4506ba4f8d9 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_interactions.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_interactions.cpp
@@ -53,7 +53,7 @@ EmojiInteractions::EmojiInteractions(not_null<Main::Session*> session)
 	_session->changes().messageUpdates(
 		Data::MessageUpdate::Flag::Destroyed
 		| Data::MessageUpdate::Flag::Edited
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		if (update.flags & Data::MessageUpdate::Flag::Destroyed) {
 			_outgoing.remove(update.item);
 			_incoming.remove(update.item);
@@ -281,7 +281,7 @@ void EmojiInteractions::sendAccumulatedOutgoing(
 	const auto emoji = from->emoji;
 	const auto requestId = _session->api().request(MTPmessages_SetTyping(
 		MTP_flags(0),
-		peer->input,
+		peer->input(),
 		MTPint(), // top_msg_id
 		MTP_sendMessageEmojiInteraction(
 			MTP_string(from->emoticon),
@@ -408,7 +408,7 @@ void EmojiInteractions::setWaitingForDownload(bool waiting) {
 	_waitingForDownload = waiting;
 	if (_waitingForDownload) {
 		_session->downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			check();
 		}, _downloadCheckLifetime);
 	} else {
@@ -426,7 +426,7 @@ void EmojiInteractions::playStarted(not_null<PeerData*> peer, QString emoji) {
 	}
 	_session->api().request(MTPmessages_SetTyping(
 		MTP_flags(0),
-		peer->input,
+		peer->input(),
 		MTPint(), // top_msg_id
 		MTP_sendMessageEmojiInteractionSeen(MTP_string(emoji))
 	)).send();
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp b/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
index 500de20b6ccc92..3382489d5c8d3e 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
@@ -523,7 +523,7 @@ void EmojiKeywords::handleSessionChanges() {
 	Core::App().domain().activeSessionValue( // #TODO multi someSessionValue
 	) | rpl::map([](Main::Session *session) {
 		return session ? &session->api() : nullptr;
-	}) | rpl::start_with_next([=](ApiWrap *api) {
+	}) | rpl::on_next([=](ApiWrap *api) {
 		apiChanged(api);
 	}, _lifetime);
 }
@@ -536,7 +536,7 @@ void EmojiKeywords::apiChanged(ApiWrap *api) {
 			) | rpl::filter([=] {
 				// Refresh with the suggested language if we already were asked.
 				return !_data.empty();
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				refresh();
 			}, _suggestedChangeLifetime);
 		}));
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 7ea95f736ea1be..31ef56eceeda8f 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -7,12 +7,14 @@ For license and copyright information please follow this link:
 */
 #include "chat_helpers/emoji_list_widget.h"
 
+#include "window/window_media_preview.h"
 #include "api/api_peer_photo.h"
 #include "apiwrap.h"
 #include "base/unixtime.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/tabbed_search.h"
 #include "ui/text/format_values.h"
+#include "ui/text/text_entity.h"
 #include "ui/effects/animations.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
@@ -27,9 +29,12 @@ For license and copyright information please follow this link:
 #include "ui/power_saving.h"
 #include "ui/ui_utility.h"
 #include "ui/cached_round_corners.h"
+#include "boxes/share_box.h"
 #include "boxes/sticker_set_box.h"
+#include "boxes/stickers_box.h"
 #include "lang/lang_keys.h"
 #include "layout/layout_position.h"
+#include "data/data_emoji_statuses.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
@@ -45,9 +50,10 @@ For license and copyright information please follow this link:
 #include "emoji_suggestions_helper.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "mainwidget.h"
 #include "core/core_settings.h"
 #include "core/application.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
@@ -60,7 +66,10 @@ namespace {
 constexpr auto kCollapsedRows = 3;
 constexpr auto kAppearDuration = 0.3;
 constexpr auto kCustomSearchLimit = 256;
+constexpr auto kCloudSearchPageLimit = 50;
 constexpr auto kColorPickerDelay = crl::time(500);
+constexpr auto kSearchRequestDelay = 400;
+constexpr auto kPreloadSearchPages = 4;
 
 using Core::RecentEmojiId;
 using Core::RecentEmojiDocument;
@@ -116,6 +125,7 @@ class EmojiColorPicker final : public Ui::RpWidget {
 	QPoint _innerPosition;
 	Ui::RoundRect _backgroundRect;
 	Ui::RoundRect _overBg;
+	Ui::BoxShadow _shadow;
 
 	bool _hiding = false;
 	QPixmap _cache;
@@ -134,6 +144,7 @@ struct EmojiListWidget::CustomEmojiInstance {
 };
 
 struct EmojiListWidget::RecentOne {
+	std::shared_ptr<Data::EmojiStatusCollectible> collectible;
 	Ui::Text::CustomEmoji *custom = nullptr;
 	RecentEmojiId id;
 	mutable QImage premiumLock;
@@ -145,7 +156,8 @@ EmojiColorPicker::EmojiColorPicker(
 : RpWidget(parent)
 , _st(st)
 , _backgroundRect(st::emojiPanRadius, _st.bg)
-, _overBg(st::emojiPanRadius, _st.overBg) {
+, _overBg(st::emojiPanRadius, _st.overBg)
+, _shadow(_st.showAnimation.shadow) {
 	setMouseTracking(true);
 }
 
@@ -228,7 +240,7 @@ void EmojiColorPicker::paintEvent(QPaintEvent *e) {
 		p.drawPixmap(0, 0, _cache);
 		return;
 	}
-	Ui::Shadow::paint(p, inner, width(), _st.showAnimation.shadow);
+	_shadow.paint(p, inner, st::emojiPanRadius);
 	_backgroundRect.paint(p, inner);
 
 	const auto skip = topColorAllSkip();
@@ -447,6 +459,13 @@ void EmojiColorPicker::drawVariant(QPainter &p, int variant) {
 		w.y() + _innerPosition.y());
 }
 
+std::vector<EmojiStatusId> DocumentListToRecent(
+		const std::vector<DocumentId> &documents) {
+	return documents | ranges::views::transform([](DocumentId id) {
+		return EmojiStatusId{ .documentId = id };
+	}) | ranges::to_vector;
+}
+
 EmojiListWidget::EmojiListWidget(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
@@ -471,6 +490,9 @@ EmojiListWidget::EmojiListWidget(
 , _features(descriptor.features)
 , _onlyUnicodeEmoji(descriptor.mode == Mode::PeerTitle)
 , _mode(_onlyUnicodeEmoji ? Mode::Full : descriptor.mode)
+, _mediaPreviewParent(descriptor.mediaPreviewParent)
+, _mediaPreviewMargins(descriptor.mediaPreviewMargins)
+, _mediaPreviewPanelStyle(descriptor.mediaPreviewPanelStyle)
 , _api(&session().mtp())
 , _staticCount(_mode == Mode::Full ? kEmojiSectionCount : 1)
 , _premiumIcon(_mode == Mode::EmojiStatus
@@ -486,6 +508,7 @@ EmojiListWidget::EmojiListWidget(
 	&session(),
 	st::emojiPremiumLock))
 , _collapsedBg(st::emojiPanExpand.height / 2, st().headerFg)
+, _searchRequestTimer([=] { sendSearchRequest(); })
 , _picker(this, st())
 , _showPickerTimer([=] { showPicker(); })
 , _previewTimer([=] { showPreview(); }) {
@@ -497,6 +520,7 @@ EmojiListWidget::EmojiListWidget(
 	if (_mode != Mode::RecentReactions
 		&& _mode != Mode::BackgroundEmoji
 		&& _mode != Mode::ChannelStatus
+		&& _mode != Mode::CustomOnly
 		&& !_onlyUnicodeEmoji) {
 		setupSearch();
 	}
@@ -504,12 +528,17 @@ EmojiListWidget::EmojiListWidget(
 	if (_mode == Mode::ChannelStatus) {
 		session().api().peerPhoto().emojiListValue(
 			Api::PeerPhoto::EmojiListType::NoChannelStatus
-		) | rpl::start_with_next([=](const std::vector<DocumentId> &list) {
+		) | rpl::on_next([=](const std::vector<DocumentId> &list) {
 			_restrictedCustomList = { begin(list), end(list) };
 			if (!_custom.empty()) {
 				refreshCustom();
 			}
 		}, lifetime());
+	} else if (_mode == Mode::EmojiStatus && _features.collectibleStatus) {
+		session().data().emojiStatuses().collectiblesUpdates(
+		) | rpl::on_next([=] {
+			refreshCustom();
+		}, lifetime());
 	}
 
 	_customSingleSize = Data::FrameSizeFromTag(
@@ -524,12 +553,12 @@ EmojiListWidget::EmojiListWidget(
 	}
 
 	_picker->chosen(
-	) | rpl::start_with_next([=](EmojiChosen data) {
+	) | rpl::on_next([=](EmojiChosen data) {
 		colorChosen(data);
 	}, lifetime());
 
 	_picker->hidden(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		pickerHidden();
 	}, lifetime());
 
@@ -537,22 +566,46 @@ EmojiListWidget::EmojiListWidget(
 		Data::PeerUpdate::Flag::EmojiSet
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer.get() == _megagroupSet);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		refreshCustom();
 		resizeToWidth(width());
 	}, lifetime());
 
 	session().data().stickers().updated(
 		Data::StickersType::Emoji
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshCustom();
 		resizeToWidth(width());
+		if (!_searchMode
+			|| !searchShortcutSelected()
+			|| _searchSets.empty()) {
+			return;
+		}
+		// Skip refill when size already matches to preserve hover state.
+		const auto &sets = session().data().stickers().sets();
+		const auto it = sets.find(_searchSelectedSetId);
+		if (it == sets.end()) {
+			return;
+		}
+		const auto set = it->second.get();
+		const auto have = int(_searchSets.front().list.size());
+		const auto want = int(set->stickers.empty()
+			? set->covers.size()
+			: set->stickers.size());
+		if (have == want) {
+			return;
+		}
+		_searchSets.clear();
+		fillSelectedSearchShortcut();
+		resizeToWidth(width());
+		update();
+		updateSelected();
 	}, lifetime());
 
 	rpl::combine(
 		Data::AmPremiumValue(&session()),
 		session().premiumPossibleValue()
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		refreshCustom();
 		resizeToWidth(width());
 	}, lifetime());
@@ -561,7 +614,7 @@ EmojiListWidget::EmojiListWidget(
 		rpl::empty
 	) | rpl::then(
 		style::PaletteChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		initButton(_add, tr::lng_stickers_featured_add(tr::now), false);
 		initButton(_unlock, tr::lng_emoji_featured_unlock(tr::now), true);
 		initButton(_restore, tr::lng_emoji_premium_restore(tr::now), true);
@@ -614,11 +667,24 @@ void EmojiListWidget::applyNextSearchQuery() {
 		const auto modeChanged = (_searchMode != searching);
 		clearSelection();
 		if (modeChanged) {
+			if (_picker) {
+				_picker->hideAnimated();
+			}
+			_colorAllRipple = nullptr;
+			for (auto &set : _custom) {
+				set.ripple = nullptr;
+			}
 			_searchMode = searching;
 		}
 		if (!searching) {
 			_searchResults.clear();
 			_searchCustomIds.clear();
+			_searchSets.clear();
+			_searchShortcutSets.clear();
+			_searchSelectedSetId = 0;
+			_searchShortcutsScroll = 0;
+			_searchShortcutsScrollMax = 0;
+			_searchShortcutsDragging = false;
 		}
 		resizeToWidth(width());
 		_recentShownCount = searching
@@ -631,19 +697,27 @@ void EmojiListWidget::applyNextSearchQuery() {
 		updateSelected();
 	};
 	if (_searchQuery.empty()) {
+		cancelSearchRequest();
 		finish(false);
 		return;
 	}
+	_searchSelectedSetId = 0;
+	_searchShortcutsScroll = 0;
+	_searchShortcutsDragging = false;
 	const auto guard = gsl::finally([&] { finish(); });
 	auto plain = collectPlainSearchResults();
-	if (_searchEmoji == _searchEmojiPrevious) {
-		return;
+	_searchEmoticon = QString();
+	{
+		auto exactSet = base::flat_set<EmojiPtr>();
+		const auto exact = SearchEmoji(_searchQuery, exactSet, true);
+		for (const auto emoji : exact) {
+			_searchEmoticon += emoji->text();
+		}
 	}
 	_searchResults.clear();
 	_searchCustomIds.clear();
-	if (_mode != Mode::Full || session().premium()) {
-		appendPremiumSearchResults();
-	}
+	_searchSets.clear();
+	_searchShortcutSets.clear();
 	if (_mode == Mode::Full) {
 		for (const auto emoji : plain) {
 			_searchResults.push_back({
@@ -651,14 +725,90 @@ void EmojiListWidget::applyNextSearchQuery() {
 			});
 		}
 	}
+	if (_mode != Mode::Full || session().premium()) {
+		appendPremiumSearchResults();
+	}
+
+	_searchQueryText = ranges::accumulate(
+		_searchQuery,
+		QString(),
+		[](QString a, const QString &b) {
+			return a.isEmpty() ? b : (a + ' ' + b);
+		}).trimmed();
+	if (!_searchQueryText.isEmpty()) {
+		toggleSearchLoading(false);
+		if (const auto requestId = base::take(_searchCloudRequestId)) {
+			_api.request(requestId).cancel();
+		}
+		if (const auto requestId = base::take(_searchSetsRequestId)) {
+			_api.request(requestId).cancel();
+		}
+		_searchNextRequestQuery = _searchQueryText;
+		_searchRequestQuery = _searchQueryText;
+		refreshSearchShortcuts();
+		const auto cloudCached = _searchCloudCache.find(_searchRequestQuery)
+			!= _searchCloudCache.cend();
+		const auto setsCached = _searchSetsCache.find(_searchRequestQuery)
+			!= _searchSetsCache.cend();
+		if (cloudCached || setsCached) {
+			_searchRequestTimer.cancel();
+			fillCloudSearchResults();
+			if (!cloudCached || !setsCached) {
+				sendSearchRequest();
+			}
+		} else {
+			_searchRequestTimer.callOnce(kSearchRequestDelay);
+		}
+	}
 }
 
 void EmojiListWidget::showPreview() {
 	if (const auto over = std::get_if<OverEmoji>(&_pressed)) {
 		if (const auto custom = lookupCustomEmoji(over)) {
-			_show->showMediaPreview(custom->stickerSetOrigin(), custom);
-			_previewShown = true;
+			_previewShown = showPreviewFor(custom.document);
+		}
+	}
+}
+
+bool EmojiListWidget::showPreviewFor(not_null<DocumentData*> document) {
+	if ((_mode == Mode::FullReactions || _mode == Mode::RecentReactions)
+		&& _mediaPreviewParent) {
+		ensureMediaPreview();
+		if (_mediaPreview) {
+			_mediaPreview->showPreview(document->stickerSetOrigin(), document);
+			return true;
+		}
+	}
+	return _show->showMediaPreview(document->stickerSetOrigin(), document);
+}
+
+void EmojiListWidget::ensureMediaPreview() {
+	if (!_mediaPreviewParent) {
+		return;
+	}
+	if (_mediaPreview) {
+		_mediaPreview->raise();
+		return;
+	}
+	if (const auto sessionController = _show->resolveWindow()) {
+		const auto tooSmall = _mediaPreviewPanelStyle
+			&& (_mediaPreviewParent->height()
+				< st::emojiPanEmojiPreviewMinHeight);
+		const auto parent = tooSmall
+			? sessionController->content()
+			: _mediaPreviewParent;
+		_mediaPreview = base::make_unique_q<Window::MediaPreviewWidget>(
+			parent,
+			sessionController);
+		if (_mediaPreviewPanelStyle && !tooSmall) {
+			_mediaPreview->setCustomPadding(
+				st::emojiPanReactionsPreviewPadding);
+			_mediaPreview->setBackgroundMargins(_mediaPreviewMargins);
+			_mediaPreview->setCustomRadius(st::emojiPanEmojiPreviewRadius);
 		}
+		_mediaPreview->show();
+		_mediaPreview->setGeometry(parent->rect());
+		_mediaPreview->raise();
 	}
 }
 
@@ -705,8 +855,602 @@ void EmojiListWidget::appendPremiumSearchResults() {
 	}
 }
 
+void EmojiListWidget::toggleSearchLoading(bool loading) {
+	if (_search) {
+		_search->setLoading(loading);
+	}
+	if (_searchLoading != loading) {
+		_searchLoading = loading;
+		update();
+	}
+}
+
+void EmojiListWidget::sendSearchRequest() {
+	_searchRequestQuery = _searchNextRequestQuery;
+	if (_searchRequestQuery.isEmpty()) {
+		return;
+	}
+	const auto query = _searchRequestQuery;
+
+	const auto cloudCached = _searchCloudCache.find(
+		query) != _searchCloudCache.cend();
+	const auto setsCached = _searchSetsCache.find(
+		query) != _searchSetsCache.cend();
+	if (cloudCached && setsCached) {
+		toggleSearchLoading(false);
+		return;
+	}
+	toggleSearchLoading(true);
+
+	if (!cloudCached) {
+		requestSearchCloud(query, 0, true);
+	}
+	if (!setsCached) {
+		sendSearchSetsRequest(query);
+	}
+}
+
+void EmojiListWidget::sendSearchSetsRequest(const QString &query) {
+	const auto hash = uint64(0);
+	_searchSetsRequestId = _api.request(
+		MTPmessages_SearchEmojiStickerSets(
+			MTP_flags(0),
+			MTP_string(query),
+			MTP_long(hash))
+	).done([=](const MTPmessages_FoundStickerSets &result) {
+		searchSetsResultsDone(query, result);
+	}).fail([=] {
+		_searchSetsRequestId = 0;
+		if ((_searchRequestQuery == query) && !_searchCloudRequestId) {
+			toggleSearchLoading(false);
+		}
+	}).handleAllErrors().send();
+}
+
+void EmojiListWidget::requestSearchCloud(
+		const QString &query,
+		int offset,
+		bool fallbackToEmpty) {
+	using Flag = MTPmessages_SearchStickers::Flag;
+	const auto hash = uint64(0);
+	_searchCloudRequestId = _api.request(MTPmessages_SearchStickers(
+		MTP_flags(Flag::f_emojis),
+		MTP_string(query),
+		MTP_string(_searchEmoticon),
+		MTP_vector<MTPstring>(SearchStickersLangCodes()),
+		MTP_int(offset),
+		MTP_int(kCloudSearchPageLimit),
+		MTP_long(hash)
+	)).done([=](const MTPmessages_FoundStickers &result) {
+		searchCloudResultsDone(query, offset, result);
+	}).fail([=] {
+		_searchCloudRequestId = 0;
+		if (!fallbackToEmpty) {
+			return;
+		}
+		_searchCloudCache.emplace(query, std::vector<DocumentId>());
+		if ((_searchRequestQuery == query) && !_searchSetsRequestId) {
+			toggleSearchLoading(false);
+			showSearchResults();
+		}
+	}).handleAllErrors().send();
+}
+
+void EmojiListWidget::cancelSearchRequest() {
+	toggleSearchLoading(false);
+	if (const auto requestId = base::take(_searchCloudRequestId)) {
+		_api.request(requestId).cancel();
+	}
+	if (const auto requestId = base::take(_searchSetsRequestId)) {
+		_api.request(requestId).cancel();
+	}
+	_searchRequestTimer.cancel();
+	_searchRequestQuery = QString();
+	_searchNextRequestQuery = QString();
+	_searchCloudCache.clear();
+	_searchCloudNextOffset.clear();
+	_searchSetsCache.clear();
+	_searchSets.clear();
+	_searchShortcutSets.clear();
+	_searchSelectedSetId = 0;
+	_searchShortcutsScroll = 0;
+	_searchShortcutsScrollMax = 0;
+	_searchShortcutsDragging = false;
+}
+
+void EmojiListWidget::searchCloudResultsDone(
+		const QString &query,
+		int requestedOffset,
+		const MTPmessages_FoundStickers &result) {
+	_searchCloudRequestId = 0;
+	const auto active = (_searchRequestQuery == query);
+
+	result.match([&](const MTPDmessages_foundStickersNotModified &data) {
+		LOG(("API: messages.foundStickersNotModified."));
+		auto it = _searchCloudCache.find(query);
+		if (it == _searchCloudCache.cend()) {
+			it = _searchCloudCache.emplace(
+				query,
+				std::vector<DocumentId>()).first;
+		}
+		if (const auto next = data.vnext_offset()) {
+			if (next->v > requestedOffset) {
+				_searchCloudNextOffset[query] = next->v;
+			} else {
+				_searchCloudNextOffset.erase(query);
+			}
+		} else {
+			_searchCloudNextOffset.erase(query);
+		}
+		if (!active) {
+			return;
+		}
+		if (!_searchSetsRequestId) {
+			toggleSearchLoading(false);
+		}
+		showSearchResults();
+		checkPaginateSearchCloud(getVisibleTop(), getVisibleBottom());
+	}, [&](const MTPDmessages_foundStickers &data) {
+		auto it = _searchCloudCache.find(query);
+		if (it == _searchCloudCache.cend()) {
+			it = _searchCloudCache.emplace(
+				query,
+				std::vector<DocumentId>()).first;
+		}
+
+		for (const auto &sticker : data.vstickers().v) {
+			if (const auto doc = session().data().processDocument(
+					sticker)) {
+				it->second.push_back(doc->id);
+			}
+		}
+
+		if (const auto next = data.vnext_offset()) {
+			if (next->v > requestedOffset) {
+				_searchCloudNextOffset[query] = next->v;
+			} else {
+				_searchCloudNextOffset.erase(query);
+			}
+		} else {
+			_searchCloudNextOffset.erase(query);
+		}
+
+		if (!active) {
+			return;
+		}
+
+		if (!_searchSetsRequestId) {
+			toggleSearchLoading(false);
+		}
+		showSearchResults();
+		checkPaginateSearchCloud(
+			getVisibleTop(),
+			getVisibleBottom());
+	});
+}
+
+void EmojiListWidget::loadMoreSearchCloud() {
+	if (_searchCloudRequestId
+		|| _searchRequestQuery.isEmpty()
+		|| (_searchRequestQuery != _searchNextRequestQuery)) {
+		return;
+	}
+	const auto query = _searchRequestQuery;
+	const auto offsetIt = _searchCloudNextOffset.find(query);
+	if (offsetIt == _searchCloudNextOffset.end()) {
+		return;
+	}
+	requestSearchCloud(query, offsetIt->second, false);
+}
+
+void EmojiListWidget::checkPaginateSearchCloud(
+		int visibleTop,
+		int visibleBottom) {
+	if (!_searchMode
+		|| searchShortcutSelected()
+		|| _searchRequestQuery.isEmpty()
+		|| (_searchRequestQuery != _searchNextRequestQuery)
+		|| _searchCloudRequestId) {
+		return;
+	}
+	const auto visibleHeight = visibleBottom - visibleTop;
+	if (visibleHeight <= 0) {
+		return;
+	}
+	if (visibleBottom > height() - visibleHeight * kPreloadSearchPages) {
+		loadMoreSearchCloud();
+	}
+}
+
+void EmojiListWidget::searchSetsResultsDone(
+		const QString &query,
+		const MTPmessages_FoundStickerSets &result) {
+	_searchSetsRequestId = 0;
+	if ((_searchRequestQuery == query) && !_searchCloudRequestId) {
+		toggleSearchLoading(false);
+	}
+
+	result.match([&](const MTPDmessages_foundStickerSetsNotModified &) {
+		LOG(("API Error: "
+			"messages.foundStickerSetsNotModified not expected."));
+	}, [&](const MTPDmessages_foundStickerSets &data) {
+		auto it = _searchSetsCache.find(query);
+		if (it == _searchSetsCache.cend()) {
+			it = _searchSetsCache.emplace(
+				query,
+				std::vector<uint64>()).first;
+		}
+		for (const auto &setData : data.vsets().v) {
+			const auto set
+				= session().data().stickers().feedSet(setData);
+			if (set->stickers.empty() && set->covers.empty()) {
+				continue;
+			}
+			it->second.push_back(set->id);
+		}
+		if (_searchRequestQuery == query) {
+			showSearchResults();
+		}
+	});
+}
+
+void EmojiListWidget::showSearchResults() {
+	clearSelection();
+
+	_searchResults.clear();
+	_searchCustomIds.clear();
+	_searchSets.clear();
+	auto wasShortcuts = base::take(_searchShortcutSets);
+	_searchEmoji.clear();
+
+	refreshSearchShortcuts();
+	for (auto &set : _searchShortcutSets) {
+		const auto i = ranges::find(
+			wasShortcuts,
+			set.id,
+			&CustomSet::id);
+		if (i != wasShortcuts.end() && i->ripple) {
+			set.ripple = std::move(i->ripple);
+		}
+	}
+	if (searchShortcutSelected()) {
+		fillSelectedSearchShortcut();
+	}
+	if (!searchShortcutSelected()) {
+		auto plain = collectPlainSearchResults();
+		if (_mode == Mode::Full) {
+			for (const auto emoji : plain) {
+				_searchResults.push_back({
+					.id = { emoji },
+				});
+			}
+		}
+		if (_mode != Mode::Full || session().premium()) {
+			appendPremiumSearchResults();
+		}
+		fillCloudSearchResults();
+	}
+
+	resizeToWidth(width());
+	_recentShownCount = _searchResults.size();
+	update();
+	updateSelected();
+}
+
+void EmojiListWidget::fillCloudSearchResults() {
+	const auto it = _searchCloudCache.find(_searchRequestQuery);
+	if (it == _searchCloudCache.cend() || it->second.empty()) {
+		return;
+	}
+	const auto test = session().isTestMode();
+	for (const auto id : it->second) {
+		if (!_searchCustomIds.emplace(id).second) {
+			continue;
+		}
+		const auto document = session().data().document(id);
+		const auto sticker = document->sticker();
+		if (!sticker) {
+			continue;
+		}
+		const auto statusId = EmojiStatusId{ id };
+		_searchResults.push_back({
+			.custom = resolveCustomEmoji(
+				statusId,
+				document,
+				SearchEmojiSectionSetId()),
+			.id = { RecentEmojiDocument{ .id = id, .test = test } },
+		});
+	}
+}
+
+void EmojiListWidget::refreshSearchShortcuts() {
+	fillLocalSearchShortcuts(_searchQueryText);
+	const auto it = _searchSetsCache.find(_searchRequestQuery);
+	if (it != _searchSetsCache.cend()) {
+		const auto &sets = session().data().stickers().sets();
+		for (const auto setId : it->second) {
+			if (const auto setIt = sets.find(setId); setIt != sets.end()) {
+				addSearchShortcut(setIt->second.get());
+			}
+		}
+	}
+	if (_searchSelectedSetId
+		&& !ranges::contains(
+			_searchShortcutSets,
+			_searchSelectedSetId,
+			&CustomSet::id)) {
+		_searchSelectedSetId = 0;
+	}
+	refreshSearchShortcutsScroll(width());
+}
+
+void EmojiListWidget::fillLocalSearchShortcuts(const QString &query) {
+	const auto searchWordsList = TextUtilities::PrepareSearchWords(query);
+	if (searchWordsList.isEmpty()) {
+		return;
+	}
+	for (const auto &set : _custom) {
+		if (!set.canRemove) {
+			continue;
+		}
+		const auto words = TextUtilities::PrepareSearchWords(
+			set.title + ' ' + set.set->shortName);
+		if (MatchAllPreparedSearchWords(words, searchWordsList)) {
+			addSearchShortcut(set.set);
+		}
+	}
+}
+
+bool EmojiListWidget::addSearchShortcut(not_null<Data::StickersSet*> set) {
+	if (ranges::contains(_searchShortcutSets, set->id, &CustomSet::id)) {
+		return false;
+	}
+	const auto &documents = set->stickers.empty()
+		? set->covers
+		: set->stickers;
+	auto list = std::vector<CustomOne>();
+	for (const auto document : documents) {
+		if (const auto sticker = document->sticker()) {
+			list.push_back({
+				.custom = resolveCustomEmoji(
+					EmojiStatusId{ document->id },
+					document,
+					set->id),
+				.document = document,
+				.emoji = Ui::Emoji::Find(sticker->alt),
+			});
+			break;
+		}
+	}
+	if (list.empty()) {
+		return false;
+	}
+	const auto installed = !!(set->flags & Data::StickersSetFlag::Installed);
+	_searchShortcutSets.push_back({
+		.id = set->id,
+		.set = set,
+		.thumbnailDocument = set->lookupThumbnailDocument(),
+		.title = set->title,
+		.list = std::move(list),
+		.canRemove = installed,
+	});
+	return true;
+}
+
+std::vector<EmojiListWidget::CustomOne> EmojiListWidget::collectSearchSet(
+		not_null<Data::StickersSet*> set) {
+	const auto &documents = set->stickers.empty()
+		? set->covers
+		: set->stickers;
+	auto result = std::vector<CustomOne>();
+	result.reserve(documents.size());
+	for (const auto document : documents) {
+		if (const auto sticker = document->sticker()) {
+			const auto statusId = EmojiStatusId{ document->id };
+			result.push_back({
+				.custom = resolveCustomEmoji(
+					statusId,
+					document,
+					set->id),
+				.document = document,
+				.emoji = Ui::Emoji::Find(sticker->alt),
+			});
+		}
+	}
+	return result;
+}
+
+void EmojiListWidget::fillSelectedSearchShortcut() {
+	const auto &sets = session().data().stickers().sets();
+	const auto it = sets.find(_searchSelectedSetId);
+	if (it == sets.end()) {
+		_searchSelectedSetId = 0;
+		return;
+	}
+	const auto set = it->second.get();
+	auto list = collectSearchSet(set);
+	if (list.empty()) {
+		_searchSelectedSetId = 0;
+		return;
+	}
+	const auto installed = !!(set->flags & Data::StickersSetFlag::Installed);
+	_searchSets.push_back({
+		.id = set->id,
+		.set = set,
+		.thumbnailDocument = set->lookupThumbnailDocument(),
+		.title = tr::lng_custom_emoji_count(
+			tr::now,
+			lt_count,
+			set->count),
+		.list = std::move(list),
+		.canRemove = installed,
+	});
+}
+
+bool EmojiListWidget::searchShortcutsShown() const {
+	return _searchMode && !_searchShortcutSets.empty();
+}
+
+bool EmojiListWidget::searchShortcutSelected() const {
+	return _searchSelectedSetId != 0;
+}
+
+void EmojiListWidget::startSearchSwapAnimation(
+		Fn<void()> change,
+		bool packToPack) {
+	if (!isVisible() || size().isEmpty()) {
+		change();
+		return;
+	}
+	const auto top = searchShortcutsTop()
+		+ (packToPack ? searchShortcutsHeight() : 0);
+	const auto computeRect = [&] {
+		const auto bottom = std::max(top + 1, getVisibleBottom());
+		return QRect(0, top, width(), bottom - top);
+	};
+	_searchSwapAnimation.stop();
+	const auto wasSelected = searchShortcutSelected();
+	_searchSwapBefore = Ui::GrabWidget(this, computeRect());
+	_searchSwapTop = top;
+	_searchSwapPartial = packToPack;
+	change();
+	_searchSwapReverse = wasSelected && !searchShortcutSelected();
+	_searchSwapAfter = Ui::GrabWidget(this, computeRect());
+	_searchSwapAnimation.start(
+		[=, this] {
+			update();
+			if (!_searchSwapAnimation.animating()) {
+				_searchSwapBefore = QPixmap();
+				_searchSwapAfter = QPixmap();
+			}
+		},
+		0.,
+		1.,
+		st().searchSwapDuration,
+		anim::sineInOut);
+}
+
+int EmojiListWidget::searchShortcutsTop() const {
+	return _search ? _search->height() : 0;
+}
+
+int EmojiListWidget::searchShortcutsHeight() const {
+	if (!searchShortcutsShown()) {
+		return 0;
+	}
+	auto result = st().searchPacksTop
+		+ st().searchPackHeight
+		+ st().searchPacksBottom;
+	result += searchShortcutSelected()
+		? st().searchBackHeight
+		: st().searchResultsHeight;
+	return result;
+}
+
+QRect EmojiListWidget::searchBackRect() const {
+	return QRect(
+		0,
+		searchShortcutsTop(),
+		width(),
+		searchShortcutSelected() ? st().searchBackHeight : 0);
+}
+
+QRect EmojiListWidget::searchShortcutRect(int index) const {
+	Expects(index >= 0 && index < int(_searchShortcutSets.size()));
+
+	const auto left = st().headerLeft
+		- st().margin.left()
+		- _searchShortcutsScroll
+		+ index * (st().searchPackWidth + st().searchPackSkip);
+	const auto top = searchShortcutsTop()
+		+ (searchShortcutSelected() ? st().searchBackHeight : 0)
+		+ st().searchPacksTop;
+	return QRect(
+		left,
+		top,
+		st().searchPackWidth,
+		st().searchPackHeight);
+}
+
+void EmojiListWidget::refreshSearchShortcutsScroll(int newWidth) {
+	if (_searchShortcutSets.empty()) {
+		_searchShortcutsScroll = 0;
+		_searchShortcutsScrollMax = 0;
+		return;
+	}
+	const auto count = int(_searchShortcutSets.size());
+	const auto full = st().headerLeft
+		- st().margin.left()
+		+ count * st().searchPackWidth
+		+ std::max(count - 1, 0) * st().searchPackSkip
+		+ st().margin.right();
+	_searchShortcutsScrollMax = std::max(full - newWidth, 0);
+	scrollSearchShortcutsTo(_searchShortcutsScroll);
+}
+
+void EmojiListWidget::scrollSearchShortcutsTo(int value) {
+	const auto scroll = std::clamp(
+		value,
+		0,
+		_searchShortcutsScrollMax);
+	if (_searchShortcutsScroll == scroll) {
+		return;
+	}
+	_searchShortcutsScroll = scroll;
+	update(0, searchShortcutsTop(), width(), searchShortcutsHeight());
+}
+
+void EmojiListWidget::toggleSearchShortcut(int index) {
+	if (index < 0 || index >= int(_searchShortcutSets.size())) {
+		return;
+	}
+	const auto setId = _searchShortcutSets[index].id;
+	const auto target = (_searchSelectedSetId == setId) ? 0 : setId;
+	const auto packToPack = _searchSelectedSetId
+		&& target
+		&& _searchSelectedSetId != target;
+	startSearchSwapAnimation([=, this] {
+		_searchSelectedSetId = target;
+		showSearchResults();
+	}, packToPack);
+	if (target) {
+		// Pull full stickers so the grid shows them instead of cover-only.
+		const auto set = _searchShortcutSets[index].set;
+		if (set->stickers.empty()
+			|| (set->flags & Data::StickersSetFlag::NotLoaded)) {
+			auto &api = session().api();
+			api.scheduleStickerSetRequest(set->id, set->accessHash);
+			api.requestStickerSets();
+		}
+	}
+}
+
+void EmojiListWidget::backToSearchResults() {
+	if (!_searchSelectedSetId) {
+		return;
+	}
+	startSearchSwapAnimation([=, this] {
+		_searchSelectedSetId = 0;
+		showSearchResults();
+	});
+}
+
+EmojiListWidget::CustomSet &EmojiListWidget::searchSetBySection(
+		int section) {
+	Expects(section > 0 && section <= int(_searchSets.size()));
+
+	return _searchSets[section - 1];
+}
+
+const EmojiListWidget::CustomSet &EmojiListWidget::searchSetBySection(
+		int section) const {
+	Expects(section > 0 && section <= int(_searchSets.size()));
+
+	return _searchSets[section - 1];
+}
+
 void EmojiListWidget::provideRecent(
-		const std::vector<DocumentId> &customRecentList) {
+		const std::vector<EmojiStatusId> &customRecentList) {
 	clearSelection();
 	fillRecentFrom(customRecentList);
 	resizeToWidth(width());
@@ -720,6 +1464,24 @@ void EmojiListWidget::repaintCustom(uint64 setId) {
 	if (_searchMode) {
 		if (repaintSearch) {
 			update();
+		} else {
+			for (auto i = 0, count = int(_searchShortcutSets.size());
+					i != count; ++i) {
+				if (_searchShortcutSets[i].id == setId) {
+					rtlupdate(searchShortcutRect(i));
+				}
+			}
+			enumerateSections([&](const SectionInfo &info) {
+				if (info.section > 0
+					&& searchSetBySection(info.section).id == setId) {
+					update(
+						0,
+						info.rowsTop,
+						width(),
+						info.rowsBottom - info.rowsTop);
+				}
+				return true;
+			});
 		}
 		return;
 	}
@@ -806,6 +1568,7 @@ void EmojiListWidget::visibleTopBottomUpdated(
 			ValidateIconAnimations::Full);
 	}
 	unloadNotSeenCustom(visibleTop, visibleBottom);
+	checkPaginateSearchCloud(visibleTop, visibleBottom);
 }
 
 void EmojiListWidget::unloadNotSeenCustom(
@@ -835,6 +1598,16 @@ void EmojiListWidget::unloadCustomIn(const SectionInfo &info) {
 			}
 		}
 		return;
+	} else if (_searchMode && info.section > 0) {
+		auto &custom = searchSetBySection(info.section);
+		if (!custom.painted) {
+			return;
+		}
+		custom.painted = false;
+		for (const auto &single : custom.list) {
+			single.custom->unload();
+		}
+		return;
 	} else if (info.section < _staticCount) {
 		return;
 	}
@@ -873,7 +1646,7 @@ object_ptr<TabbedSelector::InnerFooter> EmojiListWidget::createFooter() {
 	_footer = result;
 
 	_footer->setChosen(
-	) | rpl::start_with_next([=](uint64 setId) {
+	) | rpl::on_next([=](uint64 setId) {
 		showSet(setId);
 	}, _footer->lifetime());
 
@@ -901,12 +1674,19 @@ bool EmojiListWidget::enumerateSections(Callback callback) const {
 
 	auto i = 0;
 	auto info = SectionInfo();
+	info.top = searchShortcutsHeight();
 	const auto next = [&] {
 		info.rowsCount = info.collapsed
 			? kCollapsedRows
 			: (info.count + _columnCount - 1) / _columnCount;
+		const auto firstAfterShortcuts = !i
+			&& searchShortcutsShown()
+			&& !searchShortcutSelected();
 		info.rowsTop = info.top
-			+ (i == 0 ? _rowsTop : st().header);
+			+ (i == 0 ? _rowsTop : st().header)
+			+ (firstAfterShortcuts
+				? st::stickerPanFirstAfterShortcutsSkip
+				: 0);
 		info.rowsBottom = info.rowsTop
 			+ (info.rowsCount * _singleSize.height());
 		if (!callback(info)) {
@@ -918,7 +1698,22 @@ bool EmojiListWidget::enumerateSections(Callback callback) const {
 	if (_searchMode) {
 		info.section = i;
 		info.count = _searchResults.size();
-		return next();
+		if (!next()) {
+			return false;
+		}
+		++i;
+		for (auto &section : _searchSets) {
+			info.section = i++;
+			info.premiumRequired = section.premiumRequired;
+			info.count = int(section.list.size());
+			info.collapsed = !section.expanded
+				&& (!section.canRemove || section.premiumRequired)
+				&& (info.count > _columnCount * kCollapsedRows);
+			if (!next()) {
+				return false;
+			}
+		}
+		return true;
 	}
 	for (; i != _staticCount; ++i) {
 		info.section = i;
@@ -970,7 +1765,9 @@ EmojiListWidget::SectionInfo EmojiListWidget::sectionInfoByOffset(
 }
 
 int EmojiListWidget::sectionsCount() const {
-	return _searchMode ? 1 : (_staticCount + int(_custom.size()));
+	return _searchMode
+		? (1 + int(_searchSets.size()))
+		: (_staticCount + int(_custom.size()));
 }
 
 void EmojiListWidget::setSingleSize(QSize size) {
@@ -994,7 +1791,7 @@ void EmojiListWidget::setColorAllForceRippled(bool force) {
 		_colorAllRippleForcedLifetime = style::PaletteChanged(
 		) | rpl::filter([=] {
 			return _colorAllRipple != nullptr;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			_colorAllRipple->forceRepaint();
 		});
 		if (!_colorAllRipple) {
@@ -1026,6 +1823,7 @@ int EmojiListWidget::countDesiredHeight(int newWidth) {
 		+ (innerWidth - _columnCount * singleWidth) / 2
 		- st().margin.left();
 	setSingleSize({ singleWidth, singleWidth - 2 * st().verticalSizeSub });
+	refreshSearchShortcutsScroll(newWidth);
 
 	const auto countResult = [this](int minimalLastHeight) {
 		const auto info = sectionInfo(sectionsCount() - 1);
@@ -1094,7 +1892,8 @@ void EmojiListWidget::fillRecent() {
 	}
 }
 
-void EmojiListWidget::fillRecentFrom(const std::vector<DocumentId> &list) {
+void EmojiListWidget::fillRecentFrom(
+		const std::vector<EmojiStatusId> &list) {
 	const auto test = session().isTestMode();
 	_recent.clear();
 	_recent.reserve(list.size());
@@ -1114,10 +1913,15 @@ void EmojiListWidget::fillRecentFrom(const std::vector<DocumentId> &list) {
 			_recentCustomIds.emplace(fakeId);
 		} else {
 			_recent.push_back({
+				.collectible = id.collectible,
 				.custom = resolveCustomRecent(id),
-				.id = { RecentEmojiDocument{ .id = id, .test = test } },
+				.id = {
+					RecentEmojiDocument{ .id = id.documentId, .test = test },
+				},
 			});
-			_recentCustomIds.emplace(id);
+			_recentCustomIds.emplace(id.collectible
+				? id.collectible->documentId
+				: id.documentId);
 		}
 	}
 }
@@ -1127,6 +1931,26 @@ base::unique_qptr<Ui::PopupMenu> EmojiListWidget::fillContextMenu(
 	if (v::is_null(_selected)) {
 		return nullptr;
 	}
+	if (const auto setOver = std::get_if<OverSet>(&_selected)) {
+		const auto section = setOver->section;
+		if (_searchMode
+			&& section > 0
+			&& section <= int(_searchSets.size())) {
+			return fillSetContextMenu(searchSetBySection(section));
+		} else if (!_searchMode
+			&& section >= _staticCount
+			&& (section - _staticCount) < int(_custom.size())) {
+			return fillSetContextMenu(_custom[section - _staticCount]);
+		}
+		return nullptr;
+	}
+	if (const auto shortcut = std::get_if<OverSearchShortcut>(&_selected)) {
+		if (shortcut->index >= 0
+			&& shortcut->index < int(_searchShortcutSets.size())) {
+			return fillSetContextMenu(_searchShortcutSets[shortcut->index]);
+		}
+		return nullptr;
+	}
 	const auto over = std::get_if<OverEmoji>(&_selected);
 	if (!over) {
 		return nullptr;
@@ -1158,8 +1982,12 @@ void EmojiListWidget::fillRecentMenu(
 	const auto over = OverEmoji{ section, index };
 	const auto emoji = lookupOverEmoji(&over);
 	const auto custom = lookupCustomEmoji(&over);
-	if (custom && custom->sticker()) {
-		const auto sticker = custom->sticker();
+	if (custom.collectible) {
+		return;
+	}
+	const auto document = custom.document;
+	if (document && document->sticker()) {
+		const auto sticker = document->sticker();
 		const auto emoji = sticker->alt;
 		const auto setId = sticker->set.id;
 		if (!emoji.isEmpty()) {
@@ -1168,7 +1996,7 @@ void EmojiListWidget::fillRecentMenu(
 				EntityType::CustomEmoji,
 				0,
 				int(emoji.size()),
-				Data::SerializeCustomEmojiId(custom)
+				Data::SerializeCustomEmojiId(document)
 			});
 			addAction(tr::lng_emoji_copy(tr::now), [=] {
 				TextUtilities::SetClipboardText(data);
@@ -1177,7 +2005,7 @@ void EmojiListWidget::fillRecentMenu(
 		if (recent && setId && _features.openStickerSets) {
 			addAction(
 				tr::lng_emoji_view_pack(tr::now),
-				crl::guard(this, [=] { displaySet(setId); }),
+				crl::guard(this, [=] { displaySet(document); }),
 				&st::menuIconShowAll);
 		}
 	} else if (recent && emoji) {
@@ -1192,8 +2020,8 @@ void EmojiListWidget::fillRecentMenu(
 	auto id = RecentEmojiId{ emoji };
 	if (custom) {
 		id.data = RecentEmojiDocument{
-			.id = custom->id,
-			.test = custom->session().isTestMode(),
+			.id = custom.document->id,
+			.test = custom.document->session().isTestMode(),
 		};
 	}
 	addAction(tr::lng_emoji_remove_recent(tr::now), crl::guard(this, [=] {
@@ -1209,7 +2037,7 @@ void EmojiListWidget::fillRecentMenu(
 			refreshRecent();
 			close();
 		};
-		checkHideWithBox(Ui::MakeConfirmBox({
+		showBoxPreventHide(Ui::MakeConfirmBox({
 			.text = tr::lng_emoji_reset_recent_sure(),
 			.confirmed = crl::guard(this, sure),
 			.confirmText = tr::lng_emoji_reset_recent_button(tr::now),
@@ -1251,6 +2079,18 @@ void EmojiListWidget::fillEmojiStatusMenu(
 			TabbedSelector::kPickCustomTimeId); }));
 }
 
+base::unique_qptr<Ui::PopupMenu> EmojiListWidget::fillSetContextMenu(
+		const CustomSet &set) {
+	return FillStickerSetContextMenu(
+		this,
+		_show,
+		set.set,
+		_localSetsManager.get(),
+		crl::guard(this, [this](uint64 id) { removeSet(id); }),
+		crl::guard(this, [this] { update(); }),
+		st::popupMenuWithIcons);
+}
+
 void EmojiListWidget::paintEvent(QPaintEvent *e) {
 	auto p = Painter(this);
 
@@ -1268,6 +2108,27 @@ void EmojiListWidget::paintEvent(QPaintEvent *e) {
 		_searchExpandCache = QImage();
 	}
 
+	if (_searchSwapAnimation.animating()) {
+		if (_searchSwapPartial) {
+			paint(p, {}, clip);
+		}
+		const auto progress = _searchSwapAnimation.value(1.);
+		const auto direction = _searchSwapReverse ? -1 : 1;
+		const auto slide = st().searchBackHeight;
+		p.setOpacity(1. - progress);
+		p.drawPixmap(
+			0,
+			_searchSwapTop + direction * int(base::SafeRound(slide * progress)),
+			_searchSwapBefore);
+		p.setOpacity(progress);
+		p.drawPixmap(
+			0,
+			_searchSwapTop - direction * int(base::SafeRound(slide * (1. - progress))),
+			_searchSwapAfter);
+		p.setOpacity(1.);
+		return;
+	}
+
 	paint(p, {}, clip);
 }
 
@@ -1298,11 +2159,157 @@ void EmojiListWidget::validateEmojiPaintContext(
 	}
 }
 
+void EmojiListWidget::paintSearchShortcuts(Painter &p, QRect clip) {
+	if (!searchShortcutsShown()
+		|| clip.bottom() < searchShortcutsTop()
+		|| clip.top() >= searchShortcutsTop() + searchShortcutsHeight()) {
+		return;
+	}
+	const auto back = searchBackRect();
+	if (back.height() > 0) {
+		const auto selected = std::get_if<OverSearchBack>(
+			!v::is_null(_pressed) ? &_pressed : &_selected);
+		const auto &icon = selected
+			? st().search.back.iconOver
+			: st().search.back.icon;
+		icon.paint(
+			p,
+			st().searchBackIconLeft,
+			back.y() + st().searchBackIconTop,
+			width());
+		const auto text = tr::lng_search_back_to_results(tr::now);
+		const auto &font = st::emojiPanHeaderFont;
+		const auto available = width()
+			- st().searchBackTextLeft
+			- st().margin.right();
+		auto shown = text;
+		auto textWidth = font->width(shown);
+		if (textWidth > available) {
+			shown = font->elided(shown, available);
+			textWidth = font->width(shown);
+		}
+		p.setFont(font);
+		p.setPen(st().headerFg);
+		p.drawTextLeft(
+			st().searchBackTextLeft,
+			back.y() + st().searchBackTextTop,
+			width(),
+			shown,
+			textWidth);
+	}
+
+	const auto selectedShortcut = std::get_if<OverSearchShortcut>(
+		!v::is_null(_pressed) ? &_pressed : &_selected);
+	p.save();
+	p.setClipRect(
+		QRect(
+			0,
+			searchShortcutsTop() + back.height(),
+			width(),
+			st().searchPacksTop
+				+ st().searchPackHeight
+				+ st().searchPacksBottom),
+		Qt::IntersectClip);
+	for (auto i = 0, count = int(_searchShortcutSets.size()); i != count; ++i) {
+		auto &set = _searchShortcutSets[i];
+		const auto rect = searchShortcutRect(i);
+		if (!rect.intersects(clip)) {
+			continue;
+		}
+		const auto selected = (set.id == _searchSelectedSetId)
+			|| (selectedShortcut && selectedShortcut->index == i);
+		if (selected) {
+			_overBg.paint(p, myrtlrect(rect));
+		}
+		if (set.ripple) {
+			set.ripple->paint(
+				p,
+				myrtlrect(rect).x(),
+				rect.y(),
+				width());
+			if (set.ripple->empty()) {
+				set.ripple.reset();
+			}
+		}
+		const auto icon = QRect(
+			rect.x() + (rect.width() - st().searchPackIconSize) / 2,
+			rect.y() + st().searchPackIconTop,
+			st().searchPackIconSize,
+			st().searchPackIconSize);
+		paintSearchShortcutIcon(p, set, icon);
+
+		const auto available = rect.width()
+			- 2 * st().searchPackTextPadding;
+		auto title = set.title;
+		auto titleWidth = st::normalFont->width(title);
+		if (titleWidth > available) {
+			title = st::normalFont->elided(title, available);
+			titleWidth = st::normalFont->width(title);
+		}
+		const auto titleLeft = (titleWidth < available)
+			? (rect.x() + (rect.width() - titleWidth) / 2)
+			: (rect.x() + st().searchPackTextPadding);
+		p.setFont(st::normalFont);
+		p.setPen(st().textFg);
+		p.drawTextLeft(
+			titleLeft,
+			rect.y() + st().searchPackTextTop,
+			width(),
+			title,
+			titleWidth);
+	}
+	p.restore();
+
+	if (!searchShortcutSelected()) {
+		const auto top = searchShortcutsTop()
+			+ st().searchPacksTop
+			+ st().searchPackHeight
+			+ st().searchPacksBottom;
+		p.setFont(st::emojiPanHeaderFont);
+		p.setPen(st().headerFg);
+		p.drawTextLeft(
+			st().headerLeft - st().margin.left(),
+			top + st().searchResultsTextTop,
+			width(),
+			tr::lng_search_results_header(tr::now));
+	}
+}
+
+void EmojiListWidget::paintSearchShortcutIcon(
+		Painter &p,
+		const CustomSet &set,
+		QRect rect) {
+	if (set.list.empty() || _customSingleSize <= 0) {
+		return;
+	}
+	const auto native = _customSingleSize;
+	const auto scale = double(rect.width()) / double(native);
+	auto context = Ui::Text::CustomEmojiPaintContext{
+		.textColor = (_customTextColor
+			? _customTextColor()
+			: st().textFg->c),
+		.size = QSize(native, native),
+		.now = crl::now(),
+		.scale = 1.,
+		.position = QPoint(),
+		.paused = On(powerSavingFlag()) || paused(),
+		.scaled = false,
+		.internal = { .forceFirstFrame = true },
+	};
+	p.save();
+	p.translate(rect.center());
+	p.scale(scale, scale);
+	p.translate(-native / 2, -native / 2);
+	set.list.front().custom->paint(p, context);
+	p.restore();
+}
+
 void EmojiListWidget::paint(
 		Painter &p,
 		ExpandingContext context,
 		QRect clip) {
 	validateEmojiPaintContext(context);
+	paintSearchShortcuts(p, clip);
 
 	_paintAsPremium = session().premium();
 
@@ -1325,9 +2332,17 @@ void EmojiListWidget::paint(
 	auto selectedButton = std::get_if<OverButton>(!v::is_null(_pressed)
 		? &_pressed
 		: &_selected);
-	if (_searchResults.empty() && _searchMode) {
+	if (_searchResults.empty()
+		&& _searchSets.empty()
+		&& _searchShortcutSets.empty()
+		&& _searchMode
+		&& !_searchLoading
+		&& !_searchRequestTimer.isActive()) {
 		paintEmptySearchResults(p);
 	}
+	const auto creatorBadgeText = tr::lng_stickers_creator_badge(tr::now);
+	const auto groupBadgeText = tr::lng_emoji_group_badge(tr::now);
+	const auto &badgeFont = st::stickersHeaderBadgeFont;
 	enumerateSections([&](const SectionInfo &info) {
 		if (clip.top() >= info.rowsBottom) {
 			return true;
@@ -1340,15 +2355,42 @@ void EmojiListWidget::paint(
 		const auto titleLeft = (info.premiumRequired
 			? st().headerLockedLeft
 			: st().headerLeft) - st().margin.left();
-		const auto widthForTitle = emojiRight()
+		auto widthForTitle = emojiRight()
 			- titleLeft
 			- paintButtonGetWidth(p, info, buttonSelected, clip);
 		if (info.section > 0 && clip.top() < info.rowsTop) {
 			p.setFont(st::emojiPanHeaderFont);
 			p.setPen(st().headerFg);
-			auto titleText = (info.section < _staticCount)
+			auto titleText = (_searchMode && info.section > 0)
+				? searchSetBySection(info.section).title
+				: (info.section < _staticCount)
 				? ChatHelpers::EmojiCategoryTitle(info.section)(tr::now)
 				: _custom[info.section - _staticCount].title;
+			const auto titleSet = (_searchMode && info.section > 0)
+				? searchSetBySection(info.section).set.get()
+				: (info.section >= _staticCount)
+				? _custom[info.section - _staticCount].set.get()
+				: nullptr;
+			const auto megagroupEmoji = !_searchMode
+				&& (info.section >= _staticCount)
+				&& (_custom[info.section - _staticCount].id
+					== Data::Stickers::MegagroupSetId);
+			const auto amCreator = !megagroupEmoji
+				&& titleSet
+				&& (titleSet->flags & Data::StickersSetFlag::AmCreator);
+			const auto badgeText = megagroupEmoji
+				? groupBadgeText
+				: amCreator
+				? creatorBadgeText
+				: QString();
+			const auto badgeWidth = badgeText.isEmpty()
+				? 0
+				: badgeFont->width(badgeText);
+			if (!badgeText.isEmpty()) {
+				widthForTitle -= badgeWidth
+					+ st::stickersFeaturedUnreadSkip
+					+ st::stickersHeaderBadgeFontSkip;
+			}
 			auto titleWidth = st::emojiPanHeaderFont->width(titleText);
 			if (titleWidth > widthForTitle) {
 				titleText = st::emojiPanHeaderFont->elided(titleText, widthForTitle);
@@ -1366,6 +2408,38 @@ void EmojiListWidget::paint(
 			p.setFont(st::emojiPanHeaderFont);
 			p.setPen(st().headerFg);
 			p.drawText(titleLeft, textBaseline, titleText);
+			if (!badgeText.isEmpty()) {
+				const auto badgeLeft = titleLeft
+					+ titleWidth
+					+ st::stickersFeaturedUnreadSkip;
+				{
+					auto color = st().headerFg->c;
+					color.setAlphaF(st().headerFg->c.alphaF() * 0.15);
+					p.setPen(Qt::NoPen);
+					p.setBrush(color);
+					auto hq = PainterHighQualityEnabler(p);
+					p.drawRoundedRect(
+						style::rtlrect(
+							badgeLeft,
+							info.top + st::stickersHeaderBadgeFontTop,
+							badgeWidth + badgeFont->height,
+							badgeFont->height,
+							width()),
+						badgeFont->height / 2.,
+						badgeFont->height / 2.);
+				}
+				p.setPen(st().headerFg);
+				p.setBrush(Qt::NoBrush);
+				p.setFont(badgeFont);
+				p.drawText(
+					QRect(
+						badgeLeft + badgeFont->height / 2,
+						info.top + st::stickersHeaderBadgeFontTop,
+						badgeWidth,
+						badgeFont->height),
+					badgeText,
+					style::al_center);
+			}
 		}
 		if (clip.top() + clip.height() > info.rowsTop) {
 			ensureLoaded(info.section);
@@ -1427,8 +2501,15 @@ void EmojiListWidget::paint(
 						}
 						_overBg.paint(p, QRect(tl, st::emojiPanArea));
 					}
-					if (_searchMode) {
+					if (_searchMode && info.section == 0) {
 						drawRecent(p, context, w, _searchResults[index]);
+					} else if (_searchMode && info.section > 0) {
+						drawSearchSetCustom(
+							p,
+							context,
+							w,
+							info.section,
+							index);
 					} else if (info.section == int(Section::Recent)) {
 						drawRecent(p, context, w, _recent[index]);
 					} else if (info.section < _staticCount) {
@@ -1563,6 +2644,22 @@ void EmojiListWidget::drawCustom(
 	entry.custom->paint(p, *_emojiPaintContext);
 }
 
+void EmojiListWidget::drawSearchSetCustom(
+		QPainter &p,
+		const ExpandingContext &context,
+		QPoint position,
+		int section,
+		int index) {
+	auto &custom = searchSetBySection(section);
+	custom.painted = true;
+	auto &entry = custom.list[index];
+	_emojiPaintContext->scale = context.progress;
+	_emojiPaintContext->position = position
+		+ _innerPosition
+		+ _customPosition;
+	entry.custom->paint(p, *_emojiPaintContext);
+}
+
 bool EmojiListWidget::checkPickerHide() {
 	if (!_picker->isHidden() && !v::is_null(_pickerSelected)) {
 		_picker->hideAnimated();
@@ -1573,45 +2670,64 @@ bool EmojiListWidget::checkPickerHide() {
 	return false;
 }
 
-DocumentData *EmojiListWidget::lookupCustomEmoji(
+EmojiListWidget::ResolvedCustom EmojiListWidget::lookupCustomEmoji(
 		const OverEmoji *over) const {
-	return over ? lookupCustomEmoji(over->index, over->section) : nullptr;
+	return over
+		? lookupCustomEmoji(over->index, over->section)
+		: ResolvedCustom();
 }
 
-DocumentData *EmojiListWidget::lookupCustomEmoji(
+EmojiListWidget::ResolvedCustom EmojiListWidget::lookupCustomEmoji(
 		int index,
 		int section) const {
-	if (_searchMode) {
+	if (_searchMode && section == 0) {
 		if (index < _searchResults.size()) {
 			const auto document = std::get_if<RecentEmojiDocument>(
 				&_searchResults[index].id.data);
 			if (document) {
-				return session().data().document(document->id);
+				return { session().data().document(document->id) };
 			}
 		}
-		return nullptr;
+		return {};
+	} else if (_searchMode && section > 0) {
+		const auto &set = searchSetBySection(section);
+		if (index < int(set.list.size())) {
+			auto &entry = set.list[index];
+			return { entry.document, entry.collectible };
+		}
+		return {};
 	} else if (section == int(Section::Recent) && index < _recent.size()) {
+		const auto &recent = _recent[index];
+		if (recent.collectible) {
+			return {
+				session().data().document(recent.collectible->documentId),
+				recent.collectible,
+			};
+		}
 		const auto document = std::get_if<RecentEmojiDocument>(
-			&_recent[index].id.data);
+			&recent.id.data);
 		if (document) {
-			return session().data().document(document->id);
+			return { session().data().document(document->id) };
 		}
 	} else if (section >= _staticCount
 		&& index < _custom[section - _staticCount].list.size()) {
 		auto &set = _custom[section - _staticCount];
-		return set.list[index].document;
+		auto &entry = set.list[index];
+		return { entry.document, entry.collectible };
 	}
-	return nullptr;
+	return {};
 }
 
 EmojiPtr EmojiListWidget::lookupOverEmoji(const OverEmoji *over) const {
 	const auto section = over ? over->section : -1;
 	const auto index = over ? over->index : -1;
-	return _searchMode
+	return (_searchMode && section == 0)
 		? ((index < _searchResults.size()
 			&& v::is<EmojiPtr>(_searchResults[index].id.data))
 			? v::get<EmojiPtr>(_searchResults[index].id.data)
 			: nullptr)
+		: (_searchMode && section > 0)
+		? nullptr
 		: (section == int(Section::Recent)
 			&& index < _recent.size()
 			&& v::is<EmojiPtr>(_recent[index].id.data))
@@ -1643,9 +2759,11 @@ EmojiChosen EmojiListWidget::lookupChosen(
 }
 
 FileChosen EmojiListWidget::lookupChosen(
-		not_null<DocumentData*> custom,
+		ResolvedCustom custom,
 		const OverEmoji *over,
 		Api::SendOptions options) {
+	Expects(custom.document != nullptr);
+
 	_grabbingChosen = true;
 	const auto guard = gsl::finally([&] { _grabbingChosen = false; });
 	const auto rect = over ? emojiRect(over->section, over->index) : QRect();
@@ -1655,13 +2773,14 @@ FileChosen EmojiListWidget::lookupChosen(
 	) : QRect();
 
 	return {
-		.document = custom,
+		.document = custom.document,
 		.options = options,
 		.messageSendingFrom = {
 			.type = Ui::MessageSendingAnimationFrom::Type::Emoji,
 			.globalStartGeometry = over ? mapToGlobal(emoji) : QRect(),
 			.frame = over ? Ui::GrabWidgetToImage(this, emoji) : QImage(),
 		},
+		.collectible = custom.collectible,
 	};
 }
 
@@ -1672,6 +2791,11 @@ void EmojiListWidget::mousePressEvent(QMouseEvent *e) {
 		return;
 	}
 	setPressed(_selected);
+	if (std::get_if<OverSearchShortcut>(&_selected)) {
+		_searchShortcutsMouseDown = _lastMousePos;
+		_searchShortcutsDragStart = _searchShortcutsScroll;
+		_searchShortcutsDragging = false;
+	}
 	if (const auto over = std::get_if<OverEmoji>(&_selected)) {
 		const auto emoji = lookupOverEmoji(over);
 		if (emoji && emoji->hasVariants()) {
@@ -1710,6 +2834,10 @@ void EmojiListWidget::mouseReleaseEvent(QMouseEvent *e) {
 		}
 	}
 	updateSelected();
+	if (_searchShortcutsDragging) {
+		_searchShortcutsDragging = false;
+		return;
+	}
 
 	if (_showPickerTimer.isActive()) {
 		_showPickerTimer.cancel();
@@ -1718,19 +2846,32 @@ void EmojiListWidget::mouseReleaseEvent(QMouseEvent *e) {
 	}
 
 	if (_previewShown) {
+		if (_mediaPreview) {
+			_mediaPreview->hidePreview();
+		}
 		_previewShown = false;
 		return;
 	} else if (v::is_null(_selected) || _selected != pressed) {
 		return;
 	}
 
-	if (const auto over = std::get_if<OverEmoji>(&_selected)) {
+	if (std::get_if<OverSearchBack>(&_selected)) {
+		backToSearchResults();
+		return;
+	} else if (const auto shortcut = std::get_if<OverSearchShortcut>(
+			&_selected)) {
+		toggleSearchShortcut(shortcut->index);
+		return;
+	} else if (const auto over = std::get_if<OverEmoji>(&_selected)) {
 		const auto section = over->section;
 		const auto index = over->index;
-		if (section >= _staticCount
-			&& sectionInfo(section).collapsed
+		if (sectionInfo(section).collapsed
 			&& index + 1 == _columnCount * kCollapsedRows) {
-			_custom[section - _staticCount].expanded = true;
+			if (_searchMode && section > 0) {
+				searchSetBySection(section).expanded = true;
+			} else if (section >= _staticCount) {
+				_custom[section - _staticCount].expanded = true;
+			}
 			resizeToWidth(width());
 			update();
 			return;
@@ -1743,15 +2884,21 @@ void EmojiListWidget::mouseReleaseEvent(QMouseEvent *e) {
 			selectCustom(lookupChosen(custom, over));
 		}
 	} else if (const auto set = std::get_if<OverSet>(&pressed)) {
-		Assert(set->section >= _staticCount
-			&& set->section < _staticCount + _custom.size());
-		displaySet(_custom[set->section - _staticCount].id);
+		const auto setId = (_searchMode && set->section > 0)
+			? searchSetBySection(set->section).id
+			: (set->section >= _staticCount)
+			? _custom[set->section - _staticCount].id
+			: uint64(0);
+		if (setId) {
+			displaySet(setId);
+		}
 	} else if (auto button = std::get_if<OverButton>(&pressed)) {
 		Assert(hasButton(button->section));
 		const auto id = hasColorButton(button->section)
 			? 0
+			: (_searchMode && button->section > 0)
+			? searchSetBySection(button->section).id
 			: _custom[button->section - _staticCount].id;
-		const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
 		if (hasColorButton(button->section)) {
 			_pickerSelected = pressed;
 			showPicker();
@@ -1759,11 +2906,12 @@ void EmojiListWidget::mouseReleaseEvent(QMouseEvent *e) {
 			removeSet(id);
 		} else if (hasAddButton(button->section)) {
 			_localSetsManager->install(id);
-		} else if (const auto resolved = _show->resolveWindow(usage)) {
+		} else if (const auto resolved = _show->resolveWindow()) {
 			_jumpedToPremium.fire({});
 			switch (_mode) {
 			case Mode::Full:
 			case Mode::UserpicBuilder:
+			case Mode::CustomOnly:
 				Settings::ShowPremium(resolved, u"animated_emoji"_q);
 				break;
 			case Mode::FullReactions:
@@ -1785,18 +2933,28 @@ void EmojiListWidget::mouseReleaseEvent(QMouseEvent *e) {
 	}
 }
 
+void EmojiListWidget::displaySet(not_null<DocumentData*> document) {
+	preventHideWithBox(StickerSetBox::Show(_show, document));
+}
+
 void EmojiListWidget::displaySet(uint64 setId) {
 	if (setId == Data::Stickers::MegagroupSetId) {
-		if (_megagroupSet->mgInfo->emojiSet.id) {
+		if (_megagroupSet->canEditEmoji()) {
+			showBoxPreventHide(
+				Box<StickersBox>(_show, _megagroupSet, true));
+			return;
+		} else if (_megagroupSet->mgInfo->emojiSet.id) {
 			setId = _megagroupSet->mgInfo->emojiSet.id;
 		} else {
 			return;
 		}
+	} else if (setId == Data::Stickers::CollectibleSetId) {
+		return;
 	}
 	const auto &sets = session().data().stickers().sets();
 	auto it = sets.find(setId);
 	if (it != sets.cend()) {
-		checkHideWithBox(Box<StickerSetBox>(_show, it->second.get()));
+		showBoxPreventHide(Box<StickerSetBox>(_show, it->second.get()));
 	}
 }
 
@@ -1807,7 +2965,7 @@ void EmojiListWidget::removeMegagroupSet(bool locally) {
 		refreshCustom();
 		return;
 	}
-	checkHideWithBox(Ui::MakeConfirmBox({
+	showBoxPreventHide(Ui::MakeConfirmBox({
 		.text = tr::lng_emoji_remove_group_set(),
 		.confirmed = crl::guard(this, [this, group = _megagroupSet](
 				Fn<void()> &&close) {
@@ -1830,8 +2988,9 @@ void EmojiListWidget::removeSet(uint64 setId) {
 		Assert(i != end(_custom));
 		const auto removeLocally = !_megagroupSet->canEditEmoji();
 		removeMegagroupSet(removeLocally);
+	} else if (setId == Data::Stickers::CollectibleSetId) {
 	} else if (auto box = MakeConfirmRemoveSetBox(&session(), labelSt, setId)) {
-		checkHideWithBox(std::move(box));
+		showBoxPreventHide(std::move(box));
 	}
 }
 
@@ -1900,7 +3059,8 @@ void EmojiListWidget::pickerHidden() {
 }
 
 bool EmojiListWidget::hasColorButton(int index) const {
-	return (_staticCount > int(Section::People))
+	return !_searchMode
+		&& (_staticCount > int(Section::People))
 		&& (index == int(Section::People));
 }
 
@@ -1922,6 +3082,12 @@ QRect EmojiListWidget::colorButtonRect(const SectionInfo &info) const {
 }
 
 bool EmojiListWidget::hasRemoveButton(int index) const {
+	if (_searchMode) {
+		if (index > 0 && index <= int(_searchSets.size())) {
+			return searchSetBySection(index).canRemove;
+		}
+		return false;
+	}
 	if (index < _staticCount
 		|| index >= _staticCount + _custom.size()) {
 		return false;
@@ -1933,6 +3099,8 @@ bool EmojiListWidget::hasRemoveButton(int index) const {
 			return true;
 		}
 		return !set.list.empty() && _megagroupSet->canEditEmoji();
+	} else if (set.id == Data::Stickers::CollectibleSetId) {
+		return false;
 	}
 	return set.canRemove && !set.premiumRequired;
 }
@@ -1955,6 +3123,13 @@ QRect EmojiListWidget::removeButtonRect(const SectionInfo &info) const {
 }
 
 bool EmojiListWidget::hasAddButton(int index) const {
+	if (_searchMode) {
+		if (index > 0 && index <= int(_searchSets.size())) {
+			const auto &set = searchSetBySection(index);
+			return !set.canRemove && !set.premiumRequired;
+		}
+		return false;
+	}
 	if (index < _staticCount
 		|| index >= _staticCount + _custom.size()) {
 		return false;
@@ -1962,7 +3137,8 @@ bool EmojiListWidget::hasAddButton(int index) const {
 	const auto &set = _custom[index - _staticCount];
 	return !set.canRemove
 		&& !set.premiumRequired
-		&& set.id != Data::Stickers::MegagroupSetId;
+		&& set.id != Data::Stickers::MegagroupSetId
+		&& set.id != Data::Stickers::CollectibleSetId;
 }
 
 QRect EmojiListWidget::addButtonRect(int index) const {
@@ -1970,6 +3146,12 @@ QRect EmojiListWidget::addButtonRect(int index) const {
 }
 
 bool EmojiListWidget::hasUnlockButton(int index) const {
+	if (_searchMode) {
+		if (index > 0 && index <= int(_searchSets.size())) {
+			return searchSetBySection(index).premiumRequired;
+		}
+		return false;
+	}
 	if (index < _staticCount
 		|| index >= _staticCount + _custom.size()) {
 		return false;
@@ -1979,20 +3161,27 @@ bool EmojiListWidget::hasUnlockButton(int index) const {
 }
 
 QRect EmojiListWidget::unlockButtonRect(int index) const {
-	Expects(index >= _staticCount
-		&& index < _staticCount + _custom.size());
+	Expects((_searchMode
+			&& index > 0
+			&& index <= int(_searchSets.size()))
+		|| (index >= _staticCount
+			&& index < _staticCount + _custom.size()));
 
 	return buttonRect(sectionInfo(index), rightButton(index));
 }
 
 bool EmojiListWidget::hasButton(int index) const {
+	if (_searchMode) {
+		return (index > 0 && index <= int(_searchSets.size()));
+	}
 	if (hasColorButton(index)) {
 		return true;
 	} else if (index >= _staticCount
 		&& index < _staticCount + _custom.size()) {
 		const auto &custom = _custom[index - _staticCount];
-		return (custom.id != Data::Stickers::MegagroupSetId)
-			|| custom.canRemove;
+		return (custom.id != Data::Stickers::CollectibleSetId)
+			&& ((custom.id != Data::Stickers::MegagroupSetId)
+				|| custom.canRemove);
 	}
 	return false;
 }
@@ -2018,8 +3207,18 @@ QRect EmojiListWidget::buttonRect(
 }
 
 auto EmojiListWidget::rightButton(int index) const -> const RightButton & {
+	if (_searchMode) {
+		Expects(index > 0 && index <= int(_searchSets.size()));
+
+		return hasAddButton(index)
+			? _add
+			: searchSetBySection(index).canRemove
+			? _restore
+			: _unlock;
+	}
 	Expects(index >= _staticCount
 		&& index < _staticCount + _custom.size());
+
 	return hasAddButton(index)
 		? _add
 		: _custom[index - _staticCount].canRemove
@@ -2052,7 +3251,7 @@ void EmojiListWidget::colorChosen(EmojiChosen data) {
 
 	const auto emoji = data.emoji;
 	auto &settings = Core::App().settings();
-	if (const auto button = std::get_if<OverButton>(&_pickerSelected)) {
+	if (v::is<OverButton>(_pickerSelected)) {
 		settings.saveAllEmojiVariants(emoji);
 		for (auto section = int(Section::People)
 			; section < _staticCount
@@ -2078,8 +3277,45 @@ void EmojiListWidget::colorChosen(EmojiChosen data) {
 	_picker->hideAnimated();
 }
 
+void EmojiListWidget::wheelEvent(QWheelEvent *e) {
+	if (searchShortcutsShown() && _searchShortcutsScrollMax > 0) {
+		const auto pos = mapFromGlobal(e->globalPosition().toPoint());
+		if (pos.y() >= searchShortcutsTop()
+			&& pos.y() < searchShortcutsTop() + searchShortcutsHeight()) {
+			const auto angle = e->angleDelta();
+			const auto pixel = e->pixelDelta();
+			const auto horizontal = (angle.x() != 0);
+			const auto vertical = (angle.y() != 0);
+			if (horizontal || vertical) {
+				const auto delta = horizontal
+					? ((rtl() ? -1 : 1)
+						* (pixel.x() ? pixel.x() : angle.x()))
+					: (pixel.y() ? pixel.y() : angle.y());
+				scrollSearchShortcutsTo(_searchShortcutsScroll - delta);
+				e->accept();
+				return;
+			}
+		}
+	}
+	Inner::wheelEvent(e);
+}
+
 void EmojiListWidget::mouseMoveEvent(QMouseEvent *e) {
 	_lastMousePos = e->globalPos();
+	if (std::get_if<OverSearchShortcut>(&_pressed)
+		&& _searchShortcutsScrollMax > 0) {
+		const auto delta = _lastMousePos - _searchShortcutsMouseDown;
+		if (!_searchShortcutsDragging
+			&& delta.manhattanLength() >= QApplication::startDragDistance()) {
+			_searchShortcutsDragging = true;
+		}
+		if (_searchShortcutsDragging) {
+			scrollSearchShortcutsTo(
+				_searchShortcutsDragStart
+					+ (rtl() ? -1 : 1) * -delta.x());
+			return;
+		}
+	}
 	if (!_picker->isHidden()) {
 		if (_picker->rect().contains(_picker->mapFromGlobal(_lastMousePos))) {
 			return _picker->handleMouseMove(QCursor::pos());
@@ -2193,6 +3429,10 @@ void EmojiListWidget::refreshCustom() {
 	if (_mode == Mode::RecentReactions || _mode == Mode::MessageEffects) {
 		return;
 	}
+	// Pin the section at the visible top across the rebuild.
+	const auto wasTop = getVisibleTop();
+	const auto wasActive = currentSet(wasTop);
+	const auto wasSectionTop = sectionInfoByOffset(wasTop).top;
 	auto old = base::take(_custom);
 	const auto session = &this->session();
 	const auto premiumPossible = session->premiumPossible();
@@ -2262,6 +3502,7 @@ void EmojiListWidget::refreshCustom() {
 				return;
 			} else if (valid) {
 				i->thumbnailDocument = it->second->lookupThumbnailDocument();
+				i->title = it->second->title;
 				const auto premiumRequired = premium && premiumMayBeBought;
 				if (i->canRemove != canRemove
 					|| i->premiumRequired != premiumRequired) {
@@ -2279,11 +3520,12 @@ void EmojiListWidget::refreshCustom() {
 		auto set = std::vector<CustomOne>();
 		set.reserve(list.size());
 		for (const auto document : list) {
-			if (_restrictedCustomList.contains(document->id)) {
+			const auto id = EmojiStatusId{ document->id };
+			if (_restrictedCustomList.contains(id.documentId)) {
 				continue;
 			} else if (const auto sticker = document->sticker()) {
 				set.push_back({
-					.custom = resolveCustomEmoji(document, lookupId),
+					.custom = resolveCustomEmoji(id, document, lookupId),
 					.document = document,
 					.emoji = Ui::Emoji::Find(sticker->alt),
 				});
@@ -2305,6 +3547,7 @@ void EmojiListWidget::refreshCustom() {
 			.premiumRequired = premium && premiumMayBeBought,
 		});
 	};
+	refreshEmojiStatusCollectibles();
 	refreshMegagroupStickers(push, GroupStickersPlace::Visible);
 	for (const auto setId : owner->stickers().emojiSetsOrder()) {
 		push(setId, true);
@@ -2314,12 +3557,27 @@ void EmojiListWidget::refreshCustom() {
 	}
 	refreshMegagroupStickers(push, GroupStickersPlace::Hidden);
 
+	auto newSectionTop = wasSectionTop;
+	auto found = false;
+	enumerateSections([&](const SectionInfo &info) {
+		if (sectionSetId(info.section) == wasActive) {
+			newSectionTop = info.top;
+			found = true;
+			return false;
+		}
+		return true;
+	});
+
 	_footer->refreshIcons(
 		fillIcons(),
-		currentSet(getVisibleTop()),
+		found ? wasActive : currentSet(wasTop),
 		nullptr,
 		ValidateIconAnimations::None);
 	update();
+
+	if (found && newSectionTop != wasSectionTop) {
+		scrollTo(newSectionTop + (wasTop - wasSectionTop));
+	}
 }
 
 Fn<void()> EmojiListWidget::repaintCallback(
@@ -2337,18 +3595,17 @@ Fn<void()> EmojiListWidget::repaintCallback(
 }
 
 not_null<Ui::Text::CustomEmoji*> EmojiListWidget::resolveCustomEmoji(
+		EmojiStatusId id,
 		not_null<DocumentData*> document,
 		uint64 setId) {
-	Expects(document->sticker() != nullptr);
-
 	const auto documentId = document->id;
-	const auto i = _customEmoji.find(documentId);
+	const auto i = _customEmoji.find(id);
 	const auto recentOnly = (i != end(_customEmoji)) && i->second.recentOnly;
 	if (i != end(_customEmoji) && !recentOnly) {
 		return i->second.emoji.get();
 	}
 	auto instance = document->owner().customEmojiManager().create(
-		document,
+		Data::EmojiStatusCustomId(id),
 		repaintCallback(documentId, setId),
 		Data::CustomEmojiManager::SizeTag::Large);
 	if (recentOnly) {
@@ -2362,7 +3619,7 @@ not_null<Ui::Text::CustomEmoji*> EmojiListWidget::resolveCustomEmoji(
 		return i->second.emoji.get();
 	}
 	return _customEmoji.emplace(
-		documentId,
+		id,
 		CustomEmojiInstance{ .emoji = std::move(instance) }
 	).first->second.emoji.get();
 }
@@ -2372,7 +3629,7 @@ Ui::Text::CustomEmoji *EmojiListWidget::resolveCustomRecent(
 	const auto &data = customId.data;
 	if (const auto document = std::get_if<RecentEmojiDocument>(&data)) {
 		return resolveCustomRecent(document->id);
-	} else if (const auto emoji = std::get_if<EmojiPtr>(&data)) {
+	} else if (v::is<EmojiPtr>(data)) {
 		return nullptr;
 	}
 	Unexpected("Custom recent emoji id.");
@@ -2380,31 +3637,78 @@ Ui::Text::CustomEmoji *EmojiListWidget::resolveCustomRecent(
 
 not_null<Ui::Text::CustomEmoji*> EmojiListWidget::resolveCustomRecent(
 		DocumentId documentId) {
-	const auto i = _customRecent.find(documentId);
+	return resolveCustomRecent(EmojiStatusId{ documentId });
+}
+
+not_null<Ui::Text::CustomEmoji*> EmojiListWidget::resolveCustomRecent(
+		EmojiStatusId id) {
+	const auto i = id.collectible
+		? end(_customRecent)
+		: _customRecent.find(id.documentId);
 	if (i != end(_customRecent)) {
 		return i->second.get();
 	}
-	const auto j = _customEmoji.find(documentId);
+	const auto j = _customEmoji.find(id);
 	if (j != end(_customEmoji)) {
 		return j->second.emoji.get();
 	}
+	const auto documentId = id.collectible
+		? id.collectible->documentId
+		: id.documentId;
 	auto repaint = repaintCallback(documentId, RecentEmojiSectionSetId());
-	if (_customRecentFactory) {
+	if (_customRecentFactory && !id.collectible) {
 		return _customRecent.emplace(
-			documentId,
-			_customRecentFactory(documentId, std::move(repaint))
+			id.documentId,
+			_customRecentFactory(id.documentId, std::move(repaint))
 		).first->second.get();
 	}
 	auto custom = session().data().customEmojiManager().create(
-		documentId,
+		Data::EmojiStatusCustomId(id),
 		std::move(repaint),
 		Data::CustomEmojiManager::SizeTag::Large);
 	return _customEmoji.emplace(
-		documentId,
+		id,
 		CustomEmojiInstance{ .emoji = std::move(custom), .recentOnly = true }
 	).first->second.emoji.get();
 }
 
+void EmojiListWidget::refreshEmojiStatusCollectibles() {
+	if (_mode != Mode::EmojiStatus || !_features.collectibleStatus) {
+		return;
+	}
+	const auto type = Data::EmojiStatuses::Type::Collectibles;
+	const auto &list = session().data().emojiStatuses().list(type);
+	const auto setId = Data::Stickers::CollectibleSetId;
+	auto set = std::vector<CustomOne>();
+	set.reserve(list.size());
+	for (const auto &status : list) {
+		const auto documentId = status.collectible
+			? status.collectible->documentId
+			: status.documentId;
+		const auto document = session().data().document(documentId);
+		const auto sticker = document->sticker();
+		set.push_back({
+			.collectible = status.collectible,
+			.custom = resolveCustomEmoji(status, document, setId),
+			.document = document,
+			.emoji = sticker ? Ui::Emoji::Find(sticker->alt) : nullptr,
+		});
+	}
+	if (set.empty()) {
+		return;
+	}
+	const auto collectibles = session().data().stickers().collectibleSet();
+	_custom.push_back({
+		.id = setId,
+		.set = collectibles,
+		.thumbnailDocument = nullptr,
+		.title = collectibles->title,
+		.list = std::move(set),
+		.canRemove = false,
+		.premiumRequired = !session().premium(),
+	});
+}
+
 void EmojiListWidget::refreshMegagroupStickers(
 		Fn<void(uint64 setId, bool installed)> push,
 		GroupStickersPlace place) {
@@ -2494,7 +3798,9 @@ int EmojiListWidget::paintButtonGetWidth(
 	if (!hasButton(info.section)) {
 		return 0;
 	}
-	auto &ripple = (info.section >= _staticCount)
+	auto &ripple = (_searchMode && info.section > 0)
+		? searchSetBySection(info.section).ripple
+		: (info.section >= _staticCount)
 		? _custom[info.section - _staticCount].ripple
 		: _colorAllRipple;
 	const auto colorAll = hasColorButton(info.section);
@@ -2582,6 +3888,23 @@ void EmojiListWidget::updateSelected() {
 
 	auto newSelected = OverState{ v::null };
 	auto p = mapFromGlobal(_lastMousePos);
+	if (searchShortcutsShown()
+		&& p.y() >= searchShortcutsTop()
+		&& p.y() < searchShortcutsTop() + searchShortcutsHeight()) {
+		if (searchShortcutSelected() && searchBackRect().contains(p)) {
+			newSelected = OverSearchBack{};
+		} else {
+			for (auto i = 0, count = int(_searchShortcutSets.size());
+					i != count; ++i) {
+				if (myrtlrect(searchShortcutRect(i)).contains(p)) {
+					newSelected = OverSearchShortcut{ i };
+					break;
+				}
+			}
+		}
+		setSelected(newSelected);
+		return;
+	}
 	auto info = sectionInfoByOffset(p.y());
 	auto section = info.section;
 	if (p.y() >= info.top && p.y() < info.rowsTop) {
@@ -2589,8 +3912,10 @@ void EmojiListWidget::updateSelected() {
 			&& myrtlrect(buttonRect(section)).contains(p.x(), p.y())) {
 			newSelected = OverButton{ section };
 		} else if (_features.openStickerSets
-			&& section >= _staticCount
-			&& _mode == Mode::Full) {
+			&& ((_searchMode && section > 0)
+				|| (!_searchMode
+					&& section >= _staticCount
+					&& _mode == Mode::Full))) {
 			newSelected = OverSet{ section };
 		}
 	} else if (p.y() >= info.rowsTop && p.y() < info.rowsBottom) {
@@ -2618,6 +3943,14 @@ void EmojiListWidget::setSelected(OverState newSelected) {
 			rtlupdate(emojiRect(sticker->section, sticker->index));
 		} else if (const auto button = std::get_if<OverButton>(&_selected)) {
 			rtlupdate(buttonRect(button->section));
+		} else if (const auto shortcut
+				= std::get_if<OverSearchShortcut>(&_selected)) {
+			if (shortcut->index >= 0
+				&& shortcut->index < _searchShortcutSets.size()) {
+				rtlupdate(searchShortcutRect(shortcut->index));
+			}
+		} else if (std::get_if<OverSearchBack>(&_selected)) {
+			rtlupdate(searchBackRect());
 		}
 	};
 	updateSelected();
@@ -2640,7 +3973,7 @@ void EmojiListWidget::setSelected(OverState newSelected) {
 		if (const auto over = std::get_if<OverEmoji>(&_selected)) {
 			if (const auto custom = lookupCustomEmoji(over)) {
 				_pressed = _selected;
-				_show->showMediaPreview(custom->stickerSetOrigin(), custom);
+				_previewShown = showPreviewFor(custom.document);
 			}
 		}
 	}
@@ -2649,27 +3982,53 @@ void EmojiListWidget::setSelected(OverState newSelected) {
 void EmojiListWidget::setPressed(OverState newPressed) {
 	if (auto button = std::get_if<OverButton>(&_pressed)) {
 		Assert(hasColorButton(button->section)
+			|| (_searchMode && button->section > 0
+				&& button->section <= int(_searchSets.size()))
 			|| (button->section >= _staticCount
 				&& button->section < _staticCount + _custom.size()));
-		auto &ripple = (button->section >= _staticCount)
+		auto &ripple = (_searchMode && button->section > 0)
+			? searchSetBySection(button->section).ripple
+			: (button->section >= _staticCount)
 			? _custom[button->section - _staticCount].ripple
 			: _colorAllRipple;
 		if (ripple) {
 			ripple->lastStop();
 		}
+	} else if (auto shortcut = std::get_if<OverSearchShortcut>(&_pressed)) {
+		if (shortcut->index >= 0
+			&& shortcut->index < _searchShortcutSets.size()) {
+			auto &ripple = _searchShortcutSets[shortcut->index].ripple;
+			if (ripple) {
+				ripple->lastStop();
+			}
+		}
 	}
 	_pressed = newPressed;
 	if (auto button = std::get_if<OverButton>(&_pressed)) {
 		Assert(hasColorButton(button->section)
+			|| (_searchMode && button->section > 0
+				&& button->section <= int(_searchSets.size()))
 			|| (button->section >= _staticCount
 				&& button->section < _staticCount + _custom.size()));
-		auto &ripple = (button->section >= _staticCount)
+		auto &ripple = (_searchMode && button->section > 0)
+			? searchSetBySection(button->section).ripple
+			: (button->section >= _staticCount)
 			? _custom[button->section - _staticCount].ripple
 			: _colorAllRipple;
 		if (!ripple) {
 			ripple = createButtonRipple(button->section);
 		}
 		ripple->add(mapFromGlobal(QCursor::pos()) - buttonRippleTopLeft(button->section));
+	} else if (auto shortcut = std::get_if<OverSearchShortcut>(&_pressed)) {
+		if (shortcut->index >= 0
+			&& shortcut->index < _searchShortcutSets.size()) {
+			auto &ripple = _searchShortcutSets[shortcut->index].ripple;
+			if (!ripple) {
+				ripple = createSearchShortcutRipple(shortcut->index);
+			}
+			ripple->add(mapFromGlobal(QCursor::pos())
+				- myrtlrect(searchShortcutRect(shortcut->index)).topLeft());
+		}
 	}
 }
 
@@ -2743,6 +4102,29 @@ QPoint EmojiListWidget::buttonRippleTopLeft(int section) const {
 			: QPoint());
 }
 
+std::unique_ptr<Ui::RippleAnimation>
+EmojiListWidget::createSearchShortcutRipple(int index) {
+	Expects(index >= 0 && index < _searchShortcutSets.size());
+
+	const auto setId = _searchShortcutSets[index].id;
+	auto mask = Ui::RippleAnimation::RoundRectMask(
+		searchShortcutRect(index).size(),
+		st::roundRadiusLarge);
+	return std::make_unique<Ui::RippleAnimation>(
+		st::defaultRippleAnimation,
+		std::move(mask),
+		[this, setId] {
+			const auto i = ranges::find(
+				_searchShortcutSets,
+				setId,
+				&CustomSet::id);
+			if (i != _searchShortcutSets.end()) {
+				rtlupdate(searchShortcutRect(
+					int(i - _searchShortcutSets.begin())));
+			}
+		});
+}
+
 PowerSaving::Flag EmojiListWidget::powerSavingFlag() const {
 	const auto reactions = (_mode == Mode::FullReactions)
 		|| (_mode == Mode::RecentReactions);
@@ -2783,8 +4165,10 @@ uint64 EmojiListWidget::sectionSetId(int section) const {
 		|| section < _staticCount
 		|| (section - _staticCount) < _custom.size());
 
-	return _searchMode
+	return (_searchMode && section == 0)
 		? SearchEmojiSectionSetId()
+		: (_searchMode && section > 0)
+		? searchSetBySection(section).id
 		: (section < _staticCount)
 		? EmojiSectionSetId(static_cast<Section>(section))
 		: _custom[section - _staticCount].id;
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
index ff474ad2370a88..d025f298853917 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
@@ -9,10 +9,13 @@ For license and copyright information please follow this link:
 
 #include "chat_helpers/compose/compose_features.h"
 #include "chat_helpers/tabbed_selector.h"
+#include "ui/effects/animations.h"
 #include "ui/widgets/tooltip.h"
 #include "ui/round_rect.h"
 #include "base/timer.h"
 
+#include <map>
+
 class StickerPremiumMark;
 
 namespace style {
@@ -58,6 +61,7 @@ struct RepaintRequest;
 
 namespace Window {
 class SessionController;
+class MediaPreviewWidget;
 } // namespace Window
 
 namespace ChatHelpers {
@@ -81,20 +85,27 @@ enum class EmojiListMode {
 	BackgroundEmoji,
 	PeerTitle,
 	MessageEffects,
+	CustomOnly,
 };
 
+[[nodiscard]] std::vector<EmojiStatusId> DocumentListToRecent(
+	const std::vector<DocumentId> &documents);
+
 struct EmojiListDescriptor {
 	std::shared_ptr<Show> show;
 	EmojiListMode mode = EmojiListMode::Full;
 	Fn<QColor()> customTextColor;
 	Fn<bool()> paused;
-	std::vector<DocumentId> customRecentList;
+	std::vector<EmojiStatusId> customRecentList;
 	Fn<std::unique_ptr<Ui::Text::CustomEmoji>(
 		DocumentId,
 		Fn<void()>)> customRecentFactory;
 	base::flat_set<DocumentId> freeEffects;
 	const style::EmojiPan *st = nullptr;
 	ComposeFeatures features;
+	QWidget *mediaPreviewParent = nullptr;
+	QMargins mediaPreviewMargins;
+	bool mediaPreviewPanelStyle = true;
 };
 
 class EmojiListWidget final
@@ -137,7 +148,7 @@ class EmojiListWidget final
 	[[nodiscard]] rpl::producer<> jumpedToPremium() const;
 	[[nodiscard]] rpl::producer<> escapes() const;
 
-	void provideRecent(const std::vector<DocumentId> &customRecentList);
+	void provideRecent(const std::vector<EmojiStatusId> &customRecentList);
 
 	void prepareExpanding();
 	void paintExpanding(
@@ -162,6 +173,7 @@ class EmojiListWidget final
 	void mousePressEvent(QMouseEvent *e) override;
 	void mouseReleaseEvent(QMouseEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
+	void wheelEvent(QWheelEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
 	void leaveEventHook(QEvent *e) override;
 	void leaveToChildEvent(QEvent *e, QWidget *child) override;
@@ -186,6 +198,7 @@ class EmojiListWidget final
 		bool collapsed = false;
 	};
 	struct CustomOne {
+		std::shared_ptr<Data::EmojiStatusCollectible> collectible;
 		not_null<Ui::Text::CustomEmoji*> custom;
 		not_null<DocumentData*> document;
 		EmojiPtr emoji = nullptr;
@@ -243,16 +256,44 @@ class EmojiListWidget final
 			return !(*this == other);
 		}
 	};
+	struct OverSearchShortcut {
+		int index = 0;
+
+		inline bool operator==(OverSearchShortcut other) const {
+			return (index == other.index);
+		}
+		inline bool operator!=(OverSearchShortcut other) const {
+			return !(*this == other);
+		}
+	};
+	struct OverSearchBack {
+		inline bool operator==(OverSearchBack other) const {
+			return true;
+		}
+		inline bool operator!=(OverSearchBack other) const {
+			return !(*this == other);
+		}
+	};
 	using OverState = std::variant<
 		v::null_t,
 		OverEmoji,
 		OverSet,
-		OverButton>;
+		OverButton,
+		OverSearchShortcut,
+		OverSearchBack>;
 	struct ExpandingContext {
 		float64 progress = 0.;
 		int finalHeight = 0;
 		bool expanding = false;
 	};
+	struct ResolvedCustom {
+		DocumentData *document = nullptr;
+		std::shared_ptr<Data::EmojiStatusCollectible> collectible;
+
+		explicit operator bool() const {
+			return document != nullptr;
+		}
+	};
 
 	template <typename Callback>
 	bool enumerateSections(Callback callback) const;
@@ -271,6 +312,7 @@ class EmojiListWidget final
 		Visible,
 		Hidden,
 	};
+	void refreshEmojiStatusCollectibles();
 	void refreshMegagroupStickers(
 		Fn<void(uint64 setId, bool installed)> push,
 		GroupStickersPlace place);
@@ -281,6 +323,46 @@ class EmojiListWidget final
 	void setupSearch();
 	[[nodiscard]] std::vector<EmojiPtr> collectPlainSearchResults();
 	void appendPremiumSearchResults();
+	void sendSearchRequest();
+	void sendSearchSetsRequest(const QString &query);
+	void requestSearchCloud(
+		const QString &query,
+		int offset,
+		bool fallbackToEmpty);
+	void cancelSearchRequest();
+	void toggleSearchLoading(bool loading);
+	void searchCloudResultsDone(
+		const QString &query,
+		int requestedOffset,
+		const MTPmessages_FoundStickers &result);
+	void loadMoreSearchCloud();
+	void checkPaginateSearchCloud(int visibleTop, int visibleBottom);
+	void searchSetsResultsDone(
+		const QString &query,
+		const MTPmessages_FoundStickerSets &result);
+	void showSearchResults();
+	void fillCloudSearchResults();
+	void refreshSearchShortcuts();
+	void fillLocalSearchShortcuts(const QString &query);
+	bool addSearchShortcut(not_null<Data::StickersSet*> set);
+	[[nodiscard]] std::vector<CustomOne> collectSearchSet(
+		not_null<Data::StickersSet*> set);
+	void fillSelectedSearchShortcut();
+	[[nodiscard]] bool searchShortcutsShown() const;
+	[[nodiscard]] bool searchShortcutSelected() const;
+	void startSearchSwapAnimation(Fn<void()> change, bool packToPack = false);
+	[[nodiscard]] int searchShortcutsHeight() const;
+	[[nodiscard]] int searchShortcutsTop() const;
+	[[nodiscard]] QRect searchBackRect() const;
+	[[nodiscard]] QRect searchShortcutRect(int index) const;
+	void refreshSearchShortcutsScroll(int newWidth);
+	void scrollSearchShortcutsTo(int value);
+	void paintSearchShortcuts(Painter &p, QRect clip);
+	void paintSearchShortcutIcon(Painter &p, const CustomSet &set, QRect rect);
+	void toggleSearchShortcut(int index);
+	void backToSearchResults();
+	[[nodiscard]] CustomSet &searchSetBySection(int section);
+	[[nodiscard]] const CustomSet &searchSetBySection(int section) const;
 	void ensureLoaded(int section);
 	void updateSelected();
 	void setSelected(OverState newSelected);
@@ -294,18 +376,20 @@ class EmojiListWidget final
 		not_null<Ui::PopupMenu*> menu,
 		int section,
 		int index);
+	[[nodiscard]] base::unique_qptr<Ui::PopupMenu> fillSetContextMenu(
+		const CustomSet &set);
 
 	[[nodiscard]] EmojiPtr lookupOverEmoji(const OverEmoji *over) const;
-	[[nodiscard]] DocumentData *lookupCustomEmoji(
+	[[nodiscard]] ResolvedCustom lookupCustomEmoji(
 		const OverEmoji *over) const;
-	[[nodiscard]] DocumentData *lookupCustomEmoji(
+	[[nodiscard]] ResolvedCustom lookupCustomEmoji(
 		int index,
 		int section) const;
 	[[nodiscard]] EmojiChosen lookupChosen(
 		EmojiPtr emoji,
 		not_null<const OverEmoji*> over);
 	[[nodiscard]] FileChosen lookupChosen(
-		not_null<DocumentData*> custom,
+		ResolvedCustom custom,
 		const OverEmoji *over,
 		Api::SendOptions options = Api::SendOptions());
 	void selectEmoji(EmojiChosen data);
@@ -328,6 +412,12 @@ class EmojiListWidget final
 		QPoint position,
 		int set,
 		int index);
+	void drawSearchSetCustom(
+		QPainter &p,
+		const ExpandingContext &context,
+		QPoint position,
+		int section,
+		int index);
 	void validateEmojiPaintContext(const ExpandingContext &context);
 	[[nodiscard]] bool hasColorButton(int index) const;
 	[[nodiscard]] QRect colorButtonRect(int index) const;
@@ -357,6 +447,7 @@ class EmojiListWidget final
 		QRect clip) const;
 	void paintEmptySearchResults(Painter &p);
 
+	void displaySet(not_null<DocumentData*> document);
 	void displaySet(uint64 setId);
 	void removeSet(uint64 setId);
 	void removeMegagroupSet(bool locally);
@@ -365,24 +456,31 @@ class EmojiListWidget final
 	[[nodiscard]] std::unique_ptr<Ui::RippleAnimation> createButtonRipple(
 		int section);
 	[[nodiscard]] QPoint buttonRippleTopLeft(int section) const;
+	[[nodiscard]] std::unique_ptr<Ui::RippleAnimation>
+	createSearchShortcutRipple(int index);
 	[[nodiscard]] PowerSaving::Flag powerSavingFlag() const;
 
 	void repaintCustom(uint64 setId);
 
 	void fillRecent();
-	void fillRecentFrom(const std::vector<DocumentId> &list);
+	void fillRecentFrom(const std::vector<EmojiStatusId> &list);
 	[[nodiscard]] not_null<Ui::Text::CustomEmoji*> resolveCustomEmoji(
+		EmojiStatusId id,
 		not_null<DocumentData*> document,
 		uint64 setId);
 	[[nodiscard]] Ui::Text::CustomEmoji *resolveCustomRecent(
 		Core::RecentEmojiId customId);
 	[[nodiscard]] not_null<Ui::Text::CustomEmoji*> resolveCustomRecent(
 		DocumentId documentId);
+	[[nodiscard]] not_null<Ui::Text::CustomEmoji*> resolveCustomRecent(
+		EmojiStatusId id);
 	[[nodiscard]] Fn<void()> repaintCallback(
 		DocumentId documentId,
 		uint64 setId);
 
 	void showPreview();
+	bool showPreviewFor(not_null<DocumentData*> document);
+	void ensureMediaPreview();
 
 	void applyNextSearchQuery();
 
@@ -390,6 +488,9 @@ class EmojiListWidget final
 	const ComposeFeatures _features;
 	const bool _onlyUnicodeEmoji;
 	Mode _mode = Mode::Full;
+	QWidget *_mediaPreviewParent = nullptr;
+	QMargins _mediaPreviewMargins;
+	bool _mediaPreviewPanelStyle = true;
 	std::unique_ptr<Ui::TabbedSearch> _search;
 	MTP::Sender _api;
 	const int _staticCount = 0;
@@ -415,7 +516,7 @@ class EmojiListWidget final
 	QVector<EmojiPtr> _emoji[kEmojiSectionCount];
 	std::vector<CustomSet> _custom;
 	base::flat_set<DocumentId> _restrictedCustomList;
-	base::flat_map<DocumentId, CustomEmojiInstance> _customEmoji;
+	std::map<EmojiStatusId, CustomEmojiInstance> _customEmoji;
 	base::flat_map<
 		DocumentId,
 		std::unique_ptr<Ui::Text::CustomEmoji>> _customRecent;
@@ -434,11 +535,35 @@ class EmojiListWidget final
 	rpl::event_stream<std::vector<QString>> _searchQueries;
 	std::vector<QString> _nextSearchQuery;
 	std::vector<QString> _searchQuery;
+	QString _searchQueryText;
 	base::flat_set<EmojiPtr> _searchEmoji;
 	base::flat_set<EmojiPtr> _searchEmojiPrevious;
 	base::flat_set<DocumentId> _searchCustomIds;
 	std::vector<RecentOne> _searchResults;
 	bool _searchMode = false;
+	std::map<QString, std::vector<DocumentId>> _searchCloudCache;
+	std::map<QString, int> _searchCloudNextOffset;
+	std::map<QString, std::vector<uint64>> _searchSetsCache;
+	std::vector<CustomSet> _searchSets;
+	std::vector<CustomSet> _searchShortcutSets;
+	QString _searchRequestQuery;
+	QString _searchNextRequestQuery;
+	QString _searchEmoticon;
+	uint64 _searchSelectedSetId = 0;
+	int _searchShortcutsScroll = 0;
+	int _searchShortcutsScrollMax = 0;
+	int _searchShortcutsDragStart = 0;
+	QPoint _searchShortcutsMouseDown;
+	bool _searchShortcutsDragging = false;
+	Ui::Animations::Simple _searchSwapAnimation;
+	QPixmap _searchSwapBefore;
+	QPixmap _searchSwapAfter;
+	int _searchSwapTop = 0;
+	bool _searchSwapReverse = false;
+	bool _searchSwapPartial = false;
+	mtpRequestId _searchCloudRequestId = 0;
+	mtpRequestId _searchSetsRequestId = 0;
+	bool _searchLoading = false;
 
 	int _rowsTop = 0;
 	int _rowsLeft = 0;
@@ -458,11 +583,15 @@ class EmojiListWidget final
 	OverState _pickerSelected;
 	QPoint _lastMousePos;
 
+	base::Timer _searchRequestTimer;
 	object_ptr<EmojiColorPicker> _picker;
 	base::Timer _showPickerTimer;
 	base::Timer _previewTimer;
 	bool _previewShown = false;
 
+
+	base::unique_qptr<Window::MediaPreviewWidget> _mediaPreview;
+
 	rpl::event_stream<EmojiChosen> _chosen;
 	rpl::event_stream<FileChosen> _customChosen;
 	rpl::event_stream<> _jumpedToPremium;
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_picker_overlay.cpp b/Telegram/SourceFiles/chat_helpers/emoji_picker_overlay.cpp
new file mode 100644
index 00000000000000..384bd3c41f6285
--- /dev/null
+++ b/Telegram/SourceFiles/chat_helpers/emoji_picker_overlay.cpp
@@ -0,0 +1,692 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "chat_helpers/emoji_picker_overlay.h"
+
+#include "ui/abstract_button.h"
+#include "ui/emoji_config.h"
+#include "ui/painter.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/scroll_area.h"
+#include "styles/style_chat_helpers.h"
+
+#include <QtCore/QEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
+
+namespace ChatHelpers {
+namespace {
+
+[[nodiscard]] std::vector<EmojiPtr> BuildAllEmojis() {
+	using Section = Ui::Emoji::Section;
+	auto result = std::vector<EmojiPtr>();
+	for (auto i = int(Section::People); i <= int(Section::Symbols); ++i) {
+		const auto section = Ui::Emoji::GetSection(Section(i));
+		result.reserve(result.size() + section.size());
+		for (const auto emoji : section) {
+			result.push_back(emoji);
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] std::vector<EmojiPtr> DefaultRecentVector() {
+	const auto src = Ui::Emoji::GetDefaultRecent();
+	return std::vector<EmojiPtr>(src.begin(), src.end());
+}
+
+} // namespace
+
+class EmojiPickerOverlay::Strip final : public Ui::RpWidget {
+public:
+	Strip(QWidget *parent, not_null<EmojiPickerOverlay*> owner);
+
+	void refresh();
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+
+private:
+	struct Cell {
+		EmojiPtr emoji = nullptr;
+		QRect rect;
+	};
+
+	[[nodiscard]] int cellAtPoint(QPoint p) const;
+	void updateHover(int index);
+
+	const not_null<EmojiPickerOverlay*> _owner;
+	std::vector<Cell> _cells;
+	int _hover = -1;
+	int _pressed = -1;
+
+};
+
+class EmojiPickerOverlay::Grid final : public Ui::RpWidget {
+public:
+	Grid(QWidget *parent, not_null<EmojiPickerOverlay*> owner);
+
+	void setEmojis(std::vector<EmojiPtr> emojis);
+	int resizeGetHeight(int newWidth) override;
+	void refresh();
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+
+private:
+	struct Cell {
+		EmojiPtr emoji = nullptr;
+		QRect rect;
+	};
+
+	[[nodiscard]] int cellAtPoint(QPoint p) const;
+	void relayoutCells();
+	void updateHover(int index);
+
+	const not_null<EmojiPickerOverlay*> _owner;
+	std::vector<EmojiPtr> _emojis;
+	std::vector<Cell> _cells;
+	int _columns = 0;
+	int _hover = -1;
+	int _pressed = -1;
+
+};
+
+namespace {
+
+void DrawEmojiCell(
+		QPainter &p,
+		const QRect &cell,
+		EmojiPtr emoji,
+		bool selected,
+		bool hovered) {
+	if (selected) {
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::stickersEmojiPickerSelectedBg);
+		p.drawEllipse(cell);
+	} else if (hovered) {
+		p.setPen(Qt::NoPen);
+		p.setBrush(anim::with_alpha(st::windowSubTextFg->c, 0.12));
+		p.drawEllipse(cell);
+	}
+	if (!emoji) {
+		return;
+	}
+	const auto esize = Ui::Emoji::GetSizeLarge();
+	const auto dpr = style::DevicePixelRatio();
+	const auto pixelSize = esize / dpr;
+	const auto drawSize = std::min(
+		pixelSize,
+		st::stickersEmojiPickerItemSize - 4);
+	const auto x = cell.x() + (cell.width() - drawSize) / 2;
+	const auto y = cell.y() + (cell.height() - drawSize) / 2;
+	if (drawSize == pixelSize) {
+		Ui::Emoji::Draw(p, emoji, esize, x, y);
+	} else {
+		const auto target = QRect(x, y, drawSize, drawSize);
+		auto buffer = QImage(
+			QSize(pixelSize, pixelSize) * dpr,
+			QImage::Format_ARGB32_Premultiplied);
+		buffer.fill(Qt::transparent);
+		buffer.setDevicePixelRatio(dpr);
+		{
+			auto q = QPainter(&buffer);
+			Ui::Emoji::Draw(q, emoji, esize, 0, 0);
+		}
+		p.drawImage(target, buffer);
+	}
+}
+
+} // namespace
+
+EmojiPickerOverlay::Strip::Strip(
+	QWidget *parent,
+	not_null<EmojiPickerOverlay*> owner)
+: RpWidget(parent)
+, _owner(owner) {
+	setMouseTracking(true);
+}
+
+void EmojiPickerOverlay::Strip::refresh() {
+	const auto &sel = _owner->_selectedList;
+	const auto &recent = _owner->_recent;
+	const auto item = st::stickersEmojiPickerItemSize;
+	const auto skip = st::stickersEmojiPickerItemSkip;
+	const auto w = width();
+	if (w <= 0 || item <= 0) {
+		_cells.clear();
+		update();
+		return;
+	}
+	const auto capacity = std::max(1, (w + skip) / (item + skip));
+
+	auto order = std::vector<EmojiPtr>();
+	order.reserve(sel.size() + recent.size());
+	for (const auto emoji : sel) {
+		order.push_back(emoji);
+	}
+	for (const auto emoji : recent) {
+		const auto already = std::find(sel.begin(), sel.end(), emoji)
+			!= sel.end();
+		if (!already) {
+			order.push_back(emoji);
+		}
+	}
+	if (int(order.size()) > capacity) {
+		order.resize(capacity);
+	}
+
+	_cells.clear();
+	_cells.reserve(order.size());
+	auto x = 0;
+	const auto y = (height() - item) / 2;
+	for (const auto emoji : order) {
+		_cells.push_back({ emoji, QRect(x, y, item, item) });
+		x += item + skip;
+	}
+	_hover = -1;
+	_pressed = -1;
+	update();
+}
+
+int EmojiPickerOverlay::Strip::cellAtPoint(QPoint p) const {
+	for (auto i = 0; i != int(_cells.size()); ++i) {
+		if (_cells[i].rect.contains(p)) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+void EmojiPickerOverlay::Strip::updateHover(int index) {
+	if (_hover == index) {
+		return;
+	}
+	_hover = index;
+	update();
+}
+
+void EmojiPickerOverlay::Strip::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	auto hq = PainterHighQualityEnabler(p);
+	for (auto i = 0; i != int(_cells.size()); ++i) {
+		const auto &cell = _cells[i];
+		const auto selected = _owner->_selectedList.end()
+			!= std::find(
+				_owner->_selectedList.begin(),
+				_owner->_selectedList.end(),
+				cell.emoji);
+		DrawEmojiCell(p, cell.rect, cell.emoji, selected, i == _hover);
+	}
+}
+
+void EmojiPickerOverlay::Strip::mouseMoveEvent(QMouseEvent *e) {
+	updateHover(cellAtPoint(e->pos()));
+}
+
+void EmojiPickerOverlay::Strip::mousePressEvent(QMouseEvent *e) {
+	_pressed = cellAtPoint(e->pos());
+}
+
+void EmojiPickerOverlay::Strip::mouseReleaseEvent(QMouseEvent *e) {
+	const auto released = cellAtPoint(e->pos());
+	const auto index = _pressed;
+	_pressed = -1;
+	if (released == index && index >= 0 && index < int(_cells.size())) {
+		_owner->toggleEmoji(_cells[index].emoji, false);
+	}
+}
+
+void EmojiPickerOverlay::Strip::leaveEventHook(QEvent *e) {
+	updateHover(-1);
+}
+
+EmojiPickerOverlay::Grid::Grid(
+	QWidget *parent,
+	not_null<EmojiPickerOverlay*> owner)
+: RpWidget(parent)
+, _owner(owner) {
+	setMouseTracking(true);
+}
+
+void EmojiPickerOverlay::Grid::setEmojis(std::vector<EmojiPtr> emojis) {
+	_emojis = std::move(emojis);
+	relayoutCells();
+}
+
+int EmojiPickerOverlay::Grid::resizeGetHeight(int newWidth) {
+	resize(newWidth, 0);
+	relayoutCells();
+	return height();
+}
+
+void EmojiPickerOverlay::Grid::refresh() {
+	update();
+}
+
+void EmojiPickerOverlay::Grid::relayoutCells() {
+	const auto item = st::stickersEmojiPickerItemSize;
+	const auto skip = st::stickersEmojiPickerItemSkip;
+	const auto w = width();
+	_columns = std::max(1, (w + skip) / (item + skip));
+	_cells.clear();
+	_cells.reserve(_emojis.size());
+	auto col = 0;
+	auto row = 0;
+	for (const auto emoji : _emojis) {
+		const auto x = col * (item + skip);
+		const auto y = row * (item + skip);
+		_cells.push_back({ emoji, QRect(x, y, item, item) });
+		if (++col >= _columns) {
+			col = 0;
+			++row;
+		}
+	}
+	const auto fullRows = row + (col > 0 ? 1 : 0);
+	const auto h = fullRows > 0
+		? (fullRows * item + (fullRows - 1) * skip)
+		: 0;
+	resize(w, h);
+	_hover = -1;
+	_pressed = -1;
+	update();
+}
+
+int EmojiPickerOverlay::Grid::cellAtPoint(QPoint p) const {
+	for (auto i = 0; i != int(_cells.size()); ++i) {
+		if (_cells[i].rect.contains(p)) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+void EmojiPickerOverlay::Grid::updateHover(int index) {
+	if (_hover == index) {
+		return;
+	}
+	_hover = index;
+	update();
+}
+
+void EmojiPickerOverlay::Grid::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	auto hq = PainterHighQualityEnabler(p);
+	const auto clip = e->rect();
+	for (auto i = 0; i != int(_cells.size()); ++i) {
+		const auto &cell = _cells[i];
+		if (!cell.rect.intersects(clip)) {
+			continue;
+		}
+		const auto selected = _owner->_selectedList.end()
+			!= std::find(
+				_owner->_selectedList.begin(),
+				_owner->_selectedList.end(),
+				cell.emoji);
+		DrawEmojiCell(p, cell.rect, cell.emoji, selected, i == _hover);
+	}
+}
+
+void EmojiPickerOverlay::Grid::mouseMoveEvent(QMouseEvent *e) {
+	updateHover(cellAtPoint(e->pos()));
+}
+
+void EmojiPickerOverlay::Grid::mousePressEvent(QMouseEvent *e) {
+	_pressed = cellAtPoint(e->pos());
+}
+
+void EmojiPickerOverlay::Grid::mouseReleaseEvent(QMouseEvent *e) {
+	const auto released = cellAtPoint(e->pos());
+	const auto index = _pressed;
+	_pressed = -1;
+	if (released == index && index >= 0 && index < int(_cells.size())) {
+		_owner->toggleEmoji(_cells[index].emoji, true);
+	}
+}
+
+void EmojiPickerOverlay::Grid::leaveEventHook(QEvent *e) {
+	updateHover(-1);
+}
+
+EmojiPickerOverlay::Metrics EmojiPickerOverlay::EstimateMetrics(
+		const QString &aboutText) {
+	const auto tailHeight = st::stickersEmojiPickerStripBubble.height();
+	const auto shadowExtent = Ui::BoxShadow::ExtendFor(
+		st::stickersEmojiPickerBoxShadow);
+	const auto &pad = st::stickersEmojiPickerPadding;
+	auto about = Ui::FlatLabel(
+		nullptr,
+		aboutText,
+		st::stickersEmojiPickerAbout);
+	const auto collapsedHeight = pad.top()
+		+ about.height()
+		+ st::stickersEmojiPickerStripHeight
+		+ pad.bottom();
+	const auto expandedHeight = collapsedHeight
+		+ st::stickersEmojiPickerExpandedHeight;
+	const auto shadowAndTail = shadowExtent.top()
+		+ shadowExtent.bottom()
+		+ tailHeight;
+	return {
+		.shadowExtent = shadowExtent,
+		.tailHeight = tailHeight,
+		.collapsedHeight = collapsedHeight,
+		.expandedHeight = expandedHeight,
+		.totalCollapsedHeight = collapsedHeight + shadowAndTail,
+		.totalExpandedHeight = expandedHeight + shadowAndTail,
+	};
+}
+
+EmojiPickerOverlay::EmojiPickerOverlay(
+	QWidget *parent,
+	EmojiPickerOverlayDescriptor descriptor)
+: RpWidget(parent)
+, _aboutText(std::move(descriptor.aboutText))
+, _recent(descriptor.recent.empty()
+	? DefaultRecentVector()
+	: std::move(descriptor.recent))
+, _maxSelected(descriptor.maxSelected)
+, _allowExpand(descriptor.allowExpand)
+, _selectedList(std::move(descriptor.initialSelected))
+, _shadow(st::stickersEmojiPickerBoxShadow) {
+	_allForGrid = BuildAllEmojis();
+
+	_about = std::make_unique<Ui::FlatLabel>(
+		this,
+		_aboutText,
+		st::stickersEmojiPickerAbout);
+
+	_strip = Ui::CreateChild<Strip>(this, this);
+
+	if (_allowExpand) {
+		_expandButton = Ui::CreateChild<Ui::AbstractButton>(this);
+		_expandButton->resize(
+			st::stickersEmojiPickerExpandSize,
+			st::stickersEmojiPickerExpandSize);
+		_expandButton->setClickedCallback([=] {
+			setExpanded(!_expanded.current());
+		});
+		_expandButton->paintRequest(
+		) | rpl::on_next([=](const QRect &clip) {
+			auto p = QPainter(_expandButton);
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::stickersEmojiPickerExpandBg);
+			p.drawEllipse(_expandButton->rect());
+			const auto &icon = _expanded.current()
+				? st::stickersEmojiPickerCollapseIcon
+				: st::stickersEmojiPickerExpandIcon;
+			const auto x = (_expandButton->width() - icon.width()) / 2;
+			const auto y = (_expandButton->height() - icon.height()) / 2;
+			icon.paint(p, x, y, _expandButton->width());
+		}, _expandButton->lifetime());
+
+		_scroll = std::make_unique<Ui::ScrollArea>(
+			this,
+			st::stickersEmojiPickerScroll);
+		_scroll->setFrameStyle(QFrame::NoFrame);
+		_scroll->hide();
+		const auto gridPtr = _scroll->setOwnedWidget(
+			object_ptr<Grid>(_scroll.get(), this));
+		_grid = gridPtr.data();
+		_grid->setEmojis(_allForGrid);
+	}
+
+	_selectedVar = _selectedList;
+	resize(width(), totalExpandedHeight());
+}
+
+QMargins EmojiPickerOverlay::shadowExtent() const {
+	return _shadow.extend();
+}
+
+int EmojiPickerOverlay::totalCollapsedHeight() const {
+	const auto ext = _shadow.extend();
+	return collapsedHeight() + ext.top() + ext.bottom() + tailHeight();
+}
+
+int EmojiPickerOverlay::totalExpandedHeight() const {
+	const auto ext = _shadow.extend();
+	return expandedHeight() + ext.top() + ext.bottom() + tailHeight();
+}
+
+QRect EmojiPickerOverlay::bubbleRect() const {
+	const auto ext = _shadow.extend();
+	return QRect(
+		ext.left(),
+		ext.top(),
+		width() - ext.left() - ext.right(),
+		height() - ext.top() - ext.bottom() - tailHeight());
+}
+
+QRect EmojiPickerOverlay::bubbleShownRect() const {
+	const auto r = bubbleRect();
+	return QRect(r.x(), r.y(), r.width(), currentShownHeight());
+}
+
+EmojiPickerOverlay::~EmojiPickerOverlay() = default;
+
+const std::vector<EmojiPtr> &EmojiPickerOverlay::selected() const {
+	return _selectedList;
+}
+
+rpl::producer<std::vector<EmojiPtr>>
+EmojiPickerOverlay::selectedValue() const {
+	return _selectedVar.value();
+}
+
+void EmojiPickerOverlay::setExpanded(bool expanded) {
+	if (!_allowExpand || _expanded.current() == expanded) {
+		return;
+	}
+	startExpandAnimation(expanded);
+	_expanded = expanded;
+	if (_expandButton) {
+		_expandButton->update();
+	}
+}
+
+void EmojiPickerOverlay::startExpandAnimation(bool expanded) {
+	const auto from = _expandAnim.value(expanded ? 0. : 1.);
+	const auto to = expanded ? 1. : 0.;
+	_expandAnim.start(
+		[=] { applyExpandProgress(); },
+		from,
+		to,
+		st::slideWrapDuration,
+		anim::easeOutCirc);
+	applyExpandProgress();
+}
+
+float64 EmojiPickerOverlay::currentExpandValue() const {
+	return _expandAnim.value(_expanded.current() ? 1. : 0.);
+}
+
+int EmojiPickerOverlay::currentShownHeight() const {
+	const auto progress = currentExpandValue();
+	return anim::interpolate(
+		collapsedHeight(),
+		expandedHeight(),
+		progress);
+}
+
+void EmojiPickerOverlay::applyExpandProgress() {
+	if (_scroll) {
+		const auto progress = currentExpandValue();
+		_scroll->setVisible(progress > 0.);
+	}
+	relayout();
+	update();
+}
+
+bool EmojiPickerOverlay::expanded() const {
+	return _expanded.current();
+}
+
+rpl::producer<bool> EmojiPickerOverlay::expandedValue() const {
+	return _expanded.value();
+}
+
+int EmojiPickerOverlay::collapsedHeight() const {
+	const auto &pad = st::stickersEmojiPickerPadding;
+	const auto aboutH = _about ? _about->height() : 0;
+	return pad.top()
+		+ aboutH
+		+ st::stickersEmojiPickerStripHeight
+		+ pad.bottom();
+}
+
+int EmojiPickerOverlay::expandedHeight() const {
+	return collapsedHeight() + st::stickersEmojiPickerExpandedHeight;
+}
+
+void EmojiPickerOverlay::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	auto hq = PainterHighQualityEnabler(p);
+	const auto progress = currentExpandValue();
+	const auto shown = bubbleShownRect();
+	const auto radius = st::stickersEmojiPickerExpandedRadius;
+
+	_shadow.paint(p, shown, radius);
+	p.setPen(Qt::NoPen);
+	p.setBrush(st::stickersEmojiPickerBg);
+	p.drawRoundedRect(shown, radius, radius);
+
+	if (progress < 1.) {
+		paintTailBubble(p, shown, 1. - progress);
+	}
+}
+
+void EmojiPickerOverlay::paintTailBubble(
+		QPainter &p,
+		const QRect &bubble,
+		float64 opacity) {
+	const auto &icon = st::stickersEmojiPickerStripBubble;
+	const auto offsetRight = st::stickersEmojiPickerStripBubbleRight;
+	const auto x = bubble.right() + 1 - offsetRight - icon.width();
+	const auto y = bubble.bottom() + 1;
+	if (opacity >= 1.) {
+		icon.paint(p, x, y, width());
+	} else {
+		p.save();
+		p.setOpacity(opacity);
+		icon.paint(p, x, y, width());
+		p.restore();
+	}
+}
+
+void EmojiPickerOverlay::resizeEvent(QResizeEvent *e) {
+	relayout();
+}
+
+void EmojiPickerOverlay::mousePressEvent(QMouseEvent *e) {
+	if (!bubbleShownRect().contains(e->pos())) {
+		e->ignore();
+	}
+}
+
+int EmojiPickerOverlay::tailHeight() const {
+	return st::stickersEmojiPickerStripBubble.height();
+}
+
+void EmojiPickerOverlay::relayout() {
+	const auto &pad = st::stickersEmojiPickerPadding;
+	const auto bubble = bubbleRect();
+	const auto bubbleShown = currentShownHeight();
+	if (_about) {
+		_about->resizeToWidth(bubble.width() - pad.left() - pad.right());
+		_about->moveToLeft(bubble.left() + pad.left(), bubble.top() + pad.top());
+	}
+	const auto aboutBottom = _about
+		? (_about->y() + _about->height())
+		: (bubble.top() + pad.top());
+
+	const auto stripTop = aboutBottom;
+	const auto stripH = st::stickersEmojiPickerStripHeight;
+	const auto expandSize = _expandButton
+		? _expandButton->width()
+		: 0;
+	const auto expandGap = _expandButton
+		? st::stickersEmojiPickerItemSkip
+		: 0;
+	const auto stripW = bubble.width()
+		- pad.left()
+		- pad.right()
+		- expandSize
+		- expandGap;
+	_strip->setGeometry(bubble.left() + pad.left(), stripTop, stripW, stripH);
+	_strip->refresh();
+
+	if (_expandButton) {
+		const auto bx = bubble.right() + 1 - pad.right() - expandSize;
+		const auto by = stripTop + (stripH - expandSize) / 2;
+		_expandButton->moveToLeft(bx, by);
+	}
+
+	if (_scroll) {
+		const auto scrollTop = stripTop + stripH;
+		const auto bubbleBottom = bubble.top() + bubbleShown;
+		const auto scrollH = std::max(
+			0,
+			bubbleBottom - scrollTop - pad.bottom());
+		const auto scrollContentWidth = bubble.width()
+			- pad.left()
+			- pad.right();
+		const auto scrollAreaWidth = scrollContentWidth
+			+ pad.right();
+		_scroll->setGeometry(
+			bubble.left() + pad.left(),
+			scrollTop,
+			scrollAreaWidth,
+			scrollH);
+		if (_grid) {
+			_grid->resizeGetHeight(scrollContentWidth);
+		}
+	}
+}
+
+void EmojiPickerOverlay::toggleEmoji(EmojiPtr emoji, bool fromGrid) {
+	if (!emoji) {
+		return;
+	}
+	const auto it = std::find(
+		_selectedList.begin(),
+		_selectedList.end(),
+		emoji);
+	if (it != _selectedList.end()) {
+		_selectedList.erase(it);
+	} else {
+		if (_maxSelected > 0 && int(_selectedList.size()) >= _maxSelected) {
+			return;
+		}
+		_selectedList.push_back(emoji);
+	}
+	notifySelectionChanged();
+	if (fromGrid) {
+		setExpanded(false);
+	}
+}
+
+void EmojiPickerOverlay::notifySelectionChanged() {
+	_selectedVar = _selectedList;
+	if (_strip) {
+		_strip->refresh();
+	}
+	if (_grid) {
+		_grid->refresh();
+	}
+}
+
+} // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_picker_overlay.h b/Telegram/SourceFiles/chat_helpers/emoji_picker_overlay.h
new file mode 100644
index 00000000000000..80432ae8b4ac9d
--- /dev/null
+++ b/Telegram/SourceFiles/chat_helpers/emoji_picker_overlay.h
@@ -0,0 +1,103 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/effects/animations.h"
+#include "ui/emoji_config.h"
+#include "ui/widgets/shadow.h"
+
+namespace Ui {
+class AbstractButton;
+class FlatLabel;
+class ScrollArea;
+} // namespace Ui
+
+namespace ChatHelpers {
+
+struct EmojiPickerOverlayDescriptor {
+	QString aboutText;
+	std::vector<EmojiPtr> recent;
+	int maxSelected = 0;
+	bool allowExpand = true;
+	std::vector<EmojiPtr> initialSelected;
+};
+
+class EmojiPickerOverlay final : public Ui::RpWidget {
+public:
+	EmojiPickerOverlay(
+		QWidget *parent,
+		EmojiPickerOverlayDescriptor descriptor);
+	~EmojiPickerOverlay();
+
+	struct Metrics {
+		QMargins shadowExtent;
+		int tailHeight = 0;
+		int collapsedHeight = 0;
+		int expandedHeight = 0;
+		int totalCollapsedHeight = 0;
+		int totalExpandedHeight = 0;
+	};
+	[[nodiscard]] static Metrics EstimateMetrics(const QString &aboutText);
+
+	[[nodiscard]] const std::vector<EmojiPtr> &selected() const;
+	[[nodiscard]] rpl::producer<std::vector<EmojiPtr>> selectedValue() const;
+
+	void setExpanded(bool expanded);
+	[[nodiscard]] bool expanded() const;
+	[[nodiscard]] rpl::producer<bool> expandedValue() const;
+
+	[[nodiscard]] int collapsedHeight() const;
+	[[nodiscard]] int expandedHeight() const;
+	[[nodiscard]] QMargins shadowExtent() const;
+	[[nodiscard]] int totalCollapsedHeight() const;
+	[[nodiscard]] int totalExpandedHeight() const;
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+
+private:
+	class Strip;
+	class Grid;
+
+	void relayout();
+	void toggleEmoji(EmojiPtr emoji, bool fromGrid);
+	void notifySelectionChanged();
+	void startExpandAnimation(bool expanded);
+	void applyExpandProgress();
+	void paintTailBubble(QPainter &p, const QRect &bubble, float64 opacity);
+	[[nodiscard]] float64 currentExpandValue() const;
+	[[nodiscard]] int currentShownHeight() const;
+	[[nodiscard]] int tailHeight() const;
+	[[nodiscard]] QRect bubbleRect() const;
+	[[nodiscard]] QRect bubbleShownRect() const;
+
+	const QString _aboutText;
+	const std::vector<EmojiPtr> _recent;
+	const int _maxSelected;
+	const bool _allowExpand;
+
+	std::vector<EmojiPtr> _allForGrid;
+
+	std::vector<EmojiPtr> _selectedList;
+	rpl::variable<std::vector<EmojiPtr>> _selectedVar;
+	rpl::variable<bool> _expanded = false;
+
+	std::unique_ptr<Ui::FlatLabel> _about;
+	Strip *_strip = nullptr;
+	Ui::AbstractButton *_expandButton = nullptr;
+	std::unique_ptr<Ui::ScrollArea> _scroll;
+	Grid *_grid = nullptr;
+	Ui::Animations::Simple _expandAnim;
+	Ui::BoxShadow _shadow;
+
+};
+
+} // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
index 2f88f8202d1877..924b3b60fbbe46 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
@@ -41,9 +41,9 @@ inline auto PreviewPath(int i) {
 
 const auto kSets = {
 	Set{ { 0,    0,         0, "Mac" },       PreviewPath(0) },
-	Set{ { 1, 2290, 8'306'943, "Android" },   PreviewPath(1) },
-	Set{ { 2, 2291, 5'694'303, "Twemoji" },   PreviewPath(2) },
-	Set{ { 3, 2292, 7'261'223, "JoyPixels" }, PreviewPath(3) },
+	Set{ { 1, 2774, 8'455'034, "Android" },   PreviewPath(1) },
+	Set{ { 2, 2775, 5'713'503, "Twemoji" },   PreviewPath(2) },
+	Set{ { 3, 2776, 7'347'332, "JoyPixels" }, PreviewPath(3) },
 };
 
 using Loading = MTP::DedicatedLoader::Progress;
@@ -173,7 +173,7 @@ Loader::Loader(
 
 void Loader::unpack(const QString &path) {
 	const auto folder = internal::SetDataPath(id());
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	crl::async([=] {
 		if (UnpackSet(path, folder)) {
 			QFile(path).remove();
@@ -391,7 +391,7 @@ void Row::setupHandler() {
 		const auto &state = _state.current();
 		return !_switching && (v::is<Ready>(state)
 			|| v::is<Available>(state));
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (v::is<Available>(_state.current())) {
 			load();
 			return;
@@ -410,7 +410,7 @@ void Row::setupHandler() {
 	_state.value(
 	) | rpl::map([=](const SetState &state) {
 		return v::is<Ready>(state) || v::is<Available>(state);
-	}) | rpl::start_with_next([=](bool active) {
+	}) | rpl::on_next([=](bool active) {
 		setDisabled(!active);
 		setPointerCursor(active);
 	}, lifetime());
@@ -435,7 +435,7 @@ void Row::setupLabels(const Set &set) {
 	_status->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto left = st::manageEmojiPreviewPadding.left()
 			+ st::manageEmojiPreviewWidth
 			+ st::manageEmojiPreviewPadding.right();
@@ -487,7 +487,7 @@ void Row::setupAnimation() {
 	using namespace rpl::mappers;
 
 	_state.value(
-	) | rpl::start_with_next([=](const SetState &state) {
+	) | rpl::on_next([=](const SetState &state) {
 		update();
 	}, lifetime());
 
@@ -495,7 +495,7 @@ void Row::setupAnimation() {
 	) | rpl::map(
 		_1 == SetState{ Active() }
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_toggled.start(
 			[=] { updateStatusColorOverride(); update(); },
 			toggled ? 0. : 1.,
@@ -507,7 +507,7 @@ void Row::setupAnimation() {
 	) | rpl::map([](const SetState &state) {
 		return v::is<Loading>(state) || v::is<Active>(state);
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
 		_active.start(
 			[=] { update(); },
 			active ? 0. : 1.,
@@ -519,7 +519,7 @@ void Row::setupAnimation() {
 	) | rpl::map([](const SetState &state) {
 		return std::get_if<Loading>(&state);
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](const Loading *loading) {
+	) | rpl::on_next([=](const Loading *loading) {
 		if (loading && !_loading) {
 			_loading = std::make_unique<Ui::RadialAnimation>(
 				[=](crl::time now) { radialAnimationCallback(now); });
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
index 87fd388861e978..696541172c8502 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
@@ -22,6 +22,7 @@ For license and copyright information please follow this link:
 #include "platform/platform_specific.h"
 #include "core/application.h"
 #include "base/event_filter.h"
+#include "base/integration.h"
 #include "main/main_session.h"
 #include "data/data_session.h"
 #include "data/data_document.h"
@@ -167,7 +168,7 @@ SuggestionsWidget::SuggestionsWidget(
 , _session(session)
 , _suggestCustomEmoji(suggestCustomEmoji)
 , _allowCustomWithoutPremium(std::move(allowCustomWithoutPremium))
-, _overRect(st::roundRadiusSmall, _st.overBg)
+, _overRect(st::roundRadiusLarge, _st.overBg)
 , _oneWidth(st::emojiSuggestionSize)
 , _padding(st::emojiSuggestionsPadding) {
 	resize(
@@ -704,12 +705,12 @@ void SuggestionsWidget::enterEventHook(QEnterEvent *e) {
 	if (!inner().contains(mapToInner(QCursor::pos()))) {
 		clearMouseSelection();
 	}
-	return TWidget::enterEventHook(e);
+	return RpWidget::enterEventHook(e);
 }
 
 void SuggestionsWidget::leaveEventHook(QEvent *e) {
 	clearMouseSelection();
-	return TWidget::leaveEventHook(e);
+	return RpWidget::leaveEventHook(e);
 }
 
 SuggestionsController::SuggestionsController(
@@ -750,11 +751,11 @@ SuggestionsController::SuggestionsController(
 	};
 	_outerFilter.reset(base::install_event_filter(outer, outerCallback));
 
-	QObject::connect(
-		_field,
-		&QTextEdit::textChanged,
-		_container,
-		[=] { handleTextChange(); });
+	QObject::connect(_field, &QTextEdit::textChanged, _container, [=] {
+		base::Integration::Instance().enterFromEventLoop([&] {
+			handleTextChange();
+		});
+	});
 	QObject::connect(
 		_field,
 		&QTextEdit::cursorPositionChanged,
@@ -762,15 +763,15 @@ SuggestionsController::SuggestionsController(
 		[=] { handleCursorPositionChange(); });
 
 	_suggestions->toggleAnimated(
-	) | rpl::start_with_next([=](bool visible) {
+	) | rpl::on_next([=](bool visible) {
 		suggestionsUpdated(visible);
 	}, _lifetime);
 	_suggestions->triggered(
-	) | rpl::start_with_next([=](const SuggestionsWidget::Chosen &chosen) {
+	) | rpl::on_next([=](const SuggestionsWidget::Chosen &chosen) {
 		replaceCurrent(chosen.emoji, chosen.customData);
 	}, _lifetime);
 	Core::App().emojiKeywords().refreshed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_keywordsRefreshed = true;
 		if (!_showExactTimer.isActive()) {
 			showWithQuery(_lastShownQuery);
@@ -782,7 +783,7 @@ SuggestionsController::SuggestionsController(
 	_container->shownValue(
 	) | rpl::filter([=](bool shown) {
 		return shown && !_shown;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_container->hide();
 	}, _container->lifetime());
 
@@ -984,7 +985,7 @@ void SuggestionsController::replaceCurrent(
 	const auto position = cursor.position();
 	const auto suggestion = getEmojiQuery();
 	if (v::is<EmojiPtr>(suggestion)) {
-		const auto weak = Ui::MakeWeak(_container.get());
+		const auto weak = base::make_weak(_container.get());
 		const auto count = std::max(_emojiQueryLength, 1);
 		for (auto i = 0; i != count; ++i) {
 			const auto start = position - count + i;
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 64db33d133c0c1..c3654bc80b62fd 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -8,6 +8,8 @@ For license and copyright information please follow this link:
 #include "chat_helpers/field_autocomplete.h"
 
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/recent_inline_bots.h"
+#include "data/components/top_peers.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_changes.h"
@@ -43,7 +45,7 @@ For license and copyright information please follow this link:
 #include "ui/cached_round_corners.h"
 #include "base/unixtime.h"
 #include "base/random.h"
-#include "base/qt/qt_common_adapters.h"
+#include "base/qt/qt_key_modifiers.h"
 #include "boxes/sticker_set_box.h"
 #include "window/window_adaptive.h"
 #include "window/window_session_controller.h"
@@ -64,7 +66,7 @@ namespace {
 
 template <typename T, typename U>
 inline int indexOfInFirstN(const T &v, const U &elem, int last) {
-	for (auto b = v.cbegin(), i = b, e = b + std::max(int(v.size()), last)
+	for (auto b = v.cbegin(), i = b, e = b + std::min(int(v.size()), last)
 		; i != e
 		; ++i) {
 		if (i->user == elem) {
@@ -100,7 +102,6 @@ class FieldAutocomplete::Inner final : public Ui::RpWidget {
 		int index,
 		Api::SendOptions options = {}) const;
 
-	void setRecentInlineBotsInRows(int32 bots);
 	void setSendMenuDetails(Fn<SendMenu::Details()> &&callback);
 	void rowsUpdated();
 
@@ -126,6 +127,7 @@ class FieldAutocomplete::Inner final : public Ui::RpWidget {
 	void contextMenuEvent(QContextMenuEvent *e) override;
 
 	QRect selectedRect(int index) const;
+	[[nodiscard]] bool isRemovableMentionRow(int index) const;
 	void updateSelectedRow();
 	void setSel(int sel, bool scroll = false);
 	void showPreview();
@@ -154,7 +156,6 @@ class FieldAutocomplete::Inner final : public Ui::RpWidget {
 	std::weak_ptr<Lottie::FrameRenderer> _lottieRenderer;
 	base::unique_qptr<Ui::PopupMenu> _menu;
 	int _stickersPerRow = 1;
-	int _recentInlineBotsInRows = 0;
 	int _sel = -1;
 	int _down = -1;
 	std::optional<QPoint> _lastMousePosition;
@@ -190,9 +191,21 @@ struct FieldAutocomplete::StickerSuggestion {
 };
 
 struct FieldAutocomplete::MentionRow {
+	enum class Source {
+		InlineRecent,
+		GuestChatTopPeer,
+		MentionCandidate,
+	};
+
 	not_null<UserData*> user;
+	Source source = Source::MentionCandidate;
 	Ui::Text::String name;
 	Ui::PeerUserpicView userpic;
+
+	[[nodiscard]] bool removable() const {
+		return (source == Source::InlineRecent)
+			|| (source == Source::GuestChatTopPeer);
+	}
 };
 
 struct FieldAutocomplete::BotCommandRow {
@@ -228,7 +241,7 @@ FieldAutocomplete::FieldAutocomplete(
 	_inner->setGeometry(rect());
 
 	_inner->scrollToRequested(
-	) | rpl::start_with_next([=](Inner::ScrollTo data) {
+	) | rpl::on_next([=](Inner::ScrollTo data) {
 		_scroll->scrollToY(data.top, data.bottom);
 	}, lifetime());
 
@@ -238,9 +251,19 @@ FieldAutocomplete::FieldAutocomplete(
 	hide();
 
 	_scroll->geometryChanged(
-	) | rpl::start_with_next(crl::guard(_inner, [=] {
+	) | rpl::on_next(crl::guard(_inner, [=] {
 		_inner->onParentGeometryChanged();
 	}), lifetime());
+
+	_session->topGuestChatBots().updates(
+	) | rpl::on_next([=] {
+		if (_hiding
+			|| isHidden()
+			|| (_type != Type::Mentions)) {
+			return;
+		}
+		updateFiltered();
+	}, lifetime());
 }
 
 std::shared_ptr<Show> FieldAutocomplete::uiShow() const {
@@ -429,7 +452,7 @@ FieldAutocomplete::StickerRows FieldAutocomplete::getStickerSuggestions() {
 }
 
 void FieldAutocomplete::updateFiltered(bool resetScroll) {
-	int32 now = base::unixtime::now(), recentInlineBots = 0;
+	int32 now = base::unixtime::now();
 	MentionRows mrows;
 	HashtagRows hrows;
 	BotCommandRows brows;
@@ -437,7 +460,11 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 	if (_emoji) {
 		srows = getStickerSuggestions();
 	} else if (_type == Type::Mentions) {
-		int maxListSize = _addInlineBots ? cRecentInlineBots().size() : 0;
+		const auto guestChatBots = _session->topGuestChatBots().list();
+		int maxListSize = int(guestChatBots.size())
+			+ (_addInlineBots
+				? int(_session->recentInlineBots().list().size())
+				: 0);
 		if (_chat) {
 			maxListSize += (_chat->participants.empty() ? _chat->lastAuthors.size() : _chat->participants.size());
 		} else if (_channel && _channel->isMegagroup()) {
@@ -470,18 +497,52 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 			}
 			return filterNotPassedByUsername(user);
 		};
+		const auto mentionUserIndex = [&](not_null<UserData*> user) {
+			return indexOfInFirstN(mrows, user, int(mrows.size()));
+		};
+		const auto containsMentionUser = [&](not_null<UserData*> user) {
+			return mentionUserIndex(user) >= 0;
+		};
+		const auto pushMentionRow = [&](
+				not_null<UserData*> user,
+				MentionRow::Source source) {
+			if (containsMentionUser(user)) {
+				return;
+			}
+			mrows.push_back({ user, source });
+		};
+		const auto markMentionCandidateIfExists = [&](
+				not_null<UserData*> user) {
+			const auto index = mentionUserIndex(user);
+			if (index < 0) {
+				return false;
+			}
+			mrows[index].source = MentionRow::Source::MentionCandidate;
+			return true;
+		};
 
 		bool listAllSuggestions = _filter.isEmpty();
 		if (_addInlineBots) {
-			for (const auto user : cRecentInlineBots()) {
+			for (const auto &user : _session->recentInlineBots().list()) {
 				if (user->isInaccessible()
 					|| (!listAllSuggestions
 						&& filterNotPassedByUsername(user))) {
 					continue;
 				}
-				mrows.push_back({ user });
-				++recentInlineBots;
+				pushMentionRow(user, MentionRow::Source::InlineRecent);
+			}
+		}
+		for (const auto &peer : guestChatBots) {
+			const auto user = peer->asUser();
+			if (!user
+				|| user->isInaccessible()
+				|| !user->isBot()
+				|| (!listAllSuggestions
+					&& filterNotPassedByUsername(user))
+				|| containsMentionUser(user)) {
+				continue;
 			}
+			pushMentionRow(user, MentionRow::Source::GuestChatTopPeer);
 		}
 		if (_chat) {
 			auto sorted = base::flat_multi_map<TimeId, not_null<UserData*>>();
@@ -495,20 +556,23 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 				for (const auto &user : _chat->participants) {
 					if (user->isInaccessible()) continue;
 					if (!listAllSuggestions && filterNotPassedByName(user)) continue;
-					if (indexOfInFirstN(mrows, user, recentInlineBots) >= 0) continue;
+					if (markMentionCandidateIfExists(user)) continue;
 					sorted.emplace(byOnline(user), user);
 				}
 			}
-			for (const auto user : _chat->lastAuthors) {
+			for (const auto &user : _chat->lastAuthors) {
 				if (user->isInaccessible()) continue;
 				if (!listAllSuggestions && filterNotPassedByName(user)) continue;
-				if (indexOfInFirstN(mrows, user, recentInlineBots) >= 0) continue;
-				mrows.push_back({ user });
+				if (markMentionCandidateIfExists(user)) {
+					sorted.remove(byOnline(user), user);
+					continue;
+				}
+				pushMentionRow(user, MentionRow::Source::MentionCandidate);
 				sorted.remove(byOnline(user), user);
 			}
 			for (auto i = sorted.cend(), b = sorted.cbegin(); i != b;) {
 				--i;
-				mrows.push_back({ i->second });
+				pushMentionRow(i->second, MentionRow::Source::MentionCandidate);
 			}
 		} else if (_channel && _channel->isMegagroup()) {
 			if (!_channel->canViewMembers()) {
@@ -516,12 +580,12 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 					_channel->session().api().chatParticipants().requestAdmins(_channel);
 				} else {
 					mrows.reserve(mrows.size() + _channel->mgInfo->admins.size());
-					for (const auto &[userId, rank] : _channel->mgInfo->admins) {
+					for (const auto &userId : _channel->mgInfo->admins) {
 						if (const auto user = _channel->owner().userLoaded(userId)) {
 							if (user->isInaccessible()) continue;
 							if (!listAllSuggestions && filterNotPassedByName(user)) continue;
-							if (indexOfInFirstN(mrows, user, recentInlineBots) >= 0) continue;
-							mrows.push_back({ user });
+							if (markMentionCandidateIfExists(user)) continue;
+							pushMentionRow(user, MentionRow::Source::MentionCandidate);
 						}
 					}
 				}
@@ -530,11 +594,11 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 					_channel);
 			} else {
 				mrows.reserve(mrows.size() + _channel->mgInfo->lastParticipants.size());
-				for (const auto user : _channel->mgInfo->lastParticipants) {
+				for (const auto &user : _channel->mgInfo->lastParticipants) {
 					if (user->isInaccessible()) continue;
 					if (!listAllSuggestions && filterNotPassedByName(user)) continue;
-					if (indexOfInFirstN(mrows, user, recentInlineBots) >= 0) continue;
-					mrows.push_back({ user });
+					if (markMentionCandidateIfExists(user)) continue;
+					pushMentionRow(user, MentionRow::Source::MentionCandidate);
 				}
 			}
 		}
@@ -584,7 +648,7 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 			bots.emplace(_user, &_user->botInfo->commands);
 		} else if (_channel && _channel->isMegagroup()) {
 			if (_channel->mgInfo->bots.empty()) {
-				if (!_channel->mgInfo->botStatus) {
+				if (_channel->mgInfo->botStatus == Data::BotStatus::Unknown) {
 					_channel->session().api().chatParticipants().requestBots(
 						_channel);
 				}
@@ -614,7 +678,7 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 				};
 			};
 			brows.reserve(cnt);
-			int32 botStatus = _chat ? _chat->botStatus : ((_channel && _channel->isMegagroup()) ? _channel->mgInfo->botStatus : -1);
+			const auto botStatus = _chat ? _chat->botStatus : ((_channel && _channel->isMegagroup()) ? _channel->mgInfo->botStatus : Data::BotStatus::NoBots);
 			if (_chat) {
 				for (const auto &user : _chat->lastAuthors) {
 					if (!user->isBot()) {
@@ -626,7 +690,7 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 					}
 					for (const auto &command : *i->second) {
 						if (!listAllSuggestions) {
-							auto toFilter = (hasUsername || botStatus == 0 || botStatus == 2)
+							auto toFilter = (hasUsername || botStatus != Data::BotStatus::NoBots)
 								? command.command + '@' + PrimaryUsername(user)
 								: command.command;
 							if (!toFilter.startsWith(_filter, Qt::CaseInsensitive)/* || toFilter.size() == _filter.size()*/) {
@@ -644,8 +708,7 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 					for (const auto &command : *i->second) {
 						if (!listAllSuggestions) {
 							const auto toFilter = (hasUsername
-									|| botStatus == 0
-									|| botStatus == 2)
+									|| botStatus != Data::BotStatus::NoBots)
 								? command.command + '@' + PrimaryUsername(user)
 								: command.command;
 							if (!toFilter.startsWith(_filter, Qt::CaseInsensitive)/* || toFilter.size() == _filter.size()*/) continue;
@@ -686,7 +749,6 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 		std::move(brows),
 		std::move(srows),
 		resetScroll);
-	_inner->setRecentInlineBotsInRows(recentInlineBots);
 }
 
 void FieldAutocomplete::rowsUpdated(
@@ -910,12 +972,12 @@ FieldAutocomplete::Inner::Inner(
 , _premiumMark(_session, st::stickersPremiumLock)
 , _previewTimer([=] { showPreview(); }) {
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	_show->adjustShadowLeft(
-	) | rpl::start_with_next([=](bool adjust) {
+	) | rpl::on_next([=](bool adjust) {
 		_adjustShadowLeft = adjust;
 		update();
 	}, lifetime());
@@ -1041,7 +1103,7 @@ void FieldAutocomplete::Inner::paintEvent(QPaintEvent *e) {
 			if (selected) {
 				p.fillRect(0, i * st::mentionHeight, width(), st::mentionHeight, st::mentionBgOver);
 				int skip = (st::mentionHeight - st::smallCloseIconOver.height()) / 2;
-				if (!_hrows->empty() || (!_mrows->empty() && i < _recentInlineBotsInRows)) {
+				if (!_hrows->empty() || isRemovableMentionRow(i)) {
 					st::smallCloseIconOver.paint(p, QPoint(width() - st::smallCloseIconOver.width() - skip, i * st::mentionHeight + skip), width());
 				}
 			}
@@ -1130,8 +1192,8 @@ void FieldAutocomplete::Inner::paintEvent(QPaintEvent *e) {
 				}
 
 				auto toHighlight = row.command;
-				int32 botStatus = _parent->chat() ? _parent->chat()->botStatus : ((_parent->channel() && _parent->channel()->isMegagroup()) ? _parent->channel()->mgInfo->botStatus : -1);
-				if (hasUsername || botStatus == 0 || botStatus == 2) {
+				const auto botStatus = _parent->chat() ? _parent->chat()->botStatus : ((_parent->channel() && _parent->channel()->isMegagroup()) ? _parent->channel()->mgInfo->botStatus : Data::BotStatus::NoBots);
+				if (hasUsername || botStatus != Data::BotStatus::NoBots) {
 					toHighlight += '@' + PrimaryUsername(user);
 				}
 				user->loadUserpic();
@@ -1299,10 +1361,9 @@ bool FieldAutocomplete::Inner::chooseAtIndex(
 				? _parent->chat()->botStatus
 				: ((_parent->channel() && _parent->channel()->isMegagroup())
 					? _parent->channel()->mgInfo->botStatus
-					: -1);
+					: Data::BotStatus::NoBots);
 
-			const auto insertUsername = (botStatus == 0
-				|| botStatus == 2
+			const auto insertUsername = (botStatus != Data::BotStatus::NoBots
 				|| _parent->filter().indexOf('@') > 0);
 			const auto commandString = QString("/%1%2").arg(
 				command,
@@ -1314,36 +1375,45 @@ bool FieldAutocomplete::Inner::chooseAtIndex(
 	return false;
 }
 
-void FieldAutocomplete::Inner::setRecentInlineBotsInRows(int32 bots) {
-	_recentInlineBotsInRows = bots;
+bool FieldAutocomplete::Inner::isRemovableMentionRow(int index) const {
+	return (index >= 0)
+		&& (index < _mrows->size())
+		&& _mrows->at(index).removable();
 }
 
 void FieldAutocomplete::Inner::mousePressEvent(QMouseEvent *e) {
 	selectByMouse(e->globalPos());
 	if (e->button() == Qt::LeftButton) {
-		if (_overDelete && _sel >= 0 && _sel < (_mrows->empty() ? _hrows->size() : _recentInlineBotsInRows)) {
-			bool removed = false;
+		if (_overDelete
+			&& (_mrows->empty()
+				? (_sel >= 0 && _sel < _hrows->size())
+				: isRemovableMentionRow(_sel))) {
+			auto writeRecent = false;
 			if (_mrows->empty()) {
 				QString toRemove = _hrows->at(_sel);
 				RecentHashtagPack &recent(cRefRecentWriteHashtags());
 				for (RecentHashtagPack::iterator i = recent.begin(); i != recent.cend();) {
 					if (i->first == toRemove) {
 						i = recent.erase(i);
-						removed = true;
+						writeRecent = true;
 					} else {
 						++i;
 					}
 				}
 			} else {
-				UserData *toRemove = _mrows->at(_sel).user;
-				RecentInlineBots &recent(cRefRecentInlineBots());
-				int32 index = recent.indexOf(toRemove);
-				if (index >= 0) {
-					recent.remove(index);
-					removed = true;
+				const auto &row = _mrows->at(_sel);
+				switch (row.source) {
+				case MentionRow::Source::InlineRecent:
+					_session->recentInlineBots().remove(row.user);
+					break;
+				case MentionRow::Source::GuestChatTopPeer:
+					_session->topGuestChatBots().remove(row.user);
+					break;
+				case MentionRow::Source::MentionCandidate:
+					break;
 				}
 			}
-			if (removed) {
+			if (writeRecent) {
 				_show->session().local().writeRecentHashtagsAndBots();
 			}
 			_parent->updateFiltered();
@@ -1488,7 +1558,7 @@ void FieldAutocomplete::Inner::setupLottie(StickerSuggestion &suggestion) {
 		getLottieRenderer());
 
 	suggestion.lottie->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		repaintSticker(document);
 	}, _stickersLifetime);
 }
@@ -1587,7 +1657,9 @@ void FieldAutocomplete::Inner::selectByMouse(QPoint globalPosition) {
 			: !_hrows->empty()
 			? _hrows->size()
 			: _brows->size();
-		_overDelete = (!_hrows->empty() || (!_mrows->empty() && sel < _recentInlineBotsInRows)) ? (mouse.x() >= width() - st::mentionHeight) : false;
+		_overDelete = (!_hrows->empty() || isRemovableMentionRow(sel))
+			? (mouse.x() >= width() - st::mentionHeight)
+			: false;
 	}
 	if (sel < 0 || sel >= maxSel) {
 		sel = -1;
@@ -1662,12 +1734,13 @@ void InitFieldAutocomplete(
 	const auto field = descriptor.field;
 
 	field->rawTextEdit()->installEventFilter(raw);
-	field->customTab(true);
 
 	raw->mentionChosen(
-	) | rpl::start_with_next([=](FieldAutocomplete::MentionChosen data) {
+	) | rpl::on_next([=](FieldAutocomplete::MentionChosen data) {
 		const auto user = data.user;
-		if (data.mention.isEmpty()) {
+		const auto ctrlClick = base::IsCtrlPressed()
+			&& data.method == FieldAutocomplete::ChooseMethod::ByClick;
+		if (data.mention.isEmpty() || ctrlClick) {
 			field->insertTag(
 				user->firstName.isEmpty() ? user->name() : user->firstName,
 				PrepareMentionTag(user));
@@ -1680,7 +1753,7 @@ void InitFieldAutocomplete(
 	const auto setText = descriptor.setText;
 
 	raw->hashtagChosen(
-	) | rpl::start_with_next([=](FieldAutocomplete::HashtagChosen data) {
+	) | rpl::on_next([=](FieldAutocomplete::HashtagChosen data) {
 		field->insertTag(data.hashtag);
 	}, raw->lifetime());
 
@@ -1691,7 +1764,7 @@ void InitFieldAutocomplete(
 		? &peer->owner().shortcutMessages()
 		: nullptr;
 	raw->botCommandChosen(
-	) | rpl::start_with_next([=](FieldAutocomplete::BotCommandChosen data) {
+	) | rpl::on_next([=](FieldAutocomplete::BotCommandChosen data) {
 		if (!features().autocompleteCommands) {
 			return;
 		}
@@ -1715,7 +1788,7 @@ void InitFieldAutocomplete(
 
 	if (const auto stickerChoosing = descriptor.stickerChoosing) {
 		raw->choosingProcesses(
-		) | rpl::start_with_next([=](FieldAutocomplete::Type type) {
+		) | rpl::on_next([=](FieldAutocomplete::Type type) {
 			if (type == FieldAutocomplete::Type::Stickers) {
 				stickerChoosing();
 			}
@@ -1723,13 +1796,14 @@ void InitFieldAutocomplete(
 	}
 	if (const auto chosen = descriptor.stickerChosen) {
 		raw->stickerChosen(
-		) | rpl::start_with_next(chosen, raw->lifetime());
+		) | rpl::on_next(chosen, raw->lifetime());
 	}
 
 	field->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=](not_null<bool*> handled) {
 		if (!raw->isHidden()) {
 			raw->chooseSelected(FieldAutocomplete::ChooseMethod::ByTab);
+			*handled = true;
 		}
 	}, raw->lifetime());
 
@@ -1741,15 +1815,19 @@ void InitFieldAutocomplete(
 			&& cRecentSearchHashtags().isEmpty()) {
 			peer->session().local().readRecentHashtagsAndBots();
 		} else if (parsed.query[0] == '@'
-			&& cRecentInlineBots().isEmpty()) {
+			&& peer->session().recentInlineBots().list().empty()) {
 			peer->session().local().readRecentHashtagsAndBots();
 		} else if (parsed.query[0] == '/'
 			&& peer->isUser()
 			&& !peer->asUser()->isBot()
 			&& (!shortcutMessages
-				|| shortcutMessages->shortcuts().list.empty())) {
+				|| shortcutMessages->shortcuts().list.empty()
+				|| peer->starsPerMessageChecked() != 0)) {
 			parsed = {};
 		}
+		if (!parsed.query.isEmpty() && parsed.query[0] == '@') {
+			peer->session().topGuestChatBots().reload();
+		}
 		raw->showFiltered(peer, parsed.query, parsed.fromStart);
 	};
 
@@ -1771,15 +1849,15 @@ void InitFieldAutocomplete(
 	};
 
 	raw->refreshRequests(
-	) | rpl::start_with_next(check, raw->lifetime());
+	) | rpl::on_next(check, raw->lifetime());
 
 	raw->stickersUpdateRequests(
-	) | rpl::start_with_next(updateStickersByEmoji, raw->lifetime());
+	) | rpl::on_next(updateStickersByEmoji, raw->lifetime());
 
 	peer->owner().botCommandsChanges(
 	) | rpl::filter([=](not_null<PeerData*> changed) {
 		return (peer == changed);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (raw->clearFilteredBotCommands()) {
 			check();
 		}
@@ -1787,7 +1865,7 @@ void InitFieldAutocomplete(
 
 	peer->owner().stickers().updated(
 		Data::StickersType::Stickers
-	) | rpl::start_with_next(updateStickersByEmoji, raw->lifetime());
+	) | rpl::on_next(updateStickersByEmoji, raw->lifetime());
 
 	QObject::connect(
 		field->rawTextEdit(),
@@ -1796,7 +1874,7 @@ void InitFieldAutocomplete(
 		check,
 		Qt::QueuedConnection);
 
-	field->changes() | rpl::start_with_next(
+	field->changes() | rpl::on_next(
 		updateStickersByEmoji,
 		raw->lifetime());
 
@@ -1804,11 +1882,11 @@ void InitFieldAutocomplete(
 		Data::PeerUpdate::Flag::Rights
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer == peer);
-	}) | rpl::start_with_next(updateStickersByEmoji, raw->lifetime());
+	}) | rpl::on_next(updateStickersByEmoji, raw->lifetime());
 
 	if (shortcutMessages) {
 		shortcutMessages->shortcutsChanged(
-		) | rpl::start_with_next(check, raw->lifetime());
+		) | rpl::on_next(check, raw->lifetime());
 	}
 
 	raw->setSendMenuDetails(std::move(descriptor.sendMenuDetails));
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index 72865ea018acb0..d6226854c60487 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -31,7 +31,6 @@ For license and copyright information please follow this link:
 #include "ui/effects/ripple_animation.h"
 #include "ui/image/image.h"
 #include "ui/painter.h"
-#include "boxes/send_gif_with_caption_box.h"
 #include "boxes/stickers_box.h"
 #include "inline_bots/inline_bot_result.h"
 #include "storage/localstorage.h"
@@ -126,24 +125,24 @@ GifsListWidget::GifsListWidget(
 		[=] { sendInlineRequest(); });
 
 	session().data().stickers().savedGifsUpdated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshSavedGifs();
 	}, lifetime());
 
 	session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateInlineItems();
 	}, lifetime());
 
 	_show->pauseChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!paused()) {
 			updateInlineItems();
 		}
 	}, lifetime());
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		_mosaic.setFullWidth(s.width());
 	}, lifetime());
 
@@ -181,13 +180,13 @@ object_ptr<TabbedSelector::InnerFooter> GifsListWidget::createFooter() {
 
 	GifSectionsValue(
 		&session()
-	) | rpl::start_with_next([=](std::vector<GifSection> &&list) {
+	) | rpl::on_next([=](std::vector<GifSection> &&list) {
 		_sections = std::move(list);
 		refreshIcons();
 	}, _footer->lifetime());
 
 	_footer->setChosen(
-	) | rpl::start_with_next([=](uint64 setId) {
+	) | rpl::on_next([=](uint64 setId) {
 		if (_search) {
 			_search->cancel();
 		}
@@ -414,21 +413,12 @@ base::unique_qptr<Ui::PopupMenu> GifsListWidget::fillContextMenu(
 		icons);
 
 	if (!isInlineResult && _inlineQueryPeer) {
-		auto done = crl::guard(this, [=](
-				Api::SendOptions options,
-				TextWithTags text) {
-			selectInlineResult(selected, options, true, std::move(text));
-		});
-		const auto show = _show;
-		const auto peer = _inlineQueryPeer;
-		menu->addAction(tr::lng_send_gif_with_caption(tr::now), [=] {
-			show->show(Box(
-				Ui::SendGifWithCaptionBox,
-				item->getDocument(),
-				peer,
-				copyDetails,
-				std::move(done)));
-		}, &st::menuIconEdit);
+		menu->addAction(
+			tr::lng_send_gif_with_caption(tr::now),
+			crl::guard(this, [=] {
+				selectInlineResult(selected, {}, true, true);
+			}),
+			&st::menuIconEdit);
 	}
 
 	if (const auto item = _mosaic.maybeItemAt(_selected)) {
@@ -489,7 +479,7 @@ void GifsListWidget::selectInlineResult(
 		int index,
 		Api::SendOptions options,
 		bool forceSend,
-		TextWithTags caption) {
+		bool needsCaption) {
 	const auto item = _mosaic.maybeItemAt(index);
 	if (!item) {
 		return;
@@ -518,7 +508,8 @@ void GifsListWidget::selectInlineResult(
 			|| (media && media->image(PhotoSize::Large))) {
 			_photoChosen.fire({
 				.photo = photo,
-				.options = options });
+				.options = options
+			});
 		} else if (!photo->loading(PhotoSize::Thumbnail)) {
 			photo->load(PhotoSize::Thumbnail, Data::FileOrigin());
 		}
@@ -530,7 +521,7 @@ void GifsListWidget::selectInlineResult(
 				.document = document,
 				.options = options,
 				.messageSendingFrom = messageSendingFrom(),
-				.caption = std::move(caption),
+				.needsCaption = needsCaption,
 			});
 		} else if (!preview.usingThumbnail()) {
 			if (preview.loading()) {
@@ -666,14 +657,15 @@ GifsListWidget::LayoutItem *GifsListWidget::layoutPrepareSavedGif(
 }
 
 GifsListWidget::LayoutItem *GifsListWidget::layoutPrepareInlineResult(
-		not_null<InlineResult*> result) {
-	auto it = _inlineLayouts.find(result);
+		std::shared_ptr<InlineResult> result) {
+	const auto raw = result.get();
+	auto it = _inlineLayouts.find(raw);
 	if (it == _inlineLayouts.cend()) {
 		if (auto layout = LayoutItem::createLayout(
 				this,
-				result,
+				std::move(result),
 				_inlineWithThumb)) {
-			it = _inlineLayouts.emplace(result, std::move(layout)).first;
+			it = _inlineLayouts.emplace(raw, std::move(layout)).first;
 			it->second->initDimensions();
 		} else {
 			return nullptr;
@@ -746,8 +738,8 @@ int GifsListWidget::refreshInlineRows(const InlineCacheEntry *entry, bool result
 			from,
 			count
 		) | ranges::views::transform([&](
-				const std::unique_ptr<InlineBots::Result> &r) {
-			return layoutPrepareInlineResult(r.get());
+				const std::shared_ptr<InlineBots::Result> &r) {
+			return layoutPrepareInlineResult(r);
 		}) | ranges::views::filter([](const LayoutItem *item) {
 			return item != nullptr;
 		}) | ranges::to<std::vector<not_null<LayoutItem*>>>;
@@ -770,7 +762,7 @@ int GifsListWidget::validateExistingInlineRows(const InlineResults &results) {
 	const auto until = _mosaic.validateExistingRows([&](
 			not_null<const LayoutItem*> item,
 			int untilIndex) {
-		return item->getResult() != results[untilIndex].get();
+		return item->getResult().get() != results[untilIndex].get();
 	}, results.size());
 
 	if (_mosaic.empty()) {
@@ -899,7 +891,9 @@ void GifsListWidget::searchForGifs(const QString &query) {
 	if (!_searchBot && !_searchBotRequestId) {
 		const auto username = session().serverConfig().gifSearchUsername;
 		_searchBotRequestId = _api.request(MTPcontacts_ResolveUsername(
-			MTP_string(username)
+			MTP_flags(0),
+			MTP_string(username),
+			MTP_string()
 		)).done([=](const MTPcontacts_ResolvedPeer &result) {
 			auto &data = result.data();
 			session().data().processUsers(data.vusers());
@@ -948,8 +942,8 @@ void GifsListWidget::sendInlineRequest() {
 	_search->setLoading(true);
 	_inlineRequestId = _api.request(MTPmessages_GetInlineBotResults(
 		MTP_flags(0),
-		_searchBot->inputUser,
-		_inlineQueryPeer->input,
+		_searchBot->inputUser(),
+		_inlineQueryPeer->input(),
 		MTPInputGeoPoint(),
 		MTP_string(_inlineQuery),
 		MTP_string(nextOffset)
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
index 249ba5d0cd9e24..52fcae98ae4fe4 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
@@ -131,7 +131,7 @@ class GifsListWidget final
 	};
 
 	using InlineResult = InlineBots::Result;
-	using InlineResults = std::vector<std::unique_ptr<InlineResult>>;
+	using InlineResults = std::vector<std::shared_ptr<InlineResult>>;
 	using LayoutItem = InlineBots::Layout::ItemBase;
 
 	struct InlineCacheEntry {
@@ -162,7 +162,8 @@ class GifsListWidget final
 
 	void clearInlineRows(bool resultsDeleted);
 	LayoutItem *layoutPrepareSavedGif(not_null<DocumentData*> document);
-	LayoutItem *layoutPrepareInlineResult(not_null<InlineResult*> result);
+	LayoutItem *layoutPrepareInlineResult(
+		std::shared_ptr<InlineResult> result);
 
 	void deleteUnusedGifLayouts();
 
@@ -173,7 +174,7 @@ class GifsListWidget final
 		int index,
 		Api::SendOptions options,
 		bool forceSend = false,
-		TextWithTags caption = {});
+		bool needsCaption = false);
 
 	const std::shared_ptr<Show> _show;
 	std::unique_ptr<Ui::TabbedSearch> _search;
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 9cc3a925aab975..2913630f8820bf 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -11,37 +11,50 @@ For license and copyright information please follow this link:
 #include "history/history.h" // History::session
 #include "history/history_item.h" // HistoryItem::originalText
 #include "history/history_item_helpers.h" // DropDisallowedCustomEmoji
+#include "base/unixtime.h"
 #include "base/qthelp_regex.h"
 #include "base/qthelp_url.h"
 #include "base/event_filter.h"
 #include "ui/chat/chat_style.h"
 #include "ui/layers/generic_box.h"
+#include "ui/boxes/calendar_box.h"
+#include "ui/boxes/choose_date_time.h"
+#include "ui/basic_click_handlers.h"
 #include "ui/rect.h"
 #include "core/shortcuts.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "core/ui_integration.h"
+#include "lottie/lottie_icon.h"
+#include "info/profile/info_profile_icon.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
 #include "ui/power_saving.h"
+#include "ui/vertical_list.h"
 #include "ui/ui_utility.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_document.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
+#include "history/view/controls/compose_controls_common.h"
 #include "window/window_session_controller.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
 #include "main/main_session.h"
-#include "settings/settings_premium.h"
+#include "settings/settings_common.h"
+#include "settings/sections/settings_premium.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_settings.h"
 #include "base/qt/qt_common_adapters.h"
 
@@ -123,9 +136,9 @@ constexpr auto kLinkProtocols = {
 void EditLinkBox(
 		not_null<Ui::GenericBox*> box,
 		std::shared_ptr<Main::SessionShow> show,
-		const QString &startText,
+		const TextWithTags &startText,
 		const QString &startLink,
-		Fn<void(QString, QString)> callback,
+		Fn<void(TextWithTags, QString)> callback,
 		const style::InputField *fieldStyle,
 		Fn<QString(QString)> validate) {
 	Expects(callback != nullptr);
@@ -137,12 +150,14 @@ void EditLinkBox(
 		object_ptr<Ui::InputField>(
 			content,
 			fieldSt,
+			Ui::InputField::Mode::SingleLine,
 			tr::lng_formatting_link_text(),
 			startText),
 		st::markdownLinkFieldPadding);
 	text->setInstantReplaces(Ui::InstantReplaces::Default());
 	text->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+		Core::App().settings().replaceEmojiValue(),
+		Core::App().settings().systemTextReplaceValue());
 	Ui::Emoji::SuggestionsController::Init(
 		box->getDelegate()->outerContainer(),
 		text,
@@ -171,26 +186,26 @@ void EditLinkBox(
 			tr::lng_formatting_link_url(),
 			link));
 	url->heightValue(
-	) | rpl::start_with_next([placeholder](int height) {
+	) | rpl::on_next([placeholder](int height) {
 		placeholder->resize(placeholder->width(), height);
 	}, placeholder->lifetime());
 	placeholder->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		url->resize(width, url->height());
 	}, placeholder->lifetime());
 	url->move(placeholder->pos());
 
 	const auto submit = [=] {
-		const auto linkText = text->getLastText();
+		const auto linkText = text->getTextWithTags();
 		const auto linkUrl = validate(url->getLastText());
-		if (linkText.isEmpty()) {
+		if (linkText.text.isEmpty()) {
 			text->showError();
 			return;
 		} else if (linkUrl.isEmpty()) {
 			url->showError();
 			return;
 		}
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		callback(linkText, linkUrl);
 		if (weak) {
 			box->closeBox();
@@ -198,11 +213,11 @@ void EditLinkBox(
 	};
 
 	text->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		url->setFocusFast();
 	}, text->lifetime());
 	url->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (text->getLastText().isEmpty()) {
 			text->setFocusFast();
 		} else {
@@ -222,7 +237,7 @@ void EditLinkBox(
 	box->setWidth(st::boxWidth);
 
 	box->setFocusCallback([=] {
-		if (startText.isEmpty()) {
+		if (startText.text.isEmpty()) {
 			text->setFocusFast();
 		} else {
 			if (!url->empty()) {
@@ -232,9 +247,6 @@ void EditLinkBox(
 		}
 	});
 
-	url->customTab(true);
-	text->customTab(true);
-
 	const auto clearFullSelection = [=](not_null<Ui::InputField*> input) {
 		if (input->empty()) {
 			return;
@@ -250,17 +262,20 @@ void EditLinkBox(
 	};
 
 	url->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=](not_null<bool*> handled) {
 		clearFullSelection(url);
 		text->setFocus();
+		*handled = true;
 	}, url->lifetime());
+
 	text->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=](not_null<bool*> handled) {
 		if (!url->empty()) {
 			url->selectAll();
 		}
 		clearFullSelection(text);
 		url->setFocus();
+		*handled = true;
 	}, text->lifetime());
 }
 
@@ -292,9 +307,9 @@ void EditCodeLanguageBox(
 		const auto name = field->getLastText().trimmed();
 		const auto check = QRegularExpression("^[a-zA-Z0-9\\+\\-]*$");
 		if (check.match(name).hasMatch()) {
-			auto weak = Ui::MakeWeak(box);
+			auto weak = base::make_weak(box);
 			save(name);
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		} else {
@@ -302,7 +317,7 @@ void EditCodeLanguageBox(
 		}
 	};
 	field->submits(
-	) | rpl::start_with_next(callback, field->lifetime());
+	) | rpl::on_next(callback, field->lifetime());
 	box->addButton(tr::lng_settings_save(), callback);
 	box->addButton(tr::lng_cancel(), [=] {
 		box->closeBox();
@@ -383,27 +398,92 @@ bool EditTextChanged(
 
 Fn<bool(
 	Ui::InputField::EditLinkSelection selection,
-	QString text,
+	TextWithTags text,
 	QString link,
 	EditLinkAction action)> DefaultEditLinkCallback(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<Ui::InputField*> field,
-		const style::InputField *fieldStyle) {
-	const auto weak = Ui::MakeWeak(field);
+		const style::InputField *fieldStyle,
+		Fn<QString(QString)> linkValidator) {
+	const auto weak = base::make_weak(field);
 	return [=](
 			EditLinkSelection selection,
-			QString text,
+			TextWithTags text,
 			QString link,
 			EditLinkAction action) {
 		if (action == EditLinkAction::Check) {
-			return Ui::InputField::IsValidMarkdownLink(link)
-				&& !TextUtilities::IsMentionLink(link);
+			return (Ui::InputField::IsValidMarkdownLink(link)
+					&& !TextUtilities::IsMentionLink(link))
+				|| Ui::InputField::IsCustomDateLink(link)
+				|| (linkValidator && !linkValidator(link).isEmpty());
+		}
+		if (Ui::InputField::IsCustomDateLink(link)) {
+			const auto dateStr = link.mid(
+				Ui::InputField::kCustomDateTagStart.size());
+			const auto existingDate = dateStr.toInt();
+			auto callback = [=](
+					const TextWithTags &t,
+					const QString &l) {
+				if (const auto strong = weak.get()) {
+					strong->commitMarkdownLinkEdit(selection, t, l);
+				}
+			};
+			const auto savedCallback = std::make_shared<
+				Fn<void(const TextWithTags &, const QString &)>>(
+					std::move(callback));
+			const auto savedText = std::make_shared<TextWithTags>(text);
+			const auto showDateTimeBox = [=](TimeId time) {
+				const auto dateBox = std::make_shared<
+					base::weak_qptr<Ui::GenericBox>>();
+				*dateBox = show->show(Box(
+					Ui::ChooseDateTimeBox,
+					Ui::ChooseDateTimeBoxArgs{
+						.title = tr::lng_formatting_date_title(),
+						.submit = tr::lng_settings_save(),
+						.done = [=](TimeId result) {
+							const auto dateLink
+								= Ui::InputField::kCustomDateTagStart
+								+ QString::number(result);
+							(*savedCallback)(
+								*savedText,
+								dateLink);
+							if (const auto box = dateBox->get()) {
+								box->closeBox();
+							}
+						},
+						.min = [] { return TimeId(1); },
+						.time = time,
+						.max = [] { return TimeId(2114380800); },
+					}));
+			};
+			if (existingDate > 0) {
+				showDateTimeBox(existingDate);
+			} else {
+				show->show(Box<Ui::CalendarBox>(Ui::CalendarBoxArgs{
+					.month = QDate::currentDate(),
+					.highlighted = QDate::currentDate(),
+					.callback = [=](QDate chosen, Fn<void()> close) {
+						close();
+						const auto midday = QDateTime(
+							chosen,
+							QTime(12, 0));
+						showDateTimeBox(
+							base::unixtime::serialize(midday));
+					},
+					.minDate = QDate(1970, 1, 1),
+					.maxDate = QDate(2036, 12, 31),
+				}));
+			}
+			return true;
 		}
-		auto callback = [=](const QString &text, const QString &link) {
-			if (const auto strong = weak.data()) {
+		auto callback = [=](const TextWithTags &text, const QString &link) {
+			if (const auto strong = weak.get()) {
 				strong->commitMarkdownLinkEdit(selection, text, link);
 			}
 		};
+		const auto validateLink = linkValidator
+			? linkValidator
+			: Fn<QString(QString)>(qthelp::validate_url);
 		show->showBox(Box(
 			EditLinkBox,
 			show,
@@ -411,7 +491,7 @@ Fn<bool(
 			link,
 			std::move(callback),
 			fieldStyle,
-			qthelp::validate_url));
+			validateLink));
 		return true;
 	};
 }
@@ -423,7 +503,8 @@ Fn<void(QString now, Fn<void(QString)> save)> DefaultEditLanguageCallback(
 	};
 }
 
-void InitMessageFieldHandlers(MessageFieldHandlersArgs &&args) {
+auto InitMessageFieldHandlers(MessageFieldHandlersArgs &&args)
+-> std::shared_ptr<Ui::ChatStyle> {
 	const auto paused = [passed = args.customEmojiPaused] {
 		return passed && passed();
 	};
@@ -431,29 +512,31 @@ void InitMessageFieldHandlers(MessageFieldHandlersArgs &&args) {
 	const auto session = args.session;
 	field->setTagMimeProcessor(
 		FieldTagMimeProcessor(session, args.allowPremiumEmoji));
-	field->setCustomTextContext([=](Fn<void()> repaint) {
-		return std::any(Core::MarkedTextContext{
-			.session = session,
-			.customEmojiRepaint = std::move(repaint),
-		});
-	}, [paused] {
+	field->setCustomTextContext(Core::TextContext({
+		.session = session
+	}), [paused] {
 		return On(PowerSaving::kEmojiChat) || paused();
 	}, [paused] {
 		return On(PowerSaving::kChatSpoiler) || paused();
 	});
 	field->setInstantReplaces(Ui::InstantReplaces::Default());
 	field->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+		Core::App().settings().replaceEmojiValue(),
+		Core::App().settings().systemTextReplaceValue());
 	field->setMarkdownReplacesEnabled(rpl::single(Ui::MarkdownEnabledState{
 		Ui::MarkdownEnabled{ std::move(args.allowMarkdownTags) }
 	}));
 	if (const auto &show = args.show) {
 		field->setEditLinkCallback(
-			DefaultEditLinkCallback(show, field, args.fieldStyle));
+			DefaultEditLinkCallback(
+				show,
+				field,
+				args.fieldStyle,
+				args.linkValidator));
 		field->setEditLanguageCallback(DefaultEditLanguageCallback(show));
 		InitSpellchecker(show, field, args.fieldStyle != nullptr);
 	}
-	const auto style = field->lifetime().make_state<Ui::ChatStyle>(
+	const auto style = std::make_shared<Ui::ChatStyle>(
 		session->colorIndicesValue());
 	field->setPreCache([=] {
 		return style->messageStyle(false, false).preCache.get();
@@ -462,6 +545,7 @@ void InitMessageFieldHandlers(MessageFieldHandlersArgs &&args) {
 		const auto colorIndex = session->user()->colorIndex();
 		return style->coloredQuoteCache(false, colorIndex).get();
 	});
+	return style;
 }
 
 [[nodiscard]] bool IsGoodFactcheckUrl(QStringView url) {
@@ -470,15 +554,15 @@ void InitMessageFieldHandlers(MessageFieldHandlersArgs &&args) {
 
 [[nodiscard]] Fn<bool(
 	Ui::InputField::EditLinkSelection selection,
-	QString text,
+	TextWithTags text,
 	QString link,
 	EditLinkAction action)> FactcheckEditLinkCallback(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<Ui::InputField*> field) {
-	const auto weak = Ui::MakeWeak(field);
+	const auto weak = base::make_weak(field);
 	return [=](
 			EditLinkSelection selection,
-			QString text,
+			TextWithTags text,
 			QString link,
 			EditLinkAction action) {
 		const auto validate = [=](QString url) {
@@ -487,14 +571,14 @@ void InitMessageFieldHandlers(MessageFieldHandlersArgs &&args) {
 				return url.startsWith(start) ? url : (start + url);
 			}
 			show->showToast(
-				tr::lng_factcheck_links(tr::now, Ui::Text::RichLangValue));
+				tr::lng_factcheck_links(tr::now, tr::rich));
 			return QString();
 		};
 		if (action == EditLinkAction::Check) {
 			return IsGoodFactcheckUrl(link);
 		}
-		auto callback = [=](const QString &text, const QString &link) {
-			if (const auto strong = weak.data()) {
+		auto callback = [=](const TextWithTags &text, const QString &link) {
+			if (const auto strong = weak.get()) {
 				strong->commitMarkdownLinkEdit(selection, text, link);
 			}
 		};
@@ -533,7 +617,8 @@ Fn<void(not_null<Ui::InputField*>)> FactcheckFieldIniter(
 		});
 		field->setInstantReplaces(Ui::InstantReplaces::Default());
 		field->setInstantReplacesEnabled(
-			Core::App().settings().replaceEmojiValue());
+			Core::App().settings().replaceEmojiValue(),
+			Core::App().settings().systemTextReplaceValue());
 		field->setMarkdownReplacesEnabled(rpl::single(
 			Ui::MarkdownEnabledState{
 				Ui::MarkdownEnabled{
@@ -567,15 +652,16 @@ void InitMessageFieldGeometry(not_null<Ui::InputField*> field) {
 		st::historySendSize.height() - 2 * st::historySendPadding);
 	field->setMaxHeight(st::historyComposeFieldMaxHeight);
 
+	// st::messageSendingAnimationTextFromOffset.
 	field->setDocumentMargin(4.);
 	field->setAdditionalMargin(style::ConvertScale(4) - 4);
 }
 
-void InitMessageField(
+std::shared_ptr<Ui::ChatStyle> InitMessageField(
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<Ui::InputField*> field,
 		Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji) {
-	InitMessageFieldHandlers({
+	const auto style = InitMessageFieldHandlers({
 		.session = &show->session(),
 		.show = show,
 		.field = field,
@@ -585,9 +671,10 @@ void InitMessageField(
 		.allowPremiumEmoji = std::move(allowPremiumEmoji),
 	});
 	InitMessageFieldGeometry(field);
+	return style;
 }
 
-void InitMessageField(
+std::shared_ptr<Ui::ChatStyle> InitMessageField(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::InputField*> field,
 		Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji) {
@@ -610,11 +697,12 @@ void InitSpellchecker(
 			tr::lng_settings_manage_dictionaries(tr::now),
 			[=] { show->showBox(Box<Ui::ManageDictionariesBox>(session)); }
 		});
-	const auto s = Ui::CreateChild<SpellingHighlighter>(
+	// The highlighter parents itself to the field's document and registers a
+	// context-menu hook on the field, so it keeps working without holding it.
+	Ui::CreateChild<SpellingHighlighter>(
 		field.get(),
 		Core::App().settings().spellcheckerEnabledValue(),
 		menuItem);
-	field->setExtendedContextMenu(s->contextMenuCreated());
 #endif // TDESKTOP_DISABLE_SPELLCHECK
 }
 
@@ -676,20 +764,20 @@ void InitMessageFieldFade(
 	};
 	generateFade();
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		generateFade();
 	}, topFade->lifetime());
 
 	field->sizeValue(
-	) | rpl::start_with_next_done([=](const QSize &size) {
+	) | rpl::on_next_done([=](const QSize &size) {
 		topFade->resizeToWidth(size.width());
 		bottomFade->resizeToWidth(size.width());
 		bottomFade->move(
 			0,
 			size.height() - st::historyComposeFieldFadeHeight);
-	}, [t = Ui::MakeWeak(topFade), b = Ui::MakeWeak(bottomFade)] {
-		Ui::DestroyChild(t.data());
-		Ui::DestroyChild(b.data());
+	}, [t = base::make_weak(topFade), b = base::make_weak(bottomFade)] {
+		Ui::DestroyChild(t.get());
+		Ui::DestroyChild(b.get());
 	}, topFade->lifetime());
 
 	const auto descent = field->st().style.font->descent;
@@ -697,7 +785,7 @@ void InitMessageFieldFade(
 		field->changes(),
 		field->scrollTop().changes() | rpl::to_empty,
 		field->sizeValue() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		// InputField::changes fires before the auto-resize is being applied,
 		// so for the scroll values to be accurate we enqueue the check.
 		InvokeQueued(field, [=] {
@@ -756,7 +844,7 @@ InlineBotQuery ParseInlineBotQuery(
 				result.username = username.toString();
 				if (const auto peer = session->data().peerByUsername(result.username)) {
 					if (const auto user = peer->asUser()) {
-						result.bot = peer->asUser();
+						result.bot = user;
 					} else {
 						result.bot = nullptr;
 					}
@@ -825,10 +913,10 @@ AutocompleteQuery ParseMentionHashtagBotCommandQuery(
 				if (!features.autocompleteMentions) {
 					return {};
 				}
-				if ((position - fragmentPosition - i < 1 || text[i].isLetter()) && (i < 2 || !(text[i - 2].isLetterOrNumber() || text[i - 2] == '_'))) {
+				if ((position - fragmentPosition - i < 1 || text[i].isLetterOrNumber()) && (i < 2 || !(text[i - 2].isLetterOrNumber() || text[i - 2] == '_'))) {
 					result.fromStart = (i == 1) && (fragmentPosition == 0);
 					result.query = text.mid(i - 1, position - fragmentPosition - i + 1);
-				} else if ((position - fragmentPosition - i < 1 || text[i].isLetter()) && i > 2 && (text[i - 2].isLetterOrNumber() || text[i - 2] == '_') && !mentionInCommand) {
+				} else if ((position - fragmentPosition - i < 1 || text[i].isLetterOrNumber()) && i > 2 && (text[i - 2].isLetterOrNumber() || text[i - 2] == '_') && !mentionInCommand) {
 					mentionInCommand = true;
 					--i;
 					continue;
@@ -869,7 +957,7 @@ MessageLinksParser::MessageLinksParser(not_null<Ui::InputField*> field)
 : _field(field)
 , _timer([=] { parse(); }) {
 	_lifetime = _field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto length = _field->getTextWithTags().text.size();
 		if (!length) {
 			_lastLength = 0;
@@ -1123,14 +1211,14 @@ base::unique_qptr<Ui::RpWidget> CreateDisabledFieldView(
 			+ customFontMarginTop, 0, 0);
 
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto available = width - margins.left() - margins.right();
 		const auto skip = st::historySendDisabledIconSkip;
 		label->resizeToWidth(available - skip);
 		label->moveToLeft(margins.left() + skip, margins.top(), width);
 	}, label->lifetime());
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		const auto &icon = st::historySendDisabledIcon;
 		icon.paint(
@@ -1188,21 +1276,21 @@ base::unique_qptr<Ui::RpWidget> CreateDisabledFieldView(
 	return result;
 }
 
-base::unique_qptr<Ui::RpWidget> TextErrorSendRestriction(
+std::unique_ptr<Ui::RpWidget> TextErrorSendRestriction(
 		QWidget *parent,
 		const QString &text) {
-	auto result = base::make_unique_q<Ui::RpWidget>(parent);
+	auto result = std::make_unique<Ui::RpWidget>(parent);
 	const auto raw = result.get();
 	const auto label = CreateChild<Ui::FlatLabel>(
 		result.get(),
 		text,
 		st::historySendPremiumRequired);
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(raw).fillRect(clip, st::windowBg);
 	}, raw->lifetime());
 	raw->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto &st = st::historyComposeField;
 		const auto width = size.width();
 		const auto margins = (st.textMargins + st.placeholderMargins);
@@ -1216,11 +1304,11 @@ base::unique_qptr<Ui::RpWidget> TextErrorSendRestriction(
 	return result;
 }
 
-base::unique_qptr<Ui::RpWidget> PremiumRequiredSendRestriction(
+std::unique_ptr<Ui::RpWidget> PremiumRequiredSendRestriction(
 		QWidget *parent,
 		not_null<UserData*> user,
 		not_null<Window::SessionController*> controller) {
-	auto result = base::make_unique_q<Ui::RpWidget>(parent);
+	auto result = std::make_unique<Ui::RpWidget>(parent);
 	const auto raw = result.get();
 	const auto label = CreateChild<Ui::FlatLabel>(
 		result.get(),
@@ -1233,11 +1321,11 @@ base::unique_qptr<Ui::RpWidget> PremiumRequiredSendRestriction(
 	const auto link = CreateChild<Ui::LinkButton>(
 		result.get(),
 		tr::lng_restricted_send_non_premium_more(tr::now));
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(raw).fillRect(clip, st::windowBg);
 	}, raw->lifetime());
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto &st = st::historyComposeField;
 		const auto margins = (st.textMargins + st.placeholderMargins);
 		const auto available = width - margins.left() - margins.right();
@@ -1255,6 +1343,102 @@ base::unique_qptr<Ui::RpWidget> PremiumRequiredSendRestriction(
 	return result;
 }
 
+std::unique_ptr<Ui::AbstractButton> BoostsToLiftWriteRestriction(
+		not_null<QWidget*> parent,
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer,
+		int boosts) {
+	auto result = std::make_unique<Ui::FlatButton>(
+		parent,
+		tr::lng_restricted_boost_group(tr::now),
+		st::historyComposeButton);
+	result->setClickedCallback([=] {
+		const auto window = show->resolveWindow();
+		window->resolveBoostState(peer->asChannel(), boosts);
+	});
+	return result;
+}
+
+std::unique_ptr<Ui::AbstractButton> FrozenWriteRestriction(
+		not_null<QWidget*> parent,
+		std::shared_ptr<ChatHelpers::Show> show,
+		FrozenWriteRestrictionType type,
+		FreezeInfoStyleOverride st) {
+	using namespace Ui;
+
+	auto result = std::make_unique<FlatButton>(
+		parent,
+		QString(),
+		st::historyComposeButton);
+	const auto raw = result.get();
+
+	const auto bar = (type == FrozenWriteRestrictionType::DialogsList);
+	const auto title = CreateChild<FlatLabel>(
+		raw,
+		(bar ? tr::lng_frozen_bar_title : tr::lng_frozen_restrict_title)(
+			tr::now),
+		bar ? st::frozenBarTitle : st::frozenRestrictionTitle);
+	title->setAttribute(Qt::WA_TransparentForMouseEvents);
+	title->show();
+	const auto subtitle = CreateChild<FlatLabel>(
+		raw,
+		(bar
+			? tr::lng_frozen_bar_text(
+				lt_arrow,
+				rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+				tr::marked)
+			: tr::lng_frozen_restrict_text(tr::marked)),
+		bar ? st::frozenBarSubtitle : st::frozenRestrictionSubtitle);
+	subtitle->setAttribute(Qt::WA_TransparentForMouseEvents);
+	subtitle->show();
+
+	const auto shadow = bar ? CreateChild<PlainShadow>(raw) : nullptr;
+	const auto icon = bar ? CreateChild<RpWidget>(raw) : nullptr;
+	if (icon) {
+		icon->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(icon);
+			st::menuIconDisableAttention.paintInCenter(p, icon->rect());
+		}, icon->lifetime());
+		icon->show();
+	}
+
+	raw->sizeValue() | rpl::on_next([=](QSize size) {
+		if (bar) {
+			const auto toggle = [&](auto &&widget, bool shown) {
+				if (widget->isHidden() == shown) {
+					widget->setVisible(shown);
+				}
+			};
+			const auto small = 2 * st::defaultDialogRow.photoSize;
+			const auto shown = (size.width() > small);
+			toggle(icon, !shown);
+			toggle(title, shown);
+			toggle(subtitle, shown);
+			icon->setGeometry(0, 0, size.width(), size.height());
+		}
+		const auto skip = bar
+			? st::defaultDialogRow.padding.left()
+			: 2 * st::normalFont->spacew;
+		const auto available = size.width() - skip * 2;
+		title->resizeToWidth(available);
+		subtitle->resizeToWidth(available);
+		const auto height = title->height() + subtitle->height();
+		const auto top = (size.height() - height) / 2;
+		title->moveToLeft(skip, top, size.width());
+		subtitle->moveToLeft(skip, top + title->height(), size.width());
+
+		const auto line = st::lineWidth;
+		if (shadow) {
+			shadow->setGeometry(0, size.height() - line, size.width(), line);
+		}
+	}, title->lifetime());
+
+	raw->setClickedCallback([=] {
+		show->show(Box(FrozenInfoBox, &show->session(), st));
+	});
+	return result;
+}
+
 void SelectTextInFieldWithMargins(
 		not_null<Ui::InputField*> field,
 		const TextSelection &selection) {
@@ -1279,3 +1463,141 @@ void SelectTextInFieldWithMargins(
 	textCursor.setPosition(selection.to, QTextCursor::KeepAnchor);
 	field->setTextCursor(textCursor);
 }
+
+TextWithEntities PaidSendButtonText(tr::now_t, int stars) {
+	return Ui::Text::IconEmoji(&st::starIconEmoji).append(
+		Lang::FormatCountToShort(stars).string);
+}
+
+rpl::producer<TextWithEntities> PaidSendButtonText(
+		rpl::producer<int> stars,
+		rpl::producer<QString> fallback) {
+	if (fallback) {
+		return rpl::combine(
+			std::move(fallback),
+			std::move(stars)
+		) | rpl::map([=](QString zero, int count) {
+			return count
+				? PaidSendButtonText(tr::now, count)
+				: TextWithEntities{ zero };
+		});
+	}
+	return std::move(stars) | rpl::map([=](int count) {
+		return PaidSendButtonText(tr::now, count);
+	});
+}
+
+void FrozenInfoBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session,
+		FreezeInfoStyleOverride st) {
+	box->setWidth(st::boxWideWidth);
+	box->setStyle(st::frozenInfoBox);
+	box->setNoContentMargin(true);
+	box->addTopButton(st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+
+	const auto info = session->frozen();
+	const auto content = box->verticalLayout();
+	auto icon = Settings::CreateLottieIcon(
+		content,
+		{
+			.name = u"media_forbidden"_q,
+			.sizeOverride = st::normalBoxLottieSize,
+		},
+		st::settingLocalPasscodeIconPadding);
+	content->add(std::move(icon.widget));
+	box->setShowFinishedCallback([animate = std::move(icon.animate)] {
+		animate(anim::repeat::once);
+	});
+
+	Ui::AddSkip(content);
+
+	const auto infoRow = [&](
+			rpl::producer<QString> title,
+			rpl::producer<TextWithEntities> text,
+			not_null<const style::icon*> icon) {
+		auto raw = content->add(
+			object_ptr<Ui::VerticalLayout>(content));
+		raw->add(
+			object_ptr<Ui::FlatLabel>(
+				raw,
+				std::move(title) | rpl::map(tr::bold),
+				st.infoTitle ? *st.infoTitle : st::defaultFlatLabel),
+			st::settingsPremiumRowTitlePadding);
+		raw->add(
+			object_ptr<Ui::FlatLabel>(
+				raw,
+				std::move(text),
+				st.infoAbout ? *st.infoAbout : st::upgradeGiftSubtext),
+			st::settingsPremiumRowAboutPadding);
+		object_ptr<Info::Profile::FloatingIcon>(
+			raw,
+			*icon,
+			st::starrefInfoIconPosition);
+	};
+
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_frozen_title(),
+			st.title ? *st.title : st::uniqueGiftTitle),
+		st::settingsPremiumRowTitlePadding,
+		style::al_top);
+
+	Ui::AddSkip(content, st::defaultVerticalListSkip * 3);
+
+	infoRow(
+		tr::lng_frozen_subtitle1(),
+		tr::lng_frozen_text1(tr::marked),
+		st.violationIcon ? st.violationIcon : &st::menuIconBlock);
+	infoRow(
+		tr::lng_frozen_subtitle2(),
+		tr::lng_frozen_text2(tr::marked),
+		st.readOnlyIcon ? st.readOnlyIcon : &st::menuIconLock);
+	infoRow(
+		tr::lng_frozen_subtitle3(),
+		tr::lng_frozen_text3(
+			lt_link,
+			rpl::single(tr::link(u"@SpamBot"_q, info.appealUrl)),
+			lt_date,
+			rpl::single(TextWithEntities{
+				langDayOfMonthFull(
+					base::unixtime::parse(info.until).date()),
+			}),
+			tr::marked),
+		st.appealIcon ? st.appealIcon : &st::menuIconHourglass);
+
+	const auto button = box->addButton(
+		tr::lng_frozen_appeal_button(),
+		[url = info.appealUrl] { UrlClickHandler::Open(url); });
+	const auto buttonPadding = st::frozenInfoBox.buttonPadding;
+	const auto buttonWidth = st::boxWideWidth
+		- buttonPadding.left()
+		- buttonPadding.right();
+	button->widthValue() | rpl::filter([=] {
+		return (button->widthNoMargins() != buttonWidth);
+	}) | rpl::on_next([=] {
+		button->resizeToWidth(buttonWidth);
+	}, button->lifetime());
+}
+
+Ui::InputField::MimeDataHook WrappedMessageFieldMimeHook(
+		Ui::InputField::MimeDataHook original,
+		not_null<Ui::InputField*> field) {
+	return [field, originalHook = std::move(original)](
+			not_null<const QMimeData*> data,
+			Ui::InputField::MimeAction action) {
+		if (data->hasFormat(u"application/x-telegram-input-field"_q)) {
+			if (action == Ui::InputField::MimeAction::Check) {
+				return true;
+			}
+			const auto text = QString::fromUtf8(
+				data->data(u"application/x-telegram-input-field"_q));
+			field->textCursor().insertText(text);
+			return true;
+		}
+		return originalHook ? originalHook(data, action) : false;
+	};
+}
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.h b/Telegram/SourceFiles/chat_helpers/message_field.h
index 0557a8951382d1..feb615692b0351 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.h
+++ b/Telegram/SourceFiles/chat_helpers/message_field.h
@@ -19,6 +19,15 @@ For license and copyright information please follow this link:
 
 #include <QtGui/QClipboard>
 
+namespace tr {
+struct now_t;
+} // namespace tr
+
+class DocumentData;
+class HistoryItem;
+class PeerData;
+class UserData;
+
 namespace Main {
 class Session;
 class SessionShow;
@@ -33,7 +42,13 @@ enum class PauseReason;
 class Show;
 } // namespace ChatHelpers
 
+namespace HistoryView::Controls {
+struct WriteRestriction;
+} // namespace HistoryView::Controls
+
 namespace Ui {
+class ChatStyle;
+class GenericBox;
 class PopupMenu;
 class Show;
 } // namespace Ui
@@ -46,12 +61,13 @@ class Show;
 
 Fn<bool(
 	Ui::InputField::EditLinkSelection selection,
-	QString text,
+	TextWithTags text,
 	QString link,
 	Ui::InputField::EditLinkAction action)> DefaultEditLinkCallback(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<Ui::InputField*> field,
-		const style::InputField *fieldStyle = nullptr);
+		const style::InputField *fieldStyle = nullptr,
+		Fn<QString(QString)> linkValidator = nullptr);
 Fn<void(QString now, Fn<void(QString)> save)> DefaultEditLanguageCallback(
 	std::shared_ptr<Ui::Show> show);
 
@@ -62,20 +78,22 @@ struct MessageFieldHandlersArgs {
 	Fn<bool()> customEmojiPaused;
 	Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji;
 	const style::InputField *fieldStyle = nullptr;
+	Fn<QString(QString)> linkValidator;
 	base::flat_set<QString> allowMarkdownTags;
 };
-void InitMessageFieldHandlers(MessageFieldHandlersArgs &&args);
+auto InitMessageFieldHandlers(MessageFieldHandlersArgs &&args)
+-> std::shared_ptr<Ui::ChatStyle>;
 
 void InitMessageFieldHandlers(
 	not_null<Window::SessionController*> controller,
 	not_null<Ui::InputField*> field,
 	ChatHelpers::PauseReason pauseReasonLevel,
 	Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji = nullptr);
-void InitMessageField(
+std::shared_ptr<Ui::ChatStyle> InitMessageField(
 	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<Ui::InputField*> field,
 	Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji);
-void InitMessageField(
+std::shared_ptr<Ui::ChatStyle> InitMessageField(
 	not_null<Window::SessionController*> controller,
 	not_null<Ui::InputField*> field,
 	Fn<bool(not_null<DocumentData*>)> allowPremiumEmoji);
@@ -158,14 +176,56 @@ class MessageLinksParser final : private QObject {
 [[nodiscard]] base::unique_qptr<Ui::RpWidget> CreateDisabledFieldView(
 	QWidget *parent,
 	not_null<PeerData*> peer);
-[[nodiscard]] base::unique_qptr<Ui::RpWidget> TextErrorSendRestriction(
+[[nodiscard]] std::unique_ptr<Ui::RpWidget> TextErrorSendRestriction(
 	QWidget *parent,
 	const QString &text);
-[[nodiscard]] base::unique_qptr<Ui::RpWidget> PremiumRequiredSendRestriction(
+[[nodiscard]] std::unique_ptr<Ui::RpWidget> PremiumRequiredSendRestriction(
 	QWidget *parent,
 	not_null<UserData*> user,
 	not_null<Window::SessionController*> controller);
+[[nodiscard]] auto BoostsToLiftWriteRestriction(
+	not_null<QWidget*> parent,
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<PeerData*> peer,
+	int boosts)
+-> std::unique_ptr<Ui::AbstractButton>;
+
+struct FreezeInfoStyleOverride {
+	const style::Box *box = nullptr;
+	const style::FlatLabel *title = nullptr;
+	const style::FlatLabel *subtitle = nullptr;
+	const style::icon *violationIcon = nullptr;
+	const style::icon *readOnlyIcon = nullptr;
+	const style::icon *appealIcon = nullptr;
+	const style::FlatLabel *infoTitle = nullptr;
+	const style::FlatLabel *infoAbout = nullptr;
+};
+[[nodiscard]] FreezeInfoStyleOverride DarkFreezeInfoStyle();
+
+enum class FrozenWriteRestrictionType {
+	MessageField,
+	DialogsList,
+};
+[[nodiscard]] std::unique_ptr<Ui::AbstractButton> FrozenWriteRestriction(
+	not_null<QWidget*> parent,
+	std::shared_ptr<ChatHelpers::Show> show,
+	FrozenWriteRestrictionType type,
+	FreezeInfoStyleOverride st = {});
 
 void SelectTextInFieldWithMargins(
 	not_null<Ui::InputField*> field,
 	const TextSelection &selection);
+
+[[nodiscard]] TextWithEntities PaidSendButtonText(tr::now_t, int stars);
+[[nodiscard]] rpl::producer<TextWithEntities> PaidSendButtonText(
+	rpl::producer<int> stars,
+	rpl::producer<QString> fallback = nullptr);
+
+void FrozenInfoBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Main::Session*> session,
+	FreezeInfoStyleOverride st);
+
+[[nodiscard]] Ui::InputField::MimeDataHook WrappedMessageFieldMimeHook(
+	Ui::InputField::MimeDataHook original,
+	not_null<Ui::InputField*> field);
diff --git a/Telegram/SourceFiles/chat_helpers/share_message_phrase_factory.cpp b/Telegram/SourceFiles/chat_helpers/share_message_phrase_factory.cpp
index 3d08fb958fb871..efa4dd1aac0163 100644
--- a/Telegram/SourceFiles/chat_helpers/share_message_phrase_factory.cpp
+++ b/Telegram/SourceFiles/chat_helpers/share_message_phrase_factory.cpp
@@ -7,9 +7,13 @@ For license and copyright information please follow this link:
 */
 #include "chat_helpers/share_message_phrase_factory.h"
 
+#include "chat_helpers/compose/compose_show.h"
 #include "data/data_peer.h"
+#include "data/data_user.h"
 #include "lang/lang_keys.h"
+#include "main/main_session.h"
 #include "ui/text/text_utilities.h"
+#include "window/window_session_controller.h"
 
 namespace ChatHelpers {
 
@@ -19,17 +23,23 @@ rpl::producer<TextWithEntities> ForwardedMessagePhrase(
 		Assert(args.to1);
 
 		if (args.to1->isSelf()) {
+			if (args.toSelfWithPremiumIsEmpty && args.to1->isPremium()) {
+				return {};
+			}
 			return (args.singleMessage
-				? tr::lng_share_message_to_saved_messages
-				: tr::lng_share_messages_to_saved_messages)(
-					Ui::Text::RichLangValue);
+				? tr::lng_share_message_to_saved
+				: tr::lng_share_messages_to_saved)(
+					lt_chat,
+					rpl::single(Ui::Text::Link(
+						tr::lng_saved_messages(tr::now))),
+					tr::rich);
 		} else {
 			return (args.singleMessage
 				? tr::lng_share_message_to_chat
 				: tr::lng_share_messages_to_chat)(
 					lt_chat,
 					rpl::single(TextWithEntities{ args.to1->name() }),
-					Ui::Text::RichLangValue);
+					tr::rich);
 		}
 	} else if ((args.toCount == 2) && (args.to1 && args.to2)) {
 		return (args.singleMessage
@@ -39,16 +49,25 @@ rpl::producer<TextWithEntities> ForwardedMessagePhrase(
 				rpl::single(TextWithEntities{ args.to1->name() }),
 				lt_chat,
 				rpl::single(TextWithEntities{ args.to2->name() }),
-				Ui::Text::RichLangValue);
+				tr::rich);
 	} else {
 		return (args.singleMessage
 			? tr::lng_share_message_to_many_chats
 			: tr::lng_share_messages_to_many_chats)(
 				lt_count,
 				rpl::single(args.toCount) | tr::to_count(),
-				Ui::Text::RichLangValue);
+				tr::rich);
 	}
 }
 
+Ui::Toast::ClickHandlerFilter ForwardedToSavedMessagesFilter(
+		not_null<Main::Session*> session) {
+	return [=](const ClickHandlerPtr &, Qt::MouseButton) {
+		if (const auto window = ResolveWindowDefault()(session)) {
+			window->showPeerHistory(window->session().user());
+		}
+		return false;
+	};
+}
 
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/share_message_phrase_factory.h b/Telegram/SourceFiles/chat_helpers/share_message_phrase_factory.h
index a97addadeedf1a..dcc499fd37a032 100644
--- a/Telegram/SourceFiles/chat_helpers/share_message_phrase_factory.h
+++ b/Telegram/SourceFiles/chat_helpers/share_message_phrase_factory.h
@@ -7,8 +7,14 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "ui/toast/toast.h"
+
 class PeerData;
 
+namespace Main {
+class Session;
+} // namespace Main
+
 namespace ChatHelpers {
 
 struct ForwardedMessagePhraseArgs final {
@@ -16,9 +22,13 @@ struct ForwardedMessagePhraseArgs final {
 	bool singleMessage = false;
 	PeerData *to1 = nullptr;
 	PeerData *to2 = nullptr;
+	bool toSelfWithPremiumIsEmpty = true;
 };
 
-rpl::producer<TextWithEntities> ForwardedMessagePhrase(
+[[nodiscard]] rpl::producer<TextWithEntities> ForwardedMessagePhrase(
 	const ForwardedMessagePhraseArgs &args);
 
+[[nodiscard]] Ui::Toast::ClickHandlerFilter ForwardedToSavedMessagesFilter(
+	not_null<Main::Session*> session);
+
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp b/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp
index 42b980f9365250..7d773dde38572f 100644
--- a/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp
+++ b/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #ifndef TDESKTOP_DISABLE_SPELLCHECK
 
 #include "base/platform/base_platform_info.h"
+#include "base/weak_ptr.h"
 #include "base/zlib_help.h"
 #include "data/data_session.h"
 #include "lang/lang_instance.h"
@@ -18,12 +19,17 @@ For license and copyright information please follow this link:
 #include "main/main_domain.h"
 #include "main/main_session.h"
 #include "mainwidget.h"
+#include "mtproto/dedicated_file_loader.h"
 #include "spellcheck/platform/platform_spellcheck.h"
 #include "spellcheck/spellcheck_utils.h"
 #include "spellcheck/spellcheck_value.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "core/version.h"
 
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QInputMethod>
 
@@ -59,53 +65,187 @@ inline auto LanguageFromLocale(QLocale loc) {
 			: int(locLang);
 }
 
-const auto kDictionaries = {
-	Dict{{ QLocale::English,                               649,   174'516, "English" }}, // en_US
-	Dict{{ QLocale::Bulgarian,                             594,   229'658, "\xd0\x91\xd1\x8a\xd0\xbb\xd0\xb3\xd0\xb0\xd1\x80\xd1\x81\xd0\xba\xd0\xb8" }}, // bg_BG
-	Dict{{ QLocale::Catalan,                               595,   417'611, "\x43\x61\x74\x61\x6c\xc3\xa0" }}, // ca_ES
-	Dict{{ QLocale::Czech,                                 596,   860'286, "\xc4\x8c\x65\xc5\xa1\x74\x69\x6e\x61" }}, // cs_CZ
-	Dict{{ QLocale::Welsh,                                 597,   177'305, "\x43\x79\x6d\x72\x61\x65\x67" }}, // cy_GB
-	Dict{{ QLocale::Danish,                                598,   345'874, "\x44\x61\x6e\x73\x6b" }}, // da_DK
-	Dict{{ QLocale::German,                                599, 2'412'780, "\x44\x65\x75\x74\x73\x63\x68" }}, // de_DE
-	Dict{{ QLocale::Greek,                                 600, 1'389'160, "\xce\x95\xce\xbb\xce\xbb\xce\xb7\xce\xbd\xce\xb9\xce\xba\xce\xac" }}, // el_GR
-	Dict{{ LWC(QLocale::English, QLocale::Australia),      601,   175'266, "English (Australia)" }}, // en_AU
-	Dict{{ LWC(QLocale::English, QLocale::Canada),         602,   174'295, "English (Canada)" }}, // en_CA
-	Dict{{ LWC(QLocale::English, QLocale::UnitedKingdom),  603,   174'433, "English (United Kingdom)" }}, // en_GB
-	Dict{{ QLocale::Spanish,                               604,   264'717, "\x45\x73\x70\x61\xc3\xb1\x6f\x6c" }}, // es_ES
-	Dict{{ QLocale::Estonian,                              605,   757'394, "\x45\x65\x73\x74\x69" }}, // et_EE
-	Dict{{ QLocale::Persian,                               606,   333'911, "\xd9\x81\xd8\xa7\xd8\xb1\xd8\xb3\xdb\x8c" }}, // fa_IR
-	Dict{{ QLocale::French,                                607,   321'391, "\x46\x72\x61\x6e\xc3\xa7\x61\x69\x73" }}, // fr_FR
-	Dict{{ QLocale::Hebrew,                                608,   622'550, "\xd7\xa2\xd7\x91\xd7\xa8\xd7\x99\xd7\xaa" }}, // he_IL
-	Dict{{ QLocale::Hindi,                                 609,    56'105, "\xe0\xa4\xb9\xe0\xa4\xbf\xe0\xa4\xa8\xe0\xa5\x8d\xe0\xa4\xa6\xe0\xa5\x80" }}, // hi_IN
-	Dict{{ QLocale::Croatian,                              610,   668'876, "\x48\x72\x76\x61\x74\x73\x6b\x69" }}, // hr_HR
-	Dict{{ QLocale::Hungarian,                             611,   660'402, "\x4d\x61\x67\x79\x61\x72" }}, // hu_HU
-	Dict{{ QLocale::Armenian,                              612,   928'746, "\xd5\x80\xd5\xa1\xd5\xb5\xd5\xa5\xd6\x80\xd5\xa5\xd5\xb6" }}, // hy_AM
-	Dict{{ QLocale::Indonesian,                            613,   100'134, "\x49\x6e\x64\x6f\x6e\x65\x73\x69\x61" }}, // id_ID
-	Dict{{ QLocale::Italian,                               614,   324'613, "\x49\x74\x61\x6c\x69\x61\x6e\x6f" }}, // it_IT
-	Dict{{ QLocale::Korean,                                615, 1'256'987, "\xed\x95\x9c\xea\xb5\xad\xec\x96\xb4" }}, // ko_KR
-	Dict{{ QLocale::Lithuanian,                            616,   267'427, "\x4c\x69\x65\x74\x75\x76\x69\xc5\xb3" }}, // lt_LT
-	Dict{{ QLocale::Latvian,                               617,   641'602, "\x4c\x61\x74\x76\x69\x65\xc5\xa1\x75" }}, // lv_LV
-	Dict{{ QLocale::NorwegianBokmal,                       618,   588'650, "\x4e\x6f\x72\x73\x6b" }}, // nb_NO
-	Dict{{ QLocale::Dutch,                                 619,   743'406, "\x4e\x65\x64\x65\x72\x6c\x61\x6e\x64\x73" }}, // nl_NL
-	Dict{{ QLocale::Polish,                                620, 1'015'747, "\x50\x6f\x6c\x73\x6b\x69" }}, // pl_PL
-	Dict{{ QLocale::Portuguese,                            621, 1'231'999, "\x50\x6f\x72\x74\x75\x67\x75\xc3\xaa\x73 (Brazil)" }}, // pt_BR
-	Dict{{ LWC(QLocale::Portuguese, QLocale::Portugal),    622,   138'571, "\x50\x6f\x72\x74\x75\x67\x75\xc3\xaa\x73" }}, // pt_PT
-	Dict{{ QLocale::Romanian,                              623,   455'643, "\x52\x6f\x6d\xc3\xa2\x6e\xc4\x83" }}, // ro_RO
-	Dict{{ QLocale::Russian,                               624,   463'194, "\xd0\xa0\xd1\x83\xd1\x81\xd1\x81\xd0\xba\xd0\xb8\xd0\xb9" }}, // ru_RU
-	Dict{{ QLocale::Slovak,                                625,   525'328, "\x53\x6c\x6f\x76\x65\x6e\xc4\x8d\x69\x6e\x61" }}, // sk_SK
-	Dict{{ QLocale::Slovenian,                             626, 1'143'710, "\x53\x6c\x6f\x76\x65\x6e\xc5\xa1\xc4\x8d\x69\x6e\x61" }}, // sl_SI
-	Dict{{ QLocale::Albanian,                              627,   583'412, "\x53\x68\x71\x69\x70" }}, // sq_AL
-	Dict{{ QLocale::Swedish,                               628,   593'877, "\x53\x76\x65\x6e\x73\x6b\x61" }}, // sv_SE
-	Dict{{ QLocale::Tamil,                                 629,   323'193, "\xe0\xae\xa4\xe0\xae\xae\xe0\xae\xbf\xe0\xae\xb4\xe0\xaf\x8d" }}, // ta_IN
-	Dict{{ QLocale::Tajik,                                 630,   369'931, "\xd0\xa2\xd0\xbe\xd2\xb7\xd0\xb8\xd0\xba\xd3\xa3" }}, // tg_TG
-	Dict{{ QLocale::Turkish,                               631, 4'301'099, "\x54\xc3\xbc\x72\x6b\xc3\xa7\x65" }}, // tr_TR
-	Dict{{ QLocale::Ukrainian,                             632,   445'711, "\xd0\xa3\xd0\xba\xd1\x80\xd0\xb0\xd1\x97\xd0\xbd\xd1\x81\xd1\x8c\xd0\xba\xd0\xb0" }}, // uk_UA
-	Dict{{ QLocale::Vietnamese,                            633,    12'949, "\x54\x69\xe1\xba\xbf\x6e\x67\x20\x56\x69\xe1\xbb\x87\x74" }}, // vi_VN
-	// The Tajik code is 'tg_TG' in Chromium, but QT has only 'tg_TJ'.
+constexpr auto kDictionariesManifestChannel = "tdhbcfiles"_cs;
+constexpr auto kDictionariesManifestPostId = 2949;
+
+// Runtime-loaded dictionaries manifest. Kept in memory only: fetched from
+// the pinned JSON post the first time something actually needs it
+// (Manage Dictionaries, auto-download). Nothing persists to disk, so an
+// install whose enabled dictionaries are all on disk never hits the net.
+std::vector<Dict> DictionariesList;
+rpl::event_stream<> DictionariesListChanged;
+
+void EnsurePath();
+
+bool ParseLocation(const QString &text, QString &channel, int &postId) {
+	const auto sep = text.indexOf('#');
+	if (sep <= 0 || sep == text.size() - 1) {
+		return false;
+	}
+	auto ok = false;
+	const auto parsed = text.mid(sep + 1).toInt(&ok);
+	if (!ok || parsed <= 0) {
+		return false;
+	}
+	channel = text.left(sep);
+	postId = parsed;
+	return true;
+}
+
+std::vector<Dict> ParseManifest(const QByteArray &bytes) {
+	auto result = std::vector<Dict>();
+	auto err = QJsonParseError();
+	const auto doc = QJsonDocument::fromJson(bytes, &err);
+	if (err.error != QJsonParseError::NoError || !doc.isObject()) {
+		LOG(("Spellcheck Error: manifest JSON parse failed: %1"
+			).arg(err.errorString()));
+		return result;
+	}
+	const auto list = doc.object().value(u"dictionaries"_q).toArray();
+	result.reserve(list.size());
+	for (const auto &v : list) {
+		const auto obj = v.toObject();
+		auto d = Dict();
+		d.id = obj.value(u"id"_q).toInt();
+		d.size = int64(obj.value(u"size"_q).toDouble());
+		d.name = obj.value(u"name"_q).toString();
+		const auto location = obj.value(u"location"_q).toString();
+		if (!d.id
+			|| d.name.isEmpty()
+			|| !ParseLocation(location, d.channel, d.postId)) {
+			continue;
+		}
+		result.push_back(std::move(d));
+	}
+	return result;
+}
+
+class DictManifestLoader final : public base::has_weak_ptr {
+public:
+	explicit DictManifestLoader(base::weak_ptr<Main::Session> session);
+
+	void start();
+
+private:
+	void resolved(const MTPInputChannel &channel);
+	void received(const MTPmessages_Messages &result);
+	void apply(const QByteArray &bytes);
+	void finish();
+
+	MTP::WeakInstance _mtp;
+
 };
 
+std::shared_ptr<DictManifestLoader> ActiveManifestLoader;
+
+DictManifestLoader::DictManifestLoader(base::weak_ptr<Main::Session> session)
+: _mtp(session) {
+}
+
+void DictManifestLoader::start() {
+	if (!_mtp.valid()) {
+		finish();
+		return;
+	}
+	const auto weak = base::make_weak(this);
+	MTP::ResolveChannel(&_mtp, kDictionariesManifestChannel.utf16(), [=](
+			const MTPInputChannel &channel) {
+		if (const auto strong = weak.get()) {
+			strong->resolved(channel);
+		}
+	}, [=] {
+		if (const auto strong = weak.get()) {
+			strong->finish();
+		}
+	});
+}
+
+void DictManifestLoader::resolved(const MTPInputChannel &channel) {
+	const auto weak = base::make_weak(this);
+	_mtp.send(
+		MTPchannels_GetMessages(
+			channel,
+			MTP_vector<MTPInputMessage>(1,
+				MTP_inputMessageID(
+					MTP_int(kDictionariesManifestPostId)))),
+		[=](const MTPmessages_Messages &result) {
+			if (const auto strong = weak.get()) {
+				strong->received(result);
+			}
+		},
+		[=](const MTP::Error &) {
+			if (const auto strong = weak.get()) {
+				strong->finish();
+			}
+		});
+}
+
+void DictManifestLoader::received(const MTPmessages_Messages &result) {
+	const auto message = MTP::GetMessagesElement(result);
+	if (!message || message->type() != mtpc_message) {
+		LOG(("Spellcheck Error: manifest message not found."));
+		finish();
+		return;
+	}
+	apply(message->c_message().vmessage().v);
+	finish();
+}
+
+void DictManifestLoader::apply(const QByteArray &bytes) {
+	auto parsed = ParseManifest(bytes);
+	if (parsed.empty()) {
+		LOG(("Spellcheck Error: manifest empty or unparseable."));
+		return;
+	}
+	DictionariesList = std::move(parsed);
+	DictionariesListChanged.fire({});
+}
+
+void DictManifestLoader::finish() {
+	crl::on_main([] {
+		ActiveManifestLoader.reset();
+	});
+}
+
+void StartManifestRefresh(not_null<Main::Session*> session) {
+	if (ActiveManifestLoader) {
+		return;
+	}
+	ActiveManifestLoader = std::make_shared<DictManifestLoader>(
+		base::make_weak(session));
+	ActiveManifestLoader->start();
+}
+
+// Callers waiting for the first manifest arrival in this session.
+// We don't cache manifest to disk, so each cold start begins empty;
+// queued callbacks fire once when the MTP fetch lands.
+std::vector<Fn<void()>> ManifestPending;
+rpl::lifetime ManifestPendingSubscription;
+
+void EnsureManifestThen(
+		not_null<Main::Session*> session,
+		Fn<void()> callback) {
+	if (!DictionariesList.empty()) {
+		callback();
+		return;
+	}
+	const auto firstCaller = ManifestPending.empty();
+	ManifestPending.push_back(std::move(callback));
+	if (firstCaller) {
+		DictionariesListChanged.events(
+		) | rpl::take(1) | rpl::on_next([] {
+			auto fns = std::move(ManifestPending);
+			ManifestPending.clear();
+			for (auto &fn : fns) {
+				fn();
+			}
+		}, ManifestPendingSubscription);
+	}
+	StartManifestRefresh(session);
+}
+
 inline auto IsSupportedLang(int lang) {
-	return ranges::contains(kDictionaries, lang, &Dict::id);
+	return ranges::contains(DictionariesList, lang, &Dict::id);
 }
 
 void EnsurePath() {
@@ -144,9 +284,12 @@ void DownloadDictionaryInBackground(
 
 		if (DictionaryExists(id)) {
 			auto dicts = Core::App().settings().dictionariesEnabled();
-			if (!ranges::contains(dicts, id)) {
+			if (ranges::contains(dicts, id)) {
+				Platform::Spellchecker::UpdateLanguages(dicts);
+			} else {
 				dicts.push_back(id);
-				Core::App().settings().setDictionariesEnabled(std::move(dicts));
+				Core::App().settings().setDictionariesEnabled(
+					std::move(dicts));
 				Core::App().saveSettingsDelayed();
 			}
 		}
@@ -230,17 +373,28 @@ void DictLoader::fail() {
 }
 
 std::vector<Dict> Dictionaries() {
-	return kDictionaries | ranges::to_vector;
+	return DictionariesList;
+}
+
+rpl::producer<> DictionariesChanged() {
+	return DictionariesListChanged.events();
+}
+
+void RefreshDictionariesManifest(not_null<Main::Session*> session) {
+	StartManifestRefresh(session);
 }
 
 int64 GetDownloadSize(int id) {
-	return ranges::find(kDictionaries, id, &Spellchecker::Dict::id)->size;
+	const auto i = ranges::find(DictionariesList, id, &Dict::id);
+	return (i == end(DictionariesList)) ? 0 : i->size;
 }
 
 MTP::DedicatedLoader::Location GetDownloadLocation(int id) {
-	const auto username = kCloudLocationUsername.utf16();
-	const auto i = ranges::find(kDictionaries, id, &Spellchecker::Dict::id);
-	return MTP::DedicatedLoader::Location{ username, i->postId };
+	const auto i = ranges::find(DictionariesList, id, &Dict::id);
+	if (i == end(DictionariesList)) {
+		return MTP::DedicatedLoader::Location{};
+	}
+	return MTP::DedicatedLoader::Location{ i->channel, i->postId };
 }
 
 QString DictPathByLangId(int langId) {
@@ -256,7 +410,24 @@ QString DictionariesPath() {
 
 bool UnpackDictionary(const QString &path, int langId) {
 	const auto folder = DictPathByLangId(langId);
-	return UnpackBlob(path, folder, IsGoodPartName);
+	if (!UnpackBlob(path, folder, IsGoodPartName)) {
+		return false;
+	}
+	// The Serbian archive ships "sr_Cyrl_RS.{dic,aff}", but
+	// QLocale(QLocale::Serbian).name() is "sr_RS" on our Qt, so the
+	// Hunspell loader and DictionaryExists miss them. Rename to the
+	// expected stem.
+	if (langId == int(QLocale::Serbian)) {
+		const auto dir = QDir(folder);
+		for (const auto &ext : kDictExtensions) {
+			const auto from = u"sr_Cyrl_RS.%1"_q.arg(ext);
+			const auto to = u"sr_RS.%1"_q.arg(ext);
+			if (dir.exists(from) && !dir.exists(to)) {
+				QFile::rename(dir.filePath(from), dir.filePath(to));
+			}
+		}
+	}
+	return true;
 }
 
 bool DictionaryExists(int langId) {
@@ -316,26 +487,26 @@ rpl::producer<QString> ButtonManageDictsState(
 		if (!Core::App().settings().spellcheckerEnabled()) {
 			return QString();
 		}
-		if (!Core::App().settings().dictionariesEnabled().size()) {
+		const auto dicts = Core::App().settings().dictionariesEnabled();
+		if (dicts.empty()) {
 			return QString();
 		}
-		const auto dicts = Core::App().settings().dictionariesEnabled();
 		const auto filtered = ranges::views::all(
 			dicts
 		) | ranges::views::filter(
 			DictionaryExists
 		) | ranges::to_vector;
-		const auto active = Platform::Spellchecker::ActiveLanguages();
 
-		return (active.size() == filtered.size())
-			? QString::number(filtered.size())
-			: tr::lng_contacts_loading(tr::now);
+		return (filtered.size() < dicts.size())
+			? tr::lng_contacts_loading(tr::now)
+			: QString::number(filtered.size());
 	};
 	return rpl::single(
 		computeString()
 	) | rpl::then(
 		rpl::merge(
 			Spellchecker::SupportedScriptsChanged(),
+			Spellchecker::DictionariesChanged(),
 			Core::App().settings().dictionariesEnabledChanges(
 			) | rpl::to_empty,
 			Core::App().settings().spellcheckerEnabledChanges(
@@ -389,23 +560,23 @@ void Start(not_null<Main::Session*> session) {
 	if (Platform::Spellchecker::IsSystemSpellchecker()) {
 		Spellchecker::SupportedScriptsChanged()
 		| rpl::take(1)
-		| rpl::start_with_next(AddExceptions, lifetime);
+		| rpl::on_next(AddExceptions, lifetime);
 
 		return;
 	}
 
 	Spellchecker::SupportedScriptsChanged(
-	) | rpl::start_with_next(AddExceptions, lifetime);
+	) | rpl::on_next(AddExceptions, lifetime);
 
 	Spellchecker::SetWorkingDirPath(DictionariesPath());
 
 	settings->dictionariesEnabledChanges(
-	) | rpl::start_with_next([](auto dictionaries) {
+	) | rpl::on_next([](auto dictionaries) {
 		Platform::Spellchecker::UpdateLanguages(dictionaries);
 	}, lifetime);
 
 	settings->spellcheckerEnabledChanges(
-	) | rpl::start_with_next(onEnabled, lifetime);
+	) | rpl::on_next(onEnabled, lifetime);
 
 	const auto method = QGuiApplication::inputMethod();
 
@@ -418,12 +589,18 @@ void Start(not_null<Main::Session*> session) {
 				return;
 			}
 			const auto l = LanguageFromLocale(method->locale());
-			if (!IsSupportedLang(l) || DictionaryExists(l)) {
+			// Avoid pulling the manifest just because an input-method
+			// locale flipped; only fetch if we'd actually need to
+			// download something for the new locale.
+			if (DictionaryExists(l)) {
 				return;
 			}
-			crl::on_main(session, [=] {
+			EnsureManifestThen(session, crl::guard(session, [=] {
+				if (!IsSupportedLang(l) || DictionaryExists(l)) {
+					return;
+				}
 				DownloadDictionaryInBackground(session, 0, { l });
-			});
+			}));
 		};
 		QObject::connect(
 			method,
@@ -433,12 +610,21 @@ void Start(not_null<Main::Session*> session) {
 
 	if (settings->autoDownloadDictionaries()) {
 		session->data().contactsLoaded().changes(
-		) | rpl::start_with_next([=](bool loaded) {
+		) | rpl::on_next([=](bool loaded) {
 			if (!loaded) {
 				return;
 			}
-
-			DownloadDictionaryInBackground(session, 0, DefaultLanguages());
+			const auto enabled = settings->dictionariesEnabled();
+			if (!enabled.empty()
+				&& ranges::all_of(enabled, &DictionaryExists)) {
+				// Every previously-enabled dictionary is already on
+				// disk; no manifest fetch, no network traffic.
+				return;
+			}
+			EnsureManifestThen(session, crl::guard(session, [=] {
+				DownloadDictionaryInBackground(
+					session, 0, DefaultLanguages());
+			}));
 		}, lifetime);
 
 		connectInput();
@@ -466,7 +652,7 @@ void Start(not_null<Main::Session*> session) {
 	rpl::combine(
 		settings->spellcheckerEnabledValue(),
 		settings->autoDownloadDictionariesValue()
-	) | rpl::start_with_next([=](bool spell, bool download) {
+	) | rpl::on_next([=](bool spell, bool download) {
 		if (spell && download) {
 			connectInput();
 			return;
diff --git a/Telegram/SourceFiles/chat_helpers/spellchecker_common.h b/Telegram/SourceFiles/chat_helpers/spellchecker_common.h
index f0e02879aeb596..30da85bda9ab42 100644
--- a/Telegram/SourceFiles/chat_helpers/spellchecker_common.h
+++ b/Telegram/SourceFiles/chat_helpers/spellchecker_common.h
@@ -19,6 +19,7 @@ class Session;
 namespace Spellchecker {
 
 struct Dict : public Storage::CloudBlob::Blob {
+	QString channel;
 };
 
 int64 GetDownloadSize(int id);
@@ -33,6 +34,8 @@ bool RemoveDictionary(int langId);
 
 bool WriteDefaultDictionary();
 std::vector<Dict> Dictionaries();
+rpl::producer<> DictionariesChanged();
+void RefreshDictionariesManifest(not_null<Main::Session*> session);
 
 void Start(not_null<Main::Session*> session);
 [[nodiscard]] rpl::producer<QString> ButtonManageDictsState(
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
index 8941f35aa8bf55..3c986eadfa25ea 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "main/main_session.h"
 #include "chat_helpers/stickers_lottie.h"
+#include "data/data_media_types.h"
 #include "data/data_session.h"
 #include "data/data_document.h"
 #include "base/unixtime.h"
@@ -144,4 +145,54 @@ DocumentData *DicePacks::lookup(const QString &emoji, int value) {
 	).first->second->lookup(value);
 }
 
+void DicePacks::resolveGameOptions(
+		Fn<void(const Data::DiceGameOptions &)> done) {
+	_resolveGameOptionsCallback = std::move(done);
+	if (_resolveGameOptionsRequestId) {
+		return;
+	}
+
+	_resolveGameOptionsRequestId = _session->api().request(
+		MTPmessages_GetEmojiGameInfo()
+	).done([=](const MTPmessages_EmojiGameInfo &result) {
+		_resolveGameOptionsRequestId = 0;
+		if (const auto onstack = base::take(_resolveGameOptionsCallback)) {
+			onstack(result.match([&](
+					const MTPDmessages_emojiGameUnavailable &) {
+				return Data::DiceGameOptions();
+			}, [&](const MTPDmessages_emojiGameDiceInfo &data) {
+				auto jackpot = 0;
+				auto rewards = std::array<int, 6>{};
+				const auto &params = data.vparams().v;
+				const auto count = int(params.size());
+				for (auto i = 0; i != count; ++i) {
+					if (i < 6) {
+						rewards[i] = params[i].v;
+					} else if (i == 6) {
+						jackpot = params[i].v;
+					} else {
+						break;
+					}
+				}
+				return Data::DiceGameOptions{
+					.seedHash = data.vgame_hash().v,
+					.previousSteakNanoTon = int64(data.vprev_stake().v),
+					.milliRewards = rewards,
+					.jackpotMilliReward = jackpot,
+					.currentStreak = data.vcurrent_streak().v,
+					.playsLeft = data.vplays_left().value_or_empty(),
+				};
+			}));
+		}
+	}).fail([=] {
+		_resolveGameOptionsRequestId = 0;
+		if (const auto onstack = base::take(_resolveGameOptionsCallback)) {
+			onstack({});
+		}
+	}).send();
+}
+
+void DicePacks::apply(const MTPDupdateEmojiGameInfo &update) {
+}
+
 } // namespace Stickers
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.h b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.h
index cb5210c3511076..249467e7f2c795 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.h
@@ -9,6 +9,10 @@ For license and copyright information please follow this link:
 
 class DocumentData;
 
+namespace Data {
+struct DiceGameOptions;
+} // namespace Data
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -51,11 +55,17 @@ class DicePacks final {
 
 	[[nodiscard]] DocumentData *lookup(const QString &emoji, int value);
 
+	void resolveGameOptions(Fn<void(const Data::DiceGameOptions &)> done);
+	void apply(const MTPDupdateEmojiGameInfo &update);
+
 private:
 	const not_null<Main::Session*> _session;
 
 	base::flat_map<QString, std::unique_ptr<DicePack>> _packs;
 
+	mtpRequestId _resolveGameOptionsRequestId = 0;
+	Fn<void(const Data::DiceGameOptions &)> _resolveGameOptionsCallback;
+
 };
 
 } // namespace Stickers
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
index af07736a48a44a..c336323dad87c1 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
@@ -103,17 +103,17 @@ EmojiPack::EmojiPack(not_null<Main::Session*> session)
 	session->data().viewRemoved(
 	) | rpl::filter([](not_null<const ViewElement*> view) {
 		return view->isIsolatedEmoji() || view->isOnlyCustomEmoji();
-	}) | rpl::start_with_next([=](not_null<const ViewElement*> item) {
+	}) | rpl::on_next([=](not_null<const ViewElement*> item) {
 		remove(item);
 	}, _lifetime);
 
 	Core::App().settings().largeEmojiChanges(
-	) | rpl::start_with_next([=](bool large) {
+	) | rpl::on_next([=](bool large) {
 		refreshAll();
 	}, _lifetime);
 
 	Ui::Emoji::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_images.clear();
 		refreshAll();
 	}, _lifetime);
@@ -122,7 +122,10 @@ EmojiPack::EmojiPack(not_null<Main::Session*> session)
 EmojiPack::~EmojiPack() = default;
 
 bool EmojiPack::add(not_null<ViewElement*> view) {
-	if (const auto custom = view->onlyCustomEmoji()) {
+	if (view->data()->textAppearing()
+		|| view->Get<HistoryView::FakeBotAboutTop>()) {
+		return false;
+	} else if (const auto custom = view->onlyCustomEmoji()) {
 		_onlyCustomItems.emplace(view);
 		return true;
 	} else if (const auto emoji = view->isolatedEmoji()) {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_gift_box_pack.cpp b/Telegram/SourceFiles/chat_helpers/stickers_gift_box_pack.cpp
index a4c98c416c47c8..4aeb381c027f7b 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_gift_box_pack.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_gift_box_pack.cpp
@@ -16,14 +16,19 @@ For license and copyright information please follow this link:
 namespace Stickers {
 
 GiftBoxPack::GiftBoxPack(not_null<Main::Session*> session)
-: _session(session)
-, _localMonths({ 1, 3, 6, 12, 24 }) {
+: _session(session) {
+	_premium.dividers = { 1, 3, 6, 12, 24 };
+	_ton.dividers = { 0, 10, 50 };
 }
 
 GiftBoxPack::~GiftBoxPack() = default;
 
 rpl::producer<> GiftBoxPack::updated() const {
-	return _updated.events();
+	return _premium.updated.events();
+}
+
+rpl::producer<> GiftBoxPack::tonUpdated() const {
+	return _ton.updated.events();
 }
 
 int GiftBoxPack::monthsForStars(int stars) const {
@@ -37,86 +42,112 @@ int GiftBoxPack::monthsForStars(int stars) const {
 }
 
 DocumentData *GiftBoxPack::lookup(int months) const {
-	const auto it = ranges::lower_bound(_localMonths, months);
-	const auto fallback = _documents.empty() ? nullptr : _documents[0];
-	if (it == begin(_localMonths)) {
+	return lookup(_premium, months, false);
+}
+
+DocumentData *GiftBoxPack::tonLookup(int amount) const {
+	return lookup(_ton, amount, true);
+}
+
+DocumentData *GiftBoxPack::lookup(
+		const Pack &pack,
+		int divider,
+		bool exact) const {
+	const auto it = ranges::lower_bound(pack.dividers, divider);
+	const auto fallback = pack.documents.empty()
+		? nullptr
+		: pack.documents.front();
+	if (it == begin(pack.dividers)) {
 		return fallback;
-	} else if (it == end(_localMonths)) {
-		return _documents.back();
+	} else if (it == end(pack.dividers)) {
+		return pack.documents.empty() ? nullptr : pack.documents.back();
 	}
-	const auto left = *(it - 1);
-	const auto right = *it;
-	const auto shift = (std::abs(months - left) < std::abs(months - right))
+	const auto shift = exact
+		? ((*it > divider) ? 1 : 0)
+		: (std::abs(divider - (*(it - 1))) < std::abs(divider - (*it)))
 		? -1
 		: 0;
-	const auto index = int(std::distance(begin(_localMonths), it - shift));
-	return (index >= _documents.size()) ? fallback : _documents[index];
+	const auto index = int(std::distance(begin(pack.dividers), it - shift));
+	return (index >= pack.documents.size())
+		? fallback
+		: pack.documents[index];
 }
 
 Data::FileOrigin GiftBoxPack::origin() const {
-	return Data::FileOriginStickerSet(_setId, _accessHash);
+	return Data::FileOriginStickerSet(_premium.id, _premium.accessHash);
+}
+
+Data::FileOrigin GiftBoxPack::tonOrigin() const {
+	return Data::FileOriginStickerSet(_ton.id, _ton.accessHash);
 }
 
 void GiftBoxPack::load() {
-	if (_requestId || !_documents.empty()) {
+	load(_premium, MTP_inputStickerSetPremiumGifts());
+}
+
+void GiftBoxPack::tonLoad() {
+	load(_ton, MTP_inputStickerSetTonGifts());
+}
+
+void GiftBoxPack::load(Pack &pack, const MTPInputStickerSet &set) {
+	if (pack.requestId || !pack.documents.empty()) {
 		return;
 	}
-	_requestId = _session->api().request(MTPmessages_GetStickerSet(
-		MTP_inputStickerSetPremiumGifts(),
+	pack.requestId = _session->api().request(MTPmessages_GetStickerSet(
+		set,
 		MTP_int(0) // Hash.
-	)).done([=](const MTPmessages_StickerSet &result) {
-		_requestId = 0;
+	)).done([=, &pack](const MTPmessages_StickerSet &result) {
+		pack.requestId = 0;
 		result.match([&](const MTPDmessages_stickerSet &data) {
-			applySet(data);
+			applySet(pack, data);
 		}, [](const MTPDmessages_stickerSetNotModified &) {
 			LOG(("API Error: Unexpected messages.stickerSetNotModified."));
 		});
-	}).fail([=] {
-		_requestId = 0;
+	}).fail([=, &pack] {
+		pack.requestId = 0;
 	}).send();
 }
 
-void GiftBoxPack::applySet(const MTPDmessages_stickerSet &data) {
-	_setId = data.vset().data().vid().v;
-	_accessHash = data.vset().data().vaccess_hash().v;
+void GiftBoxPack::applySet(Pack &pack, const MTPDmessages_stickerSet &data) {
+	pack.id = data.vset().data().vid().v;
+	pack.accessHash = data.vset().data().vaccess_hash().v;
 	auto documents = base::flat_map<DocumentId, not_null<DocumentData*>>();
 	for (const auto &sticker : data.vdocuments().v) {
 		const auto document = _session->data().processDocument(sticker);
 		if (document->sticker()) {
 			documents.emplace(document->id, document);
-			if (_documents.empty()) {
+			if (pack.documents.empty()) {
 				// Fallback.
-				_documents.resize(1);
-				_documents[0] = document;
+				pack.documents.resize(1);
+				pack.documents[0] = document;
 			}
 		}
 	}
-	for (const auto &pack : data.vpacks().v) {
-		pack.match([&](const MTPDstickerPack &data) {
-			const auto emoji = qs(data.vemoticon());
-			if (emoji.isEmpty()) {
-				return;
-			}
-			for (const auto &id : data.vdocuments().v) {
-				if (const auto document = documents.take(id.v)) {
-					if (const auto sticker = (*document)->sticker()) {
-						if (!sticker->alt.isEmpty()) {
-							const auto ch = int(sticker->alt[0].unicode());
-							const auto index = (ch - '1'); // [0, 4];
-							if (index < 0 || index >= _localMonths.size()) {
-								return;
-							}
-							if ((index + 1) > _documents.size()) {
-								_documents.resize((index + 1));
-							}
-							_documents[index] = (*document);
+	for (const auto &info : data.vpacks().v) {
+		const auto &data = info.data();
+		const auto emoji = qs(data.vemoticon());
+		if (emoji.isEmpty()) {
+			return;
+		}
+		for (const auto &id : data.vdocuments().v) {
+			if (const auto document = documents.take(id.v)) {
+				if (const auto sticker = (*document)->sticker()) {
+					if (!sticker->alt.isEmpty()) {
+						const auto ch = int(sticker->alt[0].unicode());
+						const auto index = (ch - '1'); // [0, 4];
+						if (index < 0 || index >= pack.dividers.size()) {
+							return;
+						}
+						if ((index + 1) > pack.documents.size()) {
+							pack.documents.resize((index + 1));
 						}
+						pack.documents[index] = (*document);
 					}
 				}
 			}
-		});
+		}
 	}
-	_updated.fire({});
+	pack.updated.fire({});
 }
 
 } // namespace Stickers
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_gift_box_pack.h b/Telegram/SourceFiles/chat_helpers/stickers_gift_box_pack.h
index 798259c2572c7b..728b10ddb4300f 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_gift_box_pack.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_gift_box_pack.h
@@ -30,18 +30,36 @@ class GiftBoxPack final {
 	[[nodiscard]] Data::FileOrigin origin() const;
 	[[nodiscard]] rpl::producer<> updated() const;
 
+	void tonLoad();
+	[[nodiscard]] DocumentData *tonLookup(int amount) const;
+	[[nodiscard]] Data::FileOrigin tonOrigin() const;
+	[[nodiscard]] rpl::producer<> tonUpdated() const;
+
 private:
 	using SetId = uint64;
-	void applySet(const MTPDmessages_stickerSet &data);
+
+	struct Pack {
+		SetId id = 0;
+		uint64 accessHash = 0;
+		std::vector<DocumentData*> documents;
+		mtpRequestId requestId = 0;
+		std::vector<int> dividers;
+		rpl::event_stream<> updated;
+	};
+
+	void load(Pack &pack, const MTPInputStickerSet &set);
+	void applySet(Pack &pack, const MTPDmessages_stickerSet &data);
+	[[nodiscard]] DocumentData *lookup(
+		const Pack &pack,
+		int divider,
+		bool exact) const;
 
 	const not_null<Main::Session*> _session;
 	const std::vector<int> _localMonths;
+	const std::vector<int> _localTonAmounts;
 
-	rpl::event_stream<> _updated;
-	std::vector<DocumentData*> _documents;
-	SetId _setId = 0;
-	uint64 _accessHash = 0;
-	mtpRequestId _requestId = 0;
+	Pack _premium;
+	Pack _ton;
 
 };
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
index 8d666249f146cd..004075748c56f7 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
@@ -63,6 +63,24 @@ void UpdateAnimated(
 
 } // namespace
 
+bool MatchAllPreparedSearchWords(
+		const QStringList &titleWords,
+		const QStringList &searchWords) {
+	for (const auto &searchWord : searchWords) {
+		auto found = false;
+		for (const auto &titleWord : titleWords) {
+			if (titleWord.startsWith(searchWord)) {
+				found = true;
+				break;
+			}
+		}
+		if (!found) {
+			return false;
+		}
+	}
+	return true;
+}
+
 uint64 EmojiSectionSetId(EmojiSection section) {
 	Expects(section >= EmojiSection::Recent
 		&& section <= EmojiSection::Symbols);
@@ -146,7 +164,8 @@ rpl::producer<std::vector<GifSection>> GifSectionsValue(
 
 [[nodiscard]] std::vector<EmojiPtr> SearchEmoji(
 		const std::vector<QString> &query,
-		base::flat_set<EmojiPtr> &outResultSet) {
+		base::flat_set<EmojiPtr> &outResultSet,
+		bool exact) {
 	auto result = std::vector<EmojiPtr>();
 	const auto pushPlain = [&](EmojiPtr emoji) {
 		if (result.size() < kEmojiSearchLimit
@@ -170,7 +189,7 @@ rpl::producer<std::vector<GifSection>> GifSectionsValue(
 				refreshed = true;
 				keywords.refresh();
 			}
-			const auto list = keywords.queryMine(entry);
+			const auto list = keywords.queryMine(entry, exact);
 			for (const auto &entry : list) {
 				pushPlain(entry.emoji);
 				if (result.size() >= kEmojiSearchLimit) {
@@ -248,7 +267,7 @@ bool StickersListFooter::ScrollState::animationCallback(crl::time now) {
 
 GradientPremiumStar::GradientPremiumStar() {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_image = QImage();
 	}, _lifetime);
 }
@@ -302,7 +321,7 @@ StickersListFooter::StickersListFooter(Descriptor &&descriptor)
 	_iconsRight = st().iconSkip;
 
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 }
@@ -822,7 +841,7 @@ void StickersListFooter::mousePressEvent(QMouseEvent *e) {
 	if (e->button() != Qt::LeftButton) {
 		return;
 	}
-	_iconsMousePos = e ? e->globalPos() : QCursor::pos();
+	_iconsMousePos = e->globalPos();
 	updateSelected();
 
 	if (_selected == SpecialOver::Settings) {
@@ -1199,7 +1218,7 @@ void StickersListFooter::validateIconLottieAnimation(
 
 	const auto id = icon.setId;
 	icon.lottie->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateSetIcon(id);
 	}, icon.lifetime);
 }
@@ -1467,6 +1486,8 @@ void StickersListFooter::paintSetIconToCache(
 					return &st().icons.people;
 				} else if (const auto section = SetIdEmojiSection(icon.setId)) {
 					return sectionIcon(*section, selected);
+				} else if (icon.setId == Data::Stickers::CollectibleSetId) {
+					return &st().icons.collectibles;
 				}
 				return sectionIcon(Section::Recent, selected);
 			}());
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.h b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.h
index a76b1ee21ab032..2da22cb57c669c 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.h
@@ -70,7 +70,8 @@ struct GifSection {
 
 [[nodiscard]] std::vector<EmojiPtr> SearchEmoji(
 	const std::vector<QString> &query,
-	base::flat_set<EmojiPtr> &outResultSet);
+	base::flat_set<EmojiPtr> &outResultSet,
+	bool exact = false);
 
 struct StickerIcon {
 	explicit StickerIcon(uint64 setId);
@@ -115,6 +116,10 @@ class GradientPremiumStar {
 
 };
 
+[[nodiscard]] bool MatchAllPreparedSearchWords(
+	const QStringList &titleWords,
+	const QStringList &searchWords);
+
 class StickersListFooter final : public TabbedSelector::InnerFooter {
 public:
 	struct Descriptor {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 8eb165894471b5..54476c37e9201f 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "chat_helpers/stickers_list_widget.h"
 
+#include "base/options.h"
 #include "base/timer_rpl.h"
 #include "core/application.h"
 #include "data/data_document.h"
@@ -21,6 +22,7 @@ For license and copyright information please follow this link:
 #include "chat_helpers/stickers_lottie.h"
 #include "chat_helpers/stickers_list_footer.h"
 #include "ui/controls/tabbed_search.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/effects/animations.h"
@@ -30,18 +32,20 @@ For license and copyright information please follow this link:
 #include "ui/image/image.h"
 #include "ui/cached_round_corners.h"
 #include "ui/power_saving.h"
+#include "ui/ui_utility.h"
 #include "lottie/lottie_multi_player.h"
 #include "lottie/lottie_single_player.h"
 #include "lottie/lottie_animation.h"
+#include "boxes/share_box.h"
 #include "boxes/stickers_box.h"
 #include "inline_bots/inline_bot_result.h"
 #include "storage/storage_account.h"
 #include "lang/lang_keys.h"
-#include "mainwindow.h"
 #include "dialogs/ui/dialogs_layout.h"
 #include "boxes/sticker_set_box.h"
 #include "boxes/stickers_box.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/text/text_entity.h"
 #include "ui/painter.h"
 #include "window/window_session_controller.h" // GifPauseReason.
 #include "main/main_session.h"
@@ -57,6 +61,17 @@ For license and copyright information please follow this link:
 #include <QtWidgets/QApplication>
 
 namespace ChatHelpers {
+
+[[nodiscard]] QVector<MTPstring> SearchStickersLangCodes() {
+	auto result = QVector<MTPstring>();
+	if (const auto method = QGuiApplication::inputMethod()) {
+		for (const auto &lang : method->locale().uiLanguages()) {
+			result.push_back(MTP_string(lang));
+		}
+	}
+	return result;
+}
+
 namespace {
 
 constexpr auto kSearchRequestDelay = 400;
@@ -71,12 +86,20 @@ using Data::StickersPack;
 using Data::StickersSetThumbnailView;
 using SetFlag = Data::StickersSetFlag;
 
+base::options::toggle OptionUnlimitedRecentStickers({
+	.id = kOptionUnlimitedRecentStickers,
+	.name = "Unlimited recent stickers",
+	.description = "Display as much recent stickers as the server provides",
+});
+
 [[nodiscard]] bool SetInMyList(Data::StickersSetFlags flags) {
 	return (flags & SetFlag::Installed) && !(flags & SetFlag::Archived);
 }
 
 } // namespace
 
+const char kOptionUnlimitedRecentStickers[] = "unlimited-recent-stickers";
+
 struct StickersListWidget::Sticker {
 	not_null<DocumentData*> document;
 	std::shared_ptr<Data::DocumentMedia> documentMedia;
@@ -194,6 +217,7 @@ StickersListWidget::StickersListWidget(
 , _section(Section::Stickers)
 , _isMasks(_mode == Mode::Masks)
 , _isEffects(_mode == Mode::MessageEffects)
+, _excludeSetId(descriptor.excludeSetId)
 , _updateItemsTimer([=] { updateItems(); })
 , _updateSetsTimer([=] { updateSets(); })
 , _trendingAddBgOver(
@@ -237,8 +261,7 @@ StickersListWidget::StickersListWidget(
 	}
 
 	_settings->addClickHandler([=] {
-		if (const auto window = _show->resolveWindow(
-				WindowUsage::PremiumPromo)) {
+		if (const auto window = _show->resolveWindow()) {
 			// While media viewer can't show StickersBox.
 			using Section = StickersBox::Section;
 			window->show(
@@ -249,7 +272,7 @@ StickersListWidget::StickersListWidget(
 	});
 
 	session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (isVisible()) {
 			updateItems();
 			readVisibleFeatured(getVisibleTop(), getVisibleBottom());
@@ -260,7 +283,7 @@ StickersListWidget::StickersListWidget(
 		Data::PeerUpdate::Flag::StickersSet
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer.get() == _megagroupSet);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		refreshStickers();
 	}, lifetime());
 
@@ -268,7 +291,7 @@ StickersListWidget::StickersListWidget(
 		session().data().stickers().recentUpdated(_isMasks
 			? Data::StickersType::Masks
 			: Data::StickersType::Stickers
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshRecent();
 		}, lifetime());
 	}
@@ -284,7 +307,7 @@ StickersListWidget::StickersListWidget(
 		rpl::merge(
 			Data::AmPremiumValue(&session()) | rpl::to_empty,
 			session().api().premium().cloudSetUpdated()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshStickers();
 		}, lifetime());
 	}
@@ -321,12 +344,12 @@ object_ptr<TabbedSelector::InnerFooter> StickersListWidget::createFooter() {
 	_footer = result;
 
 	_footer->setChosen(
-	) | rpl::start_with_next([=](uint64 setId) {
+	) | rpl::on_next([=](uint64 setId) {
 		showStickerSet(setId);
 	}, _footer->lifetime());
 
 	_footer->openSettingsRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto onlyFeatured = !_isMasks && _mySets.empty();
 		_show->showBox(Box<StickersBox>(
 			_show,
@@ -355,6 +378,9 @@ void StickersListWidget::visibleTopBottomUpdated(
 		checkVisibleFeatured(visibleTop, visibleBottom);
 	} else {
 		checkVisibleLottie();
+		if (_section == Section::Search) {
+			checkPaginateSearchStickers(visibleTop, visibleBottom);
+		}
 	}
 	if (_footer) {
 		_footer->validateSelectedIcon(
@@ -375,8 +401,16 @@ void StickersListWidget::checkVisibleFeatured(
 	}
 
 	const auto rowHeight = featuredRowHeight();
-	const auto destroyAbove = floorclamp(visibleTop - visibleHeight, rowHeight, 0, _officialSets.size());
-	const auto destroyBelow = ceilclamp(visibleBottom + visibleHeight, rowHeight, 0, _officialSets.size());
+	const auto destroyAbove = floorclamp(
+		visibleTop - visibleHeight,
+		rowHeight,
+		0,
+		_officialSets.size());
+	const auto destroyBelow = ceilclamp(
+		visibleBottom + visibleHeight,
+		rowHeight,
+		0,
+		_officialSets.size());
 	for (auto i = 0; i != destroyAbove; ++i) {
 		clearHeavyIn(_officialSets[i]);
 	}
@@ -423,14 +457,23 @@ void StickersListWidget::readVisibleFeatured(
 		int visibleTop,
 		int visibleBottom) {
 	const auto rowHeight = featuredRowHeight();
-	const auto rowFrom = floorclamp(visibleTop, rowHeight, 0, _featuredSetsCount);
-	const auto rowTo = ceilclamp(visibleBottom, rowHeight, 0, _featuredSetsCount);
+	const auto rowFrom = floorclamp(
+		visibleTop,
+		rowHeight,
+		0,
+		_featuredSetsCount);
+	const auto rowTo = ceilclamp(
+		visibleBottom,
+		rowHeight,
+		0,
+		_featuredSetsCount);
 	for (auto i = rowFrom; i < rowTo; ++i) {
 		auto &set = _officialSets[i];
 		if (!(set.flags & SetFlag::Unread)) {
 			continue;
 		}
-		if (i * rowHeight < visibleTop || (i + 1) * rowHeight > visibleBottom) {
+		if (i * rowHeight < visibleTop
+			|| (i + 1) * rowHeight > visibleBottom) {
 			continue;
 		}
 		int count = qMin(int(set.stickers.size()), _columnCount);
@@ -459,15 +502,21 @@ template <typename Callback>
 bool StickersListWidget::enumerateSections(Callback callback) const {
 	auto info = SectionInfo();
 	info.top = _search ? _search->height() : 0;
+	info.top += searchShortcutsHeight();
 	const auto &sets = shownSets();
 	for (auto i = 0; i != sets.size(); ++i) {
 		auto &set = sets[i];
 		info.section = i;
 		info.count = set.stickers.size();
+		const auto firstAfterShortcuts = !i
+			&& searchShortcutsShown()
+			&& !searchShortcutSelected();
 		const auto titleSkip = set.externalLayout
 			? st::stickersTrendingHeader
 			: setHasTitle(set)
 			? st().header
+			: firstAfterShortcuts
+			? st::stickerPanFirstAfterShortcutsSkip
 			: st::stickerPanPadding;
 		info.rowsTop = info.top + titleSkip;
 		if (set.externalLayout) {
@@ -475,10 +524,15 @@ bool StickersListWidget::enumerateSections(Callback callback) const {
 			info.rowsBottom = info.top + featuredRowHeight();
 		} else if (set.id == Data::Stickers::MegagroupSetId && !info.count) {
 			info.rowsCount = 0;
-			info.rowsBottom = info.rowsTop + _megagroupSetButtonRect.y() + _megagroupSetButtonRect.height() + st::stickerGroupCategoryAddMargin.bottom();
+			info.rowsBottom = info.rowsTop
+				+ _megagroupSetButtonRect.y()
+				+ _megagroupSetButtonRect.height()
+				+ st::stickerGroupCategoryAddMargin.bottom();
 		} else {
-			info.rowsCount = (info.count / _columnCount) + ((info.count % _columnCount) ? 1 : 0);
-			info.rowsBottom = info.rowsTop + info.rowsCount * _singleSize.height();
+			info.rowsCount = (info.count / _columnCount)
+				+ ((info.count % _columnCount) ? 1 : 0);
+			info.rowsBottom = info.rowsTop
+				+ info.rowsCount * _singleSize.height();
 		}
 		if (!callback(info)) {
 			return false;
@@ -488,11 +542,13 @@ bool StickersListWidget::enumerateSections(Callback callback) const {
 	return true;
 }
 
-StickersListWidget::SectionInfo StickersListWidget::sectionInfo(int section) const {
+StickersListWidget::SectionInfo StickersListWidget::sectionInfo(
+		int section) const {
 	Expects(section >= 0 && section < shownSets().size());
 
 	auto result = SectionInfo();
-	enumerateSections([searchForSection = section, &result](const SectionInfo &info) {
+	enumerateSections([searchForSection = section, &result](
+			const SectionInfo &info) {
 		if (info.section == searchForSection) {
 			result = info;
 			return false;
@@ -502,10 +558,12 @@ StickersListWidget::SectionInfo StickersListWidget::sectionInfo(int section) con
 	return result;
 }
 
-StickersListWidget::SectionInfo StickersListWidget::sectionInfoByOffset(int yOffset) const {
+StickersListWidget::SectionInfo StickersListWidget::sectionInfoByOffset(
+		int yOffset) const {
 	auto result = SectionInfo();
 	enumerateSections([this, &result, yOffset](const SectionInfo &info) {
-		if (yOffset < info.rowsBottom || info.section == shownSets().size() - 1) {
+		if (yOffset < info.rowsBottom
+			|| info.section == shownSets().size() - 1) {
 			result = info;
 			return false;
 		}
@@ -521,7 +579,8 @@ int StickersListWidget::countDesiredHeight(int newWidth) {
 	if (newWidth < 2 * minSize) {
 		return 0;
 	}
-	auto availableWidth = newWidth - (st::stickerPanPadding - st().margin.left());
+	auto availableWidth = newWidth
+		- (st::stickerPanPadding - st().margin.left());
 	auto columnCount = availableWidth / minSize;
 	auto singleWidth = availableWidth / columnCount;
 	auto fullWidth = (st().margin.left() + newWidth + st::emojiScroll.width);
@@ -533,6 +592,7 @@ int StickersListWidget::countDesiredHeight(int newWidth) {
 		- st().margin.left();
 	_singleSize = QSize(singleWidth, singleWidth);
 	setColumnCount(columnCount);
+	refreshSearchShortcutsScroll(newWidth);
 
 	auto visibleHeight = minimalHeight();
 	auto minimalHeight = (visibleHeight - st::stickerPanPadding);
@@ -553,38 +613,75 @@ int StickersListWidget::countDesiredHeight(int newWidth) {
 }
 
 void StickersListWidget::sendSearchRequest() {
-	if (_searchRequestId || _searchNextQuery.isEmpty() || _isEffects) {
+	if (_searchNextQuery.isEmpty() || _isEffects) {
 		return;
 	}
-
 	_searchRequestTimer.cancel();
 	_searchQuery = _searchNextQuery;
 
-	auto it = _searchCache.find(_searchQuery);
-	if (it != _searchCache.cend()) {
+	if (_searchQuery == Ui::PremiumGroupFakeEmoticon()) {
 		toggleSearchLoading(false);
+		_searchSetsCache.emplace(_searchQuery, std::vector<uint64>());
+		_searchStickersCache.emplace(_searchQuery, std::vector<DocumentId>());
+		showSearchResults();
 		return;
 	}
-	toggleSearchLoading(true);
-	if (_searchQuery == Ui::PremiumGroupFakeEmoticon()) {
+
+	const auto stickersCached = (_searchStickersCache.find(_searchQuery)
+		!= _searchStickersCache.cend());
+	const auto setsCached = (_searchSetsCache.find(_searchQuery)
+		!= _searchSetsCache.cend());
+	if (stickersCached && setsCached) {
 		toggleSearchLoading(false);
-		_searchRequestId = 0;
-		_searchCache.emplace(_searchQuery, std::vector<uint64>());
-		showSearchResults();
 		return;
 	}
+	toggleSearchLoading(true);
+	if (!stickersCached && !_searchStickersRequestId) {
+		requestSearchStickers(_searchQuery, 0, true);
+	}
+	if (!setsCached && !_searchSetsRequestId) {
+		sendSearchSetsRequest(_searchQuery);
+	}
+}
 
+void StickersListWidget::sendSearchSetsRequest(const QString &query) {
 	const auto hash = uint64(0);
-	_searchRequestId = _api.request(MTPmessages_SearchStickerSets(
+	_searchSetsRequestId = _api.request(MTPmessages_SearchStickerSets(
 		MTP_flags(0),
-		MTP_string(_searchQuery),
+		MTP_string(query),
 		MTP_long(hash)
 	)).done([=](const MTPmessages_FoundStickerSets &result) {
-		searchResultsDone(result);
+		searchResultsDone(query, result);
 	}).fail([=] {
-		// show error?
-		toggleSearchLoading(false);
-		_searchRequestId = 0;
+		_searchSetsRequestId = 0;
+		_searchSetsCache.emplace(query, std::vector<uint64>());
+		if (_searchNextQuery == query && !_searchStickersRequestId) {
+			toggleSearchLoading(false);
+		}
+	}).handleAllErrors().send();
+}
+
+void StickersListWidget::requestSearchStickers(
+		const QString &query,
+		int offset,
+		bool isInitial) {
+	const auto hash = uint64(0);
+	_searchStickersRequestId = _api.request(MTPmessages_SearchStickers(
+		MTP_flags(0),
+		MTP_string(query),
+		MTPstring(), // emoticon
+		MTP_vector<MTPstring>(SearchStickersLangCodes()),
+		MTP_int(offset),
+		MTP_int(50),
+		MTP_long(hash)
+	)).done([=](const MTPmessages_FoundStickers &result) {
+		searchStickersResultsDone(query, offset, isInitial, result);
+	}).fail([=] {
+		_searchStickersRequestId = 0;
+		_searchStickersCache.emplace(query, std::vector<DocumentId>());
+		if (_searchNextQuery == query && !_searchSetsRequestId) {
+			toggleSearchLoading(false);
+		}
 	}).handleAllErrors().send();
 }
 
@@ -610,30 +707,47 @@ void StickersListWidget::searchForSets(
 	}
 	if (_searchQuery != cleaned) {
 		toggleSearchLoading(false);
-		if (const auto requestId = base::take(_searchRequestId)) {
+		if (const auto requestId = base::take(_searchSetsRequestId)) {
 			_api.request(requestId).cancel();
 		}
-		if (_searchCache.find(cleaned) != _searchCache.cend()) {
+		if (const auto requestId = base::take(_searchStickersRequestId)) {
+			_api.request(requestId).cancel();
+		}
+		if (_searchStickersCache.find(cleaned) != _searchStickersCache.cend()
+			&& _searchSetsCache.find(cleaned) != _searchSetsCache.cend()) {
 			_searchRequestTimer.cancel();
 			_searchQuery = _searchNextQuery = cleaned;
 		} else {
 			_searchNextQuery = cleaned;
 			_searchRequestTimer.callOnce(kSearchRequestDelay);
 		}
+		_searchSelectedSetId = 0;
+		_searchShortcutsScroll = 0;
+		_searchShortcutsDragging = false;
 		showSearchResults();
 	}
 }
 
 void StickersListWidget::cancelSetsSearch() {
 	toggleSearchLoading(false);
-	if (const auto requestId = base::take(_searchRequestId)) {
+	if (const auto requestId = base::take(_searchSetsRequestId)) {
+		_api.request(requestId).cancel();
+	}
+	if (const auto requestId = base::take(_searchStickersRequestId)) {
 		_api.request(requestId).cancel();
 	}
 	_searchRequestTimer.cancel();
 	_searchQuery = _searchNextQuery = QString();
 	_filteredStickers.clear();
 	_filterStickersCornerEmoji.clear();
-	_searchCache.clear();
+	_searchSetsCache.clear();
+	_searchStickersCache.clear();
+	_searchStickersNextOffset.clear();
+	_searchShortcutSets.clear();
+	_searchSelectedSetId = 0;
+	_searchShortcutsScroll = 0;
+	_searchShortcutsScrollMax = 0;
+	_searchShortcutsDragging = false;
 	refreshSearchRows(nullptr);
 }
 
@@ -643,8 +757,8 @@ void StickersListWidget::showSearchResults() {
 }
 
 void StickersListWidget::refreshSearchRows() {
-	auto it = _searchCache.find(_searchQuery);
-	auto sets = (it != end(_searchCache))
+	auto it = _searchSetsCache.find(_searchNextQuery);
+	auto sets = (it != end(_searchSetsCache))
 		? &it->second
 		: nullptr;
 	refreshSearchRows(sets);
@@ -656,15 +770,42 @@ void StickersListWidget::refreshSearchRows(
 
 	const auto wasSection = _section;
 	auto wasSets = base::take(_searchSets);
+	auto wasShortcuts = base::take(_searchShortcutSets);
 	const auto guard = gsl::finally([&] {
 		if (_section == wasSection && _section == Section::Search) {
 			takeHeavyData(_searchSets, wasSets);
+			takeHeavyData(_searchShortcutSets, wasShortcuts);
+			auto indices = base::flat_map<uint64, int>();
+			indices.reserve(wasShortcuts.size());
+			auto index = 0;
+			for (const auto &set : wasShortcuts) {
+				indices.emplace(set.id, index++);
+			}
+			for (auto &set : _searchShortcutSets) {
+				const auto i = indices.find(set.id);
+				if (i != end(indices)) {
+					set.ripple = std::move(wasShortcuts[i->second].ripple);
+				}
+			}
 		}
 	});
 
-	fillFilteredStickersRow();
+	const auto foundStickersIt = _searchStickersCache.find(_searchNextQuery);
+	const auto hasCloudFoundStickers = true
+		&& (foundStickersIt != _searchStickersCache.end())
+		&& !foundStickersIt->second.empty();
+
 	if (!_isEffects) {
-		fillLocalSearchRows(_searchNextQuery);
+		refreshSearchShortcuts(_searchNextQuery, cloudSets);
+	}
+	if (searchShortcutSelected()) {
+		fillSelectedSearchShortcut();
+	}
+	if (!searchShortcutSelected()) {
+		fillFilteredStickersRow();
+		if (hasCloudFoundStickers) {
+			fillFoundStickersRow(foundStickersIt->second);
+		}
 	}
 	if (!cloudSets && _searchNextQuery.isEmpty()) {
 		showStickerSet(!_mySets.empty()
@@ -674,9 +815,6 @@ void StickersListWidget::refreshSearchRows(
 	}
 
 	setSection(Section::Search);
-	if (!_isEffects && cloudSets) {
-		fillCloudSearchRows(*cloudSets);
-	}
 	refreshIcons(ValidateIconAnimations::Scroll);
 	_lastMousePosition = QCursor::pos();
 
@@ -689,49 +827,258 @@ rpl::producer<int> StickersListWidget::recentShownCount() const {
 	return _recentShownCount.value();
 }
 
-void StickersListWidget::fillLocalSearchRows(const QString &query) {
+void StickersListWidget::refreshSearchShortcuts(
+		const QString &query,
+		const std::vector<uint64> *cloudSets) {
+	fillLocalSearchShortcuts(query);
+	if (cloudSets) {
+		const auto &sets = session().data().stickers().sets();
+		for (const auto setId : *cloudSets) {
+			if (const auto it = sets.find(setId); it != sets.end()) {
+				addSearchShortcut(it->second.get());
+			}
+		}
+	}
+	if (_searchSelectedSetId
+		&& !ranges::contains(
+			_searchShortcutSets,
+			_searchSelectedSetId,
+			&Set::id)) {
+		_searchSelectedSetId = 0;
+	}
+	refreshSearchShortcutsScroll(width());
+}
+
+void StickersListWidget::fillLocalSearchShortcuts(const QString &query) {
 	const auto searchWordsList = TextUtilities::PrepareSearchWords(query);
 	if (searchWordsList.isEmpty()) {
 		return;
 	}
-	auto searchWordInTitle = [](
-			const QStringList &titleWords,
-			const QString &searchWord) {
-		for (const auto &titleWord : titleWords) {
-			if (titleWord.startsWith(searchWord)) {
-				return true;
-			}
+	const auto &sets = session().data().stickers().sets();
+	for (const auto &[setId, titleWords] : _searchIndex) {
+		if (!MatchAllPreparedSearchWords(titleWords, searchWordsList)) {
+			continue;
+		} else if (const auto it = sets.find(setId); it != sets.end()) {
+			addSearchShortcut(it->second.get());
 		}
+	}
+}
+
+bool StickersListWidget::addSearchShortcut(not_null<StickersSet*> set) {
+	if (ranges::contains(_searchShortcutSets, set->id, &Set::id)) {
 		return false;
-	};
-	auto allSearchWordsInTitle = [&](
-			const QStringList &titleWords) {
-		for (const auto &searchWord : searchWordsList) {
-			if (!searchWordInTitle(titleWords, searchWord)) {
-				return false;
-			}
-		}
-		return true;
-	};
+	}
+	const auto skipPremium = !session().premiumPossible();
+	auto elements = PrepareStickers(
+		set->stickers.empty() ? set->covers : set->stickers,
+		skipPremium);
+	if (elements.empty()) {
+		return false;
+	}
+	_searchShortcutSets.emplace_back(
+		set->id,
+		set,
+		set->flags,
+		set->title,
+		set->shortName,
+		set->count,
+		false,
+		std::move(elements));
+	_searchShortcutSets.back().thumbnailDocument
+		= set->lookupThumbnailDocument();
+	return true;
+}
 
+void StickersListWidget::fillSelectedSearchShortcut() {
 	const auto &sets = session().data().stickers().sets();
-	for (const auto &[setId, titleWords] : _searchIndex) {
-		if (allSearchWordsInTitle(titleWords)) {
-			if (const auto it = sets.find(setId); it != sets.end()) {
-				addSearchRow(it->second.get());
+	const auto it = sets.find(_searchSelectedSetId);
+	if (it == sets.end()) {
+		_searchSelectedSetId = 0;
+		return;
+	}
+	const auto set = it->second.get();
+	const auto skipPremium = !session().premiumPossible();
+	auto elements = PrepareStickers(
+		set->stickers.empty() ? set->covers : set->stickers,
+		skipPremium);
+	if (elements.empty()) {
+		_searchSelectedSetId = 0;
+		return;
+	}
+	_searchSets.emplace_back(
+		set->id,
+		set,
+		set->flags | SetFlag::Special,
+		tr::lng_stickers_count(tr::now, lt_count, set->count),
+		set->shortName,
+		set->count,
+		false,
+		std::move(elements));
+}
+
+bool StickersListWidget::searchShortcutsShown() const {
+	return (_section == Section::Search) && !_searchShortcutSets.empty();
+}
+
+bool StickersListWidget::searchShortcutSelected() const {
+	return _searchSelectedSetId != 0;
+}
+
+void StickersListWidget::startSearchSwapAnimation(
+		Fn<void()> change,
+		bool packToPack) {
+	if (!isVisible() || size().isEmpty()) {
+		change();
+		return;
+	}
+	const auto top = searchShortcutsTop()
+		+ (packToPack ? searchShortcutsHeight() : 0);
+	const auto computeRect = [&] {
+		const auto bottom = std::max(top + 1, getVisibleBottom());
+		return QRect(0, top, width(), bottom - top);
+	};
+	_searchSwapAnimation.stop();
+	const auto wasSelected = searchShortcutSelected();
+	_searchSwapBefore = Ui::GrabWidget(this, computeRect());
+	_searchSwapTop = top;
+	_searchSwapPartial = packToPack;
+	change();
+	_searchSwapReverse = wasSelected && !searchShortcutSelected();
+	_searchSwapAfter = Ui::GrabWidget(this, computeRect());
+	_searchSwapAnimation.start(
+		[=, this] {
+			update();
+			if (!_searchSwapAnimation.animating()) {
+				_searchSwapBefore = QPixmap();
+				_searchSwapAfter = QPixmap();
 			}
-		}
+		},
+		0.,
+		1.,
+		st().searchSwapDuration,
+		anim::sineInOut);
+}
+
+int StickersListWidget::searchShortcutsTop() const {
+	return _search ? _search->height() : 0;
+}
+
+int StickersListWidget::searchShortcutsHeight() const {
+	if (!searchShortcutsShown()) {
+		return 0;
 	}
+	auto result = st().searchPacksTop
+		+ st().searchPackHeight
+		+ st().searchPacksBottom;
+	result += searchShortcutSelected()
+		? st().searchBackHeight
+		: st().searchResultsHeight;
+	return result;
 }
 
-void StickersListWidget::fillCloudSearchRows(
-		const std::vector<uint64> &cloudSets) {
-	const auto &sets = session().data().stickers().sets();
-	for (const auto setId : cloudSets) {
-		if (const auto it = sets.find(setId); it != sets.end()) {
-			addSearchRow(it->second.get());
+QRect StickersListWidget::searchBackRect() const {
+	return QRect(
+		0,
+		searchShortcutsTop(),
+		width(),
+		searchShortcutSelected() ? st().searchBackHeight : 0);
+}
+
+QRect StickersListWidget::searchShortcutRect(int index) const {
+	Expects(index >= 0 && index < int(_searchShortcutSets.size()));
+
+	const auto left = st().headerLeft
+		- st().margin.left()
+		- _searchShortcutsScroll
+		+ index * (st().searchPackWidth + st().searchPackSkip);
+	const auto top = searchShortcutsTop()
+		+ (searchShortcutSelected() ? st().searchBackHeight : 0)
+		+ st().searchPacksTop;
+	return QRect(
+		left,
+		top,
+		st().searchPackWidth,
+		st().searchPackHeight);
+}
+
+void StickersListWidget::refreshSearchShortcutsScroll(int newWidth) {
+	if (_searchShortcutSets.empty()) {
+		_searchShortcutsScroll = 0;
+		_searchShortcutsScrollMax = 0;
+		return;
+	}
+	const auto count = int(_searchShortcutSets.size());
+	const auto full = st().headerLeft
+		- st().margin.left()
+		+ count * st().searchPackWidth
+		+ std::max(count - 1, 0) * st().searchPackSkip
+		+ st().margin.right();
+	_searchShortcutsScrollMax = std::max(full - newWidth, 0);
+	scrollSearchShortcutsTo(_searchShortcutsScroll);
+}
+
+void StickersListWidget::scrollSearchShortcutsTo(int value) {
+	const auto scroll = std::clamp(
+		value,
+		0,
+		_searchShortcutsScrollMax);
+	if (_searchShortcutsScroll == scroll) {
+		return;
+	}
+	_searchShortcutsScroll = scroll;
+	update(0, searchShortcutsTop(), width(), searchShortcutsHeight());
+}
+
+void StickersListWidget::toggleSearchShortcut(int index) {
+	if (index < 0 || index >= int(_searchShortcutSets.size())) {
+		return;
+	}
+	const auto setId = _searchShortcutSets[index].id;
+	const auto target = (_searchSelectedSetId == setId) ? 0 : setId;
+	const auto packToPack = _searchSelectedSetId
+		&& target
+		&& _searchSelectedSetId != target;
+	startSearchSwapAnimation([=, this] {
+		_searchSelectedSetId = target;
+		showSearchResults();
+	}, packToPack);
+}
+
+void StickersListWidget::backToSearchResults() {
+	if (!_searchSelectedSetId) {
+		return;
+	}
+	startSearchSwapAnimation([=, this] {
+		_searchSelectedSetId = 0;
+		showSearchResults();
+	});
+}
+
+void StickersListWidget::fillFoundStickersRow(
+		const std::vector<DocumentId> &stickerIds) {
+	if (stickerIds.empty()) {
+		return;
+	}
+	auto elements = std::vector<Sticker>();
+	elements.reserve(stickerIds.size());
+	for (const auto id : stickerIds) {
+		if (const auto document = session().data().document(id)) {
+			elements.push_back(Sticker{ document });
 		}
 	}
+	if (elements.empty()) {
+		return;
+	}
+
+	_searchSets.emplace_back(
+		SearchEmojiSectionSetId(),
+		nullptr,
+		Data::StickersSetFlag::Special,
+		QString(),
+		QString(),
+		elements.size(),
+		false, // externalLayout
+		std::move(elements));
 }
 
 void StickersListWidget::fillFilteredStickersRow() {
@@ -755,26 +1102,14 @@ void StickersListWidget::fillFilteredStickersRow() {
 		std::move(elements));
 }
 
-void StickersListWidget::addSearchRow(not_null<StickersSet*> set) {
-	const auto skipPremium = !session().premiumPossible();
-	auto elements = PrepareStickers(
-		set->stickers.empty() ? set->covers : set->stickers,
-		skipPremium);
-	_searchSets.emplace_back(
-		set->id,
-		set,
-		set->flags,
-		set->title,
-		set->shortName,
-		set->count,
-		!SetInMyList(set->flags),
-		std::move(elements));
-}
-
 void StickersListWidget::toggleSearchLoading(bool loading) {
 	if (_search) {
 		_search->setLoading(loading);
 	}
+	if (_searchLoading != loading) {
+		_searchLoading = loading;
+		update();
+	}
 }
 
 void StickersListWidget::takeHeavyData(
@@ -823,7 +1158,7 @@ void StickersListWidget::takeHeavyData(Set &to, Set &from) {
 			}
 		}
 		for (const auto &sticker : fromList) {
-			if (sticker.lottie) {
+			if (sticker.lottie && to.lottiePlayer) {
 				to.lottiePlayer->remove(sticker.lottie);
 			}
 		}
@@ -856,34 +1191,144 @@ auto StickersListWidget::shownSets() -> std::vector<Set> & {
 	Unexpected("Section in StickersListWidget.");
 }
 
-void StickersListWidget::searchResultsDone(
-		const MTPmessages_FoundStickerSets &result) {
-	toggleSearchLoading(false);
-	_searchRequestId = 0;
+void StickersListWidget::searchStickersResultsDone(
+		const QString &query,
+		int requestedOffset,
+		bool isInitial,
+		const MTPmessages_FoundStickers &result) {
+	_searchStickersRequestId = 0;
+	const auto active = (_searchNextQuery == query);
+	const auto finishLoading = [&] {
+		if (active && !_searchSetsRequestId) {
+			toggleSearchLoading(false);
+		}
+	};
 
-	if (result.type() == mtpc_messages_foundStickerSetsNotModified) {
-		LOG(("API Error: "
-			"messages.foundStickerSetsNotModified not expected."));
+	result.match([&](const MTPDmessages_foundStickersNotModified &data) {
+		LOG(("API: messages.foundStickersNotModified."));
+		if (const auto next = data.vnext_offset()) {
+			if (next->v > requestedOffset) {
+				_searchStickersNextOffset[query] = next->v;
+			} else {
+				_searchStickersNextOffset.erase(query);
+			}
+		} else {
+			_searchStickersNextOffset.erase(query);
+		}
+		_searchStickersCache.emplace(query, std::vector<DocumentId>());
+		if (!active) {
+			return;
+		}
+		finishLoading();
+		if (isInitial) {
+			showSearchResults();
+		} else {
+			refreshSearchRows();
+		}
+		checkPaginateSearchStickers(
+			getVisibleTop(),
+			getVisibleBottom());
+	}, [&](const MTPDmessages_foundStickers &data) {
+		auto it = _searchStickersCache.find(query);
+		if (it == _searchStickersCache.cend()) {
+			it = _searchStickersCache.emplace(
+				query,
+				std::vector<DocumentId>()).first;
+		}
+
+		for (const auto &sticker : data.vstickers().v) {
+			if (const auto doc = session().data().processDocument(sticker)) {
+				it->second.push_back(doc->id);
+			}
+		}
+
+		if (const auto next = data.vnext_offset()) {
+			if (next->v > requestedOffset) {
+				_searchStickersNextOffset[query] = next->v;
+			} else {
+				_searchStickersNextOffset.erase(query);
+			}
+		} else {
+			_searchStickersNextOffset.erase(query);
+		}
+
+		if (!active) {
+			return;
+		}
+		finishLoading();
+		if (isInitial) {
+			showSearchResults();
+		} else {
+			refreshSearchRows();
+		}
+		checkPaginateSearchStickers(
+			getVisibleTop(),
+			getVisibleBottom());
+	});
+}
+
+void StickersListWidget::loadMoreSearchStickers() {
+	if (_searchStickersRequestId
+		|| _searchQuery.isEmpty()
+		|| _isEffects
+		|| (_searchQuery != _searchNextQuery)) {
+		return;
+	}
+	const auto query = _searchQuery;
+	const auto offsetIt = _searchStickersNextOffset.find(query);
+	if (offsetIt == _searchStickersNextOffset.end()) {
 		return;
 	}
+	requestSearchStickers(query, offsetIt->second, false);
+}
 
-	Assert(result.type() == mtpc_messages_foundStickerSets);
+void StickersListWidget::checkPaginateSearchStickers(
+		int visibleTop,
+		int visibleBottom) {
+	if (_section != Section::Search
+		|| _searchQuery.isEmpty()
+		|| (_searchQuery != _searchNextQuery)
+		|| _searchStickersRequestId) {
+		return;
+	}
+	const auto visibleHeight = visibleBottom - visibleTop;
+	if (visibleHeight <= 0) {
+		return;
+	}
+	if (visibleBottom > height() - visibleHeight * kPreloadOfficialPages) {
+		loadMoreSearchStickers();
+	}
+}
 
-	auto it = _searchCache.find(_searchQuery);
-	if (it == _searchCache.cend()) {
-		it = _searchCache.emplace(
-			_searchQuery,
-			std::vector<uint64>()).first;
+void StickersListWidget::searchResultsDone(
+		const QString &query,
+		const MTPmessages_FoundStickerSets &result) {
+	_searchSetsRequestId = 0;
+	if (_searchNextQuery == query && !_searchStickersRequestId) {
+		toggleSearchLoading(false);
 	}
-	auto &d = result.c_messages_foundStickerSets();
-	for (const auto &data : d.vsets().v) {
-		const auto set = session().data().stickers().feedSet(data);
-		if (set->stickers.empty() && set->covers.empty()) {
-			continue;
+
+	result.match([&](const MTPDmessages_foundStickerSetsNotModified &data) {
+		LOG(("API Error: "
+			"messages.foundStickerSetsNotModified not expected."));
+	}, [&](const MTPDmessages_foundStickerSets &data) {
+		auto it = _searchSetsCache.find(query);
+		if (it == _searchSetsCache.cend()) {
+			it = _searchSetsCache.emplace(
+				query,
+				std::vector<uint64>()).first;
+		}
+		for (const auto &setData : data.vsets().v) {
+			const auto set = session().data().stickers().feedSet(setData);
+			if (set->stickers.empty() && set->covers.empty()) {
+				continue;
+			}
+			it->second.push_back(set->id);
 		}
-		it->second.push_back(set->id);
-	}
-	showSearchResults();
+		if (_searchNextQuery == query) {
+			showSearchResults();
+		}
+	});
 }
 
 int StickersListWidget::stickersLeft() const {
@@ -891,14 +1336,16 @@ int StickersListWidget::stickersLeft() const {
 }
 
 QRect StickersListWidget::stickerRect(int section, int sel) {
-	auto info = sectionInfo(section);
+	const auto info = sectionInfo(section);
 	if (sel >= shownSets()[section].stickers.size()) {
 		sel -= shownSets()[section].stickers.size();
 	}
-	auto countTillItem = (sel - (sel % _columnCount));
-	auto rowsToSkip = (countTillItem / _columnCount) + ((countTillItem % _columnCount) ? 1 : 0);
-	auto x = stickersLeft() + ((sel % _columnCount) * _singleSize.width());
-	auto y = info.rowsTop + rowsToSkip * _singleSize.height();
+	const auto countTillItem = (sel - (sel % _columnCount));
+	const auto rowsToSkip = (countTillItem / _columnCount)
+		+ ((countTillItem % _columnCount) ? 1 : 0);
+	const auto x = stickersLeft()
+		+ ((sel % _columnCount) * _singleSize.width());
+	const auto y = info.rowsTop + rowsToSkip * _singleSize.height();
 	return QRect(QPoint(x, y), _singleSize);
 }
 
@@ -909,12 +1356,189 @@ void StickersListWidget::paintEvent(QPaintEvent *e) {
 		p.fillRect(clip, st().bg);
 	}
 
+	if (_searchSwapAnimation.animating()) {
+		if (_searchSwapPartial) {
+			paintStickers(p, clip);
+		}
+		const auto progress = _searchSwapAnimation.value(1.);
+		const auto direction = _searchSwapReverse ? -1 : 1;
+		const auto slide = st().searchBackHeight;
+		p.setOpacity(1. - progress);
+		p.drawPixmap(
+			0,
+			_searchSwapTop + direction * int(base::SafeRound(slide * progress)),
+			_searchSwapBefore);
+		p.setOpacity(progress);
+		p.drawPixmap(
+			0,
+			_searchSwapTop - direction * int(base::SafeRound(slide * (1. - progress))),
+			_searchSwapAfter);
+		p.setOpacity(1.);
+		return;
+	}
 	paintStickers(p, clip);
 }
 
+void StickersListWidget::paintSearchShortcuts(Painter &p, QRect clip) {
+	if (!searchShortcutsShown()
+		|| clip.bottom() < searchShortcutsTop()
+		|| clip.top() >= searchShortcutsTop() + searchShortcutsHeight()) {
+		return;
+	}
+	const auto back = searchBackRect();
+	if (back.height() > 0) {
+		const auto selected = std::get_if<OverSearchBack>(
+			!v::is_null(_pressed) ? &_pressed : &_selected);
+		const auto &icon = selected
+			? st().search.back.iconOver
+			: st().search.back.icon;
+		icon.paint(
+			p,
+			st().searchBackIconLeft,
+			back.y() + st().searchBackIconTop,
+			width());
+		const auto text = tr::lng_search_back_to_results(tr::now);
+		const auto &font = st::emojiPanHeaderFont;
+		const auto available = width()
+			- st().searchBackTextLeft
+			- st().margin.right();
+		auto shown = text;
+		auto textWidth = font->width(shown);
+		if (textWidth > available) {
+			shown = font->elided(shown, available);
+			textWidth = font->width(shown);
+		}
+		p.setFont(font);
+		p.setPen(st().headerFg);
+		p.drawTextLeft(
+			st().searchBackTextLeft,
+			back.y() + st().searchBackTextTop,
+			width(),
+			shown,
+			textWidth);
+	}
+
+	const auto selectedShortcut = std::get_if<OverSearchShortcut>(
+		!v::is_null(_pressed) ? &_pressed : &_selected);
+	p.save();
+	p.setClipRect(
+		QRect(
+			0,
+			searchShortcutsTop() + back.height(),
+			width(),
+			st().searchPacksTop
+				+ st().searchPackHeight
+				+ st().searchPacksBottom),
+		Qt::IntersectClip);
+	for (auto i = 0, count = int(_searchShortcutSets.size()); i != count; ++i) {
+		auto &set = _searchShortcutSets[i];
+		const auto rect = searchShortcutRect(i);
+		if (!rect.intersects(clip)) {
+			continue;
+		}
+		const auto selected = (set.id == _searchSelectedSetId)
+			|| (selectedShortcut && selectedShortcut->index == i);
+		if (selected) {
+			_overBg.paint(p, myrtlrect(rect));
+		}
+		if (set.ripple) {
+			set.ripple->paint(
+				p,
+				myrtlrect(rect).x(),
+				rect.y(),
+				width());
+			if (set.ripple->empty()) {
+				set.ripple.reset();
+			}
+		}
+		const auto icon = QRect(
+			rect.x() + (rect.width() - st().searchPackIconSize) / 2,
+			rect.y() + st().searchPackIconTop,
+			st().searchPackIconSize,
+			st().searchPackIconSize);
+		paintSearchShortcutIcon(p, set, icon);
+
+		const auto available = rect.width()
+			- 2 * st().searchPackTextPadding;
+		auto title = set.title;
+		auto titleWidth = st::normalFont->width(title);
+		if (titleWidth > available) {
+			title = st::normalFont->elided(title, available);
+			titleWidth = st::normalFont->width(title);
+		}
+		const auto titleLeft = (titleWidth < available)
+			? (rect.x() + (rect.width() - titleWidth) / 2)
+			: (rect.x() + st().searchPackTextPadding);
+		p.setFont(st::normalFont);
+		p.setPen(st().textFg);
+		p.drawTextLeft(
+			titleLeft,
+			rect.y() + st().searchPackTextTop,
+			width(),
+			title,
+			titleWidth);
+	}
+	p.restore();
+
+	if (!searchShortcutSelected()) {
+		const auto top = searchShortcutsTop()
+			+ st().searchPacksTop
+			+ st().searchPackHeight
+			+ st().searchPacksBottom;
+		p.setFont(st::emojiPanHeaderFont);
+		p.setPen(st().headerFg);
+		p.drawTextLeft(
+			st().headerLeft - st().margin.left(),
+			top + st().searchResultsTextTop,
+			width(),
+			tr::lng_search_results_header(tr::now));
+	}
+}
+
+void StickersListWidget::paintSearchShortcutIcon(
+		Painter &p,
+		Set &set,
+		QRect rect) {
+	if (set.stickers.empty()) {
+		return;
+	}
+	auto &sticker = set.stickers.front();
+	sticker.ensureMediaCreated();
+	const auto document = sticker.document;
+	const auto media = sticker.documentMedia.get();
+	media->thumbnailWanted(document->stickerSetOrigin());
+	media->checkStickerSmall();
+
+	const auto size = ComputeStickerSize(document, rect.size());
+	if (size.isEmpty()) {
+		return;
+	}
+	const auto point = rect.topLeft() + QPoint(
+		(rect.width() - size.width()) / 2,
+		(rect.height() - size.height()) / 2);
+	if (const auto image = media->getStickerSmall()) {
+		const auto pixmap = image->pixSingle(size, { .outer = size });
+		p.drawPixmapLeft(point, width(), pixmap);
+	} else {
+		PaintStickerThumbnailPath(
+			p,
+			media,
+			QRect(point, size),
+			_pathGradient.get());
+	}
+}
+
 void StickersListWidget::paintStickers(Painter &p, QRect clip) {
-	auto fromColumn = floorclamp(clip.x() - stickersLeft(), _singleSize.width(), 0, _columnCount);
-	auto toColumn = ceilclamp(clip.x() + clip.width() - stickersLeft(), _singleSize.width(), 0, _columnCount);
+	auto fromColumn = floorclamp(
+		clip.x() - stickersLeft(),
+		_singleSize.width(),
+		0,
+		_columnCount);
+	auto toColumn = ceilclamp(
+		clip.x() + clip.width() - stickersLeft(),
+		_singleSize.width(),
+		0,
+		_columnCount);
 	if (rtl()) {
 		qSwap(fromColumn, toColumn);
 		fromColumn = _columnCount - fromColumn;
@@ -923,18 +1547,28 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 
 	_paintAsPremium = session().premium();
 	_pathGradient->startFrame(0, width(), width() / 2);
+	paintSearchShortcuts(p, clip);
 
 	auto &sets = shownSets();
-	auto selectedSticker = std::get_if<OverSticker>(&_selected);
-	auto selectedButton = std::get_if<OverButton>(!v::is_null(_pressed)
+	const auto selectedSticker = std::get_if<OverSticker>(&_selected);
+	const auto selectedButton = std::get_if<OverButton>(!v::is_null(_pressed)
 		? &_pressed
 		: &_selected);
 
 	const auto now = crl::now();
 	const auto paused = On(PowerSaving::kStickersPanel)
 		|| this->paused();
-	if (sets.empty() && _section == Section::Search) {
-		paintEmptySearchResults(p);
+	if (sets.empty()
+		&& _searchShortcutSets.empty()
+		&& _section == Section::Search) {
+		const auto loading = _searchLoading || _searchRequestTimer.isActive();
+		Inner::paintEmptySearchResults(
+			p,
+			st::stickersEmpty,
+			loading
+				? tr::lng_contacts_loading(tr::now)
+				: tr::lng_stickers_nothing_found(tr::now),
+			loading);
 	}
 	const auto badgeText = tr::lng_stickers_creator_badge(tr::now);
 	const auto &badgeFont = st::stickersHeaderBadgeFont;
@@ -952,7 +1586,8 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 				? set.count
 				: loadedCount;
 
-			auto widthForTitle = stickersRight() - (st().headerLeft - st().margin.left());
+			auto widthForTitle = stickersRight()
+				- (st().headerLeft - st().margin.left());
 			{
 				const auto installedSet = !featuredHasAddButton(info.section);
 				const auto add = featuredAddRect(info, installedSet);
@@ -989,18 +1624,27 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 				widthForTitle -= add.width() - (st.width / 2);
 			}
 			if (set.flags & SetFlag::Unread) {
-				widthForTitle -= st::stickersFeaturedUnreadSize + st::stickersFeaturedUnreadSkip;
+				widthForTitle -= st::stickersFeaturedUnreadSize
+					+ st::stickersFeaturedUnreadSkip;
 			}
 
 			auto titleText = set.title;
-			auto titleWidth = st::stickersTrendingHeaderFont->width(titleText);
+			auto titleWidth = st::stickersTrendingHeaderFont->width(
+				titleText);
 			if (titleWidth > widthForTitle) {
-				titleText = st::stickersTrendingHeaderFont->elided(titleText, widthForTitle);
+				titleText = st::stickersTrendingHeaderFont->elided(
+					titleText,
+					widthForTitle);
 				titleWidth = st::stickersTrendingHeaderFont->width(titleText);
 			}
 			p.setFont(st::stickersTrendingHeaderFont);
 			p.setPen(st().trendingHeaderFg);
-			p.drawTextLeft(st().headerLeft - st().margin.left(), info.top + st::stickersTrendingHeaderTop, width(), titleText, titleWidth);
+			p.drawTextLeft(
+				st().headerLeft - st().margin.left(),
+				info.top + st::stickersTrendingHeaderTop,
+				width(),
+				titleText,
+				titleWidth);
 
 			if (set.flags & SetFlag::Unread) {
 				p.setPen(Qt::NoPen);
@@ -1008,26 +1652,56 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 
 				{
 					PainterHighQualityEnabler hq(p);
-					p.drawEllipse(style::rtlrect(st().headerLeft - st().margin.left() + titleWidth + st::stickersFeaturedUnreadSkip, info.top + st::stickersTrendingHeaderTop + st::stickersFeaturedUnreadTop, st::stickersFeaturedUnreadSize, st::stickersFeaturedUnreadSize, width()));
+					p.drawEllipse(
+						style::rtlrect(
+							st().headerLeft
+								- st().margin.left()
+								+ titleWidth
+								+ st::stickersFeaturedUnreadSkip,
+							info.top
+								+ st::stickersTrendingHeaderTop
+								+ st::stickersFeaturedUnreadTop,
+							st::stickersFeaturedUnreadSize,
+							st::stickersFeaturedUnreadSize, width()));
 				}
 			}
 
-			auto statusText = (count > 0) ? tr::lng_stickers_count(tr::now, lt_count, count) : tr::lng_contacts_loading(tr::now);
+			const auto statusText = (count > 0)
+				? tr::lng_stickers_count(tr::now, lt_count, count)
+				: tr::lng_contacts_loading(tr::now);
 			p.setFont(st::stickersTrendingSubheaderFont);
 			p.setPen(st().trendingSubheaderFg);
-			p.drawTextLeft(st().headerLeft - st().margin.left(), info.top + st::stickersTrendingSubheaderTop, width(), statusText);
+			p.drawTextLeft(
+				st().headerLeft - st().margin.left(),
+				info.top + st::stickersTrendingSubheaderTop,
+				width(),
+				statusText);
 
 			if (info.rowsTop >= clip.y() + clip.height()) {
 				return true;
 			}
 
-			for (int j = fromColumn; j < toColumn; ++j) {
-				int index = j;
-				if (index >= loadedCount) break;
+			for (auto j = fromColumn; j < toColumn; ++j) {
+				const auto index = j;
+				if (index >= loadedCount) {
+					break;
+				}
 
-				auto selected = selectedSticker ? (selectedSticker->section == info.section && selectedSticker->index == index) : false;
-				auto deleteSelected = false;
-				paintSticker(p, set, info.rowsTop, info.section, index, now, paused, selected, deleteSelected);
+				const auto selected = selectedSticker
+					? (selectedSticker->section == info.section
+						&& selectedSticker->index == index)
+					: false;
+				const auto deleteSelected = false;
+				paintSticker(
+					p,
+					set,
+					info.rowsTop,
+					info.section,
+					index,
+					now,
+					paused,
+					selected,
+					deleteSelected);
 			}
 			if (!paused) {
 				markLottieFrameShown(set);
@@ -1036,19 +1710,29 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 		}
 		if (setHasTitle(set) && clip.top() < info.rowsTop) {
 			auto titleText = set.title;
-			auto titleWidth = st::stickersTrendingHeaderFont->width(titleText);
-			auto widthForTitle = stickersRight() - (st().headerLeft - st().margin.left());
+			auto titleWidth = st::stickersTrendingHeaderFont->width(
+				titleText);
+			auto widthForTitle = stickersRight()
+				- (st().headerLeft - st().margin.left());
 			if (hasRemoveButton(info.section)) {
-				auto remove = removeButtonRect(info);
-				auto selected = selectedButton ? (selectedButton->section == info.section) : false;
+				const auto remove = removeButtonRect(info);
+				const auto selected = selectedButton
+					? (selectedButton->section == info.section)
+					: false;
 				const auto &removeSt = st().removeSet;
 				if (set.ripple) {
-					set.ripple->paint(p, remove.x() + removeSt.rippleAreaPosition.x(), remove.y() + removeSt.rippleAreaPosition.y(), width());
+					set.ripple->paint(
+						p,
+						remove.x() + removeSt.rippleAreaPosition.x(),
+						remove.y() + removeSt.rippleAreaPosition.y(),
+						width());
 					if (set.ripple->empty()) {
 						set.ripple.reset();
 					}
 				}
-				const auto &icon = selected ? removeSt.iconOver : removeSt.icon;
+				const auto &icon = selected
+					? removeSt.iconOver
+					: removeSt.icon;
 				icon.paint(
 					p,
 					remove.x() + (remove.width() - icon.width()) / 2,
@@ -1057,19 +1741,27 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 
 				widthForTitle -= remove.width();
 			}
-			const auto amCreator = (set.flags & Data::StickersSetFlag::AmCreator);
+			const auto amCreator
+				= (set.flags & Data::StickersSetFlag::AmCreator);
 			if (amCreator) {
 				widthForTitle -= badgeWidth
 					+ st::stickersFeaturedUnreadSkip
 					+ st::stickersHeaderBadgeFontSkip;
 			}
 			if (titleWidth > widthForTitle) {
-				titleText = st::stickersTrendingHeaderFont->elided(titleText, widthForTitle);
+				titleText = st::stickersTrendingHeaderFont->elided(
+					titleText,
+					widthForTitle);
 				titleWidth = st::stickersTrendingHeaderFont->width(titleText);
 			}
 			p.setFont(st::emojiPanHeaderFont);
 			p.setPen(st().headerFg);
-			p.drawTextLeft(st().headerLeft - st().margin.left(), info.top + st().headerTop, width(), titleText, titleWidth);
+			p.drawTextLeft(
+				st().headerLeft - st().margin.left(),
+				info.top + st().headerTop,
+				width(),
+				titleText,
+				titleWidth);
 			if (amCreator) {
 				const auto badgeLeft = st().headerLeft
 					- st().margin.left()
@@ -1106,21 +1798,46 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 		}
 		if (clip.top() + clip.height() <= info.rowsTop) {
 			return true;
-		} else if (set.id == Data::Stickers::MegagroupSetId && set.stickers.empty()) {
-			auto buttonSelected = (std::get_if<OverGroupAdd>(&_selected) != nullptr);
+		} else if (set.id == Data::Stickers::MegagroupSetId
+				&& set.stickers.empty()) {
+			const auto buttonSelected = (std::get_if<OverGroupAdd>(&_selected)
+				!= nullptr);
 			paintMegagroupEmptySet(p, info.rowsTop, buttonSelected);
 			return true;
 		}
-		auto fromRow = floorclamp(clip.y() - info.rowsTop, _singleSize.height(), 0, info.rowsCount);
-		auto toRow = ceilclamp(clip.y() + clip.height() - info.rowsTop, _singleSize.height(), 0, info.rowsCount);
-		for (int i = fromRow; i < toRow; ++i) {
-			for (int j = fromColumn; j < toColumn; ++j) {
-				int index = i * _columnCount + j;
-				if (index >= info.count) break;
+		const auto fromRow = floorclamp(
+			clip.y() - info.rowsTop,
+			_singleSize.height(),
+			0,
+			info.rowsCount);
+		const auto toRow = ceilclamp(
+			clip.y() + clip.height() - info.rowsTop,
+			_singleSize.height(),
+			0,
+			info.rowsCount);
+		for (auto i = fromRow; i < toRow; ++i) {
+			for (auto j = fromColumn; j < toColumn; ++j) {
+				const auto index = int(i * _columnCount + j);
+				if (index >= info.count) {
+					break;
+				}
 
-				auto selected = selectedSticker ? (selectedSticker->section == info.section && selectedSticker->index == index) : false;
-				auto deleteSelected = selected && selectedSticker->overDelete;
-				paintSticker(p, set, info.rowsTop, info.section, index, now, paused, selected, deleteSelected);
+				const auto selected = selectedSticker
+					? (selectedSticker->section == info.section
+						&& selectedSticker->index == index)
+					: false;
+				const auto deleteSelected = selected
+					&& selectedSticker->overDelete;
+				paintSticker(
+					p,
+					set,
+					info.rowsTop,
+					info.section,
+					index,
+					now,
+					paused,
+					selected,
+					deleteSelected);
 			}
 		}
 		if (!paused) {
@@ -1214,18 +1931,14 @@ void StickersListWidget::pauseInvisibleLottieIn(const SectionInfo &info) {
 	}
 }
 
-void StickersListWidget::paintEmptySearchResults(Painter &p) {
-	Inner::paintEmptySearchResults(
-		p,
-		st::stickersEmpty,
-		tr::lng_stickers_nothing_found(tr::now));
-}
-
 int StickersListWidget::megagroupSetInfoLeft() const {
 	return st().headerLeft - st().margin.left();
 }
 
-void StickersListWidget::paintMegagroupEmptySet(Painter &p, int y, bool buttonSelected) {
+void StickersListWidget::paintMegagroupEmptySet(
+		Painter &p,
+		int y,
+		bool buttonSelected) {
 	p.setPen(st().headerFg);
 
 	auto infoLeft = megagroupSetInfoLeft();
@@ -1242,8 +1955,15 @@ void StickersListWidget::paintMegagroupEmptySet(Painter &p, int y, bool buttonSe
 		}
 	}
 	p.setFont(st::stickerGroupCategoryAdd.style.font);
-	p.setPen(buttonSelected ? st::stickerGroupCategoryAdd.textFgOver : st::stickerGroupCategoryAdd.textFg);
-	p.drawTextLeft(button.x() - (st::stickerGroupCategoryAdd.width / 2), button.y() + st::stickerGroupCategoryAdd.textTop, width(), _megagroupSetButtonText, _megagroupSetButtonTextWidth);
+	p.setPen(buttonSelected
+		? st::stickerGroupCategoryAdd.textFgOver
+		: st::stickerGroupCategoryAdd.textFg);
+	p.drawTextLeft(
+		button.x() - (st::stickerGroupCategoryAdd.width / 2),
+		button.y() + st::stickerGroupCategoryAdd.textTop,
+		width(),
+		_megagroupSetButtonText,
+		_megagroupSetButtonTextWidth);
 }
 
 void StickersListWidget::ensureLottiePlayer(Set &set) {
@@ -1256,7 +1976,7 @@ void StickersListWidget::ensureLottiePlayer(Set &set) {
 	const auto raw = set.lottiePlayer.get();
 
 	raw->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto &sets = shownSets();
 		enumerateSections([&](const SectionInfo &info) {
 			if (sets[info.section].lottiePlayer.get() != raw) {
@@ -1457,12 +2177,17 @@ void StickersListWidget::paintSticker(
 		setupWebm(set, section, index);
 	}
 
-	int row = (index / _columnCount), col = (index % _columnCount);
+	const auto row = int((index / _columnCount));
+	const auto col = int(index % _columnCount);
 
-	auto pos = QPoint(stickersLeft() + col * _singleSize.width(), y + row * _singleSize.height());
+	const auto pos = QPoint(
+		stickersLeft() + col * _singleSize.width(),
+		y + row * _singleSize.height());
 	if (selected) {
 		auto tl = pos;
-		if (rtl()) tl.setX(width() - tl.x() - _singleSize.width());
+		if (rtl()) {
+			tl.setX(width() - tl.x() - _singleSize.width());
+		}
 		_overBg.paint(p, QRect(tl, _singleSize));
 	}
 
@@ -1529,10 +2254,17 @@ void StickersListWidget::paintSticker(
 	}
 
 	if (selected && stickerHasDeleteButton(set, index)) {
-		auto xPos = pos + QPoint(_singleSize.width() - st::stickerPanDeleteIconBg.width(), 0);
-		p.setOpacity(deleteSelected ? st::stickerPanDeleteOpacityBgOver : st::stickerPanDeleteOpacityBg);
+		const auto xPos = pos
+			+ QPoint(
+				_singleSize.width() - st::stickerPanDeleteIconBg.width(),
+				0);
+		p.setOpacity(deleteSelected
+			? st::stickerPanDeleteOpacityBgOver
+			: st::stickerPanDeleteOpacityBg);
 		st::stickerPanDeleteIconBg.paint(p, xPos, width());
-		p.setOpacity(deleteSelected ? st::stickerPanDeleteOpacityFgOver : st::stickerPanDeleteOpacityFg);
+		p.setOpacity(deleteSelected
+			? st::stickerPanDeleteOpacityFgOver
+			: st::stickerPanDeleteOpacityFg);
 		st::stickerPanDeleteIconFg.paint(p, xPos, width());
 		p.setOpacity(1.);
 	}
@@ -1639,8 +2371,15 @@ void StickersListWidget::mousePressEvent(QMouseEvent *e) {
 	updateSelected();
 
 	setPressed(_selected);
+	if (std::get_if<OverSearchShortcut>(&_selected)) {
+		_searchShortcutsMouseDown = _lastMousePosition;
+		_searchShortcutsDragStart = _searchShortcutsScroll;
+		_searchShortcutsDragging = false;
+	}
 	ClickHandler::pressed();
-	_previewTimer.callOnce(QApplication::startDragTime());
+	if (std::get_if<OverSticker>(&_selected)) {
+		_previewTimer.callOnce(QApplication::startDragTime());
+	}
 }
 
 void StickersListWidget::setPressed(OverState newPressed) {
@@ -1651,6 +2390,14 @@ void StickersListWidget::setPressed(OverState newPressed) {
 		if (set.ripple) {
 			set.ripple->lastStop();
 		}
+	} else if (auto shortcut = std::get_if<OverSearchShortcut>(&_pressed)) {
+		if (shortcut->index >= 0
+			&& shortcut->index < _searchShortcutSets.size()) {
+			auto &set = _searchShortcutSets[shortcut->index];
+			if (set.ripple) {
+				set.ripple->lastStop();
+			}
+		}
 	} else if (std::get_if<OverGroupAdd>(&_pressed)) {
 		if (_megagroupSetButtonRipple) {
 			_megagroupSetButtonRipple->lastStop();
@@ -1664,24 +2411,59 @@ void StickersListWidget::setPressed(OverState newPressed) {
 		if (!set.ripple) {
 			set.ripple = createButtonRipple(button->section);
 		}
-		set.ripple->add(mapFromGlobal(QCursor::pos()) - buttonRippleTopLeft(button->section));
+		set.ripple->add(mapFromGlobal(QCursor::pos())
+			- buttonRippleTopLeft(button->section));
+	} else if (auto shortcut = std::get_if<OverSearchShortcut>(&_pressed)) {
+		if (shortcut->index >= 0
+			&& shortcut->index < _searchShortcutSets.size()) {
+			auto &set = _searchShortcutSets[shortcut->index];
+			if (!set.ripple) {
+				set.ripple = createSearchShortcutRipple(shortcut->index);
+			}
+			set.ripple->add(mapFromGlobal(QCursor::pos())
+				- myrtlrect(searchShortcutRect(shortcut->index)).topLeft());
+		}
 	} else if (std::get_if<OverGroupAdd>(&_pressed)) {
 		if (!_megagroupSetButtonRipple) {
-			auto maskSize = _megagroupSetButtonRect.size();
-			auto mask = Ui::RippleAnimation::RoundRectMask(maskSize, st::roundRadiusLarge);
-			_megagroupSetButtonRipple = std::make_unique<Ui::RippleAnimation>(st::stickerGroupCategoryAdd.ripple, std::move(mask), [this] {
-				rtlupdate(megagroupSetButtonRectFinal());
-			});
+			auto mask = Ui::RippleAnimation::RoundRectMask(
+				_megagroupSetButtonRect.size(),
+				st::roundRadiusLarge);
+			_megagroupSetButtonRipple = std::make_unique<Ui::RippleAnimation>(
+					st::stickerGroupCategoryAdd.ripple,
+					std::move(mask),
+					[this] { rtlupdate(megagroupSetButtonRectFinal()); });
 		}
-		_megagroupSetButtonRipple->add(mapFromGlobal(QCursor::pos()) - myrtlrect(megagroupSetButtonRectFinal()).topLeft());
+		_megagroupSetButtonRipple->add(mapFromGlobal(QCursor::pos())
+			- myrtlrect(megagroupSetButtonRectFinal()).topLeft());
 	}
 }
 
+std::unique_ptr<Ui::RippleAnimation>
+StickersListWidget::createSearchShortcutRipple(int index) {
+	Expects(index >= 0 && index < _searchShortcutSets.size());
+
+	const auto setId = _searchShortcutSets[index].id;
+	auto mask = Ui::RippleAnimation::RoundRectMask(
+		searchShortcutRect(index).size(),
+		st::roundRadiusLarge);
+	return std::make_unique<Ui::RippleAnimation>(
+		st::defaultRippleAnimation,
+		std::move(mask),
+		[this, setId] {
+			const auto i = ranges::find(_searchShortcutSets, setId, &Set::id);
+			if (i != _searchShortcutSets.end()) {
+				rtlupdate(searchShortcutRect(
+					int(i - _searchShortcutSets.begin())));
+			}
+		});
+}
+
 QRect StickersListWidget::megagroupSetButtonRectFinal() const {
 	auto result = QRect();
 	if (_section == Section::Stickers) {
+		using Stickers = Data::Stickers;
 		enumerateSections([this, &result](const SectionInfo &info) {
-			if (shownSets()[info.section].id == Data::Stickers::MegagroupSetId) {
+			if (shownSets()[info.section].id == Stickers::MegagroupSetId) {
 				result = _megagroupSetButtonRect.translated(0, info.rowsTop);
 				return false;
 			}
@@ -1691,12 +2473,17 @@ QRect StickersListWidget::megagroupSetButtonRectFinal() const {
 	return result;
 }
 
-std::unique_ptr<Ui::RippleAnimation> StickersListWidget::createButtonRipple(int section) {
+std::unique_ptr<Ui::RippleAnimation> StickersListWidget::createButtonRipple(
+		int section) {
 	Expects(section >= 0 && section < shownSets().size());
 
 	if (shownSets()[section].externalLayout) {
-		auto maskSize = QSize(_addWidth - st::stickersTrendingAdd.width, st::stickersTrendingAdd.height);
-		auto mask = Ui::RippleAnimation::RoundRectMask(maskSize, st::roundRadiusLarge);
+		const auto maskSize = QSize(
+			_addWidth - st::stickersTrendingAdd.width,
+			st::stickersTrendingAdd.height);
+		auto mask = Ui::RippleAnimation::RoundRectMask(
+			maskSize,
+			st::roundRadiusLarge);
 		return std::make_unique<Ui::RippleAnimation>(
 			st::stickersTrendingAdd.ripple,
 			std::move(mask),
@@ -1725,7 +2512,7 @@ void StickersListWidget::showStickerSetBox(
 		not_null<DocumentData*> document,
 		uint64 setId) {
 	if (document->sticker() && document->sticker()->set) {
-		checkHideWithBox(Box<StickerSetBox>(
+		showBoxPreventHide(Box<StickerSetBox>(
 			_show,
 			document->sticker()->set,
 			document->sticker()->setType));
@@ -1737,13 +2524,13 @@ void StickersListWidget::showStickerSetBox(
 			base::timer_once(kTimeout),
 			document->owner().stickers().updated(
 				Data::StickersType::Stickers)
-		) | rpl::start_with_next([=, weak = Ui::MakeWeak(this)] {
-			if (weak.data()) {
+		) | rpl::on_next([=, weak = base::make_weak(this)] {
+			if (weak.get()) {
 				showStickerSetBox(document, setId);
 			}
 			lifetime->destroy();
 		}, *lifetime);
-		document->owner().session().api().requestSpecialStickersForce(
+		document->session().api().requestSpecialStickersForce(
 			setId == Data::Stickers::FavedSetId,
 			setId == Data::Stickers::RecentSetId,
 			false);
@@ -1757,6 +2544,15 @@ base::unique_qptr<Ui::PopupMenu> StickersListWidget::fillContextMenu(
 	if (v::is_null(selected) || !v::is_null(_pressed)) {
 		return nullptr;
 	}
+	if (const auto setOver = std::get_if<OverSet>(&selected)) {
+		Assert(setOver->section >= 0 && setOver->section < sets.size());
+		return fillSetContextMenu(sets[setOver->section]);
+	}
+	if (const auto shortcut = std::get_if<OverSearchShortcut>(&selected)) {
+		Assert(shortcut->index >= 0
+			&& shortcut->index < _searchShortcutSets.size());
+		return fillSetContextMenu(_searchShortcutSets[shortcut->index]);
+	}
 	const auto sticker = std::get_if<OverSticker>(&selected);
 	if (!sticker) {
 		return nullptr;
@@ -1830,6 +2626,102 @@ base::unique_qptr<Ui::PopupMenu> StickersListWidget::fillContextMenu(
 	return menu;
 }
 
+base::unique_qptr<Ui::PopupMenu> StickersListWidget::fillSetContextMenu(
+		const Set &set) {
+	if (!set.set) {
+		return nullptr;
+	}
+	return FillStickerSetContextMenu(
+		this,
+		_show,
+		set.set,
+		_localSetsManager.get(),
+		crl::guard(this, [this](uint64 id) { removeSet(id); }),
+		crl::guard(this, [this] { update(); }),
+		st().menu);
+}
+
+base::unique_qptr<Ui::PopupMenu> FillStickerSetContextMenu(
+		not_null<QWidget*> parent,
+		std::shared_ptr<Show> show,
+		not_null<Data::StickersSet*> set,
+		not_null<LocalStickersManager*> localSetsManager,
+		Fn<void(uint64 setId)> remove,
+		Fn<void()> repaint,
+		const style::PopupMenu &menuSt) {
+	if (set->shortName.isEmpty()
+		|| (set->id == Data::Stickers::MegagroupSetId)
+		|| (set->id == Data::Stickers::CollectibleSetId)) {
+		return nullptr;
+	}
+	const auto type = set->type();
+	const auto isEmoji = (type == Data::StickersType::Emoji);
+	const auto isMasks = (type == Data::StickersType::Masks);
+	const auto part = isEmoji ? u"addemoji"_q : u"addstickers"_q;
+	const auto session = &set->session();
+	const auto url = session->createInternalLinkFull(
+		part + '/' + set->shortName);
+	const auto setId = set->id;
+	const auto installed = SetInMyList(set->flags);
+	const auto inMyList = installed
+		|| localSetsManager->isInstalledLocally(setId);
+
+	auto menu = base::make_unique_q<Ui::PopupMenu>(parent, menuSt);
+	if (!inMyList) {
+		menu->addAction(
+			(isEmoji
+				? tr::lng_stickers_add_emoji
+				: isMasks
+				? tr::lng_stickers_add_masks
+				: tr::lng_stickers_add_pack)(tr::now),
+			[=] {
+				localSetsManager->install(setId);
+				if (isMasks) {
+					show->showToast({
+						.text = { tr::lng_masks_installed(tr::now) },
+						.iconLottie = u"toast/contact_check"_q,
+						.iconLottieSize = st::toastLottieIconSize,
+					});
+				} else if (isEmoji) {
+					session->data().stickers().notifyEmojiSetInstalled(
+						setId);
+				} else {
+					session->data().stickers().notifyStickerSetInstalled(
+						setId);
+				}
+				if (repaint) {
+					repaint();
+				}
+			},
+			&st::menuIconAdd);
+	}
+	menu->addAction(
+		tr::lng_chat_link_share(tr::now),
+		[=] { FastShareLink(show, url); },
+		&st::menuIconShare);
+	menu->addAction(
+		tr::lng_context_copy_link(tr::now),
+		[=] {
+			TextUtilities::SetClipboardText(TextForMimeData::Simple(url));
+			show->showToast({
+				.text = { isEmoji
+					? tr::lng_stickers_copied_emoji(tr::now)
+					: tr::lng_stickers_copied(tr::now) },
+				.iconLottie = u"toast/voip_invite"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		},
+		&st::menuIconLink);
+	if (installed) {
+		menu->addSeparator();
+		menu->addAction(
+			tr::lng_stickers_remove_pack_confirm(tr::now),
+			[=] { remove(setId); },
+			&st::menuIconDelete);
+	}
+	return menu;
+}
+
 Ui::MessageSendingAnimationFrom StickersListWidget::messageSentAnimationInfo(
 		int section,
 		int index,
@@ -1865,10 +2757,20 @@ void StickersListWidget::mouseReleaseEvent(QMouseEvent *e) {
 
 	_lastMousePosition = e->globalPos();
 	updateSelected();
+	if (_searchShortcutsDragging) {
+		_searchShortcutsDragging = false;
+		return;
+	}
 
 	auto &sets = shownSets();
 	if (!v::is_null(pressed) && pressed == _selected) {
-		if (auto sticker = std::get_if<OverSticker>(&pressed)) {
+		if (std::get_if<OverSearchBack>(&pressed)) {
+			backToSearchResults();
+			return;
+		} else if (auto shortcut = std::get_if<OverSearchShortcut>(&pressed)) {
+			toggleSearchShortcut(shortcut->index);
+			return;
+		} else if (auto sticker = std::get_if<OverSticker>(&pressed)) {
 			Assert(sticker->section >= 0 && sticker->section < sets.size());
 			auto &set = sets[sticker->section];
 			Assert(sticker->index >= 0 && sticker->index < set.stickers.size());
@@ -1983,8 +2885,45 @@ void StickersListWidget::setColumnCount(int count) {
 	}
 }
 
+void StickersListWidget::wheelEvent(QWheelEvent *e) {
+	if (searchShortcutsShown() && _searchShortcutsScrollMax > 0) {
+		const auto pos = mapFromGlobal(e->globalPosition().toPoint());
+		if (pos.y() >= searchShortcutsTop()
+			&& pos.y() < searchShortcutsTop() + searchShortcutsHeight()) {
+			const auto angle = e->angleDelta();
+			const auto pixel = e->pixelDelta();
+			const auto horizontal = (angle.x() != 0);
+			const auto vertical = (angle.y() != 0);
+			if (horizontal || vertical) {
+				const auto delta = horizontal
+					? ((rtl() ? -1 : 1)
+						* (pixel.x() ? pixel.x() : angle.x()))
+					: (pixel.y() ? pixel.y() : angle.y());
+				scrollSearchShortcutsTo(_searchShortcutsScroll - delta);
+				e->accept();
+				return;
+			}
+		}
+	}
+	Inner::wheelEvent(e);
+}
+
 void StickersListWidget::mouseMoveEvent(QMouseEvent *e) {
 	_lastMousePosition = e->globalPos();
+	if (std::get_if<OverSearchShortcut>(&_pressed)
+		&& _searchShortcutsScrollMax > 0) {
+		const auto delta = _lastMousePosition - _searchShortcutsMouseDown;
+		if (!_searchShortcutsDragging
+			&& delta.manhattanLength() >= QApplication::startDragDistance()) {
+			_searchShortcutsDragging = true;
+		}
+		if (_searchShortcutsDragging) {
+			scrollSearchShortcutsTo(
+				_searchShortcutsDragStart
+					+ (rtl() ? -1 : 1) * -delta.x());
+			return;
+		}
+	}
 	updateSelected();
 }
 
@@ -2056,6 +2995,9 @@ void StickersListWidget::clearHeavyData() {
 	for (auto &set : shownSets()) {
 		clearHeavyIn(set, false);
 	}
+	for (auto &set : _searchShortcutSets) {
+		clearHeavyIn(set, false);
+	}
 }
 
 void StickersListWidget::refreshStickers() {
@@ -2116,7 +3058,11 @@ void StickersListWidget::refreshFeaturedSets() {
 		- wasFeaturedSetsCount);
 	for (const auto setId : session().data().stickers().featuredSetsOrder()) {
 		const auto externalLayout = true;
-		appendSet(_officialSets, setId, externalLayout, AppendSkip::Installed);
+		appendSet(
+			_officialSets,
+			setId,
+			externalLayout,
+			AppendSkip::Installed);
 	}
 	_featuredSetsCount = _officialSets.size();
 	if (wereOfficial.size() > wasFeaturedSetsCount) {
@@ -2143,20 +3089,45 @@ void StickersListWidget::refreshSearchSets() {
 
 	const auto &sets = session().data().stickers().sets();
 	const auto skipPremium = !session().premiumPossible();
+	const auto refreshElements = [&](Set &entry, not_null<StickersSet*> set) {
+		auto elements = PrepareStickers(
+			set->stickers.empty() ? set->covers : set->stickers,
+			skipPremium);
+		if (!elements.empty()) {
+			entry.lottiePlayer = nullptr;
+			entry.stickers = std::move(elements);
+		}
+		entry.thumbnailDocument = set->lookupThumbnailDocument();
+	};
 	for (auto &entry : _searchSets) {
-		if (const auto it = sets.find(entry.id); it != sets.end()) {
-			const auto set = it->second.get();
-			entry.flags = set->flags;
-			auto elements = PrepareStickers(set->stickers, skipPremium);
-			if (!elements.empty()) {
-				entry.lottiePlayer = nullptr;
-				entry.stickers = std::move(elements);
-			}
-			if (!SetInMyList(entry.flags)) {
-				_localSetsManager->removeInstalledLocally(entry.id);
-				entry.externalLayout = true;
-			}
+		const auto it = sets.find(entry.id);
+		if (it == sets.end()) {
+			continue;
 		}
+		const auto set = it->second.get();
+		const auto selected = (_searchSelectedSetId == entry.id);
+		entry.flags = selected
+			? (set->flags | SetFlag::Special)
+			: set->flags;
+		refreshElements(entry, set);
+		entry.title = selected
+			? tr::lng_stickers_count(tr::now, lt_count, set->count)
+			: set->title;
+		if (selected) {
+			entry.externalLayout = false;
+		} else if (!SetInMyList(entry.flags)) {
+			_localSetsManager->removeInstalledLocally(entry.id);
+			entry.externalLayout = true;
+		}
+	}
+	for (auto &entry : _searchShortcutSets) {
+		const auto it = sets.find(entry.id);
+		if (it == sets.end()) {
+			continue;
+		}
+		const auto set = it->second.get();
+		entry.title = set->title;
+		refreshElements(entry, set);
 	}
 }
 
@@ -2204,6 +3175,9 @@ bool StickersListWidget::appendSet(
 		uint64 setId,
 		bool externalLayout,
 		AppendSkip skip) {
+	if (_excludeSetId && setId == _excludeSetId) {
+		return false;
+	}
 	const auto &sets = session().data().stickers().sets();
 	auto it = sets.find(setId);
 	if (it == sets.cend()
@@ -2293,7 +3267,8 @@ auto StickersListWidget::collectRecentStickers() -> std::vector<Sticker> {
 	_custom.reserve(cloudCount + recent.size() + customCount);
 
 	auto add = [&](not_null<DocumentData*> document, bool custom) {
-		if (result.size() >= kRecentDisplayLimit) {
+		if (result.size() >= kRecentDisplayLimit
+			&& !OptionUnlimitedRecentStickers.value()) {
 			return;
 		}
 		const auto i = ranges::find(result, document, &Sticker::document);
@@ -2312,7 +3287,7 @@ auto StickersListWidget::collectRecentStickers() -> std::vector<Sticker> {
 	};
 
 	if (cloudCount > 0) {
-		for (const auto document : std::as_const(cloudIt->second->stickers)) {
+		for (const auto document : cloudIt->second->stickers) {
 			add(document, false);
 		}
 	}
@@ -2320,7 +3295,7 @@ auto StickersListWidget::collectRecentStickers() -> std::vector<Sticker> {
 		add(recentSticker.first, false);
 	}
 	if (customCount > 0) {
-		for (const auto document : std::as_const(customIt->second->stickers)) {
+		for (const auto document : customIt->second->stickers) {
 			add(document, true);
 		}
 	}
@@ -2334,7 +3309,7 @@ void StickersListWidget::refreshRecentStickers(bool performResize) {
 	if (_section == Section::Stickers) {
 		_recentShownCount = recentPack.size();
 	}
-	auto recentIt = std::find_if(_mySets.begin(), _mySets.end(), [](auto &set) {
+	const auto recentIt = ranges::find_if(_mySets, [](auto &set) {
 		return set.id == Data::Stickers::RecentSetId;
 	});
 	if (!recentPack.empty()) {
@@ -2365,7 +3340,8 @@ void StickersListWidget::refreshRecentStickers(bool performResize) {
 		_mySets.erase(recentIt);
 	}
 
-	if (performResize && (_section == Section::Stickers || _section == Section::Featured)) {
+	if ((_section == Section::Stickers || _section == Section::Featured)
+			&& performResize) {
 		resizeToWidth(width());
 		updateSelected();
 	}
@@ -2433,10 +3409,12 @@ void StickersListWidget::refreshMegagroupStickers(GroupStickersPlace place) {
 		}
 		return;
 	}
-	auto hidden = session().settings().isGroupStickersSectionHidden(_megagroupSet->id);
+	auto hidden = session().settings().isGroupStickersSectionHidden(
+		_megagroupSet->id);
 	auto removeHiddenForGroup = [this, &hidden] {
 		if (hidden) {
-			session().settings().removeGroupStickersSectionHidden(_megagroupSet->id);
+			session().settings().removeGroupStickersSectionHidden(
+				_megagroupSet->id);
 			session().saveSettings();
 			hidden = false;
 		}
@@ -2483,7 +3461,8 @@ void StickersListWidget::refreshMegagroupStickers(GroupStickersPlace place) {
 		MTP_int(0) // hash
 	)).done([=](const MTPmessages_StickerSet &result) {
 		result.match([&](const MTPDmessages_stickerSet &data) {
-			if (const auto set = session().data().stickers().feedSetFull(data)) {
+			if (const auto set = session().data().stickers().feedSetFull(
+					data)) {
 				refreshStickers();
 				if (set->id == _megagroupSetIdRequested) {
 					_megagroupSetIdRequested = 0;
@@ -2549,41 +3528,72 @@ void StickersListWidget::updateSelected() {
 		clearSelection();
 		return;
 	}
+	if (searchShortcutsShown()
+		&& p.y() >= searchShortcutsTop()
+		&& p.y() < searchShortcutsTop() + searchShortcutsHeight()) {
+		if (searchShortcutSelected() && searchBackRect().contains(p)) {
+			newSelected = OverSearchBack{};
+		} else {
+			for (auto i = 0, count = int(_searchShortcutSets.size());
+					i != count; ++i) {
+				if (myrtlrect(searchShortcutRect(i)).contains(p)) {
+					newSelected = OverSearchShortcut{ i };
+					break;
+				}
+			}
+		}
+		setSelected(newSelected);
+		return;
+	}
 	auto &sets = shownSets();
 	auto sx = (rtl() ? width() - p.x() : p.x()) - stickersLeft();
 	if (!shownSets().empty()) {
 		auto info = sectionInfoByOffset(p.y());
 		auto section = info.section;
 		if (p.y() >= info.top && p.y() < info.rowsTop) {
-			if (hasRemoveButton(section) && myrtlrect(removeButtonRect(info)).contains(p.x(), p.y())) {
+			if (hasRemoveButton(section)
+					&& myrtlrect(removeButtonRect(info)).contains(p)) {
 				newSelected = OverButton{ section };
-			} else if (featuredHasAddButton(section) && myrtlrect(featuredAddRect(info, false)).contains(p.x(), p.y())) {
+			} else if (featuredHasAddButton(section)
+					&& myrtlrect(featuredAddRect(info, false)).contains(p)) {
 				newSelected = OverButton{ section };
 			} else if (_features.openStickerSets
-				&& !(sets[section].flags & SetFlag::Special)) {
+				&& (!(sets[section].flags & SetFlag::Special)
+					|| (_section == Section::Search
+						&& sets[section].id == _searchSelectedSetId
+						&& _searchSelectedSetId != 0))) {
 				newSelected = OverSet{ section };
 			} else if ((sets[section].id == Data::Stickers::MegagroupSetId)
 				&& (_megagroupSet->canEditStickers()
 					|| !sets[section].stickers.empty())) {
 				newSelected = OverSet{ section };
 			}
-		} else if (p.y() >= info.rowsTop && p.y() < info.rowsBottom && sx >= 0) {
-			auto yOffset = p.y() - info.rowsTop;
-			auto &set = sets[section];
-			if (set.id == Data::Stickers::MegagroupSetId && set.stickers.empty()) {
-				if (_megagroupSetButtonRect.contains(stickersLeft() + sx, yOffset)) {
+		} else if (p.y() >= info.rowsTop
+				&& p.y() < info.rowsBottom
+				&& sx >= 0) {
+			const auto yOffset = p.y() - info.rowsTop;
+			const auto &set = sets[section];
+			if (set.id == Data::Stickers::MegagroupSetId
+					&& set.stickers.empty()) {
+				if (_megagroupSetButtonRect.contains(
+						stickersLeft() + sx,
+						yOffset)) {
 					newSelected = OverGroupAdd{};
 				}
 			} else {
-				auto rowIndex = qFloor(yOffset / _singleSize.height());
-				auto columnIndex = qFloor(sx / _singleSize.width());
-				auto index = rowIndex * _columnCount + columnIndex;
+				const auto rowIndex = qFloor(yOffset / _singleSize.height());
+				const auto columnIndex = qFloor(sx / _singleSize.width());
+				const auto index = rowIndex * _columnCount + columnIndex;
 				if (index >= 0 && index < set.stickers.size()) {
 					auto overDelete = false;
 					if (stickerHasDeleteButton(set, index)) {
-						auto inx = sx - (columnIndex * _singleSize.width());
-						auto iny = yOffset - (rowIndex * _singleSize.height());
-						if (inx >= _singleSize.width() - st::stickerPanDeleteIconBg.width() && iny < st::stickerPanDeleteIconBg.height()) {
+						const auto inx = sx
+							- (columnIndex * _singleSize.width());
+						const auto iny = yOffset
+							- (rowIndex * _singleSize.height());
+						const auto &icon = st::stickerPanDeleteIconBg;
+						if (inx >= _singleSize.width() - icon.width()
+							&& iny < icon.height()) {
 							overDelete = true;
 						}
 					}
@@ -2635,6 +3645,14 @@ void StickersListWidget::setSelected(OverState newSelected) {
 				} else {
 					rtlupdate(removeButtonRect(button->section));
 				}
+			} else if (auto shortcut
+					= std::get_if<OverSearchShortcut>(&_selected)) {
+				if (shortcut->index >= 0
+					&& shortcut->index < _searchShortcutSets.size()) {
+					rtlupdate(searchShortcutRect(shortcut->index));
+				}
+			} else if (std::get_if<OverSearchBack>(&_selected)) {
+				rtlupdate(searchBackRect());
 			} else if (std::get_if<OverGroupAdd>(&_selected)) {
 				rtlupdate(megagroupSetButtonRectFinal());
 			}
@@ -2646,11 +3664,15 @@ void StickersListWidget::setSelected(OverState newSelected) {
 		if (_previewShown && _pressed != _selected) {
 			if (const auto sticker = std::get_if<OverSticker>(&_selected)) {
 				_pressed = _selected;
-				Assert(sticker->section >= 0 && sticker->section < sets.size());
+				Assert(sticker->section >= 0
+					&& sticker->section < sets.size());
 				const auto &set = sets[sticker->section];
-				Assert(sticker->index >= 0 && sticker->index < set.stickers.size());
+				Assert(sticker->index >= 0
+					&& sticker->index < set.stickers.size());
 				const auto document = set.stickers[sticker->index].document;
-				_show->showMediaPreview(document->stickerSetOrigin(), document);
+				_show->showMediaPreview(
+					document->stickerSetOrigin(),
+					document);
 			}
 		}
 	}
@@ -2745,12 +3767,15 @@ void StickersListWidget::refreshIcons(ValidateIconAnimations animations) {
 }
 
 void StickersListWidget::refreshMegagroupSetGeometry() {
-	auto left = megagroupSetInfoLeft();
-	auto availableWidth = (width() - left);
-	auto top = _megagroupSetAbout.countHeight(availableWidth) + st::stickerGroupCategoryAddMargin.top();
-	_megagroupSetButtonTextWidth = st::stickerGroupCategoryAdd.style.font->width(_megagroupSetButtonText);
-	auto buttonWidth = _megagroupSetButtonTextWidth - st::stickerGroupCategoryAdd.width;
-	_megagroupSetButtonRect = QRect(left, top, buttonWidth, st::stickerGroupCategoryAdd.height);
+	const auto left = megagroupSetInfoLeft();
+	const auto availableWidth = (width() - left);
+	const auto top = _megagroupSetAbout.countHeight(availableWidth)
+		+ st::stickerGroupCategoryAddMargin.top();
+	const auto &st = st::stickerGroupCategoryAdd;
+	_megagroupSetButtonTextWidth = st.style.font->width(
+		_megagroupSetButtonText);
+	const auto buttonWidth = _megagroupSetButtonTextWidth - st.width;
+	_megagroupSetButtonRect = QRect(left, top, buttonWidth, st.height);
 }
 
 void StickersListWidget::showMegagroupSet(ChannelData *megagroup) {
@@ -2810,7 +3835,8 @@ void StickersListWidget::displaySet(uint64 setId) {
 	if (setId == Data::Stickers::MegagroupSetId) {
 		if (_megagroupSet->canEditStickers()) {
 			const auto isEmoji = false;
-			checkHideWithBox(Box<StickersBox>(_show, _megagroupSet, isEmoji));
+			showBoxPreventHide(
+				Box<StickersBox>(_show, _megagroupSet, isEmoji));
 			return;
 		} else if (_megagroupSet->mgInfo->stickerSet.id) {
 			setId = _megagroupSet->mgInfo->stickerSet.id;
@@ -2821,7 +3847,7 @@ void StickersListWidget::displaySet(uint64 setId) {
 	const auto &sets = session().data().stickers().sets();
 	auto it = sets.find(setId);
 	if (it != sets.cend()) {
-		checkHideWithBox(Box<StickerSetBox>(_show, it->second.get()));
+		showBoxPreventHide(Box<StickerSetBox>(_show, it->second.get()));
 	}
 }
 
@@ -2832,7 +3858,7 @@ void StickersListWidget::removeMegagroupSet(bool locally) {
 		refreshStickers();
 		return;
 	}
-	checkHideWithBox(Ui::MakeConfirmBox({
+	showBoxPreventHide(Ui::MakeConfirmBox({
 		.text = tr::lng_stickers_remove_group_set(),
 		.confirmed = crl::guard(this, [this, group = _megagroupSet](
 				Fn<void()> &&close) {
@@ -2858,7 +3884,7 @@ void StickersListWidget::removeSet(uint64 setId) {
 			|| !_megagroupSet->canEditStickers();
 		removeMegagroupSet(removeLocally);
 	} else if (auto box = MakeConfirmRemoveSetBox(&session(), st, setId)) {
-		checkHideWithBox(std::move(box));
+		showBoxPreventHide(std::move(box));
 	}
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
index c436273fcfc6e4..d7f25a04f1708b 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "chat_helpers/compose/compose_features.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "data/stickers/data_stickers.h"
+#include "ui/effects/animations.h"
 #include "ui/round_rect.h"
 #include "base/variant.h"
 #include "base/timer.h"
@@ -52,10 +53,14 @@ enum class Notification;
 namespace style {
 struct EmojiPan;
 struct FlatLabel;
+struct PopupMenu;
 } // namespace style
 
 namespace ChatHelpers {
 
+extern const char kOptionUnlimitedRecentStickers[];
+[[nodiscard]] QVector<MTPstring> SearchStickersLangCodes();
+
 struct StickerIcon;
 enum class ValidateIconAnimations;
 class StickersListFooter;
@@ -81,6 +86,7 @@ struct StickersListDescriptor {
 	std::vector<StickerCustomRecentDescriptor> customRecentList;
 	const style::EmojiPan *st = nullptr;
 	ComposeFeatures features;
+	uint64 excludeSetId = 0;
 };
 
 class StickersListWidget final : public TabbedSelector::Inner {
@@ -140,6 +146,7 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	void mousePressEvent(QMouseEvent *e) override;
 	void mouseReleaseEvent(QMouseEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
+	void wheelEvent(QWheelEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
 	void leaveEventHook(QEvent *e) override;
@@ -195,6 +202,24 @@ class StickersListWidget final : public TabbedSelector::Inner {
 			return !(*this == other);
 		}
 	};
+	struct OverSearchShortcut {
+		int index = 0;
+
+		inline bool operator==(OverSearchShortcut other) const {
+			return (index == other.index);
+		}
+		inline bool operator!=(OverSearchShortcut other) const {
+			return !(*this == other);
+		}
+	};
+	struct OverSearchBack {
+		inline bool operator==(OverSearchBack other) const {
+			return true;
+		}
+		inline bool operator!=(OverSearchBack other) const {
+			return !(*this == other);
+		}
+	};
 	struct OverGroupAdd {
 		inline bool operator==(OverGroupAdd other) const {
 			return true;
@@ -208,6 +233,8 @@ class StickersListWidget final : public TabbedSelector::Inner {
 		OverSticker,
 		OverSet,
 		OverButton,
+		OverSearchShortcut,
+		OverSearchBack,
 		OverGroupAdd>;
 
 	struct SectionInfo {
@@ -242,6 +269,8 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	void displaySet(uint64 setId);
 	void removeMegagroupSet(bool locally);
 	void removeSet(uint64 setId);
+	[[nodiscard]] base::unique_qptr<Ui::PopupMenu> fillSetContextMenu(
+		const Set &set);
 	void refreshMySets();
 	void refreshFeaturedSets();
 	void refreshSearchSets();
@@ -267,6 +296,8 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	[[nodiscard]] std::unique_ptr<Ui::RippleAnimation> createButtonRipple(
 		int section);
 	[[nodiscard]] QPoint buttonRippleTopLeft(int section) const;
+	[[nodiscard]] std::unique_ptr<Ui::RippleAnimation>
+	createSearchShortcutRipple(int index);
 
 	[[nodiscard]] std::vector<Set> &shownSets();
 	[[nodiscard]] const std::vector<Set> &shownSets() const;
@@ -286,7 +317,6 @@ class StickersListWidget final : public TabbedSelector::Inner {
 		bool paused,
 		bool selected,
 		bool deleteSelected);
-	void paintEmptySearchResults(Painter &p);
 
 	void ensureLottiePlayer(Set &set);
 	void setupLottie(Set &set, int section, int index);
@@ -356,13 +386,44 @@ class StickersListWidget final : public TabbedSelector::Inner {
 
 	void cancelSetsSearch();
 	void showSearchResults();
-	void searchResultsDone(const MTPmessages_FoundStickerSets &result);
+	void sendSearchSetsRequest(const QString &query);
+	void searchResultsDone(
+		const QString &query,
+		const MTPmessages_FoundStickerSets &result);
+	void requestSearchStickers(
+		const QString &query,
+		int offset,
+		bool isInitial);
+	void searchStickersResultsDone(
+		const QString &query,
+		int requestedOffset,
+		bool isInitial,
+		const MTPmessages_FoundStickers &result);
+	void loadMoreSearchStickers();
+	void checkPaginateSearchStickers(int visibleTop, int visibleBottom);
 	void refreshSearchRows();
 	void refreshSearchRows(const std::vector<uint64> *cloudSets);
+	void refreshSearchShortcuts(
+		const QString &query,
+		const std::vector<uint64> *cloudSets);
+	void fillLocalSearchShortcuts(const QString &query);
+	bool addSearchShortcut(not_null<Data::StickersSet*> set);
+	void fillSelectedSearchShortcut();
+	[[nodiscard]] bool searchShortcutsShown() const;
+	[[nodiscard]] bool searchShortcutSelected() const;
+	void startSearchSwapAnimation(Fn<void()> change, bool packToPack = false);
+	[[nodiscard]] int searchShortcutsHeight() const;
+	[[nodiscard]] int searchShortcutsTop() const;
+	[[nodiscard]] QRect searchBackRect() const;
+	[[nodiscard]] QRect searchShortcutRect(int index) const;
+	void refreshSearchShortcutsScroll(int newWidth);
+	void scrollSearchShortcutsTo(int value);
+	void paintSearchShortcuts(Painter &p, QRect clip);
+	void paintSearchShortcutIcon(Painter &p, Set &set, QRect rect);
+	void toggleSearchShortcut(int index);
+	void backToSearchResults();
 	void fillFilteredStickersRow();
-	void fillLocalSearchRows(const QString &query);
-	void fillCloudSearchRows(const std::vector<uint64> &cloudSets);
-	void addSearchRow(not_null<Data::StickersSet*> set);
+	void fillFoundStickersRow(const std::vector<DocumentId> &stickerIds);
 	void toggleSearchLoading(bool loading);
 
 	void showPreview();
@@ -385,6 +446,7 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	std::vector<Set> _mySets;
 	std::vector<Set> _officialSets;
 	std::vector<Set> _searchSets;
+	std::vector<Set> _searchShortcutSets;
 	int _featuredSetsCount = 0;
 	std::vector<bool> _custom;
 	std::vector<EmojiPtr> _cornerEmoji;
@@ -402,6 +464,7 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	Section _section = Section::Stickers;
 	const bool _isMasks;
 	const bool _isEffects;
+	const uint64 _excludeSetId = 0;
 
 	base::Timer _updateItemsTimer;
 	base::Timer _updateSetsTimer;
@@ -442,11 +505,27 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	std::vector<not_null<DocumentData*>> _filteredStickers;
 	std::vector<EmojiPtr> _filterStickersCornerEmoji;
 	rpl::variable<int> _recentShownCount;
-	std::map<QString, std::vector<uint64>> _searchCache;
+	std::map<QString, std::vector<uint64>> _searchSetsCache;
+	std::map<QString, std::vector<DocumentId>> _searchStickersCache;
+	std::map<QString, int> _searchStickersNextOffset;
 	std::vector<std::pair<uint64, QStringList>> _searchIndex;
 	base::Timer _searchRequestTimer;
 	QString _searchQuery, _searchNextQuery;
-	mtpRequestId _searchRequestId = 0;
+	uint64 _searchSelectedSetId = 0;
+	int _searchShortcutsScroll = 0;
+	int _searchShortcutsScrollMax = 0;
+	int _searchShortcutsDragStart = 0;
+	QPoint _searchShortcutsMouseDown;
+	bool _searchShortcutsDragging = false;
+	Ui::Animations::Simple _searchSwapAnimation;
+	QPixmap _searchSwapBefore;
+	QPixmap _searchSwapAfter;
+	int _searchSwapTop = 0;
+	bool _searchSwapReverse = false;
+	bool _searchSwapPartial = false;
+	mtpRequestId _searchSetsRequestId = 0;
+	mtpRequestId _searchStickersRequestId = 0;
+	bool _searchLoading = false;
 
 	rpl::event_stream<FileChosen> _chosen;
 	rpl::event_stream<> _scrollUpdated;
@@ -459,4 +538,13 @@ class StickersListWidget final : public TabbedSelector::Inner {
 	const style::FlatLabel &st,
 	uint64 setId);
 
+[[nodiscard]] base::unique_qptr<Ui::PopupMenu> FillStickerSetContextMenu(
+	not_null<QWidget*> parent,
+	std::shared_ptr<Show> show,
+	not_null<Data::StickersSet*> set,
+	not_null<LocalStickersManager*> localSetsManager,
+	Fn<void(uint64 setId)> remove,
+	Fn<void()> repaint,
+	const style::PopupMenu &menuSt);
+
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_lottie.cpp b/Telegram/SourceFiles/chat_helpers/stickers_lottie.cpp
index 095abbb5721e6d..9b129c3ca9166f 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_lottie.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_lottie.cpp
@@ -31,6 +31,12 @@ namespace {
 
 constexpr auto kDontCacheLottieAfterArea = 512 * 512;
 
+[[nodiscard]] uint64 LocalStickerId(QStringView name) {
+	auto full = u"local_sticker:"_q;
+	full.append(name);
+	return XXH64(full.data(), full.size() * sizeof(QChar), 0);
+}
+
 } // namespace
 
 uint8 LottieCacheKeyShift(uint8 replacementsTag, StickerLottieSize sizeTag) {
@@ -192,9 +198,7 @@ std::unique_ptr<Lottie::SinglePlayer> LottieThumbnail(
 	};
 	const auto session = thumb
 		? &thumb->owner()->session()
-		: media
-		? &media->owner()->session()
-		: nullptr;
+		: &media->owner()->session();
 	return LottieCachedFromContent(
 		method,
 		baseKey,
@@ -317,27 +321,17 @@ QSize ComputeStickerSize(not_null<DocumentData*> document, QSize box) {
 	return HistoryView::NonEmptySize(request.size(dimensions, 8) / ratio);
 }
 
-[[nodiscard]] uint64 LocalTgsStickerId(QStringView name) {
-	auto full = u"local_tgs_sticker:"_q;
-	full.append(name);
-	return XXH64(full.data(), full.size() * sizeof(QChar), 0);
-}
-
-not_null<DocumentData*> GenerateLocalTgsSticker(
+not_null<DocumentData*> GenerateLocalSticker(
 		not_null<Main::Session*> session,
-		const QString &name) {
-	const auto path = u":/animations/"_q + name + u".tgs"_q;
-	auto task = FileLoadTask(
-		session,
-		path,
-		QByteArray(),
-		nullptr,
-		SendMediaType::File,
-		FileLoadTo(0, {}, {}, 0),
-		{},
-		false,
-		nullptr,
-		LocalTgsStickerId(name));
+		const QString &path) {
+	auto task = FileLoadTask(FileLoadTask::Args{
+		.session = session,
+		.filepath = path,
+		.type = SendMediaType::File,
+		.to = FileLoadTo(0, {}, {}, 0),
+		.caption = {},
+		.idOverride = LocalStickerId(path),
+	});
 	task.process({ .generateGoodThumbnail = false });
 	const auto result = task.peekResult();
 	Assert(result != nullptr);
@@ -350,8 +344,50 @@ not_null<DocumentData*> GenerateLocalTgsSticker(
 	document->setLocation(Core::FileLocation(path));
 
 	Ensures(document->sticker());
-	Ensures(document->sticker()->isLottie());
 	return document;
 }
 
+not_null<DocumentData*> GenerateLocalTgsSticker(
+		not_null<Main::Session*> session,
+		const QString &name,
+		bool useTextColor) {
+	const auto cache = [&] {
+		struct Session {
+			base::weak_ptr<Main::Session> session;
+			base::flat_map<QString, not_null<DocumentData*>> cache;
+		};
+		static auto Map = std::vector<Session>();
+		for (auto i = begin(Map); i != end(Map);) {
+			if (const auto strong = i->session.get()) {
+				if (strong == session) {
+					return &i->cache;
+				}
+				++i;
+			} else {
+				i = Map.erase(i);
+			}
+		}
+		Map.push_back({ .session = session });
+		return &Map.back().cache;
+	}();
+
+	const auto key = useTextColor ? (name + u"/:/1"_q) : name;
+	const auto i = cache->find(key);
+	if (i != end(*cache)) {
+		return i->second;
+	}
+
+	const auto result = GenerateLocalSticker(
+		session,
+		u":/animations/"_q + name + u".tgs"_q);
+	if (useTextColor) {
+		result->overrideEmojiUsesTextColor(true);
+	}
+
+	cache->emplace(key, result);
+
+	Ensures(result->sticker()->isLottie());
+	return result;
+}
+
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_lottie.h b/Telegram/SourceFiles/chat_helpers/stickers_lottie.h
index e659329dde3e57..8b67d3ebb1ba8b 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_lottie.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_lottie.h
@@ -68,6 +68,7 @@ enum class StickerLottieSize : uint8 {
 	EmojiInteractionReserved7,
 	ChatIntroHelloSticker,
 	StickerEmojiSize,
+	PinnedProfileUniqueGiftSize,
 };
 [[nodiscard]] uint8 LottieCacheKeyShift(
 	uint8 replacementsTag,
@@ -130,8 +131,13 @@ bool PaintStickerThumbnailPath(
 	not_null<DocumentData*> document,
 	QSize box);
 
+[[nodiscard]] not_null<DocumentData*> GenerateLocalSticker(
+	not_null<Main::Session*> session,
+	const QString &path);
+
 [[nodiscard]] not_null<DocumentData*> GenerateLocalTgsSticker(
 	not_null<Main::Session*> session,
-	const QString &name);
+	const QString &name,
+	bool useTextColor = false);
 
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
index 7d399a59647d28..0a265988c2652c 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
@@ -12,7 +12,9 @@ For license and copyright information please follow this link:
 #include "ui/ui_utility.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "window/window_session_controller.h"
-#include "mainwindow.h"
+#include "main/main_session.h"
+#include "data/data_session.h"
+#include "data/stickers/data_stickers.h"
 #include "core/application.h"
 #include "base/options.h"
 #include "styles/style_chat_helpers.h"
@@ -33,6 +35,10 @@ base::options::toggle TabbedPanelShowOnClick({
 
 const char kOptionTabbedPanelShowOnClick[] = "tabbed-panel-show-on-click";
 
+bool ShowPanelOnClick() {
+	return TabbedPanelShowOnClick.value();
+}
+
 TabbedPanel::TabbedPanel(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
@@ -64,7 +70,8 @@ TabbedPanel::TabbedPanel(
 	: _ownedSelector.data())
 , _heightRatio(st::emojiPanHeightRatio)
 , _minContentHeight(st::emojiPanMinHeight)
-, _maxContentHeight(st::emojiPanMaxHeight) {
+, _maxContentHeight(st::emojiPanMaxHeight)
+, _shadow(_selector->st().showAnimation.shadow) {
 	Expects(_selector != nullptr);
 
 	_selector->setParent(this);
@@ -82,7 +89,7 @@ TabbedPanel::TabbedPanel(
 		_pauseAnimations.fire(false);
 	});
 	_selector->showRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showFromSelector();
 	}, lifetime());
 
@@ -99,19 +106,26 @@ TabbedPanel::TabbedPanel(
 	_hideTimer.setCallback([this] { hideByTimerOrLeave(); });
 
 	_selector->checkForHide(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!rect().contains(mapFromGlobal(QCursor::pos()))) {
 			_hideTimer.callOnce(kDelayedHideTimeoutMs);
 		}
 	}, lifetime());
 
 	_selector->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideAnimated();
 	}, lifetime());
 
+	if (_regularWindow) {
+		_regularWindow->session().data().stickers().gifWithCaptionSent(
+		) | rpl::on_next([=] {
+			hideAnimated();
+		}, lifetime());
+	}
+
 	_selector->slideFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		InvokeQueued(this, [=] {
 			if (_hideAfterSlide) {
 				startOpacityAnimation(true);
@@ -122,7 +136,7 @@ TabbedPanel::TabbedPanel(
 	macWindowDeactivateEvents(
 	) | rpl::filter([=] {
 		return !isHidden() && !preventAutoHide();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		hideAnimated();
 	}, lifetime());
 
@@ -178,6 +192,10 @@ void TabbedPanel::setDesiredHeightValues(
 	updateContentHeight();
 }
 
+void TabbedPanel::setShowAnimationOrigin(Ui::PanelAnimation::Origin origin) {
+	_showAnimationOrigin = origin;
+}
+
 void TabbedPanel::setDropDown(bool dropDown) {
 	selector()->setDropDown(dropDown);
 	_dropDown = dropDown;
@@ -240,7 +258,7 @@ void TabbedPanel::paintEvent(QPaintEvent *e) {
 		hideFinished();
 	} else {
 		if (!_cache.isNull()) _cache = QPixmap();
-		Ui::Shadow::paint(p, innerRect(), width(), _selector->st().showAnimation.shadow);
+		_shadow.paint(p, innerRect(), st::emojiPanRadius);
 	}
 }
 
@@ -273,7 +291,7 @@ void TabbedPanel::leaveEventHook(QEvent *e) {
 	} else {
 		_hideTimer.callOnce(kHideTimeoutMs);
 	}
-	return TWidget::leaveEventHook(e);
+	return RpWidget::leaveEventHook(e);
 }
 
 void TabbedPanel::otherEnter() {
@@ -288,7 +306,11 @@ void TabbedPanel::otherLeave() {
 	if (_a_opacity.animating()) {
 		hideByTimerOrLeave();
 	} else {
-		_hideTimer.callOnce(0);
+		// In case of animations disabled add some delay before hiding.
+		// Otherwise if emoji suggestions panel is shown in between
+		// (z-order wise) the emoji toggle button and tabbed panel,
+		// we won't be able to move cursor from the button to the panel.
+		_hideTimer.callOnce(anim::Disabled() ? kHideTimeoutMs : 0);
 	}
 }
 
@@ -362,17 +384,19 @@ void TabbedPanel::startShowAnimation() {
 	if (!_a_show.animating()) {
 		auto image = grabForAnimation();
 
+		const auto origin = _showAnimationOrigin.value_or(_dropDown
+			? Ui::PanelAnimation::Origin::TopRight
+			: Ui::PanelAnimation::Origin::BottomRight);
 		_showAnimation = std::make_unique<Ui::PanelAnimation>(
 			_selector->st().showAnimation,
-			(_dropDown
-				? Ui::PanelAnimation::Origin::TopRight
-				: Ui::PanelAnimation::Origin::BottomRight));
+			origin);
 		auto inner = rect().marginsRemoved(st::emojiPanMargins);
 		_showAnimation->setFinalImage(
 			std::move(image),
 			QRect(
 				inner.topLeft() * style::DevicePixelRatio(),
-				inner.size() * style::DevicePixelRatio()));
+				inner.size() * style::DevicePixelRatio()),
+			st::emojiPanRadius);
 		_showAnimation->setCornerMasks(Images::CornersMask(st::emojiPanRadius));
 		_showAnimation->start();
 	}
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
index fcedb5efc6a53c..2e4c3068511349 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
@@ -8,7 +8,9 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "ui/effects/animations.h"
+#include "ui/effects/panel_animation.h"
 #include "ui/rp_widget.h"
+#include "ui/widgets/shadow.h"
 #include "base/timer.h"
 #include "base/object_ptr.h"
 
@@ -16,15 +18,13 @@ namespace Window {
 class SessionController;
 } // namespace Window
 
-namespace Ui {
-class PanelAnimation;
-} // namespace Ui
 
 namespace ChatHelpers {
 
 class TabbedSelector;
 
 extern const char kOptionTabbedPanelShowOnClick[];
+[[nodiscard]] bool ShowPanelOnClick();
 
 struct TabbedPanelDescriptor {
 	Window::SessionController *regularWindow = nullptr;
@@ -55,6 +55,7 @@ class TabbedPanel : public Ui::RpWidget {
 		int minHeight,
 		int maxHeight);
 	void setDropDown(bool dropDown);
+	void setShowAnimationOrigin(Ui::PanelAnimation::Origin origin);
 
 	void hideFast();
 	bool hiding() const {
@@ -120,9 +121,11 @@ class TabbedPanel : public Ui::RpWidget {
 
 	bool _shouldFinishHide = false;
 	bool _dropDown = false;
+	std::optional<Ui::PanelAnimation::Origin> _showAnimationOrigin;
 
 	bool _hiding = false;
 	bool _hideAfterSlide = false;
+	Ui::BoxShadow _shadow;
 	QPixmap _cache;
 	Ui::Animations::Simple _a_opacity;
 	base::Timer _hideTimer;
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 0ac62dd2e10a45..fd046b776cdafe 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -11,7 +11,9 @@ For license and copyright information please follow this link:
 #include "chat_helpers/stickers_list_widget.h"
 #include "chat_helpers/gifs_list_widget.h"
 #include "menu/menu_send.h"
+#include "ui/controls/swipe_handler.h"
 #include "ui/controls/tabbed_search.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/shadow.h"
@@ -343,7 +345,7 @@ std::unique_ptr<Ui::TabbedSearch> MakeSearch(
 	});
 
 	result->queryValue(
-	) | rpl::skip(1) | rpl::start_with_next(
+	) | rpl::skip(1) | rpl::on_next(
 		std::move(callback),
 		parent->lifetime());
 
@@ -379,6 +381,7 @@ TabbedSelector::TabbedSelector(
 , _show(std::move(descriptor.show))
 , _level(descriptor.level)
 , _customTextColor(std::move(descriptor.customTextColor))
+, _excludeStickerSetId(descriptor.excludeStickerSetId)
 , _mode(descriptor.mode)
 , _panelRounding(Ui::PrepareCornerPixmaps(st::emojiPanRadius, _st.bg))
 , _categoriesRounding(
@@ -437,7 +440,7 @@ TabbedSelector::TabbedSelector(
 		const auto widget = tab.widget();
 
 		widget->scrollToRequests(
-		) | rpl::start_with_next([=, tab = &tab](int y) {
+		) | rpl::on_next([=, tab = &tab](int y) {
 			if (tab == currentTab()) {
 				scrollToY(y);
 			} else {
@@ -446,7 +449,7 @@ TabbedSelector::TabbedSelector(
 		}, widget->lifetime());
 
 		widget->disableScrollRequests(
-		) | rpl::start_with_next([=, tab = &tab](bool disabled) {
+		) | rpl::on_next([=, tab = &tab](bool disabled) {
 			if (tab == currentTab()) {
 				_scroll->disableScroll(disabled);
 			}
@@ -456,9 +459,9 @@ TabbedSelector::TabbedSelector(
 	rpl::merge(
 		(hasStickersTab()
 			? stickers()->scrollUpdated() | rpl::map_to(0)
-			: rpl::never<int>() | rpl::type_erased()),
+			: rpl::never<int>() | rpl::type_erased),
 		_scroll->scrollTopChanges()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		handleScroll();
 	}, lifetime());
 
@@ -477,17 +480,22 @@ TabbedSelector::TabbedSelector(
 			Data::PeerUpdate::Flag::Rights
 		) | rpl::filter([=](const Data::PeerUpdate &update) {
 			return (update.peer.get() == _currentPeer);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			checkRestrictedPeer();
 		}, lifetime());
 	}
 
 	if (hasStickersTab()) {
 		session().data().stickers().stickerSetInstalled(
-		) | rpl::start_with_next([=](uint64 setId) {
+		) | rpl::on_next([=](uint64 setId) {
 			_tabsSlider->setActiveSection(indexByType(SelectorTab::Stickers));
 			stickers()->showStickerSet(setId);
-			_showRequests.fire({});
+			if (_currentPeer
+				&& Data::CanSend(
+					_currentPeer,
+					ChatRestriction::SendStickers)) {
+				_showRequests.fire({});
+			}
 		}, lifetime());
 
 		rpl::merge(
@@ -495,13 +503,13 @@ TabbedSelector::TabbedSelector(
 			session().data().stickers().updated(hasMasksTab()
 				? Data::StickersType::Masks
 				: Data::StickersType::Stickers)
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshStickers();
 		}, lifetime());
 	}
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_panelRounding = Ui::PrepareCornerPixmaps(
 			st::emojiPanRadius,
 			_st.bg);
@@ -512,16 +520,17 @@ TabbedSelector::TabbedSelector(
 
 	if (hasEmojiTab() && _mode == Mode::Full) {
 		session().data().stickers().emojiSetInstalled(
-		) | rpl::start_with_next([=](uint64 setId) {
+		) | rpl::on_next([=](uint64 setId) {
 			_tabsSlider->setActiveSection(indexByType(SelectorTab::Emoji));
 			emoji()->showSet(setId);
-			_showRequests.fire({});
+			if (_currentPeer && Data::CanSendTexts(_currentPeer)) {
+				_showRequests.fire({});
+			}
 		}, lifetime());
 	}
 	if (hasEmojiTab()) {
 		emoji()->refreshEmoji();
 	}
-	//setAttribute(Qt::WA_AcceptTouchEvents);
 	setAttribute(Qt::WA_OpaquePaintEvent, false);
 	showAll();
 	hide();
@@ -529,6 +538,60 @@ TabbedSelector::TabbedSelector(
 
 TabbedSelector::~TabbedSelector() = default;
 
+void TabbedSelector::reinstallSwipe(not_null<Ui::RpWidget*> widget) {
+	_swipeLifetime.destroy();
+
+	auto update = [=](Ui::Controls::SwipeContextData data) {
+		if (data.translation != 0) {
+			if (!_swipeBackData.callback) {
+				_swipeBackData = Ui::Controls::SetupSwipeBack(
+					this,
+					[=]() -> std::pair<QColor, QColor> {
+						return {
+							st::historyForwardChooseBg->c,
+							st::historyForwardChooseFg->c,
+						};
+					},
+					data.translation < 0);
+			}
+			_swipeBackData.callback(data);
+			return;
+		} else if (_swipeBackData.lifetime) {
+			_swipeBackData = {};
+		}
+	};
+
+	auto init = [=](Ui::Controls::SwipeHandlerInitData data) {
+		if (!_tabsSlider) {
+			return Ui::Controls::SwipeHandlerFinishData();
+		}
+		const auto activeSection = _tabsSlider->activeSection();
+		const auto isToLeft = data.direction == Qt::RightToLeft;
+		if ((isToLeft && activeSection > 0)
+			|| (!isToLeft && activeSection < _tabs.size() - 1)) {
+			return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
+				if (_tabsSlider
+					&& _tabsSlider->activeSection() == activeSection) {
+					_swipeBackData = {};
+					_tabsSlider->setActiveSection(isToLeft
+						? activeSection - 1
+						: activeSection + 1);
+				}
+			});
+		}
+		return Ui::Controls::SwipeHandlerFinishData();
+	};
+
+	Ui::Controls::SetupSwipeHandler({
+		.widget = widget,
+		.scroll = _scroll.data(),
+		.update = std::move(update),
+		.init = std::move(init),
+		.dontStart = nullptr,
+		.onLifetime = &_swipeLifetime,
+	});
+}
+
 const style::EmojiPan &TabbedSelector::st() const {
 	return _st;
 }
@@ -562,6 +625,8 @@ TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, int index) {
 					? EmojiMode::FullReactions
 					: _mode == Mode::RecentReactions
 					? EmojiMode::RecentReactions
+					: _mode == Mode::CustomEmojiOnly
+					? EmojiMode::CustomOnly
 					: _mode == Mode::PeerTitle
 					? EmojiMode::PeerTitle
 					: EmojiMode::Full),
@@ -582,6 +647,7 @@ TabbedSelector::Tab TabbedSelector::createTab(SelectorTab type, int index) {
 				.paused = paused,
 				.st = &_st,
 				.features = _features,
+				.excludeSetId = _excludeStickerSetId,
 			});
 		}
 		case SelectorTab::Gifs: {
@@ -647,7 +713,7 @@ rpl::producer<FileChosen> TabbedSelector::customEmojiChosen() const {
 
 rpl::producer<FileChosen> TabbedSelector::fileChosen() const {
 	auto never = rpl::never<FileChosen>(
-	) | rpl::type_erased();
+	) | rpl::type_erased;
 	return rpl::merge(
 		hasStickersTab() ? stickers()->chosen() : never,
 		hasGifsTab() ? gifs()->fileChosen() : never,
@@ -1016,7 +1082,7 @@ void TabbedSelector::setCurrentPeer(PeerData *peer) {
 }
 
 void TabbedSelector::provideRecentEmoji(
-		const std::vector<DocumentId> &customRecentList) {
+		const std::vector<EmojiStatusId> &customRecentList) {
 	for (const auto &tab : _tabs) {
 		if (tab.type() == SelectorTab::Emoji) {
 			const auto emoji = static_cast<EmojiListWidget*>(tab.widget());
@@ -1042,23 +1108,38 @@ void TabbedSelector::checkRestrictedPeer() {
 				? Data::RestrictionError(
 					_currentPeer,
 					ChatRestriction::SendOther)
-				: std::nullopt)
-			: std::nullopt;
+				: Data::SendError())
+			: Data::SendError();
+		const auto changed = (_restrictedLabelKey != error.text);
+		if (!changed) {
+			return;
+		}
+		_restrictedLabelKey = error.text;
 		if (error) {
-			if (!_restrictedLabel) {
-				_restrictedLabel.create(
-					this,
-					*error,
-					st::stickersRestrictedLabel);
-				_restrictedLabel->show();
-				updateRestrictedLabelGeometry();
-				currentTab()->footer()->hide();
-				_scroll->hide();
-				_bottomShadow->hide();
-				update();
-			}
+			const auto show = _show;
+			const auto peer = _currentPeer;
+			_restrictedLabel.create(
+				this,
+				rpl::single(error.boostsToLift
+					? tr::link(error.text)
+					: TextWithEntities{ error.text }),
+				st::stickersRestrictedLabel);
+			const auto lifting = error.boostsToLift;
+			_restrictedLabel->setClickHandlerFilter([=](auto...) {
+				const auto window = show->resolveWindow();
+				window->resolveBoostState(peer->asChannel(), lifting);
+				return false;
+			});
+			_restrictedLabel->show();
+			updateRestrictedLabelGeometry();
+			currentTab()->footer()->hide();
+			_scroll->hide();
+			_bottomShadow->hide();
+			update();
 			return;
 		}
+	} else {
+		_restrictedLabelKey = QString();
 	}
 	if (_restrictedLabel) {
 		_restrictedLabel.destroy();
@@ -1134,7 +1215,7 @@ void TabbedSelector::createTabsSlider() {
 
 	_tabsSlider->setActiveSectionFast(indexByType(_currentTabType));
 	_tabsSlider->sectionActivated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		switchTab();
 	}, lifetime());
 }
@@ -1285,6 +1366,10 @@ void TabbedSelector::setWidgetToScrollArea() {
 	inner->moveToLeft(0, 0);
 	inner->show();
 
+	if (_tabs.size() > 1) {
+		reinstallSwipe(inner);
+	}
+
 	_scroll->disableScroll(false);
 	scrollToY(currentTab()->getScrollTop());
 	handleScroll();
@@ -1395,29 +1480,36 @@ void TabbedSelector::Inner::disableScroll(bool disabled) {
 	_disableScrollRequests.fire_copy(disabled);
 }
 
-void TabbedSelector::Inner::checkHideWithBox(
+void TabbedSelector::Inner::showBoxPreventHide(
 		object_ptr<Ui::BoxContent> box) {
-	const auto raw = QPointer<Ui::BoxContent>(box.data());
+	const auto weak = base::make_weak(box.data());
 	_show->showBox(std::move(box));
-	if (!raw) {
-		return;
+	preventHideWithBox(weak);
+}
+
+void TabbedSelector::Inner::preventHideWithBox(
+		base::weak_qptr<Ui::BoxContent> weak) {
+	if (const auto strong = weak.get()) {
+		_preventHideWithBox = true;
+		connect(strong, &QObject::destroyed, this, [=] {
+			_preventHideWithBox = false;
+			_checkForHide.fire({});
+		});
 	}
-	_preventHideWithBox = true;
-	connect(raw, &QObject::destroyed, this, [=] {
-		_preventHideWithBox = false;
-		_checkForHide.fire({});
-	});
 }
 
 void TabbedSelector::Inner::paintEmptySearchResults(
 		Painter &p,
 		const style::icon &icon,
-		const QString &text) const {
+		const QString &text,
+		bool skipIcon) const {
 	const auto iconLeft = (width() - icon.width()) / 2;
 	const auto iconTop = std::max(
 		(height() / 3) - (icon.height() / 2),
 		st::normalFont->height);
-	icon.paint(p, iconLeft, iconTop, width());
+	if (!skipIcon) {
+		icon.paint(p, iconLeft, iconTop, width());
+	}
 
 	const auto textWidth = st::normalFont->width(text);
 	const auto textTop = std::min(
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index f171299033d9e3..53ed102d02b23f 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "api/api_common.h"
 #include "chat_helpers/compose/compose_features.h"
 #include "ui/rp_widget.h"
+#include "ui/controls/swipe_handler_data.h"
 #include "ui/effects/animations.h"
 #include "ui/effects/message_sending_animation_common.h"
 #include "ui/effects/panel_animation.h"
@@ -62,7 +63,9 @@ struct FileChosen {
 	not_null<DocumentData*> document;
 	Api::SendOptions options;
 	Ui::MessageSendingAnimationFrom messageSendingFrom;
+	std::shared_ptr<Data::EmojiStatusCollectible> collectible;
 	TextWithTags caption;
+	bool needsCaption = false;
 };
 
 struct PhotoChosen {
@@ -80,6 +83,7 @@ using InlineChosen = InlineBots::ResultSelected;
 enum class TabbedSelectorMode {
 	Full,
 	EmojiOnly,
+	CustomEmojiOnly,
 	StickersOnly,
 	MediaEditor,
 	EmojiStatus,
@@ -98,6 +102,7 @@ struct TabbedSelectorDescriptor {
 	TabbedSelectorMode mode = TabbedSelectorMode::Full;
 	Fn<QColor()> customTextColor;
 	ComposeFeatures features;
+	uint64 excludeStickerSetId = 0;
 };
 
 enum class TabbedSearchType {
@@ -154,7 +159,7 @@ class TabbedSelector : public Ui::RpWidget {
 	void refreshStickers();
 	void setCurrentPeer(PeerData *peer);
 	void provideRecentEmoji(
-		const std::vector<DocumentId> &customRecentList);
+		const std::vector<EmojiStatusId> &customRecentList);
 
 	void hideFinished();
 	void showStarted();
@@ -286,11 +291,16 @@ class TabbedSelector : public Ui::RpWidget {
 	not_null<GifsListWidget*> gifs() const;
 	not_null<StickersListWidget*> masks() const;
 
+	void reinstallSwipe(not_null<Ui::RpWidget*> widget);
+
 	const style::EmojiPan &_st;
 	const ComposeFeatures _features;
 	const std::shared_ptr<Show> _show;
 	const PauseReason _level = {};
 	const Fn<QColor()> _customTextColor;
+	const uint64 _excludeStickerSetId = 0;
+
+	Ui::Controls::SwipeBackResult _swipeBackData;
 
 	Mode _mode = Mode::Full;
 	int _roundRadius = 0;
@@ -309,6 +319,7 @@ class TabbedSelector : public Ui::RpWidget {
 	object_ptr<Ui::PlainShadow> _bottomShadow;
 	object_ptr<Ui::ScrollArea> _scroll;
 	object_ptr<Ui::FlatLabel> _restrictedLabel = { nullptr };
+	QString _restrictedLabelKey;
 	std::vector<Tab> _tabs;
 	SelectorTab _currentTabType = SelectorTab::Emoji;
 
@@ -327,6 +338,8 @@ class TabbedSelector : public Ui::RpWidget {
 	rpl::event_stream<> _showRequests;
 	rpl::event_stream<> _slideFinished;
 
+	rpl::lifetime _swipeLifetime;
+
 };
 
 class TabbedSelector::Inner : public Ui::RpWidget {
@@ -408,12 +421,14 @@ class TabbedSelector::Inner : public Ui::RpWidget {
 	void scrollTo(int y);
 	void disableScroll(bool disabled);
 
-	void checkHideWithBox(object_ptr<Ui::BoxContent> box);
+	void showBoxPreventHide(object_ptr<Ui::BoxContent> box);
+	void preventHideWithBox(base::weak_qptr<Ui::BoxContent> weak);
 
 	void paintEmptySearchResults(
 		Painter &p,
 		const style::icon &icon,
-		const QString &text) const;
+		const QString &text,
+		bool skipIcon = false) const;
 
 private:
 	const style::EmojiPan &_st;
diff --git a/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp b/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
index 583fed29aeb786..919c360ec1c5a1 100644
--- a/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/ttl_media_layer_widget.cpp
@@ -52,7 +52,7 @@ class PreviewDelegate final : public HistoryView::DefaultElementDelegate {
 	bool elementAnimationsPaused() override;
 	not_null<Ui::PathShiftGradient*> elementPathShiftGradient() override;
 	HistoryView::Context elementContext() override;
-	bool elementIsChatWide() override;
+	HistoryView::ElementChatMode elementChatMode() override;
 
 private:
 	const not_null<QWidget*> _parent;
@@ -83,8 +83,9 @@ HistoryView::Context PreviewDelegate::elementContext() {
 	return HistoryView::Context::TTLViewer;
 }
 
-bool PreviewDelegate::elementIsChatWide() {
-	return _chatWide.current();
+HistoryView::ElementChatMode PreviewDelegate::elementChatMode() {
+	using Mode = HistoryView::ElementChatMode;
+	return _chatWide.current() ? Mode::Wide : Mode::Default;
 }
 
 class PreviewWrap final : public Ui::RpWidget {
@@ -142,7 +143,7 @@ PreviewWrap::PreviewWrap(
 	const auto closeCallback = [=] { _closeRequests.fire({}); };
 	HistoryView::TTLVoiceStops(
 		item->fullId()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_lastFrameCache = Ui::GrabWidgetToImage(this, _elementGeometry);
 		closeCallback();
 	}, lifetime());
@@ -154,20 +155,20 @@ PreviewWrap::PreviewWrap(
 
 	std::move(
 		theme
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> theme) {
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> theme) {
 		_theme = std::move(theme);
 		_style->apply(_theme.get());
 	}, lifetime());
 
 	const auto session = &_item->history()->session();
 	session->data().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const HistoryView::Element*> view) {
-		if (view == _element.get()) {
+	) | rpl::on_next([=](Data::RequestViewRepaint data) {
+		if (data.view == _element.get()) {
 			update(_elementGeometry);
 		}
 	}, lifetime());
 	session->data().itemViewRefreshRequest(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		if (item == _item) {
 			if (goodItem()) {
 				createView();
@@ -179,13 +180,13 @@ PreviewWrap::PreviewWrap(
 		}
 	}, lifetime());
 	session->data().itemDataChanges(
-	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		if (item == _item) {
 			_element->itemDataChanged();
 		}
 	}, lifetime());
 	session->data().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		if (item == _item) {
 			_closeRequests.fire({});
 		}
@@ -200,12 +201,11 @@ PreviewWrap::PreviewWrap(
 			st::ttlMediaButton);
 		close->setFullRadius(true);
 		close->setClickedCallback(closeCallback);
-		close->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 
 		rpl::combine(
 			sizeValue(),
 			_elementInner.value()
-		) | rpl::start_with_next([=](QSize size, QRect inner) {
+		) | rpl::on_next([=](QSize size, QRect inner) {
 			close->moveToLeft(
 				inner.x() + (inner.width() - close->width()) / 2,
 				(size.height()
@@ -225,11 +225,11 @@ PreviewWrap::PreviewWrap(
 					lt_user,
 					rpl::single(
 						item->history()->peer->shortName()
-					) | Ui::Text::ToRichLangValue(),
-					Ui::Text::RichLangValue)
+					) | rpl::map(tr::rich),
+					tr::rich)
 			: (isRound
 				? tr::lng_ttl_round_tooltip_in
-				: tr::lng_ttl_voice_tooltip_in)(Ui::Text::RichLangValue);
+				: tr::lng_ttl_voice_tooltip_in)(tr::rich);
 		const auto tooltip = Ui::CreateChild<Ui::ImportantTooltip>(
 			this,
 			object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
@@ -245,7 +245,7 @@ PreviewWrap::PreviewWrap(
 		_elementInner.value(
 		) | rpl::filter([](const QRect &inner) {
 			return !inner.isEmpty();
-		}) | rpl::start_with_next([=](const QRect &inner) {
+		}) | rpl::on_next([=](const QRect &inner) {
 			tooltip->pointAt(inner, RectPart::Top, [=](QSize size) {
 				return QPoint{
 					inner.x() + (inner.width() - size.width()) / 2,
@@ -280,7 +280,7 @@ void PreviewWrap::createView() {
 	rpl::combine(
 		sizeValue(),
 		_globalViewport.value()
-	) | rpl::start_with_next([=](QSize outer, QRect globalViewport) {
+	) | rpl::on_next([=](QSize outer, QRect globalViewport) {
 		_viewport = globalViewport.isEmpty()
 			? rect()
 			: mapFromGlobal(globalViewport);
@@ -323,6 +323,7 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 			_style.get(),
 			Rect(_element->currentSize()),
 			Rect(_element->currentSize()),
+			Rect(_element->currentSize()),
 			!window()->isActiveWindow());
 		context.outbg = _element->hasOutLayout();
 		_element->draw(p, context);
@@ -370,7 +371,7 @@ void ShowTTLMediaLayerWidget(
 			controller,
 			item->history()->peer));
 	preview->closeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		show->hideLayer();
 	}, preview->lifetime());
 	auto layer = std::make_unique<Editor::LayerWidget>(
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 5dc8b7ce767c61..b2da317578a3af 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -7,7 +7,6 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "core/version.h"
 #include "settings.h"
 
 enum {
@@ -17,16 +16,12 @@ enum {
 	LocalEncryptNoPwdIterCount = 4, // key derivation iteration count without pwd (not secure anyway)
 	LocalEncryptSaltSize = 32, // 256 bit
 
-	RecentInlineBotsLimit = 10,
-
 	AutoSearchTimeout = 900, // 0.9 secs
 
 	PreloadHeightsCount = 3, // when 3 screens to scroll left make a preload request
 
 	SearchPeopleLimit = 5,
 
-	MaxMessageSize = 4096,
-
 	WebPageUserId = 701000,
 
 	UpdateDelayConstPart = 8 * 3600, // 8 hour min time between update check requests
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index c1274732275272..2cc1658aa9cd47 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -8,17 +8,14 @@ For license and copyright information please follow this link:
 #include "core/application.h"
 
 #include "data/data_abstract_structure.h"
+#include "data/data_channel.h"
 #include "data/data_forum.h"
-#include "data/data_photo.h"
-#include "data/data_document.h"
 #include "data/data_message_reactions.h"
 #include "data/data_session.h"
-#include "data/data_stories.h"
-#include "data/data_user.h"
-#include "data/data_channel.h"
 #include "data/data_download_manager.h"
 #include "base/battery_saving.h"
 #include "base/event_filter.h"
+#include "base/invoke_queued.h"
 #include "base/concurrent_timer.h"
 #include "base/options.h"
 #include "base/qt_signal_producer.h"
@@ -30,18 +27,17 @@ For license and copyright information please follow this link:
 #include "core/sandbox.h"
 #include "core/local_url_handlers.h"
 #include "core/launcher.h"
+#include "core/proxy_rotation_manager.h"
 #include "core/ui_integration.h"
+#include "core/version.h"
 #include "chat_helpers/emoji_keywords.h"
 #include "chat_helpers/stickers_emoji_image_loader.h"
-#include "base/qt/qt_common_adapters.h"
 #include "base/platform/base_platform_global_shortcuts.h"
 #include "base/platform/base_platform_url_scheme.h"
 #include "base/platform/base_platform_last_input.h"
 #include "base/platform/base_platform_info.h"
 #include "platform/platform_specific.h"
 #include "platform/platform_integration.h"
-#include "mainwindow.h"
-#include "dialogs/dialogs_entry.h"
 #include "history/history.h"
 #include "apiwrap.h"
 #include "api/api_updates.h"
@@ -50,7 +46,6 @@ For license and copyright information please follow this link:
 #include "iv/iv_delegate_impl.h"
 #include "iv/iv_instance.h"
 #include "iv/iv_data.h"
-#include "lang/lang_file_parser.h"
 #include "lang/lang_translator.h"
 #include "lang/lang_cloud_manager.h"
 #include "lang/lang_hardcoded.h"
@@ -58,7 +53,6 @@ For license and copyright information please follow this link:
 #include "inline_bots/bot_attach_web_view.h"
 #include "mainwidget.h"
 #include "tray.h"
-#include "core/file_utilities.h"
 #include "core/click_handler_types.h" // ClickHandlerContext.
 #include "core/crash_reports.h"
 #include "main/main_account.h"
@@ -68,8 +62,6 @@ For license and copyright information please follow this link:
 #include "media/view/media_view_open_common.h"
 #include "mtproto/mtproto_dc_options.h"
 #include "mtproto/mtproto_config.h"
-#include "mtproto/mtp_instance.h"
-#include "media/audio/media_audio.h"
 #include "media/audio/media_audio_track.h"
 #include "media/player/media_player_instance.h"
 #include "media/player/media_player_float.h"
@@ -77,18 +69,13 @@ For license and copyright information please follow this link:
 #include "media/system_media_controls_manager.h"
 #include "window/notifications_manager.h"
 #include "window/themes/window_theme.h"
-#include "window/window_lock_widgets.h"
-#include "history/history_location_manager.h"
 #include "ui/widgets/tooltip.h"
 #include "ui/gl/gl_detection.h"
-#include "ui/image/image.h"
 #include "ui/text/text_options.h"
-#include "ui/emoji_config.h"
-#include "ui/effects/animations.h"
 #include "ui/effects/spoiler_mess.h"
 #include "ui/cached_round_corners.h"
 #include "ui/power_saving.h"
-#include "storage/serialize_common.h"
+#include "ui/screen_reader_mode.h"
 #include "storage/storage_domain.h"
 #include "storage/storage_databases.h"
 #include "storage/localstorage.h"
@@ -101,9 +88,10 @@ For license and copyright information please follow this link:
 #include "boxes/abstract_box.h"
 #include "base/qthelp_regex.h"
 #include "base/qthelp_url.h"
-#include "boxes/connection_box.h"
 #include "boxes/premium_limits_box.h"
+#include "ui/accessible/ui_accessible_factory.h"
 #include "ui/boxes/confirm_box.h"
+#include "core/cached_webview_availability.h"
 #include "styles/style_window.h"
 
 #include <QtCore/QStandardPaths>
@@ -112,13 +100,14 @@ For license and copyright information please follow this link:
 #include <QtGui/QScreen>
 #include <QtGui/QWindow>
 
+#include <ksandbox.h>
+
 namespace Core {
 namespace {
 
 constexpr auto kQuitPreventTimeoutMs = crl::time(1500);
 constexpr auto kAutoLockTimeoutLateMs = crl::time(3000);
 constexpr auto kClearEmojiImageSourceTimeout = 10 * crl::time(1000);
-constexpr auto kFileOpenTimeoutMs = crl::time(1000);
 
 LaunchState GlobalLaunchState/* = LaunchState::Running*/;
 
@@ -159,6 +148,7 @@ struct Application::Private {
 	base::Timer quitTimer;
 	UiIntegration uiIntegration;
 	Settings settings;
+	std::unique_ptr<ProxyRotationManager> proxyRotation;
 };
 
 Application::Application()
@@ -183,14 +173,15 @@ Application::Application()
 , _langCloudManager(std::make_unique<Lang::CloudManager>(langpack()))
 , _emojiKeywords(std::make_unique<ChatHelpers::EmojiKeywords>())
 , _tray(std::make_unique<Tray>())
-, _autoLockTimer([=] { checkAutoLock(); })
-, _fileOpenTimer([=] { checkFileOpen(); }) {
+, _setupEmailLock(false)
+, _autoLockTimer([=] { checkAutoLock(); }) {
 	Ui::Integration::Set(&_private->uiIntegration);
+	_private->proxyRotation = std::make_unique<ProxyRotationManager>();
 
 	_platformIntegration->init();
 
 	passcodeLockChanges(
-	) | rpl::start_with_next([=](bool locked) {
+	) | rpl::on_next([=](bool locked) {
 		_shouldLockAt = 0;
 		if (locked) {
 			closeAdditionalWindows();
@@ -198,18 +189,18 @@ Application::Application()
 	}, _lifetime);
 
 	passcodeLockChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_notifications->updateAll();
 		updateWindowTitles();
 	}, _lifetime);
 
 	settings().windowTitleContentChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateWindowTitles();
 	}, _lifetime);
 
 	_domain->activeSessionChanges(
-	) | rpl::start_with_next([=](Main::Session *session) {
+	) | rpl::on_next([=](Main::Session *session) {
 		if (session && !UpdaterDisabled()) { // #TODO multi someSessionValue
 			UpdateChecker().setMtproto(session);
 		}
@@ -247,6 +238,7 @@ Application::~Application() {
 	// Domain::finish() and there is a violation on Ensures(started()).
 	closeAdditionalWindows();
 
+	_private->proxyRotation = nullptr;
 	_domain->finish();
 
 	Local::finish();
@@ -302,6 +294,7 @@ void Application::run() {
 	QCoreApplication::instance()->installTranslator(_translator.get());
 
 	style::StartManager(cScale());
+	Ui::Accessible::Init();
 	Ui::InitTextOptions();
 	Ui::StartCachedCorners();
 	Ui::Emoji::Init();
@@ -318,12 +311,12 @@ void Application::run() {
 	rpl::combine(
 		_batterySaving->value(),
 		settings().ignoreBatterySavingValue()
-	) | rpl::start_with_next([=](bool saving, bool ignore) {
+	) | rpl::on_next([=](bool saving, bool ignore) {
 		PowerSaving::SetForceAll(saving && !ignore);
 	}, _lifetime);
 
 	style::ShortAnimationPlaying(
-	) | rpl::start_with_next([=](bool playing) {
+	) | rpl::on_next([=](bool playing) {
 		if (playing) {
 			MTP::details::pause();
 		} else {
@@ -339,14 +332,15 @@ void Application::run() {
 	QMimeDatabase().mimeTypeForName(u"text/plain"_q);
 
 	// Check now to avoid re-entrance later.
-	[[maybe_unused]] const auto ivSupported = Iv::ShowButton();
+	[[maybe_unused]] const auto &webviewAvailability
+		= Core::CachedWebviewAvailability();
 
 	_windows.emplace(nullptr, std::make_unique<Window::Controller>());
 	setLastActiveWindow(_windows.front().second.get());
 	_windowInSettings = _lastActivePrimaryWindow = _lastActiveWindow;
 
 	_domain->activeChanges(
-	) | rpl::start_with_next([=](not_null<Main::Account*> account) {
+	) | rpl::on_next([=](not_null<Main::Account*> account) {
 		showAccount(account);
 	}, _lifetime);
 
@@ -362,7 +356,7 @@ void Application::run() {
 			? _domain->activeChanges()
 			: rpl::never<not_null<Main::Account*>>();
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](not_null<Main::Account*> account) {
+	) | rpl::on_next([=](not_null<Main::Account*> account) {
 		const auto ordered = _domain->orderedAccounts();
 		const auto it = ranges::find(ordered, account);
 		if (_lastActivePrimaryWindow && it != end(ordered)) {
@@ -378,7 +372,7 @@ void Application::run() {
 	QCoreApplication::instance()->installEventFilter(this);
 
 	appDeactivatedValue(
-	) | rpl::start_with_next([=](bool deactivated) {
+	) | rpl::on_next([=](bool deactivated) {
 		if (deactivated) {
 			handleAppDeactivated();
 		} else {
@@ -414,7 +408,7 @@ void Application::run() {
 	}
 
 	_openInMediaViewRequests.events(
-	) | rpl::start_with_next([=](Media::View::OpenRequest &&request) {
+	) | rpl::on_next([=](Media::View::OpenRequest &&request) {
 		if (_mediaView) {
 			_mediaView->show(std::move(request));
 		}
@@ -499,6 +493,8 @@ void Application::startSettingsAndBackground() {
 	Local::rewriteSettingsIfNeeded();
 	Window::Theme::Background()->start();
 	checkSystemDarkMode();
+	Ui::SetScreenReaderModeDisabled(
+		settings().readPref<bool>(kScreenReaderModeDisabledKey));
 }
 
 void Application::checkSystemDarkMode() {
@@ -520,7 +516,7 @@ void Application::startSystemDarkModeViewer() {
 	rpl::merge(
 		settings().systemDarkModeChanges() | rpl::to_empty,
 		settings().systemDarkModeEnabledChanges() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkSystemDarkMode();
 	}, _lifetime);
 }
@@ -545,6 +541,7 @@ void Application::startMediaView() {
 	// only after first show and then hide.
 	InvokeQueued(this, [=] {
 		_mediaView = std::make_unique<Media::View::OverlayWidget>();
+		_mediaView->setSystemMediaControls(_mediaControlsManager.get());
 	});
 #elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_WIN
 	// On Windows we needed such hack for the main window, otherwise
@@ -552,9 +549,11 @@ void Application::startMediaView() {
 	// was broken / lost to some invalid values.
 	const auto current = _lastActivePrimaryWindow->widget()->geometry();
 	_mediaView = std::make_unique<Media::View::OverlayWidget>();
+	_mediaView->setSystemMediaControls(_mediaControlsManager.get());
 	_lastActivePrimaryWindow->widget()->Ui::RpWidget::setGeometry(current);
 #else
 	_mediaView = std::make_unique<Media::View::OverlayWidget>();
+	_mediaView->setSystemMediaControls(_mediaControlsManager.get());
 #endif // Q_OS_MAC || Q_OS_WIN
 }
 
@@ -575,18 +574,18 @@ void Application::createTray() {
 	using WindowRaw = not_null<Window::Controller*>;
 	_tray->create();
 	_tray->aboutToShowRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		enumerateWindows([&](WindowRaw w) { w->updateIsActive(); });
 		_tray->updateMenuText();
 	}, _lifetime);
 
 	_tray->showFromTrayRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		activate();
 	}, _lifetime);
 
 	_tray->hideToTrayRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		enumerateWindows([&](WindowRaw w) {
 			w->widget()->minimizeToTray();
 		});
@@ -657,10 +656,13 @@ bool Application::eventFilter(QObject *object, QEvent *e) {
 	switch (e->type()) {
 	case QEvent::KeyPress: {
 		updateNonIdle();
+		_inAppKeyPressed.fire({});
 		const auto event = static_cast<QKeyEvent*>(e);
 		if (base::Platform::GlobalShortcuts::IsToggleFullScreenKey(event)
 			&& toggleActiveWindowFullScreen()) {
 			return true;
+		} else if (Shortcuts::HandlePossibleChatSwitch(event)) {
+			return true;
 		}
 	} break;
 	case QEvent::MouseButtonPress:
@@ -669,8 +671,20 @@ bool Application::eventFilter(QObject *object, QEvent *e) {
 		updateNonIdle();
 	} break;
 
+	case QEvent::KeyRelease: {
+		const auto event = static_cast<QKeyEvent*>(e);
+		if (Shortcuts::HandlePossibleChatSwitch(event)) {
+			return true;
+		}
+	} break;
+
 	case QEvent::ShortcutOverride: {
-		// handle shortcuts ourselves
+		// Ctrl+Tab/Ctrl+Shift+Tab chat switch is a special shortcut case,
+		// because it not only does an action on the shortcut activation,
+		// but also keeps the UI visible until you release the Ctrl key.
+		Shortcuts::HandlePossibleChatSwitch(static_cast<QKeyEvent*>(e));
+
+		// Handle all the shortcut management manually.
 		return true;
 	} break;
 
@@ -691,24 +705,26 @@ bool Application::eventFilter(QObject *object, QEvent *e) {
 
 	case QEvent::FileOpen: {
 		if (object == QCoreApplication::instance()) {
-			const auto event = static_cast<QFileOpenEvent*>(e);
-			if (const auto file = event->file(); !file.isEmpty()) {
-				_filesToOpen.append(file);
-				_fileOpenTimer.callOnce(kFileOpenTimeoutMs);
-			} else if (event->url().scheme() == u"tg"_q
-				|| event->url().scheme() == u"tonsite"_q) {
-				const auto url = QString::fromUtf8(
-					event->url().toEncoded().trimmed());
-				cSetStartUrl(url.mid(0, 8192));
-				checkStartUrl();
-				if (_lastActivePrimaryWindow
-					&& StartUrlRequiresActivate(url)) {
-					_lastActivePrimaryWindow->activate();
-				}
-			} else if (event->url().scheme() == u"interpret"_q) {
-				_filesToOpen.append(event->url().toString());
-				_fileOpenTimer.callOnce(kFileOpenTimeoutMs);
+			if (_urlsToOpen.isEmpty()) {
+				InvokeQueued(this, [=] {
+					const auto activateRequired = ranges::any_of(
+						ranges::views::all(
+							_urlsToOpen
+						 ) | ranges::views::transform([](const QUrl &url) {
+							return url.toString();
+						}),
+						StartUrlRequiresActivate);
+					cRefStartUrls() << base::take(_urlsToOpen);
+					checkStartUrls();
+					if (_lastActivePrimaryWindow && activateRequired) {
+						_lastActivePrimaryWindow->activate();
+					}
+				});
 			}
+			const auto event = static_cast<QFileOpenEvent*>(e);
+			_urlsToOpen << event->url().toString(QUrl::FullyEncoded).mid(
+				0,
+				8192);
 		}
 	} break;
 
@@ -721,6 +737,39 @@ bool Application::eventFilter(QObject *object, QEvent *e) {
 	} break;
 	}
 
+	switch (e->type()) {
+	case QEvent::TouchBegin:
+		Ui::Integration::Instance().touchCounterIncrement();
+		[[fallthrough]];
+	case QEvent::TouchUpdate:
+	case QEvent::TouchEnd: {
+		_lastTouchProcessed = object->isWidgetType();
+	} break;
+
+	case QEvent::MouseButtonPress:
+	case QEvent::MouseButtonRelease:
+	case QEvent::MouseButtonDblClick:
+	case QEvent::MouseMove: {
+		const auto ev = static_cast<QMouseEvent*>(e);
+		if (ev->source() == Qt::MouseEventSynthesizedBySystem) {
+			const auto widget = static_cast<QWidget*>(object);
+			if (_lastTouchProcessed
+				|| (object->isWidgetType()
+					&& widget->testAttribute(Qt::WA_AcceptTouchEvents))) {
+				_lastMouseIgnored = true;
+				return true;
+			}
+		}
+		_lastMouseIgnored = false;
+	} break;
+
+	case QEvent::ContextMenu: {
+		const auto ev = static_cast<QContextMenuEvent*>(e);
+		return (ev->reason() == QContextMenuEvent::Mouse)
+			&& _lastMouseIgnored;
+	} break;
+	}
+
 	return QObject::eventFilter(object, e);
 }
 
@@ -792,6 +841,17 @@ void Application::setCurrentProxy(
 	refreshGlobalProxy();
 	_proxyChanges.fire({ was, now });
 	my.connectionTypeChangesNotify();
+	proxyRotationSettingsChanged();
+}
+
+void Application::proxyRotationSettingsChanged() {
+	_private->proxyRotation->settingsChanged();
+}
+
+void Application::checkProxyRotation(
+		not_null<Main::Account*> account,
+		int32 state) {
+	_private->proxyRotation->handleConnectionStateChanged(account, state);
 }
 
 auto Application::proxyChanges() const -> rpl::producer<ProxyChange> {
@@ -808,7 +868,7 @@ void Application::badMtprotoConfigurationError() {
 		_badProxyDisableBox = Ui::show(
 			Ui::MakeInformBox(Lang::Hard::ProxyConfigError()));
 		_badProxyDisableBox->boxClosing(
-		) | rpl::start_with_next(
+		) | rpl::on_next(
 			disableCallback,
 			_badProxyDisableBox->lifetime());
 	}
@@ -818,7 +878,7 @@ void Application::startLocalStorage() {
 	Ui::GL::DetectLastCheckCrash();
 	Local::start();
 	_saveSettingsTimer.emplace([=] { saveSettings(); });
-	settings().saveDelayedRequests() | rpl::start_with_next([=] {
+	settings().saveDelayedRequests() | rpl::on_next([=] {
 		saveSettingsDelayed();
 	}, _lifetime);
 }
@@ -832,7 +892,7 @@ void Application::startEmojiImageLoader() {
 	});
 
 	settings().largeEmojiChanges(
-	) | rpl::start_with_next([=](bool large) {
+	) | rpl::on_next([=](bool large) {
 		if (large) {
 			_clearEmojiImageLoaderTimer.cancel();
 		} else {
@@ -842,7 +902,7 @@ void Application::startEmojiImageLoader() {
 	}, _lifetime);
 
 	Ui::Emoji::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_emojiImageLoader.with([
 			source = prepareEmojiSourceImages()
 		](Stickers::EmojiImageLoader &loader) mutable {
@@ -915,7 +975,7 @@ void Application::forceLogOut(
 	box->setCloseByEscape(false);
 	box->setCloseByOutsideClick(false);
 	const auto weak = base::make_weak(account);
-	connect(box, &QObject::destroyed, [=] {
+	connect(box.get(), &QObject::destroyed, [=] {
 		crl::on_main(weak, [=] {
 			account->forcedLogOut();
 		});
@@ -1080,38 +1140,62 @@ bool Application::canApplyLangPackWithoutRestart() const {
 	return true;
 }
 
-void Application::checkFileOpen() {
-	cSetSendPaths(_filesToOpen);
-	_filesToOpen.clear();
-	checkSendPaths();
-}
-
-void Application::checkSendPaths() {
-	if (!cSendPaths().isEmpty()
+void Application::checkStartUrls() {
+	if (!Core::App().passcodeLocked()) {
+		cRefStartUrls() = ranges::views::all(
+			cRefStartUrls()
+		) | ranges::views::filter([&](const QUrl &url) {
+			if (url.scheme() == u"tonsite"_q) {
+				iv().showTonSite(url.toString(), {});
+				return false;
+			} else if (_lastActivePrimaryWindow) {
+				const auto local = TryConvertUrlToLocal(url.toString());
+				return !openLocalUrl(local, {});
+			}
+			return true;
+		}) | ranges::to<QList<QUrl>>;
+	}
+	if (!cRefStartUrls().isEmpty()
 		&& _lastActivePrimaryWindow
 		&& !_lastActivePrimaryWindow->locked()) {
-		_lastActivePrimaryWindow->widget()->sendPaths();
-	}
-}
-
-void Application::checkStartUrl() {
-	if (!cStartUrl().isEmpty()) {
-		const auto url = cStartUrl();
-		if (!Core::App().passcodeLocked()) {
-			if (url.startsWith("tonsite://", Qt::CaseInsensitive)) {
-				cSetStartUrl(QString());
-				iv().showTonSite(url, {});
-			} else if (_lastActivePrimaryWindow) {
-				cSetStartUrl(QString());
-				if (!openLocalUrl(url, {})) {
-					cSetStartUrl(url);
-				}
+		auto interprets = QStringList();
+		auto paths = QStringList();
+		cRefStartUrls() = ranges::views::all(
+			cRefStartUrls()
+		) | ranges::views::filter([&](const QUrl &url) {
+			if (url.scheme() == u"interpret"_q) {
+				interprets.append(url.path());
+				return false;
+			} else if (url.isLocalFile()) {
+				paths.append(url.toLocalFile());
+				return false;
 			}
+			return true;
+		}) | ranges::to<QList<QUrl>>;
+		if (!interprets.isEmpty() || !paths.isEmpty()) {
+			_lastActivePrimaryWindow->widget()->handleStartFiles(
+				std::move(interprets),
+				std::move(paths));
 		}
 	}
 }
 
 bool Application::openLocalUrl(const QString &url, QVariant context) {
+	const auto urlTrimmed = url.trimmed();
+	const auto protocol = u"tg://"_q;
+	if (urlTrimmed.startsWith(protocol, Qt::CaseInsensitive)
+		&& !passcodeLocked()) {
+		const auto command = urlTrimmed.mid(protocol.size());
+		const auto my = context.value<ClickHandlerContext>();
+		const auto controller = my.sessionWindow.get()
+			? my.sessionWindow.get()
+			: _lastActivePrimaryWindow
+			? _lastActivePrimaryWindow->sessionController()
+			: nullptr;
+		if (TryRouterForLocalUrl(controller, command)) {
+			return true;
+		}
+	}
 	return openCustomUrl("tg://", LocalUrlHandlers(), url, context);
 }
 
@@ -1120,36 +1204,7 @@ bool Application::openInternalUrl(const QString &url, QVariant context) {
 }
 
 QString Application::changelogLink() const {
-	const auto base = u"https://desktop.telegram.org/changelog"_q;
-	const auto languages = {
-		"id",
-		"de",
-		"fr",
-		"nl",
-		"pl",
-		"tr",
-		"uk",
-		"fa",
-		"ru",
-		"ms",
-		"es",
-		"it",
-		"uz",
-		"pt-br",
-		"be",
-		"ar",
-		"ko",
-	};
-	const auto current = _langpack->id().replace("-raw", "");
-	if (current.isEmpty()) {
-		return base;
-	}
-	for (const auto language : languages) {
-		if (current == language || current.split(u'-')[0] == language) {
-			return base + "?setln=" + language;
-		}
-	}
-	return base;
+	return u"https://telegramdesktop.github.io/tdesktop/changelog/"_q;
 }
 
 bool Application::openCustomUrl(
@@ -1243,6 +1298,10 @@ crl::time Application::lastNonIdleTime() const {
 		_lastNonIdleTime);
 }
 
+rpl::producer<> Application::inAppKeyPressed() const {
+	return _inAppKeyPressed.events();
+}
+
 rpl::producer<bool> Application::passcodeLockChanges() const {
 	return _passcodeLock.changes();
 }
@@ -1251,6 +1310,20 @@ rpl::producer<bool> Application::passcodeLockValue() const {
 	return _passcodeLock.value();
 }
 
+void Application::lockBySetupEmail() {
+	_setupEmailLock = true;
+	enumerateWindows([&](not_null<Window::Controller*> w) {
+		w->setupSetupEmailLock();
+	});
+}
+
+void Application::unlockSetupEmail() {
+	_setupEmailLock = false;
+	enumerateWindows([&](not_null<Window::Controller*> w) {
+		w->clearSetupEmailLock();
+	});
+}
+
 bool Application::someSessionExists() const {
 	for (const auto &[index, account] : _domain->accounts()) {
 		if (account->sessionExists()) {
@@ -1324,6 +1397,13 @@ Window::Controller *Application::activePrimaryWindow() const {
 	return _lastActivePrimaryWindow;
 }
 
+void Application::setActivePrimaryWindow(
+		not_null<Window::Controller*> window) {
+	if (window->isPrimary()) {
+		_lastActivePrimaryWindow = window;
+	}
+}
+
 Window::Controller *Application::separateWindowFor(
 		Window::SeparateId id) const {
 	for (const auto &[existingId, window] : _windows) {
@@ -1342,7 +1422,9 @@ Window::Controller *Application::ensureSeparateWindowFor(
 		return window;
 	};
 	if (const auto existing = separateWindowFor(id)) {
-		if (id.thread && id.type == Window::SeparateType::Chat) {
+		if (id.thread
+			&& id.type == Window::SeparateType::Chat
+			&& !passcodeLocked()) {
 			existing->sessionController()->showThread(
 				id.thread,
 				showAtMsgId,
@@ -1356,6 +1438,9 @@ Window::Controller *Application::ensureSeparateWindowFor(
 		std::make_unique<Window::Controller>(id, showAtMsgId)
 	).first->second.get();
 	processCreatedWindow(result);
+	if (passcodeLocked()) {
+		result->setupPasscodeLock();
+	}
 	result->firstShow();
 	result->finishFirstShow();
 	return activate(result);
@@ -1391,8 +1476,9 @@ Window::Controller *Application::windowForShowingHistory(
 
 Window::Controller *Application::windowForShowingForum(
 		not_null<Data::Forum*> forum) const {
+	const auto tabs = forum->bot() || forum->peer()->useSubsectionTabs();
 	const auto id = Window::SeparateId(
-		Window::SeparateType::Forum,
+		tabs ? Window::SeparateType::Chat : Window::SeparateType::Forum,
 		forum->history());
 	if (const auto separate = separateWindowFor(id)) {
 		return separate;
@@ -1400,9 +1486,15 @@ Window::Controller *Application::windowForShowingForum(
 	auto result = (Window::Controller*)nullptr;
 	enumerateWindows([&](not_null<Window::Controller*> window) {
 		if (const auto controller = window->sessionController()) {
-			const auto current = controller->shownForum().current();
-			if (forum == current) {
-				result = window;
+			if (tabs) {
+				if (controller->windowId() == id) {
+					result = window;
+				}
+			} else {
+				const auto current = controller->shownForum().current();
+				if (forum == current) {
+					result = window;
+				}
 			}
 		}
 	});
@@ -1469,7 +1561,7 @@ void Application::setLastActiveWindow(Window::Controller *window) {
 		return;
 	}
 	window->floatPlayerDelegateValue(
-	) | rpl::start_with_next([=](Media::Player::FloatDelegate *value) {
+	) | rpl::on_next([=](Media::Player::FloatDelegate *value) {
 		if (!value) {
 			_floatPlayers = nullptr;
 		} else if (_floatPlayers) {
@@ -1675,7 +1767,7 @@ void Application::registerLeaveSubscription(not_null<QWidget*> widget) {
 				if (e->type() == QEvent::Leave) {
 					if (const auto taken = _leaveFilters.take(window)) {
 						for (const auto &weak : taken->registered) {
-							if (const auto widget = weak.data()) {
+							if (const auto widget = weak.get()) {
 								QEvent ev(QEvent::Leave);
 								QCoreApplication::sendEvent(widget, &ev);
 							}
@@ -1796,12 +1888,12 @@ void Application::startShortcuts() {
 	Shortcuts::Start();
 
 	_domain->activeSessionChanges(
-	) | rpl::start_with_next([=](Main::Session *session) {
+	) | rpl::on_next([=](Main::Session *session) {
 		refreshApplicationIcon(session);
 	}, _lifetime);
 
 	Shortcuts::Requests(
-	) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(Command::Quit) && request->handle([] {
 			Quit();
diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h
index bfb330d351673d..48355e1c8ff139 100644
--- a/Telegram/SourceFiles/core/application.h
+++ b/Telegram/SourceFiles/core/application.h
@@ -171,6 +171,7 @@ class Application final : public QObject {
 		not_null<QWidget*> widget) const;
 	[[nodiscard]] Window::Controller *activeWindow() const;
 	[[nodiscard]] Window::Controller *activePrimaryWindow() const;
+	void setActivePrimaryWindow(not_null<Window::Controller*> window);
 	[[nodiscard]] Window::Controller *separateWindowFor(
 		Window::SeparateId id) const;
 	Window::Controller *ensureSeparateWindowFor(
@@ -219,6 +220,8 @@ class Application final : public QObject {
 	void setCurrentProxy(
 		const MTP::ProxyData &proxy,
 		MTP::ProxyData::Settings settings);
+	void proxyRotationSettingsChanged();
+	void checkProxyRotation(not_null<Main::Account*> account, int32 state);
 	[[nodiscard]] rpl::producer<ProxyChange> proxyChanges() const;
 	void badMtprotoConfigurationError();
 
@@ -270,9 +273,7 @@ class Application final : public QObject {
 	}
 
 	// Internal links.
-	void checkStartUrl();
-	void checkSendPaths();
-	void checkFileOpen();
+	void checkStartUrls();
 	bool openLocalUrl(const QString &url, QVariant context);
 	bool openInternalUrl(const QString &url, QVariant context);
 	[[nodiscard]] QString changelogLink() const;
@@ -306,6 +307,9 @@ class Application final : public QObject {
 	rpl::producer<bool> passcodeLockChanges() const;
 	rpl::producer<bool> passcodeLockValue() const;
 
+	void lockBySetupEmail();
+	void unlockSetupEmail();
+
 	void checkAutoLock(crl::time lastNonIdleTime = 0);
 	void checkAutoLockIn(crl::time time);
 	void localPasscodeChanged();
@@ -328,6 +332,7 @@ class Application final : public QObject {
 	void handleAppActivated();
 	void handleAppDeactivated();
 	[[nodiscard]] rpl::producer<bool> appDeactivatedValue() const;
+	[[nodiscard]] rpl::producer<> inAppKeyPressed() const;
 
 	void materializeLocalDrafts();
 	[[nodiscard]] rpl::producer<> materializeLocalDraftsRequests() const;
@@ -431,13 +436,15 @@ class Application final : public QObject {
 	Window::Controller *_lastActiveWindow = nullptr;
 	Window::Controller *_lastActivePrimaryWindow = nullptr;
 	Window::Controller *_windowInSettings = nullptr;
+	bool _lastMouseIgnored = false;
+	bool _lastTouchProcessed = false;
 
 	std::unique_ptr<Media::View::OverlayWidget> _mediaView;
 	const std::unique_ptr<Lang::Instance> _langpack;
 	const std::unique_ptr<Lang::CloudManager> _langCloudManager;
 	const std::unique_ptr<ChatHelpers::EmojiKeywords> _emojiKeywords;
 	std::unique_ptr<Lang::Translator> _translator;
-	QPointer<Ui::BoxContent> _badProxyDisableBox;
+	base::weak_qptr<Ui::BoxContent> _badProxyDisableBox;
 
 	const std::unique_ptr<Tray> _tray;
 
@@ -446,13 +453,13 @@ class Application final : public QObject {
 	bool _floatPlayerGifsPaused = false;
 
 	rpl::variable<bool> _passcodeLock;
+	rpl::variable<bool> _setupEmailLock;
 	bool _screenIsLocked = false;
 
 	crl::time _shouldLockAt = 0;
 	base::Timer _autoLockTimer;
 
-	QStringList _filesToOpen;
-	base::Timer _fileOpenTimer;
+	QList<QUrl> _urlsToOpen;
 
 	std::optional<base::Timer> _saveSettingsTimer;
 
@@ -463,6 +470,7 @@ class Application final : public QObject {
 	base::flat_map<not_null<QWidget*>, LeaveFilter> _leaveFilters;
 
 	rpl::event_stream<Media::View::OpenRequest> _openInMediaViewRequests;
+	rpl::event_stream<> _inAppKeyPressed;
 
 	rpl::event_stream<> _materializeLocalDraftsRequests;
 
diff --git a/Telegram/SourceFiles/core/bank_card_click_handler.cpp b/Telegram/SourceFiles/core/bank_card_click_handler.cpp
new file mode 100644
index 00000000000000..1cb6903e33bb43
--- /dev/null
+++ b/Telegram/SourceFiles/core/bank_card_click_handler.cpp
@@ -0,0 +1,257 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "core/bank_card_click_handler.h"
+
+#include "core/click_handler_types.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "mainwidget.h"
+#include "mtproto/sender.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/menu/menu_multiline_action.h"
+#include "ui/widgets/popup_menu.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_calls.h"
+#include "styles/style_chat.h" // popupMenuExpandedSeparator.
+#include "styles/style_chat_helpers.h"
+#include "styles/style_menu_icons.h"
+
+namespace {
+
+struct State final {
+	State(not_null<Main::Session*> session) : sender(&session->mtp()) {
+	}
+	MTP::Sender sender;
+};
+
+struct BankCardData final {
+	QString title;
+	std::vector<EntityLinkData> links;
+};
+
+enum class Status {
+	Loading,
+	Resolved,
+	Failed,
+};
+
+void RequestResolveBankCard(
+		not_null<State*> state,
+		const QString &bankCard,
+		Fn<void(BankCardData)> done,
+		Fn<void(QString)> fail) {
+	state->sender.request(MTPpayments_GetBankCardData(
+		MTP_string(bankCard)
+	)).done([=](const MTPpayments_BankCardData &result) {
+		auto bankCardData = BankCardData{
+			.title = qs(result.data().vtitle()),
+		};
+		for (const auto &tl : result.data().vopen_urls().v) {
+			const auto url = qs(tl.data().vurl());
+			const auto name = qs(tl.data().vname());
+
+			bankCardData.links.emplace_back(EntityLinkData{
+				.text = name,
+				.data = url,
+			});
+		}
+		done(std::move(bankCardData));
+	}).fail([=](const MTP::Error &error) {
+		fail(error.type());
+	}).send();
+}
+
+class ResolveBankCardAction final : public Ui::Menu::ItemBase {
+public:
+	ResolveBankCardAction(
+		not_null<Ui::Menu::Menu*> parent,
+		const style::Menu &st);
+
+	void setStatus(Status status);
+
+	bool isEnabled() const override;
+	not_null<QAction*> action() const override;
+
+protected:
+	int contentHeight() const override;
+
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	void paint(Painter &p);
+
+	const not_null<QAction*> _dummyAction;
+	const style::Menu &_st;
+	const int _height = 0;
+	Status _status = Status::Loading;
+
+	Ui::Text::String _text;
+
+};
+
+ResolveBankCardAction::ResolveBankCardAction(
+	not_null<Ui::Menu::Menu*> parent,
+	const style::Menu &st)
+: ItemBase(parent, st)
+, _dummyAction(Ui::CreateChild<QAction>(parent))
+, _st(st)
+, _height(st::groupCallJoinAsPhotoSize) {
+	setAcceptBoth(true);
+	fitToMenuWidth();
+	setStatus(Status::Loading);
+}
+
+void ResolveBankCardAction::setStatus(Status status) {
+	_status = status;
+	if (status == Status::Resolved) {
+		resize(width(), 0);
+	} else if (status == Status::Failed) {
+		_text.setText(_st.itemStyle, tr::lng_attach_failed(tr::now));
+	} else if (status == Status::Loading) {
+		_text.setText(_st.itemStyle, tr::lng_contacts_loading(tr::now));
+	}
+	update();
+}
+
+void ResolveBankCardAction::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	const auto selected = false;
+	const auto height = contentHeight();
+	if (selected && _st.itemBgOver->c.alpha() < 255) {
+		p.fillRect(0, 0, width(), height, _st.itemBg);
+	}
+	p.fillRect(0, 0, width(), height, selected ? _st.itemBgOver : _st.itemBg);
+
+	const auto &padding = st::groupCallJoinAsPadding;
+	{
+		p.setPen(selected ? _st.itemFgShortcutOver : _st.itemFgShortcut);
+		const auto w = width() - padding.left() - padding.right();
+		_text.draw(p, Ui::Text::PaintContext{
+			.position = QPoint(
+				(width() - w) / 2,
+				(height - _text.countHeight(w)) / 2),
+			.outerWidth = w,
+			.availableWidth = w,
+			.align = style::al_center,
+			.elisionLines = 2,
+		});
+	}
+}
+
+bool ResolveBankCardAction::isEnabled() const {
+	return false;
+}
+
+not_null<QAction*> ResolveBankCardAction::action() const {
+	return _dummyAction;
+}
+
+int ResolveBankCardAction::contentHeight() const {
+	if (_status == Status::Resolved) {
+		return 0;
+	}
+	return _height;
+}
+
+} // namespace
+
+BankCardClickHandler::BankCardClickHandler(
+	not_null<Main::Session*> session,
+	QString text)
+: _session(session)
+, _text(text) {
+}
+
+void BankCardClickHandler::onClick(ClickContext context) const {
+	if (context.button != Qt::LeftButton) {
+		return;
+	}
+	const auto my = context.other.value<ClickHandlerContext>();
+	const auto controller = my.sessionWindow.get();
+	const auto pos = QCursor::pos();
+	if (!controller) {
+		return;
+	}
+	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+		controller->content(),
+		st::popupMenuWithIcons);
+
+	const auto bankCard = _text;
+
+	const auto copy = [bankCard, show = controller->uiShow()] {
+		TextUtilities::SetClipboardText(
+			TextForMimeData::Simple(bankCard));
+		show->showToast({
+			.text = { tr::lng_context_bank_card_copied(tr::now) },
+			.iconLottie = u"toast/copy"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
+	};
+
+	menu->addAction(
+		tr::lng_context_bank_card_copy(tr::now),
+		copy,
+		&st::menuIconCopy);
+
+	auto resolveBankCardAction = base::make_unique_q<ResolveBankCardAction>(
+		menu->menu(),
+		menu->st().menu);
+	const auto resolveBankCardRaw = resolveBankCardAction.get();
+
+	menu->addSeparator(&st::popupMenuExpandedSeparator.menu.separator);
+
+	menu->addAction(std::move(resolveBankCardAction));
+
+	const auto addTitle = [=](const QString &name) {
+		auto button = base::make_unique_q<Ui::Menu::MultilineAction>(
+			menu->menu(),
+			menu->st().menu,
+			st::historyHasCustomEmoji,
+			st::historyBankCardMenuMultilinePosition,
+			TextWithEntities{ name });
+		button->setActionTriggered(copy);
+		menu->addAction(std::move(button));
+	};
+
+	const auto state = menu->lifetime().make_state<State>(
+		&controller->session());
+	RequestResolveBankCard(
+		state,
+		bankCard,
+		[=](BankCardData data) {
+			resolveBankCardRaw->setStatus(Status::Resolved);
+			for (auto &link : data.links) {
+				menu->addAction(
+					base::take(link.text),
+					[u = base::take(link.data)] { UrlClickHandler::Open(u); },
+					&st::menuIconPayment);
+			}
+			if (!data.title.isEmpty()) {
+				addTitle(base::take(data.title));
+			}
+		},
+		[=](const QString &) {
+			resolveBankCardRaw->setStatus(Status::Failed);
+		});
+
+	menu->popup(pos);
+}
+
+auto BankCardClickHandler::getTextEntity() const -> TextEntity {
+	return { EntityType::BankCard };
+}
+
+QString BankCardClickHandler::tooltip() const {
+	return _text;
+}
diff --git a/Telegram/SourceFiles/core/bank_card_click_handler.h b/Telegram/SourceFiles/core/bank_card_click_handler.h
new file mode 100644
index 00000000000000..ff45af82e184cd
--- /dev/null
+++ b/Telegram/SourceFiles/core/bank_card_click_handler.h
@@ -0,0 +1,30 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/basic_click_handlers.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+class BankCardClickHandler : public ClickHandler {
+public:
+	BankCardClickHandler(not_null<Main::Session*> session, QString text);
+
+	void onClick(ClickContext context) const override;
+
+	TextEntity getTextEntity() const override;
+
+	QString tooltip() const override;
+
+private:
+	const not_null<Main::Session*> _session;
+	QString _text;
+
+};
diff --git a/Telegram/SourceFiles/core/cached_webview_availability.h b/Telegram/SourceFiles/core/cached_webview_availability.h
new file mode 100644
index 00000000000000..cef8d5fd286494
--- /dev/null
+++ b/Telegram/SourceFiles/core/cached_webview_availability.h
@@ -0,0 +1,19 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "webview/webview_interface.h"
+
+namespace Core {
+
+[[nodiscard]] inline const Webview::Available &CachedWebviewAvailability() {
+	static const auto result = Webview::Availability();
+	return result;
+}
+
+} // namespace Core
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index 2d0d52fe06a133..7d317ec7336ef8 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "lang/lang_keys.h"
 #include "core/application.h"
+#include "core/version.h"
 #include "main/main_domain.h"
 #include "main/main_session.h"
 #include "storage/storage_domain.h"
@@ -37,7 +38,7 @@ std::map<int, const char*> BetaLogs() {
 		"- Nice looking code blocks with syntax highlight.\n"
 
 		"- Copy full code block by click on its header.\n"
-		
+
 		"- Send a highlighted code block using ```language syntax.\n"
 	}
 	};
@@ -51,7 +52,7 @@ Changelogs::Changelogs(not_null<Main::Session*> session, int oldVersion)
 	_session->data().chatsListChanges(
 	) | rpl::filter([](Data::Folder *folder) {
 		return !folder;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		requestCloudLogs();
 	}, _chatsSubscription);
 }
@@ -135,7 +136,7 @@ void Changelogs::addBetaLog(int changeVersion, const char *changes) {
 	}
 	const auto text = [&] {
 		static const auto simple = u"\n- "_q;
-		static const auto separator = QString::fromUtf8("\n\xE2\x80\xA2 ");
+		static const auto separator = '\n' + Ui::kQBullet + ' ';
 		auto result = QString::fromUtf8(changes).trimmed();
 		if (result.startsWith(base::StringViewMid(simple, 1))) {
 			result = separator.mid(1) + result.mid(simple.size() - 1);
diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp
index 231d01972c8040..162971ff04271e 100644
--- a/Telegram/SourceFiles/core/click_handler_types.cpp
+++ b/Telegram/SourceFiles/core/click_handler_types.cpp
@@ -7,16 +7,20 @@ For license and copyright information please follow this link:
 */
 #include "core/click_handler_types.h"
 
+#include "base/unixtime.h"
 #include "lang/lang_keys.h"
 #include "chat_helpers/bot_command.h"
 #include "core/application.h"
 #include "core/local_url_handlers.h"
+#include "core/file_utilities.h"
 #include "mainwidget.h"
 #include "main/main_session.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/toast/toast.h"
+#include "ui/widgets/popup_menu.h"
 #include "base/qthelp_regex.h"
 #include "base/qt/qt_key_modifiers.h"
+#include "base/random.h"
 #include "storage/storage_account.h"
 #include "history/history.h"
 #include "history/view/history_view_element.h"
@@ -28,11 +32,66 @@ For license and copyright information please follow this link:
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "window/window_session_controller_link_info.h"
+#include "apiwrap.h"
+#include "history/view/history_view_schedule_box.h"
+#include "history/view/history_view_scheduled_section.h"
+#include "menu/menu_send.h"
+#include "data/data_types.h"
 #include "styles/style_calls.h" // groupCallBoxLabel
+#include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+
+#include <QtCore/QDateTime>
+#include <QtCore/QLocale>
 
 namespace {
 
+constexpr auto kReminderSetToastDuration = 4 * crl::time(1000);
+
+[[nodiscard]] TextWithEntities BoldDomainInUrl(const QString &url) {
+	auto result = TextWithEntities{ .text = url };
+
+	if (const auto parsedUrl = QUrl(url); parsedUrl.isValid()) {
+		if (const auto host = parsedUrl.host(); !host.isEmpty()) {
+			if (const auto hostPos = url.indexOf(host); hostPos != -1) {
+				auto boldEntity = EntityInText(
+					EntityType::Bold,
+					hostPos,
+					host.length());
+
+				if (host.startsWith("www.")) {
+					boldEntity = EntityInText(
+						EntityType::Bold,
+						hostPos + 4,
+						host.length() - 4);
+				}
+
+				result.entities.push_back(boldEntity);
+			}
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] bool IsTelegramShortLinkHost(const QUrl &url) {
+	using namespace qthelp;
+
+	return regex_match(
+		"(^|\\.)(telegram\\.(me|dog)|t\\.me)$",
+		url.host(),
+		RegExOption::CaseInsensitive).valid();
+}
+
+[[nodiscard]] bool HiddenUrlRequiresConfirmation(const QUrl &url) {
+	return UrlRequiresConfirmation(url) || IsTelegramShortLinkHost(url);
+}
+
+[[nodiscard]] bool RequiresConfirmationAfterIvFallback(const QUrl &url) {
+	const auto host = url.host().toLower();
+	return (host == u"telegra.ph"_q) || (host == u"te.legra.ph"_q);
+}
+
 // Possible context owners: media viewer, profile, history widget.
 
 void SearchByHashtag(ClickContext context, const QString &tag) {
@@ -67,6 +126,93 @@ void SearchByHashtag(ClickContext context, const QString &tag) {
 			: Dialogs::Key());
 }
 
+void ExportToCalendar(TimeId date, const QString &messageText) {
+	const auto start = QDateTime::fromSecsSinceEpoch(
+		date,
+		Qt::UTC);
+	const auto end = QDateTime::fromSecsSinceEpoch(
+		date + 3600,
+		Qt::UTC);
+	const auto now = QDateTime::currentDateTimeUtc();
+	const auto format = u"yyyyMMdd'T'HHmmss'Z'"_q;
+	const auto locale = QLocale();
+	const auto raw = locale.toString(
+		base::unixtime::parse(date),
+		QLocale::LongFormat);
+	auto summary = raw;
+	summary.replace('\\', u"\\\\"_q);
+	summary.replace(';', u"\\;"_q);
+	summary.replace(',', u"\\,"_q);
+	summary.replace('\n', u"\\n"_q);
+	auto description = messageText;
+	description.replace('\\', u"\\\\"_q);
+	description.replace(';', u"\\;"_q);
+	description.replace(',', u"\\,"_q);
+	description.replace('\n', u"\\n"_q);
+	const auto uid = base::RandomValue<uint64>();
+	const auto content = u"BEGIN:VCALENDAR\r\n"
+		"VERSION:2.0\r\n"
+		"PRODID:-//Telegram Desktop//EN\r\n"
+		"BEGIN:VEVENT\r\n"
+		"DTSTART:%1\r\n"
+		"DTEND:%2\r\n"
+		"DTSTAMP:%3\r\n"
+		"UID:telegram-%4-%7@telegram.org\r\n"
+		"SUMMARY:%5\r\n"
+		"DESCRIPTION:%6\r\n"
+		"END:VEVENT\r\n"
+		"END:VCALENDAR\r\n"_q
+			.arg(start.toString(format))
+			.arg(end.toString(format))
+			.arg(now.toString(format))
+			.arg(date)
+			.arg(summary)
+			.arg(description)
+			.arg(uid, 0, 16);
+	const auto dir = cWorkingDir() + u"tdata/temp"_q;
+	QDir().mkpath(dir);
+	const auto path = u"%1/event_%2.ics"_q
+		.arg(dir)
+		.arg(date);
+	auto file = QFile(path);
+	if (file.open(QIODevice::WriteOnly)) {
+		file.write(content.toUtf8());
+		file.close();
+		File::Launch(path);
+	}
+}
+
+void DoneSetReminder(std::shared_ptr<ChatHelpers::Show> show) {
+	if (!show->valid()) {
+		return;
+	}
+	const auto text = tr::lng_reminder_scheduled_in(
+		tr::now,
+		lt_link,
+		tr::link(tr::bold(tr::lng_saved_messages(tr::now))),
+		tr::marked);
+	const auto session = &show->session();
+	const auto filter = [=](
+			const ClickHandlerPtr &,
+			Qt::MouseButton) {
+		if (const auto controller = show->resolveWindow()) {
+			controller->showSection(
+				std::make_shared<HistoryView::ScheduledMemento>(
+					session->data().history(session->user())));
+		}
+		return false;
+	};
+	show->showToast({
+		.text = text,
+		.filter = filter,
+		.iconLottie = u"toast/saved_messages"_q,
+		.iconPadding = st::selfForwardsTaggerIconPadding,
+		.st = &st::selfForwardsTaggerToast,
+		.attach = RectPart::Top,
+		.duration = kReminderSetToastDuration,
+	});
+};
+
 } // namespace
 
 bool UrlRequiresConfirmation(const QUrl &url) {
@@ -86,17 +232,30 @@ bool UrlRequiresConfirmation(const QUrl &url) {
 }
 
 QString HiddenUrlClickHandler::copyToClipboardText() const {
-	return url().startsWith(u"internal:url:"_q)
-		? url().mid(u"internal:url:"_q.size())
-		: url();
+	const auto original = originalUrl();
+	const auto originalExternal = UrlClickHandler::ExternalUrlFromInternalUrl(
+		original);
+	if (!originalExternal.isEmpty()) {
+		return originalExternal;
+	}
+	const auto value = url();
+	const auto external = UrlClickHandler::ExternalUrlFromInternalUrl(value);
+	return external.isEmpty() ? value : external;
 }
 
 QString HiddenUrlClickHandler::copyToClipboardContextItemText() const {
-	return url().isEmpty()
+	const auto original = originalUrl();
+	const auto originalExternal = UrlClickHandler::ExternalUrlFromInternalUrl(
+		original);
+	const auto value = originalExternal.isEmpty() ? url() : original;
+	const auto external = originalExternal.isEmpty()
+		? UrlClickHandler::ExternalUrlFromInternalUrl(value)
+		: originalExternal;
+	return value.isEmpty()
 		? QString()
-		: !url().startsWith(u"internal:"_q)
+		: !value.startsWith(u"internal:"_q)
 		? UrlClickHandler::copyToClipboardContextItemText()
-		: url().startsWith(u"internal:url:"_q)
+		: !external.isEmpty()
 		? UrlClickHandler::copyToClipboardContextItemText()
 		: QString();
 }
@@ -107,14 +266,15 @@ QString HiddenUrlClickHandler::dragText() const {
 }
 
 void HiddenUrlClickHandler::Open(QString url, QVariant context) {
+	if (const auto external = UrlClickHandler::ExternalUrlFromInternalUrl(url);
+			!external.isEmpty()) {
+		url = external;
+	}
 	url = Core::TryConvertUrlToLocal(url);
-	if (Core::InternalPassportLink(url)) {
+	if (Core::InternalPassportOrOAuthLink(url)) {
 		return;
 	}
 
-	const auto open = [=] {
-		UrlClickHandler::Open(url, context);
-	};
 	if (url.startsWith(u"tg://"_q, Qt::CaseInsensitive)
 		|| url.startsWith(u"internal:"_q, Qt::CaseInsensitive)) {
 		UrlClickHandler::Open(url, QVariant::fromValue([&] {
@@ -126,8 +286,31 @@ void HiddenUrlClickHandler::Open(QString url, QVariant context) {
 		const auto parsedUrl = url.startsWith(u"tonsite://"_q)
 			? QUrl(url)
 			: QUrl::fromUserInput(url);
-		if (UrlRequiresConfirmation(parsedUrl) && !base::IsCtrlPressed()) {
-			const auto my = context.value<ClickHandlerContext>();
+		auto my = context.value<ClickHandlerContext>();
+		auto openContext = context;
+		const auto forceConfirmation = my.forceExternalUrlConfirmation
+			&& my.ignoreIv;
+		const auto skipConfirmation = base::IsCtrlPressed();
+		if (forceConfirmation) {
+			my.forceExternalUrlConfirmation = false;
+			openContext = QVariant::fromValue(my);
+		}
+		const auto confirmAfterIvFallback
+			= RequiresConfirmationAfterIvFallback(parsedUrl)
+			&& !my.ignoreIv
+			&& !skipConfirmation;
+		const auto canTryIv = (my.sessionWindow.get() != nullptr);
+		if (confirmAfterIvFallback && canTryIv) {
+			my.forceExternalUrlConfirmation = true;
+			openContext = QVariant::fromValue(my);
+		}
+		const auto open = [=] {
+			UrlClickHandler::Open(url, openContext);
+		};
+		if (forceConfirmation
+			|| (confirmAfterIvFallback && !canTryIv)
+			|| (HiddenUrlRequiresConfirmation(parsedUrl)
+				&& !skipConfirmation)) {
 			if (!my.show) {
 				Core::App().hideMediaView();
 			}
@@ -155,7 +338,39 @@ void HiddenUrlClickHandler::Open(QString url, QVariant context) {
 					: st::boxLabel;
 				box->addSkip(st.style.lineHeight - st::boxPadding.bottom());
 				const auto url = box->addRow(
-					object_ptr<Ui::FlatLabel>(box, displayUrl, st));
+					object_ptr<Ui::FlatLabel>(
+						box,
+						rpl::single(BoldDomainInUrl(displayUrl)),
+						st));
+				url->setContextMenuHook([=](
+						Ui::FlatLabel::ContextMenuRequest request) {
+					const auto copyContextText = [=] {
+						TextUtilities::SetClipboardText(
+							TextForMimeData::Simple(displayUrl));
+					};
+					if (request.fullSelection) {
+						request.menu->addAction(
+							tr::lng_context_copy_link(tr::now),
+							copyContextText);
+					} else if (request.uponSelection
+						&& !request.fullSelection) {
+						const auto selection = request.selection;
+						const auto copySelectedText = [=] {
+							TextUtilities::SetClipboardText(
+								TextForMimeData::Simple(
+									displayUrl.mid(
+										selection.from,
+										selection.to - selection.from)));
+						};
+						request.menu->addAction(
+							tr::lng_context_copy_selected(tr::now),
+							copySelectedText);
+					} else if (request.selection.empty()) {
+						request.menu->addAction(
+							tr::lng_context_copy_link(tr::now),
+							copyContextText);
+					}
+				});
 				url->setSelectable(true);
 				url->setContextCopyText(tr::lng_context_copy_link(tr::now));
 			});
@@ -173,7 +388,7 @@ void HiddenUrlClickHandler::Open(QString url, QVariant context) {
 
 void BotGameUrlClickHandler::onClick(ClickContext context) const {
 	const auto url = Core::TryConvertUrlToLocal(this->url());
-	if (Core::InternalPassportLink(url)) {
+	if (Core::InternalPassportOrOAuthLink(url)) {
 		return;
 	}
 	const auto openLink = [=] {
@@ -189,6 +404,7 @@ void BotGameUrlClickHandler::onClick(ClickContext context) const {
 	const auto game = media ? media->game() : nullptr;
 	if (url.startsWith(u"tg://"_q, Qt::CaseInsensitive) || !_bot || !game) {
 		openLink();
+		return;
 	}
 	const auto bot = _bot;
 	const auto title = game->title;
@@ -196,6 +412,7 @@ void BotGameUrlClickHandler::onClick(ClickContext context) const {
 	const auto openGame = [=] {
 		bot->session().attachWebView().open({
 			.bot = bot,
+			.context = { .controller = weakController },
 			.button = {.url = url.toUtf8() },
 			.source = InlineBots::WebViewSourceGame{
 				.messageId = itemId,
@@ -204,13 +421,13 @@ void BotGameUrlClickHandler::onClick(ClickContext context) const {
 		});
 	};
 	if (_bot->isVerified()
-		|| _bot->session().local().isBotTrustedOpenGame(_bot->id)) {
+		|| _bot->session().local().isPeerTrustedOpenGame(_bot->id)) {
 		openGame();
 	} else {
 		if (const auto controller = my.sessionWindow.get()) {
 			const auto callback = [=, bot = _bot](Fn<void()> close) {
 				close();
-				bot->session().local().markBotTrustedOpenGame(bot->id);
+				bot->session().local().markPeerTrustedOpenGame(bot->id);
 				openGame();
 			};
 			controller->show(Ui::MakeConfirmBox({
@@ -227,7 +444,13 @@ void BotGameUrlClickHandler::onClick(ClickContext context) const {
 }
 
 auto HiddenUrlClickHandler::getTextEntity() const -> TextEntity {
-	return { EntityType::CustomUrl, url() };
+	const auto original = originalUrl();
+	return {
+		EntityType::CustomUrl,
+		UrlClickHandler::ExternalUrlFromInternalUrl(original).isEmpty()
+			? url()
+			: original
+	};
 }
 
 QString MentionClickHandler::copyToClipboardContextItemText() const {
@@ -367,7 +590,11 @@ void MonospaceClickHandler::onClick(ClickContext context) const {
 	}
 	const auto my = context.other.value<ClickHandlerContext>();
 	if (const auto controller = my.sessionWindow.get()) {
-		controller->showToast(tr::lng_text_copied(tr::now));
+		controller->showToast({
+			.text = { tr::lng_text_copied(tr::now) },
+			.iconLottie = u"toast/copy"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	}
 	TextUtilities::SetClipboardText(TextForMimeData::Simple(_text.trimmed()));
 }
@@ -379,3 +606,103 @@ auto MonospaceClickHandler::getTextEntity() const -> TextEntity {
 QString MonospaceClickHandler::url() const {
 	return _text;
 }
+
+FormattedDateClickHandler::FormattedDateClickHandler(
+	int32 date,
+	FormattedDateFlags flags)
+: _date(date)
+, _entityData(SerializeFormattedDateData(date, flags)) {
+}
+
+void FormattedDateClickHandler::onClick(ClickContext context) const {
+	if (context.button != Qt::LeftButton) {
+		return;
+	}
+	const auto my = context.other.value<ClickHandlerContext>();
+	const auto controller = my.sessionWindow.get();
+	if (!controller) {
+		return;
+	}
+	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+		controller->content(),
+		st::popupMenuWithIcons);
+
+	const auto date = _date;
+	const auto show = controller->uiShow();
+
+	menu->addAction(
+		tr::lng_context_copy_date(tr::now),
+		[date, show] {
+			const auto text = QLocale().toString(
+				base::unixtime::parse(date),
+				QLocale::LongFormat);
+			TextUtilities::SetClipboardText(TextForMimeData::Simple(text));
+			show->showToast({
+				.text = { tr::lng_date_copied(tr::now) },
+				.iconLottie = u"toast/copy"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		},
+		&st::menuIconCopy);
+
+	const auto itemId = my.itemId;
+	const auto &owner = controller->session().data();
+	const auto item = owner.message(itemId);
+
+	const auto messageText = item ? item->originalText().text : QString();
+	menu->addAction(
+		tr::lng_context_add_to_calendar(tr::now),
+		[date, messageText] { ExportToCalendar(date, messageText); },
+		&st::menuIconSchedule);
+
+	const auto canForward = item
+		&& !item->forbidsForward()
+		&& item->history()->peer->allowsForwarding();
+	if (canForward) {
+		menu->addAction(
+			tr::lng_context_set_reminder(tr::now),
+			[date, itemId, show] {
+				const auto session = &show->session();
+				const auto item = session->data().message(itemId);
+				if (!item) {
+					return;
+				}
+				const auto self = session->user();
+				const auto history = self->owner().history(self);
+				const auto now = base::unixtime::now();
+				const auto scheduleTime = (date > now + 60)
+					? date
+					: HistoryView::DefaultScheduleTime();
+				show->showBox(HistoryView::PrepareScheduleBox(
+					session,
+					show,
+					SendMenu::Details{ .type = SendMenu::Type::Reminder },
+					[=](Api::SendOptions options) {
+						auto action = Api::SendAction(history, options);
+						action.clearDraft = false;
+						action.generateLocal = false;
+						session->api().forwardMessages(
+							Data::ResolvedForwardDraft{
+								.items = { item },
+							},
+							action,
+							[=] { DoneSetReminder(show); });
+					},
+					Api::SendOptions(),
+					scheduleTime));
+			},
+			&st::menuIconNotifications);
+	}
+
+	menu->popup(QCursor::pos());
+}
+
+auto FormattedDateClickHandler::getTextEntity() const -> TextEntity {
+	return { EntityType::FormattedDate, _entityData };
+}
+
+QString FormattedDateClickHandler::tooltip() const {
+	return QLocale().toString(
+		base::unixtime::parse(_date),
+		QLocale::LongFormat);
+}
diff --git a/Telegram/SourceFiles/core/click_handler_types.h b/Telegram/SourceFiles/core/click_handler_types.h
index b3aa0bae02f1ad..887f3a3ecd66c4 100644
--- a/Telegram/SourceFiles/core/click_handler_types.h
+++ b/Telegram/SourceFiles/core/click_handler_types.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "ui/basic_click_handlers.h"
+#include "ui/text/text_entity.h"
 #include "data/data_msg_id.h"
 
 constexpr auto kPeerLinkPeerIdProperty = 0x01;
@@ -16,6 +17,10 @@ constexpr auto kDocumentLinkMediaProperty = 0x03;
 constexpr auto kSendReactionEmojiProperty = 0x04;
 constexpr auto kReactionsCountEmojiProperty = 0x05;
 constexpr auto kDocumentFilenameTooltipProperty = 0x06;
+constexpr auto kPhoneNumberLinkProperty = 0x07;
+constexpr auto kTodoListItemIdProperty = 0x08;
+constexpr auto kPollOptionProperty = 0x09;
+constexpr auto kFastShareProperty = 0x0a;
 
 namespace Ui {
 class Show;
@@ -51,6 +56,7 @@ struct ClickHandlerContext {
 	bool skipBotAutoLogin = false;
 	bool botStartAutoSubmit = false;
 	bool ignoreIv = false;
+	bool forceExternalUrlConfirmation = false;
 	bool dark = false;
 	// Is filled from peer info.
 	PeerData *peer = nullptr;
@@ -71,7 +77,12 @@ class HiddenUrlClickHandler : public UrlClickHandler {
 	void onClick(ClickContext context) const override {
 		const auto button = context.button;
 		if (button == Qt::LeftButton || button == Qt::MiddleButton) {
-			Open(url(), context.other);
+			const auto original = originalUrl();
+			Open(
+				UrlClickHandler::ExternalUrlFromInternalUrl(original).isEmpty()
+					? url()
+					: original,
+				context.other);
 		}
 	}
 
@@ -234,3 +245,17 @@ class MonospaceClickHandler : public TextClickHandler {
 	const TextEntity _entity;
 
 };
+
+class FormattedDateClickHandler : public ClickHandler {
+public:
+	FormattedDateClickHandler(TimeId date, FormattedDateFlags flags);
+
+	void onClick(ClickContext context) const override;
+	TextEntity getTextEntity() const override;
+	QString tooltip() const override;
+
+private:
+	TimeId _date = 0;
+	QString _entityData;
+
+};
diff --git a/Telegram/SourceFiles/core/core_cloud_password.cpp b/Telegram/SourceFiles/core/core_cloud_password.cpp
index a835112dc9b2ad..95e1782a8fb0f6 100644
--- a/Telegram/SourceFiles/core/core_cloud_password.cpp
+++ b/Telegram/SourceFiles/core/core_cloud_password.cpp
@@ -315,6 +315,8 @@ CloudPasswordState ParseCloudPasswordState(
 		ParseSecureSecretAlgo(data.vnew_secure_algo()));
 	result.unconfirmedPattern = qs(
 		data.vemail_unconfirmed_pattern().value_or_empty());
+	result.loginEmailPattern = qs(
+		data.vlogin_email_pattern().value_or_empty());
 	result.pendingResetDate = data.vpending_reset_date().value_or_empty();
 
 	result.outdatedClient = [&] {
diff --git a/Telegram/SourceFiles/core/core_cloud_password.h b/Telegram/SourceFiles/core/core_cloud_password.h
index 2c4d06bc860f79..8840ae04a8b1a8 100644
--- a/Telegram/SourceFiles/core/core_cloud_password.h
+++ b/Telegram/SourceFiles/core/core_cloud_password.h
@@ -135,6 +135,7 @@ struct CloudPasswordState {
 	bool outdatedClient = false;
 	QString hint;
 	QString unconfirmedPattern;
+	QString loginEmailPattern;
 	TimeId pendingResetDate = 0;
 };
 
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 71d9ae0e8a4f45..ea1f066718a3f7 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -23,6 +23,26 @@ For license and copyright information please follow this link:
 namespace Core {
 namespace {
 
+constexpr auto kInitialVideoQuality = 480; // Start with SD.
+constexpr auto kMinIvZoom = 25;
+constexpr auto kMaxIvZoom = 400;
+
+[[nodiscard]] int DefaultIvZoom() {
+	const auto exact = cScale() * 100 / cScreenScale();
+	const auto snap10 = ((exact + 5) / 10) * 10;
+	const auto snap25 = ((exact + 12) / 25) * 25;
+	return (std::abs(exact - snap25) <= std::abs(exact - snap10))
+		? snap25
+		: snap10;
+}
+
+[[nodiscard]] int ResolveIvZoom(int value) {
+	return std::clamp(
+		(value > 0) ? value : DefaultIvZoom(),
+		kMinIvZoom,
+		kMaxIvZoom);
+}
+
 [[nodiscard]] WindowPosition Deserialize(const QByteArray &data) {
 	QDataStream stream(data);
 	stream.setVersion(QDataStream::Qt_5_1);
@@ -88,6 +108,21 @@ void LogPosition(const WindowPosition &position, const QString &name) {
 	return RecentEmojiDocument{ id, (test == '1') };
 }
 
+[[nodiscard]] quint32 SerializeVideoQuality(Media::VideoQuality quality) {
+	static_assert(sizeof(Media::VideoQuality) == sizeof(uint32));
+	auto result = uint32();
+	const auto data = static_cast<const void*>(&quality);
+	memcpy(&result, data, sizeof(quality));
+	return result;
+}
+
+[[nodiscard]] Media::VideoQuality DeserializeVideoQuality(quint32 value) {
+	auto result = Media::VideoQuality();
+	const auto data = static_cast<void*>(&result);
+	memcpy(data, &value, sizeof(result));
+	return (result.height <= 4320) ? result : Media::VideoQuality();
+}
+
 } // namespace
 
 [[nodiscard]] WindowPosition AdjustToScale(
@@ -124,7 +159,8 @@ Settings::Settings()
 , _floatPlayerColumn(Window::Column::Second)
 , _floatPlayerCorner(RectPart::TopRight)
 , _dialogsWithChatWidthRatio(DefaultDialogsWidthRatio())
-, _dialogsNoChatWidthRatio(DefaultDialogsWidthRatio()) {
+, _dialogsNoChatWidthRatio(DefaultDialogsWidthRatio())
+, _videoQuality({ .height = kInitialVideoQuality }) {
 }
 
 Settings::~Settings() = default;
@@ -137,6 +173,8 @@ QByteArray Settings::serialize() const {
 	LogPosition(_mediaViewPosition, u"Viewer"_q);
 	const auto ivPosition = Serialize(_ivPosition);
 	LogPosition(_ivPosition, u"IV"_q);
+	const auto callPanelPosition = Serialize(_callPanelPosition);
+	LogPosition(_callPanelPosition, u"CallPanel"_q);
 	const auto proxy = _proxy.serialize();
 	const auto skipLanguages = _skipTranslationLanguages.current();
 
@@ -222,7 +260,18 @@ QByteArray Settings::serialize() const {
 		+ Serialize::stringSize(_customFontFamily)
 		+ sizeof(qint32) * 3
 		+ Serialize::bytearraySize(_tonsiteStorageToken)
-		+ sizeof(qint32) * 2;
+		+ sizeof(qint32) * 8
+		+ sizeof(ushort)
+		+ sizeof(qint32) // _notificationsDisplayChecksum
+		+ Serialize::bytearraySize(callPanelPosition)
+		+ sizeof(qint32) * 4;
+	size += sizeof(quint32);
+	for (const auto &[key, value] : _prefs) {
+		size += Serialize::bytearraySize(key)
+			+ Serialize::bytearraySize(value);
+	}
+	size += sizeof(qint32) // _audioPlaybackSpeed
+		+ sizeof(qint32); // _mediaGridZoomStep
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -291,7 +340,7 @@ QByteArray Settings::serialize() const {
 			<< qint32(_thirdSectionExtendedBy)
 			<< qint32(_notifyFromAll ? 1 : 0)
 			<< qint32(_nativeWindowFrame.current() ? 1 : 0)
-			<< qint32(_systemDarkModeEnabled.current() ? 1 : 0)
+			<< qint32(0) // Legacy system dark mode
 			<< _cameraDeviceId.current()
 			<< qint32(_ipRevealWarning ? 1 : 0)
 			<< qint32(_groupCallPushToTalk ? 1 : 0)
@@ -318,8 +367,8 @@ QByteArray Settings::serialize() const {
 			<< qint32(_disableOpenGL ? 1 : 0)
 			<< _photoEditorBrush
 			<< qint32(_groupCallNoiseSuppression ? 1 : 0)
-			<< qint32(SerializePlaybackSpeed(_voicePlaybackSpeed))
-			<< qint32(_closeToTaskbar.current() ? 1 : 0)
+			<< qint32(SerializePlaybackSpeed(_voicePlaybackSpeed.current()))
+			<< qint32(_closeBehavior)
 			<< _customDeviceModel.current()
 			<< qint32(_playerRepeatMode.current())
 			<< qint32(_playerOrderMode.current())
@@ -378,7 +427,26 @@ QByteArray Settings::serialize() const {
 			<< qint32(!_weatherInCelsius ? 0 : *_weatherInCelsius ? 1 : 2)
 			<< _tonsiteStorageToken
 			<< qint32(_includeMutedCounterFolders ? 1 : 0)
-			<< qint32(_ivZoom.current());
+			<< qint32(_chatFiltersHorizontal.current() ? 1 : 0)
+			<< qint32(_skipToastsInFocus ? 1 : 0)
+			<< qint32(_recordVideoMessages ? 1 : 0)
+			<< SerializeVideoQuality(_videoQuality)
+			<< qint32(_ivZoom.current())
+			<< qint32(_systemDarkModeEnabled.current() ? 1 : 0)
+			<< qint32(_quickDialogAction)
+			<< _notificationsVolume
+			<< _notificationsDisplayChecksum
+			<< callPanelPosition
+			<< qint32(_cornerReply.current() ? 1 : 0)
+			<< qint32(_systemAccentColorEnabled ? 1 : 0)
+			<< qint32(_usePlatformTranslation ? 1 : 0)
+			<< qint32(_systemTextReplace.current() ? 1 : 0);
+		stream << quint32(_prefs.size());
+		for (const auto &[key, value] : _prefs) {
+			stream << key << value;
+		}
+		stream << qint32(SerializePlaybackSpeed(_audioPlaybackSpeed.current()));
+		stream << qint32(_mediaGridZoomStep);
 	}
 
 	Ensures(result.size() == size);
@@ -409,6 +477,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 nativeNotifications = _nativeNotifications ? (*_nativeNotifications ? 1 : 2) : 0;
 	qint32 notificationsCount = _notificationsCount;
 	qint32 notificationsCorner = static_cast<qint32>(_notificationsCorner);
+	qint32 notificationsDisplayChecksum = _notificationsDisplayChecksum;
 	qint32 autoLock = _autoLock;
 	QString playbackDeviceId = _playbackDeviceId.current();
 	QString captureDeviceId = _captureDeviceId.current();
@@ -438,7 +507,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 suggestStickersByEmoji = _suggestStickersByEmoji ? 1 : 0;
 	qint32 spellcheckerEnabled = _spellcheckerEnabled.current() ? 1 : 0;
 	qint32 videoPlaybackSpeed = SerializePlaybackSpeed(_videoPlaybackSpeed);
-	qint32 voicePlaybackSpeed = SerializePlaybackSpeed(_voicePlaybackSpeed);
+	qint32 voicePlaybackSpeed = SerializePlaybackSpeed(
+		_voicePlaybackSpeed.current());
+	auto audioPlaybackSpeed = std::optional<qint32>();
 	QByteArray videoPipGeometry = _videoPipGeometry;
 	qint32 dictionariesEnabledCount = 0;
 	std::vector<int> dictionariesEnabled;
@@ -470,7 +541,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	QByteArray proxy;
 	qint32 hiddenGroupCallTooltips = qint32(_hiddenGroupCallTooltips.value());
 	QByteArray photoEditorBrush = _photoEditorBrush;
-	qint32 closeToTaskbar = _closeToTaskbar.current() ? 1 : 0;
+	qint32 closeBehavior = qint32(_closeBehavior);
 	QString customDeviceModel = _customDeviceModel.current();
 	qint32 playerRepeatMode = static_cast<qint32>(_playerRepeatMode.current());
 	qint32 playerOrderMode = static_cast<qint32>(_playerOrderMode.current());
@@ -480,6 +551,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 hardwareAcceleratedVideo = _hardwareAcceleratedVideo ? 1 : 0;
 	qint32 chatQuickAction = static_cast<qint32>(_chatQuickAction);
 	qint32 suggestAnimatedEmoji = _suggestAnimatedEmoji ? 1 : 0;
+	qint32 cornerReply = _cornerReply.current() ? 1 : 0;
 	qint32 cornerReaction = _cornerReaction.current() ? 1 : 0;
 	qint32 legacySkipTranslationForLanguage = _translateButtonEnabled ? 1 : 0;
 	qint32 skipTranslationLanguagesCount = 0;
@@ -498,11 +570,23 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 trayIconMonochrome = (_trayIconMonochrome.current() ? 1 : 0);
 	qint32 ttlVoiceClickTooltipHidden = _ttlVoiceClickTooltipHidden.current() ? 1 : 0;
 	QByteArray ivPosition;
+	QByteArray callPanelPosition;
 	QString customFontFamily = _customFontFamily;
 	qint32 systemUnlockEnabled = _systemUnlockEnabled ? 1 : 0;
 	qint32 weatherInCelsius = !_weatherInCelsius ? 0 : *_weatherInCelsius ? 1 : 2;
 	QByteArray tonsiteStorageToken = _tonsiteStorageToken;
 	qint32 ivZoom = _ivZoom.current();
+	qint32 skipToastsInFocus = _skipToastsInFocus ? 1 : 0;
+	qint32 recordVideoMessages = _recordVideoMessages ? 1 : 0;
+	quint32 videoQuality = SerializeVideoQuality(_videoQuality);
+	quint32 chatFiltersHorizontal = _chatFiltersHorizontal.current() ? 1 : 0;
+	quint32 quickDialogAction = quint32(_quickDialogAction);
+	ushort notificationsVolume = _notificationsVolume;
+	qint32 systemAccentColorEnabled = _systemAccentColorEnabled
+		? 1
+		: 0;
+	qint32 usePlatformTranslation = _usePlatformTranslation ? 1 : 0;
+	qint32 systemTextReplace = _systemTextReplace.current() ? 1 : 0;
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -584,6 +668,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 		stream >> nativeWindowFrame;
 	}
 	if (!stream.atEnd()) {
+		// Read over this one below, if was in the file.
 		stream >> systemDarkModeEnabled;
 	}
 	if (!stream.atEnd()) {
@@ -661,7 +746,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 		stream >> voicePlaybackSpeed;
 	}
 	if (!stream.atEnd()) {
-		stream >> closeToTaskbar;
+		stream >> closeBehavior;
 	}
 	if (!stream.atEnd()) {
 		stream >> customDeviceModel;
@@ -812,9 +897,77 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> includeMutedCounterFolders;
 	}
+	if (!stream.atEnd()) {
+		stream >> chatFiltersHorizontal;
+	}
+	if (!stream.atEnd()) {
+		stream >> skipToastsInFocus;
+	}
+	if (!stream.atEnd()) {
+		stream >> recordVideoMessages;
+	}
+	if (!stream.atEnd()) {
+		stream >> videoQuality;
+	}
 	if (!stream.atEnd()) {
 		stream >> ivZoom;
 	}
+	if (!stream.atEnd()) {
+		stream >> systemDarkModeEnabled;
+	}
+	if (!stream.atEnd()) {
+		stream >> quickDialogAction;
+	}
+	if (!stream.atEnd()) {
+		stream >> notificationsVolume;
+	}
+	if (!stream.atEnd()) {
+		stream >> notificationsDisplayChecksum;
+	}
+	if (!stream.atEnd()) {
+		stream >> callPanelPosition;
+	}
+	if (!stream.atEnd()) {
+		stream >> cornerReply;
+	}
+	if (!stream.atEnd()) {
+		stream >> systemAccentColorEnabled;
+	}
+	if (!stream.atEnd()) {
+		stream >> usePlatformTranslation;
+	}
+	if (!stream.atEnd()) {
+		stream >> systemTextReplace;
+	}
+	if (!stream.atEnd()) {
+		auto prefsCount = quint32();
+		stream >> prefsCount;
+		auto prefs = base::flat_map<QByteArray, QByteArray>();
+		prefs.reserve(prefsCount);
+		for (auto i = quint32(); i != prefsCount; ++i) {
+			auto key = QByteArray();
+			auto value = QByteArray();
+			stream >> key >> value;
+			prefs.emplace(std::move(key), std::move(value));
+		}
+		if (stream.status() == QDataStream::Ok) {
+			_prefs = std::move(prefs);
+		}
+	}
+	if (!stream.atEnd()) {
+		auto speed = qint32();
+		stream >> speed;
+		if (stream.status() == QDataStream::Ok) {
+			audioPlaybackSpeed = speed;
+		}
+	}
+	if (!stream.atEnd()) {
+		auto step = qint32();
+		stream >> step;
+		if (stream.status() == QDataStream::Ok) {
+			_mediaGridZoomStep = step;
+		}
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -854,6 +1007,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	case ScreenCorner::BottomRight:
 	case ScreenCorner::BottomLeft: _notificationsCorner = uncheckedNotificationsCorner; break;
 	}
+	_notificationsDisplayChecksum = notificationsDisplayChecksum;
+	_systemAccentColorEnabled = (systemAccentColorEnabled == 1);
+	_usePlatformTranslation = (usePlatformTranslation == 1);
 	_includeMutedCounter = (includeMutedCounter == 1);
 	_includeMutedCounterFolders = (includeMutedCounterFolders == 1);
 	_countUnreadMessages = (countUnreadMessages == 1);
@@ -887,13 +1043,20 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_loopAnimatedStickers = (loopAnimatedStickers == 1);
 	_largeEmoji = (largeEmoji == 1);
 	_replaceEmoji = (replaceEmoji == 1);
+	_systemTextReplace = (systemTextReplace == 1);
 	_suggestEmoji = (suggestEmoji == 1);
 	_suggestStickersByEmoji = (suggestStickersByEmoji == 1);
 	_spellcheckerEnabled = (spellcheckerEnabled == 1);
 	_videoPlaybackSpeed = DeserializePlaybackSpeed(videoPlaybackSpeed);
-	_voicePlaybackSpeed = DeserializePlaybackSpeed(voicePlaybackSpeed);
-	if (nonDefaultVoicePlaybackSpeed != 1) {
-		_voicePlaybackSpeed.enabled = false;
+	{
+		auto speed = DeserializePlaybackSpeed(voicePlaybackSpeed);
+		if (nonDefaultVoicePlaybackSpeed != 1) {
+			speed.enabled = false;
+		}
+		_voicePlaybackSpeed = speed;
+		_audioPlaybackSpeed = audioPlaybackSpeed
+			? DeserializePlaybackSpeed(*audioPlaybackSpeed)
+			: speed;
 	}
 	_videoPipGeometry = (videoPipGeometry);
 	_dictionariesEnabled = std::move(dictionariesEnabled);
@@ -955,7 +1118,12 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 				: Tooltip(0));
 	}();
 	_photoEditorBrush = photoEditorBrush;
-	_closeToTaskbar = (closeToTaskbar == 1);
+	const auto uncheckedCloseBehavior = static_cast<CloseBehavior>(closeBehavior);
+	switch (uncheckedCloseBehavior) {
+	case CloseBehavior::CloseToTaskbar:
+	case CloseBehavior::RunInBackground:
+	case CloseBehavior::Quit: _closeBehavior = uncheckedCloseBehavior; break;
+	}
 	_customDeviceModel = customDeviceModel;
 	_accountsOrder = accountsOrder;
 	const auto uncheckedPlayerRepeatMode = static_cast<Media::RepeatMode>(playerRepeatMode);
@@ -983,6 +1151,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 		}
 	}
 	_suggestAnimatedEmoji = (suggestAnimatedEmoji == 1);
+	_cornerReply = (cornerReply == 1);
 	_cornerReaction = (cornerReaction == 1);
 	{ // Parse the legacy translation setting.
 		if (legacySkipTranslationForLanguage == 0) {
@@ -1020,6 +1189,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!ivPosition.isEmpty()) {
 		_ivPosition = Deserialize(ivPosition);
 	}
+	if (!callPanelPosition.isEmpty()) {
+		_callPanelPosition = Deserialize(callPanelPosition);
+	}
 	_customFontFamily = customFontFamily;
 	_systemUnlockEnabled = (systemUnlockEnabled == 1);
 	_weatherInCelsius = !weatherInCelsius
@@ -1027,6 +1199,54 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 		: (weatherInCelsius == 1);
 	_tonsiteStorageToken = tonsiteStorageToken;
 	_ivZoom = ivZoom;
+	_skipToastsInFocus = (skipToastsInFocus == 1);
+	_recordVideoMessages = (recordVideoMessages == 1);
+	_videoQuality = DeserializeVideoQuality(videoQuality);
+	_chatFiltersHorizontal = (chatFiltersHorizontal == 1);
+	_quickDialogAction = Dialogs::Ui::QuickDialogAction(quickDialogAction);
+	_notificationsVolume = notificationsVolume;
+}
+
+void Settings::clearPref(std::string_view key) {
+	const auto i = _prefs.find(QByteArray(key.data(), key.size()));
+	if (i == end(_prefs)) {
+		return;
+	}
+	_prefs.erase(i);
+	_saveDelayed.fire({});
+}
+
+void Settings::writePrefGeneric(
+		std::string_view key,
+		const QByteArray &value) {
+	const auto raw = QByteArray(key.data(), key.size());
+	if (const auto i = _prefs.find(raw); i != end(_prefs)) {
+		if (i->second == value) {
+			return;
+		}
+		i->second = value;
+	} else {
+		_prefs.emplace(raw, value);
+	}
+	_saveDelayed.fire({});
+}
+
+std::optional<QByteArray> Settings::readPrefGeneric(std::string_view key) {
+	const auto i = _prefs.find(QByteArray(key.data(), key.size()));
+	return (i != end(_prefs)) ? i->second : std::optional<QByteArray>();
+}
+
+template <>
+std::optional<bool> Settings::readPrefImpl<bool>(std::string_view key) {
+	if (const auto data = readPrefGeneric(key)) {
+		return !data->isEmpty();
+	}
+	return {};
+}
+
+template <>
+void Settings::writePrefImpl<bool>(std::string_view key, bool value) {
+	writePrefGeneric(key, value ? "\x1"_q : QByteArray());
 }
 
 QString Settings::getSoundPath(const QString &key) const {
@@ -1353,6 +1573,7 @@ void Settings::resetOnLastLogout() {
 	_flashBounceNotify = true;
 	_notifyView = NotifyView::ShowPreview;
 	//_nativeNotifications = std::nullopt;
+	//_skipToastsInFocus = false;
 	//_notificationsCount = 3;
 	//_notificationsCorner = ScreenCorner::BottomRight;
 	_includeMutedCounter = true;
@@ -1390,12 +1611,14 @@ void Settings::resetOnLastLogout() {
 	_loopAnimatedStickers = true;
 	_largeEmoji = true;
 	_replaceEmoji = true;
+	_systemTextReplace = true;
 	_suggestEmoji = true;
 	_suggestStickersByEmoji = true;
 	_suggestAnimatedEmoji = true;
 	_spellcheckerEnabled = true;
 	_videoPlaybackSpeed = PlaybackSpeed();
 	_voicePlaybackSpeed = PlaybackSpeed();
+	_audioPlaybackSpeed = PlaybackSpeed();
 	//_videoPipGeometry = QByteArray();
 	_dictionariesEnabled = std::vector<int>();
 	_autoDownloadDictionaries = true;
@@ -1410,11 +1633,20 @@ void Settings::resetOnLastLogout() {
 	_thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
 	_notifyFromAll = true;
 	_tabbedReplacedWithInfo = false; // per-window
-	_systemDarkModeEnabled = false;
 	_hiddenGroupCallTooltips = 0;
 	_storiesClickTooltipHidden = false;
 	_ttlVoiceClickTooltipHidden = false;
-	_ivZoom = 100;
+	const auto srDisabled = readPref<bool>(kScreenReaderModeDisabledKey);
+	_prefs.clear();
+	if (srDisabled) {
+		writePref<bool>(kScreenReaderModeDisabledKey, true);
+	}
+	_ivZoom = 0;
+	_recordVideoMessages = false;
+	_videoQuality = {};
+	_chatFiltersHorizontal = false;
+	_quickDialogAction = Dialogs::Ui::QuickDialogAction::Disabled;
+	_notificationsVolume = 100;
 
 	_recentEmojiPreload.clear();
 	_recentEmoji.clear();
@@ -1472,6 +1704,14 @@ void Settings::setNativeNotifications(bool value) {
 		: std::make_optional(value);
 }
 
+bool Settings::skipToastsInFocus() const {
+	return _skipToastsInFocus;
+}
+
+void Settings::setSkipToastsInFocus(bool value) {
+	_skipToastsInFocus = value;
+}
+
 void Settings::setTranslateButtonEnabled(bool value) {
 	_translateButtonEnabled = value;
 }
@@ -1480,6 +1720,14 @@ bool Settings::translateButtonEnabled() const {
 	return _translateButtonEnabled;
 }
 
+void Settings::setUsePlatformTranslation(bool value) {
+	_usePlatformTranslation = value;
+}
+
+bool Settings::usePlatformTranslation() const {
+	return _usePlatformTranslation;
+}
+
 void Settings::setTranslateChatEnabled(bool value) {
 	_translateChatEnabled = value;
 }
@@ -1550,20 +1798,70 @@ auto Settings::skipTranslationLanguagesValue() const
 void Settings::setRememberedDeleteMessageOnlyForYou(bool value) {
 	_rememberedDeleteMessageOnlyForYou = value;
 }
+
 bool Settings::rememberedDeleteMessageOnlyForYou() const {
 	return _rememberedDeleteMessageOnlyForYou;
 }
 
 int Settings::ivZoom() const {
-	return _ivZoom.current();
+	return ResolveIvZoom(_ivZoom.current());
 }
+
 rpl::producer<int> Settings::ivZoomValue() const {
-	return _ivZoom.value();
+	return _ivZoom.value() | rpl::map(ResolveIvZoom);
 }
+
 void Settings::setIvZoom(int value) {
-	constexpr auto kMin = 30;
-	constexpr auto kMax = 200;
-	_ivZoom = std::clamp(value, kMin, kMax);
+	const auto resolved = ResolveIvZoom(value);
+	if (!value || resolved == ResolveIvZoom(0)) {
+		_ivZoom = 0;
+		return;
+	}
+	_ivZoom = resolved;
+}
+
+bool Settings::normalizeIvZoom() {
+	const auto value = _ivZoom.current();
+	if (!value) {
+		return false;
+	}
+	const auto resolved = ResolveIvZoom(value);
+	if (resolved == ResolveIvZoom(0)) {
+		_ivZoom = 0;
+		return true;
+	} else if (resolved != value) {
+		_ivZoom = resolved;
+		return true;
+	}
+	return false;
+}
+
+Media::VideoQuality Settings::videoQuality() const {
+	return _videoQuality;
+}
+
+void Settings::setVideoQuality(Media::VideoQuality value) {
+	_videoQuality = value;
+}
+
+bool Settings::chatFiltersHorizontal() const {
+	return _chatFiltersHorizontal.current();
+}
+
+rpl::producer<bool> Settings::chatFiltersHorizontalChanges() const {
+	return _chatFiltersHorizontal.changes();
+}
+
+void Settings::setChatFiltersHorizontal(bool value) {
+	_chatFiltersHorizontal = value;
+}
+
+Dialogs::Ui::QuickDialogAction Settings::quickDialogAction() const {
+	return _quickDialogAction;
+}
+
+void Settings::setQuickDialogAction(Dialogs::Ui::QuickDialogAction action) {
+	_quickDialogAction = action;
 }
 
 } // namespace Core
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 54199d8e5c1a99..5fd841c0653220 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "core/core_settings_proxy.h"
 #include "media/media_common.h"
+#include "dialogs/ui/dialogs_quick_action.h"
 #include "window/themes/window_themes_embedded.h"
 #include "ui/chat/attach/attach_send_files_way.h"
 #include "base/flags.h"
@@ -35,6 +36,9 @@ enum class StickedTooltip;
 
 namespace Core {
 
+inline constexpr auto kScreenReaderModeDisabledKey
+	= "screen-reader-mode-disabled"_cs;
+
 struct WindowPosition {
 	int32 moncrc = 0;
 	int maximized = 0;
@@ -109,6 +113,11 @@ class Settings final {
 		TrayOnly = 1,
 		WindowOnly = 2,
 	};
+	enum class CloseBehavior {
+		Quit = 0,
+		CloseToTaskbar = 1,
+		RunInBackground = 2,
+	};
 
 	static constexpr auto kDefaultVolume = 0.9;
 
@@ -220,6 +229,9 @@ class Settings final {
 	[[nodiscard]] bool nativeNotifications() const;
 	void setNativeNotifications(bool value);
 
+	[[nodiscard]] bool skipToastsInFocus() const;
+	void setSkipToastsInFocus(bool value);
+
 	[[nodiscard]] int notificationsCount() const {
 		return _notificationsCount;
 	}
@@ -232,6 +244,12 @@ class Settings final {
 	void setNotificationsCorner(ScreenCorner corner) {
 		_notificationsCorner = corner;
 	}
+	[[nodiscard]] int32 notificationsDisplayChecksum() const {
+		return _notificationsDisplayChecksum;
+	}
+	void setNotificationsDisplayChecksum(int32 checksum) {
+		_notificationsDisplayChecksum = checksum;
+	}
 	[[nodiscard]] bool includeMutedCounter() const {
 		return _includeMutedCounter;
 	}
@@ -375,6 +393,9 @@ class Settings final {
 	[[nodiscard]] Window::Theme::AccentColors &themesAccentColors() {
 		return _themesAccentColors;
 	}
+	[[nodiscard]] const Window::Theme::AccentColors &themesAccentColors() const {
+		return _themesAccentColors;
+	}
 	void setThemesAccentColors(Window::Theme::AccentColors &&colors) {
 		_themesAccentColors = std::move(colors);
 	}
@@ -451,6 +472,18 @@ class Settings final {
 	[[nodiscard]] rpl::producer<bool> replaceEmojiChanges() const {
 		return _replaceEmoji.changes();
 	}
+	void setSystemTextReplace(bool value) {
+		_systemTextReplace = value;
+	}
+	[[nodiscard]] bool systemTextReplace() const {
+		return _systemTextReplace.current();
+	}
+	[[nodiscard]] rpl::producer<bool> systemTextReplaceValue() const {
+		return _systemTextReplace.value();
+	}
+	[[nodiscard]] rpl::producer<bool> systemTextReplaceChanges() const {
+		return _systemTextReplace.changes();
+	}
 	[[nodiscard]] bool suggestEmoji() const {
 		return _suggestEmoji;
 	}
@@ -478,8 +511,14 @@ class Settings final {
 	[[nodiscard]] rpl::producer<bool> cornerReactionValue() const {
 		return _cornerReaction.value();
 	}
-	[[nodiscard]] rpl::producer<bool> cornerReactionChanges() const {
-		return _cornerReaction.changes();
+	void setCornerReply(bool value) {
+		_cornerReply = value;
+	}
+	[[nodiscard]] bool cornerReply() const {
+		return _cornerReply.current();
+	}
+	[[nodiscard]] rpl::producer<bool> cornerReplyValue() const {
+		return _cornerReply.value();
 	}
 
 	void setSpellcheckerEnabled(bool value) {
@@ -533,14 +572,33 @@ class Settings final {
 	}
 	[[nodiscard]] float64 voicePlaybackSpeed(
 			bool lastNonDefault = false) const {
-		return (_voicePlaybackSpeed.enabled || lastNonDefault)
-			? _voicePlaybackSpeed.value
-			: 1.;
+		const auto &s = _voicePlaybackSpeed.current();
+		return (s.enabled || lastNonDefault) ? s.value : 1.;
+	}
+	[[nodiscard]] float64 audioPlaybackSpeed(
+			bool lastNonDefault = false) const {
+		const auto &s = _audioPlaybackSpeed.current();
+		return (s.enabled || lastNonDefault) ? s.value : 1.;
 	}
 	void setVoicePlaybackSpeed(float64 speed) {
-		if ((_voicePlaybackSpeed.enabled = !Media::EqualSpeeds(speed, 1.0))) {
-			_voicePlaybackSpeed.value = speed;
-		}
+		const auto enabled = !Media::EqualSpeeds(speed, 1.0);
+		_voicePlaybackSpeed = PlaybackSpeed{
+			.value = enabled ? speed : _voicePlaybackSpeed.current().value,
+			.enabled = enabled,
+		};
+	}
+	void setAudioPlaybackSpeed(float64 speed) {
+		const auto enabled = !Media::EqualSpeeds(speed, 1.0);
+		_audioPlaybackSpeed = PlaybackSpeed{
+			.value = enabled ? speed : _audioPlaybackSpeed.current().value,
+			.enabled = enabled,
+		};
+	}
+	[[nodiscard]] auto voicePlaybackSpeedChanges() const {
+		return _voicePlaybackSpeed.changes();
+	}
+	[[nodiscard]] auto audioPlaybackSpeedChanges() const {
+		return _audioPlaybackSpeed.changes();
 	}
 
 	// For legacy values read-write outside of Settings.
@@ -625,6 +683,13 @@ class Settings final {
 		return _floatPlayerCorner;
 	}
 
+	[[nodiscard]] bool recordVideoMessages() const {
+		return _recordVideoMessages;
+	}
+	void setRecordVideoMessages(bool value) {
+		_recordVideoMessages = value;
+	}
+
 	void updateDialogsWidthRatio(float64 ratio, bool nochat);
 	[[nodiscard]] float64 dialogsWidthRatio(bool nochat) const;
 
@@ -675,6 +740,12 @@ class Settings final {
 	[[nodiscard]] rpl::producer<bool> systemDarkModeEnabledChanges() const {
 		return _systemDarkModeEnabled.changes();
 	}
+	void setSystemAccentColorEnabled(bool value) {
+		_systemAccentColorEnabled = value;
+	}
+	[[nodiscard]] bool systemAccentColorEnabled() const {
+		return _systemAccentColorEnabled;
+	}
 	[[nodiscard]] WindowTitleContent windowTitleContent() const {
 		return _windowTitleContent.current();
 	}
@@ -735,17 +806,11 @@ class Settings final {
 		_hiddenGroupCallTooltips |= value;
 	}
 
-	void setCloseToTaskbar(bool value) {
-		_closeToTaskbar = value;
-	}
-	[[nodiscard]] bool closeToTaskbar() const {
-		return _closeToTaskbar.current();
+	void setCloseBehavior(CloseBehavior value) {
+		_closeBehavior = value;
 	}
-	[[nodiscard]] rpl::producer<bool> closeToTaskbarValue() const {
-		return _closeToTaskbar.value();
-	}
-	[[nodiscard]] rpl::producer<bool> closeToTaskbarChanges() const {
-		return _closeToTaskbar.changes();
+	[[nodiscard]] CloseBehavior closeBehavior() const {
+		return _closeBehavior;
 	}
 	void setTrayIconMonochrome(bool value) {
 		_trayIconMonochrome = value;
@@ -826,6 +891,8 @@ class Settings final {
 
 	void setTranslateButtonEnabled(bool value);
 	[[nodiscard]] bool translateButtonEnabled() const;
+	void setUsePlatformTranslation(bool value);
+	[[nodiscard]] bool usePlatformTranslation() const;
 	void setTranslateChatEnabled(bool value);
 	[[nodiscard]] bool translateChatEnabled() const;
 	[[nodiscard]] rpl::producer<bool> translateChatEnabledValue() const;
@@ -879,7 +946,6 @@ class Settings final {
 	void setTtlVoiceClickTooltipHidden(bool value) {
 		_ttlVoiceClickTooltipHidden = value;
 	}
-
 	[[nodiscard]] const WindowPosition &ivPosition() const {
 		return _ivPosition;
 	}
@@ -887,6 +953,13 @@ class Settings final {
 		_ivPosition = position;
 	}
 
+	[[nodiscard]] const WindowPosition &callPanelPosition() const {
+		return _callPanelPosition;
+	}
+	void setCallPanelPosition(const WindowPosition &position) {
+		_callPanelPosition = position;
+	}
+
 	[[nodiscard]] QString customFontFamily() const {
 		return _customFontFamily;
 	}
@@ -918,6 +991,14 @@ class Settings final {
 	[[nodiscard]] int ivZoom() const;
 	[[nodiscard]] rpl::producer<int> ivZoomValue() const;
 	void setIvZoom(int value);
+	bool normalizeIvZoom();
+
+	[[nodiscard]] bool chatFiltersHorizontal() const;
+	[[nodiscard]] rpl::producer<bool> chatFiltersHorizontalChanges() const;
+	void setChatFiltersHorizontal(bool value);
+
+	[[nodiscard]] Media::VideoQuality videoQuality() const;
+	void setVideoQuality(Media::VideoQuality quality);
 
 	[[nodiscard]] static bool ThirdColumnByDefault();
 	[[nodiscard]] static float64 DefaultDialogsWidthRatio();
@@ -925,16 +1006,61 @@ class Settings final {
 	struct PlaybackSpeed {
 		float64 value = Media::kSpedUpDefault;
 		bool enabled = false;
+
+		friend bool operator==(
+			const PlaybackSpeed &,
+			const PlaybackSpeed &) = default;
 	};
 	[[nodiscard]] static qint32 SerializePlaybackSpeed(PlaybackSpeed speed);
 	[[nodiscard]] static PlaybackSpeed DeserializePlaybackSpeed(
 		qint32 speed);
 
+	[[nodiscard]] Dialogs::Ui::QuickDialogAction quickDialogAction() const;
+	void setQuickDialogAction(Dialogs::Ui::QuickDialogAction);
+
+	[[nodiscard]] ushort notificationsVolume() const {
+		return _notificationsVolume;
+	}
+	void setNotificationsVolume(ushort value) {
+		_notificationsVolume = value;
+	}
+
+	[[nodiscard]] int mediaGridZoomStep() const {
+		return _mediaGridZoomStep;
+	}
+	void setMediaGridZoomStep(int value) {
+		_mediaGridZoomStep = value;
+	}
+
+	template <typename Type, typename Other>
+	void writePref(std::string_view key, Other &&value) {
+		writePrefImpl<Type>(key, std::forward<Other>(value));
+	}
+	void clearPref(std::string_view key);
+
+	template <typename Type, typename Other = Type>
+	[[nodiscard]] Type readPref(
+			std::string_view key,
+			Other &&fallback = Type()) {
+		return readPrefImpl<Type>(key).value_or(
+			std::forward<Other>(fallback));
+	}
+
 	void resetOnLastLogout();
 
 private:
 	void resolveRecentEmoji() const;
 
+	template <typename Type>
+	void writePrefImpl(std::string_view key, Type value);
+
+	template <typename Type>
+	[[nodiscard]] std::optional<Type> readPrefImpl(std::string_view key);
+
+	void writePrefGeneric(std::string_view key, const QByteArray &value);
+	[[nodiscard]] std::optional<QByteArray> readPrefGeneric(
+		std::string_view key);
+
 	static constexpr auto kDefaultThirdColumnWidth = 0;
 	static constexpr auto kDefaultDialogsWidthRatio = 5. / 14;
 	static constexpr auto kDefaultBigDialogsWidthRatio = 0.275;
@@ -958,8 +1084,10 @@ class Settings final {
 	bool _flashBounceNotify = true;
 	NotifyView _notifyView = NotifyView::ShowPreview;
 	std::optional<bool> _nativeNotifications;
+	bool _skipToastsInFocus = false;
 	int _notificationsCount = 3;
 	ScreenCorner _notificationsCorner = ScreenCorner::BottomRight;
+	int32 _notificationsDisplayChecksum = 0;
 	bool _includeMutedCounter = true;
 	bool _includeMutedCounterFolders = true;
 	bool _countUnreadMessages = true;
@@ -989,13 +1117,16 @@ class Settings final {
 	bool _loopAnimatedStickers = true;
 	rpl::variable<bool> _largeEmoji = true;
 	rpl::variable<bool> _replaceEmoji = true;
+	rpl::variable<bool> _systemTextReplace = true;
 	bool _suggestEmoji = true;
 	bool _suggestStickersByEmoji = true;
 	bool _suggestAnimatedEmoji = true;
+	rpl::variable<bool> _cornerReply = true;
 	rpl::variable<bool> _cornerReaction = true;
 	rpl::variable<bool> _spellcheckerEnabled = true;
 	PlaybackSpeed _videoPlaybackSpeed;
-	PlaybackSpeed _voicePlaybackSpeed;
+	rpl::variable<PlaybackSpeed> _voicePlaybackSpeed;
+	rpl::variable<PlaybackSpeed> _audioPlaybackSpeed;
 	QByteArray _videoPipGeometry;
 	rpl::variable<std::vector<int>> _dictionariesEnabled;
 	rpl::variable<bool> _autoDownloadDictionaries = true;
@@ -1018,13 +1149,14 @@ class Settings final {
 	bool _notifyFromAll = true;
 	rpl::variable<bool> _nativeWindowFrame = false;
 	rpl::variable<std::optional<bool>> _systemDarkMode = std::nullopt;
-	rpl::variable<bool> _systemDarkModeEnabled = false;
+	rpl::variable<bool> _systemDarkModeEnabled = true;
+	bool _systemAccentColorEnabled = false;
 	rpl::variable<WindowTitleContent> _windowTitleContent;
 	WindowPosition _windowPosition; // per-window
 	bool _disableOpenGL = false;
 	rpl::variable<WorkMode> _workMode = WorkMode::WindowAndTray;
 	base::flags<Calls::Group::StickedTooltip> _hiddenGroupCallTooltips;
-	rpl::variable<bool> _closeToTaskbar = false;
+	CloseBehavior _closeBehavior = CloseBehavior::Quit;
 	rpl::variable<bool> _trayIconMonochrome = true;
 	rpl::variable<QString> _customDeviceModel;
 	rpl::variable<Media::RepeatMode> _playerRepeatMode;
@@ -1039,6 +1171,7 @@ class Settings final {
 	HistoryView::DoubleClickQuickAction _chatQuickAction
 		= HistoryView::DoubleClickQuickAction();
 	bool _translateButtonEnabled = false;
+	bool _usePlatformTranslation = false;
 	rpl::variable<bool> _translateChatEnabled = true;
 	rpl::variable<int> _translateToRaw = 0;
 	rpl::variable<std::vector<LanguageId>> _skipTranslationLanguages;
@@ -1050,11 +1183,15 @@ class Settings final {
 	rpl::variable<bool> _storiesClickTooltipHidden = false;
 	rpl::variable<bool> _ttlVoiceClickTooltipHidden = false;
 	WindowPosition _ivPosition;
+	WindowPosition _callPanelPosition;
 	QString _customFontFamily;
 	bool _systemUnlockEnabled = false;
 	std::optional<bool> _weatherInCelsius;
 	QByteArray _tonsiteStorageToken;
-	rpl::variable<int> _ivZoom = 100;
+	rpl::variable<int> _ivZoom = 0;
+	Media::VideoQuality _videoQuality;
+	rpl::variable<bool> _chatFiltersHorizontal = false;
+	base::flat_map<QByteArray, QByteArray> _prefs;
 
 	bool _tabbedReplacedWithInfo = false; // per-window
 	rpl::event_stream<bool> _tabbedReplacedWithInfoValue; // per-window
@@ -1065,6 +1202,15 @@ class Settings final {
 	bool _rememberedFlashBounceNotifyFromTray = false;
 	bool _dialogsWidthSetToZeroWithoutChat = false;
 
+	bool _recordVideoMessages = false;
+
+	Dialogs::Ui::QuickDialogAction _quickDialogAction
+		= Dialogs::Ui::QuickDialogAction::Disabled;
+
+	ushort _notificationsVolume = 100;
+
+	int _mediaGridZoomStep = 0;
+
 	QByteArray _photoEditorBrush;
 
 };
diff --git a/Telegram/SourceFiles/core/core_settings_proxy.cpp b/Telegram/SourceFiles/core/core_settings_proxy.cpp
index 1807aa2efea83c..495bb0b846bfce 100644
--- a/Telegram/SourceFiles/core/core_settings_proxy.cpp
+++ b/Telegram/SourceFiles/core/core_settings_proxy.cpp
@@ -10,6 +10,8 @@ For license and copyright information please follow this link:
 #include "base/platform/base_platform_info.h"
 #include "storage/serialize_common.h"
 
+#include <algorithm>
+
 namespace Core {
 namespace {
 
@@ -88,6 +90,22 @@ namespace {
 	return result;
 }
 
+std::vector<int> NormalizeProxyRotationPreferredIndices(
+		std::vector<int> indices,
+		int listSize) {
+	auto filtered = std::vector<int>();
+	filtered.reserve(indices.size());
+	for (const auto index : indices) {
+		if (index < 0
+			|| index >= listSize
+			|| ranges::contains(filtered, index)) {
+			continue;
+		}
+		filtered.push_back(index);
+	}
+	return filtered;
+}
+
 } // namespace
 
 SettingsProxy::SettingsProxy()
@@ -107,7 +125,8 @@ QByteArray SettingsProxy::serialize() const {
 			serializedList,
 			0,
 			ranges::plus(),
-			&Serialize::bytearraySize);
+			&Serialize::bytearraySize)
+		+ (4 + int(_proxyRotationPreferredIndices.size())) * sizeof(qint32);
 	auto stream = Serialize::ByteArrayWriter(size);
 	stream
 		<< qint32(_tryIPv6 ? 1 : 0)
@@ -118,6 +137,14 @@ QByteArray SettingsProxy::serialize() const {
 	for (const auto &i : serializedList) {
 		stream << i;
 	}
+	stream
+		<< qint32(_checkIpWarningShown ? 1 : 0)
+		<< qint32(_proxyRotationEnabled ? 1 : 0)
+		<< qint32(_proxyRotationTimeout)
+		<< qint32(_proxyRotationPreferredIndices.size());
+	for (const auto index : _proxyRotationPreferredIndices) {
+		stream << qint32(index);
+	}
 	return std::move(stream).result();
 }
 
@@ -133,6 +160,7 @@ bool SettingsProxy::setFromSerialized(const QByteArray &serialized) {
 	auto settings = ProxySettingsToInt(_settings);
 	auto listCount = qint32(_list.size());
 	auto selectedProxy = QByteArray();
+	auto list = std::vector<MTP::ProxyData>();
 
 	if (!stream.atEnd()) {
 		stream
@@ -142,10 +170,43 @@ bool SettingsProxy::setFromSerialized(const QByteArray &serialized) {
 			>> selectedProxy
 			>> listCount;
 		if (stream.ok()) {
+			if (listCount < 0) {
+				return false;
+			}
+			list.reserve(listCount);
 			for (auto i = 0; i != listCount; ++i) {
 				QByteArray data;
 				stream >> data;
-				_list.push_back(DeserializeProxyData(data));
+				list.push_back(DeserializeProxyData(data));
+			}
+		}
+	}
+
+	auto checkIpWarningShown = qint32(0);
+	if (!stream.atEnd()) {
+		stream >> checkIpWarningShown;
+	}
+	auto proxyRotationEnabled = qint32(_proxyRotationEnabled ? 1 : 0);
+	if (!stream.atEnd()) {
+		stream >> proxyRotationEnabled;
+	}
+	auto proxyRotationTimeout = qint32(_proxyRotationTimeout);
+	if (!stream.atEnd()) {
+		stream >> proxyRotationTimeout;
+	}
+	auto preferredCount = qint32(0);
+	auto preferredIndices = std::vector<int>();
+	if (!stream.atEnd()) {
+		stream >> preferredCount;
+		if (stream.ok()) {
+			if (preferredCount < 0) {
+				return false;
+			}
+			preferredIndices.reserve(preferredCount);
+			for (auto i = 0; i != preferredCount; ++i) {
+				auto index = qint32(0);
+				stream >> index;
+				preferredIndices.push_back(index);
 			}
 		}
 	}
@@ -158,8 +219,13 @@ bool SettingsProxy::setFromSerialized(const QByteArray &serialized) {
 
 	_tryIPv6 = (tryIPv6 == 1);
 	_useProxyForCalls = (useProxyForCalls == 1);
+	_checkIpWarningShown = (checkIpWarningShown == 1);
+	_proxyRotationEnabled = (proxyRotationEnabled == 1);
+	setProxyRotationTimeout(proxyRotationTimeout);
 	_settings = IntToProxySettings(settings);
 	_selected = DeserializeProxyData(selectedProxy);
+	_list = std::move(list);
+	setProxyRotationPreferredIndices(std::move(preferredIndices));
 
 	return true;
 }
@@ -176,6 +242,40 @@ bool SettingsProxy::isDisabled() const {
 	return _settings == MTP::ProxyData::Settings::Disabled;
 }
 
+bool SettingsProxy::checkIpWarningShown() const {
+	return _checkIpWarningShown;
+}
+
+void SettingsProxy::setCheckIpWarningShown(bool value) {
+	_checkIpWarningShown = value;
+}
+
+const std::vector<int> &SettingsProxy::proxyRotationPreferredIndices() const {
+	return _proxyRotationPreferredIndices;
+}
+
+void SettingsProxy::setProxyRotationPreferredIndices(std::vector<int> value) {
+	_proxyRotationPreferredIndices = NormalizeProxyRotationPreferredIndices(
+		std::move(value),
+		int(_list.size()));
+}
+
+bool SettingsProxy::promoteProxyRotationPreferredIndex(int index) {
+	if (index < 0 || index >= int(_list.size())) {
+		return false;
+	}
+	auto &indices = _proxyRotationPreferredIndices;
+	const auto i = ranges::find(indices, index);
+	if (i == begin(indices)) {
+		return false;
+	} else if (i != end(indices)) {
+		std::rotate(begin(indices), i, std::next(i));
+	} else {
+		indices.insert(begin(indices), index);
+	}
+	return true;
+}
+
 bool SettingsProxy::tryIPv6() const {
 	return _tryIPv6;
 }
@@ -192,6 +292,24 @@ void SettingsProxy::setUseProxyForCalls(bool value) {
 	_useProxyForCalls = value;
 }
 
+bool SettingsProxy::proxyRotationEnabled() const {
+	return _proxyRotationEnabled;
+}
+
+void SettingsProxy::setProxyRotationEnabled(bool value) {
+	_proxyRotationEnabled = value;
+}
+
+int SettingsProxy::proxyRotationTimeout() const {
+	return _proxyRotationTimeout;
+}
+
+void SettingsProxy::setProxyRotationTimeout(int value) {
+	_proxyRotationTimeout = (value > 0)
+		? value
+		: kDefaultProxyRotationTimeout;
+}
+
 MTP::ProxyData::Settings SettingsProxy::settings() const {
 	return _settings;
 }
@@ -216,6 +334,62 @@ std::vector<MTP::ProxyData> &SettingsProxy::list() {
 	return _list;
 }
 
+void SettingsProxy::setList(std::vector<MTP::ProxyData> value) {
+	_list = std::move(value);
+	_proxyRotationPreferredIndices.clear();
+}
+
+void SettingsProxy::addToList(MTP::ProxyData value) {
+	_list.push_back(std::move(value));
+}
+
+void SettingsProxy::insertToList(int index, MTP::ProxyData value) {
+	index = std::clamp(index, 0, int(_list.size()));
+	for (auto &existing : _proxyRotationPreferredIndices) {
+		if (existing >= index) {
+			++existing;
+		}
+	}
+	_list.insert(begin(_list) + index, std::move(value));
+}
+
+bool SettingsProxy::removeFromList(const MTP::ProxyData &value) {
+	const auto i = ranges::find(_list, value);
+	if (i == end(_list)) {
+		return false;
+	}
+	const auto index = int(i - begin(_list));
+	_list.erase(i);
+	for (auto &existing : _proxyRotationPreferredIndices) {
+		if (existing > index) {
+			--existing;
+		}
+	}
+	_proxyRotationPreferredIndices.erase(
+		std::remove(
+			begin(_proxyRotationPreferredIndices),
+			end(_proxyRotationPreferredIndices),
+			index),
+		end(_proxyRotationPreferredIndices));
+	return true;
+}
+
+bool SettingsProxy::replaceInList(
+		const MTP::ProxyData &was,
+		MTP::ProxyData value) {
+	const auto i = ranges::find(_list, was);
+	if (i == end(_list)) {
+		return false;
+	}
+	*i = std::move(value);
+	return true;
+}
+
+int SettingsProxy::indexInList(const MTP::ProxyData &value) const {
+	const auto i = ranges::find(_list, value);
+	return (i == end(_list)) ? -1 : int(i - begin(_list));
+}
+
 rpl::producer<> SettingsProxy::connectionTypeValue() const {
 	return _connectionTypeChanges.events_starting_with({});
 }
diff --git a/Telegram/SourceFiles/core/core_settings_proxy.h b/Telegram/SourceFiles/core/core_settings_proxy.h
index bd709c230a0548..1f2ec5c516e03a 100644
--- a/Telegram/SourceFiles/core/core_settings_proxy.h
+++ b/Telegram/SourceFiles/core/core_settings_proxy.h
@@ -9,10 +9,21 @@ For license and copyright information please follow this link:
 
 #include "mtproto/mtproto_proxy_data.h"
 
+#include <array>
+
 namespace Core {
 
 class SettingsProxy final {
 public:
+	static constexpr auto kProxyRotationTimeouts = std::array{
+		5,
+		10,
+		15,
+		30,
+		60,
+	};
+	static constexpr auto kDefaultProxyRotationTimeout = 10;
+
 	SettingsProxy();
 
 	[[nodiscard]] bool isEnabled() const;
@@ -29,14 +40,35 @@ class SettingsProxy final {
 	[[nodiscard]] bool useProxyForCalls() const;
 	void setUseProxyForCalls(bool value);
 
+	[[nodiscard]] bool proxyRotationEnabled() const;
+	void setProxyRotationEnabled(bool value);
+
+	[[nodiscard]] int proxyRotationTimeout() const;
+	void setProxyRotationTimeout(int value);
+
 	[[nodiscard]] MTP::ProxyData::Settings settings() const;
 	void setSettings(MTP::ProxyData::Settings value);
 
 	[[nodiscard]] MTP::ProxyData selected() const;
 	void setSelected(MTP::ProxyData value);
 
+	[[nodiscard]] bool checkIpWarningShown() const;
+	void setCheckIpWarningShown(bool value);
+
+	[[nodiscard]] const std::vector<int> &proxyRotationPreferredIndices() const;
+	void setProxyRotationPreferredIndices(std::vector<int> value);
+	[[nodiscard]] bool promoteProxyRotationPreferredIndex(int index);
+
 	[[nodiscard]] const std::vector<MTP::ProxyData> &list() const;
 	[[nodiscard]] std::vector<MTP::ProxyData> &list();
+	void setList(std::vector<MTP::ProxyData> value);
+	void addToList(MTP::ProxyData value);
+	void insertToList(int index, MTP::ProxyData value);
+	[[nodiscard]] bool removeFromList(const MTP::ProxyData &value);
+	[[nodiscard]] bool replaceInList(
+		const MTP::ProxyData &was,
+		MTP::ProxyData value);
+	[[nodiscard]] int indexInList(const MTP::ProxyData &value) const;
 
 	[[nodiscard]] QByteArray serialize() const;
 	bool setFromSerialized(const QByteArray &serialized);
@@ -44,13 +76,16 @@ class SettingsProxy final {
 private:
 	bool _tryIPv6 = false;
 	bool _useProxyForCalls = false;
+	bool _proxyRotationEnabled = false;
+	bool _checkIpWarningShown = false;
+	int _proxyRotationTimeout = kDefaultProxyRotationTimeout;
 	MTP::ProxyData::Settings _settings = MTP::ProxyData::Settings::System;
 	MTP::ProxyData _selected;
 	std::vector<MTP::ProxyData> _list;
+	std::vector<int> _proxyRotationPreferredIndices;
 
 	rpl::event_stream<> _connectionTypeChanges;
 
 };
 
 } // namespace Core
-
diff --git a/Telegram/SourceFiles/core/crash_report_window.cpp b/Telegram/SourceFiles/core/crash_report_window.cpp
index b73c12aedc0b59..07782efab7ed57 100644
--- a/Telegram/SourceFiles/core/crash_report_window.cpp
+++ b/Telegram/SourceFiles/core/crash_report_window.cpp
@@ -12,12 +12,17 @@ For license and copyright information please follow this link:
 #include "core/sandbox.h"
 #include "core/update_checker.h"
 #include "core/ui_integration.h"
+#include "core/version.h"
 #include "window/main_window.h"
 #include "platform/platform_specific.h"
 #include "base/zlib_help.h"
 
 #include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMenu>
+#include <QtGui/QClipboard>
+#include <QtGui/QContextMenuEvent>
 #include <QtGui/QFontInfo>
+#include <QtGui/QGuiApplication>
 #include <QtGui/QScreen>
 #include <QtGui/QDesktopServices>
 #include <QtCore/QStandardPaths>
@@ -114,6 +119,46 @@ void PreLaunchLabel::setText(const QString &text) {
 	resize(sizeHint());
 }
 
+void PreLaunchLabel::contextMenuEvent(QContextMenuEvent *e) {
+	const auto flags = textInteractionFlags();
+	const auto selectable = flags
+		& (Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
+	if (!selectable) {
+		e->ignore();
+		return;
+	}
+	const auto accel = [](QKeySequence::StandardKey key) {
+		return QCoreApplication::testAttribute(
+				Qt::AA_DontShowShortcutsInContextMenus)
+			? QString()
+			: QChar('\t')
+				+ QKeySequence(key).toString(QKeySequence::NativeText);
+	};
+	const auto menu = new QMenu(this);
+	menu->setAttribute(Qt::WA_DeleteOnClose);
+
+	const auto copy = menu->addAction(
+		u"&Copy"_q + accel(QKeySequence::Copy));
+	copy->setEnabled(hasSelectedText());
+	connect(copy, &QAction::triggered, this, [=] {
+		if (hasSelectedText()) {
+			QGuiApplication::clipboard()->setText(selectedText());
+		}
+	});
+
+	menu->addSeparator();
+
+	const auto selectAll = menu->addAction(
+		u"Select All"_q + accel(QKeySequence::SelectAll));
+	selectAll->setEnabled(!text().isEmpty());
+	connect(selectAll, &QAction::triggered, this, [=] {
+		setSelection(0, text().size());
+	});
+
+	e->accept();
+	menu->popup(e->globalPos());
+}
+
 PreLaunchInput::PreLaunchInput(QWidget *parent, bool password) : QLineEdit(parent) {
 	QFont logFont(font());
 	logFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
@@ -362,21 +407,21 @@ LastCrashedWindow::LastCrashedWindow(
 		Core::UpdateChecker checker;
 		using Progress = Core::UpdateChecker::Progress;
 		checker.checking(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			Assert(_updaterData != nullptr);
 
 			setUpdatingState(UpdatingCheck);
 		}, _lifetime);
 
 		checker.isLatest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			Assert(_updaterData != nullptr);
 
 			setUpdatingState(UpdatingLatest);
 		}, _lifetime);
 
 		checker.progress(
-		) | rpl::start_with_next([=](const Progress &result) {
+		) | rpl::on_next([=](const Progress &result) {
 			Assert(_updaterData != nullptr);
 
 			setUpdatingState(UpdatingDownload);
@@ -384,14 +429,14 @@ LastCrashedWindow::LastCrashedWindow(
 		}, _lifetime);
 
 		checker.failed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			Assert(_updaterData != nullptr);
 
 			setUpdatingState(UpdatingFail);
 		}, _lifetime);
 
 		checker.ready(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			Assert(_updaterData != nullptr);
 
 			setUpdatingState(UpdatingReady);
@@ -880,7 +925,7 @@ void LastCrashedWindow::networkSettings() {
 		proxy.user,
 		proxy.password);
 	box->saveRequests(
-	) | rpl::start_with_next([=](MTP::ProxyData &&data) {
+	) | rpl::on_next([=](MTP::ProxyData &&data) {
 		Assert(data.host.isEmpty() || data.port != 0);
 		_proxyChanges.fire(std::move(data));
 		proxyUpdated();
diff --git a/Telegram/SourceFiles/core/crash_report_window.h b/Telegram/SourceFiles/core/crash_report_window.h
index f0c438119b84b9..57501d76347f8c 100644
--- a/Telegram/SourceFiles/core/crash_report_window.h
+++ b/Telegram/SourceFiles/core/crash_report_window.h
@@ -42,6 +42,9 @@ class PreLaunchLabel : public QLabel {
 	PreLaunchLabel(QWidget *parent);
 	void setText(const QString &text);
 
+protected:
+	void contextMenuEvent(QContextMenuEvent *e) override;
+
 };
 
 class PreLaunchInput : public QLineEdit {
diff --git a/Telegram/SourceFiles/core/crash_reports.cpp b/Telegram/SourceFiles/core/crash_reports.cpp
index 1e38d721ad4229..f5559d5312b399 100644
--- a/Telegram/SourceFiles/core/crash_reports.cpp
+++ b/Telegram/SourceFiles/core/crash_reports.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "core/crash_reports.h"
 
+#include "core/version.h"
 #include "platform/platform_specific.h"
 #include "base/platform/base_platform_info.h"
 #include "core/launcher.h"
diff --git a/Telegram/SourceFiles/core/credits_amount.h b/Telegram/SourceFiles/core/credits_amount.h
new file mode 100644
index 00000000000000..42bf1a522de2dd
--- /dev/null
+++ b/Telegram/SourceFiles/core/credits_amount.h
@@ -0,0 +1,185 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/algorithm.h"
+#include "base/basic_types.h"
+
+class MTPstarsAmount;
+
+namespace tl {
+template <typename bare>
+class boxed;
+} // namespace tl
+
+using MTPStarsAmount = tl::boxed<MTPstarsAmount>;
+
+inline constexpr auto kOneStarInNano = int64(1'000'000'000);
+
+enum class CreditsType {
+	Stars,
+	Ton,
+};
+
+class CreditsAmount {
+public:
+	CreditsAmount() = default;
+	explicit CreditsAmount(
+		int64 whole,
+		CreditsType type = CreditsType::Stars)
+	: _ton((type == CreditsType::Ton) ? 1 : 0)
+	, _whole(whole) {
+	}
+	CreditsAmount(
+		int64 whole,
+		int64 nano,
+		CreditsType type = CreditsType::Stars)
+	: _ton((type == CreditsType::Ton) ? 1 : 0)
+	, _whole(whole)
+	, _nano(nano) {
+		normalize();
+	}
+
+	[[nodiscard]] int64 whole() const {
+		return _whole;
+	}
+
+	[[nodiscard]] int64 nano() const {
+		return _nano;
+	}
+
+	[[nodiscard]] double value() const {
+		return double(_whole) + double(_nano) / kOneStarInNano;
+	}
+
+	[[nodiscard]] bool ton() const {
+		return (_ton == 1);
+	}
+	[[nodiscard]] bool stars() const {
+		return (_ton == 0);
+	}
+	[[nodiscard]] CreditsType type() const {
+		return !_ton ? CreditsType::Stars : CreditsType::Ton;
+	}
+
+	[[nodiscard]] bool empty() const {
+		return !_whole && !_nano;
+	}
+
+	[[nodiscard]] inline bool operator!() const {
+		return empty();
+	}
+	[[nodiscard]] inline explicit operator bool() const {
+		return !empty();
+	}
+
+	[[nodiscard]] CreditsAmount multiplied(float64 rate) const {
+		const auto result = value() * rate;
+		const auto abs = std::abs(result);
+		const auto whole = std::floor(abs);
+		const auto nano = base::SafeRound((abs - whole) * kOneStarInNano);
+		return CreditsAmount(
+			(result < 0) ? -whole : whole,
+			(result < 0) ? -nano : nano,
+			type());
+	}
+
+	inline CreditsAmount &operator+=(CreditsAmount other) {
+		_whole += other._whole;
+		_nano += other._nano;
+		normalize();
+		return *this;
+	}
+	inline CreditsAmount &operator-=(CreditsAmount other) {
+		_whole -= other._whole;
+		_nano -= other._nano;
+		normalize();
+		return *this;
+	}
+	inline CreditsAmount &operator*=(int64 multiplier) {
+		_whole *= multiplier;
+		_nano *= multiplier;
+		normalize();
+		return *this;
+	}
+	inline CreditsAmount operator-() const {
+		auto result = *this;
+		result *= -1;
+		return result;
+	}
+
+// AppleClang :/
+//	friend inline auto operator<=>(CreditsAmount, CreditsAmount)
+//		= default;
+	friend inline constexpr auto operator<=>(
+			CreditsAmount a,
+			CreditsAmount b) {
+		if (const auto r1 = (a._whole <=> b._whole); r1 != 0) {
+			return r1;
+		} else if (const auto r2 = (a._nano <=> b._nano); r2 != 0) {
+			return r2;
+		}
+		return (a._whole || a._nano)
+			? (int(a._ton) <=> int(b._ton))
+			: std::strong_ordering::equal;
+	}
+
+	friend inline bool operator==(CreditsAmount, CreditsAmount)
+		= default;
+
+	[[nodiscard]] CreditsAmount abs() const {
+		return (_whole < 0) ? CreditsAmount(-_whole, -_nano) : *this;
+	}
+
+private:
+	void normalize() {
+		if (_nano < 0) {
+			const auto shifts = (-_nano + kOneStarInNano - 1)
+				/ kOneStarInNano;
+			_nano += shifts * kOneStarInNano;
+			_whole -= shifts;
+		} else if (_nano >= kOneStarInNano) {
+			const auto shifts = _nano / kOneStarInNano;
+			_nano -= shifts * kOneStarInNano;
+			_whole += shifts;
+		}
+	}
+
+	int64 _ton : 2 = 0;
+	int64 _whole : 62 = 0;
+	int64 _nano = 0;
+
+};
+
+[[nodiscard]] inline CreditsAmount operator+(
+		CreditsAmount a,
+		CreditsAmount b) {
+	return a += b;
+}
+
+[[nodiscard]] inline CreditsAmount operator-(
+		CreditsAmount a,
+		CreditsAmount b) {
+	return a -= b;
+}
+
+[[nodiscard]] inline CreditsAmount operator*(CreditsAmount a, int64 b) {
+	return a *= b;
+}
+
+[[nodiscard]] inline CreditsAmount operator*(int64 a, CreditsAmount b) {
+	return b *= a;
+}
+
+[[nodiscard]] CreditsAmount CreditsAmountFromTL(
+	const MTPStarsAmount &amount);
+[[nodiscard]] CreditsAmount CreditsAmountFromTL(
+	const MTPStarsAmount *amount);
+[[nodiscard]] MTPStarsAmount StarsAmountToTL(CreditsAmount amount);
+
+[[nodiscard]] QString PrepareCreditsAmountText(CreditsAmount amount);
diff --git a/Telegram/SourceFiles/core/deep_links/deep_links_chats.cpp b/Telegram/SourceFiles/core/deep_links/deep_links_chats.cpp
new file mode 100644
index 00000000000000..ebc66af146d17a
--- /dev/null
+++ b/Telegram/SourceFiles/core/deep_links/deep_links_chats.cpp
@@ -0,0 +1,50 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "core/deep_links/deep_links_router.h"
+
+#include "dialogs/dialogs_key.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
+#include "window/window_session_controller.h"
+
+namespace Core::DeepLinks {
+namespace {
+
+Result FocusSearch(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	ctx.controller->content()->searchMessages(QString(), Dialogs::Key());
+	return Result::Handled;
+}
+
+Result ShowEmojiStatus(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	ctx.controller->setHighlightControlId(u"main-menu/emoji-status"_q);
+	ctx.controller->widget()->showMainMenu();
+	return Result::Handled;
+}
+
+} // namespace
+
+void RegisterChatsHandlers(Router &router) {
+	router.add(u"chats"_q, {
+		.path = u"search"_q,
+		.action = CodeBlock{ FocusSearch },
+		.skipActivation = true,
+	});
+
+	router.add(u"chats"_q, {
+		.path = u"emoji-status"_q,
+		.action = CodeBlock{ ShowEmojiStatus },
+	});
+}
+
+} // namespace Core::DeepLinks
diff --git a/Telegram/SourceFiles/core/deep_links/deep_links_chats.h b/Telegram/SourceFiles/core/deep_links/deep_links_chats.h
new file mode 100644
index 00000000000000..434812d2900e2f
--- /dev/null
+++ b/Telegram/SourceFiles/core/deep_links/deep_links_chats.h
@@ -0,0 +1,16 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Core::DeepLinks {
+
+class Router;
+
+void RegisterChatsHandlers(Router &router);
+
+} // namespace Core::DeepLinks
diff --git a/Telegram/SourceFiles/core/deep_links/deep_links_contacts.cpp b/Telegram/SourceFiles/core/deep_links/deep_links_contacts.cpp
new file mode 100644
index 00000000000000..d7158a29697847
--- /dev/null
+++ b/Telegram/SourceFiles/core/deep_links/deep_links_contacts.cpp
@@ -0,0 +1,67 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "core/deep_links/deep_links_router.h"
+
+#include "boxes/peer_list_controllers.h"
+#include "window/window_session_controller.h"
+
+namespace Core::DeepLinks {
+namespace {
+
+Result ShowContacts(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	ctx.controller->show(PrepareContactsBox(ctx.controller));
+	return Result::Handled;
+}
+
+Result ShowAddContact(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	ctx.controller->showAddContact();
+	return Result::Handled;
+}
+
+} // namespace
+
+void RegisterContactsHandlers(Router &router) {
+	router.add(u"contacts"_q, {
+		.path = QString(),
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowContacts(ctx);
+		}},
+	});
+
+	router.add(u"contacts"_q, {
+		.path = u"search"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowContacts(ctx);
+		}},
+	});
+
+	router.add(u"contacts"_q, {
+		.path = u"sort"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ctx.controller->setHighlightControlId(u"contacts/sort"_q);
+			ctx.controller->show(PrepareContactsBox(ctx.controller));
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"contacts"_q, {
+		.path = u"new"_q,
+		.action = CodeBlock{ ShowAddContact },
+	});
+}
+
+} // namespace Core::DeepLinks
diff --git a/Telegram/SourceFiles/core/deep_links/deep_links_contacts.h b/Telegram/SourceFiles/core/deep_links/deep_links_contacts.h
new file mode 100644
index 00000000000000..0a4c0d83009c23
--- /dev/null
+++ b/Telegram/SourceFiles/core/deep_links/deep_links_contacts.h
@@ -0,0 +1,16 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Core::DeepLinks {
+
+class Router;
+
+void RegisterContactsHandlers(Router &router);
+
+} // namespace Core::DeepLinks
diff --git a/Telegram/SourceFiles/core/deep_links/deep_links_new.cpp b/Telegram/SourceFiles/core/deep_links/deep_links_new.cpp
new file mode 100644
index 00000000000000..5037eadf9cd957
--- /dev/null
+++ b/Telegram/SourceFiles/core/deep_links/deep_links_new.cpp
@@ -0,0 +1,139 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "core/deep_links/deep_links_router.h"
+
+#include "apiwrap.h"
+#include "boxes/peers/create_managed_bot_box.h"
+#include "data/data_peer_id.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/toast/toast.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+
+namespace Core::DeepLinks {
+namespace {
+
+Result ShowNewGroup(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	ctx.controller->showNewGroup();
+	return Result::Handled;
+}
+
+Result ShowNewChannel(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	ctx.controller->showNewChannel();
+	return Result::Handled;
+}
+
+Result ShowAddContact(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	ctx.controller->showAddContact();
+	return Result::Handled;
+}
+
+Result ShowNewBot(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	const auto manager = ctx.params.value(u"manager"_q);
+	const auto username = ctx.params.value(u"username"_q);
+	const auto title = ctx.params.value(u"name"_q);
+	if (manager.isEmpty()) {
+		return Result::Handled;
+	}
+	const auto session = &ctx.controller->session();
+	const auto weak = base::make_weak(ctx.controller);
+	session->api().request(MTPcontacts_ResolveUsername(
+		MTP_flags(0),
+		MTP_string(manager),
+		MTP_string()
+	)).done([=](const MTPcontacts_ResolvedPeer &result) {
+		const auto strong = weak.get();
+		if (!strong) {
+			return;
+		}
+		result.match([&](const MTPDcontacts_resolvedPeer &data) {
+			strong->session().data().processUsers(data.vusers());
+			strong->session().data().processChats(data.vchats());
+			const auto peerId = peerFromMTP(data.vpeer());
+			if (const auto managerBot = strong->session().data().userLoaded(
+					peerToUser(peerId))) {
+				if (!managerBot->isBot()) {
+					return;
+				}
+				if (!managerBot->botInfo->canManageBots) {
+					strong->showToast(
+						tr::lng_create_bot_no_manage(
+							tr::now,
+							lt_bot,
+							u"@"_q + managerBot->username()));
+					return;
+				}
+				ShowCreateManagedBotBox({
+					.show = strong->uiShow(),
+					.manager = managerBot,
+					.suggestedName = title,
+					.suggestedUsername = username,
+					.viaDeeplink = true,
+					.done = [weak, managerBot](not_null<UserData*> createdBot) {
+						if (const auto strong = weak.get()) {
+							strong->showPeerHistory(createdBot);
+							strong->showToast({
+								.title = tr::lng_managed_bot_created_title(
+									tr::now,
+									lt_name,
+									createdBot->name()),
+								.text = { tr::lng_managed_bot_created_text(
+									tr::now,
+									lt_parent_name,
+									managerBot->name()) },
+								.icon = &st::toastCheckIcon,
+							});
+						}
+					},
+				});
+			}
+		});
+	}).send();
+	return Result::Handled;
+}
+
+} // namespace
+
+void RegisterNewHandlers(Router &router) {
+	router.add(u"new"_q, {
+		.path = u"group"_q,
+		.action = CodeBlock{ ShowNewGroup },
+	});
+
+	router.add(u"new"_q, {
+		.path = u"channel"_q,
+		.action = CodeBlock{ ShowNewChannel },
+	});
+
+	router.add(u"new"_q, {
+		.path = u"contact"_q,
+		.action = CodeBlock{ ShowAddContact },
+	});
+
+	router.add(u"newbot"_q, {
+		.path = QString(),
+		.action = CodeBlock{ ShowNewBot },
+	});
+}
+
+} // namespace Core::DeepLinks
diff --git a/Telegram/SourceFiles/core/deep_links/deep_links_new.h b/Telegram/SourceFiles/core/deep_links/deep_links_new.h
new file mode 100644
index 00000000000000..54d356e2ce1215
--- /dev/null
+++ b/Telegram/SourceFiles/core/deep_links/deep_links_new.h
@@ -0,0 +1,16 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Core::DeepLinks {
+
+class Router;
+
+void RegisterNewHandlers(Router &router);
+
+} // namespace Core::DeepLinks
diff --git a/Telegram/SourceFiles/core/deep_links/deep_links_router.cpp b/Telegram/SourceFiles/core/deep_links/deep_links_router.cpp
new file mode 100644
index 00000000000000..cbba6b50b53156
--- /dev/null
+++ b/Telegram/SourceFiles/core/deep_links/deep_links_router.cpp
@@ -0,0 +1,204 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "core/deep_links/deep_links_router.h"
+
+#include "base/qthelp_url.h"
+#include "core/deep_links/deep_links_chats.h"
+#include "core/deep_links/deep_links_contacts.h"
+#include "core/deep_links/deep_links_new.h"
+#include "core/deep_links/deep_links_settings.h"
+#include "core/application.h"
+#include "main/main_session.h"
+#include "ui/toast/toast.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+
+namespace Core::DeepLinks {
+namespace {
+
+Context ParseCommand(
+		Window::SessionController *controller,
+		const QString &command) {
+	auto result = Context{ .controller = controller };
+
+	auto path = command;
+	auto queryStart = path.indexOf('?');
+	if (queryStart >= 0) {
+		const auto query = path.mid(queryStart + 1);
+		path = path.left(queryStart);
+		for (const auto &pair : query.split('&')) {
+			const auto eq = pair.indexOf('=');
+			if (eq > 0) {
+				result.params[pair.left(eq).toLower()] = qthelp::url_decode(pair.mid(eq + 1));
+			} else if (!pair.isEmpty()) {
+				result.params[pair.toLower()] = QString();
+			}
+		}
+	}
+
+	path = path.trimmed();
+	while (path.startsWith('/')) {
+		path = path.mid(1);
+	}
+	while (path.endsWith('/')) {
+		path.chop(1);
+	}
+
+	const auto slash = path.indexOf('/');
+	if (slash > 0) {
+		result.section = path.left(slash).toLower();
+		result.path = path.mid(slash + 1);
+	} else {
+		result.section = path.toLower();
+	}
+
+	return result;
+}
+
+} // namespace
+
+Router &Router::Instance() {
+	static auto instance = Router();
+	return instance;
+}
+
+Router::Router() {
+	RegisterSettingsHandlers(*this);
+	RegisterContactsHandlers(*this);
+	RegisterChatsHandlers(*this);
+	RegisterNewHandlers(*this);
+}
+
+void Router::add(const QString &section, Entry entry) {
+	_handlers[section].push_back(std::move(entry));
+}
+
+std::optional<QString> Router::findPath(
+		const QString &section,
+		Fn<bool(const Action &)> matches) const {
+	const auto i = _handlers.find(section);
+	if (i != _handlers.end()) {
+		for (const auto &entry : i->second) {
+			if (matches(entry.action)) {
+				return entry.path;
+			}
+		}
+	}
+	return std::nullopt;
+}
+
+bool Router::tryHandle(
+		Window::SessionController *controller,
+		const QString &command) {
+	const auto ctx = ParseCommand(controller, command);
+	const auto [result, skipActivation] = dispatch(ctx);
+
+	switch (result) {
+	case Result::Handled:
+		if (controller && !skipActivation) {
+			controller->window().activate();
+		}
+		return true;
+	case Result::NeedsAuth:
+		return false;
+	case Result::Unsupported:
+		showUnsupportedMessage(controller, command);
+		return true;
+	case Result::NotFound:
+		return false;
+	}
+	return false;
+}
+
+Router::DispatchResult Router::dispatch(const Context &ctx) {
+	if (ctx.section.isEmpty()) {
+		return { Result::NotFound };
+	}
+	return handleSection(ctx.section, ctx);
+}
+
+Router::DispatchResult Router::handleSection(
+		const QString &section,
+		const Context &ctx) {
+	const auto it = _handlers.find(section);
+	if (it == _handlers.end()) {
+		return { Result::NotFound };
+	}
+
+	const auto &entries = it->second;
+	const auto path = ctx.path.toLower();
+
+	for (const auto &entry : entries) {
+		if (entry.path == path || (entry.path.isEmpty() && path.isEmpty())) {
+			if (entry.requiresAuth && !ctx.controller) {
+				return { Result::NeedsAuth };
+			}
+			return {
+				executeAction(entry.action, ctx),
+				entry.skipActivation,
+			};
+		}
+	}
+
+	for (const auto &entry : entries) {
+		if (!entry.path.isEmpty() && path.startsWith(entry.path + '/')) {
+			if (entry.requiresAuth && !ctx.controller) {
+				return { Result::NeedsAuth };
+			}
+			return {
+				executeAction(entry.action, ctx),
+				entry.skipActivation,
+			};
+		}
+	}
+
+	return { Result::Unsupported };
+}
+
+Result Router::executeAction(const Action &action, const Context &ctx) {
+	return v::match(action, [&](const SettingsSection &s) {
+		if (!ctx.controller) {
+			return Result::NeedsAuth;
+		}
+		const auto highlight = ctx.params.value(u"highlight"_q);
+		if (!highlight.isEmpty()) {
+			ctx.controller->setHighlightControlId(highlight);
+		}
+		ctx.controller->showSettings(s.sectionId);
+		return Result::Handled;
+	}, [&](const SettingsControl &s) {
+		if (!ctx.controller) {
+			return Result::NeedsAuth;
+		}
+		if (!s.controlId.isEmpty()) {
+			ctx.controller->setHighlightControlId(s.controlId);
+		}
+		ctx.controller->showSettings(s.sectionId);
+		return Result::Handled;
+	}, [&](const CodeBlock &c) {
+		return c.handler(ctx);
+	}, [&](const AliasTo &a) {
+		auto aliasCtx = ctx;
+		aliasCtx.section = a.section;
+		aliasCtx.path = a.path;
+		return handleSection(a.section, aliasCtx).result;
+	});
+}
+
+void Router::showUnsupportedMessage(
+		Window::SessionController *controller,
+		const QString &url) {
+	const auto text = u"This link is not supported on Desktop."_q;
+	if (controller) {
+		controller->showToast(text);
+	} else if (const auto window = Core::App().activeWindow()) {
+		window->showToast(text);
+	}
+}
+
+} // namespace Core::DeepLinks
diff --git a/Telegram/SourceFiles/core/deep_links/deep_links_router.h b/Telegram/SourceFiles/core/deep_links/deep_links_router.h
new file mode 100644
index 00000000000000..5c496769cd7567
--- /dev/null
+++ b/Telegram/SourceFiles/core/deep_links/deep_links_router.h
@@ -0,0 +1,52 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "core/deep_links/deep_links_types.h"
+
+namespace Core::DeepLinks {
+
+class Router final {
+public:
+	static Router &Instance();
+
+	[[nodiscard]] bool tryHandle(
+		Window::SessionController *controller,
+		const QString &command);
+
+	void add(const QString &section, Entry entry);
+
+	[[nodiscard]] std::optional<QString> findPath(
+		const QString &section,
+		Fn<bool(const Action &action)> matches) const;
+
+private:
+	struct DispatchResult {
+		Result result = Result::NotFound;
+		bool skipActivation = false;
+	};
+
+	Router();
+
+	[[nodiscard]] DispatchResult dispatch(const Context &ctx);
+	[[nodiscard]] DispatchResult handleSection(
+		const QString &section,
+		const Context &ctx);
+	[[nodiscard]] Result executeAction(
+		const Action &action,
+		const Context &ctx);
+
+	void showUnsupportedMessage(
+		Window::SessionController *controller,
+		const QString &url);
+
+	std::map<QString, std::vector<Entry>> _handlers;
+
+};
+
+} // namespace Core::DeepLinks
diff --git a/Telegram/SourceFiles/core/deep_links/deep_links_settings.cpp b/Telegram/SourceFiles/core/deep_links/deep_links_settings.cpp
new file mode 100644
index 00000000000000..f14ddb4720d98e
--- /dev/null
+++ b/Telegram/SourceFiles/core/deep_links/deep_links_settings.cpp
@@ -0,0 +1,2187 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "core/deep_links/deep_links_router.h"
+
+#include "apiwrap.h"
+#include "base/binary_guard.h"
+#include "boxes/add_contact_box.h"
+#include "boxes/gift_credits_box.h"
+#include "boxes/language_box.h"
+#include "boxes/stickers_box.h"
+#include "chat_helpers/emoji_sets_manager.h"
+#include "boxes/edit_privacy_box.h"
+#include "boxes/peers/edit_peer_color_box.h"
+#include "info/bot/earn/info_bot_earn_widget.h"
+#include "info/bot/starref/info_bot_starref_common.h"
+#include "info/bot/starref/info_bot_starref_join_widget.h"
+#include "settings/settings_privacy_controllers.h"
+#include "ui/chat/chat_style.h"
+#include "boxes/star_gift_box.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "boxes/username_box.h"
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "data/data_user.h"
+#include "data/notify/data_notify_settings.h"
+#include "info/info_memento.h"
+#include "info/peer_gifts/info_peer_gifts_widget.h"
+#include "info/settings/info_settings_widget.h"
+#include "info/stories/info_stories_widget.h"
+#include "lang/lang_keys.h"
+#include "ui/boxes/peer_qr_box.h"
+#include "ui/layers/generic_box.h"
+#include "main/main_domain.h"
+#include "main/main_session.h"
+#include "storage/storage_domain.h"
+#include "settings/sections/settings_active_sessions.h"
+#include "settings/sections/settings_advanced.h"
+#include "settings/sections/settings_blocked_peers.h"
+#include "settings/sections/settings_business.h"
+#include "settings/sections/settings_calls.h"
+#include "settings/sections/settings_chat.h"
+#include "settings/sections/settings_passkeys.h"
+#include "data/components/passkeys.h"
+#include "calls/calls_box_controller.h"
+#include "settings/sections/settings_credits.h"
+#include "settings/sections/settings_folders.h"
+#include "settings/sections/settings_global_ttl.h"
+#include "settings/sections/settings_local_storage.h"
+#include "settings/sections/settings_information.h"
+#include "settings/sections/settings_local_passcode.h"
+#include "settings/sections/settings_main.h"
+#include "settings/cloud_password/settings_cloud_password_email_confirm.h"
+#include "settings/cloud_password/settings_cloud_password_input.h"
+#include "settings/cloud_password/settings_cloud_password_start.h"
+#include "settings/cloud_password/settings_cloud_password_login_email.h"
+#include "api/api_cloud_password.h"
+#include "core/core_cloud_password.h"
+#include "settings/sections/settings_notifications.h"
+#include "settings/sections/settings_notifications_type.h"
+#include "settings/settings_power_saving.h"
+#include "settings/settings_search.h"
+#include "settings/settings_experimental.h"
+#include "settings/sections/settings_premium.h"
+#include "ui/power_saving.h"
+#include "settings/sections/settings_privacy_security.h"
+#include "settings/sections/settings_shortcuts.h"
+#include "settings/sections/settings_websites.h"
+#include "boxes/connection_box.h"
+#include "mainwindow.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+
+namespace Core::DeepLinks {
+namespace {
+
+Result ShowLanguageBox(const Context &ctx, const QString &highlightId = QString()) {
+	static auto Guard = base::binary_guard();
+	if (!highlightId.isEmpty() && ctx.controller) {
+		ctx.controller->setHighlightControlId(highlightId);
+	}
+	Guard = LanguageBox::Show(ctx.controller, highlightId);
+	return Result::Handled;
+}
+
+Result ShowPowerSavingBox(
+		const Context &ctx,
+		PowerSaving::Flags highlightFlags = PowerSaving::Flags()) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	ctx.controller->show(
+		Box(::Settings::PowerSavingBox, highlightFlags),
+		Ui::LayerOption::KeepOther,
+		anim::type::normal);
+	return Result::Handled;
+}
+
+Result ShowMainMenuWithHighlight(const Context &ctx, const QString &highlightId) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	ctx.controller->setHighlightControlId(highlightId);
+	ctx.controller->widget()->showMainMenu();
+	return Result::Handled;
+}
+
+Result ShowSavedMessages(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	ctx.controller->showPeerHistory(
+		ctx.controller->session().userPeerId(),
+		Window::SectionShow::Way::Forward);
+	return Result::Handled;
+}
+
+Result ShowFaq(const Context &ctx) {
+	::Settings::OpenFaq(
+		ctx.controller ? base::make_weak(ctx.controller) : nullptr);
+	return Result::Handled;
+}
+
+void ShowQrBox(not_null<Window::SessionController*> controller) {
+	const auto user = controller->session().user();
+	controller->uiShow()->show(Box(
+		Ui::FillPeerQrBox,
+		user.get(),
+		std::nullopt,
+		rpl::single(QString())));
+}
+
+Result ShowPeerColorBox(
+		const Context &ctx,
+		PeerColorTab tab,
+		const QString &highlightId = QString()) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	if (!highlightId.isEmpty()) {
+		ctx.controller->setHighlightControlId(highlightId);
+	}
+	ctx.controller->show(Box(
+		EditPeerColorBox,
+		ctx.controller,
+		ctx.controller->session().user(),
+		std::shared_ptr<Ui::ChatStyle>(),
+		std::shared_ptr<Ui::ChatTheme>(),
+		tab));
+	return Result::Handled;
+}
+
+Result HandleQrCode(const Context &ctx, bool highlightCopy) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+
+	if (highlightCopy) {
+		ctx.controller->setHighlightControlId(u"self-qr-code/copy"_q);
+	}
+
+	const auto user = ctx.controller->session().user();
+	if (!user->username().isEmpty()) {
+		ShowQrBox(ctx.controller);
+	} else {
+		const auto controller = ctx.controller;
+		controller->uiShow()->show(Box(
+			UsernamesBoxWithCallback,
+			user,
+			[=] { ShowQrBox(controller); }));
+	}
+	return Result::Handled;
+}
+
+Result ShowEditName(
+		const Context &ctx,
+		EditNameBox::Focus focus = EditNameBox::Focus::FirstName) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	if (ctx.controller->showFrozenError()) {
+		return Result::Handled;
+	}
+	ctx.controller->show(Box<EditNameBox>(
+		ctx.controller->session().user(),
+		focus));
+	return Result::Handled;
+}
+
+Result ShowEditUsername(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	if (ctx.controller->showFrozenError()) {
+		return Result::Handled;
+	}
+	ctx.controller->show(Box(UsernamesBox, ctx.controller->session().user()));
+	return Result::Handled;
+}
+
+Result OpenInternalUrl(const Context &ctx, const QString &url) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	Core::App().openInternalUrl(
+		url,
+		QVariant::fromValue(ClickHandlerContext{
+			.sessionWindow = base::make_weak(ctx.controller),
+		}));
+	return Result::Handled;
+}
+
+Result ShowMyProfile(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	ctx.controller->showSection(
+		Info::Stories::Make(ctx.controller->session().user()));
+	return Result::Handled;
+}
+
+Result ShowLogOutMenu(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	ctx.controller->setHighlightControlId(u"settings/log-out"_q);
+	ctx.controller->showSettings(::Settings::MainId());
+	return Result::Handled;
+}
+
+Result ShowPasskeys(const Context &ctx, bool highlightCreate) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	const auto controller = ctx.controller;
+	const auto session = &controller->session();
+	const auto showBox = [=] {
+		if (highlightCreate) {
+			controller->setHighlightControlId(u"passkeys/create"_q);
+		}
+		if (session->passkeys().list().empty()) {
+			controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+				::Settings::PasskeysNoneBox(box, session);
+				box->boxClosing() | rpl::on_next([=] {
+					if (!session->passkeys().list().empty()) {
+						controller->showSettings(::Settings::PasskeysId());
+					}
+				}, box->lifetime());
+			}));
+		} else {
+			controller->showSettings(::Settings::PasskeysId());
+		}
+	};
+	if (session->passkeys().listKnown()) {
+		showBox();
+	} else {
+		session->passkeys().requestList(
+		) | rpl::take(1) | rpl::on_next([=] {
+			showBox();
+		}, controller->lifetime());
+	}
+	return Result::Handled;
+}
+
+Result ShowAutoDeleteSetCustom(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	ctx.controller->setHighlightControlId(u"auto-delete/set-custom"_q);
+	ctx.controller->showSettings(::Settings::GlobalTTLId());
+	return Result::Handled;
+}
+
+Result ShowLoginEmail(const Context &ctx) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	const auto controller = ctx.controller;
+	controller->session().api().cloudPassword().reload();
+	controller->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
+		{
+			box->getDelegate()->setTitle(
+				controller->session().api().cloudPassword().state(
+				) | rpl::map([](const Core::CloudPasswordState &state) {
+					return state.loginEmailPattern;
+				}) | rpl::map([](QString email) {
+					if (email.contains(' ')) {
+						return tr::lng_settings_cloud_login_email_section_title(
+							tr::now,
+							tr::rich);
+					}
+					return Ui::Text::WrapEmailPattern(std::move(email));
+				}));
+			for (const auto &child : ranges::views::reverse(
+					box->parentWidget()->children())) {
+				if (child && child->isWidgetType()) {
+					(static_cast<QWidget*>(child))->setAttribute(
+						Qt::WA_TransparentForMouseEvents);
+					break;
+				}
+			}
+		}
+		Ui::ConfirmBox(box, Ui::ConfirmBoxArgs{
+			.text = tr::lng_settings_cloud_login_email_box_about(),
+			.confirmed = [=](Fn<void()> close) {
+				controller->showSettings(::Settings::CloudLoginEmailId());
+				controller->window().activate();
+				close();
+			},
+			.confirmText = tr::lng_settings_cloud_login_email_box_ok(),
+		});
+	}));
+	return Result::Handled;
+}
+
+Result ShowNotificationType(
+		const Context &ctx,
+		Data::DefaultNotify type,
+		const QString &highlightId = QString()) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	if (!highlightId.isEmpty()) {
+		ctx.controller->setHighlightControlId(highlightId);
+	}
+	ctx.controller->showSettings(::Settings::NotificationsType::Id(type));
+	return Result::Handled;
+}
+
+using PrivacyKey = Api::UserPrivacy::Key;
+
+template <typename ControllerFactory>
+Result ShowPrivacyBox(
+		const Context &ctx,
+		PrivacyKey key,
+		ControllerFactory controllerFactory,
+		const QString &highlightControl = QString()) {
+	if (!ctx.controller) {
+		return Result::NeedsAuth;
+	}
+	const auto controller = ctx.controller;
+	const auto session = &controller->session();
+	if (!highlightControl.isEmpty()) {
+		controller->setHighlightControlId(highlightControl);
+	}
+	const auto shower = std::make_shared<rpl::lifetime>();
+	*shower = session->api().userPrivacy().value(
+		key
+	) | rpl::take(
+		1
+	) | rpl::on_next(crl::guard(controller, [=, shower = shower](
+			const Api::UserPrivacy::Rule &value) {
+		controller->show(Box<EditPrivacyBox>(
+			controller,
+			controllerFactory(),
+			value));
+	}));
+	session->api().userPrivacy().reload(key);
+	return Result::Handled;
+}
+
+} // namespace
+
+void RegisterSettingsHandlers(Router &router) {
+	router.add(u"settings"_q, {
+		.path = QString(),
+		.action = SettingsSection{ ::Settings::MainId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"edit"_q,
+		.action = SettingsSection{ ::Settings::InformationId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"my-profile"_q,
+		.action = CodeBlock{ ShowMyProfile },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"my-profile/edit"_q,
+		.action = SettingsSection{ ::Settings::InformationId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"my-profile/posts"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ctx.controller->setHighlightControlId(u"my-profile/posts"_q);
+			return ShowMyProfile(ctx);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"my-profile/posts/add-album"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ctx.controller->setHighlightControlId(u"my-profile/posts/add-album"_q);
+			return ShowMyProfile(ctx);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"my-profile/gifts"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ctx.controller->showSection(
+				Info::PeerGifts::Make(ctx.controller->session().user()));
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"my-profile/archived-posts"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ctx.controller->showSection(Info::Stories::Make(
+				ctx.controller->session().user(),
+				Info::Stories::ArchiveId()));
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"emoji-status"_q,
+		.action = AliasTo{ u"chats"_q, u"emoji-status"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"profile-color"_q,
+		.action = AliasTo{ u"settings"_q, u"edit/your-color"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"profile-color/profile"_q,
+		.action = AliasTo{ u"settings"_q, u"edit/your-color"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"profile-color/profile/add-icons"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPeerColorBox(
+				ctx,
+				PeerColorTab::Profile,
+				u"profile-color/add-icons"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"profile-color/profile/use-gift"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPeerColorBox(
+				ctx,
+				PeerColorTab::Profile,
+				u"profile-color/use-gift"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"profile-color/profile/reset"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPeerColorBox(
+				ctx,
+				PeerColorTab::Profile,
+				u"profile-color/reset"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"profile-color/name"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPeerColorBox(ctx, PeerColorTab::Name);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"profile-color/name/add-icons"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPeerColorBox(
+				ctx,
+				PeerColorTab::Name,
+				u"profile-color/add-icons"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"profile-color/name/use-gift"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPeerColorBox(
+				ctx,
+				PeerColorTab::Name,
+				u"profile-color/use-gift"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"profile-photo"_q,
+		.action = AliasTo{ u"settings"_q, u"edit/set-photo"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"profile-photo/use-emoji"_q,
+		.action = SettingsControl{
+			::Settings::MainId(),
+			u"profile-photo/use-emoji"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"devices"_q,
+		.action = SettingsSection{ ::Settings::SessionsId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"folders"_q,
+		.action = SettingsSection{ ::Settings::FoldersId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"notifications"_q,
+		.action = SettingsSection{ ::Settings::NotificationsId() },
+	});
+
+	const auto showExperimental = [](const Context &ctx) {
+		if (!ctx.controller) {
+			return Result::NeedsAuth;
+		}
+		const auto slash = ctx.path.indexOf('/');
+		const auto key = (slash >= 0)
+			? ctx.path.mid(slash + 1).trimmed().toLower()
+			: QString();
+		if (!key.isEmpty()) {
+			ctx.controller->setHighlightControlId(u"experimental/"_q + key);
+		}
+		ctx.controller->showSettings(::Settings::Experimental::Id());
+		return Result::Handled;
+	};
+	router.add(u"settings"_q, {
+		.path = u"experimental"_q,
+		.action = CodeBlock{ showExperimental },
+	});
+	router.add(u"settings"_q, {
+		.path = u"experiment"_q,
+		.action = CodeBlock{ showExperimental },
+	});
+	router.add(u"settings"_q, {
+		.path = u"exp"_q,
+		.action = CodeBlock{ showExperimental },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy"_q,
+		.action = SettingsSection{ ::Settings::PrivacySecurityId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/blocked"_q,
+		.action = SettingsSection{ ::Settings::BlockedPeersId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/blocked/block-user"_q,
+		.action = SettingsControl{
+			::Settings::BlockedPeersId(),
+			u"blocked/block-user"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/active-websites"_q,
+		.action = SettingsSection{ ::Settings::WebsitesId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/active-websites/disconnect-all"_q,
+		.action = SettingsControl{
+			::Settings::WebsitesId(),
+			u"websites/disconnect-all"_q,
+		},
+	});
+
+	const auto openPasscode = [](const Context &ctx, const QString &highlight) {
+		if (!ctx.controller) {
+			return Result::NeedsAuth;
+		}
+		if (!highlight.isEmpty()) {
+			ctx.controller->setHighlightControlId(highlight);
+		}
+		const auto &local = ctx.controller->session().domain().local();
+		if (local.hasLocalPasscode()) {
+			ctx.controller->showSettings(::Settings::LocalPasscodeCheckId());
+		} else {
+			ctx.controller->showSettings(::Settings::LocalPasscodeCreateId());
+		}
+		return Result::Handled;
+	};
+	router.add(u"settings"_q, {
+		.path = u"privacy/passcode"_q,
+		.action = CodeBlock{ [=](const Context &ctx) {
+			return openPasscode(ctx, QString());
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"privacy/passcode/disable"_q,
+		.action = CodeBlock{ [=](const Context &ctx) {
+			return openPasscode(ctx, u"passcode/disable"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"privacy/passcode/change"_q,
+		.action = CodeBlock{ [=](const Context &ctx) {
+			return openPasscode(ctx, u"passcode/change"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"privacy/passcode/auto-lock"_q,
+		.action = CodeBlock{ [=](const Context &ctx) {
+			return openPasscode(ctx, u"passcode/auto-lock"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"privacy/passcode/face-id"_q,
+		.action = CodeBlock{ [=](const Context &ctx) {
+			return openPasscode(ctx, u"passcode/biometrics"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"privacy/passcode/fingerprint"_q,
+		.action = AliasTo{ u"settings"_q, u"privacy/passcode/face-id"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/auto-delete"_q,
+		.action = SettingsSection{ ::Settings::GlobalTTLId() },
+	});
+
+	const auto openCloudPassword = [](const Context &ctx, const QString &highlight) {
+		if (!ctx.controller) {
+			return Result::NeedsAuth;
+		}
+		ctx.controller->showCloudPassword(highlight);
+		return Result::Handled;
+	};
+	router.add(u"settings"_q, {
+		.path = u"privacy/2sv"_q,
+		.action = CodeBlock{ [=](const Context &ctx) {
+			return openCloudPassword(ctx, QString());
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"privacy/2sv/change"_q,
+		.action = CodeBlock{ [=](const Context &ctx) {
+			return openCloudPassword(ctx, u"2sv/change"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"privacy/2sv/disable"_q,
+		.action = CodeBlock{ [=](const Context &ctx) {
+			return openCloudPassword(ctx, u"2sv/disable"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"privacy/2sv/change-email"_q,
+		.action = CodeBlock{ [=](const Context &ctx) {
+			return openCloudPassword(ctx, u"2sv/change-email"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/passkey"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPasskeys(ctx, false);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/passkey/create"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPasskeys(ctx, true);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/auto-delete/set-custom"_q,
+		.action = CodeBlock{ ShowAutoDeleteSetCustom },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/phone-number"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::PhoneNumber,
+				[=] { return std::make_unique<::Settings::PhoneNumberPrivacyController>(ctx.controller); });
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/phone-number/never"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::PhoneNumber,
+				[=] { return std::make_unique<::Settings::PhoneNumberPrivacyController>(ctx.controller); },
+				u"privacy/never"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/phone-number/always"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::PhoneNumber,
+				[=] { return std::make_unique<::Settings::PhoneNumberPrivacyController>(ctx.controller); },
+				u"privacy/always"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/last-seen"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::LastSeen,
+				[=] { return std::make_unique<::Settings::LastSeenPrivacyController>(&ctx.controller->session()); });
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/last-seen/never"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::LastSeen,
+				[=] { return std::make_unique<::Settings::LastSeenPrivacyController>(&ctx.controller->session()); },
+				u"privacy/never"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/last-seen/always"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::LastSeen,
+				[=] { return std::make_unique<::Settings::LastSeenPrivacyController>(&ctx.controller->session()); },
+				u"privacy/always"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/last-seen/hide-read-time"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::LastSeen,
+				[=] { return std::make_unique<::Settings::LastSeenPrivacyController>(&ctx.controller->session()); },
+				u"privacy/hide-read-time"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/profile-photos"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::ProfilePhoto,
+				[=] { return std::make_unique<::Settings::ProfilePhotoPrivacyController>(); });
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/profile-photos/never"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::ProfilePhoto,
+				[=] { return std::make_unique<::Settings::ProfilePhotoPrivacyController>(); },
+				u"privacy/never"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/profile-photos/always"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::ProfilePhoto,
+				[=] { return std::make_unique<::Settings::ProfilePhotoPrivacyController>(); },
+				u"privacy/always"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/profile-photos/set-public"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::ProfilePhoto,
+				[=] { return std::make_unique<::Settings::ProfilePhotoPrivacyController>(); },
+				u"privacy/set-public"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/profile-photos/update-public"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::ProfilePhoto,
+				[=] { return std::make_unique<::Settings::ProfilePhotoPrivacyController>(); },
+				u"privacy/update-public"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/profile-photos/remove-public"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::ProfilePhoto,
+				[=] { return std::make_unique<::Settings::ProfilePhotoPrivacyController>(); },
+				u"privacy/remove-public"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/bio"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::About,
+				[=] { return std::make_unique<::Settings::AboutPrivacyController>(); });
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/bio/never"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::About,
+				[=] { return std::make_unique<::Settings::AboutPrivacyController>(); },
+				u"privacy/never"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/bio/always"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::About,
+				[=] { return std::make_unique<::Settings::AboutPrivacyController>(); },
+				u"privacy/always"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/gifts"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::GiftsAutoSave,
+				[=] { return std::make_unique<::Settings::GiftsAutoSavePrivacyController>(); });
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/gifts/show-icon"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::GiftsAutoSave,
+				[=] { return std::make_unique<::Settings::GiftsAutoSavePrivacyController>(); },
+				u"privacy/show-icon"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/gifts/never"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::GiftsAutoSave,
+				[=] { return std::make_unique<::Settings::GiftsAutoSavePrivacyController>(); },
+				u"privacy/never"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/gifts/always"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::GiftsAutoSave,
+				[=] { return std::make_unique<::Settings::GiftsAutoSavePrivacyController>(); },
+				u"privacy/always"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/gifts/accepted-types"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::GiftsAutoSave,
+				[=] { return std::make_unique<::Settings::GiftsAutoSavePrivacyController>(); },
+				u"privacy/accepted-types"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/birthday"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Birthday,
+				[=] { return std::make_unique<::Settings::BirthdayPrivacyController>(); });
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/birthday/add"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return OpenInternalUrl(ctx, u"internal:edit_birthday"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/birthday/never"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Birthday,
+				[=] { return std::make_unique<::Settings::BirthdayPrivacyController>(); },
+				u"privacy/never"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/birthday/always"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Birthday,
+				[=] { return std::make_unique<::Settings::BirthdayPrivacyController>(); },
+				u"privacy/always"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/saved-music"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::SavedMusic,
+				[=] { return std::make_unique<::Settings::SavedMusicPrivacyController>(); });
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/saved-music/never"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::SavedMusic,
+				[=] { return std::make_unique<::Settings::SavedMusicPrivacyController>(); },
+				u"privacy/never"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/saved-music/always"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::SavedMusic,
+				[=] { return std::make_unique<::Settings::SavedMusicPrivacyController>(); },
+				u"privacy/always"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/forwards"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Forwards,
+				[=] { return std::make_unique<::Settings::ForwardsPrivacyController>(ctx.controller); });
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/forwards/never"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Forwards,
+				[=] { return std::make_unique<::Settings::ForwardsPrivacyController>(ctx.controller); },
+				u"privacy/never"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/forwards/always"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Forwards,
+				[=] { return std::make_unique<::Settings::ForwardsPrivacyController>(ctx.controller); },
+				u"privacy/always"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/calls"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Calls,
+				[=] { return std::make_unique<::Settings::CallsPrivacyController>(); });
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/calls/never"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Calls,
+				[=] { return std::make_unique<::Settings::CallsPrivacyController>(); },
+				u"privacy/never"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/calls/always"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Calls,
+				[=] { return std::make_unique<::Settings::CallsPrivacyController>(); },
+				u"privacy/always"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/calls/p2p"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::CallsPeer2Peer,
+				[=] { return std::make_unique<::Settings::CallsPeer2PeerPrivacyController>(); });
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/calls/p2p/never"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::CallsPeer2Peer,
+				[=] { return std::make_unique<::Settings::CallsPeer2PeerPrivacyController>(); },
+				u"privacy/never"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/calls/p2p/always"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::CallsPeer2Peer,
+				[=] { return std::make_unique<::Settings::CallsPeer2PeerPrivacyController>(); },
+				u"privacy/always"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/voice"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Voices,
+				[=] { return std::make_unique<::Settings::VoicesPrivacyController>(&ctx.controller->session()); });
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/voice/never"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Voices,
+				[=] { return std::make_unique<::Settings::VoicesPrivacyController>(&ctx.controller->session()); },
+				u"privacy/never"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/voice/always"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Voices,
+				[=] { return std::make_unique<::Settings::VoicesPrivacyController>(&ctx.controller->session()); },
+				u"privacy/always"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/messages"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ctx.controller->show(Box(EditMessagesPrivacyBox, ctx.controller, QString()));
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/messages/set-price"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ctx.controller->show(Box(
+				EditMessagesPrivacyBox,
+				ctx.controller,
+				u"privacy/set-price"_q));
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/messages/remove-fee"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ctx.controller->show(Box(
+				EditMessagesPrivacyBox,
+				ctx.controller,
+				u"privacy/remove-fee"_q));
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/invites"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Invites,
+				[=] { return std::make_unique<::Settings::GroupsInvitePrivacyController>(); });
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/invites/never"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Invites,
+				[=] { return std::make_unique<::Settings::GroupsInvitePrivacyController>(); },
+				u"privacy/never"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/invites/always"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPrivacyBox(
+				ctx,
+				PrivacyKey::Invites,
+				[=] { return std::make_unique<::Settings::GroupsInvitePrivacyController>(); },
+				u"privacy/always"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/self-destruct"_q,
+		.action = SettingsControl{
+			::Settings::PrivacySecurityId(),
+			u"privacy/self_destruct"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/data-settings/suggest-contacts"_q,
+		.action = SettingsControl{
+			::Settings::PrivacySecurityId(),
+			u"privacy/top_peers"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/data-settings/clear-payment-info"_q,
+		.action = SettingsControl{
+			::Settings::PrivacySecurityId(),
+			u"privacy/bots_payment"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"privacy/archive-and-mute"_q,
+		.action = SettingsControl{
+			::Settings::PrivacySecurityId(),
+			u"privacy/archive_and_mute"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"data/storage"_q,
+		.action = SettingsControl{ ::Settings::LocalStorageId() },
+	});
+	router.add(u"settings"_q, {
+		.path = u"data/storage/clear-cache"_q,
+		.action = SettingsControl{
+			::Settings::LocalStorageId(),
+			u"storage/clear-cache"_q,
+		},
+	});
+	router.add(u"settings"_q, {
+		.path = u"data/max-cache"_q,
+		.action = SettingsControl{
+			::Settings::LocalStorageId(),
+			u"storage/max-cache"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"data/show-18-content"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/show-18-content"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"data/proxy"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ProxiesBoxController::Show(ctx.controller);
+			return Result::Handled;
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"data/proxy/add-proxy"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ProxiesBoxController::Show(ctx.controller, u"proxy/add-proxy"_q);
+			return Result::Handled;
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"data/proxy/share-list"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ProxiesBoxController::Show(ctx.controller, u"proxy/share-list"_q);
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance"_q,
+		.action = SettingsSection{ ::Settings::ChatId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"power-saving"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPowerSavingBox(ctx);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"power-saving/stickers"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPowerSavingBox(ctx, PowerSaving::kStickersPanel);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"power-saving/emoji"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPowerSavingBox(ctx, PowerSaving::kEmojiPanel);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"power-saving/effects"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPowerSavingBox(ctx, PowerSaving::kChatBackground);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/themes"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/themes"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/themes/edit"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/themes-edit"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/themes/create"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/themes-create"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/wallpapers"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/wallpapers"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/wallpapers/set"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/wallpapers-set"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/wallpapers/choose-photo"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/wallpapers-choose-photo"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/your-color"_q,
+		.action = AliasTo{ u"settings"_q, u"profile-color"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/your-color/profile"_q,
+		.action = AliasTo{ u"settings"_q, u"profile-color/profile"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/your-color/profile/add-icons"_q,
+		.action = AliasTo{ u"settings"_q, u"profile-color/profile/add-icons"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/your-color/profile/use-gift"_q,
+		.action = AliasTo{ u"settings"_q, u"profile-color/profile/use-gift"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/your-color/profile/reset"_q,
+		.action = AliasTo{ u"settings"_q, u"profile-color/profile/reset"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/your-color/name"_q,
+		.action = AliasTo{ u"settings"_q, u"profile-color/name"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/your-color/name/add-icons"_q,
+		.action = AliasTo{ u"settings"_q, u"profile-color/name/add-icons"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/your-color/name/use-gift"_q,
+		.action = AliasTo{ u"settings"_q, u"profile-color/name/use-gift"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/night-mode"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowMainMenuWithHighlight(ctx, u"main-menu/night-mode"_q);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/auto-night-mode"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/auto-night-mode"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/text-size"_q,
+		.action = SettingsControl{
+			::Settings::MainId(),
+			u"main/scale"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/animations"_q,
+		.action = AliasTo{ u"settings"_q, u"power-saving"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/stickers-and-emoji"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/stickers-emoji"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/stickers-and-emoji/edit"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ctx.controller->show(Box<StickersBox>(
+				ctx.controller->uiShow(),
+				StickersBox::Section::Installed));
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/stickers-and-emoji/trending"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ctx.controller->show(Box<StickersBox>(
+				ctx.controller->uiShow(),
+				StickersBox::Section::Featured));
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/stickers-and-emoji/archived"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ctx.controller->show(Box<StickersBox>(
+				ctx.controller->uiShow(),
+				StickersBox::Section::Archived));
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/stickers-and-emoji/emoji"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ctx.controller->show(
+				Box<Ui::Emoji::ManageSetsBox>(&ctx.controller->session()));
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/stickers-and-emoji/emoji/suggest"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/suggest-animated-emoji"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/stickers-and-emoji/emoji/quick-reaction"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/quick-reaction"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/stickers-and-emoji/emoji/quick-reaction/choose"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/quick-reaction-choose"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/stickers-and-emoji/suggest-by-emoji"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/suggest-by-emoji"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/stickers-and-emoji/emoji/large"_q,
+		.action = SettingsControl{
+			::Settings::ChatId(),
+			u"chat/large-emoji"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"language"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowLanguageBox(ctx);
+		}},
+		.requiresAuth = false,
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"language/show-button"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowLanguageBox(ctx, u"language/show-button"_q);
+		}},
+		.requiresAuth = false,
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"language/translate-chats"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowLanguageBox(ctx, u"language/translate-chats"_q);
+		}},
+		.requiresAuth = false,
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"language/do-not-translate"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowLanguageBox(ctx, u"language/do-not-translate"_q);
+		}},
+		.requiresAuth = false,
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"premium"_q,
+		.action = SettingsSection{ ::Settings::PremiumId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"stars"_q,
+		.action = SettingsSection{ ::Settings::CreditsId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"stars/top-up"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			static auto handler = ::Settings::BuyStarsHandler();
+			handler.handler(ctx.controller->uiShow())();
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"stars/stats"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			const auto self = ctx.controller->session().user();
+			ctx.controller->showSection(Info::BotEarn::Make(self));
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"stars/gift"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			Ui::ShowGiftCreditsBox(ctx.controller, nullptr);
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"stars/earn"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			const auto self = ctx.controller->session().user();
+			if (Info::BotStarRef::Join::Allowed(self)) {
+				ctx.controller->showSection(Info::BotStarRef::Join::Make(self));
+			}
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"ton"_q,
+		.action = SettingsSection{ ::Settings::CurrencyId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"business"_q,
+		.action = SettingsSection{ ::Settings::BusinessId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"business/do-not-hide-ads"_q,
+		.action = SettingsControl{
+			::Settings::BusinessId(),
+			u"business/sponsored"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"send-gift"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			Ui::ChooseStarGiftRecipient(ctx.controller);
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"send-gift/self"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			Ui::ShowStarGiftBox(ctx.controller, ctx.controller->session().user());
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"saved-messages"_q,
+		.action = CodeBlock{ ShowSavedMessages },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"calls"_q,
+		.action = SettingsSection{ ::Settings::CallsId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"calls/all"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			Calls::ShowCallsBox(ctx.controller);
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"faq"_q,
+		.action = CodeBlock{ ShowFaq },
+		.requiresAuth = false,
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"ask-question"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			::Settings::OpenAskQuestionConfirm(ctx.controller);
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"features"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			UrlClickHandler::Open(tr::lng_telegram_features_url(tr::now));
+			return Result::Handled;
+		}},
+		.requiresAuth = false,
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"search"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			const auto self = ctx.controller->session().user();
+			auto stack = std::vector<std::shared_ptr<Info::ContentMemento>>();
+			stack.push_back(std::make_shared<Info::Settings::Memento>(
+				self,
+				::Settings::MainId()));
+			stack.push_back(std::make_shared<Info::Settings::Memento>(
+				self,
+				::Settings::Search::Id()));
+			ctx.controller->showSection(
+				std::make_shared<Info::Memento>(std::move(stack)));
+			return Result::Handled;
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"qr-code"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return HandleQrCode(ctx, false);
+		}},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"qr-code/share"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return HandleQrCode(ctx, true);
+		}},
+	});
+
+	// Edit profile deep links.
+	router.add(u"settings"_q, {
+		.path = u"edit/set-photo"_q,
+		.action = SettingsControl{
+			::Settings::MainId(),
+			u"profile-photo"_q,
+		},
+	});
+	router.add(u"settings"_q, {
+		.path = u"edit/first-name"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowEditName(ctx, EditNameBox::Focus::FirstName);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"edit/last-name"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowEditName(ctx, EditNameBox::Focus::LastName);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"edit/bio"_q,
+		.action = SettingsControl{
+			::Settings::InformationId(),
+			u"edit/bio"_q,
+		},
+	});
+	router.add(u"settings"_q, {
+		.path = u"edit/birthday"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return OpenInternalUrl(ctx, u"internal:edit_birthday"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"edit/change-number"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			ctx.controller->show(
+				Ui::MakeInformBox(tr::lng_change_phone_error()));
+			return Result::Handled;
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"edit/username"_q,
+		.action = CodeBlock{ ShowEditUsername },
+	});
+	router.add(u"settings"_q, {
+		.path = u"edit/your-color"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowPeerColorBox(ctx, PeerColorTab::Profile);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"edit/channel"_q,
+		.action = SettingsControl{
+			::Settings::InformationId(),
+			u"edit/channel"_q,
+		},
+	});
+	router.add(u"settings"_q, {
+		.path = u"edit/add-account"_q,
+		.action = SettingsControl{
+			::Settings::InformationId(),
+			u"edit/add-account"_q,
+		},
+	});
+	router.add(u"settings"_q, {
+		.path = u"edit/log-out"_q,
+		.action = CodeBlock{ ShowLogOutMenu },
+	});
+
+	// Calls deep links.
+	router.add(u"settings"_q, {
+		.path = u"calls/start-call"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			if (!ctx.controller) {
+				return Result::NeedsAuth;
+			}
+			Calls::ShowCallsBox(ctx.controller, true);
+			return Result::Handled;
+		}},
+	});
+
+	// Devices (sessions) deep links.
+	router.add(u"settings"_q, {
+		.path = u"devices/terminate-sessions"_q,
+		.action = SettingsControl{
+			::Settings::SessionsId(),
+			u"sessions/terminate-all"_q,
+		},
+	});
+	router.add(u"settings"_q, {
+		.path = u"devices/auto-terminate"_q,
+		.action = SettingsControl{
+			::Settings::SessionsId(),
+			u"sessions/auto-terminate"_q,
+		},
+	});
+
+	// Folders deep links.
+	router.add(u"settings"_q, {
+		.path = u"folders/create"_q,
+		.action = SettingsControl{
+			::Settings::FoldersId(),
+			u"folders/create"_q,
+		},
+	});
+	router.add(u"settings"_q, {
+		.path = u"folders/add-recommended"_q,
+		.action = SettingsControl{
+			::Settings::FoldersId(),
+			u"folders/add-recommended"_q,
+		},
+	});
+	router.add(u"settings"_q, {
+		.path = u"folders/show-tags"_q,
+		.action = SettingsControl{
+			::Settings::FoldersId(),
+			u"folders/show-tags"_q,
+		},
+	});
+	router.add(u"settings"_q, {
+		.path = u"folders/tab-view"_q,
+		.action = SettingsControl{
+			::Settings::FoldersId(),
+			u"folders/tab-view"_q,
+		},
+	});
+
+	// Notifications deep links.
+	router.add(u"settings"_q, {
+		.path = u"notifications/accounts"_q,
+		.action = SettingsControl{
+			::Settings::NotificationsId(),
+			u"notifications/accounts"_q,
+		},
+	});
+
+	// Notification type deep links - Private Chats.
+	router.add(u"settings"_q, {
+		.path = u"notifications/private-chats"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(ctx, Data::DefaultNotify::User);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/private-chats/edit"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(ctx, Data::DefaultNotify::User);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/private-chats/show"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(
+				ctx,
+				Data::DefaultNotify::User,
+				u"notifications/type/show"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/private-chats/sound"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(
+				ctx,
+				Data::DefaultNotify::User,
+				u"notifications/type/sound"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/private-chats/add-exception"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(
+				ctx,
+				Data::DefaultNotify::User,
+				u"notifications/type/add-exception"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/private-chats/delete-exceptions"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(
+				ctx,
+				Data::DefaultNotify::User,
+				u"notifications/type/delete-exceptions"_q);
+		}},
+	});
+
+	// Notification type deep links - Groups.
+	router.add(u"settings"_q, {
+		.path = u"notifications/groups"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(ctx, Data::DefaultNotify::Group);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/groups/edit"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(ctx, Data::DefaultNotify::Group);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/groups/show"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(
+				ctx,
+				Data::DefaultNotify::Group,
+				u"notifications/type/show"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/groups/sound"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(
+				ctx,
+				Data::DefaultNotify::Group,
+				u"notifications/type/sound"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/groups/add-exception"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(
+				ctx,
+				Data::DefaultNotify::Group,
+				u"notifications/type/add-exception"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/groups/delete-exceptions"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(
+				ctx,
+				Data::DefaultNotify::Group,
+				u"notifications/type/delete-exceptions"_q);
+		}},
+	});
+
+	// Notification type deep links - Channels.
+	router.add(u"settings"_q, {
+		.path = u"notifications/channels"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(ctx, Data::DefaultNotify::Broadcast);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/channels/edit"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(ctx, Data::DefaultNotify::Broadcast);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/channels/show"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(
+				ctx,
+				Data::DefaultNotify::Broadcast,
+				u"notifications/type/show"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/channels/sound"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(
+				ctx,
+				Data::DefaultNotify::Broadcast,
+				u"notifications/type/sound"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/channels/add-exception"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(
+				ctx,
+				Data::DefaultNotify::Broadcast,
+				u"notifications/type/add-exception"_q);
+		}},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/channels/delete-exceptions"_q,
+		.action = CodeBlock{ [](const Context &ctx) {
+			return ShowNotificationType(
+				ctx,
+				Data::DefaultNotify::Broadcast,
+				u"notifications/type/delete-exceptions"_q);
+		}},
+	});
+
+	// Other notification deep links.
+	router.add(u"settings"_q, {
+		.path = u"notifications/include-muted-chats"_q,
+		.action = SettingsControl{
+			::Settings::NotificationsId(),
+			u"notifications/include-muted-chats"_q,
+		},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/count-unread-messages"_q,
+		.action = SettingsControl{
+			::Settings::NotificationsId(),
+			u"notifications/count-unread-messages"_q,
+		},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/new-contacts"_q,
+		.action = SettingsControl{
+			::Settings::NotificationsId(),
+			u"notifications/events/joined"_q,
+		},
+	});
+	router.add(u"settings"_q, {
+		.path = u"notifications/pinned-messages"_q,
+		.action = SettingsControl{
+			::Settings::NotificationsId(),
+			u"notifications/events/pinned"_q,
+		},
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"themes"_q,
+		.action = AliasTo{ u"settings"_q, u"appearance/themes"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"themes/edit"_q,
+		.action = AliasTo{ u"settings"_q, u"appearance/themes/edit"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"themes/create"_q,
+		.action = AliasTo{ u"settings"_q, u"appearance/themes/create"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"change_number"_q,
+		.action = AliasTo{ u"settings"_q, u"edit/change-number"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"auto_delete"_q,
+		.action = AliasTo{ u"settings"_q, u"privacy/auto-delete"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"information"_q,
+		.action = AliasTo{ u"settings"_q, u"edit"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"edit_profile"_q,
+		.action = SettingsSection{ ::Settings::InformationId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"phone_privacy"_q,
+		.action = AliasTo{ u"settings"_q, u"privacy/phone-number"_q },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"login_email"_q,
+		.action = CodeBlock{ ShowLoginEmail },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"advanced"_q,
+		.action = SettingsSection{ ::Settings::AdvancedId() },
+	});
+
+	router.add(u"settings"_q, {
+		.path = u"appearance/shortcuts"_q,
+		.action = SettingsSection{ ::Settings::ShortcutsId() },
+	});
+}
+
+QString SettingsDeepLink(
+		::Settings::Type section,
+		const QString &controlId) {
+	const auto &router = Router::Instance();
+	const auto sectionPath = [&] {
+		return router.findPath(u"settings"_q, [&](const Action &action) {
+			const auto target = std::get_if<SettingsSection>(&action);
+			return target && (target->sectionId == section);
+		});
+	};
+	const auto url = [](const QString &path) {
+		return path.isEmpty()
+			? u"tg://settings"_q
+			: (u"tg://settings/"_q + path);
+	};
+	if (!controlId.isEmpty()) {
+		const auto control = router.findPath(u"settings"_q, [&](
+				const Action &action) {
+			const auto entry = std::get_if<SettingsControl>(&action);
+			return entry && (entry->controlId == controlId);
+		});
+		if (control) {
+			return url(*control);
+		} else if (const auto path = sectionPath()) {
+			return url(*path) + u"?highlight="_q + controlId;
+		}
+		return QString();
+	} else if (const auto path = sectionPath()) {
+		return url(*path);
+	}
+	return QString();
+}
+
+} // namespace Core::DeepLinks
diff --git a/Telegram/SourceFiles/core/deep_links/deep_links_settings.h b/Telegram/SourceFiles/core/deep_links/deep_links_settings.h
new file mode 100644
index 00000000000000..2fa7bcee2ff3ea
--- /dev/null
+++ b/Telegram/SourceFiles/core/deep_links/deep_links_settings.h
@@ -0,0 +1,22 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "settings/settings_type.h"
+
+namespace Core::DeepLinks {
+
+class Router;
+
+void RegisterSettingsHandlers(Router &router);
+
+[[nodiscard]] QString SettingsDeepLink(
+	::Settings::Type section,
+	const QString &controlId);
+
+} // namespace Core::DeepLinks
diff --git a/Telegram/SourceFiles/core/deep_links/deep_links_types.h b/Telegram/SourceFiles/core/deep_links/deep_links_types.h
new file mode 100644
index 00000000000000..b2e80efbe57322
--- /dev/null
+++ b/Telegram/SourceFiles/core/deep_links/deep_links_types.h
@@ -0,0 +1,65 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "settings/settings_type.h"
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Core::DeepLinks {
+
+enum class Result {
+	Handled,
+	NotFound,
+	NeedsAuth,
+	Unsupported,
+};
+
+struct Context {
+	Window::SessionController *controller = nullptr;
+	QString section;
+	QString path;
+	QMap<QString, QString> params;
+};
+
+using Handler = Fn<Result(const Context&)>;
+
+struct SettingsSection {
+	Settings::Type sectionId;
+};
+
+struct SettingsControl {
+	Settings::Type sectionId;
+	QString controlId;
+};
+
+struct CodeBlock {
+	Handler handler;
+};
+
+struct AliasTo {
+	QString section;
+	QString path;
+};
+
+using Action = std::variant<
+	SettingsSection,
+	SettingsControl,
+	CodeBlock,
+	AliasTo>;
+
+struct Entry {
+	QString path;
+	Action action;
+	bool requiresAuth = true;
+	bool skipActivation = false;
+};
+
+} // namespace Core::DeepLinks
diff --git a/Telegram/SourceFiles/core/external_control.cpp b/Telegram/SourceFiles/core/external_control.cpp
new file mode 100644
index 00000000000000..0a64b6390dbda1
--- /dev/null
+++ b/Telegram/SourceFiles/core/external_control.cpp
@@ -0,0 +1,243 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "core/external_control.h"
+
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "window/window_controller.h"
+#include "ui/layers/generic_box.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/vertical_list.h"
+#include "base/random.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+#include "styles/style_widgets.h"
+
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QWidget>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+
+namespace Core {
+namespace {
+
+constexpr auto kAutomationKey = std::string_view("automation.enabled");
+
+struct WindowEntry {
+	not_null<Window::Controller*> controller;
+	QWidget *window = nullptr;
+};
+
+[[nodiscard]] bool AutomationEnabled() {
+	return Core::App().settings().readPref<bool>(kAutomationKey, false);
+}
+
+void FillAutomationConfirmBox(
+		not_null<Ui::GenericBox*> box,
+		const QString &text,
+		Fn<void()> enable) {
+	box->setTitle(rpl::single(u"Local automation"_q));
+	box->addRow(object_ptr<Ui::FlatLabel>(
+		box,
+		rpl::single(text),
+		st::boxLabel));
+
+	const auto cancel = [=] {
+		box->closeBox();
+	};
+	struct Entry {
+		QString text;
+		Fn<void()> callback;
+	};
+	auto entries = std::vector<Entry>{
+		{ u"Enable"_q, enable },
+		{ u"Cancel"_q, cancel },
+		{ u"Not sure"_q, cancel },
+	};
+	for (auto i = int(entries.size()) - 1; i > 0; --i) {
+		std::swap(entries[i], entries[base::RandomIndex(i + 1)]);
+	}
+
+	const auto content = box->verticalLayout();
+	for (const auto &entry : entries) {
+		Ui::AddSkip(content);
+		const auto button = content->add(
+			object_ptr<Ui::RoundButton>(
+				content,
+				rpl::single(entry.text),
+				st::defaultLightButton),
+			st::boxRowPadding,
+			style::al_justify);
+		button->setFullRadius(true);
+		button->setClickedCallback(entry.callback);
+	}
+	box->setStyle(st::localAutomationBox);
+}
+
+void RequestEnableAutomation() {
+	const auto window = Core::App().activePrimaryWindow();
+	if (!window) {
+		return;
+	}
+	static QPointer<Ui::GenericBox> current;
+	if (current) {
+		return;
+	}
+	const auto show = window->uiShow();
+
+	const auto second = [=](not_null<Ui::GenericBox*> box) {
+		current = box.get();
+		FillAutomationConfirmBox(
+			box,
+			u"Just to be sure — confirm once more to enable local "
+			u"automation."_q,
+			[=] {
+				Core::App().settings().writePref<bool>(
+					kAutomationKey,
+					true);
+				box->closeBox();
+			});
+	};
+	const auto first = [=](not_null<Ui::GenericBox*> box) {
+		current = box.get();
+		FillAutomationConfirmBox(
+			box,
+			u"An external program is trying to control "
+			u"Telegram Desktop over the local socket — read open "
+			u"windows and activate them.\n\nEnable local "
+			u"automation? While it is on, anything running under your "
+			u"user account can control the app."_q,
+			[=] {
+				box->closeBox();
+				show->showBox(Box(second));
+			});
+	};
+	show->show(Box(first));
+}
+
+[[nodiscard]] QByteArray Pack(QJsonObject object) {
+	return QJsonDocument(object).toJson(QJsonDocument::Compact);
+}
+
+[[nodiscard]] QByteArray Error(const QString &text) {
+	auto object = QJsonObject();
+	object.insert(u"ok"_q, false);
+	object.insert(u"error"_q, text);
+	return Pack(object);
+}
+
+[[nodiscard]] std::vector<WindowEntry> CollectWindows() {
+	auto result = std::vector<WindowEntry>();
+	for (const auto widget : QApplication::topLevelWidgets()) {
+		const auto controller = App().findWindow(widget);
+		if (!controller) {
+			continue;
+		}
+		auto already = false;
+		for (const auto &entry : result) {
+			if (entry.controller.get() == controller) {
+				already = true;
+				break;
+			}
+		}
+		if (!already) {
+			result.push_back({ controller, widget->window() });
+		}
+	}
+	ranges::sort(result, [](const WindowEntry &a, const WindowEntry &b) {
+		if (a.controller->isPrimary() != b.controller->isPrimary()) {
+			return a.controller->isPrimary();
+		}
+		return a.controller.get() < b.controller.get();
+	});
+	return result;
+}
+
+[[nodiscard]] QByteArray HandleWindows() {
+	const auto active = App().activeWindow();
+	auto list = QJsonArray();
+	auto index = 0;
+	for (const auto &entry : CollectWindows()) {
+		auto object = QJsonObject();
+		object.insert(u"id"_q, index++);
+		object.insert(u"title"_q, entry.window->windowTitle());
+		object.insert(u"primary"_q, entry.controller->isPrimary());
+		object.insert(u"active"_q, (entry.controller.get() == active));
+		list.append(object);
+	}
+	auto object = QJsonObject();
+	object.insert(u"ok"_q, true);
+	object.insert(u"windows"_q, list);
+	return Pack(object);
+}
+
+[[nodiscard]] QByteArray HandleActivate(int index) {
+	const auto windows = CollectWindows();
+	if (index < 0 || index >= int(windows.size())) {
+		return Error(u"no such window"_q);
+	}
+	windows[index].controller->activate();
+	auto object = QJsonObject();
+	object.insert(u"ok"_q, true);
+	object.insert(u"activated"_q, index);
+	return Pack(object);
+}
+
+[[nodiscard]] QByteArray HandleCycle() {
+	const auto windows = CollectWindows();
+	if (windows.empty()) {
+		return Error(u"no windows"_q);
+	}
+	const auto active = App().activeWindow();
+	auto current = 0;
+	for (auto i = 0, count = int(windows.size()); i != count; ++i) {
+		if (windows[i].controller.get() == active) {
+			current = i;
+			break;
+		}
+	}
+	const auto next = (current + 1) % int(windows.size());
+	windows[next].controller->activate();
+	auto object = QJsonObject();
+	object.insert(u"ok"_q, true);
+	object.insert(u"activated"_q, next);
+	return Pack(object);
+}
+
+} // namespace
+
+QByteArray HandleExternalControl(const QString &command) {
+	if (!IsAppLaunched()) {
+		return Error(u"application is not launched"_q);
+	} else if (!AutomationEnabled()) {
+		RequestEnableAutomation();
+		return Error(u"local automation is disabled — confirm in the "
+			u"Telegram window to enable"_q);
+	} else if (command == u"automation-off"_q) { // TEMP test helper.
+		Core::App().settings().writePref<bool>(kAutomationKey, false);
+		auto object = QJsonObject();
+		object.insert(u"ok"_q, true);
+		return Pack(object);
+	} else if (command == u"ping"_q) {
+		auto object = QJsonObject();
+		object.insert(u"ok"_q, true);
+		object.insert(u"result"_q, u"pong"_q);
+		return Pack(object);
+	} else if (command == u"windows"_q) {
+		return HandleWindows();
+	} else if (command.startsWith(u"activate:"_q)) {
+		return HandleActivate(command.mid(9).toInt());
+	} else if (command == u"cycle"_q) {
+		return HandleCycle();
+	}
+	return Error(u"unknown control command"_q);
+}
+
+} // namespace Core
diff --git a/Telegram/SourceFiles/core/external_control.h b/Telegram/SourceFiles/core/external_control.h
new file mode 100644
index 00000000000000..609f03b321b0c6
--- /dev/null
+++ b/Telegram/SourceFiles/core/external_control.h
@@ -0,0 +1,14 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Core {
+
+[[nodiscard]] QByteArray HandleExternalControl(const QString &command);
+
+} // namespace Core
diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp
index 21d912f63c8e80..9307a3c811206c 100644
--- a/Telegram/SourceFiles/core/file_utilities.cpp
+++ b/Telegram/SourceFiles/core/file_utilities.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "core/file_utilities.h"
 
+#include "core/version.h"
 #include "storage/localstorage.h"
 #include "storage/storage_account.h"
 #include "base/platform/base_platform_file_utilities.h"
@@ -332,10 +333,19 @@ QString ImagesOrAllFilter() {
 }
 
 QString PhotoVideoFilesFilter() {
-	return u"Image and Video Files (*.png *.jpg *.jpeg *.mp4 *.mov *.m4v);;"_q
+	return u"Image and Video Files (*"_q
+		+ Ui::ImageExtensions().join(u" *"_q)
+		+ u" *.mp4 *.mov *.m4v);;"_q
 		+ AllFilesFilter();
 }
 
+QString PhotoVideoAudioFilesFilter() {
+	return u"Image, Video and Audio Files (*"_q
+		+ Ui::ImageExtensions().join(u" *"_q)
+		+ u" *.mp4 *.mov *.m4v *.webm"_q
+		+ u" *.mp3 *.m4a *.aac *.ogg *.flac *.opus *.oga)"_q;
+}
+
 const QString &Tmp() {
 	static const auto tmp = u"tmp"_q;
 	return tmp;
diff --git a/Telegram/SourceFiles/core/file_utilities.h b/Telegram/SourceFiles/core/file_utilities.h
index 815b897724df1d..95d35fe24aed68 100644
--- a/Telegram/SourceFiles/core/file_utilities.h
+++ b/Telegram/SourceFiles/core/file_utilities.h
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include <QtCore/QUrl>
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -92,6 +94,7 @@ void GetFolder(
 [[nodiscard]] QString AllOrImagesFilter();
 [[nodiscard]] QString ImagesOrAllFilter();
 [[nodiscard]] QString PhotoVideoFilesFilter();
+[[nodiscard]] QString PhotoVideoAudioFilesFilter();
 [[nodiscard]] const QString &Tmp();
 
 namespace internal {
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index 0b6afb7aa84deb..0d3d9a213d9a4e 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -16,17 +16,31 @@ For license and copyright information please follow this link:
 #include "core/crash_reports.h"
 #include "core/update_checker.h"
 #include "core/sandbox.h"
+#include "core/version.h"
 #include "base/concurrent_timer.h"
 #include "base/options.h"
 
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QStandardPaths>
+#include <QtCore/QLibraryInfo>
 
 namespace Core {
 namespace {
 
 uint64 InstallationTag = 0;
 
+base::options::toggle OptionHighDpiDownscale({
+	.id = kOptionHighDpiDownscale,
+	.name = "High DPI downscale",
+	.description = "Follow system interface scale settings exactly"
+		" (another approach, likely better quality).",
+	.scope = [] {
+		return !Platform::IsMac()
+			&& QLibraryInfo::version() >= QVersionNumber(6, 8);
+	},
+	.restartRequired = true,
+});
+
 base::options::toggle OptionFreeType({
 	.id = kOptionFreeType,
 	.name = "FreeType font engine",
@@ -62,7 +76,7 @@ FilteredCommandLineArguments::FilteredCommandLineArguments(
 	}
 
 #if defined Q_OS_WIN || defined Q_OS_MAC
-	if (OptionFreeType.value()) {
+	if (OptionFreeType.value() || OptionHighDpiDownscale.value()) {
 		pushArgument("-platform");
 #ifdef Q_OS_WIN
 		pushArgument("windows:fontengine=freetype");
@@ -106,6 +120,10 @@ void ComputeDebugMode() {
 	auto file = QFile(debugModeSettingPath);
 	if (file.exists() && file.open(QIODevice::ReadOnly)) {
 		Logs::SetDebugEnabled(file.read(1) != "0");
+#if defined _DEBUG && !defined Q_OS_MAC
+	} else {
+		Logs::SetDebugEnabled(true);
+#endif
 	}
 	if (cDebugMode()) {
 		Logs::SetDebugEnabled(true);
@@ -290,6 +308,7 @@ base::options::toggle OptionFractionalScalingEnabled({
 } // namespace
 
 const char kOptionFractionalScalingEnabled[] = "fractional-scaling-enabled";
+const char kOptionHighDpiDownscale[] = "high-dpi-downscale";
 const char kOptionFreeType[] = "freetype";
 
 Launcher *Launcher::InstanceSetter::Instance = nullptr;
@@ -341,7 +360,14 @@ void Launcher::initHighDpi() {
 	QApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
 #endif // Qt < 6.0.0
 
-	if (OptionFractionalScalingEnabled.value()) {
+	if (OptionHighDpiDownscale.value()) {
+		qputenv("QT_WIDGETS_HIGHDPI_DOWNSCALE", "1");
+	} else {
+		qunsetenv("QT_WIDGETS_HIGHDPI_DOWNSCALE");
+	}
+
+	if (OptionFractionalScalingEnabled.value()
+			|| OptionHighDpiDownscale.value()) {
 		QApplication::setHighDpiScaleFactorRoundingPolicy(
 			Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
 	} else {
@@ -500,6 +526,22 @@ uint64 Launcher::installationTag() const {
 	return InstallationTag;
 }
 
+QByteArray Launcher::instanceHash() const {
+	static const auto Result = [&] {
+		QByteArray h(32, 0);
+		if (customWorkingDir()) {
+			const auto d = QFile::encodeName(
+				QDir(cWorkingDir()).absolutePath());
+			hashMd5Hex(d.constData(), d.size(), h.data());
+		} else {
+			const auto f = QFile::encodeName(cExeDir() + cExeName());
+			hashMd5Hex(f.constData(), f.size(), h.data());
+		}
+		return h;
+	}();
+	return Result;
+}
+
 void Launcher::processArguments() {
 	enum class KeyFormat {
 		NoValues,
@@ -516,15 +558,18 @@ void Launcher::processArguments() {
 		{ "-tosettings"     , KeyFormat::NoValues },
 		{ "-startintray"    , KeyFormat::NoValues },
 		{ "-quit"           , KeyFormat::NoValues },
-		{ "-sendpath"       , KeyFormat::AllLeftValues },
 		{ "-workdir"        , KeyFormat::OneValue },
-		{ "--"              , KeyFormat::OneValue },
+		{ "--"              , KeyFormat::AllLeftValues },
 		{ "-scale"          , KeyFormat::OneValue },
 	};
 	auto parseResult = QMap<QByteArray, QStringList>();
 	auto parsingKey = QByteArray();
 	auto parsingFormat = KeyFormat::NoValues;
-	for (const auto &argument : std::as_const(_arguments)) {
+	for (auto i = _arguments.cbegin(); i != _arguments.cend(); ++i) {
+		if (i == _arguments.cbegin()) {
+			continue;
+		}
+		const auto &argument = *i;
 		switch (parsingFormat) {
 		case KeyFormat::OneValue: {
 			parseResult[parsingKey] = QStringList(argument.mid(0, 8192));
@@ -539,7 +584,9 @@ void Launcher::processArguments() {
 			if (it != parseMap.end()) {
 				parsingFormat = it->second;
 				parseResult[parsingKey] = QStringList();
+				continue;
 			}
+			parseResult["--"].push_back(argument.mid(0, 8192));
 		} break;
 		}
 	}
@@ -559,12 +606,15 @@ void Launcher::processArguments() {
 	gStartToSettings = parseResult.contains("-tosettings");
 	gStartInTray = parseResult.contains("-startintray");
 	gQuit = parseResult.contains("-quit");
-	gSendPaths = parseResult.value("-sendpath", {});
 	_customWorkingDir = parseResult.value("-workdir", {}).join(QString());
 	if (!_customWorkingDir.isEmpty()) {
 		_customWorkingDir = QDir(_customWorkingDir).absolutePath() + '/';
 	}
-	gStartUrl = parseResult.value("--", {}).join(QString());
+
+	const auto startUrls = parseResult.value("--", {});
+	gStartUrls = startUrls | ranges::views::transform([&](const QString &url) {
+		return QUrl::fromUserInput(url, _initialWorkingDir);
+	}) | ranges::views::filter(&QUrl::isValid) | ranges::to<QList<QUrl>>;
 
 	const auto scaleKey = parseResult.value("-scale", {});
 	if (scaleKey.size() > 0) {
diff --git a/Telegram/SourceFiles/core/launcher.h b/Telegram/SourceFiles/core/launcher.h
index ea5b1c97f35669..a0eb1e8d305cec 100644
--- a/Telegram/SourceFiles/core/launcher.h
+++ b/Telegram/SourceFiles/core/launcher.h
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 namespace Core {
 
 extern const char kOptionFractionalScalingEnabled[];
+extern const char kOptionHighDpiDownscale[];
 extern const char kOptionFreeType[];
 
 class Launcher {
@@ -33,6 +34,7 @@ class Launcher {
 	bool customWorkingDir() const;
 
 	uint64 installationTag() const;
+	QByteArray instanceHash() const;
 
 	bool checkPortableVersionFolder();
 	bool validateCustomWorkingDir();
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index c07832e9a7ae41..c1ff5fda47fb0c 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -7,7 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "core/local_url_handlers.h"
 
-#include "api/api_authorizations.h"
+#include "core/deep_links/deep_links_router.h"
 #include "api/api_confirm_phone.h"
 #include "api/api_chat_filters.h"
 #include "api/api_chat_invite.h"
@@ -25,22 +25,27 @@ For license and copyright information please follow this link:
 #include "ui/boxes/edit_birthday_box.h"
 #include "ui/integration.h"
 #include "payments/payments_non_panel_process.h"
+#include "boxes/peers/edit_peer_info_box.h"
 #include "boxes/share_box.h"
 #include "boxes/connection_box.h"
 #include "boxes/gift_premium_box.h"
 #include "boxes/edit_privacy_box.h"
 #include "boxes/premium_preview_box.h"
+#include "boxes/preview_ai_tone_box.h"
 #include "boxes/sticker_set_box.h"
-#include "boxes/sessions_box.h"
 #include "boxes/star_gift_box.h"
 #include "boxes/language_box.h"
+#include "boxes/url_auth_box.h"
 #include "passport/passport_form_controller.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
+#include "ui/vertical_list.h"
 #include "data/components/credits.h"
+#include "data/data_ai_compose_tones.h"
 #include "data/data_birthday.h"
 #include "data/data_channel.h"
 #include "data/data_document.h"
+#include "data/data_poll.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "media/player/media_player_instance.h"
@@ -51,26 +56,28 @@ For license and copyright information please follow this link:
 #include "window/window_peer_menu.h"
 #include "window/themes/window_theme_editor_box.h" // GenerateSlug.
 #include "payments/payments_checkout_process.h"
-#include "settings/settings_credits.h"
+#include "settings/sections/settings_credits.h"
 #include "settings/settings_credits_graphics.h"
-#include "settings/settings_information.h"
-#include "settings/settings_global_ttl.h"
-#include "settings/settings_folders.h"
-#include "settings/settings_main.h"
 #include "settings/settings_privacy_controllers.h"
-#include "settings/settings_privacy_security.h"
-#include "settings/settings_chat.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
+#include "storage/storage_account.h"
 #include "mainwidget.h"
 #include "main/main_account.h"
+#include "main/main_app_config.h"
 #include "main/main_domain.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "info/profile/info_profile_values.h"
 #include "inline_bots/bot_attach_web_view.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "iv/iv_instance.h"
 #include "apiwrap.h"
 
+#include "styles/style_chat_helpers.h"
+
 #include <QtGui/QGuiApplication>
 
 namespace Core {
@@ -145,10 +152,10 @@ void PersonalChannelController::prepare() {
 		}
 		if (!delegate()->peerListFullRowsCount()) {
 			auto none = rpl::combine(
-				tr::lng_settings_channel_no_yet(Ui::Text::WithEntities),
+				tr::lng_settings_channel_no_yet(tr::marked),
 				tr::lng_settings_channel_start()
 			) | rpl::map([](TextWithEntities &&text, const QString &link) {
-				return text.append('\n').append(Ui::Text::Link(link));
+				return text.append('\n').append(tr::link(link));
 			});
 			auto label = object_ptr<Ui::FlatLabel>(
 				nullptr,
@@ -175,6 +182,34 @@ auto PersonalChannelController::chosen() const
 	return _chosen.events();
 }
 
+Window::SessionController *ApplyAccountIndex(
+		not_null<Window::SessionController*> controller,
+		int accountIndex) {
+	if (accountIndex <= 0) {
+		return nullptr;
+	}
+	const auto list = Core::App().domain().orderedAccounts();
+	if (accountIndex > int(list.size())) {
+		return nullptr;
+	}
+	const auto account = list[accountIndex - 1];
+	if (account == &controller->session().account()) {
+		return controller;
+	} else if (const auto window = Core::App().windowFor({ account })) {
+		if (&window->account() != account) {
+			Core::App().domain().maybeActivate(account);
+			if (&window->account() != account) {
+				return nullptr;
+			}
+		}
+		const auto session = window->sessionController();
+		if (session) {
+			return session;
+		}
+	}
+	return nullptr;
+}
+
 void SavePersonalChannel(
 		not_null<Window::SessionController*> window,
 		ChannelData *channel) {
@@ -194,7 +229,7 @@ void SavePersonalChannel(
 			&& self->personalChannelMessageId() != messageId)) {
 		self->setPersonalChannel(channelId, messageId);
 		self->session().api().request(MTPaccount_UpdatePersonalChannel(
-			channel ? channel->inputChannel : MTP_inputChannelEmpty()
+			channel ? channel->inputChannel() : MTP_inputChannelEmpty()
 		)).done(crl::guard(window, [=] {
 			window->showToast((channel
 				? tr::lng_settings_channel_saved
@@ -264,6 +299,42 @@ bool ShowTheme(
 	return true;
 }
 
+bool ShowAiStyle(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto slug = match->captured(1);
+	Core::App().hideMediaView();
+	const auto weak = base::make_weak(controller);
+	auto &tones = controller->session().data().aiComposeTones();
+	tones.resolve(slug, [=](Data::AiComposeTone tone) {
+		const auto strong = weak.get();
+		if (!strong) {
+			return;
+		}
+		strong->window().show(Box(
+			PreviewAiToneBox,
+			&strong->session(),
+			std::move(tone),
+			weak));
+	}, [=](const MTP::Error &error) {
+		const auto strong = weak.get();
+		if (!strong) {
+			return;
+		} else if (error.type() == u"AICOMPOSE_TONE_SLUG_INVALID"_q) {
+			strong->window().showToast(
+				tr::lng_ai_compose_tone_invalid(tr::now));
+		} else if (!MTP::IgnoreError(error)) {
+			strong->window().showToast(error.type());
+		}
+	});
+	controller->window().activate();
+	return true;
+}
+
 void ShowLanguagesBox(Window::SessionController *controller) {
 	static auto Guard = base::binary_guard();
 	Guard = LanguageBox::Show(controller);
@@ -358,6 +429,8 @@ bool ApplyMtprotoProxy(
 	auto params = url_parse_params(
 		match->captured(1),
 		qthelp::UrlParamNameTransform::ToLower);
+	auto &secret = params[u"secret"_q];
+	secret.replace('+', '-').replace('/', '_');
 	ProxiesBoxController::ShowApplyConfirmation(
 		controller,
 		MTP::ProxyData::Type::Mtproto,
@@ -430,7 +503,9 @@ bool ShowWallPaper(
 		const QString &value) {
 	auto result = ChatAdminRights();
 	for (const auto &element : value.split(QRegularExpression(u"[+ ]"_q))) {
-		if (element == u"change_info"_q) {
+		if (element.isEmpty()) {
+			continue;
+		} else if (element == u"change_info"_q) {
 			result |= ChatAdminRight::ChangeInfo;
 		} else if (element == u"post_messages"_q) {
 			result |= ChatAdminRight::PostMessages;
@@ -448,14 +523,22 @@ bool ShowWallPaper(
 			result |= ChatAdminRight::PinMessages;
 		} else if (element == u"promote_members"_q) {
 			result |= ChatAdminRight::AddAdmins;
+		} else if (element == u"post_stories"_q) {
+			result |= ChatAdminRight::PostStories;
+		} else if (element == u"edit_stories"_q) {
+			result |= ChatAdminRight::EditStories;
+		} else if (element == u"delete_stories"_q) {
+			result |= ChatAdminRight::DeleteStories;
 		} else if (element == u"manage_video_chats"_q) {
 			result |= ChatAdminRight::ManageCall;
+		} else if (element == u"manage_direct_messages"_q) {
+			result |= ChatAdminRight::ManageDirect;
 		} else if (element == u"anonymous"_q) {
 			result |= ChatAdminRight::Anonymous;
 		} else if (element == u"manage_chat"_q) {
 			result |= ChatAdminRight::Other;
 		} else {
-			return {};
+			continue;
 		}
 	}
 	return result;
@@ -471,6 +554,20 @@ bool ResolveUsernameOrPhone(
 	const auto params = url_parse_params(
 		match->captured(1),
 		qthelp::UrlParamNameTransform::ToLower);
+
+	if (params.contains(u"acc"_q)) {
+		const auto switched = ApplyAccountIndex(
+			controller,
+			params.value(u"acc"_q).toInt());
+		if (switched) {
+			controller = switched;
+		} else {
+			controller->showToast(u"Could not activate account %1."_q.arg(
+				params.value(u"acc"_q)));
+			return false;
+		}
+	}
+
 	const auto domainParam = params.value(u"domain"_q);
 	const auto appnameParam = params.value(u"appname"_q);
 	const auto myContext = context.value<ClickHandlerContext>();
@@ -488,6 +585,18 @@ bool ResolveUsernameOrPhone(
 		ResolveGiftCode(controller, appnameParam, fromId, toId);
 		return true;
 	}
+	if (domainParam == u"oauth"_q) {
+		const auto token = params.value(u"startapp"_q);
+		if (!token.isEmpty()) {
+			UrlAuthBox::ActivateUrl(
+				controller->uiShow(),
+				&controller->session(),
+				u"tg://resolve?domain=oauth&startapp="_q
+					+ qthelp::url_encode(token),
+				context);
+			return true;
+		}
+	}
 
 	// Fix t.me/s/username links.
 	const auto webChannelPreviewLink = (domainParam == u"s"_q)
@@ -514,8 +623,19 @@ bool ResolveUsernameOrPhone(
 		? ResolveType::Profile
 		: ResolveType::Default;
 	auto startToken = params.value(u"start"_q);
+	auto referral = params.value(u"ref"_q);
 	if (!startToken.isEmpty()) {
 		resolveType = ResolveType::BotStart;
+		if (referral.isEmpty()) {
+			const auto appConfig = &controller->session().appConfig();
+			const auto &prefixes = appConfig->startRefPrefixes();
+			for (const auto &prefix : prefixes) {
+				if (startToken.startsWith(prefix)) {
+					referral = startToken.mid(prefix.size());
+					break;
+				}
+			}
+		}
 	} else if (params.contains(u"startgroup"_q)) {
 		resolveType = ResolveType::AddToGroup;
 		startToken = params.value(u"startgroup"_q);
@@ -535,7 +655,10 @@ bool ResolveUsernameOrPhone(
 		post = postId;
 	}
 	const auto storyParam = params.value(u"story"_q);
-	const auto storyId = storyParam.toInt();
+	const auto storyAlbumParam = params.value(u"album"_q);
+	const auto storyAlbumId = storyAlbumParam.toInt();
+	const auto giftCollectionParam = params.value(u"collection"_q);
+	const auto giftCollectionId = giftCollectionParam.toInt();
 	const auto appname = webChannelPreviewLink ? QString() : appnameParam;
 	const auto commentParam = params.value(u"comment"_q);
 	const auto commentId = commentParam.toInt();
@@ -544,6 +667,12 @@ bool ResolveUsernameOrPhone(
 	const auto threadParam = params.value(u"thread"_q);
 	const auto threadId = topicId ? topicId : threadParam.toInt();
 	const auto gameParam = params.value(u"game"_q);
+	const auto videot = params.value(u"t"_q);
+	const auto pollOption = PollOptionFromLink(
+		params.value(u"option"_q));
+	if (params.contains(u"direct"_q)) {
+		resolveType = ResolveType::ChannelDirect;
+	}
 	if (!gameParam.isEmpty() && validDomain(gameParam)) {
 		startToken = gameParam;
 		resolveType = ResolveType::ShareGame;
@@ -559,7 +688,13 @@ bool ResolveUsernameOrPhone(
 		.usernameOrId = domain,
 		.phone = phone,
 		.messageId = post,
-		.storyId = storyId,
+		.pollOption = pollOption,
+		.storyParam = storyParam,
+		.storyAlbumId = storyAlbumId,
+		.giftCollectionId = giftCollectionId,
+		.videoTimestamp = (!videot.isEmpty()
+			? ParseVideoTimestamp(videot)
+			: std::optional<TimeId>()),
 		.text = params.value(u"text"_q),
 		.repliesInfo = commentId
 			? Window::RepliesByLinkInfo{
@@ -571,11 +706,13 @@ bool ResolveUsernameOrPhone(
 			}
 			: Window::RepliesByLinkInfo{ v::null },
 		.resolveType = resolveType,
+		.referral = referral,
 		.startToken = startToken,
 		.startAdminRights = adminRights,
 		.startAutoSubmit = myContext.botStartAutoSubmit,
 		.botAppName = (appname.isEmpty() ? postParam : appname),
 		.botAppForceConfirmation = myContext.mayShowConfirmation,
+		.botAppFullScreen = (params.value(u"mode"_q) == u"fullscreen"_q),
 		.attachBotUsername = params.value(u"attach"_q),
 		.attachBotToggleCommand = (params.contains(u"startattach"_q)
 			? params.value(u"startattach"_q)
@@ -598,6 +735,8 @@ bool ResolveUsernameOrPhone(
 			: std::nullopt),
 		.clickFromMessageId = myContext.itemId,
 		.clickFromBotWebviewContext = myContext.botWebviewContext,
+		.historyInNewWindow =
+			(params.value(u"tdesktop_target"_q) == u"blank"_q),
 	});
 	return true;
 }
@@ -621,6 +760,8 @@ bool ResolvePrivatePost(
 	const auto topicId = topicParam.toInt();
 	const auto threadParam = params.value(u"thread"_q);
 	const auto threadId = topicId ? topicId : threadParam.toInt();
+	const auto pollOption = PollOptionFromLink(
+		params.value(u"option"_q));
 	if (!channelId || (msgId && !IsServerMsgId(msgId))) {
 		return false;
 	}
@@ -628,6 +769,7 @@ bool ResolvePrivatePost(
 	controller->showPeerByLink(Window::PeerByLinkInfo{
 		.usernameOrId = channelId,
 		.messageId = msgId,
+		.pollOption = pollOption,
 		.repliesInfo = commentId
 			? Window::RepliesByLinkInfo{
 				Window::CommentId{ commentId }
@@ -644,47 +786,6 @@ bool ResolvePrivatePost(
 	return true;
 }
 
-bool ResolveSettings(
-		Window::SessionController *controller,
-		const Match &match,
-		const QVariant &context) {
-	const auto section = match->captured(1).mid(1).toLower();
-	const auto type = [&]() -> std::optional<::Settings::Type> {
-		if (section == u"language"_q) {
-			ShowLanguagesBox(controller);
-			return {};
-		} else if (section == u"devices"_q) {
-			return ::Settings::Sessions::Id();
-		} else if (section == u"folders"_q) {
-			return ::Settings::Folders::Id();
-		} else if (section == u"privacy"_q) {
-			return ::Settings::PrivacySecurity::Id();
-		} else if (section == u"themes"_q) {
-			return ::Settings::Chat::Id();
-		} else if (section == u"change_number"_q) {
-			controller->show(
-				Ui::MakeInformBox(tr::lng_change_phone_error()));
-			return {};
-		} else if (section == u"auto_delete"_q) {
-			return ::Settings::GlobalTTLId();
-		} else if (section == u"information"_q) {
-			return ::Settings::Information::Id();
-		}
-		return ::Settings::Main::Id();
-	}();
-
-	if (type.has_value()) {
-		if (!controller) {
-			return false;
-		} else if (*type == ::Settings::Sessions::Id()) {
-			controller->session().api().authorizations().reload();
-		}
-		controller->showSettings(*type);
-		controller->window().activate();
-	}
-	return true;
-}
-
 bool HandleUnknown(
 		Window::SessionController *controller,
 		const Match &match,
@@ -721,8 +822,8 @@ bool OpenMediaTimestamp(
 	if (!controller) {
 		return false;
 	}
-	const auto time = match->captured(2).toInt();
-	if (time < 0) {
+	const auto position = match->captured(2).toInt();
+	if (position < 0) {
 		return false;
 	}
 	const auto base = match->captured(1);
@@ -735,19 +836,18 @@ bool OpenMediaTimestamp(
 		const auto session = &controller->session();
 		const auto document = session->data().document(documentId);
 		const auto context = session->data().message(itemId);
-		const auto timeMs = time * crl::time(1000);
+		const auto time = position * crl::time(1000);
 		if (document->isVideoFile()) {
 			controller->window().openInMediaView(Media::View::OpenRequest(
 				controller,
 				document,
 				context,
 				context ? context->topicRootId() : MsgId(0),
+				context ? context->sublistPeerId() : PeerId(0),
 				false,
-				timeMs));
+				time));
 		} else if (document->isSong() || document->isVoiceMessage()) {
-			session->settings().setMediaLastPlaybackPosition(
-				documentId,
-				timeMs);
+			session->local().setMediaLastPlaybackPosition(documentId, time);
 			Media::Player::instance()->play({ document, itemId });
 		}
 		return true;
@@ -768,7 +868,11 @@ bool ShowInviteLink(
 		return false;
 	}
 	QGuiApplication::clipboard()->setText(link);
-	controller->showToast(tr::lng_group_invite_copied(tr::now));
+	controller->showToast({
+		.text = { tr::lng_group_invite_copied(tr::now) },
+		.iconLottie = u"toast/voip_invite"_q,
+		.iconLottieSize = st::toastLottieIconSize,
+	});
 	return true;
 }
 
@@ -787,7 +891,11 @@ bool CopyPeerId(
 		const QVariant &context) {
 	TextUtilities::SetClipboardText({ match->captured(1) });
 	if (controller) {
-		controller->showToast(u"ID copied to clipboard."_q);
+		controller->showToast({
+			.text = { u"ID copied to clipboard."_q },
+			.iconLottie = u"toast/copy"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	}
 	return true;
 }
@@ -809,7 +917,61 @@ bool ShowEditBirthday(
 		const QVariant &context) {
 	if (!controller) {
 		return false;
+	} else if (controller->showFrozenError()) {
+		return true;
 	}
+
+	const auto captured = match->captured(1);
+	if (captured.startsWith(u":suggest:"_q)) {
+		const auto userIdStr = captured.mid(9); // Skip ":suggest:"
+		const auto userId = UserId(userIdStr.toULongLong());
+		if (!userId) {
+			return false;
+		}
+
+		const auto targetUser
+			= controller->session().data().userLoaded(userId);
+		if (!targetUser) {
+			return false;
+		}
+
+		const auto save = [=](Data::Birthday result) {
+			using BFlag = MTPDbirthday::Flag;
+			controller->session().api().request(MTPusers_SuggestBirthday(
+				targetUser->inputUser(),
+				MTP_birthday(
+					MTP_flags(result.year() ? BFlag::f_year : BFlag()),
+					MTP_int(result.day()),
+					MTP_int(result.month()),
+					MTP_int(result.year()))
+			)).done(crl::guard(controller, [=] {
+				controller->showPeerHistory(targetUser);
+				controller->showToast(
+					tr::lng_settings_birthday_suggested(
+						tr::now,
+						lt_user,
+						targetUser->name()));
+			})).fail(crl::guard(controller, [=](const MTP::Error &error) {
+				const auto type = error.type();
+				controller->showToast(type.startsWith(u"FLOOD_WAIT_"_q)
+					? tr::lng_flood_error(tr::now)
+					: (u"Error: "_q + error.type()));
+			})).handleFloodErrors().send();
+		};
+
+		controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+			box->setTitle(tr::lng_suggest_birthday_box_title(
+				lt_user,
+				Info::Profile::NameValue(targetUser)));
+			Ui::EditBirthdayBox(
+				box,
+				Data::Birthday(),
+				save,
+				Ui::EditBirthdayType::Suggest);
+		}));
+		return true;
+	}
+
 	const auto user = controller->session().user();
 	const auto save = [=](Data::Birthday result) {
 		user->setBirthday(result);
@@ -832,10 +994,51 @@ bool ShowEditBirthday(
 				: (u"Error: "_q + error.type()));
 		})).handleFloodErrors().send();
 	};
-	controller->show(Box(
-		Ui::EditBirthdayBox,
-		user->birthday(),
-		save));
+	if (captured.startsWith(u":suggestion_"_q)) {
+		const auto suggested = Data::Birthday::FromSerialized(
+			captured.mid(u":suggestion_"_q.size()).toInt());
+		controller->show(Box(
+			Ui::EditBirthdayBox,
+			suggested,
+			save,
+			Ui::EditBirthdayType::ConfirmSuggestion));
+	} else if (captured.isEmpty()) {
+		controller->show(Box(
+			Ui::EditBirthdayBox,
+			user->birthday(),
+			save,
+			Ui::EditBirthdayType::Edit));
+	} else {
+		controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+			Ui::EditBirthdayBox(box, user->birthday(), save);
+
+			const auto container = box->verticalLayout();
+			const auto session = &user->session();
+			const auto key = Api::UserPrivacy::Key::Birthday;
+			session->api().userPrivacy().reload(key);
+			auto isExactlyContacts = session->api().userPrivacy().value(
+				key
+			) | rpl::map([=](const Api::UserPrivacy::Rule &value) {
+				return (value.option == Api::UserPrivacy::Option::Contacts)
+					&& value.always.peers.empty()
+					&& !value.always.premiums
+					&& value.never.peers.empty();
+			}) | rpl::distinct_until_changed();
+			Ui::AddSkip(container);
+			const auto link = u"internal:edit_privacy_birthday:from_box"_q;
+			Ui::AddDividerText(container, rpl::conditional(
+				std::move(isExactlyContacts),
+				tr::lng_settings_birthday_contacts(
+					lt_link,
+					tr::lng_settings_birthday_contacts_link(tr::url(link)),
+					tr::marked),
+				tr::lng_settings_birthday_about(
+					lt_link,
+					tr::lng_settings_birthday_about_link(tr::url(link)),
+					tr::marked)));
+		}));
+
+	}
 	return true;
 }
 
@@ -846,11 +1049,29 @@ bool ShowEditBirthdayPrivacy(
 	if (!controller) {
 		return false;
 	}
+	const auto isFromBox = !match->captured(1).isEmpty();
 	auto syncLifetime = controller->session().api().userPrivacy().value(
 		Api::UserPrivacy::Key::Birthday
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=](const Api::UserPrivacy::Rule &value) {
+	) | rpl::on_next([=](const Api::UserPrivacy::Rule &value) {
+		if (isFromBox) {
+			using namespace ::Settings;
+			class Controller final : public BirthdayPrivacyController {
+				object_ptr<Ui::RpWidget> setupAboveWidget(
+					not_null<Window::SessionController*> controller,
+					not_null<QWidget*> parent,
+					rpl::producer<Option> optionValue,
+					not_null<QWidget*> outerContainer) override {
+					return { nullptr };
+				}
+			};
+			controller->show(Box<EditPrivacyBox>(
+				controller,
+				std::make_unique<Controller>(),
+				value));
+			return;
+		}
 		controller->show(Box<EditPrivacyBox>(
 			controller,
 			std::make_unique<::Settings::BirthdayPrivacyController>(),
@@ -865,6 +1086,24 @@ bool ShowEditPersonalChannel(
 		const QVariant &context) {
 	if (!controller) {
 		return false;
+	} else if (controller->showFrozenError()) {
+		return true;
+	}
+	const auto maybePeerId = match->captured(1);
+	const auto maybeRemove = match->captured(2);
+
+	if (!maybePeerId.isEmpty()) {
+		if (const auto peerId = PeerId(maybePeerId.toULongLong())) {
+			if (const auto peer = controller->session().data().peer(peerId)) {
+				if (const auto channel = peer->asChannel()) {
+					SavePersonalChannel(controller, channel);
+					return true;
+				}
+			}
+		}
+	} else if (!maybeRemove.isEmpty()) {
+		SavePersonalChannel(controller, nullptr);
+		return true;
 	}
 
 	auto listController = std::make_unique<PersonalChannelController>(
@@ -882,7 +1121,7 @@ bool ShowEditPersonalChannel(
 		};
 
 		rawController->chosen(
-		) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
+		) | rpl::on_next([=](not_null<ChannelData*> channel) {
 			save(channel);
 		}, box->lifetime());
 
@@ -922,7 +1161,21 @@ bool ShowCollectibleUsername(
 	}
 	const auto username = match->captured(1);
 	const auto peerId = PeerId(match->captured(2).toULongLong());
-	controller->resolveCollectible(peerId, username);
+	const auto weak = base::make_weak(controller);
+	controller->resolveCollectible(peerId, username, [=](const QString &e) {
+		if (e == u"COLLECTIBLE_NOT_FOUND"_q) {
+			if (const auto strong = weak.get()) {
+				TextUtilities::SetClipboardText({
+					strong->session().createInternalLinkFull(username)
+				});
+				strong->showToast({
+					.text = { tr::lng_username_copied(tr::now) },
+					.iconLottie = u"toast/voip_invite"_q,
+					.iconLottieSize = st::toastLottieIconSize,
+				});
+			}
+		}
+	});
 	return true;
 }
 
@@ -937,7 +1190,11 @@ bool CopyUsernameLink(
 	TextUtilities::SetClipboardText({
 		controller->session().createInternalLinkFull(username)
 	});
-	controller->showToast(tr::lng_username_copied(tr::now));
+	controller->showToast({
+		.text = { tr::lng_username_copied(tr::now) },
+		.iconLottie = u"toast/voip_invite"_q,
+		.iconLottieSize = st::toastLottieIconSize,
+	});
 	return true;
 }
 
@@ -950,7 +1207,64 @@ bool CopyUsername(
 	}
 	const auto username = match->captured(1);
 	TextUtilities::SetClipboardText({ '@' + username });
-	controller->showToast(tr::lng_username_text_copied(tr::now));
+	controller->showToast({
+		.text = { tr::lng_username_text_copied(tr::now) },
+		.iconLottie = u"toast/copy"_q,
+		.iconLottieSize = st::toastLottieIconSize,
+	});
+	return true;
+}
+
+bool EditPaidMessagesFee(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto peerId = PeerId(match->captured(1).toULongLong());
+	if (const auto id = peerToChannel(peerId)) {
+		const auto channel = controller->session().data().channelLoaded(id);
+		if (channel && channel->canEditPermissions()) {
+			ShowEditChatPermissions(controller, channel);
+		}
+	} else {
+		controller->show(Box(EditMessagesPrivacyBox, controller, QString()));
+	}
+	return true;
+}
+
+bool ShowCommonGroups(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto peerId = PeerId(match->captured(1).toULongLong());
+	if (const auto id = peerToUser(peerId)) {
+		const auto user = controller->session().data().userLoaded(id);
+		if (user) {
+			controller->showSection(
+				std::make_shared<Info::Memento>(
+					user,
+					Info::Section::Type::CommonGroups));
+		}
+	}
+	return true;
+}
+
+bool EditPeer(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto peerId = PeerId(match->captured(1).toULongLong());
+	if (const auto peer = controller->session().data().peerLoaded(peerId)) {
+		controller->showEditPeerBox(peer);
+	}
 	return true;
 }
 
@@ -965,6 +1279,17 @@ bool ShowStarsExamples(
 	return true;
 }
 
+bool ShowPopularAppsAbout(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	controller->show(Dialogs::PopularAppsAboutBox(controller));
+	return true;
+}
+
 void ExportTestChatTheme(
 		not_null<Window::SessionController*> controller,
 		not_null<const Data::CloudTheme*> theme) {
@@ -1073,7 +1398,11 @@ void ExportTestChatTheme(
 		const auto slug = Data::CloudTheme::Parse(session, result, true).slug;
 		QGuiApplication::clipboard()->setText(
 			session->createInternalLinkFull("addtheme/" + slug));
-		show->showToast(tr::lng_background_link_copied(tr::now));
+		show->showToast({
+			.text = { tr::lng_background_link_copied(tr::now) },
+			.iconLottie = u"toast/voip_invite"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	}).fail([=](const MTP::Error &error) {
 		show->showToast(u"Error: "_q + error.type());
 	}).send();
@@ -1091,8 +1420,9 @@ bool ResolveTestChatTheme(
 		qthelp::UrlParamNameTransform::ToLower);
 	if (const auto history = controller->activeChatCurrent().history()) {
 		controller->clearCachedChatThemes();
-		const auto theme = history->owner().cloudThemes().updateThemeFromLink(
-			history->peer->themeEmoji(),
+		const auto owner = &history->owner();
+		const auto theme = owner->cloudThemes().updateThemeFromLink(
+			history->peer->themeToken(),
 			params);
 		if (theme) {
 			if (!params["export"].isEmpty()) {
@@ -1240,10 +1570,10 @@ bool ResolveTopUp(
 					.text = tr::lng_credits_enough(
 						tr::now,
 						lt_link,
-						Ui::Text::Link(
-							Ui::Text::Bold(
+						tr::link(
+							tr::bold(
 								tr::lng_credits_enough_link(tr::now))),
-						Ui::Text::RichLangValue),
+						tr::rich),
 					.filter = filter,
 					.duration = 4 * crl::time(1000),
 				});
@@ -1277,8 +1607,107 @@ bool ResolveChatLink(
 	return true;
 }
 
+bool ResolveUniqueGift(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto slug = match->captured(1);
+	if (slug.isEmpty()) {
+		return false;
+	}
+	ResolveAndShowUniqueGift(controller->uiShow(), slug);
+	return true;
+}
+
+bool ResolveGiftAuction(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto slug = match->captured(1);
+	if (slug.isEmpty()) {
+		return false;
+	}
+	controller->showStarGiftAuction(slug);
+	return true;
+}
+
+bool ResolveConferenceCall(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto slug = match->captured(1);
+	if (slug.isEmpty()) {
+		return false;
+	}
+	const auto myContext = context.value<ClickHandlerContext>();
+	controller->window().activate();
+	controller->resolveConferenceCall(match->captured(1), myContext.itemId);
+	return true;
+}
+
+bool ResolveStarsSettings(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	controller->showSettings(::Settings::CreditsId());
+	controller->window().activate();
+	return true;
+}
+
+bool ResolveTonSettings(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	controller->showSettings(::Settings::CurrencyId());
+	controller->window().activate();
+	return true;
+}
+
+bool ResolveOAuth(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto params = url_parse_params(
+		match->captured(1),
+		qthelp::UrlParamNameTransform::ToLower);
+	const auto token = params.value(u"token"_q);
+	if (token.isEmpty()) {
+		return false;
+	}
+	UrlAuthBox::ActivateUrl(
+		controller->uiShow(),
+		&controller->session(),
+		u"tg://oauth?token="_q + qthelp::url_encode(token),
+		context);
+	return true;
+}
+
 } // namespace
 
+bool TryRouterForLocalUrl(
+		Window::SessionController *controller,
+		const QString &command) {
+	return DeepLinks::Router::Instance().tryHandle(controller, command);
+}
+
 const std::vector<LocalUrlHandler> &LocalUrlHandlers() {
 	static auto Result = std::vector<LocalUrlHandler>{
 		{
@@ -1297,6 +1726,10 @@ const std::vector<LocalUrlHandler> &LocalUrlHandlers() {
 			u"^addtheme/?\\?slug=([a-zA-Z0-9\\.\\_]+)(&|$)"_q,
 			ShowTheme
 		},
+		{
+			u"^addstyle/?\\?slug=([a-zA-Z0-9\\.\\_]+)(&|$)"_q,
+			ShowAiStyle
+		},
 		{
 			u"^setlanguage/?(\\?lang=([a-zA-Z0-9\\.\\_\\-]+))?(&|$)"_q,
 			SetLanguage
@@ -1333,10 +1766,6 @@ const std::vector<LocalUrlHandler> &LocalUrlHandlers() {
 			u"^privatepost/?\\?(.+)(#|$)"_q,
 			ResolvePrivatePost
 		},
-		{
-			u"^settings(/language|/devices|/folders|/privacy|/themes|/change_number|/auto_delete|/information|/edit_profile)?$"_q,
-			ResolveSettings
-		},
 		{
 			u"^test_chat_theme/?\\?(.+)(#|$)"_q,
 			ResolveTestChatTheme,
@@ -1369,6 +1798,30 @@ const std::vector<LocalUrlHandler> &LocalUrlHandlers() {
 			u"^stars_topup/?\\?(.+)(#|$)"_q,
 			ResolveTopUp
 		},
+		{
+			u"^nft/?\\?slug=([a-zA-Z0-9\\.\\_\\-]+)(&|$)"_q,
+			ResolveUniqueGift
+		},
+		{
+			u"^stargift_auction/?\\?slug=([a-zA-Z0-9\\.\\_\\-]+)(&|$)"_q,
+			ResolveGiftAuction
+		},
+		{
+			u"^call/?\\?slug=([a-zA-Z0-9\\.\\_\\-]+)(&|$)"_q,
+			ResolveConferenceCall
+		},
+		{
+			u"^stars/?(^\\?.*)?(#|$)"_q,
+			ResolveStarsSettings
+		},
+		{
+			u"^ton/?(^\\?.*)?(#|$)"_q,
+			ResolveTonSettings
+		},
+		{
+			u"^oauth/?\\?(.+)(#|$)"_q,
+			ResolveOAuth
+		},
 		{
 			u"^([^\\?]+)(\\?|#|$)"_q,
 			HandleUnknown
@@ -1400,15 +1853,15 @@ const std::vector<LocalUrlHandler> &InternalUrlHandlers() {
 			ShowSearchTagsPromo
 		},
 		{
-			u"^edit_birthday$"_q,
+			u"^edit_birthday(.*)$"_q,
 			ShowEditBirthday,
 		},
 		{
-			u"^edit_privacy_birthday$"_q,
+			u"^edit_privacy_birthday(.*)$"_q,
 			ShowEditBirthdayPrivacy,
 		},
 		{
-			u"^edit_personal_channel$"_q,
+			u"^edit_personal_channel(?::(?:(\\d{2,})|(remove)))?$"_q,
 			ShowEditPersonalChannel,
 		},
 		{
@@ -1427,10 +1880,26 @@ const std::vector<LocalUrlHandler> &InternalUrlHandlers() {
 			u"^username_regular/([a-zA-Z0-9\\-\\_\\.]+)@([0-9]+)$"_q,
 			CopyUsername,
 		},
+		{
+			u"^edit_paid_messages_fee/([0-9]+)$"_q,
+			EditPaidMessagesFee,
+		},
+		{
+			u"^common_groups/([0-9]+)$"_q,
+			ShowCommonGroups,
+		},
+		{
+			u"^edit_peer/([0-9]+)$"_q,
+			EditPeer,
+		},
 		{
 			u"^stars_examples$"_q,
 			ShowStarsExamples,
 		},
+		{
+			u"^about_popular_apps$"_q,
+			ShowPopularAppsAbout,
+		},
 	};
 	return Result;
 }
@@ -1478,6 +1947,8 @@ QString TryConvertUrlToLocal(QString url) {
 			return u"tg://"_q + stickerSetMatch->captured(1) + "?set=" + url_encode(stickerSetMatch->captured(2));
 		} else if (const auto themeMatch = regex_match(u"^addtheme/([a-zA-Z0-9\\.\\_]+)(\\?|$)"_q, query, matchOptions)) {
 			return u"tg://addtheme?slug="_q + url_encode(themeMatch->captured(1));
+		} else if (const auto addStyleMatch = regex_match(u"^addstyle/([a-zA-Z0-9\\.\\_]+)(\\?|$)"_q, query, matchOptions)) {
+			return u"tg://addstyle?slug="_q + url_encode(addStyleMatch->captured(1));
 		} else if (const auto languageMatch = regex_match(u"^setlanguage/([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"_q, query, matchOptions)) {
 			return u"tg://setlanguage?lang="_q + url_encode(languageMatch->captured(1));
 		} else if (const auto shareUrlMatch = regex_match(u"^share/url/?\\?(.+)$"_q, query, matchOptions)) {
@@ -1514,6 +1985,27 @@ QString TryConvertUrlToLocal(QString url) {
 		} else if (const auto chatlinkMatch = regex_match(u"^m/([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"_q, query, matchOptions)) {
 			const auto slug = chatlinkMatch->captured(1);
 			return u"tg://message?slug="_q + slug;
+		} else if (const auto nftMatch = regex_match(u"^nft/([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"_q, query, matchOptions)) {
+			const auto slug = nftMatch->captured(1);
+			return u"tg://nft?slug="_q + slug;
+		} else if (const auto auctionMatch = regex_match(u"^auction/([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"_q, query, matchOptions)) {
+			const auto slug = auctionMatch->captured(1);
+			return u"tg://stargift_auction?slug="_q + slug;
+		} else if (const auto callMatch = regex_match(u"^call/([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"_q, query, matchOptions)) {
+			const auto slug = callMatch->captured(1);
+			return u"tg://call?slug="_q + slug;
+		} else if (const auto newbotMatch = regex_match(u"^newbot/([a-zA-Z0-9\\.\\_]+)(/([a-zA-Z0-9\\.\\_]*))?(/?\\?(.+))?$"_q, query, matchOptions)) {
+			const auto manager = newbotMatch->captured(1);
+			const auto username = newbotMatch->captured(3);
+			const auto params = newbotMatch->captured(5);
+			auto result = u"tg://newbot?manager="_q + url_encode(manager);
+			if (!username.isEmpty()) {
+				result += u"&username="_q + url_encode(username);
+			}
+			if (!params.isEmpty()) {
+				result += '&' + params;
+			}
+			return result;
 		} else if (const auto privateMatch = regex_match(u"^"
 			"c/(\\-?\\d+)"
 			"("
@@ -1543,7 +2035,9 @@ QString TryConvertUrlToLocal(QString url) {
 				"/?$|"
 				"/[a-zA-Z0-9\\.\\_\\-]+/?(\\?|$)|"
 				"/\\d+/?(\\?|$)|"
-				"/s/\\d+/?(\\?|$)|"
+				"/s/(\\d+|live)/?(\\?|$)|"
+				"/a/\\d+/?(\\?|$)|"
+				"/c/\\d+/?(\\?|$)|"
 				"/\\d+/\\d+/?(\\?|$)"
 			")"_q, query, matchOptions)) {
 			const auto domain = usernameMatch->captured(1);
@@ -1564,8 +2058,12 @@ QString TryConvertUrlToLocal(QString url) {
 				added = u"&topic=%1&post=%2"_q.arg(threadPostMatch->captured(1), threadPostMatch->captured(2));
 			} else if (const auto postMatch = regex_match(u"^/(\\d+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
 				added = u"&post="_q + postMatch->captured(1);
-			} else if (const auto storyMatch = regex_match(u"^/s/(\\d+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
+			} else if (const auto storyMatch = regex_match(u"^/s/(\\d+|live)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
 				added = u"&story="_q + storyMatch->captured(1);
+			} else if (const auto albumMatch = regex_match(u"^/a/(\\d+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
+				added = u"&album="_q + albumMatch->captured(1);
+			} else if (const auto collectionMatch = regex_match(u"^/c/(\\d+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
+				added = u"&collection="_q + collectionMatch->captured(1);
 			} else if (const auto appNameMatch = regex_match(u"^/([a-zA-Z0-9\\.\\_\\-]+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
 				added = u"&appname="_q + appNameMatch->captured(1);
 			}
@@ -1575,36 +2073,145 @@ QString TryConvertUrlToLocal(QString url) {
 	return url;
 }
 
-bool InternalPassportLink(const QString &url) {
+bool IsMiniAppUrl(const QString &url) {
+	const auto local = TryConvertUrlToLocal(url);
+	const auto prefix = u"tg://resolve?"_q;
+	if (!local.startsWith(prefix, Qt::CaseInsensitive)) {
+		return false;
+	}
+	const auto params = qthelp::url_parse_params(
+		local.mid(prefix.size()),
+		qthelp::UrlParamNameTransform::ToLower);
+	return params.contains(u"appname"_q)
+		|| params.contains(u"startapp"_q)
+		|| params.contains(u"attach"_q);
+}
+
+struct InternalLinkCheckResult {
+	QString command;
+	QString username;
+};
+
+[[nodiscard]] InternalLinkCheckResult InternalLinkCheck(const QString &url) {
 	const auto urlTrimmed = url.trimmed();
 	if (!urlTrimmed.startsWith(u"tg://"_q, Qt::CaseInsensitive)) {
-		return false;
+		return {};
 	}
 	const auto command = base::StringViewMid(urlTrimmed, u"tg://"_q.size());
 
 	using namespace qthelp;
 	const auto matchOptions = RegExOption::CaseInsensitive;
-	const auto authMatch = regex_match(
-		u"^passport/?\\?(.+)(#|$)"_q,
-		command,
-		matchOptions);
 	const auto usernameMatch = regex_match(
 		u"^resolve/?\\?(.+)(#|$)"_q,
 		command,
 		matchOptions);
-	const auto usernameValue = usernameMatch->hasMatch()
-		? url_parse_params(
+	auto username = QString();
+	if (usernameMatch->hasMatch()) {
+		const auto params = url_parse_params(
 			usernameMatch->captured(1),
-			UrlParamNameTransform::ToLower).value(u"domain"_q)
-		: QString();
-	const auto authLegacy = (usernameValue == u"telegrampassport"_q);
+			UrlParamNameTransform::ToLower);
+		username = params.value(u"domain"_q);
+	}
+	return { .command = command.toString(), .username = username };
+}
+
+bool InternalPassportLink(const QString &url) {
+	const auto result = InternalLinkCheck(url);
+
+	using namespace qthelp;
+	const auto matchOptions = RegExOption::CaseInsensitive;
+	const auto authMatch = regex_match(
+		u"^passport/?\\?(.+)(#|$)"_q,
+		result.command,
+		matchOptions);
+	const auto authLegacy = (result.username == u"telegrampassport"_q);
 	return authMatch->hasMatch() || authLegacy;
 }
 
+bool InternalPassportOrOAuthLink(const QString &url) {
+	const auto result = InternalLinkCheck(url);
+
+	using namespace qthelp;
+	const auto matchOptions = RegExOption::CaseInsensitive;
+	const auto oauthMatch = regex_match(
+		u"^oauth/?\\?(.+)(#|$)"_q,
+		result.command,
+		matchOptions);
+	const auto oauthLegacy = (result.username == u"oauth"_q);
+	return InternalPassportLink(url)
+		|| oauthMatch->hasMatch()
+		|| oauthLegacy;
+}
+
 bool StartUrlRequiresActivate(const QString &url) {
-	return Core::App().passcodeLocked()
-		? true
-		: !InternalPassportLink(url);
+	return Core::App().passcodeLocked() || !InternalPassportLink(url);
+}
+
+void ResolveAndShowUniqueGift(
+		std::shared_ptr<ChatHelpers::Show> show,
+		const QString &slug,
+		::Settings::CreditsEntryBoxStyleOverrides st) {
+	struct Request {
+		base::weak_ptr<Main::Session> weak;
+		QString slug;
+		mtpRequestId id = 0;
+	};
+	static auto request = Request();
+
+	const auto session = &show->session();
+	if (request.weak.get() == session && request.slug == slug) {
+		return;
+	} else if (const auto strong = request.weak.get()) {
+		strong->api().request(request.id).cancel();
+	}
+	request.weak = session;
+	request.slug = slug;
+	const auto clear = [=] {
+		if (request.weak.get() == session && request.slug == slug) {
+			request = {};
+		}
+	};
+	request.id = session->api().request(
+		MTPpayments_GetUniqueStarGift(MTP_string(slug))
+	).done([=](const MTPpayments_UniqueStarGift &result) {
+		clear();
+
+		const auto &data = result.data();
+		session->data().processUsers(data.vusers());
+		if (const auto gift = Api::FromTL(session, data.vgift())) {
+			Core::App().hideMediaView();
+
+			using namespace ::Settings;
+			show->show(Box(
+				GlobalStarGiftBox,
+				show,
+				*gift,
+				StarGiftResaleInfo(),
+				st));
+			show->activate();
+		}
+	}).fail([=](const MTP::Error &error) {
+		clear();
+		if (!Ui::ShowGiftErrorToast(show, error)) {
+			show->showToast(u"Error: "_q + error.type());
+		}
+	}).send();
+}
+
+void ResolveAndShowUniqueGift(
+		std::shared_ptr<ChatHelpers::Show> show,
+		const QString &slug) {
+	ResolveAndShowUniqueGift(std::move(show), slug, {});
+}
+
+TimeId ParseVideoTimestamp(QStringView value) {
+	const auto kExp = u"^(?:(\\d+)h)?(?:(\\d+)m)?(?:(\\d+)s)?$"_q;
+	const auto m = QRegularExpression(kExp).match(value);
+	return m.hasMatch()
+		? (m.capturedView(1).toInt() * 3600
+			+ m.capturedView(2).toInt() * 60
+			+ m.capturedView(3).toInt())
+		: value.toInt();
 }
 
 } // namespace Core
diff --git a/Telegram/SourceFiles/core/local_url_handlers.h b/Telegram/SourceFiles/core/local_url_handlers.h
index 9a5cc6a55e1edf..5c0c6b11b78c89 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.h
+++ b/Telegram/SourceFiles/core/local_url_handlers.h
@@ -11,6 +11,14 @@ namespace qthelp {
 class RegularExpressionMatch;
 } // namespace qthelp
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Settings {
+struct CreditsEntryBoxStyleOverrides;
+} // namespace Settings
+
 namespace Window {
 class SessionController;
 } // namespace Window
@@ -25,13 +33,29 @@ struct LocalUrlHandler {
 		const QVariant &context)> handler;
 };
 
+[[nodiscard]] bool TryRouterForLocalUrl(
+	Window::SessionController *controller,
+	const QString &command);
+
 [[nodiscard]] const std::vector<LocalUrlHandler> &LocalUrlHandlers();
 [[nodiscard]] const std::vector<LocalUrlHandler> &InternalUrlHandlers();
 
 [[nodiscard]] QString TryConvertUrlToLocal(QString url);
 
-[[nodiscard]] bool InternalPassportLink(const QString &url);
+[[nodiscard]] bool IsMiniAppUrl(const QString &url);
+
+[[nodiscard]] bool InternalPassportOrOAuthLink(const QString &url);
 
 [[nodiscard]] bool StartUrlRequiresActivate(const QString &url);
 
+void ResolveAndShowUniqueGift(
+	std::shared_ptr<ChatHelpers::Show> show,
+	const QString &slug,
+	::Settings::CreditsEntryBoxStyleOverrides st);
+void ResolveAndShowUniqueGift(
+	std::shared_ptr<ChatHelpers::Show> show,
+	const QString &slug);
+
+[[nodiscard]] TimeId ParseVideoTimestamp(QStringView value);
+
 } // namespace Core
diff --git a/Telegram/SourceFiles/core/mime_type.cpp b/Telegram/SourceFiles/core/mime_type.cpp
index 5e15fd4e3df0eb..2393cd335279ca 100644
--- a/Telegram/SourceFiles/core/mime_type.cpp
+++ b/Telegram/SourceFiles/core/mime_type.cpp
@@ -326,12 +326,14 @@ bool NameTypeAllowsThumbnail(NameType type) {
 
 bool IsIpRevealingPath(const QString &filepath) {
 	static const auto kExtensions = [] {
-		const auto joined = u"htm html svg m4v m3u8 xhtml"_q;
+		const auto joined = u"htm html svg m4v m3u m3u8 xhtml xml kml kmz"_q;
 		const auto list = joined.split(' ');
 		return base::flat_set<QString>(list.begin(), list.end());
 	}();
 	static const auto kMimeTypes = [] {
-		const auto joined = u"text/html image/svg+xml"_q;
+		const auto joined = u"text/html image/svg+xml "
+			"application/vnd.google-earth.kml+xml "
+			"application/vnd.google-earth.kmz"_q;
 		const auto list = joined.split(' ');
 		return base::flat_set<QString>(list.begin(), list.end());
 	}();
diff --git a/Telegram/SourceFiles/core/phone_click_handler.cpp b/Telegram/SourceFiles/core/phone_click_handler.cpp
index 19d15b78a7e571..75094e6005edb0 100644
--- a/Telegram/SourceFiles/core/phone_click_handler.cpp
+++ b/Telegram/SourceFiles/core/phone_click_handler.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "core/phone_click_handler.h"
 
+#include "boxes/add_contact_box.h"
 #include "core/click_handler_types.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -38,8 +39,8 @@ namespace {
 class ResolvePhoneAction final : public Ui::Menu::ItemBase {
 public:
 	ResolvePhoneAction(
-		not_null<Ui::RpWidget*> parent,
-		const style::Menu &st,
+		not_null<Ui::Menu::Menu*> parent,
+		const style::PopupMenu &st,
 		const QString &phone,
 		not_null<Window::SessionController*> controller);
 
@@ -48,6 +49,9 @@ class ResolvePhoneAction final : public Ui::Menu::ItemBase {
 
 	void handleKeyPress(not_null<QKeyEvent*> e) override;
 
+	[[nodiscard]] QString firstName() const;
+	[[nodiscard]] QString lastName() const;
+
 protected:
 	QPoint prepareRippleStartPosition() const override;
 	QImage prepareRippleMask() const override;
@@ -75,19 +79,19 @@ class ResolvePhoneAction final : public Ui::Menu::ItemBase {
 };
 
 ResolvePhoneAction::ResolvePhoneAction(
-	not_null<Ui::RpWidget*> parent,
-	const style::Menu &st,
+	not_null<Ui::Menu::Menu*> parent,
+	const style::PopupMenu &st,
 	const QString &phone,
 	not_null<Window::SessionController*> controller)
-: ItemBase(parent, st)
-, _dummyAction(new QAction(parent))
-, _st(st)
+: ItemBase(parent, st.menu)
+, _dummyAction(Ui::CreateChild<QAction>(parent))
+, _st(st.menu)
 , _api(&controller->session().mtp())
 , _height(rect::m::sum::v(st::groupCallJoinAsPadding)
 	+ st::groupCallJoinAsPhotoSize) {
 	setAcceptBoth(true);
-	initResizeHook(parent->sizeValue());
-	setClickedCallback([=] {
+	fitToMenuWidth();
+	setActionTriggered([=] {
 		if (const auto peer = _peer.current()) {
 			controller->showPeerInfo(peer);
 		}
@@ -121,7 +125,7 @@ ResolvePhoneAction::ResolvePhoneAction(
 	}
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
@@ -130,6 +134,18 @@ ResolvePhoneAction::ResolvePhoneAction(
 	prepare();
 }
 
+QString ResolvePhoneAction::firstName() const {
+	const auto peer = _peer.current();
+	const auto user = peer ? peer->asUser() : nullptr;
+	return user ? user->firstName : QString();
+}
+
+QString ResolvePhoneAction::lastName() const {
+	const auto peer = _peer.current();
+	const auto user = peer ? peer->asUser() : nullptr;
+	return user ? user->lastName : QString();
+}
+
 void ResolvePhoneAction::paint(Painter &p) {
 	const auto selected = isSelected() && _peer.current();
 	const auto height = contentHeight();
@@ -168,10 +184,10 @@ void ResolvePhoneAction::paint(Painter &p) {
 			width());
 	} else {
 		p.setPen(selected ? _st.itemFgShortcutOver : _st.itemFgShortcut);
-		const auto w = width() - padding.left() - padding.right();
+		const auto w = width() - rect::m::sum::h(padding);
 		_below.draw(p, Ui::Text::PaintContext{
 			.position = QPoint(
-				(width() - w) / 2,
+				padding.left(),
 				(height - _below.countHeight(w)) / 2),
 			.outerWidth = w,
 			.availableWidth = w,
@@ -197,7 +213,7 @@ void ResolvePhoneAction::prepare() {
 				? rpl::single(QString())
 				: tr::lng_contacts_loading();
 		}) | rpl::flatten_latest()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			QString text,
 			QString name,
 			QString no,
@@ -275,6 +291,7 @@ PhoneClickHandler::PhoneClickHandler(
 	QString text)
 : _session(session)
 , _text(text) {
+	setProperty(kPhoneNumberLinkProperty, _text);
 }
 
 void PhoneClickHandler::onClick(ClickContext context) const {
@@ -314,14 +331,29 @@ void PhoneClickHandler::onClick(ClickContext context) const {
 			TextForMimeData::Simple(phone.trimmed()));
 	}, &st::menuIconCopy);
 
+	auto resolvePhoneAction = base::make_unique_q<ResolvePhoneAction>(
+		menu->menu(),
+		menu->st(),
+		phone,
+		controller);
+
+	if (Trim(phone) != Trim(controller->session().user()->phone())) {
+		menu->addAction(
+			tr::lng_info_add_as_contact(tr::now),
+			[=, raw = base::make_weak(resolvePhoneAction.get())] {
+				controller->show(
+					Box<AddContactBox>(
+						&controller->session(),
+						raw ? raw->firstName() : QString(),
+						raw ? raw->lastName() : QString(),
+						Trim(phone)));
+			},
+			&st::menuIconInvite);
+	}
+
 	menu->addSeparator(&st::popupMenuExpandedSeparator.menu.separator);
 
-	menu->addAction(
-		base::make_unique_q<ResolvePhoneAction>(
-			menu,
-			menu->st().menu,
-			phone,
-			controller));
+	menu->addAction(std::move(resolvePhoneAction));
 
 	menu->popup(pos);
 }
diff --git a/Telegram/SourceFiles/core/proxy_rotation_manager.cpp b/Telegram/SourceFiles/core/proxy_rotation_manager.cpp
new file mode 100644
index 00000000000000..a643f0aee62e3a
--- /dev/null
+++ b/Telegram/SourceFiles/core/proxy_rotation_manager.cpp
@@ -0,0 +1,359 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "core/proxy_rotation_manager.h"
+
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "main/main_account.h"
+#include "main/main_domain.h"
+#include "mtproto/facade.h"
+
+#include <algorithm>
+
+namespace Core {
+namespace {
+
+constexpr auto kProxyRotationCheckInterval = 2 * crl::time(1000);
+constexpr auto kProxyRotationCheckLifetime = 20 * crl::time(1000);
+constexpr auto kProxyRotationMaxActiveChecks = 10;
+
+} // namespace
+
+ProxyRotationManager::ProxyRotationManager()
+: _checkTimer([=] { runChecks(); })
+, _switchTimer([=] { switchTimerDone(); }) {
+	App().domain().accountsChanges(
+	) | rpl::on_next([=] {
+		stopChecking();
+		reevaluate();
+	}, _lifetime);
+}
+
+void ProxyRotationManager::settingsChanged() {
+	stopChecking();
+	pruneRemovedEntries();
+	reevaluate();
+}
+
+void ProxyRotationManager::handleConnectionStateChanged(
+		not_null<Main::Account*> account,
+		int32 state) {
+	(void)account;
+	(void)state;
+	reevaluate();
+}
+
+bool ProxyRotationManager::shouldObserve() const {
+	const auto &settings = App().settings().proxy();
+	return settings.isEnabled()
+		&& settings.selected()
+		&& settings.proxyRotationEnabled()
+		&& (settings.list().size() > 1);
+}
+
+std::vector<not_null<Main::Account*>> ProxyRotationManager::productionAccounts() const {
+	auto result = std::vector<not_null<Main::Account*>>();
+	for (const auto &entry : App().domain().accounts()) {
+		const auto account = entry.account.get();
+		if (!account->sessionExists() || account->mtp().isTestMode()) {
+			continue;
+		}
+		result.push_back(account);
+	}
+	return result;
+}
+
+not_null<Main::Account*> ProxyRotationManager::accountForChecks() const {
+	if (App().someSessionExists()
+		&& App().activeAccount().sessionExists()
+		&& !App().activeAccount().mtp().isTestMode()) {
+		return &App().activeAccount();
+	}
+	const auto accounts = productionAccounts();
+	Expects(!accounts.empty());
+	return accounts.front();
+}
+
+auto ProxyRotationManager::find(
+		const MTP::ProxyData &proxy) -> Entry* {
+	const auto i = ranges::find(
+		_entries,
+		proxy,
+		[](const Entry &entry) { return entry.proxy; });
+	return (i == end(_entries)) ? nullptr : &*i;
+}
+
+auto ProxyRotationManager::ensure(
+		const MTP::ProxyData &proxy) -> Entry& {
+	if (const auto entry = find(proxy)) {
+		return *entry;
+	}
+	_entries.push_back({ .proxy = proxy });
+	return _entries.back();
+}
+
+void ProxyRotationManager::reevaluate() {
+	if (!shouldObserve()) {
+		stopChecking();
+		return;
+	}
+	const auto accounts = productionAccounts();
+	if (accounts.empty()) {
+		stopChecking();
+		return;
+	}
+	const auto stateProj = [](not_null<Main::Account*> account) {
+		return account->mtp().dcstate();
+	};
+	if (ranges::contains(accounts, MTP::ConnectedState, stateProj)) {
+		stopChecking();
+		return;
+	}
+	startChecking();
+}
+
+void ProxyRotationManager::startChecking() {
+	if (_checking) {
+		return;
+	}
+	_checking = true;
+	_waitingToSwitch = false;
+	_switchStartedAt = crl::now();
+	updateProbeOrder();
+	runChecks();
+	const auto timeout = App().settings().proxy().proxyRotationTimeout();
+	_switchTimer.callOnce(timeout * crl::time(1000));
+}
+
+void ProxyRotationManager::stopChecking() {
+	_checkTimer.cancel();
+	_switchTimer.cancel();
+	_checking = false;
+	_waitingToSwitch = false;
+	_switchStartedAt = 0;
+	_probeOrder.clear();
+	_nextCheckIndex = 0;
+	clearPendingChecks();
+}
+
+void ProxyRotationManager::pruneRemovedEntries() {
+	const auto &settings = App().settings().proxy();
+	_entries.erase(
+		std::remove_if(begin(_entries), end(_entries), [&](const Entry &entry) {
+			return (settings.indexInList(entry.proxy) < 0);
+		}),
+		end(_entries));
+}
+
+void ProxyRotationManager::updateProbeOrder() {
+	const auto &settings = App().settings().proxy();
+	const auto currentIndex = settings.indexInList(settings.selected());
+	_probeOrder.clear();
+	_probeOrder.reserve(settings.list().size());
+	for (const auto index : settings.proxyRotationPreferredIndices()) {
+		if (index == currentIndex) {
+			continue;
+		}
+		_probeOrder.push_back(index);
+	}
+	for (auto i = 0, count = int(settings.list().size()); i != count; ++i) {
+		if (i == currentIndex || ranges::contains(_probeOrder, i)) {
+			continue;
+		}
+		_probeOrder.push_back(i);
+	}
+	_nextCheckIndex = 0;
+}
+
+void ProxyRotationManager::continueChecking(crl::time delay) {
+	if (!_checking) {
+		return;
+	}
+	if (_checkTimer.isActive()) {
+		_checkTimer.cancel();
+	}
+	_checkTimer.callOnce(delay);
+}
+
+void ProxyRotationManager::runChecks() {
+	if (!_checking) {
+		return;
+	}
+	if (!shouldObserve()) {
+		stopChecking();
+		return;
+	}
+	const auto accounts = productionAccounts();
+	if (accounts.empty()
+		|| ranges::contains(
+			accounts,
+			MTP::ConnectedState,
+			[](not_null<Main::Account*> account) {
+				return account->mtp().dcstate();
+			})) {
+		stopChecking();
+		return;
+	}
+	pruneExpiredChecks();
+	startNextCheck();
+	continueChecking(kProxyRotationCheckInterval);
+}
+
+void ProxyRotationManager::pruneExpiredChecks() {
+	const auto now = crl::now();
+	for (auto &entry : _entries) {
+		if (!entry.checking
+			|| (now - entry.startedAt < kProxyRotationCheckLifetime)) {
+			continue;
+		}
+		MTP::ResetProxyCheckers(entry.v4, entry.v6);
+		entry.checking = false;
+		entry.startedAt = 0;
+	}
+}
+
+void ProxyRotationManager::startNextCheck() {
+	if (_probeOrder.empty()) {
+		return;
+	}
+	if (ranges::count(_entries, true, &Entry::checking)
+		>= kProxyRotationMaxActiveChecks) {
+		return;
+	}
+	const auto &settings = App().settings().proxy();
+	auto attemptsLeft = int(_probeOrder.size());
+	while (attemptsLeft-- > 0) {
+		if (_nextCheckIndex >= int(_probeOrder.size())) {
+			_nextCheckIndex = 0;
+		}
+		const auto listIndex = _probeOrder[_nextCheckIndex++];
+		if (listIndex < 0 || listIndex >= int(settings.list().size())) {
+			continue;
+		}
+		const auto &proxy = settings.list()[listIndex];
+		auto &entry = ensure(proxy);
+		if (entry.checking) {
+			continue;
+		}
+		entry.checking = true;
+		entry.startedAt = crl::now();
+		MTP::StartProxyCheck(
+			&accountForChecks()->mtp(),
+			proxy,
+			settings.tryIPv6(),
+			entry.v4,
+			entry.v6,
+			[=](MTP::details::AbstractConnection *raw, int ping) {
+				checkDone(proxy, raw, ping);
+			},
+			[=](MTP::details::AbstractConnection *raw) {
+				checkFailed(proxy, raw);
+			});
+		break;
+	}
+}
+
+void ProxyRotationManager::switchTimerDone() {
+	if (!_checking || !shouldSwitchToAvailable()) {
+		return;
+	}
+	_waitingToSwitch = !switchToAvailable();
+}
+
+void ProxyRotationManager::clearPendingChecks() {
+	for (auto &entry : _entries) {
+		MTP::ResetProxyCheckers(entry.v4, entry.v6);
+		entry.checking = false;
+		entry.startedAt = 0;
+	}
+}
+
+void ProxyRotationManager::checkDone(
+		const MTP::ProxyData &proxy,
+		not_null<MTP::details::AbstractConnection*> raw,
+		int ping) {
+	const auto entry = find(proxy);
+	if (!entry
+		|| !entry->checking
+		|| ((entry->v4.get() != raw) && (entry->v6.get() != raw))) {
+		return;
+	}
+	MTP::DropProxyChecker(entry->v4, entry->v6, raw);
+	MTP::ResetProxyCheckers(entry->v4, entry->v6);
+	entry->checking = false;
+	entry->startedAt = 0;
+	entry->availableAt = crl::now();
+	const auto proxySettings = &App().settings().proxy();
+	if (const auto index = proxySettings->indexInList(proxy); index >= 0) {
+		if (proxySettings->promoteProxyRotationPreferredIndex(index)) {
+			App().saveSettingsDelayed();
+		}
+	}
+	updateProbeOrder();
+	if (_waitingToSwitch && shouldSwitchToAvailable()) {
+		_waitingToSwitch = !switchToAvailable();
+	}
+}
+
+void ProxyRotationManager::checkFailed(
+		const MTP::ProxyData &proxy,
+		not_null<MTP::details::AbstractConnection*> raw) {
+	const auto entry = find(proxy);
+	if (!entry
+		|| !entry->checking
+		|| ((entry->v4.get() != raw) && (entry->v6.get() != raw))) {
+		return;
+	}
+	MTP::DropProxyChecker(entry->v4, entry->v6, raw);
+	if (MTP::HasProxyCheckers(entry->v4, entry->v6)) {
+		return;
+	}
+	entry->checking = false;
+	entry->startedAt = 0;
+}
+
+bool ProxyRotationManager::switchToAvailable() {
+	if (!_checking) {
+		return false;
+	}
+	const auto &settings = App().settings().proxy();
+	for (const auto index : _probeOrder) {
+		if (index < 0 || index >= int(settings.list().size())) {
+			continue;
+		}
+		const auto &proxy = settings.list()[index];
+		const auto entry = find(proxy);
+		if (!entry || entry->checking || !entry->availableAt) {
+			continue;
+		}
+		if (entry->availableAt < _switchStartedAt) {
+			continue;
+		}
+		_waitingToSwitch = false;
+		App().setCurrentProxy(proxy, MTP::ProxyData::Settings::Enabled);
+		App().saveSettingsDelayed();
+		return true;
+	}
+	return false;
+}
+
+bool ProxyRotationManager::shouldSwitchToAvailable() const {
+	if (!_checking || !shouldObserve()) {
+		return false;
+	}
+	const auto accounts = productionAccounts();
+	return !accounts.empty()
+		&& !ranges::contains(
+			accounts,
+			MTP::ConnectedState,
+			[](not_null<Main::Account*> account) {
+				return account->mtp().dcstate();
+			});
+}
+
+} // namespace Core
diff --git a/Telegram/SourceFiles/core/proxy_rotation_manager.h b/Telegram/SourceFiles/core/proxy_rotation_manager.h
new file mode 100644
index 00000000000000..c1fee276961c4f
--- /dev/null
+++ b/Telegram/SourceFiles/core/proxy_rotation_manager.h
@@ -0,0 +1,80 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "mtproto/proxy_check.h"
+
+#include <rpl/lifetime.h>
+#include <vector>
+
+namespace Main {
+class Account;
+} // namespace Main
+
+namespace Core {
+
+class ProxyRotationManager final {
+public:
+	ProxyRotationManager();
+
+	void settingsChanged();
+	void handleConnectionStateChanged(
+		not_null<Main::Account*> account,
+		int32 state);
+
+private:
+	struct Entry {
+		MTP::ProxyData proxy;
+		MTP::ProxyCheckConnection v4;
+		MTP::ProxyCheckConnection v6;
+		bool checking = false;
+		crl::time startedAt = 0;
+		crl::time availableAt = 0;
+	};
+
+	[[nodiscard]] bool shouldObserve() const;
+	[[nodiscard]] std::vector<not_null<Main::Account*>> productionAccounts() const;
+	[[nodiscard]] not_null<Main::Account*> accountForChecks() const;
+	[[nodiscard]] Entry *find(const MTP::ProxyData &proxy);
+	[[nodiscard]] Entry &ensure(const MTP::ProxyData &proxy);
+
+	void reevaluate();
+	void startChecking();
+	void stopChecking();
+	void pruneRemovedEntries();
+	void updateProbeOrder();
+	void continueChecking(crl::time delay);
+	void runChecks();
+	void pruneExpiredChecks();
+	void startNextCheck();
+	void switchTimerDone();
+	void clearPendingChecks();
+	void checkDone(
+		const MTP::ProxyData &proxy,
+		not_null<MTP::details::AbstractConnection*> raw,
+		int ping);
+	void checkFailed(
+		const MTP::ProxyData &proxy,
+		not_null<MTP::details::AbstractConnection*> raw);
+	[[nodiscard]] bool switchToAvailable();
+	[[nodiscard]] bool shouldSwitchToAvailable() const;
+
+	base::Timer _checkTimer;
+	base::Timer _switchTimer;
+	std::vector<Entry> _entries;
+	std::vector<int> _probeOrder;
+	int _nextCheckIndex = 0;
+	bool _checking = false;
+	bool _waitingToSwitch = false;
+	crl::time _switchStartedAt = 0;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Core
diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 41888829f71da5..9289ee16481fd0 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -17,6 +17,7 @@ For license and copyright information please follow this link:
 #include "core/crash_reports.h"
 #include "core/crash_report_window.h"
 #include "core/application.h"
+#include "core/external_control.h"
 #include "core/launcher.h"
 #include "core/local_url_handlers.h"
 #include "core/update_checker.h"
@@ -24,11 +25,16 @@ For license and copyright information please follow this link:
 #include "base/timer.h"
 #include "base/concurrent_timer.h"
 #include "base/invoke_queued.h"
+#include "base/options.h"
 #include "base/qthelp_url.h"
 #include "base/qthelp_regex.h"
 #include "ui/ui_utility.h"
 #include "ui/effects/animations.h"
 
+#ifdef Q_OS_MAC
+#include "platform/mac/global_menu_mac.h"
+#endif // Q_OS_MAC
+
 #include <QtCore/QLockFile>
 #include <QtGui/QSessionManager>
 #include <QtGui/QScreen>
@@ -37,51 +43,25 @@ For license and copyright information please follow this link:
 namespace Core {
 namespace {
 
-QChar _toHex(ushort v) {
-	v = v & 0x000F;
-	return QChar::fromLatin1((v >= 10) ? ('a' + (v - 10)) : ('0' + v));
-}
-ushort _fromHex(QChar c) {
-	return ((c.unicode() >= uchar('a')) ? (c.unicode() - uchar('a') + 10) : (c.unicode() - uchar('0'))) & 0x000F;
-}
-
-QString _escapeTo7bit(const QString &str) {
-	QString result;
-	result.reserve(str.size() * 2);
-	for (int i = 0, l = str.size(); i != l; ++i) {
-		QChar ch(str.at(i));
-		ushort uch(ch.unicode());
-		if (uch < 32 || uch > 127 || uch == ushort(uchar('%'))) {
-			result.append('%').append(_toHex(uch >> 12)).append(_toHex(uch >> 8)).append(_toHex(uch >> 4)).append(_toHex(uch));
-		} else {
-			result.append(ch);
-		}
-	}
-	return result;
-}
-
-QString _escapeFrom7bit(const QString &str) {
-	QString result;
-	result.reserve(str.size());
-	for (int i = 0, l = str.size(); i != l; ++i) {
-		QChar ch(str.at(i));
-		if (ch == QChar::fromLatin1('%') && i + 4 < l) {
-			result.append(QChar(ushort((_fromHex(str.at(i + 1)) << 12) | (_fromHex(str.at(i + 2)) << 8) | (_fromHex(str.at(i + 3)) << 4) | _fromHex(str.at(i + 4)))));
-			i += 4;
-		} else {
-			result.append(ch);
-		}
-	}
-	return result;
-}
+base::options::toggle OptionDeadlockDetector({
+	.id = kOptionDeadlockDetector,
+	.name = "Deadlock Detector",
+	.description = "Check once every 30 seconds that main thread is still responsive.",
+});
 
 } // namespace
 
+const char kOptionDeadlockDetector[] = "deadlock-detector";
+
 bool Sandbox::QuitOnStartRequested = false;
+bool Sandbox::SystemShuttingDown = false;
 
 Sandbox::Sandbox(int &argc, char **argv)
 : QApplication(argc, argv)
 , _mainThreadId(QThread::currentThreadId()) {
+#ifdef Q_OS_MAC
+	Platform::CreateGlobalMenu();
+#endif // Q_OS_MAC
 }
 
 int Sandbox::start() {
@@ -151,9 +131,27 @@ int Sandbox::start() {
 
 	crl::on_main(this, [=] { checkForQuit(); });
 	connect(this, &QCoreApplication::aboutToQuit, [=] {
-		customEnterFromEventLoop([&] {
-			closeApplication();
-		});
+		// On Windows, Qt emits aboutToQuit synchronously from its
+		// WM_ENDSESSION handler (QWindowsContext::windowsProc). Running
+		// closeApplication() there destroys QWindows mid-dispatch and
+		// later WM_ENDSESSION messages delivered to other top-level
+		// HWNDs crash on virtual dispatch through stale QWindow*. Detect
+		// that path and defer cleanup to the next main-loop tick so Qt
+		// finishes delivering shutdown messages on still-live windows.
+		// On a normal quit (Ctrl+Q etc.) aboutToQuit fires from the
+		// exec() epilogue after the event loop has exited and queued
+		// events would not run, so we keep the synchronous teardown.
+		if (SystemShuttingDown) {
+			QMetaObject::invokeMethod(this, [=] {
+				customEnterFromEventLoop([&] {
+					closeApplication();
+				});
+			}, Qt::QueuedConnection);
+		} else {
+			customEnterFromEventLoop([&] {
+				closeApplication();
+			});
+		}
 	});
 
 	// https://github.com/telegramdesktop/tdesktop/issues/948
@@ -173,11 +171,22 @@ int Sandbox::start() {
 	return exec();
 }
 
+void Sandbox::NotifySystemShuttingDown() {
+	SystemShuttingDown = true;
+}
+
 void Sandbox::QuitWhenStarted() {
 	if (!QApplication::instance() || !Instance()._started) {
 		QuitOnStartRequested = true;
 	} else {
-		quit();
+		// Use exit(0) instead of quit() to avoid recursive
+		// [NSApp terminate:] on macOS. Since Qt 6.0, quit() routes
+		// through QCocoaIntegration::quit() -> [NSApp terminate:],
+		// which when called from within applicationShouldTerminate:
+		// causes a nested terminate that leads to exit() being called
+		// directly, bypassing normal cleanup. exit(0) properly exits
+		// event loops without going through the platform plugin.
+		QCoreApplication::exit(0);
 	}
 }
 
@@ -190,12 +199,16 @@ void Sandbox::launchApplication() {
 		}
 		setupScreenScale();
 
-#ifndef _DEBUG
-		if (Logs::DebugEnabled()) {
+		rpl::single(
+			rpl::empty
+		) | rpl::then(
+			OptionDeadlockDetector.changes()
+		) | rpl::on_next([=] {
 			using DeadlockDetector::PingThread;
-			_deadlockDetector = std::make_unique<PingThread>(this);
-		}
-#endif // !_DEBUG
+			_deadlockDetector = OptionDeadlockDetector.value()
+				? std::make_unique<PingThread>(this)
+				: nullptr;
+		}, _lifetime);
 
 		_application = std::make_unique<Application>();
 
@@ -252,7 +265,11 @@ void Sandbox::setupScreenScale() {
 	LOG(("ScreenScale: %1").arg(cScreenScale()));
 }
 
-Sandbox::~Sandbox() = default;
+Sandbox::~Sandbox() {
+#ifdef Q_OS_MAC
+	Platform::DestroyGlobalMenu();
+#endif // Q_OS_MAC
+}
 
 bool Sandbox::event(QEvent *e) {
 	if (e->type() == QEvent::Quit) {
@@ -277,18 +294,15 @@ void Sandbox::socketConnected() {
 	_secondInstance = true;
 
 	QString commands;
-	const QStringList &lst(cSendPaths());
-	for (QStringList::const_iterator i = lst.cbegin(), e = lst.cend(); i != e; ++i) {
-		commands += u"SEND:"_q + _escapeTo7bit(*i) + ';';
-	}
 	if (qEnvironmentVariableIsSet("XDG_ACTIVATION_TOKEN")) {
-		commands += u"XDG_ACTIVATION_TOKEN:"_q + _escapeTo7bit(qEnvironmentVariable("XDG_ACTIVATION_TOKEN")) + ';';
+		commands += u"XDG_ACTIVATION_TOKEN:"_q + qgetenv("XDG_ACTIVATION_TOKEN").toBase64() + ';';
+	}
+	for (const auto &url : cRefStartUrls()) {
+		commands += u"OPEN:"_q + url.toString(QUrl::FullyEncoded) + ';';
 	}
-	if (!cStartUrl().isEmpty()) {
-		commands += u"OPEN:"_q + _escapeTo7bit(cStartUrl()) + ';';
-	} else if (cQuit()) {
+	if (cQuit()) {
 		commands += u"CMD:quit;"_q;
-	} else {
+	} else if (cRefStartUrls().isEmpty()) {
 		commands += u"CMD:show;"_q;
 	}
 
@@ -403,7 +417,7 @@ void Sandbox::singleInstanceChecked() {
 			_lastCrashDump,
 			[=] { launchApplication(); });
 		window->proxyChanges(
-		) | rpl::start_with_next([=](MTP::ProxyData &&proxy) {
+		) | rpl::on_next([=](MTP::ProxyData &&proxy) {
 			_sandboxProxy = std::move(proxy);
 			refreshGlobalProxy();
 		}, window->lifetime());
@@ -434,11 +448,11 @@ void Sandbox::newInstanceConnected() {
 
 void Sandbox::readClients() {
 	// This method can be called before Application is constructed.
-	QString startUrl;
-	QStringList toSend;
+	QList<QUrl> startUrls;
 	for (LocalClients::iterator i = _localClients.begin(), e = _localClients.end(); i != e; ++i) {
 		i->second.append(i->first->readAll());
 		if (i->second.size()) {
+			bool activationRequired = false;
 			QString cmds(QString::fromLatin1(i->second));
 			int32 from = 0, l = cmds.length();
 			for (int32 to = cmds.indexOf(QChar(';'), from); to >= from; to = (from < l) ? cmds.indexOf(QChar(';'), from) : -1) {
@@ -448,21 +462,20 @@ void Sandbox::readClients() {
 					const auto windowId = execExternal(cmds.mid(from + 4, to - from - 4));
 					const auto response = u"RES:%1_%2;"_q.arg(processId).arg(windowId).toLatin1();
 					i->first->write(response.data(), response.size());
-				} else if (cmd.startsWith(u"SEND:"_q)) {
-					if (cSendPaths().isEmpty()) {
-						toSend.append(_escapeFrom7bit(cmds.mid(from + 5, to - from - 5)));
-					}
 				} else if (cmd.startsWith(u"XDG_ACTIVATION_TOKEN:"_q)) {
-					qputenv("XDG_ACTIVATION_TOKEN", _escapeFrom7bit(cmds.mid(from + 21, to - from - 21)).toUtf8());
+					qputenv("XDG_ACTIVATION_TOKEN", QByteArray::fromBase64(cmds.mid(from + 21, to - from - 21).toLatin1()));
 				} else if (cmd.startsWith(u"OPEN:"_q)) {
-					startUrl = _escapeFrom7bit(cmds.mid(from + 5, to - from - 5)).mid(0, 8192);
-					const auto activationRequired = StartUrlRequiresActivate(startUrl);
-					const auto processId = QApplication::applicationPid();
-					const auto windowId = activationRequired
-						? execExternal("show")
-						: 0;
-					const auto response = u"RES:%1_%2;"_q.arg(processId).arg(windowId).toLatin1();
-					i->first->write(response.data(), response.size());
+					startUrls.append(cmds.mid(from + 5, to - from - 5).mid(0, 8192));
+					if (!activationRequired) {
+						activationRequired = StartUrlRequiresActivate(startUrls.back().toString());
+					}
+				} else if (cmd.startsWith(u"CTRL:"_q)) {
+					const auto payload = HandleExternalControl(
+						cmds.mid(from + 5, to - from - 5));
+					const auto response = QByteArray("DATA:")
+						+ payload.toBase64()
+						+ ';';
+					i->first->write(response);
 				} else {
 					LOG(("Sandbox Error: unknown command %1 passed in local socket").arg(cmd.toString()));
 				}
@@ -471,21 +484,17 @@ void Sandbox::readClients() {
 			if (from > 0) {
 				i->second = i->second.mid(from);
 			}
+			const auto processId = QApplication::applicationPid();
+			const auto windowId = activationRequired
+				? execExternal("show")
+				: 0;
+			const auto response = u"RES:%1_%2;"_q.arg(processId).arg(windowId).toLatin1();
+			i->first->write(response.data(), response.size());
 		}
 	}
-	if (!toSend.isEmpty()) {
-		QStringList paths(cSendPaths());
-		paths.append(toSend);
-		cSetSendPaths(paths);
-	}
+	cRefStartUrls() << base::take(startUrls);
 	if (_application) {
-		_application->checkSendPaths();
-	}
-	if (!startUrl.isEmpty()) {
-		cSetStartUrl(startUrl);
-	}
-	if (_application) {
-		_application->checkStartUrl();
+		_application->checkStartUrls();
 	}
 }
 
@@ -581,17 +590,9 @@ void Sandbox::registerEnterFromEventLoop() {
 	}
 }
 
-bool Sandbox::notifyOrInvoke(QObject *receiver, QEvent *e) {
-	if (e->type() == base::InvokeQueuedEvent::Type()) {
-		static_cast<base::InvokeQueuedEvent*>(e)->invoke();
-		return true;
-	}
-	return QApplication::notify(receiver, e);
-}
-
 bool Sandbox::notify(QObject *receiver, QEvent *e) {
 	if (QThread::currentThreadId() != _mainThreadId) {
-		return notifyOrInvoke(receiver, e);
+		return QApplication::notify(receiver, e);
 	}
 
 	const auto wrap = createEventNestingLevel();
@@ -602,7 +603,7 @@ bool Sandbox::notify(QObject *receiver, QEvent *e) {
 			return true;
 		}
 	}
-	return notifyOrInvoke(receiver, e);
+	return QApplication::notify(receiver, e);
 }
 
 void Sandbox::processPostponedCalls(int level) {
diff --git a/Telegram/SourceFiles/core/sandbox.h b/Telegram/SourceFiles/core/sandbox.h
index 5dd5cea2bc2cba..3a43b889de2f8e 100644
--- a/Telegram/SourceFiles/core/sandbox.h
+++ b/Telegram/SourceFiles/core/sandbox.h
@@ -18,6 +18,8 @@ class QLockFile;
 
 namespace Core {
 
+extern const char kOptionDeadlockDetector[];
+
 class UpdateChecker;
 class Application;
 
@@ -60,6 +62,7 @@ class Sandbox final
 		return *static_cast<Sandbox*>(QCoreApplication::instance());
 	}
 	static void QuitWhenStarted();
+	static void NotifySystemShuttingDown();
 
 	~Sandbox();
 
@@ -75,8 +78,6 @@ class Sandbox final
 		FnMut<void()> callable;
 	};
 
-	bool notifyOrInvoke(QObject *receiver, QEvent *e);
-
 	void closeApplication(); // will be done in aboutToQuit()
 	void checkForQuit(); // will be done in exec()
 	void checkForEmptyLoopNestingLevel();
@@ -123,6 +124,7 @@ class Sandbox final
 	bool _secondInstance = false;
 	bool _started = false;
 	static bool QuitOnStartRequested;
+	static bool SystemShuttingDown;
 
 	std::unique_ptr<UpdateChecker> _updateChecker;
 
@@ -133,6 +135,8 @@ class Sandbox final
 
 	std::unique_ptr<QThread> _deadlockDetector;
 
+	rpl::lifetime _lifetime;
+
 };
 
 } // namespace Core
diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index 8c0727db0bcb6b..f2f09821380169 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -7,14 +7,16 @@ For license and copyright information please follow this link:
 */
 #include "core/shortcuts.h"
 
+#include "base/platform/base_platform_info.h"
+#include "base/event_filter.h"
+#include "base/parse_helper.h"
+#include "core/application.h"
+#include "core/version.h"
 #include "mainwindow.h"
 #include "mainwidget.h"
 #include "window/window_controller.h"
-#include "core/application.h"
 #include "media/player/media_player_instance.h"
-#include "base/platform/base_platform_info.h"
 #include "platform/platform_specific.h"
-#include "base/parse_helper.h"
 
 #include <QAction>
 #include <QShortcut>
@@ -28,6 +30,20 @@ namespace {
 constexpr auto kCountLimit = 256; // How many shortcuts can be in json file.
 
 rpl::event_stream<not_null<Request*>> RequestsStream;
+bool Paused/* = false*/;
+
+const auto kChatSwitchSpecialKeys = std::array{
+	Qt::Key_Left,
+	Qt::Key_Right,
+	Qt::Key_Up,
+	Qt::Key_Down,
+	Qt::Key_Q,
+};
+Qt::Key ChatSwitchModifier/* = Qt::Key()*/;
+bool ChatSwitchStarted/* = false*/;
+QObject *ChatSwitchFilter/* = nullptr*/;
+rpl::event_stream<ChatSwitchRequest> ChatSwitchStream;
+std::array<Qt::Key, kChatSwitchSpecialKeys.size()> ChatSwitchKeyPressHandled;
 
 const auto AutoRepeatCommands = base::flat_set<Command>{
 	Command::MediaPrevious,
@@ -75,6 +91,14 @@ const auto CommandByName = base::flat_map<QString, Command>{
 	{ u"first_chat"_q        , Command::ChatFirst },
 	{ u"last_chat"_q         , Command::ChatLast },
 	{ u"self_chat"_q         , Command::ChatSelf },
+	{ u"pinned_chat1"_q      , Command::ChatPinned1 },
+	{ u"pinned_chat2"_q      , Command::ChatPinned2 },
+	{ u"pinned_chat3"_q      , Command::ChatPinned3 },
+	{ u"pinned_chat4"_q      , Command::ChatPinned4 },
+	{ u"pinned_chat5"_q      , Command::ChatPinned5 },
+	{ u"pinned_chat6"_q      , Command::ChatPinned6 },
+	{ u"pinned_chat7"_q      , Command::ChatPinned7 },
+	{ u"pinned_chat8"_q      , Command::ChatPinned8 },
 
 	{ u"previous_folder"_q   , Command::FolderPrevious },
 	{ u"next_folder"_q       , Command::FolderNext },
@@ -100,62 +124,46 @@ const auto CommandByName = base::flat_map<QString, Command>{
 
 	{ u"read_chat"_q         , Command::ReadChat },
 
+	{ u"show_chat_menu"_q    , Command::ShowChatMenu },
+	{ u"show_chat_preview"_q , Command::ShowChatPreview },
+
+	{ u"record_voice"_q      , Command::RecordVoice },
+
 	// Shortcuts that have no default values.
 	{ u"message"_q                       , Command::JustSendMessage },
 	{ u"message_silently"_q              , Command::SendSilentMessage },
 	{ u"message_scheduled"_q             , Command::ScheduleMessage },
+	{ u"ai_compose_apply"_q              , Command::ComposeAiApplyInPlace },
+	{ u"toggle_webpage_preview"_q        , Command::ToggleWebPagePreview },
 	{ u"media_viewer_video_fullscreen"_q , Command::MediaViewerFullscreen },
 	{ u"show_scheduled"_q                , Command::ShowScheduled },
 	{ u"archive_chat"_q                  , Command::ArchiveChat },
+	{ u"record_round"_q                  , Command::RecordRound },
+	{ u"show_admin_log"_q                , Command::ShowAdminLog },
 	//
 };
 
-const auto CommandNames = base::flat_map<Command, QString>{
-	{ Command::Close          , u"close_telegram"_q },
-	{ Command::Lock           , u"lock_telegram"_q },
-	{ Command::Minimize       , u"minimize_telegram"_q },
-	{ Command::Quit           , u"quit_telegram"_q },
-
-	{ Command::MediaPlay      , u"media_play"_q },
-	{ Command::MediaPause     , u"media_pause"_q },
-	{ Command::MediaPlayPause , u"media_playpause"_q },
-	{ Command::MediaStop      , u"media_stop"_q },
-	{ Command::MediaPrevious  , u"media_previous"_q },
-	{ Command::MediaNext      , u"media_next"_q },
-
-	{ Command::Search         , u"search"_q },
-
-	{ Command::ChatPrevious   , u"previous_chat"_q },
-	{ Command::ChatNext       , u"next_chat"_q },
-	{ Command::ChatFirst      , u"first_chat"_q },
-	{ Command::ChatLast       , u"last_chat"_q },
-	{ Command::ChatSelf       , u"self_chat"_q },
-
-	{ Command::FolderPrevious , u"previous_folder"_q },
-	{ Command::FolderNext     , u"next_folder"_q },
-	{ Command::ShowAllChats   , u"all_chats"_q },
-
-	{ Command::ShowFolder1    , u"folder1"_q },
-	{ Command::ShowFolder2    , u"folder2"_q },
-	{ Command::ShowFolder3    , u"folder3"_q },
-	{ Command::ShowFolder4    , u"folder4"_q },
-	{ Command::ShowFolder5    , u"folder5"_q },
-	{ Command::ShowFolder6    , u"folder6"_q },
-	{ Command::ShowFolderLast , u"last_folder"_q },
-
-	{ Command::ShowArchive    , u"show_archive"_q },
-	{ Command::ShowContacts   , u"show_contacts"_q },
-
-	{ Command::ReadChat       , u"read_chat"_q },
+const base::flat_map<Command, QString> &CommandNames() {
+	static const auto result = [&] {
+		auto result = base::flat_map<Command, QString>();
+		for (const auto &[name, command] : CommandByName) {
+			result.emplace(command, name);
+		}
+		return result;
+	}();
+	return result;
 };
 
 [[maybe_unused]] constexpr auto kNoValue = {
 	Command::JustSendMessage,
 	Command::SendSilentMessage,
 	Command::ScheduleMessage,
+	Command::ComposeAiApplyInPlace,
+	Command::ToggleWebPagePreview,
 	Command::MediaViewerFullscreen,
 	Command::ShowScheduled,
 	Command::ArchiveChat,
+	Command::RecordRound,
 };
 
 class Manager {
@@ -168,22 +176,44 @@ class Manager {
 	void toggleMedia(bool toggled);
 	void toggleSupport(bool toggled);
 	void listen(not_null<QWidget*> widget);
+	[[nodiscard]] bool handles(const QKeySequence &sequence) const;
 
 	[[nodiscard]] const QStringList &errors() const;
 
+	[[nodiscard]] auto keysDefaults() const
+		-> base::flat_map<QKeySequence, base::flat_set<Command>>;
+	[[nodiscard]] auto keysCurrents() const
+		-> base::flat_map<QKeySequence, base::flat_set<Command>>;
+
+	void change(
+		QKeySequence was,
+		QKeySequence now,
+		Command command,
+		std::optional<Command> restore);
+	void resetToDefaults();
+
 private:
 	void fillDefaults();
 	void writeDefaultFile();
+	void writeCustomFile();
 	bool readCustomFile();
 
 	void set(const QString &keys, Command command, bool replace = false);
+	void set(const QKeySequence &result, Command command, bool replace);
 	void remove(const QString &keys);
+	void remove(const QKeySequence &keys);
+	void remove(const QKeySequence &keys, Command command);
 	void unregister(base::unique_qptr<QAction> shortcut);
 
+	void pruneListened();
+
 	QStringList _errors;
 
 	base::flat_map<QKeySequence, base::unique_qptr<QAction>> _shortcuts;
 	base::flat_multi_map<not_null<QObject*>, Command> _commandByObject;
+	std::vector<QPointer<QWidget>> _listened;
+
+	base::flat_map<QKeySequence, base::flat_set<Command>> _defaults;
 
 	base::flat_set<QAction*> _mediaShortcuts;
 	base::flat_set<QAction*> _supportShortcuts;
@@ -274,6 +304,54 @@ const QStringList &Manager::errors() const {
 	return _errors;
 }
 
+auto Manager::keysDefaults() const
+-> base::flat_map<QKeySequence, base::flat_set<Command>> {
+	return _defaults;
+}
+
+auto Manager::keysCurrents() const
+-> base::flat_map<QKeySequence, base::flat_set<Command>> {
+	auto result = base::flat_map<QKeySequence, base::flat_set<Command>>();
+	for (const auto &[keys, command] : _shortcuts) {
+		auto i = _commandByObject.findFirst(command);
+		const auto end = _commandByObject.end();
+		for (; i != end && (i->first == command); ++i) {
+			result[keys].emplace(i->second);
+		}
+	}
+	return result;
+}
+
+void Manager::change(
+		QKeySequence was,
+		QKeySequence now,
+		Command command,
+		std::optional<Command> restore) {
+	if (!was.isEmpty()) {
+		remove(was, command);
+	}
+	if (!now.isEmpty()) {
+		set(now, command, true);
+	}
+	if (restore) {
+		Assert(!was.isEmpty());
+		set(was, *restore, true);
+	}
+	writeCustomFile();
+}
+
+void Manager::resetToDefaults() {
+	while (!_shortcuts.empty()) {
+		remove(_shortcuts.begin()->first);
+	}
+	for (const auto &[sequence, commands] : _defaults) {
+		for (const auto command : commands) {
+			set(sequence, command, false);
+		}
+	}
+	writeCustomFile();
+}
+
 std::vector<Command> Manager::lookup(not_null<QObject*> object) const {
 	auto result = std::vector<Command>();
 	auto i = _commandByObject.findFirst(object);
@@ -297,11 +375,27 @@ void Manager::toggleSupport(bool toggled) {
 }
 
 void Manager::listen(not_null<QWidget*> widget) {
+	pruneListened();
+	_listened.push_back(widget.get());
 	for (const auto &[keys, shortcut] : _shortcuts) {
 		widget->addAction(shortcut.get());
 	}
 }
 
+bool Manager::handles(const QKeySequence &sequence) const {
+	return _shortcuts.contains(sequence);
+}
+
+void Manager::pruneListened() {
+	for (auto i = begin(_listened); i != end(_listened);) {
+		if (i->data()) {
+			++i;
+		} else {
+			i = _listened.erase(i);
+		}
+	}
+}
+
 bool Manager::readCustomFile() {
 	// read custom shortcuts from file if it exists or write an empty custom shortcuts file
 	QFile file(CustomFilePath());
@@ -342,6 +436,7 @@ bool Manager::readCustomFile() {
 		const auto entry = (*i).toObject();
 		const auto keys = entry.constFind(u"keys"_q);
 		const auto command = entry.constFind(u"command"_q);
+		const auto removed = entry.constFind(u"removed"_q);
 		if (keys == entry.constEnd()
 			|| command == entry.constEnd()
 			|| !(*keys).isString()
@@ -355,7 +450,11 @@ bool Manager::readCustomFile() {
 			const auto name = (*command).toString();
 			const auto i = CommandByName.find(name);
 			if (i != end(CommandByName)) {
-				set((*keys).toString(), i->second, true);
+				if (removed != entry.constEnd() && removed->toBool()) {
+					remove((*keys).toString(), i->second);
+				} else {
+					set((*keys).toString(), i->second, true);
+				}
 			} else {
 				LOG(("Shortcut Warning: "
 					"could not find shortcut command handler '%1'"
@@ -396,10 +495,6 @@ void Manager::fillDefaults() {
 	set(u"ctrl+pgup"_q, Command::ChatPrevious);
 	set(u"alt+up"_q, Command::ChatPrevious);
 
-	set(u"%1+tab"_q.arg(ctrl), Command::ChatNext);
-	set(u"%1+shift+tab"_q.arg(ctrl), Command::ChatPrevious);
-	set(u"%1+backtab"_q.arg(ctrl), Command::ChatPrevious);
-
 	set(u"ctrl+alt+home"_q, Command::ChatFirst);
 	set(u"ctrl+alt+end"_q, Command::ChatLast);
 
@@ -435,6 +530,13 @@ void Manager::fillDefaults() {
 	set(u"ctrl+j"_q, Command::ShowContacts);
 
 	set(u"ctrl+r"_q, Command::ReadChat);
+
+	set(u"ctrl+\\"_q, Command::ShowChatMenu);
+	set(u"ctrl+]"_q, Command::ShowChatPreview);
+
+	set(u"ctrl+r"_q, Command::RecordVoice);
+
+	_defaults = keysCurrents();
 }
 
 void Manager::writeDefaultFile() {
@@ -460,8 +562,8 @@ void Manager::writeDefaultFile() {
 		auto i = _commandByObject.findFirst(object);
 		const auto end = _commandByObject.end();
 		for (; i != end && i->first == object; ++i) {
-			const auto j = CommandNames.find(i->second);
-			if (j != CommandNames.end()) {
+			const auto j = CommandNames().find(i->second);
+			if (j != CommandNames().end()) {
 				QJsonObject entry;
 				entry.insert(u"keys"_q, sequence.toString().toLower());
 				entry.insert(u"command"_q, j->second);
@@ -482,6 +584,79 @@ void Manager::writeDefaultFile() {
 		}
 	}
 
+	auto document = QJsonDocument();
+	document.setArray(shortcuts);
+	file.write(document.toJson(QJsonDocument::Indented));
+}
+
+void Manager::writeCustomFile() {
+	auto shortcuts = QJsonArray();
+	for (const auto &[sequence, shortcut] : _shortcuts) {
+		const auto object = shortcut.get();
+		auto i = _commandByObject.findFirst(object);
+		const auto end = _commandByObject.end();
+		for (; i != end && i->first == object; ++i) {
+			const auto d = _defaults.find(sequence);
+			if (d == _defaults.end() || !d->second.contains(i->second)) {
+				const auto j = CommandNames().find(i->second);
+				if (j != CommandNames().end()) {
+					QJsonObject entry;
+					entry.insert(u"keys"_q, sequence.toString().toLower());
+					entry.insert(u"command"_q, j->second);
+					shortcuts.append(entry);
+				}
+			}
+		}
+	}
+	const auto has = [&](not_null<QObject*> shortcut, Command command) {
+		for (auto i = _commandByObject.findFirst(shortcut)
+			; i != end(_commandByObject) && i->first == shortcut
+			; ++i) {
+			if (i->second == command) {
+				return true;
+			}
+		}
+		return false;
+	};
+	for (const auto &[sequence, commands] : _defaults) {
+		const auto i = _shortcuts.find(sequence);
+		if (i == end(_shortcuts)) {
+			QJsonObject entry;
+			entry.insert(u"keys"_q, sequence.toString().toLower());
+			entry.insert(u"command"_q, QJsonValue());
+			shortcuts.append(entry);
+			continue;
+		}
+		for (const auto command : commands) {
+			if (!has(i->second.get(), command)) {
+				const auto j = CommandNames().find(command);
+				if (j != CommandNames().end()) {
+					QJsonObject entry;
+					entry.insert(u"keys"_q, sequence.toString().toLower());
+					entry.insert(u"command"_q, j->second);
+					entry.insert(u"removed"_q, true);
+					shortcuts.append(entry);
+				}
+			}
+		}
+	}
+
+	if (shortcuts.isEmpty()) {
+		WriteDefaultCustomFile();
+		return;
+	}
+
+	auto file = QFile(CustomFilePath());
+	if (!file.open(QIODevice::WriteOnly)) {
+		LOG(("Shortcut Warning: could not write custom shortcuts file."));
+		return;
+	}
+	const char *customHeader = R"HEADER(
+// This is a list of changed shortcuts for Telegram Desktop
+// You can edit them in Settings > Chat Settings > Keyboard Shortcuts.
+
+)HEADER";
+	file.write(customHeader);
 
 	auto document = QJsonDocument();
 	document.setArray(shortcuts);
@@ -498,8 +673,15 @@ void Manager::set(const QString &keys, Command command, bool replace) {
 		_errors.push_back(u"Could not derive key sequence '%1'!"_q.arg(keys));
 		return;
 	}
+	set(result, command, replace);
+}
+
+void Manager::set(
+		const QKeySequence &keys,
+		Command command,
+		bool replace) {
 	auto shortcut = base::make_unique_q<QAction>();
-	shortcut->setShortcut(result);
+	shortcut->setShortcut(keys);
 	shortcut->setShortcutContext(Qt::ApplicationShortcut);
 	if (!AutoRepeatCommands.contains(command)) {
 		shortcut->setAutoRepeat(false);
@@ -510,20 +692,26 @@ void Manager::set(const QString &keys, Command command, bool replace) {
 		shortcut->setEnabled(false);
 	}
 	auto object = shortcut.get();
-	auto i = _shortcuts.find(result);
+	auto i = _shortcuts.find(keys);
 	if (i == end(_shortcuts)) {
-		i = _shortcuts.emplace(result, std::move(shortcut)).first;
+		i = _shortcuts.emplace(keys, std::move(shortcut)).first;
 	} else if (replace) {
 		unregister(std::exchange(i->second, std::move(shortcut)));
 	} else {
 		object = i->second.get();
 	}
 	_commandByObject.emplace(object, command);
-	if (!shortcut && isMediaShortcut) {
-		_mediaShortcuts.emplace(i->second.get());
-	}
-	if (!shortcut && isSupportShortcut) {
-		_supportShortcuts.emplace(i->second.get());
+	if (!shortcut) { // Added the new one.
+		if (isMediaShortcut) {
+			_mediaShortcuts.emplace(i->second.get());
+		}
+		if (isSupportShortcut) {
+			_supportShortcuts.emplace(i->second.get());
+		}
+		pruneListened();
+		for (const auto &widget : _listened) {
+			widget->addAction(i->second.get());
+		}
 	}
 }
 
@@ -537,16 +725,31 @@ void Manager::remove(const QString &keys) {
 		_errors.push_back(u"Could not derive key sequence '%1'!"_q.arg(keys));
 		return;
 	}
-	const auto i = _shortcuts.find(result);
+	remove(result);
+}
+
+void Manager::remove(const QKeySequence &keys) {
+	const auto i = _shortcuts.find(keys);
 	if (i != end(_shortcuts)) {
 		unregister(std::move(i->second));
 		_shortcuts.erase(i);
 	}
 }
 
+void Manager::remove(const QKeySequence &keys, Command command) {
+	const auto i = _shortcuts.find(keys);
+	if (i != end(_shortcuts)) {
+		_commandByObject.remove(i->second.get(), command);
+		if (!_commandByObject.contains(i->second.get())) {
+			unregister(std::move(i->second));
+			_shortcuts.erase(i);
+		}
+	}
+}
+
 void Manager::unregister(base::unique_qptr<QAction> shortcut) {
 	if (shortcut) {
-		_commandByObject.erase(shortcut.get());
+		_commandByObject.removeAll(shortcut.get());
 		_mediaShortcuts.erase(shortcut.get());
 		_supportShortcuts.erase(shortcut.get());
 	}
@@ -592,7 +795,9 @@ bool Launch(Command command) {
 }
 
 bool Launch(std::vector<Command> commands) {
-	if (auto handler = RequestHandler(std::move(commands))) {
+	if (Paused) {
+		return false;
+	} else if (auto handler = RequestHandler(std::move(commands))) {
 		return handler();
 	}
 	return false;
@@ -610,12 +815,169 @@ const QStringList &Errors() {
 	return Data.errors();
 }
 
+bool MarkChatSwitchKeyPressHandled(Qt::Key key, bool handled) {
+	if (!key) {
+		return false;
+	} else if (handled) {
+		if (ranges::contains(ChatSwitchKeyPressHandled, key)) {
+			return false;
+		}
+		const auto i = ranges::find(ChatSwitchKeyPressHandled, Qt::Key(0));
+		Assert(i != end(ChatSwitchKeyPressHandled));
+		*i = key;
+		return true;
+	}
+	const auto i = ranges::find(ChatSwitchKeyPressHandled, key);
+	if (i == end(ChatSwitchKeyPressHandled)) {
+		return false;
+	}
+	*i = Qt::Key(0);
+	return true;
+}
+
+bool CancelChatSwitch(Qt::Key result) {
+	ChatSwitchModifier = Qt::Key();
+	if (!ChatSwitchStarted) {
+		return false;
+	}
+	ChatSwitchStarted = false;
+	delete base::take(ChatSwitchFilter);
+	ChatSwitchStream.fire({ .action = result });
+	return true;
+}
+
+bool NavigateChatSwitch(Qt::Key result) {
+	if (!ChatSwitchStarted) {
+		return false;
+	}
+	ChatSwitchStream.fire({ .action = result });
+	return true;
+}
+
+bool CheckChatSwitchEvent(Qt::Key key) {
+	const auto plain = Qt::Key(int(key)
+		& ~(Qt::ControlModifier
+			| Qt::ShiftModifier
+			| Qt::AltModifier
+			| Qt::MetaModifier));
+	if (MarkChatSwitchKeyPressHandled(plain, false)) {
+		return true;
+	} else if (plain == Qt::Key_Escape) {
+		return CancelChatSwitch(Qt::Key_Escape);
+	} else if (plain == Qt::Key_Return || plain == Qt::Key_Enter) {
+		return CancelChatSwitch(Qt::Key_Enter);
+	} else if (ranges::contains(kChatSwitchSpecialKeys, plain)) {
+		return NavigateChatSwitch(Qt::Key(plain));
+	}
+	return false;
+}
+
 bool HandleEvent(
 		not_null<QObject*> object,
 		not_null<QShortcutEvent*> event) {
+	if (ChatSwitchStarted) {
+		const auto full = event->key();
+		for (auto i = 0; i != full.count(); ++i) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+			const auto raw = full[i].key();
+#else // Qt >= 6.0.0
+			const auto raw = full[i];
+#endif // Qt < 6.0.0
+			if (CheckChatSwitchEvent(Qt::Key(raw))) {
+				return true;
+			}
+		}
+		return false;
+	}
 	return Launch(Data.lookup(object));
 }
 
+rpl::producer<ChatSwitchRequest> ChatSwitchRequests() {
+	return ChatSwitchStream.events();
+}
+
+bool HandlePossibleChatSwitch(not_null<QKeyEvent*> event) {
+	const auto type = event->type();
+	if (Paused) {
+		return false;
+	} else if (type == QEvent::ShortcutOverride) {
+		const auto key = Qt::Key(event->key());
+		const auto ctrl = Platform::IsMac()
+			? Qt::MetaModifier
+			: Qt::ControlModifier;
+		if ((event->modifiers() & ctrl)
+			&& ranges::contains(kChatSwitchSpecialKeys, key)) {
+			// For Ctrl+Q in case of active chat switch we have
+			// on Windows always ShortcutOverride + KeyPress,
+			// while on macOS we have just ShortcutOverride for
+			// the first press and KeyPress only for repeat events.
+			//
+			// This complex scheme allows to handle both cases with
+			// firing the switch event Key_Q exactly once initially.
+			if (CheckChatSwitchEvent(key)) {
+				MarkChatSwitchKeyPressHandled(key, true);
+			}
+			crl::on_main([=] {
+				MarkChatSwitchKeyPressHandled(key, false);
+			});
+		}
+		if (Data.handles(QKeySequence(ctrl | Qt::Key_Tab))
+			&& (Data.handles(ctrl | Qt::ShiftModifier | Qt::Key_Backtab)
+				|| Data.handles(ctrl | Qt::ShiftModifier | Qt::Key_Tab)
+				|| Data.handles(QKeySequence(ctrl | Qt::Key_Backtab)))) {
+			return false;
+		} else if (key == Qt::Key_Control || key == Qt::Key_Meta) {
+			ChatSwitchModifier = key;
+		} else if (key == Qt::Key_Tab || key == Qt::Key_Backtab) {
+			const auto modifiers = event->modifiers();
+			if (modifiers & ctrl) {
+				if (ChatSwitchModifier == Qt::Key()) {
+					ChatSwitchModifier = Platform::IsMac()
+						? Qt::Key_Meta
+						: Qt::Key_Control;
+				}
+				const auto action = (modifiers & Qt::ShiftModifier)
+					? Qt::Key_Backtab
+					: key;
+				if (Data.handles(modifiers | key)) {
+					return false;
+				} else if (action == Qt::Key_Tab
+					&& Data.handles(QKeySequence(ctrl | Qt::Key_Tab))) {
+					return false;
+				} else if (action == Qt::Key_Backtab
+					&& Data.handles(QKeySequence(ctrl | Qt::Key_Backtab))) {
+					return false;
+				} else if (action == Qt::Key_Backtab
+					&& Data.handles(ctrl | Qt::ShiftModifier | Qt::Key_Tab)) {
+					return false;
+				}
+				const auto started = !std::exchange(ChatSwitchStarted, true);
+				if (started) {
+					Assert(!ChatSwitchFilter);
+					ChatSwitchFilter = base::install_event_filter(qApp, [=](not_null<QEvent*> e) {
+						return (e->type() == QEvent::InputMethod)
+							? base::EventFilterResult::Cancel
+							: base::EventFilterResult::Continue;
+					});
+				}
+				ChatSwitchStream.fire({
+					.action = action,
+					.started = started,
+				});
+				return true;
+			}
+		}
+	} else if (type == QEvent::KeyPress) {
+		return CheckChatSwitchEvent(Qt::Key(event->key()));
+	} else if (type == QEvent::KeyRelease) {
+		const auto key = Qt::Key(event->key());
+		if (key == ChatSwitchModifier) {
+			CancelChatSwitch(Qt::Key_Enter);
+		}
+	}
+	return false;
+}
+
 void ToggleMediaShortcuts(bool toggled) {
 	Data.toggleMedia(toggled);
 }
@@ -624,6 +986,69 @@ void ToggleSupportShortcuts(bool toggled) {
 	Data.toggleSupport(toggled);
 }
 
+void Pause() {
+	Paused = true;
+}
+
+void Unpause() {
+	Paused = false;
+}
+
+auto KeysDefaults()
+-> base::flat_map<QKeySequence, base::flat_set<Command>> {
+	return Data.keysDefaults();
+}
+
+auto KeysCurrents()
+-> base::flat_map<QKeySequence, base::flat_set<Command>> {
+	return Data.keysCurrents();
+}
+
+void Change(
+		QKeySequence was,
+		QKeySequence now,
+		Command command,
+		std::optional<Command> restore) {
+	Data.change(was, now, command, restore);
+}
+
+void ResetToDefaults() {
+	Data.resetToDefaults();
+}
+
+bool AllowWithoutModifiers(int key) {
+	const auto service = {
+		Qt::Key_Escape,
+		Qt::Key_Tab,
+		Qt::Key_Backtab,
+		Qt::Key_Backspace,
+		Qt::Key_Return,
+		Qt::Key_Enter,
+		Qt::Key_Insert,
+		Qt::Key_Delete,
+		Qt::Key_Pause,
+		Qt::Key_Print,
+		Qt::Key_SysReq,
+		Qt::Key_Clear,
+		Qt::Key_Home,
+		Qt::Key_End,
+		Qt::Key_Left,
+		Qt::Key_Up,
+		Qt::Key_Right,
+		Qt::Key_Down,
+		Qt::Key_PageUp,
+		Qt::Key_PageDown,
+		Qt::Key_Shift,
+		Qt::Key_Control,
+		Qt::Key_Meta,
+		Qt::Key_Alt,
+		Qt::Key_CapsLock,
+		Qt::Key_NumLock,
+		Qt::Key_ScrollLock,
+	};
+	return (key >= 0x80) && !ranges::contains(service, key);
+}
+
 void Finish() {
 	Data.clear();
 }
diff --git a/Telegram/SourceFiles/core/shortcuts.h b/Telegram/SourceFiles/core/shortcuts.h
index 562c54e441b3b2..c6e50ec09b277d 100644
--- a/Telegram/SourceFiles/core/shortcuts.h
+++ b/Telegram/SourceFiles/core/shortcuts.h
@@ -7,6 +7,9 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+class QKeyEvent;
+class QShortcutEvent;
+
 namespace Shortcuts {
 
 enum class Command {
@@ -65,12 +68,22 @@ enum class Command {
 	JustSendMessage,
 	SendSilentMessage,
 	ScheduleMessage,
+	ComposeAiApplyInPlace,
+	ToggleWebPagePreview,
+
+	RecordVoice,
+	RecordRound,
 
 	ReadChat,
 	ArchiveChat,
 
 	MediaViewerFullscreen,
 
+	ShowChatMenu,
+	ShowChatPreview,
+
+	ShowAdminLog,
+
 	SupportReloadTemplates,
 	SupportToggleMuted,
 	SupportScrollToCurrent,
@@ -116,7 +129,7 @@ class Request {
 
 };
 
-rpl::producer<not_null<Request*>> Requests();
+[[nodiscard]] rpl::producer<not_null<Request*>> Requests();
 
 void Start();
 void Finish();
@@ -126,7 +139,15 @@ void Listen(not_null<QWidget*> widget);
 bool Launch(Command command);
 bool HandleEvent(not_null<QObject*> object, not_null<QShortcutEvent*> event);
 
-const QStringList &Errors();
+bool HandlePossibleChatSwitch(not_null<QKeyEvent*> event);
+
+struct ChatSwitchRequest {
+	Qt::Key action = Qt::Key_Tab; // Key_Tab, Key_Backtab or Key_Escape.
+	bool started = false;
+};
+[[nodiscard]] rpl::producer<ChatSwitchRequest> ChatSwitchRequests();
+
+[[nodiscard]] const QStringList &Errors();
 
 // Media shortcuts are not enabled by default, because other
 // applications also use them. They are enabled only when
@@ -137,4 +158,21 @@ void ToggleMediaShortcuts(bool toggled);
 // have some conflicts with default input shortcuts, like Ctrl+Delete.
 void ToggleSupportShortcuts(bool toggled);
 
+void Pause();
+void Unpause();
+
+[[nodiscard]] auto KeysDefaults()
+-> base::flat_map<QKeySequence, base::flat_set<Command>>;
+[[nodiscard]] auto KeysCurrents()
+-> base::flat_map<QKeySequence, base::flat_set<Command>>;
+
+void Change(
+	QKeySequence was,
+	QKeySequence now,
+	Command command,
+	std::optional<Command> restore = {});
+void ResetToDefaults();
+
+[[nodiscard]] bool AllowWithoutModifiers(int key);
+
 } // namespace Shortcuts
diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp
index 2d15e4272793ef..824626b934947f 100644
--- a/Telegram/SourceFiles/core/ui_integration.cpp
+++ b/Telegram/SourceFiles/core/ui_integration.cpp
@@ -11,14 +11,17 @@ For license and copyright information please follow this link:
 #include "core/local_url_handlers.h"
 #include "core/file_utilities.h"
 #include "core/application.h"
+#include "core/bank_card_click_handler.h"
 #include "core/sandbox.h"
 #include "core/click_handler_types.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_session.h"
 #include "iv/iv_instance.h"
 #include "ui/text/text_custom_emoji.h"
+#include "ui/text/text_utilities.h"
 #include "ui/basic_click_handlers.h"
 #include "ui/emoji_config.h"
+#include "ui/toast/toast.h"
 #include "lang/lang_keys.h"
 #include "platform/platform_specific.h"
 #include "boxes/url_auth_box.h"
@@ -30,6 +33,11 @@ For license and copyright information please follow this link:
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "mainwindow.h"
+#include "base/unixtime.h"
+#include "styles/style_chat_helpers.h"
+
+#include <QtCore/QDateTime>
+#include <QtCore/QLocale>
 
 namespace Core {
 namespace {
@@ -83,18 +91,24 @@ const auto kBadPrefix = u"http://"_q;
 		QVariant context) {
 	auto &account = Core::App().activeAccount();
 	const auto &config = account.appConfig();
+	const auto my = context.value<ClickHandlerContext>();
+	const auto window = my.sessionWindow.get();
+	const auto show = window
+		? window->uiShow()
+		: my.show;
 	const auto domains = config.get<std::vector<QString>>(
 		"url_auth_domains",
 		{});
 	if (!account.sessionExists()
 		|| domain.isEmpty()
+		|| !show
 		|| !ranges::contains(domains, domain)) {
 		return false;
 	}
 	const auto good = url.startsWith(kBadPrefix, Qt::CaseInsensitive)
 		? (kGoodPrefix + url.mid(kBadPrefix.size()))
 		: url;
-	UrlAuthBox::Activate(&account.session(), good, context);
+	UrlAuthBox::ActivateUrl(show, &account.session(), good, context);
 	return true;
 }
 
@@ -106,8 +120,154 @@ const auto kBadPrefix = u"http://"_q;
 	return cWorkingDir() + "tdata/angle_backend";
 }
 
+[[nodiscard]] Ui::Text::FormattedDateResult FormatDateRelative(TimeId date) {
+	const auto now = base::unixtime::now();
+	const auto delta = int64(date) - int64(now);
+	const auto absDelta = std::abs(delta);
+	const auto future = (delta > 0);
+	auto text = QString();
+	auto nextUpdate = int32(0);
+
+	if (absDelta < 1) {
+		text = tr::lng_date_relative_now(tr::now);
+		nextUpdate = now + 1;
+	} else if (absDelta < 60) {
+		const auto count = int(absDelta);
+		text = (future
+			? tr::lng_date_relative_in_seconds
+			: tr::lng_date_relative_seconds_ago)(tr::now, lt_count, count);
+		nextUpdate = now + 1;
+	} else if (absDelta < 3600) {
+		const auto count = int(absDelta / 60);
+		text = (future
+			? tr::lng_date_relative_in_minutes
+			: tr::lng_date_relative_minutes_ago)(tr::now, lt_count, count);
+		nextUpdate = future
+			? ((count > 1)
+				? (date - (count - 1) * 60)
+				: (date - 59))
+			: (date + (count + 1) * 60);
+	} else if (absDelta < 86400) {
+		const auto count = int(absDelta / 3600);
+		text = (future
+			? tr::lng_date_relative_in_hours
+			: tr::lng_date_relative_hours_ago)(tr::now, lt_count, count);
+		nextUpdate = future
+			? ((count > 1)
+				? (date - (count - 1) * 3600)
+				: (date - 3599))
+			: (date + (count + 1) * 3600);
+	} else if (absDelta < 30 * 86400) {
+		const auto count = int(absDelta / 86400);
+		text = (future
+			? tr::lng_date_relative_in_days
+			: tr::lng_date_relative_days_ago)(tr::now, lt_count, count);
+		nextUpdate = future
+			? ((count > 1)
+				? (date - (count - 1) * 86400)
+				: (date - 86399))
+			: (date + (count + 1) * 86400);
+	} else if (absDelta < 365 * 86400) {
+		const auto count = int(absDelta / (30 * 86400));
+		text = (future
+			? tr::lng_date_relative_in_months
+			: tr::lng_date_relative_months_ago)(tr::now, lt_count, count);
+		nextUpdate = future
+			? ((count > 1)
+				? (date - (count - 1) * 30 * 86400)
+				: (date - 30 * 86400 + 1))
+			: (date + (count + 1) * 30 * 86400);
+	} else {
+		const auto count = int(absDelta / (365 * 86400));
+		text = (future
+			? tr::lng_date_relative_in_years
+			: tr::lng_date_relative_years_ago)(tr::now, lt_count, count);
+		nextUpdate = future
+			? ((count > 1)
+				? (date - (count - 1) * 365 * 86400)
+				: (date - 365 * 86400 + 1))
+			: (date + (count + 1) * 365 * 86400);
+	}
+	return { text, nextUpdate };
+}
+
+[[nodiscard]] Ui::Text::FormattedDateResult FormatDateWithFlags(
+		TimeId date,
+		FormattedDateFlags flags) {
+	if (flags & FormattedDateFlag::Relative) {
+		return FormatDateRelative(date);
+	}
+	const auto dateTime = QDateTime::fromSecsSinceEpoch(date);
+	const auto locale = QLocale();
+	auto parts = QStringList();
+	const auto hasDayOfWeek = (flags & FormattedDateFlag::DayOfWeek);
+	const auto hasShortDate = (flags & FormattedDateFlag::ShortDate);
+	const auto hasLongDate = (flags & FormattedDateFlag::LongDate);
+	const auto hasShortTime = (flags & FormattedDateFlag::ShortTime);
+	const auto hasLongTime = (flags & FormattedDateFlag::LongTime);
+	if (hasDayOfWeek) {
+		parts.push_back(hasLongDate
+			? langDayOfWeekFull(dateTime.date())
+			: langDayOfWeek(dateTime.date()));
+	}
+	if (hasLongDate) {
+		parts.push_back(langDayOfMonthFull(dateTime.date()));
+	} else if (hasShortDate) {
+		parts.push_back(langDayOfMonth(dateTime.date()));
+	}
+	if (hasLongTime) {
+		parts.push_back(locale.toString(
+			dateTime.time(),
+			QLocale::LongFormat));
+	} else if (hasShortTime) {
+		parts.push_back(locale.toString(
+			dateTime.time(),
+			QLocale::ShortFormat));
+	}
+	auto text = parts.join(u" "_q);
+	if (text.isEmpty()) {
+		text = locale.toString(dateTime, QLocale::ShortFormat);
+	}
+	return { text, 0 };
+}
+
 } // namespace
 
+Ui::Text::MarkedContext TextContext(TextContextArgs &&args) {
+	using Context = Ui::Text::MarkedContext;
+	using Factory = Ui::Text::CustomEmojiFactory;
+
+	const auto session = args.session;
+	auto simple = [session](QStringView data, const Context &context) {
+		return session->data().customEmojiManager().create(
+			data,
+			context.repaint);
+	};
+	auto factory = !args.customEmojiLoopLimit
+		? Factory(simple)
+		: (args.customEmojiLoopLimit > 0)
+		? Factory([simple, loop = args.customEmojiLoopLimit](
+				QStringView data,
+				const Context &context) {
+			return MakeWrappedEmoji<Ui::Text::LimitedLoopsEmoji>(
+				simple(data, context),
+				loop);
+		})
+		: Factory([simple](
+				QStringView data,
+				const Context &context) {
+			return MakeWrappedEmoji<Ui::Text::FirstFrameEmoji>(
+				simple(data, context));
+		});
+	args.details.session = session;
+	return {
+		.repaint = std::move(args.repaint),
+		.customEmojiFactory = std::move(factory),
+		.formattedDateFactory = FormatDateWithFlags,
+		.other = std::move(args.details),
+	};
+}
+
 void UiIntegration::postponeCall(FnMut<void()> &&callable) {
 	Sandbox::Instance().postponeCall(std::move(callable));
 }
@@ -142,14 +302,22 @@ void UiIntegration::activationFromTopPanel() {
 	Platform::IgnoreApplicationActivationRightNow();
 }
 
+void UiIntegration::touchCounterIncrement() {
+	++_touchCounter;
+}
+
+int UiIntegration::touchCounterNow() {
+	return _touchCounter;
+}
+
 bool UiIntegration::screenIsLocked() {
 	return Core::App().screenIsLocked();
 }
 
 std::shared_ptr<ClickHandler> UiIntegration::createLinkHandler(
 		const EntityLinkData &data,
-		const std::any &context) {
-	const auto my = std::any_cast<MarkedTextContext>(&context);
+		const Ui::Text::MarkedContext &context) {
+	const auto my = std::any_cast<Core::TextContextDetails>(&context.other);
 	switch (data.type) {
 	case EntityType::Url:
 		return (!data.data.isEmpty()
@@ -166,7 +334,7 @@ std::shared_ptr<ClickHandler> UiIntegration::createLinkHandler(
 		return std::make_shared<BotCommandClickHandler>(data.data);
 
 	case EntityType::Hashtag:
-		using HashtagMentionType = MarkedTextContext::HashtagMentionType;
+		using HashtagMentionType = TextContextDetails::HashtagMentionType;
 		if (my && my->type == HashtagMentionType::Twitter) {
 			return std::make_shared<UrlClickHandler>(
 				(u"https://twitter.com/hashtag/"_q
@@ -186,7 +354,7 @@ std::shared_ptr<ClickHandler> UiIntegration::createLinkHandler(
 		return std::make_shared<CashtagClickHandler>(data.data);
 
 	case EntityType::Mention:
-		using HashtagMentionType = MarkedTextContext::HashtagMentionType;
+		using HashtagMentionType = TextContextDetails::HashtagMentionType;
 		if (my && my->type == HashtagMentionType::Twitter) {
 			return std::make_shared<UrlClickHandler>(
 				u"https://twitter.com/"_q + data.data.mid(1),
@@ -218,7 +386,19 @@ std::shared_ptr<ClickHandler> UiIntegration::createLinkHandler(
 	case EntityType::Pre:
 		return std::make_shared<MonospaceClickHandler>(data.text, data.type);
 	case EntityType::Phone:
-		return std::make_shared<PhoneClickHandler>(my->session, data.text);
+		return (my && my->session)
+			? std::make_shared<PhoneClickHandler>(my->session, data.text)
+			: nullptr;
+	case EntityType::BankCard:
+		return (my && my->session)
+			? std::make_shared<BankCardClickHandler>(my->session, data.text)
+			: nullptr;
+	case EntityType::FormattedDate: {
+		const auto [date, flags] = DeserializeFormattedDateData(data.data);
+		if (date) {
+			return std::make_shared<FormattedDateClickHandler>(date, flags);
+		}
+	} break;
 	}
 	return Integration::createLinkHandler(data, context);
 }
@@ -227,7 +407,7 @@ bool UiIntegration::handleUrlClick(
 		const QString &url,
 		const QVariant &context) {
 	const auto local = Core::TryConvertUrlToLocal(url);
-	if (Core::InternalPassportLink(local)) {
+	if (Core::InternalPassportOrOAuthLink(local)) {
 		return true;
 	}
 
@@ -265,36 +445,21 @@ bool UiIntegration::handleUrlClick(
 bool UiIntegration::copyPreOnClick(const QVariant &context) {
 	const auto my = context.value<ClickHandlerContext>();
 	if (const auto window = my.sessionWindow.get()) {
-		window->showToast(tr::lng_code_copied(tr::now));
+		window->showToast({
+			.text = { tr::lng_code_copied(tr::now) },
+			.iconLottie = u"toast/copy"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	} else if (my.show) {
-		my.show->showToast(tr::lng_code_copied(tr::now));
+		my.show->showToast({
+			.text = { tr::lng_code_copied(tr::now) },
+			.iconLottie = u"toast/copy"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	}
 	return true;
 }
 
-std::unique_ptr<Ui::Text::CustomEmoji> UiIntegration::createCustomEmoji(
-		QStringView data,
-		const std::any &context) {
-	const auto my = std::any_cast<MarkedTextContext>(&context);
-	if (!my || !my->session) {
-		return nullptr;
-	}
-	auto result = my->session->data().customEmojiManager().create(
-		data,
-		my->customEmojiRepaint);
-	if (my->customEmojiLoopLimit > 0) {
-		return std::make_unique<Ui::Text::LimitedLoopsEmoji>(
-			std::move(result),
-			my->customEmojiLoopLimit);
-	}
-	return result;
-}
-
-Fn<void()> UiIntegration::createSpoilerRepaint(const std::any &context) {
-	const auto my = std::any_cast<MarkedTextContext>(&context);
-	return my ? my->customEmojiRepaint : nullptr;
-}
-
 rpl::producer<> UiIntegration::forcePopupMenuHideRequests() {
 	return Core::App().passcodeLockChanges() | rpl::to_empty;
 }
@@ -369,6 +534,10 @@ QString UiIntegration::phraseFormattingSpoiler() {
 	return tr::lng_menu_formatting_spoiler(tr::now);
 }
 
+QString UiIntegration::phraseFormattingDate() {
+	return tr::lng_menu_formatting_date(tr::now);
+}
+
 QString UiIntegration::phraseButtonOk() {
 	return tr::lng_box_ok(tr::now);
 }
@@ -421,6 +590,18 @@ QString UiIntegration::phraseQuoteHeaderCopy() {
 	return tr::lng_code_block_header_copy(tr::now);
 }
 
+QString UiIntegration::phraseMinimize() {
+	return tr::lng_minimize_window(tr::now);
+}
+
+QString UiIntegration::phraseMaximize() {
+	return tr::lng_maximize_window(tr::now);
+}
+
+QString UiIntegration::phraseRestore() {
+	return tr::lng_restore_window(tr::now);
+}
+
 bool OpenGLLastCheckFailed() {
 	return QFile::exists(OpenGLCheckFilePath());
 }
diff --git a/Telegram/SourceFiles/core/ui_integration.h b/Telegram/SourceFiles/core/ui_integration.h
index 330d7a84c6bb4c..c34e47b8037527 100644
--- a/Telegram/SourceFiles/core/ui_integration.h
+++ b/Telegram/SourceFiles/core/ui_integration.h
@@ -19,7 +19,7 @@ class ElementDelegate;
 
 namespace Core {
 
-struct MarkedTextContext {
+struct TextContextDetails {
 	enum class HashtagMentionType : uchar {
 		Telegram,
 		Twitter,
@@ -28,9 +28,15 @@ struct MarkedTextContext {
 
 	Main::Session *session = nullptr;
 	HashtagMentionType type = HashtagMentionType::Telegram;
-	Fn<void()> customEmojiRepaint;
+};
+
+struct TextContextArgs {
+	not_null<Main::Session*> session;
+	TextContextDetails details;
+	Fn<void()> repaint;
 	int customEmojiLoopLimit = 0;
 };
+[[nodiscard]] Ui::Text::MarkedContext TextContext(TextContextArgs &&args);
 
 class UiIntegration final : public Ui::Integration {
 public:
@@ -44,12 +50,14 @@ class UiIntegration final : public Ui::Integration {
 
 	void textActionsUpdated() override;
 	void activationFromTopPanel() override;
+	void touchCounterIncrement() override;
+	int touchCounterNow() override;
 
 	bool screenIsLocked() override;
 
 	std::shared_ptr<ClickHandler> createLinkHandler(
 		const EntityLinkData &data,
-		const std::any &context) override;
+		const Ui::Text::MarkedContext &context) override;
 	bool handleUrlClick(
 		const QString &url,
 		const QVariant &context) override;
@@ -57,10 +65,6 @@ class UiIntegration final : public Ui::Integration {
 	rpl::producer<> forcePopupMenuHideRequests() override;
 	const Ui::Emoji::One *defaultEmojiVariant(
 		const Ui::Emoji::One *emoji) override;
-	std::unique_ptr<Ui::Text::CustomEmoji> createCustomEmoji(
-		QStringView data,
-		const std::any &context) override;
-	Fn<void()> createSpoilerRepaint(const std::any &context) override;
 
 	QString phraseContextCopyText() override;
 	QString phraseContextCopyEmail() override;
@@ -77,6 +81,7 @@ class UiIntegration final : public Ui::Integration {
 	QString phraseFormattingBlockquote() override;
 	QString phraseFormattingMonospace() override;
 	QString phraseFormattingSpoiler() override;
+	QString phraseFormattingDate() override;
 	QString phraseButtonOk() override;
 	QString phraseButtonClose() override;
 	QString phraseButtonCancel() override;
@@ -90,6 +95,12 @@ class UiIntegration final : public Ui::Integration {
 	QString phraseBotAllowWriteTitle() override;
 	QString phraseBotAllowWriteConfirm() override;
 	QString phraseQuoteHeaderCopy() override;
+	QString phraseMinimize() override;
+	QString phraseMaximize() override;
+	QString phraseRestore() override;
+
+private:
+	int _touchCounter = 0;
 
 };
 
diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
index 777dde80c4ad73..976c40695ccebd 100644
--- a/Telegram/SourceFiles/core/update_checker.cpp
+++ b/Telegram/SourceFiles/core/update_checker.cpp
@@ -17,6 +17,7 @@ For license and copyright information please follow this link:
 #include "core/application.h"
 #include "core/changelogs.h"
 #include "core/click_handler_types.h"
+#include "core/version.h"
 #include "mainwindow.h"
 #include "main/main_account.h"
 #include "main/main_session.h"
@@ -25,15 +26,22 @@ For license and copyright information please follow this link:
 #include "info/info_controller.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
-#include "settings/settings_advanced.h"
+#include "settings/sections/settings_advanced.h"
 #include "settings/settings_intro.h"
 #include "ui/layers/box_content.h"
 
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
+#include <QtCore/QFileSystemWatcher>
 
 #include <ksandbox.h>
 
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
+#include "base/platform/linux/base_linux_xdp_utilities.h"
+
+#include <flatpakportal/flatpakportal.hpp>
+#endif // !Q_OS_WIN && !Q_OS_MAC
+
 extern "C" {
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
@@ -59,6 +67,12 @@ namespace {
 constexpr auto kUpdaterTimeout = 10 * crl::time(1000);
 constexpr auto kMaxResponseSize = 1024 * 1024;
 
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
+constexpr auto kFlatpakPortalService = "org.freedesktop.portal.Flatpak";
+constexpr auto kFlatpakPortalObjectPath = "/org/freedesktop/portal/Flatpak";
+constexpr auto kFlatpakUpdated = "/app/.updated"_cs;
+#endif // !Q_OS_WIN && !Q_OS_MAC
+
 #ifdef TDESKTOP_DISABLE_AUTOUPDATE
 bool UpdaterIsDisabled = true;
 #else // TDESKTOP_DISABLE_AUTOUPDATE
@@ -80,6 +94,11 @@ using VersionChar = wchar_t;
 
 using Loader = MTP::AbstractDedicatedLoader;
 
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
+using namespace gi::repository;
+namespace GObject = gi::repository::GObject;
+#endif // !Q_OS_WIN && !Q_OS_MAC
+
 struct BIODeleter {
 	void operator()(BIO *value) {
 		BIO_free(value);
@@ -98,6 +117,8 @@ class Checker : public base::has_weak_ptr {
 
 	virtual void start() = 0;
 
+	virtual bool poll() const;
+
 	rpl::producer<std::shared_ptr<Loader>> ready() const;
 	rpl::producer<> failed() const;
 
@@ -217,6 +238,40 @@ class MtpChecker : public Checker {
 
 };
 
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
+class FlatpakChecker : public Checker {
+public:
+	FlatpakChecker(bool testing);
+
+	void start() override;
+
+	bool poll() const override;
+
+	~FlatpakChecker();
+
+private:
+	FlatpakPortal::Flatpak _interface;
+	FlatpakPortal::FlatpakUpdateMonitor _monitor;
+	QFileSystemWatcher _watcher;
+	ulong _updateAvailableSignal = 0;
+
+};
+
+class FlatpakLoader : public Loader {
+public:
+	FlatpakLoader(FlatpakPortal::FlatpakUpdateMonitor monitor);
+
+	~FlatpakLoader();
+
+private:
+	void startLoading() override;
+
+	FlatpakPortal::FlatpakUpdateMonitor _monitor;
+	ulong _progressSignal = 0;
+
+};
+#endif // !Q_OS_WIN && !Q_OS_MAC
+
 std::shared_ptr<Updater> GetUpdaterInstance() {
 	if (const auto result = UpdaterInstance.lock()) {
 		return result;
@@ -271,6 +326,10 @@ QString ExtractFilename(const QString &url) {
 
 bool UnpackUpdate(const QString &filepath) {
 #ifndef TDESKTOP_DISABLE_AUTOUPDATE
+	if (filepath.isEmpty()) {
+		return true;
+	}
+
 	QFile input(filepath);
 	if (!input.open(QIODevice::ReadOnly)) {
 		LOG(("Update Error: cant read updates file!"));
@@ -633,6 +692,10 @@ rpl::producer<> Checker::failed() const {
 	return _failed.events();
 }
 
+bool Checker::poll() const {
+	return true;
+}
+
 bool Checker::testing() const {
 	return _testing;
 }
@@ -1050,6 +1113,161 @@ Fn<void(const MTP::Error &error)> MtpChecker::failHandler() {
 	};
 }
 
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
+FlatpakChecker::FlatpakChecker(bool testing)
+: Checker(testing)
+, _watcher({u"/app"_q}) {
+	FlatpakPortal::FlatpakProxy::new_for_bus(
+			Gio::BusType::SESSION_,
+			Gio::DBusProxyFlags::NONE_,
+			kFlatpakPortalService,
+			kFlatpakPortalObjectPath,
+			crl::guard(this, [=](GObject::Object, Gio::AsyncResult res) {
+		auto result = FlatpakPortal::FlatpakProxy::new_for_bus_finish(res);
+		if (!result) {
+			Gio::DBusErrorNS_::strip_remote_error(result.error());
+			LOG(("Update Error: %1").arg(result.error().message_().c_str()));
+			return;
+		}
+
+		_interface = *result;
+		_interface.call_create_update_monitor(
+				GLib::Variant::new_array(
+					GLib::VariantType::new_("{sv}"),
+					{}),
+				[=](GObject::Object, Gio::AsyncResult res) {
+			const auto result = _interface.call_create_update_monitor_finish(
+				res);
+
+			if (!result) {
+				Gio::DBusErrorNS_::strip_remote_error(result.error());
+				LOG(("Update Error: %1").arg(
+					result.error().message_().c_str()));
+				fail();
+				return;
+			}
+
+			FlatpakPortal::FlatpakUpdateMonitorProxy::new_for_bus(
+					Gio::BusType::SESSION_,
+					Gio::DBusProxyFlags::NONE_,
+					kFlatpakPortalService,
+					std::get<1>(*result),
+					crl::guard(this, [=](GObject::Object, Gio::AsyncResult res) {
+				using FlatpakPortal::FlatpakUpdateMonitorProxy;
+				auto result = FlatpakUpdateMonitorProxy::new_for_bus_finish(
+					res);
+
+				if (!result) {
+					Gio::DBusErrorNS_::strip_remote_error(result.error());
+					LOG(("Update Error: %1").arg(
+						result.error().message_().c_str()));
+					fail();
+					return;
+				}
+
+				_monitor = *result;
+				_updateAvailableSignal
+					= _monitor.signal_update_available().connect([=](
+							FlatpakPortal::FlatpakUpdateMonitor,
+							GLib::Variant updateInfo) {
+						done(std::make_shared<FlatpakLoader>(_monitor));
+					});
+			}));
+		});
+	}));
+
+	QObject::connect(
+		&_watcher,
+		&QFileSystemWatcher::directoryChanged,
+		[=](const QString &path) {
+			start();
+		});
+}
+
+void FlatpakChecker::start() {
+	if (QFileInfo::exists(kFlatpakUpdated.utf16())) {
+		done(std::make_shared<FlatpakLoader>(_monitor));
+	}
+}
+
+bool FlatpakChecker::poll() const {
+	return false;
+}
+
+FlatpakChecker::~FlatpakChecker() {
+	if (_monitor) {
+		_monitor.disconnect(_updateAvailableSignal);
+		_monitor.call_close(nullptr);
+	}
+}
+
+FlatpakLoader::FlatpakLoader(FlatpakPortal::FlatpakUpdateMonitor monitor)
+: Loader({}, kChunkSize)
+, _monitor(monitor) {
+	if (!_monitor) {
+		return;
+	}
+
+	_progressSignal = _monitor.signal_progress().connect([=](
+			FlatpakPortal::FlatpakUpdateMonitor,
+			GLib::Variant info) {
+		auto dict = GLib::VariantDict::new_(info);
+		switch (dict.lookup_value("status").get_uint32()) {
+		case 0: {
+			const auto n_ops = dict.lookup_value("n_ops").get_uint32();
+			const auto op = dict.lookup_value("op").get_uint32();
+			const auto progress = dict.lookup_value("progress").get_uint32();
+			threadSafeProgress({
+				int64(
+					std::round((op + (progress / 100.)) / n_ops * 104857600)),
+				104857600,
+				true,
+			});
+		} break;
+		case 1:
+		case 2: threadSafeReady(); break;
+		case 3: {
+			LOG(("Update Error: %1").arg(
+				dict.lookup_value("error_message").get_string(
+					nullptr).c_str()));
+			threadSafeFailed();
+		} break;
+		}
+	});
+}
+
+void FlatpakLoader::startLoading() {
+	if (QFileInfo::exists(kFlatpakUpdated.utf16())) {
+		threadSafeReady();
+	}
+
+	if (!_monitor) {
+		return;
+	}
+
+	_monitor.call_update(
+		base::Platform::XDP::ParentWindowID(),
+		GLib::Variant::new_array(
+			GLib::VariantType::new_("{sv}"),
+			{}),
+		crl::guard(this, [=](GObject::Object, Gio::AsyncResult res) {
+			const auto result = _monitor.call_close_finish(res);
+			if (!result) {
+				Gio::DBusErrorNS_::strip_remote_error(result.error());
+				LOG(("Update Error: %1").arg(
+					result.error().message_().c_str()));
+				threadSafeFailed();
+			}
+		}));
+}
+
+FlatpakLoader::~FlatpakLoader() {
+	if (_monitor) {
+		_monitor.disconnect(_progressSignal);
+	}
+}
+#endif // !Q_OS_WIN && !Q_OS_MAC
+
 } // namespace
 
 bool UpdaterDisabled() {
@@ -1079,6 +1297,7 @@ class Updater : public base::has_weak_ptr {
 	State state() const;
 	int already() const;
 	int size() const;
+	bool percent() const;
 
 	void setMtproto(base::weak_ptr<Main::Session> session);
 
@@ -1123,6 +1342,7 @@ class Updater : public base::has_weak_ptr {
 	rpl::event_stream<> _ready;
 	Implementation _httpImplementation;
 	Implementation _mtpImplementation;
+	Implementation _flatpakImplementation;
 	std::shared_ptr<Loader> _activeLoader;
 	bool _usingMtprotoLoader = (cAlphaVersion() != 0);
 	base::weak_ptr<Main::Session> _session;
@@ -1134,19 +1354,19 @@ class Updater : public base::has_weak_ptr {
 Updater::Updater()
 : _timer([=] { check(); })
 , _retryTimer([=] { handleTimeout(); }) {
-	checking() | rpl::start_with_next([=] {
+	checking() | rpl::on_next([=] {
 		handleChecking();
 	}, _lifetime);
-	progress() | rpl::start_with_next([=] {
+	progress() | rpl::on_next([=] {
 		handleProgress();
 	}, _lifetime);
-	failed() | rpl::start_with_next([=] {
+	failed() | rpl::on_next([=] {
 		handleFailed();
 	}, _lifetime);
-	ready() | rpl::start_with_next([=] {
+	ready() | rpl::on_next([=] {
 		handleReady();
 	}, _lifetime);
-	isLatest() | rpl::start_with_next([=] {
+	isLatest() | rpl::on_next([=] {
 		handleLatest();
 	}, _lifetime);
 }
@@ -1231,9 +1451,16 @@ int Updater::already() const {
 	return _activeLoader ? _activeLoader->alreadySize() : 0;
 }
 
+bool Updater::percent() const {
+	return _activeLoader ? _activeLoader->preferPercent() : 0;
+}
+
 void Updater::stop() {
 	_httpImplementation = Implementation();
 	_mtpImplementation = Implementation();
+	_flatpakImplementation = Implementation{
+		std::move(_flatpakImplementation.checker)
+	};
 	_activeLoader = nullptr;
 	_action = Action::Waiting;
 }
@@ -1267,7 +1494,15 @@ void Updater::start(bool forceWait) {
 		return;
 	}
 
-	if (sendRequest) {
+	if (KSandbox::isFlatpak()) {
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
+		if (!_flatpakImplementation.checker) {
+			startImplementation(
+				&_flatpakImplementation,
+				std::make_unique<FlatpakChecker>(_testing));
+		}
+#endif // !Q_OS_WIN && !Q_OS_MAC
+	} else if (sendRequest) {
 		startImplementation(
 			&_httpImplementation,
 			std::make_unique<HttpChecker>(_testing));
@@ -1299,11 +1534,11 @@ void Updater::startImplementation(
 	}
 
 	checker->ready(
-	) | rpl::start_with_next([=](std::shared_ptr<Loader> &&loader) {
+	) | rpl::on_next([=](std::shared_ptr<Loader> &&loader) {
 		checkerDone(which, std::move(loader));
 	}, checker->lifetime());
 	checker->failed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkerFail(which);
 	}, checker->lifetime());
 
@@ -1317,7 +1552,7 @@ void Updater::startImplementation(
 void Updater::checkerDone(
 		not_null<Implementation*> which,
 		std::shared_ptr<Loader> loader) {
-	which->checker = nullptr;
+	if (which->checker->poll()) which->checker = nullptr;
 	which->loader = std::move(loader);
 
 	tryLoaders();
@@ -1373,11 +1608,11 @@ bool Updater::tryLoaders() {
 			loader->progress(
 			) | rpl::start_to_stream(_progress, loader->lifetime());
 			loader->ready(
-			) | rpl::start_with_next([=](QString &&filepath) {
+			) | rpl::on_next([=](QString &&filepath) {
 				finalize(std::move(filepath));
 			}, loader->lifetime());
 			loader->failed(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_failed.fire({});
 			}, loader->lifetime());
 
@@ -1388,7 +1623,14 @@ bool Updater::tryLoaders() {
 			_isLatest.fire({});
 		}
 	};
-	if (_mtpImplementation.failed && _httpImplementation.failed) {
+	if (KSandbox::isFlatpak()) {
+		if (_flatpakImplementation.failed) {
+			_failed.fire({});
+			return false;
+		} else {
+			tryOne(_flatpakImplementation);
+		}
+	} else if (_mtpImplementation.failed && _httpImplementation.failed) {
 		_failed.fire({});
 		return false;
 	} else if (!_mtpImplementation.loader) {
@@ -1491,6 +1733,10 @@ int UpdateChecker::size() const {
 	return _updater->size();
 }
 
+bool UpdateChecker::percent() const {
+	return _updater->percent();
+}
+
 //QString winapiErrorWrap() {
 //	WCHAR errMsg[2048];
 //	DWORD errorCode = GetLastError();
@@ -1658,7 +1904,7 @@ void UpdateApplication() {
 				controller->showSection(
 					std::make_shared<Info::Memento>(
 						Info::Settings::Tag{ controller->session().user() },
-						::Settings::Advanced::Id()),
+						::Settings::AdvancedId()),
 					Window::SectionShow());
 			} else {
 				window->widget()->showSpecialLayer(
diff --git a/Telegram/SourceFiles/core/update_checker.h b/Telegram/SourceFiles/core/update_checker.h
index 4e32c300029dc9..458ffc75a972bc 100644
--- a/Telegram/SourceFiles/core/update_checker.h
+++ b/Telegram/SourceFiles/core/update_checker.h
@@ -46,6 +46,7 @@ class UpdateChecker {
 	State state() const;
 	int already() const;
 	int size() const;
+	bool percent() const;
 
 private:
 	const std::shared_ptr<Updater> _updater;
diff --git a/Telegram/SourceFiles/core/utils.cpp b/Telegram/SourceFiles/core/utils.cpp
index c4d0b76fab84bc..caeb3a19b30636 100644
--- a/Telegram/SourceFiles/core/utils.cpp
+++ b/Telegram/SourceFiles/core/utils.cpp
@@ -15,7 +15,6 @@ extern "C" {
 #include <openssl/sha.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
-#include <openssl/engine.h>
 #include <openssl/conf.h>
 #include <openssl/ssl.h>
 #include <openssl/rand.h>
diff --git a/Telegram/SourceFiles/core/utils.h b/Telegram/SourceFiles/core/utils.h
index 325f6ccc43f250..9d8a3ee6221537 100644
--- a/Telegram/SourceFiles/core/utils.h
+++ b/Telegram/SourceFiles/core/utils.h
@@ -21,10 +21,6 @@ For license and copyright information please follow this link:
 #include <set>
 #include <filesystem>
 
-#if __has_include(<ksandbox.h>)
-#include <ksandbox.h>
-#endif
-
 #define qsl(s) QStringLiteral(s)
 
 namespace base {
@@ -34,15 +30,6 @@ inline bool in_range(Value &&value, From &&from, Till &&till) {
 	return (value >= from) && (value < till);
 }
 
-#if __has_include(<ksandbox.h>)
-inline QString IconName() {
-	static const auto Result = KSandbox::isFlatpak()
-		? qEnvironmentVariable("FLATPAK_ID")
-		: u"telegram"_q;
-	return Result;
-}
-#endif
-
 inline bool CanReadDirectory(const QString &path) {
 #ifndef Q_OS_MAC // directory_iterator since 10.15
 	std::error_code error;
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index eb198caa595976..a2266893617257 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 5006003;
-constexpr auto AppVersionStr = "5.6.3";
+constexpr auto AppVersion = 6009003;
+constexpr auto AppVersionStr = "6.9.3";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/SourceFiles/countries/countries_instance.cpp b/Telegram/SourceFiles/countries/countries_instance.cpp
index ba159016d952f1..09d72899d177e2 100644
--- a/Telegram/SourceFiles/countries/countries_instance.cpp
+++ b/Telegram/SourceFiles/countries/countries_instance.cpp
@@ -302,7 +302,13 @@ QString CountriesInstance::validPhoneCode(QString fullCode) const {
 	return QString();
 }
 
-QString CountriesInstance::countryNameByISO2(const QString &iso) const {
+QString CountriesInstance::countryNameByISO2(
+		const QString &iso,
+		Naming naming) const {
+	if (naming == Naming::Polls
+		&& !iso.compare(u"FT"_q, Qt::CaseInsensitive)) {
+		return u"Fragment"_q;
+	}
 	const auto &listByISO2 = byISO2();
 	const auto i = listByISO2.constFind(iso);
 	return (i != listByISO2.cend()) ? (*i)->name : QString();
@@ -322,6 +328,9 @@ QString CountriesInstance::flagEmojiByISO2(const QString &iso) const {
 		|| iso.back() < 'A'
 		|| iso.back() > 'Z') {
 		return QString();
+	} else if (iso == u"FT"_q) {
+		return QString::fromUtf8(
+			"\xF0\x9F\x8F\xB4\xE2\x80\x8D\xE2\x98\xA0\xEF\xB8\x8F");
 	}
 	auto result = QString(4, QChar(0xD83C));
 	result[1] = QChar(iso.front().unicode() - 'A' + 0xDDE6);
diff --git a/Telegram/SourceFiles/countries/countries_instance.h b/Telegram/SourceFiles/countries/countries_instance.h
index b7993930c2be2e..8941163fbab860 100644
--- a/Telegram/SourceFiles/countries/countries_instance.h
+++ b/Telegram/SourceFiles/countries/countries_instance.h
@@ -24,6 +24,11 @@ struct Info {
 	bool isHidden = false;
 };
 
+enum class Naming : uchar {
+	Default,
+	Polls,
+};
+
 struct FormatResult {
 	QString formatted;
 	QVector<int> groups;
@@ -50,7 +55,9 @@ class CountriesInstance final {
 	[[nodiscard]] const Map &byISO2() const;
 
 	[[nodiscard]] QString validPhoneCode(QString fullCode) const;
-	[[nodiscard]] QString countryNameByISO2(const QString &iso) const;
+	[[nodiscard]] QString countryNameByISO2(
+		const QString &iso,
+		Naming naming = Naming::Default) const;
 	[[nodiscard]] QString countryISO2ByPhone(const QString &phone) const;
 	[[nodiscard]] QString flagEmojiByISO2(const QString &iso) const;
 
diff --git a/Telegram/SourceFiles/countries/countries_manager.cpp b/Telegram/SourceFiles/countries/countries_manager.cpp
index 5b8c30c99b88cb..ac59fcabedf3fb 100644
--- a/Telegram/SourceFiles/countries/countries_manager.cpp
+++ b/Telegram/SourceFiles/countries/countries_manager.cpp
@@ -153,9 +153,9 @@ Manager::Manager(not_null<Main::Domain*> domain)
 	domain->activeValue(
 	) | rpl::filter([=](Main::Account *account) {
 		return (account != nullptr);
-	}) | rpl::start_with_next_done([=](Main::Account *account) {
+	}) | rpl::on_next_done([=](Main::Account *account) {
 		*mtpLifetime = account->mtpMainSessionValue(
-		) | rpl::start_with_next([=](not_null<MTP::Instance*> instance) {
+		) | rpl::on_next([=](not_null<MTP::Instance*> instance) {
 			_api.emplace(instance);
 			request();
 		});
diff --git a/Telegram/SourceFiles/data/business/data_business_chatbots.cpp b/Telegram/SourceFiles/data/business/data_business_chatbots.cpp
index ca894acf556b98..6c64c79b3f6332 100644
--- a/Telegram/SourceFiles/data/business/data_business_chatbots.cpp
+++ b/Telegram/SourceFiles/data/business/data_business_chatbots.cpp
@@ -8,10 +8,12 @@ For license and copyright information please follow this link:
 #include "data/business/data_business_chatbots.h"
 
 #include "apiwrap.h"
+#include "boxes/peers/edit_peer_permissions_box.h"
 #include "data/business/data_business_common.h"
 #include "data/business/data_business_info.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
 
 namespace Data {
@@ -41,7 +43,7 @@ void Chatbots::preload() {
 			_settings = ChatbotsSettings{
 				.bot = _owner->session().data().user(botId),
 				.recipients = FromMTP(_owner, bot.vrecipients()),
-				.repliesAllowed = bot.is_can_reply(),
+				.permissions = FromMTP(bot.vrights()),
 			};
 		} else {
 			_settings.force_assign(ChatbotsSettings());
@@ -81,12 +83,9 @@ void Chatbots::save(
 		using Flag = MTPaccount_UpdateConnectedBot::Flag;
 		const auto api = &_owner->session().api();
 		api->request(MTPaccount_UpdateConnectedBot(
-			MTP_flags(!settings.bot
-				? Flag::f_deleted
-				: settings.repliesAllowed
-				? Flag::f_can_reply
-				: Flag()),
-			(settings.bot ? settings.bot : was.bot)->inputUser,
+			MTP_flags(!settings.bot ? Flag::f_deleted : Flag::f_rights),
+			ToMTP(settings.permissions),
+			(settings.bot ? settings.bot : was.bot)->inputUser(),
 			ForBotsToMTP(settings.recipients)
 		)).done([=](const MTPUpdates &result) {
 			api->applyUpdates(result);
@@ -118,7 +117,7 @@ void Chatbots::togglePaused(not_null<PeerData*> peer, bool paused) {
 		_sentRequests.erase(i);
 	}
 	const auto id = api->request(MTPaccount_ToggleConnectedBotPaused(
-		peer->input,
+		peer->input(),
 		MTP_bool(paused)
 	)).done([=] {
 		if (_sentRequests[peer].type != type) {
@@ -156,7 +155,7 @@ void Chatbots::removeFrom(not_null<PeerData*> peer) {
 		_sentRequests.erase(i);
 	}
 	const auto id = api->request(MTPaccount_DisablePeerConnectedBot(
-		peer->input
+		peer->input()
 	)).done([=] {
 		if (_sentRequests[peer].type != type) {
 			return;
@@ -180,4 +179,39 @@ void Chatbots::reload() {
 	preload();
 }
 
+EditFlagsDescriptor<ChatbotsPermissions> ChatbotsPermissionsLabels() {
+	using Flag = ChatbotsPermission;
+
+	using PermissionLabel = EditFlagsLabel<ChatbotsPermissions>;
+	auto messages = std::vector<PermissionLabel>{
+		{ Flag::ViewMessages, tr::lng_chatbots_read(tr::now) },
+		{ Flag::ReplyToMessages, tr::lng_chatbots_reply(tr::now) },
+		{ Flag::MarkAsRead, tr::lng_chatbots_mark_as_read(tr::now) },
+		{ Flag::DeleteSent, tr::lng_chatbots_delete_sent(tr::now) },
+		{ Flag::DeleteReceived, tr::lng_chatbots_delete_received(tr::now) },
+	};
+	auto manage = std::vector<PermissionLabel>{
+		{ Flag::EditName, tr::lng_chatbots_edit_name(tr::now) },
+		{ Flag::EditBio, tr::lng_chatbots_edit_bio(tr::now) },
+		{ Flag::EditUserpic, tr::lng_chatbots_edit_userpic(tr::now) },
+		{ Flag::EditUsername, tr::lng_chatbots_edit_username(tr::now) },
+	};
+	auto gifts = std::vector<PermissionLabel>{
+		{ Flag::ViewGifts, tr::lng_chatbots_view_gifts(tr::now) },
+		{ Flag::SellGifts, tr::lng_chatbots_sell_gifts(tr::now) },
+		{ Flag::GiftSettings, tr::lng_chatbots_gift_settings(tr::now) },
+		{ Flag::TransferGifts, tr::lng_chatbots_transfer_gifts(tr::now) },
+		{ Flag::TransferStars, tr::lng_chatbots_transfer_stars(tr::now) },
+	};
+	auto stories = std::vector<PermissionLabel>{
+		{ Flag::ManageStories, tr::lng_chatbots_manage_stories(tr::now) },
+	};
+	return { .labels = {
+		{ tr::lng_chatbots_manage_messages(), std::move(messages) },
+		{ tr::lng_chatbots_manage_profile(), std::move(manage) },
+		{ tr::lng_chatbots_manage_gifts(), std::move(gifts) },
+		{ std::nullopt, std::move(stories) },
+	}, .st = nullptr };
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/business/data_business_chatbots.h b/Telegram/SourceFiles/data/business/data_business_chatbots.h
index 902cdd42068dcd..97a034845ef11f 100644
--- a/Telegram/SourceFiles/data/business/data_business_chatbots.h
+++ b/Telegram/SourceFiles/data/business/data_business_chatbots.h
@@ -11,6 +11,9 @@ For license and copyright information please follow this link:
 
 class UserData;
 
+template <typename Flags>
+struct EditFlagsDescriptor;
+
 namespace Data {
 
 class Session;
@@ -18,7 +21,7 @@ class Session;
 struct ChatbotsSettings {
 	UserData *bot = nullptr;
 	BusinessRecipients recipients;
-	bool repliesAllowed = false;
+	ChatbotsPermissions permissions;
 
 	friend inline bool operator==(
 		const ChatbotsSettings &,
@@ -67,4 +70,7 @@ class Chatbots final {
 
 };
 
+[[nodiscard]] auto ChatbotsPermissionsLabels()
+-> EditFlagsDescriptor<ChatbotsPermissions>;
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/business/data_business_common.cpp b/Telegram/SourceFiles/data/business/data_business_common.cpp
index 149a3ee1369fd6..dc6619f5e73224 100644
--- a/Telegram/SourceFiles/data/business/data_business_common.cpp
+++ b/Telegram/SourceFiles/data/business/data_business_common.cpp
@@ -159,6 +159,47 @@ BusinessRecipients FromMTP(
 	return result;
 }
 
+ChatbotsPermissions FromMTP(const MTPBusinessBotRights &rights) {
+	using Flag = ChatbotsPermission;
+	const auto &data = rights.data();
+
+	return Flag::ViewMessages
+		| (data.is_reply() ? Flag::ReplyToMessages : Flag())
+		| (data.is_read_messages() ? Flag::MarkAsRead : Flag())
+		| (data.is_delete_sent_messages() ? Flag::DeleteSent : Flag())
+		| (data.is_delete_received_messages() ? Flag::DeleteReceived : Flag())
+		| (data.is_edit_name() ? Flag::EditName : Flag())
+		| (data.is_edit_bio() ? Flag::EditBio : Flag())
+		| (data.is_edit_profile_photo() ? Flag::EditUserpic : Flag())
+		| (data.is_edit_username() ? Flag::EditUsername : Flag())
+		| (data.is_view_gifts() ? Flag::ViewGifts : Flag())
+		| (data.is_sell_gifts() ? Flag::SellGifts : Flag())
+		| (data.is_change_gift_settings() ? Flag::GiftSettings : Flag())
+		| (data.is_transfer_and_upgrade_gifts() ? Flag::TransferGifts : Flag())
+		| (data.is_transfer_stars() ? Flag::TransferStars : Flag())
+		| (data.is_manage_stories() ? Flag::ManageStories : Flag());
+}
+
+MTPBusinessBotRights ToMTP(ChatbotsPermissions rights) {
+	using Flag = MTPDbusinessBotRights::Flag;
+	using Right = ChatbotsPermission;
+	return MTP_businessBotRights(MTP_flags(Flag()
+		| ((rights & Right::ReplyToMessages) ? Flag::f_reply : Flag())
+		| ((rights & Right::MarkAsRead) ? Flag::f_read_messages : Flag())
+		| ((rights & Right::DeleteSent) ? Flag::f_delete_sent_messages : Flag())
+		| ((rights & Right::DeleteReceived) ? Flag::f_delete_received_messages : Flag())
+		| ((rights & Right::EditName) ? Flag::f_edit_name : Flag())
+		| ((rights & Right::EditBio) ? Flag::f_edit_bio : Flag())
+		| ((rights & Right::EditUserpic) ? Flag::f_edit_profile_photo : Flag())
+		| ((rights & Right::EditUsername) ? Flag::f_edit_username : Flag())
+		| ((rights & Right::ViewGifts) ? Flag::f_view_gifts : Flag())
+		| ((rights & Right::SellGifts) ? Flag::f_sell_gifts : Flag())
+		| ((rights & Right::GiftSettings) ? Flag::f_change_gift_settings : Flag())
+		| ((rights & Right::TransferGifts) ? Flag::f_transfer_and_upgrade_gifts : Flag())
+		| ((rights & Right::TransferStars) ? Flag::f_transfer_stars : Flag())
+		| ((rights & Right::ManageStories) ? Flag::f_manage_stories : Flag())));
+}
+
 BusinessDetails FromMTP(
 		not_null<Session*> owner,
 		const tl::conditional<MTPBusinessWorkHours> &hours,
diff --git a/Telegram/SourceFiles/data/business/data_business_common.h b/Telegram/SourceFiles/data/business/data_business_common.h
index 600d5ff79d81f8..90ae82b0749df7 100644
--- a/Telegram/SourceFiles/data/business/data_business_common.h
+++ b/Telegram/SourceFiles/data/business/data_business_common.h
@@ -57,6 +57,26 @@ enum class BusinessRecipientsType : uchar {
 	Bots,
 };
 
+enum class ChatbotsPermission {
+	ViewMessages    = 0x0001,
+	ReplyToMessages = 0x0002,
+	MarkAsRead      = 0x0004,
+	DeleteSent      = 0x0008,
+	DeleteReceived  = 0x0010,
+	EditName        = 0x0020,
+	EditBio         = 0x0040,
+	EditUserpic     = 0x0080,
+	EditUsername    = 0x0100,
+	ViewGifts       = 0x0200,
+	SellGifts       = 0x0400,
+	GiftSettings    = 0x0800,
+	TransferGifts   = 0x1000,
+	TransferStars   = 0x2000,
+	ManageStories   = 0x4000,
+};
+inline constexpr bool is_flag_type(ChatbotsPermission) { return true; }
+using ChatbotsPermissions = base::flags<ChatbotsPermission>;
+
 [[nodiscard]] MTPInputBusinessRecipients ForMessagesToMTP(
 	const BusinessRecipients &data);
 [[nodiscard]] MTPInputBusinessBotRecipients ForBotsToMTP(
@@ -67,6 +87,9 @@ enum class BusinessRecipientsType : uchar {
 [[nodiscard]] BusinessRecipients FromMTP(
 	not_null<Session*> owner,
 	const MTPBusinessBotRecipients &recipients);
+[[nodiscard]] ChatbotsPermissions FromMTP(
+	const MTPBusinessBotRights &rights);
+[[nodiscard]] MTPBusinessBotRights ToMTP(ChatbotsPermissions rights);
 
 struct Timezone {
 	QString id;
diff --git a/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp b/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
index ff7979c2e8211a..859cb0ce3ffc3a 100644
--- a/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/data/business/data_shortcut_messages.cpp
@@ -54,9 +54,11 @@ constexpr auto kRequestTimeLimit = 60 * crl::time(1000);
 			data.vid(),
 			data.vfrom_id() ? *data.vfrom_id() : MTPPeer(),
 			data.vpeer_id(),
+			data.vsaved_peer_id() ? *data.vsaved_peer_id() : MTPPeer(),
 			data.vreply_to() ? *data.vreply_to() : MTPMessageReplyHeader(),
 			data.vdate(),
 			data.vaction(),
+			data.vreactions() ? *data.vreactions() : MTPMessageReactions(),
 			MTP_int(data.vttl_period().value_or_empty()));
 	}, [&](const MTPDmessage &data) {
 		return MTP_message(
@@ -65,11 +67,13 @@ constexpr auto kRequestTimeLimit = 60 * crl::time(1000);
 			data.vid(),
 			data.vfrom_id() ? *data.vfrom_id() : MTPPeer(),
 			MTPint(), // from_boosts_applied
+			MTPstring(), // from_rank
 			data.vpeer_id(),
 			data.vsaved_peer_id() ? *data.vsaved_peer_id() : MTPPeer(),
 			data.vfwd_from() ? *data.vfwd_from() : MTPMessageFwdHeader(),
 			MTP_long(data.vvia_bot_id().value_or_empty()),
 			MTP_long(data.vvia_business_bot_id().value_or_empty()),
+			data.vguestchat_via_from() ? *data.vguestchat_via_from() : MTPPeer(),
 			data.vreply_to() ? *data.vreply_to() : MTPMessageReplyHeader(),
 			data.vdate(),
 			data.vmessage(),
@@ -89,7 +93,17 @@ constexpr auto kRequestTimeLimit = 60 * crl::time(1000);
 			MTP_int(data.vttl_period().value_or_empty()),
 			MTP_int(shortcutId),
 			MTP_long(data.veffect().value_or_empty()),
-			(data.vfactcheck() ? *data.vfactcheck() : MTPFactCheck()));
+			(data.vfactcheck() ? *data.vfactcheck() : MTPFactCheck()),
+			MTP_int(data.vreport_delivery_until_date().value_or_empty()),
+			MTP_long(data.vpaid_message_stars().value_or_empty()),
+			(data.vsuggested_post()
+				? *data.vsuggested_post()
+				: MTPSuggestedPost()),
+			MTP_int(data.vschedule_repeat_period().value_or_empty()),
+			MTP_string(qs(data.vsummary_from_language().value_or_empty())),
+			(data.vrich_message()
+				? *data.vrich_message()
+				: MTPRichMessage()));
 	});
 }
 
@@ -106,7 +120,7 @@ ShortcutMessages::ShortcutMessages(not_null<Session*> owner)
 	owner->itemRemoved(
 	) | rpl::filter([](not_null<const HistoryItem*> item) {
 		return item->isBusinessShortcut();
-	}) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	}) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		remove(item);
 	}, _lifetime);
 }
@@ -653,12 +667,7 @@ HistoryItem *ShortcutMessages::append(
 			if (data.is_edit_hide()) {
 				existing->applyEdition(HistoryMessageEdition(_session, data));
 			} else {
-				existing->updateSentContent({
-					qs(data.vmessage()),
-					Api::EntitiesFromMTP(
-						_session,
-						data.ventities().value_or_empty())
-				}, data.vmedia());
+				existing->updateSentContent(data);
 				existing->updateReplyMarkup(
 					HistoryMessageMarkupData(data.vreply_markup()));
 				existing->updateForwardedInfo(data.vfwd_from());
diff --git a/Telegram/SourceFiles/data/components/credits.cpp b/Telegram/SourceFiles/data/components/credits.cpp
index 4c2379a9501da2..efae66ad522d94 100644
--- a/Telegram/SourceFiles/data/components/credits.cpp
+++ b/Telegram/SourceFiles/data/components/credits.cpp
@@ -7,8 +7,10 @@ For license and copyright information please follow this link:
 */
 #include "data/components/credits.h"
 
+#include "apiwrap.h"
 #include "api/api_credits.h"
 #include "data/data_user.h"
+#include "lang/lang_keys.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 
@@ -21,21 +23,23 @@ constexpr auto kReloadThreshold = 60 * crl::time(1000);
 
 Credits::Credits(not_null<Main::Session*> session)
 : _session(session)
+, _tonBalance(CreditsAmount(0, CreditsType::Ton))
 , _reload([=] { load(true); }) {
 }
 
 Credits::~Credits() = default;
 
 void Credits::apply(const MTPDupdateStarsBalance &data) {
-	apply(data.vbalance().v);
+	apply(CreditsAmountFromTL(data.vbalance()));
 }
 
 rpl::producer<float64> Credits::rateValue(
 		not_null<PeerData*> ownedBotOrChannel) {
-	return rpl::single(
-		_session->appConfig().get<float64>(
-			u"stars_usd_withdraw_rate_x1000"_q,
-			1200) / 1000.);
+	return rpl::single(_session->appConfig().starsWithdrawRate());
+}
+
+float64 Credits::usdRate() const {
+	return _session->appConfig().currencyWithdrawRate();
 }
 
 void Credits::load(bool force) {
@@ -45,10 +49,23 @@ void Credits::load(bool force) {
 			&& _lastLoaded + kReloadThreshold > crl::now())) {
 		return;
 	}
-	_loader = std::make_unique<Api::CreditsStatus>(_session->user());
-	_loader->request({}, [=](Data::CreditsStatusSlice slice) {
-		_loader = nullptr;
-		apply(slice.balance);
+	const auto self = _session->user();
+	_loader = std::make_unique<rpl::lifetime>();
+	_loader->make_state<Api::CreditsStatus>(self)->request({}, [=](
+			Data::CreditsStatusSlice slice) {
+		const auto balance = slice.balance;
+		const auto apiStats
+			= _loader->make_state<Api::CreditsEarnStatistics>(self);
+		const auto finish = [=](bool statsEnabled) {
+			_statsEnabled = statsEnabled;
+			apply(balance);
+			_loader = nullptr;
+		};
+		apiStats->request() | rpl::on_error_done([=] {
+			finish(false);
+		}, [=] {
+			finish(true);
+		}, *_loader);
 	});
 }
 
@@ -65,26 +82,83 @@ rpl::producer<bool> Credits::loadedValue() const {
 	) | rpl::then(_loadedChanges.events() | rpl::map_to(true));
 }
 
-uint64 Credits::balance() const {
+CreditsAmount Credits::balance() const {
 	return _nonLockedBalance.current();
 }
 
-uint64 Credits::balance(PeerId peerId) const {
+CreditsAmount Credits::balance(PeerId peerId) const {
 	const auto it = _cachedPeerBalances.find(peerId);
-	return (it != _cachedPeerBalances.end()) ? it->second : 0;
+	return (it != _cachedPeerBalances.end()) ? it->second : CreditsAmount();
+}
+
+CreditsAmount Credits::balanceCurrency(PeerId peerId) const {
+	const auto it = _cachedPeerCurrencyBalances.find(peerId);
+	return (it != _cachedPeerCurrencyBalances.end())
+		? it->second
+		: CreditsAmount(0, 0, CreditsType::Ton);
 }
 
-rpl::producer<uint64> Credits::balanceValue() const {
+rpl::producer<CreditsAmount> Credits::balanceValue() const {
 	return _nonLockedBalance.value();
 }
 
+void Credits::tonLoad(bool force) {
+	if (_tonRequestId
+		|| (!force
+			&& _tonLastLoaded
+			&& _tonLastLoaded + kReloadThreshold > crl::now())) {
+		return;
+	}
+	_tonRequestId = _session->api().request(MTPpayments_GetStarsStatus(
+		MTP_flags(MTPpayments_GetStarsStatus::Flag::f_ton),
+		MTP_inputPeerSelf()
+	)).done([=](const MTPpayments_StarsStatus &result) {
+		_tonRequestId = 0;
+		const auto amount = CreditsAmountFromTL(result.data().vbalance());
+		if (amount.ton()) {
+			apply(amount);
+		} else if (amount.empty()) {
+			apply(CreditsAmount(0, CreditsType::Ton));
+		} else {
+			LOG(("API Error: Got weird balance."));
+		}
+	}).fail([=](const MTP::Error &error) {
+		_tonRequestId = 0;
+		LOG(("API Error: Couldn't get TON balance, error: %1"
+			).arg(error.type()));
+	}).send();
+}
+
+bool Credits::tonLoaded() const {
+	return _tonLastLoaded != 0;
+}
+
+rpl::producer<bool> Credits::tonLoadedValue() const {
+	if (tonLoaded()) {
+		return rpl::single(true);
+	}
+	return rpl::single(
+		false
+	) | rpl::then(_tonLoadedChanges.events() | rpl::map_to(true));
+}
+
+CreditsAmount Credits::tonBalance() const {
+	return _tonBalance.current();
+}
+
+rpl::producer<CreditsAmount> Credits::tonBalanceValue() const {
+	return _tonBalance.value();
+}
+
 void Credits::updateNonLockedValue() {
-	_nonLockedBalance = (_balance >= _locked) ? (_balance - _locked) : 0;
+	_nonLockedBalance = (_balance >= _locked)
+		? (_balance - _locked)
+		: CreditsAmount();
 }
 
-void Credits::lock(int count) {
+void Credits::lock(CreditsAmount count) {
 	Expects(loaded());
-	Expects(count >= 0);
+	Expects(count >= CreditsAmount(0));
 	Expects(_locked + count <= _balance);
 
 	_locked += count;
@@ -92,8 +166,8 @@ void Credits::lock(int count) {
 	updateNonLockedValue();
 }
 
-void Credits::unlock(int count) {
-	Expects(count >= 0);
+void Credits::unlock(CreditsAmount count) {
+	Expects(count >= CreditsAmount(0));
 	Expects(_locked >= count);
 
 	_locked -= count;
@@ -101,12 +175,12 @@ void Credits::unlock(int count) {
 	updateNonLockedValue();
 }
 
-void Credits::withdrawLocked(int count) {
-	Expects(count >= 0);
+void Credits::withdrawLocked(CreditsAmount count) {
+	Expects(count >= CreditsAmount(0));
 	Expects(_locked >= count);
 
 	_locked -= count;
-	apply(_balance >= count ? (_balance - count) : 0);
+	apply(_balance >= count ? (_balance - count) : CreditsAmount(0));
 	invalidate();
 }
 
@@ -114,18 +188,85 @@ void Credits::invalidate() {
 	_reload.call();
 }
 
-void Credits::apply(uint64 balance) {
-	_balance = balance;
-	updateNonLockedValue();
+void Credits::apply(CreditsAmount balance) {
+	if (balance.ton()) {
+		_tonBalance = balance;
 
-	const auto was = std::exchange(_lastLoaded, crl::now());
-	if (!was) {
-		_loadedChanges.fire({});
+		const auto was = std::exchange(_tonLastLoaded, crl::now());
+		if (!was) {
+			_tonLoadedChanges.fire({});
+		}
+	} else {
+		_balance = balance;
+		updateNonLockedValue();
+
+		const auto was = std::exchange(_lastLoaded, crl::now());
+		if (!was) {
+			_loadedChanges.fire({});
+		}
 	}
 }
 
-void Credits::apply(PeerId peerId, uint64 balance) {
+void Credits::apply(PeerId peerId, CreditsAmount balance) {
 	_cachedPeerBalances[peerId] = balance;
+	_refreshedByPeerId.fire_copy(peerId);
+}
+
+void Credits::applyCurrency(PeerId peerId, CreditsAmount balance) {
+	_cachedPeerCurrencyBalances[peerId] = balance;
+	_refreshedByPeerId.fire_copy(peerId);
+}
+
+rpl::producer<> Credits::refreshedByPeerId(PeerId peerId) {
+	return _refreshedByPeerId.events(
+	) | rpl::filter(rpl::mappers::_1 == peerId) | rpl::to_empty;
+}
+
+bool Credits::statsEnabled() const {
+	return _statsEnabled;
 }
 
 } // namespace Data
+
+CreditsAmount CreditsAmountFromTL(const MTPStarsAmount &amount) {
+	return amount.match([&](const MTPDstarsAmount &data) {
+		return CreditsAmount(
+			data.vamount().v,
+			data.vnanos().v,
+			CreditsType::Stars);
+	}, [&](const MTPDstarsTonAmount &data) {
+		const auto isNegative = (static_cast<int64_t>(data.vamount().v) < 0);
+		const auto absValue = isNegative
+			? uint64(~data.vamount().v + 1)
+			: data.vamount().v;
+		const auto result = CreditsAmount(
+			int64(absValue / 1'000'000'000),
+			absValue % 1'000'000'000,
+			CreditsType::Ton);
+		return isNegative
+			? CreditsAmount(0, CreditsType::Ton) - result
+			: result;
+	});
+}
+
+CreditsAmount CreditsAmountFromTL(const MTPStarsAmount *amount) {
+	return amount ? CreditsAmountFromTL(*amount) : CreditsAmount();
+}
+
+MTPStarsAmount StarsAmountToTL(CreditsAmount amount) {
+	return amount.ton() ? MTP_starsTonAmount(
+		MTP_long(amount.whole() * uint64(1'000'000'000) + amount.nano())
+	) : MTP_starsAmount(MTP_long(amount.whole()), MTP_int(amount.nano()));
+}
+
+QString PrepareCreditsAmountText(CreditsAmount amount) {
+	return amount.stars()
+		? tr::lng_action_gift_for_stars(
+			tr::now,
+			lt_count_decimal,
+			amount.value())
+		: tr::lng_action_gift_for_ton(
+			tr::now,
+			lt_count_decimal,
+			amount.value());
+}
diff --git a/Telegram/SourceFiles/data/components/credits.h b/Telegram/SourceFiles/data/components/credits.h
index 62fefcc3c7b1b2..c20323e6f63e3d 100644
--- a/Telegram/SourceFiles/data/components/credits.h
+++ b/Telegram/SourceFiles/data/components/credits.h
@@ -7,10 +7,6 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-namespace Api {
-class CreditsStatus;
-} // namespace Api
-
 namespace Main {
 class Session;
 } // namespace Main
@@ -23,21 +19,34 @@ class Credits final {
 	~Credits();
 
 	void load(bool force = false);
-	void apply(uint64 balance);
-	void apply(PeerId peerId, uint64 balance);
-
 	[[nodiscard]] bool loaded() const;
 	[[nodiscard]] rpl::producer<bool> loadedValue() const;
-
-	[[nodiscard]] uint64 balance() const;
-	[[nodiscard]] uint64 balance(PeerId peerId) const;
-	[[nodiscard]] rpl::producer<uint64> balanceValue() const;
+	[[nodiscard]] CreditsAmount balance() const;
+	[[nodiscard]] CreditsAmount balance(PeerId peerId) const;
+	[[nodiscard]] rpl::producer<CreditsAmount> balanceValue() const;
+	[[nodiscard]] float64 usdRate() const;
 	[[nodiscard]] rpl::producer<float64> rateValue(
 		not_null<PeerData*> ownedBotOrChannel);
 
-	void lock(int count);
-	void unlock(int count);
-	void withdrawLocked(int count);
+	[[nodiscard]] rpl::producer<> refreshedByPeerId(PeerId peerId);
+
+	void tonLoad(bool force = false);
+	[[nodiscard]] bool tonLoaded() const;
+	[[nodiscard]] rpl::producer<bool> tonLoadedValue() const;
+	[[nodiscard]] CreditsAmount tonBalance() const;
+	[[nodiscard]] rpl::producer<CreditsAmount> tonBalanceValue() const;
+
+	void apply(CreditsAmount balance);
+	void apply(PeerId peerId, CreditsAmount balance);
+
+	[[nodiscard]] bool statsEnabled() const;
+
+	void applyCurrency(PeerId peerId, CreditsAmount balance);
+	[[nodiscard]] CreditsAmount balanceCurrency(PeerId peerId) const;
+
+	void lock(CreditsAmount count);
+	void unlock(CreditsAmount count);
+	void withdrawLocked(CreditsAmount count);
 	void invalidate();
 
 	void apply(const MTPDupdateStarsBalance &data);
@@ -47,16 +56,25 @@ class Credits final {
 
 	const not_null<Main::Session*> _session;
 
-	std::unique_ptr<Api::CreditsStatus> _loader;
+	std::unique_ptr<rpl::lifetime> _loader;
 
-	base::flat_map<PeerId, uint64> _cachedPeerBalances;
+	base::flat_map<PeerId, CreditsAmount> _cachedPeerBalances;
+	base::flat_map<PeerId, CreditsAmount> _cachedPeerCurrencyBalances;
 
-	uint64 _balance = 0;
-	uint64 _locked = 0;
-	rpl::variable<uint64> _nonLockedBalance;
+	CreditsAmount _balance;
+	CreditsAmount _locked;
+	rpl::variable<CreditsAmount> _nonLockedBalance;
 	rpl::event_stream<> _loadedChanges;
 	crl::time _lastLoaded = 0;
-	float64 _rate = 0.;
+
+	rpl::variable<CreditsAmount> _tonBalance;
+	rpl::event_stream<> _tonLoadedChanges;
+	crl::time _tonLastLoaded = false;
+	mtpRequestId _tonRequestId = 0;
+
+	bool _statsEnabled = false;
+
+	rpl::event_stream<PeerId> _refreshedByPeerId;
 
 	SingleQueuedInvokation _reload;
 
diff --git a/Telegram/SourceFiles/data/components/factchecks.cpp b/Telegram/SourceFiles/data/components/factchecks.cpp
index 77251925ef34bb..a393f56f6a3752 100644
--- a/Telegram/SourceFiles/data/components/factchecks.cpp
+++ b/Telegram/SourceFiles/data/components/factchecks.cpp
@@ -60,7 +60,7 @@ void Factchecks::subscribeIfNotYet() {
 	_subscribed = true;
 
 	_session->data().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		_pending.remove(item);
 		const auto i = ranges::find(_requested, item.get());
 		if (i != end(_requested)) {
@@ -91,7 +91,7 @@ void Factchecks::request() {
 		}
 	}
 	_requestId = _session->api().request(MTPmessages_GetFactCheck(
-		history->peer->input,
+		history->peer->input(),
 		MTP_vector<MTPint>(std::move(ids))
 	)).done([=](const MTPVector<MTPFactCheck> &result) {
 		_requestId = 0;
@@ -170,7 +170,7 @@ void Factchecks::save(
 		return;
 	} else if (text.empty()) {
 		_session->api().request(MTPmessages_DeleteFactCheck(
-			item->history()->peer->input,
+			item->history()->peer->input(),
 			MTP_int(item->id.bare)
 		)).done([=](const MTPUpdates &result) {
 			_session->api().applyUpdates(result);
@@ -180,7 +180,7 @@ void Factchecks::save(
 		}).send();
 	} else {
 		_session->api().request(MTPmessages_EditFactCheck(
-			item->history()->peer->input,
+			item->history()->peer->input(),
 			MTP_int(item->id.bare),
 			MTP_textWithEntities(
 				MTP_string(text.text),
diff --git a/Telegram/SourceFiles/data/components/gift_auctions.cpp b/Telegram/SourceFiles/data/components/gift_auctions.cpp
new file mode 100644
index 00000000000000..d06a538944cdb4
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/gift_auctions.cpp
@@ -0,0 +1,559 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/components/gift_auctions.h"
+
+#include "api/api_hash.h"
+#include "api/api_premium.h"
+#include "api/api_text_entities.h"
+#include "apiwrap.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+
+namespace Data {
+
+GiftAuctions::GiftAuctions(not_null<Main::Session*> session)
+: _session(session)
+, _timer([=] { checkSubscriptions(); }) {
+	crl::on_main(_session, [=] {
+		rpl::merge(
+			_session->data().chatsListChanges(),
+			_session->data().chatsListLoadedEvents()
+		) | rpl::filter(
+			!rpl::mappers::_1
+		) | rpl::take(1) | rpl::on_next([=] {
+			requestActive();
+		}, _lifetime);
+	});
+}
+
+GiftAuctions::~GiftAuctions() = default;
+
+void GiftAuctions::resolveSlug(const QString &slug, Fn<void(uint64)> done) {
+	const auto it = _slugToGiftId.find(slug);
+	if (it != _slugToGiftId.end()) {
+		done(it->second);
+		return;
+	}
+
+	auto &request = _slugRequests[slug];
+	request.callbacks.push_back(std::move(done));
+	if (request.callbacks.size() > 1) {
+		return;
+	}
+
+	_session->api().request(MTPpayments_GetStarGiftAuctionState(
+		MTP_inputStarGiftAuctionSlug(MTP_string(slug)),
+		MTP_int(0)
+	)).done([=](const MTPpayments_StarGiftAuctionState &result) {
+		const auto &data = result.data();
+
+		_session->data().processUsers(data.vusers());
+		_session->data().processChats(data.vchats());
+
+		auto gift = Api::FromTL(_session, data.vgift());
+		if (!gift || !gift->id) {
+			_slugRequests.erase(slug);
+			return;
+		}
+		const auto giftId = gift->id;
+
+		_slugToGiftId.emplace(slug, giftId);
+
+		auto &entry = _map[giftId];
+		if (!entry) {
+			entry = std::make_unique<Entry>();
+		}
+		const auto raw = entry.get();
+		raw->state.gift = std::move(gift);
+
+		applyStateResponse(raw, result);
+
+		auto callbacks = std::move(_slugRequests[slug].callbacks);
+		_slugRequests.erase(slug);
+		for (const auto &callback : callbacks) {
+			callback(giftId);
+		}
+	}).fail([=] {
+		_slugRequests.erase(slug);
+	}).send();
+}
+
+void GiftAuctions::applyStateResponse(
+		not_null<Entry*> entry,
+		const MTPpayments_StarGiftAuctionState &result) {
+	const auto &data = result.data();
+
+	const auto timeout = data.vtimeout().v;
+	const auto ms = timeout * crl::time(1000);
+	entry->state.subscribedTill = ms ? (crl::now() + ms) : -1;
+
+	const auto was = myStateKey(entry->state);
+	apply(entry, data.vstate());
+	apply(entry, data.vuser_state());
+
+	if (entry->changes.has_consumers()) {
+		entry->changes.fire({});
+		if (ms && (!_timer.isActive() || _timer.remainingTime() > ms)) {
+			_timer.callOnce(ms);
+		}
+	}
+	if (was != myStateKey(entry->state)) {
+		_activeChanged.fire({});
+	}
+}
+
+rpl::producer<GiftAuctionState> GiftAuctions::state(uint64 giftId) {
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		auto &entry = _map[giftId];
+		if (!entry) {
+			entry = std::make_unique<Entry>();
+		}
+		const auto raw = entry.get();
+
+		raw->changes.events() | rpl::on_next([=] {
+			consumer.put_next_copy(raw->state);
+		}, lifetime);
+
+		const auto now = crl::now();
+		if (raw->state.subscribedTill < 0
+			|| raw->state.subscribedTill >= now) {
+			consumer.put_next_copy(raw->state);
+		} else if (raw->state.subscribedTill >= 0) {
+			request(giftId);
+		}
+
+		return lifetime;
+	};
+}
+
+void GiftAuctions::apply(const MTPDupdateStarGiftAuctionState &data) {
+	if (const auto entry = find(data.vgift_id().v)) {
+		const auto was = myStateKey(entry->state);
+		apply(entry, data.vstate());
+		entry->changes.fire({});
+		if (was != myStateKey(entry->state)) {
+			_activeChanged.fire({});
+		}
+	} else {
+		requestActive();
+	}
+}
+
+void GiftAuctions::apply(const MTPDupdateStarGiftAuctionUserState &data) {
+	if (const auto entry = find(data.vgift_id().v)) {
+		const auto was = myStateKey(entry->state);
+		apply(entry, data.vuser_state());
+		entry->changes.fire({});
+		if (was != myStateKey(entry->state)) {
+			_activeChanged.fire({});
+		}
+	} else {
+		requestActive();
+	}
+}
+
+void GiftAuctions::requestAcquired(
+		uint64 giftId,
+		Fn<void(std::vector<Data::GiftAcquired>)> done) {
+	Expects(done != nullptr);
+
+	_session->api().request(MTPpayments_GetStarGiftAuctionAcquiredGifts(
+		MTP_long(giftId)
+	)).done([=](const MTPpayments_StarGiftAuctionAcquiredGifts &result) {
+		const auto &data = result.data();
+
+		const auto owner = &_session->data();
+		owner->processUsers(data.vusers());
+		owner->processChats(data.vchats());
+
+		const auto &list = data.vgifts().v;
+		auto gifts = std::vector<Data::GiftAcquired>();
+		gifts.reserve(list.size());
+		for (const auto &gift : list) {
+			const auto &data = gift.data();
+			gifts.push_back({
+				.to = owner->peer(peerFromMTP(data.vpeer())),
+				.message = (data.vmessage()
+					? Api::ParseTextWithEntities(_session, *data.vmessage())
+					: TextWithEntities()),
+				.date = data.vdate().v,
+				.bidAmount = int64(data.vbid_amount().v),
+				.round = data.vround().v,
+				.number = data.vgift_num().value_or_empty(),
+				.position = data.vpos().v,
+				.nameHidden = data.is_name_hidden(),
+			});
+		}
+		if (const auto entry = find(giftId)) {
+			const auto count = int(gifts.size());
+			if (entry->state.my.gotCount != count) {
+				entry->state.my.gotCount = count;
+				entry->changes.fire({});
+			}
+		}
+		done(std::move(gifts));
+	}).fail([=] {
+		done({});
+	}).send();
+}
+
+std::optional<Data::UniqueGiftAttributes> GiftAuctions::attributes(
+		uint64 giftId) const {
+	const auto i = _attributes.find(giftId);
+	return (i != end(_attributes) && i->second.waiters.empty())
+		? i->second.lists
+		: std::optional<Data::UniqueGiftAttributes>();
+}
+
+void GiftAuctions::requestAttributes(uint64 giftId, Fn<void()> ready) {
+	auto &entry = _attributes[giftId];
+	entry.waiters.push_back(std::move(ready));
+	if (entry.waiters.size() > 1) {
+		return;
+	}
+	_session->api().request(MTPpayments_GetStarGiftUpgradeAttributes(
+		MTP_long(giftId)
+	)).done([=](const MTPpayments_StarGiftUpgradeAttributes &result) {
+		const auto &attributes = result.data().vattributes().v;
+		auto &entry = _attributes[giftId];
+		auto &info = entry.lists;
+		info.models.reserve(attributes.size());
+		info.patterns.reserve(attributes.size());
+		info.backdrops.reserve(attributes.size());
+		for (const auto &attribute : attributes) {
+			attribute.match([&](const MTPDstarGiftAttributeModel &data) {
+				info.models.push_back(Api::FromTL(_session, data));
+			}, [&](const MTPDstarGiftAttributePattern &data) {
+				info.patterns.push_back(Api::FromTL(_session, data));
+			}, [&](const MTPDstarGiftAttributeBackdrop &data) {
+				info.backdrops.push_back(Api::FromTL(data));
+			}, [](const MTPDstarGiftAttributeOriginalDetails &data) {
+			});
+		}
+		for (const auto &ready : base::take(entry.waiters)) {
+			if (ready) ready();
+		}
+	}).fail([=] {
+		for (const auto &ready : base::take(_attributes[giftId].waiters)) {
+			if (ready) ready();
+		}
+	}).send();
+}
+
+rpl::producer<ActiveAuctions> GiftAuctions::active() const {
+	return _activeChanged.events_starting_with_copy(
+		rpl::empty
+	) | rpl::map([=] {
+		return collectActive();
+	});
+}
+
+rpl::producer<bool> GiftAuctions::hasActiveChanges() const {
+	const auto has = hasActive();
+	return _activeChanged.events(
+	) | rpl::map([=] {
+		return hasActive();
+	}) | rpl::combine_previous(
+		has
+	) | rpl::filter([=](bool previous, bool current) {
+		return previous != current;
+	}) | rpl::map([=](bool previous, bool current) {
+		return current;
+	});
+}
+
+bool GiftAuctions::hasActive() const {
+	for (const auto &[giftId, entry] : _map) {
+		if (myStateKey(entry->state)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void GiftAuctions::checkSubscriptions() {
+	const auto now = crl::now();
+	auto next = crl::time();
+	for (const auto &[giftId, entry] : _map) {
+		const auto raw = entry.get();
+		const auto till = raw->state.subscribedTill;
+		if (till <= 0 || !raw->changes.has_consumers()) {
+			continue;
+		} else if (till <= now) {
+			request(giftId);
+		} else {
+			const auto timeout = till - now;
+			if (!next || timeout < next) {
+				next = timeout;
+			}
+		}
+	}
+	if (next) {
+		_timer.callOnce(next);
+	}
+}
+
+auto GiftAuctions::myStateKey(const GiftAuctionState &state) const
+-> MyStateKey {
+	if (!state.my.bid) {
+		return {};
+	}
+	auto min = 0;
+	for (const auto &level : state.bidLevels) {
+		if (level.position > state.gift->auctionGiftsPerRound) {
+			break;
+		} else if (!min || min > level.amount) {
+			min = level.amount;
+		}
+	}
+	return {
+		.bid = int(state.my.bid),
+		.position = MyAuctionPosition(state),
+		.version = state.version,
+	};
+}
+
+ActiveAuctions GiftAuctions::collectActive() const {
+	auto result = ActiveAuctions();
+	result.list.reserve(_map.size());
+	for (const auto &[giftId, entry] : _map) {
+		const auto raw = &entry->state;
+		if (raw->gift && raw->my.date) {
+			result.list.push_back(raw);
+		}
+	}
+	return result;
+}
+
+uint64 GiftAuctions::countActiveHash() const {
+	// The server hashes the auctions in a fixed order, so we have to sort
+	// them by (date, version) before hashing, just like the Android client
+	// does in GiftAuctionController::calculateUserAuctionsHash. Otherwise
+	// the server will never answer with starGiftActiveAuctionsNotModified.
+	auto list = collectActive().list;
+	ranges::sort(list, ranges::less(), [](const auto &active) {
+		return (uint64(uint32(active->my.date)) << 32)
+			| uint32(active->version);
+	});
+	auto result = Api::HashInit();
+	for (const auto &active : list) {
+		Api::HashUpdate(result, active->version);
+		Api::HashUpdate(result, active->my.date);
+	}
+	return Api::HashFinalize(result);
+}
+
+void GiftAuctions::requestActive() {
+	if (_activeRequestId) {
+		return;
+	}
+	_activeRequestId = _session->api().request(
+		MTPpayments_GetStarGiftActiveAuctions(MTP_long(countActiveHash()))
+	).done([=](const MTPpayments_StarGiftActiveAuctions &result) {
+		_activeRequestId = 0;
+		result.match([=](const MTPDpayments_starGiftActiveAuctions &data) {
+			const auto owner = &_session->data();
+			owner->processUsers(data.vusers());
+			owner->processChats(data.vchats());
+
+			auto giftsFound = base::flat_set<uint64>();
+			const auto &list = data.vauctions().v;
+			giftsFound.reserve(list.size());
+			for (const auto &auction : list) {
+				const auto &data = auction.data();
+				auto gift = Api::FromTL(_session, data.vgift());
+				if (!gift || !gift->id) {
+					LOG(("Api Error: Bad auction gift."));
+					continue;
+				}
+				const auto giftId = gift->id;
+				auto &entry = _map[giftId];
+				if (!entry) {
+					entry = std::make_unique<Entry>();
+				}
+				const auto raw = entry.get();
+				if (!raw->state.gift) {
+					raw->state.gift = std::move(gift);
+				}
+				apply(raw, data.vstate());
+				apply(raw, data.vuser_state());
+				giftsFound.emplace(giftId);
+			}
+			for (const auto &[giftId, entry] : _map) {
+				const auto my = &entry->state.my;
+				if (my->date && !giftsFound.contains(giftId)) {
+					my->to = nullptr;
+					my->minBidAmount = 0;
+					my->bid = 0;
+					my->date = 0;
+					my->returned = false;
+					giftsFound.emplace(giftId);
+				}
+			}
+			for (const auto &giftId : giftsFound) {
+				_map[giftId]->changes.fire({});
+			}
+			_activeChanged.fire({});
+		}, [](const MTPDpayments_starGiftActiveAuctionsNotModified &) {
+		});
+	}).send();
+}
+
+void GiftAuctions::request(uint64 giftId) {
+	auto it = _map.find(giftId);
+	if (it == _map.end()) {
+		return;
+	}
+	const auto raw = it->second.get();
+	if (raw->requested) {
+		return;
+	}
+	raw->requested = true;
+	_session->api().request(MTPpayments_GetStarGiftAuctionState(
+		MTP_inputStarGiftAuction(MTP_long(giftId)),
+		MTP_int(raw->state.version)
+	)).done([=](const MTPpayments_StarGiftAuctionState &result) {
+		auto it = _map.find(giftId);
+		if (it == _map.end()) {
+			return;
+		}
+		const auto raw = it->second.get();
+		raw->requested = false;
+
+		const auto &data = result.data();
+
+		_session->data().processUsers(data.vusers());
+		_session->data().processChats(data.vchats());
+
+		raw->state.gift = Api::FromTL(_session, data.vgift());
+		if (!raw->state.gift) {
+			return;
+		}
+
+		applyStateResponse(raw, result);
+	}).fail([=] {
+		auto it = _map.find(giftId);
+		if (it != _map.end()) {
+			it->second->requested = false;
+		}
+	}).send();
+}
+
+GiftAuctions::Entry *GiftAuctions::find(uint64 giftId) const {
+	const auto it = _map.find(giftId);
+	return (it != _map.end()) ? it->second.get() : nullptr;
+}
+
+void GiftAuctions::apply(
+		not_null<Entry*> entry,
+		const MTPStarGiftAuctionState &state) {
+	apply(&entry->state, state);
+}
+
+void GiftAuctions::apply(
+		not_null<GiftAuctionState*> entry,
+		const MTPStarGiftAuctionState &state) {
+	Expects(entry->gift.has_value());
+
+	state.match([&](const MTPDstarGiftAuctionState &data) {
+		const auto version = data.vversion().v;
+		if (entry->version >= version) {
+			return;
+		}
+		const auto owner = &_session->data();
+		entry->startDate = data.vstart_date().v;
+		entry->endDate = data.vend_date().v;
+		entry->minBidAmount = data.vmin_bid_amount().v;
+		const auto &levels = data.vbid_levels().v;
+		entry->bidLevels.clear();
+		entry->bidLevels.reserve(levels.size());
+		for (const auto &level : levels) {
+			auto &bid = entry->bidLevels.emplace_back();
+			const auto &data = level.data();
+			bid.amount = data.vamount().v;
+			bid.position = data.vpos().v;
+			bid.date = data.vdate().v;
+		}
+		const auto &top = data.vtop_bidders().v;
+		entry->topBidders.clear();
+		entry->topBidders.reserve(top.size());
+		for (const auto &user : top) {
+			entry->topBidders.push_back(owner->user(UserId(user.v)));
+		}
+		entry->nextRoundAt = data.vnext_round_at().v;
+		entry->giftsLeft = data.vgifts_left().v;
+		entry->currentRound = data.vcurrent_round().v;
+		entry->totalRounds = data.vtotal_rounds().v;
+		const auto &rounds = data.vrounds().v;
+		entry->roundParameters.clear();
+		entry->roundParameters.reserve(rounds.size());
+		for (const auto &round : rounds) {
+			round.match([&](const MTPDstarGiftAuctionRound &data) {
+				entry->roundParameters.push_back({
+					.number = data.vnum().v,
+					.duration = data.vduration().v,
+				});
+			}, [&](const MTPDstarGiftAuctionRoundExtendable &data) {
+				entry->roundParameters.push_back({
+					.number = data.vnum().v,
+					.duration = data.vduration().v,
+					.extendTop = data.vextend_top().v,
+					.extendDuration = data.vextend_window().v,
+				});
+			});
+		}
+		entry->averagePrice = 0;
+	}, [&](const MTPDstarGiftAuctionStateFinished &data) {
+		entry->averagePrice = data.vaverage_price().v;
+		entry->startDate = data.vstart_date().v;
+		entry->endDate = data.vend_date().v;
+		entry->minBidAmount = 0;
+		entry->nextRoundAt
+			= entry->currentRound
+			= entry->totalRounds
+			= entry->giftsLeft
+			= entry->version
+			= 0;
+	}, [&](const MTPDstarGiftAuctionStateNotModified &data) {
+	});
+}
+
+void GiftAuctions::apply(
+		not_null<Entry*> entry,
+		const MTPStarGiftAuctionUserState &state) {
+	apply(&entry->state.my, state);
+}
+
+void GiftAuctions::apply(
+		not_null<StarGiftAuctionMyState*> entry,
+		const MTPStarGiftAuctionUserState &state) {
+	const auto &data = state.data();
+	entry->to = data.vbid_peer()
+		? _session->data().peer(peerFromMTP(*data.vbid_peer())).get()
+		: nullptr;
+	entry->minBidAmount = data.vmin_bid_amount().value_or(0);
+	entry->bid = data.vbid_amount().value_or(0);
+	entry->date = data.vbid_date().value_or(0);
+	entry->gotCount = data.vacquired_count().v;
+	entry->returned = data.is_returned();
+}
+
+int MyAuctionPosition(const GiftAuctionState &state) {
+	const auto &levels = state.bidLevels;
+	for (auto i = begin(levels), e = end(levels); i != e; ++i) {
+		if (i->amount < state.my.bid
+			|| (i->amount == state.my.bid && i->date >= state.my.date)) {
+			return i->position;
+		}
+	}
+	return (levels.empty() ? 0 : levels.back().position) + 1;
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/gift_auctions.h b/Telegram/SourceFiles/data/components/gift_auctions.h
new file mode 100644
index 00000000000000..5a24f3ab7e9328
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/gift_auctions.h
@@ -0,0 +1,166 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "data/data_star_gift.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Data {
+
+struct GiftAuctionBidLevel {
+	int64 amount = 0;
+	int position = 0;
+	TimeId date = 0;
+};
+
+struct StarGiftAuctionMyState {
+	PeerData *to = nullptr;
+	int64 minBidAmount = 0;
+	int64 bid = 0;
+	TimeId date = 0;
+	int gotCount = 0;
+	bool returned = false;
+};
+
+struct GiftAuctionRound {
+	int number = 0;
+	TimeId duration = 0;
+	int extendTop = 0;
+	TimeId extendDuration = 0;
+};
+
+struct GiftAuctionState {
+	std::optional<StarGift> gift;
+	StarGiftAuctionMyState my;
+	std::vector<GiftAuctionBidLevel> bidLevels;
+	std::vector<not_null<UserData*>> topBidders;
+	std::vector<GiftAuctionRound> roundParameters;
+	crl::time subscribedTill = 0;
+	int64 minBidAmount = 0;
+	int64 averagePrice = 0;
+	TimeId startDate = 0;
+	TimeId endDate = 0;
+	TimeId nextRoundAt = 0;
+	int currentRound = 0;
+	int totalRounds = 0;
+	int giftsLeft = 0;
+	int version = 0;
+
+	[[nodiscard]] bool finished() const {
+		return (averagePrice != 0);
+	}
+};
+
+struct GiftAcquired {
+	not_null<PeerData*> to;
+	TextWithEntities message;
+	TimeId date = 0;
+	int64 bidAmount = 0;
+	int round = 0;
+	int number = 0;
+	int position = 0;
+	bool nameHidden = false;
+};
+
+struct ActiveAuctions {
+	std::vector<not_null<GiftAuctionState*>> list;
+};
+
+class GiftAuctions final {
+public:
+	explicit GiftAuctions(not_null<Main::Session*> session);
+	~GiftAuctions();
+
+	[[nodiscard]] rpl::producer<GiftAuctionState> state(uint64 giftId);
+	void resolveSlug(const QString &slug, Fn<void(uint64)> done);
+
+	void apply(const MTPDupdateStarGiftAuctionState &data);
+	void apply(const MTPDupdateStarGiftAuctionUserState &data);
+
+	void requestAcquired(
+		uint64 giftId,
+		Fn<void(std::vector<Data::GiftAcquired>)> done);
+
+	[[nodiscard]] std::optional<Data::UniqueGiftAttributes> attributes(
+		uint64 giftId) const;
+	void requestAttributes(uint64 giftId, Fn<void()> ready = nullptr);
+
+	[[nodiscard]] rpl::producer<ActiveAuctions> active() const;
+	[[nodiscard]] rpl::producer<bool> hasActiveChanges() const;
+	[[nodiscard]] bool hasActive() const;
+
+private:
+	struct Entry {
+		GiftAuctionState state;
+		rpl::event_stream<> changes;
+		bool requested = false;
+	};
+	struct MyStateKey {
+		int bid = 0;
+		int position = 0;
+		int version = 0;
+
+		explicit operator bool() const {
+			return bid != 0;
+		}
+		friend inline bool operator==(MyStateKey, MyStateKey) = default;
+	};
+	struct Attributes {
+		Data::UniqueGiftAttributes lists;
+		std::vector<Fn<void()>> waiters;
+	};
+	struct SlugRequest {
+		std::vector<Fn<void(uint64)>> callbacks;
+	};
+
+	void request(uint64 giftId);
+	Entry *find(uint64 giftId) const;
+	void applyStateResponse(
+		not_null<Entry*> entry,
+		const MTPpayments_StarGiftAuctionState &result);
+	void apply(
+		not_null<Entry*> entry,
+		const MTPStarGiftAuctionState &state);
+	void apply(
+		not_null<GiftAuctionState*> entry,
+		const MTPStarGiftAuctionState &state);
+	void apply(
+		not_null<Entry*> entry,
+		const MTPStarGiftAuctionUserState &state);
+	void apply(
+		not_null<StarGiftAuctionMyState*> entry,
+		const MTPStarGiftAuctionUserState &state);
+	void checkSubscriptions();
+
+	[[nodiscard]] MyStateKey myStateKey(const GiftAuctionState &state) const;
+	[[nodiscard]] ActiveAuctions collectActive() const;
+	[[nodiscard]] uint64 countActiveHash() const;
+	void requestActive();
+
+	const not_null<Main::Session*> _session;
+
+	base::Timer _timer;
+	base::flat_map<uint64, std::unique_ptr<Entry>> _map;
+	base::flat_map<QString, SlugRequest> _slugRequests;
+	base::flat_map<QString, uint64> _slugToGiftId;
+	base::flat_map<uint64, Attributes> _attributes;
+
+	rpl::event_stream<> _activeChanged;
+	mtpRequestId _activeRequestId = 0;
+
+	rpl::lifetime _lifetime;
+
+};
+
+[[nodiscard]] int MyAuctionPosition(const GiftAuctionState &state);
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/location_pickers.cpp b/Telegram/SourceFiles/data/components/location_pickers.cpp
index 4402e4ccf8a57d..7f15a30da1c7fc 100644
--- a/Telegram/SourceFiles/data/components/location_pickers.cpp
+++ b/Telegram/SourceFiles/data/components/location_pickers.cpp
@@ -25,7 +25,7 @@ Ui::LocationPicker *LocationPickers::lookup(const Api::SendAction &action) {
 	for (auto i = begin(_pickers); i != end(_pickers);) {
 		if (const auto strong = i->picker.get()) {
 			if (i->action == action) {
-				return i->picker.get();
+				return strong;
 			}
 			++i;
 		} else {
@@ -41,4 +41,4 @@ void LocationPickers::emplace(
 	_pickers.push_back({ action, picker });
 }
 
-} // namespace Data
\ No newline at end of file
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/passkeys.cpp b/Telegram/SourceFiles/data/components/passkeys.cpp
new file mode 100644
index 00000000000000..7e9c06912e6b19
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/passkeys.cpp
@@ -0,0 +1,186 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/components/passkeys.h"
+
+#include "apiwrap.h"
+#include "data/data_passkey_deserialize.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "platform/platform_webauthn.h"
+
+namespace Data {
+namespace {
+
+constexpr auto kTimeoutMs = 5000;
+
+[[nodiscard]] PasskeyEntry FromTL(const MTPDpasskey &data) {
+	return PasskeyEntry{
+		.id = qs(data.vid()),
+		.name = qs(data.vname()),
+		.date = data.vdate().v,
+		.softwareEmojiId = data.vsoftware_emoji_id().value_or(0),
+		.lastUsageDate = data.vlast_usage_date().value_or(0),
+	};
+}
+
+} // namespace
+
+Passkeys::Passkeys(not_null<Main::Session*> session)
+: _session(session) {
+}
+
+Passkeys::~Passkeys() = default;
+
+void Passkeys::initRegistration(
+		Fn<void(const Data::Passkey::RegisterData&)> done) {
+	_session->api().request(MTPaccount_InitPasskeyRegistration(
+	)).done([=](const MTPaccount_PasskeyRegistrationOptions &result) {
+		const auto &data = result.data();
+		const auto jsonData = data.voptions().data().vdata().v;
+		if (const auto p = Data::Passkey::DeserializeRegisterData(jsonData)) {
+			done(*p);
+		}
+	}).send();
+}
+
+void Passkeys::registerPasskey(
+		const Platform::WebAuthn::RegisterResult &result,
+		Fn<void()> done) {
+	const auto credentialIdBase64 = QString::fromUtf8(
+		result.credentialId.toBase64(QByteArray::Base64UrlEncoding));
+	_session->api().request(MTPaccount_RegisterPasskey(
+		MTP_inputPasskeyCredentialPublicKey(
+			MTP_string(credentialIdBase64),
+			MTP_string(credentialIdBase64),
+			MTP_inputPasskeyResponseRegister(
+				MTP_dataJSON(MTP_bytes(result.clientDataJSON)),
+				MTP_bytes(result.attestationObject)))
+	)).done([=](const MTPPasskey &result) {
+		_passkeys.emplace_back(FromTL(result.data()));
+		_listUpdated.fire({});
+		done();
+	}).send();
+}
+
+void Passkeys::deletePasskey(
+		const QString &id,
+		Fn<void()> done,
+		Fn<void(QString)> fail) {
+	_session->api().request(MTPaccount_DeletePasskey(
+		MTP_string(id)
+	)).done([=] {
+		_lastRequestTime = 0;
+		_listKnown = false;
+		loadList();
+		done();
+	}).fail([=](const MTP::Error &error) {
+		fail(error.type());
+	}).send();
+}
+
+rpl::producer<> Passkeys::requestList() {
+	if (crl::now() - _lastRequestTime > kTimeoutMs) {
+		if (!_listRequestId) {
+			loadList();
+		}
+		return _listUpdated.events();
+	} else {
+		return _listUpdated.events_starting_with(rpl::empty_value());
+	}
+}
+
+const std::vector<PasskeyEntry> &Passkeys::list() const {
+	return _passkeys;
+}
+
+bool Passkeys::listKnown() const {
+	return _listKnown;
+}
+
+void Passkeys::loadList() {
+	_lastRequestTime = crl::now();
+	_listRequestId = _session->api().request(MTPaccount_GetPasskeys(
+	)).done([=](const MTPaccount_Passkeys &result) {
+		_listRequestId = 0;
+		_listKnown = true;
+		const auto &data = result.data();
+		_passkeys.clear();
+		_passkeys.reserve(data.vpasskeys().v.size());
+		for (const auto &passkey : data.vpasskeys().v) {
+			_passkeys.emplace_back(FromTL(passkey.data()));
+		}
+		_listUpdated.fire({});
+	}).fail([=] {
+		_listRequestId = 0;
+	}).send();
+}
+
+bool Passkeys::canRegister() const {
+	const auto max = _session->appConfig().passkeysAccountPasskeysMax();
+	return Platform::WebAuthn::IsSupported() && _passkeys.size() < max;
+}
+
+bool Passkeys::possible() const {
+	return _session->appConfig().settingsDisplayPasskeys();
+}
+
+void InitPasskeyLogin(
+		MTP::Sender &api,
+		Fn<void(const Data::Passkey::LoginData&)> done) {
+	api.request(MTPauth_InitPasskeyLogin(
+		MTP_int(ApiId),
+		MTP_string(ApiHash)
+	)).done([=](const MTPauth_PasskeyLoginOptions &result) {
+		const auto &data = result.data();
+		if (const auto p = Passkey::DeserializeLoginData(
+				data.voptions().data().vdata().v)) {
+			done(*p);
+		}
+	}).send();
+}
+
+void FinishPasskeyLogin(
+		MTP::Sender &api,
+		int initialDc,
+		const Platform::WebAuthn::LoginResult &result,
+		Fn<void(const MTPauth_Authorization&)> done,
+		Fn<void(QString)> fail) {
+	const auto userHandleStr = QString::fromUtf8(result.userHandle);
+	const auto parts = userHandleStr.split(':');
+	if (parts.size() != 2) {
+		return;
+	}
+	const auto userDc = parts[0].toInt();
+	const auto credentialIdBase64 = result.credentialId.toBase64(
+		QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
+	const auto credential = MTP_inputPasskeyCredentialPublicKey(
+		MTP_string(credentialIdBase64.toStdString()),
+		MTP_string(credentialIdBase64.toStdString()),
+		MTP_inputPasskeyResponseLogin(
+			MTP_dataJSON(MTP_bytes(result.clientDataJSON)),
+			MTP_bytes(result.authenticatorData),
+			MTP_bytes(result.signature),
+			MTP_string(userHandleStr.toStdString())
+		)
+	);
+	const auto flags = (userDc != initialDc)
+		? MTPauth_finishPasskeyLogin::Flag::f_from_dc_id
+		: MTPauth_finishPasskeyLogin::Flags(0);
+	api.request(MTPauth_FinishPasskeyLogin(
+		MTP_flags(flags),
+		credential,
+		MTP_int(initialDc),
+		MTP_long(0)
+	)).toDC(
+		userDc
+	).done(done).fail([=](const MTP::Error &error) {
+		fail(error.type());
+	}).send();
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/passkeys.h b/Telegram/SourceFiles/data/components/passkeys.h
new file mode 100644
index 00000000000000..12f216510123c0
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/passkeys.h
@@ -0,0 +1,79 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data::Passkey {
+struct RegisterData;
+struct LoginData;
+} // namespace Data::Passkey
+namespace Platform::WebAuthn {
+struct RegisterResult;
+struct LoginResult;
+} // namespace Platform::WebAuthn
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace MTP {
+class Sender;
+} // namespace MTP
+
+namespace Data {
+
+struct PasskeyEntry {
+	QString id;
+	QString name;
+	TimeId date = 0;
+	DocumentId softwareEmojiId = 0;
+	TimeId lastUsageDate = 0;
+};
+
+class Passkeys final {
+public:
+	explicit Passkeys(not_null<Main::Session*> session);
+	~Passkeys();
+
+	void initRegistration(Fn<void(const Data::Passkey::RegisterData&)> done);
+	void registerPasskey(
+		const Platform::WebAuthn::RegisterResult &result,
+		Fn<void()> done);
+	void deletePasskey(
+		const QString &id,
+		Fn<void()> done,
+		Fn<void(QString)> fail);
+	[[nodiscard]] rpl::producer<> requestList();
+	[[nodiscard]] const std::vector<PasskeyEntry> &list() const;
+	[[nodiscard]] bool listKnown() const;
+	[[nodiscard]] bool canRegister() const;
+	[[nodiscard]] bool possible() const;
+
+private:
+	void loadList();
+
+	const not_null<Main::Session*> _session;
+	std::vector<PasskeyEntry> _passkeys;
+	rpl::event_stream<> _listUpdated;
+	crl::time _lastRequestTime = 0;
+	mtpRequestId _listRequestId = 0;
+	bool _listKnown = false;
+
+};
+
+void InitPasskeyLogin(
+	MTP::Sender &api,
+	Fn<void(const Data::Passkey::LoginData&)> done);
+
+void FinishPasskeyLogin(
+	MTP::Sender &api,
+	int initialDc,
+	const Platform::WebAuthn::LoginResult &result,
+	Fn<void(const MTPauth_Authorization&)> done,
+	Fn<void(QString)> fail);
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/promo_suggestions.cpp b/Telegram/SourceFiles/data/components/promo_suggestions.cpp
new file mode 100644
index 00000000000000..6a0e5bc608dc21
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/promo_suggestions.cpp
@@ -0,0 +1,369 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/components/promo_suggestions.h"
+
+#include "api/api_text_entities.h"
+#include "apiwrap.h"
+#include "base/unixtime.h"
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "data/data_changes.h"
+#include "data/data_histories.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "history/history.h"
+#include "main/main_session.h"
+#include "main/main_session_settings.h"
+
+namespace Data {
+namespace {
+
+using UserIds = std::vector<UserId>;
+
+constexpr auto kTopPromotionInterval = TimeId(60 * 60);
+constexpr auto kTopPromotionMinDelay = TimeId(10);
+
+[[nodiscard]] CustomSuggestion CustomFromTL(
+		not_null<Main::Session*> session,
+		const MTPPendingSuggestion &r) {
+	return CustomSuggestion({
+		.suggestion = qs(r.data().vsuggestion()),
+		.title = Api::ParseTextWithEntities(session, r.data().vtitle()),
+		.description = Api::ParseTextWithEntities(
+			session,
+			r.data().vdescription()),
+		.url = qs(r.data().vurl()),
+	});
+}
+
+} // namespace
+
+PromoSuggestions::PromoSuggestions(
+	not_null<Main::Session*> session,
+	Fn<void()> firstPromoLoaded)
+: _session(session)
+, _topPromotionTimer([=] { refreshTopPromotion(); })
+, _firstPromoLoaded(std::move(firstPromoLoaded)) {
+	Core::App().settings().proxy().connectionTypeValue(
+	) | rpl::on_next([=] {
+		refreshTopPromotion();
+	}, _lifetime);
+}
+
+PromoSuggestions::~PromoSuggestions() = default;
+
+void PromoSuggestions::refreshTopPromotion() {
+	if (_contactBirthdaysLastDayRequest != -1
+		&& _contactBirthdaysLastDayRequest != QDate::currentDate().day()) {
+		_refreshed.fire({});
+	}
+
+	const auto now = base::unixtime::now();
+	const auto next = (_topPromotionNextRequestTime != 0)
+		? _topPromotionNextRequestTime
+		: now;
+	if (_topPromotionRequestId) {
+		topPromotionDelayed(now, next);
+		return;
+	}
+	const auto key = [&]() -> std::pair<QString, uint32> {
+		if (!Core::App().settings().proxy().isEnabled()) {
+			return {};
+		}
+		const auto &proxy = Core::App().settings().proxy().selected();
+		if (proxy.type != MTP::ProxyData::Type::Mtproto) {
+			return {};
+		}
+		return { proxy.host, proxy.port };
+	}();
+	if (_topPromotionKey == key && now < next) {
+		topPromotionDelayed(now, next);
+		return;
+	}
+	_topPromotionKey = key;
+	_topPromotionRequestId = _session->api().request(MTPhelp_GetPromoData(
+	)).done([=](const MTPhelp_PromoData &result) {
+		_topPromotionRequestId = 0;
+
+		_topPromotionNextRequestTime = result.match([&](const auto &data) {
+			return data.vexpires().v;
+		});
+		topPromotionDelayed(
+			base::unixtime::now(),
+			_topPromotionNextRequestTime);
+
+		result.match([&](const MTPDhelp_promoDataEmpty &data) {
+			setTopPromoted(nullptr, QString(), QString());
+		}, [&](const MTPDhelp_promoData &data) {
+			_session->data().processChats(data.vchats());
+			_session->data().processUsers(data.vusers());
+
+			auto changedPendingSuggestions = false;
+			auto pendingSuggestions = ranges::views::all(
+				data.vpending_suggestions().v
+			) | ranges::views::transform([](const auto &suggestion) {
+				return qs(suggestion);
+			}) | ranges::to_vector;
+			for (const auto &suggestion : pendingSuggestions) {
+				if (suggestion == u"SETUP_LOGIN_EMAIL_NOSKIP"_q) {
+					_setupEmailState = SetupEmailState::SetupNoSkip;
+					break;
+				}
+				if (suggestion == u"SETUP_LOGIN_EMAIL"_q) {
+					_setupEmailState = SetupEmailState::Setup;
+					break;
+				}
+			}
+			if (!ranges::equal(_pendingSuggestions, pendingSuggestions)) {
+				_pendingSuggestions = std::move(pendingSuggestions);
+				changedPendingSuggestions = true;
+			}
+
+			auto changedDismissedSuggestions = false;
+			for (const auto &suggestion : data.vdismissed_suggestions().v) {
+				changedDismissedSuggestions
+					|= _dismissedSuggestions.emplace(qs(suggestion)).second;
+			}
+
+			if (const auto peer = data.vpeer()) {
+				const auto peerId = peerFromMTP(*peer);
+				const auto history = _session->data().history(peerId);
+				setTopPromoted(
+					history,
+					data.vpsa_type().value_or_empty(),
+					data.vpsa_message().value_or_empty());
+			} else {
+				setTopPromoted(nullptr, QString(), QString());
+			}
+
+			auto changedCustom = false;
+			auto custom = data.vcustom_pending_suggestion()
+				? std::make_optional(
+					CustomFromTL(
+						_session,
+						*data.vcustom_pending_suggestion()))
+				: std::nullopt;
+			if (_custom != custom) {
+				_custom = std::move(custom);
+				changedCustom = true;
+			}
+
+			const auto changedContactBirthdaysLastDayRequest =
+				_contactBirthdaysLastDayRequest != -1
+					&& _contactBirthdaysLastDayRequest
+						!= QDate::currentDate().day();
+
+			if (changedPendingSuggestions
+				|| changedDismissedSuggestions
+				|| changedCustom
+				|| changedContactBirthdaysLastDayRequest) {
+				_refreshed.fire({});
+			}
+		});
+		if (_firstPromoLoaded) {
+			base::take(_firstPromoLoaded)();
+		}
+	}).fail([=] {
+		_topPromotionRequestId = 0;
+		const auto now = base::unixtime::now();
+		const auto next = _topPromotionNextRequestTime = now
+			+ kTopPromotionInterval;
+		if (!_topPromotionTimer.isActive()) {
+			topPromotionDelayed(now, next);
+		}
+	}).send();
+}
+
+void PromoSuggestions::topPromotionDelayed(TimeId now, TimeId next) {
+	_topPromotionTimer.callOnce(std::min(
+		std::max(next - now, kTopPromotionMinDelay),
+		kTopPromotionInterval) * crl::time(1000));
+};
+
+rpl::producer<> PromoSuggestions::value() const {
+	return _refreshed.events_starting_with({});
+}
+
+void PromoSuggestions::setTopPromoted(
+		History *promoted,
+		const QString &type,
+		const QString &message) {
+	const auto changed = (_topPromoted != promoted);
+	if (!changed
+		&& (!promoted || promoted->topPromotionMessage() == message)) {
+		return;
+	}
+	if (changed) {
+		if (_topPromoted) {
+			_topPromoted->cacheTopPromotion(false, QString(), QString());
+		}
+	}
+	const auto old = std::exchange(_topPromoted, promoted);
+	if (_topPromoted) {
+		_session->data().histories().requestDialogEntry(_topPromoted);
+		_topPromoted->cacheTopPromotion(true, type, message);
+		_topPromoted->requestChatListMessage();
+		_session->changes().historyUpdated(
+			_topPromoted,
+			HistoryUpdate::Flag::TopPromoted);
+	}
+	if (changed && old) {
+		_session->changes().historyUpdated(
+			old,
+			HistoryUpdate::Flag::TopPromoted);
+	}
+}
+
+bool PromoSuggestions::current(const QString &key) const {
+	if (key == u"BIRTHDAY_CONTACTS_TODAY"_q) {
+		if (_dismissedSuggestions.contains(key)) {
+			return false;
+		} else {
+			const auto known
+				= PromoSuggestions::knownBirthdaysToday();
+			if (!known) {
+				return true;
+			}
+			return !known->empty();
+		}
+	}
+	return !_dismissedSuggestions.contains(key)
+		&& ranges::contains(_pendingSuggestions, key);
+}
+
+rpl::producer<> PromoSuggestions::requested(const QString &key) const {
+	return value() | rpl::filter([=] { return current(key); });
+}
+
+void PromoSuggestions::dismiss(const QString &key) {
+	if (!_dismissedSuggestions.emplace(key).second) {
+		return;
+	}
+	_session->api().request(MTPhelp_DismissSuggestion(
+		MTP_inputPeerEmpty(),
+		MTP_string(key)
+	)).send();
+}
+
+void PromoSuggestions::dismissSetupEmail(Fn<void()> done) {
+	auto key = QString();
+	if (_setupEmailState == SetupEmailState::SettingUp) {
+		key = u"SETUP_LOGIN_EMAIL"_q;
+	} else if (_setupEmailState == SetupEmailState::SettingUpNoSkip) {
+		key = u"SETUP_LOGIN_EMAIL_NOSKIP"_q;
+	} else {
+		return;
+	}
+	_session->api().request(MTPhelp_DismissSuggestion(
+		MTP_inputPeerEmpty(),
+		MTP_string(key)
+	)).done([=](const MTPBool &) {
+		_setupEmailState = SetupEmailState::None;
+		done();
+	}).send();
+}
+
+void PromoSuggestions::invalidate() {
+	if (_topPromotionRequestId) {
+		_session->api().request(_topPromotionRequestId).cancel();
+	}
+	_topPromotionNextRequestTime = 0;
+	_topPromotionTimer.callOnce(crl::time(200));
+}
+
+std::optional<CustomSuggestion> PromoSuggestions::custom() const {
+	return (_custom && !_dismissedSuggestions.contains(_custom->suggestion))
+		? _custom
+		: std::nullopt;
+}
+
+void PromoSuggestions::requestContactBirthdays(Fn<void()> done, bool force) {
+	if ((_contactBirthdaysLastDayRequest != -1)
+		&& (_contactBirthdaysLastDayRequest == QDate::currentDate().day())
+		&& !force) {
+		return done();
+	}
+	if (_contactBirthdaysRequestId) {
+		_session->api().request(_contactBirthdaysRequestId).cancel();
+	}
+	_contactBirthdaysRequestId = _session->api().request(
+		MTPcontacts_GetBirthdays()
+	).done([=](const MTPcontacts_ContactBirthdays &result) {
+		_contactBirthdaysRequestId = 0;
+		_contactBirthdaysLastDayRequest = QDate::currentDate().day();
+		auto users = UserIds();
+		auto today = UserIds();
+		_session->data().processUsers(result.data().vusers());
+		for (const auto &tlContact : result.data().vcontacts().v) {
+			const auto peerId = tlContact.data().vcontact_id().v;
+			if (const auto user = _session->data().user(peerId)) {
+				const auto &data = tlContact.data().vbirthday().data();
+				user->setBirthday(Data::Birthday(
+					data.vday().v,
+					data.vmonth().v,
+					data.vyear().value_or_empty()));
+				if (user->isSelf()
+					|| user->isInaccessible()
+					|| user->isBlocked()) {
+					continue;
+				}
+				if (Data::IsBirthdayToday(user->birthday())) {
+					today.push_back(peerToUser(user->id));
+				}
+				users.push_back(peerToUser(user->id));
+			}
+		}
+		_contactBirthdays = std::move(users);
+		_contactBirthdaysToday = std::move(today);
+		done();
+	}).fail([=](const MTP::Error &error) {
+		_contactBirthdaysRequestId = 0;
+		_contactBirthdaysLastDayRequest = QDate::currentDate().day();
+		_contactBirthdays = {};
+		_contactBirthdaysToday = {};
+		done();
+	}).send();
+}
+
+std::optional<UserIds> PromoSuggestions::knownContactBirthdays() const {
+	if ((_contactBirthdaysLastDayRequest == -1)
+		|| (_contactBirthdaysLastDayRequest != QDate::currentDate().day())) {
+		return std::nullopt;
+	}
+	return _contactBirthdays;
+}
+
+std::optional<UserIds> PromoSuggestions::knownBirthdaysToday() const {
+	if ((_contactBirthdaysLastDayRequest == -1)
+		|| (_contactBirthdaysLastDayRequest != QDate::currentDate().day())) {
+		return std::nullopt;
+	}
+	return _contactBirthdaysToday;
+}
+
+QString PromoSuggestions::SugValidatePassword() {
+	static const auto key = u"VALIDATE_PASSWORD"_q;
+	return key;
+}
+
+void PromoSuggestions::setSetupEmailState(SetupEmailState state) {
+	if (_setupEmailState != state) {
+		_setupEmailState = state;
+		_setupEmailStateChanges.fire_copy(state);
+	}
+}
+
+SetupEmailState PromoSuggestions::setupEmailState() const {
+	return _setupEmailState;
+}
+
+rpl::producer<SetupEmailState> PromoSuggestions::setupEmailStateValue() const {
+	return _setupEmailStateChanges.events_starting_with_copy(_setupEmailState);
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/promo_suggestions.h b/Telegram/SourceFiles/data/components/promo_suggestions.h
new file mode 100644
index 00000000000000..1052c83c3ab9be
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/promo_suggestions.h
@@ -0,0 +1,107 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+
+class History;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Data {
+
+enum class SetupEmailState {
+	None,
+	Setup,
+	SetupNoSkip,
+	SettingUp,
+	SettingUpNoSkip,
+};
+
+struct CustomSuggestion final {
+	QString suggestion;
+	TextWithEntities title;
+	TextWithEntities description;
+	QString url;
+
+	friend inline auto operator<=>(
+		const CustomSuggestion &,
+		const CustomSuggestion &) = default;
+};
+
+class PromoSuggestions final {
+public:
+	explicit PromoSuggestions(
+		not_null<Main::Session*> session,
+		Fn<void()> firstPromoLoaded = nullptr);
+	~PromoSuggestions();
+
+	[[nodiscard]] bool current(const QString &key) const;
+	[[nodiscard]] std::optional<CustomSuggestion> custom() const;
+	[[nodiscard]] rpl::producer<> requested(const QString &key) const;
+	void dismiss(const QString &key);
+	void dismissSetupEmail(Fn<void()> done);
+
+	void refreshTopPromotion();
+
+	void invalidate();
+
+	rpl::producer<> value() const;
+	// Create rpl::producer<> refreshed() const; on memand.
+
+	void requestContactBirthdays(Fn<void()> done, bool force = false);
+	[[nodiscard]] auto knownContactBirthdays() const
+		-> std::optional<std::vector<UserId>>;
+	[[nodiscard]] auto knownBirthdaysToday() const
+		-> std::optional<std::vector<UserId>>;
+
+	[[nodiscard]] static QString SugValidatePassword();
+
+	void setSetupEmailState(SetupEmailState state);
+	[[nodiscard]] SetupEmailState setupEmailState() const;
+	[[nodiscard]] rpl::producer<SetupEmailState> setupEmailStateValue() const;
+
+private:
+	void setTopPromoted(
+		History *promoted,
+		const QString &type,
+		const QString &message);
+
+	void topPromotionDelayed(TimeId now, TimeId next);
+
+	const not_null<Main::Session*> _session;
+	base::flat_set<QString> _dismissedSuggestions;
+	std::vector<QString> _pendingSuggestions;
+	std::optional<CustomSuggestion> _custom;
+
+	History *_topPromoted = nullptr;
+
+	mtpRequestId _contactBirthdaysRequestId = 0;
+	int _contactBirthdaysLastDayRequest = -1;
+	std::vector<UserId> _contactBirthdays;
+	std::vector<UserId> _contactBirthdaysToday;
+
+	mtpRequestId _topPromotionRequestId = 0;
+	std::pair<QString, uint32> _topPromotionKey;
+	TimeId _topPromotionNextRequestTime = TimeId(0);
+	base::Timer _topPromotionTimer;
+
+	SetupEmailState _setupEmailState = SetupEmailState::None;
+
+	rpl::event_stream<> _refreshed;
+	rpl::event_stream<SetupEmailState> _setupEmailStateChanges;
+
+	Fn<void()> _firstPromoLoaded;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/recent_inline_bots.cpp b/Telegram/SourceFiles/data/components/recent_inline_bots.cpp
new file mode 100644
index 00000000000000..fcbe0f1734c7b8
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/recent_inline_bots.cpp
@@ -0,0 +1,69 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/components/recent_inline_bots.h"
+
+#include "config.h"
+#include "data/data_user.h"
+#include "main/main_session.h"
+#include "storage/storage_account.h"
+
+namespace Data {
+namespace {
+
+constexpr auto kLimit = 10;
+
+} // namespace
+
+RecentInlineBots::RecentInlineBots(not_null<Main::Session*> session)
+: _session(session) {
+}
+
+const std::vector<not_null<UserData*>> &RecentInlineBots::list() const {
+	_session->local().readRecentHashtagsAndBots();
+	return _list;
+}
+
+rpl::producer<> RecentInlineBots::updates() const {
+	return _updates.events();
+}
+
+void RecentInlineBots::bump(not_null<UserData*> user) {
+	_session->local().readRecentHashtagsAndBots();
+
+	if (!_list.empty() && _list.front() == user) {
+		return;
+	}
+	auto i = ranges::find(_list, user);
+	if (i == end(_list)) {
+		if (int(_list.size()) >= kLimit) {
+			_list.pop_back();
+		}
+		_list.insert(begin(_list), user);
+	} else {
+		ranges::rotate(begin(_list), i, i + 1);
+	}
+	_updates.fire({});
+
+	_session->local().writeRecentHashtagsAndBots();
+}
+
+void RecentInlineBots::remove(not_null<UserData*> user) {
+	const auto i = ranges::find(_list, user);
+	if (i != end(_list)) {
+		_list.erase(i);
+		_updates.fire({});
+		_session->local().writeRecentHashtagsAndBots();
+	}
+}
+
+void RecentInlineBots::applyLocal(
+		std::vector<not_null<UserData*>> list) {
+	_list = std::move(list);
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/recent_inline_bots.h b/Telegram/SourceFiles/data/components/recent_inline_bots.h
new file mode 100644
index 00000000000000..739512c0c1dd19
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/recent_inline_bots.h
@@ -0,0 +1,36 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class UserData;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Data {
+
+class RecentInlineBots final {
+public:
+	explicit RecentInlineBots(not_null<Main::Session*> session);
+
+	[[nodiscard]] const std::vector<not_null<UserData*>> &list() const;
+	[[nodiscard]] rpl::producer<> updates() const;
+
+	void bump(not_null<UserData*> user);
+	void remove(not_null<UserData*> user);
+	void applyLocal(std::vector<not_null<UserData*>> list);
+
+private:
+	const not_null<Main::Session*> _session;
+	std::vector<not_null<UserData*>> _list;
+	rpl::event_stream<> _updates;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/recent_peers.cpp b/Telegram/SourceFiles/data/components/recent_peers.cpp
index 58fb7dfcc6db53..47749ad2f052bc 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.cpp
+++ b/Telegram/SourceFiles/data/components/recent_peers.cpp
@@ -7,6 +7,10 @@ For license and copyright information please follow this link:
 */
 #include "data/components/recent_peers.h"
 
+#include "core/version.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "history/history.h"
 #include "main/main_session.h"
 #include "storage/serialize_common.h"
 #include "storage/serialize_peer.h"
@@ -16,6 +20,7 @@ namespace Data {
 namespace {
 
 constexpr auto kLimit = 48;
+constexpr auto kMaxRememberedOpenChats = 32;
 
 } // namespace
 
@@ -85,7 +90,7 @@ QByteArray RecentPeers::serialize() const {
 	auto stream = Serialize::ByteArrayWriter(size);
 	stream
 		<< quint32(AppVersion)
-		<< quint32(_list.size());
+		<< quint32(count);
 	for (const auto &peer : list) {
 		Serialize::writePeer(stream, peer);
 	}
@@ -112,6 +117,7 @@ void RecentPeers::applyLocal(QByteArray serialized) {
 		).arg(streamAppVersion));
 	_list.reserve(count);
 	for (auto i = 0; i != int(count); ++i) {
+		const auto streamPosition = stream.underlying().device()->pos();
 		const auto peer = Serialize::readPeer(
 			_session,
 			streamAppVersion,
@@ -123,7 +129,8 @@ void RecentPeers::applyLocal(QByteArray serialized) {
 			DEBUG_LOG(("Suggestions: Failed RecentPeers reading %1 / %2."
 				).arg(i + 1
 				).arg(count));
-			_list.clear();
+			DEBUG_LOG(("Failed bytes: %1.").arg(
+				QString::fromUtf8(serialized.mid(streamPosition).toHex())));
 			return;
 		}
 	}
@@ -131,4 +138,30 @@ void RecentPeers::applyLocal(QByteArray serialized) {
 		("Suggestions: RecentPeers read OK, count: %1").arg(_list.size()));
 }
 
+std::vector<not_null<Thread*>> RecentPeers::collectChatOpenHistory() const {
+	_session->local().readSearchSuggestions();
+	return _opens;
+}
+
+void RecentPeers::chatOpenPush(not_null<Thread*> thread) {
+	const auto i = ranges::find(_opens, thread);
+	if (i == end(_opens)) {
+		while (_opens.size() >= kMaxRememberedOpenChats) {
+			_opens.pop_back();
+		}
+		_opens.insert(begin(_opens), thread);
+	} else if (i != begin(_opens)) {
+		ranges::rotate(begin(_opens), i, i + 1);
+	}
+}
+
+void RecentPeers::chatOpenRemove(not_null<Thread*> thread) {
+	_opens.erase(ranges::remove(_opens, thread), end(_opens));
+}
+
+void RecentPeers::chatOpenKeepUserpics(
+		base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> userpics) {
+	_chatOpenUserpicsCache = std::move(userpics);
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/components/recent_peers.h b/Telegram/SourceFiles/data/components/recent_peers.h
index e30942720e8bde..9b2ad907b6a40a 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.h
+++ b/Telegram/SourceFiles/data/components/recent_peers.h
@@ -7,12 +7,16 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "ui/userpic_view.h"
+
 namespace Main {
 class Session;
 } // namespace Main
 
 namespace Data {
 
+class Thread;
+
 class RecentPeers final {
 public:
 	explicit RecentPeers(not_null<Main::Session*> session);
@@ -28,10 +32,22 @@ class RecentPeers final {
 	[[nodiscard]] QByteArray serialize() const;
 	void applyLocal(QByteArray serialized);
 
+	[[nodiscard]] auto collectChatOpenHistory() const
+		-> std::vector<not_null<Thread*>>;
+	void chatOpenPush(not_null<Thread*> thread);
+	void chatOpenRemove(not_null<Thread*> thread);
+	void chatOpenKeepUserpics(
+		base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> userpics);
+
 private:
 	const not_null<Main::Session*> _session;
 
 	std::vector<not_null<PeerData*>> _list;
+	std::vector<not_null<Thread*>> _opens;
+	base::flat_map<
+		not_null<PeerData*>,
+		Ui::PeerUserpicView> _chatOpenUserpicsCache;
+
 	rpl::event_stream<> _updates;
 
 };
diff --git a/Telegram/SourceFiles/data/components/recent_shared_media_gifts.cpp b/Telegram/SourceFiles/data/components/recent_shared_media_gifts.cpp
new file mode 100644
index 00000000000000..2cafa5daced65e
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/recent_shared_media_gifts.cpp
@@ -0,0 +1,271 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/components/recent_shared_media_gifts.h"
+
+#include "api/api_credits.h" // InputSavedStarGiftId
+#include "api/api_premium.h"
+#include "apiwrap.h"
+#include "boxes/star_gift_box.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "data/data_document.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+
+namespace Data {
+namespace {
+
+constexpr auto kReloadThreshold = 60 * crl::time(1000);
+constexpr auto kMaxGifts = 3;
+constexpr auto kMaxPinnedGifts = 6;
+
+} // namespace
+
+RecentSharedMediaGifts::RecentSharedMediaGifts(
+	not_null<Main::Session*> session)
+: _session(session) {
+}
+
+RecentSharedMediaGifts::~RecentSharedMediaGifts() = default;
+
+std::vector<Data::SavedStarGift> RecentSharedMediaGifts::filterGifts(
+		const std::deque<Data::SavedStarGift> &gifts,
+		bool onlyPinnedToTop) {
+	auto result = std::vector<Data::SavedStarGift>();
+	const auto maxCount = onlyPinnedToTop ? kMaxPinnedGifts : kMaxGifts;
+	for (const auto &gift : gifts) {
+		if (!onlyPinnedToTop || gift.pinned) {
+			result.push_back(gift);
+			if (result.size() >= maxCount) {
+				break;
+			}
+		}
+	}
+	return result;
+}
+
+void RecentSharedMediaGifts::request(
+		not_null<PeerData*> peer,
+		Fn<void(std::vector<SavedStarGift>)> done,
+		bool onlyPinnedToTop) {
+	const auto it = _recent.find(peer->id);
+	if (it != _recent.end()) {
+		auto &entry = it->second;
+		if (entry.lastRequestTime
+			&& entry.lastRequestTime + kReloadThreshold > crl::now()) {
+			done(filterGifts(entry.gifts, onlyPinnedToTop));
+			return;
+		}
+		if (entry.requestId) {
+			entry.pendingCallbacks.push_back([=] {
+				const auto it = _recent.find(peer->id);
+				if (it != _recent.end()) {
+					done(filterGifts(it->second.gifts, onlyPinnedToTop));
+				}
+			});
+			return;
+		}
+	}
+
+	_recent[peer->id].requestId = peer->session().api().request(
+		MTPpayments_GetSavedStarGifts(
+			MTP_flags(0),
+			peer->input(),
+			MTP_int(0), // collection_id
+			MTP_string(QString()),
+			MTP_int(kMaxPinnedGifts)
+	)).done([=](const MTPpayments_SavedStarGifts &result) {
+		const auto &data = result.data();
+		const auto owner = &peer->owner();
+		owner->processUsers(data.vusers());
+		owner->processChats(data.vchats());
+		auto &entry = _recent[peer->id];
+		entry.lastRequestTime = crl::now();
+		entry.requestId = 0;
+		entry.gifts.clear();
+
+		for (const auto &gift : data.vgifts().v) {
+			if (auto parsed = Api::FromTL(peer, gift)) {
+				entry.gifts.push_back(std::move(*parsed));
+			}
+		}
+
+		done(filterGifts(entry.gifts, onlyPinnedToTop));
+		for (const auto &callback : entry.pendingCallbacks) {
+			callback();
+		}
+		entry.pendingCallbacks.clear();
+	}).send();
+}
+
+void RecentSharedMediaGifts::clearLastRequestTime(
+		not_null<PeerData*> peer) {
+	const auto it = _recent.find(peer->id);
+	if (it != _recent.end()) {
+		it->second.lastRequestTime = 0;
+	}
+}
+
+void RecentSharedMediaGifts::updatePinnedOrder(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer,
+		const std::vector<SavedStarGift> &gifts,
+		const std::vector<Data::SavedStarGiftId> &manageIds,
+		Fn<void()> done) {
+	auto inputs = QVector<MTPInputSavedStarGift>();
+	inputs.reserve(manageIds.size());
+	for (const auto &id : manageIds) {
+		inputs.push_back(Api::InputSavedStarGiftId(id));
+	}
+
+	_session->api().request(MTPpayments_ToggleStarGiftsPinnedToTop(
+		peer->input(),
+		MTP_vector<MTPInputSavedStarGift>(std::move(inputs))
+	)).done([=] {
+		auto result = std::deque<SavedStarGift>();
+		for (const auto &id : manageIds) {
+			for (const auto &gift : gifts) {
+				if (gift.manageId == id) {
+					result.push_back(gift);
+					break;
+				}
+			}
+		}
+		_recent[peer->id].gifts = std::move(result);
+		if (done) {
+			done();
+		}
+	}).fail([=](const MTP::Error &error) {
+		if (!Ui::ShowGiftErrorToast(show, error)) {
+			show->showToast(error.type());
+		}
+	}).send();
+}
+
+void RecentSharedMediaGifts::togglePinned(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer,
+		const Data::SavedStarGiftId &manageId,
+		bool pinned,
+		std::shared_ptr<Data::UniqueGift> uniqueData,
+		std::shared_ptr<Data::UniqueGift> replacingData) {
+	const auto performToggle = [=](const std::vector<SavedStarGift> &gifts) {
+		const auto limit = _session->appConfig().pinnedGiftsLimit();
+		auto manageIds = std::vector<Data::SavedStarGiftId>();
+
+		if (pinned) {
+			for (const auto &gift : gifts) {
+				if (gift.pinned && gift.manageId != manageId) {
+					manageIds.push_back(gift.manageId);
+					if (manageIds.size() >= limit - 1) {
+						break;
+					}
+				}
+			}
+			manageIds.push_back(manageId);
+		} else {
+			for (const auto &gift : gifts) {
+				if (gift.pinned && gift.manageId != manageId) {
+					manageIds.push_back(gift.manageId);
+				}
+			}
+		}
+
+		const auto updateLocal = [=] {
+				using GiftAction = Data::GiftUpdate::Action;
+				_session->data().notifyGiftUpdate({
+					.id = manageId,
+					.action = (pinned ? GiftAction::Pin : GiftAction::Unpin),
+				});
+				if (pinned) {
+					show->showToast({
+						.title = (uniqueData
+							? tr::lng_gift_pinned_done_title(
+								tr::now,
+								lt_gift,
+								Data::UniqueGiftName(*uniqueData))
+							: QString()),
+						.text = (replacingData
+							? tr::lng_gift_pinned_done_replaced(
+								tr::now,
+								lt_gift,
+								TextWithEntities{
+									Data::UniqueGiftName(*replacingData),
+								},
+								tr::marked)
+							: tr::lng_gift_pinned_done(
+								tr::now,
+								tr::marked)),
+						.duration = Ui::Toast::kDefaultDuration * 2,
+					});
+				}
+			};
+
+			if (!pinned) {
+				updatePinnedOrder(show, peer, gifts, manageIds, updateLocal);
+			} else {
+				_session->api().request(MTPpayments_GetSavedStarGift(
+					MTP_vector<MTPInputSavedStarGift>(
+						1,
+						Api::InputSavedStarGiftId(manageId))
+				)).done([=](const MTPpayments_SavedStarGifts &result) {
+					const auto &tlGift = result.data().vgifts().v.front();
+					if (auto parsed = Api::FromTL(peer, tlGift)) {
+						auto updatedGifts = std::vector<SavedStarGift>();
+						for (const auto &gift : gifts) {
+							if (gift.pinned && gift.manageId != manageId) {
+								updatedGifts.push_back(gift);
+							}
+						}
+						parsed->pinned = true;
+						updatedGifts.push_back(*parsed);
+						updatePinnedOrder(
+							show,
+							peer,
+							updatedGifts,
+							manageIds,
+							updateLocal);
+					}
+				}).send();
+			}
+	};
+
+	request(peer, performToggle, true);
+}
+
+void RecentSharedMediaGifts::reorderPinned(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer,
+		int oldPosition,
+		int newPosition) {
+	const auto performReorder = [=](const std::vector<SavedStarGift> &gifts) {
+		if (oldPosition < 0 || oldPosition >= gifts.size()
+			|| newPosition < 0 || newPosition >= gifts.size()
+			|| oldPosition == newPosition) {
+			return;
+		}
+
+		auto manageIds = std::vector<Data::SavedStarGiftId>();
+		manageIds.reserve(gifts.size());
+		for (const auto &gift : gifts) {
+			manageIds.push_back(gift.manageId);
+		}
+		base::reorder(manageIds, oldPosition, newPosition);
+
+		updatePinnedOrder(show, peer, gifts, manageIds, nullptr);
+	};
+
+	request(peer, performReorder, true);
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/recent_shared_media_gifts.h b/Telegram/SourceFiles/data/components/recent_shared_media_gifts.h
new file mode 100644
index 00000000000000..33da57140c9735
--- /dev/null
+++ b/Telegram/SourceFiles/data/components/recent_shared_media_gifts.h
@@ -0,0 +1,73 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "data/data_star_gift.h"
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Data {
+
+class RecentSharedMediaGifts final {
+public:
+	explicit RecentSharedMediaGifts(not_null<Main::Session*> session);
+	~RecentSharedMediaGifts();
+
+	void request(
+		not_null<PeerData*> peer,
+		Fn<void(std::vector<Data::SavedStarGift>)> done,
+		bool onlyPinnedToTop = false);
+
+	void clearLastRequestTime(not_null<PeerData*> peer);
+
+	void togglePinned(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer,
+		const Data::SavedStarGiftId &manageId,
+		bool pinned,
+		std::shared_ptr<Data::UniqueGift> uniqueData,
+		std::shared_ptr<Data::UniqueGift> replacingData = nullptr);
+
+	void reorderPinned(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer,
+		int oldPosition,
+		int newPosition);
+
+private:
+	void updatePinnedOrder(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer,
+		const std::vector<SavedStarGift> &gifts,
+		const std::vector<Data::SavedStarGiftId> &manageIds,
+		Fn<void()> done);
+
+	[[nodiscard]] std::vector<Data::SavedStarGift> filterGifts(
+		const std::deque<SavedStarGift> &gifts,
+		bool onlyPinnedToTop);
+
+	struct Entry {
+		std::deque<SavedStarGift> gifts;
+		crl::time lastRequestTime = 0;
+		mtpRequestId requestId = 0;
+		std::vector<Fn<void()>> pendingCallbacks;
+	};
+
+	const not_null<Main::Session*> _session;
+
+	base::flat_map<PeerId, Entry> _recent;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/components/scheduled_messages.cpp b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
index 9e69dd35b75fc8..3540af2059b81e 100644
--- a/Telegram/SourceFiles/data/components/scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/components/scheduled_messages.cpp
@@ -59,9 +59,11 @@ constexpr auto kRequestTimeLimit = 60 * crl::time(1000);
 			data.vid(),
 			data.vfrom_id() ? *data.vfrom_id() : MTPPeer(),
 			data.vpeer_id(),
+			data.vsaved_peer_id() ? *data.vsaved_peer_id() : MTPPeer(),
 			data.vreply_to() ? *data.vreply_to() : MTPMessageReplyHeader(),
 			data.vdate(),
 			data.vaction(),
+			data.vreactions() ? *data.vreactions() : MTPMessageReactions(),
 			MTP_int(data.vttl_period().value_or_empty()));
 	}, [&](const MTPDmessage &data) {
 		return MTP_message(
@@ -69,11 +71,13 @@ constexpr auto kRequestTimeLimit = 60 * crl::time(1000);
 			data.vid(),
 			data.vfrom_id() ? *data.vfrom_id() : MTPPeer(),
 			MTPint(), // from_boosts_applied
+			MTPstring(), // from_rank
 			data.vpeer_id(),
 			data.vsaved_peer_id() ? *data.vsaved_peer_id() : MTPPeer(),
 			data.vfwd_from() ? *data.vfwd_from() : MTPMessageFwdHeader(),
 			MTP_long(data.vvia_bot_id().value_or_empty()),
 			MTP_long(data.vvia_business_bot_id().value_or_empty()),
+			data.vguestchat_via_from() ? *data.vguestchat_via_from() : MTPPeer(),
 			data.vreply_to() ? *data.vreply_to() : MTPMessageReplyHeader(),
 			data.vdate(),
 			data.vmessage(),
@@ -93,7 +97,17 @@ constexpr auto kRequestTimeLimit = 60 * crl::time(1000);
 			MTP_int(data.vttl_period().value_or_empty()),
 			MTPint(), // quick_reply_shortcut_id
 			MTP_long(data.veffect().value_or_empty()), // effect
-			data.vfactcheck() ? *data.vfactcheck() : MTPFactCheck());
+			data.vfactcheck() ? *data.vfactcheck() : MTPFactCheck(),
+			MTP_int(data.vreport_delivery_until_date().value_or_empty()),
+			MTP_long(data.vpaid_message_stars().value_or_empty()),
+			(data.vsuggested_post()
+				? *data.vsuggested_post()
+				: MTPSuggestedPost()),
+			MTP_int(data.vschedule_repeat_period().value_or_empty()),
+			MTP_string(qs(data.vsummary_from_language().value_or_empty())),
+			(data.vrich_message()
+				? *data.vrich_message()
+				: MTPRichMessage()));
 	});
 }
 
@@ -109,7 +123,7 @@ ScheduledMessages::ScheduledMessages(not_null<Main::Session*> session)
 	_session->data().itemRemoved(
 	) | rpl::filter([](not_null<const HistoryItem*> item) {
 		return item->isScheduled();
-	}) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	}) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		remove(item);
 	}, _lifetime);
 }
@@ -242,11 +256,13 @@ void ScheduledMessages::sendNowSimpleMessage(
 			update.vid(),
 			peerToMTP(local->from()->id),
 			MTPint(), // from_boosts_applied
+			MTPstring(), // from_rank
 			peerToMTP(history->peer->id),
 			MTPPeer(), // saved_peer_id
 			MTPMessageFwdHeader(),
 			MTPlong(), // via_bot_id
 			MTPlong(), // via_business_bot_id
+			MTPPeer(), // guestchat_via_from
 			replyHeader,
 			update.vdate(),
 			MTP_string(local->originalText().text),
@@ -266,7 +282,13 @@ void ScheduledMessages::sendNowSimpleMessage(
 			MTP_int(update.vttl_period().value_or_empty()),
 			MTPint(), // quick_reply_shortcut_id
 			MTP_long(local->effectId()), // effect
-			MTPFactCheck()),
+			MTPFactCheck(),
+			MTPint(), // report_delivery_until_date
+			MTPlong(), // paid_message_stars
+			MTPSuggestedPost(),
+			MTPint(), // schedule_repeat_period
+			MTPstring(), // summary_from_language
+			MTPRichMessage()),
 		localFlags,
 		NewMessageType::Unread);
 
@@ -316,10 +338,7 @@ void ScheduledMessages::checkEntitiesAndUpdate(const MTPDmessage &data) {
 	const auto existing = j->second;
 	if (!HasScheduledDate(existing)) {
 		// Destroy a local message, that should be in history.
-		existing->updateSentContent({
-			qs(data.vmessage()),
-			Api::EntitiesFromMTP(_session, data.ventities().value_or_empty())
-		}, data.vmedia());
+		existing->updateSentContent(data);
 		existing->updateReplyMarkup(
 			HistoryMessageMarkupData(data.vreply_markup()));
 		existing->updateForwardedInfo(data.vfwd_from());
@@ -343,10 +362,20 @@ void ScheduledMessages::apply(
 	if (i == end(_data)) {
 		return;
 	}
-	for (const auto &id : update.vmessages().v) {
+	const auto sent = update.vsent_messages();
+	const auto &ids = update.vmessages().v;
+	for (auto k = 0, count = int(ids.size()); k != count; ++k) {
+		const auto id = ids[k].v;
 		const auto &list = i->second;
-		const auto j = list.itemById.find(id.v);
+		const auto j = list.itemById.find(id);
 		if (j != end(list.itemById)) {
+			if (sent && k < sent->v.size()) {
+				const auto &sentId = sent->v[k];
+				_session->data().sentFromScheduled({
+					.item = j->second,
+					.sentId = sentId.v,
+				});
+			}
 			j->second->destroy();
 			i = _data.find(history);
 			if (i == end(_data)) {
@@ -463,7 +492,7 @@ void ScheduledMessages::request(not_null<History*> history) {
 		? countListHash(i->second)
 		: uint64(0);
 	request.requestId = _session->api().request(
-		MTPmessages_GetScheduledHistory(peer->input, MTP_long(hash))
+		MTPmessages_GetScheduledHistory(peer->input(), MTP_long(hash))
 	).done([=](const MTPmessages_Messages &result) {
 		parse(history, result);
 	}).fail([=] {
@@ -526,12 +555,7 @@ HistoryItem *ScheduledMessages::append(
 			if (data.is_edit_hide()) {
 				existing->applyEdition(HistoryMessageEdition(_session, data));
 			} else {
-				existing->updateSentContent({
-					qs(data.vmessage()),
-					Api::EntitiesFromMTP(
-						_session,
-						data.ventities().value_or_empty())
-				}, data.vmedia());
+				existing->updateSentContent(data);
 				existing->updateReplyMarkup(
 					HistoryMessageMarkupData(data.vreply_markup()));
 				existing->updateForwardedInfo(data.vfwd_from());
diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.cpp b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
index f4ec3a3565faf7..40c00c4bb4dc20 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.cpp
@@ -8,12 +8,14 @@ For license and copyright information please follow this link:
 #include "data/components/sponsored_messages.h"
 
 #include "api/api_text_entities.h"
+#include "api/api_peer_search.h" // SponsoredSearchResult
 #include "apiwrap.h"
 #include "core/click_handler_types.h"
 #include "data/data_channel.h"
 #include "data/data_document.h"
 #include "data/data_file_origin.h"
 #include "data/data_media_preload.h"
+#include "data/data_peer_values.h"
 #include "data/data_photo.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -21,22 +23,46 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_element.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "ui/text/text_utilities.h" // Ui::Text::RichLangValue.
+#include "ui/chat/sponsored_message_bar.h"
+#include "ui/text/text_utilities.h" // tr::rich.
 
 namespace Data {
 namespace {
 
+constexpr auto kMs = crl::time(1000);
 constexpr auto kRequestTimeLimit = 5 * 60 * crl::time(1000);
 
+const auto kFlaggedPreload = ((MediaPreload*)quintptr(0x01));
+
 [[nodiscard]] bool TooEarlyForRequest(crl::time received) {
 	return (received > 0) && (received + kRequestTimeLimit > crl::now());
 }
 
+template <typename Fields>
+[[nodiscard]] std::vector<TextWithEntities> Prepare(const Fields &fields) {
+	using InfoList = std::vector<TextWithEntities>;
+	return (!fields.sponsorInfo.text.isEmpty()
+		&& !fields.additionalInfo.text.isEmpty())
+		? InfoList{ fields.sponsorInfo, fields.additionalInfo }
+		: !fields.sponsorInfo.text.isEmpty()
+		? InfoList{ fields.sponsorInfo }
+		: !fields.additionalInfo.text.isEmpty()
+		? InfoList{ fields.additionalInfo }
+		: InfoList{};
+}
+
 } // namespace
 
 SponsoredMessages::SponsoredMessages(not_null<Main::Session*> session)
 : _session(session)
 , _clearTimer([=] { clearOldRequests(); }) {
+	Data::AmPremiumValue(
+		_session
+	) | rpl::on_next([=](bool premium) {
+		if (premium) {
+			clear();
+		}
+	}, _lifetime);
 }
 
 SponsoredMessages::~SponsoredMessages() {
@@ -58,21 +84,28 @@ void SponsoredMessages::clear() {
 
 void SponsoredMessages::clearOldRequests() {
 	const auto now = crl::now();
-	while (true) {
-		const auto i = ranges::find_if(_requests, [&](const auto &value) {
-			const auto &request = value.second;
-			return !request.requestId
-				&& (request.lastReceived + kRequestTimeLimit <= now);
-		});
-		if (i == end(_requests)) {
-			break;
+	const auto clear = [&](auto &requests) {
+		while (true) {
+			const auto i = ranges::find_if(requests, [&](const auto &value) {
+				const auto &request = value.second;
+				return !request.requestId
+					&& (request.lastReceived + kRequestTimeLimit <= now);
+			});
+			if (i == end(requests)) {
+				break;
+			}
+			requests.erase(i);
 		}
-		_requests.erase(i);
-	}
+	};
+	clear(_requests);
+	clear(_requestsForVideo);
 }
 
 SponsoredMessages::AppendResult SponsoredMessages::append(
 		not_null<History*> history) {
+	if (isTopBarFor(history)) {
+		return SponsoredMessages::AppendResult::None;
+	}
 	const auto it = _data.find(history);
 	if (it == end(_data)) {
 		return SponsoredMessages::AppendResult::None;
@@ -152,10 +185,11 @@ void SponsoredMessages::inject(
 		if (blockIt == end(history->blocks)) {
 			return;
 		}
-		const auto messages = [&]() -> const std::vector<ViewPtr> & {
+		const auto messages = [&]() -> const std::vector<ViewPtr>& {
 			return (*blockIt)->messages;
 		};
 		auto lastViewIt = ranges::find(messages(), lastView, &ViewPtr::get);
+		auto appendAtLeastToEnd = false;
 		while ((summaryBetween < list.postsBetween)
 			|| (summaryHeight < betweenHeight)) {
 			lastViewIt++;
@@ -164,6 +198,10 @@ void SponsoredMessages::inject(
 				if (blockIt != end(history->blocks)) {
 					lastViewIt = begin(messages());
 				} else {
+					if (!list.injectedCount) {
+						appendAtLeastToEnd = true;
+						break;
+					}
 					return;
 				}
 			}
@@ -178,23 +216,49 @@ void SponsoredMessages::inject(
 		entryIt->itemFullId = FullMsgId(
 			history->peer->id,
 			_session->data().nextLocalMessageId());
-		const auto makedMessage = history->makeMessage(
-			entryIt->itemFullId.msg,
-			entryIt->sponsored.from,
-			entryIt->sponsored.textWithEntities,
-			(*lastViewIt)->data());
-		entryIt->item.reset(makedMessage.get());
-		history->addNewInTheMiddle(
-			makedMessage.get(),
-			std::distance(begin(history->blocks), blockIt),
-			std::distance(begin(messages()), lastViewIt) + 1);
-		messages().back().get()->setPendingResize();
+		if (appendAtLeastToEnd) {
+			entryIt->item.reset(history->addSponsoredMessage(
+				entryIt->itemFullId.msg,
+				entryIt->sponsored.from,
+				entryIt->sponsored.textWithEntities));
+		} else {
+			const auto makedMessage = history->makeMessage(
+				entryIt->itemFullId.msg,
+				entryIt->sponsored.from,
+				entryIt->sponsored.textWithEntities,
+				(*lastViewIt)->data());
+			entryIt->item.reset(makedMessage.get());
+			history->addNewInTheMiddle(
+				makedMessage.get(),
+				std::distance(begin(history->blocks), blockIt),
+				std::distance(begin(messages()), lastViewIt) + 1);
+			messages().back().get()->setPendingResize();
+		}
 		list.injectedCount++;
 	}
 }
 
 bool SponsoredMessages::canHaveFor(not_null<History*> history) const {
-	return history->peer->isChannel();
+	if (history->peer->isChannel()) {
+		return true;
+	} else if (const auto user = history->peer->asUser()) {
+		return user->isBot();
+	}
+	return false;
+}
+
+bool SponsoredMessages::canHaveFor(not_null<HistoryItem*> item) const {
+	return item->history()->peer->isBroadcast()
+		&& item->isRegular();
+}
+
+bool SponsoredMessages::isTopBarFor(not_null<History*> history) const {
+	if (peerIsUser(history->peer->id)) {
+		if (const auto user = history->peer->asUser()) {
+			return user->isBot();
+		}
+	}
+	return false;
 }
 
 void SponsoredMessages::request(not_null<History*> history, Fn<void()> done) {
@@ -218,10 +282,11 @@ void SponsoredMessages::request(not_null<History*> history, Fn<void()> done) {
 			}
 		}
 	}
-	const auto channel = history->peer->asChannel();
-	Assert(channel != nullptr);
 	request.requestId = _session->api().request(
-		MTPchannels_GetSponsoredMessages(channel->inputChannel)
+		MTPmessages_GetSponsoredMessages(
+			MTP_flags(0),
+			history->peer->input(),
+			MTPint()) // msg_id
 	).done([=](const MTPmessages_sponsoredMessages &result) {
 		parse(history, result);
 		if (done) {
@@ -232,6 +297,78 @@ void SponsoredMessages::request(not_null<History*> history, Fn<void()> done) {
 	}).send();
 }
 
+void SponsoredMessages::requestForVideo(
+		not_null<HistoryItem*> item,
+		Fn<void(SponsoredForVideo)> done) {
+	Expects(done != nullptr);
+
+	if (!canHaveFor(item)) {
+		done({});
+		return;
+	}
+	const auto peer = item->history()->peer;
+	auto &request = _requestsForVideo[peer];
+	if (TooEarlyForRequest(request.lastReceived)) {
+		auto prepared = prepareForVideo(peer);
+		if (prepared.list.empty()
+			|| prepared.state.itemIndex < prepared.list.size()
+			|| prepared.state.leftTillShow > 0) {
+			done(std::move(prepared));
+			return;
+		}
+	}
+	request.callbacks.push_back(std::move(done));
+	if (request.requestId) {
+		return;
+	}
+	{
+		const auto it = _dataForVideo.find(peer);
+		if (it != end(_dataForVideo)) {
+			auto &list = it->second;
+			// Don't rebuild currently displayed messages.
+			const auto proj = [](const Entry &e) {
+				return e.item != nullptr;
+			};
+			if (ranges::any_of(list.entries, proj)) {
+				return;
+			}
+		}
+	}
+	const auto finish = [=] {
+		const auto i = _requestsForVideo.find(peer);
+		if (i != end(_requestsForVideo)) {
+			for (const auto &callback : base::take(i->second.callbacks)) {
+				callback(prepareForVideo(peer));
+			}
+		}
+	};
+	using Flag = MTPmessages_GetSponsoredMessages::Flag;
+	request.requestId = _session->api().request(
+		MTPmessages_GetSponsoredMessages(
+			MTP_flags(Flag::f_msg_id),
+			peer->input(),
+			MTP_int(item->id.bare))
+	).done([=](const MTPmessages_sponsoredMessages &result) {
+		parseForVideo(peer, result);
+		finish();
+	}).fail([=] {
+		_requestsForVideo.remove(peer);
+		finish();
+	}).send();
+}
+
+void SponsoredMessages::updateForVideo(
+		FullMsgId itemId,
+		SponsoredForVideoState state) {
+	if (state.initial()) {
+		return;
+	}
+	const auto i = _dataForVideo.find(_session->data().peer(itemId.peer));
+	if (i != end(_dataForVideo)) {
+		i->second.state = state;
+	}
+}
+
 void SponsoredMessages::parse(
 		not_null<History*> history,
 		const MTPmessages_sponsoredMessages &list) {
@@ -247,25 +384,123 @@ void SponsoredMessages::parse(
 		_session->data().processChats(data.vchats());
 
 		const auto &messages = data.vmessages().v;
-		auto &list = _data.emplace(history, List()).first->second;
+		auto &list = _data.emplace(history).first->second;
 		list.entries.clear();
 		list.received = crl::now();
-		for (const auto &message : messages) {
-			append(history, list, message);
-		}
 		if (const auto postsBetween = data.vposts_between()) {
 			list.postsBetween = postsBetween->v;
 			list.state = State::InjectToMiddle;
 		} else {
-			list.state = State::AppendToEnd;
+			list.state = history->peer->isChannel()
+				? State::AppendToEnd
+				: State::AppendToTopBar;
+		}
+		for (const auto &message : messages) {
+			append([=] {
+				return &_data[history].entries;
+			}, history, message);
+		}
+	}, [](const MTPDmessages_sponsoredMessagesEmpty &) {
+	});
+}
+
+void SponsoredMessages::parseForVideo(
+		not_null<PeerData*> peer,
+		const MTPmessages_sponsoredMessages &list) {
+	auto &request = _requestsForVideo[peer];
+	request.lastReceived = crl::now();
+	request.requestId = 0;
+	if (!_clearTimer.isActive()) {
+		_clearTimer.callOnce(kRequestTimeLimit * 2);
+	}
+
+	list.match([&](const MTPDmessages_sponsoredMessages &data) {
+		_session->data().processUsers(data.vusers());
+		_session->data().processChats(data.vchats());
+
+		const auto history = _session->data().history(peer);
+		const auto &messages = data.vmessages().v;
+		auto &list = _dataForVideo.emplace(peer).first->second;
+		list.entries.clear();
+		list.received = crl::now();
+		list.startDelay = data.vstart_delay().value_or_empty() * kMs;
+		list.betweenDelay = data.vbetween_delay().value_or_empty() * kMs;
+		for (const auto &message : messages) {
+			append([=] {
+				return &_dataForVideo[peer].entries;
+			}, history, message);
 		}
 	}, [](const MTPDmessages_sponsoredMessagesEmpty &) {
 	});
 }
 
+SponsoredForVideo SponsoredMessages::prepareForVideo(
+		not_null<PeerData*> peer) {
+	const auto i = _dataForVideo.find(peer);
+	if (i == end(_dataForVideo) || i->second.entries.empty()) {
+		return {};
+	}
+	return SponsoredForVideo{
+		.list = i->second.entries | ranges::views::transform(
+			&Entry::sponsored
+		) | ranges::to_vector,
+		.startDelay = i->second.startDelay,
+		.betweenDelay = i->second.betweenDelay,
+		.state = i->second.state,
+	};
+}
+
+FullMsgId SponsoredMessages::fillTopBar(
+		not_null<History*> history,
+		not_null<Ui::RpWidget*> widget) {
+	const auto it = _data.find(history);
+	if (it != end(_data)) {
+		auto &list = it->second;
+		if (!list.entries.empty()) {
+			const auto &entry = list.entries.front();
+			const auto fullId = entry.itemFullId;
+			Ui::FillSponsoredMessageBar(
+				widget,
+				_session,
+				fullId,
+				entry.sponsored.from,
+				entry.sponsored.textWithEntities);
+			return fullId;
+		}
+	}
+	return {};
+}
+
+rpl::producer<> SponsoredMessages::itemRemoved(const FullMsgId &fullId) {
+	if (IsServerMsgId(fullId.msg) || !fullId) {
+		return rpl::never<>();
+	}
+	const auto history = _session->data().history(fullId.peer);
+	const auto it = _data.find(history);
+	if (it == end(_data)) {
+		return rpl::never<>();
+	}
+	auto &list = it->second;
+	const auto entryIt = ranges::find_if(list.entries, [&](const Entry &e) {
+		return e.itemFullId == fullId;
+	});
+	if (entryIt == end(list.entries)) {
+		return rpl::never<>();
+	}
+	if (!entryIt->optionalDestructionNotifier) {
+		entryIt->optionalDestructionNotifier
+			= std::make_unique<rpl::lifetime>();
+		entryIt->optionalDestructionNotifier->add([this, fullId] {
+			_itemRemoved.fire_copy(fullId);
+		});
+	}
+	return _itemRemoved.events(
+	) | rpl::filter(rpl::mappers::_1 == fullId) | rpl::to_empty;
+}
+
 void SponsoredMessages::append(
+		Fn<not_null<std::vector<Entry>*>()> entries,
 		not_null<History*> history,
-		List &list,
 		const MTPSponsoredMessage &message) {
 	const auto &data = message.data();
 	const auto randomId = data.vrandom_id().v;
@@ -276,14 +511,16 @@ void SponsoredMessages::append(
 			data.vmedia()->match([&](const MTPDmessageMediaPhoto &media) {
 				if (const auto tlPhoto = media.vphoto()) {
 					tlPhoto->match([&](const MTPDphoto &data) {
-						mediaPhoto = history->owner().processPhoto(data);
+						mediaPhoto = _session->data().processPhoto(data);
 					}, [](const MTPDphotoEmpty &) {
 					});
 				}
 			}, [&](const MTPDmessageMediaDocument &media) {
 				if (const auto tlDocument = media.vdocument()) {
 					tlDocument->match([&](const MTPDdocument &data) {
-						const auto d = history->owner().processDocument(data);
+						const auto d = _session->data().processDocument(
+							data,
+							media.valt_documents());
 						if (d->isVideoFile()
 							|| d->isSilentVideo()
 							|| d->isAnimation()
@@ -302,16 +539,12 @@ void SponsoredMessages::append(
 		.link = qs(data.vurl()),
 		.buttonText = qs(data.vbutton_text()),
 		.photoId = data.vphoto()
-			? history->session().data().processPhoto(*data.vphoto())->id
+			? _session->data().processPhoto(*data.vphoto())->id
 			: PhotoId(0),
 		.mediaPhotoId = (mediaPhoto ? mediaPhoto->id : 0),
 		.mediaDocumentId = (mediaDocument ? mediaDocument->id : 0),
-		.backgroundEmojiId = data.vcolor().has_value()
-			? data.vcolor()->data().vbackground_emoji_id().value_or_empty()
-			: uint64(0),
-		.colorIndex = uint8(data.vcolor().has_value()
-			? data.vcolor()->data().vcolor().value_or_empty()
-			: 0),
+		.backgroundEmojiId = BackgroundEmojiIdFromColor(data.vcolor()),
+		.colorIndex = ColorIndexFromColor(data.vcolor()).value_or(0),
 		.isLinkInternal = !UrlRequiresConfirmation(qs(data.vurl())),
 		.isRecommended = data.is_recommended(),
 		.canReport = data.is_can_report(),
@@ -321,7 +554,7 @@ void SponsoredMessages::append(
 			tr::now,
 			lt_text,
 			{ .text = qs(*data.vsponsor_info()) },
-			Ui::Text::RichLangValue)
+			tr::rich)
 		: TextWithEntities();
 	auto additionalInfo = TextWithEntities::Simple(
 		data.vadditional_info() ? qs(*data.vadditional_info()) : QString());
@@ -338,25 +571,24 @@ void SponsoredMessages::append(
 		.link = from.link,
 		.sponsorInfo = std::move(sponsorInfo),
 		.additionalInfo = std::move(additionalInfo),
+		.durationMin = data.vmin_display_duration().value_or_empty() * kMs,
+		.durationMax = data.vmax_display_duration().value_or_empty() * kMs,
 	};
-	list.entries.push_back({
-		.sponsored = std::move(sharedMessage),
-	});
-	auto &entry = list.entries.back();
-	const auto itemId = entry.itemFullId = FullMsgId(
+	const auto itemId = FullMsgId(
 		history->peer->id,
 		_session->data().nextLocalMessageId());
+	const auto list = entries();
+	list->push_back({
+		.itemFullId = itemId,
+		.sponsored = std::move(sharedMessage),
+	});
+	auto &entry = list->back();
 	const auto fileOrigin = FileOrigin(); // No way to refresh in ads.
 
-	static const auto kFlaggedPreload = ((MediaPreload*)quintptr(0x01));
 	const auto preloaded = [=] {
-		const auto i = _data.find(history);
-		if (i == end(_data)) {
-			return;
-		}
-		auto &entries = i->second.entries;
-		const auto j = ranges::find(entries, itemId, &Entry::itemFullId);
-		if (j == end(entries)) {
+		const auto list = entries();
+		const auto j = ranges::find(*list, itemId, &Entry::itemFullId);
+		if (j == end(*list)) {
 			return;
 		}
 		auto &entry = *j;
@@ -406,7 +638,7 @@ void SponsoredMessages::clearItems(not_null<History*> history) {
 
 const SponsoredMessages::Entry *SponsoredMessages::find(
 		const FullMsgId &fullId) const {
-	if (!peerIsChannel(fullId.peer)) {
+	if (!peerIsChannel(fullId.peer) && !peerIsUser(fullId.peer)) {
 		return nullptr;
 	}
 	const auto history = _session->data().history(fullId.peer);
@@ -429,17 +661,16 @@ void SponsoredMessages::view(const FullMsgId &fullId) {
 	if (!entryPtr) {
 		return;
 	}
-	const auto randomId = entryPtr->sponsored.randomId;
+	view(entryPtr->sponsored.randomId);
+}
+
+void SponsoredMessages::view(const QByteArray &randomId) {
 	auto &request = _viewRequests[randomId];
 	if (request.requestId || TooEarlyForRequest(request.lastReceived)) {
 		return;
 	}
-	const auto channel = entryPtr->item->history()->peer->asChannel();
-	Assert(channel != nullptr);
 	request.requestId = _session->api().request(
-		MTPchannels_ViewSponsoredMessage(
-			channel->inputChannel,
-			MTP_bytes(randomId))
+		MTPmessages_ViewSponsoredMessage(MTP_bytes(randomId))
 	).done([=] {
 		auto &request = _viewRequests[randomId];
 		request.lastReceived = crl::now();
@@ -455,19 +686,13 @@ SponsoredMessages::Details SponsoredMessages::lookupDetails(
 	if (!entryPtr) {
 		return {};
 	}
-	const auto &data = entryPtr->sponsored;
+	return lookupDetails(entryPtr->sponsored);
+}
 
-	using InfoList = std::vector<TextWithEntities>;
-	auto info = (!data.sponsorInfo.text.isEmpty()
-			&& !data.additionalInfo.text.isEmpty())
-		? InfoList{ data.sponsorInfo, data.additionalInfo }
-		: !data.sponsorInfo.text.isEmpty()
-		? InfoList{ data.sponsorInfo }
-		: !data.additionalInfo.text.isEmpty()
-		? InfoList{ data.additionalInfo }
-		: InfoList{};
+SponsoredMessages::Details SponsoredMessages::lookupDetails(
+		const SponsoredMessage &data) const {
 	return {
-		.info = std::move(info),
+		.info = Prepare(data),
 		.link = data.link,
 		.buttonText = data.from.buttonText,
 		.photoId = data.from.photoId,
@@ -480,6 +705,14 @@ SponsoredMessages::Details SponsoredMessages::lookupDetails(
 	};
 }
 
+SponsoredMessages::Details SponsoredMessages::lookupDetails(
+		const Api::SponsoredSearchResult &data) const {
+	return {
+		.info = Prepare(data),
+		.canReport = true,
+	};
+}
+
 void SponsoredMessages::clicked(
 		const FullMsgId &fullId,
 		bool isMedia,
@@ -488,22 +721,45 @@ void SponsoredMessages::clicked(
 	if (!entryPtr) {
 		return;
 	}
-	const auto randomId = entryPtr->sponsored.randomId;
-	const auto channel = entryPtr->item->history()->peer->asChannel();
-	Assert(channel != nullptr);
-	using Flag = MTPchannels_ClickSponsoredMessage::Flag;
-	_session->api().request(MTPchannels_ClickSponsoredMessage(
+	clicked(entryPtr->sponsored.randomId, isMedia, isFullscreen);
+}
+
+void SponsoredMessages::clicked(
+		const QByteArray &randomId,
+		bool isMedia,
+		bool isFullscreen) {
+	using Flag = MTPmessages_ClickSponsoredMessage::Flag;
+	_session->api().request(MTPmessages_ClickSponsoredMessage(
 		MTP_flags(Flag(0)
 			| (isMedia ? Flag::f_media : Flag(0))
 			| (isFullscreen ? Flag::f_fullscreen : Flag(0))),
-		channel->inputChannel,
 		MTP_bytes(randomId)
 	)).send();
 }
 
+SponsoredReportAction SponsoredMessages::createReportCallback(
+		const FullMsgId &fullId) {
+	const auto entry = find(fullId);
+	if (!entry) {
+		return { .callback = [=](const auto &...) {} };
+	}
+	const auto history = _session->data().history(fullId.peer);
+	const auto erase = [=] {
+		const auto it = _data.find(history);
+		if (it != end(_data)) {
+			auto &list = it->second.entries;
+			const auto proj = [&](const Entry &e) {
+				return e.itemFullId == fullId;
+			};
+			list.erase(ranges::remove_if(list, proj), end(list));
+		}
+	};
+	return createReportCallback(entry->sponsored.randomId, erase);
+}
 
-auto SponsoredMessages::createReportCallback(const FullMsgId &fullId)
--> Fn<void(SponsoredReportResult::Id, Fn<void(SponsoredReportResult)>)> {
+SponsoredReportAction SponsoredMessages::createReportCallback(
+		const QByteArray &randomId,
+		Fn<void()> erase) {
 	using TLChoose = MTPDchannels_sponsoredMessageReportResultChooseOption;
 	using TLAdsHidden = MTPDchannels_sponsoredMessageReportResultAdsHidden;
 	using TLReported = MTPDchannels_sponsoredMessageReportResultReported;
@@ -519,38 +775,15 @@ auto SponsoredMessages::createReportCallback(const FullMsgId &fullId)
 	};
 	const auto state = std::make_shared<State>();
 
-	return [=](Result::Id optionId, Fn<void(Result)> done) {
-		const auto entry = find(fullId);
-		if (!entry) {
-			return;
-		}
-
-		const auto history = entry->item->history();
-		const auto channel = history->peer->asChannel();
-		if (!channel) {
-			return;
-		}
-
-		const auto erase = [=] {
-			const auto it = _data.find(history);
-			if (it != end(_data)) {
-				auto &list = it->second.entries;
-				const auto proj = [&](const Entry &e) {
-					return e.itemFullId == fullId;
-				};
-				list.erase(ranges::remove_if(list, proj), end(list));
-			}
-		};
-
+	return { .callback = [=](Result::Id optionId, Fn<void(Result)> done) {
 		if (optionId == Result::Id("-1")) {
 			erase();
 			return;
 		}
 
 		state->requestId = _session->api().request(
-			MTPchannels_ReportSponsoredMessage(
-				channel->inputChannel,
-				MTP_bytes(entry->sponsored.randomId),
+			MTPmessages_ReportSponsoredMessage(
+				MTP_bytes(randomId),
 				MTP_bytes(optionId))
 		).done([=](
 				const MTPchannels_SponsoredMessageReportResult &result,
@@ -587,7 +820,7 @@ auto SponsoredMessages::createReportCallback(const FullMsgId &fullId)
 				done({ .error = error.type() });
 			}
 		}).send();
-	};
+	} };
 }
 
 SponsoredMessages::State SponsoredMessages::state(
@@ -596,4 +829,23 @@ SponsoredMessages::State SponsoredMessages::state(
 	return (it == end(_data)) ? State::None : it->second.state;
 }
 
+bool SponsoredMessages::hasUnshownFor(not_null<History*> history) const {
+	if (isTopBarFor(history)) {
+		return false;
+	}
+	const auto it = _data.find(history);
+	if (it == end(_data)) {
+		return false;
+	}
+	const auto &list = it->second;
+	if (list.showedAll
+		|| !TooEarlyForRequest(list.received)
+		|| list.postsBetween) {
+		return false;
+	}
+	return ranges::any_of(list.entries, [](const Entry &entry) {
+		return (entry.item == nullptr);
+	});
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/components/sponsored_messages.h b/Telegram/SourceFiles/data/components/sponsored_messages.h
index 028861af9ac537..beab943dd2127a 100644
--- a/Telegram/SourceFiles/data/components/sponsored_messages.h
+++ b/Telegram/SourceFiles/data/components/sponsored_messages.h
@@ -14,10 +14,18 @@ For license and copyright information please follow this link:
 
 class History;
 
+namespace Api {
+struct SponsoredSearchResult;
+} // namespace Api
+
 namespace Main {
 class Session;
 } // namespace Main
 
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
 namespace Data {
 
 class MediaPreload;
@@ -59,10 +67,48 @@ struct SponsoredMessage {
 	QByteArray randomId;
 	SponsoredFrom from;
 	TextWithEntities textWithEntities;
-	History *history = nullptr;
+	not_null<History*> history;
 	QString link;
 	TextWithEntities sponsorInfo;
 	TextWithEntities additionalInfo;
+	crl::time durationMin = 0;
+	crl::time durationMax = 0;
+};
+
+struct SponsoredMessageDetails {
+	std::vector<TextWithEntities> info;
+	QString link;
+	QString buttonText;
+	PhotoId photoId = PhotoId(0);
+	PhotoId mediaPhotoId = PhotoId(0);
+	DocumentId mediaDocumentId = DocumentId(0);
+	uint64 backgroundEmojiId = 0;
+	uint8 colorIndex : 6 = 0;
+	bool isLinkInternal = false;
+	bool canReport = false;
+};
+
+struct SponsoredReportAction {
+	Fn<void(
+		Data::SponsoredReportResult::Id,
+		Fn<void(Data::SponsoredReportResult)>)> callback;
+};
+
+struct SponsoredForVideoState {
+	int itemIndex = 0;
+	crl::time leftTillShow = 0;
+
+	[[nodiscard]] bool initial() const {
+		return !itemIndex && !leftTillShow;
+	}
+};
+
+struct SponsoredForVideo {
+	std::vector<SponsoredMessage> list;
+	crl::time startDelay = 0;
+	crl::time betweenDelay = 0;
+
+	SponsoredForVideoState state;
 };
 
 class SponsoredMessages final {
@@ -76,28 +122,37 @@ class SponsoredMessages final {
 		None,
 		AppendToEnd,
 		InjectToMiddle,
+		AppendToTopBar,
 	};
-	struct Details {
-		std::vector<TextWithEntities> info;
-		QString link;
-		QString buttonText;
-		PhotoId photoId = PhotoId(0);
-		PhotoId mediaPhotoId = PhotoId(0);
-		DocumentId mediaDocumentId = DocumentId(0);
-		uint64 backgroundEmojiId = 0;
-		uint8 colorIndex : 6 = 0;
-		bool isLinkInternal = false;
-		bool canReport = false;
-	};
+	using Details = SponsoredMessageDetails;
 	using RandomId = QByteArray;
 	explicit SponsoredMessages(not_null<Main::Session*> session);
 	~SponsoredMessages();
 
 	[[nodiscard]] bool canHaveFor(not_null<History*> history) const;
+	[[nodiscard]] bool canHaveFor(not_null<HistoryItem*> item) const;
+	[[nodiscard]] bool isTopBarFor(not_null<History*> history) const;
 	void request(not_null<History*> history, Fn<void()> done);
+	void requestForVideo(
+		not_null<HistoryItem*> item,
+		Fn<void(SponsoredForVideo)> done);
+	void updateForVideo(
+		FullMsgId itemId,
+		SponsoredForVideoState state);
 	void clearItems(not_null<History*> history);
 	[[nodiscard]] Details lookupDetails(const FullMsgId &fullId) const;
+	[[nodiscard]] Details lookupDetails(const SponsoredMessage &data) const;
+	[[nodiscard]] Details lookupDetails(
+		const Api::SponsoredSearchResult &data) const;
 	void clicked(const FullMsgId &fullId, bool isMedia, bool isFullscreen);
+	void clicked(
+		const QByteArray &randomId,
+		bool isMedia,
+		bool isFullscreen);
+	[[nodiscard]] FullMsgId fillTopBar(
+		not_null<History*> history,
+		not_null<Ui::RpWidget*> widget);
+	[[nodiscard]] rpl::producer<> itemRemoved(const FullMsgId &);
 
 	[[nodiscard]] AppendResult append(not_null<History*> history);
 	void inject(
@@ -107,11 +162,17 @@ class SponsoredMessages final {
 		int fallbackWidth);
 
 	void view(const FullMsgId &fullId);
+	void view(const QByteArray &randomId);
 
 	[[nodiscard]] State state(not_null<History*> history) const;
 
-	[[nodiscard]] auto createReportCallback(const FullMsgId &fullId)
-	-> Fn<void(SponsoredReportResult::Id, Fn<void(SponsoredReportResult)>)>;
+	[[nodiscard]] bool hasUnshownFor(not_null<History*> history) const;
+
+	[[nodiscard]] SponsoredReportAction createReportCallback(
+		const FullMsgId &fullId);
+	[[nodiscard]] SponsoredReportAction createReportCallback(
+		const QByteArray &randomId,
+		Fn<void()> erase);
 
 	void clear();
 
@@ -122,6 +183,7 @@ class SponsoredMessages final {
 		FullMsgId itemFullId;
 		SponsoredMessage sponsored;
 		std::unique_ptr<MediaPreload> preload;
+		std::unique_ptr<rpl::lifetime> optionalDestructionNotifier;
 	};
 	struct List {
 		std::vector<Entry> entries;
@@ -133,18 +195,35 @@ class SponsoredMessages final {
 		int postsBetween = 0;
 		State state = State::None;
 	};
+	struct ListForVideo {
+		std::vector<Entry> entries;
+		crl::time received = 0;
+		crl::time startDelay = 0;
+		crl::time betweenDelay = 0;
+		SponsoredForVideoState state;
+	};
 	struct Request {
 		mtpRequestId requestId = 0;
 		crl::time lastReceived = 0;
 	};
+	struct RequestForVideo {
+		std::vector<Fn<void(SponsoredForVideo)>> callbacks;
+		mtpRequestId requestId = 0;
+		crl::time lastReceived = 0;
+	};
 
 	void parse(
 		not_null<History*> history,
 		const MTPmessages_sponsoredMessages &list);
+	void parseForVideo(
+		not_null<PeerData*> peer,
+		const MTPmessages_sponsoredMessages &list);
 	void append(
+		Fn<not_null<std::vector<Entry>*>()> entries,
 		not_null<History*> history,
-		List &list,
 		const MTPSponsoredMessage &message);
+	[[nodiscard]] SponsoredForVideo prepareForVideo(
+		not_null<PeerData*> peer);
 	void clearOldRequests();
 
 	const Entry *find(const FullMsgId &fullId) const;
@@ -156,6 +235,11 @@ class SponsoredMessages final {
 	base::flat_map<not_null<History*>, Request> _requests;
 	base::flat_map<RandomId, Request> _viewRequests;
 
+	base::flat_map<not_null<PeerData*>, ListForVideo> _dataForVideo;
+	base::flat_map<not_null<PeerData*>, RequestForVideo> _requestsForVideo;
+
+	rpl::event_stream<FullMsgId> _itemRemoved;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/data/components/top_peers.cpp b/Telegram/SourceFiles/data/components/top_peers.cpp
index 1d630722078f23..4961a64badfbc2 100644
--- a/Telegram/SourceFiles/data/components/top_peers.cpp
+++ b/Telegram/SourceFiles/data/components/top_peers.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "api/api_hash.h"
 #include "apiwrap.h"
+#include "core/version.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -44,6 +45,8 @@ constexpr auto kRequestTimeLimit = 10 * crl::time(1000);
 [[nodiscard]] MTPTopPeerCategory TypeToCategory(TopPeerType type) {
 	switch (type) {
 	case TopPeerType::Chat: return MTP_topPeerCategoryCorrespondents();
+	case TopPeerType::BotGuestChat:
+		return MTP_topPeerCategoryBotsGuestChat();
 	case TopPeerType::BotApp: return MTP_topPeerCategoryBotsApp();
 	}
 	Unexpected("Type in TypeToCategory.");
@@ -53,11 +56,44 @@ constexpr auto kRequestTimeLimit = 10 * crl::time(1000);
 	using Flag = MTPcontacts_GetTopPeers::Flag;
 	switch (type) {
 	case TopPeerType::Chat: return Flag::f_correspondents;
+	case TopPeerType::BotGuestChat: return Flag::f_bots_guestchat;
 	case TopPeerType::BotApp: return Flag::f_bots_app;
 	}
 	Unexpected("Type in TypeToGetFlags.");
 }
 
+[[nodiscard]] mtpTypeId TypeToCategoryConstructor(TopPeerType type) {
+	switch (type) {
+	case TopPeerType::Chat:
+		return mtpc_topPeerCategoryCorrespondents;
+	case TopPeerType::BotGuestChat:
+		return mtpc_topPeerCategoryBotsGuestChat;
+	case TopPeerType::BotApp:
+		return mtpc_topPeerCategoryBotsApp;
+	}
+	Unexpected("Type in TypeToCategoryConstructor.");
+}
+
+[[nodiscard]] bool CanIncrementPeer(
+		TopPeerType type,
+		not_null<PeerData*> peer) {
+	const auto user = peer->asUser();
+	if (!user) {
+		return false;
+	}
+	switch (type) {
+	case TopPeerType::Chat:
+		return !user->isBot();
+	case TopPeerType::BotGuestChat:
+		return user->isBot()
+			&& user->botInfo
+			&& user->botInfo->supportsGuestChat;
+	case TopPeerType::BotApp:
+		return false;
+	}
+	Unexpected("Type in CanIncrementPeer.");
+}
+
 } // namespace
 
 TopPeers::TopPeers(not_null<Main::Session*> session, TopPeerType type)
@@ -72,7 +108,7 @@ void TopPeers::loadAfterChats() {
 	using namespace rpl::mappers;
 	crl::on_main(_session, [=] {
 		_session->data().chatsListLoadedEvents(
-		) | rpl::filter(_1 == nullptr) | rpl::start_with_next([=] {
+		) | rpl::filter(_1 == nullptr) | rpl::on_next([=] {
 			crl::on_main(_session, [=] {
 				request();
 			});
@@ -109,7 +145,7 @@ void TopPeers::remove(not_null<PeerData*> peer) {
 
 	_requestId = _session->api().request(MTPcontacts_ResetTopPeerRating(
 		TypeToCategory(_type),
-		peer->input
+		peer->input()
 	)).send();
 }
 
@@ -119,31 +155,32 @@ void TopPeers::increment(not_null<PeerData*> peer, TimeId date) {
 	if (_disabled || date <= _lastReceivedDate) {
 		return;
 	}
-	if (const auto user = peer->asUser(); user && !user->isBot()) {
-		auto changed = false;
-		auto i = ranges::find(_list, peer, &TopPeer::peer);
-		if (i == end(_list)) {
-			_list.push_back({ .peer = peer });
-			i = end(_list) - 1;
+	if (!CanIncrementPeer(_type, peer)) {
+		return;
+	}
+	auto changed = false;
+	auto i = ranges::find(_list, peer, &TopPeer::peer);
+	if (i == end(_list)) {
+		_list.push_back({ .peer = peer });
+		i = end(_list) - 1;
+		changed = true;
+	}
+	const auto &config = peer->session().mtp().config();
+	const auto decay = config.values().ratingDecay;
+	i->rating += RatingDelta(date, _lastReceivedDate, decay);
+	for (; i != begin(_list); --i) {
+		if (i->rating >= (i - 1)->rating) {
 			changed = true;
-		}
-		const auto &config = peer->session().mtp().config();
-		const auto decay = config.values().ratingDecay;
-		i->rating += RatingDelta(date, _lastReceivedDate, decay);
-		for (; i != begin(_list); --i) {
-			if (i->rating >= (i - 1)->rating) {
-				changed = true;
-				std::swap(*i, *(i - 1));
-			} else {
-				break;
-			}
-		}
-		if (changed) {
-			updated();
+			std::swap(*i, *(i - 1));
 		} else {
-			_session->local().writeSearchSuggestionsDelayed();
+			break;
 		}
 	}
+	if (changed) {
+		updated();
+	} else {
+		_session->local().writeSearchSuggestionsDelayed();
+	}
 }
 
 void TopPeers::reload() {
@@ -202,9 +239,7 @@ void TopPeers::request() {
 			owner->processChats(data.vchats());
 			for (const auto &category : data.vcategories().v) {
 				const auto &data = category.data();
-				const auto cons = (_type == TopPeerType::Chat)
-					? mtpc_topPeerCategoryCorrespondents
-					: mtpc_topPeerCategoryBotsApp;
+				const auto cons = TypeToCategoryConstructor(_type);
 				if (data.vcategory().type() != cons) {
 					LOG(("API Error: Unexpected top peer category."));
 					continue;
@@ -264,7 +299,7 @@ QByteArray TopPeers::serialize() const {
 	stream
 		<< quint32(AppVersion)
 		<< quint32(_disabled ? 1 : 0)
-		<< quint32(_list.size());
+		<< quint32(count);
 	for (const auto &top : list) {
 		Serialize::writePeer(stream, top.peer);
 		stream << SerializeRating(top.rating);
@@ -300,6 +335,7 @@ void TopPeers::applyLocal(QByteArray serialized) {
 	_list.reserve(count);
 	for (auto i = 0; i != int(count); ++i) {
 		auto rating = quint64();
+		const auto streamPosition = stream.underlying().device()->pos();
 		const auto peer = Serialize::readPeer(
 			_session,
 			streamAppVersion,
@@ -313,6 +349,8 @@ void TopPeers::applyLocal(QByteArray serialized) {
 		} else {
 			DEBUG_LOG(("Suggestions: "
 				"Failed TopPeers reading %1 / %2.").arg(i + 1).arg(count));
+			DEBUG_LOG(("Failed bytes: %1.").arg(
+				QString::fromUtf8(serialized.mid(streamPosition).toHex())));
 			_list.clear();
 			return;
 		}
diff --git a/Telegram/SourceFiles/data/components/top_peers.h b/Telegram/SourceFiles/data/components/top_peers.h
index 7f834ad84f826d..fc523ba25ab205 100644
--- a/Telegram/SourceFiles/data/components/top_peers.h
+++ b/Telegram/SourceFiles/data/components/top_peers.h
@@ -15,6 +15,7 @@ namespace Data {
 
 enum class TopPeerType {
 	Chat,
+	BotGuestChat,
 	BotApp,
 };
 
@@ -57,7 +58,6 @@ class TopPeers final {
 	mtpRequestId _requestId = 0;
 
 	bool _disabled = false;
-	bool _received = false;
 
 };
 
diff --git a/Telegram/SourceFiles/data/data_ai_compose_tones.cpp b/Telegram/SourceFiles/data/data_ai_compose_tones.cpp
new file mode 100644
index 00000000000000..678672e7a20e29
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_ai_compose_tones.cpp
@@ -0,0 +1,375 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/data_ai_compose_tones.h"
+
+#include "apiwrap.h"
+#include "api/api_text_entities.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+
+namespace Data {
+namespace {
+
+constexpr auto kRefreshInterval = 3600 * crl::time(1000);
+
+} // namespace
+
+AiComposeTones::AiComposeTones(not_null<Main::Session*> session)
+: _session(session)
+, _refreshTimer([=] { refresh(); }) {
+	refresh();
+	_refreshTimer.callEach(kRefreshInterval);
+}
+
+void AiComposeTones::refresh() {
+	refreshWithHash(_hash);
+}
+
+void AiComposeTones::refreshWithHash(uint64 hash) {
+	if (_refreshRequestId) {
+		if (hash == 0) {
+			_pendingRefresh = PendingRefresh::Full;
+		} else if (_pendingRefresh == PendingRefresh::None) {
+			_pendingRefresh = PendingRefresh::Incremental;
+		}
+		return;
+	}
+	_refreshRequestId = _session->api().request(MTPaicompose_GetTones(
+		MTP_long(hash)
+	)).done([=](const MTPaicompose_Tones &result) {
+		_refreshRequestId = 0;
+		result.match([&](const MTPDaicompose_tones &data) {
+			_session->data().processUsers(data.vusers());
+			_hash = data.vhash().v;
+			parseTones(data.vtones().v);
+			_updates.fire({});
+		}, [](const MTPDaicompose_tonesNotModified &) {
+		});
+		finishRefresh();
+	}).fail([=] {
+		_refreshRequestId = 0;
+		finishRefresh();
+	}).send();
+}
+
+void AiComposeTones::parseTones(const QVector<MTPAiComposeTone> &list) {
+	_list.clear();
+	_list.reserve(list.size());
+	for (const auto &tone : list) {
+		_list.push_back(parseTone(tone));
+	}
+	reapplyRecentCustomToneOrder();
+}
+
+AiComposeTone AiComposeTones::parseTone(
+		const MTPAiComposeTone &tone) const {
+	return tone.match([&](const MTPDaiComposeTone &data) {
+		auto result = AiComposeTone{
+			.id = data.vid().v,
+			.accessHash = data.vaccess_hash().v,
+			.slug = qs(data.vslug()),
+			.title = qs(data.vtitle()),
+			.emojiId = data.vemoji_id().value_or_empty(),
+			.prompt = qs(data.vprompt().value_or_empty()),
+			.installsCount = data.vinstalls_count().value_or_empty(),
+			.authorId = data.vauthor_id()
+				? UserId(data.vauthor_id()->v)
+				: UserId(0),
+			.creator = data.is_creator(),
+		};
+		if (const auto example = data.vexample_english()) {
+			example->match([&](const MTPDaiComposeToneExample &d) {
+				result.firstExample = AiComposeToneExample{
+					.from = Api::ParseTextWithEntities(_session, d.vfrom()),
+					.to = Api::ParseTextWithEntities(_session, d.vto()),
+				};
+			});
+		}
+		return result;
+	}, [&](const MTPDaiComposeToneDefault &data) {
+		return AiComposeTone{
+			.title = qs(data.vtitle()),
+			.emojiId = data.vemoji_id().v,
+			.isDefault = true,
+			.defaultType = qs(data.vtone()),
+		};
+	});
+}
+
+void AiComposeTones::create(
+		const QString &title,
+		const QString &prompt,
+		DocumentId emojiId,
+		bool displayAuthor,
+		Fn<void(AiComposeTone)> done,
+		Fn<void(const MTP::Error &)> fail) {
+	using Flag = MTPaicompose_CreateTone::Flag;
+	auto flags = MTPaicompose_CreateTone::Flags(0);
+	if (displayAuthor) {
+		flags |= Flag::f_display_author;
+	}
+	_session->api().request(MTPaicompose_CreateTone(
+		MTP_flags(flags),
+		MTP_long(emojiId),
+		MTP_string(title),
+		MTP_string(prompt)
+	)).done([=](const MTPAiComposeTone &result) {
+		auto parsed = parseTone(result);
+		promoteCustomTone(parsed);
+		_hash = 0;
+		_updates.fire({});
+		if (done) {
+			done(parsed);
+		}
+		refresh();
+	}).fail([=](const MTP::Error &error) {
+		if (fail) {
+			fail(error);
+		}
+	}).send();
+}
+
+void AiComposeTones::update(
+		const AiComposeTone &tone,
+		std::optional<QString> title,
+		std::optional<QString> prompt,
+		std::optional<DocumentId> emojiId,
+		std::optional<bool> displayAuthor,
+		Fn<void(AiComposeTone)> done,
+		Fn<void(const MTP::Error &)> fail) {
+	using Flag = MTPaicompose_UpdateTone::Flag;
+	auto flags = MTPaicompose_UpdateTone::Flags(0);
+	if (displayAuthor) {
+		flags |= Flag::f_display_author;
+	}
+	if (emojiId) {
+		flags |= Flag::f_emoji_id;
+	}
+	if (title) {
+		flags |= Flag::f_title;
+	}
+	if (prompt) {
+		flags |= Flag::f_prompt;
+	}
+	_session->api().request(MTPaicompose_UpdateTone(
+		MTP_flags(flags),
+		toneToMTP(tone),
+		displayAuthor
+			? (*displayAuthor ? MTP_boolTrue() : MTP_boolFalse())
+			: MTPBool(),
+		MTP_long(emojiId.value_or(0)),
+		MTP_string(title.value_or(QString())),
+		MTP_string(prompt.value_or(QString()))
+	)).done([=](const MTPAiComposeTone &result) {
+		auto parsed = parseTone(result);
+		promoteCustomTone(parsed);
+		_hash = 0;
+		_updates.fire({});
+		if (done) {
+			done(parsed);
+		}
+		refresh();
+	}).fail([=](const MTP::Error &error) {
+		if (fail) {
+			fail(error);
+		}
+	}).send();
+}
+
+void AiComposeTones::save(
+		const AiComposeTone &tone,
+		bool unsave,
+		Fn<void()> done,
+		Fn<void(const MTP::Error &)> fail) {
+	_session->api().request(MTPaicompose_SaveTone(
+		toneToMTP(tone),
+		unsave ? MTP_boolTrue() : MTP_boolFalse()
+	)).done([=] {
+		if (unsave) {
+			removeCustomTone(tone.id);
+			forgetRecentCustomTone(tone.id);
+		} else {
+			promoteCustomTone(tone);
+		}
+		_hash = 0;
+		_updates.fire({});
+		if (done) {
+			done();
+		}
+		refresh();
+	}).fail([=](const MTP::Error &error) {
+		if (fail) {
+			fail(error);
+		}
+	}).send();
+}
+
+void AiComposeTones::remove(
+		const AiComposeTone &tone,
+		Fn<void()> done) {
+	const auto toneCopy = tone;
+	_session->api().request(MTPaicompose_DeleteTone(
+		toneToMTP(tone)
+	)).done([=] {
+		if (!toneCopy.isDefault) {
+			removeCustomTone(toneCopy.id);
+			forgetRecentCustomTone(toneCopy.id);
+		}
+		_hash = 0;
+		_updates.fire({});
+		if (done) {
+			done();
+		}
+		refresh();
+	}).fail([=] {
+	}).send();
+}
+
+void AiComposeTones::resolve(
+		const QString &slug,
+		Fn<void(AiComposeTone)> done,
+		Fn<void(const MTP::Error &)> fail) {
+	_session->api().request(MTPaicompose_GetTone(
+		MTP_inputAiComposeToneSlug(MTP_string(slug))
+	)).done([=](const MTPaicompose_Tones &result) {
+		result.match([&](const MTPDaicompose_tones &data) {
+			_session->data().processUsers(data.vusers());
+			const auto &tones = data.vtones().v;
+			if (!tones.isEmpty()) {
+				if (done) {
+					done(parseTone(tones.front()));
+				}
+			} else if (fail) {
+				fail(MTP::Error::Local(
+					"TONE_NOT_FOUND",
+					"Tone not found."));
+			}
+		}, [&](const MTPDaicompose_tonesNotModified &) {
+			if (fail) {
+				fail(MTP::Error::Local(
+					"TONE_NOT_MODIFIED",
+					"Tone not modified."));
+			}
+		});
+	}).fail([=](const MTP::Error &error) {
+		if (fail) {
+			fail(error);
+		}
+	}).send();
+}
+
+void AiComposeTones::getToneExample(
+		const AiComposeTone &tone,
+		int num,
+		Fn<void(AiComposeToneExample)> done,
+		Fn<void(const MTP::Error &)> fail) {
+	_session->api().request(MTPaicompose_GetToneExample(
+		toneToMTP(tone),
+		MTP_int(num)
+	)).done([=](const MTPAiComposeToneExample &result) {
+		result.match([&](const MTPDaiComposeToneExample &data) {
+			if (done) {
+				done(AiComposeToneExample{
+					.from = Api::ParseTextWithEntities(_session, data.vfrom()),
+					.to = Api::ParseTextWithEntities(_session, data.vto()),
+				});
+			}
+		});
+	}).fail([=](const MTP::Error &error) {
+		if (fail) {
+			fail(error);
+		}
+	}).send();
+}
+
+void AiComposeTones::applyUpdate() {
+	refresh();
+}
+
+void AiComposeTones::finishRefresh() {
+	const auto pending = _pendingRefresh;
+	_pendingRefresh = PendingRefresh::None;
+	if (pending == PendingRefresh::None) {
+		return;
+	}
+	refreshWithHash((pending == PendingRefresh::Full) ? 0 : _hash);
+}
+
+void AiComposeTones::promoteCustomTone(AiComposeTone tone) {
+	if (tone.isDefault) {
+		return;
+	}
+	removeCustomTone(tone.id);
+	rememberRecentCustomTone(tone.id);
+	_list.insert(begin(_list), std::move(tone));
+}
+
+void AiComposeTones::removeCustomTone(uint64 id) {
+	const auto i = ranges::find(_list, id, &AiComposeTone::id);
+	if (i != end(_list)) {
+		_list.erase(i);
+	}
+}
+
+void AiComposeTones::rememberRecentCustomTone(uint64 id) {
+	const auto i = ranges::find(_recentCustomToneIds, id);
+	if (i != end(_recentCustomToneIds)) {
+		_recentCustomToneIds.erase(i);
+	}
+	_recentCustomToneIds.insert(begin(_recentCustomToneIds), id);
+}
+
+void AiComposeTones::forgetRecentCustomTone(uint64 id) {
+	const auto i = ranges::find(_recentCustomToneIds, id);
+	if (i != end(_recentCustomToneIds)) {
+		_recentCustomToneIds.erase(i);
+	}
+}
+
+void AiComposeTones::reapplyRecentCustomToneOrder() {
+	auto reordered = std::vector<AiComposeTone>();
+	reordered.reserve(_list.size());
+
+	auto recent = std::vector<uint64>();
+	recent.reserve(_recentCustomToneIds.size());
+	for (const auto id : _recentCustomToneIds) {
+		const auto i = ranges::find(_list, id, &AiComposeTone::id);
+		if (i != end(_list) && !i->isDefault) {
+			reordered.push_back(*i);
+			recent.push_back(id);
+		}
+	}
+	for (const auto &tone : _list) {
+		const auto promoted = !tone.isDefault
+			&& (ranges::find(recent, tone.id) != end(recent));
+		if (!promoted) {
+			reordered.push_back(tone);
+		}
+	}
+	_recentCustomToneIds = std::move(recent);
+	_list = std::move(reordered);
+}
+
+MTPInputAiComposeTone AiComposeTones::toneToMTP(
+		const AiComposeTone &tone) const {
+	return tone.isDefault
+		? MTP_inputAiComposeToneDefault(MTP_string(tone.defaultType))
+		: MTP_inputAiComposeToneID(
+			MTP_long(tone.id),
+			MTP_long(tone.accessHash));
+}
+
+const std::vector<AiComposeTone> &AiComposeTones::list() const {
+	return _list;
+}
+
+rpl::producer<> AiComposeTones::updated() const {
+	return _updates.events();
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_ai_compose_tones.h b/Telegram/SourceFiles/data/data_ai_compose_tones.h
new file mode 100644
index 00000000000000..fe4a050f3e3065
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_ai_compose_tones.h
@@ -0,0 +1,118 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "ui/text/text_entity.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace MTP {
+class Error;
+} // namespace MTP
+
+namespace Data {
+
+struct AiComposeToneExample {
+	TextWithEntities from;
+	TextWithEntities to;
+};
+
+struct AiComposeTone {
+	uint64 id = 0;
+	uint64 accessHash = 0;
+	QString slug;
+	QString title;
+	DocumentId emojiId = 0;
+	QString prompt;
+	int installsCount = 0;
+	UserId authorId = 0;
+	bool creator = false;
+	bool isDefault = false;
+	QString defaultType;
+	std::optional<AiComposeToneExample> firstExample;
+};
+
+class AiComposeTones final {
+public:
+	explicit AiComposeTones(not_null<Main::Session*> session);
+
+	void refresh();
+	[[nodiscard]] const std::vector<AiComposeTone> &list() const;
+	[[nodiscard]] rpl::producer<> updated() const;
+
+	void create(
+		const QString &title,
+		const QString &prompt,
+		DocumentId emojiId,
+		bool displayAuthor,
+		Fn<void(AiComposeTone)> done,
+		Fn<void(const MTP::Error &)> fail = nullptr);
+	void update(
+		const AiComposeTone &tone,
+		std::optional<QString> title,
+		std::optional<QString> prompt,
+		std::optional<DocumentId> emojiId,
+		std::optional<bool> displayAuthor,
+		Fn<void(AiComposeTone)> done,
+		Fn<void(const MTP::Error &)> fail = nullptr);
+	void save(
+		const AiComposeTone &tone,
+		bool unsave,
+		Fn<void()> done = nullptr,
+		Fn<void(const MTP::Error &)> fail = nullptr);
+	void remove(
+		const AiComposeTone &tone,
+		Fn<void()> done = nullptr);
+	void resolve(
+		const QString &slug,
+		Fn<void(AiComposeTone)> done,
+		Fn<void(const MTP::Error &)> fail = nullptr);
+	void getToneExample(
+		const AiComposeTone &tone,
+		int num,
+		Fn<void(AiComposeToneExample)> done,
+		Fn<void(const MTP::Error &)> fail = nullptr);
+
+	void applyUpdate();
+
+	[[nodiscard]] MTPInputAiComposeTone toneToMTP(
+		const AiComposeTone &tone) const;
+
+private:
+	void parseTones(const QVector<MTPAiComposeTone> &list);
+	[[nodiscard]] AiComposeTone parseTone(
+		const MTPAiComposeTone &tone) const;
+	void finishRefresh();
+	void promoteCustomTone(AiComposeTone tone);
+	void removeCustomTone(uint64 id);
+	void rememberRecentCustomTone(uint64 id);
+	void forgetRecentCustomTone(uint64 id);
+	void reapplyRecentCustomToneOrder();
+	void refreshWithHash(uint64 hash);
+
+	enum class PendingRefresh {
+		None,
+		Incremental,
+		Full,
+	};
+
+	const not_null<Main::Session*> _session;
+	uint64 _hash = 0;
+	mtpRequestId _refreshRequestId = 0;
+	std::vector<AiComposeTone> _list;
+	std::vector<uint64> _recentCustomToneIds;
+	rpl::event_stream<> _updates;
+	base::Timer _refreshTimer;
+	PendingRefresh _pendingRefresh = PendingRefresh::None;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/history/history_view_swipe_data.h b/Telegram/SourceFiles/data/data_authorization.h
similarity index 56%
rename from Telegram/SourceFiles/history/history_view_swipe_data.h
rename to Telegram/SourceFiles/data/data_authorization.h
index c3dd9eb776d3aa..8f4add2e1df300 100644
--- a/Telegram/SourceFiles/history/history_view_swipe_data.h
+++ b/Telegram/SourceFiles/data/data_authorization.h
@@ -7,14 +7,14 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-namespace HistoryView {
+namespace Data {
 
-struct ChatPaintGestureHorizontalData {
-	float64 ratio = 0.;
-	float64 reachRatio = 0.;
-	int64 msgBareId = 0;
-	int translation = 0;
-	int cursorTop = 0;
+struct UnreviewedAuth {
+	uint64 hash = 0;
+	bool unconfirmed = false;
+	TimeId date = 0;
+	QString device;
+	QString location;
 };
 
-} // namespace HistoryView
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_auto_download.cpp b/Telegram/SourceFiles/data/data_auto_download.cpp
index c0ea8505518769..26008bbe91f1bc 100644
--- a/Telegram/SourceFiles/data/data_auto_download.cpp
+++ b/Telegram/SourceFiles/data/data_auto_download.cpp
@@ -20,7 +20,8 @@ namespace {
 constexpr auto kDefaultMaxSize = 8 * int64(1024 * 1024);
 constexpr auto kDefaultAutoPlaySize = 50 * int64(1024 * 1024);
 constexpr auto kVersion1 = char(1);
-constexpr auto kVersion = char(2);
+constexpr auto kVersion2 = char(2);
+constexpr auto kVersion = char(3);
 
 template <typename Enum>
 auto enums_view(int from, int till) {
@@ -80,6 +81,26 @@ Type AutoPlayTypeFromDocument(not_null<DocumentData*> document) {
 		: Type::AutoPlayGIF;
 }
 
+[[nodiscard]] int64 ForceAllowLimit(
+		const Full &data,
+		Source source,
+		Type type) {
+	const auto user = data.bytesLimit(source, type);
+	return (user > 0) ? user : Defaults().bytesLimit(source, type);
+}
+
+[[nodiscard]] bool ForceAllowed(
+		const Full &data,
+		Source source,
+		Type type,
+		int64 fileSize) {
+	if (ranges::find(kStreamedTypes, type) != end(kStreamedTypes)) {
+		return false;
+	}
+	const auto limit = ForceAllowLimit(data, source, type);
+	return (limit > 0) && (fileSize <= limit);
+}
+
 } // namespace
 
 void Single::setBytesLimit(int64 bytesLimit) {
@@ -194,10 +215,32 @@ int64 Full::bytesLimit(Source source, Type type) const {
 	return setOrDefault(source, type).bytesLimit(type);
 }
 
+void Full::setPeerOverride(PeerId peerId, Override value) {
+	if (value == Override::Default) {
+		_peerOverrides.remove(peerId);
+	} else {
+		_peerOverrides[peerId] = value;
+	}
+}
+
+Override Full::peerOverride(PeerId peerId) const {
+	const auto i = _peerOverrides.find(peerId);
+	return (i != end(_peerOverrides)) ? i->second : Override::Default;
+}
+
+void Full::enumeratePeerOverrides(
+		Fn<void(PeerId, Override)> callback) const {
+	for (const auto &[peerId, value] : _peerOverrides) {
+		callback(peerId, value);
+	}
+}
+
 QByteArray Full::serialize() const {
 	auto result = QByteArray();
 	auto size = sizeof(qint8);
 	size += kSourcesCount * kTypesCount * sizeof(qint32);
+	size += sizeof(qint32);
+	size += _peerOverrides.size() * (sizeof(quint64) + sizeof(qint8));
 	result.reserve(size);
 	{
 		auto buffer = QBuffer(&result);
@@ -209,6 +252,12 @@ QByteArray Full::serialize() const {
 				stream << set(source).serialize(type);
 			}
 		}
+		stream << qint32(_peerOverrides.size());
+		for (const auto &[peerId, override] : _peerOverrides) {
+			stream
+				<< SerializePeerId(peerId)
+				<< qint8(static_cast<char>(override));
+		}
 	}
 	return result;
 }
@@ -223,7 +272,9 @@ bool Full::setFromSerialized(const QByteArray &serialized) {
 	stream >> version;
 	if (stream.status() != QDataStream::Ok) {
 		return false;
-	} else if (version != kVersion && version != kVersion1) {
+	} else if (version != kVersion
+		&& version != kVersion2
+		&& version != kVersion1) {
 		return false;
 	}
 	auto temp = Full();
@@ -245,7 +296,33 @@ bool Full::setFromSerialized(const QByteArray &serialized) {
 			}
 		}
 	}
+	if (version >= kVersion && !stream.atEnd()) {
+		auto count = qint32();
+		stream >> count;
+		if (stream.status() != QDataStream::Ok || count < 0) {
+			return false;
+		}
+		for (auto i = 0; i != count; ++i) {
+			auto serializedPeerId = quint64();
+			auto rawOverride = qint8();
+			stream >> serializedPeerId >> rawOverride;
+			if (stream.status() != QDataStream::Ok) {
+				return false;
+			}
+			const auto value = (rawOverride == qint8(Override::ForceAllow))
+				? Override::ForceAllow
+				: (rawOverride == qint8(Override::ForceDeny))
+				? Override::ForceDeny
+				: Override::Default;
+			if (value != Override::Default) {
+				temp.setPeerOverride(
+					DeserializePeerId(serializedPeerId),
+					value);
+			}
+		}
+	}
 	_data = temp._data;
+	_peerOverrides = std::move(temp._peerOverrides);
 	return true;
 }
 
@@ -278,6 +355,27 @@ bool Should(
 		const Full &data,
 		not_null<PeerData*> peer,
 		not_null<DocumentData*> document) {
+	if (document->sticker()) {
+		return true;
+	}
+	const auto override = data.peerOverride(peer->id);
+	if (override == Override::ForceDeny) {
+		return false;
+	} else if (document->isGifv()) {
+		return true;
+	} else if (override == Override::ForceAllow) {
+		if (document->isVoiceMessage()
+			|| document->isVideoMessage()
+			|| document->isSong()
+			|| document->isVideoFile()) {
+			return false;
+		}
+		return ForceAllowed(
+			data,
+			SourceFromPeer(peer),
+			Type::File,
+			document->size);
+	}
 	return Should(data, SourceFromPeer(peer), document);
 }
 
@@ -296,6 +394,16 @@ bool Should(
 		const Full &data,
 		not_null<PeerData*> peer,
 		not_null<PhotoData*> photo) {
+	const auto override = data.peerOverride(peer->id);
+	if (override == Override::ForceDeny) {
+		return false;
+	} else if (override == Override::ForceAllow) {
+		return ForceAllowed(
+			data,
+			SourceFromPeer(peer),
+			Type::Photo,
+			photo->imageByteSize(PhotoSize::Large));
+	}
 	return data.shouldDownload(
 		SourceFromPeer(peer),
 		Type::Photo,
@@ -306,7 +414,20 @@ bool ShouldAutoPlay(
 		const Full &data,
 		not_null<PeerData*> peer,
 		not_null<DocumentData*> document) {
-	return document->sticker() || data.shouldDownload(
+	if (document->sticker()) {
+		return true;
+	}
+	const auto override = data.peerOverride(peer->id);
+	if (override == Override::ForceDeny) {
+		return false;
+	} else if (override == Override::ForceAllow) {
+		return ForceAllowed(
+			data,
+			SourceFromPeer(peer),
+			AutoPlayTypeFromDocument(document),
+			document->size);
+	}
+	return data.shouldDownload(
 		SourceFromPeer(peer),
 		AutoPlayTypeFromDocument(document),
 		document->size);
@@ -316,12 +437,23 @@ bool ShouldAutoPlay(
 		const Full &data,
 		not_null<PeerData*> peer,
 		not_null<PhotoData*> photo) {
+	if (!photo->hasVideo()) {
+		return false;
+	}
+	const auto override = data.peerOverride(peer->id);
+	if (override == Override::ForceDeny) {
+		return false;
+	}
 	const auto source = SourceFromPeer(peer);
 	const auto size = photo->videoByteSize(PhotoSize::Large);
-	return photo->hasVideo()
-		&& (data.shouldDownload(source, Type::AutoPlayGIF, size)
-			|| data.shouldDownload(source, Type::AutoPlayVideo, size)
-			|| data.shouldDownload(source, Type::AutoPlayVideoMessage, size));
+	if (override == Override::ForceAllow) {
+		return ForceAllowed(data, source, Type::AutoPlayGIF, size)
+			|| ForceAllowed(data, source, Type::AutoPlayVideo, size)
+			|| ForceAllowed(data, source, Type::AutoPlayVideoMessage, size);
+	}
+	return data.shouldDownload(source, Type::AutoPlayGIF, size)
+		|| data.shouldDownload(source, Type::AutoPlayVideo, size)
+		|| data.shouldDownload(source, Type::AutoPlayVideoMessage, size);
 }
 
 Full WithDisabledAutoPlay(const Full &data) {
@@ -331,6 +463,15 @@ Full WithDisabledAutoPlay(const Full &data) {
 			result.setBytesLimit(source, type, 0);
 		}
 	}
+	auto toClear = std::vector<PeerId>();
+	data.enumeratePeerOverrides([&](PeerId id, Override value) {
+		if (value == Override::ForceAllow) {
+			toClear.push_back(id);
+		}
+	});
+	for (const auto id : toClear) {
+		result.setPeerOverride(id, Override::Default);
+	}
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/data/data_auto_download.h b/Telegram/SourceFiles/data/data_auto_download.h
index a3275452fd9089..319f53d80822db 100644
--- a/Telegram/SourceFiles/data/data_auto_download.h
+++ b/Telegram/SourceFiles/data/data_auto_download.h
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/flat_map.h"
+
 #include <array>
 
 namespace Data {
@@ -45,6 +47,12 @@ inline constexpr auto kStreamedTypes = {
 
 constexpr auto kTypesCount = 7;
 
+enum class Override : char {
+	Default    = 0,
+	ForceAllow = 1,
+	ForceDeny  = 2,
+};
+
 class Single {
 public:
 	void setBytesLimit(int64 bytesLimit);
@@ -90,6 +98,11 @@ class Full {
 		int64 fileSize) const;
 	[[nodiscard]] int64 bytesLimit(Source source, Type type) const;
 
+	void setPeerOverride(PeerId peerId, Override value);
+	[[nodiscard]] Override peerOverride(PeerId peerId) const;
+	void enumeratePeerOverrides(
+		Fn<void(PeerId, Override)> callback) const;
+
 	[[nodiscard]] QByteArray serialize() const;
 	bool setFromSerialized(const QByteArray &serialized);
 
@@ -101,6 +114,7 @@ class Full {
 	[[nodiscard]] const Set &setOrDefault(Source source, Type type) const;
 
 	std::array<Set, kSourcesCount> _data;
+	base::flat_map<PeerId, Override> _peerOverrides;
 
 };
 
diff --git a/Telegram/SourceFiles/data/data_birthday.cpp b/Telegram/SourceFiles/data/data_birthday.cpp
index 34a2b07374a28a..f41e251bff858c 100644
--- a/Telegram/SourceFiles/data/data_birthday.cpp
+++ b/Telegram/SourceFiles/data/data_birthday.cpp
@@ -69,12 +69,15 @@ int Birthday::year() const {
 	return _value / 10000;
 }
 
-QString BirthdayText(Birthday date) {
+QString BirthdayText(Birthday date, bool fullMonth) {
+	const auto wrapMonth = fullMonth
+		? Lang::MonthDay
+		: Lang::MonthSmall;
 	if (const auto year = date.year()) {
 		return tr::lng_month_day_year(
 			tr::now,
 			lt_month,
-			Lang::MonthSmall(date.month())(tr::now),
+			wrapMonth(date.month())(tr::now),
 			lt_day,
 			QString::number(date.day()),
 			lt_year,
@@ -83,7 +86,7 @@ QString BirthdayText(Birthday date) {
 		return tr::lng_month_day(
 			tr::now,
 			lt_month,
-			Lang::MonthSmall(date.month())(tr::now),
+			wrapMonth(date.month())(tr::now),
 			lt_day,
 			QString::number(date.day()));
 	}
diff --git a/Telegram/SourceFiles/data/data_birthday.h b/Telegram/SourceFiles/data/data_birthday.h
index e728cce4206c5e..15858b6e01bdc1 100644
--- a/Telegram/SourceFiles/data/data_birthday.h
+++ b/Telegram/SourceFiles/data/data_birthday.h
@@ -38,7 +38,7 @@ class Birthday final {
 
 };
 
-[[nodiscard]] QString BirthdayText(Birthday date);
+[[nodiscard]] QString BirthdayText(Birthday date, bool fullMonth = false);
 [[nodiscard]] QString BirthdayCake();
 [[nodiscard]] int BirthdayAge(Birthday date);
 [[nodiscard]] bool IsBirthdayToday(Birthday date);
diff --git a/Telegram/SourceFiles/data/data_changes.cpp b/Telegram/SourceFiles/data/data_changes.cpp
index 773c50d5d4bb21..8b5d73c9a8fa03 100644
--- a/Telegram/SourceFiles/data/data_changes.cpp
+++ b/Telegram/SourceFiles/data/data_changes.cpp
@@ -204,6 +204,42 @@ void Changes::topicRemoved(not_null<ForumTopic*> topic) {
 	_topicChanges.drop(topic);
 }
 
+void Changes::sublistUpdated(
+		not_null<SavedSublist*> sublist,
+		SublistUpdate::Flags flags) {
+	const auto drop = (flags & SublistUpdate::Flag::Destroyed);
+	_sublistChanges.updated(sublist, flags, drop);
+	if (!drop) {
+		scheduleNotifications();
+	}
+}
+
+rpl::producer<SublistUpdate> Changes::sublistUpdates(
+		SublistUpdate::Flags flags) const {
+	return _sublistChanges.updates(flags);
+}
+
+rpl::producer<SublistUpdate> Changes::sublistUpdates(
+		not_null<SavedSublist*> sublist,
+		SublistUpdate::Flags flags) const {
+	return _sublistChanges.updates(sublist, flags);
+}
+
+rpl::producer<SublistUpdate> Changes::sublistFlagsValue(
+		not_null<SavedSublist*> sublist,
+		SublistUpdate::Flags flags) const {
+	return _sublistChanges.flagsValue(sublist, flags);
+}
+
+rpl::producer<SublistUpdate> Changes::realtimeSublistUpdates(
+		SublistUpdate::Flag flag) const {
+	return _sublistChanges.realtimeUpdates(flag);
+}
+
+void Changes::sublistRemoved(not_null<SavedSublist*> sublist) {
+	_sublistChanges.drop(sublist);
+}
+
 void Changes::messageUpdated(
 		not_null<HistoryItem*> item,
 		MessageUpdate::Flags flags) {
@@ -304,6 +340,34 @@ rpl::producer<StoryUpdate> Changes::realtimeStoryUpdates(
 	return _storyChanges.realtimeUpdates(flag);
 }
 
+void Changes::chatAdminChanged(
+		not_null<PeerData*> peer,
+		not_null<UserData*> user,
+		ChatAdminRights rights,
+		QString rank) {
+	_chatAdminChanges.fire({
+		.peer = peer,
+		.user = user,
+		.rights = rights,
+		.rank = std::move(rank),
+	});
+}
+
+rpl::producer<ChatAdminChange> Changes::chatAdminChanges() const {
+	return _chatAdminChanges.events();
+}
+
+void Changes::chatMemberRankChanged(
+		not_null<PeerData*> peer,
+		not_null<UserData*> user,
+		QString rank) {
+	_chatMemberRankChanges.fire({ peer, user, std::move(rank) });
+}
+
+rpl::producer<ChatMemberRankChange> Changes::chatMemberRankChanges() const {
+	return _chatMemberRankChanges.events();
+}
+
 void Changes::scheduleNotifications() {
 	if (!_notify) {
 		_notify = true;
@@ -323,6 +387,7 @@ void Changes::sendNotifications() {
 	_messageChanges.sendNotifications();
 	_entryChanges.sendNotifications();
 	_topicChanges.sendNotifications();
+	_sublistChanges.sendNotifications();
 	_storyChanges.sendNotifications();
 }
 
diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h
index a2c45bb2a317ce..16e14e7b73e045 100644
--- a/Telegram/SourceFiles/data/data_changes.h
+++ b/Telegram/SourceFiles/data/data_changes.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "base/flags.h"
+#include "data/data_chat_participant_status.h"
 
 class History;
 class PeerData;
@@ -38,6 +39,7 @@ inline constexpr int CountBit(Flag Last = Flag::LastUsedBit) {
 namespace Data {
 
 class ForumTopic;
+class SavedSublist;
 class Story;
 
 struct NameUpdate {
@@ -64,7 +66,7 @@ struct PeerUpdate {
 		Notifications       = (1ULL << 4),
 		Migration           = (1ULL << 5),
 		UnavailableReason   = (1ULL << 6),
-		ChatThemeEmoji      = (1ULL << 7),
+		ChatThemeToken      = (1ULL << 7),
 		ChatWallPaper       = (1ULL << 8),
 		IsBlocked           = (1ULL << 9),
 		MessagesTTL         = (1ULL << 10),
@@ -72,47 +74,57 @@ struct PeerUpdate {
 		Usernames           = (1ULL << 12),
 		TranslationDisabled = (1ULL << 13),
 		Color               = (1ULL << 14),
-		BackgroundEmoji     = (1ULL << 15),
-		StoriesState        = (1ULL << 16),
+		ColorProfile        = (1ULL << 15),
+		BackgroundEmoji     = (1ULL << 16),
+		StoriesState        = (1ULL << 17),
+		VerifyInfo          = (1ULL << 18),
+		StarsPerMessage     = (1ULL << 19),
 
 		// For users
-		CanShareContact     = (1ULL << 17),
-		IsContact           = (1ULL << 18),
-		PhoneNumber         = (1ULL << 19),
-		OnlineStatus        = (1ULL << 20),
-		BotCommands         = (1ULL << 21),
-		BotCanBeInvited     = (1ULL << 22),
-		BotStartToken       = (1ULL << 23),
-		CommonChats         = (1ULL << 24),
-		PeerGifts           = (1ULL << 25),
-		HasCalls            = (1ULL << 26),
-		SupportInfo         = (1ULL << 27),
-		IsBot               = (1ULL << 28),
-		EmojiStatus         = (1ULL << 29),
-		BusinessDetails     = (1ULL << 30),
-		Birthday            = (1ULL << 31),
-		PersonalChannel     = (1ULL << 32),
+		CanShareContact     = (1ULL << 20),
+		IsContact           = (1ULL << 21),
+		PhoneNumber         = (1ULL << 22),
+		OnlineStatus        = (1ULL << 23),
+		BotCommands         = (1ULL << 24),
+		BotCanBeInvited     = (1ULL << 25),
+		BotStartToken       = (1ULL << 26),
+		CommonChats         = (1ULL << 27),
+		PeerGifts           = (1ULL << 28),
+		HasCalls            = (1ULL << 29),
+		SupportInfo         = (1ULL << 30),
+		IsBot               = (1ULL << 31),
+		EmojiStatus         = (1ULL << 32),
+		BusinessDetails     = (1ULL << 33),
+		Birthday            = (1ULL << 34),
+		PersonalChannel     = (1ULL << 35),
+		StarRefProgram      = (1ULL << 36),
+		PaysPerMessage      = (1ULL << 37),
+		GiftSettings        = (1ULL << 38),
+		StarsRating         = (1ULL << 39),
+		ContactNote         = (1ULL << 40),
 
 		// For chats and channels
-		InviteLinks         = (1ULL << 33),
-		Members             = (1ULL << 34),
-		Admins              = (1ULL << 35),
-		BannedUsers         = (1ULL << 36),
-		Rights              = (1ULL << 37),
-		PendingRequests     = (1ULL << 38),
-		Reactions           = (1ULL << 39),
+		InviteLinks         = (1ULL << 41),
+		Members             = (1ULL << 42),
+		Admins              = (1ULL << 43),
+		BannedUsers         = (1ULL << 44),
+		Rights              = (1ULL << 45),
+		PendingRequests     = (1ULL << 46),
+		Reactions           = (1ULL << 47),
 
 		// For channels
-		ChannelAmIn         = (1ULL << 40),
-		StickersSet         = (1ULL << 41),
-		EmojiSet            = (1ULL << 42),
-		ChannelLinkedChat   = (1ULL << 43),
-		ChannelLocation     = (1ULL << 44),
-		Slowmode            = (1ULL << 45),
-		GroupCall           = (1ULL << 46),
+		ChannelAmIn         = (1ULL << 48),
+		StickersSet         = (1ULL << 49),
+		EmojiSet            = (1ULL << 50),
+		DiscussionLink      = (1ULL << 51),
+		MonoforumLink       = (1ULL << 52),
+		ChannelLocation     = (1ULL << 53),
+		Slowmode            = (1ULL << 54),
+		GroupCall           = (1ULL << 55),
+		ManagedBot          = (1ULL << 56),
 
 		// For iteration
-		LastUsedBit         = (1ULL << 46),
+		LastUsedBit         = (1ULL << 56),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
@@ -141,8 +153,9 @@ struct HistoryUpdate {
 		CloudDraft         = (1U << 12),
 		TranslateFrom      = (1U << 13),
 		TranslatedTo       = (1U << 14),
+		UnreadPollVotes    = (1U << 15),
 
-		LastUsedBit        = (1U << 14),
+		LastUsedBit        = (1U << 15),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
@@ -167,8 +180,9 @@ struct TopicUpdate {
 		Closed          = (1U << 9),
 		Creator         = (1U << 10),
 		Destroyed       = (1U << 11),
+		UnreadPollVotes = (1U << 12),
 
-		LastUsedBit     = (1U << 11),
+		LastUsedBit     = (1U << 12),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
@@ -178,6 +192,26 @@ struct TopicUpdate {
 
 };
 
+struct SublistUpdate {
+	enum class Flag : uint32 {
+		None = 0,
+
+		UnreadView = (1U << 1),
+		UnreadReactions = (1U << 2),
+		CloudDraft = (1U << 3),
+		Destroyed = (1U << 4),
+		UnreadPollVotes = (1U << 5),
+
+		LastUsedBit = (1U << 5),
+	};
+	using Flags = base::flags<Flag>;
+	friend inline constexpr auto is_flag_type(Flag) { return true; }
+
+	not_null<SavedSublist*> sublist;
+	Flags flags = 0;
+
+};
+
 struct MessageUpdate {
 	enum class Flag : uint32 {
 		None = 0,
@@ -245,6 +279,19 @@ struct StoryUpdate {
 
 };
 
+struct ChatAdminChange {
+	not_null<PeerData*> peer;
+	not_null<UserData*> user;
+	ChatAdminRights rights;
+	QString rank;
+};
+
+struct ChatMemberRankChange {
+	not_null<PeerData*> peer;
+	not_null<UserData*> user;
+	QString rank;
+};
+
 class Changes final {
 public:
 	explicit Changes(not_null<Main::Session*> session);
@@ -299,6 +346,21 @@ class Changes final {
 		TopicUpdate::Flag flag) const;
 	void topicRemoved(not_null<ForumTopic*> topic);
 
+	void sublistUpdated(
+		not_null<SavedSublist*> sublist,
+		SublistUpdate::Flags flags);
+	[[nodiscard]] rpl::producer<SublistUpdate> sublistUpdates(
+		SublistUpdate::Flags flags) const;
+	[[nodiscard]] rpl::producer<SublistUpdate> sublistUpdates(
+		not_null<SavedSublist*> sublist,
+		SublistUpdate::Flags flags) const;
+	[[nodiscard]] rpl::producer<SublistUpdate> sublistFlagsValue(
+		not_null<SavedSublist*> sublist,
+		SublistUpdate::Flags flags) const;
+	[[nodiscard]] rpl::producer<SublistUpdate> realtimeSublistUpdates(
+		SublistUpdate::Flag flag) const;
+	void sublistRemoved(not_null<SavedSublist*> sublist);
+
 	void messageUpdated(
 		not_null<HistoryItem*> item,
 		MessageUpdate::Flags flags);
@@ -342,6 +404,19 @@ class Changes final {
 	[[nodiscard]] rpl::producer<StoryUpdate> realtimeStoryUpdates(
 		StoryUpdate::Flag flag) const;
 
+	void chatAdminChanged(
+		not_null<PeerData*> peer,
+		not_null<UserData*> user,
+		ChatAdminRights rights,
+		QString rank);
+	[[nodiscard]] rpl::producer<ChatAdminChange> chatAdminChanges() const;
+
+	void chatMemberRankChanged(
+		not_null<PeerData*> peer,
+		not_null<UserData*> user,
+		QString rank);
+	[[nodiscard]] rpl::producer<ChatMemberRankChange> chatMemberRankChanges() const;
+
 	void sendNotifications();
 
 private:
@@ -390,9 +465,12 @@ class Changes final {
 	Manager<PeerData, PeerUpdate> _peerChanges;
 	Manager<History, HistoryUpdate> _historyChanges;
 	Manager<ForumTopic, TopicUpdate> _topicChanges;
+	Manager<SavedSublist, SublistUpdate> _sublistChanges;
 	Manager<HistoryItem, MessageUpdate> _messageChanges;
 	Manager<Dialogs::Entry, EntryUpdate> _entryChanges;
 	Manager<Story, StoryUpdate> _storyChanges;
+	rpl::event_stream<ChatAdminChange> _chatAdminChanges;
+	rpl::event_stream<ChatMemberRankChange> _chatMemberRankChanges;
 
 	bool _notify = false;
 
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index 157a16b392a3c2..8687dadc9fe5a5 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -7,7 +7,11 @@ For license and copyright information please follow this link:
 */
 #include "data/data_channel.h"
 
+#include "api/api_credits.h"
 #include "api/api_global_privacy.h"
+#include "api/api_statistics.h"
+#include "base/timer_rpl.h"
+#include "data/components/credits.h"
 #include "data/data_changes.h"
 #include "data/data_channel_admins.h"
 #include "data/data_user.h"
@@ -20,6 +24,7 @@ For license and copyright information please follow this link:
 #include "data/data_histories.h"
 #include "data/data_group_call.h"
 #include "data/data_message_reactions.h"
+#include "data/data_saved_messages.h"
 #include "data/data_wall_paper.h"
 #include "data/notify/data_notify_settings.h"
 #include "main/main_session.h"
@@ -27,9 +32,12 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "core/application.h"
 #include "history/history.h"
+#include "history/history_item.h"
 #include "api/api_chat_invite.h"
 #include "api/api_invite_links.h"
 #include "apiwrap.h"
+#include "storage/storage_account.h"
+#include "ui/unread_badge.h"
 #include "window/notifications_manager.h"
 
 namespace {
@@ -83,10 +91,31 @@ std::unique_ptr<Data::Forum> MegagroupInfo::takeForumData() {
 	return nullptr;
 }
 
+void MegagroupInfo::ensureMonoforum(not_null<ChannelData*> that) {
+	if (!_monoforum) {
+		const auto history = that->owner().history(that);
+		_monoforum = std::make_unique<Data::SavedMessages>(
+			&that->owner(),
+			that);
+		history->monoforumChanged(nullptr);
+	}
+}
+
+Data::SavedMessages *MegagroupInfo::monoforum() const {
+	return _monoforum.get();
+}
+
+std::unique_ptr<Data::SavedMessages> MegagroupInfo::takeMonoforumData() {
+	if (auto result = base::take(_monoforum)) {
+		const auto history = result->owner().history(result->parentChat());
+		history->monoforumChanged(result.get());
+		return result;
+	}
+	return nullptr;
+}
+
 ChannelData::ChannelData(not_null<Data::Session*> owner, PeerId id)
 : PeerData(owner, id)
-, inputChannel(
-	MTP_inputChannel(MTP_long(peerToChannel(id).bare), MTP_long(0)))
 , _ptsWaiter(&owner->session().updates()) {
 }
 
@@ -145,16 +174,19 @@ bool ChannelData::isUsernameEditable(QString username) const {
 }
 
 void ChannelData::setAccessHash(uint64 accessHash) {
-	access = accessHash;
-	input = MTP_inputPeerChannel(
-		MTP_long(peerToChannel(id).bare),
-		MTP_long(accessHash));
-	inputChannel = MTP_inputChannel(
-		MTP_long(peerToChannel(id).bare),
-		MTP_long(accessHash));
+	_accessHash = accessHash;
 }
 
 void ChannelData::setFlags(ChannelDataFlags which) {
+	if (which & Flag::MonoforumAdmin) {
+		which |= Flag::Monoforum;
+	}
+	if (which & (Flag::Forum | Flag::Monoforum)) {
+		which |= Flag::Megagroup;
+	}
+	if (which & Flag::Monoforum) {
+		which &= ~Flag::Forum;
+	}
 	const auto diff = flags() ^ which;
 	if ((which & Flag::Megagroup) && !mgInfo) {
 		mgInfo = std::make_unique<MegagroupInfo>();
@@ -163,11 +195,17 @@ void ChannelData::setFlags(ChannelDataFlags which) {
 	// Let Data::Forum live till the end of _flags.set.
 	// That way the data can be used in changes handler.
 	// Example: render frame for forum auto-closing animation.
-	const auto taken = ((diff & Flag::Forum) && !(which & Flag::Forum))
+	const auto takenForum = ((diff & Flag::Forum) && !(which & Flag::Forum))
 		? mgInfo->takeForumData()
 		: nullptr;
+	const auto takenMonoforum = ((diff & Flag::MonoforumAdmin)
+		&& !(which & Flag::MonoforumAdmin))
+		? mgInfo->takeMonoforumData()
+		: nullptr;
 	const auto wasIn = amIn();
-	if ((diff & Flag::Forum) && (which & Flag::Forum)) {
+	if ((diff & Flag::MonoforumAdmin) && (which & Flag::MonoforumAdmin)) {
+		mgInfo->ensureMonoforum(this);
+	} else if ((diff & Flag::Forum) && (which & Flag::Forum)) {
 		mgInfo->ensureForum(this);
 	}
 	_flags.set(which);
@@ -186,20 +224,24 @@ void ChannelData::setFlags(ChannelDataFlags which) {
 		}
 	}
 	if (diff & (Flag::Forum
+		| Flag::MonoforumAdmin
 		| Flag::CallNotEmpty
 		| Flag::SimilarExpanded
 		| Flag::Signatures
-		| Flag::SignatureProfiles)) {
+		| Flag::SignatureProfiles
+		| Flag::ForumTabs)) {
 		if (const auto history = this->owner().historyLoaded(this)) {
 			if (diff & Flag::CallNotEmpty) {
 				history->updateChatListEntry();
 			}
-			if (diff & Flag::Forum) {
+			if (diff & (Flag::Forum | Flag::MonoforumAdmin)) {
 				Core::App().notifications().clearFromHistory(history);
 				history->updateChatListEntryHeight();
 				if (history->inChatList()) {
 					if (const auto forum = this->forum()) {
 						forum->preloadTopics();
+					} else if (const auto monoforum = this->monoforum()) {
+						monoforum->preloadSublists();
 					}
 				}
 			}
@@ -214,9 +256,12 @@ void ChannelData::setFlags(ChannelDataFlags which) {
 			if (diff & (Flag::Signatures | Flag::SignatureProfiles)) {
 				session().changes().peerUpdated(this, UpdateFlag::Rights);
 			}
+			if (diff & Flag::ForumTabs) {
+				history->forumTabsChanged(which & Flag::ForumTabs);
+			}
 		}
 	}
-	if (const auto raw = taken.get()) {
+	if (const auto raw = takenForum.get()) {
 		owner().forumIcons().clearUserpicsReset(raw);
 	}
 }
@@ -269,22 +314,54 @@ const ChannelLocation *ChannelData::getLocation() const {
 	return mgInfo ? mgInfo->getLocation() : nullptr;
 }
 
-void ChannelData::setLinkedChat(ChannelData *linked) {
-	if (_linkedChat != linked) {
-		_linkedChat = linked;
+void ChannelData::setDiscussionLink(ChannelData *linked) {
+	if (_discussionLink != linked || !_discussionLinkKnown) {
+		_discussionLink = linked;
+		_discussionLinkKnown = true;
 		if (const auto history = owner().historyLoaded(this)) {
 			history->forceFullResize();
 		}
-		session().changes().peerUpdated(this, UpdateFlag::ChannelLinkedChat);
+		session().changes().peerUpdated(this, UpdateFlag::DiscussionLink);
+	}
+}
+
+ChannelData *ChannelData::discussionLink() const {
+	return _discussionLink;
+}
+
+bool ChannelData::discussionLinkKnown() const {
+	return _discussionLinkKnown;
+}
+
+void ChannelData::setMonoforumLink(ChannelData *link) {
+	if (_monoforumLink) {
+		if (isBroadcast()) {
+			_monoforumLink->setMonoforumLink(link ? this : nullptr);
+		} else if (isMonoforum()) {
+			if (!link && !monoforumDisabled()) {
+				setFlags(flags() | Flag::MonoforumDisabled);
+			} else if (link && monoforumDisabled()) {
+				setFlags(flags() & ~Flag::MonoforumDisabled);
+			}
+		}
+		return;
+	} else if (!link) {
+		return;
+	}
+	_monoforumLink = link;
+	link->setMonoforumLink(this);
+	session().changes().peerUpdated(this, UpdateFlag::MonoforumLink);
+	if (isMegagroup() && link->canAccessMonoforum()) {
+		setFlags(flags() | Flag::MonoforumAdmin);
 	}
 }
 
-ChannelData *ChannelData::linkedChat() const {
-	return _linkedChat.value_or(nullptr);
+ChannelData *ChannelData::monoforumLink() const {
+	return _monoforumLink;
 }
 
-bool ChannelData::linkedChatKnown() const {
-	return _linkedChat.has_value();
+bool ChannelData::monoforumDisabled() const {
+	return flags() & Flag::MonoforumDisabled;
 }
 
 void ChannelData::setMembersCount(int newMembersCount) {
@@ -343,6 +420,11 @@ void ChannelData::setPendingRequestsCount(
 	}
 }
 
+bool ChannelData::useSubsectionTabs() const {
+	return amMonoforumAdmin()
+		|| (isForum() && (flags() & ChannelDataFlag::ForumTabs));
+}
+
 ChatRestrictionsInfo ChannelData::KickedRestrictedRights(
 		not_null<PeerData*> participant) {
 	using Flag = ChatRestriction;
@@ -376,8 +458,8 @@ void ChannelData::applyEditAdmin(
 			setMembersCount(membersCount() + 1);
 			if (user->isBot() && !mgInfo->bots.contains(user)) {
 				mgInfo->bots.insert(user);
-				if (mgInfo->botStatus != 0 && mgInfo->botStatus < 2) {
-					mgInfo->botStatus = 2;
+				if (mgInfo->botStatus == Data::BotStatus::NoBots) {
+					mgInfo->botStatus = Data::BotStatus::HasBots;
 				}
 			}
 		}
@@ -428,6 +510,17 @@ void ChannelData::applyEditAdmin(
 	session().changes().peerUpdated(this, UpdateFlag::Admins);
 }
 
+void ChannelData::applyEditMemberRank(
+		not_null<UserData*> user,
+		const QString &rank) {
+	if (!mgInfo) {
+		return;
+	}
+	const auto userId = peerToUser(user->id);
+	Data::ChannelMemberRankChanges changes(this);
+	changes.feed(userId, rank);
+}
+
 void ChannelData::applyEditBanned(
 		not_null<PeerData*> participant,
 		ChatRestrictionsInfo oldRights,
@@ -469,31 +562,29 @@ void ChannelData::applyEditBanned(
 					not_null{ user });
 				if (i != mgInfo->lastParticipants.end()) {
 					mgInfo->lastParticipants.erase(i);
-				}
-				if (membersCount() > 1) {
-					setMembersCount(membersCount() - 1);
+					if (membersCount() > 1) {
+						setMembersCount(membersCount() - 1);
+					} else {
+						mgInfo->lastParticipantsStatus |= MegagroupInfo::LastParticipantsCountOutdated;
+						mgInfo->lastParticipantsCount = 0;
+					}
 				} else {
 					mgInfo->lastParticipantsStatus |= MegagroupInfo::LastParticipantsCountOutdated;
-					mgInfo->lastParticipantsCount = 0;
 				}
+				flags |= UpdateFlag::Members;
+				owner().removeMegagroupParticipant(this, user);
 				setKickedCount(kickedCount() + 1);
 				if (mgInfo->bots.contains(user)) {
 					mgInfo->bots.remove(user);
-					if (mgInfo->bots.empty() && mgInfo->botStatus > 0) {
-						mgInfo->botStatus = -1;
+					if (mgInfo->bots.empty() && mgInfo->botStatus == Data::BotStatus::HasBots) {
+						mgInfo->botStatus = Data::BotStatus::NoBots;
 					}
 				}
-				flags |= UpdateFlag::Members;
-				owner().removeMegagroupParticipant(this, user);
 			}
 		}
 		Data::ChannelAdminChanges(this).remove(peerToUser(user->id));
 	} else if (!mgInfo) {
 		if (isKicked) {
-			if (user && membersCount() > 1) {
-				setMembersCount(membersCount() - 1);
-				flags |= UpdateFlag::Members;
-			}
 			setKickedCount(kickedCount() + 1);
 		}
 	}
@@ -514,7 +605,7 @@ void ChannelData::markForbidden() {
 			? MTPDchannelForbidden::Flag::f_megagroup
 			: MTPDchannelForbidden::Flag::f_broadcast),
 		MTP_long(peerToChannel(id).bare),
-		MTP_long(access),
+		MTP_long(_accessHash),
 		MTP_string(name()),
 		MTPint()));
 }
@@ -557,38 +648,38 @@ void ChannelData::setAvailableMinId(MsgId availableMinId) {
 }
 
 bool ChannelData::canBanMembers() const {
-	return amCreator()
-		|| (adminRights() & AdminRight::BanUsers);
+	return amCreator() || (adminRights() & AdminRight::BanUsers);
 }
 
 bool ChannelData::canPostMessages() const {
-	return amCreator()
-		|| (adminRights() & AdminRight::PostMessages);
+	return amCreator() || (adminRights() & AdminRight::PostMessages);
 }
 
 bool ChannelData::canEditMessages() const {
-	return amCreator()
-		|| (adminRights() & AdminRight::EditMessages);
+	return amCreator() || (adminRights() & AdminRight::EditMessages);
 }
 
 bool ChannelData::canDeleteMessages() const {
-	return amCreator()
-		|| (adminRights() & AdminRight::DeleteMessages);
+	return amCreator() || (adminRights() & AdminRight::DeleteMessages);
 }
 
 bool ChannelData::canPostStories() const {
-	return amCreator()
-		|| (adminRights() & AdminRight::PostStories);
+	return amCreator() || (adminRights() & AdminRight::PostStories);
 }
 
 bool ChannelData::canEditStories() const {
-	return amCreator()
-		|| (adminRights() & AdminRight::EditStories);
+	if (isMonoforum()) {
+		return false;
+	}
+	return amCreator() || (adminRights() & AdminRight::EditStories);
 }
 
 bool ChannelData::canDeleteStories() const {
-	return amCreator()
-		|| (adminRights() & AdminRight::DeleteStories);
+	return amCreator() || (adminRights() & AdminRight::DeleteStories);
+}
+
+bool ChannelData::canAccessMonoforum() const {
+	return amCreator() || (adminRights() & AdminRight::ManageDirect);
 }
 
 bool ChannelData::canPostPaidMedia() const {
@@ -604,14 +695,15 @@ bool ChannelData::hiddenPreHistory() const {
 }
 
 bool ChannelData::canAddMembers() const {
-	return isMegagroup()
+	return isMonoforum()
+		? false
+		: isMegagroup()
 		? !amRestricted(ChatRestriction::AddParticipants)
 		: ((adminRights() & AdminRight::InviteByLinkOrAdd) || amCreator());
 }
 
 bool ChannelData::canAddAdmins() const {
-	return amCreator()
-		|| (adminRights() & AdminRight::AddAdmins);
+	return amCreator() || (adminRights() & AdminRight::AddAdmins);
 }
 
 bool ChannelData::allowsForwarding() const {
@@ -646,7 +738,11 @@ bool ChannelData::canEditPermissions() const {
 }
 
 bool ChannelData::canEditSignatures() const {
-	return isChannel() && canEditInformation();
+	return isBroadcast() && canEditInformation();
+}
+
+bool ChannelData::canEditAutoTranslate() const {
+	return isBroadcast() && canEditInformation();
 }
 
 bool ChannelData::canEditPreHistoryHidden() const {
@@ -669,9 +765,7 @@ bool ChannelData::canEditEmoji() const {
 }
 
 bool ChannelData::canDelete() const {
-	constexpr auto kDeleteChannelMembersLimit = 1000;
-	return amCreator()
-		&& (membersCount() <= kDeleteChannelMembersLimit);
+	return amCreator();
 }
 
 bool ChannelData::canEditLastAdmin(not_null<UserData*> user) const {
@@ -713,6 +807,33 @@ bool ChannelData::canRestrictParticipant(
 	return adminRights() & AdminRight::BanUsers;
 }
 
+void ChannelData::setBotVerifyDetails(Ui::BotVerifyDetails details) {
+	if (!details) {
+		if (_botVerifyDetails) {
+			_botVerifyDetails = nullptr;
+			session().changes().peerUpdated(this, UpdateFlag::VerifyInfo);
+		}
+	} else if (!_botVerifyDetails) {
+		_botVerifyDetails = std::make_unique<Ui::BotVerifyDetails>(details);
+		session().changes().peerUpdated(this, UpdateFlag::VerifyInfo);
+	} else if (*_botVerifyDetails != details) {
+		*_botVerifyDetails = details;
+		session().changes().peerUpdated(this, UpdateFlag::VerifyInfo);
+	}
+}
+
+void ChannelData::setBotVerifyDetailsIcon(DocumentId iconId) {
+	if (!iconId) {
+		setBotVerifyDetails({});
+	} else {
+		auto info = _botVerifyDetails
+			? *_botVerifyDetails
+			: Ui::BotVerifyDetails();
+		info.iconId = iconId;
+		setBotVerifyDetails(info);
+	}
+}
+
 void ChannelData::setAdminRights(ChatAdminRights rights) {
 	if (rights == adminRights()) {
 		return;
@@ -738,6 +859,11 @@ void ChannelData::setAdminRights(ChatAdminRights rights) {
 	session().changes().peerUpdated(
 		this,
 		UpdateFlag::Rights | UpdateFlag::Admins | UpdateFlag::BannedUsers);
+	if (isBroadcast() && _monoforumLink) {
+		const auto flags = _monoforumLink->flags();
+		_monoforumLink->setFlags((flags & ~Flag::MonoforumAdmin)
+			| (canAccessMonoforum() ? Flag::MonoforumAdmin : Flag()));
+	}
 }
 
 void ChannelData::setRestrictions(ChatRestrictionsInfo rights) {
@@ -831,6 +957,33 @@ void ChannelData::growSlowmodeLastMessage(TimeId when) {
 	session().changes().peerUpdated(this, UpdateFlag::Slowmode);
 }
 
+int ChannelData::starsPerMessage() const {
+	return _starsPerMessage;
+}
+
+int ChannelData::commonStarsPerMessage() const {
+	return owner().commonStarsPerMessage(this);
+}
+
+void ChannelData::setStarsPerMessage(int stars) {
+	if (_starsPerMessage != stars) {
+		_starsPerMessage = stars;
+		session().changes().peerUpdated(this, UpdateFlag::StarsPerMessage);
+	}
+	checkTrustedPayForMessage();
+}
+
+int ChannelData::peerGiftsCount() const {
+	return _peerGiftsCount;
+}
+
+void ChannelData::setPeerGiftsCount(int count) {
+	if (_peerGiftsCount != count) {
+		_peerGiftsCount = count;
+		session().changes().peerUpdated(this, UpdateFlag::PeerGifts);
+	}
+}
+
 int ChannelData::boostsApplied() const {
 	if (const auto info = mgInfo.get()) {
 		return info->boostsApplied;
@@ -857,7 +1010,7 @@ rpl::producer<bool> ChannelData::unrestrictedByBoostsValue() const {
 	return mgInfo
 		? mgInfo->unrestrictedByBoostsChanges.events_starting_with(
 			unrestrictedByBoosts())
-		: (rpl::single(false) | rpl::type_erased());
+		: (rpl::single(false) | rpl::type_erased);
 }
 
 void ChannelData::setBoostsUnrestrict(int applied, int unrestrict) {
@@ -900,7 +1053,7 @@ QString ChannelData::invitePeekHash() const {
 }
 
 void ChannelData::privateErrorReceived() {
-	if (const auto expires = invitePeekExpires()) {
+	if (invitePeekExpires()) {
 		const auto hash = invitePeekHash();
 		for (const auto &window : session().windows()) {
 			clearInvitePeek();
@@ -945,10 +1098,13 @@ void ChannelData::setGroupCall(
 			data.vid().v,
 			data.vaccess_hash().v,
 			scheduleDate,
-			rtmp);
+			rtmp,
+			Data::GroupCallOrigin::Group);
 		owner().registerGroupCall(_call.get());
 		session().changes().peerUpdated(this, UpdateFlag::GroupCall);
 		addFlags(Flag::CallActive);
+	}, [&](const auto &) {
+		clearGroupCall();
 	});
 }
 
@@ -973,7 +1129,7 @@ PeerId ChannelData::groupCallDefaultJoinAs() const {
 void ChannelData::setAllowedReactions(Data::AllowedReactions value) {
 	if (_allowedReactions != value) {
 		if (value.paidEnabled) {
-			session().api().globalPrivacy().loadPaidReactionAnonymous();
+			session().api().globalPrivacy().loadPaidReactionShownPeer();
 		}
 		const auto enabled = [](const Data::AllowedReactions &allowed) {
 			return (allowed.type != Data::AllowedReactionsType::Some)
@@ -1002,20 +1158,34 @@ bool ChannelData::hasUnreadStories() const {
 	return flags() & Flag::HasUnreadStories;
 }
 
+bool ChannelData::hasActiveVideoStream() const {
+	return flags() & Flag::HasActiveVideoStream;
+}
+
 void ChannelData::setStoriesState(StoriesState state) {
 	Expects(state != StoriesState::Unknown);
 
 	const auto was = flags();
 	switch (state) {
 	case StoriesState::None:
-		_flags.remove(Flag::HasActiveStories | Flag::HasUnreadStories);
+		_flags.remove(Flag::HasActiveStories
+			| Flag::HasUnreadStories
+			| Flag::HasActiveVideoStream);
 		break;
 	case StoriesState::HasRead:
-		_flags.set(
-			(flags() & ~Flag::HasUnreadStories) | Flag::HasActiveStories);
+		_flags.set(Flag::HasActiveStories
+			| (was
+				& ~(Flag::HasUnreadStories | Flag::HasActiveVideoStream)));
 		break;
 	case StoriesState::HasUnread:
-		_flags.add(Flag::HasActiveStories | Flag::HasUnreadStories);
+		_flags.set((was & ~Flag::HasActiveVideoStream)
+			| Flag::HasActiveStories
+			| Flag::HasUnreadStories);
+		break;
+	case StoriesState::HasVideoStream:
+		_flags.set((was & ~Flag::HasUnreadStories)
+			| Flag::HasActiveStories
+			| Flag::HasActiveVideoStream);
 		break;
 	}
 	if (flags() != was) {
@@ -1026,12 +1196,6 @@ void ChannelData::setStoriesState(StoriesState state) {
 	}
 }
 
-void ChannelData::processTopics(const MTPVector<MTPForumTopic> &topics) {
-	if (const auto forum = this->forum()) {
-		forum->applyReceivedTopics(topics);
-	}
-}
-
 int ChannelData::levelHint() const {
 	return _levelHint;
 }
@@ -1044,10 +1208,33 @@ TimeId ChannelData::subscriptionUntilDate() const {
 	return _subscriptionUntilDate;
 }
 
+UserData *ChannelData::guardBot() const {
+	return _guardBotId
+		? owner().userLoaded(_guardBotId)
+		: nullptr;
+}
+
+void ChannelData::setGuardBotId(UserId userId) {
+	_guardBotId = userId;
+}
+
 void ChannelData::updateSubscriptionUntilDate(TimeId subscriptionUntilDate) {
 	_subscriptionUntilDate = subscriptionUntilDate;
 }
 
+MTPInputChannel ChannelData::inputChannel() const {
+	const auto item = isLoaded() ? nullptr : owner().messageWithPeer(id);
+	if (item) {
+		return MTP_inputChannelFromMessage(
+			item->history()->peer->input(),
+			MTP_int(item->id.bare),
+			MTP_long(peerToChannel(id).bare));
+	}
+	return MTP_inputChannel(
+		MTP_long(peerToChannel(id).bare),
+		MTP_long(_accessHash));
+}
+
 namespace Data {
 
 void ApplyMigration(
@@ -1098,6 +1285,9 @@ void ApplyChannelUpdate(
 	}
 
 	channel->setMessagesTTL(update.vttl_period().value_or_empty());
+	channel->setStarsPerMessage(
+		update.vsend_paid_messages_stars().value_or_empty());
+	channel->setGuardBotId(UserId(update.vguard_bot_id().value_or_empty()));
 	using Flag = ChannelDataFlag;
 	const auto mask = Flag::CanSetUsername
 		| Flag::CanViewParticipants
@@ -1110,7 +1300,11 @@ void ApplyChannelUpdate(
 		| Flag::ViewAsMessages
 		| Flag::CanViewRevenue
 		| Flag::PaidMediaAllowed
-		| Flag::CanViewCreditsRevenue;
+		| Flag::CanViewCreditsRevenue
+		| Flag::StargiftsAvailable
+		| Flag::PaidMessagesAvailable
+		| (channel->starsPerMessage() ? Flag::HasStarsPerMessage : Flag())
+		| Flag::StarsPerMessageKnown;
 	channel->setFlags((channel->flags() & ~mask)
 		| (update.is_can_set_username() ? Flag::CanSetUsername : Flag())
 		| (update.is_can_view_participants()
@@ -1131,7 +1325,15 @@ void ApplyChannelUpdate(
 		| (update.is_can_view_revenue() ? Flag::CanViewRevenue : Flag())
 		| (update.is_can_view_stars_revenue()
 			? Flag::CanViewCreditsRevenue
-			: Flag()));
+			: Flag())
+		| (update.is_stargifts_available()
+			? Flag::StargiftsAvailable
+			: Flag())
+		| (update.is_paid_messages_available()
+			? Flag::PaidMessagesAvailable
+			: Flag())
+		| (channel->starsPerMessage() ? Flag::HasStarsPerMessage : Flag())
+		| Flag::StarsPerMessageKnown);
 	channel->setUserpicPhoto(update.vchat_photo());
 	if (const auto migratedFrom = update.vmigrated_from_chat_id()) {
 		channel->addFlags(Flag::Megagroup);
@@ -1144,6 +1346,7 @@ void ApplyChannelUpdate(
 	channel->setRestrictedCount(update.vbanned_count().value_or_empty());
 	channel->setKickedCount(update.vkicked_count().value_or_empty());
 	channel->setSlowmodeSeconds(update.vslowmode_seconds().value_or_empty());
+	channel->setPeerGiftsCount(update.vstargifts_count().value_or_empty());
 	if (const auto next = update.vslowmode_next_send_date()) {
 		channel->growSlowmodeLastMessage(
 			next->v - channel->slowmodeSeconds());
@@ -1161,9 +1364,9 @@ void ApplyChannelUpdate(
 		channel->setLocation(MTP_channelLocationEmpty());
 	}
 	if (const auto chat = update.vlinked_chat_id()) {
-		channel->setLinkedChat(channel->owner().channelLoaded(chat->v));
+		channel->setDiscussionLink(channel->owner().channelLoaded(chat->v));
 	} else {
-		channel->setLinkedChat(nullptr);
+		channel->setDiscussionLink(nullptr);
 	}
 	if (const auto history = channel->owner().historyLoaded(channel)) {
 		if (const auto available = update.vavailable_min_id()) {
@@ -1235,7 +1438,7 @@ void ApplyChannelUpdate(
 			update.vboosts_applied().value_or_empty(),
 			update.vboosts_unrestrict().value_or_empty());
 	}
-	channel->setThemeEmoji(qs(update.vtheme_emoticon().value_or_empty()));
+	channel->setThemeToken(qs(update.vtheme_emoticon().value_or_empty()));
 	channel->setTranslationDisabled(update.is_translations_disabled());
 
 	const auto reactionsLimit = update.vreactions_limit().value_or_empty();
@@ -1251,6 +1454,8 @@ void ApplyChannelUpdate(
 			.paidEnabled = update.is_paid_reactions_available(),
 		});
 	}
+	channel->setBotVerifyDetails(
+		ParseBotVerifyDetails(update.vbot_verification()));
 	channel->owner().stories().apply(channel, update.vstories());
 	channel->fullUpdated();
 	channel->setPendingRequestsCount(
@@ -1283,6 +1488,43 @@ void ApplyChannelUpdate(
 		channel->setWallPaper({});
 	}
 
+	if ((channel->flags() & Flag::CanViewRevenue)
+		|| (channel->flags() & Flag::CanViewCreditsRevenue)) {
+		static constexpr auto kTimeout = crl::time(60000);
+		const auto id = channel->id;
+		const auto weak = base::make_weak(&channel->session());
+		const auto creditsLoadLifetime = std::make_shared<rpl::lifetime>();
+		const auto creditsLoad
+			= creditsLoadLifetime->make_state<Api::CreditsStatus>(channel);
+		creditsLoad->request({}, [=](Data::CreditsStatusSlice slice) {
+			if (const auto strong = weak.get()) {
+				strong->credits().apply(id, slice.balance);
+			}
+			creditsLoadLifetime->destroy();
+		});
+		base::timer_once(kTimeout) | rpl::on_next([=] {
+			creditsLoadLifetime->destroy();
+		}, *creditsLoadLifetime);
+		const auto currencyLoadLifetime = std::make_shared<rpl::lifetime>();
+		const auto currencyLoad
+			= currencyLoadLifetime->make_state<Api::EarnStatistics>(channel);
+		const auto apply = [=](const CreditsAmount &balance) {
+			if (const auto strong = weak.get()) {
+				strong->credits().applyCurrency(id, balance);
+			}
+			currencyLoadLifetime->destroy();
+		};
+		currencyLoad->request() | rpl::on_error_done(
+			[=](const QString &error) {
+				apply(CreditsAmount(0, CreditsType::Ton));
+			},
+			[=] { apply(currencyLoad->data().currentBalance); },
+			*currencyLoadLifetime);
+		base::timer_once(kTimeout) | rpl::on_next([=] {
+			currencyLoadLifetime->destroy();
+		}, *currencyLoadLifetime);
+	}
+
 	// For clearUpTill() call.
 	channel->owner().sendHistoryChangeNotifications();
 }
diff --git a/Telegram/SourceFiles/data/data_channel.h b/Telegram/SourceFiles/data/data_channel.h
index 90f3b9274c49bb..d10b6f055cc380 100644
--- a/Telegram/SourceFiles/data/data_channel.h
+++ b/Telegram/SourceFiles/data/data_channel.h
@@ -14,6 +14,13 @@ For license and copyright information please follow this link:
 #include "data/data_peer_bot_commands.h"
 #include "data/data_user_names.h"
 
+class ChannelData;
+
+namespace Data {
+class Forum;
+class SavedMessages;
+} // namespace Data
+
 struct ChannelLocation {
 	QString address;
 	Data::LocationPoint point;
@@ -69,6 +76,16 @@ enum class ChannelDataFlag : uint64 {
 	PaidMediaAllowed = (1ULL << 33),
 	CanViewCreditsRevenue = (1ULL << 34),
 	SignatureProfiles = (1ULL << 35),
+	StargiftsAvailable = (1ULL << 36),
+	PaidMessagesAvailable = (1ULL << 37),
+	AutoTranslation = (1ULL << 38),
+	Monoforum = (1ULL << 39),
+	MonoforumAdmin = (1ULL << 40),
+	MonoforumDisabled = (1ULL << 41),
+	ForumTabs = (1ULL << 42),
+	HasStarsPerMessage = (1ULL << 43),
+	StarsPerMessageKnown = (1ULL << 44),
+	HasActiveVideoStream = (1ULL << 45),
 };
 inline constexpr bool is_flag_type(ChannelDataFlag) { return true; };
 using ChannelDataFlags = base::flags<ChannelDataFlag>;
@@ -113,6 +130,10 @@ class MegagroupInfo {
 	[[nodiscard]] Data::Forum *forum() const;
 	[[nodiscard]] std::unique_ptr<Data::Forum> takeForumData();
 
+	void ensureMonoforum(not_null<ChannelData*> that);
+	[[nodiscard]] Data::SavedMessages *monoforum() const;
+	[[nodiscard]] std::unique_ptr<Data::SavedMessages> takeMonoforumData();
+
 	std::deque<not_null<UserData*>> lastParticipants;
 	base::flat_map<not_null<UserData*>, Admin> lastAdmins;
 	base::flat_map<not_null<UserData*>, Restricted> lastRestricted;
@@ -120,12 +141,11 @@ class MegagroupInfo {
 	base::flat_set<not_null<UserData*>> bots;
 	rpl::event_stream<bool> unrestrictedByBoostsChanges;
 
-	// For admin badges, full admins list with ranks.
-	base::flat_map<UserId, QString> admins;
+	base::flat_set<UserId> admins;
+	base::flat_map<UserId, QString> memberRanks;
 
 	UserData *creator = nullptr; // nullptr means unknown
-	QString creatorRank;
-	int botStatus = 0; // -1 - no bots, 0 - unknown, 1 - one bot, that sees all history, 2 - other
+	Data::BotStatus botStatus = Data::BotStatus::Unknown;
 	bool joinedMessageFound = false;
 	bool adminsLoaded = false;
 	StickerSetIdentifier stickerSet;
@@ -149,6 +169,9 @@ class MegagroupInfo {
 	ChannelLocation _location;
 	Data::ChatBotCommands _botCommands;
 	std::unique_ptr<Data::Forum> _forum;
+	std::unique_ptr<Data::SavedMessages> _monoforum;
+
+	friend class ChannelData;
 
 };
 
@@ -170,6 +193,10 @@ class ChannelData final : public PeerData {
 	void setUsername(const QString &username);
 	void setUsernames(const Data::Usernames &newUsernames);
 	void setPhoto(const MTPChatPhoto &photo);
+
+	[[nodiscard]] uint64 accessHash() const {
+		return _accessHash;
+	}
 	void setAccessHash(uint64 accessHash);
 
 	void setFlags(ChannelDataFlags which);
@@ -253,6 +280,19 @@ class ChannelData final : public PeerData {
 	[[nodiscard]] bool viewForumAsMessages() const {
 		return flags() & Flag::ViewAsMessages;
 	}
+	[[nodiscard]] bool stargiftsAvailable() const {
+		return flags() & Flag::StargiftsAvailable;
+	}
+	[[nodiscard]] bool paidMessagesAvailable() const {
+		return flags() & Flag::PaidMessagesAvailable;
+	}
+	[[nodiscard]] bool hasStarsPerMessage() const {
+		return flags() & Flag::HasStarsPerMessage;
+	}
+	[[nodiscard]] bool starsPerMessageKnown() const {
+		return flags() & Flag::StarsPerMessageKnown;
+	}
+	[[nodiscard]] bool useSubsectionTabs() const;
 
 	[[nodiscard]] static ChatRestrictionsInfo KickedRestrictedRights(
 		not_null<PeerData*> participant);
@@ -265,6 +305,9 @@ class ChannelData final : public PeerData {
 		ChatAdminRightsInfo oldRights,
 		ChatAdminRightsInfo newRights,
 		const QString &rank);
+	void applyEditMemberRank(
+		not_null<UserData*> user,
+		const QString &rank);
 	void applyEditBanned(
 		not_null<PeerData*> participant,
 		ChatRestrictionsInfo oldRights,
@@ -287,6 +330,9 @@ class ChannelData final : public PeerData {
 	[[nodiscard]] bool isForum() const {
 		return flags() & Flag::Forum;
 	}
+	[[nodiscard]] bool isMonoforum() const {
+		return flags() & Flag::Monoforum;
+	}
 	[[nodiscard]] bool hasUsername() const {
 		return flags() & Flag::Username;
 	}
@@ -305,10 +351,17 @@ class ChannelData final : public PeerData {
 	[[nodiscard]] bool requestToJoin() const {
 		return flags() & Flag::RequestToJoin;
 	}
+	[[nodiscard]] UserData *guardBot() const;
+	[[nodiscard]] UserId guardBotId() const {
+		return _guardBotId;
+	}
+	void setGuardBotId(UserId userId);
 	[[nodiscard]] bool antiSpamMode() const {
 		return flags() & Flag::AntiSpam;
 	}
-
+	[[nodiscard]] bool autoTranslation() const {
+		return flags() & Flag::AutoTranslation;
+	}
 	[[nodiscard]] auto adminRights() const {
 		return _adminRights.current();
 	}
@@ -364,11 +417,13 @@ class ChannelData final : public PeerData {
 	[[nodiscard]] bool canEditStories() const;
 	[[nodiscard]] bool canDeleteStories() const;
 	[[nodiscard]] bool canPostPaidMedia() const;
+	[[nodiscard]] bool canAccessMonoforum() const;
 	[[nodiscard]] bool hiddenPreHistory() const;
 	[[nodiscard]] bool canViewMembers() const;
 	[[nodiscard]] bool canViewAdmins() const;
 	[[nodiscard]] bool canViewBanned() const;
 	[[nodiscard]] bool canEditSignatures() const;
+	[[nodiscard]] bool canEditAutoTranslate() const;
 	[[nodiscard]] bool canEditStickers() const;
 	[[nodiscard]] bool canEditEmoji() const;
 	[[nodiscard]] bool canDelete() const;
@@ -376,6 +431,12 @@ class ChannelData final : public PeerData {
 	[[nodiscard]] bool canRestrictParticipant(
 		not_null<PeerData*> participant) const;
 
+	void setBotVerifyDetails(Ui::BotVerifyDetails details);
+	void setBotVerifyDetailsIcon(DocumentId iconId);
+	[[nodiscard]] Ui::BotVerifyDetails *botVerifyDetails() const {
+		return _botVerifyDetails.get();
+	}
+
 	void setInviteLink(const QString &newInviteLink);
 	[[nodiscard]] QString inviteLink() const {
 		return _inviteLink;
@@ -385,9 +446,13 @@ class ChannelData final : public PeerData {
 	void setLocation(const MTPChannelLocation &data);
 	[[nodiscard]] const ChannelLocation *getLocation() const;
 
-	void setLinkedChat(ChannelData *linked);
-	[[nodiscard]] ChannelData *linkedChat() const;
-	[[nodiscard]] bool linkedChatKnown() const;
+	void setDiscussionLink(ChannelData *link);
+	[[nodiscard]] ChannelData *discussionLink() const;
+	[[nodiscard]] bool discussionLinkKnown() const;
+
+	void setMonoforumLink(ChannelData *link);
+	[[nodiscard]] ChannelData *monoforumLink() const;
+	[[nodiscard]] bool monoforumDisabled() const;
 
 	void ptsInit(int32 pts) {
 		_ptsWaiter.init(pts);
@@ -446,6 +511,13 @@ class ChannelData final : public PeerData {
 	[[nodiscard]] TimeId slowmodeLastMessage() const;
 	void growSlowmodeLastMessage(TimeId when);
 
+	void setStarsPerMessage(int stars);
+	[[nodiscard]] int starsPerMessage() const;
+	[[nodiscard]] int commonStarsPerMessage() const;
+
+	[[nodiscard]] int peerGiftsCount() const;
+	void setPeerGiftsCount(int count);
+
 	[[nodiscard]] int boostsApplied() const;
 	[[nodiscard]] int boostsUnrestrict() const;
 	[[nodiscard]] bool unrestrictedByBoosts() const;
@@ -475,13 +547,15 @@ class ChannelData final : public PeerData {
 
 	[[nodiscard]] bool hasActiveStories() const;
 	[[nodiscard]] bool hasUnreadStories() const;
+	[[nodiscard]] bool hasActiveVideoStream() const;
 	void setStoriesState(StoriesState state);
 
 	[[nodiscard]] Data::Forum *forum() const {
 		return mgInfo ? mgInfo->forum() : nullptr;
 	}
-
-	void processTopics(const MTPVector<MTPForumTopic> &topics);
+	[[nodiscard]] Data::SavedMessages *monoforum() const {
+		return mgInfo ? mgInfo->monoforum() : nullptr;
+	}
 
 	[[nodiscard]] int levelHint() const;
 	void updateLevelHint(int levelHint);
@@ -489,11 +563,9 @@ class ChannelData final : public PeerData {
 	[[nodiscard]] TimeId subscriptionUntilDate() const;
 	void updateSubscriptionUntilDate(TimeId subscriptionUntilDate);
 
-	// Still public data members.
-	uint64 access = 0;
-
-	MTPinputChannel inputChannel = MTP_inputChannelEmpty();
+	[[nodiscard]] MTPInputChannel inputChannel() const;
 
+	// Still public data members.
 	int32 date = 0;
 	std::unique_ptr<MegagroupInfo> mgInfo;
 
@@ -521,15 +593,11 @@ class ChannelData final : public PeerData {
 
 	Data::UsernamesInfo _username;
 
-	int _membersCount = -1;
-	int _adminsCount = 1;
-	int _restrictedCount = 0;
-	int _kickedCount = 0;
-	int _pendingRequestsCount = 0;
-	int _levelHint = 0;
 	std::vector<UserId> _recentRequesters;
 	MsgId _availableMinId = 0;
 
+	uint64 _accessHash = 0;
+
 	RestrictionFlags _defaultRestrictions;
 	AdminRightFlags _adminRights;
 	RestrictionFlags _restrictions;
@@ -539,13 +607,28 @@ class ChannelData final : public PeerData {
 	std::vector<Data::UnavailableReason> _unavailableReasons;
 	std::unique_ptr<InvitePeek> _invitePeek;
 	QString _inviteLink;
-	std::optional<ChannelData*> _linkedChat;
+
+	ChannelData *_discussionLink = nullptr;
+	ChannelData *_monoforumLink = nullptr;
+	bool _discussionLinkKnown = false;
+
+	int _peerGiftsCount = 0;
+	int _membersCount = -1;
+	int _adminsCount = 1;
+	int _restrictedCount = 0;
+	int _kickedCount = 0;
+	int _pendingRequestsCount = 0;
+	int _levelHint = 0;
+	int _starsPerMessage = 0;
+	UserId _guardBotId = 0;
 
 	Data::AllowedReactions _allowedReactions;
 
 	std::unique_ptr<Data::GroupCall> _call;
 	PeerId _callDefaultJoinAs = 0;
 
+	std::unique_ptr<Ui::BotVerifyDetails> _botVerifyDetails;
+
 };
 
 namespace Data {
diff --git a/Telegram/SourceFiles/data/data_channel_admins.cpp b/Telegram/SourceFiles/data/data_channel_admins.cpp
index e7ac8ced186688..49764162ccf69b 100644
--- a/Telegram/SourceFiles/data/data_channel_admins.cpp
+++ b/Telegram/SourceFiles/data/data_channel_admins.cpp
@@ -10,31 +10,51 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "data/data_channel.h"
 #include "data/data_session.h"
+#include "data/data_user.h"
 #include "main/main_session.h"
 
 namespace Data {
 
 ChannelAdminChanges::ChannelAdminChanges(not_null<ChannelData*> channel)
 : _channel(channel)
-, _admins(_channel->mgInfo->admins) {
+, _admins(_channel->mgInfo->admins)
+, _oldCreator(_channel->mgInfo->creator) {
 }
 
 void ChannelAdminChanges::add(UserId userId, const QString &rank) {
-	const auto i = _admins.find(userId);
-	if (i == end(_admins) || i->second != rank) {
-		_admins[userId] = rank;
+	if (_admins.emplace(userId).second) {
 		_changes.emplace(userId);
 	}
+	auto &ranks = _channel->mgInfo->memberRanks;
+	if (!rank.isEmpty()) {
+		const auto i = ranks.find(userId);
+		if (i == end(ranks) || i->second != rank) {
+			ranks[userId] = rank;
+			_changes.emplace(userId);
+		}
+	} else {
+		if (ranks.remove(userId)) {
+			_changes.emplace(userId);
+		}
+	}
 }
 
 void ChannelAdminChanges::remove(UserId userId) {
-	if (_admins.contains(userId)) {
-		_admins.remove(userId);
+	if (_admins.remove(userId)) {
 		_changes.emplace(userId);
 	}
 }
 
 ChannelAdminChanges::~ChannelAdminChanges() {
+	const auto creator = _channel->mgInfo->creator;
+	if (creator != _oldCreator) {
+		if (creator) {
+			_changes.emplace(peerToUser(creator->id));
+		}
+		if (_oldCreator) {
+			_changes.emplace(peerToUser(_oldCreator->id));
+		}
+	}
 	if (_changes.size() > 1
 		|| (!_changes.empty()
 			&& _changes.front() != _channel->session().userId())) {
@@ -44,4 +64,49 @@ ChannelAdminChanges::~ChannelAdminChanges() {
 	}
 }
 
+ChannelMemberRankChanges::ChannelMemberRankChanges(
+		not_null<ChannelData*> channel)
+: _channel(channel)
+, _memberRanks(_channel->mgInfo->memberRanks) {
+}
+
+void ChannelMemberRankChanges::feed(
+		UserId userId,
+		const QString &rank) {
+	if (rank.isEmpty()) {
+		if (_memberRanks.remove(userId)) {
+			_changes.emplace(userId);
+		}
+	} else {
+		const auto i = _memberRanks.find(userId);
+		if (i == end(_memberRanks) || i->second != rank) {
+			_memberRanks[userId] = rank;
+			_changes.emplace(userId);
+		}
+	}
+}
+
+ChannelMemberRankChanges::~ChannelMemberRankChanges() {
+	if (_changes.empty()) {
+		return;
+	}
+	const auto info = _channel->mgInfo.get();
+	auto adminChanges = base::flat_set<UserId>();
+	for (const auto &userId : _changes) {
+		if (info->admins.contains(userId)
+			|| (info->creator
+				&& peerToUser(info->creator->id) == userId)) {
+			adminChanges.emplace(userId);
+		}
+	}
+	if (adminChanges.size() > 1
+		|| (!adminChanges.empty()
+			&& adminChanges.front() != _channel->session().userId())) {
+		if (const auto history
+			= _channel->owner().historyLoaded(_channel)) {
+			history->applyGroupAdminChanges(adminChanges);
+		}
+	}
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_channel_admins.h b/Telegram/SourceFiles/data/data_channel_admins.h
index 7fa1b06fd985c7..b97d3259f36c5e 100644
--- a/Telegram/SourceFiles/data/data_channel_admins.h
+++ b/Telegram/SourceFiles/data/data_channel_admins.h
@@ -20,7 +20,23 @@ class ChannelAdminChanges {
 
 private:
 	not_null<ChannelData*> _channel;
-	base::flat_map<UserId, QString> &_admins;
+	base::flat_set<UserId> &_admins;
+	base::flat_set<UserId> _changes;
+	UserData *_oldCreator = nullptr;
+
+};
+
+class ChannelMemberRankChanges {
+public:
+	ChannelMemberRankChanges(not_null<ChannelData*> channel);
+
+	void feed(UserId userId, const QString &rank);
+
+	~ChannelMemberRankChanges();
+
+private:
+	not_null<ChannelData*> _channel;
+	base::flat_map<UserId, QString> &_memberRanks;
 	base::flat_set<UserId> _changes;
 
 };
diff --git a/Telegram/SourceFiles/data/data_channel_earn.h b/Telegram/SourceFiles/data/data_channel_earn.h
index c4db98f28bb2f8..eeb19771329a4c 100644
--- a/Telegram/SourceFiles/data/data_channel_earn.h
+++ b/Telegram/SourceFiles/data/data_channel_earn.h
@@ -7,46 +7,18 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "data/data_statistics_chart.h"
-
 #include <QtCore/QDateTime>
 
+#include "data/data_credits.h"
+#include "data/data_statistics_chart.h"
+
 namespace Data {
 
 using EarnInt = uint64;
 
-constexpr auto kEarnMultiplier = EarnInt(1000000000);
-
-struct EarnHistoryEntry final {
-	enum class Type {
-		In,
-		Out,
-		Return,
-	};
-
-	enum class Status {
-		Success,
-		Failed,
-		Pending,
-	};
-
-	Type type;
-	Status status;
-
-	EarnInt amount = 0;
-	QDateTime date;
-	QDateTime dateTo;
-
-	QString provider;
-
-	QDateTime successDate;
-	QString successLink;
-
-};
-
 struct EarnHistorySlice final {
-	using OffsetToken = int;
-	std::vector<EarnHistoryEntry> list;
+	using OffsetToken = QString;
+	std::vector<CreditsHistoryEntry> list;
 	int total = 0;
 	bool allLoaded = false;
 	OffsetToken token;
@@ -58,9 +30,9 @@ struct EarnStatistics final {
 	}
 	Data::StatisticalGraph topHoursGraph;
 	Data::StatisticalGraph revenueGraph;
-	EarnInt currentBalance = 0;
-	EarnInt availableBalance = 0;
-	EarnInt overallRevenue = 0;
+	CreditsAmount currentBalance;
+	CreditsAmount availableBalance;
+	CreditsAmount overallRevenue;
 	float64 usdRate = 0.;
 	bool switchedOff = false;
 
diff --git a/Telegram/SourceFiles/data/data_chat.cpp b/Telegram/SourceFiles/data/data_chat.cpp
index 6f285e805f5386..ec5afcd19db315 100644
--- a/Telegram/SourceFiles/data/data_chat.cpp
+++ b/Telegram/SourceFiles/data/data_chat.cpp
@@ -27,10 +27,9 @@ using UpdateFlag = Data::PeerUpdate::Flag;
 } // namespace
 
 ChatData::ChatData(not_null<Data::Session*> owner, PeerId id)
-: PeerData(owner, id)
-, inputChat(MTP_long(peerToChat(id).bare)) {
+: PeerData(owner, id) {
 	_flags.changes(
-	) | rpl::start_with_next([=](const Flags::Change &change) {
+	) | rpl::on_next([=](const Flags::Change &change) {
 		if (change.diff & Flag::CallNotEmpty) {
 			if (const auto history = this->owner().historyLoaded(this)) {
 				history->updateChatListEntry();
@@ -127,7 +126,7 @@ void ChatData::invalidateParticipants() {
 	setAdminRights(ChatAdminRights());
 	//setDefaultRestrictions(ChatRestrictions());
 	invitedByMe.clear();
-	botStatus = 0;
+	botStatus = Data::BotStatus::Unknown;
 	session().changes().peerUpdated(
 		this,
 		UpdateFlag::Members | UpdateFlag::Admins);
@@ -177,10 +176,14 @@ void ChatData::setDefaultRestrictions(ChatRestrictions rights) {
 
 void ChatData::refreshBotStatus() {
 	if (participants.empty()) {
-		botStatus = 0;
+		botStatus = Data::BotStatus::Unknown;
 	} else {
-		const auto bot = ranges::none_of(participants, &UserData::isBot);
-		botStatus = bot ? -1 : 2;
+		const auto noBots = ranges::none_of(
+			participants,
+			&UserData::isBot);
+		botStatus = noBots
+			? Data::BotStatus::NoBots
+			: Data::BotStatus::HasBots;
 	}
 }
 
@@ -234,10 +237,13 @@ void ChatData::setGroupCall(
 			data.vid().v,
 			data.vaccess_hash().v,
 			scheduleDate,
-			rtmp);
+			rtmp,
+			Data::GroupCallOrigin::Group);
 		owner().registerGroupCall(_call.get());
 		session().changes().peerUpdated(this, UpdateFlag::GroupCall);
 		addFlags(Flag::CallActive);
+	}, [&](const auto &) {
+		clearGroupCall();
 	});
 }
 
@@ -310,6 +316,10 @@ const Data::AllowedReactions &ChatData::allowedReactions() const {
 	return _allowedReactions;
 }
 
+MTPlong ChatData::inputChat() const {
+	return MTP_long(peerToChat(id).bare);
+}
+
 namespace Data {
 
 void ApplyChatUpdate(
@@ -340,7 +350,7 @@ void ApplyChatUpdate(
 		if (chat->count > 0) { // If the count is known.
 			++chat->count;
 		}
-		chat->botStatus = 0;
+		chat->botStatus = Data::BotStatus::Unknown;
 	} else {
 		chat->participants.emplace(user);
 		if (UserId(update.vinviter_id()) == session->userId()) {
@@ -350,7 +360,7 @@ void ApplyChatUpdate(
 		}
 		++chat->count;
 		if (user->isBot()) {
-			chat->botStatus = 2;
+			chat->botStatus = Data::BotStatus::HasBots;
 			if (!user->botInfo->inited) {
 				session->api().requestFullPeer(user);
 			}
@@ -380,7 +390,7 @@ void ApplyChatUpdate(
 		if (chat->count > 0) {
 			chat->count--;
 		}
-		chat->botStatus = 0;
+		chat->botStatus = Data::BotStatus::Unknown;
 	} else {
 		chat->participants.erase(user);
 		chat->count--;
@@ -394,7 +404,7 @@ void ApplyChatUpdate(
 				history->clearLastKeyboard();
 			}
 		}
-		if (chat->botStatus > 0 && user->isBot()) {
+		if (chat->botStatus == Data::BotStatus::HasBots && user->isBot()) {
 			chat->refreshBotStatus();
 		}
 	}
@@ -431,6 +441,32 @@ void ApplyChatUpdate(
 	session->changes().peerUpdated(chat, UpdateFlag::Admins);
 }
 
+void ApplyChatUpdate(
+		not_null<ChatData*> chat,
+		const MTPDupdateChatParticipantRank &update) {
+	if (chat->applyUpdateVersion(update.vversion().v)
+		!= ChatData::UpdateStatus::Good) {
+		return;
+	}
+	const auto rank = qs(update.vrank().v);
+	const auto userId = UserId(update.vuser_id().v);
+	if (rank.isEmpty()) {
+		chat->memberRanks.remove(userId);
+	} else {
+		chat->memberRanks[userId] = rank;
+	}
+	if (userId != chat->session().userId()) {
+		if (const auto history = chat->owner().historyLoaded(chat)) {
+			auto changes = base::flat_set<UserId>();
+			changes.emplace(userId);
+			history->applyGroupAdminChanges(changes);
+		}
+	}
+	chat->session().changes().peerUpdated(
+		chat,
+		Data::PeerUpdate::Flag::Members);
+}
+
 void ApplyChatUpdate(
 		not_null<ChatData*> chat,
 		const MTPDupdateChatDefaultBannedRights &update) {
@@ -483,7 +519,7 @@ void ApplyChatUpdate(not_null<ChatData*> chat, const MTPDchatFull &update) {
 		SetTopPinnedMessageId(chat, pinned->v);
 	}
 	chat->checkFolder(update.vfolder_id().value_or_empty());
-	chat->setThemeEmoji(qs(update.vtheme_emoticon().value_or_empty()));
+	chat->setThemeToken(qs(update.vtheme_emoticon().value_or_empty()));
 	chat->setTranslationDisabled(update.is_translations_disabled());
 	const auto reactionsLimit = update.vreactions_limit().value_or_empty();
 	if (const auto allowed = update.vavailable_reactions()) {
@@ -526,6 +562,7 @@ void ApplyChatUpdate(
 		chat->participants.clear();
 		chat->invitedByMe.clear();
 		chat->admins.clear();
+		chat->memberRanks.clear();
 		chat->setAdminRights(ChatAdminRights());
 		const auto selfUserId = session->userId();
 		for (const auto &participant : list) {
@@ -552,13 +589,25 @@ void ApplyChatUpdate(
 
 			participant.match([&](const MTPDchatParticipantCreator &data) {
 				chat->creator = userId;
+				const auto rank = qs(data.vrank().value_or_empty());
+				if (!rank.isEmpty()) {
+					chat->memberRanks[userId] = rank;
+				}
 			}, [&](const MTPDchatParticipantAdmin &data) {
 				chat->admins.emplace(user);
 				if (user->isSelf()) {
 					chat->setAdminRights(
 						chat->defaultAdminRights(user).flags);
 				}
-			}, [](const MTPDchatParticipant &) {
+				const auto rank = qs(data.vrank().value_or_empty());
+				if (!rank.isEmpty()) {
+					chat->memberRanks[userId] = rank;
+				}
+			}, [&](const MTPDchatParticipant &data) {
+				const auto rank = qs(data.vrank().value_or_empty());
+				if (!rank.isEmpty()) {
+					chat->memberRanks[userId] = rank;
+				}
 			});
 		}
 		if (chat->participants.empty()) {
diff --git a/Telegram/SourceFiles/data/data_chat.h b/Telegram/SourceFiles/data/data_chat.h
index 5a285aeeb5147d..da67c63e2fcdea 100644
--- a/Telegram/SourceFiles/data/data_chat.h
+++ b/Telegram/SourceFiles/data/data_chat.h
@@ -166,9 +166,9 @@ class ChatData final : public PeerData {
 	void setAllowedReactions(Data::AllowedReactions value);
 	[[nodiscard]] const Data::AllowedReactions &allowedReactions() const;
 
-	// Still public data members.
-	const MTPlong inputChat;
+	[[nodiscard]] MTPlong inputChat() const;
 
+	// Still public data members.
 	int count = 0;
 	TimeId date = 0;
 	UserId creator = 0;
@@ -178,7 +178,8 @@ class ChatData final : public PeerData {
 	base::flat_set<not_null<UserData*>> admins;
 	std::deque<not_null<UserData*>> lastAuthors;
 	base::flat_set<not_null<PeerData*>> markupSenders;
-	int botStatus = 0; // -1 - no bots, 0 - unknown, 1 - one bot, that sees all history, 2 - other
+	base::flat_map<UserId, QString> memberRanks;
+	Data::BotStatus botStatus = Data::BotStatus::Unknown;
 
 private:
 	Flags _flags;
@@ -215,6 +216,9 @@ void ApplyChatUpdate(
 void ApplyChatUpdate(
 	not_null<ChatData*> chat,
 	const MTPDupdateChatParticipantAdmin &update);
+void ApplyChatUpdate(
+	not_null<ChatData*> chat,
+	const MTPDupdateChatParticipantRank &update);
 void ApplyChatUpdate(
 	not_null<ChatData*> chat,
 	const MTPDupdateChatDefaultBannedRights &update);
diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp
index 7a6f63a743c29e..5af1964406c2d0 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.cpp
+++ b/Telegram/SourceFiles/data/data_chat_filters.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "data/data_chat_filters.h"
 
+#include "api/api_text_entities.h"
 #include "history/history.h"
 #include "data/data_peer.h"
 #include "data/data_user.h"
@@ -39,23 +40,38 @@ constexpr auto kLoadExceptionsPerRequest = 100;
 
 } // namespace
 
+TextWithEntities ForceCustomEmojiStatic(TextWithEntities text) {
+	for (auto &entity : text.entities) {
+		if (entity.type() == EntityType::CustomEmoji) {
+			entity = EntityInText(
+				EntityType::CustomEmoji,
+				entity.offset(),
+				entity.length(),
+				u"force-static:"_q + entity.data());
+		}
+	}
+	return text;
+}
+
 ChatFilter::ChatFilter(
 	FilterId id,
-	const QString &title,
-	const QString &iconEmoji,
+	ChatFilterTitle title,
+	QString iconEmoji,
 	std::optional<uint8> colorIndex,
 	Flags flags,
 	base::flat_set<not_null<History*>> always,
 	std::vector<not_null<History*>> pinned,
 	base::flat_set<not_null<History*>> never)
 : _id(id)
-, _title(title)
-, _iconEmoji(iconEmoji)
+, _title(std::move(title.text))
+, _iconEmoji(std::move(iconEmoji))
 , _colorIndex(colorIndex)
 , _always(std::move(always))
 , _pinned(std::move(pinned))
 , _never(std::move(never))
-, _flags(flags) {
+, _flags(title.isStatic
+	? (flags | Flag::StaticTitle)
+	: (flags & ~Flag::StaticTitle)) {
 }
 
 ChatFilter ChatFilter::FromTL(
@@ -69,7 +85,8 @@ ChatFilter ChatFilter::FromTL(
 			| (data.is_bots() ? Flag::Bots : Flag(0))
 			| (data.is_exclude_muted() ? Flag::NoMuted : Flag(0))
 			| (data.is_exclude_read() ? Flag::NoRead : Flag(0))
-			| (data.is_exclude_archived() ? Flag::NoArchived : Flag(0));
+			| (data.is_exclude_archived() ? Flag::NoArchived : Flag(0))
+			| (data.is_title_noanimate() ? Flag::StaticTitle : Flag(0));
 		auto &&to_histories = ranges::views::transform([&](
 				const MTPInputPeer &input) {
 			const auto peer = Data::PeerFromInputMTP(owner, input);
@@ -95,7 +112,10 @@ ChatFilter ChatFilter::FromTL(
 		};
 		return ChatFilter(
 			data.vid().v,
-			qs(data.vtitle()),
+			{
+				Api::ParseTextWithEntities(&owner->session(), data.vtitle()),
+				data.is_title_noanimate(),
+			},
 			qs(data.vemoticon().value_or_empty()),
 			data.vcolor()
 				? std::make_optional(data.vcolor()->v)
@@ -104,7 +124,7 @@ ChatFilter ChatFilter::FromTL(
 			std::move(list),
 			std::move(pinned),
 			{ never.begin(), never.end() });
-	}, [](const MTPDdialogFilterDefault &d) {
+	}, [](const MTPDdialogFilterDefault &) {
 		return ChatFilter();
 	}, [&](const MTPDdialogFilterChatlist &data) {
 		auto &&to_histories = ranges::views::transform([&](
@@ -143,13 +163,17 @@ ChatFilter ChatFilter::FromTL(
 		};
 		return ChatFilter(
 			data.vid().v,
-			qs(data.vtitle()),
+			{
+				Api::ParseTextWithEntities(&owner->session(), data.vtitle()),
+				data.is_title_noanimate(),
+			},
 			qs(data.vemoticon().value_or_empty()),
 			data.vcolor()
 				? std::make_optional(data.vcolor()->v)
 				: std::nullopt,
 			(Flag::Chatlist
-				| (data.is_has_my_invites() ? Flag::HasMyLinks : Flag())),
+				| (data.is_has_my_invites() ? Flag::HasMyLinks : Flag())
+				| (data.is_title_noanimate() ? Flag::StaticTitle : Flag(0))),
 			std::move(list),
 			std::move(pinned),
 			{});
@@ -162,9 +186,20 @@ ChatFilter ChatFilter::withId(FilterId id) const {
 	return result;
 }
 
-ChatFilter ChatFilter::withTitle(const QString &title) const {
+ChatFilter ChatFilter::withTitle(ChatFilterTitle title) const {
+	auto result = *this;
+	result._title = std::move(title.text);
+	if (title.isStatic) {
+		result._flags |= Flag::StaticTitle;
+	} else {
+		result._flags &= ~Flag::StaticTitle;
+	}
+	return result;
+}
+
+ChatFilter ChatFilter::withColorIndex(std::optional<uint8> c) const {
 	auto result = *this;
-	result._title = title;
+	result._colorIndex = c;
 	return result;
 }
 
@@ -182,27 +217,42 @@ ChatFilter ChatFilter::withChatlist(bool chatlist, bool hasMyLinks) const {
 	return result;
 }
 
+ChatFilter ChatFilter::withoutAlways(not_null<History*> history) const {
+	auto result = *this;
+	if (CanRemoveFromChatFilter(result, history)) {
+		result._always.remove(history);
+	}
+	return result;
+}
+
 MTPDialogFilter ChatFilter::tl(FilterId replaceId) const {
 	auto always = _always;
 	auto pinned = QVector<MTPInputPeer>();
 	pinned.reserve(_pinned.size());
 	for (const auto &history : _pinned) {
-		pinned.push_back(history->peer->input);
+		pinned.push_back(history->peer->input());
 		always.remove(history);
 	}
 	auto include = QVector<MTPInputPeer>();
 	include.reserve(always.size());
 	for (const auto &history : always) {
-		include.push_back(history->peer->input);
+		include.push_back(history->peer->input());
 	}
+	auto title = MTP_textWithEntities(
+		MTP_string(_title.text),
+		Api::EntitiesToMTP(
+			nullptr,
+			_title.entities,
+			Api::ConvertOption::SkipLocal));
 	if (_flags & Flag::Chatlist) {
 		using TLFlag = MTPDdialogFilterChatlist::Flag;
 		const auto flags = TLFlag::f_emoticon
-			| (_colorIndex ? TLFlag::f_color : TLFlag(0));
+			| (_colorIndex ? TLFlag::f_color : TLFlag(0))
+			| (staticTitle() ? TLFlag::f_title_noanimate : TLFlag(0));
 		return MTP_dialogFilterChatlist(
 			MTP_flags(flags),
 			MTP_int(replaceId ? replaceId : _id),
-			MTP_string(_title),
+			std::move(title),
 			MTP_string(_iconEmoji),
 			MTP_int(_colorIndex.value_or(0)),
 			MTP_vector<MTPInputPeer>(pinned),
@@ -211,6 +261,7 @@ MTPDialogFilter ChatFilter::tl(FilterId replaceId) const {
 	using TLFlag = MTPDdialogFilter::Flag;
 	const auto flags = TLFlag::f_emoticon
 		| (_colorIndex ? TLFlag::f_color : TLFlag(0))
+		| (staticTitle() ? TLFlag::f_title_noanimate : TLFlag(0))
 		| ((_flags & Flag::Contacts) ? TLFlag::f_contacts : TLFlag(0))
 		| ((_flags & Flag::NonContacts) ? TLFlag::f_non_contacts : TLFlag(0))
 		| ((_flags & Flag::Groups) ? TLFlag::f_groups : TLFlag(0))
@@ -224,12 +275,12 @@ MTPDialogFilter ChatFilter::tl(FilterId replaceId) const {
 	auto never = QVector<MTPInputPeer>();
 	never.reserve(_never.size());
 	for (const auto &history : _never) {
-		never.push_back(history->peer->input);
+		never.push_back(history->peer->input());
 	}
 	return MTP_dialogFilter(
 		MTP_flags(flags),
 		MTP_int(replaceId ? replaceId : _id),
-		MTP_string(_title),
+		std::move(title),
 		MTP_string(_iconEmoji),
 		MTP_int(_colorIndex.value_or(0)),
 		MTP_vector<MTPInputPeer>(pinned),
@@ -241,10 +292,14 @@ FilterId ChatFilter::id() const {
 	return _id;
 }
 
-QString ChatFilter::title() const {
+const TextWithEntities &ChatFilter::titleText() const {
 	return _title;
 }
 
+ChatFilterTitle ChatFilter::title() const {
+	return { _title, !!(_flags & Flag::StaticTitle) };
+}
+
 QString ChatFilter::iconEmoji() const {
 	return _iconEmoji;
 }
@@ -257,6 +312,10 @@ ChatFilter::Flags ChatFilter::flags() const {
 	return _flags;
 }
 
+bool ChatFilter::staticTitle() const {
+	return _flags & Flag::StaticTitle;
+}
+
 bool ChatFilter::chatlist() const {
 	return _flags & Flag::Chatlist;
 }
@@ -277,7 +336,9 @@ const base::flat_set<not_null<History*>> &ChatFilter::never() const {
 	return _never;
 }
 
-bool ChatFilter::contains(not_null<History*> history) const {
+bool ChatFilter::contains(
+		not_null<History*> history,
+		bool ignoreFakeUnread) const {
 	const auto flag = [&] {
 		const auto peer = history->peer;
 		if (const auto user = peer->asUser()) {
@@ -286,7 +347,7 @@ bool ChatFilter::contains(not_null<History*> history) const {
 				: user->isContact()
 				? Flag::Contacts
 				: Flag::NonContacts;
-		} else if (const auto chat = peer->asChat()) {
+		} else if (peer->isChat()) {
 			return Flag::Groups;
 		} else if (const auto channel = peer->asChannel()) {
 			if (channel->isBroadcast()) {
@@ -314,7 +375,7 @@ bool ChatFilter::contains(not_null<History*> history) const {
 			&& (!(_flags & Flag::NoRead)
 				|| state.unread
 				|| state.mention
-				|| history->fakeUnreadWhileOpened())
+				|| (!ignoreFakeUnread && history->fakeUnreadWhileOpened()))
 			&& (!(_flags & Flag::NoArchived)
 				|| (history->folderKnown() && !history->folder())))
 		|| _always.contains(history);
@@ -350,8 +411,11 @@ void ChatFilters::clear() {
 	_list.clear();
 }
 
-void ChatFilters::setPreloaded(const QVector<MTPDialogFilter> &result) {
+void ChatFilters::setPreloaded(
+		const QVector<MTPDialogFilter> &result,
+		bool tagsEnabled) {
 	_loadRequestId = -1;
+	_tagsEnabled = tagsEnabled;
 	received(result);
 	crl::on_main(&_owner->session(), [=] {
 		if (_loadRequestId == -1) {
@@ -377,6 +441,7 @@ void ChatFilters::load(bool force) {
 	api.request(_loadRequestId).cancel();
 	_loadRequestId = api.request(MTPmessages_GetDialogFilters(
 	)).done([=](const MTPmessages_DialogFilters &result) {
+		_tagsEnabled = result.data().is_tags_enabled();
 		received(result.data().vfilters().v);
 		_loadRequestId = 0;
 	}).fail([=] {
@@ -388,12 +453,42 @@ void ChatFilters::load(bool force) {
 	}).send();
 }
 
+bool ChatFilters::tagsEnabled() const {
+	return _tagsEnabled.current();
+}
+
+rpl::producer<bool> ChatFilters::tagsEnabledValue() const {
+	return _tagsEnabled.value();
+}
+
+rpl::producer<bool> ChatFilters::tagsEnabledChanges() const {
+	return _tagsEnabled.changes();
+}
+
+void ChatFilters::requestToggleTags(bool value, Fn<void()> fail) {
+	if (_toggleTagsRequestId) {
+		return;
+	}
+	_toggleTagsRequestId = _owner->session().api().request(
+		MTPmessages_ToggleDialogFilterTags(MTP_bool(value))
+	).done([=](const MTPBool &result) {
+		_tagsEnabled = value;
+		_toggleTagsRequestId = 0;
+	}).fail([=](const MTP::Error &error) {
+		const auto message = error.type();
+		_toggleTagsRequestId = 0;
+		LOG(("API Error: Toggle Tags - %1").arg(message));
+		fail();
+	}).send();
+}
+
 void ChatFilters::received(const QVector<MTPDialogFilter> &list) {
 	auto position = 0;
 	auto changed = false;
 	for (const auto &filter : list) {
 		auto parsed = ChatFilter::FromTL(filter, _owner);
-		const auto b = begin(_list) + position, e = end(_list);
+		const auto b = begin(_list) + position;
+		const auto e = end(_list);
 		const auto i = ranges::find(b, e, parsed.id(), &ChatFilter::id);
 		if (i == e) {
 			applyInsert(std::move(parsed), position);
@@ -616,16 +711,29 @@ bool ChatFilters::applyChange(ChatFilter &filter, ChatFilter &&updated) {
 		|| (filter.hasMyLinks() != updated.hasMyLinks());
 	const auto listUpdated = rulesChanged
 		|| pinnedChanged
-		|| (filter.title() != updated.title())
+		|| (filter.titleText() != updated.titleText())
+		|| (filter.staticTitle() != updated.staticTitle())
 		|| (filter.iconEmoji() != updated.iconEmoji());
-	if (!listUpdated && !chatlistChanged) {
+	const auto colorChanged = filter.colorIndex() != updated.colorIndex();
+	const auto colorExistenceChanged = (!filter.colorIndex())
+		!= (!updated.colorIndex());
+	if (!listUpdated && !chatlistChanged && !colorChanged) {
 		return false;
 	}
+	const auto wasFilter = std::move(filter);
+	filter = std::move(updated);
+	auto entryToRefreshHeight = (Dialogs::Entry*)(nullptr);
 	if (rulesChanged) {
 		const auto filterList = _owner->chatsFilters().chatsList(id);
+		const auto areTagsEnabled = tagsEnabled();
+		const auto tagsExistence = [&](not_null<Dialogs::Row*> row) {
+			return (!areTagsEnabled || entryToRefreshHeight)
+				? false
+				: row->entry()->hasChatsFilterTags(0);
+		};
 		const auto feedHistory = [&](not_null<History*> history) {
-			const auto now = updated.contains(history);
-			const auto was = filter.contains(history);
+			const auto now = filter.contains(history);
+			const auto was = wasFilter.contains(history);
 			if (now != was) {
 				if (now) {
 					history->addToChatList(id, filterList);
@@ -637,7 +745,11 @@ bool ChatFilters::applyChange(ChatFilter &filter, ChatFilter &&updated) {
 		const auto feedList = [&](not_null<const Dialogs::MainList*> list) {
 			for (const auto &entry : *list->indexed()) {
 				if (const auto history = entry->history()) {
+					const auto wasTags = tagsExistence(entry);
 					feedHistory(history);
+					if (wasTags != tagsExistence(entry)) {
+						entryToRefreshHeight = entry->entry();
+					}
 				}
 			}
 		};
@@ -645,14 +757,13 @@ bool ChatFilters::applyChange(ChatFilter &filter, ChatFilter &&updated) {
 		if (const auto folder = _owner->folderLoaded(Data::Folder::kId)) {
 			feedList(folder->chatsList());
 		}
-		if (exceptionsChanged && !updated.always().empty()) {
+		if (exceptionsChanged && !filter.always().empty()) {
 			_exceptionsToLoad.push_back(id);
 			Ui::PostponeCall(&_owner->session(), [=] {
 				_owner->session().api().requestMoreDialogsIfNeeded();
 			});
 		}
 	}
-	filter = std::move(updated);
 	if (pinnedChanged) {
 		const auto filterList = _owner->chatsFilters().chatsList(id);
 		filterList->pinned()->applyList(filter.pinned());
@@ -660,6 +771,16 @@ bool ChatFilters::applyChange(ChatFilter &filter, ChatFilter &&updated) {
 	if (chatlistChanged) {
 		_isChatlistChanged.fire_copy(id);
 	}
+	if (colorChanged) {
+		_tagColorChanged.fire_copy(TagColorChanged{
+			.filterId = id,
+			.colorExistenceChanged = colorExistenceChanged,
+		});
+	}
+	if (entryToRefreshHeight) {
+		// Trigger a full refresh of height for the main list.
+		entryToRefreshHeight->updateChatListEntryHeight();
+	}
 	return listUpdated;
 }
 
@@ -802,6 +923,10 @@ rpl::producer<FilterId> ChatFilters::isChatlistChanged() const {
 	return _isChatlistChanged.events();
 }
 
+rpl::producer<TagColorChanged> ChatFilters::tagColorChanged() const {
+	return _tagColorChanged.events();
+}
+
 bool ChatFilters::loadNextExceptions(bool chatsListLoaded) {
 	if (_exceptionsLoadRequestId) {
 		return true;
@@ -819,7 +944,7 @@ bool ChatFilters::loadNextExceptions(bool chatsListLoaded) {
 			for (const auto &history : i->always()) {
 				if (!history->folderKnown()) {
 					inputs.push_back(
-						MTP_inputDialogPeer(history->peer->input));
+						MTP_inputDialogPeer(history->peer->input()));
 				}
 			}
 		}
@@ -922,7 +1047,7 @@ rpl::producer<Ui::MoreChatsBarContent> ChatFilters::moreChatsContent(
 
 		_moreChatsUpdated.events_starting_with_copy(
 			id
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			consumer.put_next(Ui::MoreChatsBarContent{
 				.count = int(moreChats(id).size()),
 			});
@@ -1019,4 +1144,14 @@ void ChatFilters::checkLoadMoreChatsLists() {
 	}
 }
 
+bool CanRemoveFromChatFilter(
+		const ChatFilter &filter,
+		not_null<History*> history) {
+	using Flag = ChatFilter::Flag;
+	const auto flagsWithoutNoReadNoArchivedNoMuted = filter.flags()
+		& ~(Flag::NoRead | Flag::NoArchived | Flag::NoMuted);
+	return (filter.always().size() > 1 || flagsWithoutNoReadNoArchivedNoMuted)
+		&& filter.contains(history);
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_chat_filters.h b/Telegram/SourceFiles/data/data_chat_filters.h
index e123ab2c156848..cfba1f9a459efa 100644
--- a/Telegram/SourceFiles/data/data_chat_filters.h
+++ b/Telegram/SourceFiles/data/data_chat_filters.h
@@ -25,6 +25,17 @@ namespace Data {
 
 class Session;
 
+struct ChatFilterTitle {
+	TextWithEntities text;
+	bool isStatic = false;
+
+	[[nodiscard]] bool empty() const {
+		return text.empty();
+	}
+};
+
+[[nodiscard]] TextWithEntities ForceCustomEmojiStatic(TextWithEntities text);
+
 class ChatFilter final {
 public:
 	enum class Flag : ushort {
@@ -40,9 +51,10 @@ class ChatFilter final {
 
 		Chatlist    = (1 << 8),
 		HasMyLinks  = (1 << 9),
+		StaticTitle = (1 << 10),
 
-		NewChats      = (1 << 10), // Telegram Business exceptions.
-		ExistingChats = (1 << 11),
+		NewChats      = (1 << 11), // Telegram Business exceptions.
+		ExistingChats = (1 << 12),
 	};
 	friend constexpr inline bool is_flag_type(Flag) { return true; };
 	using Flags = base::flags<Flag>;
@@ -50,8 +62,8 @@ class ChatFilter final {
 	ChatFilter() = default;
 	ChatFilter(
 		FilterId id,
-		const QString &title,
-		const QString &iconEmoji,
+		ChatFilterTitle title,
+		QString iconEmoji,
 		std::optional<uint8> colorIndex,
 		Flags flags,
 		base::flat_set<not_null<History*>> always,
@@ -59,10 +71,12 @@ class ChatFilter final {
 		base::flat_set<not_null<History*>> never);
 
 	[[nodiscard]] ChatFilter withId(FilterId id) const;
-	[[nodiscard]] ChatFilter withTitle(const QString &title) const;
+	[[nodiscard]] ChatFilter withTitle(ChatFilterTitle title) const;
+	[[nodiscard]] ChatFilter withColorIndex(std::optional<uint8>) const;
 	[[nodiscard]] ChatFilter withChatlist(
 		bool chatlist,
 		bool hasMyLinks) const;
+	[[nodiscard]] ChatFilter withoutAlways(not_null<History*>) const;
 
 	[[nodiscard]] static ChatFilter FromTL(
 		const MTPDialogFilter &data,
@@ -70,21 +84,25 @@ class ChatFilter final {
 	[[nodiscard]] MTPDialogFilter tl(FilterId replaceId = 0) const;
 
 	[[nodiscard]] FilterId id() const;
-	[[nodiscard]] QString title() const;
+	[[nodiscard]] ChatFilterTitle title() const;
+	[[nodiscard]] const TextWithEntities &titleText() const;
 	[[nodiscard]] QString iconEmoji() const;
 	[[nodiscard]] std::optional<uint8> colorIndex() const;
 	[[nodiscard]] Flags flags() const;
+	[[nodiscard]] bool staticTitle() const;
 	[[nodiscard]] bool chatlist() const;
 	[[nodiscard]] bool hasMyLinks() const;
 	[[nodiscard]] const base::flat_set<not_null<History*>> &always() const;
 	[[nodiscard]] const std::vector<not_null<History*>> &pinned() const;
 	[[nodiscard]] const base::flat_set<not_null<History*>> &never() const;
 
-	[[nodiscard]] bool contains(not_null<History*> history) const;
+	[[nodiscard]] bool contains(
+		not_null<History*> history,
+		bool ignoreFakeUnread = false) const;
 
 private:
 	FilterId _id = 0;
-	QString _title;
+	TextWithEntities _title;
 	QString _iconEmoji;
 	std::optional<uint8> _colorIndex;
 	base::flat_set<not_null<History*>> _always;
@@ -95,7 +113,7 @@ class ChatFilter final {
 };
 
 inline bool operator==(const ChatFilter &a, const ChatFilter &b) {
-	return (a.title() == b.title())
+	return (a.titleText() == b.titleText())
 		&& (a.iconEmoji() == b.iconEmoji())
 		&& (a.colorIndex() == b.colorIndex())
 		&& (a.flags() == b.flags())
@@ -123,12 +141,19 @@ struct SuggestedFilter {
 	QString description;
 };
 
+struct TagColorChanged final {
+	FilterId filterId = 0;
+	bool colorExistenceChanged = false;
+};
+
 class ChatFilters final {
 public:
 	explicit ChatFilters(not_null<Session*> owner);
 	~ChatFilters();
 
-	void setPreloaded(const QVector<MTPDialogFilter> &result);
+	void setPreloaded(
+		const QVector<MTPDialogFilter> &result,
+		bool tagsEnabled);
 
 	void load();
 	void reload();
@@ -139,6 +164,7 @@ class ChatFilters final {
 	[[nodiscard]] const std::vector<ChatFilter> &list() const;
 	[[nodiscard]] rpl::producer<> changed() const;
 	[[nodiscard]] rpl::producer<FilterId> isChatlistChanged() const;
+	[[nodiscard]] rpl::producer<TagColorChanged> tagColorChanged() const;
 	[[nodiscard]] bool loaded() const;
 	[[nodiscard]] bool has() const;
 
@@ -185,6 +211,11 @@ class ChatFilters final {
 		FilterId id) const;
 	void moreChatsHide(FilterId id, bool localOnly = false);
 
+	[[nodiscard]] bool tagsEnabled() const;
+	[[nodiscard]] rpl::producer<bool> tagsEnabledValue() const;
+	[[nodiscard]] rpl::producer<bool> tagsEnabledChanges() const;
+	void requestToggleTags(bool value, Fn<void()> fail);
+
 private:
 	struct MoreChatsData {
 		std::vector<not_null<PeerData*>> missing;
@@ -209,9 +240,11 @@ class ChatFilters final {
 	base::flat_map<FilterId, std::unique_ptr<Dialogs::MainList>> _chatsLists;
 	rpl::event_stream<> _listChanged;
 	rpl::event_stream<FilterId> _isChatlistChanged;
+	rpl::event_stream<TagColorChanged> _tagColorChanged;
 	mtpRequestId _loadRequestId = 0;
 	mtpRequestId _saveOrderRequestId = 0;
 	mtpRequestId _saveOrderAfterId = 0;
+	mtpRequestId _toggleTagsRequestId = 0;
 	bool _loaded = false;
 	bool _reloading = false;
 
@@ -220,6 +253,8 @@ class ChatFilters final {
 	rpl::event_stream<> _suggestedUpdated;
 	crl::time _suggestedLastReceived = 0;
 
+	rpl::variable<bool> _tagsEnabled = false;
+
 	std::deque<FilterId> _exceptionsToLoad;
 	mtpRequestId _exceptionsLoadRequestId = 0;
 
@@ -233,4 +268,8 @@ class ChatFilters final {
 
 };
 
+[[nodiscard]] bool CanRemoveFromChatFilter(
+	const ChatFilter &filter,
+	not_null<History*> history);
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_chat_participant_status.cpp b/Telegram/SourceFiles/data/data_chat_participant_status.cpp
index 38fa1a27e3b193..79c1fa00474a8a 100644
--- a/Telegram/SourceFiles/data/data_chat_participant_status.cpp
+++ b/Telegram/SourceFiles/data/data_chat_participant_status.cpp
@@ -9,6 +9,8 @@ For license and copyright information please follow this link:
 
 #include "base/unixtime.h"
 #include "boxes/peers/edit_peer_permissions_box.h"
+#include "boxes/premium_limits_box.h" // FileSizeLimitBox.
+#include "chat_helpers/compose/compose_show.h"
 #include "data/data_chat.h"
 #include "data/data_channel.h"
 #include "data/data_forum_topic.h"
@@ -16,21 +18,69 @@ For license and copyright information please follow this link:
 #include "data/data_user.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/chat/attach/attach_prepare.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/format_values.h" // FormatDurationWordsSlowmode.
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "window/window_session_controller.h"
+#include "styles/style_widgets.h"
 
 namespace {
 
 [[nodiscard]] ChatAdminRights ChatAdminRightsFlags(
 		const MTPChatAdminRights &rights) {
 	return rights.match([](const MTPDchatAdminRights &data) {
-		return ChatAdminRights::from_raw(int32(data.vflags().v));
+		using Flag = ChatAdminRight;
+		return (data.is_change_info() ? Flag::ChangeInfo : Flag())
+			| (data.is_post_messages() ? Flag::PostMessages : Flag())
+			| (data.is_edit_messages() ? Flag::EditMessages : Flag())
+			| (data.is_delete_messages() ? Flag::DeleteMessages : Flag())
+			| (data.is_ban_users() ? Flag::BanUsers : Flag())
+			| (data.is_invite_users() ? Flag::InviteByLinkOrAdd : Flag())
+			| (data.is_pin_messages() ? Flag::PinMessages : Flag())
+			| (data.is_add_admins() ? Flag::AddAdmins : Flag())
+			| (data.is_anonymous() ? Flag::Anonymous : Flag())
+			| (data.is_manage_call() ? Flag::ManageCall : Flag())
+			| (data.is_other() ? Flag::Other : Flag())
+			| (data.is_manage_topics() ? Flag::ManageTopics : Flag())
+			| (data.is_post_stories() ? Flag::PostStories : Flag())
+			| (data.is_edit_stories() ? Flag::EditStories : Flag())
+			| (data.is_delete_stories() ? Flag::DeleteStories : Flag())
+			| (data.is_manage_direct_messages()
+				? Flag::ManageDirect
+				: Flag())
+			| (data.is_manage_ranks()
+				? Flag::ManageRanks
+				: Flag());
 	});
 }
 
 [[nodiscard]] ChatRestrictions ChatBannedRightsFlags(
 		const MTPChatBannedRights &rights) {
 	return rights.match([](const MTPDchatBannedRights &data) {
-		return ChatRestrictions::from_raw(int32(data.vflags().v));
+		using Flag = ChatRestriction;
+		return (data.is_view_messages() ? Flag::ViewMessages : Flag())
+			| (data.is_send_stickers() ? Flag::SendStickers : Flag())
+			| (data.is_send_gifs() ? Flag::SendGifs : Flag())
+			| (data.is_send_games() ? Flag::SendGames : Flag())
+			| (data.is_send_inline() ? Flag::SendInline : Flag())
+			| (data.is_send_polls() ? Flag::SendPolls : Flag())
+			| (data.is_send_photos() ? Flag::SendPhotos : Flag())
+			| (data.is_send_videos() ? Flag::SendVideos : Flag())
+			| (data.is_send_roundvideos() ? Flag::SendVideoMessages : Flag())
+			| (data.is_send_audios() ? Flag::SendMusic : Flag())
+			| (data.is_send_voices() ? Flag::SendVoiceMessages : Flag())
+			| (data.is_send_docs() ? Flag::SendFiles : Flag())
+			| (data.is_send_plain() ? Flag::SendOther : Flag())
+			| (data.is_embed_links() ? Flag::EmbedLinks : Flag())
+			| (data.is_send_reactions() ? Flag::SendReactions : Flag())
+			| (data.is_change_info() ? Flag::ChangeInfo : Flag())
+			| (data.is_invite_users() ? Flag::AddParticipants : Flag())
+			| (data.is_pin_messages() ? Flag::PinMessages : Flag())
+			| (data.is_manage_topics() ? Flag::CreateTopics : Flag())
+			| (data.is_edit_rank() ? Flag::EditRank : Flag());
 	});
 }
 
@@ -47,11 +97,68 @@ ChatAdminRightsInfo::ChatAdminRightsInfo(const MTPChatAdminRights &rights)
 : flags(ChatAdminRightsFlags(rights)) {
 }
 
+MTPChatAdminRights AdminRightsToMTP(ChatAdminRightsInfo info) {
+	using Flag = MTPDchatAdminRights::Flag;
+	using R = ChatAdminRight;
+	const auto flags = info.flags;
+	return MTP_chatAdminRights(MTP_flags(Flag()
+		| ((flags & R::ChangeInfo) ? Flag::f_change_info : Flag())
+		| ((flags & R::PostMessages) ? Flag::f_post_messages : Flag())
+		| ((flags & R::EditMessages) ? Flag::f_edit_messages : Flag())
+		| ((flags & R::DeleteMessages) ? Flag::f_delete_messages : Flag())
+		| ((flags & R::BanUsers) ? Flag::f_ban_users : Flag())
+		| ((flags & R::InviteByLinkOrAdd) ? Flag::f_invite_users : Flag())
+		| ((flags & R::PinMessages) ? Flag::f_pin_messages : Flag())
+		| ((flags & R::AddAdmins) ? Flag::f_add_admins : Flag())
+		| ((flags & R::Anonymous) ? Flag::f_anonymous : Flag())
+		| ((flags & R::ManageCall) ? Flag::f_manage_call : Flag())
+		| ((flags & R::Other) ? Flag::f_other : Flag())
+		| ((flags & R::ManageTopics) ? Flag::f_manage_topics : Flag())
+		| ((flags & R::PostStories) ? Flag::f_post_stories : Flag())
+		| ((flags & R::EditStories) ? Flag::f_edit_stories : Flag())
+		| ((flags & R::DeleteStories) ? Flag::f_delete_stories : Flag())
+		| ((flags & R::ManageDirect)
+			? Flag::f_manage_direct_messages
+			: Flag())
+		| ((flags & R::ManageRanks)
+			? Flag::f_manage_ranks
+			: Flag())));
+}
+
 ChatRestrictionsInfo::ChatRestrictionsInfo(const MTPChatBannedRights &rights)
 : flags(ChatBannedRightsFlags(rights))
 , until(ChatBannedRightsUntilDate(rights)) {
 }
 
+MTPChatBannedRights RestrictionsToMTP(ChatRestrictionsInfo info) {
+	using Flag = MTPDchatBannedRights::Flag;
+	using R = ChatRestriction;
+	const auto flags = info.flags;
+	return MTP_chatBannedRights(
+		MTP_flags(Flag()
+			| ((flags & R::ViewMessages) ? Flag::f_view_messages : Flag())
+			| ((flags & R::SendStickers) ? Flag::f_send_stickers : Flag())
+			| ((flags & R::SendGifs) ? Flag::f_send_gifs : Flag())
+			| ((flags & R::SendGames) ? Flag::f_send_games : Flag())
+			| ((flags & R::SendInline) ? Flag::f_send_inline : Flag())
+			| ((flags & R::SendPolls) ? Flag::f_send_polls : Flag())
+			| ((flags & R::SendPhotos) ? Flag::f_send_photos : Flag())
+			| ((flags & R::SendVideos) ? Flag::f_send_videos : Flag())
+			| ((flags & R::SendVideoMessages) ? Flag::f_send_roundvideos : Flag())
+			| ((flags & R::SendMusic) ? Flag::f_send_audios : Flag())
+			| ((flags & R::SendVoiceMessages) ? Flag::f_send_voices : Flag())
+			| ((flags & R::SendFiles) ? Flag::f_send_docs : Flag())
+			| ((flags & R::SendOther) ? Flag::f_send_plain : Flag())
+			| ((flags & R::EmbedLinks) ? Flag::f_embed_links : Flag())
+			| ((flags & R::SendReactions) ? Flag::f_send_reactions : Flag())
+			| ((flags & R::ChangeInfo) ? Flag::f_change_info : Flag())
+			| ((flags & R::AddParticipants) ? Flag::f_invite_users : Flag())
+			| ((flags & R::PinMessages) ? Flag::f_pin_messages : Flag())
+			| ((flags & R::CreateTopics) ? Flag::f_manage_topics : Flag())
+			| ((flags & R::EditRank) ? Flag::f_edit_rank : Flag())),
+		MTP_int(info.until));
+}
+
 namespace Data {
 
 std::vector<ChatRestrictions> ListOfRestrictions(
@@ -111,12 +218,15 @@ bool CanSendAnyOf(
 		not_null<const PeerData*> peer,
 		ChatRestrictions rights,
 		bool forbidInForums) {
-	if (const auto user = peer->asUser()) {
+	if (peer->session().frozen()
+		&& !peer->isFreezeAppealChat()) {
+		return false;
+	} else if (const auto user = peer->asUser()) {
 		if (user->isInaccessible()
 			|| user->isRepliesChat()
 			|| user->isVerifyCodes()) {
 			return false;
-		} else if (user->meRequiresPremiumToWrite()
+		} else if (user->requiresPremiumToWrite()
 			&& !user->session().premium()) {
 			return false;
 		} else if (rights
@@ -139,46 +249,54 @@ bool CanSendAnyOf(
 		if (!chat->amIn()) {
 			return false;
 		}
-		for (const auto right : AllSendRestrictionsList()) {
-			if ((rights & right) && !chat->amRestricted(right)) {
-				return true;
-			}
-		}
-		return false;
+		return chat->amCreator()
+			|| chat->hasAdminRights()
+			|| (rights & ~chat->defaultRestrictions());
 	} else if (const auto channel = peer->asChannel()) {
+		if (channel->monoforumDisabled()) {
+			return false;
+		}
 		using Flag = ChannelDataFlag;
 		const auto allowed = channel->amIn()
 			|| ((channel->flags() & Flag::HasLink)
-				&& !(channel->flags() & Flag::JoinToWrite));
+				&& !(channel->flags() & Flag::JoinToWrite))
+			|| channel->isMonoforum();
 		if (!allowed || (forbidInForums && channel->isForum())) {
 			return false;
-		} else if (channel->canPostMessages()) {
-			return true;
-		} else if (channel->isBroadcast()) {
-			return false;
-		}
-		for (const auto right : AllSendRestrictionsList()) {
-			if ((rights & right) && !channel->amRestricted(right)) {
-				return true;
-			}
 		}
-		return false;
+		const auto restricted = channel->restrictions()
+			| (channel->unrestrictedByBoosts()
+				? ChatRestrictions()
+				: channel->defaultRestrictions());
+		return channel->canPostMessages()
+			|| (!channel->isBroadcast()
+				&& (channel->hasAdminRights()
+					|| (rights & ~restricted)));
 	}
 	Unexpected("Peer type in CanSendAnyOf.");
 }
 
-std::optional<QString> RestrictionError(
+SendError RestrictionError(
 		not_null<PeerData*> peer,
 		ChatRestriction restriction) {
 	using Flag = ChatRestriction;
-	if (const auto restricted = peer->amRestricted(restriction)) {
+	if (peer->session().frozen()
+		&& !peer->isFreezeAppealChat()) {
+		return SendError({
+			.text = tr::lng_frozen_restrict_title(tr::now),
+			.frozen = true,
+		});
+	} else if (const auto restricted = peer->amRestricted(restriction)) {
 		if (const auto user = peer->asUser()) {
-			if (user->meRequiresPremiumToWrite()
+			if (user->requiresPremiumToWrite()
 				&& !user->session().premium()) {
-				return tr::lng_restricted_send_non_premium(
-					tr::now,
-					lt_user,
-					user->shortName());
+				return SendError({
+					.text = tr::lng_restricted_send_non_premium(
+						tr::now,
+						lt_user,
+						user->shortName()),
+					.premiumToLift = true,
+				});
 			}
 			const auto result = (restriction == Flag::SendVoiceMessages)
 				? tr::lng_restricted_send_voice_messages(
@@ -194,13 +312,16 @@ std::optional<QString> RestrictionError(
 				? u"can't send polls :("_q
 				: (restriction == Flag::PinMessages)
 				? u"can't pin :("_q
-				: std::optional<QString>();
+				: SendError();
 
 			Ensures(result.has_value());
 			return result;
 		}
 		const auto all = restricted.isWithEveryone();
 		const auto channel = peer->asChannel();
+		if (channel && channel->monoforumDisabled()) {
+			return tr::lng_action_direct_messages_disabled(tr::now);
+		}
 		if (!all && channel) {
 			auto restrictedUntil = channel->restrictedUntil();
 			if (restrictedUntil > 0
@@ -253,6 +374,16 @@ std::optional<QString> RestrictionError(
 				Unexpected("Restriction in Data::RestrictionErrorKey.");
 			}
 		}
+		if (all
+			&& channel
+			&& channel->boostsUnrestrict()
+			&& !channel->unrestrictedByBoosts()) {
+			return SendError({
+				.text = tr::lng_restricted_boost_group(tr::now),
+				.boostsToLift = (channel->boostsUnrestrict()
+					- channel->boostsApplied()),
+			});
+		}
 		switch (restriction) {
 		case Flag::SendPolls:
 			return all
@@ -302,10 +433,10 @@ std::optional<QString> RestrictionError(
 		}
 		Unexpected("Restriction in Data::RestrictionErrorKey.");
 	}
-	return std::nullopt;
+	return SendError();
 }
 
-std::optional<QString> AnyFileRestrictionError(not_null<PeerData*> peer) {
+SendError AnyFileRestrictionError(not_null<PeerData*> peer) {
 	using Restriction = ChatRestriction;
 	for (const auto right : FilesSendRestrictionsList()) {
 		if (!RestrictionError(peer, right)) {
@@ -315,7 +446,7 @@ std::optional<QString> AnyFileRestrictionError(not_null<PeerData*> peer) {
 	return RestrictionError(peer, Restriction::SendFiles);
 }
 
-std::optional<QString> FileRestrictionError(
+SendError FileRestrictionError(
 		not_null<PeerData*> peer,
 		const Ui::PreparedList &list,
 		std::optional<bool> compress) {
@@ -339,7 +470,7 @@ std::optional<QString> FileRestrictionError(
 	return {};
 }
 
-std::optional<QString> FileRestrictionError(
+SendError FileRestrictionError(
 		not_null<PeerData*> peer,
 		const Ui::PreparedFile &file,
 		std::optional<bool> compress) {
@@ -383,4 +514,97 @@ std::optional<QString> FileRestrictionError(
 	return {};
 }
 
+void ShowSendErrorToast(
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		Data::SendError error) {
+	return ShowSendErrorToast(navigation->uiShow(), peer, error);
+}
+
+void ShowSendErrorToast(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer,
+		Data::SendError error) {
+	if (!error.boostsToLift) {
+		show->showToast(*error);
+		return;
+	}
+	const auto boost = [=] {
+		const auto window = show->resolveWindow();
+		window->resolveBoostState(peer->asChannel(), error.boostsToLift);
+	};
+	show->showToast({
+		.text = tr::link(*error),
+		.filter = [=](const auto &...) { boost(); return false; },
+	});
+}
+
+bool ShowSendError(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer,
+		const Ui::PreparedList &list,
+		std::optional<bool> compress,
+		bool ignoreSlowmodeLeft) {
+	const auto error = [&]() -> Data::SendError {
+		const auto error = Data::FileRestrictionError(peer, list, compress);
+		if (error) {
+			return error;
+		} else if (const auto left = peer->slowmodeSecondsLeft()) {
+			if (!ignoreSlowmodeLeft) {
+				return tr::lng_slowmode_enabled(
+					tr::now,
+					lt_left,
+					Ui::FormatDurationWordsSlowmode(left));
+			}
+		}
+		using Error = Ui::PreparedList::Error;
+		switch (list.error) {
+		case Error::None: return QString();
+		case Error::EmptyFile:
+		case Error::Directory:
+		case Error::NonLocalUrl: return tr::lng_send_image_empty(
+			tr::now,
+			lt_name,
+			list.errorData);
+		case Error::TooLargeFile: return u"(toolarge)"_q;
+		}
+		return tr::lng_forward_send_files_cant(tr::now);
+	}();
+	if (!error) {
+		return false;
+	} else if (error.text == u"(toolarge)"_q) {
+		const auto max = ranges::max_element(
+			list.files,
+			{},
+			&Ui::PreparedFile::size);
+		const auto session = &show->session();
+		show->show(Box(FileSizeLimitBox, session, max->size, nullptr));
+		return true;
+	}
+	ShowSendErrorToast(show, peer, error);
+	return true;
+}
+
+bool ShowSendError(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer,
+		const Ui::PreparedBundle &bundle,
+		bool ignoreSlowmodeLeft) {
+	if (peer->slowmodeApplied() && bundle.groups.size() > 1) {
+		Data::ShowSendErrorToast(
+			show,
+			peer,
+			tr::lng_slowmode_no_many(tr::now));
+		return true;
+	}
+	const auto ignore = ignoreSlowmodeLeft;
+	const auto compress = bundle.way.sendImagesAsPhotos();
+	for (const auto &group : bundle.groups) {
+		if (ShowSendError(show, peer, group.list, compress, ignore)) {
+			return true;
+		}
+	}
+	return false;
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_chat_participant_status.h b/Telegram/SourceFiles/data/data_chat_participant_status.h
index 8dd7cd682ffa96..294ad232c0f2a4 100644
--- a/Telegram/SourceFiles/data/data_chat_participant_status.h
+++ b/Telegram/SourceFiles/data/data_chat_participant_status.h
@@ -7,11 +7,20 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Ui {
 struct PreparedList;
 struct PreparedFile;
+struct PreparedBundle;
 } // namespace Ui
 
+namespace Window {
+class SessionNavigation;
+} // namespace Window
+
 enum class ChatAdminRight {
 	ChangeInfo = (1 << 0),
 	PostMessages = (1 << 1),
@@ -28,6 +37,9 @@ enum class ChatAdminRight {
 	PostStories = (1 << 14),
 	EditStories = (1 << 15),
 	DeleteStories = (1 << 16),
+	ManageDirect = (1 << 17),
+	ManageRanks = (1 << 18),
+	ProcessJoinRequests = (1 << 19),
 };
 inline constexpr bool is_flag_type(ChatAdminRight) { return true; }
 using ChatAdminRights = base::flags<ChatAdminRight>;
@@ -54,6 +66,8 @@ enum class ChatRestriction {
 	AddParticipants = (1 << 15),
 	PinMessages = (1 << 17),
 	CreateTopics = (1 << 18),
+	EditRank = (1 << 26),
+	SendReactions = (1 << 27),
 };
 inline constexpr bool is_flag_type(ChatRestriction) { return true; }
 using ChatRestrictions = base::flags<ChatRestriction>;
@@ -67,6 +81,8 @@ struct ChatAdminRightsInfo {
 	ChatAdminRights flags;
 };
 
+[[nodiscard]] MTPChatAdminRights AdminRightsToMTP(ChatAdminRightsInfo info);
+
 struct ChatRestrictionsInfo {
 	ChatRestrictionsInfo() = default;
 	ChatRestrictionsInfo(ChatRestrictions flags, TimeId until)
@@ -79,6 +95,9 @@ struct ChatRestrictionsInfo {
 	TimeId until = 0;
 };
 
+[[nodiscard]] MTPChatBannedRights RestrictionsToMTP(
+	ChatRestrictionsInfo info);
+
 namespace Data {
 
 class Thread;
@@ -87,10 +106,12 @@ struct AdminRightsSetOptions {
 	bool isGroup : 1 = false;
 	bool isForum : 1 = false;
 	bool anyoneCanAddMembers : 1 = false;
+	bool canProcessJoinRequests : 1 = false;
 };
 
 struct RestrictionsSetOptions {
 	bool isForum = false;
+	bool isUserSpecific = false;
 };
 
 [[nodiscard]] std::vector<ChatRestrictions> ListOfRestrictions(
@@ -175,18 +196,83 @@ struct RestrictionsSetOptions {
 	return CanSendAnyOf(peer, AllSendRestrictions(), forbidInForums);
 }
 
-[[nodiscard]] std::optional<QString> RestrictionError(
+struct SendError {
+	SendError(QString text = QString()) : text(std::move(text)) {
+	}
+
+	struct Args {
+		QString text;
+		int boostsToLift = 0;
+		bool monoforumAdmin = false;
+		bool premiumToLift = false;
+		bool frozen = false;
+	};
+	SendError(Args &&args)
+	: text(std::move(args.text))
+	, boostsToLift(args.boostsToLift)
+	, monoforumAdmin(args.monoforumAdmin)
+	, premiumToLift(args.premiumToLift)
+	, frozen(args.frozen) {
+	}
+
+	QString text;
+	int boostsToLift = 0;
+	bool monoforumAdmin = false;
+	bool premiumToLift = false;
+	bool frozen = false;
+
+	[[nodiscard]] SendError value_or(SendError other) const {
+		return *this ? *this : other;
+	}
+
+	explicit operator bool() const {
+		return monoforumAdmin || !text.isEmpty();
+	}
+	[[nodiscard]] bool has_value() const {
+		return !text.isEmpty();
+	}
+	[[nodiscard]] const QString &operator*() const {
+		return text;
+	}
+};
+
+struct SendErrorWithThread {
+	SendError error;
+	Thread *thread = nullptr;
+};
+
+[[nodiscard]] SendError RestrictionError(
 	not_null<PeerData*> peer,
 	ChatRestriction restriction);
-[[nodiscard]] std::optional<QString> AnyFileRestrictionError(
-	not_null<PeerData*> peer);
-[[nodiscard]] std::optional<QString> FileRestrictionError(
+[[nodiscard]] SendError AnyFileRestrictionError(not_null<PeerData*> peer);
+[[nodiscard]] SendError FileRestrictionError(
 	not_null<PeerData*> peer,
 	const Ui::PreparedList &list,
 	std::optional<bool> compress);
-[[nodiscard]] std::optional<QString> FileRestrictionError(
+[[nodiscard]] SendError FileRestrictionError(
 	not_null<PeerData*> peer,
 	const Ui::PreparedFile &file,
 	std::optional<bool> compress);
 
+void ShowSendErrorToast(
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	SendError error);
+void ShowSendErrorToast(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<PeerData*> peer,
+	SendError error);
+
+bool ShowSendError(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<PeerData*> peer,
+	const Ui::PreparedList &list,
+	std::optional<bool> compress,
+	bool ignoreSlowmodeLeft = false);
+bool ShowSendError(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<PeerData*> peer,
+	const Ui::PreparedBundle &bundle,
+	bool ignoreSlowmodeLeft = false);
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_cloud_file.cpp b/Telegram/SourceFiles/data/data_cloud_file.cpp
index 7b3e7382890b20..c80d8f26ee93fa 100644
--- a/Telegram/SourceFiles/data/data_cloud_file.cpp
+++ b/Telegram/SourceFiles/data/data_cloud_file.cpp
@@ -289,7 +289,7 @@ void LoadCloudFile(
 	};
 
 	file.loader->updates(
-	) | rpl::start_with_next_error_done([=] {
+	) | rpl::on_next_error_done([=] {
 		if (const auto onstack = progress) {
 			onstack();
 		}
diff --git a/Telegram/SourceFiles/data/data_cloud_themes.cpp b/Telegram/SourceFiles/data/data_cloud_themes.cpp
index 5ac1c2052cd52b..978bab8ca7c037 100644
--- a/Telegram/SourceFiles/data/data_cloud_themes.cpp
+++ b/Telegram/SourceFiles/data/data_cloud_themes.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "data/data_cloud_themes.h"
 
+#include "api/api_premium.h"
 #include "window/themes/window_theme.h"
 #include "window/themes/window_theme_preview.h"
 #include "window/themes/window_theme_editor_box.h"
@@ -26,6 +27,7 @@ namespace {
 
 constexpr auto kFirstReloadTimeout = 10 * crl::time(1000);
 constexpr auto kReloadTimeout = 3600 * crl::time(1000);
+constexpr auto kGiftThemesLimit = 24;
 
 bool IsTestingColors/* = false*/;
 
@@ -37,44 +39,38 @@ CloudTheme CloudTheme::Parse(
 		bool parseSettings) {
 	const auto document = data.vdocument();
 	const auto paper = [&](const MTPThemeSettings &settings) {
-		return settings.match([&](const MTPDthemeSettings &data) {
-			return data.vwallpaper()
-				? WallPaper::Create(session, *data.vwallpaper())
-				: std::nullopt;
-		});
+		const auto &data = settings.data();
+		return data.vwallpaper()
+			? WallPaper::Create(session, *data.vwallpaper())
+			: std::nullopt;
 	};
 	const auto outgoingMessagesColors = [&](
 			const MTPThemeSettings &settings) {
 		auto result = std::vector<QColor>();
-		settings.match([&](const MTPDthemeSettings &data) {
-			if (const auto colors = data.vmessage_colors()) {
-				for (const auto &color : colors->v) {
-					result.push_back(Ui::ColorFromSerialized(color));
-				}
+		const auto &data = settings.data();
+		if (const auto colors = data.vmessage_colors()) {
+			for (const auto &color : colors->v) {
+				result.push_back(Ui::ColorFromSerialized(color));
 			}
-		});
+		}
 		return result;
 	};
 	const auto accentColor = [&](const MTPThemeSettings &settings) {
-		return settings.match([&](const MTPDthemeSettings &data) {
-			return Ui::ColorFromSerialized(data.vaccent_color());
-		});
+		const auto &data = settings.data();
+		return Ui::ColorFromSerialized(data.vaccent_color());
 	};
 	const auto outgoingAccentColor = [&](const MTPThemeSettings &settings) {
-		return settings.match([&](const MTPDthemeSettings &data) {
-			return Ui::MaybeColorFromSerialized(data.voutbox_accent_color());
-		});
+		const auto &data = settings.data();
+		return Ui::MaybeColorFromSerialized(data.voutbox_accent_color());
 	};
 	const auto basedOnDark = [&](const MTPThemeSettings &settings) {
-		return settings.match([&](const MTPDthemeSettings &data) {
-			return data.vbase_theme().match([](
-					const MTPDbaseThemeNight &) {
-				return true;
-			}, [](const MTPDbaseThemeTinted &) {
-				return true;
-			}, [](const auto &) {
-				return false;
-			});
+		const auto &data = settings.data();
+		return data.vbase_theme().match([](const MTPDbaseThemeNight &) {
+			return true;
+		}, [](const MTPDbaseThemeTinted &) {
+			return true;
+		}, [](const auto &) {
+			return false;
 		});
 	};
 	const auto settings = [&] {
@@ -111,6 +107,80 @@ CloudTheme CloudTheme::Parse(
 	};
 }
 
+CloudTheme CloudTheme::Parse(
+		not_null<Main::Session*> session,
+		const MTPDchatThemeUniqueGift &data,
+		bool parseSettings) {
+	const auto gift = Api::FromTL(session, data.vgift());
+	if (!gift || !gift->unique) {
+		return {};
+	}
+	const auto paper = [&](const MTPThemeSettings &settings) {
+		const auto &data = settings.data();
+		return data.vwallpaper()
+			? WallPaper::Create(session, *data.vwallpaper())
+			: std::nullopt;
+	};
+	const auto basedOnDark = [&](const MTPThemeSettings &settings) {
+		const auto &data = settings.data();
+		return data.vbase_theme().match([](const MTPDbaseThemeNight &) {
+			return true;
+		}, [](const MTPDbaseThemeTinted &) {
+			return true;
+		}, [](const auto &) {
+			return false;
+		});
+	};
+	const auto outgoingMessagesColors = [&](
+			const MTPThemeSettings &settings) {
+		auto result = std::vector<QColor>();
+		const auto &data = settings.data();
+		if (const auto colors = data.vmessage_colors()) {
+			for (const auto &color : colors->v) {
+				result.push_back(Ui::ColorFromSerialized(color));
+			}
+		//} else if (basedOnDark(settings)) {
+		//	result.push_back(gift->unique->backdrop.edgeColor);
+		//} else {
+		//	result.push_back(anim::color(
+		//		gift->unique->backdrop.patternColor,
+		//		QColor(255, 255, 255, 255),
+		//		0.75));
+		}
+		return result;
+	};
+	const auto accentColor = [&](const MTPThemeSettings &settings) {
+		const auto &data = settings.data();
+		return Ui::ColorFromSerialized(data.vaccent_color());
+	};
+	const auto outgoingAccentColor = [&](const MTPThemeSettings &settings) {
+		const auto &data = settings.data();
+		return Ui::MaybeColorFromSerialized(
+			data.voutbox_accent_color()
+		);// .value_or(gift->unique->backdrop.patternColor);
+	};
+	const auto settings = [&] {
+		auto result = base::flat_map<Type, Settings>();
+		for (const auto &fields : data.vtheme_settings().v) {
+			const auto type = basedOnDark(fields) ? Type::Dark : Type::Light;
+			result.emplace(type, Settings{
+				.paper = paper(fields),
+				.accentColor = accentColor(fields),
+				.outgoingAccentColor = outgoingAccentColor(fields),
+				.outgoingMessagesColors = outgoingMessagesColors(fields),
+			});
+		}
+		return result;
+	};
+	return {
+		.id = gift->unique->id,
+		.unique = gift->unique,
+		.settings = (parseSettings
+			? settings()
+			: base::flat_map<Type, Settings>()),
+	};
+}
+
 CloudTheme CloudTheme::Parse(
 		not_null<Main::Session*> session,
 		const MTPTheme &data,
@@ -142,7 +212,7 @@ void CloudThemes::setupReload() {
 		return (update.type == BackgroundUpdate::Type::ApplyingTheme);
 	}) | rpl::map([=] {
 		return needReload();
-	}) | rpl::start_with_next([=](bool need) {
+	}) | rpl::on_next([=](bool need) {
 		install();
 		if (need) {
 			scheduleReload();
@@ -238,7 +308,7 @@ void CloudThemes::showPreview(
 void CloudThemes::showPreview(
 		not_null<Window::Controller*> controller,
 		const CloudTheme &cloud) {
-	if (const auto documentId = cloud.documentId) {
+	if (cloud.documentId) {
 		previewFromDocument(controller, cloud);
 	} else if (cloud.createdBy == _session->userId()) {
 		controller->show(Box(
@@ -305,7 +375,7 @@ void CloudThemes::loadDocumentAndInvoke(
 		_session->downloaderTaskFinished(
 		) | rpl::filter([=, &value] {
 			return value.documentMedia->loaded();
-		}) | rpl::start_with_next([=, &value] {
+		}) | rpl::on_next([=, &value] {
 			invokeForLoaded(value);
 		}, value.subscription);
 	}
@@ -382,9 +452,16 @@ rpl::producer<> CloudThemes::chatThemesUpdated() const {
 	return _chatThemesUpdates.events();
 }
 
-std::optional<CloudTheme> CloudThemes::themeForEmoji(
-		const QString &emoticon) const {
-	const auto emoji = Ui::Emoji::Find(emoticon);
+std::optional<CloudTheme> CloudThemes::themeForToken(
+		const QString &token) const {
+	if (token.startsWith(u"gift:"_q)) {
+		const auto id = QStringView(token).mid(5).toULongLong();
+		const auto i = _giftThemes.find(id);
+		return (i != end(_giftThemes))
+			? i->second
+			: std::optional<CloudTheme>();
+	}
+	const auto emoji = Ui::Emoji::Find(token);
 	if (!emoji) {
 		return {};
 	}
@@ -394,18 +471,21 @@ std::optional<CloudTheme> CloudThemes::themeForEmoji(
 	return (i != end(_chatThemes)) ? std::make_optional(*i) : std::nullopt;
 }
 
-rpl::producer<std::optional<CloudTheme>> CloudThemes::themeForEmojiValue(
-		const QString &emoticon) {
+rpl::producer<std::optional<CloudTheme>> CloudThemes::themeForTokenValue(
+		const QString &token) {
+	if (token.startsWith(u"gift:"_q)) {
+		return rpl::single(themeForToken(token));
+	}
 	const auto testing = TestingColors();
-	if (!Ui::Emoji::Find(emoticon)) {
+	if (!Ui::Emoji::Find(token)) {
 		return rpl::single<std::optional<CloudTheme>>(std::nullopt);
-	} else if (auto result = themeForEmoji(emoticon)) {
+	} else if (auto result = themeForToken(token)) {
 		if (testing) {
 			return rpl::single(
 				std::move(result)
 			) | rpl::then(chatThemesUpdated(
 			) | rpl::map([=] {
-				return themeForEmoji(emoticon);
+				return themeForToken(token);
 			}) | rpl::filter([](const std::optional<CloudTheme> &theme) {
 				return theme.has_value();
 			}));
@@ -418,12 +498,92 @@ rpl::producer<std::optional<CloudTheme>> CloudThemes::themeForEmojiValue(
 		std::nullopt
 	) | rpl::then(chatThemesUpdated(
 	) | rpl::map([=] {
-		return themeForEmoji(emoticon);
+		return themeForToken(token);
 	}) | rpl::filter([](const std::optional<CloudTheme> &theme) {
 		return theme.has_value();
 	}) | rpl::take(limit));
 }
 
+void CloudThemes::myGiftThemesLoadMore(bool reload) {
+	if (reload && !_myGiftThemesTokens.empty()) {
+		_session->api().request(base::take(_myGiftThemesRequestId)).cancel();
+	}
+	if (_myGiftThemesRequestId || (!reload && _myGiftThemesLoaded)) {
+		return;
+	}
+	_myGiftThemesRequestId = _session->api().request(
+		MTPaccount_GetUniqueGiftChatThemes(
+			MTP_string(reload ? QString() : _myGiftThemesNextOffset),
+			MTP_int(kGiftThemesLimit),
+			MTP_long(_myGiftThemesHash))
+	).done([=](const MTPaccount_ChatThemes &result) {
+		_myGiftThemesRequestId = 0;
+		result.match([&](const MTPDaccount_chatThemes &data) {
+			if (reload || _myGiftThemesTokens.empty()) {
+				_myGiftThemesHash = data.vhash().v;
+				_myGiftThemesTokens.clear();
+				_myGiftThemesLoaded = false;
+			}
+			_session->data().processUsers(data.vusers());
+			_session->data().processChats(data.vchats());
+			const auto &list = data.vthemes().v;
+			const auto got = int(list.size());
+			_myGiftThemesTokens.reserve(_myGiftThemesTokens.size() + got);
+			for (const auto &theme : list) {
+				theme.match([](const MTPDchatTheme &) {
+				}, [&](const MTPDchatThemeUniqueGift &data) {
+					_myGiftThemesTokens.push_back(
+						processGiftThemeGetToken(data));
+				});
+			}
+			if (const auto next = data.vnext_offset()) {
+				_myGiftThemesNextOffset = qs(*next);
+			} else {
+				_myGiftThemesLoaded = true;
+			}
+			_myGiftThemesUpdates.fire({});
+		}, [&](const MTPDaccount_chatThemesNotModified &) {
+			if (!reload) {
+				_myGiftThemesLoaded = true;
+				_myGiftThemesUpdates.fire({});
+			}
+		});
+	}).fail([=] {
+		_myGiftThemesRequestId = 0;
+		_myGiftThemesLoaded = true;
+	}).send();
+}
+
+const std::vector<QString> &CloudThemes::myGiftThemesTokens() const {
+	return _myGiftThemesTokens;
+}
+
+bool CloudThemes::myGiftThemesReady() const {
+	return !_myGiftThemesTokens.empty() || _myGiftThemesLoaded;
+}
+
+rpl::producer<> CloudThemes::myGiftThemesUpdated() const {
+	return _myGiftThemesUpdates.events();
+}
+
+QString CloudThemes::processGiftThemeGetToken(
+		const MTPDchatThemeUniqueGift &data) {
+	auto parsed = CloudTheme::Parse(_session, data, true);
+	if (parsed.unique) {
+		const auto id = parsed.unique->id;
+		_giftThemes[id] = std::move(parsed);
+		return u"gift:%1"_q.arg(id);
+	}
+	return QString();
+}
+
+void CloudThemes::refreshChatThemesFor(const QString &token) {
+	if (token.startsWith(u"gift:"_q)) {
+		return;
+	}
+	refreshChatThemes();
+}
+
 bool CloudThemes::TestingColors() {
 	return IsTestingColors;
 }
diff --git a/Telegram/SourceFiles/data/data_cloud_themes.h b/Telegram/SourceFiles/data/data_cloud_themes.h
index 1ac4ceff1940da..445c171f3ee177 100644
--- a/Telegram/SourceFiles/data/data_cloud_themes.h
+++ b/Telegram/SourceFiles/data/data_cloud_themes.h
@@ -22,6 +22,7 @@ class Controller;
 
 namespace Data {
 
+struct UniqueGift;
 class DocumentMedia;
 
 enum class CloudThemeType {
@@ -38,6 +39,7 @@ struct CloudTheme {
 	UserId createdBy = 0;
 	int usersCount = 0;
 	QString emoticon;
+	std::shared_ptr<UniqueGift> unique;
 
 	using Type = CloudThemeType;
 	struct Settings {
@@ -52,6 +54,10 @@ struct CloudTheme {
 		not_null<Main::Session*> session,
 		const MTPDtheme &data,
 		bool parseSettings = false);
+	static CloudTheme Parse(
+		not_null<Main::Session*> session,
+		const MTPDchatThemeUniqueGift &data,
+		bool parseSettings = false);
 	static CloudTheme Parse(
 		not_null<Main::Session*> session,
 		const MTPTheme &data,
@@ -73,9 +79,18 @@ class CloudThemes final {
 	void refreshChatThemes();
 	[[nodiscard]] const std::vector<CloudTheme> &chatThemes() const;
 	[[nodiscard]] rpl::producer<> chatThemesUpdated() const;
-	[[nodiscard]] std::optional<CloudTheme> themeForEmoji(
-		const QString &emoticon) const;
-	[[nodiscard]] auto themeForEmojiValue(const QString &emoticon)
+
+	void myGiftThemesLoadMore(bool reload = false);
+	[[nodiscard]] const std::vector<QString> &myGiftThemesTokens() const;
+	[[nodiscard]] rpl::producer<> myGiftThemesUpdated() const;
+	[[nodiscard]] QString processGiftThemeGetToken(
+		const MTPDchatThemeUniqueGift &data);
+	[[nodiscard]] bool myGiftThemesReady() const;
+
+	void refreshChatThemesFor(const QString &token);
+	[[nodiscard]] std::optional<CloudTheme> themeForToken(
+		const QString &token) const;
+	[[nodiscard]] auto themeForTokenValue(const QString &token)
 		-> rpl::producer<std::optional<CloudTheme>>;
 
 	[[nodiscard]] static bool TestingColors();
@@ -140,6 +155,14 @@ class CloudThemes final {
 	std::vector<CloudTheme> _chatThemes;
 	rpl::event_stream<> _chatThemesUpdates;
 
+	mtpRequestId _myGiftThemesRequestId = 0;
+	base::flat_map<uint64, CloudTheme> _giftThemes;
+	std::vector<QString> _myGiftThemesTokens;
+	rpl::event_stream<> _myGiftThemesUpdates;
+	uint64 _myGiftThemesHash = 0;
+	QString _myGiftThemesNextOffset;
+	bool _myGiftThemesLoaded = false;
+
 	base::Timer _reloadCurrentTimer;
 	LoadingDocument _updatingFrom;
 	LoadingDocument _previewFrom;
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index 3397cf7ea20cfb..177c8d09af5e32 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -11,6 +11,9 @@ For license and copyright information please follow this link:
 
 namespace Data {
 
+struct UniqueGift;
+struct UniqueGiftValue;
+
 struct CreditTopupOption final {
 	uint64 credits = 0;
 	QString product;
@@ -37,6 +40,10 @@ struct CreditsHistoryEntry final {
 		return !id.isEmpty();
 	}
 
+	[[nodiscard]] bool isLiveStoryReaction() const {
+		return paidMessagesCount && reaction && !bareMsgId;
+	}
+
 	using PhotoId = uint64;
 	enum class PeerType {
 		Peer,
@@ -46,43 +53,95 @@ struct CreditsHistoryEntry final {
 		Unsupported,
 		PremiumBot,
 		Ads,
+		API,
 	};
 
 	QString id;
 	QString title;
 	TextWithEntities description;
 	QDateTime date;
+	QDateTime firstSaleDate;
+	QDateTime lastSaleDate;
 	PhotoId photoId = 0;
 	std::vector<CreditsHistoryMedia> extended;
-	uint64 credits = 0;
+	CreditsAmount credits;
 	uint64 bareMsgId = 0;
 	uint64 barePeerId = 0;
 	uint64 bareGiveawayMsgId = 0;
 	uint64 bareGiftStickerId = 0;
+	uint64 bareGiftOwnerId = 0;
+	uint64 bareGiftHostId = 0;
+	uint64 bareGiftReleasedById = 0;
+	uint64 bareGiftResaleRecipientId = 0;
+	uint64 bareActorId = 0;
+	uint64 bareEntryOwnerId = 0;
+	uint64 giftChannelSavedId = 0;
+	uint64 stargiftId = 0;
+	QString giftPrepayUpgradeHash;
+	QString giftTitle;
+	std::shared_ptr<UniqueGift> uniqueGift;
+	Fn<std::vector<CreditsHistoryEntry>()> pinnedSavedGifts;
+	uint64 nextToUpgradeStickerId = 0;
+	Fn<void()> nextToUpgradeShow;
+	Fn<void()> craftAnotherCallback;
+	CreditsAmount starrefAmount;
+	int starrefCommission = 0;
+	uint64 starrefRecipientId = 0;
 	PeerType peerType;
 	QDateTime subscriptionUntil;
+
+	// Currency properties.
+	QDateTime adsProceedsToDate;
+	QString provider; // Unused.
+
 	QDateTime successDate;
 	QString successLink;
+	int paidMessagesCount = 0;
+	CreditsAmount paidMessagesAmount;
+	int paidMessagesCommission = 0;
 	int limitedCount = 0;
 	int limitedLeft = 0;
-	int convertStars = 0;
-	bool converted = false;
-	bool anonymous = false;
-	bool savedToProfile = false;
-	bool fromGiftsList = false;
-	bool reaction = false;
-	bool refunded = false;
-	bool pending = false;
-	bool failed = false;
-	bool in = false;
-	bool gift = false;
+	int starsConverted = 0;
+	int starsToUpgrade = 0;
+	int starsUpgradedBySender = 0;
+	int starsForDetailsRemove = 0;
+	int premiumMonthsForStars = 0;
+	int floodSkip = 0;
+	int giftNumber = 0;
+	bool converted : 1 = false;
+	bool anonymous : 1 = false;
+	bool stargift : 1 = false;
+	bool auction : 1 = false;
+	bool postsSearch : 1 = false;
+	bool giftTransferred : 1 = false;
+	bool giftRefunded : 1 = false;
+	bool giftUpgraded : 1 = false;
+	bool giftUpgradeSeparate : 1 = false;
+	bool giftUpgradeGifted : 1 = false;
+	bool giftResale : 1 = false;
+	bool giftOffer : 1 = false;
+	bool giftResaleForceTon : 1 = false;
+	bool giftPinned : 1 = false;
+	bool giftCrafted : 1 = false;
+	bool savedToProfile : 1 = false;
+	bool fromGiftsList : 1 = false;
+	bool fromGiftSlug : 1 = false;
+	bool soldOutInfo : 1 = false;
+	bool canUpgradeGift : 1 = false;
+	bool hasGiftComment : 1 = false;
+	bool reaction : 1 = false;
+	bool refunded : 1 = false;
+	bool pending : 1 = false;
+	bool failed : 1 = false;
+	bool in : 1 = false;
+	bool gift : 1 = false;
 };
 
 struct CreditsStatusSlice final {
 	using OffsetToken = QString;
 	std::vector<CreditsHistoryEntry> list;
 	std::vector<SubscriptionEntry> subscriptions;
-	uint64 balance = 0;
+	CreditsAmount balance;
 	uint64 subscriptionsMissingBalance = 0;
 	bool allLoaded = false;
 	OffsetToken token;
diff --git a/Telegram/SourceFiles/data/data_credits_earn.h b/Telegram/SourceFiles/data/data_credits_earn.h
index c82d58a7444641..af1d840c72ddfb 100644
--- a/Telegram/SourceFiles/data/data_credits_earn.h
+++ b/Telegram/SourceFiles/data/data_credits_earn.h
@@ -7,22 +7,24 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "core/credits_amount.h"
 #include "data/data_statistics_chart.h"
 
 #include <QtCore/QDateTime>
 
 namespace Data {
 
-using CreditsEarnInt = uint64;
-
 struct CreditsEarnStatistics final {
 	explicit operator bool() const {
-		return !!usdRate;
+		return usdRate
+			&& currentBalance
+			&& availableBalance
+			&& overallRevenue;
 	}
 	Data::StatisticalGraph revenueGraph;
-	CreditsEarnInt currentBalance = 0;
-	CreditsEarnInt availableBalance = 0;
-	CreditsEarnInt overallRevenue = 0;
+	CreditsAmount currentBalance;
+	CreditsAmount availableBalance;
+	CreditsAmount overallRevenue;
 	float64 usdRate = 0.;
 	bool isWithdrawalEnabled = false;
 	QDateTime nextWithdrawalAt;
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 5456ef2807afa0..3ab940a4b85c9d 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 #include "data/data_streaming.h"
 #include "data/data_document_media.h"
 #include "data/data_reply_preview.h"
+#include "data/data_web_page.h"
 #include "lang/lang_keys.h"
 #include "inline_bots/inline_bot_layout_item.h"
 #include "main/main_session.h"
@@ -87,6 +88,16 @@ void UpdateStickerSetIdentifier(
 	});
 }
 
+[[nodiscard]] int ResolveAttributeVsTranscodeQuality(
+		int attributesQuality,
+		int transcodeMax) {
+	return (transcodeMax > 0
+		&& (attributesQuality < transcodeMax
+			|| attributesQuality > transcodeMax * 1.5))
+		? transcodeMax
+		: attributesQuality;
+}
+
 } // namespace
 
 QString FileNameUnsafe(
@@ -332,6 +343,8 @@ void DocumentData::setattributes(
 
 	validateLottieSticker();
 
+	auto wasVideoData = isVideoFile() ? std::move(_additional) : nullptr;
+
 	_videoPreloadPrefix = 0;
 	for (const auto &attribute : attributes) {
 		attribute.match([&](const MTPDdocumentAttributeImageSize &data) {
@@ -388,11 +401,21 @@ void DocumentData::setattributes(
 					: VideoDocument;
 				if (data.is_round_message()) {
 					_additional = std::make_unique<RoundData>();
-				} else if (const auto size = data.vpreload_prefix_size()) {
-					if (size->v > 0 && size->v < kMaxAllowedPreloadPrefix) {
-						_videoPreloadPrefix = size->v;
+				} else {
+					if (const auto size = data.vpreload_prefix_size()) {
+						if (size->v > 0
+							&& size->v < kMaxAllowedPreloadPrefix) {
+							_videoPreloadPrefix = size->v;
+						}
 					}
+					_additional = wasVideoData
+						? std::move(wasVideoData)
+						: std::make_unique<VideoData>();
+					video()->codec = qs(
+						data.vvideo_codec().value_or_empty());
 				}
+			} else if (type == VideoDocument && wasVideoData) {
+				_additional = std::move(wasVideoData);
 			} else if (const auto info = sticker()) {
 				info->type = StickerType::Webm;
 			}
@@ -511,6 +534,180 @@ void DocumentData::setattributes(
 	}
 }
 
+void DocumentData::setVideoQualities(const QVector<MTPDocument> &list) {
+	auto qualities = std::vector<not_null<DocumentData*>>();
+	qualities.reserve(list.size());
+	for (const auto &document : list) {
+		qualities.push_back(owner().processDocument(document));
+	}
+	setVideoQualities(std::move(qualities));
+}
+
+void DocumentData::setVideoQualities(
+		std::vector<not_null<DocumentData*>> qualities) {
+	const auto data = video();
+	if (!data) {
+		return;
+	}
+	auto count = int(qualities.size());
+	if (qualities.empty()) {
+		return;
+	}
+	const auto good = [&](not_null<DocumentData*> document) {
+		return document->isVideoFile()
+			&& !document->dimensions.isEmpty()
+			&& !document->inappPlaybackFailed()
+			&& document->useStreamingLoader();
+	};
+	ranges::sort(
+		qualities,
+		ranges::greater(),
+		&DocumentData::resolveVideoQuality);
+	for (auto i = 0; i != count - 1;) {
+		const auto my = qualities[i];
+		const auto next = qualities[i + 1];
+		const auto myQuality = my->resolveVideoQuality();
+		const auto nextQuality = next->resolveVideoQuality();
+		const auto myGood = good(my);
+		const auto nextGood = good(next);
+		if (!myGood || !nextGood || myQuality == nextQuality) {
+			const auto removeMe = !myGood
+				|| (nextGood && (my->size > next->size));
+			const auto from = i + (removeMe ? 1 : 2);
+			for (auto j = from; j != count; ++j) {
+				qualities[j - 1] = qualities[j];
+			}
+			--count;
+		} else {
+			++i;
+		}
+	}
+	if (!qualities[count - 1]->resolveVideoQuality()) {
+		--count;
+	}
+	qualities.erase(qualities.begin() + count, qualities.end());
+	if (!qualities.empty()) {
+		auto transcodeMax = 0;
+		for (const auto &quality : qualities) {
+			const auto qres = quality->resolveVideoQuality();
+			if (qres > transcodeMax) {
+				transcodeMax = qres;
+			}
+		}
+		const auto attributesSize = isVideoFile() ? dimensions : QSize();
+		const auto attributesQuality = attributesSize.isEmpty()
+			? 0
+			: std::min(attributesSize.width(), attributesSize.height());
+		auto mine = ResolveAttributeVsTranscodeQuality(
+			attributesQuality,
+			transcodeMax);
+		if (mine) {
+			qualities.insert(begin(qualities), this);
+		}
+	}
+	data->qualities = std::move(qualities);
+}
+
+int DocumentData::resolveVideoQuality() const {
+	if (const auto data = video()) {
+		if (!data->realVideoSize.isEmpty()) {
+			const auto size = data->realVideoSize;
+			return std::min(size.width(), size.height());
+		}
+		const auto attributesSize = isVideoFile() ? dimensions : QSize();
+		const auto attributesQuality = attributesSize.isEmpty()
+			? 0
+			: std::min(attributesSize.width(), attributesSize.height());
+		if (!data->qualities.empty()) {
+			auto transcodeMax = 0;
+			for (const auto &quality : data->qualities) {
+				if (quality != this) {
+					const auto qres = quality->resolveVideoQuality();
+					if (qres > transcodeMax) {
+						transcodeMax = qres;
+					}
+				}
+			}
+			if (transcodeMax > 0) {
+				return ResolveAttributeVsTranscodeQuality(
+					attributesQuality,
+					transcodeMax);
+			}
+		}
+	}
+	const auto attributesSize = isVideoFile() ? dimensions : QSize();
+	return attributesSize.isEmpty()
+		? 0
+		: std::min(attributesSize.width(), attributesSize.height());
+}
+
+int DocumentData::resolveOriginalVideoQuality() const {
+	if (const auto data = video()) {
+		if (!data->realVideoSize.isEmpty()) {
+			const auto size = data->realVideoSize;
+			return std::min(size.width(), size.height());
+		}
+	}
+	const auto attributesSize = isVideoFile() ? dimensions : QSize();
+	return attributesSize.isEmpty()
+		? 0
+		: std::min(attributesSize.width(), attributesSize.height());
+}
+
+Media::VideoQuality DocumentData::initialPlaybackVideoQuality(
+		Media::VideoQuality request) const {
+	return (isVideoFile() && !filepath(true).isEmpty())
+		? Media::VideoQuality{
+			.manual = 1u,
+			.height = uint32(std::max(resolveOriginalVideoQuality(), 0)),
+			.original = 1u,
+		}
+		: request;
+}
+
+auto DocumentData::resolveQualities(HistoryItem *context) const
+-> const std::vector<not_null<DocumentData*>> & {
+	static const auto empty = std::vector<not_null<DocumentData*>>();
+	const auto info = video();
+	const auto media = context ? context->media() : nullptr;
+	if (!info || !media || media->document() != this) {
+		return empty;
+	}
+	return media->hasQualitiesList() ? info->qualities : empty;
+}
+
+not_null<DocumentData*> DocumentData::chooseQuality(
+		HistoryItem *context,
+		Media::VideoQuality request) {
+	const auto &list = resolveQualities(context);
+	if (list.empty() || !request.height) {
+		return this;
+	}
+	const auto height = int(request.height);
+	if (request.original) {
+		return this;
+	}
+
+	auto closest = (DocumentData*)nullptr;
+	auto closestAbs = -1;
+	auto closestSize = -1;
+
+	for (const auto &quality : list) {
+		const auto qres = quality->resolveVideoQuality();
+		const auto abs = std::abs(height - qres);
+		if (!closest
+			|| abs < closestAbs
+			|| (abs == closestAbs && (quality->size < closestSize
+				|| (closest == this && quality != this)))) {
+			closest = quality;
+			closestAbs = abs;
+			closestSize = quality->size;
+		}
+	}
+
+	return closest ? closest : this;
+}
+
 void DocumentData::validateLottieSticker() {
 	if (type == FileDocument
 		&& hasMimeType(u"application/x-tgsticker"_q)) {
@@ -611,6 +808,11 @@ bool DocumentData::isPatternWallPaperSVG() const {
 	return isWallPaper() && hasMimeType(u"application/x-tgwallpattern"_q);
 }
 
+bool DocumentData::isSvgImage() const {
+	return hasMimeType(u"image/svg+xml"_q)
+		|| _filename.endsWith(u".svg"_q, Qt::CaseInsensitive);
+}
+
 bool DocumentData::isPremiumSticker() const {
 	if (!(_flags & Flag::PremiumSticker)) {
 		return false;
@@ -631,6 +833,14 @@ bool DocumentData::emojiUsesTextColor() const {
 	return (_flags & Flag::UseTextColor);
 }
 
+void DocumentData::overrideEmojiUsesTextColor(bool value) {
+	if (value) {
+		_flags |= Flag::UseTextColor;
+	} else {
+		_flags &= ~Flag::UseTextColor;
+	}
+}
+
 bool DocumentData::hasThumbnail() const {
 	return _thumbnail.location.valid()
 		&& !thumbnailFailed()
@@ -994,9 +1204,10 @@ void DocumentData::save(
 		if (!toFile.isEmpty()) {
 			if (!media->bytes().isEmpty()) {
 				QFile f(toFile);
-				f.open(QIODevice::WriteOnly);
-				f.write(media->bytes());
-				f.close();
+				if (f.open(QIODevice::WriteOnly)) {
+					f.write(media->bytes());
+					f.close();
+				}
 
 				setLocation(Core::FileLocation(toFile));
 				session().local().writeFileLocation(
@@ -1093,7 +1304,7 @@ void DocumentData::save(
 
 void DocumentData::handleLoaderUpdates() {
 	_loader->updates(
-	) | rpl::start_with_next_error_done([=] {
+	) | rpl::on_next_error_done([=] {
 		_owner->documentLoadProgress(this);
 	}, [=](FileLoader::Error error) {
 		using FailureReason = FileLoader::FailureReason;
@@ -1306,6 +1517,17 @@ Image *DocumentData::getReplyPreview(
 		Data::FileOrigin origin,
 		not_null<PeerData*> context,
 		bool spoiler) {
+	if (v::is<Data::FileOriginMessage>(origin.data)) {
+		if (const auto item = _owner->message(
+				v::get<FullMsgId>(origin.data))) {
+			if (const auto cover = LookupVideoCover(this, item)) {
+				return cover->getReplyPreview(
+					std::move(origin),
+					context,
+					spoiler);
+			}
+		}
+	}
 	if (!hasThumbnail()) {
 		return nullptr;
 	} else if (!_replyPreview) {
@@ -1384,6 +1606,16 @@ const RoundData *DocumentData::round() const {
 	return const_cast<DocumentData*>(this)->round();
 }
 
+VideoData *DocumentData::video() {
+	return isVideoFile()
+		? static_cast<VideoData*>(_additional.get())
+		: nullptr;
+}
+
+const VideoData *DocumentData::video() const {
+	return const_cast<DocumentData*>(this)->video();
+}
+
 bool DocumentData::hasRemoteLocation() const {
 	return (_dc != 0 && _access != 0);
 }
@@ -1400,17 +1632,8 @@ bool DocumentData::useStreamingLoader() const {
 		|| isVoiceMessage();
 }
 
-bool DocumentData::canBeStreamed(HistoryItem *item) const {
-	// Streaming couldn't be used with external player
-	// Maybe someone brave will implement this once upon a time...
-	static const auto &ExternalVideoPlayer = base::options::lookup<bool>(
-		Data::kOptionExternalVideoPlayer);
-	return hasRemoteLocation()
-		&& supportsStreaming()
-		&& (!isVideoFile()
-			|| storyMedia()
-			|| !ExternalVideoPlayer.value()
-			|| (item && !item->allowsForward()));
+bool DocumentData::canBeStreamed() const {
+	return hasRemoteLocation() && supportsStreaming();
 }
 
 void DocumentData::setInappPlaybackFailed() {
@@ -1568,6 +1791,10 @@ void DocumentData::forceIsStreamedAnimation() {
 	setMaybeSupportsStreaming(true);
 }
 
+bool DocumentData::isMusicForProfile() const {
+	return isSong();
+}
+
 bool DocumentData::isVoiceMessage() const {
 	return (type == VoiceDocument);
 }
@@ -1596,6 +1823,7 @@ bool DocumentData::isTheme() const {
 		|| _filename.endsWith(u".tdesktop-palette"_q, Qt::CaseInsensitive)
 		|| (hasMimeType(u"application/x-tgtheme-tdesktop"_q)
 			&& (_filename.isEmpty()
+				|| !_filename.contains('.')
 				|| _nameType == Core::NameType::ThemeFile));
 }
 
@@ -1749,3 +1977,18 @@ void DocumentData::collectLocalData(not_null<DocumentData*> local) {
 		session().local().writeFileLocation(mediaKey(), _location);
 	}
 }
+
+PhotoData *LookupVideoCover(
+		not_null<DocumentData*> document,
+		HistoryItem *item) {
+	const auto media = item ? item->media() : nullptr;
+	if (const auto webpage = media ? media->webpage() : nullptr) {
+		if (webpage->document == document && webpage->photoIsVideoCover) {
+			return webpage->photo;
+		}
+		return nullptr;
+	}
+	return (media && media->document() == document)
+		? media->videoCover()
+		: nullptr;
+}
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index 47237b3c4a396a..88d596ccd0d2e0 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -13,6 +13,8 @@ For license and copyright information please follow this link:
 #include "data/data_cloud_file.h"
 #include "core/file_location.h"
 
+class HistoryItem;
+class PhotoData;
 enum class ChatRestriction;
 class mtpFileLoader;
 
@@ -31,11 +33,13 @@ struct Key;
 } // namespace Storage
 
 namespace Media {
-namespace Streaming {
-class Loader;
-} // namespace Streaming
+struct VideoQuality;
 } // namespace Media
 
+namespace Media::Streaming {
+class Loader;
+} // namespace Media::Streaming
+
 namespace Data {
 class Session;
 class DocumentMedia;
@@ -92,6 +96,12 @@ struct VoiceData : public DocumentAdditionalData {
 	char wavemax = 0;
 };
 
+struct VideoData : public DocumentAdditionalData {
+	QString codec;
+	std::vector<not_null<DocumentData*>> qualities;
+	QSize realVideoSize;
+};
+
 using RoundData = VoiceData;
 
 namespace Serialize {
@@ -108,8 +118,19 @@ class DocumentData final {
 
 	void setattributes(
 		const QVector<MTPDocumentAttribute> &attributes);
+	void setVideoQualities(const QVector<MTPDocument> &list);
 
 	void automaticLoadSettingsChanged();
+	void setVideoQualities(std::vector<not_null<DocumentData*>> qualities);
+	[[nodiscard]] int resolveVideoQuality() const;
+	[[nodiscard]] int resolveOriginalVideoQuality() const;
+	[[nodiscard]] Media::VideoQuality initialPlaybackVideoQuality(
+		Media::VideoQuality request) const;
+	[[nodiscard]] auto resolveQualities(HistoryItem *context) const
+		-> const std::vector<not_null<DocumentData*>> &;
+	[[nodiscard]] not_null<DocumentData*> chooseQuality(
+		HistoryItem *context,
+		Media::VideoQuality request);
 
 	[[nodiscard]] bool loading() const;
 	[[nodiscard]] QString loadingFilePath() const;
@@ -161,8 +182,11 @@ class DocumentData final {
 	[[nodiscard]] const VoiceData *voice() const;
 	[[nodiscard]] RoundData *round();
 	[[nodiscard]] const RoundData *round() const;
+	[[nodiscard]] VideoData *video();
+	[[nodiscard]] const VideoData *video() const;
 
 	void forceIsStreamedAnimation();
+	[[nodiscard]] bool isMusicForProfile() const;
 	[[nodiscard]] bool isVoiceMessage() const;
 	[[nodiscard]] bool isVideoMessage() const;
 	[[nodiscard]] bool isSong() const;
@@ -186,9 +210,11 @@ class DocumentData final {
 	[[nodiscard]] bool isPatternWallPaper() const;
 	[[nodiscard]] bool isPatternWallPaperPNG() const;
 	[[nodiscard]] bool isPatternWallPaperSVG() const;
+	[[nodiscard]] bool isSvgImage() const;
 	[[nodiscard]] bool isPremiumSticker() const;
 	[[nodiscard]] bool isPremiumEmoji() const;
 	[[nodiscard]] bool emojiUsesTextColor() const;
+	void overrideEmojiUsesTextColor(bool value);
 
 	[[nodiscard]] bool hasThumbnail() const;
 	[[nodiscard]] bool thumbnailLoading() const;
@@ -270,7 +296,7 @@ class DocumentData final {
 	[[nodiscard]] Storage::Cache::Key cacheKey() const;
 	[[nodiscard]] uint8 cacheTag() const;
 
-	[[nodiscard]] bool canBeStreamed(HistoryItem *item) const;
+	[[nodiscard]] bool canBeStreamed() const;
 	[[nodiscard]] auto createStreamingLoader(
 		Data::FileOrigin origin,
 		bool forceRemoteLoader) const
@@ -380,6 +406,10 @@ class DocumentData final {
 
 };
 
+[[nodiscard]] PhotoData *LookupVideoCover(
+	not_null<DocumentData*> document,
+	HistoryItem *item);
+
 VoiceWaveform documentWaveformDecode(const QByteArray &encoded5bit);
 QByteArray documentWaveformEncode5bit(const VoiceWaveform &waveform);
 
diff --git a/Telegram/SourceFiles/data/data_document_media.cpp b/Telegram/SourceFiles/data/data_document_media.cpp
index e61030302b0192..c77ef0ffcb9cb2 100644
--- a/Telegram/SourceFiles/data/data_document_media.cpp
+++ b/Telegram/SourceFiles/data/data_document_media.cpp
@@ -25,6 +25,8 @@ For license and copyright information please follow this link:
 #include "core/mime_type.h"
 #include "storage/file_download.h"
 #include "ui/chat/attach/attach_prepare.h"
+#include "ui/image/svg_preview.h"
+#include "ui/rect.h"
 
 #include <QtCore/QBuffer>
 #include <QtGui/QImageReader>
@@ -44,6 +46,7 @@ enum class FileType {
 	WallPatternPNG,
 	WallPatternSVG,
 	Theme,
+	SvgImage,
 };
 
 [[nodiscard]] bool MayHaveGoodThumbnail(not_null<DocumentData*> owner) {
@@ -51,6 +54,7 @@ enum class FileType {
 		|| owner->isAnimation()
 		|| owner->isWallPaper()
 		|| owner->isTheme()
+		|| owner->isSvgImage()
 		|| (owner->sticker() && owner->sticker()->isAnimated());
 }
 
@@ -78,6 +82,21 @@ enum class FileType {
 				kWallPaperThumbnailLimit),
 			.gzipSvg = true,
 		}).image;
+	} else if (type == FileType::SvgImage) {
+		if (data.isEmpty() && !path.isEmpty()) {
+			auto file = QFile(path);
+			if (file.open(QIODevice::ReadOnly)) {
+				const auto limit = Ui::SvgPreviewBytesLimit();
+				if (!file.isSequential() && (file.size() > limit)) {
+					return QImage();
+				}
+				data = file.read(limit + 1);
+				if (data.size() > limit) {
+					return QImage();
+				}
+			}
+		}
+		return Ui::RenderSvgPreview(data, Size(kWallPaperThumbnailLimit));
 	}
 	auto buffer = QBuffer(&data);
 	auto file = QFile(path);
@@ -181,7 +200,7 @@ Image *DocumentMedia::goodThumbnail() const {
 }
 
 void DocumentMedia::setGoodThumbnail(QImage thumbnail) {
-	if (!(_flags & Flag::GoodThumbnailWanted)) {
+	if (!(_flags & Flag::GoodThumbnailWanted) || thumbnail.isNull()) {
 		return;
 	}
 	_goodThumbnail = std::make_unique<Image>(std::move(thumbnail));
@@ -285,7 +304,10 @@ void DocumentMedia::checkStickerLarge() {
 void DocumentMedia::automaticLoad(
 		Data::FileOrigin origin,
 		const HistoryItem *item) {
-	if (_owner->status != FileReady || loaded() || _owner->cancelled()) {
+	if (_owner->status != FileReady
+		|| loaded()
+		|| _owner->uploading()
+		|| _owner->cancelled()) {
 		return;
 	} else if (!item && !_owner->sticker() && !_owner->isAnimation()) {
 		return;
@@ -358,10 +380,10 @@ float64 DocumentMedia::progress() const {
 		: (loaded() ? 1. : 0.);
 }
 
-bool DocumentMedia::canBePlayed(HistoryItem *item) const {
+bool DocumentMedia::canBePlayed() const {
 	return !_owner->inappPlaybackFailed()
 		&& _owner->useStreamingLoader()
-		&& (loaded() || _owner->canBeStreamed(item));
+		&& (loaded() || _owner->canBeStreamed());
 }
 
 bool DocumentMedia::thumbnailEnoughForSticker() const {
@@ -419,6 +441,8 @@ void DocumentMedia::GenerateGoodThumbnail(
 		? FileType::WallPaper
 		: document->isTheme()
 		? FileType::Theme
+		: document->isSvgImage()
+		? FileType::SvgImage
 		: !document->sticker()
 		? FileType::Video
 		: document->sticker()->isLottie()
@@ -431,7 +455,7 @@ void DocumentMedia::GenerateGoodThumbnail(
 		document->setGoodThumbnailChecked(false);
 		return;
 	}
-	const auto guard = base::make_weak(&document->owner().session());
+	const auto guard = base::make_weak(&document->session());
 	crl::async([=, location = std::move(location)] {
 		const auto filepath = (location && location->accessEnable())
 			? location->name()
@@ -444,7 +468,8 @@ void DocumentMedia::GenerateGoodThumbnail(
 				|| type == FileType::VideoSticker)
 				? "WEBP"
 				: (type == FileType::WallPatternPNG
-					|| type == FileType::WallPatternSVG)
+					|| type == FileType::WallPatternSVG
+					|| type == FileType::SvgImage)
 				? "PNG"
 				: "JPG";
 			result.save(&buffer, format, kGoodThumbQuality);
diff --git a/Telegram/SourceFiles/data/data_document_media.h b/Telegram/SourceFiles/data/data_document_media.h
index 9dfb3588a4f1f5..de94713dbe60b4 100644
--- a/Telegram/SourceFiles/data/data_document_media.h
+++ b/Telegram/SourceFiles/data/data_document_media.h
@@ -78,7 +78,7 @@ class DocumentMedia final {
 	[[nodiscard]] QByteArray bytes() const;
 	[[nodiscard]] bool loaded(bool check = false) const;
 	[[nodiscard]] float64 progress() const;
-	[[nodiscard]] bool canBePlayed(HistoryItem *item) const;
+	[[nodiscard]] bool canBePlayed() const;
 
 	void automaticLoad(Data::FileOrigin origin, const HistoryItem *item);
 
diff --git a/Telegram/SourceFiles/data/data_document_resolver.cpp b/Telegram/SourceFiles/data/data_document_resolver.cpp
index 4c901daa24eb05..20fc12fc94b5a2 100644
--- a/Telegram/SourceFiles/data/data_document_resolver.cpp
+++ b/Telegram/SourceFiles/data/data_document_resolver.cpp
@@ -7,20 +7,21 @@ For license and copyright information please follow this link:
 */
 #include "data/data_document_resolver.h"
 
-#include "base/options.h"
 #include "base/platform/base_platform_info.h"
 #include "boxes/abstract_box.h" // Ui::show().
 #include "chat_helpers/ttl_media_layer_widget.h"
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "core/core_settings.h"
 #include "core/mime_type.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_file_click_handler.h"
 #include "data/data_session.h"
+#include "history/view/media/history_view_gif.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "history/view/media/history_view_gif.h"
+#include "iv/iv_instance.h"
 #include "lang/lang_keys.h"
 #include "media/player/media_player_instance.h"
 #include "platform/platform_file_utilities.h"
@@ -30,6 +31,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/checkbox.h"
 #include "ui/wrap/slide_wrap.h"
 #include "window/window_session_controller.h"
+
 #include "styles/style_layers.h"
 
 #include <QtCore/QBuffer>
@@ -39,13 +41,6 @@ For license and copyright information please follow this link:
 namespace Data {
 namespace {
 
-base::options::toggle OptionExternalVideoPlayer({
-	.id = kOptionExternalVideoPlayer,
-	.name = "External video player",
-	.description = "Use system video player instead of the internal one. "
-		"This disabes video playback in messages.",
-});
-
 void ConfirmDontWarnBox(
 		not_null<Ui::GenericBox*> box,
 		rpl::producer<TextWithEntities> &&text,
@@ -57,7 +52,7 @@ void ConfirmDontWarnBox(
 		std::move(check),
 		false,
 		st::defaultBoxCheckbox);
-	const auto weak = Ui::MakeWeak(checkbox.data());
+	const auto weak = base::make_weak(checkbox.data());
 	auto confirmed = crl::guard(weak, [=, callback = std::move(callback)] {
 		const auto checked = weak->checked();
 		box->closeBox();
@@ -130,13 +125,13 @@ void LaunchWithWarning(
 		File::Launch(name);
 	};
 	auto text = isIpReveal
-		? tr::lng_launch_svg_warning(Ui::Text::WithEntities)
+		? tr::lng_launch_svg_warning(tr::marked)
 		: ((nameType == Core::NameType::Executable)
 			? tr::lng_launch_exe_warning
 			: tr::lng_launch_other_warning)(
 				lt_extension,
-				rpl::single(Ui::Text::Bold('.' + extension)),
-				Ui::Text::WithEntities);
+				rpl::single(tr::bold('.' + extension)),
+				tr::marked);
 	auto check = (isIpReveal
 		? tr::lng_launch_exe_dont_ask
 		: tr::lng_launch_dont_ask)();
@@ -153,8 +148,6 @@ void LaunchWithWarning(
 
 } // namespace
 
-const char kOptionExternalVideoPlayer[] = "external-video-player";
-
 base::binary_guard ReadBackgroundImageAsync(
 		not_null<Data::DocumentMedia*> media,
 		FnMut<QImage(QImage)> postprocess,
@@ -169,7 +162,11 @@ base::binary_guard ReadBackgroundImageAsync(
 		guard = result.make_guard(),
 		callback = std::move(done)
 	]() mutable {
-		auto image = Ui::ReadBackgroundImage(path, bytes, gzipSvg);
+		auto image = Ui::ReadBackgroundImage(path, bytes, gzipSvg).image;
+		if (image.isNull()) {
+			image = QImage(1, 1, QImage::Format_ARGB32_Premultiplied);
+			image.fill(Qt::black);
+		}
 		if (postprocess) {
 			image = postprocess(std::move(image));
 		}
@@ -187,22 +184,20 @@ void ResolveDocument(
 		Window::SessionController *controller,
 		not_null<DocumentData*> document,
 		HistoryItem *item,
-		MsgId topicRootId) {
+		MsgId topicRootId,
+		PeerId monoforumPeerId,
+		bool showDrawButton) {
 	if (document->isNull()) {
 		return;
 	}
 	const auto msgId = item ? item->fullId() : FullMsgId();
 
 	const auto showDocument = [&] {
-		if (OptionExternalVideoPlayer.value()
-			&& document->isVideoFile()
-			&& !document->filepath().isEmpty()) {
-			File::Launch(document->location(false).fname);
-		} else if (controller) {
+		if (controller) {
 			controller->openDocument(
 				document,
 				true,
-				{ msgId, topicRootId });
+				{ msgId, topicRootId, monoforumPeerId, showDrawButton });
 		}
 	};
 
@@ -238,7 +233,7 @@ void ResolveDocument(
 	if (document->isTheme() && media->loaded(true)) {
 		showDocument();
 		location.accessDisable();
-	} else if (media->canBePlayed(item)) {
+	} else if (media->canBePlayed()) {
 		if (document->isAudioFile()
 			|| document->isVoiceMessage()
 			|| document->isVideoMessage()) {
@@ -255,8 +250,21 @@ void ResolveDocument(
 	} else {
 		document->saveFromDataSilent();
 		if (!openImageInApp()) {
-			if (!document->filepath(true).isEmpty()) {
-				LaunchWithWarning(location.name(), item);
+			const auto path = document->filepath(true);
+			if (!path.isEmpty()) {
+				auto context = QVariant();
+				if (item) {
+					auto clickHandlerContext = ClickHandlerContext();
+					clickHandlerContext.itemId = item->fullId();
+					if (controller) {
+						clickHandlerContext.sessionWindow = controller;
+						clickHandlerContext.show = controller->uiShow();
+					}
+					context = QVariant::fromValue(clickHandlerContext);
+				}
+				if (!Core::App().iv().showMarkdown(path, context)) {
+					LaunchWithWarning(path, item);
+				}
 			} else if (document->status == FileReady
 				|| document->status == FileDownloadFailed) {
 				DocumentSaveClickHandler::Save(
diff --git a/Telegram/SourceFiles/data/data_document_resolver.h b/Telegram/SourceFiles/data/data_document_resolver.h
index 4988297aaae57f..57f965a8636287 100644
--- a/Telegram/SourceFiles/data/data_document_resolver.h
+++ b/Telegram/SourceFiles/data/data_document_resolver.h
@@ -20,8 +20,6 @@ namespace Data {
 
 class DocumentMedia;
 
-extern const char kOptionExternalVideoPlayer[];
-
 base::binary_guard ReadBackgroundImageAsync(
 	not_null<Data::DocumentMedia*> media,
 	FnMut<QImage(QImage)> postprocess,
@@ -31,6 +29,8 @@ void ResolveDocument(
 	Window::SessionController *controller,
 	not_null<DocumentData*> document,
 	HistoryItem *item,
-	MsgId topicRootId);
+	MsgId topicRootId,
+	PeerId monoforumPeerId,
+	bool showDrawButton);
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_download_manager.cpp b/Telegram/SourceFiles/data/data_download_manager.cpp
index c40085968a3ffe..0633614ee64544 100644
--- a/Telegram/SourceFiles/data/data_download_manager.cpp
+++ b/Telegram/SourceFiles/data/data_download_manager.cpp
@@ -24,6 +24,7 @@ For license and copyright information please follow this link:
 #include "storage/storage_account.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/history_item_components.h"
 #include "history/history_item_helpers.h"
 #include "core/application.h"
 #include "core/mime_type.h"
@@ -61,12 +62,19 @@ constexpr auto ByDocument = [](const auto &entry) {
 	if (const auto user = peer->asUser()) {
 		return user->accessHash();
 	} else if (const auto channel = peer->asChannel()) {
-		return channel->access;
+		return channel->accessHash();
 	}
 	return 0;
 }
 
 [[nodiscard]] bool ItemContainsMedia(const DownloadObject &object) {
+	if (const auto iv = object.item->Get<HistoryMessageMediaForInstantView>()) {
+		if (object.document && iv->documents.contains(object.document)) {
+			return true;
+		} else if (object.photo && iv->photos.contains(object.photo)) {
+			return true;
+		}
+	}
 	if (const auto photo = object.photo) {
 		if (const auto media = object.item->media()) {
 			if (const auto page = media->webpage()) {
@@ -124,6 +132,15 @@ DownloadManager::DownloadManager()
 
 DownloadManager::~DownloadManager() = default;
 
+bool DownloadManager::empty() const {
+	for (const auto &[session, data] : _sessions) {
+		if (!data.downloading.empty() || !data.downloaded.empty()) {
+			return false;
+		}
+	}
+	return true;
+}
+
 void DownloadManager::trackSession(not_null<Main::Session*> session) {
 	auto &data = _sessions.emplace(session, SessionData()).first->second;
 	data.downloaded = deserialize(session);
@@ -132,32 +149,32 @@ void DownloadManager::trackSession(not_null<Main::Session*> session) {
 	session->data().documentLoadProgress(
 	) | rpl::filter([=](not_null<DocumentData*> document) {
 		return _loadingDocuments.contains(document);
-	}) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+	}) | rpl::on_next([=](not_null<DocumentData*> document) {
 		check(document);
 	}, data.lifetime);
 
 	session->data().itemLayoutChanged(
 	) | rpl::filter([=](not_null<const HistoryItem*> item) {
 		return _loading.contains(item);
-	}) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	}) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		check(item);
 	}, data.lifetime);
 
 	session->data().itemViewRefreshRequest(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		changed(item);
 	}, data.lifetime);
 
 	session->changes().messageUpdates(
 		MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const MessageUpdate &update) {
+	) | rpl::on_next([=](const MessageUpdate &update) {
 		removed(update.item);
 	}, data.lifetime);
 
 	session->account().sessionChanges(
 	) | rpl::filter(
 		rpl::mappers::_1 != session
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		untrack(session);
 	}, data.lifetime);
 }
@@ -830,10 +847,7 @@ void DownloadManager::changed(not_null<const HistoryItem*> item) {
 		const auto i = ranges::find(data.downloaded, item.get(), ByItem);
 		Assert(i != end(data.downloaded));
 
-		const auto media = item->media();
-		const auto photo = media ? media->photo() : nullptr;
-		const auto document = media ? media->document() : nullptr;
-		if (i->object->photo != photo || i->object->document != document) {
+		if (!ItemContainsMedia(*i->object)) {
 			detach(*i);
 		}
 	}
@@ -1128,7 +1142,7 @@ rpl::producer<Ui::DownloadBarContent> MakeDownloadBarContent() {
 				state->document->session().downloaderTaskFinished(
 				) | rpl::filter([=] {
 					return self(self);
-				}) | rpl::start_with_next(
+				}) | rpl::on_next(
 					state->push,
 					state->downloadTaskLifetime);
 			}
@@ -1190,7 +1204,7 @@ rpl::producer<Ui::DownloadBarContent> MakeDownloadBarContent() {
 		manager.loadingListChanges(
 		) | rpl::filter([=] {
 			return !state->scheduled;
-		}) | rpl::start_with_next(state->push, lifetime);
+		}) | rpl::on_next(state->push, lifetime);
 
 		notify();
 		return lifetime;
diff --git a/Telegram/SourceFiles/data/data_download_manager.h b/Telegram/SourceFiles/data/data_download_manager.h
index bb031c62e4c136..8ef078b30cfc4c 100644
--- a/Telegram/SourceFiles/data/data_download_manager.h
+++ b/Telegram/SourceFiles/data/data_download_manager.h
@@ -80,6 +80,8 @@ class DownloadManager final {
 	DownloadManager();
 	~DownloadManager();
 
+	[[nodiscard]] bool empty() const;
+
 	void trackSession(not_null<Main::Session*> session);
 	void itemVisibilitiesUpdated(not_null<Main::Session*> session);
 
diff --git a/Telegram/SourceFiles/data/data_drafts.cpp b/Telegram/SourceFiles/data/data_drafts.cpp
index 1bd7135e864076..86c79f1520a664 100644
--- a/Telegram/SourceFiles/data/data_drafts.cpp
+++ b/Telegram/SourceFiles/data/data_drafts.cpp
@@ -45,11 +45,13 @@ WebPageDraft WebPageDraft::FromItem(not_null<HistoryItem*> item) {
 Draft::Draft(
 	const TextWithTags &textWithTags,
 	FullReplyTo reply,
+	SuggestOptions suggest,
 	const MessageCursor &cursor,
 	WebPageDraft webpage,
 	mtpRequestId saveRequestId)
 : textWithTags(textWithTags)
 , reply(std::move(reply))
+, suggest(suggest)
 , cursor(cursor)
 , webpage(webpage)
 , saveRequestId(saveRequestId) {
@@ -58,10 +60,12 @@ Draft::Draft(
 Draft::Draft(
 	not_null<const Ui::InputField*> field,
 	FullReplyTo reply,
+	SuggestOptions suggest,
 	WebPageDraft webpage,
 	mtpRequestId saveRequestId)
 : textWithTags(field->getTextWithTags())
 , reply(std::move(reply))
+, suggest(suggest)
 , cursor(field)
 , webpage(webpage) {
 }
@@ -70,10 +74,11 @@ void ApplyPeerCloudDraft(
 		not_null<Main::Session*> session,
 		PeerId peerId,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		const MTPDdraftMessage &draft) {
 	const auto history = session->data().history(peerId);
 	const auto date = draft.vdate().v;
-	if (history->skipCloudDraftUpdate(topicRootId, date)) {
+	if (history->skipCloudDraftUpdate(topicRootId, monoforumPeerId, date)) {
 		return;
 	}
 	const auto textWithTags = TextWithTags{
@@ -87,6 +92,7 @@ void ApplyPeerCloudDraft(
 		? ReplyToFromMTP(history, *draft.vreply_to())
 		: FullReplyTo();
 	replyTo.topicRootId = topicRootId;
+	replyTo.monoforumPeerId = monoforumPeerId;
 	auto webpage = WebPageDraft{
 		.invert = draft.is_invert_media(),
 		.removed = draft.is_no_webpage(),
@@ -104,29 +110,43 @@ void ApplyPeerCloudDraft(
 			}
 		}, [](const auto &) {});
 	}
+	auto suggest = SuggestOptions();
+	if (!history->suggestDraftAllowed()) {
+		// Don't apply suggest options in unsupported chats.
+	} else if (const auto suggested = draft.vsuggested_post()) {
+		const auto &data = suggested->data();
+		suggest.exists = 1;
+		suggest.date = data.vschedule_date().value_or_empty();
+		const auto price = CreditsAmountFromTL(data.vprice());
+		suggest.priceWhole = price.whole();
+		suggest.priceNano = price.nano();
+		suggest.ton = price.ton() ? 1 : 0;
+	}
 	auto cloudDraft = std::make_unique<Draft>(
 		textWithTags,
 		replyTo,
+		suggest,
 		MessageCursor(Ui::kQFixedMax, Ui::kQFixedMax, Ui::kQFixedMax),
 		std::move(webpage));
 	cloudDraft->date = date;
 
 	history->setCloudDraft(std::move(cloudDraft));
-	history->applyCloudDraft(topicRootId);
+	history->applyCloudDraft(topicRootId, monoforumPeerId);
 }
 
 void ClearPeerCloudDraft(
 		not_null<Main::Session*> session,
 		PeerId peerId,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		TimeId date) {
 	const auto history = session->data().history(peerId);
-	if (history->skipCloudDraftUpdate(topicRootId, date)) {
+	if (history->skipCloudDraftUpdate(topicRootId, monoforumPeerId, date)) {
 		return;
 	}
 
-	history->clearCloudDraft(topicRootId);
-	history->applyCloudDraft(topicRootId);
+	history->clearCloudDraft(topicRootId, monoforumPeerId);
+	history->applyCloudDraft(topicRootId, monoforumPeerId);
 }
 
 void SetChatLinkDraft(not_null<PeerData*> peer, TextWithEntities draft) {
@@ -146,15 +166,20 @@ void SetChatLinkDraft(not_null<PeerData*> peer, TextWithEntities draft) {
 	};
 	const auto history = peer->owner().history(peer->id);
 	const auto topicRootId = MsgId();
-	history->setLocalDraft(std::make_unique<Data::Draft>(
+	const auto monoforumPeerId = PeerId();
+	history->setLocalDraft(std::make_unique<Draft>(
 		textWithTags,
-		FullReplyTo{ .topicRootId = topicRootId },
+		FullReplyTo{
+			.topicRootId = topicRootId,
+			.monoforumPeerId = monoforumPeerId,
+		},
+		SuggestOptions(),
 		cursor,
-		Data::WebPageDraft()));
-	history->clearLocalEditDraft(topicRootId);
+		WebPageDraft()));
+	history->clearLocalEditDraft(topicRootId, monoforumPeerId);
 	history->session().changes().entryUpdated(
 		history,
-		Data::EntryUpdate::Flag::LocalDraftSet);
+		EntryUpdate::Flag::LocalDraftSet);
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_drafts.h b/Telegram/SourceFiles/data/data_drafts.h
index 1330995ed02c07..63872d1fa66944 100644
--- a/Telegram/SourceFiles/data/data_drafts.h
+++ b/Telegram/SourceFiles/data/data_drafts.h
@@ -23,11 +23,13 @@ void ApplyPeerCloudDraft(
 	not_null<Main::Session*> session,
 	PeerId peerId,
 	MsgId topicRootId,
+	PeerId monoforumPeerId,
 	const MTPDdraftMessage &draft);
 void ClearPeerCloudDraft(
 	not_null<Main::Session*> session,
 	PeerId peerId,
 	MsgId topicRootId,
+	PeerId monoforumPeerId,
 	TimeId date);
 
 struct WebPageDraft {
@@ -50,18 +52,21 @@ struct Draft {
 	Draft(
 		const TextWithTags &textWithTags,
 		FullReplyTo reply,
+		SuggestOptions suggest,
 		const MessageCursor &cursor,
 		WebPageDraft webpage,
 		mtpRequestId saveRequestId = 0);
 	Draft(
 		not_null<const Ui::InputField*> field,
 		FullReplyTo reply,
+		SuggestOptions suggest,
 		WebPageDraft webpage,
 		mtpRequestId saveRequestId = 0);
 
 	TimeId date = 0;
 	TextWithTags textWithTags;
 	FullReplyTo reply; // reply.messageId.msg is editMsgId for edit draft.
+	SuggestOptions suggest;
 	MessageCursor cursor;
 	WebPageDraft webpage;
 	mtpRequestId saveRequestId = 0;
@@ -72,22 +77,38 @@ class DraftKey {
 	[[nodiscard]] static constexpr DraftKey None() {
 		return 0;
 	}
-	[[nodiscard]] static constexpr DraftKey Local(MsgId topicRootId) {
-		return (topicRootId < 0 || topicRootId >= ServerMaxMsgId)
+	[[nodiscard]] static constexpr DraftKey Local(
+			MsgId topicRootId,
+			PeerId monoforumPeerId) {
+		return Invalid(topicRootId, monoforumPeerId)
 			? None()
-			: (topicRootId ? topicRootId.bare : kLocalDraftIndex);
+			: (topicRootId
+				? topicRootId.bare
+				: monoforumPeerId
+				? (monoforumPeerId.value + kMonoforumDraftBit)
+				: kLocalDraftIndex);
 	}
-	[[nodiscard]] static constexpr DraftKey LocalEdit(MsgId topicRootId) {
-		return (topicRootId < 0 || topicRootId >= ServerMaxMsgId)
+	[[nodiscard]] static constexpr DraftKey LocalEdit(
+			MsgId topicRootId,
+			PeerId monoforumPeerId) {
+		return Invalid(topicRootId, monoforumPeerId)
 			? None()
-			: ((topicRootId ? topicRootId.bare : kLocalDraftIndex)
-				+ kEditDraftShift);
+			: (kEditDraftShift
+				+ (topicRootId
+					? topicRootId.bare
+					: monoforumPeerId
+					? (monoforumPeerId.value + kMonoforumDraftBit)
+					: kLocalDraftIndex));
 	}
-	[[nodiscard]] static constexpr DraftKey Cloud(MsgId topicRootId) {
-		return (topicRootId < 0 || topicRootId >= ServerMaxMsgId)
+	[[nodiscard]] static constexpr DraftKey Cloud(
+			MsgId topicRootId,
+			PeerId monoforumPeerId) {
+		return Invalid(topicRootId, monoforumPeerId)
 			? None()
 			: topicRootId
 			? (kCloudDraftShift + topicRootId.bare)
+			: monoforumPeerId
+			? (kCloudDraftShift + monoforumPeerId.value + kMonoforumDraftBit)
 			: kCloudDraftIndex;
 	}
 	[[nodiscard]] static constexpr DraftKey Scheduled() {
@@ -120,40 +141,62 @@ class DraftKey {
 		return !value
 			? None()
 			: (value == kLocalDraftIndex + kEditDraftShiftOld)
-			? LocalEdit(0)
+			? LocalEdit(MsgId(), PeerId())
 			: (value == kScheduledDraftIndex + kEditDraftShiftOld)
 			? ScheduledEdit()
 			: (value > 0 && value < 0x4000'0000)
-			? Local(MsgId(value))
+			? Local(MsgId(value), PeerId())
 			: (value > kEditDraftShiftOld
 				&& value < kEditDraftShiftOld + 0x4000'000)
-			? LocalEdit(int64(value - kEditDraftShiftOld))
+			? LocalEdit(MsgId(int64(value - kEditDraftShiftOld)), PeerId())
 			: None();
 	}
 	[[nodiscard]] constexpr bool isLocal() const {
 		return (_value == kLocalDraftIndex)
-			|| (_value > 0 && _value < ServerMaxMsgId.bare);
+			|| (_value > 0
+				&& (_value & kMonoforumDraftMask) < ServerMaxMsgId.bare);
 	}
 	[[nodiscard]] constexpr bool isCloud() const {
 		return (_value == kCloudDraftIndex)
-			|| (_value > kCloudDraftShift
-				&& _value < kCloudDraftShift + ServerMaxMsgId.bare);
+			|| ((_value & kMonoforumDraftMask) > kCloudDraftShift
+				&& ((_value & kMonoforumDraftMask)
+					< kCloudDraftShift + ServerMaxMsgId.bare));
 	}
 
 	[[nodiscard]] constexpr MsgId topicRootId() const {
 		const auto max = ServerMaxMsgId.bare;
-		if (_value > kCloudDraftShift && _value < kCloudDraftShift + max) {
+		if (_value & kMonoforumDraftBit) {
+			return 0;
+		} else if ((_value > kCloudDraftShift)
+			&& (_value < kCloudDraftShift + max)) {
 			return (_value - kCloudDraftShift);
-		} else if (_value > kEditDraftShift && _value < kEditDraftShift + max) {
+		} else if ((_value > kEditDraftShift)
+			&& (_value < kEditDraftShift + max)) {
 			return (_value - kEditDraftShift);
 		} else if (_value > 0 && _value < max) {
 			return _value;
 		}
 		return 0;
 	}
-
+	[[nodiscard]] constexpr PeerId monoforumPeerId() const {
+		const auto max = ServerMaxMsgId.bare;
+		const auto value = _value & kMonoforumDraftMask;
+		if (!(_value & kMonoforumDraftBit)) {
+			return 0;
+		} else if ((value > kCloudDraftShift)
+			&& (value < kCloudDraftShift + max)) {
+			return PeerId(UserId(value - kCloudDraftShift));
+		} else if ((value > kEditDraftShift)
+			&& (value < kEditDraftShift + max)) {
+			return PeerId(UserId(value - kEditDraftShift));
+		} else if (value > 0 && value < max) {
+			return PeerId(UserId(value));
+		}
+		return 0;
+	}
 
 	friend inline constexpr auto operator<=>(DraftKey, DraftKey) = default;
+	friend inline constexpr bool operator==(DraftKey, DraftKey) = default;
 
 	inline explicit operator bool() const {
 		return _value != 0;
@@ -163,9 +206,20 @@ class DraftKey {
 	constexpr DraftKey(int64 value) : _value(value) {
 	}
 
+	[[nodiscard]] static constexpr bool Invalid(
+			MsgId topicRootId,
+			PeerId monoforumPeerId) {
+		return (topicRootId < 0)
+			|| (topicRootId >= ServerMaxMsgId)
+			|| !peerIsUser(monoforumPeerId)
+			|| (monoforumPeerId.value >= ServerMaxMsgId);
+	}
+
 	static constexpr auto kLocalDraftIndex = -1;
 	static constexpr auto kCloudDraftIndex = -2;
 	static constexpr auto kScheduledDraftIndex = -3;
+	static constexpr auto kMonoforumDraftBit = (int64(1) << 60);
+	static constexpr auto kMonoforumDraftMask = (kMonoforumDraftBit - 1);
 	static constexpr auto kEditDraftShift = ServerMaxMsgId.bare;
 	static constexpr auto kCloudDraftShift = 2 * ServerMaxMsgId.bare;
 	static constexpr auto kShortcutDraftShift = 3 * ServerMaxMsgId.bare;
@@ -189,6 +243,7 @@ using HistoryDrafts = base::flat_map<DraftKey, std::unique_ptr<Draft>>;
 [[nodiscard]] inline bool DraftIsNull(const Draft *draft) {
 	return !draft
 		|| (!draft->reply.messageId
+			&& !draft->suggest.exists
 			&& DraftStringIsEmpty(draft->textWithTags.text));
 }
 
@@ -202,6 +257,7 @@ using HistoryDrafts = base::flat_map<DraftKey, std::unique_ptr<Draft>>;
 	}
 	return (a->textWithTags == b->textWithTags)
 		&& (a->reply == b->reply)
+		&& (a->suggest == b->suggest)
 		&& (a->webpage == b->webpage);
 }
 
diff --git a/Telegram/SourceFiles/data/data_emoji_statuses.cpp b/Telegram/SourceFiles/data/data_emoji_statuses.cpp
index e00dd8910bc943..b6494d2f82365b 100644
--- a/Telegram/SourceFiles/data/data_emoji_statuses.cpp
+++ b/Telegram/SourceFiles/data/data_emoji_statuses.cpp
@@ -11,7 +11,9 @@ For license and copyright information please follow this link:
 #include "data/data_channel.h"
 #include "data/data_user.h"
 #include "data/data_session.h"
+#include "data/data_star_gift.h"
 #include "data/data_document.h"
+#include "data/data_wall_paper.h"
 #include "data/stickers/data_stickers.h"
 #include "base/unixtime.h"
 #include "base/timer_rpl.h"
@@ -26,20 +28,19 @@ constexpr auto kRefreshDefaultListEach = 60 * 60 * crl::time(1000);
 constexpr auto kRecentRequestTimeout = 10 * crl::time(1000);
 constexpr auto kMaxTimeout = 6 * 60 * 60 * crl::time(1000);
 
-[[nodiscard]] std::vector<DocumentId> ListFromMTP(
-		const MTPDaccount_emojiStatuses &data) {
-	const auto &list = data.vstatuses().v;
-	auto result = std::vector<DocumentId>();
-	result.reserve(list.size());
-	for (const auto &status : list) {
-		const auto parsed = ParseEmojiStatus(status);
-		if (!parsed.id) {
-			LOG(("API Error: emojiStatusEmpty in account.emojiStatuses."));
-		} else {
-			result.push_back(parsed.id);
-		}
-	}
-	return result;
+[[nodiscard]] EmojiStatusCollectible ParseEmojiStatusCollectible(
+		const MTPDemojiStatusCollectible &data) {
+	return EmojiStatusCollectible{
+		.id = data.vcollectible_id().v,
+		.documentId = data.vdocument_id().v,
+		.title = qs(data.vtitle()),
+		.slug = qs(data.vslug()),
+		.patternDocumentId = data.vpattern_document_id().v,
+		.centerColor = Ui::ColorFromSerialized(data.vcenter_color()),
+		.edgeColor = Ui::ColorFromSerialized(data.vedge_color()),
+		.patternColor = Ui::ColorFromSerialized(data.vpattern_color()),
+		.textColor = Ui::ColorFromSerialized(data.vtext_color()),
+	};
 }
 
 } // namespace
@@ -52,7 +53,7 @@ EmojiStatuses::EmojiStatuses(not_null<Session*> owner)
 
 	base::timer_each(
 		kRefreshDefaultListEach
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshDefault();
 		refreshChannelDefault();
 	}, _lifetime);
@@ -84,6 +85,10 @@ void EmojiStatuses::refreshChannelColored() {
 	requestChannelColored();
 }
 
+void EmojiStatuses::refreshCollectibles() {
+	requestCollectibles();
+}
+
 void EmojiStatuses::refreshRecentDelayed() {
 	if (_recentRequestId || _recentRequestScheduled) {
 		return;
@@ -96,17 +101,42 @@ void EmojiStatuses::refreshRecentDelayed() {
 	});
 }
 
-const std::vector<DocumentId> &EmojiStatuses::list(Type type) const {
+const std::vector<EmojiStatusId> &EmojiStatuses::list(Type type) const {
 	switch (type) {
 	case Type::Recent: return _recent;
 	case Type::Default: return _default;
 	case Type::Colored: return _colored;
 	case Type::ChannelDefault: return _channelDefault;
 	case Type::ChannelColored: return _channelColored;
+	case Type::Collectibles: return _collectibles;
 	}
 	Unexpected("Type in EmojiStatuses::list.");
 }
 
+EmojiStatusData EmojiStatuses::parse(const MTPEmojiStatus &status) {
+	return status.match([](const MTPDemojiStatus &data) {
+		return EmojiStatusData{
+			.id = { .documentId = data.vdocument_id().v },
+			.until = data.vuntil().value_or_empty(),
+		};
+	}, [&](const MTPDemojiStatusCollectible &data) {
+		const auto collectibleId = data.vcollectible_id().v;
+		auto &collectible = _collectibleData[collectibleId];
+		if (!collectible) {
+			collectible = std::make_shared<EmojiStatusCollectible>(
+				ParseEmojiStatusCollectible(data));
+		}
+		return EmojiStatusData{
+			.id = { .collectible = collectible },
+			.until = data.vuntil().value_or_empty(),
+		};
+	}, [](const MTPDinputEmojiStatusCollectible &) {
+		return EmojiStatusData();
+	}, [](const MTPDemojiStatusEmpty &) {
+		return EmojiStatusData();
+	});
+}
+
 rpl::producer<> EmojiStatuses::recentUpdates() const {
 	return _recentUpdated.events();
 }
@@ -119,6 +149,10 @@ rpl::producer<> EmojiStatuses::channelDefaultUpdates() const {
 	return _channelDefaultUpdated.events();
 }
 
+rpl::producer<> EmojiStatuses::collectiblesUpdates() const {
+	return _collectiblesUpdated.events();
+}
+
 void EmojiStatuses::registerAutomaticClear(
 		not_null<PeerData*> peer,
 		TimeId until) {
@@ -253,7 +287,7 @@ void EmojiStatuses::processClearing() {
 			}
 			++i;
 		} else {
-			i->first->setEmojiStatus(0, 0);
+			i->first->setEmojiStatus(EmojiStatusId());
 			i = clearing.erase(i);
 		}
 	}
@@ -271,6 +305,22 @@ void EmojiStatuses::processClearing() {
 	}
 }
 
+std::vector<EmojiStatusId> EmojiStatuses::parse(
+		const MTPDaccount_emojiStatuses &data) {
+	const auto &list = data.vstatuses().v;
+	auto result = std::vector<EmojiStatusId>();
+	result.reserve(list.size());
+	for (const auto &status : list) {
+		const auto parsed = parse(status);
+		if (!parsed.id) {
+			LOG(("API Error: empty status in account.emojiStatuses."));
+		} else {
+			result.push_back(parsed.id);
+		}
+	}
+	return result;
+}
+
 void EmojiStatuses::processClearingIn(TimeId wait) {
 	const auto waitms = wait * crl::time(1000);
 	_clearingTimer.callOnce(std::min(waitms, kMaxTimeout));
@@ -327,6 +377,7 @@ void EmojiStatuses::requestColored() {
 		_coloredRequestId = 0;
 		result.match([&](const MTPDmessages_stickerSet &data) {
 			updateColored(data);
+			refreshCollectibles();
 		}, [](const MTPDmessages_stickerSetNotModified &) {
 			LOG(("API Error: Unexpected messages.stickerSetNotModified."));
 		});
@@ -374,15 +425,34 @@ void EmojiStatuses::requestChannelColored() {
 	}).send();
 }
 
+void EmojiStatuses::requestCollectibles() {
+	if (_collectiblesRequestId) {
+		return;
+	}
+	auto &api = _owner->session().api();
+	_collectiblesRequestId = api.request(
+		MTPaccount_GetCollectibleEmojiStatuses(MTP_long(_collectiblesHash))
+	).done([=](const MTPaccount_EmojiStatuses &result) {
+		_collectiblesRequestId = 0;
+		result.match([&](const MTPDaccount_emojiStatuses &data) {
+			updateCollectibles(data);
+		}, [&](const MTPDaccount_emojiStatusesNotModified &) {
+		});
+	}).fail([=] {
+		_collectiblesRequestId = 0;
+		_collectiblesHash = 0;
+	}).send();
+}
+
 void EmojiStatuses::updateRecent(const MTPDaccount_emojiStatuses &data) {
 	_recentHash = data.vhash().v;
-	_recent = ListFromMTP(data);
+	_recent = parse(data);
 	_recentUpdated.fire({});
 }
 
 void EmojiStatuses::updateDefault(const MTPDaccount_emojiStatuses &data) {
 	_defaultHash = data.vhash().v;
-	_default = ListFromMTP(data);
+	_default = parse(data);
 	_defaultUpdated.fire({});
 }
 
@@ -391,7 +461,9 @@ void EmojiStatuses::updateColored(const MTPDmessages_stickerSet &data) {
 	_colored.clear();
 	_colored.reserve(list.size());
 	for (const auto &sticker : data.vdocuments().v) {
-		_colored.push_back(_owner->processDocument(sticker)->id);
+		_colored.push_back({
+			.documentId = _owner->processDocument(sticker)->id,
+		});
 	}
 	_coloredUpdated.fire({});
 }
@@ -399,7 +471,7 @@ void EmojiStatuses::updateColored(const MTPDmessages_stickerSet &data) {
 void EmojiStatuses::updateChannelDefault(
 		const MTPDaccount_emojiStatuses &data) {
 	_channelDefaultHash = data.vhash().v;
-	_channelDefault = ListFromMTP(data);
+	_channelDefault = parse(data);
 	_channelDefaultUpdated.fire({});
 }
 
@@ -409,18 +481,27 @@ void EmojiStatuses::updateChannelColored(
 	_channelColored.clear();
 	_channelColored.reserve(list.size());
 	for (const auto &sticker : data.vdocuments().v) {
-		_channelColored.push_back(_owner->processDocument(sticker)->id);
+		_channelColored.push_back({
+			.documentId = _owner->processDocument(sticker)->id,
+		});
 	}
 	_channelColoredUpdated.fire({});
 }
 
-void EmojiStatuses::set(DocumentId id, TimeId until) {
+void EmojiStatuses::updateCollectibles(
+	const MTPDaccount_emojiStatuses &data) {
+	_collectiblesHash = data.vhash().v;
+	_collectibles = parse(data);
+	_collectiblesUpdated.fire({});
+}
+
+void EmojiStatuses::set(EmojiStatusId id, TimeId until) {
 	set(_owner->session().user(), id, until);
 }
 
 void EmojiStatuses::set(
 		not_null<PeerData*> peer,
-		DocumentId id,
+		EmojiStatusId id,
 		TimeId until) {
 	auto &api = _owner->session().api();
 	auto &requestId = _sentRequests[peer];
@@ -437,26 +518,50 @@ void EmojiStatuses::set(
 			_sentRequests.remove(peer);
 		}).send();
 	};
+	using EFlag = MTPDemojiStatus::Flag;
+	using CFlag = MTPDinputEmojiStatusCollectible::Flag;
 	const auto status = !id
 		? MTP_emojiStatusEmpty()
-		: !until
-		? MTP_emojiStatus(MTP_long(id))
-		: MTP_emojiStatusUntil(MTP_long(id), MTP_int(until));
+		: id.collectible
+		? MTP_inputEmojiStatusCollectible(
+			MTP_flags(until ? CFlag::f_until : CFlag()),
+			MTP_long(id.collectible->id),
+			MTP_int(until))
+		: MTP_emojiStatus(
+			MTP_flags(until ? EFlag::f_until : EFlag()),
+			MTP_long(id.documentId),
+			MTP_int(until));
 	if (peer->isSelf()) {
 		send(MTPaccount_UpdateEmojiStatus(status));
 	} else if (const auto channel = peer->asChannel()) {
-		send(MTPchannels_UpdateEmojiStatus(channel->inputChannel, status));
+		send(MTPchannels_UpdateEmojiStatus(channel->inputChannel(), status));
 	}
 }
 
-EmojiStatusData ParseEmojiStatus(const MTPEmojiStatus &status) {
-	return status.match([](const MTPDemojiStatus &data) {
-		return EmojiStatusData{ data.vdocument_id().v };
-	}, [](const MTPDemojiStatusUntil &data) {
-		return EmojiStatusData{ data.vdocument_id().v, data.vuntil().v };
-	}, [](const MTPDemojiStatusEmpty &) {
-		return EmojiStatusData();
-	});
+EmojiStatusId EmojiStatuses::fromUniqueGift(
+		const Data::UniqueGift &gift) {
+	const auto collectibleId = gift.id;
+	auto &collectible = _collectibleData[collectibleId];
+	if (!collectible) {
+		collectible = std::make_shared<EmojiStatusCollectible>(
+			EmojiStatusCollectible{
+				.id = gift.id,
+				.documentId = gift.model.document->id,
+				.title = Data::UniqueGiftName(gift),
+				.slug = gift.slug,
+				.patternDocumentId = gift.pattern.document->id,
+				.centerColor = gift.backdrop.centerColor,
+				.edgeColor = gift.backdrop.edgeColor,
+				.patternColor = gift.backdrop.patternColor,
+				.textColor = gift.backdrop.textColor,
+			});
+	}
+	return { .collectible = collectible };
+}
+
+EmojiStatusCollectible *EmojiStatuses::collectibleInfo(CollectibleId id) {
+	const auto i = _collectibleData.find(id);
+	return (i != end(_collectibleData)) ? i->second.get() : nullptr;
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_emoji_statuses.h b/Telegram/SourceFiles/data/data_emoji_statuses.h
index 0a0b75ba222735..f7809b58695e35 100644
--- a/Telegram/SourceFiles/data/data_emoji_statuses.h
+++ b/Telegram/SourceFiles/data/data_emoji_statuses.h
@@ -21,6 +21,27 @@ namespace Data {
 
 class DocumentMedia;
 class Session;
+struct UniqueGift;
+
+struct EmojiStatusCollectible {
+	CollectibleId id = 0;
+	DocumentId documentId = 0;
+	QString title;
+	QString slug;
+	DocumentId patternDocumentId = 0;
+	QColor centerColor;
+	QColor edgeColor;
+	QColor patternColor;
+	QColor textColor;
+
+	explicit operator bool() const {
+		return id != 0;
+	}
+};
+struct EmojiStatusData {
+	EmojiStatusId id;
+	TimeId until = 0;
+};
 
 class EmojiStatuses final {
 public:
@@ -38,6 +59,7 @@ class EmojiStatuses final {
 	void refreshColored();
 	void refreshChannelDefault();
 	void refreshChannelColored();
+	void refreshCollectibles();
 
 	enum class Type {
 		Recent,
@@ -45,15 +67,21 @@ class EmojiStatuses final {
 		Colored,
 		ChannelDefault,
 		ChannelColored,
+		Collectibles,
 	};
-	[[nodiscard]] const std::vector<DocumentId> &list(Type type) const;
+	[[nodiscard]] const std::vector<EmojiStatusId> &list(Type type) const;
+
+	[[nodiscard]] EmojiStatusData parse(const MTPEmojiStatus &status);
 
 	[[nodiscard]] rpl::producer<> recentUpdates() const;
 	[[nodiscard]] rpl::producer<> defaultUpdates() const;
 	[[nodiscard]] rpl::producer<> channelDefaultUpdates() const;
+	[[nodiscard]] rpl::producer<> collectiblesUpdates() const;
 
-	void set(DocumentId id, TimeId until = 0);
-	void set(not_null<PeerData*> peer, DocumentId id, TimeId until = 0);
+	void set(EmojiStatusId id, TimeId until = 0);
+	void set(not_null<PeerData*> peer, EmojiStatusId id, TimeId until = 0);
+	[[nodiscard]] EmojiStatusId fromUniqueGift(const Data::UniqueGift &gift);
+	[[nodiscard]] EmojiStatusCollectible *collectibleInfo(CollectibleId id);
 
 	void registerAutomaticClear(not_null<PeerData*> peer, TimeId until);
 
@@ -79,31 +107,42 @@ class EmojiStatuses final {
 	void requestColored();
 	void requestChannelDefault();
 	void requestChannelColored();
+	void requestCollectibles();
 
 	void updateRecent(const MTPDaccount_emojiStatuses &data);
 	void updateDefault(const MTPDaccount_emojiStatuses &data);
 	void updateColored(const MTPDmessages_stickerSet &data);
 	void updateChannelDefault(const MTPDaccount_emojiStatuses &data);
 	void updateChannelColored(const MTPDmessages_stickerSet &data);
+	void updateCollectibles(const MTPDaccount_emojiStatuses &data);
 
 	void processClearingIn(TimeId wait);
 	void processClearing();
 
+	[[nodiscard]] std::vector<EmojiStatusId> parse(
+		const MTPDaccount_emojiStatuses &data);
+
 	template <typename Request>
 	void requestGroups(not_null<GroupsType*> type, Request &&request);
 
 	const not_null<Session*> _owner;
 
-	std::vector<DocumentId> _recent;
-	std::vector<DocumentId> _default;
-	std::vector<DocumentId> _colored;
-	std::vector<DocumentId> _channelDefault;
-	std::vector<DocumentId> _channelColored;
+	std::vector<EmojiStatusId> _recent;
+	std::vector<EmojiStatusId> _default;
+	std::vector<EmojiStatusId> _colored;
+	std::vector<EmojiStatusId> _channelDefault;
+	std::vector<EmojiStatusId> _channelColored;
+	std::vector<EmojiStatusId> _collectibles;
 	rpl::event_stream<> _recentUpdated;
 	rpl::event_stream<> _defaultUpdated;
 	rpl::event_stream<> _coloredUpdated;
 	rpl::event_stream<> _channelDefaultUpdated;
 	rpl::event_stream<> _channelColoredUpdated;
+	rpl::event_stream<> _collectiblesUpdated;
+
+	base::flat_map<
+		CollectibleId,
+		std::shared_ptr<EmojiStatusCollectible>> _collectibleData;
 
 	mtpRequestId _recentRequestId = 0;
 	bool _recentRequestScheduled = false;
@@ -119,6 +158,9 @@ class EmojiStatuses final {
 
 	mtpRequestId _channelColoredRequestId = 0;
 
+	mtpRequestId _collectiblesRequestId = 0;
+	uint64 _collectiblesHash = 0;
+
 	base::flat_map<not_null<PeerData*>, mtpRequestId> _sentRequests;
 
 	base::flat_map<not_null<PeerData*>, TimeId> _clearing;
@@ -133,10 +175,4 @@ class EmojiStatuses final {
 
 };
 
-struct EmojiStatusData {
-	DocumentId id = 0;
-	TimeId until = 0;
-};
-[[nodiscard]] EmojiStatusData ParseEmojiStatus(const MTPEmojiStatus &status);
-
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_file_click_handler.cpp b/Telegram/SourceFiles/data/data_file_click_handler.cpp
index e42397d197e112..7f0a593b4f36df 100644
--- a/Telegram/SourceFiles/data/data_file_click_handler.cpp
+++ b/Telegram/SourceFiles/data/data_file_click_handler.cpp
@@ -96,8 +96,7 @@ void DocumentSaveClickHandler::Save(
 			return;
 		}
 		const auto filepath = data->filepath(true);
-		const auto fileinfo = QFileInfo(
-			);
+		const auto fileinfo = QFileInfo(filepath);
 		const auto filedir = filepath.isEmpty()
 			? QDir()
 			: fileinfo.dir();
diff --git a/Telegram/SourceFiles/data/data_file_origin.cpp b/Telegram/SourceFiles/data/data_file_origin.cpp
index 76838edc37a2d7..4a3c759f6386ed 100644
--- a/Telegram/SourceFiles/data/data_file_origin.cpp
+++ b/Telegram/SourceFiles/data/data_file_origin.cpp
@@ -43,6 +43,11 @@ struct FileReferenceAccumulator {
 		push(data.data().vphotos());
 		push(data.data().vdocuments());
 	}
+	void push(const MTPRichMessage &data) {
+		const auto &fields = data.data();
+		push(fields.vphotos());
+		push(fields.vdocuments());
+	}
 	void push(const MTPWallPaper &data) {
 		data.match([&](const MTPDwallPaper &data) {
 			push(data.vdocument());
@@ -59,6 +64,29 @@ struct FileReferenceAccumulator {
 			push(data.vdocuments());
 		}, [&](const MTPDwebPageAttributeStickerSet &data) {
 			push(data.vstickers());
+		}, [&](const MTPDwebPageAttributeUniqueStarGift &data) {
+			push(data.vgift());
+		}, [&](const MTPDwebPageAttributeStarGiftCollection &data) {
+			push(data.vicons());
+		}, [&](const MTPDwebPageAttributeStarGiftAuction &data) {
+			push(data.vgift());
+		}, [](const MTPDwebPageAttributeAiComposeTone &) {
+		});
+	}
+	void push(const MTPStarGift &data) {
+		data.match([&](const MTPDstarGift &data) {
+			push(data.vsticker());
+		}, [&](const MTPDstarGiftUnique &data) {
+			push(data.vattributes());
+		});
+	}
+	void push(const MTPStarGiftAttribute &data) {
+		data.match([&](const MTPDstarGiftAttributeModel &data) {
+			push(data.vdocument());
+		}, [&](const MTPDstarGiftAttributePattern &data) {
+			push(data.vdocument());
+		}, [&](const MTPDstarGiftAttributeBackdrop &data) {
+		}, [&](const MTPDstarGiftAttributeOriginalDetails &data) {
 		});
 	}
 	void push(const MTPWebPage &data) {
@@ -87,6 +115,8 @@ struct FileReferenceAccumulator {
 			push(data.vphoto());
 		}, [&](const MTPDmessageMediaDocument &data) {
 			push(data.vdocument());
+			push(data.vvideo_cover());
+			push(data.valt_documents());
 		}, [&](const MTPDmessageMediaWebPage &data) {
 			push(data.vwebpage());
 		}, [&](const MTPDmessageMediaGame &data) {
@@ -95,6 +125,15 @@ struct FileReferenceAccumulator {
 			push(data.vextended_media());
 		}, [&](const MTPDmessageMediaPaidMedia &data) {
 			push(data.vextended_media());
+		}, [&](const MTPDmessageMediaPoll &data) {
+			push(data.vattached_media());
+			for (const auto &answer : data.vpoll().data().vanswers().v) {
+				answer.match([&](const MTPDpollAnswer &a) {
+					push(a.vmedia());
+				}, [](const auto &) {
+				});
+			}
+			push(data.vresults().data().vsolution_media());
 		}, [](const auto &data) {
 		});
 	}
@@ -108,6 +147,7 @@ struct FileReferenceAccumulator {
 		data.match([&](const MTPDmessage &data) {
 			push(data.vmedia());
 			push(data.vreply_to());
+			push(data.vrich_message());
 		}, [&](const MTPDmessageService &data) {
 			data.vaction().match(
 			[&](const MTPDmessageActionChatEditPhoto &data) {
@@ -141,7 +181,20 @@ struct FileReferenceAccumulator {
 		});
 	}
 	void push(const MTPusers_UserFull &data) {
-		push(data.data().vfull_user().data().vpersonal_photo());
+		const auto &full = data.data().vfull_user().data();
+		push(full.vpersonal_photo());
+		push(full.vfallback_photo());
+		push(full.vprofile_photo());
+	}
+	void push(const MTPChatFull &data) {
+		data.match([&](const MTPDchatFull &data) {
+			push(data.vchat_photo());
+		}, [&](const MTPDchannelFull &data) {
+			push(data.vchat_photo());
+		});
+	}
+	void push(const MTPmessages_ChatFull &data) {
+		push(data.data().vfull_chat());
 	}
 	void push(const MTPmessages_RecentStickers &data) {
 		data.match([&](const MTPDmessages_recentStickers &data) {
@@ -182,6 +235,12 @@ struct FileReferenceAccumulator {
 	void push(const MTPstories_Stories &data) {
 		push(data.data().vstories());
 	}
+	void push(const MTPusers_SavedMusic &data) {
+		data.match([&](const MTPDusers_savedMusic &data) {
+			push(data.vdocuments());
+		}, [](const MTPDusers_savedMusicNotModified &data) {
+		});
+	}
 
 	UpdatedFileReferences result;
 };
@@ -207,6 +266,10 @@ UpdatedFileReferences GetFileReferences(const MTPusers_UserFull &data) {
 	return GetFileReferencesHelper(data);
 }
 
+UpdatedFileReferences GetFileReferences(const MTPmessages_ChatFull &data) {
+	return GetFileReferencesHelper(data);
+}
+
 UpdatedFileReferences GetFileReferences(
 		const MTPmessages_RecentStickers &data) {
 	return GetFileReferencesHelper(data);
@@ -251,6 +314,10 @@ UpdatedFileReferences GetFileReferences(const MTPstories_Stories &data) {
 	return GetFileReferencesHelper(data);
 }
 
+UpdatedFileReferences GetFileReferences(const MTPusers_SavedMusic &data) {
+	return GetFileReferencesHelper(data);
+}
+
 UpdatedFileReferences GetFileReferences(const MTPMessageMedia &data) {
 	return GetFileReferencesHelper(data);
 }
diff --git a/Telegram/SourceFiles/data/data_file_origin.h b/Telegram/SourceFiles/data/data_file_origin.h
index 33e6a3f0d72bdd..47ce47a990e48e 100644
--- a/Telegram/SourceFiles/data/data_file_origin.h
+++ b/Telegram/SourceFiles/data/data_file_origin.h
@@ -208,6 +208,7 @@ struct UpdatedFileReferences {
 UpdatedFileReferences GetFileReferences(const MTPmessages_Messages &data);
 UpdatedFileReferences GetFileReferences(const MTPphotos_Photos &data);
 UpdatedFileReferences GetFileReferences(const MTPusers_UserFull &data);
+UpdatedFileReferences GetFileReferences(const MTPmessages_ChatFull &data);
 UpdatedFileReferences GetFileReferences(
 	const MTPmessages_RecentStickers &data);
 UpdatedFileReferences GetFileReferences(
@@ -221,6 +222,7 @@ UpdatedFileReferences GetFileReferences(
 UpdatedFileReferences GetFileReferences(const MTPhelp_PremiumPromo &data);
 UpdatedFileReferences GetFileReferences(const MTPmessages_WebPage &data);
 UpdatedFileReferences GetFileReferences(const MTPstories_Stories &data);
+UpdatedFileReferences GetFileReferences(const MTPusers_SavedMusic &data);
 
 // Admin Log Event.
 UpdatedFileReferences GetFileReferences(const MTPMessageMedia &data);
diff --git a/Telegram/SourceFiles/data/data_folder.cpp b/Telegram/SourceFiles/data/data_folder.cpp
index e6599a5eea68b9..46897b690847d9 100644
--- a/Telegram/SourceFiles/data/data_folder.cpp
+++ b/Telegram/SourceFiles/data/data_folder.cpp
@@ -93,7 +93,7 @@ constexpr auto kShowChatNamesCount = 8;
 				result,
 				lt_chat,
 				wrapName(*i),
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 		return result;
 	}();
@@ -104,7 +104,7 @@ constexpr auto kShowChatNamesCount = 8;
 			(count - shown),
 			lt_chats,
 			accumulated,
-			Ui::Text::WithEntities)
+			tr::marked)
 		: accumulated;
 }
 
@@ -124,7 +124,7 @@ Folder::Folder(not_null<Session*> owner, FolderId id)
 		PeerUpdate::Flag::Name
 	) | rpl::filter([=](const PeerUpdate &update) {
 		return ranges::contains(_lastHistories, update.peer, &History::peer);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		++_chatListViewVersion;
 		updateChatListEntryPostponed();
 	}, _lifetime);
@@ -134,13 +134,13 @@ Folder::Folder(not_null<Session*> owner, FolderId id)
 	_chatsList.unreadStateChanges(
 	) | rpl::filter([=] {
 		return inChatList();
-	}) | rpl::start_with_next([=](const Dialogs::UnreadState &old) {
+	}) | rpl::on_next([=](const Dialogs::UnreadState &old) {
 		++_chatListViewVersion;
 		notifyUnreadStateChange(old);
 	}, _lifetime);
 
 	_chatsList.fullSize().changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateChatListEntryPostponed();
 	}, _lifetime);
 }
@@ -387,7 +387,11 @@ Dialogs::BadgesState Folder::chatListBadgesState() const {
 		chatListUnreadState(),
 		Dialogs::CountInBadge::Chats,
 		Dialogs::IncludeInBadge::All);
-	result.unreadMuted = result.mentionMuted = result.reactionMuted = true;
+	result.unreadMuted
+		= result.mentionMuted
+		= result.reactionMuted
+		= result.pollMuted
+		= true;
 	if (result.unread && !result.unreadCounter) {
 		result.unreadCounter = 1;
 	}
diff --git a/Telegram/SourceFiles/data/data_forum.cpp b/Telegram/SourceFiles/data/data_forum.cpp
index 361135d8855cca..0459fe5962e521 100644
--- a/Telegram/SourceFiles/data/data_forum.cpp
+++ b/Telegram/SourceFiles/data/data_forum.cpp
@@ -7,12 +7,15 @@ For license and copyright information please follow this link:
 */
 #include "data/data_forum.h"
 
+#include "data/components/recent_peers.h"
 #include "data/data_channel.h"
 #include "data/data_histories.h"
 #include "data/data_changes.h"
 #include "data/data_session.h"
 #include "data/data_forum_icons.h"
 #include "data/data_forum_topic.h"
+#include "data/data_replies_list.h"
+#include "data/data_user.h"
 #include "data/notify/data_notify_settings.h"
 #include "history/history.h"
 #include "history/history_item.h"
@@ -46,15 +49,26 @@ constexpr auto kShowTopicNamesCount = 8;
 Forum::Forum(not_null<History*> history)
 : _history(history)
 , _topicsList(&session(), {}, owner().maxPinnedChatsLimitValue(this)) {
-	Expects(_history->peer->isChannel());
-
+	Expects(_history->peer->isChannel()
+		|| _history->peer->isBot());
 
 	if (_history->inChatList()) {
 		preloadTopics();
 	}
-	if (channel()->canCreateTopics()) {
+	if (peer()->canCreateTopics()) {
 		owner().forumIcons().requestDefaultIfUnknown();
 	}
+	_topicsList.fullSize().value(
+	) | rpl::map([](int size) {
+		return size > 0;
+	}) | rpl::distinct_until_changed(
+	) | rpl::skip(
+		1
+	) | rpl::on_next([=] {
+		if (IsBotCreatesTopics(_history->peer)) {
+			_history->updateChatListEntryHeight();
+		}
+	}, _lifetime);
 }
 
 Forum::~Forum() {
@@ -73,8 +87,11 @@ Forum::~Forum() {
 	auto &changes = session().changes();
 	const auto peerId = _history->peer->id;
 	for (const auto &[rootId, topic] : _topics) {
-		storage.unload(Storage::SharedMediaUnloadThread(peerId, rootId));
-		_history->setForwardDraft(rootId, {});
+		storage.unload(Storage::SharedMediaUnloadThread(
+			peerId,
+			rootId,
+			PeerId()));
+		_history->setForwardDraft(rootId, PeerId(), {});
 
 		const auto raw = topic.get();
 		changes.topicRemoved(raw);
@@ -94,7 +111,15 @@ not_null<History*> Forum::history() const {
 	return _history;
 }
 
-not_null<ChannelData*> Forum::channel() const {
+not_null<PeerData*> Forum::peer() const {
+	return _history->peer;
+}
+
+UserData *Forum::bot() const {
+	return _history->peer->asBot();
+}
+
+ChannelData *Forum::channel() const {
 	return _history->peer->asChannel();
 }
 
@@ -103,6 +128,14 @@ not_null<Dialogs::MainList*> Forum::topicsList() {
 }
 
 rpl::producer<> Forum::destroyed() const {
+	if (const auto bot = this->bot()) {
+		return bot->flagsValue(
+		) | rpl::filter([=](const UserData::Flags::Change &update) {
+			using Flag = UserData::Flag;
+			return (update.diff & Flag::Forum)
+				&& !(update.value & Flag::Forum);
+		}) | rpl::take(1) | rpl::to_empty;
+	}
 	return channel()->flagsValue(
 	) | rpl::filter([=](const ChannelData::Flags::Change &update) {
 		using Flag = ChannelData::Flag;
@@ -138,9 +171,9 @@ void Forum::requestTopics() {
 	}
 	const auto firstLoad = !_offset.date;
 	const auto loadCount = firstLoad ? kTopicsFirstLoad : kTopicsPerPage;
-	_requestId = session().api().request(MTPchannels_GetForumTopics(
+	_requestId = session().api().request(MTPmessages_GetForumTopics(
 		MTP_flags(0),
-		channel()->inputChannel,
+		peer()->input(),
 		MTPstring(), // q
 		MTP_int(_offset.date),
 		MTP_int(_offset.id),
@@ -165,7 +198,7 @@ void Forum::requestTopics() {
 	}).fail([=](const MTP::Error &error) {
 		_requestId = 0;
 		_topicsList.setLoaded();
-		if (error.type() == u"CHANNEL_FORUM_MISSING"_q) {
+		if (error.type() == u"CHANNEL_FORUM_MISSING"_q && channel()) {
 			const auto flags = channel()->flags() & ~ChannelDataFlag::Forum;
 			channel()->setFlags(flags);
 		}
@@ -176,34 +209,40 @@ void Forum::applyTopicDeleted(MsgId rootId) {
 	_topicsDeleted.emplace(rootId);
 
 	const auto i = _topics.find(rootId);
-	if (i != end(_topics)) {
-		const auto raw = i->second.get();
-		Core::App().notifications().clearFromTopic(raw);
-		owner().removeChatListEntry(raw);
-
-		if (ranges::contains(_lastTopics, not_null(raw))) {
-			reorderLastTopics();
-		}
+	if (i == end(_topics)) {
+		return;
+	}
+	const auto raw = i->second.get();
+	Core::App().notifications().clearFromTopic(raw);
+	owner().removeChatListEntry(raw);
 
-		_topicDestroyed.fire(raw);
-		session().changes().topicUpdated(
-			raw,
-			Data::TopicUpdate::Flag::Destroyed);
-		session().changes().entryUpdated(
-			raw,
-			Data::EntryUpdate::Flag::Destroyed);
-		_topics.erase(i);
+	if (ranges::contains(_lastTopics, not_null(raw))) {
+		reorderLastTopics();
+	}
 
-		_history->destroyMessagesByTopic(rootId);
-		session().storage().unload(Storage::SharedMediaUnloadThread(
-			_history->peer->id,
-			rootId));
-		_history->setForwardDraft(rootId, {});
+	if (_activeSubsectionTopic == raw) {
+		_activeSubsectionTopic = nullptr;
 	}
+	_topicDestroyed.fire(raw);
+	_history->session().recentPeers().chatOpenRemove(raw);
+	session().changes().topicUpdated(
+		raw,
+		Data::TopicUpdate::Flag::Destroyed);
+	session().changes().entryUpdated(
+		raw,
+		Data::EntryUpdate::Flag::Destroyed);
+	_topics.erase(i);
+
+	_history->destroyMessagesByTopic(rootId);
+	session().storage().unload(Storage::SharedMediaUnloadThread(
+		_history->peer->id,
+		rootId,
+		PeerId()));
+	_history->setForwardDraft(rootId, PeerId(), {});
 }
 
 void Forum::reorderLastTopics() {
-	// We want first kShowChatNamesCount histories, by last message date.
+	// We want first kShowTopicNamesCount histories, by last message date.
 	const auto pred = [](not_null<ForumTopic*> a, not_null<ForumTopic*> b) {
 		const auto aItem = a->chatListMessage();
 		const auto bItem = b->chatListMessage();
@@ -255,6 +294,47 @@ const std::vector<not_null<ForumTopic*>> &Forum::recentTopics() const {
 	return _lastTopics;
 }
 
+void Forum::saveActiveSubsectionThread(not_null<Thread*> thread) {
+	if (const auto topic = thread->asTopic()) {
+		Assert(topic->forum() == this);
+		_activeSubsectionTopic = topic->creating() ? nullptr : topic;
+	} else {
+		Assert(thread == history());
+		_activeSubsectionTopic = nullptr;
+	}
+}
+
+Thread *Forum::activeSubsectionThread() const {
+	return _activeSubsectionTopic;
+}
+
+void Forum::markUnreadCountsUnknown(MsgId readTillId) {
+	if (!peer()->useSubsectionTabs()) {
+		return;
+	}
+	for (const auto &[rootId, topic] : _topics) {
+		const auto replies = topic->replies();
+		if (replies->unreadCountCurrent() > 0) {
+			replies->setInboxReadTill(readTillId, std::nullopt);
+		}
+	}
+}
+
+void Forum::updateUnreadCounts(
+		MsgId readTillId,
+		const base::flat_map<not_null<ForumTopic*>, int> &counts) {
+	if (!peer()->useSubsectionTabs()) {
+		return;
+	}
+	for (const auto &[rootId, topic] : _topics) {
+		const auto raw = topic.get();
+		const auto replies = raw->replies();
+		const auto i = counts.find(raw);
+		const auto count = (i != end(counts)) ? i->second : 0;
+		replies->setInboxReadTill(readTillId, count);
+	}
+}
+
 void Forum::listMessageChanged(HistoryItem *from, HistoryItem *to) {
 	if (from || to) {
 		reorderLastTopics();
@@ -280,7 +360,9 @@ void Forum::applyReceivedTopics(
 	owner().processUsers(data.vusers());
 	owner().processChats(data.vchats());
 	owner().processMessages(data.vmessages(), NewMessageType::Existing);
-	channel()->ptsReceived(data.vpts().v);
+	if (const auto channel = this->channel()) {
+		channel->ptsReceived(data.vpts().v);
+	}
 	applyReceivedTopics(data.vtopics(), std::move(callback));
 	if (!_staleRootIds.empty()) {
 		requestSomeStale();
@@ -295,10 +377,7 @@ void Forum::applyReceivedTopics(
 		const auto rootId = topic.match([&](const auto &data) {
 			return data.vid().v;
 		});
-		_staleRootIds.remove(rootId);
-		topic.match([&](const MTPDforumTopicDeleted &data) {
-			applyTopicDeleted(rootId);
-		}, [&](const MTPDforumTopic &data) {
+		const auto apply = [&](const MTPDforumTopic *fields = nullptr) {
 			_topicsDeleted.remove(rootId);
 			const auto i = _topics.find(rootId);
 			const auto creating = (i == end(_topics));
@@ -308,7 +387,9 @@ void Forum::applyReceivedTopics(
 					std::make_unique<ForumTopic>(this, rootId)
 				).first->second.get()
 				: i->second.get();
-			raw->applyTopic(data);
+			if (fields) {
+				raw->applyTopic(*fields);
+			}
 			if (creating) {
 				if (const auto last = _history->chatListMessage()
 					; last && last->topicRootId() == rootId) {
@@ -319,6 +400,19 @@ void Forum::applyReceivedTopics(
 			if (callback) {
 				callback(raw);
 			}
+		};
+
+		_staleRootIds.remove(rootId);
+		topic.match([&](const MTPDforumTopicDeleted &data) {
+			if (rootId != ForumTopic::kGeneralId) {
+				applyTopicDeleted(rootId);
+			} else {
+				// We shouldn't delete general topic in any case.
+				// Here this happens in bot forums, for example.
+				apply();
+			}
+		}, [&](const MTPDforumTopic &data) {
+			apply(&data);
 		});
 	}
 }
@@ -353,8 +447,8 @@ void Forum::requestSomeStale() {
 	_staleRequestId = histories.sendRequest(_history, type, [=](
 			Fn<void()> finish) {
 		return session().api().request(
-			MTPchannels_GetForumTopicsByID(
-				channel()->inputChannel,
+			MTPmessages_GetForumTopicsByID(
+				peer()->input(),
 				MTP_vector<MTPint>(rootIds))
 		).done([=](const MTPmessages_ForumTopics &result) {
 			_staleRequestId = 0;
@@ -388,7 +482,7 @@ void Forum::requestTopic(MsgId rootId, Fn<void()> done) {
 	if (!request.id
 		&& _staleRootIds.emplace(rootId).second
 		&& (_staleRootIds.size() == 1)) {
-		crl::on_main(&session(), [peer = channel()] {
+		crl::on_main(&session(), [peer = peer()] {
 			if (const auto forum = peer->forum()) {
 				forum->requestSomeStale();
 			}
@@ -444,6 +538,15 @@ MsgId Forum::reserveCreatingId(
 	return result;
 }
 
+ForumTopic *Forum::reserveNewBotTopic() {
+	const auto &colors = ForumTopicColorIds();
+	const auto colorId = colors[base::RandomIndex(colors.size())];
+	return topicFor(reserveCreatingId(
+		tr::lng_bot_new_chat(tr::now),
+		colorId,
+		DocumentId()));
+}
+
 void Forum::discardCreatingId(MsgId rootId) {
 	Expects(creating(rootId));
 
@@ -492,6 +595,12 @@ void Forum::clearAllUnreadReactions() {
 	}
 }
 
+void Forum::clearAllUnreadPollVotes() {
+	for (const auto &[rootId, topic] : _topics) {
+		topic->unreadPollVotes().clear();
+	}
+}
+
 void Forum::enumerateTopics(Fn<void(not_null<ForumTopic*>)> action) const {
 	for (const auto &[rootId, topic] : _topics) {
 		action(topic.get());
@@ -518,7 +627,8 @@ ForumTopic *Forum::enforceTopicFor(MsgId rootId) {
 }
 
 bool Forum::topicDeleted(MsgId rootId) const {
-	return _topicsDeleted.contains(rootId);
+	return _topicsDeleted.contains(rootId)
+		|| (rootId == ForumTopic::kGeneralId && peer()->isBot());
 }
 
 rpl::producer<> Forum::chatsListChanges() const {
diff --git a/Telegram/SourceFiles/data/data_forum.h b/Telegram/SourceFiles/data/data_forum.h
index 732ef80097e1b4..8a5fb37cf2eb89 100644
--- a/Telegram/SourceFiles/data/data_forum.h
+++ b/Telegram/SourceFiles/data/data_forum.h
@@ -41,8 +41,10 @@ class Forum final {
 
 	[[nodiscard]] Session &owner() const;
 	[[nodiscard]] Main::Session &session() const;
+	[[nodiscard]] not_null<PeerData*> peer() const;
 	[[nodiscard]] not_null<History*> history() const;
-	[[nodiscard]] not_null<ChannelData*> channel() const;
+	[[nodiscard]] UserData *bot() const;
+	[[nodiscard]] ChannelData *channel() const;
 	[[nodiscard]] not_null<Dialogs::MainList*> topicsList();
 	[[nodiscard]] rpl::producer<> destroyed() const;
 	[[nodiscard]] auto topicDestroyed() const
@@ -85,9 +87,11 @@ class Forum final {
 	void discardCreatingId(MsgId rootId);
 	[[nodiscard]] bool creating(MsgId rootId) const;
 	void created(MsgId rootId, MsgId realId);
+	[[nodiscard]] ForumTopic *reserveNewBotTopic();
 
 	void clearAllUnreadMentions();
 	void clearAllUnreadReactions();
+	void clearAllUnreadPollVotes();
 	void enumerateTopics(Fn<void(not_null<ForumTopic*>)> action) const;
 
 	void listMessageChanged(HistoryItem *from, HistoryItem *to);
@@ -96,6 +100,14 @@ class Forum final {
 	[[nodiscard]] auto recentTopics() const
 		-> const std::vector<not_null<ForumTopic*>> &;
 
+	void saveActiveSubsectionThread(not_null<Thread*> thread);
+	[[nodiscard]] Thread *activeSubsectionThread() const;
+
+	void markUnreadCountsUnknown(MsgId readTillId);
+	void updateUnreadCounts(
+		MsgId readTillId,
+		const base::flat_map<not_null<ForumTopic*>, int> &counts);
+
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
@@ -129,6 +141,8 @@ class Forum final {
 	std::vector<not_null<ForumTopic*>> _lastTopics;
 	int _lastTopicsVersion = 0;
 
+	ForumTopic *_activeSubsectionTopic = nullptr;
+
 	rpl::event_stream<> _chatsListChanges;
 	rpl::event_stream<> _chatsListLoadedEvents;
 
diff --git a/Telegram/SourceFiles/data/data_forum_topic.cpp b/Telegram/SourceFiles/data/data_forum_topic.cpp
index 7e7998897cc5fc..c62eb711b1f493 100644
--- a/Telegram/SourceFiles/data/data_forum_topic.cpp
+++ b/Telegram/SourceFiles/data/data_forum_topic.cpp
@@ -26,12 +26,13 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "history/history_unread_things.h"
 #include "history/view/history_view_item_preview.h"
-#include "history/view/history_view_replies_section.h"
+#include "history/view/history_view_chat_section.h"
 #include "main/main_session.h"
 #include "base/unixtime.h"
 #include "ui/painter.h"
 #include "ui/color_int_conversion.h"
 #include "ui/text/text_custom_emoji.h"
+#include "ui/text/text_utilities.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_chat_helpers.h"
 
@@ -152,10 +153,10 @@ QImage ForumTopicGeneralIconFrame(int size, const QColor &color) {
 	result.setDevicePixelRatio(ratio);
 	result.fill(Qt::transparent);
 
-	const auto use = size * 0.8;
-	const auto skip = size * 0.1;
+	const auto use = size * 1.;
+	const auto skip = size * 0.;
 	auto p = QPainter(&result);
-	svg.render(&p, QRectF(skip, 0, use, use));
+	svg.render(&p, QRectF(skip, skip, use, use));
 	p.end();
 
 	return style::colorizeImage(result, color);
@@ -221,7 +222,7 @@ TopicIconDescriptor ParseTopicIconEmojiEntity(QStringView entity) {
 		const auto parts = entity.mid(normal.size()).split(' ');
 		if (parts.size() == 2) {
 			return {
-				.title = parts[1].toString(),
+				.title = parts[1].isEmpty() ? u" "_q : parts[1].toString(),
 				.colorId = int32(parts[0].toUInt()),
 			};
 		}
@@ -249,7 +250,7 @@ ForumTopic::ForumTopic(not_null<Forum*> forum, MsgId rootId)
 
 	if (isGeneral()) {
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_defaultIcon = QImage();
 		}, _lifetime);
 	}
@@ -264,7 +265,15 @@ std::shared_ptr<Data::RepliesList> ForumTopic::replies() const {
 	return _replies;
 }
 
-not_null<ChannelData*> ForumTopic::channel() const {
+not_null<PeerData*> ForumTopic::peer() const {
+	return _forum->peer();
+}
+
+UserData *ForumTopic::bot() const {
+	return _forum->bot();
+}
+
+ChannelData *ForumTopic::channel() const {
 	return _forum->channel();
 }
 
@@ -307,24 +316,28 @@ bool ForumTopic::my() const {
 }
 
 bool ForumTopic::canEdit() const {
-	return my() || channel()->canManageTopics();
+	return my() || peer()->canManageTopics();
 }
 
 bool ForumTopic::canDelete() const {
 	if (creating() || isGeneral()) {
 		return false;
-	} else if (channel()->canDeleteMessages()) {
+	} else if (bot()) {
 		return true;
+	} else if (const auto channel = this->channel()) {
+		if (channel->canDeleteMessages()) {
+			return true;
+		}
 	}
 	return my() && replies()->canDeleteMyTopic();
 }
 
 bool ForumTopic::canToggleClosed() const {
-	return !creating() && canEdit();
+	return !creating() && canEdit() && !_forum->peer()->isBot();
 }
 
 bool ForumTopic::canTogglePinned() const {
-	return !creating() && channel()->canManageTopics();
+	return !creating() && peer()->canManageTopics();
 }
 
 bool ForumTopic::creating() const {
@@ -361,9 +374,9 @@ void ForumTopic::subscribeToUnreadChanges() {
 	) | rpl::combine_previous(
 	) | rpl::filter([=] {
 		return inChatList();
-	}) | rpl::start_with_next([=](
-		std::optional<int> previous,
-		std::optional<int> now) {
+	}) | rpl::on_next([=](
+			std::optional<int> previous,
+			std::optional<int> now) {
 		if (previous.value_or(0) != now.value_or(0)) {
 			_forum->recentTopicsInvalidate(this);
 		}
@@ -404,8 +417,9 @@ void ForumTopic::applyTopic(const MTPDforumTopic &data) {
 			draft->match([&](const MTPDdraftMessage &data) {
 				Data::ApplyPeerCloudDraft(
 					&session(),
-					channel()->id,
+					peer()->id,
 					_rootId,
+					PeerId(),
 					data);
 			}, [](const MTPDdraftMessageEmpty&) {});
 		}
@@ -417,6 +431,7 @@ void ForumTopic::applyTopic(const MTPDforumTopic &data) {
 		applyTopicTopMessage(data.vtop_message().v);
 		unreadMentions().setCount(data.vunread_mentions_count().v);
 		unreadReactions().setCount(data.vunread_reactions_count().v);
+		unreadPollVotes().setCount(data.vunread_poll_votes_count().v);
 	}
 }
 
@@ -461,14 +476,14 @@ void ForumTopic::setClosedAndSave(bool closed) {
 
 	const auto api = &session().api();
 	const auto weak = base::make_weak(this);
-	api->request(MTPchannels_EditForumTopic(
-		MTP_flags(MTPchannels_EditForumTopic::Flag::f_closed),
-		channel()->inputChannel,
+	api->request(MTPmessages_EditForumTopic(
+		MTP_flags(MTPmessages_EditForumTopic::Flag::f_closed),
+		peer()->input(),
 		MTP_int(_rootId),
 		MTPstring(), // title
 		MTPlong(), // icon_emoji_id
 		MTP_bool(closed),
-		MTPBool() // hidden
+		MTPBool() // hiddenKO
 	)).done([=](const MTPUpdates &result) {
 		api->applyUpdates(result);
 	}).fail([=](const MTP::Error &error) {
@@ -525,7 +540,7 @@ int ForumTopic::chatListNameVersion() const {
 void ForumTopic::applyTopicTopMessage(MsgId topMessageId) {
 	if (topMessageId) {
 		growLastKnownServerMessageId(topMessageId);
-		const auto itemId = FullMsgId(channel()->id, topMessageId);
+		const auto itemId = FullMsgId(peer()->id, topMessageId);
 		if (const auto item = owner().message(itemId)) {
 			setLastServerMessage(item);
 			resolveChatListMessageGroup();
@@ -709,7 +724,7 @@ void ForumTopic::requestChatListMessage() {
 
 TimeId ForumTopic::adjustedChatListTimeId() const {
 	const auto result = chatListTimeId();
-	if (const auto draft = history()->cloudDraft(_rootId)) {
+	if (const auto draft = history()->cloudDraft(_rootId, PeerId())) {
 		if (!Data::DraftIsNull(draft) && !session().supportMode()) {
 			return std::max(result, draft->date);
 		}
@@ -755,6 +770,16 @@ TextWithEntities ForumTopic::titleWithIcon() const {
 	return ForumTopicIconWithTitle(_rootId, _iconId, _title);
 }
 
+TextWithEntities ForumTopic::titleWithIconOrLogo() const {
+	if (_iconId || isGeneral()) {
+		return titleWithIcon();
+	}
+	return Ui::Text::SingleCustomEmoji(Data::TopicIconEmojiEntity({
+		.title = _title,
+		.colorId = _colorId,
+	})).append(' ').append(_title);
+}
+
 int ForumTopic::titleVersion() const {
 	return _titleVersion;
 }
@@ -782,7 +807,7 @@ void ForumTopic::applyIconId(DocumentId iconId) {
 	_iconId = iconId;
 	invalidateTitleWithIcon();
 	_icon = iconId
-		? std::make_unique<Ui::Text::LimitedLoopsEmoji>(
+		? MakeWrappedEmoji<Ui::Text::LimitedLoopsEmoji>(
 			owner().customEmojiManager().create(
 				_iconId,
 				[=] { updateChatListEntry(); },
@@ -812,6 +837,16 @@ void ForumTopic::applyColorId(int32 colorId) {
 	}
 }
 
+void ForumTopic::applyMaybeLast(not_null<HistoryItem*> item) {
+	if (!_lastServerMessage.value_or(nullptr)
+		|| (*_lastServerMessage)->id < item->id) {
+		setLastServerMessage(item);
+		resolveChatListMessageGroup();
+	} else {
+		growLastKnownServerMessageId(item->id);
+	}
+}
+
 void ForumTopic::applyItemAdded(not_null<HistoryItem*> item) {
 	if (item->isRegular()) {
 		setLastServerMessage(item);
@@ -867,7 +902,7 @@ void ForumTopic::setMuted(bool muted) {
 	session().changes().topicUpdated(this, UpdateFlag::Notifications);
 }
 
-not_null<HistoryView::SendActionPainter*> ForumTopic::sendActionPainter() {
+HistoryView::SendActionPainter *ForumTopic::sendActionPainter() {
 	return _sendActionPainter.get();
 }
 
@@ -883,7 +918,7 @@ Dialogs::BadgesState ForumTopic::chatListBadgesState() const {
 		Dialogs::CountInBadge::Messages,
 		Dialogs::IncludeInBadge::All);
 	if (!result.unread && _replies->inboxReadTillId() < 2) {
-		result.unread = channel()->amIn()
+		result.unread = (bot() || (channel() && channel()->amIn()))
 			&& (_lastKnownServerMessageId > history()->inboxReadTillId());
 		result.unreadMuted = muted();
 	}
@@ -955,6 +990,9 @@ void ForumTopic::hasUnreadReactionChanged(bool has) {
 	notifyUnreadStateChange(was);
 }
 
+void ForumTopic::hasUnreadPollVoteChanged(bool has) {
+}
+
 const QString &ForumTopic::chatListNameSortKey() const {
 	static const auto empty = QString();
 	return empty;
diff --git a/Telegram/SourceFiles/data/data_forum_topic.h b/Telegram/SourceFiles/data/data_forum_topic.h
index 06423e47505b25..383fa267543344 100644
--- a/Telegram/SourceFiles/data/data_forum_topic.h
+++ b/Telegram/SourceFiles/data/data_forum_topic.h
@@ -91,7 +91,9 @@ class ForumTopic final : public Thread {
 	}
 
 	[[nodiscard]] std::shared_ptr<RepliesList> replies() const;
-	[[nodiscard]] not_null<ChannelData*> channel() const;
+	[[nodiscard]] not_null<PeerData*> peer() const;
+	[[nodiscard]] UserData *bot() const;
+	[[nodiscard]] ChannelData *channel() const;
 	[[nodiscard]] not_null<History*> history() const;
 	[[nodiscard]] not_null<Forum*> forum() const;
 	[[nodiscard]] rpl::producer<> destroyed() const;
@@ -139,6 +141,7 @@ class ForumTopic final : public Thread {
 
 	void hasUnreadMentionChanged(bool has) override;
 	void hasUnreadReactionChanged(bool has) override;
+	void hasUnreadPollVoteChanged(bool has) override;
 
 	[[nodiscard]] HistoryItem *lastMessage() const;
 	[[nodiscard]] HistoryItem *lastServerMessage() const;
@@ -148,6 +151,7 @@ class ForumTopic final : public Thread {
 
 	[[nodiscard]] QString title() const;
 	[[nodiscard]] TextWithEntities titleWithIcon() const;
+	[[nodiscard]] TextWithEntities titleWithIconOrLogo() const;
 	[[nodiscard]] int titleVersion() const;
 	void applyTitle(const QString &title);
 	[[nodiscard]] DocumentId iconId() const;
@@ -157,6 +161,7 @@ class ForumTopic final : public Thread {
 	void applyCreator(PeerId creatorId);
 	void applyCreationDate(TimeId date);
 	void applyIsMy(bool my);
+	void applyMaybeLast(not_null<HistoryItem*> item);
 	void applyItemAdded(not_null<HistoryItem*> item);
 	void applyItemRemoved(MsgId id);
 	void maybeSetLastMessage(not_null<HistoryItem*> item);
@@ -181,7 +186,7 @@ class ForumTopic final : public Thread {
 	void setMuted(bool muted) override;
 
 	[[nodiscard]] auto sendActionPainter()
-		->not_null<HistoryView::SendActionPainter*> override;
+		-> HistoryView::SendActionPainter* override;
 
 private:
 	enum class Flag : uchar {
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index 72b4d387fc78d0..a18477b26bb8e8 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 #include "data/data_chat.h"
 #include "data/data_changes.h"
 #include "data/data_session.h"
+#include "data/data_user.h"
 #include "main/main_session.h"
 #include "calls/calls_instance.h"
 #include "calls/group/calls_group_call.h"
@@ -60,25 +61,65 @@ bool GroupCallParticipant::screenPaused() const {
 GroupCall::GroupCall(
 	not_null<PeerData*> peer,
 	CallId id,
-	CallId accessHash,
+	uint64 accessHash,
 	TimeId scheduleDate,
-	bool rtmp)
+	bool rtmp,
+	GroupCallOrigin origin)
 : _id(id)
 , _accessHash(accessHash)
 , _peer(peer)
 , _reloadByQueuedUpdatesTimer([=] { reload(); })
 , _speakingByActiveFinishTimer([=] { checkFinishSpeakingByActive(); })
 , _scheduleDate(scheduleDate)
+, _savedSendAs(peer->session().user())
 , _rtmp(rtmp)
+, _conference(origin == GroupCallOrigin::Conference)
+, _videoStream(origin == GroupCallOrigin::VideoStream)
 , _listenersHidden(rtmp) {
+	if (_conference) {
+		session().data().registerGroupCall(this);
+
+		_participantUpdates.events(
+		) | rpl::filter([=](const ParticipantUpdate &update) {
+			return !update.now
+				&& !update.was->peer->isSelf()
+				&& !_participantsWithAccess.current().empty();
+		}) | rpl::on_next([=](const ParticipantUpdate &update) {
+			if (const auto id = peerToUser(update.was->peer->id)) {
+				if (_participantsWithAccess.current().contains(id)) {
+					_staleParticipantIds.fire({ id });
+				}
+			}
+		}, _checkStaleLifetime);
+
+		_participantsWithAccess.changes(
+		) | rpl::filter([=](const base::flat_set<UserId> &list) {
+			return !list.empty();
+		}) | rpl::on_next([=] {
+			if (_allParticipantsLoaded) {
+				checkStaleParticipants();
+			} else {
+				requestParticipants();
+			}
+		}, _checkStaleLifetime);
+	} else if (_videoStream) {
+		session().data().registerGroupCall(this);
+	}
 }
 
 GroupCall::~GroupCall() {
+	if (_conference || _videoStream) {
+		session().data().unregisterGroupCall(this);
+	}
 	api().request(_unknownParticipantPeersRequestId).cancel();
 	api().request(_participantsRequestId).cancel();
 	api().request(_reloadRequestId).cancel();
 }
 
+Main::Session &GroupCall::session() const {
+	return _peer->session();
+}
+
 CallId GroupCall::id() const {
 	return _id;
 }
@@ -87,14 +128,41 @@ bool GroupCall::loaded() const {
 	return _version > 0;
 }
 
+rpl::producer<bool> GroupCall::loadedValue() const {
+	if (loaded()) {
+		return rpl::single(true);
+	}
+	return _loadedChanges.events_starting_with(false);
+}
+
 bool GroupCall::rtmp() const {
 	return _rtmp;
 }
 
+GroupCallOrigin GroupCall::origin() const {
+	return _conference
+		? GroupCallOrigin::Conference
+		: _videoStream
+		? GroupCallOrigin::VideoStream
+		: GroupCallOrigin::Group;
+}
+
+bool GroupCall::creator() const {
+	return _creator;
+}
+
+bool GroupCall::canManage() const {
+	return _conference ? _creator : _peer->canManageGroupCall();
+}
+
 bool GroupCall::listenersHidden() const {
 	return _listenersHidden;
 }
 
+bool GroupCall::blockchainMayBeEmpty() const {
+	return _version < 2;
+}
+
 not_null<PeerData*> GroupCall::peer() const {
 	return _peer;
 }
@@ -146,7 +214,7 @@ void GroupCall::requestParticipants() {
 					: ApplySliceSource::SliceLoaded));
 			setServerParticipantsCount(data.vcount().v);
 			if (data.vparticipants().v.isEmpty()) {
-				_allParticipantsLoaded = true;
+				setParticipantsLoaded();
 			}
 			finishParticipantsSliceRequest();
 			if (reloaded) {
@@ -157,7 +225,7 @@ void GroupCall::requestParticipants() {
 		_participantsRequestId = 0;
 		const auto reloaded = processSavedFullCall();
 		setServerParticipantsCount(_participants.size());
-		_allParticipantsLoaded = true;
+		setParticipantsLoaded();
 		finishParticipantsSliceRequest();
 		if (reloaded) {
 			_participantsReloaded.fire({});
@@ -165,6 +233,36 @@ void GroupCall::requestParticipants() {
 	}).send();
 }
 
+void GroupCall::setParticipantsLoaded() {
+	_allParticipantsLoaded = true;
+	checkStaleParticipants();
+}
+
+void GroupCall::checkStaleParticipants() {
+	const auto &list = _participantsWithAccess.current();
+	if (list.empty()) {
+		return;
+	}
+	auto existing = base::flat_set<UserId>();
+	existing.reserve(_participants.size() + 1);
+	existing.emplace(session().userId());
+	for (const auto &participant : _participants) {
+		if (const auto id = peerToUser(participant.peer->id)) {
+			existing.emplace(id);
+		}
+	}
+	auto stale = base::flat_set<UserId>();
+	for (const auto &id : list) {
+		if (!existing.contains(id)) {
+			stale.reserve(list.size());
+			stale.emplace(id);
+		}
+	}
+	if (!stale.empty()) {
+		_staleParticipantIds.fire(std::move(stale));
+	}
+}
+
 bool GroupCall::processSavedFullCall() {
 	if (!_savedFull) {
 		return false;
@@ -225,6 +323,10 @@ rpl::producer<int> GroupCall::fullCountValue() const {
 	return _fullCount.value();
 }
 
+QString GroupCall::conferenceInviteLink() const {
+	return _conferenceInviteLink;
+}
+
 bool GroupCall::participantsLoaded() const {
 	return _allParticipantsLoaded;
 }
@@ -275,7 +377,32 @@ auto GroupCall::participantSpeaking() const
 	return _participantSpeaking.events();
 }
 
+void GroupCall::setParticipantsWithAccess(base::flat_set<UserId> list) {
+	_participantsWithAccess = std::move(list);
+	if (_allParticipantsLoaded) {
+		checkStaleParticipants();
+	} else {
+		requestParticipants();
+	}
+}
+
+auto GroupCall::participantsWithAccessCurrent() const
+-> const base::flat_set<UserId> & {
+	return _participantsWithAccess.current();
+}
+
+auto GroupCall::participantsWithAccessValue() const
+-> rpl::producer<base::flat_set<UserId>> {
+	return _participantsWithAccess.value();
+}
+
+auto GroupCall::staleParticipantIds() const
+-> rpl::producer<base::flat_set<UserId>> {
+	return _staleParticipantIds.events();
+}
+
 void GroupCall::enqueueUpdate(const MTPUpdate &update) {
+	const auto initial = !_version;
 	update.match([&](const MTPDupdateGroupCall &updateData) {
 		updateData.vcall().match([&](const MTPDgroupCall &data) {
 			const auto version = data.vversion().v;
@@ -329,7 +456,7 @@ void GroupCall::enqueueUpdate(const MTPUpdate &update) {
 	}, [](const auto &) {
 		Unexpected("Type in GroupCall::enqueueUpdate.");
 	});
-	processQueuedUpdates();
+	processQueuedUpdates(initial);
 }
 
 void GroupCall::discard(const MTPDgroupCallDiscarded &data) {
@@ -347,9 +474,8 @@ void GroupCall::discard(const MTPDgroupCallDiscarded &data) {
 	Core::App().calls().applyGroupCallUpdateChecked(
 		&peer->session(),
 		MTP_updateGroupCall(
-			MTP_long(peer->isChat()
-				? peerToChat(peer->id).bare
-				: peerToChannel(peer->id).bare),
+			MTP_flags(MTPDupdateGroupCall::Flag::f_peer),
+			peerToMTP(peer->id),
 			MTP_groupCallDiscarded(
 				data.vid(),
 				data.vaccess_hash(),
@@ -397,15 +523,30 @@ void GroupCall::applyCallFields(const MTPDgroupCall &data) {
 		"Set from groupCall %1 -> %2"
 		).arg(_version
 		).arg(data.vversion().v));
+	const auto initial = !_version;
 	_version = data.vversion().v;
 	if (!_version) {
 		LOG(("API Error: Got zero version in groupCall."));
 		_version = 1;
 	}
 	_rtmp = data.is_rtmp_stream();
+	_creator = data.is_creator();
 	_listenersHidden = data.is_listeners_hidden();
-	_joinMuted = data.is_join_muted();
-	_canChangeJoinMuted = data.is_can_change_join_muted();
+	if (data.is_conference()) {
+		_canChangeJoinMuted = false;
+		_joinMuted = false;
+		const auto enabled = data.is_messages_enabled();
+		_canChangeMessagesEnabled = enabled;
+		if (!enabled || initial) {
+			_messagesEnabled = enabled;
+		}
+	} else {
+		_canChangeJoinMuted = data.is_can_change_join_muted();
+		_joinMuted = data.is_join_muted();
+		_canChangeMessagesEnabled = data.is_can_change_messages_enabled();
+		_messagesEnabled = data.is_messages_enabled();
+	}
+	_messagesMinPrice = data.vsend_paid_messages_stars().value_or_empty();
 	_joinedToTop = !data.is_join_date_asc();
 	setServerParticipantsCount(data.vparticipants_count().v);
 	changePeerEmptyCallFlag();
@@ -419,6 +560,13 @@ void GroupCall::applyCallFields(const MTPDgroupCall &data) {
 	_unmutedVideoLimit = data.vunmuted_video_limit().v;
 	_allParticipantsLoaded
 		= (_serverParticipantsCount == _participants.size());
+	_conferenceInviteLink = qs(data.vinvite_link().value_or_empty());
+	if (const auto as = data.vdefault_send_as()) {
+		_savedSendAs = _peer->owner().peer(peerFromMTP(*as));
+	}
+	if (initial) {
+		_loadedChanges.fire(true);
+	}
 }
 
 void GroupCall::applyLocalUpdate(
@@ -458,12 +606,10 @@ void GroupCall::applyEnqueuedUpdate(const MTPUpdate &update) {
 	}, [](const auto &) {
 		Unexpected("Type in GroupCall::applyEnqueuedUpdate.");
 	});
-	Core::App().calls().applyGroupCallUpdateChecked(
-		&_peer->session(),
-		update);
+	Core::App().calls().applyGroupCallUpdateChecked(&session(), update);
 }
 
-void GroupCall::processQueuedUpdates() {
+void GroupCall::processQueuedUpdates(bool initial) {
 	if (!_version || _applyingQueuedUpdates) {
 		return;
 	}
@@ -475,7 +621,13 @@ void GroupCall::processQueuedUpdates() {
 		const auto type = entry.first.second;
 		const auto incremented = (type == QueuedType::VersionedParticipant);
 		if ((version < _version)
-			|| (version == _version && incremented)) {
+			|| (version == _version && incremented && !initial)) {
+			// There is a case for a new conference call we receive:
+			// - updateGroupCall, version = 2
+			// - updateGroupCallParticipants, version = 2, versioned
+			// In case we were joining together with creation,
+			// in that case we don't want to skip the participants update,
+			// so we pass the `initial` flag specifically for that case.
 			_queuedUpdates.erase(_queuedUpdates.begin());
 		} else if (version == _version
 			|| (version == _version + 1 && incremented)) {
@@ -650,7 +802,8 @@ void GroupCall::applyParticipantsSlice(
 				.videoJoined = videoJoined,
 				.applyVolumeFromMin = applyVolumeFromMin,
 			};
-			if (i == end(_participants)) {
+			const auto adding = (i == end(_participants));
+			if (adding) {
 				if (value.ssrc) {
 					_participantPeerByAudioSsrc.emplace(
 						value.ssrc,
@@ -663,9 +816,6 @@ void GroupCall::applyParticipantsSlice(
 						participantPeer);
 				}
 				_participants.push_back(value);
-				if (const auto user = participantPeer->asUser()) {
-					_peer->owner().unregisterInvitedToCallUser(_id, user);
-				}
 			} else {
 				if (i->ssrc != value.ssrc) {
 					_participantPeerByAudioSsrc.erase(i->ssrc);
@@ -697,6 +847,14 @@ void GroupCall::applyParticipantsSlice(
 					.now = value,
 				});
 			}
+			if (adding) {
+				if (const auto user = participantPeer->asUser()) {
+					_peer->owner().unregisterInvitedToCallUser(
+						_id,
+						user,
+						false);
+				}
+			}
 		});
 	}
 	if (sliceSource == ApplySliceSource::UpdateReceived) {
@@ -818,7 +976,7 @@ void GroupCall::checkFinishSpeakingByActive() {
 			++i;
 		}
 	}
-	for (const auto participantPeer : stop) {
+	for (const auto &participantPeer : stop) {
 		const auto participant = findParticipant(participantPeer);
 		Assert(participant != nullptr);
 		if (participant->speaking) {
@@ -982,8 +1140,20 @@ bool GroupCall::joinedToTop() const {
 	return _joinedToTop;
 }
 
+void GroupCall::setMessagesEnabledLocally(bool enabled) {
+	_messagesEnabled = enabled;
+}
+
 ApiWrap &GroupCall::api() const {
-	return _peer->session().api();
+	return session().api();
+}
+
+void GroupCall::saveSendAs(not_null<PeerData*> peer) {
+	_savedSendAs = peer;
+	api().request(MTPphone_SaveDefaultSendAs(
+		input(),
+		peer->input()
+	)).send();
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 6dbaf8debeea3a..a97f7246a1c0ce 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -17,6 +17,15 @@ namespace Calls {
 struct ParticipantVideoParams;
 } // namespace Calls
 
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace TdE2E {
+struct ParticipantState;
+struct UserId;
+} // namespace TdE2E
+
 namespace Data {
 
 [[nodiscard]] const std::string &RtmpEndpointId();
@@ -51,20 +60,34 @@ struct GroupCallParticipant {
 	[[nodiscard]] bool screenPaused() const;
 };
 
+enum class GroupCallOrigin : uchar {
+	Group,
+	Conference,
+	VideoStream,
+};
+
 class GroupCall final {
 public:
 	GroupCall(
 		not_null<PeerData*> peer,
 		CallId id,
-		CallId accessHash,
+		uint64 accessHash,
 		TimeId scheduleDate,
-		bool rtmp);
+		bool rtmp,
+		GroupCallOrigin origin);
 	~GroupCall();
 
+	[[nodiscard]] Main::Session &session() const;
+
 	[[nodiscard]] CallId id() const;
 	[[nodiscard]] bool loaded() const;
+	[[nodiscard]] rpl::producer<bool> loadedValue() const;
 	[[nodiscard]] bool rtmp() const;
+	[[nodiscard]] GroupCallOrigin origin() const;
+	[[nodiscard]] bool creator() const;
+	[[nodiscard]] bool canManage() const;
 	[[nodiscard]] bool listenersHidden() const;
+	[[nodiscard]] bool blockchainMayBeEmpty() const;
 	[[nodiscard]] not_null<PeerData*> peer() const;
 	[[nodiscard]] MTPInputGroupCall input() const;
 	[[nodiscard]] QString title() const {
@@ -104,7 +127,7 @@ class GroupCall final {
 		return _unmutedVideoLimit.current();
 	}
 	[[nodiscard]] bool recordVideo() const {
-		return _recordVideo.current();
+		return _recordVideo;
 	}
 
 	void setPeer(not_null<PeerData*> peer);
@@ -133,6 +156,16 @@ class GroupCall final {
 	[[nodiscard]] auto participantSpeaking() const
 		-> rpl::producer<not_null<Participant*>>;
 
+	void setParticipantsWithAccess(base::flat_set<UserId> list);
+	[[nodiscard]] auto participantsWithAccessCurrent() const
+		-> const base::flat_set<UserId> &;
+	[[nodiscard]] auto participantsWithAccessValue() const
+		-> rpl::producer<base::flat_set<UserId>>;
+	[[nodiscard]] auto staleParticipantIds() const
+		-> rpl::producer<base::flat_set<UserId>>;
+	void setParticipantsLoaded();
+	void checkStaleParticipants();
+
 	void enqueueUpdate(const MTPUpdate &update);
 	void applyLocalUpdate(
 		const MTPDupdateGroupCallParticipants &update);
@@ -153,6 +186,7 @@ class GroupCall final {
 
 	[[nodiscard]] int fullCount() const;
 	[[nodiscard]] rpl::producer<int> fullCountValue() const;
+	[[nodiscard]] QString conferenceInviteLink() const;
 
 	void setInCall();
 	void reload();
@@ -164,6 +198,31 @@ class GroupCall final {
 	[[nodiscard]] bool canChangeJoinMuted() const;
 	[[nodiscard]] bool joinedToTop() const;
 
+	void setMessagesEnabledLocally(bool enabled);
+	[[nodiscard]] bool canChangeMessagesEnabled() const {
+		return _canChangeMessagesEnabled;
+	}
+	[[nodiscard]] bool messagesEnabled() const {
+		return _messagesEnabled.current();
+	}
+	[[nodiscard]] rpl::producer<bool> messagesEnabledValue() const {
+		return _messagesEnabled.value();
+	}
+	[[nodiscard]] int messagesMinPrice() const {
+		return _messagesMinPrice.current();
+	}
+	[[nodiscard]] rpl::producer<int> messagesMinPriceValue() const {
+		return _messagesMinPrice.value();
+	}
+
+	[[nodiscard]] not_null<PeerData*> resolveSendAs() const {
+		return _savedSendAs.current();
+	}
+	[[nodiscard]] rpl::producer<not_null<PeerData*>> sendAsValue() const {
+		return _savedSendAs.value();
+	}
+	void saveSendAs(not_null<PeerData*> peer);
+
 private:
 	enum class ApplySliceSource {
 		FullReloaded,
@@ -191,7 +250,7 @@ class GroupCall final {
 	void applyEnqueuedUpdate(const MTPUpdate &update);
 	void setServerParticipantsCount(int count);
 	void computeParticipantsCount();
-	void processQueuedUpdates();
+	void processQueuedUpdates(bool initial = false);
 	void processFullCallUsersChats(const MTPphone_GroupCall &call);
 	void processFullCallFields(const MTPphone_GroupCall &call);
 	[[nodiscard]] bool requestParticipantsAfterReload(
@@ -201,14 +260,16 @@ class GroupCall final {
 	[[nodiscard]] Participant *findParticipant(not_null<PeerData*> peer);
 
 	const CallId _id = 0;
-	const CallId _accessHash = 0;
+	const uint64 _accessHash = 0;
 
 	not_null<PeerData*> _peer;
 	int _version = 0;
+	rpl::event_stream<bool> _loadedChanges;
 	mtpRequestId _participantsRequestId = 0;
 	mtpRequestId _reloadRequestId = 0;
 	crl::time _reloadLastFinished = 0;
 	rpl::variable<QString> _title;
+	QString _conferenceInviteLink;
 
 	base::flat_multi_map<
 		std::pair<int, QueuedType>,
@@ -224,7 +285,8 @@ class GroupCall final {
 	int _serverParticipantsCount = 0;
 	rpl::variable<int> _fullCount = 0;
 	rpl::variable<int> _unmutedVideoLimit = 0;
-	rpl::variable<bool> _recordVideo = 0;
+	rpl::variable<bool> _messagesEnabled = false;
+	rpl::variable<int> _messagesMinPrice = 0;
 	rpl::variable<TimeId> _recordStartDate = 0;
 	rpl::variable<TimeId> _scheduleDate = 0;
 	rpl::variable<bool> _scheduleStartSubscribed = false;
@@ -241,13 +303,24 @@ class GroupCall final {
 	rpl::event_stream<not_null<Participant*>> _participantSpeaking;
 	rpl::event_stream<> _participantsReloaded;
 
-	bool _joinMuted = false;
-	bool _canChangeJoinMuted = true;
-	bool _allParticipantsLoaded = false;
-	bool _joinedToTop = false;
-	bool _applyingQueuedUpdates = false;
-	bool _rtmp = false;
-	bool _listenersHidden = false;
+	rpl::variable<base::flat_set<UserId>> _participantsWithAccess;
+	rpl::event_stream<base::flat_set<UserId>> _staleParticipantIds;
+	rpl::lifetime _checkStaleLifetime;
+
+	rpl::variable<not_null<PeerData*>> _savedSendAs;
+
+	bool _creator : 1 = false;
+	bool _joinMuted : 1 = false;
+	bool _recordVideo : 1 = false;
+	bool _canChangeJoinMuted : 1 = true;
+	bool _canChangeMessagesEnabled : 1 = true;
+	bool _allParticipantsLoaded : 1 = false;
+	bool _joinedToTop : 1 = false;
+	bool _applyingQueuedUpdates : 1 = false;
+	bool _rtmp : 1 = false;
+	bool _conference : 1 = false;
+	bool _videoStream : 1 = false;
+	bool _listenersHidden : 1 = false;
 
 };
 
diff --git a/Telegram/SourceFiles/data/data_groups.cpp b/Telegram/SourceFiles/data/data_groups.cpp
index 15bb0d820e8941..7af7050f1402c8 100644
--- a/Telegram/SourceFiles/data/data_groups.cpp
+++ b/Telegram/SourceFiles/data/data_groups.cpp
@@ -84,7 +84,7 @@ void Groups::refreshMessage(
 		_data->requestItemViewRefresh(item);
 		return;
 	}
-	if (!item->isRegular() && !item->isScheduled()) {
+	if (!item->isRegular() && !item->isScheduled() && !item->isUploading()) {
 		return;
 	}
 	const auto groupId = item->groupId();
diff --git a/Telegram/SourceFiles/data/data_histories.cpp b/Telegram/SourceFiles/data/data_histories.cpp
index 0f428913acb727..7968fbc0a121ea 100644
--- a/Telegram/SourceFiles/data/data_histories.cpp
+++ b/Telegram/SourceFiles/data/data_histories.cpp
@@ -10,12 +10,15 @@ For license and copyright information please follow this link:
 #include "api/api_text_entities.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/components/scheduled_messages.h"
-#include "data/data_session.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
+#include "data/data_document.h"
 #include "data/data_folder.h"
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
+#include "data/data_saved_music.h"
+#include "data/data_saved_sublist.h"
+#include "data/data_session.h"
 #include "data/data_user.h"
 #include "base/unixtime.h"
 #include "base/random.h"
@@ -32,6 +35,7 @@ namespace Data {
 namespace {
 
 constexpr auto kReadRequestTimeout = 3 * crl::time(1000);
+constexpr auto kReportDeliveriesPerRequest = 50;
 
 } // namespace
 
@@ -42,7 +46,7 @@ MTPInputReplyTo ReplyToForMTP(
 	if (replyTo.storyId) {
 		if (const auto peer = owner->peerLoaded(replyTo.storyId.peer)) {
 			return MTP_inputReplyToStory(
-				peer->input,
+				peer->input(),
 				MTP_int(replyTo.storyId.story));
 		}
 	} else if (replyTo.messageId || replyTo.topicRootId) {
@@ -55,9 +59,18 @@ MTPInputReplyTo ReplyToForMTP(
 				? replyingToTopic->rootId()
 				: Data::ForumTopic::kGeneralId)
 			: (to ? to->topicRootId() : Data::ForumTopic::kGeneralId);
-		const auto replyToTopicId = to
+		const auto replyToTopicId = (to
+			&& (to->history() != history || to->id != replyingToTopicId))
 			? to->topicRootId()
 			: replyingToTopicId;
+		const auto possibleMonoforumPeerId = (to && to->sublistPeerId())
+			? to->sublistPeerId()
+			: replyTo.monoforumPeerId
+			? replyTo.monoforumPeerId
+			: history->session().user()->id;
+		const auto replyToMonoforumPeerId = history->peer->amMonoforumAdmin()
+			? possibleMonoforumPeerId
+			: PeerId();
 		const auto external = replyTo.messageId
 			&& (replyTo.messageId.peer != history->peer->id
 				|| replyingToTopicId != replyToTopicId);
@@ -72,17 +85,35 @@ MTPInputReplyTo ReplyToForMTP(
 				| (replyTo.quote.text.isEmpty()
 					? Flag()
 					: (Flag::f_quote_text | Flag::f_quote_offset))
+				| (replyToMonoforumPeerId
+					? Flag::f_monoforum_peer_id
+					: Flag())
 				| (quoteEntities.v.isEmpty()
 					? Flag()
-					: Flag::f_quote_entities)),
+					: Flag::f_quote_entities)
+				| (replyTo.todoItemId ? Flag::f_todo_item_id : Flag())
+			| (replyTo.pollOption.isEmpty()
+				? Flag()
+				: Flag::f_poll_option)),
 			MTP_int(replyTo.messageId ? replyTo.messageId.msg : 0),
 			MTP_int(replyTo.topicRootId),
 			(external
-				? owner->peer(replyTo.messageId.peer)->input
+				? owner->peer(replyTo.messageId.peer)->input()
 				: MTPInputPeer()),
 			MTP_string(replyTo.quote.text),
 			quoteEntities,
-			MTP_int(replyTo.quoteOffset));
+			MTP_int(replyTo.quoteOffset),
+			(replyToMonoforumPeerId
+				? history->owner().peer(replyToMonoforumPeerId)->input()
+				: MTPInputPeer()),
+			MTP_int(replyTo.todoItemId),
+			MTP_bytes(replyTo.pollOption));
+	} else if (history->peer->amMonoforumAdmin()
+		&& replyTo.monoforumPeerId) {
+		const auto replyToMonoforumPeer = replyTo.monoforumPeerId
+			? history->owner().peer(replyTo.monoforumPeerId)
+			: history->session().user();
+		return MTP_inputReplyToMonoForum(replyToMonoforumPeer->input());
 	}
 	return MTPInputReplyTo();
 }
@@ -394,7 +425,7 @@ void Histories::sendDialogRequests() {
 
 	auto peers = QVector<MTPInputDialogPeer>();
 	const auto dialogPeer = [](not_null<History*> history) {
-		return MTP_inputDialogPeer(history->peer->input);
+		return MTP_inputDialogPeer(history->peer->input());
 	};
 	ranges::transform(
 		histories,
@@ -473,7 +504,26 @@ void Histories::changeDialogUnreadMark(
 	using Flag = MTPmessages_MarkDialogUnread::Flag;
 	session().api().request(MTPmessages_MarkDialogUnread(
 		MTP_flags(unread ? Flag::f_unread : Flag(0)),
-		MTP_inputDialogPeer(history->peer->input)
+		MTPInputPeer(), // parent_peer
+		MTP_inputDialogPeer(history->peer->input())
+	)).send();
+}
+
+void Histories::changeSublistUnreadMark(
+		not_null<Data::SavedSublist*> sublist,
+		bool unread) {
+	const auto parent = sublist->parentChat();
+	if (!parent) {
+		return;
+	}
+	sublist->setUnreadMark(unread);
+
+	using Flag = MTPmessages_MarkDialogUnread::Flag;
+	session().api().request(MTPmessages_MarkDialogUnread(
+		MTP_flags(Flag::f_parent_peer
+			| (unread ? Flag::f_unread : Flag(0))),
+		parent->input(),
+		MTP_inputDialogPeer(sublist->sublistPeer()->input())
 	)).send();
 }
 
@@ -486,7 +536,7 @@ void Histories::requestFakeChatListMessage(
 	_fakeChatListRequests.emplace(history);
 	sendRequest(history, RequestType::History, [=](Fn<void()> finish) {
 		return session().api().request(MTPmessages_GetHistory(
-			history->peer->input,
+			history->peer->input(),
 			MTP_int(0), // offset_id
 			MTP_int(0), // offset_date
 			MTP_int(0), // add_offset
@@ -502,6 +552,7 @@ void Histories::requestFakeChatListMessage(
 			_fakeChatListRequests.erase(history);
 			history->setFakeChatListMessageFrom(MTP_messages_messages(
 				MTP_vector<MTPMessage>(0),
+				MTP_vector<MTPForumTopic>(0),
 				MTP_vector<MTPChat>(0),
 				MTP_vector<MTPUser>(0)));
 			finish();
@@ -526,7 +577,7 @@ void Histories::requestGroupAround(not_null<HistoryItem*> item) {
 	const auto requestId = sendRequest(history, RequestType::History, [=](
 			Fn<void()> finish) {
 		return session().api().request(MTPmessages_GetHistory(
-			history->peer->input,
+			history->peer->input(),
 			MTP_int(id),
 			MTP_int(0), // offset_date
 			MTP_int(-kMaxAlbumCount),
@@ -565,6 +616,58 @@ void Histories::sendPendingReadInbox(not_null<History*> history) {
 	}
 }
 
+void Histories::reportDelivery(not_null<HistoryItem*> item) {
+	auto &set = _pendingDeliveryReport[item->history()->peer];
+	if (!set.emplace(item->id).second) {
+		return;
+	}
+	crl::on_main(&session(), [=] {
+		reportPendingDeliveries();
+	});
+}
+
+void Histories::reportPendingDeliveries() {
+	auto &pending = _pendingDeliveryReport;
+	for (auto i = begin(pending); i != end(pending);) {
+		auto &[peer, ids] = *i;
+		auto list = QVector<MTPint>();
+		if (_deliveryReportSent.contains(peer)) {
+			++i;
+			continue;
+		} else if (ids.size() > kReportDeliveriesPerRequest) {
+			const auto count = kReportDeliveriesPerRequest;
+			list.reserve(count);
+			for (auto j = begin(ids), till = j + count; j != till; ++j) {
+				list.push_back(MTP_int(*j));
+			}
+			ids.erase(begin(ids), begin(ids) + count);
+		} else if (!ids.empty()) {
+			list.reserve(ids.size());
+			for (const auto &id : ids) {
+				list.push_back(MTP_int(id));
+			}
+			ids.clear();
+		}
+		if (ids.empty()) {
+			i = pending.erase(i);
+		} else {
+			++i;
+		}
+		_deliveryReportSent.emplace(peer);
+		const auto finish = [=] {
+			_deliveryReportSent.remove(peer);
+			if (_pendingDeliveryReport.contains(peer)) {
+				reportPendingDeliveries();
+			}
+		};
+		session().api().request(MTPmessages_ReportMessagesDelivery(
+			MTP_flags(0),
+			peer->input(),
+			MTP_vector(std::move(list))
+		)).done(finish).fail(finish).send();
+	}
+}
+
 void Histories::sendReadRequests() {
 	DEBUG_LOG(("Reading: send requests with count %1.").arg(_states.size()));
 	if (_states.empty()) {
@@ -617,17 +720,18 @@ void Histories::sendReadRequest(not_null<History*> history, State &state) {
 			} else {
 				Assert(!state->sentReadTill || state->sentReadTill > tillId);
 			}
+			history->validateMonoAndForumUnread(tillId);
 			sendReadRequests();
 			finish();
 		};
 		if (const auto channel = history->peer->asChannel()) {
 			return session().api().request(MTPchannels_ReadHistory(
-				channel->inputChannel,
+				channel->inputChannel(),
 				MTP_int(tillId)
 			)).done(finished).fail(finished).send();
 		} else {
 			return session().api().request(MTPmessages_ReadHistory(
-				history->peer->input,
+				history->peer->input(),
 				MTP_int(tillId)
 			)).done([=](const MTPmessages_AffectedMessages &result) {
 				session().api().applyAffectedMessages(history->peer, result);
@@ -679,7 +783,7 @@ void Histories::deleteMessages(
 		};
 		if (const auto channel = history->peer->asChannel()) {
 			return session().api().request(MTPchannels_DeleteMessages(
-				channel->inputChannel,
+				channel->inputChannel(),
 				MTP_vector<MTPint>(ids)
 			)).done(done).fail(finish).send();
 		} else {
@@ -703,7 +807,7 @@ void Histories::deleteAllMessages(
 		const auto channel = peer->asChannel();
 		if (!justClear && revoke && channel && channel->canDelete()) {
 			return session().api().request(MTPchannels_DeleteChannel(
-				channel->inputChannel
+				channel->inputChannel()
 			)).done([=](const MTPUpdates &result) {
 				session().api().applyUpdates(result);
 			//}).fail([=](const MTP::Error &error) {
@@ -715,18 +819,18 @@ void Histories::deleteAllMessages(
 			using Flag = MTPchannels_DeleteHistory::Flag;
 			return session().api().request(MTPchannels_DeleteHistory(
 				MTP_flags(revoke ? Flag::f_for_everyone : Flag(0)),
-				channel->inputChannel,
+				channel->inputChannel(),
 				MTP_int(deleteTillId)
 			)).done(finish).fail(finish).send();
-		} else if (revoke && chat && chat->amCreator()) {
+		} else if (!justClear && revoke && chat && chat->amCreator()) {
 			return session().api().request(MTPmessages_DeleteChat(
-				chat->inputChat
+				chat->inputChat()
 			)).done(finish).fail([=](const MTP::Error &error) {
 				if (error.type() == "PEER_ID_INVALID") {
 					// Try to join and delete,
 					// while delete fails for non-joined.
 					session().api().request(MTPmessages_AddChatUser(
-						chat->inputChat,
+						chat->inputChat(),
 						MTP_inputUserSelf(),
 						MTP_int(0)
 					)).done([=](const MTPmessages_InvitedUsers &result) {
@@ -748,7 +852,7 @@ void Histories::deleteAllMessages(
 				| (revoke ? Flag::f_revoke : Flag(0));
 			return session().api().request(MTPmessages_DeleteHistory(
 				MTP_flags(flags),
-				peer->input,
+				peer->input(),
 				MTP_int(0),
 				MTPint(), // min_date
 				MTPint() // max_date
@@ -788,10 +892,10 @@ void Histories::deleteMessagesByDates(
 }
 
 void Histories::deleteMessagesByDates(
-		not_null<History*> history,
-		TimeId minDate,
-		TimeId maxDate,
-		bool revoke) {
+	not_null<History*> history,
+	TimeId minDate,
+	TimeId maxDate,
+	bool revoke) {
 	sendRequest(history, RequestType::Delete, [=](Fn<void()> finish) {
 		const auto peer = history->peer;
 		using Flag = MTPmessages_DeleteHistory::Flag;
@@ -801,7 +905,7 @@ void Histories::deleteMessagesByDates(
 			| (revoke ? Flag::f_revoke : Flag(0));
 		return session().api().request(MTPmessages_DeleteHistory(
 			MTP_flags(flags),
-			peer->input,
+			peer->input(),
 			MTP_int(0),
 			MTP_int(minDate),
 			MTP_int(maxDate)
@@ -824,10 +928,14 @@ void Histories::deleteMessages(const MessageIdsList &ids, bool revoke) {
 	base::flat_map<not_null<History*>, QVector<MTPint>> idsByPeer;
 	base::flat_map<not_null<PeerData*>, QVector<MTPint>> scheduledIdsByPeer;
 	base::flat_map<BusinessShortcutId, QVector<MTPint>> quickIdsByShortcut;
+	base::flat_set<not_null<DocumentData*>> savedMusic;
 	for (const auto &itemId : ids) {
 		if (const auto item = _owner->message(itemId)) {
 			const auto history = item->history();
-			if (item->isScheduled()) {
+			if (item->isSavedMusicItem()) {
+				savedMusic.emplace(item->media()->document());
+				continue;
+			} else if (item->isScheduled()) {
 				const auto wasOnServer = !item->isSending()
 					&& !item->hasFailed();
 				auto &scheduled = _owner->session().scheduledMessages();
@@ -861,7 +969,7 @@ void Histories::deleteMessages(const MessageIdsList &ids, bool revoke) {
 	}
 	for (const auto &[peer, ids] : scheduledIdsByPeer) {
 		peer->session().api().request(MTPmessages_DeleteScheduledMessages(
-			peer->input,
+			peer->input(),
 			MTP_vector<MTPint>(ids)
 		)).done([peer = peer](const MTPUpdates &result) {
 			peer->session().api().applyUpdates(result);
@@ -876,8 +984,14 @@ void Histories::deleteMessages(const MessageIdsList &ids, bool revoke) {
 			api->applyUpdates(result);
 		}).send();
 	}
+	for (const auto &document : savedMusic) {
+		document->owner().savedMusic().remove(document);
+	}
 
-	for (const auto item : remove) {
+	if (!remove.empty()) {
+		_owner->notifyItemsAboutToBeDestroyed(remove);
+	}
+	for (const auto &item : remove) {
 		const auto history = item->history();
 		const auto wasLast = (history->lastMessage() == item);
 		const auto wasInChats = (history->chatListMessage() == item);
@@ -937,8 +1051,6 @@ int Histories::sendRequest(
 void Histories::sendCreateTopicRequest(
 		not_null<History*> history,
 		MsgId rootId) {
-	Expects(history->peer->isChannel());
-
 	const auto forum = history->asForum();
 	Assert(forum != nullptr);
 	const auto topic = forum->topicFor(rootId);
@@ -948,11 +1060,12 @@ void Histories::sendCreateTopicRequest(
 		randomId,
 		{ history->peer->id, rootId });
 	const auto api = &session().api();
-	using Flag = MTPchannels_CreateForumTopic::Flag;
-	api->request(MTPchannels_CreateForumTopic(
+	using Flag = MTPmessages_CreateForumTopic::Flag;
+	api->request(MTPmessages_CreateForumTopic(
 		MTP_flags(Flag::f_icon_color
-			| (topic->iconId() ? Flag::f_icon_emoji_id : Flag(0))),
-		history->peer->asChannel()->inputChannel,
+			| (topic->iconId() ? Flag::f_icon_emoji_id : Flag())
+			| (history->peer->isBot() ? Flag::f_title_missing : Flag())),
+		history->peer->input(),
 		MTP_string(topic->title()),
 		MTP_int(topic->colorId()),
 		MTP_long(topic->iconId()),
@@ -1000,13 +1113,12 @@ int Histories::sendPreparedMessage(
 		_creatingTopicRequests.emplace(id);
 		return id;
 	}
-	const auto realReplyTo = FullReplyTo{
-		.messageId = convertTopicReplyToId(history, replyTo.messageId),
-		.quote = replyTo.quote,
-		.storyId = replyTo.storyId,
-		.topicRootId = convertTopicReplyToId(history, replyTo.topicRootId),
-		.quoteOffset = replyTo.quoteOffset,
+	auto realReplyTo = replyTo;
+	const auto topicReplyToId = [&](const auto &id) {
+		return convertTopicReplyToId(history, id);
 	};
+	realReplyTo.messageId = topicReplyToId(replyTo.messageId);
+	realReplyTo.topicRootId = topicReplyToId(replyTo.topicRootId);
 	return v::match(message(history, realReplyTo), [&](const auto &request) {
 		const auto type = RequestType::Send;
 		return sendRequest(history, type, [=](Fn<void()> finish) {
diff --git a/Telegram/SourceFiles/data/data_histories.h b/Telegram/SourceFiles/data/data_histories.h
index dd2900a41cd4b8..773dec16c1f50d 100644
--- a/Telegram/SourceFiles/data/data_histories.h
+++ b/Telegram/SourceFiles/data/data_histories.h
@@ -26,6 +26,7 @@ namespace Data {
 class Session;
 class Folder;
 struct WebPageDraft;
+class SavedSublist;
 
 [[nodiscard]] MTPInputReplyTo ReplyToForMTP(
 	not_null<History*> history,
@@ -63,6 +64,7 @@ class Histories final {
 	void readInboxOnNewMessage(not_null<HistoryItem*> item);
 	void readClientSideMessage(not_null<HistoryItem*> item);
 	void sendPendingReadInbox(not_null<History*> history);
+	void reportDelivery(not_null<HistoryItem*> item);
 
 	void requestDialogEntry(not_null<Data::Folder*> folder);
 	void requestDialogEntry(
@@ -70,6 +72,9 @@ class Histories final {
 		Fn<void()> callback = nullptr);
 	void dialogEntryApplied(not_null<History*> history);
 	void changeDialogUnreadMark(not_null<History*> history, bool unread);
+	void changeSublistUnreadMark(
+		not_null<Data::SavedSublist*> sublist,
+		bool unread);
 	void requestFakeChatListMessage(not_null<History*> history);
 
 	void requestGroupAround(not_null<HistoryItem*> item);
@@ -107,7 +112,8 @@ class Histories final {
 		MTPmessages_SendMessage,
 		MTPmessages_SendMedia,
 		MTPmessages_SendInlineBotResult,
-		MTPmessages_SendMultiMedia>;
+		MTPmessages_SendMultiMedia,
+		MTPmessages_ForwardMessages>;
 	int sendPreparedMessage(
 		not_null<History*> history,
 		FullReplyTo replyTo,
@@ -201,6 +207,7 @@ class Histories final {
 	void postponeRequestDialogEntries();
 
 	void sendDialogRequests();
+	void reportPendingDeliveries();
 
 	[[nodiscard]] bool isCreatingTopic(
 		not_null<History*> history,
@@ -236,6 +243,11 @@ class Histories final {
 	base::flat_map<FullMsgId, MsgId> _createdTopicIds;
 	base::flat_set<mtpRequestId> _creatingTopicRequests;
 
+	base::flat_map<
+		not_null<PeerData*>,
+		base::flat_set<MsgId>> _pendingDeliveryReport;
+	base::flat_set<not_null<PeerData*>> _deliveryReportSent;
+
 };
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_history_messages.cpp b/Telegram/SourceFiles/data/data_history_messages.cpp
index 5d5dffa30b074a..c86a8907db824a 100644
--- a/Telegram/SourceFiles/data/data_history_messages.cpp
+++ b/Telegram/SourceFiles/data/data_history_messages.cpp
@@ -88,7 +88,7 @@ rpl::producer<SparseIdsSlice> HistoryViewer(
 			limitAfter);
 		using RequestAroundInfo = SparseIdsSliceBuilder::AroundData;
 		builder->insufficientAround(
-		) | rpl::start_with_next([=](const RequestAroundInfo &info) {
+		) | rpl::on_next([=](const RequestAroundInfo &info) {
 			if (!info.aroundId) {
 				// Ignore messages-count-only requests, because we perform
 				// them with non-zero limit of messages and end up adding
@@ -110,22 +110,22 @@ rpl::producer<SparseIdsSlice> HistoryViewer(
 		messages->sliceUpdated(
 		) | rpl::filter([=](const SliceUpdate &update) {
 			return builder->applyUpdate(update);
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		messages->oneRemoved(
 		) | rpl::filter([=](MsgId messageId) {
 			return builder->removeOne(messageId);
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		messages->allRemoved(
 		) | rpl::filter([=] {
 			return builder->removeAll();
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		messages->bottomInvalidated(
 		) | rpl::filter([=] {
 			return builder->invalidateBottom();
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		const auto snapshot = messages->snapshot({
 			aroundId,
@@ -152,6 +152,7 @@ rpl::producer<SparseIdsMergedSlice> HistoryMergedViewer(
 	auto createSimpleViewer = [=](
 			PeerId peerId,
 			MsgId topicRootId,
+			PeerId monoforumPeerId,
 			SparseIdsSlice::Key simpleKey,
 			int limitBefore,
 			int limitAfter) {
@@ -161,11 +162,10 @@ rpl::producer<SparseIdsMergedSlice> HistoryMergedViewer(
 		return HistoryViewer(chosen, simpleKey, limitBefore, limitAfter);
 	};
 	const auto peerId = history->peer->id;
-	const auto topicRootId = MsgId();
 	const auto migratedPeerId = migrateFrom ? migrateFrom->id : PeerId(0);
 	using Key = SparseIdsMergedSlice::Key;
 	return SparseIdsMergedSlice::CreateViewer(
-		Key(peerId, topicRootId, migratedPeerId, universalAroundId),
+		Key(peerId, MsgId(), PeerId(), migratedPeerId, universalAroundId),
 		limitBefore,
 		limitAfter,
 		std::move(createSimpleViewer));
diff --git a/Telegram/SourceFiles/data/data_lastseen_status.h b/Telegram/SourceFiles/data/data_lastseen_status.h
index a7d0171e260162..f5da5fbd84d704 100644
--- a/Telegram/SourceFiles/data/data_lastseen_status.h
+++ b/Telegram/SourceFiles/data/data_lastseen_status.h
@@ -112,7 +112,9 @@ class LastseenStatus final {
 	static constexpr auto kValidAfter = kLifeStartDate + kSpecialValueSkip;
 
 	[[nodiscard]] bool valid() const {
-		return !_available || (_value >= kSpecialValueSkip);
+		constexpr auto kMaxSum = uint32(std::numeric_limits<TimeId>::max());
+		return (kMaxSum - _value > uint32(kLifeStartDate))
+			&& (!_available || (_value >= kSpecialValueSkip));
 	}
 
 	LastseenStatus(uint32 value, bool available, bool hiddenByMe)
diff --git a/Telegram/SourceFiles/data/data_media_preload.cpp b/Telegram/SourceFiles/data/data_media_preload.cpp
index 8fb938067362d8..b1288f24ce9045 100644
--- a/Telegram/SourceFiles/data/data_media_preload.cpp
+++ b/Telegram/SourceFiles/data/data_media_preload.cpp
@@ -75,7 +75,7 @@ void PhotoPreload::start(FileOrigin origin) {
 		_photo->owner()->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return _photo->loaded();
-		}) | rpl::start_with_next([=] { callDone(); }, _lifetime);
+		}) | rpl::on_next([=] { callDone(); }, _lifetime);
 	}
 }
 
@@ -151,7 +151,7 @@ VideoPreload::~VideoPreload() {
 }
 
 bool VideoPreload::Can(not_null<DocumentData*> video) {
-	return video->canBeStreamed(nullptr)
+	return video->canBeStreamed()
 		&& video->videoPreloadLocation().valid()
 		&& video->bigFileBaseCacheKey();
 }
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 81dc056e912e1c..b33e40184e723d 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -11,9 +11,11 @@ For license and copyright information please follow this link:
 #include "boxes/send_credits_box.h" // CreditsEmoji.
 #include "history/history.h"
 #include "history/history_item.h" // CreateMedia.
+#include "history/history_item_components.h"
 #include "history/history_location_manager.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_item_preview.h"
+#include "history/view/media/history_view_birthday_suggestion.h"
 #include "history/view/media/history_view_photo.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/view/media/history_view_gif.h"
@@ -29,13 +31,17 @@ For license and copyright information please follow this link:
 #include "history/view/media/history_view_web_page.h"
 #include "history/view/media/history_view_poll.h"
 #include "history/view/media/history_view_theme_document.h"
+#include "history/view/media/history_view_todo_list.h"
 #include "history/view/media/history_view_slot_machine.h"
 #include "history/view/media/history_view_dice.h"
 #include "history/view/media/history_view_service_box.h"
 #include "history/view/media/history_view_story_mention.h"
 #include "history/view/media/history_view_premium_gift.h"
+#include "history/view/media/history_view_unique_gift.h"
 #include "history/view/media/history_view_userpic_suggestion.h"
 #include "dialogs/ui/dialogs_message_view.h"
+#include "ui/boxes/emoji_stake_box.h"
+#include "ui/controls/ton_common.h"
 #include "ui/image/image.h"
 #include "ui/effects/spoiler_mess.h"
 #include "ui/text/format_song_document_name.h"
@@ -51,6 +57,7 @@ For license and copyright information please follow this link:
 #include "storage/localstorage.h"
 #include "chat_helpers/stickers_dice_pack.h" // Stickers::DicePacks::IsSlot.
 #include "chat_helpers/stickers_gift_box_pack.h"
+#include "data/components/credits.h"
 #include "data/data_session.h"
 #include "data/data_auto_download.h"
 #include "data/data_photo.h"
@@ -64,9 +71,11 @@ For license and copyright information please follow this link:
 #include "data/data_file_origin.h"
 #include "data/data_stories.h"
 #include "data/data_story.h"
+#include "data/data_todo_list.h"
 #include "data/data_user.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "calls/calls_instance.h"
 #include "core/application.h"
 #include "core/click_handler_types.h" // ClickHandlerContext
 #include "lang/lang_keys.h"
@@ -94,11 +103,11 @@ struct AlbumCounts {
 };
 
 [[nodiscard]] TextWithEntities WithCaptionNotificationText(
-		const QString &attachType,
+		TextWithEntities attachType,
 		const TextWithEntities &caption,
 		bool hasMiniImages = false) {
 	if (caption.text.isEmpty()) {
-		return Ui::Text::Colorized(attachType);
+		return Ui::Text::Colorized(std::move(attachType));
 	}
 	auto wrapped = st::wrap_rtl(caption);
 	return hasMiniImages
@@ -109,11 +118,21 @@ struct AlbumCounts {
 			tr::lng_dialogs_text_media_wrapped(
 				tr::now,
 				lt_media,
-				Ui::Text::Colorized(attachType),
-				Ui::Text::WithEntities),
+				Ui::Text::Colorized(std::move(attachType)),
+				tr::marked),
 			lt_caption,
 			wrapped,
-			Ui::Text::WithEntities);
+			tr::marked);
+}
+
+[[nodiscard]] TextWithEntities WithCaptionNotificationText(
+		const QString &attachType,
+		const TextWithEntities &caption,
+		bool hasMiniImages = false) {
+	return WithCaptionNotificationText(
+		Ui::Text::WithEntities(attachType),
+		caption,
+		hasMiniImages);
 }
 
 [[nodiscard]] QImage PreparePreviewImage(
@@ -170,8 +189,19 @@ struct AlbumCounts {
 }
 
 template <typename MediaType>
-[[nodiscard]] uint64 CountCacheKey(not_null<MediaType*> data, bool spoiler) {
-	return (reinterpret_cast<uint64>(data.get()) & ~1) | (spoiler ? 1 : 0);
+[[nodiscard]] uint64 CountCacheKey(
+		not_null<MediaType*> data,
+		ImageRoundRadius radius,
+		bool spoiler) {
+	return (reinterpret_cast<uint64>(data.get()) & ~3)
+		| ((radius == ImageRoundRadius::Ellipse) ? 2 : 0)
+		| (spoiler ? 1 : 0);
+}
+
+[[nodiscard]] uint64 SimpleCacheKey(ImageRoundRadius radius, bool spoiler) {
+	return uint64()
+		| ((radius == ImageRoundRadius::Ellipse) ? 2 : 0)
+		| (spoiler ? 1 : 0);
 }
 
 [[nodiscard]] ItemPreviewImage PreparePhotoPreviewImage(
@@ -180,7 +210,7 @@ template <typename MediaType>
 		ImageRoundRadius radius,
 		bool spoiler) {
 	const auto photo = media->owner();
-	const auto counted = CountCacheKey(photo, spoiler);
+	const auto counted = CountCacheKey(photo, radius, spoiler);
 	if (const auto small = media->image(PhotoSize::Small)) {
 		return { PreparePreviewImage(small, radius, spoiler), counted };
 	} else if (const auto thumbnail = media->image(PhotoSize::Thumbnail)) {
@@ -190,15 +220,15 @@ template <typename MediaType>
 	}
 	const auto allowedToDownload = media->autoLoadThumbnailAllowed(
 		item->history()->peer);
-	const auto spoilered = uint64(spoiler ? 1 : 0);
-	const auto cacheKey = allowedToDownload ? spoilered : counted;
+	const auto simple = SimpleCacheKey(radius, spoiler);
+	const auto cacheKey = allowedToDownload ? simple : counted;
 	if (allowedToDownload) {
 		media->owner()->load(PhotoSize::Small, item->fullId());
 	}
 	if (const auto blurred = media->thumbnailInline()) {
 		return { PreparePreviewImage(blurred, radius, spoiler), cacheKey };
 	}
-	return { QImage(), allowedToDownload ? spoilered : cacheKey };
+	return { QImage(), allowedToDownload ? simple : cacheKey };
 }
 
 [[nodiscard]] ItemPreviewImage PrepareFilePreviewImage(
@@ -209,19 +239,19 @@ template <typename MediaType>
 	Expects(media->owner()->hasThumbnail());
 
 	const auto document = media->owner();
-	const auto readyCacheKey = CountCacheKey(document, spoiler);
 	if (const auto thumbnail = media->thumbnail()) {
+		const auto readyCacheKey = CountCacheKey(document, radius, spoiler);
 		return {
 			PreparePreviewImage(thumbnail, radius, spoiler),
 			readyCacheKey,
 		};
 	}
 	document->loadThumbnail(item->fullId());
-	const auto spoilered = uint64(spoiler ? 1 : 0);
+	const auto simple = SimpleCacheKey(radius, spoiler);
 	if (const auto blurred = media->thumbnailInline()) {
-		return { PreparePreviewImage(blurred, radius, spoiler), spoilered };
+		return { PreparePreviewImage(blurred, radius, spoiler), simple };
 	}
-	return { QImage(), spoilered };
+	return { QImage(), simple };
 }
 
 [[nodiscard]] QImage PutPlayIcon(QImage preview) {
@@ -243,7 +273,8 @@ template <typename MediaType>
 		bool spoiler) {
 	auto result = PreparePhotoPreviewImage(item, media, radius, spoiler);
 	if (!result.data.isNull()
-		&& media->owner()->extendedMediaVideoDuration().has_value()) {
+		&& (media->owner()->extendedMediaVideoDuration().has_value()
+			|| (item->media() && item->media()->videoCover()))) {
 		result.data = PutPlayIcon(std::move(result.data));
 	}
 	return result;
@@ -273,13 +304,14 @@ template <typename MediaType>
 [[nodiscard]] ItemPreviewImage FindCachedPreview(
 		const std::vector<ItemPreviewImage> *existing,
 		not_null<MediaType*> data,
+		ImageRoundRadius radius,
 		bool spoiler) {
 	if (!existing) {
 		return {};
 	}
 	const auto i = ranges::find(
 		*existing,
-		CountCacheKey(data, spoiler),
+		CountCacheKey(data, radius, spoiler),
 		&ItemPreviewImage::cacheKey);
 	return (i != end(*existing)) ? *i : ItemPreviewImage();
 }
@@ -442,29 +474,57 @@ Invoice ComputeInvoiceData(
 	return result;
 }
 
-Call ComputeCallData(const MTPDmessageActionPhoneCall &call) {
+Call ComputeCallData(
+		not_null<Session*> owner,
+		const MTPDmessageActionPhoneCall &call) {
 	auto result = Call();
-	result.finishReason = [&] {
+	result.state = [&] {
 		if (const auto reason = call.vreason()) {
-			switch (reason->type()) {
-			case mtpc_phoneCallDiscardReasonBusy:
-				return CallFinishReason::Busy;
-			case mtpc_phoneCallDiscardReasonDisconnect:
-				return CallFinishReason::Disconnected;
-			case mtpc_phoneCallDiscardReasonHangup:
-				return CallFinishReason::Hangup;
-			case mtpc_phoneCallDiscardReasonMissed:
-				return CallFinishReason::Missed;
-			}
+			return reason->match([](const MTPDphoneCallDiscardReasonBusy &) {
+				return CallState::Busy;
+			}, [](const MTPDphoneCallDiscardReasonDisconnect &) {
+				return CallState::Disconnected;
+			}, [](const MTPDphoneCallDiscardReasonHangup &) {
+				return CallState::Hangup;
+			}, [](const MTPDphoneCallDiscardReasonMissed &) {
+				return CallState::Missed;
+			}, [](const MTPDphoneCallDiscardReasonMigrateConferenceCall &) {
+				return CallState::MigrateConferenceCall;
+			});
 			Unexpected("Call reason type.");
 		}
-		return CallFinishReason::Hangup;
+		return CallState::Hangup;
 	}();
 	result.duration = call.vduration().value_or_empty();
 	result.video = call.is_video();
 	return result;
 }
 
+Call ComputeCallData(
+		not_null<Session*> owner,
+		const MTPDmessageActionConferenceCall &call) {
+	auto participants = std::vector<not_null<PeerData*>>();
+	if (const auto list = call.vother_participants()) {
+		participants.reserve(list->v.size());
+		for (const auto &participant : list->v) {
+			participants.push_back(owner->peer(peerFromMTP(participant)));
+		}
+	}
+	return {
+		.otherParticipants = std::move(participants),
+		.conferenceId = call.vcall_id().v,
+		.duration = call.vduration().value_or_empty(),
+		.state = (call.vduration().value_or_empty()
+			? CallState::Hangup
+			: call.is_missed()
+			? CallState::Missed
+			: call.is_active()
+			? CallState::Active
+			: CallState::Invitation),
+		.video = call.is_video(),
+	};
+}
+
 GiveawayStart ComputeGiveawayStartData(
 		not_null<HistoryItem*> item,
 		const MTPDmessageMediaGiveaway &data) {
@@ -551,6 +611,18 @@ DocumentData *Media::document() const {
 	return nullptr;
 }
 
+PhotoData *Media::videoCover() const {
+	return nullptr;
+}
+
+TimeId Media::videoTimestamp() const {
+	return 0;
+}
+
+bool Media::hasQualitiesList() const {
+	return false;
+}
+
 PhotoData *Media::photo() const {
 	return nullptr;
 }
@@ -591,6 +663,10 @@ PollData *Media::poll() const {
 	return nullptr;
 }
 
+TodoListData *Media::todolist() const {
+	return nullptr;
+}
+
 const WallPaper *Media::paper() const {
 	return nullptr;
 }
@@ -607,6 +683,10 @@ bool Media::storyExpired(bool revalidate) {
 	return false;
 }
 
+bool Media::storyUnsupported() const {
+	return false;
+}
+
 bool Media::storyMention() const {
 	return false;
 }
@@ -619,6 +699,10 @@ const GiveawayResults *Media::giveawayResults() const {
 	return nullptr;
 }
 
+DiceGameOutcome Media::diceGameOutcome() const {
+	return {};
+}
+
 bool Media::uploading() const {
 	return false;
 }
@@ -842,13 +926,17 @@ ItemPreview MediaPhoto::toPreview(ToPreviewOptions options) const {
 	}
 	auto images = std::vector<ItemPreviewImage>();
 	auto context = std::any();
-	if (auto found = FindCachedPreview(options.existing, _photo, _spoiler)) {
+	const auto radius = _chat
+		? ImageRoundRadius::Ellipse
+		: ImageRoundRadius::Small;
+	if (auto found = FindCachedPreview(
+			options.existing,
+			_photo,
+			radius,
+			_spoiler)) {
 		images.push_back(std::move(found));
 	} else {
 		const auto media = _photo->createMediaView();
-		const auto radius = _chat
-			? ImageRoundRadius::Ellipse
-			: ImageRoundRadius::Small;
 		if (auto prepared = PreparePhotoPreview(
 				parent(),
 				media,
@@ -864,9 +952,9 @@ ItemPreview MediaPhoto::toPreview(ToPreviewOptions options) const {
 	const auto type = tr::lng_in_dlg_photo(tr::now);
 	const auto caption = (options.hideCaption || options.ignoreMessageText)
 		? TextWithEntities()
-		: options.translated
-		? parent()->translatedText()
-		: parent()->originalText();
+		: Dialogs::Ui::DialogsPreviewText(options.translated
+			? parent()->translatedText()
+			: parent()->originalText());
 	const auto hasMiniImages = !images.empty();
 	return {
 		.text = WithCaptionNotificationText(type, caption, hasMiniImages),
@@ -963,15 +1051,16 @@ std::unique_ptr<HistoryView::Media> MediaPhoto::createView(
 MediaFile::MediaFile(
 	not_null<HistoryItem*> parent,
 	not_null<DocumentData*> document,
-	bool skipPremiumEffect,
-	bool spoiler,
-	crl::time ttlSeconds)
+	Args &&args)
 : Media(parent)
 , _document(document)
+, _videoCover(args.videoCover)
+, _ttlSeconds(args.ttlSeconds)
 , _emoji(document->sticker() ? document->sticker()->alt : QString())
-, _skipPremiumEffect(skipPremiumEffect)
-, _spoiler(spoiler)
-, _ttlSeconds(ttlSeconds) {
+, _videoTimestamp(args.videoTimestamp)
+, _skipPremiumEffect(args.skipPremiumEffect)
+, _hasQualitiesList(args.hasQualitiesList)
+, _spoiler(args.spoiler) {
 	parent->history()->owner().registerDocumentItem(_document, parent);
 
 	if (!_emoji.isEmpty()) {
@@ -995,18 +1084,32 @@ MediaFile::~MediaFile() {
 }
 
 std::unique_ptr<Media> MediaFile::clone(not_null<HistoryItem*> parent) {
-	return std::make_unique<MediaFile>(
-		parent,
-		_document,
-		!_document->session().premium(),
-		_spoiler,
-		_ttlSeconds);
+	return std::make_unique<MediaFile>(parent, _document, MediaFile::Args{
+		.ttlSeconds = _ttlSeconds,
+		.videoCover = _videoCover,
+		.videoTimestamp = _videoTimestamp,
+		.hasQualitiesList = _hasQualitiesList,
+		.skipPremiumEffect = !_document->session().premium(),
+		.spoiler = _spoiler,
+	});
 }
 
 DocumentData *MediaFile::document() const {
 	return _document;
 }
 
+PhotoData *MediaFile::videoCover() const {
+	return _videoCover;
+}
+
+TimeId MediaFile::videoTimestamp() const {
+	return _videoTimestamp;
+}
+
+bool MediaFile::hasQualitiesList() const {
+	return _hasQualitiesList;
+}
+
 bool MediaFile::uploading() const {
 	return _document->uploading();
 }
@@ -1066,24 +1169,51 @@ ItemPreview MediaFile::toPreview(ToPreviewOptions options) const {
 			return toGroupPreview(group->items, options);
 		}
 	}
-	if (const auto sticker = _document->sticker()) {
+	if (_document->sticker()) {
 		return Media::toPreview(options);
 	}
 	auto images = std::vector<ItemPreviewImage>();
 	auto context = std::any();
 	const auto existing = options.existing;
-	if (auto found = FindCachedPreview(existing, _document, _spoiler)) {
+	const auto spoilered = _spoiler
+		|| (_document->isVideoMessage() && ttlSeconds());
+	const auto radius = _document->isVideoMessage()
+		? ImageRoundRadius::Ellipse
+		: ImageRoundRadius::Small;
+	if (_videoCover) {
+		if (auto found = FindCachedPreview(
+				existing,
+				not_null{ _videoCover },
+				radius,
+				spoilered)) {
+			images.push_back(std::move(found));
+		} else {
+			const auto media = _videoCover->createMediaView();
+			if (auto prepared = PreparePhotoPreview(
+					parent(),
+					media,
+					radius,
+					_spoiler)
+				; prepared || !prepared.cacheKey) {
+				images.push_back(std::move(prepared));
+				if (!prepared.cacheKey) {
+					context = media;
+				}
+			}
+		}
+	} else if (auto found = FindCachedPreview(
+			existing,
+			_document,
+			radius,
+			spoilered)) {
 		images.push_back(std::move(found));
 	} else if (TryFilePreview(_document)) {
 		const auto media = _document->createMediaView();
-		const auto radius = _document->isVideoMessage()
-			? ImageRoundRadius::Ellipse
-			: ImageRoundRadius::Small;
 		if (auto prepared = PrepareFilePreview(
 				parent(),
 				media,
 				radius,
-				_spoiler)
+				spoilered)
 			; prepared || !prepared.cacheKey) {
 			images.push_back(std::move(prepared));
 			if (!prepared.cacheKey) {
@@ -1091,33 +1221,41 @@ ItemPreview MediaFile::toPreview(ToPreviewOptions options) const {
 			}
 		}
 	}
-	const auto type = [&] {
+	const auto type = [&]() -> TextWithEntities {
 		using namespace Ui::Text;
 		if (_document->isVideoMessage()) {
-			return (item->media() && item->media()->ttlSeconds())
+			return WithEntities((item->media() && item->media()->ttlSeconds())
 				? tr::lng_in_dlg_video_message_ttl(tr::now)
-				: tr::lng_in_dlg_video_message(tr::now);
+				: tr::lng_in_dlg_video_message(tr::now));
 		} else if (_document->isAnimation()) {
-			return u"GIF"_q;
+			return WithEntities(u"GIF"_q);
 		} else if (_document->isVideoFile()) {
-			return tr::lng_in_dlg_video(tr::now);
+			return WithEntities(tr::lng_in_dlg_video(tr::now));
 		} else if (_document->isVoiceMessage()) {
-			return (item->media() && item->media()->ttlSeconds())
-				? tr::lng_in_dlg_voice_message_ttl(tr::now)
-				: tr::lng_in_dlg_audio(tr::now);
+			if (item->media() && item->media()->ttlSeconds()) {
+				return WithEntities(
+					tr::lng_in_dlg_voice_message_ttl(tr::now));
+			} else if (item->isUnreadMedia()) {
+				return tr::lng_in_dlg_audio_unread(
+					tr::now,
+					lt_emoji,
+					IconEmoji(&st::dialogsUnreadMediaDotEmoji),
+					tr::rich);
+			}
+			return WithEntities(tr::lng_in_dlg_audio(tr::now));
 		} else if (const auto name = FormatSongNameFor(_document).string();
 				!name.isEmpty()) {
-			return name;
+			return WithEntities(name);
 		} else if (_document->isAudioFile()) {
-			return tr::lng_in_dlg_audio_file(tr::now);
+			return WithEntities(tr::lng_in_dlg_audio_file(tr::now));
 		}
-		return tr::lng_in_dlg_file(tr::now);
+		return WithEntities(tr::lng_in_dlg_file(tr::now));
 	}();
 	const auto caption = (options.hideCaption || options.ignoreMessageText)
 		? TextWithEntities()
-		: options.translated
-		? parent()->translatedText()
-		: parent()->originalText();
+		: Dialogs::Ui::DialogsPreviewText(options.translated
+			? parent()->translatedText()
+			: parent()->originalText());
 	const auto hasMiniImages = !images.empty();
 	return {
 		.text = WithCaptionNotificationText(type, caption, hasMiniImages),
@@ -1127,7 +1265,7 @@ ItemPreview MediaFile::toPreview(ToPreviewOptions options) const {
 }
 
 TextWithEntities MediaFile::notificationText() const {
-	if (const auto sticker = _document->sticker()) {
+	if (_document->sticker()) {
 		const auto text = _emoji.isEmpty()
 			? tr::lng_in_dlg_sticker(tr::now)
 			: tr::lng_in_dlg_sticker_emoji(tr::now, lt_emoji, _emoji);
@@ -1159,7 +1297,7 @@ TextWithEntities MediaFile::notificationText() const {
 }
 
 QString MediaFile::pinnedTextSubstring() const {
-	if (const auto sticker = _document->sticker()) {
+	if (_document->sticker()) {
 		if (!_emoji.isEmpty()) {
 			return tr::lng_action_pinned_media_emoji_sticker(
 				tr::now,
@@ -1224,7 +1362,7 @@ bool MediaFile::forwardedBecomesUnread() const {
 }
 
 bool MediaFile::dropForwardedInfo() const {
-	return _document->isSong();
+	return false;
 }
 
 bool MediaFile::hasSpoiler() const {
@@ -1273,7 +1411,11 @@ bool MediaFile::updateSentMedia(const MTPMessageMedia &media) {
 			"or with ttl_seconds in updateSentMedia()"));
 		return false;
 	}
-	parent()->history()->owner().documentConvert(_document, *content);
+	const auto owner = &parent()->history()->owner();
+	owner->documentConvert(_document, *content);
+	if (const auto cover = _videoCover ? data.vvideo_cover() : nullptr) {
+		owner->photoConvert(_videoCover, *cover);
+	}
 	return true;
 }
 
@@ -1615,11 +1757,28 @@ std::unique_ptr<HistoryView::Media> MediaLocation::createView(
 MediaCall::MediaCall(not_null<HistoryItem*> parent, const Call &call)
 : Media(parent)
 , _call(call) {
-	parent->history()->owner().registerCallItem(parent);
+	const auto peer = parent->history()->peer;
+	peer->owner().registerCallItem(parent);
+	if (const auto user = _call.conferenceId ? peer->asUser() : nullptr) {
+		Core::App().calls().registerConferenceInvite(
+			_call.conferenceId,
+			user,
+			parent->id,
+			!parent->out());
+	}
 }
 
 MediaCall::~MediaCall() {
-	parent()->history()->owner().unregisterCallItem(parent());
+	const auto parent = this->parent();
+	const auto peer = parent->history()->peer;
+	peer->owner().unregisterCallItem(parent);
+	if (const auto user = _call.conferenceId ? peer->asUser() : nullptr) {
+		Core::App().calls().unregisterConferenceInvite(
+			_call.conferenceId,
+			user,
+			parent->id,
+			!parent->out());
+	}
 }
 
 std::unique_ptr<Media> MediaCall::clone(not_null<HistoryItem*> parent) {
@@ -1631,7 +1790,8 @@ const Call *MediaCall::call() const {
 }
 
 TextWithEntities MediaCall::notificationText() const {
-	auto result = Text(parent(), _call.finishReason, _call.video);
+	const auto conference = (_call.conferenceId != 0);
+	auto result = Text(parent(), _call.state, conference, _call.video);
 	if (_call.duration > 0) {
 		result = tr::lng_call_type_and_duration(
 			tr::now,
@@ -1672,26 +1832,39 @@ std::unique_ptr<HistoryView::Media> MediaCall::createView(
 
 QString MediaCall::Text(
 		not_null<HistoryItem*> item,
-		CallFinishReason reason,
+		CallState state,
+		bool conference,
 		bool video) {
-	if (item->out()) {
-		return ((reason == CallFinishReason::Missed)
-			? (video
+	if (state == CallState::Invitation) {
+		return tr::lng_call_invitation(tr::now);
+	} else if (state == CallState::Active) {
+		return tr::lng_call_ongoing(tr::now);
+	} else if (item->out()) {
+		return ((state == CallState::Missed)
+			? (conference
+				? tr::lng_call_group_declined
+				: video
 				? tr::lng_call_video_cancelled
 				: tr::lng_call_cancelled)
-			: (video
+			: (conference
+				? tr::lng_call_group_outgoing
+				: video
 				? tr::lng_call_video_outgoing
 				: tr::lng_call_outgoing))(tr::now);
-	} else if (reason == CallFinishReason::Missed) {
-		return (video
+	} else if (state == CallState::Missed) {
+		return (conference
+			? tr::lng_call_group_missed
+			: video
 			? tr::lng_call_video_missed
 			: tr::lng_call_missed)(tr::now);
-	} else if (reason == CallFinishReason::Busy) {
+	} else if (state == CallState::Busy) {
 		return (video
 			? tr::lng_call_video_declined
 			: tr::lng_call_declined)(tr::now);
 	}
-	return (video
+	return (conference
+		? tr::lng_call_group_incoming
+		: video
 		? tr::lng_call_video_incoming
 		: tr::lng_call_incoming)(tr::now);
 }
@@ -1776,13 +1949,17 @@ ItemPreview MediaWebPage::toPreview(ToPreviewOptions options) const {
 		|| _page->type == WebPageType::Video
 		|| _page->type == WebPageType::Document;
 	if (pageTypeWithPreview || !_page->collage.items.empty()) {
-		if (auto found = FindCachedPreview(options.existing, _page, false)) {
+		const auto radius = ImageRoundRadius::Small;
+		if (auto found = FindCachedPreview(
+				options.existing,
+				_page,
+				radius,
+				false)) {
 			return { .text = caption, .images = { std::move(found) } };
 		}
 		auto context = std::any();
 		auto images = std::vector<ItemPreviewImage>();
 		auto prepared = ItemPreviewImage();
-		const auto radius = ImageRoundRadius::Small;
 		if (const auto photo = MediaWebPage::photo()) {
 			const auto media = photo->createMediaView();
 			prepared = PreparePhotoPreview(parent(), media, radius, false);
@@ -1845,6 +2022,10 @@ std::unique_ptr<HistoryView::Media> MediaWebPage::createView(
 		not_null<HistoryView::Element*> message,
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing) {
+	if (realParent->hideLinks()) {
+		realParent->setHasHiddenLinks(true);
+		return nullptr;
+	}
 	return std::make_unique<HistoryView::WebPage>(message, _page, _flags);
 }
 
@@ -2030,10 +2211,18 @@ ItemPreview MediaInvoice::toPreview(ToPreviewOptions options) const {
 		if (!photo && !document) {
 			continue;
 		} else if (images.size() < kMaxPreviewImages) {
-			auto found = photo
-				? FindCachedPreview(existing, not_null(photo), spoiler)
-				: FindCachedPreview(existing, not_null(document), spoiler);
 			const auto radius = ImageRoundRadius::Small;
+			auto found = photo
+				? FindCachedPreview(
+					existing,
+					not_null(photo),
+					radius,
+					spoiler)
+				: FindCachedPreview(
+					existing,
+					not_null(document),
+					radius,
+					spoiler);
 			if (found) {
 				images.push_back(std::move(found));
 			} else if (photo) {
@@ -2073,12 +2262,11 @@ ItemPreview MediaInvoice::toPreview(ToPreviewOptions options) const {
 	const auto type = ComputeAlbumCountsString(counts);
 	const auto caption = (options.hideCaption || options.ignoreMessageText)
 		? TextWithEntities()
-		: options.translated
-		? parent()->translatedText()
-		: parent()->originalText();
+		: Dialogs::Ui::DialogsPreviewText(options.translated
+			? parent()->translatedText()
+			: parent()->originalText());
 	const auto hasMiniImages = !images.empty();
-	auto nice = Ui::Text::Colorized(
-		Ui::CreditsEmojiSmall(&parent()->history()->session()));
+	auto nice = Ui::Text::Colorized(Ui::CreditsEmojiSmall());
 	nice.append(WithCaptionNotificationText(type, caption, hasMiniImages));
 	return {
 		.text = std::move(nice),
@@ -2141,13 +2329,34 @@ MediaPoll::~MediaPoll() {
 }
 
 std::unique_ptr<Media> MediaPoll::clone(not_null<HistoryItem*> parent) {
-	return std::make_unique<MediaPoll>(parent, _poll);
+	auto result = std::make_unique<MediaPoll>(parent, _poll);
+	result->_consumedText = _consumedText;
+	return result;
 }
 
 PollData *MediaPoll::poll() const {
 	return _poll;
 }
 
+Storage::SharedMediaTypesMask MediaPoll::sharedMediaTypes() const {
+	return Storage::SharedMediaTypesMask{}
+		.added(Storage::SharedMediaType::Poll);
+}
+
+ItemPreview MediaPoll::toPreview(ToPreviewOptions options) const {
+	const auto caption = (options.hideCaption || options.ignoreMessageText)
+		? TextWithEntities()
+		: Dialogs::Ui::DialogsPreviewText(options.translated
+			? parent()->translatedText()
+			: parent()->originalText());
+	const auto type = Ui::Text::IconEmoji(
+		&st::dialogsMiniPollIcon
+	).append(_poll->question.text);
+	return {
+		.text = WithCaptionNotificationText(type, caption),
+	};
+}
+
 TextWithEntities MediaPoll::notificationText() const {
 	return TextWithEntities()
 		.append(QChar(0xD83D))
@@ -2162,6 +2371,9 @@ QString MediaPoll::pinnedTextSubstring() const {
 
 TextForMimeData MediaPoll::clipboardText() const {
 	auto result = TextWithEntities();
+	if (!_consumedText.text.isEmpty()) {
+		result.append(_consumedText).append(u"\n"_q);
+	}
 	result
 		.append(u"[ "_q)
 		.append(tr::lng_in_dlg_poll(tr::now))
@@ -2174,29 +2386,117 @@ TextForMimeData MediaPoll::clipboardText() const {
 	return TextForMimeData::Rich(std::move(result));
 }
 
+bool MediaPoll::consumeMessageText(const TextWithEntities &text) {
+	_consumedText = text;
+	return true;
+}
+
+TextWithEntities MediaPoll::consumedMessageText() const {
+	return _consumedText;
+}
+
 bool MediaPoll::updateInlineResultMedia(const MTPMessageMedia &media) {
 	return false;
 }
 
 bool MediaPoll::updateSentMedia(const MTPMessageMedia &media) {
-	return false;
+	return media.match([&](const MTPDmessageMediaPoll &data) {
+		parent()->history()->owner().processPoll(data);
+		return true;
+	}, [](const auto &) {
+		return false;
+	});
 }
 
 std::unique_ptr<HistoryView::Media> MediaPoll::createView(
 		not_null<HistoryView::Element*> message,
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing) {
-	return std::make_unique<HistoryView::Poll>(message, _poll);
+	return std::make_unique<HistoryView::Poll>(message, _poll, _consumedText);
+}
+
+MediaTodoList::MediaTodoList(
+	not_null<HistoryItem*> parent,
+	not_null<TodoListData*> todolist)
+: Media(parent)
+, _todolist(todolist) {
+}
+
+MediaTodoList::~MediaTodoList() {
+}
+
+std::unique_ptr<Media> MediaTodoList::clone(not_null<HistoryItem*> parent) {
+	const auto id = parent->fullId();
+	return std::make_unique<MediaTodoList>(
+		parent,
+		parent->history()->owner().duplicateTodoList(id, _todolist));
+}
+
+TodoListData *MediaTodoList::todolist() const {
+	return _todolist;
+}
+
+TextWithEntities MediaTodoList::notificationText() const {
+	return TextWithEntities()
+		.append(QChar(0x2705))
+		.append(QChar(' '))
+		.append(Ui::Text::Colorized(_todolist->title));
+}
+
+QString MediaTodoList::pinnedTextSubstring() const {
+	return QChar(171) + _todolist->title.text + QChar(187);
+}
+
+TextForMimeData MediaTodoList::clipboardText() const {
+	auto result = TextWithEntities();
+	result
+		.append(u"[ "_q)
+		.append(tr::lng_in_dlg_todo_list(tr::now))
+		.append(u" : "_q)
+		.append(_todolist->title)
+		.append(u" ]"_q);
+	for (const auto &item : _todolist->items) {
+		result.append(u"\n- "_q).append(item.text);
+	}
+	return TextForMimeData::Rich(std::move(result));
+}
+
+bool MediaTodoList::allowsEdit() const {
+	return parent()->out() || parent()->history()->peer->isSelf();
+}
+
+bool MediaTodoList::updateInlineResultMedia(const MTPMessageMedia &media) {
+	return false;
+}
+
+bool MediaTodoList::updateSentMedia(const MTPMessageMedia &media) {
+	return false;
+}
+
+std::unique_ptr<HistoryView::Media> MediaTodoList::createView(
+		not_null<HistoryView::Element*> message,
+		not_null<HistoryItem*> realParent,
+		HistoryView::Element *replacing) {
+	return std::make_unique<HistoryView::TodoList>(
+		message,
+		_todolist,
+		replacing);
 }
 
-MediaDice::MediaDice(not_null<HistoryItem*> parent, QString emoji, int value)
+MediaDice::MediaDice(
+	not_null<HistoryItem*> parent,
+	DiceGameOutcome outcome,
+	QString emoji,
+	int value)
 : Media(parent)
+, _outcome(outcome)
 , _emoji(emoji)
 , _value(value) {
+	parent->history()->session().credits().tonLoad();
 }
 
 std::unique_ptr<Media> MediaDice::clone(not_null<HistoryItem*> parent) {
-	return std::make_unique<MediaDice>(parent, _emoji, _value);
+	return std::make_unique<MediaDice>(parent, _outcome, _emoji, _value);
 }
 
 QString MediaDice::emoji() const {
@@ -2207,6 +2507,10 @@ int MediaDice::value() const {
 	return _value;
 }
 
+DiceGameOutcome MediaDice::diceGameOutcome() const {
+	return _outcome;
+}
+
 bool MediaDice::allowsRevoke(TimeId now) const {
 	const auto peer = parent()->history()->peer;
 	if (peer->isSelf() || !peer->isUser()) {
@@ -2239,8 +2543,22 @@ bool MediaDice::updateSentMedia(const MTPMessageMedia &media) {
 	if (media.type() != mtpc_messageMediaDice) {
 		return false;
 	}
-	_value = media.c_messageMediaDice().vvalue().v;
-	parent()->history()->owner().requestItemRepaint(parent());
+	const auto &data = media.c_messageMediaDice();
+	_value = data.vvalue().v;
+	if (const auto outcome = data.vgame_outcome()) {
+		const auto &data = outcome->data();
+		_outcome = Data::DiceGameOutcome{
+			.nanoTon = int64(data.vton_amount().v),
+			.stakeNanoTon = int64(data.vstake_ton_amount().v),
+			.seed = data.vseed().v,
+		};
+	} else {
+		_outcome = {};
+	}
+	if (parent()->out() && _outcome.stakeNanoTon > 0) {
+		parent()->history()->session().credits().tonLoad(true);
+	}
+	parent()->history()->owner().notifyItemDataChange(parent());
 	return true;
 }
 
@@ -2273,39 +2591,100 @@ ClickHandlerPtr MediaDice::MakeHandler(
 		}
 	};
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
-		auto config = Ui::Toast::Config{
-			.text = { tr::lng_about_random(tr::now, lt_emoji, emoji) },
-			.st = &st::historyDiceToast,
-			.duration = Ui::Toast::kDefaultDuration * 2,
-		};
-		if (CanSend(history->peer, ChatRestriction::SendOther)) {
-			auto link = Ui::Text::Link(tr::lng_about_random_send(tr::now));
-			link.entities.push_back(
-				EntityInText(EntityType::Semibold, 0, link.text.size()));
-			config.text.append(' ').append(std::move(link));
-			config.filter = crl::guard(&history->session(), [=](
-					const ClickHandlerPtr &handler,
-					Qt::MouseButton button) {
-				if (button == Qt::LeftButton && !ShownToast.empty()) {
-					auto message = Api::MessageToSend(
-						Api::SendAction(history));
-					message.action.clearDraft = false;
-					message.textWithTags.text = emoji;
-
-					Api::SendDice(message);
-					HideExisting();
-				}
-				return false;
-			});
-		}
-
-		HideExisting();
+		const auto found = Ui::Emoji::Find(emoji);
+		const auto id = found ? found->id() : QString();
+		const auto game = (id == QString::fromUtf8("\xf0\x9f\x8e\xb2"));
 		const auto my = context.other.value<ClickHandlerContext>();
 		const auto weak = my.sessionWindow;
-		if (const auto strong = weak.get()) {
-			ShownToast = strong->showToast(std::move(config));
+		const auto sendWith = [=](const QByteArray &hash, int64 nanoTon) {
+			auto message = Api::MessageToSend(
+				Api::SendAction(history));
+			message.textWithTags.text = emoji;
+
+			auto &action = message.action;
+			action.clearDraft = false;
+
+			auto &options = action.options;
+			options.stakeNanoTon = nanoTon;
+			options.stakeSeedHash = hash;
+
+			Api::SendDice(message);
+
+			HideExisting();
+		};
+		const auto sendAllowed = CanSend(
+			history->peer,
+			ChatRestriction::SendOther);
+		const auto showToast = [=](Ui::Toast::Config &&config) {
+			HideExisting();
+			if (const auto strong = weak.get()) {
+				ShownToast = strong->showToast(std::move(config));
+			} else {
+				ShownToast = Ui::Toast::Show(std::move(config));
+			}
+		};
+		const auto showSimple = [=] {
+			auto config = Ui::Toast::Config{
+				.text = { tr::lng_about_random(tr::now, lt_emoji, emoji) },
+				.st = &st::historyDiceToast,
+				.duration = Ui::Toast::kDefaultDuration * 2,
+			};
+			if (sendAllowed) {
+				auto link = tr::link(tr::lng_about_random_send(tr::now));
+				link.entities.push_back(
+					EntityInText(EntityType::Semibold, 0, link.text.size()));
+				config.text.append(' ').append(std::move(link));
+				config.filter = crl::guard(&history->session(), [=](
+						const ClickHandlerPtr &handler,
+						Qt::MouseButton button) {
+					if (button == Qt::LeftButton && !ShownToast.empty()) {
+						sendWith(QByteArray(), 0);
+					}
+					return false;
+				});
+			}
+			showToast(std::move(config));
+		};
+		if (!game || !sendAllowed) {
+			showSimple();
 		} else {
-			ShownToast = Ui::Toast::Show(std::move(config));
+			const auto pack = &history->session().diceStickersPacks();
+			pack->resolveGameOptions([=](
+					const Data::DiceGameOptions &options) {
+				const auto window = weak.get();
+				const auto seedHash = options.seedHash;
+				const auto sendWithStake = [=](int64 stakeNanoTon) {
+					if (stakeNanoTon > 0 && window) {
+						const auto session = &window->session();
+						const auto credits = &session->credits();
+						const auto required = CreditsAmount(
+							stakeNanoTon / Ui::kNanosInOne,
+							stakeNanoTon % Ui::kNanosInOne,
+							CreditsType::Ton);
+						if (credits->tonLoaded()
+							&& credits->tonBalance() < required) {
+							HideExisting();
+							window->uiShow()->show(Box(
+								Ui::InsufficientTonBox,
+								session,
+								required));
+							return;
+						}
+					}
+					sendWith(seedHash, stakeNanoTon);
+				};
+				if (!options || !window) {
+					showSimple();
+				} else {
+					showToast(Ui::MakeEmojiGameStakeToast(window->uiShow(), {
+						.session = &window->session(),
+						.currentStake = options.previousSteakNanoTon,
+						.milliRewards = options.milliRewards,
+						.jackpotMilliReward = options.jackpotMilliReward,
+						.submit = sendWithStake,
+					}));
+				}
+			});
 		}
 	});
 }
@@ -2314,7 +2693,7 @@ MediaGiftBox::MediaGiftBox(
 	not_null<HistoryItem*> parent,
 	not_null<PeerData*> from,
 	GiftType type,
-	int count)
+	int64 count)
 : MediaGiftBox(parent, from, GiftCode{ .count = count, .type = type }) {
 }
 
@@ -2363,6 +2742,35 @@ std::unique_ptr<HistoryView::Media> MediaGiftBox::createView(
 		not_null<HistoryView::Element*> message,
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing) {
+	if (_data.type == GiftType::BirthdaySuggest) {
+		return std::make_unique<HistoryView::MediaGeneric>(
+			message,
+			HistoryView::GenerateSuggetsBirthdayMedia(
+				message,
+				replacing,
+				Data::Birthday::FromSerialized(_data.count)),
+			HistoryView::MediaGenericDescriptor{
+				.maxWidth = st::birthdaySuggestStickerWidth,
+				.service = true,
+				.hideServiceText = true,
+			});
+	} else if (_data.type == GiftType::ChatTheme
+		|| _data.type == GiftType::GiftOffer) {
+		return std::make_unique<HistoryView::ServiceBox>(
+			message,
+			std::make_unique<HistoryView::GiftServiceBox>(message, this));
+	} else if (const auto &unique = _data.unique) {
+		return std::make_unique<HistoryView::MediaGeneric>(
+			message,
+			HistoryView::GenerateUniqueGiftMedia(message, replacing, unique),
+			HistoryView::MediaGenericDescriptor{
+				.maxWidth = st::msgServiceGiftBoxSize.width(),
+				.paintBgFactory = [=] {
+					return HistoryView::UniqueGiftBg(message, unique);
+				},
+				.service = true,
+			});
+	}
 	return std::make_unique<HistoryView::ServiceBox>(
 		message,
 		std::make_unique<HistoryView::PremiumGift>(message, this));
@@ -2436,7 +2844,9 @@ MediaStory::MediaStory(
 	if (!maybeStory && maybeStory.error() == NoStory::Unknown) {
 		stories->resolve(storyId, crl::guard(this, [=] {
 			if (const auto maybeStory = stories->lookup(storyId)) {
-				if (!_mention && _viewMayExist) {
+				if ((*maybeStory)->unsupported() || (*maybeStory)->call()) {
+					_unsupported = true;
+				} else if (!_mention && _viewMayExist) {
 					parent->setText((*maybeStory)->caption());
 				}
 			} else {
@@ -2469,6 +2879,9 @@ bool MediaStory::storyExpired(bool revalidate) {
 	if (revalidate) {
 		const auto stories = &parent()->history()->owner().stories();
 		if (const auto maybeStory = stories->lookup(_storyId)) {
+			if ((*maybeStory)->unsupported() || (*maybeStory)->call()) {
+				_unsupported = true;
+			}
 			_expired = false;
 		} else if (maybeStory.error() == Data::NoStory::Deleted) {
 			_expired = true;
@@ -2477,6 +2890,10 @@ bool MediaStory::storyExpired(bool revalidate) {
 	return _expired;
 }
 
+bool MediaStory::storyUnsupported() const {
+	return _unsupported;
+}
+
 bool MediaStory::storyMention() const {
 	return _mention;
 }
@@ -2553,7 +2970,10 @@ std::unique_ptr<HistoryView::Media> MediaStory::createView(
 	_expired = false;
 	_viewMayExist = true;
 	const auto story = *maybeStory;
-	if (_mention) {
+	if (story->unsupported() || story->call()) {
+		_unsupported = true;
+		return nullptr;
+	} else if (_mention) {
 		return std::make_unique<HistoryView::ServiceBox>(
 			message,
 			std::make_unique<HistoryView::StoryMention>(message, story));
@@ -2565,13 +2985,14 @@ std::unique_ptr<HistoryView::Media> MediaStory::createView(
 				realParent,
 				photo,
 				spoiler);
-		} else {
+		} else if (const auto document = story->document()) {
 			return std::make_unique<HistoryView::Gif>(
 				message,
 				realParent,
-				story->document(),
+				document,
 				spoiler);
 		}
+		return nullptr;
 	}
 }
 
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index e1213e39a3873a..ded7677a9c02a5 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -39,12 +39,16 @@ namespace Data {
 class CloudImage;
 class WallPaper;
 class Session;
+struct UniqueGift;
 
-enum class CallFinishReason : char {
+enum class CallState : char {
 	Missed,
 	Busy,
 	Disconnected,
 	Hangup,
+	MigrateConferenceCall,
+	Invitation,
+	Active,
 };
 
 struct SharedContact final {
@@ -76,10 +80,12 @@ struct SharedContact final {
 };
 
 struct Call {
-	using FinishReason = CallFinishReason;
+	using State = CallState;
 
+	std::vector<not_null<PeerData*>> otherParticipants;
+	CallId conferenceId = 0;
 	int duration = 0;
-	FinishReason finishReason = FinishReason::Missed;
+	State state = State::Missed;
 	bool video = false;
 
 };
@@ -127,28 +133,77 @@ struct GiveawayResults {
 	bool all = false;
 };
 
+struct DiceGameOptions {
+	QByteArray seedHash;
+	int64 previousSteakNanoTon = 0;
+	std::array<int, 6> milliRewards;
+	int jackpotMilliReward = 0;
+	int currentStreak = 0;
+	int playsLeft = 0;
+
+	explicit operator bool() const {
+		return !seedHash.isEmpty();
+	}
+};
+
+struct DiceGameOutcome {
+	int64 nanoTon = 0;
+	int64 stakeNanoTon = 0;
+	QByteArray seed;
+
+	explicit operator bool() const {
+		return stakeNanoTon != 0;
+	}
+};
+
 enum class GiftType : uchar {
-	Premium, // count - months
+	Premium, // count - days
 	Credits, // count - credits
+	Ton, // count - nano tons
 	StarGift, // count - stars
+	ChatTheme,
+	BirthdaySuggest,
+	GiftOffer,
 };
 
 struct GiftCode {
 	QString slug;
+	uint64 stargiftId = 0;
 	DocumentData *document = nullptr;
+	PeerData *stargiftReleasedBy = nullptr;
+	std::shared_ptr<UniqueGift> unique;
 	TextWithEntities message;
+	PeerData *auctionTo = nullptr;
 	ChannelData *channel = nullptr;
+	PeerData *channelFrom = nullptr;
+	uint64 channelSavedId = 0;
+	QString giftPrepayUpgradeHash;
+	QString giftTitle;
 	MsgId giveawayMsgId = 0;
-	int convertStars = 0;
+	MsgId realGiftMsgId = 0;
+	int starsConverted = 0;
+	int starsToUpgrade = 0;
+	int starsUpgradedBySender = 0;
+	int starsForDetailsRemove = 0;
+	int starsBid = 0;
+	int giftNum = 0;
 	int limitedCount = 0;
 	int limitedLeft = 0;
-	int count = 0;
+	int64 count = 0;
 	GiftType type = GiftType::Premium;
 	bool viaGiveaway : 1 = false;
+	bool transferred : 1 = false;
+	bool upgradeSeparate : 1 = false;
+	bool upgradeGifted : 1 = false;
+	bool upgradable : 1 = false;
 	bool unclaimed : 1 = false;
 	bool anonymous : 1 = false;
 	bool converted : 1 = false;
+	bool upgraded : 1 = false;
+	bool refunded : 1 = false;
+	bool upgrade : 1 = false;
 	bool saved : 1 = false;
+	bool craft : 1 = false;
 };
 
 class Media {
@@ -165,6 +220,9 @@ class Media {
 	virtual std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) = 0;
 
 	virtual DocumentData *document() const;
+	virtual PhotoData *videoCover() const;
+	virtual TimeId videoTimestamp() const;
+	virtual bool hasQualitiesList() const;
 	virtual PhotoData *photo() const;
 	virtual WebPageData *webpage() const;
 	virtual MediaWebPageFlags webpageFlags() const;
@@ -175,13 +233,16 @@ class Media {
 	virtual const GiftCode *gift() const;
 	virtual CloudImage *location() const;
 	virtual PollData *poll() const;
+	virtual TodoListData *todolist() const;
 	virtual const WallPaper *paper() const;
 	virtual bool paperForBoth() const;
 	virtual FullStoryId storyId() const;
 	virtual bool storyExpired(bool revalidate = false);
+	virtual bool storyUnsupported() const;
 	virtual bool storyMention() const;
 	virtual const GiveawayStart *giveawayStart() const;
 	virtual const GiveawayResults *giveawayResults() const;
+	virtual DiceGameOutcome diceGameOutcome() const;
 
 	virtual bool uploading() const;
 	virtual Storage::SharedMediaTypesMask sharedMediaTypes() const;
@@ -283,17 +344,27 @@ class MediaPhoto final : public Media {
 
 class MediaFile final : public Media {
 public:
+	struct Args {
+		crl::time ttlSeconds = 0;
+		PhotoData *videoCover = nullptr;
+		TimeId videoTimestamp = 0;
+		bool hasQualitiesList = false;
+		bool skipPremiumEffect = false;
+		bool spoiler = false;
+	};
+
 	MediaFile(
 		not_null<HistoryItem*> parent,
 		not_null<DocumentData*> document,
-		bool skipPremiumEffect,
-		bool spoiler,
-		crl::time ttlSeconds);
+		Args &&args);
 	~MediaFile();
 
 	std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) override;
 
 	DocumentData *document() const override;
+	PhotoData *videoCover() const override;
+	TimeId videoTimestamp() const override;
+	bool hasQualitiesList() const override;
 
 	bool uploading() const override;
 	Storage::SharedMediaTypesMask sharedMediaTypes() const override;
@@ -322,13 +393,17 @@ class MediaFile final : public Media {
 
 private:
 	not_null<DocumentData*> _document;
-	QString _emoji;
-	bool _skipPremiumEffect = false;
-	bool _spoiler = false;
+	PhotoData *_videoCover = nullptr;
 
 	// Video (unsupported) / Voice / Round.
 	crl::time _ttlSeconds = 0;
 
+	QString _emoji;
+	TimeId _videoTimestamp = 0;
+	bool _skipPremiumEffect = false;
+	bool _hasQualitiesList = false;
+	bool _spoiler = false;
+
 };
 
 class MediaContact final : public Media {
@@ -431,9 +506,10 @@ class MediaCall final : public Media {
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing = nullptr) override;
 
-	static QString Text(
+	[[nodiscard]] static QString Text(
 		not_null<HistoryItem*> item,
-		CallFinishReason reason,
+		CallState state,
+		bool conference,
 		bool video);
 
 private:
@@ -557,10 +633,14 @@ class MediaPoll final : public Media {
 	std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) override;
 
 	PollData *poll() const override;
+	Storage::SharedMediaTypesMask sharedMediaTypes() const override;
 
+	ItemPreview toPreview(ToPreviewOptions options) const override;
 	TextWithEntities notificationText() const override;
 	QString pinnedTextSubstring() const override;
 	TextForMimeData clipboardText() const override;
+	bool consumeMessageText(const TextWithEntities &text) override;
+	TextWithEntities consumedMessageText() const override;
 
 	bool updateInlineResultMedia(const MTPMessageMedia &media) override;
 	bool updateSentMedia(const MTPMessageMedia &media) override;
@@ -571,12 +651,45 @@ class MediaPoll final : public Media {
 
 private:
 	not_null<PollData*> _poll;
+	TextWithEntities _consumedText;
+
+};
+
+class MediaTodoList final : public Media {
+public:
+	MediaTodoList(
+		not_null<HistoryItem*> parent,
+		not_null<TodoListData*> todolist);
+	~MediaTodoList();
+
+	std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) override;
+
+	TodoListData *todolist() const override;
+
+	TextWithEntities notificationText() const override;
+	QString pinnedTextSubstring() const override;
+	TextForMimeData clipboardText() const override;
+	bool allowsEdit() const override;
+
+	bool updateInlineResultMedia(const MTPMessageMedia &media) override;
+	bool updateSentMedia(const MTPMessageMedia &media) override;
+	std::unique_ptr<HistoryView::Media> createView(
+		not_null<HistoryView::Element*> message,
+		not_null<HistoryItem*> realParent,
+		HistoryView::Element *replacing = nullptr) override;
+
+private:
+	not_null<TodoListData*> _todolist;
 
 };
 
 class MediaDice final : public Media {
 public:
-	MediaDice(not_null<HistoryItem*> parent, QString emoji, int value);
+	MediaDice(
+		not_null<HistoryItem*> parent,
+		DiceGameOutcome outcome,
+		QString emoji,
+		int value);
 
 	std::unique_ptr<Media> clone(not_null<HistoryItem*> parent) override;
 
@@ -588,6 +701,7 @@ class MediaDice final : public Media {
 	QString pinnedTextSubstring() const override;
 	TextForMimeData clipboardText() const override;
 	bool forceForwardedInfo() const override;
+	DiceGameOutcome diceGameOutcome() const override;
 
 	bool updateInlineResultMedia(const MTPMessageMedia &media) override;
 	bool updateSentMedia(const MTPMessageMedia &media) override;
@@ -602,6 +716,7 @@ class MediaDice final : public Media {
 		const QString &emoji);
 
 private:
+	DiceGameOutcome _outcome;
 	QString _emoji;
 	int _value = 0;
 
@@ -613,7 +728,7 @@ class MediaGiftBox final : public Media {
 		not_null<HistoryItem*> parent,
 		not_null<PeerData*> from,
 		GiftType type,
-		int count);
+		int64 count);
 	MediaGiftBox(
 		not_null<HistoryItem*> parent,
 		not_null<PeerData*> from,
@@ -683,6 +798,7 @@ class MediaStory final : public Media, public base::has_weak_ptr {
 
 	FullStoryId storyId() const override;
 	bool storyExpired(bool revalidate = false) override;
+	bool storyUnsupported() const override;
 	bool storyMention() const override;
 
 	TextWithEntities notificationText() const override;
@@ -704,6 +820,7 @@ class MediaStory final : public Media, public base::has_weak_ptr {
 	const FullStoryId _storyId;
 	const bool _mention = false;
 	bool _viewMayExist = false;
+	bool _unsupported = false;
 	bool _expired = false;
 
 };
@@ -767,7 +884,12 @@ class MediaGiveawayResults final : public Media {
 	not_null<HistoryItem*> item,
 	const MTPDmessageMediaPaidMedia &data);
 
-[[nodiscard]] Call ComputeCallData(const MTPDmessageActionPhoneCall &call);
+[[nodiscard]] Call ComputeCallData(
+	not_null<Session*> owner,
+	const MTPDmessageActionPhoneCall &call);
+[[nodiscard]] Call ComputeCallData(
+	not_null<Session*> owner,
+	const MTPDmessageActionConferenceCall &call);
 
 [[nodiscard]] GiveawayStart ComputeGiveawayStartData(
 	not_null<HistoryItem*> item,
diff --git a/Telegram/SourceFiles/data/data_message_reaction_id.cpp b/Telegram/SourceFiles/data/data_message_reaction_id.cpp
index 1deac2bbb86d56..b4a34a7d306c42 100644
--- a/Telegram/SourceFiles/data/data_message_reaction_id.cpp
+++ b/Telegram/SourceFiles/data/data_message_reaction_id.cpp
@@ -40,6 +40,25 @@ std::vector<ReactionId> SearchTagsFromQuery(
 	return result;
 }
 
+HashtagWithUsername HashtagWithUsernameFromQuery(QStringView query) {
+	const auto match = TextUtilities::RegExpHashtag(true).match(query);
+	if (match.hasMatch()) {
+		const auto username = match.capturedView(2).mid(1).toString();
+		const auto offset = int(match.capturedLength(1));
+		const auto full = int(query.size());
+		const auto length = full
+			- int(username.size())
+			- 1
+			- offset
+			- int(match.capturedLength(3));
+		if (!username.isEmpty() && length > 0 && offset + length <= full) {
+			const auto hashtag = query.mid(offset, length).toString();
+			return { hashtag, username };
+		}
+	}
+	return {};
+}
+
 QString ReactionEntityData(const ReactionId &id) {
 	if (id.empty()) {
 		return {};
diff --git a/Telegram/SourceFiles/data/data_message_reaction_id.h b/Telegram/SourceFiles/data/data_message_reaction_id.h
index c624ef865cbde4..5480179d48afa5 100644
--- a/Telegram/SourceFiles/data/data_message_reaction_id.h
+++ b/Telegram/SourceFiles/data/data_message_reaction_id.h
@@ -7,8 +7,20 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/basic_types.h"
 #include "base/qt/qt_compare.h"
 
+#include <variant>
+
+namespace tl {
+template <typename bare>
+class boxed;
+} // namespace tl
+
+class MTPreaction;
+using MTPReaction = tl::boxed<MTPreaction>;
+using DocumentId = uint64;
+
 namespace Data {
 
 struct ReactionId {
@@ -65,6 +77,13 @@ struct MessageReaction {
 [[nodiscard]] std::vector<ReactionId> SearchTagsFromQuery(
 	const QString &query);
 
+struct HashtagWithUsername {
+	QString hashtag;
+	QString username;
+};
+[[nodiscard]] HashtagWithUsername HashtagWithUsernameFromQuery(
+	QStringView query);
+
 [[nodiscard]] QString ReactionEntityData(const ReactionId &id);
 
 [[nodiscard]] ReactionId ReactionFromMTP(const MTPReaction &reaction);
diff --git a/Telegram/SourceFiles/data/data_message_reactions.cpp b/Telegram/SourceFiles/data/data_message_reactions.cpp
index d360ccf65a6d5e..117a5a3abc7c40 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.cpp
+++ b/Telegram/SourceFiles/data/data_message_reactions.cpp
@@ -8,6 +8,8 @@ For license and copyright information please follow this link:
 #include "data/data_message_reactions.h"
 
 #include "api/api_global_privacy.h"
+#include "calls/group/calls_group_call.h"
+#include "calls/group/calls_group_messages.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "core/application.h"
 #include "history/history.h"
@@ -17,6 +19,7 @@ For license and copyright information please follow this link:
 #include "main/main_app_config.h"
 #include "main/session/send_as_peers.h"
 #include "data/components/credits.h"
+#include "data/data_channel.h"
 #include "data/data_user.h"
 #include "data/data_session.h"
 #include "data/data_histories.h"
@@ -153,8 +156,23 @@ constexpr auto kPaidAccumulatePeriod = 5 * crl::time(1000) + 500;
 	return (i != end(top)) && i->my;
 }
 
-[[nodiscard]] std::optional<bool> MaybeAnonymous(uint32 privacySet, uint32 anonymous) {
-	return privacySet ? (anonymous == 1) : std::optional<bool>();
+[[nodiscard]] std::optional<PeerId> MaybeShownPeer(
+		uint32 privacySet,
+		PeerId shownPeer) {
+	return privacySet ? shownPeer : std::optional<PeerId>();
+}
+
+[[nodiscard]] MTPPaidReactionPrivacy PaidReactionShownPeerToTL(
+		not_null<Main::Session*> session,
+		std::optional<PeerId> shownPeer) {
+	return !shownPeer
+		? MTPPaidReactionPrivacy()
+		: !*shownPeer
+		? MTP_paidReactionPrivacyAnonymous()
+		: (*shownPeer == session->userPeerId())
+		? MTP_paidReactionPrivacyDefault()
+		: MTP_paidReactionPrivacyPeer(
+			session->data().peer(*shownPeer)->input());
 }
 
 } // namespace
@@ -175,6 +193,13 @@ PossibleItemReactionsRef LookupPossibleReactions(
 		}
 	}
 	const auto session = &peer->session();
+	if (const auto channel = peer->asChannel()) {
+		if ((!channel->amCreator())
+			&& (channel->adminRights() & ChatAdminRight::Anonymous)
+			&& (session->sendAsPeers().resolveChosen(channel) == channel)) {
+			return {};
+		}
+	}
 	const auto reactions = &session->data().reactions();
 	const auto &full = reactions->list(Reactions::Type::Active);
 	const auto &top = reactions->list(Reactions::Type::Top);
@@ -231,7 +256,7 @@ PossibleItemReactionsRef LookupPossibleReactions(
 			}
 		}
 		if (allowed.paidEnabled
-			&& !added.contains(Data::ReactionId::Paid())) {
+			&& !added.contains(ReactionId::Paid())) {
 			result.recent.push_back(reactions->lookupPaid());
 		}
 	} else {
@@ -277,7 +302,7 @@ PossibleItemReactionsRef LookupPossibleReactions(
 		}
 	}
 	if (!item->reactionsAreTags()) {
-		const auto toFront = [&](Data::ReactionId id) {
+		const auto toFront = [&](ReactionId id) {
 			const auto i = ranges::find(result.recent, id, &Reaction::id);
 			if (i != end(result.recent) && i != begin(result.recent)) {
 				std::rotate(begin(result.recent), i, i + 1);
@@ -285,12 +310,40 @@ PossibleItemReactionsRef LookupPossibleReactions(
 		};
 		toFront(reactions->favoriteId());
 		if (paidInFront) {
-			toFront(Data::ReactionId::Paid());
+			toFront(ReactionId::Paid());
 		}
 	}
 	return result;
 }
 
+[[nodiscard]] PossibleItemReactionsRef LookupPossibleReactions(
+		not_null<Main::Session*> session) {
+	auto result = PossibleItemReactionsRef();
+	const auto reactions = &session->data().reactions();
+	const auto &full = reactions->list(Reactions::Type::Active);
+	const auto &top = reactions->list(Reactions::Type::Top);
+	const auto &recent = reactions->list(Reactions::Type::Recent);
+	const auto premiumPossible = session->premiumPossible();
+	auto added = base::flat_set<ReactionId>();
+	result.recent.reserve(full.size());
+	for (const auto &reaction : ranges::views::concat(top, recent, full)) {
+		if (premiumPossible || !reaction.id.custom()) {
+			if (added.emplace(reaction.id).second) {
+				result.recent.push_back(&reaction);
+			}
+		}
+	}
+	result.customAllowed = premiumPossible;
+	const auto i = ranges::find(
+		result.recent,
+		reactions->favoriteId(),
+		&Reaction::id);
+	if (i != end(result.recent) && i != begin(result.recent)) {
+		std::rotate(begin(result.recent), i, i + 1);
+	}
+	return result;
+}
+
 PossibleItemReactions::PossibleItemReactions(
 	const PossibleItemReactionsRef &other)
 : recent(other.recent | ranges::views::transform([](const auto &value) {
@@ -314,14 +367,14 @@ Reactions::Reactions(not_null<Session*> owner)
 
 	base::timer_each(
 		kRefreshFullListEach
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshDefault();
 		requestEffects();
 	}, _lifetime);
 
 	_owner->session().changes().messageUpdates(
 		MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const MessageUpdate &update) {
+	) | rpl::on_next([=](const MessageUpdate &update) {
 		const auto item = update.item;
 		_pollingItems.remove(item);
 		_pollItems.remove(item);
@@ -348,7 +401,7 @@ Reactions::Reactions(not_null<Session*> owner)
 				: ReactionId{ config.reactionDefaultEmoji };
 		}) | rpl::filter([=](const ReactionId &id) {
 			return !_saveFaveRequestId;
-		}) | rpl::start_with_next([=](ReactionId &&id) {
+		}) | rpl::on_next([=](ReactionId &&id) {
 			applyFavorite(id);
 		}, _lifetime);
 	});
@@ -551,8 +604,8 @@ DocumentData *Reactions::chooseGenericAnimation(
 	const auto i = sticker
 		? ranges::find(
 			_available,
-			::Data::ReactionId{ { sticker->alt } },
-			&::Data::Reaction::id)
+			ReactionId{ { sticker->alt } },
+			&Reaction::id)
 		: end(_available);
 	if (i != end(_available) && i->aroundAnimation) {
 		const auto view = i->aroundAnimation->createMediaView();
@@ -862,7 +915,7 @@ void Reactions::loadImage(
 		setAnimatedIcon(set);
 	} else if (!_imagesLoadLifetime) {
 		document->session().downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			downloadTaskFinished();
 		}, _imagesLoadLifetime);
 	}
@@ -1005,7 +1058,7 @@ void Reactions::requestMyTags(SavedSublist *sublist) {
 	using Flag = MTPmessages_GetSavedReactionTags::Flag;
 	my.requestId = api.request(MTPmessages_GetSavedReactionTags(
 		MTP_flags(sublist ? Flag::f_peer : Flag()),
-		(sublist ? sublist->peer()->input : MTP_inputPeerEmpty()),
+		(sublist ? sublist->sublistPeer()->input() : MTP_inputPeerEmpty()),
 		MTP_long(my.hash)
 	)).done([=](const MTPmessages_SavedReactionTags &result) {
 		auto &my = _myTags[sublist];
@@ -1225,6 +1278,9 @@ not_null<CustomEmojiManager::Listener*> Reactions::resolveListener() {
 }
 
 void Reactions::customEmojiResolveDone(not_null<DocumentData*> document) {
+	if (!document->sticker()) {
+		return;
+	}
 	const auto id = ReactionId{ { document->id } };
 	const auto favorite = (_unresolvedFavoriteId == id);
 	const auto i = _unresolvedTop.find(id);
@@ -1448,7 +1504,7 @@ void Reactions::send(not_null<HistoryItem*> item, bool addToRecent) {
 		| (addToRecent ? Flag::f_add_to_recent : Flag(0));
 	i->second = api.request(MTPmessages_SendReaction(
 		MTP_flags(flags),
-		item->history()->peer->input,
+		item->history()->peer->input(),
 		MTP_int(id.msg),
 		MTP_vector<MTPReaction>(chosen | ranges::views::filter([](
 				const ReactionId &id) {
@@ -1607,6 +1663,24 @@ crl::time Reactions::sendingScheduledPaidAt(
 	return (i != end(_sendPaidItems)) ? i->second : crl::time();
 }
 
+void Reactions::schedulePaid(not_null<Calls::GroupCall*> call) {
+	_sendPaidCalls[call] = crl::now() + kPaidAccumulatePeriod;
+	if (!_sendPaidTimer.isActive()) {
+		_sendPaidTimer.callOnce(kPaidAccumulatePeriod);
+	}
+}
+
+void Reactions::undoScheduledPaid(not_null<Calls::GroupCall*> call) {
+	_sendPaidCalls.remove(call);
+	call->messages()->reactionsPaidScheduledCancel();
+}
+
+crl::time Reactions::sendingScheduledPaidAt(
+		not_null<Calls::GroupCall*> call) const {
+	const auto i = _sendPaidCalls.find(call);
+	return (i != end(_sendPaidCalls)) ? i->second : crl::time();
+}
+
 crl::time Reactions::ScheduledPaidDelay() {
 	return kPaidAccumulatePeriod;
 }
@@ -1654,7 +1728,7 @@ void Reactions::pollCollected() {
 			}
 		};
 		_pollRequestId = api.request(MTPmessages_GetMessagesReactions(
-			peer->input,
+			peer->input(),
 			MTP_vector<MTPint>(ids)
 		)).done([=](const MTPUpdates &result) {
 			_owner->session().api().applyUpdates(result);
@@ -1700,13 +1774,27 @@ void Reactions::CheckUnknownForUnread(
 }
 
 void Reactions::sendPaid() {
-	if (!_sendingPaid.empty()) {
-		return;
-	}
 	auto next = crl::time();
 	const auto now = crl::now();
-	for (auto i = begin(_sendPaidItems); i != end(_sendPaidItems);) {
-		const auto item = i->first;
+	if (_sendingPaid.empty()) {
+		for (auto i = begin(_sendPaidItems); i != end(_sendPaidItems);) {
+			const auto item = i->first;
+			const auto when = i->second;
+			if (when > now) {
+				if (!next || next > when) {
+					next = when;
+				}
+				++i;
+			} else {
+				i = _sendPaidItems.erase(i);
+				if (sendPaid(item)) {
+					return;
+				}
+			}
+		}
+	}
+	for (auto i = begin(_sendPaidCalls); i != end(_sendPaidCalls);) {
+		const auto call = i->first;
 		const auto when = i->second;
 		if (when > now) {
 			if (!next || next > when) {
@@ -1714,10 +1802,8 @@ void Reactions::sendPaid() {
 			}
 			++i;
 		} else {
-			i = _sendPaidItems.erase(i);
-			if (sendPaid(item)) {
-				return;
-			}
+			i = _sendPaidCalls.erase(i);
+			call->messages()->reactionsPaidSend();
 		}
 	}
 	if (next) {
@@ -1739,16 +1825,16 @@ void Reactions::sendPaidPrivacyRequest(
 		not_null<HistoryItem*> item,
 		PaidReactionSend send) {
 	Expects(!_sendingPaid.contains(item));
-	Expects(send.anonymous.has_value());
+	Expects(send.shownPeer.has_value());
 	Expects(!send.count);
 
 	const auto id = item->fullId();
 	auto &api = _owner->session().api();
 	const auto requestId = api.request(
 		MTPmessages_TogglePaidReactionPrivacy(
-			item->history()->peer->input,
+			item->history()->peer->input(),
 			MTP_int(id.msg),
-			MTP_bool(*send.anonymous))
+			PaidReactionShownPeerToTL(&_owner->session(), send.shownPeer))
 	).done([=] {
 		if (const auto item = _owner->message(id)) {
 			if (_sendingPaid.remove(item)) {
@@ -1782,12 +1868,14 @@ void Reactions::sendPaidRequest(
 	auto &api = _owner->session().api();
 	using Flag = MTPmessages_SendPaidReaction::Flag;
 	const auto requestId = api.request(MTPmessages_SendPaidReaction(
-		MTP_flags(send.anonymous ? Flag::f_private : Flag()),
-		item->history()->peer->input,
+		MTP_flags(send.shownPeer ? Flag::f_private : Flag()),
+		item->history()->peer->input(),
 		MTP_int(id.msg),
 		MTP_int(send.count),
 		MTP_long(randomId),
-		MTP_bool(send.anonymous.value_or(false))
+		(!send.shownPeer
+			? MTPPaidReactionPrivacy()
+			: PaidReactionShownPeerToTL(&_owner->session(), *send.shownPeer))
 	)).done([=](const MTPUpdates &result) {
 		if (const auto item = _owner->message(id)) {
 			if (_sendingPaid.remove(item)) {
@@ -1838,9 +1926,9 @@ MessageReactions::~MessageReactions() {
 			finishPaidSending({
 				.count = int(paid->sending),
 				.valid = true,
-				.anonymous = MaybeAnonymous(
+				.shownPeer = MaybeShownPeer(
 					paid->sendingPrivacySet,
-					paid->sendingAnonymous),
+					paid->sendingShownPeer),
 			}, false);
 		}
 	}
@@ -1956,6 +2044,71 @@ void MessageReactions::remove(const ReactionId &id) {
 	owner.notifyItemDataChange(_item);
 }
 
+bool MessageReactions::removeFromParticipant(
+		not_null<PeerData*> participant,
+		const ReactionId &knownReaction) {
+	auto changed = false;
+	auto participantFound = false;
+	const auto decrementReactionCount = [&](const ReactionId &id, int count) {
+		const auto i = ranges::find(_list, id, &MessageReaction::id);
+		if (i == end(_list)) {
+			return false;
+		}
+		if (i->count <= count) {
+			_list.erase(i);
+		} else {
+			i->count -= count;
+		}
+		return true;
+	};
+	for (auto i = begin(_recent); i != end(_recent);) {
+		auto &list = i->second;
+		const auto was = int(list.size());
+		list.erase(
+			ranges::remove(list, participant, &RecentReaction::peer),
+			end(list));
+		if (const auto removed = was - int(list.size())) {
+			changed = true;
+			participantFound = true;
+			decrementReactionCount(i->first, removed);
+		}
+		if (list.empty()) {
+			i = _recent.erase(i);
+		} else {
+			++i;
+		}
+	}
+	if (_paid) {
+		auto removedCount = 0;
+		auto removedEntries = 0;
+		_paid->top.erase(
+			ranges::remove_if(_paid->top, [&](const TopPaid &entry) {
+				if (entry.peer != participant.get()) {
+					return false;
+				}
+				removedCount += int(entry.count);
+				++removedEntries;
+				return true;
+			}),
+			end(_paid->top));
+		if (removedEntries) {
+			changed = true;
+			const auto paid = ReactionId::Paid();
+			participantFound = true;
+			decrementReactionCount(paid, removedCount);
+			if (_paid->top.empty() && !localPaidData()) {
+				_paid = nullptr;
+			}
+		}
+	}
+	if (!knownReaction.empty()
+		&& !participantFound
+		&& decrementReactionCount(knownReaction, 1)) {
+		changed = true;
+	}
+	return changed;
+}
+
 bool MessageReactions::checkIfChanged(
 		const QVector<MTPReactionCount> &list,
 		const QVector<MTPMessagePeerReaction> &recent,
@@ -2204,7 +2357,7 @@ void MessageReactions::markRead() {
 
 void MessageReactions::scheduleSendPaid(
 		int count,
-		std::optional<bool> anonymous) {
+		std::optional<PeerId> shownPeer) {
 	Expects(count >= 0);
 
 	if (!_paid) {
@@ -2212,12 +2365,12 @@ void MessageReactions::scheduleSendPaid(
 	}
 	_paid->scheduled += count;
 	_paid->scheduledFlag = 1;
-	if (anonymous.has_value()) {
-		_paid->scheduledAnonymous = anonymous.value_or(false) ? 1 : 0;
-		_paid->scheduledPrivacySet = anonymous.has_value();
+	if (shownPeer.has_value()) {
+		_paid->scheduledShownPeer = *shownPeer;
+		_paid->scheduledPrivacySet = true;
 	}
 	if (count > 0) {
-		_item->history()->session().credits().lock(count);
+		_item->history()->session().credits().lock(CreditsAmount(count));
 	}
 	_item->history()->owner().reactions().schedulePaid(_item);
 }
@@ -2230,11 +2383,12 @@ void MessageReactions::cancelScheduledPaid() {
 	if (_paid) {
 		if (_paid->scheduledFlag) {
 			if (const auto amount = int(_paid->scheduled)) {
-				_item->history()->session().credits().unlock(amount);
+				_item->history()->session().credits().unlock(
+					CreditsAmount(amount));
 			}
 			_paid->scheduled = 0;
 			_paid->scheduledFlag = 0;
-			_paid->scheduledAnonymous = 0;
+			_paid->scheduledShownPeer = 0;
 			_paid->scheduledPrivacySet = 0;
 		}
 		if (!_paid->sendingFlag && _paid->top.empty()) {
@@ -2249,18 +2403,18 @@ PaidReactionSend MessageReactions::startPaidSending() {
 	}
 	_paid->sending = _paid->scheduled;
 	_paid->sendingFlag = _paid->scheduledFlag;
-	_paid->sendingAnonymous = _paid->scheduledAnonymous;
+	_paid->sendingShownPeer = _paid->scheduledShownPeer;
 	_paid->sendingPrivacySet = _paid->scheduledPrivacySet;
 	_paid->scheduled = 0;
 	_paid->scheduledFlag = 0;
-	_paid->scheduledAnonymous = 0;
+	_paid->scheduledShownPeer = 0;
 	_paid->scheduledPrivacySet = 0;
 	return {
 		.count = int(_paid->sending),
 		.valid = true,
-		.anonymous = MaybeAnonymous(
+		.shownPeer = MaybeShownPeer(
 			_paid->sendingPrivacySet,
-			_paid->sendingAnonymous),
+			_paid->sendingShownPeer),
 	};
 }
 
@@ -2270,13 +2424,13 @@ void MessageReactions::finishPaidSending(
 	Expects(_paid != nullptr);
 	Expects(send.count == _paid->sending);
 	Expects(send.valid == (_paid->sendingFlag == 1));
-	Expects(send.anonymous == MaybeAnonymous(
+	Expects(send.shownPeer == MaybeShownPeer(
 		_paid->sendingPrivacySet,
-		_paid->sendingAnonymous));
+		_paid->sendingShownPeer));
 
 	_paid->sending = 0;
 	_paid->sendingFlag = 0;
-	_paid->sendingAnonymous = 0;
+	_paid->sendingShownPeer = 0;
 	_paid->sendingPrivacySet = 0;
 	if (!_paid->scheduledFlag && _paid->top.empty()) {
 		_paid = nullptr;
@@ -2285,17 +2439,17 @@ void MessageReactions::finishPaidSending(
 			return top.my;
 		});
 		if (i != end(_paid->top)) {
-			i->peer = send.anonymous
-				? nullptr
-				: _item->history()->session().user().get();
+			i->peer = send.shownPeer
+				? _item->history()->owner().peer(*send.shownPeer).get()
+				: nullptr;
 		}
 	}
 	if (const auto amount = send.count) {
 		const auto credits = &_item->history()->session().credits();
 		if (success) {
-			credits->withdrawLocked(amount);
+			credits->withdrawLocked(CreditsAmount(amount));
 		} else {
-			credits->unlock(amount);
+			credits->unlock(CreditsAmount(amount));
 		}
 	}
 }
@@ -2308,22 +2462,23 @@ int MessageReactions::localPaidCount() const {
 	return _paid ? (_paid->scheduled + _paid->sending) : 0;
 }
 
-bool MessageReactions::localPaidAnonymous() const {
-	const auto minePaidAnonymous = [&] {
+PeerId MessageReactions::localPaidShownPeer() const {
+	const auto minePaidShownPeer = [&] {
 		for (const auto &entry : _paid->top) {
 			if (entry.my) {
-				return !entry.peer;
+				return entry.peer ? entry.peer->id : PeerId();
 			}
 		}
 		const auto api = &_item->history()->session().api();
-		return api->globalPrivacy().paidReactionAnonymousCurrent();
+		return api->globalPrivacy().paidReactionShownPeerCurrent();
 	};
-	return _paid
-		&& ((_paid->scheduledFlag && _paid->scheduledPrivacySet)
-			? (_paid->scheduledAnonymous == 1)
-			: (_paid->sendingFlag && _paid->sendingPrivacySet)
-			? (_paid->sendingAnonymous == 1)
-			: minePaidAnonymous());
+	return !_paid
+		? PeerId()
+		: (_paid->scheduledFlag && _paid->scheduledPrivacySet)
+		? _paid->scheduledShownPeer
+		: (_paid->sendingFlag && _paid->sendingPrivacySet)
+		? _paid->sendingShownPeer
+		: minePaidShownPeer();
 }
 
 bool MessageReactions::clearCloudData() {
diff --git a/Telegram/SourceFiles/data/data_message_reactions.h b/Telegram/SourceFiles/data/data_message_reactions.h
index f1bf36f4641017..93cef12b087f2a 100644
--- a/Telegram/SourceFiles/data/data_message_reactions.h
+++ b/Telegram/SourceFiles/data/data_message_reactions.h
@@ -11,6 +11,10 @@ For license and copyright information please follow this link:
 #include "data/data_message_reaction_id.h"
 #include "data/stickers/data_custom_emoji.h"
 
+namespace Calls {
+class GroupCall;
+} // namespace Calls
+
 namespace Ui {
 class AnimatedIcon;
 } // namespace Ui
@@ -61,6 +65,8 @@ struct PossibleItemReactions {
 [[nodiscard]] PossibleItemReactionsRef LookupPossibleReactions(
 	not_null<HistoryItem*> item,
 	bool paidInFront = false);
+[[nodiscard]] PossibleItemReactionsRef LookupPossibleReactions(
+	not_null<Main::Session*> session);
 
 struct MyTagInfo {
 	ReactionId id;
@@ -71,7 +77,7 @@ struct MyTagInfo {
 struct PaidReactionSend {
 	int count = 0;
 	bool valid = false;
-	std::optional<bool> anonymous = false;
+	std::optional<PeerId> shownPeer = PeerId();
 };
 
 class Reactions final : private CustomEmojiManager::Listener {
@@ -152,10 +158,17 @@ class Reactions final : private CustomEmojiManager::Listener {
 		SavedSublist *sublist = nullptr);
 
 	[[nodiscard]] bool isQuitPrevent();
+
 	void schedulePaid(not_null<HistoryItem*> item);
 	void undoScheduledPaid(not_null<HistoryItem*> item);
 	[[nodiscard]] crl::time sendingScheduledPaidAt(
 		not_null<HistoryItem*> item) const;
+
+	void schedulePaid(not_null<Calls::GroupCall*> call);
+	void undoScheduledPaid(not_null<Calls::GroupCall*> call);
+	[[nodiscard]] crl::time sendingScheduledPaidAt(
+		not_null<Calls::GroupCall*> call) const;
+
 	[[nodiscard]] static crl::time ScheduledPaidDelay();
 
 	[[nodiscard]] static bool HasUnread(const MTPMessageReactions &data);
@@ -353,6 +366,8 @@ class Reactions final : private CustomEmojiManager::Listener {
 	base::flat_map<not_null<HistoryItem*>, mtpRequestId> _sendingPaid;
 	base::Timer _sendPaidTimer;
 
+	base::flat_map<not_null<Calls::GroupCall*>, crl::time> _sendPaidCalls;
+
 	mtpRequestId _saveFaveRequestId = 0;
 
 	rpl::lifetime _lifetime;
@@ -390,6 +405,9 @@ class MessageReactions final {
 
 	void add(const ReactionId &id, bool addToRecent);
 	void remove(const ReactionId &id);
+	bool removeFromParticipant(
+		not_null<PeerData*> participant,
+		const ReactionId &knownReaction);
 	bool change(
 		const QVector<MTPReactionCount> &list,
 		const QVector<MTPMessagePeerReaction> &recent,
@@ -409,7 +427,7 @@ class MessageReactions final {
 	[[nodiscard]] bool hasUnread() const;
 	void markRead();
 
-	void scheduleSendPaid(int count, std::optional<bool> anonymous);
+	void scheduleSendPaid(int count, std::optional<PeerId> shownPeer);
 	[[nodiscard]] int scheduledPaid() const;
 	void cancelScheduledPaid();
 
@@ -418,19 +436,19 @@ class MessageReactions final {
 
 	[[nodiscard]] bool localPaidData() const;
 	[[nodiscard]] int localPaidCount() const;
-	[[nodiscard]] bool localPaidAnonymous() const;
+	[[nodiscard]] PeerId localPaidShownPeer() const;
 	bool clearCloudData();
 
 private:
 	struct Paid {
 		std::vector<TopPaid> top;
-		uint32 scheduled: 29 = 0;
+		PeerId scheduledShownPeer = 0;
+		PeerId sendingShownPeer = 0;
+		uint32 scheduled: 30 = 0;
 		uint32 scheduledFlag : 1 = 0;
-		uint32 scheduledAnonymous : 1 = 0;
 		uint32 scheduledPrivacySet : 1 = 0;
-		uint32 sending : 29 = 0;
+		uint32 sending : 30 = 0;
 		uint32 sendingFlag : 1 = 0;
-		uint32 sendingAnonymous : 1 = 0;
 		uint32 sendingPrivacySet : 1 = 0;
 	};
 	const not_null<HistoryItem*> _item;
diff --git a/Telegram/SourceFiles/data/data_msg_id.h b/Telegram/SourceFiles/data/data_msg_id.h
index b3ecb27b0bea0f..acaf0438768b8b 100644
--- a/Telegram/SourceFiles/data/data_msg_id.h
+++ b/Telegram/SourceFiles/data/data_msg_id.h
@@ -8,9 +8,14 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "base/qt/qt_compare.h"
+#include "core/credits_amount.h"
 #include "data/data_peer_id.h"
 #include "ui/text/text_entity.h"
 
+#ifdef _DEBUG
+#include <QtCore/QDebug>
+#endif // _DEBUG
+
 struct MsgId {
 	constexpr MsgId() noexcept = default;
 	constexpr MsgId(int64 value) noexcept : bare(value) {
@@ -86,7 +91,9 @@ constexpr auto SpecialMsgIdShift = EndStoryMsgId.bare;
 constexpr auto ShowAtTheEndMsgId = MsgId(SpecialMsgIdShift + 1);
 constexpr auto SwitchAtTopMsgId = MsgId(SpecialMsgIdShift + 2);
 constexpr auto ShowAndStartBotMsgId = MsgId(SpecialMsgIdShift + 4);
+constexpr auto ShowAndMaybeStartBotMsgId = MsgId(SpecialMsgIdShift + 5);
 constexpr auto ShowForChooseMessagesMsgId = MsgId(SpecialMsgIdShift + 6);
+constexpr auto kSearchQueryOffsetHint = -1;
 
 static_assert(SpecialMsgIdShift + 0xFF < 0);
 static_assert(-(SpecialMsgIdShift + 0xFF) > ServerMaxMsgId);
@@ -105,7 +112,7 @@ static_assert(-(SpecialMsgIdShift + 0xFF) > ServerMaxMsgId);
 	return MsgId(StartClientMsgId.bare + index);
 }
 
-[[nodiscrd]] constexpr inline bool IsStoryMsgId(MsgId id) noexcept {
+[[nodiscard]] constexpr inline bool IsStoryMsgId(MsgId id) noexcept {
 	return (id >= StartStoryMsgId && id < EndStoryMsgId);
 }
 [[nodiscard]] constexpr inline StoryId StoryIdFromMsgId(MsgId id) noexcept {
@@ -156,25 +163,84 @@ struct FullMsgId {
 	MsgId msg = 0;
 };
 
+#ifdef _DEBUG
+inline QDebug operator<<(QDebug debug, const FullMsgId &fullMsgId) {
+	debug.nospace()
+		<< "FullMsgId(peer: "
+		<< fullMsgId.peer.value
+		<< ", msg: "
+		<< fullMsgId.msg.bare
+		<< ")";
+	return debug;
+}
+#endif // _DEBUG
+
 Q_DECLARE_METATYPE(FullMsgId);
 
+struct MessageHighlightId {
+	TextWithEntities quote;
+	int quoteOffset = 0;
+	int todoItemId = 0;
+	QByteArray pollOption;
+
+	[[nodiscard]] bool empty() const {
+		return quote.empty() && !todoItemId && pollOption.isEmpty();
+	}
+	[[nodiscard]] friend inline bool operator==(
+		const MessageHighlightId &a,
+		const MessageHighlightId &b) = default;
+};
+
 struct FullReplyTo {
 	FullMsgId messageId;
 	TextWithEntities quote;
 	FullStoryId storyId;
 	MsgId topicRootId = 0;
+	PeerId monoforumPeerId = 0;
 	int quoteOffset = 0;
+	int todoItemId = 0;
+	QByteArray pollOption;
 
-	[[nodiscard]] bool valid() const {
+	[[nodiscard]] MessageHighlightId highlight() const {
+		return { quote, quoteOffset, todoItemId, pollOption };
+	}
+	[[nodiscard]] bool replying() const {
 		return messageId || (storyId && storyId.peer);
 	}
 	explicit operator bool() const {
-		return valid();
+		return replying() || monoforumPeerId;
 	}
 	friend inline auto operator<=>(FullReplyTo, FullReplyTo) = default;
 	friend inline bool operator==(FullReplyTo, FullReplyTo) = default;
 };
 
+struct SuggestOptions {
+	uint32 exists : 1 = 0;
+	uint32 priceWhole : 31 = 0;
+	uint32 priceNano : 31 = 0;
+	uint32 ton : 1 = 0;
+	TimeId date = 0;
+	TimeId offerDuration = 0;
+
+	[[nodiscard]] CreditsAmount price() const {
+		return CreditsAmount(
+			priceWhole,
+			priceNano,
+			ton ? CreditsType::Ton : CreditsType::Stars);
+	}
+
+	explicit operator bool() const {
+		return exists != 0;
+	}
+
+	friend inline auto operator<=>(
+		SuggestOptions,
+		SuggestOptions) = default;
+	friend inline bool operator==(
+		SuggestOptions,
+		SuggestOptions) = default;
+};
+
 struct GlobalMsgId {
 	FullMsgId itemId;
 	uint64 sessionUniqueId = 0;
@@ -209,4 +275,13 @@ struct hash<FullStoryId> {
 	}
 };
 
+template <>
+struct hash<FullMsgId> {
+	size_t operator()(FullMsgId value) const {
+		return QtPrivate::QHashCombine().operator()(
+			std::hash<BareId>()(value.peer.value),
+			value.msg.bare);
+	}
+};
+
 } // namespace std
diff --git a/Telegram/SourceFiles/data/data_passkey_deserialize.cpp b/Telegram/SourceFiles/data/data_passkey_deserialize.cpp
new file mode 100644
index 00000000000000..61a4209a41241a
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_passkey_deserialize.cpp
@@ -0,0 +1,121 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+
+#include "data/data_passkey_deserialize.h"
+
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonArray>
+
+namespace Data::Passkey {
+namespace {
+
+[[nodiscard]] std::string SerializeClientData(
+		const QByteArray &challenge,
+		const QString &type) {
+	auto obj = QJsonObject();
+	obj["type"] = type;
+	obj["challenge"] = QString::fromUtf8(
+		challenge.toBase64(QByteArray::Base64UrlEncoding
+			| QByteArray::OmitTrailingEquals));
+	obj["origin"] = "https://telegram.org";
+	obj["crossOrigin"] = false;
+	return QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString();
+}
+
+} // namespace
+
+std::optional<RegisterData> DeserializeRegisterData(
+		const QByteArray &jsonData) {
+	auto doc = QJsonDocument::fromJson(jsonData);
+	if (!doc.isObject()) {
+		return std::nullopt;
+	}
+
+	auto root = doc.object();
+	auto publicKey = root["publicKey"].toObject();
+	if (publicKey.isEmpty()) {
+		return std::nullopt;
+	}
+
+	auto data = RegisterData();
+
+	auto rp = publicKey["rp"].toObject();
+	data.rp.id = rp["id"].toString();
+	data.rp.name = rp["name"].toString();
+
+	auto user = publicKey["user"].toObject();
+	data.user.id = QByteArray::fromBase64(
+		user["id"].toString().toUtf8());
+	data.user.name = user["name"].toString();
+	data.user.displayName = user["displayName"].toString();
+
+	data.challenge = QByteArray::fromBase64(
+		publicKey["challenge"].toString().toUtf8(),
+		QByteArray::Base64UrlEncoding);
+
+	auto params = publicKey["pubKeyCredParams"].toArray();
+	for (const auto &param : params) {
+		auto obj = param.toObject();
+		CredentialParameter cp;
+		cp.type = obj["type"].toString();
+		cp.alg = obj["alg"].toInt();
+		data.pubKeyCredParams.push_back(cp);
+	}
+
+	data.timeout = publicKey["timeout"].toInt(60000);
+
+	return data;
+}
+
+std::string SerializeClientDataCreate(const QByteArray &challenge) {
+	return SerializeClientData(challenge, "webauthn.create");
+}
+
+std::string SerializeClientDataGet(const QByteArray &challenge) {
+	return SerializeClientData(challenge, "webauthn.get");
+}
+
+std::optional<LoginData> DeserializeLoginData(
+		const QByteArray &jsonData) {
+	auto doc = QJsonDocument::fromJson(jsonData);
+	if (!doc.isObject()) {
+		return std::nullopt;
+	}
+
+	auto root = doc.object();
+	auto publicKey = root["publicKey"].toObject();
+	if (publicKey.isEmpty()) {
+		return std::nullopt;
+	}
+
+	auto data = LoginData();
+	data.challenge = QByteArray::fromBase64(
+		publicKey["challenge"].toString().toUtf8(),
+		QByteArray::Base64UrlEncoding);
+	data.rpId = publicKey["rpId"].toString();
+	data.timeout = publicKey["timeout"].toInt(60000);
+	data.userVerification = publicKey["userVerification"].toString();
+
+	if (publicKey.contains("allowCredentials")) {
+		auto allowList = publicKey["allowCredentials"].toArray();
+		for (const auto &cred : allowList) {
+			auto credObj = cred.toObject();
+			Credential credential;
+			credential.id = QByteArray::fromBase64(
+				credObj["id"].toString().toUtf8(),
+				QByteArray::Base64UrlEncoding);
+			credential.type = credObj["type"].toString();
+			data.allowCredentials.push_back(credential);
+		}
+	}
+
+	return data;
+}
+
+} // namespace Data::Passkey
diff --git a/Telegram/SourceFiles/data/data_passkey_deserialize.h b/Telegram/SourceFiles/data/data_passkey_deserialize.h
new file mode 100644
index 00000000000000..a1bdc8b703644b
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_passkey_deserialize.h
@@ -0,0 +1,62 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+
+#pragma once
+
+namespace Data::Passkey {
+
+struct RelyingParty {
+	QString id;
+	QString name;
+};
+
+struct User {
+	QByteArray id;
+	QString name;
+	QString displayName;
+};
+
+struct CredentialParameter {
+	QString type;
+	int alg = 0;
+};
+
+struct RegisterData {
+	RelyingParty rp;
+	User user;
+	QByteArray challenge;
+	std::vector<CredentialParameter> pubKeyCredParams;
+	int timeout = 60000;
+};
+
+struct Credential {
+	QByteArray id;
+	QString type;
+};
+
+struct LoginData {
+	QByteArray challenge;
+	QString rpId;
+	std::vector<Credential> allowCredentials;
+	QString userVerification;
+	int timeout = 60000;
+};
+
+[[nodiscard]] std::optional<RegisterData> DeserializeRegisterData(
+	const QByteArray &jsonData);
+
+[[nodiscard]] std::optional<LoginData> DeserializeLoginData(
+	const QByteArray &jsonData);
+
+[[nodiscard]] std::string SerializeClientDataCreate(
+	const QByteArray &challenge);
+
+[[nodiscard]] std::string SerializeClientDataGet(
+	const QByteArray &challenge);
+
+} // namespace Data::Passkey
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 3b3fdbedbefe78..ec10d0fdc8cccf 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -37,6 +37,7 @@ For license and copyright information please follow this link:
 #include "mtproto/mtproto_config.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
+#include "window/notifications_manager.h"
 #include "window/window_session_controller.h"
 #include "window/main_window.h" // Window::LogoNoMargin.
 #include "ui/image/image.h"
@@ -44,11 +45,13 @@ For license and copyright information please follow this link:
 #include "ui/empty_userpic.h"
 #include "ui/text/text_options.h"
 #include "ui/painter.h"
+#include "ui/unread_badge.h"
 #include "ui/ui_utility.h"
 #include "history/history.h"
 #include "history/view/history_view_element.h"
 #include "history/history_item.h"
 #include "storage/file_download.h"
+#include "storage/storage_account.h"
 #include "storage/storage_facade.h"
 #include "storage/storage_shared_media.h"
 
@@ -64,6 +67,28 @@ using UpdateFlag = Data::PeerUpdate::Flag;
 	return session->appConfig().ignoredRestrictionReasons();
 }
 
+[[nodiscard]] int ParseRegistrationDate(const QString &text) {
+	// MM.YYYY
+	if (text.size() != 7 || text[2] != '.') {
+		return 0;
+	}
+	const auto month = text.mid(0, 2).toInt();
+	const auto year = text.mid(3, 4).toInt();
+	return (year > 2012 && year < 2100 && month > 0 && month <= 12)
+		? (year * 100) + month
+		: 0;
+}
+
+[[nodiscard]] int RegistrationYear(int date) {
+	const auto year = date / 100;
+	return (year > 2012 && year < 2100) ? year : 0;
+}
+
+[[nodiscard]] int RegistrationMonth(int date) {
+	const auto month = date % 100;
+	return (month > 0 && month <= 12) ? month : 0;
+}
+
 } // namespace
 
 namespace Data {
@@ -222,6 +247,30 @@ UserData *UserFromInputMTP(
 	});
 }
 
+Ui::ColorCollectible ParseColorCollectible(
+		const MTPDpeerColorCollectible &data) {
+	return {
+		.collectibleId = data.vcollectible_id().v,
+		.giftEmojiId = data.vgift_emoji_id().v,
+		.backgroundEmojiId = data.vbackground_emoji_id().v,
+		.accentColor = Ui::ColorFromSerialized(data.vaccent_color()),
+		.strip = ranges::views::all(
+			data.vcolors().v
+		) | ranges::views::transform(
+			&Ui::ColorFromSerialized
+		) | ranges::to_vector,
+		.darkAccentColor = Ui::MaybeColorFromSerialized(
+			data.vdark_accent_color()).value_or(QColor(0, 0, 0, 0)),
+		.darkStrip = (data.vdark_colors()
+			? ranges::views::all(
+				data.vdark_colors()->v
+			) | ranges::views::transform(
+				&Ui::ColorFromSerialized
+			) | ranges::to_vector
+			: std::vector<QColor>()),
+	};
+}
+
 } // namespace Data
 
 PeerClickHandler::PeerClickHandler(not_null<PeerData*> peer)
@@ -340,6 +389,17 @@ void PeerData::invalidateEmptyUserpic() {
 	_userpicEmpty = nullptr;
 }
 
+void PeerData::checkTrustedPayForMessage() {
+	if (!_checkedTrustedPayForMessage
+		&& !starsPerMessage()
+		&& session().local().peerTrustedPayForMessageRead()) {
+		_checkedTrustedPayForMessage = 1;
+		if (session().local().hasPeerTrustedPayForMessageEntry(id)) {
+			session().local().clearPeerTrustedPayForMessage(id);
+		}
+	}
+}
+
 ClickHandlerPtr PeerData::createOpenLink() {
 	return std::make_shared<PeerClickHandler>(this);
 }
@@ -390,21 +450,33 @@ QImage *PeerData::userpicCloudImage(Ui::PeerUserpicView &view) const {
 }
 
 void PeerData::paintUserpic(
-		Painter &p,
+		QPainter &p,
 		Ui::PeerUserpicView &view,
-		int x,
-		int y,
-		int size,
-		bool forceCircle) const {
+		PaintUserpicContext context) const {
+	if (const auto broadcast = monoforumBroadcast()) {
+		if (context.shape == Ui::PeerUserpicShape::Auto) {
+			context.shape = Ui::PeerUserpicShape::Monoforum;
+		}
+		broadcast->paintUserpic(p, view, context);
+		return;
+	}
+	const auto size = context.size;
 	const auto cloud = userpicCloudImage(view);
 	const auto ratio = style::DevicePixelRatio();
+	if (context.shape == Ui::PeerUserpicShape::Auto) {
+		context.shape = (isForum() && !isBot())
+			? Ui::PeerUserpicShape::Forum
+			: isMonoforum()
+			? Ui::PeerUserpicShape::Monoforum
+			: Ui::PeerUserpicShape::Circle;
+	}
 	Ui::ValidateUserpicCache(
 		view,
 		cloud,
 		cloud ? nullptr : ensureEmptyUserpic().get(),
 		size * ratio,
-		!forceCircle && isForum());
-	p.drawImage(QRect(x, y, size, size), view.cached);
+		context.shape);
+	p.drawImage(QRect(context.position, QSize(size, size)), view.cached);
 }
 
 void PeerData::loadUserpic() {
@@ -512,7 +584,7 @@ Data::FileOrigin PeerData::userpicOrigin() const {
 
 Data::FileOrigin PeerData::userpicPhotoOrigin() const {
 	return (isUser() && userpicPhotoId())
-		? Data::FileOriginUserPhoto(peerToUser(id).bare, userpicPhotoId())
+		? Data::FileOriginFullUser(peerToUser(id))
 		: Data::FileOrigin();
 }
 
@@ -528,7 +600,7 @@ void PeerData::updateUserpic(
 				isSelf() ? peerToUser(id) : UserId(),
 				MTP_inputPeerPhotoFileLocation(
 					MTP_flags(0),
-					input,
+					input(),
 					MTP_long(photoId))) },
 			kUserpicSize,
 			kUserpicSize),
@@ -624,18 +696,32 @@ bool PeerData::canPinMessages() const {
 	Unexpected("Peer type in PeerData::canPinMessages.");
 }
 
-bool PeerData::canCreatePolls() const {
+bool PeerData::canCreatePolls(bool forbidInForums) const {
 	if (const auto user = asUser()) {
-		return user->isBot()
-			&& !user->isSupport()
-			&& !user->isRepliesChat()
-			&& !user->isVerifyCodes();
+		return user->isSelf()
+			|| (user->isBot()
+				&& !user->isSupport()
+				&& !user->isRepliesChat()
+				&& !user->isVerifyCodes());
+	} else if (isMonoforum()) {
+		return false;
 	}
-	return Data::CanSend(this, ChatRestriction::SendPolls);
+	return Data::CanSend(this, ChatRestriction::SendPolls, forbidInForums);
+}
+
+bool PeerData::canCreateTodoLists(bool forbidInForums) const {
+	if (isMonoforum() || isBroadcast()) {
+		return false;
+	}
+	return session().premium()
+		&& (Data::CanSend(this, ChatRestriction::SendPolls, forbidInForums)
+			|| isUser());
 }
 
 bool PeerData::canCreateTopics() const {
-	if (const auto channel = asChannel()) {
+	if (const auto bot = asBot()) {
+		return bot->isForum();
+	} else if (const auto channel = asChannel()) {
 		return channel->isForum()
 			&& !channel->amRestricted(ChatRestriction::CreateTopics);
 	}
@@ -643,7 +729,9 @@ bool PeerData::canCreateTopics() const {
 }
 
 bool PeerData::canManageTopics() const {
-	if (const auto channel = asChannel()) {
+	if (const auto bot = asBot()) {
+		return bot->isForum();
+	} else if (const auto channel = asChannel()) {
 		return channel->isForum()
 			&& (channel->amCreator()
 				|| (channel->adminRights() & ChatAdminRight::ManageTopics));
@@ -651,10 +739,45 @@ bool PeerData::canManageTopics() const {
 	return false;
 }
 
+bool PeerData::canPostStories() const {
+	if (const auto channel = asChannel()) {
+		return channel->canPostStories();
+	}
+	return isSelf();
+}
+
+bool PeerData::canEditStories() const {
+	if (const auto channel = asChannel()) {
+		return channel->canEditStories();
+	}
+	return isSelf();
+}
+
+bool PeerData::canDeleteStories() const {
+	if (const auto channel = asChannel()) {
+		return channel->canDeleteStories();
+	}
+	return isSelf();
+}
+
+bool PeerData::canManageGifts() const {
+	if (const auto channel = asChannel()) {
+		return channel->canPostMessages();
+	}
+	return isSelf();
+}
+
+bool PeerData::canTransferGifts() const {
+	if (const auto channel = asChannel()) {
+		return channel->amCreator();
+	}
+	return isSelf();
+}
+
 bool PeerData::canEditMessagesIndefinitely() const {
 	if (const auto user = asUser()) {
 		return user->isSelf();
-	} else if (const auto chat = asChat()) {
+	} else if (isChat()) {
 		return false;
 	} else if (const auto channel = asChannel()) {
 		return channel->isMegagroup()
@@ -685,6 +808,13 @@ bool PeerData::canExportChatHistory() const {
 	return false;
 }
 
+bool PeerData::autoTranslation() const {
+	if (const auto channel = asChannel()) {
+		return channel->autoTranslation();
+	}
+	return false;
+}
+
 bool PeerData::setAbout(const QString &newAbout) {
 	if (_about == newAbout) {
 		return false;
@@ -707,7 +837,9 @@ void PeerData::checkFolder(FolderId folderId) {
 
 void PeerData::clearBusinessBot() {
 	if (const auto details = _barDetails.get()) {
-		if (details->requestChatDate) {
+		if (details->requestChatDate
+			|| details->paysPerMessage
+			|| !details->phoneCountryCode.isEmpty()) {
 			details->businessBot = nullptr;
 			details->businessBotManageUrl = QString();
 		} else {
@@ -744,18 +876,33 @@ void PeerData::saveTranslationDisabled(bool disabled) {
 	using Flag = MTPmessages_TogglePeerTranslations::Flag;
 	session().api().request(MTPmessages_TogglePeerTranslations(
 		MTP_flags(disabled ? Flag::f_disabled : Flag()),
-		input
+		input()
 	)).send();
 }
 
 void PeerData::setBarSettings(const MTPPeerSettings &data) {
 	data.match([&](const MTPDpeerSettings &data) {
-		if (!data.vbusiness_bot_id() && !data.vrequest_chat_title()) {
+		const auto wasPaysPerMessage = paysPerMessage();
+		if (!data.vbusiness_bot_id()
+			&& !data.vrequest_chat_title()
+			&& !data.vcharge_paid_message_stars()
+			&& !data.vphone_country()
+			&& !data.vregistration_month()
+			&& !data.vname_change_date()
+			&& !data.vphoto_change_date()) {
 			_barDetails = nullptr;
 		} else if (!_barDetails) {
 			_barDetails = std::make_unique<PeerBarDetails>();
 		}
 		if (_barDetails) {
+			_barDetails->phoneCountryCode
+				= qs(data.vphone_country().value_or_empty());
+			_barDetails->registrationDate = ParseRegistrationDate(
+				data.vregistration_month().value_or_empty());
+			_barDetails->nameChangeDate
+				= data.vname_change_date().value_or_empty();
+			_barDetails->photoChangeDate
+				= data.vphoto_change_date().value_or_empty();
 			_barDetails->requestChatTitle
 				= qs(data.vrequest_chat_title().value_or_empty());
 			_barDetails->requestChatDate
@@ -765,6 +912,8 @@ void PeerData::setBarSettings(const MTPPeerSettings &data) {
 				: nullptr;
 			_barDetails->businessBotManageUrl
 				= qs(data.vbusiness_bot_manage_url().value_or_empty());
+			_barDetails->paysPerMessage
+				= data.vcharge_paid_message_stars().value_or_empty();
 		}
 		using Flag = PeerBarSetting;
 		setBarSettings((data.is_add_contact() ? Flag::AddContact : Flag())
@@ -788,8 +937,65 @@ void PeerData::setBarSettings(const MTPPeerSettings &data) {
 			| (data.is_business_bot_can_reply()
 				? Flag::BusinessBotCanReply
 				: Flag()));
+		if (wasPaysPerMessage != paysPerMessage()) {
+			session().changes().peerUpdated(
+				this,
+				UpdateFlag::PaysPerMessage);
+		}
 	});
 }
+
+void PeerData::setBarSettings(PeerBarSettings which) {
+	const auto was = hideLinks();
+	_barSettings.set(which);
+	if (was && !hideLinks()) {
+		if (const auto history = owner().historyLoaded(this)) {
+			crl::on_main(&history->session(), [=] {
+				history->refreshHiddenLinksItems();
+			});
+		}
+		if (const auto from = migrateFrom()) {
+			if (const auto history = owner().historyLoaded(from)) {
+				crl::on_main(&history->session(), [=] {
+					history->refreshHiddenLinksItems();
+				});
+			}
+		}
+	}
+}
+
+int PeerData::paysPerMessage() const {
+	return _barDetails ? _barDetails->paysPerMessage : 0;
+}
+
+void PeerData::clearPaysPerMessage() {
+	if (const auto details = _barDetails.get()) {
+		if (details->paysPerMessage) {
+			if (details->businessBot
+				|| details->requestChatDate
+				|| !details->phoneCountryCode.isEmpty()) {
+				details->paysPerMessage = 0;
+			} else {
+				_barDetails = nullptr;
+			}
+			session().changes().peerUpdated(
+				this,
+				UpdateFlag::PaysPerMessage);
+		}
+	}
+}
+
+bool PeerData::hideLinks() const {
+	//if (!isUser()) {
+	//	return false;
+	//}
+	if (const auto to = migrateTo()) {
+		return to->hideLinks();
+	}
+	const auto settings = barSettings();
+	return !settings || (*settings & PeerBarSetting::ReportSpam);
+}
+
 QString PeerData::requestChatTitle() const {
 	return _barDetails ? _barDetails->requestChatTitle : QString();
 }
@@ -806,11 +1012,26 @@ QString PeerData::businessBotManageUrl() const {
 	return _barDetails ? _barDetails->businessBotManageUrl : QString();
 }
 
-bool PeerData::changeColorIndex(
-		const tl::conditional<MTPint> &cloudColorIndex) {
-	return cloudColorIndex
-		? changeColorIndex(cloudColorIndex->v)
-		: clearColorIndex();
+QString PeerData::phoneCountryCode() const {
+	return _barDetails ? _barDetails->phoneCountryCode : QString();
+}
+
+int PeerData::registrationMonth() const {
+	return _barDetails
+		? RegistrationMonth(_barDetails->registrationDate)
+		: 0;
+}
+
+int PeerData::registrationYear() const {
+	return _barDetails ? RegistrationYear(_barDetails->registrationDate) : 0;
+}
+
+TimeId PeerData::nameChangeDate() const {
+	return _barDetails ? _barDetails->nameChangeDate : 0;
+}
+
+TimeId PeerData::photoChangeDate() const {
+	return _barDetails ? _barDetails->photoChangeDate : 0;
 }
 
 bool PeerData::changeBackgroundEmojiId(
@@ -820,15 +1041,42 @@ bool PeerData::changeBackgroundEmojiId(
 		: DocumentId());
 }
 
+bool PeerData::changeColorCollectible(
+		const tl::conditional<MTPPeerColor> &cloudColor) {
+	if (!cloudColor) {
+		return clearColorCollectible();
+	}
+	return cloudColor->match([&](const MTPDpeerColorCollectible &data) {
+		return changeColorCollectible(Data::ParseColorCollectible(data));
+	}, [&](const MTPDpeerColor &) {
+		return clearColorCollectible();
+	}, [&](const MTPDinputPeerColorCollectible &) {
+		return clearColorCollectible();
+	});
+}
+
 bool PeerData::changeColor(
 		const tl::conditional<MTPPeerColor> &cloudColor) {
-	const auto changed1 = cloudColor
-		? changeColorIndex(cloudColor->data().vcolor())
+	const auto maybeColorIndex = Data::ColorIndexFromColor(cloudColor);
+	const auto changed1 = maybeColorIndex
+		? changeColorIndex(*maybeColorIndex)
 		: clearColorIndex();
-	const auto changed2 = changeBackgroundEmojiId(cloudColor
-		? cloudColor->data().vbackground_emoji_id().value_or_empty()
-		: DocumentId());
-	return changed1 || changed2;
+	const auto changed2 = changeBackgroundEmojiId(
+		Data::BackgroundEmojiIdFromColor(cloudColor));
+	const auto changed3 = changeColorCollectible(cloudColor);
+	return changed1 || changed2 || changed3;
+}
+
+bool PeerData::changeColorProfile(
+		const tl::conditional<MTPPeerColor> &cloudColor) {
+	const auto maybeColorIndex = Data::ColorIndexFromColor(cloudColor);
+	const auto changed1 = maybeColorIndex
+		? changeColorProfileIndex(*maybeColorIndex)
+		: clearColorProfileIndex();
+	const auto changed2 = changeProfileBackgroundEmojiId(
+		Data::BackgroundEmojiIdFromColor(cloudColor));
+	const auto changed3 = changeColorProfileCollectible(cloudColor);
+	return changed1 || changed2 || changed3;
 }
 
 void PeerData::fillNames() {
@@ -910,6 +1158,16 @@ void PeerData::fullUpdated() {
 	setLoadedStatus(LoadedStatus::Full);
 }
 
+UserData *PeerData::asBot() {
+	return isBot() ? static_cast<UserData*>(this) : nullptr;
+}
+
+const UserData *PeerData::asBot() const {
+	return isBot()
+		? static_cast<const UserData*>(this)
+		: nullptr;
+}
+
 UserData *PeerData::asUser() {
 	return isUser() ? static_cast<UserData*>(this) : nullptr;
 }
@@ -984,6 +1242,16 @@ const ChannelData *PeerData::asChannelOrMigrated() const {
 	return migrateTo();
 }
 
+ChannelData *PeerData::asMonoforum() {
+	const auto channel = asMegagroup();
+	return (channel && channel->isMonoforum()) ? channel : nullptr;
+}
+
+const ChannelData *PeerData::asMonoforum() const {
+	const auto channel = asMegagroup();
+	return (channel && channel->isMonoforum()) ? channel : nullptr;
+}
+
 ChatData *PeerData::migrateFrom() const {
 	if (const auto megagroup = asMegagroup()) {
 		return megagroup->amIn()
@@ -1016,6 +1284,35 @@ not_null<const PeerData*> PeerData::migrateToOrMe() const {
 	return this;
 }
 
+not_null<PeerData*> PeerData::userpicPaintingPeer() {
+	if (const auto broadcast = monoforumBroadcast()) {
+		return broadcast;
+	}
+	return this;
+}
+
+not_null<const PeerData*> PeerData::userpicPaintingPeer() const {
+	return const_cast<PeerData*>(this)->userpicPaintingPeer();
+}
+
+Ui::PeerUserpicShape PeerData::userpicShape() const {
+	return isForum() && !isBot()
+		? Ui::PeerUserpicShape::Forum
+		: isMonoforum()
+		? Ui::PeerUserpicShape::Monoforum
+		: Ui::PeerUserpicShape::Circle;
+}
+
+ChannelData *PeerData::monoforumBroadcast() const {
+	const auto monoforum = asMonoforum();
+	return monoforum ? monoforum->monoforumLink() : nullptr;
+}
+
+ChannelData *PeerData::broadcastMonoforum() const {
+	const auto broadcast = asBroadcast();
+	return broadcast ? broadcast->monoforumLink() : nullptr;
+}
+
 const QString &PeerData::topBarNameText() const {
 	if (const auto to = migrateTo()) {
 		return to->topBarNameText();
@@ -1034,6 +1331,8 @@ int PeerData::nameVersion() const {
 const QString &PeerData::name() const {
 	if (const auto to = migrateTo()) {
 		return to->name();
+	} else if (const auto broadcast = monoforumBroadcast()) {
+		return broadcast->name();
 	}
 	return _name;
 }
@@ -1041,6 +1340,10 @@ const QString &PeerData::name() const {
 const QString &PeerData::shortName() const {
 	if (const auto user = asUser()) {
 		return user->firstName.isEmpty() ? user->lastName : user->firstName;
+	} else if (const auto to = migrateTo()) {
+		return to->shortName();
+	} else if (const auto broadcast = monoforumBroadcast()) {
+		return broadcast->shortName();
 	}
 	return _name;
 }
@@ -1082,6 +1385,25 @@ bool PeerData::isUsernameEditable(QString username) const {
 	return false;
 }
 
+bool PeerData::changeColorCollectible(Ui::ColorCollectible data) {
+	if (!_colorCollectible || (*_colorCollectible != data)) {
+		// We don't reuse allocated object because in ChatStyle we
+		// cache colors using std::weak_ptr as a key.
+		_colorCollectible = std::make_shared<Ui::ColorCollectible>(
+			std::move(data));
+		return true;
+	}
+	return false;
+}
+
+bool PeerData::clearColorCollectible() {
+	if (!_colorCollectible) {
+		return false;
+	}
+	_colorCollectible = nullptr;
+	return true;
+}
+
 bool PeerData::changeColorIndex(uint8 index) {
 	index %= Ui::kColorIndexCount;
 	if (_colorIndexCloud && _colorIndex == index) {
@@ -1113,12 +1435,72 @@ bool PeerData::changeBackgroundEmojiId(DocumentId id) {
 	return true;
 }
 
+bool PeerData::changeColorProfileCollectible(Ui::ColorCollectible data) {
+	if (!_colorProfileCollectible || (*_colorProfileCollectible != data)) {
+		_colorProfileCollectible = std::make_shared<Ui::ColorCollectible>(
+			std::move(data));
+		return true;
+	}
+	return false;
+}
+
+bool PeerData::changeColorProfileCollectible(
+		const tl::conditional<MTPPeerColor> &cloudColor) {
+	if (!cloudColor) {
+		return clearColorProfileCollectible();
+	}
+	return cloudColor->match([&](const MTPDpeerColorCollectible &data) {
+		return changeColorProfileCollectible(Data::ParseColorCollectible(data));
+	}, [&](const MTPDpeerColor &) {
+		return clearColorProfileCollectible();
+	}, [&](const MTPDinputPeerColorCollectible &) {
+		return clearColorProfileCollectible();
+	});
+}
+
+bool PeerData::clearColorProfileCollectible() {
+	if (!_colorProfileCollectible) {
+		return false;
+	}
+	_colorProfileCollectible = nullptr;
+	return true;
+}
+
+bool PeerData::changeColorProfileIndex(uint8 index) {
+	index %= Ui::kColorIndexCount;
+	if (_colorProfileIndex == index) {
+		return false;
+	}
+	_colorProfileIndex = index;
+	return true;
+}
+
+bool PeerData::clearColorProfileIndex() {
+	if (!_colorProfileIndex.has_value()) {
+		return false;
+	}
+	_colorProfileIndex = std::nullopt;
+	return true;
+}
+
+DocumentId PeerData::profileBackgroundEmojiId() const {
+	return _profileBackgroundEmojiId;
+}
+
+bool PeerData::changeProfileBackgroundEmojiId(DocumentId id) {
+	if (_profileBackgroundEmojiId == id) {
+		return false;
+	}
+	_profileBackgroundEmojiId = id;
+	return true;
+}
+
 void PeerData::setEmojiStatus(const MTPEmojiStatus &status) {
-	const auto parsed = Data::ParseEmojiStatus(status);
+	const auto parsed = owner().emojiStatuses().parse(status);
 	setEmojiStatus(parsed.id, parsed.until);
 }
 
-void PeerData::setEmojiStatus(DocumentId emojiStatusId, TimeId until) {
+void PeerData::setEmojiStatus(EmojiStatusId emojiStatusId, TimeId until) {
 	if (_emojiStatusId != emojiStatusId) {
 		_emojiStatusId = emojiStatusId;
 		session().changes().peerUpdated(this, UpdateFlag::EmojiStatus);
@@ -1126,10 +1508,17 @@ void PeerData::setEmojiStatus(DocumentId emojiStatusId, TimeId until) {
 	owner().emojiStatuses().registerAutomaticClear(this, until);
 }
 
-DocumentId PeerData::emojiStatusId() const {
+EmojiStatusId PeerData::emojiStatusId() const {
 	return _emojiStatusId;
 }
 
+bool PeerData::isBot() const {
+	if (const auto user = asUser()) {
+		return user->isBot();
+	}
+	return false;
+}
+
 bool PeerData::isSelf() const {
 	if (const auto user = asUser()) {
 		return (user->flags() & UserDataFlag::Self);
@@ -1186,12 +1575,21 @@ bool PeerData::isBroadcast() const {
 }
 
 bool PeerData::isForum() const {
-	if (const auto channel = asChannel()) {
+	if (const auto bot = asBot()) {
+		return bot->isForum();
+	} else if (const auto channel = asChannel()) {
 		return channel->isForum();
 	}
 	return false;
 }
 
+bool PeerData::isMonoforum() const {
+	if (const auto channel = asChannel()) {
+		return channel->isMonoforum();
+	}
+	return false;
+}
+
 bool PeerData::isGigagroup() const {
 	if (const auto channel = asChannel()) {
 		return channel->isGigagroup();
@@ -1215,6 +1613,10 @@ bool PeerData::isVerifyCodes() const {
 	return (id == kVerifyCodesId);
 }
 
+bool PeerData::isFreezeAppealChat() const {
+	return username().compare(u"spambot"_q, Qt::CaseInsensitive) == 0;
+}
+
 bool PeerData::sharedMediaInfo() const {
 	return isSelf() || isRepliesChat();
 }
@@ -1246,8 +1648,19 @@ void PeerData::setStoriesHidden(bool hidden) {
 	}
 }
 
+Ui::BotVerifyDetails *PeerData::botVerifyDetails() const {
+	if (const auto user = asUser()) {
+		return user->botVerifyDetails();
+	} else if (const auto channel = asChannel()) {
+		return channel->botVerifyDetails();
+	}
+	return nullptr;
+}
+
 Data::Forum *PeerData::forum() const {
-	if (const auto channel = asChannel()) {
+	if (const auto bot = asBot()) {
+		return bot->forum();
+	} else if (const auto channel = asChannel()) {
 		return channel->forum();
 	}
 	return nullptr;
@@ -1262,9 +1675,65 @@ Data::ForumTopic *PeerData::forumTopicFor(MsgId rootId) const {
 	return nullptr;
 }
 
+Data::SavedMessages *PeerData::monoforum() const {
+	if (const auto channel = asChannel()) {
+		return channel->monoforum();
+	}
+	return nullptr;
+}
+
+Data::SavedSublist *PeerData::monoforumSublistFor(
+		PeerId sublistPeerId) const {
+	if (!sublistPeerId) {
+		return nullptr;
+	} else if (const auto monoforum = this->monoforum()) {
+		return monoforum->sublistLoaded(owner().peer(sublistPeerId));
+	}
+	return nullptr;
+}
+
+bool PeerData::useSubsectionTabs() const {
+	if (const auto bot = asBot()) {
+		return bot->isForum();
+	} else if (const auto channel = asChannel()) {
+		return channel->useSubsectionTabs();
+	}
+	return false;
+}
+
+bool PeerData::displayAsForum() const {
+	if (!isForum()) {
+		return false;
+	} else if (Data::IsBotCreatesTopics(this)) {
+		const auto forum = asBot()->botInfo->forum();
+		return forum && !forum->topicsList()->empty();
+	}
+	return true;
+}
+
+bool PeerData::displaySubsectionTabs() const {
+	if (asBot()) {
+		return displayAsForum();
+	}
+	return useSubsectionTabs();
+}
+
+bool PeerData::viewForumAsMessages() const {
+	if (const auto channel = asChannel()) {
+		return channel->viewForumAsMessages();
+	}
+	return false;
+}
+
+void PeerData::processTopics(const MTPVector<MTPForumTopic> &topics) {
+	if (const auto forum = this->forum()) {
+		forum->applyReceivedTopics(topics);
+	}
+}
+
 bool PeerData::allowsForwarding() const {
 	if (const auto user = asUser()) {
-		return true;
+		return user->allowsForwarding();
 	} else if (const auto channel = asChannel()) {
 		return channel->allowsForwarding();
 	} else if (const auto chat = asChat()) {
@@ -1290,7 +1759,7 @@ Data::RestrictionCheckResult PeerData::amRestricted(
 		}
 	};
 	if (const auto user = asUser()) {
-		if (user->meRequiresPremiumToWrite() && !user->session().premium()) {
+		if (user->requiresPremiumToWrite() && !user->session().premium()) {
 			return Result::Explicit();
 		}
 		return (right == ChatRestriction::SendVoiceMessages
@@ -1304,6 +1773,9 @@ Data::RestrictionCheckResult PeerData::amRestricted(
 				: Result::Explicit())
 			: Result::Allowed();
 	} else if (const auto channel = asChannel()) {
+		if (channel->monoforumDisabled()) {
+			return Result::WithEveryone();
+		}
 		const auto defaultRestrictions = channel->defaultRestrictions()
 			| (channel->isPublic()
 				? (ChatRestriction::PinMessages
@@ -1340,6 +1812,7 @@ bool PeerData::canRevokeFullHistory() const {
 	if (const auto user = asUser()) {
 		return !isSelf()
 			&& (!user->isBot() || user->isSupport())
+			&& !user->isInaccessible()
 			&& session().serverConfig().revokePrivateInbox
 			&& (session().serverConfig().revokePrivateTimeLimit == 0x7FFFFFFF);
 	} else if (const auto chat = asChat()) {
@@ -1347,7 +1820,8 @@ bool PeerData::canRevokeFullHistory() const {
 	} else if (const auto megagroup = asMegagroup()) {
 		return megagroup->amCreator()
 			&& megagroup->membersCountKnown()
-			&& megagroup->canDelete();
+			&& megagroup->canDelete()
+			&& !megagroup->isMonoforum();
 	}
 	return false;
 }
@@ -1399,16 +1873,66 @@ int PeerData::slowmodeSecondsLeft() const {
 }
 
 bool PeerData::canManageGroupCall() const {
-	if (const auto chat = asChat()) {
+	if (const auto user = asUser()) {
+		return user->isSelf();
+	} else if (const auto chat = asChat()) {
 		return chat->amCreator()
 			|| (chat->adminRights() & ChatAdminRight::ManageCall);
 	} else if (const auto group = asChannel()) {
+		if (group->isMonoforum()) {
+			return false;
+		}
 		return group->amCreator()
 			|| (group->adminRights() & ChatAdminRight::ManageCall);
 	}
+	Unexpected("Peer type in PeerData::canManageGroupCall.");
+}
+
+bool PeerData::canManageRanks() const {
+	if (const auto chat = asChat()) {
+		return chat->amCreator()
+			|| (chat->adminRights() & ChatAdminRight::ManageRanks);
+	} else if (const auto channel = asChannel()) {
+		return channel->amCreator()
+			|| (channel->adminRights() & ChatAdminRight::ManageRanks);
+	}
+	return false;
+}
+
+bool PeerData::amMonoforumAdmin() const {
+	if (const auto channel = asChannel()) {
+		return channel->flags() & ChannelDataFlag::MonoforumAdmin;
+	}
 	return false;
 }
 
+int PeerData::starsPerMessage() const {
+	if (const auto user = asUser()) {
+		return user->starsPerMessage();
+	} else if (const auto channel = asChannel()) {
+		return channel->starsPerMessage();
+	}
+	return 0;
+}
+
+int PeerData::starsPerMessageChecked() const {
+	if (const auto channel = asChannel()) {
+		if (channel->adminRights()
+			|| channel->amCreator()
+			|| amMonoforumAdmin()) {
+			return 0;
+		}
+	}
+	return starsPerMessage();
+}
+
+Data::StarsRating PeerData::starsRating() const {
+	if (const auto user = asUser()) {
+		return user->starsRating();
+	}
+	return {};
+}
+
 Data::GroupCall *PeerData::groupCall() const {
 	if (const auto chat = asChat()) {
 		return chat->groupCall();
@@ -1427,24 +1951,23 @@ PeerId PeerData::groupCallDefaultJoinAs() const {
 	return 0;
 }
 
-void PeerData::setThemeEmoji(const QString &emoticon) {
-	if (_themeEmoticon == emoticon) {
+void PeerData::setThemeToken(const QString &token) {
+	if (_themeToken == token) {
 		return;
-	}
-	if (Ui::Emoji::Find(_themeEmoticon) == Ui::Emoji::Find(emoticon)) {
-		_themeEmoticon = emoticon;
+	} else if (!token.startsWith(u"gift:"_q)
+		&& Ui::Emoji::Find(_themeToken) == Ui::Emoji::Find(token)) {
+		_themeToken = token;
 		return;
 	}
-	_themeEmoticon = emoticon;
-	if (!emoticon.isEmpty()
-		&& !owner().cloudThemes().themeForEmoji(emoticon)) {
-		owner().cloudThemes().refreshChatThemes();
+	_themeToken = token;
+	if (!token.isEmpty() && !owner().cloudThemes().themeForToken(token)) {
+		owner().cloudThemes().refreshChatThemesFor(token);
 	}
-	session().changes().peerUpdated(this, UpdateFlag::ChatThemeEmoji);
+	session().changes().peerUpdated(this, UpdateFlag::ChatThemeToken);
 }
 
-const QString &PeerData::themeEmoji() const {
-	return _themeEmoticon;
+const QString &PeerData::themeToken() const {
+	return _themeToken;
 }
 
 void PeerData::setWallPaper(
@@ -1495,6 +2018,15 @@ bool PeerData::hasUnreadStories() const {
 	return false;
 }
 
+bool PeerData::hasActiveVideoStream() const {
+	if (const auto user = asUser()) {
+		return user->hasActiveVideoStream();
+	} else if (const auto channel = asChannel()) {
+		return channel->hasActiveVideoStream();
+	}
+	return false;
+}
+
 void PeerData::setStoriesState(StoriesState state) {
 	if (const auto user = asUser()) {
 		return user->setStoriesState(state);
@@ -1505,6 +2037,50 @@ void PeerData::setStoriesState(StoriesState state) {
 	}
 }
 
+int PeerData::peerGiftsCount() const {
+	if (const auto user = asUser()) {
+		return user->peerGiftsCount();
+	} else if (const auto channel = asChannel()) {
+		return channel->peerGiftsCount();
+	}
+	return 0;
+}
+
+MTPInputPeer PeerData::input() const {
+	if (const auto user = asUser()) {
+		const auto specific = user->inputUser();
+		return specific.match([](const MTPDinputUser &data) {
+			return MTP_inputPeerUser(data.vuser_id(), data.vaccess_hash());
+		}, [](const MTPDinputUserFromMessage &data) {
+			return MTP_inputPeerUserFromMessage(
+				data.vpeer(),
+				data.vmsg_id(),
+				data.vuser_id());
+		}, [](const MTPDinputUserEmpty &) {
+			return MTP_inputPeerEmpty();
+		}, [](const MTPDinputUserSelf &) {
+			return MTP_inputPeerSelf();
+		});
+	} else if (const auto chat = asChat()) {
+		return MTP_inputPeerChat(chat->inputChat());
+	} else if (const auto channel = asChannel()) {
+		const auto &specific = channel->inputChannel();
+		return specific.match([](const MTPDinputChannel &data) {
+			return MTP_inputPeerChannel(
+				data.vchannel_id(),
+				data.vaccess_hash());
+		}, [](const MTPDinputChannelFromMessage &data) {
+			return MTP_inputPeerChannelFromMessage(
+				data.vpeer(),
+				data.vmsg_id(),
+				data.vchannel_id());
+		}, [](const MTPDinputChannelEmpty &) {
+			return MTP_inputPeerEmpty();
+		});
+	}
+	return MTP_inputPeerEmpty();
+}
+
 void PeerData::setIsBlocked(bool is) {
 	const auto status = is
 		? BlockStatus::Blocked
@@ -1520,6 +2096,7 @@ void PeerData::setIsBlocked(bool is) {
 			}
 		}
 		session().changes().peerUpdated(this, UpdateFlag::IsBlocked);
+		Core::App().notifications().checkDelayed();
 	}
 }
 
@@ -1556,12 +2133,14 @@ void SetTopPinnedMessageId(
 		session.settings().setHiddenPinnedMessageId(
 			peer->id,
 			MsgId(0), // topicRootId
+			PeerId(0), // monoforumPeerId
 			0);
 		session.saveSettingsDelayed();
 	}
 	session.storage().add(Storage::SharedMediaAddExisting(
 		peer->id,
 		MsgId(0), // topicRootId
+		PeerId(0), // monoforumPeerId
 		Storage::SharedMediaType::Pinned,
 		messageId,
 		{ messageId, ServerMaxMsgId }));
@@ -1571,22 +2150,25 @@ void SetTopPinnedMessageId(
 FullMsgId ResolveTopPinnedId(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		PeerData *migrated) {
 	const auto slice = peer->session().storage().snapshot(
 		Storage::SharedMediaQuery(
 			Storage::SharedMediaKey(
 				peer->id,
 				topicRootId,
+				monoforumPeerId,
 				Storage::SharedMediaType::Pinned,
 				ServerMaxMsgId - 1),
 			1,
 			1));
-	const auto old = (!topicRootId && migrated)
+	const auto old = (!topicRootId && !monoforumPeerId && migrated)
 		? migrated->session().storage().snapshot(
 			Storage::SharedMediaQuery(
 				Storage::SharedMediaKey(
 					migrated->id,
 					MsgId(0), // topicRootId
+					PeerId(0), // monoforumPeerId
 					Storage::SharedMediaType::Pinned,
 					ServerMaxMsgId - 1),
 				1,
@@ -1608,22 +2190,25 @@ FullMsgId ResolveTopPinnedId(
 FullMsgId ResolveMinPinnedId(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		PeerData *migrated) {
 	const auto slice = peer->session().storage().snapshot(
 		Storage::SharedMediaQuery(
 			Storage::SharedMediaKey(
 				peer->id,
 				topicRootId,
+				monoforumPeerId,
 				Storage::SharedMediaType::Pinned,
 				1),
 			1,
 			1));
-	const auto old = (!topicRootId && migrated)
+	const auto old = (!topicRootId && !monoforumPeerId && migrated)
 		? migrated->session().storage().snapshot(
 			Storage::SharedMediaQuery(
 				Storage::SharedMediaKey(
 					migrated->id,
 					MsgId(0), // topicRootId
+					PeerId(0), // monoforumPeerId
 					Storage::SharedMediaType::Pinned,
 					1),
 				1,
@@ -1642,4 +2227,42 @@ FullMsgId ResolveMinPinnedId(
 	}
 }
 
+uint64 BackgroundEmojiIdFromColor(const MTPPeerColor *color) {
+	if (!color) {
+		return 0;
+	}
+	return color->match([](const MTPDpeerColor &data) -> uint64 {
+		return data.vbackground_emoji_id().value_or_empty();
+	}, [](const MTPDpeerColorCollectible &data) -> uint64 {
+		return data.vbackground_emoji_id().v;
+	}, [](const MTPDinputPeerColorCollectible &data) -> uint64 {
+		return 0;
+	});
+}
+
+std::optional<uint8> ColorIndexFromColor(const MTPPeerColor *color) {
+	if (!color) {
+		return std::nullopt;
+	}
+	return color->match([](const MTPDpeerColor &d) -> std::optional<uint8> {
+		return d.vcolor() ? std::make_optional(d.vcolor()->v) : std::nullopt;
+	}, [](const auto &) -> std::optional<uint8> {
+		return std::nullopt;
+	});
+}
+
+bool IsBotUserCreatesTopics(not_null<PeerData*> peer) {
+	if (const auto user = peer->asUser()) {
+		return user->botInfo && user->botInfo->userCreatesTopics;
+	}
+	return false;
+}
+
+bool IsBotCreatesTopics(not_null<const PeerData*> peer) {
+	if (const auto user = peer->asUser()) {
+		return user->botInfo && !user->botInfo->userCreatesTopics;
+	}
+	return false;
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index 354bac4a5050a4..66e5f056efa7d6 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -7,10 +7,11 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "data/notify/data_peer_notify_settings.h"
 #include "data/data_types.h"
 #include "data/data_flags.h"
-#include "data/notify/data_peer_notify_settings.h"
 #include "data/data_cloud_file.h"
+#include "data/data_peer_common.h"
 #include "ui/userpic_view.h"
 
 struct BotInfo;
@@ -23,6 +24,8 @@ enum class ChatRestriction;
 
 namespace Ui {
 class EmptyUserpic;
+struct BotVerifyDetails;
+struct ColorCollectible;
 } // namespace Ui
 
 namespace Main {
@@ -36,6 +39,8 @@ class Forum;
 class ForumTopic;
 class Session;
 class GroupCall;
+class SavedMessages;
+class SavedSublist;
 struct ReactionId;
 class WallPaper;
 
@@ -138,6 +143,9 @@ struct AllowedReactions {
 	not_null<Session*> owner,
 	const MTPInputUser &input);
 
+[[nodiscard]] Ui::ColorCollectible ParseColorCollectible(
+	const MTPDpeerColorCollectible &data);
+
 } // namespace Data
 
 class PeerClickHandler : public ClickHandler {
@@ -172,10 +180,21 @@ inline constexpr bool is_flag_type(PeerBarSetting) { return true; };
 using PeerBarSettings = base::flags<PeerBarSetting>;
 
 struct PeerBarDetails {
+	QString phoneCountryCode;
+	int registrationDate = 0; // YYYYMM or 0, YYYY > 2012, MM > 0.
+	TimeId nameChangeDate = 0;
+	TimeId photoChangeDate = 0;
 	QString requestChatTitle;
 	TimeId requestChatDate;
 	UserData *businessBot = nullptr;
 	QString businessBotManageUrl;
+	int paysPerMessage = 0;
+};
+
+struct PaintUserpicContext {
+	QPoint position;
+	int size = 0;
+	Ui::PeerUserpicShape shape = Ui::PeerUserpicShape::Auto;
 };
 
 class PeerData {
@@ -199,14 +218,36 @@ class PeerData {
 	[[nodiscard]] uint8 colorIndex() const {
 		return _colorIndex;
 	}
+	[[nodiscard]] auto colorCollectible() const
+	-> const std::shared_ptr<Ui::ColorCollectible> & {
+		return _colorCollectible;
+	}
+	bool changeColorCollectible(Ui::ColorCollectible data);
+	bool clearColorCollectible();
 	bool changeColorIndex(uint8 index);
 	bool clearColorIndex();
 	[[nodiscard]] DocumentId backgroundEmojiId() const;
 	bool changeBackgroundEmojiId(DocumentId id);
 
+	[[nodiscard]] std::optional<uint8> colorProfileIndex() const {
+		return _colorProfileIndex;
+	}
+	[[nodiscard]] auto colorProfileCollectible() const
+	-> const std::shared_ptr<Ui::ColorCollectible> & {
+		return _colorProfileCollectible;
+	}
+	bool changeColorProfileCollectible(Ui::ColorCollectible data);
+	bool changeColorProfileCollectible(
+		const tl::conditional<MTPPeerColor> &cloudColor);
+	bool clearColorProfileCollectible();
+	bool changeColorProfileIndex(uint8 index);
+	bool clearColorProfileIndex();
+	[[nodiscard]] DocumentId profileBackgroundEmojiId() const;
+	bool changeProfileBackgroundEmojiId(DocumentId id);
+
 	void setEmojiStatus(const MTPEmojiStatus &status);
-	void setEmojiStatus(DocumentId emojiStatusId, TimeId until = 0);
-	[[nodiscard]] DocumentId emojiStatusId() const;
+	void setEmojiStatus(EmojiStatusId emojiStatusId, TimeId until = 0);
+	[[nodiscard]] EmojiStatusId emojiStatusId() const;
 
 	[[nodiscard]] bool isUser() const {
 		return peerIsUser(id);
@@ -217,6 +258,7 @@ class PeerData {
 	[[nodiscard]] bool isChannel() const {
 		return peerIsChannel(id);
 	}
+	[[nodiscard]] bool isBot() const;
 	[[nodiscard]] bool isSelf() const;
 	[[nodiscard]] bool isVerified() const;
 	[[nodiscard]] bool isPremium() const;
@@ -225,14 +267,18 @@ class PeerData {
 	[[nodiscard]] bool isMegagroup() const;
 	[[nodiscard]] bool isBroadcast() const;
 	[[nodiscard]] bool isForum() const;
+	[[nodiscard]] bool isMonoforum() const;
 	[[nodiscard]] bool isGigagroup() const;
 	[[nodiscard]] bool isRepliesChat() const;
 	[[nodiscard]] bool isVerifyCodes() const;
+	[[nodiscard]] bool isFreezeAppealChat() const;
 	[[nodiscard]] bool sharedMediaInfo() const;
 	[[nodiscard]] bool savedSublistsInfo() const;
 	[[nodiscard]] bool hasStoriesHidden() const;
 	void setStoriesHidden(bool hidden);
 
+	[[nodiscard]] Ui::BotVerifyDetails *botVerifyDetails() const;
+
 	[[nodiscard]] bool isNotificationsUser() const {
 		return (id == peerFromUser(333000))
 			|| (id == kServiceNotificationsId);
@@ -247,6 +293,16 @@ class PeerData {
 	[[nodiscard]] Data::Forum *forum() const;
 	[[nodiscard]] Data::ForumTopic *forumTopicFor(MsgId rootId) const;
 
+	[[nodiscard]] Data::SavedMessages *monoforum() const;
+	[[nodiscard]] Data::SavedSublist *monoforumSublistFor(
+		PeerId sublistPeerId) const;
+
+	[[nodiscard]] bool useSubsectionTabs() const;
+	[[nodiscard]] bool displaySubsectionTabs() const;
+	[[nodiscard]] bool displayAsForum() const;
+	[[nodiscard]] bool viewForumAsMessages() const;
+	void processTopics(const MTPVector<MTPForumTopic> &topics);
+
 	[[nodiscard]] Data::PeerNotifySettings &notify() {
 		return _notify;
 	}
@@ -263,7 +319,15 @@ class PeerData {
 	[[nodiscard]] rpl::producer<bool> slowmodeAppliedValue() const;
 	[[nodiscard]] int slowmodeSecondsLeft() const;
 	[[nodiscard]] bool canManageGroupCall() const;
+	[[nodiscard]] bool canManageRanks() const;
+	[[nodiscard]] bool amMonoforumAdmin() const;
 
+	[[nodiscard]] int starsPerMessage() const;
+	[[nodiscard]] int starsPerMessageChecked() const;
+	[[nodiscard]] Data::StarsRating starsRating() const;
+
+	[[nodiscard]] UserData *asBot();
+	[[nodiscard]] const UserData *asBot() const;
 	[[nodiscard]] UserData *asUser();
 	[[nodiscard]] const UserData *asUser() const;
 	[[nodiscard]] ChatData *asChat();
@@ -278,11 +342,22 @@ class PeerData {
 	[[nodiscard]] const ChatData *asChatNotMigrated() const;
 	[[nodiscard]] ChannelData *asChannelOrMigrated();
 	[[nodiscard]] const ChannelData *asChannelOrMigrated() const;
+	[[nodiscard]] ChannelData *asMonoforum();
+	[[nodiscard]] const ChannelData *asMonoforum() const;
 
 	[[nodiscard]] ChatData *migrateFrom() const;
 	[[nodiscard]] ChannelData *migrateTo() const;
 	[[nodiscard]] not_null<PeerData*> migrateToOrMe();
 	[[nodiscard]] not_null<const PeerData*> migrateToOrMe() const;
+	[[nodiscard]] not_null<PeerData*> userpicPaintingPeer();
+	[[nodiscard]] not_null<const PeerData*> userpicPaintingPeer() const;
+	[[nodiscard]] Ui::PeerUserpicShape userpicShape() const;
+
+	// isMonoforum() ? monoforumLink() : nullptr
+	[[nodiscard]] ChannelData *monoforumBroadcast() const;
+
+	// isMonoforum() ? nullptr : monoforumLink()
+	[[nodiscard]] ChannelData *broadcastMonoforum() const;
 
 	void updateFull();
 	void updateFullForced();
@@ -313,15 +388,28 @@ class PeerData {
 		const ImageLocation &location,
 		bool hasVideo);
 	void setUserpicPhoto(const MTPPhoto &data);
+
 	void paintUserpic(
-		Painter &p,
+		QPainter &p,
 		Ui::PeerUserpicView &view,
-		int x,
-		int y,
-		int size,
-		bool forceCircle = false) const;
+		PaintUserpicContext context) const;
+	void paintUserpic(
+			QPainter &p,
+			Ui::PeerUserpicView &view,
+			int x,
+			int y,
+			int size,
+			bool forceCircle = false) const {
+		paintUserpic(p, view, {
+			.position = { x, y },
+			.size = size,
+			.shape = (forceCircle
+				? Ui::PeerUserpicShape::Circle
+				: Ui::PeerUserpicShape::Auto),
+		});
+	}
 	void paintUserpicLeft(
-			Painter &p,
+			QPainter &p,
 			Ui::PeerUserpicView &view,
 			int x,
 			int y,
@@ -375,10 +463,17 @@ class PeerData {
 
 	[[nodiscard]] bool canPinMessages() const;
 	[[nodiscard]] bool canEditMessagesIndefinitely() const;
-	[[nodiscard]] bool canCreatePolls() const;
+	[[nodiscard]] bool canCreatePolls(bool forbidInForums = true) const;
+	[[nodiscard]] bool canCreateTodoLists(bool forbidInForums = true) const;
 	[[nodiscard]] bool canCreateTopics() const;
 	[[nodiscard]] bool canManageTopics() const;
+	[[nodiscard]] bool canPostStories() const;
+	[[nodiscard]] bool canEditStories() const;
+	[[nodiscard]] bool canDeleteStories() const;
+	[[nodiscard]] bool canManageGifts() const;
+	[[nodiscard]] bool canTransferGifts() const;
 	[[nodiscard]] bool canExportChatHistory() const;
+	[[nodiscard]] bool autoTranslation() const;
 
 	// Returns true if about text was changed.
 	bool setAbout(const QString &newAbout);
@@ -388,9 +483,7 @@ class PeerData {
 
 	void checkFolder(FolderId folderId);
 
-	void setBarSettings(PeerBarSettings which) {
-		_barSettings.set(which);
-	}
+	void setBarSettings(PeerBarSettings which);
 	[[nodiscard]] auto barSettings() const {
 		return (_barSettings.current() & PeerBarSetting::Unknown)
 			? std::nullopt
@@ -399,13 +492,21 @@ class PeerData {
 	[[nodiscard]] auto barSettingsValue() const {
 		return (_barSettings.current() & PeerBarSetting::Unknown)
 			? _barSettings.changes()
-			: (_barSettings.value() | rpl::type_erased());
+			: (_barSettings.value() | rpl::type_erased);
 	}
+	[[nodiscard]] int paysPerMessage() const;
+	void clearPaysPerMessage();
+	[[nodiscard]] bool hideLinks() const;
 	[[nodiscard]] QString requestChatTitle() const;
 	[[nodiscard]] TimeId requestChatDate() const;
 	[[nodiscard]] UserData *businessBot() const;
 	[[nodiscard]] QString businessBotManageUrl() const;
 	void clearBusinessBot();
+	[[nodiscard]] QString phoneCountryCode() const;
+	[[nodiscard]] int registrationMonth() const;
+	[[nodiscard]] int registrationYear() const;
+	[[nodiscard]] TimeId nameChangeDate() const;
+	[[nodiscard]] TimeId photoChangeDate() const;
 
 	enum class TranslationFlag : uchar {
 		Unknown,
@@ -417,10 +518,12 @@ class PeerData {
 	void saveTranslationDisabled(bool disabled);
 
 	void setBarSettings(const MTPPeerSettings &data);
-	bool changeColorIndex(const tl::conditional<MTPint> &cloudColorIndex);
 	bool changeBackgroundEmojiId(
 		const tl::conditional<MTPlong> &cloudBackgroundEmoji);
+	bool changeColorCollectible(
+		const tl::conditional<MTPPeerColor> &cloudColor);
 	bool changeColor(const tl::conditional<MTPPeerColor> &cloudColor);
+	bool changeColorProfile(const tl::conditional<MTPPeerColor> &cloudColor);
 
 	enum class BlockStatus : char {
 		Unknown,
@@ -461,8 +564,8 @@ class PeerData {
 	[[nodiscard]] Data::GroupCall *groupCall() const;
 	[[nodiscard]] PeerId groupCallDefaultJoinAs() const;
 
-	void setThemeEmoji(const QString &emoticon);
-	[[nodiscard]] const QString &themeEmoji() const;
+	void setThemeToken(const QString &token);
+	[[nodiscard]] const QString &themeToken() const;
 
 	void setWallPaper(
 		std::optional<Data::WallPaper> paper,
@@ -475,13 +578,18 @@ class PeerData {
 		None,
 		HasRead,
 		HasUnread,
+		HasVideoStream,
 	};
 	[[nodiscard]] bool hasActiveStories() const;
 	[[nodiscard]] bool hasUnreadStories() const;
+	[[nodiscard]] bool hasActiveVideoStream() const;
 	void setStoriesState(StoriesState state);
 
+	[[nodiscard]] int peerGiftsCount() const;
+
+	[[nodiscard]] MTPInputPeer input() const;
+
 	const PeerId id;
-	MTPinputPeer input = MTP_inputPeerEmpty();
 
 protected:
 	void updateNameDelayed(
@@ -491,6 +599,7 @@ class PeerData {
 	void updateUserpic(PhotoId photoId, MTP::DcId dcId, bool hasVideo);
 	void clearUserpic();
 	void invalidateEmptyUserpic();
+	void checkTrustedPayForMessage();
 
 private:
 	void fillNames();
@@ -520,29 +629,34 @@ class PeerData {
 	base::flat_set<QString> _nameWords; // for filtering
 	base::flat_set<QChar> _nameFirstLetters;
 
-	DocumentId _emojiStatusId = 0;
-	uint64 _backgroundEmojiId = 0;
+	EmojiStatusId _emojiStatusId;
+	DocumentId _backgroundEmojiId = 0;
+	DocumentId _profileBackgroundEmojiId = 0;
 	crl::time _lastFullUpdate = 0;
 
 	QString _name;
-	uint32 _nameVersion : 30 = 1;
+	uint32 _nameVersion : 16 = 1;
 	uint32 _sensitiveContent : 1 = 0;
 	uint32 _wallPaperOverriden : 1 = 0;
+	uint32 _checkedTrustedPayForMessage : 1 = 0;
 
 	TimeId _ttlPeriod = 0;
 
 	BarSettings _barSettings = PeerBarSettings(PeerBarSetting::Unknown);
 	std::unique_ptr<PeerBarDetails> _barDetails;
+	std::shared_ptr<Ui::ColorCollectible> _colorCollectible;
+	std::shared_ptr<Ui::ColorCollectible> _colorProfileCollectible;
 
 	BlockStatus _blockStatus = BlockStatus::Unknown;
 	LoadedStatus _loadedStatus = LoadedStatus::Not;
 	TranslationFlag _translationFlag = TranslationFlag::Unknown;
 	uint8 _colorIndex : 6 = 0;
 	uint8 _colorIndexCloud : 1 = 0;
+	std::optional<uint8> _colorProfileIndex;
 	uint8 _userpicHasVideo : 1 = 0;
 
 	QString _about;
-	QString _themeEmoticon;
+	QString _themeToken;
 	std::unique_ptr<Data::WallPaper> _wallPaper;
 
 };
@@ -555,10 +669,18 @@ void SetTopPinnedMessageId(
 [[nodiscard]] FullMsgId ResolveTopPinnedId(
 	not_null<PeerData*> peer,
 	MsgId topicRootId,
+	PeerId monoforumPeerId,
 	PeerData *migrated = nullptr);
 [[nodiscard]] FullMsgId ResolveMinPinnedId(
 	not_null<PeerData*> peer,
 	MsgId topicRootId,
+	PeerId monoforumPeerId,
 	PeerData *migrated = nullptr);
 
+[[nodiscard]] uint64 BackgroundEmojiIdFromColor(const MTPPeerColor *color);
+[[nodiscard]] std::optional<uint8> ColorIndexFromColor(const MTPPeerColor *);
+
+[[nodiscard]] bool IsBotUserCreatesTopics(not_null<PeerData*>);
+[[nodiscard]] bool IsBotCreatesTopics(not_null<const PeerData*>);
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_peer_bot_commands.cpp b/Telegram/SourceFiles/data/data_peer_bot_commands.cpp
index 8adc31a9e31056..2487dc768545e1 100644
--- a/Telegram/SourceFiles/data/data_peer_bot_commands.cpp
+++ b/Telegram/SourceFiles/data/data_peer_bot_commands.cpp
@@ -17,11 +17,16 @@ ChatBotCommands::Changed ChatBotCommands::update(
 		clear();
 	} else {
 		for (const auto &commands : list) {
-			auto &value = operator[](commands.userId);
-			changed |= commands.commands.empty()
-				? remove(commands.userId)
-				: !ranges::equal(value, commands.commands);
-			value = commands.commands;
+			if (commands.commands.empty()) {
+				changed |= remove(commands.userId);
+			} else {
+				auto &value = operator[](commands.userId);
+				const auto isEqual = ranges::equal(value, commands.commands);
+				changed |= !isEqual;
+				if (!isEqual) {
+					value = commands.commands;
+				}
+			}
 		}
 	}
 	return changed;
diff --git a/Telegram/SourceFiles/data/data_peer_bot_commands.h b/Telegram/SourceFiles/data/data_peer_bot_commands.h
index e0730b4e43045a..bf46e49635a9d3 100644
--- a/Telegram/SourceFiles/data/data_peer_bot_commands.h
+++ b/Telegram/SourceFiles/data/data_peer_bot_commands.h
@@ -11,6 +11,12 @@ For license and copyright information please follow this link:
 
 namespace Data {
 
+enum class BotStatus : int {
+	NoBots = -1,
+	Unknown = 0,
+	HasBots = 2,
+};
+
 struct BotCommands final {
 	UserId userId;
 	std::vector<BotCommand> commands;
diff --git a/Telegram/SourceFiles/data/data_peer_colors.h b/Telegram/SourceFiles/data/data_peer_colors.h
new file mode 100644
index 00000000000000..8b85cbb67ec7b1
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_peer_colors.h
@@ -0,0 +1,23 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+
+struct ColorProfileSet {
+	std::vector<QColor> palette;
+	std::vector<QColor> bg;
+	std::vector<QColor> story;
+};
+
+struct ColorProfileData {
+	ColorProfileSet light;
+	ColorProfileSet dark;
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_peer_common.h b/Telegram/SourceFiles/data/data_peer_common.h
new file mode 100644
index 00000000000000..656f089f9f4754
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_peer_common.h
@@ -0,0 +1,34 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+
+struct StarsRating {
+	int level = 0;
+	int stars = 0;
+	int thisLevelStars = 0;
+	int nextLevelStars = 0;
+
+	explicit operator bool() const {
+		return level != 0 || thisLevelStars != 0;
+	}
+
+	friend inline bool operator==(StarsRating, StarsRating) = default;
+};
+
+struct StarsRatingPending {
+	StarsRating value;
+	TimeId date = 0;
+
+	explicit operator bool() const {
+		return value && date;
+	}
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_peer_values.cpp b/Telegram/SourceFiles/data/data_peer_values.cpp
index 73d041c085e59e..2e8ee8c52df9a7 100644
--- a/Telegram/SourceFiles/data/data_peer_values.cpp
+++ b/Telegram/SourceFiles/data/data_peer_values.cpp
@@ -182,30 +182,31 @@ inline auto DefaultRestrictionValue(
 			| Flag::HasLink
 			| Flag::Forbidden
 			| Flag::Creator;
-		const auto channel = topic->channel();
-		return rpl::combine(
-			PeerFlagsValue(channel.get(), mask),
-			RestrictionsValue(channel, rights),
-			DefaultRestrictionsValue(channel, rights),
-			AdminRightsValue(channel, ChatAdminRight::ManageTopics),
-			topic->session().changes().topicFlagsValue(
-				topic,
-				TopicUpdate::Flag::Closed),
-			[=](
-					ChannelDataFlags flags,
-					ChatRestrictions sendRestriction,
-					ChatRestrictions defaultSendRestriction,
-					auto,
-					auto) {
-				const auto notAmInFlags = Flag::Left | Flag::Forbidden;
-				const auto allowed = !(flags & notAmInFlags)
-					|| ((flags & Flag::HasLink)
-						&& !(flags & Flag::JoinToWrite));
-				return allowed
-					&& ((flags & Flag::Creator)
-						|| (!sendRestriction && !defaultSendRestriction))
-					&& (!topic->closed() || topic->canToggleClosed());
-			});
+		if (const auto channel = topic->channel()) {
+			return rpl::combine(
+				PeerFlagsValue(channel, mask),
+				RestrictionsValue(channel, rights),
+				DefaultRestrictionsValue(channel, rights),
+				AdminRightsValue(channel, ChatAdminRight::ManageTopics),
+				topic->session().changes().topicFlagsValue(
+					topic,
+					TopicUpdate::Flag::Closed),
+				[=](
+						ChannelDataFlags flags,
+						ChatRestrictions sendRestriction,
+						ChatRestrictions defaultSendRestriction,
+						auto,
+						auto) {
+					const auto notAmInFlags = Flag::Left | Flag::Forbidden;
+					const auto allowed = !(flags & notAmInFlags)
+						|| ((flags & Flag::HasLink)
+							&& !(flags & Flag::JoinToWrite));
+					return allowed
+						&& ((flags & Flag::Creator)
+							|| (!sendRestriction && !defaultSendRestriction))
+						&& (!topic->closed() || topic->canToggleClosed());
+				});
+		}
 	}
 	return CanSendAnyOfValue(thread->peer(), rights, forbidInForums);
 }
@@ -224,11 +225,11 @@ inline auto DefaultRestrictionValue(
 			| ChatRestriction::SendVideoMessages);
 		auto allowedAny = PeerFlagsValue(
 			user,
-			(UserDataFlag::Deleted | UserDataFlag::MeRequiresPremiumToWrite)
+			(UserDataFlag::Deleted | UserDataFlag::RequiresPremiumToWrite)
 		) | rpl::map([=](UserDataFlags flags) {
 			return (flags & UserDataFlag::Deleted)
 				? rpl::single(false)
-				: !(flags & UserDataFlag::MeRequiresPremiumToWrite)
+				: !(flags & UserDataFlag::RequiresPremiumToWrite)
 				? rpl::single(true)
 				: AmPremiumValue(&user->session());
 		}) | rpl::flatten_latest();
@@ -269,10 +270,12 @@ inline auto DefaultRestrictionValue(
 			| Flag::Left
 			| Flag::Forum
 			| Flag::JoinToWrite
+			| Flag::Monoforum
 			| Flag::HasLink
 			| Flag::Forbidden
 			| Flag::Creator
-			| Flag::Broadcast;
+			| Flag::Broadcast
+			| Flag::MonoforumDisabled;
 		return rpl::combine(
 			PeerFlagsValue(channel, mask),
 			AdminRightValue(
@@ -287,12 +290,16 @@ inline auto DefaultRestrictionValue(
 					bool unrestrictedByBoosts,
 					ChatRestrictions sendRestriction,
 					ChatRestrictions defaultSendRestriction) {
+				if (flags & Flag::MonoforumDisabled) {
+					return false;
+				}
 				const auto notAmInFlags = Flag::Left | Flag::Forbidden;
 				const auto forumRestriction = forbidInForums
 					&& (flags & Flag::Forum);
 				const auto allowed = !(flags & notAmInFlags)
 					|| ((flags & Flag::HasLink)
-						&& !(flags & Flag::JoinToWrite));
+						&& !(flags & Flag::JoinToWrite))
+					|| (flags & Flag::Monoforum);
 				const auto restricted = sendRestriction
 					| (defaultSendRestriction && !unrestrictedByBoosts);
 				return allowed
@@ -369,13 +376,15 @@ rpl::producer<bool> CanPinMessagesValue(not_null<PeerData*> peer) {
 
 rpl::producer<bool> CanManageGroupCallValue(not_null<PeerData*> peer) {
 	const auto flag = ChatAdminRight::ManageCall;
-	if (const auto chat = peer->asChat()) {
+	if (const auto user = peer->asUser()) {
+		return rpl::single(user->isSelf());
+	} else if (const auto chat = peer->asChat()) {
 		return chat->amCreator()
-			? (rpl::single(true) | rpl::type_erased())
+			? (rpl::single(true) | rpl::type_erased)
 			: AdminRightValue(chat, flag);
 	} else if (const auto channel = peer->asChannel()) {
 		return channel->amCreator()
-			? (rpl::single(true) | rpl::type_erased())
+			? (rpl::single(true) | rpl::type_erased)
 			: AdminRightValue(channel, flag);
 	}
 	return rpl::single(false);
@@ -512,6 +521,23 @@ bool ChannelHasSubscriptionUntilDate(ChannelData *channel) {
 	return channel && channel->subscriptionUntilDate() > 0;
 }
 
+rpl::producer<Data::StarsRating> StarsRatingValue(
+		not_null<PeerData*> peer) {
+	if (const auto user = peer->asUser()) {
+		return user->session().changes().peerFlagsValue(
+			user,
+			Data::PeerUpdate::Flag::StarsRating
+		) | rpl::map([=] {
+			auto result = user->starsRating();
+			if (!user->isSelf() && result.level < 0) {
+				result.stars = 0;
+			}
+			return result;
+		});
+	}
+	return rpl::single(Data::StarsRating());
+}
+
 rpl::producer<QImage> PeerUserpicImageValue(
 		not_null<PeerData*> peer,
 		int size,
@@ -532,7 +558,7 @@ rpl::producer<QImage> PeerUserpicImageValue(
 
 			if (loading && !state->waiting) {
 				peer->session().downloaderTaskFinished(
-				) | rpl::start_with_next(state->push, state->waiting);
+				) | rpl::on_next(state->push, state->waiting);
 			} else if (!loading && state->waiting) {
 				state->waiting.destroy();
 			}
@@ -552,7 +578,7 @@ rpl::producer<QImage> PeerUserpicImageValue(
 		peer->session().changes().peerFlagsValue(
 			peer,
 			PeerUpdate::Flag::Photo
-		) | rpl::start_with_next(state->push, result);
+		) | rpl::on_next(state->push, result);
 		return result;
 	};
 }
@@ -599,7 +625,7 @@ rpl::producer<int> UniqueReactionsLimitValue(
 	) | rpl::map([config = &peer->session().appConfig()] {
 		return UniqueReactionsLimit(config);
 	}) | rpl::distinct_until_changed();
-	if (const auto channel = peer->asChannel()) {
+	if (peer->isChannel()) {
 		return rpl::combine(
 			PeerAllowedReactionsValue(peer),
 			std::move(configValue)
@@ -608,7 +634,7 @@ rpl::producer<int> UniqueReactionsLimitValue(
 				? allowedReactions.maxCount
 				: limit;
 		});
-	} else if (const auto chat = peer->asChat()) {
+	} else if (peer->isChat()) {
 		return rpl::combine(
 			PeerAllowedReactionsValue(peer),
 			std::move(configValue)
diff --git a/Telegram/SourceFiles/data/data_peer_values.h b/Telegram/SourceFiles/data/data_peer_values.h
index b726746be0148f..322e1dda39dec4 100644
--- a/Telegram/SourceFiles/data/data_peer_values.h
+++ b/Telegram/SourceFiles/data/data_peer_values.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "data/data_peer.h"
+#include "data/data_peer_values.h"
 #include "data/data_chat_participant_status.h"
 
 enum class ImageRoundRadius;
@@ -166,6 +167,9 @@ inline auto PeerFullFlagValue(
 [[nodiscard]] bool ChannelHasActiveCall(not_null<ChannelData*> channel);
 [[nodiscard]] bool ChannelHasSubscriptionUntilDate(ChannelData *channel);
 
+[[nodiscard]] rpl::producer<Data::StarsRating> StarsRatingValue(
+	not_null<PeerData*> peer);
+
 [[nodiscard]] rpl::producer<QImage> PeerUserpicImageValue(
 	not_null<PeerData*> peer,
 	int size,
diff --git a/Telegram/SourceFiles/data/data_photo.cpp b/Telegram/SourceFiles/data/data_photo.cpp
index 0a2d37f8f32c9c..c354ca551b4671 100644
--- a/Telegram/SourceFiles/data/data_photo.cpp
+++ b/Telegram/SourceFiles/data/data_photo.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "data/data_photo.h"
 
+#include "data/data_document.h"
 #include "data/data_session.h"
 #include "data/data_reply_preview.h"
 #include "data/data_photo_media.h"
@@ -15,6 +16,7 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "media/streaming/media_streaming_loader_local.h"
 #include "media/streaming/media_streaming_loader_mtproto.h"
+#include "storage/storage_account.h"
 #include "storage/file_download.h"
 #include "core/application.h"
 
@@ -475,6 +477,28 @@ int PhotoData::height() const {
 	return _images[PhotoSizeIndex(PhotoSize::Large)].location.height();
 }
 
+MediaKey PhotoData::mediaKey() const {
+	return ::mediaKey(UnknownFileLocation, _dc, id);
+}
+
+const Core::FileLocation &PhotoData::location(bool check) const {
+	if (check && !_location.check()) {
+		const auto location = session().local().readFileLocation(mediaKey());
+		const auto that = const_cast<PhotoData*>(this);
+		if (!location.inMediaCache()) {
+			that->_location = location;
+		}
+	}
+	return _location;
+}
+
+void PhotoData::setLocation(const Core::FileLocation &loc) {
+	if (!loc.inMediaCache() && loc.check()) {
+		_location = loc;
+		session().local().writeFileLocation(mediaKey(), _location);
+	}
+}
+
 Data::CloudFile &PhotoData::videoFile(PhotoSize size) {
 	Expects(_videoSizes != nullptr);
 
diff --git a/Telegram/SourceFiles/data/data_photo.h b/Telegram/SourceFiles/data/data_photo.h
index 3cd749a71512ba..f33078082a0f23 100644
--- a/Telegram/SourceFiles/data/data_photo.h
+++ b/Telegram/SourceFiles/data/data_photo.h
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "data/data_types.h"
 #include "data/data_cloud_file.h"
+#include "core/file_location.h"
 
 namespace Main {
 class Session;
@@ -160,6 +161,10 @@ class PhotoData final {
 	[[nodiscard]] int width() const;
 	[[nodiscard]] int height() const;
 
+	[[nodiscard]] MediaKey mediaKey() const;
+	[[nodiscard]] const Core::FileLocation &location(bool check) const;
+	void setLocation(const Core::FileLocation &loc);
+
 	PhotoId id = 0;
 
 	PeerData *peer = nullptr; // for chat and channel photos connection
@@ -195,4 +200,6 @@ class PhotoData final {
 
 	not_null<Data::Session*> _owner;
 
+	Core::FileLocation _location;
+
 };
diff --git a/Telegram/SourceFiles/data/data_photo_media.cpp b/Telegram/SourceFiles/data/data_photo_media.cpp
index af01588f455a80..06a52ed4dcad7d 100644
--- a/Telegram/SourceFiles/data/data_photo_media.cpp
+++ b/Telegram/SourceFiles/data/data_photo_media.cpp
@@ -65,13 +65,13 @@ QByteArray PhotoMedia::imageBytes(PhotoSize size) const {
 auto PhotoMedia::resolveLoadedImage(PhotoSize size) const
 -> const PhotoImage * {
 	const auto &original = _images[PhotoSizeIndex(size)];
-	if (const auto image = original.data.get()) {
+	if (original.data) {
 		if (original.goodFor >= size) {
 			return &original;
 		}
 	}
 	const auto &valid = _images[_owner->validSizeIndex(size)];
-	if (const auto image = valid.data.get()) {
+	if (valid.data.get()) {
 		if (valid.goodFor >= size) {
 			return &valid;
 		}
diff --git a/Telegram/SourceFiles/data/data_poll.cpp b/Telegram/SourceFiles/data/data_poll.cpp
index 64a3176d55979f..1e90b3a7e92e4b 100644
--- a/Telegram/SourceFiles/data/data_poll.cpp
+++ b/Telegram/SourceFiles/data/data_poll.cpp
@@ -8,11 +8,15 @@ For license and copyright information please follow this link:
 #include "data/data_poll.h"
 
 #include "api/api_text_entities.h"
+#include "countries/countries_instance.h"
+#include "data/data_document.h"
+#include "data/data_photo.h"
 #include "data/data_user.h"
 #include "data/data_session.h"
+#include "data/data_web_page.h"
 #include "base/call_delayed.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "api/api_text_entities.h"
 #include "ui/text/text_options.h"
 
 namespace {
@@ -20,6 +24,27 @@ namespace {
 constexpr auto kShortPollTimeout = 30 * crl::time(1000);
 constexpr auto kReloadAfterAutoCloseDelay = crl::time(1000);
 
+void ProcessPollMedia(
+		not_null<Data::Session*> owner,
+		const MTPMessageMedia &media) {
+	media.match([&](const MTPDmessageMediaPhoto &media) {
+		if (const auto photo = media.vphoto()) {
+			photo->match([&](const MTPDphoto &) {
+				owner->processPhoto(*photo);
+			}, [](const auto &) {
+			});
+		}
+	}, [&](const MTPDmessageMediaDocument &media) {
+		if (const auto document = media.vdocument()) {
+			document->match([&](const MTPDdocument &) {
+				owner->processDocument(*document);
+			}, [](const auto &) {
+			});
+		}
+	}, [](const auto &) {
+	});
+}
+
 const PollAnswer *AnswerByOption(
 		const std::vector<PollAnswer> &list,
 		const QByteArray &option) {
@@ -70,31 +95,59 @@ bool PollData::closeByTimer() {
 bool PollData::applyChanges(const MTPDpoll &poll) {
 	Expects(poll.vid().v == id);
 
-	const auto newQuestion = TextWithEntities{
-		.text = qs(poll.vquestion().data().vtext()),
-		.entities = Api::EntitiesFromMTP(
-			&session(),
-			poll.vquestion().data().ventities().v),
-	};
+	const auto newQuestion = Api::ParseTextWithEntities(
+		&session(),
+		poll.vquestion());
 	const auto newFlags = (poll.is_closed() ? Flag::Closed : Flag(0))
 		| (poll.is_public_voters() ? Flag::PublicVotes : Flag(0))
 		| (poll.is_multiple_choice() ? Flag::MultiChoice : Flag(0))
-		| (poll.is_quiz() ? Flag::Quiz : Flag(0));
+		| (poll.is_quiz() ? Flag::Quiz : Flag(0))
+		| (poll.is_shuffle_answers() ? Flag::ShuffleAnswers : Flag(0))
+		| (poll.is_revoting_disabled() ? Flag::RevotingDisabled : Flag(0))
+		| (poll.is_open_answers() ? Flag::OpenAnswers : Flag(0))
+		| (poll.is_hide_results_until_close()
+			? Flag::HideResultsUntilClose
+			: Flag(0))
+		| (poll.is_creator() ? Flag::Creator : Flag(0))
+		| (poll.is_subscribers_only() ? Flag::SubscribersOnly : Flag(0));
 	const auto newCloseDate = poll.vclose_date().value_or_empty();
 	const auto newClosePeriod = poll.vclose_period().value_or_empty();
+	auto newCountries = std::vector<QString>();
+	if (const auto countries = poll.vcountries_iso2()) {
+		newCountries.reserve(countries->v.size());
+		for (const auto &country : countries->v) {
+			newCountries.push_back(qs(country));
+		}
+	}
 	auto newAnswers = ranges::views::all(
 		poll.vanswers().v
 	) | ranges::views::transform([&](const MTPPollAnswer &data) {
 		return data.match([&](const MTPDpollAnswer &answer) {
 			auto result = PollAnswer();
 			result.option = answer.voption().v;
-			result.text = TextWithEntities{
-				.text = qs(answer.vtext().data().vtext()),
-				.entities = Api::EntitiesFromMTP(
-					&session(),
-					answer.vtext().data().ventities().v),
-			};
+			result.text = Api::ParseTextWithEntities(
+				&session(),
+				answer.vtext());
+			if (const auto media = answer.vmedia()) {
+				ProcessPollMedia(_owner, *media);
+				result.media = PollMediaFromMTP(_owner, *media);
+			}
+			if (const auto addedBy = answer.vadded_by()) {
+				result.addedBy = _owner->peer(peerFromMTP(*addedBy));
+				result.addedDate = answer.vdate().value_or_empty();
+			}
 			return result;
+		}, [&](const MTPDinputPollAnswer &answer) {
+			auto result = PollAnswer();
+			result.text = Api::ParseTextWithEntities(
+				&session(),
+				answer.vtext());
+			if (const auto media = answer.vmedia()) {
+				result.media = PollMediaFromInputMTP(_owner, *media);
+			}
+			return result;
+		}, [](const auto &) {
+			return PollAnswer();
 		});
 	}) | ranges::views::take(
 		kMaxOptions
@@ -103,6 +156,7 @@ bool PollData::applyChanges(const MTPDpoll &poll) {
 	const auto changed1 = (question != newQuestion)
 		|| (closeDate != newCloseDate)
 		|| (closePeriod != newClosePeriod)
+		|| (countries != newCountries)
 		|| (_flags != newFlags);
 	const auto changed2 = (answers != newAnswers);
 	if (!changed1 && !changed2) {
@@ -112,6 +166,7 @@ bool PollData::applyChanges(const MTPDpoll &poll) {
 		question = newQuestion;
 		closeDate = newCloseDate;
 		closePeriod = newClosePeriod;
+		countries = std::move(newCountries);
 		_flags = newFlags;
 	}
 	if (changed2) {
@@ -124,6 +179,7 @@ bool PollData::applyChanges(const MTPDpoll &poll) {
 			}
 		}
 	}
+	hash = poll.vhash().v;
 	++version;
 	return true;
 }
@@ -135,12 +191,36 @@ bool PollData::applyResults(const MTPPollResults &results) {
 		const auto newTotalVoters
 			= results.vtotal_voters().value_or(totalVoters);
 		auto changed = (newTotalVoters != totalVoters);
+		const auto setCanViewStats = [&](bool value) {
+			const auto previous = (_flags & Flag::CanViewStats);
+			if (bool(previous) == value) {
+				return;
+			}
+			if (value) {
+				_flags |= Flag::CanViewStats;
+			} else {
+				_flags &= ~Flag::CanViewStats;
+			}
+			changed = true;
+		};
+		if (!results.is_min() || results.is_can_view_stats()) {
+			setCanViewStats(results.is_can_view_stats());
+		}
 		if (const auto list = results.vresults()) {
 			for (const auto &result : list->v) {
 				if (applyResultToAnswers(result, results.is_min())) {
 					changed = true;
 				}
 			}
+		} else if (!results.is_min()
+			&& newTotalVoters == 0
+			&& voted()) {
+			for (auto &answer : answers) {
+				if (answer.chosen) {
+					answer.chosen = false;
+					changed = true;
+				}
+			}
 		}
 		if (const auto recent = results.vrecent_voters()) {
 			const auto recentChanged = !ranges::equal(
@@ -175,6 +255,14 @@ bool PollData::applyResults(const MTPPollResults &results) {
 				changed = true;
 			}
 		}
+		if (const auto media = results.vsolution_media()) {
+			ProcessPollMedia(_owner, *media);
+			const auto parsed = PollMediaFromMTP(_owner, *media);
+			if (solutionMedia != parsed) {
+				solutionMedia = parsed;
+				changed = true;
+			}
+		}
 		if (!changed) {
 			return false;
 		}
@@ -212,9 +300,12 @@ bool PollData::applyResultToAnswers(
 		if (!answer) {
 			return false;
 		}
-		auto changed = (answer->votes != voters.vvoters().v);
-		if (changed) {
-			answer->votes = voters.vvoters().v;
+		auto changed = false;
+		if (const auto count = voters.vvoters()) {
+			if (answer->votes != count->v) {
+				answer->votes = count->v;
+				changed = true;
+			}
 		}
 		if (!isMinResults) {
 			if (answer->chosen != voters.is_chosen()) {
@@ -226,6 +317,30 @@ bool PollData::applyResultToAnswers(
 			answer->correct = voters.is_correct();
 			changed = true;
 		}
+		if (const auto recent = voters.vrecent_voters()) {
+			const auto recentChanged = !ranges::equal(
+				answer->recentVoters,
+				recent->v,
+				ranges::equal_to(),
+				&PeerData::id,
+				peerFromMTP);
+			if (recentChanged) {
+				changed = true;
+				answer->recentVoters = ranges::views::all(
+					recent->v
+				) | ranges::views::transform([&](MTPPeer peerId) {
+					const auto peer = _owner->peer(
+						peerFromMTP(peerId));
+					return peer->isMinimalLoaded()
+						? peer.get()
+						: nullptr;
+				}) | ranges::views::filter([](PeerData *peer) {
+					return peer != nullptr;
+				}) | ranges::views::transform([](PeerData *peer) {
+					return not_null(peer);
+				}) | ranges::to_vector;
+			}
+		}
 		return changed;
 	});
 }
@@ -261,13 +376,230 @@ bool PollData::quiz() const {
 	return (_flags & Flag::Quiz);
 }
 
+bool PollData::shuffleAnswers() const {
+	return (_flags & Flag::ShuffleAnswers);
+}
+
+bool PollData::revotingDisabled() const {
+	return (_flags & Flag::RevotingDisabled);
+}
+
+bool PollData::openAnswers() const {
+	return (_flags & Flag::OpenAnswers);
+}
+
+bool PollData::hideResultsUntilClose() const {
+	return (_flags & Flag::HideResultsUntilClose);
+}
+
+bool PollData::creator() const {
+	return (_flags & Flag::Creator);
+}
+
+bool PollData::subscribersOnly() const {
+	return (_flags & Flag::SubscribersOnly);
+}
+
+bool PollData::canViewStats() const {
+	return (_flags & Flag::CanViewStats);
+}
+
+void PollData::setVoteRestriction(VoteRestriction restriction) {
+	_voteRestrictionUpdated = (restriction == VoteRestriction::None)
+		? 0
+		: crl::now();
+	if (_voteRestriction != restriction) {
+		_voteRestriction = restriction;
+		++version;
+	}
+}
+
+PollData::VoteRestriction PollData::voteRestriction() const {
+	return _voteRestriction;
+}
+
+crl::time PollData::voteRestrictionUpdated() const {
+	return _voteRestrictionUpdated;
+}
+
+QString PollData::debugString() const {
+	auto result = QString();
+	result += u"Poll #"_q + QString::number(id) + u'\n';
+	result += u"Q: "_q + question.text + u'\n';
+	if (quiz()) {
+		result += u"[Quiz]"_q;
+	}
+	if (multiChoice()) {
+		result += u"[MultiChoice]"_q;
+	}
+	if (closed()) {
+		result += u"[Closed]"_q;
+	}
+	if (publicVotes()) {
+		result += u"[PublicVotes]"_q;
+	}
+	if (subscribersOnly()) {
+		result += u"[SubscribersOnly]"_q;
+	}
+	if (canViewStats()) {
+		result += u"[CanViewStats]"_q;
+	}
+	if (!result.endsWith(u'\n')) {
+		result += u'\n';
+	}
+	result += u"Total voters: "_q + QString::number(totalVoters) + u'\n';
+	for (const auto &answer : answers) {
+		result += u"  - "_q + answer.text.text
+			+ u" ["_q + QString::number(answer.votes) + u" votes"_q;
+		if (answer.chosen) {
+			result += u", chosen"_q;
+		}
+		if (answer.correct) {
+			result += u", correct"_q;
+		}
+		result += u"]\n"_q;
+	}
+	if (!solution.text.isEmpty()) {
+		result += u"Solution: "_q + solution.text + u'\n';
+	}
+	if (!countries.empty()) {
+		result += u"Countries: "_q + countries.front();
+		for (auto i = 1, count = int(countries.size()); i != count; ++i) {
+			result += u", "_q + countries[i];
+		}
+		result += u'\n';
+	}
+	return result;
+}
+
+MTPInputMedia PollMediaToMTP(const PollMedia &media) {
+	if (media.photo) {
+		return MTP_inputMediaPhoto(
+			MTP_flags(MTPDinputMediaPhoto::Flag(0)),
+			media.photo->mtpInput(),
+			MTP_int(0),
+			MTPInputDocument());
+	} else if (media.document) {
+		return MTP_inputMediaDocument(
+			MTP_flags(MTPDinputMediaDocument::Flag(0)),
+			media.document->mtpInput(),
+			MTPInputPhoto(),
+			MTP_int(0),
+			MTP_int(0),
+			MTPstring());
+	} else if (media.geo) {
+		return MTP_inputMediaGeoPoint(
+			MTP_inputGeoPoint(
+				MTP_flags(0),
+				MTP_double(media.geo->lat()),
+				MTP_double(media.geo->lon()),
+				MTPint())); // accuracy_radius
+	} else if (!media.url.isEmpty()) {
+		return MTP_inputMediaWebPage(
+			MTP_flags(MTPDinputMediaWebPage::Flag::f_optional),
+			MTP_string(media.url));
+	}
+	return MTPInputMedia();
+}
+
+PollMedia PollMediaFromMTP(
+		not_null<Data::Session*> owner,
+		const MTPMessageMedia &media) {
+	auto result = PollMedia();
+	media.match([&](const MTPDmessageMediaPhoto &data) {
+		if (const auto photo = data.vphoto()) {
+			photo->match([&](const MTPDphoto &) {
+				result.photo = owner->processPhoto(*photo);
+			}, [](const auto &) {
+			});
+		}
+	}, [&](const MTPDmessageMediaDocument &data) {
+		if (const auto document = data.vdocument()) {
+			document->match([&](const MTPDdocument &) {
+				result.document = owner->processDocument(*document);
+			}, [](const auto &) {
+			});
+		}
+	}, [&](const MTPDmessageMediaGeo &data) {
+		data.vgeo().match([&](const MTPDgeoPoint &point) {
+			result.geo = Data::LocationPoint(point);
+		}, [](const MTPDgeoPointEmpty &) {
+		});
+	}, [&](const MTPDmessageMediaVenue &data) {
+		data.vgeo().match([&](const MTPDgeoPoint &point) {
+			result.geo = Data::LocationPoint(point);
+		}, [](const MTPDgeoPointEmpty &) {
+		});
+	}, [&](const MTPDmessageMediaWebPage &data) {
+		data.vwebpage().match([&](const MTPDwebPage &page) {
+			result.webpage = owner->processWebpage(page);
+		}, [&](const MTPDwebPagePending &page) {
+			result.webpage = owner->processWebpage(page);
+		}, [&](const MTPDwebPageEmpty &page) {
+			if (const auto url = page.vurl()) {
+				result.url = qs(*url);
+			}
+		}, [&](const MTPDwebPageNotModified &page) {
+		});
+		if (result.webpage && !result.webpage->url.isEmpty()) {
+			result.url = result.webpage->url;
+		}
+	}, [](const auto &) {
+	});
+	return result;
+}
+
+PollMedia PollMediaFromInputMTP(
+		not_null<Data::Session*> owner,
+		const MTPInputMedia &media) {
+	auto result = PollMedia();
+	media.match([&](const MTPDinputMediaPhoto &data) {
+		data.vid().match([&](const MTPDinputPhoto &photo) {
+			result.photo = owner->photo(photo.vid().v);
+		}, [](const auto &) {
+		});
+	}, [&](const MTPDinputMediaDocument &data) {
+		data.vid().match([&](const MTPDinputDocument &document) {
+			result.document = owner->document(document.vid().v);
+		}, [](const auto &) {
+		});
+	}, [&](const MTPDinputMediaGeoPoint &data) {
+		data.vgeo_point().match([&](const MTPDinputGeoPoint &point) {
+			result.geo.emplace(
+				point.vlat().v,
+				point.vlong().v,
+				Data::LocationPoint::NoAccessHash);
+		}, [](const auto &) {
+		});
+	}, [&](const MTPDinputMediaWebPage &data) {
+		result.url = qs(data.vurl());
+	}, [](const auto &) {
+	});
+	return result;
+}
+
+QByteArray PollOptionFromLink(const QString &value) {
+	return QByteArray::fromBase64(value.toLatin1());
+}
+
+QString PollOptionToLink(const QByteArray &option) {
+	return QString::fromLatin1(
+		option.toBase64(QByteArray::OmitTrailingEquals));
+}
+
 MTPPoll PollDataToMTP(not_null<const PollData*> poll, bool close) {
 	const auto convert = [&](const PollAnswer &answer) {
-		return MTP_pollAnswer(
+		const auto flags = answer.media
+			? MTPDinputPollAnswer::Flag::f_media
+			: MTPDinputPollAnswer::Flag(0);
+		return MTP_inputPollAnswer(
+			MTP_flags(flags),
 			MTP_textWithEntities(
 				MTP_string(answer.text.text),
 				Api::EntitiesToMTP(&poll->session(), answer.text.entities)),
-			MTP_bytes(answer.option));
+			answer.media
+				? PollMediaToMTP(answer.media)
+				: MTPInputMedia());
 	};
 	auto answers = QVector<MTPPollAnswer>();
 	answers.reserve(poll->answers.size());
@@ -275,13 +607,26 @@ MTPPoll PollDataToMTP(not_null<const PollData*> poll, bool close) {
 		poll->answers,
 		ranges::back_inserter(answers),
 		convert);
+	auto countries = QVector<MTPstring>();
+	countries.reserve(poll->countries.size());
+	for (const auto &country : poll->countries) {
+		countries.push_back(MTP_string(country));
+	}
 	using Flag = MTPDpoll::Flag;
 	const auto flags = ((poll->closed() || close) ? Flag::f_closed : Flag(0))
 		| (poll->multiChoice() ? Flag::f_multiple_choice : Flag(0))
 		| (poll->publicVotes() ? Flag::f_public_voters : Flag(0))
 		| (poll->quiz() ? Flag::f_quiz : Flag(0))
+		| (poll->shuffleAnswers() ? Flag::f_shuffle_answers : Flag(0))
+		| (poll->revotingDisabled() ? Flag::f_revoting_disabled : Flag(0))
+		| (poll->openAnswers() ? Flag::f_open_answers : Flag(0))
+		| (poll->hideResultsUntilClose()
+			? Flag::f_hide_results_until_close
+			: Flag(0))
+		| (poll->subscribersOnly() ? Flag::f_subscribers_only : Flag(0))
 		| (poll->closePeriod > 0 ? Flag::f_close_period : Flag(0))
-		| (poll->closeDate > 0 ? Flag::f_close_date : Flag(0));
+		| (poll->closeDate > 0 ? Flag::f_close_date : Flag(0))
+		| (countries.isEmpty() ? Flag(0) : Flag::f_countries_iso2);
 	return MTP_poll(
 		MTP_long(poll->id),
 		MTP_flags(flags),
@@ -290,7 +635,9 @@ MTPPoll PollDataToMTP(not_null<const PollData*> poll, bool close) {
 			Api::EntitiesToMTP(&poll->session(), poll->question.entities)),
 		MTP_vector<MTPPollAnswer>(answers),
 		MTP_int(poll->closePeriod),
-		MTP_int(poll->closeDate));
+		MTP_int(poll->closeDate),
+		MTP_vector<MTPstring>(std::move(countries)), // countries_iso2
+		MTP_long(0));
 }
 
 MTPInputMedia PollDataToInputMedia(
@@ -300,10 +647,10 @@ MTPInputMedia PollDataToInputMedia(
 		| (poll->quiz()
 			? MTPDinputMediaPoll::Flag::f_correct_answers
 			: MTPDinputMediaPoll::Flag(0));
-	auto correct = QVector<MTPbytes>();
-	for (const auto &answer : poll->answers) {
-		if (answer.correct) {
-			correct.push_back(MTP_bytes(answer.option));
+	auto correct = QVector<MTPint>();
+	for (auto i = 0, count = int(poll->answers.size()); i < count; ++i) {
+		if (poll->answers[i].correct) {
+			correct.push_back(MTP_int(i));
 		}
 	}
 
@@ -321,10 +668,88 @@ MTPInputMedia PollDataToInputMedia(
 	if (!sentEntities.v.isEmpty()) {
 		inputFlags |= MTPDinputMediaPoll::Flag::f_solution_entities;
 	}
+	if (poll->attachedMedia) {
+		inputFlags |= MTPDinputMediaPoll::Flag::f_attached_media;
+	}
+	if (poll->solutionMedia) {
+		inputFlags |= MTPDinputMediaPoll::Flag::f_solution_media;
+	}
 	return MTP_inputMediaPoll(
 		MTP_flags(inputFlags),
 		PollDataToMTP(poll, close),
-		MTP_vector<MTPbytes>(correct),
+		MTP_vector<MTPint>(correct),
+		poll->attachedMedia
+			? PollMediaToMTP(poll->attachedMedia)
+			: MTPInputMedia(),
 		MTP_string(solution.text),
-		sentEntities);
+		sentEntities,
+		poll->solutionMedia
+			? PollMediaToMTP(poll->solutionMedia)
+			: MTPInputMedia());
+}
+
+QString JoinPollCountries(const std::vector<QString> &countriesIso2) {
+	auto countries = QStringList();
+	countries.reserve(int(countriesIso2.size()));
+	const auto &instance = Countries::Instance();
+	for (const auto &iso2 : countriesIso2) {
+		const auto name = instance.countryNameByISO2(
+			iso2,
+			Countries::Naming::Polls);
+		countries.push_back(name.isEmpty() ? iso2 : name);
+	}
+	if (countries.empty()) {
+		return QString();
+	}
+	auto result = countries.front();
+	for (auto i = 1, count = int(countries.size()); i != count; ++i) {
+		result = ((i + 1 == count)
+			? tr::lng_prizes_countries_and_last
+			: tr::lng_prizes_countries_and_one)(
+				tr::now,
+				lt_countries,
+				result,
+				lt_country,
+				countries[i]);
+	}
+	return result;
+}
+
+TextWithEntities PollCountriesRestrictionText(
+		const std::vector<QString> &countries) {
+	const auto joined = JoinPollCountries(countries);
+	return joined.isEmpty()
+		? tr::lng_polls_vote_restricted_countries(tr::now, tr::rich)
+		: tr::lng_polls_vote_restricted_countries_list(
+			tr::now,
+			lt_countries,
+			tr::bold(joined),
+			tr::rich);
+}
+
+TextWithEntities PollVoteRestrictionText(
+		PollData::VoteRestriction restriction,
+		not_null<PeerData*> peer,
+		not_null<const PollData*> poll) {
+	switch (restriction) {
+	case PollData::VoteRestriction::SubscribersOnly: {
+		const auto channel = peer->name();
+		return channel.isEmpty()
+			? tr::lng_polls_vote_restricted_subscribers(tr::now, tr::rich)
+			: tr::lng_polls_vote_restricted_subscribers_channel(
+				tr::now,
+				lt_channel,
+				tr::bold(channel),
+				tr::rich);
+	}
+	case PollData::VoteRestriction::SubscribersJoinedTooRecently:
+		return tr::lng_polls_vote_restricted_subscribers_recent(
+			tr::now,
+			tr::rich);
+	case PollData::VoteRestriction::Countries:
+		return PollCountriesRestrictionText(poll->countries);
+	case PollData::VoteRestriction::None:
+		break;
+	}
+	return {};
 }
diff --git a/Telegram/SourceFiles/data/data_poll.h b/Telegram/SourceFiles/data/data_poll.h
index 49dd021734b156..40728df03a83d4 100644
--- a/Telegram/SourceFiles/data/data_poll.h
+++ b/Telegram/SourceFiles/data/data_poll.h
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "data/data_location.h"
+
 namespace Data {
 class Session;
 } // namespace Data
@@ -15,9 +17,42 @@ namespace Main {
 class Session;
 } // namespace Main
 
+class PeerData;
+class PhotoData;
+class DocumentData;
+struct WebPageData;
+
+struct PollMedia {
+	PhotoData *photo = nullptr;
+	DocumentData *document = nullptr;
+	std::optional<Data::LocationPoint> geo;
+	WebPageData *webpage = nullptr;
+	QString url;
+
+	explicit operator bool() const {
+		return photo || document || geo || !url.isEmpty();
+	}
+};
+
+inline bool operator==(const PollMedia &a, const PollMedia &b) {
+	return (a.photo == b.photo)
+		&& (a.document == b.document)
+		&& (a.geo == b.geo)
+		&& (a.webpage == b.webpage)
+		&& (a.url == b.url);
+}
+
+inline bool operator!=(const PollMedia &a, const PollMedia &b) {
+	return !(a == b);
+}
+
 struct PollAnswer {
 	TextWithEntities text;
 	QByteArray option;
+	PollMedia media;
+	std::vector<not_null<PeerData*>> recentVoters;
+	PeerData *addedBy = nullptr;
+	TimeId addedDate = 0;
 	int votes = 0;
 	bool chosen = false;
 	bool correct = false;
@@ -25,7 +60,8 @@ struct PollAnswer {
 
 inline bool operator==(const PollAnswer &a, const PollAnswer &b) {
 	return (a.text == b.text)
-		&& (a.option == b.option);
+		&& (a.option == b.option)
+		&& (a.media == b.media);
 }
 
 inline bool operator!=(const PollAnswer &a, const PollAnswer &b) {
@@ -39,13 +75,26 @@ struct PollData {
 	[[nodiscard]] Main::Session &session() const;
 
 	enum class Flag {
-		Closed      = 0x01,
-		PublicVotes = 0x02,
-		MultiChoice = 0x04,
-		Quiz        = 0x08,
+		Closed                = 0x001,
+		PublicVotes           = 0x002,
+		MultiChoice           = 0x004,
+		Quiz                  = 0x008,
+		ShuffleAnswers        = 0x010,
+		RevotingDisabled      = 0x020,
+		OpenAnswers           = 0x040,
+		HideResultsUntilClose = 0x080,
+		Creator               = 0x100,
+		SubscribersOnly       = 0x200,
+		CanViewStats          = 0x400,
 	};
 	friend inline constexpr bool is_flag_type(Flag) { return true; };
 	using Flags = base::flags<Flag>;
+	enum class VoteRestriction {
+		None,
+		SubscribersOnly,
+		SubscribersJoinedTooRecently,
+		Countries,
+	};
 
 	bool closeByTimer();
 	bool applyChanges(const MTPDpoll &poll);
@@ -63,6 +112,18 @@ struct PollData {
 	[[nodiscard]] bool publicVotes() const;
 	[[nodiscard]] bool multiChoice() const;
 	[[nodiscard]] bool quiz() const;
+	[[nodiscard]] bool shuffleAnswers() const;
+	[[nodiscard]] bool revotingDisabled() const;
+	[[nodiscard]] bool openAnswers() const;
+	[[nodiscard]] bool hideResultsUntilClose() const;
+	[[nodiscard]] bool creator() const;
+	[[nodiscard]] bool subscribersOnly() const;
+	[[nodiscard]] bool canViewStats() const;
+	void setVoteRestriction(VoteRestriction restriction);
+	[[nodiscard]] VoteRestriction voteRestriction() const;
+	[[nodiscard]] crl::time voteRestrictionUpdated() const;
+
+	[[nodiscard]] QString debugString() const;
 
 	PollId id = 0;
 	TextWithEntities question;
@@ -70,12 +131,16 @@ struct PollData {
 	std::vector<not_null<PeerData*>> recentVoters;
 	std::vector<QByteArray> sendingVotes;
 	TextWithEntities solution;
+	PollMedia attachedMedia;
+	PollMedia solutionMedia;
+	std::vector<QString> countries;
 	TimeId closePeriod = 0;
 	TimeId closeDate = 0;
 	int totalVoters = 0;
 	int version = 0;
+	uint64 hash = 0;
 
-	static constexpr auto kMaxOptions = 10;
+	static constexpr auto kMaxOptions = 32;
 
 private:
 	bool applyResultToAnswers(
@@ -84,13 +149,39 @@ struct PollData {
 
 	const not_null<Data::Session*> _owner;
 	Flags _flags = Flags();
+	VoteRestriction _voteRestriction = VoteRestriction::None;
+	crl::time _voteRestrictionUpdated = 0;
 	crl::time _lastResultsUpdate = 0; // < 0 means force reload.
 
 };
 
+inline constexpr auto kDefaultPollCreateFlags = PollData::Flag::PublicVotes
+	| PollData::Flag::MultiChoice
+	| PollData::Flag::OpenAnswers
+	| PollData::Flag::ShuffleAnswers;
+
+[[nodiscard]] QString JoinPollCountries(
+	const std::vector<QString> &countriesIso2);
+[[nodiscard]] TextWithEntities PollCountriesRestrictionText(
+	const std::vector<QString> &countries);
+[[nodiscard]] TextWithEntities PollVoteRestrictionText(
+	PollData::VoteRestriction restriction,
+	not_null<PeerData*> peer,
+	not_null<const PollData*> poll);
+
+[[nodiscard]] QByteArray PollOptionFromLink(const QString &value);
+[[nodiscard]] QString PollOptionToLink(const QByteArray &option);
+
 [[nodiscard]] MTPPoll PollDataToMTP(
 	not_null<const PollData*> poll,
 	bool close = false);
 [[nodiscard]] MTPInputMedia PollDataToInputMedia(
 	not_null<const PollData*> poll,
 	bool close = false);
+[[nodiscard]] MTPInputMedia PollMediaToMTP(const PollMedia &media);
+[[nodiscard]] PollMedia PollMediaFromMTP(
+	not_null<Data::Session*> owner,
+	const MTPMessageMedia &media);
+[[nodiscard]] PollMedia PollMediaFromInputMTP(
+	not_null<Data::Session*> owner,
+	const MTPInputMedia &media);
diff --git a/Telegram/SourceFiles/data/data_poll_messages.cpp b/Telegram/SourceFiles/data/data_poll_messages.cpp
new file mode 100644
index 00000000000000..a40eef83342218
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_poll_messages.cpp
@@ -0,0 +1,69 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/data_poll_messages.h"
+
+#include "data/data_messages.h"
+#include "data/data_shared_media.h"
+#include "data/data_sparse_ids.h"
+#include "data/data_chat.h"
+#include "history/history.h"
+#include "main/main_session.h"
+#include "storage/storage_shared_media.h"
+
+namespace Data {
+
+rpl::producer<MessagesSlice> PollMessagesViewer(
+		not_null<Main::Session*> session,
+		not_null<History*> history,
+		MsgId topicRootId,
+		PeerId monoforumPeerId,
+		MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) {
+	const auto peerId = history->peer->id;
+	const auto migrateFrom = history->peer->migrateFrom();
+	const auto migratedPeerId = migrateFrom ? migrateFrom->id : PeerId(0);
+	const auto messageId = ((aroundId.fullId.msg == ShowAtTheEndMsgId)
+			|| (aroundId == MaxMessagePosition))
+		? (ServerMaxMsgId - 1)
+		: (aroundId.fullId.peer == peerId)
+		? aroundId.fullId.msg
+		: (aroundId.fullId.msg
+			? (aroundId.fullId.msg - ServerMaxMsgId)
+			: (ServerMaxMsgId - 1));
+	const auto key = SharedMediaMergedKey(
+		SparseIdsMergedSlice::Key(
+			peerId,
+			topicRootId,
+			monoforumPeerId,
+			migratedPeerId,
+			messageId),
+		Storage::SharedMediaType::Poll);
+	return SharedMediaMergedViewer(
+		session,
+		key,
+		limitBefore,
+		limitAfter
+	) | rpl::map([=](SparseIdsMergedSlice &&slice) {
+		auto result = MessagesSlice();
+		result.fullCount = slice.fullCount();
+		result.skippedAfter = slice.skippedAfter();
+		result.skippedBefore = slice.skippedBefore();
+		const auto count = slice.size();
+		result.ids.reserve(count);
+		if (const auto msgId = slice.nearest(messageId)) {
+			result.nearestToAround = *msgId;
+		}
+		for (auto i = 0; i != count; ++i) {
+			result.ids.push_back(slice[i]);
+		}
+		return result;
+	});
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_poll_messages.h b/Telegram/SourceFiles/data/data_poll_messages.h
new file mode 100644
index 00000000000000..0febf13ef502ac
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_poll_messages.h
@@ -0,0 +1,30 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class History;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Data {
+
+struct MessagesSlice;
+struct MessagePosition;
+
+[[nodiscard]] rpl::producer<MessagesSlice> PollMessagesViewer(
+	not_null<Main::Session*> session,
+	not_null<History*> history,
+	MsgId topicRootId,
+	PeerId monoforumPeerId,
+	MessagePosition aroundId,
+	int limitBefore,
+	int limitAfter);
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_premium_limits.cpp b/Telegram/SourceFiles/data/data_premium_limits.cpp
index 6421f722a77e60..cb1fe7eada6dd9 100644
--- a/Telegram/SourceFiles/data/data_premium_limits.cpp
+++ b/Telegram/SourceFiles/data/data_premium_limits.cpp
@@ -68,7 +68,7 @@ int PremiumLimits::dialogFiltersDefault() const {
 	return appConfigLimit("dialog_filters_limit_default", 10);
 }
 int PremiumLimits::dialogFiltersPremium() const {
-	return appConfigLimit("dialog_filters_limit_premium", 20);
+	return appConfigLimit("dialog_filters_limit_premium", 30);
 }
 int PremiumLimits::dialogFiltersCurrent() const {
 	return isPremium()
@@ -176,6 +176,20 @@ int PremiumLimits::captionLengthCurrent() const {
 		: captionLengthDefault();
 }
 
+int PremiumLimits::messageLengthDefault() const {
+	return appConfigLimit("message_length_limit_default", 4096);
+}
+
+int PremiumLimits::messageLengthPremium() const {
+	return appConfigLimit("message_length_limit_premium", 8192);
+}
+
+int PremiumLimits::messageLengthCurrent() const {
+	return isPremium()
+		? messageLengthPremium()
+		: messageLengthDefault();
+}
+
 int PremiumLimits::uploadMaxDefault() const {
 	return appConfigLimit("upload_max_fileparts_default", 4000);
 }
@@ -200,12 +214,30 @@ int PremiumLimits::aboutLengthCurrent() const {
 		: aboutLengthDefault();
 }
 
+int PremiumLimits::contactNoteLengthCurrent() const {
+	return appConfigLimit("contact_note_length_limit", 128);
+}
+
 int PremiumLimits::maxBoostLevel() const {
 	return appConfigLimit(
 		u"boosts_channel_level_max"_q,
 		_session->isTestMode() ? 9 : 99);
 }
 
+int PremiumLimits::botsCreateDefault() const {
+	return appConfigLimit("bots_create_limit_default", 20);
+}
+int PremiumLimits::botsCreatePremium() const {
+	return appConfigLimit("bots_create_limit_premium", 40);
+}
+
+int PremiumLimits::aiComposeSavedTonesDefault() const {
+	return appConfigLimit("aicompose_tone_saved_limit_default", 5);
+}
+int PremiumLimits::aiComposeSavedTonesPremium() const {
+	return appConfigLimit("aicompose_tone_saved_limit_premium", 20);
+}
+
 int PremiumLimits::appConfigLimit(
 		const QString &key,
 		int fallback) const {
@@ -262,6 +294,12 @@ int LevelLimits::channelRestrictSponsoredLevelMin() const {
 		20);
 }
 
+int LevelLimits::channelAutoTranslateLevelMin() const {
+	return _session->appConfig().get<int>(
+		u"channel_autotranslation_level_min"_q,
+		3);
+}
+
 int LevelLimits::groupTranscribeLevelMin() const {
 	return _session->appConfig().get<int>(
 		u"group_transcribe_level_min"_q,
diff --git a/Telegram/SourceFiles/data/data_premium_limits.h b/Telegram/SourceFiles/data/data_premium_limits.h
index f1cfe146d71f91..bd499c990fee93 100644
--- a/Telegram/SourceFiles/data/data_premium_limits.h
+++ b/Telegram/SourceFiles/data/data_premium_limits.h
@@ -70,6 +70,9 @@ class PremiumLimits final {
 	[[nodiscard]] int captionLengthDefault() const;
 	[[nodiscard]] int captionLengthPremium() const;
 	[[nodiscard]] int captionLengthCurrent() const;
+	[[nodiscard]] int messageLengthDefault() const;
+	[[nodiscard]] int messageLengthPremium() const;
+	[[nodiscard]] int messageLengthCurrent() const;
 
 	[[nodiscard]] int uploadMaxDefault() const;
 	[[nodiscard]] int uploadMaxPremium() const;
@@ -79,8 +82,16 @@ class PremiumLimits final {
 	[[nodiscard]] int aboutLengthPremium() const;
 	[[nodiscard]] int aboutLengthCurrent() const;
 
+	[[nodiscard]] int contactNoteLengthCurrent() const;
+
 	[[nodiscard]] int maxBoostLevel() const;
 
+	[[nodiscard]] int botsCreateDefault() const;
+	[[nodiscard]] int botsCreatePremium() const;
+
+	[[nodiscard]] int aiComposeSavedTonesDefault() const;
+	[[nodiscard]] int aiComposeSavedTonesPremium() const;
+
 private:
 	[[nodiscard]] int appConfigLimit(
 		const QString &key,
@@ -102,6 +113,7 @@ class LevelLimits final {
 	[[nodiscard]] int channelWallpaperLevelMin() const;
 	[[nodiscard]] int channelCustomWallpaperLevelMin() const;
 	[[nodiscard]] int channelRestrictSponsoredLevelMin() const;
+	[[nodiscard]] int channelAutoTranslateLevelMin() const;
 	[[nodiscard]] int groupTranscribeLevelMin() const;
 	[[nodiscard]] int groupEmojiStickersLevelMin() const;
 	[[nodiscard]] int groupProfileBgIconLevelMin() const;
diff --git a/Telegram/SourceFiles/data/data_premium_subscription_option.h b/Telegram/SourceFiles/data/data_premium_subscription_option.h
index 6d5bd5e7339e1c..3dd9fc0a74d39d 100644
--- a/Telegram/SourceFiles/data/data_premium_subscription_option.h
+++ b/Telegram/SourceFiles/data/data_premium_subscription_option.h
@@ -10,10 +10,13 @@ For license and copyright information please follow this link:
 namespace Data {
 
 struct PremiumSubscriptionOption {
+	int months = 0;
 	QString duration;
 	QString discount;
 	QString costPerMonth;
-	QString costTotal;
+	QString costNoDiscount;
+	QString costPerYear;
+	QString currency;
 	QString total;
 	QString botUrl;
 };
diff --git a/Telegram/SourceFiles/data/data_replies_list.cpp b/Telegram/SourceFiles/data/data_replies_list.cpp
index 2a962dc1b6bc1a..4bf7d11868ad7d 100644
--- a/Telegram/SourceFiles/data/data_replies_list.cpp
+++ b/Telegram/SourceFiles/data/data_replies_list.cpp
@@ -71,7 +71,7 @@ RepliesList::RepliesList(
 , _readRequestTimer([=] { sendReadTillRequest(); }) {
 	if (_owningTopic) {
 		_owningTopic->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_owningTopic = nullptr;
 			subscribeToUpdates();
 		}, _lifetime);
@@ -96,7 +96,7 @@ void RepliesList::subscribeToUpdates() {
 	) | rpl::filter([=](const RepliesReadTillUpdate &update) {
 		return (update.id.msg == _rootId)
 			&& (update.id.peer == _history->peer->id);
-	}) | rpl::start_with_next([=](const RepliesReadTillUpdate &update) {
+	}) | rpl::on_next([=](const RepliesReadTillUpdate &update) {
 		apply(update);
 	}, _lifetime);
 
@@ -105,18 +105,18 @@ void RepliesList::subscribeToUpdates() {
 		| MessageUpdate::Flag::NewMaybeAdded
 		| MessageUpdate::Flag::ReplyToTopAdded
 		| MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const MessageUpdate &update) {
+	) | rpl::on_next([=](const MessageUpdate &update) {
 		apply(update);
 	}, _lifetime);
 
 	_history->session().changes().topicUpdates(
 		TopicUpdate::Flag::Creator
-	) | rpl::start_with_next([=](const TopicUpdate &update) {
+	) | rpl::on_next([=](const TopicUpdate &update) {
 		apply(update);
 	}, _lifetime);
 
 	_history->owner().channelDifferenceTooLong(
-	) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
+	) | rpl::on_next([=](not_null<ChannelData*> channel) {
 		if (channel == _history->peer) {
 			applyDifferenceTooLong();
 		}
@@ -194,19 +194,19 @@ rpl::producer<MessagesSlice> RepliesList::source(
 		_history->session().changes().historyUpdates(
 			_history,
 			HistoryUpdate::Flag::ClientSideMessages
-		) | rpl::start_with_next(pushDelayed, lifetime);
+		) | rpl::on_next(pushDelayed, lifetime);
 
 		_history->session().changes().messageUpdates(
 			MessageUpdate::Flag::Destroyed
 		) | rpl::filter([=](const MessageUpdate &update) {
 			return applyItemDestroyed(viewer, update.item);
-		}) | rpl::start_with_next(pushDelayed, lifetime);
+		}) | rpl::on_next(pushDelayed, lifetime);
 
 		_listChanges.events(
-		) | rpl::start_with_next(pushDelayed, lifetime);
+		) | rpl::on_next(pushDelayed, lifetime);
 
 		_instantChanges.events(
-		) | rpl::start_with_next(pushInstant, lifetime);
+		) | rpl::on_next(pushInstant, lifetime);
 
 		pushInstant();
 		return lifetime;
@@ -366,7 +366,7 @@ bool RepliesList::buildFromData(not_null<Viewer*> viewer) {
 	const auto around = [&] {
 		if (viewer->around != ShowAtUnreadMsgId) {
 			return viewer->around;
-		} else if (const auto item = lookupRoot()) {
+		} else if (lookupRoot()) {
 			return computeInboxReadTillFull();
 		} else if (_owningTopic) {
 			// Somehow we don't want always to jump to computed inboxReadTill
@@ -456,16 +456,16 @@ bool RepliesList::applyItemDestroyed(
 bool RepliesList::applyUpdate(const MessageUpdate &update) {
 	using Flag = MessageUpdate::Flag;
 
-	if (update.item->history() != _history
-		|| !update.item->isRegular()
-		|| !update.item->inThread(_rootId)) {
+	if (update.item->history() != _history || !update.item->isRegular()) {
 		return false;
 	}
+
 	const auto id = update.item->id;
+	const auto inThread = update.item->inThread(_rootId);
 	const auto added = (update.flags & Flag::ReplyToTopAdded);
 	const auto i = ranges::lower_bound(_list, id, std::greater<>());
 	if (update.flags & Flag::Destroyed) {
-		if (!added) {
+		if (!added && inThread) {
 			changeUnreadCountByPost(id, -1);
 		}
 		if (i == end(_list) || *i != id) {
@@ -480,6 +480,8 @@ bool RepliesList::applyUpdate(const MessageUpdate &update) {
 			}
 		}
 		return true;
+	} else if (!inThread) {
+		return false;
 	}
 	if (added) {
 		changeUnreadCountByPost(id, 1);
@@ -534,7 +536,7 @@ void RepliesList::loadAround(MsgId id) {
 
 	const auto send = [=](Fn<void()> finish) {
 		return _history->session().api().request(MTPmessages_GetReplies(
-			_history->peer->input,
+			_history->peer->input(),
 			MTP_int(_rootId),
 			MTP_int(id), // offset_id
 			MTP_int(0), // offset_date
@@ -591,7 +593,7 @@ void RepliesList::loadBefore() {
 	const auto last = _list.back();
 	const auto send = [=](Fn<void()> finish) {
 		return _history->session().api().request(MTPmessages_GetReplies(
-			_history->peer->input,
+			_history->peer->input(),
 			MTP_int(_rootId),
 			MTP_int(last), // offset_id
 			MTP_int(0), // offset_date
@@ -635,7 +637,7 @@ void RepliesList::loadAfter() {
 	const auto first = _list.front();
 	const auto send = [=](Fn<void()> finish) {
 		return _history->session().api().request(MTPmessages_GetReplies(
-			_history->peer->input,
+			_history->peer->input(),
 			MTP_int(_rootId),
 			MTP_int(first + 1), // offset_id
 			MTP_int(0), // offset_date
@@ -691,17 +693,19 @@ bool RepliesList::processMessagesIsEmpty(const MTPmessages_Messages &result) {
 			"(HistoryWidget::messagesReceived)"));
 		return 0;
 	}, [&](const MTPDmessages_messages &data) {
+		_history->peer->processTopics(data.vtopics());
 		return int(data.vmessages().v.size());
 	}, [&](const MTPDmessages_messagesSlice &data) {
+		_history->peer->processTopics(data.vtopics());
 		return data.vcount().v;
 	}, [&](const MTPDmessages_channelMessages &data) {
 		if (const auto channel = _history->peer->asChannel()) {
 			channel->ptsReceived(data.vpts().v);
-			channel->processTopics(data.vtopics());
 		} else {
 			LOG(("API Error: received messages.channelMessages when "
 				"no channel was passed! (HistoryWidget::messagesReceived)"));
 		}
+		_history->peer->processTopics(data.vtopics());
 		return data.vcount().v;
 	});
 
@@ -938,7 +942,7 @@ void RepliesList::requestUnreadCount() {
 	};
 	_reloadUnreadCountRequestId = session->api().request(
 		MTPmessages_GetDiscussionMessage(
-			_history->peer->input,
+			_history->peer->input(),
 			MTP_int(_rootId))
 	).done([=](const MTPmessages_DiscussionMessage &result) {
 		if (weak) {
@@ -1002,7 +1006,7 @@ void RepliesList::sendReadTillRequest() {
 	api->request(base::take(_readRequestId)).cancel();
 
 	_readRequestId = api->request(MTPmessages_ReadDiscussion(
-		_history->peer->input,
+		_history->peer->input(),
 		MTP_int(_rootId),
 		MTP_int(computeInboxReadTillFull())
 	)).done(crl::guard(this, [=] {
diff --git a/Telegram/SourceFiles/data/data_replies_list.h b/Telegram/SourceFiles/data/data_replies_list.h
index 42f56c1aec7ebf..12770b6deaad35 100644
--- a/Telegram/SourceFiles/data/data_replies_list.h
+++ b/Telegram/SourceFiles/data/data_replies_list.h
@@ -58,8 +58,6 @@ class RepliesList final : public base::has_weak_ptr {
 	[[nodiscard]] bool isServerSideUnread(
 		not_null<const HistoryItem*> item) const;
 
-	[[nodiscard]] std::optional<int> computeUnreadCountLocally(
-		MsgId afterId) const;
 	void requestUnreadCount();
 
 	void readTill(not_null<HistoryItem*> item);
@@ -71,6 +69,10 @@ class RepliesList final : public base::has_weak_ptr {
 		return _lifetime;
 	}
 
+	[[nodiscard]] HistoryItem *divider() const {
+		return _divider;
+	}
+
 private:
 	struct Viewer;
 
@@ -79,6 +81,8 @@ class RepliesList final : public base::has_weak_ptr {
 
 	void subscribeToUpdates();
 	void appendClientSideMessages(MessagesSlice &slice);
+	[[nodiscard]] std::optional<int> computeUnreadCountLocally(
+		MsgId afterId) const;
 
 	[[nodiscard]] bool buildFromData(not_null<Viewer*> viewer);
 	[[nodiscard]] bool applyItemDestroyed(
diff --git a/Telegram/SourceFiles/data/data_saved_messages.cpp b/Telegram/SourceFiles/data/data_saved_messages.cpp
index 9a4f4441f91897..6d309a324caff1 100644
--- a/Telegram/SourceFiles/data/data_saved_messages.cpp
+++ b/Telegram/SourceFiles/data/data_saved_messages.cpp
@@ -8,38 +8,117 @@ For license and copyright information please follow this link:
 #include "data/data_saved_messages.h"
 
 #include "apiwrap.h"
-#include "data/data_peer.h"
+#include "core/application.h"
+#include "data/components/recent_peers.h"
+#include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_histories.h"
+#include "data/data_user.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/history_unread_things.h"
 #include "main/main_session.h"
+#include "storage/storage_facade.h"
+#include "storage/storage_shared_media.h"
+#include "window/notifications_manager.h"
 
 namespace Data {
 namespace {
 
-constexpr auto kPerPage = 50;
-constexpr auto kFirstPerPage = 10;
 constexpr auto kListPerPage = 100;
 constexpr auto kListFirstPerPage = 20;
+constexpr auto kLoadedSublistsMinCount = 20;
+constexpr auto kShowSublistNamesCount = 5;
+constexpr auto kStalePerRequest = 100;
 
 } // namespace
 
-SavedMessages::SavedMessages(not_null<Session*> owner)
+SavedMessages::SavedMessages(
+	not_null<Session*> owner,
+	ChannelData *parentChat)
 : _owner(owner)
+, _parentChat(parentChat)
+, _owningHistory(parentChat ? owner->history(parentChat).get() : nullptr)
 , _chatsList(
-	&owner->session(),
+	&_owner->session(),
 	FilterId(),
-	owner->maxPinnedChatsLimitValue(this))
+	_owner->maxPinnedChatsLimitValue(this))
 , _loadMore([=] { sendLoadMoreRequests(); }) {
+	// We don't assign _owningHistory for my Saved Messages here,
+	// because the data structures are not ready yet.
+	if (_owningHistory && _owningHistory->inChatList()) {
+		preloadSublists();
+	}
 }
 
-SavedMessages::~SavedMessages() = default;
+void SavedMessages::clear() {
+	for (const auto &request : base::take(_sublistRequests)) {
+		if (request.second.id != _staleRequestId) {
+			owner().histories().cancelRequest(request.second.id);
+		}
+	}
+	if (const auto requestId = base::take(_staleRequestId)) {
+		session().api().request(requestId).cancel();
+	}
+
+	auto &storage = session().storage();
+	auto &changes = session().changes();
+	if (_owningHistory) {
+		for (const auto &[peer, sublist] : base::take(_sublists)) {
+			storage.unload(Storage::SharedMediaUnloadThread(
+				_owningHistory->peer->id,
+				MsgId(),
+				peer->id));
+			_owningHistory->setForwardDraft(MsgId(), peer->id, {});
+
+			const auto raw = sublist.get();
+			changes.sublistRemoved(raw);
+			changes.entryRemoved(raw);
+		}
+	}
+	_owningHistory = nullptr;
+}
+
+void SavedMessages::saveActiveSubsectionThread(not_null<Thread*> thread) {
+	if (const auto sublist = thread->asSublist()) {
+		Assert(sublist->parent() == this);
+		_activeSubsectionSublist = sublist;
+	} else {
+		Assert(thread == _owningHistory);
+		_activeSubsectionSublist = nullptr;
+	}
+}
+
+Thread *SavedMessages::activeSubsectionThread() const {
+	return _activeSubsectionSublist;
+}
+
+SavedMessages::~SavedMessages() {
+	clear();
+}
 
 bool SavedMessages::supported() const {
 	return !_unsupported;
 }
 
+void SavedMessages::markUnsupported() {
+	_unsupported = true;
+}
+
+ChannelData *SavedMessages::parentChat() const {
+	return _parentChat;
+}
+
+not_null<History*> SavedMessages::owningHistory() const {
+	if (!_owningHistory) {
+		const_cast<SavedMessages*>(this)->_owningHistory
+			= _owner->history(_owner->session().user());
+	}
+	return _owningHistory;
+}
+
 Session &SavedMessages::owner() const {
 	return *_owner;
 }
@@ -53,13 +132,135 @@ not_null<Dialogs::MainList*> SavedMessages::chatsList() {
 }
 
 not_null<SavedSublist*> SavedMessages::sublist(not_null<PeerData*> peer) {
-	const auto i = _sublists.find(peer);
-	if (i != end(_sublists)) {
-		return i->second.get();
+	if (const auto loaded = sublistLoaded(peer)) {
+		return loaded;
 	}
 	return _sublists.emplace(
 		peer,
-		std::make_unique<SavedSublist>(peer)).first->second.get();
+		std::make_unique<SavedSublist>(this, peer)).first->second.get();
+}
+
+SavedSublist *SavedMessages::sublistLoaded(not_null<PeerData*> peer) {
+	const auto i = _sublists.find(peer);
+	return (i != end(_sublists)) ? i->second.get() : nullptr;
+}
+
+void SavedMessages::requestSomeStale() {
+	if (_staleRequestId
+		|| (!_offset.id && _loadMoreRequestId)
+		|| _stalePeers.empty()
+		|| !_parentChat) {
+		return;
+	}
+	const auto type = Histories::RequestType::History;
+	auto peers = std::vector<not_null<PeerData*>>();
+	auto peerIds = QVector<MTPInputPeer>();
+	peers.reserve(std::min(int(_stalePeers.size()), kStalePerRequest));
+	peerIds.reserve(std::min(int(_stalePeers.size()), kStalePerRequest));
+	for (auto i = begin(_stalePeers); i != end(_stalePeers);) {
+		const auto peer = *i;
+		i = _stalePeers.erase(i);
+
+		peers.push_back(peer);
+		peerIds.push_back(peer->input());
+		if (peerIds.size() == kStalePerRequest) {
+			break;
+		}
+	}
+	if (peerIds.empty()) {
+		return;
+	}
+	const auto call = [=] {
+		for (const auto &peer : peers) {
+			finishSublistRequest(peer);
+		}
+		for (const auto &peer : peers) {
+			if (const auto sublist = sublistLoaded(peer)) {
+				if (!sublist->lastMessage()
+					&& !sublist->lastServerMessage()) {
+					applySublistDeleted(peer);
+				}
+			}
+		}
+	};
+	auto &histories = owner().histories();
+	_staleRequestId = histories.sendRequest(_owningHistory, type, [=](
+			Fn<void()> finish) {
+		using Flag = MTPmessages_GetSavedDialogsByID::Flag;
+		return session().api().request(
+			MTPmessages_GetSavedDialogsByID(
+				MTP_flags(Flag::f_parent_peer),
+				_parentChat->input(),
+				MTP_vector<MTPInputPeer>(peerIds))
+		).done([=](const MTPmessages_SavedDialogs &result) {
+			_staleRequestId = 0;
+			applyReceivedSublists(result);
+			call();
+			finish();
+		}).fail([=] {
+			_staleRequestId = 0;
+			call();
+			finish();
+		}).send();
+	});
+	for (const auto &peer : peers) {
+		_sublistRequests[peer].id = _staleRequestId;
+	}
+}
+
+void SavedMessages::finishSublistRequest(not_null<PeerData*> peer) {
+	if (const auto request = _sublistRequests.take(peer)) {
+		for (const auto &callback : request->callbacks) {
+			callback();
+		}
+	}
+}
+
+void SavedMessages::requestSublist(
+		not_null<PeerData*> peer,
+		Fn<void()> done) {
+	if (!_parentChat) {
+		return;
+	}
+	auto &request = _sublistRequests[peer];
+	if (done) {
+		request.callbacks.push_back(std::move(done));
+	}
+	if (!request.id
+		&& _stalePeers.emplace(peer).second
+		&& (_stalePeers.size() == 1)) {
+		crl::on_main(&session(), [peer = _parentChat] {
+			if (const auto monoforum = peer->monoforum()) {
+				monoforum->requestSomeStale();
+			}
+		});
+	}
+}
+
+void SavedMessages::refreshPinned() {
+	if (parentChat()) {
+		return;
+	}
+	if (_pinnedRequestId) {
+		_refreshPinnedAfterRequest = true;
+		return;
+	}
+	loadPinned();
+}
+
+rpl::producer<> SavedMessages::chatsListChanges() const {
+	return _chatsListChanges.events();
+}
+
+rpl::producer<> SavedMessages::chatsListLoadedEvents() const {
+	return _chatsListLoadedEvents.events();
+}
+
+void SavedMessages::preloadSublists() {
+	if (parentChat()
+		&& chatsList()->indexed()->size() < kLoadedSublistsMinCount) {
+		loadMore();
+	}
 }
 
 void SavedMessages::loadMore() {
@@ -67,30 +268,53 @@ void SavedMessages::loadMore() {
 	_loadMore.call();
 }
 
-void SavedMessages::loadMore(not_null<SavedSublist*> sublist) {
-	_loadMoreSublistsScheduled.emplace(sublist);
-	_loadMore.call();
+void SavedMessages::clearAllUnreadReactions() {
+	for (const auto &[peer, sublist] : _sublists) {
+		sublist->unreadReactions().clear();
+	}
 }
 
 void SavedMessages::sendLoadMore() {
-	if (_loadMoreRequestId || _chatsList.loaded()) {
+	if (_loadMoreRequestId) {
 		return;
-	} else if (!_pinnedLoaded) {
+	}
+	if (!_pinnedLoaded) {
 		loadPinned();
 	}
+	if (_chatsList.loaded()) {
+		return;
+	}
+	using Flag = MTPmessages_GetSavedDialogs::Flag;
 	_loadMoreRequestId = _owner->session().api().request(
 		MTPmessages_GetSavedDialogs(
-			MTP_flags(MTPmessages_GetSavedDialogs::Flag::f_exclude_pinned),
-			MTP_int(_offsetDate),
-			MTP_int(_offsetId),
-			_offsetPeer ? _offsetPeer->input : MTP_inputPeerEmpty(),
-			MTP_int(_offsetId ? kListPerPage : kListFirstPerPage),
+			MTP_flags(Flag::f_exclude_pinned
+				| (_parentChat ? Flag::f_parent_peer : Flag(0))),
+			_parentChat ? _parentChat->input() : MTPInputPeer(),
+			MTP_int(_offset.date),
+			MTP_int(_offset.id),
+			_offset.peer ? _offset.peer->input() : MTP_inputPeerEmpty(),
+			MTP_int(_offset.id ? kListPerPage : kListFirstPerPage),
 			MTP_long(0)) // hash
 	).done([=](const MTPmessages_SavedDialogs &result) {
-		apply(result, false);
+		const auto applied = applyReceivedSublists(result);
+		if (applied.allLoaded || _offset == applied.offset) {
+			_chatsList.setLoaded();
+		} else if (_offset.date > 0 && applied.offset.date > _offset.date) {
+			LOG(("API Error: Bad order in messages.savedDialogs."));
+			_chatsList.setLoaded();
+		} else {
+			_offset = applied.offset;
+		}
+		_loadMoreRequestId = 0;
+		_chatsListChanges.fire({});
+		if (_chatsList.loaded()) {
+			_chatsListLoadedEvents.fire({});
+		}
+		reorderLastSublists();
+		requestSomeStale();
 	}).fail([=](const MTP::Error &error) {
 		if (error.type() == u"SAVED_DIALOGS_UNSUPPORTED"_q) {
-			_unsupported = true;
+			markUnsupported();
 		}
 		_chatsList.setLoaded();
 		_loadMoreRequestId = 0;
@@ -98,94 +322,39 @@ void SavedMessages::sendLoadMore() {
 }
 
 void SavedMessages::loadPinned() {
-	if (_pinnedRequestId) {
+	if (_pinnedRequestId || parentChat()) {
 		return;
 	}
 	_pinnedRequestId = _owner->session().api().request(
 		MTPmessages_GetPinnedSavedDialogs()
 	).done([=](const MTPmessages_SavedDialogs &result) {
-		apply(result, true);
+		_pinnedRequestId = 0;
+		_pinnedLoaded = true;
+		applyReceivedSublists(result, true);
+		_chatsListChanges.fire({});
+		if (_refreshPinnedAfterRequest) {
+			_refreshPinnedAfterRequest = false;
+			loadPinned();
+		}
 	}).fail([=](const MTP::Error &error) {
 		if (error.type() == u"SAVED_DIALOGS_UNSUPPORTED"_q) {
-			_unsupported = true;
+			markUnsupported();
 		} else {
 			_pinnedLoaded = true;
 		}
 		_pinnedRequestId = 0;
-	}).send();
-}
-
-void SavedMessages::sendLoadMore(not_null<SavedSublist*> sublist) {
-	if (_loadMoreRequests.contains(sublist) || sublist->isFullLoaded()) {
-		return;
-	}
-	const auto &list = sublist->messages();
-	const auto offsetId = list.empty() ? MsgId(0) : list.back()->id;
-	const auto offsetDate = list.empty() ? MsgId(0) : list.back()->date();
-	const auto limit = offsetId ? kPerPage : kFirstPerPage;
-	const auto requestId = _owner->session().api().request(
-		MTPmessages_GetSavedHistory(
-			sublist->peer()->input,
-			MTP_int(offsetId),
-			MTP_int(offsetDate),
-			MTP_int(0), // add_offset
-			MTP_int(limit),
-			MTP_int(0), // max_id
-			MTP_int(0), // min_id
-			MTP_long(0)) // hash
-	).done([=](const MTPmessages_Messages &result) {
-		auto count = 0;
-		auto list = (const QVector<MTPMessage>*)nullptr;
-		result.match([](const MTPDmessages_channelMessages &) {
-			LOG(("API Error: messages.channelMessages in sublist."));
-		}, [](const MTPDmessages_messagesNotModified &) {
-			LOG(("API Error: messages.messagesNotModified in sublist."));
-		}, [&](const auto &data) {
-			owner().processUsers(data.vusers());
-			owner().processChats(data.vchats());
-			list = &data.vmessages().v;
-			if constexpr (MTPDmessages_messages::Is<decltype(data)>()) {
-				count = int(list->size());
-			} else {
-				count = data.vcount().v;
-			}
-		});
-
-		_loadMoreRequests.remove(sublist);
-		if (!list) {
-			sublist->setFullLoaded();
-			return;
-		}
-		auto items = std::vector<not_null<HistoryItem*>>();
-		items.reserve(list->size());
-		for (const auto &message : *list) {
-			const auto item = owner().addNewMessage(
-				message,
-				{},
-				NewMessageType::Existing);
-			if (item) {
-				items.push_back(item);
-			}
-		}
-		sublist->append(std::move(items), count);
-		if (result.type() == mtpc_messages_messages) {
-			sublist->setFullLoaded();
-		}
-	}).fail([=](const MTP::Error &error) {
-		if (error.type() == u"SAVED_DIALOGS_UNSUPPORTED"_q) {
-			_unsupported = true;
+		if (_refreshPinnedAfterRequest) {
+			_refreshPinnedAfterRequest = false;
+			loadPinned();
 		}
-		sublist->setFullLoaded();
-		_loadMoreRequests.remove(sublist);
 	}).send();
-	_loadMoreRequests[sublist] = requestId;
 }
 
-void SavedMessages::apply(
-		const MTPmessages_SavedDialogs &result,
+SavedMessages::ApplyResult SavedMessages::applyReceivedSublists(
+		const MTPmessages_SavedDialogs &dialogs,
 		bool pinned) {
 	auto list = (const QVector<MTPSavedDialog>*)nullptr;
-	result.match([](const MTPDmessages_savedDialogsNotModified &) {
+	dialogs.match([](const MTPDmessages_savedDialogsNotModified &) {
 		LOG(("API Error: messages.savedDialogsNotModified."));
 	}, [&](const auto &data) {
 		_owner->processUsers(data.vusers());
@@ -195,69 +364,95 @@ void SavedMessages::apply(
 			NewMessageType::Existing);
 		list = &data.vdialogs().v;
 	});
-	if (pinned) {
-		_pinnedRequestId = 0;
-		_pinnedLoaded = true;
-	} else {
-		_loadMoreRequestId = 0;
-	}
 	if (!list) {
-		if (!pinned) {
-			_chatsList.setLoaded();
-		}
-		return;
+		return { .allLoaded = true };
 	}
 	auto lastValid = false;
-	auto offsetDate = TimeId();
-	auto offsetId = MsgId();
-	auto offsetPeer = (PeerData*)nullptr;
-	const auto selfId = _owner->session().userPeerId();
+	auto result = ApplyResult();
+	auto serverPinnedPeers = base::flat_set<not_null<PeerData*>>();
+	const auto parentPeerId = _parentChat
+		? _parentChat->id
+		: _owner->session().userPeerId();
 	for (const auto &dialog : *list) {
-		const auto &data = dialog.data();
-		const auto peer = _owner->peer(peerFromMTP(data.vpeer()));
-		const auto topId = MsgId(data.vtop_message().v);
-		if (const auto item = _owner->message(selfId, topId)) {
-			offsetPeer = peer;
-			offsetDate = item->date();
-			offsetId = topId;
-			lastValid = true;
-			const auto entry = sublist(peer);
+		dialog.match([&](const MTPDsavedDialog &data) {
+			const auto peer = _owner->peer(peerFromMTP(data.vpeer()));
 			const auto entryPinned = pinned || data.is_pinned();
-			entry->applyMaybeLast(item);
-			_owner->setPinnedFromEntryList(entry, entryPinned);
-		} else {
-			lastValid = false;
-		}
+			const auto topId = MsgId(data.vtop_message().v);
+			if (entryPinned) {
+				serverPinnedPeers.emplace(peer);
+			}
+			if (entryPinned) {
+				if (const auto loaded = sublistLoaded(peer)) {
+					_owner->setPinnedFromEntryList(loaded, true);
+				}
+			}
+			if (const auto item = _owner->message(parentPeerId, topId);
+				item
+				&& item->isRegular()
+				&& !item->isService()) {
+				result.offset.peer = peer;
+				result.offset.date = item->date();
+				result.offset.id = topId;
+				lastValid = true;
+				const auto entry = sublist(peer);
+				entry->applyMaybeLast(item);
+				_owner->setPinnedFromEntryList(entry, entryPinned);
+			} else {
+				lastValid = false;
+			}
+		}, [&](const MTPDmonoForumDialog &data) {
+			const auto peer = _owner->peer(peerFromMTP(data.vpeer()));
+			if (pinned) {
+				serverPinnedPeers.emplace(peer);
+			}
+			const auto topId = MsgId(data.vtop_message().v);
+			if (const auto item = _owner->message(parentPeerId, topId);
+				item
+				&& item->isRegular()
+				&& !item->isService()) {
+				result.offset.peer = peer;
+				result.offset.date = item->date();
+				result.offset.id = topId;
+				lastValid = true;
+				sublist(peer)->applyMonoforumDialog(data, item);
+			} else {
+				lastValid = false;
+			}
+		});
 	}
 	if (pinned) {
+		for (const auto &[peer, holder] : _sublists) {
+			const auto entry = holder.get();
+			if (entry->isPinnedDialog(FilterId())
+				&& !serverPinnedPeers.contains(peer)) {
+				if (!entry->parentChat() && !entry->chatListMessage()) {
+					entry->setRestorePinnedWhenNonEmpty(true);
+				}
+				_owner->setChatPinned(entry, FilterId(), false);
+			}
+			entry->updateChatListExistence();
+		}
 	} else if (!lastValid) {
 		LOG(("API Error: Unknown message in the end of a slice."));
-		_chatsList.setLoaded();
-	} else if (result.type() == mtpc_messages_savedDialogs) {
-		_chatsList.setLoaded();
-	} else if ((_offsetDate > 0 && offsetDate > _offsetDate)
-		|| (offsetDate == _offsetDate
-			&& offsetId == _offsetId
-			&& offsetPeer == _offsetPeer)) {
-		LOG(("API Error: Bad order in messages.savedDialogs."));
-		_chatsList.setLoaded();
-	} else {
-		_offsetDate = offsetDate;
-		_offsetId = offsetId;
-		_offsetPeer = offsetPeer;
+		result.allLoaded = true;
+	} else if (dialogs.type() == mtpc_messages_savedDialogs) {
+		result.allLoaded = true;
 	}
+	if (!_stalePeers.empty()) {
+		requestSomeStale();
+	}
+	return result;
 }
 
 void SavedMessages::sendLoadMoreRequests() {
 	if (_loadMoreScheduled) {
 		sendLoadMore();
 	}
-	for (const auto sublist : base::take(_loadMoreSublistsScheduled)) {
-		sendLoadMore(sublist);
-	}
 }
 
 void SavedMessages::apply(const MTPDupdatePinnedSavedDialogs &update) {
+	Expects(!parentChat());
+
 	const auto list = update.vorder();
 	if (!list) {
 		loadPinned();
@@ -283,6 +478,8 @@ void SavedMessages::apply(const MTPDupdatePinnedSavedDialogs &update) {
 }
 
 void SavedMessages::apply(const MTPDupdateSavedDialogPinned &update) {
+	Expects(!parentChat());
+
 	update.vpeer().match([&](const MTPDdialogPeer &data) {
 		const auto peer = _owner->peer(peerFromMTP(data.vpeer()));
 		const auto i = _sublists.find(peer);
@@ -297,4 +494,150 @@ void SavedMessages::apply(const MTPDupdateSavedDialogPinned &update) {
 	});
 }
 
+void SavedMessages::applySublistDeleted(not_null<PeerData*> sublistPeer) {
+	const auto i = _sublists.find(sublistPeer);
+	if (i == end(_sublists)) {
+		return;
+	}
+	const auto raw = i->second.get();
+	Core::App().notifications().clearFromSublist(raw);
+	owner().removeChatListEntry(raw);
+
+	if (ranges::contains(_lastSublists, not_null(raw))) {
+		reorderLastSublists();
+	}
+	if (_activeSubsectionSublist == raw) {
+		_activeSubsectionSublist = nullptr;
+	}
+
+	_sublistDestroyed.fire(raw);
+	_owner->session().recentPeers().chatOpenRemove(raw);
+	session().changes().sublistUpdated(
+		raw,
+		Data::SublistUpdate::Flag::Destroyed);
+	session().changes().entryUpdated(
+		raw,
+		Data::EntryUpdate::Flag::Destroyed);
+	_sublists.erase(i);
+
+	const auto history = owningHistory();
+	history->destroyMessagesBySublist(sublistPeer);
+	session().storage().unload(Storage::SharedMediaUnloadThread(
+		_owningHistory->peer->id,
+		MsgId(),
+		sublistPeer->id));
+	history->setForwardDraft(MsgId(), sublistPeer->id, {});
+}
+
+void SavedMessages::reorderLastSublists() {
+	if (!_parentChat) {
+		return;
+	}
+
+	// We want first kShowChatNamesCount histories, by last message date.
+	const auto pred = [](
+			not_null<SavedSublist*> a,
+			not_null<SavedSublist*> b) {
+		const auto aItem = a->chatListMessage();
+		const auto bItem = b->chatListMessage();
+		const auto aDate = aItem ? aItem->date() : TimeId(0);
+		const auto bDate = bItem ? bItem->date() : TimeId(0);
+		return aDate > bDate;
+	};
+	_lastSublists.clear();
+	_lastSublists.reserve(kShowSublistNamesCount + 1);
+	auto &&sublists = ranges::views::all(
+		*_chatsList.indexed()
+	) | ranges::views::transform([](not_null<Dialogs::Row*> row) {
+		return row->sublist();
+	});
+	auto nonPinnedChecked = 0;
+	for (const auto sublist : sublists) {
+		const auto i = ranges::upper_bound(
+			_lastSublists,
+			not_null(sublist),
+			pred);
+		if (size(_lastSublists) < kShowSublistNamesCount
+			|| i != end(_lastSublists)) {
+			_lastSublists.insert(i, sublist);
+		}
+		if (size(_lastSublists) > kShowSublistNamesCount) {
+			_lastSublists.pop_back();
+		}
+		if (!sublist->isPinnedDialog(FilterId())
+			&& ++nonPinnedChecked >= kShowSublistNamesCount) {
+			break;
+		}
+	}
+	++_lastSublistsVersion;
+	owningHistory()->updateChatListEntry();
+}
+
+void SavedMessages::listMessageChanged(HistoryItem *from, HistoryItem *to) {
+	if (from || to) {
+		reorderLastSublists();
+	}
+}
+
+int SavedMessages::recentSublistsListVersion() const {
+	return _lastSublistsVersion;
+}
+
+void SavedMessages::recentSublistsInvalidate(
+		not_null<SavedSublist*> sublist) {
+	Expects(_parentChat != nullptr);
+
+	if (ranges::contains(_lastSublists, sublist)) {
+		++_lastSublistsVersion;
+		owningHistory()->updateChatListEntry();
+	}
+}
+
+auto SavedMessages::recentSublists() const
+-> const std::vector<not_null<SavedSublist*>> & {
+	return _lastSublists;
+}
+
+void SavedMessages::markUnreadCountsUnknown(MsgId readTillId) {
+	for (const auto &[peer, sublist] : _sublists) {
+		if (sublist->unreadCountCurrent() > 0) {
+			sublist->setInboxReadTill(readTillId, std::nullopt);
+		}
+	}
+}
+
+void SavedMessages::updateUnreadCounts(
+		MsgId readTillId,
+		const base::flat_map<not_null<SavedSublist*>, int> &counts) {
+	for (const auto &[peer, sublist] : _sublists) {
+		const auto raw = sublist.get();
+		const auto i = counts.find(raw);
+		const auto count = (i != end(counts)) ? i->second : 0;
+		if (raw->unreadCountCurrent() != count) {
+			raw->setInboxReadTill(readTillId, count);
+		}
+	}
+}
+
+rpl::producer<> SavedMessages::destroyed() const {
+	if (!_parentChat) {
+		return rpl::never<>();
+	}
+	return _parentChat->flagsValue(
+	) | rpl::filter([=](const ChannelData::Flags::Change &update) {
+		using Flag = ChannelData::Flag;
+		return (update.diff & Flag::MonoforumAdmin)
+			&& !(update.value & Flag::MonoforumAdmin);
+	}) | rpl::take(1) | rpl::to_empty;
+}
+
+auto SavedMessages::sublistDestroyed() const
+-> rpl::producer<not_null<SavedSublist*>> {
+	return _sublistDestroyed.events();
+}
+
+rpl::lifetime &SavedMessages::lifetime() {
+	return _lifetime;
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_saved_messages.h b/Telegram/SourceFiles/data/data_saved_messages.h
index 3e09f4db0aac3e..82b9aed5cb2e12 100644
--- a/Telegram/SourceFiles/data/data_saved_messages.h
+++ b/Telegram/SourceFiles/data/data_saved_messages.h
@@ -9,6 +9,10 @@ For license and copyright information please follow this link:
 
 #include "dialogs/dialogs_main_list.h"
 
+namespace Dialogs {
+struct UnreadState;
+} // namespace Dialogs
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -18,55 +22,132 @@ namespace Data {
 class Session;
 class SavedSublist;
 
+struct SavedMessagesOffsets {
+	TimeId date = 0;
+	MsgId id = 0;
+	PeerData *peer = nullptr;
+
+	friend inline constexpr auto operator<=>(
+		SavedMessagesOffsets,
+		SavedMessagesOffsets) = default;
+};
+
 class SavedMessages final {
 public:
-	explicit SavedMessages(not_null<Session*> owner);
+	explicit SavedMessages(
+		not_null<Session*> owner,
+		ChannelData *parentChat = nullptr);
 	~SavedMessages();
 
 	[[nodiscard]] bool supported() const;
+	void markUnsupported();
+
+	[[nodiscard]] ChannelData *parentChat() const;
+	[[nodiscard]] not_null<History*> owningHistory() const;
 
 	[[nodiscard]] Session &owner() const;
 	[[nodiscard]] Main::Session &session() const;
 
 	[[nodiscard]] not_null<Dialogs::MainList*> chatsList();
 	[[nodiscard]] not_null<SavedSublist*> sublist(not_null<PeerData*> peer);
+	[[nodiscard]] SavedSublist *sublistLoaded(not_null<PeerData*> peer);
+	void requestSublist(not_null<PeerData*> peer, Fn<void()> done = nullptr);
+	void refreshPinned();
 
+	[[nodiscard]] rpl::producer<> chatsListChanges() const;
+	[[nodiscard]] rpl::producer<> chatsListLoadedEvents() const;
+
+	[[nodiscard]] rpl::producer<> destroyed() const;
+	[[nodiscard]] auto sublistDestroyed() const
+		-> rpl::producer<not_null<SavedSublist*>>;
+
+	void preloadSublists();
 	void loadMore();
-	void loadMore(not_null<SavedSublist*> sublist);
+	void clearAllUnreadReactions();
 
 	void apply(const MTPDupdatePinnedSavedDialogs &update);
 	void apply(const MTPDupdateSavedDialogPinned &update);
+	void applySublistDeleted(not_null<PeerData*> sublistPeer);
+
+	void listMessageChanged(HistoryItem *from, HistoryItem *to);
+	[[nodiscard]] int recentSublistsListVersion() const;
+	void recentSublistsInvalidate(not_null<SavedSublist*> sublist);
+	[[nodiscard]] auto recentSublists() const
+		-> const std::vector<not_null<SavedSublist*>> &;
+
+	void markUnreadCountsUnknown(MsgId readTillId);
+	void updateUnreadCounts(
+		MsgId readTillId,
+		const base::flat_map<not_null<SavedSublist*>, int> &counts);
+
+	void clear();
+
+	void saveActiveSubsectionThread(not_null<Thread*> thread);
+	Thread *activeSubsectionThread() const;
+
+	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
+	struct SublistRequest {
+		mtpRequestId id = 0;
+		std::vector<Fn<void()>> callbacks;
+	};
+	struct ApplyResult {
+		SavedMessagesOffsets offset;
+		bool allLoaded = false;
+	};
+
 	void loadPinned();
-	void apply(const MTPmessages_SavedDialogs &result, bool pinned);
+	ApplyResult applyReceivedSublists(
+		const MTPmessages_SavedDialogs &result,
+		SavedMessagesOffsets &updateOffsets);
+	ApplyResult applyReceivedSublists(
+		const MTPmessages_SavedDialogs &result,
+		bool pinned = false);
+
+	void reorderLastSublists();
+	void requestSomeStale();
+	void finishSublistRequest(not_null<PeerData*> peer);
 
 	void sendLoadMore();
-	void sendLoadMore(not_null<SavedSublist*> sublist);
 	void sendLoadMoreRequests();
 
 	const not_null<Session*> _owner;
+	ChannelData *_parentChat = nullptr;
+	History *_owningHistory = nullptr;
+
+	rpl::event_stream<not_null<SavedSublist*>> _sublistDestroyed;
 
 	Dialogs::MainList _chatsList;
 	base::flat_map<
 		not_null<PeerData*>,
 		std::unique_ptr<SavedSublist>> _sublists;
+	base::flat_map<not_null<PeerData*>, SublistRequest> _sublistRequests;
+	base::flat_set<not_null<PeerData*>> _stalePeers;
+	mtpRequestId _staleRequestId = 0;
 
-	base::flat_map<not_null<SavedSublist*>, mtpRequestId> _loadMoreRequests;
 	mtpRequestId _loadMoreRequestId = 0;
 	mtpRequestId _pinnedRequestId = 0;
+	bool _refreshPinnedAfterRequest = false;
 
-	TimeId _offsetDate = 0;
-	MsgId _offsetId = 0;
-	PeerData *_offsetPeer = nullptr;
+	SavedMessagesOffsets _offset;
 
 	SingleQueuedInvokation _loadMore;
-	base::flat_set<not_null<SavedSublist*>> _loadMoreSublistsScheduled;
 	bool _loadMoreScheduled = false;
 
+	std::vector<not_null<SavedSublist*>> _lastSublists;
+	int _lastSublistsVersion = 0;
+
+	rpl::event_stream<> _chatsListChanges;
+	rpl::event_stream<> _chatsListLoadedEvents;
+
+	SavedSublist *_activeSubsectionSublist = nullptr;
+
 	bool _pinnedLoaded = false;
 	bool _unsupported = false;
 
+	rpl::lifetime _lifetime;
+
 };
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_saved_music.cpp b/Telegram/SourceFiles/data/data_saved_music.cpp
new file mode 100644
index 00000000000000..b42e83aa0906e1
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_saved_music.cpp
@@ -0,0 +1,417 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/data_saved_music.h"
+
+#include "api/api_hash.h"
+#include "apiwrap.h"
+#include "base/unixtime.h"
+#include "data/data_document.h"
+#include "data/data_file_origin.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "history/history.h"
+#include "main/main_session.h"
+#include "ui/ui_utility.h"
+
+namespace Data {
+namespace {
+
+constexpr auto kPerPage = 50;
+constexpr auto kReloadIdsEvery = 30 * crl::time(1000);
+
+[[nodiscard]] not_null<DocumentData*> ItemDocument(
+		not_null<HistoryItem*> item) {
+	return item->media()->document();
+}
+
+} // namespace
+
+SavedMusic::SavedMusic(not_null<Session*> owner)
+: _owner(owner) {
+}
+
+SavedMusic::~SavedMusic() {
+	Expects(_entries.empty());
+}
+
+void SavedMusic::clear() {
+	base::take(_entries);
+}
+
+bool SavedMusic::Supported(PeerId peerId) {
+	return peerId && peerIsUser(peerId);
+}
+
+not_null<HistoryItem*> SavedMusic::musicIdToMsg(
+		PeerId peerId,
+		Entry &entry,
+		not_null<DocumentData*> id) {
+	const auto i = entry.musicIdToMsg.find(id);
+	if (i != end(entry.musicIdToMsg)) {
+		return i->second.get();
+	} else if (!entry.history) {
+		entry.history = _owner->history(peerId);
+	}
+	return entry.musicIdToMsg.emplace(id, entry.history->makeMessage({
+		.id = entry.history->nextNonHistoryEntryId(),
+		.flags = (MessageFlag::FakeHistoryItem
+			| MessageFlag::HasFromId
+			| MessageFlag::SavedMusicItem),
+		.from = entry.history->peer->id,
+		.date = base::unixtime::now(),
+	}, id, TextWithEntities())).first->second.get();
+}
+
+void SavedMusic::loadIds() {
+	if (_loadIdsRequest
+		|| (_lastReceived
+			&& (crl::now() - _lastReceived < kReloadIdsEvery))) {
+		return;
+	}
+	_loadIdsRequest = _owner->session().api().request(
+		MTPaccount_GetSavedMusicIds(MTP_long(Api::CountHash(_myIds)))
+	).done([=](const MTPaccount_SavedMusicIds &result) {
+		_loadIdsRequest = 0;
+		_lastReceived = crl::now();
+		result.match([&](const MTPDaccount_savedMusicIds &data) {
+			_myIds = data.vids().v
+				| ranges::views::transform(&MTPlong::v)
+				| ranges::to_vector;
+		}, [](const MTPDaccount_savedMusicIdsNotModified &) {
+		});
+	}).fail([=] {
+		_loadIdsRequest = 0;
+		_lastReceived = crl::now();
+	}).send();
+}
+
+bool SavedMusic::has(not_null<DocumentData*> document) const {
+	return ranges::contains(_myIds, document->id);
+}
+
+void SavedMusic::save(
+		not_null<DocumentData*> document,
+		Data::FileOrigin origin) {
+	const auto peerId = _owner->session().userPeerId();
+	auto &entry = _entries[peerId];
+	if (entry.list.empty() && !entry.loaded) {
+		loadMore(peerId);
+	}
+	if (has(document)) {
+		return;
+	}
+	const auto item = musicIdToMsg(peerId, entry, document);
+	entry.list.insert(begin(entry.list), item);
+	if (entry.total >= 0) {
+		++entry.total;
+	}
+	_myIds.insert(begin(_myIds), document->id);
+
+	const auto send = [=](auto resend) -> void {
+		const auto usedFileReference = document->fileReference();
+		_owner->session().api().request(MTPaccount_SaveMusic(
+			MTP_flags(0),
+			document->mtpInput(),
+			MTPInputDocument()
+		)).fail([=](const MTP::Error &error) {
+			if (error.code() == 400
+				&& error.type().startsWith(u"FILE_REFERENCE_"_q)) {
+				document->session().api().refreshFileReference(origin, [=](
+						const auto &) {
+					if (document->fileReference() != usedFileReference) {
+						resend(resend);
+					}
+				});
+			}
+		}).send();
+	};
+	send(send);
+
+	_changed.fire_copy(peerId);
+}
+
+void SavedMusic::remove(not_null<DocumentData*> document) {
+	const auto peerId = _owner->session().userPeerId();
+	auto &entry = _entries[peerId];
+	const auto i = ranges::find(entry.list, document, ItemDocument);
+	if (i != end(entry.list)) {
+		entry.musicIdFromMsgId.remove((*i)->id);
+		entry.list.erase(i);
+		if (entry.total > 0) {
+			entry.total = std::max(entry.total - 1, 0);
+		}
+	}
+	entry.musicIdToMsg.remove(document);
+	_myIds.erase(ranges::remove(_myIds, document->id), end(_myIds));
+	_owner->session().api().request(MTPaccount_SaveMusic(
+		MTP_flags(MTPaccount_SaveMusic::Flag::f_unsave),
+		document->mtpInput(),
+		MTPInputDocument()
+	)).send();
+	_changed.fire_copy(peerId);
+}
+
+void SavedMusic::reorder(int oldPosition, int newPosition) {
+	const auto peerId = _owner->session().userPeerId();
+	auto &entry = _entries[peerId];
+	if (oldPosition < 0 || newPosition < 0
+		|| oldPosition >= entry.list.size()
+		|| newPosition >= entry.list.size()
+		|| oldPosition == newPosition) {
+		return;
+	}
+
+	const auto item = entry.list[oldPosition];
+	const auto document = ItemDocument(item);
+
+	base::reorder(entry.list, oldPosition, newPosition);
+
+	const auto afterDocument = (newPosition > 0)
+		? ItemDocument(entry.list[newPosition - 1]).get()
+		: nullptr;
+
+	_owner->session().api().request(MTPaccount_SaveMusic(
+		MTP_flags(afterDocument
+			? MTPaccount_SaveMusic::Flag::f_after_id
+			: MTPaccount_SaveMusic::Flags(0)),
+		document->mtpInput(),
+		afterDocument ? afterDocument->mtpInput() : MTPInputDocument()
+	)).done([=] {
+	}).fail([=](const MTP::Error &error) {
+	}).send();
+
+	_changed.fire_copy(peerId);
+}
+
+void SavedMusic::apply(not_null<UserData*> user, const MTPDocument *last) {
+	const auto peerId = user->id;
+	auto &entry = _entries[peerId];
+	if (!last) {
+		if (const auto requestId = base::take(entry.requestId)) {
+			_owner->session().api().request(requestId).cancel();
+		}
+		entry = Entry{ .total = 0, .loaded = true };
+		_changed.fire_copy(peerId);
+		return;
+	}
+	const auto document = _owner->processDocument(*last);
+	const auto i = ranges::find(entry.list, document, ItemDocument);
+	if (i != end(entry.list)) {
+		if (i == begin(entry.list)) {
+			return;
+		}
+		ranges::rotate(begin(entry.list), i, i + 1);
+		_changed.fire_copy(peerId);
+		loadMore(peerId, true);
+		return;
+	}
+	entry.list.insert(
+		begin(entry.list),
+		musicIdToMsg(peerId, entry, document));
+	_changed.fire_copy(peerId);
+	if (entry.loaded) {
+		loadMore(peerId, true);
+	}
+}
+
+bool SavedMusic::countKnown(PeerId peerId) const {
+	if (!Supported(peerId)) {
+		return true;
+	}
+	const auto entry = lookupEntry(peerId);
+	return entry && entry->total >= 0;
+}
+
+int SavedMusic::count(PeerId peerId) const {
+	if (!Supported(peerId)) {
+		return 0;
+	}
+	const auto entry = lookupEntry(peerId);
+	return entry ? std::max(entry->total, 0) : 0;
+}
+
+const std::vector<not_null<HistoryItem*>> &SavedMusic::list(
+		PeerId peerId) const {
+	static const auto empty = std::vector<not_null<HistoryItem*>>();
+	if (!Supported(peerId)) {
+		return empty;
+	}
+
+	const auto entry = lookupEntry(peerId);
+	return entry ? entry->list : empty;
+}
+
+void SavedMusic::loadMore(PeerId peerId) {
+	loadMore(peerId, false);
+}
+
+void SavedMusic::loadMore(PeerId peerId, bool reload) {
+	if (!Supported(peerId)) {
+		return;
+	}
+
+	auto &entry = _entries[peerId];
+	if (!entry.reloading && reload) {
+		_owner->session().api().request(
+			base::take(entry.requestId)).cancel();
+	}
+	if ((!reload && entry.loaded) || entry.requestId) {
+		return;
+	}
+	const auto user = _owner->peer(peerId)->asUser();
+	Assert(user != nullptr);
+
+	entry.reloading = reload;
+	entry.requestId = _owner->session().api().request(MTPusers_GetSavedMusic(
+		user->inputUser(),
+		MTP_int(reload ? 0 : entry.list.size()),
+		MTP_int(kPerPage),
+		MTP_long(reload ? firstPageHash(entry) : 0)
+	)).done([=](const MTPusers_SavedMusic &result) {
+		auto &entry = _entries[peerId];
+		entry.requestId = 0;
+		const auto reloaded = base::take(entry.reloading);
+		result.match([&](const MTPDusers_savedMusicNotModified &) {
+		}, [&](const MTPDusers_savedMusic &data) {
+			const auto list = data.vdocuments().v;
+			const auto count = int(list.size());
+			entry.total = std::max(count, data.vcount().v);
+			if (reloaded) {
+				entry.list.clear();
+			}
+			for (const auto &item : list) {
+				const auto document = _owner->processDocument(item);
+				if (!ranges::contains(entry.list, document, ItemDocument)) {
+					entry.list.push_back(
+						musicIdToMsg(peerId, entry, document));
+				}
+			}
+			entry.loaded = list.empty()
+				|| (entry.total == entry.list.size());
+		});
+		_changed.fire_copy(peerId);
+	}).fail([=](const MTP::Error &error) {
+		auto &entry = _entries[peerId];
+		entry.requestId = 0;
+		entry.total = int(entry.list.size());
+		entry.loaded = true;
+		_changed.fire_copy(peerId);
+	}).send();
+}
+
+uint64 SavedMusic::firstPageHash(const Entry &entry) const {
+	return Api::CountHash(entry.list
+		| ranges::views::transform(ItemDocument)
+		| ranges::views::transform(&DocumentData::id)
+		| ranges::views::take(kPerPage));
+}
+
+rpl::producer<PeerId> SavedMusic::changed() const {
+	return _changed.events();
+}
+
+SavedMusic::Entry *SavedMusic::lookupEntry(PeerId peerId) {
+	if (!Supported(peerId)) {
+		return nullptr;
+	}
+
+	auto it = _entries.find(peerId);
+	if (it == end(_entries)) {
+		return nullptr;
+	}
+	return &it->second;
+}
+
+const SavedMusic::Entry *SavedMusic::lookupEntry(PeerId peerId) const {
+	return const_cast<SavedMusic*>(this)->lookupEntry(peerId);
+}
+
+rpl::producer<SavedMusicSlice> SavedMusicList(
+		not_null<PeerData*> peer,
+		HistoryItem *aroundId,
+		int limit) {
+	if (!peer->isUser()) {
+		return rpl::single(SavedMusicSlice({}, 0, 0, 0));
+	}
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		struct State {
+			SavedMusicSlice slice;
+			base::has_weak_ptr guard;
+			bool scheduled = false;
+		};
+		const auto state = lifetime.make_state<State>();
+
+		const auto push = [=] {
+			state->scheduled = false;
+
+			const auto peerId = peer->id;
+			const auto savedMusic = &peer->owner().savedMusic();
+			if (!savedMusic->countKnown(peerId)) {
+				return;
+			}
+			const auto &loaded = savedMusic->list(peerId);
+			const auto count = savedMusic->count(peerId);
+			auto i = aroundId
+				? ranges::find(loaded, not_null(aroundId))
+				: begin(loaded);
+			if (i == end(loaded)) {
+				i = begin(loaded);
+			}
+			const auto hasAfter = int(i - begin(loaded));
+			const auto hasBefore = int(end(loaded) - i);
+			if (hasBefore < limit) {
+				savedMusic->loadMore(peerId);
+			}
+			const auto takeAfter = std::min(hasAfter, limit);
+			const auto takeBefore = std::min(hasBefore, limit);
+			auto ids = std::vector<not_null<HistoryItem*>>();
+			ids.reserve(takeAfter + takeBefore);
+			for (auto j = i - takeAfter; j != i + takeBefore; ++j) {
+				ids.push_back(*j);
+			}
+			const auto added = int(ids.size());
+			state->slice = SavedMusicSlice(
+				std::move(ids),
+				count,
+				count - (hasAfter - takeAfter) - added,
+				hasAfter - takeAfter);
+			consumer.put_next_copy(state->slice);
+		};
+		const auto schedule = [=] {
+			if (state->scheduled) {
+				return;
+			}
+			state->scheduled = true;
+			Ui::PostponeCall(&state->guard, [=] {
+				if (state->scheduled) {
+					push();
+				}
+			});
+		};
+
+		const auto peerId = peer->id;
+		const auto savedMusic = &peer->owner().savedMusic();
+		savedMusic->changed(
+		) | rpl::filter(
+			rpl::mappers::_1 == peerId
+		) | rpl::on_next(schedule, lifetime);
+
+		if (!savedMusic->countKnown(peerId)) {
+			savedMusic->loadMore(peerId);
+		}
+
+		push();
+
+		return lifetime;
+	};
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_saved_music.h b/Telegram/SourceFiles/data/data_saved_music.h
new file mode 100644
index 00000000000000..5d4175733c91f5
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_saved_music.h
@@ -0,0 +1,88 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "data/data_abstract_sparse_ids.h"
+
+#include "history/history_item.h"
+
+class PeerData;
+
+namespace Data {
+
+class Session;
+struct FileOrigin;
+
+class SavedMusic final {
+public:
+	explicit SavedMusic(not_null<Session*> owner);
+	~SavedMusic();
+
+	[[nodiscard]] static bool Supported(PeerId peerId);
+
+	[[nodiscard]] bool countKnown(PeerId peerId) const;
+	[[nodiscard]] int count(PeerId peerId) const;
+	[[nodiscard]] const std::vector<not_null<HistoryItem*>> &list(
+		PeerId peerId) const;
+	void loadMore(PeerId peerId);
+
+	[[nodiscard]] rpl::producer<PeerId> changed() const;
+
+	void loadIds();
+	[[nodiscard]] bool has(not_null<DocumentData*> document) const;
+	void save(not_null<DocumentData*> document, FileOrigin origin);
+	void remove(not_null<DocumentData*> document);
+	void reorder(int oldPosition, int newPosition);
+
+	void apply(not_null<UserData*> user, const MTPDocument *last);
+
+	void clear();
+
+private:
+	using OwnedItem = std::unique_ptr<HistoryItem, HistoryItem::Destroyer>;
+
+	struct Entry {
+		base::flat_map<MsgId, not_null<DocumentData*>> musicIdFromMsgId;
+		base::flat_map<not_null<DocumentData*>, OwnedItem> musicIdToMsg;
+		std::vector<not_null<HistoryItem*>> list;
+		History *history = nullptr;
+		mtpRequestId requestId = 0;
+		int total = -1;
+		bool loaded = false;
+		bool reloading = false;
+	};
+
+	void loadMore(PeerId peerId, bool reload);
+	[[nodiscard]] Entry *lookupEntry(PeerId peerId);
+	[[nodiscard]] const Entry *lookupEntry(PeerId peerId) const;
+	[[nodiscard]] uint64 firstPageHash(const Entry &entry) const;
+	[[nodiscard]] not_null<HistoryItem*> musicIdToMsg(
+		PeerId peerId,
+		Entry &entry,
+		not_null<DocumentData*> id);
+
+	const not_null<Session*> _owner;
+
+	std::vector<DocumentId> _myIds;
+	crl::time _lastReceived = 0;
+	mtpRequestId _loadIdsRequest = 0;
+
+	std::unordered_map<PeerId, Entry> _entries;
+	rpl::event_stream<PeerId> _changed;
+
+};
+
+using SavedMusicSlice = AbstractSparseIds<
+	std::vector<not_null<HistoryItem*>>>;
+
+[[nodiscard]] rpl::producer<SavedMusicSlice> SavedMusicList(
+	not_null<PeerData*> peer,
+	HistoryItem *aroundId,
+	int limit);
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_saved_sublist.cpp b/Telegram/SourceFiles/data/data_saved_sublist.cpp
index 2d129a5f67e02c..68290f41b6edf8 100644
--- a/Telegram/SourceFiles/data/data_saved_sublist.cpp
+++ b/Telegram/SourceFiles/data/data_saved_sublist.cpp
@@ -7,219 +7,1027 @@ For license and copyright information please follow this link:
 */
 #include "data/data_saved_sublist.h"
 
+#include "api/api_unread_things.h"
+#include "apiwrap.h"
+#include "core/application.h"
+#include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_drafts.h"
 #include "data/data_histories.h"
+#include "data/data_messages.h"
 #include "data/data_peer.h"
 #include "data/data_saved_messages.h"
 #include "data/data_session.h"
+#include "data/data_user.h"
 #include "history/view/history_view_item_preview.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/history_unread_things.h"
+#include "main/main_session.h"
+#include "window/notifications_manager.h"
 
 namespace Data {
+namespace {
 
-SavedSublist::SavedSublist(not_null<PeerData*> peer)
-: Entry(&peer->owner(), Dialogs::Entry::Type::SavedSublist)
-, _history(peer->owner().history(peer)) {
-}
+constexpr auto kMessagesPerPage = 50;
+constexpr auto kReadRequestTimeout = 3 * crl::time(1000);
+
+} // namespace
 
-SavedSublist::~SavedSublist() = default;
+struct SavedSublist::Viewer {
+	MessagesSlice slice;
+	MsgId around = 0;
+	int limitBefore = 0;
+	int limitAfter = 0;
+	base::has_weak_ptr guard;
+	bool scheduled = false;
+};
 
-not_null<History*> SavedSublist::history() const {
-	return _history;
+SavedSublist::SavedSublist(
+	not_null<SavedMessages*> parent,
+	not_null<PeerData*> sublistPeer)
+: Thread(&sublistPeer->owner(), Dialogs::Entry::Type::SavedSublist)
+, _parent(parent)
+, _sublistHistory(sublistPeer->owner().history(sublistPeer))
+, _readRequestTimer([=] { sendReadTillRequest(); }) {
+	if (parent->parentChat()) {
+		_flags |= Flag::InMonoforum;
+	}
+	subscribeToUnreadChanges();
 }
 
-not_null<PeerData*> SavedSublist::peer() const {
-	return _history->peer;
+SavedSublist::~SavedSublist() {
+	histories().cancelRequest(base::take(_beforeId));
+	histories().cancelRequest(base::take(_afterId));
+	if (_readRequestTimer.isActive()) {
+		sendReadTillRequest();
+	}
+	session().api().unreadThings().cancelRequests(this);
 }
 
-bool SavedSublist::isHiddenAuthor() const {
-	return peer()->isSavedHiddenAuthor();
+bool SavedSublist::inMonoforum() const {
+	return (_flags & Flag::InMonoforum) != 0;
 }
 
-bool SavedSublist::isFullLoaded() const {
-	return (_flags & Flag::FullLoaded) != 0;
+void SavedSublist::apply(const SublistReadTillUpdate &update) {
+	if (update.out) {
+		setOutboxReadTill(update.readTillId);
+	} else if (update.readTillId >= _inboxReadTillId) {
+		setInboxReadTill(
+			update.readTillId,
+			computeUnreadCountLocally(update.readTillId));
+	}
 }
 
-auto SavedSublist::messages() const
--> const std::vector<not_null<HistoryItem*>> & {
-	return _items;
+void SavedSublist::apply(const MessageUpdate &update) {
+	if (applyUpdate(update)) {
+		_instantChanges.fire({});
+	}
 }
 
-void SavedSublist::applyMaybeLast(not_null<HistoryItem*> item, bool added) {
-	const auto before = [](
-			not_null<HistoryItem*> a,
-			not_null<HistoryItem*> b) {
-		return IsServerMsgId(a->id)
-			? (IsServerMsgId(b->id) ? (a->id < b->id) : true)
-			: (IsServerMsgId(b->id) ? false : (a->id < b->id));
-	};
+void SavedSublist::applyDifferenceTooLong() {
+	if (_skippedAfter.has_value()) {
+		_skippedAfter = std::nullopt;
+		_listChanges.fire({});
+	}
+}
 
-	if (_items.empty()) {
-		_items.push_back(item);
-	} else if (_items.front() == item) {
-		return;
-	} else if (!isFullLoaded()
-		&& _items.size() == 1
-		&& before(_items.front(), item)) {
-		_items[0] = item;
-	} else if (before(_items.back(), item)) {
-		for (auto i = begin(_items); i != end(_items); ++i) {
-			if (item == *i) {
-				return;
-			} else if (before(*i, item)) {
-				_items.insert(i, item);
-				break;
+bool SavedSublist::removeOne(not_null<HistoryItem*> item) {
+	const auto id = item->id;
+	const auto i = ranges::lower_bound(_list, id, std::greater<>());
+	changeUnreadCountByMessage(id, -1);
+	if (i == end(_list) || *i != id) {
+		if (const auto known = _fullCount.current()) {
+			if (*known > 0) {
+				_fullCount = (*known - 1);
+				return true;
 			}
 		}
+		return false;
 	}
-	if (added && _fullCount) {
-		++*_fullCount;
+	_list.erase(i);
+	if (_skippedBefore && _skippedAfter) {
+		_fullCount = *_skippedBefore + _list.size() + *_skippedAfter;
+	} else if (const auto known = _fullCount.current()) {
+		if (*known > 0) {
+			_fullCount = (*known - 1);
+		}
 	}
-	if (_items.front() == item) {
-		setChatListTimeId(item->date());
+	return true;
+}
+
+rpl::producer<MessagesSlice> SavedSublist::source(
+		MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) {
+	const auto around = aroundId.fullId.msg;
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+		const auto viewer = lifetime.make_state<Viewer>();
+		const auto push = [=] {
+			if (viewer->scheduled) {
+				viewer->scheduled = false;
+				if (buildFromData(viewer)) {
+					appendClientSideMessages(viewer->slice);
+					consumer.put_next_copy(viewer->slice);
+				}
+			}
+		};
+		const auto pushInstant = [=] {
+			viewer->scheduled = true;
+			push();
+		};
+		const auto pushDelayed = [=] {
+			if (!viewer->scheduled) {
+				viewer->scheduled = true;
+				crl::on_main(&viewer->guard, push);
+			}
+		};
+		viewer->around = around;
+		viewer->limitBefore = limitBefore;
+		viewer->limitAfter = limitAfter;
+
+		const auto history = owningHistory();
+		history->session().changes().historyUpdates(
+			history,
+			HistoryUpdate::Flag::ClientSideMessages
+		) | rpl::on_next(pushDelayed, lifetime);
+
+		_listChanges.events(
+		) | rpl::on_next(pushDelayed, lifetime);
+
+		_instantChanges.events(
+		) | rpl::on_next(pushInstant, lifetime);
+
+		pushInstant();
+		return lifetime;
+	};
+}
+
+not_null<SavedMessages*> SavedSublist::parent() const {
+	return _parent;
+}
+
+not_null<History*> SavedSublist::owningHistory() {
+	return _parent->owningHistory();
+}
+
+ChannelData *SavedSublist::parentChat() const {
+	return _parent->parentChat();
+}
+
+not_null<PeerData*> SavedSublist::sublistPeer() const {
+	return _sublistHistory->peer;
+}
+
+bool SavedSublist::isHiddenAuthor() const {
+	return sublistPeer()->isSavedHiddenAuthor();
+}
+
+rpl::producer<> SavedSublist::destroyed() const {
+	using namespace rpl::mappers;
+	return rpl::merge(
+		_parent->destroyed(),
+		_parent->sublistDestroyed() | rpl::filter(
+			_1 == this
+		) | rpl::to_empty);
+}
+
+void SavedSublist::applyMaybeLast(not_null<HistoryItem*> item) {
+	if (!item->isRegular() || item->isService()) {
+		return;
+	}
+	if (!_lastServerMessage.value_or(nullptr)
+		|| (*_lastServerMessage)->id < item->id) {
+		setLastServerMessage(item);
 		resolveChatListMessageGroup();
+	} else {
+		growLastKnownServerMessageId(item->id);
 	}
-	_changed.fire({});
 }
 
-void SavedSublist::removeOne(not_null<HistoryItem*> item) {
-	if (_items.empty()) {
+void SavedSublist::applyItemAdded(not_null<HistoryItem*> item) {
+	if (item->isService()) {
 		return;
 	}
-	const auto last = (_items.front() == item);
-	const auto from = ranges::remove(_items, item);
-	const auto removed = end(_items) - from;
-	if (removed) {
-		_items.erase(from, end(_items));
+	const auto wasInChatList = shouldBeInChatList();
+	if (item->isRegular()) {
+		setLastServerMessage(item);
+	} else {
+		setLastMessage(item);
+	}
+	if (!_parent->parentChat() && !isPinnedDialog(FilterId())) {
+		if (_restorePinnedWhenNonEmpty) {
+			owner().setChatPinned(this, FilterId(), true);
+			_restorePinnedWhenNonEmpty = false;
+		} else if (!wasInChatList && shouldBeInChatList()) {
+			_parent->refreshPinned();
+		}
+	}
+}
+
+void SavedSublist::applyItemRemoved(MsgId id) {
+	if (const auto lastItem = lastMessage()) {
+		if (lastItem->id == id) {
+			_lastMessage = std::nullopt;
+		}
+	}
+	if (const auto lastServerItem = lastServerMessage()) {
+		if (lastServerItem->id == id) {
+			_lastServerMessage = std::nullopt;
+		}
+	}
+	if (const auto chatListItem = _chatListMessage.value_or(nullptr)) {
+		if (chatListItem->id == id) {
+			_chatListMessage = std::nullopt;
+			crl::on_main(this, [=] {
+				const auto locallyKnownEmpty = _list.empty()
+					&& (_fullCount.current() == 0);
+				if (_chatListMessage.value_or(nullptr)) {
+					return;
+				} else if ((_skippedAfter == 0) || locallyKnownEmpty) {
+					if (!_list.empty()) {
+						applyMaybeLast(owner().message(
+							owningHistory()->peer,
+							_list.front()));
+						return;
+					} else if ((_skippedBefore == 0) || locallyKnownEmpty) {
+						if (!_parent->parentChat()
+							&& isPinnedDialog(FilterId())) {
+							_restorePinnedWhenNonEmpty = true;
+							owner().setChatPinned(this, FilterId(), false);
+						}
+						setLastServerMessage(nullptr);
+						updateChatListExistence();
+						return;
+					}
+				}
+				if (_parent->parentChat()) {
+					requestChatListMessage();
+				} else {
+					loadAround(0);
+				}
+			});
+		}
+	}
+}
+
+void SavedSublist::requestChatListMessage() {
+	if (!chatListMessageKnown()) {
+		parent()->requestSublist(sublistPeer());
+	}
+}
+
+void SavedSublist::setRestorePinnedWhenNonEmpty(bool restore) {
+	_restorePinnedWhenNonEmpty = restore;
+}
+
+void SavedSublist::readTillEnd() {
+	readTill(_lastKnownServerMessageId);
+}
+
+bool SavedSublist::buildFromData(not_null<Viewer*> viewer) {
+	if (_list.empty() && _skippedBefore == 0 && _skippedAfter == 0) {
+		viewer->slice.ids.clear();
+		viewer->slice.nearestToAround = FullMsgId();
+		viewer->slice.fullCount
+			= viewer->slice.skippedBefore
+			= viewer->slice.skippedAfter
+			= 0;
+		ranges::reverse(viewer->slice.ids);
+		return true;
+	}
+	const auto around = (viewer->around != ShowAtUnreadMsgId)
+		? viewer->around
+		: computeInboxReadTillFull();
+	if (_list.empty()
+		|| (!around && _skippedAfter != 0)
+		|| (around > _list.front() && _skippedAfter != 0)
+		|| (around > 0 && around < _list.back() && _skippedBefore != 0)) {
+		loadAround(around);
+		return false;
+	}
+	const auto i = around
+		? ranges::lower_bound(_list, around, std::greater<>())
+		: (inMonoforum() ? end(_list) : begin(_list));
+	const auto availableBefore = int(end(_list) - i);
+	const auto availableAfter = int(i - begin(_list));
+	const auto useBefore = std::min(availableBefore, viewer->limitBefore + 1);
+	const auto useAfter = std::min(availableAfter, viewer->limitAfter);
+	const auto slice = &viewer->slice;
+	if (_skippedBefore.has_value()) {
+		slice->skippedBefore
+			= (*_skippedBefore + (availableBefore - useBefore));
+	}
+	if (_skippedAfter.has_value()) {
+		slice->skippedAfter
+			= (*_skippedAfter + (availableAfter - useAfter));
+	}
+
+	const auto peerId = owningHistory()->peer->id;
+	slice->ids.clear();
+	auto nearestToAround = std::optional<MsgId>();
+	slice->ids.reserve(useAfter + useBefore);
+	for (auto j = i - useAfter, e = i + useBefore; j != e; ++j) {
+		const auto id = *j;
+		if (!nearestToAround && id < around) {
+			nearestToAround = (j == i - useAfter)
+				? id
+				: *(j - 1);
+		}
+		slice->ids.emplace_back(peerId, id);
+	}
+	slice->nearestToAround = FullMsgId(
+		peerId,
+		nearestToAround.value_or(
+			slice->ids.empty() ? 0 : slice->ids.back().msg));
+	slice->fullCount = _fullCount.current();
+
+	ranges::reverse(viewer->slice.ids);
+
+	if (_skippedBefore != 0 && useBefore < viewer->limitBefore + 1) {
+		loadBefore();
+	}
+	if (_skippedAfter != 0 && useAfter < viewer->limitAfter) {
+		loadAfter();
+	}
+
+	return true;
+}
+
+bool SavedSublist::applyUpdate(const MessageUpdate &update) {
+	using Flag = MessageUpdate::Flag;
+
+	if (update.item->history() != owningHistory()
+		|| !update.item->isRegular()
+		|| update.item->sublistPeerId() != sublistPeer()->id) {
+		return false;
+	} else if (update.flags & Flag::Destroyed) {
+		return removeOne(update.item);
+	}
+	const auto id = update.item->id;
+	if (update.flags & Flag::NewAdded) {
+		changeUnreadCountByMessage(id, 1);
+	}
+	const auto i = ranges::lower_bound(_list, id, std::greater<>());
+	if (_skippedAfter != 0
+		|| (i != end(_list) && *i == id)) {
+		return false;
+	}
+	_list.insert(i, id);
+	if (_skippedBefore && _skippedAfter) {
+		_fullCount = *_skippedBefore + _list.size() + *_skippedAfter;
+	} else if (const auto known = _fullCount.current()) {
+		_fullCount = *known + 1;
+	}
+	return true;
+}
+
+bool SavedSublist::processMessagesIsEmpty(
+		const MTPmessages_Messages &result) {
+	const auto guard = gsl::finally([&] { _listChanges.fire({}); });
+
+	const auto list = result.match([&](
+			const MTPDmessages_messagesNotModified &) {
+		LOG(("API Error: received messages.messagesNotModified! "
+			"(HistoryWidget::messagesReceived)"));
+		return QVector<MTPMessage>();
+	}, [&](const auto &data) {
+		owner().processUsers(data.vusers());
+		owner().processChats(data.vchats());
+		return data.vmessages().v;
+	});
+
+	const auto fullCount = result.match([&](
+			const MTPDmessages_messagesNotModified &) {
+		LOG(("API Error: received messages.messagesNotModified! "
+			"(HistoryWidget::messagesReceived)"));
+		return 0;
+	}, [&](const MTPDmessages_messages &data) {
+		owningHistory()->peer->processTopics(data.vtopics());
+		return int(data.vmessages().v.size());
+	}, [&](const MTPDmessages_messagesSlice &data) {
+		owningHistory()->peer->processTopics(data.vtopics());
+		return data.vcount().v;
+	}, [&](const MTPDmessages_channelMessages &data) {
+		if (const auto channel = owningHistory()->peer->asChannel()) {
+			channel->ptsReceived(data.vpts().v);
+		} else {
+			LOG(("API Error: received messages.channelMessages when "
+				"no channel was passed! (HistoryWidget::messagesReceived)"));
+		}
+		owningHistory()->peer->processTopics(data.vtopics());
+		return data.vcount().v;
+	});
+
+	if (list.isEmpty()) {
+		return true;
 	}
-	if (_fullCount) {
-		--*_fullCount;
+
+	const auto maxId = IdFromMessage(list.front());
+	const auto wasSize = int(_list.size());
+	const auto toFront = (wasSize > 0) && (maxId > _list.front());
+	const auto localFlags = MessageFlags();
+	const auto type = NewMessageType::Existing;
+	auto refreshed = std::vector<MsgId>();
+	if (toFront) {
+		refreshed.reserve(_list.size() + list.size());
 	}
-	if (last) {
-		if (_items.empty()) {
-			if (isFullLoaded()) {
-				updateChatListExistence();
+	auto skipped = 0;
+	for (const auto &message : list) {
+		if (const auto item = owner().addNewMessage(message, localFlags, type)) {
+			if (item->sublistPeerId() == sublistPeer()->id
+				&& item->isRegular()) {
+				if (toFront && item->id > _list.front()) {
+					refreshed.push_back(item->id);
+				} else if (_list.empty() || item->id < _list.back()) {
+					_list.push_back(item->id);
+				}
 			} else {
-				updateChatListEntry();
-				crl::on_main(this, [=] {
-					owner().savedMessages().loadMore(this);
-				});
+				++skipped;
 			}
 		} else {
-			setChatListTimeId(_items.front()->date());
+			++skipped;
 		}
 	}
-	if (removed || _fullCount) {
-		_changed.fire({});
+	if (toFront) {
+		refreshed.insert(refreshed.end(), _list.begin(), _list.end());
+		_list = std::move(refreshed);
+	}
+
+	const auto nowSize = int(_list.size());
+	auto &decrementFrom = toFront ? _skippedAfter : _skippedBefore;
+	if (decrementFrom.has_value()) {
+		*decrementFrom = std::max(
+			*decrementFrom - (nowSize - wasSize),
+			0);
+	}
+
+	const auto checkedCount = std::max(fullCount - skipped, nowSize);
+	if (_skippedBefore && _skippedAfter) {
+		auto &correct = toFront ? _skippedBefore : _skippedAfter;
+		*correct = std::max(
+			checkedCount - *decrementFrom - nowSize,
+			0);
+		*decrementFrom = checkedCount - *correct - nowSize;
+		Assert(*decrementFrom >= 0);
+	} else if (_skippedBefore) {
+		*_skippedBefore = std::min(*_skippedBefore, checkedCount - nowSize);
+		_skippedAfter = checkedCount - *_skippedBefore - nowSize;
+	} else if (_skippedAfter) {
+		*_skippedAfter = std::min(*_skippedAfter, checkedCount - nowSize);
+		_skippedBefore = checkedCount - *_skippedAfter - nowSize;
+	}
+	_fullCount = checkedCount;
+
+	checkReadTillEnd();
+
+	Ensures(list.size() >= skipped);
+	return (list.size() == skipped);
+}
+
+void SavedSublist::setInboxReadTill(
+		MsgId readTillId,
+		std::optional<int> unreadCount) {
+	const auto newReadTillId = std::max(readTillId.bare, int64(1));
+	const auto ignore = (newReadTillId < _inboxReadTillId);
+	if (ignore) {
+		return;
+	}
+	const auto changed = (newReadTillId > _inboxReadTillId);
+	if (changed) {
+		_inboxReadTillId = newReadTillId;
+	}
+	if (_skippedAfter == 0
+		&& !_list.empty()
+		&& _inboxReadTillId >= _list.front()) {
+		unreadCount = 0;
+	} else if (_lastServerMessage.value_or(nullptr)
+		&& (*_lastServerMessage)->id <= newReadTillId) {
+		unreadCount = 0;
+	}
+	if (_unreadCount.current() != unreadCount
+		&& (changed || unreadCount.has_value())) {
+		setUnreadCount(unreadCount);
 	}
 }
 
-rpl::producer<> SavedSublist::changes() const {
-	return _changed.events();
+MsgId SavedSublist::inboxReadTillId() const {
+	return _inboxReadTillId;
 }
 
-std::optional<int> SavedSublist::fullCount() const {
-	return isFullLoaded() ? int(_items.size()) : _fullCount;
+MsgId SavedSublist::computeInboxReadTillFull() const {
+	return _inboxReadTillId;
 }
 
-rpl::producer<int> SavedSublist::fullCountValue() const {
-	return _changed.events_starting_with({}) | rpl::map([=] {
-		return fullCount();
-	}) | rpl::filter_optional();
-}
-
-void SavedSublist::append(
-		std::vector<not_null<HistoryItem*>> &&items,
-		int fullCount) {
-	_fullCount = fullCount;
-	if (items.empty()) {
-		setFullLoaded();
-	} else if (_items.empty()) {
-		_items = std::move(items);
-		setChatListTimeId(_items.front()->date());
-		_changed.fire({});
-	} else if (_items.back()->id > items.front()->id) {
-		_items.insert(end(_items), begin(items), end(items));
-		_changed.fire({});
+void SavedSublist::setOutboxReadTill(MsgId readTillId) {
+	const auto newReadTillId = std::max(readTillId.bare, int64(1));
+	if (newReadTillId > _outboxReadTillId) {
+		_outboxReadTillId = newReadTillId;
+		const auto history = owningHistory();
+		history->session().changes().historyUpdated(
+			history,
+			HistoryUpdate::Flag::OutboxRead);
+	}
+}
+
+MsgId SavedSublist::computeOutboxReadTillFull() const {
+	return _outboxReadTillId;
+}
+
+void SavedSublist::setUnreadCount(std::optional<int> count) {
+	_unreadCount = count;
+	if (!count && !_readRequestTimer.isActive() && !_readRequestId) {
+		reloadUnreadCountIfNeeded();
+	}
+}
+
+void SavedSublist::setUnreadMark(bool unread) {
+	if (unreadMark() == unread) {
+		return;
+	}
+	const auto notifier = unreadStateChangeNotifier(
+		!unreadCountCurrent());
+	Thread::setUnreadMarkFlag(unread);
+}
+
+bool SavedSublist::unreadCountKnown() const {
+	return !inMonoforum() || _unreadCount.current().has_value();
+}
+
+int SavedSublist::unreadCountCurrent() const {
+	return _unreadCount.current().value_or(0);
+}
+
+rpl::producer<std::optional<int>> SavedSublist::unreadCountValue() const {
+	if (!inMonoforum()) {
+		return rpl::single(std::optional<int>(0));
+	}
+	return _unreadCount.value();
+}
+
+int SavedSublist::displayedUnreadCount() const {
+	return (_inboxReadTillId > 1) ? unreadCountCurrent() : 0;
+}
+
+void SavedSublist::changeUnreadCountByMessage(MsgId id, int delta) {
+	if (!inMonoforum() || !_inboxReadTillId) {
+		setUnreadCount(std::nullopt);
+		return;
+	}
+	const auto count = _unreadCount.current();
+	if (count.has_value() && (id > _inboxReadTillId)) {
+		setUnreadCount(std::max(*count + delta, 0));
+	}
+}
+
+bool SavedSublist::isServerSideUnread(
+		not_null<const HistoryItem*> item) const {
+	if (!inMonoforum()) {
+		return false;
+	}
+	const auto till = item->out()
+		? computeOutboxReadTillFull()
+		: computeInboxReadTillFull();
+	return (item->id > till);
+}
+
+void SavedSublist::checkReadTillEnd() {
+	if (_unreadCount.current() != 0
+		&& _skippedAfter == 0
+		&& !_list.empty()
+		&& _inboxReadTillId >= _list.front()) {
+		setUnreadCount(0);
+	}
+}
+
+std::optional<int> SavedSublist::computeUnreadCountLocally(
+		MsgId afterId) const {
+	Expects(afterId >= _inboxReadTillId);
+
+	const auto currentUnreadCountAfter = _unreadCount.current();
+	const auto startingMarkingAsRead = (currentUnreadCountAfter == 0)
+		&& (_inboxReadTillId == 1)
+		&& (afterId > 1);
+	const auto wasUnreadCountAfter = startingMarkingAsRead
+		? _fullCount.current().value_or(0)
+		: currentUnreadCountAfter;
+	const auto readTillId = std::max(afterId, MsgId(1));
+	const auto wasReadTillId = _inboxReadTillId;
+	const auto backLoaded = (_skippedBefore == 0);
+	const auto frontLoaded = (_skippedAfter == 0);
+	const auto fullLoaded = backLoaded && frontLoaded;
+	const auto allUnread = (readTillId == MsgId(1))
+		|| (fullLoaded && _list.empty());
+	if (allUnread && fullLoaded) {
+		// Should not happen too often unless the list is empty.
+		return int(_list.size());
+	} else if (frontLoaded && !_list.empty() && readTillId >= _list.front()) {
+		// Always "count by local data" if read till the end.
+		return 0;
+	} else if (wasReadTillId == readTillId) {
+		// Otherwise don't recount the same value over and over.
+		return wasUnreadCountAfter;
+	} else if (frontLoaded && !_list.empty() && readTillId >= _list.back()) {
+		// And count by local data if it is available and read-till changed.
+		return int(ranges::lower_bound(_list, readTillId, std::greater<>())
+			- begin(_list));
+	} else if (_list.empty()) {
+		return std::nullopt;
+	} else if (wasUnreadCountAfter.has_value()
+		&& (frontLoaded || readTillId <= _list.front())
+		&& (backLoaded || wasReadTillId >= _list.back())) {
+		// Count how many were read since previous value.
+		const auto from = ranges::lower_bound(
+			_list,
+			readTillId,
+			std::greater<>());
+		const auto till = ranges::lower_bound(
+			from,
+			end(_list),
+			wasReadTillId,
+			std::greater<>());
+		return std::max(*wasUnreadCountAfter - int(till - from), 0);
+	}
+	return std::nullopt;
+}
+
+void SavedSublist::requestUnreadCount() {
+	parent()->requestSublist(sublistPeer());
+}
+
+void SavedSublist::readTill(not_null<HistoryItem*> item) {
+	readTill(item->id, item);
+}
+
+void SavedSublist::readTill(MsgId tillId) {
+	const auto parentChat = _parent->parentChat();
+	if (!parentChat) {
+		return;
+	}
+	readTill(tillId, owner().message(parentChat->id, tillId));
+}
+
+void SavedSublist::readTill(
+		MsgId tillId,
+		HistoryItem *tillIdItem) {
+	if (!IsServerMsgId(tillId)) {
+		return;
+	}
+	if (unreadMark()) {
+		owner().histories().changeSublistUnreadMark(this, false);
+	}
+	const auto was = computeInboxReadTillFull();
+	const auto now = tillId;
+	if (now < was) {
+		return;
+	}
+	const auto unreadCount = computeUnreadCountLocally(now);
+	const auto fast = (tillIdItem && tillIdItem->out())
+		|| !unreadCount.has_value();
+	if (was < now || (fast && now == was)) {
+		setInboxReadTill(now, unreadCount);
+		if (!_readRequestTimer.isActive()) {
+			_readRequestTimer.callOnce(fast ? 0 : kReadRequestTimeout);
+		} else if (fast && _readRequestTimer.remainingTime() > 0) {
+			_readRequestTimer.callOnce(0);
+		}
+	}
+	Core::App().notifications().clearIncomingFromSublist(this);
+}
+
+void SavedSublist::sendReadTillRequest() {
+	const auto parentChat = _parent->parentChat();
+	if (!parentChat) {
+		return;
+	}
+	if (_readRequestTimer.isActive()) {
+		_readRequestTimer.cancel();
+	}
+	const auto api = &_parent->session().api();
+	api->request(base::take(_readRequestId)).cancel();
+
+	_sentReadTill = computeInboxReadTillFull();
+	_readRequestId = api->request(MTPmessages_ReadSavedHistory(
+		parentChat->input(),
+		sublistPeer()->input(),
+		MTP_int(_sentReadTill.bare)
+	)).done(crl::guard(this, [=] {
+		_readRequestId = 0;
+		reloadUnreadCountIfNeeded();
+	})).send();
+}
+
+void SavedSublist::reloadUnreadCountIfNeeded() {
+	if (unreadCountKnown()) {
+		return;
+	} else if (inboxReadTillId() < computeInboxReadTillFull()) {
+		_readRequestTimer.callOnce(0);
+	} else {
+		requestUnreadCount();
+	}
+}
+
+void SavedSublist::subscribeToUnreadChanges() {
+	if (!inMonoforum()) {
+		return;
+	}
+	_unreadCount.value(
+	) | rpl::map([=](std::optional<int> value) {
+		return value ? displayedUnreadCount() : value;
+	}) | rpl::distinct_until_changed(
+	) | rpl::combine_previous(
+	) | rpl::filter([=] {
+		return inChatList();
+	}) | rpl::on_next([=](
+			std::optional<int> previous,
+			std::optional<int> now) {
+		if (previous.value_or(0) != now.value_or(0)) {
+			_parent->recentSublistsInvalidate(this);
+		}
+		notifyUnreadStateChange(unreadStateFor(
+			previous.value_or(0),
+			previous.has_value()));
+	}, _lifetime);
+}
+
+void SavedSublist::applyMonoforumDialog(
+		const MTPDmonoForumDialog &data,
+		not_null<HistoryItem*> topItem) {
+	if (const auto parent = parentChat()) {
+		if (const auto draft = data.vdraft()) {
+			draft->match([&](const MTPDdraftMessage &data) {
+				Data::ApplyPeerCloudDraft(
+					&session(),
+					parent->id,
+					MsgId(),
+					sublistPeer()->id,
+					data);
+			}, [](const MTPDdraftMessageEmpty&) {});
+		}
+	}
+
+	setInboxReadTill(
+		data.vread_inbox_max_id().v,
+		data.vunread_count().v);
+	if (!unreadCountKnown() && !_readRequestId) {
+		// We got read_inbox_max_id < than our current inboxReadTillId,
+		// we need either to send a read request with this new value,
+		// or to downgrade inboxReadTillId locally.
+		if (_sentReadTill < computeInboxReadTillFull()) {
+			sendReadTillRequest();
+		} else {
+			// Just if nothing else helps.
+			_inboxReadTillId = 0;
+			setInboxReadTill(
+				data.vread_inbox_max_id().v,
+				data.vunread_count().v);
+		}
+	}
+	setOutboxReadTill(data.vread_outbox_max_id().v);
+	unreadReactions().setCount(data.vunread_reactions_count().v);
+	setUnreadMark(data.is_unread_mark());
+	applyMaybeLast(topItem);
+
+	if (data.is_nopaid_messages_exception()) {
+		_flags |= Flag::FeeRemoved;
+	} else {
+		_flags &= ~Flag::FeeRemoved;
+	}
+}
+
+bool SavedSublist::isFeeRemoved() const {
+	return (_flags & Flag::FeeRemoved);
+}
+
+void SavedSublist::toggleFeeRemoved(bool feeRemoved) {
+	if (feeRemoved) {
+		_flags |= Flag::FeeRemoved;
 	} else {
-		_items.insert(end(_items), begin(items), end(items));
-		ranges::stable_sort(
-			_items,
-			ranges::greater(),
-			&HistoryItem::id);
-		ranges::unique(_items, ranges::greater(), &HistoryItem::id);
-		_changed.fire({});
-	}
-}
-
-void SavedSublist::setFullLoaded(bool loaded) {
-	if (loaded != isFullLoaded()) {
-		if (loaded) {
-			_flags |= Flag::FullLoaded;
-			if (_items.empty()) {
-				updateChatListExistence();
+		_flags &= ~Flag::FeeRemoved;
+	}
+}
+
+TimeId SavedSublist::adjustedChatListTimeId() const {
+	const auto result = chatListTimeId();
+	const auto monoforumPeerId = sublistPeer()->id;
+	const auto history = _parent->owningHistory();
+	if (const auto draft = history->cloudDraft(MsgId(), monoforumPeerId)) {
+		if (!Data::DraftIsNull(draft) && !session().supportMode()) {
+			return std::max(result, draft->date);
+		}
+	}
+	return result;
+}
+
+rpl::producer<> SavedSublist::changes() const {
+	return _listChanges.events();
+}
+
+void SavedSublist::loadFullCount() {
+	if (!_fullCount.current() && !_loadingAround) {
+		loadAround(0);
+	}
+}
+
+void SavedSublist::appendClientSideMessages(MessagesSlice &slice) {
+	const auto &messages = owningHistory()->clientSideMessages();
+	if (messages.empty()) {
+		return;
+	} else if (slice.ids.empty()) {
+		if (slice.skippedBefore != 0 || slice.skippedAfter != 0) {
+			return;
+		}
+		slice.ids.reserve(messages.size());
+		const auto sublistPeerId = sublistPeer()->id;
+		for (const auto &item : messages) {
+			if (item->sublistPeerId() != sublistPeerId) {
+				continue;
 			}
+			slice.ids.push_back(item->fullId());
+		}
+		ranges::sort(slice.ids);
+		return;
+	}
+	const auto sublistPeerId = sublistPeer()->id;
+	auto dates = std::vector<TimeId>();
+	dates.reserve(slice.ids.size());
+	for (const auto &id : slice.ids) {
+		const auto message = owner().message(id);
+		Assert(message != nullptr);
+
+		dates.push_back(message->date());
+	}
+	for (const auto &item : messages) {
+		if (item->sublistPeerId() != sublistPeerId) {
+			continue;
+		}
+		const auto date = item->date();
+		if (date < dates.front()) {
+			if (slice.skippedBefore != 0) {
+				if (slice.skippedBefore) {
+					++*slice.skippedBefore;
+				}
+				continue;
+			}
+			dates.insert(dates.begin(), date);
+			slice.ids.insert(slice.ids.begin(), item->fullId());
 		} else {
-			_flags &= ~Flag::FullLoaded;
+			auto to = dates.size();
+			for (; to != 0; --to) {
+				const auto checkId = slice.ids[to - 1].msg;
+				if (dates[to - 1] > date) {
+					continue;
+				} else if (dates[to - 1] < date
+					|| IsServerMsgId(checkId)
+					|| checkId < item->id) {
+					break;
+				}
+			}
+			dates.insert(dates.begin() + to, date);
+			slice.ids.insert(slice.ids.begin() + to, item->fullId());
 		}
-		_changed.fire({});
 	}
 }
 
+std::optional<int> SavedSublist::fullCount() const {
+	return _fullCount.current();
+}
+
+rpl::producer<int> SavedSublist::fullCountValue() const {
+	return _fullCount.value() | rpl::filter_optional();
+}
+
 int SavedSublist::fixedOnTopIndex() const {
 	return 0;
 }
 
 bool SavedSublist::shouldBeInChatList() const {
-	return isPinnedDialog(FilterId()) || !_items.empty();
+	const auto monoforum = _parent->parentChat();
+	if (monoforum && (monoforum == sublistPeer())) {
+		return false;
+	}
+	const auto last = lastMessage();
+	const auto hasDisplayableLast = last && !last->isService();
+	if (!monoforum) {
+		return hasDisplayableLast;
+	}
+	return isPinnedDialog(FilterId())
+		|| !lastMessageKnown()
+		|| hasDisplayableLast;
+}
+
+HistoryItem *SavedSublist::lastMessage() const {
+	return _lastMessage.value_or(nullptr);
+}
+
+bool SavedSublist::lastMessageKnown() const {
+	return _lastMessage.has_value();
+}
+
+HistoryItem *SavedSublist::lastServerMessage() const {
+	return _lastServerMessage.value_or(nullptr);
+}
+
+bool SavedSublist::lastServerMessageKnown() const {
+	return _lastServerMessage.has_value();
+}
+
+MsgId SavedSublist::lastKnownServerMessageId() const {
+	return _lastKnownServerMessageId;
 }
 
 Dialogs::UnreadState SavedSublist::chatListUnreadState() const {
-	return {};
+	if (!inMonoforum()) {
+		return {};
+	}
+	return unreadStateFor(displayedUnreadCount(), unreadCountKnown());
 }
 
 Dialogs::BadgesState SavedSublist::chatListBadgesState() const {
-	return {};
+	if (!inMonoforum()) {
+		return {};
+	}
+	auto result = Dialogs::BadgesForUnread(
+		chatListUnreadState(),
+		Dialogs::CountInBadge::Messages,
+		Dialogs::IncludeInBadge::All);
+	if (!result.unread && inboxReadTillId() < 2) {
+		result.unread = (_lastKnownServerMessageId
+			> _parent->owningHistory()->inboxReadTillId());
+		result.unreadMuted = muted();
+	}
+	if (_parent->owningHistory()->muted()) {
+		result.unreadMuted
+			= result.mentionMuted
+			= result.reactionMuted
+			= result.pollMuted
+			= true;
+	}
+	return result;
 }
 
 HistoryItem *SavedSublist::chatListMessage() const {
-	return _items.empty() ? nullptr : _items.front().get();
+	return _lastMessage.value_or(nullptr);
 }
 
 bool SavedSublist::chatListMessageKnown() const {
-	return true;
+	return _lastMessage.has_value();
 }
 
 const QString &SavedSublist::chatListName() const {
-	return _history->chatListName();
+	return _sublistHistory->chatListName();
 }
 
 const base::flat_set<QString> &SavedSublist::chatListNameWords() const {
-	return _history->chatListNameWords();
+	return _sublistHistory->chatListNameWords();
 }
 
 const base::flat_set<QChar> &SavedSublist::chatListFirstLetters() const {
-	return _history->chatListFirstLetters();
+	return _sublistHistory->chatListFirstLetters();
 }
 
 const QString &SavedSublist::chatListNameSortKey() const {
-	return _history->chatListNameSortKey();
+	return _sublistHistory->chatListNameSortKey();
 }
 
 int SavedSublist::chatListNameVersion() const {
-	return _history->chatListNameVersion();
+	return _sublistHistory->chatListNameVersion();
 }
 
 void SavedSublist::paintUserpic(
 		Painter &p,
 		Ui::PeerUserpicView &view,
 		const Dialogs::Ui::PaintContext &context) const {
-	_history->paintUserpic(p, view, context);
+	_sublistHistory->paintUserpic(p, view, context);
 }
 
-void SavedSublist::chatListPreloadData() {
-	peer()->loadUserpic();
-	allowChatListMessageResolve();
+HistoryView::SendActionPainter *SavedSublist::sendActionPainter() {
+	return nullptr;
+}
+
+void SavedSublist::hasUnreadMentionChanged(bool has) {
+	auto was = chatListUnreadState();
+	if (has) {
+		was.mentions = 0;
+	} else {
+		was.mentions = 1;
+	}
+	notifyUnreadStateChange(was);
+}
+
+void SavedSublist::hasUnreadReactionChanged(bool has) {
+	auto was = chatListUnreadState();
+	if (has) {
+		was.reactions = was.reactionsMuted = 0;
+	} else {
+		was.reactions = 1;
+		was.reactionsMuted = muted() ? was.reactions : 0;
+	}
+	notifyUnreadStateChange(was);
+}
+
+void SavedSublist::hasUnreadPollVoteChanged(bool has) {
 }
 
 void SavedSublist::allowChatListMessageResolve() {
@@ -230,27 +1038,287 @@ void SavedSublist::allowChatListMessageResolve() {
 	resolveChatListMessageGroup();
 }
 
-bool SavedSublist::hasOrphanMediaGroupPart() const {
-	if (isFullLoaded() || _items.size() != 1) {
-		return false;
+void SavedSublist::resolveChatListMessageGroup() {
+	if (!(_flags & Flag::ResolveChatListMessage)) {
+		return;
+	}
+	// If we set a single album part, request the full album.
+	const auto item = _lastServerMessage.value_or(nullptr);
+	if (item && item->groupId() != MessageGroupId()) {
+		if (owner().groups().isGroupOfOne(item)
+			&& !item->toPreview({
+				.hideSender = true,
+				.hideCaption = true }).images.empty()
+				&& _requestedGroups.emplace(item->fullId()).second) {
+			owner().histories().requestGroupAround(item);
+		}
 	}
-	return (_items.front()->groupId() != MessageGroupId());
 }
 
-void SavedSublist::resolveChatListMessageGroup() {
-	const auto item = chatListMessage();
-	if (!(_flags & Flag::ResolveChatListMessage)
-		|| !item
-		|| !hasOrphanMediaGroupPart()) {
+void SavedSublist::growLastKnownServerMessageId(MsgId id) {
+	_lastKnownServerMessageId = std::max(_lastKnownServerMessageId, id);
+}
+
+void SavedSublist::setLastServerMessage(HistoryItem *item) {
+	if (item) {
+		growLastKnownServerMessageId(item->id);
+	}
+	_lastServerMessage = item;
+	if (_lastMessage
+		&& *_lastMessage
+		&& !(*_lastMessage)->isRegular()
+		&& (!item
+			|| (*_lastMessage)->date() > item->date()
+			|| (*_lastMessage)->isSending())) {
 		return;
 	}
-	// If we set a single album part, request the full album.
-	const auto withImages = !item->toPreview({
-		.hideSender = true,
-		.hideCaption = true }).images.empty();
-	if (withImages) {
-		owner().histories().requestGroupAround(item);
+	setLastMessage(item);
+}
+
+void SavedSublist::setLastMessage(HistoryItem *item) {
+	if (_lastMessage && *_lastMessage == item) {
+		return;
+	}
+	_lastMessage = item;
+	if (!item || item->isRegular()) {
+		_lastServerMessage = item;
+		if (item) {
+			growLastKnownServerMessageId(item->id);
+		}
 	}
+	setChatListMessage(item);
+}
+
+void SavedSublist::setChatListMessage(HistoryItem *item) {
+	if (_chatListMessage && *_chatListMessage == item) {
+		return;
+	}
+	const auto was = _chatListMessage.value_or(nullptr);
+	if (item) {
+		if (item->isSponsored()) {
+			return;
+		}
+		if (_chatListMessage
+			&& *_chatListMessage
+			&& !(*_chatListMessage)->isRegular()
+			&& (*_chatListMessage)->date() > item->date()) {
+			return;
+		}
+		_chatListMessage = item;
+		setChatListTimeId(item->date());
+		updateChatListExistence();
+	} else if (!_chatListMessage || *_chatListMessage) {
+		_chatListMessage = nullptr;
+		updateChatListExistence();
+	}
+	_parent->listMessageChanged(was, item);
+}
+
+void SavedSublist::chatListPreloadData() {
+	sublistPeer()->loadUserpic();
+	allowChatListMessageResolve();
+}
+
+Dialogs::UnreadState SavedSublist::unreadStateFor(
+		int count,
+		bool known) const {
+	auto result = Dialogs::UnreadState();
+	const auto mark = !count && unreadMark();
+	const auto muted = this->muted();
+	result.messages = count;
+	result.chats = count ? 1 : 0;
+	result.marks = mark ? 1 : 0;
+	result.reactions = unreadReactions().has() ? 1 : 0;
+	result.messagesMuted = muted ? result.messages : 0;
+	result.chatsMuted = muted ? result.chats : 0;
+	result.marksMuted = muted ? result.marks : 0;
+	result.reactionsMuted = muted ? result.reactions : 0;
+	result.known = known;
+	return result;
+}
+
+Histories &SavedSublist::histories() {
+	return owner().histories();
+}
+
+void SavedSublist::loadAround(MsgId id) {
+	if (_loadingAround && *_loadingAround == id) {
+		_loadingAroundRetry = id;
+		return;
+	}
+	_loadingAroundRetry = std::nullopt;
+	histories().cancelRequest(base::take(_beforeId));
+	histories().cancelRequest(base::take(_afterId));
+
+	const auto send = [=](Fn<void()> finish) {
+		using Flag = MTPmessages_GetSavedHistory::Flag;
+		const auto parentChat = _parent->parentChat();
+		return session().api().request(MTPmessages_GetSavedHistory(
+			MTP_flags(parentChat ? Flag::f_parent_peer : Flag(0)),
+			parentChat ? parentChat->input() : MTPInputPeer(),
+			sublistPeer()->input(),
+			MTP_int(id), // offset_id
+			MTP_int(0), // offset_date
+			MTP_int(id ? (-kMessagesPerPage / 2) : 0), // add_offset
+			MTP_int(kMessagesPerPage), // limit
+			MTP_int(0), // max_id
+			MTP_int(0), // min_id
+			MTP_long(0)) // hash
+		).done([=](const MTPmessages_Messages &result) {
+			_beforeId = 0;
+			_loadingAround = std::nullopt;
+			finish();
+
+			if (!id) {
+				_skippedAfter = 0;
+			} else {
+				_skippedAfter = std::nullopt;
+			}
+			_skippedBefore = std::nullopt;
+			_list.clear();
+			if (processMessagesIsEmpty(result)) {
+				_fullCount = _skippedBefore = _skippedAfter = 0;
+				if (!_parent->parentChat()
+					&& !_chatListMessage.value_or(nullptr)) {
+					if (isPinnedDialog(FilterId())) {
+						_restorePinnedWhenNonEmpty = true;
+						owner().setChatPinned(this, FilterId(), false);
+					}
+					setLastServerMessage(nullptr);
+					updateChatListExistence();
+				}
+			} else if (id) {
+				Assert(!_list.empty());
+				if (_list.front() <= id) {
+					_skippedAfter = 0;
+				} else if (_list.back() >= id) {
+					_skippedBefore = 0;
+				}
+			} else if (!_parent->parentChat()
+				&& !_chatListMessage.value_or(nullptr)) {
+				Assert(!_list.empty());
+				applyMaybeLast(owner().message(
+					owningHistory()->peer,
+					_list.front()));
+			}
+			checkReadTillEnd();
+			if (const auto retry = base::take(_loadingAroundRetry)) {
+				loadAround(*retry);
+			}
+		}).fail([=](const MTP::Error &error) {
+			if (error.type() == u"SAVED_DIALOGS_UNSUPPORTED"_q) {
+				_parent->markUnsupported();
+			}
+			_beforeId = 0;
+			_loadingAround = std::nullopt;
+			finish();
+			if (const auto retry = base::take(_loadingAroundRetry)) {
+				loadAround(*retry);
+			}
+		}).send();
+	};
+	_loadingAround = id;
+	_beforeId = histories().sendRequest(
+		owningHistory(),
+		Histories::RequestType::History,
+		send);
+}
+
+void SavedSublist::loadBefore() {
+	Expects(!_list.empty());
+
+	if (_loadingAround) {
+		histories().cancelRequest(base::take(_beforeId));
+	} else if (_beforeId) {
+		return;
+	}
+
+	const auto last = _list.back();
+	const auto send = [=](Fn<void()> finish) {
+		using Flag = MTPmessages_GetSavedHistory::Flag;
+		const auto parentChat = _parent->parentChat();
+		return session().api().request(MTPmessages_GetSavedHistory(
+			MTP_flags(parentChat ? Flag::f_parent_peer : Flag(0)),
+			parentChat ? parentChat->input() : MTPInputPeer(),
+			sublistPeer()->input(),
+			MTP_int(last), // offset_id
+			MTP_int(0), // offset_date
+			MTP_int(0), // add_offset
+			MTP_int(kMessagesPerPage), // limit
+			MTP_int(0), // min_id
+			MTP_int(0), // max_id
+			MTP_long(0) // hash
+		)).done([=](const MTPmessages_Messages &result) {
+			_beforeId = 0;
+			finish();
+
+			if (_list.empty()) {
+				return;
+			} else if (_list.back() != last) {
+				loadBefore();
+			} else if (processMessagesIsEmpty(result)) {
+				_skippedBefore = 0;
+				if (_skippedAfter == 0) {
+					_fullCount = _list.size();
+				}
+			}
+		}).fail([=] {
+			_beforeId = 0;
+			finish();
+		}).send();
+	};
+	_beforeId = histories().sendRequest(
+		owningHistory(),
+		Histories::RequestType::History,
+		send);
+}
+
+void SavedSublist::loadAfter() {
+	Expects(!_list.empty());
+
+	if (_afterId) {
+		return;
+	}
+
+	const auto first = _list.front();
+	const auto send = [=](Fn<void()> finish) {
+		using Flag = MTPmessages_GetSavedHistory::Flag;
+		const auto parentChat = _parent->parentChat();
+		return session().api().request(MTPmessages_GetSavedHistory(
+			MTP_flags(parentChat ? Flag::f_parent_peer : Flag(0)),
+			parentChat ? parentChat->input() : MTPInputPeer(),
+			sublistPeer()->input(),
+			MTP_int(first + 1), // offset_id
+			MTP_int(0), // offset_date
+			MTP_int(-kMessagesPerPage), // add_offset
+			MTP_int(kMessagesPerPage), // limit
+			MTP_int(0), // min_id
+			MTP_int(0), // max_id
+			MTP_long(0) // hash
+		)).done([=](const MTPmessages_Messages &result) {
+			_afterId = 0;
+			finish();
+
+			if (_list.empty()) {
+				return;
+			} else if (_list.front() != first) {
+				loadAfter();
+			} else if (processMessagesIsEmpty(result)) {
+				_skippedAfter = 0;
+				if (_skippedBefore == 0) {
+					_fullCount = _list.size();
+				}
+				checkReadTillEnd();
+			}
+		}).fail([=] {
+			_afterId = 0;
+			finish();
+		}).send();
+	};
+	_afterId = histories().sendRequest(
+		owningHistory(),
+		Histories::RequestType::History,
+		send);
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_saved_sublist.h b/Telegram/SourceFiles/data/data_saved_sublist.h
index 15c3428fff42dc..c62b6186445814 100644
--- a/Telegram/SourceFiles/data/data_saved_sublist.h
+++ b/Telegram/SourceFiles/data/data_saved_sublist.h
@@ -7,8 +7,9 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/timer.h"
+#include "data/data_thread.h"
 #include "dialogs/ui/dialogs_message_view.h"
-#include "dialogs/dialogs_entry.h"
 
 class PeerData;
 class History;
@@ -16,31 +17,64 @@ class History;
 namespace Data {
 
 class Session;
-
-class SavedSublist final : public Dialogs::Entry {
+class Histories;
+class SavedMessages;
+struct MessagePosition;
+struct MessageUpdate;
+struct SublistReadTillUpdate;
+struct MessagesSlice;
+
+class SavedSublist final : public Data::Thread {
 public:
-	explicit SavedSublist(not_null<PeerData*> peer);
+	SavedSublist(
+		not_null<SavedMessages*> parent,
+		not_null<PeerData*> sublistPeer);
 	~SavedSublist();
 
-	[[nodiscard]] not_null<History*> history() const;
-	[[nodiscard]] not_null<PeerData*> peer() const;
+	[[nodiscard]] bool inMonoforum() const;
+	[[nodiscard]] bool isFeeRemoved() const;
+	void toggleFeeRemoved(bool feeRemoved);
+
+	void apply(const SublistReadTillUpdate &update);
+	void apply(const MessageUpdate &update);
+	void applyDifferenceTooLong();
+	bool removeOne(not_null<HistoryItem*> item);
+
+	[[nodiscard]] rpl::producer<MessagesSlice> source(
+		MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter);
+
+	[[nodiscard]] not_null<SavedMessages*> parent() const;
+	[[nodiscard]] not_null<History*> owningHistory() override;
+	[[nodiscard]] ChannelData *parentChat() const;
+	[[nodiscard]] not_null<PeerData*> sublistPeer() const;
 	[[nodiscard]] bool isHiddenAuthor() const;
-	[[nodiscard]] bool isFullLoaded() const;
+	[[nodiscard]] rpl::producer<> destroyed() const;
 
-	[[nodiscard]] auto messages() const
-		-> const std::vector<not_null<HistoryItem*>> &;
-	void applyMaybeLast(not_null<HistoryItem*> item, bool added = false);
-	void removeOne(not_null<HistoryItem*> item);
-	void append(std::vector<not_null<HistoryItem*>> &&items, int fullCount);
-	void setFullLoaded(bool loaded = true);
+	void applyMaybeLast(not_null<HistoryItem*> item);
+	void applyItemAdded(not_null<HistoryItem*> item);
+	void applyItemRemoved(MsgId id);
 
 	[[nodiscard]] rpl::producer<> changes() const;
 	[[nodiscard]] std::optional<int> fullCount() const;
 	[[nodiscard]] rpl::producer<int> fullCountValue() const;
+	void loadFullCount();
+
+	[[nodiscard]] bool unreadCountKnown() const;
+	[[nodiscard]] int unreadCountCurrent() const;
+	[[nodiscard]] int displayedUnreadCount() const;
+	[[nodiscard]] rpl::producer<std::optional<int>> unreadCountValue() const;
+	void setUnreadMark(bool unread);
 
-	[[nodiscard]] Dialogs::Ui::MessageView &lastItemDialogsView() {
-		return _lastItemDialogsView;
-	}
+	void applyMonoforumDialog(
+		const MTPDmonoForumDialog &dialog,
+		not_null<HistoryItem*> topItem);
+	void readTillEnd();
+	void requestChatListMessage();
+	void setRestorePinnedWhenNonEmpty(bool restore);
+
+	TimeId adjustedChatListTimeId() const override;
 
 	int fixedOnTopIndex() const override;
 	bool shouldBeInChatList() const override;
@@ -54,31 +88,113 @@ class SavedSublist final : public Dialogs::Entry {
 	const base::flat_set<QString> &chatListNameWords() const override;
 	const base::flat_set<QChar> &chatListFirstLetters() const override;
 
+	void hasUnreadMentionChanged(bool has) override;
+	void hasUnreadReactionChanged(bool has) override;
+	void hasUnreadPollVoteChanged(bool has) override;
+
+	[[nodiscard]] HistoryItem *lastMessage() const;
+	[[nodiscard]] HistoryItem *lastServerMessage() const;
+	[[nodiscard]] bool lastMessageKnown() const;
+	[[nodiscard]] bool lastServerMessageKnown() const;
+	[[nodiscard]] MsgId lastKnownServerMessageId() const;
+
+	void setInboxReadTill(MsgId readTillId, std::optional<int> unreadCount);
+	[[nodiscard]] MsgId inboxReadTillId() const;
+	[[nodiscard]] MsgId computeInboxReadTillFull() const;
+
+	void setOutboxReadTill(MsgId readTillId);
+	[[nodiscard]] MsgId computeOutboxReadTillFull() const;
+
+	[[nodiscard]] bool isServerSideUnread(
+		not_null<const HistoryItem*> item) const override;
+
+	void requestUnreadCount();
+
+	void readTill(not_null<HistoryItem*> item);
+	void readTill(MsgId tillId);
+
 	void chatListPreloadData() override;
 	void paintUserpic(
 		Painter &p,
 		Ui::PeerUserpicView &view,
 		const Dialogs::Ui::PaintContext &context) const override;
 
+	[[nodiscard]] auto sendActionPainter()
+		-> HistoryView::SendActionPainter* override;
+
 private:
+	struct Viewer;
+
 	enum class Flag : uchar {
 		ResolveChatListMessage = (1 << 0),
-		FullLoaded = (1 << 1),
+		InMonoforum = (1 << 1),
+		FeeRemoved = (1 << 2),
 	};
 	friend inline constexpr bool is_flag_type(Flag) { return true; }
 	using Flags = base::flags<Flag>;
 
-	bool hasOrphanMediaGroupPart() const;
+	[[nodiscard]] Histories &histories();
+
+	void subscribeToUnreadChanges();
+	[[nodiscard]] Dialogs::UnreadState unreadStateFor(
+		int count,
+		bool known) const;
+	void setLastMessage(HistoryItem *item);
+	void setLastServerMessage(HistoryItem *item);
+	void setChatListMessage(HistoryItem *item);
 	void allowChatListMessageResolve();
 	void resolveChatListMessageGroup();
+	void growLastKnownServerMessageId(MsgId id);
+
+	void changeUnreadCountByMessage(MsgId id, int delta);
+	void setUnreadCount(std::optional<int> count);
+	void readTill(MsgId tillId, HistoryItem *tillIdItem);
+	void checkReadTillEnd();
+	void sendReadTillRequest();
+	void reloadUnreadCountIfNeeded();
+
+	[[nodiscard]] bool buildFromData(not_null<Viewer*> viewer);
+	[[nodiscard]] bool applyUpdate(const MessageUpdate &update);
+	void appendClientSideMessages(MessagesSlice &slice);
+	[[nodiscard]] std::optional<int> computeUnreadCountLocally(
+		MsgId afterId) const;
+	bool processMessagesIsEmpty(const MTPmessages_Messages &result);
+	void loadAround(MsgId id);
+	void loadBefore();
+	void loadAfter();
+
+	const not_null<SavedMessages*> _parent;
+	const not_null<History*> _sublistHistory;
+
+	MsgId _lastKnownServerMessageId = 0;
+
+	std::vector<MsgId> _list;
+	std::optional<int> _skippedBefore;
+	std::optional<int> _skippedAfter;
+	rpl::variable<std::optional<int>> _fullCount;
+	rpl::event_stream<> _listChanges;
+	rpl::event_stream<> _instantChanges;
+	std::optional<MsgId> _loadingAround;
+	std::optional<MsgId> _loadingAroundRetry;
+	rpl::variable<std::optional<int>> _unreadCount;
+	MsgId _inboxReadTillId = 0;
+	MsgId _outboxReadTillId = 0;
+	Flags _flags;
 
-	const not_null<History*> _history;
+	std::optional<HistoryItem*> _lastMessage;
+	std::optional<HistoryItem*> _lastServerMessage;
+	std::optional<HistoryItem*> _chatListMessage;
+	base::flat_set<FullMsgId> _requestedGroups;
+	int _beforeId = 0;
+	int _afterId = 0;
 
-	std::vector<not_null<HistoryItem*>> _items;
-	std::optional<int> _fullCount;
-	rpl::event_stream<> _changed;
-	Dialogs::Ui::MessageView _lastItemDialogsView;
-	Flags _flags;
+	base::Timer _readRequestTimer;
+	mtpRequestId _readRequestId = 0;
+	MsgId _sentReadTill = 0;
+
+	bool _restorePinnedWhenNonEmpty = false;
+
+	rpl::lifetime _lifetime;
 
 };
 
diff --git a/Telegram/SourceFiles/data/data_search_calendar.cpp b/Telegram/SourceFiles/data/data_search_calendar.cpp
new file mode 100644
index 00000000000000..81b2befaf4d586
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_search_calendar.cpp
@@ -0,0 +1,247 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/data_search_calendar.h"
+
+#include "apiwrap.h"
+#include "base/unixtime.h"
+#include "data/data_document.h"
+#include "data/data_media_types.h"
+#include "data/data_peer.h"
+#include "data/data_search_controller.h" // PrepareSearchFilter
+#include "data/data_session.h"
+#include "history/history_item.h"
+#include "history/history.h"
+#include "main/main_session.h"
+#include "ui/dynamic_thumbnails.h"
+
+namespace Api {
+
+SearchCalendarController::SearchCalendarController(
+	not_null<Main::Session*> session,
+	PeerId peerId,
+	Storage::SharedMediaType type)
+: _session(session)
+, _peerId(peerId)
+, _type(type)
+, _api(&session->mtp()) {
+}
+
+void SearchCalendarController::monthThumbnails(
+		TimeId date,
+		Fn<void(std::vector<DayThumbnail>)> onFinish) {
+	const auto parsed = base::unixtime::parse(date).date();
+	const auto key = MonthKey{
+		.peerId = _peerId,
+		.year = parsed.year(),
+		.month = parsed.month(),
+	};
+
+	if (const auto it = _months.find(key); it != _months.end()) {
+		if (it->second.loaded) {
+			onFinish(it->second.cache);
+			return;
+		}
+	}
+
+	auto &data = _months[key];
+	data.callbacks.push_back(std::move(onFinish));
+
+	if (!data.requestId) {
+		performMonthRequest(key);
+	}
+}
+
+void SearchCalendarController::performMonthRequest(const MonthKey &key) {
+	const auto peer = _session->data().peer(key.peerId);
+	const auto filter = PrepareSearchFilter(_type);
+
+	const auto month = QDate(key.year, key.month, 1);
+	const auto endDate = base::unixtime::serialize(QDateTime(
+		month.addMonths(1).addDays(-1),
+		QTime(23, 59, 59)));
+
+	auto &data = _months[key];
+
+	data.requestId = _api.request(
+		MTPmessages_GetSearchResultsCalendar(
+			MTP_flags(0),
+			peer->input(),
+			MTPInputPeer(),
+			filter,
+			MTP_int(data.state.offsetId),
+			MTP_int(data.state.offsetDate ? data.state.offsetDate : endDate)
+	)).done([=](const MTPmessages_SearchResultsCalendar &result) {
+		auto &data = _months[key];
+		data.requestId = 0;
+		const auto &fields = result.data();
+		_session->data().processUsers(fields.vusers());
+		_session->data().processChats(fields.vchats());
+		_session->data().processMessages(
+			fields.vmessages(),
+			NewMessageType::Existing);
+
+		auto messageIds = std::vector<FullMsgId>();
+		messageIds.reserve(fields.vmessages().v.size());
+		for (const auto &message : fields.vmessages().v) {
+			messageIds.push_back(
+				FullMsgId(key.peerId, IdFromMessage(message)));
+		}
+
+		auto periods = std::vector<CalendarPeriod>();
+		periods.reserve(fields.vperiods().v.size());
+		for (const auto &period : fields.vperiods().v) {
+			const auto &periodFields = period.data();
+			periods.push_back(CalendarPeriod{
+				.date = periodFields.vdate().v,
+				.minMsgId = periodFields.vmin_msg_id().v,
+				.maxMsgId = periodFields.vmax_msg_id().v,
+				.count = periodFields.vcount().v,
+			});
+		}
+
+		const auto prevOffsetId = data.state.offsetId;
+		const auto prevOffsetDate = data.state.offsetDate;
+		data.state.offsetId = fields.vmin_msg_id().v;
+		data.state.offsetDate = fields.vmin_date().v;
+
+		const auto noMoreData = !data.state.offsetId
+			|| (prevOffsetId == data.state.offsetId
+				&& prevOffsetDate == data.state.offsetDate);
+
+		processMonthData(
+			key,
+			periods,
+			messageIds,
+			fields.vmin_date().v,
+			noMoreData);
+	}).fail([=] {
+		auto &data = _months[key];
+		data.requestId = 0;
+		data.loaded = true;
+		auto callbacks = std::move(data.callbacks);
+		data.callbacks.clear();
+		for (const auto &callback : callbacks) {
+			callback(data.cache);
+		}
+	}).send();
+}
+
+void SearchCalendarController::processMonthData(
+		const MonthKey &key,
+		const std::vector<CalendarPeriod> &periods,
+		const std::vector<FullMsgId> &messages,
+		TimeId minDate,
+		bool noMoreData) {
+	const auto inTargetMonth = [&](TimeId date) {
+		const auto parsed = base::unixtime::parse(date).date();
+		return (parsed.year() == key.year) && (parsed.month() == key.month);
+	};
+	const auto dayStartOf = [&](TimeId date) {
+		return base::unixtime::serialize(
+			QDateTime(base::unixtime::parse(date).date(), QTime()));
+	};
+
+	// Representative messages of the page give the thumbnail for each day.
+	auto dayImages = base::flat_map<
+		TimeId,
+		std::shared_ptr<Ui::DynamicImage>>();
+	for (const auto &fullId : messages) {
+		const auto item = _session->data().message(fullId);
+		if (!item || !inTargetMonth(item->date())) {
+			continue;
+		}
+		const auto dayStart = dayStartOf(item->date());
+		if (dayImages.contains(dayStart)) {
+			continue;
+		}
+		const auto media = item->media();
+		if (!media) {
+			continue;
+		}
+		auto image = std::shared_ptr<Ui::DynamicImage>();
+		if (const auto photo = media->photo()) {
+			image = Ui::MakePhotoThumbnail(photo, item->fullId());
+		} else if (const auto document = media->document()) {
+			if (document->isVideoFile()) {
+				image = Ui::MakeDocumentThumbnail(document, item->fullId());
+			}
+		}
+		if (image) {
+			dayImages.emplace(dayStart, std::move(image));
+		}
+	}
+
+	// Periods are authoritative: they provide the newest message of each day.
+	auto &data = _months[key];
+	auto seenDays = base::flat_set<TimeId>();
+	for (const auto &thumb : data.cache) {
+		seenDays.emplace(thumb.date);
+	}
+	for (const auto &period : periods) {
+		if (!period.maxMsgId || !inTargetMonth(period.date)) {
+			continue;
+		}
+		const auto dayStart = dayStartOf(period.date);
+		if (seenDays.contains(dayStart)) {
+			continue;
+		}
+		const auto i = dayImages.find(dayStart);
+		if (i == dayImages.end()) {
+			continue;
+		}
+		seenDays.emplace(dayStart);
+		data.cache.push_back(DayThumbnail{
+			.date = dayStart,
+			.image = i->second,
+			.msgId = period.maxMsgId,
+		});
+	}
+
+	const auto month = QDate(key.year, key.month, 1);
+	const auto covered = noMoreData
+		|| (minDate && base::unixtime::parse(minDate).date() < month);
+	if (!covered && !data.requestId) {
+		performMonthRequest(key);
+		return;
+	}
+
+	data.loaded = true;
+	auto callbacks = std::move(data.callbacks);
+	data.callbacks.clear();
+	for (const auto &callback : callbacks) {
+		callback(data.cache);
+	}
+}
+
+std::optional<MsgId> SearchCalendarController::resolveMsgIdByDate(
+		TimeId date) const {
+	const auto parsed = base::unixtime::parse(date).date();
+	const auto key = MonthKey{
+		.peerId = _peerId,
+		.year = parsed.year(),
+		.month = parsed.month(),
+	};
+
+	const auto it = _months.find(key);
+	if (it == _months.end() || it->second.cache.empty()) {
+		return std::nullopt;
+	}
+
+	const auto dayStart = base::unixtime::serialize(
+		QDateTime(parsed, QTime()));
+
+	for (const auto &thumb : it->second.cache) {
+		if (thumb.date == dayStart) {
+			return thumb.msgId;
+		}
+	}
+
+	return std::nullopt;
+}
+
+} // namespace Api
\ No newline at end of file
diff --git a/Telegram/SourceFiles/data/data_search_calendar.h b/Telegram/SourceFiles/data/data_search_calendar.h
new file mode 100644
index 00000000000000..0b1e6eee951ef0
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_search_calendar.h
@@ -0,0 +1,98 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "mtproto/sender.h"
+#include "storage/storage_shared_media.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class DynamicImage;
+} // namespace Ui
+
+namespace Api {
+
+struct CalendarPeriod {
+	TimeId date = 0;
+	MsgId minMsgId = 0;
+	MsgId maxMsgId = 0;
+	int count = 0;
+};
+
+struct CalendarResult {
+	std::vector<CalendarPeriod> periods;
+	int count = 0;
+	TimeId minDate = 0;
+	MsgId minMsgId = 0;
+};
+
+struct DayThumbnail {
+	TimeId date = 0;
+	std::shared_ptr<Ui::DynamicImage> image;
+	MsgId msgId = 0;
+};
+
+class SearchCalendarController final {
+public:
+	SearchCalendarController(
+		not_null<Main::Session*> session,
+		PeerId peerId,
+		Storage::SharedMediaType type);
+
+	void monthThumbnails(
+		TimeId date,
+		Fn<void(std::vector<DayThumbnail>)> onFinish);
+
+	[[nodiscard]] std::optional<MsgId> resolveMsgIdByDate(TimeId date) const;
+
+private:
+	struct MonthKey {
+		PeerId peerId = 0;
+		int year = 0;
+		int month = 0;
+
+		friend inline auto operator<=>(
+			const MonthKey &,
+			const MonthKey &) = default;
+	};
+
+	struct MonthState {
+		MsgId offsetId = 0;
+		TimeId offsetDate = 0;
+	};
+
+	struct MonthData {
+		std::vector<DayThumbnail> cache;
+		std::vector<Fn<void(std::vector<DayThumbnail>)>> callbacks;
+		mtpRequestId requestId = 0;
+		MonthState state;
+		bool loaded = false;
+	};
+
+	void performMonthRequest(const MonthKey &key);
+	void processMonthData(
+		const MonthKey &key,
+		const std::vector<CalendarPeriod> &periods,
+		const std::vector<FullMsgId> &messages,
+		TimeId minDate,
+		bool noMoreData);
+
+	const not_null<Main::Session*> _session;
+	const PeerId _peerId;
+	const Storage::SharedMediaType _type;
+
+	MTP::Sender _api;
+
+	base::flat_map<MonthKey, MonthData> _months;
+
+};
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/data/data_search_controller.cpp b/Telegram/SourceFiles/data/data_search_controller.cpp
index 4e33a9eaa5282e..5e7fdddd085324 100644
--- a/Telegram/SourceFiles/data/data_search_controller.cpp
+++ b/Telegram/SourceFiles/data/data_search_controller.cpp
@@ -26,43 +26,120 @@ constexpr auto kDefaultSearchTimeoutMs = crl::time(200);
 
 } // namespace
 
+MTPMessagesFilter PrepareSearchFilter(Storage::SharedMediaType type) {
+	using Type = Storage::SharedMediaType;
+	switch (type) {
+	case Type::Photo:
+		return MTP_inputMessagesFilterPhotos();
+	case Type::Video:
+		return MTP_inputMessagesFilterVideo();
+	case Type::PhotoVideo:
+		return MTP_inputMessagesFilterPhotoVideo();
+	case Type::MusicFile:
+		return MTP_inputMessagesFilterMusic();
+	case Type::File:
+		return MTP_inputMessagesFilterDocument();
+	case Type::VoiceFile:
+		return MTP_inputMessagesFilterVoice();
+	case Type::RoundVoiceFile:
+		return MTP_inputMessagesFilterRoundVoice();
+	case Type::RoundFile:
+		return MTP_inputMessagesFilterRoundVideo();
+	case Type::GIF:
+		return MTP_inputMessagesFilterGif();
+	case Type::Link:
+		return MTP_inputMessagesFilterUrl();
+	case Type::ChatPhoto:
+		return MTP_inputMessagesFilterChatPhotos();
+	case Type::Pinned:
+		return MTP_inputMessagesFilterPinned();
+	case Type::Poll:
+		return MTP_inputMessagesFilterPoll();
+	}
+	return MTP_inputMessagesFilterEmpty();
+}
+
+std::optional<GlobalMediaRequest> PrepareGlobalMediaRequest(
+		not_null<Main::Session*> session,
+		int32 offsetRate,
+		Data::MessagePosition offsetPosition,
+		Storage::SharedMediaType type,
+		const QString &query) {
+	const auto filter = PrepareSearchFilter(type);
+	if (query.isEmpty() && filter.type() == mtpc_inputMessagesFilterEmpty) {
+		return std::nullopt;
+	}
+
+	const auto minDate = 0;
+	const auto maxDate = 0;
+	const auto folderId = 0;
+	const auto limit = offsetPosition.fullId.peer
+		? kSharedMediaLimit
+		: kFirstSharedMediaLimit;
+	return MTPmessages_SearchGlobal(
+		MTP_flags(MTPmessages_SearchGlobal::Flag::f_folder_id), // No archive
+		MTP_int(folderId),
+		MTP_string(query),
+		filter,
+		MTP_int(minDate),
+		MTP_int(maxDate),
+		MTP_int(offsetRate),
+		(offsetPosition.fullId.peer
+			? session->data().peer(PeerId(offsetPosition.fullId.peer))->input()
+			: MTP_inputPeerEmpty()),
+		MTP_int(offsetPosition.fullId.msg),
+		MTP_int(limit));
+}
+
+GlobalMediaResult ParseGlobalMediaResult(
+		not_null<Main::Session*> session,
+		const MTPmessages_Messages &data) {
+	auto result = GlobalMediaResult();
+
+	auto messages = (const QVector<MTPMessage>*)nullptr;
+	data.match([&](const MTPDmessages_messagesNotModified &) {
+	}, [&](const auto &data) {
+		session->data().processUsers(data.vusers());
+		session->data().processChats(data.vchats());
+		messages = &data.vmessages().v;
+	});
+	data.match([&](const MTPDmessages_messagesNotModified &) {
+	}, [&](const MTPDmessages_messages &data) {
+		result.fullCount = data.vmessages().v.size();
+	}, [&](const MTPDmessages_messagesSlice &data) {
+		result.fullCount = data.vcount().v;
+		result.offsetRate = data.vnext_rate().value_or_empty();
+	}, [&](const MTPDmessages_channelMessages &data) {
+		result.fullCount = data.vcount().v;
+	});
+	data.match([&](const MTPDmessages_channelMessages &data) {
+		LOG(("API Error: received messages.channelMessages when "
+			"no channel was passed! (ParseSearchResult)"));
+	}, [](const auto &) {});
+
+	const auto addType = NewMessageType::Existing;
+	result.messageIds.reserve(messages->size());
+	for (const auto &message : *messages) {
+		const auto item = session->data().addNewMessage(
+			message,
+			MessageFlags(),
+			addType);
+		if (item) {
+			result.messageIds.push_back(item->position());
+		}
+	}
+	return result;
+}
+
 std::optional<SearchRequest> PrepareSearchRequest(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
+	    PeerId monoforumPeerId,
 		Storage::SharedMediaType type,
 		const QString &query,
 		MsgId messageId,
 		Data::LoadDirection direction) {
-	const auto filter = [&] {
-		using Type = Storage::SharedMediaType;
-		switch (type) {
-		case Type::Photo:
-			return MTP_inputMessagesFilterPhotos();
-		case Type::Video:
-			return MTP_inputMessagesFilterVideo();
-		case Type::PhotoVideo:
-			return MTP_inputMessagesFilterPhotoVideo();
-		case Type::MusicFile:
-			return MTP_inputMessagesFilterMusic();
-		case Type::File:
-			return MTP_inputMessagesFilterDocument();
-		case Type::VoiceFile:
-			return MTP_inputMessagesFilterVoice();
-		case Type::RoundVoiceFile:
-			return MTP_inputMessagesFilterRoundVoice();
-		case Type::RoundFile:
-			return MTP_inputMessagesFilterRoundVideo();
-		case Type::GIF:
-			return MTP_inputMessagesFilterGif();
-		case Type::Link:
-			return MTP_inputMessagesFilterUrl();
-		case Type::ChatPhoto:
-			return MTP_inputMessagesFilterChatPhotos();
-		case Type::Pinned:
-			return MTP_inputMessagesFilterPinned();
-		}
-		return MTP_inputMessagesFilterEmpty();
-	}();
+	const auto filter = PrepareSearchFilter(type);
 	if (query.isEmpty() && filter.type() == mtpc_inputMessagesFilterEmpty) {
 		return std::nullopt;
 	}
@@ -94,11 +171,14 @@ std::optional<SearchRequest> PrepareSearchRequest(
 		int64(0x3FFFFFFF)));
 	using Flag = MTPmessages_Search::Flag;
 	return MTPmessages_Search(
-		MTP_flags(topicRootId ? Flag::f_top_msg_id : Flag(0)),
-		peer->input,
+		MTP_flags((topicRootId ? Flag::f_top_msg_id : Flag(0))
+			| (monoforumPeerId ? Flag::f_saved_peer_id : Flag(0))),
+		peer->input(),
 		MTP_string(query),
 		MTP_inputPeerEmpty(),
-		MTPInputPeer(), // saved_peer_id
+		(monoforumPeerId
+			? peer->owner().peer(monoforumPeerId)->input()
+			: MTPInputPeer()),
 		MTPVector<MTPReaction>(), // saved_reaction
 		MTP_int(topicRootId),
 		filter,
@@ -127,6 +207,7 @@ SearchResult ParseSearchResult(
 			auto &d = data.c_messages_messages();
 			peer->owner().processUsers(d.vusers());
 			peer->owner().processChats(d.vchats());
+			peer->processTopics(d.vtopics());
 			result.fullCount = d.vmessages().v.size();
 			return &d.vmessages().v;
 		} break;
@@ -135,21 +216,22 @@ SearchResult ParseSearchResult(
 			auto &d = data.c_messages_messagesSlice();
 			peer->owner().processUsers(d.vusers());
 			peer->owner().processChats(d.vchats());
+			peer->processTopics(d.vtopics());
 			result.fullCount = d.vcount().v;
 			return &d.vmessages().v;
 		} break;
 
 		case mtpc_messages_channelMessages: {
 			const auto &d = data.c_messages_channelMessages();
+			peer->owner().processUsers(d.vusers());
+			peer->owner().processChats(d.vchats());
 			if (const auto channel = peer->asChannel()) {
 				channel->ptsReceived(d.vpts().v);
-				channel->processTopics(d.vtopics());
 			} else {
 				LOG(("API Error: received messages.channelMessages when "
 					"no channel was passed! (ParseSearchResult)"));
 			}
-			peer->owner().processUsers(d.vusers());
-			peer->owner().processChats(d.vchats());
+			peer->processTopics(d.vtopics());
 			result.fullCount = d.vcount().v;
 			return &d.vmessages().v;
 		} break;
@@ -231,7 +313,7 @@ HistoryRequest PrepareHistoryRequest(
 		int64(0),
 		int64(0x3FFFFFFF)));
 	return MTPmessages_GetHistory(
-		peer->input,
+		peer->input(),
 		MTP_int(mtpOffsetId),
 		MTP_int(offsetDate),
 		MTP_int(addOffset),
@@ -295,12 +377,14 @@ rpl::producer<SparseIdsMergedSlice> SearchController::idsSlice(
 	auto createSimpleViewer = [=](
 			PeerId peerId,
 			MsgId topicRootId,
+			PeerId monoforumPeerId,
 			SparseIdsSlice::Key simpleKey,
 			int limitBefore,
 			int limitAfter) {
 		return simpleIdsSlice(
 			peerId,
 			topicRootId,
+			monoforumPeerId,
 			simpleKey,
 			query,
 			limitBefore,
@@ -310,6 +394,7 @@ rpl::producer<SparseIdsMergedSlice> SearchController::idsSlice(
 		SparseIdsMergedSlice::Key(
 			query.peerId,
 			query.topicRootId,
+			query.monoforumPeerId,
 			query.migratedPeerId,
 			aroundId),
 		limitBefore,
@@ -320,6 +405,7 @@ rpl::producer<SparseIdsMergedSlice> SearchController::idsSlice(
 rpl::producer<SparseIdsSlice> SearchController::simpleIdsSlice(
 		PeerId peerId,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		MsgId aroundId,
 		const Query &query,
 		int limitBefore,
@@ -328,8 +414,12 @@ rpl::producer<SparseIdsSlice> SearchController::simpleIdsSlice(
 	Expects(IsServerMsgId(aroundId) || (aroundId == 0));
 	Expects((aroundId != 0)
 		|| (limitBefore == 0 && limitAfter == 0));
-	Expects((query.peerId == peerId && query.topicRootId == topicRootId)
-		|| (query.migratedPeerId == peerId && MsgId(0) == topicRootId));
+	Expects((query.peerId == peerId
+		&& query.topicRootId == topicRootId
+		&& query.monoforumPeerId == monoforumPeerId)
+		|| (query.migratedPeerId == peerId
+			&& MsgId(0) == topicRootId
+			&& PeerId(0) == monoforumPeerId));
 
 	auto it = _cache.find(query);
 	if (it == _cache.end()) {
@@ -346,7 +436,7 @@ rpl::producer<SparseIdsSlice> SearchController::simpleIdsSlice(
 			limitBefore,
 			limitAfter);
 		builder->insufficientAround(
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const SparseIdsSliceBuilder::AroundData &data) {
 			requestMore(data, query, listData);
 		}, lifetime);
@@ -358,22 +448,24 @@ rpl::producer<SparseIdsSlice> SearchController::simpleIdsSlice(
 		listData->list.sliceUpdated(
 		) | rpl::filter([=](const SliceUpdate &update) {
 			return builder->applyUpdate(update);
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		_session->data().itemRemoved(
 		) | rpl::filter([=](not_null<const HistoryItem*> item) {
 			return (item->history()->peer->id == peerId)
-				&& (!topicRootId || item->topicRootId() == topicRootId);
+				&& (!topicRootId || item->topicRootId() == topicRootId)
+				&& (!monoforumPeerId
+					|| item->sublistPeerId() == monoforumPeerId);
 		}) | rpl::filter([=](not_null<const HistoryItem*> item) {
 			return builder->removeOne(item->id);
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		_session->data().historyCleared(
 		) | rpl::filter([=](not_null<const History*> history) {
 			return (history->peer->id == peerId);
 		}) | rpl::filter([=] {
 			return builder->removeAll();
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		using Result = Storage::SparseIdsListResult;
 		listData->list.query(Storage::SparseIdsListQuery(
@@ -382,7 +474,7 @@ rpl::producer<SparseIdsSlice> SearchController::simpleIdsSlice(
 			limitAfter
 		)) | rpl::filter([=](const Result &result) {
 			return builder->applyInitial(result);
-		}) | rpl::start_with_next_done(
+		}) | rpl::on_next_done(
 			pushNextSnapshot,
 			[=] { builder->checkInsufficient(); },
 			lifetime);
@@ -436,6 +528,7 @@ void SearchController::requestMore(
 	auto prepared = PrepareSearchRequest(
 		listData->peer,
 		query.topicRootId,
+		query.monoforumPeerId,
 		query.type,
 		query.query,
 		key.aroundId,
diff --git a/Telegram/SourceFiles/data/data_search_controller.h b/Telegram/SourceFiles/data/data_search_controller.h
index 26b930b9b718a0..e7fb3f8e9fddd3 100644
--- a/Telegram/SourceFiles/data/data_search_controller.h
+++ b/Telegram/SourceFiles/data/data_search_controller.h
@@ -19,6 +19,7 @@ class Session;
 
 namespace Data {
 enum class LoadDirection : char;
+struct MessagePosition;
 } // namespace Data
 
 namespace Api {
@@ -36,9 +37,31 @@ using HistoryResult = SearchResult;
 using HistoryRequest = MTPmessages_GetHistory;
 using HistoryRequestResult = MTPmessages_Messages;
 
+using GlobalMediaRequest = MTPmessages_SearchGlobal;
+struct GlobalMediaResult {
+	std::vector<Data::MessagePosition> messageIds;
+	int32 offsetRate = 0;
+	int fullCount = 0;
+};
+
+[[nodiscard]] MTPMessagesFilter PrepareSearchFilter(
+	Storage::SharedMediaType type);
+
+[[nodiscard]] std::optional<GlobalMediaRequest> PrepareGlobalMediaRequest(
+	not_null<Main::Session*> session,
+	int32 offsetRate,
+	Data::MessagePosition offsetPosition,
+	Storage::SharedMediaType type,
+	const QString &query);
+
+[[nodiscard]] GlobalMediaResult ParseGlobalMediaResult(
+	not_null<Main::Session*> session,
+	const MTPmessages_Messages &data);
+
 [[nodiscard]] std::optional<SearchRequest> PrepareSearchRequest(
 	not_null<PeerData*> peer,
 	MsgId topicRootId,
+	PeerId monoforumPeerId,
 	Storage::SharedMediaType type,
 	const QString &query,
 	MsgId messageId,
@@ -70,6 +93,7 @@ class SearchController final {
 
 		PeerId peerId = 0;
 		MsgId topicRootId = 0;
+		PeerId monoforumPeerId = 0;
 		PeerId migratedPeerId = 0;
 		MediaType type = MediaType::kCount;
 		QString query;
@@ -129,6 +153,7 @@ class SearchController final {
 	rpl::producer<SparseIdsSlice> simpleIdsSlice(
 		PeerId peerId,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		MsgId aroundId,
 		const Query &query,
 		int limitBefore,
diff --git a/Telegram/SourceFiles/data/data_send_action.h b/Telegram/SourceFiles/data/data_send_action.h
index 227ef656995183..2b56062ed15e49 100644
--- a/Telegram/SourceFiles/data/data_send_action.h
+++ b/Telegram/SourceFiles/data/data_send_action.h
@@ -23,9 +23,7 @@ class SendActionManager final {
 public:
 	struct AnimationUpdate {
 		not_null<Thread*> thread;
-		int left = 0;
-		int width = 0;
-		int height = 0;
+		QRect rect;
 		bool textUpdated = false;
 	};
 	explicit SendActionManager();
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 9ce94052f93f61..066c87357fe1fc 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -13,19 +13,24 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "mainwidget.h"
 #include "api/api_bot.h"
+#include "api/api_premium.h"
 #include "api/api_text_entities.h"
 #include "api/api_user_names.h"
+#include "chat_helpers/stickers_lottie.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "core/mime_type.h" // Core::IsMimeSticker
 #include "ui/image/image_location_factory.h" // Images::FromPhotoSize
 #include "ui/text/format_values.h" // Ui::FormatPhone
+#include "ui/color_int_conversion.h"
 #include "export/export_manager.h"
 #include "export/view/export_view_panel_controller.h"
 #include "mtproto/mtproto_config.h"
 #include "window/notifications_manager.h"
 #include "history/history.h"
+#include "history/history_item.h"
 #include "history/history_item_components.h"
+#include "history/history_streamed_drafts.h"
 #include "history/view/media/history_view_media.h"
 #include "history/view/history_view_element.h"
 #include "inline_bots/inline_bot_layout_item.h"
@@ -44,6 +49,7 @@ For license and copyright information please follow this link:
 #include "data/components/sponsored_messages.h"
 #include "data/stickers/data_stickers.h"
 #include "data/notify/data_notify_settings.h"
+#include "data/data_ai_compose_tones.h"
 #include "data/data_bot_app.h"
 #include "data/data_changes.h"
 #include "data/data_group_call.h"
@@ -54,16 +60,21 @@ For license and copyright information please follow this link:
 #include "data/data_file_origin.h"
 #include "data/data_download_manager.h"
 #include "data/data_web_page.h"
+#include "iv/iv_rich_page.h"
 #include "data/data_game.h"
 #include "data/data_poll.h"
 #include "data/data_replies_list.h"
 #include "data/data_chat_filters.h"
+#include "dialogs/dialogs_entry.h"
+#include "dialogs/dialogs_row.h"
+#include "base/options.h"
 #include "data/data_send_action.h"
 #include "data/data_message_reactions.h"
 #include "data/data_emoji_statuses.h"
 #include "data/data_forum_icons.h"
 #include "data/data_cloud_themes.h"
 #include "data/data_saved_messages.h"
+#include "data/data_saved_music.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_stories.h"
 #include "data/data_streaming.h"
@@ -73,6 +84,7 @@ For license and copyright information please follow this link:
 #include "data/data_premium_limits.h"
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
+#include "data/data_todo_list.h"
 #include "base/platform/base_platform_info.h"
 #include "base/unixtime.h"
 #include "base/call_delayed.h"
@@ -82,6 +94,9 @@ For license and copyright information please follow this link:
 namespace Data {
 namespace {
 
+constexpr auto kNextForUpgradeGiftTimeout = 5 * crl::time(1000);
+constexpr auto kMaxServiceNotificationMessageSize = 4096;
+
 using ViewElement = HistoryView::Element;
 
 // s: box 100x100
@@ -228,10 +243,12 @@ Session::Session(not_null<Main::Session*> session)
 , _contactsList(Dialogs::SortMode::Name)
 , _contactsNoChatsList(Dialogs::SortMode::Name)
 , _ttlCheckTimer([=] { checkTTLs(); })
+, _formattedDateTimer([=] { checkFormattedDateUpdates(); })
 , _selfDestructTimer([=] { checkSelfDestructItems(); })
 , _pollsClosingTimer([=] { checkPollsClosings(); })
 , _watchForOfflineTimer([=] { checkLocalUsersWentOffline(); })
 , _groups(this)
+, _aiComposeTones(std::make_unique<AiComposeTones>(session))
 , _chatsFilters(std::make_unique<ChatFilters>(this))
 , _cloudThemes(std::make_unique<CloudThemes>(session))
 , _sendActionManager(std::make_unique<SendActionManager>())
@@ -245,6 +262,7 @@ Session::Session(not_null<Main::Session*> session)
 , _notifySettings(std::make_unique<NotifySettings>(this))
 , _customEmojiManager(std::make_unique<CustomEmojiManager>(this))
 , _stories(std::make_unique<Stories>(this))
+, _savedMusic(std::make_unique<SavedMusic>(this))
 , _savedMessages(std::make_unique<SavedMessages>(this))
 , _chatbots(std::make_unique<Chatbots>(this))
 , _businessInfo(std::make_unique<BusinessInfo>(this))
@@ -266,12 +284,18 @@ Session::Session(not_null<Main::Session*> session)
 	setupUserIsContactViewer();
 
 	_chatsList.unreadStateChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		notifyUnreadBadgeChanged();
 	}, _lifetime);
 
+	base::options::lookup<bool>(
+		Dialogs::kOptionDialogsUnreadOnTop
+	).changes() | rpl::on_next([=] {
+		refreshChatListUnreadOnTop();
+	}, _lifetime);
+
 	_chatsFilters->changed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto enabled = _chatsFilters->has();
 		if (enabled != session->settings().dialogsFiltersEnabled()) {
 			session->settings().setDialogsFiltersEnabled(enabled);
@@ -280,7 +304,7 @@ Session::Session(not_null<Main::Session*> session)
 	}, _lifetime);
 
 	_reactions->myTagRenamed(
-	) | rpl::start_with_next([=](const ReactionId &id) {
+	) | rpl::on_next([=](const ReactionId &id) {
 		const auto i = _viewsByTag.find(id);
 		if (i != end(_viewsByTag)) {
 			for (const auto &view : i->second) {
@@ -290,7 +314,7 @@ Session::Session(not_null<Main::Session*> session)
 	}, _lifetime);
 
 	Spellchecker::HighlightReady(
-	) | rpl::start_with_next([=](uint64 processId) {
+	) | rpl::on_next([=](uint64 processId) {
 		highlightProcessDone(processId);
 	}, _lifetime);
 
@@ -299,7 +323,7 @@ Session::Session(not_null<Main::Session*> session)
 	crl::on_main(_session, [=] {
 		AmPremiumValue(
 			_session
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			for (const auto &[document, items] : _documentItems) {
 				if (document->isVoiceMessage()) {
 					for (const auto &item : items) {
@@ -313,7 +337,7 @@ Session::Session(not_null<Main::Session*> session)
 	});
 
 	session->appConfig().ignoredRestrictionReasonsChanges(
-	) | rpl::start_with_next([=](std::vector<QString> &&changed) {
+	) | rpl::on_next([=](std::vector<QString> &&changed) {
 		auto refresh = std::vector<not_null<const HistoryItem*>>();
 		for (const auto &[item, reasons] : _possiblyRestricted) {
 			for (const auto &reason : changed) {
@@ -331,7 +355,7 @@ Session::Session(not_null<Main::Session*> session)
 
 void Session::subscribeForTopicRepliesLists() {
 	repliesReadTillUpdates(
-	) | rpl::start_with_next([=](const RepliesReadTillUpdate &update) {
+	) | rpl::on_next([=](const RepliesReadTillUpdate &update) {
 		if (const auto peer = peerLoaded(update.id.peer)) {
 			if (const auto topic = peer->forumTopicFor(update.id.msg)) {
 				topic->replies()->apply(update);
@@ -339,25 +363,43 @@ void Session::subscribeForTopicRepliesLists() {
 		}
 	}, _lifetime);
 
+	sublistReadTillUpdates(
+	) | rpl::on_next([=](const SublistReadTillUpdate &update) {
+		if (const auto parentChat = channelLoaded(update.parentChatId)) {
+			if (const auto monoforum = parentChat->monoforum()) {
+				const auto sublistPeerId = update.sublistPeerId;
+				const auto peer = monoforum->owner().peer(sublistPeerId);
+				if (const auto sublist = monoforum->sublistLoaded(peer)) {
+					sublist->apply(update);
+				}
+			}
+		}
+	}, _lifetime);
+
 	session().changes().messageUpdates(
 		MessageUpdate::Flag::NewAdded
 		| MessageUpdate::Flag::NewMaybeAdded
 		| MessageUpdate::Flag::ReplyToTopAdded
 		| MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const MessageUpdate &update) {
+	) | rpl::on_next([=](const MessageUpdate &update) {
 		if (const auto topic = update.item->topic()) {
 			topic->replies()->apply(update);
+		} else if (update.flags == MessageUpdate::Flag::ReplyToTopAdded) {
+			// Not interested in this one for sublist.
+			return;
+		} else if (const auto sublist = update.item->savedSublist()) {
+			sublist->apply(update);
 		}
 	}, _lifetime);
 
 	session().changes().topicUpdates(
 		TopicUpdate::Flag::Creator
-	) | rpl::start_with_next([=](const TopicUpdate &update) {
+	) | rpl::on_next([=](const TopicUpdate &update) {
 		update.topic->replies()->apply(update);
 	}, _lifetime);
 
 	channelDifferenceTooLong(
-	) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
+	) | rpl::on_next([=](not_null<ChannelData*> channel) {
 		if (const auto forum = channel->forum()) {
 			forum->enumerateTopics([](not_null<ForumTopic*> topic) {
 				topic->replies()->applyDifferenceTooLong();
@@ -367,22 +409,36 @@ void Session::subscribeForTopicRepliesLists() {
 }
 
 void Session::clear() {
+	_sessionDataAboutToBeCleared.fire({});
+
 	// Optimization: clear notifications before destroying items.
 	Core::App().notifications().clearFromSession(_session);
 
-	// We must clear all forums before clearing customEmojiManager.
+	// We must clear all [mono]forums before clearing customEmojiManager.
 	// Because in Data::ForumTopic an Ui::Text::CustomEmoji is cached.
-	auto forums = base::flat_set<not_null<ChannelData*>>();
+	auto botForums = base::flat_set<not_null<UserData*>>();
+	auto channelForums = base::flat_set<not_null<ChannelData*>>();
 	for (const auto &[peerId, peer] : _peers) {
+		if (const auto bot = peer->asBot()) {
+			if (bot->isForum()) {
+				botForums.emplace(bot);
+			}
+		}
 		if (const auto channel = peer->asChannel()) {
-			if (channel->isForum()) {
-				forums.emplace(channel);
+			if (channel->isForum() || channel->amMonoforumAdmin()) {
+				channelForums.emplace(channel);
 			}
 		}
 	}
-	for (const auto &channel : forums) {
-		channel->setFlags(channel->flags() & ~ChannelDataFlag::Forum);
+	for (const auto &bot : botForums) {
+		bot->setFlags(bot->flags() & ~UserDataFlag::Forum);
 	}
+	for (const auto &channel : channelForums) {
+		channel->setFlags(channel->flags()
+			& ~(ChannelDataFlag::Forum | ChannelDataFlag::MonoforumAdmin));
+	}
+	_savedMusic->clear();
+	_savedMessages->clear();
 
 	_sendActionManager->clear();
 
@@ -390,12 +446,21 @@ void Session::clear() {
 	_shortcutMessages = nullptr;
 	_session->scheduledMessages().clear();
 	_session->sponsoredMessages().clear();
+
+	// Items are gone now, so HistoryMessageReply::resolvedStory raw
+	// pointers no longer linger. Tear stories down here so their
+	// shared_ptr<GroupCall> drops while Main::Session::_data still
+	// holds a live pointer to us; otherwise the GroupCall destructor
+	// would run inside ~Data::Session and find data() returning a
+	// null reference (the parent unique_ptr resets its stored pointer
+	// before invoking the deleter).
+	_stories->clear();
+
 	_dependentMessages.clear();
 	base::take(_messages);
 	base::take(_nonChannelMessages);
 	_messageByRandomId.clear();
 	_sentMessagesData.clear();
-	cSetRecentInlineBots(RecentInlineBots());
 	cSetRecentStickers(RecentStickerPack());
 	HistoryView::Element::ClearGlobal();
 	_contactsNoChatsList.clear();
@@ -441,8 +506,6 @@ not_null<PeerData*> Session::peer(PeerId id) {
 		}
 		Unexpected("Peer id type.");
 	}();
-
-	result->input = MTPinputPeer(MTP_inputPeerEmpty());
 	return _peers.emplace(id, std::move(result)).first->second.get();
 }
 
@@ -502,8 +565,6 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 	data.match([&](const MTPDuserEmpty &data) {
 		const auto canShareThisContact = result->canShareThisContactFast();
 
-		result->input = MTP_inputPeerUser(data.vid(), MTP_long(0));
-		result->inputUser = MTP_inputUser(data.vid(), MTP_long(0));
 		result->setName(tr::lng_deleted(tr::now), QString(), QString(), QString());
 		result->setPhoto(MTP_userProfilePhotoEmpty());
 		result->setFlags(UserDataFlag::Deleted);
@@ -522,16 +583,58 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 
 		const auto canShareThisContact = result->canShareThisContactFast();
 
+		const auto hasRequirePremiumToWrite
+			= data.is_contact_require_premium();
+		const auto hasStarsPerMessage
+			= data.vsend_paid_messages_stars().has_value();
+		if (!hasStarsPerMessage) {
+			result->setStarsPerMessage(0);
+		}
+		result->setBotInfoVersion(data.vbot_info_version().value_or(-1));
+
+		if (!minimal) {
+			if (const auto info = result->botInfo.get()) {
+				info->readsAllHistory = data.is_bot_chat_history();
+				if (info->cantJoinGroups != data.is_bot_nochats()) {
+					info->cantJoinGroups = data.is_bot_nochats();
+					flags |= UpdateFlag::BotCanBeInvited;
+				}
+				if (const auto value = data.vbot_inline_placeholder()) {
+					info->inlinePlaceholder = '_' + qs(*value);
+				} else {
+					info->inlinePlaceholder = QString();
+				}
+				info->supportsAttachMenu = data.is_bot_attach_menu();
+				info->supportsBusiness = data.is_bot_business();
+				const auto canEditInformation = data.is_bot_can_edit();
+				if (info->canEditInformation != canEditInformation) {
+					info->canEditInformation = canEditInformation;
+					flags |= UpdateFlag::ManagedBot;
+				}
+				info->activeUsers = data.vbot_active_users().value_or_empty();
+				info->hasMainApp = data.is_bot_has_main_app();
+				info->userCreatesTopics = data.is_bot_forum_can_manage_topics();
+				info->canManageBots = data.is_bot_can_manage_bots();
+				info->supportsGuestChat = data.is_bot_guestchat();
+				info->supportsGuard = data.is_bot_guard();
+			}
+		}
+
 		using Flag = UserDataFlag;
 		const auto flagsMask = Flag::Deleted
 			| Flag::Verified
 			| Flag::Scam
 			| Flag::Fake
 			| Flag::BotInlineGeo
+			| Flag::Forum
 			| Flag::Premium
 			| Flag::Support
-			| Flag::SomeRequirePremiumToWrite
-			| Flag::RequirePremiumToWriteKnown
+			| Flag::HasRequirePremiumToWrite
+			| Flag::HasStarsPerMessage
+			| Flag::MessageMoneyRestrictionsKnown
+			| (!hasRequirePremiumToWrite
+				? Flag::RequiresPremiumToWrite
+				: Flag())
 			| (!minimal
 				? Flag::Contact
 				| Flag::MutualContact
@@ -544,22 +647,34 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 			? Data::Stories::PeerSourceState()
 			: !data.vstories_max_id()
 			? std::optional<Data::Stories::PeerSourceState>()
-			: stories().peerSourceState(result, data.vstories_max_id()->v);
+			: stories().peerSourceState(result, *data.vstories_max_id());
 		const auto flagsSet = (data.is_deleted() ? Flag::Deleted : Flag())
 			| (data.is_verified() ? Flag::Verified : Flag())
 			| (data.is_scam() ? Flag::Scam : Flag())
 			| (data.is_fake() ? Flag::Fake : Flag())
 			| (data.is_bot_inline_geo() ? Flag::BotInlineGeo : Flag())
+			| (data.is_bot_forum_view() ? Flag::Forum : Flag())
 			| (data.is_premium() ? Flag::Premium : Flag())
 			| (data.is_support() ? Flag::Support : Flag())
-			| (data.is_contact_require_premium()
-				? (Flag::SomeRequirePremiumToWrite
-					| (result->someRequirePremiumToWrite()
-						? (result->requirePremiumToWriteKnown()
-							? Flag::RequirePremiumToWriteKnown
+			| (hasRequirePremiumToWrite
+				? (Flag::HasRequirePremiumToWrite
+					| (result->hasRequirePremiumToWrite()
+						? (result->messageMoneyRestrictionsKnown()
+							? Flag::MessageMoneyRestrictionsKnown
+							: Flag())
+						: Flag()))
+				: Flag())
+			| (hasStarsPerMessage
+				? (Flag::HasStarsPerMessage
+					| (result->hasStarsPerMessage()
+						? (result->messageMoneyRestrictionsKnown()
+							? Flag::MessageMoneyRestrictionsKnown
 							: Flag())
 						: Flag()))
 				: Flag())
+			| ((!hasRequirePremiumToWrite && !hasStarsPerMessage)
+				? Flag::MessageMoneyRestrictionsKnown
+				: Flag())
 			| (!minimal
 				? (data.is_contact() ? Flag::Contact : Flag())
 				| (data.is_mutual_contact() ? Flag::MutualContact : Flag())
@@ -569,38 +684,27 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 				| (data.is_stories_hidden() ? Flag::StoriesHidden : Flag())
 				: Flag());
 		result->setFlags((result->flags() & ~flagsMask) | flagsSet);
-		if (minimal) {
-			if (result->input.type() == mtpc_inputPeerEmpty) {
-				result->input = MTP_inputPeerUser(
-					data.vid(),
-					MTP_long(data.vaccess_hash().value_or_empty()));
-			}
-			if (result->inputUser.type() == mtpc_inputUserEmpty) {
-				result->inputUser = MTP_inputUser(
-					data.vid(),
-					MTP_long(data.vaccess_hash().value_or_empty()));
-			}
-		} else {
+		result->setBotVerifyDetailsIcon(
+			data.vbot_verification_icon().value_or_empty());
+		if (!minimal) {
 			if (storiesState) {
-				result->setStoriesState(!storiesState->maxId
-					? UserData::StoriesState::None
+				result->setStoriesState(storiesState->hasVideoStream
+					? PeerData::StoriesState::HasVideoStream
+					: !storiesState->maxId
+					? PeerData::StoriesState::None
 					: (storiesState->maxId > storiesState->readTill)
-					? UserData::StoriesState::HasUnread
-					: UserData::StoriesState::HasRead);
-			}
-			if (data.is_self()) {
-				result->input = MTP_inputPeerSelf();
-				result->inputUser = MTP_inputUserSelf();
-			} else if (const auto accessHash = data.vaccess_hash()) {
-				result->input = MTP_inputPeerUser(data.vid(), *accessHash);
-				result->inputUser = MTP_inputUser(data.vid(), *accessHash);
-			} else {
-				result->input = MTP_inputPeerUser(data.vid(), MTP_long(result->accessHash()));
-				result->inputUser = MTP_inputUser(data.vid(), MTP_long(result->accessHash()));
+					? PeerData::StoriesState::HasUnread
+					: PeerData::StoriesState::HasRead);
 			}
 			result->setUnavailableReasons(Data::UnavailableReason::Extract(
 				data.vrestriction_reason()));
 		}
+
+		if (const auto accessHash = data.vaccess_hash()) {
+			if (!minimal || !result->accessHash()) {
+				result->setAccessHash(accessHash->v);
+			}
+		}
 		if (data.is_deleted()) {
 			if (!result->phone().isEmpty()) {
 				result->setPhone(QString());
@@ -674,46 +778,25 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 					result->setPhoto(MTP_userProfilePhotoEmpty());
 				}
 			}
-			if (const auto accessHash = data.vaccess_hash()) {
-				result->setAccessHash(accessHash->v);
-			}
 			status = data.vstatus();
 			if (!minimal) {
 				const auto newUsername = uname;
-				const auto newUsernames = data.vusernames()
-					? Api::Usernames::FromTL(*data.vusernames())
-					: !newUsername.isEmpty()
-					? Data::Usernames{{ newUsername, true, true }}
-					: Data::Usernames();
-				result->setUsernames(newUsernames);
+				if (data.vusernames()) {
+					result->setUsernames(
+						Api::Usernames::FromTL(*data.vusernames()));
+				} else if (!newUsername.isEmpty()) {
+					result->setUsernames({{ newUsername, true, true }});
+				} else {
+					result->setUsernames({});
+				}
 			}
 		}
 		if (const auto &status = data.vemoji_status()) {
 			result->setEmojiStatus(*status);
 		} else {
-			result->setEmojiStatus(0);
+			result->setEmojiStatus(EmojiStatusId());
 		}
 		if (!minimal) {
-			if (const auto botInfoVersion = data.vbot_info_version()) {
-				result->setBotInfoVersion(botInfoVersion->v);
-				result->botInfo->readsAllHistory = data.is_bot_chat_history();
-				if (result->botInfo->cantJoinGroups != data.is_bot_nochats()) {
-					result->botInfo->cantJoinGroups = data.is_bot_nochats();
-					flags |= UpdateFlag::BotCanBeInvited;
-				}
-				if (const auto placeholder = data.vbot_inline_placeholder()) {
-					result->botInfo->inlinePlaceholder = '_' + qs(*placeholder);
-				} else {
-					result->botInfo->inlinePlaceholder = QString();
-				}
-				result->botInfo->supportsAttachMenu = data.is_bot_attach_menu();
-				result->botInfo->supportsBusiness = data.is_bot_business();
-				result->botInfo->canEditInformation = data.is_bot_can_edit();
-				result->botInfo->activeUsers = data.vbot_active_users().value_or_empty();
-				result->botInfo->hasMainApp = data.is_bot_has_main_app();
-			} else {
-				result->setBotInfoVersion(-1);
-			}
 			result->setIsContact(data.is_contact()
 				|| data.is_mutual_contact());
 		}
@@ -728,6 +811,9 @@ not_null<UserData*> Session::processUser(const MTPUser &data) {
 				_peerDecorationsUpdated.fire_copy(result);
 			}
 		}
+		if (result->changeColorProfile(data.vprofile_color())) {
+			flags |= UpdateFlag::ColorProfile;
+		}
 	});
 
 	if (minimal) {
@@ -779,7 +865,6 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 			chat->invalidateParticipants();
 		}
 
-		chat->input = MTP_inputPeerChat(data.vid());
 		chat->setName(qs(data.vtitle()));
 		chat->setPhoto(data.vphoto());
 		chat->date = data.vdate().v;
@@ -799,7 +884,7 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 			migratedTo->match([&](const MTPDinputChannel &input) {
 				const auto channel = this->channel(input.vchannel_id().v);
 				channel->addFlags(ChannelDataFlag::Megagroup);
-				if (!channel->access) {
+				if (!channel->accessHash()) {
 					channel->setAccessHash(input.vaccess_hash().v);
 				}
 				ApplyMigration(chat, channel);
@@ -839,7 +924,6 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 
 		const auto canAddMembers = chat->canAddMembers();
 
-		chat->input = MTP_inputPeerChat(data.vid());
 		chat->setName(qs(data.vtitle()));
 		chat->setPhoto(MTP_chatPhotoEmpty());
 		chat->date = 0;
@@ -860,6 +944,12 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 			LOG(("API Warning: not loaded minimal channel applied."));
 		}
 
+		if (const auto accessHash = data.vaccess_hash()) {
+			if (!minimal || !channel->accessHash()) {
+				channel->setAccessHash(accessHash->v);
+			}
+		}
+
 		const auto wasInChannel = channel->amIn();
 		const auto canViewAdmins = channel->canViewAdmins();
 		const auto canViewMembers = channel->canViewMembers();
@@ -882,14 +972,9 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 		if (const auto &status = data.vemoji_status()) {
 			channel->setEmojiStatus(*status);
 		} else {
-			channel->setEmojiStatus(0);
+			channel->setEmojiStatus(EmojiStatusId());
 		}
-		if (minimal) {
-			if (channel->input.type() == mtpc_inputPeerEmpty
-				|| channel->inputChannel.type() == mtpc_inputChannelEmpty) {
-				channel->setAccessHash(data.vaccess_hash().value_or_empty());
-			}
-		} else {
+		if (!minimal) {
 			if (const auto rights = data.vadmin_rights()) {
 				channel->setAdminRights(ChatAdminRightsInfo(*rights).flags);
 			} else if (channel->hasAdminRights()) {
@@ -900,8 +985,6 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 			} else if (channel->hasRestrictions()) {
 				channel->setRestrictions(ChatRestrictionsInfo());
 			}
-			channel->setAccessHash(
-				data.vaccess_hash().value_or(channel->access));
 			channel->date = data.vdate().v;
 			channel->setUnavailableReasons(Data::UnavailableReason::Extract(
 				data.vrestriction_reason()));
@@ -909,15 +992,17 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 
 		{
 			const auto newUsername = qs(data.vusername().value_or_empty());
-			const auto newUsernames = data.vusernames()
-				? Api::Usernames::FromTL(*data.vusernames())
-				: !newUsername.isEmpty()
-				? Data::Usernames{ Data::Username{ newUsername, true, true } }
-				: Data::Usernames();
 			channel->setName(
 				qs(data.vtitle()),
 				TextUtilities::SingleLine(newUsername));
-			channel->setUsernames(newUsernames);
+			if (data.vusernames()) {
+				channel->setUsernames(
+					Api::Usernames::FromTL(*data.vusernames()));
+			} else if (!newUsername.isEmpty()) {
+				channel->setUsernames({ { newUsername, true, true } });
+			} else {
+				channel->setUsernames({});
+			}
 		}
 		const auto hasUsername = !channel->username().isEmpty();
 
@@ -936,21 +1021,38 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 			| Flag::CallActive
 			| Flag::CallNotEmpty
 			| Flag::Forbidden
-			| (!minimal ? (Flag::Left | Flag::Creator) : Flag())
+			| (!minimal
+				? (Flag::Left | Flag::Creator)
+				: Flag())
 			| Flag::NoForwards
 			| Flag::JoinToWrite
 			| Flag::RequestToJoin
 			| Flag::Forum
+			| Flag::ForumTabs
 			| ((!minimal && !data.is_stories_hidden_min())
 				? Flag::StoriesHidden
-				: Flag());
+				: Flag())
+			| Flag::AutoTranslation
+			| Flag::Monoforum
+			| Flag::HasStarsPerMessage
+			| Flag::StarsPerMessageKnown;
+		const auto hasStarsPerMessage
+			= data.vsend_paid_messages_stars().has_value();
+		if (!hasStarsPerMessage) {
+			channel->setStarsPerMessage(0);
+			_commonStarsPerMessage.remove(channel);
+		} else if (const auto count = data.vsend_paid_messages_stars()->v) {
+			_commonStarsPerMessage[channel] = count;
+		} else {
+			_commonStarsPerMessage.remove(channel);
+		}
 		const auto storiesState = minimal
 			? std::optional<Data::Stories::PeerSourceState>()
 			: data.is_stories_unavailable()
 			? Data::Stories::PeerSourceState()
 			: !data.vstories_max_id()
 			? std::optional<Data::Stories::PeerSourceState>()
-			: stories().peerSourceState(channel, data.vstories_max_id()->v);
+			: stories().peerSourceState(channel, *data.vstories_max_id());
 		const auto flagsSet = (data.is_broadcast() ? Flag::Broadcast : Flag())
 			| (data.is_verified() ? Flag::Verified : Flag())
 			| (data.is_scam() ? Flag::Scam : Flag())
@@ -969,8 +1071,8 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 				? Flag::CallNotEmpty
 				: Flag())
 			| (!minimal
-				? (data.is_left() ? Flag::Left : Flag())
-				| (data.is_creator() ? Flag::Creator : Flag())
+				? ((data.is_left() ? Flag::Left : Flag())
+					| (data.is_creator() ? Flag::Creator : Flag()))
 				: Flag())
 			| (data.is_noforwards() ? Flag::NoForwards : Flag())
 			| (data.is_join_to_send() ? Flag::JoinToWrite : Flag())
@@ -978,21 +1080,37 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 			| ((data.is_forum() && data.is_megagroup())
 				? Flag::Forum
 				: Flag())
+			| (data.is_forum_tabs() ? Flag::ForumTabs : Flag())
 			| ((!minimal
 				&& !data.is_stories_hidden_min()
 				&& data.is_stories_hidden())
 				? Flag::StoriesHidden
-				: Flag());
+				: Flag())
+			| (data.is_autotranslation() ? Flag::AutoTranslation : Flag())
+			| (data.is_monoforum() ? Flag::Monoforum : Flag())
+			| (hasStarsPerMessage
+				? (Flag::HasStarsPerMessage
+					| (channel->starsPerMessageKnown()
+						? Flag::StarsPerMessageKnown
+						: Flag()))
+				: Flag::StarsPerMessageKnown);
 		channel->setFlags((channel->flags() & ~flagsMask) | flagsSet);
+		channel->setBotVerifyDetailsIcon(
+			data.vbot_verification_icon().value_or_empty());
 		if (!minimal && storiesState) {
-			result->setStoriesState(!storiesState->maxId
-				? UserData::StoriesState::None
+			result->setStoriesState(storiesState->hasVideoStream
+				? PeerData::StoriesState::HasVideoStream
+				: !storiesState->maxId
+				? PeerData::StoriesState::None
 				: (storiesState->maxId > storiesState->readTill)
-				? UserData::StoriesState::HasUnread
-				: UserData::StoriesState::HasRead);
+				? PeerData::StoriesState::HasUnread
+				: PeerData::StoriesState::HasRead);
 		}
 
 		channel->setPhoto(data.vphoto());
+		applyMonoforumLinkedId(
+			channel,
+			data.vlinked_monoforum_id().value_or_empty());
 
 		if (wasInChannel != channel->amIn()) {
 			flags |= UpdateFlag::ChannelAmIn;
@@ -1011,6 +1129,9 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 				_peerDecorationsUpdated.fire_copy(result);
 			}
 		}
+		if (result->changeColorProfile(data.vprofile_color())) {
+			flags |= UpdateFlag::ColorProfile;
+		}
 	}, [&](const MTPDchannelForbidden &data) {
 		const auto channel = result->asChannel();
 
@@ -1022,9 +1143,11 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 		using Flag = ChannelDataFlag;
 		const auto flagsMask = Flag::Broadcast
 			| Flag::Megagroup
-			| Flag::Forbidden;
+			| Flag::Forbidden
+			| Flag::Monoforum;
 		const auto flagsSet = (data.is_broadcast() ? Flag::Broadcast : Flag())
 			| (data.is_megagroup() ? Flag::Megagroup : Flag())
+			| (data.is_monoforum() ? Flag::Monoforum : Flag())
 			| Flag::Forbidden;
 		channel->setFlags((channel->flags() & ~flagsMask) | flagsSet);
 
@@ -1076,12 +1199,38 @@ UserData *Session::processUsers(const MTPVector<MTPUser> &data) {
 
 PeerData *Session::processChats(const MTPVector<MTPChat> &data) {
 	auto result = (PeerData*)nullptr;
+	_postponedMonoforumLinkedIds.emplace();
 	for (const auto &chat : data.v) {
 		result = processChat(chat);
 	}
+	const auto ids = base::take(_postponedMonoforumLinkedIds);
+	for (const auto &[channel, linkedId] : *ids) {
+		applyMonoforumLinkedId(channel, linkedId);
+	}
 	return result;
 }
 
+void Session::applyMonoforumLinkedId(
+		not_null<ChannelData*> channel,
+		ChannelId linkedId) {
+	if (!linkedId) {
+		channel->setMonoforumLink(nullptr);
+	} else if (_postponedMonoforumLinkedIds) {
+		_postponedMonoforumLinkedIds->emplace(channel, linkedId);
+	} else {
+		const auto loaded = channel->isLoaded();
+		const auto linked = this->channel(linkedId);
+		const auto good = loaded
+			? linked->isLoaded()
+			: linked->isMinimalLoaded();
+		if (good) {
+			channel->setMonoforumLink(linked);
+		} else {
+			channel->updateFull();
+		}
+	}
+}
+
 void Session::applyMaximumChatVersions(const MTPVector<MTPChat> &data) {
 	for (const auto &chat : data.v) {
 		chat.match([&](const MTPDchat &data) {
@@ -1108,6 +1257,60 @@ GroupCall *Session::groupCall(CallId callId) const {
 	return (i != end(_groupCalls)) ? i->second.get() : nullptr;
 }
 
+std::shared_ptr<GroupCall> Session::sharedConferenceCall(
+		CallId id,
+		uint64 accessHash) {
+	const auto i = _conferenceCalls.find(id);
+	if (i != end(_conferenceCalls)) {
+		if (auto result = i->second.lock()) {
+			return result;
+		}
+	}
+	auto result = std::make_shared<GroupCall>(
+		session().user(),
+		id,
+		accessHash,
+		TimeId(), // scheduledDate
+		false, // rtmp
+		GroupCallOrigin::Conference);
+	if (i != end(_conferenceCalls)) {
+		i->second = result;
+	} else {
+		_conferenceCalls.emplace(id, result);
+	}
+	return result;
+}
+
+std::shared_ptr<GroupCall> Session::sharedConferenceCallFind(
+		const MTPUpdates &response) {
+	const auto list = response.match([&](const MTPDupdates &data) {
+		return &data.vupdates().v;
+	}, [&](const MTPDupdatesCombined &data) {
+		return &data.vupdates().v;
+	}, [](const auto &) {
+		return (const QVector<MTPUpdate>*)nullptr;
+	});
+	const auto empty = std::shared_ptr<GroupCall>();
+	if (!list) {
+		return empty;
+	}
+	for (const auto &update : *list) {
+		const auto call = update.match([&](const MTPDupdateGroupCall &data) {
+			return data.vcall().match([&](const MTPDgroupCall &data) {
+				return data.is_conference()
+					? sharedConferenceCall(
+						data.vid().v,
+						data.vaccess_hash().v)
+					: nullptr;
+			}, [&](const auto &) { return empty; });
+		}, [&](const auto &) { return empty; });
+		if (call) {
+			return call;
+		}
+	}
+	return empty;
+}
+
 void Session::watchForOffline(not_null<UserData*> user, TimeId now) {
 	if (!now) {
 		now = base::unixtime::now();
@@ -1143,6 +1346,21 @@ void Session::maybeStopWatchForOffline(not_null<UserData*> user) {
 	}
 }
 
+void Session::recordSharingDisabledTime(not_null<UserData*> user) {
+	_sharingDisabledTimes[user] = base::unixtime::now();
+}
+
+bool Session::sharingRecentlyDisabledByMe(
+		not_null<UserData*> user) const {
+	const auto i = _sharingDisabledTimes.find(user);
+	return (i != end(_sharingDisabledTimes))
+		&& (base::unixtime::now() - i->second < 86400);
+}
+
+void Session::clearSharingDisabledTime(not_null<UserData*> user) {
+	_sharingDisabledTimes.remove(user);
+}
+
 void Session::checkLocalUsersWentOffline() {
 	_watchForOfflineTimer.cancel();
 
@@ -1168,8 +1386,8 @@ void Session::checkLocalUsersWentOffline() {
 }
 
 auto Session::invitedToCallUsers(CallId callId) const
--> const base::flat_set<not_null<UserData*>> & {
-	static const base::flat_set<not_null<UserData*>> kEmpty;
+-> const base::flat_map<not_null<UserData*>, bool> & {
+	static const base::flat_map<not_null<UserData*>, bool> kEmpty;
 	const auto i = _invitedToCallUsers.find(callId);
 	return (i != _invitedToCallUsers.end()) ? i->second : kEmpty;
 }
@@ -1177,8 +1395,16 @@ auto Session::invitedToCallUsers(CallId callId) const
 void Session::registerInvitedToCallUser(
 		CallId callId,
 		not_null<PeerData*> peer,
-		not_null<UserData*> user) {
-	const auto call = peer->groupCall();
+		not_null<UserData*> user,
+		bool calling) {
+	registerInvitedToCallUser(callId, peer->groupCall(), user, calling);
+}
+
+void Session::registerInvitedToCallUser(
+		CallId callId,
+		GroupCall *call,
+		not_null<UserData*> user,
+		bool calling) {
 	if (call && call->id() == callId) {
 		const auto inCall = ranges::contains(
 			call->participants(),
@@ -1188,18 +1414,32 @@ void Session::registerInvitedToCallUser(
 			return;
 		}
 	}
-	_invitedToCallUsers[callId].emplace(user);
-	_invitesToCalls.fire({ callId, user });
+	_invitedToCallUsers[callId][user] = calling;
+	_invitesToCalls.fire({ callId, user, calling });
 }
 
 void Session::unregisterInvitedToCallUser(
 		CallId callId,
-		not_null<UserData*> user) {
+		not_null<UserData*> user,
+		bool onlyStopCalling) {
 	const auto i = _invitedToCallUsers.find(callId);
 	if (i != _invitedToCallUsers.end()) {
-		i->second.remove(user);
-		if (i->second.empty()) {
-			_invitedToCallUsers.erase(i);
+		const auto j = i->second.find(user);
+		if (j != end(i->second)) {
+			if (onlyStopCalling) {
+				if (!j->second) {
+					return;
+				}
+				j->second = false;
+			} else {
+				i->second.erase(j);
+				if (i->second.empty()) {
+					_invitedToCallUsers.erase(i);
+				}
+			}
+			const auto calling = false;
+			const auto removed = !onlyStopCalling;
+			_invitesToCalls.fire({ callId, user, calling, removed });
 		}
 	}
 }
@@ -1218,6 +1458,9 @@ UserData *Session::userByPhone(const QString &phone) const {
 
 PeerData *Session::peerByUsername(const QString &username) const {
 	const auto uname = username.trimmed();
+	if (uname.isEmpty()) {
+		return nullptr;
+	}
 	for (const auto &[peerId, peer] : _peers) {
 		if (peer->isLoaded()
 			&& !peer->username().compare(uname, Qt::CaseInsensitive)) {
@@ -1404,10 +1647,6 @@ void Session::forgetPassportCredentials() {
 	_passportCredentials = nullptr;
 }
 
-QString Session::nameSortKey(const QString &name) const {
-	return TextUtilities::RemoveAccents(name).toLower();
-}
-
 void Session::setupMigrationViewer() {
 	session().changes().peerUpdates(
 		PeerUpdate::Flag::Migration
@@ -1415,7 +1654,7 @@ void Session::setupMigrationViewer() {
 		return update.peer->asChat();
 	}) | rpl::filter([=](ChatData *chat) {
 		return (chat != nullptr);
-	}) | rpl::start_with_next([=](not_null<ChatData*> chat) {
+	}) | rpl::on_next([=](not_null<ChatData*> chat) {
 		const auto channel = chat->migrateTo();
 		if (!channel) {
 			return;
@@ -1437,7 +1676,7 @@ void Session::setupChannelLeavingViewer() {
 		PeerUpdate::Flag::ChannelAmIn
 	) | rpl::map([](const PeerUpdate &update) {
 		return update.peer->asChannel();
-	}) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
+	}) | rpl::on_next([=](not_null<ChannelData*> channel) {
 		if (channel->amIn()) {
 			channel->clearInvitePeek();
 		} else {
@@ -1455,7 +1694,7 @@ void Session::setupChannelLeavingViewer() {
 
 void Session::setupPeerNameViewer() {
 	session().changes().realtimeNameUpdates(
-	) | rpl::start_with_next([=](const NameUpdate &update) {
+	) | rpl::on_next([=](const NameUpdate &update) {
 		const auto peer = update.peer;
 		if (const auto history = historyLoaded(peer)) {
 			history->refreshChatListNameSortKey();
@@ -1471,7 +1710,7 @@ void Session::setupUserIsContactViewer() {
 		PeerUpdate::Flag::IsContact
 	) | rpl::map([](const PeerUpdate &update) {
 		return update.peer->asUser();
-	}) | rpl::start_with_next([=](not_null<UserData*> user) {
+	}) | rpl::on_next([=](not_null<UserData*> user) {
 		const auto i = _contactViews.find(peerToUser(user->id));
 		if (i != _contactViews.end()) {
 			for (const auto &view : i->second) {
@@ -1503,7 +1742,7 @@ void Session::enumerateItemViews(
 		not_null<const HistoryItem*> item,
 		Method method) {
 	if (const auto i = _views.find(item); i != _views.end()) {
-		for (const auto view : i->second) {
+		for (const auto &view : i->second) {
 			method(view);
 		}
 	}
@@ -1573,6 +1812,16 @@ void Session::requestPollViewRepaint(not_null<const PollData*> poll) {
 	}
 }
 
+void Session::requestTodoListViewRepaint(
+		not_null<const TodoListData*> todolist) {
+	if (const auto i = _todoListViews.find(todolist)
+		; i != _todoListViews.end()) {
+		for (const auto &view : i->second) {
+			requestViewResize(view);
+		}
+	}
+}
+
 void Session::documentLoadProgress(not_null<DocumentData*> document) {
 	requestDocumentViewRepaint(document);
 	_documentLoadProgress.fire_copy(document);
@@ -1592,16 +1841,19 @@ void Session::documentLoadFail(
 
 void Session::photoLoadProgress(not_null<PhotoData*> photo) {
 	requestPhotoViewRepaint(photo);
+	_photoLoadProgress.fire_copy(photo);
 }
 
 void Session::photoLoadDone(not_null<PhotoData*> photo) {
 	notifyPhotoLayoutChanged(photo);
+	_photoLoadProgress.fire_copy(photo);
 }
 
 void Session::photoLoadFail(
 		not_null<PhotoData*> photo,
 		bool started) {
 	notifyPhotoLayoutChanged(photo);
+	_photoLoadProgress.fire_copy(photo);
 }
 
 void Session::markMediaRead(not_null<const DocumentData*> document) {
@@ -1653,6 +1905,22 @@ rpl::producer<GiftUpdate> Session::giftUpdates() const {
 	return _giftUpdates.events();
 }
 
+void Session::notifyGiftsUpdate(GiftsUpdate &&update) {
+	_giftsUpdates.fire(std::move(update));
+}
+
+rpl::producer<GiftsUpdate> Session::giftsUpdates() const {
+	return _giftsUpdates.events();
+}
+
+void Session::notifyGiftAuctionGot(GiftAuctionGot &&update) {
+	_giftAuctionGots.fire(std::move(update));
+}
+
+rpl::producer<GiftAuctionGot> Session::giftAuctionGots() const {
+	return _giftAuctionGots.events();
+}
+
 HistoryItem *Session::changeMessageId(PeerId peerId, MsgId wasId, MsgId nowId) {
 	const auto list = messagesListForInsert(peerId);
 	const auto i = list->find(wasId);
@@ -1736,14 +2004,14 @@ rpl::producer<Session::IdChange> Session::itemIdChanged() const {
 	return _itemIdChanges.events();
 }
 
-void Session::requestItemRepaint(not_null<const HistoryItem*> item) {
+void Session::requestItemRepaint(not_null<const HistoryItem*> item, QRect r) {
 	_itemRepaintRequest.fire_copy(item);
 	auto repaintGroupLeader = false;
 	auto repaintView = [&](not_null<const ViewElement*> view) {
 		if (view->isHiddenByGroup()) {
 			repaintGroupLeader = true;
 		} else {
-			requestViewRepaint(view);
+			requestViewRepaint(view, r);
 		}
 	};
 	enumerateItemViews(item, repaintView);
@@ -1775,11 +2043,19 @@ rpl::producer<not_null<const HistoryItem*>> Session::itemRepaintRequest() const
 	return _itemRepaintRequest.events();
 }
 
-void Session::requestViewRepaint(not_null<const ViewElement*> view) {
-	_viewRepaintRequest.fire_copy(view);
+void Session::requestDrawToReply(DrawToReplyRequest request) {
+	_drawToReplyRequests.fire_copy(std::move(request));
+}
+
+rpl::producer<DrawToReplyRequest> Session::drawToReplyRequests() const {
+	return _drawToReplyRequests.events();
+}
+
+void Session::requestViewRepaint(not_null<const ViewElement*> view, QRect r) {
+	_viewRepaintRequest.fire_copy({ view, r });
 }
 
-rpl::producer<not_null<const ViewElement*>> Session::viewRepaintRequest() const {
+rpl::producer<RequestViewRepaint> Session::viewRepaintRequest() const {
 	return _viewRepaintRequest.events();
 }
 
@@ -1804,6 +2080,24 @@ rpl::producer<not_null<ViewElement*>> Session::viewResizeRequest() const {
 	return _viewResizeRequest.events();
 }
 
+void Session::notifyViewHeightAdjusted(
+		not_null<ViewElement*> view,
+		int delta) {
+	_viewHeightAdjusted.fire({ view, delta });
+}
+
+rpl::producer<Session::ViewHeightAdjusted> Session::viewHeightAdjusted() const {
+	return _viewHeightAdjusted.events();
+}
+
+void Session::requestItemShowHighlight(not_null<HistoryItem*> item) {
+	_itemShowHighlightRequest.fire_copy(item);
+}
+
+rpl::producer<not_null<HistoryItem*>> Session::itemShowHighlightRequest() const {
+	return _itemShowHighlightRequest.events();
+}
+
 void Session::requestItemViewRefresh(not_null<const HistoryItem*> item) {
 	if (const auto view = item->mainView()) {
 		notifyHistoryChangeDelayed(item->history());
@@ -1824,12 +2118,25 @@ rpl::producer<not_null<HistoryItem*>> Session::itemDataChanges() const {
 	return _itemDataChanges.events();
 }
 
+void Session::notifyReactionsRemoved(ReactionsRemoved update) {
+	_reactionsRemoved.fire(std::move(update));
+}
+
+rpl::producer<ReactionsRemoved> Session::reactionsRemoved() const {
+	return _reactionsRemoved.events();
+}
+
 void Session::requestItemTextRefresh(not_null<HistoryItem*> item) {
 	const auto call = [&](not_null<HistoryItem*> item) {
 		enumerateItemViews(item, [&](not_null<ViewElement*> view) {
 			view->itemTextUpdated();
 		});
 		requestItemResize(item);
+		if (item->textAppearing()) {
+			enumerateItemViews(item, [&](not_null<ViewElement*> view) {
+				view->skipInactiveTextAppearing();
+			});
+		}
 	};
 	if (const auto group = groups().find(item)) {
 		call(group->items.front());
@@ -1902,6 +2209,30 @@ rpl::producer<not_null<const HistoryItem*>> Session::itemRemoved(
 	});
 }
 
+rpl::producer<> Session::sessionDataAboutToBeCleared() const {
+	return _sessionDataAboutToBeCleared.events();
+}
+
+void Session::notifyItemsAboutToBeDestroyed(
+		const std::vector<not_null<HistoryItem*>> &items) {
+	_itemsAboutToBeDestroyed.fire_copy(items);
+}
+
+auto Session::itemsAboutToBeDestroyed() const
+-> rpl::producer<std::vector<not_null<HistoryItem*>>> {
+	return _itemsAboutToBeDestroyed.events();
+}
+
+void Session::notifyViewAboutToBeRemoved(
+		not_null<const ViewElement*> view,
+		ViewRemovalReason reason) {
+	_viewAboutToBeRemoved.fire({ view, reason });
+}
+
+rpl::producer<ViewRemoval> Session::viewAboutToBeRemoved() const {
+	return _viewAboutToBeRemoved.events();
+}
+
 void Session::notifyViewRemoved(not_null<const ViewElement*> view) {
 	_viewRemoved.fire_copy(view);
 }
@@ -1918,6 +2249,14 @@ rpl::producer<not_null<const ViewElement*>> Session::viewPaidReactionSent() cons
 	return _viewPaidReactionSent.events();
 }
 
+void Session::notifyCallPaidReactionSent(not_null<Calls::GroupCall*> call) {
+	_callPaidReactionSent.fire_copy(call);
+}
+
+rpl::producer<not_null<Calls::GroupCall*>> Session::callPaidReactionSent() const {
+	return _callPaidReactionSent.events();
+}
+
 void Session::notifyHistoryUnloaded(not_null<const History*> history) {
 	_historyUnloaded.fire_copy(history);
 }
@@ -1957,6 +2296,70 @@ rpl::producer<> Session::pinnedDialogsOrderUpdated() const {
 	return _pinnedDialogsOrderUpdated.events();
 }
 
+void Session::nextForUpgradeGiftInvalidate(not_null<PeerData*> owner) {
+	_nextForUpgradeGifts.remove(owner);
+}
+
+void Session::nextForUpgradeGiftRequest(
+		not_null<PeerData*> owner,
+		Fn<void(std::optional<Data::SavedStarGift>)> done) {
+	auto &entry = _nextForUpgradeGifts[owner];
+	if (entry.requestId) {
+		entry.done = std::move(done);
+		return;
+	} else if (crl::now() - entry.received < kNextForUpgradeGiftTimeout) {
+		done(entry.gift);
+		return;
+	}
+	entry.done = std::move(done);
+
+	const auto finishWith = [=](std::optional<Data::SavedStarGift> gift) {
+		auto &entry = _nextForUpgradeGifts[owner];
+		entry.requestId = 0;
+		entry.gift = std::move(gift);
+		entry.received = crl::now();
+		base::take(entry.done)(entry.gift);
+	};
+	using Flag = MTPpayments_GetSavedStarGifts::Flag;
+	entry.requestId = _session->api().request(
+		MTPpayments_GetSavedStarGifts(
+			MTP_flags(Flag::f_exclude_unique
+				| Flag::f_exclude_unlimited
+				| Flag::f_exclude_unupgradable),
+			owner->input(),
+			MTPint(), // collection_id
+			MTP_string(), // offset
+			MTP_int(1)) // limit
+	).done([=](const MTPpayments_SavedStarGifts &result) {
+		const auto &data = result.data();
+		processUsers(data.vusers());
+		processChats(data.vchats());
+		const auto &list = data.vgifts().v;
+		if (list.empty()) {
+			finishWith(std::nullopt);
+		} else if (auto parsed = Api::FromTL(owner, list[0])) {
+			finishWith(std::move(*parsed));
+		} else {
+			finishWith(std::nullopt);
+		}
+	}).fail([=](const MTP::Error &error) {
+		finishWith(std::nullopt);
+	}).send();
+}
+
+Session::CreditsSubsRebuilderPtr Session::createCreditsSubsRebuilder() {
+	if (auto result = activeCreditsSubsRebuilder()) {
+		return result;
+	}
+	auto result = std::make_shared<CreditsSubsRebuilder>();
+	_creditsSubsRebuilder = result;
+	return result;
+}
+
+Session::CreditsSubsRebuilderPtr Session::activeCreditsSubsRebuilder() const {
+	return _creditsSubsRebuilder.lock();
+}
+
 void Session::registerHeavyViewPart(not_null<ViewElement*> view) {
 	_heavyViewParts.emplace(view);
 }
@@ -1985,7 +2388,7 @@ void Session::unloadHeavyViewParts(
 				remove.push_back(view);
 			}
 		}
-		for (const auto view : remove) {
+		for (const auto &view : remove) {
 			view->unloadHeavyPart();
 		}
 	}
@@ -2005,7 +2408,7 @@ void Session::unloadHeavyViewParts(
 			remove.push_back(view);
 		}
 	}
-	for (const auto view : remove) {
+	for (const auto &view : remove) {
 		view->unloadHeavyPart();
 	}
 }
@@ -2195,7 +2598,10 @@ void Session::applyDialog(
 }
 
 bool Session::pinnedCanPin(not_null<Dialogs::Entry*> entry) const {
-	if (const auto sublist = entry->asSublist()) {
+	if ([[maybe_unused]] const auto sublist = entry->asSublist()) {
+		if (sublist->parentChat()) {
+			return false;
+		}
 		const auto saved = &savedMessages();
 		return pinnedChatsOrder(saved).size() < pinnedChatsLimit(saved);
 	} else if (const auto topic = entry->asTopic()) {
@@ -2237,6 +2643,9 @@ int Session::pinnedChatsLimit(not_null<Data::Forum*> forum) const {
 }
 
 int Session::pinnedChatsLimit(not_null<Data::SavedMessages*> saved) const {
+	if (saved->parentChat()) {
+		return 0;
+	}
 	const auto limits = Data::PremiumLimits(_session);
 	return limits.savedSublistsPinnedCurrent();
 }
@@ -2277,6 +2686,9 @@ rpl::producer<int> Session::maxPinnedChatsLimitValue(
 
 rpl::producer<int> Session::maxPinnedChatsLimitValue(
 		not_null<SavedMessages*> saved) const {
+	if (saved->parentChat()) {
+		return rpl::single(0);
+	}
 	// Premium limit from appconfig.
 	// We always use premium limit in the MainList limit producer,
 	// because it slices the list to that limit. We don't want to slice
@@ -2405,21 +2817,25 @@ void Session::processMessages(
 void Session::processExistingMessages(
 		ChannelData *channel,
 		const MTPmessages_Messages &data) {
+	data.match([&](const MTPDmessages_messagesNotModified&) {
+		LOG(("API Error: received messages.messagesNotModified!"));
+	}, [&](const auto &data) {
+		processUsers(data.vusers());
+		processChats(data.vchats());
+		processMessages(data.vmessages(), NewMessageType::Existing);
+	});
 	data.match([&](const MTPDmessages_channelMessages &data) {
 		if (channel) {
 			channel->ptsReceived(data.vpts().v);
-			channel->processTopics(data.vtopics());
 		} else {
 			LOG(("App Error: received messages.channelMessages!"));
 		}
 	}, [](const auto &) {});
-
 	data.match([&](const MTPDmessages_messagesNotModified&) {
-		LOG(("API Error: received messages.messagesNotModified!"));
 	}, [&](const auto &data) {
-		processUsers(data.vusers());
-		processChats(data.vchats());
-		processMessages(data.vmessages(), NewMessageType::Existing);
+		if (channel) {
+			channel->processTopics(data.vtopics());
+		}
 	});
 }
 
@@ -2494,12 +2910,65 @@ void Session::unregisterMessageTTL(
 void Session::checkTTLs() {
 	_ttlCheckTimer.cancel();
 	const auto now = base::unixtime::now();
-	while (!_ttlMessages.empty() && _ttlMessages.begin()->first <= now) {
-		_ttlMessages.begin()->second.front()->destroy();
+	auto expired = std::vector<not_null<HistoryItem*>>();
+	for (const auto &[when, items] : _ttlMessages) {
+		if (when > now) {
+			break;
+		}
+		expired.insert(expired.end(), items.begin(), items.end());
+	}
+	if (!expired.empty()) {
+		notifyItemsAboutToBeDestroyed(expired);
+		for (const auto &item : expired) {
+			item->destroy();
+		}
 	}
 	scheduleNextTTLs();
 }
 
+void Session::registerFormattedDateUpdate(
+		TimeId when,
+		not_null<HistoryView::Element*> view) {
+	_formattedDateUpdates[when].push_back(
+		base::make_weak(view.get()));
+	const auto nearest = _formattedDateUpdates.begin()->first;
+	if (nearest < when && _formattedDateTimer.isActive()) {
+		return;
+	}
+	scheduleNextFormattedDateUpdate();
+}
+
+void Session::scheduleNextFormattedDateUpdate() {
+	if (_formattedDateUpdates.empty()) {
+		return;
+	}
+	const auto nearest = _formattedDateUpdates.begin()->first;
+	const auto now = base::unixtime::now();
+	const auto maxTimeout = TimeId(86400);
+	const auto timeout = std::min(
+		std::max(now, nearest) - now,
+		maxTimeout);
+	_formattedDateTimer.callOnce(timeout * crl::time(1000));
+}
+
+void Session::checkFormattedDateUpdates() {
+	_formattedDateTimer.cancel();
+	const auto now = base::unixtime::now();
+	auto expired = std::vector<base::weak_ptr<HistoryView::Element>>();
+	while (!_formattedDateUpdates.empty()
+		&& _formattedDateUpdates.begin()->first <= now) {
+		auto &list = _formattedDateUpdates.begin()->second;
+		expired.insert(expired.end(), list.begin(), list.end());
+		_formattedDateUpdates.erase(_formattedDateUpdates.begin());
+	}
+	for (const auto &weak : expired) {
+		if (const auto strong = weak.get()) {
+			requestItemTextRefresh(strong->data());
+		}
+	}
+	scheduleNextFormattedDateUpdate();
+}
+
 void Session::processMessagesDeleted(
 		PeerId peerId,
 		const QVector<MTPint> &data) {
@@ -2509,37 +2978,51 @@ void Session::processMessagesDeleted(
 		return;
 	}
 
+	auto toDestroy = std::vector<not_null<HistoryItem*>>();
 	auto historiesToCheck = base::flat_set<not_null<History*>>();
 	for (const auto &messageId : data) {
 		const auto i = list ? list->find(messageId.v) : Messages::iterator();
 		if (list && i != list->end()) {
 			const auto history = i->second->history();
-			i->second->destroy();
-			if (!history->chatListMessageKnown()) {
-				historiesToCheck.emplace(history);
-			}
+			toDestroy.push_back(i->second);
+			historiesToCheck.emplace(history);
 		} else if (affected) {
 			affected->unknownMessageDeleted(messageId.v);
 		}
 	}
+	if (!toDestroy.empty()) {
+		notifyItemsAboutToBeDestroyed(toDestroy);
+		for (const auto &item : toDestroy) {
+			item->destroy();
+		}
+	}
 	for (const auto &history : historiesToCheck) {
-		history->requestChatListMessage();
+		if (!history->chatListMessageKnown()) {
+			history->requestChatListMessage();
+		}
 	}
 }
 
 void Session::processNonChannelMessagesDeleted(const QVector<MTPint> &data) {
+	auto toDestroy = std::vector<not_null<HistoryItem*>>();
 	auto historiesToCheck = base::flat_set<not_null<History*>>();
 	for (const auto &messageId : data) {
 		if (const auto item = nonChannelMessage(messageId.v)) {
 			const auto history = item->history();
+			toDestroy.push_back(item);
+			historiesToCheck.emplace(history);
+		}
+	}
+	if (!toDestroy.empty()) {
+		notifyItemsAboutToBeDestroyed(toDestroy);
+		for (const auto &item : toDestroy) {
 			item->destroy();
-			if (!history->chatListMessageKnown()) {
-				historiesToCheck.emplace(history);
-			}
 		}
 	}
 	for (const auto &history : historiesToCheck) {
-		history->requestChatListMessage();
+		if (!history->chatListMessageKnown()) {
+			history->requestChatListMessage();
+		}
 	}
 }
 
@@ -2632,6 +3115,34 @@ HistoryItem *Session::message(FullMsgId itemId) const {
 	return message(itemId.peer, itemId.msg);
 }
 
+void Session::removeReactionsFromParticipant(
+		not_null<PeerData*> peer,
+		MsgId msgId,
+		not_null<PeerData*> participant,
+		const ReactionId &reaction,
+		MsgId originMsgId) {
+	if (msgId) {
+		if (const auto item = message(peer, msgId)) {
+			item->removeReactionsFromParticipant(participant, reaction);
+		}
+	} else if (const auto list = messagesList(peer->id)) {
+		for (const auto &entry : *list) {
+			const auto knownReaction = (originMsgId
+				&& (entry.second->id == originMsgId))
+				? reaction
+				: ReactionId();
+			entry.second->removeReactionsFromParticipant(
+				participant,
+				knownReaction);
+		}
+	}
+	notifyReactionsRemoved({
+		.peer = peer,
+		.msgId = msgId,
+		.participant = participant,
+	});
+}
+
 HistoryItem *Session::nonChannelMessage(MsgId itemId) const {
 	if (!IsServerMsgId(itemId)) {
 		return nullptr;
@@ -2711,10 +3222,23 @@ HistoryItem *Session::addNewMessage(
 		MessageFlags localFlags,
 		NewMessageType type) {
 	const auto peerId = PeerFromMessage(data);
-	if (!peerId) {
+	if (!peerId || data.type() == mtpc_messageEmpty) {
 		return nullptr;
 	}
 
+	if (type == NewMessageType::Unread
+		&& data.type() == mtpc_message) {
+		if (const auto h = historyLoaded(peerId)) {
+			if (const auto streamed = h->streamedDraftsIfExists()) {
+				if (const auto adopted = streamed->adoptIncoming(
+						data.c_message())) {
+					CheckForSwitchInlineButton(adopted);
+					return adopted;
+				}
+			}
+		}
+	}
+
 	const auto result = history(peerId)->addNewMessage(
 		id,
 		data,
@@ -2730,10 +3254,23 @@ int Session::unreadBadge() const {
 	return computeUnreadBadge(_chatsList.unreadState());
 }
 
+int Session::unreadWithMentionsBadge() const {
+	auto state = _chatsList.unreadState();
+	if (state.mentions) {
+		state.messages -= state.mentions;
+	}
+	return computeUnreadBadge(state) + state.mentions;
+}
+
 bool Session::unreadBadgeMuted() const {
 	return computeUnreadBadgeMuted(_chatsList.unreadState());
 }
 
+bool Session::unreadWithMentionsBadgeMuted() const {
+	const auto state = _chatsList.unreadState();
+	return !state.mentions && computeUnreadBadgeMuted(state);
+}
+
 int Session::unreadBadgeIgnoreOne(Dialogs::Key key) const {
 	const auto remove = (key && key.entry()->inChatList())
 		? key.entry()->chatListUnreadState()
@@ -2775,6 +3312,15 @@ auto Session::repliesReadTillUpdates() const
 	return _repliesReadTillUpdates.events();
 }
 
+void Session::updateSublistReadTill(SublistReadTillUpdate update) {
+	_sublistReadTillUpdates.fire(std::move(update));
+}
+
+auto Session::sublistReadTillUpdates() const
+-> rpl::producer<SublistReadTillUpdate> {
+	return _sublistReadTillUpdates.events();
+}
+
 int Session::computeUnreadBadge(const Dialogs::UnreadState &state) const {
 	const auto all = Core::App().settings().includeMutedCounter();
 	return std::max(state.marks - (all ? 0 : state.marksMuted), 0)
@@ -3139,17 +3685,24 @@ not_null<DocumentData*> Session::document(DocumentId id) {
 	return i->second.get();
 }
 
-not_null<DocumentData*> Session::processDocument(const MTPDocument &data) {
+not_null<DocumentData*> Session::processDocument(
+		const MTPDocument &data,
+		const MTPVector<MTPDocument> *qualities) {
 	return data.match([&](const MTPDdocument &data) {
-		return processDocument(data);
+		return processDocument(data, qualities);
 	}, [&](const MTPDdocumentEmpty &data) {
 		return document(data.vid().v);
 	});
 }
 
-not_null<DocumentData*> Session::processDocument(const MTPDdocument &data) {
+not_null<DocumentData*> Session::processDocument(
+		const MTPDdocument &data,
+		const MTPVector<MTPDocument> *qualities) {
 	const auto result = document(data.vid().v);
 	documentApplyFields(result, data);
+	if (qualities) {
+		result->setVideoQualities(qualities->v);
+	}
 	return result;
 }
 
@@ -3443,9 +3996,13 @@ not_null<WebPageData*> Session::processWebpage(
 		WebPageCollage(),
 		nullptr,
 		nullptr,
+		nullptr,
+		nullptr,
+		0,
 		0,
 		QString(),
 		false,
+		false,
 		data.vdate().v
 			? data.vdate().v
 			: (base::unixtime::now() + kDefaultPendingTimeout));
@@ -3455,7 +4012,9 @@ not_null<WebPageData*> Session::processWebpage(
 not_null<WebPageData*> Session::webpage(
 		WebPageId id,
 		const QString &siteName,
-		const TextWithEntities &content) {
+		const TextWithEntities &content,
+		PhotoData *photo,
+		DocumentData *document) {
 	return webpage(
 		id,
 		WebPageType::Article,
@@ -3464,14 +4023,16 @@ not_null<WebPageData*> Session::webpage(
 		siteName,
 		QString(),
 		content,
-		nullptr,
-		nullptr,
+		photo,
+		document,
 		WebPageCollage(),
 		nullptr,
 		nullptr,
+		nullptr,
 		0,
 		QString(),
 		false,
+		false,
 		TimeId(0));
 }
 
@@ -3488,9 +4049,11 @@ not_null<WebPageData*> Session::webpage(
 		WebPageCollage &&collage,
 		std::unique_ptr<Iv::Data> iv,
 		std::unique_ptr<WebPageStickerSet> stickerSet,
+		std::shared_ptr<UniqueGift> uniqueGift,
 		int duration,
 		const QString &author,
 		bool hasLargeMedia,
+		bool photoIsVideoCover,
 		TimeId pendingTill) {
 	const auto result = webpage(id);
 	webpageApplyFields(
@@ -3507,9 +4070,13 @@ not_null<WebPageData*> Session::webpage(
 		std::move(collage),
 		std::move(iv),
 		std::move(stickerSet),
+		std::move(uniqueGift),
+		nullptr,
+		0,
 		duration,
 		author,
 		hasLargeMedia,
+		photoIsVideoCover,
 		pendingTill);
 	return result;
 }
@@ -3541,6 +4108,7 @@ void Session::webpageApplyFields(
 		}
 		return nullptr;
 	};
+
 	const auto lookupThemeDocument = [&]() -> DocumentData* {
 		if (const auto attributes = data.vattributes()) {
 			for (const auto &attribute : attributes->v) {
@@ -3551,6 +4119,14 @@ void Session::webpageApplyFields(
 					return (DocumentData*)nullptr;
 				}, [](const MTPDwebPageAttributeStickerSet &) {
 					return (DocumentData*)nullptr;
+				}, [](const MTPDwebPageAttributeUniqueStarGift &) {
+					return (DocumentData*)nullptr;
+				}, [](const MTPDwebPageAttributeStarGiftCollection &) {
+					return (DocumentData*)nullptr;
+				}, [](const MTPDwebPageAttributeStarGiftAuction &) {
+					return (DocumentData*)nullptr;
+				}, [](const MTPDwebPageAttributeAiComposeTone &) {
+					return (DocumentData*)nullptr;
 				});
 				if (result) {
 					return result;
@@ -3559,6 +4135,7 @@ void Session::webpageApplyFields(
 		}
 		return nullptr;
 	};
+
 	using WebPageStickerSetPtr = std::unique_ptr<WebPageStickerSet>;
 	const auto lookupStickerSet = [&]() -> WebPageStickerSetPtr {
 		if (const auto attributes = data.vattributes()) {
@@ -3572,6 +4149,14 @@ void Session::webpageApplyFields(
 						result->items.push_back(processDocument(tl));
 					}
 					return result;
+				}, [&](const MTPDwebPageAttributeStarGiftCollection &data) {
+					auto result = std::make_unique<WebPageStickerSet>();
+					result->isEmoji = false;
+					result->isTextColor = false;
+					for (const auto &tl : data.vicons().v) {
+						result->items.push_back(processDocument(tl));
+					}
+					return result;
 				}, [](const auto &) {
 					return WebPageStickerSetPtr(nullptr);
 				});
@@ -3582,6 +4167,56 @@ void Session::webpageApplyFields(
 		}
 		return nullptr;
 	};
+
+	using UniqueGiftPtr = std::shared_ptr<UniqueGift>;
+	const auto lookupUniqueGift = [&]() -> UniqueGiftPtr {
+		if (const auto attributes = data.vattributes()) {
+			for (const auto &attribute : attributes->v) {
+				return attribute.match([&](
+						const MTPDwebPageAttributeUniqueStarGift &data) {
+					const auto gift = Api::FromTL(_session, data.vgift());
+					return gift ? gift->unique : nullptr;
+				}, [](const auto &) -> UniqueGiftPtr { return nullptr; });
+			}
+		}
+		return nullptr;
+	};
+
+	using WebPageAuctionPtr = std::unique_ptr<WebPageAuction>;
+	const auto lookupAuction = [&]() -> WebPageAuctionPtr {
+		if (const auto attributes = data.vattributes()) {
+			for (const auto &attribute : attributes->v) {
+				return attribute.match([&](
+						const MTPDwebPageAttributeStarGiftAuction &data) {
+					const auto gift = Api::FromTL(_session, data.vgift());
+					if (!gift) {
+						return WebPageAuctionPtr(nullptr);
+					}
+					auto auction = std::make_unique<WebPageAuction>();
+					auction->auctionGift = std::make_shared<StarGift>(*gift);
+					auction->endDate = data.vend_date().v;
+					return auction;
+				}, [](const auto &) -> WebPageAuctionPtr { return nullptr; });
+			}
+		}
+		return nullptr;
+	};
+
+	const auto lookupComposeToneEmojiId = [&]() -> DocumentId {
+		if (const auto attributes = data.vattributes()) {
+			for (const auto &attribute : attributes->v) {
+				const auto result = attribute.match([&](
+						const MTPDwebPageAttributeAiComposeTone &data) {
+					return DocumentId(data.vemoji_id().v);
+				}, [](const auto &) { return DocumentId(0); });
+				if (result) {
+					return result;
+				}
+			}
+		}
+		return 0;
+	};
+
 	auto story = (Data::Story*)nullptr;
 	auto storyId = FullStoryId();
 	if (const auto attributes = data.vattributes()) {
@@ -3612,46 +4247,31 @@ void Session::webpageApplyFields(
 			}, [](const auto &) {});
 		}
 	}
-	if (const auto page = data.vcached_page()) {
-		for (const auto &photo : page->data().vphotos().v) {
-			processPhoto(photo);
-		}
-		for (const auto &document : page->data().vdocuments().v) {
-			processDocument(document);
-		}
-		const auto process = [&](
-				const MTPPageBlock &block,
-				const auto &self) -> void {
-			block.match([&](const MTPDpageBlockChannel &data) {
-				processChat(data.vchannel());
-			}, [&](const MTPDpageBlockCover &data) {
-				self(data.vcover(), self);
-			}, [&](const MTPDpageBlockEmbedPost &data) {
-				for (const auto &block : data.vblocks().v) {
-					self(block, self);
-				}
-			}, [&](const MTPDpageBlockCollage &data) {
-				for (const auto &block : data.vitems().v) {
-					self(block, self);
-				}
-			}, [&](const MTPDpageBlockSlideshow &data) {
-				for (const auto &block : data.vitems().v) {
-					self(block, self);
-				}
-			}, [&](const MTPDpageBlockDetails &data) {
-				for (const auto &block : data.vblocks().v) {
-					self(block, self);
-				}
-			}, [](const auto &) {});
-		};
-		for (const auto &block : page->data().vblocks().v) {
-			process(block, process);
-		}
-	}
 	const auto type = story ? WebPageType::Story : ParseWebPageType(data);
-	auto iv = (data.vcached_page() && !IgnoreIv(type))
-		? std::make_unique<Iv::Data>(data, *data.vcached_page())
+	const auto cachedPage = data.vcached_page();
+	const auto ivPhoto = photo ? processPhoto(*photo).get() : nullptr;
+	const auto ivDocument = document ? processDocument(*document).get() : nullptr;
+	const auto richPage = (cachedPage && !IgnoreIv(type))
+		? Iv::ParseRichPage(_session, data)
+		: nullptr;
+	auto iv = richPage
+		? std::make_unique<Iv::Data>(data, richPage)
 		: nullptr;
+	const auto resolvedPhoto = story
+		? story->photo()
+		: photo
+		? ivPhoto
+		: nullptr;
+	const auto resolvedDocument = story
+		? story->document()
+		: document
+		? ivDocument
+		: lookupThemeDocument();
+	const auto photoIsVideoCover = data.is_video_cover_photo()
+		|| (resolvedDocument
+			&& resolvedPhoto
+			&& resolvedDocument->isVideoFile()
+			&& !resolvedDocument->hasThumbnail());
 	webpageApplyFields(
 		page,
 		type,
@@ -3661,22 +4281,18 @@ void Session::webpageApplyFields(
 		qs(data.vtitle().value_or_empty()),
 		(story ? story->caption() : description),
 		storyId,
-		(story
-			? story->photo()
-			: photo
-			? processPhoto(*photo).get()
-			: nullptr),
-		(story
-			? story->document()
-			: document
-			? processDocument(*document).get()
-			: lookupThemeDocument()),
+		resolvedPhoto,
+		resolvedDocument,
 		WebPageCollage(this, data),
 		std::move(iv),
 		lookupStickerSet(),
+		lookupUniqueGift(),
+		lookupAuction(),
+		lookupComposeToneEmojiId(),
 		data.vduration().value_or_empty(),
 		qs(data.vauthor().value_or_empty()),
 		data.is_has_large_media(),
+		photoIsVideoCover,
 		pendingTill);
 }
 
@@ -3694,9 +4310,13 @@ void Session::webpageApplyFields(
 		WebPageCollage &&collage,
 		std::unique_ptr<Iv::Data> iv,
 		std::unique_ptr<WebPageStickerSet> stickerSet,
+		std::shared_ptr<UniqueGift> uniqueGift,
+		std::unique_ptr<WebPageAuction> auction,
+		DocumentId composeToneEmojiId,
 		int duration,
 		const QString &author,
 		bool hasLargeMedia,
+		bool photoIsVideoCover,
 		TimeId pendingTill) {
 	const auto requestPending = (!page->pendingTill && pendingTill > 0);
 	const auto changed = page->applyChanges(
@@ -3712,9 +4332,13 @@ void Session::webpageApplyFields(
 		std::move(collage),
 		std::move(iv),
 		std::move(stickerSet),
+		std::move(uniqueGift),
+		std::move(auction),
+		composeToneEmojiId,
 		duration,
 		author,
 		hasLargeMedia,
+		photoIsVideoCover,
 		pendingTill);
 	if (requestPending) {
 		_session->api().requestWebPageDelayed(page);
@@ -3865,6 +4489,34 @@ not_null<PollData*> Session::poll(PollId id) {
 	return i->second.get();
 }
 
+HistoryItem *Session::findItemForPoll(PollId id) const {
+	const auto i = _polls.find(id);
+	if (i == _polls.end()) {
+		return nullptr;
+	}
+	const auto j = _pollViews.find(i->second.get());
+	if (j == _pollViews.end() || j->second.empty()) {
+		return nullptr;
+	}
+	return j->second.front()->data();
+}
+
+std::vector<not_null<PeerData*>> Session::pollRecentVoters(PollId id) const {
+	auto result = std::vector<not_null<PeerData*>>();
+	const auto i = _polls.find(id);
+	if (i == _polls.end()) {
+		return result;
+	}
+	for (const auto &answer : i->second->answers) {
+		for (const auto &voter : answer.recentVoters) {
+			if (!ranges::contains(result, voter)) {
+				result.push_back(voter);
+			}
+		}
+	}
+	return result;
+}
+
 not_null<PollData*> Session::processPoll(const MTPPoll &data) {
 	return data.match([&](const MTPDpoll &data) {
 		const auto id = data.vid().v;
@@ -3883,6 +4535,36 @@ not_null<PollData*> Session::processPoll(const MTPPoll &data) {
 
 not_null<PollData*> Session::processPoll(const MTPDmessageMediaPoll &data) {
 	const auto result = processPoll(data.vpoll());
+	auto media = PollMedia();
+	if (const auto attached = data.vattached_media()) {
+		attached->match([&](const MTPDmessageMediaPhoto &data) {
+			const auto photo = data.vphoto();
+			if (photo && photo->type() == mtpc_photo) {
+				media.photo = processPhoto(*photo);
+			}
+		}, [&](const MTPDmessageMediaDocument &data) {
+			const auto document = data.vdocument();
+			if (document && document->type() == mtpc_document) {
+				media.document = processDocument(*document);
+			}
+		}, [&](const MTPDmessageMediaGeo &data) {
+			data.vgeo().match([&](const MTPDgeoPoint &point) {
+				media.geo = LocationPoint(point);
+			}, [](const MTPDgeoPointEmpty &) {
+			});
+		}, [&](const MTPDmessageMediaVenue &data) {
+			data.vgeo().match([&](const MTPDgeoPoint &point) {
+				media.geo = LocationPoint(point);
+			}, [](const MTPDgeoPointEmpty &) {
+			});
+		}, [](const auto &) {
+		});
+	}
+	if (result->attachedMedia != media) {
+		result->attachedMedia = media;
+		++result->version;
+		notifyPollUpdateDelayed(result);
+	}
 	const auto changed = result->applyResults(data.vresults());
 	if (changed) {
 		notifyPollUpdateDelayed(result);
@@ -3890,6 +4572,49 @@ not_null<PollData*> Session::processPoll(const MTPDmessageMediaPoll &data) {
 	return result;
 }
 
+not_null<TodoListData*> Session::todoList(TodoListId id) {
+	auto i = _todoLists.find(id);
+	if (i == _todoLists.cend()) {
+		i = _todoLists.emplace(
+			id,
+			std::make_unique<TodoListData>(this, id)).first;
+	}
+	return i->second.get();
+}
+
+not_null<TodoListData*> Session::processTodoList(
+		TodoListId id,
+		const MTPTodoList &todolist) {
+	const auto &data = todolist.data();
+	const auto result = todoList(id);
+	const auto changed = result->applyChanges(data);
+	if (changed) {
+		notifyTodoListUpdateDelayed(result);
+	}
+	return result;
+}
+
+not_null<TodoListData*> Session::processTodoList(
+		TodoListId id,
+		const MTPDmessageMediaToDo &data) {
+	const auto result = processTodoList(id, data.vtodo());
+	const auto changed = result->applyCompletions(data.vcompletions());
+	if (changed) {
+		notifyTodoListUpdateDelayed(result);
+	}
+	return result;
+}
+
+not_null<TodoListData*> Session::duplicateTodoList(
+		TodoListId id,
+		not_null<TodoListData*> existing) {
+	const auto result = todoList(id);
+	result->title = existing->title;
+	result->items = existing->items;
+	++result->version;
+	return result;
+}
+
 void Session::checkPollsClosings() {
 	const auto now = base::unixtime::now();
 	auto closest = 0;
@@ -3907,7 +4632,9 @@ void Session::checkPollsClosings() {
 		}
 	}
 	if (closest) {
-		_pollsClosingTimer.callOnce((closest - now) * crl::time(1000));
+		constexpr auto kMaxTimeout = 24 * 3600 * crl::time(1000);
+		_pollsClosingTimer.callOnce(
+			std::min((closest - now) * crl::time(1000), kMaxTimeout));
 	} else {
 		_pollsClosingTimer.cancel();
 	}
@@ -3926,6 +4653,23 @@ void Session::applyUpdate(const MTPDupdateMessagePoll &update) {
 	if (updated && updated->applyResults(update.vresults())) {
 		notifyPollUpdateDelayed(updated);
 	}
+	if (const auto tlPeer = update.vpeer()) {
+		const auto peer = peerFromMTP(*tlPeer);
+		if (const auto history = historyLoaded(peer)) {
+			histories().requestDialogEntry(history);
+		}
+	} else if (updated) {
+		if (const auto i = _pollViews.find(updated)
+			; i != _pollViews.end()) {
+			for (const auto &view : i->second) {
+				if (view->data()->hasUnreadPollVote()) {
+					histories().requestDialogEntry(
+						view->data()->history());
+					break;
+				}
+			}
+		}
+	}
 }
 
 void Session::applyUpdate(const MTPDupdateChatParticipants &update) {
@@ -3960,6 +4704,12 @@ void Session::applyUpdate(const MTPDupdateChatParticipantAdmin &update) {
 	}
 }
 
+void Session::applyUpdate(const MTPDupdateChatParticipantRank &update) {
+	if (const auto chat = chatLoaded(update.vchat_id().v)) {
+		ApplyChatUpdate(chat, update);
+	}
+}
+
 void Session::applyUpdate(const MTPDupdateChatDefaultBannedRights &update) {
 	if (const auto peer = peerLoaded(peerFromMTP(update.vpeer()))) {
 		if (const auto chat = peer->asChat()) {
@@ -4013,6 +4763,9 @@ void Session::unregisterPhotoItem(
 void Session::registerDocumentItem(
 		not_null<const DocumentData*> document,
 		not_null<HistoryItem*> item) {
+	if (document->isMusicForProfile()) {
+		document->owner().savedMusic().loadIds();
+	}
 	_documentItems[document].insert(item);
 }
 
@@ -4100,6 +4853,24 @@ void Session::unregisterPollView(
 	}
 }
 
+void Session::registerTodoListView(
+		not_null<const TodoListData*> todolist,
+		not_null<ViewElement*> view) {
+	_todoListViews[todolist].insert(view);
+}
+
+void Session::unregisterTodoListView(
+		not_null<const TodoListData*> todolist,
+		not_null<ViewElement*> view) {
+	const auto i = _todoListViews.find(todolist);
+	if (i != _todoListViews.end()) {
+		auto &items = i->second;
+		if (items.remove(view) && items.empty()) {
+			_todoListViews.erase(i);
+		}
+	}
+}
+
 void Session::registerContactView(
 		UserId contactId,
 		not_null<ViewElement*> view) {
@@ -4142,7 +4913,7 @@ void Session::registerContactItem(
 	}
 
 	if (const auto i = _views.find(item); i != _views.end()) {
-		for (const auto view : i->second) {
+		for (const auto &view : i->second) {
 			if (const auto media = view->media()) {
 				media->updateSharedContactUserId(contactId);
 			}
@@ -4209,7 +4980,7 @@ void Session::unregisterStoryItem(
 void Session::refreshStoryItemViews(FullStoryId id) {
 	const auto i = _storyItems.find(id);
 	if (i != _storyItems.end()) {
-		for (const auto item : i->second) {
+		for (const auto &item : i->second) {
 			if (const auto media = item->media()) {
 				if (media->storyMention()) {
 					item->updateStoryMentionText();
@@ -4280,37 +5051,54 @@ QString Session::findContactPhone(UserId contactId) const {
 	return QString();
 }
 
-bool Session::hasPendingWebPageGamePollNotification() const {
+bool Session::hasPendingWebPageGamePollTodoListNotification() const {
 	return !_webpagesUpdated.empty()
 		|| !_gamesUpdated.empty()
-		|| !_pollsUpdated.empty();
+		|| !_pollsUpdated.empty()
+		|| !_todoListsUpdated.empty();
 }
 
 void Session::notifyWebPageUpdateDelayed(not_null<WebPageData*> page) {
-	const auto invoke = !hasPendingWebPageGamePollNotification();
+	const auto invoke = !hasPendingWebPageGamePollTodoListNotification();
 	_webpagesUpdated.insert(page);
 	if (invoke) {
-		crl::on_main(_session, [=] { sendWebPageGamePollNotifications(); });
+		crl::on_main(_session, [=] {
+			sendWebPageGamePollTodoListNotifications();
+		});
 	}
 }
 
 void Session::notifyGameUpdateDelayed(not_null<GameData*> game) {
-	const auto invoke = !hasPendingWebPageGamePollNotification();
+	const auto invoke = !hasPendingWebPageGamePollTodoListNotification();
 	_gamesUpdated.insert(game);
 	if (invoke) {
-		crl::on_main(_session, [=] { sendWebPageGamePollNotifications(); });
+		crl::on_main(_session, [=] {
+			sendWebPageGamePollTodoListNotifications();
+		});
 	}
 }
 
 void Session::notifyPollUpdateDelayed(not_null<PollData*> poll) {
-	const auto invoke = !hasPendingWebPageGamePollNotification();
+	const auto invoke = !hasPendingWebPageGamePollTodoListNotification();
 	_pollsUpdated.insert(poll);
 	if (invoke) {
-		crl::on_main(_session, [=] { sendWebPageGamePollNotifications(); });
+		crl::on_main(_session, [=] {
+			sendWebPageGamePollTodoListNotifications();
+		});
+	}
+}
+
+void Session::notifyTodoListUpdateDelayed(not_null<TodoListData*> todolist) {
+	const auto invoke = !hasPendingWebPageGamePollTodoListNotification();
+	_todoListsUpdated.insert(todolist);
+	if (invoke) {
+		crl::on_main(_session, [=] {
+			sendWebPageGamePollTodoListNotifications();
+		});
 	}
 }
 
-void Session::sendWebPageGamePollNotifications() {
+void Session::sendWebPageGamePollTodoListNotifications() {
 	auto resize = std::vector<not_null<ViewElement*>>();
 	for (const auto &page : base::take(_webpagesUpdated)) {
 		_webpageUpdates.fire_copy(page);
@@ -4325,10 +5113,17 @@ void Session::sendWebPageGamePollNotifications() {
 		}
 	}
 	for (const auto &poll : base::take(_pollsUpdated)) {
+		_pollUpdates.fire_copy(poll);
 		if (const auto i = _pollViews.find(poll); i != _pollViews.end()) {
 			resize.insert(end(resize), begin(i->second), end(i->second));
 		}
 	}
+	for (const auto &todolist : base::take(_todoListsUpdated)) {
+		if (const auto i = _todoListViews.find(todolist)
+			; i != _todoListViews.end()) {
+			resize.insert(end(resize), begin(i->second), end(i->second));
+		}
+	}
 	for (const auto &view : resize) {
 		requestViewResize(view);
 	}
@@ -4338,6 +5133,10 @@ rpl::producer<not_null<WebPageData*>> Session::webPageUpdates() const {
 	return _webpageUpdates.events();
 }
 
+rpl::producer<not_null<PollData*>> Session::pollUpdates() const {
+	return _pollUpdates.events();
+}
+
 void Session::channelDifferenceTooLong(not_null<ChannelData*> channel) {
 	_channelDifferenceTooLong.fire_copy(channel);
 }
@@ -4409,12 +5208,12 @@ not_null<Folder*> Session::processFolder(const MTPDfolder &data) {
 
 not_null<Dialogs::MainList*> Session::chatsListFor(
 		not_null<Dialogs::Entry*> entry) {
-	const auto topic = entry->asTopic();
-	return topic
-		? topic->forum()->topicsList()
-		: entry->asSublist()
-		? _savedMessages->chatsList()
-		: chatsList(entry->folder());
+	if (const auto topic = entry->asTopic()) {
+		return topic->forum()->topicsList();
+	} else if (const auto sublist = entry->asSublist()) {
+		return sublist->parent()->chatsList();
+	}
+	return chatsList(entry->folder());
 }
 
 not_null<Dialogs::MainList*> Session::chatsList(Data::Folder *folder) {
@@ -4490,7 +5289,30 @@ void Session::refreshChatListEntry(Dialogs::Key key) {
 		}
 		if (const auto forum = history->peer->forum()) {
 			forum->preloadTopics();
+		} else if (const auto monoforum = history->peer->monoforum()) {
+			monoforum->preloadSublists();
+		}
+		//if (const auto broadcast = history->peer->monoforumBroadcast()) {
+		//	if (!broadcast->isFullLoaded()) {
+		//		broadcast->updateFull();
+		//	}
+		//}
+	}
+}
+
+void Session::refreshChatListUnreadOnTop() {
+	auto entries = std::vector<not_null<Dialogs::Entry*>>();
+	const auto collect = [&](not_null<Dialogs::MainList*> list) {
+		for (const auto &row : list->indexed()->all()) {
+			entries.push_back(row->entry());
 		}
+	};
+	collect(&_chatsList);
+	if (const auto folder = folderLoaded(Data::Folder::kId)) {
+		collect(folder->chatsList());
+	}
+	for (const auto &entry : entries) {
+		entry->updateChatListSortPosition();
 	}
 }
 
@@ -4572,10 +5394,12 @@ void Session::serviceNotification(
 			MTPstring(), // lang_code
 			MTPEmojiStatus(),
 			MTPVector<MTPUsername>(),
-			MTPint(), // stories_max_id
+			MTPRecentStory(),
 			MTPPeerColor(), // color
 			MTPPeerColor(), // profile_color
-			MTPint())); // bot_active_users
+			MTPint(), // bot_active_users
+			MTPlong(), // bot_verification_icon
+			MTPlong())); // send_paid_messages_stars
 	}
 	const auto history = this->history(PeerData::kServiceNotificationsId);
 	const auto insert = [=] {
@@ -4602,7 +5426,10 @@ void Session::insertCheckedServiceNotification(
 	const auto localFlags = MessageFlag::ClientSideUnread
 		| MessageFlag::Local;
 	auto sending = TextWithEntities(), left = message;
-	while (TextUtilities::CutPart(sending, left, MaxMessageSize)) {
+	while (TextUtilities::CutPart(
+			sending,
+			left,
+			kMaxServiceNotificationMessageSize)) {
 		const auto id = nextLocalMessageId();
 		addNewMessage(
 			id,
@@ -4611,11 +5438,13 @@ void Session::insertCheckedServiceNotification(
 				MTP_int(0), // Not used (would've been trimmed to 32 bits).
 				peerToMTP(PeerData::kServiceNotificationsId),
 				MTPint(), // from_boosts_applied
+				MTPstring(), // from_rank
 				peerToMTP(PeerData::kServiceNotificationsId),
 				MTPPeer(), // saved_peer_id
 				MTPMessageFwdHeader(),
 				MTPlong(), // via_bot_id
 				MTPlong(), // via_business_bot_id
+				MTPPeer(), // guestchat_via_from
 				MTPMessageReplyHeader(),
 				MTP_int(date),
 				MTP_string(sending.text),
@@ -4633,7 +5462,13 @@ void Session::insertCheckedServiceNotification(
 				MTPint(), // ttl_period
 				MTPint(), // quick_reply_shortcut_id
 				MTPlong(), // effect
-				MTPFactCheck()),
+				MTPFactCheck(),
+				MTPint(), // report_delivery_until_date
+				MTPlong(), // paid_message_stars
+				MTPSuggestedPost(),
+				MTPint(), // schedule_repeat_period
+				MTPstring(), // summary_from_language
+				MTPRichMessage()),
 			localFlags,
 			NewMessageType::Unread);
 	}
@@ -4648,36 +5483,6 @@ MessageIdsList Session::takeMimeForwardIds() {
 	return std::move(_mimeForwardIds);
 }
 
-void Session::setTopPromoted(
-		History *promoted,
-		const QString &type,
-		const QString &message) {
-	const auto changed = (_topPromoted != promoted);
-	if (!changed
-		&& (!promoted || promoted->topPromotionMessage() == message)) {
-		return;
-	}
-	if (changed) {
-		if (_topPromoted) {
-			_topPromoted->cacheTopPromotion(false, QString(), QString());
-		}
-	}
-	const auto old = std::exchange(_topPromoted, promoted);
-	if (_topPromoted) {
-		histories().requestDialogEntry(_topPromoted);
-		_topPromoted->cacheTopPromotion(true, type, message);
-		_topPromoted->requestChatListMessage();
-		session().changes().historyUpdated(
-			_topPromoted,
-			HistoryUpdate::Flag::TopPromoted);
-	}
-	if (changed && old) {
-		session().changes().historyUpdated(
-			old,
-			HistoryUpdate::Flag::TopPromoted);
-	}
-}
-
 bool Session::updateWallpapers(const MTPaccount_WallPapers &data) {
 	return data.match([&](const MTPDaccount_wallPapers &data) {
 		setWallpapers(data.vwallpapers().v, data.vhash().v);
@@ -4757,12 +5562,15 @@ void Session::saveViewAsMessages(
 		not_null<Forum*> forum,
 		bool viewAsMessages) {
 	const auto channel = forum->channel();
+	if (!channel) {
+		return;
+	}
 	if (const auto requestId = _viewAsMessagesRequests.take(channel)) {
 		_session->api().request(*requestId).cancel();
 	}
 	_viewAsMessagesRequests[channel] = _session->api().request(
 		MTPchannels_ToggleViewForumAsMessages(
-			channel->inputChannel,
+			channel->inputChannel(),
 			MTP_bool(viewAsMessages))
 	).done([=] {
 		_viewAsMessagesRequests.remove(channel);
@@ -4780,6 +5588,15 @@ auto Session::webViewResultSent() const -> rpl::producer<WebViewResultSent> {
 	return _webViewResultSent.events();
 }
 
+void Session::joinChatWebViewDecision(JoinChatWebViewDecision &&decision) {
+	return _joinChatWebViewDecision.fire(std::move(decision));
+}
+
+auto Session::joinChatWebViewDecision() const
+-> rpl::producer<JoinChatWebViewDecision> {
+	return _joinChatWebViewDecision.events();
+}
+
 rpl::producer<not_null<PeerData*>> Session::peerDecorationsUpdated() const {
 	return _peerDecorationsUpdated.events();
 }
@@ -4806,6 +5623,66 @@ void Session::viewTagsChanged(
 	}
 }
 
+void Session::sentToScheduled(SentToScheduled value) {
+	_sentToScheduled.fire(std::move(value));
+}
+
+rpl::producer<SentToScheduled> Session::sentToScheduled() const {
+	return _sentToScheduled.events();
+}
+
+void Session::sentFromScheduled(SentFromScheduled value) {
+	_sentFromScheduled.fire(std::move(value));
+}
+
+rpl::producer<SentFromScheduled> Session::sentFromScheduled() const {
+	return _sentFromScheduled.events();
+}
+
+void Session::editStarsPerMessage(
+		not_null<ChannelData*> channel,
+		int count) {
+	// For admin it's zero, we're admin if we can edit it.
+	channel->setStarsPerMessage(0);
+	if (count) {
+		_commonStarsPerMessage[channel] = count;
+	} else {
+		_commonStarsPerMessage.remove(channel);
+	}
+}
+
+int Session::commonStarsPerMessage(
+		not_null<const ChannelData*> channel) const {
+	const auto i = _commonStarsPerMessage.find(channel);
+	return (i != end(_commonStarsPerMessage)) ? i->second : 0;
+}
+
+void Session::setPendingStarsRating(StarsRatingPending value) {
+	_pendingStarsRating = value
+		? std::make_unique<StarsRatingPending>(value)
+		: nullptr;
+}
+
+StarsRatingPending Session::pendingStarsRating() const {
+	return _pendingStarsRating ? *_pendingStarsRating : StarsRatingPending();
+}
+
+void Session::addRecentSelfForwards(const RecentSelfForwards &data) {
+	_recentSelfForwards.fire_copy(data);
+}
+
+rpl::producer<RecentSelfForwards> Session::recentSelfForwards() const {
+	return _recentSelfForwards.events();
+}
+
+void Session::addRecentJoinChat(const RecentJoinChat &data) {
+	_recentJoinChat.fire_copy(data);
+}
+
+rpl::producer<RecentJoinChat> Session::recentJoinChat() const {
+	return _recentJoinChat.events();
+}
+
 void Session::clearLocalStorage() {
 	_cache->close();
 	_cache->clear();
@@ -4813,4 +5690,139 @@ void Session::clearLocalStorage() {
 	_bigFileCache->clear();
 }
 
+void Session::fillMessagePeer(FullMsgId fullId, PeerId peerId) {
+	if (!peerLoaded(peerId) && fullId.peer != peerId) {
+		_messagesWithPeer[peerId].push_back(fullId);
+	}
+}
+
+void Session::fillForwardedInfo(
+		FullMsgId fullId,
+		const MTPMessageFwdHeader &header) {
+	return header.match([&](const MTPDmessageFwdHeader &data) {
+		if (const auto fromId = data.vfrom_id()) {
+			fillMessagePeer(fullId, peerFromMTP(*fromId));
+		}
+	});
+}
+
+void Session::fillMentionUsers(
+		FullMsgId fullId,
+		const MTPVector<MTPMessageEntity> &entities) {
+	for (const auto &entity : entities.v) {
+		entity.match([&](const MTPDmessageEntityMentionName &data) {
+			fillMessagePeer(fullId, peerFromUser(data.vuser_id()));
+		}, [&](const MTPDinputMessageEntityMentionName &data) {
+			data.vuser_id().match([&](const MTPDinputUser &data) {
+				fillMessagePeer(fullId, peerFromUser(data.vuser_id()));
+			}, [](const auto &) {});
+		}, [](const auto &) {});
+	}
+}
+
+void Session::fillMessagePeers(PeerId peerId, const MTPMessage &message) {
+	const auto id = IdFromMessage(message);
+	if (!IsServerMsgId(id)) {
+		return;
+	}
+	const auto fullId = FullMsgId(peerId, id);
+	fillMessagePeer(fullId, peerId);
+	return message.match([&](const MTPDmessage &data) {
+		if (const auto fromId = data.vfrom_id()) {
+			fillMessagePeer(fullId, peerFromMTP(*fromId));
+		}
+		if (const auto viaBotId = data.vvia_bot_id()) {
+			fillMessagePeer(fullId, peerFromUser(*viaBotId));
+		}
+		if (const auto fwd = data.vfwd_from()) {
+			fillForwardedInfo(fullId, *fwd);
+		}
+		if (const auto entities = data.ventities()) {
+			fillMentionUsers(fullId, *entities);
+		}
+	}, [&](const MTPDmessageService &data) {
+		if (const auto fromId = data.vfrom_id()) {
+			fillMessagePeer(fullId, peerFromMTP(*fromId));
+		}
+		return data.vaction().match(
+		[&](const MTPDmessageActionChatAddUser &data) {
+			for (const auto &userId : data.vusers().v) {
+				fillMessagePeer(fullId, peerFromUser(userId));
+			}
+		}, [&](const MTPDmessageActionChatJoinedByLink &data) {
+			fillMessagePeer(fullId, peerFromUser(data.vinviter_id()));
+		}, [&](const MTPDmessageActionChatDeleteUser &data) {
+			fillMessagePeer(fullId, peerFromUser(data.vuser_id()));
+		}, [](const auto &) {
+		});
+	}, [](const MTPDmessageEmpty &) {
+	});
+}
+
+void Session::fillMessagePeers(const MTPDupdateShortMessage &data) {
+	const auto id = MsgId(data.vid().v);
+	const auto peerId = peerFromUser(data.vuser_id());
+	if (!id || !peerId) {
+		return;
+	}
+	const auto fullId = FullMsgId(peerId, id);
+	fillMessagePeer(fullId, peerId);
+	if (const auto viaBotId = data.vvia_bot_id()) {
+		fillMessagePeer(fullId, peerFromUser(*viaBotId));
+	}
+	if (const auto fwd = data.vfwd_from()) {
+		fillForwardedInfo(fullId, *fwd);
+	}
+	if (const auto entities = data.ventities()) {
+		fillMentionUsers(fullId, *entities);
+	}
+}
+
+void Session::fillMessagePeers(const MTPDupdateShortChatMessage &data) {
+	const auto id = MsgId(data.vid().v);
+	const auto peerId = peerFromChat(data.vchat_id());
+	if (!id || !peerId) {
+		return;
+	}
+	const auto fullId = FullMsgId(peerId, id);
+	fillMessagePeer(fullId, peerId);
+	fillMessagePeer(fullId, peerFromUser(data.vfrom_id()));
+	if (const auto viaBotId = data.vvia_bot_id()) {
+		fillMessagePeer(fullId, peerFromUser(*viaBotId));
+	}
+	if (const auto fwd = data.vfwd_from()) {
+		fillForwardedInfo(fullId, *fwd);
+	}
+	if (const auto entities = data.ventities()) {
+		fillMentionUsers(fullId, *entities);
+	}
+}
+
+void Session::fillMessagePeers(
+		FullMsgId fullId,
+		const MTPDupdateShortSentMessage &data) {
+	if (const auto entities = data.ventities()) {
+		fillMentionUsers(fullId, *entities);
+	}
+}
+
+HistoryItem *Session::messageWithPeer(PeerId id) const {
+	if (id == _session->userPeerId()) {
+		return nullptr;
+	}
+	const auto i = _messagesWithPeer.find(id);
+	if (i == end(_messagesWithPeer)) {
+		return nullptr;
+	}
+	auto &list = i->second;
+	for (auto j = begin(list); j != end(list);) {
+		if (const auto item = message(*j)) {
+			return item;
+		}
+		j = list.erase(j);
+	}
+	_messagesWithPeer.erase(i);
+	return nullptr;
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index a87e7e604aeca3..57acd38dd52c03 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "dialogs/dialogs_main_list.h"
 #include "data/data_groups.h"
 #include "data/data_cloud_file.h"
+#include "data/data_star_gift.h"
 #include "history/history_location_manager.h"
 #include "base/timer.h"
 
@@ -18,9 +19,14 @@ class Image;
 class HistoryItem;
 struct WebPageCollage;
 struct WebPageStickerSet;
+struct WebPageAuction;
 enum class WebPageType : uint8;
 enum class NewMessageType;
 
+namespace Calls {
+class GroupCall;
+} // namespace Calls
+
 namespace HistoryView {
 struct Group;
 class Element;
@@ -53,6 +59,7 @@ class SendActionManager;
 class Reactions;
 class EmojiStatuses;
 class ForumIcons;
+class AiComposeTones;
 class ChatFilters;
 class CloudThemes;
 class Streaming;
@@ -65,11 +72,15 @@ class GroupCall;
 class NotifySettings;
 class CustomEmojiManager;
 class Stories;
+class SavedMusic;
 class SavedMessages;
 class Chatbots;
 class BusinessInfo;
 struct ReactionId;
 struct UnavailableReason;
+struct CreditsStatusSlice;
+struct StarsRatingPending;
+struct UniqueGift;
 
 struct RepliesReadTillUpdate {
 	FullMsgId id;
@@ -77,17 +88,81 @@ struct RepliesReadTillUpdate {
 	bool out = false;
 };
 
+struct SublistReadTillUpdate {
+	ChannelId parentChatId;
+	PeerId sublistPeerId;
+	MsgId readTillId;
+	bool out = false;
+};
+
 struct GiftUpdate {
 	enum class Action : uchar {
 		Save,
 		Unsave,
 		Convert,
+		Transfer,
 		Delete,
+		Pin,
+		Unpin,
+		ResaleChange,
+		Upgraded,
 	};
 
-	FullMsgId itemId;
+	Data::SavedStarGiftId id;
+	QString slug;
 	Action action = {};
 };
+struct GiftsUpdate {
+	not_null<PeerData*> peer;
+	int collectionId = 0;
+	std::vector<Data::SavedStarGiftId> added;
+	std::vector<Data::SavedStarGiftId> removed;
+};
+struct GiftAuctionGot {
+	uint64 giftId = 0;
+	not_null<PeerData*> to;
+};
+
+struct SentToScheduled {
+	not_null<History*> history;
+	MsgId scheduledId = 0;
+};
+struct SentFromScheduled {
+	not_null<HistoryItem*> item;
+	MsgId sentId = 0;
+};
+
+struct RecentSelfForwards {
+	PeerId fromPeerId = 0;
+	MessageIdsList ids;
+};
+
+struct RecentJoinChat {
+	PeerId fromPeerId = 0;
+	PeerId joinedPeerId = 0;
+};
+
+struct DrawToReplyRequest {
+	FullMsgId messageId;
+	uint64 photoId = 0;
+	uint64 documentId = 0;
+};
+
+struct ReactionsRemoved {
+	not_null<PeerData*> peer;
+	MsgId msgId = 0;
+	not_null<PeerData*> participant;
+};
+
+struct RequestViewRepaint {
+	not_null<const HistoryView::Element*> view;
+	QRect rect;
+};
+
+struct ViewRemoval {
+	not_null<const HistoryView::Element*> view;
+	ViewRemovalReason reason = ViewRemovalReason::Removed;
+};
 
 class Session final {
 public:
@@ -105,14 +180,15 @@ class Session final {
 		return *_session;
 	}
 
-	[[nodiscard]] QString nameSortKey(const QString &name) const;
-
 	[[nodiscard]] Groups &groups() {
 		return _groups;
 	}
 	[[nodiscard]] const Groups &groups() const {
 		return _groups;
 	}
+	[[nodiscard]] AiComposeTones &aiComposeTones() const {
+		return *_aiComposeTones;
+	}
 	[[nodiscard]] ChatFilters &chatsFilters() const {
 		return *_chatsFilters;
 	}
@@ -155,6 +231,9 @@ class Session final {
 	[[nodiscard]] Stories &stories() const {
 		return *_stories;
 	}
+	[[nodiscard]] SavedMusic &savedMusic() const {
+		return *_savedMusic;
+	}
 	[[nodiscard]] SavedMessages &savedMessages() const {
 		return *_savedMessages;
 	}
@@ -217,22 +296,44 @@ class Session final {
 
 	void registerGroupCall(not_null<GroupCall*> call);
 	void unregisterGroupCall(not_null<GroupCall*> call);
-	GroupCall *groupCall(CallId callId) const;
+	[[nodiscard]] GroupCall *groupCall(CallId callId) const;
+
+	[[nodiscard]] std::shared_ptr<GroupCall> sharedConferenceCall(
+		CallId id,
+		uint64 accessHash);
+	[[nodiscard]] std::shared_ptr<GroupCall> sharedConferenceCallFind(
+		const MTPUpdates &response);
 
 	void watchForOffline(not_null<UserData*> user, TimeId now = 0);
 	void maybeStopWatchForOffline(not_null<UserData*> user);
 
+	void recordSharingDisabledTime(not_null<UserData*> user);
+	[[nodiscard]] bool sharingRecentlyDisabledByMe(
+		not_null<UserData*> user) const;
+	void clearSharingDisabledTime(not_null<UserData*> user);
+
 	[[nodiscard]] auto invitedToCallUsers(CallId callId) const
-		-> const base::flat_set<not_null<UserData*>> &;
+		-> const base::flat_map<not_null<UserData*>, bool> &;
 	void registerInvitedToCallUser(
 		CallId callId,
 		not_null<PeerData*> peer,
-		not_null<UserData*> user);
-	void unregisterInvitedToCallUser(CallId callId, not_null<UserData*> user);
+		not_null<UserData*> user,
+		bool calling);
+	void registerInvitedToCallUser(
+		CallId callId,
+		GroupCall *call,
+		not_null<UserData*> user,
+		bool calling);
+	void unregisterInvitedToCallUser(
+		CallId callId,
+		not_null<UserData*> user,
+		bool onlyStopCalling);
 
 	struct InviteToCall {
 		CallId id = 0;
 		not_null<UserData*> user;
+		bool calling = false;
+		bool removed = false;
 	};
 	[[nodiscard]] rpl::producer<InviteToCall> invitesToCalls() const {
 		return _invitesToCalls.events();
@@ -295,14 +396,28 @@ class Session final {
 	[[nodiscard]] rpl::producer<not_null<HistoryItem*>> newItemAdded() const;
 	void notifyGiftUpdate(GiftUpdate &&update);
 	[[nodiscard]] rpl::producer<GiftUpdate> giftUpdates() const;
-	void requestItemRepaint(not_null<const HistoryItem*> item);
+	void notifyGiftsUpdate(GiftsUpdate &&update);
+	[[nodiscard]] rpl::producer<GiftsUpdate> giftsUpdates() const;
+	void notifyGiftAuctionGot(GiftAuctionGot &&update);
+	[[nodiscard]] rpl::producer<GiftAuctionGot> giftAuctionGots() const;
+	void requestItemRepaint(not_null<const HistoryItem*> item, QRect r = QRect());
 	[[nodiscard]] rpl::producer<not_null<const HistoryItem*>> itemRepaintRequest() const;
-	void requestViewRepaint(not_null<const ViewElement*> view);
-	[[nodiscard]] rpl::producer<not_null<const ViewElement*>> viewRepaintRequest() const;
+	void requestDrawToReply(DrawToReplyRequest request);
+	[[nodiscard]] rpl::producer<DrawToReplyRequest> drawToReplyRequests() const;
+	void requestViewRepaint(not_null<const ViewElement*> view, QRect r = QRect());
+	[[nodiscard]] rpl::producer<RequestViewRepaint> viewRepaintRequest() const;
 	void requestItemResize(not_null<const HistoryItem*> item);
 	[[nodiscard]] rpl::producer<not_null<const HistoryItem*>> itemResizeRequest() const;
 	void requestViewResize(not_null<ViewElement*> view);
 	[[nodiscard]] rpl::producer<not_null<ViewElement*>> viewResizeRequest() const;
+	struct ViewHeightAdjusted {
+		not_null<ViewElement*> view;
+		int delta = 0;
+	};
+	void notifyViewHeightAdjusted(not_null<ViewElement*> view, int delta);
+	[[nodiscard]] rpl::producer<ViewHeightAdjusted> viewHeightAdjusted() const;
+	void requestItemShowHighlight(not_null<HistoryItem*> item);
+	[[nodiscard]] rpl::producer<not_null<HistoryItem*>> itemShowHighlightRequest() const;
 	void requestItemViewRefresh(not_null<const HistoryItem*> item);
 	[[nodiscard]] rpl::producer<not_null<const HistoryItem*>> itemViewRefreshRequest() const;
 	void requestItemTextRefresh(not_null<HistoryItem*> item);
@@ -311,10 +426,21 @@ class Session final {
 	[[nodiscard]] rpl::producer<not_null<const History*>> historyUnloaded() const;
 	void notifyItemDataChange(not_null<HistoryItem*> item);
 	[[nodiscard]] rpl::producer<not_null<HistoryItem*>> itemDataChanges() const;
+	void notifyReactionsRemoved(ReactionsRemoved update);
+	[[nodiscard]] rpl::producer<ReactionsRemoved> reactionsRemoved() const;
 
 	[[nodiscard]] rpl::producer<not_null<const HistoryItem*>> itemRemoved() const;
 	[[nodiscard]] rpl::producer<not_null<const HistoryItem*>> itemRemoved(
 		FullMsgId itemId) const;
+	[[nodiscard]] rpl::producer<> sessionDataAboutToBeCleared() const;
+	void notifyItemsAboutToBeDestroyed(
+		const std::vector<not_null<HistoryItem*>> &items);
+	[[nodiscard]] auto itemsAboutToBeDestroyed() const
+		-> rpl::producer<std::vector<not_null<HistoryItem*>>>;
+	void notifyViewAboutToBeRemoved(
+		not_null<const ViewElement*> view,
+		ViewRemovalReason reason);
+	[[nodiscard]] rpl::producer<ViewRemoval> viewAboutToBeRemoved() const;
 	void notifyViewRemoved(not_null<const ViewElement*> view);
 	[[nodiscard]] rpl::producer<not_null<const ViewElement*>> viewRemoved() const;
 	void notifyHistoryCleared(not_null<const History*> history);
@@ -323,11 +449,23 @@ class Session final {
 	[[nodiscard]] rpl::producer<not_null<History*>> historyChanged() const;
 	void notifyViewPaidReactionSent(not_null<const ViewElement*> view);
 	[[nodiscard]] rpl::producer<not_null<const ViewElement*>> viewPaidReactionSent() const;
+	void notifyCallPaidReactionSent(not_null<Calls::GroupCall*> call);
+	[[nodiscard]] rpl::producer<not_null<Calls::GroupCall*>> callPaidReactionSent() const;
 	void sendHistoryChangeNotifications();
 
 	void notifyPinnedDialogsOrderUpdated();
 	[[nodiscard]] rpl::producer<> pinnedDialogsOrderUpdated() const;
 
+	void nextForUpgradeGiftInvalidate(not_null<PeerData*> owner);
+	void nextForUpgradeGiftRequest(
+		not_null<PeerData*> owner,
+		Fn<void(std::optional<Data::SavedStarGift>)> done);
+
+	using CreditsSubsRebuilder = rpl::event_stream<CreditsStatusSlice>;
+	using CreditsSubsRebuilderPtr = std::shared_ptr<CreditsSubsRebuilder>;
+	[[nodiscard]] CreditsSubsRebuilderPtr createCreditsSubsRebuilder();
+	[[nodiscard]] CreditsSubsRebuilderPtr activeCreditsSubsRebuilder() const;
+
 	void registerRestricted(
 		not_null<const HistoryItem*> item,
 		const QString &reason);
@@ -376,6 +514,7 @@ class Session final {
 	void applyUpdate(const MTPDupdateChatParticipantAdd &update);
 	void applyUpdate(const MTPDupdateChatParticipantDelete &update);
 	void applyUpdate(const MTPDupdateChatParticipantAdmin &update);
+	void applyUpdate(const MTPDupdateChatParticipantRank &update);
 	void applyUpdate(const MTPDupdateChatDefaultBannedRights &update);
 
 	void applyDialogs(
@@ -409,7 +548,7 @@ class Session final {
 	[[nodiscard]] const std::vector<Dialogs::Key> &pinnedChatsOrder(
 		FilterId filterId) const;
 	[[nodiscard]] const std::vector<Dialogs::Key> &pinnedChatsOrder(
-		not_null<Data::SavedMessages*> saved) const;
+		not_null<SavedMessages*> saved) const;
 	void setChatPinned(Dialogs::Key key, FilterId filterId, bool pinned);
 	void setPinnedFromEntryList(Dialogs::Key key, bool pinned);
 	void clearPinnedChats(Folder *folder);
@@ -417,7 +556,7 @@ class Session final {
 		Folder *folder,
 		const QVector<MTPDialogPeer> &list);
 	void applyPinnedTopics(
-		not_null<Data::Forum*> forum,
+		not_null<Forum*> forum,
 		const QVector<MTPint> &list);
 	void reorderTwoPinnedChats(
 		FilterId filterId,
@@ -434,6 +573,10 @@ class Session final {
 	void registerMessageTTL(TimeId when, not_null<HistoryItem*> item);
 	void unregisterMessageTTL(TimeId when, not_null<HistoryItem*> item);
 
+	void registerFormattedDateUpdate(
+		TimeId when,
+		not_null<HistoryView::Element*> view);
+
 	// Returns true if item found and it is not detached.
 	bool updateExistingMessage(const MTPDmessage &data);
 	void updateEditedMessage(const MTPMessage &data);
@@ -451,6 +594,13 @@ class Session final {
 		PeerId peerId,
 		const QVector<MTPint> &data);
 
+	void removeReactionsFromParticipant(
+		not_null<PeerData*> peer,
+		MsgId msgId,
+		not_null<PeerData*> participant,
+		const ReactionId &reaction,
+		MsgId originMsgId);
+
 	[[nodiscard]] MsgId nextLocalMessageId();
 	[[nodiscard]] HistoryItem *message(
 		PeerId peerId,
@@ -492,6 +642,7 @@ class Session final {
 	void requestDocumentViewRepaint(not_null<const DocumentData*> document);
 	void markMediaRead(not_null<const DocumentData*> document);
 	void requestPollViewRepaint(not_null<const PollData*> poll);
+	void requestTodoListViewRepaint(not_null<const TodoListData*> todolist);
 
 	void photoLoadProgress(not_null<PhotoData*> photo);
 	void photoLoadDone(not_null<PhotoData*> photo);
@@ -501,6 +652,10 @@ class Session final {
 	void documentLoadDone(not_null<DocumentData*> document);
 	void documentLoadFail(not_null<DocumentData*> document, bool started);
 
+	[[nodiscard]] auto photoLoadProgress() const
+	-> rpl::producer<not_null<PhotoData*>> {
+		return _photoLoadProgress.events();
+	}
 	[[nodiscard]] auto documentLoadProgress() const
 	-> rpl::producer<not_null<DocumentData*>> {
 		return _documentLoadProgress.events();
@@ -517,7 +672,9 @@ class Session final {
 		NewMessageType type);
 
 	[[nodiscard]] int unreadBadge() const;
+	[[nodiscard]] int unreadWithMentionsBadge() const;
 	[[nodiscard]] bool unreadBadgeMuted() const;
+	[[nodiscard]] bool unreadWithMentionsBadgeMuted() const;
 	[[nodiscard]] int unreadBadgeIgnoreOne(Dialogs::Key key) const;
 	[[nodiscard]] bool unreadBadgeMutedIgnoreOne(Dialogs::Key key) const;
 	[[nodiscard]] int unreadOnlyMutedBadge() const;
@@ -528,6 +685,10 @@ class Session final {
 	[[nodiscard]] auto repliesReadTillUpdates() const
 		-> rpl::producer<RepliesReadTillUpdate>;
 
+	void updateSublistReadTill(SublistReadTillUpdate update);
+	[[nodiscard]] auto sublistReadTillUpdates() const
+		-> rpl::producer<SublistReadTillUpdate>;
+
 	void selfDestructIn(not_null<HistoryItem*> item, crl::time delay);
 
 	[[nodiscard]] not_null<PhotoData*> photo(PhotoId id);
@@ -558,8 +719,12 @@ class Session final {
 		const ImageLocation &thumbnailLocation);
 
 	[[nodiscard]] not_null<DocumentData*> document(DocumentId id);
-	not_null<DocumentData*> processDocument(const MTPDocument &data);
-	not_null<DocumentData*> processDocument(const MTPDdocument &data);
+	not_null<DocumentData*> processDocument(
+		const MTPDocument &data,
+		const MTPVector<MTPDocument> *qualities = nullptr);
+	not_null<DocumentData*> processDocument(
+		const MTPDdocument &data,
+		const MTPVector<MTPDocument> *qualities = nullptr);
 	not_null<DocumentData*> processDocument(
 		const MTPdocument &data,
 		const ImageWithLocation &thumbnail);
@@ -593,7 +758,9 @@ class Session final {
 	[[nodiscard]] not_null<WebPageData*> webpage(
 		WebPageId id,
 		const QString &siteName,
-		const TextWithEntities &content);
+		const TextWithEntities &content,
+		PhotoData *photo = nullptr,
+		DocumentData *document = nullptr);
 	[[nodiscard]] not_null<WebPageData*> webpage(
 		WebPageId id,
 		WebPageType type,
@@ -607,9 +774,11 @@ class Session final {
 		WebPageCollage &&collage,
 		std::unique_ptr<Iv::Data> iv,
 		std::unique_ptr<WebPageStickerSet> stickerSet,
+		std::shared_ptr<UniqueGift> uniqueGift,
 		int duration,
 		const QString &author,
 		bool hasLargeMedia,
+		bool photoIsVideoCover,
 		TimeId pendingTill);
 
 	[[nodiscard]] not_null<GameData*> game(GameId id);
@@ -633,9 +802,23 @@ class Session final {
 		const MTPBotApp &data);
 
 	[[nodiscard]] not_null<PollData*> poll(PollId id);
+	[[nodiscard]] HistoryItem *findItemForPoll(PollId id) const;
+	[[nodiscard]] std::vector<not_null<PeerData*>> pollRecentVoters(
+		PollId id) const;
 	not_null<PollData*> processPoll(const MTPPoll &data);
 	not_null<PollData*> processPoll(const MTPDmessageMediaPoll &data);
 
+	[[nodiscard]] not_null<TodoListData*> todoList(TodoListId id);
+	not_null<TodoListData*> processTodoList(
+		TodoListId id,
+		const MTPTodoList &todolist);
+	not_null<TodoListData*> processTodoList(
+		TodoListId id,
+		const MTPDmessageMediaToDo &data);
+	[[nodiscard]] not_null<TodoListData*> duplicateTodoList(
+		TodoListId id,
+		not_null<TodoListData*> existing);
+
 	[[nodiscard]] not_null<CloudImage*> location(
 		const LocationPoint &point);
 
@@ -675,6 +858,12 @@ class Session final {
 	void unregisterPollView(
 		not_null<const PollData*> poll,
 		not_null<ViewElement*> view);
+	void registerTodoListView(
+		not_null<const TodoListData*> todolist,
+		not_null<ViewElement*> view);
+	void unregisterTodoListView(
+		not_null<const TodoListData*> todolist,
+		not_null<ViewElement*> view);
 	void registerContactView(
 		UserId contactId,
 		not_null<ViewElement*> view);
@@ -704,9 +893,11 @@ class Session final {
 	void notifyWebPageUpdateDelayed(not_null<WebPageData*> page);
 	void notifyGameUpdateDelayed(not_null<GameData*> game);
 	void notifyPollUpdateDelayed(not_null<PollData*> poll);
-	[[nodiscard]] bool hasPendingWebPageGamePollNotification() const;
-	void sendWebPageGamePollNotifications();
+	void notifyTodoListUpdateDelayed(not_null<TodoListData*> todolist);
+	[[nodiscard]] bool hasPendingWebPageGamePollTodoListNotification() const;
+	void sendWebPageGamePollTodoListNotifications();
 	[[nodiscard]] rpl::producer<not_null<WebPageData*>> webPageUpdates() const;
+	[[nodiscard]] rpl::producer<not_null<PollData*>> pollUpdates() const;
 
 	void channelDifferenceTooLong(not_null<ChannelData*> channel);
 	[[nodiscard]] rpl::producer<not_null<ChannelData*>> channelDifferenceTooLong() const;
@@ -740,6 +931,7 @@ class Session final {
 	};
 	void refreshChatListEntry(Dialogs::Key key);
 	void removeChatListEntry(Dialogs::Key key);
+	void refreshChatListUnreadOnTop();
 	[[nodiscard]] auto chatListEntryRefreshes() const
 		-> rpl::producer<ChatListEntryRefresh>;
 
@@ -758,11 +950,6 @@ class Session final {
 	void setMimeForwardIds(MessageIdsList &&list);
 	MessageIdsList takeMimeForwardIds();
 
-	void setTopPromoted(
-		History *promoted,
-		const QString &type,
-		const QString &message);
-
 	bool updateWallpapers(const MTPaccount_WallPapers &data);
 	void removeWallpaper(const WallPaper &paper);
 	const std::vector<WallPaper> &wallpapers() const;
@@ -774,6 +961,14 @@ class Session final {
 	void webViewResultSent(WebViewResultSent &&sent);
 	[[nodiscard]] rpl::producer<WebViewResultSent> webViewResultSent() const;
 
+	struct JoinChatWebViewDecision {
+		PeerId peerId;
+		uint64 queryId = 0;
+		MTPJoinChatBotResult result;
+	};
+	void joinChatWebViewDecision(JoinChatWebViewDecision &&decision);
+	[[nodiscard]] rpl::producer<JoinChatWebViewDecision> joinChatWebViewDecision() const;
+
 	void saveViewAsMessages(not_null<Forum*> forum, bool viewAsMessages);
 
 	[[nodiscard]] auto peerDecorationsUpdated() const
@@ -787,11 +982,44 @@ class Session final {
 		std::vector<ReactionId> &&was,
 		std::vector<ReactionId> &&now);
 
+	void sentToScheduled(SentToScheduled value);
+	[[nodiscard]] rpl::producer<SentToScheduled> sentToScheduled() const;
+	void sentFromScheduled(SentFromScheduled value);
+	[[nodiscard]] rpl::producer<SentFromScheduled> sentFromScheduled() const;
+
+	void editStarsPerMessage(not_null<ChannelData*> channel, int count);
+	[[nodiscard]] int commonStarsPerMessage(
+		not_null<const ChannelData*> channel) const;
+
+	void setPendingStarsRating(StarsRatingPending value);
+	[[nodiscard]] StarsRatingPending pendingStarsRating() const;
+
+	void addRecentSelfForwards(const RecentSelfForwards &data);
+	[[nodiscard]] rpl::producer<RecentSelfForwards> recentSelfForwards() const;
+
+	void addRecentJoinChat(const RecentJoinChat &data);
+	[[nodiscard]] rpl::producer<RecentJoinChat> recentJoinChat() const;
+
 	void clearLocalStorage();
 
+	void fillMessagePeers(PeerId peerId, const MTPMessage &message);
+	void fillMessagePeers(const MTPDupdateShortMessage &data);
+	void fillMessagePeers(const MTPDupdateShortChatMessage &data);
+	void fillMessagePeers(
+		FullMsgId fullId,
+		const MTPDupdateShortSentMessage &data);
+	[[nodiscard]] HistoryItem *messageWithPeer(PeerId id) const;
+
 private:
 	using Messages = std::unordered_map<MsgId, not_null<HistoryItem*>>;
 
+	struct NextToUpgradeGift {
+		std::optional<Data::SavedStarGift> gift;
+		Fn<void(std::optional<Data::SavedStarGift>)> done;
+		crl::time received = 0;
+		mtpRequestId requestId = 0;
+	};
+
 	void suggestStartExport();
 
 	void setupMigrationViewer();
@@ -805,6 +1033,9 @@ class Session final {
 	void scheduleNextTTLs();
 	void checkTTLs();
 
+	void scheduleNextFormattedDateUpdate();
+	void checkFormattedDateUpdates();
+
 	int computeUnreadBadge(const Dialogs::UnreadState &state) const;
 	bool computeUnreadBadgeMuted(const Dialogs::UnreadState &state) const;
 
@@ -886,9 +1117,13 @@ class Session final {
 		WebPageCollage &&collage,
 		std::unique_ptr<Iv::Data> iv,
 		std::unique_ptr<WebPageStickerSet> stickerSet,
+		std::shared_ptr<UniqueGift> uniqueGift,
+		std::unique_ptr<WebPageAuction> auction,
+		DocumentId composeToneEmojiId,
 		int duration,
 		const QString &author,
 		bool hasLargeMedia,
+		bool photoIsVideoCover,
 		TimeId pendingTill);
 
 	void gameApplyFields(
@@ -917,15 +1152,27 @@ class Session final {
 	void setWallpapers(const QVector<MTPWallPaper> &data, uint64 hash);
 	void highlightProcessDone(uint64 processId);
 
+	void applyMonoforumLinkedId(
+		not_null<ChannelData*> channel,
+		ChannelId linkedId);
+
 	void checkPollsClosings();
 
+	void fillMessagePeer(FullMsgId fullId, PeerId peerId);
+	void fillForwardedInfo(
+		FullMsgId fullId,
+		const MTPMessageFwdHeader &header);
+	void fillMentionUsers(
+		FullMsgId fullId,
+		const MTPVector<MTPMessageEntity> &entities);
+
 	const not_null<Main::Session*> _session;
 
 	Storage::DatabasePointer _cache;
 	Storage::DatabasePointer _bigFileCache;
 
 	TimeId _exportAvailableAt = 0;
-	QPointer<Ui::BoxContent> _exportSuggestion;
+	base::weak_qptr<Ui::BoxContent> _exportSuggestion;
 
 	rpl::variable<bool> _contactsLoaded = false;
 	rpl::variable<int> _groupFreeTranscribeLevel;
@@ -939,16 +1186,26 @@ class Session final {
 	rpl::event_stream<not_null<const ViewElement*>> _viewLayoutChanges;
 	rpl::event_stream<not_null<HistoryItem*>> _newItemAdded;
 	rpl::event_stream<GiftUpdate> _giftUpdates;
+	rpl::event_stream<GiftsUpdate> _giftsUpdates;
+	rpl::event_stream<GiftAuctionGot> _giftAuctionGots;
 	rpl::event_stream<not_null<const HistoryItem*>> _itemRepaintRequest;
-	rpl::event_stream<not_null<const ViewElement*>> _viewRepaintRequest;
+	rpl::event_stream<RequestViewRepaint> _viewRepaintRequest;
 	rpl::event_stream<not_null<const HistoryItem*>> _itemResizeRequest;
 	rpl::event_stream<not_null<ViewElement*>> _viewResizeRequest;
+	rpl::event_stream<ViewHeightAdjusted> _viewHeightAdjusted;
+	rpl::event_stream<not_null<HistoryItem*>> _itemShowHighlightRequest;
 	rpl::event_stream<not_null<const HistoryItem*>> _itemViewRefreshRequest;
 	rpl::event_stream<not_null<HistoryItem*>> _itemTextRefreshRequest;
+	rpl::event_stream<DrawToReplyRequest> _drawToReplyRequests;
 	rpl::event_stream<not_null<HistoryItem*>> _itemDataChanges;
+	rpl::event_stream<ReactionsRemoved> _reactionsRemoved;
 	rpl::event_stream<not_null<const HistoryItem*>> _itemRemoved;
+	rpl::event_stream<> _sessionDataAboutToBeCleared;
+	rpl::event_stream<std::vector<not_null<HistoryItem*>>> _itemsAboutToBeDestroyed;
+	rpl::event_stream<ViewRemoval> _viewAboutToBeRemoved;
 	rpl::event_stream<not_null<const ViewElement*>> _viewRemoved;
 	rpl::event_stream<not_null<const ViewElement*>> _viewPaidReactionSent;
+	rpl::event_stream<not_null<Calls::GroupCall*>> _callPaidReactionSent;
 	rpl::event_stream<not_null<const History*>> _historyUnloaded;
 	rpl::event_stream<not_null<const History*>> _historyCleared;
 	base::flat_set<not_null<History*>> _historiesChanged;
@@ -959,6 +1216,9 @@ class Session final {
 	rpl::event_stream<ChatListEntryRefresh> _chatListEntryRefreshes;
 	rpl::event_stream<> _unreadBadgeChanges;
 	rpl::event_stream<RepliesReadTillUpdate> _repliesReadTillUpdates;
+	rpl::event_stream<SublistReadTillUpdate> _sublistReadTillUpdates;
+	rpl::event_stream<SentToScheduled> _sentToScheduled;
+	rpl::event_stream<SentFromScheduled> _sentFromScheduled;
 
 	Dialogs::MainList _chatsList;
 	Dialogs::IndexedList _contactsList;
@@ -972,6 +1232,9 @@ class Session final {
 	std::map<TimeId, base::flat_set<not_null<HistoryItem*>>> _ttlMessages;
 	base::Timer _ttlCheckTimer;
 
+	std::map<TimeId, std::vector<base::weak_ptr<HistoryView::Element>>> _formattedDateUpdates;
+	base::Timer _formattedDateTimer;
+
 	std::unordered_map<MsgId, not_null<HistoryItem*>> _nonChannelMessages;
 
 	base::flat_map<uint64, FullMsgId> _messageByRandomId;
@@ -1007,6 +1270,9 @@ class Session final {
 	std::unordered_map<
 		PollId,
 		std::unique_ptr<PollData>> _polls;
+	std::map<
+		TodoListId,
+		std::unique_ptr<TodoListData>> _todoLists;
 	std::unordered_map<
 		GameId,
 		std::unique_ptr<GameData>> _games;
@@ -1019,6 +1285,9 @@ class Session final {
 	std::unordered_map<
 		not_null<const PollData*>,
 		base::flat_set<not_null<ViewElement*>>> _pollViews;
+	std::unordered_map<
+		not_null<const TodoListData*>,
+		base::flat_set<not_null<ViewElement*>>> _todoListViews;
 	std::unordered_map<
 		UserId,
 		base::flat_set<not_null<HistoryItem*>>> _contactItems;
@@ -1035,9 +1304,12 @@ class Session final {
 	base::flat_set<not_null<WebPageData*>> _webpagesUpdated;
 	base::flat_set<not_null<GameData*>> _gamesUpdated;
 	base::flat_set<not_null<PollData*>> _pollsUpdated;
+	base::flat_set<not_null<TodoListData*>> _todoListsUpdated;
 
 	rpl::event_stream<not_null<WebPageData*>> _webpageUpdates;
+	rpl::event_stream<not_null<PollData*>> _pollUpdates;
 	rpl::event_stream<not_null<ChannelData*>> _channelDifferenceTooLong;
+	rpl::event_stream<not_null<PhotoData*>> _photoLoadProgress;
 	rpl::event_stream<not_null<DocumentData*>> _documentLoadProgress;
 	base::flat_set<not_null<ChannelData*>> _suggestToGigagroup;
 
@@ -1058,23 +1330,31 @@ class Session final {
 
 	base::flat_set<not_null<ViewElement*>> _heavyViewParts;
 
-	base::flat_map<uint64, not_null<GroupCall*>> _groupCalls;
+	base::flat_map<CallId, not_null<GroupCall*>> _groupCalls;
+	base::flat_map<CallId, std::weak_ptr<GroupCall>> _conferenceCalls;
 	rpl::event_stream<InviteToCall> _invitesToCalls;
 	base::flat_map<
-		uint64,
-		base::flat_set<not_null<UserData*>>> _invitedToCallUsers;
+		CallId,
+		base::flat_map<not_null<UserData*>, bool>> _invitedToCallUsers;
 
 	base::flat_set<not_null<ViewElement*>> _shownSpoilers;
 	base::flat_map<
 		ReactionId,
 		base::flat_set<not_null<ViewElement*>>> _viewsByTag;
 
-	History *_topPromoted = nullptr;
-
 	std::unordered_map<PeerId, std::unique_ptr<PeerData>> _peers;
 
+	std::optional<base::flat_map<
+		not_null<ChannelData*>,
+		ChannelId>> _postponedMonoforumLinkedIds;
+
+	// This one from `channel`, not `channelFull`.
+	base::flat_map<not_null<const ChannelData*>, int> _commonStarsPerMessage;
+
 	MessageIdsList _mimeForwardIds;
 
+	std::weak_ptr<CreditsSubsRebuilder> _creditsSubsRebuilder;
+
 	using CredentialsWithGeneration = std::pair<
 		const Passport::SavedCredentials,
 		int>;
@@ -1085,17 +1365,22 @@ class Session final {
 
 	base::flat_map<not_null<UserData*>, TimeId> _watchingForOffline;
 	base::Timer _watchForOfflineTimer;
+	base::flat_map<not_null<UserData*>, TimeId> _sharingDisabledTimes;
 
 	base::flat_map<not_null<PeerData*>, MTP::DcId> _peerStatsDcIds;
 
 	rpl::event_stream<WebViewResultSent> _webViewResultSent;
+	rpl::event_stream<JoinChatWebViewDecision> _joinChatWebViewDecision;
 
 	rpl::event_stream<not_null<PeerData*>> _peerDecorationsUpdated;
 	base::flat_map<
 		not_null<ChannelData*>,
 		mtpRequestId> _viewAsMessagesRequests;
 
+	mutable base::flat_map<PeerId, std::vector<FullMsgId>> _messagesWithPeer;
+
 	Groups _groups;
+	const std::unique_ptr<AiComposeTones> _aiComposeTones;
 	const std::unique_ptr<ChatFilters> _chatsFilters;
 	const std::unique_ptr<CloudThemes> _cloudThemes;
 	const std::unique_ptr<SendActionManager> _sendActionManager;
@@ -1109,6 +1394,7 @@ class Session final {
 	const std::unique_ptr<NotifySettings> _notifySettings;
 	const std::unique_ptr<CustomEmojiManager> _customEmojiManager;
 	const std::unique_ptr<Stories> _stories;
+	const std::unique_ptr<SavedMusic> _savedMusic;
 	const std::unique_ptr<SavedMessages> _savedMessages;
 	const std::unique_ptr<Chatbots> _chatbots;
 	const std::unique_ptr<BusinessInfo> _businessInfo;
@@ -1116,6 +1402,15 @@ class Session final {
 
 	MsgId _nonHistoryEntryId = ShortcutMaxMsgId;
 
+	std::unique_ptr<StarsRatingPending> _pendingStarsRating;
+
+	base::flat_map<
+		not_null<PeerData*>,
+		NextToUpgradeGift> _nextForUpgradeGifts;
+
+	rpl::event_stream<RecentSelfForwards> _recentSelfForwards;
+	rpl::event_stream<RecentJoinChat> _recentJoinChat;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/data/data_shared_media.cpp b/Telegram/SourceFiles/data/data_shared_media.cpp
index 6834190bf70a92..f3ea8a5dc8a18c 100644
--- a/Telegram/SourceFiles/data/data_shared_media.cpp
+++ b/Telegram/SourceFiles/data/data_shared_media.cpp
@@ -7,18 +7,18 @@ For license and copyright information please follow this link:
 */
 #include "data/data_shared_media.h"
 
-#include <rpl/combine.h>
-#include "main/main_session.h"
 #include "apiwrap.h"
-#include "storage/storage_facade.h"
-#include "history/history.h"
-#include "history/history_item.h"
+#include "core/crash_reports.h"
 #include "data/components/scheduled_messages.h"
 #include "data/data_document.h"
 #include "data/data_media_types.h"
 #include "data/data_photo.h"
+#include "data/data_saved_music.h"
 #include "data/data_session.h"
-#include "core/crash_reports.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "main/main_session.h"
+#include "storage/storage_facade.h"
 
 namespace {
 
@@ -66,7 +66,7 @@ bool IsItemGoodForType(const not_null<HistoryItem*> item, Type type) {
 		|| ((videoType || photoVideoType) && videoDoc)
 		|| (fileType && (document->isTheme()
 			|| document->isImage()
-			|| !document->canBeStreamed(item)));
+			|| !document->canBeStreamed()));
 }
 
 } // namespace
@@ -79,7 +79,8 @@ std::optional<Storage::SharedMediaType> SharedMediaOverviewType(
 	case Type::MusicFile:
 	case Type::File:
 	case Type::RoundVoiceFile:
-	case Type::Link: return type;
+	case Type::Link:
+	case Type::Poll: return type;
 	}
 	return std::nullopt;
 }
@@ -88,7 +89,8 @@ bool SharedMediaAllowSearch(Storage::SharedMediaType type) {
 	switch (type) {
 	case Type::MusicFile:
 	case Type::File:
-	case Type::Link: return true;
+	case Type::Link:
+	case Type::Poll: return true;
 	default: return false;
 	}
 }
@@ -110,17 +112,19 @@ rpl::producer<SparseIdsSlice> SharedMediaViewer(
 		auto requestMediaAround = [
 			peer = session->data().peer(key.peerId),
 			topicRootId = key.topicRootId,
+			monoforumPeerId = key.monoforumPeerId,
 			type = key.type
 		](const SparseIdsSliceBuilder::AroundData &data) {
 			peer->session().api().requestSharedMedia(
 				peer,
 				topicRootId,
+				monoforumPeerId,
 				type,
 				data.aroundId,
 				data.direction);
 		};
 		builder->insufficientAround(
-		) | rpl::start_with_next(requestMediaAround, lifetime);
+		) | rpl::on_next(requestMediaAround, lifetime);
 
 		auto pushNextSnapshot = [=] {
 			consumer.put_next(builder->snapshot());
@@ -131,10 +135,11 @@ rpl::producer<SparseIdsSlice> SharedMediaViewer(
 		) | rpl::filter([=](const SliceUpdate &update) {
 			return (update.peerId == key.peerId)
 				&& (update.topicRootId == key.topicRootId)
+				&& (update.monoforumPeerId == key.monoforumPeerId)
 				&& (update.type == key.type);
 		}) | rpl::filter([=](const SliceUpdate &update) {
 			return builder->applyUpdate(update.data);
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		using OneRemoved = Storage::SharedMediaRemoveOne;
 		session->storage().sharedMediaOneRemoved(
@@ -143,7 +148,7 @@ rpl::producer<SparseIdsSlice> SharedMediaViewer(
 				&& update.types.test(key.type);
 		}) | rpl::filter([=](const OneRemoved &update) {
 			return builder->removeOne(update.messageId);
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		using AllRemoved = Storage::SharedMediaRemoveAll;
 		session->storage().sharedMediaAllRemoved(
@@ -151,10 +156,12 @@ rpl::producer<SparseIdsSlice> SharedMediaViewer(
 			return (update.peerId == key.peerId)
 				&& (!update.topicRootId
 					|| update.topicRootId == key.topicRootId)
+				&& (!update.monoforumPeerId
+					|| update.monoforumPeerId == key.monoforumPeerId)
 				&& update.types.test(key.type);
 		}) | rpl::filter([=] {
 			return builder->removeAll();
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		using InvalidateBottom = Storage::SharedMediaInvalidateBottom;
 		session->storage().sharedMediaBottomInvalidated(
@@ -162,7 +169,7 @@ rpl::producer<SparseIdsSlice> SharedMediaViewer(
 			return (update.peerId == key.peerId);
 		}) | rpl::filter([=] {
 			return builder->invalidateBottom();
-		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
+		}) | rpl::on_next(pushNextSnapshot, lifetime);
 
 		using Result = Storage::SharedMediaResult;
 		session->storage().query(Storage::SharedMediaQuery(
@@ -171,7 +178,7 @@ rpl::producer<SparseIdsSlice> SharedMediaViewer(
 			limitAfter
 		)) | rpl::filter([=](const Result &result) {
 			return builder->applyInitial(result);
-		}) | rpl::start_with_next_done(
+		}) | rpl::on_next_done(
 			pushNextSnapshot,
 			[=] { builder->checkInsufficient(); },
 			lifetime);
@@ -228,6 +235,39 @@ rpl::producer<SparseIdsMergedSlice> SharedScheduledMediaViewer(
 	});
 }
 
+rpl::producer<SparseIdsMergedSlice> SavedMusicMediaViewer(
+		not_null<Main::Session*> session,
+		SharedMediaMergedKey key,
+		int limitBefore,
+		int limitAfter) {
+	Expects((key.mergedKey.universalId != 0)
+		|| (limitBefore == 0 && limitAfter == 0));
+
+	const auto peerId = key.mergedKey.peerId;
+	const auto item = key.mergedKey.universalId
+		? session->data().message(peerId, key.mergedKey.universalId)
+		: nullptr;
+
+	return Data::SavedMusicList(
+		session->data().peer(peerId),
+		item,
+		std::max(limitBefore, limitAfter)
+	) | rpl::map([=](const Data::SavedMusicSlice &slice) {
+		auto list = std::vector<MsgId>();
+		list.reserve(slice.size());
+		for (auto i = 0, count = int(slice.size()); i != count; ++i) {
+			list.push_back(slice[i]->id);
+		}
+		return SparseIdsMergedSlice(
+			key.mergedKey,
+			SparseUnsortedIdsSlice(
+				std::move(list),
+				slice.fullCount(),
+				slice.skippedBefore(),
+				slice.skippedAfter()));
+	});
+}
+
 rpl::producer<SparseIdsMergedSlice> SharedMediaMergedViewer(
 		not_null<Main::Session*> session,
 		SharedMediaMergedKey key,
@@ -236,6 +276,7 @@ rpl::producer<SparseIdsMergedSlice> SharedMediaMergedViewer(
 	auto createSimpleViewer = [=](
 			PeerId peerId,
 			MsgId topicRootId,
+			PeerId monoforumPeerId,
 			SparseIdsSlice::Key simpleKey,
 			int limitBefore,
 			int limitAfter) {
@@ -244,6 +285,7 @@ rpl::producer<SparseIdsMergedSlice> SharedMediaMergedViewer(
 			Storage::SharedMediaKey(
 				peerId,
 				topicRootId,
+				monoforumPeerId,
 				key.type,
 				simpleKey),
 			limitBefore,
@@ -461,7 +503,7 @@ rpl::producer<SharedMediaWithLastSlice> SharedMediaWithLastViewer(
 				std::move(viewerKey),
 				limitBefore,
 				limitAfter
-			) | rpl::start_with_next([=](SparseIdsMergedSlice &&update) {
+			) | rpl::on_next([=](SparseIdsMergedSlice &&update) {
 				consumer.put_next(SharedMediaWithLastSlice(
 					session,
 					key,
@@ -476,7 +518,20 @@ rpl::producer<SharedMediaWithLastSlice> SharedMediaWithLastViewer(
 				std::move(viewerKey),
 				limitBefore,
 				limitAfter
-			) | rpl::start_with_next([=](SparseIdsMergedSlice &&update) {
+			) | rpl::on_next([=](SparseIdsMergedSlice &&update) {
+				consumer.put_next(SharedMediaWithLastSlice(
+					session,
+					key,
+					std::move(update),
+					std::nullopt));
+			});
+		} else if (key.topicRootId == SharedMediaWithLastSlice::kSavedMusicTopicId) {
+			return SavedMusicMediaViewer(
+				session,
+				std::move(viewerKey),
+				limitBefore,
+				limitAfter
+			) | rpl::on_next([=](SparseIdsMergedSlice &&update) {
 				consumer.put_next(SharedMediaWithLastSlice(
 					session,
 					key,
@@ -497,7 +552,7 @@ rpl::producer<SharedMediaWithLastSlice> SharedMediaWithLastViewer(
 					key.type),
 				1,
 				1)
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				SparseIdsMergedSlice &&viewer,
 				SparseIdsMergedSlice &&ending) {
 			consumer.put_next(SharedMediaWithLastSlice(
diff --git a/Telegram/SourceFiles/data/data_shared_media.h b/Telegram/SourceFiles/data/data_shared_media.h
index d9d2d8c63ffb96..cb01f14f46b696 100644
--- a/Telegram/SourceFiles/data/data_shared_media.h
+++ b/Telegram/SourceFiles/data/data_shared_media.h
@@ -52,6 +52,12 @@ rpl::producer<SparseIdsMergedSlice> SharedScheduledMediaViewer(
 	int limitBefore,
 	int limitAfter);
 
+rpl::producer<SparseIdsMergedSlice> SavedMusicMediaViewer(
+	not_null<Main::Session*> session,
+	SharedMediaMergedKey key,
+	int limitBefore,
+	int limitAfter);
+
 rpl::producer<SparseIdsMergedSlice> SharedMediaMergedViewer(
 	not_null<Main::Session*> session,
 	SharedMediaMergedKey key,
@@ -70,15 +76,19 @@ class SharedMediaWithLastSlice {
 
 	static constexpr auto kScheduledTopicId
 		= SparseIdsMergedSlice::kScheduledTopicId;
+	static constexpr auto kSavedMusicTopicId
+		= SparseIdsMergedSlice::kSavedMusicTopicId;
 	struct Key {
 		Key(
 			PeerId peerId,
 			MsgId topicRootId,
+			PeerId monoforumPeerId,
 			PeerId migratedPeerId,
 			Type type,
 			UniversalMsgId universalId)
 		: peerId(peerId)
 		, topicRootId(topicRootId)
+		, monoforumPeerId(monoforumPeerId)
 		, migratedPeerId(migratedPeerId)
 		, type(type)
 		, universalId(universalId) {
@@ -91,6 +101,7 @@ class SharedMediaWithLastSlice {
 
 		PeerId peerId = 0;
 		MsgId topicRootId = 0;
+		PeerId monoforumPeerId = 0;
 		PeerId migratedPeerId = 0;
 		Type type = Type::kCount;
 		UniversalMsgId universalId;
@@ -120,6 +131,7 @@ class SharedMediaWithLastSlice {
 		return {
 			key.peerId,
 			key.topicRootId,
+			key.monoforumPeerId,
 			key.migratedPeerId,
 			v::is<MessageId>(key.universalId)
 				? v::get<MessageId>(key.universalId)
@@ -130,6 +142,7 @@ class SharedMediaWithLastSlice {
 		return {
 			key.peerId,
 			key.topicRootId,
+			key.monoforumPeerId,
 			key.migratedPeerId,
 			ServerMaxMsgId - 1
 		};
diff --git a/Telegram/SourceFiles/data/data_sparse_ids.cpp b/Telegram/SourceFiles/data/data_sparse_ids.cpp
index b48881ca3abe5e..1f11a042429402 100644
--- a/Telegram/SourceFiles/data/data_sparse_ids.cpp
+++ b/Telegram/SourceFiles/data/data_sparse_ids.cpp
@@ -377,7 +377,10 @@ rpl::producer<SparseIdsMergedSlice> SparseIdsMergedSlice::CreateViewer(
 		int limitBefore,
 		int limitAfter,
 		Fn<SimpleViewerFunction> simpleViewer) {
-	Expects(!key.topicRootId || !key.migratedPeerId);
+	Expects(!key.topicRootId
+		|| (!key.monoforumPeerId && !key.migratedPeerId));
+	Expects(!key.monoforumPeerId
+		|| (!key.topicRootId && !key.migratedPeerId));
 	Expects(IsServerMsgId(key.universalId)
 		|| (key.universalId == 0)
 		|| (IsServerMsgId(ServerMaxMsgId + key.universalId) && key.migratedPeerId != 0));
@@ -388,6 +391,7 @@ rpl::producer<SparseIdsMergedSlice> SparseIdsMergedSlice::CreateViewer(
 		auto partViewer = simpleViewer(
 			key.peerId,
 			key.topicRootId,
+			key.monoforumPeerId,
 			SparseIdsMergedSlice::PartKey(key),
 			limitBefore,
 			limitAfter
@@ -395,7 +399,7 @@ rpl::producer<SparseIdsMergedSlice> SparseIdsMergedSlice::CreateViewer(
 		if (!key.migratedPeerId) {
 			return std::move(
 				partViewer
-			) | rpl::start_with_next([=](SparseIdsSlice &&part) {
+			) | rpl::on_next([=](SparseIdsSlice &&part) {
 				consumer.put_next(SparseIdsMergedSlice(
 					key,
 					std::move(part),
@@ -405,13 +409,14 @@ rpl::producer<SparseIdsMergedSlice> SparseIdsMergedSlice::CreateViewer(
 		auto migratedViewer = simpleViewer(
 			key.migratedPeerId,
 			MsgId(0), // topicRootId
+			PeerId(0), // monoforumPeerId
 			SparseIdsMergedSlice::MigratedKey(key),
 			limitBefore,
 			limitAfter);
 		return rpl::combine(
 			std::move(partViewer),
 			std::move(migratedViewer)
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				SparseIdsSlice &&part,
 				SparseIdsSlice &&migrated) {
 			consumer.put_next(SparseIdsMergedSlice(
diff --git a/Telegram/SourceFiles/data/data_sparse_ids.h b/Telegram/SourceFiles/data/data_sparse_ids.h
index 6b762e2dbe74d9..10dbe9037e3221 100644
--- a/Telegram/SourceFiles/data/data_sparse_ids.h
+++ b/Telegram/SourceFiles/data/data_sparse_ids.h
@@ -28,16 +28,19 @@ class SparseIdsMergedSlice {
 public:
 	using UniversalMsgId = MsgId;
 	static constexpr MsgId kScheduledTopicId = ScheduledMaxMsgId;
+	static constexpr MsgId kSavedMusicTopicId = ScheduledMaxMsgId + 1;
 
 	struct Key {
 		Key(
 			PeerId peerId,
 			MsgId topicRootId,
+			PeerId monoforumPeerId,
 			PeerId migratedPeerId,
 			UniversalMsgId universalId)
 		: peerId(peerId)
 		, topicRootId(topicRootId)
-		, migratedPeerId(topicRootId ? 0 : migratedPeerId)
+		, monoforumPeerId(monoforumPeerId)
+		, migratedPeerId((topicRootId || monoforumPeerId) ? 0 : migratedPeerId)
 		, universalId(universalId) {
 		}
 
@@ -47,6 +50,7 @@ class SparseIdsMergedSlice {
 
 		PeerId peerId = 0;
 		MsgId topicRootId = 0;
+		PeerId monoforumPeerId = 0;
 		PeerId migratedPeerId = 0;
 		UniversalMsgId universalId = 0;
 	};
@@ -72,6 +76,7 @@ class SparseIdsMergedSlice {
 	using SimpleViewerFunction = rpl::producer<SparseIdsSlice>(
 		PeerId peerId,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		SparseIdsSlice::Key simpleKey,
 		int limitBefore,
 		int limitAfter);
diff --git a/Telegram/SourceFiles/data/data_star_gift.cpp b/Telegram/SourceFiles/data/data_star_gift.cpp
new file mode 100644
index 00000000000000..4ecc85f4bbc4a4
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_star_gift.cpp
@@ -0,0 +1,351 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/data_star_gift.h"
+
+#include "api/api_premium.h"
+#include "apiwrap.h"
+#include "data/data_document.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "lang/lang_tag.h"
+#include "main/main_session.h"
+#include "ui/controls/ton_common.h"
+#include "ui/text/text_utilities.h"
+#include "styles/style_credits.h"
+
+namespace Data {
+namespace {
+
+constexpr auto kMyGiftsPerPage = 50;
+constexpr auto kResaleGiftsPerPage = 50;
+constexpr auto kCraftGiftsPerPage = 50;
+
+[[nodiscard]] MTPStarGiftAttributeId AttributeToTL(GiftAttributeId id) {
+	switch (id.type) {
+	case GiftAttributeIdType::Backdrop:
+		return MTP_starGiftAttributeIdBackdrop(
+			MTP_int(int32(uint32(id.value))));
+	case GiftAttributeIdType::Model:
+		return MTP_starGiftAttributeIdModel(MTP_long(id.value));
+	case GiftAttributeIdType::Pattern:
+		return MTP_starGiftAttributeIdPattern(MTP_long(id.value));
+	}
+	Unexpected("Invalid attribute id type");
+}
+
+[[nodiscard]] GiftAttributeId FromTL(const MTPStarGiftAttributeId &id) {
+	return id.match([&](const MTPDstarGiftAttributeIdBackdrop &data) {
+		return GiftAttributeId{
+			.value = uint64(uint32(data.vbackdrop_id().v)),
+			.type = GiftAttributeIdType::Backdrop,
+		};
+	}, [&](const MTPDstarGiftAttributeIdModel &data) {
+		return GiftAttributeId{
+			.value = data.vdocument_id().v,
+			.type = GiftAttributeIdType::Model,
+		};
+	}, [&](const MTPDstarGiftAttributeIdPattern &data) {
+		return GiftAttributeId{
+			.value = data.vdocument_id().v,
+			.type = GiftAttributeIdType::Pattern,
+		};
+	});
+}
+
+} // namespace
+
+QString UniqueGiftName(const UniqueGift &gift) {
+	return UniqueGiftName(gift.title, gift.number);
+}
+
+QString UniqueGiftName(const QString &title, int number) {
+	return title + u" #"_q + Lang::FormatCountDecimal(number);
+}
+
+QString UniqueGiftRarityText(UniqueGiftRarity type) {
+	switch (type) {
+	case UniqueGiftRarity::Uncommon:
+		return tr::lng_gift_uncommon_tag(tr::now);
+	case UniqueGiftRarity::Rare:
+		return tr::lng_gift_rare_tag(tr::now);
+	case UniqueGiftRarity::Epic:
+		return tr::lng_gift_epic_tag(tr::now);
+	case UniqueGiftRarity::Legendary:
+		return tr::lng_gift_legendary_tag(tr::now);
+	}
+	return QString();
+}
+
+UniqueGiftRarityColors UniqueGiftRarityBadgeColors(UniqueGiftRarity type) {
+	constexpr auto kBgOpacity = 0.15;
+	const auto base = [&] {
+		switch (type) {
+		case UniqueGiftRarity::Uncommon: return QColor(0x40, 0xA9, 0x20);
+		case UniqueGiftRarity::Rare: return QColor(0x11, 0xAA, 0xBE);
+		case UniqueGiftRarity::Epic: return QColor(0x95, 0x5C, 0xDB);
+		case UniqueGiftRarity::Legendary: return QColor(0xBF, 0x76, 0x00);
+		}
+		Unexpected("Invalid rarity type.");
+	}();
+	auto bg = base;
+	bg.setAlphaF(kBgOpacity);
+	return { bg, base };
+}
+
+QString UniqueGiftAttributeText(const UniqueGiftAttribute &attribute) {
+	const auto type = attribute.rarityType();
+	if (type != UniqueGiftRarity::Default) {
+		return UniqueGiftRarityText(type);
+	}
+	const auto permille = attribute.rarityPermille();
+	return (permille > 0)
+		? (QString::number(permille / 10.) + '%')
+		: u"< 0.1%"_q;
+}
+
+bool UniqueGiftAttributeHasSpecialRarity(const UniqueGiftAttribute &attribute) {
+	return attribute.rarityType() != UniqueGiftRarity::Default;
+}
+
+CreditsAmount UniqueGiftResaleStars(const UniqueGift &gift) {
+	return CreditsAmount(gift.starsForResale);
+}
+
+CreditsAmount UniqueGiftResaleTon(const UniqueGift &gift) {
+	return CreditsAmount(
+		gift.nanoTonForResale / Ui::kNanosInOne,
+		gift.nanoTonForResale % Ui::kNanosInOne,
+		CreditsType::Ton);
+}
+
+CreditsAmount UniqueGiftResaleAsked(const UniqueGift &gift) {
+	return gift.onlyAcceptTon
+		? UniqueGiftResaleTon(gift)
+		: UniqueGiftResaleStars(gift);
+}
+
+TextWithEntities FormatGiftResaleStars(const UniqueGift &gift) {
+	return Ui::Text::IconEmoji(
+		&st::starIconEmoji
+	).append(Lang::FormatCountDecimal(gift.starsForResale));
+}
+
+TextWithEntities FormatGiftResaleTon(const UniqueGift &gift) {
+	return Ui::Text::IconEmoji(
+		&st::tonIconEmoji
+	).append(Lang::FormatCreditsAmountDecimal(UniqueGiftResaleTon(gift)));
+}
+
+TextWithEntities FormatGiftResaleAsked(const UniqueGift &gift) {
+	return gift.onlyAcceptTon
+		? FormatGiftResaleTon(gift)
+		: FormatGiftResaleStars(gift);
+}
+
+GiftAttributeId IdFor(const UniqueGiftBackdrop &value) {
+	return {
+		.value = uint64(uint32(value.id)),
+		.type = GiftAttributeIdType::Backdrop,
+	};
+}
+
+GiftAttributeId IdFor(const UniqueGiftModel &value) {
+	return {
+		.value = value.document->id,
+		.type = GiftAttributeIdType::Model,
+	};
+}
+
+GiftAttributeId IdFor(const UniqueGiftPattern &value) {
+	return {
+		.value = value.document->id,
+		.type = GiftAttributeIdType::Pattern,
+	};
+}
+
+rpl::producer<MyGiftsDescriptor> MyUniqueGiftsSlice(
+		not_null<Main::Session*> session,
+		MyUniqueType type,
+		QString offset) {
+	return [=](auto consumer) {
+		using Flag = MTPpayments_GetSavedStarGifts::Flag;
+		const auto user = session->user();
+		const auto requestId = session->api().request(
+			MTPpayments_GetSavedStarGifts(
+			MTP_flags(Flag::f_exclude_upgradable
+				| Flag::f_exclude_unupgradable
+				| Flag::f_exclude_unlimited
+				| ((type == MyUniqueType::OnlyOwned)
+					? Flag::f_exclude_hosted
+					: Flag())),
+			user->input(),
+			MTP_int(0), // collection_id
+			MTP_string(offset),
+			MTP_int(kMyGiftsPerPage)
+		)).done([=](const MTPpayments_SavedStarGifts &result) {
+			auto gifts = MyGiftsDescriptor();
+			const auto &data = result.data();
+			if (const auto next = data.vnext_offset()) {
+				gifts.offset = qs(*next);
+			}
+
+			const auto owner = &session->data();
+			owner->processUsers(data.vusers());
+			owner->processChats(data.vchats());
+
+			gifts.list.reserve(data.vgifts().v.size());
+			for (const auto &gift : data.vgifts().v) {
+				if (auto parsed = Api::FromTL(user, gift)) {
+					gifts.list.push_back(std::move(*parsed));
+				}
+			}
+			consumer.put_next(std::move(gifts));
+			consumer.put_done();
+		}).fail([=] {
+			consumer.put_next({});
+			consumer.put_done();
+		}).send();
+
+		auto lifetime = rpl::lifetime();
+		lifetime.add([=] { session->api().request(requestId).cancel(); });
+		return lifetime;
+	};
+}
+
+rpl::producer<ResaleGiftsDescriptor> ResaleGiftsSlice(
+		not_null<Main::Session*> session,
+		uint64 giftId,
+		ResaleGiftsFilter filter,
+		QString offset) {
+	return [=](auto consumer) {
+		using Flag = MTPpayments_GetResaleStarGifts::Flag;
+		const auto requestId = session->api().request(
+			MTPpayments_GetResaleStarGifts(
+				MTP_flags(Flag::f_attributes_hash
+					| ((filter.sort == ResaleGiftsSort::Price)
+						? Flag::f_sort_by_price
+						: (filter.sort == ResaleGiftsSort::Number)
+						? Flag::f_sort_by_num
+						: Flag())
+					| (filter.attributes.empty()
+						? Flag()
+						: Flag::f_attributes)
+					| (filter.forCraft ? Flag::f_for_craft : Flag())
+					| (filter.starsOnly ? Flag::f_stars_only : Flag())),
+				MTP_long(filter.attributesHash),
+				MTP_long(giftId),
+				MTP_vector_from_range(filter.attributes
+					| ranges::views::transform(AttributeToTL)),
+				MTP_string(offset),
+				MTP_int(kResaleGiftsPerPage)
+			)).done([=](const MTPpayments_ResaleStarGifts &result) {
+			const auto &data = result.data();
+			session->data().processUsers(data.vusers());
+			session->data().processChats(data.vchats());
+
+			auto info = ResaleGiftsDescriptor{
+				.giftId = giftId,
+				.offset = qs(data.vnext_offset().value_or_empty()),
+				.count = data.vcount().v,
+			};
+			const auto &list = data.vgifts().v;
+			info.list.reserve(list.size());
+			for (const auto &entry : list) {
+				if (auto gift = Api::FromTL(session, entry)) {
+					info.list.push_back(std::move(*gift));
+				}
+			}
+			info.attributesHash = data.vattributes_hash().value_or_empty();
+			const auto &attributes = data.vattributes()
+				? data.vattributes()->v
+				: QVector<MTPStarGiftAttribute>();
+			const auto &counters = data.vcounters()
+				? data.vcounters()->v
+				: QVector<MTPStarGiftAttributeCounter>();
+			auto counts = base::flat_map<GiftAttributeId, int>();
+			counts.reserve(counters.size());
+			for (const auto &counter : counters) {
+				const auto &data = counter.data();
+				counts.emplace(FromTL(data.vattribute()), data.vcount().v);
+			}
+			const auto count = [&](GiftAttributeId id) {
+				const auto i = counts.find(id);
+				return i != end(counts) ? i->second : 0;
+			};
+			info.models.reserve(attributes.size());
+			info.patterns.reserve(attributes.size());
+			info.backdrops.reserve(attributes.size());
+			for (const auto &attribute : attributes) {
+				attribute.match([&](const MTPDstarGiftAttributeModel &data) {
+					const auto parsed = Api::FromTL(session, data);
+					info.models.push_back({ parsed, count(IdFor(parsed)) });
+				}, [&](const MTPDstarGiftAttributePattern &data) {
+					const auto parsed = Api::FromTL(session, data);
+					info.patterns.push_back({ parsed, count(IdFor(parsed)) });
+				}, [&](const MTPDstarGiftAttributeBackdrop &data) {
+					const auto parsed = Api::FromTL(data);
+					info.backdrops.push_back({ parsed, count(IdFor(parsed)) });
+				}, [](const MTPDstarGiftAttributeOriginalDetails &data) {
+				});
+			}
+			consumer.put_next(std::move(info));
+			consumer.put_done();
+		}).fail([=](const MTP::Error &error) {
+			consumer.put_next({});
+			consumer.put_done();
+		}).send();
+
+		auto lifetime = rpl::lifetime();
+		lifetime.add([=] { session->api().request(requestId).cancel(); });
+		return lifetime;
+	};
+}
+
+rpl::producer<CraftGiftsDescriptor> CraftGiftsSlice(
+		not_null<Main::Session*> session,
+		uint64 giftId,
+		QString offset) {
+	return [=](auto consumer) {
+		const auto requestId = session->api().request(
+			MTPpayments_GetCraftStarGifts(
+				MTP_long(giftId),
+				MTP_string(offset),
+				MTP_int(kCraftGiftsPerPage))
+		).done([=](const MTPpayments_SavedStarGifts &result) {
+			const auto user = session->user();
+			const auto owner = &session->data();
+			const auto &data = result.data();
+			owner->processUsers(data.vusers());
+			owner->processChats(data.vchats());
+
+			auto info = CraftGiftsDescriptor{
+				.giftId = giftId,
+				.offset = qs(data.vnext_offset().value_or_empty()),
+				.count = data.vcount().v,
+			};
+			info.list.reserve(data.vgifts().v.size());
+			for (const auto &gift : data.vgifts().v) {
+				if (auto parsed = Api::FromTL(user, gift)) {
+					info.list.push_back(std::move(*parsed));
+				}
+			}
+			consumer.put_next(std::move(info));
+			consumer.put_done();
+		}).fail([=](const MTP::Error &error) {
+			consumer.put_next({});
+			consumer.put_done();
+		}).send();
+
+		auto lifetime = rpl::lifetime();
+		lifetime.add([=] { session->api().request(requestId).cancel(); });
+		return lifetime;
+	};
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
new file mode 100644
index 00000000000000..8a9f8be81ef11e
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -0,0 +1,425 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+struct ColorCollectible;
+} // namespace Ui
+
+namespace Data {
+
+enum class UniqueGiftRarity : int {
+	Default = 0,
+	Uncommon = -1,
+	Rare = -2,
+	Epic = -3,
+	Legendary = -4,
+};
+
+struct UniqueGiftAttribute {
+	QString name;
+	int rarityValue = 0;
+
+	[[nodiscard]] UniqueGiftRarity rarityType() const {
+		return (rarityValue >= 0)
+			? UniqueGiftRarity::Default
+			: UniqueGiftRarity(rarityValue);
+	}
+	[[nodiscard]] int rarityPermille() const {
+		return (rarityValue >= 0) ? rarityValue : 0;
+	}
+
+	friend inline bool operator==(
+		const UniqueGiftAttribute &,
+		const UniqueGiftAttribute &) = default;
+};
+
+struct UniqueGiftRarityColors {
+	QColor bg;
+	QColor fg;
+};
+
+[[nodiscard]] QString UniqueGiftRarityText(UniqueGiftRarity type);
+[[nodiscard]] UniqueGiftRarityColors UniqueGiftRarityBadgeColors(
+	UniqueGiftRarity type);
+[[nodiscard]] QString UniqueGiftAttributeText(
+	const UniqueGiftAttribute &attribute);
+[[nodiscard]] bool UniqueGiftAttributeHasSpecialRarity(
+	const UniqueGiftAttribute &attribute);
+
+struct UniqueGiftModel : UniqueGiftAttribute {
+	not_null<DocumentData*> document;
+
+	friend inline bool operator==(
+		const UniqueGiftModel &,
+		const UniqueGiftModel &) = default;
+};
+
+struct UniqueGiftPattern : UniqueGiftAttribute {
+	not_null<DocumentData*> document;
+
+	friend inline bool operator==(
+		const UniqueGiftPattern &,
+		const UniqueGiftPattern &) = default;
+};
+
+struct UniqueGiftBackdrop : UniqueGiftAttribute {
+	QColor centerColor;
+	QColor edgeColor;
+	QColor patternColor;
+	QColor textColor;
+	int id = 0;
+
+	friend inline bool operator==(
+		const UniqueGiftBackdrop &,
+		const UniqueGiftBackdrop &) = default;
+};
+
+struct UniqueGiftAttributes {
+	std::vector<UniqueGiftModel> models;
+	std::vector<UniqueGiftBackdrop> backdrops;
+	std::vector<UniqueGiftPattern> patterns;
+};
+
+struct UniqueGiftOriginalDetails {
+	PeerId senderId = 0;
+	PeerId recipientId = 0;
+	TimeId date = 0;
+	TextWithEntities message;
+};
+
+struct UniqueGiftValue {
+	QString currency;
+	int64 valuePrice = 0;
+	int64 valuePriceUsd = 0;
+	CreditsAmount initialPriceStars;
+	int64 initialSalePrice = 0;
+	TimeId initialSaleDate = 0;
+	int64 lastSalePrice = 0;
+	TimeId lastSaleDate = 0;
+	int64 averagePrice = 0;
+	int64 minimumPrice = 0;
+	int forSaleOnTelegram = 0;
+	int forSaleOnFragment = 0;
+	QString fragmentUrl;
+	bool lastSaleFragment = false;
+};
+
+struct UniqueGift {
+	CollectibleId id = 0;
+	uint64 initialGiftId = 0;
+	QString slug;
+	QString title;
+	QString giftAddress;
+	QString ownerAddress;
+	QString ownerName;
+	PeerId ownerId = 0;
+	PeerId hostId = 0;
+	PeerData *releasedBy = nullptr;
+	PeerData *themeUser = nullptr;
+	int64 nanoTonForResale = -1;
+	int craftChancePermille = 0;
+	int starsForResale = -1;
+	int starsForTransfer = -1;
+	int starsMinOffer = -1;
+	int number = 0;
+	bool onlyAcceptTon = false;
+	bool canBeTheme = false;
+	bool crafted = false;
+	bool burned = false;
+	TimeId exportAt = 0;
+	TimeId canTransferAt = 0;
+	TimeId canResellAt = 0;
+	TimeId canCraftAt = 0;
+	UniqueGiftModel model;
+	UniqueGiftPattern pattern;
+	UniqueGiftBackdrop backdrop;
+	UniqueGiftOriginalDetails originalDetails;
+	std::shared_ptr<UniqueGiftValue> value;
+	std::shared_ptr<Ui::ColorCollectible> peerColor;
+};
+
+[[nodiscard]] QString UniqueGiftName(const UniqueGift &gift);
+[[nodiscard]] QString UniqueGiftName(const QString &title, int number);
+
+[[nodiscard]] CreditsAmount UniqueGiftResaleStars(const UniqueGift &gift);
+[[nodiscard]] CreditsAmount UniqueGiftResaleTon(const UniqueGift &gift);
+[[nodiscard]] CreditsAmount UniqueGiftResaleAsked(const UniqueGift &gift);
+
+[[nodiscard]] TextWithEntities FormatGiftResaleStars(const UniqueGift &gift);
+[[nodiscard]] TextWithEntities FormatGiftResaleTon(const UniqueGift &gift);
+[[nodiscard]] TextWithEntities FormatGiftResaleAsked(const UniqueGift &gift);
+
+struct StarGiftBackground {
+	QColor center;
+	QColor edge;
+	QColor text;
+
+	[[nodiscard]] UniqueGiftBackdrop backdrop() const {
+		return {
+			.centerColor = center,
+			.edgeColor = edge,
+			.patternColor = edge,
+			.textColor = text,
+		};
+	}
+};
+
+struct StarGift {
+	uint64 id = 0;
+	std::shared_ptr<UniqueGift> unique;
+	std::shared_ptr<StarGiftBackground> background;
+	int64 stars = 0;
+	int64 starsConverted = 0;
+	int64 starsToUpgrade = 0;
+	int64 starsResellMin = 0;
+	not_null<DocumentData*> document;
+	PeerData *releasedBy = nullptr;
+	QString resellTitle;
+	int resellCount = 0;
+	QString auctionSlug;
+	int auctionGiftsPerRound = 0;
+	TimeId auctionStartDate = 0;
+	int limitedLeft = 0;
+	int limitedCount = 0;
+	int perUserTotal = 0;
+	int perUserRemains = 0;
+	int upgradeVariants = 0;
+	TimeId firstSaleDate = 0;
+	TimeId lastSaleDate = 0;
+	TimeId lockedUntilDate = 0;
+	bool resellTonOnly : 1 = false;
+	bool requirePremium : 1 = false;
+	bool peerColorAvailable : 1 = false;
+	bool upgradable : 1 = false;
+	bool birthday : 1 = false;
+	bool soldOut : 1 = false;
+
+	[[nodiscard]] bool auction() const {
+		return !auctionSlug.isEmpty();
+	}
+
+	friend inline bool operator==(
+		const StarGift &,
+		const StarGift &) = default;
+};
+
+class SavedStarGiftId {
+public:
+	[[nodiscard]] static SavedStarGiftId User(MsgId messageId) {
+		auto result = SavedStarGiftId();
+		result.entityId = uint64(messageId.bare);
+		return result;
+	}
+	[[nodiscard]] static SavedStarGiftId Chat(
+			not_null<PeerData*> peer,
+			uint64 savedId) {
+		auto result = SavedStarGiftId();
+		result.peer = peer;
+		result.entityId = savedId;
+		return result;
+	}
+
+	[[nodiscard]] bool isUser() const {
+		return !peer;
+	}
+	[[nodiscard]] bool isChat() const {
+		return peer != nullptr;
+	}
+
+	[[nodiscard]] MsgId userMessageId() const {
+		return peer ? MsgId(0) : MsgId(entityId);
+	}
+	[[nodiscard]] PeerData *chat() const {
+		return peer;
+	}
+	[[nodiscard]] uint64 chatSavedId() const {
+		return peer ? entityId : 0;
+	}
+
+	explicit operator bool() const {
+		return entityId != 0;
+	}
+
+	friend inline bool operator==(
+		const SavedStarGiftId &,
+		const SavedStarGiftId &) = default;
+	friend inline auto operator<=>(
+		const SavedStarGiftId &,
+		const SavedStarGiftId &) = default;
+
+private:
+	PeerData *peer = nullptr;
+	uint64 entityId = 0;
+
+};
+
+struct SavedStarGift {
+	StarGift info;
+	SavedStarGiftId manageId;
+	std::vector<int> collectionIds;
+	TextWithEntities message;
+	int64 starsConverted = 0;
+	int64 starsUpgradedBySender = 0;
+	int64 starsForDetailsRemove = 0;
+	QString giftPrepayUpgradeHash;
+	PeerId fromId = 0;
+	TimeId date = 0;
+	int giftNum = 0;
+	bool upgradeSeparate = false;
+	bool upgradable = false;
+	bool anonymous = false;
+	bool pinned = false;
+	bool hidden = false;
+	bool mine = false;
+};
+
+struct GiftUpgradeSpinner {
+	enum class State {
+		Initial, // Didn't start the upgrade.
+		Preparing, // Upgraded, requested Cover to prepare the spinners.
+		Loading, // Cover started preparing the spinners.
+		Prepared, // Cover prepared the spinners, waiting for nextToUpgrade.
+		Started, // Started spinning animations.
+		FinishBackdrop, // Ready to animate to target backdrop.
+		FinishedBackdrop, // Backdrop finishes spinning.
+		FinishPattern, // Ready to animate to target pattern.
+		FinishedPattern, // Pattern finishes spinning.
+		FinishModel, // Ready to animate to target model.
+		FinishedModel, // All spinners finish animating or user pressed Skip.
+		Finished, // Animations finished, show fireworks.
+		Timeout, // Waited for Prepared for too long, skipping animations.
+	};
+
+	Data::UniqueGiftAttributes attributes;
+	std::shared_ptr<Data::UniqueGift> target;
+	rpl::variable<State> state;
+};
+
+struct GiftUpgradeResult {
+	StarGift info;
+	SavedStarGiftId manageId;
+	TimeId date = 0;
+	int starsForDetailsRemove = 0;
+	bool saved = false;
+};
+
+struct GiftCollection {
+	int id = 0;
+	int count = 0;
+	QString title;
+	DocumentData *icon = nullptr;
+	uint64 hash = 0;
+};
+
+struct UniqueGiftModelCount {
+	UniqueGiftModel model;
+	int count = 0;
+};
+
+struct UniqueGiftBackdropCount {
+	UniqueGiftBackdrop backdrop;
+	int count = 0;
+};
+
+struct UniqueGiftPatternCount {
+	UniqueGiftPattern pattern;
+	int count = 0;
+};
+
+enum class ResaleGiftsSort {
+	Date,
+	Price,
+	Number,
+};
+
+enum class GiftAttributeIdType {
+	Model,
+	Pattern,
+	Backdrop,
+};
+
+struct GiftAttributeId {
+	uint64 value = 0;
+	GiftAttributeIdType type = GiftAttributeIdType::Model;
+
+	friend inline auto operator<=>(
+		GiftAttributeId,
+		GiftAttributeId) = default;
+	friend inline bool operator==(
+		GiftAttributeId,
+		GiftAttributeId) = default;
+};
+
+[[nodiscard]] GiftAttributeId IdFor(const UniqueGiftBackdrop &value);
+[[nodiscard]] GiftAttributeId IdFor(const UniqueGiftModel &value);
+[[nodiscard]] GiftAttributeId IdFor(const UniqueGiftPattern &value);
+
+struct MyGiftsDescriptor {
+	std::vector<SavedStarGift> list;
+	QString offset;
+};
+
+enum class MyUniqueType {
+	OwnedAndHosted,
+	OnlyOwned,
+};
+
+[[nodiscard]] rpl::producer<MyGiftsDescriptor> MyUniqueGiftsSlice(
+	not_null<Main::Session*> session,
+	MyUniqueType type,
+	QString offset = QString());
+
+struct ResaleGiftsDescriptor {
+	uint64 giftId = 0;
+	QString title;
+	QString offset;
+	std::vector<StarGift> list;
+	std::vector<UniqueGiftModelCount> models;
+	std::vector<UniqueGiftBackdropCount> backdrops;
+	std::vector<UniqueGiftPatternCount> patterns;
+	uint64 attributesHash = 0;
+	int count = 0;
+	ResaleGiftsSort sort = ResaleGiftsSort::Date;
+};
+
+struct ResaleGiftsFilter {
+	uint64 attributesHash = 0;
+	base::flat_set<GiftAttributeId> attributes;
+	ResaleGiftsSort sort = ResaleGiftsSort::Price;
+	bool forCraft = false;
+	bool starsOnly = false;
+
+	friend inline bool operator==(
+		const ResaleGiftsFilter &,
+		const ResaleGiftsFilter &) = default;
+};
+
+[[nodiscard]] rpl::producer<ResaleGiftsDescriptor> ResaleGiftsSlice(
+	not_null<Main::Session*> session,
+	uint64 giftId,
+	ResaleGiftsFilter filter = {},
+	QString offset = QString());
+
+struct CraftGiftsDescriptor {
+	uint64 giftId = 0;
+	QString offset;
+	std::vector<SavedStarGift> list;
+	int count = 0;
+};
+
+[[nodiscard]] rpl::producer<CraftGiftsDescriptor> CraftGiftsSlice(
+	not_null<Main::Session*> session,
+	uint64 giftId,
+	QString offset = QString());
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_statistics_chart.h b/Telegram/SourceFiles/data/data_statistics_chart.h
index 11782651e5181d..111bf7e25d40a1 100644
--- a/Telegram/SourceFiles/data/data_statistics_chart.h
+++ b/Telegram/SourceFiles/data/data_statistics_chart.h
@@ -68,7 +68,7 @@ struct StatisticalChart {
 
 	float64 oneDayPercentage = 0.;
 
-	float64 timeStep = 0.;
+	float64 timeStep = 1.;
 
 	bool isFooterHidden = false;
 	bool hasPercentages = false;
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 0d9671f539ba57..232f352f92fbab 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -10,9 +10,11 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "apiwrap.h"
 #include "core/application.h"
+#include "data/components/top_peers.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
 #include "data/data_document.h"
+#include "data/data_group_call.h"
 #include "data/data_folder.h"
 #include "data/data_photo.h"
 #include "data/data_user.h"
@@ -48,12 +50,13 @@ constexpr auto kPollingViewsPerPage = Story::kRecentViewersMax;
 using UpdateFlag = StoryUpdate::Flag;
 
 [[nodiscard]] std::optional<StoryMedia> ParseMedia(
-		not_null<Session*> owner,
-		const MTPMessageMedia &media) {
+		not_null<PeerData*> peer,
+		const MTPMessageMedia &media,
+		const std::shared_ptr<GroupCall> &existingCall) {
 	return media.match([&](const MTPDmessageMediaPhoto &data)
 		-> std::optional<StoryMedia> {
 		if (const auto photo = data.vphoto()) {
-			const auto result = owner->processPhoto(*photo);
+			const auto result = peer->owner().processPhoto(*photo);
 			if (!result->isNull()) {
 				return StoryMedia{ result };
 			}
@@ -62,7 +65,9 @@ using UpdateFlag = StoryUpdate::Flag;
 	}, [&](const MTPDmessageMediaDocument &data)
 		-> std::optional<StoryMedia> {
 		if (const auto document = data.vdocument()) {
-			const auto result = owner->processDocument(*document);
+			const auto result = peer->owner().processDocument(
+				*document,
+				data.valt_documents());
 			if (!result->isNull()
 				&& (result->isGifv() || result->isVideoFile())) {
 				result->setStoryMedia(true);
@@ -70,16 +75,78 @@ using UpdateFlag = StoryUpdate::Flag;
 			}
 		}
 		return {};
+	}, [&](const MTPDmessageMediaVideoStream &data) {
+		const auto rtmp = data.is_rtmp_stream();
+		return std::make_optional(data.vcall().match([&](
+				const MTPDinputGroupCall &data) {
+			auto call = (existingCall
+				&& existingCall->peer() == peer
+				&& existingCall->id() == data.vid().v)
+				? existingCall
+				: std::make_shared<Data::GroupCall>(
+					peer,
+					data.vid().v,
+					data.vaccess_hash().v,
+					TimeId(),
+					rtmp,
+					GroupCallOrigin::VideoStream);
+			return StoryMedia{ std::move(call) };
+		}, [](const auto &) {
+			return StoryMedia();
+		}));
 	}, [&](const MTPDmessageMediaUnsupported &data) {
 		return std::make_optional(StoryMedia{ v::null });
 	}, [](const auto &) { return std::optional<StoryMedia>(); });
 }
 
+[[nodiscard]] StoryAlbum FromTL(
+		not_null<Session*> owner,
+		const MTPStoryAlbum &album) {
+	const auto &data = album.data();
+	return {
+		.id = data.valbum_id().v,
+		.title = qs(data.vtitle()),
+		.iconPhoto = (data.vicon_photo()
+			? owner->processPhoto(*data.vicon_photo()).get()
+			: nullptr),
+		.iconVideo = (data.vicon_video()
+			? owner->processDocument(*data.vicon_video()).get()
+			: nullptr),
+	};
+}
+
+bool InsertSorted(std::vector<StoryId> &list, StoryId id) {
+	const auto i = ranges::lower_bound(list, id, std::greater<>());
+	if (i != end(list) && *i == id) {
+		return false;
+	}
+	list.insert(i, id);
+	return true;
+}
+
+bool RemoveSorted(std::vector<StoryId> &list, StoryId id) {
+	const auto i = ranges::lower_bound(list, id, std::greater<>());
+	if (i != end(list) && *i == id) {
+		list.erase(i);
+		return true;
+	}
+	return false;
+}
+
+bool RemoveUnsorted(std::vector<StoryId> &list, StoryId id) {
+	const auto i = ranges::find(list, id);
+	if (i != end(list)) {
+		list.erase(i);
+		return true;
+	}
+	return false;
+}
+
 } // namespace
 
 std::vector<StoryId> RespectingPinned(const StoriesIds &ids) {
 	if (ids.pinnedToTop.empty()) {
-		return ids.list | ranges::to_vector;
+		return ids.list;
 	}
 	auto result = std::vector<StoryId>();
 	result.reserve(ids.list.size());
@@ -99,6 +166,7 @@ StoriesSourceInfo StoriesSource::info() const {
 		.count = uint32(std::min(int(ids.size()), kMaxSegmentsCount)),
 		.unreadCount = uint32(std::min(unreadCount(), kMaxSegmentsCount)),
 		.premium = (peer->isUser() && peer->asUser()->isPremium()) ? 1U : 0,
+		.hasVideoStream = hasVideoStream ? 1U : 0,
 	};
 }
 
@@ -125,7 +193,7 @@ Stories::Stories(not_null<Session*> owner)
 	crl::on_main(this, [=] {
 		session().changes().peerUpdates(
 			Data::PeerUpdate::Flag::Rights
-		) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+		) | rpl::on_next([=](const Data::PeerUpdate &update) {
 			const auto channel = update.peer->asChannel();
 			if (!channel) {
 				return;
@@ -154,6 +222,13 @@ Stories::~Stories() {
 	Expects(_pollingViews.empty());
 }
 
+void Stories::clear() {
+	_pollingSettings.clear();
+	_pollingViews.clear();
+	_stories.clear();
+	_deletingStories.clear();
+}
+
 Session &Stories::owner() const {
 	return *_owner;
 }
@@ -231,7 +306,7 @@ void Stories::apply(not_null<PeerData*> peer, const MTPPeerStories *data) {
 		_sourceChanged.fire_copy(peer->id);
 		updatePeerStoriesState(peer);
 	} else {
-		parseAndApply(*data);
+		parseAndApply(*data, ParseSource::DirectRequest);
 	}
 }
 
@@ -264,12 +339,12 @@ void Stories::requestPeerStories(
 		}
 	};
 	_owner->session().api().request(MTPstories_GetPeerStories(
-		peer->input
+		peer->input()
 	)).done([=](const MTPstories_PeerStories &result) {
 		const auto &data = result.data();
 		_owner->processUsers(data.vusers());
 		_owner->processChats(data.vchats());
-		parseAndApply(data.vstories());
+		parseAndApply(data.vstories(), ParseSource::DirectRequest);
 		finish();
 	}).fail([=] {
 		applyDeletedFromSources(peer->id, StorySourcesList::NotHidden);
@@ -310,7 +385,7 @@ void Stories::scheduleExpireTimer() {
 			const auto nearest = _expiring.front().first;
 			const auto now = base::unixtime::now();
 			const auto delay = (nearest > now)
-				? (nearest - now)
+				? std::min(nearest - now, 86'400)
 				: 0;
 			_expireTimer.callOnce(delay * crl::time(1000));
 		}
@@ -334,15 +409,7 @@ void Stories::processExpired() {
 }
 
 Stories::Set *Stories::lookupArchive(not_null<PeerData*> peer) {
-	const auto peerId = peer->id;
-	if (hasArchive(peer)) {
-		const auto i = _archive.find(peerId);
-		return (i != end(_archive))
-			? &i->second
-			: &_archive.emplace(peerId, Set()).first->second;
-	}
-	clearArchive(peer);
-	return nullptr;
+	return albumIdsSet(peer->id, kStoriesAlbumIdArchive);
 }
 
 void Stories::clearArchive(not_null<PeerData*> peer) {
@@ -360,10 +427,12 @@ void Stories::clearArchive(not_null<PeerData*> peer) {
 			}
 		}
 	}
-	_archiveChanged.fire_copy(peerId);
+	_albumIdsChanged.fire({ peerId, kStoriesAlbumIdArchive });
 }
 
-void Stories::parseAndApply(const MTPPeerStories &stories) {
+void Stories::parseAndApply(
+		const MTPPeerStories &stories,
+		ParseSource source) {
 	const auto &data = stories.data();
 	const auto peerId = peerFromMTP(data.vpeer());
 	const auto already = _readTill.find(peerId);
@@ -382,6 +451,13 @@ void Stories::parseAndApply(const MTPPeerStories &stories) {
 	for (const auto &story : list) {
 		if (const auto id = parseAndApply(result.peer, story, now)) {
 			result.ids.emplace(id);
+
+			if (story.type() == mtpc_storyItem) {
+				const auto &media = story.c_storyItem().vmedia();
+				if (media.type() == mtpc_messageMediaVideoStream) {
+					result.hasVideoStream = true;
+				}
+			}
 		}
 	}
 	if (result.ids.empty()) {
@@ -417,12 +493,25 @@ void Stories::parseAndApply(const MTPPeerStories &stories) {
 		}
 		sort(list);
 	};
-	if (result.peer->isSelf()
-		|| (result.peer->isChannel() && result.peer->asChannel()->amIn())
-		|| (result.peer->isUser()
-			&& (result.peer->asUser()->isBot()
-				|| result.peer->asUser()->isContact()))
-		|| result.peer->isServiceUser()) {
+	const auto appendToStrip = [](not_null<PeerData*> peer, ParseSource source) {
+		if (peer->isSelf()) {
+			return true;
+		} else if (const auto channel = peer->asChannel()) {
+			return channel->amIn();
+		} else if (const auto user = peer->asUser()) {
+			return (source == ParseSource::MyStrip)
+				|| user->storiesCorrespondent()
+				|| user->isServiceUser()
+				|| user->isContact()
+				|| user->isBot();
+		}
+		return false;
+	};
+	if (appendToStrip(result.peer, source)) {
+		if (source == ParseSource::MyStrip
+			&& !appendToStrip(result.peer, ParseSource::DirectRequest)) {
+			result.peer->asUser()->setStoriesCorrespondent(true);
+		}
 		const auto hidden = result.peer->hasStoriesHidden();
 		using List = StorySourcesList;
 		add(hidden ? List::Hidden : List::NotHidden);
@@ -441,7 +530,14 @@ Story *Stories::parseAndApply(
 		not_null<PeerData*> peer,
 		const MTPDstoryItem &data,
 		TimeId now) {
-	const auto media = ParseMedia(_owner, data.vmedia());
+	const auto id = data.vid().v;
+	const auto fullId = FullStoryId{ peer->id, id };
+	auto &stories = _stories[peer->id];
+	const auto i = stories.find(id);
+	const auto &existingCall = (i != end(stories))
+		? i->second->call()
+		: nullptr;
+	const auto media = ParseMedia(peer, data.vmedia(), existingCall);
 	if (!media) {
 		return nullptr;
 	}
@@ -450,14 +546,38 @@ Story *Stories::parseAndApply(
 	if (expired && !data.is_pinned() && !hasArchive(peer)) {
 		return nullptr;
 	}
-	const auto id = data.vid().v;
-	const auto fullId = FullStoryId{ peer->id, id };
-	auto &stories = _stories[peer->id];
-	const auto i = stories.find(id);
+	auto albumInfo = (Albums*)nullptr;
+	auto list = std::optional<base::flat_set<int>>();
+	if (const auto albums = data.valbums()) {
+		list.emplace();
+		if (!albums->v.empty()) {
+			albumInfo = &_albums[peer->id];
+			list->reserve(albums->v.size());
+			for (const auto &albumId : albums->v) {
+				albumInfo->sets[albumId.v].albumKnownInArchive.emplace(id);
+				list->emplace(albumId.v);
+			}
+		}
+	}
 	if (i != end(stories)) {
 		const auto result = i->second.get();
 		const auto mediaChanged = (result->media() != *media);
 		result->applyChanges(*media, data, now);
+		if (list) {
+			const auto &was = result->albumIds();
+			if (*list != was) {
+				if (!albumInfo && !was.empty()) {
+					albumInfo = &_albums[peer->id];
+				}
+				for (const auto wasId : result->albumIds()) {
+					if (!list->contains(wasId)) {
+						albumInfo->sets[wasId].albumKnownInArchive.remove(id);
+					}
+				}
+				result->setAlbumIds(*base::take(list));
+			}
+		}
+
 		const auto j = _pollingSettings.find(result);
 		if (j != end(_pollingSettings)) {
 			maybeSchedulePolling(result, j->second, now);
@@ -482,14 +602,17 @@ Story *Stories::parseAndApply(
 		data,
 		now
 	)).first->second.get();
+	if (list) {
+		result->setAlbumIds(*base::take(list));
+	}
 
 	if (const auto archive = lookupArchive(peer)) {
-		const auto added = archive->ids.list.emplace(id).second;
+		const auto added = InsertSorted(archive->ids.list, id);
 		if (added) {
 			if (archive->total >= 0 && id > archive->lastId) {
 				++archive->total;
 			}
-			_archiveChanged.fire_copy(peer->id);
+			_albumIdsChanged.fire({ peer->id, kStoriesAlbumIdArchive });
 		}
 	}
 
@@ -576,20 +699,20 @@ void Stories::savedStateChanged(not_null<Story*> story) {
 	const auto inProfile = story->inProfile();
 	if (inProfile) {
 		auto &saved = _saved[peer];
-		const auto added = saved.ids.list.emplace(id).second;
+		const auto added = InsertSorted(saved.ids.list, id);
 		if (added) {
 			if (saved.total >= 0 && id > saved.lastId) {
 				++saved.total;
 			}
-			_savedChanged.fire_copy(peer);
+			_albumIdsChanged.fire({ peer, kStoriesAlbumIdSaved });
 		}
 	} else if (const auto i = _saved.find(peer); i != end(_saved)) {
 		auto &saved = i->second;
-		if (saved.ids.list.remove(id)) {
+		if (RemoveSorted(saved.ids.list, id)) {
 			if (saved.total > 0) {
 				--saved.total;
 			}
-			_savedChanged.fire_copy(peer);
+			_albumIdsChanged.fire({ peer, kStoriesAlbumIdSaved });
 		}
 	}
 }
@@ -617,7 +740,7 @@ void Stories::loadMore(StorySourcesList list) {
 			_sourcesStates[index] = qs(data.vstate());
 			_sourcesLoaded[index] = !data.is_has_more();
 			for (const auto &single : data.vpeer_stories().v) {
-				parseAndApply(single);
+				parseAndApply(single, ParseSource::MyStrip);
 			}
 		}, [](const MTPDstories_allStoriesNotModified &) {
 		});
@@ -644,6 +767,8 @@ void Stories::preloadListsMore() {
 		const auto index = static_cast<int>(list);
 		return _sourcesLoaded[index] || !_sourcesStates[index].isEmpty();
 	};
+	const auto selfId = _owner->session().userPeerId();
+	constexpr auto archive = kStoriesAlbumIdArchive;
 	if (loading(StorySourcesList::NotHidden)
 		|| loading(StorySourcesList::Hidden)) {
 		return;
@@ -651,8 +776,8 @@ void Stories::preloadListsMore() {
 		loadMore(StorySourcesList::NotHidden);
 	} else if (!countLoaded(StorySourcesList::Hidden)) {
 		loadMore(StorySourcesList::Hidden);
-	} else if (!archiveCountKnown(_owner->session().userPeerId())) {
-		archiveLoadMore(_owner->session().userPeerId());
+	} else if (!albumIdsCountKnown(selfId, archive)) {
+		albumIdsLoadMore(selfId, archive);
 	}
 }
 
@@ -731,7 +856,7 @@ void Stories::sendResolveRequests() {
 		};
 		const auto peer = _owner->session().data().peer(peerId);
 		api->request(MTPstories_GetStoriesByID(
-			peer->input,
+			peer->input(),
 			MTP_vector<MTPint>(prepared)
 		)).done([=](const MTPstories_Stories &result) {
 			owner().processUsers(result.data().vusers());
@@ -797,28 +922,32 @@ void Stories::applyDeleted(not_null<PeerData*> peer, StoryId id) {
 				story.get(),
 				UpdateFlag::Destroyed);
 			removeDependencyStory(story.get());
-			if (hasArchive(story->peer())) {
-				if (const auto k = _archive.find(peerId)
-					; k != end(_archive)) {
-					const auto archive = &k->second;
-					if (archive->ids.list.remove(id)) {
-						if (archive->total > 0) {
-							--archive->total;
+			const auto removeFromAlbum = [&](int albumId) {
+				if (const auto set = albumIdsSet(peerId, albumId, true)) {
+					set->albumKnownInArchive.remove(id);
+					RemoveUnsorted(set->ids.pinnedToTop, id);
+
+					const auto sorted = (albumId == kStoriesAlbumIdSaved)
+						|| (albumId == kStoriesAlbumIdArchive);
+					const auto removed = sorted
+						? RemoveSorted(set->ids.list, id)
+						: RemoveUnsorted(set->ids.list, id);
+					if (removed) {
+						if (set->total > 0) {
+							--set->total;
 						}
-						_archiveChanged.fire_copy(peerId);
+						_albumIdsChanged.fire({ peerId, albumId });
 					}
 				}
+			};
+			if (hasArchive(story->peer())) {
+				removeFromAlbum(kStoriesAlbumIdArchive);
 			}
 			if (story->inProfile()) {
-				if (const auto k = _saved.find(peerId); k != end(_saved)) {
-					const auto saved = &k->second;
-					if (saved->ids.list.remove(id)) {
-						if (saved->total > 0) {
-							--saved->total;
-						}
-						_savedChanged.fire_copy(peerId);
-					}
-				}
+				removeFromAlbum(kStoriesAlbumIdSaved);
+			}
+			for (const auto id : story->albumIds()) {
+				removeFromAlbum(id);
 			}
 			if (_preloading && _preloading->id() == fullId) {
 				_preloading = nullptr;
@@ -968,7 +1097,7 @@ void Stories::sendReaction(FullStoryId id, Data::ReactionId reaction) {
 		const auto api = &session().api();
 		api->request(MTPstories_SendReaction(
 			MTP_flags(0),
-			story->peer()->input,
+			story->peer()->input(),
 			MTP_int(id.story),
 			ReactionToMTP(reaction)
 		)).send();
@@ -1066,10 +1195,8 @@ void Stories::resolve(FullStoryId id, Fn<void()> done, bool force) {
 }
 
 void Stories::loadAround(FullStoryId id, StoriesContext context) {
-	if (v::is<StoriesContextSingle>(context.data)) {
-		return;
-	} else if (v::is<StoriesContextSaved>(context.data)
-		|| v::is<StoriesContextArchive>(context.data)) {
+	if (v::is<StoriesContextSingle>(context.data)
+		|| v::is<StoriesContextAlbum>(context.data)) {
 		return;
 	}
 	const auto i = _all.find(id.peer);
@@ -1185,15 +1312,24 @@ void Stories::toggleHidden(
 		bool hidden,
 		std::shared_ptr<Ui::Show> show) {
 	const auto peer = _owner->peer(peerId);
-	const auto justRemove = peer->isServiceUser() && hidden;
+	const auto byHints = peer->isUser()
+		&& !peer->asUser()->isBot()
+		&& !peer->asUser()->isContact()
+		&& !peer->asUser()->isServiceUser();
+	const auto justRemove = (byHints || peer->isServiceUser()) && hidden;
 	if (peer->hasStoriesHidden() != hidden) {
-		if (!justRemove) {
+		if (byHints && hidden) {
+			peer->asUser()->setStoriesCorrespondent(false);
+		} else if (!justRemove) {
 			peer->setStoriesHidden(hidden);
 		}
 		session().api().request(MTPstories_TogglePeerStoriesHidden(
-			peer->input,
+			peer->input(),
 			MTP_bool(hidden)
 		)).send();
+		if (byHints) {
+			peer->session().topPeers().remove(peer);
+		}
 	}
 
 	const auto name = peer->shortName();
@@ -1205,8 +1341,8 @@ void Stories::toggleHidden(
 			show->showToast(phrase(
 				tr::now,
 				lt_user,
-				Ui::Text::Bold(name),
-				Ui::Text::RichLangValue));
+				tr::bold(name),
+				tr::rich));
 		}
 	});
 
@@ -1271,7 +1407,7 @@ void Stories::sendMarkAsReadRequest(
 
 	const auto api = &_owner->session().api();
 	api->request(MTPstories_ReadStories(
-		peer->input,
+		peer->input(),
 		MTP_int(tillId)
 	)).done(finish).fail(finish).send();
 }
@@ -1332,7 +1468,7 @@ void Stories::sendIncrementViewsRequests() {
 			checkQuitPreventFinished();
 		};
 		api->request(MTPstories_IncrementStoryViews(
-			_owner->peer(peer)->input,
+			_owner->peer(peer)->input(),
 			MTP_vector<MTPint>(std::move(ids))
 		)).done(finish).fail(finish).send();
 		_incrementViewsPending.remove(peer);
@@ -1392,7 +1528,7 @@ void Stories::loadReactionsSlice(
 	_owner->session().api().request(_reactionsRequestId).cancel();
 	_reactionsRequestId = api->request(MTPstories_GetStoryReactionsList(
 		MTP_flags(offset.isEmpty() ? Flag() : Flag::f_offset),
-		_reactionsStoryPeer->input,
+		_reactionsStoryPeer->input(),
 		MTP_int(_reactionsStoryId),
 		MTPReaction(),
 		MTP_string(_reactionsOffset),
@@ -1424,7 +1560,7 @@ void Stories::loadReactionsSlice(
 					slice.list.push_back({
 						.peer = story->peer(),
 						.repostId = story->id(),
-						});
+					});
 				}
 			}, [&](const MTPDstoryReactionPublicForward &data) {
 				const auto item = _owner->addNewMessage(
@@ -1466,7 +1602,7 @@ void Stories::sendViewsSliceRequest() {
 	_owner->session().api().request(_viewsRequestId).cancel();
 	_viewsRequestId = api->request(MTPstories_GetStoryViewsList(
 		MTP_flags(Flag::f_reactions_first),
-		_viewsStoryPeer->input,
+		_viewsStoryPeer->input(),
 		MTPstring(), // q
 		MTP_int(_viewsStoryId),
 		MTP_string(_viewsOffset),
@@ -1542,7 +1678,7 @@ void Stories::sendViewsCountsRequest() {
 	const auto api = &_owner->session().api();
 	_owner->session().api().request(_viewsRequestId).cancel();
 	_viewsRequestId = api->request(MTPstories_GetStoriesViews(
-		_viewsStoryPeer->input,
+		_viewsStoryPeer->input(),
 		MTP_vector<MTPint>(1, MTP_int(_viewsStoryId))
 	)).done([=](const MTPstories_StoryViews &result) {
 		_viewsRequestId = 0;
@@ -1572,155 +1708,398 @@ bool Stories::hasArchive(not_null<PeerData*> peer) const {
 	return false;
 }
 
-const StoriesIds &Stories::archive(PeerId peerId) const {
-	static const auto empty = StoriesIds();
-	const auto i = _archive.find(peerId);
-	return (i != end(_archive)) ? i->second.ids : empty;
-}
-
-rpl::producer<PeerId> Stories::archiveChanged() const {
-	return _archiveChanged.events();
+const Stories::Set *Stories::albumIdsSet(PeerId peerId, int albumId) const {
+	return const_cast<Stories*>(this)->albumIdsSet(peerId, albumId, true);
 }
 
-int Stories::archiveCount(PeerId peerId) const {
-	const auto i = _archive.find(peerId);
-	return (i != end(_archive)) ? i->second.total : 0;
+Stories::Set *Stories::albumIdsSet(PeerId peerId, int albumId, bool lazy) {
+	if (albumId == kStoriesAlbumIdArchive) {
+		const auto peer = _owner->peer(peerId);
+		if (!hasArchive(peer)) {
+			clearArchive(peer);
+			return nullptr;
+		}
+		const auto i = _archive.find(peerId);
+		return (i != end(_archive))
+			? &i->second
+			: lazy
+			? nullptr
+			: &_archive.emplace(peerId, Set()).first->second;
+	} else if (albumId == kStoriesAlbumIdSaved) {
+		const auto i = _saved.find(peerId);
+		return (i != end(_saved))
+			? &i->second
+			: lazy
+			? nullptr
+			: &_saved.emplace(peerId, Set()).first->second;
+	}
+	auto i = _albums.find(peerId);
+	if (i == end(_albums)) {
+		if (lazy) {
+			return nullptr;
+		}
+		i = _albums.emplace(peerId, Albums()).first;
+	}
+	const auto j = i->second.sets.find(albumId);
+	return (j != end(i->second.sets))
+		? &j->second
+		: lazy
+		? nullptr
+		: &i->second.sets.emplace(albumId).first->second;
 }
 
-bool Stories::archiveCountKnown(PeerId peerId) const {
-	const auto i = _archive.find(peerId);
-	return (i != end(_archive)) && (i->second.total >= 0);
+const StoriesIds &Stories::albumIds(PeerId peerId, int albumId) const {
+	static const auto empty = StoriesIds();
+	const auto set = albumIdsSet(peerId, albumId);
+	return set ? set->ids : empty;
 }
 
-bool Stories::archiveLoaded(PeerId peerId) const {
-	const auto i = _archive.find(peerId);
-	return (i != end(_archive)) && i->second.loaded;
+rpl::producer<StoryAlbumIdsKey> Stories::albumIdsChanged() const {
+	return _albumIdsChanged.events();
 }
 
-const StoriesIds &Stories::saved(PeerId peerId) const {
-	static const auto empty = StoriesIds();
-	const auto i = _saved.find(peerId);
-	return (i != end(_saved)) ? i->second.ids : empty;
+int Stories::albumIdsCount(PeerId peerId, int albumId) const {
+	const auto set = albumIdsSet(peerId, albumId);
+	return set ? std::max(set->total, 0) : 0;
 }
 
-rpl::producer<PeerId> Stories::savedChanged() const {
-	return _savedChanged.events();
+bool Stories::albumIdsCountKnown(PeerId peerId, int albumId) const {
+	const auto set = albumIdsSet(peerId, albumId);
+	return set && (set->total >= 0);
 }
 
-int Stories::savedCount(PeerId peerId) const {
-	const auto i = _saved.find(peerId);
-	return (i != end(_saved)) ? i->second.total : 0;
+bool Stories::albumIdsLoaded(PeerId peerId, int albumId) const {
+	const auto set = albumIdsSet(peerId, albumId);
+	return set && set->loaded;
 }
 
-bool Stories::savedCountKnown(PeerId peerId) const {
-	const auto i = _saved.find(peerId);
-	return (i != end(_saved)) && (i->second.total >= 0);
+void Stories::albumIdsLoadMore(PeerId peerId, int albumId) {
+	albumIdsLoadMore(peerId, albumId, false);
 }
 
-bool Stories::savedLoaded(PeerId peerId) const {
-	const auto i = _saved.find(peerId);
-	return (i != end(_saved)) && i->second.loaded;
-}
+void Stories::albumIdsLoadMore(PeerId peerId, int albumId, bool reload) {
+	Expects(!reload || albumId > 0);
 
-void Stories::archiveLoadMore(PeerId peerId) {
 	const auto peer = _owner->peer(peerId);
-	const auto archive = lookupArchive(peer);
-	if (!archive || archive->requestId || archive->loaded) {
+	const auto set = albumIdsSet(peerId, albumId);
+	if (set && reload) {
+		_owner->session().api().request(base::take(set->requestId)).cancel();
+	}
+	if (!set || set->requestId || (!reload && set->loaded)) {
 		return;
 	}
 	const auto api = &_owner->session().api();
-	archive->requestId = api->request(MTPstories_GetStoriesArchive(
-		peer->input,
-		MTP_int(archive->lastId),
-		MTP_int(archive->lastId ? kArchivePerPage : kArchiveFirstPerPage)
-	)).done([=](const MTPstories_Stories &result) {
-		const auto archive = lookupArchive(peer);
-		if (!archive) {
+	const auto done = [=](const MTPstories_Stories &result) {
+		const auto set = albumIdsSet(peerId, albumId);
+		if (!set) {
 			return;
 		}
-		archive->requestId = 0;
-
+		set->requestId = 0;
+		if (reload) {
+			set->ids.list.clear();
+			set->ids.pinnedToTop.clear();
+			set->lastId = StoryId();
+		}
 		const auto &data = result.data();
 		const auto now = base::unixtime::now();
-		archive->total = data.vcount().v;
+		auto pinnedToTopIds = data.vpinned_to_top().value_or_empty();
+		auto pinnedToTop = pinnedToTopIds
+			| ranges::views::transform(&MTPint::v)
+			| ranges::to_vector;
+		const auto ordered = (albumId == kStoriesAlbumIdSaved)
+			|| (albumId == kStoriesAlbumIdArchive);
+		set->total = data.vcount().v;
 		for (const auto &story : data.vstories().v) {
 			const auto id = story.match([&](const auto &id) {
 				return id.vid().v;
 			});
-			archive->ids.list.emplace(id);
-			archive->lastId = id;
+			if (ordered) {
+				InsertSorted(set->ids.list, id);
+			} else {
+				set->ids.list.push_back(id);
+			}
+			set->lastId = id;
 			if (!parseAndApply(peer, story, now)) {
-				archive->ids.list.remove(id);
-				if (archive->total > 0) {
-					--archive->total;
+				if (ordered) {
+					RemoveSorted(set->ids.list, id);
+				} else {
+					set->ids.list.pop_back();
+				}
+				if (set->total > 0) {
+					--set->total;
 				}
 			}
 		}
-		const auto ids = int(archive->ids.list.size());
-		archive->loaded = data.vstories().v.empty();
-		archive->total = archive->loaded ? ids : std::max(archive->total, ids);
-		_archiveChanged.fire_copy(peerId);
-	}).fail([=] {
-		const auto archive = lookupArchive(peer);
-		if (!archive) {
+		const auto count = int(set->ids.list.size());
+		set->loaded = data.vstories().v.empty();
+		set->total = set->loaded ? count : std::max(set->total, count);
+		if (albumId == kStoriesAlbumIdSaved) {
+			setPinnedToTop(peerId, std::move(pinnedToTop));
+		}
+		_albumIdsChanged.fire({ peerId, albumId });
+	};
+	const auto fail = [=] {
+		const auto set = albumIdsSet(peerId, albumId);
+		if (!set) {
 			return;
 		}
-		archive->requestId = 0;
-		archive->loaded = true;
-		archive->total = int(archive->ids.list.size());
-		_archiveChanged.fire_copy(peerId);
-	}).send();
+		set->requestId = 0;
+		set->loaded = true;
+		set->total = int(set->ids.list.size());
+		_albumIdsChanged.fire({ peerId, albumId });
+	};
+	set->requestId = (albumId == kStoriesAlbumIdArchive)
+		? api->request(MTPstories_GetStoriesArchive(
+			peer->input(),
+			MTP_int(set->lastId),
+			MTP_int(set->lastId ? kArchivePerPage : kArchiveFirstPerPage)
+		)).done(done).fail(fail).send()
+		: (albumId == kStoriesAlbumIdSaved)
+		? api->request(MTPstories_GetPinnedStories(
+			peer->input(),
+			MTP_int(set->lastId),
+			MTP_int(set->lastId ? kSavedPerPage : kSavedFirstPerPage)
+		)).done(done).fail(fail).send()
+		: api->request(MTPstories_GetAlbumStories(
+			peer->input(),
+			MTP_int(albumId),
+			MTP_int(reload ? 0 : set->ids.list.size()),
+			MTP_int((reload || set->ids.list.empty())
+				? kSavedFirstPerPage
+				: kSavedPerPage)
+		)).done(done).fail(fail).send();
+}
+
+const base::flat_set<StoryId> &Stories::albumKnownInArchive(
+		PeerId peerId,
+		int albumId) const {
+	static const auto empty = base::flat_set<StoryId>();
+
+	const auto i = _albums.find(peerId);
+	if (i == end(_albums)) {
+		return empty;
+	}
+	const auto j = i->second.sets.find(albumId);
+	return (j != end(i->second.sets))
+		? j->second.albumKnownInArchive
+		: empty;
 }
 
-void Stories::savedLoadMore(PeerId peerId) {
-	auto &saved = _saved[peerId];
-	if (saved.requestId || saved.loaded) {
-		return;
+auto Stories::albumsListValue(PeerId peerId)
+-> rpl::producer<std::vector<Data::StoryAlbum>> {
+	auto &albums = _albums[peerId];
+	if (!albums.requestId) {
+		loadAlbums(_owner->peer(peerId), albums);
 	}
+	return albums.list.value();
+}
+
+void Stories::loadAlbums(not_null<PeerData*> peer, Albums &albums) {
 	const auto api = &_owner->session().api();
-	const auto peer = _owner->peer(peerId);
-	saved.requestId = api->request(MTPstories_GetPinnedStories(
-		peer->input,
-		MTP_int(saved.lastId),
-		MTP_int(saved.lastId ? kSavedPerPage : kSavedFirstPerPage)
-	)).done([=](const MTPstories_Stories &result) {
-		auto &saved = _saved[peerId];
-		saved.requestId = 0;
+	api->request(base::take(albums.requestId)).cancel();
+	albums.requestId = api->request(MTPstories_GetAlbums(
+		peer->input(),
+		MTP_long(albums.hash)
+	)).done([=](const MTPstories_Albums &result) {
+		auto &albums = _albums[peer->id];
+		albums.requestId = 0;
+		result.match([&](const MTPDstories_albums &data) {
+			albums.hash = data.vhash().v;
+			auto parsed = std::vector<Data::StoryAlbum>();
+			const auto &list = data.valbums().v;
+			parsed.reserve(list.size());
+			for (const auto &album : list) {
+				parsed.push_back(FromTL(_owner, album));
+			}
+			albums.list = std::move(parsed);
+		}, [](const MTPDstories_albumsNotModified &) {
+		});
+	}).fail([=] {
+		auto &albums = _albums[peer->id];
+		albums.requestId = 0;
+		albums.hash = 0;
+	}).send();
+}
 
-		const auto &data = result.data();
-		const auto now = base::unixtime::now();
-		auto pinnedToTopIds = data.vpinned_to_top().value_or_empty();
-		auto pinnedToTop = pinnedToTopIds
-			| ranges::views::transform(&MTPint::v)
-			| ranges::to_vector;
-		saved.total = data.vcount().v;
-		for (const auto &story : data.vstories().v) {
-			const auto id = story.match([&](const auto &id) {
-				return id.vid().v;
-			});
-			saved.ids.list.emplace(id);
-			saved.lastId = id;
-			if (!parseAndApply(peer, story, now)) {
-				saved.ids.list.remove(id);
-				if (saved.total > 0) {
-					--saved.total;
+void Stories::albumCreate(
+		not_null<PeerData*> peer,
+		const QString &title,
+		StoryId addId,
+		Fn<void(StoryAlbum)> done,
+		Fn<void(QString)> fail) {
+	auto ids = QVector<MTPint>();
+	if (addId) {
+		ids.push_back(MTP_int(addId));
+	}
+	_owner->session().api().request(MTPstories_CreateAlbum(
+		peer->input(),
+		MTP_string(title),
+		MTP_vector<MTPint>(ids)
+	)).done([=](const MTPStoryAlbum &result) {
+		auto &albums = _albums[peer->id];
+		auto current = albums.list.current();
+		auto parsed = FromTL(_owner, result);
+		current.push_back(parsed);
+		albums.list = std::move(current);
+		loadAlbums(peer, albums);
+		if (const auto onstack = done) {
+			onstack(std::move(parsed));
+		}
+	}).fail([=](const MTP::Error &error) {
+		if (const auto onstack = fail) {
+			onstack(error.type());
+		}
+	}).send();
+}
+
+void Stories::albumRename(
+		not_null<PeerData*> peer,
+		int id,
+		const QString &title,
+		Fn<void(StoryAlbum)> done,
+		Fn<void(QString)> fail) {
+	using Flag = MTPstories_UpdateAlbum::Flag;
+	_owner->session().api().request(MTPstories_UpdateAlbum(
+		MTP_flags(Flag::f_title),
+		peer->input(),
+		MTP_int(id),
+		MTP_string(title),
+		MTPVector<MTPint>(),
+		MTPVector<MTPint>(),
+		MTPVector<MTPint>()
+	)).done([=](const MTPStoryAlbum &result) {
+		auto &albums = _albums[peer->id];
+		auto current = albums.list.current();
+		auto parsed = FromTL(_owner, result);
+		current.push_back(parsed);
+		albums.list = std::move(current);
+		loadAlbums(peer, albums);
+		if (const auto onstack = done) {
+			onstack(std::move(parsed));
+		}
+	}).fail([=](const MTP::Error &error) {
+		if (const auto onstack = fail) {
+			onstack(error.type());
+		}
+	}).send();
+}
+
+void Stories::albumDelete(not_null<PeerData*> peer, int id) {
+	_owner->session().api().request(MTPstories_DeleteAlbum(
+		peer->input(),
+		MTP_int(id)
+	)).send();
+
+	auto &albums = _albums[peer->id];
+	auto current = albums.list.current();
+	current.erase(
+		ranges::remove(current, id, &StoryAlbum::id),
+		end(current));
+	albums.list = std::move(current);
+
+	const auto i = albums.sets.find(id);
+	if (i != end(albums.sets)) {
+		_owner->session().api().request(
+			base::take(i->second.requestId)).cancel();
+		for (const auto storyId : i->second.albumKnownInArchive) {
+			if (const auto story = lookup({ peer->id, storyId })) {
+				auto now = (*story)->albumIds();
+				if (now.remove(id)) {
+					(*story)->setAlbumIds(std::move(now));
 				}
 			}
 		}
-		const auto ids = int(saved.ids.list.size());
-		saved.loaded = data.vstories().v.empty();
-		saved.total = saved.loaded ? ids : std::max(saved.total, ids);
-		setPinnedToTop(peerId, std::move(pinnedToTop));
-		_savedChanged.fire_copy(peerId);
+		albums.sets.erase(i);
+	}
+}
+
+void Stories::albumReorderStories(
+		not_null<PeerData*> peer,
+		int albumId,
+		int oldPosition,
+		int newPosition,
+		Fn<void()> done,
+		Fn<void()> fail) {
+	const auto ids = albumIds(peer->id, albumId);
+	const auto list = RespectingPinned(ids);
+
+	if (oldPosition < 0 || newPosition < 0
+		|| oldPosition >= list.size() || newPosition >= list.size()) {
+		fail();
+		return;
+	}
+
+	if (_reorderStoriesRequestId) {
+		_owner->session().api().request(
+			base::take(_reorderStoriesRequestId)).cancel();
+	}
+
+	auto reorderedList = list;
+	base::reorder(reorderedList, oldPosition, newPosition);
+
+	auto order = QVector<MTPint>();
+	order.reserve(reorderedList.size());
+	for (const auto id : reorderedList) {
+		order.push_back(MTP_int(id));
+	}
+
+	_reorderStoriesRequestId = _owner->session().api().request(
+		MTPstories_UpdateAlbum(
+			MTP_flags(MTPstories_UpdateAlbum::Flag::f_order),
+			peer->input(),
+			MTP_int(albumId),
+			MTPstring(),
+			MTPVector<MTPint>(),
+			MTPVector<MTPint>(),
+			MTP_vector<MTPint>(order)
+	)).done([=](const MTPStoryAlbum &result) {
+		_reorderStoriesRequestId = 0;
+		if (const auto set = albumIdsSet(peer->id, albumId)) {
+			set->ids.list = reorderedList;
+			_albumIdsChanged.fire({ peer->id, albumId });
+		}
+		done();
 	}).fail([=] {
-		auto &saved = _saved[peerId];
-		saved.requestId = 0;
-		saved.loaded = true;
-		saved.total = int(saved.ids.list.size());
-		_savedChanged.fire_copy(peerId);
+		_reorderStoriesRequestId = 0;
+		fail();
 	}).send();
 }
 
+void Stories::notifyAlbumUpdate(StoryAlbumUpdate &&update) {
+	const auto peerId = update.peer->id;
+	const auto i = _albums.find(peerId);
+	if (i != end(_albums)) {
+		const auto albumId = update.albumId;
+		const auto j = i->second.sets.find(albumId);
+		if (j != end(i->second.sets)) {
+			for (const auto &id : update.added) {
+				j->second.albumKnownInArchive.emplace(id);
+				if (const auto story = lookup({ peerId, id })) {
+					auto now = (*story)->albumIds();
+					if (now.emplace(albumId).second) {
+						(*story)->setAlbumIds(std::move(now));
+					}
+				}
+			}
+			for (const auto &id : update.removed) {
+				j->second.albumKnownInArchive.remove(id);
+				if (const auto story = lookup({ peerId, id })) {
+					auto now = (*story)->albumIds();
+					if (now.remove(albumId)) {
+						(*story)->setAlbumIds(std::move(now));
+					}
+				}
+			}
+			albumIdsLoadMore(peerId, albumId, true);
+		}
+	}
+	_albumUpdates.fire(std::move(update));
+}
+
+rpl::producer<StoryAlbumUpdate> Stories::albumUpdates() const {
+	return _albumUpdates.events();
+}
+
 void Stories::setPinnedToTop(
 		PeerId peerId,
 		std::vector<StoryId> &&pinnedToTop) {
@@ -1762,7 +2141,7 @@ void Stories::deleteList(const std::vector<FullStoryId> &ids) {
 	}
 	const auto api = &_owner->session().api();
 	api->request(MTPstories_DeleteStories(
-		peer->input,
+		peer->input(),
 		MTP_vector<MTPint>(list)
 	)).done([=](const MTPVector<MTPint> &result) {
 		for (const auto &id : result.v) {
@@ -1790,7 +2169,7 @@ void Stories::toggleInProfileList(
 	}
 	const auto api = &_owner->session().api();
 	api->request(MTPstories_TogglePinned(
-		peer->input,
+		peer->input(),
 		MTP_vector<MTPint>(list),
 		MTP_bool(inProfile)
 	)).done([=](const MTPVector<MTPint> &result) {
@@ -1811,12 +2190,12 @@ void Stories::toggleInProfileList(
 					const auto add = loaded || (id.v >= lastId);
 					if (!add) {
 						dirty = true;
-					} else if (saved.ids.list.emplace(id.v).second) {
+					} else if (InsertSorted(saved.ids.list, id.v)) {
 						if (saved.total >= 0) {
 							++saved.total;
 						}
 					}
-				} else if (saved.ids.list.remove(id.v)) {
+				} else if (RemoveSorted(saved.ids.list, id.v)) {
 					if (saved.total > 0) {
 						--saved.total;
 					}
@@ -1828,9 +2207,9 @@ void Stories::toggleInProfileList(
 			}
 		}
 		if (dirty) {
-			savedLoadMore(peerId);
+			albumIdsLoadMore(peerId, kStoriesAlbumIdSaved);
 		} else {
-			_savedChanged.fire_copy(peerId);
+			_albumIdsChanged.fire({ peerId, kStoriesAlbumIdSaved });
 		}
 	}).send();
 }
@@ -1875,11 +2254,6 @@ void Stories::togglePinnedList(
 	auto &saved = _saved[peerId];
 	auto list = QVector<MTPint>();
 	list.reserve(maxPinnedCount());
-	for (const auto &id : saved.ids.pinnedToTop) {
-		if (pin || !ranges::contains(ids, FullStoryId{ peerId, id })) {
-			list.push_back(MTP_int(id));
-		}
-	}
 	if (pin) {
 		auto copy = ids;
 		ranges::sort(copy, ranges::greater());
@@ -1890,16 +2264,21 @@ void Stories::togglePinnedList(
 			}
 		}
 	}
+	for (const auto &id : saved.ids.pinnedToTop) {
+		if (pin || !ranges::contains(ids, FullStoryId{ peerId, id })) {
+			list.push_back(MTP_int(id));
+		}
+	}
 	const auto api = &_owner->session().api();
 	const auto peer = session().data().peer(peerId);
 	api->request(MTPstories_TogglePinnedToTop(
-		peer->input,
+		peer->input(),
 		MTP_vector<MTPint>(list)
 	)).done([=] {
 		setPinnedToTop(peerId, list
 			| ranges::views::transform(&MTPint::v)
 			| ranges::to_vector);
-		_savedChanged.fire_copy(peerId);
+		_albumIdsChanged.fire({ peerId, kStoriesAlbumIdSaved });
 	}).send();
 
 }
@@ -1966,18 +2345,25 @@ void Stories::setPreloadingInViewer(std::vector<FullStoryId> ids) {
 
 std::optional<Stories::PeerSourceState> Stories::peerSourceState(
 		not_null<PeerData*> peer,
-		StoryId storyMaxId) {
+		const MTPRecentStory &recent) {
+	const auto &data = recent.data();
+	const auto maxId = data.vmax_id().value_or_empty();
+	const auto live = data.is_live();
 	const auto i = _readTill.find(peer->id);
 	if (_readTillReceived || (i != end(_readTill))) {
 		return PeerSourceState{
-			.maxId = storyMaxId,
+			.maxId = maxId,
 			.readTill = std::min(
-				storyMaxId,
+				maxId,
 				(i != end(_readTill)) ? i->second : 0),
+			.hasVideoStream = live,
 		};
 	}
 	requestReadTills();
-	_pendingPeerStateMaxId[peer] = storyMaxId;
+	_pendingPeerRecentState[peer] = RecentState{
+		.maxId = maxId,
+		.hasVideoStream = live,
+	};
 	return std::nullopt;
 }
 
@@ -1990,8 +2376,8 @@ void Stories::requestReadTills() {
 	)).done([=](const MTPUpdates &result) {
 		_readTillReceived = true;
 		api->applyUpdates(result);
-		for (auto &[peer, maxId] : base::take(_pendingPeerStateMaxId)) {
-			updatePeerStoriesState(peer);
+		for (auto &[peer, recent] : base::take(_pendingPeerRecentState)) {
+			updatePeerStoriesState(peer, recent);
 		}
 		for (const auto &storyId : base::take(_pendingReadTillItems)) {
 			_owner->refreshStoryItemViews(storyId);
@@ -2115,20 +2501,32 @@ void Stories::sendPollingViewsRequests() {
 	_pollingViewsTimer.callOnce(kPollViewsInterval);
 }
 
-void Stories::updatePeerStoriesState(not_null<PeerData*> peer) {
+void Stories::updatePeerStoriesState(
+		not_null<PeerData*> peer,
+		std::optional<RecentState> cachedRecentState) {
 	const auto till = _readTill.find(peer->id);
 	const auto readTill = (till != end(_readTill)) ? till->second : 0;
-	const auto pendingMaxId = [&] {
-		const auto j = _pendingPeerStateMaxId.find(peer);
-		return (j != end(_pendingPeerStateMaxId)) ? j->second : 0;
+	const auto pendingRecentState = [&] {
+		if (cachedRecentState) {
+			return *cachedRecentState;
+		}
+		const auto j = _pendingPeerRecentState.find(peer);
+		return (j != end(_pendingPeerRecentState))
+			? j->second
+			: RecentState();
 	};
 	const auto i = _all.find(peer->id);
-	const auto max = (i != end(_all))
-		? (i->second.ids.empty() ? 0 : i->second.ids.back().id)
-		: pendingMaxId();
-	peer->setStoriesState(!max
+	const auto recent = (i != end(_all))
+		? RecentState{
+			(i->second.ids.empty() ? 0 : i->second.ids.back().id),
+			(!i->second.ids.empty() && i->second.ids.back().videoStream),
+		}
+		: pendingRecentState();
+	peer->setStoriesState(recent.hasVideoStream
+		? PeerData::StoriesState::HasVideoStream
+		: !recent.maxId
 		? PeerData::StoriesState::None
-		: (max <= readTill)
+		: (recent.maxId <= readTill)
 		? PeerData::StoriesState::HasRead
 		: PeerData::StoriesState::HasUnread);
 }
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 4e6b0ce88d662d..b944a76da225e2 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -13,6 +13,10 @@ For license and copyright information please follow this link:
 #include "base/weak_ptr.h"
 #include "data/data_story.h"
 
+namespace Data {
+class GroupCall;
+} // namespace Data
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -23,15 +27,19 @@ class Show;
 
 namespace Data {
 
+inline constexpr auto kStoriesAlbumIdSaved = 0;
+inline constexpr auto kStoriesAlbumIdArchive = -1;
+
 class Folder;
 class Session;
 struct StoryView;
 struct StoryIdDates;
 class Story;
+struct StoryAlbum;
 class StoryPreload;
 
 struct StoriesIds {
-	base::flat_set<StoryId, std::greater<>> list;
+	std::vector<StoryId> list; // flat_set<int, greater> for saved/archive.
 	std::vector<StoryId> pinnedToTop;
 
 	friend inline bool operator==(
@@ -47,6 +55,7 @@ struct StoriesSourceInfo {
 	uint32 count : 15 = 0;
 	uint32 unreadCount : 15 = 0;
 	uint32 premium : 1 = 0;
+	uint32 hasVideoStream : 1 = 0;
 
 	friend inline bool operator==(
 		StoriesSourceInfo,
@@ -58,6 +67,7 @@ struct StoriesSource {
 	base::flat_set<StoryIdDates> ids;
 	StoryId readTill = 0;
 	bool hidden = false;
+	bool hasVideoStream = false;
 
 	[[nodiscard]] StoriesSourceInfo info() const;
 	[[nodiscard]] int unreadCount() const;
@@ -90,26 +100,20 @@ struct StoriesContextPeer {
 	friend inline bool operator==(StoriesContextPeer, StoriesContextPeer) = default;
 };
 
-struct StoriesContextSaved {
-	friend inline auto operator<=>(
-		StoriesContextSaved,
-		StoriesContextSaved) = default;
-	friend inline bool operator==(StoriesContextSaved, StoriesContextSaved) = default;
-};
+struct StoriesContextAlbum {
+	int id = 0;
 
-struct StoriesContextArchive {
 	friend inline auto operator<=>(
-		StoriesContextArchive,
-		StoriesContextArchive) = default;
-	friend inline bool operator==(StoriesContextArchive, StoriesContextArchive) = default;
+		StoriesContextAlbum,
+		StoriesContextAlbum) = default;
+	friend inline bool operator==(StoriesContextAlbum, StoriesContextAlbum) = default;
 };
 
 struct StoriesContext {
 	std::variant<
 		StoriesContextSingle,
 		StoriesContextPeer,
-		StoriesContextSaved,
-		StoriesContextArchive,
+		StoriesContextAlbum,
 		StorySourcesList> data;
 
 	friend inline auto operator<=>(
@@ -126,8 +130,27 @@ struct StealthMode {
 	friend inline bool operator==(StealthMode, StealthMode) = default;
 };
 
+struct StoryAlbumUpdate {
+	not_null<PeerData*> peer;
+	int albumId = 0;
+	std::vector<StoryId> added;
+	std::vector<StoryId> removed;
+};
+
 inline constexpr auto kStorySourcesListCount = 2;
 
+struct StoryAlbumIdsKey {
+	PeerId peerId;
+	int albumId = 0;
+
+	friend inline auto operator<=>(
+		StoryAlbumIdsKey,
+		StoryAlbumIdsKey) = default;
+	friend inline bool operator==(
+		StoryAlbumIdsKey,
+		StoryAlbumIdsKey) = default;
+};
+
 class Stories final : public base::has_weak_ptr {
 public:
 	explicit Stories(not_null<Session*> owner);
@@ -135,6 +158,8 @@ class Stories final : public base::has_weak_ptr {
 
 	static constexpr auto kInProfileToastDuration = 4 * crl::time(1000);
 
+	void clear();
+
 	[[nodiscard]] Session &owner() const;
 	[[nodiscard]] Main::Session &session() const;
 
@@ -192,19 +217,42 @@ class Stories final : public base::has_weak_ptr {
 
 	[[nodiscard]] bool hasArchive(not_null<PeerData*> peer) const;
 
-	[[nodiscard]] const StoriesIds &archive(PeerId peerId) const;
-	[[nodiscard]] rpl::producer<PeerId> archiveChanged() const;
-	[[nodiscard]] int archiveCount(PeerId peerId) const;
-	[[nodiscard]] bool archiveCountKnown(PeerId peerId) const;
-	[[nodiscard]] bool archiveLoaded(PeerId peerId) const;
-	void archiveLoadMore(PeerId peerId);
+	[[nodiscard]] const StoriesIds &albumIds(
+		PeerId peerId,
+		int albumId) const;
+	[[nodiscard]] rpl::producer<StoryAlbumIdsKey> albumIdsChanged() const;
+	[[nodiscard]] int albumIdsCount(PeerId peerId, int albumId) const;
+	[[nodiscard]] bool albumIdsCountKnown(PeerId peerId, int albumId) const;
+	[[nodiscard]] bool albumIdsLoaded(PeerId peerId, int albumId) const;
+	void albumIdsLoadMore(PeerId peerId, int albumId);
+	[[nodiscard]] const base::flat_set<StoryId> &albumKnownInArchive(
+		PeerId peerId,
+		int albumId) const;
 
-	[[nodiscard]] const StoriesIds &saved(PeerId peerId) const;
-	[[nodiscard]] rpl::producer<PeerId> savedChanged() const;
-	[[nodiscard]] int savedCount(PeerId peerId) const;
-	[[nodiscard]] bool savedCountKnown(PeerId peerId) const;
-	[[nodiscard]] bool savedLoaded(PeerId peerId) const;
-	void savedLoadMore(PeerId peerId);
+	[[nodiscard]] auto albumsListValue(PeerId peerId)
+		-> rpl::producer<std::vector<Data::StoryAlbum>>;
+	void albumCreate(
+		not_null<PeerData*> peer,
+		const QString &title,
+		StoryId addId,
+		Fn<void(StoryAlbum)> done,
+		Fn<void(QString)> fail);
+	void albumRename(
+		not_null<PeerData*> peer,
+		int id,
+		const QString &title,
+		Fn<void(StoryAlbum)> done,
+		Fn<void(QString)> fail);
+	void albumDelete(not_null<PeerData*> peer, int id);
+	void albumReorderStories(
+		not_null<PeerData*> peer,
+		int albumId,
+		int oldPosition,
+		int newPosition,
+		Fn<void()> done,
+		Fn<void()> fail);
+	void notifyAlbumUpdate(StoryAlbumUpdate &&update);
+	[[nodiscard]] rpl::producer<StoryAlbumUpdate> albumUpdates() const;
 
 	void deleteList(const std::vector<FullStoryId> &ids);
 	void toggleInProfileList(
@@ -225,10 +273,11 @@ class Stories final : public base::has_weak_ptr {
 	struct PeerSourceState {
 		StoryId maxId = 0;
 		StoryId readTill = 0;
+		bool hasVideoStream = false;
 	};
 	[[nodiscard]] std::optional<PeerSourceState> peerSourceState(
 		not_null<PeerData*> peer,
-		StoryId storyMaxId);
+		const MTPRecentStory &recent);
 	[[nodiscard]] bool isUnread(not_null<Story*> story);
 
 	enum class Polling {
@@ -257,18 +306,33 @@ class Stories final : public base::has_weak_ptr {
 private:
 	struct Set {
 		StoriesIds ids;
+		base::flat_set<StoryId> albumKnownInArchive;
 		int total = -1;
 		StoryId lastId = 0;
 		bool loaded = false;
 		mtpRequestId requestId = 0;
 	};
-
+	struct Albums {
+		rpl::variable<std::vector<Data::StoryAlbum>> list;
+		base::flat_map<int, Set> sets;
+		uint64 hash = 0;
+		mtpRequestId requestId = 0;
+	};
+	struct RecentState {
+		StoryId maxId = 0;
+		bool hasVideoStream = false;
+	};
 	struct PollingSettings {
 		int chat = 0;
 		int viewer = 0;
 	};
+	enum class ParseSource : uchar {
+		MyStrip,
+		DirectRequest,
+	};
 
-	void parseAndApply(const MTPPeerStories &stories);
+	void albumIdsLoadMore(PeerId peerId, int albumId, bool reload);
+	void parseAndApply(const MTPPeerStories &stories, ParseSource source);
 	[[nodiscard]] Story *parseAndApply(
 		not_null<PeerData*> peer,
 		const MTPDstoryItem &data,
@@ -282,11 +346,16 @@ class Stories final : public base::has_weak_ptr {
 		const QVector<MTPStoryItem> &list);
 	void sendResolveRequests();
 	void finalizeResolve(FullStoryId id);
-	void updatePeerStoriesState(not_null<PeerData*> peer);
+	void updatePeerStoriesState(
+		not_null<PeerData*> peer,
+		std::optional<RecentState> cachedRecentState = std::nullopt);
 
 	[[nodiscard]] Set *lookupArchive(not_null<PeerData*> peer);
 	void clearArchive(not_null<PeerData*> peer);
 
+	const Set *albumIdsSet(PeerId peerId, int albumId) const;
+	Set *albumIdsSet(PeerId peerId, int albumId, bool lazy = false);
+
 	void applyDeleted(not_null<PeerData*> peer, StoryId id);
 	void applyExpired(FullStoryId id);
 	void applyRemovedFromActive(FullStoryId id);
@@ -331,6 +400,8 @@ class Stories final : public base::has_weak_ptr {
 	void sendViewsSliceRequest();
 	void sendViewsCountsRequest();
 
+	void loadAlbums(not_null<PeerData*> peer, Albums &albums);
+
 	const not_null<Session*> _owner;
 	std::unordered_map<
 		PeerId,
@@ -369,10 +440,10 @@ class Stories final : public base::has_weak_ptr {
 	rpl::event_stream<PeerId> _itemsChanged;
 
 	std::unordered_map<PeerId, Set> _archive;
-	rpl::event_stream<PeerId> _archiveChanged;
-
 	std::unordered_map<PeerId, Set> _saved;
-	rpl::event_stream<PeerId> _savedChanged;
+	std::unordered_map<PeerId, Albums> _albums;
+	rpl::event_stream<StoryAlbumUpdate> _albumUpdates;
+	rpl::event_stream<StoryAlbumIdsKey> _albumIdsChanged;
 
 	base::flat_set<PeerId> _markReadPending;
 	base::Timer _markReadTimer;
@@ -406,7 +477,7 @@ class Stories final : public base::has_weak_ptr {
 
 	base::flat_map<PeerId, StoryId> _readTill;
 	base::flat_set<FullStoryId> _pendingReadTillItems;
-	base::flat_map<not_null<PeerData*>, StoryId> _pendingPeerStateMaxId;
+	base::flat_map<not_null<PeerData*>, RecentState> _pendingPeerRecentState;
 	mtpRequestId _readTillsRequestId = 0;
 	bool _readTillReceived = false;
 
@@ -415,6 +486,8 @@ class Stories final : public base::has_weak_ptr {
 	base::Timer _pollingTimer;
 	base::Timer _pollingViewsTimer;
 
+	mtpRequestId _reorderStoriesRequestId = 0;
+
 	rpl::variable<StealthMode> _stealthMode;
 
 	rpl::lifetime _lifetime;
diff --git a/Telegram/SourceFiles/data/data_stories_ids.cpp b/Telegram/SourceFiles/data/data_stories_ids.cpp
index d2ac334272a9e2..d6e85edd562d12 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.cpp
+++ b/Telegram/SourceFiles/data/data_stories_ids.cpp
@@ -16,8 +16,9 @@ For license and copyright information please follow this link:
 
 namespace Data {
 
-rpl::producer<StoriesIdsSlice> SavedStoriesIds(
+rpl::producer<StoriesIdsSlice> AlbumStoriesIds(
 		not_null<PeerData*> peer,
+		int albumId,
 		StoryId aroundId,
 		int limit) {
 	return [=](auto consumer) {
@@ -35,22 +36,20 @@ rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 
 			const auto peerId = peer->id;
 			const auto stories = &peer->owner().stories();
-			if (!stories->savedCountKnown(peerId)) {
+			if (!stories->albumIdsCountKnown(peerId, albumId)) {
 				return;
 			}
-
-			const auto &saved = stories->saved(peerId);
-			const auto sorted = RespectingPinned(saved);
-			const auto count = stories->savedCount(peerId);
+			const auto &loaded = stories->albumIds(peerId, albumId);
+			const auto sorted = RespectingPinned(loaded);
+			const auto count = stories->albumIdsCount(peerId, albumId);
 			auto i = ranges::find(sorted, aroundId);
 			if (i == end(sorted)) {
-				const auto j = saved.list.lower_bound(aroundId);
-				i = begin(sorted) + int(j - begin(saved.list));
+				i = begin(sorted);
 			}
 			const auto hasBefore = int(i - begin(sorted));
 			const auto hasAfter = int(end(sorted) - i);
 			if (hasAfter < limit) {
-				stories->savedLoadMore(peerId);
+				stories->albumIdsLoadMore(peerId, albumId);
 			}
 			const auto takeBefore = std::min(hasBefore, limit);
 			const auto takeAfter = std::min(hasAfter, limit);
@@ -64,7 +63,7 @@ rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 				std::move(ids),
 				count,
 				(hasBefore - takeBefore),
-				count - hasBefore - added);
+				count - (hasBefore - takeBefore) - added);
 			consumer.put_next_copy(state->slice);
 		};
 		const auto schedule = [=] {
@@ -81,91 +80,13 @@ rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 
 		const auto peerId = peer->id;
 		const auto stories = &peer->owner().stories();
-		stories->savedChanged(
+		stories->albumIdsChanged(
 		) | rpl::filter(
-			rpl::mappers::_1 == peerId
-		) | rpl::start_with_next(schedule, lifetime);
-
-		if (!stories->savedCountKnown(peerId)) {
-			stories->savedLoadMore(peerId);
-		}
-
-		push();
-
-		return lifetime;
-	};
-}
-
-rpl::producer<StoriesIdsSlice> ArchiveStoriesIds(
-		not_null<PeerData*> peer,
-		StoryId aroundId,
-		int limit) {
-	return [=](auto consumer) {
-		auto lifetime = rpl::lifetime();
-
-		struct State {
-			StoriesIdsSlice slice;
-			base::has_weak_ptr guard;
-			bool scheduled = false;
-		};
-		const auto state = lifetime.make_state<State>();
-
-		const auto push = [=] {
-			state->scheduled = false;
-
-			const auto peerId = peer->id;
-			const auto stories = &peer->owner().stories();
-			if (!stories->archiveCountKnown(peerId)) {
-				return;
-			}
-
-			const auto &archive = stories->archive(peerId);
-			const auto sorted = RespectingPinned(archive);
-			const auto count = stories->savedCount(peerId);
-			auto i = ranges::find(sorted, aroundId);
-			if (i == end(sorted)) {
-				const auto j = archive.list.lower_bound(aroundId);
-				i = begin(sorted) + int(j - begin(archive.list));
-			}
-			const auto hasBefore = int(i - begin(sorted));
-			const auto hasAfter = int(end(sorted) - i);
-			if (hasAfter < limit) {
-				stories->archiveLoadMore(peerId);
-			}
-			const auto takeBefore = std::min(hasBefore, limit);
-			const auto takeAfter = std::min(hasAfter, limit);
-			auto ids = std::vector<StoryId>();
-			ids.reserve(takeBefore + takeAfter);
-			for (auto j = i - takeBefore; j != i + takeAfter; ++j) {
-				ids.push_back(*j);
-			}
-			const auto added = int(ids.size());
-			state->slice = StoriesIdsSlice(
-				std::move(ids),
-				count,
-				(hasBefore - takeBefore),
-				count - hasBefore - added);
-			consumer.put_next_copy(state->slice);
-		};
-		const auto schedule = [=] {
-			if (state->scheduled) {
-				return;
-			}
-			state->scheduled = true;
-			Ui::PostponeCall(&state->guard, [=] {
-				if (state->scheduled) {
-					push();
-				}
-			});
-		};
-
-		const auto peerId = peer->id;
-		const auto stories = &peer->owner().stories();
-		stories->archiveChanged(
-		) | rpl::start_with_next(schedule, lifetime);
+			rpl::mappers::_1 == Data::StoryAlbumIdsKey{ peerId, albumId }
+		) | rpl::on_next(schedule, lifetime);
 
-		if (!stories->archiveCountKnown(peerId)) {
-			stories->archiveLoadMore(peerId);
+		if (!stories->albumIdsCountKnown(peerId, albumId)) {
+			stories->albumIdsLoadMore(peerId, albumId);
 		}
 
 		push();
diff --git a/Telegram/SourceFiles/data/data_stories_ids.h b/Telegram/SourceFiles/data/data_stories_ids.h
index 88a5103b3bac5c..67d651ca531a60 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.h
+++ b/Telegram/SourceFiles/data/data_stories_ids.h
@@ -19,13 +19,9 @@ namespace Data {
 
 using StoriesIdsSlice = AbstractSparseIds<std::vector<StoryId>>;
 
-[[nodiscard]] rpl::producer<StoriesIdsSlice> SavedStoriesIds(
-	not_null<PeerData*> peer,
-	StoryId aroundId,
-	int limit);
-
-[[nodiscard]] rpl::producer<StoriesIdsSlice> ArchiveStoriesIds(
+[[nodiscard]] rpl::producer<StoriesIdsSlice> AlbumStoriesIds(
 	not_null<PeerData*> peer,
+	int albumId,
 	StoryId aroundId,
 	int limit);
 
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index 9adcad0152ee21..deb5afa27aba87 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -87,6 +87,7 @@ using UpdateFlag = StoryUpdate::Flag;
 	}, [&](const MTPDmediaAreaChannelPost &data) {
 	}, [&](const MTPDmediaAreaUrl &data) {
 	}, [&](const MTPDmediaAreaWeather &data) {
+	}, [&](const MTPDmediaAreaStarGift &data) {
 	}, [&](const MTPDinputMediaAreaChannelPost &data) {
 		LOG(("API Error: Unexpected inputMediaAreaChannelPost from API."));
 	}, [&](const MTPDinputMediaAreaVenue &data) {
@@ -110,6 +111,7 @@ using UpdateFlag = StoryUpdate::Flag;
 	}, [&](const MTPDmediaAreaChannelPost &data) {
 	}, [&](const MTPDmediaAreaUrl &data) {
 	}, [&](const MTPDmediaAreaWeather &data) {
+	}, [&](const MTPDmediaAreaStarGift &data) {
 	}, [&](const MTPDinputMediaAreaChannelPost &data) {
 		LOG(("API Error: Unexpected inputMediaAreaChannelPost from API."));
 	}, [&](const MTPDinputMediaAreaVenue &data) {
@@ -133,6 +135,7 @@ using UpdateFlag = StoryUpdate::Flag;
 		});
 	}, [&](const MTPDmediaAreaUrl &data) {
 	}, [&](const MTPDmediaAreaWeather &data) {
+	}, [&](const MTPDmediaAreaStarGift &data) {
 	}, [&](const MTPDinputMediaAreaChannelPost &data) {
 		LOG(("API Error: Unexpected inputMediaAreaChannelPost from API."));
 	}, [&](const MTPDinputMediaAreaVenue &data) {
@@ -154,6 +157,11 @@ using UpdateFlag = StoryUpdate::Flag;
 			.url = qs(data.vurl()),
 		});
 	}, [&](const MTPDmediaAreaWeather &data) {
+	}, [&](const MTPDmediaAreaStarGift &data) {
+		result.emplace(UrlArea{
+			.area = ParseArea(data.vcoordinates()),
+			.url = u"tg://nft?slug="_q + qs(data.vslug()),
+		});
 	}, [&](const MTPDinputMediaAreaChannelPost &data) {
 		LOG(("API Error: Unexpected inputMediaAreaChannelPost from API."));
 	}, [&](const MTPDinputMediaAreaVenue &data) {
@@ -180,6 +188,7 @@ using UpdateFlag = StoryUpdate::Flag;
 				-274.,
 				1'000'000.)),
 		});
+	}, [&](const MTPDmediaAreaStarGift &data) {
 	}, [&](const MTPDinputMediaAreaChannelPost &data) {
 		LOG(("API Error: Unexpected inputMediaAreaChannelPost from API."));
 	}, [&](const MTPDinputMediaAreaVenue &data) {
@@ -270,7 +279,12 @@ bool Story::mine() const {
 }
 
 StoryIdDates Story::idDates() const {
-	return { _id, _date, _expires };
+	return {
+		_id,
+		_date,
+		_expires,
+		std::holds_alternative<std::shared_ptr<GroupCall>>(_media.data),
+	};
 }
 
 FullStoryId Story::fullId() const {
@@ -307,11 +321,20 @@ DocumentData *Story::document() const {
 	return result ? result->get() : nullptr;
 }
 
+const std::shared_ptr<GroupCall> &Story::call() const {
+	const auto result = std::get_if<std::shared_ptr<GroupCall>>(
+		&_media.data);
+	static const auto empty = std::shared_ptr<GroupCall>();
+	return result ? *result : empty;
+}
+
 bool Story::hasReplyPreview() const {
 	return v::match(_media.data, [](not_null<PhotoData*> photo) {
 		return !photo->isNull();
 	}, [](not_null<DocumentData*> document) {
 		return document->hasThumbnail();
+	}, [](const std::shared_ptr<GroupCall> &call) {
+		return false;
 	}, [](v::null_t) {
 		return false;
 	});
@@ -322,6 +345,8 @@ Image *Story::replyPreview() const {
 		return photo->getReplyPreview(fullId(), _peer, false);
 	}, [&](not_null<DocumentData*> document) {
 		return document->getReplyPreview(fullId(), _peer, false);
+	}, [](const std::shared_ptr<GroupCall> &call) {
+		return (Image*)nullptr;
 	}, [](v::null_t) {
 		return (Image*)nullptr;
 	});
@@ -338,10 +363,10 @@ TextWithEntities Story::inReplyText() const {
 				tr::now,
 				lt_media,
 				Ui::Text::Colorized(type),
-				Ui::Text::WithEntities),
+				tr::marked),
 			lt_caption,
 			_caption,
-			Ui::Text::WithEntities);
+			tr::marked);
 }
 
 void Story::setPinnedToTop(bool pinned) {
@@ -358,7 +383,12 @@ bool Story::pinnedToTop() const {
 }
 
 void Story::setInProfile(bool value) {
-	_inProfile = value;
+	if (_inProfile != value) {
+		_inProfile = value;
+		if (const auto item = _peer->owner().stories().lookupItem(this)) {
+			item->setStoryInProfile(value);
+		}
+	}
 }
 
 bool Story::inProfile() const {
@@ -405,11 +435,7 @@ bool Story::canShare() const {
 }
 
 bool Story::canDelete() const {
-	if (const auto channel = _peer->asChannel()) {
-		return channel->canDeleteStories()
-			|| (out() && channel->canPostStories());
-	}
-	return _peer->isSelf();
+	return _peer->canDeleteStories() || (out() && _peer->canPostStories());
 }
 
 bool Story::canReport() const {
@@ -423,7 +449,7 @@ bool Story::hasDirectLink() const {
 	return !_peer->username().isEmpty();
 }
 
-std::optional<QString> Story::errorTextForForward(
+Data::SendError Story::errorTextForForward(
 		not_null<Thread*> to) const {
 	const auto peer = to->peer();
 	const auto holdsPhoto = v::is<not_null<PhotoData*>>(_media.data);
@@ -433,10 +459,10 @@ std::optional<QString> Story::errorTextForForward(
 	const auto second = holdsPhoto
 		? ChatRestriction::SendVideos
 		: ChatRestriction::SendPhotos;
-	if (const auto error = Data::RestrictionError(peer, first)) {
-		return *error;
-	} else if (const auto error = Data::RestrictionError(peer, second)) {
-		return *error;
+	if (const auto one = Data::RestrictionError(peer, first)) {
+		return one;
+	} else if (const auto two = Data::RestrictionError(peer, second)) {
+		return two;
 	} else if (!Data::CanSend(to, first, false)
 		|| !Data::CanSend(to, second, false)) {
 		return tr::lng_forward_cant(tr::now);
@@ -701,7 +727,7 @@ void Story::applyFields(
 	auto caption = TextWithEntities{
 		data.vcaption().value_or_empty(),
 		Api::EntitiesFromMTP(
-			&owner().session(),
+			&session(),
 			data.ventities().value_or_empty()),
 	};
 	if (const auto user = _peer->asUser()) {
@@ -894,6 +920,14 @@ StoryId Story::repostSourceId() const {
 	return _repostSourceId;
 }
 
+const base::flat_set<int> &Story::albumIds() const {
+	return _albumIds;
+}
+
+void Story::setAlbumIds(base::flat_set<int> ids) {
+	_albumIds = std::move(ids);
+}
+
 PeerData *Story::fromPeer() const {
 	return _fromPeer;
 }
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index 490f979ce29f12..4d6fb17dada27e 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -21,9 +21,11 @@ class Session;
 
 namespace Data {
 
+class GroupCall;
 class Session;
 class Thread;
 class MediaPreload;
+struct SendError;
 
 enum class StoryPrivacy : uchar {
 	Public,
@@ -37,6 +39,7 @@ struct StoryIdDates {
 	StoryId id = 0;
 	TimeId date = 0;
 	TimeId expires = 0;
+	bool videoStream = false;
 
 	[[nodiscard]] bool valid() const {
 		return id != 0;
@@ -53,7 +56,8 @@ struct StoryMedia {
 	std::variant<
 		v::null_t,
 		not_null<PhotoData*>,
-		not_null<DocumentData*>> data;
+		not_null<DocumentData*>,
+		std::shared_ptr<GroupCall>> data;
 
 	friend inline bool operator==(StoryMedia, StoryMedia) = default;
 };
@@ -169,6 +173,7 @@ class Story final {
 	[[nodiscard]] const StoryMedia &media() const;
 	[[nodiscard]] PhotoData *photo() const;
 	[[nodiscard]] DocumentData *document() const;
+	[[nodiscard]] const std::shared_ptr<GroupCall> &call() const;
 
 	[[nodiscard]] bool hasReplyPreview() const;
 	[[nodiscard]] Image *replyPreview() const;
@@ -191,7 +196,7 @@ class Story final {
 	[[nodiscard]] bool canReport() const;
 
 	[[nodiscard]] bool hasDirectLink() const;
-	[[nodiscard]] std::optional<QString> errorTextForForward(
+	[[nodiscard]] Data::SendError errorTextForForward(
 		not_null<Thread*> to) const;
 
 	void setCaption(TextWithEntities &&caption);
@@ -236,6 +241,9 @@ class Story final {
 	[[nodiscard]] QString repostSourceName() const;
 	[[nodiscard]] StoryId repostSourceId() const;
 
+	[[nodiscard]] const base::flat_set<int> &albumIds() const;
+	void setAlbumIds(base::flat_set<int> ids);
+
 	[[nodiscard]] PeerData *fromPeer() const;
 
 private:
@@ -264,6 +272,7 @@ class Story final {
 	PeerData * const _repostSourcePeer = nullptr;
 	const QString _repostSourceName;
 	const StoryId _repostSourceId = 0;
+	base::flat_set<int> _albumIds;
 	PeerData * const _fromPeer = nullptr;
 	Data::ReactionId _sentReactionId;
 	StoryMedia _media;
@@ -307,4 +316,15 @@ class StoryPreload final : public base::has_weak_ptr {
 
 };
 
+struct StoryAlbum {
+	int id = 0;
+	QString title;
+	PhotoData *iconPhoto = nullptr;
+	DocumentData *iconVideo = nullptr;
+
+	friend inline bool operator==(
+		const StoryAlbum &,
+		const StoryAlbum &) = default;
+};
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_streaming.cpp b/Telegram/SourceFiles/data/data_streaming.cpp
index dd3b13b38cddc8..658c83807e1187 100644
--- a/Telegram/SourceFiles/data/data_streaming.cpp
+++ b/Telegram/SourceFiles/data/data_streaming.cpp
@@ -41,6 +41,43 @@ bool PruneDestroyedAndSet(
 	return result;
 }
 
+[[nodiscard]] auto LookupOtherQualities(
+	DocumentData *original,
+	not_null<DocumentData*> quality,
+	HistoryItem *context)
+-> std::vector<Media::Streaming::QualityDescriptor> {
+	if (!original || !context) {
+		return {};
+	}
+	auto qualities = original->resolveQualities(context);
+	if (qualities.empty()) {
+		return {};
+	}
+	auto result = std::vector<Media::Streaming::QualityDescriptor>();
+	result.reserve(qualities.size());
+	for (const auto &video : qualities) {
+		if (video != quality) {
+			if (const auto height = video->resolveVideoQuality()) {
+				result.push_back({
+					.sizeInBytes = uint32(video->size),
+					.height = uint32(height),
+				});
+			}
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] auto LookupOtherQualities(
+	DocumentData *original,
+	not_null<PhotoData*> quality,
+	HistoryItem *context)
+-> std::vector<Media::Streaming::QualityDescriptor> {
+	Expects(!original);
+
+	return {};
+}
+
 } // namespace
 
 Streaming::Streaming(not_null<Session*> owner)
@@ -50,7 +87,6 @@ Streaming::Streaming(not_null<Session*> owner)
 
 Streaming::~Streaming() = default;
 
-
 template <typename Data>
 [[nodiscard]] std::shared_ptr<Streaming::Reader> Streaming::sharedReader(
 		base::flat_map<not_null<Data*>, std::weak_ptr<Reader>> &readers,
@@ -84,10 +120,16 @@ template <typename Data>
 		base::flat_map<not_null<Data*>, std::weak_ptr<Document>> &documents,
 		base::flat_map<not_null<Data*>, std::weak_ptr<Reader>> &readers,
 		not_null<Data*> data,
+		DocumentData *original,
+		HistoryItem *context,
 		FileOrigin origin) {
+	auto otherQualities = LookupOtherQualities(original, data, context);
 	const auto i = documents.find(data);
 	if (i != end(documents)) {
 		if (auto result = i->second.lock()) {
+			if (!otherQualities.empty()) {
+				result->setOtherQualities(std::move(otherQualities));
+			}
 			return result;
 		}
 	}
@@ -95,7 +137,10 @@ template <typename Data>
 	if (!reader) {
 		return nullptr;
 	}
-	auto result = std::make_shared<Document>(data, std::move(reader));
+	auto result = std::make_shared<Document>(
+		data,
+		std::move(reader),
+		std::move(otherQualities));
 	if (!PruneDestroyedAndSet(documents, data, result)) {
 		documents.emplace_or_assign(data, result);
 	}
@@ -136,7 +181,27 @@ std::shared_ptr<Streaming::Reader> Streaming::sharedReader(
 std::shared_ptr<Streaming::Document> Streaming::sharedDocument(
 		not_null<DocumentData*> document,
 		FileOrigin origin) {
-	return sharedDocument(_fileDocuments, _fileReaders, document, origin);
+	return sharedDocument(
+		_fileDocuments,
+		_fileReaders,
+		document,
+		nullptr,
+		nullptr,
+		origin);
+}
+
+std::shared_ptr<Streaming::Document> Streaming::sharedDocument(
+		not_null<DocumentData*> quality,
+		not_null<DocumentData*> original,
+		HistoryItem *context,
+		FileOrigin origin) {
+	return sharedDocument(
+		_fileDocuments,
+		_fileReaders,
+		quality,
+		original,
+		context,
+		origin);
 }
 
 std::shared_ptr<Streaming::Reader> Streaming::sharedReader(
@@ -149,7 +214,13 @@ std::shared_ptr<Streaming::Reader> Streaming::sharedReader(
 std::shared_ptr<Streaming::Document> Streaming::sharedDocument(
 		not_null<PhotoData*> photo,
 		FileOrigin origin) {
-	return sharedDocument(_photoDocuments, _photoReaders, photo, origin);
+	return sharedDocument(
+		_photoDocuments,
+		_photoReaders,
+		photo,
+		nullptr,
+		nullptr,
+		origin);
 }
 
 void Streaming::keepAlive(not_null<DocumentData*> document) {
diff --git a/Telegram/SourceFiles/data/data_streaming.h b/Telegram/SourceFiles/data/data_streaming.h
index 14e863f4a269d5..51a6f185494350 100644
--- a/Telegram/SourceFiles/data/data_streaming.h
+++ b/Telegram/SourceFiles/data/data_streaming.h
@@ -12,12 +12,10 @@ For license and copyright information please follow this link:
 class PhotoData;
 class DocumentData;
 
-namespace Media {
-namespace Streaming {
+namespace Media::Streaming {
 class Reader;
 class Document;
-} // namespace Streaming
-} // namespace Media
+} // namespace Media::Streaming
 
 namespace Data {
 
@@ -41,6 +39,11 @@ class Streaming final {
 	[[nodiscard]] std::shared_ptr<Document> sharedDocument(
 		not_null<DocumentData*> document,
 		FileOrigin origin);
+	[[nodiscard]] std::shared_ptr<Document> sharedDocument(
+		not_null<DocumentData*> quality,
+		not_null<DocumentData*> original,
+		HistoryItem *context,
+		FileOrigin origin);
 
 	[[nodiscard]] std::shared_ptr<Reader> sharedReader(
 		not_null<PhotoData*> photo,
@@ -68,6 +71,8 @@ class Streaming final {
 		base::flat_map<not_null<Data*>, std::weak_ptr<Document>> &documents,
 		base::flat_map<not_null<Data*>, std::weak_ptr<Reader>> &readers,
 		not_null<Data*> data,
+		DocumentData *original,
+		HistoryItem *context,
 		FileOrigin origin);
 
 	template <typename Data>
diff --git a/Telegram/SourceFiles/data/data_subscriptions.h b/Telegram/SourceFiles/data/data_subscriptions.h
index 69af0d4d670516..d6e72b911a07aa 100644
--- a/Telegram/SourceFiles/data/data_subscriptions.h
+++ b/Telegram/SourceFiles/data/data_subscriptions.h
@@ -25,10 +25,14 @@ struct SubscriptionEntry final {
 
 	QString id;
 	QString inviteHash;
+	QString title;
+	QString slug;
 	QDateTime until;
 	PeerSubscription subscription;
 	uint64 barePeerId = 0;
+	uint64 photoId = 0;
 	bool cancelled = false;
+	bool cancelledByBot = false;
 	bool expired = false;
 	bool canRefulfill = false;
 };
diff --git a/Telegram/SourceFiles/data/data_thread.cpp b/Telegram/SourceFiles/data/data_thread.cpp
index 1934c345079c68..5fd76d016221c5 100644
--- a/Telegram/SourceFiles/data/data_thread.cpp
+++ b/Telegram/SourceFiles/data/data_thread.cpp
@@ -7,9 +7,13 @@ For license and copyright information please follow this link:
 */
 #include "data/data_thread.h"
 
+#include "data/data_forum.h"
 #include "data/data_forum_topic.h"
 #include "data/data_changes.h"
+#include "data/data_channel.h"
 #include "data/data_peer.h"
+#include "data/data_saved_messages.h"
+#include "data/data_saved_sublist.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_unread_things.h"
@@ -31,6 +35,20 @@ MsgId Thread::topicRootId() const {
 	return MsgId();
 }
 
+PeerId Thread::monoforumPeerId() const {
+	if (const auto sublist = asSublist()) {
+		return sublist->sublistPeer()->id;
+	}
+	return PeerId();
+}
+
+PeerData *Thread::maybeSublistPeer() const {
+	if (const auto sublist = asSublist()) {
+		return sublist->sublistPeer();
+	}
+	return nullptr;
+}
+
 not_null<PeerData*> Thread::peer() const {
 	return owningHistory()->peer;
 }
@@ -80,6 +98,33 @@ HistoryUnreadThings::ConstProxy Thread::unreadReactions() const {
 	};
 }
 
+HistoryUnreadThings::Proxy Thread::unreadPollVotes() {
+	return {
+		this,
+		_unreadThings,
+		HistoryUnreadThings::Type::PollVotes,
+		!!(_flags & Flag::UnreadThingsKnown),
+	};
+}
+
+HistoryUnreadThings::ConstProxy Thread::unreadPollVotes() const {
+	return {
+		_unreadThings ? &_unreadThings->pollVotes : nullptr,
+		!!(_flags & Flag::UnreadThingsKnown),
+	};
+}
+
+bool Thread::canToggleUnread(bool nowUnread) const {
+	if ((asTopic() || asForum()) && !nowUnread) {
+		return false;
+	} else if (asSublist() && owningHistory()->peer->isSelf()) {
+		return false;
+	} else if (asHistory() && peer()->amMonoforumAdmin()) {
+		return false;
+	}
+	return true;
+}
+
 const base::flat_set<MsgId> &Thread::unreadMentionsIds() const {
 	if (!_unreadThings) {
 		static const auto Result = base::flat_set<MsgId>();
@@ -96,6 +141,14 @@ const base::flat_set<MsgId> &Thread::unreadReactionsIds() const {
 	return _unreadThings->reactions.ids();
 }
 
+const base::flat_set<MsgId> &Thread::unreadPollVotesIds() const {
+	if (!_unreadThings) {
+		static const auto Result = base::flat_set<MsgId>();
+		return Result;
+	}
+	return _unreadThings->pollVotes.ids();
+}
+
 void Thread::clearNotifications() {
 	_notifications.clear();
 }
@@ -176,4 +229,16 @@ void Thread::setHasPinnedMessages(bool has) {
 		EntryUpdate::Flag::HasPinnedMessages);
 }
 
+void Thread::saveMeAsActiveSubsectionThread() {
+	if (const auto peer = owningHistory()->peer; peer->useSubsectionTabs()) {
+		if (const auto forum = peer->forum()) {
+			forum->saveActiveSubsectionThread(this);
+		} else if (const auto channel = peer->asChannel()) {
+			if (const auto monoforum = channel->monoforum()) {
+				monoforum->saveActiveSubsectionThread(this);
+			}
+		}
+	}
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_thread.h b/Telegram/SourceFiles/data/data_thread.h
index 9bbc6635fe96b4..9756e25020f83f 100644
--- a/Telegram/SourceFiles/data/data_thread.h
+++ b/Telegram/SourceFiles/data/data_thread.h
@@ -43,11 +43,12 @@ class PeerNotifySettings;
 enum class ItemNotificationType {
 	Message,
 	Reaction,
+	PollVote,
 };
 
 struct ItemNotification {
 	not_null<HistoryItem*> item;
-	UserData *reactionSender = nullptr;
+	UserData *reactionOrVoteSender = nullptr;
 	ItemNotificationType type = ItemNotificationType::Message;
 
 	friend inline auto operator<=>(
@@ -67,6 +68,8 @@ class Thread : public Dialogs::Entry {
 		return const_cast<Thread*>(this)->owningHistory();
 	}
 	[[nodiscard]] MsgId topicRootId() const;
+	[[nodiscard]] PeerId monoforumPeerId() const;
+	[[nodiscard]] PeerData *maybeSublistPeer() const;
 	[[nodiscard]] not_null<PeerData*> peer() const;
 	[[nodiscard]] PeerNotifySettings &notify();
 	[[nodiscard]] const PeerNotifySettings &notify() const;
@@ -76,8 +79,12 @@ class Thread : public Dialogs::Entry {
 	[[nodiscard]] HistoryUnreadThings::ConstProxy unreadMentions() const;
 	[[nodiscard]] HistoryUnreadThings::Proxy unreadReactions();
 	[[nodiscard]] HistoryUnreadThings::ConstProxy unreadReactions() const;
+	[[nodiscard]] HistoryUnreadThings::Proxy unreadPollVotes();
+	[[nodiscard]] HistoryUnreadThings::ConstProxy unreadPollVotes() const;
 	virtual void hasUnreadMentionChanged(bool has) = 0;
 	virtual void hasUnreadReactionChanged(bool has) = 0;
+	virtual void hasUnreadPollVoteChanged(bool has) = 0;
+	bool canToggleUnread(bool nowUnread) const;
 
 	void removeNotification(not_null<HistoryItem*> item);
 	void clearNotifications();
@@ -103,6 +110,7 @@ class Thread : public Dialogs::Entry {
 
 	[[nodiscard]] const base::flat_set<MsgId> &unreadMentionsIds() const;
 	[[nodiscard]] const base::flat_set<MsgId> &unreadReactionsIds() const;
+	[[nodiscard]] const base::flat_set<MsgId> &unreadPollVotesIds() const;
 
 	[[nodiscard]] Ui::Text::String &cloudDraftTextCache() {
 		return _cloudDraftTextCache;
@@ -112,11 +120,13 @@ class Thread : public Dialogs::Entry {
 	}
 
 	[[nodiscard]] virtual auto sendActionPainter()
-		-> not_null<HistoryView::SendActionPainter*> = 0;
+		-> HistoryView::SendActionPainter* = 0;
 
 	[[nodiscard]] bool hasPinnedMessages() const;
 	void setHasPinnedMessages(bool has);
 
+	void saveMeAsActiveSubsectionThread();
+
 protected:
 	void setUnreadMarkFlag(bool unread);
 
diff --git a/Telegram/SourceFiles/data/data_todo_list.cpp b/Telegram/SourceFiles/data/data_todo_list.cpp
new file mode 100644
index 00000000000000..1496490e182a1d
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_todo_list.cpp
@@ -0,0 +1,223 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/data_todo_list.h"
+
+#include "api/api_text_entities.h"
+#include "data/data_user.h"
+#include "data/data_session.h"
+#include "base/call_delayed.h"
+#include "history/history_item.h"
+#include "main/main_session.h"
+#include "api/api_text_entities.h"
+#include "ui/text/text_options.h"
+
+namespace {
+
+const TodoListItem *ItemById(const std::vector<TodoListItem> &list, int id) {
+	const auto i = ranges::find(list, id, &TodoListItem::id);
+	return (i != end(list)) ? &*i : nullptr;
+}
+
+TodoListItem *ItemById(std::vector<TodoListItem> &list, int id) {
+	return const_cast<TodoListItem*>(ItemById(std::as_const(list), id));
+}
+
+} // namespace
+
+TodoListData::TodoListData(not_null<Data::Session*> owner, TodoListId id)
+: id(id)
+, _owner(owner) {
+}
+
+Data::Session &TodoListData::owner() const {
+	return *_owner;
+}
+
+Main::Session &TodoListData::session() const {
+	return _owner->session();
+}
+
+bool TodoListData::applyChanges(const MTPDtodoList &todolist) {
+	const auto newTitle = Api::ParseTextWithEntities(
+		&session(),
+		todolist.vtitle());
+	const auto newFlags = (todolist.is_others_can_append()
+		? Flag::OthersCanAppend
+		: Flag())
+		| (todolist.is_others_can_complete() ? Flag::OthersCanComplete
+			: Flag());
+	auto newItems = ranges::views::all(
+		todolist.vlist().v
+	) | ranges::views::transform([&](const MTPTodoItem &item) {
+		return TodoListItemFromMTP(&session(), item);
+	}) | ranges::views::take(
+		kMaxOptions
+	) | ranges::to_vector;
+
+	const auto changed1 = (title != newTitle) || (_flags != newFlags);
+	const auto changed2 = (items != newItems);
+	if (!changed1 && !changed2) {
+		return false;
+	}
+	if (changed1) {
+		title = newTitle;
+		_flags = newFlags;
+	}
+	if (changed2) {
+		std::swap(items, newItems);
+		for (const auto &old : newItems) {
+			if (const auto current = itemById(old.id)) {
+				current->completedBy = old.completedBy;
+				current->completionDate = old.completionDate;
+			}
+		}
+	}
+	++version;
+	return true;
+}
+
+bool TodoListData::applyCompletions(
+		const MTPVector<MTPTodoCompletion> *completions) {
+	auto changed = false;
+	const auto lookup = [&](int id) {
+		if (!completions) {
+			return (const MTPDtodoCompletion*)nullptr;
+		}
+		const auto proj = [](const MTPTodoCompletion &completion) {
+			return completion.data().vid().v;
+		};
+		const auto i = ranges::find(completions->v, id, proj);
+		return (i != completions->v.end()) ? &i->data() : nullptr;
+	};
+	for (auto &item : items) {
+		const auto completion = lookup(item.id);
+		const auto by = completion
+			? owner().peer(peerFromMTP(completion->vcompleted_by())).get()
+			: nullptr;
+		const auto date = completion ? completion->vdate().v : TimeId();
+		if (item.completedBy != by || item.completionDate != date) {
+			item.completedBy = by;
+			item.completionDate = date;
+			changed = true;
+		}
+	}
+	if (changed) {
+		++version;
+	}
+	return changed;
+}
+
+void TodoListData::apply(
+		not_null<HistoryItem*> item,
+		const MTPDmessageActionTodoCompletions &data) {
+	for (const auto &id : data.vcompleted().v) {
+		if (const auto task = itemById(id.v)) {
+			task->completedBy = item->from();
+			task->completionDate = item->date();
+		}
+	}
+	for (const auto &id : data.vincompleted().v) {
+		if (const auto task = itemById(id.v)) {
+			task->completedBy = nullptr;
+			task->completionDate = TimeId();
+		}
+	}
+	owner().notifyTodoListUpdateDelayed(this);
+}
+
+void TodoListData::apply(const MTPDmessageActionTodoAppendTasks &data) {
+	const auto limit = TodoListData::kMaxOptions;
+	for (const auto &task : data.vlist().v) {
+		if (items.size() < limit) {
+			const auto parsed = TodoListItemFromMTP(
+				&session(),
+				task);
+			if (!itemById(parsed.id)) {
+				items.push_back(std::move(parsed));
+			}
+		}
+	}
+	owner().notifyTodoListUpdateDelayed(this);
+}
+
+TodoListItem *TodoListData::itemById(int id) {
+	return ItemById(items, id);
+}
+
+const TodoListItem *TodoListData::itemById(int id) const {
+	return ItemById(items, id);
+}
+
+void TodoListData::setFlags(Flags flags) {
+	if (_flags != flags) {
+		_flags = flags;
+		++version;
+	}
+}
+
+TodoListData::Flags TodoListData::flags() const {
+	return _flags;
+}
+
+bool TodoListData::othersCanAppend() const {
+	return (_flags & Flag::OthersCanAppend);
+}
+
+bool TodoListData::othersCanComplete() const {
+	return (_flags & Flag::OthersCanComplete);
+}
+
+MTPVector<MTPTodoItem> TodoListItemsToMTP(
+		not_null<Main::Session*> session,
+		const std::vector<TodoListItem> &tasks) {
+	const auto convert = [&](const TodoListItem &item) {
+		return MTP_todoItem(
+			MTP_int(item.id),
+			MTP_textWithEntities(
+				MTP_string(item.text.text),
+				Api::EntitiesToMTP(session, item.text.entities)));
+	};
+	auto items = QVector<MTPTodoItem>();
+	items.reserve(tasks.size());
+	ranges::transform(tasks, ranges::back_inserter(items), convert);
+	return MTP_vector<MTPTodoItem>(items);
+}
+
+MTPTodoList TodoListDataToMTP(not_null<const TodoListData*> todolist) {
+	using Flag = MTPDtodoList::Flag;
+	const auto flags = Flag()
+		| (todolist->othersCanAppend()
+			? Flag::f_others_can_append
+			: Flag())
+		| (todolist->othersCanComplete()
+			? Flag::f_others_can_complete
+			: Flag());
+	return MTP_todoList(
+		MTP_flags(flags),
+		MTP_textWithEntities(
+			MTP_string(todolist->title.text),
+			Api::EntitiesToMTP(
+				&todolist->session(),
+				todolist->title.entities)),
+		TodoListItemsToMTP(&todolist->session(), todolist->items));
+}
+
+MTPInputMedia TodoListDataToInputMedia(
+		not_null<const TodoListData*> todolist) {
+	return MTP_inputMediaTodo(TodoListDataToMTP(todolist));
+}
+
+TodoListItem TodoListItemFromMTP(
+		not_null<Main::Session*> session,
+		const MTPTodoItem &item) {
+	const auto &data = item.data();
+	return {
+		.text = Api::ParseTextWithEntities(session, data.vtitle()),
+		.id = data.vid().v,
+	};
+}
diff --git a/Telegram/SourceFiles/data/data_todo_list.h b/Telegram/SourceFiles/data/data_todo_list.h
new file mode 100644
index 00000000000000..dd10b8878add8d
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_todo_list.h
@@ -0,0 +1,80 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+class Session;
+} // namespace Data
+
+namespace Main {
+class Session;
+} // namespace Main
+
+struct TodoListItem {
+	TextWithEntities text;
+	PeerData *completedBy = nullptr;
+	TimeId completionDate = 0;
+	int id = 0;
+
+	friend inline bool operator==(
+		const TodoListItem &,
+		const TodoListItem &) = default;
+};
+
+struct TodoListData {
+	TodoListData(not_null<Data::Session*> owner, TodoListId id);
+
+	[[nodiscard]] Data::Session &owner() const;
+	[[nodiscard]] Main::Session &session() const;
+
+	enum class Flag {
+		OthersCanAppend   = 0x01,
+		OthersCanComplete = 0x02,
+	};
+	friend inline constexpr bool is_flag_type(Flag) { return true; };
+	using Flags = base::flags<Flag>;
+
+	bool applyChanges(const MTPDtodoList &todolist);
+	bool applyCompletions(const MTPVector<MTPTodoCompletion> *completions);
+
+	void apply(
+		not_null<HistoryItem*> item,
+		const MTPDmessageActionTodoCompletions &data);
+	void apply(const MTPDmessageActionTodoAppendTasks &data);
+
+	[[nodiscard]] TodoListItem *itemById(int id);
+	[[nodiscard]] const TodoListItem *itemById(int id) const;
+
+	void setFlags(Flags flags);
+	[[nodiscard]] Flags flags() const;
+	[[nodiscard]] bool othersCanAppend() const;
+	[[nodiscard]] bool othersCanComplete() const;
+
+	TodoListId id;
+	TextWithEntities title;
+	std::vector<TodoListItem> items;
+	int version = 0;
+
+	static constexpr auto kMaxOptions = 32;
+
+private:
+	const not_null<Data::Session*> _owner;
+	Flags _flags = Flags();
+
+};
+
+[[nodiscard]] MTPVector<MTPTodoItem> TodoListItemsToMTP(
+	not_null<Main::Session*> session,
+	const std::vector<TodoListItem> &tasks);
+[[nodiscard]] MTPTodoList TodoListDataToMTP(
+	not_null<const TodoListData*> todolist);
+[[nodiscard]] MTPInputMedia TodoListDataToInputMedia(
+	not_null<const TodoListData*> todolist);
+[[nodiscard]] TodoListItem TodoListItemFromMTP(
+	not_null<Main::Session*> session,
+	const MTPTodoItem &item);
diff --git a/Telegram/SourceFiles/data/data_types.cpp b/Telegram/SourceFiles/data/data_types.cpp
index ab792cd3052991..ab60b8bfb654e7 100644
--- a/Telegram/SourceFiles/data/data_types.cpp
+++ b/Telegram/SourceFiles/data/data_types.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "data/data_types.h"
 
+#include "media/media_common.h"
 #include "ui/widgets/fields/input_field.h"
 #include "storage/cache/storage_cache_types.h"
 #include "base/openssl_help.h"
@@ -114,8 +115,8 @@ void MessageCursor::applyTo(not_null<Ui::InputField*> field) {
 }
 
 PeerId PeerFromMessage(const MTPmessage &message) {
-	return message.match([](const MTPDmessageEmpty &) {
-		return PeerId(0);
+	return message.match([](const MTPDmessageEmpty &data) {
+		return data.vpeer_id() ? peerFromMTP(*data.vpeer_id()) : PeerId(0);
 	}, [](const auto &data) {
 		return peerFromMTP(data.vpeer_id());
 	});
@@ -157,8 +158,9 @@ BusinessShortcutId BusinessShortcutIdFromMessage(
 bool GoodStickerDimensions(int width, int height) {
 	// Show all .webp (except very large ones) as stickers,
 	// allow to open them in media viewer to see details.
-	constexpr auto kLargetsStickerSide = 2560;
-	return (width > 0)
-		&& (height > 0)
-		&& (width * height <= kLargetsStickerSide * kLargetsStickerSide);
+	constexpr auto kLargestStickerSide = 2560;
+	return ::Media::ValidFrameSize(
+		width,
+		height,
+		kLargestStickerSide * kLargestStickerSide);
 }
diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index fbcdf3e3ffccca..5c54b73a838b10 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 #include "data/data_msg_id.h"
 #include "base/qt/qt_compare.h"
 
+struct AudioAlbumThumbLocation;
 class HistoryItem;
 using HistoryItemsList = std::vector<not_null<HistoryItem*>>;
 
@@ -36,6 +37,9 @@ using Options = base::flags<Option>;
 
 namespace Data {
 
+struct FileOrigin;
+struct EmojiStatusCollectible;
+
 struct UploadState {
 	explicit UploadState(int64 size) : size(size) {
 	}
@@ -58,8 +62,6 @@ constexpr auto kVoiceMessageCacheTag = uint8(0x03);
 constexpr auto kVideoMessageCacheTag = uint8(0x04);
 constexpr auto kAnimationCacheTag = uint8(0x05);
 
-struct FileOrigin;
-
 } // namespace Data
 
 struct MessageGroupId {
@@ -127,6 +129,7 @@ struct WebPageData;
 struct GameData;
 struct BotAppData;
 struct PollData;
+struct TodoListData;
 
 using PhotoId = uint64;
 using VideoId = uint64;
@@ -135,10 +138,28 @@ using DocumentId = uint64;
 using WebPageId = uint64;
 using GameId = uint64;
 using PollId = uint64;
+using TodoListId = FullMsgId;
 using WallPaperId = uint64;
 using CallId = uint64;
 using BotAppId = uint64;
 using EffectId = uint64;
+using CollectibleId = uint64;
+
+struct EmojiStatusId {
+	DocumentId documentId = 0;
+	std::shared_ptr<Data::EmojiStatusCollectible> collectible;
+
+	explicit operator bool() const {
+		return documentId || collectible;
+	}
+
+	friend inline auto operator<=>(
+		const EmojiStatusId &,
+		const EmojiStatusId &) = default;
+	friend inline bool operator==(
+		const EmojiStatusId &,
+		const EmojiStatusId &) = default;
+};
 
 constexpr auto CancelledWebPageId = WebPageId(0xFFFFFFFFFFFFFFFFULL);
 
@@ -327,6 +348,28 @@ enum class MessageFlag : uint64 {
 
 	SensitiveContent      = (1ULL << 47),
 	HasRestrictions       = (1ULL << 48),
+
+	EstimatedDate         = (1ULL << 49),
+
+	ReactionsAllowed      = (1ULL << 50),
+
+	HideDisplayDate       = (1ULL << 51),
+
+	StarsPaidSuggested    = (1ULL << 52),
+	TonPaidSuggested      = (1ULL << 53),
+
+	StoryInProfile        = (1ULL << 54),
+	SavedMusicItem        = (1ULL << 55),
+
+	HasHiddenLinks        = (1ULL << 56),
+	HasSummaryEntry       = (1ULL << 57),
+	CanBeSummarized       = (1ULL << 58),
+	HasUnreadPollVote     = (1ULL << 59),
+
+	TextAppearing         = (1ULL << 60),
+	TextAppearingStarted  = (1ULL << 61),
+
+	GuestChatViaFrom      = (1ULL << 62),
 };
 inline constexpr bool is_flag_type(MessageFlag) { return true; }
 using MessageFlags = base::flags<MessageFlag>;
@@ -340,3 +383,32 @@ enum class MediaWebPageFlag : uint8 {
 };
 inline constexpr bool is_flag_type(MediaWebPageFlag) { return true; }
 using MediaWebPageFlags = base::flags<MediaWebPageFlag>;
+
+namespace Data {
+
+enum class ForwardOptions {
+	PreserveInfo,
+	NoSenderNames,
+	NoNamesAndCaptions,
+};
+
+enum class ViewRemovalReason : uchar {
+	Removed,
+	Detached,
+};
+
+struct ForwardDraft {
+	MessageIdsList ids;
+	ForwardOptions options = ForwardOptions::PreserveInfo;
+
+	friend inline auto operator<=>(
+		const ForwardDraft&,
+		const ForwardDraft&) = default;
+};
+
+struct ResolvedForwardDraft {
+	HistoryItemsList items;
+	ForwardOptions options = ForwardOptions::PreserveInfo;
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_unread_value.cpp b/Telegram/SourceFiles/data/data_unread_value.cpp
new file mode 100644
index 00000000000000..c374dc0f6558dc
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_unread_value.cpp
@@ -0,0 +1,68 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/data_unread_value.h"
+
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "data/data_chat_filters.h"
+#include "data/data_folder.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+#include "window/notifications_manager.h"
+
+namespace Data {
+namespace {
+
+rpl::producer<Dialogs::UnreadState> MainListUnreadState(
+		not_null<Dialogs::MainList*> list) {
+	return rpl::single(rpl::empty) | rpl::then(
+		list->unreadStateChanges() | rpl::to_empty
+	) | rpl::map([=] {
+		return list->unreadState();
+	});
+}
+
+} // namespace
+
+[[nodiscard]] Dialogs::UnreadState MainListMapUnreadState(
+		not_null<Main::Session*> session,
+		const Dialogs::UnreadState &state) {
+	const auto folderId = Data::Folder::kId;
+	if (const auto folder = session->data().folderLoaded(folderId)) {
+		return state - folder->chatsList()->unreadState();
+	}
+	return state;
+}
+
+rpl::producer<Dialogs::UnreadState> UnreadStateValue(
+		not_null<Main::Session*> session,
+		FilterId filterId) {
+	if (filterId > 0) {
+		const auto filters = &session->data().chatsFilters();
+		return MainListUnreadState(filters->chatsList(filterId));
+	}
+	return MainListUnreadState(
+		session->data().chatsList()
+	) | rpl::map([=](const Dialogs::UnreadState &state) {
+		return MainListMapUnreadState(session, state);
+	});
+}
+
+rpl::producer<bool> IncludeMutedCounterFoldersValue() {
+	using namespace Window::Notifications;
+	return rpl::single(rpl::empty_value()) | rpl::then(
+		Core::App().notifications().settingsChanged(
+		) | rpl::filter(
+			rpl::mappers::_1 == ChangeType::IncludeMuted
+		) | rpl::to_empty
+	) | rpl::map([] {
+		return Core::App().settings().includeMutedCounterFolders();
+	});
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_unread_value.h b/Telegram/SourceFiles/data/data_unread_value.h
new file mode 100644
index 00000000000000..1acdbcc983a15b
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_unread_value.h
@@ -0,0 +1,30 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Dialogs {
+struct UnreadState;
+} // namespace Dialogs
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Data {
+
+[[nodiscard]] Dialogs::UnreadState MainListMapUnreadState(
+	not_null<Main::Session*> session,
+	const Dialogs::UnreadState &state);
+
+[[nodiscard]] rpl::producer<Dialogs::UnreadState> UnreadStateValue(
+	not_null<Main::Session*> session,
+	FilterId filterId);
+
+[[nodiscard]] rpl::producer<bool> IncludeMutedCounterFoldersValue();
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index 440cffcda0259b..2a5c93abdb3f23 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -7,12 +7,24 @@ For license and copyright information please follow this link:
 */
 #include "data/data_user.h"
 
+#include "api/api_credits.h"
+#include "api/api_global_privacy.h"
 #include "api/api_sensitive_content.h"
+#include "api/api_statistics.h"
+#include "api/api_text_entities.h"
+#include "base/timer_rpl.h"
+#include "core/application.h"
 #include "storage/localstorage.h"
+#include "storage/storage_account.h"
 #include "storage/storage_user_photos.h"
 #include "main/main_session.h"
 #include "data/business/data_business_common.h"
 #include "data/business/data_business_info.h"
+#include "data/components/credits.h"
+#include "data/data_cloud_themes.h"
+#include "data/data_forum.h"
+#include "data/data_forum_icons.h"
+#include "data/data_saved_music.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "data/data_peer_bot_command.h"
@@ -21,9 +33,11 @@ For license and copyright information please follow this link:
 #include "data/data_wall_paper.h"
 #include "data/notify/data_notify_settings.h"
 #include "history/history.h"
+#include "history/history_item.h"
 #include "api/api_peer_photo.h"
 #include "apiwrap.h"
 #include "lang/lang_keys.h"
+#include "window/notifications_manager.h"
 #include "styles/style_chat.h"
 
 namespace {
@@ -33,10 +47,71 @@ constexpr auto kSetOnlineAfterActivity = TimeId(30);
 
 using UpdateFlag = Data::PeerUpdate::Flag;
 
+bool ApplyBotVerifierSettings(
+		not_null<BotInfo*> info,
+		const MTPBotVerifierSettings *settings) {
+	if (!settings) {
+		const auto taken = base::take(info->verifierSettings);
+		return taken != nullptr;
+	}
+	const auto &data = settings->data();
+	const auto parsed = BotVerifierSettings{
+		.iconId = DocumentId(data.vicon().v),
+		.company = qs(data.vcompany()),
+		.customDescription = qs(data.vcustom_description().value_or_empty()),
+		.canModifyDescription = data.is_can_modify_custom_description(),
+	};
+	if (!info->verifierSettings) {
+		info->verifierSettings = std::make_unique<BotVerifierSettings>(
+			parsed);
+		return true;
+	} else if (*info->verifierSettings != parsed) {
+		*info->verifierSettings = parsed;
+		return true;
+	}
+	return false;
+}
+
+[[nodiscard]] Data::StarsRating ParseStarsRating(
+		const MTPStarsRating *rating) {
+	if (!rating) {
+		return {};
+	}
+	const auto &data = rating->data();
+	return {
+		.level = data.vlevel().v,
+		.stars = int(data.vstars().v),
+		.thisLevelStars = int(data.vcurrent_level_stars().v),
+		.nextLevelStars = int(data.vnext_level_stars().value_or_empty()),
+	};
+}
+
 } // namespace
 
 BotInfo::BotInfo() = default;
 
+BotInfo::~BotInfo() = default;
+
+void BotInfo::ensureForum(not_null<UserData*> that) {
+	if (!_forum) {
+		const auto history = that->owner().history(that);
+		_forum = std::make_unique<Data::Forum>(history);
+		history->forumChanged(nullptr);
+	}
+}
+
+Data::Forum *BotInfo::forum() const {
+	return _forum.get();
+}
+
+std::unique_ptr<Data::Forum> BotInfo::takeForumData() {
+	if (auto result = base::take(_forum)) {
+		result->history()->forumChanged(result.get());
+		return result;
+	}
+	return nullptr;
+}
+
 Data::LastseenStatus LastseenFromMTP(
 		const MTPUserStatus &status,
 		Data::LastseenStatus currentStatus) {
@@ -161,20 +236,34 @@ bool UserData::hasUnreadStories() const {
 	return flags() & Flag::HasUnreadStories;
 }
 
+bool UserData::hasActiveVideoStream() const {
+	return flags() & Flag::HasActiveVideoStream;
+}
+
 void UserData::setStoriesState(StoriesState state) {
 	Expects(state != StoriesState::Unknown);
 
 	const auto was = flags();
 	switch (state) {
 	case StoriesState::None:
-		_flags.remove(Flag::HasActiveStories | Flag::HasUnreadStories);
+		_flags.remove(Flag::HasActiveStories
+			| Flag::HasUnreadStories
+			| Flag::HasActiveVideoStream);
 		break;
 	case StoriesState::HasRead:
-		_flags.set(
-			(flags() & ~Flag::HasUnreadStories) | Flag::HasActiveStories);
+		_flags.set(Flag::HasActiveStories
+			| (was
+				& ~(Flag::HasUnreadStories | Flag::HasActiveVideoStream)));
 		break;
 	case StoriesState::HasUnread:
-		_flags.add(Flag::HasActiveStories | Flag::HasUnreadStories);
+		_flags.set((was & ~Flag::HasActiveVideoStream)
+			| Flag::HasActiveStories
+			| Flag::HasUnreadStories);
+		break;
+	case StoriesState::HasVideoStream:
+		_flags.set((was & ~Flag::HasUnreadStories)
+			| Flag::HasActiveStories
+			| Flag::HasActiveVideoStream);
 		break;
 	}
 	if (flags() != was) {
@@ -202,6 +291,16 @@ void UserData::setBusinessDetails(Data::BusinessDetails details) {
 	session().changes().peerUpdated(this, UpdateFlag::BusinessDetails);
 }
 
+void UserData::setStarRefProgram(StarRefProgram program) {
+	const auto info = botInfo.get();
+	if (info && info->starRefProgram != program) {
+		info->starRefProgram = program;
+		session().changes().peerUpdated(
+			this,
+			Data::PeerUpdate::Flag::StarRefProgram);
+	}
+}
+
 ChannelId UserData::personalChannelId() const {
 	return _personalChannelId;
 }
@@ -219,7 +318,41 @@ void UserData::setPersonalChannel(ChannelId channelId, MsgId messageId) {
 	}
 }
 
-void UserData::setName(const QString &newFirstName, const QString &newLastName, const QString &newPhoneName, const QString &newUsername) {
+UserId UserData::botManagerId() const {
+	return _botManagerId;
+}
+
+void UserData::setBotManagerId(UserId managerId) {
+	const auto changed = (_botManagerId != managerId);
+	_botManagerId = managerId;
+	if (changed) {
+		session().changes().peerUpdated(this, UpdateFlag::ManagedBot);
+	}
+}
+
+MTPInputUser UserData::inputUser() const {
+	const auto item = isLoaded() ? nullptr : owner().messageWithPeer(id);
+	if (item) {
+		const auto peer = item->history()->peer;
+		Assert(peer.get() != this);
+
+		return MTP_inputUserFromMessage(
+			item->history()->peer->input(),
+			MTP_int(item->id.bare),
+			MTP_long(peerToUser(id).bare));
+	} else if (isSelf()) {
+		return MTP_inputUserSelf();
+	}
+	return MTP_inputUser(
+		MTP_long(peerToUser(id).bare),
+		MTP_long(_accessHash));
+}
+
+void UserData::setName(
+		const QString &newFirstName,
+		const QString &newLastName,
+		const QString &newPhoneName,
+		const QString &newUsername) {
 	bool changeName = !newFirstName.isEmpty() || !newLastName.isEmpty();
 
 	QString newFullName;
@@ -232,7 +365,14 @@ void UserData::setName(const QString &newFirstName, const QString &newLastName,
 			firstName = newFirstName;
 			lastName = newLastName;
 		}
-		newFullName = lastName.isEmpty() ? firstName : tr::lng_full_name(tr::now, lt_first_name, firstName, lt_last_name, lastName);
+		newFullName = lastName.isEmpty()
+			? firstName
+			: tr::lng_full_name(
+				tr::now,
+				lt_first_name,
+				firstName,
+				lt_last_name,
+				lastName);
 	}
 	updateNameDelayed(newFullName, newPhoneName, newUsername);
 }
@@ -342,7 +482,31 @@ void UserData::setBotInfo(const MTPBotInfo &info) {
 		const auto privacyChanged = (botInfo->privacyPolicyUrl != privacy);
 		botInfo->privacyPolicyUrl = privacy;
 
-		if (changedCommands || changedButton || privacyChanged) {
+		if (const auto settings = d.vapp_settings()) {
+			const auto &data = settings->data();
+			botInfo->botAppColorTitleDay = Ui::MaybeColorFromSerialized(
+				data.vheader_color()).value_or(QColor(0, 0, 0, 0));
+			botInfo->botAppColorTitleNight = Ui::MaybeColorFromSerialized(
+				data.vheader_dark_color()).value_or(QColor(0, 0, 0, 0));
+			botInfo->botAppColorBodyDay = Ui::MaybeColorFromSerialized(
+				data.vbackground_color()).value_or(QColor(0, 0, 0, 0));
+			botInfo->botAppColorBodyNight = Ui::MaybeColorFromSerialized(
+				data.vbackground_dark_color()).value_or(QColor(0, 0, 0, 0));
+		} else {
+			botInfo->botAppColorTitleDay
+				= botInfo->botAppColorTitleNight
+				= botInfo->botAppColorBodyDay
+				= botInfo->botAppColorBodyNight
+				= QColor(0, 0, 0, 0);
+		}
+		const auto changedVerifierSettings = ApplyBotVerifierSettings(
+			botInfo.get(),
+			d.vverifier_settings());
+
+		if (changedCommands
+			|| changedButton
+			|| privacyChanged
+			|| changedVerifierSettings) {
 			owner().botCommandsChanged(this);
 		}
 	} break;
@@ -379,12 +543,43 @@ void UserData::setAccessHash(uint64 accessHash) {
 }
 
 void UserData::setFlags(UserDataFlags which) {
-	if ((which & UserDataFlag::Deleted)
-		!= (flags() & UserDataFlag::Deleted)) {
+	if (!isBot()) {
+		which &= ~Flag::Forum;
+	}
+	const auto diff = flags() ^ which;
+	if (diff & Flag::Deleted) {
 		invalidateEmptyUserpic();
 	}
-	_flags.set((flags() & UserDataFlag::Self)
-		| (which & ~UserDataFlag::Self));
+	// Let Data::Forum live till the end of _flags.set.
+	// That way the data can be used in changes handler.
+	// Example: render frame for forum auto-closing animation.
+	const auto takenForum = (botInfo
+		&& (diff & Flag::Forum)
+		&& !(which & Flag::Forum))
+		? botInfo->takeForumData()
+		: nullptr;
+	if ((diff & Flag::Forum) && (which & Flag::Forum)) {
+		if (const auto info = botInfo.get()) {
+			info->ensureForum(this);
+		}
+	}
+	_flags.set((flags() & Flag::Self) | (which & ~Flag::Self));
+	if (diff & Flag::Forum) {
+		if (const auto history = this->owner().historyLoaded(this)) {
+			if (diff & Flag::Forum) {
+				Core::App().notifications().clearFromHistory(history);
+				history->updateChatListEntryHeight();
+				if (history->inChatList()) {
+					if (const auto forum = this->forum()) {
+						forum->preloadTopics();
+					}
+				}
+			}
+		}
+	}
+	if (const auto raw = takenForum.get()) {
+		owner().forumIcons().clearUserpicsReset(raw);
+	}
 }
 
 void UserData::addFlags(UserDataFlags which) {
@@ -439,19 +634,23 @@ bool UserData::hasStoriesHidden() const {
 	return (flags() & UserDataFlag::StoriesHidden);
 }
 
-bool UserData::someRequirePremiumToWrite() const {
-	return (flags() & UserDataFlag::SomeRequirePremiumToWrite);
+bool UserData::hasRequirePremiumToWrite() const {
+	return (flags() & UserDataFlag::HasRequirePremiumToWrite);
 }
 
-bool UserData::meRequiresPremiumToWrite() const {
-	return !isSelf() && (flags() & UserDataFlag::MeRequiresPremiumToWrite);
+bool UserData::hasStarsPerMessage() const {
+	return (flags() & UserDataFlag::HasStarsPerMessage);
 }
 
-bool UserData::requirePremiumToWriteKnown() const {
-	return (flags() & UserDataFlag::RequirePremiumToWriteKnown);
+bool UserData::requiresPremiumToWrite() const {
+	return !isSelf() && (flags() & UserDataFlag::RequiresPremiumToWrite);
 }
 
-bool UserData::canSendIgnoreRequirePremium() const {
+bool UserData::messageMoneyRestrictionsKnown() const {
+	return (flags() & UserDataFlag::MessageMoneyRestrictionsKnown);
+}
+
+bool UserData::canSendIgnoreMoneyRestrictions() const {
 	return !isInaccessible() && !isRepliesChat() && !isVerifyCodes();
 }
 
@@ -459,6 +658,56 @@ bool UserData::readDatesPrivate() const {
 	return (flags() & UserDataFlag::ReadDatesPrivate);
 }
 
+bool UserData::allowsForwarding() const {
+	return !(flags() & Flag::NoForwardsMyEnabled)
+		&& !(flags() & Flag::NoForwardsPeerEnabled);
+}
+
+void UserData::setNoForwardsFlags(bool myEnabled, bool peerEnabled) {
+	const auto mask = Flag::NoForwardsMyEnabled | Flag::NoForwardsPeerEnabled;
+	setFlags((flags() & ~mask)
+		| (myEnabled ? Flag::NoForwardsMyEnabled : Flag())
+		| (peerEnabled ? Flag::NoForwardsPeerEnabled : Flag()));
+	if (!myEnabled && !peerEnabled) {
+		owner().clearSharingDisabledTime(this);
+	}
+}
+
+int UserData::starsPerMessage() const {
+	return _starsPerMessage;
+}
+
+void UserData::setStoriesCorrespondent(bool is) {
+	if (is) {
+		_flags.add(UserDataFlag::StoriesCorrespondent);
+	} else {
+		_flags.remove(UserDataFlag::StoriesCorrespondent);
+	}
+}
+
+bool UserData::storiesCorrespondent() const {
+	return (_flags.current() & UserDataFlag::StoriesCorrespondent);
+}
+
+void UserData::setStarsPerMessage(int stars) {
+	if (_starsPerMessage != stars) {
+		_starsPerMessage = stars;
+		session().changes().peerUpdated(this, UpdateFlag::StarsPerMessage);
+	}
+	checkTrustedPayForMessage();
+}
+
+void UserData::setStarsRating(Data::StarsRating value) {
+	if (_starsRating != value) {
+		_starsRating = value;
+		session().changes().peerUpdated(this, UpdateFlag::StarsRating);
+	}
+}
+
+Data::StarsRating UserData::starsRating() const {
+	return _starsRating;
+}
+
 bool UserData::canAddContact() const {
 	return canShareThisContact() && !isContact();
 }
@@ -483,6 +732,33 @@ bool UserData::isUsernameEditable(QString username) const {
 	return _username.isEditable(username);
 }
 
+void UserData::setBotVerifyDetails(Ui::BotVerifyDetails details) {
+	if (!details) {
+		if (_botVerifyDetails) {
+			_botVerifyDetails = nullptr;
+			session().changes().peerUpdated(this, UpdateFlag::VerifyInfo);
+		}
+	} else if (!_botVerifyDetails) {
+		_botVerifyDetails = std::make_unique<Ui::BotVerifyDetails>(details);
+		session().changes().peerUpdated(this, UpdateFlag::VerifyInfo);
+	} else if (*_botVerifyDetails != details) {
+		*_botVerifyDetails = details;
+		session().changes().peerUpdated(this, UpdateFlag::VerifyInfo);
+	}
+}
+
+void UserData::setBotVerifyDetailsIcon(DocumentId iconId) {
+	if (!iconId) {
+		setBotVerifyDetails({});
+	} else {
+		auto info = _botVerifyDetails
+			? *_botVerifyDetails
+			: Ui::BotVerifyDetails();
+		info.iconId = iconId;
+		setBotVerifyDetails(info);
+	}
+}
+
 const QString &UserData::phone() const {
 	return _phone;
 }
@@ -510,7 +786,6 @@ void UserData::setCallsStatus(CallsStatus callsStatus) {
 	}
 }
 
-
 Data::Birthday UserData::birthday() const {
 	return _birthday;
 }
@@ -543,6 +818,24 @@ bool UserData::hasCalls() const {
 		&& (callsStatus() != CallsStatus::Unknown);
 }
 
+void UserData::setDisallowedGiftTypes(Api::DisallowedGiftTypes types) {
+	if (_disallowedGiftTypes != types) {
+		_disallowedGiftTypes = types;
+		session().changes().peerUpdated(this, UpdateFlag::GiftSettings);
+	}
+}
+
+const TextWithEntities &UserData::note() const {
+	return _note;
+}
+
+void UserData::setNote(const TextWithEntities &note) {
+	if (_note != note) {
+		_note = note;
+		session().changes().peerUpdated(this, UpdateFlag::ContactNote);
+	}
+}
+
 namespace Data {
 
 void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
@@ -577,9 +870,16 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 	} else {
 		user->setBotInfoVersion(-1);
 	}
+	if (const auto info = user->botInfo.get()) {
+		info->canManageEmojiStatus = update.is_bot_can_manage_emoji_status();
+		user->setStarRefProgram(
+			Data::ParseStarRefProgram(update.vstarref_program()));
+	}
 	if (const auto pinned = update.vpinned_msg_id()) {
 		SetTopPinnedMessageId(user, pinned->v);
 	}
+	user->setStarsPerMessage(
+		update.vsend_paid_messages_stars().value_or_empty());
 	using Flag = UserDataFlag;
 	const auto mask = Flag::Blocked
 		| Flag::HasPhoneCalls
@@ -587,8 +887,13 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 		| Flag::CanPinMessages
 		| Flag::VoiceMessagesForbidden
 		| Flag::ReadDatesPrivate
-		| Flag::RequirePremiumToWriteKnown
-		| Flag::MeRequiresPremiumToWrite;
+		| (update.is_contact_require_premium()
+			? Flag::HasRequirePremiumToWrite
+			: Flag())
+		| (user->starsPerMessage() ? Flag::HasStarsPerMessage : Flag())
+		| Flag::MessageMoneyRestrictionsKnown
+		| Flag::RequiresPremiumToWrite
+		| Flag::UnofficialSecurityRisk;
 	user->setFlags((user->flags() & ~mask)
 		| (update.is_phone_calls_private()
 			? Flag::PhoneCallsPrivate
@@ -600,9 +905,13 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 			? Flag::VoiceMessagesForbidden
 			: Flag())
 		| (update.is_read_dates_private() ? Flag::ReadDatesPrivate : Flag())
-		| Flag::RequirePremiumToWriteKnown
+		| (user->starsPerMessage() ? Flag::HasStarsPerMessage : Flag())
+		| Flag::MessageMoneyRestrictionsKnown
 		| (update.is_contact_require_premium()
-			? Flag::MeRequiresPremiumToWrite
+			? (Flag::RequiresPremiumToWrite | Flag::HasRequirePremiumToWrite)
+			: Flag())
+		| (update.is_unofficial_security_risk()
+			? Flag::UnofficialSecurityRisk
 			: Flag()));
 	user->setIsBlocked(update.is_blocked());
 	user->setCallsStatus(update.is_phone_calls_private()
@@ -614,7 +923,16 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 	user->setCommonChatsCount(update.vcommon_chats_count().v);
 	user->setPeerGiftsCount(update.vstargifts_count().value_or_empty());
 	user->checkFolder(update.vfolder_id().value_or_empty());
-	user->setThemeEmoji(qs(update.vtheme_emoticon().value_or_empty()));
+	if (const auto theme = update.vtheme()) {
+		theme->match([&](const MTPDchatTheme &data) {
+			user->setThemeToken(qs(data.vemoticon()));
+		}, [&](const MTPDchatThemeUniqueGift &data) {
+			user->setThemeToken(
+				user->owner().cloudThemes().processGiftThemeGetToken(data));
+		});
+	} else {
+		user->setThemeToken(QString());
+	}
 	user->setTranslationDisabled(update.is_translations_disabled());
 	user->setPrivateForwardName(
 		update.vprivate_forward_name().value_or_empty());
@@ -635,6 +953,43 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 				user,
 				Data::PeerUpdate::Flag::Rights);
 		}
+		if (info->canEditInformation) {
+			static constexpr auto kTimeout = crl::time(60000);
+			const auto id = user->id;
+			const auto weak = base::make_weak(&user->session());
+			const auto creditsLoadLifetime
+				= std::make_shared<rpl::lifetime>();
+			const auto creditsLoad
+				= creditsLoadLifetime->make_state<Api::CreditsStatus>(user);
+			creditsLoad->request({}, [=](Data::CreditsStatusSlice slice) {
+				if (const auto strong = weak.get()) {
+					strong->credits().apply(id, slice.balance);
+				}
+				creditsLoadLifetime->destroy();
+			});
+			base::timer_once(kTimeout) | rpl::on_next([=] {
+				creditsLoadLifetime->destroy();
+			}, *creditsLoadLifetime);
+			const auto currencyLoadLifetime
+				= std::make_shared<rpl::lifetime>();
+			const auto currencyLoad
+				= currencyLoadLifetime->make_state<Api::EarnStatistics>(user);
+			const auto apply = [=](const CreditsAmount &balance) {
+				if (const auto strong = weak.get()) {
+					strong->credits().applyCurrency(id, balance);
+				}
+				currencyLoadLifetime->destroy();
+			};
+			currencyLoad->request() | rpl::on_error_done(
+				[=](const QString &error) {
+					apply(CreditsAmount(0, CreditsType::Ton));
+				},
+				[=] { apply(currencyLoad->data().currentBalance); },
+				*currencyLoadLifetime);
+			base::timer_once(kTimeout) | rpl::on_next([=] {
+				currencyLoadLifetime->destroy();
+			}, *currencyLoadLifetime);
+		}
 	}
 
 	if (const auto paper = update.vwallpaper()) {
@@ -654,16 +1009,98 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 	user->setPersonalChannel(
 		update.vpersonal_channel_id().value_or_empty(),
 		update.vpersonal_channel_message().value_or_empty());
+	user->setBotManagerId(update.vbot_manager_id().value_or_empty());
 	if (user->isSelf()) {
 		user->owner().businessInfo().applyAwaySettings(
 			FromMTP(&user->owner(), update.vbusiness_away_message()));
 		user->owner().businessInfo().applyGreetingSettings(
 			FromMTP(&user->owner(), update.vbusiness_greeting_message()));
 	}
+	user->setBotVerifyDetails(
+		ParseBotVerifyDetails(update.vbot_verification()));
+	user->setStarsRating(ParseStarsRating(update.vstars_rating()));
+	if (user->isSelf()) {
+		user->owner().setPendingStarsRating({
+			.value = ParseStarsRating(update.vstars_my_pending_rating()),
+			.date = update.vstars_my_pending_rating_date().value_or_empty(),
+		});
+	}
+
+	if (const auto gifts = update.vdisallowed_gifts()) {
+		const auto &data = gifts->data();
+		user->setDisallowedGiftTypes(Api::DisallowedGiftType()
+			| (data.is_disallow_unlimited_stargifts()
+				? Api::DisallowedGiftType::Unlimited
+				: Api::DisallowedGiftType())
+			| (data.is_disallow_limited_stargifts()
+				? Api::DisallowedGiftType::Limited
+				: Api::DisallowedGiftType())
+			| (data.is_disallow_unique_stargifts()
+				? Api::DisallowedGiftType::Unique
+				: Api::DisallowedGiftType())
+			| (data.is_disallow_premium_gifts()
+				? Api::DisallowedGiftType::Premium
+				: Api::DisallowedGiftType())
+			| (data.is_disallow_stargifts_from_channels()
+				? Api::DisallowedGiftType::FromChannels
+				: Api::DisallowedGiftType())
+			| (update.is_display_gifts_button()
+				? Api::DisallowedGiftType::SendHide
+				: Api::DisallowedGiftType()));
+	} else {
+		user->setDisallowedGiftTypes(Api::DisallowedGiftTypes()
+			| (update.is_display_gifts_button()
+				? Api::DisallowedGiftType::SendHide
+				: Api::DisallowedGiftType()));
+	}
 
 	user->owner().stories().apply(user, update.vstories());
+	user->owner().savedMusic().apply(user, update.vsaved_music());
+
+	if (const auto note = update.vnote()) {
+		user->setNote(TextWithEntities{
+			qs(note->data().vtext()),
+			Api::EntitiesFromMTP(
+				&user->session(),
+				note->data().ventities().v)
+		});
+	} else {
+		user->setNote(TextWithEntities());
+	}
+
+	user->setNoForwardsFlags(
+		update.is_noforwards_my_enabled(),
+		update.is_noforwards_peer_enabled());
 
 	user->fullUpdated();
 }
 
+StarRefProgram ParseStarRefProgram(const MTPStarRefProgram *program) {
+	if (!program) {
+		return {};
+	}
+	auto result = StarRefProgram();
+	const auto &data = program->data();
+	result.commission = data.vcommission_permille().v;
+	result.durationMonths = data.vduration_months().value_or_empty();
+	result.revenuePerUser = CreditsAmountFromTL(
+		data.vdaily_revenue_per_user());
+	result.endDate = data.vend_date().value_or_empty();
+	return result;
+}
+
+Ui::BotVerifyDetails ParseBotVerifyDetails(const MTPBotVerification *info) {
+	if (!info) {
+		return {};
+	}
+	const auto &data = info->data();
+	const auto description = qs(data.vdescription());
+	const auto flags = TextParseLinks;
+	return {
+		.botId = UserId(data.vbot_id().v),
+		.iconId = DocumentId(data.vicon().v),
+		.description = TextUtilities::ParseEntities(description, flags),
+	};
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index f016a9d4dac495..3b6f00df47a36f 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -7,20 +7,66 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "core/credits_amount.h"
+#include "data/components/credits.h"
 #include "data/data_birthday.h"
 #include "data/data_peer.h"
 #include "data/data_chat_participant_status.h"
 #include "data/data_lastseen_status.h"
 #include "data/data_user_names.h"
 #include "dialogs/dialogs_key.h"
+#include "base/flags.h"
 
 namespace Data {
+class Forum;
 struct BotCommand;
 struct BusinessDetails;
 } // namespace Data
 
+namespace Api {
+enum class DisallowedGiftType : uchar;
+using DisallowedGiftTypes = base::flags<DisallowedGiftType>;
+} // namespace Api
+
+struct StarRefProgram {
+	CreditsAmount revenuePerUser;
+	TimeId endDate = 0;
+	ushort commission = 0;
+	uint8 durationMonths = 0;
+
+	friend inline constexpr bool operator==(
+		StarRefProgram,
+		StarRefProgram) = default;
+};
+
+struct BotVerifierSettings {
+	DocumentId iconId = 0;
+	QString company;
+	QString customDescription;
+	bool canModifyDescription = false;
+
+	explicit operator bool() const {
+		return iconId != 0;
+	}
+
+	friend inline bool operator==(
+		const BotVerifierSettings &a,
+		const BotVerifierSettings &b) = default;
+};
+
 struct BotInfo {
+	enum class SetBotPhotoOpenState : uchar {
+		Unknown,
+		OpenedWithHistory,
+		OpenedEmpty,
+	};
+
 	BotInfo();
+	~BotInfo();
+
+	void ensureForum(not_null<UserData*> that);
+	[[nodiscard]] Data::Forum *forum() const;
+	[[nodiscard]] std::unique_ptr<Data::Forum> takeForumData();
 
 	QString description;
 	QString inlinePlaceholder;
@@ -33,22 +79,41 @@ struct BotInfo {
 	QString botMenuButtonUrl;
 	QString privacyPolicyUrl;
 
+	QColor botAppColorTitleDay = QColor(0, 0, 0, 0);
+	QColor botAppColorTitleNight = QColor(0, 0, 0, 0);
+	QColor botAppColorBodyDay = QColor(0, 0, 0, 0);
+	QColor botAppColorBodyNight = QColor(0, 0, 0, 0);
+
 	QString startToken;
 	Dialogs::EntryState inlineReturnTo;
 
 	ChatAdminRights groupAdminRights;
 	ChatAdminRights channelAdminRights;
 
+	StarRefProgram starRefProgram;
+	std::unique_ptr<BotVerifierSettings> verifierSettings;
+
 	int version = 0;
 	int descriptionVersion = 0;
 	int activeUsers = 0;
+	SetBotPhotoOpenState setBotPhotoOpenState = SetBotPhotoOpenState::Unknown;
 	bool inited : 1 = false;
 	bool readsAllHistory : 1 = false;
 	bool cantJoinGroups : 1 = false;
 	bool supportsAttachMenu : 1 = false;
 	bool canEditInformation : 1 = false;
+	bool canManageEmojiStatus : 1 = false;
 	bool supportsBusiness : 1 = false;
 	bool hasMainApp : 1 = false;
+	bool userCreatesTopics : 1 = false;
+	bool setBotPhotoHidden : 1 = false;
+	bool canManageBots : 1 = false;
+	bool supportsGuestChat : 1 = false;
+	bool supportsGuard : 1 = false;
+
+private:
+	std::unique_ptr<Data::Forum> _forum;
+
 };
 
 enum class UserDataFlag : uint32 {
@@ -67,16 +132,22 @@ enum class UserDataFlag : uint32 {
 	DiscardMinPhoto = (1 << 12),
 	Self = (1 << 13),
 	Premium = (1 << 14),
-	//CanReceiveGifts = (1 << 15),
+	UnofficialSecurityRisk = (1 << 15),
 	VoiceMessagesForbidden = (1 << 16),
 	PersonalPhoto = (1 << 17),
 	StoriesHidden = (1 << 18),
 	HasActiveStories = (1 << 19),
 	HasUnreadStories = (1 << 20),
-	MeRequiresPremiumToWrite = (1 << 21),
-	SomeRequirePremiumToWrite = (1 << 22),
-	RequirePremiumToWriteKnown = (1 << 23),
-	ReadDatesPrivate = (1 << 24),
+	RequiresPremiumToWrite = (1 << 21),
+	HasRequirePremiumToWrite = (1 << 22),
+	HasStarsPerMessage = (1 << 23),
+	MessageMoneyRestrictionsKnown = (1 << 24),
+	ReadDatesPrivate = (1 << 25),
+	StoriesCorrespondent = (1 << 26),
+	Forum = (1 << 27),
+	HasActiveVideoStream = (1 << 28),
+	NoForwardsMyEnabled = (1 << 29),
+	NoForwardsPeerEnabled = (1 << 30),
 };
 inline constexpr bool is_flag_type(UserDataFlag) { return true; };
 using UserDataFlags = base::flags<UserDataFlag>;
@@ -111,7 +182,7 @@ class UserData final : public PeerData {
 
 	void madeAction(TimeId when); // pseudo-online
 
-	uint64 accessHash() const {
+	[[nodiscard]] uint64 accessHash() const {
 		return _accessHash;
 	}
 	void setAccessHash(uint64 accessHash);
@@ -137,11 +208,29 @@ class UserData final : public PeerData {
 	[[nodiscard]] bool applyMinPhoto() const;
 	[[nodiscard]] bool hasPersonalPhoto() const;
 	[[nodiscard]] bool hasStoriesHidden() const;
-	[[nodiscard]] bool someRequirePremiumToWrite() const;
-	[[nodiscard]] bool meRequiresPremiumToWrite() const;
-	[[nodiscard]] bool requirePremiumToWriteKnown() const;
-	[[nodiscard]] bool canSendIgnoreRequirePremium() const;
+	[[nodiscard]] bool hasRequirePremiumToWrite() const;
+	[[nodiscard]] bool hasStarsPerMessage() const;
+	[[nodiscard]] bool requiresPremiumToWrite() const;
+	[[nodiscard]] bool messageMoneyRestrictionsKnown() const;
+	[[nodiscard]] bool canSendIgnoreMoneyRestrictions() const;
 	[[nodiscard]] bool readDatesPrivate() const;
+	[[nodiscard]] bool allowsForwarding() const;
+	void setNoForwardsFlags(bool myEnabled, bool peerEnabled);
+	[[nodiscard]] bool isForum() const {
+		return flags() & Flag::Forum;
+	}
+	[[nodiscard]] Data::Forum *forum() const {
+		return botInfo ? botInfo->forum() : nullptr;
+	}
+
+	void setStoriesCorrespondent(bool is);
+	[[nodiscard]] bool storiesCorrespondent() const;
+
+	void setStarsPerMessage(int stars);
+	[[nodiscard]] int starsPerMessage() const;
+
+	void setStarsRating(Data::StarsRating value);
+	[[nodiscard]] Data::StarsRating starsRating() const;
 
 	[[nodiscard]] bool canShareThisContact() const;
 	[[nodiscard]] bool canAddContact() const;
@@ -157,6 +246,12 @@ class UserData final : public PeerData {
 	[[nodiscard]] const std::vector<QString> &usernames() const;
 	[[nodiscard]] bool isUsernameEditable(QString username) const;
 
+	void setBotVerifyDetails(Ui::BotVerifyDetails details);
+	void setBotVerifyDetailsIcon(DocumentId iconId);
+	[[nodiscard]] Ui::BotVerifyDetails *botVerifyDetails() const {
+		return _botVerifyDetails.get();
+	}
+
 	enum class ContactStatus : char {
 		Unknown,
 		Contact,
@@ -195,16 +290,26 @@ class UserData final : public PeerData {
 
 	[[nodiscard]] bool hasActiveStories() const;
 	[[nodiscard]] bool hasUnreadStories() const;
+	[[nodiscard]] bool hasActiveVideoStream() const;
 	void setStoriesState(StoriesState state);
 
 	[[nodiscard]] const Data::BusinessDetails &businessDetails() const;
 	void setBusinessDetails(Data::BusinessDetails details);
 
+	void setStarRefProgram(StarRefProgram program);
+
 	[[nodiscard]] ChannelId personalChannelId() const;
 	[[nodiscard]] MsgId personalChannelMessageId() const;
 	void setPersonalChannel(ChannelId channelId, MsgId messageId);
 
-	MTPInputUser inputUser = MTP_inputUserEmpty();
+	[[nodiscard]] UserId botManagerId() const;
+	void setBotManagerId(UserId managerId);
+
+	[[nodiscard]] bool unofficialSecurityRisk() const {
+		return flags() & Flag::UnofficialSecurityRisk;
+	}
+
+	[[nodiscard]] MTPInputUser inputUser() const;
 
 	QString firstName;
 	QString lastName;
@@ -212,6 +317,14 @@ class UserData final : public PeerData {
 
 	std::unique_ptr<BotInfo> botInfo;
 
+	[[nodiscard]] Api::DisallowedGiftTypes disallowedGiftTypes() const {
+		return _disallowedGiftTypes;
+	}
+	void setDisallowedGiftTypes(Api::DisallowedGiftTypes types);
+
+	[[nodiscard]] const TextWithEntities &note() const;
+	void setNote(const TextWithEntities &note);
+
 private:
 	auto unavailableReasons() const
 		-> const std::vector<Data::UnavailableReason> & override;
@@ -224,6 +337,7 @@ class UserData final : public PeerData {
 	Data::Birthday _birthday;
 	int _commonChatsCount = 0;
 	int _peerGiftsCount = 0;
+	int _starsPerMessage = 0;
 	ContactStatus _contactStatus = ContactStatus::Unknown;
 	CallsStatus _callsStatus = CallsStatus::Unknown;
 
@@ -233,18 +347,30 @@ class UserData final : public PeerData {
 	std::vector<Data::UnavailableReason> _unavailableReasons;
 	QString _phone;
 	QString _privateForwardName;
+	std::unique_ptr<Ui::BotVerifyDetails> _botVerifyDetails;
+	Data::StarsRating _starsRating;
 
 	ChannelId _personalChannelId = 0;
 	MsgId _personalChannelMessageId = 0;
+	UserId _botManagerId = 0;
 
 	uint64 _accessHash = 0;
 	static constexpr auto kInaccessibleAccessHashOld
 		= 0xFFFFFFFFFFFFFFFFULL;
 
+	Api::DisallowedGiftTypes _disallowedGiftTypes;
+	TextWithEntities _note;
+
 };
 
 namespace Data {
 
 void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update);
 
+[[nodiscard]] StarRefProgram ParseStarRefProgram(
+	const MTPStarRefProgram *program);
+
+[[nodiscard]] Ui::BotVerifyDetails ParseBotVerifyDetails(
+	const MTPBotVerification *info);
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_user_names.cpp b/Telegram/SourceFiles/data/data_user_names.cpp
index c2edd6b01c985c..2059380a15b70e 100644
--- a/Telegram/SourceFiles/data/data_user_names.cpp
+++ b/Telegram/SourceFiles/data/data_user_names.cpp
@@ -44,7 +44,7 @@ void UsernamesInfo::setUsernames(const Usernames &usernames) {
 	) | ranges::views::filter([&](const Data::Username &username) {
 		if (username.editable) {
 			editableUsername = username.username;
-			return true;
+			return username.active;
 		}
 		return username.active;
 	}) | ranges::views::transform([](const Data::Username &username) {
diff --git a/Telegram/SourceFiles/data/data_user_photos.cpp b/Telegram/SourceFiles/data/data_user_photos.cpp
index 6271f9b4c9c382..74553e63194b16 100644
--- a/Telegram/SourceFiles/data/data_user_photos.cpp
+++ b/Telegram/SourceFiles/data/data_user_photos.cpp
@@ -203,16 +203,16 @@ rpl::producer<UserPhotosSlice> UserPhotosViewer(
 				photoId);
 		};
 		builder->insufficientPhotosAround()
-			| rpl::start_with_next(std::move(requestPhotosAround), lifetime);
+			| rpl::on_next(std::move(requestPhotosAround), lifetime);
 
 		session->storage().userPhotosSliceUpdated()
-			| rpl::start_with_next(applyUpdate, lifetime);
+			| rpl::on_next(applyUpdate, lifetime);
 
 		session->storage().query(Storage::UserPhotosQuery(
 			key,
 			limitBefore,
 			limitAfter
-		)) | rpl::start_with_next_done(
+		)) | rpl::on_next_done(
 			applyUpdate,
 			[=] { builder->checkInsufficientPhotos(); },
 			lifetime);
@@ -247,7 +247,7 @@ std::optional<PhotoId> SyncUserFallbackPhotoViewer(not_null<UserData*> user) {
 		Storage::UserPhotosKey(peerToUser(user->id), true),
 		kFallbackCount,
 		kFallbackCount
-	)) | rpl::start_with_next([&](Storage::UserPhotosResult &&slice) {
+	)) | rpl::on_next([&](Storage::UserPhotosResult &&slice) {
 		if (slice.photoIds.empty()) {
 			return;
 		}
diff --git a/Telegram/SourceFiles/data/data_web_page.cpp b/Telegram/SourceFiles/data/data_web_page.cpp
index d4565627777eaf..574f8a43daffba 100644
--- a/Telegram/SourceFiles/data/data_web_page.cpp
+++ b/Telegram/SourceFiles/data/data_web_page.cpp
@@ -14,6 +14,8 @@ For license and copyright information please follow this link:
 #include "data/data_photo.h"
 #include "data/data_channel.h"
 #include "data/data_document.h"
+#include "data/data_star_gift.h"
+#include "core/local_url_handlers.h"
 #include "lang/lang_keys.h"
 #include "iv/iv_data.h"
 #include "ui/image/image.h"
@@ -158,6 +160,8 @@ WebPageType ParseWebPageType(
 		return WebPageType::VoiceChat;
 	} else if (type == u"telegram_livestream"_q) {
 		return WebPageType::Livestream;
+	} else if (type == u"telegram_call"_q) {
+		return WebPageType::ConferenceCall;
 	} else if (type == u"telegram_user"_q) {
 		return WebPageType::User;
 	} else if (type == u"telegram_botapp"_q) {
@@ -170,6 +174,16 @@ WebPageType ParseWebPageType(
 		return WebPageType::Giftcode;
 	} else if (type == u"telegram_stickerset"_q) {
 		return WebPageType::StickerSet;
+	} else if (type == u"telegram_story_album"_q) {
+		return WebPageType::StoryAlbum;
+	} else if (type == u"telegram_collection"_q) {
+		return WebPageType::GiftCollection;
+	} else if (type == u"telegram_auction"_q) {
+		return WebPageType::Auction;
+	} else if (type == u"telegram_newbot"_q) {
+		return WebPageType::NewBot;
+	} else if (type == u"telegram_aicomposetone"_q) {
+		return WebPageType::ComposeAiTone;
 	} else if (hasIV) {
 		return WebPageType::ArticleWithIV;
 	} else {
@@ -178,8 +192,7 @@ WebPageType ParseWebPageType(
 }
 
 bool IgnoreIv(WebPageType type) {
-	return !Iv::ShowButton()
-		|| (type == WebPageType::Message)
+	return (type == WebPageType::Message)
 		|| (type == WebPageType::Album);
 }
 
@@ -190,6 +203,49 @@ WebPageType ParseWebPageType(const MTPDwebPage &page) {
 		!!page.vcached_page());
 }
 
+namespace {
+
+[[nodiscard]] QString SimplifyUrl(const QString &url) {
+	auto result = url.split('#')[0].toLower();
+	if (result.endsWith('/')) {
+		result.chop(1);
+	}
+	const auto prefixes = { u"http://"_q, u"https://"_q };
+	for (const auto &prefix : prefixes) {
+		if (result.startsWith(prefix)) {
+			result = result.mid(prefix.size());
+			break;
+		}
+	}
+	return result;
+}
+
+} // namespace
+
+QString ExtractHash(
+		not_null<WebPageData*> webpage,
+		const TextWithEntities &text) {
+	const auto simplified = SimplifyUrl(webpage->url);
+	for (const auto &entity : text.entities) {
+		const auto link = (entity.type() == EntityType::Url)
+			? text.text.mid(entity.offset(), entity.length())
+			: (entity.type() == EntityType::CustomUrl)
+			? entity.data()
+			: QString();
+		if (SimplifyUrl(link) == simplified) {
+			const auto i = link.indexOf('#');
+			return (i > 0) ? link.mid(i + 1) : QString();
+		}
+	}
+	return QString();
+}
+
+bool UrlMatchesWebPage(
+		not_null<WebPageData*> webpage,
+		const QString &url) {
+	return SimplifyUrl(url) == SimplifyUrl(webpage->url);
+}
+
 WebPageCollage::WebPageCollage(
 	not_null<Data::Session*> owner,
 	const MTPDwebPage &data)
@@ -224,9 +280,13 @@ bool WebPageData::applyChanges(
 		WebPageCollage &&newCollage,
 		std::unique_ptr<Iv::Data> newIv,
 		std::unique_ptr<WebPageStickerSet> newStickerSet,
+		std::shared_ptr<Data::UniqueGift> newUniqueGift,
+		std::unique_ptr<WebPageAuction> newAuction,
+		DocumentId newComposeToneEmojiId,
 		int newDuration,
 		const QString &newAuthor,
 		bool newHasLargeMedia,
+		bool newPhotoIsVideoCover,
 		int newPendingTill) {
 	if (newPendingTill != 0
 		&& (!url.isEmpty() || failed)
@@ -258,12 +318,18 @@ bool WebPageData::applyChanges(
 	const auto hasSiteName = !resultSiteName.isEmpty() ? 1 : 0;
 	const auto hasTitle = !resultTitle.isEmpty() ? 1 : 0;
 	const auto hasDescription = !newDescription.text.isEmpty() ? 1 : 0;
-	if (newDocument
+	const auto allowLargeMediaDocument = newDocument
+		&& newDocument->isVideoFile()
+		&& newPhoto;
+	if ((!allowLargeMediaDocument && newDocument)
 		|| !newCollage.items.empty()
 		|| !newPhoto
 		|| (hasSiteName + hasTitle + hasDescription < 2)) {
 		newHasLargeMedia = false;
 	}
+	if (!newDocument || !newDocument->isVideoFile() || !newPhoto) {
+		newPhotoIsVideoCover = false;
+	}
 
 	if (type == newType
 		&& url == resultUrl
@@ -276,11 +342,16 @@ bool WebPageData::applyChanges(
 		&& document == newDocument
 		&& collage.items == newCollage.items
 		&& (!iv == !newIv)
-		&& (!iv || iv->partial() == newIv->partial())
+		&& (!iv || (iv->partial() == newIv->partial()
+			&& iv->hash() == newIv->hash()))
 		&& (!stickerSet == !newStickerSet)
+		&& (!uniqueGift == !newUniqueGift)
+		&& (!auction == !newAuction)
+		&& composeToneEmojiId == newComposeToneEmojiId
 		&& duration == newDuration
 		&& author == resultAuthor
 		&& hasLargeMedia == (newHasLargeMedia ? 1 : 0)
+		&& photoIsVideoCover == (newPhotoIsVideoCover ? 1 : 0)
 		&& pendingTill == newPendingTill) {
 		return false;
 	}
@@ -289,6 +360,7 @@ bool WebPageData::applyChanges(
 	}
 	type = newType;
 	hasLargeMedia = newHasLargeMedia ? 1 : 0;
+	photoIsVideoCover = newPhotoIsVideoCover ? 1 : 0;
 	url = resultUrl;
 	displayUrl = resultDisplayUrl;
 	siteName = resultSiteName;
@@ -300,6 +372,9 @@ bool WebPageData::applyChanges(
 	collage = std::move(newCollage);
 	iv = std::move(newIv);
 	stickerSet = std::move(newStickerSet);
+	uniqueGift = std::move(newUniqueGift);
+	auction = std::move(newAuction);
+	composeToneEmojiId = newComposeToneEmojiId;
 	duration = newDuration;
 	author = resultAuthor;
 	pendingTill = newPendingTill;
@@ -324,6 +399,16 @@ void WebPageData::ApplyChanges(
 		not_null<Main::Session*> session,
 		ChannelData *channel,
 		const MTPmessages_Messages &result) {
+	const auto list = result.match([](
+			const MTPDmessages_messagesNotModified &) {
+		LOG(("API Error: received messages.messagesNotModified! "
+			"(WebPageData::ApplyChanges)"));
+		return static_cast<const QVector<MTPMessage>*>(nullptr);
+	}, [&](const auto &data) {
+		session->data().processUsers(data.vusers());
+		session->data().processChats(data.vchats());
+		return &data.vmessages().v;
+	});
 	result.match([&](
 			const MTPDmessages_channelMessages &data) {
 		if (channel) {
@@ -335,15 +420,12 @@ void WebPageData::ApplyChanges(
 		}
 	}, [&](const auto &) {
 	});
-	const auto list = result.match([](
+	result.match([](
 			const MTPDmessages_messagesNotModified &) {
-		LOG(("API Error: received messages.messagesNotModified! "
-			"(WebPageData::ApplyChanges)"));
-		return static_cast<const QVector<MTPMessage>*>(nullptr);
 	}, [&](const auto &data) {
-		session->data().processUsers(data.vusers());
-		session->data().processChats(data.vchats());
-		return &data.vmessages().v;
+		if (channel) {
+			channel->processTopics(data.vtopics());
+		}
 	});
 	if (!list) {
 		return;
@@ -360,7 +442,7 @@ void WebPageData::ApplyChanges(
 		}, [&](const auto &) {
 		});
 	}
-	session->data().sendWebPageGamePollNotifications();
+	session->data().sendWebPageGamePollTodoListNotifications();
 }
 
 QString WebPageData::displayedSiteName() const {
@@ -371,6 +453,21 @@ QString WebPageData::displayedSiteName() const {
 		: siteName;
 }
 
+TimeId WebPageData::extractVideoTimestamp() const {
+	const auto take = [&](const QStringList &list, int index) {
+		return (index >= 0 && index < list.size()) ? list[index] : QString();
+	};
+	const auto hashed = take(url.split('#'), 0);
+	const auto params = take(hashed.split('?'), 1);
+	const auto parts = params.split('&');
+	for (const auto &part : parts) {
+		if (part.startsWith(u"t="_q)) {
+			return Core::ParseVideoTimestamp(part.mid(2));
+		}
+	}
+	return 0;
+}
+
 bool WebPageData::computeDefaultSmallMedia() const {
 	if (!collage.items.empty()) {
 		return false;
@@ -379,7 +476,8 @@ bool WebPageData::computeDefaultSmallMedia() const {
 		&& description.empty()
 		&& author.isEmpty()) {
 		return false;
-	} else if (!document
+	} else if (!uniqueGift
+		&& !document
 		&& photo
 		&& type != WebPageType::Photo
 		&& type != WebPageType::Document
diff --git a/Telegram/SourceFiles/data/data_web_page.h b/Telegram/SourceFiles/data/data_web_page.h
index 6497a0394da23f..92eef03ffb4d7f 100644
--- a/Telegram/SourceFiles/data/data_web_page.h
+++ b/Telegram/SourceFiles/data/data_web_page.h
@@ -15,6 +15,8 @@ class ChannelData;
 
 namespace Data {
 class Session;
+struct UniqueGift;
+struct StarGift;
 } // namespace Data
 
 namespace Iv {
@@ -48,12 +50,19 @@ enum class WebPageType : uint8 {
 	Theme,
 	Story,
 	StickerSet,
+	StoryAlbum,
+	GiftCollection,
+	Auction,
+	NewBot,
+
+	ComposeAiTone,
 
 	Article,
 	ArticleWithIV,
 
 	VoiceChat,
 	Livestream,
+	ConferenceCall,
 
 	Factcheck,
 };
@@ -81,6 +90,11 @@ struct WebPageStickerSet {
 
 };
 
+struct WebPageAuction {
+	std::shared_ptr<Data::StarGift> auctionGift;
+	TimeId endDate = 0;
+};
+
 struct WebPageData {
 	WebPageData(not_null<Data::Session*> owner, const WebPageId &id);
 	~WebPageData();
@@ -101,9 +115,13 @@ struct WebPageData {
 		WebPageCollage &&newCollage,
 		std::unique_ptr<Iv::Data> newIv,
 		std::unique_ptr<WebPageStickerSet> newStickerSet,
+		std::shared_ptr<Data::UniqueGift> newUniqueGift,
+		std::unique_ptr<WebPageAuction> newAuction,
+		DocumentId newComposeToneEmojiId,
 		int newDuration,
 		const QString &newAuthor,
 		bool newHasLargeMedia,
+		bool newPhotoIsVideoCover,
 		int newPendingTill);
 
 	static void ApplyChanges(
@@ -112,6 +130,7 @@ struct WebPageData {
 		const MTPmessages_Messages &result);
 
 	[[nodiscard]] QString displayedSiteName() const;
+	[[nodiscard]] TimeId extractVideoTimestamp() const;
 	[[nodiscard]] bool computeDefaultSmallMedia() const;
 	[[nodiscard]] bool suggestEnlargePhoto() const;
 
@@ -129,9 +148,13 @@ struct WebPageData {
 	WebPageCollage collage;
 	std::unique_ptr<Iv::Data> iv;
 	std::unique_ptr<WebPageStickerSet> stickerSet;
+	std::shared_ptr<Data::UniqueGift> uniqueGift;
+	std::unique_ptr<WebPageAuction> auction;
+	DocumentId composeToneEmojiId = 0;
 	int duration = 0;
 	TimeId pendingTill = 0;
-	uint32 version : 30 = 0;
+	uint32 version : 29 = 0;
+	uint32 photoIsVideoCover : 1 = 0;
 	uint32 hasLargeMedia : 1 = 0;
 	uint32 failed : 1 = 0;
 
@@ -141,3 +164,11 @@ struct WebPageData {
 	const not_null<Data::Session*> _owner;
 
 };
+
+[[nodiscard]] QString ExtractHash(
+	not_null<WebPageData*> webpage,
+	const TextWithEntities &text);
+
+[[nodiscard]] bool UrlMatchesWebPage(
+	not_null<WebPageData*> webpage,
+	const QString &url);
diff --git a/Telegram/SourceFiles/data/notify/data_notify_settings.cpp b/Telegram/SourceFiles/data/notify/data_notify_settings.cpp
index beb47698b75eef..b97cadbd631bc8 100644
--- a/Telegram/SourceFiles/data/notify/data_notify_settings.cpp
+++ b/Telegram/SourceFiles/data/notify/data_notify_settings.cpp
@@ -80,7 +80,7 @@ NotifySettings::NotifySettings(not_null<Session*> owner)
 void NotifySettings::request(not_null<PeerData*> peer) {
 	if (peer->notify().settingsUnknown()) {
 		peer->session().api().requestNotifySettings(
-			MTP_inputNotifyPeer(peer->input));
+			MTP_inputNotifyPeer(peer->input()));
 	}
 	if (defaultSettings(peer).settingsUnknown()) {
 		peer->session().api().requestNotifySettings(peer->isUser()
@@ -96,7 +96,7 @@ void NotifySettings::request(not_null<Thread*> thread) {
 		if (topic->notify().settingsUnknown()) {
 			topic->session().api().requestNotifySettings(
 				MTP_inputNotifyForumTopic(
-					topic->channel()->input,
+					topic->peer()->input(),
 					MTP_int(topic->rootId())));
 		}
 	}
@@ -132,9 +132,9 @@ void NotifySettings::apply(
 		}, [](const MTPDinputPeerChannel &data) {
 			return peerFromChannel(data.vchannel_id());
 		}, [](const MTPDinputPeerUserFromMessage &data) -> PeerId {
-			Unexpected("From message peer in NotifySettings::apply.");
+			return peerFromUser(data.vuser_id());
 		}, [](const MTPDinputPeerChannelFromMessage &data) -> PeerId {
-			Unexpected("From message peer in NotifySettings::apply.");
+			return peerFromChannel(data.vchannel_id());
 		}, [](const MTPDinputPeerEmpty &) -> PeerId {
 			Unexpected("Empty peer in NotifySettings::apply.");
 		});
@@ -259,9 +259,7 @@ void NotifySettings::resetToDefault(not_null<PeerData*> peer) {
 
 void NotifySettings::forumParentMuteUpdated(not_null<Forum*> forum) {
 	forum->enumerateTopics([&](not_null<ForumTopic*> topic) {
-		if (!topic->notify().settingsUnknown()) {
-			updateLocal(topic);
-		}
+		updateLocal(topic);
 	});
 }
 
@@ -321,7 +319,7 @@ void NotifySettings::updateLocal(not_null<Thread*> thread) {
 		auto &lifetime = _mutedTopics.emplace(
 			topic,
 			rpl::lifetime()).first->second;
-		topic->destroyed() | rpl::start_with_next([=] {
+		topic->destroyed() | rpl::on_next([=] {
 			_mutedTopics.erase(topic);
 		}, lifetime);
 		unmuteByFinishedDelayed(changesIn);
@@ -385,7 +383,7 @@ void NotifySettings::cacheSound(const std::optional<NotifySound> &sound) {
 	}
 	// Not requested yet.
 	_owner->session().api().ringtones().listUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (const auto id : base::take(_ringtones.pendingIds)) {
 			cacheSound(id);
 		}
@@ -507,7 +505,7 @@ bool NotifySettings::soundUnknown(not_null<const Thread*> thread) const {
 	const auto topic = thread->asTopic();
 	return (topic && topic->notify().settingsUnknown())
 		|| ((!topic || !topic->notify().sound().has_value())
-			&& soundUnknown(topic->channel()));
+			&& soundUnknown(topic->peer()));
 }
 
 bool NotifySettings::isMuted(
diff --git a/Telegram/SourceFiles/data/notify/data_notify_settings.h b/Telegram/SourceFiles/data/notify/data_notify_settings.h
index b1930f45bd3647..689964299cf162 100644
--- a/Telegram/SourceFiles/data/notify/data_notify_settings.h
+++ b/Telegram/SourceFiles/data/notify/data_notify_settings.h
@@ -21,11 +21,6 @@ class Thread;
 class Forum;
 class ForumTopic;
 
-enum class DefaultNotify {
-	User,
-	Group,
-	Broadcast,
-};
 [[nodiscard]] DefaultNotify DefaultNotifyType(
 	not_null<const PeerData*> peer);
 
diff --git a/Telegram/SourceFiles/data/notify/data_peer_notify_settings.h b/Telegram/SourceFiles/data/notify/data_peer_notify_settings.h
index b5de9e11959a58..49e3c9dc8158ae 100644
--- a/Telegram/SourceFiles/data/notify/data_peer_notify_settings.h
+++ b/Telegram/SourceFiles/data/notify/data_peer_notify_settings.h
@@ -11,6 +11,12 @@ namespace Data {
 
 class NotifyPeerSettingsValue;
 
+enum class DefaultNotify : uint8_t {
+	User,
+	Group,
+	Broadcast,
+};
+
 struct NotifySound {
 	QString	title;
 	QString data;
diff --git a/Telegram/SourceFiles/data/notify/data_peer_notify_volume.cpp b/Telegram/SourceFiles/data/notify/data_peer_notify_volume.cpp
new file mode 100644
index 00000000000000..90ce0856d6cca0
--- /dev/null
+++ b/Telegram/SourceFiles/data/notify/data_peer_notify_volume.cpp
@@ -0,0 +1,117 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/notify/data_peer_notify_volume.h"
+
+#include "data/data_peer.h"
+#include "data/data_thread.h"
+#include "data/notify/data_peer_notify_settings.h"
+#include "main/main_session.h"
+#include "main/main_session_settings.h"
+#include "core/application.h"
+#include "window/notifications_manager.h"
+#include "settings/settings_common.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "styles/style_settings.h"
+
+namespace Data {
+
+Data::VolumeController DefaultRingtonesVolumeController(
+		not_null<Main::Session*> session,
+		Data::DefaultNotify defaultNotify) {
+	return Data::VolumeController{
+		.volume = [=]() -> ushort {
+			const auto volume = session->settings().ringtoneVolume(
+				defaultNotify);
+			return volume ? volume : 100;
+		},
+		.saveVolume = [=](ushort volume) {
+			session->settings().setRingtoneVolume(defaultNotify, volume);
+			session->saveSettingsDelayed();
+		}};
+}
+
+Data::VolumeController ThreadRingtonesVolumeController(
+		not_null<Data::Thread*> thread) {
+	return Data::VolumeController{
+		.volume = [=]() -> ushort {
+			const auto volume = thread->session().settings().ringtoneVolume(
+				thread->peer()->id,
+				thread->topicRootId(),
+				thread->monoforumPeerId());
+			return volume ? volume : 100;
+		},
+		.saveVolume = [=](ushort volume) {
+			thread->session().settings().setRingtoneVolume(
+				thread->peer()->id,
+				thread->topicRootId(),
+				thread->monoforumPeerId(),
+				volume);
+			thread->session().saveSettingsDelayed();
+		}};
+}
+
+} // namespace Data
+
+namespace Ui {
+
+void AddRingtonesVolumeSlider(
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<bool> toggleOn,
+		rpl::producer<QString> subtitle,
+		Data::VolumeController volumeController) {
+	Expects(volumeController.volume && volumeController.saveVolume);
+
+	const auto volumeWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	volumeWrap->toggleOn(
+		rpl::combine(
+			Core::App().notifications().volumeSupportedValue(),
+			std::move(toggleOn)
+		) | rpl::map(
+			rpl::mappers::_1 && rpl::mappers::_2
+		) | rpl::distinct_until_changed(),
+		anim::type::normal);
+	volumeWrap->finishAnimating();
+
+	Ui::AddSubsectionTitle(volumeWrap->entity(), std::move(subtitle));
+	auto sliderWithLabel = Settings::MakeSliderWithLabel(
+		volumeWrap->entity(),
+		st::settingsScale,
+		st::settingsScaleLabel,
+		st::normalFont->spacew * 2,
+		st::settingsScaleLabel.style.font->width("100%"),
+		true);
+	const auto slider = sliderWithLabel.slider;
+	const auto label = sliderWithLabel.label;
+
+	volumeWrap->entity()->add(
+		std::move(sliderWithLabel.widget),
+		st::settingsBigScalePadding);
+
+	const auto updateLabel = [=](int volume) {
+		label->setText(QString::number(volume) + '%');
+	};
+
+	slider->setPseudoDiscrete(
+		100,
+		[=](int index) { return index + 1; },
+		int(volumeController.volume()),
+		updateLabel,
+		[saveVolume = volumeController.saveVolume](int volume) {
+			saveVolume(volume);
+		});
+	updateLabel(volumeController.volume());
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/data/notify/data_peer_notify_volume.h b/Telegram/SourceFiles/data/notify/data_peer_notify_volume.h
new file mode 100644
index 00000000000000..cc6833e7a11e93
--- /dev/null
+++ b/Telegram/SourceFiles/data/notify/data_peer_notify_volume.h
@@ -0,0 +1,45 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class VerticalLayout;
+} // namespace Ui
+
+namespace Data {
+
+enum class DefaultNotify : uint8_t;
+class Thread;
+
+struct VolumeController {
+	Fn<ushort()> volume = nullptr;
+	Fn<void(ushort)> saveVolume = nullptr;
+};
+
+[[nodiscard]] VolumeController DefaultRingtonesVolumeController(
+	not_null<Main::Session*> session,
+	Data::DefaultNotify defaultNotify);
+
+[[nodiscard]] VolumeController ThreadRingtonesVolumeController(
+	not_null<Data::Thread*> thread);
+
+} // namespace Data
+
+namespace Ui {
+
+void AddRingtonesVolumeSlider(
+	not_null<Ui::VerticalLayout*> container,
+	rpl::producer<bool> toggleOn,
+	rpl::producer<QString> subtitle,
+	Data::VolumeController volumeController);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/data/raw/raw_countries_bounds.cpp b/Telegram/SourceFiles/data/raw/raw_countries_bounds.cpp
index d4e3831219c037..23db0af790010d 100644
--- a/Telegram/SourceFiles/data/raw/raw_countries_bounds.cpp
+++ b/Telegram/SourceFiles/data/raw/raw_countries_bounds.cpp
@@ -145,7 +145,7 @@ const base::flat_map<QString, GeoBounds> &CountryBounds() {
 		{ u"PY"_q, GeoBounds{ -62.69, -27.55, -54.29, -19.34 } },
 		{ u"QA"_q, GeoBounds{ 50.74, 24.56, 51.61, 26.11 } },
 		{ u"RO"_q, GeoBounds{ 20.22, 43.69, 29.63, 48.22 } },
-		{ u"RU"_q, GeoBounds{ -180.0, 41.15, 180.0, 81.25 } },
+		{ u"RU"_q, GeoBounds{ -18.0, 41.15, 180.0, 81.25 } },
 		{ u"RW"_q, GeoBounds{ 29.02, -2.92, 30.82, -1.13 } },
 		{ u"SA"_q, GeoBounds{ 34.63, 16.35, 55.67, 32.16 } },
 		{ u"SD"_q, GeoBounds{ 21.94, 8.62, 38.41, 22.0 } },
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
index bb90a581d81628..0e3ece8f6e0475 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
@@ -15,6 +15,7 @@ For license and copyright information please follow this link:
 #include "data/data_session.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
+#include "data/data_emoji_statuses.h"
 #include "data/data_file_origin.h"
 #include "data/data_forum_topic.h" // ParseTopicIconEmojiEntity.
 #include "data/data_peer.h"
@@ -26,7 +27,10 @@ For license and copyright information please follow this link:
 #include "lottie/lottie_frame_generator.h"
 #include "ffmpeg/ffmpeg_frame_generator.h"
 #include "chat_helpers/stickers_lottie.h"
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "storage/file_download.h" // kMaxFileInMemory
+#include "ui/chat/chats_filter_tag.h"
+#include "ui/effects/premium_stars_colored.h"
 #include "ui/effects/credits_graphics.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/text/custom_emoji_instance.h"
@@ -96,14 +100,26 @@ class CallbackListener final : public CustomEmojiManager::Listener {
 		: FrameSizeFromTag(tag);
 }
 
-[[nodiscard]] QString InternalPrefix() {
-	return u"internal:"_q;
-}
-
 [[nodiscard]] QString UserpicEmojiPrefix() {
 	return u"userpic:"_q;
 }
 
+[[nodiscard]] QString ScaledSimplePrefix() {
+	return u"scaled-simple:"_q;
+}
+
+[[nodiscard]] QString ScaledCustomPrefix() {
+	return u"scaled-custom:"_q;
+}
+
+[[nodiscard]] QString ForceStaticPrefix() {
+	return u"force-static:"_q;
+}
+
+[[nodiscard]] QString CollectiblePrefix() {
+	return u"collectible:"_q;
+}
+
 [[nodiscard]] QString InternalPadding(QMargins value) {
 	return value.isNull() ? QString() : QString(",%1,%2,%3,%4"
 	).arg(value.left()
@@ -243,7 +259,7 @@ void CustomEmojiLoader::load(Fn<void(LoadResult)> loaded) {
 				check();
 			} else {
 				load->document->session().downloaderTaskFinished(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					check();
 				}, load->process->lifetime);
 			}
@@ -447,7 +463,7 @@ CustomEmojiManager::CustomEmojiManager(not_null<Session*> owner)
 	appConfig->value(
 	) | rpl::take_while([=] {
 		return !_coloredSetId;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		const auto setId = appConfig->get<QString>(
 			"default_emoji_statuses_stickerset_id",
 			QString()).toULongLong();
@@ -499,8 +515,8 @@ std::unique_ptr<Ui::Text::CustomEmoji> CustomEmojiManager::create(
 Ui::Text::CustomEmojiFactory CustomEmojiManager::factory(
 		SizeTag tag,
 		int sizeOverride) {
-	return [=](QStringView data, Fn<void()> update) {
-		return create(data, std::move(update), tag, sizeOverride);
+	return [=](QStringView data, const Ui::Text::MarkedContext &context) {
+		return create(data, context.repaint, tag, sizeOverride);
 	};
 }
 
@@ -536,12 +552,37 @@ std::unique_ptr<Ui::Text::CustomEmoji> CustomEmojiManager::create(
 		Fn<void()> update,
 		SizeTag tag,
 		int sizeOverride) {
-	if (data.startsWith(InternalPrefix())) {
-		return internal(data);
+	if (data.startsWith(ScaledSimplePrefix())) {
+		const auto text = data.mid(ScaledSimplePrefix().size());
+		const auto emoji = Ui::Emoji::Find(text);
+		Assert(emoji != nullptr);
+		return Ui::MakeScaledSimpleEmoji(emoji);
+	} else if (data.startsWith(ScaledCustomPrefix())) {
+		const auto original = data.mid(ScaledCustomPrefix().size());
+		return Ui::MakeScaledCustomEmoji(
+			create(original, std::move(update), SizeTag::Large));
+	} else if (data.startsWith(ForceStaticPrefix())) {
+		const auto original = data.mid(ForceStaticPrefix().size());
+		return MakeWrappedEmoji<Ui::Text::FirstFrameEmoji>(
+			create(original, std::move(update), tag, sizeOverride));
 	} else if (data.startsWith(UserpicEmojiPrefix())) {
 		const auto ratio = style::DevicePixelRatio();
 		const auto size = EmojiSizeFromTag(tag) / ratio;
 		return userpic(data, std::move(update), size);
+	} else if (data.startsWith(CollectiblePrefix())) {
+		const auto id = data.mid(CollectiblePrefix().size()).toULongLong();
+		const auto emojiStatuses = &session().data().emojiStatuses();
+		auto info = emojiStatuses->collectibleInfo(id);
+		Assert(info != nullptr);
+		const auto documentId = info->documentId;
+		auto inner = create(documentId, base::duplicate(update), tag);
+		return Ui::Premium::MakeCollectibleEmoji(
+			data,
+			info->centerColor,
+			info->edgeColor,
+			std::move(inner),
+			std::move(update),
+			FrameSizeFromTag(tag) / style::DevicePixelRatio());
 	} else if (const auto parsed = Data::ParseTopicIconEmojiEntity(data)) {
 		return MakeTopicIconEmoji(parsed, std::move(update), tag);
 	}
@@ -571,26 +612,6 @@ std::unique_ptr<Ui::Text::CustomEmoji> CustomEmojiManager::create(
 	});
 }
 
-std::unique_ptr<Ui::Text::CustomEmoji> CustomEmojiManager::internal(
-		QStringView data) {
-	const auto v = data.mid(InternalPrefix().size()).split(',');
-	if (v.size() != 5 && v.size() != 1) {
-		return nullptr;
-	}
-	const auto index = v[0].toInt();
-	Assert(index >= 0 && index < _internalEmoji.size());
-
-	auto &info = _internalEmoji[index];
-	const auto padding = (v.size() == 5)
-		? QMargins(v[1].toInt(), v[2].toInt(), v[3].toInt(), v[4].toInt())
-		: QMargins();
-	return std::make_unique<Ui::CustomEmoji::Internal>(
-		data.toString(),
-		info.image,
-		padding,
-		info.textColor);
-}
-
 std::unique_ptr<Ui::Text::CustomEmoji> CustomEmojiManager::userpic(
 		QStringView data,
 		Fn<void()> update,
@@ -652,22 +673,27 @@ void CustomEmojiManager::unregisterListener(not_null<Listener*> listener) {
 	}
 }
 
-rpl::producer<not_null<DocumentData*>> CustomEmojiManager::resolve(
-		DocumentId documentId) {
+auto CustomEmojiManager::resolve(DocumentId documentId)
+-> rpl::producer<not_null<DocumentData*>, rpl::empty_error> {
 	return [=](auto consumer) {
 		auto result = rpl::lifetime();
-		const auto put = [=](not_null<DocumentData*> document) {
+		const auto put = [=](
+				not_null<DocumentData*> document,
+				bool resolved = true) {
 			if (!document->sticker()) {
+				if (resolved) {
+					consumer.put_error({});
+				}
 				return false;
 			}
 			consumer.put_next_copy(document);
 			return true;
 		};
-		if (!put(owner().document(documentId))) {
-			const auto listener = new CallbackListener(put);
+		if (!put(owner().document(documentId), false)) {
+			const auto listener = result.make_state<CallbackListener>(put);
+			resolve(documentId, listener);
 			result.add([=] {
 				unregisterListener(listener);
-				delete listener;
 			});
 		}
 		return result;
@@ -763,6 +789,9 @@ void CustomEmojiManager::request() {
 		requestFinished();
 	}).fail([=] {
 		LOG(("API Error: Failed to get documents for emoji."));
+		for (const auto &id : ids) {
+			processListeners(_owner->document(id.v));
+		}
 		requestFinished();
 	}).send();
 }
@@ -792,7 +821,8 @@ void CustomEmojiManager::processLoaders(not_null<DocumentData*> document) {
 	}
 }
 
-void CustomEmojiManager::processListeners(not_null<DocumentData*> document) {
+void CustomEmojiManager::processListeners(
+		not_null<DocumentData*> document) {
 	const auto id = document->id;
 	if (const auto listeners = _resolvers.take(id)) {
 		for (const auto &listener : *listeners) {
@@ -849,15 +879,15 @@ void CustomEmojiManager::repaintLater(
 		not_null<Ui::CustomEmoji::Instance*> instance,
 		Ui::CustomEmoji::RepaintRequest request) {
 	auto &bunch = _repaints[request.duration];
-	if (bunch.when < request.when) {
-		if (bunch.when > 0) {
-			for (const auto &already : bunch.instances) {
-				if (already.get() == instance) {
-					// Still waiting for full bunch repaint, don't bump.
-					return;
-				}
+	if (bunch.when > 0) {
+		for (const auto &already : bunch.instances) {
+			if (already.get() == instance) {
+				// Still waiting for full bunch repaint, don't bump.
+				return;
 			}
 		}
+	}
+	if (bunch.when < request.when) {
 		bunch.when = request.when;
 #if 0 // inject-to-on_main
 		_repaintsLastAdded = request.when;
@@ -887,7 +917,7 @@ void CustomEmojiManager::scheduleRepaintTimer() {
 #if 0 // inject-to-on_main
 	if (!_repaintsLifetime) {
 		crl::on_main_update_requests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			invokeRepaints();
 		}, _repaintsLifetime);
 	}
@@ -964,49 +994,6 @@ uint64 CustomEmojiManager::coloredSetId() const {
 	return _coloredSetId;
 }
 
-TextWithEntities CustomEmojiManager::creditsEmoji(QMargins padding) {
-	return Ui::Text::SingleCustomEmoji(
-		registerInternalEmoji(
-			Ui::GenerateStars(st::normalFont->height, 1),
-			padding,
-			false));
-}
-
-QString CustomEmojiManager::registerInternalEmoji(
-		QImage emoji,
-		QMargins padding,
-		bool textColor) {
-	_internalEmoji.push_back({ std::move(emoji), textColor });
-	return InternalPrefix()
-		+ QString::number(_internalEmoji.size() - 1)
-		+ InternalPadding(padding);
-}
-
-QString CustomEmojiManager::registerInternalEmoji(
-		const style::icon &icon,
-		QMargins padding,
-		bool textColor) {
-	const auto i = _iconEmoji.find(&icon);
-	if (i != end(_iconEmoji)) {
-		return i->second + InternalPadding(padding);
-	}
-	auto image = QImage(
-		icon.size() * style::DevicePixelRatio(),
-		QImage::Format_ARGB32_Premultiplied);
-	image.fill(Qt::transparent);
-	image.setDevicePixelRatio(style::DevicePixelRatio());
-	auto p = QPainter(&image);
-	icon.paint(p, 0, 0, icon.width());
-	p.end();
-
-	const auto result = registerInternalEmoji(
-		std::move(image),
-		QMargins{},
-		textColor);
-	_iconEmoji.emplace(&icon, result);
-	return result + InternalPadding(padding);
-}
-
 [[nodiscard]] QString CustomEmojiManager::peerUserpicEmojiData(
 		not_null<PeerData*> peer,
 		QMargins padding,
@@ -1044,7 +1031,10 @@ TextWithEntities SingleCustomEmoji(DocumentId id) {
 }
 
 TextWithEntities SingleCustomEmoji(not_null<DocumentData*> document) {
-	return SingleCustomEmoji(document->id);
+	const auto sticker = document->sticker();
+	return Ui::Text::SingleCustomEmoji(
+		SerializeCustomEmojiId(document),
+		sticker ? sticker->alt : QString());
 }
 
 bool AllowEmojiWithoutPremium(
@@ -1081,8 +1071,9 @@ void InsertCustomEmoji(
 Ui::Text::CustomEmojiFactory ReactedMenuFactory(
 		not_null<Main::Session*> session) {
 	return [owner = &session->data()](
-			QStringView data,
-			Fn<void()> repaint) -> std::unique_ptr<Ui::Text::CustomEmoji> {
+		QStringView data,
+		const Ui::Text::MarkedContext &context
+	) -> std::unique_ptr<Ui::Text::CustomEmoji> {
 		const auto prefix = u"default:"_q;
 		if (data.startsWith(prefix)) {
 			const auto &list = owner->reactions().list(
@@ -1098,18 +1089,28 @@ Ui::Text::CustomEmojiFactory ReactedMenuFactory(
 				const auto tag = Data::CustomEmojiManager::SizeTag::Normal;
 				const auto ratio = style::DevicePixelRatio();
 				const auto skip = (Data::FrameSizeFromTag(tag) / ratio - size) / 2;
-				return std::make_unique<Ui::Text::FirstFrameEmoji>(
-					std::make_unique<Ui::Text::ShiftedEmoji>(
+				return MakeWrappedEmoji<Ui::Text::FirstFrameEmoji>(
+					MakeWrappedEmoji<Ui::Text::ShiftedEmoji>(
 						owner->customEmojiManager().create(
 							document,
-							std::move(repaint),
+							context.repaint,
 							tag,
 							size),
 						QPoint(skip, skip)));
 			}
 		}
-		return owner->customEmojiManager().create(data, std::move(repaint));
+		return owner->customEmojiManager().create(data, context.repaint);
 	};
 }
 
+QString CollectibleCustomEmojiId(Data::EmojiStatusCollectible &data) {
+	return CollectiblePrefix() + QString::number(data.id);
+}
+
+QString EmojiStatusCustomId(const EmojiStatusId &id) {
+	return id.collectible
+		? CollectibleCustomEmojiId(*id.collectible)
+		: SerializeCustomEmojiId(id.documentId);
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
index d51a521909d08b..1351bb0c1d9d40 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
@@ -66,8 +66,8 @@ class CustomEmojiManager final : public base::has_weak_ptr {
 	void resolve(DocumentId documentId, not_null<Listener*> listener);
 	void unregisterListener(not_null<Listener*> listener);
 
-	[[nodiscard]] rpl::producer<not_null<DocumentData*>> resolve(
-		DocumentId documentId);
+	[[nodiscard]] auto resolve(DocumentId documentId)
+		-> rpl::producer<not_null<DocumentData*>, rpl::empty_error>;
 
 	[[nodiscard]] std::unique_ptr<Ui::CustomEmoji::Loader> createLoader(
 		not_null<DocumentData*> document,
@@ -83,15 +83,6 @@ class CustomEmojiManager final : public base::has_weak_ptr {
 	[[nodiscard]] Main::Session &session() const;
 	[[nodiscard]] Session &owner() const;
 
-	[[nodiscard]] QString registerInternalEmoji(
-		QImage emoji,
-		QMargins padding = {},
-		bool textColor = true);
-	[[nodiscard]] QString registerInternalEmoji(
-		const style::icon &icon,
-		QMargins padding = {},
-		bool textColor = true);
-
 	[[nodiscard]] QString peerUserpicEmojiData(
 		not_null<PeerData*> peer,
 		QMargins padding = {},
@@ -99,8 +90,6 @@ class CustomEmojiManager final : public base::has_weak_ptr {
 
 	[[nodiscard]] uint64 coloredSetId() const;
 
-	[[nodiscard]] TextWithEntities creditsEmoji(QMargins padding = {});
-
 private:
 	static constexpr auto kSizeCount = int(SizeTag::kCount);
 
@@ -151,8 +140,6 @@ class CustomEmojiManager final : public base::has_weak_ptr {
 		SizeTag tag,
 		int sizeOverride,
 		LoaderFactory factory);
-	[[nodiscard]] std::unique_ptr<Ui::Text::CustomEmoji> internal(
-		QStringView data);
 	[[nodiscard]] std::unique_ptr<Ui::Text::CustomEmoji> userpic(
 		QStringView data,
 		Fn<void()> update,
@@ -162,7 +149,7 @@ class CustomEmojiManager final : public base::has_weak_ptr {
 	const not_null<Session*> _owner;
 
 	std::array<
-		base::flat_map<
+		std::unordered_map<
 			DocumentId,
 			std::unique_ptr<Ui::CustomEmoji::Instance>>,
 		kSizeCount> _instances;
@@ -189,9 +176,6 @@ class CustomEmojiManager final : public base::has_weak_ptr {
 	bool _repaintTimerScheduled = false;
 	bool _requestSetsScheduled = false;
 
-	std::vector<InternalEmojiData> _internalEmoji;
-	base::flat_map<not_null<const style::icon*>, QString> _iconEmoji;
-
 #if 0 // inject-to-on_main
 	crl::time _repaintsLastAdded = 0;
 	rpl::lifetime _repaintsLifetime;
@@ -223,4 +207,8 @@ void InsertCustomEmoji(
 [[nodiscard]] Ui::Text::CustomEmojiFactory ReactedMenuFactory(
 	not_null<Main::Session*> session);
 
+[[nodiscard]] QString CollectibleCustomEmojiId(
+	Data::EmojiStatusCollectible &data);
+[[nodiscard]] QString EmojiStatusCustomId(const EmojiStatusId &id);
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.cpp b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
index 4133af7b67cd6e..9850b6623ed764 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
@@ -22,7 +22,7 @@ For license and copyright information please follow this link:
 #include "history/history_item_components.h"
 #include "apiwrap.h"
 #include "storage/storage_account.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "main/main_session.h"
@@ -48,7 +48,7 @@ using SetFlag = StickersSetFlag;
 		const Data::PremiumLimits &limits) {
 	const auto defaultLimit = limits.gifsDefault();
 	const auto premiumLimit = limits.gifsPremium();
-	return Ui::Text::Bold(
+	return tr::bold(
 		tr::lng_saved_gif_limit_title(tr::now, lt_count, defaultLimit)
 	).append('\n').append(
 		tr::lng_saved_gif_limit_more(
@@ -56,15 +56,15 @@ using SetFlag = StickersSetFlag;
 			lt_count,
 			premiumLimit,
 			lt_link,
-			Ui::Text::Link(tr::lng_saved_gif_limit_link(tr::now)),
-			Ui::Text::WithEntities));
+			tr::link(tr::lng_saved_gif_limit_link(tr::now)),
+			tr::marked));
 }
 
 [[nodiscard]] TextWithEntities FaveStickersToast(
 		const Data::PremiumLimits &limits) {
 	const auto defaultLimit = limits.stickersFavedDefault();
 	const auto premiumLimit = limits.stickersFavedPremium();
-	return Ui::Text::Bold(
+	return tr::bold(
 		tr::lng_fave_sticker_limit_title(tr::now, lt_count, defaultLimit)
 	).append('\n').append(
 		tr::lng_fave_sticker_limit_more(
@@ -72,8 +72,8 @@ using SetFlag = StickersSetFlag;
 			lt_count,
 			premiumLimit,
 			lt_link,
-			Ui::Text::Link(tr::lng_fave_sticker_limit_link(tr::now)),
-			Ui::Text::WithEntities));
+			tr::link(tr::lng_fave_sticker_limit_link(tr::now)),
+			tr::marked));
 }
 
 void MaybeShowPremiumToast(
@@ -88,8 +88,7 @@ void MaybeShowPremiumToast(
 		return;
 	}
 	const auto filter = [=](const auto ...) {
-		const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
-		if (const auto controller = show->resolveWindow(usage)) {
+		if (const auto controller = show->resolveWindow()) {
 			Settings::ShowPremium(controller, ref);
 		}
 		return false;
@@ -189,6 +188,14 @@ rpl::producer<uint64> Stickers::stickerSetInstalled() const {
 	return _stickerSetInstalled.events();
 }
 
+void Stickers::notifyGifWithCaptionSent() {
+	_gifWithCaptionSent.fire({});
+}
+
+rpl::producer<> Stickers::gifWithCaptionSent() const {
+	return _gifWithCaptionSent.events();
+}
+
 void Stickers::notifyEmojiSetInstalled(uint64 setId) {
 	_emojiSetInstalled.fire(std::move(setId));
 }
@@ -206,22 +213,20 @@ void Stickers::incrementSticker(not_null<DocumentData*> document) {
 	auto &sets = setsRef();
 	auto it = sets.find(Data::Stickers::CloudRecentSetId);
 	if (it == sets.cend()) {
-		if (it == sets.cend()) {
-			it = sets.emplace(
+		it = sets.emplace(
+			Data::Stickers::CloudRecentSetId,
+			std::make_unique<Data::StickersSet>(
+				&session().data(),
 				Data::Stickers::CloudRecentSetId,
-				std::make_unique<Data::StickersSet>(
-					&session().data(),
-					Data::Stickers::CloudRecentSetId,
-					uint64(0), // accessHash
-					uint64(0), // hash
-					tr::lng_recent_stickers(tr::now),
-					QString(),
-					0, // count
-					SetFlag::Special,
-					TimeId(0))).first;
-		} else {
-			it->second->title = tr::lng_recent_stickers(tr::now);
-		}
+				uint64(0), // accessHash
+				uint64(0), // hash
+				tr::lng_recent_stickers(tr::now),
+				QString(),
+				0, // count
+				SetFlag::Special,
+				TimeId(0))).first;
+	} else {
+		it->second->title = tr::lng_recent_stickers(tr::now);
 	}
 	const auto set = it->second.get();
 	auto removedFromEmoji = std::vector<not_null<EmojiPtr>>();
@@ -256,7 +261,7 @@ void Stickers::incrementSticker(not_null<DocumentData*> document) {
 				set->emoji[emoji].push_front(document);
 			}
 		} else if (!removedFromEmoji.empty()) {
-			for (const auto emoji : removedFromEmoji) {
+			for (const auto &emoji : removedFromEmoji) {
 				set->emoji[emoji].push_front(document);
 			}
 		} else {
@@ -792,7 +797,7 @@ void Stickers::somethingReceived(
 void Stickers::setPackAndEmoji(
 		StickersSet &set,
 		StickersPack &&pack,
-		const std::vector<TimeId> &&dates,
+		std::vector<TimeId> &&dates,
 		const QVector<MTPStickerPack> &packs) {
 	set.stickers = std::move(pack);
 	set.dates = std::move(dates);
@@ -817,6 +822,25 @@ void Stickers::setPackAndEmoji(
 	}
 }
 
+not_null<StickersSet*> Stickers::collectibleSet() {
+	const auto setId = CollectibleSetId;
+	auto &sets = setsRef();
+	auto it = sets.find(setId);
+	if (it == sets.cend()) {
+		it = sets.emplace(setId, std::make_unique<StickersSet>(
+				&owner(),
+				setId,
+				uint64(0), // accessHash
+				uint64(0), // hash
+				tr::lng_collectible_emoji(tr::now),
+				QString(),
+				0, // count
+				SetFlag::Special,
+				TimeId(0))).first;
+	}
+	return it->second.get();
+}
+
 void Stickers::specialSetReceived(
 		uint64 setId,
 		const QString &setTitle,
@@ -1441,7 +1465,7 @@ std::vector<not_null<DocumentData*>> Stickers::getListByEmoji(
 		const auto others = session().api().stickersByEmoji(key);
 		if (others) {
 			result.reserve(result.size() + others->size());
-			for (const auto document : *others) {
+			for (const auto &document : *others) {
 				add(document, CreateOtherSortKey(document));
 			}
 		} else if (!forceAllResults) {
@@ -1585,7 +1609,8 @@ not_null<StickersSet*> Stickers::feedSet(const MTPStickerSet &info) {
 			& (SetFlag::Featured
 				| SetFlag::Unread
 				| SetFlag::NotLoaded
-				| SetFlag::Special);
+				| SetFlag::Special
+				| SetFlag::Installed);
 		set->flags = flags | clientFlags;
 		const auto installDate = data.vinstalled_date();
 		set->installDate = installDate
@@ -1633,7 +1658,12 @@ not_null<StickersSet*> Stickers::feedSet(
 	const auto set = data.match([&](const auto &data) {
 		return feedSet(data.vset());
 	});
-	data.match([](const MTPDstickerSetCovered &data) {
+	data.match([&](const MTPDstickerSetCovered &data) {
+		set->covers = StickersPack();
+		const auto cover = session().data().processDocument(data.vcover());
+		if (cover->sticker()) {
+			set->covers.push_back(cover);
+		}
 	}, [&](const MTPDstickerSetNoCovered &data) {
 	}, [&](const MTPDstickerSetMultiCovered &data) {
 		feedSetCovers(set, data.vcovers().v);
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.h b/Telegram/SourceFiles/data/stickers/data_stickers.h
index 426b034aaae800..602b2b4c53c426 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.h
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.h
@@ -65,6 +65,9 @@ class Stickers final {
 	// For setting up megagroup sticker set.
 	static constexpr auto MegagroupSetId = 0xFFFFFFFFFFFFFFEFULL;
 
+	// For collectible emoji statuses.
+	static constexpr auto CollectibleSetId = 0xFFFFFFFFFFFFFFF8ULL;
+
 	void notifyUpdated(StickersType type);
 	[[nodiscard]] rpl::producer<StickersType> updated() const;
 	[[nodiscard]] rpl::producer<> updated(StickersType type) const;
@@ -75,6 +78,8 @@ class Stickers final {
 	[[nodiscard]] rpl::producer<> savedGifsUpdated() const;
 	void notifyStickerSetInstalled(uint64 setId);
 	[[nodiscard]] rpl::producer<uint64> stickerSetInstalled() const;
+	void notifyGifWithCaptionSent();
+	[[nodiscard]] rpl::producer<> gifWithCaptionSent() const;
 	void notifyEmojiSetInstalled(uint64 setId);
 	[[nodiscard]] rpl::producer<uint64> emojiSetInstalled() const;
 
@@ -244,6 +249,8 @@ class Stickers final {
 	[[nodiscard]] auto getEmojiListFromSet(not_null<DocumentData*> document)
 		-> std::optional<std::vector<not_null<EmojiPtr>>>;
 
+	[[nodiscard]] not_null<StickersSet*> collectibleSet();
+
 	not_null<StickersSet*> feedSet(const MTPStickerSet &data);
 	not_null<StickersSet*> feedSet(const MTPStickerSetCovered &data);
 	not_null<StickersSet*> feedSetFull(const MTPDmessages_stickerSet &data);
@@ -286,7 +293,7 @@ class Stickers final {
 	void setPackAndEmoji(
 		StickersSet &set,
 		StickersPack &&pack,
-		const std::vector<TimeId> &&dates,
+		std::vector<TimeId> &&dates,
 		const QVector<MTPStickerPack> &packs);
 	void somethingReceived(
 		const QVector<MTPStickerSet> &list,
@@ -301,6 +308,7 @@ class Stickers final {
 	rpl::event_stream<StickersType> _recentUpdated;
 	rpl::event_stream<> _savedGifsUpdated;
 	rpl::event_stream<uint64> _stickerSetInstalled;
+	rpl::event_stream<> _gifWithCaptionSent;
 	rpl::event_stream<uint64> _emojiSetInstalled;
 	crl::time _lastUpdate = 0;
 	crl::time _lastRecentUpdate = 0;
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 6451e79b4a0a7c..dde6f4516c6bd1 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -22,6 +22,11 @@ DialogRow {
 	topicsSkipBig: pixels;
 	topicsHeight: pixels;
 	unreadMarkDiameter: pixels;
+	tagTop: pixels;
+}
+DialogRightButton {
+	button: RoundButton;
+	margin: margins;
 }
 
 ThreeStateIcon {
@@ -30,6 +35,12 @@ ThreeStateIcon {
 	active: icon;
 }
 
+VerifiedBadge {
+	position: point;
+	color: color;
+	height: pixels;
+}
+
 ForumTopicIcon {
 	size: pixels;
 	font: font;
@@ -89,6 +100,11 @@ defaultDialogRow: DialogRow {
 	textLeft: 68px;
 	textTop: 34px;
 }
+taggedDialogRow: DialogRow(defaultDialogRow) {
+	height: 72px;
+	textTop: 30px;
+	tagTop: 52px;
+}
 forumDialogRow: DialogRow(defaultDialogRow) {
 	height: 80px;
 	textTop: 32px;
@@ -96,6 +112,29 @@ forumDialogRow: DialogRow(defaultDialogRow) {
 	topicsSkipBig: 14px;
 	topicsHeight: 21px;
 }
+taggedForumDialogRow: DialogRow(forumDialogRow) {
+	height: 96px;
+	tagTop: 77px;
+}
+dialogRowFilterTagSkip: 4px;
+dialogRowFilterTagStyle: TextStyle(defaultTextStyle) {
+	font: font(10px);
+}
+dialogRowOpenBot: DialogRightButton {
+	button: RoundButton(defaultActiveButton) {
+		height: 20px;
+		textTop: 1px;
+	}
+	margin: margins(0px, 32px, 10px, 0px);
+}
+dialogRowOpenBotRecent: DialogRightButton(dialogRowOpenBot) {
+	margin: margins(0px, 32px, 16px, 0px);
+}
+dialogsTopBarRightButton: RoundButton(defaultActiveButton) {
+	width: -16px;
+	height: 22px;
+	textTop: 2px;
+}
 
 forumDialogJumpArrow: icon{{ "dialogs/dialogs_topic_arrow", dialogsTextFg }};
 forumDialogJumpArrowOver: icon{{ "dialogs/dialogs_topic_arrow", dialogsTextFgOver }};
@@ -211,6 +250,17 @@ dialogsEmptyLabel: FlatLabel(defaultFlatLabel) {
 	align: align(top);
 	textFg: windowSubTextFg;
 }
+dialogEmptyButton: RoundButton(defaultActiveButton) {
+}
+dialogEmptyButtonSkip: 12px;
+dialogEmptyButtonLabel: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(boxFontSize semibold);
+	}
+	minWidth: 32px;
+	align: align(top);
+	textFg: windowFg;
+}
 
 dialogsMenuToggle: IconButton {
 	width: 40px;
@@ -222,9 +272,7 @@ dialogsMenuToggle: IconButton {
 
 	rippleAreaPosition: point(0px, 0px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 dialogsMenuToggleUnread: icon {
 	{ "dialogs/dialogs_menu_unread", dialogsMenuIconFg },
@@ -318,6 +366,13 @@ dialogsCancelSearch: CrossButton {
 	ripple: emptyRippleAnimation;
 }
 
+dialogsCalendarTopBar: IconButton(dialogsCalendar) {
+	width: 26px;
+}
+dialogsSearchFromTopBar: IconButton(dialogsSearchFrom) {
+	width: 26px;
+}
+
 dialogCalendar: IconButton(dialogsMenuToggle) {
 	icon: icon {{ "dialogs/dialogs_calendar", lightButtonFg }};
 	iconOver: icon {{ "dialogs/dialogs_calendar", lightButtonFgOver }};
@@ -386,6 +441,18 @@ dialogsLockIcon: ThreeStateIcon {
 	active: icon {{ "emoji/premium_lock", dialogsUnreadBgMutedActive, point(4px, 0px) }};
 }
 
+dialogsVerifiedColors: VerifiedBadge {
+	height: 20px;
+	color: dialogsVerifiedIconBg;
+	position: point(-1px, 0px);
+}
+dialogsVerifiedColorsOver: VerifiedBadge(dialogsVerifiedColors) {
+	color: dialogsVerifiedIconBgOver;
+}
+dialogsVerifiedColorsActive: VerifiedBadge(dialogsVerifiedColors) {
+	color: dialogsVerifiedIconBgActive;
+}
+
 dialogsVerifiedIcon: icon {
 	{ "dialogs/dialogs_verified_star", dialogsVerifiedIconBg },
 	{ "dialogs/dialogs_verified_check", dialogsVerifiedIconFg },
@@ -458,18 +525,14 @@ dialogsLoadMoreLoading: InfiniteRadialAnimation(defaultInfiniteRadialAnimation)
 }
 
 dialogsSearchInHeight: 38px;
-dialogsSearchInPhotoSize: 26px;
-dialogsSearchInPhotoPadding: 12px;
+dialogsSearchInPhotoSize: 28px;
+dialogsSearchInPhotoPadding: 10px;
 dialogsSearchInSkip: 10px;
 dialogsSearchInNameTop: 9px;
 dialogsSearchInDownTop: 15px;
 dialogsSearchInDown: icon {{ "intro_country_dropdown", windowBoldFg }};
 dialogsSearchInDownSkip: 4px;
 dialogsSearchInMenu: PopupMenu(defaultPopupMenu) {
-	shadow: boxRoundShadow;
-	animation: PanelAnimation(defaultPanelAnimation) {
-		shadow: boxRoundShadow;
-	}
 	scrollPadding: margins(0px, 0px, 0px, 0px);
 	radius: 8px;
 	menu: menuWithIcons;
@@ -477,9 +540,6 @@ dialogsSearchInMenu: PopupMenu(defaultPopupMenu) {
 dialogsSearchInCheck: icon {{ "player/player_check", mediaPlayerActiveFg }};
 dialogsSearchInCheckSkip: 8px;
 dialogsSearchFromStyle: defaultTextStyle;
-dialogsSearchFromPalette: TextPalette(defaultTextPalette) {
-	linkFg: dialogsNameFg;
-}
 
 dialogsScamPadding: margins(2px, 0px, 2px, 0px);
 dialogsScamFont: font(9px semibold);
@@ -493,6 +553,11 @@ dialogsMiniPreviewSkip: 2px;
 dialogsMiniPreviewRight: 3px;
 dialogsMiniPlay: icon{{ "dialogs/dialogs_mini_play", videoPlayIconFg }};
 
+dialogsUnreadMediaDotEmoji: IconEmoji {
+	icon: icon{{ "dialogs/dialogs_unread_media_dot", dialogsTextFgService }};
+	padding: margins(1px, 7px, 2px, 0px);
+}
+
 dialogsMiniForward: DialogsMiniIcon {
 	icon: ThreeStateIcon {
 		icon: icon {{ "mini_forward", dialogsTextFg, point(0px, 1px) }};
@@ -503,7 +568,15 @@ dialogsMiniForward: DialogsMiniIcon {
 	skipMedia: 2px;
 }
 
-dialogsMiniReplyIcon: icon {{ "mini_forward-flip_horizontal", attentionButtonFg, point(0px, 2px) }};
+dialogsMiniReplyIcon: IconEmoji {
+	icon: icon {{ "mini_forward-flip_horizontal", attentionButtonFg }};
+	padding: margins(0px, 2px, 0px, 0px);
+}
+
+dialogsMiniPollIcon: IconEmoji {
+	icon: icon {{ "dialogs/dialogs_chatlist_poll-17x17", dialogsTextFg }};
+	padding: margins(0px, 1px, 3px, 0px);
+}
 
 dialogsMiniReplyStory: DialogsMiniIcon {
 	icon: ThreeStateIcon {
@@ -515,16 +588,78 @@ dialogsMiniReplyStory: DialogsMiniIcon {
 	skipMedia: 5px;
 }
 
+historyReplyStoryIcon: IconEmoji {
+	icon: icon {{ "mini_reply_story", dialogsTextFg, point(0px, 1px) }};
+	padding: margins(0px, 0px, 4px, 0px);
+}
+
 dialogsUnreadMention: ThreeStateIcon {
-	icon: icon{{ "dialogs/dialogs_mention", dialogsUnreadFg }};
-	over: icon{{ "dialogs/dialogs_mention", dialogsUnreadFgOver }};
-	active: icon{{ "dialogs/dialogs_mention", dialogsUnreadFgActive }};
+	icon: icon{{ "dialogs/dialogs_chatlist_mention-18x18", dialogsMentionIconFg }};
+	over: icon{{ "dialogs/dialogs_chatlist_mention-18x18", dialogsMentionIconFg }};
+	active: icon{{ "dialogs/dialogs_chatlist_mention-18x18", dialogsNameFgActive }};
 }
-dialogsUnreadReaction: ThreeStateIcon {
-	icon: icon{{ "dialogs/dialogs_reaction", dialogsUnreadFg }};
-	over: icon{{ "dialogs/dialogs_reaction", dialogsUnreadFgOver }};
-	active: icon{{ "dialogs/dialogs_reaction", dialogsUnreadFgActive }};
+dialogsUnreadMentionMuted: ThreeStateIcon {
+	icon: icon{{ "dialogs/dialogs_chatlist_mention-18x18", dialogsUnreadBgMuted }};
+	over: icon{{ "dialogs/dialogs_chatlist_mention-18x18", dialogsUnreadBgMutedOver }};
+	active: icon{{ "dialogs/dialogs_chatlist_mention-18x18", dialogsUnreadBgMutedActive }};
 }
+dialogsUnreadReaction: ThreeStateIcon {
+	icon: icon{{ "dialogs/dialogs_chatlist_reaction-18x18", dialogsReactionIconFg }};
+	over: icon{{ "dialogs/dialogs_chatlist_reaction-18x18", dialogsReactionIconFg }};
+	active: icon{{ "dialogs/dialogs_chatlist_reaction-18x18", dialogsNameFgActive }};
+}
+dialogsUnreadReactionMuted: ThreeStateIcon {
+	icon: icon{{ "dialogs/dialogs_chatlist_reaction-18x18", dialogsUnreadBgMuted }};
+	over: icon{{ "dialogs/dialogs_chatlist_reaction-18x18", dialogsUnreadBgMutedOver }};
+	active: icon{{ "dialogs/dialogs_chatlist_reaction-18x18", dialogsUnreadBgMutedActive }};
+}
+dialogsUnreadPoll: ThreeStateIcon {
+	icon: icon{{ "dialogs/dialogs_chatlist_poll-18x18", dialogsPollIconFg }};
+	over: icon{{ "dialogs/dialogs_chatlist_poll-18x18", dialogsPollIconFg }};
+	active: icon{{ "dialogs/dialogs_chatlist_poll-18x18", dialogsNameFgActive }};
+}
+dialogsUnreadPollMuted: ThreeStateIcon {
+	icon: icon{{ "dialogs/dialogs_chatlist_poll-18x18", dialogsUnreadBgMuted }};
+	over: icon{{ "dialogs/dialogs_chatlist_poll-18x18", dialogsUnreadBgMutedOver }};
+	active: icon{{ "dialogs/dialogs_chatlist_poll-18x18", dialogsUnreadBgMutedActive }};
+}
+dialogsUnreadMentionBadge: ThreeStateIcon {
+	icon: icon{{ "dialogs/dialogs_chatlist_mention-13x13", dialogsUnreadFg }};
+	over: icon{{ "dialogs/dialogs_chatlist_mention-13x13", dialogsUnreadFgOver }};
+	active: icon{{ "dialogs/dialogs_chatlist_mention-13x13", dialogsUnreadFgActive }};
+}
+dialogsUnreadMentionBadgeMuted: ThreeStateIcon {
+	icon: icon{{ "dialogs/dialogs_chatlist_mention-13x13", dialogsUnreadFg }};
+	over: icon{{ "dialogs/dialogs_chatlist_mention-13x13", dialogsUnreadFgOver }};
+	active: icon{{ "dialogs/dialogs_chatlist_mention-13x13", dialogsUnreadFgActive }};
+}
+dialogsUnreadReactionBadge: ThreeStateIcon {
+	icon: icon{{ "dialogs/dialogs_chatlist_reaction-13x13", dialogsUnreadFg }};
+	over: icon{{ "dialogs/dialogs_chatlist_reaction-13x13", dialogsUnreadFgOver }};
+	active: icon{{ "dialogs/dialogs_chatlist_reaction-13x13", dialogsUnreadFgActive }};
+}
+dialogsUnreadReactionBadgeMuted: ThreeStateIcon {
+	icon: icon{{ "dialogs/dialogs_chatlist_reaction-13x13", dialogsUnreadFg }};
+	over: icon{{ "dialogs/dialogs_chatlist_reaction-13x13", dialogsUnreadFgOver }};
+	active: icon{{ "dialogs/dialogs_chatlist_reaction-13x13", dialogsUnreadFgActive }};
+}
+dialogsUnreadPollBadge: ThreeStateIcon {
+	icon: icon{{ "dialogs/dialogs_chatlist_poll-13x13", dialogsUnreadFg }};
+	over: icon{{ "dialogs/dialogs_chatlist_poll-13x13", dialogsUnreadFgOver }};
+	active: icon{{ "dialogs/dialogs_chatlist_poll-13x13", dialogsUnreadFgActive }};
+}
+dialogsUnreadPollBadgeMuted: ThreeStateIcon {
+	icon: icon{{ "dialogs/dialogs_chatlist_poll-13x13", dialogsUnreadFg }};
+	over: icon{{ "dialogs/dialogs_chatlist_poll-13x13", dialogsUnreadFgOver }};
+	active: icon{{ "dialogs/dialogs_chatlist_poll-13x13", dialogsUnreadFgActive }};
+}
+
+dialogsMuteIcon: ThreeStateIcon {
+	icon: icon{{ "dialogs/dialogs_mute", dialogsUnreadBgMuted }};
+	over: icon{{ "dialogs/dialogs_mute", dialogsUnreadBgMutedOver }};
+	active: icon{{ "dialogs/dialogs_mute", dialogsUnreadBgMutedActive }};
+}
+dialogsMuteIconSkip: 4px;
 
 downloadBarHeight: 46px;
 downloadArrow: icon{{ "fast_to_original", menuIconFg }};
@@ -674,7 +809,11 @@ recentPeersSpecialName: PeerListItem(recentPeersItem) {
 	namePosition: point(64px, 19px);
 }
 
+dialogsTabsScroll: ScrollArea(defaultScrollArea) {
+	barHidden: true;
+}
 dialogsSearchTabs: SettingsSlider(defaultSettingsSlider) {
+	padding: 9px;
 	height: 33px;
 	barTop: 30px;
 	barSkip: 0px;
@@ -692,7 +831,10 @@ dialogsSearchTabs: SettingsSlider(defaultSettingsSlider) {
 	rippleBgActive: lightButtonBgOver;
 	ripple: defaultRippleAnimation;
 }
-dialogsSearchTabsPadding: 8px;
+
+chatsFiltersTabs: SettingsSlider(dialogsSearchTabs) {
+	rippleBottomSkip: 0px;
+}
 
 dialogsStoriesList: DialogsStoriesList {
 	small: dialogsStories;
@@ -713,15 +855,6 @@ dialogsStoriesTooltip: ImportantTooltip(defaultImportantTooltip) {
 }
 dialogsStoriesTooltipLabel: defaultImportantTooltipLabel;
 dialogsStoriesTooltipMaxWidth: 200px;
-dialogsStoriesTooltipHide: IconButton(defaultIconButton) {
-	width: 34px;
-	height: 20px;
-	iconPosition: point(-1px, -1px);
-	icon: icon {{ "calls/video_tooltip", importantTooltipFg }};
-	iconOver: icon {{ "calls/video_tooltip", importantTooltipFg }};
-	ripple: emptyRippleAnimation;
-}
-
 searchedBarHeight: 28px;
 searchedBarFont: normalFont;
 searchedBarPosition: point(14px, 5px);
@@ -739,9 +872,119 @@ dialogsSearchTagSkip: point(8px, 4px);
 dialogsSearchTagBottom: 10px;
 dialogsSearchTagLocked: icon{{ "dialogs/mini_tag_lock", lightButtonFgOver }};
 dialogsSearchTagPromo: defaultTextStyle;
-dialogsSearchTagArrow: icon{{ "dialogs/mini_arrow", windowSubTextFg }};
-dialogsSearchTagArrowPadding: margins(-6px, 3px, 0px, 0px);
+dialogsSearchTagArrow: IconEmoji {
+	icon: icon{{ "dialogs/mini_arrow", windowSubTextFg }};
+	padding: margins(-6px, 3px, 0px, 0px);
+}
 dialogsSearchTagPromoLeft: 6px;
 dialogsSearchTagPromoRight: 1px;
 dialogsSearchTagPromoSkip: 6px;
 
+dialogsPopularAppsPadding: margins(10px, 8px, 10px, 12px);
+dialogsPopularAppsAbout: FlatLabel(boxDividerLabel) {
+	minWidth: 128px;
+}
+
+dialogsQuickActionSize: 20px;
+dialogsQuickActionRippleSize: 80px;
+
+dialogsSponsoredButton: DialogRightButton(dialogRowOpenBot) {
+	button: RoundButton(defaultLightButton) {
+		textFg: windowActiveTextFg;
+		textFgOver: windowActiveTextFg;
+		textBg: lightButtonBgOver;
+		textBgOver: lightButtonBgOver;
+		height: 20px;
+		textTop: 1px;
+	}
+	margin: margins(0px, 9px, 10px, 0px);
+}
+
+dialogsTopBarLeftPadding: 18px;
+dialogsTopBarSuggestionTitleStyle: TextStyle(defaultTextStyle) {
+	font: font(semibold 12px);
+}
+dialogsTopBarSuggestionAboutStyle: TextStyle(defaultTextStyle) {
+	font: font(11px);
+}
+dialogsTopBarSuggestionMargins: margins(8px, 8px, 8px, 8px);
+dialogsTopBarSuggestionShadow: BoxShadow {
+	blurRadius: 8px;
+	offset: point(0px, 2px);
+	opacity: 0.18;
+}
+dialogsSuggestionDeniedAuthLottie: size(70px, 70px);
+dialogsSuggestionDeniedAuthLottieCircle: size(90px, 90px);
+dialogsSuggestionDeniedAuthLottieMargins: margins(10px, 10px, 10px, 10px);
+
+dialogsMiniQuoteIcon: icon{{ "chat/mini_quote", dialogsTextFg }};
+
+postsSearchIntroTitle: FlatLabel(defaultFlatLabel) {
+	textFg: windowBoldFg;
+	minWidth: 64px;
+	style: TextStyle(semiboldTextStyle) {
+		font: font(semibold 16px);
+	}
+	align: align(top);
+}
+postsSearchIntroTitleMargin: margins(20px, 0px, 20px, 4px);
+postsSearchIntroSubtitle: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	minWidth: 64px;
+	align: align(top);
+}
+postsSearchIntroSubtitleMargin: margins(20px, 4px, 20px, 16px);
+postsSearchIntroButton: RoundButton(defaultActiveButton) {
+	width: 200px;
+	height: 42px;
+	textTop: 12px;
+	style: semiboldTextStyle;
+}
+postsSearchIntroFooter: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	minWidth: 64px;
+	align: align(top);
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+}
+postsSearchIntroFooterMargin: margins(20px, 12px, 20px, 0px);
+postsSearchIcon: icon {{ "box_search", windowFgActive }};
+postsSearchIconPadding: margins(12px, 1px, 6px, 0px);
+postsSearchArrow: icon {{ "dialogs/mini_arrow", windowFgActive }};
+postsSearchArrowPadding: margins(2px, 1px, 8px, 0px);
+
+dialogsUnconfirmedAuthPadding: margins(10px, 0px, 10px, 0px);
+dialogsUnconfirmedAuthTitle: FlatLabel(boxLabel) {
+	minWidth: 70px;
+	align: align(top);
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+}
+dialogsUnconfirmedAuthAbout: FlatLabel(boxLabel) {
+	minWidth: 70px;
+	align: align(top);
+	textFg: windowSubTextFg;
+	style: TextStyle(defaultTextStyle) {
+		font: font(11px);
+	}
+}
+dialogsUnconfirmedAuthButton: RoundButton(defaultBoxButton) {
+	width: -16px;
+	height: 26px;
+	textTop: 5px;
+	radius: 10px;
+	style: TextStyle(semiboldTextStyle) {
+		font: font(11px semibold);
+	}
+}
+dialogsUnconfirmedAuthButtonNo: RoundButton(dialogsUnconfirmedAuthButton) {
+	textFg: attentionButtonFg;
+	textFgOver: attentionButtonFgOver;
+	textBgOver: attentionButtonBgOver;
+
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: attentionButtonBgRipple;
+	}
+}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_common.h b/Telegram/SourceFiles/dialogs/dialogs_common.h
new file mode 100644
index 00000000000000..a8c3e41a9ba574
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/dialogs_common.h
@@ -0,0 +1,165 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#ifdef _DEBUG
+#include <QtCore/QDebug>
+#endif // _DEBUG
+
+namespace style {
+struct DialogRightButton;
+} // namespace style
+
+namespace Ui {
+class RippleAnimation;
+} // namespace Ui
+
+namespace Dialogs {
+
+class Row;
+
+enum class SortMode {
+	Date    = 0x00,
+	Name    = 0x01,
+	Add     = 0x02,
+};
+
+struct PositionChange {
+	int from = -1;
+	int to = -1;
+	int height = 0;
+};
+
+struct UnreadState {
+	int messages = 0;
+	int messagesMuted = 0;
+	int chats = 0;
+	int chatsMuted = 0;
+	int marks = 0;
+	int marksMuted = 0;
+	int reactions = 0;
+	int reactionsMuted = 0;
+	int mentions = 0;
+	int polls = 0;
+	int pollsMuted = 0;
+	bool known = false;
+
+	UnreadState &operator+=(const UnreadState &other) {
+		messages += other.messages;
+		messagesMuted += other.messagesMuted;
+		chats += other.chats;
+		chatsMuted += other.chatsMuted;
+		marks += other.marks;
+		marksMuted += other.marksMuted;
+		reactions += other.reactions;
+		reactionsMuted += other.reactionsMuted;
+		mentions += other.mentions;
+		polls += other.polls;
+		pollsMuted += other.pollsMuted;
+		return *this;
+	}
+	UnreadState &operator-=(const UnreadState &other) {
+		messages -= other.messages;
+		messagesMuted -= other.messagesMuted;
+		chats -= other.chats;
+		chatsMuted -= other.chatsMuted;
+		marks -= other.marks;
+		marksMuted -= other.marksMuted;
+		reactions -= other.reactions;
+		reactionsMuted -= other.reactionsMuted;
+		mentions -= other.mentions;
+		polls -= other.polls;
+		pollsMuted -= other.pollsMuted;
+		return *this;
+	}
+};
+
+inline UnreadState operator+(const UnreadState &a, const UnreadState &b) {
+	auto result = a;
+	result += b;
+	return result;
+}
+
+inline UnreadState operator-(const UnreadState &a, const UnreadState &b) {
+	auto result = a;
+	result -= b;
+	return result;
+}
+
+#ifdef _DEBUG
+inline QDebug operator<<(QDebug debug, const UnreadState &state) {
+	return debug.nospace() << "UnreadState(messages:" << state.messages
+	<< ", messagesMuted:" << state.messagesMuted
+	<< ", chats:" << state.chats
+	<< ", chatsMuted:" << state.chatsMuted
+	<< ", marks:" << state.marks
+	<< ", marksMuted:" << state.marksMuted
+	<< ", reactions:" << state.reactions
+	<< ", reactionsMuted:" << state.reactionsMuted
+	<< ", mentions:" << state.mentions
+	<< ", polls:" << state.polls
+	<< ", pollsMuted:" << state.pollsMuted
+	<< ", known:" << state.known << ")";
+}
+#endif // _DEBUG
+
+struct BadgesState {
+	int unreadCounter = 0;
+	bool unread : 1 = false;
+	bool unreadMuted : 1 = false;
+	bool mention : 1 = false;
+	bool mentionMuted : 1 = false;
+	bool reaction : 1 = false;
+	bool reactionMuted : 1 = false;
+	bool poll : 1 = false;
+	bool pollMuted : 1 = false;
+
+	friend inline constexpr auto operator<=>(
+		BadgesState,
+		BadgesState) = default;
+	friend inline constexpr bool operator==(
+		BadgesState,
+		BadgesState) = default;
+
+	[[nodiscard]] bool empty() const {
+		return !unread && !mention && !reaction && !poll;
+	}
+};
+
+enum class CountInBadge : uchar {
+	Default,
+	Chats,
+	Messages,
+};
+
+enum class IncludeInBadge : uchar {
+	Default,
+	Unmuted,
+	All,
+	UnmutedOrAll,
+};
+
+struct RowsByLetter {
+	not_null<Row*> main;
+	base::flat_map<QChar, not_null<Row*>> letters;
+};
+
+struct RightButton final {
+	const style::DialogRightButton *st = nullptr;
+	QImage bg;
+	QImage selectedBg;
+	QImage activeBg;
+	Ui::Text::String text;
+	std::unique_ptr<Ui::RippleAnimation> ripple;
+
+	explicit operator bool() const {
+		return st != nullptr;
+	}
+};
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_entry.cpp b/Telegram/SourceFiles/dialogs/dialogs_entry.cpp
index 6d227c69ad9560..2796d3a2c14cf2 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_entry.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_entry.cpp
@@ -9,6 +9,8 @@ For license and copyright information please follow this link:
 
 #include "dialogs/dialogs_key.h"
 #include "dialogs/dialogs_indexed_list.h"
+#include "base/options.h"
+#include "base/unixtime.h"
 #include "data/data_changes.h"
 #include "data/data_session.h"
 #include "data/data_folder.h"
@@ -20,6 +22,7 @@ For license and copyright information please follow this link:
 #include "mainwidget.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_options.h"
 #include "ui/ui_utility.h"
 #include "history/history.h"
@@ -46,8 +49,25 @@ uint64 PinnedDialogPos(int pinnedIndex) {
 	return 0xFFFFFFFF000000FFULL - pinnedIndex;
 }
 
+uint64 UnreadOnTopDialogPos(uint64 sortKeyByDate) {
+	return sortKeyByDate | 0x8000000000000000ULL;
+}
+
+base::options::toggle OptionUnreadOnTop({
+	.id = kOptionDialogsUnreadOnTop,
+	.name = "Keep unmuted unread chats on top",
+	.description = "Sort chats with new unmuted messages right below the "
+		"pinned ones and keep them there until you read them.",
+});
+
+[[nodiscard]] bool UnreadOnTopEnabled() {
+	return OptionUnreadOnTop.value();
+}
+
 } // namespace
 
+const char kOptionDialogsUnreadOnTop[] = "dialogs-unread-on-top";
+
 BadgesState BadgesForUnread(
 		const UnreadState &state,
 		CountInBadge count,
@@ -76,6 +96,8 @@ BadgesState BadgesForUnread(
 		.mention = (state.mentions > 0),
 		.reaction = (state.reactions > 0),
 		.reactionMuted = (state.reactions <= state.reactionsMuted),
+		.poll = (state.polls > 0),
+		.pollMuted = (state.polls <= state.pollsMuted),
 	};
 }
 
@@ -84,9 +106,9 @@ Entry::Entry(not_null<Data::Session*> owner, Type type)
 , _flags((type == Type::History)
 	? (Flag::IsThread | Flag::IsHistory)
 	: (type == Type::ForumTopic)
-	? Flag::IsThread
+	? (Flag::IsThread | Flag::IsForumTopic)
 	: (type == Type::SavedSublist)
-	? Flag::IsSavedSublist
+	? (Flag::IsThread | Flag::IsSavedSublist)
 	: Flag(0)) {
 }
 
@@ -113,7 +135,7 @@ Data::Forum *Entry::asForum() {
 }
 
 Data::Folder *Entry::asFolder() {
-	return (_flags & (Flag::IsThread | Flag::IsSavedSublist))
+	return (_flags & Flag::IsThread)
 		? nullptr
 		: static_cast<Data::Folder*>(this);
 }
@@ -125,7 +147,7 @@ Data::Thread *Entry::asThread() {
 }
 
 Data::ForumTopic *Entry::asTopic() {
-	return ((_flags & Flag::IsThread) && !(_flags & Flag::IsHistory))
+	return (_flags & Flag::IsForumTopic)
 		? static_cast<Data::ForumTopic*>(this)
 		: nullptr;
 }
@@ -225,10 +247,29 @@ int Entry::lookupPinnedIndex(FilterId filterId) const {
 
 uint64 Entry::computeSortPosition(FilterId filterId) const {
 	const auto index = lookupPinnedIndex(filterId);
-	return index ? PinnedDialogPos(index) : _sortKeyByDate;
+	if (index) {
+		return PinnedDialogPos(index);
+	} else if (UnreadOnTopEnabled() && hasUnreadUnmutedForSort()) {
+		return UnreadOnTopDialogPos(_sortKeyByDate);
+	}
+	return _sortKeyByDate;
+}
+
+bool Entry::hasUnreadUnmutedForSort() const {
+	const auto state = chatListUnreadState();
+	return (state.messages > state.messagesMuted)
+		|| (state.marks > state.marksMuted)
+		|| (state.reactions > state.reactionsMuted);
 }
 
 void Entry::updateChatListExistence() {
+	if (const auto history = asHistory()) {
+		if (history->peer->asMonoforum()) {
+			if (!folderKnown()) {
+				history->clearFolder();
+			}
+		}
+	}
 	setChatListExistence(shouldBeInChatList());
 }
 
@@ -254,8 +295,39 @@ void Entry::notifyUnreadStateChange(const UnreadState &wasState) {
 			return state.messages || state.marks || state.mentions;
 		};
 		if (isForFilters(wasState) != isForFilters(nowState)) {
+			const auto wasTags = _tagColors.size();
 			owner().chatsFilters().refreshHistory(history);
+
+			// Hack for History::fakeUnreadWhileOpened().
+			if (!isForFilters(nowState)
+				&& (wasTags > 0)
+				&& (wasTags == _tagColors.size())) {
+				auto updateRequested = false;
+				for (const auto &filter : filters.list()) {
+					if (!(filter.flags() & Data::ChatFilter::Flag::NoRead)
+						|| !_chatListLinks.contains(filter.id())
+						|| filter.contains(history, true)) {
+						continue;
+					}
+					const auto wasTagsCount = _tagColors.size();
+					setColorIndexForFilterId(filter.id(), std::nullopt);
+					updateRequested |= (wasTagsCount != _tagColors.size());
+				}
+				if (updateRequested) {
+					updateChatListEntryHeight();
+					session().changes().peerUpdated(
+						history->peer,
+						Data::PeerUpdate::Flag::Name);
+				}
+			}
 		}
+	} else if (const auto sublist = asSublist()) {
+		session().changes().sublistUpdated(
+			sublist,
+			Data::SublistUpdate::Flag::UnreadView);
+	}
+	if (UnreadOnTopEnabled()) {
+		updateChatListSortPosition();
 	}
 	updateChatListEntryPostponed();
 }
@@ -272,6 +344,33 @@ const Ui::Text::String &Entry::chatListNameText() const {
 	return _chatListNameText;
 }
 
+DateText ResolveDateText(
+		DateTextCache &cache,
+		TimeId date,
+		crl::time now) {
+	static crl::time LastNow = 0;
+	static int LastTodaySerial = 0;
+	if (!now || LastNow != now) {
+		LastNow = now;
+		LastTodaySerial = int(QDate::currentDate().toJulianDay());
+	}
+	if (cache.messageTimeId != date
+		|| cache.todaySerial != LastTodaySerial) {
+		const auto qdt = base::unixtime::parse(date);
+		cache.text = Ui::FormatDialogsDate(qdt);
+		cache.width = st::dialogsDateFont->width(cache.text);
+		cache.messageTimeId = date;
+		cache.todaySerial = LastTodaySerial;
+	}
+	return { cache.text, cache.width };
+}
+
+DateText Entry::chatListTimestampText(
+		TimeId date,
+		crl::time now) const {
+	return ResolveDateText(_chatListDateCache, date, now);
+}
+
 void Entry::setChatListExistence(bool exists) {
 	if (exists && _sortKeyInChatList) {
 		owner().refreshChatListEntry(this);
@@ -332,9 +431,29 @@ int Entry::posInChatList(FilterId filterId) const {
 	return mainChatListLink(filterId)->index();
 }
 
+void Entry::setColorIndexForFilterId(
+		FilterId filterId,
+		std::optional<uint8> colorIndex) {
+	if (!filterId) {
+		return;
+	}
+	if (colorIndex) {
+		_tagColors[filterId] = *colorIndex;
+	} else {
+		_tagColors.remove(filterId);
+	}
+}
+
 not_null<Row*> Entry::addToChatList(
 		FilterId filterId,
 		not_null<MainList*> list) {
+	if (filterId) {
+		const auto &list = owner().chatsFilters().list();
+		const auto it = ranges::find(list, filterId, &Data::ChatFilter::id);
+		if (it != end(list)) {
+			setColorIndexForFilterId(filterId, it->colorIndex());
+		}
+	}
 	if (const auto main = maybeMainChatListLink(filterId)) {
 		return main;
 	}
@@ -350,6 +469,12 @@ void Entry::removeFromChatList(
 	if (isPinnedDialog(filterId)) {
 		owner().setChatPinned(this, filterId, false);
 	}
+	if (filterId) {
+		const auto it = _tagColors.find(filterId);
+		if (it != end(_tagColors)) {
+			_tagColors.erase(it);
+		}
+	}
 
 	const auto i = _chatListLinks.find(filterId);
 	if (i == end(_chatListLinks)) {
@@ -397,4 +522,18 @@ void Entry::updateChatListEntryHeight() {
 	session().changes().entryUpdated(this, Data::EntryUpdate::Flag::Height);
 }
 
+bool Entry::hasChatsFilterTags(FilterId exclude) const {
+	if (!owner().chatsFilters().tagsEnabled()) {
+		return false;
+	}
+	if (exclude) {
+		if (_tagColors.size() == 1) {
+			if (_tagColors.begin()->first == exclude) {
+				return false;
+			}
+		}
+	}
+	return !_tagColors.empty();
+}
+
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_entry.h b/Telegram/SourceFiles/dialogs/dialogs_entry.h
index 56e84f48c77cbc..143262198c69fe 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_entry.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_entry.h
@@ -10,10 +10,11 @@ For license and copyright information please follow this link:
 #include "base/flat_map.h"
 #include "base/weak_ptr.h"
 #include "base/flags.h"
-#include "dialogs/dialogs_key.h"
+#include "dialogs/dialogs_common.h"
 #include "ui/unread_badge.h"
 
 class HistoryItem;
+class History;
 class UserData;
 
 namespace Main {
@@ -26,6 +27,8 @@ class Forum;
 class Folder;
 class ForumTopic;
 class SavedSublist;
+class SavedMessages;
+class Thread;
 } // namespace Data
 
 namespace Ui {
@@ -39,112 +42,34 @@ struct PaintContext;
 
 namespace Dialogs {
 
+struct UnreadState;
 class Row;
 class IndexedList;
 class MainList;
 
-struct RowsByLetter {
-	not_null<Row*> main;
-	base::flat_map<QChar, not_null<Row*>> letters;
-};
-
-enum class SortMode {
-	Date    = 0x00,
-	Name    = 0x01,
-	Add     = 0x02,
-};
-
-struct PositionChange {
-	int from = -1;
-	int to = -1;
-	int height = 0;
-};
-
-struct UnreadState {
-	int messages = 0;
-	int messagesMuted = 0;
-	int chats = 0;
-	int chatsMuted = 0;
-	int marks = 0;
-	int marksMuted = 0;
-	int reactions = 0;
-	int reactionsMuted = 0;
-	int mentions = 0;
-	bool known = false;
-
-	UnreadState &operator+=(const UnreadState &other) {
-		messages += other.messages;
-		messagesMuted += other.messagesMuted;
-		chats += other.chats;
-		chatsMuted += other.chatsMuted;
-		marks += other.marks;
-		marksMuted += other.marksMuted;
-		reactions += other.reactions;
-		reactionsMuted += other.reactionsMuted;
-		mentions += other.mentions;
-		return *this;
-	}
-	UnreadState &operator-=(const UnreadState &other) {
-		messages -= other.messages;
-		messagesMuted -= other.messagesMuted;
-		chats -= other.chats;
-		chatsMuted -= other.chatsMuted;
-		marks -= other.marks;
-		marksMuted -= other.marksMuted;
-		reactions -= other.reactions;
-		reactionsMuted -= other.reactionsMuted;
-		mentions -= other.mentions;
-		return *this;
-	}
-};
+extern const char kOptionDialogsUnreadOnTop[];
 
-inline UnreadState operator+(const UnreadState &a, const UnreadState &b) {
-	auto result = a;
-	result += b;
-	return result;
-}
-
-inline UnreadState operator-(const UnreadState &a, const UnreadState &b) {
-	auto result = a;
-	result -= b;
-	return result;
-}
-
-struct BadgesState {
-	int unreadCounter = 0;
-	bool unread : 1 = false;
-	bool unreadMuted : 1 = false;
-	bool mention : 1 = false;
-	bool mentionMuted : 1 = false;
-	bool reaction : 1 = false;
-	bool reactionMuted : 1 = false;
-
-	friend inline constexpr auto operator<=>(
-		BadgesState,
-		BadgesState) = default;
-
-	[[nodiscard]] bool empty() const {
-		return !unread && !mention && !reaction;
-	}
-};
+[[nodiscard]] BadgesState BadgesForUnread(
+	const UnreadState &state,
+	CountInBadge count = CountInBadge::Default,
+	IncludeInBadge include = IncludeInBadge::Default);
 
-enum class CountInBadge : uchar {
-	Default,
-	Chats,
-	Messages,
+struct DateTextCache {
+	QString text;
+	TimeId messageTimeId = 0;
+	int todaySerial = 0;
+	int width = 0;
 };
 
-enum class IncludeInBadge : uchar {
-	Default,
-	Unmuted,
-	All,
-	UnmutedOrAll,
+struct DateText {
+	const QString &text;
+	int width = 0;
 };
 
-[[nodiscard]] BadgesState BadgesForUnread(
-	const UnreadState &state,
-	CountInBadge count = CountInBadge::Default,
-	IncludeInBadge include = IncludeInBadge::Default);
+[[nodiscard]] DateText ResolveDateText(
+	DateTextCache &cache,
+	TimeId date,
+	crl::time now);
 
 class Entry : public base::has_weak_ptr {
 public:
@@ -186,6 +111,7 @@ class Entry : public base::has_weak_ptr {
 	not_null<Row*> addToChatList(
 		FilterId filterId,
 		not_null<MainList*> list);
+	void setColorIndexForFilterId(FilterId, std::optional<uint8>);
 	void removeFromChatList(
 		FilterId filterId,
 		not_null<MainList*> list);
@@ -247,10 +173,14 @@ class Entry : public base::has_weak_ptr {
 	}
 
 	[[nodiscard]] const Ui::Text::String &chatListNameText() const;
+	[[nodiscard]] DateText chatListTimestampText(
+		TimeId date,
+		crl::time now) const;
 	[[nodiscard]] Ui::PeerBadge &chatListPeerBadge() const {
 		return _chatListPeerBadge;
 	}
 
+	[[nodiscard]] bool hasChatsFilterTags(FilterId exclude) const;
 protected:
 	void notifyUnreadStateChange(const UnreadState &wasState);
 	inline auto unreadStateChangeNotifier(bool required);
@@ -261,9 +191,10 @@ class Entry : public base::has_weak_ptr {
 	enum class Flag : uchar {
 		IsThread = (1 << 0),
 		IsHistory = (1 << 1),
-		IsSavedSublist = (1 << 2),
-		UpdatePostponed = (1 << 3),
-		InUnreadChangeBlock = (1 << 4),
+		IsForumTopic = (1 << 2),
+		IsSavedSublist = (1 << 3),
+		UpdatePostponed = (1 << 4),
+		InUnreadChangeBlock = (1 << 5),
 	};
 	friend inline constexpr bool is_flag_type(Flag) { return true; }
 	using Flags = base::flags<Flag>;
@@ -271,6 +202,7 @@ class Entry : public base::has_weak_ptr {
 	virtual void changedChatListPinHook();
 	void pinnedIndexChanged(FilterId filterId, int was, int now);
 	[[nodiscard]] uint64 computeSortPosition(FilterId filterId) const;
+	[[nodiscard]] bool hasUnreadUnmutedForSort() const;
 
 	void setChatListExistence(bool exists);
 	not_null<Row*> mainChatListLink(FilterId filterId) const;
@@ -281,9 +213,11 @@ class Entry : public base::has_weak_ptr {
 	uint64 _sortKeyInChatList = 0;
 	uint64 _sortKeyByDate = 0;
 	base::flat_map<FilterId, int> _pinnedIndex;
+	base::flat_map<FilterId, uint8> _tagColors;
 	mutable Ui::PeerBadge _chatListPeerBadge;
 	mutable Ui::Text::String _chatListNameText;
 	mutable int _chatListNameVersion = 0;
+	mutable DateTextCache _chatListDateCache;
 	TimeId _timeId = 0;
 	Flags _flags;
 
@@ -295,7 +229,7 @@ auto Entry::unreadStateChangeNotifier(bool required) {
 	_flags |= Flag::InUnreadChangeBlock;
 	const auto notify = required && inChatList();
 	const auto wasState = notify ? chatListUnreadState() : UnreadState();
-	return gsl::finally([=] {
+	return gsl::finally([=, this] {
 		_flags &= ~Flag::InUnreadChangeBlock;
 		if (notify) {
 			Assert(inChatList());
diff --git a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp
index 2254346cf8c8e5..43636f81a89337 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp
@@ -194,6 +194,20 @@ void IndexedList::adjustNames(
 	}
 }
 
+void IndexedList::freeze() {
+	_list.freeze();
+	for (auto &[ch, list] : _index) {
+		list.freeze();
+	}
+}
+
+void IndexedList::unfreeze() {
+	_list.unfreeze();
+	for (auto &[ch, list] : _index) {
+		list.unfreeze();
+	}
+}
+
 void IndexedList::remove(Key key, Row *replacedBy) {
 	if (_list.remove(key, replacedBy)) {
 		for (const auto &ch : key.entry()->chatListFirstLetters()) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h
index 62128d92edd195..97cc7091516ae2 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h
@@ -7,13 +7,15 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "dialogs/dialogs_entry.h"
 #include "dialogs/dialogs_list.h"
 
 class History;
 
 namespace Dialogs {
 
+struct RowsByLetter;
+class Row;
+
 class IndexedList {
 public:
 	IndexedList(SortMode sortMode, FilterId filterId = 0);
@@ -22,6 +24,8 @@ class IndexedList {
 	Row *addByName(Key key);
 	void adjustByDate(const RowsByLetter &links);
 	void moveToTop(Key key);
+	void freeze();
+	void unfreeze();
 	bool updateHeight(Key key, float64 narrowRatio);
 	bool updateHeights(float64 narrowRatio);
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index ab6577613e22c3..bedc18e1c313dd 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -11,27 +11,32 @@ For license and copyright information please follow this link:
 #include "dialogs/ui/chat_search_empty.h"
 #include "dialogs/ui/chat_search_in.h"
 #include "dialogs/ui/dialogs_layout.h"
-#include "dialogs/ui/dialogs_stories_content.h"
 #include "dialogs/ui/dialogs_video_userpic.h"
 #include "dialogs/dialogs_indexed_list.h"
 #include "dialogs/dialogs_widget.h"
 #include "dialogs/dialogs_search_from_controllers.h"
 #include "dialogs/dialogs_search_tags.h"
-#include "history/view/history_view_chat_preview.h"
+#include "dialogs/dialogs_quick_action.h"
 #include "history/view/history_view_context_menu.h"
+#include "history/view/history_view_subsection_tabs.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
 #include "core/shortcuts.h"
+#include "core/ui_integration.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/text/text_utilities.h"
 #include "ui/text/text_options.h"
 #include "ui/dynamic_thumbnails.h"
+#include "ui/vertical_list.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/screen_reader_mode.h"
 #include "ui/ui_utility.h"
+#include "data/components/sponsored_messages.h"
 #include "data/data_drafts.h"
 #include "data/data_folder.h"
 #include "data/data_forum.h"
@@ -44,50 +49,72 @@ For license and copyright information please follow this link:
 #include "data/data_peer_values.h"
 #include "data/data_histories.h"
 #include "data/data_chat_filters.h"
-#include "data/data_cloud_file.h"
 #include "data/data_changes.h"
 #include "data/data_message_reactions.h"
 #include "data/data_saved_messages.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_stories.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_send_action.h"
 #include "base/unixtime.h"
 #include "base/options.h"
 #include "lang/lang_keys.h"
-#include "mainwindow.h"
-#include "mainwidget.h"
+#include "lottie/lottie_icon.h"
+#include "settings/settings_common.h"
 #include "storage/storage_account.h"
 #include "apiwrap.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "menu/menu_sponsored.h"
 #include "window/notifications_manager.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "window/window_peer_menu.h"
+#include "ui/chat/chats_filter_tag.h"
+#include "ui/effects/ripple_animation.h"
 #include "ui/effects/loading_element.h"
+#include "ui/effects/thanos_effect_session.h"
 #include "ui/widgets/multi_select.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
-#include "ui/empty_userpic.h"
 #include "ui/unread_badge.h"
 #include "boxes/filters/edit_filter_box.h"
 #include "boxes/peers/edit_forum_topic_box.h"
+#include "boxes/peer_list_box.h"
 #include "api/api_chat_filters.h"
 #include "base/qt/qt_common_adapters.h"
 #include "styles/style_dialogs.h"
+#include "styles/style_boxes.h"
 #include "styles/style_chat.h" // popupMenuExpandedSeparator
 #include "styles/style_chat_helpers.h"
+#include "styles/style_color_indices.h"
 #include "styles/style_window.h"
+#include "styles/style_media_player.h"
 #include "styles/style_menu_icons.h"
 
 #include <QtWidgets/QApplication>
+#include <QtCore/QMimeData>
+#include <unordered_map>
 
 namespace Dialogs {
 namespace {
 
+constexpr auto kFreezeTimeout = 2 * crl::time(1000);
 constexpr auto kHashtagResultsLimit = 5;
 constexpr auto kStartReorderThreshold = 30;
+constexpr auto kStartDragToFilterThresholdX = kStartReorderThreshold;
+constexpr auto kStartDragToFilterThresholdY = 75;
 constexpr auto kQueryPreviewLimit = 32;
+constexpr auto kPreviewPostsLimit = 3;
+
+[[nodiscard]] InnerWidget::ChatsFilterTagsKey SerializeFilterTagsKey(
+		FilterId filterId,
+		uint8 more,
+		bool active) {
+	return (filterId & 0xFFFFFFFF)
+		| (static_cast<int64_t>(more) << 32)
+		| (static_cast<int64_t>(active) << 40);
+}
 
 [[nodiscard]] int FixedOnTopDialogsCount(not_null<Dialogs::IndexedList*> list) {
 	auto result = 0;
@@ -115,9 +142,25 @@ constexpr auto kQueryPreviewLimit = 32;
 	return result;
 }
 
+[[nodiscard]] UserData *MaybeBotWithApp(Row *row) {
+	if (row) {
+		if (const auto history = row->key().history()) {
+			if (const auto user = history->peer->asUser()) {
+				if (user->botInfo && user->botInfo->hasMainApp) {
+					if (!history->unreadCount() && !history->unreadMark()) {
+						return user;
+					}
+				}
+			}
+		}
+	}
+	return nullptr;
+}
+
 [[nodiscard]] object_ptr<SearchEmpty> MakeSearchEmpty(
 		QWidget *parent,
-		SearchState state) {
+		SearchState state,
+		Fn<void()> resetChatTypeFilter) {
 	const auto query = state.query.trimmed();
 	const auto hashtag = !query.isEmpty() && (query[0] == '#');
 	const auto trimmed = hashtag ? query.mid(1).trimmed() : query;
@@ -131,6 +174,9 @@ constexpr auto kQueryPreviewLimit = 32;
 	const auto waiting = trimmed.isEmpty()
 		&& state.tags.empty()
 		&& !fromPeer;
+	const auto suggestAllChats = !waiting
+		&& state.tab == ChatSearchTab::MyMessages
+		&& state.filter != ChatTypeFilter::All;
 	const auto icon = waiting
 		? SearchEmptyIcon::Search
 		: SearchEmptyIcon::NoResults;
@@ -144,7 +190,7 @@ constexpr auto kQueryPreviewLimit = 32;
 	} else {
 		text.append(tr::lng_search_tab_no_results(
 			tr::now,
-			Ui::Text::Bold));
+			tr::bold));
 		if (!trimmed.isEmpty()) {
 			const auto preview = (trimmed.size() > kQueryPreviewLimit + 3)
 				? (trimmed.mid(0, kQueryPreviewLimit) + Ui::kQEllipsis)
@@ -154,7 +200,10 @@ constexpr auto kQueryPreviewLimit = 32;
 					tr::now,
 					lt_query,
 					trimmed.mid(0, kQueryPreviewLimit)));
-			if (hashtag) {
+			if (suggestAllChats) {
+				text.append("\n\n").append(
+					tr::link(tr::lng_search_tab_try_in_all(tr::now)));
+			} else if (hashtag) {
 				text.append("\n").append(
 					tr::lng_search_tab_no_results_retry(tr::now));
 			}
@@ -164,11 +213,29 @@ constexpr auto kQueryPreviewLimit = 32;
 		parent,
 		icon,
 		rpl::single(std::move(text)));
+	if (suggestAllChats) {
+		result->handlerActivated(
+		) | rpl::on_next(resetChatTypeFilter, result->lifetime());
+	}
 	result->show();
 	result->resizeToWidth(parent->width());
 	return result;
 }
 
+[[nodiscard]] QString ChatTypeFilterLabel(ChatTypeFilter filter) {
+	switch (filter) {
+	case ChatTypeFilter::All:
+		return tr::lng_search_filter_all(tr::now);
+	case ChatTypeFilter::Private:
+		return tr::lng_search_filter_private(tr::now);
+	case ChatTypeFilter::Groups:
+		return tr::lng_search_filter_group(tr::now);
+	case ChatTypeFilter::Channels:
+		return tr::lng_search_filter_channel(tr::now);
+	}
+	Unexpected("Chat type filter in search results.");
+}
+
 } // namespace
 
 struct InnerWidget::CollapsedRow {
@@ -186,15 +253,27 @@ struct InnerWidget::HashtagResult {
 	BasicRow row;
 };
 
+struct InnerWidget::SponsoredSearchResult {
+	Api::SponsoredSearchResult data;
+	RightButton button;
+};
+
 struct InnerWidget::PeerSearchResult {
 	explicit PeerSearchResult(not_null<PeerData*> peer) : peer(peer) {
 	}
+
 	not_null<PeerData*> peer;
+	std::unique_ptr<SponsoredSearchResult> sponsored;
 	mutable Ui::Text::String name;
 	mutable Ui::PeerBadge badge;
 	BasicRow row;
 };
 
+struct InnerWidget::TagCache {
+	Ui::ChatsFilterTagContext context;
+	QImage frame;
+};
+
 Key InnerWidget::FilterResult::key() const {
 	return row->key();
 }
@@ -217,21 +296,31 @@ InnerWidget::InnerWidget(
 , _narrowWidth(st::defaultDialogRow.padding.left()
 	+ st::defaultDialogRow.photoSize
 	+ st::defaultDialogRow.padding.left())
-, _childListShown(std::move(childListShown)) {
+, _childListShown(std::move(childListShown))
+, _freezeTimer([=] { _shownList->unfreeze(); update(); }) {
 	setAttribute(Qt::WA_OpaquePaintEvent, true);
+	setAccessibleName(tr::lng_recent_chats(tr::now));
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_topicJumpCache = nullptr;
+		_chatsFilterTags.clear();
+		_rightButtons.clear();
+		_pressedRightButtonData = nullptr;
+		for (const auto &result : _peerSearchResults) {
+			if (const auto sponsored = result->sponsored.get()) {
+				sponsored->button = {};
+			}
+		}
 	}, lifetime());
 
 	session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	Core::App().notifications().settingsChanged(
-	) | rpl::start_with_next([=](Window::Notifications::ChangeType change) {
+	) | rpl::on_next([=](Window::Notifications::ChangeType change) {
 		if (change == Window::Notifications::ChangeType::CountMessages) {
 			// Folder rows change their unread badge with this setting.
 			update();
@@ -239,29 +328,28 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 
 	session().data().contactsLoaded().changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refresh();
 		refreshEmpty();
 	}, lifetime());
 
 	session().data().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		itemRemoved(item);
 	}, lifetime());
 
 	session().data().dialogsRowReplacements(
-	) | rpl::start_with_next([=](Data::Session::DialogsRowReplacement r) {
+	) | rpl::on_next([=](Data::Session::DialogsRowReplacement r) {
 		dialogRowReplaced(r.old, r.now);
 	}, lifetime());
 
 	session().data().sendActionManager().animationUpdated(
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const Data::SendActionManager::AnimationUpdate &update) {
 		const auto updateRect = Ui::RowPainter::SendActionAnimationRect(
-			_st,
-			update.left,
-			update.width,
-			update.height,
+			update.thread,
+			_filterId,
+			update.rect,
 			width(),
 			update.textUpdated);
 		updateDialogRow(
@@ -271,7 +359,7 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 
 	session().data().sendActionManager().speakingAnimationUpdated(
-	) | rpl::start_with_next([=](not_null<History*> history) {
+	) | rpl::on_next([=](not_null<History*> history) {
 		repaintDialogRowCornerStatus(history);
 	}, lifetime());
 
@@ -284,26 +372,97 @@ InnerWidget::InnerWidget(
 		return !_savedSublists
 			&& !_openedForum
 			&& (folder == _openedFolder);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		refresh();
 	}, lifetime());
 
+	Ui::ScheduleThanosEffectWarmUp(&session(), lifetime());
+
 	rpl::merge(
-		session().settings().archiveCollapsedChanges() | rpl::to_empty,
-		session().data().chatsFilters().changed()
-	) | rpl::start_with_next([=] {
+		session().settings().archiveCollapsedChanges() | rpl::map_to(false),
+		session().data().chatsFilters().changed() | rpl::map_to(true),
+		session().data().chatsFilters().tagsEnabledChanges(
+		) | rpl::map_to(true)
+	) | rpl::on_next([=](bool refreshHeight) {
+		if (refreshHeight) {
+			_chatsFilterTags.clear();
+			_shownList->updateHeights(_narrowRatio);
+		}
 		refreshWithCollapsedRows();
 	}, lifetime());
 
+	session().data().chatsFilters().tagsEnabledValue(
+	) | rpl::on_next([=](bool tags) {
+		_handleChatListEntryTagRefreshesLifetime.destroy();
+		if (!tags) {
+			return;
+		}
+		using Event = Data::Session::ChatListEntryRefresh;
+		session().data().chatListEntryRefreshes(
+		) | rpl::filter([=](const Event &event) {
+			if (_waitingAllChatListEntryRefreshesForTags) {
+				return false;
+			}
+			if (event.existenceChanged) {
+				if (event.key.entry()->inChatList(_filterId)) {
+					_waitingAllChatListEntryRefreshesForTags = true;
+					return true;
+				}
+			}
+			return false;
+		}) | rpl::on_next([=](const Event &event) {
+			Ui::PostponeCall(crl::guard(this, [=] {
+				_waitingAllChatListEntryRefreshesForTags = false;
+				if (_shownList->updateHeights(_narrowRatio)) {
+					refresh();
+				}
+			}));
+		}, _handleChatListEntryTagRefreshesLifetime);
+
+		session().data().chatsFilters().tagColorChanged(
+		) | rpl::on_next([=](Data::TagColorChanged data) {
+			const auto filterId = data.filterId;
+			const auto key = SerializeFilterTagsKey(filterId, 0, false);
+			const auto activeKey = SerializeFilterTagsKey(filterId, 0, true);
+			{
+				auto &tags = _chatsFilterTags;
+				if (const auto it = tags.find(key); it != tags.end()) {
+					tags.erase(it);
+				}
+				if (const auto it = tags.find(activeKey); it != tags.end()) {
+					tags.erase(it);
+				}
+			}
+			if (data.colorExistenceChanged) {
+				auto &filters = session().data().chatsFilters();
+				for (const auto &filter : filters.list()) {
+					if (filter.id() != filterId) {
+						continue;
+					}
+					const auto c = filter.colorIndex();
+					const auto list = filters.chatsList(filterId);
+					for (const auto &row : list->indexed()->all()) {
+						row->entry()->setColorIndexForFilterId(filterId, c);
+					}
+				}
+				if (_shownList->updateHeights(_narrowRatio)) {
+					refresh();
+				}
+			} else {
+				update();
+			}
+		}, _handleChatListEntryTagRefreshesLifetime);
+	}, lifetime());
+
 	session().settings().archiveInMainMenuChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refresh();
 	}, lifetime());
 
 	session().changes().historyUpdates(
 		Data::HistoryUpdate::Flag::IsPinned
 		| Data::HistoryUpdate::Flag::ChatOccupied
-	) | rpl::start_with_next([=](const Data::HistoryUpdate &update) {
+	) | rpl::on_next([=](const Data::HistoryUpdate &update) {
 		if (update.flags & Data::HistoryUpdate::Flag::IsPinned) {
 			stopReorderPinned();
 		}
@@ -320,7 +479,7 @@ InnerWidget::InnerWidget(
 		| UpdateFlag::IsContact
 		| UpdateFlag::FullInfo
 		| UpdateFlag::EmojiStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		if (update.flags
 			& (UpdateFlag::Name
 				| UpdateFlag::Photo
@@ -345,14 +504,14 @@ InnerWidget::InnerWidget(
 
 	session().changes().messageUpdates(
 		Data::MessageUpdate::Flag::DialogRowRefresh
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		refreshDialogRow({ update.item->history(), update.item->fullId() });
 	}, lifetime());
 
 	session().changes().entryUpdates(
 		Data::EntryUpdate::Flag::Repaint
 		| Data::EntryUpdate::Flag::Height
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		const auto entry = update.entry;
 		if (update.flags & Data::EntryUpdate::Flag::Height) {
 			if (updateEntryHeight(entry)) {
@@ -374,20 +533,38 @@ InnerWidget::InnerWidget(
 
 	_controller->activeChatEntryValue(
 	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			RowDescriptor previous,
 			RowDescriptor next) {
-		updateDialogRow(previous);
-		updateDialogRow(next);
+		const auto update = [&](const RowDescriptor &descriptor) {
+			const auto msgId = descriptor.fullId;
+			if (const auto topic = descriptor.key.topic()) {
+				if (_openedForum == topic->forum()) {
+					updateDialogRow(descriptor);
+				} else {
+					updateDialogRow({ { topic->owningHistory() }, msgId });
+				}
+			} else if (const auto sublist = descriptor.key.sublist()) {
+				if (_savedSublists == sublist->parent()) {
+					updateDialogRow(descriptor);
+				} else {
+					updateDialogRow({ { sublist->owningHistory() }, msgId });
+				}
+			} else {
+				updateDialogRow(descriptor);
+			}
+		};
+		update(previous);
+		update(next);
 	}, lifetime());
 
 	_controller->activeChatsFilter(
-	) | rpl::start_with_next([=](FilterId filterId) {
+	) | rpl::on_next([=](FilterId filterId) {
 		switchToFilter(filterId);
 	}, lifetime());
 
 	_controller->window().widget()->globalForceClicks(
-	) | rpl::start_with_next([=](QPoint globalPosition) {
+	) | rpl::on_next([=](QPoint globalPosition) {
 		processGlobalForceClick(globalPosition);
 	}, lifetime());
 
@@ -411,7 +588,7 @@ bool InnerWidget::updateEntryHeight(not_null<Entry*> entry) {
 			result.top = top;
 		}
 		if (result.row->key().entry() == entry) {
-			result.row->recountHeight(_narrowRatio);
+			result.row->recountHeight(_narrowRatio, _filterId);
 			changing = true;
 			top = result.top;
 		}
@@ -555,7 +732,7 @@ int InnerWidget::searchInChatSkip() const {
 	return _searchIn ? _searchIn->height() : 0;
 }
 
-int InnerWidget::searchedOffset() const {
+int InnerWidget::previewOffset() const {
 	auto result = peerSearchOffset();
 	if (!_peerSearchResults.empty()) {
 		result += (_peerSearchResults.size() * st::dialogsRowHeight)
@@ -564,6 +741,15 @@ int InnerWidget::searchedOffset() const {
 	return result;
 }
 
+int InnerWidget::searchedOffset() const {
+	auto result = previewOffset();
+	if (!_previewResults.empty()) {
+		result += (_previewResults.size() * st::dialogsRowHeight)
+			+ st::searchedBarHeight;
+	}
+	return result;
+}
+
 void InnerWidget::changeOpenedFolder(Data::Folder *folder) {
 	Expects(!folder || !_savedSublists);
 
@@ -608,7 +794,7 @@ void InnerWidget::changeOpenedForum(Data::Forum *forum) {
 		rpl::merge(
 			forum->chatsListChanges(),
 			forum->chatsListLoadedEvents()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refresh();
 		}, _openedForumLifetime);
 	}
@@ -627,7 +813,7 @@ void InnerWidget::showSavedSublists() {
 	Expects(!_geometryInited);
 	Expects(!_savedSublists);
 
-	_savedSublists = true;
+	_savedSublists = &session().data().savedMessages();
 
 	stopReorderPinned();
 	clearSelection();
@@ -640,7 +826,7 @@ void InnerWidget::showSavedSublists() {
 	_openedForumLifetime.destroy();
 
 	//session().data().savedMessages().chatsListChanges(
-	//) | rpl::start_with_next([=] {
+	//) | rpl::on_next([=] {
 	//	refresh();
 	//}, lifetime());
 
@@ -686,16 +872,105 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			not_null<Row*> row,
 			bool selected,
 			bool mayBeActive) {
-		const auto key = row->key();
+		const auto &key = row->key();
 		const auto active = mayBeActive && isRowActive(row, activeEntry);
-		const auto forum = key.history() && key.history()->isForum();
-		if (forum && !_topicJumpCache) {
+		const auto history = key.history();
+		const auto forum = history && history->peer->displayAsForum();
+		const auto monoforum = history && history->amMonoforumAdmin();
+		if ((forum || monoforum) && !_topicJumpCache) {
 			_topicJumpCache = std::make_unique<Ui::TopicJumpCache>();
 		}
-		const auto expanding = forum
-			&& (key.history()->peer->id == childListShown.peerId);
+		const auto expanding = (forum || monoforum)
+			&& (history->peer->id == childListShown.peerId);
+		context.rightButton = maybeCacheRightButton(row);
+		if (history) {
+			if (_activeQuickAction
+				&& (_activeQuickAction->data.msgBareId
+					== history->peer->id.value)) {
+				context.quickActionContext = _activeQuickAction.get();
+			} else if (!_inactiveQuickActions.empty()) {
+				auto it = _inactiveQuickActions.begin();
+				while (it != _inactiveQuickActions.end()) {
+					const auto raw = it->get();
+					if (raw->finishedAt
+						&& (ms - raw->finishedAt
+							> st::defaultRippleAnimation.hideDuration)) {
+						it = _inactiveQuickActions.erase(it);
+					} else {
+						if (raw->data.msgBareId == history->peer->id.value) {
+							context.quickActionContext = raw;
+						}
+						++it;
+					}
+				}
+			}
+		}
+
+		context.st = (forum || monoforum) ? &st::forumDialogRow : _st.get();
+
+		auto chatsFilterTags = std::vector<QImage*>();
+		if (context.narrow) {
+			context.chatsFilterTags = nullptr;
+		} else if (row->entry()->hasChatsFilterTags(context.filter)) {
+			const auto a = active;
+			context.st = (forum || monoforum)
+				? &st::taggedForumDialogRow
+				: &st::taggedDialogRow;
+			auto availableWidth = context.width
+				- context.st->padding.right()
+				- st::dialogsUnreadPadding
+				- context.st->nameLeft;
+			auto more = uint8(0);
+			const auto &list = session().data().chatsFilters().list();
+			for (const auto &filter : list) {
+				if (!row->entry()->inChatList(filter.id())
+					|| (filter.id() == context.filter)) {
+					continue;
+				}
+				if (active
+					&& (filter.flags() & Data::ChatFilter::Flag::NoRead)
+					&& !filter.contains(history, true)) {
+					// Hack for History::fakeUnreadWhileOpened().
+					continue;
+				}
+				if (const auto tag = cacheChatsFilterTag(filter, 0, a)) {
+					if (more) {
+						more++;
+						continue;
+					}
+					const auto tagWidth = tag->width()
+						/ style::DevicePixelRatio();
+					if (availableWidth < tagWidth) {
+						more++;
+					} else {
+						chatsFilterTags.push_back(tag);
+						availableWidth -= tagWidth
+							+ st::dialogRowFilterTagSkip;
+					}
+				}
+			}
+			if (more) {
+				if (const auto tag = cacheChatsFilterTag({}, more, a)) {
+					const auto tagWidth = tag->width()
+						/ style::DevicePixelRatio();
+					if (availableWidth < tagWidth) {
+						more++;
+						if (!chatsFilterTags.empty()) {
+							const auto tag = cacheChatsFilterTag({}, more, a);
+							if (tag) {
+								chatsFilterTags.back() = tag;
+							}
+						}
+					} else {
+						chatsFilterTags.push_back(tag);
+					}
+				}
+			}
+			context.chatsFilterTags = &chatsFilterTags;
+		} else {
+			context.chatsFilterTags = nullptr;
+		}
 
-		context.st = (forum ? &st::forumDialogRow : _st.get());
 		context.topicsExpanded = (expanding && !active)
 			? childListShown.shown
 			: 0.;
@@ -709,6 +984,9 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			&& _selectedTopicJump
 			&& (!_pressed || _pressedTopicJump);
 		Ui::RowPainter::Paint(p, row, validateVideoUserpic(row), context);
+		if (context.quickActionContext) {
+			context.quickActionContext = nullptr;
+		}
 	};
 	if (_state == WidgetState::Default) {
 		const auto collapsedSkip = collapsedRowsOffset();
@@ -810,7 +1088,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 		}
 		if (_searchIn) {
 			p.translate(0, searchInChatSkip());
-			if (_searchResults.empty()) {
+			if (_previewResults.empty() && _searchResults.empty()) {
 				p.fillRect(0, 0, fullWidth, st::lineWidth, st::shadowFg);
 			}
 		}
@@ -898,15 +1176,36 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 				const auto activePeer = activeEntry.key.peer();
 				for (; from < to; ++from) {
 					const auto &result = _peerSearchResults[from];
+					if (result->sponsored
+						&& r.y() <= (skip + from * st::dialogsRowHeight)
+						&& r.y() + r.height() >= (skip + (from + 1) * st::dialogsRowHeight)) {
+						session().sponsoredMessages().view(
+							result->sponsored->data.randomId);
+					}
 					const auto peer = result->peer;
 					const auto active = !activeEntry.fullId
 						&& activePeer
 						&& ((peer == activePeer)
 							|| (peer->migrateTo() == activePeer));
-					const auto selected = (from == (isPressed()
+					const auto selected = (from == ((_peerSearchMenu >= 0)
+						? _peerSearchMenu
+						: isPressed()
 						? _peerSearchPressed
 						: _peerSearchSelected));
+					if (result->sponsored
+						&& result->sponsored->button.text.isEmpty()) {
+						fillRightButton(
+							result->sponsored->button,
+							tr::lng_search_sponsored_button(
+								tr::now,
+								tr::marked),
+							st::dialogsSponsoredButton);
+					}
+
 					paintPeerSearchResult(p, result.get(), {
+						.rightButton = (result->sponsored
+							? &result->sponsored->button
+							: nullptr),
 						.st = &st::defaultDialogRow,
 						.currentBg = currentBg(),
 						.now = ms,
@@ -924,7 +1223,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 		}
 
 		const auto showUnreadInSearchResults = uniqueSearchResults();
-		if (_searchResults.empty()) {
+		if (_previewResults.empty() && _searchResults.empty()) {
 			if (_loadingAnimation) {
 				const auto text = tr::lng_contacts_loading(tr::now);
 				p.fillRect(0, 0, fullWidth, st::searchedBarHeight, st::searchedBarBg);
@@ -933,17 +1232,109 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 				p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(), text);
 				p.translate(0, st::searchedBarHeight);
 			}
-		} else {
+			return;
+		}
+		if (!_previewResults.empty()) {
+			const auto text = tr::lng_search_tab_public_posts(tr::now);
+			p.fillRect(0, 0, fullWidth, st::searchedBarHeight, st::searchedBarBg);
+			p.setFont(st::searchedBarFont);
+			p.setPen(st::searchedBarFg);
+			p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(), text);
+			const auto moreFont = (_selectedMorePosts || _pressedMorePosts)
+				? st::searchedBarFont->underline()
+				: st::searchedBarFont;
+			{
+				const auto text = tr::lng_channels_your_more(tr::now);
+				if (!_morePostsWidth) {
+					_morePostsWidth = moreFont->width(text);
+				}
+				p.setFont(moreFont);
+				p.drawTextLeft(
+					width() - st::searchedBarPosition.x() - _morePostsWidth,
+					st::searchedBarPosition.y(),
+					width(),
+					text);
+				p.translate(0, st::searchedBarHeight);
+			}
+			auto skip = previewOffset();
+			auto from = floorclamp(r.y() - skip, _st->height, 0, _previewResults.size());
+			auto to = ceilclamp(r.y() + r.height() - skip, _st->height, 0, _previewResults.size());
+			p.translate(0, from * _st->height);
+			if (from < _previewResults.size()) {
+				const auto searchLowerText = (_searchHashOrCashtag == HashOrCashtag::None)
+					? _searchState.query.toLower()
+					: QString();
+				for (; from < to; ++from) {
+					const auto &result = _previewResults[from];
+					const auto active = isSearchResultActive(result.get(), activeEntry);
+					const auto selected = _menuRow.key
+						? isSearchResultActive(result.get(), _menuRow)
+						: _chatPreviewRow.key
+						? isSearchResultActive(result.get(), _chatPreviewRow)
+						: (from == (isPressed()
+							? _previewPressed
+							: _previewSelected));
+					Ui::RowPainter::Paint(p, result.get(), {
+						.st = _st,
+						.folder = _openedFolder,
+						.forum = _openedForum,
+						.currentBg = currentBg(),
+						.filter = _filterId,
+						.now = ms,
+						.searchLowerText = QStringView(searchLowerText),
+						.width = fullWidth,
+						.active = active,
+						.selected = selected,
+						.paused = videoPaused,
+						.search = true,
+						.narrow = (fullWidth < st::columnMinimalWidthLeft / 2),
+						.displayUnreadInfo = showUnreadInSearchResults,
+					});
+					p.translate(0, _st->height);
+				}
+			}
+			if (to < _previewResults.size()) {
+				p.translate(0, (_previewResults.size() - to) * _st->height);
+			}
+		}
+
+		if (!_searchResults.empty()) {
 			const auto text = showUnreadInSearchResults
 				? u"Search results"_q
+				: (_searchState.tab == ChatSearchTab::PublicPosts && !_searchIn)
+				? (_searchState.query.isEmpty()
+					? tr::lng_posts_subtitle_empty(tr::now)
+					: tr::lng_posts_subtitle(tr::now))
 				: tr::lng_search_found_results(
 					tr::now,
 					lt_count,
 					_searchedMigratedCount + _searchedCount);
+			const auto searchLowerText = (_searchHashOrCashtag == HashOrCashtag::None)
+				? _searchState.query.toLower()
+				: QString();
 			p.fillRect(0, 0, fullWidth, st::searchedBarHeight, st::searchedBarBg);
 			p.setFont(st::searchedBarFont);
 			p.setPen(st::searchedBarFg);
 			p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(), text);
+			const auto filterOver = _selectedChatTypeFilter
+				|| _pressedChatTypeFilter;
+			const auto filterFont = filterOver
+				? st::searchedBarFont->underline()
+				: st::searchedBarFont;
+			if (hasChatTypeFilter()) {
+				const auto text = ChatTypeFilterLabel(_searchState.filter);
+				if (!_chatTypeFilterWidth) {
+					_chatTypeFilterWidth = filterFont->width(text);
+				}
+				p.setFont(filterFont);
+				p.drawTextLeft(
+					(width()
+						- st::searchedBarPosition.x()
+						- _chatTypeFilterWidth),
+					st::searchedBarPosition.y(),
+					width(),
+					text);
+			}
 			p.translate(0, st::searchedBarHeight);
 
 			auto skip = searchedOffset();
@@ -968,6 +1359,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 						.currentBg = currentBg(),
 						.filter = _filterId,
 						.now = ms,
+						.searchLowerText = QStringView(searchLowerText),
 						.width = fullWidth,
 						.active = active,
 						.selected = selected,
@@ -983,6 +1375,57 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 	}
 }
 
+void InnerWidget::fillRightButton(
+		RightButton &button,
+		const TextWithEntities &text,
+		const style::DialogRightButton &st) {
+	button.st = &st;
+	button.text.setMarkedText(st.button.style, text);
+	const auto size = QSize(
+		button.text.maxWidth() + button.text.minHeight(),
+		st.button.height);
+	const auto generateBg = [&](const style::color &c) {
+		auto bg = QImage(
+			style::DevicePixelRatio() * size,
+			QImage::Format_ARGB32_Premultiplied);
+		bg.setDevicePixelRatio(style::DevicePixelRatio());
+		bg.fill(Qt::transparent);
+		{
+			auto p = QPainter(&bg);
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(c);
+			const auto r = size.height() / 2;
+			p.drawRoundedRect(Rect(size), r, r);
+		}
+		return bg;
+	};
+	button.bg = generateBg(st.button.textBg);
+	button.selectedBg = generateBg(st.button.textBgOver);
+	button.activeBg = generateBg(st.button.textFg);
+}
+
+[[nodiscard]] RightButton *InnerWidget::maybeCacheRightButton(Row *row) {
+	if (const auto user = MaybeBotWithApp(row)) {
+		const auto it = _rightButtons.find(user->id);
+		if (it == _rightButtons.end()) {
+			auto rightButton = RightButton();
+			fillRightButton(
+				rightButton,
+				tr::lng_profile_open_app_short(
+					tr::now,
+					tr::marked),
+				st::dialogRowOpenBot);
+			return &(_rightButtons.emplace(
+				user->id,
+				std::move(rightButton)).first->second);
+		} else {
+			return &(it->second);
+		}
+	}
+	return nullptr;
+}
+
 Ui::VideoUserpic *InnerWidget::validateVideoUserpic(not_null<Row*> row) {
 	const auto history = row->history();
 	return history ? validateVideoUserpic(history) : nullptr;
@@ -1052,8 +1495,18 @@ bool InnerWidget::isRowActive(
 		not_null<Row*> row,
 		const RowDescriptor &entry) const {
 	const auto key = row->key();
-	return (entry.key == key)
-		|| (entry.key.sublist() && key.peer() && key.peer()->isSelf());
+	if (entry.key == key) {
+		return true;
+	} else if (const auto topic = entry.key.topic()) {
+		if (const auto history = key.history()) {
+			return (history->peer == topic->peer())
+				&& HistoryView::SubsectionTabs::UsedFor(history);
+		}
+		return false;
+	} else if (const auto sublist = entry.key.sublist()) {
+		return key.history() && key.history() == sublist->owningHistory();
+	}
+	return false;
 }
 
 bool InnerWidget::isSearchResultActive(
@@ -1095,7 +1548,11 @@ void InnerWidget::paintPeerSearchResult(
 		context.st->photoSize);
 
 	auto nameleft = context.st->nameLeft;
-	auto namewidth = context.width - nameleft - context.st->padding.right();
+	auto available = context.width - nameleft - context.st->padding.right();
+	auto namewidth = available;
+	if (const auto used = Ui::PaintRightButton(p, context)) {
+		namewidth -= used - st::dialogsUnreadPadding;
+	}
 	QRect rectForName(nameleft, context.st->nameTop, namewidth, st::semiboldFont->height);
 
 	if (result->name.isEmpty()) {
@@ -1105,43 +1562,58 @@ void InnerWidget::paintPeerSearchResult(
 			Ui::NameTextOptions());
 	}
 
-	// draw chat icon
-	if (const auto chatTypeIcon = Ui::ChatTypeIcon(peer, context)) {
+	if (const auto info = peer->botVerifyDetails()) {
+		if (!result->badge.ready(info)) {
+			result->badge.set(
+				info,
+				peer->owner().customEmojiManager().factory(
+					Data::CustomEmojiSizeTag::Isolated),
+				[=] { updateSearchResult(peer); });
+		}
+		const auto &st = Ui::VerifiedStyle(context);
+		const auto position = rectForName.topLeft();
+		const auto skip = result->badge.drawVerified(p, position, st);
+		rectForName.setLeft(position.x() + skip + st::dialogsChatTypeSkip);
+	} else if (const auto chatTypeIcon = Ui::ChatTypeIcon(peer, context)) {
 		chatTypeIcon->paint(p, rectForName.topLeft(), context.width);
 		rectForName.setLeft(rectForName.left()
 			+ chatTypeIcon->width()
 			+ st::dialogsChatTypeSkip);
 	}
-	const auto badgeWidth = result->badge.drawGetWidth(
-		p,
-		rectForName,
-		result->name.maxWidth(),
-		context.width,
-		{
-			.peer = peer,
-			.verified = (context.active
-				? &st::dialogsVerifiedIconActive
-				: context.selected
-				? &st::dialogsVerifiedIconOver
-				: &st::dialogsVerifiedIcon),
-			.premium = &ThreeStateIcon(
-				st::dialogsPremiumIcon,
-				context.active,
-				context.selected),
-			.scam = (context.active
-				? &st::dialogsScamFgActive
-				: context.selected
-				? &st::dialogsScamFgOver
-				: &st::dialogsScamFg),
-			.premiumFg = (context.active
-				? &st::dialogsVerifiedIconBgActive
-				: context.selected
-				? &st::dialogsVerifiedIconBgOver
-				: &st::dialogsVerifiedIconBg),
-			.customEmojiRepaint = [=] { updateSearchResult(peer); },
-			.now = context.now,
-			.paused = context.paused,
-		});
+	const auto badgeWidth = result->badge.drawGetWidth(p, {
+		.peer = peer,
+		.rectForName = rectForName,
+		.nameWidth = result->name.maxWidth(),
+		.outerWidth = context.width,
+		.verified = (context.active
+			? &st::dialogsVerifiedIconActive
+			: context.selected
+			? &st::dialogsVerifiedIconOver
+			: &st::dialogsVerifiedIcon),
+		.premium = &ThreeStateIcon(
+			st::dialogsPremiumIcon,
+			context.active,
+			context.selected),
+		.scam = (context.active
+			? &st::dialogsScamFgActive
+			: context.selected
+			? &st::dialogsScamFgOver
+			: &st::dialogsScamFg),
+		.direct = (context.active
+			? &st::dialogsDraftFgActive
+			: context.selected
+			? &st::windowSubTextFgOver
+			: &st::windowSubTextFg),
+		.premiumFg = (context.active
+			? &st::dialogsVerifiedIconBgActive
+			: context.selected
+			? &st::dialogsVerifiedIconBgOver
+			: &st::dialogsVerifiedIconBg),
+		.customEmojiRepaint = [=] { updateSearchResult(peer); },
+		.now = context.now,
+		.prioritizeVerification = true,
+		.paused = context.paused,
+	});
 	rectForName.setWidth(rectForName.width() - badgeWidth);
 
 	QRect tr(context.st->textLeft, context.st->textTop, namewidth, st::dialogsTextFont->height);
@@ -1187,112 +1659,21 @@ void InnerWidget::paintSearchTags(
 	const auto position = QPoint(_searchTagsLeft, top);
 	_searchTags->paint(p, position, context.now, context.paused);
 }
-//
-//void InnerWidget::paintSearchInChat(
-//		Painter &p,
-//		const Ui::PaintContext &context) const {
-//	auto height = searchInChatSkip();
-//
-//	auto top = 0;
-//	p.setFont(st::searchedBarFont);
-//	auto fullRect = QRect(0, top, width(), height - top);
-//	p.fillRect(fullRect, currentBg());
-//	if (_searchFromShown) {
-//		p.setPen(st::dialogsTextFg);
-//		p.setTextPalette(st::dialogsSearchFromPalette);
-//		paintSearchInPeer(p, _searchFromShown, _searchFromUserUserpic, top, _searchFromUserText);
-//		p.restoreTextPalette();
-//	}
-//}
-//
-//template <typename PaintUserpic>
-//void InnerWidget::paintSearchInFilter(
-//		Painter &p,
-//		PaintUserpic paintUserpic,
-//		int top,
-//		const style::icon *icon,
-//		const Ui::Text::String &text) const {
-//	const auto savedPen = p.pen();
-//	const auto userpicLeft = st::defaultDialogRow.padding.left();
-//	const auto userpicTop = top
-//		+ (st::dialogsSearchInHeight - st::dialogsSearchInPhotoSize) / 2;
-//	paintUserpic(p, userpicLeft, userpicTop, st::dialogsSearchInPhotoSize);
-//
-//	const auto nameleft = st::defaultDialogRow.padding.left()
-//		+ st::dialogsSearchInPhotoSize
-//		+ st::dialogsSearchInPhotoPadding;
-//	const auto namewidth = width()
-//		- nameleft
-//		- st::defaultDialogRow.padding.left()
-//		- st::defaultDialogRow.padding.right()
-//		- st::dialogsCancelSearch.width;
-//	auto rectForName = QRect(
-//		nameleft,
-//		top + (st::dialogsSearchInHeight - st::semiboldFont->height) / 2,
-//		namewidth,
-//		st::semiboldFont->height);
-//	if (icon) {
-//		icon->paint(p, rectForName.topLeft(), width());
-//		rectForName.setLeft(rectForName.left()
-//			+ icon->width()
-//			+ st::dialogsChatTypeSkip);
-//	}
-//	p.setPen(savedPen);
-//	text.drawLeftElided(
-//		p,
-//		rectForName.left(),
-//		rectForName.top(),
-//		rectForName.width(),
-//		width());
-//}
-//
-//void InnerWidget::paintSearchInPeer(
-//		Painter &p,
-//		not_null<PeerData*> peer,
-//		Ui::PeerUserpicView &userpic,
-//		int top,
-//		const Ui::Text::String &text) const {
-//	const auto paintUserpic = [&](Painter &p, int x, int y, int size) {
-//		peer->paintUserpicLeft(p, userpic, x, y, width(), size);
-//	};
-//	const auto icon = Ui::ChatTypeIcon(peer);
-//	paintSearchInFilter(p, paintUserpic, top, icon, text);
-//}
-//
-//void InnerWidget::paintSearchInSaved(
-//		Painter &p,
-//		int top,
-//		const Ui::Text::String &text) const {
-//	const auto paintUserpic = [&](Painter &p, int x, int y, int size) {
-//		Ui::EmptyUserpic::PaintSavedMessages(p, x, y, width(), size);
-//	};
-//	paintSearchInFilter(p, paintUserpic, top, nullptr, text);
-//}
-//
-//void InnerWidget::paintSearchInReplies(
-//		Painter &p,
-//		int top,
-//		const Ui::Text::String &text) const {
-//	const auto paintUserpic = [&](Painter &p, int x, int y, int size) {
-//		Ui::EmptyUserpic::PaintRepliesMessages(p, x, y, width(), size);
-//	};
-//	paintSearchInFilter(p, paintUserpic, top, nullptr, text);
-//}
-//
-//void InnerWidget::paintSearchInTopic(
-//		Painter &p,
-//		const Ui::PaintContext &context,
-//		not_null<Data::ForumTopic*> topic,
-//		Ui::PeerUserpicView &userpic,
-//		int top,
-//		const Ui::Text::String &text) const {
-//	const auto paintUserpic = [&](Painter &p, int x, int y, int size) {
-//		p.translate(x, y);
-//		topic->paintUserpic(p, userpic, context);
-//		p.translate(-x, -y);
-//	};
-//	paintSearchInFilter(p, paintUserpic, top, nullptr, text);
-//}
+
+void InnerWidget::showPeerMenu() {
+	if (!_selected) {
+		return;
+	}
+	const auto &padding = st::defaultDialogRow.padding;
+	const auto pos = QPoint(
+		width() - padding.right(),
+		_selected->top() + _selected->height() + padding.bottom());
+	auto event = QContextMenuEvent(
+		QContextMenuEvent::Keyboard,
+		pos,
+		mapToGlobal(pos));
+	InnerWidget::contextMenuEvent(&event);
+}
 
 void InnerWidget::mouseMoveEvent(QMouseEvent *e) {
 	if (_chatPreviewTouchGlobal || _touchDragStartGlobal) {
@@ -1306,12 +1687,118 @@ void InnerWidget::mouseMoveEvent(QMouseEvent *e) {
 		&& *_lastMousePosition == globalPosition) {
 		return;
 	}
+
+	if (_lastMousePosition && *_lastMousePosition != globalPosition) {
+		if (skipChatsListFreeze()) {
+			unfreezeShownList(true);
+		} else {
+			if (!_freezeTimer.isActive()) {
+				_shownList->freeze();
+			}
+			_freezeTimer.callOnce(kFreezeTimeout);
+		}
+	}
+
+	if (_pressed && (e->buttons() & Qt::LeftButton)) {
+		const auto local = e->pos();
+		const auto outside = _dragging ? false : true;
+		const auto delta = local - _dragStart;
+		const auto thresholdY = _pressed->entry()->isPinnedDialog(_filterId)
+			? kStartDragToFilterThresholdY
+			: kStartDragToFilterThresholdX;
+		const auto distanceExceeded = std::abs(delta.x())
+				>= style::ConvertScale(kStartDragToFilterThresholdX)
+			|| std::abs(delta.y()) >= style::ConvertScale(thresholdY);
+
+		if (!_qdragging && outside && distanceExceeded) {
+			if (_pressed->history()) {
+				unfreezeShownList(true);
+				_dragging = _pressed;
+				_qdragging = _pressed;
+				InvokeQueued(this, [=] { performDrag(); });
+				return;
+			}
+		} else if (!outside && _qdragging) {
+			_qdragging = nullptr;
+		}
+	}
+
 	selectByMouse(globalPosition);
 	if (_chatPreviewScheduled && !isUserpicPress()) {
 		cancelChatPreview();
 	}
 }
 
+bool InnerWidget::skipChatsListFreeze() const {
+	return _dragging != nullptr;
+}
+
+void InnerWidget::unfreezeShownList(bool updateIfWasFrozen) {
+	const auto wasFrozen = _freezeTimer.isActive();
+	_freezeTimer.cancel();
+	_shownList->unfreeze();
+	if (updateIfWasFrozen && wasFrozen) {
+		update();
+	}
+}
+
+void InnerWidget::performDrag() {
+	if (!_qdragging || !session().data().chatsFilters().has()) {
+		return;
+	}
+	const auto history = _qdragging->history();
+	if (!history) {
+		return;
+	}
+
+	auto mimeData = std::make_unique<QMimeData>();
+	auto byteArray = [&] {
+		auto data = QByteArray();
+		auto stream = QDataStream(&data, QIODevice::WriteOnly);
+		stream << history->peer->id.value;
+		stream << history->session().isTestMode();
+		return data;
+	}();
+	mimeData->setData(
+		u"application/x-telegram-dialog"_q,
+		std::move(byteArray));
+
+	if (const auto u = history->peer->username(); !u.isEmpty()) {
+		mimeData->setText(history->peer->session().createInternalLinkFull(u));
+		mimeData->setData(
+			u"application/x-telegram-input-field"_q,
+			('@' + u).toUtf8());
+	}
+
+	const auto &st = st::defaultDialogRow;
+	auto pixmap = QPixmap(Size(st.height * style::DevicePixelRatio()));
+	pixmap.setDevicePixelRatio(style::DevicePixelRatio());
+	pixmap.fill(Qt::transparent);
+	if (const auto draw = PaintUserpicCallback(history->peer, true)) {
+		auto p = Painter(&pixmap);
+		p.setOpacity(0.7);
+		const auto pos = (st.height - st.photoSize) / 2;
+		draw(p, pos, pos, st.height, st.photoSize);
+	}
+
+	Ui::Animations::Manager::SetScheduleWithInvokeQueued(true);
+
+	_controller->cancelScheduledPreview();
+	// This call enters event loop and can destroy any QObject.
+	_controller->widget()->launchDrag(
+		std::move(mimeData),
+		[=, weak = base::make_weak(this)] {
+			Ui::Animations::Manager::SetScheduleWithInvokeQueued(false);
+			if (weak) {
+				_qdragging = nullptr;
+				clearPressed();
+				finishReorderOnRelease();
+				selectByMouse(QCursor::pos());
+			}
+		},
+		pixmap);
+}
+
 void InnerWidget::cancelChatPreview() {
 	_chatPreviewTouchGlobal = {};
 	_chatPreviewScheduled = false;
@@ -1327,9 +1814,11 @@ void InnerWidget::clearIrrelevantState() {
 		setHashtagPressed(-1);
 		_hashtagDeleteSelected = _hashtagDeletePressed = false;
 		_filteredSelected = -1;
-		setFilteredPressed(-1, false);
+		setFilteredPressed(-1, false, false);
 		_peerSearchSelected = -1;
-		setPeerSearchPressed(-1);
+		setPeerSearchPressed(-1, false);
+		_previewSelected = -1;
+		setPreviewPressed(-1);
 		_searchedSelected = -1;
 		setSearchedPressed(-1);
 	} else if (_state == WidgetState::Filtered) {
@@ -1340,6 +1829,37 @@ void InnerWidget::clearIrrelevantState() {
 	}
 }
 
+bool InnerWidget::lookupIsInBotAppButton(
+		Row *row,
+		QPoint localPosition) {
+	if (_narrowRatio) {
+		return false;
+	}
+	if (const auto user = MaybeBotWithApp(row)) {
+		const auto it = _rightButtons.find(user->id);
+		if (it != _rightButtons.end()) {
+			return lookupIsInRightButton(it->second, localPosition);
+		}
+	}
+	return false;
+}
+
+bool InnerWidget::lookupIsInRightButton(
+		const RightButton &button,
+		QPoint localPosition) {
+	if (!button.st) {
+		return false;
+	}
+
+	const auto s = button.bg.size() / style::DevicePixelRatio();
+	const auto r = QRect(
+		width() - s.width() - button.st->margin.right(),
+		button.st->margin.top(),
+		s.width(),
+		s.height());
+	return r.contains(localPosition);
+}
+
 void InnerWidget::selectByMouse(QPoint globalPosition) {
 	const auto local = mapFromGlobal(globalPosition);
 	if (updateReorderPinned(local)) {
@@ -1380,16 +1900,19 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 			: (mouseY >= offset)
 			? _shownList->rowAtY(mouseY - offset)
 			: nullptr;
+		const auto mappedY = selected ? mouseY - offset - selected->top() : 0;
 		const auto selectedTopicJump = selected
-			&& selected->lookupIsInTopicJump(
-				local.x(),
-				mouseY - offset - selected->top());
+			&& selected->lookupIsInTopicJump(local.x(), mappedY);
+		const auto selectedRightButton = selected
+			&& lookupIsInBotAppButton(selected, QPoint(local.x(), mappedY));
 		if (_collapsedSelected != collapsedSelected
 			|| _selected != selected
-			|| _selectedTopicJump != selectedTopicJump) {
+			|| _selectedTopicJump != selectedTopicJump
+			|| _selectedRightButton != selectedRightButton) {
 			updateSelectedRow();
 			_selected = selected;
 			_selectedTopicJump = selectedTopicJump;
+			_selectedRightButton = selectedRightButton;
 			_collapsedSelected = collapsedSelected;
 			updateSelectedRow();
 			setCursor((_selected || _collapsedSelected >= 0)
@@ -1422,29 +1945,76 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 			if (filteredSelected < 0 || filteredSelected >= _filterResults.size()) {
 				filteredSelected = -1;
 			}
+			const auto mappedY = (filteredSelected >= 0)
+				? mouseY - skip - _filterResults[filteredSelected].top
+				: 0;
 			const auto selectedTopicJump = (filteredSelected >= 0)
 				&& _filterResults[filteredSelected].row->lookupIsInTopicJump(
 					local.x(),
-					mouseY - skip - _filterResults[filteredSelected].top);
+					mappedY);
+			const auto selectedRightButton = (filteredSelected >= 0)
+				? lookupIsInBotAppButton(
+					_filterResults[filteredSelected].row,
+					QPoint(local.x(), mappedY))
+				: _selectedRightButton;
 			if (_filteredSelected != filteredSelected
-				|| _selectedTopicJump != selectedTopicJump) {
+				|| _selectedTopicJump != selectedTopicJump
+				|| _selectedRightButton != selectedRightButton) {
 				updateSelectedRow();
 				_filteredSelected = filteredSelected;
 				_selectedTopicJump = selectedTopicJump;
+				_selectedRightButton = selectedRightButton;
 				updateSelectedRow();
 			}
 		}
 		if (!_peerSearchResults.empty()) {
-			auto skip = peerSearchOffset();
+			const auto skip = peerSearchOffset();
 			auto peerSearchSelected = (mouseY >= skip) ? ((mouseY - skip) / st::dialogsRowHeight) : -1;
 			if (peerSearchSelected < 0 || peerSearchSelected >= _peerSearchResults.size()) {
 				peerSearchSelected = -1;
 			}
-			if (_peerSearchSelected != peerSearchSelected) {
+			const auto mappedY = (peerSearchSelected >= 0)
+				? mouseY - skip - (peerSearchSelected * st::dialogsRowHeight)
+				: 0;
+			const auto selectedRightButton = (peerSearchSelected >= 0)
+				? (_peerSearchResults[peerSearchSelected]->sponsored
+					&& lookupIsInRightButton(
+						_peerSearchResults[peerSearchSelected]->sponsored->button,
+						QPoint(local.x(), mappedY)))
+				: _selectedRightButton;
+			if (_peerSearchSelected != peerSearchSelected
+				|| _selectedRightButton != selectedRightButton) {
 				updateSelectedRow();
 				_peerSearchSelected = peerSearchSelected;
+				_selectedRightButton = selectedRightButton;
+				updateSelectedRow();
+			}
+		}
+		if (!_previewResults.empty()) {
+			auto skip = previewOffset();
+			auto previewSelected = (mouseY >= skip) ? ((mouseY - skip) / _st->height) : -1;
+			if (previewSelected < 0 || previewSelected >= _previewResults.size()) {
+				previewSelected = -1;
+			}
+			if (_previewSelected != previewSelected) {
+				updateSelectedRow();
+				_previewSelected = previewSelected;
 				updateSelectedRow();
 			}
+			auto selectedMorePosts = false;
+			const auto from = skip - st::searchedBarHeight;
+			if (mouseY <= skip && mouseY >= from) {
+				const auto left = width()
+					- _morePostsWidth
+					- 2 * st::searchedBarPosition.x();
+				if (_morePostsWidth > 0 && local.x() >= left) {
+					selectedMorePosts = true;
+				}
+			}
+			if (_selectedMorePosts != selectedMorePosts) {
+				update(0, from, width(), st::searchedBarHeight);
+				_selectedMorePosts = selectedMorePosts;
+			}
 		}
 		if (!_searchResults.empty()) {
 			auto skip = searchedOffset();
@@ -1457,6 +2027,20 @@ void InnerWidget::selectByMouse(QPoint globalPosition) {
 				_searchedSelected = searchedSelected;
 				updateSelectedRow();
 			}
+			auto selectedChatTypeFilter = false;
+			const auto from = skip - st::searchedBarHeight;
+			if (hasChatTypeFilter() && mouseY <= skip && mouseY >= from) {
+				const auto left = width()
+					- _chatTypeFilterWidth
+					- 2 * st::searchedBarPosition.x();
+				if (_chatTypeFilterWidth > 0 && local.x() >= left) {
+					selectedChatTypeFilter = true;
+				}
+			}
+			if (_selectedChatTypeFilter != selectedChatTypeFilter) {
+				update(0, from, width(), st::searchedBarHeight);
+				_selectedChatTypeFilter = selectedChatTypeFilter;
+			}
 		}
 		if (!inTags && wasSelected != isSelected()) {
 			setCursor(wasSelected ? style::cur_default : style::cur_pointer);
@@ -1469,8 +2053,13 @@ RowDescriptor InnerWidget::computeChatPreviewRow() const {
 	if (const auto peer = result.key.peer()) {
 		const auto topicId = _pressedTopicJump
 			? _pressedTopicJumpRootId
-			: 0;
-		if (const auto topic = peer->forumTopicFor(topicId)) {
+			: MsgId();
+		const auto sublistPeerId = _pressedTopicJump
+			? _pressedSublistJumpPeerId
+			: PeerId();
+		if (const auto sublist = peer->monoforumSublistFor(sublistPeerId)) {
+			return { sublist, FullMsgId() };
+		} else if (const auto topic = peer->forumTopicFor(topicId)) {
 			return { topic, FullMsgId() };
 		}
 	}
@@ -1489,13 +2078,19 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 	selectByMouse(e->globalPos());
 
 	_pressButton = e->button();
-	setPressed(_selected, _selectedTopicJump);
+	setPressed(_selected, _selectedTopicJump, _selectedRightButton);
 	setCollapsedPressed(_collapsedSelected);
 	setHashtagPressed(_hashtagSelected);
 	_hashtagDeletePressed = _hashtagDeleteSelected;
-	setFilteredPressed(_filteredSelected, _selectedTopicJump);
-	setPeerSearchPressed(_peerSearchSelected);
+	setFilteredPressed(
+		_filteredSelected,
+		_selectedTopicJump,
+		_selectedRightButton);
+	setPeerSearchPressed(_peerSearchSelected, _selectedRightButton);
+	setPreviewPressed(_previewSelected);
 	setSearchedPressed(_searchedSelected);
+	_pressedMorePosts = _selectedMorePosts;
+	_pressedChatTypeFilter = _selectedChatTypeFilter;
 
 	const auto alt = (e->modifiers() & Qt::AltModifier);
 	if (alt && showChatPreview()) {
@@ -1511,16 +2106,22 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 		});
 	} else if (_pressed) {
 		auto row = _pressed;
-		const auto weak = Ui::MakeWeak(this);
-		const auto updateCallback = [weak, row] {
-			const auto strong = weak.data();
-			if (!strong || !strong->_pinnedShiftAnimation.animating()) {
-				row->entry()->updateChatListEntry();
+		const auto weakThis = base::make_weak(this);
+		const auto weakEntry = base::make_weak(row->entry());
+		const auto updateCallback = [weakThis, weakEntry] {
+			const auto that = weakThis.get();
+			if (!that || !that->_pinnedShiftAnimation.animating()) {
+				if (const auto entry = weakEntry.get()) {
+					entry->updateChatListEntry();
+				}
 			}
 		};
 		const auto origin = e->pos()
 			- QPoint(0, dialogsOffset() + _pressed->top());
-		if (_pressedTopicJump) {
+		if ((_pressButton == Qt::MiddleButton)
+			&& addQuickActionRipple(row, updateCallback)) {
+		} else if (addRightButtonRipple(origin, updateCallback)) {
+		} else if (_pressedTopicJump) {
 			row->addTopicJumpRipple(
 				origin,
 				_topicJumpCache.get(),
@@ -1546,7 +2147,8 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 		const auto origin = e->pos()
 			- QPoint(0, filteredOffset() + result.top);
 		const auto updateCallback = [=] { repaintDialogRow(filterId, row); };
-		if (_pressedTopicJump) {
+		if (addRightButtonRipple(origin, updateCallback)) {
+		} else if (_pressedTopicJump) {
 			row->addTopicJumpRipple(
 				origin,
 				_topicJumpCache.get(),
@@ -1560,11 +2162,19 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 		}
 	} else if (base::in_range(_peerSearchPressed, 0, _peerSearchResults.size())) {
 		auto &result = _peerSearchResults[_peerSearchPressed];
-		auto row = &result->row;
-		row->addRipple(
-			e->pos() - QPoint(0, peerSearchOffset() + _peerSearchPressed * st::dialogsRowHeight),
-			QSize(width(), st::dialogsRowHeight),
-			[this, peer = result->peer] { updateSearchResult(peer); });
+		const auto row = &result->row;
+		const auto origin = e->pos()
+			- QPoint(0, peerSearchOffset() + _peerSearchPressed * st::dialogsRowHeight);
+		const auto updateCallback = [this, peer = result->peer] {
+			updateSearchResult(peer);
+		};
+		if (addRightButtonRipple(origin, updateCallback)) {
+		} else {
+			row->addRipple(
+				origin,
+				QSize(width(), st::dialogsRowHeight),
+				updateCallback);
+		}
 	} else if (base::in_range(_searchedPressed, 0, _searchResults.size())) {
 		auto &row = _searchResults[_searchedPressed];
 		row->addRipple(
@@ -1580,10 +2190,98 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 	}
 }
 
+bool InnerWidget::addRightButtonRipple(QPoint origin, Fn<void()> updateCallback) {
+	if (!(_pressedRightButton && _pressedRightButtonData)) {
+		return false;
+	}
+	const auto size = _pressedRightButtonData->bg.size()
+		/ style::DevicePixelRatio();
+	if (!_pressedRightButtonData->ripple) {
+		_pressedRightButtonData->ripple = std::make_unique<Ui::RippleAnimation>(
+			_pressedRightButtonData->st->button.ripple,
+			Ui::RippleAnimation::RoundRectMask(size, size.height() / 2),
+			std::move(updateCallback));
+	}
+	const auto shift = QPoint(
+		width() - size.width() - _pressedRightButtonData->st->margin.right(),
+		_pressedRightButtonData->st->margin.top());
+	_pressedRightButtonData->ripple->add(origin - shift);
+	return true;
+}
+
+bool InnerWidget::addQuickActionRipple(
+		not_null<Row*> row,
+		Fn<void()> updateCallback) {
+	if (_activeQuickAction) {
+		return false;
+	}
+	const auto action = Core::App().settings().quickDialogAction();
+	if (action == Dialogs::Ui::QuickDialogAction::Disabled) {
+		return false;
+	}
+	const auto history = row->history();
+	if (!history) {
+		return false;
+	}
+	const auto type = ResolveQuickDialogLabel(history, action, _filterId);
+	if (type == Dialogs::Ui::QuickDialogActionLabel::Disabled) {
+		return false;
+	}
+	const auto key = history->peer->id.value;
+	const auto context = ensureQuickAction(key);
+	if (context->data) {
+		return false;
+	}
+
+	auto name = ResolveQuickDialogLottieIconName(type);
+	const auto rowHeight = row->height();
+	context->icon = Lottie::MakeIcon({
+		.name = std::move(name),
+		.sizeOverride = Size(st::dialogsQuickActionSize),
+	});
+	context->action = action;
+	context->icon->jumpTo(context->icon->framesCount() - 1, [=] {
+		const auto size = QSize(
+			st::dialogsQuickActionRippleSize,
+			rowHeight);
+		if (!context->ripple) {
+			context->ripple = std::make_unique<Ui::RippleAnimation>(
+				st::defaultRippleAnimation,
+				Ui::RippleAnimation::RectMask(size),
+				updateCallback);
+		}
+		if (!context->rippleFg) {
+			context->rippleFg = std::make_unique<Ui::RippleAnimation>(
+				st::defaultRippleAnimation,
+				Ui::RippleAnimation::MaskByDrawer(
+					size,
+					true,
+					[&](QPainter &p) {
+						p.setCompositionMode(
+							QPainter::CompositionMode_Source);
+						p.fillRect(Rect(size), Qt::transparent);
+						DrawQuickAction(
+							p,
+							Rect(size),
+							context->icon.get(),
+							ResolveQuickDialogLabel(
+								history,
+								action,
+								_filterId));
+					}),
+				std::move(updateCallback));
+		}
+		context->ripple->add(QPoint(size.width() / 2, size.height() / 2));
+		context->rippleFg->add(QPoint(size.width() / 2, size.height() / 2));
+	});
+
+	return true;
+}
+
 const std::vector<Key> &InnerWidget::pinnedChatsOrder() const {
 	const auto owner = &session().data();
 	return _savedSublists
-		? owner->pinnedChatsOrder(&owner->savedMessages())
+		? owner->pinnedChatsOrder(_savedSublists)
 		: _openedForum
 		? owner->pinnedChatsOrder(_openedForum)
 		: _filterId
@@ -1592,12 +2290,21 @@ const std::vector<Key> &InnerWidget::pinnedChatsOrder() const {
 }
 
 void InnerWidget::checkReorderPinnedStart(QPoint localPosition) {
-	if (!_pressed || _dragging || _state != WidgetState::Default) {
+	if (!_pressed
+		|| _dragging
+		|| (_state != WidgetState::Default)
+		|| _pressedRightButtonData) {
 		return;
 	} else if (qAbs(localPosition.y() - _dragStart.y())
 		< style::ConvertScale(kStartReorderThreshold)) {
 		return;
 	}
+	if ((_pressButton == Qt::MiddleButton)
+		&& (Core::App().settings().quickDialogAction()
+			!= Dialogs::Ui::QuickDialogAction::Disabled)) {
+		return;
+	}
+	unfreezeShownList(true);
 	_dragging = _pressed;
 	startReorderPinned(localPosition);
 }
@@ -1639,6 +2346,9 @@ int InnerWidget::countPinnedIndex(Row *ofRow) {
 }
 
 void InnerWidget::savePinnedOrder() {
+	if (_savedSublists && _savedSublists->parentChat()) {
+		return;
+	}
 	const auto &newOrder = pinnedChatsOrder();
 	if (newOrder.size() != _pinnedOnDragStart.size()) {
 		return; // Something has changed in the set of pinned chats.
@@ -1665,6 +2375,7 @@ void InnerWidget::finishReorderPinned() {
 		savePinnedOrder();
 		_dragging = nullptr;
 		_touchDragStartGlobal = {};
+		_qdragging = nullptr;
 	}
 
 	_draggingIndex = -1;
@@ -1731,38 +2442,64 @@ bool InnerWidget::updateReorderPinned(QPoint localPosition) {
 	}
 
 	const auto draggingHeight = _dragging->height();
+	const auto promoted = fixedOnTopCount();
 	auto yaddWas = _pinnedRows[_draggingIndex].yadd.current();
 	auto shift = 0;
+	auto shiftHeight = 0;
 	auto now = crl::now();
+	const auto crossThreshold = [&](int height) {
+		return std::max(draggingHeight / 2, height - draggingHeight / 2);
+	};
 	if (_dragStart.y() > localPosition.y() && _draggingIndex > 0) {
-		shift = -floorclamp(_dragStart.y() - localPosition.y() + (draggingHeight / 2), draggingHeight, 0, _draggingIndex);
-
-		for (auto from = _draggingIndex, to = _draggingIndex + shift; from > to; --from) {
+		auto delta = _dragStart.y() - localPosition.y();
+		for (auto from = _draggingIndex; from > 0; --from) {
+			const auto height
+				= (*(_shownList->cbegin() + promoted + from - 1))->height();
+			if (delta < crossThreshold(height)) {
+				break;
+			}
+			delta -= height;
+			--shift;
 			_shownList->movePinned(_dragging, -1);
 			std::swap(_pinnedRows[from], _pinnedRows[from - 1]);
-			_pinnedRows[from].yadd = anim::value(_pinnedRows[from].yadd.current() - draggingHeight, 0);
+			_pinnedRows[from].yadd = anim::value(
+				_pinnedRows[from].yadd.current() - draggingHeight,
+				0);
 			_pinnedRows[from].animStartTime = now;
-		}
-	} else if (_dragStart.y() < localPosition.y() && _draggingIndex + 1 < pinnedCount) {
-		shift = floorclamp(localPosition.y() - _dragStart.y() + (draggingHeight / 2), draggingHeight, 0, pinnedCount - _draggingIndex - 1);
-
-		for (auto from = _draggingIndex, to = _draggingIndex + shift; from < to; ++from) {
+			shiftHeight -= height;
+		}
+	} else if (_dragStart.y() < localPosition.y()
+			&& _draggingIndex + 1 < pinnedCount) {
+		auto delta = localPosition.y() - _dragStart.y();
+		for (auto from = _draggingIndex; from + 1 < pinnedCount; ++from) {
+			const auto height
+				= (*(_shownList->cbegin() + promoted + from + 1))->height();
+			if (delta < crossThreshold(height)) {
+				break;
+			}
+			delta -= height;
+			++shift;
 			_shownList->movePinned(_dragging, 1);
 			std::swap(_pinnedRows[from], _pinnedRows[from + 1]);
-			_pinnedRows[from].yadd = anim::value(_pinnedRows[from].yadd.current() + draggingHeight, 0);
+			_pinnedRows[from].yadd = anim::value(
+				_pinnedRows[from].yadd.current() + draggingHeight,
+				0);
 			_pinnedRows[from].animStartTime = now;
+			shiftHeight += height;
 		}
 	}
 	if (shift) {
 		_draggingIndex += shift;
 		_aboveIndex = _draggingIndex;
-		_dragStart.setY(_dragStart.y() + shift * _st->height);
+		_dragStart.setY(_dragStart.y() + shiftHeight);
 		if (!_pinnedShiftAnimation.animating()) {
 			_pinnedShiftAnimation.start();
 		}
 	}
 	_aboveTopShift = qCeil(_pinnedRows[_aboveIndex].yadd.current());
-	_pinnedRows[_draggingIndex].yadd = anim::value(yaddWas - shift * _st->height, localPosition.y() - _dragStart.y());
+	_pinnedRows[_draggingIndex].yadd = anim::value(
+		yaddWas - shiftHeight,
+		localPosition.y() - _dragStart.y());
 	if (!_pinnedRows[_draggingIndex].animStartTime) {
 		_pinnedRows[_draggingIndex].yadd.finish();
 	}
@@ -1771,8 +2508,11 @@ bool InnerWidget::updateReorderPinned(QPoint localPosition) {
 	const auto delta = [&] {
 		if (localPosition.y() < _visibleTop) {
 			return localPosition.y() - _visibleTop;
-		} else if ((_savedSublists || _openedFolder || _openedForum || _filterId)
-			&& localPosition.y() > _visibleBottom) {
+		} else if ((localPosition.y() > _visibleBottom)
+			&& (_savedSublists
+				|| _openedFolder
+				|| _openedForum
+				|| _filterId)) {
 			return localPosition.y() - _visibleBottom;
 		}
 		return 0;
@@ -1813,7 +2553,7 @@ bool InnerWidget::pinnedShiftAnimationCallback(crl::time now) {
 	}
 	if (updateMin >= 0) {
 		const auto minHeight = _st->height;
-		const auto maxHeight = st::forumDialogRow.height;
+		const auto maxHeight = st::taggedForumDialogRow.height;
 		auto top = pinnedOffset();
 		auto updateFrom = top + minHeight * (updateMin - 1);
 		auto updateHeight = maxHeight * (updateMax - updateMin + 3);
@@ -1844,14 +2584,16 @@ void InnerWidget::mousePressReleased(
 	if (_chatPreviewScheduled) {
 		_controller->cancelScheduledPreview();
 	}
-	_pressButton = Qt::NoButton;
+	const auto pressButton = base::take(_pressButton);
 
 	const auto wasDragging = finishReorderOnRelease();
 
 	auto collapsedPressed = _collapsedPressed;
 	setCollapsedPressed(-1);
 	const auto pressedTopicRootId = _pressedTopicJumpRootId;
+	const auto pressedSublistPeerId = _pressedSublistJumpPeerId;
 	const auto pressedTopicJump = _pressedTopicJump;
+	const auto pressedRightButton = _pressedRightButton;
 	auto pressed = _pressed;
 	clearPressed();
 	auto hashtagPressed = _hashtagPressed;
@@ -1859,29 +2601,85 @@ void InnerWidget::mousePressReleased(
 	auto hashtagDeletePressed = _hashtagDeletePressed;
 	_hashtagDeletePressed = false;
 	auto filteredPressed = _filteredPressed;
-	setFilteredPressed(-1, false);
+	setFilteredPressed(-1, false, false);
 	auto peerSearchPressed = _peerSearchPressed;
-	setPeerSearchPressed(-1);
+	setPeerSearchPressed(-1, false);
+	auto previewPressed = _previewPressed;
+	setPreviewPressed(-1);
 	auto searchedPressed = _searchedPressed;
 	setSearchedPressed(-1);
+	const auto pressedMorePosts = _pressedMorePosts;
+	_pressedMorePosts = false;
+	const auto pressedChatTypeFilter = _pressedChatTypeFilter;
+	_pressedChatTypeFilter = false;
 	if (wasDragging) {
 		selectByMouse(globalPosition);
 	}
+	if (_pressedRightButtonData && _pressedRightButtonData->ripple) {
+		_pressedRightButtonData->ripple->lastStop();
+	}
+	if ((pressButton == Qt::MiddleButton)
+		&& _activeQuickAction
+		&& pressed
+		&& !_activeQuickAction->data) {
+		if (const auto history = pressed->history()) {
+			const auto raw = _activeQuickAction.get();
+			if (raw->ripple) {
+				raw->ripple->lastStop();
+			}
+			if (raw->rippleFg) {
+				raw->rippleFg->lastStop();
+			}
+
+			if (pressed == _selected) {
+				PerformQuickDialogAction(
+					_controller,
+					history->peer,
+					raw->action,
+					_filterId);
+			}
+			deactivateQuickAction();
+		}
+	}
 	updateSelectedRow();
 	if (!wasDragging && button == Qt::LeftButton) {
 		if ((collapsedPressed >= 0 && collapsedPressed == _collapsedSelected)
 			|| (pressed
 				&& pressed == _selected
-				&& pressedTopicJump == _selectedTopicJump)
+				&& pressedTopicJump == _selectedTopicJump
+				&& pressedRightButton == _selectedRightButton)
 			|| (hashtagPressed >= 0
 				&& hashtagPressed == _hashtagSelected
 				&& hashtagDeletePressed == _hashtagDeleteSelected)
-			|| (filteredPressed >= 0 && filteredPressed == _filteredSelected)
+			|| (filteredPressed >= 0
+				&& filteredPressed == _filteredSelected
+				&& pressedRightButton == _selectedRightButton)
 			|| (peerSearchPressed >= 0
-				&& peerSearchPressed == _peerSearchSelected)
+				&& peerSearchPressed == _peerSearchSelected
+				&& pressedRightButton == _selectedRightButton)
+			|| (previewPressed >= 0
+				&& previewPressed == _previewSelected)
 			|| (searchedPressed >= 0
-				&& searchedPressed == _searchedSelected)) {
-			chooseRow(modifiers, pressedTopicRootId);
+				&& searchedPressed == _searchedSelected)
+			|| (pressedMorePosts
+				&& pressedMorePosts == _selectedMorePosts)
+			|| (pressedChatTypeFilter
+				&& pressedChatTypeFilter == _selectedChatTypeFilter)) {
+			if (pressedRightButton && (pressed || filteredPressed >= 0)) {
+				const auto &row = pressed
+					? pressed
+					: _filterResults[filteredPressed].row.get();
+				if (const auto user = MaybeBotWithApp(row)) {
+					_openBotMainAppRequests.fire(peerToUser(user->id));
+				}
+			} else if (pressedRightButton && peerSearchPressed >= 0) {
+				showSponsoredMenu(peerSearchPressed, globalPosition);
+			} else {
+				chooseRow(
+					modifiers,
+					pressedTopicRootId,
+					pressedSublistPeerId);
+			}
 		}
 	}
 	if (auto activated = ClickHandler::unpressed()) {
@@ -1902,25 +2700,45 @@ void InnerWidget::setCollapsedPressed(int pressed) {
 	}
 }
 
-void InnerWidget::setPressed(Row *pressed, bool pressedTopicJump) {
-	if (_pressed != pressed || (pressed && _pressedTopicJump != pressedTopicJump)) {
+void InnerWidget::setPressed(
+		Row *pressed,
+		bool pressedTopicJump,
+		bool pressedRightButton) {
+	if ((_pressed != pressed)
+		|| (pressed && _pressedTopicJump != pressedTopicJump)
+		|| (pressed && _pressedRightButton != pressedRightButton)) {
 		if (_pressed) {
 			_pressed->stopLastRipple();
 		}
+		if (_pressedRightButtonData && _pressedRightButtonData->ripple) {
+			_pressedRightButtonData->ripple->lastStop();
+		}
 		_pressed = pressed;
-		if (pressed || !pressedTopicJump) {
+		if (pressed || !pressedTopicJump || !pressedRightButton) {
 			_pressedTopicJump = pressedTopicJump;
+			_pressedRightButton = pressedRightButton;
+			if (pressedRightButton) {
+				if (const auto user = MaybeBotWithApp(pressed)) {
+					const auto it = _rightButtons.find(user->id);
+					if (it != _rightButtons.end()) {
+						_pressedRightButtonData = &(it->second);
+					}
+				}
+			}
 			const auto history = pressedTopicJump
 				? pressed->history()
 				: nullptr;
 			const auto item = history ? history->chatListMessage() : nullptr;
 			_pressedTopicJumpRootId = item ? item->topicRootId() : MsgId();
+			_pressedSublistJumpPeerId = item
+				? item->sublistPeerId()
+				: PeerId();
 		}
 	}
 }
 
 void InnerWidget::clearPressed() {
-	setPressed(nullptr, false);
+	setPressed(nullptr, false, false);
 }
 
 void InnerWidget::setHashtagPressed(int pressed) {
@@ -1930,29 +2748,71 @@ void InnerWidget::setHashtagPressed(int pressed) {
 	_hashtagPressed = pressed;
 }
 
-void InnerWidget::setFilteredPressed(int pressed, bool pressedTopicJump) {
+void InnerWidget::setFilteredPressed(
+		int pressed,
+		bool pressedTopicJump,
+		bool pressedRightButton) {
 	if (_filteredPressed != pressed
-		|| (pressed >= 0 && _pressedTopicJump != pressedTopicJump)) {
+		|| (pressed >= 0 && _pressedTopicJump != pressedTopicJump)
+		|| (pressed >= 0 && _pressedRightButton != pressedRightButton)) {
 		if (base::in_range(_filteredPressed, 0, _filterResults.size())) {
 			_filterResults[_filteredPressed].row->stopLastRipple();
 		}
+		if (_pressedRightButtonData && _pressedRightButtonData->ripple) {
+			_pressedRightButtonData->ripple->lastStop();
+		}
 		_filteredPressed = pressed;
-		if (pressed >= 0 || !pressedTopicJump) {
+		if (pressed >= 0 || !pressedTopicJump || !pressedRightButton) {
 			_pressedTopicJump = pressedTopicJump;
+			_pressedRightButton = pressedRightButton;
+			if (pressed >= 0 && pressedRightButton) {
+				const auto &row = _filterResults[pressed].row;
+				if (const auto history = row->history()) {
+					const auto it = _rightButtons.find(history->peer->id);
+					if (it != _rightButtons.end()) {
+						_pressedRightButtonData = &(it->second);
+					}
+				}
+			}
 			const auto history = pressedTopicJump
 				? _filterResults[pressed].row->history()
 				: nullptr;
 			const auto item = history ? history->chatListMessage() : nullptr;
 			_pressedTopicJumpRootId = item ? item->topicRootId() : MsgId();
+			_pressedSublistJumpPeerId = item
+				? item->sublistPeerId()
+				: PeerId();
+		}
+	}
+}
+
+void InnerWidget::setPeerSearchPressed(int pressed, bool pressedRightButton) {
+	if (_peerSearchPressed != pressed
+		|| (pressed >= 0 && _pressedRightButton != pressedRightButton)) {
+		if (base::in_range(_peerSearchPressed, 0, _peerSearchResults.size())) {
+			_peerSearchResults[_peerSearchPressed]->row.stopLastRipple();
+		}
+		if (_pressedRightButtonData && _pressedRightButtonData->ripple) {
+			_pressedRightButtonData->ripple->lastStop();
+		}
+		_peerSearchPressed = pressed;
+		if (pressed >= 0 || !pressedRightButton) {
+			_pressedRightButton = pressedRightButton;
+			if (pressed >= 0 && pressedRightButton) {
+				const auto &entry = _peerSearchResults[pressed];
+				if (entry->sponsored) {
+					_pressedRightButtonData = &entry->sponsored->button;
+				}
+			}
 		}
 	}
 }
 
-void InnerWidget::setPeerSearchPressed(int pressed) {
-	if (base::in_range(_peerSearchPressed, 0, _peerSearchResults.size())) {
-		_peerSearchResults[_peerSearchPressed]->row.stopLastRipple();
+void InnerWidget::setPreviewPressed(int pressed) {
+	if (base::in_range(_previewPressed, 0, _previewResults.size())) {
+		_previewResults[_previewPressed]->stopLastRipple();
 	}
-	_peerSearchPressed = pressed;
+	_previewPressed = pressed;
 }
 
 void InnerWidget::setSearchedPressed(int pressed) {
@@ -1984,6 +2844,9 @@ void InnerWidget::moveSearchIn() {
 void InnerWidget::dialogRowReplaced(
 		Row *oldRow,
 		Row *newRow) {
+	if (_activeSubItemsRow == oldRow) {
+		_activeSubItemsRow = nullptr;
+	}
 	auto found = false;
 	if (_state == WidgetState::Filtered) {
 		auto top = 0;
@@ -2008,7 +2871,11 @@ void InnerWidget::dialogRowReplaced(
 		_selected = newRow;
 	}
 	if (_pressed == oldRow) {
-		setPressed(newRow, _pressedTopicJump);
+		if (newRow) {
+			setPressed(newRow, _pressedTopicJump, _pressedRightButton);
+		} else {
+			clearPressed();
+		}
 	}
 	if (_dragging == oldRow) {
 		if (newRow) {
@@ -2030,12 +2897,12 @@ void InnerWidget::handleChatListEntryRefreshes() {
 			return false;
 		} else if (const auto topic = event.key.topic()) {
 			return (topic->forum() == _openedForum);
-		} else if (event.key.sublist()) {
-			return _savedSublists;
+		} else if (const auto sublist = event.key.sublist()) {
+			return sublist->parent() == _savedSublists;
 		} else {
 			return !_openedForum;
 		}
-	}) | rpl::start_with_next([=](const Event &event) {
+	}) | rpl::on_next([=](const Event &event) {
 		const auto offset = dialogsOffset();
 		const auto from = offset + event.moved.from;
 		const auto to = offset + event.moved.to;
@@ -2049,7 +2916,7 @@ void InnerWidget::handleChatListEntryRefreshes() {
 			&& (key.topic()
 				? (key.topic()->forum() == _openedForum)
 				: key.sublist()
-				? _savedSublists
+				? (key.sublist()->parent() == _savedSublists)
 				: (entry->folder() == _openedFolder))) {
 			_dialogMoved.fire({ from, to });
 		}
@@ -2254,7 +3121,8 @@ void InnerWidget::enterEventHook(QEnterEvent *e) {
 Row *InnerWidget::shownRowByKey(Key key) {
 	const auto entry = key.entry();
 	if (_savedSublists) {
-		if (!entry->asSublist()) {
+		const auto sublist = entry->asSublist();
+		if (!sublist || sublist->parent() != _savedSublists) {
 			return nullptr;
 		}
 	} else if (_openedForum) {
@@ -2313,6 +3181,8 @@ void InnerWidget::updateSelectedRow(Key key) {
 			}
 		} else if (_peerSearchSelected >= 0) {
 			update(0, peerSearchOffset() + _peerSearchSelected * st::dialogsRowHeight, width(), st::dialogsRowHeight);
+		} else if (_previewSelected >= 0) {
+			update(0, previewOffset() + _previewSelected * _st->height, width(), _st->height);
 		} else if (_searchedSelected >= 0) {
 			update(0, searchedOffset() + _searchedSelected * _st->height, width(), _st->height);
 		}
@@ -2321,26 +3191,32 @@ void InnerWidget::updateSelectedRow(Key key) {
 
 void InnerWidget::refreshShownList() {
 	const auto list = _savedSublists
-		? session().data().savedMessages().chatsList()->indexed()
+		? _savedSublists->chatsList()->indexed()
 		: _openedForum
 		? _openedForum->topicsList()->indexed()
 		: _filterId
 		? session().data().chatsFilters().chatsList(_filterId)->indexed()
 		: session().data().chatsList(_openedFolder)->indexed();
 	if (_shownList != list) {
+		_shownList->unfreeze();
 		_shownList = list;
 		_shownList->updateHeights(_narrowRatio);
+		_activeSubItemsRow = nullptr;
 	}
 }
 
 void InnerWidget::leaveEventHook(QEvent *e) {
 	setMouseTracking(false);
+	unfreezeShownList(false);
 	clearSelection();
+	update();
 }
 
 void InnerWidget::dragLeft() {
 	setMouseTracking(false);
+	unfreezeShownList(false);
 	clearSelection();
+	update();
 }
 
 FilterId InnerWidget::filterId() const {
@@ -2354,9 +3230,12 @@ void InnerWidget::clearSelection() {
 	if (isSelected()) {
 		updateSelectedRow();
 		_collapsedSelected = -1;
+		_selectedMorePosts = false;
+		_selectedChatTypeFilter = false;
 		_selected = nullptr;
 		_filteredSelected
 			= _searchedSelected
+			= _previewSelected
 			= _peerSearchSelected
 			= _hashtagSelected
 			= -1;
@@ -2365,6 +3244,11 @@ void InnerWidget::clearSelection() {
 }
 
 void InnerWidget::fillSupportSearchMenu(not_null<Ui::PopupMenu*> menu) {
+	const auto globalSearch = (_searchState.tab == ChatSearchTab::MyMessages)
+		|| (_searchState.tab == ChatSearchTab::PublicPosts);
+	if (!globalSearch && _searchState.inChat) {
+		return;
+	}
 	const auto all = session().settings().supportAllSearchResults();
 	const auto text = all ? "Only one from chat" : "Show all messages";
 	menu->addAction(text, [=] {
@@ -2375,9 +3259,12 @@ void InnerWidget::fillSupportSearchMenu(not_null<Ui::PopupMenu*> menu) {
 
 void InnerWidget::fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu) {
 	const auto folder = session().data().folderLoaded(Data::Folder::kId);
+	const auto globalSearch = (_searchState.tab == ChatSearchTab::MyMessages)
+		|| (_searchState.tab == ChatSearchTab::PublicPosts);
 	if (!folder
 		|| !folder->chatsList()->fullSize().current()
-		|| _searchState.inChat) {
+		|| (!globalSearch && _searchState.inChat)
+		|| (_searchState.tab == ChatSearchTab::PublicPosts)) {
 		return;
 	}
 	const auto skip = session().settings().skipArchiveInSearch();
@@ -2401,6 +3288,11 @@ bool InnerWidget::showChatPreview() {
 void InnerWidget::chatPreviewShown(bool shown, RowDescriptor row) {
 	_chatPreviewScheduled = false;
 	if (shown) {
+		const auto chosen = computeChosenRow();
+		if (!chosen.sponsoredRandomId.isEmpty() && row.key == chosen.key) {
+			auto &messages = session().sponsoredMessages();
+			messages.clicked(chosen.sponsoredRandomId, false, false);
+		}
 		_chatPreviewRow = row;
 		if (base::take(_chatPreviewTouchGlobal)) {
 			_touchCancelRequests.fire({});
@@ -2433,7 +3325,9 @@ bool InnerWidget::scheduleChatPreview(QPoint positionOverride) {
 void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 	_menu = nullptr;
 
-	if (e->reason() == QContextMenuEvent::Mouse) {
+	const auto fromMouse = e->reason() == QContextMenuEvent::Mouse;
+
+	if (fromMouse) {
 		selectByMouse(e->globalPos());
 	}
 
@@ -2449,6 +3343,11 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 		} else if (_state == WidgetState::Filtered) {
 			if (base::in_range(_filteredSelected, 0, _filterResults.size())) {
 				return { _filterResults[_filteredSelected].key(), FullMsgId() };
+			} else if (base::in_range(_previewSelected, 0, _previewResults.size())) {
+				return {
+					_previewResults[_previewSelected]->item()->history(),
+					_previewResults[_previewSelected]->item()->fullId()
+				};
 			} else if (base::in_range(_searchedSelected, 0, _searchResults.size())) {
 				return {
 					_searchResults[_searchedSelected]->item()->history(),
@@ -2491,6 +3390,9 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 		if (_menuRow.key) {
 			updateDialogRow(base::take(_menuRow));
 		}
+		if (!fromMouse) {
+			return;
+		}
 		const auto globalPosition = QCursor::pos();
 		if (rect().contains(mapFromGlobal(globalPosition))) {
 			setMouseTracking(true);
@@ -2505,6 +3407,71 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 	}
 }
 
+void InnerWidget::showSponsoredMenu(int peerSearchIndex, QPoint globalPos) {
+	_menu = nullptr;
+
+	const auto count = int(_peerSearchResults.size());
+	const auto entry = (peerSearchIndex >= 0 && peerSearchIndex < count)
+		? _peerSearchResults[peerSearchIndex].get()
+		: nullptr;
+	if (!entry || !entry->sponsored) {
+		return;
+	}
+
+	_peerSearchMenu = peerSearchIndex;
+	_menu = base::make_unique_q<Ui::PopupMenu>(
+		this,
+		st::popupMenuExpandedSeparator);
+	const auto peer = entry->peer;
+	const auto remove = crl::guard(this, [=] {
+		_sponsoredRemoved.emplace(peer);
+		if (_pressedRightButtonData) {
+			for (const auto &result : _peerSearchResults) {
+				if (result->peer == peer
+					&& result->sponsored
+					&& _pressedRightButtonData
+						== &result->sponsored->button) {
+					_pressedRightButtonData = nullptr;
+					_pressedRightButton = false;
+					break;
+				}
+			}
+		}
+		_peerSearchResults.erase(
+			ranges::remove(
+				_peerSearchResults,
+				peer,
+				&PeerSearchResult::peer),
+			end(_peerSearchResults));
+		refresh();
+	});
+	Menu::FillSponsored(
+		Ui::Menu::CreateAddActionCallback(_menu),
+		_controller->uiShow(),
+		Menu::SponsoredPhrases::Search,
+		session().sponsoredMessages().lookupDetails(entry->sponsored->data),
+		session().sponsoredMessages().createReportCallback(
+			entry->sponsored->data.randomId,
+			remove));
+	QObject::connect(_menu.get(), &QObject::destroyed, [=] {
+		if (_peerSearchMenu >= 0
+			&& _peerSearchMenu < _peerSearchResults.size()) {
+			const auto index = std::exchange(_peerSearchMenu, -1);
+			updateSearchResult(_peerSearchResults[index]->peer);
+		}
+		const auto globalPosition = QCursor::pos();
+		if (rect().contains(mapFromGlobal(globalPosition))) {
+			setMouseTracking(true);
+			selectByMouse(globalPosition);
+		}
+	});
+	if (_menu->empty()) {
+		_menu = nullptr;
+	} else {
+		_menu->popup(globalPos);
+	}
+}
+
 void InnerWidget::parentGeometryChanged() {
 	const auto globalPosition = QCursor::pos();
 	if (rect().contains(mapFromGlobal(globalPosition))) {
@@ -2539,7 +3506,7 @@ bool InnerWidget::processTouchEvent(not_null<QTouchEvent*> e) {
 		}
 		if (_chatPreviewTouchGlobal) {
 			const auto delta = (*_chatPreviewTouchGlobal - *point);
-			if (delta.manhattanLength() > _st->photoSize) {
+			if (delta.manhattanLength() >= QApplication::startDragDistance()) {
 				cancelChatPreview();
 			}
 		}
@@ -2548,7 +3515,7 @@ bool InnerWidget::processTouchEvent(not_null<QTouchEvent*> e) {
 			return _dragging != nullptr;
 		} else if (_touchDragStartGlobal) {
 			const auto delta = (*_touchDragStartGlobal - *point);
-			if (delta.manhattanLength() > QApplication::startDragDistance()) {
+			if (delta.manhattanLength() >= QApplication::startDragDistance()) {
 				if (_touchDragPinnedTimer.isActive()) {
 					_touchDragPinnedTimer.cancel();
 					_touchDragStartGlobal = {};
@@ -2586,17 +3553,24 @@ void InnerWidget::dragPinnedFromTouch() {
 		return;
 	}
 	_dragStart = mapFromGlobal(global);
+	unfreezeShownList(true);
 	_dragging = _selected;
 	const auto now = mapFromGlobal(_touchDragNowGlobal.value_or(global));
 	startReorderPinned(now);
 	updateReorderPinned(now);
 }
 
+bool InnerWidget::hasChatTypeFilter() const {
+	return !_searchResults.empty()
+		&& (_searchState.tab == ChatSearchTab::MyMessages);
+}
+
 void InnerWidget::searchRequested(bool loading) {
 	_searchWaiting = false;
 	_searchLoading = loading;
 	if (loading) {
 		clearSearchResults(true);
+		clearPreviewResults();
 	}
 	refresh(true);
 }
@@ -2625,13 +3599,13 @@ void InnerWidget::applySearchState(SearchState state) {
 			reactions->myTagsValue(sublist),
 			state.tags);
 
-		_searchTags->repaintRequests() | rpl::start_with_next([=] {
+		_searchTags->repaintRequests() | rpl::on_next([=] {
 			const auto height = _searchTags->height();
 			update(0, 0, width(), height);
 		}, _searchTags->lifetime());
 
 		_searchTags->menuRequests(
-		) | rpl::start_with_next([=](Data::ReactionId id) {
+		) | rpl::on_next([=](Data::ReactionId id) {
 			HistoryView::ShowTagInListMenu(
 				&_menu,
 				_lastMousePosition.value_or(QCursor::pos()),
@@ -2642,9 +3616,12 @@ void InnerWidget::applySearchState(SearchState state) {
 
 		_searchTags->heightValue() | rpl::skip(
 			1
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refresh();
 			moveSearchIn();
+			if (_loadingAnimation) {
+				_loadingAnimation->move(0, searchedOffset());
+			}
 		}, _searchTags->lifetime());
 	} else {
 		_searchTags = nullptr;
@@ -2653,13 +3630,18 @@ void InnerWidget::applySearchState(SearchState state) {
 	_searchFromShown = ignoreInChat
 		? nullptr
 		: sublist
-		? sublist->peer().get()
+		? sublist->sublistPeer().get()
 		: state.fromPeer;
 	if (state.inChat) {
 		onHashtagFilterUpdate(QStringView());
 	}
+	if (state.filter != _searchState.filter) {
+		_chatTypeFilterWidth = 0;
+		update();
+	}
 	_searchState = std::move(state);
 	_searchHashOrCashtag = IsHashOrCashtagSearchQuery(_searchState.query);
+	_searchWithPostsPreview = computeSearchWithPostsPreview();
 
 	updateSearchIn();
 	moveSearchIn();
@@ -2674,7 +3656,8 @@ void InnerWidget::applySearchState(SearchState state) {
 		_filter = newFilter;
 		if (_filter.isEmpty()
 			&& !_searchState.fromPeer
-			&& _searchState.tags.empty()) {
+			&& _searchState.tags.empty()
+			&& _searchState.tab != ChatSearchTab::PublicPosts) {
 			clearFilter();
 		} else {
 			setState(WidgetState::Filtered);
@@ -2689,14 +3672,13 @@ void InnerWidget::applySearchState(SearchState state) {
 					end(results));
 				for (const auto e = end(_filterResults); i != e; ++i) {
 					i->top = top;
-					i->row->recountHeight(_narrowRatio);
+					i->row->recountHeight(_narrowRatio, _filterId);
 					top += i->row->height();
 				}
 			};
 			if (_searchState.filterChatsList() && !words.isEmpty()) {
 				if (_savedSublists) {
-					const auto owner = &session().data();
-					append(owner->savedMessages().chatsList()->indexed());
+					append(_savedSublists->chatsList()->indexed());
 				} else if (_openedForum) {
 					append(_openedForum->topicsList()->indexed());
 				} else {
@@ -2762,45 +3744,69 @@ void InnerWidget::appendToFiltered(Key key) {
 		}
 	}
 	auto row = std::make_unique<Row>(key, 0, 0);
-	row->recountHeight(_narrowRatio);
+	row->recountHeight(_narrowRatio, _filterId);
 	const auto &[i, ok] = _filterResultsGlobal.emplace(key, std::move(row));
 	const auto height = filteredHeight();
 	_filterResults.emplace_back(i->second.get());
 	_filterResults.back().top = height;
-	trackSearchResultsHistory(key.owningHistory());
+	trackResultsHistory(key.owningHistory());
 }
 
 InnerWidget::~InnerWidget() {
+	unfreezeShownList(false);
 	session().data().stories().decrementPreloadingMainSources();
 	clearSearchResults();
 }
 
-void InnerWidget::clearSearchResults(bool clearPeerSearchResults) {
-	if (clearPeerSearchResults) {
-		_peerSearchResults.clear();
+void InnerWidget::clearSearchResults(bool alsoPeerSearchResults) {
+	if (alsoPeerSearchResults) {
+		clearPeerSearchResults();
 	}
 	_searchResults.clear();
-	_searchResultsLifetime.destroy();
-	_searchResultsHistories.clear();
 	_searchedCount = _searchedMigratedCount = 0;
 }
 
-void InnerWidget::trackSearchResultsHistory(not_null<History*> history) {
-	if (!_searchResultsHistories.emplace(history).second) {
+void InnerWidget::clearPeerSearchResults() {
+	if (_pressedRightButtonData) {
+		for (const auto &result : _peerSearchResults) {
+			if (result->sponsored
+				&& _pressedRightButtonData == &result->sponsored->button) {
+				_pressedRightButtonData = nullptr;
+				_pressedRightButton = false;
+				break;
+			}
+		}
+	}
+	_peerSearchResults.clear();
+}
+
+void InnerWidget::clearPreviewResults() {
+	_previewResults.clear();
+	_previewCount = 0;
+}
+
+void InnerWidget::trackResultsHistory(not_null<History*> history) {
+	if (!_trackedHistories.emplace(history).second) {
 		return;
 	}
-	const auto channel = history->peer->asChannel();
-	if (!channel || channel->isBroadcast()) {
+	const auto peer = history->peer;
+	if (!peer->isBot() && !peer->isMegagroup()) {
 		return;
 	}
-	channel->flagsValue(
-	) | rpl::skip(
-		1
-	) | rpl::filter([=](const ChannelData::Flags::Change &change) {
-		return (change.diff & ChannelDataFlag::Forum);
-	}) | rpl::start_with_next([=] {
+	auto changes = peer->isBot()
+		? peer->asBot()->flagsValue() | rpl::skip(
+			1
+		) | rpl::filter([=](const UserData::Flags::Change &change) {
+			return change.diff & UserDataFlag::Forum;
+		}) | rpl::to_empty | rpl::type_erased
+		: peer->asChannel()->flagsValue() | rpl::skip(
+			1
+		) | rpl::filter([=](const ChannelData::Flags::Change &change) {
+			return (change.diff & ChannelDataFlag::Forum);
+		}) | rpl::to_empty | rpl::type_erased;
+	std::move(changes) | rpl::on_next([=] {
 		for (const auto &row : _searchResults) {
-			if (row->item()->history()->peer == channel) {
+			if (row->item()->history()->peer == peer) {
 				row->invalidateTopic();
 			}
 		}
@@ -2808,7 +3814,7 @@ void InnerWidget::trackSearchResultsHistory(not_null<History*> history) {
 		for (auto i = begin(_filterResultsGlobal)
 			; i != end(_filterResultsGlobal);) {
 			if (const auto topic = i->first.topic()) {
-				if (topic->channel() == channel) {
+				if (topic->peer() == peer) {
 					removed = true;
 					_filterResults.erase(
 						ranges::remove(
@@ -2827,11 +3833,11 @@ void InnerWidget::trackSearchResultsHistory(not_null<History*> history) {
 			clearMouseSelection(true);
 		}
 		update();
-	}, _searchResultsLifetime);
+	}, _trackedLifetime);
 
-	if (const auto forum = channel->forum()) {
+	if (const auto forum = peer->forum()) {
 		forum->topicDestroyed(
-		) | rpl::start_with_next([=](not_null<Data::ForumTopic*> topic) {
+		) | rpl::on_next([=](not_null<Data::ForumTopic*> topic) {
 			auto removed = false;
 			const auto sfrom = ranges::remove(
 				_searchResults,
@@ -2857,11 +3863,15 @@ void InnerWidget::trackSearchResultsHistory(not_null<History*> history) {
 			if (_chatPreviewRow.key.topic() == topic) {
 				_chatPreviewRow = {};
 			}
-		}, _searchResultsLifetime);
+		}, _trackedLifetime);
 	}
 }
 
 Data::Thread *InnerWidget::updateFromParentDrag(QPoint globalPosition) {
+	if (!_freezeTimer.isActive()) {
+		_shownList->freeze();
+	}
+	_freezeTimer.callOnce(kFreezeTimeout);
 	selectByMouse(globalPosition);
 
 	const auto fromRow = [](Row *row) {
@@ -2875,6 +3885,13 @@ Data::Thread *InnerWidget::updateFromParentDrag(QPoint globalPosition) {
 		} else if (base::in_range(_peerSearchSelected, 0, _peerSearchResults.size())) {
 			return session().data().history(
 				_peerSearchResults[_peerSearchSelected]->peer);
+		} else if (base::in_range(_previewSelected, 0, _previewResults.size())) {
+			if (const auto item = _previewResults[_previewSelected]->item()) {
+				if (const auto topic = item->topic()) {
+					return topic;
+				}
+				return item->history();
+			}
 		} else if (base::in_range(_searchedSelected, 0, _searchResults.size())) {
 			if (const auto item = _searchResults[_searchedSelected]->item()) {
 				if (const auto topic = item->topic()) {
@@ -2915,6 +3932,11 @@ rpl::producer<ChatSearchTab> InnerWidget::changeSearchTabRequests() const {
 	return _changeSearchTabRequests.events();
 }
 
+auto InnerWidget::changeSearchFilterRequests() const
+-> rpl::producer<ChatTypeFilter>{
+	return _changeSearchFilterRequests.events();
+}
+
 rpl::producer<> InnerWidget::cancelSearchRequests() const {
 	return _cancelSearchRequests.events();
 }
@@ -2987,7 +4009,7 @@ void InnerWidget::itemRemoved(not_null<const HistoryItem*> item) {
 }
 
 bool InnerWidget::uniqueSearchResults() const {
-	return _controller->uniqueChatsInSearchResults();
+	return _controller->uniqueChatsInSearchResults(_searchState);
 }
 
 bool InnerWidget::hasHistoryInResults(not_null<History*> history) const {
@@ -3028,87 +4050,105 @@ void InnerWidget::searchReceived(
 	_searchLoading = false;
 
 	const auto uniquePeers = uniqueSearchResults();
-	if (type == SearchRequestType::FromStart
-		|| type == SearchRequestType::PeerFromStart) {
+	const auto withPreview = _searchWithPostsPreview;
+	const auto toPreview = withPreview && type.posts;
+	if (type.start && !type.migrated && (!withPreview || !type.posts)) {
 		clearSearchResults(false);
 	}
-	const auto isMigratedSearch = (type == SearchRequestType::MigratedFromStart)
-		|| (type == SearchRequestType::MigratedFromOffset);
+	if (!withPreview || toPreview) {
+		clearPreviewResults();
+	}
 
-	const auto key = (!_openedForum || _searchState.inChat.topic())
+	const auto globalSearch = (_searchState.tab == ChatSearchTab::MyMessages)
+		|| (_searchState.tab == ChatSearchTab::PublicPosts);
+	const auto key = globalSearch
+		? Key()
+		: (!_openedForum || _searchState.inChat.topic())
 		? _searchState.inChat
 		: Key(_openedForum->history());
 	if (inject
-		&& (!_searchState.inChat
+		&& (globalSearch
+			|| !_searchState.inChat
 			|| inject->history() == _searchState.inChat.history())) {
 		Assert(_searchResults.empty());
+		Assert(!toPreview);
 		const auto index = int(_searchResults.size());
 		_searchResults.push_back(
 			std::make_unique<FakeRow>(
 				key,
 				inject,
 				[=] { repaintSearchResult(index); }));
-		trackSearchResultsHistory(inject->history());
+		trackResultsHistory(inject->history());
 		++fullCount;
 	}
+	auto &results = toPreview ? _previewResults : _searchResults;
 	for (const auto &item : messages) {
 		const auto history = item->history();
-		if (!uniquePeers || !hasHistoryInResults(history)) {
-			const auto index = int(_searchResults.size());
-			_searchResults.push_back(
-				std::make_unique<FakeRow>(
-					key,
-					item,
-					[=] { repaintSearchResult(index); }));
-			trackSearchResultsHistory(history);
-			if (uniquePeers && !history->unreadCountKnown()) {
+		if (toPreview || !uniquePeers || !hasHistoryInResults(history)) {
+			const auto index = int(results.size());
+			const auto repaint = toPreview
+				? Fn<void()>([=] { repaintSearchResult(index); })
+				: [=] { repaintPreviewResult(index); };
+			results.push_back(
+				std::make_unique<FakeRow>(key, item, repaint));
+			trackResultsHistory(history);
+			if (!toPreview && uniquePeers && !history->unreadCountKnown()) {
 				history->owner().histories().requestDialogEntry(history);
+			} else if (toPreview && results.size() >= kPreviewPostsLimit) {
+				break;
 			}
 		}
 	}
-	if (isMigratedSearch) {
+	if (type.migrated) {
 		_searchedMigratedCount = fullCount;
-	} else {
+	} else if (!withPreview || !toPreview) {
 		_searchedCount = fullCount;
+	} else {
+		_previewCount = fullCount;
 	}
 
 	refresh();
 }
 
-void InnerWidget::peerSearchReceived(
-		const QString &query,
-		const QVector<MTPPeer> &my,
-		const QVector<MTPPeer> &result) {
+void InnerWidget::peerSearchReceived(Api::PeerSearchResult result) {
 	if (_state != WidgetState::Filtered) {
 		return;
 	}
 
-	_peerSearchQuery = query.toLower().trimmed();
-	_peerSearchResults.clear();
-	_peerSearchResults.reserve(result.size());
-	for	(const auto &mtpPeer : my) {
-		if (const auto peer = session().data().peerLoaded(peerFromMTP(mtpPeer))) {
-			appendToFiltered(peer->owner().history(peer));
-		} else {
-			LOG(("API Error: "
-				"user %1 was not loaded in InnerWidget::peopleReceived()"
-				).arg(peerFromMTP(mtpPeer).value));
+	_peerSearchQuery = result.query.toLower().trimmed();
+	clearPeerSearchResults();
+	_peerSearchResults.reserve(result.peers.size()
+		+ result.sponsored.size());
+	for	(const auto &peer : result.my) {
+		appendToFiltered(peer->owner().history(peer));
+	}
+	const auto inlist = [&](not_null<PeerData*> peer) {
+		if (const auto history = peer->owner().historyLoaded(peer)) {
+			// Skip existing chats.
+			return history->inChatList();
 		}
+		return false;
+	};
+	auto added = base::flat_set<not_null<PeerData*>>();
+	for (const auto &sponsored : result.sponsored) {
+		const auto peer = sponsored.peer;
+		if (inlist(peer) || _sponsoredRemoved.contains(peer)) {
+			continue;
+		}
+		_peerSearchResults.push_back(
+			std::make_unique<PeerSearchResult>(peer));
+		_peerSearchResults.back()->sponsored
+			= std::make_unique<SponsoredSearchResult>(SponsoredSearchResult{
+				.data = sponsored,
+			});
+		added.emplace(peer);
 	}
-	for (const auto &mtpPeer : result) {
-		if (const auto peer = session().data().peerLoaded(peerFromMTP(mtpPeer))) {
-			if (const auto history = peer->owner().historyLoaded(peer)) {
-				if (history->inChatList()) {
-					continue; // skip existing chats
-				}
-			}
-			_peerSearchResults.push_back(std::make_unique<PeerSearchResult>(
-				peer));
-		} else {
-			LOG(("API Error: "
-				"user %1 was not loaded in InnerWidget::peopleReceived()"
-				).arg(peerFromMTP(mtpPeer).value));
+	for (const auto &peer : result.peers) {
+		if (added.contains(peer) || inlist(peer)) {
+			continue;
 		}
+		_peerSearchResults.push_back(
+			std::make_unique<PeerSearchResult>(peer));
 	}
 	refresh();
 }
@@ -3145,6 +4185,7 @@ void InnerWidget::editOpenedFilter() {
 }
 
 void InnerWidget::refresh(bool toTop) {
+	_activeSubItemsRow = nullptr;
 	if (!_geometryInited) {
 		return;
 	} else if (needCollapsedRowsRefresh()) {
@@ -3195,7 +4236,9 @@ void InnerWidget::refreshEmpty() {
 			}
 		} else if (_searchEmptyState != _searchState) {
 			_searchEmptyState = _searchState;
-			_searchEmpty = MakeSearchEmpty(this, _searchState);
+			_searchEmpty = MakeSearchEmpty(this, _searchState, [=] {
+				_changeSearchFilterRequests.fire(ChatTypeFilter::All);
+			});
 			if (_controller->session().data().chatsListLoaded()) {
 				_searchEmpty->animate();
 			}
@@ -3224,7 +4267,7 @@ void InnerWidget::refreshEmpty() {
 	const auto state = !_shownList->empty()
 		? EmptyState::None
 		: _savedSublists
-		? (data->savedMessages().chatsList()->loaded()
+		? (_savedSublists->chatsList()->loaded()
 			? EmptyState::EmptySavedSublists
 			: EmptyState::Loading)
 		: _openedForum
@@ -3239,9 +4282,20 @@ void InnerWidget::refreshEmpty() {
 	if (state == EmptyState::None) {
 		_emptyState = state;
 		_empty.destroy();
+		_emptyList.destroy();
+		_emptyButton.destroy();
 		return;
 	} else if (_emptyState == state) {
-		_empty->setVisible(_state == WidgetState::Default);
+		const auto isEmptyVisible = (_state == WidgetState::Default)
+			&& !_openedFolder;
+		_empty->setVisible(isEmptyVisible);
+		if (_emptyList) {
+			_emptyList->setVisible(isEmptyVisible);
+			_empty->setVisible(false);
+		}
+		if (_emptyButton) {
+			_emptyButton->setVisible(isEmptyVisible);
+		}
 		return;
 	}
 	_emptyState = state;
@@ -3265,14 +4319,13 @@ void InnerWidget::refreshEmpty() {
 		std::move(phrase),
 		std::move(link)
 	) | rpl::map([](const QString &phrase, const QString &link) {
-		auto result = Ui::Text::WithEntities(phrase);
+		auto result = tr::marked(phrase);
 		if (!link.isEmpty()) {
-			result.append("\n\n").append(Ui::Text::Link(link));
+			result.append("\n\n").append(tr::link(link));
 		}
 		return result;
 	});
 	_empty.create(this, std::move(full), st::dialogsEmptyLabel);
-	resizeEmpty();
 	_empty->overrideLinkClickHandler([=] {
 		if (_emptyState == EmptyState::NoContacts) {
 			_controller->showAddContact();
@@ -3284,6 +4337,64 @@ void InnerWidget::refreshEmpty() {
 		}
 	});
 	_empty->setVisible(_state == WidgetState::Default);
+
+	if (state == EmptyState::NoContacts) {
+		const auto isListVisible = (_state == WidgetState::Default)
+			&& !_openedFolder;
+		if (_openedFolder) {
+			crl::on_main(this, [=] {
+				if (_openedFolder) {
+					_controller->closeFolder();
+				}
+			});
+		}
+		_emptyList.create(this);
+		_emptyList->setVisible(isListVisible);
+
+		auto icon = ::Settings::CreateLottieIcon(
+			_emptyList,
+			{
+				.name = u"no_chats"_q,
+				.sizeOverride = st::normalBoxLottieSize,
+			});
+		_emptyList->add(std::move(icon.widget), style::al_top);
+		Ui::AddSkip(_emptyList);
+		_emptyList->add(
+			object_ptr<Ui::FlatLabel>(
+				_emptyList,
+				tr::lng_no_conversations(),
+				st::dialogEmptyButtonLabel),
+			style::al_top);
+		if (_state == WidgetState::Default) {
+			icon.animate(anim::repeat::once);
+		}
+		_emptyButton.create(
+			this,
+			tr::lng_no_conversations_button(),
+			st::dialogEmptyButton);
+		_emptyButton->setVisible(isListVisible);
+		_emptyButton->setClickedCallback([=, window = _controller] {
+			window->show(PrepareContactsBox(window));
+		});
+		geometryValue() | rpl::on_next([=](const QRect &r) {
+			const auto top = r.height()
+				- _emptyButton->height()
+				- st::dialogEmptyButtonSkip;
+			_emptyButton->moveToLeft(st::dialogEmptyButtonSkip, top);
+		}, _emptyButton->lifetime());
+		geometryValue() | rpl::on_next([=](const QRect &r) {
+			const auto bottom = _emptyButton
+				? (_emptyButton->height() + st::dialogEmptyButtonSkip)
+				: 0;
+			_emptyList->moveToLeft(
+				0,
+				((r.height() - bottom) - _emptyList->height()) / 2);
+		}, _emptyList->lifetime());
+
+		_empty->setVisible(!_emptyList->isVisible());
+	}
+
+	resizeEmpty();
 }
 
 void InnerWidget::resizeEmpty() {
@@ -3292,6 +4403,13 @@ void InnerWidget::resizeEmpty() {
 		_empty->resizeToWidth(width() - 2 * skip);
 		_empty->move(skip, (st::dialogsEmptyHeight - _empty->height()) / 2);
 	}
+	if (_emptyList) {
+		_emptyList->resizeToWidth(width());
+	}
+	if (_emptyButton) {
+		const auto skip = st::dialogEmptyButtonSkip;
+		_emptyButton->resizeToWidth(width() - 2 * skip);
+	}
 	if (_searchEmpty) {
 		_searchEmpty->resizeToWidth(width());
 		_searchEmpty->move(0, searchedOffset());
@@ -3313,6 +4431,7 @@ void InnerWidget::clearMouseSelection(bool clearSelection) {
 		} else if (_state == WidgetState::Filtered) {
 			_filteredSelected
 				= _peerSearchSelected
+				= _previewSelected
 				= _searchedSelected
 				= _hashtagSelected = -1;
 		}
@@ -3362,14 +4481,22 @@ void InnerWidget::updateSearchIn() {
 	const auto peer = _searchState.inChat.owningHistory()
 		? _searchState.inChat.owningHistory()->peer.get()
 		: _openedForum
-		? _openedForum->channel().get()
+		? _openedForum->peer().get()
 		: nullptr;
+	const auto paused = [window = _controller] {
+		return window->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
+	};
+	const auto textFg = [] {
+		return st::windowSubTextFg->c;
+	};
 	const auto topicIcon = !topic
 		? nullptr
 		: topic->iconId()
 		? Ui::MakeEmojiThumbnail(
 			&topic->owner(),
-			Data::SerializeCustomEmojiId(topic->iconId()))
+			Data::SerializeCustomEmojiId(topic->iconId()),
+			paused,
+			textFg)
 		: Ui::MakeEmojiThumbnail(
 			&topic->owner(),
 			Data::TopicIconEmojiEntity({
@@ -3379,11 +4506,13 @@ void InnerWidget::updateSearchIn() {
 				.colorId = (topic->isGeneral()
 					? Data::ForumGeneralIconColor(st::windowSubTextFg->c)
 					: topic->colorId()),
-			}));
+			}),
+			paused,
+			textFg);
 	const auto peerIcon = peer
 		? Ui::MakeUserpicThumbnail(peer)
 		: sublist
-		? Ui::MakeUserpicThumbnail(sublist->peer())
+		? Ui::MakeUserpicThumbnail(sublist->sublistPeer())
 		: nullptr;
 	const auto myIcon = Ui::MakeIconThumbnail(st::menuIconChats);
 	const auto publicIcon = (_searchHashOrCashtag != HashOrCashtag::None)
@@ -3416,6 +4545,20 @@ void InnerWidget::repaintSearchResult(int index) {
 		_st->height);
 }
 
+void InnerWidget::repaintPreviewResult(int index) {
+	rtlupdate(
+		0,
+		previewOffset() + index * _st->height,
+		width(),
+		_st->height);
+}
+
+bool InnerWidget::computeSearchWithPostsPreview() const {
+	return 	(_searchHashOrCashtag != HashOrCashtag::None)
+		&& (_searchState.tab == ChatSearchTab::MyMessages)
+		&& !_searchState.inChat;
+}
+
 void InnerWidget::clearFilter() {
 	if (_state == WidgetState::Filtered || _searchState.inChat) {
 		if (_searchState.inChat) {
@@ -3426,8 +4569,11 @@ void InnerWidget::clearFilter() {
 		_hashtagResults.clear();
 		_filterResults.clear();
 		_filterResultsGlobal.clear();
-		_peerSearchResults.clear();
+		clearPeerSearchResults();
 		_searchResults.clear();
+		_previewResults.clear();
+		_trackedHistories.clear();
+		_trackedLifetime.destroy();
 		_filter = QString();
 		refresh(true);
 	}
@@ -3474,15 +4620,22 @@ void InnerWidget::selectSkip(int32 direction) {
 		}
 		scrollToDefaultSelected();
 	} else if (_state == WidgetState::Filtered) {
-		if (_hashtagResults.empty() && _filterResults.empty() && _peerSearchResults.empty() && _searchResults.empty()) {
+		if (_hashtagResults.empty()
+			&& _filterResults.empty()
+			&& _peerSearchResults.empty()
+			&& _previewResults.empty()
+			&& _searchResults.empty()) {
 			return;
 		}
-		if ((_hashtagSelected < 0 || _hashtagSelected >= _hashtagResults.size()) &&
-			(_filteredSelected < 0 || _filteredSelected >= _filterResults.size()) &&
-			(_peerSearchSelected < 0 || _peerSearchSelected >= _peerSearchResults.size()) &&
-			(_searchedSelected < 0 || _searchedSelected >= _searchResults.size())) {
-			if (_hashtagResults.empty() && _filterResults.empty() && _peerSearchResults.empty()) {
+		if ((_hashtagSelected < 0 || _hashtagSelected >= _hashtagResults.size())
+			&& (_filteredSelected < 0 || _filteredSelected >= _filterResults.size())
+			&& (_peerSearchSelected < 0 || _peerSearchSelected >= _peerSearchResults.size())
+			&& (_previewSelected < 0 || _previewSelected >= _previewResults.size())
+			&& (_searchedSelected < 0 || _searchedSelected >= _searchResults.size())) {
+			if (_hashtagResults.empty() && _filterResults.empty() && _peerSearchResults.empty() && _previewResults.empty()) {
 				_searchedSelected = 0;
+			} else if (_hashtagResults.empty() && _filterResults.empty() && _peerSearchResults.empty()) {
+				_previewSelected = 0;
 			} else if (_hashtagResults.empty() && _filterResults.empty()) {
 				_peerSearchSelected = 0;
 			} else if (_hashtagResults.empty()) {
@@ -3493,30 +4646,36 @@ void InnerWidget::selectSkip(int32 direction) {
 		} else {
 			int32 cur = base::in_range(_hashtagSelected, 0, _hashtagResults.size())
 				? _hashtagSelected
-				: (base::in_range(_filteredSelected, 0, _filterResults.size())
-					? (_hashtagResults.size() + _filteredSelected)
-					: (base::in_range(_peerSearchSelected, 0, _peerSearchResults.size())
-						? (_peerSearchSelected + _filterResults.size() + _hashtagResults.size())
-						: (_searchedSelected + _peerSearchResults.size() + _filterResults.size() + _hashtagResults.size())));
+				: base::in_range(_filteredSelected, 0, _filterResults.size())
+				? (_hashtagResults.size() + _filteredSelected)
+				: base::in_range(_peerSearchSelected, 0, _peerSearchResults.size())
+				? (_peerSearchSelected + _filterResults.size() + _hashtagResults.size())
+				: base::in_range(_previewSelected, 0, _previewResults.size())
+				? (_previewSelected + _peerSearchResults.size() + _filterResults.size() + _hashtagResults.size())
+				: (_searchedSelected + _previewResults.size() + _peerSearchResults.size() + _filterResults.size() + _hashtagResults.size());
 			cur = std::clamp(
 				cur + direction,
 				0,
 				static_cast<int>(_hashtagResults.size()
 					+ _filterResults.size()
 					+ _peerSearchResults.size()
+					+ _previewResults.size()
 					+ _searchResults.size()) - 1);
 			if (cur < _hashtagResults.size()) {
 				_hashtagSelected = cur;
-				_filteredSelected = _peerSearchSelected = _searchedSelected = -1;
+				_filteredSelected = _peerSearchSelected = _previewSelected = _searchedSelected = -1;
 			} else if (cur < _hashtagResults.size() + _filterResults.size()) {
 				_filteredSelected = cur - _hashtagResults.size();
-				_hashtagSelected = _peerSearchSelected = _searchedSelected = -1;
+				_hashtagSelected = _peerSearchSelected = _previewSelected = _searchedSelected = -1;
 			} else if (cur < _hashtagResults.size() + _filterResults.size() + _peerSearchResults.size()) {
 				_peerSearchSelected = cur - _hashtagResults.size() - _filterResults.size();
-				_hashtagSelected = _filteredSelected = _searchedSelected = -1;
+				_hashtagSelected = _filteredSelected = _previewSelected = _searchedSelected = -1;
+			} else if (cur < _hashtagResults.size() + _filterResults.size() + _peerSearchResults.size() + _previewResults.size()) {
+				_previewSelected = cur - _hashtagResults.size() - _filterResults.size() - _peerSearchResults.size();
+				_hashtagSelected = _filteredSelected = _peerSearchSelected = _searchedSelected = -1;
 			} else {
-				_hashtagSelected = _filteredSelected = _peerSearchSelected = -1;
-				_searchedSelected = cur - _hashtagResults.size() - _filterResults.size() - _peerSearchResults.size();
+				_searchedSelected = cur - _hashtagResults.size() - _filterResults.size() - _peerSearchResults.size() - _previewResults.size();
+				_hashtagSelected = _filteredSelected = _peerSearchSelected = _previewSelected = -1;
 			}
 		}
 		if (base::in_range(_hashtagSelected, 0, _hashtagResults.size())) {
@@ -3533,6 +4692,13 @@ void InnerWidget::selectSkip(int32 direction) {
 			const auto height = st::dialogsRowHeight
 				+ (_peerSearchSelected ? 0 : st::searchedBarHeight);
 			scrollToItem(from, height);
+		} else if (base::in_range(_previewSelected, 0, _previewResults.size())) {
+			const auto from = previewOffset()
+				+ _previewSelected * _st->height
+				+ (_previewSelected ? 0 : -st::searchedBarHeight);
+			const auto height = _st->height
+				+ (_previewSelected ? 0 : st::searchedBarHeight);
+			scrollToItem(from, height);
 		} else {
 			const auto from = searchedOffset()
 				+ _searchedSelected * _st->height
@@ -3551,7 +4717,14 @@ void InnerWidget::scrollToEntry(const RowDescriptor &entry) {
 			scrollToItem(dialogsOffset() + row->top(), row->height());
 		}
 	} else if (_state == WidgetState::Filtered) {
-		for (int32 i = 0, c = _searchResults.size(); i < c; ++i) {
+		for (auto i = 0, c = int(_previewResults.size()); i != c; ++i) {
+			if (isSearchResultActive(_previewResults[i].get(), entry)) {
+				const auto from = previewOffset() + i * _st->height;
+				scrollToItem(from, _st->height);
+				return;
+			}
+		}
+		for (auto i = 0, c = int(_searchResults.size()); i != c; ++i) {
 			if (isSearchResultActive(_searchResults[i].get(), entry)) {
 				const auto from = searchedOffset() + i * _st->height;
 				scrollToItem(from, _st->height);
@@ -3646,33 +4819,45 @@ void InnerWidget::preloadRowsData() {
 		}
 		yTo -= otherStart;
 	} else if (_state == WidgetState::Filtered) {
-		int32 from = (yFrom - filteredOffset()) / _st->height;
+		auto from = (yFrom - filteredOffset()) / _st->height;
 		if (from < 0) from = 0;
 		if (from < _filterResults.size()) {
-			int32 to = (yTo / _st->height) + 1;
-			if (to > _filterResults.size()) to = _filterResults.size();
-
+			const auto to = std::min(
+				((yTo - filteredOffset()) / _st->height) + 1,
+				int(_filterResults.size()));
 			for (; from < to; ++from) {
 				_filterResults[from].key().entry()->chatListPreloadData();
 			}
 		}
 
-		from = (yFrom > filteredOffset() + st::searchedBarHeight ? ((yFrom - filteredOffset() - st::searchedBarHeight) / st::dialogsRowHeight) : 0) - _filterResults.size();
+		from = (yFrom - peerSearchOffset()) / st::dialogsRowHeight;
 		if (from < 0) from = 0;
 		if (from < _peerSearchResults.size()) {
-			int32 to = (yTo > filteredOffset() + st::searchedBarHeight ? ((yTo - filteredOffset() - st::searchedBarHeight) / st::dialogsRowHeight) : 0) - _filterResults.size() + 1;
-			if (to > _peerSearchResults.size()) to = _peerSearchResults.size();
-
+			const auto to = std::min(
+				((yTo - peerSearchOffset()) / st::dialogsRowHeight) + 1,
+				int(_peerSearchResults.size()));
 			for (; from < to; ++from) {
 				_peerSearchResults[from]->peer->loadUserpic();
 			}
 		}
-		from = (yFrom > filteredOffset() + ((_peerSearchResults.empty() ? 0 : st::searchedBarHeight) + st::searchedBarHeight) ? ((yFrom - filteredOffset() - (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) - st::searchedBarHeight) / st::dialogsRowHeight) : 0) - _filterResults.size() - _peerSearchResults.size();
+
+		from = (yFrom - previewOffset()) / _st->height;
 		if (from < 0) from = 0;
-		if (from < _searchResults.size()) {
-			int32 to = (yTo > filteredOffset() + (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) + st::searchedBarHeight ? ((yTo - filteredOffset() - (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) - st::searchedBarHeight) / st::dialogsRowHeight) : 0) - _filterResults.size() - _peerSearchResults.size() + 1;
-			if (to > _searchResults.size()) to = _searchResults.size();
+		if (from < _previewResults.size()) {
+			const auto to = std::min(
+				((yTo - previewOffset()) / _st->height) + 1,
+				int(_previewResults.size()));
+			for (; from < to; ++from) {
+				_previewResults[from]->item()->history()->peer->loadUserpic();
+			}
+		}
 
+		from = (yFrom - searchedOffset()) / _st->height;
+		if (from < 0) from = 0;
+		if (from < _searchResults.size()) {
+			const auto to = std::min(
+				((yTo - searchedOffset()) / _st->height) + 1,
+				int(_searchResults.size()));
 			for (; from < to; ++from) {
 				_searchResults[from]->item()->history()->peer->loadUserpic();
 			}
@@ -3746,6 +4931,48 @@ void InnerWidget::restoreChatsFilterScrollState(FilterId filterId) {
 	}
 }
 
+QImage *InnerWidget::cacheChatsFilterTag(
+		const Data::ChatFilter &filter,
+		uint8 more,
+		bool active) {
+	if (!filter.id() && !more) {
+		return nullptr;
+	}
+	const auto key = SerializeFilterTagsKey(filter.id(), more, active);
+	auto &entry = _chatsFilterTags[key];
+	if (!entry.frame.isNull()) {
+		if (!entry.context.loading) {
+			return &entry.frame;
+		}
+		for (const auto &[k, emoji] : entry.context.emoji) {
+			if (!emoji->ready()) {
+				return &entry.frame; // Still waiting for emoji.
+			}
+		}
+	}
+	auto roundedText = TextWithEntities();
+	auto colorIndex = -1;
+	if (filter.id()) {
+		roundedText = filter.title().text;
+		roundedText.text = roundedText.text.toUpper();
+		if (filter.colorIndex()) {
+			colorIndex = *(filter.colorIndex());
+		}
+	} else if (more > 0) {
+		roundedText.text = QChar('+') + QString::number(more);
+		colorIndex = st::colorIndexBlue;
+	}
+	if (roundedText.empty() || colorIndex < 0) {
+		return nullptr;
+	}
+	const auto color = Ui::EmptyUserpic::UserpicColor(colorIndex).color2;
+	entry.context.color = color->c;
+	entry.context.active = active;
+	entry.context.textContext = Core::TextContext({ .session = &session() });
+	entry.frame = Ui::ChatsFilterTag(roundedText, entry.context);
+	return &entry.frame;
+}
+
 bool InnerWidget::chooseHashtag() {
 	if (_state != WidgetState::Filtered) {
 		return false;
@@ -3798,10 +5025,21 @@ ChosenRow InnerWidget::computeChosenRow() const {
 				.filteredRow = true,
 			};
 		} else if (base::in_range(_peerSearchSelected, 0, _peerSearchResults.size())) {
-			const auto peer = _peerSearchResults[_peerSearchSelected]->peer;
+			const auto row = _peerSearchResults[_peerSearchSelected].get();
 			return {
-				.key = session().data().history(peer),
-				.message = Data::UnreadMessagePosition
+				.key = session().data().history(row->peer),
+				.message = Data::UnreadMessagePosition,
+				.sponsoredRandomId = (row->sponsored
+					? row->sponsored->data.randomId
+					: QByteArray()),
+			};
+		} else if (base::in_range(_previewSelected, 0, _previewResults.size())) {
+			const auto result = _previewResults[_previewSelected].get();
+			const auto topic = result->topic();
+			const auto item = result->item();
+			return {
+				.key = (topic ? (Entry*)topic : (Entry*)item->history()),
+				.message = item->position()
 			};
 		} else if (base::in_range(_searchedSelected, 0, _searchResults.size())) {
 			const auto result = _searchResults[_searchedSelected].get();
@@ -3817,7 +5055,7 @@ ChosenRow InnerWidget::computeChosenRow() const {
 }
 
 bool InnerWidget::isUserpicPress() const {
-	return  (_lastRowLocalMouseX >= 0)
+	return (_lastRowLocalMouseX >= 0)
 		&& (_lastRowLocalMouseX < _st->nameLeft)
 		&& (_collapsedSelected < 0
 			|| _collapsedSelected >= _collapsedRows.size());
@@ -3829,9 +5067,33 @@ bool InnerWidget::isUserpicPressOnWide() const {
 
 bool InnerWidget::chooseRow(
 		Qt::KeyboardModifiers modifiers,
-		MsgId pressedTopicRootId) {
+		MsgId pressedTopicRootId,
+		PeerId pressedSublistPeerId) {
 	if (chooseHashtag()) {
 		return true;
+	} else if (_selectedMorePosts) {
+		if (_searchHashOrCashtag != HashOrCashtag::None) {
+			_changeSearchTabRequests.fire(ChatSearchTab::PublicPosts);
+		}
+		return true;
+	} else if (_selectedChatTypeFilter) {
+		_menu = base::make_unique_q<Ui::PopupMenu>(
+			this,
+			st::popupMenuWithIcons);
+		for (const auto tab : {
+			ChatTypeFilter::All,
+			ChatTypeFilter::Private,
+			ChatTypeFilter::Groups,
+			ChatTypeFilter::Channels,
+		}) {
+			_menu->addAction(ChatTypeFilterLabel(tab), [=] {
+				_changeSearchFilterRequests.fire_copy(tab);
+			}, (tab == _searchState.filter)
+				? &st::mediaPlayerMenuCheck
+				: nullptr);
+		}
+		_menu->popup(QCursor::pos());
+		return true;
 	}
 	const auto modifyChosenRow = [&](
 			ChosenRow row,
@@ -3847,13 +5109,10 @@ bool InnerWidget::chooseRow(
 		}
 		if (!chosen.message.fullId) {
 			if (const auto history = chosen.key.history()) {
-				if (const auto forum = history->peer->forum()) {
-					if (pressedTopicRootId) {
-						chosen.message.fullId = {
-							history->peer->id,
-							pressedTopicRootId,
-						};
-					}
+				if (history->peer->forum()) {
+					chosen.topicJumpRootId = pressedTopicRootId;
+				} else if (history->peer->amMonoforumAdmin()) {
+					chosen.sublistJumpPeerId = pressedSublistPeerId;
 				}
 			}
 		}
@@ -4066,7 +5325,7 @@ void InnerWidget::setupOnlineStatusCheck() {
 		Data::PeerUpdate::Flag::OnlineStatus
 		| Data::PeerUpdate::Flag::GroupCall
 		| Data::PeerUpdate::Flag::MessagesTTL
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto &peer = update.peer;
 		if (const auto user = peer->asUser()) {
 			if (user->isSelf()) {
@@ -4178,7 +5437,7 @@ void InnerWidget::setupShortcuts() {
 			&& !_controller->window().locked()
 			&& !_childListShown.current().shown
 			&& !_chatPreviewRow.key;
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 
 		const auto row = _controller->activeChatEntryCurrent();
@@ -4295,33 +5554,14 @@ void InnerWidget::setupShortcuts() {
 			});
 		}
 
-		const auto nearFolder = [=](bool isNext) {
-			const auto id = _controller->activeChatsFilterCurrent();
-			const auto list = &session().data().chatsFilters().list();
-			const auto index = int(ranges::find(
-				*list,
-				id,
-				&Data::ChatFilter::id
-			) - begin(*list));
-			if (index == list->size() && id != 0) {
-				return false;
-			}
-			const auto changed = index + (isNext ? 1 : -1);
-			if (changed >= int(list->size()) || changed < 0) {
-				return false;
-			}
-			_controller->setActiveChatsFilter((changed >= 0)
-				? (*list)[changed].id()
-				: 0);
-			return true;
-		};
-
 		request->check(Command::FolderNext) && request->handle([=] {
-			return nearFolder(true);
+			using namespace Window;
+			return CheckAndJumpToNearChatsFilter(_controller, true, true);
 		});
 
 		request->check(Command::FolderPrevious) && request->handle([=] {
-			return nearFolder(false);
+			using namespace Window;
+			return CheckAndJumpToNearChatsFilter(_controller, false, true);
 		});
 
 		request->check(Command::ReadChat) && request->handle([=] {
@@ -4409,4 +5649,529 @@ bool InnerWidget::jumpToDialogRow(RowDescriptor to) {
 	return _controller->jumpToChatListEntry(to);
 }
 
+rpl::producer<UserId> InnerWidget::openBotMainAppRequests() const {
+	return _openBotMainAppRequests.events();
+}
+
+void InnerWidget::setSwipeContextData(
+		int64 key,
+		std::optional<Ui::Controls::SwipeContextData> data) {
+	if (!key) {
+		return;
+	}
+	if (!data) {
+		_activeQuickAction = nullptr;
+		return;
+	}
+	const auto context = ensureQuickAction(key);
+
+	context->data = base::take(*data);
+	if (context->data.msgBareId) {
+		constexpr auto kStartAnimateThreshold = 0.32;
+		constexpr auto kResetAnimateThreshold = 0.24;
+		if (context->data.ratio > kStartAnimateThreshold) {
+			if (context->icon
+				&& !context->icon->frameIndex()
+				&& !context->icon->animating()) {
+				context->icon->animate(
+					[=] { update(); },
+					0,
+					context->icon->framesCount());
+			}
+		} else if (context->data.ratio < kResetAnimateThreshold) {
+			if (context->icon
+				&& context->icon->frameIndex()) {
+				context->icon->jumpTo(0, [=] { update(); });
+			}
+		}
+		update();
+	}
+}
+
+not_null<Ui::QuickActionContext*> InnerWidget::ensureQuickAction(int64 key) {
+	Expects(key != 0);
+
+	if (_activeQuickAction) {
+		if (_activeQuickAction->data.msgBareId == key) {
+			return _activeQuickAction.get();
+		} else {
+			deactivateQuickAction();
+		}
+	}
+	_activeQuickAction = std::make_unique<Ui::QuickActionContext>();
+	_activeQuickAction->data.msgBareId = key;
+	return _activeQuickAction.get();
+}
+
+int64 InnerWidget::calcSwipeKey(int top) {
+	top -= dialogsOffset();
+	if (top < 0) {
+		return 0;
+	}
+	for (auto it = _shownList->begin(); it != _shownList->end(); ++it) {
+		const auto row = it->get();
+		const auto from = row->top();
+		const auto to = from + row->height();
+		if (top >= from && top < to) {
+			if (const auto peer = row->key().peer()) {
+				return peer->id.value;
+			}
+			return 0;
+		}
+	}
+	return 0;
+}
+
+void InnerWidget::prepareQuickAction(
+		int64 key,
+		Dialogs::Ui::QuickDialogAction action) {
+	Expects(key != 0);
+
+	const auto context = ensureQuickAction(key);
+	auto name = ResolveQuickDialogLottieIconName(
+		ResolveQuickDialogLabel(
+			session().data().history(PeerId(key)),
+			action,
+			_filterId));
+	context->icon = Lottie::MakeIcon({
+		.name = std::move(name),
+		.sizeOverride = Size(st::dialogsQuickActionSize),
+	});
+	context->action = action;
+}
+
+void InnerWidget::clearQuickActions() {
+	_inactiveQuickActions.clear();
+}
+
+void InnerWidget::deactivateQuickAction() {
+	if (_activeQuickAction) {
+		_activeQuickAction->finishedAt = crl::now();
+		_inactiveQuickActions.push_back(
+			QuickActionPtr{ _activeQuickAction.release() });
+	}
+}
+
+void InnerWidget::focusInEvent(QFocusEvent *e) {
+	RpWidget::focusInEvent(e);
+
+	if (_state == WidgetState::Default) {
+		if (!_selected && !_shownList->empty()) {
+			_selected = _shownList->cbegin()->get();
+		}
+	} else if (_state == WidgetState::Filtered) {
+		const auto noneSelected
+			= !base::in_range(
+				_hashtagSelected, 0, int(_hashtagResults.size()))
+			&& !base::in_range(
+				_filteredSelected, 0, int(_filterResults.size()))
+			&& !base::in_range(
+				_peerSearchSelected, 0, int(_peerSearchResults.size()))
+			&& !base::in_range(
+				_previewSelected, 0, int(_previewResults.size()))
+			&& !base::in_range(
+				_searchedSelected, 0, int(_searchResults.size()));
+		if (noneSelected && filteredChildCount() > 0) {
+			selectSkip(1);
+		}
+	}
+	InvokeQueued(this, [=] {
+		if (hasFocus()) {
+			announceSelectedFocus();
+		}
+	});
+}
+
+bool InnerWidget::processKeyDispatch(QKeyEvent *e) {
+	struct Snapshot {
+		Row *selected = nullptr;
+		int hashtag = -1;
+		int filtered = -1;
+		int peerSearch = -1;
+		int preview = -1;
+		int searched = -1;
+	};
+	const auto snap = Snapshot{
+		_selected,
+		_hashtagSelected,
+		_filteredSelected,
+		_peerSearchSelected,
+		_previewSelected,
+		_searchedSelected,
+	};
+	if (e->key() == Qt::Key_Up) {
+		selectSkip(-1);
+	} else if (e->key() == Qt::Key_Down) {
+		selectSkip(1);
+	} else if (e->key() == Qt::Key_PageUp) {
+		selectSkipPage(_visibleBottom - _visibleTop, -1);
+	} else if (e->key() == Qt::Key_PageDown) {
+		selectSkipPage(_visibleBottom - _visibleTop, 1);
+	} else if (e->key() == Qt::Key_Home || e->key() == Qt::Key_End) {
+		// Jump to the first/last row. selectSkip() clamps the target, so
+		// skipping by more than the total row count lands on the edge in both
+		// the default and the filtered (search) list.
+		const auto rows = int(_collapsedRows.size())
+			+ _shownList->size()
+			+ int(_hashtagResults.size())
+			+ int(_filterResults.size())
+			+ int(_peerSearchResults.size())
+			+ int(_previewResults.size())
+			+ int(_searchResults.size());
+		selectSkip((e->key() == Qt::Key_End) ? rows : -rows);
+	} else {
+		return false;
+	}
+	const auto changed = (_selected != snap.selected)
+		|| (_hashtagSelected != snap.hashtag)
+		|| (_filteredSelected != snap.filtered)
+		|| (_peerSearchSelected != snap.peerSearch)
+		|| (_previewSelected != snap.preview)
+		|| (_searchedSelected != snap.searched);
+	if (changed) {
+		announceSelectedFocus();
+	}
+	return true;
+}
+
+void InnerWidget::keyPressEvent(QKeyEvent *e) {
+	if (processKeyDispatch(e)) {
+		return;
+	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
+		chooseRow();
+		return;
+	}
+	// Leave unhandled keys (e.g. typed characters) for the parent
+	// Dialogs::Widget, whose keyPressEvent redirects them to search.
+	RpWidget::keyPressEvent(e);
+}
+
+void InnerWidget::announceSelectedFocus() {
+	if (_state == WidgetState::Default) {
+		if (!_selected) {
+			return;
+		}
+		const auto i = _shownList->cfind(_selected);
+		if (i != _shownList->cend()) {
+			const auto index = int(i - _shownList->cbegin());
+			accessibilityChildNameChanged(index);
+			accessibilityChildFocused(index);
+		}
+	} else if (_state == WidgetState::Filtered) {
+		const auto h = int(_hashtagResults.size());
+		const auto f = int(_filterResults.size());
+		const auto p = int(_peerSearchResults.size());
+		const auto v = int(_previewResults.size());
+		auto index = -1;
+		if (base::in_range(_hashtagSelected, 0, h)) {
+			index = _hashtagSelected;
+		} else if (base::in_range(_filteredSelected, 0, f)) {
+			index = h + _filteredSelected;
+		} else if (base::in_range(_peerSearchSelected, 0, p)) {
+			index = h + f + _peerSearchSelected;
+		} else if (base::in_range(_previewSelected, 0, v)) {
+			index = h + f + p + _previewSelected;
+		} else if (base::in_range(
+				_searchedSelected,
+				0,
+				int(_searchResults.size()))) {
+			index = h + f + p + v + _searchedSelected;
+		}
+		if (index >= 0) {
+			accessibilityChildNameChanged(index);
+			accessibilityChildFocused(index);
+		}
+	}
+}
+
+Ui::AccessibilityState InnerWidget::accessibilityState() const {
+	// Mark the List container as non-focusable so screen readers
+	// drill down to the focusable child items (ListItem rows).
+	return {};
+}
+
+int InnerWidget::filteredChildCount() const {
+	return int(_hashtagResults.size()
+		+ _filterResults.size()
+		+ _peerSearchResults.size()
+		+ _previewResults.size()
+		+ _searchResults.size());
+}
+
+auto InnerWidget::filteredChildAt(int index) const
+-> std::optional<FilteredChildRef> {
+	if (index < 0) {
+		return std::nullopt;
+	}
+	const auto h = int(_hashtagResults.size());
+	const auto f = int(_filterResults.size());
+	const auto p = int(_peerSearchResults.size());
+	const auto v = int(_previewResults.size());
+	const auto s = int(_searchResults.size());
+	if (index < h) {
+		return FilteredChildRef{
+			AccessibilityCohort::Hashtag,
+			index,
+		};
+	} else if (index < h + f) {
+		return FilteredChildRef{
+			AccessibilityCohort::Filtered,
+			index - h,
+		};
+	} else if (index < h + f + p) {
+		return FilteredChildRef{
+			AccessibilityCohort::PeerSearch,
+			index - h - f,
+		};
+	} else if (index < h + f + p + v) {
+		return FilteredChildRef{
+			AccessibilityCohort::Preview,
+			index - h - f - p,
+		};
+	} else if (index < h + f + p + v + s) {
+		return FilteredChildRef{
+			AccessibilityCohort::Searched,
+			index - h - f - p - v,
+		};
+	}
+	return std::nullopt;
+}
+
+int InnerWidget::accessibilityChildCount() const {
+	if (_state == WidgetState::Default) {
+		return _shownList->size();
+	} else if (_state == WidgetState::Filtered) {
+		return filteredChildCount();
+	}
+	return 0;
+}
+
+QString InnerWidget::accessibilityChildName(int index) const {
+	if (_state == WidgetState::Default) {
+		if (index < 0 || index >= _shownList->size()) {
+			return {};
+		}
+		const auto it = _shownList->cbegin() + index;
+		return RowAccessibilityName(it->get(), _filterId);
+	} else if (_state == WidgetState::Filtered) {
+		const auto ref = filteredChildAt(index);
+		if (!ref) {
+			return {};
+		}
+		switch (ref->cohort) {
+		case AccessibilityCohort::Hashtag:
+			return HashtagAccessibilityName(
+				_hashtagResults[ref->local]->tag);
+		case AccessibilityCohort::Filtered:
+			return RowAccessibilityName(
+				_filterResults[ref->local].row,
+				_filterId);
+		case AccessibilityCohort::PeerSearch: {
+			const auto &r = _peerSearchResults[ref->local];
+			return PeerSearchResultAccessibilityName(
+				r->peer,
+				r->sponsored != nullptr);
+		}
+		case AccessibilityCohort::Preview:
+			return SearchedMessageAccessibilityName(
+				_previewResults[ref->local].get());
+		case AccessibilityCohort::Searched:
+			return SearchedMessageAccessibilityName(
+				_searchResults[ref->local].get());
+		}
+	}
+	return {};
+}
+
+QAccessible::State InnerWidget::accessibilityChildState(int index) const {
+	auto state = QAccessible::State();
+	state.selectable = true;
+	if (Ui::ScreenReaderModeActive()) {
+		state.focusable = true;
+	}
+	if (_state == WidgetState::Default) {
+		if (index < 0 || index >= _shownList->size()) {
+			return state;
+		}
+		const auto it = _shownList->cbegin() + index;
+		if (it->get() == _selected) {
+			state.selected = true;
+			state.active = true;
+			if (Ui::ScreenReaderModeActive()) {
+				state.focused = true;
+			}
+		}
+		return state;
+	} else if (_state == WidgetState::Filtered) {
+		const auto ref = filteredChildAt(index);
+		if (!ref) {
+			return state;
+		}
+		const auto active = [&] {
+			switch (ref->cohort) {
+			case AccessibilityCohort::Hashtag:
+				return ref->local == _hashtagSelected;
+			case AccessibilityCohort::Filtered:
+				return ref->local == _filteredSelected;
+			case AccessibilityCohort::PeerSearch:
+				return ref->local == _peerSearchSelected;
+			case AccessibilityCohort::Preview:
+				return ref->local == _previewSelected;
+			case AccessibilityCohort::Searched:
+				return ref->local == _searchedSelected;
+			}
+			return false;
+		}();
+		if (active) {
+			state.selected = true;
+			state.active = true;
+			if (Ui::ScreenReaderModeActive()) {
+				state.focused = true;
+			}
+		}
+		return state;
+	}
+	return state;
+}
+
+QAccessible::Role InnerWidget::accessibilityChildRole() const {
+	return QAccessible::Role::ListItem;
+}
+
+QRect InnerWidget::accessibilityChildRect(int index) const {
+	if (_state == WidgetState::Default) {
+		if (index < 0 || index >= _shownList->size()) {
+			return QRect();
+		}
+		const auto row = (_shownList->cbegin() + index)->get();
+		return QRect(0, row->top(), width(), row->height());
+	} else if (_state == WidgetState::Filtered) {
+		const auto ref = filteredChildAt(index);
+		if (!ref) {
+			return QRect();
+		}
+		switch (ref->cohort) {
+		case AccessibilityCohort::Hashtag:
+			return QRect(
+				0,
+				hashtagsOffset() + ref->local * st::mentionHeight,
+				width(),
+				st::mentionHeight);
+		case AccessibilityCohort::Filtered: {
+			const auto &r = _filterResults[ref->local];
+			return QRect(
+				0,
+				filteredOffset() + r.top,
+				width(),
+				r.row->height());
+		}
+		case AccessibilityCohort::PeerSearch:
+			return QRect(
+				0,
+				peerSearchOffset() + ref->local * st::dialogsRowHeight,
+				width(),
+				st::dialogsRowHeight);
+		case AccessibilityCohort::Preview:
+			return QRect(
+				0,
+				previewOffset() + ref->local * _st->height,
+				width(),
+				_st->height);
+		case AccessibilityCohort::Searched:
+			return QRect(
+				0,
+				searchedOffset() + ref->local * _st->height,
+				width(),
+				_st->height);
+		}
+		return QRect();
+	}
+	return QRect();
+}
+
+int InnerWidget::accessibilityChildColumnCount(int row) const {
+	if (_state == WidgetState::Default) {
+		if (row < 0 || row >= _shownList->size()) {
+			return 0;
+		}
+		const auto rowPtr = (_shownList->cbegin() + row)->get();
+		return int(activeSubItems(rowPtr).size());
+	} else if (_state == WidgetState::Filtered) {
+		const auto ref = filteredChildAt(row);
+		if (!ref || ref->cohort != AccessibilityCohort::Filtered) {
+			return 0;
+		}
+		return int(activeSubItems(_filterResults[ref->local].row).size());
+	}
+	return 0;
+}
+
+const std::vector<SubItem> &InnerWidget::activeSubItems(
+		not_null<const Row*> row) const {
+	if (row.get() != _activeSubItemsRow) {
+		_activeSubItems = ActiveSubItems(row, _filterId);
+		_activeSubItemsRow = row.get();
+	}
+	return _activeSubItems;
+}
+
+QAccessible::Role InnerWidget::accessibilityChildSubItemRole() const {
+	return QAccessible::Cell;
+}
+
+QString InnerWidget::accessibilityChildSubItemName(
+		int row,
+		int column) const {
+	if (_state == WidgetState::Default) {
+		if (row < 0 || row >= _shownList->size()) {
+			return {};
+		}
+		const auto rowPtr = (_shownList->cbegin() + row)->get();
+		const auto &active = activeSubItems(rowPtr);
+		if (column < 0 || column >= int(active.size())) {
+			return {};
+		}
+		return SubItemLabel(active[column]);
+	} else if (_state == WidgetState::Filtered) {
+		const auto ref = filteredChildAt(row);
+		if (!ref || ref->cohort != AccessibilityCohort::Filtered) {
+			return {};
+		}
+		const auto &active = activeSubItems(_filterResults[ref->local].row);
+		if (column < 0 || column >= int(active.size())) {
+			return {};
+		}
+		return SubItemLabel(active[column]);
+	}
+	return {};
+}
+
+QString InnerWidget::accessibilityChildSubItemValue(
+		int row,
+		int column) const {
+	if (_state == WidgetState::Default) {
+		if (row < 0 || row >= _shownList->size()) {
+			return {};
+		}
+		const auto rowPtr = (_shownList->cbegin() + row)->get();
+		const auto &active = activeSubItems(rowPtr);
+		if (column < 0 || column >= int(active.size())) {
+			return {};
+		}
+		return SubItemValue(rowPtr, _filterId, active[column]);
+	} else if (_state == WidgetState::Filtered) {
+		const auto ref = filteredChildAt(row);
+		if (!ref || ref->cohort != AccessibilityCohort::Filtered) {
+			return {};
+		}
+		const auto rowPtr = _filterResults[ref->local].row;
+		const auto &active = activeSubItems(rowPtr);
+		if (column < 0 || column >= int(active.size())) {
+			return {};
+		}
+		return SubItemValue(rowPtr, _filterId, active[column]);
+	}
+	return {};
+}
+
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index a0b80ef67173e0..e825e6f840eefd 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -10,21 +10,33 @@ For license and copyright information please follow this link:
 #include "base/flags.h"
 #include "base/object_ptr.h"
 #include "base/timer.h"
-#include "dialogs/dialogs_key.h"
 #include "data/data_messages.h"
-#include "ui/dragging_scroll_manager.h"
+#include "dialogs/ui/dialogs_quick_action_context.h"
+#include "dialogs/dialogs_inner_widget_accessibility.h"
+#include "dialogs/dialogs_key.h"
+#include "lang/lang_keys.h"
 #include "ui/effects/animations.h"
+#include "ui/dragging_scroll_manager.h"
 #include "ui/rp_widget.h"
 #include "ui/userpic_view.h"
 
 namespace style {
 struct DialogRow;
+struct DialogRightButton;
 } // namespace style
 
+namespace Api {
+struct PeerSearchResult;
+} // namespace Api
+
 namespace MTP {
 class Error;
 } // namespace MTP
 
+namespace Lottie {
+class Icon;
+} // namespace Lottie
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -33,7 +45,12 @@ namespace Ui {
 class IconButton;
 class PopupMenu;
 class FlatLabel;
+class VerticalLayout;
+class RoundButton;
 struct ScrollToRequest;
+namespace Controls {
+enum class QuickDialogAction;
+} // namespace Controls
 } // namespace Ui
 
 namespace Window {
@@ -41,9 +58,11 @@ class SessionController;
 } // namespace Window
 
 namespace Data {
+class ChatFilter;
 class Thread;
 class Folder;
 class Forum;
+class SavedMessages;
 struct ReactionId;
 } // namespace Data
 
@@ -63,22 +82,32 @@ class SearchTags;
 class SearchEmpty;
 class ChatSearchIn;
 enum class HashOrCashtag : uchar;
+struct RightButton;
+enum class ChatTypeFilter : uchar;
 
 struct ChosenRow {
 	Key key;
 	Data::MessagePosition message;
+	MsgId topicJumpRootId;
+	PeerId sublistJumpPeerId;
+	QByteArray sponsoredRandomId;
 	bool userpicClick : 1 = false;
 	bool filteredRow : 1 = false;
 	bool newWindow : 1 = false;
 };
 
-enum class SearchRequestType : uchar {
-	FromStart,
-	FromOffset,
-	PeerFromStart,
-	PeerFromOffset,
-	MigratedFromStart,
-	MigratedFromOffset,
+struct SearchRequestType {
+	bool migrated : 1 = false;
+	bool posts : 1 = false;
+	bool start : 1 = false;
+	bool peer : 1 = false;
+
+	friend inline constexpr auto operator<=>(
+		SearchRequestType a,
+		SearchRequestType b) = default;
+	friend inline constexpr bool operator==(
+		SearchRequestType a,
+		SearchRequestType b) = default;
 };
 
 enum class SearchRequestDelay : uchar {
@@ -94,6 +123,8 @@ enum class WidgetState {
 
 class InnerWidget final : public Ui::RpWidget {
 public:
+	using ChatsFilterTagsKey = int64;
+
 	struct ChildListShown {
 		PeerId peerId = 0;
 		float64 shown = 0.;
@@ -108,10 +139,7 @@ class InnerWidget final : public Ui::RpWidget {
 		HistoryItem *inject,
 		SearchRequestType type,
 		int fullCount);
-	void peerSearchReceived(
-		const QString &query,
-		const QVector<MTPPeer> &my,
-		const QVector<MTPPeer> &result);
+	void peerSearchReceived(Api::PeerSearchResult result);
 
 	[[nodiscard]] FilterId filterId() const;
 
@@ -131,6 +159,8 @@ class InnerWidget final : public Ui::RpWidget {
 	void refreshEmpty();
 	void resizeEmpty();
 
+	void showPeerMenu();
+
 	[[nodiscard]] bool isUserpicPress() const;
 	[[nodiscard]] bool isUserpicPressOnWide() const;
 	void cancelChatPreview();
@@ -139,7 +169,9 @@ class InnerWidget final : public Ui::RpWidget {
 	void chatPreviewShown(bool shown, RowDescriptor row = {});
 	bool chooseRow(
 		Qt::KeyboardModifiers modifiers = {},
-		MsgId pressedTopicRootId = {});
+		MsgId pressedTopicRootId = {},
+		PeerId pressedSublistPeerId = {});
+	bool processKeyDispatch(QKeyEvent *e);
 
 	void scrollToEntry(const RowDescriptor &entry);
 
@@ -167,6 +199,8 @@ class InnerWidget final : public Ui::RpWidget {
 	[[nodiscard]] rpl::producer<> listBottomReached() const;
 	[[nodiscard]] auto changeSearchTabRequests() const
 		-> rpl::producer<ChatSearchTab>;
+	[[nodiscard]] auto changeSearchFilterRequests() const
+		-> rpl::producer<ChatTypeFilter>;
 	[[nodiscard]] rpl::producer<> cancelSearchRequests() const;
 	[[nodiscard]] rpl::producer<> cancelSearchFromRequests() const;
 	[[nodiscard]] rpl::producer<> changeSearchFromRequests() const;
@@ -192,6 +226,32 @@ class InnerWidget final : public Ui::RpWidget {
 		return _touchCancelRequests.events();
 	}
 
+	[[nodiscard]] rpl::producer<UserId> openBotMainAppRequests() const;
+
+	void setSwipeContextData(
+		int64 key,
+		std::optional<Ui::Controls::SwipeContextData> data);
+	[[nodiscard]] int64 calcSwipeKey(int top);
+	void prepareQuickAction(int64 key, Dialogs::Ui::QuickDialogAction);
+	void clearQuickActions();
+
+	Qt::FocusPolicy accessibilityFocusPolicy() override {
+		return Qt::TabFocus;
+	}
+	QAccessible::Role accessibilityRole() override {
+		return QAccessible::Role::List;
+	}
+	Ui::AccessibilityState accessibilityState() const override;
+	int accessibilityChildCount() const override;
+	QString accessibilityChildName(int index) const override;
+	QAccessible::State accessibilityChildState(int index) const override;
+	QAccessible::Role accessibilityChildRole() const override;
+	QRect accessibilityChildRect(int index) const override;
+	int accessibilityChildColumnCount(int row) const override;
+	QAccessible::Role accessibilityChildSubItemRole() const override;
+	QString accessibilityChildSubItemName(int row, int column) const override;
+	QString accessibilityChildSubItemValue(int row, int column) const override;
+
 protected:
 	void visibleTopBottomUpdated(
 		int visibleTop,
@@ -205,11 +265,15 @@ class InnerWidget final : public Ui::RpWidget {
 	void enterEventHook(QEnterEvent *e) override;
 	void leaveEventHook(QEvent *e) override;
 	void contextMenuEvent(QContextMenuEvent *e) override;
+	void focusInEvent(QFocusEvent *e) override;
+	void keyPressEvent(QKeyEvent *e) override;
 
 private:
 	struct CollapsedRow;
 	struct HashtagResult;
+	struct SponsoredSearchResult;
 	struct PeerSearchResult;
+	struct TagCache;
 
 	enum class JumpSkip {
 		PreviousOrBegin,
@@ -265,6 +329,7 @@ class InnerWidget final : public Ui::RpWidget {
 	void repaintDialogRow(RowDescriptor row);
 	void refreshDialogRow(RowDescriptor row);
 	bool updateEntryHeight(not_null<Entry*> entry);
+	void showSponsoredMenu(int peerSearchIndex, QPoint globalPos);
 
 	void clearMouseSelection(bool clearSelection = false);
 	void mousePressReleased(
@@ -278,11 +343,18 @@ class InnerWidget final : public Ui::RpWidget {
 	void scrollToItem(int top, int height);
 	void scrollToDefaultSelected();
 	void setCollapsedPressed(int pressed);
-	void setPressed(Row *pressed, bool pressedTopicJump);
+	void setPressed(
+		Row *pressed,
+		bool pressedTopicJump,
+		bool pressedRightButton);
 	void clearPressed();
 	void setHashtagPressed(int pressed);
-	void setFilteredPressed(int pressed, bool pressedTopicJump);
-	void setPeerSearchPressed(int pressed);
+	void setFilteredPressed(
+		int pressed,
+		bool pressedTopicJump,
+		bool pressedRightButton);
+	void setPeerSearchPressed(int pressed, bool pressedRightButton);
+	void setPreviewPressed(int pressed);
 	void setSearchedPressed(int pressed);
 	bool isPressed() const {
 		return (_collapsedPressed >= 0)
@@ -290,7 +362,10 @@ class InnerWidget final : public Ui::RpWidget {
 			|| (_hashtagPressed >= 0)
 			|| (_filteredPressed >= 0)
 			|| (_peerSearchPressed >= 0)
-			|| (_searchedPressed >= 0);
+			|| (_previewPressed >= 0)
+			|| (_searchedPressed >= 0)
+			|| _pressedMorePosts
+			|| _pressedChatTypeFilter;
 	}
 	bool isSelected() const {
 		return (_collapsedSelected >= 0)
@@ -298,7 +373,10 @@ class InnerWidget final : public Ui::RpWidget {
 			|| (_hashtagSelected >= 0)
 			|| (_filteredSelected >= 0)
 			|| (_peerSearchSelected >= 0)
-			|| (_searchedSelected >= 0);
+			|| (_previewSelected >= 0)
+			|| (_searchedSelected >= 0)
+			|| _selectedMorePosts
+			|| _selectedChatTypeFilter;
 	}
 	bool uniqueSearchResults() const;
 	bool hasHistoryInResults(not_null<History*> history) const;
@@ -310,6 +388,11 @@ class InnerWidget final : public Ui::RpWidget {
 	void updateRowCornerStatusShown(not_null<History*> history);
 	void repaintDialogRowCornerStatus(not_null<History*> history);
 
+	bool addBotAppRipple(QPoint origin, Fn<void()> updateCallback);
+	bool addQuickActionRipple(not_null<Row*> row, Fn<void()> updateCallback);
+
+	bool addRightButtonRipple(QPoint origin, Fn<void()> updateCallback);
+
 	void setupShortcuts();
 	RowDescriptor computeJump(
 		const RowDescriptor &to,
@@ -352,6 +435,7 @@ class InnerWidget final : public Ui::RpWidget {
 	[[nodiscard]] int filteredHeight(int till = -1) const;
 	[[nodiscard]] int peerSearchOffset() const;
 	[[nodiscard]] int searchInChatOffset() const;
+	[[nodiscard]] int previewOffset() const;
 	[[nodiscard]] int searchedOffset() const;
 	[[nodiscard]] int searchInChatSkip() const;
 	[[nodiscard]] int hashtagsOffset() const;
@@ -403,14 +487,36 @@ class InnerWidget final : public Ui::RpWidget {
 	//	const Ui::Text::String &text) const;
 	void updateSearchIn();
 	void repaintSearchResult(int index);
+	void repaintPreviewResult(int index);
+
+	[[nodiscard]] bool computeSearchWithPostsPreview() const;
 
 	Ui::VideoUserpic *validateVideoUserpic(not_null<Row*> row);
 	Ui::VideoUserpic *validateVideoUserpic(not_null<History*> history);
 
 	Row *shownRowByKey(Key key);
-	void clearSearchResults(bool clearPeerSearchResults = true);
+	[[nodiscard]] const std::vector<SubItem> &activeSubItems(
+		not_null<const Row*> row) const;
+	enum class AccessibilityCohort {
+		Hashtag,
+		Filtered,
+		PeerSearch,
+		Preview,
+		Searched,
+	};
+	struct FilteredChildRef {
+		AccessibilityCohort cohort;
+		int local = 0;
+	};
+	[[nodiscard]] int filteredChildCount() const;
+	[[nodiscard]] std::optional<FilteredChildRef>
+		filteredChildAt(int index) const;
+	void announceSelectedFocus();
+	void clearSearchResults(bool alsoPeerSearchResults = true);
+	void clearPeerSearchResults();
+	void clearPreviewResults();
 	void updateSelectedRow(Key key = Key());
-	void trackSearchResultsHistory(not_null<History*> history);
+	void trackResultsHistory(not_null<History*> history);
 
 	[[nodiscard]] QBrush currentBg() const;
 	[[nodiscard]] RowDescriptor computeChatPreviewRow() const;
@@ -420,6 +526,8 @@ class InnerWidget final : public Ui::RpWidget {
 	void startReorderPinned(QPoint localPosition);
 	int updateReorderIndexGetCount();
 	bool updateReorderPinned(QPoint localPosition);
+	[[nodiscard]] bool skipChatsListFreeze() const;
+	void unfreezeShownList(bool updateIfWasFrozen);
 	void finishReorderPinned();
 	bool finishReorderOnRelease();
 	void stopReorderPinned();
@@ -429,10 +537,34 @@ class InnerWidget final : public Ui::RpWidget {
 	void handleChatListEntryRefreshes();
 	void moveSearchIn();
 	void dragPinnedFromTouch();
+	[[nodiscard]] bool hasChatTypeFilter() const;
 
 	void saveChatsFilterScrollState(FilterId filterId);
 	void restoreChatsFilterScrollState(FilterId filterId);
 
+	[[nodiscard]] not_null<Ui::QuickActionContext*> ensureQuickAction(
+		int64 key);
+	void deactivateQuickAction();
+
+	[[nodiscard]] bool lookupIsInBotAppButton(
+		Row *row,
+		QPoint localPosition);
+	[[nodiscard]] bool lookupIsInRightButton(
+		const RightButton &button,
+		QPoint localPosition);
+	[[nodiscard]] RightButton *maybeCacheRightButton(Row *row);
+	void fillRightButton(
+		RightButton &button,
+		const TextWithEntities &text,
+		const style::DialogRightButton &st);
+
+	[[nodiscard]] QImage *cacheChatsFilterTag(
+		const Data::ChatFilter &filter,
+		uint8 more,
+		bool active);
+
+	void performDrag();
+
 	const not_null<Window::SessionController*> _controller;
 
 	not_null<IndexedList*> _shownList;
@@ -449,15 +581,27 @@ class InnerWidget final : public Ui::RpWidget {
 	std::vector<std::unique_ptr<CollapsedRow>> _collapsedRows;
 	not_null<const style::DialogRow*> _st;
 	mutable std::unique_ptr<Ui::TopicJumpCache> _topicJumpCache;
+	bool _selectedChatTypeFilter = false;
+	bool _pressedChatTypeFilter = false;
+	bool _selectedMorePosts = false;
+	bool _pressedMorePosts = false;
 	int _collapsedSelected = -1;
 	int _collapsedPressed = -1;
 	bool _skipTopDialog = false;
 	Row *_selected = nullptr;
 	Row *_pressed = nullptr;
 	MsgId _pressedTopicJumpRootId;
+	PeerId _pressedSublistJumpPeerId;
 	bool _selectedTopicJump = false;
 	bool _pressedTopicJump = false;
 
+	RightButton *_pressedRightButtonData = nullptr;
+	bool _pressedRightButtonSponsored = false;
+	bool _selectedRightButton = false;
+	bool _pressedRightButton = false;
+
+	Row *_qdragging = nullptr;
+
 	Row *_dragging = nullptr;
 	int _draggingIndex = -1;
 	int _aboveIndex = -1;
@@ -466,6 +610,9 @@ class InnerWidget final : public Ui::RpWidget {
 	Ui::Animations::Basic _pinnedShiftAnimation;
 	base::flat_set<Key> _pinnedOnDragStart;
 
+	mutable const Row *_activeSubItemsRow = nullptr;
+	mutable std::vector<SubItem> _activeSubItems;
+
 	// Remember the last currently dragged row top shift for updating area.
 	int _aboveTopShift = -1;
 	int _narrowWidth = 0;
@@ -487,14 +634,24 @@ class InnerWidget final : public Ui::RpWidget {
 
 	EmptyState _emptyState = EmptyState::None;
 
+	base::flat_set<not_null<History*>> _trackedHistories;
+	rpl::lifetime _trackedLifetime;
+
 	QString _peerSearchQuery;
+	base::flat_set<not_null<PeerData*>> _sponsoredRemoved;
 	std::vector<std::unique_ptr<PeerSearchResult>> _peerSearchResults;
 	int _peerSearchSelected = -1;
 	int _peerSearchPressed = -1;
+	int _peerSearchMenu = -1;
+
+	std::vector<std::unique_ptr<FakeRow>> _previewResults;
+	int _previewCount = 0;
+	int _previewSelected = -1;
+	int _previewPressed = -1;
+	int _morePostsWidth = 0;
+	int _chatTypeFilterWidth = 0;
 
 	std::vector<std::unique_ptr<FakeRow>> _searchResults;
-	base::flat_set<not_null<History*>> _searchResultsHistories;
-	rpl::lifetime _searchResultsLifetime;
 	int _searchedCount = 0;
 	int _searchedMigratedCount = 0;
 	int _searchedSelected = -1;
@@ -504,6 +661,7 @@ class InnerWidget final : public Ui::RpWidget {
 
 	std::unique_ptr<ChatSearchIn> _searchIn;
 	rpl::event_stream<ChatSearchTab> _changeSearchTabRequests;
+	rpl::event_stream<ChatTypeFilter> _changeSearchFilterRequests;
 	rpl::event_stream<> _cancelSearchRequests;
 	rpl::event_stream<> _cancelSearchFromRequests;
 	rpl::event_stream<> _changeSearchFromRequests;
@@ -511,11 +669,14 @@ class InnerWidget final : public Ui::RpWidget {
 	object_ptr<SearchEmpty> _searchEmpty = { nullptr };
 	SearchState _searchEmptyState;
 	object_ptr<Ui::FlatLabel> _empty = { nullptr };
+	object_ptr<Ui::VerticalLayout> _emptyList = { nullptr };
+	object_ptr<Ui::RoundButton> _emptyButton = { nullptr };
 
 	Ui::DraggingScrollManager _draggingScroll;
 
 	SearchState _searchState;
 	HashOrCashtag _searchHashOrCashtag = {};
+	bool _searchWithPostsPreview = false;
 	History *_searchInMigrated = nullptr;
 	PeerData *_searchFromShown = nullptr;
 	Ui::Text::String _searchFromUserText;
@@ -529,6 +690,12 @@ class InnerWidget final : public Ui::RpWidget {
 
 	base::flat_map<FilterId, int> _chatsFilterScrollStates;
 
+	std::unordered_map<ChatsFilterTagsKey, TagCache> _chatsFilterTags;
+	bool _waitingAllChatListEntryRefreshesForTags = false;
+	rpl::lifetime _handleChatListEntryTagRefreshesLifetime;
+
+	std::unordered_map<PeerId, RightButton> _rightButtons;
+
 	Fn<void()> _loadMoreCallback;
 	Fn<void()> _loadMoreFilteredCallback;
 	rpl::event_stream<> _listBottomReached;
@@ -540,6 +707,11 @@ class InnerWidget final : public Ui::RpWidget {
 	rpl::event_stream<SearchRequestDelay> _searchRequests;
 	rpl::event_stream<QString> _completeHashtagRequests;
 	rpl::event_stream<> _refreshHashtagsRequests;
+	rpl::event_stream<UserId> _openBotMainAppRequests;
+
+	using QuickActionPtr = std::unique_ptr<Ui::QuickActionContext>;
+	QuickActionPtr _activeQuickAction;
+	std::vector<QuickActionPtr> _inactiveQuickActions;
 
 	RowDescriptor _chatPreviewRow;
 	bool _chatPreviewScheduled = false;
@@ -550,10 +722,12 @@ class InnerWidget final : public Ui::RpWidget {
 	rpl::event_stream<> _touchCancelRequests;
 
 	rpl::variable<ChildListShown> _childListShown;
+	base::Timer _freezeTimer;
 	float64 _narrowRatio = 0.;
 	bool _geometryInited = false;
 
-	bool _savedSublists = false;
+	Data::SavedMessages *_savedSublists = nullptr;
+
 	bool _searchLoading = false;
 	bool _searchWaiting = false;
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget_accessibility.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget_accessibility.cpp
new file mode 100644
index 00000000000000..74695c027f6f5b
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget_accessibility.cpp
@@ -0,0 +1,660 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/dialogs_inner_widget_accessibility.h"
+
+#include "data/notify/data_notify_settings.h"
+#include "data/data_channel.h"
+#include "data/data_chat_filters.h"
+#include "data/data_drafts.h"
+#include "data/data_folder.h"
+#include "data/data_forum_topic.h"
+#include "data/data_message_reactions.h"
+#include "data/data_peer_values.h"
+#include "data/data_saved_sublist.h"
+#include "data/data_session.h"
+#include "data/data_stories.h"
+#include "data/data_user.h"
+#include "dialogs/dialogs_entry.h"
+#include "dialogs/dialogs_row.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
+#include "history/history_item_helpers.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/text/format_values.h"
+
+namespace Dialogs {
+namespace {
+
+[[nodiscard]] QString ChatTypeString(not_null<PeerData*> peer) {
+	if (const auto user = peer->asUser()) {
+		if (user->isInaccessible()) {
+			return tr::lng_deleted(tr::now);
+		} else if (user->isSelf()) {
+			return tr::lng_saved_messages(tr::now);
+		} else if (user->isServiceUser()) {
+			return tr::lng_sr_chat_service(tr::now);
+		} else if (user->isBot()) {
+			return tr::lng_sr_chat_bot(tr::now);
+		}
+	} else if (peer->isBroadcast()) {
+		return tr::lng_sr_chat_channel(tr::now);
+	} else if (peer->isMegagroup() || peer->isChat()) {
+		return tr::lng_sr_chat_group(tr::now);
+	}
+	return QString();
+}
+
+[[nodiscard]] QStringList MessageTailParts(
+		not_null<const HistoryItem*> item,
+		not_null<History*> history,
+		not_null<PeerData*> peer) {
+	QStringList parts;
+	if (item->isService()) {
+		return parts;
+	}
+	const auto dateTime = ItemDateTime(item);
+
+	QString status;
+	auto statusBeforeMessage = false;
+	if (item->out()) {
+		if (item->isSending()) {
+			status = tr::lng_sr_chat_sending(tr::now);
+			statusBeforeMessage = true;
+		} else if (item->hasFailed()) {
+			status = tr::lng_sr_chat_failed(tr::now);
+			statusBeforeMessage = true;
+		} else if (item->unread(history)) {
+			status = tr::lng_sr_message_not_seen(tr::now);
+			statusBeforeMessage = true;
+		} else {
+			status = tr::lng_sr_message_seen(tr::now);
+			statusBeforeMessage = true;
+		}
+	} else {
+		status = tr::lng_sr_chat_received(tr::now);
+		statusBeforeMessage = false;
+	}
+
+	auto messageText = item->notificationText().text;
+	if (!messageText.isEmpty()) {
+		constexpr auto kMaxMessageLength = 100;
+		if (messageText.size() > kMaxMessageLength) {
+			messageText = messageText.left(kMaxMessageLength) + u"..."_q;
+		}
+		if (peer->isChat() || peer->isMegagroup()) {
+			if (const auto from = item->from()) {
+				if (!item->out()) {
+					messageText = from->shortName()
+						+ u": "_q
+						+ messageText;
+				}
+			}
+		}
+		if (statusBeforeMessage) {
+			messageText = status + u", "_q + messageText;
+		}
+		parts << messageText;
+	}
+
+	const auto &reactions = item->reactions();
+	if (!reactions.empty()) {
+		QStringList reactionParts;
+		for (const auto &reaction : reactions) {
+			QString reactionText;
+			if (reaction.id.paid()) {
+				reactionText = tr::lng_sr_chat_reaction_star(tr::now);
+			} else if (const auto emoji = reaction.id.emoji(); !emoji.isEmpty()) {
+				reactionText = emoji;
+			} else {
+				reactionText = tr::lng_sr_chat_reaction_custom(tr::now);
+			}
+			if (reaction.count > 1) {
+				reactionText += u" "_q + QString::number(reaction.count);
+			}
+			reactionParts << reactionText;
+		}
+		if (!reactionParts.isEmpty()) {
+			parts << tr::lng_sr_chat_message_reactions(
+				tr::now,
+				lt_reactions,
+				reactionParts.join(u", "_q));
+		}
+	}
+
+	if (!statusBeforeMessage) {
+		parts << status;
+	}
+
+	if (dateTime.isValid()) {
+		const auto now = QDateTime::currentDateTime();
+		QString timeText;
+		if (dateTime.date() == now.date()) {
+			timeText = tr::lng_schedule_at(tr::now)
+				+ u" "_q
+				+ QLocale().toString(
+					dateTime.time(),
+					QLocale::ShortFormat);
+		} else {
+			timeText = Ui::FormatDateTime(dateTime);
+		}
+		parts << timeText;
+	}
+
+	return parts;
+}
+
+} // namespace
+
+QString RowAccessibilityName(
+		not_null<const Row*> row,
+		FilterId filterId) {
+	if (const auto topic = row->topic()) {
+		const auto title = topic->isGeneral()
+			? Data::ForumGeneralIconTitle()
+			: topic->title();
+		return tr::lng_sr_chat_topic(tr::now) + u" "_q + title;
+	}
+
+	if (const auto folder = row->folder()) {
+		return tr::lng_sr_chat_folder(tr::now)
+			+ u" "_q
+			+ folder->chatListName();
+	}
+
+	if (const auto sublist = row->sublist()) {
+		return tr::lng_saved_messages(tr::now)
+			+ u" "_q
+			+ sublist->sublistPeer()->name();
+	}
+
+	const auto history = row->history();
+	if (!history) {
+		return {};
+	}
+
+	const auto peer = history->peer;
+	if (!peer) {
+		return {};
+	}
+
+	QStringList parts;
+
+	const auto type = ChatTypeString(peer);
+	if (!type.isEmpty()) {
+		parts << type;
+	}
+
+	parts << peer->name();
+
+	if (peer->isScam()) {
+		parts << tr::lng_sr_chat_scam(tr::now);
+	} else if (peer->isFake()) {
+		parts << tr::lng_sr_chat_fake(tr::now);
+	}
+
+	if (const auto user = peer->asUser()) {
+		if (user->isPremium()) {
+			parts << tr::lng_premium(tr::now);
+		}
+	}
+
+	if (peer->isVerified()) {
+		parts << tr::lng_sr_chat_verified(tr::now);
+	}
+
+	if (const auto user = peer->asUser()) {
+		if (Data::IsUserOnline(user)) {
+			parts << tr::lng_sr_chat_online(tr::now);
+		}
+	}
+
+	if (peer->owner().notifySettings().isMuted(peer)) {
+		parts << tr::lng_notification_exceptions_muted(tr::now);
+	}
+
+	if (row->entry()->isPinnedDialog(filterId)) {
+		parts << tr::lng_sr_chat_pinned(tr::now);
+	}
+
+	if (const auto draft = history->cloudDraft(MsgId(0), PeerId(0))) {
+		if (!draft->textWithTags.text.isEmpty()) {
+			parts << tr::lng_from_draft(tr::now);
+		}
+	} else if (const auto localDraft = history->localDraft(MsgId(0), PeerId(0))) {
+		if (!localDraft->textWithTags.text.isEmpty()) {
+			parts << tr::lng_from_draft(tr::now);
+		}
+	}
+
+	const auto badges = row->entry()->chatListBadgesState();
+	if (badges.unreadCounter > 0) {
+		parts << tr::lng_sr_chat_unread(
+			tr::now,
+			lt_count,
+			badges.unreadCounter);
+	} else if (badges.unread) {
+		parts << tr::lng_settings_quick_dialog_action_unread(tr::now);
+	}
+
+	if (badges.mention) {
+		parts << tr::lng_sr_chat_mention(tr::now);
+	}
+
+	if (const auto item = history->chatListMessage()) {
+		parts += MessageTailParts(item, history, peer);
+	}
+
+	return parts.join(u", "_q);
+}
+
+QString SubItemLabel(SubItem item) {
+	switch (item) {
+	case SubItem::Type: return tr::lng_sr_chat_column_type(tr::now);
+	case SubItem::Name: return tr::lng_sr_chat_column_name(tr::now);
+	case SubItem::Warning: return tr::lng_sr_chat_column_warning(tr::now);
+	case SubItem::Premium: return tr::lng_sr_chat_column_premium(tr::now);
+	case SubItem::Verified: return tr::lng_sr_chat_column_verified(tr::now);
+	case SubItem::Activity: return tr::lng_sr_chat_column_activity(tr::now);
+	case SubItem::Muted: return tr::lng_sr_chat_column_muted(tr::now);
+	case SubItem::Pinned: return tr::lng_sr_chat_column_pinned(tr::now);
+	case SubItem::Draft: return tr::lng_sr_chat_column_draft(tr::now);
+	case SubItem::Unread: return tr::lng_sr_chat_column_unread(tr::now);
+	case SubItem::Mention: return tr::lng_sr_chat_column_mention(tr::now);
+	case SubItem::Sender: return tr::lng_sr_chat_column_sender(tr::now);
+	case SubItem::Message: return tr::lng_sr_chat_column_message(tr::now);
+	case SubItem::Delivery: return tr::lng_sr_chat_column_delivery(tr::now);
+	case SubItem::Reactions: return tr::lng_sr_chat_column_reactions(tr::now);
+	case SubItem::Time: return tr::lng_sr_chat_column_time(tr::now);
+	case SubItem::Sponsored: return tr::lng_sr_chat_column_sponsored(tr::now);
+	case SubItem::Stories: return tr::lng_sr_chat_column_stories(tr::now);
+	case SubItem::Autodelete: return tr::lng_sr_chat_column_autodelete(tr::now);
+	case SubItem::Subscription: return tr::lng_sr_chat_column_subscription(tr::now);
+	case SubItem::Closed: return tr::lng_sr_chat_column_closed(tr::now);
+	case SubItem::Forward: return tr::lng_sr_chat_column_forward(tr::now);
+	case SubItem::Folders: return tr::lng_sr_chat_column_folders(tr::now);
+	case SubItem::Count: break;
+	}
+	return {};
+}
+
+QString SubItemValue(
+		not_null<const Row*> row,
+		FilterId filterId,
+		SubItem item) {
+	if (const auto topic = row->topic()) {
+		switch (item) {
+		case SubItem::Type:
+			return tr::lng_sr_chat_topic(tr::now);
+		case SubItem::Name:
+			return topic->isGeneral()
+				? Data::ForumGeneralIconTitle()
+				: topic->title();
+		case SubItem::Closed:
+			if (topic->closed()) {
+				return tr::lng_hours_closed(tr::now);
+			}
+			return {};
+		default:
+			return {};
+		}
+	}
+
+	if (const auto folder = row->folder()) {
+		switch (item) {
+		case SubItem::Type:
+			return tr::lng_sr_chat_folder(tr::now);
+		case SubItem::Name:
+			return folder->chatListName();
+		default:
+			return {};
+		}
+	}
+
+	if (const auto sublist = row->sublist()) {
+		switch (item) {
+		case SubItem::Type:
+			return tr::lng_saved_messages(tr::now);
+		case SubItem::Name:
+			return sublist->sublistPeer()->name();
+		default:
+			return {};
+		}
+	}
+
+	const auto history = row->history();
+	if (!history) {
+		return {};
+	}
+
+	const auto peer = history->peer;
+	if (!peer) {
+		return {};
+	}
+
+	switch (item) {
+	case SubItem::Type:
+		return ChatTypeString(peer);
+	case SubItem::Name:
+		return peer->name();
+	case SubItem::Warning:
+		if (peer->isScam()) {
+			return tr::lng_sr_chat_scam(tr::now);
+		} else if (peer->isFake()) {
+			return tr::lng_sr_chat_fake(tr::now);
+		}
+		return {};
+	case SubItem::Premium:
+		if (const auto user = peer->asUser()) {
+			if (user->isPremium()) {
+				return tr::lng_premium(tr::now);
+			}
+		}
+		return {};
+	case SubItem::Verified:
+		if (peer->isVerified()) {
+			return tr::lng_sr_chat_verified(tr::now);
+		}
+		return {};
+	case SubItem::Activity:
+		if (const auto user = peer->asUser()) {
+			if (Data::IsUserOnline(user)) {
+				return tr::lng_sr_chat_online(tr::now);
+			}
+		}
+		return {};
+	case SubItem::Muted:
+		if (peer->owner().notifySettings().isMuted(peer)) {
+			return tr::lng_notification_exceptions_muted(tr::now);
+		}
+		return {};
+	case SubItem::Pinned:
+		if (row->entry()->isPinnedDialog(filterId)) {
+			return tr::lng_sr_chat_pinned(tr::now);
+		}
+		return {};
+	case SubItem::Draft:
+		if (const auto draft = history->cloudDraft(MsgId(0), PeerId(0))) {
+			if (!draft->textWithTags.text.isEmpty()) {
+				return tr::lng_from_draft(tr::now);
+			}
+		} else if (const auto localDraft = history->localDraft(MsgId(0), PeerId(0))) {
+			if (!localDraft->textWithTags.text.isEmpty()) {
+				return tr::lng_from_draft(tr::now);
+			}
+		}
+		return {};
+	case SubItem::Unread: {
+		const auto badges = row->entry()->chatListBadgesState();
+		if (badges.unreadCounter > 0) {
+			return tr::lng_sr_chat_unread(
+				tr::now,
+				lt_count,
+				badges.unreadCounter);
+		} else if (badges.unread) {
+			return tr::lng_settings_quick_dialog_action_unread(tr::now);
+		}
+		return {};
+	}
+	case SubItem::Mention: {
+		const auto badges = row->entry()->chatListBadgesState();
+		if (badges.mention) {
+			return tr::lng_sr_chat_mention(tr::now);
+		}
+		return {};
+	}
+	case SubItem::Sender: {
+		const auto chatItem = history->chatListMessage();
+		if (!chatItem || chatItem->isService() || chatItem->out()) {
+			return {};
+		}
+		if (peer->isChat() || peer->isMegagroup()) {
+			if (const auto from = chatItem->from()) {
+				return from->shortName();
+			}
+		}
+		return {};
+	}
+	case SubItem::Message: {
+		const auto chatItem = history->chatListMessage();
+		if (!chatItem || chatItem->isService()) {
+			return {};
+		}
+		auto messageText = chatItem->notificationText().text;
+		if (messageText.isEmpty()) {
+			return {};
+		}
+		constexpr auto kMaxMessageLength = 100;
+		if (messageText.size() > kMaxMessageLength) {
+			messageText = messageText.left(kMaxMessageLength)
+				+ u"..."_q;
+		}
+		return messageText;
+	}
+	case SubItem::Delivery: {
+		const auto chatItem = history->chatListMessage();
+		if (!chatItem || chatItem->isService()) {
+			return {};
+		}
+		if (chatItem->out()) {
+			if (chatItem->isSending()) {
+				return tr::lng_sr_chat_sending(tr::now);
+			} else if (chatItem->hasFailed()) {
+				return tr::lng_sr_chat_failed(tr::now);
+			} else if (chatItem->unread(history)) {
+				return tr::lng_sr_message_not_seen(tr::now);
+			} else {
+				return tr::lng_sr_message_seen(tr::now);
+			}
+		}
+		return tr::lng_sr_chat_received(tr::now);
+	}
+	case SubItem::Reactions: {
+		const auto chatItem = history->chatListMessage();
+		if (!chatItem || chatItem->isService()) {
+			return {};
+		}
+		const auto &reactions = chatItem->reactions();
+		if (reactions.empty()) {
+			return {};
+		}
+		QStringList reactionParts;
+		for (const auto &reaction : reactions) {
+			QString reactionText;
+			if (reaction.id.paid()) {
+				reactionText = tr::lng_sr_chat_reaction_star(tr::now);
+			} else if (const auto emoji = reaction.id.emoji(); !emoji.isEmpty()) {
+				reactionText = emoji;
+			} else {
+				reactionText = tr::lng_sr_chat_reaction_custom(tr::now);
+			}
+			if (reaction.count > 1) {
+				reactionText += u" "_q + QString::number(reaction.count);
+			}
+			reactionParts << reactionText;
+		}
+		return reactionParts.join(u", "_q);
+	}
+	case SubItem::Time: {
+		const auto chatItem = history->chatListMessage();
+		if (!chatItem || chatItem->isService()) {
+			return {};
+		}
+		const auto dateTime = ItemDateTime(chatItem);
+		if (!dateTime.isValid()) {
+			return {};
+		}
+		const auto now = QDateTime::currentDateTime();
+		if (dateTime.date() == now.date()) {
+			return QLocale().toString(
+				dateTime.time(),
+				QLocale::ShortFormat);
+		}
+		return Ui::FormatDateTime(dateTime);
+	}
+	case SubItem::Sponsored: {
+		if (history->useTopPromotion()) {
+			const auto type = history->topPromotionType();
+			if (type.isEmpty()) {
+				return tr::lng_sr_chat_sponsored(tr::now);
+			}
+			const auto custom = Lang::GetNonDefaultValue(
+				"cloud_lng_badge_psa_" + type.toUtf8());
+			return custom.isEmpty()
+				? tr::lng_badge_psa_default(tr::now)
+				: custom;
+		}
+		return {};
+	}
+	case SubItem::Stories: {
+		if (peer->hasActiveStories()) {
+			if (peer->hasUnreadStories()) {
+				const auto source = peer->owner().stories().source(
+					peer->id);
+				const auto count = source
+					? int(source->unreadCount())
+					: 1;
+				return tr::lng_sr_chat_stories_unread(
+					tr::now,
+					lt_count,
+					count);
+			}
+			return tr::lng_sr_chat_stories_read(tr::now);
+		}
+		return {};
+	}
+	case SubItem::Autodelete:
+		if (peer->messagesTTL()) {
+			return tr::lng_sr_chat_autodelete(tr::now);
+		}
+		return {};
+	case SubItem::Subscription:
+		if (Data::ChannelHasSubscriptionUntilDate(peer->asChannel())) {
+			return tr::lng_sr_chat_subscribed(tr::now);
+		}
+		return {};
+	case SubItem::Closed:
+		return {};
+	case SubItem::Forward: {
+		const auto chatItem = history->chatListMessage();
+		if (!chatItem || chatItem->isService()) {
+			return {};
+		}
+		if (chatItem->Get<HistoryMessageForwarded>()) {
+			return tr::lng_sr_chat_forwarded(tr::now);
+		}
+		if (chatItem->replyToStory().valid()) {
+			return tr::lng_sr_chat_story_reply(tr::now);
+		}
+		return {};
+	}
+	case SubItem::Folders: {
+		const auto entry = row->entry();
+		if (!entry->hasChatsFilterTags(filterId)) {
+			return {};
+		}
+		QStringList tags;
+		const auto &list = row->history()->session().data().chatsFilters().list();
+		for (const auto &filter : list) {
+			if (!entry->inChatList(filter.id())
+				|| (filter.id() == filterId)) {
+				continue;
+			}
+			tags << filter.title().text.text;
+		}
+		return tags.join(u", "_q);
+	}
+	case SubItem::Count: break;
+	}
+	return {};
+}
+
+std::vector<SubItem> ActiveSubItems(
+		not_null<const Row*> row,
+		FilterId filterId) {
+	auto result = std::vector<SubItem>();
+	result.reserve(int(SubItem::Count));
+	for (auto i = 0; i != int(SubItem::Count); ++i) {
+		const auto item = SubItem(i);
+		if (!SubItemValue(row, filterId, item).isEmpty()) {
+			result.push_back(item);
+		}
+	}
+	return result;
+}
+
+QString HashtagAccessibilityName(QStringView tag) {
+	return tr::lng_sr_chat_hashtag(tr::now)
+		+ u": #"_q
+		+ tag.toString();
+}
+
+QString PeerSearchResultAccessibilityName(
+		not_null<PeerData*> peer,
+		bool sponsored) {
+	QStringList parts;
+
+	const auto type = ChatTypeString(peer);
+	if (!type.isEmpty()) {
+		parts << type;
+	}
+
+	parts << peer->name();
+
+	if (peer->isScam()) {
+		parts << tr::lng_sr_chat_scam(tr::now);
+	} else if (peer->isFake()) {
+		parts << tr::lng_sr_chat_fake(tr::now);
+	}
+
+	if (const auto user = peer->asUser()) {
+		if (user->isPremium()) {
+			parts << tr::lng_premium(tr::now);
+		}
+	}
+
+	if (peer->isVerified()) {
+		parts << tr::lng_sr_chat_verified(tr::now);
+	}
+
+	if (const auto user = peer->asUser()) {
+		if (Data::IsUserOnline(user)) {
+			parts << tr::lng_sr_chat_online(tr::now);
+		}
+	}
+
+	if (sponsored) {
+		parts << tr::lng_sr_chat_sponsored(tr::now);
+	}
+
+	return parts.join(u", "_q);
+}
+
+QString SearchedMessageAccessibilityName(
+		not_null<const FakeRow*> row) {
+	const auto item = row->item();
+	const auto history = item->history();
+	const auto peer = history->peer;
+
+	QStringList parts;
+	const auto type = ChatTypeString(peer);
+	if (!type.isEmpty()) {
+		parts << type;
+	}
+	parts << peer->name();
+	if (const auto topic = row->topic()) {
+		parts << (topic->isGeneral()
+			? Data::ForumGeneralIconTitle()
+			: topic->title());
+	}
+	parts += MessageTailParts(item, history, peer);
+	return parts.join(u", "_q);
+}
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget_accessibility.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget_accessibility.h
new file mode 100644
index 00000000000000..5a1844869b6f58
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget_accessibility.h
@@ -0,0 +1,64 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "dialogs/dialogs_key.h"
+
+namespace Dialogs {
+
+class Row;
+class FakeRow;
+
+enum class SubItem : int {
+	Type,
+	Name,
+	Warning,
+	Premium,
+	Verified,
+	Activity,
+	Muted,
+	Pinned,
+	Draft,
+	Unread,
+	Mention,
+	Sender,
+	Message,
+	Delivery,
+	Reactions,
+	Time,
+	Sponsored,
+	Stories,
+	Autodelete,
+	Subscription,
+	Closed,
+	Forward,
+	Folders,
+
+	Count,
+};
+
+[[nodiscard]] QString RowAccessibilityName(
+	not_null<const Row*> row,
+	FilterId filterId);
+[[nodiscard]] QString SubItemLabel(SubItem item);
+[[nodiscard]] QString SubItemValue(
+	not_null<const Row*> row,
+	FilterId filterId,
+	SubItem item);
+[[nodiscard]] std::vector<SubItem> ActiveSubItems(
+	not_null<const Row*> row,
+	FilterId filterId);
+
+[[nodiscard]] QString HashtagAccessibilityName(QStringView tag);
+[[nodiscard]] QString PeerSearchResultAccessibilityName(
+	not_null<PeerData*> peer,
+	bool sponsored);
+[[nodiscard]] QString SearchedMessageAccessibilityName(
+	not_null<const FakeRow*> row);
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_key.h b/Telegram/SourceFiles/dialogs/dialogs_key.h
index 8b5d22ed7040dc..f74fba9815ba9e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_key.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_key.h
@@ -113,6 +113,7 @@ struct EntryState {
 		Replies,
 		SavedSublist,
 		ContextMenu,
+		SubsectionTabsMenu,
 		ShortcutMessages,
 	};
 
@@ -120,9 +121,21 @@ struct EntryState {
 	Section section = Section::History;
 	FilterId filterId = 0;
 	FullReplyTo currentReplyTo;
+	SuggestOptions currentSuggest;
 
-	friend inline auto operator<=>(EntryState, EntryState) noexcept
-		= default;
+	friend inline auto operator<=>(
+		const EntryState&,
+		const EntryState&) = default;
+	friend inline bool operator==(
+		const EntryState&,
+		const EntryState&) = default;
+};
+
+enum class ChatTypeFilter : uchar {
+	All,
+	Private,
+	Groups,
+	Channels,
 };
 
 struct SearchState {
@@ -130,6 +143,7 @@ struct SearchState {
 	PeerData *fromPeer = nullptr;
 	std::vector<Data::ReactionId> tags;
 	ChatSearchTab tab = {};
+	ChatTypeFilter filter = ChatTypeFilter::All;
 	QString query;
 
 	[[nodiscard]] bool empty() const;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_list.cpp b/Telegram/SourceFiles/dialogs/dialogs_list.cpp
index 362f8b857bcdf3..3d6515baba2eef 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_list.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_list.cpp
@@ -32,7 +32,7 @@ not_null<Row*> List::addToEnd(Key key) {
 		key,
 		std::make_unique<Row>(key, _rows.size(), height())
 	).first->second.get();
-	result->recountHeight(_narrowRatio);
+	result->recountHeight(_narrowRatio, _filterId);
 	_rows.emplace_back(result);
 	if (_sortMode == SortMode::Date) {
 		adjustByDate(result);
@@ -84,6 +84,16 @@ void List::adjustByName(not_null<Row*> row) {
 void List::adjustByDate(not_null<Row*> row) {
 	Expects(_sortMode == SortMode::Date);
 
+	if (_frozen) {
+		const auto canAdjustWhileFrozen = _pendingAdjust.empty()
+			&& (row->entry()->fixedOnTopIndex()
+				|| row->entry()->isPinnedDialog(_filterId));
+		if (!canAdjustWhileFrozen) {
+			_pendingAdjust.emplace(row);
+			return;
+		}
+	}
+
 	const auto key = row->sortKey(_filterId);
 	const auto index = row->index();
 	const auto i = _rows.begin() + index;
@@ -103,6 +113,53 @@ void List::adjustByDate(not_null<Row*> row) {
 	}
 }
 
+void List::freeze() {
+	_frozen = true;
+}
+
+void List::unfreeze() {
+	_frozen = false;
+	auto pending = base::take(_pendingAdjust);
+	if (pending.empty()) {
+		return;
+	} else if (pending.size() == 1) {
+		adjustByDate(*pending.begin());
+		return;
+	}
+	for (const auto &row : pending) {
+		adjustByDate(row);
+	}
+	if (!sortedByDate()) {
+		sortByDate();
+	}
+}
+
+bool List::sortedByDate() const {
+	Expects(_sortMode == SortMode::Date);
+
+	for (auto i = 1, count = int(_rows.size()); i != count; ++i) {
+		if (_rows[i - 1]->sortKey(_filterId) < _rows[i]->sortKey(_filterId)) {
+			return false;
+		}
+	}
+	return true;
+}
+
+void List::sortByDate() {
+	Expects(_sortMode == SortMode::Date);
+
+	ranges::stable_sort(_rows, [&](Row *a, Row *b) {
+		return a->sortKey(_filterId) > b->sortKey(_filterId);
+	});
+	auto top = 0;
+	for (auto i = 0, count = int(_rows.size()); i != count; ++i) {
+		const auto row = _rows[i];
+		row->_index = i;
+		row->_top = top;
+		top += row->height();
+	}
+}
+
 bool List::updateHeight(Key key, float64 narrowRatio) {
 	const auto i = _rowByKey.find(key);
 	if (i == _rowByKey.cend()) {
@@ -112,7 +169,7 @@ bool List::updateHeight(Key key, float64 narrowRatio) {
 	const auto index = row->index();
 	auto top = row->top();
 	const auto was = row->height();
-	row->recountHeight(narrowRatio);
+	row->recountHeight(narrowRatio, _filterId);
 	if (row->height() == was) {
 		return false;
 	}
@@ -129,7 +186,7 @@ bool List::updateHeights(float64 narrowRatio) {
 	auto top = 0;
 	for (const auto &row : _rows) {
 		row->_top = top;
-		row->recountHeight(narrowRatio);
+		row->recountHeight(narrowRatio, _filterId);
 		top += row->height();
 	}
 	return (height() != was);
@@ -170,6 +227,7 @@ bool List::remove(Key key, Row *replacedBy) {
 	}
 
 	const auto row = i->second.get();
+	_pendingAdjust.remove(row);
 	row->entry()->owner().dialogsRowReplaced({ row, replacedBy });
 
 	auto top = row->top();
@@ -198,7 +256,7 @@ Row *List::rowAtY(int y) const {
 
 List::iterator List::findByY(int y) const {
 	return ranges::lower_bound(_rows, y, ranges::less(), [](const Row *row) {
-		return row->top() + row->height();
+		return row->top() + row->height() - 1;
 	});
 }
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_list.h b/Telegram/SourceFiles/dialogs/dialogs_list.h
index 7b1bd84f245c78..050852a37d383f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_list.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_list.h
@@ -24,6 +24,8 @@ class List final {
 	~List() = default;
 
 	void clear() {
+		_frozen = false;
+		_pendingAdjust.clear();
 		_rows.clear();
 		_rowByKey.clear();
 	}
@@ -52,6 +54,8 @@ class List final {
 	not_null<Row*> addByName(Key key);
 	bool moveToTop(Key key);
 	void adjustByDate(not_null<Row*> row);
+	void freeze();
+	void unfreeze();
 	bool updateHeight(Key key, float64 narrowRatio);
 	bool updateHeights(float64 narrowRatio);
 	bool remove(Key key, Row *replacedBy = nullptr);
@@ -74,6 +78,8 @@ class List final {
 
 private:
 	void adjustByName(not_null<Row*> row);
+	[[nodiscard]] bool sortedByDate() const;
+	void sortByDate();
 	void rotate(
 		std::vector<not_null<Row*>>::iterator first,
 		std::vector<not_null<Row*>>::iterator middle,
@@ -82,8 +88,10 @@ class List final {
 	SortMode _sortMode = SortMode();
 	FilterId _filterId = 0;
 	float64 _narrowRatio = 0.;
+	bool _frozen = false;
 	std::vector<not_null<Row*>> _rows;
 	std::map<Key, std::unique_ptr<Row>> _rowByKey;
+	base::flat_set<not_null<Row*>> _pendingAdjust;
 
 };
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_main_list.cpp b/Telegram/SourceFiles/dialogs/dialogs_main_list.cpp
index 9c9ad67baea492..affe4fab3d5195 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_main_list.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_main_list.cpp
@@ -27,12 +27,12 @@ MainList::MainList(
 
 	std::move(
 		pinnedLimit
-	) | rpl::start_with_next([=](int limit) {
-		_pinned.setLimit(limit);
+	) | rpl::on_next([=](int limit) {
+		_pinned.setLimit(std::max(limit, 1));
 	}, _lifetime);
 
 	session->changes().realtimeNameUpdates(
-	) | rpl::start_with_next([=](const Data::NameUpdate &update) {
+	) | rpl::on_next([=](const Data::NameUpdate &update) {
 		_all.peerNameChanged(_filterId, update.peer, update.oldFirstLetters);
 	}, _lifetime);
 }
@@ -120,6 +120,10 @@ void MainList::unreadStateChanged(
 	const auto notify = !useClouded || wasState.known;
 	const auto notifier = unreadStateChangeNotifier(notify);
 	_unreadState += nowState - wasState;
+	if (_unreadState.chatsMuted > _unreadState.chats
+		|| _unreadState.messagesMuted > _unreadState.messages) {
+		[[maybe_unused]] int a = 0;
+	}
 	if (updateCloudUnread) {
 		Assert(nowState.known);
 		_cloudUnreadState += nowState - wasState;
@@ -145,6 +149,10 @@ void MainList::unreadEntryChanged(
 	} else {
 		_unreadState -= state;
 	}
+	if (_unreadState.chatsMuted > _unreadState.chats
+		|| _unreadState.messagesMuted > _unreadState.messages) {
+		[[maybe_unused]] int a = 0;
+	}
 	if (updateCloudUnread) {
 		if (added) {
 			_cloudUnreadState += state;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_main_list.h b/Telegram/SourceFiles/dialogs/dialogs_main_list.h
index 157e48e314d27a..1a5f86c3a52a4e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_main_list.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_main_list.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "dialogs/dialogs_common.h"
 #include "dialogs/dialogs_indexed_list.h"
 #include "dialogs/dialogs_pinned_list.h"
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_pinned_list.cpp b/Telegram/SourceFiles/dialogs/dialogs_pinned_list.cpp
index cac85b3b39302f..fe7af22999b5e9 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_pinned_list.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_pinned_list.cpp
@@ -66,7 +66,7 @@ void PinnedList::setPinned(Key key, bool pinned) {
 		const auto index = int(it - begin(_data));
 		_data.erase(it);
 		key.entry()->cachePinnedIndex(_filterId, 0);
-		for (auto i = index, count = int(size(_data)); i != count; ++i) {
+		for (auto i = index; i < int(size(_data)); ++i) {
 			_data[i].entry()->cachePinnedIndex(_filterId, i + 1);
 		}
 	}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_quick_action.cpp b/Telegram/SourceFiles/dialogs/dialogs_quick_action.cpp
new file mode 100644
index 00000000000000..5d8618f96ec374
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/dialogs_quick_action.cpp
@@ -0,0 +1,283 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/dialogs_quick_action.h"
+
+#include "dialogs/ui/dialogs_quick_action_context.h"
+#include "apiwrap.h"
+#include "data/data_histories.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "dialogs/dialogs_entry.h"
+#include "history/history.h"
+#include "lang/lang_instance.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_session.h"
+#include "menu/menu_mute.h"
+#include "ui/toast/toast.h"
+#include "window/window_peer_menu.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_dialogs.h"
+
+namespace Dialogs {
+namespace {
+
+const style::font &SwipeActionFont(
+		Dialogs::Ui::QuickDialogActionLabel action,
+		int availableWidth) {
+	struct Entry final {
+		Dialogs::Ui::QuickDialogActionLabel action;
+		QString langId;
+		style::font font;
+	};
+	static auto Fonts = std::vector<Entry>();
+	for (auto &entry : Fonts) {
+		if (entry.action == action) {
+			if (entry.langId == Lang::GetInstance().id()) {
+				return entry.font;
+			}
+		}
+	}
+	constexpr auto kNormalFontSize = 13;
+	constexpr auto kMinFontSize = 5;
+	for (auto i = kNormalFontSize; i >= kMinFontSize; --i) {
+		auto font = style::font(
+			style::ConvertScale(i, style::Scale()),
+			st::semiboldFont->flags(),
+			st::semiboldFont->family());
+		if (font->width(ResolveQuickDialogLabel(action)) <= availableWidth
+			|| i == kMinFontSize) {
+			Fonts.emplace_back(Entry{
+				.action = action,
+				.langId = Lang::GetInstance().id(),
+				.font = std::move(font),
+			});
+			return Fonts.back().font;
+		}
+	}
+	Unexpected("SwipeActionFont: can't find font.");
+}
+
+} // namespace
+
+void PerformQuickDialogAction(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		Ui::QuickDialogAction action,
+		FilterId filterId) {
+	const auto history = peer->owner().history(peer);
+	if (action == Dialogs::Ui::QuickDialogAction::Mute) {
+		const auto isMuted = rpl::variable<bool>(
+			MuteMenu::ThreadDescriptor(history).isMutedValue()).current();
+		MuteMenu::ThreadDescriptor(history).updateMutePeriod(isMuted
+			? 0
+			: std::numeric_limits<TimeId>::max());
+		controller->showToast({
+			.text = { isMuted
+				? tr::lng_quick_dialog_action_toast_unmute_success(tr::now)
+				: tr::lng_quick_dialog_action_toast_mute_success(tr::now) },
+			.iconLottie = isMuted
+				? u"toast/unmute"_q
+				: u"toast/mute"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
+	} else if (action == Dialogs::Ui::QuickDialogAction::Pin) {
+		const auto entry = (Dialogs::Entry*)(history);
+		const auto isPinned = entry->isPinnedDialog(filterId);
+		const auto onToggled = isPinned
+			? Fn<void()>(nullptr)
+			: [=] {
+				controller->showToast({
+					.text = { tr::lng_quick_dialog_action_toast_pin_success(
+						tr::now) },
+					.iconLottie = u"toast/pin"_q,
+					.iconLottieSize = st::toastLottieIconSize,
+				});
+			};
+		Window::TogglePinnedThread(controller, entry, filterId, onToggled);
+		if (isPinned) {
+			controller->showToast({
+				.text = { tr::lng_quick_dialog_action_toast_unpin_success(
+					tr::now) },
+				.iconLottie = u"toast/unpin"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		}
+	} else if (action == Dialogs::Ui::QuickDialogAction::Read) {
+		if (Window::IsUnreadThread(history)) {
+			Window::MarkAsReadThread(history);
+			controller->showToast(
+				tr::lng_quick_dialog_action_toast_read_success(tr::now));
+		} else if (history) {
+			peer->owner().histories().changeDialogUnreadMark(history, true);
+			controller->showToast(
+				tr::lng_quick_dialog_action_toast_unread_success(tr::now));
+		}
+	} else if (action == Dialogs::Ui::QuickDialogAction::Archive) {
+		const auto isArchived = Window::IsArchived(history);
+		controller->showToast(isArchived
+			? tr::lng_quick_dialog_action_toast_unarchive_success(tr::now)
+			: tr::lng_quick_dialog_action_toast_archive_success(tr::now));
+		history->session().api().toggleHistoryArchived(
+			history,
+			!isArchived,
+			[] {});
+	} else if (action == Dialogs::Ui::QuickDialogAction::Delete) {
+		Window::DeleteAndLeaveHandler(controller, peer)();
+	}
+}
+
+QString ResolveQuickDialogLottieIconName(Ui::QuickDialogActionLabel action) {
+	switch (action) {
+	case Ui::QuickDialogActionLabel::Mute:
+		return u"swipe_mute"_q;
+	case Ui::QuickDialogActionLabel::Unmute:
+		return u"swipe_unmute"_q;
+	case Ui::QuickDialogActionLabel::Pin:
+		return u"swipe_pin"_q;
+	case Ui::QuickDialogActionLabel::Unpin:
+		return u"swipe_unpin"_q;
+	case Ui::QuickDialogActionLabel::Read:
+		return u"swipe_read"_q;
+	case Ui::QuickDialogActionLabel::Unread:
+		return u"swipe_unread"_q;
+	case Ui::QuickDialogActionLabel::Archive:
+		return u"swipe_archive"_q;
+	case Ui::QuickDialogActionLabel::Unarchive:
+		return u"swipe_unarchive"_q;
+	case Ui::QuickDialogActionLabel::Delete:
+		return u"swipe_delete"_q;
+	default:
+		return u"swipe_disabled"_q;
+	}
+}
+
+Ui::QuickDialogActionLabel ResolveQuickDialogLabel(
+		not_null<History*> history,
+		Ui::QuickDialogAction action,
+		FilterId filterId) {
+	if (action == Dialogs::Ui::QuickDialogAction::Mute) {
+		if (history->peer->isSelf()) {
+			return Ui::QuickDialogActionLabel::Disabled;
+		}
+		const auto isMuted = rpl::variable<bool>(
+			MuteMenu::ThreadDescriptor(history).isMutedValue()).current();
+		return isMuted
+			? Ui::QuickDialogActionLabel::Unmute
+			: Ui::QuickDialogActionLabel::Mute;
+	} else if (action == Dialogs::Ui::QuickDialogAction::Pin) {
+		const auto entry = (Dialogs::Entry*)(history);
+		return entry->isPinnedDialog(filterId)
+			? Ui::QuickDialogActionLabel::Unpin
+			: Ui::QuickDialogActionLabel::Pin;
+	} else if (action == Dialogs::Ui::QuickDialogAction::Read) {
+		const auto unread = Window::IsUnreadThread(history);
+		if (history->isForum() && !unread) {
+			return Ui::QuickDialogActionLabel::Disabled;
+		}
+		return unread
+			? Ui::QuickDialogActionLabel::Read
+			: Ui::QuickDialogActionLabel::Unread;
+	} else if (action == Dialogs::Ui::QuickDialogAction::Archive) {
+		if (!Window::CanArchive(history, history->peer)) {
+			return Ui::QuickDialogActionLabel::Disabled;
+		}
+		return Window::IsArchived(history)
+			? Ui::QuickDialogActionLabel::Unarchive
+			: Ui::QuickDialogActionLabel::Archive;
+	} else if (action == Dialogs::Ui::QuickDialogAction::Delete) {
+		return Ui::QuickDialogActionLabel::Delete;
+	}
+	return Ui::QuickDialogActionLabel::Disabled;
+}
+
+QString ResolveQuickDialogLabel(Ui::QuickDialogActionLabel action) {
+	switch (action) {
+	case Ui::QuickDialogActionLabel::Mute:
+		return tr::lng_settings_quick_dialog_action_mute(tr::now);
+	case Ui::QuickDialogActionLabel::Unmute:
+		return tr::lng_settings_quick_dialog_action_unmute(tr::now);
+	case Ui::QuickDialogActionLabel::Pin:
+		return tr::lng_settings_quick_dialog_action_pin(tr::now);
+	case Ui::QuickDialogActionLabel::Unpin:
+		return tr::lng_settings_quick_dialog_action_unpin(tr::now);
+	case Ui::QuickDialogActionLabel::Read:
+		return tr::lng_settings_quick_dialog_action_read(tr::now);
+	case Ui::QuickDialogActionLabel::Unread:
+		return tr::lng_settings_quick_dialog_action_unread(tr::now);
+	case Ui::QuickDialogActionLabel::Archive:
+		return tr::lng_settings_quick_dialog_action_archive(tr::now);
+	case Ui::QuickDialogActionLabel::Unarchive:
+		return tr::lng_settings_quick_dialog_action_unarchive(tr::now);
+	case Ui::QuickDialogActionLabel::Delete:
+		return tr::lng_settings_quick_dialog_action_delete(tr::now);
+	default:
+		return tr::lng_settings_quick_dialog_action_disabled(tr::now);
+	};
+}
+
+const style::color &ResolveQuickActionBg(
+		Ui::QuickDialogActionLabel action) {
+	switch (action) {
+	case Ui::QuickDialogActionLabel::Delete:
+		return st::attentionButtonFg;
+	case Ui::QuickDialogActionLabel::Disabled:
+		return st::windowSubTextFgOver;
+	case Ui::QuickDialogActionLabel::Mute:
+	case Ui::QuickDialogActionLabel::Unmute:
+	case Ui::QuickDialogActionLabel::Pin:
+	case Ui::QuickDialogActionLabel::Unpin:
+	case Ui::QuickDialogActionLabel::Read:
+	case Ui::QuickDialogActionLabel::Unread:
+	case Ui::QuickDialogActionLabel::Archive:
+	case Ui::QuickDialogActionLabel::Unarchive:
+	default:
+		return st::windowBgActive;
+	};
+}
+
+const style::color &ResolveQuickActionBgActive(
+		Ui::QuickDialogActionLabel action) {
+	return st::windowSubTextFgOver;
+}
+
+void DrawQuickAction(
+		QPainter &p,
+		const QRect &rect,
+		not_null<Lottie::Icon*> icon,
+		Ui::QuickDialogActionLabel label,
+		float64 iconRatio,
+		bool twoLines) {
+	const auto iconSize = st::dialogsQuickActionSize * iconRatio;
+	const auto innerHeight = iconSize * 2;
+	const auto top = (rect.height() - innerHeight) / 2;
+	icon->paint(p, rect.x() + (rect.width() - iconSize) / 2, top);
+	p.setPen(st::premiumButtonFg);
+	p.setBrush(Qt::NoBrush);
+	const auto availableWidth = rect.width();
+	p.setFont(SwipeActionFont(label, availableWidth));
+	if (twoLines) {
+		auto text = ResolveQuickDialogLabel(label);
+		const auto index = text.indexOf(' ');
+		if (index != -1) {
+			text = text.replace(index, 1, '\n');
+		}
+		p.drawText(
+			QRect(rect.x(), top, availableWidth, innerHeight),
+			std::move(text),
+			style::al_bottom);
+	} else {
+		p.drawText(
+			QRect(rect.x(), top, availableWidth, innerHeight),
+			ResolveQuickDialogLabel(label),
+			style::al_bottom);
+	}
+}
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_quick_action.h b/Telegram/SourceFiles/dialogs/dialogs_quick_action.h
new file mode 100644
index 00000000000000..4ba26f291d02d9
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/dialogs_quick_action.h
@@ -0,0 +1,57 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class History;
+class PeerData;
+
+namespace Dialogs::Ui {
+enum class QuickDialogAction;
+enum class QuickDialogActionLabel;
+} // namespace Dialogs::Ui
+
+namespace Lottie {
+class Icon;
+} // namespace Lottie
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Dialogs {
+
+void PerformQuickDialogAction(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> peer,
+	Ui::QuickDialogAction action,
+	FilterId filterId);
+
+[[nodiscard]] QString ResolveQuickDialogLottieIconName(
+	Ui::QuickDialogActionLabel action);
+
+[[nodiscard]] Ui::QuickDialogActionLabel ResolveQuickDialogLabel(
+	not_null<History*> history,
+	Ui::QuickDialogAction action,
+	FilterId filterId);
+
+[[nodiscard]] QString ResolveQuickDialogLabel(Ui::QuickDialogActionLabel);
+
+[[nodiscard]] const style::color &ResolveQuickActionBg(
+	Ui::QuickDialogActionLabel);
+[[nodiscard]] const style::color &ResolveQuickActionBgActive(
+	Ui::QuickDialogActionLabel);
+
+void DrawQuickAction(
+	QPainter &p,
+	const QRect &rect,
+	not_null<Lottie::Icon*> icon,
+	Ui::QuickDialogActionLabel label,
+	float64 iconRatio = 1.,
+	bool twoLines = false);
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
index 5a0730f86d96b6..3b01b6e83f74fe 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
@@ -12,7 +12,10 @@ For license and copyright information please follow this link:
 #include "ui/effects/credits_graphics.h"
 #include "ui/effects/outline_segments.h"
 #include "ui/effects/ripple_animation.h"
+#include "ui/effects/ttl_icon.h"
+#include "ui/effects/round_checkbox.h"
 #include "ui/image/image_prepare.h"
+#include "ui/text/custom_emoji_text_badge.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
@@ -30,6 +33,7 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
 #include "base/unixtime.h"
+#include "styles/style_calls.h"
 #include "styles/style_dialogs.h"
 
 namespace Dialogs {
@@ -131,30 +135,7 @@ constexpr auto kBlurRadius = 24;
 		- st::dialogsTTLBadgeInnerMargins;
 	const auto ttlText = Ui::FormatTTLTiny(ttl);
 
-	q.setFont(st::dialogsScamFont);
-	q.setPen(st::premiumButtonFg);
-	q.drawText(
-		innerRect,
-		(ttlText.size() > 2) ? ttlText.mid(0, 2) : ttlText,
-		style::al_center);
-
-	constexpr auto kPenWidth = 1.5;
-
-	const auto penWidth = style::ConvertScaleExact(kPenWidth);
-	auto pen = QPen(st::premiumButtonFg);
-	pen.setJoinStyle(Qt::RoundJoin);
-	pen.setCapStyle(Qt::RoundCap);
-	pen.setWidthF(penWidth);
-
-	q.setPen(pen);
-	q.setBrush(Qt::NoBrush);
-	q.drawArc(innerRect, arc::kQuarterLength, arc::kHalfLength);
-
-	q.setClipRect(innerRect
-		- QMargins(innerRect.width() / 2, -penWidth, -penWidth, -penWidth));
-	pen.setStyle(Qt::DotLine);
-	q.setPen(pen);
-	q.drawEllipse(innerRect);
+	Ui::PaintTimerIcon(q, innerRect, ttlText, st::premiumButtonFg->c);
 
 	return result;
 }
@@ -302,7 +283,8 @@ void BasicRow::paintUserpic(
 		not_null<Entry*> entry,
 		PeerData *peer,
 		Ui::VideoUserpic *videoUserpic,
-		const Ui::PaintContext &context) const {
+		const Ui::PaintContext &context,
+		bool hasUnreadBadgesAbove) const {
 	PaintUserpic(p, entry, peer, videoUserpic, _userpic, context);
 }
 
@@ -316,21 +298,32 @@ Row::~Row() {
 	clearTopicJumpRipple();
 }
 
-void Row::recountHeight(float64 narrowRatio) {
-	if (const auto history = _id.history()) {
-		_height = history->isForum()
-			? anim::interpolate(
-				st::forumDialogRow.height,
-				st::defaultDialogRow.height,
-				narrowRatio)
-			: st::defaultDialogRow.height;
-	} else if (_id.folder()) {
-		_height = st::defaultDialogRow.height;
-	} else if (_id.topic()) {
-		_height = st::forumTopicRow.height;
-	} else {
-		_height = st::defaultDialogRow.height;
+const style::DialogRow &Row::ComputeSt(
+		not_null<const Entry*> entry,
+		FilterId filterId) {
+	if (const auto history = entry->asHistory()) {
+		const auto hasTags = entry->hasChatsFilterTags(filterId);
+		const auto wideRow = history->peer->displayAsForum()
+			|| history->amMonoforumAdmin();
+		return wideRow
+			? (hasTags ? st::taggedForumDialogRow : st::forumDialogRow)
+			: hasTags
+			? st::taggedDialogRow
+			: st::defaultDialogRow;
+	} else if (entry->asTopic()) {
+		return st::forumTopicRow;
 	}
+	return st::defaultDialogRow;
+}
+
+void Row::recountHeight(float64 narrowRatio, FilterId filterId) {
+	const auto &st = ComputeSt(_id.entry(), filterId);
+	_height = ((&st == &st::defaultDialogRow) || !_id.history())
+		? st::defaultDialogRow.height
+		: anim::interpolate(
+			st.height,
+			st::defaultDialogRow.height,
+			narrowRatio);
 }
 
 uint64 Row::sortKey(FilterId filterId) const {
@@ -363,12 +356,15 @@ void Row::setCornerBadgeShown(
 
 void Row::updateCornerBadgeShown(
 		not_null<PeerData*> peer,
-		Fn<void()> updateCallback) const {
+		Fn<void()> updateCallback,
+		bool hasUnreadBadgesAbove) const {
 	const auto user = peer->asUser();
 	const auto now = user ? base::unixtime::now() : TimeId();
 	const auto channel = user ? nullptr : peer->asChannel();
 	const auto nextLayer = [&] {
-		if (user && Data::IsUserOnline(user, now)) {
+		if (hasUnreadBadgesAbove) {
+			return kNoneLayer;
+		} else if (user && Data::IsUserOnline(user, now)) {
 			return kTopLayer;
 		} else if (channel
 			&& (Data::ChannelHasActiveCall(channel)
@@ -432,29 +428,44 @@ void Row::PaintCornerBadgeFrame(
 		q.restore();
 
 		const auto outline = QRectF(0, 0, photoSize, photoSize);
-		const auto storiesUnreadCount = data->storiesUnreadCount;
-		const auto storiesUnreadBrush = [&] {
-			if (context.active || !storiesUnreadCount) {
-				return st::dialogsUnreadBgMutedActive->b;
-			}
-			auto gradient = Ui::UnreadStoryOutlineGradient(outline);
-			return QBrush(gradient);
-		}();
-		const auto storiesBrush = context.active
-			? st::dialogsUnreadBgMutedActive->b
-			: st::dialogsUnreadBgMuted->b;
 		const auto storiesUnread = st::dialogsStoriesFull.lineTwice / 2.;
 		const auto storiesLine = st::dialogsStoriesFull.lineReadTwice / 2.;
 		auto segments = std::vector<Ui::OutlineSegment>();
-		segments.reserve(storiesCount);
-		const auto storiesReadCount = storiesCount - storiesUnreadCount;
-		for (auto i = 0; i != storiesReadCount; ++i) {
-			segments.push_back({ storiesBrush, storiesLine });
+		if (data->storiesHasVideoStream) {
+			const auto storiesVideoStreamBrush = st::attentionButtonFg->b;
+			segments.push_back({ storiesVideoStreamBrush, storiesUnread });
+		} else {
+			const auto storiesUnreadCount = data->storiesUnreadCount;
+			const auto storiesUnreadBrush = [&] {
+				if (context.active || !storiesUnreadCount) {
+					return st::dialogsUnreadBgMutedActive->b;
+				}
+				auto gradient = Ui::UnreadStoryOutlineGradient(outline);
+				return QBrush(gradient);
+			}();
+			const auto storiesBrush = context.active
+				? st::dialogsUnreadBgMutedActive->b
+				: st::dialogsUnreadBgMuted->b;
+			segments.reserve(storiesCount);
+			const auto storiesReadCount = storiesCount - storiesUnreadCount;
+			for (auto i = 0; i != storiesReadCount; ++i) {
+				segments.push_back({ storiesBrush, storiesLine });
+			}
+			for (auto i = 0; i != storiesUnreadCount; ++i) {
+				segments.push_back({ storiesUnreadBrush, storiesUnread });
+			}
 		}
-		for (auto i = 0; i != storiesUnreadCount; ++i) {
-			segments.push_back({ storiesUnreadBrush, storiesUnread });
+		if (peer && (peer->forum() || peer->monoforum())) {
+			const auto radius = context.st->photoSize
+				* Ui::ForumUserpicRadiusMultiplier();
+			Ui::PaintOutlineSegments(q, outline, radius, segments);
+		} else {
+			Ui::PaintOutlineSegments(q, outline, segments);
+		}
+
+		if (data->storiesHasVideoStream) {
+			Ui::PaintLiveBadge(q, 0, 0, photoSize);
 		}
-		Ui::PaintOutlineSegments(q, outline, segments);
 	}
 
 	if (subscribed) {
@@ -525,9 +536,10 @@ void Row::paintUserpic(
 		not_null<Entry*> entry,
 		PeerData *peer,
 		Ui::VideoUserpic *videoUserpic,
-		const Ui::PaintContext &context) const {
+		const Ui::PaintContext &context,
+		bool hasUnreadBadgesAbove) const {
 	if (peer) {
-		updateCornerBadgeShown(peer);
+		updateCornerBadgeShown(peer, nullptr, hasUnreadBadgesAbove);
 	}
 
 	const auto cornerBadgeShown = !_cornerBadgeUserpic
@@ -540,10 +552,10 @@ void Row::paintUserpic(
 	const auto storiesHas = storiesPeer
 		? storiesPeer->hasActiveStories()
 		: storiesFolder
-		? storiesFolder->storiesCount()
+		? (storiesFolder->storiesCount() > 0)
 		: false;
 	if (!cornerBadgeShown && !storiesHas) {
-		BasicRow::paintUserpic(p, entry, peer, videoUserpic, context);
+		BasicRow::paintUserpic(p, entry, peer, videoUserpic, context, false);
 		if (!peer || !_cornerBadgeShown) {
 			_cornerBadgeUserpic = nullptr;
 		}
@@ -575,6 +587,11 @@ void Row::paintUserpic(
 		: (storiesPeer && storiesPeer->hasUnreadStories())
 		? 1
 		: 0;
+	const auto storiesHasVideoStream = storiesSource
+		? storiesSource->hasVideoStream
+		: (storiesPeer && storiesPeer->hasActiveVideoStream())
+		? 1
+		: 0;
 	const auto limit = Ui::kOutlineSegmentsMax;
 	const auto storiesCount = std::min(storiesCountReal, limit);
 	const auto storiesUnreadCount = std::min(storiesUnreadCountReal, limit);
@@ -603,12 +620,14 @@ void Row::paintUserpic(
 		|| _cornerBadgeUserpic->frameIndex != frameIndex
 		|| _cornerBadgeUserpic->storiesCount != storiesCount
 		|| _cornerBadgeUserpic->storiesUnreadCount != storiesUnreadCount
+		|| _cornerBadgeUserpic->storiesHasVideoStream != storiesHasVideoStream
 		|| videoUserpic) {
 		_cornerBadgeUserpic->key = key;
 		_cornerBadgeUserpic->paletteVersion = paletteVersion;
 		_cornerBadgeUserpic->active = active;
 		_cornerBadgeUserpic->storiesCount = storiesCount;
 		_cornerBadgeUserpic->storiesUnreadCount = storiesUnreadCount;
+		_cornerBadgeUserpic->storiesHasVideoStream = storiesHasVideoStream;
 		_cornerBadgeUserpic->frameIndex = frameIndex;
 		_cornerBadgeUserpic->layersManager.markFrameShown();
 		PaintCornerBadgeFrame(
@@ -741,4 +760,10 @@ const Ui::Text::String &FakeRow::name() const {
 	return _name;
 }
 
+DateText FakeRow::dateText(
+		TimeId date,
+		crl::time now) const {
+	return ResolveDateText(_dateCache, date, now);
+}
+
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.h b/Telegram/SourceFiles/dialogs/dialogs_row.h
index a4ddde404e5fa4..7e2f9a6708dd53 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.h
@@ -7,10 +7,11 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "ui/text/text.h"
 #include "ui/effects/animations.h"
+#include "ui/text/text.h"
 #include "ui/unread_badge.h"
 #include "ui/userpic_view.h"
+#include "dialogs/dialogs_entry.h"
 #include "dialogs/dialogs_key.h"
 #include "dialogs/ui/dialogs_message_view.h"
 
@@ -51,7 +52,8 @@ class BasicRow {
 		not_null<Entry*> entry,
 		PeerData *peer,
 		Ui::VideoUserpic *videoUserpic,
-		const Ui::PaintContext &context) const;
+		const Ui::PaintContext &context,
+		bool hasUnreadBadgesAbove) const;
 
 	void addRipple(QPoint origin, QSize size, Fn<void()> updateCallback);
 	virtual void stopLastRipple();
@@ -86,6 +88,10 @@ class Row final : public BasicRow {
 	Row(Key key, int index, int top);
 	~Row();
 
+	[[nodiscard]] static const style::DialogRow &ComputeSt(
+		not_null<const Entry*> entry,
+		FilterId filterId);
+
 	[[nodiscard]] int top() const {
 		return _top;
 	}
@@ -94,17 +100,19 @@ class Row final : public BasicRow {
 
 		return _height;
 	}
-	void recountHeight(float64 narrowRatio);
+	void recountHeight(float64 narrowRatio, FilterId filterId);
 
 	void updateCornerBadgeShown(
 		not_null<PeerData*> peer,
-		Fn<void()> updateCallback = nullptr) const;
+		Fn<void()> updateCallback = nullptr,
+		bool hasUnreadBadgesAbove = false) const;
 	void paintUserpic(
 		Painter &p,
 		not_null<Entry*> entry,
 		PeerData *peer,
 		Ui::VideoUserpic *videoUserpic,
-		const Ui::PaintContext &context) const final override;
+		const Ui::PaintContext &context,
+		bool hasUnreadBadgesAbove) const final override;
 
 	[[nodiscard]] bool lookupIsInTopicJump(int x, int y) const;
 	void stopLastRipple() override;
@@ -175,9 +183,10 @@ class Row final : public BasicRow {
 		QImage frame;
 		QImage cacheTTL;
 		int frameIndex = -1;
-		uint32 paletteVersion : 17 = 0;
+		uint32 paletteVersion : 16 = 0;
 		uint32 storiesCount : 7 = 0;
 		uint32 storiesUnreadCount : 7 = 0;
+		uint32 storiesHasVideoStream : 1 = 0;
 		uint32 active : 1 = 0;
 	};
 
@@ -231,6 +240,9 @@ class FakeRow final : public BasicRow, public base::has_weak_ptr {
 		return _badge;
 	}
 	[[nodiscard]] const Ui::Text::String &name() const;
+	[[nodiscard]] DateText dateText(
+		TimeId date,
+		crl::time now) const;
 
 	void invalidateTopic();
 
@@ -244,6 +256,7 @@ class FakeRow final : public BasicRow, public base::has_weak_ptr {
 	mutable Ui::MessageView _itemView;
 	mutable Ui::PeerBadge _badge;
 	mutable Ui::Text::String _name;
+	mutable DateTextCache _dateCache;
 
 };
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
index b81e79f7b3abea..8790507de5bac5 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
@@ -41,7 +41,7 @@ object_ptr<Ui::BoxContent> SearchFromBox(
 					box->closeBox();
 				});
 			});
-		box->boxClosing() | rpl::start_with_next(
+		box->boxClosing() | rpl::on_next(
 			std::move(closedCallback),
 			*subscription);
 		return box;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
new file mode 100644
index 00000000000000..59006544f4bdd2
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
@@ -0,0 +1,347 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/dialogs_search_posts.h"
+
+#include "apiwrap.h"
+#include "base/unixtime.h"
+#include "data/data_session.h"
+#include "data/data_peer_values.h"
+#include "history/history.h"
+#include "main/main_session.h"
+
+namespace Dialogs {
+namespace {
+
+constexpr auto kQueryDelay = crl::time(500);
+constexpr auto kPerPage = 50;
+
+[[nodiscard]] const QRegularExpression &SearchSplitter() {
+	static const auto result = QRegularExpression(QString::fromLatin1(""
+		"[\\s\\-\\+\\(\\)\\[\\]\\{\\}\\<\\>\\,\\.\\!\\_\\;\\\"\\'\\x0]"));
+	return result;
+}
+
+} // namespace
+
+PostsSearch::PostsSearch(not_null<Main::Session*> session)
+: _session(session)
+, _api(&_session->api().instance())
+, _timer([=] { applyQuery(); })
+, _recheckTimer([=] { recheck(); }) {
+	Data::AmPremiumValue(_session) | rpl::on_next([=] {
+		maybePushPremiumUpdate();
+	}, _lifetime);
+}
+
+rpl::producer<PostsSearchState> PostsSearch::stateUpdates() const {
+	return _stateUpdates.events();
+}
+
+rpl::producer<PostsSearchState> PostsSearch::pagesUpdates() const {
+	return _pagesUpdates.events();
+}
+
+void PostsSearch::requestMore() {
+	if (!_query) {
+		return;
+	}
+	auto &entry = _entries[*_query];
+	if (_queryPushed != *_query || !entry.pagesPushed) {
+		return;
+	} else if (entry.pagesPushed < entry.pages.size()) {
+		_pagesUpdates.fire(PostsSearchState{
+			.page = entry.pages[entry.pagesPushed++],
+			.totalCount = entry.totalCount,
+		});
+	} else {
+		requestSearch(*_query);
+	}
+}
+
+void PostsSearch::setQuery(const QString &query) {
+	const auto words = TextUtilities::PrepareSearchWords(
+		query,
+		&SearchSplitter());
+	const auto prepared = words.isEmpty() ? QString() : words.join(' ');
+	if (_queryExact == query) {
+		return;
+	}
+	_queryExact = query;
+	_query = prepared;
+	const auto i = _entries.find(prepared);
+	if (i != end(_entries)) {
+		pushStateUpdate(i->second);
+	} else if (prepared.isEmpty()) {
+		applyQuery();
+	} else {
+		_timer.callOnce(kQueryDelay);
+	}
+}
+
+int PostsSearch::setAllowedStars(int stars) {
+	if (!_query) {
+		return 0;
+	} else if (_floodState) {
+		if (_floodState->freeSearchesLeft > 0) {
+			stars = 0;
+		} else if (_floodState->nextFreeSearchTime > 0
+			&& _floodState->nextFreeSearchTime <= base::unixtime::now()) {
+			stars = 0;
+		} else {
+			stars = std::min(int(_floodState->starsPerPaidSearch), stars);
+		}
+	}
+	_entries[*_query].allowedStars = stars;
+	requestSearch(*_query);
+	return stars;
+}
+
+void PostsSearch::pushStateUpdate(const Entry &entry) {
+	Expects(_query.has_value());
+
+	const auto initial = (_queryPushed != *_query);
+	if (initial) {
+		_queryPushed = *_query;
+		entry.pagesPushed = 0;
+	} else if (entry.pagesPushed > 0) {
+		if (entry.pagesPushed < entry.pages.size()) {
+			_pagesUpdates.fire(PostsSearchState{
+				.page = entry.pages[entry.pagesPushed++],
+				.totalCount = entry.totalCount,
+			});
+		}
+		return;
+	}
+	const auto empty = entry.pages.empty()
+		|| (entry.pages.size() == 1 && entry.pages.front().empty());
+	if (!empty || (entry.loaded && !_query->isEmpty())) {
+		if (!entry.pages.empty()) {
+			++entry.pagesPushed;
+		}
+		_stateUpdates.fire(PostsSearchState{
+			.page = (entry.pages.empty()
+				? std::vector<not_null<HistoryItem*>>()
+				: entry.pages.front()),
+			.totalCount = entry.totalCount,
+		});
+	} else if (entry.checkId || entry.searchId) {
+		_stateUpdates.fire(PostsSearchState{
+			.loading = true,
+		});
+	} else {
+		Assert(_floodState.has_value());
+		auto copy = _floodState;
+		copy->query = *_queryExact;
+		copy->needsPremium = !_session->premium();
+		_stateUpdates.fire(PostsSearchState{
+			.intro = std::move(copy),
+		});
+	}
+}
+
+void PostsSearch::maybePushPremiumUpdate() {
+	if (!_floodState || !_query) {
+		return;
+	}
+	auto &entry = _entries[*_query];
+	if (!entry.pages.empty()
+		|| entry.loaded
+		|| entry.checkId
+		|| entry.searchId) {
+		return;
+	}
+	pushStateUpdate(entry);
+}
+
+void PostsSearch::applyQuery() {
+	Expects(_query.has_value());
+
+	_timer.cancel();
+	if (_query->isEmpty()) {
+		requestSearch(QString());
+	} else {
+		requestState(*_query);
+	}
+}
+
+void PostsSearch::requestSearch(const QString &query) {
+	auto &entry = _entries[query];
+	if (entry.searchId || entry.loaded) {
+		return;
+	}
+
+	const auto useStars = entry.allowedStars;
+	entry.allowedStars = 0;
+
+	using Flag = MTPchannels_SearchPosts::Flag;
+	entry.searchId = _api.request(MTPchannels_SearchPosts(
+		MTP_flags(Flag::f_query
+			| (useStars ? Flag::f_allow_paid_stars : Flag())),
+		MTP_string(), // hashtag
+		MTP_string(query),
+		MTP_int(entry.offsetRate),
+		(entry.offsetPeer ? entry.offsetPeer->input() : MTP_inputPeerEmpty()),
+		MTP_int(entry.offsetId),
+		MTP_int(kPerPage),
+		MTP_long(useStars)
+	)).done([=](const MTPmessages_Messages &result) {
+		auto &entry = _entries[query];
+		entry.searchId = 0;
+
+		const auto initial = !entry.offsetId;
+		const auto owner = &_session->data();
+		const auto processList = [&](const MTPVector<MTPMessage> &messages) {
+			auto result = std::vector<not_null<HistoryItem*>>();
+			for (const auto &message : messages.v) {
+				const auto msgId = IdFromMessage(message);
+				const auto peerId = PeerFromMessage(message);
+				const auto lastDate = DateFromMessage(message);
+				if (const auto peer = owner->peerLoaded(peerId)) {
+					if (lastDate) {
+						const auto item = owner->addNewMessage(
+							message,
+							MessageFlags(),
+							NewMessageType::Existing);
+						result.push_back(item);
+					}
+					entry.offsetPeer = peer;
+				} else {
+					LOG(("API Error: a search results with not loaded peer %1"
+						).arg(peerId.value));
+				}
+				entry.offsetId = msgId;
+			}
+			return result;
+		};
+		auto totalCount = 0;
+		auto messages = result.match([&](const MTPDmessages_messages &data) {
+			owner->processUsers(data.vusers());
+			owner->processChats(data.vchats());
+			entry.loaded = true;
+			auto list = processList(data.vmessages());
+			totalCount = list.size();
+			return list;
+		}, [&](const MTPDmessages_messagesSlice &data) {
+			owner->processUsers(data.vusers());
+			owner->processChats(data.vchats());
+			auto list = processList(data.vmessages());
+			const auto nextRate = data.vnext_rate();
+			const auto rateUpdated = nextRate
+				&& (nextRate->v != entry.offsetRate);
+			const auto finished = list.empty();
+			if (rateUpdated) {
+				entry.offsetRate = nextRate->v;
+			}
+			if (finished) {
+				entry.loaded = true;
+			}
+			totalCount = data.vcount().v;
+			if (const auto flood = data.vsearch_flood()) {
+				setFloodStateFrom(flood->data());
+			}
+			return list;
+		}, [&](const MTPDmessages_channelMessages &data) {
+			LOG(("API Error: "
+				"received messages.channelMessages when no channel "
+				"was passed! (PostsSearch::performSearch)"));
+			owner->processUsers(data.vusers());
+			owner->processChats(data.vchats());
+			auto list = processList(data.vmessages());
+			if (list.empty()) {
+				entry.loaded = true;
+			}
+			totalCount = data.vcount().v;
+			return list;
+		}, [&](const MTPDmessages_messagesNotModified &) {
+			LOG(("API Error: received messages.messagesNotModified! "
+				"(PostsSearch::performSearch)"));
+			entry.loaded = true;
+			return std::vector<not_null<HistoryItem*>>();
+		});
+		if (initial) {
+			entry.pages.clear();
+		}
+		entry.pages.push_back(std::move(messages));
+		const auto count = int(ranges::accumulate(
+			entry.pages,
+			size_type(),
+			ranges::plus(),
+			&std::vector<not_null<HistoryItem*>>::size));
+		const auto full = entry.loaded ? count : std::max(count, totalCount);
+		entry.totalCount = full;
+		if (_query == query) {
+			pushStateUpdate(entry);
+		}
+	}).fail([=](const MTP::Error &error) {
+		auto &entry = _entries[query];
+		entry.searchId = 0;
+
+		const auto initial = !entry.offsetId;
+		const auto &type = error.type();
+		if (initial && type.startsWith(u"FLOOD_WAIT_"_q)) {
+			requestState(query);
+		} else {
+			entry.loaded = true;
+		}
+	}).handleFloodErrors().send();
+}
+
+void PostsSearch::setFloodStateFrom(const MTPDsearchPostsFlood &data) {
+	_recheckTimer.cancel();
+	const auto left = std::max(data.vremains().v, 0);
+	const auto next = data.vwait_till().value_or_empty();
+	if (!left && next > 0) {
+		const auto now = base::unixtime::now();
+		const auto delay = std::clamp(next - now, 1, 86401);
+		_recheckTimer.callOnce(delay * crl::time(1000));
+	}
+	_floodState = PostsSearchIntroState{
+		.freeSearchesPerDay = data.vtotal_daily().v,
+		.freeSearchesLeft = left,
+		.nextFreeSearchTime = next,
+		.starsPerPaidSearch = uint32(data.vstars_amount().v),
+	};
+}
+
+void PostsSearch::recheck() {
+	requestState(*_query, true);
+}
+
+void PostsSearch::requestState(const QString &query, bool force) {
+	auto &entry = _entries[query];
+	if (force) {
+		_api.request(base::take(entry.checkId)).cancel();
+	} else if (entry.checkId || entry.loaded) {
+		return;
+	}
+
+	using Flag = MTPchannels_CheckSearchPostsFlood::Flag;
+	entry.checkId = _api.request(MTPchannels_CheckSearchPostsFlood(
+		MTP_flags(Flag::f_query),
+		MTP_string(query)
+	)).done([=](const MTPSearchPostsFlood &result) {
+		auto &entry = _entries[query];
+		entry.checkId = 0;
+
+		const auto &data = result.data();
+		setFloodStateFrom(data);
+		if (data.is_query_is_free()) {
+			if (!entry.loaded) {
+				requestSearch(query);
+			}
+		} else if (_query == query) {
+			pushStateUpdate(entry);
+		}
+	}).fail([=](const MTP::Error &error) {
+		auto &entry = _entries[query];
+		entry.checkId = 0;
+		entry.loaded = true;
+	}).handleFloodErrors().send();
+}
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.h b/Telegram/SourceFiles/dialogs/dialogs_search_posts.h
new file mode 100644
index 00000000000000..5f48b98eb016ae
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.h
@@ -0,0 +1,80 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "dialogs/ui/posts_search_intro.h"
+#include "mtproto/sender.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Dialogs {
+
+struct PostsSearchState {
+	std::optional<PostsSearchIntroState> intro;
+	std::vector<not_null<HistoryItem*>> page;
+	int totalCount = 0;
+	bool loading = false;
+};
+
+class PostsSearch final {
+public:
+	explicit PostsSearch(not_null<Main::Session*> session);
+
+	[[nodiscard]] rpl::producer<PostsSearchState> stateUpdates() const;
+	[[nodiscard]] rpl::producer<PostsSearchState> pagesUpdates() const;
+
+	void setQuery(const QString &query);
+	int setAllowedStars(int stars);
+	void requestMore();
+
+private:
+	struct Entry {
+		std::vector<std::vector<not_null<HistoryItem*>>> pages;
+		int totalCount = 0;
+		mtpRequestId searchId = 0;
+		mtpRequestId checkId = 0;
+		PeerData *offsetPeer = nullptr;
+		MsgId offsetId = 0;
+		int offsetRate = 0;
+		int allowedStars = 0;
+		mutable int pagesPushed = 0;
+		bool loaded = false;
+	};
+
+	void recheck();
+	void applyQuery();
+	void requestSearch(const QString &query);
+	void requestState(const QString &query, bool force = false);
+	void setFloodStateFrom(const MTPDsearchPostsFlood &data);
+	void pushStateUpdate(const Entry &entry);
+	void maybePushPremiumUpdate();
+
+	const not_null<Main::Session*> _session;
+
+	MTP::Sender _api;
+
+	base::Timer _timer;
+	base::Timer _recheckTimer;
+	base::flat_map<QString, Entry> _entries;
+	std::optional<QString> _queryExact;
+	std::optional<QString> _query;
+	QString _queryPushed;
+
+	std::optional<PostsSearchIntroState> _floodState;
+
+	rpl::event_stream<PostsSearchState> _stateUpdates;
+	rpl::event_stream<PostsSearchState> _pagesUpdates;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp
index c7e85c94e7af61..7cf7598fad5bd0 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp
@@ -52,25 +52,14 @@ namespace {
 	});
 }
 
-[[nodiscard]] Ui::Text::String FillAdditionalText(
-		not_null<Data::Session*> owner,
-		int width) {
-	auto emoji = Ui::Text::SingleCustomEmoji(
-		owner->customEmojiManager().registerInternalEmoji(
-			st::dialogsSearchTagArrow,
-			st::dialogsSearchTagArrowPadding));
+[[nodiscard]] Ui::Text::String FillAdditionalText(int width) {
+	auto emoji = Ui::Text::IconEmoji(&st::dialogsSearchTagArrow);
 	auto result = Ui::Text::String();
-	const auto context = Core::MarkedTextContext{
-		.session = &owner->session(),
-		.customEmojiRepaint = [] {},
-		.customEmojiLoopLimit = 1,
-	};
 	const auto attempt = [&](const auto &phrase) {
 		result.setMarkedText(
 			st::dialogsSearchTagPromo,
-			phrase(tr::now, lt_arrow, emoji, Ui::Text::WithEntities),
-			kMarkupTextOptions,
-			context);
+			phrase(tr::now, lt_arrow, emoji, tr::marked),
+			kMarkupTextOptions);
 		return result.maxWidth() < width;
 	};
 	if (attempt(tr::lng_add_tag_phrase_long)
@@ -103,7 +92,7 @@ SearchTags::SearchTags(
 	rpl::combine(
 		std::move(tags),
 		Data::AmPremiumValue(&owner->session())
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const std::vector<Data::Reaction> &list,
 			bool premium) {
 		fill(list, premium);
@@ -118,7 +107,7 @@ SearchTags::SearchTags(
 	}
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_normalBg = _selectedBg = QImage();
 	}, _lifetime);
 }
@@ -231,7 +220,7 @@ void SearchTags::layout() {
 	if (_tags.size() == 1 && _tags.front().promo) {
 		_additionalLeft = x - skip.x() + st::dialogsSearchTagPromoSkip;
 		const auto additionalWidth = _width - _additionalLeft;
-		_additionalText = FillAdditionalText(_owner, additionalWidth);
+		_additionalText = FillAdditionalText(additionalWidth);
 	} else {
 		_additionalText = {};
 	}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
new file mode 100644
index 00000000000000..cb8850148cf452
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
@@ -0,0 +1,235 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/dialogs_top_bar_suggestion.h"
+
+#include "api/api_authorizations.h"
+#include "apiwrap.h"
+#include "base/call_delayed.h"
+#include "core/application.h"
+#include "data/components/gift_auctions.h"
+#include "data/components/promo_suggestions.h"
+#include "data/data_peer_values.h" // Data::AmPremiumValue.
+#include "dialogs/suggestions/suggestion.h"
+#include "dialogs/ui/dialogs_top_bar_suggestion_content.h"
+#include "main/main_session.h"
+#include "ui/ui_utility.h"
+#include "ui/wrap/slide_wrap.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_dialogs.h"
+
+namespace Dialogs {
+namespace {
+
+[[nodiscard]] not_null<Window::SessionController*> FindSessionController(
+		not_null<Ui::RpWidget*> widget) {
+	const auto window = Core::App().findWindow(widget);
+	Assert(window != nullptr);
+	return window->sessionController();
+}
+
+} // namespace
+
+rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Main::Session*> session,
+		rpl::producer<bool> outerWrapToggleValue,
+		rpl::producer<float64> childListShown,
+		rpl::producer<> prepareCollapseSnapshot) {
+	return [=,
+			outerWrapToggleValue = rpl::duplicate(outerWrapToggleValue),
+			childListShown = rpl::duplicate(childListShown),
+			prepareCollapseSnapshot = rpl::duplicate(
+				prepareCollapseSnapshot)](
+			auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		struct Toggle {
+			bool value = false;
+			anim::type type;
+		};
+
+		struct State {
+			TopBarSuggestionContent *content = nullptr;
+			base::unique_qptr<Ui::SlideWrap<Ui::RpWidget>> wrap;
+			rpl::variable<Toggle> desiredWrapToggle;
+			rpl::variable<bool> outerWrapToggle;
+			rpl::lifetime activeLifetime;
+			std::optional<TopBarSuggestions::Priority> activeSpec;
+			std::optional<int> activeSpecDay;
+			Fn<void()> prepareSnapshot;
+		};
+
+		const auto state = lifetime.make_state<State>();
+		state->outerWrapToggle = rpl::duplicate(outerWrapToggleValue);
+
+		const auto ensureContent
+		= [=]() -> not_null<TopBarSuggestionContent*> {
+			if (!state->content) {
+				const auto window = FindSessionController(parent);
+				state->content = Ui::CreateChild<TopBarSuggestionContent>(
+					parent,
+					[=] { return window->isGifPausedAtLeastFor(
+						Window::GifPauseReason::Layer); });
+				state->content->setCollapseProgress(
+					rpl::duplicate(childListShown));
+			}
+			return state->content;
+		};
+
+		const auto context = TopBarSuggestions::Context{
+			.parent = parent,
+			.session = session,
+			.ensureContent = ensureContent,
+			.findController = [=]()
+			-> not_null<Window::SessionController*> {
+				return FindSessionController(parent);
+			},
+			.childListShown = [=]() -> rpl::producer<float64> {
+				return rpl::duplicate(childListShown);
+			},
+		};
+
+		const auto specs = lifetime.make_state<std::vector<
+			TopBarSuggestions::Spec>>(TopBarSuggestions::AllSpecs());
+		ranges::sort(
+			*specs,
+			std::greater<>(),
+			&TopBarSuggestions::Spec::priority);
+
+		const auto processCurrentSuggestion = [=](auto repeat) -> void {
+			const auto recompute = [=] { repeat(repeat); };
+
+			auto winner = (const TopBarSuggestions::Spec*)(nullptr);
+			for (auto i = 0; i < int(specs->size()); ++i) {
+				const auto &spec = (*specs)[i];
+				if (spec.available(context)) {
+					winner = &spec;
+					break;
+				}
+			}
+
+			const auto currentDay = QDate::currentDate().day();
+			if (winner
+				&& winner->dayDependent
+				&& state->activeSpecDay
+				&& *state->activeSpecDay != currentDay) {
+				state->activeSpec = std::nullopt;
+			}
+
+			const auto winnerPriority = winner
+				? std::optional<TopBarSuggestions::Priority>(winner->priority)
+				: std::nullopt;
+			if (state->activeSpec == winnerPriority
+				&& (!winner || state->wrap)) {
+				return;
+			}
+
+			state->activeLifetime.destroy();
+			state->activeSpec = winnerPriority;
+			state->activeSpecDay = (winner && winner->dayDependent)
+				? std::optional<int>(currentDay)
+				: std::nullopt;
+
+			if (winner) {
+				auto args = TopBarSuggestions::ActivateArgs{
+					.context = context,
+					.lifetime = &state->activeLifetime,
+					.done = [=](
+							not_null<Ui::RpWidget*> widget,
+							Fn<void()> prepareSnapshot) {
+						if (state->wrap
+							&& state->wrap->entity() != widget.get()) {
+							state->wrap = nullptr;
+							if (widget.get() != state->content) {
+								state->content = nullptr;
+							}
+							state->prepareSnapshot = nullptr;
+						}
+						if (!state->wrap) {
+							state->wrap = base::make_unique_q<
+								Ui::SlideWrap<Ui::RpWidget>>(
+								parent,
+								object_ptr<Ui::RpWidget>::fromRaw(widget));
+							state->desiredWrapToggle.force_assign(
+								Toggle{ false, anim::type::instant });
+							state->prepareSnapshot = std::move(
+								prepareSnapshot);
+						}
+						state->desiredWrapToggle.force_assign(
+							Toggle{ true, anim::type::normal });
+					},
+					.recompute = recompute,
+				};
+				winner->activate(std::move(args));
+				return;
+			}
+
+			if (!state->wrap) {
+				return;
+			}
+			const auto wrap = state->wrap.get();
+			state->desiredWrapToggle.force_assign(
+				Toggle{ false, anim::type::normal });
+			base::call_delayed(st::slideWrapDuration * 2, wrap, [=] {
+				if (state->activeSpec) {
+					return;
+				}
+				state->content = nullptr;
+				state->wrap = nullptr;
+				state->prepareSnapshot = nullptr;
+				consumer.put_next(nullptr);
+			});
+		};
+
+		state->desiredWrapToggle.value() | rpl::combine_previous(
+		) | rpl::filter([=] {
+			return state->wrap != nullptr;
+		}) | rpl::on_next([=](Toggle was, Toggle now) {
+			state->wrap->toggle(
+				state->outerWrapToggle.current() && now.value,
+				(was.value == now.value)
+					? anim::type::instant
+					: now.type);
+		}, lifetime);
+
+		state->outerWrapToggle.value() | rpl::combine_previous(
+		) | rpl::filter([=] {
+			return state->wrap != nullptr;
+		}) | rpl::on_next([=](bool was, bool now) {
+			const auto toggle = state->desiredWrapToggle.current();
+			state->wrap->toggle(
+				toggle.value && now,
+				(was == now) ? toggle.type : anim::type::instant);
+		}, lifetime);
+
+		rpl::merge(
+			session->promoSuggestions().value(),
+			session->api().authorizations().unreviewedChanges(),
+			Data::AmPremiumValue(session) | rpl::skip(1) | rpl::to_empty,
+			session->giftAuctions().hasActiveChanges() | rpl::to_empty
+		) | rpl::on_next([=] {
+			const auto was = state->wrap.get();
+			const auto weak = base::make_weak(was);
+			processCurrentSuggestion(processCurrentSuggestion);
+			if (was != state->wrap || (was && !weak)) {
+				consumer.put_next_copy(state->wrap.get());
+			}
+		}, lifetime);
+
+		rpl::duplicate(prepareCollapseSnapshot) | rpl::on_next([=] {
+			if (state->prepareSnapshot) {
+				state->prepareSnapshot();
+			}
+		}, lifetime);
+
+		return lifetime;
+	};
+}
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.h b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.h
new file mode 100644
index 00000000000000..9ad295c3c52184
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.h
@@ -0,0 +1,34 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+template <typename Object>
+class object_ptr;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class RpWidget;
+template <typename Widget>
+class SlideWrap;
+} // namespace Ui
+
+namespace Dialogs {
+
+[[nodiscard]] auto TopBarSuggestionValue(
+	not_null<Ui::RpWidget*> parent,
+	not_null<Main::Session*>,
+	rpl::producer<bool> outerWrapToggleValue,
+	rpl::producer<float64> childListShown,
+	rpl::producer<> prepareCollapseSnapshot)
+-> rpl::producer<Ui::SlideWrap<Ui::RpWidget>*>;
+
+} // namespace Dialogs
+
diff --git a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion_test.cpp b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion_test.cpp
new file mode 100644
index 00000000000000..7fcdf7561290f5
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion_test.cpp
@@ -0,0 +1,165 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/dialogs_widget.h"
+
+#ifdef _DEBUG
+
+#include "base/call_delayed.h"
+#include "data/data_authorization.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "dialogs/dialogs_inner_widget.h"
+#include "dialogs/ui/dialogs_top_bar_suggestion_content.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/painter.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/elastic_scroll.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "styles/style_boxes.h"
+#include "styles/style_dialogs.h"
+
+#include <QShortcut>
+
+namespace Dialogs {
+
+void Widget::setupTopBarSuggestionTestHotkeys() {
+	const auto install = [this](Ui::SlideWrap<Ui::RpWidget> *wrap) {
+		_topBarSuggestionPlaceholder = nullptr;
+		_topBarSuggestion = nullptr;
+		if (!wrap) {
+			_scroll->setBarTopInset(0);
+			_topBarSuggestionHeightChanged.fire(0);
+			return;
+		}
+		_topBarSuggestionPlaceholder.reset(_innerList->insert(
+			0,
+			object_ptr<Ui::RpWidget>(_innerList)));
+		_topBarSuggestionPlaceholder->paintOn([
+			ph = _topBarSuggestionPlaceholder.get()
+		](QPainter &p) {
+			p.fillRect(ph->rect(), st::dialogsBg);
+		});
+		_topBarSuggestion.reset(wrap);
+		_topBarSuggestion->setParent(_scroll);
+		_topBarSuggestion->raise();
+		_topBarSuggestion->toggle(false, anim::type::instant);
+		_topBarSuggestion->heightValue(
+		) | rpl::on_next([=, this](int h) {
+			if (_topBarSuggestionPlaceholder) {
+				_topBarSuggestionPlaceholder->resize(
+					_topBarSuggestionPlaceholder->width(),
+					h);
+			}
+			_scroll->setBarTopInset(h);
+			_topBarSuggestionHeightChanged.fire_copy(h);
+		}, _topBarSuggestion->entity()->lifetime());
+		const auto pinToScroll = [this] {
+			if (_topBarSuggestion) {
+				_topBarSuggestion->resizeToWidth(_scroll->width());
+				_topBarSuggestion->moveToLeft(0, 0);
+			}
+		};
+		_scroll->sizeValue(
+		) | rpl::to_empty | rpl::on_next(
+			pinToScroll,
+			_topBarSuggestion->entity()->lifetime());
+		pinToScroll();
+		_topBarSuggestion->toggle(true, anim::type::normal);
+	};
+
+	const auto hideAndCleanup = [this] {
+		if (!_topBarSuggestion) {
+			return;
+		}
+		_topBarSuggestion->toggle(false, anim::type::normal);
+		const auto wrap = _topBarSuggestion.get();
+		base::call_delayed(st::slideWrapDuration * 2, wrap, [=, this] {
+			_topBarSuggestionPlaceholder = nullptr;
+			_topBarSuggestion = nullptr;
+			_scroll->setBarTopInset(0);
+			_topBarSuggestionHeightChanged.fire(0);
+		});
+	};
+
+	const auto regularShortcut = new QShortcut(
+		QKeySequence(u"Ctrl+Shift+T"_q),
+		this);
+	QObject::connect(
+		regularShortcut,
+		&QShortcut::activated,
+		this,
+		[=, this] {
+			using RightIcon = TopBarSuggestionContent::RightIcon;
+			const auto content = Ui::CreateChild<TopBarSuggestionContent>(
+				this);
+			content->setRightIcon(RightIcon::Close);
+			const auto user = session().user();
+			content->setContent(
+				tr::lng_dialogs_suggestions_birthday_contact_title(
+					tr::now,
+					lt_text,
+					{ user->shortName() },
+					tr::rich),
+				tr::lng_dialogs_suggestions_birthday_contact_about(
+					tr::now,
+					TextWithEntities::Simple));
+			content->setLeadingWidget(Ui::CreateChild<Ui::UserpicButton>(
+				content,
+				user,
+				st::uploadUserpicButton));
+			content->setHideCallback(hideAndCleanup);
+			content->setCollapseProgress(_childListShown.value());
+			_prepareTopBarSnapshot.events(
+			) | rpl::on_next([content] {
+				content->prepareCollapseSnapshot();
+			}, content->lifetime());
+			const auto wrap = Ui::CreateChild<
+				Ui::SlideWrap<Ui::RpWidget>>(
+					this,
+					object_ptr<Ui::RpWidget>::fromRaw(content));
+			install(wrap);
+		});
+
+	const auto authShortcut = new QShortcut(
+		QKeySequence(u"Ctrl+Shift+A"_q),
+		this);
+	QObject::connect(
+		authShortcut,
+		&QShortcut::activated,
+		this,
+		[=, this] {
+			auto fake = std::vector<Data::UnreviewedAuth>();
+			fake.push_back({
+				.hash = 0,
+				.unconfirmed = true,
+				.device = u"Test Device"_q,
+				.location = u"Test Location"_q,
+			});
+			const auto auth = CreateUnconfirmedAuthContent(
+				this,
+				rpl::single(std::move(fake)),
+				[=](bool) { hideAndCleanup(); },
+				_childListShown.value());
+			_prepareTopBarSnapshot.events(
+			) | rpl::on_next([auth] {
+				auth->prepareCollapseSnapshot();
+			}, auth->lifetime());
+			const auto wrap = Ui::CreateChild<
+				Ui::SlideWrap<Ui::RpWidget>>(
+					this,
+					object_ptr<Ui::RpWidget>::fromRaw(auth));
+			install(wrap);
+		});
+}
+
+} // namespace Dialogs
+
+#endif // _DEBUG
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 3d9d1daf46175f..64babfe07e3d16 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "dialogs/dialogs_widget.h"
 
+#include "base/call_delayed.h"
 #include "base/qt/qt_key_modifiers.h"
 #include "base/options.h"
 #include "dialogs/ui/chat_search_in.h"
@@ -15,28 +16,35 @@ For license and copyright information please follow this link:
 #include "dialogs/ui/dialogs_suggestions.h"
 #include "dialogs/dialogs_inner_widget.h"
 #include "dialogs/dialogs_search_from_controllers.h"
+#include "dialogs/dialogs_top_bar_suggestion.h"
+#include "dialogs/dialogs_quick_action.h"
 #include "dialogs/dialogs_key.h"
-#include "dialogs/dialogs_entry.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "history/view/history_view_top_bar_widget.h"
+#include "history/view/history_view_chat_section.h"
 #include "history/view/history_view_contact_status.h"
-#include "history/view/history_view_requests_bar.h"
 #include "history/view/history_view_group_call_bar.h"
+#include "history/view/history_view_requests_bar.h"
+#include "history/view/history_view_top_bar_widget.h"
 #include "boxes/peers/edit_peer_requests_box.h"
+#include "boxes/choose_filter_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/chat_filters_tabs_strip.h"
 #include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/vertical_layout.h"
 #include "ui/effects/radial_animation.h"
 #include "ui/chat/requests_bar.h"
 #include "ui/chat/group_call_bar.h"
 #include "ui/chat/more_chats_bar.h"
 #include "ui/controls/download_bar.h"
 #include "ui/controls/jump_down_button.h"
+#include "ui/controls/swipe_handler.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/screen_reader_mode.h"
 #include "ui/ui_utility.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
@@ -44,16 +52,14 @@ For license and copyright information please follow this link:
 #include "main/main_domain.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "api/api_authorizations.h"
 #include "api/api_chat_filters.h"
 #include "apiwrap.h"
-#include "base/event_filter.h"
+#include "chat_helpers/message_field.h"
 #include "core/application.h"
 #include "core/ui_integration.h"
 #include "core/update_checker.h"
 #include "core/shortcuts.h"
-#include "boxes/peer_list_box.h"
-#include "boxes/peers/edit_participants_box.h"
-#include "window/window_adaptive.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "window/window_slide_animation.h"
@@ -63,6 +69,7 @@ For license and copyright information please follow this link:
 #include "storage/storage_account.h"
 #include "storage/storage_domain.h"
 #include "data/components/recent_peers.h"
+#include "data/components/sponsored_messages.h"
 #include "data/data_session.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
@@ -75,6 +82,7 @@ For license and copyright information please follow this link:
 #include "data/data_changes.h"
 #include "data/data_download_manager.h"
 #include "data/data_chat_filters.h"
+#include "data/data_saved_messages.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_stories.h"
 #include "info/downloads/info_downloads_widget.h"
@@ -101,8 +109,8 @@ constexpr auto kSearchRequestDelay = crl::time(900);
 
 base::options::toggle OptionForumHideChatsList({
 	.id = kOptionForumHideChatsList,
-	.name = "Hide chats list in forums",
-	.description = "Don't keep a narrow column of chats list.",
+	.name = "Hide chat list in forums",
+	.description = "Don't keep a narrow column of chat list.",
 });
 
 [[nodiscard]] bool RedirectTextToSearch(const QString &text) {
@@ -116,9 +124,11 @@ base::options::toggle OptionForumHideChatsList({
 
 [[nodiscard]] QImage UpdateIcon() {
 	const auto iconSize = st::dialogsInstallUpdateIconSize;
+	const auto ratio = style::DevicePixelRatio();
 	auto result = QImage(
-		Size(iconSize) * style::DevicePixelRatio(),
+		Size(iconSize) * ratio,
 		QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(ratio);
 	result.fill(Qt::transparent);
 	{
 		auto p = QPainter(&result);
@@ -217,7 +227,7 @@ Widget::BottomButton::BottomButton(
 	if (_hasTextIcon) {
 		rpl::single(rpl::empty_value()) | rpl::then(
 			style::PaletteChanged()
-		) | rpl::start_with_next([this] {
+		) | rpl::on_next([this] {
 			_textIcon = UpdateIcon();
 		}, lifetime());
 	}
@@ -234,7 +244,9 @@ void Widget::BottomButton::radialAnimationCallback() {
 	}
 }
 
-void Widget::BottomButton::onStateChanged(State was, StateChangeSource source) {
+void Widget::BottomButton::onStateChanged(
+		State was,
+		StateChangeSource source) {
 	RippleButton::onStateChanged(was, source);
 	if ((was & StateFlag::Disabled) != (state() & StateFlag::Disabled)) {
 		_loading = isDisabled()
@@ -363,6 +375,7 @@ Widget::Widget(
 		_storiesContents.events() | rpl::flatten_latest())
 	: nullptr)
 , _searchTimer([=] { search(); })
+, _peerSearch(&controller->session(), Api::PeerSearch::Type::WithSponsored)
 , _singleMessageSearch(&controller->session()) {
 	const auto makeChildListShown = [](PeerId peerId, float64 shown) {
 		return InnerWidget::ChildListShown{ peerId, shown };
@@ -371,25 +384,38 @@ Widget::Widget(
 	_scroll->setOverscrollTypes(
 		_stories ? OverscrollType::Virtual : OverscrollType::Real,
 		OverscrollType::Real);
-	_inner = _scroll->setOwnedWidget(object_ptr<InnerWidget>(
-		this,
+	_innerList = _scroll->setOwnedWidget(
+		object_ptr<Ui::VerticalLayout>(this));
+	_inner = _innerList->add(object_ptr<InnerWidget>(
+		_innerList,
 		controller,
 		rpl::combine(
 			_childListPeerId.value(),
 			_childListShown.value(),
 			makeChildListShown)));
+	rpl::combine(
+		_scroll->heightValue(),
+		_topBarSuggestionHeightChanged.events_starting_with(0)
+	) | rpl::on_next([=](int height, int topBarHeight) {
+		_innerList->setMinimumHeight(height);
+		_inner->setMinimumHeight(height - topBarHeight);
+		_inner->refresh();
+	}, _innerList->lifetime());
+	_scroll->widthValue() | rpl::on_next([=](int width) {
+		_innerList->resizeToWidth(width);
+	}, _innerList->lifetime());
 	_scrollToTop->raise();
 	_lockUnlock->toggle(false, anim::type::instant);
 
 	_inner->updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		listScrollUpdated();
 	}, lifetime());
 
 	rpl::combine(
 		session().api().dialogsLoadMayBlockByDate(),
 		session().api().dialogsLoadBlockedByDate()
-	) | rpl::start_with_next([=](bool mayBlock, bool isBlocked) {
+	) | rpl::on_next([=](bool mayBlock, bool isBlocked) {
 		refreshLoadMoreButton(mayBlock, isBlocked);
 	}, lifetime());
 
@@ -406,7 +432,7 @@ Widget::Widget(
 				&& !update.history->isPinnedDialog(
 					controller->activeChatsFilterCurrent());
 		}
-	}) | rpl::start_with_next([=](const Data::HistoryUpdate &update) {
+	}) | rpl::on_next([=](const Data::HistoryUpdate &update) {
 		jumpToTop(true);
 	}, lifetime());
 
@@ -414,20 +440,20 @@ Widget::Widget(
 	) | rpl::to_empty);
 
 	_inner->scrollByDeltaRequests(
-	) | rpl::start_with_next([=](int delta) {
+	) | rpl::on_next([=](int delta) {
 		if (_scroll) {
 			_scroll->scrollToY(_scroll->scrollTop() + delta);
 		}
 	}, lifetime());
 
 	_inner->mustScrollTo(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &data) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &data) {
 		if (_scroll) {
 			_scroll->scrollToY(data.ymin, data.ymax);
 		}
 	}, lifetime());
 	_inner->dialogMoved(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &data) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &data) {
 		const auto movedFrom = data.ymin;
 		const auto movedTo = data.ymax;
 		const auto st = _scroll->scrollTop();
@@ -436,27 +462,36 @@ Widget::Widget(
 		}
 	}, lifetime());
 	_inner->searchRequests(
-	) | rpl::start_with_next([=](SearchRequestDelay delay) {
+	) | rpl::on_next([=](SearchRequestDelay delay) {
 		searchRequested(delay);
 	}, lifetime());
 	_inner->completeHashtagRequests(
-	) | rpl::start_with_next([=](const QString &tag) {
+	) | rpl::on_next([=](const QString &tag) {
 		completeHashtag(tag);
 	}, lifetime());
 	_inner->refreshHashtagsRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		searchCursorMoved();
 	}, lifetime());
 	_inner->changeSearchTabRequests(
 	) | rpl::filter([=](ChatSearchTab tab) {
 		return _searchState.tab != tab;
-	}) | rpl::start_with_next([=](ChatSearchTab tab) {
+	}) | rpl::on_next([=](ChatSearchTab tab) {
 		auto copy = _searchState;
 		copy.tab = tab;
 		applySearchState(std::move(copy));
 	}, lifetime());
+	_inner->changeSearchFilterRequests(
+	) | rpl::filter([=](ChatTypeFilter filter) {
+		return (_searchState.filter != filter)
+			&& (_searchState.tab == ChatSearchTab::MyMessages);
+	}) | rpl::on_next([=](ChatTypeFilter filter) {
+		auto copy = _searchState;
+		copy.filter = filter;
+		applySearchState(copy);
+	}, lifetime());
 	_inner->cancelSearchRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		cancelSearch({
 			.forceFullCancel = true,
 			.jumpBackToSearchedChat = true,
@@ -464,7 +499,7 @@ Widget::Widget(
 		controller->widget()->setInnerFocus();
 	}, lifetime());
 	_inner->cancelSearchFromRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto copy = _searchState;
 		copy.fromPeer = nullptr;
 		if (copy.inChat.sublist()) {
@@ -473,27 +508,33 @@ Widget::Widget(
 		applySearchState(std::move(copy));
 	}, lifetime());
 	_inner->changeSearchFromRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showSearchFrom();
 	}, lifetime());
 	_inner->chosenRow(
-	) | rpl::start_with_next([=](const ChosenRow &row) {
+	) | rpl::on_next([=](const ChosenRow &row) {
 		chosenRow(row);
 	}, lifetime());
+	_inner->openBotMainAppRequests(
+	) | rpl::on_next([=](UserId userId) {
+		if (const auto user = session().data().user(userId)) {
+			openBotMainApp(user);
+		}
+	}, lifetime());
 
 	_scroll->geometryChanged(
-	) | rpl::start_with_next(crl::guard(_inner, [=] {
+	) | rpl::on_next(crl::guard(_inner, [=] {
 		_inner->parentGeometryChanged();
 	}), lifetime());
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		listScrollUpdated();
 	}, lifetime());
 
 	session().data().chatsListChanges(
 	) | rpl::filter([=](Data::Folder *folder) {
 		return (folder == _inner->shownFolder());
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		Ui::PostponeCall(this, [=] { listScrollUpdated(); });
 	}, lifetime());
 
@@ -501,17 +542,31 @@ Widget::Widget(
 	controller->widget()->imeCompositionStarts(
 	) | rpl::filter([=] {
 		return redirectImeToSearch();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_search->setFocusFast();
 	}, lifetime());
 
 	_search->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		crl::on_main(this, [=] { applySearchUpdate(); });
 	}, _search->lifetime());
 
 	_search->submits(
-	) | rpl::start_with_next([=] { submit(); }, _search->lifetime());
+	) | rpl::on_next([=] { submit(); }, _search->lifetime());
+
+	_search->setMimeDataHook([=](
+			not_null<const QMimeData*> data,
+			Ui::InputField::MimeAction action) {
+		if (data->hasFormat(u"application/x-telegram-dialog"_q)) {
+			if (const auto history = HistoryFromMimeData(data, &session())) {
+				if (action != Ui::InputField::MimeAction::Check) {
+					controller->searchInChat(history);
+				}
+				return true;
+			}
+		}
+		return false;
+	});
 
 	QObject::connect(
 		_search->rawTextEdit().get(),
@@ -527,22 +582,28 @@ Widget::Widget(
 			checker.isLatest(),
 			checker.failed(),
 			checker.ready()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			checkUpdateStatus();
 		}, lifetime());
 	}
 
-	_cancelSearch->setClickedCallback([this] {
+	_cancelSearch->setClickedCallback([=] {
 		cancelSearch({ .jumpBackToSearchedChat = true });
 	});
-	_jumpToDate->entity()->setClickedCallback([this] { showCalendar(); });
-	_chooseFromUser->entity()->setClickedCallback([this] { showSearchFrom(); });
+	_cancelSearch->setAccessibleName(tr::lng_sr_cancel_search(tr::now));
+	_jumpToDate->entity()->setClickedCallback([=] { showCalendar(); });
+	_jumpToDate->entity()->setAccessibleName(
+		tr::lng_sr_search_date(tr::now));
+	_chooseFromUser->entity()->setClickedCallback([=] { showSearchFrom(); });
+	_chooseFromUser->entity()->setAccessibleName(
+		tr::lng_search_messages_from(tr::now));
 	rpl::single(rpl::empty) | rpl::then(
 		session().domain().local().localPasscodeChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateLockUnlockVisibility();
 	}, lifetime());
 	const auto lockUnlock = _lockUnlock->entity();
+	lockUnlock->setAccessibleName(tr::lng_shortcuts_lock(tr::now));
 	lockUnlock->setClickedCallback([=] {
 		lockUnlock->setIconOverride(
 			&st::dialogsUnlockIcon,
@@ -557,6 +618,7 @@ Widget::Widget(
 		setupStories();
 	}
 
+	_searchForNarrowLayout->setAccessibleName(tr::lng_dlg_filter(tr::now));
 	_searchForNarrowLayout->setClickedCallback([=] {
 		_search->setFocusFast();
 		if (_childList) {
@@ -576,11 +638,10 @@ Widget::Widget(
 	});
 	_inner->setLoadMoreCallback([=] {
 		const auto state = _inner->state();
+		const auto process = currentSearchProcess();
 		if (state == WidgetState::Filtered
-			&& (!_searchFull
-				|| (_searchInMigrated
-					&& _searchFull
-					&& !_searchFullMigrated))) {
+			&& (!process->full
+				|| (_searchInMigrated && !_migratedProcess.full))) {
 			searchMore();
 		} else if (_openedForum && state == WidgetState::Default) {
 			_openedForum->requestTopics();
@@ -592,7 +653,7 @@ Widget::Widget(
 		}
 	});
 	_inner->listBottomReached(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		loadMoreBlockedByDate();
 	}, lifetime());
 
@@ -612,7 +673,7 @@ Widget::Widget(
 	};
 	_scroll->setOverscrollBg(overscrollBg());
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_scroll->setOverscrollBg(overscrollBg());
 	}, lifetime());
 
@@ -624,12 +685,12 @@ Widget::Widget(
 			anim::type::instant);
 
 		controller->openedFolder().changes(
-		) | rpl::start_with_next([=](Data::Folder *folder) {
+		) | rpl::on_next([=](Data::Folder *folder) {
 			changeOpenedFolder(folder, anim::type::normal);
 		}, lifetime());
 
 		controller->shownForum().changes(
-		) | rpl::filter(!rpl::mappers::_1) | rpl::start_with_next([=] {
+		) | rpl::filter(!rpl::mappers::_1) | rpl::on_next([=] {
 			if (_openedForum) {
 				changeOpenedForum(nullptr, anim::type::normal);
 			} else if (_childList) {
@@ -638,14 +699,14 @@ Widget::Widget(
 		}, lifetime());
 
 		_childListShown.changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_scroll->setOverscrollBg(overscrollBg());
 			updateControlsGeometry();
 		}, lifetime());
 
 		_childListShown.changes(
 		) | rpl::filter((rpl::mappers::_1 == 0.) || (rpl::mappers::_1 == 1.)
-		) | rpl::start_with_next([=](float64 shown) {
+		) | rpl::on_next([=](float64 shown) {
 			const auto color = (shown > 0.) ? &st::dialogsRippleBg : nullptr;
 			_mainMenu.toggle->setRippleColorOverride(color);
 			_searchForNarrowLayout->setRippleColorOverride(color);
@@ -654,12 +715,175 @@ Widget::Widget(
 		setupMoreChatsBar();
 		setupDownloadBar();
 	}
+	setupSwipeBack();
+
+	if (session().settings().dialogsFiltersEnabled()
+		&& (Core::App().settings().chatFiltersHorizontal()
+			|| !controller->enoughSpaceForFilters())) {
+		toggleFiltersMenu(true);
+	}
+
+	setupFrozenAccountBar();
+	setupTopBarSuggestions();
+#ifdef _DEBUG
+	setupTopBarSuggestionTestHotkeys();
+#endif // _DEBUG
+}
+
+void Widget::setupSwipeBack() {
+	const auto isMainList = [=] {
+		const auto current = controller()->activeChatsFilterCurrent();
+		const auto &chatsFilters = session().data().chatsFilters();
+		if (chatsFilters.has()) {
+			return chatsFilters.defaultId() == current;
+		}
+		return !current;
+	};
+
+	auto update = [=](Ui::Controls::SwipeContextData data) {
+		data.cursorTop -= _inner->y();
+		if (data.translation != 0) {
+			if (data.translation < 0
+				&& _inner
+				&& (Core::App().settings().quickDialogAction()
+					!= Ui::QuickDialogAction::Disabled)) {
+				_inner->setSwipeContextData(data.msgBareId, std::move(data));
+			} else {
+				if (!_swipeBackData.callback) {
+					_swipeBackData = Ui::Controls::SetupSwipeBack(
+						this,
+						[]() -> std::pair<QColor, QColor> {
+							return {
+								st::historyForwardChooseBg->c,
+								st::historyForwardChooseFg->c,
+							};
+						},
+						_swipeBackMirrored,
+						_swipeBackIconMirrored);
+				}
+				_swipeBackData.callback(data);
+			}
+			return;
+		} else {
+			if (_swipeBackData.lifetime) {
+				_swipeBackData = {};
+			}
+			if (_inner) {
+				_inner->setSwipeContextData(data.msgBareId, std::nullopt);
+				_inner->update();
+			}
+		}
+	};
+
+	auto init = [=](Ui::Controls::SwipeHandlerInitData data) {
+		const auto top = data.cursorPosition.y() - _inner->y();
+		_swipeBackIconMirrored = false;
+		_swipeBackMirrored = false;
+		if (_childListShown.current()) {
+			return Ui::Controls::SwipeHandlerFinishData();
+		}
+		const auto isRightToLeft = data.direction == Qt::RightToLeft;
+		const auto action = Core::App().settings().quickDialogAction();
+		const auto isDisabled = action == Ui::QuickDialogAction::Disabled;
+		if (_inner) {
+			_inner->clearQuickActions();
+			if (!isRightToLeft) {
+				if (const auto key = _inner->calcSwipeKey(top);
+						key && !isDisabled) {
+					_inner->prepareQuickAction(key, action);
+					return Ui::Controls::SwipeHandlerFinishData{
+						.callback = [=, session = &session()] {
+							auto callback = [=, peerId = PeerId(key)] {
+								PerformQuickDialogAction(
+									controller(),
+									session->data().peer(peerId),
+									action,
+									_inner->filterId());
+							};
+							base::call_delayed(
+								st::slideWrapDuration,
+								session,
+								std::move(callback));
+						},
+						.msgBareId = key,
+						.speedRatio = 1.,
+						.reachRatioDuration = crl::time(
+							st::slideWrapDuration),
+						.provideReachOutRatio = true,
+					};
+				}
+			}
+		}
+		if (controller()->openedFolder().current()) {
+			if (!isRightToLeft) {
+				return Ui::Controls::SwipeHandlerFinishData();
+			}
+			return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
+				_swipeBackData = {};
+				if (controller()->openedFolder().current()) {
+					if (!controller()->windowId().folder()) {
+						controller()->closeFolder();
+					}
+				}
+			});
+		}
+		if (controller()->shownForum().current()) {
+			if (!isRightToLeft) {
+				return Ui::Controls::SwipeHandlerFinishData();
+			}
+			const auto id = controller()->windowId();
+			const auto initial = id.forum();
+			if (initial) {
+				return Ui::Controls::SwipeHandlerFinishData();
+			}
+			return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
+				_swipeBackData = {};
+				if (controller()->shownForum().current()) {
+					controller()->closeForum();
+				}
+			});
+		}
+		if (isRightToLeft && isMainList()) {
+			_swipeBackIconMirrored = true;
+			return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
+				_swipeBackIconMirrored = false;
+				_swipeBackData = {};
+				if (isMainList()) {
+					showMainMenu();
+				}
+			});
+		}
+		if (session().data().chatsFilters().has() && isDisabled) {
+			_swipeBackMirrored = !isRightToLeft;
+			using namespace Window;
+			const auto next = !isRightToLeft;
+			if (CheckAndJumpToNearChatsFilter(controller(), next, false)) {
+				return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
+					_swipeBackData = {};
+					CheckAndJumpToNearChatsFilter(controller(), next, true);
+				});
+			}
+		}
+
+		return Ui::Controls::SwipeHandlerFinishData();
+	};
+
+	Ui::Controls::SetupSwipeHandler({
+		.widget = _innerList,
+		.scroll = _scroll.data(),
+		.update = std::move(update),
+		.init = std::move(init),
+	});
+
 }
 
 void Widget::chosenRow(const ChosenRow &row) {
 	storiesToggleExplicitExpand(false);
 
-	if (!_searchState.query.isEmpty()) {
+	if (!row.sponsoredRandomId.isEmpty()) {
+		auto &messages = session().sponsoredMessages();
+		messages.clicked(row.sponsoredRandomId, false, false);
+	} else if (!_searchState.query.isEmpty()) {
 		if (const auto history = row.key.history()) {
 			session().recentPeers().bump(history->peer);
 		}
@@ -667,15 +891,20 @@ void Widget::chosenRow(const ChosenRow &row) {
 
 	const auto history = row.key.history();
 	const auto topicJump = history
-		? history->peer->forumTopicFor(row.message.fullId.msg)
+		? history->peer->forumTopicFor(row.topicJumpRootId)
+		: nullptr;
+	const auto sublistJump = history
+		? history->peer->monoforumSublistFor(row.sublistJumpPeerId)
 		: nullptr;
+
 	if (topicJump) {
 		if (controller()->shownForum().current() == topicJump->forum()) {
 			controller()->closeForum();
 		} else if (row.newWindow) {
 			controller()->showInNewWindow(Window::SeparateId(topicJump));
 		} else {
-			if (!controller()->adaptive().isOneColumn()) {
+			if (!controller()->adaptive().isOneColumn()
+				&& !topicJump->peer()->useSubsectionTabs()) {
 				controller()->showForum(
 					topicJump->forum(),
 					Window::SectionShow().withChildColumn());
@@ -686,17 +915,27 @@ void Widget::chosenRow(const ChosenRow &row) {
 				Window::SectionShow::Way::ClearStack);
 		}
 		return;
+	} else if (sublistJump) {
+		if (row.newWindow) {
+			controller()->showInNewWindow(Window::SeparateId(sublistJump));
+		} else {
+			controller()->showThread(
+				sublistJump,
+				ShowAtUnreadMsgId,
+				Window::SectionShow::Way::ClearStack);
+		}
+		return;
 	} else if (const auto topic = row.key.topic()) {
+		auto params = Window::SectionShow(
+			Window::SectionShow::Way::ClearStack);
+		params.highlight = Window::SearchHighlightId(_searchState.query);
 		if (row.newWindow) {
 			controller()->showInNewWindow(
 				Window::SeparateId(topic),
 				row.message.fullId.msg);
 		} else {
 			session().data().saveViewAsMessages(topic->forum(), false);
-			controller()->showThread(
-				topic,
-				row.message.fullId.msg,
-				Window::SectionShow::Way::ClearStack);
+			controller()->showThread(topic, row.message.fullId.msg, params);
 		}
 	} else if (history
 		&& row.userpicClick
@@ -709,18 +948,23 @@ void Widget::chosenRow(const ChosenRow &row) {
 		&& history->isForum()
 		&& !row.message.fullId
 		&& (!controller()->adaptive().isOneColumn()
-			|| !history->peer->forum()->channel()->viewForumAsMessages())) {
+			|| !history->peer->viewForumAsMessages()
+			|| history->peer->useSubsectionTabs())) {
 		const auto forum = history->peer->forum();
 		if (controller()->shownForum().current() == forum) {
 			controller()->closeForum();
 		} else if (row.newWindow) {
-			controller()->showInNewWindow(
-				Window::SeparateId(Window::SeparateType::Forum, history));
+			const auto type = forum->peer()->useSubsectionTabs()
+				? Window::SeparateType::Chat
+				: Window::SeparateType::Forum;
+			controller()->showInNewWindow(Window::SeparateId(type, history));
 		} else {
 			controller()->showForum(
 				forum,
-				Window::SectionShow().withChildColumn());
-			if (forum->channel()->viewForumAsMessages()) {
+				Window::SectionShow(
+					Window::SectionShow::Way::ClearStack).withChildColumn());
+			if (controller()->shownForum().current() == forum
+				&& forum->peer()->viewForumAsMessages()) {
 				controller()->showThread(
 					history,
 					ShowAtUnreadMsgId,
@@ -728,18 +972,39 @@ void Widget::chosenRow(const ChosenRow &row) {
 			}
 		}
 		return;
+	} else if (history
+		&& history->amMonoforumAdmin()
+		&& !row.message.fullId) {
+		const auto monoforum = history->peer->monoforum();
+		if (row.newWindow) {
+			controller()->showInNewWindow(
+				Window::SeparateId(Window::SeparateType::Chat, history));
+		} else {
+			if (const auto active = monoforum->activeSubsectionThread()) {
+				controller()->showThread(
+					active,
+					ShowAtUnreadMsgId,
+					Window::SectionShow::Way::ClearStack);
+			} else {
+				controller()->showPeerHistory(
+					history,
+					Window::SectionShow::Way::ClearStack);
+			}
+		}
+		return;
 	} else if (history) {
 		const auto peer = history->peer;
-		const auto showAtMsgId = controller()->uniqueChatsInSearchResults()
-			? ShowAtUnreadMsgId
-			: row.message.fullId.msg;
+		const auto showAtMsgId = controller()->uniqueChatsInSearchResults(
+			_searchState
+		) ? ShowAtUnreadMsgId : row.message.fullId.msg;
+		auto params = Window::SectionShow(
+			Window::SectionShow::Way::ClearStack);
+		params.highlight = Window::SearchHighlightId(_searchState.query);
 		if (row.newWindow) {
 			controller()->showInNewWindow(peer, showAtMsgId);
+			closeSuggestions();
 		} else {
-			controller()->showThread(
-				history,
-				showAtMsgId,
-				Window::SectionShow::Way::ClearStack);
+			controller()->showThread(history, showAtMsgId, params);
 			hideChildList();
 		}
 	} else if (const auto folder = row.key.folder()) {
@@ -776,7 +1041,7 @@ void Widget::setGeometryWithTopMoved(
 	_topDelta = topDelta;
 	bool willBeResized = (size() != newGeometry.size());
 	if (geometry() != newGeometry) {
-		auto weak = Ui::MakeWeak(this);
+		auto weak = base::make_weak(this);
 		setGeometry(newGeometry);
 		if (!weak) {
 			return;
@@ -797,6 +1062,7 @@ void Widget::scrollToDefaultChecked(bool verytop) {
 
 void Widget::setupScrollUpButton() {
 	_scrollToTop->setClickedCallback([=] { scrollToDefaultChecked(); });
+	_scrollToTop->setAccessibleName(tr::lng_sr_scroll_to_top(tr::now));
 	trackScroll(_scrollToTop);
 	trackScroll(this);
 	updateScrollUpVisibility();
@@ -806,19 +1072,135 @@ void Widget::setupTouchChatPreview() {
 	_scroll->setCustomTouchProcess([=](not_null<QTouchEvent*> e) {
 		return _inner->processTouchEvent(e);
 	});
-	_inner->touchCancelRequests() | rpl::start_with_next([=] {
+	_inner->touchCancelRequests() | rpl::on_next([=] {
 		QTouchEvent ev(QEvent::TouchCancel);
 		ev.setTimestamp(crl::now());
 		QGuiApplication::sendEvent(_scroll, &ev);
 	}, _inner->lifetime());
 }
 
+void Widget::setupFrozenAccountBar() {
+	session().frozenValue(
+	) | rpl::on_next([=] {
+		updateFrozenAccountBar();
+		updateControlsGeometry();
+	}, lifetime());
+}
+
+void Widget::setupTopBarSuggestions() {
+	if (_layout == Layout::Child) {
+		return;
+	}
+	using namespace rpl::mappers;
+	crl::on_main(_innerList, [=] {
+		const auto owner = &session().data();
+		session().api().authorizations().unreviewedChanges(
+		) | rpl::on_next([=] {
+			updateForceDisplayWide();
+		}, lifetime());
+		(owner->chatsListLoaded(nullptr)
+			? rpl::single<Data::Folder*>(nullptr)
+			: owner->chatsListLoadedEvents()
+		) | rpl::filter(_1 == nullptr) | rpl::map([=] {
+			auto on = rpl::combine(
+				controller()->activeChatsFilter(),
+				_openedFolderOrForumChanges.events_starting_with(false),
+				widthValue() | rpl::map(
+					_1 >= st::columnMinimalWidthLeft
+				) | rpl::distinct_until_changed(),
+				_searchStateForTopBarSuggestion.events_starting_with(
+					!_searchState.query.isEmpty()),
+				_jumpToDate->toggledValue()
+			) | rpl::map([=](
+					FilterId id,
+					bool folderOrForum,
+					bool wide,
+					bool search,
+					bool searchInPeer) {
+				return !folderOrForum
+					&& wide
+					&& !search
+					&& !searchInPeer
+					&& (id == owner->chatsFilters().defaultId());
+			});
+			return TopBarSuggestionValue(
+				this,
+				&session(),
+				std::move(on),
+				_childListShown.value(),
+				_prepareTopBarSnapshot.events());
+		}) | rpl::flatten_latest() | rpl::on_next([=](
+				Ui::SlideWrap<Ui::RpWidget> *raw) {
+			if (raw) {
+				_topBarSuggestionPlaceholder.reset(_innerList->insert(
+					0,
+					object_ptr<Ui::RpWidget>(_innerList)));
+				_topBarSuggestionPlaceholder->paintOn([
+					ph = _topBarSuggestionPlaceholder.get()
+				](QPainter &p) {
+					p.fillRect(ph->rect(), st::dialogsBg);
+				});
+				_topBarSuggestion.reset(raw);
+				_topBarSuggestion->setParent(_scroll);
+				_topBarSuggestion->raise();
+				_topBarSuggestion->heightValue(
+				) | rpl::on_next([=](int h) {
+					if (_topBarSuggestionPlaceholder) {
+						_topBarSuggestionPlaceholder->resize(
+							_topBarSuggestionPlaceholder->width(),
+							h);
+					}
+					_scroll->setBarTopInset(h);
+					_topBarSuggestionHeightChanged.fire_copy(h);
+				}, _topBarSuggestion->entity()->lifetime());
+				const auto pinToScroll = [=] {
+					if (_topBarSuggestion) {
+						_topBarSuggestion->resizeToWidth(_scroll->width());
+						_topBarSuggestion->moveToLeft(0, 0);
+					}
+				};
+				_scroll->sizeValue(
+				) | rpl::to_empty | rpl::on_next(
+					pinToScroll,
+					_topBarSuggestion->entity()->lifetime());
+				pinToScroll();
+			} else {
+				_topBarSuggestionPlaceholder = nullptr;
+				_topBarSuggestion = nullptr;
+				_scroll->setBarTopInset(0);
+				_topBarSuggestionHeightChanged.fire(0);
+			}
+		}, lifetime());
+	});
+}
+
+void Widget::updateFrozenAccountBar() {
+	if (_layout == Layout::Child
+		|| _openedForum
+		|| _openedFolder
+		|| !session().frozen()) {
+		_frozenAccountBar = nullptr;
+	} else if (!_frozenAccountBar) {
+		_frozenAccountBar = FrozenWriteRestriction(
+			this,
+			controller()->uiShow(),
+			FrozenWriteRestrictionType::DialogsList);
+		_frozenAccountBar->show();
+	}
+}
+
+void Widget::updateTopBarSuggestions() {
+	if (_topBarSuggestion) {
+		_openedFolderOrForumChanges.fire(_openedFolder || _openedForum);
+	}
+}
+
 void Widget::setupMoreChatsBar() {
 	if (_layout == Layout::Child) {
 		return;
 	}
 	controller()->activeChatsFilter(
-	) | rpl::start_with_next([=](FilterId id) {
+	) | rpl::on_next([=](FilterId id) {
 		storiesToggleExplicitExpand(false);
 		const auto cancelled = cancelSearch({ .forceFullCancel = true });
 		const auto guard = gsl::finally([&] {
@@ -840,7 +1222,7 @@ void Widget::setupMoreChatsBar() {
 		trackScroll(_moreChatsBar->wrap());
 
 		_moreChatsBar->barClicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (const auto missing = filters->moreChats(id)
 				; !missing.empty()) {
 				Api::ProcessFilterUpdate(controller(), id, missing);
@@ -848,7 +1230,7 @@ void Widget::setupMoreChatsBar() {
 		}, _moreChatsBar->lifetime());
 
 		_moreChatsBar->closeClicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			Api::ProcessFilterUpdate(controller(), id, {});
 		}, _moreChatsBar->lifetime());
 
@@ -860,7 +1242,7 @@ void Widget::setupMoreChatsBar() {
 		}
 
 		_moreChatsBar->heightValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateControlsGeometry();
 		}, _moreChatsBar->lifetime());
 	}, lifetime());
@@ -872,7 +1254,7 @@ void Widget::setupDownloadBar() {
 	}
 
 	Data::MakeDownloadBarContent(
-	) | rpl::start_with_next([=](Ui::DownloadBarContent &&content) {
+	) | rpl::on_next([=](Ui::DownloadBarContent &&content) {
 		const auto create = (content.count && !_downloadBar);
 		if (create) {
 			_downloadBar = std::make_unique<Ui::DownloadBar>(
@@ -884,20 +1266,20 @@ void Widget::setupDownloadBar() {
 		}
 		if (create) {
 			_downloadBar->heightValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				updateControlsGeometry();
 			}, _downloadBar->lifetime());
 
 			_downloadBar->shownValue(
 			) | rpl::filter(
 				!rpl::mappers::_1
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_downloadBar = nullptr;
 				updateControlsGeometry();
 			}, _downloadBar->lifetime());
 
 			_downloadBar->clicks(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				auto &&list = Core::App().downloadManager().loadingList();
 				const auto guard = gsl::finally([] {
 					Core::App().downloadManager().clearIfFinished();
@@ -931,7 +1313,7 @@ void Widget::updateScrollUpVisibility() {
 	}
 
 	startScrollUpButtonAnimation(
-		(_scroll->scrollTop() > st::historyToDownShownAfter)
+		(_scroll->scrollTop() > (st::historyToDownShownAfter / 2))
 		&& (_scroll->scrollTop() < _scroll->scrollTopMax()));
 }
 
@@ -988,10 +1370,12 @@ void Widget::setupMainMenuToggle() {
 	});
 	_mainMenu.under->stackUnder(_mainMenu.toggle);
 	_mainMenu.toggle->setClickedCallback([=] { showMainMenu(); });
+	_mainMenu.toggle->setIsMenuButton(true);
+	_mainMenu.toggle->setAccessibleName(tr::lng_main_menu(tr::now));
 
 	rpl::single(rpl::empty) | rpl::then(
 		controller()->filtersMenuChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto filtersHidden = !controller()->filtersWidth();
 		_mainMenu.toggle->setVisible(filtersHidden);
 		_mainMenu.under->setVisible(filtersHidden);
@@ -1001,7 +1385,7 @@ void Widget::setupMainMenuToggle() {
 
 	Window::OtherAccountsUnreadState(
 		&controller()->session().account()
-	) | rpl::start_with_next([=](const Window::OthersUnreadState &state) {
+	) | rpl::on_next([=](const Window::OthersUnreadState &state) {
 		const auto icon = !state.count
 			? nullptr
 			: !state.allMuted
@@ -1013,7 +1397,7 @@ void Widget::setupMainMenuToggle() {
 
 void Widget::setupStories() {
 	_stories->verticalScrollEvents(
-	) | rpl::start_with_next([=](not_null<QWheelEvent*> e) {
+	) | rpl::on_next([=](not_null<QWheelEvent*> e) {
 		_scroll->viewportEvent(e);
 	}, _stories->lifetime());
 
@@ -1048,7 +1432,7 @@ void Widget::setupStories() {
 		_scroll->positionValue(),
 		_scroll->movementValue(),
 		_storiesExplicitExpandValue.value()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			Ui::ElasticScrollPosition position,
 			Ui::ElasticScrollMovement movement,
 			int explicitlyExpanded) {
@@ -1090,27 +1474,27 @@ void Widget::setupStories() {
 	}, lifetime());
 
 	_stories->collapsedGeometryChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateLockUnlockPosition();
 	}, lifetime());
 
 	_stories->clicks(
-	) | rpl::start_with_next([=](uint64 id) {
+	) | rpl::on_next([=](uint64 id) {
 		controller()->openPeerStories(PeerId(int64(id)), currentSource());
 	}, lifetime());
 
 	_stories->showMenuRequests(
-	) | rpl::start_with_next([=](const Stories::ShowMenuRequest &request) {
+	) | rpl::on_next([=](const Stories::ShowMenuRequest &request) {
 		FillSourceMenu(controller(), request);
 	}, lifetime());
 
 	_stories->loadMoreRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		session().data().stories().loadMore(currentSource());
 	}, lifetime());
 
 	_stories->toggleExpandedRequests(
-	) | rpl::start_with_next([=](bool expanded) {
+	) | rpl::on_next([=](bool expanded) {
 		const auto position = _scroll->position();
 		if (!expanded) {
 			_scroll->setOverscrollDefaults(0, 0);
@@ -1124,11 +1508,11 @@ void Widget::setupStories() {
 		}
 	}, lifetime());
 
-	_stories->emptyValue() | rpl::skip(1) | rpl::start_with_next([=] {
+	_stories->emptyValue() | rpl::skip(1) | rpl::on_next([=] {
 		updateStoriesVisibility();
 	}, lifetime());
 
-	_stories->widthValue() | rpl::start_with_next([=] {
+	_stories->widthValue() | rpl::on_next([=] {
 		updateLockUnlockPosition();
 	}, lifetime());
 }
@@ -1151,7 +1535,7 @@ void Widget::storiesToggleExplicitExpand(bool expand) {
 
 void Widget::trackScroll(not_null<Ui::RpWidget*> widget) {
 	widget->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::TouchBegin
 			|| type == QEvent::TouchUpdate
@@ -1171,7 +1555,7 @@ void Widget::setupShortcuts() {
 			&& !_childList
 			&& !controller()->isLayerShown()
 			&& !controller()->window().locked();
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 
 		if (!controller()->activeChatCurrent()) {
@@ -1188,6 +1572,21 @@ void Widget::setupShortcuts() {
 				}
 				return false;
 			});
+			request->check(Command::ShowChatMenu, 1) && request->handle([=] {
+				if (_inner) {
+					Window::ActivateWindow(controller());
+					_inner->showPeerMenu();
+				}
+				return true;
+			});
+			request->check(Command::ShowChatPreview, 1)
+			&& request->handle([=] {
+				if (_inner) {
+					Window::ActivateWindow(controller());
+					return _inner->showChatPreview();
+				}
+				return true;
+			});
 		}
 	}, lifetime());
 }
@@ -1197,13 +1596,14 @@ void Widget::fullSearchRefreshOn(rpl::producer<> events) {
 		events
 	) | rpl::filter([=] {
 		return !_searchQuery.isEmpty();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_searchTimer.cancel();
-		_searchCache.clear();
-		_singleMessageSearch.clear();
-		for (const auto &[requestId, query] : base::take(_searchQueries)) {
+		_searchProcess.cache.clear();
+		const auto queries = base::take(_searchProcess.queries);
+		for (const auto &[requestId, query] : queries) {
 			session().api().request(requestId).cancel();
 		}
+		_singleMessageSearch.clear();
 		_searchQuery = QString();
 		_scroll->scrollToY(0);
 		cancelSearchRequest();
@@ -1225,6 +1625,12 @@ void Widget::updateControlsVisibility(bool fast) {
 	if (_moreChatsBar) {
 		_moreChatsBar->show();
 	}
+	if (_frozenAccountBar) {
+		_frozenAccountBar->show();
+	}
+	if (_chatFilters) {
+		_chatFilters->setVisible(!_openedForum);
+	}
 	if (_openedFolder || _openedForum) {
 		_subsectionTopBar->show();
 		if (_forumTopShadow) {
@@ -1240,7 +1646,9 @@ void Widget::updateControlsVisibility(bool fast) {
 			_forumReportBar->show();
 		}
 	} else {
-		updateLockUnlockVisibility();
+		updateLockUnlockVisibility(fast
+			? anim::type::instant
+			: anim::type::normal);
 		updateJumpToDateVisibility(fast);
 		updateSearchFromVisibility(fast);
 	}
@@ -1294,6 +1702,64 @@ void Widget::updateHasFocus(not_null<QWidget*> focused) {
 	}
 }
 
+void Widget::toggleFiltersMenu(bool enabled) {
+	if (_layout == Layout::Child) {
+		enabled = false;
+	}
+	if (const auto id = controller()->windowId(); id.forum() || id.folder()) {
+		enabled = false;
+	}
+	if (!enabled == !_chatFilters) {
+		return;
+	} else if (enabled) {
+		class NoScrollPropagationWidget final : public Ui::RpWidget {
+		public:
+			using Ui::RpWidget::RpWidget;
+
+		protected:
+			void touchEvent(QTouchEvent *e) {
+				e->accept();
+			}
+			void wheelEvent(QWheelEvent *e) override final {
+				e->accept();
+			}
+
+		};
+
+		_chatFilters = base::make_unique_q<NoScrollPropagationWidget>(this);
+		const auto raw = _chatFilters.get();
+		const auto inner = Ui::AddChatFiltersTabsStrip(
+			_chatFilters.get(),
+			&session(),
+			[this](FilterId id) {
+				_scroll->scrollToY(0);
+				if (controller()->activeChatsFilterCurrent() != id) {
+					controller()->setActiveChatsFilter(id);
+				}
+			},
+			Window::GifPauseReason::Any,
+			controller(),
+			true);
+		raw->show();
+		raw->stackUnder(_scroll);
+		raw->resizeToWidth(width());
+		const auto shadow = Ui::CreateChild<Ui::PlainShadow>(raw);
+		shadow->show();
+		inner->sizeValue() | rpl::on_next([=, this](const QSize &s) {
+			raw->resize(s);
+			shadow->setGeometry(
+				0,
+				s.height() - shadow->height(),
+				s.width(),
+				shadow->height());
+			updateControlsGeometry();
+		}, _chatFilters->lifetime());
+		updateControlsGeometry();
+	} else {
+		_chatFilters = nullptr;
+	}
+}
+
 bool Widget::cancelSearchByMouseBack() {
 	return _searchHasFocus
 		&& !_searchSuggestionsLocked
@@ -1308,8 +1774,12 @@ void Widget::processSearchFocusChange() {
 	updateSuggestions(anim::type::normal);
 }
 
+bool Widget::searchActive() const {
+	return Ui::ScreenReaderModeActive() ? _searchEngaged : _searchHasFocus;
+}
+
 void Widget::updateSuggestions(anim::type animated) {
-	const auto suggest = (_searchHasFocus || _searchSuggestionsLocked)
+	const auto suggest = (searchActive() || _searchSuggestionsLocked)
 		&& !_searchState.inChat
 		&& (_inner->state() == WidgetState::Default);
 	if (anim::Disabled() || !session().data().chatsListLoaded()) {
@@ -1340,10 +1810,11 @@ void Widget::updateSuggestions(anim::type animated) {
 			_suggestions = nullptr;
 			_hidingSuggestions.clear();
 			storiesExplicitCollapse();
-			updateStoriesVisibility();
+			updateControlsVisibility();
 			_scroll->show();
 		}
 	} else if (suggest && !_suggestions) {
+		_hidingSuggestions.clear();
 		if (animated == anim::type::normal) {
 			startWidthAnimation();
 		}
@@ -1354,6 +1825,9 @@ void Widget::updateSuggestions(anim::type animated) {
 			controller(),
 			TopPeersContent(&session()),
 			RecentPeersContent(&session()));
+		_suggestions->clearSearchQueryRequests() | rpl::on_next([=] {
+			setSearchQuery(QString());
+		}, _suggestions->lifetime());
 		_searchSuggestionsLocked = false;
 
 		rpl::merge(
@@ -1361,7 +1835,7 @@ void Widget::updateSuggestions(anim::type animated) {
 			_suggestions->recentPeerChosen(),
 			_suggestions->myChannelChosen(),
 			_suggestions->recommendationChosen()
-		) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		) | rpl::on_next([=](not_null<PeerData*> peer) {
 			if (_searchSuggestionsLocked
 				&& (!_suggestions || !_suggestions->persist())) {
 				processSearchFocusChange();
@@ -1376,8 +1850,10 @@ void Widget::updateSuggestions(anim::type animated) {
 			}
 		}, _suggestions->lifetime());
 
-		_suggestions->recentAppChosen(
-		) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		rpl::merge(
+			_suggestions->openBotMainAppRequests(),
+			_suggestions->recentAppChosen()
+		) | rpl::on_next([=](not_null<PeerData*> peer) {
 			if (const auto user = peer->asUser()) {
 				if (const auto info = user->botInfo.get()) {
 					if (info->hasMainApp) {
@@ -1393,10 +1869,14 @@ void Widget::updateSuggestions(anim::type animated) {
 		}, _suggestions->lifetime());
 
 		_suggestions->popularAppChosen(
-		) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		) | rpl::on_next([=](not_null<PeerData*> peer) {
 			controller()->showPeerInfo(peer);
 		}, _suggestions->lifetime());
 
+		_suggestions->closeRequests() | rpl::on_next([=] {
+			closeSuggestions();
+		}, _suggestions->lifetime());
+
 		updateControlsGeometry();
 
 		_suggestions->show(animated, [=] {
@@ -1408,6 +1888,15 @@ void Widget::updateSuggestions(anim::type animated) {
 	}
 }
 
+void Widget::closeSuggestions() {
+	_searchSuggestionsLocked = false;
+	_searchHasFocus = false;
+	setFocus();
+	updateForceDisplayWide();
+	updateCancelSearch();
+	updateSuggestions(anim::type::normal);
+}
+
 void Widget::openBotMainApp(not_null<UserData*> bot) {
 	session().attachWebView().open({
 		.bot = bot,
@@ -1442,7 +1931,7 @@ void Widget::changeOpenedSubsection(
 	change();
 	refreshTopBars();
 	updateControlsVisibility(true);
-	_peerSearchRequest = 0;
+	_peerSearch.clear();
 	_api.request(base::take(_topicSearchRequest)).cancel();
 	if (animated == anim::type::normal) {
 		if (_connecting) {
@@ -1477,6 +1966,8 @@ void Widget::changeOpenedFolder(Data::Folder *folder, anim::type animated) {
 		if (_stories) {
 			storiesExplicitCollapse();
 		}
+		updateFrozenAccountBar();
+		updateTopBarSuggestions();
 	}, (folder != nullptr), animated);
 }
 
@@ -1529,9 +2020,12 @@ void Widget::changeOpenedForum(Data::Forum *forum, anim::type animated) {
 		_searchState.tab = forum
 			? ChatSearchTab::ThisPeer
 			: ChatSearchTab::MyMessages;
+		_searchWithPostsPreview = computeSearchWithPostsPreview();
 		_api.request(base::take(_topicSearchRequest)).cancel();
 		_inner->changeOpenedForum(forum);
 		storiesToggleExplicitExpand(false);
+		updateFrozenAccountBar();
+		updateTopBarSuggestions();
 		updateStoriesVisibility();
 	}, (forum != nullptr), animated);
 }
@@ -1550,23 +2044,23 @@ void Widget::refreshTopBars() {
 				_stories->raise();
 			}
 			_subsectionTopBar->searchCancelled(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				escape();
 			}, _subsectionTopBar->lifetime());
 			_subsectionTopBar->searchSubmitted(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				submit();
 			}, _subsectionTopBar->lifetime());
 			_subsectionTopBar->searchQuery(
-			) | rpl::start_with_next([=](QString query) {
+			) | rpl::on_next([=](QString query) {
 				applySearchUpdate();
 			}, _subsectionTopBar->lifetime());
 			_subsectionTopBar->jumpToDateRequest(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				showCalendar();
 			}, _subsectionTopBar->lifetime());
 			_subsectionTopBar->chooseFromUserRequest(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				showSearchFrom();
 			}, _subsectionTopBar->lifetime());
 			updateControlsGeometry();
@@ -1580,7 +2074,7 @@ void Widget::refreshTopBars() {
 					? Dialogs::Key(history)
 					: Dialogs::Key(_openedFolder)),
 				.section = Dialogs::EntryState::Section::ChatsList,
-			}, history ? history->sendActionPainter().get() : nullptr);
+			}, history ? history->sendActionPainter() : nullptr);
 		if (_forumSearchRequested) {
 			showSearchInTopBar(anim::type::instant);
 		}
@@ -1592,41 +2086,41 @@ void Widget::refreshTopBars() {
 		updateSearchFromVisibility(true);
 	}
 	_forumSearchRequested = false;
-	if (_openedForum) {
-		const auto channel = _openedForum->channel();
-		channel->updateFull();
+	if (_openedForum && _openedForum->peer()->isChannel()) {
+		const auto peer = _openedForum->peer();
+		peer->updateFull();
 
 		_forumReportBar = std::make_unique<HistoryView::ContactStatus>(
 			controller(),
 			this,
-			channel,
+			peer,
 			true);
 		_forumRequestsBar = std::make_unique<Ui::RequestsBar>(
 			this,
 			HistoryView::RequestsBarContentByPeer(
-				channel,
+				peer,
 				st::historyRequestsUserpics.size,
 				true));
 		_forumGroupCallBar = std::make_unique<Ui::GroupCallBar>(
 			this,
 			HistoryView::GroupCallBarContentByPeer(
-				channel,
+				peer,
 				st::historyGroupCallUserpics.size,
 				true),
 			Core::App().appDeactivatedValue());
 		_forumTopShadow = std::make_unique<Ui::PlainShadow>(this);
 
 		_forumRequestsBar->barClicks(
-		) | rpl::start_with_next([=] {
-			RequestsBoxController::Start(controller(), channel);
+		) | rpl::on_next([=] {
+			RequestsBoxController::Start(controller(), peer);
 		}, _forumRequestsBar->lifetime());
 
 		rpl::merge(
 			_forumGroupCallBar->barClicks(),
 			_forumGroupCallBar->joinClicks()
-		) | rpl::start_with_next([=] {
-			if (channel->groupCall()) {
-				controller()->startOrJoinGroupCall(channel);
+		) | rpl::on_next([=] {
+			if (peer->groupCall()) {
+				controller()->startOrJoinGroupCall(peer);
 			}
 		}, _forumGroupCallBar->lifetime());
 
@@ -1648,7 +2142,7 @@ void Widget::refreshTopBars() {
 			_forumGroupCallBar->heightValue(),
 			_forumRequestsBar->heightValue(),
 			_forumReportBar->bar().heightValue()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateControlsGeometry();
 		}, _forumRequestsBar->lifetime());
 	} else {
@@ -1673,11 +2167,7 @@ QPixmap Widget::grabForFolderSlideAnimation() {
 		_scrollToTop->hide();
 	}
 
-	const auto rect = QRect(
-		0,
-		0,
-		width(),
-		_scroll->y() + _scroll->height());
+	const auto rect = QRect(0, 0, width(), rect::bottom(_scroll));
 	auto result = Ui::GrabWidget(this, rect);
 
 	if (!hidden) {
@@ -1742,6 +2232,10 @@ bool Widget::searchHasFocus() const {
 	return _searchHasFocus;
 }
 
+Data::Forum *Widget::openedForum() const {
+	return _openedForum;
+}
+
 void Widget::jumpToTop(bool belowPinned) {
 	if (session().supportMode()) {
 		return;
@@ -1846,6 +2340,12 @@ void Widget::scrollToDefault(bool verytop) {
 			this,
 			QPoint(),
 			QRect(0, top, wideGeometry.width(), skip));
+		if (_chatFilters) {
+			Ui::RenderWidget(
+				p,
+				_chatFilters,
+				QPoint(0, skip - _chatFilters->height()));
+		}
 		Ui::RenderWidget(p, _scroll, QPoint(0, skip));
 	}
 	if (scrollGeometry != wideGeometry) {
@@ -1861,6 +2361,12 @@ void Widget::startWidthAnimation() {
 	}
 	_widthAnimationCache = grabNonNarrowScrollFrame();
 	_scroll->hide();
+	if (_frozenAccountBar) {
+		_frozenAccountBar->hide();
+	}
+	if (_chatFilters) {
+		_chatFilters->hide();
+	}
 	updateStoriesVisibility();
 }
 
@@ -1868,27 +2374,40 @@ void Widget::stopWidthAnimation() {
 	_widthAnimationCache = QPixmap();
 	if (!_showAnimation) {
 		_scroll->setVisible(!_suggestions);
+		if (_frozenAccountBar) {
+			_frozenAccountBar->setVisible(!_suggestions);
+		}
+		if (_chatFilters) {
+			_chatFilters->setVisible(!_suggestions);
+		}
 	}
 	updateStoriesVisibility();
 	update();
 }
 
 void Widget::updateStoriesVisibility() {
-	updateLockUnlockVisibility();
+	updateLockUnlockVisibility(anim::type::normal);
 	if (!_stories) {
 		return;
 	}
-	const auto hidden = (_showAnimation != nullptr)
+	const auto widthAnimation = !_widthAnimationCache.isNull();
+	const auto suggestionsAnimation = widthAnimation
+		&& (!_suggestions || !_hidingSuggestions.empty());
+	const auto hiddenInstant = _showAnimation
 		|| _openedForum
-		|| !_widthAnimationCache.isNull()
+		|| (widthAnimation && !suggestionsAnimation)
 		|| _childList
-		|| _searchHasFocus
+		|| _stories->empty()
+		|| (_scroll->position().overscroll < -st::dialogsFilterSkip);
+	const auto hiddenAnimated = _searchHasFocus
 		|| _searchSuggestionsLocked
 		|| !_searchState.query.isEmpty()
 		|| _searchState.inChat
-		|| _stories->empty();
-	if (_stories->isHidden() != hidden) {
-		_stories->setVisible(!hidden);
+		|| suggestionsAnimation;
+	const auto hidden = hiddenInstant || hiddenAnimated;
+	const auto changed = (_stories->toggledHidden() != hidden);
+	_stories->setToggledHidden(hiddenInstant, hiddenAnimated);
+	if (changed) {
 		using Type = Ui::ElasticScroll::OverscrollType;
 		if (hidden) {
 			_scroll->setOverscrollDefaults(0, 0);
@@ -1953,7 +2472,7 @@ void Widget::startSlideAnimation(
 		Window::SlideDirection direction) {
 	_scroll->hide();
 	if (_stories) {
-		_stories->hide();
+		_stories->setToggledHidden(true, false);
 	}
 	_searchControls->hide();
 	if (_subsectionTopBar) {
@@ -1962,6 +2481,12 @@ void Widget::startSlideAnimation(
 	if (_moreChatsBar) {
 		_moreChatsBar->hide();
 	}
+	if (_frozenAccountBar) {
+		_frozenAccountBar->hide();
+	}
+	if (_chatFilters) {
+		_chatFilters->hide();
+	}
 	if (_forumTopShadow) {
 		_forumTopShadow->hide();
 	}
@@ -2110,16 +2635,34 @@ bool Widget::search(bool inCache, SearchRequestDelay delay) {
 	const auto fromPeer = searchFromPeer();
 	const auto &inTags = searchInTags();
 	const auto tab = _searchState.tab;
-	const auto fromStartType = inPeer
-		? SearchRequestType::PeerFromStart
-		: SearchRequestType::FromStart;
+	const auto filter = _searchState.filter;
+	const auto fromStartType = SearchRequestType{
+		.start = true,
+		.peer = (inPeer != nullptr),
+	};
 	if (trimmed.isEmpty() && !fromPeer && inTags.empty()) {
 		cancelSearchRequest();
-		searchApplyEmpty(fromStartType, 0);
-		_api.request(base::take(_peerSearchRequest)).cancel();
-		_peerSearchQuery = QString();
-		peerSearchApplyEmpty(0);
+
+		// Otherwise inside first searchApplyEmpty we call searchMode(),
+		// which tries to load migrated search results for empty query.
+		_migratedProcess.full = true;
+
+		searchApplyEmpty(fromStartType, currentSearchProcess());
+		if (_searchInMigrated) {
+			const auto type = SearchRequestType{
+				.migrated = true,
+				.start = true,
+			};
+			searchApplyEmpty(type, &_migratedProcess);
+		}
+		if (_searchWithPostsPreview) {
+			searchApplyEmpty(
+				{ .posts = true, .start = true },
+				&_postsProcess);
+		}
+		_peerSearch.clear();
 		_api.request(base::take(_topicSearchRequest)).cancel();
+		peerSearchReceived({});
 		return true;
 	} else if (inCache) {
 		const auto success = _singleMessageSearch.lookup(query, [=] {
@@ -2128,28 +2671,35 @@ bool Widget::search(bool inCache, SearchRequestDelay delay) {
 		if (!success) {
 			return false;
 		}
-		const auto i = _searchCache.find(query);
-		if (i != _searchCache.end()) {
+		const auto process = currentSearchProcess();
+		const auto i = process->cache.find(query);
+		if (i != process->cache.end()) {
 			_searchQuery = query;
 			_searchQueryFrom = fromPeer;
 			_searchQueryTags = inTags;
 			_searchQueryTab = tab;
-			_searchNextRate = 0;
-			_searchFull = _searchFullMigrated = false;
+			_searchQueryFilter = filter;
+			process->nextRate = 0;
+			process->full = false;
+			_migratedProcess.full = false;
 			cancelSearchRequest();
-			searchReceived(fromStartType, i->second, 0);
+			searchReceived(fromStartType, i->second, process, true);
 			result = true;
 		}
 	} else if (_searchQuery != query
 		|| _searchQueryFrom != fromPeer
 		|| _searchQueryTags != inTags
-		|| _searchQueryTab != tab) {
+		|| _searchQueryTab != tab
+		|| _searchQueryFilter != filter) {
+		const auto process = currentSearchProcess();
 		_searchQuery = query;
 		_searchQueryFrom = fromPeer;
 		_searchQueryTags = inTags;
 		_searchQueryTab = tab;
-		_searchNextRate = 0;
-		_searchFull = _searchFullMigrated = false;
+		_searchQueryFilter = filter;
+		process->nextRate = 0;
+		process->full = false;
+		_migratedProcess.full = false;
 		cancelSearchRequest();
 		if (inPeer) {
 			const auto topic = searchInTopic();
@@ -2161,118 +2711,74 @@ bool Widget::search(bool inCache, SearchRequestDelay delay) {
 				: _searchState.inChat.sublist();
 			const auto fromPeer = sublist ? nullptr : _searchQueryFrom;
 			const auto savedPeer = sublist
-				? sublist->peer().get()
+				? sublist->sublistPeer().get()
 				: nullptr;
-			_searchInHistoryRequest = histories.sendRequest(history, type, [=](Fn<void()> finish) {
-				const auto type = SearchRequestType::PeerFromStart;
+			_historiesRequest = histories.sendRequest(history, type, [=](
+					Fn<void()> finish) {
+				const auto type = SearchRequestType{
+					.start = true,
+					.peer = true,
+				};
 				using Flag = MTPmessages_Search::Flag;
-				_searchRequest = session().api().request(MTPmessages_Search(
-					MTP_flags((topic ? Flag::f_top_msg_id : Flag())
-						| (fromPeer ? Flag::f_from_id : Flag())
-						| (savedPeer ? Flag::f_saved_peer_id : Flag())
-						| (_searchQueryTags.empty()
-							? Flag()
-							: Flag::f_saved_reaction)),
-					inPeer->input,
-					MTP_string(_searchQuery),
-					(fromPeer ? fromPeer->input : MTP_inputPeerEmpty()),
-					(savedPeer ? savedPeer->input : MTP_inputPeerEmpty()),
-					MTP_vector_from_range(
-						_searchQueryTags | ranges::views::transform(
-							Data::ReactionToMTP
-						)),
-					MTP_int(topic ? topic->rootId() : 0),
-					MTP_inputMessagesFilterEmpty(),
-					MTP_int(0), // min_date
-					MTP_int(0), // max_date
-					MTP_int(0), // offset_id
-					MTP_int(0), // add_offset
-					MTP_int(kSearchPerPage),
-					MTP_int(0), // max_id
-					MTP_int(0), // min_id
-					MTP_long(0) // hash
-				)).done([=](const MTPmessages_Messages &result) {
-					_searchInHistoryRequest = 0;
-					searchReceived(type, result, _searchRequest);
+				process->requestId = session().api().request(
+					MTPmessages_Search(
+						MTP_flags((topic ? Flag::f_top_msg_id : Flag())
+							| (fromPeer ? Flag::f_from_id : Flag())
+							| (savedPeer ? Flag::f_saved_peer_id : Flag())
+							| (_searchQueryTags.empty()
+								? Flag()
+								: Flag::f_saved_reaction)),
+						inPeer->input(),
+						MTP_string(_searchQuery),
+						(fromPeer ? fromPeer->input() : MTP_inputPeerEmpty()),
+						(savedPeer ? savedPeer->input() : MTP_inputPeerEmpty()),
+						MTP_vector_from_range(
+							_searchQueryTags | ranges::views::transform(
+								Data::ReactionToMTP
+							)),
+						MTP_int(topic ? topic->rootId() : 0),
+						MTP_inputMessagesFilterEmpty(),
+						MTP_int(0), // min_date
+						MTP_int(0), // max_date
+						MTP_int(0), // offset_id
+						MTP_int(0), // add_offset
+						MTP_int(kSearchPerPage),
+						MTP_int(0), // max_id
+						MTP_int(0), // min_id
+						MTP_long(0)) // hash
+				).done([=](const MTPmessages_Messages &result) {
+					_historiesRequest = 0;
+					searchReceived(type, result, process);
 					finish();
 				}).fail([=](const MTP::Error &error) {
-					_searchInHistoryRequest = 0;
-					searchFailed(type, error, _searchRequest);
+					_historiesRequest = 0;
+					searchFailed(type, error, process);
 					finish();
 				}).send();
-				_searchQueries.emplace(_searchRequest, _searchQuery);
-				return _searchRequest;
+				process->queries.emplace(process->requestId, _searchQuery);
+				return process->requestId;
 			});
 		} else if (_searchState.tab == ChatSearchTab::PublicPosts) {
-			const auto type = SearchRequestType::FromStart;
-			_searchRequest = session().api().request(MTPchannels_SearchPosts(
-				MTP_string(_searchState.query.trimmed().mid(1)),
-				MTP_int(0), // offset_rate
-				MTP_inputPeerEmpty(), // offset_peer
-				MTP_int(0), // offset_id
-				MTP_int(kSearchPerPage)
-			)).done([=](const MTPmessages_Messages &result) {
-				searchReceived(type, result, _searchRequest);
-			}).fail([=](const MTP::Error &error) {
-				searchFailed(type, error, _searchRequest);
-			}).send();
-			_searchQueries.emplace(_searchRequest, _searchQuery);
+			requestPublicPosts(true);
 		} else {
-			const auto type = SearchRequestType::FromStart;
-			const auto flags = session().settings().skipArchiveInSearch()
-				? MTPmessages_SearchGlobal::Flag::f_folder_id
-				: MTPmessages_SearchGlobal::Flag(0);
-			const auto folderId = 0;
-			_searchRequest = session().api().request(MTPmessages_SearchGlobal(
-				MTP_flags(flags),
-				MTP_int(folderId),
-				MTP_string(_searchQuery),
-				MTP_inputMessagesFilterEmpty(),
-				MTP_int(0), // min_date
-				MTP_int(0), // max_date
-				MTP_int(0), // offset_rate
-				MTP_inputPeerEmpty(), // offset_peer
-				MTP_int(0), // offset_id
-				MTP_int(kSearchPerPage)
-			)).done([=](const MTPmessages_Messages &result) {
-				searchReceived(type, result, _searchRequest);
-			}).fail([=](const MTP::Error &error) {
-				searchFailed(type, error, _searchRequest);
-			}).send();
-			_searchQueries.emplace(_searchRequest, _searchQuery);
+			requestMessages(true);
 		}
 		_inner->searchRequested(true);
 	} else {
 		_inner->searchRequested(false);
 	}
-	const auto peerQuery = Api::ConvertPeerSearchQuery(query);
-	if (searchForPeersRequired(peerQuery)) {
-		if (inCache) {
-			auto i = _peerSearchCache.find(peerQuery);
-			if (i != _peerSearchCache.end()) {
-				_peerSearchQuery = peerQuery;
-				_peerSearchRequest = 0;
-				peerSearchReceived(i->second, 0);
-				result = true;
-			}
-		} else if (_peerSearchQuery != peerQuery) {
-			_peerSearchQuery = peerQuery;
-			_peerSearchFull = false;
-			_peerSearchRequest = _api.request(MTPcontacts_Search(
-				MTP_string(_peerSearchQuery),
-				MTP_int(SearchPeopleLimit)
-			)).done([=](const MTPcontacts_Found &result, mtpRequestId requestId) {
-				peerSearchReceived(result, requestId);
-			}).fail([=](const MTP::Error &error, mtpRequestId requestId) {
-				peerSearchFailed(error, requestId);
-			}).send();
-			_peerSearchQueries.emplace(_peerSearchRequest, _peerSearchQuery);
-		}
+	if (peerSearchRequired()) {
+		const auto requestType = inCache
+			? Api::PeerSearch::RequestType::CacheOnly
+			: Api::PeerSearch::RequestType::CacheOrRemote;
+		_peerSearch.request(query, [=](Api::PeerSearchResult result) {
+			peerSearchReceived(result);
+		}, requestType);
 	} else {
-		_api.request(base::take(_peerSearchRequest)).cancel();
-		_peerSearchQuery = peerQuery;
-		peerSearchApplyEmpty(0);
+		_peerSearch.clear();
+		peerSearchReceived({});
 	}
+	const auto peerQuery = Api::ConvertPeerSearchQuery(query);
 	if (searchForTopicsRequired(peerQuery)) {
 		if (inCache) {
 			if (_topicSearchQuery != peerQuery) {
@@ -2291,18 +2797,15 @@ bool Widget::search(bool inCache, SearchRequestDelay delay) {
 	return result;
 }
 
-bool Widget::searchForPeersRequired(const QString &query) const {
-	return _searchState.filterChatsList()
-		&& !_openedForum
-		&& !query.isEmpty()
-		&& (IsHashOrCashtagSearchQuery(query) == HashOrCashtag::None);
+bool Widget::peerSearchRequired() const {
+	return _searchState.filterChatsList() && !_openedForum;
 }
 
 bool Widget::searchForTopicsRequired(const QString &query) const {
 	return _searchState.filterChatsList()
 		&& _openedForum
-		&& !query.isEmpty()
 		&& (IsHashOrCashtagSearchQuery(query) == HashOrCashtag::None)
+		&& !TextUtilities::PrepareSearchWords(query).isEmpty()
 		&& !_openedForum->topicsList()->loaded();
 }
 
@@ -2322,8 +2825,34 @@ void Widget::showMainMenu() {
 }
 
 void Widget::searchMessages(SearchState state) {
+	if (const auto peer = state.inChat.peer()) {
+		if (_openedForum && peer->forum() != _openedForum) {
+			controller()->closeForum();
+		}
+	} else if (state.query.isEmpty()) {
+		if (_childList) {
+			hideChildList();
+		}
+		if (_openedForum) {
+			controller()->closeForum();
+		}
+		if (_layout == Layout::Main) {
+			controller()->closeFolder();
+		}
+	}
 	applySearchState(std::move(state));
 	session().local().saveRecentSearchHashtags(_searchState.query);
+
+	if (_childList) {
+		_childList->setInnerFocus();
+	} else if (_subsectionTopBar) {
+		if (!_subsectionTopBar->searchSetFocus()
+			&& !_subsectionTopBar->searchHasFocus()) {
+			_subsectionTopBar->toggleSearch(true, anim::type::normal);
+		}
+	} else {
+		_search->setFocus();
+	}
 }
 
 void Widget::searchTopics() {
@@ -2331,9 +2860,9 @@ void Widget::searchTopics() {
 		return;
 	}
 	_api.request(base::take(_topicSearchRequest)).cancel();
-	_topicSearchRequest = _api.request(MTPchannels_GetForumTopics(
-		MTP_flags(MTPchannels_GetForumTopics::Flag::f_q),
-		_openedForum->channel()->inputChannel,
+	_topicSearchRequest = _api.request(MTPmessages_GetForumTopics(
+		MTP_flags(MTPmessages_GetForumTopics::Flag::f_q),
+		_openedForum->peer()->input(),
 		MTP_string(_topicSearchQuery),
 		MTP_int(_topicSearchOffsetDate),
 		MTP_int(_topicSearchOffsetId),
@@ -2368,11 +2897,12 @@ void Widget::searchTopics() {
 }
 
 void Widget::searchMore() {
-	if (_searchRequest
-		|| _searchInHistoryRequest
+	const auto process = currentSearchProcess();
+	if (process->requestId
+		|| _historiesRequest
 		|| _searchTimer.isActive()) {
 		return;
-	} else if (!_searchFull) {
+	} else if (!process->full) {
 		if (const auto peer = searchInPeer()) {
 			auto &histories = session().data().histories();
 			const auto topic = searchInTopic();
@@ -2383,156 +2913,229 @@ void Widget::searchMore() {
 				: _searchState.inChat.sublist();
 			const auto fromPeer = sublist ? nullptr : _searchQueryFrom;
 			const auto savedPeer = sublist
-				? sublist->peer().get()
+				? sublist->sublistPeer().get()
 				: nullptr;
-			_searchInHistoryRequest = histories.sendRequest(history, type, [=](Fn<void()> finish) {
-				const auto type = _lastSearchId
-					? SearchRequestType::PeerFromOffset
-					: SearchRequestType::PeerFromStart;
+			_historiesRequest = histories.sendRequest(history, type, [=](
+					Fn<void()> finish) {
+				const auto type = SearchRequestType{
+					.start = !process->lastId,
+					.peer = true,
+				};
 				using Flag = MTPmessages_Search::Flag;
-				_searchRequest = session().api().request(MTPmessages_Search(
-					MTP_flags((topic ? Flag::f_top_msg_id : Flag())
-						| (fromPeer ? Flag::f_from_id : Flag())
-						| (savedPeer ? Flag::f_saved_peer_id : Flag())
-						| (_searchQueryTags.empty()
-							? Flag()
-							: Flag::f_saved_reaction)),
-					peer->input,
-					MTP_string(_searchQuery),
-					(fromPeer ? fromPeer->input : MTP_inputPeerEmpty()),
-					(savedPeer ? savedPeer->input : MTP_inputPeerEmpty()),
-					MTP_vector_from_range(
-						_searchQueryTags | ranges::views::transform(
-							Data::ReactionToMTP
-						)),
-					MTP_int(topic ? topic->rootId() : 0),
-					MTP_inputMessagesFilterEmpty(),
-					MTP_int(0), // min_date
-					MTP_int(0), // max_date
-					MTP_int(_lastSearchId),
-					MTP_int(0), // add_offset
-					MTP_int(kSearchPerPage),
-					MTP_int(0), // max_id
-					MTP_int(0), // min_id
-					MTP_long(0) // hash
-				)).done([=](const MTPmessages_Messages &result) {
-					searchReceived(type, result, _searchRequest);
-					_searchInHistoryRequest = 0;
+				process->requestId = session().api().request(
+					MTPmessages_Search(
+						MTP_flags((topic ? Flag::f_top_msg_id : Flag())
+							| (fromPeer ? Flag::f_from_id : Flag())
+							| (savedPeer ? Flag::f_saved_peer_id : Flag())
+							| (_searchQueryTags.empty()
+								? Flag()
+								: Flag::f_saved_reaction)),
+						peer->input(),
+						MTP_string(_searchQuery),
+						(fromPeer ? fromPeer->input() : MTP_inputPeerEmpty()),
+						(savedPeer
+							? savedPeer->input()
+							: MTP_inputPeerEmpty()),
+						MTP_vector_from_range(
+							_searchQueryTags | ranges::views::transform(
+								Data::ReactionToMTP
+							)),
+						MTP_int(topic ? topic->rootId() : 0),
+						MTP_inputMessagesFilterEmpty(),
+						MTP_int(0), // min_date
+						MTP_int(0), // max_date
+						MTP_int(process->lastId),
+						MTP_int(0), // add_offset
+						MTP_int(kSearchPerPage),
+						MTP_int(0), // max_id
+						MTP_int(0), // min_id
+						MTP_long(0)) // hash
+				).done([=](const MTPmessages_Messages &result) {
+					searchReceived(type, result, process);
+					_historiesRequest = 0;
 					finish();
 				}).fail([=](const MTP::Error &error) {
-					searchFailed(type, error, _searchRequest);
-					_searchInHistoryRequest = 0;
+					searchFailed(type, error, process);
+					_historiesRequest = 0;
 					finish();
 				}).send();
-				if (!_lastSearchId) {
-					_searchQueries.emplace(_searchRequest, _searchQuery);
+				if (!process->lastId) {
+					process->queries.emplace(
+						process->requestId,
+						_searchQuery);
 				}
-				return _searchRequest;
+				return process->requestId;
 			});
+		} else if (_searchState.tab == ChatSearchTab::PublicPosts) {
+			requestPublicPosts(false);
 		} else {
-			const auto type = _lastSearchId
-				? SearchRequestType::FromOffset
-				: SearchRequestType::FromStart;
-			const auto flags = session().settings().skipArchiveInSearch()
-				? MTPmessages_SearchGlobal::Flag::f_folder_id
-				: MTPmessages_SearchGlobal::Flag(0);
-			const auto folderId = 0;
-			_searchRequest = session().api().request(MTPmessages_SearchGlobal(
-				MTP_flags(flags),
-				MTP_int(folderId),
-				MTP_string(_searchQuery),
-				MTP_inputMessagesFilterEmpty(),
-				MTP_int(0), // min_date
-				MTP_int(0), // max_date
-				MTP_int(_searchNextRate),
-				(_lastSearchPeer
-					? _lastSearchPeer->input
-					: MTP_inputPeerEmpty()),
-				MTP_int(_lastSearchId),
-				MTP_int(kSearchPerPage)
-			)).done([=](const MTPmessages_Messages &result) {
-				searchReceived(type, result, _searchRequest);
-			}).fail([=](const MTP::Error &error) {
-				searchFailed(type, error, _searchRequest);
-			}).send();
-			if (!_lastSearchId) {
-				_searchQueries.emplace(_searchRequest, _searchQuery);
-			}
+			requestMessages(false);
 		}
-	} else if (_searchInMigrated && !_searchFullMigrated) {
+	} else if (_searchInMigrated && !_migratedProcess.full) {
 		auto &histories = session().data().histories();
 		const auto type = Data::Histories::RequestType::History;
 		const auto history = _searchInMigrated;
-		_searchInHistoryRequest = histories.sendRequest(history, type, [=](Fn<void()> finish) {
-			const auto type = _lastSearchMigratedId
-				? SearchRequestType::MigratedFromOffset
-				: SearchRequestType::MigratedFromStart;
+		_historiesRequest = histories.sendRequest(history, type, [=](
+				Fn<void()> finish) {
+			const auto type = SearchRequestType{
+				.migrated = true,
+				.start = !_migratedProcess.lastId,
+			};
 			const auto flags = _searchQueryFrom
 				? MTP_flags(MTPmessages_Search::Flag::f_from_id)
 				: MTP_flags(0);
-			_searchRequest = session().api().request(MTPmessages_Search(
-				flags,
-				_searchInMigrated->peer->input,
-				MTP_string(_searchQuery),
-				(_searchQueryFrom
-					? _searchQueryFrom->input
-					: MTP_inputPeerEmpty()),
-				MTPInputPeer(), // saved_peer_id
-				MTPVector<MTPReaction>(), // saved_reaction
-				MTPint(), // top_msg_id
-				MTP_inputMessagesFilterEmpty(),
-				MTP_int(0), // min_date
-				MTP_int(0), // max_date
-				MTP_int(_lastSearchMigratedId),
-				MTP_int(0), // add_offset
-				MTP_int(kSearchPerPage),
-				MTP_int(0), // max_id
-				MTP_int(0), // min_id
-				MTP_long(0) // hash
-			)).done([=](const MTPmessages_Messages &result) {
-				searchReceived(type, result, _searchRequest);
-				_searchInHistoryRequest = 0;
+			_migratedProcess.requestId = session().api().request(
+				MTPmessages_Search(
+					flags,
+					_searchInMigrated->peer->input(),
+					MTP_string(_searchQuery),
+					(_searchQueryFrom
+						? _searchQueryFrom->input()
+						: MTP_inputPeerEmpty()),
+					MTPInputPeer(), // saved_peer_id
+					MTPVector<MTPReaction>(), // saved_reaction
+					MTPint(), // top_msg_id
+					MTP_inputMessagesFilterEmpty(),
+					MTP_int(0), // min_date
+					MTP_int(0), // max_date
+					MTP_int(_migratedProcess.lastId),
+					MTP_int(0), // add_offset
+					MTP_int(kSearchPerPage),
+					MTP_int(0), // max_id
+					MTP_int(0), // min_id
+					MTP_long(0)) // hash
+			).done([=](const MTPmessages_Messages &result) {
+				searchReceived(type, result, &_migratedProcess);
+				_historiesRequest = 0;
 				finish();
 			}).fail([=](const MTP::Error &error) {
-				searchFailed(type, error, _searchRequest);
-				_searchInHistoryRequest = 0;
+				searchFailed(type, error, &_migratedProcess);
+				_historiesRequest = 0;
 				finish();
 			}).send();
-			return _searchRequest;
+			return _migratedProcess.requestId;
 		});
 	}
 }
 
+void Widget::requestPublicPosts(bool fromStart) {
+	if (!_postsProcess.lastId || !_postsProcess.lastPeer) {
+		fromStart = true;
+	}
+	const auto type = SearchRequestType{
+		.posts = true,
+		.start = fromStart,
+	};
+	using Flag = MTPchannels_SearchPosts::Flag;
+	_postsProcess.requestId = session().api().request(
+		MTPchannels_SearchPosts(
+			MTP_flags(Flag::f_hashtag),
+			MTP_string(_searchState.query.trimmed().mid(1)),
+			MTP_string(), // query
+			MTP_int(fromStart ? 0 : _postsProcess.nextRate),
+			(fromStart
+				? MTP_inputPeerEmpty()
+				: _postsProcess.lastPeer->input()),
+			MTP_int(fromStart ? 0 : _postsProcess.lastId),
+			MTP_int(kSearchPerPage),
+			MTP_long(0)) // allow_paid_stars
+	).done([=](const MTPmessages_Messages &result) {
+		searchReceived(type, result, &_postsProcess);
+	}).fail([=](const MTP::Error &error) {
+		searchFailed(type, error, &_postsProcess);
+	}).send();
+	if (fromStart) {
+		_postsProcess.queries.emplace(_postsProcess.requestId, _searchQuery);
+	}
+}
+
+void Widget::requestMessages(bool fromStart) {
+	if (!_searchProcess.lastId || !_searchProcess.lastPeer) {
+		fromStart = true;
+	}
+	const auto type = SearchRequestType{
+		.start = fromStart,
+	};
+	using Flag = MTPmessages_SearchGlobal::Flag;
+	const auto flags = Flag()
+		| (session().settings().skipArchiveInSearch()
+			? Flag::f_folder_id
+			: Flag())
+		| (_searchQueryFilter == ChatTypeFilter::Private
+			? Flag::f_users_only
+			: _searchQueryFilter == ChatTypeFilter::Groups
+			? Flag::f_groups_only
+			: _searchQueryFilter == ChatTypeFilter::Channels
+			? Flag::f_broadcasts_only
+			: Flag());
+	const auto folderId = 0;
+	_searchProcess.requestId = session().api().request(
+		MTPmessages_SearchGlobal(
+			MTP_flags(flags),
+			MTP_int(folderId),
+			MTP_string(_searchQuery),
+			MTP_inputMessagesFilterEmpty(),
+			MTP_int(0), // min_date
+			MTP_int(0), // max_date
+			MTP_int(fromStart ? 0 : _searchProcess.nextRate),
+			(fromStart
+				? MTP_inputPeerEmpty()
+				: _searchProcess.lastPeer->input()),
+			MTP_int(fromStart ? 0 : _searchProcess.lastId),
+			MTP_int(kSearchPerPage))
+	).done([=](const MTPmessages_Messages &result) {
+		searchReceived(type, result, &_searchProcess);
+	}).fail([=](const MTP::Error &error) {
+		searchFailed(type, error, &_searchProcess);
+	}).send();
+	if (!_searchProcess.lastId) {
+		_searchProcess.queries.emplace(
+			_searchProcess.requestId,
+			_searchQuery);
+	}
+	if (fromStart && _searchWithPostsPreview) {
+		requestPublicPosts(true);
+	}
+}
+
+auto Widget::currentSearchProcess() -> not_null<SearchProcessState*> {
+	return (_searchState.tab == ChatSearchTab::PublicPosts)
+		? &_postsProcess
+		: &_searchProcess;
+}
+
+bool Widget::computeSearchWithPostsPreview() const {
+	return 	(_searchHashOrCashtag != HashOrCashtag::None)
+		&& (_searchState.tab == ChatSearchTab::MyMessages)
+		&& !_searchState.inChat;
+}
+
 void Widget::searchReceived(
 		SearchRequestType type,
 		const MTPmessages_Messages &result,
-		mtpRequestId requestId) {
+		not_null<SearchProcessState*> process,
+		bool cacheResults) {
 	const auto state = _inner->state();
-	if (state == WidgetState::Filtered) {
-		if (type == SearchRequestType::FromStart || type == SearchRequestType::PeerFromStart) {
-			auto i = _searchQueries.find(requestId);
-			if (i != _searchQueries.end()) {
-				_searchCache[i->second] = result;
-				_searchQueries.erase(i);
-			}
+	if (!cacheResults
+		&& (state == WidgetState::Filtered)
+		&& type.start) {
+		const auto i = process->queries.find(process->requestId);
+		if (i != process->queries.end()) {
+			process->cache[i->second] = result;
+			process->queries.erase(i);
 		}
 	}
-	const auto inject = (type == SearchRequestType::FromStart
-		|| type == SearchRequestType::PeerFromStart)
+	const auto inject = (type.start && !type.posts && !type.migrated)
 		? *_singleMessageSearch.lookup(_searchQuery)
 		: nullptr;
-
-	if (_searchRequest != requestId) {
+	if (cacheResults && process->requestId) {
 		return;
 	}
-	if (type == SearchRequestType::FromStart
-		|| type == SearchRequestType::PeerFromStart) {
-		_lastSearchPeer = nullptr;
-		_lastSearchId = _lastSearchMigratedId = 0;
+	if (type.start) {
+		process->lastPeer = nullptr;
+		process->lastId = 0;
 	}
-	const auto isMigratedSearch = (type == SearchRequestType::MigratedFromStart)
-		|| (type == SearchRequestType::MigratedFromOffset);
-	const auto process = [&](const MTPVector<MTPMessage> &messages) {
+	const auto processList = [&](const MTPVector<MTPMessage> &messages) {
 		auto result = std::vector<not_null<HistoryItem*>>();
 		for (const auto &message : messages.v) {
 			const auto msgId = IdFromMessage(message);
@@ -2546,173 +3149,121 @@ void Widget::searchReceived(
 						NewMessageType::Existing);
 					result.push_back(item);
 				}
-				_lastSearchPeer = peer;
+				process->lastPeer = peer;
 			} else {
 				LOG(("API Error: a search results with not loaded peer %1"
 					).arg(peerId.value));
 			}
-			if (isMigratedSearch) {
-				_lastSearchMigratedId = msgId;
-			} else {
-				_lastSearchId = msgId;
-			}
+			process->lastId = msgId;
 		}
 		return result;
 	};
 	auto fullCount = 0;
 	auto messages = result.match([&](const MTPDmessages_messages &data) {
-		if (_searchRequest != 0) {
+		if (!cacheResults) {
 			// Don't apply cached data!
 			session().data().processUsers(data.vusers());
 			session().data().processChats(data.vchats());
+			if (const auto peer = searchInPeer()) {
+				peer->processTopics(data.vtopics());
+			}
 		}
-		if (type == SearchRequestType::MigratedFromStart || type == SearchRequestType::MigratedFromOffset) {
-			_searchFullMigrated = true;
-		} else {
-			_searchFull = true;
-		}
-		auto list = process(data.vmessages());
+		process->full = true;
+		auto list = processList(data.vmessages());
 		fullCount = list.size();
 		return list;
 	}, [&](const MTPDmessages_messagesSlice &data) {
-		if (_searchRequest != 0) {
+		if (!cacheResults) {
 			// Don't apply cached data!
 			session().data().processUsers(data.vusers());
 			session().data().processChats(data.vchats());
+			if (const auto peer = searchInPeer()) {
+				peer->processTopics(data.vtopics());
+			}
 		}
-		auto list = process(data.vmessages());
+		auto list = processList(data.vmessages());
 		const auto nextRate = data.vnext_rate();
-		const auto rateUpdated = nextRate && (nextRate->v != _searchNextRate);
-		const auto finished = (type == SearchRequestType::FromStart || type == SearchRequestType::FromOffset)
-			? !rateUpdated
-			: list.empty();
+		const auto rateUpdated = nextRate
+			&& (nextRate->v != process->nextRate);
+		const auto finished = (type.peer || type.migrated || type.posts)
+			? list.empty()
+			: !rateUpdated;
 		if (rateUpdated) {
-			_searchNextRate = nextRate->v;
+			process->nextRate = nextRate->v;
 		}
 		if (finished) {
-			if (type == SearchRequestType::MigratedFromStart || type == SearchRequestType::MigratedFromOffset) {
-				_searchFullMigrated = true;
-			} else {
-				_searchFull = true;
-			}
+			process->full = true;
 		}
 		fullCount = data.vcount().v;
 		return list;
 	}, [&](const MTPDmessages_channelMessages &data) {
-		if (const auto peer = searchInPeer()) {
-			if (const auto channel = peer->asChannel()) {
-				channel->ptsReceived(data.vpts().v);
-				channel->processTopics(data.vtopics());
+		if (!cacheResults) {
+			// Don't apply cached data!
+			session().data().processUsers(data.vusers());
+			session().data().processChats(data.vchats());
+			if (const auto peer = searchInPeer()) {
+				if (const auto channel = peer->asChannel()) {
+					channel->ptsReceived(data.vpts().v);
+				} else {
+					LOG(("API Error: "
+						"received messages.channelMessages when no channel "
+						"was passed! (Widget::searchReceived)"));
+				}
+				peer->processTopics(data.vtopics());
 			} else {
 				LOG(("API Error: "
 					"received messages.channelMessages when no channel "
 					"was passed! (Widget::searchReceived)"));
 			}
-		} else {
-			LOG(("API Error: "
-				"received messages.channelMessages when no channel "
-				"was passed! (Widget::searchReceived)"));
-		}
-		if (_searchRequest != 0) {
-			// Don't apply cached data!
-			session().data().processUsers(data.vusers());
-			session().data().processChats(data.vchats());
 		}
-		auto list = process(data.vmessages());
+		auto list = processList(data.vmessages());
 		if (list.empty()) {
-			if (type == SearchRequestType::MigratedFromStart || type == SearchRequestType::MigratedFromOffset) {
-				_searchFullMigrated = true;
-			} else {
-				_searchFull = true;
-			}
+			process->full = true;
 		}
 		fullCount = data.vcount().v;
 		return list;
 	}, [&](const MTPDmessages_messagesNotModified &) {
-		LOG(("API Error: received messages.messagesNotModified! (Widget::searchReceived)"));
-		if (type == SearchRequestType::MigratedFromStart || type == SearchRequestType::MigratedFromOffset) {
-			_searchFullMigrated = true;
-		} else {
-			_searchFull = true;
-		}
+		LOG(("API Error: received messages.messagesNotModified! "
+			"(Widget::searchReceived)"));
+		process->full = true;
 		return std::vector<not_null<HistoryItem*>>();
 	});
 	_inner->searchReceived(messages, inject, type, fullCount);
 
-	_searchRequest = 0;
+	process->requestId = 0;
 	listScrollUpdated();
 	update();
 }
 
-void Widget::peerSearchReceived(
-		const MTPcontacts_Found &result,
-		mtpRequestId requestId) {
-	const auto state = _inner->state();
-	auto q = _peerSearchQuery;
-	if (state == WidgetState::Filtered) {
-		auto i = _peerSearchQueries.find(requestId);
-		if (i != _peerSearchQueries.end()) {
-			_peerSearchCache[i->second] = result;
-			_peerSearchQueries.erase(i);
-		}
-	}
-	if (_peerSearchRequest == requestId) {
-		switch (result.type()) {
-		case mtpc_contacts_found: {
-			auto &d = result.c_contacts_found();
-			session().data().processUsers(d.vusers());
-			session().data().processChats(d.vchats());
-			_inner->peerSearchReceived(q, d.vmy_results().v, d.vresults().v);
-		} break;
-		}
-
-		_peerSearchRequest = 0;
-		listScrollUpdated();
-	}
+void Widget::peerSearchReceived(Api::PeerSearchResult result) {
+	_inner->peerSearchReceived(std::move(result));
+	listScrollUpdated();
+	update();
 }
 
-void Widget::searchApplyEmpty(SearchRequestType type, mtpRequestId id) {
-	_searchFull = _searchFullMigrated = true;
+void Widget::searchApplyEmpty(
+		SearchRequestType type,
+		not_null<SearchProcessState*> process) {
+	process->full = true;
 	searchReceived(
 		type,
 		MTP_messages_messages(
 			MTP_vector<MTPMessage>(),
+			MTP_vector<MTPForumTopic>(),
 			MTP_vector<MTPChat>(),
 			MTP_vector<MTPUser>()),
-		id);
-}
-
-void Widget::peerSearchApplyEmpty(mtpRequestId id) {
-	_peerSearchFull = true;
-	peerSearchReceived(
-		MTP_contacts_found(
-			MTP_vector<MTPPeer>(0),
-			MTP_vector<MTPPeer>(0),
-			MTP_vector<MTPChat>(0),
-			MTP_vector<MTPUser>(0)),
-		id);
+		process);
 }
 
 void Widget::searchFailed(
 		SearchRequestType type,
 		const MTP::Error &error,
-		mtpRequestId requestId) {
+		not_null<SearchProcessState*> process) {
 	if (error.type() == u"SEARCH_QUERY_EMPTY"_q) {
-		searchApplyEmpty(type, requestId);
-	} else if (_searchRequest == requestId) {
-		_searchRequest = 0;
-		if (type == SearchRequestType::MigratedFromStart || type == SearchRequestType::MigratedFromOffset) {
-			_searchFullMigrated = true;
-		} else {
-			_searchFull = true;
-		}
-	}
-}
-
-void Widget::peerSearchFailed(const MTP::Error &error, mtpRequestId id) {
-	if (_peerSearchRequest == id) {
-		_peerSearchRequest = 0;
-		_peerSearchFull = true;
+		searchApplyEmpty(type, process);
+	} else {
+		process->requestId = 0;
+		process->full = true;
 	}
 }
 
@@ -2817,13 +3368,22 @@ void Widget::listScrollUpdated() {
 void Widget::updateCancelSearch() {
 	const auto shown = !_searchState.query.isEmpty()
 		|| (!_searchState.inChat
-			&& (_searchHasFocus || _searchSuggestionsLocked));
+			&& (searchActive() || _searchSuggestionsLocked));
 	_cancelSearch->toggle(shown, anim::type::normal);
+	if (_searchState.inChat) {
+		_cancelSearch->setAccessibleName(shown
+			? tr::lng_sr_clear_search(tr::now)
+			: tr::lng_sr_cancel_search(tr::now));
+	}
 }
 
 QString Widget::validateSearchQuery() {
 	const auto query = currentSearchQuery();
-	if (_searchState.tab == ChatSearchTab::PublicPosts) {
+	if (!_subsectionTopBar
+		&& _suggestions
+		&& _suggestions->consumeSearchQuery(query)) {
+		return QString();
+	} else if (_searchState.tab == ChatSearchTab::PublicPosts) {
 		if (_searchHashOrCashtag == HashOrCashtag::None) {
 			_searchHashOrCashtag = HashOrCashtag::Hashtag;
 		}
@@ -2838,12 +3398,16 @@ QString Widget::validateSearchQuery() {
 	} else {
 		_searchHashOrCashtag = IsHashOrCashtagSearchQuery(query);
 	}
+	_searchWithPostsPreview = computeSearchWithPostsPreview();
 	return query;
 }
 
 void Widget::applySearchUpdate() {
 	auto copy = _searchState;
 	copy.query = validateSearchQuery();
+	if (Ui::ScreenReaderModeActive() && !copy.query.isEmpty()) {
+		_searchEngaged = true;
+	}
 	applySearchState(std::move(copy));
 
 	if (_chooseFromUser->toggled()
@@ -2868,7 +3432,8 @@ void Widget::updateForceDisplayWide() {
 		|| (_subsectionTopBar && _subsectionTopBar->searchHasFocus())
 		|| _searchSuggestionsLocked
 		|| !_searchState.query.isEmpty()
-		|| _searchState.inChat);
+		|| _searchState.inChat
+		|| !session().api().authorizations().unreviewed().empty());
 }
 
 void Widget::showForum(
@@ -2913,7 +3478,7 @@ void Widget::openChildList(
 			controller(),
 			Layout::Child);
 		_childList->showForum(forum, copy);
-		_childListPeerId = forum->channel()->id;
+		_childListPeerId = forum->peer()->id;
 	}
 
 	_childListShadow = std::make_unique<Ui::RpWidget>(this);
@@ -2921,12 +3486,12 @@ void Widget::openChildList(
 	const auto opacity = shadow->lifetime().make_state<float64>(0.);
 	shadow->setAttribute(Qt::WA_TransparentForMouseEvents);
 	shadow->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(shadow);
 		p.setOpacity(*opacity);
 		p.fillRect(clip, st::shadowFg);
 	}, shadow->lifetime());
-	_childListShown.value() | rpl::start_with_next([=](float64 value) {
+	_childListShown.value() | rpl::on_next([=](float64 value) {
 		*opacity = value;
 		update();
 		_inner->update();
@@ -2936,6 +3501,7 @@ void Widget::openChildList(
 		}
 	}, shadow->lifetime());
 
+	_prepareTopBarSnapshot.fire({});
 	updateControlsGeometry();
 	updateControlsVisibility(true);
 
@@ -2968,7 +3534,7 @@ void Widget::closeChildList(anim::type animated) {
 			Window::SlideAnimation
 		>();
 		_hideChildListCanvas->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			QPainter p(_hideChildListCanvas.get());
 			animation->paintContents(p);
 		}, _hideChildListCanvas->lifetime());
@@ -3061,13 +3627,23 @@ bool Widget::applySearchState(SearchState state) {
 	const auto tagsChanged = (_searchState.tags != state.tags);
 	const auto queryChanged = (_searchState.query != state.query);
 	const auto tabChanged = (_searchState.tab != state.tab);
+	const auto queryEmptyChanged = queryChanged
+		? (_searchState.query.isEmpty() != state.query.isEmpty())
+		: false;
+	if (queryEmptyChanged || tabChanged) {
+		state.filter = ChatTypeFilter::All;
+	}
+	const auto filterChanged = (_searchState.filter != state.filter);
 
 	if (forum) {
 		if (_openedForum == forum) {
 			showSearchInTopBar(anim::type::normal);
 		} else if (_layout == Layout::Main) {
 			_forumSearchRequested = true;
-			controller()->showForum(forum);
+			auto params = Window::SectionShow(
+				Window::SectionShow::Way::ClearStack);
+			params.forceTopicsList = true;
+			controller()->showForum(forum, params);
 		} else {
 			return false;
 		}
@@ -3089,13 +3665,28 @@ bool Widget::applySearchState(SearchState state) {
 			: ChatSearchTab::MyMessages;
 	}
 
-	const auto migrateFrom = (peer && !topic)
+	const auto migrateFrom = (peer
+		&& !topic
+		&& state.tab == ChatSearchTab::ThisPeer)
 		? peer->migrateFrom()
 		: nullptr;
 	_searchInMigrated = migrateFrom
 		? peer->owner().history(migrateFrom).get()
 		: nullptr;
 	_searchState = state;
+	if (inChatChanged && _searchState.inChat && _stories) {
+		storiesExplicitCollapse();
+	}
+	if (_chatFilters && (queryEmptyChanged || inChatChanged)) {
+		_chatFilters->setVisible(_searchState.query.isEmpty()
+			&& !_openedForum
+			&& !searchInPeer());
+		updateControlsGeometry();
+	}
+	if (_topBarSuggestion && queryEmptyChanged) {
+		_searchStateForTopBarSuggestion.fire(!_searchState.query.isEmpty());
+	}
+	_searchWithPostsPreview = computeSearchWithPostsPreview();
 	if (queryChanged) {
 		updateLockUnlockVisibility(anim::type::normal);
 		updateLoadMoreChatsVisibility();
@@ -3111,19 +3702,19 @@ bool Widget::applySearchState(SearchState state) {
 	updateSearchFromVisibility();
 	updateLockUnlockPosition();
 
-	if ((state.query.isEmpty() && !state.fromPeer && state.tags.empty())
+	const auto searchCleared = state.query.isEmpty()
+		&& !state.fromPeer
+		&& state.tags.empty();
+	if (searchCleared
 		|| inChatChanged
 		|| fromPeerChanged
+		|| filterChanged
 		|| tagsChanged
 		|| tabChanged) {
-		clearSearchCache();
+		clearSearchCache(searchCleared);
 	}
 	if (state.query.isEmpty()) {
-		_peerSearchCache.clear();
-		for (const auto &[requestId, query] : base::take(_peerSearchQueries)) {
-			_api.request(requestId).cancel();
-		}
-		_peerSearchQuery = QString();
+		_peerSearch.clear();
 	}
 
 	if (_searchState.query != currentSearchQuery()) {
@@ -3137,16 +3728,19 @@ bool Widget::applySearchState(SearchState state) {
 	}
 
 	_searchTagsLifetime = _inner->searchTagsChanges(
-	) | rpl::start_with_next([=](std::vector<Data::ReactionId> &&list) {
+	) | rpl::on_next([=](std::vector<Data::ReactionId> &&list) {
 		auto copy = _searchState;
 		copy.tags = std::move(list);
 		applySearchState(std::move(copy));
 	});
 	if (_subsectionTopBar) {
 		_subsectionTopBar->searchEnableJumpToDate(
-			_openedForum && _searchState.inChat);
+			_openedForum || _searchState.inChat);
 	}
 	if (!_searchState.inChat && _searchState.query.isEmpty()) {
+		if (!_widthAnimationCache.isNull()) {
+			stopWidthAnimation();
+		}
 		setInnerFocus();
 	} else if (!_subsectionTopBar) {
 		_search->setFocus();
@@ -3158,26 +3752,37 @@ bool Widget::applySearchState(SearchState state) {
 	return true;
 }
 
-void Widget::clearSearchCache() {
-	_searchCache.clear();
+void Widget::clearSearchCache(bool clearPosts) {
+	_searchProcess.cache.clear();
 	_singleMessageSearch.clear();
-	for (const auto &[requestId, query] : base::take(_searchQueries)) {
+	const auto queries = base::take(_searchProcess.queries);
+	for (const auto &[requestId, query] : queries) {
 		session().api().request(requestId).cancel();
 	}
 	_searchQuery = QString();
 	_searchQueryFrom = nullptr;
 	_searchQueryTags.clear();
+	if (clearPosts) {
+		_postsProcess.cache.clear();
+		const auto queries = base::take(_postsProcess.queries);
+		for (const auto &[requestId, query] : queries) {
+			session().api().request(requestId).cancel();
+		}
+	}
 	_topicSearchQuery = QString();
 	_topicSearchOffsetDate = 0;
 	_topicSearchOffsetId = _topicSearchOffsetTopicId = 0;
-	_api.request(base::take(_peerSearchRequest)).cancel();
 	_api.request(base::take(_topicSearchRequest)).cancel();
+	_peerSearch.clear();
 	cancelSearchRequest();
 }
 
 void Widget::showCalendar() {
-	if (_searchState.inChat) {
-		controller()->showCalendar(_searchState.inChat, QDate());
+	const auto chat = (!_searchState.inChat && _openedForum)
+		? Key(_openedForum->history())
+		: _searchState.inChat;
+	if (chat) {
+		controller()->showCalendar({ chat });
 	}
 }
 
@@ -3241,10 +3846,17 @@ void Widget::completeHashtag(QString tag) {
 			if (cur == start + 1
 				|| base::StringViewMid(t, start + 1, cur - start - 1)
 					== base::StringViewMid(tag, 0, cur - start - 1)) {
-				for (; cur < t.size() && cur - start - 1 < tag.size(); ++cur) {
-					if (t.at(cur) != tag.at(cur - start - 1)) break;
+				while (cur < t.size() && cur - start - 1 < tag.size()) {
+					if (t.at(cur) != tag.at(cur - start - 1)) {
+						break;
+					}
+					++cur;
+				}
+				if (cur - start - 1 == tag.size()
+					&& cur < t.size()
+					&& t.at(cur) == ' ') {
+					++cur;
 				}
-				if (cur - start - 1 == tag.size() && cur < t.size() && t.at(cur) == ' ') ++cur;
 				hashtag = t.mid(0, start + 1) + tag + ' ' + t.mid(cur);
 				setSearchQuery(hashtag, start + 1 + tag.size() + 1);
 				applySearchUpdate();
@@ -3269,20 +3881,28 @@ void Widget::updateLockUnlockVisibility(anim::type animated) {
 	if (_showAnimation) {
 		return;
 	}
-	const auto hidden = !session().domain().local().hasLocalPasscode()
-		|| _showAnimation
+	const auto widthAnimation = !_widthAnimationCache.isNull();
+	const auto suggestionsAnimation = widthAnimation
+		&& (!_suggestions || !_hidingSuggestions.empty());
+	const auto hiddenInstant = _showAnimation
 		|| _openedForum
-		|| !_widthAnimationCache.isNull()
+		|| (widthAnimation && !suggestionsAnimation)
 		|| _childList
-		|| _searchHasFocus
+		|| !session().domain().local().hasLocalPasscode()
+		|| (_stories
+			&& !_stories->empty()
+			&& _scroll->position().overscroll < -st::dialogsFilterSkip);
+	const auto hiddenAnimated = _searchHasFocus
 		|| _searchSuggestionsLocked
+		|| !_searchState.query.isEmpty()
 		|| _searchState.inChat
-		|| !_searchState.query.isEmpty();
-	if (_lockUnlock->toggled() == hidden) {
-		const auto stories = _stories && !_stories->empty();
-		_lockUnlock->toggle(
-			!hidden,
-			stories ? anim::type::instant : animated);
+		|| suggestionsAnimation;
+	const auto hidden = hiddenInstant || hiddenAnimated;
+	const auto changed = (_lockUnlock->toggled() == hidden);
+	_lockUnlock->toggle(
+		!hidden,
+		hiddenInstant ? anim::type::instant : animated);
+	if (changed) {
 		if (!hidden) {
 			updateLockUnlockPosition();
 		}
@@ -3356,7 +3976,8 @@ void Widget::updateControlsGeometry() {
 		? st::dialogsFilterSkip
 		: (st::dialogsFilterPadding.x() + _mainMenu.toggle->width()))
 		+ st::dialogsFilterPadding.x();
-	const auto filterRight = st::dialogsFilterSkip + st::dialogsFilterPadding.x();
+	const auto filterRight = st::dialogsFilterSkip
+		+ st::dialogsFilterPadding.x();
 	const auto filterWidth = qMax(ratiow, smallw) - filterLeft - filterRight;
 	const auto filterAreaHeight = st::topBarHeight;
 	_searchControls->setGeometry(0, filterAreaTop, ratiow, filterAreaHeight);
@@ -3369,7 +3990,11 @@ void Widget::updateControlsGeometry() {
 
 	auto filterTop = (filterAreaHeight - _search->height()) / 2;
 	filterLeft = anim::interpolate(filterLeft, _narrowWidth, narrowRatio);
-	_search->setGeometryToLeft(filterLeft, filterTop, filterWidth, _search->height());
+	_search->setGeometryToLeft(
+		filterLeft,
+		filterTop,
+		filterWidth,
+		_search->height());
 
 	auto mainMenuLeft = anim::interpolate(
 		st::dialogsFilterPadding.x(),
@@ -3387,12 +4012,16 @@ void Widget::updateControlsGeometry() {
 		-_searchForNarrowLayout->width(),
 		(_narrowWidth - _searchForNarrowLayout->width()) / 2,
 		narrowRatio);
-	_searchForNarrowLayout->moveToLeft(searchLeft, st::dialogsFilterPadding.y());
+	_searchForNarrowLayout->moveToLeft(
+		searchLeft,
+		st::dialogsFilterPadding.y());
 
 	auto right = filterLeft + filterWidth;
 	_cancelSearch->moveToLeft(right - _cancelSearch->width(), _search->y());
-	right -= _jumpToDate->width(); _jumpToDate->moveToLeft(right, _search->y());
-	right -= _chooseFromUser->width(); _chooseFromUser->moveToLeft(right, _search->y());
+	right -= _jumpToDate->width();
+	_jumpToDate->moveToLeft(right, _search->y());
+	right -= _chooseFromUser->width();
+	_chooseFromUser->moveToLeft(right, _search->y());
 
 	const auto barw = width();
 	const auto expandedStoriesTop = filterAreaTop + filterAreaHeight;
@@ -3454,9 +4083,20 @@ void Widget::updateControlsGeometry() {
 	if (_forumRequestsBar) {
 		_forumRequestsBar->resizeToWidth(barw);
 	}
+	if (_chatFilters) {
+		_chatFilters->resizeToWidth(barw);
+	}
+	if (_frozenAccountBar) {
+		_frozenAccountBar->resize(barw, _frozenAccountBar->height());
+	}
 	_updateScrollGeometryCached = [=] {
-		const auto moreChatsBarTop = expandedStoriesTop
+		const auto frozenBarTop = expandedStoriesTop
 			+ ((!_stories || _stories->isHidden()) ? 0 : _aboveScrollAdded);
+		if (_frozenAccountBar) {
+			_frozenAccountBar->move(0, frozenBarTop);
+		}
+		const auto moreChatsBarTop = frozenBarTop
+			+ (_frozenAccountBar ? _frozenAccountBar->height() : 0);
 		if (_moreChatsBar) {
 			_moreChatsBar->move(0, moreChatsBarTop);
 		}
@@ -3475,8 +4115,17 @@ void Widget::updateControlsGeometry() {
 		if (_forumReportBar) {
 			_forumReportBar->bar().move(0, forumReportTop);
 		}
-		const auto scrollTop = forumReportTop
+		const auto chatFiltersTop = forumReportTop
 			+ (_forumReportBar ? _forumReportBar->bar().height() : 0);
+		if (_chatFilters) {
+			_chatFilters->move(0, chatFiltersTop);
+		}
+		const auto scrollTop = chatFiltersTop
+			+ ((_chatFilters
+				&& _searchState.query.isEmpty()
+				&& !_openedForum && !searchInPeer())
+				? (_chatFilters->height() * (1. - narrowRatio))
+				: 0);
 		const auto scrollHeight = height() - scrollTop - bottomSkip;
 		const auto wasScrollHeight = _scroll->height();
 		_scroll->setGeometry(0, scrollTop, scrollWidth, scrollHeight);
@@ -3535,7 +4184,8 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 		//} else {
 		//	e->ignore();
 		//}
-	} else if ((e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Tab)
+	} else if ((e->key() == Qt::Key_Backspace
+			|| (e->key() == Qt::Key_Tab && !Ui::ScreenReaderModeActive()))
 		&& _searchHasFocus
 		&& !_searchState.inChat
 		&& _searchState.query.isEmpty()) {
@@ -3548,22 +4198,13 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 			|| e->key() == Qt::Key_Left
 			|| e->key() == Qt::Key_Right)) {
 		_suggestions->selectJump(Qt::Key(e->key()));
-	} else if (e->key() == Qt::Key_Down) {
-		_inner->selectSkip(1);
-	} else if (e->key() == Qt::Key_Up) {
-		_inner->selectSkip(-1);
-	} else if (e->key() == Qt::Key_PageDown) {
-		if (_suggestions) {
-			_suggestions->selectJump(Qt::Key_Down, _scroll->height());
-		} else {
-			_inner->selectSkipPage(_scroll->height(), 1);
-		}
-	} else if (e->key() == Qt::Key_PageUp) {
-		if (_suggestions) {
-			_suggestions->selectJump(Qt::Key_Up, _scroll->height());
-		} else {
-			_inner->selectSkipPage(_scroll->height(), -1);
-		}
+	} else if (_suggestions
+		&& (e->key() == Qt::Key_PageDown
+			|| e->key() == Qt::Key_PageUp)) {
+		_suggestions->selectJump(
+			(e->key() == Qt::Key_PageDown) ? Qt::Key_Down : Qt::Key_Up,
+			_scroll->height());
+	} else if (_inner->processKeyDispatch(e)) {
 	} else if (redirectKeyToSearch(e)) {
 		// This delay in search focus processing allows us not to create
 		// _suggestions in case the event inserts some non-whitespace search
@@ -3611,7 +4252,7 @@ bool Widget::redirectToSearchPossible() const {
 		&& !_childList
 		&& _search->isVisible()
 		&& !_search->hasFocus()
-		&& hasFocus();
+		&& (hasFocus() || _inner->hasFocus());
 }
 
 bool Widget::redirectKeyToSearch(QKeyEvent *e) const {
@@ -3675,6 +4316,10 @@ void Widget::paintEvent(QPaintEvent *e) {
 		const auto top = _searchControls->y()
 			+ _searchControls->height()
 			+ suggestionsSkip;
+		const auto aboveBottom = above.y() + above.height();
+		if (top > aboveBottom) {
+			p.fillRect(0, aboveBottom, width(), top - aboveBottom, bg);
+		}
 		p.drawPixmapLeft(0, top, width(), _widthAnimationCache);
 		belowTop = top
 			+ (_widthAnimationCache.height() / style::DevicePixelRatio());
@@ -3691,9 +4336,11 @@ void Widget::scrollToEntry(const RowDescriptor &entry) {
 }
 
 void Widget::cancelSearchRequest() {
-	session().api().request(base::take(_searchRequest)).cancel();
+	session().api().request(base::take(_searchProcess.requestId)).cancel();
+	session().api().request(base::take(_migratedProcess.requestId)).cancel();
+	session().api().request(base::take(_postsProcess.requestId)).cancel();
 	session().data().histories().cancelRequest(
-		base::take(_searchInHistoryRequest));
+		base::take(_historiesRequest));
 }
 
 PeerData *Widget::searchInPeer() const {
@@ -3701,9 +4348,9 @@ PeerData *Widget::searchInPeer() const {
 		|| _searchState.tab == ChatSearchTab::PublicPosts)
 		? nullptr
 		: _openedForum
-		? _openedForum->channel().get()
+		? _openedForum->peer().get()
 		: _searchState.inChat.sublist()
-		? session().user().get()
+		? _searchState.inChat.sublist()->owningHistory()->peer.get()
 		: _searchState.inChat.peer();
 }
 
@@ -3769,9 +4416,19 @@ void Widget::setSearchQuery(const QString &query, int cursorPosition) {
 }
 
 bool Widget::cancelSearch(CancelSearchOptions options) {
+	_searchEngaged = false;
+	const auto clearingSuggestionsQuery = _suggestions
+		&& _suggestions->consumeSearchQuery(QString());
+	if (clearingSuggestionsQuery) {
+		setSearchQuery(QString());
+		if (!options.forceFullCancel) {
+			return true;
+		}
+	}
 	cancelSearchRequest();
 	auto updatedState = _searchState;
-	const auto clearingQuery = !updatedState.query.isEmpty();
+	const auto clearingQuery = clearingSuggestionsQuery
+		|| !updatedState.query.isEmpty();
 	const auto forceFullCancel = options.forceFullCancel;
 	auto clearingInChat = (forceFullCancel || !clearingQuery)
 		&& (updatedState.inChat
@@ -3810,8 +4467,12 @@ bool Widget::cancelSearch(CancelSearchOptions options) {
 		// Don't create suggestions in unfocus case.
 		setInnerFocus(true);
 	}
-	_lastSearchPeer = nullptr;
-	_lastSearchId = _lastSearchMigratedId = 0;
+	_searchProcess.lastPeer = nullptr;
+	_searchProcess.lastId = 0;
+	_migratedProcess.lastPeer = nullptr;
+	_migratedProcess.lastId = 0;
+	_postsProcess.lastPeer = nullptr;
+	_postsProcess.lastId = 0;
 	_inner->clearFilter();
 	applySearchState(std::move(updatedState));
 	if (_suggestions && clearSearchFocus) {
@@ -3822,6 +4483,19 @@ bool Widget::cancelSearch(CancelSearchOptions options) {
 		}
 	}
 	updateForceDisplayWide();
+	if (clearingInChat) {
+		if (const auto forum = controller()->shownForum().current()) {
+			if (forum->peer()->useSubsectionTabs()) {
+				const auto id = controller()->windowId();
+				const auto initial = id.forum();
+				if (!initial) {
+					controller()->closeForum();
+				} else if (initial != forum) {
+					controller()->showForum(initial);
+				}
+			}
+		}
+	}
 	return clearingQuery || clearingInChat || clearSearchFocus;
 }
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index a1ee3950de3e65..81a180e57e1e21 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -7,9 +7,11 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "api/api_peer_search.h"
 #include "base/timer.h"
 #include "dialogs/dialogs_key.h"
 #include "window/section_widget.h"
+#include "ui/controls/swipe_handler_data.h"
 #include "ui/effects/animations.h"
 #include "ui/userpic_view.h"
 #include "mtproto/sender.h"
@@ -51,6 +53,9 @@ class JumpDownButton;
 class ElasticScroll;
 template <typename Widget>
 class FadeWrapScaled;
+template <typename Widget>
+class SlideWrap;
+class VerticalLayout;
 } // namespace Ui
 
 namespace Window {
@@ -75,7 +80,7 @@ class FakeRow;
 class Key;
 struct ChosenRow;
 class InnerWidget;
-enum class SearchRequestType : uchar;
+struct SearchRequestType;
 enum class SearchRequestDelay : uchar;
 class Suggestions;
 class ChatSearchIn;
@@ -106,6 +111,8 @@ class Widget final : public Window::AbstractSectionWidget {
 	void setInnerFocus(bool unfocusSearch = false);
 	[[nodiscard]] bool searchHasFocus() const;
 
+	[[nodiscard]] Data::Forum *openedForum() const;
+
 	void jumpToTop(bool belowPinned = false);
 	void raiseWithTooltip();
 
@@ -129,6 +136,7 @@ class Widget final : public Window::AbstractSectionWidget {
 	[[nodiscard]] RowDescriptor resolveChatNext(RowDescriptor from = {}) const;
 	[[nodiscard]] RowDescriptor resolveChatPrevious(RowDescriptor from = {}) const;
 	void updateHasFocus(not_null<QWidget*> focused);
+	void toggleFiltersMenu(bool value);
 
 	// Float player interface.
 	bool floatPlayerHandleWheelEvent(QEvent *e) override;
@@ -151,10 +159,26 @@ class Widget final : public Window::AbstractSectionWidget {
 	void paintEvent(QPaintEvent *e) override;
 
 private:
+	struct SearchProcessState {
+		base::flat_map<QString, MTPmessages_Messages> cache;
+		base::flat_map<mtpRequestId, QString> queries;
+
+		PeerData *lastPeer = nullptr;
+		MsgId lastId = 0;
+		int32 nextRate = 0;
+		mtpRequestId requestId = 0;
+		bool full = false;
+	};
+
 	void chosenRow(const ChosenRow &row);
 	void listScrollUpdated();
 	void searchCursorMoved();
 	void completeHashtag(QString tag);
+	void requestPublicPosts(bool fromStart);
+	void requestMessages(bool fromStart);
+	[[nodiscard]] not_null<SearchProcessState*> currentSearchProcess();
+
+	[[nodiscard]] bool computeSearchWithPostsPreview() const;
 
 	[[nodiscard]] QString currentSearchQuery() const;
 	[[nodiscard]] int currentSearchQueryCursorPosition() const;
@@ -168,10 +192,9 @@ class Widget final : public Window::AbstractSectionWidget {
 	void searchReceived(
 		SearchRequestType type,
 		const MTPmessages_Messages &result,
-		mtpRequestId requestId);
-	void peerSearchReceived(
-		const MTPcontacts_Found &result,
-		mtpRequestId requestId);
+		not_null<SearchProcessState*> process,
+		bool cacheResults = false);
+	void peerSearchReceived(Api::PeerSearchResult result);
 	void escape();
 	void submit();
 	void cancelSearchRequest();
@@ -182,17 +205,23 @@ class Widget final : public Window::AbstractSectionWidget {
 
 	void setupSupportMode();
 	void setupTouchChatPreview();
+	void setupFrozenAccountBar();
 	void setupConnectingWidget();
 	void setupMainMenuToggle();
 	void setupMoreChatsBar();
 	void setupDownloadBar();
 	void setupShortcuts();
 	void setupStories();
+	void setupSwipeBack();
+	void setupTopBarSuggestions();
+#ifdef _DEBUG
+	void setupTopBarSuggestionTestHotkeys();
+#endif // _DEBUG
 	void storiesExplicitCollapse();
 	void collectStoriesUserpicsViews(Data::StorySourcesList list);
 	void storiesToggleExplicitExpand(bool expand);
 	void trackScroll(not_null<Ui::RpWidget*> widget);
-	[[nodiscard]] bool searchForPeersRequired(const QString &query) const;
+	[[nodiscard]] bool peerSearchRequired() const;
 	[[nodiscard]] bool searchForTopicsRequired(const QString &query) const;
 
 	// Child list may be unable to set specific search state.
@@ -201,8 +230,10 @@ class Widget final : public Window::AbstractSectionWidget {
 	void showCalendar();
 	void showSearchFrom();
 	void showMainMenu();
-	void clearSearchCache();
+	void clearSearchCache(bool clearPosts);
 	void setSearchQuery(const QString &query, int cursorPosition = -1);
+	void updateTopBarSuggestions();
+	void updateFrozenAccountBar();
 	void updateControlsVisibility(bool fast = false);
 	void updateLockUnlockVisibility(
 		anim::type animated = anim::type::instant);
@@ -244,10 +275,10 @@ class Widget final : public Window::AbstractSectionWidget {
 	void searchFailed(
 		SearchRequestType type,
 		const MTP::Error &error,
-		mtpRequestId requestId);
-	void peerSearchFailed(const MTP::Error &error, mtpRequestId requestId);
-	void searchApplyEmpty(SearchRequestType type, mtpRequestId id);
-	void peerSearchApplyEmpty(mtpRequestId id);
+		not_null<SearchProcessState*> process);
+	void searchApplyEmpty(
+		SearchRequestType type,
+		not_null<SearchProcessState*> process);
 
 	void updateForceDisplayWide();
 	void scrollToDefault(bool verytop = false);
@@ -259,6 +290,8 @@ class Widget final : public Window::AbstractSectionWidget {
 	void updateLockUnlockPosition();
 	void updateSuggestions(anim::type animated);
 	void processSearchFocusChange();
+	void closeSuggestions();
+	[[nodiscard]] bool searchActive() const;
 
 	[[nodiscard]] bool redirectToSearchPossible() const;
 	[[nodiscard]] bool redirectKeyToSearch(QKeyEvent *e) const;
@@ -276,8 +309,11 @@ class Widget final : public Window::AbstractSectionWidget {
 	bool _dragForward = false;
 	base::Timer _chooseByDragTimer;
 
-	Layout _layout = Layout::Main;
-	int _narrowWidth = 0;
+	const Layout _layout = Layout::Main;
+	const int _narrowWidth = 0;
+
+	std::unique_ptr<Ui::AbstractButton> _frozenAccountBar;
+
 	object_ptr<Ui::RpWidget> _searchControls;
 	object_ptr<HistoryView::TopBarWidget> _subsectionTopBar = { nullptr };
 	struct {
@@ -289,7 +325,7 @@ class Widget final : public Window::AbstractSectionWidget {
 	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _chooseFromUser;
 	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _jumpToDate;
 	object_ptr<Ui::CrossButton> _cancelSearch;
-	object_ptr< Ui::FadeWrapScaled<Ui::IconButton>> _lockUnlock;
+	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _lockUnlock;
 
 	std::unique_ptr<Ui::MoreChatsBar> _moreChatsBar;
 
@@ -298,8 +334,18 @@ class Widget final : public Window::AbstractSectionWidget {
 	std::unique_ptr<Ui::RequestsBar> _forumRequestsBar;
 	std::unique_ptr<HistoryView::ContactStatus> _forumReportBar;
 
+	base::unique_qptr<Ui::RpWidget> _chatFilters;
+
+	base::unique_qptr<Ui::SlideWrap<Ui::RpWidget>> _topBarSuggestion;
+	base::unique_qptr<Ui::RpWidget> _topBarSuggestionPlaceholder;
+	rpl::event_stream<int> _topBarSuggestionHeightChanged;
+	rpl::event_stream<bool> _searchStateForTopBarSuggestion;
+	rpl::event_stream<> _prepareTopBarSnapshot;
+	rpl::event_stream<bool> _openedFolderOrForumChanges;
+
 	object_ptr<Ui::ElasticScroll> _scroll;
-	QPointer<InnerWidget> _inner;
+	Ui::VerticalLayout *_innerList = nullptr;
+	InnerWidget *_inner = nullptr;
 	std::unique_ptr<Suggestions> _suggestions;
 	std::vector<std::unique_ptr<Suggestions>> _hidingSuggestions;
 	class BottomButton;
@@ -318,6 +364,7 @@ class Widget final : public Window::AbstractSectionWidget {
 	bool _scrollToTopIsShown = false;
 	bool _forumSearchRequested = false;
 	HashOrCashtag _searchHashOrCashtag = {};
+	bool _searchWithPostsPreview = false;
 
 	Data::Folder *_openedFolder = nullptr;
 	Data::Forum *_openedForum = nullptr;
@@ -327,6 +374,7 @@ class Widget final : public Window::AbstractSectionWidget {
 	QString _lastSearchText;
 	bool _searchSuggestionsLocked = false;
 	bool _searchHasFocus = false;
+	bool _searchEngaged = false;
 	bool _processingSearch = false;
 
 	rpl::event_stream<rpl::producer<Stories::Content>> _storiesContents;
@@ -343,10 +391,6 @@ class Widget final : public Window::AbstractSectionWidget {
 
 	base::Timer _searchTimer;
 
-	QString _peerSearchQuery;
-	bool _peerSearchFull = false;
-	mtpRequestId _peerSearchRequest = 0;
-
 	QString _topicSearchQuery;
 	TimeId _topicSearchOffsetDate = 0;
 	MsgId _topicSearchOffsetId = 0;
@@ -358,21 +402,19 @@ class Widget final : public Window::AbstractSectionWidget {
 	PeerData *_searchQueryFrom = nullptr;
 	std::vector<Data::ReactionId> _searchQueryTags;
 	ChatSearchTab _searchQueryTab = {};
-	int32 _searchNextRate = 0;
-	bool _searchFull = false;
-	bool _searchFullMigrated = false;
-	int _searchInHistoryRequest = 0; // Not real mtpRequestId.
-	mtpRequestId _searchRequest = 0;
+	ChatTypeFilter _searchQueryFilter = {};
+
+	Ui::Controls::SwipeBackResult _swipeBackData;
+	bool _swipeBackMirrored = false;
+	bool _swipeBackIconMirrored = false;
 
-	PeerData *_lastSearchPeer = nullptr;
-	MsgId _lastSearchId = 0;
-	MsgId _lastSearchMigratedId = 0;
+	SearchProcessState _searchProcess;
+	SearchProcessState _migratedProcess;
+	SearchProcessState _postsProcess;
+	int _historiesRequest = 0; // Not real mtpRequestId.
 
-	base::flat_map<QString, MTPmessages_Messages> _searchCache;
+	Api::PeerSearch _peerSearch;
 	Api::SingleMessageSearch _singleMessageSearch;
-	base::flat_map<mtpRequestId, QString> _searchQueries;
-	base::flat_map<QString, MTPcontacts_Found> _peerSearchCache;
-	base::flat_map<mtpRequestId, QString> _peerSearchQueries;
 
 	QPixmap _widthAnimationCache;
 
diff --git a/Telegram/SourceFiles/dialogs/suggestions/suggestion.cpp b/Telegram/SourceFiles/dialogs/suggestions/suggestion.cpp
new file mode 100644
index 00000000000000..c45f35c4da4256
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/suggestions/suggestion.cpp
@@ -0,0 +1,26 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/suggestions/suggestion.h"
+
+namespace Dialogs::TopBarSuggestions {
+
+std::vector<Spec> AllSpecs() {
+	auto result = std::vector<Spec>();
+	result.push_back(MakeBirthdayContactsSpec());
+	result.push_back(MakeBirthdaySetupSpec());
+	result.push_back(MakeCustomPromoSpec());
+	result.push_back(MakeGiftAuctionsSpec());
+	result.push_back(MakeLowCreditsSubsSpec());
+	result.push_back(MakePremiumGraceSpec());
+	result.push_back(MakePremiumOfferSpec());
+	result.push_back(MakeUnreviewedAuthSpec());
+	result.push_back(MakeUserpicSetupSpec());
+	return result;
+}
+
+} // namespace Dialogs::TopBarSuggestions
diff --git a/Telegram/SourceFiles/dialogs/suggestions/suggestion.h b/Telegram/SourceFiles/dialogs/suggestions/suggestion.h
new file mode 100644
index 00000000000000..069cc917428065
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/suggestions/suggestion.h
@@ -0,0 +1,75 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Dialogs {
+
+class TopBarSuggestionContent;
+
+namespace TopBarSuggestions {
+
+struct Context {
+	not_null<Ui::RpWidget*> parent;
+	not_null<Main::Session*> session;
+	Fn<not_null<TopBarSuggestionContent*>()> ensureContent;
+	Fn<not_null<Window::SessionController*>()> findController;
+	Fn<rpl::producer<float64>()> childListShown;
+};
+
+struct ActivateArgs {
+	Context context;
+	not_null<rpl::lifetime*> lifetime;
+	Fn<void(not_null<Ui::RpWidget*>, Fn<void()>)> done;
+	Fn<void()> recompute;
+};
+
+enum class Priority : int {
+	UserpicSetup     = 1,
+	PremiumOffer     = 2,
+	BirthdaySetup    = 3,
+	BirthdayContacts = 4,
+	LowCreditsSubs   = 5,
+	PremiumGrace     = 6,
+	CustomPromo      = 7,
+	GiftAuctions     = 8,
+	UnreviewedAuth   = 9,
+};
+
+struct Spec {
+	Priority priority = Priority{};
+	Fn<bool(const Context&)> available;
+	Fn<void(ActivateArgs)> activate;
+	bool dayDependent = false;
+};
+
+[[nodiscard]] std::vector<Spec> AllSpecs();
+
+[[nodiscard]] Spec MakeBirthdayContactsSpec();
+[[nodiscard]] Spec MakeBirthdaySetupSpec();
+[[nodiscard]] Spec MakeCustomPromoSpec();
+[[nodiscard]] Spec MakeGiftAuctionsSpec();
+[[nodiscard]] Spec MakeLowCreditsSubsSpec();
+[[nodiscard]] Spec MakePremiumGraceSpec();
+[[nodiscard]] Spec MakePremiumOfferSpec();
+[[nodiscard]] Spec MakeUnreviewedAuthSpec();
+[[nodiscard]] Spec MakeUserpicSetupSpec();
+
+} // namespace TopBarSuggestions
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/suggestions/suggestion_birthday_contacts.cpp b/Telegram/SourceFiles/dialogs/suggestions/suggestion_birthday_contacts.cpp
new file mode 100644
index 00000000000000..f654821a44ff60
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/suggestions/suggestion_birthday_contacts.cpp
@@ -0,0 +1,149 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/suggestions/suggestion.h"
+
+#include "boxes/star_gift_box.h"
+#include "data/components/promo_suggestions.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "dialogs/ui/dialogs_top_bar_suggestion_content.h"
+#include "history/view/history_view_group_call_bar.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/painter.h"
+#include "ui/text/text_utilities.h"
+#include "ui/ui_utility.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+
+namespace Dialogs::TopBarSuggestions {
+namespace {
+
+constexpr auto kSugBirthdayContacts = "BIRTHDAY_CONTACTS_TODAY"_cs;
+
+bool Available(const Context &context) {
+	const auto session = context.session.get();
+	return session->premiumCanBuy()
+		&& session->promoSuggestions().current(kSugBirthdayContacts.utf8());
+}
+
+void Activate(ActivateArgs args) {
+	const auto session = args.context.session.get();
+	const auto promo = &session->promoSuggestions();
+	const auto content = args.context.ensureContent();
+	const auto findController = args.context.findController;
+	const auto recompute = args.recompute;
+	const auto done = args.done;
+
+	promo->requestContactBirthdays(crl::guard(content.get(), [=] {
+		const auto users = promo->knownBirthdaysToday().value_or(
+			std::vector<UserId>());
+		if (users.empty()) {
+			recompute();
+			return;
+		}
+		const auto controller = findController();
+		const auto isSingle = users.size() == 1;
+		const auto first = session->data().user(users.front());
+		using RightIcon = TopBarSuggestionContent::RightIcon;
+		content->setRightIcon(RightIcon::Close);
+		content->setClickedCallback([=] {
+			if (isSingle) {
+				Ui::ShowStarGiftBox(controller, first);
+			} else {
+				Ui::ChooseStarGiftRecipient(controller);
+			}
+		});
+		content->setHideCallback([=] {
+			promo->dismiss(kSugBirthdayContacts.utf8());
+			controller->showToast(
+				tr::lng_dialogs_suggestions_birthday_contact_dismiss(
+					tr::now));
+			recompute();
+		});
+		auto title = isSingle
+			? tr::lng_dialogs_suggestions_birthday_contact_title(
+				tr::now,
+				lt_text,
+				{ first->shortName() },
+				tr::rich)
+			: tr::lng_dialogs_suggestions_birthday_contacts_title(
+				tr::now,
+				lt_count,
+				users.size(),
+				tr::rich);
+		auto text = isSingle
+			? tr::lng_dialogs_suggestions_birthday_contact_about(
+				tr::now,
+				TextWithEntities::Simple)
+			: tr::lng_dialogs_suggestions_birthday_contacts_about(
+				tr::now,
+				TextWithEntities::Simple);
+		content->setContent(std::move(title), std::move(text));
+		if (!isSingle) {
+			struct UserViews {
+				std::vector<HistoryView::UserpicInRow> inRow;
+				QImage userpics;
+			};
+			auto inRow = std::vector<HistoryView::UserpicInRow>();
+			for (const auto &id : users) {
+				if (inRow.size() >= 3) {
+					break;
+				}
+				if (const auto user = session->data().user(id)) {
+					inRow.push_back({ .peer = user });
+				}
+			}
+			const auto &userpicsSt = st::historyCommentsUserpics;
+			const auto rowCount = int(inRow.size());
+			const auto rowWidth = rowCount * userpicsSt.size
+				- userpicsSt.shift;
+			const auto rowHeight = userpicsSt.size;
+			const auto widget = Ui::CreateChild<Ui::RpWidget>(content.get());
+			widget->resize(rowWidth, rowHeight);
+			const auto s = widget->lifetime().make_state<UserViews>();
+			s->inRow = std::move(inRow);
+			widget->paintOn([=](QPainter &p) {
+				if (HistoryView::NeedRegenerateUserpics(
+						s->userpics,
+						s->inRow)) {
+					HistoryView::GenerateUserpicsInRow(
+						s->userpics,
+						s->inRow,
+						st::historyCommentsUserpics,
+						3);
+				}
+				p.drawImage(0, 0, s->userpics);
+			});
+			content->setLeadingWidget(widget);
+		} else {
+			const auto fake = Ui::CreateChild<Ui::UserpicButton>(
+				content.get(),
+				first,
+				st::uploadUserpicButton);
+			content->setLeadingWidget(fake);
+		}
+		done(content, [content] { content->prepareCollapseSnapshot(); });
+	}));
+}
+
+} // namespace
+
+Spec MakeBirthdayContactsSpec() {
+	return {
+		.priority = Priority::BirthdayContacts,
+		.available = Available,
+		.activate = Activate,
+		.dayDependent = true,
+	};
+}
+
+} // namespace Dialogs::TopBarSuggestions
diff --git a/Telegram/SourceFiles/dialogs/suggestions/suggestion_birthday_setup.cpp b/Telegram/SourceFiles/dialogs/suggestions/suggestion_birthday_setup.cpp
new file mode 100644
index 00000000000000..fe4cefd82cf6ef
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/suggestions/suggestion_birthday_setup.cpp
@@ -0,0 +1,86 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/suggestions/suggestion.h"
+
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "data/components/promo_suggestions.h"
+#include "data/data_birthday.h"
+#include "data/data_user.h"
+#include "dialogs/ui/dialogs_top_bar_suggestion_content.h"
+#include "info/profile/info_profile_values.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/text/text_utilities.h"
+#include "window/window_session_controller.h"
+
+namespace Dialogs::TopBarSuggestions {
+namespace {
+
+constexpr auto kSugSetBirthday = "BIRTHDAY_SETUP"_cs;
+
+bool Available(const Context &context) {
+	const auto session = context.session.get();
+	return session->promoSuggestions().current(kSugSetBirthday.utf8())
+		&& !Data::IsBirthdayToday(session->user()->birthday());
+}
+
+void Activate(ActivateArgs args) {
+	const auto session = args.context.session.get();
+	const auto promo = &session->promoSuggestions();
+	const auto content = args.context.ensureContent();
+	const auto findController = args.context.findController;
+	const auto recompute = args.recompute;
+	const auto lifetime = args.lifetime;
+	using RightIcon = TopBarSuggestionContent::RightIcon;
+	content->setRightIcon(RightIcon::Close);
+	content->setLeadingWidget(nullptr);
+	content->setClickedCallback([=] {
+		const auto controller = findController();
+		Core::App().openInternalUrl(
+			u"internal:edit_birthday:add_privacy"_q,
+			QVariant::fromValue(ClickHandlerContext{
+				.sessionWindow = base::make_weak(controller),
+			}));
+
+		Info::Profile::BirthdayValue(
+			session->user()
+		) | rpl::map(
+			Data::IsBirthdayTodayValue
+		) | rpl::flatten_latest(
+		) | rpl::distinct_until_changed(
+		) | rpl::on_next([=] {
+			recompute();
+		}, *lifetime);
+	});
+	content->setHideCallback([=] {
+		promo->dismiss(kSugSetBirthday.utf8());
+		recompute();
+	});
+	content->setContent(
+		tr::lng_dialogs_suggestions_birthday_title(
+			tr::now,
+			tr::bold),
+		tr::lng_dialogs_suggestions_birthday_about(
+			tr::now,
+			TextWithEntities::Simple));
+	args.done(content, [content] { content->prepareCollapseSnapshot(); });
+}
+
+} // namespace
+
+Spec MakeBirthdaySetupSpec() {
+	return {
+		.priority = Priority::BirthdaySetup,
+		.available = Available,
+		.activate = Activate,
+		.dayDependent = true,
+	};
+}
+
+} // namespace Dialogs::TopBarSuggestions
diff --git a/Telegram/SourceFiles/dialogs/suggestions/suggestion_custom_promo.cpp b/Telegram/SourceFiles/dialogs/suggestions/suggestion_custom_promo.cpp
new file mode 100644
index 00000000000000..a8c99d02fa7dae
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/suggestions/suggestion_custom_promo.cpp
@@ -0,0 +1,66 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/suggestions/suggestion.h"
+
+#include "core/click_handler_types.h"
+#include "core/ui_integration.h"
+#include "data/components/promo_suggestions.h"
+#include "dialogs/ui/dialogs_top_bar_suggestion_content.h"
+#include "main/main_session.h"
+#include "window/window_session_controller.h"
+
+namespace Dialogs::TopBarSuggestions {
+namespace {
+
+bool Available(const Context &context) {
+	return context.session->promoSuggestions().custom().has_value();
+}
+
+void Activate(ActivateArgs args) {
+	const auto session = args.context.session.get();
+	const auto promo = &session->promoSuggestions();
+	const auto custom = promo->custom();
+	if (!custom) {
+		return;
+	}
+	const auto content = args.context.ensureContent();
+	const auto findController = args.context.findController;
+	const auto recompute = args.recompute;
+	using RightIcon = TopBarSuggestionContent::RightIcon;
+	content->setRightIcon(RightIcon::Close);
+	content->setLeadingWidget(nullptr);
+	content->setClickedCallback([=] {
+		const auto controller = findController();
+		UrlClickHandler::Open(
+			custom->url,
+			QVariant::fromValue(ClickHandlerContext{
+				.sessionWindow = base::make_weak(controller),
+			}));
+	});
+	content->setHideCallback([=] {
+		promo->dismiss(custom->suggestion);
+		recompute();
+	});
+	content->setContent(
+		custom->title,
+		custom->description,
+		Core::TextContext({ .session = session }));
+	args.done(content, [content] { content->prepareCollapseSnapshot(); });
+}
+
+} // namespace
+
+Spec MakeCustomPromoSpec() {
+	return {
+		.priority = Priority::CustomPromo,
+		.available = Available,
+		.activate = Activate,
+	};
+}
+
+} // namespace Dialogs::TopBarSuggestions
diff --git a/Telegram/SourceFiles/dialogs/suggestions/suggestion_gift_auctions.cpp b/Telegram/SourceFiles/dialogs/suggestions/suggestion_gift_auctions.cpp
new file mode 100644
index 00000000000000..87a81f5985e2d6
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/suggestions/suggestion_gift_auctions.cpp
@@ -0,0 +1,77 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/suggestions/suggestion.h"
+
+#include "boxes/star_gift_auction_box.h"
+#include "core/ui_integration.h"
+#include "data/components/gift_auctions.h"
+#include "dialogs/ui/dialogs_top_bar_suggestion_content.h"
+#include "main/main_session.h"
+#include "ui/text/text_utilities.h"
+#include "window/window_session_controller.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_layers.h"
+
+namespace Dialogs::TopBarSuggestions {
+namespace {
+
+bool Available(const Context &context) {
+	return context.session->giftAuctions().hasActive();
+}
+
+void Activate(ActivateArgs args) {
+	const auto session = args.context.session.get();
+	const auto auctions = &session->giftAuctions();
+	const auto content = args.context.ensureContent();
+	const auto window = args.context.findController();
+
+	struct Button {
+		rpl::variable<TextWithEntities> text;
+		Fn<void()> callback;
+		base::has_weak_ptr guard;
+	};
+	const auto button = args.lifetime->make_state<Button>();
+	const auto recompute = args.recompute;
+	auctions->active(
+	) | rpl::on_next([=](Data::ActiveAuctions &&active) {
+		if (active.list.empty()) {
+			recompute();
+			return;
+		}
+		auto text = Ui::ActiveAuctionsState(active);
+		const auto textColorOverride = text.someOutbid
+			? st::attentionButtonFg->c
+			: std::optional<QColor>();
+		content->setContent(
+			Ui::ActiveAuctionsTitle(active),
+			std::move(text.text),
+			Core::TextContext({ .session = session }),
+			textColorOverride);
+		button->text = Ui::ActiveAuctionsButton(active);
+		button->callback = Ui::ActiveAuctionsCallback(window, active);
+	}, *args.lifetime);
+	const auto callback = crl::guard(&button->guard, [=] {
+		button->callback();
+	});
+	content->setRightButton(button->text.value(), callback);
+	content->setClickedCallback(callback);
+	content->setLeadingWidget(nullptr);
+	args.done(content, [content] { content->prepareCollapseSnapshot(); });
+}
+
+} // namespace
+
+Spec MakeGiftAuctionsSpec() {
+	return {
+		.priority = Priority::GiftAuctions,
+		.available = Available,
+		.activate = Activate,
+	};
+}
+
+} // namespace Dialogs::TopBarSuggestions
diff --git a/Telegram/SourceFiles/dialogs/suggestions/suggestion_low_credits_subs.cpp b/Telegram/SourceFiles/dialogs/suggestions/suggestion_low_credits_subs.cpp
new file mode 100644
index 00000000000000..aa19d1cb46a437
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/suggestions/suggestion_low_credits_subs.cpp
@@ -0,0 +1,130 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/suggestions/suggestion.h"
+
+#include "api/api_credits.h"
+#include "data/components/credits.h"
+#include "data/components/promo_suggestions.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "dialogs/ui/dialogs_top_bar_suggestion_content.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/settings_credits_graphics.h"
+#include "ui/effects/credits_graphics.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "window/window_session_controller.h"
+
+namespace Dialogs::TopBarSuggestions {
+namespace {
+
+constexpr auto kSugLowCreditsSubs = "STARS_SUBSCRIPTION_LOW_BALANCE"_cs;
+
+bool Available(const Context &context) {
+	const auto session = context.session.get();
+	return session->premiumCanBuy()
+		&& session->promoSuggestions().current(kSugLowCreditsSubs.utf8());
+}
+
+void Activate(ActivateArgs args) {
+	const auto session = args.context.session.get();
+	const auto promo = &session->promoSuggestions();
+	const auto content = args.context.ensureContent();
+	const auto findController = args.context.findController;
+	const auto recompute = args.recompute;
+	const auto done = args.done;
+
+	const auto history = args.lifetime->make_state<
+		std::unique_ptr<Api::CreditsHistory>>(
+			std::make_unique<Api::CreditsHistory>(
+				session->user(),
+				false,
+				false));
+	const auto balanceSub = args.lifetime->make_state<rpl::lifetime>();
+
+	const auto show = [=](const QString &peers, uint64 needed, uint64 whole) {
+		if (whole > needed) {
+			return;
+		}
+		using RightIcon = TopBarSuggestionContent::RightIcon;
+		content->setRightIcon(RightIcon::Close);
+		content->setLeadingWidget(nullptr);
+		content->setClickedCallback([=] {
+			const auto controller = findController();
+			controller->uiShow()->show(Box(
+				Settings::SmallBalanceBox,
+				controller->uiShow(),
+				needed,
+				Settings::SmallBalanceSubscription{ peers },
+				[=] {
+					promo->dismiss(kSugLowCreditsSubs.utf8());
+					recompute();
+				}));
+		});
+		content->setHideCallback([=] {
+			promo->dismiss(kSugLowCreditsSubs.utf8());
+			recompute();
+		});
+		content->setContent(
+			tr::lng_dialogs_suggestions_credits_sub_low_title(
+				tr::now,
+				lt_count,
+				float64(needed - whole),
+				lt_emoji,
+				Ui::MakeCreditsIconEntity(),
+				lt_channels,
+				{ peers },
+				tr::bold),
+			tr::lng_dialogs_suggestions_credits_sub_low_about(
+				tr::now,
+				TextWithEntities::Simple),
+			Ui::MakeCreditsIconContext(
+				content->contentTitleSt().font->height,
+				1));
+		done(content, [content] { content->prepareCollapseSnapshot(); });
+	};
+
+	session->credits().load();
+	session->credits().balanceValue() | rpl::on_next([=] {
+		balanceSub->destroy();
+		(*history)->requestSubscriptions(
+			Data::CreditsStatusSlice::OffsetToken(),
+			[=](Data::CreditsStatusSlice slice) {
+				history->reset();
+				auto peers = QStringList();
+				auto credits = uint64(0);
+				for (const auto &entry : slice.subscriptions) {
+					if (entry.barePeerId) {
+						const auto peer = session->data().peer(
+							PeerId(entry.barePeerId));
+						peers.append(peer->name());
+						credits += entry.subscription.credits;
+					}
+				}
+				show(
+					peers.join(", "),
+					credits,
+					session->credits().balance().whole());
+			},
+			true);
+	}, *balanceSub);
+}
+
+} // namespace
+
+Spec MakeLowCreditsSubsSpec() {
+	return {
+		.priority = Priority::LowCreditsSubs,
+		.available = Available,
+		.activate = Activate,
+	};
+}
+
+} // namespace Dialogs::TopBarSuggestions
diff --git a/Telegram/SourceFiles/dialogs/suggestions/suggestion_premium_grace.cpp b/Telegram/SourceFiles/dialogs/suggestions/suggestion_premium_grace.cpp
new file mode 100644
index 00000000000000..bdb5394e9716a3
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/suggestions/suggestion_premium_grace.cpp
@@ -0,0 +1,70 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/suggestions/suggestion.h"
+
+#include "core/click_handler_types.h"
+#include "data/components/promo_suggestions.h"
+#include "dialogs/ui/dialogs_top_bar_suggestion_content.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/text/text_utilities.h"
+#include "window/window_session_controller.h"
+
+namespace Dialogs::TopBarSuggestions {
+namespace {
+
+constexpr auto kSugPremiumGrace = "PREMIUM_GRACE"_cs;
+
+bool Available(const Context &context) {
+	const auto session = context.session.get();
+	return session->premiumCanBuy()
+		&& session->promoSuggestions().current(kSugPremiumGrace.utf8());
+}
+
+void Activate(ActivateArgs args) {
+	const auto session = args.context.session.get();
+	const auto promo = &session->promoSuggestions();
+	const auto content = args.context.ensureContent();
+	const auto findController = args.context.findController;
+	const auto recompute = args.recompute;
+	using RightIcon = TopBarSuggestionContent::RightIcon;
+	content->setRightIcon(RightIcon::Close);
+	content->setLeadingWidget(nullptr);
+	content->setClickedCallback([=] {
+		const auto controller = findController();
+		UrlClickHandler::Open(
+			u"https://t.me/premiumbot?start=status"_q,
+			QVariant::fromValue(ClickHandlerContext{
+				.sessionWindow = base::make_weak(controller),
+			}));
+	});
+	content->setHideCallback([=] {
+		promo->dismiss(kSugPremiumGrace.utf8());
+		recompute();
+	});
+	content->setContent(
+		tr::lng_dialogs_suggestions_premium_grace_title(
+			tr::now,
+			tr::bold),
+		tr::lng_dialogs_suggestions_premium_grace_about(
+			tr::now,
+			TextWithEntities::Simple));
+	args.done(content, [content] { content->prepareCollapseSnapshot(); });
+}
+
+} // namespace
+
+Spec MakePremiumGraceSpec() {
+	return {
+		.priority = Priority::PremiumGrace,
+		.available = Available,
+		.activate = Activate,
+	};
+}
+
+} // namespace Dialogs::TopBarSuggestions
diff --git a/Telegram/SourceFiles/dialogs/suggestions/suggestion_premium_offer.cpp b/Telegram/SourceFiles/dialogs/suggestions/suggestion_premium_offer.cpp
new file mode 100644
index 00000000000000..2adef5b5c75d24
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/suggestions/suggestion_premium_offer.cpp
@@ -0,0 +1,113 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/suggestions/suggestion.h"
+
+#include "api/api_premium.h"
+#include "apiwrap.h"
+#include "data/components/promo_suggestions.h"
+#include "dialogs/ui/dialogs_top_bar_suggestion_content.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/sections/settings_premium.h"
+#include "ui/text/text_utilities.h"
+#include "window/window_session_controller.h"
+
+namespace Dialogs::TopBarSuggestions {
+namespace {
+
+constexpr auto kSugPremiumAnnual = "PREMIUM_ANNUAL"_cs;
+constexpr auto kSugPremiumUpgrade = "PREMIUM_UPGRADE"_cs;
+constexpr auto kSugPremiumRestore = "PREMIUM_RESTORE"_cs;
+
+[[nodiscard]] QString CurrentPremiumKey(
+		not_null<Data::PromoSuggestions*> promo) {
+	if (promo->current(kSugPremiumAnnual.utf8())) {
+		return kSugPremiumAnnual.utf8();
+	} else if (promo->current(kSugPremiumRestore.utf8())) {
+		return kSugPremiumRestore.utf8();
+	} else if (promo->current(kSugPremiumUpgrade.utf8())) {
+		return kSugPremiumUpgrade.utf8();
+	}
+	return QString();
+}
+
+bool Available(const Context &context) {
+	const auto session = context.session.get();
+	if (!session->premiumPossible() || session->premium()) {
+		return false;
+	}
+	return !CurrentPremiumKey(&session->promoSuggestions()).isEmpty();
+}
+
+void Activate(ActivateArgs args) {
+	const auto session = args.context.session.get();
+	const auto promo = &session->promoSuggestions();
+	const auto content = args.context.ensureContent();
+	const auto findController = args.context.findController;
+	const auto recompute = args.recompute;
+	const auto done = args.done;
+	const auto key = CurrentPremiumKey(promo);
+	const auto isPremiumAnnual = (key == kSugPremiumAnnual.utf8());
+	const auto isPremiumRestore = (key == kSugPremiumRestore.utf8());
+	const auto premiumSub = args.lifetime->make_state<rpl::lifetime>();
+	using RightIcon = TopBarSuggestionContent::RightIcon;
+	content->setRightIcon(RightIcon::Arrow);
+	content->setLeadingWidget(nullptr);
+
+	const auto set = [=](QString discount) {
+		constexpr auto kMinus = QChar(0x2212);
+		const auto &title = isPremiumAnnual
+			? tr::lng_dialogs_suggestions_premium_annual_title
+			: isPremiumRestore
+			? tr::lng_dialogs_suggestions_premium_restore_title
+			: tr::lng_dialogs_suggestions_premium_upgrade_title;
+		const auto &description = isPremiumAnnual
+			? tr::lng_dialogs_suggestions_premium_annual_about
+			: isPremiumRestore
+			? tr::lng_dialogs_suggestions_premium_restore_about
+			: tr::lng_dialogs_suggestions_premium_upgrade_about;
+		content->setContent(
+			title(
+				tr::now,
+				lt_text,
+				{ discount.replace(kMinus, QChar()) },
+				tr::bold),
+			description(tr::now, TextWithEntities::Simple));
+		content->setClickedCallback([=] {
+			const auto controller = findController();
+			Settings::ShowPremium(controller, "dialogs_hint");
+			promo->dismiss(key);
+			recompute();
+		});
+		done(content, [content] { content->prepareCollapseSnapshot(); });
+	};
+
+	const auto api = &session->api().premium();
+	api->statusTextValue() | rpl::on_next([=] {
+		for (const auto &o : api->subscriptionOptions()) {
+			if (o.months == 12) {
+				set(o.discount);
+				premiumSub->destroy();
+				return;
+			}
+		}
+	}, *premiumSub);
+	api->reload();
+}
+
+} // namespace
+
+Spec MakePremiumOfferSpec() {
+	return {
+		.priority = Priority::PremiumOffer,
+		.available = Available,
+		.activate = Activate,
+	};
+}
+
+} // namespace Dialogs::TopBarSuggestions
diff --git a/Telegram/SourceFiles/dialogs/suggestions/suggestion_unreviewed_auth.cpp b/Telegram/SourceFiles/dialogs/suggestions/suggestion_unreviewed_auth.cpp
new file mode 100644
index 00000000000000..5673c81dcce5cc
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/suggestions/suggestion_unreviewed_auth.cpp
@@ -0,0 +1,144 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/suggestions/suggestion.h"
+
+#include "api/api_authorizations.h"
+#include "apiwrap.h"
+#include "boxes/unconfirmed_auth_denied_box.h"
+#include "core/click_handler_types.h"
+#include "data/data_authorization.h"
+#include "dialogs/ui/dialogs_top_bar_suggestion_content.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/sections/settings_active_sessions.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+
+namespace Dialogs::TopBarSuggestions {
+namespace {
+
+[[nodiscard]] QString FormatAuthInfo(const Data::UnreviewedAuth &auth) {
+	const auto location = auth.location.isEmpty()
+		? QString()
+		: "\U0001F30D " + auth.location;
+	const auto device = auth.device.isEmpty()
+		? QString()
+		: "\U0001F4F1 " + auth.device;
+
+	if (!location.isEmpty() && !device.isEmpty()) {
+		return location + " (" + device + ")";
+	} else if (!location.isEmpty()) {
+		return location;
+	} else if (!device.isEmpty()) {
+		return device;
+	}
+	return QString();
+}
+
+void ShowAuthToast(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Main::Session*> session,
+		Fn<not_null<Window::SessionController*>()> findController,
+		const std::vector<Data::UnreviewedAuth> &list,
+		bool confirmed) {
+	if (confirmed) {
+		auto text = tr::lng_unconfirmed_auth_confirmed_message(
+			tr::now,
+			lt_link,
+			tr::link(tr::lng_settings_sessions_title(tr::now)),
+			tr::rich);
+		auto filter = [=](
+				ClickHandlerPtr handler,
+				Qt::MouseButton button) {
+			if (const auto controller = findController()) {
+				session->api().authorizations().reload();
+				controller->showSettings(Settings::SessionsId());
+				return false;
+			}
+			return true;
+		};
+		Ui::Toast::Show(parent->window(), Ui::Toast::Config{
+			.title = tr::lng_unconfirmed_auth_confirmed(tr::now),
+			.text = std::move(text),
+			.filter = std::move(filter),
+			.duration = crl::time(5000),
+		});
+	} else {
+		auto messageText = QString();
+		if (list.size() == 1) {
+			messageText = tr::lng_unconfirmed_auth_denied_single(
+				tr::now,
+				lt_country,
+				FormatAuthInfo(list.front()));
+		} else {
+			auto authList = QString('\n');
+			for (auto i = 0; i < std::min(int(list.size()), 10); ++i) {
+				const auto info = FormatAuthInfo(list[i]);
+				if (!info.isEmpty()) {
+					authList += "• " + info + "\n";
+				}
+			}
+			messageText = tr::lng_unconfirmed_auth_denied_multiple(
+				tr::now,
+				lt_country,
+				authList);
+		}
+		const auto controller = findController();
+		const auto count = float64(list.size());
+		controller->show(Box(ShowAuthDeniedBox, count, messageText));
+	}
+}
+
+bool Available(const Context &context) {
+	return !context.session->api().authorizations().unreviewed().empty();
+}
+
+void Activate(ActivateArgs args) {
+	const auto session = args.context.session.get();
+	const auto parent = args.context.parent;
+	const auto findController = args.context.findController;
+	const auto authorizations = &session->api().authorizations();
+	auto listProducer = rpl::single(
+		authorizations->unreviewed()
+	) | rpl::then(
+		authorizations->unreviewedChanges() | rpl::map([=] {
+			return authorizations->unreviewed();
+		})
+	);
+
+	const auto wrap = CreateUnconfirmedAuthContent(
+		parent,
+		std::move(listProducer),
+		[=](bool confirmed) {
+			const auto current = authorizations->unreviewed();
+			auto hashes = ranges::views::all(
+				current
+			) | ranges::views::transform([](const auto &auth) {
+				return auth.hash;
+			}) | ranges::to_vector;
+			ShowAuthToast(parent, session, findController, current, confirmed);
+			authorizations->review(hashes, confirmed);
+		},
+		args.context.childListShown());
+	args.done(wrap, [wrap] { wrap->prepareCollapseSnapshot(); });
+}
+
+} // namespace
+
+Spec MakeUnreviewedAuthSpec() {
+	return {
+		.priority = Priority::UnreviewedAuth,
+		.available = Available,
+		.activate = Activate,
+	};
+}
+
+} // namespace Dialogs::TopBarSuggestions
diff --git a/Telegram/SourceFiles/dialogs/suggestions/suggestion_userpic_setup.cpp b/Telegram/SourceFiles/dialogs/suggestions/suggestion_userpic_setup.cpp
new file mode 100644
index 00000000000000..5de362235bceec
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/suggestions/suggestion_userpic_setup.cpp
@@ -0,0 +1,111 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/suggestions/suggestion.h"
+
+#include "api/api_peer_photo.h"
+#include "apiwrap.h"
+#include "data/components/promo_suggestions.h"
+#include "data/data_changes.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "dialogs/ui/dialogs_top_bar_suggestion_content.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/text/text_utilities.h"
+#include "ui/ui_utility.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_dialogs.h"
+
+namespace Dialogs::TopBarSuggestions {
+namespace {
+
+constexpr auto kSugSetUserpic = "USERPIC_SETUP"_cs;
+
+bool Available(const Context &context) {
+	const auto session = context.session.get();
+	return session->promoSuggestions().current(kSugSetUserpic.utf8())
+		&& !session->user()->userpicPhotoId();
+}
+
+void Activate(ActivateArgs args) {
+	const auto session = args.context.session.get();
+	const auto promo = &session->promoSuggestions();
+	const auto content = args.context.ensureContent();
+	const auto controller = args.context.findController();
+	const auto recompute = args.recompute;
+	using RightIcon = TopBarSuggestionContent::RightIcon;
+	content->setRightIcon(RightIcon::Close);
+	const auto upload = Ui::CreateChild<Ui::UserpicButton>(
+		content.get(),
+		&controller->window(),
+		Ui::UserpicButton::Role::ChoosePhoto,
+		st::uploadUserpicButton);
+	content->setLeadingWidget(upload);
+	upload->chosenImages() | rpl::on_next([=](
+			Ui::UserpicButton::ChosenImage &&chosen) {
+		if (chosen.type == Ui::UserpicButton::ChosenType::Set) {
+			session->api().peerPhoto().upload(
+				session->user(),
+				{
+					std::move(chosen.image),
+					chosen.markup.documentId,
+					chosen.markup.colors,
+				});
+		}
+	}, upload->lifetime());
+
+	session->changes().peerUpdates(
+		session->user(),
+		Data::PeerUpdate::Flag::Photo
+	) | rpl::on_next([=] {
+		if (session->user()->userpicPhotoId()) {
+			recompute();
+		}
+	}, *args.lifetime);
+
+	content->setHideCallback([=] {
+		promo->dismiss(kSugSetUserpic.utf8());
+		recompute();
+	});
+
+	content->setClickedCallback([=] {
+		const auto syntetic = [=](QEvent::Type type) {
+			Ui::SendSynteticMouseEvent(
+				upload,
+				type,
+				Qt::LeftButton,
+				upload->mapToGlobal(QPoint(0, 0)));
+		};
+		syntetic(QEvent::MouseMove);
+		syntetic(QEvent::MouseButtonPress);
+		syntetic(QEvent::MouseButtonRelease);
+	});
+	content->setContent(
+		tr::lng_dialogs_suggestions_userpics_title(
+			tr::now,
+			tr::bold),
+		tr::lng_dialogs_suggestions_userpics_about(
+			tr::now,
+			TextWithEntities::Simple));
+	args.done(content, [content] { content->prepareCollapseSnapshot(); });
+}
+
+} // namespace
+
+Spec MakeUserpicSetupSpec() {
+	return {
+		.priority = Priority::UserpicSetup,
+		.available = Available,
+		.activate = Activate,
+	};
+}
+
+} // namespace Dialogs::TopBarSuggestions
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp
index 7c3c7f3937899d..cc1f0cc6ec9bc7 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.cpp
@@ -50,7 +50,7 @@ void SearchEmpty::setup(Icon icon, rpl::producer<TextWithEntities> text) {
 		st::recentPeersEmptyMargin);
 	const auto animated = widget.data();
 
-	sizeValue() | rpl::start_with_next([=](QSize size) {
+	sizeValue() | rpl::on_next([=](QSize size) {
 		const auto padding = st::recentPeersEmptyMargin;
 		const auto paddings = padding.left() + padding.right();
 		label->resizeToWidth(size.width() - paddings);
@@ -62,6 +62,13 @@ void SearchEmpty::setup(Icon icon, rpl::producer<TextWithEntities> text) {
 		label->move((size.width() - label->width()) / 2, top - sub);
 	}, lifetime());
 
+	label->setClickHandlerFilter([=](
+			const ClickHandlerPtr &handler,
+			Qt::MouseButton) {
+		_handlerActivated.fire_copy(handler);
+		return false;
+	});
+
 	_animate = [animate] {
 		animate(anim::repeat::once);
 	};
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_empty.h b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.h
index 0ad901ad99ed36..2d1d830a26533c 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_empty.h
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_empty.h
@@ -29,10 +29,15 @@ class SearchEmpty final : public Ui::RpWidget {
 
 	void animate();
 
+	[[nodiscard]] rpl::producer<ClickHandlerPtr> handlerActivated() const {
+		return _handlerActivated.events();
+	}
+
 private:
 	void setup(Icon icon, rpl::producer<TextWithEntities> text);
 
 	Fn<void()> _animate;
+	rpl::event_stream<ClickHandlerPtr> _handlerActivated;
 
 };
 
diff --git a/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp b/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp
index 42e8c33d78635e..f82ebe8bafc0ce 100644
--- a/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/chat_search_in.cpp
@@ -95,16 +95,14 @@ Action::Action(
 , _height(st::dialogsSearchInHeight)
 , _icon(std::move(icon))
 , _checked(chosen) {
-	const auto parent = parentMenu->menu();
-
 	_text.setText(st::semiboldTextStyle, label);
 	_icon->subscribeToUpdates([=] { update(); });
 
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 	resolveMinWidth();
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
@@ -263,7 +261,7 @@ void ChatSearchIn::Section::update() {
 
 ChatSearchIn::ChatSearchIn(QWidget *parent)
 : RpWidget(parent) {
-	_in.clicks.events() | rpl::start_with_next([=] {
+	_in.clicks.events() | rpl::on_next([=] {
 		showMenu();
 	}, lifetime());
 }
@@ -285,13 +283,13 @@ void ChatSearchIn::apply(
 	updateSection(
 		&_in,
 		i->icon->clone(),
-		Ui::Text::Semibold(TabLabel(active, peerTabType)));
+		tr::semibold(TabLabel(active, peerTabType)));
 
 	auto text = tr::lng_dlg_search_from(
 		tr::now,
 		lt_user,
-		Ui::Text::Semibold(fromName),
-		Ui::Text::WithEntities);
+		tr::semibold(fromName),
+		tr::marked);
 	updateSection(&_from, std::move(fromUserpic), std::move(text));
 
 	resizeToWidth(width());
@@ -332,7 +330,7 @@ void ChatSearchIn::showMenu() {
 			tab.icon,
 			TabLabel(value, _peerTabType),
 			(value == active));
-		action->setClickedCallback([=] {
+		action->setActionTriggered([=] {
 			_active = value;
 		});
 		_menu->addAction(std::move(action));
@@ -410,7 +408,7 @@ void ChatSearchIn::updateSection(
 			st::columnMinimalWidthLeft,
 			st::dialogsSearchInHeight);
 
-		raw->paintRequest() | rpl::start_with_next([=] {
+		raw->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(raw);
 			if (!section->subscribed) {
 				section->subscribed = true;
@@ -451,8 +449,9 @@ void ChatSearchIn::updateSection(
 
 		const auto st = &st::dialogsCancelSearchInPeer;
 		section->cancel = std::make_unique<Ui::IconButton>(raw, *st);
+		section->cancel->setAccessibleName(tr::lng_cancel(tr::now));
 		section->cancel->show();
-		raw->sizeValue() | rpl::start_with_next([=](QSize size) {
+		raw->sizeValue() | rpl::on_next([=](QSize size) {
 			const auto left = size.width() - section->cancel->width();
 			const auto top = (size.height() - st->height) / 2;
 			section->cancel->moveToLeft(left, top);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
index 74ef869481bfe4..e8e88862b04616 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
@@ -7,45 +7,62 @@ For license and copyright information please follow this link:
 */
 #include "dialogs/ui/dialogs_layout.h"
 
+#include "base/options.h"
+#include "base/unixtime.h"
+#include "core/ui_integration.h"
+#include "data/data_channel.h"
 #include "data/data_drafts.h"
+#include "data/data_folder.h"
 #include "data/data_forum_topic.h"
+#include "data/data_peer_values.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_session.h"
+#include "data/data_thread.h"
+#include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "dialogs/dialogs_list.h"
 #include "dialogs/dialogs_three_state_icon.h"
+#include "dialogs/dialogs_quick_action.h"
 #include "dialogs/ui/dialogs_video_userpic.h"
-#include "styles/style_dialogs.h"
-#include "styles/style_window.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
+#include "history/history_item_helpers.h"
+#include "history/history_unread_things.h"
+#include "history/view/history_view_item_preview.h"
+#include "history/view/history_view_send_action.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_session.h"
 #include "storage/localstorage.h"
+#include "support/support_helper.h"
 #include "ui/empty_userpic.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/power_saving.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
 #include "ui/unread_badge.h"
 #include "ui/unread_badge_paint.h"
-#include "ui/painter.h"
-#include "ui/power_saving.h"
-#include "core/ui_integration.h"
-#include "lang/lang_keys.h"
-#include "support/support_helper.h"
-#include "main/main_session.h"
-#include "history/view/history_view_send_action.h"
-#include "history/view/history_view_item_preview.h"
-#include "history/history_unread_things.h"
-#include "history/history_item.h"
-#include "history/history_item_components.h"
-#include "history/history_item_helpers.h"
-#include "history/history.h"
-#include "base/unixtime.h"
-#include "data/data_channel.h"
-#include "data/data_user.h"
-#include "data/data_folder.h"
-#include "data/data_peer_values.h"
+#include "ui/unread_counter_format.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_widgets.h"
+#include "styles/style_window.h"
 
 namespace Dialogs::Ui {
+
+const char kOptionDialogsMuteIcon[] = "dialogs-mute-icon";
+
 namespace {
 
+base::options::toggle DialogsMuteIcon({
+	.id = kOptionDialogsMuteIcon,
+	.name = "Mute icon in dialogs",
+	.description = "Show a small mute icon next to the chat name "
+		"for muted chats.",
+});
+
 const auto kPsaBadgePrefix = "cloud_lng_badge_psa_";
 
 [[nodiscard]] bool ShowUserBotIcon(not_null<UserData*> user) {
@@ -57,20 +74,24 @@ const auto kPsaBadgePrefix = "cloud_lng_badge_psa_";
 
 [[nodiscard]] bool ShowSendActionInDialogs(Data::Thread *thread) {
 	const auto history = thread ? thread->owningHistory().get() : nullptr;
-	if (!history) {
+	if (!history || thread->asSublist()) {
 		return false;
 	} else if (const auto user = history->peer->asUser()) {
 		return !user->lastseen().isHidden();
 	}
-	return !history->isForum();
+	return !history->peer->displayAsForum()
+		&& !history->amMonoforumAdmin();
 }
 
 void PaintRowTopRight(
 		QPainter &p,
 		const QString &text,
 		QRect &rectForName,
-		const PaintContext &context) {
-	const auto width = st::dialogsDateFont->width(text);
+		const PaintContext &context,
+		int precomputedWidth = -1) {
+	const auto width = (precomputedWidth >= 0)
+		? precomputedWidth
+		: st::dialogsDateFont->width(text);
 	rectForName.setWidth(rectForName.width() - width - st::dialogsDateSkip);
 	p.setFont(st::dialogsDateFont);
 	p.setPen(context.active
@@ -84,21 +105,100 @@ void PaintRowTopRight(
 		text);
 }
 
+int PaintRightButtonImpl(QPainter &p, const PaintContext &context) {
+	if (context.width < st::columnMinimalWidthLeft) {
+		return 0;
+	}
+	if (const auto rightButton = context.rightButton) {
+		Assert(rightButton->st != nullptr);
+
+		const auto size = rightButton->bg.size() / style::DevicePixelRatio();
+		const auto left = context.width
+			- size.width()
+			- rightButton->st->margin.right();
+		const auto top = rightButton->st->margin.top();
+		p.drawImage(
+			left,
+			top,
+			context.active
+				? rightButton->activeBg
+				: context.selected
+				? rightButton->selectedBg
+				: rightButton->bg);
+		if (rightButton->ripple) {
+			rightButton->ripple->paint(
+				p,
+				left,
+				top,
+				size.width() - size.height() / 2,
+				(context.active
+					? &st::universalRippleAnimation.color->c
+					: &rightButton->st->button.ripple.color->c));
+			if (rightButton->ripple->empty()) {
+				rightButton->ripple.reset();
+			}
+		}
+		p.setPen(context.active
+			? rightButton->st->button.textBg
+			: context.selected
+			? rightButton->st->button.textFgOver
+			: rightButton->st->button.textFg);
+		rightButton->text.draw(p, {
+			.position = QPoint(
+				left + size.height() / 2,
+				top + rightButton->st->button.textTop),
+			.outerWidth = size.width() - size.height() / 2,
+			.availableWidth = size.width() - size.height() / 2,
+			.elisionLines = 1,
+		});
+		return size.width() + st::dialogsUnreadPadding;
+	}
+	return 0;
+}
+
 int PaintBadges(
 		QPainter &p,
 		const PaintContext &context,
 		BadgesState badgesState,
 		int right,
 		int top,
-		bool displayPinnedIcon = false,
-		int pinnedIconTop = 0) {
+		bool displayPinnedIcon,
+		int pinnedIconTop,
+		bool narrow) {
+	const auto paintIconBadge = [&](
+			const style::ThreeStateIcon &icons,
+			bool muted,
+			UnreadBadgeSize sizeId) {
+		if (narrow) {
+			auto st = UnreadBadgeStyle();
+			st.sizeId = sizeId;
+			st.active = context.active;
+			st.selected = context.selected;
+			st.muted = muted;
+			st.padding = 0;
+			st.textTop = 0;
+			const auto badge = PaintUnreadBadge(p, QString(), right, top, st);
+			ThreeStateIcon(icons, st.active, st.selected).paintInCenter(
+				p,
+				badge);
+			right -= badge.width() + st.padding + st::dialogsUnreadPadding;
+			return;
+		}
+		const auto &icon = ThreeStateIcon(
+			icons,
+			context.active,
+			context.selected);
+		icon.paint(p, right - icon.width(), top, context.width);
+		right -= icon.width() + st::dialogsUnreadPadding;
+	};
 	auto initial = right;
+	auto painted = 0;
 	if (badgesState.unread
 		&& !badgesState.unreadCounter
 		&& context.st->unreadMarkDiameter > 0) {
 		const auto d = context.st->unreadMarkDiameter;
-		UnreadBadgeStyle st;
-		PainterHighQualityEnabler hq(p);
+		auto st = UnreadBadgeStyle();
+		auto hq = PainterHighQualityEnabler(p);
 		const auto rect = QRect(
 			right - st.size + (st.size - d) / 2,
 			top + (st.size - d) / 2,
@@ -118,16 +218,21 @@ int PaintBadges(
 				: st::dialogsUnreadBg));
 		p.drawEllipse(rect);
 		right -= st.size + st.padding;
+		++painted;
 	} else if (badgesState.unread) {
 		UnreadBadgeStyle st;
 		st.active = context.active;
 		st.selected = context.selected;
 		st.muted = badgesState.unreadMuted;
-		const auto counter = (badgesState.unreadCounter > 0)
-			? QString::number(badgesState.unreadCounter)
-			: QString();
+		const auto counter = FormatUnreadCounter(
+			badgesState.unreadCounter,
+			badgesState.mention || badgesState.reaction || badgesState.poll,
+			narrow);
 		const auto badge = PaintUnreadBadge(p, counter, right, top, st);
 		right -= badge.width() + st.padding;
+		++painted;
+	} else if (const auto used = PaintRightButton(p, context)) {
+		return used - st::dialogsUnreadPadding;
 	} else if (displayPinnedIcon) {
 		const auto &icon = ThreeStateIcon(
 			st::dialogsPinnedIcon,
@@ -136,27 +241,45 @@ int PaintBadges(
 		icon.paint(p, right - icon.width(), pinnedIconTop, context.width);
 		right -= icon.width() + st::dialogsUnreadPadding;
 	}
-	if (badgesState.mention || badgesState.reaction) {
-		UnreadBadgeStyle st;
-		st.sizeId = badgesState.mention
-			? UnreadBadgeSize::Dialogs
-			: UnreadBadgeSize::ReactionInDialogs;
-		st.active = context.active;
-		st.selected = context.selected;
-		st.muted = badgesState.mention
+	if ((!narrow || (painted < 2))
+		&& (badgesState.mention || badgesState.reaction)) {
+		const auto muted = badgesState.mention
 			? badgesState.mentionMuted
 			: badgesState.reactionMuted;
-		st.padding = 0;
-		st.textTop = 0;
-		const auto counter = QString();
-		const auto badge = PaintUnreadBadge(p, counter, right, top, st);
-		ThreeStateIcon(
+		paintIconBadge(
 			badgesState.mention
-				? st::dialogsUnreadMention
-				: st::dialogsUnreadReaction,
-			st.active,
-			st.selected).paintInCenter(p, badge);
-		right -= badge.width() + st.padding + st::dialogsUnreadPadding;
+				? (narrow
+					? (muted
+						? st::dialogsUnreadMentionBadgeMuted
+						: st::dialogsUnreadMentionBadge)
+					: (muted
+						? st::dialogsUnreadMentionMuted
+						: st::dialogsUnreadMention))
+				: (narrow
+					? (muted
+						? st::dialogsUnreadReactionBadgeMuted
+						: st::dialogsUnreadReactionBadge)
+					: (muted
+						? st::dialogsUnreadReactionMuted
+						: st::dialogsUnreadReaction)),
+			muted,
+			badgesState.mention
+				? UnreadBadgeSize::Dialogs
+				: UnreadBadgeSize::ReactionInDialogs);
+		++painted;
+	}
+	if ((!narrow || (painted < 2)) && badgesState.poll) {
+		paintIconBadge(
+			narrow
+				? (badgesState.pollMuted
+					? st::dialogsUnreadPollBadgeMuted
+					: st::dialogsUnreadPollBadge)
+				: (badgesState.pollMuted
+					? st::dialogsUnreadPollMuted
+					: st::dialogsUnreadPoll),
+			badgesState.pollMuted,
+			UnreadBadgeSize::PollInDialogs);
+		++painted;
 	}
 	return (initial - right);
 }
@@ -189,7 +312,10 @@ void PaintNarrowCounter(
 		context,
 		badgesState,
 		context.st->padding.left() + context.st->photoSize,
-		top);
+		top,
+		false,
+		0,
+		true);
 }
 
 int PaintWideCounter(
@@ -210,7 +336,8 @@ int PaintWideCounter(
 		context.width - context.st->padding.right(),
 		top,
 		displayPinnedIcon,
-		texttop);
+		texttop,
+		false);
 	return availableWidth - used;
 }
 
@@ -256,6 +383,19 @@ enum class Flag {
 };
 inline constexpr bool is_flag_type(Flag) { return true; }
 
+void PaintDialogDate(
+		QPainter &p,
+		not_null<const Entry*> entry,
+		const FakeRow *fakeRow,
+		TimeId date,
+		QRect &rectForName,
+		const PaintContext &context) {
+	const auto resolved = fakeRow
+		? fakeRow->dateText(date, context.now)
+		: entry->chatListTimestampText(date, context.now);
+	PaintRowTopRight(p, resolved.text, rectForName, context, resolved.width);
+}
+
 template <typename PaintItemCallback>
 void PaintRow(
 		Painter &p,
@@ -270,8 +410,9 @@ void PaintRow(
 		const HiddenSenderInfo *hiddenSenderInfo,
 		HistoryItem *item,
 		const Data::Draft *draft,
-		QDateTime date,
+		TimeId date,
 		const PaintContext &context,
+		const FakeRow *fakeRow,
 		BadgesState badgesState,
 		base::flags<Flag> flags,
 		PaintItemCallback &&paintItemCallback) {
@@ -280,11 +421,29 @@ void PaintRow(
 		draft = nullptr;
 	}
 
+	const auto history = entry->asHistory();
+	const auto thread = entry->asThread();
+	const auto sublist = entry->asSublist();
+
 	auto bg = context.active
 		? st::dialogsBgActive
 		: context.selected
 		? st::dialogsBgOver
 		: context.currentBg;
+	auto swipeTranslation = 0;
+	if (history
+		&& context.quickActionContext
+		&& !context.quickActionContext->ripple
+		&& (history->peer->id.value
+			== context.quickActionContext->data.msgBareId)) {
+		if (context.quickActionContext->data.translation != 0) {
+			swipeTranslation = context.quickActionContext->data.translation
+				* -2;
+		}
+	}
+	if (swipeTranslation) {
+		p.translate(-swipeTranslation, 0);
+	}
 	p.fillRect(geometry, bg);
 	if (!(flags & Flag::TopicJumpRipple)) {
 		auto ripple = context.active
@@ -293,10 +452,6 @@ void PaintRow(
 		row->paintRipple(p, 0, 0, context.width, &ripple->c);
 	}
 
-	const auto history = entry->asHistory();
-	const auto thread = entry->asThread();
-	const auto sublist = entry->asSublist();
-
 	if (flags & Flag::SavedMessages) {
 		EmptyUserpic::PaintSavedMessages(
 			p,
@@ -341,10 +496,20 @@ void PaintRow(
 			row->userpicView(),
 			context);
 	} else {
-		row->paintUserpic(p, entry, from, videoUserpic, context);
+		row->paintUserpic(
+			p,
+			entry,
+			from,
+			videoUserpic,
+			context,
+			(context.narrow
+				&& !badgesState.empty()
+				&& !draft
+				&& item
+				&& !item->isEmpty()));
 	}
 
-	auto nameleft = context.st->nameLeft;
+	const auto nameleft = context.st->nameLeft;
 	if (context.topicsExpanded > 0.) {
 		PaintExpandedTopicsBar(p, context.topicsExpanded);
 	}
@@ -364,6 +529,11 @@ void PaintRow(
 
 	const auto promoted = (history && history->useTopPromotion())
 		&& !context.search;
+	const auto verifyInfo = (from
+		&& (!from->isSelf()
+			|| (!(flags & Flag::SavedMessages) && !(flags & Flag::MyNotes))))
+		? from->botVerifyDetails()
+		: nullptr;
 	if (promoted) {
 		const auto type = history->topPromotionType();
 		const auto custom = type.isEmpty()
@@ -375,6 +545,18 @@ void PaintRow(
 			? tr::lng_badge_psa_default(tr::now)
 			: custom;
 		PaintRowTopRight(p, text, rectForName, context);
+	} else if (verifyInfo) {
+		if (!rowBadge.ready(verifyInfo)) {
+			rowBadge.set(
+				verifyInfo,
+				from->owner().customEmojiManager().factory(
+					Data::CustomEmojiSizeTag::Isolated),
+				customEmojiRepaint);
+		}
+		const auto &st = Ui::VerifiedStyle(context);
+		const auto position = rectForName.topLeft();
+		const auto skip = rowBadge.drawVerified(p, position, st);
+		rectForName.setLeft(position.x() + skip + st::dialogsChatTypeSkip);
 	} else if (from) {
 		if (const auto chatTypeIcon = ChatTypeIcon(from, context)) {
 			chatTypeIcon->paint(p, rectForName.topLeft(), context.width);
@@ -425,12 +607,13 @@ void PaintRow(
 		|| (supportMode
 			&& entry->session().supportHelper().isOccupiedBySomeone(history))) {
 		if (!promoted) {
-			const auto dateString = Ui::FormatDialogsDate(date);
-			PaintRowTopRight(p, dateString, rectForName, context);
+			PaintDialogDate(p, entry, fakeRow, date, rectForName, context);
 		}
 
 		auto availableWidth = namewidth;
-		if (entry->isPinnedDialog(context.filter)
+		if (const auto used = PaintRightButton(p, context)) {
+			availableWidth -= used;
+		} else if (entry->isPinnedDialog(context.filter)
 			&& (context.filter || !entry->fixedOnTopIndex())) {
 			auto &icon = ThreeStateIcon(
 				st::dialogsPinnedIcon,
@@ -480,20 +663,16 @@ void PaintRow(
 							.entities = ConvertTextTagsToEntities(
 								draft->textWithTags.tags),
 						}),
-						Text::WithEntities);
+						tr::marked);
 				if (draft && draft->reply) {
-					auto &data = thread->owner().customEmojiManager();
 					draftText = Ui::Text::Colorized(
-						Ui::Text::SingleCustomEmoji(
-							data.registerInternalEmoji(
-								st::dialogsMiniReplyIcon,
-								{},
-								true))).append(std::move(draftText));
+						Ui::Text::IconEmoji(&st::dialogsMiniReplyIcon)
+					).append(std::move(draftText));
 				}
-				const auto context = Core::MarkedTextContext{
+				const auto context = Core::TextContext({
 					.session = &thread->session(),
-					.customEmojiRepaint = customEmojiRepaint,
-				};
+					.repaint = customEmojiRepaint,
+				});
 				cache.setMarkedText(
 					st::dialogsTextStyle,
 					std::move(draftText),
@@ -528,7 +707,9 @@ void PaintRow(
 		}
 	} else if (!item) {
 		auto availableWidth = namewidth;
-		if (entry->isPinnedDialog(context.filter)
+		if (const auto used = PaintRightButton(p, context)) {
+			availableWidth -= used;
+		} else if (entry->isPinnedDialog(context.filter)
 			&& (context.filter || !entry->fixedOnTopIndex())) {
 			auto &icon = ThreeStateIcon(
 				st::dialogsPinnedIcon,
@@ -557,8 +738,7 @@ void PaintRow(
 		}
 	} else if (!item->isEmpty()) {
 		if ((thread || sublist) && !promoted) {
-			const auto dateString = Ui::FormatDialogsDate(date);
-			PaintRowTopRight(p, dateString, rectForName, context);
+			PaintDialogDate(p, entry, fakeRow, date, rectForName, context);
 		}
 
 		paintItemCallback(nameleft, namewidth);
@@ -616,6 +796,42 @@ void PaintRow(
 	}
 
 	p.setFont(st::semiboldFont);
+	const auto paintPeerBadge = [&](int rowNameWidth) {
+		const auto badgeWidth = rowBadge.drawGetWidth(p, {
+			.peer = from,
+			.rectForName = rectForName,
+			.nameWidth = rowNameWidth,
+			.outerWidth = context.width,
+			.verified = (context.active
+				? &st::dialogsVerifiedIconActive
+				: context.selected
+				? &st::dialogsVerifiedIconOver
+				: &st::dialogsVerifiedIcon),
+			.premium = &ThreeStateIcon(
+				st::dialogsPremiumIcon,
+				context.active,
+				context.selected),
+			.scam = (context.active
+				? &st::dialogsScamFgActive
+				: context.selected
+				? &st::dialogsScamFgOver
+				: &st::dialogsScamFg),
+			.direct = (context.active
+				? &st::dialogsDraftFgActive
+				: context.selected
+				? &st::windowSubTextFgOver
+				: &st::windowSubTextFg),
+			.premiumFg = (context.active
+				? &st::dialogsVerifiedIconBgActive
+				: context.selected
+				? &st::dialogsVerifiedIconBgOver
+				: &st::dialogsVerifiedIconBg),
+			.customEmojiRepaint = customEmojiRepaint,
+			.now = context.now,
+			.paused = context.paused,
+		});
+		rectForName.setWidth(rectForName.width() - badgeWidth);
+	};
 	if (flags
 		& (Flag::SavedMessages
 			| Flag::RepliesMessages
@@ -632,6 +848,9 @@ void PaintRow(
 			? tr::lng_my_notes(tr::now)
 			: tr::lng_hidden_author_messages(tr::now);
 		const auto textWidth = st::semiboldFont->width(text);
+		if (!context.search && (flags & Flag::VerifyCodes)) {
+			paintPeerBadge(textWidth);
+		}
 		if (textWidth > rectForName.width()) {
 			text = st::semiboldFont->elided(text, rectForName.width());
 		}
@@ -640,40 +859,30 @@ void PaintRow(
 			: context.selected
 			? st::dialogsNameFgOver
 			: st::dialogsNameFg);
-		p.drawTextLeft(rectForName.left(), rectForName.top(), context.width, text);
+		p.drawTextLeft(
+			rectForName.left(),
+			rectForName.top(),
+			context.width,
+			text);
 	} else if (from) {
+		auto badgeWidth = 0;
 		if ((history || sublist) && !context.search) {
-			const auto badgeWidth = rowBadge.drawGetWidth(
-				p,
-				rectForName,
-				rowName.maxWidth(),
-				context.width,
-				{
-					.peer = from,
-					.verified = (context.active
-						? &st::dialogsVerifiedIconActive
-						: context.selected
-						? &st::dialogsVerifiedIconOver
-						: &st::dialogsVerifiedIcon),
-					.premium = &ThreeStateIcon(
-						st::dialogsPremiumIcon,
-						context.active,
-						context.selected),
-					.scam = (context.active
-						? &st::dialogsScamFgActive
-						: context.selected
-						? &st::dialogsScamFgOver
-						: &st::dialogsScamFg),
-					.premiumFg = (context.active
-						? &st::dialogsVerifiedIconBgActive
-						: context.selected
-						? &st::dialogsVerifiedIconBgOver
-						: &st::dialogsVerifiedIconBg),
-					.customEmojiRepaint = customEmojiRepaint,
-					.now = context.now,
-					.paused = context.paused,
-				});
-			rectForName.setWidth(rectForName.width() - badgeWidth);
+			const auto widthBefore = rectForName.width();
+			paintPeerBadge(rowName.maxWidth());
+			badgeWidth = widthBefore - rectForName.width();
+		}
+		const auto drawMuteIcon = DialogsMuteIcon.value()
+			&& thread
+			&& thread->muted();
+		if (drawMuteIcon) {
+			const auto &muteIcon = ThreeStateIcon(
+				st::dialogsMuteIcon,
+				context.active,
+				context.selected);
+			rectForName.setWidth(
+				rectForName.width()
+					- muteIcon.width()
+					- st::dialogsMuteIconSkip);
 		}
 		p.setPen(context.active
 			? st::dialogsNameFgActive
@@ -685,6 +894,22 @@ void PaintRow(
 			.availableWidth = rectForName.width(),
 			.elisionLines = 1,
 		});
+		if (drawMuteIcon) {
+			const auto &muteIcon = ThreeStateIcon(
+				st::dialogsMuteIcon,
+				context.active,
+				context.selected);
+			const auto nameW = std::min(
+				rowName.maxWidth(),
+				rectForName.width());
+			const auto muteLeft = rectForName.left()
+				+ nameW
+				+ badgeWidth
+				+ st::dialogsMuteIconSkip;
+			const auto muteTop = rectForName.top()
+				+ (st::semiboldFont->height - muteIcon.height()) / 2;
+			muteIcon.paint(p, muteLeft, muteTop, context.width);
+		}
 	} else if (hiddenSenderInfo) {
 		p.setPen(context.active
 			? st::dialogsNameFgActive
@@ -712,6 +937,69 @@ void PaintRow(
 			.elisionLines = 1,
 		});
 	}
+
+	if (const auto tags = context.chatsFilterTags) {
+		auto left = nameleft;
+		for (const auto &tag : *tags) {
+			p.drawImage(left, context.st->tagTop, *tag);
+			left += st::dialogRowFilterTagSkip
+				+ (tag->width() / style::DevicePixelRatio());
+		}
+	}
+	if (swipeTranslation) {
+		p.translate(swipeTranslation, 0);
+		const auto swipeActionRect = QRect(
+			rect::right(geometry) - swipeTranslation,
+			geometry.y(),
+			swipeTranslation,
+			geometry.height());
+		p.setClipRegion(swipeActionRect);
+		const auto labelType = ResolveQuickDialogLabel(
+			history,
+			context.quickActionContext->action,
+			context.filter);
+		p.fillRect(swipeActionRect, ResolveQuickActionBg(labelType));
+		if (context.quickActionContext->data.reachRatio) {
+			p.setPen(Qt::NoPen);
+			p.setBrush(ResolveQuickActionBgActive(labelType));
+			const auto r = swipeTranslation
+				* context.quickActionContext->data.reachRatio;
+			const auto offset = st::dialogsQuickActionSize
+				+ st::dialogsQuickActionSize / 2.;
+			p.drawEllipse(QPointF(geometry.width() - offset, offset), r, r);
+		}
+		const auto quickWidth = st::dialogsQuickActionSize * 3;
+		if (context.quickActionContext->icon) {
+			DrawQuickAction(
+				p,
+				QRect(
+					rect::right(geometry) - quickWidth,
+					geometry.y(),
+					quickWidth,
+					geometry.height()),
+				context.quickActionContext->icon.get(),
+				labelType);
+		}
+		p.setClipping(false);
+	}
+	if (const auto quick = context.quickActionContext;
+			quick && quick->ripple && quick->rippleFg) {
+		const auto labelType = ResolveQuickDialogLabel(
+			history,
+			context.quickActionContext->action,
+			context.filter);
+		const auto ripple = ResolveQuickActionBg(labelType);
+		const auto size = st::dialogsQuickActionRippleSize;
+		const auto x = geometry.width() - size;
+		quick->ripple->paint(p, x, 0, size, &ripple->c);
+		quick->rippleFg->paint(p, x, 0, size, &st::premiumButtonFg->c);
+		if (quick->ripple->empty()) {
+			quick->ripple.reset();
+		}
+		if (quick->rippleFg->empty()) {
+			quick->rippleFg.reset();
+		}
+	}
 }
 
 } // namespace
@@ -738,12 +1026,12 @@ const style::icon *ChatTypeIcon(
 			st::dialogsChannelIcon,
 			context.active,
 			context.selected);
-	} else if (peer->isForum()) {
+	} else if (peer->displayAsForum()) {
 		return &ThreeStateIcon(
 			st::dialogsForumIcon,
 			context.active,
 			context.selected);
-	} else {
+	} else if (!peer->isMonoforum()) {
 		return &ThreeStateIcon(
 			st::dialogsChatIcon,
 			context.active,
@@ -752,6 +1040,14 @@ const style::icon *ChatTypeIcon(
 	return nullptr;
 }
 
+const style::VerifiedBadge &VerifiedStyle(const PaintContext &context) {
+	return context.active
+		? st::dialogsVerifiedColorsActive
+		: context.selected
+		? st::dialogsVerifiedColorsOver
+		: st::dialogsVerifiedColors;
+}
+
 void RowPainter::Paint(
 		Painter &p,
 		not_null<const Row*> row,
@@ -769,28 +1065,23 @@ void RowPainter::Paint(
 		if (!thread) {
 			return nullptr;
 		}
-		if ((!peer || !peer->isForum()) && (!item || !badgesState.unread)) {
+		if ((!peer
+				|| (!peer->displayAsForum() && !peer->amMonoforumAdmin()))
+			&& (!item || !badgesState.unread)) {
 			// Draw item, if there are unread messages.
 			const auto draft = thread->owningHistory()->cloudDraft(
-				thread->topicRootId());
+				thread->topicRootId(),
+				thread->monoforumPeerId());
 			if (!Data::DraftIsNull(draft)) {
 				return draft;
 			}
 		}
 		return nullptr;
 	}();
-	const auto displayDate = [&] {
-		if (item) {
-			if (cloudDraft) {
-				return (item->date() > cloudDraft->date)
-					? ItemDateTime(item)
-					: base::unixtime::parse(cloudDraft->date);
-			}
-			return ItemDateTime(item);
-		}
-		return cloudDraft
-			? base::unixtime::parse(cloudDraft->date)
-			: QDateTime();
+	const auto displayDate = [&]() -> TimeId {
+		const auto itemDate = item ? item->date() : TimeId(0);
+		const auto draftDate = cloudDraft ? cloudDraft->date : TimeId(0);
+		return std::max(itemDate, draftDate);
 	}();
 	const auto displayPinnedIcon = badgesState.empty()
 		&& entry->isPinnedDialog(context.filter)
@@ -801,11 +1092,11 @@ void RowPainter::Paint(
 			? history->peer->migrateTo()
 			: history->peer.get())
 		: sublist
-		? sublist->peer().get()
+		? sublist->sublistPeer().get()
 		: nullptr;
 	const auto allowUserOnline = true;// !context.narrow || badgesState.empty();
 	const auto flags = (allowUserOnline ? Flag::AllowUserOnline : Flag(0))
-		| ((sublist && from->isSelf())
+		| ((sublist && !sublist->parentChat() && from->isSelf())
 			? Flag::MyNotes
 			: (peer && peer->isSelf())
 			? Flag::SavedMessages
@@ -853,21 +1144,23 @@ void RowPainter::Paint(
 			? nullptr
 			: thread
 			? &thread->lastItemDialogsView()
-			: sublist
-			? &sublist->lastItemDialogsView()
 			: nullptr;
 		if (view) {
-			const auto forum = context.st->topicsHeight
-				? row->history()->peer->forum()
+			const auto forum = (peer && context.st->topicsHeight)
+				? peer->forum()
 				: nullptr;
-			if (!view->prepared(item, forum)) {
+			const auto monoforum = (peer && context.st->topicsHeight)
+				? peer->monoforum()
+				: nullptr;
+			if (!view->prepared(item, forum, monoforum)) {
 				view->prepare(
 					item,
 					forum,
+					monoforum,
 					[=] { entry->updateChatListEntry(); },
 					{});
 			}
-			if (forum) {
+			if (forum || monoforum) {
 				rect.setHeight(context.st->topicsHeight + rect.height());
 			}
 			view->paint(p, rect, context);
@@ -888,6 +1181,7 @@ void RowPainter::Paint(
 		cloudDraft,
 		displayDate,
 		context,
+		nullptr,
 		badgesState,
 		flags,
 		paintItemCallback);
@@ -939,6 +1233,7 @@ void RowPainter::Paint(
 		return {};
 	}();
 	previewOptions.ignoreGroup = true;
+	previewOptions.searchLowerText = context.searchLowerText;
 
 	const auto badgesState = context.displayUnreadInfo
 		? entry->chatListBadgesState()
@@ -961,8 +1256,13 @@ void RowPainter::Paint(
 			availableWidth,
 			st::dialogsTextFont->height);
 		auto &view = row->itemView();
-		if (!view.prepared(item, nullptr)) {
-			view.prepare(item, nullptr, row->repaint(), previewOptions);
+		if (!view.prepared(item, nullptr, nullptr)) {
+			view.prepare(
+				item,
+				nullptr,
+				nullptr,
+				row->repaint(),
+				previewOptions);
 		}
 		view.paint(p, itemRect, context);
 	};
@@ -991,28 +1291,38 @@ void RowPainter::Paint(
 		hiddenSenderInfo,
 		item,
 		cloudDraft,
-		ItemDateTime(item),
+		item->date(),
 		context,
+		row,
 		badgesState,
 		flags,
 		paintItemCallback);
 }
 
 QRect RowPainter::SendActionAnimationRect(
-		not_null<const style::DialogRow*> st,
-		int animationLeft,
-		int animationWidth,
-		int animationHeight,
+		not_null<const Data::Thread*> thread,
+		FilterId filterId,
+		QRect rect,
 		int fullWidth,
 		bool textUpdated) {
-	const auto nameleft = st->nameLeft;
-	const auto namewidth = fullWidth - nameleft - st->padding.right();
-	const auto texttop = st->textTop;
+	const auto &st = Row::ComputeSt(thread, filterId);
+	const auto nameleft = st.nameLeft;
+	const auto namewidth = fullWidth - nameleft - st.padding.right();
+	const auto texttop = st.textTop;
+
+	const auto add = st::lineWidth - Ui::Emoji::GetCustomSkipNormal();
+	const auto height = std::max({
+		add + rect.height() + add,
+		add + st::normalFont->height + add,
+		add + st::dialogsMiniPreviewTop + st::dialogsMiniPreview + add,
+		st::lineWidth + Ui::Emoji::GetCustomSizeNormal() + st::lineWidth,
+	});
+
 	return QRect(
-		nameleft + (textUpdated ? 0 : animationLeft),
-		texttop,
-		textUpdated ? namewidth : animationWidth,
-		animationHeight);
+		nameleft + (textUpdated ? (-add) : rect.x()),
+		texttop + rect.y() - add,
+		textUpdated ? (add + namewidth + add) : rect.width(),
+		height);
 }
 
 void PaintCollapsedRow(
@@ -1038,7 +1348,8 @@ void PaintCollapsedRow(
 			+ st::dialogsUnreadFont->ascent;
 		const auto left = context.narrow
 			? ((context.width - st::semiboldFont->width(text)) / 2)
-			: context.st->padding.left();
+			: st::dialogsTopBarLeftPadding;
+			// : context.st->padding.left();
 		p.drawText(left, textBaseline, text);
 	} else {
 		folder->paintUserpic(
@@ -1060,4 +1371,8 @@ void PaintCollapsedRow(
 	}
 }
 
+int PaintRightButton(QPainter &p, const PaintContext &context) {
+	return PaintRightButtonImpl(p, context);
+}
+
 } // namespace Dialogs::Ui
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.h b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.h
index cc67307d5a2ad2..d5a36aeae7c443 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.h
@@ -7,28 +7,29 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "dialogs/ui/dialogs_quick_action_context.h"
 #include "ui/cached_round_corners.h"
 
 namespace style {
 struct DialogRow;
+struct VerifiedBadge;
 } // namespace style
 
 namespace st {
 extern const style::DialogRow &defaultDialogRow;
 } // namespace st
 
-namespace Ui {
-} // namespace Ui
-
 namespace Data {
 class Forum;
 class Folder;
+class Thread;
 } // namespace Data
 
 namespace Dialogs {
 class Row;
 class FakeRow;
 class BasicRow;
+struct RightButton;
 } // namespace Dialogs
 
 namespace Dialogs::Ui {
@@ -53,6 +54,9 @@ struct TopicJumpCache {
 };
 
 struct PaintContext {
+	RightButton *rightButton = nullptr;
+	std::vector<QImage*> *chatsFilterTags = nullptr;
+	QuickActionContext *quickActionContext = nullptr;
 	not_null<const style::DialogRow*> st;
 	TopicJumpCache *topicJumpCache = nullptr;
 	Data::Folder *folder = nullptr;
@@ -61,6 +65,7 @@ struct PaintContext {
 	FilterId filter = 0;
 	float64 topicsExpanded = 0.;
 	crl::time now = 0;
+	QStringView searchLowerText;
 	int width = 0;
 	bool active = false;
 	bool selected = false;
@@ -71,11 +76,16 @@ struct PaintContext {
 	bool displayUnreadInfo = false;
 };
 
+extern const char kOptionDialogsMuteIcon[];
+
 [[nodiscard]] const style::icon *ChatTypeIcon(
 	not_null<PeerData*> peer,
 	const PaintContext &context);
 [[nodiscard]] const style::icon *ChatTypeIcon(not_null<PeerData*> peer);
 
+[[nodiscard]] const style::VerifiedBadge &VerifiedStyle(
+	const PaintContext &context);
+
 class RowPainter {
 public:
 	static void Paint(
@@ -88,10 +98,9 @@ class RowPainter {
 		not_null<const FakeRow*> row,
 		const PaintContext &context);
 	static QRect SendActionAnimationRect(
-		not_null<const style::DialogRow*> st,
-		int animationLeft,
-		int animationWidth,
-		int animationHeight,
+		not_null<const Data::Thread*> thread,
+		FilterId filterId,
+		QRect rect,
 		int fullWidth,
 		bool textUpdated);
 };
@@ -104,4 +113,6 @@ void PaintCollapsedRow(
 	int unread,
 	const PaintContext &context);
 
+int PaintRightButton(QPainter &p, const PaintContext &context);
+
 } // namespace Dialogs::Ui
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
index 0060eae45857b1..f9cb36f37751e8 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
@@ -9,15 +9,18 @@ For license and copyright information please follow this link:
 
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/view/history_view_element.h"
 #include "history/view/history_view_item_preview.h"
 #include "main/main_session.h"
 #include "dialogs/dialogs_three_state_icon.h"
 #include "dialogs/ui/dialogs_layout.h"
 #include "dialogs/ui/dialogs_topics_view.h"
 #include "ui/effects/spoiler_mess.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/power_saving.h"
 #include "core/ui_integration.h"
 #include "lang/lang_keys.h"
@@ -138,28 +141,43 @@ bool MessageView::dependsOn(not_null<const HistoryItem*> item) const {
 
 bool MessageView::prepared(
 		not_null<const HistoryItem*> item,
-		Data::Forum *forum) const {
+		Data::Forum *forum,
+		Data::SavedMessages *monoforum) const {
 	return (_textCachedFor == item.get())
-		&& (!forum
+		&& (_unreadMedia == item->isUnreadMedia())
+		&& ((!forum && !monoforum)
 			|| (_topics
 				&& _topics->forum() == forum
+				&& _topics->monoforum() == monoforum
 				&& _topics->prepared()));
 }
 
 void MessageView::prepare(
 		not_null<const HistoryItem*> item,
 		Data::Forum *forum,
+		Data::SavedMessages *monoforum,
 		Fn<void()> customEmojiRepaint,
 		ToPreviewOptions options) {
-	if (!forum) {
+	if (!forum && !monoforum) {
 		_topics = nullptr;
-	} else if (!_topics || _topics->forum() != forum) {
-		_topics = std::make_unique<TopicsView>(forum);
-		_topics->prepare(item->topicRootId(), customEmojiRepaint);
+	} else if (!_topics
+		|| _topics->forum() != forum
+		|| _topics->monoforum() != monoforum) {
+		_topics = std::make_unique<TopicsView>(forum, monoforum);
+		if (forum) {
+			_topics->prepare(item->topicRootId(), customEmojiRepaint);
+		} else {
+			_topics->prepare(item->sublistPeerId(), customEmojiRepaint);
+		}
 	} else if (!_topics->prepared()) {
-		_topics->prepare(item->topicRootId(), customEmojiRepaint);
+		if (forum) {
+			_topics->prepare(item->topicRootId(), customEmojiRepaint);
+		} else {
+			_topics->prepare(item->sublistPeerId(), customEmojiRepaint);
+		}
 	}
 	if (_textCachedFor == item.get()) {
+		_unreadMedia = item->isUnreadMedia();
 		return;
 	}
 	options.existing = &_imagesCache;
@@ -173,11 +191,11 @@ void MessageView::prepare(
 		: nullptr;
 	const auto hasImages = !preview.images.empty();
 	const auto history = item->history();
-	const auto context = Core::MarkedTextContext{
+	auto context = Core::TextContext({
 		.session = &history->session(),
-		.customEmojiRepaint = customEmojiRepaint,
+		.repaint = customEmojiRepaint,
 		.customEmojiLoopLimit = kEmojiLoopCount,
-	};
+	});
 	const auto senderTill = (preview.arrowInTextPosition > 0)
 		? preview.arrowInTextPosition
 		: preview.imagesInTextPosition;
@@ -194,14 +212,107 @@ void MessageView::prepare(
 	}
 	TextUtilities::Trim(preview.text);
 	auto textToCache = DialogsPreviewText(std::move(preview.text));
+
+	if (!options.searchLowerText.isEmpty()) {
+		static constexpr auto kLeftShift = 15;
+		auto minFrom = std::numeric_limits<uint16>::max();
+
+		const auto words = Ui::Text::Words(options.searchLowerText);
+		textToCache.entities.reserve(textToCache.entities.size()
+			+ words.size());
+
+		for (const auto &word : words) {
+			const auto selection = HistoryView::FindSearchQueryHighlight(
+				textToCache.text,
+				word);
+			if (!selection.empty()) {
+				minFrom = std::min(minFrom, selection.from);
+				textToCache.entities.push_back(EntityInText{
+					EntityType::Colorized,
+					selection.from,
+					selection.to - selection.from
+				});
+			}
+		}
+
+		if (minFrom == std::numeric_limits<uint16>::max()
+			&& !item->replyTo().quote.empty()) {
+			auto textQuote = TextWithEntities();
+			for (const auto &word : words) {
+				const auto selection = HistoryView::FindSearchQueryHighlight(
+					item->replyTo().quote.text,
+					word);
+				if (!selection.empty()) {
+					minFrom = 0;
+					if (textQuote.empty()) {
+						textQuote = item->replyTo().quote;
+					}
+					textQuote.entities.push_back(EntityInText{
+						EntityType::Colorized,
+						selection.from,
+						selection.to - selection.from
+					});
+				}
+			}
+			if (!textQuote.empty()) {
+				auto helper = Ui::Text::CustomEmojiHelper(context);
+				const auto factory = Ui::Text::PaletteDependentEmoji{
+					.factory = [=] {
+						const auto &icon = st::dialogsMiniQuoteIcon;
+						auto image = QImage(
+							icon.size() * style::DevicePixelRatio(),
+							QImage::Format_ARGB32_Premultiplied);
+						image.setDevicePixelRatio(style::DevicePixelRatio());
+						image.fill(Qt::transparent);
+						{
+							auto p = Painter(&image);
+							icon.paintInCenter(
+								p,
+								Rect(icon.size()),
+								st::dialogsTextFg->c);
+						}
+						return image;
+					},
+					.margin = QMargins(
+						st::lineWidth * 2,
+						0,
+						st::lineWidth * 2,
+						0),
+				};
+				textToCache = textQuote
+					.append(helper.paletteDependent(factory))
+					.append(std::move(textToCache));
+				context = helper.context(customEmojiRepaint);
+			}
+		}
+
+		if (!words.empty() && minFrom != std::numeric_limits<uint16>::max()) {
+			std::sort(
+				textToCache.entities.begin(),
+				textToCache.entities.end(),
+				[](const auto &a, const auto &b) {
+					return a.offset() < b.offset();
+				});
+
+			const auto textSize = textToCache.text.size();
+			minFrom = (minFrom > textSize || minFrom < kLeftShift)
+				? 0
+				: minFrom - kLeftShift;
+
+			textToCache = (TextWithEntities{
+				minFrom > 0 ? kQEllipsis : QString()
+			}).append(Text::Mid(std::move(textToCache), minFrom));
+		}
+	}
 	_hasPlainLinkAtBegin = !textToCache.entities.empty()
 		&& (textToCache.entities.front().type() == EntityType::Colorized);
 	_textCache.setMarkedText(
 		st::dialogsTextStyle,
 		std::move(textToCache),
 		DialogTextOptions(),
-		context);
+		std::move(context));
 	_textCachedFor = item;
+	_unreadMedia = item->isUnreadMedia();
 	_imagesCache = std::move(preview.images);
 	if (!ranges::any_of(_imagesCache, &ItemPreviewImage::hasSpoiler)) {
 		_spoiler = nullptr;
@@ -212,7 +323,7 @@ void MessageView::prepare(
 		if (!_loadingContext) {
 			_loadingContext = std::make_unique<LoadingContext>();
 			item->history()->session().downloaderTaskFinished(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_textCachedFor = nullptr;
 			}, _loadingContext->lifetime);
 		}
@@ -254,11 +365,18 @@ int MessageView::countWidth() const {
 	auto result = 0;
 	if (!_senderCache.isEmpty()) {
 		result += _senderCache.maxWidth();
-		if (!_imagesCache.empty()) {
+		if (!_imagesCache.empty() && !_leftIcon) {
 			result += st::dialogsMiniPreviewSkip
 				+ st::dialogsMiniPreviewRight;
 		}
 	}
+	if (_leftIcon) {
+		const auto w = _leftIcon->icon.icon.width();
+		result += w
+			+ (_imagesCache.empty()
+				? _leftIcon->skipText
+				: _leftIcon->skipMedia);
+	}
 	if (!_imagesCache.empty()) {
 		result += (_imagesCache.size()
 			* (st::dialogsMiniPreview + st::dialogsMiniPreviewSkip))
@@ -367,7 +485,18 @@ void MessageView::paint(
 			if (image.hasSpoiler()) {
 				const auto frame = DefaultImageSpoiler().frame(
 					_spoiler->index(context.now, pausedSpoiler));
-				FillSpoilerRect(p, mini, frame);
+				if (image.isEllipse()) {
+					const auto radius = st::dialogsMiniPreview / 2;
+					static auto mask = Images::CornersMask(radius);
+					FillSpoilerRect(
+						p,
+						mini,
+						Images::CornersMaskRef(mask),
+						frame,
+						_cornersCache);
+				} else {
+					FillSpoilerRect(p, mini, frame);
+				}
 			}
 		}
 		rect.setLeft(rect.x() + w);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.h b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.h
index 58c1966a8c3b2f..d2f8bbc96021e7 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.h
@@ -24,6 +24,7 @@ class SpoilerAnimation;
 
 namespace Data {
 class Forum;
+class SavedMessages;
 } // namespace Data
 
 namespace HistoryView {
@@ -56,10 +57,12 @@ class MessageView final {
 
 	[[nodiscard]] bool prepared(
 		not_null<const HistoryItem*> item,
-		Data::Forum *forum) const;
+		Data::Forum *forum,
+		Data::SavedMessages *monoforum) const;
 	void prepare(
 		not_null<const HistoryItem*> item,
 		Data::Forum *forum,
+		Data::SavedMessages *monoforum,
 		Fn<void()> customEmojiRepaint,
 		ToPreviewOptions options);
 
@@ -94,7 +97,9 @@ class MessageView final {
 	mutable std::unique_ptr<SpoilerAnimation> _spoiler;
 	mutable std::unique_ptr<LoadingContext> _loadingContext;
 	mutable const style::DialogsMiniIcon *_leftIcon = nullptr;
+	mutable QImage _cornersCache;
 	mutable bool _hasPlainLinkAtBegin = false;
+	mutable bool _unreadMedia = false;
 
 };
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_quick_action.h b/Telegram/SourceFiles/dialogs/ui/dialogs_quick_action.h
new file mode 100644
index 00000000000000..7c924c06ee0006
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_quick_action.h
@@ -0,0 +1,23 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Dialogs::Ui {
+
+using namespace ::Ui;
+
+enum class QuickDialogAction {
+	Mute,
+	Pin,
+	Read,
+	Archive,
+	Delete,
+	Disabled,
+};
+
+} // namespace Dialogs::Ui
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_quick_action_context.h b/Telegram/SourceFiles/dialogs/ui/dialogs_quick_action_context.h
new file mode 100644
index 00000000000000..a1baa2873003f4
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_quick_action_context.h
@@ -0,0 +1,47 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "dialogs/ui/dialogs_quick_action.h"
+#include "ui/controls/swipe_handler_data.h"
+
+namespace Lottie {
+class Icon;
+} // namespace Lottie
+
+namespace Ui {
+class RippleAnimation;
+} // namespace Ui
+
+namespace Dialogs::Ui {
+
+using namespace ::Ui;
+
+enum class QuickDialogActionLabel {
+	Mute,
+	Unmute,
+	Pin,
+	Unpin,
+	Read,
+	Unread,
+	Archive,
+	Unarchive,
+	Delete,
+	Disabled,
+};
+
+struct QuickActionContext {
+	::Ui::Controls::SwipeContextData data;
+	std::unique_ptr<Lottie::Icon> icon;
+	std::unique_ptr<Ui::RippleAnimation> ripple;
+	std::unique_ptr<Ui::RippleAnimation> rippleFg;
+	QuickDialogAction action;
+	crl::time finishedAt = 0;
+};
+
+} // namespace Dialogs::Ui
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index bea4a1b291262f..2f3e06c4ed067c 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "dialogs/ui/dialogs_stories_content.h"
 
+#include "base/unixtime.h"
 #include "data/data_changes.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
@@ -21,12 +22,15 @@ For license and copyright information please follow this link:
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "main/main_session.h"
+#include "media/stories/media_stories_stealth.h"
 #include "lang/lang_keys.h"
 #include "ui/dynamic_image.h"
 #include "ui/dynamic_thumbnails.h"
 #include "ui/painter.h"
 #include "window/window_session_controller.h"
+#include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_media_stories.h"
 
 namespace Dialogs::Stories {
 namespace {
@@ -75,6 +79,7 @@ Content State::next() {
 			.thumbnail = std::move(userpic),
 			.count = info.count,
 			.unreadCount = info.unreadCount,
+			.hasVideoStream = info.hasVideoStream ? 1U : 0U,
 			.skipSmall = peer->isSelf() ? 1U : 0U,
 		});
 	}
@@ -94,7 +99,7 @@ rpl::producer<Content> ContentForSession(
 			rpl::empty
 		) | rpl::then(
 			stories->sourcesChanged(list)
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			consumer.put_next(state->next());
 		}, result);
 		return result;
@@ -152,13 +157,16 @@ rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
 					const auto maybe = stories->lookup(storyId);
 					if (maybe) {
 						if (!resolving) {
-							const auto unread = (id > state->readTill);
+							const auto stream = (*maybe)->call();
+							const auto unread = stream
+								|| (id > state->readTill);
 							result.elements.reserve(ids.size());
 							result.elements.push_back({
 								.id = uint64(id),
 								.thumbnail = Ui::MakeStoryThumbnail(*maybe),
 								.count = 1U,
 								.unreadCount = unread ? 1U : 0U,
+								.hasVideoStream = stream ? 1U : 0U,
 							});
 							if (unread) {
 								done = false;
@@ -183,11 +191,11 @@ rpl::producer<Content> LastForPeer(not_null<PeerData*> peer) {
 
 			rpl::single(peerId) | rpl::then(
 				stories->itemsChanged() | rpl::filter(_1 == peerId)
-			) | rpl::start_with_next(state->check, lifetime);
+			) | rpl::on_next(state->check, lifetime);
 
 			stories->session().changes().storyUpdates(
 				Data::StoryUpdate::Flag::MarkRead
-			) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
+			) | rpl::on_next([=](const Data::StoryUpdate &update) {
 				if (update.story->peer()->id == peerId) {
 					if (update.story->id() > state->readTill) {
 						state->readTill = update.story->id();
@@ -215,7 +223,7 @@ void FillSourceMenu(
 		add(tr::lng_stories_archive_button(tr::now), [=] {
 			controller->showSection(Info::Stories::Make(
 				peer,
-				Info::Stories::Tab::Archive));
+				Info::Stories::ArchiveId()));
 		}, &st::menuIconStoriesArchiveSection);
 		add(tr::lng_stories_my_title(tr::now), [=] {
 			controller->showSection(Info::Stories::Make(peer));
@@ -239,6 +247,9 @@ void FillSourceMenu(
 		add(viewProfileText, [=] {
 			controller->showPeerInfo(peer);
 		}, channel ? &st::menuIconInfo : &st::menuIconProfile);
+		if (!peer->hasActiveVideoStream() && peer->hasUnreadStories()) {
+			Media::Stories::AddStealthModeMenu(add, peer, controller);
+		}
 		const auto in = [&](Data::StorySourcesList list) {
 			return ranges::contains(
 				owner->stories().sources(list),
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
index bfe63258925158..10a4674319d547 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "base/event_filter.h"
 #include "base/qt_signal_producer.h"
 #include "lang/lang_keys.h"
+#include "ui/effects/round_checkbox.h"
 #include "ui/effects/outline_segments.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
@@ -20,6 +21,7 @@ For license and copyright information please follow this link:
 #include "ui/dynamic_image.h"
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_dialogs.h"
 
 #include <QtWidgets/QApplication>
@@ -46,33 +48,6 @@ constexpr auto kMaxTooltipNames = 3;
 	return full.photoLeft * 2 + full.photo - 2 * skip;
 }
 
-[[nodiscard]] object_ptr<Ui::RpWidget> MakeTooltipContent(
-		not_null<QWidget*> parent,
-		rpl::producer<TextWithEntities> text,
-		Fn<void()> hide) {
-	const auto size = st::dialogsStoriesTooltipHide.width;
-	const auto skip = st::defaultImportantTooltip.padding.right();
-	auto result = object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
-		parent,
-		Ui::MakeNiceTooltipLabel(
-			parent,
-			std::move(text),
-			st::dialogsStoriesTooltipMaxWidth,
-			st::dialogsStoriesTooltipLabel),
-		(st::defaultImportantTooltip.padding
-			+ QMargins(0, 0, skip + size, 0)));
-	const auto button = Ui::CreateChild<Ui::IconButton>(
-		result.data(),
-		st::dialogsStoriesTooltipHide);
-	result->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
-		button->resize(button->width(), size.height());
-		button->moveToRight(0, 0, size.width());
-	}, button->lifetime());
-	button->setClickedCallback(std::move(hide));
-	return result;
-}
-
 } // namespace
 
 struct List::Layout {
@@ -105,7 +80,7 @@ List::List(
 , _st(st) {
 	setCursor(style::cur_default);
 
-	std::move(content) | rpl::start_with_next([=](Content &&content) {
+	std::move(content) | rpl::on_next([=](Content &&content) {
 		showContent(std::move(content));
 	}, lifetime());
 
@@ -146,6 +121,7 @@ void List::showContent(Content &&content) {
 			}
 			item.element.count = element.count;
 			item.element.unreadCount = element.unreadCount;
+			item.element.hasVideoStream = element.hasVideoStream;
 		} else {
 			_data.items.emplace_back(Item{ .element = element });
 		}
@@ -197,6 +173,38 @@ rpl::producer<not_null<QWheelEvent*>> List::verticalScrollEvents() const {
 	return _verticalScrollEvents.events();
 }
 
+bool List::toggledHidden() const {
+	return _hiddenInstant || _hiddenAnimated;
+}
+
+void List::setToggledHidden(bool hiddenInstant, bool hiddenAnimated) {
+	const auto hidden = (hiddenInstant || hiddenAnimated);
+	const auto hiddenChanged = (hidden != toggledHidden());
+	const auto hiddenInstantChanged = (_hiddenInstant != hiddenInstant);
+	const auto hiddenAnimatedChanged = (_hiddenAnimated != hiddenAnimated);
+	_hiddenInstant = hiddenInstant;
+	_hiddenAnimated = hiddenAnimated;
+	if (hiddenChanged) {
+		if (_hiddenInstant || !hiddenAnimatedChanged) {
+			_hiddenAnimation.stop();
+			setVisible(!toggledHidden());
+		} else {
+			const auto from = hidden ? 0. : 1.;
+			const auto till = hidden ? 1. : 0.;
+			_hiddenAnimation.start([=] {
+				if (!_hiddenAnimation.animating()) {
+					setVisible(!toggledHidden());
+				}
+				update();
+			}, from, till, st::fadeWrapDuration, anim::linear);
+			show();
+		}
+	} else if (hiddenInstantChanged && _hiddenInstant) {
+		_hiddenAnimation.stop();
+		setVisible(!toggledHidden());
+	}
+}
+
 void List::requestExpanded(bool expanded) {
 	if (_expanded != expanded) {
 		_expanded = expanded;
@@ -339,6 +347,10 @@ List::Layout List::computeLayout(float64 expanded) const {
 }
 
 void List::paintEvent(QPaintEvent *e) {
+	const auto hidden = _hiddenAnimation.value(toggledHidden() ? 1. : 0.);
+	if (hidden >= 1.) {
+		return;
+	}
 	const auto &st = _st.small;
 	const auto &full = _st.full;
 	const auto layout = computeLayout();
@@ -352,13 +364,18 @@ void List::paintEvent(QPaintEvent *e) {
 	};
 	const auto line = elerp(st.lineTwice, full.lineTwice) / 2.;
 	const auto photo = lerp(st.photo, full.photo);
-	const auto layered = layout.single < (photo + 4 * line);
+	const auto layered = (layout.single < (photo + 4 * line))
+		|| (hidden > 0.);
 	auto p = QPainter(this);
 	if (layered) {
 		ensureLayer();
 		auto q = QPainter(&_layer);
 		paint(q, layout, photo, line, true);
 		q.end();
+
+		if (hidden > 0.) {
+			p.setOpacity(1. - hidden);
+		}
 		p.drawImage(0, 0, _layer);
 	} else {
 		paint(p, layout, photo, line, false);
@@ -443,8 +460,15 @@ void List::paint(
 		return Single{ x, indexSmall, small, indexFull, full, y };
 	};
 	const auto hasUnread = [&](const Single &single) {
-		return (single.itemSmall && single.itemSmall->element.unreadCount)
-			|| (single.itemFull && single.itemFull->element.unreadCount);
+		const auto itemSmall = single.itemSmall;
+		const auto itemFull = single.itemFull;
+		return false
+			||(itemSmall
+				&& (itemSmall->element.unreadCount
+					|| itemSmall->element.hasVideoStream))
+			|| (itemFull
+				&& (itemFull->element.unreadCount
+					|| itemFull->element.hasVideoStream));
 	};
 	const auto enumerate = [&](auto &&paintGradient, auto &&paintOther) {
 		auto nextGradientPainted = false;
@@ -508,8 +532,15 @@ void List::paint(
 			photo);
 		const auto small = single.itemSmall;
 		const auto itemFull = single.itemFull;
-		const auto smallUnread = (small && small->element.unreadCount);
-		const auto fullUnreadCount = itemFull
+		const auto smallHasVideoStream = small
+			&& small->element.hasVideoStream;
+		const auto smallUnread = smallHasVideoStream
+			|| (small && small->element.unreadCount);
+		const auto fullHasVideoStream = itemFull
+			&& itemFull->element.hasVideoStream;
+		const auto fullUnreadCount = fullHasVideoStream
+			? 1
+			: itemFull
 			? itemFull->element.unreadCount
 			: 0;
 		const auto unreadOpacity = (smallUnread && fullUnreadCount)
@@ -527,7 +558,11 @@ void List::paint(
 			gradient.setStart(userpic.topRight());
 			gradient.setFinalStop(userpic.bottomLeft());
 			if (!fullUnreadCount) {
-				p.setPen(QPen(gradient, line));
+				if (smallHasVideoStream) {
+					p.setPen(QPen(st::attentionButtonFg->c, line));
+				} else {
+					p.setPen(QPen(gradient, line));
+				}
 				p.setBrush(Qt::NoBrush);
 				p.drawEllipse(outer);
 			} else {
@@ -551,10 +586,14 @@ void List::paint(
 			photo);
 		const auto small = single.itemSmall;
 		const auto itemFull = single.itemFull;
-		const auto smallUnread = small && small->element.unreadCount;
-		const auto fullUnreadCount = itemFull
-			? itemFull->element.unreadCount
-			: 0;
+		const auto smallUnread = small
+			&& (small->element.unreadCount
+				|| small->element.hasVideoStream);
+		const auto fullUnreadCount = !itemFull
+			? 0
+			: itemFull->element.hasVideoStream
+			? 1
+			: itemFull->element.unreadCount;
 		const auto fullCount = itemFull ? itemFull->element.count : 0;
 
 		// White circle with possible read gray line.
@@ -574,7 +613,9 @@ void List::paint(
 			p.setCompositionMode(QPainter::CompositionMode_SourceOver);
 		}
 		if (hasReadLine) {
-			if (small && !small->element.unreadCount) {
+			if (small
+				&& !small->element.unreadCount
+				&& !small->element.hasVideoStream) {
 				p.setOpacity(expandRatio);
 			}
 			validateSegments(
@@ -617,6 +658,19 @@ void List::paint(
 					itemFull->element.thumbnail->image(size));
 			}
 		}
+
+		if (const auto full = single.itemFull) {
+			if (full->element.hasVideoStream && expandRatio > 0.) {
+				p.setOpacity(expandRatio);
+				const auto skip = std::ceil(line + lineRead);
+				Ui::PaintLiveBadge(
+					p,
+					std::ceil(userpic.x() - skip),
+					std::ceil(userpic.y() - skip),
+					std::ceil(userpic.width() + 2 * skip),
+					st::windowBg->c);
+			}
+		}
 		p.setOpacity(1.);
 	});
 }
@@ -638,6 +692,16 @@ void List::validateSegments(
 		bool forUnread) {
 	const auto count = item->element.count;
 	const auto unread = item->element.unreadCount;
+	if (item->element.hasVideoStream) {
+		item->segments.resize(1);
+		if (forUnread) {
+			item->segments[0].width = line;
+			item->segments[0].brush = st::attentionButtonFg->b;
+		} else {
+			item->segments[0].width = 0.;
+		}
+		return;
+	}
 	if (int(item->segments.size()) != count) {
 		item->segments.resize(count);
 	}
@@ -877,7 +941,7 @@ TextWithEntities List::computeTooltipText() const {
 			break;
 		}
 	}
-	auto sequence = Ui::Text::Bold(names.front());
+	auto sequence = tr::bold(names.front());
 	if (names.size() > 1) {
 		for (auto i = 1; i + 1 != names.size(); ++i) {
 			sequence = tr::lng_stories_click_to_view_and_one(
@@ -885,22 +949,22 @@ TextWithEntities List::computeTooltipText() const {
 				lt_accumulated,
 				sequence,
 				lt_user,
-				Ui::Text::Bold(names[i]),
-				Ui::Text::WithEntities);
+				tr::bold(names[i]),
+				tr::marked);
 		}
 		sequence = tr::lng_stories_click_to_view_and_last(
 			tr::now,
 			lt_accumulated,
 			sequence,
 			lt_user,
-			Ui::Text::Bold(names.back()),
-			Ui::Text::WithEntities);
+			tr::bold(names.back()),
+			tr::marked);
 	}
 	return tr::lng_stories_click_to_view(
 		tr::now,
 		lt_users,
 		sequence,
-		Ui::Text::WithEntities);
+		tr::marked);
 }
 
 void List::setShowTooltip(
@@ -916,9 +980,13 @@ void List::setShowTooltip(
 	};
 	_tooltip = std::make_unique<Ui::ImportantTooltip>(
 		tooltipParent,
-		MakeTooltipContent(
+		Ui::MakeTooltipWithClose(
 			tooltipParent,
 			_tooltipText.value() | rpl::filter(notEmpty),
+			st::dialogsStoriesTooltipMaxWidth,
+			st::dialogsStoriesTooltipLabel,
+			st::importantTooltipHide,
+			st::defaultImportantTooltip.padding,
 			_tooltipHide),
 		st::dialogsStoriesTooltip);
 	const auto tooltip = _tooltip.get();
@@ -947,7 +1015,7 @@ void List::setShowTooltip(
 			notEmpty
 		) | rpl::distinct_until_changed(),
 		tooltipParent->windowActiveValue()
-	) | rpl::start_with_next([=](bool, bool, bool active) {
+	) | rpl::on_next([=](bool, bool, bool active) {
 		_tooltipWindowActive = active;
 		if (!isHidden()) {
 			toggleTooltip(false);
@@ -955,7 +1023,7 @@ void List::setShowTooltip(
 	}, tooltip->lifetime());
 
 	shownValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](bool shown) {
+	) | rpl::skip(1) | rpl::on_next([=](bool shown) {
 		toggleTooltip(true);
 	}, tooltip->lifetime());
 }
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
index c3140a9ca466ee..64ac522bb0c3b4 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_list.h
@@ -37,6 +37,7 @@ struct Element {
 	std::shared_ptr<Ui::DynamicImage> thumbnail;
 	uint32 count : 15 = 0;
 	uint32 unreadCount : 15 = 0;
+	uint32 hasVideoStream : 1 = 0;
 	uint32 skipSmall : 1 = 0;
 
 	friend inline bool operator==(
@@ -100,6 +101,9 @@ class List final : public Ui::RpWidget {
 	[[nodiscard]] auto verticalScrollEvents() const
 		-> rpl::producer<not_null<QWheelEvent*>>;
 
+	[[nodiscard]] bool toggledHidden() const;
+	void setToggledHidden(bool hiddenInstant, bool hiddenAnimated);
+
 private:
 	struct Layout;
 	enum class State {
@@ -195,8 +199,11 @@ class List final : public Ui::RpWidget {
 
 	Ui::Animations::Simple _expandedAnimation;
 	Ui::Animations::Simple _expandCatchUpAnimation;
+	Ui::Animations::Simple _hiddenAnimation;
 	float64 _lastRatio = 0.;
 	int _lastExpandedHeight = 0;
+	bool _hiddenAnimated : 1 = false;
+	bool _hiddenInstant : 1 = false;
 	bool _expandIgnored : 1 = false;
 	bool _expanded : 1 = false;
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 13f52f9444557f..c3dc482b2186f2 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -11,23 +11,46 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "base/unixtime.h"
 #include "base/qt/qt_key_modifiers.h"
+#include "boxes/choose_filter_box.h"
 #include "boxes/peer_list_box.h"
+#include "core/application.h"
+#include "core/ui_integration.h"
 #include "data/components/recent_peers.h"
 #include "data/components/top_peers.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
+#include "data/data_chat_filters.h"
+#include "data/data_download_manager.h"
 #include "data/data_folder.h"
 #include "data/data_peer_values.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "dialogs/ui/chat_search_empty.h"
+#include "dialogs/ui/chat_search_in.h"
+#include "dialogs/ui/posts_search_intro.h"
+#include "dialogs/dialogs_inner_widget.h"
+#include "dialogs/dialogs_search_posts.h"
 #include "history/history.h"
+#include "info/downloads/info_downloads_widget.h"
+#include "info/media/info_media_widget.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "info/info_wrap_widget.h"
 #include "inline_bots/bot_attach_web_view.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/settings_common.h"
+#include "settings/settings_credits_graphics.h"
+#include "settings/sections/settings_premium.h"
+#include "storage/storage_shared_media.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/controls/swipe_handler.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/toast/toast.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "ui/text/custom_emoji_text_badge.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
@@ -41,15 +64,18 @@ For license and copyright information please follow this link:
 #include "ui/delayed_activation.h"
 #include "ui/dynamic_thumbnails.h"
 #include "ui/painter.h"
+#include "ui/search_field_controller.h"
 #include "ui/unread_badge_paint.h"
 #include "ui/ui_utility.h"
 #include "window/window_separate_id.h"
 #include "window/window_session_controller.h"
 #include "window/window_peer_menu.h"
+#include "styles/style_boxes.h"
 #include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
 #include "styles/style_window.h"
 
 namespace Dialogs {
@@ -57,9 +83,9 @@ namespace {
 
 constexpr auto kCollapsedChannelsCount = 5;
 constexpr auto kProbablyMaxChannels = 1000;
-constexpr auto kProbablyMaxRecommendations = 100;
 constexpr auto kCollapsedAppsCount = 5;
 constexpr auto kProbablyMaxApps = 100;
+constexpr auto kSearchQueryDelay = crl::time(900);
 
 class RecentRow final : public PeerListRow {
 public:
@@ -77,12 +103,18 @@ class RecentRow final : public PeerListRow {
 		bool selected,
 		bool actionSelected) override;
 	bool rightActionDisabled() const override;
+	void rightActionAddRipple(
+		QPoint point,
+		Fn<void()> updateCallback) override;
+	void rightActionStopLastRipple() override;
 
 	const style::PeerListItem &computeSt(
 		const style::PeerListItem &st) const override;
 
 private:
 	const not_null<History*> _history;
+	std::unique_ptr<Ui::Text::String> _mainAppText;
+	std::unique_ptr<Ui::RippleAnimation> _actionRipple;
 	QString _badgeString;
 	QSize _badgeSize;
 	uint32 _counter : 30 = 0;
@@ -113,6 +145,7 @@ struct EntryMenuDescriptor {
 	QString removeAllText;
 	QString removeAllConfirm;
 	Fn<void()> removeAll;
+	Fn<void()> closeCallback;
 };
 
 [[nodiscard]] Fn<void()> RemoveAllConfirm(
@@ -138,6 +171,9 @@ void FillEntryMenu(
 	add(tr::lng_context_new_window(tr::now), [=] {
 		Ui::PreventDelayedActivation();
 		controller->showInNewWindow(peer);
+		if (descriptor.closeCallback) {
+			descriptor.closeCallback();
+		}
 	}, &st::menuIconNewWindow);
 	Window::AddSeparatorAndShiftUp(add);
 
@@ -150,6 +186,20 @@ void FillEntryMenu(
 		controller->showPeerHistory(peer);
 	}, channel ? &st::menuIconChannel : &st::menuIconChatBubble);
 
+	const auto history = peer->owner().historyLoaded(peer);
+	if (history
+		&& history->owner().chatsFilters().has()
+		&& history->inChatList()) {
+		add(Ui::Menu::MenuCallback::Args{
+			.text = tr::lng_filters_menu_add(tr::now),
+			.handler = nullptr,
+			.icon = &st::menuIconAddToFolder,
+			.fillSubmenu = [&](not_null<Ui::PopupMenu*> menu) {
+				FillChooseFilterMenu(controller, menu, history);
+			},
+			.submenuSt = &st::foldersMenu,
+		});
+	}
 	const auto viewProfileText = group
 		? tr::lng_context_view_group(tr::now)
 		: channel
@@ -182,7 +232,17 @@ void FillEntryMenu(
 
 RecentRow::RecentRow(not_null<PeerData*> peer)
 : PeerListRow(peer)
-, _history(peer->owner().history(peer)) {
+, _history(peer->owner().history(peer))
+, _mainAppText([&]() -> std::unique_ptr<Ui::Text::String> {
+	if (const auto user = peer->asUser()) {
+		if (user->botInfo && user->botInfo->hasMainApp) {
+			return std::make_unique<Ui::Text::String>(
+				st::dialogRowOpenBotRecent.button.style,
+				tr::lng_profile_open_app_short(tr::now));
+		}
+	}
+	return nullptr;
+}()) {
 	if (peer->isSelf() || peer->isRepliesChat() || peer->isVerifyCodes()) {
 		setCustomStatus(u" "_q);
 	} else if (const auto chat = peer->asChat()) {
@@ -245,11 +305,21 @@ bool RecentRow::refreshBadge() {
 }
 
 QSize RecentRow::rightActionSize() const {
+	if (_mainAppText && _badgeSize.isEmpty()) {
+		return QSize(
+			_mainAppText->maxWidth() + _mainAppText->minHeight(),
+			st::dialogRowOpenBotRecent.button.height);
+	}
 	return _badgeSize;
 }
 
 QMargins RecentRow::rightActionMargins() const {
-	if (_badgeSize.isEmpty()) {
+	if (_mainAppText && _badgeSize.isEmpty()) {
+		const auto &st = st::dialogRowOpenBotRecent;
+		auto margins = st.margin;
+		margins.setTop((st::recentPeersItem.height - st.button.height) / 2);
+		return margins;
+	} else if (_badgeSize.isEmpty()) {
 		return {};
 	}
 	const auto x = st::recentPeersItem.photoPosition.x();
@@ -264,6 +334,32 @@ void RecentRow::rightActionPaint(
 		int outerWidth,
 		bool selected,
 		bool actionSelected) {
+	if (_mainAppText && _badgeSize.isEmpty()) {
+		const auto size = RecentRow::rightActionSize();
+		p.setPen(Qt::NoPen);
+		p.setBrush(actionSelected
+			? st::activeButtonBgOver
+			: st::activeButtonBg);
+		const auto radius = size.height() / 2;
+		auto hq = PainterHighQualityEnabler(p);
+		p.drawRoundedRect(QRect(QPoint(x, y), size), radius, radius);
+		if (_actionRipple) {
+			_actionRipple->paint(p, x, y, outerWidth);
+			if (_actionRipple->empty()) {
+				_actionRipple.reset();
+			}
+		}
+		p.setPen(actionSelected
+			? st::activeButtonFgOver
+			: st::activeButtonFg);
+		const auto top = st::dialogRowOpenBotRecent.button.textTop;
+		_mainAppText->draw(p, {
+			.position = QPoint(x + size.height() / 2, y + top),
+			.outerWidth = outerWidth,
+			.availableWidth = outerWidth,
+			.elisionLines = 1,
+		});
+	}
 	if (!_counter && !_unread) {
 		return;
 	} else if (_badgeString.isEmpty()) {
@@ -281,7 +377,31 @@ void RecentRow::rightActionPaint(
 }
 
 bool RecentRow::rightActionDisabled() const {
-	return true;
+	return !_mainAppText || !_badgeSize.isEmpty();
+}
+
+void RecentRow::rightActionAddRipple(
+		QPoint point,
+		Fn<void()> updateCallback) {
+	if (!_mainAppText || !_badgeSize.isEmpty()) {
+		return;
+	}
+	if (!_actionRipple) {
+		const auto size = rightActionSize();
+		const auto radius = size.height() / 2;
+		auto mask = Ui::RippleAnimation::RoundRectMask(size, radius);
+		_actionRipple = std::make_unique<Ui::RippleAnimation>(
+			st::defaultActiveButton.ripple,
+			std::move(mask),
+			std::move(updateCallback));
+	}
+	_actionRipple->add(point);
+}
+
+void RecentRow::rightActionStopLastRipple() {
+	if (_actionRipple) {
+		_actionRipple->lastStop();
+	}
 }
 
 const style::PeerListItem &RecentRow::computeSt(
@@ -322,11 +442,16 @@ class Suggestions::ObjectListController
 		return _chosen.events();
 	}
 
+	void setCloseCallback(Fn<void()> callback) {
+		_closeCallback = std::move(callback);
+	}
+
 	Main::Session &session() const override {
 		return _window->session();
 	}
 
 	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowMiddleClicked(not_null<PeerListRow*> row) override;
 	bool rowTrackPress(not_null<PeerListRow*> row) override;
 	void rowTrackPressCancel() override;
 	bool rowTrackPressSkipMouseSelection() override;
@@ -344,6 +469,8 @@ class Suggestions::ObjectListController
 	void setupPlainDivider(rpl::producer<QString> title);
 	void setupExpandDivider(rpl::producer<QString> title);
 
+	Fn<void()> _closeCallback;
+
 private:
 	const not_null<Window::SessionController*> _window;
 
@@ -358,14 +485,19 @@ class Suggestions::ObjectListController
 
 class RecentsController final : public Suggestions::ObjectListController {
 public:
+	using RightActionCallback = Fn<void(not_null<PeerData*>)>;
+
 	RecentsController(
 		not_null<Window::SessionController*> window,
-		RecentPeersList list);
+		RecentPeersList list,
+		RightActionCallback rightActionCallback,
+		Fn<void()> closeCallback);
 
 	void prepare() override;
 	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
 		QWidget *parent,
 		not_null<PeerListRow*> row) override;
+	void rowRightActionClicked(not_null<PeerListRow*> row) override;
 
 	QString savedMessagesChatStatus() const override;
 
@@ -375,6 +507,7 @@ class RecentsController final : public Suggestions::ObjectListController {
 	[[nodiscard]] Fn<void()> removeAllCallback();
 
 	RecentPeersList _recent;
+	RightActionCallback _rightActionCallback;
 	rpl::lifetime _lifetime;
 
 };
@@ -463,7 +596,6 @@ class PopularAppsController final
 
 	Fn<bool(not_null<PeerData*>)> _filterOut;
 	rpl::producer<> _filterOutRefreshes;
-	History *_activeHistory = nullptr;
 	bool _requested = false;
 	rpl::lifetime _lifetime;
 
@@ -551,7 +683,7 @@ bool Suggestions::ObjectListController::processTouchEvent(
 
 void Suggestions::ObjectListController::setupTouchChatPreview(
 		not_null<Ui::ElasticScroll*> scroll) {
-	_touchCancelRequests.events() | rpl::start_with_next([=] {
+	_touchCancelRequests.events() | rpl::on_next([=] {
 		QTouchEvent ev(QEvent::TouchCancel);
 		ev.setTimestamp(crl::now());
 		QGuiApplication::sendEvent(scroll, &ev);
@@ -579,6 +711,14 @@ void Suggestions::ObjectListController::rowClicked(
 	_chosen.fire(row->peer());
 }
 
+void Suggestions::ObjectListController::rowMiddleClicked(
+		not_null<PeerListRow*> row) {
+	window()->showInNewWindow(row->peer());
+	if (_closeCallback) {
+		_closeCallback();
+	}
+}
+
 void Suggestions::ObjectListController::setupPlainDivider(
 		rpl::producer<QString> title) {
 	auto result = object_ptr<Ui::FixedHeightWidget>(
@@ -590,13 +730,13 @@ void Suggestions::ObjectListController::setupPlainDivider(
 		std::move(title),
 		st::searchedBarLabel);
 	raw->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto x = st::searchedBarPosition.x();
 		const auto y = st::searchedBarPosition.y();
 		label->resizeToWidth(size.width() - x * 2);
 		label->moveToLeft(x, y, size.width());
 	}, raw->lifetime());
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(raw).fillRect(clip, st::searchedBarBg);
 	}, raw->lifetime());
 
@@ -616,7 +756,7 @@ void Suggestions::ObjectListController::setupExpandDivider(
 	count(
 	) | rpl::map(
 		rpl::mappers::_1 > kCollapsedChannelsCount
-	) | rpl::distinct_until_changed() | rpl::start_with_next([=](bool more) {
+	) | rpl::distinct_until_changed() | rpl::on_next([=](bool more) {
 		_expanded = false;
 		if (!more) {
 			const auto toggle = _toggleExpanded.current();
@@ -641,7 +781,7 @@ void Suggestions::ObjectListController::setupExpandDivider(
 		rpl::combine(
 			raw->sizeValue(),
 			toggle->widthValue()
-		) | rpl::start_with_next([=](QSize size, int width) {
+		) | rpl::on_next([=](QSize size, int width) {
 			const auto x = st::searchedBarPosition.x();
 			const auto y = st::searchedBarPosition.y();
 			toggle->moveToRight(0, 0, size.width());
@@ -656,14 +796,14 @@ void Suggestions::ObjectListController::setupExpandDivider(
 		_toggleExpanded.value()
 	) | rpl::filter(
 		rpl::mappers::_2 == nullptr
-	) | rpl::start_with_next([=](QSize size, const auto) {
+	) | rpl::on_next([=](QSize size, const auto) {
 		const auto x = st::searchedBarPosition.x();
 		const auto y = st::searchedBarPosition.y();
 		label->resizeToWidth(size.width() - x * 2);
 		label->moveToLeft(x, y, size.width());
 	}, raw->lifetime());
 
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(raw).fillRect(clip, st::searchedBarBg);
 	}, raw->lifetime());
 
@@ -672,9 +812,13 @@ void Suggestions::ObjectListController::setupExpandDivider(
 
 RecentsController::RecentsController(
 	not_null<Window::SessionController*> window,
-	RecentPeersList list)
+	RecentPeersList list,
+	RightActionCallback rightActionCallback,
+	Fn<void()> closeCallback)
 : ObjectListController(window)
-, _recent(std::move(list)) {
+, _recent(std::move(list))
+, _rightActionCallback(std::move(rightActionCallback)) {
+	_closeCallback = std::move(closeCallback);
 }
 
 void RecentsController::prepare() {
@@ -732,10 +876,23 @@ base::unique_qptr<Ui::PopupMenu> RecentsController::rowContextMenu(
 		.removeAllText = tr::lng_recent_clear_all(tr::now),
 		.removeAllConfirm = tr::lng_recent_clear_sure(tr::now),
 		.removeAll = removeAllCallback(),
+		.closeCallback = crl::guard(this, [=] {
+			if (_closeCallback) {
+				_closeCallback();
+			}
+		}),
 	});
 	return result;
 }
 
+void RecentsController::rowRightActionClicked(not_null<PeerListRow*> row) {
+	if (_rightActionCallback) {
+		if (const auto peer = row->peer()) {
+			_rightActionCallback(peer);
+		}
+	}
+}
+
 QString RecentsController::savedMessagesChatStatus() const {
 	return tr::lng_saved_forward_here(tr::now);
 }
@@ -760,14 +917,14 @@ void RecentsController::setupDivider() {
 	rpl::combine(
 		raw->sizeValue(),
 		clear->widthValue()
-	) | rpl::start_with_next([=](QSize size, int width) {
+	) | rpl::on_next([=](QSize size, int width) {
 		const auto x = st::searchedBarPosition.x();
 		const auto y = st::searchedBarPosition.y();
 		clear->moveToRight(0, 0, size.width());
 		label->resizeToWidth(size.width() - x - width);
 		label->moveToLeft(x, y, size.width());
 	}, raw->lifetime());
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(raw).fillRect(clip, st::searchedBarBg);
 	}, raw->lifetime());
 
@@ -779,7 +936,7 @@ void RecentsController::subscribeToEvents() {
 	session().changes().peerUpdates(
 		Flag::Notifications
 		| Flag::OnlineStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto peer = update.peer;
 		if (peer->isSelf()) {
 			return;
@@ -803,7 +960,7 @@ void RecentsController::subscribeToEvents() {
 	}, _lifetime);
 
 	session().data().unreadBadgeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto i = 0; i != countCurrent(); ++i) {
 			const auto row = delegate()->peerListRowAt(i);
 			if (static_cast<RecentRow*>(row.get())->refreshBadge()) {
@@ -823,7 +980,7 @@ void MyChannelsController::prepare() {
 
 	session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::ChannelAmIn
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto channel = update.peer->asBroadcast();
 		if (!channel || channel->amIn()) {
 			return;
@@ -847,7 +1004,7 @@ void MyChannelsController::prepare() {
 	const auto add = [&](not_null<Dialogs::MainList*> list) {
 		for (const auto &row : list->indexed()->all()) {
 			if (const auto history = row->history()) {
-				if (const auto channel = history->peer->asBroadcast()) {
+				if (history->peer->isBroadcast()) {
 					_channels.push_back(history);
 				}
 			}
@@ -861,7 +1018,7 @@ void MyChannelsController::prepare() {
 	ranges::sort(_channels, ranges::greater(), &History::chatListTimeId);
 	setCount(_channels.size());
 
-	expanded() | rpl::start_with_next([=] {
+	expanded() | rpl::on_next([=] {
 		fill();
 	}, _lifetime);
 
@@ -872,11 +1029,11 @@ void MyChannelsController::prepare() {
 	rpl::merge(
 		std::move(loading),
 		owner->chatsListLoadedEvents()
-	) | rpl::start_with_next([=](Data::Folder *folder) {
+	) | rpl::on_next([=](Data::Folder *folder) {
 		const auto list = owner->chatsList(folder);
 		for (const auto &row : list->indexed()->all()) {
 			if (const auto history = row->history()) {
-				if (const auto channel = history->peer->asBroadcast()) {
+				if (history->peer->isBroadcast()) {
 					if (ranges::contains(_channels, not_null(history))) {
 						_channels.push_back(history);
 					}
@@ -962,7 +1119,7 @@ void RecommendationsController::load() {
 	const auto participants = &session().api().chatParticipants();
 	participants->loadRecommendations();
 	participants->recommendationsLoaded(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		fill();
 	}, _lifetime);
 }
@@ -981,7 +1138,7 @@ void RecommendationsController::fill() {
 	delegate()->peerListRefreshRows();
 	setCount(delegate()->peerListFullRowsCount());
 
-	window()->activeChatValue() | rpl::start_with_next([=](const Key &key) {
+	window()->activeChatValue() | rpl::on_next([=](const Key &key) {
 		const auto history = key.history();
 		if (_activeHistory == history) {
 			return;
@@ -1027,7 +1184,7 @@ void RecentAppsController::prepare() {
 	_bots.reserve(kProbablyMaxApps);
 	rpl::single() | rpl::then(
 		session().topBotApps().updates()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_bots.clear();
 		for (const auto &peer : session().topBotApps().list()) {
 			if (const auto bot = peer->asUser()) {
@@ -1043,7 +1200,7 @@ void RecentAppsController::prepare() {
 		fill();
 	}, _lifetime);
 
-	expanded() | rpl::skip(1) | rpl::start_with_next([=] {
+	expanded() | rpl::skip(1) | rpl::on_next([=] {
 		fill();
 	}, _lifetime);
 }
@@ -1073,6 +1230,11 @@ base::unique_qptr<Ui::PopupMenu> RecentAppsController::rowContextMenu(
 		.peer = peer,
 		.removeOneText = tr::lng_recent_remove(tr::now),
 		.removeOne = removeOne,
+		.closeCallback = crl::guard(this, [=] {
+			if (_closeCallback) {
+				_closeCallback();
+			}
+		}),
 	});
 	return result;
 }
@@ -1136,7 +1298,7 @@ void PopularAppsController::prepare() {
 	}
 	rpl::single() | rpl::then(
 		std::move(_filterOutRefreshes)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		fill();
 	}, _lifetime);
 }
@@ -1149,7 +1311,7 @@ void PopularAppsController::load() {
 	const auto attachWebView = &session().attachWebView();
 	attachWebView->loadPopularAppBots();
 	attachWebView->popularAppBotsLoaded(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		fill();
 	}, _lifetime);
 }
@@ -1163,8 +1325,22 @@ void PopularAppsController::fill() {
 			appendRow(bot);
 		}
 	}
+	const auto count = delegate()->peerListFullRowsCount();
+	setCount(count);
+	if (count > 0) {
+		delegate()->peerListSetBelowWidget(object_ptr<Ui::DividerLabel>(
+			(QWidget*)nullptr,
+			object_ptr<Ui::FlatLabel>(
+				(QWidget*)nullptr,
+				tr::lng_bot_apps_which(
+					lt_link,
+					tr::lng_bot_apps_which_link(
+						tr::url(u"internal:about_popular_apps"_q)),
+					tr::marked),
+				st::dialogsPopularAppsAbout),
+			st::dialogsPopularAppsPadding));
+	}
 	delegate()->peerListRefreshRows();
-	setCount(delegate()->peerListFullRowsCount());
 }
 
 void PopularAppsController::appendRow(not_null<UserData*> bot) {
@@ -1184,7 +1360,12 @@ Suggestions::Suggestions(
 	RecentPeersList recentPeers)
 : RpWidget(parent)
 , _controller(controller)
-, _tabs(std::make_unique<Ui::SettingsSlider>(this, st::dialogsSearchTabs))
+, _tabsScroll(
+	std::make_unique<Ui::ScrollArea>(this, st::dialogsTabsScroll, true))
+, _tabs(
+	_tabsScroll->setOwnedWidget(
+		object_ptr<Ui::SettingsSlider>(this, st::dialogsSearchTabs)))
+, _tabKeys(TabKeysFor(controller))
 , _chatsScroll(std::make_unique<Ui::ElasticScroll>(this))
 , _chatsContent(
 	_chatsScroll->setOwnedWidget(object_ptr<Ui::VerticalLayout>(this)))
@@ -1204,9 +1385,11 @@ Suggestions::Suggestions(
 , _appsScroll(std::make_unique<Ui::ElasticScroll>(this))
 , _appsContent(
 	_appsScroll->setOwnedWidget(object_ptr<Ui::VerticalLayout>(this)))
+, _postsScroll(std::make_unique<Ui::ElasticScroll>(this))
+, _postsWrap(_postsScroll->setOwnedWidget(object_ptr<Ui::RpWidget>(this)))
 , _recentApps(setupRecentApps())
-, _popularApps(setupPopularApps()) {
-
+, _popularApps(setupPopularApps())
+, _searchQueryTimer([=] { applySearchQuery(); }) {
 	setupTabs();
 	setupChats();
 	setupChannels();
@@ -1216,63 +1399,118 @@ Suggestions::Suggestions(
 Suggestions::~Suggestions() = default;
 
 void Suggestions::setupTabs() {
+	_tabsScroll->setCustomWheelProcess([=](not_null<QWheelEvent*> e) {
+		const auto pixelDelta = e->pixelDelta();
+		const auto angleDelta = e->angleDelta();
+		if (std::abs(pixelDelta.x()) + std::abs(angleDelta.x())) {
+			return false;
+		}
+		const auto y = pixelDelta.y() ? pixelDelta.y() : angleDelta.y();
+		_tabsScroll->scrollToX(_tabsScroll->scrollLeft() - y);
+		return true;
+	});
+
+	const auto scrollToIndex = [=](int index, anim::type type) {
+		const auto to = index
+			? (_tabs->centerOfSection(index) - _tabsScroll->width() / 2)
+			: 0;
+		_tabsScrollAnimation.stop();
+		if (type == anim::type::instant) {
+			_tabsScroll->scrollToX(to);
+		} else {
+			_tabsScrollAnimation.start(
+				[=](float64 v) { _tabsScroll->scrollToX(v); },
+				_tabsScroll->scrollLeft(),
+				std::min(to, _tabsScroll->scrollLeftMax()),
+				st::defaultTabsSlider.duration);
+		}
+	};
+	rpl::single(-1) | rpl::then(
+		_tabs->sectionActivated()
+	) | rpl::combine_previous(
+	) | rpl::on_next([=](int was, int index) {
+		if (was != index) {
+			scrollToIndex(index, anim::type::normal);
+		}
+	}, _tabs->lifetime());
+
 	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
 	shadow->lower();
 
-	_tabs->move(st::dialogsSearchTabsPadding, 0);
+	_tabsScroll->move(0, 0);
+	_tabs->move(0, 0);
 	rpl::combine(
 		widthValue(),
 		_tabs->heightValue()
-	) | rpl::start_with_next([=](int width, int height) {
+	) | rpl::on_next([=](int width, int height) {
 		const auto line = st::lineWidth;
 		shadow->setGeometry(0, height - line, width, line);
 	}, shadow->lifetime());
 
-	shadow->showOn(_tabs->shownValue());
+	shadow->showOn(_tabsScroll->shownValue());
+
+	const auto labels = base::flat_map<Key, QString>{
+		{ Key{ Tab::Chats }, tr::lng_recent_chats(tr::now) },
+		{ Key{ Tab::Channels }, tr::lng_recent_channels(tr::now) },
+		{ Key{ Tab::Apps }, tr::lng_recent_apps(tr::now) },
+		{ Key{ Tab::Posts }, tr::lng_recent_posts(tr::now) },
+		{ Key{ Tab::Media, MediaType::Photo }, tr::lng_all_photos(tr::now) },
+		{ Key{ Tab::Media, MediaType::Video }, tr::lng_all_videos(tr::now) },
+		{ Key{ Tab::Downloads }, tr::lng_all_downloads(tr::now) },
+		{ Key{ Tab::Media, MediaType::Link }, tr::lng_all_links(tr::now) },
+		{ Key{ Tab::Media, MediaType::File }, tr::lng_all_files(tr::now) },
+		{
+			Key{ Tab::Media, MediaType::MusicFile },
+			tr::lng_all_music(tr::now),
+		},
+		{
+			Key{ Tab::Media, MediaType::RoundVoiceFile },
+			tr::lng_all_voice(tr::now),
+		},
+	};
 
-	_tabs->setSections({
-		tr::lng_recent_chats(tr::now),
-		tr::lng_recent_channels(tr::now),
-		tr::lng_recent_apps(tr::now),
-	});
+	auto sections = std::vector<TextWithEntities>();
+	for (const auto key : _tabKeys) {
+		const auto i = labels.find(key);
+		Assert(i != end(labels));
+		sections.push_back({ i->second });
+	}
+	_tabs->setSections(sections);
 	_tabs->sectionActivated(
-	) | rpl::start_with_next([=](int section) {
-		switchTab(section == 2
-			? Tab::Apps
-			: section
-			? Tab::Channels
-			: Tab::Chats);
+	) | rpl::on_next([=](int section) {
+		Assert(section >= 0 && section < _tabKeys.size());
+		switchTab(_tabKeys[section]);
 	}, _tabs->lifetime());
 }
 
 void Suggestions::setupChats() {
-	_recent->count.value() | rpl::start_with_next([=](int count) {
+	_recent->count.value() | rpl::on_next([=](int count) {
 		_recent->wrap->toggle(count > 0, anim::type::instant);
 		_emptyRecent->toggle(count == 0, anim::type::instant);
 	}, _recent->wrap->lifetime());
 
-	_topPeers->emptyValue() | rpl::start_with_next([=](bool empty) {
+	_topPeers->emptyValue() | rpl::on_next([=](bool empty) {
 		_topPeersWrap->toggle(!empty, anim::type::instant);
 	}, _topPeers->lifetime());
 
-	_topPeers->clicks() | rpl::start_with_next([=](uint64 peerIdRaw) {
+	_topPeers->clicks() | rpl::on_next([=](uint64 peerIdRaw) {
 		const auto peerId = PeerId(peerIdRaw);
 		_topPeerChosen.fire(_controller->session().data().peer(peerId));
 	}, _topPeers->lifetime());
 
-	_topPeers->pressed() | rpl::start_with_next([=](uint64 peerIdRaw) {
+	_topPeers->pressed() | rpl::on_next([=](uint64 peerIdRaw) {
 		handlePressForChatPreview(PeerId(peerIdRaw), [=](bool shown) {
 			_topPeers->pressLeftToContextMenu(shown);
 		});
 	}, _topPeers->lifetime());
 
-	_topPeers->pressCancelled() | rpl::start_with_next([=] {
+	_topPeers->pressCancelled() | rpl::on_next([=] {
 		_controller->cancelScheduledPreview();
 	}, _topPeers->lifetime());
 
 	_topPeers->showMenuRequests(
-	) | rpl::start_with_next([=](const ShowTopPeerMenuRequest &request) {
-		const auto weak = Ui::MakeWeak(this);
+	) | rpl::on_next([=](const ShowTopPeerMenuRequest &request) {
+		const auto weak = base::make_weak(this);
 		const auto owner = &_controller->session().data();
 		const auto peer = owner->peer(PeerId(request.id));
 		const auto removeOne = [=] {
@@ -1294,29 +1532,33 @@ void Suggestions::setupChats() {
 			.removeOneText = tr::lng_recent_remove(tr::now),
 			.removeOne = removeOne,
 			.removeAllText = tr::lng_recent_hide_top(
-				tr::now).replace('&', u"&&"_q),
+				tr::now,
+				Ui::Text::FixAmpersandInAction),
 			.removeAllConfirm = tr::lng_recent_hide_sure(tr::now),
 			.removeAll = removeAll,
-		});
+			.closeCallback = crl::guard(
+				this,
+				[=] { _closeRequests.fire({}); }),
+			});
 	}, _topPeers->lifetime());
 
 	_topPeers->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		_chatsScroll->scrollToY(request.ymin, request.ymax);
 	}, _topPeers->lifetime());
 
 	_topPeers->verticalScrollEvents(
-	) | rpl::start_with_next([=](not_null<QWheelEvent*> e) {
+	) | rpl::on_next([=](not_null<QWheelEvent*> e) {
 		_chatsScroll->viewportEvent(e);
 	}, _topPeers->lifetime());
 
-	_chatsScroll->setVisible(_tab.current() == Tab::Chats);
+	_chatsScroll->setVisible(_key.current().tab == Tab::Chats);
 	_chatsScroll->setCustomTouchProcess(_recent->processTouch);
 }
 
 void Suggestions::handlePressForChatPreview(
-		PeerId id,
-		Fn<void(bool)> callback) {
+	PeerId id,
+	Fn<void(bool)> callback) {
 	callback = crl::guard(this, callback);
 	const auto row = RowDescriptor(
 		_controller->session().data().history(id),
@@ -1329,11 +1571,11 @@ void Suggestions::handlePressForChatPreview(
 }
 
 void Suggestions::setupChannels() {
-	_myChannels->count.value() | rpl::start_with_next([=](int count) {
+	_myChannels->count.value() | rpl::on_next([=](int count) {
 		_myChannels->wrap->toggle(count > 0, anim::type::instant);
 	}, _myChannels->wrap->lifetime());
 
-	_recommendations->count.value() | rpl::start_with_next([=](int count) {
+	_recommendations->count.value() | rpl::on_next([=](int count) {
 		_recommendations->wrap->toggle(count > 0, anim::type::instant);
 	}, _recommendations->wrap->lifetime());
 
@@ -1344,7 +1586,7 @@ void Suggestions::setupChannels() {
 			rpl::mappers::_1 + rpl::mappers::_2 == 0),
 		anim::type::instant);
 
-	_channelsScroll->setVisible(_tab.current() == Tab::Channels);
+	_channelsScroll->setVisible(_key.current().tab == Tab::Channels);
 	_channelsScroll->setCustomTouchProcess([=](not_null<QTouchEvent*> e) {
 		const auto myChannels = _myChannels->processTouch(e);
 		const auto recommendations = _recommendations->processTouch(e);
@@ -1353,15 +1595,15 @@ void Suggestions::setupChannels() {
 }
 
 void Suggestions::setupApps() {
-	_recentApps->count.value() | rpl::start_with_next([=](int count) {
+	_recentApps->count.value() | rpl::on_next([=](int count) {
 		_recentApps->wrap->toggle(count > 0, anim::type::instant);
 	}, _recentApps->wrap->lifetime());
 
-	_popularApps->count.value() | rpl::start_with_next([=](int count) {
+	_popularApps->count.value() | rpl::on_next([=](int count) {
 		_popularApps->wrap->toggle(count > 0, anim::type::instant);
 	}, _popularApps->wrap->lifetime());
 
-	_appsScroll->setVisible(_tab.current() == Tab::Apps);
+	_appsScroll->setVisible(_key.current().tab == Tab::Apps);
 	_appsScroll->setCustomTouchProcess([=](not_null<QTouchEvent*> e) {
 		const auto recentApps = _recentApps->processTouch(e);
 		const auto popularApps = _popularApps->processTouch(e);
@@ -1369,13 +1611,67 @@ void Suggestions::setupApps() {
 	});
 }
 
+Ui::Controls::SwipeHandlerArgs Suggestions::generateIncompleteSwipeArgs() {
+	_swipeLifetime.destroy();
+
+	auto update = [=](Ui::Controls::SwipeContextData data) {
+		if (data.translation != 0) {
+			if (!_swipeBackData.callback) {
+				_swipeBackData = Ui::Controls::SetupSwipeBack(
+					this,
+					[=]() -> std::pair<QColor, QColor> {
+						return {
+							st::historyForwardChooseBg->c,
+							st::historyForwardChooseFg->c,
+						};
+					},
+					data.translation < 0);
+			}
+			_swipeBackData.callback(data);
+			return;
+		} else if (_swipeBackData.lifetime) {
+			_swipeBackData = {};
+		}
+	};
+	auto init = [=](Ui::Controls::SwipeHandlerInitData data) {
+		if (!_tabs) {
+			return Ui::Controls::SwipeHandlerFinishData();
+		}
+		const auto activeSection = _tabs->activeSection();
+		const auto isToLeft = data.direction == Qt::RightToLeft;
+		if ((isToLeft && activeSection > 0)
+			|| (!isToLeft && activeSection < _tabKeys.size() - 1)) {
+			return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
+				if (_tabs
+					&& _tabs->activeSection() == activeSection) {
+					_swipeBackData = {};
+					_tabs->setActiveSection(isToLeft
+						? activeSection - 1
+						: activeSection + 1);
+				}
+			});
+		}
+		return Ui::Controls::SwipeHandlerFinishData();
+	};
+	return { .widget = this, .update = update, .init = init };
+}
+
+void Suggestions::reinstallSwipe(not_null<Ui::ElasticScroll*> scroll) {
+	_swipeLifetime.destroy();
+
+	auto args = generateIncompleteSwipeArgs();
+	args.scroll = scroll;
+	args.onLifetime = &_swipeLifetime;
+
+	Ui::Controls::SetupSwipeHandler(std::move(args));
+}
+
 void Suggestions::selectJump(Qt::Key direction, int pageSize) {
-	switch (_tab.current()) {
+	switch (_key.current().tab) {
 	case Tab::Chats: selectJumpChats(direction, pageSize); return;
 	case Tab::Channels: selectJumpChannels(direction, pageSize); return;
 	case Tab::Apps: selectJumpApps(direction, pageSize); return;
 	}
-	Unexpected("Tab in Suggestions::selectJump.");
 }
 
 void Suggestions::selectJumpChats(Qt::Key direction, int pageSize) {
@@ -1553,7 +1849,7 @@ void Suggestions::selectJumpApps(Qt::Key direction, int pageSize) {
 }
 
 void Suggestions::chooseRow() {
-	switch (_tab.current()) {
+	switch (_key.current().tab) {
 	case Tab::Chats:
 		if (!_topPeers->chooseRow()) {
 			_recent->choose();
@@ -1572,10 +1868,225 @@ void Suggestions::chooseRow() {
 	}
 }
 
+bool Suggestions::consumeSearchQuery(const QString &query) {
+	using Type = MediaType;
+	const auto key = _key.current();
+	const auto tab = key.tab;
+	const auto type = (key.tab == Tab::Media) ? key.mediaType : Type::kCount;
+	if (tab == Tab::Posts) {
+		const auto changed = (_searchQuery != query);
+		setPostsSearchQuery(query);
+		return changed || !query.isEmpty();
+	} else if (tab != Tab::Downloads
+		&& type != Type::File
+		&& type != Type::Link
+		&& type != Type::MusicFile) {
+		return false;
+	} else if (_searchQuery == query) {
+		return false;
+	}
+	_searchQuery = query;
+	_persist = !_searchQuery.isEmpty();
+	if (query.isEmpty() || tab == Tab::Downloads) {
+		_searchQueryTimer.cancel();
+		applySearchQuery();
+	} else {
+		_searchQueryTimer.callOnce(kSearchQueryDelay);
+	}
+	return true;
+}
+
+void Suggestions::setupPostsSearch() {
+	_postsSearch = std::make_unique<PostsSearch>(&_controller->session());
+
+	_postsSearch->stateUpdates(
+	) | rpl::on_next([=](const PostsSearchState &state) {
+		if (state.intro) {
+			if (!_postsSearchIntro) {
+				setupPostsIntro(*state.intro);
+			} else {
+				_postsSearchIntro->update(*state.intro);
+			}
+			return;
+		} else if (!_postsContent) {
+			setupPostsResults();
+		}
+
+		_postsContent->applySearchState(SearchState{
+			.tab = ChatSearchTab::PublicPosts,
+			.query = _searchQuery,
+		});
+		if (state.loading) {
+			_postsContent->searchRequested(true);
+		} else {
+			_postsContent->searchReceived(
+				state.page,
+				nullptr,
+				{ .posts = true, .start = true },
+				state.totalCount);
+			_postsScroll->scrollToY(0);
+			updatePostsSearchVisibleRange();
+		}
+	}, _postsWrap->lifetime());
+
+	_postsSearch->pagesUpdates(
+	) | rpl::on_next([=](const PostsSearchState &state) {
+		Expects(!state.intro && !state.loading);
+
+		if (!_postsContent) {
+			return;
+		}
+		_postsContent->searchReceived(
+			state.page,
+			nullptr,
+			{ .posts = true },
+			state.totalCount);
+		updatePostsSearchVisibleRange();
+	}, _postsWrap->lifetime());
+}
+
+void Suggestions::setPostsSearchQuery(const QString &query) {
+	if (!_postsSearch) {
+		setupPostsSearch();
+	}
+	if (!query.isEmpty()) {
+		_persist = true;
+	}
+	_searchQuery = query;
+	_searchQueryTimer.cancel();
+	_postsSearch->setQuery(query);
+}
+
+void Suggestions::setupPostsResults() {
+	Expects(!_postsContent);
+
+	delete base::take(_postsSearchIntro);
+	_postsContent = Ui::CreateChild<InnerWidget>(
+		_postsWrap.get(),
+		_controller,
+		rpl::single(InnerWidget::ChildListShown()));
+
+	_postsContent->applySearchState(SearchState{
+		.tab = ChatSearchTab::PublicPosts,
+		.query = _searchQuery,
+	});
+	_postsContent->searchRequested(true);
+
+	_postsContent->chosenRow(
+	) | rpl::on_next([=](const ChosenRow &row) {
+		const auto history = row.key.history();
+		if (!history) {
+			return;
+		}
+		_persist = true;
+		const auto showAtMsgId = row.message.fullId.msg;
+		auto params = Window::SectionShow(
+			Window::SectionShow::Way::ClearStack);
+		params.highlight = Window::SearchHighlightId(_searchQuery);
+		if (row.newWindow) {
+			_controller->showInNewWindow(history->peer, showAtMsgId);
+			_closeRequests.fire({});
+		} else {
+			_controller->showThread(history, showAtMsgId, params);
+		}
+	}, _postsContent->lifetime());
+
+	_postsContent->heightValue() | rpl::on_next([=](int height) {
+		_postsWrap->resize(_postsWrap->width(), height);
+	}, _postsContent->lifetime());
+
+	rpl::combine(
+		rpl::single(rpl::empty) | rpl::then(_postsScroll->scrolls()),
+		_postsScroll->heightValue()
+	) | rpl::on_next([=] {
+		updatePostsSearchVisibleRange();
+	}, _postsContent->lifetime());
+
+	_postsContent->setLoadMoreCallback([=] {
+		_postsSearch->requestMore();
+	});
+
+	_postsContent->setNarrowRatio(0.);
+	_postsContent->show();
+	updateControlsGeometry();
+}
+
+void Suggestions::updatePostsSearchVisibleRange() {
+	Expects(_postsContent != nullptr);
+
+	const auto top = _postsScroll->scrollTop();
+	const auto height = _postsScroll->height();
+	_postsContent->setVisibleTopBottom(top, top + height);
+}
+
+void Suggestions::setupPostsIntro(const PostsSearchIntroState &intro) {
+	Expects(!_postsSearchIntro);
+
+	delete base::take(_postsContent);
+	_postsSearchIntro = Ui::CreateChild<PostsSearchIntro>(_postsWrap, intro);
+
+	_postsSearchIntro->searchWithStars(
+	) | rpl::on_next([=](int stars) {
+		if (!_controller->session().premium()) {
+			Settings::ShowPremium(
+				_controller,
+				u"posts_search"_q);
+		} else if (!stars) {
+			_postsSearch->setAllowedStars(0);
+		} else {
+			using namespace Settings;
+			const auto done = [=](Settings::SmallBalanceResult result) {
+				if (result == Settings::SmallBalanceResult::Success
+					|| result == Settings::SmallBalanceResult::Already) {
+					const auto spent = _postsSearch->setAllowedStars(stars);
+					if (spent > 0) {
+						_controller->showToast({
+							.text = tr::lng_posts_paid_spent(
+								tr::now,
+								lt_count,
+								spent,
+								tr::rich),
+							.attach = RectPart::Top,
+							.duration = Ui::Toast::kDefaultDuration * 2,
+						});
+					}
+				}
+			};
+			MaybeRequestBalanceIncrease(
+				_controller->uiShow(),
+				stars,
+				SmallBalanceForSearch{},
+				done);
+		}
+	}, _postsSearchIntro->lifetime());
+
+	_postsScroll->heightValue() | rpl::on_next([=](int height) {
+		_postsWrap->resize(_postsWrap->width(), height);
+	}, _postsSearchIntro->lifetime());
+
+	_postsSearchIntro->show();
+	updateControlsGeometry();
+}
+
+void Suggestions::applySearchQuery() {
+	const auto key = _key.current();
+	const auto controller = _mediaLists[key].wrap->controller();
+	const auto search = controller->searchFieldController();
+	if (search->query() != _searchQuery) {
+		search->setQuery(_searchQuery);
+	}
+}
+
+rpl::producer<> Suggestions::clearSearchQueryRequests() const {
+	return _clearSearchQueryRequests.events();
+}
+
 Data::Thread *Suggestions::updateFromParentDrag(QPoint globalPosition) {
-	return (_tab.current() == Tab::Chats)
-		? updateFromChatsDrag(globalPosition)
-		: updateFromChannelsDrag(globalPosition);
+	switch (_key.current().tab) {
+	case Tab::Chats: return updateFromChatsDrag(globalPosition);
+	case Tab::Channels: return updateFromChannelsDrag(globalPosition);
+	}
+	return nullptr;
 }
 
 Data::Thread *Suggestions::updateFromChatsDrag(QPoint globalPosition) {
@@ -1636,39 +2147,75 @@ void Suggestions::hide(anim::type animated, Fn<void()> finish) {
 	}
 }
 
-void Suggestions::switchTab(Tab tab) {
-	const auto was = _tab.current();
-	if (was == tab) {
+void Suggestions::switchTab(Key key) {
+	const auto was = _key.current();
+	if (was == key) {
 		return;
 	}
-	_tab = tab;
+	consumeSearchQuery(QString());
+	_key = key;
 	_persist = false;
+	_clearSearchQueryRequests.fire({});
 	if (_tabs->isHidden()) {
 		return;
 	}
-	startSlideAnimation(was, tab);
+	startSlideAnimation(was, key);
+}
+
+void Suggestions::ensureContent(Key key) {
+	if (key.tab == Tab::Posts) {
+		setPostsSearchQuery(QString());
+		return;
+	} else if (key.tab != Tab::Downloads && key.tab != Tab::Media) {
+		return;
+	}
+	auto &list = _mediaLists[key];
+	if (list.wrap) {
+		return;
+	}
+	const auto self = _controller->session().user();
+	const auto memento = (key.tab == Tab::Downloads)
+		? Info::Downloads::Make(self)
+		: std::make_shared<Info::Memento>(
+			self,
+			Info::Section(key.mediaType, Info::Section::Type::GlobalMedia));
+	list.wrap = Ui::CreateChild<Info::WrapWidget>(
+		this,
+		_controller,
+		Info::Wrap::Search,
+		memento.get());
+	list.wrap->show();
+	updateControlsGeometry();
 }
 
-void Suggestions::startSlideAnimation(Tab was, Tab now) {
+void Suggestions::startSlideAnimation(Key was, Key now) {
+	ensureContent(now);
+	const auto wasIndex = ranges::find(_tabKeys, was);
+	const auto nowIndex = ranges::find(_tabKeys, now);
 	if (!_slideAnimation.animating()) {
-		_slideLeft = (was == Tab::Chats || now == Tab::Chats)
-			? Ui::GrabWidget(_chatsScroll.get())
-			: Ui::GrabWidget(_channelsScroll.get());
-		_slideLeftTop = (was == Tab::Chats || now == Tab::Chats)
-			? _chatsScroll->y()
-			: _channelsScroll->y();
-		_slideRight = (was == Tab::Apps || now == Tab::Apps)
-			? Ui::GrabWidget(_appsScroll.get())
-			: Ui::GrabWidget(_channelsScroll.get());
-		_slideRightTop = (was == Tab::Apps || now == Tab::Apps)
-			? _appsScroll->y()
-			: _channelsScroll->y();
-		_chatsScroll->hide();
-		_channelsScroll->hide();
-		_appsScroll->hide();
-	}
-	const auto from = (now > was) ? 0. : 1.;
-	const auto to = (now > was) ? 1. : 0.;
+		const auto find = [&](Key key) -> not_null<QWidget*> {
+			switch (key.tab) {
+			case Tab::Chats: return _chatsScroll.get();
+			case Tab::Channels: return _channelsScroll.get();
+			case Tab::Apps: return _appsScroll.get();
+			case Tab::Posts: return _postsScroll.get();
+			}
+			return _mediaLists[key].wrap;
+		};
+		auto left = find(was);
+		auto right = find(now);
+		if (wasIndex > nowIndex) {
+			std::swap(left, right);
+		}
+		_slideLeft = Ui::GrabWidget(left);
+		_slideLeftTop = left->y();
+		_slideRight = Ui::GrabWidget(right);
+		_slideRightTop = right->y();
+		left->hide();
+		right->hide();
+	}
+	const auto from = (nowIndex > wasIndex) ? 0. : 1.;
+	const auto to = (nowIndex > wasIndex) ? 1. : 0.;
 	_slideAnimation.start([=] {
 		update();
 		if (!_slideAnimation.animating() && !_shownAnimation.animating()) {
@@ -1699,10 +2246,14 @@ void Suggestions::startShownAnimation(bool shown, Fn<void()> finish) {
 			resize(now, height());
 		}
 	}
-	_tabs->hide();
+	_tabsScroll->hide();
 	_chatsScroll->hide();
 	_channelsScroll->hide();
 	_appsScroll->hide();
+	_postsScroll->hide();
+	for (const auto &[key, list] : _mediaLists) {
+		list.wrap->hide();
+	}
 	_slideAnimation.stop();
 }
 
@@ -1714,17 +2265,56 @@ void Suggestions::finishShow() {
 	_shownAnimation.stop();
 	_cache = QPixmap();
 
-	_tabs->show();
-	const auto tab = _tab.current();
-	_chatsScroll->setVisible(tab == Tab::Chats);
-	_channelsScroll->setVisible(tab == Tab::Channels);
-	_appsScroll->setVisible(tab == Tab::Apps);
+	_tabsScroll->show();
+	const auto key = _key.current();
+	_chatsScroll->setVisible(key == Key{ Tab::Chats });
+	_channelsScroll->setVisible(key == Key{ Tab::Channels });
+	_appsScroll->setVisible(key == Key{ Tab::Apps });
+	_postsScroll->setVisible(key == Key{ Tab::Posts });
+	for (const auto &[mediaKey, list] : _mediaLists) {
+		list.wrap->setVisible(key == mediaKey);
+		if (key == mediaKey) {
+			_swipeLifetime.destroy();
+			auto incomplete = generateIncompleteSwipeArgs();
+			list.wrap->replaceSwipeHandler(&incomplete);
+		}
+	}
+	if (key == Key{ Tab::Chats }) {
+		reinstallSwipe(_chatsScroll.get());
+	} else if (key == Key{ Tab::Channels }) {
+		reinstallSwipe(_channelsScroll.get());
+	} else if (key == Key{ Tab::Apps }) {
+		reinstallSwipe(_appsScroll.get());
+	} else if (key == Key{ Tab::Posts }) {
+		reinstallSwipe(_postsScroll.get());
+	}
 }
 
 float64 Suggestions::shownOpacity() const {
 	return _shownAnimation.value(_hidden ? 0. : 1.);
 }
 
+std::vector<Suggestions::Key> Suggestions::TabKeysFor(
+		not_null<Window::SessionController*> controller) {
+	auto result = std::vector<Key>{
+		{ Tab::Chats },
+		{ Tab::Channels },
+		{ Tab::Apps },
+		{ Tab::Posts },
+		{ Tab::Media, MediaType::Photo },
+		{ Tab::Media, MediaType::Video },
+		{ Tab::Downloads },
+		{ Tab::Media, MediaType::Link },
+		{ Tab::Media, MediaType::File },
+		{ Tab::Media, MediaType::MusicFile },
+		{ Tab::Media, MediaType::RoundVoiceFile },
+	};
+	if (Core::App().downloadManager().empty()) {
+		result.erase(ranges::find(result, Key{ Tab::Downloads }));
+	}
+	return result;
+}
+
 void Suggestions::paintEvent(QPaintEvent *e) {
 	const auto opacity = shownOpacity();
 	auto color = st::windowBg->c;
@@ -1738,7 +2328,7 @@ void Suggestions::paintEvent(QPaintEvent *e) {
 		p.drawPixmap(0, (opacity - 1.) * slide, _cache);
 	} else if (!_slideLeft.isNull()) {
 		const auto slide = st::topPeers.height + st::searchedBarHeight;
-		const auto right = (_tab.current() == Tab::Channels);
+		const auto right = (_key.current().tab == Tab::Channels);
 		const auto progress = _slideAnimation.value(right ? 1. : 0.);
 		p.setOpacity(1. - progress);
 		p.drawPixmap(
@@ -1754,25 +2344,58 @@ void Suggestions::paintEvent(QPaintEvent *e) {
 }
 
 void Suggestions::resizeEvent(QResizeEvent *e) {
+	updateControlsGeometry();
+}
+
+void Suggestions::updateControlsGeometry() {
 	const auto w = std::max(width(), st::columnMinimalWidthLeft);
-	_tabs->resizeToWidth(w);
+	_tabs->fitWidthToSections();
+
 	const auto tabs = _tabs->height();
+	_tabsScroll->setGeometry(0, 0, w, tabs);
 
-	_chatsScroll->setGeometry(0, tabs, w, height() - tabs);
+	const auto content = QRect(0, tabs, w, height() - tabs);
+
+	_chatsScroll->setGeometry(content);
 	_chatsContent->resizeToWidth(w);
 
-	_channelsScroll->setGeometry(0, tabs, w, height() - tabs);
+	_channelsScroll->setGeometry(content);
 	_channelsContent->resizeToWidth(w);
 
-	_appsScroll->setGeometry(0, tabs, w, height() - tabs);
+	_appsScroll->setGeometry(content);
 	_appsContent->resizeToWidth(w);
+
+	_postsScroll->setGeometry(content);
+	_postsWrap->resizeToWidth(w);
+	if (_postsSearchIntro) {
+		_postsSearchIntro->setGeometry(0, 0, w, height() - tabs);
+	} else if (_postsContent) {
+		_postsContent->resizeToWidth(w);
+		_postsContent->setMinimumHeight(height() - tabs);
+		_postsContent->refresh();
+	}
+
+	const auto expanding = false;
+	for (const auto &[key, list] : _mediaLists) {
+		const auto full = !list.wrap->scrollBottomSkip();
+		const auto additionalScroll = (full ? st::boxRadius : 0);
+		const auto height = content.height() - (full ? 0 : st::boxRadius);
+		const auto wrapGeometry = QRect{ 0, tabs, w, height};
+		list.wrap->updateGeometry(
+			wrapGeometry,
+			expanding,
+			additionalScroll,
+			content.height());
+	}
 }
 
 auto Suggestions::setupRecentPeers(RecentPeersList recentPeers)
 -> std::unique_ptr<ObjectList> {
 	const auto controller = lifetime().make_state<RecentsController>(
 		_controller,
-		std::move(recentPeers));
+		std::move(recentPeers),
+		[=](not_null<PeerData*> p) { _openBotMainAppRequests.fire_copy(p); },
+		[=] { _closeRequests.fire({}); });
 
 	const auto addToScroll = [=] {
 		return _topPeersWrap->toggled() ? _topPeers->height() : 0;
@@ -1808,7 +2431,7 @@ auto Suggestions::setupRecentPeers(RecentPeersList recentPeers)
 	};
 
 	raw->chosen.events(
-	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+	) | rpl::on_next([=](not_null<PeerData*> peer) {
 		_controller->session().recentPeers().bump(peer);
 	}, list->lifetime());
 
@@ -1868,7 +2491,7 @@ auto Suggestions::setupMyChannels() -> std::unique_ptr<ObjectList> {
 	};
 
 	raw->chosen.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_persist = false;
 	}, list->lifetime());
 
@@ -1914,13 +2537,13 @@ auto Suggestions::setupRecommendations() -> std::unique_ptr<ObjectList> {
 	};
 
 	raw->chosen.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_persist = true;
 	}, list->lifetime());
 
-	_tab.value() | rpl::filter(
-		rpl::mappers::_1 == Tab::Channels
-	) | rpl::start_with_next([=] {
+	_key.value() | rpl::filter(
+		rpl::mappers::_1 == Key{ Tab::Channels }
+	) | rpl::on_next([=] {
 		controller->load();
 	}, list->lifetime());
 
@@ -1930,6 +2553,9 @@ auto Suggestions::setupRecommendations() -> std::unique_ptr<ObjectList> {
 auto Suggestions::setupRecentApps() -> std::unique_ptr<ObjectList> {
 	const auto controller = lifetime().make_state<RecentAppsController>(
 		_controller);
+	controller->setCloseCallback([=] {
+		_closeRequests.fire({});
+	});
 	_recentAppsShows = [=](not_null<PeerData*> peer) {
 		return controller->shown(peer);
 	};
@@ -1979,7 +2605,7 @@ auto Suggestions::setupRecentApps() -> std::unique_ptr<ObjectList> {
 	};
 
 	raw->chosen.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_persist = false;
 	}, list->lifetime());
 
@@ -2029,13 +2655,13 @@ auto Suggestions::setupPopularApps() -> std::unique_ptr<ObjectList> {
 	};
 
 	raw->chosen.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_persist = true;
 	}, list->lifetime());
 
-	_tab.value() | rpl::filter(
-		rpl::mappers::_1 == Tab::Apps
-	) | rpl::start_with_next([=] {
+	_key.value() | rpl::filter(
+		rpl::mappers::_1 == Key{ Tab::Apps }
+	) | rpl::on_next([=] {
 		controller->load();
 	}, list->lifetime());
 
@@ -2070,7 +2696,7 @@ auto Suggestions::setupObjectList(
 	};
 
 	controller->chosen(
-	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+	) | rpl::on_next([=](not_null<PeerData*> peer) {
 		raw->chosen.fire_copy(peer);
 	}, lifetime);
 
@@ -2085,7 +2711,7 @@ auto Suggestions::setupObjectList(
 	};
 
 	list->scrollToRequests(
-	) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
+	) | rpl::on_next([=](Ui::ScrollToRequest request) {
 		const auto add = addToScroll ? addToScroll() : 0;
 		scroll->scrollToY(request.ymin + add, request.ymax + add);
 	}, list->lifetime());
@@ -2109,13 +2735,13 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupEmpty(
 	auto content = object_ptr<SearchEmpty>(
 		parent,
 		icon,
-		std::move(text) | Ui::Text::ToWithEntities());
+		std::move(text) | rpl::map(tr::marked));
 
 	const auto raw = content.data();
 	rpl::combine(
 		_chatsScroll->heightValue(),
 		_topPeersWrap->heightValue()
-	) | rpl::start_with_next([=](int height, int top) {
+	) | rpl::on_next([=](int height, int top) {
 		raw->setMinimalHeight(height - top);
 	}, raw->lifetime());
 
@@ -2126,7 +2752,7 @@ object_ptr<Ui::SlideWrap<>> Suggestions::setupEmpty(
 
 	result->toggledValue() | rpl::filter([=](bool shown) {
 		return shown && _controller->session().data().chatsListLoaded();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		raw->animate();
 	}, raw->lifetime());
 
@@ -2214,7 +2840,7 @@ rpl::producer<TopPeersList> TopPeersContent(
 			| Flag::Photo
 			| Flag::Notifications
 			| Flag::OnlineStatus
-		) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+		) | rpl::on_next([=](const Data::PeerUpdate &update) {
 			const auto peer = update.peer;
 			if (peer->isSelf()) {
 				return;
@@ -2263,7 +2889,7 @@ rpl::producer<TopPeersList> TopPeersContent(
 		}, lifetime);
 
 		session->data().unreadBadgeChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto changed = false;
 			auto &entries = state->data.entries;
 			for (const auto &[peer, data] : state->indices) {
@@ -2304,7 +2930,7 @@ object_ptr<Ui::BoxContent> StarsExamplesBox(
 		});
 
 		raw->load();
-		raw->chosen() | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		raw->chosen() | rpl::on_next([=](not_null<PeerData*> peer) {
 			if (const auto user = peer->asUser()) {
 				if (const auto info = user->botInfo.get()) {
 					if (info->hasMainApp) {
@@ -2326,4 +2952,21 @@ object_ptr<Ui::BoxContent> StarsExamplesBox(
 	return Box<PeerListBox>(std::move(controller), std::move(initBox));
 }
 
+object_ptr<Ui::BoxContent> PopularAppsAboutBox(
+		not_null<Window::SessionController*> window) {
+	return Ui::MakeInformBox({
+		.text = tr::lng_popular_apps_info_text(
+			lt_bot,
+			rpl::single(tr::link(
+				u"@botfather"_q,
+				u"https://t.me/botfather"_q)),
+			lt_link,
+			tr::lng_popular_apps_info_here(
+				tr::url(tr::lng_popular_apps_info_url(tr::now))),
+			tr::rich),
+		.confirmText = tr::lng_popular_apps_info_confirm(),
+		.title = tr::lng_popular_apps_info_title(),
+	});
+}
+
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index be868b77ab03fc..d060895defcd89 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -8,7 +8,9 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "base/object_ptr.h"
+#include "base/timer.h"
 #include "dialogs/ui/top_peers_strip.h"
+#include "ui/controls/swipe_handler_data.h"
 #include "ui/effects/animations.h"
 #include "ui/rp_widget.h"
 
@@ -18,12 +20,25 @@ namespace Data {
 class Thread;
 } // namespace Data
 
+namespace Info {
+class WrapWidget;
+} // namespace Info
+
 namespace Main {
 class Session;
 } // namespace Main
 
+namespace Storage {
+enum class SharedMediaType : signed char;
+} // namespace Storage
+
+namespace Ui::Controls {
+struct SwipeHandlerArgs;
+} // namespace Ui::Controls
+
 namespace Ui {
 class BoxContent;
+class ScrollArea;
 class ElasticScroll;
 class SettingsSlider;
 class VerticalLayout;
@@ -37,6 +52,10 @@ class SessionController;
 
 namespace Dialogs {
 
+class InnerWidget;
+class PostsSearch;
+class PostsSearchIntro;
+struct PostsSearchIntroState;
 enum class SearchEmptyIcon;
 
 struct RecentPeersList {
@@ -55,6 +74,9 @@ class Suggestions final : public Ui::RpWidget {
 	void selectJump(Qt::Key direction, int pageSize = 0);
 	void chooseRow();
 
+	bool consumeSearchQuery(const QString &query);
+	[[nodiscard]] rpl::producer<> clearSearchQueryRequests() const;
+
 	[[nodiscard]] Data::Thread *updateFromParentDrag(QPoint globalPosition);
 	void dragLeft();
 
@@ -88,14 +110,25 @@ class Suggestions final : public Ui::RpWidget {
 	-> rpl::producer<not_null<PeerData*>> {
 		return _popularApps->chosen.events();
 	}
+	[[nodiscard]] auto openBotMainAppRequests() const
+	-> rpl::producer<not_null<PeerData*>> {
+		return _openBotMainAppRequests.events();
+	}
+	[[nodiscard]] rpl::producer<> closeRequests() const {
+		return _closeRequests.events();
+	}
 
 	class ObjectListController;
 
 private:
+	using MediaType = Storage::SharedMediaType;
 	enum class Tab : uchar {
 		Chats,
 		Channels,
 		Apps,
+		Posts,
+		Media,
+		Downloads,
 	};
 	enum class JumpResult : uchar {
 		NotApplied,
@@ -103,6 +136,14 @@ class Suggestions final : public Ui::RpWidget {
 		AppliedAndOut,
 	};
 
+	struct Key {
+		Tab tab = Tab::Chats;
+		MediaType mediaType = {};
+
+		friend inline auto operator<=>(Key, Key) = default;
+		friend inline bool operator==(Key, Key) = default;
+	};
+
 	struct ObjectList {
 		not_null<Ui::SlideWrap<PeerListContent>*> wrap;
 		rpl::variable<int> count;
@@ -114,6 +155,14 @@ class Suggestions final : public Ui::RpWidget {
 		rpl::event_stream<not_null<PeerData*>> chosen;
 	};
 
+	struct MediaList {
+		Info::WrapWidget *wrap = nullptr;
+		rpl::variable<int> count;
+	};
+
+	[[nodiscard]] static std::vector<Key> TabKeysFor(
+		not_null<Window::SessionController*> controller);
+
 	void paintEvent(QPaintEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 
@@ -121,6 +170,9 @@ class Suggestions final : public Ui::RpWidget {
 	void setupChats();
 	void setupChannels();
 	void setupApps();
+	void reinstallSwipe(not_null<Ui::ElasticScroll*>);
+	[[nodiscard]] auto generateIncompleteSwipeArgs()
+	-> Ui::Controls::SwipeHandlerArgs;
 
 	void selectJumpChats(Qt::Key direction, int pageSize);
 	void selectJumpChannels(Qt::Key direction, int pageSize);
@@ -156,17 +208,29 @@ class Suggestions final : public Ui::RpWidget {
 		SearchEmptyIcon icon,
 		rpl::producer<QString> text);
 
-	void switchTab(Tab tab);
+	void switchTab(Key key);
 	void startShownAnimation(bool shown, Fn<void()> finish);
-	void startSlideAnimation(Tab was, Tab now);
+	void startSlideAnimation(Key was, Key now);
+	void ensureContent(Key key);
 	void finishShow();
 
 	void handlePressForChatPreview(PeerId id, Fn<void(bool)> callback);
+	void updateControlsGeometry();
+	void applySearchQuery();
+
+	void setupPostsSearch();
+	void setPostsSearchQuery(const QString &query);
+	void setupPostsResults();
+	void setupPostsIntro(const PostsSearchIntroState &intro);
+	void updatePostsSearchVisibleRange();
 
 	const not_null<Window::SessionController*> _controller;
 
-	const std::unique_ptr<Ui::SettingsSlider> _tabs;
-	rpl::variable<Tab> _tab = Tab::Chats;
+	const std::unique_ptr<Ui::ScrollArea> _tabsScroll;
+	const not_null<Ui::SettingsSlider*> _tabs;
+	Ui::Animations::Simple _tabsScrollAnimation;
+	const std::vector<Key> _tabKeys;
+	rpl::variable<Key> _key;
 
 	const std::unique_ptr<Ui::ElasticScroll> _chatsScroll;
 	const not_null<Ui::VerticalLayout*> _chatsContent;
@@ -174,6 +238,8 @@ class Suggestions final : public Ui::RpWidget {
 	const not_null<Ui::SlideWrap<TopPeersStrip>*> _topPeersWrap;
 	const not_null<TopPeersStrip*> _topPeers;
 	rpl::event_stream<not_null<PeerData*>> _topPeerChosen;
+	rpl::event_stream<not_null<PeerData*>> _openBotMainAppRequests;
+	rpl::event_stream<> _closeRequests;
 
 	const std::unique_ptr<ObjectList> _recent;
 
@@ -190,11 +256,22 @@ class Suggestions final : public Ui::RpWidget {
 	const std::unique_ptr<Ui::ElasticScroll> _appsScroll;
 	const not_null<Ui::VerticalLayout*> _appsContent;
 
+	std::unique_ptr<PostsSearch> _postsSearch;
+	const std::unique_ptr<Ui::ElasticScroll> _postsScroll;
+	const not_null<Ui::RpWidget*> _postsWrap;
+	PostsSearchIntro *_postsSearchIntro = nullptr;
+	InnerWidget *_postsContent = nullptr;
+
 	rpl::producer<> _recentAppsRefreshed;
 	Fn<bool(not_null<PeerData*>)> _recentAppsShows;
 	const std::unique_ptr<ObjectList> _recentApps;
 	const std::unique_ptr<ObjectList> _popularApps;
 
+	base::flat_map<Key, MediaList> _mediaLists;
+	rpl::event_stream<> _clearSearchQueryRequests;
+	QString _searchQuery;
+	base::Timer _searchQueryTimer;
+
 	Ui::Animations::Simple _shownAnimation;
 	Fn<void()> _showFinished;
 	bool _hidden = false;
@@ -205,6 +282,9 @@ class Suggestions final : public Ui::RpWidget {
 	QPixmap _slideLeft;
 	QPixmap _slideRight;
 
+	Ui::Controls::SwipeBackResult _swipeBackData;
+	rpl::lifetime _swipeLifetime;
+
 	int _slideLeftTop = 0;
 	int _slideRightTop = 0;
 
@@ -219,4 +299,7 @@ class Suggestions final : public Ui::RpWidget {
 [[nodiscard]] object_ptr<Ui::BoxContent> StarsExamplesBox(
 	not_null<Window::SessionController*> window);
 
+[[nodiscard]] object_ptr<Ui::BoxContent> PopularAppsAboutBox(
+	not_null<Window::SessionController*> window);
+
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
new file mode 100644
index 00000000000000..4513752cb0e6ac
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
@@ -0,0 +1,645 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/ui/dialogs_top_bar_suggestion_content.h"
+
+#include "base/call_delayed.h"
+#include "data/data_authorization.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "settings/settings_common.h"
+#include "ui/effects/animation_value.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/power_saving.h"
+#include "ui/rect.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_custom_emoji.h"
+#include "ui/ui_rpl_filter.h"
+#include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_chat.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_layers.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
+
+namespace Dialogs {
+namespace {
+
+[[nodiscard]] int PillRadius() {
+	const auto padding = st::msgReplyPadding.top();
+	return (padding
+		+ st::semiboldTextStyle.font->height
+		+ st::dialogsTopBarSuggestionAboutStyle.font->height
+		+ padding) / 2;
+}
+
+void PaintTopFade(QPainter &p, int outerWidth, int fadeHeight) {
+	if (fadeHeight <= 0) {
+		return;
+	}
+	auto transparent = st::dialogsBg->c;
+	transparent.setAlpha(0);
+	auto grad = QLinearGradient(0, 0, 0, fadeHeight);
+	grad.setColorAt(0, st::dialogsBg->c);
+	grad.setColorAt(1, transparent);
+	p.fillRect(QRect(0, 0, outerWidth, fadeHeight), grad);
+}
+
+[[nodiscard]] QString FormatUnconfirmedAuthMessage(
+		const std::vector<Data::UnreviewedAuth> &list) {
+	if (list.empty()) {
+		return QString();
+	} else if (list.size() == 1) {
+		const auto &auth = list.at(0);
+		return tr::lng_unconfirmed_auth_single(
+			tr::now,
+			lt_from,
+			auth.device,
+			lt_country,
+			auth.location);
+	}
+	auto commonLocation = list.at(0).location;
+	for (auto i = 1; i < list.size(); ++i) {
+		if (commonLocation != list.at(i).location) {
+			commonLocation.clear();
+			break;
+		}
+	}
+	if (commonLocation.isEmpty()) {
+		return tr::lng_unconfirmed_auth_multiple(
+			tr::now,
+			lt_count,
+			list.size());
+	}
+	return tr::lng_unconfirmed_auth_multiple_from(
+		tr::now,
+		lt_count,
+		list.size(),
+		lt_country,
+		commonLocation);
+}
+
+void PaintPillTopSheen(QPainter &p, const QRect &pill, int radius) {
+	if (pill.isEmpty() || st::dialogsBg->c.lightness() >= 128) {
+		return;
+	}
+	auto top = QColor(255, 255, 255, 40);
+	auto mid = QColor(255, 255, 255, 0);
+	auto bottom = QColor(255, 255, 255, 20);
+	auto grad = QLinearGradient(0, pill.top(), 0, pill.bottom());
+	grad.setColorAt(0., top);
+	grad.setColorAt(0.5, mid);
+	grad.setColorAt(1., bottom);
+	p.setPen(QPen(QBrush(grad), st::lineWidth));
+	p.setBrush(Qt::NoBrush);
+	const auto half = 0.5 * st::lineWidth;
+	const auto stroke = QRectF(pill).adjusted(half, half, -half, -half);
+	p.drawRoundedRect(stroke, radius - half, radius - half);
+}
+
+} // namespace
+
+UnconfirmedAuthWrap::UnconfirmedAuthWrap(
+	not_null<Ui::RpWidget*> parent,
+	object_ptr<Ui::VerticalLayout> &&child)
+: Ui::SlideWrap<Ui::VerticalLayout>(parent, std::move(child))
+, _shadow(st::dialogsTopBarSuggestionShadow) {
+	paintRequest() | rpl::on_next([=] {
+		if (!_collapseSnapshot.isNull()) {
+			auto p = QPainter(this);
+			p.drawPixmap(0, 0, _collapseSnapshot);
+		}
+	}, lifetime());
+}
+
+rpl::producer<int> UnconfirmedAuthWrap::desiredHeightValue() const {
+	return entity()->heightValue();
+}
+
+void UnconfirmedAuthWrap::setCollapseProgress(
+		rpl::producer<float64> progress) {
+	std::move(progress) | rpl::on_next([=](float64 value) {
+		if (_collapseProgress == value) {
+			return;
+		}
+		_collapseProgress = value;
+		if (value == 0.) {
+			releaseCollapseSnapshot();
+		}
+		resizeToWidth(width());
+		update();
+	}, lifetime());
+}
+
+void UnconfirmedAuthWrap::prepareCollapseSnapshot() {
+	_collapseSnapshot = Ui::GrabWidget(this);
+	if (const auto w = wrapped()) {
+		w->hide();
+	}
+	update();
+}
+
+void UnconfirmedAuthWrap::releaseCollapseSnapshot() {
+	if (_collapseSnapshot.isNull()) {
+		return;
+	}
+	_collapseSnapshot = QPixmap();
+	if (const auto w = wrapped()) {
+		w->show();
+	}
+}
+
+int UnconfirmedAuthWrap::resizeGetHeight(int newWidth) {
+	if (!_collapseSnapshot.isNull()) {
+		const auto fullHeight = int(_collapseSnapshot.height()
+			/ _collapseSnapshot.devicePixelRatio());
+		return int(base::SafeRound(
+			fullHeight * (1. - _collapseProgress)));
+	}
+	if (const auto w = wrapped()) {
+		w->resizeToWidth(newWidth);
+	}
+	return wrapped() ? wrapped()->height() : 0;
+}
+
+not_null<UnconfirmedAuthWrap*> CreateUnconfirmedAuthContent(
+		not_null<Ui::RpWidget*> parent,
+		rpl::producer<std::vector<Data::UnreviewedAuth>> list,
+		Fn<void(bool)> callback,
+		rpl::producer<float64> collapseProgress) {
+	const auto wrap = Ui::CreateChild<UnconfirmedAuthWrap>(
+		parent,
+		object_ptr<Ui::VerticalLayout>(parent));
+	wrap->setCollapseProgress(std::move(collapseProgress));
+	const auto content = wrap->entity();
+	const auto &margins = st::dialogsTopBarSuggestionMargins;
+	content->paintOn([=](QPainter &p) {
+		const auto outer = content->rect();
+		const auto pill = outer - margins;
+		PaintTopFade(p, outer.width(), margins.top() + pill.height() / 2);
+		if (pill.isEmpty()) {
+			return;
+		}
+		const auto radius = std::min({
+			PillRadius(),
+			pill.width() / 2,
+			pill.height() / 2,
+		});
+		wrap->shadow().paint(p, pill, radius);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(st::dialogsBg);
+		p.setPen(Qt::NoPen);
+		p.drawRoundedRect(pill, radius, radius);
+		PaintPillTopSheen(p, pill, radius);
+	});
+
+	const auto &basePadding = st::dialogsUnconfirmedAuthPadding;
+	const auto padding = QMargins(
+		margins.left() + basePadding.left(),
+		basePadding.top(),
+		margins.right() + basePadding.right(),
+		basePadding.bottom());
+
+	Ui::AddSkip(content, margins.top());
+	Ui::AddSkip(content);
+
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_unconfirmed_auth_title(),
+			st::dialogsUnconfirmedAuthTitle),
+		padding,
+		style::al_top);
+
+	Ui::AddSkip(content);
+
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			std::move(list) | rpl::map(FormatUnconfirmedAuthMessage),
+			st::dialogsUnconfirmedAuthAbout),
+		padding,
+		style::al_top)->setTryMakeSimilarLines(true);
+
+	Ui::AddSkip(content);
+	const auto buttons = content->add(object_ptr<Ui::FixedHeightWidget>(
+		content,
+		st::dialogsUnconfirmedAuthButton.height));
+	const auto yes = Ui::CreateChild<Ui::RoundButton>(
+		buttons,
+		tr::lng_unconfirmed_auth_confirm(),
+		st::dialogsUnconfirmedAuthButton);
+	const auto no = Ui::CreateChild<Ui::RoundButton>(
+		buttons,
+		tr::lng_unconfirmed_auth_deny(),
+		st::dialogsUnconfirmedAuthButtonNo);
+	yes->setClickedCallback([=] {
+		wrap->toggle(false, anim::type::normal);
+		base::call_delayed(st::universalDuration, wrap, [=] {
+			callback(true);
+		});
+	});
+	no->setClickedCallback([=] {
+		wrap->toggle(false, anim::type::normal);
+		base::call_delayed(st::universalDuration, wrap, [=] {
+			callback(false);
+		});
+	});
+	buttons->sizeValue(
+	) | rpl::filter_size(
+	) | rpl::on_next([=](const QSize &s) {
+		const auto halfWidth = (s.width() - rect::m::sum::h(padding)) / 2;
+		yes->moveToLeft(
+			padding.left() + (halfWidth - yes->width()) / 2,
+			0);
+		no->moveToLeft(
+			padding.left() + halfWidth + (halfWidth - no->width()) / 2,
+			0);
+	}, buttons->lifetime());
+	Ui::AddSkip(content);
+	Ui::AddSkip(content, margins.bottom());
+
+	return wrap;
+}
+
+TopBarSuggestionContent::TopBarSuggestionContent(
+	not_null<Ui::RpWidget*> parent,
+	Fn<bool()> emojiPaused)
+: Ui::RippleButton(parent, st::defaultRippleAnimationBgOver)
+, _titleSt(st::semiboldTextStyle)
+, _contentTitleSt(st::dialogsTopBarSuggestionTitleStyle)
+, _contentTextSt(st::dialogsTopBarSuggestionAboutStyle)
+, _shadow(st::dialogsTopBarSuggestionShadow)
+, _emojiPaused(std::move(emojiPaused)) {
+	_leftPadding = st::dialogsTopBarLeftPadding;
+	setRightIcon(RightIcon::Close);
+}
+
+void TopBarSuggestionContent::setRightIcon(RightIcon icon) {
+	_rightButton = nullptr;
+	if (icon == _rightIcon) {
+		return;
+	}
+	_rightHide = nullptr;
+	_rightArrow = nullptr;
+	_rightIcon = icon;
+	const auto &margins = st::dialogsTopBarSuggestionMargins;
+	if (icon == RightIcon::Close) {
+		_rightHide = base::make_unique_q<Ui::IconButton>(
+			this,
+			st::dialogsCancelSearchInPeer);
+		const auto rightHide = _rightHide.get();
+		sizeValue() | rpl::filter_size(
+		) | rpl::on_next([=](const QSize &s) {
+			const auto &button = st::dialogsCancelSearchInPeer;
+			const auto padding = PillRadius()
+				- button.rippleAreaSize / 2;
+			const auto pillHeight = s.height() - rect::m::sum::v(margins);
+			rightHide->moveToRight(
+				margins.right() + padding - button.rippleAreaPosition.x(),
+				margins.top()
+					+ (pillHeight - button.rippleAreaSize) / 2
+					- button.rippleAreaPosition.y());
+		}, rightHide->lifetime());
+		rightHide->show();
+	} else if (icon == RightIcon::Arrow) {
+		_rightArrow = base::make_unique_q<Ui::IconButton>(
+			this,
+			st::backButton);
+		const auto arrow = _rightArrow.get();
+		arrow->setIconOverride(
+			&st::settingsPremiumArrow,
+			&st::settingsPremiumArrowOver);
+		arrow->setAttribute(Qt::WA_TransparentForMouseEvents);
+		sizeValue() | rpl::filter_size(
+		) | rpl::on_next([=](const QSize &s) {
+			const auto &point = st::settingsPremiumArrowShift;
+			const auto pillRight = s.width() - margins.right();
+			const auto pillHeight = s.height() - rect::m::sum::v(margins);
+			arrow->moveToLeft(
+				pillRight - arrow->width(),
+				margins.top()
+					+ point.y()
+					+ (pillHeight - arrow->height()) / 2);
+		}, arrow->lifetime());
+		arrow->show();
+	}
+	resizeToWidth(width());
+}
+
+void TopBarSuggestionContent::setRightButton(
+		rpl::producer<TextWithEntities> text,
+		Fn<void()> callback) {
+	_rightHide = nullptr;
+	_rightArrow = nullptr;
+	_rightIcon = RightIcon::None;
+	if (!text) {
+		_rightButton = nullptr;
+		return;
+	}
+	using namespace Ui;
+	_rightButton = base::make_unique_q<RoundButton>(
+		this,
+		rpl::single(QString()),
+		st::dialogsTopBarRightButton);
+	_rightButton->setText(std::move(text));
+	const auto &margins = st::dialogsTopBarSuggestionMargins;
+	rpl::combine(
+		sizeValue(),
+		_rightButton->sizeValue()
+	) | rpl::on_next([=](QSize outer, QSize inner) {
+		const auto pillHeight = outer.height() - rect::m::sum::v(margins);
+		const auto verticalGap = (pillHeight - inner.height()) / 2;
+		_rightButton->moveToRight(
+			margins.right() + verticalGap,
+			margins.top() + verticalGap,
+			outer.width());
+	}, _rightButton->lifetime());
+	_rightButton->setFullRadius(true);
+	_rightButton->setClickedCallback(std::move(callback));
+	_rightButton->show();
+}
+
+void TopBarSuggestionContent::draw(QPainter &p) {
+	const auto outer = Ui::RpWidget::rect();
+	const auto &margins = st::dialogsTopBarSuggestionMargins;
+	const auto pill = outer - margins;
+
+	PaintTopFade(p, outer.width(), margins.top() + pill.height() / 2);
+
+	if (pill.isEmpty()) {
+		return;
+	}
+	const auto radius = std::min({
+		PillRadius(),
+		pill.width() / 2,
+		pill.height() / 2,
+	});
+
+	_shadow.paint(p, pill, radius);
+
+	auto hq = PainterHighQualityEnabler(p);
+	p.setBrush(st::dialogsBg);
+	p.setPen(Qt::NoPen);
+	p.drawRoundedRect(pill, radius, radius);
+	PaintPillTopSheen(p, pill, radius);
+
+	auto clipPath = QPainterPath();
+	clipPath.addRoundedRect(pill, radius, radius);
+	p.setClipPath(clipPath);
+	Ui::RippleButton::paintRipple(p, 0, 0);
+	p.setClipping(false);
+
+	const auto leftPadding = _leftPadding + margins.left();
+	const auto rightPadding = margins.right();
+	const auto topPadding = st::msgReplyPadding.top() + margins.top();
+	const auto availableWidthNoPhoto = outer.width()
+		- (_rightArrow
+			? (_rightArrow->width() / 4 * 3) // Takes full height.
+			: 0)
+		- leftPadding
+		- rightPadding;
+	const auto availableWidth = availableWidthNoPhoto
+		- (_rightHide ? _rightHide->width() : 0);
+	const auto titleRight = leftPadding;
+	const auto hasSecondLineTitle = availableWidth < _contentTitle.maxWidth();
+	const auto paused = On(PowerSaving::kEmojiChat)
+		|| (_emojiPaused && _emojiPaused());
+	p.setPen(st::windowActiveTextFg);
+	p.setPen(st::windowFg);
+	{
+		const auto left = leftPadding;
+		const auto top = topPadding;
+		_contentTitle.draw(p, {
+			.position = QPoint(left, top),
+			.outerWidth = hasSecondLineTitle
+				? availableWidth
+				: (availableWidth - titleRight),
+			.availableWidth = availableWidth,
+			.pausedEmoji = paused,
+			.elisionLines = hasSecondLineTitle ? 2 : 1,
+		});
+	}
+	{
+		const auto left = leftPadding;
+		const auto top = hasSecondLineTitle
+			? (topPadding
+				+ _titleSt.font->height
+				+ _contentTitleSt.font->height)
+			: topPadding + _titleSt.font->height;
+		const auto lineHeight = _contentTextSt.font->height;
+		const auto lineLayout = [=](int line) -> Ui::Text::LineGeometry {
+			line++;
+			const auto diff = (st::sponsoredMessageBarMaxHeight)
+				- line * lineHeight;
+			if (diff < 3 * lineHeight) {
+				return {
+					.width = availableWidth,
+					.elided = true,
+				};
+			} else if (diff < 2 * lineHeight) {
+				return {};
+			}
+			return { .width = availableWidth };
+		};
+		p.setPen(_descriptionColorOverride.value_or(st::windowSubTextFg->c));
+		_contentText.draw(p, {
+			.position = QPoint(left, top),
+			.outerWidth = availableWidth,
+			.availableWidth = availableWidth,
+			.geometry = Ui::Text::GeometryDescriptor{
+				.layout = std::move(lineLayout),
+			},
+			.pausedEmoji = paused,
+		});
+	}
+}
+
+void TopBarSuggestionContent::setContent(
+		TextWithEntities title,
+		TextWithEntities description,
+		std::optional<Ui::Text::MarkedContext> context,
+		std::optional<QColor> descriptionColorOverride) {
+	_descriptionColorOverride = descriptionColorOverride;
+	if (context) {
+		context->repaint = [=] { update(); };
+		_contentTitle.setMarkedText(
+			_contentTitleSt,
+			std::move(title),
+			kMarkupTextOptions,
+			*context);
+		_contentText.setMarkedText(
+			_contentTextSt,
+			std::move(description),
+			kMarkupTextOptions,
+			base::take(*context));
+	} else {
+		_contentTitle.setMarkedText(_contentTitleSt, std::move(title));
+		_contentText.setMarkedText(_contentTextSt, std::move(description));
+	}
+	resizeToWidth(width());
+	update();
+}
+
+void TopBarSuggestionContent::paintEvent(QPaintEvent *) {
+	auto p = QPainter(this);
+	if (!_collapseSnapshot.isNull()) {
+		p.drawPixmap(0, 0, _collapseSnapshot);
+		return;
+	}
+	draw(p);
+}
+
+void TopBarSuggestionContent::prepareCollapseSnapshot() {
+	_collapseSnapshot = Ui::GrabWidget(this);
+	for (const auto child : children()) {
+		if (const auto widget = qobject_cast<QWidget*>(child)) {
+			widget->hide();
+		}
+	}
+	update();
+}
+
+void TopBarSuggestionContent::releaseCollapseSnapshot() {
+	if (_collapseSnapshot.isNull()) {
+		return;
+	}
+	_collapseSnapshot = QPixmap();
+	for (const auto child : children()) {
+		if (const auto widget = qobject_cast<QWidget*>(child)) {
+			widget->show();
+		}
+	}
+}
+
+int TopBarSuggestionContent::resizeGetHeight(int newWidth) {
+	if (!_collapseSnapshot.isNull()) {
+		const auto fullHeight = int(_collapseSnapshot.height()
+			/ _collapseSnapshot.devicePixelRatio());
+		return int(base::SafeRound(
+			fullHeight * (1. - _collapseProgress)));
+	}
+	const auto &margins = st::dialogsTopBarSuggestionMargins;
+	const auto topPadding = st::msgReplyPadding.top();
+	const auto bottomPadding = st::msgReplyPadding.top();
+	const auto availableWidthNoPhoto = newWidth
+		- rect::m::sum::h(margins)
+		- (_rightArrow
+			? (_rightArrow->width() / 4 * 3) // Takes full height.
+			: 0)
+		- _leftPadding;
+	const auto availableWidth = availableWidthNoPhoto
+		- (_rightHide ? _rightHide->width() : 0);
+	if (availableWidth <= 0) {
+		return topPadding + bottomPadding + rect::m::sum::v(margins);
+	}
+	const auto hasSecondLineTitle
+		= (availableWidth < _contentTitle.maxWidth());
+	const auto textTop = hasSecondLineTitle
+		? (topPadding
+			+ _titleSt.font->height
+			+ _contentTitleSt.font->height)
+		: (topPadding + _titleSt.font->height);
+
+	const auto lineHeight = _contentTextSt.font->height;
+	auto lineLayout = [=](int line) -> Ui::Text::LineGeometry {
+		line++;
+		const auto diff = (st::sponsoredMessageBarMaxHeight)
+			- line * lineHeight;
+		if (diff < 3 * lineHeight) {
+			return {
+				.width = availableWidth,
+				.elided = true,
+			};
+		} else if (diff < 2 * lineHeight) {
+			return {};
+		}
+		return { .width = availableWidth };
+	};
+	const auto dims = _contentText.countDimensions(
+		Ui::Text::GeometryDescriptor{ .layout = std::move(lineLayout) });
+	const auto natural = textTop + dims.height + bottomPadding;
+	const auto capped = std::min(
+		natural,
+		st::sponsoredMessageBarMaxHeight);
+	const auto withMargins = capped + rect::m::sum::v(margins);
+	return int(base::SafeRound(withMargins * (1. - _collapseProgress)));
+}
+
+void TopBarSuggestionContent::setCollapseProgress(
+		rpl::producer<float64> progress) {
+	std::move(progress) | rpl::on_next([=](float64 value) {
+		if (_collapseProgress == value) {
+			return;
+		}
+		_collapseProgress = value;
+		if (value == 0.) {
+			releaseCollapseSnapshot();
+		}
+		resizeToWidth(width());
+		update();
+	}, lifetime());
+}
+
+void TopBarSuggestionContent::setHideCallback(Fn<void()> hideCallback) {
+	Expects(_rightHide != nullptr);
+	_rightHide->setClickedCallback(std::move(hideCallback));
+}
+
+void TopBarSuggestionContent::setLeadingWidget(Ui::RpWidget *widget) {
+	_leadingWidgetLifetime.destroy();
+	if (_leadingWidget && _leadingWidget != widget) {
+		_leadingWidget->deleteLater();
+	}
+	_leadingWidget = widget;
+	const auto basePadding = st::dialogsTopBarLeftPadding;
+	if (!widget) {
+		if (_leftPadding != basePadding) {
+			_leftPadding = basePadding;
+			resizeToWidth(width());
+			update();
+		}
+		return;
+	}
+	widget->setParent(this);
+	widget->setAttribute(Qt::WA_TransparentForMouseEvents);
+	const auto &margins = st::dialogsTopBarSuggestionMargins;
+	const auto &row = st::defaultDialogRow;
+	sizeValue() | rpl::filter_size(
+	) | rpl::on_next([=](const QSize &s) {
+		widget->raise();
+		widget->show();
+		const auto pillHeight = s.height() - rect::m::sum::v(margins);
+		widget->moveToLeft(
+			row.padding.left() + (row.photoSize - widget->width()) / 2,
+			margins.top() + (pillHeight - widget->height()) / 2);
+	}, _leadingWidgetLifetime);
+	const auto padding = row.nameLeft - margins.left();
+	if (_leftPadding != padding) {
+		_leftPadding = padding;
+		resizeToWidth(width());
+		update();
+	}
+}
+
+const style::TextStyle & TopBarSuggestionContent::contentTitleSt() const {
+	return _contentTitleSt;
+}
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h
new file mode 100644
index 00000000000000..a68b7982727ff0
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h
@@ -0,0 +1,129 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+
+namespace Ui {
+class DynamicImage;
+class IconButton;
+} // namespace Ui
+
+namespace Ui::Text {
+struct MarkedContext;
+} // namespace Ui::Text
+
+namespace Data {
+struct UnreviewedAuth;
+} // namespace Data
+
+namespace Dialogs {
+
+class UnconfirmedAuthWrap : public Ui::SlideWrap<Ui::VerticalLayout> {
+public:
+	UnconfirmedAuthWrap(
+		not_null<Ui::RpWidget*> parent,
+		object_ptr<Ui::VerticalLayout> &&child);
+
+	[[nodiscard]] const Ui::BoxShadow &shadow() const {
+		return _shadow;
+	}
+
+	[[nodiscard]] rpl::producer<int> desiredHeightValue() const override;
+
+	void setCollapseProgress(rpl::producer<float64> progress);
+	void prepareCollapseSnapshot();
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+
+private:
+	void releaseCollapseSnapshot();
+
+	float64 _collapseProgress = 0.;
+	QPixmap _collapseSnapshot;
+	Ui::BoxShadow _shadow;
+
+};
+
+not_null<UnconfirmedAuthWrap*> CreateUnconfirmedAuthContent(
+		not_null<Ui::RpWidget*> parent,
+		rpl::producer<std::vector<Data::UnreviewedAuth>> list,
+		Fn<void(bool)> callback,
+		rpl::producer<float64> collapseProgress);
+
+class TopBarSuggestionContent : public Ui::RippleButton {
+public:
+	enum class RightIcon {
+		None,
+		Close,
+		Arrow,
+	};
+
+	TopBarSuggestionContent(
+		not_null<Ui::RpWidget*> parent,
+		Fn<bool()> emojiPaused = nullptr);
+
+	void setContent(
+		TextWithEntities title,
+		TextWithEntities description,
+		std::optional<Ui::Text::MarkedContext> context = std::nullopt,
+		std::optional<QColor> descriptionColorOverride = std::nullopt);
+
+	void setHideCallback(Fn<void()>);
+	void setRightIcon(RightIcon);
+	void setRightButton(
+		rpl::producer<TextWithEntities> text,
+		Fn<void()> callback);
+	void setLeadingWidget(Ui::RpWidget *widget);
+	void setCollapseProgress(rpl::producer<float64> progress);
+	void prepareCollapseSnapshot();
+
+	[[nodiscard]] const style::TextStyle &contentTitleSt() const;
+
+protected:
+	void paintEvent(QPaintEvent *) override;
+	int resizeGetHeight(int newWidth) override;
+
+private:
+	void draw(QPainter &p);
+	void releaseCollapseSnapshot();
+
+	const style::TextStyle &_titleSt;
+	const style::TextStyle &_contentTitleSt;
+	const style::TextStyle &_contentTextSt;
+
+	Ui::Text::String _contentTitle;
+	Ui::Text::String _contentText;
+	float64 _collapseProgress = 0.;
+	QPixmap _collapseSnapshot;
+	std::optional<QColor> _descriptionColorOverride;
+
+	Ui::BoxShadow _shadow;
+
+	base::unique_qptr<Ui::IconButton> _rightHide;
+	base::unique_qptr<Ui::IconButton> _rightArrow;
+	base::unique_qptr<Ui::RoundButton> _rightButton;
+	QPointer<Ui::RpWidget> _leadingWidget;
+	rpl::lifetime _leadingWidgetLifetime;
+	Fn<void()> _hideCallback;
+	Fn<bool()> _emojiPaused;
+
+	int _leftPadding = 0;
+
+	RightIcon _rightIcon = RightIcon::None;
+
+	std::shared_ptr<Ui::DynamicImage> _rightPhoto;
+	QImage _rightPhotoImage;
+
+};
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_topics_view.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_topics_view.cpp
index cd312fd85ea9be..67e3d73e587f5c 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_topics_view.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_topics_view.cpp
@@ -8,10 +8,16 @@ For license and copyright information please follow this link:
 #include "dialogs/ui/dialogs_topics_view.h"
 
 #include "dialogs/ui/dialogs_layout.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
+#include "data/data_peer.h"
+#include "data/data_saved_messages.h"
+#include "data/data_saved_sublist.h"
+#include "data/data_session.h"
 #include "core/ui_integration.h"
 #include "lang/lang_keys.h"
+#include "main/main_session.h"
 #include "ui/painter.h"
 #include "ui/power_saving.h"
 #include "ui/text/text_options.h"
@@ -26,29 +32,35 @@ constexpr auto kIconLoopCount = 1;
 
 } // namespace
 
-TopicsView::TopicsView(not_null<Data::Forum*> forum)
-: _forum(forum) {
+TopicsView::TopicsView(Data::Forum *forum, Data::SavedMessages *monoforum)
+: _forum(forum)
+, _monoforum(monoforum) {
 }
 
 TopicsView::~TopicsView() = default;
 
 bool TopicsView::prepared() const {
-	return (_version == _forum->recentTopicsListVersion());
+	const auto version = _forum
+		? _forum->recentTopicsListVersion()
+		: _monoforum->recentSublistsListVersion();
+	return (_version == version);
 }
 
 void TopicsView::prepare(MsgId frontRootId, Fn<void()> customEmojiRepaint) {
+	Expects(_forum != nullptr);
+
 	const auto &list = _forum->recentTopics();
 	_version = _forum->recentTopicsListVersion();
 	_titles.reserve(list.size());
 	auto index = 0;
 	for (const auto &topic : list) {
 		const auto from = begin(_titles) + index;
-		const auto rootId = topic->rootId();
+		const auto key = topic->rootId().bare;
 		const auto i = ranges::find(
 			from,
 			end(_titles),
-			rootId,
-			&Title::topicRootId);
+			key,
+			&Title::key);
 		if (i != end(_titles)) {
 			if (i != from) {
 				ranges::rotate(from, i, i + 1);
@@ -58,18 +70,18 @@ void TopicsView::prepare(MsgId frontRootId, Fn<void()> customEmojiRepaint) {
 		}
 		auto &title = _titles[index++];
 		const auto unread = topic->chatListBadgesState().unread;
-		if (title.topicRootId == rootId
+		if (title.key == key
 			&& title.unread == unread
 			&& title.version == topic->titleVersion()) {
 			continue;
 		}
-		const auto context = Core::MarkedTextContext{
+		const auto context = Core::TextContext({
 			.session = &topic->session(),
-			.customEmojiRepaint = customEmojiRepaint,
+			.repaint = customEmojiRepaint,
 			.customEmojiLoopLimit = kIconLoopCount,
-		};
+		});
 		auto topicTitle = topic->titleWithIcon();
-		title.topicRootId = rootId;
+		title.key = key;
 		title.version = topic->titleVersion();
 		title.unread = unread;
 		title.title.setMarkedText(
@@ -87,7 +99,80 @@ void TopicsView::prepare(MsgId frontRootId, Fn<void()> customEmojiRepaint) {
 		_titles.pop_back();
 	}
 	const auto i = frontRootId
-		? ranges::find(_titles, frontRootId, &Title::topicRootId)
+		? ranges::find(_titles, frontRootId.bare, &Title::key)
+		: end(_titles);
+	_jumpToTopic = (i != end(_titles));
+	if (_jumpToTopic) {
+		if (i != begin(_titles)) {
+			ranges::rotate(begin(_titles), i, i + 1);
+		}
+		if (!_titles.front().unread) {
+			_jumpToTopic = false;
+		}
+	}
+	_allLoaded = _forum->topicsList()->loaded();
+}
+
+void TopicsView::prepare(PeerId frontPeerId, Fn<void()> customEmojiRepaint) {
+	Expects(_monoforum != nullptr);
+
+	const auto &list = _monoforum->recentSublists();
+	const auto manager = &_monoforum->session().data().customEmojiManager();
+	_version = _monoforum->recentSublistsListVersion();
+	_titles.reserve(list.size());
+	auto index = 0;
+	for (const auto &sublist : list) {
+		const auto from = begin(_titles) + index;
+		const auto peer = sublist->sublistPeer();
+		const auto key = peer->id.value;
+		const auto i = ranges::find(
+			from,
+			end(_titles),
+			key,
+			&Title::key);
+		if (i != end(_titles)) {
+			if (i != from) {
+				ranges::rotate(from, i, i + 1);
+			}
+		} else if (index >= _titles.size()) {
+			_titles.emplace_back();
+		}
+		auto &title = _titles[index++];
+		const auto unread = sublist->chatListBadgesState().unread;
+		if (title.key == key
+			&& title.unread == unread
+			&& title.version == peer->nameVersion()) {
+			continue;
+		}
+		const auto context = Core::TextContext({
+			.session = &sublist->session(),
+			.repaint = customEmojiRepaint,
+			.customEmojiLoopLimit = kIconLoopCount,
+		});
+		auto topicTitle = TextWithEntities().append(
+			Ui::Text::SingleCustomEmoji(
+				manager->peerUserpicEmojiData(peer),
+				u"@"_q)
+		).append(' ').append(peer->shortName());
+		title.key = key;
+		title.version = peer->nameVersion();
+		title.unread = unread;
+		title.title.setMarkedText(
+			st::dialogsTextStyle,
+			(unread
+				? Ui::Text::Colorized(
+					Ui::Text::Wrapped(
+						std::move(topicTitle),
+						EntityType::Bold))
+				: std::move(topicTitle)),
+			DialogTextOptions(),
+			context);
+	}
+	while (_titles.size() > index) {
+		_titles.pop_back();
+	}
+	const auto i = frontPeerId
+		? ranges::find(_titles, frontPeerId.value, &Title::key)
 		: end(_titles);
 	_jumpToTopic = (i != end(_titles));
 	if (_jumpToTopic) {
@@ -98,6 +183,7 @@ void TopicsView::prepare(MsgId frontRootId, Fn<void()> customEmojiRepaint) {
 			_jumpToTopic = false;
 		}
 	}
+	_allLoaded = _monoforum->chatsList()->loaded();
 }
 
 int TopicsView::jumpToTopicWidth() const {
@@ -123,10 +209,13 @@ void TopicsView::paint(
 	rect.setWidth(rect.width() - _lastTopicJumpGeometry.rightCut);
 	auto skipBig = _jumpToTopic && !context.active;
 	if (_titles.empty()) {
+		const auto text = _allLoaded
+			? tr::lng_filters_no_chats(tr::now)
+			: tr::lng_contacts_loading(tr::now);
 		p.drawText(
 			rect.x(),
 			rect.y() + st::normalFont->ascent,
-			tr::lng_contacts_loading(tr::now));
+			text);
 		return;
 	}
 	for (const auto &title : _titles) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_topics_view.h b/Telegram/SourceFiles/dialogs/ui/dialogs_topics_view.h
index b90c3d54171ab7..9dd5d3aa7b310e 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_topics_view.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_topics_view.h
@@ -16,6 +16,8 @@ struct DialogRow;
 namespace Data {
 class Forum;
 class ForumTopic;
+class SavedMessages;
+class SavedSublist;
 } // namespace Data
 
 namespace Ui {
@@ -59,15 +61,19 @@ void FillJumpToLastPrepared(QPainter &p, JumpToLastPrepared context);
 
 class TopicsView final {
 public:
-	explicit TopicsView(not_null<Data::Forum*> forum);
+	TopicsView(Data::Forum *forum, Data::SavedMessages *monoforum);
 	~TopicsView();
 
-	[[nodiscard]] not_null<Data::Forum*> forum() const {
+	[[nodiscard]] Data::Forum *forum() const {
 		return _forum;
 	}
+	[[nodiscard]] Data::SavedMessages *monoforum() const {
+		return _monoforum;
+	}
 
 	[[nodiscard]] bool prepared() const;
 	void prepare(MsgId frontRootId, Fn<void()> customEmojiRepaint);
+	void prepare(PeerId frontPeerId, Fn<void()> customEmojiRepaint);
 
 	[[nodiscard]] int jumpToTopicWidth() const;
 
@@ -99,7 +105,7 @@ class TopicsView final {
 private:
 	struct Title {
 		Text::String title;
-		MsgId topicRootId = 0;
+		uint64 key = 0;
 		int version = -1;
 		bool unread = false;
 	};
@@ -107,13 +113,15 @@ class TopicsView final {
 	[[nodiscard]] QImage topicJumpRippleMask(
 		not_null<TopicJumpCache*> topicJumpCache) const;
 
-	const not_null<Data::Forum*> _forum;
+	Data::Forum * const _forum = nullptr;
+	Data::SavedMessages * const _monoforum = nullptr;
 
 	mutable std::vector<Title> _titles;
 	mutable std::unique_ptr<RippleAnimation> _ripple;
 	JumpToLastGeometry _lastTopicJumpGeometry;
 	int _version = -1;
 	bool _jumpToTopic = false;
+	bool _allLoaded = false;
 
 	rpl::lifetime _lifetime;
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.cpp
index 188d512e8da3e4..9f970a30d9c6c7 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_video_userpic.cpp
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 #include "data/data_photo_media.h"
 #include "data/data_file_origin.h"
 #include "data/data_session.h"
+#include "dialogs/dialogs_entry.h"
 #include "dialogs/ui/dialogs_layout.h"
 #include "ui/painter.h"
 #include "styles/style_dialogs.h"
diff --git a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
new file mode 100644
index 00000000000000..d21aea9c0010b8
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
@@ -0,0 +1,252 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/ui/posts_search_intro.h"
+
+#include "base/timer_rpl.h"
+#include "base/unixtime.h"
+#include "lang/lang_keys.h"
+#include "ui/controls/button_labels.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/vertical_layout.h"
+#include "styles/style_credits.h"
+#include "styles/style_dialogs.h"
+
+namespace Dialogs {
+namespace {
+
+[[nodiscard]] rpl::producer<QString> FormatCountdownTill(TimeId when) {
+	return rpl::single(rpl::empty) | rpl::then(
+		base::timer_each(1000)
+	) | rpl::map([=] {
+		const auto now = base::unixtime::now();
+		const auto delta = std::max(when - now, 0);
+		const auto hours = delta / 3600;
+		const auto minutes = (delta % 3600) / 60;
+		const auto seconds = delta % 60;
+		constexpr auto kZero = QChar('0');
+		return (hours > 0)
+			? u"%1:%2:%3"_q
+				.arg(hours)
+				.arg(minutes, 2, 10, kZero)
+				.arg(seconds, 2, 10, kZero)
+			: u"%1:%2"_q
+				.arg(minutes)
+				.arg(seconds, 2, 10, kZero);
+	});
+}
+
+void SetSearchButtonLabel(
+		not_null<Ui::RpWidget*> button,
+		rpl::producer<TextWithEntities> text) {
+	const auto left = &st::postsSearchIcon;
+	const auto leftPadding = st::postsSearchIconPadding;
+	const auto right = &st::postsSearchArrow;
+	const auto rightPadding = st::postsSearchArrowPadding;
+	const auto leftSkip = left->size().grownBy(leftPadding).width();
+	const auto rightSkip = right->size().grownBy(rightPadding).width();
+
+	struct State {
+		State() : linkFg([] {
+			auto copy = st::windowFgActive->c;
+			copy.setAlphaF(0.6);
+			return copy;
+		}), st(st::resaleButtonTitle) {
+		}
+
+		style::complex_color linkFg;
+		style::FlatLabel st;
+	};
+	auto lifetime = rpl::lifetime();
+	const auto state = lifetime.make_state<State>();
+	state->st.palette.linkFg = state->linkFg.color();
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		button,
+		rpl::duplicate(text),
+		state->st);
+	label->lifetime().add(std::move(lifetime));
+	label->show();
+
+	const auto icons = Ui::CreateChild<Ui::RpWidget>(button);
+	icons->show();
+	rpl::combine(
+		button->sizeValue(),
+		std::move(text)
+	) | rpl::on_next([=](QSize size, const auto &) {
+		icons->setGeometry(QRect(QPoint(), size));
+		const auto available = size.width() - leftSkip - rightSkip;
+		if (available <= 0) {
+			return;
+		}
+		const auto width = std::min(available, label->textMaxWidth());
+		label->resizeToWidth(width);
+		const auto full = leftSkip + width + rightSkip;
+		const auto x = (size.width() - full) / 2;
+		const auto y = (size.height() - label->height()) / 2;
+		label->moveToLeft(x + leftSkip, y, size.width());
+	}, icons->lifetime());
+
+	icons->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(icons);
+		left->paint(
+			p,
+			label->x() - leftSkip + leftPadding.left(),
+			label->y() + leftPadding.top(),
+			icons->width());
+		right->paint(
+			p,
+			label->x() + label->width() + rightPadding.left(),
+			label->y() + rightPadding.top(),
+			icons->width());
+	}, icons->lifetime());
+}
+
+} // namespace
+
+PostsSearchIntro::PostsSearchIntro(
+	not_null<Ui::RpWidget*> parent,
+	PostsSearchIntroState state)
+: RpWidget(parent)
+, _state(std::move(state))
+, _content(std::make_unique<Ui::VerticalLayout>(this)) {
+	setup();
+}
+
+PostsSearchIntro::~PostsSearchIntro() = default;
+
+void PostsSearchIntro::update(PostsSearchIntroState state) {
+	_state = std::move(state);
+}
+
+rpl::producer<int> PostsSearchIntro::searchWithStars() const {
+	return _button->clicks() | rpl::map([=] {
+		const auto &now = _state.current();
+		return (now.needsPremium || now.freeSearchesLeft)
+			? 0
+			: int(now.starsPerPaidSearch);
+	});
+}
+
+void PostsSearchIntro::setup() {
+	auto title = _state.value(
+	) | rpl::map([](const PostsSearchIntroState &state) {
+		return (state.needsPremium || state.freeSearchesLeft > 0)
+			? tr::lng_posts_title()
+			: tr::lng_posts_limit_reached();
+	}) | rpl::flatten_latest();
+
+	auto subtitle = _state.value(
+	) | rpl::map([](const PostsSearchIntroState &state) {
+		return (state.needsPremium || state.freeSearchesLeft > 0)
+			? tr::lng_posts_start()
+			: tr::lng_posts_limit_about(
+				lt_count,
+				rpl::single(state.freeSearchesPerDay * 1.));
+	}) | rpl::flatten_latest();
+
+	auto footer = _state.value(
+	) | rpl::map([](const PostsSearchIntroState &state)
+	-> rpl::producer<QString> {
+		if (state.needsPremium) {
+			return tr::lng_posts_need_subscribe();
+		} else if (state.freeSearchesLeft > 0) {
+			return tr::lng_posts_remaining(
+				lt_count,
+				rpl::single(state.freeSearchesLeft * 1.));
+		} else {
+			return rpl::single(QString());
+		}
+	}) | rpl::flatten_latest();
+
+	_title = _content->add(
+		object_ptr<Ui::FlatLabel>(
+			_content.get(),
+			std::move(title),
+			st::postsSearchIntroTitle),
+		st::postsSearchIntroTitleMargin,
+		style::al_top);
+	_title->setTryMakeSimilarLines(true);
+	_subtitle = _content->add(
+		object_ptr<Ui::FlatLabel>(
+			_content.get(),
+			std::move(subtitle),
+			st::postsSearchIntroSubtitle),
+		st::postsSearchIntroSubtitleMargin,
+		style::al_top);
+	_subtitle->setTryMakeSimilarLines(true);
+	_button = _content->add(
+		object_ptr<Ui::RoundButton>(
+			_content.get(),
+			rpl::single(QString()),
+			st::postsSearchIntroButton),
+		style::al_top);
+	_footer = _content->add(
+		object_ptr<Ui::FlatLabel>(
+			_content.get(),
+			std::move(footer),
+			st::postsSearchIntroFooter),
+		st::postsSearchIntroFooterMargin,
+		style::al_top);
+	_footer->setTryMakeSimilarLines(true);
+
+	_state.value(
+	) | rpl::on_next([=](const PostsSearchIntroState &state) {
+		if (state.query.trimmed().isEmpty() && !state.needsPremium) {
+			_button->resize(_button->width(), 0);
+			_content->resizeToWidth(width());
+			return;
+		}
+
+		auto copy = _button->children();
+		for (const auto child : copy) {
+			delete child;
+		}
+		if (state.needsPremium) {
+			_button->setText(tr::lng_posts_subscribe());
+		} else if (state.freeSearchesLeft > 0) {
+			_button->setText(rpl::single(QString()));
+
+			SetSearchButtonLabel(_button, tr::lng_posts_search_button(
+				lt_query,
+				rpl::single(Ui::Text::Colorized(state.query.trimmed())),
+				tr::marked));
+		} else {
+			_button->setText(rpl::single(QString()));
+
+			Ui::SetButtonTwoLabels(
+				_button,
+				tr::lng_posts_limit_search_paid(
+					lt_cost,
+					rpl::single(Ui::Text::IconEmoji(
+						&st::starIconEmoji
+					).append(
+						Lang::FormatCountDecimal(state.starsPerPaidSearch))),
+					tr::marked),
+				tr::lng_posts_limit_unlocks(
+					lt_duration,
+					FormatCountdownTill(
+						state.nextFreeSearchTime
+					) | rpl::map(tr::marked),
+					tr::marked),
+				st::resaleButtonTitle,
+				st::resaleButtonSubtitle);
+		}
+		_button->resize(_button->width(), st::postsSearchIntroButton.height);
+		_content->resizeToWidth(width());
+	}, _button->lifetime());
+}
+
+void PostsSearchIntro::resizeEvent(QResizeEvent *e) {
+	_content->resizeToWidth(width());
+	const auto top = std::max(0, (height() - _content->height()) / 3);
+	_content->move(0, top);
+}
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.h b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.h
new file mode 100644
index 00000000000000..cebd6e512ad9f6
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.h
@@ -0,0 +1,59 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+
+namespace Ui {
+class FlatLabel;
+class RoundButton;
+class VerticalLayout;
+} // namespace Ui
+
+namespace Dialogs {
+
+struct PostsSearchIntroState {
+	QString query;
+	int freeSearchesPerDay = 0;
+	int freeSearchesLeft = 0;
+	TimeId nextFreeSearchTime = 0;
+	uint32 starsPerPaidSearch : 31 = 0;
+	uint32 needsPremium : 1 = 0;
+
+	friend inline bool operator==(
+		PostsSearchIntroState,
+		PostsSearchIntroState) = default;
+};
+
+class PostsSearchIntro final : public Ui::RpWidget {
+public:
+	PostsSearchIntro(
+		not_null<Ui::RpWidget*> parent,
+		PostsSearchIntroState state);
+	~PostsSearchIntro();
+
+	void update(PostsSearchIntroState state);
+
+	[[nodiscard]] rpl::producer<int> searchWithStars() const;
+
+private:
+	void resizeEvent(QResizeEvent *e) override;
+
+	void setup();
+
+	rpl::variable<PostsSearchIntroState> _state;
+
+	std::unique_ptr<Ui::VerticalLayout> _content;
+	Ui::FlatLabel *_title = nullptr;
+	Ui::FlatLabel *_subtitle = nullptr;
+	Ui::RoundButton *_button = nullptr;
+	Ui::FlatLabel *_footer = nullptr;
+
+};
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
index 67cafb98cc78db..450b4d3fa69246 100644
--- a/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/top_peers_strip.cpp
@@ -60,14 +60,14 @@ TopPeersStrip::TopPeersStrip(
 	setupHeader();
 	setupStrip();
 
-	std::move(content) | rpl::start_with_next([=](const TopPeersList &list) {
+	std::move(content) | rpl::on_next([=](const TopPeersList &list) {
 		apply(list);
 	}, lifetime());
 
 	rpl::combine(
 		_count.value(),
 		_expanded.value()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		resizeToWidth(width());
 	}, _strip.lifetime());
 
@@ -88,7 +88,7 @@ void TopPeersStrip::setupHeader() {
 		widthValue()
 	) | rpl::map(
 		(rpl::mappers::_1 * single) > (rpl::mappers::_2 + (single * 2) / 3)
-	) | rpl::distinct_until_changed() | rpl::start_with_next([=](bool more) {
+	) | rpl::distinct_until_changed() | rpl::on_next([=](bool more) {
 		setExpanded(false);
 		if (!more) {
 			const auto toggle = _toggleExpanded.current();
@@ -113,7 +113,7 @@ void TopPeersStrip::setupHeader() {
 		rpl::combine(
 			_header.sizeValue(),
 			toggle->widthValue()
-		) | rpl::start_with_next([=](QSize size, int width) {
+		) | rpl::on_next([=](QSize size, int width) {
 			const auto x = st::searchedBarPosition.x();
 			const auto y = st::searchedBarPosition.y();
 			toggle->moveToRight(0, 0, size.width());
@@ -128,14 +128,14 @@ void TopPeersStrip::setupHeader() {
 		_toggleExpanded.value()
 	) | rpl::filter(
 		rpl::mappers::_2 == nullptr
-	) | rpl::start_with_next([=](QSize size, const auto) {
+	) | rpl::on_next([=](QSize size, const auto) {
 		const auto x = st::searchedBarPosition.x();
 		const auto y = st::searchedBarPosition.y();
 		label->resizeToWidth(size.width() - x * 2);
 		label->moveToLeft(x, y, size.width());
 	}, _header.lifetime());
 
-	_header.paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_header.paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(&_header).fillRect(clip, st::searchedBarBg);
 	}, _header.lifetime());
 }
@@ -181,7 +181,7 @@ void TopPeersStrip::setupStrip() {
 		return base::EventFilterResult::Cancel;
 	});
 
-	_strip.paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_strip.paintRequest() | rpl::on_next([=](QRect clip) {
 		paintStrip(clip);
 	}, _strip.lifetime());
 }
diff --git a/Telegram/SourceFiles/editor/color_picker.cpp b/Telegram/SourceFiles/editor/color_picker.cpp
index a07e021147942e..7e29244eca01f6 100644
--- a/Telegram/SourceFiles/editor/color_picker.cpp
+++ b/Telegram/SourceFiles/editor/color_picker.cpp
@@ -7,132 +7,423 @@ For license and copyright information please follow this link:
 */
 #include "editor/color_picker.h"
 
+#include "base/basic_types.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "ui/abstract_button.h"
+#include "ui/layers/generic_box.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/rp_widget.h"
+#include "ui/widgets/color_editor.h"
 #include "styles/style_editor.h"
 
-#include <QtGui/QLinearGradient>
+#include <QConicalGradient>
+
 
 namespace Editor {
 namespace {
 
-constexpr auto kPrecision = 1000;
-constexpr auto kMinBrushSize = 0.1f;
-constexpr auto kMouseSkip = 1.4;
-
-constexpr auto kMinInnerHeight = 0.2;
-constexpr auto kMaxInnerHeight = 0.8;
+constexpr auto kMinBrushSize = 0.1;
+constexpr auto kMinBrushWidth = 1.;
+constexpr auto kMaxBrushWidth = 25.;
 
 constexpr auto kCircleDuration = crl::time(200);
+constexpr auto kSizeControlSwitchDuration = crl::time(140);
+constexpr auto kColorButtonSwitchDuration = crl::time(140);
 
-constexpr auto kMax = 1.0;
-
-ColorPicker::OutlinedStop FindOutlinedStop(
-		const QColor &color,
-		const QGradientStops &stops,
-		int width) {
-	for (auto i = 0; i < stops.size(); i++) {
-		const auto &current = stops[i];
-		if (current.second == color) {
-			const auto prev = ((i - 1) < 0)
-				? std::nullopt
-				: std::make_optional<int>(stops[i - 1].first * width);
-			const auto next = ((i + 1) >= stops.size())
-				? std::nullopt
-				: std::make_optional<int>(stops[i + 1].first * width);
-			return ColorPicker::OutlinedStop{
-				.stopPos = (current.first * width),
-				.prevStopPos = prev,
-				.nextStopPos = next,
-			};
-		}
+inline float64 InterpolateF(float64 a, float64 b, float64 b_ratio) {
+	return a + float64(b - a) * b_ratio;
+};
+
+inline float64 InterpolationRatio(int from, int to, int result) {
+	return (result - from) / float64(to - from);
+};
+
+[[nodiscard]] int ToolIndex(Brush::Tool tool) {
+	switch (tool) {
+	case Brush::Tool::Pen: return 0;
+	case Brush::Tool::Arrow: return 1;
+	case Brush::Tool::Marker: return 2;
+	case Brush::Tool::Blur: return 3;
+	case Brush::Tool::Eraser: return 4;
 	}
-	return ColorPicker::OutlinedStop();
+	return 0;
 }
 
-QGradientStops Colors() {
-	return QGradientStops{
-		{ 0.00f, QColor(234, 39, 57) },
-		{ 0.14f, QColor(219, 58, 210) },
-		{ 0.24f, QColor(48, 81, 227) },
-		{ 0.39f, QColor(73, 197, 237) },
-		{ 0.49f, QColor(128, 200, 100) },
-		{ 0.62f, QColor(252, 222, 101) },
-		{ 0.73f, QColor(252, 150, 77) },
-		{ 0.85f, QColor(0, 0, 0) },
-		{ 1.00f, QColor(255, 255, 255) } };
+[[nodiscard]] Brush::Tool ToolFromIndex(int index) {
+	switch (index) {
+	case 0: return Brush::Tool::Pen;
+	case 1: return Brush::Tool::Arrow;
+	case 2: return Brush::Tool::Marker;
+	case 3: return Brush::Tool::Blur;
+	case 4: return Brush::Tool::Eraser;
+	}
+	return Brush::Tool::Pen;
 }
 
-QBrush GradientBrush(const QPoint &p, const QGradientStops &stops) {
-	auto gradient = QLinearGradient(0, p.y(), p.x(), p.y());
-	gradient.setStops(stops);
-	return QBrush(std::move(gradient));
+[[nodiscard]] bool FixedColorTool(Brush::Tool tool) {
+	return (tool == Brush::Tool::Eraser) || (tool == Brush::Tool::Blur);
 }
 
-float RatioPrecise(float a) {
-	return int(a * kPrecision) / float(kPrecision);
+[[nodiscard]] QColor FixedToolColor() {
+	return QColor(0, 0, 0);
 }
 
-inline float64 InterpolateF(float a, float b, float64 b_ratio) {
-	return a + float64(b - a) * b_ratio;
+void NormalizeBrushColor(Brush &brush) {
+	if (FixedColorTool(brush.tool)) {
+		brush.color = FixedToolColor();
+	}
+}
+
+class PlusCircle final : public Ui::AbstractButton {
+public:
+	using Ui::AbstractButton::AbstractButton;
+
+private:
+	void paintEvent(QPaintEvent *event) override {
+		auto p = QPainter(this);
+		PainterHighQualityEnabler hq(p);
+
+		const auto border = st::photoEditorColorButtonBorder;
+		const auto half = border / 2.;
+		const auto rect = QRectF(QWidget::rect())
+			.adjusted(half, half, -half, -half);
+
+		p.setPen(border > 0
+			? QPen(st::photoEditorColorButtonBorderFg, border)
+			: Qt::NoPen);
+		p.setBrush(Qt::NoBrush);
+
+		const auto lineWidth = st::photoEditorColorPalettePlusLine;
+		auto pen = QPen(st::photoEditorColorPalettePlusFg, lineWidth);
+		pen.setCapStyle(Qt::RoundCap);
+		p.setPen(pen);
+
+		const auto c = rect::center(rect);
+		const auto r = rect.width() / 2. - lineWidth * 1.75;
+		p.drawLine(QPointF(c.x() - r, c.y()), QPointF(c.x() + r, c.y()));
+		p.drawLine(QPointF(c.x(), c.y() - r), QPointF(c.x(), c.y() + r));
+	}
 };
 
-inline float64 InterpolationRatio(int from, int to, int result) {
-	return (result - from) / float64(to - from);
+class ColorButton final : public Ui::AbstractButton {
+public:
+	ColorButton(
+		not_null<QWidget*> parent,
+		Fn<QColor()> color)
+	: AbstractButton(parent)
+	, _color(std::move(color)) {
+	}
+
+private:
+	void paintEvent(QPaintEvent *event) override {
+		auto p = QPainter(this);
+		auto hq = PainterHighQualityEnabler(p);
+
+		const auto size = std::min(width(), height());
+		if (size <= 0) {
+			return;
+		}
+
+		const auto left = (width() - size) / 2.;
+		const auto top = (height() - size) / 2.;
+		const auto outer = QRectF(left, top, size, size);
+		const auto ringWidth = float64(std::max(
+			st::photoEditorColorButtonBorder,
+			st::photoEditorColorPaletteSelectionWidth));
+		const auto ringHalf = ringWidth / 2.;
+		const auto ringRect = outer.adjusted(
+			ringHalf,
+			ringHalf,
+			-ringHalf,
+			-ringHalf);
+
+		auto gradient = QConicalGradient(outer.center(), 15.);
+		gradient.setColorAt(0. / 7., QColor(0xEB, 0x4B, 0x4B));
+		gradient.setColorAt(1. / 7., QColor(0xFF, 0xA5, 0x00));
+		gradient.setColorAt(2. / 7., QColor(0xFF, 0xFF, 0x00));
+		gradient.setColorAt(3. / 7., QColor(0x8F, 0xCE, 0x00));
+		gradient.setColorAt(4. / 7., QColor(0x00, 0xFF, 0xFF));
+		gradient.setColorAt(5. / 7., QColor(0x60, 0x80, 0xE4));
+		gradient.setColorAt(6. / 7., QColor(0xEE, 0x82, 0xEE));
+		gradient.setColorAt(7. / 7., QColor(0xEB, 0x4B, 0x4B));
+
+		auto pen = QPen(QBrush(gradient), ringWidth);
+		pen.setCapStyle(Qt::RoundCap);
+		p.setPen(pen);
+		p.setBrush(Qt::NoBrush);
+		p.drawEllipse(ringRect);
+
+		const auto innerInset = ringWidth
+			+ st::photoEditorColorButtonBorder * 1.5;
+		if (outer.width() <= innerInset * 2.
+			|| outer.height() <= innerInset * 2.) {
+			return;
+		}
+		auto innerRect = outer.adjusted(
+			innerInset,
+			innerInset,
+			-innerInset,
+			-innerInset);
+		const auto innerBorder = float64(st::photoEditorColorButtonBorder);
+		if (innerBorder > 0.) {
+			const auto innerHalf = innerBorder / 2.;
+			innerRect = innerRect.adjusted(
+				innerHalf,
+				innerHalf,
+				-innerHalf,
+				-innerHalf);
+		}
+		p.setPen(Qt::NoPen);
+		p.setBrush(_color());
+		p.drawEllipse(innerRect);
+	}
+
+	Fn<QColor()> _color;
+
 };
 
+class ToolLottieButton final : public Ui::AbstractButton {
+public:
+	ToolLottieButton(
+		not_null<QWidget*> parent,
+		const QString &path)
+	: AbstractButton(parent)
+	, _icon(Lottie::MakeIcon({
+		.path = path,
+		.sizeOverride = Size(st::photoEditorToolButtonIconSize),
+		.frame = 0,
+	})) {
+		events(
+		) | rpl::on_next([=](not_null<QEvent*> event) {
+			const auto type = event->type();
+			if (type == QEvent::Enter) {
+				if (_hovered) {
+					return;
+				}
+				_hovered = true;
+				_resetPending = false;
+				if (_icon && _icon->valid() && !_icon->animating()) {
+					if (_icon->frameIndex() != 0) {
+						_icon->jumpTo(0, [=] { update(); });
+					}
+				}
+				playOnce();
+			} else if (type == QEvent::Leave) {
+				_hovered = false;
+				if (_icon && _icon->animating()) {
+					_resetPending = true;
+				} else {
+					reset();
+				}
+			}
+		}, lifetime());
+	}
+
+private:
+	void paintEvent(QPaintEvent *event) override {
+		auto p = Painter(this);
+		if (_icon) {
+			_icon->paintInCenter(p, rect());
+			if (_resetPending && !_icon->animating()) {
+				_resetPending = false;
+				reset();
+			}
+		}
+	}
+
+	void playOnce() {
+		if (!_icon || !_icon->valid()) {
+			return;
+		}
+		const auto count = _icon->framesCount();
+		if (count <= 0) {
+			return;
+		}
+		_icon->animate(
+			[=] { update(); },
+			0,
+			count - 1,
+			crl::time(st::photoEditorToolButtonHoverDuration));
+	}
+
+	void reset() {
+		if (!_icon || !_icon->valid()) {
+			return;
+		}
+		if (_icon->frameIndex() != 0) {
+			_icon->jumpTo(0, [=] { update(); });
+		}
+	}
+
+	std::unique_ptr<Lottie::Icon> _icon;
+	bool _hovered = false;
+	bool _resetPending = false;
+};
+
+std::vector<QColor> PaletteColors() {
+	return {
+		QColor(0, 0, 0),
+		QColor(255, 255, 255),
+		QColor(234, 39, 57),
+		QColor(252, 150, 77),
+		QColor(252, 222, 101),
+		QColor(128, 200, 100),
+		QColor(73, 197, 237),
+		QColor(48, 81, 227),
+		QColor(219, 58, 210),
+		QColor(255, 114, 169),
+	};
+}
+
 } // namespace
 
 ColorPicker::ColorPicker(
 	not_null<Ui::RpWidget*> parent,
-	const Brush &savedBrush)
-: _circleColor(Qt::white)
-, _width(st::photoEditorColorPickerWidth)
-, _lineHeight(st::photoEditorColorPickerLineHeight)
-, _colorLine(base::make_unique_q<Ui::RpWidget>(parent))
-, _canvasForCircle(base::make_unique_q<Ui::RpWidget>(parent))
-, _gradientStops(Colors())
-, _outlinedStop(FindOutlinedStop(_circleColor, _gradientStops, _width))
-, _gradientBrush(
-	GradientBrush(QPoint(_width, _lineHeight / 2), _gradientStops))
-, _brush(Brush{
-	.sizeRatio = (savedBrush.sizeRatio
-		? savedBrush.sizeRatio
-		: kMinBrushSize),
-	.color = (savedBrush.color.isValid()
-		? savedBrush.color
-		: _gradientStops.front().second),
-}) {
-	_colorLine->resize(_width, _lineHeight);
-	_canvasForCircle->resize(
-		_width + circleHeight(kMax),
-		st::photoEditorColorPickerCanvasHeight);
-
-	_canvasForCircle->setAttribute(Qt::WA_TransparentForMouseEvents);
-
-	_down.pos = QPoint(colorToPosition(savedBrush.color), 0);
-
-	_colorLine->paintRequest(
-	) | rpl::start_with_next([=] {
-		auto p = QPainter(_colorLine);
-		PainterHighQualityEnabler hq(p);
+	std::shared_ptr<Ui::Show> show,
+	const std::array<Brush, 5> &savedBrushes,
+	Brush::Tool savedTool)
+: _parent(parent)
+, _show(std::move(show))
+, _colorButton(base::make_unique_q<ColorButton>(parent, [=] {
+	return colorButtonColor();
+}))
+, _paletteWrap(std::in_place, parent)
+, _sizeControlHoverArea(std::in_place, parent)
+, _sizeControl(std::in_place, parent)
+, _toolSelection(std::in_place, parent)
+, _brush(savedBrushes[ToolIndex(savedTool)])
+, _toolBrushes(savedBrushes) {
+	_colorButton->resize(Size(st::photoEditorColorButtonSize));
 
+	for (auto i = 0; i != int(_toolBrushes.size()); ++i) {
+		_toolBrushes[i].tool = ToolFromIndex(i);
+		NormalizeBrushColor(_toolBrushes[i]);
+	}
+	_brush = _toolBrushes[ToolIndex(savedTool)];
+	_brush.tool = savedTool;
+	NormalizeBrushColor(_brush);
+	_colorButtonFrom = _brush.color;
+	_colorButtonTo = _brush.color;
+
+	_toolSelection->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_toolSelection->setAttribute(Qt::WA_TranslucentBackground, true);
+	_toolSelection->setVisible(false);
+	_toolSelection->paintOn([=](QPainter &p) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setOpacity(st::photoEditorToolButtonSelectedOpacity);
+		auto pen = QPen(
+			st::photoEditorToolButtonSelectedFg,
+			st::photoEditorToolButtonSelectedWidth);
+		pen.setCapStyle(Qt::RoundCap);
 		p.setPen(Qt::NoPen);
-		p.setBrush(_gradientBrush);
+		p.setBrush(st::photoEditorToolButtonSelectedFg);
+		const auto padding = st::photoEditorToolButtonSelectedPadding;
+		const auto half = pen.widthF() / 2.;
+		const auto rect = QRectF(_toolSelection->rect()).adjusted(
+			padding + half,
+			padding + half,
+			-padding - half,
+			-padding - half);
+		p.drawEllipse(rect);
+	});
+
+	_toolButtons.push_back(base::make_unique_q<ToolLottieButton>(
+		parent,
+		u":/animations/photo_editor_pen.tgs"_q));
+	_toolButtons.push_back(base::make_unique_q<ToolLottieButton>(
+		parent,
+		u":/animations/photo_editor_arrow.tgs"_q));
+	_toolButtons.push_back(base::make_unique_q<ToolLottieButton>(
+		parent,
+		u":/animations/photo_editor_marker.tgs"_q));
+	_toolButtons.push_back(base::make_unique_q<ToolLottieButton>(
+		parent,
+		u":/animations/photo_editor_blur.tgs"_q));
+	_toolButtons.push_back(base::make_unique_q<ToolLottieButton>(
+		parent,
+		u":/animations/photo_editor_eraser.tgs"_q));
+	for (const auto &button : _toolButtons) {
+		button->resize(
+			st::photoEditorToolButtonSize,
+			st::photoEditorToolButtonSize);
+		button->show();
+	}
+	const auto setToolRequest = [=](Brush::Tool tool) {
+		_toolClicks.fire({});
+		setTool(tool);
+	};
+	if (_toolButtons.size() >= 5) {
+		_toolButtons[0]->setClickedCallback([=] {
+			setToolRequest(Brush::Tool::Pen);
+		});
+		_toolButtons[1]->setClickedCallback([=] {
+			setToolRequest(Brush::Tool::Arrow);
+		});
+		_toolButtons[2]->setClickedCallback([=] {
+			setToolRequest(Brush::Tool::Marker);
+		});
+		_toolButtons[3]->setClickedCallback([=] {
+			setToolRequest(Brush::Tool::Blur);
+		});
+		_toolButtons[4]->setClickedCallback([=] {
+			setToolRequest(Brush::Tool::Eraser);
+		});
+	}
+	updateToolSelection(false);
+	_paletteWrap->setVisible(false);
+	_sizeControl->resize(
+		st::photoEditorBrushSizeControlHitPadding * 2
+			+ st::photoEditorBrushSizeControlExpandShift
+			+ st::photoEditorBrushSizeControlExpandedTopWidth,
+		st::photoEditorBrushSizeControlHeight);
+	_sizeControlHoverArea->setMouseTracking(true);
+	_sizeControl->setMouseTracking(true);
+
+	updateSizeControlPositionFromRatio(false);
+	moveSizeControl(_parent->size());
+
+	_colorButton->setClickedCallback([=] {
+		setPaletteVisible(!_paletteVisible);
+	});
 
-		const auto radius = _colorLine->height() / 2.;
-		p.drawRoundedRect(_colorLine->rect(), radius, radius);
-	}, _colorLine->lifetime());
+	_sizeControl->paintOn([=](QPainter &p) {
+		paintSizeControl(p);
+	});
 
-	_canvasForCircle->paintRequest(
-	) | rpl::start_with_next([=] {
-		auto p = QPainter(_canvasForCircle);
-		paintCircle(p);
-	}, _canvasForCircle->lifetime());
+	_parent->sizeValue(
+	) | rpl::on_next([=](const QSize &size) {
+		moveSizeControl(size);
+		if (_paletteVisible) {
+			rebuildPalette();
+		}
+	}, _sizeControl->lifetime());
+
+	_sizeControlHoverArea->events(
+	) | rpl::on_next([=](not_null<QEvent*> event) {
+		const auto type = event->type();
+		if (type == QEvent::Enter) {
+			_sizeHoverAreaHovered = true;
+			updateSizeControlExpanded();
+		} else if (type == QEvent::Leave) {
+			_sizeHoverAreaHovered = false;
+			updateSizeControlExpanded();
+		}
+	}, _sizeControlHoverArea->lifetime());
 
-	_colorLine->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> event) {
+	_sizeControl->events(
+	) | rpl::on_next([=](not_null<QEvent*> event) {
 		const auto type = event->type();
+		if (type == QEvent::Enter) {
+			_sizeControlHovered = true;
+			updateSizeControlExpanded();
+			return;
+		} else if (type == QEvent::Leave) {
+			_sizeControlHovered = false;
+			updateSizeControlExpanded();
+			return;
+		}
 		const auto isPress = (type == QEvent::MouseButtonPress)
 			|| (type == QEvent::MouseButtonDblClick);
 		const auto isMove = (type == QEvent::MouseMove);
@@ -140,189 +431,607 @@ ColorPicker::ColorPicker(
 		if (!isPress && !isMove && !isRelease) {
 			return;
 		}
-		_down.pressed = !isRelease;
-
-		const auto progress = _circleAnimation.value(isPress ? 0. : 1.);
-		if (!isMove) {
-			const auto from = progress;
-			const auto to = isPress ? 1. : 0.;
-			_circleAnimation.stop();
-
-			_circleAnimation.start(
-				[=] { _canvasForCircle->update(); },
-				from,
-				to,
-				kCircleDuration * std::abs(to - from),
-				anim::easeOutCirc);
-		}
+
 		const auto e = static_cast<QMouseEvent*>(event.get());
-		updateMousePosition(e->pos(), progress);
-		if (isRelease) {
+		if (isPress) {
+			if (e->button() != Qt::LeftButton) {
+				return;
+			}
+			const auto progress = _sizeControlAnimation.value(
+				_sizeControlExpanded ? 1. : 0.);
+			const auto inHandle = sizeControlHandleRect(progress).contains(
+				e->pos());
+			const auto inControl = sizeControlHitRect(progress).contains(
+				e->pos());
+			if (!inHandle && !inControl) {
+				return;
+			}
+			_sizeControlPositionAnimation.stop();
+			_sizeDown.pressed = true;
+			updateSizeControlMousePosition(e->pos().y());
+			updateSizeControlExpanded();
+			_sizeControl->update();
+			return;
+		}
+		if (!_sizeDown.pressed) {
+			return;
+		}
+		if (isMove) {
+			updateSizeControlMousePosition(e->pos().y());
+			_sizeControl->update();
+			return;
+		}
+		if (isRelease && (e->button() == Qt::LeftButton)) {
+			updateSizeControlMousePosition(e->pos().y());
+			_sizeDown.pressed = false;
+			updateSizeControlExpanded();
 			_saveBrushRequests.fire_copy(_brush);
+			_sizeControl->update();
 		}
+	}, _sizeControl->lifetime());
+
+	rebuildPalette();
+}
+
+void ColorPicker::moveLine(const QPoint &position) {
+	_colorButtonCenter = position;
+	const auto gap = st::photoEditorToolButtonGap;
+	const auto colorWidth = _colorButton->width();
+	const auto colorHeight = _colorButton->height();
+	const auto toolSize = st::photoEditorToolButtonSize;
+	const auto tools = int(_toolButtons.size());
+	const auto totalWidth = colorWidth + tools * toolSize + tools * gap;
+	const auto left = position.x() - totalWidth / 2;
+	const auto top = position.y() - colorHeight / 2;
+	_colorButton->move(left, top);
+	updateToolButtonsGeometry();
+	updateToolSelection(false);
+	updatePaletteGeometry();
+}
 
-		_canvasForCircle->update();
-	}, _colorLine->lifetime());
+void ColorPicker::setCanvasRect(const QRect &rect) {
+	_canvasRect = rect;
+	moveSizeControl(_parent->size());
 }
 
-void ColorPicker::updateMousePosition(const QPoint &pos, float64 progress) {
-	const auto mapped = _canvasForCircle->mapFromParent(
-		_colorLine->mapToParent(pos));
+void ColorPicker::updateToolButtonsGeometry() {
+	const auto size = st::photoEditorToolButtonSize;
+	const auto extra = st::photoEditorToolButtonSelectedExtra;
+	const auto hit = size + extra * 2;
+	const auto gap = st::photoEditorToolButtonGap;
+	auto x = _colorButton->x() + _colorButton->width() + gap;
+	const auto y = _colorButton->y()
+		+ (_colorButton->height() - size) / 2;
+	for (const auto &button : _toolButtons) {
+		button->resize(hit, hit);
+		button->move(x - extra, y - extra);
+		x += size + gap;
+	}
+}
 
-	const auto height = circleHeight(progress);
-	const auto mappedY = int(mapped.y() - height * kMouseSkip);
-	const auto bottom = _canvasForCircle->height() - circleHeight(kMax);
-	const auto &skip = st::photoEditorColorPickerCircleSkip;
+void ColorPicker::updateToolSelection(bool animated) {
+	if (_toolButtons.size() < 5) {
+		return;
+	}
+	const auto index = ToolIndex(_brush.tool);
+	if (index < 0 || index >= int(_toolButtons.size())) {
+		return;
+	}
+	const auto &button = _toolButtons[index];
+	const auto target = button->pos();
+	_toolSelection->resize(button->size());
+	_toolSelection->raise();
+	if (!animated || !_toolSelection->isVisible()) {
+		_toolSelectionAnimation.stop();
+		_toolSelection->move(target);
+		_toolSelection->update();
+		return;
+	}
+	_toolSelectionFrom = _toolSelection->pos();
+	_toolSelectionTo = target;
+	_toolSelectionAnimation.stop();
+	_toolSelectionAnimation.start([=] {
+		const auto progress = _toolSelectionAnimation.value(1.);
+		_toolSelection->move(
+			anim::interpolate(
+				_toolSelectionFrom.x(),
+				_toolSelectionTo.x(),
+				progress),
+			anim::interpolate(
+				_toolSelectionFrom.y(),
+				_toolSelectionTo.y(),
+				progress));
+		_toolSelection->update();
+	}, 0., 1., crl::time(st::photoEditorToolButtonSelectDuration),
+		anim::easeOutCirc);
+}
 
-	_down.pos = QPoint(
-		std::clamp(pos.x(), 0, _width),
-		std::clamp(mappedY, 0, bottom - skip));
+void ColorPicker::setTool(Brush::Tool tool) {
+	if (_brush.tool == tool) {
+		return;
+	}
+	storeCurrentBrush();
+	_brush = _toolBrushes[ToolIndex(tool)];
+	_brush.tool = tool;
+	NormalizeBrushColor(_brush);
+	updateSizeControlPositionFromRatio(true);
+	updateColorButtonColor(_brush.color, true);
+	if (_paletteVisible) {
+		rebuildPalette();
+	} else {
+		_colorButton->update();
+	}
+	updateToolSelection(true);
+	_sizeControl->update();
+	_saveBrushRequests.fire_copy(_brush);
+}
 
-	// Convert Y to the brush size.
-	const auto from = 0;
-	const auto to = bottom - skip;
+void ColorPicker::storeCurrentBrush() {
+	if (_toolSelectionSuppressed) {
+		return;
+	}
+	NormalizeBrushColor(_brush);
+	_toolBrushes[ToolIndex(_brush.tool)] = _brush;
+}
 
-	// Don't change the brush size when we are on the color line.
-	if (mappedY <= to) {
-		_brush.sizeRatio = std::clamp(
-			float(1. - InterpolationRatio(from, to, _down.pos.y())),
-			kMinBrushSize,
-			1.f);
+void ColorPicker::setColor(const QColor &color) {
+	_brush.color = color;
+	updateColorButtonColor(color, true);
+	if (_paletteVisible) {
+		rebuildPalette();
+	} else {
+		_colorButton->update();
 	}
-	_brush.color = positionToColor(_down.pos.x());
 }
 
-void ColorPicker::moveLine(const QPoint &position) {
-	_colorLine->move(position
-		- QPoint(_colorLine->width() / 2, _colorLine->height() / 2));
-
-	_canvasForCircle->move(
-		_colorLine->x() - circleHeight(kMax) / 2,
-		_colorLine->y()
-			+ _colorLine->height()
-			+ ((circleHeight() - _colorLine->height()) / 2)
-			- _canvasForCircle->height());
-}
-
-QColor ColorPicker::positionToColor(int x) const {
-	const auto from = 0;
-	const auto to = _width;
-	const auto gradientRatio = InterpolationRatio(from, to, x);
-
-	for (auto i = 1; i < _gradientStops.size(); i++) {
-		const auto &previous = _gradientStops[i - 1];
-		const auto &current = _gradientStops[i];
-		const auto &fromStop = previous.first;
-		const auto &toStop = current.first;
-		const auto &fromColor = previous.second;
-		const auto &toColor = current.second;
-
-		if ((fromStop <= gradientRatio) && (toStop >= gradientRatio)) {
-			const auto stopRatio = RatioPrecise(
-				(gradientRatio - fromStop) / float64(toStop - fromStop));
-			return anim::color(fromColor, toColor, stopRatio);
-		}
+void ColorPicker::setToolSelectionVisible(bool visible) {
+	_toolSelectionSuppressed = !visible;
+	_toolSelection->setVisible(visible);
+}
+
+void ColorPicker::updateColorButtonColor(const QColor &color, bool animated) {
+	const auto hasValid = _colorButtonFrom.isValid() && _colorButtonTo.isValid();
+	const auto from = hasValid ? colorButtonColor() : color;
+	const auto to = color.isValid() ? color : from;
+	if (from == to) {
+		_colorButtonAnimation.stop();
+		_colorButtonFrom = from;
+		_colorButtonTo = to;
+		return;
+	}
+	_colorButtonFrom = from;
+	_colorButtonTo = to;
+	_colorButtonAnimation.stop();
+	if (animated) {
+		_colorButtonAnimation.start(
+			[=] { _colorButton->update(); },
+			0.,
+			1.,
+			kColorButtonSwitchDuration,
+			anim::easeOutCirc);
+	} else {
+		_colorButton->update();
 	}
-	return QColor();
 }
 
-void ColorPicker::paintCircle(QPainter &p) {
-	PainterHighQualityEnabler hq(p);
+QColor ColorPicker::colorButtonColor() const {
+	const auto progress = _colorButtonAnimation.value(1.);
+	return anim::color(_colorButtonFrom, _colorButtonTo, progress);
+}
 
-	p.setPen(Qt::NoPen);
-	p.setBrush(_circleColor);
+void ColorPicker::paintSizeControl(QPainter &p) {
+	auto hq = PainterHighQualityEnabler(p);
 
-	const auto progress = _circleAnimation.value(_down.pressed ? 1. : 0.);
-	const auto h = circleHeight(progress);
-	const auto bottom = _canvasForCircle->height() - h;
+	const auto progress = _sizeControlAnimation.value(_sizeControlExpanded
+		? 1.
+		: 0.);
+	const auto path = sizeControlShapePath(progress);
 
-	const auto circleX = _down.pos.x() + (circleHeight(kMax) - h) / 2;
-	const auto circleY = _circleAnimation.animating()
-		? anim::interpolate(bottom, _down.pos.y(), progress)
-		: _down.pressed
-		? _down.pos.y()
-		: bottom;
+	p.setPen(Qt::NoPen);
+	p.setBrush(QColor(255, 255, 255, anim::interpolate(96, 176, progress)));
+	p.drawPath(path);
 
-	const auto r = QRect(circleX, circleY, h, h);
-	p.drawEllipse(r);
+	const auto handleRect = sizeControlHandleRect(progress);
+	p.setBrush(QColor(255, 255, 255, 244));
+	p.drawEllipse(handleRect);
+}
 
-	const auto innerH = InterpolateF(
-		h * kMinInnerHeight,
-		h * kMaxInnerHeight,
-		_brush.sizeRatio);
+void ColorPicker::setVisible(bool visible) {
+	if (!visible) {
+		_paletteVisible = false;
+		_sizeDown.pressed = false;
+		_sizeHoverAreaHovered = false;
+		_sizeControlHovered = false;
+		_sizeControlExpanded = false;
+		_sizeControlAnimation.stop();
+		_sizeControlPositionAnimation.stop();
+		_toolSelectionAnimation.stop();
+	}
+	_colorButton->setVisible(visible && !_paletteVisible);
+	_paletteWrap->setVisible(visible && _paletteVisible);
+	_sizeControlHoverArea->setVisible(visible);
+	_sizeControl->setVisible(visible);
+	const auto showTools = visible
+		&& !_paletteVisible
+		&& !_toolSelectionSuppressed;
+	_toolSelection->setVisible(showTools);
+	for (const auto &button : _toolButtons) {
+		button->setVisible(visible && !_paletteVisible);
+	}
+	if (showTools) {
+		updateToolSelection(false);
+	}
+}
 
-	p.setBrush(_brush.color);
+rpl::producer<Brush> ColorPicker::saveBrushRequests() const {
+	return _saveBrushRequests.events_starting_with_copy(_brush);
+}
 
-	const auto innerRect = QRectF(
-		r.x() + (r.width() - innerH) / 2.,
-		r.y() + (r.height() - innerH) / 2.,
-		innerH,
-		innerH);
+rpl::producer<> ColorPicker::toolClicks() const {
+	return _toolClicks.events();
+}
 
-	paintOutline(p, innerRect);
-	p.drawEllipse(innerRect);
+bool ColorPicker::preventHandleKeyPress() const {
+	return _sizeControl->isVisible()
+		&& (_sizeControlAnimation.animating() || _sizeDown.pressed);
 }
 
-void ColorPicker::paintOutline(QPainter &p, const QRectF &rect) {
-	const auto &s = _outlinedStop;
-	if (!s.stopPos) {
-		return;
+void ColorPicker::rebuildPalette() {
+	_paletteButtons.clear();
+	_palettePlus = nullptr;
+
+	auto colors = PaletteColors();
+	auto hasCurrent = false;
+	for (const auto &c : colors) {
+		if (c == _brush.color) {
+			hasCurrent = true;
+			break;
+		}
 	}
-	const auto draw = [&](float opacity) {
-		p.save();
-		p.setOpacity(opacity);
-		p.setPen(Qt::lightGray);
-		p.setPen(Qt::NoBrush);
-		p.drawEllipse(rect);
-		p.restore();
-	};
-	const auto x = _down.pos.x();
-	if (s.prevStopPos && (x >= s.prevStopPos && x <= s.stopPos)) {
-		const auto from = *s.prevStopPos;
-		const auto to = *s.stopPos;
-		const auto ratio = InterpolationRatio(from, to, x);
-		if (ratio >= 0. && ratio <= 1.) {
-			draw(ratio);
+	if (!hasCurrent) {
+		colors.push_back(_brush.color);
+
+		const auto &padding = st::photoEditorButtonBarPadding;
+		const auto size = st::photoEditorColorPaletteItemSize;
+		const auto gap = st::photoEditorColorPaletteGap;
+		const auto barWidth = std::min(
+				st::photoEditorButtonBarWidth,
+				_parent->width())
+			- rect::m::sum::h(padding)
+			- st::photoEditorUndoButton.width
+			- st::photoEditorRedoButton.width;
+		const auto count = int(colors.size());
+		const auto paletteWidth = count * size
+			+ (count - 1) * gap
+			+ (gap + size);
+		if (paletteWidth > barWidth && colors.size() > 2) {
+			colors.erase(colors.end() - 2);
 		}
-	} else if (s.nextStopPos && (x >= s.stopPos && x <= s.nextStopPos)) {
-		const auto from = *s.stopPos;
-		const auto to = *s.nextStopPos;
-		const auto ratio = InterpolationRatio(from, to, x);
-		if (ratio >= 0. && ratio <= 1.) {
-			draw(1. - ratio);
+	}
+
+	auto index = uint8(0);
+	for (const auto &c : colors) {
+		auto button = base::make_unique_q<Ui::ColorSample>(
+			_paletteWrap,
+			[c](uint8) {
+				auto set = Data::ColorProfileSet();
+				set.palette = { c };
+				return set;
+			},
+			index++,
+			c == _brush.color);
+		button->setSelectionCutout(true);
+		button->setClickedCallback([=] {
+			_brush.color = c;
+			storeCurrentBrush();
+			updateColorButtonColor(_brush.color, true);
+			rebuildPalette();
+			_colorButton->update();
+			_saveBrushRequests.fire_copy(_brush);
+			setPaletteVisible(false);
+		});
+		button->show();
+		_paletteButtons.push_back(std::move(button));
+	}
+
+	_palettePlus = base::make_unique_q<PlusCircle>(_paletteWrap);
+	_palettePlus->setClickedCallback([=] {
+		if (!_show) {
+			return;
 		}
+		_show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+			struct State {
+				QColor color;
+			};
+			const auto state = box->lifetime().make_state<State>();
+			state->color = _brush.color;
+			auto editor = box->addRow(
+				object_ptr<ColorEditor>(
+					box,
+					ColorEditor::Mode::HSL,
+					_brush.color),
+				style::margins());
+			box->setWidth(editor->width());
+			editor->colorValue(
+			) | rpl::on_next([=](QColor c) {
+				state->color = c;
+			}, editor->lifetime());
+			box->addButton(tr::lng_box_done(), [=] {
+				_brush.color = state->color;
+				storeCurrentBrush();
+				updateColorButtonColor(_brush.color, true);
+				rebuildPalette();
+				_colorButton->update();
+				_saveBrushRequests.fire_copy(_brush);
+				setPaletteVisible(false);
+				box->closeBox();
+			});
+			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+		}));
+	});
+	_palettePlus->show();
+	updatePaletteGeometry();
+}
+
+void ColorPicker::updatePaletteGeometry() {
+	if (!_paletteWrap) {
+		return;
 	}
+	const auto size = st::photoEditorColorPaletteItemSize;
+	const auto gap = st::photoEditorColorPaletteGap;
+	const auto count = int(_paletteButtons.size());
+	const auto plusSize = size;
+	const auto width = (count * size)
+		+ ((count > 0) ? (count - 1) * gap : 0)
+		+ gap + plusSize;
+	const auto height = std::max(size, plusSize);
+
+	_paletteWrap->resize(width, height);
+	auto x = 0;
+	for (const auto &button : _paletteButtons) {
+		button->resize(size, size);
+		button->move(x, (height - size) / 2);
+		x += size + gap;
+	}
+	if (_palettePlus) {
+		_palettePlus->resize(plusSize, plusSize);
+		_palettePlus->move(x, (height - plusSize) / 2);
+	}
+
+	if (_colorButtonCenter.isNull()) {
+		return;
+	}
+	_paletteWrap->move(_colorButtonCenter - QPoint(width / 2, height / 2));
 }
 
-int ColorPicker::circleHeight(float64 progress) const {
-	return anim::interpolate(
-		st::photoEditorColorPickerCircleSize,
-		st::photoEditorColorPickerCircleBigSize,
-		progress);
+void ColorPicker::setPaletteVisible(bool visible) {
+	if (_paletteVisible == visible) {
+		return;
+	}
+	_paletteVisible = visible;
+	_paletteWrap->setVisible(visible);
+	_colorButton->setVisible(!visible);
+	const auto showTools = !visible && !_toolSelectionSuppressed;
+	_toolSelection->setVisible(showTools);
+	for (const auto &button : _toolButtons) {
+		button->setVisible(!visible);
+	}
+	if (visible) {
+		rebuildPalette();
+	} else if (showTools) {
+		updateToolSelection(false);
+	}
 }
 
-void ColorPicker::setVisible(bool visible) {
-	_colorLine->setVisible(visible);
-	_canvasForCircle->setVisible(visible);
+void ColorPicker::moveSizeControl(const QSize &size) {
+	if (size.isEmpty()) {
+		return;
+	}
+	const auto areaWidth = std::min(
+		size.width(),
+		st::photoEditorBrushSizeControlHitPadding);
+	const auto areaTop = (_canvasRect.height() > 0)
+		? _canvasRect.y()
+		: (size.height() - _sizeControl->height()) / 2;
+	const auto areaHeight = (_canvasRect.height() > 0)
+		? _canvasRect.height()
+		: _sizeControl->height();
+	_sizeControlHoverArea->setGeometry(
+		0,
+		std::clamp(areaTop, 0, std::max(0, size.height() - areaHeight)),
+		areaWidth,
+		std::min(areaHeight, size.height()));
+
+	const auto collapsedCenterX = sizeControlCurrentCenterX(0.)
+		- st::photoEditorBrushSizeControlLeftSkip;
+	const auto collapsedLeft = collapsedCenterX
+		- (float64(st::photoEditorBrushSizeControlCollapsedWidth) / 2.);
+	const auto y = (_canvasRect.height() > 0)
+		? (rect::center(_canvasRect).y() - _sizeControl->height() / 2)
+		: ((size.height() - _sizeControl->height()) / 2);
+	const auto diff = size.height() - _sizeControl->height();
+	_sizeControl->move(
+		-int(base::SafeRound(collapsedLeft)),
+		std::clamp(y, 0, std::max(0, diff)));
 }
 
-rpl::producer<Brush> ColorPicker::saveBrushRequests() const {
-	return _saveBrushRequests.events_starting_with_copy(_brush);
+void ColorPicker::updateSizeControlExpanded() {
+	const auto expanded = _sizeDown.pressed
+		|| _sizeHoverAreaHovered
+		|| _sizeControlHovered;
+	if (_sizeControlExpanded == expanded
+		&& !_sizeControlAnimation.animating()) {
+		return;
+	}
+	_sizeControlExpanded = expanded;
+	const auto from = _sizeControlAnimation.value(expanded ? 0. : 1.);
+	const auto to = expanded ? 1. : 0.;
+	_sizeControlAnimation.stop();
+	_sizeControlAnimation.start(
+		[=] { _sizeControl->update(); },
+		from,
+		to,
+		kCircleDuration * std::abs(to - from),
+		anim::easeOutCirc);
+	_sizeControl->update();
 }
 
-int ColorPicker::colorToPosition(const QColor &color) const {
-	const auto step = 1. / kPrecision;
-	for (auto i = 0.; i <= 1.; i += step) {
-		if (positionToColor(i * _width) == color) {
-			return i * _width;
-		}
+void ColorPicker::updateSizeControlMousePosition(int y) {
+	_sizeDown.y = std::clamp(y, sizeControlTop(), sizeControlBottom());
+	_brush.sizeRatio = sizeControlRatioFromY(_sizeDown.y);
+	storeCurrentBrush();
+}
+
+void ColorPicker::updateSizeControlPositionFromRatio(bool animated) {
+	const auto target = sizeControlYFromRatio(_brush.sizeRatio);
+	if (!animated || _sizeDown.pressed) {
+		_sizeControlPositionAnimation.stop();
+		_sizeDown.y = target;
+		return;
 	}
-	return 0;
+	if (_sizeDown.y == target) {
+		return;
+	}
+	_sizeControlPositionFrom = _sizeDown.y;
+	_sizeControlPositionTo = target;
+	_sizeControlPositionAnimation.stop();
+	_sizeControlPositionAnimation.start([=] {
+		const auto progress = _sizeControlPositionAnimation.value(1.);
+		_sizeDown.y = anim::interpolate(
+			_sizeControlPositionFrom,
+			_sizeControlPositionTo,
+			progress);
+		_sizeControl->update();
+	}, 0., 1., kSizeControlSwitchDuration, anim::easeOutCirc);
+	_sizeControl->update();
 }
 
-bool ColorPicker::preventHandleKeyPress() const {
-	return _canvasForCircle->isVisible()
-		&& (_circleAnimation.animating() || _down.pressed);
+int ColorPicker::sizeControlShapeTop() const {
+	return st::photoEditorBrushSizeControlHitPadding;
+}
+
+int ColorPicker::sizeControlShapeBottom() const {
+	return _sizeControl->height() - st::photoEditorBrushSizeControlHitPadding;
+}
+
+int ColorPicker::sizeControlTop() const {
+	return sizeControlShapeTop()
+		+ (st::photoEditorBrushSizeControlExpandedTopWidth / 2);
+}
+
+int ColorPicker::sizeControlBottom() const {
+	return sizeControlShapeBottom()
+		- (st::photoEditorBrushSizeControlExpandedBottomWidth / 2);
+}
+
+float ColorPicker::sizeControlRatioFromY(int y) const {
+	const auto top = sizeControlTop();
+	const auto bottom = sizeControlBottom();
+	if (bottom <= top) {
+		return 1.f;
+	}
+	const auto ratio = 1. - InterpolationRatio(top, bottom, y);
+	return std::clamp(ratio, kMinBrushSize, 1.0);
+}
+
+int ColorPicker::sizeControlYFromRatio(float ratio) const {
+	const auto top = sizeControlTop();
+	const auto bottom = sizeControlBottom();
+	if (bottom <= top) {
+		return top;
+	}
+	const auto normalized = std::clamp(
+		(ratio - kMinBrushSize) / (1.0 - kMinBrushSize),
+		0.0,
+		1.0);
+	return std::clamp(
+		anim::interpolate(bottom, top, normalized),
+		top,
+		bottom);
+}
+
+QRectF ColorPicker::sizeControlHandleRect(float64 progress) const {
+	const auto handleSize = sizeControlHandleSize();
+	const auto centerX = sizeControlCurrentCenterX(progress);
+	return QRectF(
+		centerX - handleSize / 2.,
+		_sizeDown.y - handleSize / 2.,
+		handleSize,
+		handleSize);
+}
+
+QRectF ColorPicker::sizeControlHitRect(float64 progress) const {
+	const auto collapsed = st::photoEditorBrushSizeControlCollapsedWidth;
+	const auto width = float64(anim::interpolate(
+		collapsed,
+		st::photoEditorBrushSizeControlExpandedTopWidth,
+		progress));
+	const auto centerX = sizeControlCurrentCenterX(progress);
+	const auto top = float64(sizeControlShapeTop());
+	const auto bottom = float64(sizeControlShapeBottom());
+	return QRectF(
+		centerX - width / 2.,
+		top,
+		width,
+		bottom - top);
+}
+
+QPainterPath ColorPicker::sizeControlShapePath(float64 progress) const {
+	const auto collapsed = st::photoEditorBrushSizeControlCollapsedWidth;
+	const auto topWidth = float64(anim::interpolate(
+		collapsed,
+		st::photoEditorBrushSizeControlExpandedTopWidth,
+		progress));
+	const auto topInset = st::photoEditorBrushSizeControlTopInset;
+	const auto adjustedTopWidth = std::max(
+		0.,
+		topWidth - float64(topInset * 2));
+	const auto bottomWidth = float64(anim::interpolate(
+		collapsed,
+		st::photoEditorBrushSizeControlExpandedBottomWidth,
+		progress));
+	const auto centerX = sizeControlCurrentCenterX(progress);
+	const auto top = float64(sizeControlShapeTop()) + topInset;
+	const auto bottom = float64(sizeControlShapeBottom());
+	const auto topRadius = adjustedTopWidth / 2.;
+	const auto bottomRadius = bottomWidth / 2.;
+
+	auto path = QPainterPath();
+	const auto topRect = QRectF(
+		centerX - topRadius,
+		top,
+		adjustedTopWidth,
+		adjustedTopWidth);
+	const auto bottomRect = QRectF(
+		centerX - bottomRadius,
+		bottom - bottomWidth,
+		bottomWidth,
+		bottomWidth);
+	path.moveTo(centerX - topRadius, top + topRadius);
+	path.arcTo(topRect, 180., -180.);
+	path.lineTo(centerX + bottomRadius, bottom - bottomRadius);
+	path.arcTo(bottomRect, 0., -180.);
+	path.lineTo(centerX - topRadius, top + topRadius);
+	path.closeSubpath();
+	return path;
+}
+
+float64 ColorPicker::sizeControlCurrentCenterX(float64 progress) const {
+	const auto from = float64(st::photoEditorBrushSizeControlCollapsedWidth)
+		/ 2.;
+	const auto to = float64(st::photoEditorBrushSizeControlExpandShift)
+		+ float64(st::photoEditorBrushSizeControlExpandedTopWidth) / 2.;
+	return float64(st::photoEditorBrushSizeControlHitPadding)
+		+ InterpolateF(from, to, progress);
+}
+
+float64 ColorPicker::sizeControlHandleSize() const {
+	const auto width = kMinBrushWidth
+		+ (kMaxBrushWidth - kMinBrushWidth) * _brush.sizeRatio;
+	return std::clamp(
+		width,
+		float64(st::photoEditorBrushSizeControlExpandedBottomWidth),
+		float64(st::photoEditorBrushSizeControlExpandedTopWidth));
 }
 
 } // namespace Editor
diff --git a/Telegram/SourceFiles/editor/color_picker.h b/Telegram/SourceFiles/editor/color_picker.h
index 84c3354ea59b78..3d64431ce62fcb 100644
--- a/Telegram/SourceFiles/editor/color_picker.h
+++ b/Telegram/SourceFiles/editor/color_picker.h
@@ -10,57 +10,100 @@ For license and copyright information please follow this link:
 #include "base/unique_qptr.h"
 #include "editor/photo_editor_inner_common.h"
 #include "ui/effects/animations.h"
+#include "ui/peer/color_sample.h"
 
 namespace Ui {
 class RpWidget;
+class Show;
 } // namespace Ui
 
 namespace Editor {
 
 class ColorPicker final {
 public:
-	struct OutlinedStop {
-		std::optional<int> stopPos = std::nullopt;
-		std::optional<int> prevStopPos = std::nullopt;
-		std::optional<int> nextStopPos = std::nullopt;
-	};
-
-	ColorPicker(not_null<Ui::RpWidget*> parent, const Brush &savedBrush);
+	ColorPicker(
+		not_null<Ui::RpWidget*> parent,
+		std::shared_ptr<Ui::Show> show,
+		const std::array<Brush, 5> &savedBrushes,
+		Brush::Tool savedTool);
 
 	void moveLine(const QPoint &position);
+	void setCanvasRect(const QRect &rect);
 	void setVisible(bool visible);
+	void setColor(const QColor &color);
+	void setToolSelectionVisible(bool visible);
 	bool preventHandleKeyPress() const;
 
 	rpl::producer<Brush> saveBrushRequests() const;
+	rpl::producer<> toolClicks() const;
 
 private:
-	void paintCircle(QPainter &p);
-	void paintOutline(QPainter &p, const QRectF &rect);
-	QColor positionToColor(int x) const;
-	int colorToPosition(const QColor &color) const;
-	int circleHeight(float64 progress = 0.) const;
-	void updateMousePosition(const QPoint &pos, float64 progress);
-
-	const QColor _circleColor;
-	const int _width;
-	const int _lineHeight;
-
-	const base::unique_qptr<Ui::RpWidget> _colorLine;
-	const base::unique_qptr<Ui::RpWidget> _canvasForCircle;
-
-	const QGradientStops _gradientStops;
-	const OutlinedStop _outlinedStop;
-	const QBrush _gradientBrush;
+	void paintSizeControl(QPainter &p);
+	void rebuildPalette();
+	void updateToolButtonsGeometry();
+	void updateToolSelection(bool animated);
+	void setTool(Brush::Tool tool);
+	void storeCurrentBrush();
+	void updateColorButtonColor(const QColor &color, bool animated);
+	[[nodiscard]] QColor colorButtonColor() const;
+	void updatePaletteGeometry();
+	void setPaletteVisible(bool visible);
+	void moveSizeControl(const QSize &size);
+	void updateSizeControlExpanded();
+	void updateSizeControlMousePosition(int y);
+	void updateSizeControlPositionFromRatio(bool animated);
+	[[nodiscard]] int sizeControlShapeTop() const;
+	[[nodiscard]] int sizeControlShapeBottom() const;
+	[[nodiscard]] int sizeControlTop() const;
+	[[nodiscard]] int sizeControlBottom() const;
+	[[nodiscard]] float sizeControlRatioFromY(int y) const;
+	[[nodiscard]] int sizeControlYFromRatio(float ratio) const;
+	[[nodiscard]] QRectF sizeControlHandleRect(float64 progress) const;
+	[[nodiscard]] QRectF sizeControlHitRect(float64 progress) const;
+	[[nodiscard]] QPainterPath sizeControlShapePath(float64 progress) const;
+	[[nodiscard]] float64 sizeControlCurrentCenterX(float64 progress) const;
+	[[nodiscard]] float64 sizeControlHandleSize() const;
+
+	const not_null<Ui::RpWidget*> _parent;
+	const std::shared_ptr<Ui::Show> _show;
+
+	const base::unique_qptr<Ui::AbstractButton> _colorButton;
+	const base::unique_qptr<Ui::RpWidget> _paletteWrap;
+	const base::unique_qptr<Ui::RpWidget> _sizeControlHoverArea;
+	const base::unique_qptr<Ui::RpWidget> _sizeControl;
+	const base::unique_qptr<Ui::RpWidget> _toolSelection;
+	std::vector<base::unique_qptr<Ui::AbstractButton>> _toolButtons;
 
 	struct {
-		QPoint pos;
+		int y = 0;
 		bool pressed = false;
-	} _down;
+	} _sizeDown;
+	bool _toolSelectionSuppressed = false;
+	bool _sizeHoverAreaHovered = false;
+	bool _sizeControlHovered = false;
+	bool _sizeControlExpanded = false;
+	int _sizeControlPositionFrom = 0;
+	int _sizeControlPositionTo = 0;
+	QRect _canvasRect;
+	QPoint _colorButtonCenter;
+	bool _paletteVisible = false;
 	Brush _brush;
+	QColor _colorButtonFrom;
+	QColor _colorButtonTo;
+	std::array<Brush, 5> _toolBrushes;
 
-	Ui::Animations::Simple _circleAnimation;
+	Ui::Animations::Simple _sizeControlAnimation;
+	Ui::Animations::Simple _sizeControlPositionAnimation;
+	Ui::Animations::Simple _colorButtonAnimation;
+	Ui::Animations::Simple _toolSelectionAnimation;
 
 	rpl::event_stream<Brush> _saveBrushRequests;
+	rpl::event_stream<> _toolClicks;
+
+	std::vector<base::unique_qptr<Ui::ColorSample>> _paletteButtons;
+	base::unique_qptr<Ui::AbstractButton> _palettePlus;
+	QPoint _toolSelectionFrom;
+	QPoint _toolSelectionTo;
 
 };
 
diff --git a/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp b/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp
index 2c0482c3325d5a..2958e1b4e2b52a 100644
--- a/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp
+++ b/Telegram/SourceFiles/editor/controllers/stickers_panel_controller.cpp
@@ -27,7 +27,7 @@ StickersPanelController::StickersPanelController(
 				nullptr,
 				ChatHelpers::TabbedSelectorDescriptor{
 					.show = show,
-					.st = st::storiesComposeControls.tabbed,
+					.st = st::mediaviewEmojiPan,
 					.level = Window::GifPauseReason::Layer,
 					.mode = ChatHelpers::TabbedSelector::Mode::MediaEditor,
 					.features = {
@@ -60,7 +60,7 @@ void StickersPanelController::setShowRequestChanges(
 		rpl::producer<ShowRequest> &&showRequest) {
 	std::move(
 		showRequest
-	) | rpl::start_with_next([=](ShowRequest show) {
+	) | rpl::on_next([=](ShowRequest show) {
 		if (show == ShowRequest::ToggleAnimated) {
 			_stickersPanel->toggleAnimated();
 			_stickersPanel->raise();
@@ -79,7 +79,7 @@ void StickersPanelController::setMoveRequestChanges(
 		rpl::producer<QPoint> &&moveRequest) {
 	std::move(
 		moveRequest
-	) | rpl::start_with_next([=](const QPoint &point) {
+	) | rpl::on_next([=](const QPoint &point) {
 		_stickersPanel->moveBottomRight(
 			point.y(),
 			point.x() + _stickersPanel->width() / 2);
diff --git a/Telegram/SourceFiles/editor/editor.style b/Telegram/SourceFiles/editor/editor.style
index 3a56f21c8fe76f..81f5eed2a4e324 100644
--- a/Telegram/SourceFiles/editor/editor.style
+++ b/Telegram/SourceFiles/editor/editor.style
@@ -10,6 +10,7 @@ using "ui/basic.style";
 using "window/window.style";
 using "ui/widgets/widgets.style";
 using "ui/chat/chat.style";
+using "media/view/media_view.style";
 
 // photoEditorControlsBottomSkip * 2 + photoEditorControlsCenterSkip + photoEditorButtonBarHeight * 2
 photoEditorControlsHeight: 146px;
@@ -23,13 +24,15 @@ photoEditorContentMargins: margins(
 	photoEditorControlsBottomSkip,
 	photoEditorControlsHeight);
 
-photoEditorBarAnimationDuration: 200;
+photoEditorBarAnimationDuration: 100;
 
 photoEditorButtonIconFg: mediaviewPipControlsFg;
 photoEditorButtonIconFgOver: mediaviewPipControlsFgOver;
 
 photoEditorButtonIconFgActive: lightButtonFg;
 photoEditorButtonIconFgInactive: mediaviewPipPlaybackInactive;
+photoEditorEdgeButtonBg: shadowFg;
+photoEditorEdgeButtonMargins: margins(4px, 4px, 4px, 4px);
 
 photoEditorButtonBarHeight: 48px;
 photoEditorButtonBarWidth: 422px;
@@ -39,7 +42,6 @@ photoEditorTextButtonPadding: margins(22px, 0px, 22px, 0px);
 photoEditorButtonStyle: TextStyle(semiboldTextStyle) {
 	font: font(14px semibold);
 }
-photoEditorButtonTextTop: 15px;
 
 photoEditorAbout: FlatLabel(defaultFlatLabel) {
 	textFg: mediaviewCaptionFg;
@@ -87,16 +89,77 @@ photoEditorStickersButton: IconButton(photoEditorRotateButton) {
 }
 photoEditorStickersIconActive: icon {{ "settings/settings_stickers", photoEditorButtonIconFgActive }};
 
+photoEditorCropRatioButton: IconButton(photoEditorRotateButton) {
+	icon: icon {{ "photo_editor/ratio-23x23", photoEditorButtonIconFg, point(0px, 1px) }};
+	iconOver: icon {{ "photo_editor/ratio-23x23", photoEditorButtonIconFgOver, point(0px, 1px) }};
+}
+photoEditorCropRatioIconActive: icon {{ "photo_editor/ratio-23x23", photoEditorButtonIconFgActive, point(0px, 1px) }};
+
+photoEditorCornersButton: IconButton(photoEditorRotateButton) {
+	icon: icon {{ "photo_editor/corners-23x23", photoEditorButtonIconFg, point(0px, 1px) }};
+	iconOver: icon {{ "photo_editor/corners-23x23", photoEditorButtonIconFgOver, point(0px, 1px) }};
+}
+photoEditorCornersIconActive: icon {{ "photo_editor/corners-23x23", photoEditorButtonIconFgActive, point(0px, 1px) }};
+
+photoEditorCornersMenuAboutLabel: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(11px);
+	}
+	minWidth: 136px;
+	textFg: groupCallMemberNotJoinedStatus;
+}
+photoEditorCornersMenuAboutPosition: point(12px, 4px);
+
+photoEditorMenuSubmenuArrow: icon {{ "menu/submenu_arrow", groupCallMemberNotJoinedStatus }};
+
+photoEditorCropRatioMenu: PopupMenu(mediaviewPopupMenu) {
+	menu: Menu(mediaviewMenu) {
+		widthMin: 108px;
+		arrow: photoEditorMenuSubmenuArrow;
+	}
+}
+
 photoEditorUndoButtonInactive: icon {{ "photo_editor/undo", photoEditorButtonIconFgInactive }};
 photoEditorRedoButtonInactive: icon {{ "photo_editor/undo-flip_horizontal", photoEditorButtonIconFgInactive }};
 
-photoEditorColorPickerWidth: 250px;
-photoEditorColorPickerLineHeight: 10px;
-photoEditorColorPickerCanvasHeight: 300px;
-photoEditorColorPickerCircleSize: 24px;
-photoEditorColorPickerCircleBigSize: 50px;
-
-photoEditorColorPickerCircleSkip: 50px;
+photoEditorColorButtonSize: 24px;
+photoEditorColorButtonBorder: 1px;
+photoEditorColorButtonBorderFg: mediaviewCaptionFg;
+photoEditorColorPaletteItemSize: 20px;
+photoEditorColorPaletteGap: 6px;
+photoEditorColorPaletteSelectionWidth: 2px;
+photoEditorColorPalettePlusLine: 2px;
+photoEditorColorPalettePlusFg: mediaviewCaptionFg;
+
+photoEditorToolButtonSize: 20px;
+photoEditorToolButtonIconSize: 20px;
+photoEditorToolButtonGap: 18px;
+photoEditorToolButtonHoverDuration: 350;
+photoEditorToolButtonSelectDuration: 120;
+photoEditorToolButtonSelectedFg: mediaviewCaptionFg;
+photoEditorToolButtonSelectedWidth: 2px;
+photoEditorToolButtonSelectedPadding: 2px;
+photoEditorToolButtonSelectedOpacity: 0.35;
+photoEditorToolButtonSelectedExtra: 8px;
+
+photoEditorMarkerOpacity: 0.35;
+photoEditorMarkerSizeMultiplier: 2.5;
+photoEditorArrowHeadLengthFactor: 2.5;
+photoEditorArrowHeadMinDistanceFactor: 1.5;
+photoEditorArrowHeadAngleDegrees: 26;
+photoEditorEraserPreviewOpacity: 0.25;
+photoEditorBlurSizeMultiplier: 3.0;
+photoEditorBlurPreviewOpacity: 0.25;
+photoEditorBlurRadius: 20;
+
+photoEditorBrushSizeControlLeftSkip: -3px;
+photoEditorBrushSizeControlHeight: 280px;
+photoEditorBrushSizeControlCollapsedWidth: 6px;
+photoEditorBrushSizeControlExpandedTopWidth: 25px;
+photoEditorBrushSizeControlExpandedBottomWidth: 4px;
+photoEditorBrushSizeControlExpandShift: 14px;
+photoEditorBrushSizeControlHitPadding: 24px;
+photoEditorBrushSizeControlTopInset: 1px;
 
 photoEditorCropPointSize: 10px;
 photoEditorCropMinSize: 20px;
diff --git a/Telegram/SourceFiles/editor/editor_crop.cpp b/Telegram/SourceFiles/editor/editor_crop.cpp
index 54f8369c274f81..ec50507762781b 100644
--- a/Telegram/SourceFiles/editor/editor_crop.cpp
+++ b/Telegram/SourceFiles/editor/editor_crop.cpp
@@ -19,6 +19,10 @@ constexpr auto kETL = Qt::TopEdge | Qt::LeftEdge;
 constexpr auto kETR = Qt::TopEdge | Qt::RightEdge;
 constexpr auto kEBL = Qt::BottomEdge | Qt::LeftEdge;
 constexpr auto kEBR = Qt::BottomEdge | Qt::RightEdge;
+constexpr auto kEL = Qt::Edges(Qt::LeftEdge);
+constexpr auto kER = Qt::Edges(Qt::RightEdge);
+constexpr auto kET = Qt::Edges(Qt::TopEdge);
+constexpr auto kEB = Qt::Edges(Qt::BottomEdge);
 constexpr auto kEAll = Qt::TopEdge
 	| Qt::LeftEdge
 	| Qt::BottomEdge
@@ -34,6 +38,10 @@ QPoint PointOfEdge(Qt::Edges e, const QRectF &r) {
 	case kETR: return QPoint(r.x() + r.width(), r.y());
 	case kEBL: return QPoint(r.x(), r.y() + r.height());
 	case kEBR: return QPoint(r.x() + r.width(), r.y() + r.height());
+	case kEL: return QPoint(r.x(), r.y() + (r.height() / 2.));
+	case kER: return QPoint(r.x() + r.width(), r.y() + (r.height() / 2.));
+	case kET: return QPoint(r.x() + (r.width() / 2.), r.y());
+	case kEB: return QPoint(r.x() + (r.width() / 2.), r.y() + r.height());
 	default: return QPoint();
 	}
 }
@@ -42,6 +50,15 @@ QSizeF FlipSizeByRotation(const QSizeF &size, int angle) {
 	return (((angle / 90) % 2) == 1) ? size.transposed() : size;
 }
 
+[[nodiscard]] QRectF OriginalCrop(QSize outer, QSize inner) {
+	const auto size = inner.scaled(outer, Qt::KeepAspectRatio);
+	return QRectF(
+		(outer.width() - size.width()) / 2,
+		(outer.height() - size.height()) / 2,
+		size.width(),
+		size.height());
+}
+
 } // namespace
 
 Crop::Crop(
@@ -60,19 +77,27 @@ Crop::Crop(
 , _data(std::move(data))
 , _cropOriginal(modifications.crop.isValid()
 	? modifications.crop
+	: !_data.exactSize.isEmpty()
+	? OriginalCrop(_imageSize, _data.exactSize)
 	: QRectF(QPoint(), _imageSize))
 , _angle(modifications.angle)
 , _flipped(modifications.flipped)
-, _keepAspectRatio(_data.keepAspectRatio) {
+, _keepAspectRatio(_data.keepAspectRatio)
+, _cornersLevel(modifications.cornersLevel) {
 
 	setMouseTracking(true);
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(this);
 
 		p.fillPath(_painterPath, st::photoCropFadeBg);
-		paintPoints(p);
+		paintFrame(p);
+		const auto gridOpacity = _gridOpacityAnimation.value(
+			_gridVisible ? 1. : 0.);
+		if (gridOpacity > 0.) {
+			paintGrid(p, gridOpacity);
+		}
 	}, lifetime());
 
 }
@@ -129,12 +154,109 @@ void Crop::applyTransform(
 	}
 }
 
-void Crop::paintPoints(QPainter &p) {
+QPainterPath Crop::cropPath() const {
+	auto result = QPainterPath();
+	if (_data.cropType == EditorData::CropType::Ellipse) {
+		result.addEllipse(_cropPaint);
+	} else if (_data.cropType == EditorData::CropType::RoundedRect) {
+		const auto multiplier = RoundedCornersMultiplier(_cornersLevel);
+		if (multiplier <= 0.) {
+			result.addRect(_cropPaint);
+		} else {
+			const auto radius = std::min(
+				_cropPaint.width(),
+				_cropPaint.height()) * multiplier;
+			result.addRoundedRect(_cropPaint, radius, radius);
+		}
+	} else {
+		result.addRect(_cropPaint);
+	}
+	return result;
+}
+
+void Crop::paintFrame(QPainter &p) {
+	const auto framePath = cropPath();
+	auto frameStroker = QPainterPathStroker();
+	frameStroker.setWidth(st::lineWidth * 2);
+	frameStroker.setJoinStyle(Qt::MiterJoin);
+	frameStroker.setCapStyle(Qt::SquareCap);
+	auto frameShape = frameStroker.createStroke(framePath);
 	p.save();
-	p.setPen(Qt::NoPen);
-	p.setBrush(st::photoCropPointFg);
-	for (const auto &r : ranges::views::values(_edges)) {
-		p.drawRect(r);
+	p.setRenderHint(QPainter::Antialiasing, true);
+	p.fillPath(frameShape, st::photoCropPointFg);
+	{
+		const auto cornerLength = std::min(
+			float64(st::photoEditorCropPointSize * 2),
+			std::min(_cropPaint.width(), _cropPaint.height()) / 2.);
+		if (cornerLength > 0.) {
+			auto cornerLines = QPainterPath();
+			cornerLines.moveTo(_cropPaint.left(), _cropPaint.top());
+			cornerLines.lineTo(
+				_cropPaint.left() + cornerLength,
+				_cropPaint.top());
+			cornerLines.moveTo(_cropPaint.left(), _cropPaint.top());
+			cornerLines.lineTo(
+				_cropPaint.left(),
+				_cropPaint.top() + cornerLength);
+			cornerLines.moveTo(_cropPaint.right(), _cropPaint.top());
+			cornerLines.lineTo(
+				_cropPaint.right() - cornerLength,
+				_cropPaint.top());
+			cornerLines.moveTo(_cropPaint.right(), _cropPaint.top());
+			cornerLines.lineTo(
+				_cropPaint.right(),
+				_cropPaint.top() + cornerLength);
+			cornerLines.moveTo(_cropPaint.left(), _cropPaint.bottom());
+			cornerLines.lineTo(
+				_cropPaint.left() + cornerLength,
+				_cropPaint.bottom());
+			cornerLines.moveTo(_cropPaint.left(), _cropPaint.bottom());
+			cornerLines.lineTo(
+				_cropPaint.left(),
+				_cropPaint.bottom() - cornerLength);
+			cornerLines.moveTo(_cropPaint.right(), _cropPaint.bottom());
+			cornerLines.lineTo(
+				_cropPaint.right() - cornerLength,
+				_cropPaint.bottom());
+			cornerLines.moveTo(_cropPaint.right(), _cropPaint.bottom());
+			cornerLines.lineTo(
+				_cropPaint.right(),
+				_cropPaint.bottom() - cornerLength);
+
+			auto cornerStroker = QPainterPathStroker();
+			cornerStroker.setWidth(st::lineWidth * 4);
+			cornerStroker.setJoinStyle(Qt::MiterJoin);
+			cornerStroker.setCapStyle(Qt::SquareCap);
+			auto cornerColor = st::photoCropPointFg->c;
+			cornerColor.setAlpha(255);
+			p.fillPath(cornerStroker.createStroke(cornerLines), cornerColor);
+		}
+	}
+	p.restore();
+}
+
+void Crop::paintGrid(QPainter &p, float64 opacity) {
+	if ((_cropPaint.width() <= 0.) || (_cropPaint.height() <= 0.)) {
+		return;
+	}
+	p.save();
+	p.setOpacity(opacity);
+	p.setRenderHint(QPainter::Antialiasing, true);
+	p.setClipPath(cropPath());
+	auto pen = QPen(st::photoCropPointFg, st::lineWidth);
+	pen.setCapStyle(Qt::FlatCap);
+	p.setPen(pen);
+	const auto horizontalStep = _cropPaint.width() / 3.;
+	const auto verticalStep = _cropPaint.height() / 3.;
+	for (auto i = 1; i < 3; ++i) {
+		const auto x = _cropPaint.left() + (horizontalStep * i);
+		const auto y = _cropPaint.top() + (verticalStep * i);
+		p.drawLine(
+			QPointF(x, _cropPaint.top()),
+			QPointF(x, _cropPaint.bottom()));
+		p.drawLine(
+			QPointF(_cropPaint.left(), y),
+			QPointF(_cropPaint.right(), y));
 	}
 	p.restore();
 }
@@ -146,15 +268,7 @@ void Crop::setCropPaint(QRectF &&rect) {
 
 	_painterPath.clear();
 	_painterPath.addRect(_innerRect);
-	if (_data.cropType == EditorData::CropType::Ellipse) {
-		_painterPath.addEllipse(_cropPaint);
-	} else if (_data.cropType == EditorData::CropType::RoundedRect) {
-		const auto radius = std::min(_cropPaint.width(), _cropPaint.height())
-			* Ui::ForumUserpicRadiusMultiplier();
-		_painterPath.addRoundedRect(_cropPaint, radius, radius);
-	} else {
-		_painterPath.addRect(_cropPaint);
-	}
+	_painterPath.addPath(cropPath());
 }
 
 void Crop::convertCropPaintToOriginal() {
@@ -182,15 +296,46 @@ void Crop::updateEdges() {
 	const auto &s = _pointSize;
 	const auto &m = _edgePointMargins;
 	const auto &r = _cropPaint;
+	const auto sideWidth = std::max(0., r.width() - s);
+	const auto sideHeight = std::max(0., r.height() - s);
 	for (const auto &e : { kETL, kETR, kEBL, kEBR }) {
 		_edges[e] = QRectF(PointOfEdge(e, r), QSize(s, s)) + m;
 	}
+	if (!_keepAspectRatio) {
+		_edges[kEL] = QRectF(
+			r.left() - _pointSizeH,
+			r.top() + _pointSizeH,
+			s,
+			sideHeight);
+		_edges[kER] = QRectF(
+			r.right() - _pointSizeH,
+			r.top() + _pointSizeH,
+			s,
+			sideHeight);
+		_edges[kET] = QRectF(
+			r.left() + _pointSizeH,
+			r.top() - _pointSizeH,
+			sideWidth,
+			s);
+		_edges[kEB] = QRectF(
+			r.left() + _pointSizeH,
+			r.bottom() - _pointSizeH,
+			sideWidth,
+			s);
+	} else {
+		_edges.erase(kEL);
+		_edges.erase(kER);
+		_edges.erase(kET);
+		_edges.erase(kEB);
+	}
 }
 
 Qt::Edges Crop::mouseState(const QPoint &p) {
-	for (const auto &[e, r] : _edges) {
-		if (r.contains(p)) {
-			return e;
+	for (const auto &e : { kETL, kETR, kEBL, kEBR, kEL, kER, kET, kEB }) {
+		if (const auto i = _edges.find(e); i != end(_edges)) {
+			if (i->second.contains(p)) {
+				return e;
+			}
 		}
 	}
 	if (_cropPaint.contains(p)) {
@@ -200,10 +345,23 @@ Qt::Edges Crop::mouseState(const QPoint &p) {
 }
 
 void Crop::mousePressEvent(QMouseEvent *e) {
+	if (_data.fixedCrop && e->button() != Qt::LeftButton) {
+		return;
+	}
 	computeDownState(e->pos());
+	if (_down.edge) {
+		setGridVisible(true, false);
+	}
 }
 
 void Crop::mouseReleaseEvent(QMouseEvent *e) {
+	if (_data.fixedCrop && e->button() != Qt::LeftButton) {
+		return;
+	}
+	const auto hadEdge = bool(_down.edge);
+	if (hadEdge) {
+		setGridVisible(false, true);
+	}
 	clearDownState();
 	convertCropPaintToOriginal();
 }
@@ -252,6 +410,24 @@ void Crop::clearDownState() {
 	_down = InfoAtDown();
 }
 
+void Crop::setGridVisible(bool visible, bool animated) {
+	if ((_gridVisible == visible) && !_gridOpacityAnimation.animating()) {
+		return;
+	}
+	const auto from = _gridOpacityAnimation.value(_gridVisible ? 1. : 0.);
+	const auto to = visible ? 1. : 0.;
+	_gridVisible = visible;
+	_gridOpacityAnimation.stop();
+	if (animated) {
+		_gridOpacityAnimation.start(
+			[=] { update(); },
+			from,
+			to,
+			st::photoEditorBarAnimationDuration * std::abs(to - from));
+	}
+	update();
+}
+
 void Crop::performCrop(const QPoint &pos) {
 	const auto &crop = _down.rect;
 	const auto &pressedEdge = _down.edge;
@@ -276,12 +452,14 @@ void Crop::performCrop(const QPoint &pos) {
 		}
 
 		const auto &minSize = st::photoEditorCropMinSize;
-		const auto xMin = xFactor * int(crop.width() - minSize);
-		// const auto xMin = int(xFactor * crop.width()
-		// 	- xFactor * minSize * ((cropRatio > 1.) ? cropRatio : 1.));
-		const auto yMin = yFactor * int(crop.height() - minSize);
-		// const auto yMin = int(yFactor * crop.height()
-		// 	- yFactor * minSize * ((cropRatio < 1.) ? (1. / cropRatio) : 1.));
+		const auto minW = (_keepAspectRatio && cropRatio > 1.)
+			? (minSize * cropRatio)
+			: float64(minSize);
+		const auto minH = (_keepAspectRatio && cropRatio < 1.)
+			? (minSize / cropRatio)
+			: float64(minSize);
+		const auto xMin = xFactor * int(crop.width() - minW);
+		const auto yMin = yFactor * int(crop.height() - minH);
 
 		const auto x = std::clamp(
 			diff.x(),
@@ -321,12 +499,20 @@ void Crop::mouseMoveEvent(QMouseEvent *e) {
 		update();
 	}
 
+	if (_data.fixedCrop && (e->buttons() & Qt::MiddleButton)) {
+		return;
+	}
+
 	const auto edge = pressedEdge ? pressedEdge : mouseState(pos);
 
 	const auto cursor = ((edge == kETL) || (edge == kEBR))
 		? style::cur_sizefdiag
 		: ((edge == kETR) || (edge == kEBL))
 		? style::cur_sizebdiag
+		: ((edge == kEL) || (edge == kER))
+		? style::cur_sizehor
+		: ((edge == kET) || (edge == kEB))
+		? style::cur_sizever
 		: (edge == kEAll)
 		? style::cur_sizeall
 		: style::cur_default;
@@ -337,6 +523,59 @@ style::margins Crop::cropMargins() const {
 	return _innerMargins;
 }
 
+void Crop::setAspectRatio(float64 ratio) {
+	const auto free = (ratio <= 0.);
+	_keepAspectRatio = !free;
+
+	if (!free) {
+		const auto maxW = _innerRect.width();
+		const auto maxH = _innerRect.height();
+		auto newW = maxW;
+		auto newH = maxW / ratio;
+		if (newH > maxH) {
+			newH = maxH;
+			newW = maxH * ratio;
+		}
+
+		const auto center = _cropPaint.center();
+		auto adjusted = QRectF(
+			center.x() - newW / 2.,
+			center.y() - newH / 2.,
+			newW,
+			newH);
+
+		if (adjusted.left() < _innerRect.left()) {
+			adjusted.moveLeft(_innerRect.left());
+		}
+		if (adjusted.top() < _innerRect.top()) {
+			adjusted.moveTop(_innerRect.top());
+		}
+		if (adjusted.right() > _innerRect.right()) {
+			adjusted.moveRight(_innerRect.right());
+		}
+		if (adjusted.bottom() > _innerRect.bottom()) {
+			adjusted.moveBottom(_innerRect.bottom());
+		}
+
+		setCropPaint(std::move(adjusted));
+		convertCropPaintToOriginal();
+	} else {
+		updateEdges();
+	}
+	update();
+}
+
+void Crop::setCornersLevel(RoundedCornersLevel level) {
+	if (_cornersLevel == level) {
+		return;
+	}
+	_cornersLevel = level;
+	_painterPath.clear();
+	_painterPath.addRect(_innerRect);
+	_painterPath.addPath(cropPath());
+	update();
+}
+
 QRect Crop::saveCropRect() {
 	const auto savedCrop = _cropOriginal.toRect();
 	return (!savedCrop.topLeft().isNull() || (savedCrop.size() != _imageSize))
diff --git a/Telegram/SourceFiles/editor/editor_crop.h b/Telegram/SourceFiles/editor/editor_crop.h
index 002bfcd4eccbe1..f0eab5d0508393 100644
--- a/Telegram/SourceFiles/editor/editor_crop.h
+++ b/Telegram/SourceFiles/editor/editor_crop.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "ui/rp_widget.h"
+#include "ui/effects/animations.h"
 
 #include "base/flat_map.h"
 #include "editor/photo_editor_common.h"
@@ -30,6 +31,8 @@ class Crop final : public Ui::RpWidget {
 		const QSizeF &scaledImageSize);
 	[[nodiscard]] QRect saveCropRect();
 	[[nodiscard]] style::margins cropMargins() const;
+	void setAspectRatio(float64 ratio);
+	void setCornersLevel(RoundedCornersLevel level);
 
 protected:
 	void mousePressEvent(QMouseEvent *e) override;
@@ -51,7 +54,10 @@ class Crop final : public Ui::RpWidget {
 		} borders;
 	};
 
-	void paintPoints(QPainter &p);
+	void paintFrame(QPainter &p);
+	void paintGrid(QPainter &p, float64 opacity);
+	void setGridVisible(bool visible, bool animated);
+	[[nodiscard]] QPainterPath cropPath() const;
 
 	void updateEdges();
 	[[nodiscard]] QPoint pointOfEdge(Qt::Edges e) const;
@@ -86,12 +92,16 @@ class Crop final : public Ui::RpWidget {
 	QPainterPath _painterPath;
 
 	InfoAtDown _down;
+	Ui::Animations::Simple _gridOpacityAnimation;
 
 	int _angle = 0;
 	bool _flipped = false;
+	bool _gridVisible = false;
 
 	bool _keepAspectRatio = false;
 
+	RoundedCornersLevel _cornersLevel = RoundedCornersLevel::Large;
+
 };
 
 } // namespace Editor
diff --git a/Telegram/SourceFiles/editor/editor_layer_widget.cpp b/Telegram/SourceFiles/editor/editor_layer_widget.cpp
index baa149d5a1855b..6c6d43f1c872ea 100644
--- a/Telegram/SourceFiles/editor/editor_layer_widget.cpp
+++ b/Telegram/SourceFiles/editor/editor_layer_widget.cpp
@@ -59,7 +59,7 @@ LayerWidget::LayerWidget(
 	_content->show();
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(this);
 		const auto faded = _backgroundFade.value(1.);
 		if (faded < 1.) {
@@ -83,12 +83,12 @@ void LayerWidget::start() {
 	_background = ProcessBackground(renderBackground(), _backgroundNight);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		checkBackgroundStale();
 		_content->resize(size);
 	}, lifetime());
 
-	style::PaletteChanged() | rpl::start_with_next([=] {
+	style::PaletteChanged() | rpl::on_next([=] {
 		checkBackgroundStale();
 	}, lifetime());
 }
@@ -157,12 +157,12 @@ void LayerWidget::checkCacheBackground() {
 
 void LayerWidget::cacheBackground() {
 	_backgroundCaching = true;
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto night = IsNightMode();
 	crl::async([weak, night, image = renderBackground()]() mutable {
 		auto result = ProcessBackground(image, night);
 		crl::on_main([weak, night, result = std::move(result)]() mutable {
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->backgroundReady(std::move(result), night);
 			}
 		});
diff --git a/Telegram/SourceFiles/editor/editor_paint.cpp b/Telegram/SourceFiles/editor/editor_paint.cpp
index 5f858ae27e9781..c2176f9fa11431 100644
--- a/Telegram/SourceFiles/editor/editor_paint.cpp
+++ b/Telegram/SourceFiles/editor/editor_paint.cpp
@@ -7,20 +7,26 @@ For license and copyright information please follow this link:
 */
 #include "editor/editor_paint.h"
 
+#include "base/platform/base_platform_haptic.h"
 #include "core/mime_type.h"
-#include "ui/boxes/confirm_box.h"
 #include "editor/controllers/controllers.h"
-#include "editor/scene/scene.h"
 #include "editor/scene/scene_item_canvas.h"
 #include "editor/scene/scene_item_image.h"
 #include "editor/scene/scene_item_sticker.h"
+#include "editor/scene/scene_item_text.h"
+#include "editor/scene/scene.h"
 #include "lang/lang_keys.h"
 #include "lottie/lottie_single_player.h"
 #include "storage/storage_media_prepare.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/chat/attach/attach_prepare.h"
+#include "ui/rect.h"
 #include "ui/ui_utility.h"
 
 #include <QGraphicsView>
+#include <QNativeGestureEvent>
+#include <QScrollBar>
+#include <QWheelEvent>
 #include <QtCore/QMimeData>
 
 namespace Editor {
@@ -28,6 +34,15 @@ namespace {
 
 constexpr auto kMaxBrush = 25.;
 constexpr auto kMinBrush = 1.;
+constexpr auto kMinCanvasZoom = 1.;
+constexpr auto kMaxCanvasZoom = 8.;
+constexpr auto kCanvasZoomStep = 1.15;
+constexpr auto kZoomEpsilon = 0.0001;
+constexpr auto kMinItemZoom = 0.1;
+constexpr auto kMaxItemZoom = 10.;
+constexpr auto kCanvasZoomStepFine = 1.015;
+constexpr auto kZoomSmoothTau = 60.;
+constexpr auto kZoomMaxFrameDelta = crl::time(64);
 
 std::shared_ptr<Scene> EnsureScene(
 		PhotoModifications &mods,
@@ -46,25 +61,54 @@ Paint::Paint(
 	not_null<Ui::RpWidget*> parent,
 	PhotoModifications &modifications,
 	const QSize &imageSize,
-	std::shared_ptr<Controllers> controllers)
+	std::shared_ptr<Controllers> controllers,
+	Fn<QImage(QRect)> blurSource,
+	bool fixedCrop)
 : RpWidget(parent)
 , _controllers(controllers)
 , _scene(EnsureScene(modifications, imageSize))
 , _view(base::make_unique_q<QGraphicsView>(_scene.get(), this))
-, _imageSize(imageSize) {
+, _viewport(_view->viewport())
+, _imageSize(imageSize)
+, _fixedCrop(fixedCrop) {
 	Expects(modifications.paint != nullptr);
 
+	_scene->setBlurSource(std::move(blurSource));
+
+	{
+		constexpr auto kDefaultFontSizeDivisor = 15.;
+		const auto shortSide = std::min(
+			imageSize.width(),
+			imageSize.height());
+		_scene->setTextDefaults(
+			QColor(255, 255, 255),
+			shortSide / kDefaultFontSizeDivisor,
+			int(TextStyle::Plain));
+	}
+
 	keepResult();
 
 	_view->show();
 	_view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 	_view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 	_view->setFrameStyle(int(QFrame::NoFrame) | QFrame::Plain);
-	_view->viewport()->setAutoFillBackground(false);
+	_view->setBackgroundBrush(Qt::transparent);
+	_view->setAttribute(Qt::WA_TranslucentBackground, true);
+	_viewport->setAutoFillBackground(false);
+	_viewport->setAttribute(Qt::WA_TranslucentBackground, true);
+	_viewport->installEventFilter(this);
+
+	_scene->textEditStates(
+	) | rpl::on_next([=](bool editing) {
+		_textEditing = editing;
+	}, lifetime());
 
 	// Undo / Redo.
 	controllers->undoController->performRequestChanges(
-	) | rpl::start_with_next([=](const Undo &command) {
+	) | rpl::on_next([=](const Undo &command) {
+		if (_textEditing.current()) {
+			return;
+		}
 		if (command == Undo::Undo) {
 			_scene->performUndo();
 		} else {
@@ -76,16 +120,22 @@ Paint::Paint(
 	}, lifetime());
 
 	controllers->undoController->setCanPerformChanges(rpl::merge(
-		_hasUndo.value() | rpl::map([](bool enable) {
+		rpl::combine(
+			_hasUndo.value(),
+			_textEditing.value()
+		) | rpl::map([](bool enable, bool editing) {
 			return UndoController::EnableRequest{
 				.command = Undo::Undo,
-				.enable = enable,
+				.enable = enable && !editing,
 			};
 		}),
-		_hasRedo.value() | rpl::map([](bool enable) {
+		rpl::combine(
+			_hasRedo.value(),
+			_textEditing.value()
+		) | rpl::map([](bool enable, bool editing) {
 			return UndoController::EnableRequest{
 				.command = Undo::Redo,
-				.enable = enable,
+				.enable = enable && !editing,
 			};
 		})));
 
@@ -97,7 +147,7 @@ Paint::Paint(
 			) | rpl::map_to(ShowRequest::HideAnimated));
 
 		controllers->stickersPanelController->stickerChosen(
-		) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+		) | rpl::on_next([=](not_null<DocumentData*> document) {
 			const auto item = std::make_shared<ItemSticker>(
 				document,
 				itemBaseData());
@@ -110,25 +160,188 @@ Paint::Paint(
 		controllers->stickersPanelController
 			? controllers->stickersPanelController->stickerChosen(
 				) | rpl::to_empty
-			: rpl::never<>() | rpl::type_erased(),
+			: rpl::never<>() | rpl::type_erased,
 		_scene->addsItem()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		clearRedoList();
 		updateUndoState();
 	}, lifetime());
 
 	_scene->removesItem(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateUndoState();
 	}, lifetime());
 
+	_zoomAnimation.init([=](crl::time now) {
+		return zoomAnimationStep(now);
+	});
+
+}
+
+bool Paint::zoomSceneItems(float64 wheelDelta, bool fine) {
+	if (!wheelDelta) {
+		return false;
+	}
+	const auto step = wheelDelta
+		/ float64(QWheelEvent::DefaultDeltasPerStep);
+	const auto base = fine ? kCanvasZoomStepFine : kCanvasZoomStep;
+	return zoomSceneItemsByFactor(std::pow(base, step));
+}
+
+bool Paint::zoomSceneItemsByFactor(float64 factor) {
+	const auto center = rect::center(_scene->sceneRect());
+	auto applied = false;
+	for (const auto &item : _scene->items()) {
+		const auto raw = item.get();
+		const auto oldScale = raw->scale();
+		const auto newScale = std::clamp(
+			oldScale * factor,
+			kMinItemZoom,
+			kMaxItemZoom);
+		if (std::abs(newScale - oldScale) < kZoomEpsilon) {
+			continue;
+		}
+		const auto ratio = newScale / oldScale;
+		raw->setScale(newScale);
+		const auto pos = raw->pos();
+		raw->setPos(center + (pos - center) * ratio);
+		applied = true;
+	}
+	if (!applied && std::abs(factor - 1.) > kZoomEpsilon) {
+		if (!_zoomAtLimit) {
+			_zoomAtLimit = true;
+			base::Platform::Haptic();
+		}
+	} else if (applied) {
+		_zoomAtLimit = false;
+	}
+	return applied;
+}
+
+void Paint::zoomCanvas(float64 factor, QPoint viewportPoint, bool animated) {
+	const auto view = _view.get();
+	if (!view || !_viewport) {
+		return;
+	}
+	const auto current = _zoomAnimation.animating()
+		? _zoomTarget
+		: _transform.userZoom;
+	const auto raw = current * factor;
+	const auto newTarget = std::clamp(raw, kMinCanvasZoom, kMaxCanvasZoom);
+	const auto pushingPastLimit
+		= (factor > 1. && raw > kMaxCanvasZoom + kZoomEpsilon)
+		|| (factor < 1. && raw < kMinCanvasZoom - kZoomEpsilon);
+	if (std::abs(newTarget - current) < kZoomEpsilon) {
+		if (pushingPastLimit && !_zoomAtLimit) {
+			_zoomAtLimit = true;
+			base::Platform::Haptic();
+		}
+		return;
+	}
+	_zoomAtLimit = false;
+	_zoomTarget = newTarget;
+	_zoomFocus = viewportPoint;
+	_zoomAnchorScene = view->mapToScene(viewportPoint);
+	if (animated) {
+		if (!_zoomAnimation.animating()) {
+			_zoomLastFrame = crl::now();
+			_zoomAnimation.start();
+		}
+	} else {
+		_zoomAnimation.stop();
+		applyCanvasZoom(newTarget, false);
+	}
+}
+
+void Paint::applyCanvasZoom(float64 zoom, bool subpixel) {
+	const auto view = _view.get();
+	if (!view || !_viewport) {
+		return;
+	}
+	_transform.userZoom = zoom;
+	updateViewGeometry();
+	applyViewTransform();
+	const auto sceneAtFocus = view->mapToScene(_zoomFocus);
+	const auto center = view->mapToScene(rect::center(_viewport->rect()));
+	view->centerOn(center - (sceneAtFocus - _zoomAnchorScene));
+	if (subpixel) {
+		const auto landed = view->viewportTransform().map(_zoomAnchorScene);
+		auto residual = QPointF(_zoomFocus) - landed;
+		residual.setX(std::clamp(residual.x(), -1., 1.));
+		residual.setY(std::clamp(residual.y(), -1., 1.));
+		view->setTransform(view->transform()
+			* QTransform().translate(residual.x(), residual.y()));
+	}
+	if (const auto parent = parentWidget()) {
+		parent->update(geometry());
+	}
+}
+
+bool Paint::zoomAnimationStep(crl::time now) {
+	const auto delta = std::clamp(
+		now - _zoomLastFrame,
+		crl::time(0),
+		kZoomMaxFrameDelta);
+	_zoomLastFrame = now;
+
+	const auto shown = _transform.userZoom;
+	const auto ratio = 1. - std::exp(-float64(delta) / kZoomSmoothTau);
+	auto next = shown + (_zoomTarget - shown) * ratio;
+	const auto finished = std::abs(next - _zoomTarget) < kZoomEpsilon;
+	if (finished) {
+		next = _zoomTarget;
+	}
+	applyCanvasZoom(next, !finished);
+	return !finished;
+}
+
+void Paint::panSceneItems(QPointF sceneDelta) {
+	if (sceneDelta.isNull()) {
+		return;
+	}
+	for (const auto &item : _scene->items()) {
+		item->setPos(item->pos() + sceneDelta);
+	}
+}
+
+QPointF Paint::mapWidgetDeltaToScene(QPoint delta) const {
+	if (!_view) {
+		return QPointF(delta);
+	}
+	return _view->mapToScene(delta) - _view->mapToScene(QPoint());
+}
+
+Paint::~Paint() {
+	_scene->cancelTextEditing();
+	if (_viewport) {
+		_viewport->removeEventFilter(this);
+	}
+}
+
+void Paint::updateViewGeometry() {
+	if (_imageGeometry.isEmpty()) {
+		return;
+	}
+	const auto target = (_transform.userZoom - kMinCanvasZoom) > kZoomEpsilon
+		? _outerGeometry
+		: _imageGeometry;
+	if (geometry() != target) {
+		setGeometry(target);
+	}
+	_view->setGeometry(rect());
 }
 
 void Paint::applyTransform(QRect geometry, int angle, bool flipped) {
 	if (geometry.isEmpty()) {
 		return;
 	}
-	setGeometry(geometry);
+	_imageGeometry = geometry;
+	_outerGeometry = parentWidget() ? parentWidget()->rect() : geometry;
+
+	const auto center = (_transform.fitZoom <= 0.)
+		|| _view->viewport()->rect().isEmpty()
+		? rect::center(_scene->sceneRect())
+		: _view->mapToScene(_view->viewport()->rect().center());
 	const auto size = geometry.size();
 
 	const auto rotatedImageSize = QTransform()
@@ -139,15 +352,22 @@ void Paint::applyTransform(QRect geometry, int angle, bool flipped) {
 		* (flipped ? -1 : 1);
 	const auto ratioH = size.height() / float64(rotatedImageSize.height());
 
-	_view->setTransform(QTransform().scale(ratioW, ratioH).rotate(angle));
-	_view->setGeometry(QRect(QPoint(), size));
+	_view->setGeometry(rect());
 
 	_transform = {
 		.angle = angle,
 		.flipped = flipped,
-		.zoom = size.width() / float64(_scene->sceneRect().width()),
+		.fitZoom = ((std::abs(ratioW) + std::abs(ratioH)) / 2.),
+		.ratioW = ratioW,
+		.ratioH = ratioH,
+		.userZoom = _transform.userZoom,
 	};
-	_scene->updateZoom(_transform.zoom);
+	updateViewGeometry();
+	applyViewTransform();
+	_view->centerOn(center);
+	if (const auto parent = parentWidget()) {
+		parent->update();
+	}
 }
 
 std::shared_ptr<Scene> Paint::saveScene() const {
@@ -183,7 +403,40 @@ void Paint::updateUndoState() {
 void Paint::applyBrush(const Brush &brush) {
 	_scene->applyBrush(
 		brush.color,
-		(kMinBrush + float64(kMaxBrush - kMinBrush) * brush.sizeRatio));
+		(kMinBrush + float64(kMaxBrush - kMinBrush) * brush.sizeRatio),
+		brush.tool);
+}
+
+void Paint::createTextItem() {
+	_scene->createTextAtCenter(-_transform.angle);
+}
+
+void Paint::clearSelection() {
+	_scene->clearSelection();
+}
+
+void Paint::setTextColor(const QColor &color) {
+	_scene->setTextColor(color);
+}
+
+void Paint::setSelectedTextColor(const QColor &color) {
+	_scene->setSelectedTextColor(color);
+}
+
+rpl::producer<QColor> Paint::textColorRequests() const {
+	return _scene->textColorRequests();
+}
+
+rpl::producer<QColor> Paint::textItemSelections() const {
+	return _scene->textItemSelections();
+}
+
+rpl::producer<> Paint::textItemDeselections() const {
+	return _scene->textItemDeselections();
+}
+
+rpl::producer<bool> Paint::textEditStates() const {
+	return _scene->textEditStates();
 }
 
 void Paint::handleMimeData(const QMimeData *data) {
@@ -220,6 +473,33 @@ void Paint::handleMimeData(const QMimeData *data) {
 	}
 }
 
+void Paint::paintImage(QPainter &p, const QPixmap &image) const {
+	if (_view->geometry().isEmpty()) {
+		return;
+	}
+	p.save();
+	p.setClipRect(geometry(), Qt::IntersectClip);
+	p.translate(pos());
+	p.setTransform(_view->viewportTransform(), true);
+	p.drawPixmap(Rect(_imageSize), image);
+	p.restore();
+}
+
+void Paint::resetView() {
+	_zoomAnimation.stop();
+	_zoomTarget = kMinCanvasZoom;
+	if (_transform.userZoom == kMinCanvasZoom) {
+		return;
+	}
+	_transform.userZoom = kMinCanvasZoom;
+	updateViewGeometry();
+	applyViewTransform();
+	_view->centerOn(rect::center(_scene->sceneRect()));
+	if (const auto parent = parentWidget()) {
+		parent->update(geometry());
+	}
+}
+
 ItemBase::Data Paint::itemBaseData() const {
 	const auto s = _scene->sceneRect().toRect().size();
 	const auto size = std::min(s.width(), s.height()) / 2;
@@ -237,4 +517,100 @@ ItemBase::Data Paint::itemBaseData() const {
 	};
 }
 
+void Paint::applyViewTransform() {
+	_view->setTransform(QTransform()
+		.scale(
+			_transform.ratioW * _transform.userZoom,
+			_transform.ratioH * _transform.userZoom)
+		.rotate(_transform.angle));
+	_transform.zoom = _transform.fitZoom * _transform.userZoom;
+	_scene->updateZoom(_transform.zoom);
+}
+
+bool Paint::eventFilter(QObject *obj, QEvent *e) {
+	if (obj != _viewport) {
+		return RpWidget::eventFilter(obj, e);
+	}
+	const auto view = _view.get();
+	if (!view || !_viewport) {
+		return true;
+	}
+	if (e->type() == QEvent::Wheel) {
+		const auto wheel = static_cast<QWheelEvent*>(e);
+		const auto raw = wheel->angleDelta();
+		const auto delta = raw.y() ? raw.y() : raw.x();
+		if (!delta) {
+			return true;
+		}
+
+		if (_fixedCrop) {
+			zoomSceneItems(
+				delta,
+				wheel->modifiers().testFlag(Qt::ShiftModifier));
+			return true;
+		}
+		const auto step = delta / float64(QWheelEvent::DefaultDeltasPerStep);
+		zoomCanvas(
+			std::pow(kCanvasZoomStep, step),
+			wheel->position().toPoint(),
+			false);
+		return true;
+	} else if (e->type() == QEvent::NativeGesture) {
+		const auto gesture = static_cast<QNativeGestureEvent*>(e);
+		if (gesture->gestureType() != Qt::ZoomNativeGesture) {
+			return RpWidget::eventFilter(obj, e);
+		}
+		const auto factor = 1. + gesture->value();
+		if (_fixedCrop) {
+			zoomSceneItemsByFactor(factor);
+		} else {
+			zoomCanvas(factor, gesture->pos(), true);
+		}
+		return true;
+	} else if (e->type() == QEvent::MouseButtonPress) {
+		const auto mouse = static_cast<QMouseEvent*>(e);
+		if (mouse->button() == Qt::MiddleButton) {
+			_pan = {
+				.active = (_fixedCrop
+					|| _transform.userZoom > kMinCanvasZoom),
+				.point = mouse->pos(),
+			};
+			if (_pan.active) {
+				_viewport->setCursor(Qt::ClosedHandCursor);
+			}
+			return true;
+		}
+	} else if (e->type() == QEvent::MouseMove) {
+		const auto mouse = static_cast<QMouseEvent*>(e);
+		if (_pan.active) {
+			const auto point = mouse->pos();
+			const auto delta = point - _pan.point;
+			_pan.point = point;
+
+			if (_fixedCrop) {
+				panSceneItems(mapWidgetDeltaToScene(delta));
+			} else if (_transform.userZoom > kMinCanvasZoom) {
+				view->horizontalScrollBar()->setValue(
+					view->horizontalScrollBar()->value() - delta.x());
+				view->verticalScrollBar()->setValue(
+					view->verticalScrollBar()->value() - delta.y());
+				if (const auto parent = parentWidget()) {
+					parent->update(geometry());
+				}
+			}
+			return true;
+		}
+	} else if (e->type() == QEvent::MouseButtonRelease) {
+		const auto mouse = static_cast<QMouseEvent*>(e);
+		if (mouse->button() == Qt::MiddleButton) {
+			if (_pan.active) {
+				_viewport->unsetCursor();
+			}
+			_pan.active = false;
+			return true;
+		}
+	}
+	return RpWidget::eventFilter(obj, e);
+}
+
 } // namespace Editor
diff --git a/Telegram/SourceFiles/editor/editor_paint.h b/Telegram/SourceFiles/editor/editor_paint.h
index 8100d79ed2aef9..2a1676cf9e0db0 100644
--- a/Telegram/SourceFiles/editor/editor_paint.h
+++ b/Telegram/SourceFiles/editor/editor_paint.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "ui/rp_widget.h"
+#include "ui/effects/animations.h"
 
 #include "editor/photo_editor_common.h"
 #include "editor/photo_editor_inner_common.h"
@@ -28,7 +29,10 @@ class Paint final : public Ui::RpWidget {
 		not_null<Ui::RpWidget*> parent,
 		PhotoModifications &modifications,
 		const QSize &imageSize,
-		std::shared_ptr<Controllers> controllers);
+		std::shared_ptr<Controllers> controllers,
+		Fn<QImage(QRect)> blurSource,
+		bool fixedCrop = false);
+	~Paint() override;
 
 	[[nodiscard]] std::shared_ptr<Scene> saveScene() const;
 	void restoreScene();
@@ -39,31 +43,76 @@ class Paint final : public Ui::RpWidget {
 	void keepResult();
 	void updateUndoState();
 
+	void createTextItem();
+	void clearSelection();
+	void setTextColor(const QColor &color);
+	void setSelectedTextColor(const QColor &color);
+
+	[[nodiscard]] rpl::producer<QColor> textColorRequests() const;
+	[[nodiscard]] rpl::producer<QColor> textItemSelections() const;
+	[[nodiscard]] rpl::producer<> textItemDeselections() const;
+	[[nodiscard]] rpl::producer<bool> textEditStates() const;
+
 	void handleMimeData(const QMimeData *data);
+	void paintImage(QPainter &p, const QPixmap &image) const;
+	void resetView();
+
+	bool zoomSceneItems(float64 wheelDelta, bool fine = false);
+	bool zoomSceneItemsByFactor(float64 factor);
+	void panSceneItems(QPointF sceneDelta);
+	[[nodiscard]] QPointF mapWidgetDeltaToScene(QPoint delta) const;
 
 private:
+	bool eventFilter(QObject *obj, QEvent *e) override;
+	void updateViewGeometry();
+	void zoomCanvas(float64 factor, QPoint viewportPoint, bool animated);
+	void applyCanvasZoom(float64 zoom, bool subpixel);
+	bool zoomAnimationStep(crl::time now);
+
 	struct SavedItem {
 		std::shared_ptr<QGraphicsItem> item;
 		bool undid = false;
 	};
 
 	ItemBase::Data itemBaseData() const;
+	void applyViewTransform();
 
 	void clearRedoList();
 
 	const std::shared_ptr<Controllers> _controllers;
 	const std::shared_ptr<Scene> _scene;
 	const base::unique_qptr<QGraphicsView> _view;
+	QPointer<QWidget> _viewport;
 	const QSize _imageSize;
+	const bool _fixedCrop = false;
+	QRect _imageGeometry;
+	QRect _outerGeometry;
 
 	struct {
 		int angle = 0;
 		bool flipped = false;
 		float64 zoom = 0.;
+		float64 fitZoom = 0.;
+		float64 ratioW = 0.;
+		float64 ratioH = 0.;
+		float64 userZoom = 1.;
 	} _transform;
 
+	struct {
+		bool active = false;
+		QPoint point;
+	} _pan;
+
+	bool _zoomAtLimit = false;
+	float64 _zoomTarget = 1.;
+	QPoint _zoomFocus;
+	QPointF _zoomAnchorScene;
+	crl::time _zoomLastFrame = 0;
+	Ui::Animations::Basic _zoomAnimation;
+
 	rpl::variable<bool> _hasUndo = true;
 	rpl::variable<bool> _hasRedo = true;
+	rpl::variable<bool> _textEditing = false;
 
 
 };
diff --git a/Telegram/SourceFiles/editor/photo_editor.cpp b/Telegram/SourceFiles/editor/photo_editor.cpp
index 801e122582e4e5..e1170081318df7 100644
--- a/Telegram/SourceFiles/editor/photo_editor.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor.cpp
@@ -22,26 +22,164 @@ namespace Editor {
 namespace {
 
 constexpr auto kPrecision = 100000;
+constexpr auto kBrushesVersion = -2;
+constexpr auto kDefaultBrushSizeRatio = 0.9;
 
-[[nodiscard]] QByteArray Serialize(const Brush &brush) {
+[[nodiscard]] int ToolIndex(Brush::Tool tool) {
+	switch (tool) {
+	case Brush::Tool::Pen: return 0;
+	case Brush::Tool::Arrow: return 1;
+	case Brush::Tool::Marker: return 2;
+	case Brush::Tool::Blur: return 3;
+	case Brush::Tool::Eraser: return 4;
+	}
+	return 0;
+}
+
+[[nodiscard]] Brush::Tool ToolFromIndex(int index) {
+	switch (index) {
+	case 0: return Brush::Tool::Pen;
+	case 1: return Brush::Tool::Arrow;
+	case 2: return Brush::Tool::Marker;
+	case 3: return Brush::Tool::Blur;
+	case 4: return Brush::Tool::Eraser;
+	}
+	return Brush::Tool::Pen;
+}
+
+[[nodiscard]] Brush::Tool ToolFromSerialized(qint32 value) {
+	switch (value) {
+	case int(Brush::Tool::Pen): return Brush::Tool::Pen;
+	case int(Brush::Tool::Arrow): return Brush::Tool::Arrow;
+	case int(Brush::Tool::Marker): return Brush::Tool::Marker;
+	case int(Brush::Tool::Eraser): return Brush::Tool::Eraser;
+	case int(Brush::Tool::Blur): return Brush::Tool::Blur;
+	}
+	return Brush::Tool::Pen;
+}
+
+[[nodiscard]] QColor DefaultBrushColor(Brush::Tool tool) {
+	switch (tool) {
+	case Brush::Tool::Pen: return QColor(234, 39, 57);
+	case Brush::Tool::Arrow: return QColor(252, 150, 77);
+	case Brush::Tool::Marker: return QColor(252, 222, 101);
+	case Brush::Tool::Eraser: return QColor(0, 0, 0);
+	case Brush::Tool::Blur: return QColor(0, 0, 0);
+	}
+	return QColor(234, 39, 57);
+}
+
+[[nodiscard]] Brush DefaultBrush(Brush::Tool tool) {
+	auto result = Brush();
+	result.sizeRatio = kDefaultBrushSizeRatio;
+	result.color = DefaultBrushColor(tool);
+	result.tool = tool;
+	return result;
+}
+
+[[nodiscard]] std::array<Brush, 5> DefaultBrushes() {
+	auto result = std::array<Brush, 5>();
+	for (auto i = 0; i != int(result.size()); ++i) {
+		const auto tool = ToolFromIndex(i);
+		result[i] = DefaultBrush(tool);
+	}
+	return result;
+}
+
+struct BrushState {
+	std::array<Brush, 5> brushes = DefaultBrushes();
+	Brush::Tool tool = Brush::Tool::Pen;
+};
+
+[[nodiscard]] QByteArray Serialize(
+		const std::array<Brush, 5> &brushes,
+		Brush::Tool tool) {
 	auto result = QByteArray();
 	auto stream = QDataStream(&result, QIODevice::WriteOnly);
 	stream.setVersion(QDataStream::Qt_5_3);
-	stream << qint32(brush.sizeRatio * kPrecision) << brush.color;
+	stream
+		<< qint32(kBrushesVersion)
+		<< qint32(int(tool))
+		<< qint32(brushes.size());
+	for (auto i = 0; i != int(brushes.size()); ++i) {
+		const auto tool = ToolFromIndex(i);
+		const auto &brush = brushes[i];
+		stream
+			<< qint32(int(tool))
+			<< qint32(brush.sizeRatio * kPrecision)
+			<< brush.color;
+	}
 	stream.device()->close();
 
 	return result;
 }
 
-[[nodiscard]] Brush Deserialize(const QByteArray &data) {
+[[nodiscard]] BrushState Deserialize(const QByteArray &data) {
+	auto result = BrushState();
+	if (data.isEmpty()) {
+		return result;
+	}
 	auto stream = QDataStream(data);
-	auto result = Brush();
-	auto size = qint32(0);
-	stream >> size >> result.color;
-	result.sizeRatio = size / float(kPrecision);
-	return (stream.status() != QDataStream::Ok)
-		? Brush()
-		: result;
+	auto head = qint32(0);
+	stream >> head;
+	if (stream.status() != QDataStream::Ok) {
+		return result;
+	}
+	if (head < 0) {
+		const auto version = head;
+		auto toolValue = qint32(int(Brush::Tool::Pen));
+		auto count = qint32(0);
+		stream >> toolValue >> count;
+		if (stream.status() != QDataStream::Ok) {
+			return result;
+		}
+		result.tool = ToolFromSerialized(toolValue);
+		auto limit = int(count);
+		if (limit < 0) {
+			limit = 0;
+		} else if (limit > int(result.brushes.size())) {
+			limit = int(result.brushes.size());
+		}
+		for (auto i = 0; i != limit; ++i) {
+			auto entryTool = qint32(int(Brush::Tool::Pen));
+			auto size = qint32(0);
+			auto color = QColor();
+			stream >> entryTool >> size >> color;
+			if (stream.status() != QDataStream::Ok) {
+				return result;
+			}
+			const auto tool = ToolFromSerialized(entryTool);
+			const auto index = ToolIndex(tool);
+			if (version == kBrushesVersion && size > 0) {
+				result.brushes[index].sizeRatio = size / float64(kPrecision);
+			}
+			if (color.isValid()) {
+				result.brushes[index].color = color;
+			}
+			result.brushes[index].tool = tool;
+		}
+		return result;
+	}
+	auto color = QColor();
+	stream >> color;
+	if (stream.status() != QDataStream::Ok) {
+		return result;
+	}
+	auto toolValue = qint32(int(Brush::Tool::Pen));
+	if (!stream.atEnd()) {
+		stream >> toolValue;
+		if (stream.status() != QDataStream::Ok) {
+			toolValue = qint32(int(Brush::Tool::Pen));
+		}
+	}
+	const auto tool = ToolFromSerialized(toolValue);
+	const auto index = ToolIndex(tool);
+	if (color.isValid()) {
+		result.brushes[index].color = color;
+	}
+	result.brushes[index].tool = tool;
+	result.tool = tool;
+	return result;
 }
 
 } // namespace
@@ -79,7 +217,7 @@ PhotoEditor::PhotoEditor(
 			std::move(sessionShow))
 		: nullptr,
 	std::make_unique<UndoController>(),
-	std::move(show)))
+	show))
 , _content(base::make_unique_q<PhotoEditorContent>(
 	this,
 	photo,
@@ -90,13 +228,20 @@ PhotoEditor::PhotoEditor(
 	this,
 	_controllers,
 	_modifications,
-	data))
+	data,
+	photo->size()))
+, _brushes(Deserialize(Core::App().settings().photoEditorBrush()).brushes)
+, _brushTool(Deserialize(Core::App().settings().photoEditorBrush()).tool)
 , _colorPicker(std::make_unique<ColorPicker>(
 	this,
-	Deserialize(Core::App().settings().photoEditorBrush()))) {
+	std::move(show),
+	_brushes,
+	_brushTool)) {
+	_modifications.cropType = data.cropType;
+	_modifications.cropMode = data.cropMode;
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		if (size.isEmpty()) {
 			return;
 		}
@@ -104,10 +249,11 @@ PhotoEditor::PhotoEditor(
 	}, lifetime());
 
 	_content->innerRect(
-	) | rpl::start_with_next([=](QRect inner) {
+	) | rpl::on_next([=](QRect inner) {
 		if (inner.isEmpty()) {
 			return;
 		}
+		_colorPicker->setCanvasRect(inner.translated(_content->pos()));
 		const auto innerTop = _content->y() + inner.top();
 		const auto skip = st::photoEditorCropPointSize;
 		const auto controlsRect = rect()
@@ -116,23 +262,23 @@ PhotoEditor::PhotoEditor(
 	}, lifetime());
 
 	_controls->colorLinePositionValue(
-	) | rpl::start_with_next([=](const QPoint &p) {
+	) | rpl::on_next([=](const QPoint &p) {
 		_colorPicker->moveLine(p);
 	}, _controls->lifetime());
 
 	_controls->colorLineShownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		_colorPicker->setVisible(shown);
 	}, _controls->lifetime());
 
 	_mode.value(
-	) | rpl::start_with_next([=](const PhotoEditorMode &mode) {
+	) | rpl::on_next([=](const PhotoEditorMode &mode) {
 		_content->applyMode(mode);
 		_controls->applyMode(mode);
 	}, lifetime());
 
 	_controls->rotateRequests(
-	) | rpl::start_with_next([=](int angle) {
+	) | rpl::on_next([=](int angle) {
 		_modifications.angle += 90;
 		if (_modifications.angle >= 360) {
 			_modifications.angle -= 360;
@@ -141,21 +287,36 @@ PhotoEditor::PhotoEditor(
 	}, lifetime());
 
 	_controls->flipRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_modifications.flipped = !_modifications.flipped;
 		_content->applyModifications(_modifications);
 	}, lifetime());
 
+	_controls->aspectRatioChanges() | rpl::on_next([=](float64 ratio) {
+		_content->applyAspectRatio(ratio);
+	}, lifetime());
+
+	_controls->cornersLevelChanges(
+	) | rpl::on_next([=](RoundedCornersLevel level) {
+		_modifications.cornersLevel = level;
+		_content->applyModifications(_modifications);
+	}, lifetime());
+
 	_controls->paintModeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_mode = PhotoEditorMode{
 			.mode = PhotoEditorMode::Mode::Paint,
 			.action = PhotoEditorMode::Action::None,
 		};
 	}, lifetime());
 
+	_controls->textRequests(
+	) | rpl::on_next([=] {
+		_content->createTextItem();
+	}, lifetime());
+
 	_controls->doneRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto mode = _mode.current().mode;
 		if (mode == PhotoEditorMode::Mode::Paint) {
 			_mode = PhotoEditorMode{
@@ -172,7 +333,7 @@ PhotoEditor::PhotoEditor(
 	}, lifetime());
 
 	_controls->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto mode = _mode.current().mode;
 		if (mode == PhotoEditorMode::Mode::Paint) {
 			_mode = PhotoEditorMode{
@@ -188,15 +349,63 @@ PhotoEditor::PhotoEditor(
 		}
 	}, lifetime());
 
+	_colorPicker->toolClicks(
+	) | rpl::on_next([=] {
+		_content->clearSelection();
+	}, lifetime());
+
 	_colorPicker->saveBrushRequests(
-	) | rpl::start_with_next([=](const Brush &brush) {
-		_content->applyBrush(brush);
+	) | rpl::on_next([=](const Brush &brush) {
+		if (_textItemSelected || _textEditing) {
+			_content->setSelectedTextColor(brush.color);
+			_content->setTextColor(brush.color);
+		} else {
+			_content->applyBrush(brush);
+			_content->setTextColor(brush.color);
 
-		const auto serialized = Serialize(brush);
-		if (Core::App().settings().photoEditorBrush() != serialized) {
-			Core::App().settings().setPhotoEditorBrush(serialized);
-			Core::App().saveSettingsDelayed();
+			_brushTool = brush.tool;
+			_brushes[ToolIndex(brush.tool)] = brush;
+			const auto serialized = Serialize(_brushes, _brushTool);
+			if (Core::App().settings().photoEditorBrush() != serialized) {
+				Core::App().settings().setPhotoEditorBrush(serialized);
+				Core::App().saveSettingsDelayed();
+			}
+		}
+	}, lifetime());
+
+	_content->textEditStates(
+	) | rpl::on_next([=](bool editing) {
+		_textEditing = editing;
+		if (_textEditing) {
+			_colorPicker->setToolSelectionVisible(false);
+		} else if (!_textItemSelected) {
+			const auto &brush = _brushes[ToolIndex(_brushTool)];
+			_colorPicker->setColor(brush.color);
+			_colorPicker->setToolSelectionVisible(true);
+		}
+	}, lifetime());
+
+	_content->textColorRequests(
+	) | rpl::on_next([=](const QColor &color) {
+		_colorPicker->setColor(color);
+	}, lifetime());
+
+	_content->textItemSelections(
+	) | rpl::on_next([=](const QColor &color) {
+		_textItemSelected = true;
+		_colorPicker->setToolSelectionVisible(false);
+		_colorPicker->setColor(color);
+	}, lifetime());
+
+	_content->textItemDeselections(
+	) | rpl::on_next([=] {
+		_textItemSelected = false;
+		if (_textEditing) {
+			return;
 		}
+		const auto &brush = _brushes[ToolIndex(_brushTool)];
+		_colorPicker->setColor(brush.color);
+		_colorPicker->setToolSelectionVisible(true);
 	}, lifetime());
 }
 
@@ -224,16 +433,16 @@ void InitEditorLayer(
 		not_null<PhotoEditor*> editor,
 		Fn<void(PhotoModifications)> doneCallback) {
 	editor->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		layer->closeLayer();
 	}, editor->lifetime());
 
-	const auto weak = Ui::MakeWeak(layer.get());
+	const auto weak = base::make_weak(layer.get());
 	editor->doneRequests(
-	) | rpl::start_with_next([=, done = std::move(doneCallback)](
+	) | rpl::on_next([=, done = std::move(doneCallback)](
 			const PhotoModifications &mods) {
 		done(mods);
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeLayer();
 		}
 	}, editor->lifetime());
diff --git a/Telegram/SourceFiles/editor/photo_editor.h b/Telegram/SourceFiles/editor/photo_editor.h
index 4169339a698e2f..2c23a82cf3806d 100644
--- a/Telegram/SourceFiles/editor/photo_editor.h
+++ b/Telegram/SourceFiles/editor/photo_editor.h
@@ -13,6 +13,8 @@ For license and copyright information please follow this link:
 #include "editor/photo_editor_common.h"
 #include "editor/photo_editor_inner_common.h"
 
+#include <array>
+
 namespace Ui {
 class LayerWidget;
 class Show;
@@ -62,12 +64,16 @@ class PhotoEditor final : public Ui::RpWidget {
 
 	base::unique_qptr<PhotoEditorContent> _content;
 	base::unique_qptr<PhotoEditorControls> _controls;
+	std::array<Brush, 5> _brushes;
+	Brush::Tool _brushTool = Brush::Tool::Pen;
 	const std::unique_ptr<ColorPicker> _colorPicker;
 
 	rpl::variable<PhotoEditorMode> _mode = PhotoEditorMode{
 		.mode = PhotoEditorMode::Mode::Transform,
 		.action = PhotoEditorMode::Action::None,
 	};
+	bool _textItemSelected = false;
+	bool _textEditing = false;
 	rpl::event_stream<PhotoModifications> _done;
 	rpl::event_stream<> _cancel;
 
diff --git a/Telegram/SourceFiles/editor/photo_editor_common.cpp b/Telegram/SourceFiles/editor/photo_editor_common.cpp
index 4fd72ac829001b..18f1833a61c9c7 100644
--- a/Telegram/SourceFiles/editor/photo_editor_common.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor_common.cpp
@@ -9,9 +9,58 @@ For license and copyright information please follow this link:
 
 #include "editor/scene/scene.h"
 #include "ui/painter.h"
+#include "ui/userpic_view.h"
 
 namespace Editor {
 
+void ApplyShapeMask(QImage &image, const PhotoModifications &mods) {
+	if (mods.cropMode != EditorData::CropMode::Mask) {
+		return;
+	}
+	const auto type = mods.cropType;
+	if (type == EditorData::CropType::Rect) {
+		return;
+	}
+	const auto multiplier = (type == EditorData::CropType::RoundedRect)
+		? RoundedCornersMultiplier(mods.cornersLevel)
+		: Ui::ForumUserpicRadiusMultiplier();
+	if (type == EditorData::CropType::RoundedRect && multiplier <= 0.) {
+		return;
+	}
+	if (image.format() != QImage::Format_ARGB32_Premultiplied) {
+		image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
+	}
+	auto mask = QImage(image.size(), QImage::Format_ARGB32_Premultiplied);
+	mask.fill(Qt::transparent);
+	{
+		auto p = QPainter(&mask);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(Qt::white);
+		const auto rect = QRectF(QPointF(), QSizeF(image.size()));
+		if (type == EditorData::CropType::Ellipse) {
+			p.drawEllipse(rect);
+		} else {
+			const auto radius = std::min(rect.width(), rect.height())
+				* multiplier;
+			p.drawRoundedRect(rect, radius, radius);
+		}
+	}
+	auto p = QPainter(&image);
+	p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+	p.drawImage(0, 0, mask);
+}
+
+float64 RoundedCornersMultiplier(RoundedCornersLevel level) {
+	switch (level) {
+	case RoundedCornersLevel::Large: return Ui::ForumUserpicRadiusMultiplier();
+	case RoundedCornersLevel::Medium: return 0.2;
+	case RoundedCornersLevel::Small: return 0.12;
+	case RoundedCornersLevel::None: return 0.;
+	}
+	Unexpected("Unknown RoundedCornersLevel in RoundedCornersMultiplier.");
+}
+
 QImage ImageModified(QImage image, const PhotoModifications &mods) {
 	Expects(!image.isNull());
 
diff --git a/Telegram/SourceFiles/editor/photo_editor_common.h b/Telegram/SourceFiles/editor/photo_editor_common.h
index 028f55c6fa2fe6..5695b6dc129737 100644
--- a/Telegram/SourceFiles/editor/photo_editor_common.h
+++ b/Telegram/SourceFiles/editor/photo_editor_common.h
@@ -11,18 +11,15 @@ namespace Editor {
 
 class Scene;
 
-struct PhotoModifications {
-	int angle = 0;
-	bool flipped = false;
-	QRect crop;
-	std::shared_ptr<Scene> paint = nullptr;
-
-	[[nodiscard]] bool empty() const;
-	[[nodiscard]] explicit operator bool() const;
-	~PhotoModifications();
-
+enum class RoundedCornersLevel {
+	Large,
+	Medium,
+	Small,
+	None,
 };
 
+[[nodiscard]] float64 RoundedCornersMultiplier(RoundedCornersLevel level);
+
 struct EditorData {
 	enum class CropType {
 		Rect,
@@ -30,14 +27,39 @@ struct EditorData {
 		RoundedRect,
 	};
 
+	enum class CropMode {
+		Hint,
+		Mask,
+	};
+
 	TextWithEntities about;
 	QString confirm;
+	QSize exactSize;
 	CropType cropType = CropType::Rect;
+	CropMode cropMode = CropMode::Hint;
 	bool keepAspectRatio = false;
+	bool fixedCrop = false;
+};
+
+struct PhotoModifications {
+	int angle = 0;
+	bool flipped = false;
+	QRect crop;
+	EditorData::CropType cropType = EditorData::CropType::Rect;
+	EditorData::CropMode cropMode = EditorData::CropMode::Hint;
+	RoundedCornersLevel cornersLevel = RoundedCornersLevel::Large;
+	std::shared_ptr<Scene> paint = nullptr;
+
+	[[nodiscard]] bool empty() const;
+	[[nodiscard]] explicit operator bool() const;
+	~PhotoModifications();
+
 };
 
 [[nodiscard]] QImage ImageModified(
 	QImage image,
 	const PhotoModifications &mods);
 
+void ApplyShapeMask(QImage &image, const PhotoModifications &mods);
+
 } // namespace Editor
diff --git a/Telegram/SourceFiles/editor/photo_editor_content.cpp b/Telegram/SourceFiles/editor/photo_editor_content.cpp
index 1a379b9b3c5d7d..dd9f701fd8de70 100644
--- a/Telegram/SourceFiles/editor/photo_editor_content.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor_content.cpp
@@ -13,6 +13,9 @@ For license and copyright information please follow this link:
 #include "media/view/media_view_pip.h"
 #include "storage/storage_media_prepare.h"
 
+#include <QtGui/QMouseEvent>
+#include <QtGui/QWheelEvent>
+
 namespace Editor {
 
 using Media::View::FlipSizeByRotation;
@@ -26,11 +29,25 @@ PhotoEditorContent::PhotoEditorContent(
 	EditorData data)
 : RpWidget(parent)
 , _photoSize(photo->size())
+, _fixedCrop(data.fixedCrop)
 , _paint(base::make_unique_q<Paint>(
 	this,
 	modifications,
 	_photoSize,
-	std::move(controllers)))
+	std::move(controllers),
+	[photo](QRect rect) {
+		const auto &img = photo->original();
+		const auto dpr = img.devicePixelRatio();
+		const auto pixelRect = QRect(
+			int(rect.x() * dpr),
+			int(rect.y() * dpr),
+			int(rect.width() * dpr),
+			int(rect.height() * dpr));
+		auto result = img.copy(pixelRect.intersected(img.rect()));
+		result.setDevicePixelRatio(dpr);
+		return result;
+	},
+	data.fixedCrop))
 , _crop(base::make_unique_q<Crop>(
 	this,
 	modifications,
@@ -42,7 +59,7 @@ PhotoEditorContent::PhotoEditorContent(
 	rpl::combine(
 		_modifications.value(),
 		sizeValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const PhotoModifications &mods, const QSize &size) {
 		if (size.isEmpty()) {
 			return;
@@ -79,21 +96,68 @@ PhotoEditorContent::PhotoEditorContent(
 			geometry + _crop->cropMargins(),
 			mods.angle,
 			mods.flipped, imageSizeF);
+		_crop->setCornersLevel(mods.cornersLevel);
 		_paint->applyTransform(geometry, mods.angle, mods.flipped);
 
 		_innerRect = geometry;
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(this);
 
 		p.fillRect(clip, Qt::transparent);
-		p.setTransform(_imageMatrix);
-		p.drawPixmap(_imageRect, _photo->pix(_imageRect.size()));
+		if (_mode.mode == PhotoEditorMode::Mode::Paint) {
+			_paint->paintImage(p, _photo->pix(_photoSize));
+		} else {
+			p.setTransform(_imageMatrix);
+			p.drawPixmap(_imageRect, _photo->pix(_imageRect.size()));
+		}
 	}, lifetime());
 
 	setupDragArea();
+
+	if (_fixedCrop) {
+		const auto pan = _crop->lifetime().make_state<
+			std::optional<QPoint>
+		>();
+		_crop->events(
+		) | rpl::on_next([=](not_null<QEvent*> e) {
+			const auto type = e->type();
+			if (type == QEvent::Wheel) {
+				const auto wheel = static_cast<QWheelEvent*>(e.get());
+				const auto raw = wheel->angleDelta();
+				_paint->zoomSceneItems(
+					raw.y() ? raw.y() : raw.x(),
+					wheel->modifiers().testFlag(Qt::ShiftModifier));
+				e->accept();
+			} else if (type == QEvent::MouseButtonPress) {
+				const auto mouse = static_cast<QMouseEvent*>(e.get());
+				if (mouse->button() == Qt::MiddleButton) {
+					*pan = mouse->pos();
+					_crop->setCursor(Qt::ClosedHandCursor);
+					e->accept();
+				}
+			} else if (type == QEvent::MouseMove) {
+				if (pan->has_value()) {
+					const auto mouse = static_cast<QMouseEvent*>(e.get());
+					const auto point = mouse->pos();
+					const auto delta = point - **pan;
+					*pan = point;
+					_paint->panSceneItems(
+						_paint->mapWidgetDeltaToScene(delta));
+					e->accept();
+				}
+			} else if (type == QEvent::MouseButtonRelease) {
+				const auto mouse = static_cast<QMouseEvent*>(e.get());
+				if (mouse->button() == Qt::MiddleButton && pan->has_value()) {
+					pan->reset();
+					_crop->unsetCursor();
+					e->accept();
+				}
+			}
+		}, _crop->lifetime());
+	}
 }
 
 void PhotoEditorContent::applyModifications(
@@ -125,6 +189,8 @@ void PhotoEditorContent::applyMode(const PhotoEditorMode &mode) {
 	_paint->setAttribute(Qt::WA_TransparentForMouseEvents, isTransform);
 	if (!isTransform) {
 		_paint->updateUndoState();
+	} else {
+		_paint->resetView();
 	}
 
 	if (mode.action == PhotoEditorMode::Action::Discard) {
@@ -133,12 +199,49 @@ void PhotoEditorContent::applyMode(const PhotoEditorMode &mode) {
 		_paint->keepResult();
 	}
 	_mode = mode;
+	update();
+}
+
+void PhotoEditorContent::applyAspectRatio(float64 ratio) {
+	_crop->setAspectRatio(ratio);
 }
 
 void PhotoEditorContent::applyBrush(const Brush &brush) {
 	_paint->applyBrush(brush);
 }
 
+void PhotoEditorContent::createTextItem() {
+	_paint->createTextItem();
+}
+
+void PhotoEditorContent::clearSelection() {
+	_paint->clearSelection();
+}
+
+void PhotoEditorContent::setTextColor(const QColor &color) {
+	_paint->setTextColor(color);
+}
+
+void PhotoEditorContent::setSelectedTextColor(const QColor &color) {
+	_paint->setSelectedTextColor(color);
+}
+
+rpl::producer<QColor> PhotoEditorContent::textColorRequests() const {
+	return _paint->textColorRequests();
+}
+
+rpl::producer<QColor> PhotoEditorContent::textItemSelections() const {
+	return _paint->textItemSelections();
+}
+
+rpl::producer<> PhotoEditorContent::textItemDeselections() const {
+	return _paint->textItemDeselections();
+}
+
+rpl::producer<bool> PhotoEditorContent::textEditStates() const {
+	return _paint->textEditStates();
+}
+
 bool PhotoEditorContent::handleKeyPress(not_null<QKeyEvent*> e) const {
 	return false;
 }
diff --git a/Telegram/SourceFiles/editor/photo_editor_content.h b/Telegram/SourceFiles/editor/photo_editor_content.h
index 027e5574a6680e..50dbfff3adc252 100644
--- a/Telegram/SourceFiles/editor/photo_editor_content.h
+++ b/Telegram/SourceFiles/editor/photo_editor_content.h
@@ -31,6 +31,16 @@ class PhotoEditorContent final : public Ui::RpWidget {
 	void applyModifications(PhotoModifications modifications);
 	void applyMode(const PhotoEditorMode &mode);
 	void applyBrush(const Brush &brush);
+	void createTextItem();
+	void clearSelection();
+	void setTextColor(const QColor &color);
+	void setSelectedTextColor(const QColor &color);
+
+	[[nodiscard]] rpl::producer<QColor> textColorRequests() const;
+	[[nodiscard]] rpl::producer<QColor> textItemSelections() const;
+	[[nodiscard]] rpl::producer<> textItemDeselections() const;
+	[[nodiscard]] rpl::producer<bool> textEditStates() const;
+	void applyAspectRatio(float64 ratio);
 	void save(PhotoModifications &modifications);
 
 	bool handleKeyPress(not_null<QKeyEvent*> e) const;
@@ -44,6 +54,7 @@ class PhotoEditorContent final : public Ui::RpWidget {
 private:
 
 	const QSize _photoSize;
+	const bool _fixedCrop = false;
 	const base::unique_qptr<Paint> _paint;
 	const base::unique_qptr<Crop> _crop;
 	const std::shared_ptr<Image> _photo;
diff --git a/Telegram/SourceFiles/editor/photo_editor_controls.cpp b/Telegram/SourceFiles/editor/photo_editor_controls.cpp
index 72a43386512815..89d0fe7c8afd24 100644
--- a/Telegram/SourceFiles/editor/photo_editor_controls.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor_controls.cpp
@@ -12,9 +12,15 @@ For license and copyright information please follow this link:
 #include "ui/image/image_prepare.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/menu/menu_multiline_action.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "styles/style_editor.h"
+#include "styles/style_media_player.h" // mediaPlayerMenuCheck
+
+#include <QRegion>
 
 namespace Editor {
 
@@ -24,7 +30,6 @@ class EdgeButton final : public Ui::RippleButton {
 		not_null<Ui::RpWidget*> parent,
 		const QString &text,
 		int height,
-		bool left,
 		const style::color &bg,
 		const style::color &fg,
 		const style::RippleAnimation &st);
@@ -41,7 +46,6 @@ class EdgeButton final : public Ui::RippleButton {
 	const int _width;
 	const QRect _rippleRect;
 	const QColor _bg;
-	const bool _left;
 
 	QImage rounded(std::optional<QColor> color) const;
 
@@ -51,7 +55,6 @@ EdgeButton::EdgeButton(
 	not_null<Ui::RpWidget*> parent,
 	const QString &text,
 	int height,
-	bool left,
 	const style::color &bg,
 	const style::color &fg,
 	const style::RippleAnimation &st)
@@ -61,27 +64,40 @@ EdgeButton::EdgeButton(
 , _width(_text.maxWidth()
 	+ st::photoEditorTextButtonPadding.left()
 	+ st::photoEditorTextButtonPadding.right())
-, _rippleRect(QRect(0, 0, _width, height))
-, _bg(bg->c)
-, _left(left) {
-	resize(_width, height);
+, _rippleRect(QRect(
+	rect::m::pos::tl(st::photoEditorEdgeButtonMargins),
+	QSize(
+		_width,
+		height - rect::m::sum::v(st::photoEditorEdgeButtonMargins))))
+, _bg(bg->c) {
+	resize(
+		_width + rect::m::sum::h(st::photoEditorEdgeButtonMargins),
+		height);
 	init();
 }
 
 void EdgeButton::init() {
-	// const auto bg = rounded(_bg);
+	const auto bg = rounded(_bg);
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 
-		// p.drawImage(QPoint(), bg);
+		if (isOver()) {
+			p.drawImage(_rippleRect.topLeft(), bg);
+		}
 
 		paintRipple(p, _rippleRect.x(), _rippleRect.y());
 
 		p.setPen(_fg);
-		const auto textTop = st::photoEditorButtonTextTop;
-		_text.draw(p, 0, textTop, width(), style::al_center);
+		const auto textTop = _rippleRect.y()
+			+ (_rippleRect.height() - _text.minHeight()) / 2;
+		_text.draw(
+			p,
+			_rippleRect.x(),
+			textTop,
+			_rippleRect.width(),
+			style::al_center);
 	}, lifetime());
 }
 
@@ -92,10 +108,10 @@ QImage EdgeButton::rounded(std::optional<QColor> color) const {
 	result.setDevicePixelRatio(style::DevicePixelRatio());
 	result.fill(color.value_or(Qt::white));
 
-	const auto parts = RectPart::None
-		| (_left ? RectPart::TopLeft : RectPart::TopRight)
-		| (_left ? RectPart::BottomLeft : RectPart::BottomRight);
-	return Images::Round(std::move(result), ImageRoundRadius::Large, parts);
+	const auto radius = std::min(_rippleRect.width(), _rippleRect.height())
+		/ 2;
+	const auto mask = Images::CornersMask(radius);
+	return Images::Round(std::move(result), mask);
 }
 
 QImage EdgeButton::prepareRippleMask() const {
@@ -122,7 +138,7 @@ ButtonBar::ButtonBar(
 	const style::color &bg)
 : RpWidget(parent) {
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		const auto children = RpWidget::children();
 		const auto widgets = ranges::views::all(
 			children
@@ -175,24 +191,58 @@ ButtonBar::ButtonBar(
 		result.setDevicePixelRatio(style::DevicePixelRatio());
 		result.fill(bg->c);
 
-		_roundedBg = Images::Round(
-			std::move(result),
-			ImageRoundRadius::Large);
+		const auto radius = std::min(size.width(), size.height()) / 2;
+		const auto mask = Images::CornersMask(radius);
+		_roundedBg = Images::Round(std::move(result), mask);
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(this);
 		p.drawImage(QPoint(), _roundedBg);
 	}, lifetime());
 }
 
+class TextToolButton final : public Ui::AbstractButton {
+public:
+	TextToolButton(not_null<QWidget*> parent)
+	: AbstractButton(parent) {
+		constexpr auto kSizeShrink = 6;
+		resize(
+			st::photoEditorStickersButton.width - kSizeShrink,
+			st::photoEditorStickersButton.height - kSizeShrink);
+		events(
+		) | rpl::on_next([=](not_null<QEvent*> event) {
+			if (event->type() == QEvent::Enter
+				|| event->type() == QEvent::Leave) {
+				update();
+			}
+		}, lifetime());
+	}
+
+private:
+	void paintEvent(QPaintEvent *) override {
+		auto p = QPainter(this);
+		auto hq = PainterHighQualityEnabler(p);
+		auto font = st::semiboldFont->f;
+		font.setPixelSize(QWidget::rect().height() / 2);
+		p.setFont(font);
+		p.setPen(isOver()
+			? st::photoEditorButtonIconFgOver
+			: st::photoEditorButtonIconFg);
+		p.translate(0, st::lineWidth * 3);
+		p.drawText(QWidget::rect(), style::al_center, u"A"_q);
+	}
+};
+
 PhotoEditorControls::PhotoEditorControls(
 	not_null<Ui::RpWidget*> parent,
 	std::shared_ptr<Controllers> controllers,
 	const PhotoModifications modifications,
-	const EditorData &data)
+	const EditorData &data,
+	const QSize &imageSize)
 : RpWidget(parent)
+, _imageSize(imageSize)
 , _bg(st::roundedBg)
 , _buttonHeight(st::photoEditorButtonBarHeight)
 , _transformButtons(base::make_unique_q<ButtonBar>(this, _bg))
@@ -210,8 +260,7 @@ PhotoEditorControls::PhotoEditorControls(
 	_transformButtons,
 	tr::lng_cancel(tr::now),
 	_buttonHeight,
-	true,
-	_bg,
+	st::photoEditorEdgeButtonBg,
 	st::mediaviewCaptionFg,
 	st::photoEditorRotateButton.ripple))
 , _flipButton(base::make_unique_q<Ui::IconButton>(
@@ -223,20 +272,28 @@ PhotoEditorControls::PhotoEditorControls(
 , _paintModeButton(base::make_unique_q<Ui::IconButton>(
 	_transformButtons,
 	st::photoEditorPaintModeButton))
+, _cropRatioButton(data.keepAspectRatio
+	? nullptr
+	: base::make_unique_q<Ui::IconButton>(
+		_transformButtons,
+		st::photoEditorCropRatioButton))
+, _cornersButton((data.cropType == EditorData::CropType::RoundedRect)
+	? base::make_unique_q<Ui::IconButton>(
+		_transformButtons,
+		st::photoEditorCornersButton)
+	: nullptr)
 , _transformDone(base::make_unique_q<EdgeButton>(
 	_transformButtons,
 	(data.confirm.isEmpty() ? tr::lng_box_done(tr::now) : data.confirm),
 	_buttonHeight,
-	false,
-	_bg,
+	st::photoEditorEdgeButtonBg,
 	st::mediaviewTextLinkFg,
 	st::photoEditorRotateButton.ripple))
 , _paintCancel(base::make_unique_q<EdgeButton>(
 	_paintBottomButtons,
 	tr::lng_cancel(tr::now),
 	_buttonHeight,
-	true,
-	_bg,
+	st::photoEditorEdgeButtonBg,
 	st::mediaviewCaptionFg,
 	st::photoEditorRotateButton.ripple))
 , _undoButton(base::make_unique_q<Ui::IconButton>(
@@ -253,12 +310,12 @@ PhotoEditorControls::PhotoEditorControls(
 			_paintBottomButtons,
 			st::photoEditorStickersButton)
 		: nullptr)
+, _textButton(base::make_unique_q<TextToolButton>(_paintBottomButtons))
 , _paintDone(base::make_unique_q<EdgeButton>(
 	_paintBottomButtons,
 	tr::lng_box_done(tr::now),
 	_buttonHeight,
-	false,
-	_bg,
+	st::photoEditorEdgeButtonBg,
 	st::mediaviewTextLinkFg,
 	st::photoEditorRotateButton.ripple)) {
 
@@ -269,7 +326,7 @@ PhotoEditorControls::PhotoEditorControls(
 	_paintModeButtonActive->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		if (size.isEmpty()) {
 			return;
 		}
@@ -304,7 +361,7 @@ PhotoEditorControls::PhotoEditorControls(
 	}, lifetime());
 
 	_mode.changes(
-	) | rpl::start_with_next([=](const PhotoEditorMode &mode) {
+	) | rpl::on_next([=](const PhotoEditorMode &mode) {
 		if (mode.mode == PhotoEditorMode::Mode::Out) {
 			return;
 		}
@@ -316,7 +373,7 @@ PhotoEditorControls::PhotoEditorControls(
 	}, lifetime());
 
 	_paintBottomButtons->positionValue(
-	) | rpl::start_with_next([=](const QPoint &containerPos) {
+	) | rpl::on_next([=](const QPoint &containerPos) {
 		_paintTopButtons->moveToLeft(
 			containerPos.x(),
 			containerPos.y()
@@ -325,10 +382,28 @@ PhotoEditorControls::PhotoEditorControls(
 	}, _paintBottomButtons->lifetime());
 
 	_paintBottomButtons->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		_paintTopButtons->setVisible(shown);
 	}, _paintBottomButtons->lifetime());
 
+	auto aboutChanges = _about
+		? rpl::merge(
+			_about->geometryValue() | rpl::to_empty,
+			_about->shownValue() | rpl::to_empty)
+		: rpl::never<>() | rpl::type_erased;
+	rpl::merge(
+		geometryValue() | rpl::to_empty,
+		_transformButtons->geometryValue() | rpl::to_empty,
+		_transformButtons->shownValue() | rpl::to_empty,
+		_paintBottomButtons->geometryValue() | rpl::to_empty,
+		_paintBottomButtons->shownValue() | rpl::to_empty,
+		_paintTopButtons->geometryValue() | rpl::to_empty,
+		_paintTopButtons->shownValue() | rpl::to_empty,
+		std::move(aboutChanges)
+	) | rpl::on_next([=] {
+		updateInputMask();
+	}, lifetime());
+
 	controllers->undoController->setPerformRequestChanges(rpl::merge(
 		_undoButton->clicks() | rpl::map_to(Undo::Undo),
 		_redoButton->clicks() | rpl::map_to(Undo::Redo),
@@ -350,7 +425,7 @@ PhotoEditorControls::PhotoEditorControls(
 		})));
 
 	controllers->undoController->canPerformChanges(
-	) | rpl::start_with_next([=](const UndoController::EnableRequest &r) {
+	) | rpl::on_next([=](const UndoController::EnableRequest &r) {
 		const auto isUndo = (r.command == Undo::Undo);
 		const auto &button = isUndo ? _undoButton : _redoButton;
 		button->setAttribute(Qt::WA_TransparentForMouseEvents, !r.enable);
@@ -385,7 +460,7 @@ PhotoEditorControls::PhotoEditorControls(
 			}));
 
 		controllers->stickersPanelController->panelShown(
-		) | rpl::start_with_next([=](bool shown) {
+		) | rpl::on_next([=](bool shown) {
 			const auto icon = shown
 				? &st::photoEditorStickersIconActive
 				: nullptr;
@@ -397,12 +472,122 @@ PhotoEditorControls::PhotoEditorControls(
 		modifications.flipped ? 0 : 1
 	) | rpl::then(
 		_flipButton->clicks() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_flipped = !_flipped;
 		const auto icon = _flipped ? &st::photoEditorFlipIconActive : nullptr;
 		_flipButton->setIconOverride(icon, icon);
 	}, _flipButton->lifetime());
 
+	if (_cropRatioButton) {
+		const auto imageRatio = float64(
+			_imageSize.width()) / _imageSize.height();
+		const auto ratiosMatch = [](float64 a, float64 b) {
+			return std::abs(a - b) < 0.01;
+		};
+		_cropRatioButton->setClickedCallback([=] {
+			_ratioMenu = base::make_unique_q<Ui::PopupMenu>(
+				_cropRatioButton.get(),
+				st::photoEditorCropRatioMenu);
+			_ratioMenu->setForcedOrigin(
+				Ui::PanelAnimation::Origin::BottomRight);
+			const auto check = &st::mediaPlayerMenuCheck;
+			const auto add = [&](const QString &text, float64 ratio) {
+				const auto selected = ratiosMatch(_currentRatio, ratio);
+				_ratioMenu->addAction(
+					text,
+					[=] {
+						if (ratiosMatch(_currentRatio, ratio)) {
+							return;
+						}
+						_currentRatio = ratio;
+						_aspectRatioChanges.fire_copy(ratio);
+						const auto locked = (ratio > 0.);
+						const auto icon = locked
+							? &st::photoEditorCropRatioIconActive
+							: nullptr;
+						_cropRatioButton->setIconOverride(icon, icon);
+					},
+					selected ? check : nullptr);
+			};
+			add(tr::lng_photo_editor_crop_original(tr::now), imageRatio);
+			add(tr::lng_photo_editor_crop_square(tr::now), 1.);
+			add(u"3:2"_q, 3. / 2.);
+			add(u"16:9"_q, 16. / 9.);
+			add(u"3:4"_q, 3. / 4.);
+			add(u"9:16"_q, 9. / 16.);
+			add(tr::lng_photo_editor_crop_free(tr::now), 0.);
+			const auto button = _cropRatioButton.get();
+			const auto bottomRight = button->mapToGlobal(
+				QPoint(button->width(), 0));
+			_ratioMenu->popup(bottomRight);
+		});
+	}
+
+	_currentCornersLevel = modifications.cornersLevel;
+	if (_cornersButton) {
+		const auto updateIcon = [=] {
+			const auto active = (_currentCornersLevel
+				!= RoundedCornersLevel::Large);
+			const auto icon = active
+				? &st::photoEditorCornersIconActive
+				: nullptr;
+			_cornersButton->setIconOverride(icon, icon);
+		};
+		updateIcon();
+		_cornersButton->setClickedCallback([=] {
+			_cornersMenu = base::make_unique_q<Ui::PopupMenu>(
+				_cornersButton.get(),
+				st::photoEditorCropRatioMenu);
+			_cornersMenu->setForcedOrigin(
+				Ui::PanelAnimation::Origin::BottomRight);
+			auto about = base::make_unique_q<Ui::Menu::MultilineAction>(
+				_cornersMenu->menu(),
+				_cornersMenu->menu()->st(),
+				st::photoEditorCornersMenuAboutLabel,
+				st::photoEditorCornersMenuAboutPosition,
+				TextWithEntities{
+					tr::lng_photo_editor_corners_about(tr::now),
+				});
+			_cornersMenu->addAction(std::move(about));
+			_cornersMenu->addSeparator();
+			const auto check = &st::mediaPlayerMenuCheck;
+			const auto add = [&](
+					const QString &text,
+					RoundedCornersLevel level) {
+				const auto selected = (_currentCornersLevel == level);
+				_cornersMenu->addAction(
+					text,
+					[=] {
+						if (_currentCornersLevel == level) {
+							return;
+						}
+						_currentCornersLevel = level;
+						updateIcon();
+						_cornersLevelChanges.fire_copy(level);
+					},
+					selected ? check : nullptr);
+			};
+			add(
+				tr::lng_photo_editor_corners_large(tr::now),
+				RoundedCornersLevel::Large);
+			add(
+				tr::lng_photo_editor_corners_medium(tr::now),
+				RoundedCornersLevel::Medium);
+			add(
+				tr::lng_photo_editor_corners_small(tr::now),
+				RoundedCornersLevel::Small);
+			add(
+				tr::lng_photo_editor_corners_none(tr::now),
+				RoundedCornersLevel::None);
+			const auto button = _cornersButton.get();
+			const auto bottomRight = button->mapToGlobal(
+				QPoint(button->width(), 0));
+			_cornersMenu->popup(bottomRight);
+		});
+	}
+
+	updateInputMask();
+
 }
 
 rpl::producer<int> PhotoEditorControls::rotateRequests() const {
@@ -417,6 +602,10 @@ rpl::producer<> PhotoEditorControls::paintModeRequests() const {
 	return _paintModeButton->clicks() | rpl::to_empty;
 }
 
+rpl::producer<> PhotoEditorControls::textRequests() const {
+	return _textButton->clicks() | rpl::to_empty;
+}
+
 rpl::producer<> PhotoEditorControls::doneRequests() const {
 	return rpl::merge(
 		_transformDone->clicks() | rpl::to_empty,
@@ -434,11 +623,20 @@ rpl::producer<> PhotoEditorControls::cancelRequests() const {
 		_transformCancel->clicks() | rpl::to_empty,
 		_paintCancel->clicks() | rpl::to_empty,
 		_keyPresses.events(
-		) | rpl::filter([=](not_null<QKeyEvent*> e) {
-			const auto key = e->key();
-			return (key == Qt::Key_Escape)
-				&& !_toggledBarAnimation.animating();
-		}) | rpl::to_empty);
+	) | rpl::filter([=](not_null<QKeyEvent*> e) {
+		const auto key = e->key();
+		return (key == Qt::Key_Escape)
+			&& !_toggledBarAnimation.animating();
+	}) | rpl::to_empty);
+}
+
+rpl::producer<float64> PhotoEditorControls::aspectRatioChanges() const {
+	return _aspectRatioChanges.events();
+}
+
+auto PhotoEditorControls::cornersLevelChanges() const
+-> rpl::producer<RoundedCornersLevel> {
+	return _cornersLevelChanges.events();
 }
 
 int PhotoEditorControls::bottomButtonsTop() const {
@@ -486,7 +684,8 @@ void PhotoEditorControls::showAnimated(
 				std::move(callback),
 				1.,
 				0.,
-				duration);
+				duration,
+				anim::easeOutCirc);
 		}
 	};
 
@@ -513,7 +712,35 @@ void PhotoEditorControls::showAnimated(
 			std::move(animationCallback),
 			0.,
 			1.,
-			duration);
+			duration,
+			anim::easeInCirc);
+	}
+}
+
+void PhotoEditorControls::updateInputMask() {
+	auto region = QRegion();
+	const auto visibleRect = rect();
+	const auto add = [&](not_null<const QWidget*> widget) {
+		if (!widget->isHidden()) {
+			const auto geometry = widget->geometry() & visibleRect;
+			if (!geometry.isEmpty()) {
+				region += geometry;
+			}
+		}
+	};
+	add(_transformButtons);
+	add(_paintBottomButtons);
+	add(_paintTopButtons);
+	if (_about && !_about->isHidden()) {
+		const auto geometry = _about->geometry() & visibleRect;
+		if (!geometry.isEmpty()) {
+			region += geometry;
+		}
+	}
+	if (region.isEmpty()) {
+		clearMask();
+	} else {
+		setMask(region);
 	}
 }
 
diff --git a/Telegram/SourceFiles/editor/photo_editor_controls.h b/Telegram/SourceFiles/editor/photo_editor_controls.h
index a70b0a2f68a617..404a64d819744f 100644
--- a/Telegram/SourceFiles/editor/photo_editor_controls.h
+++ b/Telegram/SourceFiles/editor/photo_editor_controls.h
@@ -9,13 +9,16 @@ For license and copyright information please follow this link:
 
 #include "ui/rp_widget.h"
 
+#include "base/unique_qptr.h"
 #include "ui/effects/animations.h"
 #include "editor/photo_editor_common.h"
 #include "editor/photo_editor_inner_common.h"
 
 namespace Ui {
+class AbstractButton;
 class IconButton;
 class FlatLabel;
+class PopupMenu;
 template <typename Widget>
 class FadeWrap;
 } // namespace Ui
@@ -33,15 +36,20 @@ class PhotoEditorControls final : public Ui::RpWidget {
 		not_null<Ui::RpWidget*> parent,
 		std::shared_ptr<Controllers> controllers,
 		const PhotoModifications modifications,
-		const EditorData &data);
+		const EditorData &data,
+		const QSize &imageSize);
 
 	[[nodiscard]] rpl::producer<int> rotateRequests() const;
 	[[nodiscard]] rpl::producer<> flipRequests() const;
 	[[nodiscard]] rpl::producer<> paintModeRequests() const;
+	[[nodiscard]] rpl::producer<> textRequests() const;
 	[[nodiscard]] rpl::producer<> doneRequests() const;
 	[[nodiscard]] rpl::producer<> cancelRequests() const;
 	[[nodiscard]] rpl::producer<QPoint> colorLinePositionValue() const;
 	[[nodiscard]] rpl::producer<bool> colorLineShownValue() const;
+	[[nodiscard]] rpl::producer<float64> aspectRatioChanges() const;
+	[[nodiscard]] auto cornersLevelChanges() const
+		-> rpl::producer<RoundedCornersLevel>;
 
 	[[nodiscard]] bool animating() const;
 
@@ -53,9 +61,11 @@ class PhotoEditorControls final : public Ui::RpWidget {
 	void showAnimated(
 		PhotoEditorMode::Mode mode,
 		anim::type animated = anim::type::normal);
+	void updateInputMask();
 
 	int bottomButtonsTop() const;
 
+	const QSize _imageSize;
 	const style::color &_bg;
 	const int _buttonHeight;
 	const base::unique_qptr<ButtonBar> _transformButtons;
@@ -68,6 +78,8 @@ class PhotoEditorControls final : public Ui::RpWidget {
 	const base::unique_qptr<Ui::IconButton> _flipButton;
 	const base::unique_qptr<Ui::IconButton> _rotateButton;
 	const base::unique_qptr<Ui::IconButton> _paintModeButton;
+	const base::unique_qptr<Ui::IconButton> _cropRatioButton;
+	const base::unique_qptr<Ui::IconButton> _cornersButton;
 	const base::unique_qptr<EdgeButton> _transformDone;
 
 	const base::unique_qptr<EdgeButton> _paintCancel;
@@ -75,14 +87,22 @@ class PhotoEditorControls final : public Ui::RpWidget {
 	const base::unique_qptr<Ui::IconButton> _redoButton;
 	const base::unique_qptr<Ui::IconButton> _paintModeButtonActive;
 	const base::unique_qptr<Ui::IconButton> _stickersButton;
+	const base::unique_qptr<Ui::AbstractButton> _textButton;
 	const base::unique_qptr<EdgeButton> _paintDone;
 
+	base::unique_qptr<Ui::PopupMenu> _ratioMenu;
+	base::unique_qptr<Ui::PopupMenu> _cornersMenu;
+	float64 _currentRatio = 0.;
+	RoundedCornersLevel _currentCornersLevel = RoundedCornersLevel::Large;
+
 	bool _flipped = false;
 
 	Ui::Animations::Simple _toggledBarAnimation;
 
 	rpl::variable<PhotoEditorMode> _mode;
 	rpl::event_stream<not_null<QKeyEvent*>> _keyPresses;
+	rpl::event_stream<float64> _aspectRatioChanges;
+	rpl::event_stream<RoundedCornersLevel> _cornersLevelChanges;
 
 };
 
diff --git a/Telegram/SourceFiles/editor/photo_editor_inner_common.h b/Telegram/SourceFiles/editor/photo_editor_inner_common.h
index cbb9bd288350e2..59a882e5e86ce3 100644
--- a/Telegram/SourceFiles/editor/photo_editor_inner_common.h
+++ b/Telegram/SourceFiles/editor/photo_editor_inner_common.h
@@ -26,8 +26,16 @@ struct PhotoEditorMode {
 };
 
 struct Brush {
-	float sizeRatio = 0.;
+	enum class Tool : uchar {
+		Pen,
+		Arrow,
+		Marker,
+		Eraser,
+		Blur,
+	};
+	float64 sizeRatio = 0.;
 	QColor color;
+	Tool tool = Tool::Pen;
 };
 
 enum class SaveState {
diff --git a/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp b/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp
index 33ed5e837b6f22..45190842e54216 100644
--- a/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp
@@ -26,22 +26,27 @@ void OpenWithPreparedFile(
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<Ui::PreparedFile*> file,
 		int previewWidth,
-		Fn<void()> &&doneCallback) {
+		Fn<void(bool ok)> &&doneCallback,
+		int sideLimit,
+		QSize exactSize) {
 	using ImageInfo = Ui::PreparedFileInformation::Image;
 	const auto image = std::get_if<ImageInfo>(&file->information->media);
 	if (!image) {
+		doneCallback(false);
 		return;
 	}
 	const auto photoType = (file->type == Ui::PreparedFile::Type::Photo);
 	const auto modifiedFileType = (file->type == Ui::PreparedFile::Type::File)
 		&& !image->modifications.empty();
 	if (!photoType && !modifiedFileType) {
+		doneCallback(false);
 		return;
 	}
 
-	const auto sideLimit = PhotoSideLimit();
-	auto callback = [=, done = std::move(doneCallback)](
-			const PhotoModifications &mods) {
+	sideLimit = sideLimit ? sideLimit : PhotoSideLimit(true);
+	const auto accepted = std::make_shared<bool>();
+	auto callback = [=](const PhotoModifications &mods) {
+		*accepted = true;
 		image->modifications = mods;
 		Storage::UpdateImageDetails(*file, previewWidth, sideLimit);
 		{
@@ -51,19 +56,26 @@ void OpenWithPreparedFile(
 				? PreparedFile::Type::Photo
 				: PreparedFile::Type::File;
 		}
-		done();
+		doneCallback(true);
 	};
 	auto copy = image->data;
 	const auto fileImage = std::make_shared<Image>(std::move(copy));
+	const auto keepRatio = !exactSize.isEmpty();
 	auto editor = base::make_unique_q<PhotoEditor>(
 		parent,
 		show,
 		show,
 		fileImage,
-		image->modifications);
+		image->modifications,
+		EditorData{ .exactSize = exactSize, .keepAspectRatio = keepRatio });
 	const auto raw = editor.get();
 	auto layer = std::make_unique<LayerWidget>(parent, std::move(editor));
 	InitEditorLayer(layer.get(), raw, std::move(callback));
+	QObject::connect(layer.get(), &QObject::destroyed, [=] {
+		if (!*accepted) {
+			doneCallback(false);
+		}
+	});
 	show->showLayer(std::move(layer), Ui::LayerOption::KeepOther);
 }
 
diff --git a/Telegram/SourceFiles/editor/photo_editor_layer_widget.h b/Telegram/SourceFiles/editor/photo_editor_layer_widget.h
index f1c2fd445a529e..b08aba8f2f719d 100644
--- a/Telegram/SourceFiles/editor/photo_editor_layer_widget.h
+++ b/Telegram/SourceFiles/editor/photo_editor_layer_widget.h
@@ -34,7 +34,9 @@ void OpenWithPreparedFile(
 	std::shared_ptr<ChatHelpers::Show> show,
 	not_null<Ui::PreparedFile*> file,
 	int previewWidth,
-	Fn<void()> &&doneCallback);
+	Fn<void(bool ok)> &&doneCallback,
+	int sideLimit = 0,
+	QSize exactSize = {});
 
 void PrepareProfilePhoto(
 	not_null<QWidget*> parent,
diff --git a/Telegram/SourceFiles/editor/scene/scene.cpp b/Telegram/SourceFiles/editor/scene/scene.cpp
index 0ebb29ceddf1a2..127f21ef0da214 100644
--- a/Telegram/SourceFiles/editor/scene/scene.cpp
+++ b/Telegram/SourceFiles/editor/scene/scene.cpp
@@ -10,19 +10,146 @@ For license and copyright information please follow this link:
 #include "editor/scene/scene_item_canvas.h"
 #include "editor/scene/scene_item_line.h"
 #include "editor/scene/scene_item_sticker.h"
+#include "editor/scene/scene_item_text.h"
+#include "editor/scene/scene_emoji_document.h"
+#include "ui/image/image_prepare.h"
 #include "ui/rp_widget.h"
+#include "styles/style_editor.h"
 
+#include <QGraphicsSceneContextMenuEvent>
 #include <QGraphicsSceneMouseEvent>
+#include <QGraphicsTextItem>
+#include <QGraphicsView>
+#include <QTextCursor>
+#include <QTextDocument>
 
 namespace Editor {
 namespace {
 
 using ItemPtr = std::shared_ptr<NumberedItem>;
 
+class ItemEraser final : public NumberedItem {
+public:
+	struct Target {
+		std::shared_ptr<ItemLine> item;
+		QPixmap before;
+	};
+
+	ItemEraser(
+		QPixmap mask,
+		QPointF maskPos,
+		std::vector<Target> targets)
+	: _mask(std::move(mask))
+	, _maskPos(maskPos)
+	, _targets(std::move(targets)) {
+	}
+
+	void apply() {
+		for (const auto &target : _targets) {
+			target.item->applyEraser(_mask, _maskPos);
+		}
+	}
+
+	void revert() {
+		for (const auto &target : _targets) {
+			target.item->setPixmap(target.before);
+		}
+	}
+
+	QRectF boundingRect() const override {
+		return QRectF();
+	}
+
+	void paint(
+			QPainter *,
+			const QStyleOptionGraphicsItem *,
+			QWidget *) override {
+	}
+
+	bool hasState(SaveState state) const override {
+		const auto &saved = (state == SaveState::Keep) ? _keeped : _saved;
+		return saved.saved;
+	}
+
+	void save(SaveState state) override {
+		auto &saved = (state == SaveState::Keep) ? _keeped : _saved;
+		saved = {
+			.saved = true,
+			.status = status(),
+		};
+	}
+
+	void restore(SaveState state) override {
+		if (!hasState(state)) {
+			return;
+		}
+		const auto &saved = (state == SaveState::Keep) ? _keeped : _saved;
+		setStatus(saved.status);
+		if (saved.status == Status::Normal) {
+			apply();
+		} else if (saved.status == Status::Undid) {
+			revert();
+		}
+	}
+
+private:
+	QPixmap _mask;
+	QPointF _maskPos;
+	std::vector<Target> _targets;
+
+	struct {
+		bool saved = false;
+		NumberedItem::Status status;
+	} _saved, _keeped;
+};
+
 bool SkipMouseEvent(not_null<QGraphicsSceneMouseEvent*> event) {
 	return event->isAccepted() || (event->button() == Qt::RightButton);
 }
 
+constexpr auto kPaddingFactor = 0.4;
+constexpr auto kMaxWidthFactor = 0.8;
+constexpr auto kMinWidthFactor = 0.16;
+constexpr auto kIdealWidthExtra = 2;
+constexpr auto kScaleThreshold = 0.01;
+
+class TextEditProxy final : public QGraphicsTextItem {
+public:
+	using QGraphicsTextItem::QGraphicsTextItem;
+
+	Fn<void()> onFinish;
+	Fn<void()> onCancel;
+
+protected:
+	void keyPressEvent(QKeyEvent *event) override {
+		if (event->key() == Qt::Key_Escape) {
+			fire(onCancel);
+			return;
+		}
+		QGraphicsTextItem::keyPressEvent(event);
+	}
+
+	void focusOutEvent(QFocusEvent *event) override {
+		QGraphicsTextItem::focusOutEvent(event);
+		fire(onFinish);
+	}
+
+	void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override {
+		event->accept();
+	}
+
+private:
+	void fire(Fn<void()> &callback) {
+		if (!callback) {
+			return;
+		}
+		const auto cb = std::exchange(callback, nullptr);
+		onFinish = nullptr;
+		onCancel = nullptr;
+		crl::on_main(cb);
+	}
+};
+
 } // namespace
 
 Scene::Scene(const QRectF &rect)
@@ -33,26 +160,179 @@ Scene::Scene(const QRectF &rect)
 	_canvas->clearPixmap();
 
 	_canvas->grabContentRequests(
-	) | rpl::start_with_next([=](ItemCanvas::Content &&content) {
+	) | rpl::on_next([=](ItemCanvas::Content &&content) {
+		if (content.clear) {
+			auto mask = std::move(content.pixmap);
+			if (mask.isNull()) {
+				return;
+			}
+			const auto maskPos = content.position;
+			const auto maskSize = mask.size()
+				/ float64(mask.devicePixelRatio());
+			const auto maskRect = QRectF(maskPos, maskSize);
+			auto targets = std::vector<ItemEraser::Target>();
+			const auto hits = QGraphicsScene::items(
+				maskRect,
+				Qt::IntersectsItemBoundingRect,
+				Qt::DescendingOrder);
+			for (auto *raw : hits) {
+				const auto it = _itemsByPointer.find(raw);
+				if (it == end(_itemsByPointer)) {
+					continue;
+				}
+				const auto &item = it->second;
+				if (!item->isNormalStatus()) {
+					continue;
+				}
+				const auto line = std::dynamic_pointer_cast<ItemLine>(item);
+				if (!line) {
+					continue;
+				}
+				auto before = line->pixmap();
+				if (!line->applyEraser(mask, maskPos)) {
+					continue;
+				}
+				targets.push_back({
+					.item = line,
+					.before = std::move(before),
+				});
+			}
+			if (!targets.empty()) {
+				const auto eraser = std::make_shared<ItemEraser>(
+					std::move(mask),
+					maskPos,
+					std::move(targets));
+				addItem(eraser);
+				_canvas->setZValue(++_lastLineZ);
+			}
+			return;
+		}
+		if (content.blur) {
+			auto mask = std::move(content.pixmap);
+			if (mask.isNull() || !_blurSource) {
+				return;
+			}
+			const auto maskPos = content.position;
+			const auto maskSize = mask.size()
+				/ float64(mask.devicePixelRatio());
+			const auto sourceRect = QRectF(maskPos, maskSize);
+			const auto expandedRect = sourceRect.toAlignedRect().adjusted(
+				-st::photoEditorBlurRadius,
+				-st::photoEditorBlurRadius,
+				st::photoEditorBlurRadius,
+				st::photoEditorBlurRadius);
+			const auto captureRect = expandedRect.intersected(
+				sceneRect().toAlignedRect());
+			if (captureRect.isEmpty()) {
+				return;
+			}
+			auto source = _blurSource(captureRect);
+			if (source.isNull()) {
+				return;
+			}
+			const auto sourceDpr = source.devicePixelRatio();
+			if (source.format() != QImage::Format_ARGB32_Premultiplied) {
+				source = source.convertToFormat(
+					QImage::Format_ARGB32_Premultiplied);
+				source.setDevicePixelRatio(sourceDpr);
+			}
+			const auto canvasVisible = _canvas->isVisible();
+			_canvas->setVisible(false);
+			{
+				auto p = QPainter(&source);
+				render(
+					&p,
+					QRectF(QPointF(), QSizeF(captureRect.size())),
+					QRectF(captureRect),
+					Qt::IgnoreAspectRatio);
+			}
+			_canvas->setVisible(canvasVisible);
+			auto blurred = Images::BlurLargeImage(
+				std::move(source),
+				st::photoEditorBlurRadius);
+			if (blurred.isNull()) {
+				return;
+			}
+			blurred.setDevicePixelRatio(sourceDpr);
+			auto result = QImage(
+				mask.size(),
+				QImage::Format_ARGB32_Premultiplied);
+			result.setDevicePixelRatio(mask.devicePixelRatio());
+			result.fill(Qt::transparent);
+			{
+				auto p = QPainter(&result);
+				p.drawImage(
+					QRectF(QPointF(), maskSize),
+					blurred,
+					QRectF(
+						sourceRect.x() - captureRect.x(),
+						sourceRect.y() - captureRect.y(),
+						sourceRect.width(),
+						sourceRect.height()));
+				p.setCompositionMode(
+					QPainter::CompositionMode_DestinationIn);
+				p.drawPixmap(0, 0, mask);
+			}
+			auto blurPixmap = QPixmap::fromImage(std::move(result));
+			const auto item = std::make_shared<ItemLine>(
+				std::move(blurPixmap));
+			item->setPos(maskPos);
+			addItem(item);
+			_canvas->setZValue(++_lastLineZ);
+			return;
+		}
 		const auto item = std::make_shared<ItemLine>(
 			std::move(content.pixmap));
 		item->setPos(content.position);
 		addItem(item);
 		_canvas->setZValue(++_lastLineZ);
 	}, _lifetime);
+
+	QObject::connect(
+		this,
+		&QGraphicsScene::selectionChanged,
+		[=] {
+			const auto selected = selectedItems();
+			auto *textItem = (ItemText*)(nullptr);
+			if (selected.size() == 1
+				&& selected.front()->type() == ItemText::Type) {
+				textItem = static_cast<ItemText*>(selected.front());
+			}
+			const auto changed = (textItem != _selectedTextItem);
+			if (!changed) {
+				return;
+			}
+			_selectedTextItem = textItem;
+			if (textItem) {
+				_textItemSelections.fire_copy(textItem->color());
+			} else {
+				_textItemDeselections.fire({});
+			}
+		});
 }
 
 void Scene::cancelDrawing() {
+	if (_textEdit.proxy) {
+		finishTextEditing(false);
+	}
 	_canvas->cancelDrawing();
 }
 
+void Scene::cancelTextEditing() {
+	if (_textEdit.proxy) {
+		finishTextEditing(false, false);
+	}
+}
+
 void Scene::addItem(ItemPtr item) {
 	if (!item) {
 		return;
 	}
 	item->setNumber(_itemNumber++);
 	QGraphicsScene::addItem(item.get());
+	const auto raw = item.get();
 	_items.push_back(std::move(item));
+	_itemsByPointer.emplace(raw, _items.back());
 	_addsItem.fire({});
 }
 
@@ -72,8 +352,18 @@ void Scene::removeItem(const ItemPtr &item) {
 }
 
 void Scene::mousePressEvent(QGraphicsSceneMouseEvent *event) {
+	if (_textEdit.proxy) {
+		const auto clickOnProxy = _textEdit.proxy->contains(
+			_textEdit.proxy->mapFromScene(event->scenePos()));
+		if (!clickOnProxy) {
+			finishTextEditing(true);
+			QGraphicsScene::mousePressEvent(event);
+			return;
+		}
+	}
+
 	QGraphicsScene::mousePressEvent(event);
-	if (SkipMouseEvent(event)) {
+	if (SkipMouseEvent(event) || !sceneRect().contains(event->scenePos())) {
 		return;
 	}
 	_canvas->handleMousePressEvent(event);
@@ -81,7 +371,7 @@ void Scene::mousePressEvent(QGraphicsSceneMouseEvent *event) {
 
 void Scene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
 	QGraphicsScene::mouseReleaseEvent(event);
-	if (SkipMouseEvent(event)) {
+	if (SkipMouseEvent(event) || _textEdit.proxy) {
 		return;
 	}
 	_canvas->handleMouseReleaseEvent(event);
@@ -89,14 +379,60 @@ void Scene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
 
 void Scene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
 	QGraphicsScene::mouseMoveEvent(event);
-	if (SkipMouseEvent(event)) {
+	if (SkipMouseEvent(event) || _textEdit.proxy) {
 		return;
 	}
 	_canvas->handleMouseMoveEvent(event);
 }
 
-void Scene::applyBrush(const QColor &color, float size) {
-	_canvas->applyBrush(color, size);
+void Scene::applyBrush(const QColor &color, float64 size, Brush::Tool tool) {
+	_canvas->applyBrush(color, size, tool);
+}
+
+void Scene::setTextDefaults(
+		const QColor &color,
+		float64 fontSize,
+		int style) {
+	_textColor = color;
+	_textFontSize = fontSize;
+	_textStyle = style;
+}
+
+void Scene::setTextColor(const QColor &color) {
+	_textColor = color;
+	if (_textEdit.proxy) {
+		_textEdit.proxy->setDefaultTextColor(EffectiveTextColor(
+			color,
+			static_cast<TextStyle>(_textEditStyle)));
+	}
+}
+
+void Scene::setSelectedTextColor(const QColor &color) {
+	for (auto *item : selectedItems()) {
+		if (item->type() == ItemText::Type) {
+			static_cast<ItemText*>(item)->setColor(color);
+		}
+	}
+}
+
+rpl::producer<QColor> Scene::textColorRequests() const {
+	return _textColorRequests.events();
+}
+
+rpl::producer<QColor> Scene::textItemSelections() const {
+	return _textItemSelections.events();
+}
+
+rpl::producer<> Scene::textItemDeselections() const {
+	return _textItemDeselections.events();
+}
+
+rpl::producer<bool> Scene::textEditStates() const {
+	return _textEditStates.events();
+}
+
+void Scene::setBlurSource(Fn<QImage(QRect)> source) {
+	_blurSource = std::move(source);
 }
 
 rpl::producer<> Scene::addsItem() const {
@@ -125,6 +461,8 @@ std::shared_ptr<float64> Scene::lastZ() const {
 }
 
 void Scene::updateZoom(float64 zoom) {
+	_currentZoom = zoom;
+	_canvas->updateZoom(zoom);
 	for (const auto &item : items()) {
 		if (item->type() >= ItemBase::Type) {
 			static_cast<ItemBase*>(item.get())->updateZoom(zoom);
@@ -145,6 +483,9 @@ void Scene::performUndo() {
 
 	const auto it = ranges::find_if(filtered, &NumberedItem::isNormalStatus);
 	if (it != filtered.end()) {
+		if (const auto eraser = dynamic_cast<ItemEraser*>(it->get())) {
+			eraser->revert();
+		}
 		(*it)->setStatus(NumberedItem::Status::Undid);
 	}
 }
@@ -154,6 +495,9 @@ void Scene::performRedo() {
 
 	const auto it = ranges::find_if(filtered, &NumberedItem::isUndidStatus);
 	if (it != filtered.end()) {
+		if (const auto eraser = dynamic_cast<ItemEraser*>(it->get())) {
+			eraser->apply();
+		}
 		(*it)->setStatus(NumberedItem::Status::Normal);
 	}
 }
@@ -171,6 +515,10 @@ void Scene::removeIf(Fn<bool(const ItemPtr &)> proj) {
 		}
 	}
 	_items = std::move(copy);
+	_itemsByPointer.clear();
+	for (const auto &item : _items) {
+		_itemsByPointer.emplace(item.get(), item);
+	}
 }
 
 void Scene::clearRedoList() {
@@ -182,6 +530,10 @@ void Scene::clearRedoList() {
 }
 
 void Scene::save(SaveState state) {
+	if (_textEdit.proxy) {
+		finishTextEditing(true);
+	}
+
 	removeIf([](const ItemPtr &item) {
 		return item->isRemovedStatus()
 			&& !item->hasState(SaveState::Keep)
@@ -207,11 +559,282 @@ void Scene::restore(SaveState state) {
 	cancelDrawing();
 }
 
+void Scene::setTextEditing(bool editing, bool notify) {
+	if (_textEditing == editing) {
+		return;
+	}
+	_textEditing = editing;
+	if (notify) {
+		_textEditStates.fire_copy(editing);
+	}
+}
+
+void Scene::setupTextProxy(
+		QGraphicsTextItem *proxy,
+		const QColor &color,
+		float64 fontSize) {
+	proxy->setTextInteractionFlags(Qt::TextEditorInteraction);
+	proxy->setDefaultTextColor(color);
+
+	auto *emojiDoc = new EmojiDocument(proxy);
+	emojiDoc->setDocumentMargin(0);
+	proxy->setDocument(emojiDoc);
+
+	auto font = QFont();
+	font.setPixelSize(int(fontSize));
+	font.setWeight(QFont::DemiBold);
+	proxy->setFont(font);
+
+	{
+		auto option = emojiDoc->defaultTextOption();
+		option.setAlignment(Qt::AlignCenter);
+		emojiDoc->setDefaultTextOption(option);
+	}
+}
+
+void Scene::createTextAtCenter(int rotation) {
+	if (_textEdit.proxy) {
+		return;
+	}
+
+	const auto generation = ++_textEditGeneration;
+
+	clearSelection();
+	cancelDrawing();
+	setTextEditing(true);
+	_textEditStyle = _textStyle;
+
+	_textEdit.proxy.reset(new TextEditProxy());
+	const auto proxy = _textEdit.proxy.get();
+	setupTextProxy(
+		proxy,
+		EffectiveTextColor(
+			_textColor,
+			static_cast<TextStyle>(_textEditStyle)),
+		_textFontSize);
+
+	const auto emojiDoc = proxy->document();
+	const auto shortSide = std::min(
+		sceneRect().width(),
+		sceneRect().height());
+	const auto padding = int(_textFontSize * kPaddingFactor);
+	const auto maxTextWidth = std::max(
+		int(shortSide * kMaxWidthFactor) - 2 * padding,
+		1);
+	const auto minTextWidth = std::clamp(
+		int(shortSide * kMinWidthFactor) - 2 * padding,
+		1,
+		maxTextWidth);
+	const auto sceneCenter = sceneRect().center();
+	const auto adjustWidth = [=] {
+		emojiDoc->setTextWidth(maxTextWidth);
+		const auto ideal = int(std::ceil(emojiDoc->idealWidth()));
+		const auto width = std::clamp(
+			ideal + kIdealWidthExtra,
+			minTextWidth,
+			maxTextWidth);
+		proxy->setTextWidth(width);
+		const auto anchor = QPointF(width / 2., 0.);
+		proxy->setTransformOriginPoint(anchor);
+		proxy->setPos(sceneCenter - anchor);
+	};
+	adjustWidth();
+	proxy->setRotation(rotation);
+
+	QObject::connect(emojiDoc, &QTextDocument::contentsChanged, [=] {
+		ReplaceEmoji(emojiDoc);
+		adjustWidth();
+	});
+
+	QGraphicsScene::addItem(proxy);
+	proxy->setZValue((*_lastZ)++);
+	proxy->setFocus();
+	if (!views().isEmpty()) {
+		views().first()->setFocus();
+	}
+
+	const auto raw = static_cast<TextEditProxy*>(proxy);
+	raw->onFinish = crl::guard(this, [=] {
+		if (generation == _textEditGeneration) {
+			finishTextEditing(true);
+		}
+	});
+	raw->onCancel = crl::guard(this, [=] {
+		if (generation == _textEditGeneration) {
+			finishTextEditing(false);
+		}
+	});
+
+	_textEdit.item.reset();
+	_textColorRequests.fire_copy(_textColor);
+}
+
+void Scene::startTextEditing(ItemText *item) {
+	if (_textEdit.proxy) {
+		finishTextEditing(true);
+	}
+	if (!item) {
+		return;
+	}
+
+	const auto generation = ++_textEditGeneration;
+
+	cancelDrawing();
+	setTextEditing(true);
+	_textEditStyle = int(item->textStyle());
+
+	_textEdit.proxy.reset(new TextEditProxy());
+	const auto proxy = _textEdit.proxy.get();
+	setupTextProxy(
+		proxy,
+		EffectiveTextColor(item->color(), item->textStyle()),
+		item->fontSize());
+
+	proxy->setPlainText(item->text());
+	ReplaceEmoji(proxy->document());
+
+	const auto emojiDoc = proxy->document();
+	const auto shortSide = std::min(
+		sceneRect().width(),
+		sceneRect().height());
+	const auto padding = int(item->fontSize() * kPaddingFactor);
+	const auto maxTextWidth = std::max(
+		int(shortSide * kMaxWidthFactor) - 2 * padding,
+		1);
+	const auto minTextWidth = std::clamp(
+		int(shortSide * kMinWidthFactor) - 2 * padding,
+		1,
+		maxTextWidth);
+	const auto anchor = item->scenePos();
+	const auto adjustWidth = [=] {
+		emojiDoc->setTextWidth(maxTextWidth);
+		const auto ideal = int(std::ceil(emojiDoc->idealWidth()));
+		const auto width = std::clamp(
+			ideal + kIdealWidthExtra,
+			minTextWidth,
+			maxTextWidth);
+		proxy->setTextWidth(width);
+		const auto center = proxy->boundingRect().center();
+		proxy->setTransformOriginPoint(center);
+		proxy->setPos(anchor - center);
+	};
+	adjustWidth();
+
+	QObject::connect(emojiDoc, &QTextDocument::contentsChanged, [=] {
+		ReplaceEmoji(emojiDoc);
+		adjustWidth();
+	});
+
+	const auto scale = item->editScale();
+	proxy->setRotation(item->rotation());
+	if (std::abs(scale - 1.) > kScaleThreshold) {
+		proxy->setScale(scale);
+	}
+
+	QGraphicsScene::addItem(proxy);
+	proxy->setZValue((*_lastZ)++);
+	proxy->setFocus();
+
+	auto cursor = proxy->textCursor();
+	cursor.select(QTextCursor::Document);
+	proxy->setTextCursor(cursor);
+
+	item->setVisible(false);
+
+	const auto raw = static_cast<TextEditProxy*>(proxy);
+	raw->onFinish = crl::guard(this, [=] {
+		if (generation == _textEditGeneration) {
+			finishTextEditing(true);
+		}
+	});
+	raw->onCancel = crl::guard(this, [=] {
+		if (generation == _textEditGeneration) {
+			finishTextEditing(false);
+		}
+	});
+
+	const auto it = _itemsByPointer.find(item);
+	_textEdit.item = (it != end(_itemsByPointer))
+		? it->second
+		: std::weak_ptr<NumberedItem>();
+	_textColorRequests.fire_copy(item->color());
+}
+
+void Scene::finishTextEditing(bool save, bool notify) {
+	if (!_textEdit.proxy) {
+		return;
+	}
+
+	const auto text = save
+		? RecoverTextFromDocument(_textEdit.proxy->document()).trimmed()
+		: QString();
+	const auto proxyRect = _textEdit.proxy->boundingRect();
+	const auto proxyCenter = _textEdit.proxy->mapToScene(proxyRect.center());
+	const auto proxyRotation = int(_textEdit.proxy->rotation());
+	const auto lockedItem = _textEdit.item.lock();
+	auto *existingItem = lockedItem
+		? static_cast<ItemText*>(lockedItem.get())
+		: (ItemText*)(nullptr);
+
+	const auto raw = static_cast<TextEditProxy*>(_textEdit.proxy.get());
+	raw->onFinish = nullptr;
+	raw->onCancel = nullptr;
+	QGraphicsScene::removeItem(_textEdit.proxy.get());
+	_textEdit.proxy = nullptr;
+	_textEdit.item.reset();
+	setTextEditing(false, notify);
+
+	const auto defaultStyle = static_cast<TextStyle>(_textStyle);
+
+	if (!text.isEmpty()) {
+		if (existingItem) {
+			existingItem->setText(text);
+			existingItem->setVisible(true);
+		} else {
+			const auto imageSize = sceneRect().size().toSize();
+			const auto contentSize = ItemText::computeContentSize(
+				text,
+				_textFontSize,
+				imageSize,
+				defaultStyle);
+			const auto zoom = (_currentZoom > 0.) ? _currentZoom : 1.;
+			const auto handleInflate = int(
+				std::ceil(st::photoEditorItemHandleSize / zoom));
+			const auto size = std::max(
+				contentSize.width() + handleInflate,
+				1);
+			auto data = ItemBase::Data{
+				.initialZoom = zoom,
+				.zPtr = _lastZ,
+				.size = size,
+				.x = int(proxyCenter.x()),
+				.y = int(proxyCenter.y()),
+				.rotation = proxyRotation,
+				.imageSize = imageSize,
+			};
+			auto item = std::make_shared<ItemText>(
+				text,
+				_textColor,
+				_textFontSize,
+				defaultStyle,
+				imageSize,
+				std::move(data));
+			addItem(item);
+		}
+	} else if (existingItem) {
+		if (save) {
+			removeItem(existingItem);
+		} else {
+			existingItem->setVisible(true);
+		}
+	}
+}
+
 Scene::~Scene() {
-	// Prevent destroying by scene of all items.
+	disconnect(this, &QGraphicsScene::selectionChanged, nullptr, nullptr);
+	cancelTextEditing();
 	QGraphicsScene::removeItem(_canvas.get());
 	for (const auto &item : items()) {
-		// Scene loses ownership of an item.
 		QGraphicsScene::removeItem(item.get());
 	}
 }
diff --git a/Telegram/SourceFiles/editor/scene/scene.h b/Telegram/SourceFiles/editor/scene/scene.h
index d23423107c5f13..252f4795ec10a8 100644
--- a/Telegram/SourceFiles/editor/scene/scene.h
+++ b/Telegram/SourceFiles/editor/scene/scene.h
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 #include <QGraphicsScene>
 
 class QGraphicsSceneMouseEvent;
+class QGraphicsTextItem;
 
 namespace Ui {
 class RpWidget;
@@ -21,6 +22,7 @@ class RpWidget;
 namespace Editor {
 
 class ItemCanvas;
+class ItemText;
 class NumberedItem;
 
 class Scene final : public QGraphicsScene {
@@ -29,7 +31,9 @@ class Scene final : public QGraphicsScene {
 
 	Scene(const QRectF &rect);
 	~Scene();
-	void applyBrush(const QColor &color, float size);
+	void applyBrush(const QColor &color, float64 size, Brush::Tool tool);
+	void setBlurSource(Fn<QImage(QRect)> source);
+	void setTextDefaults(const QColor &color, float64 fontSize, int style);
 
 	[[nodiscard]] std::vector<ItemPtr> items(
 		Qt::SortOrder order = Qt::DescendingOrder) const;
@@ -44,6 +48,17 @@ class Scene final : public QGraphicsScene {
 	void updateZoom(float64 zoom);
 
 	void cancelDrawing();
+	void cancelTextEditing();
+
+	void startTextEditing(ItemText *item);
+	void createTextAtCenter(int rotation);
+	void setTextColor(const QColor &color);
+	void setSelectedTextColor(const QColor &color);
+
+	[[nodiscard]] rpl::producer<QColor> textColorRequests() const;
+	[[nodiscard]] rpl::producer<QColor> textItemSelections() const;
+	[[nodiscard]] rpl::producer<> textItemDeselections() const;
+	[[nodiscard]] rpl::producer<bool> textEditStates() const;
 
 	[[nodiscard]] bool hasUndo() const;
 	[[nodiscard]] bool hasRedo() const;
@@ -61,15 +76,42 @@ class Scene final : public QGraphicsScene {
 	void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
 private:
 	void removeIf(Fn<bool(const ItemPtr &)> proj);
+	void finishTextEditing(bool save, bool notify = true);
+	void setTextEditing(bool editing, bool notify = true);
+	void setupTextProxy(
+		QGraphicsTextItem *proxy,
+		const QColor &color,
+		float64 fontSize);
+
 	const std::shared_ptr<ItemCanvas> _canvas;
 	const std::shared_ptr<float64> _lastZ;
+	Fn<QImage(QRect)> _blurSource;
 
 	std::vector<ItemPtr> _items;
+	std::unordered_map<QGraphicsItem*, ItemPtr> _itemsByPointer;
 
 	float64 _lastLineZ = 0.;
+	float64 _currentZoom = 1.;
 	int _itemNumber = 0;
 
+	QColor _textColor;
+	float64 _textFontSize = 0.;
+	int _textStyle = 0;
+	int _textEditStyle = 0;
+
+	struct {
+		std::weak_ptr<NumberedItem> item;
+		base::unique_qptr<QGraphicsTextItem> proxy;
+	} _textEdit;
+
 	rpl::event_stream<> _addsItem, _removesItem;
+	rpl::event_stream<QColor> _textColorRequests;
+	rpl::event_stream<QColor> _textItemSelections;
+	rpl::event_stream<> _textItemDeselections;
+	rpl::event_stream<bool> _textEditStates;
+	ItemText *_selectedTextItem = nullptr;
+	bool _textEditing = false;
+	int _textEditGeneration = 0;
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/editor/scene/scene_emoji_document.cpp b/Telegram/SourceFiles/editor/scene/scene_emoji_document.cpp
new file mode 100644
index 00000000000000..df04598343f3a9
--- /dev/null
+++ b/Telegram/SourceFiles/editor/scene/scene_emoji_document.cpp
@@ -0,0 +1,132 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "editor/scene/scene_emoji_document.h"
+
+#include "ui/emoji_config.h"
+#include "ui/painter.h"
+
+#include <QTextBlock>
+#include <QTextCursor>
+
+namespace Editor {
+
+EmojiDocument::EmojiDocument(QObject *parent)
+: QTextDocument(parent) {
+}
+
+QVariant EmojiDocument::loadResource(int type, const QUrl &name) {
+	if (type != QTextDocument::ImageResource
+		|| name.scheme() != u"emoji"_q) {
+		return QTextDocument::loadResource(type, name);
+	}
+	const auto i = _cache.find(name);
+	if (i != _cache.end()) {
+		return i->second;
+	}
+	auto result = QVariant();
+	if (const auto emoji = Ui::Emoji::FromUrl(name.toDisplayString())) {
+		const auto factor = style::DevicePixelRatio();
+		const auto logical = QFontMetrics(defaultFont()).height();
+		const auto source = Ui::Emoji::GetSizeLarge();
+		auto image = QImage(
+			QSize(logical, logical) * factor,
+			QImage::Format_ARGB32_Premultiplied);
+		image.setDevicePixelRatio(factor);
+		image.fill(Qt::transparent);
+		{
+			auto p = QPainter(&image);
+			auto hq = PainterHighQualityEnabler(p);
+			const auto sourceLogical = source / float64(factor);
+			const auto scale = logical / sourceLogical;
+			p.scale(scale, scale);
+			Ui::Emoji::Draw(p, emoji, source, 0, 0);
+		}
+		result = QVariant(QPixmap::fromImage(std::move(image)));
+	}
+	_cache.emplace(name, result);
+	return result;
+}
+
+void ReplaceEmoji(QTextDocument *doc) {
+	QSignalBlocker blocker(doc);
+	const auto fontHeight = QFontMetrics(doc->defaultFont()).height();
+	auto cursor = QTextCursor(doc);
+	auto block = doc->begin();
+	while (block.isValid()) {
+		auto text = block.text();
+		auto start = text.constData();
+		auto end = start + text.size();
+		auto ch = start;
+		while (ch < end) {
+			auto emojiLength = 0;
+			const auto emoji = Ui::Emoji::Find(ch, end, &emojiLength);
+			if (!emoji || emojiLength <= 0) {
+				++ch;
+				continue;
+			}
+			const auto pos = block.position() + int(ch - start);
+			cursor.setPosition(pos);
+			cursor.setPosition(
+				pos + emojiLength,
+				QTextCursor::KeepAnchor);
+
+			auto format = QTextImageFormat();
+			format.setName(emoji->toUrl());
+			format.setWidth(fontHeight);
+			format.setHeight(fontHeight);
+			format.setVerticalAlignment(
+				QTextCharFormat::AlignBaseline);
+			cursor.insertImage(format);
+
+			block = doc->findBlock(pos);
+			text = block.text();
+			start = text.constData();
+			end = start + text.size();
+			ch = start + (pos - block.position()) + 1;
+			continue;
+		}
+		block = block.next();
+	}
+}
+
+QString RecoverTextFromDocument(QTextDocument *doc) {
+	auto result = QString();
+	auto block = doc->begin();
+	while (block.isValid()) {
+		if (block != doc->begin()) {
+			result += '\n';
+		}
+		auto it = block.begin();
+		while (!it.atEnd()) {
+			const auto fragment = it.fragment();
+			if (!fragment.isValid()) {
+				++it;
+				continue;
+			}
+			const auto text = fragment.text();
+			const auto format = fragment.charFormat();
+			for (const auto &ch : text) {
+				if (ch == QChar::ObjectReplacementCharacter) {
+					if (format.isImageFormat()) {
+						const auto name = format.toImageFormat().name();
+						if (const auto emoji = Ui::Emoji::FromUrl(name)) {
+							result += emoji->text();
+							continue;
+						}
+					}
+				}
+				result += ch;
+			}
+			++it;
+		}
+		block = block.next();
+	}
+	return result;
+}
+
+} // namespace Editor
diff --git a/Telegram/SourceFiles/editor/scene/scene_emoji_document.h b/Telegram/SourceFiles/editor/scene/scene_emoji_document.h
new file mode 100644
index 00000000000000..eff28e4907ebc8
--- /dev/null
+++ b/Telegram/SourceFiles/editor/scene/scene_emoji_document.h
@@ -0,0 +1,26 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include <QTextDocument>
+
+namespace Editor {
+
+class EmojiDocument final : public QTextDocument {
+public:
+	explicit EmojiDocument(QObject *parent = nullptr);
+	QVariant loadResource(int type, const QUrl &name) override;
+
+private:
+	std::map<QUrl, QVariant> _cache;
+};
+
+void ReplaceEmoji(QTextDocument *doc);
+[[nodiscard]] QString RecoverTextFromDocument(QTextDocument *doc);
+
+} // namespace Editor
diff --git a/Telegram/SourceFiles/editor/scene/scene_item_base.cpp b/Telegram/SourceFiles/editor/scene/scene_item_base.cpp
index 8c697025848eba..4f74a80551113e 100644
--- a/Telegram/SourceFiles/editor/scene/scene_item_base.cpp
+++ b/Telegram/SourceFiles/editor/scene/scene_item_base.cpp
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/popup_menu.h"
 #include "ui/painter.h"
 #include "styles/style_editor.h"
+#include "styles/style_media_view.h"
 #include "styles/style_menu_icons.h"
 
 #include <QGraphicsScene>
@@ -170,7 +171,7 @@ void ItemBase::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {
 }
 
 void ItemBase::mousePressEvent(QGraphicsSceneMouseEvent *event) {
-	setZValue((*_lastZ)++);
+	raiseToTop();
 	if (event->button() == Qt::LeftButton) {
 		_handle = handleType(event->pos());
 	}
@@ -211,22 +212,22 @@ void ItemBase::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
 
 	_menu = base::make_unique_q<Ui::PopupMenu>(
 		nullptr,
-		st::popupMenuWithIcons);
+		st::mediaviewPopupMenu);
 	add(
 		tr::lng_photo_editor_menu_delete,
 		kDeleteSequence,
 		[=] { actionDelete(); },
-		&st::menuIconDelete);
+		&st::mediaMenuIconDelete);
 	add(
 		tr::lng_photo_editor_menu_flip,
 		kFlipSequence,
 		[=] { actionFlip(); },
-		&st::menuIconFlip);
+		&st::mediaMenuIconFlip);
 	add(
 		tr::lng_photo_editor_menu_duplicate,
 		kDuplicateSequence,
 		[=] { actionDuplicate(); },
-		&st::menuIconCopy);
+		&st::mediaMenuIconCopy);
 
 	_menu->popup(event->screenPos());
 }
@@ -267,6 +268,10 @@ void ItemBase::actionDuplicate() {
 	}
 }
 
+void ItemBase::raiseToTop() {
+	setZValue((*_lastZ)++);
+}
+
 void ItemBase::keyPressEvent(QKeyEvent *e) {
 	if (e->key() == Qt::Key_Escape) {
 		if (const auto s = scene()) {
@@ -329,6 +334,7 @@ void ItemBase::updateVerticalSize() {
 }
 
 void ItemBase::setAspectRatio(float64 aspectRatio) {
+	prepareGeometryChange();
 	_aspectRatio = aspectRatio;
 	updateVerticalSize();
 }
diff --git a/Telegram/SourceFiles/editor/scene/scene_item_base.h b/Telegram/SourceFiles/editor/scene/scene_item_base.h
index 3ee271ad2ac493..1f93b6b0cd274f 100644
--- a/Telegram/SourceFiles/editor/scene/scene_item_base.h
+++ b/Telegram/SourceFiles/editor/scene/scene_item_base.h
@@ -100,6 +100,7 @@ class ItemBase : public NumberedItem {
 	void actionFlip();
 	void actionDelete();
 	void actionDuplicate();
+	void raiseToTop();
 
 	QRectF contentRect() const;
 	QRectF innerRect() const;
diff --git a/Telegram/SourceFiles/editor/scene/scene_item_canvas.cpp b/Telegram/SourceFiles/editor/scene/scene_item_canvas.cpp
index 21b7266f365ca4..27a4186dee1eed 100644
--- a/Telegram/SourceFiles/editor/scene/scene_item_canvas.cpp
+++ b/Telegram/SourceFiles/editor/scene/scene_item_canvas.cpp
@@ -6,73 +6,31 @@ For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "editor/scene/scene_item_canvas.h"
+#include "styles/style_editor.h"
 
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
+#include <QtMath>
 
 namespace Editor {
 namespace {
 
-QRectF NormalizedRect(const QPointF& p1, const QPointF& p2) {
-	return QRectF(
-		std::min(p1.x(), p2.x()),
-		std::min(p1.y(), p2.y()),
-		std::abs(p2.x() - p1.x()) + 1,
-		std::abs(p2.y() - p1.y()) + 1);
+constexpr auto kMinPointDistanceBase = 2.0;
+constexpr auto kMaxPointDistance = 15.0;
+constexpr auto kSmoothingStrength = 0.5;
+constexpr auto kSegmentOverlap = 3;
+constexpr auto kOriginStartJumpRatio = 0.25;
+constexpr auto kHalfStrength = kSmoothingStrength / 2.0;
+constexpr auto kInvStrength = 1.0 - kSmoothingStrength;
+
+[[nodiscard]] float64 PointDistance(const QPointF &a, const QPointF &b) {
+	const auto dx = a.x() - b.x();
+	const auto dy = a.y() - b.y();
+	return std::sqrt(dx * dx + dy * dy);
 }
 
-std::vector<QPointF> InterpolatedPoints(
-		const QPointF &startPoint,
-		const QPointF &endPoint) {
-	std::vector<QPointF> points;
-
-	const auto x1 = startPoint.x();
-	const auto y1 = startPoint.y();
-	const auto x2 = endPoint.x();
-	const auto y2 = endPoint.y();
-
-	// Difference of x and y values.
-	const auto dx = x2 - x1;
-	const auto dy = y2 - y1;
-
-	// Absolute values of differences.
-	const auto ix = std::abs(dx);
-	const auto iy = std::abs(dy);
-
-	// Larger of the x and y differences.
-	const auto inc = ix > iy ? ix : iy;
-
-	// Plot location.
-	auto plotx = x1;
-	auto ploty = y1;
-
-	auto x = 0;
-	auto y = 0;
-
-	points.push_back(QPointF(plotx, ploty));
-
-	for (auto i = 0; i <= inc; i++) {
-		const auto xInc = x > inc;
-		const auto yInc = y > inc;
-
-		x += ix;
-		y += iy;
-
-		if (xInc) {
-			x -= inc;
-			plotx += 1 * ((dx < 0) ? -1 : 1);
-		}
-
-		if (yInc) {
-			y -= inc;
-			ploty += 1 * ((dy < 0) ? -1 : 1);
-		}
-
-		if (xInc || yInc) {
-			points.push_back(QPointF(plotx, ploty));
-		}
-	}
-	return points;
+[[nodiscard]] bool IsValidPoint(const QPointF &point) {
+	return std::isfinite(point.x()) && std::isfinite(point.y());
 }
 
 } // namespace
@@ -96,11 +54,17 @@ void ItemCanvas::clearPixmap() {
 	_p->setBrush(_brushData.color);
 }
 
-void ItemCanvas::applyBrush(const QColor &color, float size) {
+void ItemCanvas::applyBrush(const QColor &color, float size, Brush::Tool tool) {
 	_brushData.color = color;
 	_brushData.size = size;
+	_brushData.tool = tool;
 	_p->setBrush(color);
-	_brushMargins = QMarginsF(size, size, size, size);// / 2.;
+	const auto width = strokeWidth(1.0);
+	const auto extra = (tool == Brush::Tool::Arrow)
+		? arrowHeadLength()
+		: 0.;
+	const auto margin = width + extra;
+	_brushMargins = QMarginsF(margin, margin, margin, margin);
 }
 
 QRectF ItemCanvas::boundingRect() const {
@@ -108,44 +72,295 @@ QRectF ItemCanvas::boundingRect() const {
 }
 
 void ItemCanvas::computeContentRect(const QPointF &p) {
-	if (!scene()) {
+	if (!scene() || !IsValidPoint(p)) {
 		return;
 	}
 	const auto sceneSize = scene()->sceneRect().size();
+	const auto contentLeft = std::max(0., _contentRect.x());
+	const auto contentTop = std::max(0., _contentRect.y());
 	_contentRect = QRectF(
 		QPointF(
-			std::clamp(p.x() - _brushMargins.left(), 0., _contentRect.x()),
-			std::clamp(p.y() - _brushMargins.top(), 0., _contentRect.y())
-		),
+			std::clamp(p.x() - _brushMargins.left(), 0., contentLeft),
+			std::clamp(p.y() - _brushMargins.top(), 0., contentTop)),
 		QPointF(
 			std::clamp(
 				p.x() + _brushMargins.right(),
-				_contentRect.x() + _contentRect.width(),
+				contentLeft + _contentRect.width(),
 				sceneSize.width()),
 			std::clamp(
 				p.y() + _brushMargins.bottom(),
-				_contentRect.y() + _contentRect.height(),
-				sceneSize.height())
-		));
+				contentTop + _contentRect.height(),
+				sceneSize.height())));
+}
+
+std::vector<ItemCanvas::StrokePoint> ItemCanvas::smoothStroke(
+		const std::vector<StrokePoint> &points) const {
+	if (points.size() < 4) {
+		return points;
+	}
+	auto result = std::vector<StrokePoint>();
+	result.reserve(points.size());
+	result.push_back(points[0]);
+	result.push_back(points[1]);
+	for (auto i = 2; i < int(points.size()) - 1; ++i) {
+		const auto &prev = points[i - 1].pos;
+		const auto &curr = points[i].pos;
+		const auto &next = points[i + 1].pos;
+		const auto smoothed = curr * kInvStrength
+			+ (prev + next) * kHalfStrength;
+		result.push_back({
+			.pos = smoothed,
+			.pressure = points[i].pressure,
+			.time = points[i].time,
+		});
+	}
+	result.push_back(points.back());
+	return result;
 }
 
-void ItemCanvas::drawLine(
-		const QPointF &currentPoint,
-		const QPointF &lastPoint) {
-	const auto halfBrushSize = _brushData.size / 2.;
-	const auto points = InterpolatedPoints(lastPoint, currentPoint);
+float64 ItemCanvas::strokeWidth(float64 pressure) const {
+	auto width = _brushData.size * pressure;
+	if (_brushData.tool == Brush::Tool::Marker) {
+		width *= st::photoEditorMarkerSizeMultiplier;
+	} else if (_brushData.tool == Brush::Tool::Blur) {
+		width *= st::photoEditorBlurSizeMultiplier;
+	}
+	return width;
+}
+
+QColor ItemCanvas::strokeColor() const {
+	if (_brushData.tool == Brush::Tool::Eraser
+		|| _brushData.tool == Brush::Tool::Blur) {
+		return QColor(0, 0, 0, 255);
+	}
+	auto color = _brushData.color;
+	if (_brushData.tool == Brush::Tool::Marker) {
+		color.setAlphaF(color.alphaF() * st::photoEditorMarkerOpacity);
+	}
+	return color;
+}
 
-	_rectToUpdate |= NormalizedRect(currentPoint, lastPoint) + _brushMargins;
+float64 ItemCanvas::arrowHeadLength() const {
+	return _brushData.size * st::photoEditorArrowHeadLengthFactor;
+}
 
-	for (const auto &point : points) {
-		_p->drawEllipse(point, halfBrushSize, halfBrushSize);
+void ItemCanvas::renderSegment(
+		const std::vector<StrokePoint> &points,
+		int startIdx) {
+	if (points.size() < 2 || startIdx >= int(points.size()) - 1) {
+		return;
+	}
+	if (!IsValidPoint(points.back().pos)) {
+		return;
+	}
+	auto path = QPainterPath();
+	const auto effectiveStart = std::max(0, startIdx);
+	if (!IsValidPoint(points[effectiveStart].pos)) {
+		return;
+	}
+	path.moveTo(points[effectiveStart].pos);
+	for (auto i = effectiveStart; i < int(points.size()) - 1; ++i) {
+		const auto &p0 = points[i].pos;
+		const auto &p1 = points[i + 1].pos;
+		if (!IsValidPoint(p0) || !IsValidPoint(p1)) {
+			return;
+		}
+		const auto ctrl = (p0 + p1) / 2.0;
+		if (!IsValidPoint(ctrl)) {
+			return;
+		}
+		if (i == effectiveStart) {
+			path.lineTo(ctrl);
+		} else {
+			path.quadTo(p0, ctrl);
+		}
+	}
+	path.lineTo(points.back().pos);
+	const auto count = points.size() - std::max(0, startIdx);
+	const auto avgPressure = count > 0
+		? std::accumulate(
+			points.begin() + std::max(0, startIdx),
+			points.end(),
+			0.0,
+			[](float64 sum, const StrokePoint &p) {
+				return sum + p.pressure;
+			}) / count
+		: 1.0;
+	const auto width = strokeWidth(avgPressure);
+	auto stroker = QPainterPathStroker();
+	stroker.setWidth(width);
+	stroker.setCapStyle(Qt::RoundCap);
+	stroker.setJoinStyle(Qt::RoundJoin);
+	const auto outline = stroker.createStroke(path);
+	const auto color = strokeColor();
+	if (_brushData.tool == Brush::Tool::Marker) {
+		_p->save();
+		_p->setCompositionMode(QPainter::CompositionMode_Source);
+		_p->fillPath(outline, color);
+		_p->restore();
+	} else {
+		_p->fillPath(outline, color);
 	}
+	_rectToUpdate |= outline.boundingRect() + _brushMargins;
+}
+
+void ItemCanvas::drawIncrementalStroke() {
+	if (_currentStroke.size() < 2) {
+		return;
+	}
+	const auto startIdx = std::max(
+		0,
+		_lastRenderedIndex - kSegmentOverlap);
+	auto segment = std::vector<StrokePoint>(
+		_currentStroke.begin() + startIdx,
+		_currentStroke.end());
+	if (segment.size() < 2) {
+		return;
+	}
+	if (segment.size() >= 4) {
+		for (auto i = 0; i < 2; ++i) {
+			segment = smoothStroke(segment);
+		}
+	}
+	renderSegment(
+		segment,
+		std::min(kSegmentOverlap, int(segment.size()) - 1));
+	_lastRenderedIndex = std::max(
+		0,
+		int(_currentStroke.size()) - kSegmentOverlap);
+}
+
+void ItemCanvas::drawArrowHead() {
+	if (_brushData.tool != Brush::Tool::Arrow) {
+		return;
+	}
+	if (_currentStroke.size() < 2) {
+		return;
+	}
+	const auto tip = _currentStroke.back().pos;
+	const auto minDistance = _brushData.size
+		* st::photoEditorArrowHeadMinDistanceFactor;
+	auto base = _currentStroke.front().pos;
+	for (auto i = int(_currentStroke.size()) - 2; i >= 0; --i) {
+		const auto &p = _currentStroke[i].pos;
+		if (PointDistance(tip, p) >= minDistance) {
+			base = p;
+			break;
+		}
+	}
+	auto direction = tip - base;
+	const auto length = std::sqrt(
+		direction.x() * direction.x()
+			+ direction.y() * direction.y());
+	if (length <= 0.) {
+		return;
+	}
+	direction /= length;
+	const auto angle = qDegreesToRadians(
+		float64(st::photoEditorArrowHeadAngleDegrees));
+	const auto sinA = std::sin(angle);
+	const auto cosA = std::cos(angle);
+	const auto rotate = [&](const QPointF &v, float64 s, float64 c) {
+		return QPointF(v.x() * c - v.y() * s, v.x() * s + v.y() * c);
+	};
+	const auto headLength = arrowHeadLength();
+	const auto left = tip - rotate(direction, sinA, cosA) * headLength;
+	const auto right = tip - rotate(direction, -sinA, cosA) * headLength;
+
+	auto arrow = QPainterPath();
+	arrow.moveTo(tip);
+	arrow.lineTo(left);
+	arrow.moveTo(tip);
+	arrow.lineTo(right);
+	auto stroker = QPainterPathStroker();
+	stroker.setWidth(strokeWidth(_currentStroke.back().pressure));
+	stroker.setCapStyle(Qt::RoundCap);
+	stroker.setJoinStyle(Qt::RoundJoin);
+	const auto outline = stroker.createStroke(arrow);
+	_p->fillPath(outline, strokeColor());
+	_rectToUpdate |= outline.boundingRect() + _brushMargins;
+	computeContentRect(left);
+	computeContentRect(right);
+}
+
+void ItemCanvas::addStrokePoint(const QPointF &point, int64 time) {
+	if (!IsValidPoint(point)) {
+		return;
+	}
+	if ((_currentStroke.size() == 1)
+		&& (_currentStroke.front().pos == QPointF())
+		&& (point != QPointF())) {
+		if (const auto currentScene = scene()) {
+			const auto size = currentScene->sceneRect().size();
+			const auto maxStartJump = std::max(size.width(), size.height())
+				* kOriginStartJumpRatio;
+			if (PointDistance(_currentStroke.front().pos, point)
+				> maxStartJump) {
+				_currentStroke.front() = {
+					.pos = point,
+					.pressure = 1.0,
+					.time = time,
+				};
+				_lastPointTime = time;
+				_contentRect = QRectF(point, point) + _brushMargins;
+				return;
+			}
+		}
+	}
+	if (!_currentStroke.empty()) {
+		const auto distance = PointDistance(
+			point,
+			_currentStroke.back().pos);
+		const auto minDistance = (_zoom > 1.0)
+			? (kMinPointDistanceBase / _zoom)
+			: (kMinPointDistanceBase * _zoom);
+		if (distance < minDistance) {
+			return;
+		}
+		const auto maxDistance = (_zoom > 1.0)
+			? (kMaxPointDistance / _zoom)
+			: kMaxPointDistance;
+		if (distance > maxDistance) {
+			const auto steps = int(std::ceil(distance / maxDistance));
+			const auto lastPos = _currentStroke.back().pos;
+			const auto lastPressure = _currentStroke.back().pressure;
+			for (auto i = 1; i < steps; ++i) {
+				const auto t = float64(i) / steps;
+				const auto interpolated = lastPos * (1.0 - t) + point * t;
+				const auto interpTime = _lastPointTime
+					+ int64((time - _lastPointTime) * t);
+				_currentStroke.push_back({
+					.pos = interpolated,
+					.pressure = lastPressure,
+					.time = interpTime,
+				});
+			}
+		}
+	}
+	_currentStroke.push_back({
+		.pos = point,
+		.pressure = 1.0,
+		.time = time,
+	});
+	_lastPointTime = time;
+	computeContentRect(point);
 }
 
 void ItemCanvas::handleMousePressEvent(
 		not_null<QGraphicsSceneMouseEvent*> e) {
 	_lastPoint = e->scenePos();
-	_contentRect = QRectF(_lastPoint, _lastPoint);
+	if (!IsValidPoint(_lastPoint)) {
+		_drawing = false;
+		return;
+	}
+	_rectToUpdate = QRectF();
+	_contentRect = QRectF();
+	_currentStroke.clear();
+	_lastRenderedIndex = 0;
+	_lastPointTime = 0;
+	const auto now = crl::now();
+	addStrokePoint(_lastPoint, now);
+	_contentRect = QRectF(_lastPoint, _lastPoint) + _brushMargins;
 	_drawing = true;
 }
 
@@ -155,10 +370,16 @@ void ItemCanvas::handleMouseMoveEvent(
 		return;
 	}
 	const auto scenePos = e->scenePos();
-	drawLine(scenePos, _lastPoint);
-	update(_rectToUpdate);
-	computeContentRect(scenePos);
+	if (!IsValidPoint(scenePos)) {
+		return;
+	}
+	const auto now = crl::now();
+	addStrokePoint(scenePos, now);
 	_lastPoint = scenePos;
+	if (_currentStroke.size() - _lastRenderedIndex >= 3) {
+		drawIncrementalStroke();
+		update(_rectToUpdate);
+	}
 }
 
 void ItemCanvas::handleMouseReleaseEvent(
@@ -167,19 +388,26 @@ void ItemCanvas::handleMouseReleaseEvent(
 		return;
 	}
 	_drawing = false;
-
+	drawIncrementalStroke();
+	drawArrowHead();
+	update(_rectToUpdate);
 	if (_contentRect.isValid()) {
 		const auto scaledContentRect = QRectF(
 			_contentRect.x() * style::DevicePixelRatio(),
 			_contentRect.y() * style::DevicePixelRatio(),
 			_contentRect.width() * style::DevicePixelRatio(),
 			_contentRect.height() * style::DevicePixelRatio());
-
 		_grabContentRequests.fire({
 			.pixmap = _pixmap.copy(scaledContentRect.toRect()),
 			.position = _contentRect.topLeft(),
+			.clear = (_brushData.tool == Brush::Tool::Eraser),
+			.blur = (_brushData.tool == Brush::Tool::Blur),
 		});
 	}
+	_currentStroke.clear();
+	_lastRenderedIndex = 0;
+	_lastPointTime = 0;
+	_currentPath = QPainterPath();
 	clearPixmap();
 	update();
 }
@@ -189,7 +417,19 @@ void ItemCanvas::paint(
 		const QStyleOptionGraphicsItem *,
 		QWidget *) {
 	p->fillRect(_rectToUpdate, Qt::transparent);
-	p->drawPixmap(0, 0, _pixmap);
+	if (_brushData.tool == Brush::Tool::Eraser) {
+		p->save();
+		p->setOpacity(st::photoEditorEraserPreviewOpacity);
+		p->drawPixmap(0, 0, _pixmap);
+		p->restore();
+	} else if (_brushData.tool == Brush::Tool::Blur) {
+		p->save();
+		p->setOpacity(st::photoEditorBlurPreviewOpacity);
+		p->drawPixmap(0, 0, _pixmap);
+		p->restore();
+	} else {
+		p->drawPixmap(0, 0, _pixmap);
+	}
 	_rectToUpdate = QRectF();
 }
 
@@ -211,11 +451,19 @@ bool ItemCanvas::collidesWithPath(
 
 void ItemCanvas::cancelDrawing() {
 	_drawing = false;
+	_currentStroke.clear();
+	_lastRenderedIndex = 0;
+	_lastPointTime = 0;
+	_currentPath = QPainterPath();
 	_contentRect = QRectF();
 	clearPixmap();
 	update();
 }
 
+void ItemCanvas::updateZoom(float64 zoom) {
+	_zoom = zoom;
+}
+
 ItemCanvas::~ItemCanvas() {
 	_hq = nullptr;
 	_p = nullptr;
diff --git a/Telegram/SourceFiles/editor/scene/scene_item_canvas.h b/Telegram/SourceFiles/editor/scene/scene_item_canvas.h
index d93261dd7bfd8f..7bc1faf68f292c 100644
--- a/Telegram/SourceFiles/editor/scene/scene_item_canvas.h
+++ b/Telegram/SourceFiles/editor/scene/scene_item_canvas.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "editor/photo_editor_inner_common.h"
 #include "ui/painter.h"
 
 #include <QGraphicsItem>
@@ -20,14 +21,17 @@ class ItemCanvas : public QGraphicsItem {
 	struct Content {
 		QPixmap pixmap;
 		QPointF position;
+		bool clear = false;
+		bool blur = false;
 	};
 
 	ItemCanvas();
 	~ItemCanvas();
 
-	void applyBrush(const QColor &color, float size);
+	void applyBrush(const QColor &color, float size, Brush::Tool tool);
 	void clearPixmap();
 	void cancelDrawing();
+	void updateZoom(float64 zoom);
 
 	QRectF boundingRect() const override;
 	void paint(
@@ -50,10 +54,30 @@ class ItemCanvas : public QGraphicsItem {
 		const QPainterPath &,
 		Qt::ItemSelectionMode) const override;
 private:
+	struct StrokePoint {
+		QPointF pos;
+		float64 pressure = 1.0;
+		int64 time = 0;
+	};
+
 	void computeContentRect(const QPointF &p);
-	void drawLine(const QPointF &currentPoint, const QPointF &lastPoint);
+	void addStrokePoint(const QPointF &point, int64 time);
+	void drawIncrementalStroke();
+	void drawArrowHead();
+	std::vector<StrokePoint> smoothStroke(
+		const std::vector<StrokePoint> &points) const;
+	void renderSegment(
+		const std::vector<StrokePoint> &points,
+		int startIdx);
+	[[nodiscard]] float64 strokeWidth(float64 pressure) const;
+	[[nodiscard]] QColor strokeColor() const;
+	[[nodiscard]] float64 arrowHeadLength() const;
 
 	bool _drawing = false;
+	std::vector<StrokePoint> _currentStroke;
+	int _lastRenderedIndex = 0;
+	float64 _zoom = 1.0;
+	int64 _lastPointTime = 0;
 
 	std::unique_ptr<PainterHighQualityEnabler> _hq;
 	std::unique_ptr<Painter> _p;
@@ -65,10 +89,12 @@ class ItemCanvas : public QGraphicsItem {
 	QPointF _lastPoint;
 
 	QPixmap _pixmap;
+	QPainterPath _currentPath;
 
 	struct {
 		float size = 1.;
 		QColor color;
+		Brush::Tool tool = Brush::Tool::Pen;
 	} _brushData;
 
 	rpl::event_stream<Content> _grabContentRequests;
diff --git a/Telegram/SourceFiles/editor/scene/scene_item_image.cpp b/Telegram/SourceFiles/editor/scene/scene_item_image.cpp
index b3cc544cfd905a..1a939231bc49bc 100644
--- a/Telegram/SourceFiles/editor/scene/scene_item_image.cpp
+++ b/Telegram/SourceFiles/editor/scene/scene_item_image.cpp
@@ -10,7 +10,7 @@ For license and copyright information please follow this link:
 namespace Editor {
 
 ItemImage::ItemImage(
-	const QPixmap &&pixmap,
+	QPixmap &&pixmap,
 	ItemBase::Data data)
 : ItemBase(std::move(data))
 , _pixmap(std::move(pixmap)) {
diff --git a/Telegram/SourceFiles/editor/scene/scene_item_image.h b/Telegram/SourceFiles/editor/scene/scene_item_image.h
index 1754ac279b8321..320370ea27fea6 100644
--- a/Telegram/SourceFiles/editor/scene/scene_item_image.h
+++ b/Telegram/SourceFiles/editor/scene/scene_item_image.h
@@ -14,7 +14,7 @@ namespace Editor {
 class ItemImage : public ItemBase {
 public:
 	ItemImage(
-		const QPixmap &&pixmap,
+		QPixmap &&pixmap,
 		ItemBase::Data data);
 	void paint(
 		QPainter *p,
diff --git a/Telegram/SourceFiles/editor/scene/scene_item_line.cpp b/Telegram/SourceFiles/editor/scene/scene_item_line.cpp
index 0d40e24c7db182..ca608fc56108d8 100644
--- a/Telegram/SourceFiles/editor/scene/scene_item_line.cpp
+++ b/Telegram/SourceFiles/editor/scene/scene_item_line.cpp
@@ -8,10 +8,11 @@ For license and copyright information please follow this link:
 #include "editor/scene/scene_item_line.h"
 
 #include <QGraphicsScene>
+#include <QtGui/QPainter>
 
 namespace Editor {
 
-ItemLine::ItemLine(const QPixmap &&pixmap)
+ItemLine::ItemLine(QPixmap &&pixmap)
 : _pixmap(std::move(pixmap))
 , _rect(QPointF(), _pixmap.size() / float64(style::DevicePixelRatio())) {
 }
@@ -27,6 +28,36 @@ void ItemLine::paint(
 	p->drawPixmap(0, 0, _pixmap);
 }
 
+const QPixmap &ItemLine::pixmap() const {
+	return _pixmap;
+}
+
+void ItemLine::setPixmap(QPixmap pixmap) {
+	_pixmap = std::move(pixmap);
+	update();
+}
+
+bool ItemLine::applyEraser(const QPixmap &mask, const QPointF &maskPos) {
+	if (mask.isNull()) {
+		return false;
+	}
+	const auto maskSize = mask.size() / float64(mask.devicePixelRatio());
+	const auto localTopLeft = maskPos - pos();
+	const auto localRect = QRectF(localTopLeft, maskSize);
+	if (!localRect.intersects(_rect)) {
+		return false;
+	}
+	auto image = _pixmap.toImage().convertToFormat(
+		QImage::Format_ARGB32_Premultiplied);
+	auto p = QPainter(&image);
+	p.setCompositionMode(QPainter::CompositionMode_DestinationOut);
+	p.drawPixmap(localTopLeft, mask);
+	p.end();
+	_pixmap = QPixmap::fromImage(std::move(image));
+	update();
+	return true;
+}
+
 bool ItemLine::collidesWithItem(
 		const QGraphicsItem *,
 		Qt::ItemSelectionMode) const {
diff --git a/Telegram/SourceFiles/editor/scene/scene_item_line.h b/Telegram/SourceFiles/editor/scene/scene_item_line.h
index d4746c8e398adf..bd88150cf49e35 100644
--- a/Telegram/SourceFiles/editor/scene/scene_item_line.h
+++ b/Telegram/SourceFiles/editor/scene/scene_item_line.h
@@ -13,12 +13,15 @@ namespace Editor {
 
 class ItemLine : public NumberedItem {
 public:
-	ItemLine(const QPixmap &&pixmap);
+	ItemLine(QPixmap &&pixmap);
 	QRectF boundingRect() const override;
 	void paint(
 		QPainter *p,
 		const QStyleOptionGraphicsItem *option,
 		QWidget *widget) override;
+	[[nodiscard]] const QPixmap &pixmap() const;
+	void setPixmap(QPixmap pixmap);
+	bool applyEraser(const QPixmap &mask, const QPointF &maskPos);
 
 	bool hasState(SaveState state) const override;
 	void save(SaveState state) override;
@@ -31,7 +34,7 @@ class ItemLine : public NumberedItem {
 		const QPainterPath &,
 		Qt::ItemSelectionMode) const override;
 private:
-	const QPixmap _pixmap;
+	QPixmap _pixmap;
 	const QRectF _rect;
 
 	struct {
diff --git a/Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp b/Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp
index 2cf42d10c0e31a..0e910bd0f1d2b9 100644
--- a/Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp
+++ b/Telegram/SourceFiles/editor/scene/scene_item_sticker.cpp
@@ -46,7 +46,7 @@ ItemSticker::ItemSticker(
 					* style::DevicePixelRatio(),
 				Lottie::Quality::High);
 			_lottie.player->updates(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				updatePixmap(_lottie.player->frame());
 				_lottie.player = nullptr;
 				_lottie.lifetime.destroy();
@@ -84,8 +84,8 @@ ItemSticker::ItemSticker(
 		return true;
 	};
 	if (!updateThumbnail()) {
-		_document->owner().session().downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		_document->session().downloaderTaskFinished(
+		) | rpl::on_next([=] {
 			if (updateThumbnail()) {
 				_loadingLifetime.destroy();
 				update();
diff --git a/Telegram/SourceFiles/editor/scene/scene_item_text.cpp b/Telegram/SourceFiles/editor/scene/scene_item_text.cpp
new file mode 100644
index 00000000000000..07fb4d4486d6e5
--- /dev/null
+++ b/Telegram/SourceFiles/editor/scene/scene_item_text.cpp
@@ -0,0 +1,761 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "editor/scene/scene_item_text.h"
+
+#include "editor/scene/scene.h"
+#include "editor/scene/scene_emoji_document.h"
+#include "lang/lang_keys.h"
+#include "ui/emoji_config.h"
+#include "ui/painter.h"
+#include "ui/widgets/popup_menu.h"
+#include "styles/style_editor.h"
+#include "styles/style_media_view.h"
+#include "styles/style_menu_icons.h"
+
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsSceneContextMenuEvent>
+#include <QtWidgets/QApplication>
+#include <QTextBlock>
+#include <QTextCursor>
+#include <QTextDocument>
+#include <QTextLayout>
+#include <QTextOption>
+
+namespace Editor {
+namespace {
+
+constexpr auto kPaddingFactor = 0.4;
+constexpr auto kMaxWidthFactor = 0.8;
+constexpr auto kMinContentWidth = 20;
+constexpr auto kBrightnessFramedThreshold = 0.721;
+constexpr auto kBrightnessSemiTransparentThreshold = 0.25;
+constexpr auto kSemiTransparentAlpha = 0x99;
+constexpr auto kCornerRadiusFactor = 1. / 3.;
+constexpr auto kLinePadHFactor = 1. / 3.;
+constexpr auto kLinePadVFactor = 1. / 8.;
+constexpr auto kMergeRadiusFactor = 1.5;
+constexpr auto kLineShiftFactor = 1. / 7.;
+constexpr auto kTextStyleClickDelay = crl::time(120);
+
+struct LayoutMetrics {
+	int contentWidth = 0;
+	int contentHeight = 0;
+	int padding = 0;
+	int textMaxWidth = 0;
+};
+
+QFont TextFont(float64 fontSize) {
+	auto font = QFont();
+	font.setPixelSize(std::max(int(fontSize), 1));
+	font.setWeight(QFont::DemiBold);
+	return font;
+}
+
+float64 ComputeBrightness(const QColor &color) {
+	return (color.red() * 0.2126
+		+ color.green() * 0.7152
+		+ color.blue() * 0.0722) / 255.;
+}
+
+LayoutMetrics ComputeMetrics(
+		const QString &text,
+		float64 fontSize,
+		const QSize &imageSize,
+		TextStyle style) {
+	const auto hasBackground = (style == TextStyle::Framed)
+		|| (style == TextStyle::SemiTransparent);
+	const auto padding = hasBackground ? int(fontSize * kPaddingFactor) : 0;
+	const auto shortSide = std::min(imageSize.width(), imageSize.height());
+	const auto textMaxWidth = std::max(
+		int(shortSide * kMaxWidthFactor) - 2 * padding,
+		kMinContentWidth);
+
+	const auto font = TextFont(fontSize);
+
+	auto processedText = text;
+	processedText.replace('\n', QChar::LineSeparator);
+
+	auto option = QTextOption();
+	option.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
+
+	auto layout = QTextLayout(processedText, font);
+	layout.setTextOption(option);
+	layout.beginLayout();
+
+	auto totalHeight = 0.;
+	auto maxWidth = 0.;
+	while (true) {
+		auto line = layout.createLine();
+		if (!line.isValid()) {
+			break;
+		}
+		line.setLineWidth(textMaxWidth);
+		line.setPosition(QPointF(0, totalHeight));
+		totalHeight += line.height();
+		maxWidth = std::max(maxWidth, float64(line.naturalTextWidth()));
+	}
+	layout.endLayout();
+
+	return {
+		.contentWidth = std::max(int(std::ceil(maxWidth)), kMinContentWidth),
+		.contentHeight = int(std::ceil(totalHeight)),
+		.padding = padding,
+		.textMaxWidth = textMaxWidth,
+	};
+}
+
+struct LineRect {
+	float64 left = 0;
+	float64 top = 0;
+	float64 right = 0;
+	float64 bottom = 0;
+	[[nodiscard]] float64 width() const { return right - left; }
+};
+
+QPainterPath BuildConnectedBackground(
+		const QTextLayout &layout,
+		int contentWidth,
+		int padding,
+		float64 fontSize) {
+	const auto linePadH = fontSize * kLinePadHFactor;
+	const auto linePadV = fontSize * kLinePadVFactor;
+	const auto cornerRadius = fontSize * kCornerRadiusFactor;
+	const auto mergeRadius = cornerRadius * kMergeRadiusFactor;
+	const auto centerX = padding + contentWidth / 2.;
+
+	auto rects = std::vector<LineRect>();
+	for (auto i = 0; i < layout.lineCount(); ++i) {
+		const auto line = layout.lineAt(i);
+		const auto hw = float64(line.naturalTextWidth()) / 2. + linePadH;
+		rects.push_back({
+			.left = centerX - hw,
+			.top = padding + float64(line.y()) - linePadV,
+			.right = centerX + hw,
+			.bottom = padding + float64(line.y() + line.height()) + linePadV,
+		});
+	}
+
+	if (rects.empty()) {
+		return {};
+	}
+	if (rects.size() == 1) {
+		auto path = QPainterPath();
+		const auto &r = rects[0];
+		path.addRoundedRect(
+			QRectF(r.left, r.top, r.width(), r.bottom - r.top),
+			cornerRadius,
+			cornerRadius);
+		return path;
+	}
+
+	for (auto i = 1; i < int(rects.size()); ++i) {
+		rects[i - 1].bottom = rects[i].top;
+	}
+
+	for (auto i = 1; i < int(rects.size()); ++i) {
+		auto traceback = false;
+		if (std::abs(rects[i - 1].left - rects[i].left) < mergeRadius) {
+			const auto v = std::min(rects[i - 1].left, rects[i].left);
+			rects[i - 1].left = rects[i].left = v;
+			traceback = true;
+		}
+		if (std::abs(rects[i - 1].right - rects[i].right) < mergeRadius) {
+			const auto v = std::max(rects[i - 1].right, rects[i].right);
+			rects[i - 1].right = rects[i].right = v;
+			traceback = true;
+		}
+		if (traceback) {
+			for (auto j = i; j >= 1; --j) {
+				if (std::abs(rects[j - 1].left - rects[j].left)
+					< mergeRadius) {
+					const auto v = std::min(
+						rects[j - 1].left,
+						rects[j].left);
+					rects[j - 1].left = rects[j].left = v;
+				}
+				if (std::abs(rects[j - 1].right - rects[j].right)
+					< mergeRadius) {
+					const auto v = std::max(
+						rects[j - 1].right,
+						rects[j].right);
+					rects[j - 1].right = rects[j].right = v;
+				}
+			}
+		}
+	}
+
+	struct V { float64 x, y; };
+	auto verts = std::vector<V>();
+
+	verts.push_back({ rects[0].left, rects[0].top });
+	verts.push_back({ rects[0].right, rects[0].top });
+
+	for (auto i = 1; i < int(rects.size()); ++i) {
+		if (std::abs(rects[i].right - rects[i - 1].right) > 0.5) {
+			verts.push_back({ rects[i - 1].right, rects[i].top });
+			verts.push_back({ rects[i].right, rects[i].top });
+		}
+	}
+
+	const auto last = int(rects.size()) - 1;
+	verts.push_back({ rects[last].right, rects[last].bottom });
+	verts.push_back({ rects[last].left, rects[last].bottom });
+
+	for (auto i = last - 1; i >= 0; --i) {
+		if (std::abs(rects[i].left - rects[i + 1].left) > 0.5) {
+			verts.push_back({ rects[i + 1].left, rects[i + 1].top });
+			verts.push_back({ rects[i].left, rects[i + 1].top });
+		}
+	}
+
+	auto path = QPainterPath();
+	const auto n = int(verts.size());
+	for (auto i = 0; i < n; ++i) {
+		const auto &prev = verts[(i + n - 1) % n];
+		const auto &curr = verts[i];
+		const auto &next = verts[(i + 1) % n];
+
+		const auto dx1 = curr.x - prev.x;
+		const auto dy1 = curr.y - prev.y;
+		const auto len1 = std::sqrt(dx1 * dx1 + dy1 * dy1);
+
+		const auto dx2 = next.x - curr.x;
+		const auto dy2 = next.y - curr.y;
+		const auto len2 = std::sqrt(dx2 * dx2 + dy2 * dy2);
+
+		if (len1 < 0.1 || len2 < 0.1) {
+			if (i == 0) {
+				path.moveTo(curr.x, curr.y);
+			} else {
+				path.lineTo(curr.x, curr.y);
+			}
+			continue;
+		}
+
+		const auto r = std::min({
+			cornerRadius,
+			len1 / 2.,
+			len2 / 2.,
+		});
+		const auto bx = curr.x - dx1 / len1 * r;
+		const auto by = curr.y - dy1 / len1 * r;
+		const auto ax = curr.x + dx2 / len2 * r;
+		const auto ay = curr.y + dy2 / len2 * r;
+
+		if (i == 0) {
+			path.moveTo(bx, by);
+		} else {
+			path.lineTo(bx, by);
+		}
+		path.quadTo(curr.x, curr.y, ax, ay);
+	}
+	path.closeSubpath();
+	return path;
+}
+
+TextStyle NextTextStyle(TextStyle style) {
+	switch (style) {
+	case TextStyle::Plain:
+		return TextStyle::Framed;
+	case TextStyle::Framed:
+		return TextStyle::SemiTransparent;
+	case TextStyle::SemiTransparent:
+		return TextStyle::Plain;
+	}
+	Unexpected("Text style in NextTextStyle.");
+}
+
+} // namespace
+
+QColor EffectiveTextColor(const QColor &color, TextStyle style) {
+	if (style != TextStyle::Framed) {
+		return color;
+	}
+	return (ComputeBrightness(color) >= kBrightnessFramedThreshold)
+		? QColor(0, 0, 0)
+		: QColor(255, 255, 255);
+}
+
+ItemText::ItemText(
+	const QString &text,
+	const QColor &color,
+	float64 fontSize,
+	TextStyle style,
+	const QSize &imageSize,
+	ItemBase::Data data)
+: ItemBase(std::move(data))
+, _text(text)
+, _color(color)
+, _fontSize(fontSize)
+, _textStyle(style)
+, _imageSize(imageSize)
+, _textStyleClickTimer([=] {
+	setTextStyle(NextTextStyle(_textStyle));
+	_textStyleClickChanged = true;
+}) {
+	renderContent();
+}
+
+void ItemText::renderContent() {
+	if (_text.isEmpty()) {
+		_pixmap = QPixmap();
+		setAspectRatio(1.);
+		return;
+	}
+
+	const auto m = ComputeMetrics(_text, _fontSize, _imageSize, _textStyle);
+	const auto pixWidth = m.contentWidth + 2 * m.padding;
+	const auto pixHeight = m.contentHeight + 2 * m.padding;
+
+	const auto font = TextFont(_fontSize);
+
+	auto processedText = _text;
+	processedText.replace('\n', QChar::LineSeparator);
+
+	auto option = QTextOption();
+	option.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
+
+	auto layout = QTextLayout(processedText, font);
+	layout.setTextOption(option);
+
+	struct EmojiPos {
+		int start = 0;
+		int length = 0;
+		EmojiPtr emoji = nullptr;
+	};
+	auto emojiFormats = QVector<QTextLayout::FormatRange>();
+	auto emojiPositions = std::vector<EmojiPos>();
+	{
+		auto pos = 0;
+		const auto begin = processedText.constData();
+		const auto end = begin + processedText.size();
+		while (pos < processedText.size()) {
+			auto emojiLen = 0;
+			const auto emoji = Ui::Emoji::Find(
+				begin + pos,
+				end,
+				&emojiLen);
+			if (emoji && emojiLen > 0) {
+				auto fmt = QTextCharFormat();
+				fmt.setForeground(QColor(0, 0, 0, 0));
+				emojiFormats.append({ pos, emojiLen, fmt });
+				emojiPositions.push_back({ pos, emojiLen, emoji });
+				pos += emojiLen;
+			} else {
+				++pos;
+			}
+		}
+	}
+	layout.setFormats(emojiFormats);
+
+	layout.beginLayout();
+	auto y = 0.;
+	while (true) {
+		auto line = layout.createLine();
+		if (!line.isValid()) {
+			break;
+		}
+		line.setLineWidth(m.textMaxWidth);
+		line.setPosition(QPointF(0, y));
+		y += line.height();
+	}
+	layout.endLayout();
+
+	auto textColor = _color;
+	auto bgColor = QColor(Qt::transparent);
+	const auto brightness = ComputeBrightness(_color);
+	const auto hasBackground =
+		(_textStyle == TextStyle::Framed)
+		|| (_textStyle == TextStyle::SemiTransparent);
+
+	switch (_textStyle) {
+	case TextStyle::Framed:
+		bgColor = _color;
+		textColor = (brightness >= kBrightnessFramedThreshold)
+			? QColor(0, 0, 0)
+			: QColor(255, 255, 255);
+		break;
+	case TextStyle::SemiTransparent:
+		bgColor = (brightness >= kBrightnessSemiTransparentThreshold)
+			? QColor(0, 0, 0, kSemiTransparentAlpha)
+			: QColor(255, 255, 255, kSemiTransparentAlpha);
+		break;
+	case TextStyle::Plain:
+		break;
+	}
+
+	const auto dpr = style::DevicePixelRatio();
+	auto pixmap = QPixmap(QSize(pixWidth, pixHeight) * dpr);
+	pixmap.setDevicePixelRatio(dpr);
+	pixmap.fill(Qt::transparent);
+
+	{
+		auto p = QPainter(&pixmap);
+		auto hq = PainterHighQualityEnabler(p);
+
+		if (hasBackground) {
+			const auto bgPath = BuildConnectedBackground(
+				layout,
+				m.contentWidth,
+				m.padding,
+				_fontSize);
+			if (_textStyle == TextStyle::SemiTransparent) {
+				auto opaque = bgColor;
+				opaque.setAlpha(255);
+				auto mask = QPixmap(pixmap.size());
+				mask.setDevicePixelRatio(dpr);
+				mask.fill(Qt::transparent);
+				{
+					auto mp = QPainter(&mask);
+					auto mhq = PainterHighQualityEnabler(mp);
+					mp.setPen(Qt::NoPen);
+					mp.setBrush(opaque);
+					mp.drawPath(bgPath);
+				}
+				p.setOpacity(bgColor.alphaF());
+				p.drawPixmap(0, 0, mask);
+				p.setOpacity(1.0);
+			} else {
+				p.setPen(Qt::NoPen);
+				p.setBrush(bgColor);
+				p.drawPath(bgPath);
+			}
+		}
+
+		const auto lineShift = _fontSize * kLineShiftFactor;
+		const auto lineCount = layout.lineCount();
+		p.setPen(textColor);
+		for (auto i = 0; i < lineCount; ++i) {
+			const auto line = layout.lineAt(i);
+			const auto xOffset =
+				(m.contentWidth - line.naturalTextWidth()) / 2.;
+			const auto yShift = (i < lineCount - 1) ? -lineShift : 0.;
+			line.draw(
+				&p,
+				QPointF(m.padding + xOffset, m.padding + yShift));
+		}
+
+		p.setRenderHint(QPainter::SmoothPixmapTransform, true);
+		const auto factor = style::DevicePixelRatio();
+		const auto source = Ui::Emoji::GetSizeLarge();
+		const auto sourceLogical = source / float64(factor);
+		const auto emojiSize = float64(QFontMetrics(font).height());
+		const auto emojiScale = emojiSize / sourceLogical;
+		for (const auto &ep : emojiPositions) {
+			auto lineIndex = -1;
+			for (auto i = 0; i < lineCount; ++i) {
+				const auto line = layout.lineAt(i);
+				const auto lineStart = line.textStart();
+				const auto lineEnd = lineStart + line.textLength();
+				if (ep.start >= lineStart && ep.start < lineEnd) {
+					lineIndex = i;
+					break;
+				}
+			}
+			if (lineIndex < 0) {
+				continue;
+			}
+			const auto line = layout.lineAt(lineIndex);
+			const auto lineStart = line.textStart();
+			const auto lineEnd = lineStart + line.textLength();
+			const auto drawEnd = std::min(ep.start + ep.length, lineEnd);
+			const auto xOffset =
+				(m.contentWidth - line.naturalTextWidth()) / 2.;
+			const auto yShift = (lineIndex < lineCount - 1)
+				? -lineShift
+				: 0.;
+			const auto x = line.cursorToX(ep.start);
+			const auto nextX = line.cursorToX(drawEnd);
+			const auto glyphWidth = float64(nextX - x);
+			const auto drawX = m.padding
+				+ xOffset
+				+ x
+				+ (glyphWidth - emojiSize) / 2.;
+			const auto drawY = m.padding
+				+ yShift
+				+ line.y()
+				+ (line.height() - emojiSize) / 2.;
+			p.save();
+			p.translate(drawX, drawY);
+			p.scale(emojiScale, emojiScale);
+			Ui::Emoji::Draw(p, ep.emoji, source, 0, 0);
+			p.restore();
+		}
+	}
+
+	_pixmap = std::move(pixmap);
+	const auto handleMargin = std::max(
+		innerRect().width() - contentRect().width(),
+		0.);
+	setAspectRatio(
+		(pixHeight + handleMargin) / float64(pixWidth + handleMargin));
+}
+
+QSize ItemText::computeContentSize(
+		const QString &text,
+		float64 fontSize,
+		const QSize &imageSize,
+		TextStyle style) {
+	if (text.isEmpty()) {
+		return {};
+	}
+	auto processedText = text;
+	processedText.replace('\n', QChar::LineSeparator);
+	const auto m = ComputeMetrics(processedText, fontSize, imageSize, style);
+	return QSize(
+		m.contentWidth + 2 * m.padding,
+		m.contentHeight + 2 * m.padding);
+}
+
+void ItemText::paint(
+		QPainter *p,
+		const QStyleOptionGraphicsItem *option,
+		QWidget *w) {
+	if (!_pixmap.isNull()) {
+		const auto rect = contentRect();
+		const auto pixmapSize = QSizeF(
+			_pixmap.size() / style::DevicePixelRatio()
+		).scaled(rect.size(), Qt::KeepAspectRatio);
+		const auto resultRect = QRectF(
+			rect.topLeft(),
+			pixmapSize
+		).translated(
+			(rect.width() - pixmapSize.width()) / 2.,
+			(rect.height() - pixmapSize.height()) / 2.);
+		if (flipped()) {
+			p->save();
+			const auto center = resultRect.center();
+			p->translate(center);
+			p->scale(-1, 1);
+			p->translate(-center);
+			p->drawPixmap(resultRect.toRect(), _pixmap);
+			p->restore();
+		} else {
+			p->drawPixmap(resultRect.toRect(), _pixmap);
+		}
+	}
+	ItemBase::paint(p, option, w);
+}
+
+int ItemText::type() const {
+	return Type;
+}
+
+const QString &ItemText::text() const {
+	return _text;
+}
+
+void ItemText::setText(const QString &text) {
+	_text = text;
+	renderContent();
+	update();
+}
+
+const QColor &ItemText::color() const {
+	return _color;
+}
+
+void ItemText::setColor(const QColor &color) {
+	_color = color;
+	renderContent();
+	update();
+}
+
+float64 ItemText::fontSize() const {
+	return _fontSize;
+}
+
+float64 ItemText::editScale() const {
+	const auto natural = computeContentSize(
+		_text,
+		_fontSize,
+		_imageSize,
+		_textStyle);
+	if (natural.width() <= 0) {
+		return 1.;
+	}
+	return size() / natural.width();
+}
+
+TextStyle ItemText::textStyle() const {
+	return _textStyle;
+}
+
+void ItemText::setTextStyle(TextStyle style) {
+	_textStyle = style;
+	renderContent();
+	update();
+}
+
+void ItemText::mousePressEvent(QGraphicsSceneMouseEvent *event) {
+	_textStyleClickTimer.cancel();
+	_textStyleClickChanged = false;
+	_textStyleClickCandidate = (event->button() == Qt::LeftButton)
+		&& contentRect().contains(event->pos());
+	_textStyleClickDragging = false;
+	if (_textStyleClickCandidate) {
+		_textStyleClickItemPosition = pos();
+		_textStyleClickInitialStyle = _textStyle;
+		event->accept();
+		return;
+	}
+	ItemBase::mousePressEvent(event);
+}
+
+void ItemText::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
+	if (!_textStyleClickCandidate) {
+		ItemBase::mouseMoveEvent(event);
+		return;
+	}
+	const auto delta = event->screenPos()
+		- event->buttonDownScreenPos(Qt::LeftButton);
+	if (!_textStyleClickDragging
+		&& delta.manhattanLength() >= QApplication::startDragDistance()) {
+		_textStyleClickDragging = true;
+		if (scene()) {
+			scene()->clearSelection();
+			setSelected(true);
+		}
+		raiseToTop();
+		setCursor(Qt::ClosedHandCursor);
+	}
+	if (_textStyleClickDragging) {
+		const auto sceneDelta = event->scenePos()
+			- event->buttonDownScenePos(Qt::LeftButton);
+		setPos(_textStyleClickItemPosition + sceneDelta);
+	}
+	event->accept();
+}
+
+void ItemText::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
+	const auto textStyleClickCandidate = _textStyleClickCandidate;
+	const auto textStyleClickDragging = _textStyleClickDragging;
+	_textStyleClickCandidate = false;
+	_textStyleClickDragging = false;
+	if (!textStyleClickCandidate) {
+		ItemBase::mouseReleaseEvent(event);
+		return;
+	}
+	if (textStyleClickDragging) {
+		unsetCursor();
+		event->accept();
+		return;
+	}
+	if (event->button() == Qt::LeftButton) {
+		const auto delta = event->screenPos()
+			- event->buttonDownScreenPos(Qt::LeftButton);
+		if (delta.manhattanLength() >= QApplication::startDragDistance()) {
+			event->accept();
+			return;
+		}
+		_textStyleClickTimer.callOnce(kTextStyleClickDelay);
+		event->accept();
+	}
+}
+
+void ItemText::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {
+	_textStyleClickCandidate = false;
+	_textStyleClickDragging = false;
+	_textStyleClickTimer.cancel();
+	if (_textStyleClickChanged) {
+		setTextStyle(_textStyleClickInitialStyle);
+		_textStyleClickChanged = false;
+	}
+	if (const auto s = static_cast<Scene*>(scene())) {
+		s->startTextEditing(this);
+	}
+}
+
+void ItemText::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
+	if (scene()) {
+		scene()->clearSelection();
+		setSelected(true);
+	}
+
+	_contextMenu = base::make_unique_q<Ui::PopupMenu>(
+		nullptr,
+		st::mediaviewPopupMenu);
+	const auto add = [&](
+			const QString &text,
+			TextStyle style,
+			const style::icon *icon) {
+		const auto checked = (_textStyle == style);
+		auto action = _contextMenu->addAction(
+			text,
+			[=] { setTextStyle(style); },
+			icon);
+		if (checked) {
+			action->setChecked(true);
+		}
+	};
+	add(
+		tr::lng_photo_editor_text_style_plain(tr::now),
+		TextStyle::Plain,
+		&st::mediaMenuIconTextStylePlain);
+	add(
+		tr::lng_photo_editor_text_style_framed(tr::now),
+		TextStyle::Framed,
+		&st::mediaMenuIconTextStyleFramed);
+	add(
+		tr::lng_photo_editor_text_style_semi_transparent(tr::now),
+		TextStyle::SemiTransparent,
+		&st::mediaMenuIconTextStyleSemiTransparent);
+
+	_contextMenu->addSeparator();
+
+	_contextMenu->addAction(
+		tr::lng_photo_editor_menu_duplicate(tr::now),
+		[=] { actionDuplicate(); },
+		&st::mediaMenuIconCopy);
+	_contextMenu->addAction(
+		tr::lng_photo_editor_menu_delete(tr::now),
+		[=] { actionDelete(); },
+		&st::mediaMenuIconDelete);
+
+	_contextMenu->popup(event->screenPos());
+}
+
+void ItemText::performFlip() {
+	update();
+}
+
+std::shared_ptr<ItemBase> ItemText::duplicate(ItemBase::Data data) const {
+	return std::make_shared<ItemText>(
+		_text,
+		_color,
+		_fontSize,
+		_textStyle,
+		_imageSize,
+		std::move(data));
+}
+
+void ItemText::save(SaveState state) {
+	ItemBase::save(state);
+	auto &saved = (state == SaveState::Keep) ? _keepedState : _savedState;
+	saved = {
+		.text = _text,
+		.color = _color,
+		.fontSize = _fontSize,
+		.textStyle = _textStyle,
+	};
+}
+
+void ItemText::restore(SaveState state) {
+	if (!hasState(state)) {
+		return;
+	}
+	const auto &saved = (state == SaveState::Keep) ? _keepedState : _savedState;
+	_text = saved.text;
+	_color = saved.color;
+	_fontSize = saved.fontSize;
+	_textStyle = saved.textStyle;
+	renderContent();
+	ItemBase::restore(state);
+}
+
+} // namespace Editor
diff --git a/Telegram/SourceFiles/editor/scene/scene_item_text.h b/Telegram/SourceFiles/editor/scene/scene_item_text.h
new file mode 100644
index 00000000000000..050be0c331fc42
--- /dev/null
+++ b/Telegram/SourceFiles/editor/scene/scene_item_text.h
@@ -0,0 +1,103 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "base/unique_qptr.h"
+#include "editor/scene/scene_item_base.h"
+
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
+namespace Editor {
+
+enum class TextStyle : uchar {
+	Framed,
+	SemiTransparent,
+	Plain,
+};
+
+[[nodiscard]] QColor EffectiveTextColor(const QColor &color, TextStyle style);
+
+class ItemText : public ItemBase {
+public:
+	enum { Type = ItemBase::Type + 2 };
+
+	ItemText(
+		const QString &text,
+		const QColor &color,
+		float64 fontSize,
+		TextStyle style,
+		const QSize &imageSize,
+		ItemBase::Data data);
+
+	void paint(
+		QPainter *p,
+		const QStyleOptionGraphicsItem *option,
+		QWidget *widget) override;
+	int type() const override;
+
+	[[nodiscard]] const QString &text() const;
+	void setText(const QString &text);
+
+	[[nodiscard]] const QColor &color() const;
+	void setColor(const QColor &color);
+
+	[[nodiscard]] float64 fontSize() const;
+
+	[[nodiscard]] TextStyle textStyle() const;
+	void setTextStyle(TextStyle style);
+
+	[[nodiscard]] float64 editScale() const;
+
+	[[nodiscard]] static QSize computeContentSize(
+		const QString &text,
+		float64 fontSize,
+		const QSize &imageSize,
+		TextStyle style);
+
+	void save(SaveState state) override;
+	void restore(SaveState state) override;
+
+protected:
+	void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
+	void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
+	void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+	void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
+	void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override;
+	void performFlip() override;
+	std::shared_ptr<ItemBase> duplicate(ItemBase::Data data) const override;
+
+private:
+	void renderContent();
+
+	QString _text;
+	QColor _color;
+	float64 _fontSize;
+	TextStyle _textStyle = TextStyle::Plain;
+	QSize _imageSize;
+	QPixmap _pixmap;
+	base::unique_qptr<Ui::PopupMenu> _contextMenu;
+	QPointF _textStyleClickItemPosition;
+	TextStyle _textStyleClickInitialStyle = TextStyle::Plain;
+	base::Timer _textStyleClickTimer;
+	bool _textStyleClickCandidate = false;
+	bool _textStyleClickDragging = false;
+	bool _textStyleClickChanged = false;
+
+	struct SavedText {
+		QString text;
+		QColor color;
+		float64 fontSize = 0.;
+		TextStyle textStyle = TextStyle::Plain;
+	};
+	SavedText _savedState, _keepedState;
+};
+
+} // namespace Editor
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index 0301f1ce4457af..48d8c424ded6d3 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -303,7 +303,11 @@ std::vector<TextPart> ParseText(
 				return Type::Blockquote; },
 			[](const MTPDmessageEntityBankCard&) { return Type::BankCard; },
 			[](const MTPDmessageEntitySpoiler&) { return Type::Spoiler; },
-			[](const MTPDmessageEntityCustomEmoji&) { return Type::CustomEmoji; });
+			[](const MTPDmessageEntityCustomEmoji&) { return Type::CustomEmoji; },
+			[](const MTPDmessageEntityFormattedDate&) { return Type::Unknown; },
+			[](const MTPDmessageEntityDiffInsert&) { return Type::Unknown; },
+			[](const MTPDmessageEntityDiffReplace&) { return Type::Unknown; },
+			[](const MTPDmessageEntityDiffDelete&) { return Type::Unknown; });
 		part.text = mid(start, length);
 		part.additional = entity.match(
 		[](const MTPDmessageEntityPre &data) {
@@ -335,6 +339,10 @@ Utf8String Reaction::TypeToString(const Reaction &reaction) {
 	Unexpected("Type in Reaction::Type.");
 }
 
+std::vector<TextPart> ParseText(const MTPTextWithEntities &text) {
+	return ParseText(text.data().vtext(), text.data().ventities().v);
+}
+
 Utf8String Reaction::Id(const Reaction &reaction) {
 	auto id = Utf8String();
 	switch (reaction.type) {
@@ -777,17 +785,18 @@ Poll ParsePoll(const MTPDmessageMediaPoll &data) {
 	auto result = Poll();
 	data.vpoll().match([&](const MTPDpoll &poll) {
 		result.id = poll.vid().v;
-		result.question = ParseString(poll.vquestion().data().vtext());
+		result.question = ParseText(poll.vquestion());
 		result.closed = poll.is_closed();
 		result.answers = ranges::views::all(
 			poll.vanswers().v
 		) | ranges::views::transform([](const MTPPollAnswer &answer) {
-			return answer.match([](const MTPDpollAnswer &answer) {
-				auto result = Poll::Answer();
-				result.text = ParseString(answer.vtext().data().vtext());
-				result.option = answer.voption().v;
-				return result;
+			auto result = Poll::Answer();
+			answer.match([&](const MTPDpollAnswer &data) {
+				result.text = ParseText(data.vtext());
+				result.option = data.voption().v;
+			}, [](const auto &) {
 			});
+			return result;
 		}) | ranges::to_vector;
 	});
 	data.vresults().match([&](const MTPDpollResults &results) {
@@ -796,25 +805,49 @@ Poll ParsePoll(const MTPDmessageMediaPoll &data) {
 		}
 		if (const auto resultsList = results.vresults()) {
 			for (const auto &single : resultsList->v) {
-				single.match([&](const MTPDpollAnswerVoters &voters) {
-					const auto i = ranges::find(
-						result.answers,
-						voters.voption().v,
-						&Poll::Answer::option);
-					if (i == end(result.answers)) {
-						return;
-					}
-					i->votes = voters.vvoters().v;
-					if (voters.is_chosen()) {
-						i->my = true;
-					}
-				});
+				const auto &voters = single.data();
+				const auto i = ranges::find(
+					result.answers,
+					voters.voption().v,
+					&Poll::Answer::option);
+				if (i == end(result.answers)) {
+					continue;
+				}
+				if (const auto votes = voters.vvoters()) {
+					i->votes = votes->v;
+				}
+				if (voters.is_chosen()) {
+					i->my = true;
+				}
 			}
 		}
 	});
 	return result;
 }
 
+TodoListItem ParseTodoListItem(const MTPTodoItem &item) {
+	const auto &data = item.data();
+	auto result = TodoListItem();
+	result.text = ParseText(data.vtitle());
+	result.id = data.vid().v;
+	return result;
+}
+
+TodoList ParseTodoList(const MTPDmessageMediaToDo &data) {
+	auto result = TodoList();
+	data.vtodo().match([&](const MTPDtodoList &data) {
+		result.title = ParseText(data.vtitle());
+		result.othersCanAppend = data.is_others_can_append();
+		result.othersCanComplete = data.is_others_can_complete();
+		result.items = ranges::views::all(
+			data.vlist().v
+		) | ranges::views::transform(
+			ParseTodoListItem
+		) | ranges::to_vector;
+	});
+	return result;
+}
+
 GiveawayStart ParseGiveaway(const MTPDmessageMediaGiveaway &data) {
 	auto result = GiveawayStart{
 		.untilDate = data.vuntil_date().v,
@@ -880,6 +913,20 @@ UserpicsSlice ParseUserpicsSlice(
 	return result;
 }
 
+[[nodiscard]] ActionStarGift ParseStarGift(const MTPStarGift &gift) {
+	return gift.match([&](const MTPDstarGift &gift) {
+		return ActionStarGift{
+			.giftId = uint64(gift.vid().v),
+			.stars = int64(gift.vstars().v),
+			.limited = gift.is_limited(),
+		};
+	}, [&](const MTPDstarGiftUnique &gift) {
+		return ActionStarGift{
+			.giftId = uint64(gift.vid().v),
+		};
+	});
+}
+
 File &Story::file() {
 	return media.file();
 }
@@ -920,6 +967,7 @@ StoriesSlice ParseStoriesSlice(
 				auto content = photo
 					? ParsePhoto(*photo, suggestedPath)
 					: Photo();
+				content.spoilered = data.is_spoiler();
 				media.content = content;
 			}, [&](const MTPDmessageMediaDocument &data) {
 				const auto document = data.vdocument();
@@ -948,6 +996,7 @@ StoriesSlice ParseStoriesSlice(
 						date,
 						extension);
 				content.thumb.file.suggestedPath = path + "_thumb.jpg";
+				content.spoilered = data.is_spoiler();
 				media.content = content;
 			}, [&](const auto &data) {
 				media.content = UnsupportedMedia();
@@ -1041,10 +1090,17 @@ ContactInfo ParseContactInfo(const MTPUser &data) {
 	auto result = ContactInfo();
 	data.match([&](const MTPDuser &data) {
 		result.userId = data.vid().v;
-		const auto color = data.vcolor();
-		result.colorIndex = (color && color->data().vcolor())
-			? color->data().vcolor()->v
-			: PeerColorIndex(result.userId);
+		result.colorIndex = PeerColorIndex(result.userId);
+		if (const auto color = data.vcolor()) {
+			color->match([&](const MTPDpeerColor &data) {
+				if (const auto color = data.vcolor()) {
+					result.colorIndex = color->v;
+				}
+			}, [](const MTPDpeerColorCollectible &) {
+				// themes
+			}, [](const MTPDinputPeerColorCollectible &) {
+			});
+		}
 		if (const auto firstName = data.vfirst_name()) {
 			result.firstName = ParseString(*firstName);
 		}
@@ -1074,10 +1130,17 @@ User ParseUser(const MTPUser &data) {
 	result.info = ParseContactInfo(data);
 	data.match([&](const MTPDuser &data) {
 		result.bareId = data.vid().v;
-		const auto color = data.vcolor();
-		result.colorIndex = (color && color->data().vcolor())
-			? color->data().vcolor()->v
-			: PeerColorIndex(result.bareId);
+		result.colorIndex = PeerColorIndex(result.bareId);
+		if (const auto color = data.vcolor()) {
+			color->match([&](const MTPDpeerColor &data) {
+				if (const auto color = data.vcolor()) {
+					result.colorIndex = color->v;
+				}
+			}, [](const MTPDpeerColorCollectible &) {
+				// themes
+			}, [](const MTPDinputPeerColorCollectible &) {
+			});
+		}
 		if (const auto username = data.vusername()) {
 			result.username = ParseString(*username);
 		}
@@ -1136,12 +1199,25 @@ Chat ParseChat(const MTPChat &data) {
 		result.input = MTP_inputPeerChat(MTP_long(result.bareId));
 	}, [&](const MTPDchannel &data) {
 		result.bareId = data.vid().v;
-		const auto color = data.vcolor();
-		result.colorIndex = (color && color->data().vcolor())
-			? color->data().vcolor()->v
-			: PeerColorIndex(result.bareId);
+		result.colorIndex = PeerColorIndex(result.bareId);
+		if (const auto color = data.vcolor()) {
+			color->match([&](const MTPDpeerColor &data) {
+				if (const auto color = data.vcolor()) {
+					result.colorIndex = color->v;
+				}
+			}, [](const MTPDpeerColorCollectible &) {
+			}, [](const MTPDinputPeerColorCollectible &) {
+			});
+		}
+		result.isMonoforum = data.is_monoforum();
 		result.isBroadcast = data.is_broadcast();
 		result.isSupergroup = data.is_megagroup();
+		result.hasMonoforumAdminRights = data.is_broadcast()
+			&& (data.is_creator()
+				|| (data.vadmin_rights()
+					&& data.vadmin_rights()->data().is_manage_direct_messages()));
+		result.monoforumLinkId
+			= data.vlinked_monoforum_id().value_or_empty();
 		result.title = ParseString(data.vtitle());
 		if (const auto username = data.vusername()) {
 			result.username = ParseString(*username);
@@ -1153,6 +1229,7 @@ Chat ParseChat(const MTPChat &data) {
 		result.bareId = data.vid().v;
 		result.isBroadcast = data.is_broadcast();
 		result.isSupergroup = data.is_megagroup();
+		result.isMonoforum = data.is_monoforum();
 		result.title = ParseString(data.vtitle());
 		result.input = MTP_inputPeerChannel(
 			MTP_long(result.bareId),
@@ -1161,15 +1238,6 @@ Chat ParseChat(const MTPChat &data) {
 	return result;
 }
 
-std::map<PeerId, Chat> ParseChatsList(const MTPVector<MTPChat> &data) {
-	auto result = std::map<PeerId, Chat>();
-	for (const auto &chat : data.v) {
-		auto parsed = ParseChat(chat);
-		result.emplace(parsed.id(), std::move(parsed));
-	}
-	return result;
-}
-
 Utf8String ContactInfo::name() const {
 	return firstName.isEmpty()
 		? (lastName.isEmpty()
@@ -1246,6 +1314,20 @@ std::map<PeerId, Peer> ParsePeersLists(
 		auto parsed = ParseChat(chat);
 		result.emplace(parsed.id(), Peer{ std::move(parsed) });
 	}
+	for (auto &[peerId, parsed] : result) {
+		if (const auto chat = std::get_if<Chat>(&parsed.data)) {
+			if (chat->isMonoforum) {
+				const auto i = result.find(
+					PeerId(ChannelId(chat->monoforumLinkId)));
+				if (i != end(result)) {
+					chat->isMonoforumAdmin
+						= i->second.chat()->hasMonoforumAdminRights;
+					chat->isMonoforumOfPublicBroadcast
+						= !i->second.chat()->username.isEmpty();
+				}
+			}
+		}
+	}
 	return result;
 }
 
@@ -1329,6 +1411,7 @@ Media ParseMedia(
 				+ "photos/"
 				+ PreparePhotoFileName(++context.photos, date))
 			: Photo();
+		content.spoilered = data.is_spoiler();
 		if (const auto ttl = data.vttl_seconds()) {
 			result.ttl = ttl->v;
 			content.image.file = File();
@@ -1349,6 +1432,7 @@ Media ParseMedia(
 			result.ttl = ttl->v;
 			content.file = File();
 		}
+		content.spoilered = data.is_spoiler();
 		result.content = content;
 	}, [&](const MTPDmessageMediaWebPage &data) {
 		// Ignore web pages.
@@ -1363,6 +1447,8 @@ Media ParseMedia(
 		result.ttl = data.vperiod().v;
 	}, [&](const MTPDmessageMediaPoll &data) {
 		result.content = ParsePoll(data);
+	}, [&](const MTPDmessageMediaToDo &data) {
+		result.content = ParseTodoList(data);
 	}, [](const MTPDmessageMediaDice &data) {
 		// #TODO dice
 	}, [](const MTPDmessageMediaStory &data) {
@@ -1373,6 +1459,8 @@ Media ParseMedia(
 		result.content = ParseGiveaway(data);
 	}, [&](const MTPDmessageMediaPaidMedia &data) {
 		result.content = ParsePaidMedia(context, data, folder, date);
+	}, [](const MTPDmessageMediaVideoStream &data) {
+		// Live stories.
 	}, [](const MTPDmessageMediaEmpty &data) {});
 	return result;
 }
@@ -1457,16 +1545,18 @@ ServiceAction ParseServiceAction(
 			content.duration = duration->v;
 		}
 		if (const auto reason = data.vreason()) {
-			using Reason = ActionPhoneCall::DiscardReason;
-			content.discardReason = reason->match(
+			using State = ActionPhoneCall::State;
+			content.state = reason->match(
 			[](const MTPDphoneCallDiscardReasonMissed &data) {
-				return Reason::Missed;
+				return State::Missed;
 			}, [](const MTPDphoneCallDiscardReasonDisconnect &data) {
-				return Reason::Disconnect;
+				return State::Disconnect;
 			}, [](const MTPDphoneCallDiscardReasonHangup &data) {
-				return Reason::Hangup;
+				return State::Hangup;
 			}, [](const MTPDphoneCallDiscardReasonBusy &data) {
-				return Reason::Busy;
+				return State::Busy;
+			}, [](const MTPDphoneCallDiscardReasonMigrateConferenceCall &) {
+				return State::MigrateConferenceCall;
 			});
 		}
 		result.content = content;
@@ -1563,9 +1653,13 @@ ServiceAction ParseServiceAction(
 			.date = data.vschedule_date().v,
 		};
 	}, [&](const MTPDmessageActionSetChatTheme &data) {
-		result.content = ActionSetChatTheme{
-			.emoji = qs(data.vemoticon()),
-		};
+		data.vtheme().match([&](const MTPDchatTheme &data) {
+			result.content = ActionSetChatTheme{
+				.emoji = qs(data.vemoticon()),
+			};
+		}, [&](const MTPDchatThemeUniqueGift &data) {
+			result.content = ActionSetChatTheme{};
+		});
 	}, [&](const MTPDmessageActionChatJoinedByRequest &data) {
 		result.content = ActionChatJoinedByRequest();
 	}, [&](const MTPDmessageActionWebViewDataSentMe &data) {
@@ -1579,7 +1673,7 @@ ServiceAction ParseServiceAction(
 		content.cost = Ui::FillAmountAndCurrency(
 			data.vamount().v,
 			qs(data.vcurrency())).toUtf8();
-		content.months = data.vmonths().v;
+		content.days = data.vdays().v;
 		result.content = content;
 	}, [&](const MTPDmessageActionTopicCreate &data) {
 		auto content = ActionTopicCreate();
@@ -1622,7 +1716,7 @@ ServiceAction ParseServiceAction(
 			: PeerId();
 		content.viaGiveaway = data.is_via_giveaway();
 		content.unclaimed = data.is_unclaimed();
-		content.months = data.vmonths().v;
+		content.days = data.vdays().v;
 		content.code = data.vslug().v;
 		result.content = content;
 	}, [&](const MTPDmessageActionGiveawayLaunch &data) {
@@ -1648,11 +1742,21 @@ ServiceAction ParseServiceAction(
 		content.transactionId = data.vcharge().data().vid().v;
 		result.content = content;
 	}, [&](const MTPDmessageActionGiftStars &data) {
-		auto content = ActionGiftStars();
+		auto content = ActionGiftCredits();
 		content.cost = Ui::FillAmountAndCurrency(
 			data.vamount().v,
 			qs(data.vcurrency())).toUtf8();
-		content.credits = data.vstars().v;
+		content.amount = CreditsAmount(data.vstars().v, CreditsType::Stars);
+		result.content = content;
+	}, [&](const MTPDmessageActionGiftTon &data) {
+		auto content = ActionGiftCredits();
+		content.cost = Ui::FillAmountAndCurrency(
+			data.vamount().v,
+			qs(data.vcurrency())).toUtf8();
+		content.amount = CreditsAmount(
+			data.vamount().v / uint64(1'000'000'000),
+			data.vamount().v % uint64(1'000'000'000),
+			CreditsType::Ton);
 		result.content = content;
 	}, [&](const MTPDmessageActionPrizeStars &data) {
 		result.content = ActionPrizeStars{
@@ -1663,18 +1767,137 @@ ServiceAction ParseServiceAction(
 			.isUnclaimed = data.is_unclaimed(),
 		};
 	}, [&](const MTPDmessageActionStarGift &data) {
-		const auto &gift = data.vgift().data();
-		result.content = ActionStarGift{
-			.giftId = uint64(gift.vid().v),
-			.stars = int64(gift.vstars().v),
-			.text = (data.vmessage()
-				? ParseText(
-					data.vmessage()->data().vtext(),
-					data.vmessage()->data().ventities().v)
-				: std::vector<TextPart>()),
-			.anonymous = data.is_name_hidden(),
-			.limited = gift.is_limited(),
+		auto content = ParseStarGift(data.vgift());
+		content.text = (data.vmessage()
+			? ParseText(
+				data.vmessage()->data().vtext(),
+				data.vmessage()->data().ventities().v)
+			: std::vector<TextPart>());
+		content.anonymous = data.is_name_hidden();
+		result.content = content;
+	}, [&](const MTPDmessageActionStarGiftUnique &data) {
+		result.content = ParseStarGift(data.vgift());
+	}, [&](const MTPDmessageActionPaidMessagesRefunded &data) {
+		result.content = ActionPaidMessagesRefunded{
+			.messages = data.vcount().v,
+			.stars = int64(data.vstars().v),
 		};
+	}, [&](const MTPDmessageActionPaidMessagesPrice &data) {
+		result.content = ActionPaidMessagesPrice{
+			.stars = int(data.vstars().v),
+			.broadcastAllowed = data.is_broadcast_messages_allowed(),
+		};
+	}, [&](const MTPDmessageActionTodoCompletions &data) {
+		const auto take = [](const MTPVector<MTPint> &list) {
+			return list.v
+				| ranges::views::transform(&MTPint::v)
+				| ranges::to_vector;
+		};
+		result.content = ActionTodoCompletions{
+			.completed = take(data.vcompleted()),
+			.incompleted = take(data.vincompleted()),
+		};
+	}, [&](const MTPDmessageActionTodoAppendTasks &data) {
+		result.content = ActionTodoAppendTasks{
+			.items = data.vlist().v
+				| ranges::views::transform(ParseTodoListItem)
+				| ranges::to_vector,
+		};
+	}, [&](const MTPDmessageActionPollAppendAnswer &data) {
+		result.content = ActionPollAppendAnswer{};
+	}, [&](const MTPDmessageActionSuggestedPostApproval &data) {
+		result.content = ActionSuggestedPostApproval{
+			.rejectComment = data.vreject_comment().value_or_empty(),
+			.scheduleDate = data.vschedule_date().value_or_empty(),
+			.price = CreditsAmountFromTL(data.vprice()),
+			.rejected = data.is_rejected(),
+			.balanceTooLow = data.is_balance_too_low(),
+		};
+	}, [&](const MTPDmessageActionSuggestedPostSuccess &data) {
+		result.content = ActionSuggestedPostSuccess{
+			.price = CreditsAmountFromTL(data.vprice()),
+		};
+	}, [&](const MTPDmessageActionSuggestedPostRefund &data) {
+		result.content = ActionSuggestedPostRefund{
+			.payerInitiated = data.is_payer_initiated(),
+		};
+	}, [&](const MTPDmessageActionConferenceCall &data) {
+		auto content = ActionPhoneCall();
+		using State = ActionPhoneCall::State;
+		content.conferenceId = data.vcall_id().v;
+		if (const auto duration = data.vduration()) {
+			content.duration = duration->v;
+		}
+		content.state = data.is_missed()
+			? State::Missed
+			: data.is_active()
+			? State::Active
+			: data.vduration().value_or_empty()
+			? State::Hangup
+			: State::Invitation;
+		result.content = content;
+	}, [&](const MTPDmessageActionSuggestBirthday &data) {
+		auto content = ActionSuggestBirthday();
+		const auto &fields = data.vbirthday().data();
+		content.birthday = Birthday(
+			fields.vday().v,
+			fields.vmonth().v,
+			fields.vyear().value_or_empty());
+		result.content = content;
+	}, [&](const MTPDmessageActionStarGiftPurchaseOffer &data) {
+		auto content = ParseStarGift(data.vgift());
+		content.offer = true;
+		content.offerPrice = CreditsAmountFromTL(data.vprice());
+		content.offerExpireAt = data.vexpires_at().v;
+		content.offerAccepted = data.is_accepted();
+		content.offerDeclined = data.is_declined();
+		result.content = content;
+	}, [&](const MTPDmessageActionStarGiftPurchaseOfferDeclined &data) {
+		auto content = ParseStarGift(data.vgift());
+		content.offer = true;
+		content.offerDeclined = true;
+		content.offerExpired = data.is_expired();
+		content.offerPrice = CreditsAmountFromTL(data.vprice());
+		result.content = content;
+	}, [&](const MTPDmessageActionNewCreatorPending &data) {
+		auto content = ActionNewCreatorPending();
+		content.newCreatorId = data.vnew_creator_id().v;
+		result.content = content;
+	}, [&](const MTPDmessageActionChangeCreator &data) {
+		auto content = ActionChangeCreator();
+		content.newCreatorId = data.vnew_creator_id().v;
+		result.content = content;
+	}, [&](const MTPDmessageActionNoForwardsToggle &data) {
+		auto content = ActionNoForwardsToggle();
+		content.newValue = (data.vnew_value().type() == mtpc_boolTrue);
+		result.content = content;
+	}, [&](const MTPDmessageActionNoForwardsRequest &data) {
+		auto content = ActionNoForwardsRequest();
+		content.expired = data.is_expired();
+		content.newValue = (data.vnew_value().type() == mtpc_boolTrue);
+		result.content = content;
+	}, [&](const MTPDmessageActionManagedBotCreated &data) {
+		auto content = ActionManagedBotCreated();
+		content.botId = data.vbot_id().v;
+		result.content = content;
+	}, [&](const MTPDmessageActionPollAppendAnswer &data) {
+		auto content = ActionPollAppendAnswer();
+		data.vanswer().match([&](const MTPDpollAnswer &answer) {
+			content.option = ParseString(answer.vtext().match(
+				[](const MTPDtextWithEntities &d) {
+					return d.vtext();
+				}));
+		}, [](const auto &) {});
+		result.content = content;
+	}, [&](const MTPDmessageActionPollDeleteAnswer &data) {
+		auto content = ActionPollDeleteAnswer();
+		data.vanswer().match([&](const MTPDpollAnswer &answer) {
+			content.option = ParseString(answer.vtext().match(
+				[](const MTPDtextWithEntities &d) {
+					return d.vtext();
+				}));
+		}, [](const auto &) {});
+		result.content = content;
 	}, [](const MTPDmessageActionEmpty &data) {});
 	return result;
 }
@@ -1686,9 +1909,9 @@ File &Message::file() {
 	} else if (const auto photo = std::get_if<ActionSuggestProfilePhoto>(
 			content)) {
 		return photo->photo.image.file;
-	} else if (const auto wallpaper = std::get_if<ActionSetChatWallPaper>(
-			content)) {
-		// #TODO wallpapers
+	// } else if (const auto wallpaper = std::get_if<ActionSetChatWallPaper>(
+	// 		content)) {
+	// #TODO wallpapers
 	}
 	return media.file();
 }
@@ -1700,9 +1923,9 @@ const File &Message::file() const {
 	} else if (const auto photo = std::get_if<ActionSuggestProfilePhoto>(
 			content)) {
 		return photo->photo.image.file;
-	} else if (const auto wallpaper = std::get_if<ActionSetChatWallPaper>(
-			content)) {
-		// #TODO wallpapers
+	// } else if (const auto wallpaper = std::get_if<ActionSetChatWallPaper>(
+	// 		content)) {
+	// #TODO wallpapers
 	}
 	return media.file();
 }
@@ -2068,7 +2291,13 @@ const DialogInfo *DialogsInfo::item(int index) const {
 
 DialogInfo::Type DialogTypeFromChat(const Chat &chat) {
 	using Type = DialogInfo::Type;
-	return chat.username.isEmpty()
+	return (chat.isMonoforum && !chat.isMonoforumAdmin)
+		? Type::Personal
+		: (chat.isMonoforumAdmin && chat.isMonoforumOfPublicBroadcast)
+		? Type::PublicSupergroup
+		: chat.isMonoforumAdmin
+		? Type::PrivateSupergroup
+		: chat.username.isEmpty()
 		? (chat.isBroadcast
 			? Type::PrivateChannel
 			: chat.isSupergroup
@@ -2129,6 +2358,11 @@ DialogsInfo ParseDialogsInfo(const MTPmessages_Dialogs &data) {
 				info.migratedToChannelId = peer.chat()
 					? peer.chat()->migratedToChannelId
 					: 0;
+				info.isMonoforum = peer.chat()
+					&& peer.chat()->isMonoforum;
+				info.monoforumBroadcastInput = peer.chat()
+					? peer.chat()->monoforumBroadcastInput
+					: MTPInputPeer(MTP_inputPeerEmpty());
 			}
 			info.topMessageId = fields.vtop_message().v;
 			const auto messageIt = messages.find(MessageId{
@@ -2167,6 +2401,10 @@ DialogInfo DialogInfoFromChat(const Chat &data) {
 	result.topMessageId = 0;
 	result.type = DialogTypeFromChat(data);
 	result.migratedToChannelId = data.migratedToChannelId;
+	result.isMonoforum = data.isMonoforum;
+	if (data.isMonoforumAdmin) {
+		result.monoforumBroadcastInput = data.monoforumBroadcastInput;
+	}
 	return result;
 }
 
@@ -2301,7 +2539,8 @@ void FinalizeDialogsInfo(DialogsInfo &info, const Settings &settings) {
 			}
 			Unexpected("Type in ApiWrap::onlyMyMessages.");
 		}();
-		dialog.onlyMyMessages = ((settings.fullChats & setting) != setting);
+		dialog.onlyMyMessages = (dialog.type != DialogType::Personal)
+			&& ((settings.fullChats & setting) != setting);
 
 		ranges::sort(dialog.splits);
 	}
diff --git a/Telegram/SourceFiles/export/data/export_data_types.h b/Telegram/SourceFiles/export/data/export_data_types.h
index 72e823d218dd06..2ce4ae30d9d739 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.h
+++ b/Telegram/SourceFiles/export/data/export_data_types.h
@@ -10,6 +10,8 @@ For license and copyright information please follow this link:
 #include "scheme.h"
 #include "base/optional.h"
 #include "base/variant.h"
+#include "core/credits_amount.h"
+#include "data/data_birthday.h"
 #include "data/data_peer_id.h"
 
 #include <QtCore/QSize>
@@ -44,6 +46,41 @@ inline auto NumberToString(Type value, int length = 0, char filler = '0')
 		filler).replace(',', '.');
 }
 
+using Birthday = ::Data::Birthday;
+
+struct TextPart {
+	enum class Type {
+		Text,
+		Unknown,
+		Mention,
+		Hashtag,
+		BotCommand,
+		Url,
+		Email,
+		Bold,
+		Italic,
+		Code,
+		Pre,
+		TextUrl,
+		MentionName,
+		Phone,
+		Cashtag,
+		Underline,
+		Strike,
+		Blockquote,
+		BankCard,
+		Spoiler,
+		CustomEmoji,
+	};
+	Type type = Type::Text;
+	Utf8String text;
+	Utf8String additional;
+
+	[[nodiscard]] static Utf8String UnavailableEmoji() {
+		return "(unavailable)";
+	}
+};
+
 struct UserpicsInfo {
 	int count = 0;
 };
@@ -52,6 +89,10 @@ struct StoriesInfo {
 	int count = 0;
 };
 
+struct ProfileMusicInfo {
+	int count = 0;
+};
+
 struct FileLocation {
 	int dcId = 0;
 	MTPInputFileLocation data;
@@ -119,6 +160,7 @@ uint8 ContactColorIndex(const ContactInfo &data);
 struct Photo {
 	uint64 id = 0;
 	TimeId date = 0;
+	bool spoilered = false;
 
 	Image image;
 };
@@ -146,6 +188,7 @@ struct Document {
 	bool isVoiceMessage = false;
 	bool isVideoFile = false;
 	bool isAudioFile = false;
+	bool spoilered = false;
 };
 
 struct SharedContact {
@@ -196,19 +239,31 @@ struct PaidMedia {
 
 struct Poll {
 	struct Answer {
-		Utf8String text;
+		std::vector<TextPart> text;
 		QByteArray option;
 		int votes = 0;
 		bool my = false;
 	};
 
 	uint64 id = 0;
-	Utf8String question;
+	std::vector<TextPart> question;
 	std::vector<Answer> answers;
 	int totalVotes = 0;
 	bool closed = false;
 };
 
+struct TodoListItem {
+	std::vector<TextPart> text;
+	int id = 0;
+};
+
+struct TodoList {
+	bool othersCanAppend = false;
+	bool othersCanComplete = false;
+	std::vector<TextPart> title;
+	std::vector<TodoListItem> items;
+};
+
 struct GiveawayStart {
 	std::vector<QString> countries;
 	std::vector<ChannelId> channels;
@@ -271,14 +326,19 @@ struct Chat {
 	Utf8String title;
 	Utf8String username;
 	uint8 colorIndex = 0;
+	bool isMonoforum = false;
 	bool isBroadcast = false;
 	bool isSupergroup = false;
+	bool isMonoforumAdmin = false;
+	bool hasMonoforumAdminRights = false;
+	bool isMonoforumOfPublicBroadcast = false;
+	BareId monoforumLinkId = 0;
 
 	MTPInputPeer input = MTP_inputPeerEmpty();
+	MTPInputPeer monoforumBroadcastInput = MTP_inputPeerEmpty();
 };
 
 Chat ParseChat(const MTPChat &data);
-std::map<PeerId, Chat> ParseChatsList(const MTPVector<MTPChat> &data);
 
 struct Peer {
 	PeerId id() const;
@@ -368,6 +428,7 @@ struct Media {
 		Game,
 		Invoice,
 		Poll,
+		TodoList,
 		GiveawayStart,
 		GiveawayResults,
 		PaidMedia,
@@ -402,39 +463,6 @@ Media ParseMedia(
 	const QString &folder,
 	TimeId date);
 
-struct TextPart {
-	enum class Type {
-		Text,
-		Unknown,
-		Mention,
-		Hashtag,
-		BotCommand,
-		Url,
-		Email,
-		Bold,
-		Italic,
-		Code,
-		Pre,
-		TextUrl,
-		MentionName,
-		Phone,
-		Cashtag,
-		Underline,
-		Strike,
-		Blockquote,
-		BankCard,
-		Spoiler,
-		CustomEmoji,
-	};
-	Type type = Type::Text;
-	Utf8String text;
-	Utf8String additional;
-
-	[[nodiscard]] static Utf8String UnavailableEmoji() {
-		return "(unavailable)";
-	}
-};
-
 struct ActionChatCreate {
 	Utf8String title;
 	std::vector<UserId> userIds;
@@ -495,14 +523,19 @@ struct ActionPaymentSent {
 };
 
 struct ActionPhoneCall {
-	enum class DiscardReason {
+	enum class State {
 		Unknown,
 		Missed,
 		Disconnect,
 		Hangup,
 		Busy,
+		MigrateConferenceCall,
+		Invitation,
+		Active,
 	};
-	DiscardReason discardReason = DiscardReason::Unknown;
+
+	uint64 conferenceId = 0;
+	State state = State::Unknown;
 	int duration = 0;
 };
 
@@ -583,7 +616,7 @@ struct ActionWebViewDataSent {
 
 struct ActionGiftPremium {
 	Utf8String cost;
-	int months = 0;
+	int days = 0;
 };
 
 struct ActionTopicCreate {
@@ -608,7 +641,7 @@ struct ActionSetChatWallPaper {
 struct ActionGiftCode {
 	QByteArray code;
 	PeerId boostPeerId = 0;
-	int months = 0;
+	int days = 0;
 	bool viaGiveaway = false;
 	bool unclaimed = false;
 };
@@ -638,9 +671,9 @@ struct ActionPaymentRefunded {
 	Utf8String transactionId;
 };
 
-struct ActionGiftStars {
+struct ActionGiftCredits {
 	Utf8String cost;
-	int credits = 0;
+	CreditsAmount amount;
 };
 
 struct ActionPrizeStars {
@@ -657,6 +690,81 @@ struct ActionStarGift {
 	std::vector<TextPart> text;
 	bool anonymous = false;
 	bool limited = false;
+
+	CreditsAmount offerPrice;
+	TimeId offerExpireAt = 0;
+	bool offer = false;
+	bool offerAccepted = false;
+	bool offerDeclined = false;
+	bool offerExpired = false;
+};
+
+struct ActionPaidMessagesRefunded {
+	int messages = 0;
+	int64 stars = 0;
+};
+
+struct ActionPaidMessagesPrice {
+	int stars = 0;
+	bool broadcastAllowed = false;
+};
+
+struct ActionTodoCompletions {
+	std::vector<int> completed;
+	std::vector<int> incompleted;
+};
+
+struct ActionTodoAppendTasks {
+	std::vector<TodoListItem> items;
+};
+
+struct ActionPollAppendAnswer {
+	Utf8String option;
+};
+
+struct ActionPollDeleteAnswer {
+	Utf8String option;
+};
+
+struct ActionSuggestedPostApproval {
+	Utf8String rejectComment;
+	TimeId scheduleDate = 0;
+	CreditsAmount price;
+	bool rejected = false;
+	bool balanceTooLow = false;
+};
+
+struct ActionSuggestedPostSuccess {
+	CreditsAmount price;
+};
+
+struct ActionSuggestedPostRefund {
+	bool payerInitiated = false;
+};
+
+struct ActionSuggestBirthday {
+	Birthday birthday;
+};
+
+struct ActionNoForwardsToggle {
+	bool newValue = false;
+};
+
+struct ActionNoForwardsRequest {
+	bool expired = false;
+	bool newValue = false;
+};
+
+struct ActionNewCreatorPending {
+	UserId newCreatorId = 0;
+};
+
+struct ActionChangeCreator {
+	UserId newCreatorId = 0;
+};
+
+struct ActionManagedBotCreated {
+	UserId botId = 0;
 };
 
 struct ServiceAction {
@@ -702,9 +810,24 @@ struct ServiceAction {
 		ActionGiveawayResults,
 		ActionBoostApply,
 		ActionPaymentRefunded,
-		ActionGiftStars,
+		ActionGiftCredits,
 		ActionPrizeStars,
-		ActionStarGift> content;
+		ActionStarGift,
+		ActionPaidMessagesRefunded,
+		ActionPaidMessagesPrice,
+		ActionTodoCompletions,
+		ActionTodoAppendTasks,
+		ActionPollAppendAnswer,
+		ActionPollDeleteAnswer,
+		ActionSuggestedPostApproval,
+		ActionSuggestedPostSuccess,
+		ActionSuggestedPostRefund,
+		ActionSuggestBirthday,
+		ActionNoForwardsToggle,
+		ActionNoForwardsRequest,
+		ActionNewCreatorPending,
+		ActionChangeCreator,
+		ActionManagedBotCreated> content;
 };
 
 ServiceAction ParseServiceAction(
@@ -853,6 +976,11 @@ StoriesSlice ParseStoriesSlice(
 	const MTPVector<MTPStoryItem> &data,
 	int baseIndex);
 
+struct ProfileMusicSlice {
+	std::vector<Message> list;
+	int skipped = 0;
+};
+
 Message ParseMessage(
 	ParseMediaContext &context,
 	const MTPMessage &data,
@@ -889,12 +1017,15 @@ struct DialogInfo {
 	MTPInputPeer migratedFromInput = MTP_inputPeerEmpty();
 	ChannelId migratedToChannelId = 0;
 
+	MTPInputPeer monoforumBroadcastInput = MTP_inputPeerEmpty();
+
 	// User messages splits which contained that dialog.
 	std::vector<int> splits;
 
 	// Filled after the whole dialogs list is accumulated.
 	bool onlyMyMessages = false;
 	bool isLeftChannel = false;
+	bool isMonoforum = false;
 	QString relativePath;
 
 	// Filled when requesting dialog messages.
diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
index b511b9fe3e6de0..f23c279f9d4236 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
@@ -32,6 +32,7 @@ constexpr auto kFileMaxSize = 4000 * int64(1024 * 1024);
 constexpr auto kLocationCacheSize = 100'000;
 constexpr auto kMaxEmojiPerRequest = 100;
 constexpr auto kStoriesSliceLimit = 100;
+constexpr auto kProfileMusicSliceLimit = 100;
 
 struct LocationKey {
 	uint64 type;
@@ -112,6 +113,7 @@ struct ApiWrap::StartProcess {
 	enum class Step {
 		UserpicsCount,
 		StoriesCount,
+		ProfileMusicCount,
 		SplitRanges,
 		DialogsCount,
 		LeftChannelsCount,
@@ -155,6 +157,19 @@ struct ApiWrap::StoriesProcess {
 	int fileIndex = 0;
 };
 
+struct ApiWrap::ProfileMusicProcess {
+	FnMut<bool(Data::ProfileMusicInfo&&)> start;
+	Fn<bool(DownloadProgress)> fileProgress;
+	Fn<bool(Data::ProfileMusicSlice&&)> handleSlice;
+	FnMut<void()> finish;
+
+	int processed = 0;
+	std::optional<Data::ProfileMusicSlice> slice;
+	int offsetId = 0;
+	bool lastSlice = false;
+	int fileIndex = 0;
+};
+
 struct ApiWrap::OtherDataProcess {
 	Data::File file;
 	FnMut<void(Data::File&&)> done;
@@ -210,25 +225,41 @@ struct ApiWrap::DialogsProcess : ChatsProcess {
 	MTPInputPeer offsetPeer = MTP_inputPeerEmpty();
 };
 
-struct ApiWrap::ChatProcess {
-	Data::DialogInfo info;
-
-	FnMut<bool(const Data::DialogInfo &)> start;
+struct ApiWrap::AbstractMessagesProcess {
 	Fn<bool(DownloadProgress)> fileProgress;
 	Fn<bool(Data::MessagesSlice&&)> handleSlice;
 	FnMut<void()> done;
 
 	FnMut<void(MTPmessages_Messages&&)> requestDone;
 
-	int localSplitIndex = 0;
-	int32 largestIdPlusOne = 1;
-
 	Data::ParseMediaContext context;
 	std::optional<Data::MessagesSlice> slice;
 	bool lastSlice = false;
 	int fileIndex = 0;
 };
 
+struct ApiWrap::ChatProcess : AbstractMessagesProcess {
+	Data::DialogInfo info;
+
+	FnMut<bool(const Data::DialogInfo &)> start;
+
+	int localSplitIndex = 0;
+	int32 largestIdPlusOne = 1;
+};
+
+struct ApiWrap::TopicProcess : AbstractMessagesProcess {
+	PeerId peerId = 0;
+	MTPInputPeer inputPeer;
+	int32 topicRootId = 0;
+	QString relativePath;
+
+	FnMut<bool(int count)> start;
+
+	int32 offsetId = 0;
+	int totalCount = 0;
+	int processedCount = 0;
+};
+
 
 template <typename Request>
 class ApiWrap::RequestBuilder {
@@ -404,7 +435,9 @@ auto ApiWrap::fileRequest(const Data::FileLocation &location, int64 offset) {
 	}).toDC(MTP::ShiftDcId(location.dcId, MTP::kExportMediaDcShift)));
 }
 
-ApiWrap::ApiWrap(QPointer<MTP::Instance> weak, Fn<void(FnMut<void()>)> runner)
+ApiWrap::ApiWrap(
+	base::weak_qptr<MTP::Instance> weak,
+	Fn<void(FnMut<void()>)> runner)
 : _mtp(weak, std::move(runner))
 , _fileCache(std::make_unique<LoadedFileCache>(kLocationCacheSize)) {
 }
@@ -436,10 +469,11 @@ void ApiWrap::startExport(
 	if (_settings->types & Settings::Type::Stories) {
 		_startProcess->steps.push_back(Step::StoriesCount);
 	}
-	if (_settings->types & Settings::Type::AnyChatsMask) {
-		_startProcess->steps.push_back(Step::SplitRanges);
+	if (_settings->types & Settings::Type::ProfileMusic) {
+		_startProcess->steps.push_back(Step::ProfileMusicCount);
 	}
 	if (_settings->types & Settings::Type::AnyChatsMask) {
+		_startProcess->steps.push_back(Step::SplitRanges);
 		_startProcess->steps.push_back(Step::DialogsCount);
 	}
 	if (_settings->types & Settings::Type::GroupsChannelsMask) {
@@ -468,6 +502,8 @@ void ApiWrap::sendNextStartRequest() {
 		return requestUserpicsCount();
 	case Step::StoriesCount:
 		return requestStoriesCount();
+	case Step::ProfileMusicCount:
+		return requestProfileMusicCount();
 	case Step::SplitRanges:
 		return requestSplitRanges();
 	case Step::DialogsCount:
@@ -518,6 +554,34 @@ void ApiWrap::requestStoriesCount() {
 	}).send();
 }
 
+void ApiWrap::requestProfileMusicCount() {
+	Expects(_startProcess != nullptr);
+
+	mainRequest(MTPusers_GetSavedMusic(
+		_user,
+		MTP_int(0), // offset
+		MTP_int(0), // limit
+		MTP_long(0) // hash
+	)).done([=](const MTPusers_SavedMusic &result) {
+		Expects(_settings != nullptr);
+		Expects(_startProcess != nullptr);
+
+		const auto count = result.match(
+		[](const MTPDusers_savedMusic &data) {
+			return data.vcount().v;
+		}, [](const MTPDusers_savedMusicNotModified &data) {
+			return -1;
+		});
+		if (count < 0) {
+			error("Unexpected messagesNotModified received.");
+			return;
+		}
+		_startProcess->info.profileMusicCount = count;
+
+		sendNextStartRequest();
+	}).send();
+}
+
 void ApiWrap::requestSplitRanges() {
 	Expects(_startProcess != nullptr);
 
@@ -1062,6 +1126,215 @@ void ApiWrap::finishStories() {
 	base::take(_storiesProcess)->finish();
 }
 
+void ApiWrap::requestProfileMusic(
+		FnMut<bool(Data::ProfileMusicInfo&&)> start,
+		Fn<bool(DownloadProgress)> progress,
+		Fn<bool(Data::ProfileMusicSlice&&)> slice,
+		FnMut<void()> finish) {
+	Expects(_profileMusicProcess == nullptr);
+
+	_profileMusicProcess = std::make_unique<ProfileMusicProcess>();
+	_profileMusicProcess->start = std::move(start);
+	_profileMusicProcess->fileProgress = std::move(progress);
+	_profileMusicProcess->handleSlice = std::move(slice);
+	_profileMusicProcess->finish = std::move(finish);
+
+	mainRequest(MTPusers_GetSavedMusic(
+		_user,
+		MTP_int(0), // offset
+		MTP_int(kProfileMusicSliceLimit), // limit
+		MTP_long(0) // hash
+	)).done([=](const MTPusers_SavedMusic &result) mutable {
+		Expects(_profileMusicProcess != nullptr);
+
+		auto startInfo = result.match(
+		[](const MTPDusers_savedMusic &data) {
+			return Data::ProfileMusicInfo{ data.vcount().v };
+		}, [](const MTPDusers_savedMusicNotModified &data) {
+			return Data::ProfileMusicInfo{ 0 };
+		});
+		if (!_profileMusicProcess->start(std::move(startInfo))) {
+			return;
+		}
+
+		handleProfileMusicSlice(result);
+	}).send();
+}
+
+void ApiWrap::handleProfileMusicSlice(const MTPusers_SavedMusic &result) {
+	Expects(_profileMusicProcess != nullptr);
+	Expects(_selfId.has_value());
+
+	auto context = Data::ParseMediaContext();
+	context.selfPeerId = peerFromUser(*_selfId);
+
+	auto slice = result.match([&](const MTPDusers_savedMusic &data) {
+		if (data.vdocuments().v.size() < kProfileMusicSliceLimit) {
+			_profileMusicProcess->lastSlice = true;
+		}
+		auto result = Data::MessagesSlice();
+		for (const auto &doc : data.vdocuments().v) {
+			auto message = Data::Message();
+			message.id = ++_profileMusicProcess->processed;
+			message.date = 0;
+			message.media.content = Data::ParseDocument(
+				context,
+				doc,
+				"profile_music/",
+				0);
+			result.list.push_back(std::move(message));
+		}
+		return result;
+	}, [&](const MTPDusers_savedMusicNotModified &) {
+		_profileMusicProcess->lastSlice = true;
+		return Data::MessagesSlice();
+	});
+
+	auto profileSlice = Data::ProfileMusicSlice();
+	profileSlice.list.reserve(slice.list.size());
+	for (auto &message : slice.list) {
+		if (v::is<Data::Document>(message.media.content)) {
+			const auto &doc = v::get<Data::Document>(message.media.content);
+			if (doc.isAudioFile) {
+				profileSlice.list.push_back(std::move(message));
+			}
+		}
+	}
+
+	loadProfileMusicFiles(std::move(profileSlice));
+}
+
+void ApiWrap::loadProfileMusicFiles(Data::ProfileMusicSlice &&slice) {
+	Expects(_profileMusicProcess != nullptr);
+	Expects(!_profileMusicProcess->slice.has_value());
+
+	if (slice.list.empty()) {
+		_profileMusicProcess->lastSlice = true;
+	}
+	_profileMusicProcess->slice = std::move(slice);
+	_profileMusicProcess->fileIndex = 0;
+	loadNextProfileMusic();
+}
+
+void ApiWrap::loadNextProfileMusic() {
+	Expects(_profileMusicProcess != nullptr);
+	Expects(_profileMusicProcess->slice.has_value());
+
+	for (auto &list = _profileMusicProcess->slice->list
+		; _profileMusicProcess->fileIndex < list.size()
+		; ++_profileMusicProcess->fileIndex) {
+		auto &message = list[_profileMusicProcess->fileIndex];
+		const auto origin = Data::FileOrigin{ .messageId = message.id };
+		const auto ready = processFileLoad(
+			message.file(),
+			origin,
+			[=](FileProgress value) { return loadProfileMusicProgress(value); },
+			[=](const QString &path) { loadProfileMusicDone(path); },
+			&message);
+		if (!ready) {
+			return;
+		}
+		const auto thumbProgress = [=](FileProgress value) {
+			return loadProfileMusicThumbProgress(value);
+		};
+		const auto thumbReady = processFileLoad(
+			message.thumb().file,
+			origin,
+			thumbProgress,
+			[=](const QString &path) { loadProfileMusicThumbDone(path); },
+			&message);
+		if (!thumbReady) {
+			return;
+		}
+	}
+	finishProfileMusicSlice();
+}
+
+void ApiWrap::finishProfileMusicSlice() {
+	Expects(_profileMusicProcess != nullptr);
+	Expects(_profileMusicProcess->slice.has_value());
+
+	auto slice = *base::take(_profileMusicProcess->slice);
+	if (!slice.list.empty()) {
+		_profileMusicProcess->processed += slice.list.size();
+		_profileMusicProcess->offsetId = slice.list.back().id;
+		if (!_profileMusicProcess->handleSlice(std::move(slice))) {
+			return;
+		}
+	}
+	if (_profileMusicProcess->lastSlice) {
+		finishProfileMusic();
+		return;
+	}
+
+	mainRequest(MTPusers_GetSavedMusic(
+		_user,
+		MTP_int(_profileMusicProcess->offsetId),
+		MTP_int(kProfileMusicSliceLimit),
+		MTP_long(0)
+	)).done([=](const MTPusers_SavedMusic &result) {
+		handleProfileMusicSlice(result);
+	}).send();
+}
+
+bool ApiWrap::loadProfileMusicProgress(FileProgress progress) {
+	Expects(_fileProcess != nullptr);
+	Expects(_profileMusicProcess != nullptr);
+	Expects(_profileMusicProcess->slice.has_value());
+	Expects((_profileMusicProcess->fileIndex >= 0)
+		&& (_profileMusicProcess->fileIndex
+			< _profileMusicProcess->slice->list.size()));
+
+	return _profileMusicProcess->fileProgress(DownloadProgress{
+		_fileProcess->randomId,
+		_fileProcess->relativePath,
+		_profileMusicProcess->fileIndex,
+		progress.ready,
+		progress.total });
+}
+
+void ApiWrap::loadProfileMusicDone(const QString &relativePath) {
+	Expects(_profileMusicProcess != nullptr);
+	Expects(_profileMusicProcess->slice.has_value());
+	Expects((_profileMusicProcess->fileIndex >= 0)
+		&& (_profileMusicProcess->fileIndex
+			< _profileMusicProcess->slice->list.size()));
+
+	const auto index = _profileMusicProcess->fileIndex;
+	auto &file = _profileMusicProcess->slice->list[index].file();
+	file.relativePath = relativePath;
+	if (relativePath.isEmpty()) {
+		file.skipReason = Data::File::SkipReason::Unavailable;
+	}
+	loadNextProfileMusic();
+}
+
+bool ApiWrap::loadProfileMusicThumbProgress(FileProgress progress) {
+	return loadProfileMusicProgress(progress);
+}
+
+void ApiWrap::loadProfileMusicThumbDone(const QString &relativePath) {
+	Expects(_profileMusicProcess != nullptr);
+	Expects(_profileMusicProcess->slice.has_value());
+	Expects((_profileMusicProcess->fileIndex >= 0)
+		&& (_profileMusicProcess->fileIndex
+			< _profileMusicProcess->slice->list.size()));
+
+	const auto index = _profileMusicProcess->fileIndex;
+	auto &file = _profileMusicProcess->slice->list[index].thumb().file;
+	file.relativePath = relativePath;
+	if (relativePath.isEmpty()) {
+		file.skipReason = Data::File::SkipReason::Unavailable;
+	}
+	loadNextProfileMusic();
+}
+
+void ApiWrap::finishProfileMusic() {
+	Expects(_profileMusicProcess != nullptr);
+
+	base::take(_profileMusicProcess)->finish();
+}
+
 void ApiWrap::requestContacts(FnMut<void(Data::ContactsList&&)> done) {
 	Expects(_contactsProcess == nullptr);
 
@@ -1372,7 +1645,7 @@ void ApiWrap::appendSinglePeerDialogs(Data::DialogsInfo &&info) {
 		if (isSupergroupType(info.type) && !migratedRequestId) {
 			migratedRequestId = requestSinglePeerMigrated(info);
 			continue;
-		} else if (isChannelType(info.type)) {
+		} else if (isChannelType(info.type) || info.isMonoforum) {
 			continue;
 		}
 		for (auto i = last; i != 0; --i) {
@@ -1644,6 +1917,9 @@ void ApiWrap::requestChatMessages(
 	const auto realPeerInput = (splitIndex >= 0)
 		? _chatProcess->info.input
 		: _chatProcess->info.migratedFromInput;
+	const auto outgoingInput = _chatProcess->info.isMonoforum
+		? _chatProcess->info.monoforumBroadcastInput
+		: MTP_inputPeerSelf();
 	const auto realSplitIndex = (splitIndex >= 0)
 		? splitIndex
 		: (splitsCount + splitIndex);
@@ -1652,7 +1928,7 @@ void ApiWrap::requestChatMessages(
 			MTP_flags(MTPmessages_Search::Flag::f_from_id),
 			realPeerInput,
 			MTP_string(), // query
-			MTP_inputPeerSelf(),
+			outgoingInput,
 			MTPInputPeer(), // saved_peer_id
 			MTPVector<MTPReaction>(), // saved_reaction
 			MTPint(), // top_msg_id
@@ -1820,13 +2096,18 @@ std::optional<QByteArray> ApiWrap::getCustomEmoji(QByteArray &data) {
 		}
 		auto &file = i->second.file;
 		const auto fileProgress = [=](FileProgress value) {
-			return loadMessageEmojiProgress(value);
+			if (_chatProcess) {
+				return loadMessageEmojiProgress(value);
+			} else if (_topicProcess) {
+				return loadTopicEmojiProgress(value);
+			}
+			return true;
 		};
 		const auto ready = processFileLoad(
 			file,
 			{ .customEmojiId = id },
 			fileProgress,
-			[=](const QString &path) { loadMessageEmojiDone(id, path); });
+			[=](const QString &path) { loadCustomEmojiDone(id, path); });
 		if (!ready) {
 			return std::nullopt;
 		}
@@ -2002,6 +2283,36 @@ void ApiWrap::loadMessageEmojiDone(uint64 id, const QString &relativePath) {
 	loadNextMessageFile();
 }
 
+bool ApiWrap::loadTopicEmojiProgress(FileProgress progress) {
+	Expects(_fileProcess != nullptr);
+	Expects(_topicProcess != nullptr);
+	Expects(_topicProcess->slice.has_value());
+	Expects((_topicProcess->fileIndex >= 0)
+		&& (_topicProcess->fileIndex < _topicProcess->slice->list.size()));
+
+	return _topicProcess->fileProgress(DownloadProgress{
+		.randomId = _fileProcess->randomId,
+		.path = _fileProcess->relativePath,
+		.itemIndex = _topicProcess->fileIndex,
+		.ready = progress.ready,
+		.total = progress.total });
+}
+
+void ApiWrap::loadCustomEmojiDone(uint64 id, const QString &relativePath) {
+	const auto i = _resolvedCustomEmoji.find(id);
+	if (i != end(_resolvedCustomEmoji)) {
+		i->second.file.relativePath = relativePath;
+		if (relativePath.isEmpty()) {
+			i->second.file.skipReason = Data::File::SkipReason::Unavailable;
+		}
+	}
+	if (_chatProcess) {
+		loadNextMessageFile();
+	} else if (_topicProcess) {
+		loadNextTopicMessageFile();
+	}
+}
+
 void ApiWrap::finishMessages() {
 	Expects(_chatProcess != nullptr);
 	Expects(!_chatProcess->slice.has_value());
@@ -2010,6 +2321,316 @@ void ApiWrap::finishMessages() {
 	process->done();
 }
 
+void ApiWrap::requestTopicMessages(
+		PeerId peerId,
+		MTPInputPeer inputPeer,
+		int32 topicRootId,
+		FnMut<bool(int count)> start,
+		Fn<bool(DownloadProgress)> progress,
+		Fn<bool(Data::MessagesSlice&&)> slice,
+		FnMut<void()> done) {
+	Expects(_topicProcess == nullptr);
+	Expects(_selfId.has_value());
+
+	_topicProcess = std::make_unique<TopicProcess>();
+	_topicProcess->context.selfPeerId = peerFromUser(*_selfId);
+	_topicProcess->peerId = peerId;
+	_topicProcess->inputPeer = inputPeer;
+	_topicProcess->topicRootId = topicRootId;
+	_topicProcess->relativePath = "chats/chat_"
+		+ QString::number(peerId.value)
+		+ "/topic_"
+		+ QString::number(topicRootId)
+		+ "/";
+	_topicProcess->start = std::move(start);
+	_topicProcess->fileProgress = std::move(progress);
+	_topicProcess->handleSlice = std::move(slice);
+	_topicProcess->done = std::move(done);
+
+	mainRequest(MTPchannels_GetMessages(
+		MTP_inputChannel(
+			inputPeer.c_inputPeerChannel().vchannel_id(),
+			inputPeer.c_inputPeerChannel().vaccess_hash()),
+		MTP_vector<MTPInputMessage>(
+			1,
+			MTP_inputMessageID(MTP_int(topicRootId)))
+	)).done([=](const MTPmessages_Messages &rootResult) {
+		Expects(_topicProcess != nullptr);
+
+		auto rootSlice = rootResult.match([&](
+				const MTPDmessages_messagesNotModified &) {
+			return Data::MessagesSlice();
+		}, [&](const auto &data) {
+			return Data::ParseMessagesSlice(
+				_topicProcess->context,
+				data.vmessages(),
+				data.vusers(),
+				data.vchats(),
+				_topicProcess->relativePath);
+		});
+
+		auto rootSlicePtr = std::make_shared<Data::MessagesSlice>(
+			std::move(rootSlice));
+
+		requestTopicReplies(
+			0,
+			0,
+			kMessagesSliceLimit,
+			[=](const MTPmessages_Messages &result) {
+				Expects(_topicProcess != nullptr);
+
+				const auto count = result.match(
+					[](const MTPDmessages_messages &data) {
+					return int(data.vmessages().v.size());
+				}, [](const MTPDmessages_messagesSlice &data) {
+					return data.vcount().v;
+				}, [](const MTPDmessages_channelMessages &data) {
+					return data.vcount().v;
+				}, [](const MTPDmessages_messagesNotModified &data) {
+					return -1;
+				});
+				if (count < 0) {
+					error("Unexpected messagesNotModified received.");
+					return;
+				}
+				_topicProcess->totalCount = count;
+				if (!_topicProcess->start(count)) {
+					return;
+				}
+
+				if (!rootSlicePtr->list.empty()) {
+					collectMessagesCustomEmoji(*rootSlicePtr);
+					_topicProcess->slice = std::move(*rootSlicePtr);
+					_topicProcess->fileIndex = 0;
+					resolveTopicCustomEmoji();
+					return;
+				}
+
+				requestTopicMessagesSlice();
+			});
+	}).send();
+}
+
+void ApiWrap::requestTopicMessagesSlice() {
+	Expects(_topicProcess != nullptr);
+
+	const auto offsetId = (_topicProcess->offsetId == 0)
+		? 1
+		: (_topicProcess->offsetId + 1);
+	requestTopicReplies(
+		offsetId,
+		-kMessagesSliceLimit,
+		kMessagesSliceLimit,
+		[=](const MTPmessages_Messages &result) {
+			Expects(_topicProcess != nullptr);
+
+			result.match([&](const MTPDmessages_messagesNotModified &data) {
+				error("Unexpected messagesNotModified received.");
+			}, [&](const auto &data) {
+				if constexpr (MTPDmessages_messages::Is<decltype(data)>()) {
+					_topicProcess->lastSlice = true;
+				}
+				auto slice = Data::ParseMessagesSlice(
+					_topicProcess->context,
+					data.vmessages(),
+					data.vusers(),
+					data.vchats(),
+					_topicProcess->relativePath);
+				if (slice.list.empty()) {
+					_topicProcess->lastSlice = true;
+				}
+				loadTopicMessagesFiles(std::move(slice));
+			});
+		});
+}
+
+void ApiWrap::requestTopicReplies(
+		int offsetId,
+		int addOffset,
+		int limit,
+		FnMut<void(MTPmessages_Messages&&)> done) {
+	Expects(_topicProcess != nullptr);
+
+	_topicProcess->requestDone = std::move(done);
+	const auto doneHandler = [=](MTPmessages_Messages &&result) {
+		Expects(_topicProcess != nullptr);
+		base::take(_topicProcess->requestDone)(std::move(result));
+	};
+
+	mainRequest(MTPmessages_GetReplies(
+		_topicProcess->inputPeer,
+		MTP_int(_topicProcess->topicRootId),
+		MTP_int(offsetId),
+		MTP_int(0),
+		MTP_int(addOffset),
+		MTP_int(limit),
+		MTP_int(0),
+		MTP_int(0),
+		MTP_long(0)
+	)).done(doneHandler).send();
+}
+
+void ApiWrap::loadTopicMessagesFiles(Data::MessagesSlice &&slice) {
+	Expects(_topicProcess != nullptr);
+	Expects(!_topicProcess->slice.has_value());
+
+	collectMessagesCustomEmoji(slice);
+
+	if (slice.list.empty()) {
+		_topicProcess->lastSlice = true;
+	}
+	_topicProcess->slice = std::move(slice);
+	_topicProcess->fileIndex = 0;
+
+	resolveTopicCustomEmoji();
+}
+
+void ApiWrap::resolveTopicCustomEmoji() {
+	if (_unresolvedCustomEmoji.empty()) {
+		loadNextTopicMessageFile();
+		return;
+	}
+	const auto count = std::min(
+		int(_unresolvedCustomEmoji.size()),
+		kMaxEmojiPerRequest);
+	auto v = QVector<MTPlong>();
+	v.reserve(count);
+	const auto till = end(_unresolvedCustomEmoji);
+	const auto from = end(_unresolvedCustomEmoji) - count;
+	for (auto i = from; i != till; ++i) {
+		v.push_back(MTP_long(*i));
+	}
+	_unresolvedCustomEmoji.erase(from, till);
+	const auto finalize = [=] {
+		for (const auto &id : v) {
+			if (_resolvedCustomEmoji.contains(id.v)) {
+				continue;
+			}
+			_resolvedCustomEmoji.emplace(
+				id.v,
+				Data::Document{
+					.file = {
+						.skipReason = Data::File::SkipReason::Unavailable,
+					},
+				});
+		}
+		resolveTopicCustomEmoji();
+	};
+	mainRequest(MTPmessages_GetCustomEmojiDocuments(
+		MTP_vector<MTPlong>(v)
+	)).fail([=](const MTP::Error &error) {
+		LOG(("Export Error: Failed to get documents for emoji."));
+		finalize();
+		return true;
+	}).done([=](const MTPVector<MTPDocument> &result) {
+		for (const auto &entry : result.v) {
+			auto document = Data::ParseDocument(
+				_topicProcess->context,
+				entry,
+				_topicProcess->relativePath,
+				TimeId());
+			_resolvedCustomEmoji.emplace(document.id, std::move(document));
+		}
+		finalize();
+	}).send();
+}
+
+void ApiWrap::loadNextTopicMessageFile() {
+	Expects(_topicProcess != nullptr);
+	Expects(_topicProcess->slice.has_value());
+
+	const auto makeProgress = [=](FileProgress progress) {
+		return _topicProcess->fileProgress(DownloadProgress{
+			.randomId = _fileProcess->randomId,
+			.path = _fileProcess->relativePath,
+			.itemIndex = _topicProcess->fileIndex,
+			.ready = progress.ready,
+			.total = progress.total,
+		});
+	};
+	for (auto &list = _topicProcess->slice->list
+		; _topicProcess->fileIndex < list.size()
+		; ++_topicProcess->fileIndex) {
+		auto &message = list[_topicProcess->fileIndex];
+		if (!messageCustomEmojiReady(message)) {
+			return;
+		}
+		const auto origin = Data::FileOrigin{
+			.peer = _topicProcess->inputPeer,
+			.messageId = message.id
+		};
+		const auto ready = processFileLoad(
+			message.file(),
+			origin,
+			makeProgress,
+			[=, &message](const QString &path) {
+				loadTopicMessageFileOrThumbDone(message.file(), path);
+			},
+			&message);
+		if (!ready) {
+			return;
+		}
+		const auto thumbReady = processFileLoad(
+			message.thumb().file,
+			origin,
+			makeProgress,
+			[=, &message](const QString &path) {
+				loadTopicMessageFileOrThumbDone(message.thumb().file, path);
+			},
+			&message);
+		if (!thumbReady) {
+			return;
+		}
+	}
+	finishTopicMessagesSlice();
+}
+
+void ApiWrap::finishTopicMessagesSlice() {
+	Expects(_topicProcess != nullptr);
+	Expects(_topicProcess->slice.has_value());
+
+	auto slice = *base::take(_topicProcess->slice);
+	if (!slice.list.empty()) {
+		_topicProcess->offsetId = slice.list.back().id;
+		_topicProcess->processedCount += slice.list.size();
+		if (!_topicProcess->handleSlice(std::move(slice))) {
+			return;
+		}
+	}
+
+	const auto reachedTotal = _topicProcess->totalCount > 0
+		&& _topicProcess->processedCount >= _topicProcess->totalCount;
+
+	if (!_topicProcess->lastSlice && !reachedTotal) {
+		requestTopicMessagesSlice();
+	} else {
+		finishTopicMessages();
+	}
+}
+
+void ApiWrap::loadTopicMessageFileOrThumbDone(
+		Data::File &file,
+		const QString &relativePath) {
+	Expects(_topicProcess != nullptr);
+	Expects(_topicProcess->slice.has_value());
+	Expects((_topicProcess->fileIndex >= 0)
+		&& (_topicProcess->fileIndex < _topicProcess->slice->list.size()));
+
+	file.relativePath = relativePath;
+	if (relativePath.isEmpty()) {
+		file.skipReason = Data::File::SkipReason::Unavailable;
+	}
+	loadNextTopicMessageFile();
+}
+
+void ApiWrap::finishTopicMessages() {
+	Expects(_topicProcess != nullptr);
+	Expects(!_topicProcess->slice.has_value());
+
+	const auto process = base::take(_topicProcess);
+	process->done();
+}
+
 bool ApiWrap::processFileLoad(
 		Data::File &file,
 		const Data::FileOrigin &origin,
@@ -2065,7 +2686,7 @@ bool ApiWrap::processFileLoad(
 	} else if (!story && (_settings->media.types & type) != type) {
 		file.skipReason = SkipReason::FileType;
 		return true;
-	} else if (!story && fullSize >= _settings->media.sizeLimit) {
+	} else if (!story && fullSize > _settings->media.sizeLimit) {
 		// Don't load thumbs for large files that we skip.
 		file.skipReason = SkipReason::FileSize;
 		return true;
diff --git a/Telegram/SourceFiles/export/export_api_wrap.h b/Telegram/SourceFiles/export/export_api_wrap.h
index 6073243152ab66..d2e41780a80f88 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.h
+++ b/Telegram/SourceFiles/export/export_api_wrap.h
@@ -21,6 +21,8 @@ struct UserpicsInfo;
 struct UserpicsSlice;
 struct StoriesInfo;
 struct StoriesSlice;
+struct ProfileMusicInfo;
+struct ProfileMusicSlice;
 struct ContactsList;
 struct SessionsList;
 struct DialogsInfo;
@@ -40,7 +42,9 @@ struct Settings;
 
 class ApiWrap {
 public:
-	ApiWrap(QPointer<MTP::Instance> weak, Fn<void(FnMut<void()>)> runner);
+	ApiWrap(
+		base::weak_qptr<MTP::Instance> weak,
+		Fn<void(FnMut<void()>)> runner);
 
 	rpl::producer<MTP::Error> errors() const;
 	rpl::producer<Output::Result> ioErrors() const;
@@ -48,6 +52,7 @@ class ApiWrap {
 	struct StartInfo {
 		int userpicsCount = 0;
 		int storiesCount = 0;
+		int profileMusicCount = 0;
 		int dialogsCount = 0;
 	};
 	void startExport(
@@ -84,6 +89,12 @@ class ApiWrap {
 		Fn<bool(Data::StoriesSlice&&)> slice,
 		FnMut<void()> finish);
 
+	void requestProfileMusic(
+		FnMut<bool(Data::ProfileMusicInfo&&)> start,
+		Fn<bool(DownloadProgress)> progress,
+		Fn<bool(Data::ProfileMusicSlice&&)> slice,
+		FnMut<void()> finish);
+
 	void requestContacts(FnMut<void(Data::ContactsList&&)> done);
 
 	void requestSessions(FnMut<void(Data::SessionsList&&)> done);
@@ -95,6 +106,15 @@ class ApiWrap {
 		Fn<bool(Data::MessagesSlice&&)> slice,
 		FnMut<void()> done);
 
+	void requestTopicMessages(
+		PeerId peerId,
+		MTPInputPeer inputPeer,
+		int32 topicRootId,
+		FnMut<bool(int count)> start,
+		Fn<bool(DownloadProgress)> progress,
+		Fn<bool(Data::MessagesSlice&&)> slice,
+		FnMut<void()> done);
+
 	void finishExport(FnMut<void()> done);
 	void skipFile(uint64 randomId);
 	void cancelExportFast();
@@ -107,18 +127,22 @@ class ApiWrap {
 	struct ContactsProcess;
 	struct UserpicsProcess;
 	struct StoriesProcess;
+	struct ProfileMusicProcess;
 	struct OtherDataProcess;
 	struct FileProcess;
 	struct FileProgress;
 	struct ChatsProcess;
 	struct LeftChannelsProcess;
 	struct DialogsProcess;
+	struct AbstractMessagesProcess;
 	struct ChatProcess;
+	struct TopicProcess;
 
 	void startMainSession(FnMut<void()> done);
 	void sendNextStartRequest();
 	void requestUserpicsCount();
 	void requestStoriesCount();
+	void requestProfileMusicCount();
 	void requestSplitRanges();
 	void requestDialogsCount();
 	void requestLeftChannelsCount();
@@ -144,6 +168,16 @@ class ApiWrap {
 	void finishStoriesSlice();
 	void finishStories();
 
+	void handleProfileMusicSlice(const MTPusers_SavedMusic &result);
+	void loadProfileMusicFiles(Data::ProfileMusicSlice &&slice);
+	void loadNextProfileMusic();
+	bool loadProfileMusicProgress(FileProgress value);
+	void loadProfileMusicDone(const QString &relativePath);
+	bool loadProfileMusicThumbProgress(FileProgress value);
+	void loadProfileMusicThumbDone(const QString &relativePath);
+	void finishProfileMusicSlice();
+	void finishProfileMusic();
+
 	void otherDataDone(const QString &relativePath);
 
 	bool useOnlyLastSplit() const;
@@ -179,6 +213,12 @@ class ApiWrap {
 		int addOffset,
 		int limit,
 		FnMut<void(MTPmessages_Messages&&)> done);
+	void requestTopicMessagesSlice();
+	void requestTopicReplies(
+		int offsetId,
+		int addOffset,
+		int limit,
+		FnMut<void(MTPmessages_Messages&&)> done);
 	void collectMessagesCustomEmoji(const Data::MessagesSlice &slice);
 	void resolveCustomEmoji();
 	void loadMessagesFiles(Data::MessagesSlice &&slice);
@@ -194,6 +234,17 @@ class ApiWrap {
 	void finishMessagesSlice();
 	void finishMessages();
 
+	void loadTopicMessagesFiles(Data::MessagesSlice &&slice);
+	void resolveTopicCustomEmoji();
+	void loadNextTopicMessageFile();
+	bool loadTopicEmojiProgress(FileProgress progress);
+	void loadCustomEmojiDone(uint64 id, const QString &relativePath);
+	void loadTopicMessageFileOrThumbDone(
+		Data::File &file,
+		const QString &relativePath);
+	void finishTopicMessagesSlice();
+	void finishTopicMessages();
+
 	[[nodiscard]] Data::Message *currentFileMessage() const;
 	[[nodiscard]] Data::FileOrigin currentFileMessageOrigin() const;
 
@@ -256,11 +307,13 @@ class ApiWrap {
 	std::unique_ptr<ContactsProcess> _contactsProcess;
 	std::unique_ptr<UserpicsProcess> _userpicsProcess;
 	std::unique_ptr<StoriesProcess> _storiesProcess;
+	std::unique_ptr<ProfileMusicProcess> _profileMusicProcess;
 	std::unique_ptr<OtherDataProcess> _otherDataProcess;
 	std::unique_ptr<FileProcess> _fileProcess;
 	std::unique_ptr<LeftChannelsProcess> _leftChannelsProcess;
 	std::unique_ptr<DialogsProcess> _dialogsProcess;
 	std::unique_ptr<ChatProcess> _chatProcess;
+	std::unique_ptr<TopicProcess> _topicProcess;
 	base::flat_set<uint64> _unresolvedCustomEmoji;
 	base::flat_map<uint64, Data::Document> _resolvedCustomEmoji;
 	QVector<MTPMessageRange> _splits;
diff --git a/Telegram/SourceFiles/export/export_controller.cpp b/Telegram/SourceFiles/export/export_controller.cpp
index a6e12d28da000b..57abbbd7e9ff28 100644
--- a/Telegram/SourceFiles/export/export_controller.cpp
+++ b/Telegram/SourceFiles/export/export_controller.cpp
@@ -37,6 +37,13 @@ class ControllerObject {
 		crl::weak_on_queue<ControllerObject> weak,
 		QPointer<MTP::Instance> mtproto,
 		const MTPInputPeer &peer);
+	ControllerObject(
+		crl::weak_on_queue<ControllerObject> weak,
+		QPointer<MTP::Instance> mtproto,
+		const MTPInputPeer &peer,
+		int32 topicRootId,
+		uint64 peerId,
+		const QString &topicTitle);
 
 	rpl::producer<State> state() const;
 
@@ -76,11 +83,13 @@ class ControllerObject {
 	void exportPersonalInfo();
 	void exportUserpics();
 	void exportStories();
+	void exportProfileMusic();
 	void exportContacts();
 	void exportSessions();
 	void exportOtherData();
 	void exportDialogs();
 	void exportNextDialog();
+	void exportTopic();
 
 	template <typename Callback = const decltype(kNullStateCallback) &>
 	ProcessingState prepareState(
@@ -91,10 +100,12 @@ class ControllerObject {
 	ProcessingState statePersonalInfo() const;
 	ProcessingState stateUserpics(const DownloadProgress &progress) const;
 	ProcessingState stateStories(const DownloadProgress &progress) const;
+	ProcessingState stateProfileMusic(const DownloadProgress &progress) const;
 	ProcessingState stateContacts() const;
 	ProcessingState stateSessions() const;
 	ProcessingState stateOtherData() const;
 	ProcessingState stateDialogs(const DownloadProgress &progress) const;
+	ProcessingState stateTopic(const DownloadProgress &progress) const;
 	void fillMessagesState(
 		ProcessingState &result,
 		const Data::DialogsInfo &info,
@@ -119,6 +130,9 @@ class ControllerObject {
 	int _storiesWritten = 0;
 	int _storiesCount = 0;
 
+	int _profileMusicWritten = 0;
+	int _profileMusicCount = 0;
+
 	// rpl::variable<State> fails to compile in MSVC :(
 	State _state;
 	rpl::event_stream<State> _stateChanges;
@@ -134,6 +148,10 @@ class ControllerObject {
 	std::vector<Step> _steps;
 	int _stepIndex = -1;
 
+	int32 _topicRootId = 0;
+	uint64 _topicPeerId = 0;
+	QString _topicTitle;
+
 	rpl::lifetime _lifetime;
 
 };
@@ -145,12 +163,42 @@ ControllerObject::ControllerObject(
 : _api(mtproto, weak.runner())
 , _state(PasswordCheckState{}) {
 	_api.errors(
-	) | rpl::start_with_next([=](const MTP::Error &error) {
+	) | rpl::on_next([=](const MTP::Error &error) {
 		setState(ApiErrorState{ error });
 	}, _lifetime);
 
 	_api.ioErrors(
-	) | rpl::start_with_next([=](const Output::Result &result) {
+	) | rpl::on_next([=](const Output::Result &result) {
+		ioCatchError(result);
+	}, _lifetime);
+
+	//requestPasswordState();
+	auto state = PasswordCheckState();
+	state.checked = false;
+	state.requesting = false;
+	state.singlePeer = peer;
+	setState(std::move(state));
+}
+
+ControllerObject::ControllerObject(
+	crl::weak_on_queue<ControllerObject> weak,
+	QPointer<MTP::Instance> mtproto,
+	const MTPInputPeer &peer,
+	int32 topicRootId,
+	uint64 peerId,
+	const QString &topicTitle)
+: _api(mtproto, weak.runner())
+, _state(PasswordCheckState{})
+, _topicRootId(topicRootId)
+, _topicPeerId(peerId)
+, _topicTitle(topicTitle) {
+	_api.errors(
+	) | rpl::on_next([=](const MTP::Error &error) {
+		setState(ApiErrorState{ error });
+	}, _lifetime);
+
+	_api.ioErrors(
+	) | rpl::on_next([=](const Output::Result &result) {
 		ioCatchError(result);
 	}, _lifetime);
 
@@ -252,6 +300,8 @@ void ControllerObject::startExport(
 	}
 	_settings = NormalizeSettings(settings);
 	_environment = environment;
+	_settings.singleTopicRootId = _topicRootId;
+	_settings.singleTopicPeerId = _topicPeerId;
 
 	_settings.path = Output::NormalizePath(_settings);
 	_writer = Output::CreateWriter(_settings.format);
@@ -269,6 +319,10 @@ void ControllerObject::skipFile(uint64 randomId) {
 void ControllerObject::fillExportSteps() {
 	using Type = Settings::Type;
 	_steps.push_back(Step::Initializing);
+	if (_settings.onlySingleTopic()) {
+		_steps.push_back(Step::Topic);
+		return;
+	}
 	if (_settings.types & Type::AnyChatsMask) {
 		_steps.push_back(Step::DialogsList);
 	}
@@ -281,6 +335,9 @@ void ControllerObject::fillExportSteps() {
 	if (_settings.types & Type::Stories) {
 		_steps.push_back(Step::Stories);
 	}
+	if (_settings.types & Type::ProfileMusic) {
+		_steps.push_back(Step::ProfileMusic);
+	}
 	if (_settings.types & Type::Contacts) {
 		_steps.push_back(Step::Contacts);
 	}
@@ -317,6 +374,9 @@ void ControllerObject::fillSubstepsInSteps(const ApiWrap::StartInfo &info) {
 	if (_settings.types & Settings::Type::Stories) {
 		push(Step::Stories, 1);
 	}
+	if (_settings.types & Settings::Type::ProfileMusic) {
+		push(Step::ProfileMusic, 1);
+	}
 	if (_settings.types & Settings::Type::Contacts) {
 		push(Step::Contacts, 1);
 	}
@@ -329,6 +389,9 @@ void ControllerObject::fillSubstepsInSteps(const ApiWrap::StartInfo &info) {
 	if (_settings.types & Settings::Type::AnyChatsMask) {
 		push(Step::Dialogs, info.dialogsCount);
 	}
+	if (_settings.onlySingleTopic()) {
+		push(Step::Topic, 1);
+	}
 	_substepsInStep = std::move(result);
 	_substepsTotal = ranges::accumulate(_substepsInStep, 0);
 }
@@ -356,10 +419,12 @@ void ControllerObject::exportNext() {
 	case Step::PersonalInfo: return exportPersonalInfo();
 	case Step::Userpics: return exportUserpics();
 	case Step::Stories: return exportStories();
+	case Step::ProfileMusic: return exportProfileMusic();
 	case Step::Contacts: return exportContacts();
 	case Step::Sessions: return exportSessions();
 	case Step::OtherData: return exportOtherData();
 	case Step::Dialogs: return exportDialogs();
+	case Step::Topic: return exportTopic();
 	}
 	Unexpected("Step in ControllerObject::exportNext.");
 }
@@ -454,6 +519,32 @@ void ControllerObject::exportStories() {
 	});
 }
 
+void ControllerObject::exportProfileMusic() {
+	_api.requestProfileMusic([=](Data::ProfileMusicInfo &&start) {
+		if (ioCatchError(_writer->writeProfileMusicStart(start))) {
+			return false;
+		}
+		_profileMusicWritten = 0;
+		_profileMusicCount = start.count;
+		return true;
+	}, [=](DownloadProgress progress) {
+		setState(stateProfileMusic(progress));
+		return true;
+	}, [=](Data::ProfileMusicSlice &&slice) {
+		if (ioCatchError(_writer->writeProfileMusicSlice(slice))) {
+			return false;
+		}
+		_profileMusicWritten += slice.list.size();
+		setState(stateProfileMusic(DownloadProgress()));
+		return true;
+	}, [=] {
+		if (ioCatchError(_writer->writeProfileMusicEnd())) {
+			return;
+		}
+		exportNext();
+	});
+}
+
 void ControllerObject::exportContacts() {
 	setState(stateContacts());
 	_api.requestContacts([=](Data::ContactsList &&result) {
@@ -596,6 +687,21 @@ ProcessingState ControllerObject::stateStories(
 	});
 }
 
+ProcessingState ControllerObject::stateProfileMusic(
+		const DownloadProgress &progress) const {
+	return prepareState(Step::ProfileMusic, [&](ProcessingState &result) {
+		result.entityIndex = _profileMusicWritten + progress.itemIndex;
+		result.entityCount = std::max(_profileMusicCount, result.entityIndex);
+		result.bytesRandomId = progress.randomId;
+		if (!progress.path.isEmpty()) {
+			const auto last = progress.path.lastIndexOf('/');
+			result.bytesName = progress.path.mid(last + 1);
+		}
+		result.bytesLoaded = progress.ready;
+		result.bytesCount = progress.total;
+	});
+}
+
 ProcessingState ControllerObject::stateContacts() const {
 	return prepareState(Step::Contacts);
 }
@@ -655,6 +761,71 @@ int ControllerObject::substepsInStep(Step step) const {
 	return _substepsInStep[static_cast<int>(step)];
 }
 
+void ControllerObject::exportTopic() {
+	auto topicInfo = Data::DialogInfo();
+	topicInfo.type = Data::DialogInfo::Type::PublicSupergroup;
+	topicInfo.name = _topicTitle.toUtf8();
+	topicInfo.peerId = PeerId(_topicPeerId);
+	topicInfo.relativePath = QString();
+
+	if (ioCatchError(_writer->writeDialogStart(topicInfo))) {
+		return;
+	}
+
+	_api.requestTopicMessages(
+		PeerId(_topicPeerId),
+		_settings.singlePeer,
+		_topicRootId,
+		[=](int count) {
+			_messagesWritten = 0;
+			_messagesCount = count;
+			setState(stateTopic(DownloadProgress()));
+			return true;
+		},
+		[=](DownloadProgress progress) {
+			setState(stateTopic(progress));
+			return true;
+		},
+		[=](Data::MessagesSlice &&slice) {
+			if (ioCatchError(_writer->writeDialogSlice(slice))) {
+				return false;
+			}
+			_messagesWritten += slice.list.size();
+			setState(stateTopic(DownloadProgress()));
+			return true;
+		},
+		[=] {
+			if (ioCatchError(_writer->writeDialogEnd())) {
+				return;
+			}
+			if (ioCatchError(_writer->finish())) {
+				return;
+			}
+			_api.finishExport([=] {
+				setFinishedState();
+			});
+		});
+}
+
+ProcessingState ControllerObject::stateTopic(
+		const DownloadProgress &progress) const {
+	return prepareState(Step::Topic, [&](ProcessingState &result) {
+		result.entityType = ProcessingState::EntityType::Topic;
+		result.entityName = _topicTitle;
+		result.entityIndex = 0;
+		result.entityCount = 1;
+		result.itemIndex = _messagesWritten + progress.itemIndex;
+		result.itemCount = std::max(_messagesCount, result.itemIndex);
+		result.bytesRandomId = progress.randomId;
+		if (!progress.path.isEmpty()) {
+			const auto last = progress.path.lastIndexOf('/');
+			result.bytesName = progress.path.mid(last + 1);
+		}
+		result.bytesLoaded = progress.ready;
+		result.bytesCount = progress.total;
+	});
+}
+
 void ControllerObject::setFinishedState() {
 	setState(FinishedState{
 		_writer->mainFilePath(),
@@ -668,6 +839,20 @@ Controller::Controller(
 : _wrapped(std::move(mtproto), peer) {
 }
 
+Controller::Controller(
+	QPointer<MTP::Instance> mtproto,
+	const MTPInputPeer &peer,
+	int32 topicRootId,
+	uint64 peerId,
+	const QString &topicTitle)
+: _wrapped(
+	std::move(mtproto),
+	peer,
+	static_cast<int32>(topicRootId),
+	static_cast<uint64>(peerId),
+	topicTitle) {
+}
+
 rpl::producer<State> Controller::state() const {
 	return _wrapped.producer_on_main([=](const Implementation &unwrapped) {
 		return unwrapped.state();
diff --git a/Telegram/SourceFiles/export/export_controller.h b/Telegram/SourceFiles/export/export_controller.h
index b486a6d0940e7c..386c24f788e354 100644
--- a/Telegram/SourceFiles/export/export_controller.h
+++ b/Telegram/SourceFiles/export/export_controller.h
@@ -39,16 +39,19 @@ struct ProcessingState {
 		PersonalInfo,
 		Userpics,
 		Stories,
+		ProfileMusic,
 		Contacts,
 		Sessions,
 		OtherData,
 		Dialogs,
+		Topic,
 	};
 	enum class EntityType {
 		Chat,
 		SavedMessages,
 		RepliesMessages,
 		VerifyCodes,
+		Topic,
 		Other,
 	};
 
@@ -114,6 +117,12 @@ class Controller {
 	Controller(
 		QPointer<MTP::Instance> mtproto,
 		const MTPInputPeer &peer);
+	Controller(
+		QPointer<MTP::Instance> mtproto,
+		const MTPInputPeer &peer,
+		int32 topicRootId,
+		uint64 peerId,
+		const QString &topicTitle);
 
 	rpl::producer<State> state() const;
 
diff --git a/Telegram/SourceFiles/export/export_manager.cpp b/Telegram/SourceFiles/export/export_manager.cpp
index 7277adef3372f0..367e9d4bcefb0d 100644
--- a/Telegram/SourceFiles/export/export_manager.cpp
+++ b/Telegram/SourceFiles/export/export_manager.cpp
@@ -22,7 +22,24 @@ Manager::Manager() = default;
 Manager::~Manager() = default;
 
 void Manager::start(not_null<PeerData*> peer) {
-	start(&peer->session(), peer->input);
+	start(&peer->session(), peer->input());
+}
+
+void Manager::startTopic(
+		not_null<PeerData*> peer,
+		MsgId topicRootId,
+		const QString &topicTitle) {
+	if (_panel) {
+		_panel->activatePanel();
+		return;
+	}
+	_controller = std::make_unique<Controller>(
+		&peer->session().mtp(),
+		peer->input(),
+		int32(topicRootId.bare),
+		uint64(peer->id.value),
+		topicTitle);
+	setupPanel(&peer->session());
 }
 
 void Manager::start(
@@ -35,20 +52,24 @@ void Manager::start(
 	_controller = std::make_unique<Controller>(
 		&session->mtp(),
 		singlePeer);
+	setupPanel(session);
+}
+
+void Manager::setupPanel(not_null<Main::Session*> session) {
 	_panel = std::make_unique<View::PanelController>(
 		session,
 		_controller.get());
 	session->account().sessionChanges(
 	) | rpl::filter([=](Main::Session *value) {
 		return (value != session);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		stop();
 	}, _panel->lifetime());
 
 	_viewChanges.fire(_panel.get());
 
 	_panel->stopRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		LOG(("Export Info: Stop requested."));
 		stop();
 	}, _controller->lifetime());
diff --git a/Telegram/SourceFiles/export/export_manager.h b/Telegram/SourceFiles/export/export_manager.h
index 0d69a5747fdadf..0e54f6c14f8057 100644
--- a/Telegram/SourceFiles/export/export_manager.h
+++ b/Telegram/SourceFiles/export/export_manager.h
@@ -34,6 +34,10 @@ class Manager final {
 	void start(
 		not_null<Main::Session*> session,
 		const MTPInputPeer &singlePeer = MTP_inputPeerEmpty());
+	void startTopic(
+		not_null<PeerData*> peer,
+		MsgId topicRootId,
+		const QString &topicTitle);
 
 	[[nodiscard]] rpl::producer<View::PanelController*> currentView() const;
 	[[nodiscard]] bool inProgress() const;
@@ -42,6 +46,8 @@ class Manager final {
 	void stop();
 
 private:
+	void setupPanel(not_null<Main::Session*> session);
+
 	std::unique_ptr<Controller> _controller;
 	std::unique_ptr<View::PanelController> _panel;
 	rpl::event_stream<View::PanelController*> _viewChanges;
diff --git a/Telegram/SourceFiles/export/export_settings.h b/Telegram/SourceFiles/export/export_settings.h
index be2e1b782ab785..ae2e3238bccbe4 100644
--- a/Telegram/SourceFiles/export/export_settings.h
+++ b/Telegram/SourceFiles/export/export_settings.h
@@ -58,6 +58,7 @@ struct Settings {
 		PrivateChannels     = 0x200,
 		PublicChannels      = 0x400,
 		Stories             = 0x800,
+		ProfileMusic        = 0x1000,
 
 		GroupsMask          = PrivateGroups | PublicGroups,
 		ChannelsMask        = PrivateChannels | PublicChannels,
@@ -68,6 +69,7 @@ struct Settings {
 			| Userpics
 			| Contacts
 			| Stories
+			| ProfileMusic
 			| Sessions),
 		AllMask             = NonChatsMask | OtherData | AnyChatsMask,
 	};
@@ -86,17 +88,26 @@ struct Settings {
 	TimeId singlePeerFrom = 0;
 	TimeId singlePeerTill = 0;
 
+	int32 singleTopicRootId = 0;
+	uint64 singleTopicPeerId = 0;
+	QString singleTopicTitle;
+
 	TimeId availableAt = 0;
 
 	bool onlySinglePeer() const {
 		return singlePeer.type() != mtpc_inputPeerEmpty;
 	}
 
+	bool onlySingleTopic() const {
+		return onlySinglePeer() && singleTopicRootId != 0;
+	}
+
 	static inline Types DefaultTypes() {
 		return Type::PersonalInfo
 			| Type::Userpics
 			| Type::Contacts
 			| Type::Stories
+			| Type::ProfileMusic
 			| Type::PersonalChats
 			| Type::PrivateGroups;
 	}
diff --git a/Telegram/SourceFiles/export/output/export_output_abstract.cpp b/Telegram/SourceFiles/export/output/export_output_abstract.cpp
index dbdb1bf9992976..cadd6dbb3ca7a6 100644
--- a/Telegram/SourceFiles/export/output/export_output_abstract.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_abstract.cpp
@@ -408,7 +408,7 @@ Stats AbstractWriter::produceTestExample(
 		auto message = serviceMessage();
 		auto action = Data::ActionPhoneCall();
 		action.duration = counter();
-		action.discardReason = Data::ActionPhoneCall::DiscardReason::Busy;
+		action.state = Data::ActionPhoneCall::State::Busy;
 		message.action.content = action;
 		return message;
 	}());
diff --git a/Telegram/SourceFiles/export/output/export_output_abstract.h b/Telegram/SourceFiles/export/output/export_output_abstract.h
index 9ceef46ebdc071..611a4acace2ccc 100644
--- a/Telegram/SourceFiles/export/output/export_output_abstract.h
+++ b/Telegram/SourceFiles/export/output/export_output_abstract.h
@@ -16,6 +16,8 @@ struct UserpicsInfo;
 struct UserpicsSlice;
 struct StoriesInfo;
 struct StoriesSlice;
+struct ProfileMusicInfo;
+struct ProfileMusicSlice;
 struct ContactsList;
 struct SessionsList;
 struct DialogsInfo;
@@ -64,6 +66,12 @@ class AbstractWriter {
 		const Data::StoriesSlice &data) = 0;
 	[[nodiscard]] virtual Result writeStoriesEnd() = 0;
 
+	[[nodiscard]] virtual Result writeProfileMusicStart(
+		const Data::ProfileMusicInfo &data) = 0;
+	[[nodiscard]] virtual Result writeProfileMusicSlice(
+		const Data::ProfileMusicSlice &data) = 0;
+	[[nodiscard]] virtual Result writeProfileMusicEnd() = 0;
+
 	[[nodiscard]] virtual Result writeContactsList(
 		const Data::ContactsList &data) = 0;
 
diff --git a/Telegram/SourceFiles/export/output/export_output_html.cpp b/Telegram/SourceFiles/export/output/export_output_html.cpp
index 4bdb71eb366aec..34b97d2c94468e 100644
--- a/Telegram/SourceFiles/export/output/export_output_html.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_html.cpp
@@ -44,9 +44,10 @@ constexpr auto kContactsPriority = 2;
 constexpr auto kFrequentContactsPriority = 3;
 constexpr auto kUserpicsPriority = 4;
 constexpr auto kStoriesPriority = 5;
-constexpr auto kSessionsPriority = 6;
-constexpr auto kWebSessionsPriority = 7;
-constexpr auto kOtherPriority = 8;
+constexpr auto kProfileMusicPriority = 6;
+constexpr auto kSessionsPriority = 7;
+constexpr auto kWebSessionsPriority = 8;
+constexpr auto kOtherPriority = 9;
 
 const auto kLineBreak = QByteArrayLiteral("<br>");
 
@@ -538,6 +539,12 @@ class HtmlWriter::Wrap {
 		const std::vector<Data::TextPart> &caption,
 		const QString &internalLinksDomain,
 		const QString &link = QString());
+	[[nodiscard]] QByteArray pushAudioEntry(
+		const QByteArray &name,
+		const QByteArray &info,
+		const QByteArrayList &details,
+		const QByteArray &duration,
+		const QString &link = QString());
 	[[nodiscard]] QByteArray pushSessionListEntry(
 		int apiId,
 		const QByteArray &name,
@@ -621,7 +628,14 @@ class HtmlWriter::Wrap {
 	[[nodiscard]] QByteArray pushPhotoMedia(
 		const Data::Photo &data,
 		const QString &basePath);
-	[[nodiscard]] QByteArray pushPoll(const Data::Poll &data);
+	[[nodiscard]] QByteArray pushPoll(
+		const Data::Poll &data,
+		const QString &internalLinksDomain,
+		const QString &relativeLinkBase);
+	[[nodiscard]] QByteArray pushTodoList(
+		const Data::TodoList &data,
+		const QString &internalLinksDomain,
+		const QString &relativeLinkBase);
 	[[nodiscard]] QByteArray pushGiveaway(
 		const PeersMap &peers,
 		const Data::GiveawayStart &data);
@@ -870,6 +884,54 @@ QByteArray HtmlWriter::Wrap::pushStoriesListEntry(
 	return result;
 }
 
+QByteArray HtmlWriter::Wrap::pushAudioEntry(
+		const QByteArray &name,
+		const QByteArray &info,
+		const QByteArrayList &details,
+		const QByteArray &duration,
+		const QString &link) {
+	auto result = pushDiv("entry clearfix");
+	if (!link.isEmpty()) {
+		result.append(pushTag("a", {
+			{ "class", "pull_left userpic_wrap" },
+			{ "href", relativePath(link).toUtf8() + "#allow_back" },
+		}));
+	} else {
+		result.append(pushDiv("pull_left userpic_wrap"));
+	}
+	result.append(pushDiv("userpic audio_icon"));
+	result.append(popTag());
+	result.append(popTag());
+	result.append(pushDiv("body"));
+	if (!duration.isEmpty()) {
+		result.append(pushDiv("pull_right info details"));
+		result.append(SerializeString(duration));
+		result.append(popTag());
+	}
+	if (!info.isEmpty()) {
+		if (!link.isEmpty()) {
+			result.append(pushTag("a", {
+				{ "class", "block_link expanded" },
+				{ "href", relativePath(link).toUtf8() + "#allow_back" },
+			}));
+		}
+		result.append(pushDiv("name bold"));
+		result.append(SerializeString(info));
+		result.append(popTag());
+		if (!link.isEmpty()) {
+			result.append(popTag());
+		}
+	}
+	for (const auto &detail : details) {
+		result.append(pushDiv("details_entry details"));
+		result.append(SerializeString(detail));
+		result.append(popTag());
+	}
+	result.append(popTag());
+	result.append(popTag());
+	return result;
+}
+
 QByteArray HtmlWriter::Wrap::pushSessionListEntry(
 		int apiId,
 		const QByteArray &name,
@@ -1264,15 +1326,15 @@ auto HtmlWriter::Wrap::pushMessage(
 			+ SerializeString(data.text)
 			+ "&raquo; button to the bot";
 	}, [&](const ActionGiftPremium &data) {
-		if (!data.months || data.cost.isEmpty()) {
+		if (!data.days || data.cost.isEmpty()) {
 			return serviceFrom + " sent you a gift.";
 		}
 		return serviceFrom
 			+ " sent you a gift for "
 			+ data.cost
 			+ ": Telegram Premium for "
-			+ QString::number(data.months).toUtf8()
-			+ " months.";
+			+ QString::number(data.days).toUtf8()
+			+ " days.";
 	}, [&](const ActionTopicCreate &data) {
 		return serviceFrom
 			+ " created topic &laquo;"
@@ -1305,17 +1367,17 @@ auto HtmlWriter::Wrap::pushMessage(
 	}, [&](const ActionGiftCode &data) {
 		return data.unclaimed
 			? ("This is an unclaimed Telegram Premium for "
-				+ NumberToString(data.months)
-				+ (data.months > 1 ? " months" : "month")
+				+ NumberToString(data.days)
+				+ (data.days > 1 ? " days" : " day")
 				+ " prize in a giveaway organized by a channel.")
 			: data.viaGiveaway
 			? ("You won a Telegram Premium for "
-				+ NumberToString(data.months)
-				+ (data.months > 1 ? " months" : "month")
+				+ NumberToString(data.days)
+				+ (data.days > 1 ? " days" : " day")
 				+ " prize in a giveaway organized by a channel.")
 			: ("You've received a Telegram Premium for "
-				+ NumberToString(data.months)
-				+ (data.months > 1 ? " months" : "month")
+				+ NumberToString(data.days)
+				+ (data.days > 1 ? " days" : " day")
 				+ " gift from a channel.");
 	}, [&](const ActionGiveawayLaunch &data) {
 		return serviceFrom + " just started a giveaway "
@@ -1346,16 +1408,16 @@ auto HtmlWriter::Wrap::pushMessage(
 			+ " refunded back "
 			+ amount;
 		return result;
-	}, [&](const ActionGiftStars &data) {
-		if (!data.credits || data.cost.isEmpty()) {
+	}, [&](const ActionGiftCredits &data) {
+		if (!data.amount || data.cost.isEmpty()) {
 			return serviceFrom + " sent you a gift.";
 		}
 		return serviceFrom
 			+ " sent you a gift for "
 			+ data.cost
 			+ ": "
-			+ QString::number(data.credits).toUtf8()
-			+ " Telegram Stars.";
+			+ QString::number(data.amount.value()).toUtf8()
+			+ (data.amount.ton() ? " TON." : " Telegram Stars.");
 	}, [&](const ActionPrizeStars &data) {
 		return "You won a prize in a giveaway organized by "
 			+ peers.wrapPeerName(data.peerId)
@@ -1367,6 +1429,160 @@ auto HtmlWriter::Wrap::pushMessage(
 			+ " sent you a gift of "
 			+ QByteArray::number(data.stars)
 			+ " Telegram Stars.";
+	}, [&](const ActionPaidMessagesRefunded &data) {
+		auto result = message.out
+			? ("You refunded "
+				+ QString::number(data.stars).toUtf8()
+				+ " Stars for "
+				+ QString::number(data.messages).toUtf8()
+				+ " messages to "
+				+ peers.wrapPeerName(dialog.peerId))
+			: (peers.wrapPeerName(dialog.peerId)
+				+ " refunded "
+				+ QString::number(data.stars).toUtf8()
+				+ " Stars for "
+				+ QString::number(data.messages).toUtf8()
+				+ " messages to you");
+		return result;
+	}, [&](const ActionPaidMessagesPrice &data) {
+		if (isChannel) {
+			auto result = !data.broadcastAllowed
+				? "Direct messages were disabled."
+				: ("Price per direct message changed to "
+					+ QString::number(data.stars).toUtf8()
+					+ " Telegram Stars.");
+			return result;
+		}
+		auto result = "Price per message changed to "
+			+ QString::number(data.stars).toUtf8()
+			+ " Telegram Stars.";
+		return result;
+	}, [&](const ActionTodoCompletions &data) {
+		auto completed = QByteArrayList();
+		for (const auto index : data.completed) {
+			completed.push_back(QByteArray::number(index));
+		}
+		auto incompleted = QByteArrayList();
+		for (const auto index : data.incompleted) {
+			incompleted.push_back(QByteArray::number(index));
+		}
+		const auto list = [](const QByteArrayList &v) {
+			return v.isEmpty()
+				? QByteArray()
+				: (v.size() > 1)
+				? (v.mid(0, v.size() - 1).join(", ") + " and " + v.back())
+				: v.front();
+		};
+		if (completed.isEmpty() && !incompleted.isEmpty()) {
+			return serviceFrom
+				+ " marked "
+				+ list(incompleted)
+				+ " as not done yet in "
+				+ wrapReplyToLink("this todo list") + ".";
+		} else if (!completed.isEmpty() && incompleted.isEmpty()) {
+			return serviceFrom
+				+ " marked "
+				+ list(completed)
+				+ " as done in "
+				+ wrapReplyToLink("this todo list") + ".";
+		}
+		return serviceFrom
+			+ " marked "
+			+ list(completed)
+			+ " as done and "
+			+ list(incompleted)
+			+ " as not done yet in "
+			+ wrapReplyToLink("this todo list") + ".";
+	}, [&](const ActionTodoAppendTasks &data) {
+		auto tasks = QByteArrayList();
+		for (const auto &task : data.items) {
+			tasks.push_back("&quot;"
+				+ FormatText(task.text, internalLinksDomain, _base)
+				+ "&quot;");
+		}
+		return serviceFrom + " added tasks: " + tasks.join(", ");
+	}, [&](const ActionPollAppendAnswer &data) {
+		return serviceFrom + " added &quot;"
+			+ data.option
+			+ "&quot; to the poll.";
+	}, [&](const ActionPollDeleteAnswer &data) {
+		return serviceFrom + " removed &quot;"
+			+ data.option
+			+ "&quot; from the poll.";
+	}, [&](const ActionSuggestedPostApproval &data) {
+		return serviceFrom
+			+ (data.rejected ? " rejected " : " approved ")
+			+ "your suggested post"
+			+ (data.price
+				? (", for "
+					+ QString::number(data.price.value()).toUtf8()
+					+ (data.price.ton() ? " TON" : " stars"))
+				: "")
+			+ (data.scheduleDate
+				? (", "
+					+ FormatDateText(data.scheduleDate)
+					+ " at "
+					+ FormatTimeText(data.scheduleDate))
+				: "")
+			+ (data.rejectComment.isEmpty()
+				? "."
+				: (", with comment: &quot;"
+					+ SerializeString(data.rejectComment)
+					+ "&quot;"));
+	}, [&](const ActionSuggestedPostSuccess &data) {
+		return "The paid post was shown for 24 hours and "
+			+ QString::number(data.price.value()).toUtf8()
+			+ (data.price.ton() ? " TON" : " stars")
+			+ " were transferred to the channel.";
+	}, [&](const ActionSuggestedPostRefund &data) {
+		return QByteArray() + (data.payerInitiated
+			? "The user refunded the payment, post was deleted."
+			: "The admin deleted the post early, the payment was refunded.");
+	}, [&](const ActionSuggestBirthday &data) {
+		return serviceFrom
+			+ " suggests to add a date of birth: "
+			+ QByteArray::number(data.birthday.day())
+			+ [&] {
+				switch (data.birthday.month()) {
+				case 1: return " January";
+				case 2: return " February";
+				case 3: return " March";
+				case 4: return " April";
+				case 5: return " May";
+				case 6: return " June";
+				case 7: return " July";
+				case 8: return " August";
+				case 9: return " September";
+				case 10: return " October";
+				case 11: return " November";
+				case 12: return " December";
+				}
+				return "";
+			}() + (data.birthday.year()
+				? (' ' + QByteArray::number(data.birthday.year()))
+				: QByteArray());
+	}, [&](const ActionNoForwardsToggle &data) {
+		return serviceFrom
+			+ (data.newValue
+				? " disabled sharing in this chat"
+				: " enabled sharing in this chat");
+	}, [&](const ActionNoForwardsRequest &data) {
+		return serviceFrom
+			+ " requested to enable sharing in this chat";
+	}, [&](const ActionNewCreatorPending &data) {
+		return peers.wrapUserName(data.newCreatorId)
+			+ " will become the new main admin in 7 days if "
+			+ serviceFrom
+			+ " does not return";
+	}, [&](const ActionChangeCreator &data) {
+		return serviceFrom
+			+ " made "
+			+ peers.wrapUserName(data.newCreatorId)
+			+ " the new main admin of the group";
+	}, [&](const ActionManagedBotCreated &data) {
+		return serviceFrom
+			+ " created a bot "
+			+ peers.wrapUserName(data.botId);
 	}, [](v::null_t) { return QByteArray(); });
 
 	if (!serviceText.isEmpty()) {
@@ -1549,6 +1765,7 @@ auto HtmlWriter::Wrap::pushMessage(
 			block.append(popTag());
 		}
 		block.append(popTag());
+		block.append(popTag());
 	}
 	if (!message.signature.isEmpty()) {
 		block.append(pushDiv("signature details"));
@@ -1559,7 +1776,9 @@ auto HtmlWriter::Wrap::pushMessage(
 		block.append(popTag());
 	}
 	if (!message.reactions.empty()) {
-		block.append(pushDiv("reactions"));
+		block.append(pushTag("span", {
+			{ "class", "reactions" },
+		}));
 		for (const auto &reaction : message.reactions) {
 			auto reactionClass = QByteArray("reaction");
 			for (const auto &recent : reaction.recent) {
@@ -1573,10 +1792,10 @@ auto HtmlWriter::Wrap::pushMessage(
 				reactionClass += " paid";
 			}
 
-			block.append(pushTag("div", {
+			block.append(pushTag("span", {
 				{ "class", reactionClass },
 			}));
-			block.append(pushTag("div", {
+			block.append(pushTag("span", {
 				{ "class", "emoji" },
 			}));
 			switch (reaction.type) {
@@ -1595,7 +1814,7 @@ auto HtmlWriter::Wrap::pushMessage(
 			}
 			block.append(popTag());
 			if (!reaction.recent.empty()) {
-				block.append(pushTag("div", {
+				block.append(pushTag("span", {
 					{ "class", "userpics" },
 				}));
 				for (const auto &recent : reaction.recent) {
@@ -1616,7 +1835,7 @@ auto HtmlWriter::Wrap::pushMessage(
 			}
 			if (reaction.recent.empty()
 				|| (reaction.count > reaction.recent.size())) {
-				block.append(pushTag("div", {
+				block.append(pushTag("span", {
 					{ "class", "count" },
 				}));
 				block.append(NumberToString(reaction.count));
@@ -1690,7 +1909,9 @@ QByteArray HtmlWriter::Wrap::pushMedia(
 		Assert(!message.media.ttl);
 		return pushPhotoMedia(*photo, basePath);
 	} else if (const auto poll = std::get_if<Poll>(&content)) {
-		return pushPoll(*poll);
+		return pushPoll(*poll, internalLinksDomain, _base);
+	} else if (const auto todo = std::get_if<TodoList>(&content)) {
+		return pushTodoList(*todo, internalLinksDomain, _base);
 	} else if (const auto giveaway = std::get_if<GiveawayStart>(&content)) {
 		return pushGiveaway(peers, *giveaway);
 	} else if (const auto giveaway = std::get_if<GiveawayResults>(&content)) {
@@ -1968,13 +2189,19 @@ QByteArray HtmlWriter::Wrap::pushPhotoMedia(
 	return result;
 }
 
-QByteArray HtmlWriter::Wrap::pushPoll(const Data::Poll &data) {
+QByteArray HtmlWriter::Wrap::pushPoll(
+		const Data::Poll &data,
+		const QString &internalLinksDomain,
+		const QString &relativeLinkBase) {
 	using namespace Data;
 
 	auto result = pushDiv("media_wrap clearfix");
 	result.append(pushDiv("media_poll"));
 	result.append(pushDiv("question bold"));
-	result.append(SerializeString(data.question));
+	result.append(FormatText(
+		data.question,
+		internalLinksDomain,
+		relativeLinkBase));
 	result.append(popTag());
 	result.append(pushDiv("details"));
 	if (data.closed) {
@@ -2005,7 +2232,9 @@ QByteArray HtmlWriter::Wrap::pushPoll(const Data::Poll &data) {
 	};
 	for (const auto &answer : data.answers) {
 		result.append(pushDiv("answer"));
-		result.append("- " + SerializeString(answer.text) + details(answer));
+		result.append("- "
+			+ FormatText(answer.text, internalLinksDomain, relativeLinkBase)
+			+ details(answer));
 		result.append(popTag());
 	}
 	result.append(pushDiv("total details	"));
@@ -2016,6 +2245,38 @@ QByteArray HtmlWriter::Wrap::pushPoll(const Data::Poll &data) {
 	return result;
 }
 
+QByteArray HtmlWriter::Wrap::pushTodoList(
+		const Data::TodoList &data,
+		const QString &internalLinksDomain,
+		const QString &relativeLinkBase) {
+	using namespace Data;
+
+	auto result = pushDiv("media_wrap clearfix");
+	result.append(pushDiv("media_poll"));
+	result.append(pushDiv("question bold"));
+	result.append(FormatText(
+		data.title,
+		internalLinksDomain,
+		relativeLinkBase));
+	result.append(popTag());
+	result.append(pushDiv("details"));
+	result.append(SerializeString("To-do List"));
+	result.append(popTag());
+	const auto details = [&](const TodoListItem &item) {
+		return QByteArray(""); // #TODO todo
+	};
+	for (const auto &item : data.items) {
+		result.append(pushDiv("answer"));
+		result.append("- "
+			+ FormatText(item.text, internalLinksDomain, relativeLinkBase)
+			+ details(item));
+		result.append(popTag());
+	}
+	result.append(popTag());
+	result.append(popTag());
+	return result;
+}
+
 QByteArray HtmlWriter::Wrap::pushGiveaway(
 		const PeersMap &peers,
 		const Data::GiveawayStart &data) {
@@ -2253,16 +2514,20 @@ MediaData HtmlWriter::Wrap::prepareMediaData(
 	if (const auto call = std::get_if<ActionPhoneCall>(&action.content)) {
 		result.classes = "media_call";
 		result.title = peers.peer(message.out
-				? message.peerId
-				: message.selfId).name();
+			? message.peerId
+			: message.selfId).name();
 		result.status = [&] {
-			using Reason = ActionPhoneCall::DiscardReason;
-			const auto reason = call->discardReason;
-			if (message.out) {
-				return reason == Reason::Missed ? "Cancelled" : "Outgoing";
-			} else if (reason == Reason::Missed) {
+			using State = ActionPhoneCall::State;
+			const auto state = call->state;
+			if (state == State::Invitation) {
+				return "Invitation";
+			} else if (state == State::Active) {
+				return "Ongoing";
+			} else if (message.out) {
+				return (state == State::Missed) ? "Cancelled" : "Outgoing";
+			} else if (state == State::Missed) {
 				return "Missed";
-			} else if (reason == Reason::Busy) {
+			} else if (state == State::Busy) {
 				return "Declined";
 			}
 			return "Incoming";
@@ -2320,10 +2585,12 @@ MediaData HtmlWriter::Wrap::prepareMediaData(
 		} else if (data.isVideoFile) {
 			// At least try to pushVideoFileMedia.
 		} else if (data.isAudioFile) {
-			result.title = (data.songPerformer.isEmpty()
-				|| data.songTitle.isEmpty())
-				? QByteArray("Audio file")
-				: data.songPerformer + " \xe2\x80\x93 " + data.songTitle;
+			result.title = (!data.songPerformer.isEmpty()
+				&& !data.songTitle.isEmpty())
+				? (data.songPerformer + " \xe2\x80\x93 " + data.songTitle)
+				: !data.name.isEmpty()
+				? data.name
+				: QByteArray("Audio file");
 			result.status = FormatDuration(data.duration);
 			if (!hasFile) {
 				result.status += ", " + FormatFileSize(data.file.size);
@@ -2399,6 +2666,7 @@ MediaData HtmlWriter::Wrap::prepareMediaData(
 		result.description = data.description;
 		result.status = Data::FormatMoneyAmount(data.amount, data.currency);
 	}, [](const Poll &data) {
+	}, [](const TodoList &data) {
 	}, [](const GiveawayStart &data) {
 	}, [](const GiveawayResults &data) {
 	}, [&](const PaidMedia &data) {
@@ -2523,6 +2791,7 @@ Result HtmlWriter::start(
 		"images/section_chats.png",
 		"images/section_contacts.png",
 		"images/section_frequent.png",
+		"images/section_music.png",
 		"images/section_other.png",
 		"images/section_photos.png",
 		"images/section_sessions.png",
@@ -2818,6 +3087,93 @@ Result HtmlWriter::writeStoriesEnd() {
 	return Result::Success();
 }
 
+Result HtmlWriter::writeProfileMusicStart(const Data::ProfileMusicInfo &data) {
+	Expects(_summary != nullptr);
+	Expects(_profileMusic == nullptr);
+
+	_profileMusicCount = data.count;
+	if (!_profileMusicCount) {
+		return Result::Success();
+	}
+	_profileMusic = fileWithRelativePath(profileMusicFilePath());
+
+	auto block = _profileMusic->pushHeader(
+		"Profile Music",
+		mainFileRelativePath());
+	block.append(_profileMusic->pushDiv("page_body list_page"));
+	block.append(_profileMusic->pushDiv("entry_list"));
+	if (const auto result = _profileMusic->writeBlock(block); !result) {
+		return result;
+	}
+	return Result::Success();
+}
+
+Result HtmlWriter::writeProfileMusicSlice(const Data::ProfileMusicSlice &data) {
+	Expects(_profileMusic != nullptr);
+
+	_profileMusicCount -= data.skipped;
+	if (data.list.empty()) {
+		return Result::Success();
+	}
+	auto block = QByteArray();
+	for (const auto &message : data.list) {
+		if (!v::is<Data::Document>(message.media.content)) {
+			continue;
+		}
+		const auto &doc = v::get<Data::Document>(message.media.content);
+		if (!doc.isAudioFile) {
+			continue;
+		}
+		using SkipReason = Data::File::SkipReason;
+		const auto &file = doc.file;
+		Assert(!file.relativePath.isEmpty()
+			|| file.skipReason != SkipReason::None);
+		auto status = QByteArrayList();
+		status.append([&]() -> Data::Utf8String {
+			switch (file.skipReason) {
+			case SkipReason::Unavailable:
+				return "(File unavailable, please try again later)";
+			case SkipReason::FileSize:
+				return "(File exceeds maximum size. "
+					"Change data exporting settings to download.)";
+			case SkipReason::FileType:
+				return "(File not included. "
+					"Change data exporting settings to download.)";
+			case SkipReason::None: return Data::FormatFileSize(file.size);
+			}
+			Unexpected("Skip reason while writing profile music path.");
+		}());
+		const auto &path = file.relativePath;
+		const auto title = !doc.songTitle.isEmpty()
+			? doc.songTitle
+			: !doc.name.isEmpty()
+			? doc.name
+			: Data::Utf8String("Unknown Track");
+		const auto performer = !doc.songPerformer.isEmpty()
+			? doc.songPerformer
+			: Data::Utf8String("Unknown Artist");
+		const auto info = performer + " - " + title;
+		const auto duration = doc.duration > 0
+			? Data::FormatDuration(doc.duration)
+			: QByteArray();
+		block.append(_profileMusic->pushAudioEntry(
+			(path.isEmpty() ? QString("File unavailable") : path).toUtf8(),
+			info,
+			status,
+			duration,
+			path));
+	}
+	return _profileMusic->writeBlock(block);
+}
+
+Result HtmlWriter::writeProfileMusicEnd() {
+	pushProfileMusicSection();
+	if (_profileMusic) {
+		return base::take(_profileMusic)->close();
+	}
+	return Result::Success();
+}
+
 QString HtmlWriter::storiesFilePath() const {
 	return "lists/stories.html";
 }
@@ -2831,6 +3187,19 @@ void HtmlWriter::pushStoriesSection() {
 		storiesFilePath());
 }
 
+QString HtmlWriter::profileMusicFilePath() const {
+	return "lists/profile_music.html";
+}
+
+void HtmlWriter::pushProfileMusicSection() {
+	pushSection(
+		kProfileMusicPriority,
+		"Profile Music",
+		"music",
+		_profileMusicCount,
+		profileMusicFilePath());
+}
+
 Result HtmlWriter::writeContactsList(const Data::ContactsList &data) {
 	Expects(_summary != nullptr);
 
diff --git a/Telegram/SourceFiles/export/output/export_output_html.h b/Telegram/SourceFiles/export/output/export_output_html.h
index 27d68a54a70c0f..2ecc9aaab50eb4 100644
--- a/Telegram/SourceFiles/export/output/export_output_html.h
+++ b/Telegram/SourceFiles/export/output/export_output_html.h
@@ -64,6 +64,10 @@ class HtmlWriter : public AbstractWriter {
 	Result writeStoriesSlice(const Data::StoriesSlice &data) override;
 	Result writeStoriesEnd() override;
 
+	Result writeProfileMusicStart(const Data::ProfileMusicInfo &data) override;
+	Result writeProfileMusicSlice(const Data::ProfileMusicSlice &data) override;
+	Result writeProfileMusicEnd() override;
+
 	Result writeContactsList(const Data::ContactsList &data) override;
 
 	Result writeSessionsList(const Data::SessionsList &data) override;
@@ -131,9 +135,11 @@ class HtmlWriter : public AbstractWriter {
 		const QString &userpicPath);
 	void pushUserpicsSection();
 	void pushStoriesSection();
+	void pushProfileMusicSection();
 
 	[[nodiscard]] QString userpicsFilePath() const;
 	[[nodiscard]] QString storiesFilePath() const;
+	[[nodiscard]] QString profileMusicFilePath() const;
 
 	[[nodiscard]] QByteArray wrapMessageLink(
 		int messageId,
@@ -159,6 +165,9 @@ class HtmlWriter : public AbstractWriter {
 	int _storiesCount = 0;
 	std::unique_ptr<Wrap> _stories;
 
+	int _profileMusicCount = 0;
+	std::unique_ptr<Wrap> _profileMusic;
+
 	QString _dialogsRelativePath;
 	Data::DialogInfo _dialog;
 	DialogsMode _dialogsMode = DialogsMode::None;
diff --git a/Telegram/SourceFiles/export/output/export_output_html_and_json.cpp b/Telegram/SourceFiles/export/output/export_output_html_and_json.cpp
index 9220147ea85308..98b6af8c98c7e2 100644
--- a/Telegram/SourceFiles/export/output/export_output_html_and_json.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_html_and_json.cpp
@@ -73,6 +73,24 @@ Result HtmlAndJsonWriter::writeStoriesEnd() {
 	});
 }
 
+Result HtmlAndJsonWriter::writeProfileMusicStart(const Data::ProfileMusicInfo &data) {
+	return invoke([&](WriterPtr w) {
+		return w->writeProfileMusicStart(data);
+	});
+}
+
+Result HtmlAndJsonWriter::writeProfileMusicSlice(const Data::ProfileMusicSlice &data) {
+	return invoke([&](WriterPtr w) {
+		return w->writeProfileMusicSlice(data);
+	});
+}
+
+Result HtmlAndJsonWriter::writeProfileMusicEnd() {
+	return invoke([&](WriterPtr w) {
+		return w->writeProfileMusicEnd();
+	});
+}
+
 Result HtmlAndJsonWriter::writeContactsList(const Data::ContactsList &data) {
 	return invoke([&](WriterPtr w) {
 		return w->writeContactsList(data);
diff --git a/Telegram/SourceFiles/export/output/export_output_html_and_json.h b/Telegram/SourceFiles/export/output/export_output_html_and_json.h
index 2a40833a8c11f1..e3071a8c14cf89 100644
--- a/Telegram/SourceFiles/export/output/export_output_html_and_json.h
+++ b/Telegram/SourceFiles/export/output/export_output_html_and_json.h
@@ -36,6 +36,10 @@ class HtmlAndJsonWriter final : public AbstractWriter {
 	Result writeStoriesSlice(const Data::StoriesSlice &data) override;
 	Result writeStoriesEnd() override;
 
+	Result writeProfileMusicStart(const Data::ProfileMusicInfo &data) override;
+	Result writeProfileMusicSlice(const Data::ProfileMusicSlice &data) override;
+	Result writeProfileMusicEnd() override;
+
 	Result writeContactsList(const Data::ContactsList &data) override;
 
 	Result writeSessionsList(const Data::SessionsList &data) override;
diff --git a/Telegram/SourceFiles/export/output/export_output_json.cpp b/Telegram/SourceFiles/export/output/export_output_json.cpp
index 14fe04b343582b..ec6fc54cb2a320 100644
--- a/Telegram/SourceFiles/export/output/export_output_json.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_json.cpp
@@ -385,11 +385,17 @@ QByteArray SerializeMessage(
 	};
 	const auto pushPhoto = [&](const Image &image) {
 		pushPath(image.file, "photo");
+		push("photo_file_size", image.file.size);
 		if (image.width && image.height) {
 			push("width", image.width);
 			push("height", image.height);
 		}
 	};
+	const auto pushSpoiler = [&](const auto &media) {
+		if (media.spoilered) {
+			push("media_spoiler", true);
+		}
+	};
 
 	v::match(message.action.content, [&](const ActionChatCreate &data) {
 		pushActor();
@@ -404,6 +410,7 @@ QByteArray SerializeMessage(
 		pushActor();
 		pushAction("edit_group_photo");
 		pushPhoto(data.photo.image);
+		pushSpoiler(data.photo);
 	}, [&](const ActionChatDeletePhoto &data) {
 		pushActor();
 		pushAction("delete_group_photo");
@@ -454,20 +461,27 @@ QByteArray SerializeMessage(
 		}
 	}, [&](const ActionPhoneCall &data) {
 		pushActor();
-		pushAction("phone_call");
+		pushAction(data.conferenceId ? "conference_call" : "phone_call");
 		if (data.duration) {
 			push("duration_seconds", data.duration);
 		}
-		using Reason = ActionPhoneCall::DiscardReason;
-		push("discard_reason", [&] {
-			switch (data.discardReason) {
-			case Reason::Busy: return "busy";
-			case Reason::Disconnect: return "disconnect";
-			case Reason::Hangup: return "hangup";
-			case Reason::Missed: return "missed";
-			}
-			return "";
-		}());
+		using State = ActionPhoneCall::State;
+		if (data.conferenceId) {
+			push("is_active", data.state == State::Active);
+			push("is_missed", data.state == State::Missed);
+		} else {
+			push("discard_reason", [&] {
+				switch (data.state) {
+				case State::Busy: return "busy";
+				case State::Disconnect: return "disconnect";
+				case State::Hangup: return "hangup";
+				case State::Missed: return "missed";
+				case State::MigrateConferenceCall:
+					return "migrate_conference_all";
+				}
+				return "";
+			}());
+		}
 	}, [&](const ActionScreenshotTaken &data) {
 		pushActor();
 		pushAction("take_screenshot");
@@ -567,8 +581,8 @@ QByteArray SerializeMessage(
 		if (!data.cost.isEmpty()) {
 			push("cost", data.cost);
 		}
-		if (data.months) {
-			push("months", data.months);
+		if (data.days) {
+			push("days", data.days);
 		}
 	}, [&](const ActionTopicCreate &data) {
 		pushActor();
@@ -587,6 +601,7 @@ QByteArray SerializeMessage(
 		pushActor();
 		pushAction("suggest_profile_photo");
 		pushPhoto(data.photo.image);
+		pushSpoiler(data.photo);
 	}, [&](const ActionRequestedPeer &data) {
 		pushActor();
 		pushAction("requested_peer");
@@ -602,7 +617,7 @@ QByteArray SerializeMessage(
 		if (data.boostPeerId) {
 			push("boost_peer_id", data.boostPeerId);
 		}
-		push("months", data.months);
+		push("days", data.days);
 		push("unclaimed", data.unclaimed);
 		push("via_giveaway", data.viaGiveaway);
 	}, [&](const ActionGiveawayLaunch &data) {
@@ -629,14 +644,17 @@ QByteArray SerializeMessage(
 		pushBare("peer_name", wrapPeerName(data.peerId));
 		push("peer_id", data.peerId);
 		push("charge_id", data.transactionId);
-	}, [&](const ActionGiftStars &data) {
+	}, [&](const ActionGiftCredits &data) {
 		pushActor();
-		pushAction("send_stars_gift");
+		pushAction(data.amount.ton()
+			? "send_ton_gift"
+			: "send_stars_gift");
 		if (!data.cost.isEmpty()) {
 			push("cost", data.cost);
 		}
-		if (data.credits) {
-			push("stars", data.credits);
+		if (data.amount) {
+			push("amount_whole", data.amount.whole());
+			push("amount_nano", data.amount.nano());
 		}
 	}, [&](const ActionPrizeStars &data) {
 		pushActor();
@@ -654,7 +672,106 @@ QByteArray SerializeMessage(
 		push("stars", data.stars);
 		push("is_limited", data.limited);
 		push("is_anonymous", data.anonymous);
-		pushBare("text", SerializeText(context, data.text));
+		pushBare("gift_text", SerializeText(context, data.text));
+	}, [&](const ActionPaidMessagesRefunded &data) {
+		pushActor();
+		pushAction("paid_messages_refund");
+		push("messages_count", data.messages);
+		push("stars_count", data.stars);
+	}, [&](const ActionPaidMessagesPrice &data) {
+		pushActor();
+		pushAction("paid_messages_price_change");
+		push("price_stars", data.stars);
+		push("is_broadcast_messages_allowed", data.broadcastAllowed);
+	}, [&](const ActionTodoCompletions &data) {
+		pushActor();
+		pushAction("todo_completions");
+		auto completed = QByteArrayList();
+		for (const auto index : data.completed) {
+			completed.push_back(QByteArray::number(index));
+		}
+		auto incompleted = QByteArrayList();
+		for (const auto index : data.incompleted) {
+			incompleted.push_back(QByteArray::number(index));
+		}
+		pushBare("completed", '[' + completed.join(',') + ']');
+		pushBare("incompleted", '[' + incompleted.join(',') + ']');
+	}, [&](const ActionTodoAppendTasks &data) {
+		pushActor();
+		pushAction("todo_append_tasks");
+		const auto items = ranges::views::all(
+			data.items
+		) | ranges::views::transform([&](const TodoListItem &item) {
+			context.nesting.push_back(Context::kArray);
+			auto result = SerializeObject(context, {
+				{ "text", SerializeText(context, item.text) },
+				{ "id", NumberToString(item.id) },
+			});
+			context.nesting.pop_back();
+			return result;
+		}) | ranges::to_vector;
+		pushBare("items", SerializeArray(context, items));
+	}, [&](const ActionPollAppendAnswer &data) {
+		pushActor();
+		pushAction("poll_append_answer");
+		push("option", data.option);
+	}, [&](const ActionPollDeleteAnswer &data) {
+		pushActor();
+		pushAction("poll_delete_answer");
+		push("option", data.option);
+	}, [&](const ActionSuggestedPostApproval &data) {
+		pushActor();
+		pushAction("process_suggested_post");
+		if (data.rejected) {
+			pushBare("rejected", "true");
+			if (!data.rejectComment.isEmpty()) {
+				push("comment", data.rejectComment);
+			}
+		} else {
+			push("price_amount_whole", NumberToString(data.price.whole()));
+			push("price_amount_nano", NumberToString(data.price.nano()));
+			push("price_currency", data.price.ton() ? "TON" : "Stars");
+			push("scheduled_date", data.scheduleDate);
+		}
+	}, [&](const ActionSuggestedPostSuccess &data) {
+		pushActor();
+		pushAction("suggested_post_success");
+		push("price_amount_whole", NumberToString(data.price.whole()));
+		push("price_amount_nano", NumberToString(data.price.nano()));
+		push("price_currency", data.price.ton() ? "TON" : "Stars");
+	}, [&](const ActionSuggestedPostRefund &data) {
+		pushActor();
+		pushAction("suggested_post_refund");
+		push("user_initiated", data.payerInitiated);
+	}, [&](const ActionSuggestBirthday &data) {
+		pushActor();
+		pushAction("suggest_birthday");
+		push("day", data.birthday.day());
+		push("month", data.birthday.month());
+		if (const auto year = data.birthday.year()) {
+			push("year", year);
+		}
+	}, [&](const ActionNoForwardsToggle &data) {
+		pushActor();
+		pushAction("no_forwards_toggle");
+		push("new_value", data.newValue);
+	}, [&](const ActionNoForwardsRequest &data) {
+		pushActor();
+		pushAction("no_forwards_request");
+		push("expired", data.expired);
+		push("new_value", data.newValue);
+	}, [&](const ActionNewCreatorPending &data) {
+		pushActor();
+		pushAction("new_creator_pending");
+		pushBare("new_creator", wrapUserName(data.newCreatorId));
+	}, [&](const ActionChangeCreator &data) {
+		pushActor();
+		pushAction("change_creator");
+		pushBare("new_creator", wrapUserName(data.newCreatorId));
+	}, [&](const ActionManagedBotCreated &data) {
+		pushActor();
+		pushAction("managed_bot_created");
+		pushBare("bot", wrapUserName(data.botId));
 	}, [](v::null_t) {});
 
 	if (v::is_null(message.action.content)) {
@@ -664,6 +781,7 @@ QByteArray SerializeMessage(
 			pushBare(
 				"forwarded_from",
 				wrapPeerName(message.forwardedFromId));
+			push("forwarded_from_id", message.forwardedFromId);
 		} else if (!message.forwardedFromName.isEmpty()) {
 			pushBare(
 				"forwarded_from",
@@ -684,12 +802,15 @@ QByteArray SerializeMessage(
 
 	v::match(message.media.content, [&](const Photo &photo) {
 		pushPhoto(photo.image);
+		pushSpoiler(photo);
 		pushTTL();
 	}, [&](const Document &data) {
 		pushPath(data.file, "file");
 		push("file_name", data.name);
+		push("file_size", data.file.size);
 		if (data.thumb.width > 0) {
 			pushPath(data.thumb.file, "thumbnail");
+			push("thumbnail_file_size", data.thumb.file.size);
 		}
 		const auto pushType = [&](const QByteArray &value) {
 			push("media_type", value);
@@ -718,6 +839,7 @@ QByteArray SerializeMessage(
 			push("width", data.width);
 			push("height", data.height);
 		}
+		pushSpoiler(data);
 		pushTTL();
 	}, [&](const SharedContact &data) {
 		pushBare("contact_information", SerializeObject(context, {
@@ -730,6 +852,7 @@ QByteArray SerializeMessage(
 		}));
 		if (!data.vcard.content.isEmpty()) {
 			pushPath(data.vcard, "contact_vcard");
+			push("contact_vcard_file_size", data.vcard.size);
 		}
 	}, [&](const GeoPoint &data) {
 		pushBare(
@@ -777,7 +900,7 @@ QByteArray SerializeMessage(
 		) | ranges::views::transform([&](const Poll::Answer &answer) {
 			context.nesting.push_back(Context::kArray);
 			auto result = SerializeObject(context, {
-				{ "text", SerializeString(answer.text) },
+				{ "text", SerializeText(context, answer.text) },
 				{ "voters", NumberToString(answer.votes) },
 				{ "chosen", answer.my ? "true" : "false" },
 			});
@@ -788,11 +911,36 @@ QByteArray SerializeMessage(
 		context.nesting.pop_back();
 
 		pushBare("poll", SerializeObject(context, {
-			{ "question", SerializeString(data.question) },
+			{ "question", SerializeText(context, data.question) },
 			{ "closed", data.closed ? "true" : "false" },
 			{ "total_voters", NumberToString(data.totalVotes) },
 			{ "answers", serialized }
 		}));
+	}, [&](const TodoList &data) {
+		context.nesting.push_back(Context::kObject);
+		const auto items = ranges::views::all(
+			data.items
+		) | ranges::views::transform([&](const TodoListItem &item) {
+			context.nesting.push_back(Context::kArray);
+			auto result = SerializeObject(context, {
+				{ "text", SerializeText(context, item.text) },
+				{ "id", NumberToString(item.id) },
+			});
+			context.nesting.pop_back();
+			return result;
+		}) | ranges::to_vector;
+		const auto serialized = SerializeArray(context, items);
+		context.nesting.pop_back();
+
+		pushBare("todo_list", SerializeObject(context, {
+			{ "title", SerializeText(context, data.title) },
+			{ "others_can_append", data.othersCanAppend ? "true" : "false" },
+			{
+				"others_can_complete",
+				data.othersCanComplete ? "true" : "false",
+			},
+			{ "answers", serialized }
+		}));
 	}, [&](const GiveawayStart &data) {
 		context.nesting.push_back(Context::kArray);
 		const auto channels = ranges::views::all(
@@ -1200,6 +1348,34 @@ Result JsonWriter::writeStoriesEnd() {
 	return _output->writeBlock(popNesting());
 }
 
+Result JsonWriter::writeProfileMusicStart(const Data::ProfileMusicInfo &data) {
+	Expects(_output != nullptr);
+
+	auto block = prepareObjectItemStart("profile_music");
+	return _output->writeBlock(block + pushNesting(Context::kArray));
+}
+
+Result JsonWriter::writeProfileMusicSlice(const Data::ProfileMusicSlice &data) {
+	Expects(_output != nullptr);
+
+	if (data.list.empty()) {
+		return Result::Success();
+	}
+
+	auto block = QByteArray();
+	for (const auto &message : data.list) {
+		block.append(prepareArrayItemStart());
+		block.append(SerializeMessage(_context, message, {}, QString()));
+	}
+	return _output->writeBlock(block);
+}
+
+Result JsonWriter::writeProfileMusicEnd() {
+	Expects(_output != nullptr);
+
+	return _output->writeBlock(popNesting());
+}
+
 Result JsonWriter::writeContactsList(const Data::ContactsList &data) {
 	Expects(_output != nullptr);
 
diff --git a/Telegram/SourceFiles/export/output/export_output_json.h b/Telegram/SourceFiles/export/output/export_output_json.h
index 879918fcee68a6..a50e547f58b9fc 100644
--- a/Telegram/SourceFiles/export/output/export_output_json.h
+++ b/Telegram/SourceFiles/export/output/export_output_json.h
@@ -48,6 +48,10 @@ class JsonWriter : public AbstractWriter {
 	Result writeStoriesSlice(const Data::StoriesSlice &data) override;
 	Result writeStoriesEnd() override;
 
+	Result writeProfileMusicStart(const Data::ProfileMusicInfo &data) override;
+	Result writeProfileMusicSlice(const Data::ProfileMusicSlice &data) override;
+	Result writeProfileMusicEnd() override;
+
 	Result writeContactsList(const Data::ContactsList &data) override;
 
 	Result writeSessionsList(const Data::SessionsList &data) override;
diff --git a/Telegram/SourceFiles/export/view/export_view_content.cpp b/Telegram/SourceFiles/export/view/export_view_content.cpp
index 9813321efebb87..9ea898fcac3e57 100644
--- a/Telegram/SourceFiles/export/view/export_view_content.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_content.cpp
@@ -96,6 +96,13 @@ Content ContentFromState(
 			state.bytesName,
 			state.bytesRandomId);
 		break;
+	case Step::ProfileMusic:
+		pushMain(tr::lng_export_option_profile_music(tr::now));
+		pushBytes(
+			"music" + QString::number(state.entityIndex),
+			state.bytesName,
+			state.bytesRandomId);
+		break;
 	case Step::Sessions:
 		pushMain(tr::lng_export_option_sessions(tr::now));
 		break;
@@ -131,6 +138,26 @@ Content ContentFromState(
 			state.bytesName,
 			state.bytesRandomId);
 		break;
+	case Step::Topic:
+		pushMain(tr::lng_export_state_chats(tr::now));
+		push(
+			"topic",
+			state.entityName.isEmpty()
+				? tr::lng_deleted(tr::now)
+				: state.entityName,
+			(state.itemCount > 0
+				? (QString::number(state.itemIndex)
+					+ " / "
+					+ QString::number(state.itemCount))
+				: QString()),
+			(state.itemCount > 0
+				? (state.itemIndex / float64(state.itemCount))
+				: 0.));
+		pushBytes(
+			"file_topic_" + QString::number(state.itemIndex),
+			state.bytesName,
+			state.bytesRandomId);
+		break;
 	default: Unexpected("Step in ContentFromState.");
 	}
 	const auto requiredRows = settings->onlySinglePeer() ? 2 : 3;
diff --git a/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp b/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
index 4aef9c36e64548..abd35bdbe1a99e 100644
--- a/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
@@ -68,7 +68,7 @@ void SuggestBox::prepare() {
 		tr::lng_export_suggest_text(tr::now),
 		st::boxLabel);
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto contentWidth = width
 			- st::boxPadding.left()
 			- st::boxPadding.right();
@@ -76,7 +76,7 @@ void SuggestBox::prepare() {
 		content->moveToLeft(st::boxPadding.left(), 0);
 	}, content->lifetime());
 	content->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWidth, height + st::boxPadding.bottom());
 	}, content->lifetime());
 }
@@ -96,11 +96,11 @@ Environment PrepareEnvironment(not_null<Main::Session*> session) {
 	return result;
 }
 
-QPointer<Ui::BoxContent> SuggestStart(not_null<Main::Session*> session) {
+base::weak_qptr<Ui::BoxContent> SuggestStart(not_null<Main::Session*> session) {
 	ClearSuggestStart(session);
 	return Ui::show(
 		Box<SuggestBox>(session),
-		Ui::LayerOption::KeepOther).data();
+		Ui::LayerOption::KeepOther).get();
 }
 
 void ClearSuggestStart(not_null<Main::Session*> session) {
@@ -146,7 +146,7 @@ PanelController::PanelController(
 	ResolveSettings(session, *_settings);
 
 	_process->state(
-	) | rpl::start_with_next([=](State &&state) {
+	) | rpl::on_next([=](State &&state) {
 		updateState(std::move(state));
 	}, _lifetime);
 }
@@ -168,15 +168,18 @@ void PanelController::activatePanel() {
 
 void PanelController::createPanel() {
 	const auto singlePeer = _settings->onlySinglePeer();
+	const auto singleTopic = _settings->onlySingleTopic();
 	_panel = base::make_unique_q<Ui::SeparatePanel>(Ui::SeparatePanelArgs{
 		.onAllSpaces = true,
 	});
-	_panel->setTitle((singlePeer
+	_panel->setTitle((singleTopic
+		? tr::lng_export_header_topic
+		: singlePeer
 		? tr::lng_export_header_chats
 		: tr::lng_export_title)());
 	_panel->setInnerSize(st::exportPanelSize);
 	_panel->closeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		LOG(("Export Info: Panel Hide By Close."));
 		_panel->hideGetDuration();
 	}, _panel->lifetime());
@@ -198,19 +201,19 @@ void PanelController::showSettings() {
 	});
 
 	settings->startClicks(
-	) | rpl::start_with_next([=]() {
+	) | rpl::on_next([=]() {
 		showProgress();
 		_process->startExport(*_settings, PrepareEnvironment(_session));
 	}, settings->lifetime());
 
 	settings->cancelClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		LOG(("Export Info: Panel Hide By Cancel."));
 		_panel->hideGetDuration();
 	}, settings->lifetime());
 
 	settings->changes(
-	) | rpl::start_with_next([=](Settings &&settings) {
+	) | rpl::on_next([=](Settings &&settings) {
 		*_settings = std::move(settings);
 	}, settings->lifetime());
 
@@ -267,7 +270,7 @@ void PanelController::showCriticalError(const QString &text) {
 			st::exportErrorLabel),
 		style::margins(0, st::exportPanelSize.height() / 4, 0, 0));
 	container->widthValue(
-	) | rpl::start_with_next([label = container->entity()](int width) {
+	) | rpl::on_next([label = container->entity()](int width) {
 		label->resize(width, label->height());
 	}, container->lifetime());
 
@@ -277,7 +280,7 @@ void PanelController::showCriticalError(const QString &text) {
 
 void PanelController::showError(const QString &text) {
 	auto box = Ui::MakeInformBox(text);
-	const auto weak = Ui::MakeWeak(box.data());
+	const auto weak = base::make_weak(box.data());
 	const auto hidden = _panel->isHidden();
 	_panel->showBox(
 		std::move(box),
@@ -286,7 +289,7 @@ void PanelController::showError(const QString &text) {
 	weak->setCloseByEscape(false);
 	weak->setCloseByOutsideClick(false);
 	weak->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		LOG(("Export Info: Panel Hide By Error: %1.").arg(text));
 		_panel->hideGetDuration();
 	}, weak->lifetime());
@@ -309,17 +312,17 @@ void PanelController::showProgress() {
 		) | rpl::then(progressState()));
 
 	progress->skipFileClicks(
-	) | rpl::start_with_next([=](uint64 randomId) {
+	) | rpl::on_next([=](uint64 randomId) {
 		_process->skipFile(randomId);
 	}, progress->lifetime());
 
 	progress->cancelClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		stopWithConfirmation();
 	}, progress->lifetime());
 
 	progress->doneClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto finished = std::get_if<FinishedState>(&_state)) {
 			File::ShowInFolder(finished->path);
 			LOG(("Export Info: Panel Hide By Done: %1."
diff --git a/Telegram/SourceFiles/export/view/export_view_panel_controller.h b/Telegram/SourceFiles/export/view/export_view_panel_controller.h
index 70c72f8a69b3c4..b820202c3d459c 100644
--- a/Telegram/SourceFiles/export/view/export_view_panel_controller.h
+++ b/Telegram/SourceFiles/export/view/export_view_panel_controller.h
@@ -24,7 +24,7 @@ class Session;
 namespace Export {
 namespace View {
 
-QPointer<Ui::BoxContent> SuggestStart(not_null<Main::Session*> session);
+base::weak_qptr<Ui::BoxContent> SuggestStart(not_null<Main::Session*> session);
 void ClearSuggestStart(not_null<Main::Session*> session);
 bool IsDefaultPath(not_null<Main::Session*> session, const QString &path);
 void ResolveSettings(not_null<Main::Session*> session, Settings &settings);
@@ -79,7 +79,7 @@ class PanelController {
 	base::unique_qptr<Ui::SeparatePanel> _panel;
 
 	State _state;
-	QPointer<Ui::BoxContent> _confirmStopBox;
+	base::weak_qptr<Ui::BoxContent> _confirmStopBox;
 	rpl::event_stream<rpl::producer<>> _panelCloseEvents;
 	bool _stopRequested = false;
 	rpl::lifetime _lifetime;
diff --git a/Telegram/SourceFiles/export/view/export_view_progress.cpp b/Telegram/SourceFiles/export/view/export_view_progress.cpp
index dabda8280d81f1..9ffcbe2fd4a89c 100644
--- a/Telegram/SourceFiles/export/view/export_view_progress.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_progress.cpp
@@ -51,8 +51,8 @@ class ProgressWidget::Row : public Ui::RpWidget {
 	void hideCurrentInstance();
 	void setInstanceProgress(Instance &instance, float64 progress);
 	void toggleInstance(Instance &data, bool shown);
-	void instanceOpacityCallback(QPointer<Ui::FlatLabel> label);
-	void removeOldInstance(QPointer<Ui::FlatLabel> label);
+	void instanceOpacityCallback(base::weak_qptr<Ui::FlatLabel> label);
+	void removeOldInstance(base::weak_qptr<Ui::FlatLabel> label);
 	void paintInstance(QPainter &p, const Instance &data);
 
 	void updateControlsGeometry(int newWidth);
@@ -146,7 +146,7 @@ void ProgressWidget::Row::toggleInstance(Instance &instance, bool shown) {
 	if (instance.hiding != shown) {
 		return;
 	}
-	const auto label = Ui::MakeWeak(instance.label->entity());
+	const auto label = base::make_weak(instance.label->entity());
 	instance.opacity.start(
 		[=] { instanceOpacityCallback(label); },
 		shown ? 0. : 1.,
@@ -158,10 +158,10 @@ void ProgressWidget::Row::toggleInstance(Instance &instance, bool shown) {
 }
 
 void ProgressWidget::Row::instanceOpacityCallback(
-		QPointer<Ui::FlatLabel> label) {
+		base::weak_qptr<Ui::FlatLabel> label) {
 	update();
 	const auto i = ranges::find(_old, label, [](const Instance &instance) {
-		return Ui::MakeWeak(instance.label->entity());
+		return base::make_weak(instance.label->entity());
 	});
 	if (i != end(_old) && i->hiding && !i->opacity.animating()) {
 		crl::on_main(this, [=] {
@@ -170,9 +170,10 @@ void ProgressWidget::Row::instanceOpacityCallback(
 	}
 }
 
-void ProgressWidget::Row::removeOldInstance(QPointer<Ui::FlatLabel> label) {
+void ProgressWidget::Row::removeOldInstance(
+		base::weak_qptr<Ui::FlatLabel> label) {
 	const auto i = ranges::find(_old, label, [](const Instance &instance) {
-		return Ui::MakeWeak(instance.label->entity());
+		return base::make_weak(instance.label->entity());
 	});
 	if (i != end(_old)) {
 		_old.erase(i);
@@ -243,7 +244,7 @@ ProgressWidget::ProgressWidget(
 , _body(this)
 , _fileShowSkipTimer([=] { _skipFile->show(anim::type::normal); }) {
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_body->resizeToWidth(width);
 		_body->moveToLeft(0, 0);
 	}, _body->lifetime());
@@ -269,7 +270,7 @@ ProgressWidget::ProgressWidget(
 
 	std::move(
 		content
-	) | rpl::start_with_next([=](Content &&content) {
+	) | rpl::on_next([=](Content &&content) {
 		updateState(std::move(content));
 	}, lifetime());
 
@@ -288,7 +289,7 @@ rpl::producer<uint64> ProgressWidget::skipFileClicks() const {
 rpl::producer<> ProgressWidget::cancelClicks() const {
 	return _cancel
 		? (_cancel->clicks() | rpl::to_empty)
-		: (rpl::never<>() | rpl::type_erased());
+		: (rpl::never<>() | rpl::type_erased);
 }
 
 rpl::producer<> ProgressWidget::doneClicks() const {
@@ -296,11 +297,10 @@ rpl::producer<> ProgressWidget::doneClicks() const {
 }
 
 void ProgressWidget::setupBottomButton(not_null<Ui::RoundButton*> button) {
-	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	button->show();
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		button->move(
 			(size.width() - button->width()) / 2,
 			(size.height() - st::exportCancelBottom - button->height()));
diff --git a/Telegram/SourceFiles/export/view/export_view_settings.cpp b/Telegram/SourceFiles/export/view/export_view_settings.cpp
index fdb61a7993a72c..1964ff00f0c5bf 100644
--- a/Telegram/SourceFiles/export/view/export_view_settings.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_settings.cpp
@@ -22,6 +22,7 @@ For license and copyright information please follow this link:
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/boxes/calendar_box.h"
+#include "ui/boxes/choose_time.h"
 #include "platform/platform_specific.h"
 #include "core/application.h"
 #include "core/file_utilities.h"
@@ -148,7 +149,7 @@ void SettingsWidget::setupContent() {
 	setupPathAndFormat(content);
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		scroll->resize(size.width(), size.height() - buttons->height());
 		wrap->resizeToWidth(size.width());
 		content->resizeToWidth(size.width());
@@ -182,6 +183,11 @@ void SettingsWidget::setupFullExportOptions(
 		tr::lng_export_option_stories(tr::now),
 		Type::Stories,
 		tr::lng_export_option_stories_about(tr::now));
+	addOptionWithAbout(
+		container,
+		tr::lng_export_option_profile_music(tr::now),
+		Type::ProfileMusic,
+		tr::lng_export_option_profile_music_about(tr::now));
 	addHeader(container, tr::lng_export_header_chats(tr::now));
 	addOption(
 		container,
@@ -226,17 +232,18 @@ void SettingsWidget::setupMediaOptions(
 	value() | rpl::map([](const Settings &data) {
 		return data.types;
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](Settings::Types types) {
+	) | rpl::on_next([=](Settings::Types types) {
 		mediaWrap->toggle((types & (Type::PersonalChats
 			| Type::BotChats
 			| Type::PrivateGroups
 			| Type::PrivateChannels
 			| Type::PublicGroups
-			| Type::PublicChannels)) != 0, anim::type::normal);
+			| Type::PublicChannels
+			| Type::ProfileMusic)) != 0, anim::type::normal);
 	}, mediaWrap->lifetime());
 
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		mediaWrap->resizeToWidth(width);
 	}, mediaWrap->lifetime());
 }
@@ -299,7 +306,7 @@ void SettingsWidget::addLocationLabel(
 			? u"Downloads/"_q + File::DefaultDownloadPathFolder(_session)
 			: tr::lng_download_path_temp(tr::now)
 			: path;
-		return Ui::Text::Link(
+		return tr::link(
 			QDir::toNativeSeparators(text),
 			QString("internal:edit_export_path"));
 	});
@@ -309,7 +316,7 @@ void SettingsWidget::addLocationLabel(
 			tr::lng_export_option_location(
 				lt_path,
 				std::move(pathLink),
-				Ui::Text::WithEntities),
+				tr::marked),
 			st::exportLocationLabel),
 		st::exportLocationPadding);
 	label->overrideLinkClickHandler([=] {
@@ -319,20 +326,20 @@ void SettingsWidget::addLocationLabel(
 }
 
 void SettingsWidget::chooseFormat() {
-	const auto shared = std::make_shared<QPointer<Ui::GenericBox>>();
+	const auto shared = std::make_shared<base::weak_qptr<Ui::GenericBox>>();
 	const auto callback = [=](Format format) {
 		changeData([&](Settings &data) {
 			data.format = format;
 		});
-		if (const auto weak = shared->data()) {
-			weak->closeBox();
+		if (const auto strong = shared->get()) {
+			strong->closeBox();
 		}
 	};
 	auto box = Box(
 		ChooseFormatBox,
 		readData().format,
 		callback);
-	*shared = Ui::MakeWeak(box.data());
+	*shared = base::make_weak(box.data());
 	_showBoxCallback(std::move(box));
 }
 
@@ -348,7 +355,7 @@ void SettingsWidget::addFormatAndLocationLabel(
 			? u"Downloads/"_q + File::DefaultDownloadPathFolder(_session)
 			: tr::lng_download_path_temp(tr::now)
 			: path;
-		return Ui::Text::Link(
+		return tr::link(
 			QDir::toNativeSeparators(text),
 			u"internal:edit_export_path"_q);
 	});
@@ -361,7 +368,7 @@ void SettingsWidget::addFormatAndLocationLabel(
 			: (format == Format::Json)
 			? "JSON"
 			: tr::lng_export_option_html_and_json(tr::now);
-		return Ui::Text::Link(text, u"internal:edit_format"_q);
+		return tr::link(text, u"internal:edit_format"_q);
 	});
 	const auto label = container->add(
 		object_ptr<Ui::FlatLabel>(
@@ -371,7 +378,7 @@ void SettingsWidget::addFormatAndLocationLabel(
 				std::move(formatLink),
 				lt_path,
 				std::move(pathLink),
-				Ui::Text::WithEntities),
+				tr::marked),
 			st::exportLocationLabel),
 		st::exportLocationPadding);
 	label->overrideLinkClickHandler([=](const QString &url) {
@@ -388,7 +395,7 @@ void SettingsWidget::addFormatAndLocationLabel(
 
 void SettingsWidget::addLimitsLabel(
 		not_null<Ui::VerticalLayout*> container) {
-	auto fromLink = value() | rpl::map([](const Settings &data) {
+	auto fromDateLink = value() | rpl::map([](const Settings &data) {
 		return data.singlePeerFrom;
 	}) | rpl::distinct_until_changed(
 	) | rpl::map([](TimeId from) {
@@ -396,10 +403,37 @@ void SettingsWidget::addLimitsLabel(
 			? rpl::single(langDayOfMonthFull(
 				base::unixtime::parse(from).date()))
 			: tr::lng_export_beginning()
-		) | Ui::Text::ToLink(u"internal:edit_from"_q);
+		) | rpl::map(tr::url(u"internal:edit_from"_q));
+	}) | rpl::flatten_latest();
+
+	const auto mapToTime = [](TimeId id, const QString &link) {
+		return rpl::single(id
+			? QLocale().toString(
+				base::unixtime::parse(id).time(),
+				QLocale::ShortFormat)
+			: QString()
+		) | rpl::map(tr::url(link));
+	};
+
+	const auto concat = [](TextWithEntities date, TextWithEntities link) {
+		return link.text.isEmpty()
+			? date
+			: date.append(u", "_q).append(std::move(link));
+	};
+
+	auto fromTimeLink = value() | rpl::map([](const Settings &data) {
+		return data.singlePeerFrom;
+	}) | rpl::distinct_until_changed(
+	) | rpl::map([=](TimeId from) {
+		return mapToTime(from, u"internal:edit_from_time"_q);
 	}) | rpl::flatten_latest();
 
-	auto tillLink = value() | rpl::map([](const Settings &data) {
+	auto fromLink = rpl::combine(
+		std::move(fromDateLink),
+		std::move(fromTimeLink)
+	) | rpl::map(concat);
+
+	auto tillDateLink = value() | rpl::map([](const Settings &data) {
 		return data.singlePeerTill;
 	}) | rpl::distinct_until_changed(
 	) | rpl::map([](TimeId till) {
@@ -407,15 +441,27 @@ void SettingsWidget::addLimitsLabel(
 			? rpl::single(langDayOfMonthFull(
 				base::unixtime::parse(till).date()))
 			: tr::lng_export_end()
-		) | Ui::Text::ToLink(u"internal:edit_till"_q);
+		) | rpl::map(tr::url(u"internal:edit_till"_q));
+	}) | rpl::flatten_latest();
+
+	auto tillTimeLink = value() | rpl::map([](const Settings &data) {
+		return data.singlePeerTill;
+	}) | rpl::distinct_until_changed(
+	) | rpl::map([=](TimeId till) {
+		return mapToTime(till, u"internal:edit_till_time"_q);
 	}) | rpl::flatten_latest();
 
+	auto tillLink = rpl::combine(
+		std::move(tillDateLink),
+		std::move(tillTimeLink)
+	) | rpl::map(concat);
+
 	auto datesText = tr::lng_export_limits(
 		lt_from,
 		std::move(fromLink),
 		lt_till,
 		std::move(tillLink),
-		Ui::Text::WithEntities
+		tr::marked
 	) | rpl::after_next([=] {
 		container->resizeToWidth(container->width());
 	});
@@ -424,8 +470,47 @@ void SettingsWidget::addLimitsLabel(
 		object_ptr<Ui::FlatLabel>(
 			container,
 			std::move(datesText),
-			st::exportLocationLabel),
+			st::boxLabel),
 		st::exportLimitsPadding);
+
+	const auto removeTime = [](TimeId dateTime) {
+		return base::unixtime::serialize(
+			QDateTime(
+				base::unixtime::parse(dateTime).date(),
+				QTime()));
+	};
+
+	const auto editTimeLimit = [=](Fn<TimeId()> now, Fn<void(TimeId)> done) {
+		_showBoxCallback(Box([=](not_null<Ui::GenericBox*> box) {
+			auto result = Ui::ChooseTimeWidget(
+				box->verticalLayout(),
+				[&] {
+					const auto time = base::unixtime::parse(now()).time();
+					return time.hour() * 3600
+						+ time.minute() * 60
+						+ time.second();
+				}(),
+				true);
+			const auto widget = box->addRow(std::move(result.widget));
+			const auto toSave = widget->lifetime().make_state<TimeId>(0);
+			std::move(
+				result.secondsValue
+			) | rpl::on_next([=](TimeId t) {
+				*toSave = t;
+			}, box->lifetime());
+			box->addButton(tr::lng_settings_save(), [=] {
+				done(*toSave);
+				box->closeBox();
+			});
+			box->addButton(tr::lng_cancel(), [=] {
+				box->closeBox();
+			});
+			box->setTitle(tr::lng_settings_ttl_after_custom());
+		}));
+	};
+
+	constexpr auto kOffset = 600;
+
 	label->overrideLinkClickHandler([=](const QString &url) {
 		if (url == u"internal:edit_from"_q) {
 			const auto done = [=](TimeId limit) {
@@ -439,10 +524,38 @@ void SettingsWidget::addLimitsLabel(
 				readData().singlePeerTill,
 				tr::lng_export_from_beginning(),
 				done);
+		} else if (url == u"internal:edit_from_time"_q) {
+			const auto now = [=] {
+				auto result = TimeId(0);
+				changeData([&](Settings &settings) {
+					result = settings.singlePeerFrom;
+				});
+				return result;
+			};
+			const auto done = [=](TimeId time) {
+				changeData([&](Settings &settings) {
+					const auto result = time
+						+ removeTime(settings.singlePeerFrom);
+					if (result >= settings.singlePeerTill
+							&& settings.singlePeerTill) {
+						settings.singlePeerFrom = settings.singlePeerTill
+							- kOffset;
+					} else {
+						settings.singlePeerFrom = result;
+					}
+				});
+			};
+			editTimeLimit(now, done);
 		} else if (url == u"internal:edit_till"_q) {
 			const auto done = [=](TimeId limit) {
 				changeData([&](Settings &settings) {
-					settings.singlePeerTill = limit;
+					if (limit <= settings.singlePeerFrom
+							&& settings.singlePeerFrom) {
+						settings.singlePeerTill = settings.singlePeerFrom
+							+ kOffset;
+					} else {
+						settings.singlePeerTill = limit;
+					}
 				});
 			};
 			editDateLimit(
@@ -451,6 +564,28 @@ void SettingsWidget::addLimitsLabel(
 				0,
 				tr::lng_export_till_end(),
 				done);
+		} else if (url == u"internal:edit_till_time"_q) {
+			const auto now = [=] {
+				auto result = TimeId(0);
+				changeData([&](Settings &settings) {
+					result = settings.singlePeerTill;
+				});
+				return result;
+			};
+			const auto done = [=](TimeId time) {
+				changeData([&](Settings &settings) {
+					const auto result = time
+						+ removeTime(settings.singlePeerTill);
+					if (result <= settings.singlePeerFrom
+							&& settings.singlePeerFrom) {
+						settings.singlePeerTill = settings.singlePeerFrom
+							+ kOffset;
+					} else {
+						settings.singlePeerTill = result;
+					}
+				});
+			};
+			editTimeLimit(now, done);
 		} else {
 			Unexpected("Click handler URL in export limits edit.");
 		}
@@ -473,20 +608,20 @@ void SettingsWidget::editDateLimit(
 		? base::unixtime::parse(min).date()
 		: QDate::currentDate();
 	const auto month = highlighted;
-	const auto shared = std::make_shared<QPointer<Ui::CalendarBox>>();
+	const auto shared = std::make_shared<base::weak_qptr<Ui::CalendarBox>>();
 	const auto finalize = [=](not_null<Ui::CalendarBox*> box) {
 		box->addLeftButton(std::move(resetLabel), crl::guard(this, [=] {
 			done(0);
-			if (const auto weak = shared->data()) {
+			if (const auto weak = shared->get()) {
 				weak->closeBox();
 			}
 		}));
 	};
-	const auto callback = crl::guard(this, [=](const QDate &date) {
+	const auto callback = crl::guard(this, [=](
+			const QDate &date,
+			Fn<void()> close) {
 		done(base::unixtime::serialize(date.startOfDay()));
-		if (const auto weak = shared->data()) {
-			weak->closeBox();
-		}
+		close();
 	});
 	auto box = Box<Ui::CalendarBox>(Ui::CalendarBoxArgs{
 		.month = month,
@@ -501,7 +636,7 @@ void SettingsWidget::editDateLimit(
 			? base::unixtime::parse(max).date()
 			: QDate::currentDate()),
 	});
-	*shared = Ui::MakeWeak(box.data());
+	*shared = base::make_weak(box.data());
 	_showBoxCallback(std::move(box));
 }
 
@@ -533,14 +668,14 @@ not_null<Ui::RpWidget*> SettingsWidget::setupButtons(
 	value() | rpl::map([](const Settings &data) {
 		return (data.types != Types(0)) || data.onlySinglePeer();
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool canStart) {
+	) | rpl::on_next([=](bool canStart) {
 		refreshButtons(buttons, canStart);
 		topShadow->raise();
 		bottomShadow->raise();
 	}, buttons->lifetime());
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		buttons->resizeToWidth(size.width());
 		buttons->moveToLeft(0, size.height() - buttons->height());
 		topShadow->resizeToWidth(size.width());
@@ -575,7 +710,7 @@ not_null<Ui::Checkbox*> SettingsWidget::addOption(
 			st::defaultBoxCheckbox),
 		st::exportSettingPadding);
 	checkbox->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		changeData([&](Settings &data) {
 			if (checked) {
 				data.types |= types;
@@ -618,7 +753,7 @@ void SettingsWidget::addChatOption(
 			st::exportSubSettingPadding));
 
 	onlyMy->entity()->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		changeData([&](Settings &data) {
 			if (checked) {
 				data.fullChats &= ~types;
@@ -681,7 +816,7 @@ void SettingsWidget::addMediaOption(
 			st::defaultBoxCheckbox),
 		st::exportSettingPadding);
 	checkbox->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		changeData([&](Settings &data) {
 			if (checked) {
 				data.media.types |= type;
@@ -715,7 +850,7 @@ void SettingsWidget::addSizeSlider(
 		st::exportFileSizeLabel);
 	value() | rpl::map([](const Settings &data) {
 		return data.media.sizeLimit;
-	}) | rpl::start_with_next([=](int64 sizeLimit) {
+	}) | rpl::on_next([=](int64 sizeLimit) {
 		const auto limit = sizeLimit / kMegabyte;
 		const auto size = QString::number(limit) + " MB";
 		const auto text = tr::lng_export_option_size_limit(
@@ -729,7 +864,7 @@ void SettingsWidget::addSizeSlider(
 		label->widthValue(),
 		slider->geometryValue(),
 		_2
-	) | rpl::start_with_next([=](QRect geometry) {
+	) | rpl::on_next([=](QRect geometry) {
 		label->moveToRight(
 			st::exportFileSizePadding.right(),
 			geometry.y() - label->height() - st::exportFileSizeLabelBottom);
@@ -753,12 +888,11 @@ void SettingsWidget::refreshButtons(
 			st::defaultBoxButton)
 		: nullptr;
 	if (start) {
-		start->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 		start->show();
 		_startClicks = start->clicks() | rpl::to_empty;
 
 		container->sizeValue(
-		) | rpl::start_with_next([=](QSize size) {
+		) | rpl::on_next([=](QSize size) {
 			const auto right = st::defaultBox.buttonPadding.right();
 			const auto top = st::defaultBox.buttonPadding.top();
 			start->moveToRight(right, top);
@@ -769,14 +903,13 @@ void SettingsWidget::refreshButtons(
 		container.get(),
 		tr::lng_cancel(),
 		st::defaultBoxButton);
-	cancel->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	cancel->show();
 	_cancelClicks = cancel->clicks() | rpl::to_empty;
 
 	rpl::combine(
 		container->sizeValue(),
 		start ? start->widthValue() : rpl::single(0)
-	) | rpl::start_with_next([=](QSize size, int width) {
+	) | rpl::on_next([=](QSize size, int width) {
 		const auto right = st::defaultBox.buttonPadding.right()
 			+ (width ? width + st::defaultBox.buttonPadding.left() : 0);
 		const auto top = st::defaultBox.buttonPadding.top();
diff --git a/Telegram/SourceFiles/export/view/export_view_top_bar.cpp b/Telegram/SourceFiles/export/view/export_view_top_bar.cpp
index dbdb9fc6ede272..80c74c1a759242 100644
--- a/Telegram/SourceFiles/export/view/export_view_top_bar.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_top_bar.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "export/view/export_view_top_bar.h"
 
 #include "export/view/export_view_content.h"
+#include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/continuous_sliders.h"
 #include "ui/widgets/labels.h"
@@ -22,11 +23,14 @@ namespace View {
 
 TopBar::TopBar(QWidget *parent, Content &&content)
 : RpWidget(parent)
-, _info(this, st::exportTopBarLabel)
+, _infoLeft(this, st::exportTopBarLabel)
+, _infoMiddle(this, st::exportTopBarLabel)
+, _infoRight(this, st::exportTopBarLabel)
 , _shadow(this)
 , _progress(this, st::mediaPlayerPlayback)
 , _button(this) {
 	resize(width(), st::mediaPlayerHeight + st::lineWidth);
+	_infoMiddle->setElisionMiddle(true);
 	_progress->setAttribute(Qt::WA_TransparentForMouseEvents);
 	updateData(std::move(content));
 }
@@ -35,24 +39,64 @@ rpl::producer<Qt::MouseButton> TopBar::clicks() const {
 	return _button->clicks();
 }
 
+void TopBar::resizeToWidthInfo(int w) {
+	if (w <= 0) {
+		return;
+	}
+	const auto &infoFont = st::mediaPlayerName.style.font;
+	const auto infoTop = st::mediaPlayerNameTop - infoFont->ascent;
+	const auto padding = st::mediaPlayerPlayLeft + st::mediaPlayerPadding;
+	const auto spacing = infoFont->spacew;
+	_infoLeft->moveToLeft(padding, infoTop);
+	auto availableWidth = w;
+	availableWidth -= rect::right(_infoLeft);
+	availableWidth -= padding;
+	_infoMiddle->resizeToWidth(_infoMiddle->naturalWidth());
+	_infoRight->resizeToWidth(_infoRight->naturalWidth());
+	const auto requiredWidth = spacing
+		+ _infoMiddle->naturalWidth()
+		+ (_infoRight->naturalWidth()
+			? (spacing + _infoRight->naturalWidth())
+			: 0);
+	if (requiredWidth > availableWidth) {
+		_infoRight->moveToLeft(
+			w - padding - _infoRight->width(),
+			infoTop);
+		_infoMiddle->resizeToWidth(qMax(
+			_infoRight->x()
+				- rect::right(_infoLeft)
+				- spacing * 2,
+			0));
+		_infoMiddle->moveToLeft(
+			rect::right(_infoLeft) + spacing,
+			infoTop);
+	} else {
+		_infoMiddle->moveToLeft(
+			rect::right(_infoLeft) + spacing,
+			infoTop);
+		_infoRight->moveToLeft(
+			rect::right(_infoMiddle) + spacing,
+			infoTop);
+	}
+}
+
 void TopBar::updateData(Content &&content) {
 	if (content.rows.empty()) {
 		return;
 	}
 	const auto &row = content.rows[0];
-	_info->setMarkedText(
-		Ui::Text::Bold(tr::lng_export_progress_title(tr::now))
-			.append(" \xe2\x80\x93 ")
-			.append(row.label)
+	_infoLeft->setMarkedText(
+		tr::lng_export_progress_title(tr::now, tr::bold)
 			.append(' ')
-			.append(Ui::Text::Colorized(row.info)));
+			.append(QChar(0x2013)));
+	_infoMiddle->setText(row.label);
+	_infoRight->setMarkedText(Ui::Text::Colorized(row.info));
+	resizeToWidthInfo(width());
 	_progress->setValue(row.progress);
 }
 
 void TopBar::resizeEvent(QResizeEvent *e) {
-	_info->moveToLeft(
-		st::mediaPlayerPlayLeft + st::mediaPlayerPadding,
-		st::mediaPlayerNameTop - st::mediaPlayerName.style.font->ascent);
+	resizeToWidthInfo(e->size().width());
 	_button->setGeometry(0, 0, width(), height() - st::lineWidth);
 	_progress->setGeometry(
 		0,
@@ -64,7 +108,7 @@ void TopBar::resizeEvent(QResizeEvent *e) {
 void TopBar::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 	auto fill = e->rect().intersected(
-		QRect(0, 0, width(), st::mediaPlayerHeight));
+		QRect(0, 0, width(), st::mediaPlayerHeight + st::lineWidth));
 	if (!fill.isEmpty()) {
 		p.fillRect(fill, st::mediaPlayerBg);
 	}
diff --git a/Telegram/SourceFiles/export/view/export_view_top_bar.h b/Telegram/SourceFiles/export/view/export_view_top_bar.h
index 24e015f68b2626..6d355e6414ee00 100644
--- a/Telegram/SourceFiles/export/view/export_view_top_bar.h
+++ b/Telegram/SourceFiles/export/view/export_view_top_bar.h
@@ -41,7 +41,11 @@ class TopBar : public Ui::RpWidget {
 	void paintEvent(QPaintEvent *e) override;
 
 private:
-	object_ptr<Ui::FlatLabel> _info;
+	void resizeToWidthInfo(int w);
+
+	object_ptr<Ui::FlatLabel> _infoLeft;
+	object_ptr<Ui::FlatLabel> _infoMiddle;
+	object_ptr<Ui::FlatLabel> _infoRight;
 	object_ptr<Ui::PlainShadow> _shadow = { nullptr };
 	object_ptr<Ui::FilledSlider> _progress;
 	object_ptr<Ui::AbstractButton> _button;
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_bytes_io_wrap.h b/Telegram/SourceFiles/ffmpeg/ffmpeg_bytes_io_wrap.h
new file mode 100644
index 00000000000000..b7387ba97a6621
--- /dev/null
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_bytes_io_wrap.h
@@ -0,0 +1,99 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ffmpeg/ffmpeg_utility.h"
+
+namespace FFmpeg {
+
+struct ReadBytesWrap {
+	int64 size = 0;
+	int64 offset = 0;
+	const uchar *data = nullptr;
+
+	static int Read(void *opaque, uint8_t *buf, int buf_size) {
+		auto wrap = static_cast<ReadBytesWrap*>(opaque);
+		const auto toRead = std::min(
+			int64(buf_size),
+			wrap->size - wrap->offset);
+		if (!toRead) {
+			return AVERROR_EOF;
+		} else if (toRead > 0) {
+			memcpy(buf, wrap->data + wrap->offset, toRead);
+			wrap->offset += toRead;
+		}
+		return toRead;
+	}
+	static int64_t Seek(void *opaque, int64_t offset, int whence) {
+		auto wrap = static_cast<ReadBytesWrap*>(opaque);
+		auto updated = int64(-1);
+		switch (whence) {
+		case SEEK_SET: updated = offset; break;
+		case SEEK_CUR: updated = wrap->offset + offset; break;
+		case SEEK_END: updated = wrap->size + offset; break;
+		case AVSEEK_SIZE: return wrap->size; break;
+		}
+		if (updated < 0 || updated > wrap->size) {
+			return -1;
+		}
+		wrap->offset = updated;
+		return updated;
+	}
+};
+
+struct WriteBytesWrap {
+	QByteArray content;
+	int64 offset = 0;
+
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+	static int Write(void *opaque, const uint8_t *_buf, int buf_size) {
+		uint8_t *buf = const_cast<uint8_t *>(_buf);
+#else
+	static int Write(void *opaque, uint8_t *buf, int buf_size) {
+#endif
+		auto wrap = static_cast<WriteBytesWrap*>(opaque);
+		if (const auto total = wrap->offset + int64(buf_size)) {
+			const auto size = int64(wrap->content.size());
+			constexpr auto kReserve = 1024 * 1024;
+			wrap->content.reserve((total / kReserve) * kReserve);
+			const auto overwrite = std::min(
+				size - wrap->offset,
+				int64(buf_size));
+			if (overwrite) {
+				memcpy(wrap->content.data() + wrap->offset, buf, overwrite);
+			}
+			if (const auto append = buf_size - overwrite) {
+				wrap->content.append(
+					reinterpret_cast<const char*>(buf) + overwrite,
+					append);
+			}
+			wrap->offset += buf_size;
+		}
+		return buf_size;
+	}
+
+	static int64_t Seek(void *opaque, int64_t offset, int whence) {
+		auto wrap = static_cast<WriteBytesWrap*>(opaque);
+		const auto &content = wrap->content;
+		const auto checkedSeek = [&](int64_t offset) {
+			if (offset < 0 || offset > int64(content.size())) {
+				return int64_t(-1);
+			}
+			return int64_t(wrap->offset = offset);
+		};
+		switch (whence) {
+		case SEEK_SET: return checkedSeek(offset);
+		case SEEK_CUR: return checkedSeek(wrap->offset + offset);
+		case SEEK_END: return checkedSeek(int64(content.size()) + offset);
+		case AVSEEK_SIZE: return int64(content.size());
+		}
+		return -1;
+	}
+};
+
+} // namespace FFmpeg
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_frame_generator.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_frame_generator.cpp
index de478b784b67b7..13e3f7f8655700 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_frame_generator.cpp
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_frame_generator.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "ffmpeg/ffmpeg_frame_generator.h"
 
 #include "ffmpeg/ffmpeg_utility.h"
+#include "media/media_common.h"
 #include "base/debug_log.h"
 
 namespace FFmpeg {
@@ -15,6 +16,8 @@ namespace {
 
 constexpr auto kMaxArea = 1920 * 1080 * 4;
 
+using ::Media::ValidFrameSize;
+
 } // namespace
 
 class FrameGenerator::Impl final {
@@ -103,7 +106,11 @@ FrameGenerator::Impl::Impl(const QByteArray &bytes)
 	const auto info = _format->streams[_streamId];
 	_rotation = ReadRotationFromMetadata(info);
 	//_aspect = ValidateAspectRatio(info->sample_aspect_ratio);
-	_codec = MakeCodecPointer({ .stream = info });
+	_codec = MakeCodecPointer({
+		.stream = info,
+		.hwAllowed = false,
+		.videoMaxArea = kMaxArea,
+	});
 }
 
 int FrameGenerator::Impl::Read(void *opaque, uint8_t *buf, int buf_size) {
@@ -157,7 +164,7 @@ FrameGenerator::Frame FrameGenerator::Impl::renderCurrent(
 	const auto width = frame->width;
 	const auto height = frame->height;
 	if (!width || !height) {
-		LOG(("Webm Error: Bad frame size: %1x%2 ").arg(width).arg(height));
+		LOG(("Webm Error: Bad frame size %1x%2").arg(width).arg(height));
 		return {};
 	}
 
@@ -167,6 +174,10 @@ FrameGenerator::Frame FrameGenerator::Impl::renderCurrent(
 	}
 	if (!GoodStorageForFrame(storage, size)) {
 		storage = CreateFrameStorage(size);
+		if (storage.isNull()) {
+			LOG(("Webm Error: Bad frame size %1x%2").arg(width).arg(height));
+			return {};
+		}
 	}
 	const auto dx = (size.width() - scaled.width()) / 2;
 	const auto dy = (size.height() - scaled.height()) / 2;
@@ -182,7 +193,7 @@ FrameGenerator::Frame FrameGenerator::Impl::renderCurrent(
 	const auto withAlpha = bgra || (srcFormat == AV_PIX_FMT_YUVA420P);
 	const auto dstPerLine = storage.bytesPerLine();
 	auto dst = storage.bits() + dx * sizeof(int32) + dy * dstPerLine;
-	if (srcSize == dstSize && bgra) {
+	if (bgra && srcSize == dstSize && frame->linesize[0] > 0) {
 		const auto srcPerLine = frame->linesize[0];
 		const auto perLine = std::min(srcPerLine, int(dstPerLine));
 		auto src = frame->data[0];
@@ -291,11 +302,7 @@ void FrameGenerator::Impl::jumpToStart() {
 
 void FrameGenerator::Impl::resolveNextFrameTiming() {
 	const auto base = _format->streams[_streamId]->time_base;
-#if DA_FFMPEG_HAVE_DURATION
 	const auto duration = _next.frame->duration;
-#else
-	const auto duration = _next.frame->pkt_duration;
-#endif
 	const auto framePts = _next.frame->pts;
 	auto framePosition = (framePts * 1000LL * base.num) / base.den;
 	_currentFrameDelay = _nextFrameDelay;
@@ -321,7 +328,7 @@ void FrameGenerator::Impl::readNextFrame() {
 	while (true) {
 		auto result = avcodec_receive_frame(_codec.get(), frame.get());
 		if (result >= 0) {
-			if (frame->width * frame->height > kMaxArea) {
+			if (!ValidFrameSize(frame->width, frame->height, kMaxArea)) {
 				return;
 			}
 			_next.frame = std::move(frame);
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
index 0f7083df369a48..277c1bbb83adba 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
@@ -8,14 +8,17 @@ For license and copyright information please follow this link:
 #include "ffmpeg/ffmpeg_utility.h"
 
 #include "base/algorithm.h"
+#include "base/options.h"
 #include "logs.h"
 
-#if !defined TDESKTOP_USE_PACKAGED && !defined Q_OS_WIN && !defined Q_OS_MAC
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
 #include "base/platform/linux/base_linux_library.h"
 #include <deque>
-#endif // !TDESKTOP_USE_PACKAGED && !Q_OS_WIN && !Q_OS_MAC
+#endif // !Q_OS_WIN && !Q_OS_MAC
 
 #include <QImage>
+#include <limits>
+#include <new>
 
 #ifdef LIB_FFMPEG_USE_QT_PRIVATE_API
 #include <private/qdrawhelper_p.h>
@@ -26,6 +29,16 @@ extern "C" {
 #include <libavutil/display.h>
 } // extern "C"
 
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
+extern "C" {
+void _libvdpau_so_tramp_resolve_all(void) __attribute__((weak));
+void _libva_drm_so_tramp_resolve_all(void) __attribute__((weak));
+void _libva_x11_so_tramp_resolve_all(void) __attribute__((weak));
+void _libva_so_tramp_resolve_all(void) __attribute__((weak));
+void _libdrm_so_tramp_resolve_all(void) __attribute__((weak));
+} // extern "C"
+#endif // !Q_OS_WIN && !Q_OS_MAC
+
 namespace FFmpeg {
 namespace {
 
@@ -34,9 +47,26 @@ constexpr auto kAlignImageBy = 64;
 constexpr auto kImageFormat = QImage::Format_ARGB32_Premultiplied;
 constexpr auto kMaxScaleByAspectRatio = 16;
 constexpr auto kAvioBlockSize = 4096;
+constexpr auto kMaxFrameStorageBytes = 64 * 1024 * 1024;
+constexpr auto kMaxPixelsPaddingRatio = 32;
+constexpr auto kMaxPixelsFixedPadding = 64 * 1024;
 constexpr auto kTimeUnknown = std::numeric_limits<crl::time>::min();
 constexpr auto kDurationMax = crl::time(std::numeric_limits<int>::max());
 
+base::options::toggle OptionFFmpegMultiThread({
+	.id = kOptionFFmpegMultiThread,
+	.name = "Multi-thread video decoding",
+	.description = "Allow FFmpeg to use a thread pool for decoding,"
+		" typically a thread per CPU thread.",
+	.defaultValue = true,
+});
+
+base::options::option<int> OptionFFmpegThreadCount({
+	.id = kOptionFFmpegThreadCount,
+	.name = "Video decoding thread count",
+	.description = "Override FFmpeg's thread pool thread count.",
+});
+
 using GetFormatMethod = enum AVPixelFormat(*)(
 	struct AVCodecContext *s,
 	const enum AVPixelFormat *fmt);
@@ -46,11 +76,47 @@ struct HwAccelDescriptor {
 	AVPixelFormat format = AV_PIX_FMT_NONE;
 };
 
-void AlignedImageBufferCleanupHandler(void* data) {
+struct AlignedFrameStorageLayout {
+	int width = 0;
+	int height = 0;
+	int bytesPerLine = 0;
+	int totalBytes = 0;
+};
+
+void AlignedImageBufferCleanupHandler(void *data) {
 	const auto buffer = static_cast<uchar*>(data);
 	delete[] buffer;
 }
 
+[[nodiscard]] bool ComputeAlignedFrameStorageLayout(
+		QSize size,
+		AlignedFrameStorageLayout *out) {
+	const auto width = size.width();
+	const auto height = size.height();
+	if (width <= 0 || height <= 0) {
+		return false;
+	}
+	const auto widthAlign = kAlignImageBy / kPixelBytesSize;
+	const auto widthRemainder = width % widthAlign;
+	const auto widthPadding = widthRemainder
+		? (widthAlign - widthRemainder)
+		: 0;
+	const auto alignedWidth = int64_t(width) + widthPadding;
+	const auto bytesPerLine = int64_t(alignedWidth) * kPixelBytesSize;
+	if (bytesPerLine > kMaxFrameStorageBytes) {
+		return false;
+	}
+	const auto totalBytes = int64_t(bytesPerLine) * height + kAlignImageBy;
+	if (totalBytes > kMaxFrameStorageBytes) {
+		return false;
+	}
+	out->width = width;
+	out->height = height;
+	out->bytesPerLine = int(bytesPerLine);
+	out->totalBytes = int(totalBytes);
+	return true;
+}
+
 [[nodiscard]] bool IsValidAspectRatio(AVRational aspect) {
 	return (aspect.num > 0)
 		&& (aspect.den > 0)
@@ -91,23 +157,24 @@ void PremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
 #endif // LIB_FFMPEG_USE_QT_PRIVATE_API
 }
 
-#if !defined TDESKTOP_USE_PACKAGED && !defined Q_OS_WIN && !defined Q_OS_MAC
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
 [[nodiscard]] auto CheckHwLibs() {
 	auto list = std::deque{
 		AV_PIX_FMT_CUDA,
 	};
-	if (base::Platform::LoadLibrary("libvdpau.so.1")) {
+	if (!_libvdpau_so_tramp_resolve_all
+			|| base::Platform::LoadLibrary("libvdpau.so.1")) {
 		list.push_front(AV_PIX_FMT_VDPAU);
 	}
 	if ([&] {
 		const auto list = std::array{
-			"libva-drm.so.2",
-			"libva-x11.so.2",
-			"libva.so.2",
-			"libdrm.so.2",
+			std::make_pair(_libva_drm_so_tramp_resolve_all, "libva-drm.so.2"),
+			std::make_pair(_libva_x11_so_tramp_resolve_all, "libva-x11.so.2"),
+			std::make_pair(_libva_so_tramp_resolve_all, "libva.so.2"),
+			std::make_pair(_libdrm_so_tramp_resolve_all, "libdrm.so.2"),
 		};
-		for (const auto lib : list) {
-			if (!base::Platform::LoadLibrary(lib)) {
+		for (const auto &lib : list) {
+			if (lib.first && !base::Platform::LoadLibrary(lib.second)) {
 				return false;
 			}
 		}
@@ -117,7 +184,7 @@ void PremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
 	}
 	return list;
 }
-#endif // !TDESKTOP_USE_PACKAGED && !Q_OS_WIN && !Q_OS_MAC
+#endif // !Q_OS_WIN && !Q_OS_MAC
 
 [[nodiscard]] bool InitHw(AVCodecContext *context, AVHWDeviceType type) {
 	AVCodecContext *parent = static_cast<AVCodecContext*>(context->opaque);
@@ -160,9 +227,7 @@ void PremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
 		}
 		return false;
 	};
-#if !defined TDESKTOP_USE_PACKAGED && !defined Q_OS_WIN && !defined Q_OS_MAC
-	static const auto list = CheckHwLibs();
-#else // !TDESKTOP_USE_PACKAGED && !Q_OS_WIN && !Q_OS_MAC
+#if defined Q_OS_WIN || defined Q_OS_MAC
 	const auto list = std::array{
 #ifdef Q_OS_WIN
 		AV_PIX_FMT_D3D11,
@@ -170,13 +235,11 @@ void PremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
 		AV_PIX_FMT_CUDA,
 #elif defined Q_OS_MAC // Q_OS_WIN
 		AV_PIX_FMT_VIDEOTOOLBOX,
-#else // Q_OS_WIN || Q_OS_MAC
-		AV_PIX_FMT_VAAPI,
-		AV_PIX_FMT_VDPAU,
-		AV_PIX_FMT_CUDA,
 #endif // Q_OS_WIN || Q_OS_MAC
 	};
-#endif // TDESKTOP_USE_PACKAGED || Q_OS_WIN || Q_OS_MAC
+#else // Q_OS_WIN || Q_OS_MAC
+	static const auto list = CheckHwLibs();
+#endif // !Q_OS_WIN && !Q_OS_MAC
 	for (const auto format : list) {
 		if (!has(format)) {
 			continue;
@@ -227,6 +290,9 @@ enum AVPixelFormat GetFormatImplementation(
 
 } // namespace
 
+const char kOptionFFmpegMultiThread[] = "ffmpeg-multithread";
+const char kOptionFFmpegThreadCount[] = "ffmpeg-thread-count";
+
 IOPointer MakeIOPointer(
 		void *opaque,
 		int(*read)(void *opaque, uint8_t *buffer, int bufferSize),
@@ -284,10 +350,12 @@ FormatPointer MakeFormatPointer(
 		return {};
 	}
 	result->pb = io.get();
+	result->flags |= AVFMT_FLAG_CUSTOM_IO;
 
 	auto options = (AVDictionary*)nullptr;
 	const auto guard = gsl::finally([&] { av_dict_free(&options); });
 	av_dict_set(&options, "usetoc", "1", 0);
+
 	const auto error = AvErrorWrap(avformat_open_input(
 		&result,
 		nullptr,
@@ -307,6 +375,54 @@ FormatPointer MakeFormatPointer(
 	return FormatPointer(result);
 }
 
+FormatPointer MakeWriteFormatPointer(
+		void *opaque,
+		int(*read)(void *opaque, uint8_t *buffer, int bufferSize),
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+		int(*write)(void *opaque, const uint8_t *buffer, int bufferSize),
+#else
+		int(*write)(void *opaque, uint8_t *buffer, int bufferSize),
+#endif
+		int64_t(*seek)(void *opaque, int64_t offset, int whence),
+		const QByteArray &format) {
+	const AVOutputFormat *found = nullptr;
+	void *i = nullptr;
+	while ((found = av_muxer_iterate(&i))) {
+		if (found->name == format) {
+			break;
+		}
+	}
+	if (!found) {
+		LogError(
+			"av_muxer_iterate",
+			u"Format %1 not found"_q.arg(QString::fromUtf8(format)));
+		return {};
+	}
+
+	auto io = MakeIOPointer(opaque, read, write, seek);
+	if (!io) {
+		return {};
+	}
+	io->seekable = (seek != nullptr);
+
+	auto result = (AVFormatContext*)nullptr;
+	auto error = AvErrorWrap(avformat_alloc_output_context2(
+		&result,
+		(AVOutputFormat*)found,
+		nullptr,
+		nullptr));
+	if (!result || error) {
+		LogError("avformat_alloc_output_context2", error);
+		return {};
+	}
+	result->pb = io.get();
+	result->flags |= AVFMT_FLAG_CUSTOM_IO;
+
+	// Now FormatPointer will own and free the IO context.
+	io.release();
+	return FormatPointer(result);
+}
+
 void FormatDeleter::operator()(AVFormatContext *value) {
 	if (value) {
 		const auto deleter = IOPointer(value->pb);
@@ -321,6 +437,12 @@ const AVCodec *FindDecoder(not_null<AVCodecContext*> context) {
 		: avcodec_find_decoder(context->codec_id);
 }
 
+int64_t MaxPixelsForAreaLimit(int64_t area) {
+	// Decoders may check internally padded frame dimensions against max_pixels,
+	// not just the visible frame size. Leave room for alignment/cropping slack.
+	return area + area / kMaxPixelsPaddingRatio + kMaxPixelsFixedPadding;
+}
+
 CodecPointer MakeCodecPointer(CodecDescriptor descriptor) {
 	auto error = AvErrorWrap();
 
@@ -337,7 +459,18 @@ CodecPointer MakeCodecPointer(CodecDescriptor descriptor) {
 		return {};
 	}
 	context->pkt_timebase = stream->time_base;
-	av_opt_set(context, "threads", "auto", 0);
+	if ((descriptor.videoMaxArea > 0)
+		&& (context->codec_type == AVMEDIA_TYPE_VIDEO)) {
+		context->max_pixels = MaxPixelsForAreaLimit(
+			descriptor.videoMaxArea);
+	}
+	if (OptionFFmpegMultiThread.value()) {
+		av_opt_set_int(
+			context,
+			"threads",
+			OptionFFmpegThreadCount.value(),
+			0);
+	}
 	av_opt_set_int(context, "refcounted_frames", 1, 0);
 
 	const auto codec = FindDecoder(context);
@@ -448,21 +581,94 @@ SwscalePointer MakeSwscalePointer(
 		existing);
 }
 
+void SwresampleDeleter::operator()(SwrContext *value) {
+	if (value) {
+		swr_free(&value);
+	}
+}
+
+SwresamplePointer MakeSwresamplePointer(
+		AVChannelLayout *srcLayout,
+		AVSampleFormat srcFormat,
+		int srcRate,
+		AVChannelLayout *dstLayout,
+		AVSampleFormat dstFormat,
+		int dstRate,
+		SwresamplePointer *existing) {
+	// We have to use custom caching for SwsContext, because
+	// sws_getCachedContext checks passed flags with existing context flags,
+	// and re-creates context if they're different, but in the process of
+	// context creation the passed flags are modified before being written
+	// to the resulting context, so the caching doesn't work.
+	if (existing && (*existing) != nullptr) {
+		const auto &deleter = existing->get_deleter();
+		if (srcLayout->nb_channels == deleter.srcChannels
+			&& dstLayout->nb_channels == deleter.dstChannels
+			&& srcFormat == deleter.srcFormat
+			&& dstFormat == deleter.dstFormat
+			&& srcRate == deleter.srcRate
+			&& dstRate == deleter.dstRate) {
+			return std::move(*existing);
+		}
+	}
+
+	// Initialize audio resampler
+	auto result = (SwrContext*)nullptr;
+	auto error = AvErrorWrap(swr_alloc_set_opts2(
+		&result,
+		dstLayout,
+		dstFormat,
+		dstRate,
+		srcLayout,
+		srcFormat,
+		srcRate,
+		0,
+		nullptr));
+	if (error || !result) {
+		LogError(u"swr_alloc_set_opts2"_q, error);
+		return SwresamplePointer();
+	}
+
+	error = AvErrorWrap(swr_init(result));
+	if (error) {
+		LogError(u"swr_init"_q, error);
+		swr_free(&result);
+		return SwresamplePointer();
+	}
+
+	return SwresamplePointer(
+		result,
+		{
+			srcFormat,
+			srcRate,
+			srcLayout->nb_channels,
+			dstFormat,
+			dstRate,
+			dstLayout->nb_channels,
+		});
+}
+
 void SwscaleDeleter::operator()(SwsContext *value) {
 	if (value) {
 		sws_freeContext(value);
 	}
 }
 
-void LogError(const QString &method) {
-	LOG(("Streaming Error: Error in %1.").arg(method));
+void LogError(const QString &method, const QString &details) {
+	LOG(("Streaming Error: Error in %1%2."
+		).arg(method
+		).arg(details.isEmpty() ? QString() : " - " + details));
 }
 
-void LogError(const QString &method, AvErrorWrap error) {
-	LOG(("Streaming Error: Error in %1 (code: %2, text: %3)."
+void LogError(
+		const QString &method,
+		AvErrorWrap error,
+		const QString &details) {
+	LOG(("Streaming Error: Error in %1 (code: %2, text: %3)%4."
 		).arg(method
 		).arg(error.code()
-		).arg(error.text()));
+		).arg(error.text()
+		).arg(details.isEmpty() ? QString() : " - " + details));
 }
 
 crl::time PtsToTime(int64_t pts, AVRational timeBase) {
@@ -512,13 +718,14 @@ int DurationByPacket(const Packet &packet, AVRational timeBase) {
 }
 
 int ReadRotationFromMetadata(not_null<AVStream*> stream) {
-	const auto displaymatrix = av_stream_get_side_data(
-		stream,
-		AV_PKT_DATA_DISPLAYMATRIX,
-		nullptr);
+	const auto displaymatrix = av_packet_side_data_get(
+		stream->codecpar->coded_side_data,
+		stream->codecpar->nb_coded_side_data,
+		AV_PKT_DATA_DISPLAYMATRIX);
 	auto theta = 0;
 	if (displaymatrix) {
-		theta = -round(av_display_rotation_get((int32_t*)displaymatrix));
+		const auto matrix = (int32_t*)displaymatrix->data;
+		theta = -round(av_display_rotation_get(matrix));
 	}
 	theta -= 360 * floor(theta / 360 + 0.9 / 360);
 	const auto result = int(base::SafeRound(theta));
@@ -553,27 +760,26 @@ bool GoodStorageForFrame(const QImage &storage, QSize size) {
 
 // Create a QImage of desired size where all the data is properly aligned.
 QImage CreateFrameStorage(QSize size) {
-	const auto width = size.width();
-	const auto height = size.height();
-	const auto widthAlign = kAlignImageBy / kPixelBytesSize;
-	const auto neededWidth = width + ((width % widthAlign)
-		? (widthAlign - (width % widthAlign))
-		: 0);
-	const auto perLine = neededWidth * kPixelBytesSize;
-	const auto buffer = new uchar[perLine * height + kAlignImageBy];
-	const auto cleanupData = static_cast<void *>(buffer);
+	auto layout = AlignedFrameStorageLayout();
+	if (!ComputeAlignedFrameStorageLayout(size, &layout)) {
+		return {};
+	}
+	const auto buffer = new (std::nothrow) uchar[layout.totalBytes];
+	if (!buffer) {
+		return {};
+	}
 	const auto address = reinterpret_cast<uintptr_t>(buffer);
 	const auto alignedBuffer = buffer + ((address % kAlignImageBy)
 		? (kAlignImageBy - (address % kAlignImageBy))
 		: 0);
 	return QImage(
 		alignedBuffer,
-		width,
-		height,
-		perLine,
+		layout.width,
+		layout.height,
+		layout.bytesPerLine,
 		kImageFormat,
 		AlignedImageBufferCleanupHandler,
-		cleanupData);
+		buffer);
 }
 
 void UnPremultiply(QImage &dst, const QImage &src) {
@@ -581,21 +787,32 @@ void UnPremultiply(QImage &dst, const QImage &src) {
 	// as an image in QImage::Format_ARGB32 format.
 	if (!GoodStorageForFrame(dst, src.size())) {
 		dst = CreateFrameStorage(src.size());
+		if (dst.isNull()) {
+			return;
+		}
 	}
 	const auto srcPerLine = src.bytesPerLine();
 	const auto dstPerLine = dst.bytesPerLine();
 	const auto width = src.width();
 	const auto height = src.height();
+	if (width <= 0 || height <= 0) {
+		return;
+	}
+	const auto packedLine = int64_t(width) * kPixelBytesSize;
+	const auto packedCount = int64_t(width) * height;
+	const auto fast = (srcPerLine == packedLine)
+		&& (dstPerLine == packedLine)
+		&& (packedCount <= kMaxFrameStorageBytes);
 	auto srcBytes = src.bits();
 	auto dstBytes = dst.bits();
-	if (srcPerLine != width * 4 || dstPerLine != width * 4) {
+	if (!fast) {
 		for (auto i = 0; i != height; ++i) {
 			UnPremultiplyLine(dstBytes, srcBytes, width);
 			srcBytes += srcPerLine;
 			dstBytes += dstPerLine;
 		}
 	} else {
-		UnPremultiplyLine(dstBytes, srcBytes, width * height);
+		UnPremultiplyLine(dstBytes, srcBytes, int(packedCount));
 	}
 }
 
@@ -603,14 +820,21 @@ void PremultiplyInplace(QImage &image) {
 	const auto perLine = image.bytesPerLine();
 	const auto width = image.width();
 	const auto height = image.height();
+	if (width <= 0 || height <= 0) {
+		return;
+	}
+	const auto packedLine = int64_t(width) * kPixelBytesSize;
+	const auto packedCount = int64_t(width) * height;
+	const auto fast = (perLine == packedLine)
+		&& (packedCount <= kMaxFrameStorageBytes);
 	auto bytes = image.bits();
-	if (perLine != width * 4) {
+	if (!fast) {
 		for (auto i = 0; i != height; ++i) {
 			PremultiplyLine(bytes, bytes, width);
 			bytes += perLine;
 		}
 	} else {
-		PremultiplyLine(bytes, bytes, width * height);
+		PremultiplyLine(bytes, bytes, int(packedCount));
 	}
 }
 
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
index d96daa9c79279b..ae9f6201329004 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "base/bytes.h"
 #include "base/algorithm.h"
 
+#include <cstdint>
 #include <crl/crl_time.h>
 
 #include <QSize>
@@ -19,18 +20,14 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libswscale/swscale.h>
+#include <libswresample/swresample.h>
+#include <libavutil/opt.h>
 #include <libavutil/version.h>
 } // extern "C"
 
-#define DA_FFMPEG_NEW_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_INT >= \
-	AV_VERSION_INT(57, 28, 100))
-
 #define DA_FFMPEG_CONST_WRITE_CALLBACK (LIBAVFORMAT_VERSION_INT >= \
 	AV_VERSION_INT(61, 01, 100))
 
-#define DA_FFMPEG_HAVE_DURATION (LIBAVUTIL_VERSION_INT >= \
-	AV_VERSION_INT(58, 02, 100))
-
 class QImage;
 
 namespace FFmpeg {
@@ -41,6 +38,9 @@ inline constexpr auto kAVBlockSize = 4096; // 4Kb for ffmpeg blocksize
 constexpr auto kUniversalTimeBase = AVRational{ 1, AV_TIME_BASE };
 constexpr auto kNormalAspect = AVRational{ 1, 1 };
 
+extern const char kOptionFFmpegMultiThread[];
+extern const char kOptionFFmpegThreadCount[];
+
 class AvErrorWrap {
 public:
 	AvErrorWrap(int code = 0) : _code(code) {
@@ -138,6 +138,16 @@ using FormatPointer = std::unique_ptr<AVFormatContext, FormatDeleter>;
 	int(*write)(void *opaque, uint8_t *buffer, int bufferSize),
 #endif
 	int64_t(*seek)(void *opaque, int64_t offset, int whence));
+[[nodiscard]] FormatPointer MakeWriteFormatPointer(
+	void *opaque,
+	int(*read)(void *opaque, uint8_t *buffer, int bufferSize),
+#if DA_FFMPEG_CONST_WRITE_CALLBACK
+	int(*write)(void *opaque, const uint8_t *buffer, int bufferSize),
+#else
+	int(*write)(void *opaque, uint8_t *buffer, int bufferSize),
+#endif
+	int64_t(*seek)(void *opaque, int64_t offset, int whence),
+	const QByteArray &format);
 
 struct CodecDeleter {
 	void operator()(AVCodecContext *value);
@@ -147,6 +157,7 @@ using CodecPointer = std::unique_ptr<AVCodecContext, CodecDeleter>;
 struct CodecDescriptor {
 	not_null<AVStream*> stream;
 	bool hwAllowed = false;
+	int64_t videoMaxArea = 0;
 };
 [[nodiscard]] CodecPointer MakeCodecPointer(CodecDescriptor descriptor);
 
@@ -179,10 +190,34 @@ using SwscalePointer = std::unique_ptr<SwsContext, SwscaleDeleter>;
 	QSize resize,
 	SwscalePointer *existing = nullptr);
 
-void LogError(const QString &method);
-void LogError(const QString &method, FFmpeg::AvErrorWrap error);
+struct SwresampleDeleter {
+	AVSampleFormat srcFormat = AV_SAMPLE_FMT_NONE;
+	int srcRate = 0;
+	int srcChannels = 0;
+	AVSampleFormat dstFormat = AV_SAMPLE_FMT_NONE;
+	int dstRate = 0;
+	int dstChannels = 0;
+
+	void operator()(SwrContext *value);
+};
+using SwresamplePointer = std::unique_ptr<SwrContext, SwresampleDeleter>;
+[[nodiscard]] SwresamplePointer MakeSwresamplePointer(
+	AVChannelLayout *srcLayout,
+	AVSampleFormat srcFormat,
+	int srcRate,
+	AVChannelLayout *dstLayout,
+	AVSampleFormat dstFormat,
+	int dstRate,
+	SwresamplePointer *existing = nullptr);
+
+void LogError(const QString &method, const QString &details = {});
+void LogError(
+	const QString &method,
+	FFmpeg::AvErrorWrap error,
+	const QString &details = {});
 
 [[nodiscard]] const AVCodec *FindDecoder(not_null<AVCodecContext*> context);
+[[nodiscard]] int64_t MaxPixelsForAreaLimit(int64_t area);
 [[nodiscard]] crl::time PtsToTime(int64_t pts, AVRational timeBase);
 // Used for full duration conversion.
 [[nodiscard]] crl::time PtsToTimeCeil(int64_t pts, AVRational timeBase);
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_filter.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_filter.cpp
index f158f8be120ff0..27613d8d43d5fa 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_filter.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_filter.cpp
@@ -25,12 +25,19 @@ EditFlagsDescriptor<FilterValue::Flags> FilterValueLabels(bool isChannel) {
 		| Flag::Unkick;
 	const auto membersNew = Flag::Join | Flag::Invite;
 	const auto membersRemoved = Flag::Leave;
+	auto membersNewText = (isChannel
+		? tr::lng_admin_log_filter_subscribers_new
+		: tr::lng_admin_log_filter_members_new)(tr::now);
+	auto membersRemovedText = (isChannel
+		? tr::lng_admin_log_filter_subscribers_removed
+		: tr::lng_admin_log_filter_members_removed)(tr::now);
 
 	auto members = std::vector<Label>{
 		{ adminRights, tr::lng_admin_log_filter_admins_new(tr::now) },
+		{ Flag::EditRank, tr::lng_admin_log_filter_edit_rank(tr::now) },
 		{ restrictions, tr::lng_admin_log_filter_restrictions(tr::now) },
-		{ membersNew, tr::lng_admin_log_filter_members_new(tr::now) },
-		{ membersRemoved, tr::lng_admin_log_filter_members_removed(tr::now) },
+		{ membersNew, std::move(membersNewText) },
+		{ membersRemoved, std::move(membersRemovedText) },
 	};
 
 	const auto info = Flag::Info | Flag::Settings;
@@ -76,11 +83,15 @@ EditFlagsDescriptor<FilterValue::Flags> FilterValueLabels(bool isChannel) {
 	}
 	return { .labels = {
 		{
-			tr::lng_admin_log_filter_actions_member_section(),
+			!isChannel
+				? tr::lng_admin_log_filter_actions_member_section()
+				: tr::lng_admin_log_filter_actions_subscriber_section(),
 			std::move(members),
 		},
 		{
-			tr::lng_admin_log_filter_actions_settings_section(),
+			!isChannel
+				? tr::lng_admin_log_filter_actions_settings_section()
+				: tr::lng_admin_log_filter_actions_channel_settings_section(),
 			std::move(settings),
 		},
 		{
@@ -94,7 +105,7 @@ Fn<FilterValue::Flags()> FillFilterValueList(
 		not_null<Ui::VerticalLayout*> container,
 		bool isChannel,
 		const FilterValue &filter) {
-	auto [checkboxes, getResult, changes] = CreateEditAdminLogFilter(
+	auto [checkboxes, getResult, changes, highlightWidget] = CreateEditAdminLogFilter(
 		container,
 		filter.flags ? (*filter.flags) : ~FilterValue::Flags(0),
 		isChannel);
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_filter_value.h b/Telegram/SourceFiles/history/admin_log/history_admin_log_filter_value.h
index 619f58322daa0b..2465cd38e6740a 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_filter_value.h
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_filter_value.h
@@ -29,8 +29,9 @@ struct FilterValue final {
 		Invites = (1U << 15),
 		Topics = (1U << 16),
 		SubExtend = (1U << 17),
+		EditRank = (1U << 18),
 
-		MAX_FIELD = (1U << 17),
+		MAX_FIELD = (1U << 18),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr bool is_flag_type(Flag) { return true; };
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
index b67629f92b4598..b9bbefa5dfd2b5 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -11,18 +11,23 @@ For license and copyright information please follow this link:
 #include "history/view/media/history_view_media.h"
 #include "history/view/media/history_view_web_page.h"
 #include "history/history_item.h"
+#include "history/history_item_helpers.h"
 #include "history/history_item_components.h"
+#include "history/history_item_reply_markup.h"
 #include "history/history_item_text.h"
 #include "history/admin_log/history_admin_log_section.h"
 #include "history/admin_log/history_admin_log_filter.h"
 #include "history/view/history_view_context_menu.h"
 #include "history/view/history_view_message.h"
+#include "history/view/history_view_reply.h"
 #include "history/view/history_view_service_message.h"
 #include "history/view/history_view_cursor_state.h"
 #include "chat_helpers/message_field.h"
 #include "boxes/sticker_set_box.h"
+#include "boxes/translate_box.h"
 #include "ui/boxes/confirm_box.h"
 #include "base/platform/base_platform_info.h"
+#include "base/qt/qt_common_adapters.h"
 #include "base/qt/qt_key_modifiers.h"
 #include "base/unixtime.h"
 #include "base/call_delayed.h"
@@ -32,6 +37,7 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "api/api_chat_participants.h"
 #include "api/api_attached_stickers.h"
+#include "api/api_report.h"
 #include "window/window_session_controller.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
@@ -78,9 +84,19 @@ namespace {
 // If we require to support more admins we'll have to rewrite this anyway.
 constexpr auto kMaxChannelAdmins = 200;
 constexpr auto kScrollDateHideTimeout = 1000;
-constexpr auto kEventsFirstPage = 20;
-constexpr auto kEventsPerPage = 50;
+constexpr auto kScrollDateHideOnDayCrossingTimeout = crl::time(3000);
+constexpr auto kEventsFirstPage = 100;
+constexpr auto kEventsPerPage = 100;
 constexpr auto kClearUserpicsAfter = 50;
+constexpr auto kNewEventsCheckInterval = crl::time(5000);
+constexpr auto kNewEventsLimit = 100;
+
+// Trigger an Up preload when fewer than this many display rows sit above
+// the visible top.
+constexpr auto kPreloadUpDisplayItemsBuffer = 4;
+
+// Max span between a delete group's first event and any later one.
+constexpr auto kDeleteGroupTimeWindowSeconds = TimeId(5);
 
 } // namespace
 
@@ -89,31 +105,31 @@ void InnerWidget::enumerateItems(Method method) {
 	constexpr auto TopToBottom = (direction == EnumItemsDirection::TopToBottom);
 
 	// No displayed messages in this history.
-	if (_items.empty()) {
+	if (_displayItems.empty()) {
 		return;
 	}
 	if (_visibleBottom <= _itemsTop || _itemsTop + _itemsHeight <= _visibleTop) {
 		return;
 	}
 
-	auto begin = std::rbegin(_items), end = std::rend(_items);
-	auto from = TopToBottom ? std::lower_bound(begin, end, _visibleTop, [this](auto &elem, int top) {
-		return this->itemTop(elem) + elem->height() <= top;
-	}) : std::upper_bound(begin, end, _visibleBottom, [this](int bottom, auto &elem) {
-		return this->itemTop(elem) + elem->height() >= bottom;
+	auto begin = std::rbegin(_displayItems), end = std::rend(_displayItems);
+	auto from = TopToBottom ? std::lower_bound(begin, end, _visibleTop, [this](const DisplayEntry &elem, int top) {
+		return this->itemTop(elem.view) + elem.view->height() <= top;
+	}) : std::upper_bound(begin, end, _visibleBottom, [this](int bottom, const DisplayEntry &elem) {
+		return this->itemTop(elem.view) + elem.view->height() >= bottom;
 	});
 	auto wasEnd = (from == end);
 	if (wasEnd) {
 		--from;
 	}
 	if (TopToBottom) {
-		Assert(itemTop(from->get()) + from->get()->height() > _visibleTop);
+		Assert(itemTop(from->view) + from->view->height() > _visibleTop);
 	} else {
-		Assert(itemTop(from->get()) < _visibleBottom);
+		Assert(itemTop(from->view) < _visibleBottom);
 	}
 
 	while (true) {
-		auto item = from->get();
+		auto item = from->view;
 		auto itemtop = itemTop(item);
 		auto itembottom = itemtop + item->height();
 
@@ -255,50 +271,57 @@ InnerWidget::InnerWidget(
 	HistoryView::MakePathShiftGradient(
 		controller->chatStyle(),
 		[=] { update(); }))
+, _highlighter(
+	&_history->owner(),
+	[=](const HistoryItem *item) { return viewForItem(item); },
+	[=](const Element *view) { repaintItem(view); })
 , _scrollDateCheck([=] { scrollDateCheck(); })
 , _emptyText(
 		st::historyAdminLogEmptyWidth
 		- st::historyAdminLogEmptyPadding.left()
 		- st::historyAdminLogEmptyPadding.left())
-, _antiSpamValidator(_controller, _channel) {
+, _antiSpamValidator(_controller, _channel)
+, _touchSelectTimer([=] { onTouchSelect(); })
+, _touchScrollTimer([=] { onTouchScrollTimer(); }) {
 	Window::ChatThemeValueFromPeer(
 		controller,
 		channel
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
 		_theme = std::move(theme);
 		controller->setChatStyleTheme(_theme);
 	}, lifetime());
 
+	setAttribute(Qt::WA_AcceptTouchEvents);
 	setMouseTracking(true);
 	_scrollDateHideTimer.setCallback([=] { scrollDateHideByTimer(); });
 	session().data().viewRepaintRequest(
-	) | rpl::start_with_next([=](auto view) {
-		if (view->delegate() == this) {
-			repaintItem(view);
+	) | rpl::on_next([=](Data::RequestViewRepaint data) {
+		if (myView(data.view)) {
+			repaintItem(data.view, data.rect);
 		}
 	}, lifetime());
 	session().data().viewResizeRequest(
-	) | rpl::start_with_next([=](auto view) {
-		if (view->delegate() == this) {
+	) | rpl::on_next([=](auto view) {
+		if (myView(view)) {
 			resizeItem(view);
 		}
 	}, lifetime());
 	session().data().itemViewRefreshRequest(
-	) | rpl::start_with_next([=](auto item) {
+	) | rpl::on_next([=](auto item) {
 		if (const auto view = viewForItem(item)) {
 			refreshItem(view);
 		}
 	}, lifetime());
 	session().data().viewLayoutChanged(
-	) | rpl::start_with_next([=](auto view) {
-		if (view->delegate() == this) {
+	) | rpl::on_next([=](auto view) {
+		if (myView(view)) {
 			if (view->isUnderCursor()) {
 				updateSelected();
 			}
 		}
 	}, lifetime());
 	session().data().itemDataChanges(
-	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		if (const auto view = viewForItem(item)) {
 			view->itemDataChanged();
 		}
@@ -309,7 +332,7 @@ InnerWidget::InnerWidget(
 		return (_history == query.item->history())
 			&& query.item->isAdminLogEntry()
 			&& isVisible();
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			const Data::Session::ItemVisibilityQuery &query) {
 		if (const auto view = viewForItem(query.item)) {
 			auto top = itemTop(view);
@@ -322,7 +345,7 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 
 	controller->adaptive().chatWideValue(
-	) | rpl::start_with_next([=](bool wide) {
+	) | rpl::on_next([=](bool wide) {
 		_isChatWide = wide;
 	}, lifetime());
 
@@ -331,6 +354,13 @@ InnerWidget::InnerWidget(
 	_antiSpamValidator.resolveUser(crl::guard(
 		this,
 		[=] { requestAdmins(); }));
+
+	_newEventsTimer.setCallback([=] { requestNewEvents(); });
+	_newEventsTimer.callEach(kNewEventsCheckInterval);
+}
+
+bool InnerWidget::myView(not_null<const HistoryView::Element*> view) const {
+	return !_items.empty() && (view->delegate().get() == this);
 }
 
 Main::Session &InnerWidget::session() const {
@@ -349,10 +379,20 @@ rpl::producer<> InnerWidget::cancelSignal() const {
 	return _cancelSignal.events();
 }
 
+rpl::producer<int> InnerWidget::newEventsCountValue() const {
+	return _newEventsCount.value();
+}
+
+void InnerWidget::resetNewEventsCount() {
+	_unreadEventIds.clear();
+	_newEventsCount = 0;
+}
+
 void InnerWidget::visibleTopBottomUpdated(
 		int visibleTop,
 		int visibleBottom) {
 	auto scrolledUp = (visibleTop < _visibleTop);
+	auto scrolledDown = (visibleTop > _visibleTop);
 	_visibleTop = visibleTop;
 	_visibleBottom = visibleBottom;
 
@@ -364,9 +404,29 @@ void InnerWidget::visibleTopBottomUpdated(
 	updateVisibleTopItem();
 	checkPreloadMore();
 	if (scrolledUp) {
+		_scrollDateAfterDayCrossing = false;
 		_scrollDateCheck.call();
 	} else {
-		scrollDateHideByTimer();
+		scrollDateCheckDownward();
+	}
+	const auto pruneUnreadEvents = !_skipUnreadEventPrune && scrolledDown;
+	if (pruneUnreadEvents && _visibleBottom == height()) {
+		resetNewEventsCount();
+	} else if (pruneUnreadEvents && !_unreadEventIds.empty()) {
+		const auto before = _unreadEventIds.size();
+		enumerateItems<EnumItemsDirection::TopToBottom>([&](
+				not_null<Element*> view,
+				int,
+				int) {
+			const auto it = _itemEventIds.find(view->data());
+			if (it != _itemEventIds.end()) {
+				_unreadEventIds.remove(it->second);
+			}
+			return true;
+		});
+		if (_unreadEventIds.size() != before) {
+			_newEventsCount = int(_unreadEventIds.size());
+		}
 	}
 	_controller->floatPlayerAreaUpdated();
 	session().data().itemVisibilitiesUpdated();
@@ -375,17 +435,22 @@ void InnerWidget::visibleTopBottomUpdated(
 void InnerWidget::updateVisibleTopItem() {
 	if (_visibleBottom == height()) {
 		_visibleTopItem = nullptr;
+		_visibleTopDisplayIndex = -1;
 	} else {
-		auto begin = std::rbegin(_items), end = std::rend(_items);
-		auto from = std::lower_bound(begin, end, _visibleTop, [this](auto &&elem, int top) {
-			return this->itemTop(elem) + elem->height() <= top;
+		auto begin = std::rbegin(_displayItems), end = std::rend(_displayItems);
+		auto from = std::lower_bound(begin, end, _visibleTop, [this](const DisplayEntry &elem, int top) {
+			return this->itemTop(elem.view) + elem.view->height() <= top;
 		});
 		if (from != end) {
-			_visibleTopItem = *from;
+			_visibleTopItem = from->view;
 			_visibleTopFromItem = _visibleTop - _visibleTopItem->y();
+			_visibleTopDisplayIndex = int(_displayItems.size())
+				- 1
+				- int(from - begin);
 		} else {
 			_visibleTopItem = nullptr;
 			_visibleTopFromItem = _visibleTop;
+			_visibleTopDisplayIndex = -1;
 		}
 	}
 }
@@ -410,8 +475,33 @@ void InnerWidget::scrollDateCheck() {
 	}
 }
 
+void InnerWidget::scrollDateCheckDownward() {
+	const auto previousDay = _scrollDateLastItem
+		? _scrollDateLastItem->dateTime().date()
+		: QDate();
+	const auto currentDay = _visibleTopItem
+		? _visibleTopItem->dateTime().date()
+		: QDate();
+	const auto crossedDay = previousDay.isValid()
+		&& currentDay.isValid()
+		&& (previousDay != currentDay);
+	_scrollDateLastItem = _visibleTopItem;
+	_scrollDateLastItemTop = _visibleTopFromItem;
+	if (crossedDay) {
+		if (!_scrollDateShown) {
+			toggleScrollDateShown();
+		}
+		_scrollDateAfterDayCrossing = true;
+		_scrollDateHideTimer.callOnce(
+			kScrollDateHideOnDayCrossingTimeout);
+	} else if (!_scrollDateAfterDayCrossing) {
+		scrollDateHideByTimer();
+	}
+}
+
 void InnerWidget::scrollDateHideByTimer() {
 	_scrollDateHideTimer.cancel();
+	_scrollDateAfterDayCrossing = false;
 	scrollDateHide();
 }
 
@@ -438,11 +528,25 @@ void InnerWidget::checkPreloadMore() {
 	if (_visibleTop + PreloadHeightsCount * (_visibleBottom - _visibleTop) > height()) {
 		preloadMore(Direction::Down);
 	}
-	if (_visibleTop < PreloadHeightsCount * (_visibleBottom - _visibleTop)) {
+	if (_visibleTop < PreloadHeightsCount * (_visibleBottom - _visibleTop)
+			&& displayItemsAboveVisibleTop() < kPreloadUpDisplayItemsBuffer) {
 		preloadMore(Direction::Up);
 	}
 }
 
+int InnerWidget::displayItemsAboveVisibleTop() const {
+	if (!_visibleTopItem) {
+		// Either nothing is loaded yet (we want a preload to kick off the
+		// first request) or the whole content fits in viewport. Both states
+		// should let Up preload fire if other conditions agree.
+		return 0;
+	}
+	Assert(_visibleTopDisplayIndex >= 0
+		&& _visibleTopDisplayIndex < int(_displayItems.size()));
+	// Larger storage index = higher visually (reverse layout).
+	return int(_displayItems.size()) - 1 - _visibleTopDisplayIndex;
+}
+
 void InnerWidget::applyFilter(FilterValue &&value) {
 	if (_filter != value) {
 		_filter = value;
@@ -461,7 +565,7 @@ void InnerWidget::requestAdmins() {
 	const auto offset = 0;
 	const auto participantsHash = uint64(0);
 	_api.request(MTPchannels_GetParticipants(
-		_channel->inputChannel,
+		_channel->inputChannel(),
 		MTP_channelParticipantsAdmins(),
 		MTP_int(offset),
 		MTP_int(kMaxChannelAdmins),
@@ -545,7 +649,7 @@ void InnerWidget::showFilter(Fn<void(FilterValue &&filter)> callback) {
 				box->verticalLayout(),
 				tr::lng_admin_log_filter_actions_admins_section(
 					tr::now,
-					Ui::Text::WithEntities),
+					tr::marked),
 				checkedPeerId.size() == admins.size(),
 				st::defaultBoxCheckbox));
 		using Controller = Ui::ExpandablePeerListController;
@@ -588,9 +692,11 @@ void InnerWidget::showFilter(Fn<void(FilterValue &&filter)> callback) {
 void InnerWidget::clearAndRequestLog() {
 	_api.request(base::take(_preloadUpRequestId)).cancel();
 	_api.request(base::take(_preloadDownRequestId)).cancel();
+	_api.request(base::take(_newEventsRequestId)).cancel();
 	_filterChanged = true;
 	_upLoaded = false;
 	_downLoaded = true;
+	resetNewEventsCount();
 	updateMinMaxIds();
 	preloadMore(Direction::Up);
 }
@@ -598,7 +704,7 @@ void InnerWidget::clearAndRequestLog() {
 void InnerWidget::updateEmptyText() {
 	auto hasSearch = !_searchQuery.isEmpty();
 	auto hasFilter = _filter.flags || _filter.admins;
-	auto text = Ui::Text::Semibold((hasSearch || hasFilter)
+	auto text = tr::semibold((hasSearch || hasFilter)
 		? tr::lng_admin_log_no_results_title(tr::now)
 		: tr::lng_admin_log_no_events_title(tr::now));
 	auto description = hasSearch
@@ -616,8 +722,9 @@ void InnerWidget::updateEmptyText() {
 }
 
 QString InnerWidget::tooltipText() const {
-	if (_mouseCursorState == CursorState::Date
-		&& _mouseAction == MouseAction::None) {
+	if (_mouseAction == MouseAction::None
+		&& (_mouseCursorState == CursorState::Date
+			|| _mouseCursorState == CursorState::LogAdminService)) {
 		if (const auto view = Element::Hovered()) {
 			auto dateText = HistoryView::DateTooltipText(view);
 
@@ -662,7 +769,8 @@ bool InnerWidget::elementUnderCursor(
 	return (Element::Hovered() == view);
 }
 
-HistoryView::SelectionModeResult InnerWidget::elementInSelectionMode() {
+HistoryView::SelectionModeResult InnerWidget::elementInSelectionMode(
+		const HistoryView::Element *) {
 	return {};
 }
 
@@ -685,6 +793,16 @@ void InnerWidget::elementShowPollResults(
 	FullMsgId context) {
 }
 
+void InnerWidget::elementShowAddPollOption(
+	not_null<HistoryView::Element*> view,
+	not_null<PollData*> poll,
+	FullMsgId context,
+	QRect optionRect) {
+}
+
+void InnerWidget::elementSubmitAddPollOption(FullMsgId context) {
+}
+
 void InnerWidget::elementOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) {
@@ -698,6 +816,12 @@ void InnerWidget::elementOpenDocument(
 	_controller->openDocument(document, showInMediaView, { context });
 }
 
+bool InnerWidget::elementScrollToLocalY(
+		not_null<const Element*> view,
+		int localTop) {
+	return false;
+}
+
 void InnerWidget::elementCancelUpload(const FullMsgId &context) {
 	if (const auto item = session().data().message(context)) {
 		_controller->cancelUploadLayer(item);
@@ -709,12 +833,18 @@ void InnerWidget::elementShowTooltip(
 	Fn<void()> hiddenCallback) {
 }
 
+void InnerWidget::elementShowHiddenSenderTooltip(
+		FullMsgId itemId,
+		const TextWithEntities &text) {
+	_controller->showToast(TextWithEntities(text));
+}
+
 bool InnerWidget::elementAnimationsPaused() {
 	return _controller->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
 }
 
 bool InnerWidget::elementHideReply(not_null<const Element*> view) {
-	return true;
+	return false;
 }
 
 bool InnerWidget::elementShownUnread(not_null<const Element*> view) {
@@ -735,8 +865,9 @@ void InnerWidget::elementSearchInList(
 void InnerWidget::elementHandleViaClick(not_null<UserData*> bot) {
 }
 
-bool InnerWidget::elementIsChatWide() {
-	return _isChatWide;
+HistoryView::ElementChatMode InnerWidget::elementChatMode() {
+	using Mode = HistoryView::ElementChatMode;
+	return _isChatWide ? Mode::Wide : Mode::Default;
 }
 
 not_null<Ui::PathShiftGradient*> InnerWidget::elementPathShiftGradient() {
@@ -746,6 +877,74 @@ not_null<Ui::PathShiftGradient*> InnerWidget::elementPathShiftGradient() {
 void InnerWidget::elementReplyTo(const FullReplyTo &to) {
 }
 
+void InnerWidget::jumpToMessageInLog(
+		not_null<HistoryItem*> item,
+		MessageHighlightId highlight) {
+	if (!viewForItem(item)) {
+		expandGroupContaining(item);
+	}
+	const auto view = viewForItem(item);
+	if (!view) {
+		return;
+	}
+	_highlighter.highlight({ item, highlight });
+
+	const auto top = itemTop(view);
+	const auto height = view->height();
+	const auto viewport = _visibleBottom - _visibleTop;
+	if (top >= _visibleTop && top + height <= _visibleBottom) {
+		return;
+	}
+	const auto from = _visibleTop;
+	const auto target = std::clamp(
+		top - std::max(0, (viewport - height) / 2),
+		0,
+		std::max(0, this->height() - viewport));
+	if (from == target) {
+		return;
+	}
+	_scrollToAnimation.stop();
+	_scrollToAnimation.start(
+		[=] {
+			_scrollToSignal.fire_copy(
+				anim::interpolate(
+					from,
+					target,
+					_scrollToAnimation.value(1.)));
+		},
+		0.,
+		1.,
+		st::slideDuration,
+		anim::easeOutCubic);
+}
+
+void InnerWidget::expandGroupContaining(not_null<HistoryItem*> item) {
+	auto index = -1;
+	for (auto i = 0, count = int(_items.size()); i != count; ++i) {
+		if (_items[i]->data() == item) {
+			index = i;
+			break;
+		}
+	}
+	if (index < 0) {
+		return;
+	}
+	for (const auto &group : _deleteGroups) {
+		if (index < group.startIndex || index >= group.endIndex) {
+			continue;
+		}
+		if (group.eventCount > 3
+			&& !_expandedGroups.contains(group.eventId)) {
+			_expandedGroups.insert(group.eventId);
+			clearDisplayPointers(DisplayPointerScope::All);
+			_skipScrollRestore = true;
+			rebuildDisplayItems();
+			_skipScrollRestore = false;
+		}
+		return;
+	}
+}
+
 void InnerWidget::elementStartInteraction(not_null<const Element*> view) {
 }
 
@@ -775,7 +974,9 @@ void InnerWidget::saveState(not_null<SectionMemento*> memento) {
 	memento->setAdmins(std::move(_admins));
 	memento->setAdminsCanEdit(std::move(_adminsCanEdit));
 	memento->setSearchQuery(std::move(_searchQuery));
+	memento->setExpandedGroups(std::move(_expandedGroups));
 	if (!_filterChanged) {
+		clearDisplayItems(DisplayPointerScope::All);
 		for (auto &item : _items) {
 			item.clearView();
 		}
@@ -784,27 +985,40 @@ void InnerWidget::saveState(not_null<SectionMemento*> memento) {
 			base::take(_eventIds),
 			_upLoaded,
 			_downLoaded);
+		memento->setDeleteEventMeta(
+			base::take(_itemEventIds),
+			base::take(_eventAdminIds),
+			base::take(_eventDates));
 		base::take(_itemsByData);
 	}
 	_upLoaded = _downLoaded = true; // Don't load or handle anything anymore.
 }
 
 void InnerWidget::restoreState(not_null<SectionMemento*> memento) {
-	_items = memento->takeItems();
-	for (auto &item : _items) {
+	// OwnedItem::refreshView may call requestItemResize.
+	// So we postpone resizing until all views are created.
+	_items.clear();
+	auto items = memento->takeItems();
+	for (auto &item : items) {
 		item.refreshView(this);
-		_itemsByData.emplace(item->data(), item.get());
 	}
+	_items = std::move(items);
+
 	_eventIds = memento->takeEventIds();
 	_admins = memento->takeAdmins();
 	_adminsCanEdit = memento->takeAdminsCanEdit();
 	_filter = memento->takeFilter();
 	_searchQuery = memento->takeSearchQuery();
+	_expandedGroups = memento->takeExpandedGroups();
+	_itemEventIds = memento->takeItemEventIds();
+	_eventAdminIds = memento->takeEventAdminIds();
+	_eventDates = memento->takeEventDates();
 	_upLoaded = memento->upLoaded();
 	_downLoaded = memento->downLoaded();
 	_filterChanged = false;
 	updateMinMaxIds();
-	updateSize();
+	computeDeleteGroups();
+	rebuildDisplayItems();
 }
 
 void InnerWidget::preloadMore(Direction direction) {
@@ -838,7 +1052,8 @@ void InnerWidget::preloadMore(Direction direction) {
 			| ((f & LocalFlag::GroupCall) ? Flag::f_group_call : empty)
 			| ((f & LocalFlag::Invites) ? Flag::f_invites : empty)
 			| ((f & LocalFlag::Topics) ? Flag::f_forums : empty)
-			| ((f & LocalFlag::SubExtend) ? Flag::f_sub_extend : empty);
+			| ((f & LocalFlag::SubExtend) ? Flag::f_sub_extend : empty)
+			| ((f & LocalFlag::EditRank) ? Flag::f_edit_rank : empty);
 	}();
 	if (_filter.flags != 0) {
 		flags |= MTPchannels_GetAdminLog::Flag::f_events_filter;
@@ -848,7 +1063,7 @@ void InnerWidget::preloadMore(Direction direction) {
 		if (!_filter.admins->empty()) {
 			admins.reserve(_filter.admins->size());
 			for (const auto &admin : (*_filter.admins)) {
-				admins.push_back(admin->inputUser);
+				admins.push_back(admin->inputUser());
 			}
 		}
 		flags |= MTPchannels_GetAdminLog::Flag::f_admins;
@@ -858,7 +1073,7 @@ void InnerWidget::preloadMore(Direction direction) {
 	auto perPage = _items.empty() ? kEventsFirstPage : kEventsPerPage;
 	requestId = _api.request(MTPchannels_GetAdminLog(
 		MTP_flags(flags),
-		_channel->inputChannel,
+		_channel->inputChannel(),
 		MTP_string(_searchQuery),
 		MTP_channelAdminLogEventsFilter(MTP_flags(filter)),
 		MTP_vector<MTPInputUser>(admins),
@@ -883,6 +1098,121 @@ void InnerWidget::preloadMore(Direction direction) {
 	}).send();
 }
 
+void InnerWidget::requestNewEvents() {
+	if (_newEventsRequestId
+		|| _filterChanged
+		|| _preloadUpRequestId
+		|| _preloadDownRequestId
+		|| _eventIds.empty()) {
+		return;
+	}
+	fetchNewEventsBatch(
+		_maxId,
+		0,
+		std::make_shared<QVector<MTPChannelAdminLogEvent>>());
+}
+
+void InnerWidget::fetchNewEventsBatch(
+		uint64 pollMinId,
+		uint64 maxId,
+		std::shared_ptr<QVector<MTPChannelAdminLogEvent>> accumulated) {
+	auto flags = MTPchannels_GetAdminLog::Flags(0);
+	const auto filter = [&] {
+		using Flag = MTPDchannelAdminLogEventsFilter::Flag;
+		using LocalFlag = FilterValue::Flag;
+		const auto empty = MTPDchannelAdminLogEventsFilter::Flags(0);
+		const auto f = _filter.flags.value_or(LocalFlag());
+		return empty
+			| ((f & LocalFlag::Join) ? Flag::f_join : empty)
+			| ((f & LocalFlag::Leave) ? Flag::f_leave : empty)
+			| ((f & LocalFlag::Invite) ? Flag::f_invite : empty)
+			| ((f & LocalFlag::Ban) ? Flag::f_ban : empty)
+			| ((f & LocalFlag::Unban) ? Flag::f_unban : empty)
+			| ((f & LocalFlag::Kick) ? Flag::f_kick : empty)
+			| ((f & LocalFlag::Unkick) ? Flag::f_unkick : empty)
+			| ((f & LocalFlag::Promote) ? Flag::f_promote : empty)
+			| ((f & LocalFlag::Demote) ? Flag::f_demote : empty)
+			| ((f & LocalFlag::Info) ? Flag::f_info : empty)
+			| ((f & LocalFlag::Settings) ? Flag::f_settings : empty)
+			| ((f & LocalFlag::Pinned) ? Flag::f_pinned : empty)
+			| ((f & LocalFlag::Edit) ? Flag::f_edit : empty)
+			| ((f & LocalFlag::Delete) ? Flag::f_delete : empty)
+			| ((f & LocalFlag::GroupCall) ? Flag::f_group_call : empty)
+			| ((f & LocalFlag::Invites) ? Flag::f_invites : empty)
+			| ((f & LocalFlag::Topics) ? Flag::f_forums : empty)
+			| ((f & LocalFlag::SubExtend) ? Flag::f_sub_extend : empty)
+			| ((f & LocalFlag::EditRank) ? Flag::f_edit_rank : empty);
+	}();
+	if (_filter.flags != 0) {
+		flags |= MTPchannels_GetAdminLog::Flag::f_events_filter;
+	}
+	auto admins = QVector<MTPInputUser>(0);
+	if (_filter.admins) {
+		if (!_filter.admins->empty()) {
+			admins.reserve(_filter.admins->size());
+			for (const auto &admin : (*_filter.admins)) {
+				admins.push_back(admin->inputUser());
+			}
+		}
+		flags |= MTPchannels_GetAdminLog::Flag::f_admins;
+	}
+	_newEventsRequestId = _api.request(MTPchannels_GetAdminLog(
+		MTP_flags(flags),
+		_channel->inputChannel(),
+		MTP_string(_searchQuery),
+		MTP_channelAdminLogEventsFilter(MTP_flags(filter)),
+		MTP_vector<MTPInputUser>(admins),
+		MTP_long(maxId),
+		MTP_long(pollMinId),
+		MTP_int(kNewEventsLimit)
+	)).done([=](const MTPchannels_AdminLogResults &result) {
+		Expects(result.type() == mtpc_channels_adminLogResults);
+
+		_newEventsRequestId = 0;
+		if (_filterChanged) {
+			return;
+		}
+		const auto &results = result.c_channels_adminLogResults();
+		_channel->owner().processUsers(results.vusers());
+		_channel->owner().processChats(results.vchats());
+
+		const auto &events = results.vevents().v;
+		for (const auto &event : events) {
+			if (!_eventIds.contains(event.data().vid().v)) {
+				accumulated->push_back(event);
+			}
+		}
+
+		if (events.size() == kNewEventsLimit && !events.isEmpty()) {
+			const auto nextMaxId = events.back().data().vid().v;
+			fetchNewEventsBatch(pollMinId, nextMaxId, accumulated);
+			return;
+		}
+		flushNewEvents(*accumulated);
+	}).fail([=] {
+		_newEventsRequestId = 0;
+		flushNewEvents(*accumulated);
+	}).send();
+}
+
+void InnerWidget::flushNewEvents(
+		const QVector<MTPChannelAdminLogEvent> &events) {
+	if (_filterChanged || events.isEmpty()) {
+		return;
+	}
+	auto fresh = QVector<MTPChannelAdminLogEvent>();
+	fresh.reserve(events.size());
+	for (const auto &event : events) {
+		if (!_eventIds.contains(event.data().vid().v)) {
+			fresh.push_back(event);
+		}
+	}
+	if (fresh.isEmpty()) {
+		return;
+	}
+	addEvents(Direction::Down, fresh);
+}
+
 void InnerWidget::addEvents(Direction direction, const QVector<MTPChannelAdminLogEvent> &events) {
 	if (_filterChanged) {
 		clearAfterFilterChange();
@@ -904,7 +1234,9 @@ void InnerWidget::addEvents(Direction direction, const QVector<MTPChannelAdminLo
 		: newItemsForDownDirection;
 	addToItems.reserve(oldItemsCount + events.size() * 2);
 
+	const auto canRestrict = InnerWidget::canRestrict();
 	const auto antiSpamUserId = _antiSpamValidator.userId();
+	auto newItems = std::vector<not_null<HistoryItem*>>();
 	for (const auto &event : events) {
 		const auto &data = event.data();
 		const auto id = data.vid().v;
@@ -913,6 +1245,14 @@ void InnerWidget::addEvents(Direction direction, const QVector<MTPChannelAdminLo
 		}
 		const auto rememberRealMsgId = (antiSpamUserId
 			== peerToUser(peerFromUser(data.vuser_id())));
+		const auto isDeleteAction = (data.vaction().type()
+			== mtpc_channelAdminLogEventActionDeleteMessage);
+		if (isDeleteAction) {
+			_eventAdminIds.emplace(
+				id,
+				peerToUser(peerFromUser(data.vuser_id())));
+			_eventDates.emplace(id, data.vdate().v);
+		}
 
 		auto count = 0;
 		const auto addOne = [&](
@@ -924,11 +1264,21 @@ void InnerWidget::addEvents(Direction direction, const QVector<MTPChannelAdminLo
 			}
 			_eventIds.emplace(id);
 			_itemsByData.emplace(item->data(), item.get());
-			if (rememberRealMsgId && realId) {
-				_antiSpamValidator.addEventMsgId(
-					item->data()->fullId(),
-					realId);
+			_itemEventIds.emplace(item->data(), id);
+			if (realId) {
+				if (rememberRealMsgId) {
+					_antiSpamValidator.addEventMsgId(
+						item->data()->fullId(),
+						realId);
+				}
+				if (canRestrict) {
+					_realIdsForReport[item->data()->fullId()] = realId;
+				}
+				if (!item->data()->isService()) {
+					_itemsByRealMsgId.insert_or_assign(realId, item->data());
+				}
 			}
+			newItems.push_back(item->data());
 			addToItems.push_back(std::move(item));
 			++count;
 		};
@@ -947,8 +1297,24 @@ void InnerWidget::addEvents(Direction direction, const QVector<MTPChannelAdminLo
 			}
 		}
 	}
+
+	for (const auto &item : newItems) {
+		const auto replyTo = item->replyToFullId();
+		if (replyTo.peer != _history->peer->id) {
+			continue;
+		}
+		const auto i = _itemsByRealMsgId.find(replyTo.msg);
+		if (i != _itemsByRealMsgId.end() && i->second != item) {
+			item->resolveAdminLogReplyTo(i->second);
+		}
+	}
+
 	auto newItemsCount = _items.size() + ((direction == Direction::Up) ? 0 : newItemsForDownDirection.size());
 	if (newItemsCount != oldItemsCount) {
+		// _visibleTopItem may end up absorbed and have a stale y() after
+		// rebuild; pin to a captured real-item anchor instead.
+		const auto anchor = captureScrollAnchor();
+
 		if (direction == Direction::Down) {
 			for (auto &item : _items) {
 				newItemsForDownDirection.push_back(std::move(item));
@@ -956,7 +1322,23 @@ void InnerWidget::addEvents(Direction direction, const QVector<MTPChannelAdminLo
 			_items = std::move(newItemsForDownDirection);
 		}
 		updateMinMaxIds();
-		itemsAdded(direction, newItemsCount - oldItemsCount);
+		computeDeleteGroups();
+		_skipScrollRestore = true;
+		rebuildDisplayItems();
+		_skipScrollRestore = false;
+
+		if (!up) {
+			for (const auto &event : events) {
+				_unreadEventIds.emplace(event.data().vid().v);
+			}
+			_newEventsCount = int(_unreadEventIds.size());
+		}
+
+		const auto skipUnreadEventPrune = gsl::finally([&] {
+			_skipUnreadEventPrune = false;
+		});
+		_skipUnreadEventPrune = !up;
+		_scrollToSignal.fire_copy(computeScrollFromAnchor(anchor));
 	}
 	update();
 }
@@ -973,31 +1355,413 @@ void InnerWidget::updateMinMaxIds() {
 	}
 }
 
-void InnerWidget::itemsAdded(Direction direction, int addedCount) {
-	Expects(addedCount >= 0);
-	auto checkFrom = (direction == Direction::Up)
-		? (_items.size() - addedCount)
-		: 1; // Should be ": 0", but zero is skipped anyway.
-	auto checkTo = (direction == Direction::Up) ? (_items.size() + 1) : (addedCount + 1);
-	for (auto i = checkFrom; i != checkTo; ++i) {
-		if (i > 0) {
-			const auto view = _items[i - 1].get();
-			if (i < _items.size()) {
-				const auto previous = _items[i].get();
-				view->setDisplayDate(view->dateTime().date() != previous->dateTime().date());
-				const auto attach = view->computeIsAttachToPrevious(previous);
-				view->setAttachToPrevious(attach, previous);
-				previous->setAttachToNext(attach, view);
-			} else {
-				view->setDisplayDate(true);
+
+void InnerWidget::computeDeleteGroups() {
+	_deleteGroups.clear();
+
+	if (_items.empty()) {
+		return;
+	}
+
+	// Groups break on: different admin, time span over the window, or a
+	// sticky boundary marker from the previous pass.
+	auto previousAnchors = std::move(_previousDeleteGroupAnchors);
+	_previousDeleteGroupAnchors.clear();
+
+	auto groupStart = -1;
+	auto groupAdmin = UserId();
+	auto groupEventId = uint64(0);
+	auto groupEventCount = 0;
+	auto groupFirstDate = TimeId(0);
+	auto currentEventId = uint64(0);
+	auto closeAfterCurrentEvent = false;
+
+	const auto finalizeGroup = [&](int endIndex) {
+		if (groupEventCount > 0) {
+			Assert(endIndex - groupStart >= groupEventCount * 2);
+			_deleteGroups.push_back({
+				.eventId = groupEventId,
+				.adminId = groupAdmin,
+				.startIndex = groupStart,
+				.endIndex = endIndex,
+				.eventCount = groupEventCount,
+			});
+			// Items run newest→oldest, so groupEventId is the old edge.
+			_previousDeleteGroupAnchors.insert(groupEventId);
+		}
+		groupStart = -1;
+		groupAdmin = UserId();
+		groupEventId = 0;
+		groupEventCount = 0;
+		groupFirstDate = 0;
+		closeAfterCurrentEvent = false;
+	};
+
+	for (auto i = 0, count = int(_items.size()); i < count; ++i) {
+		const auto item = _items[i]->data();
+		const auto eit = _itemEventIds.find(item);
+		if (eit == _itemEventIds.end()) {
+			finalizeGroup(i);
+			continue;
+		}
+		const auto eventId = eit->second;
+		const auto adminIt = _eventAdminIds.find(eventId);
+		if (adminIt == _eventAdminIds.end()) {
+			finalizeGroup(i);
+			continue;
+		}
+		const auto adminId = adminIt->second;
+
+		if (eventId != currentEventId) {
+			const auto dateIt = _eventDates.find(eventId);
+			const auto thisDate = (dateIt != _eventDates.end())
+				? dateIt->second
+				: TimeId(0);
+
+			const auto sameAdmin = (groupStart >= 0)
+				&& (adminId == groupAdmin);
+			const auto withinTimeWindow = sameAdmin
+				&& groupFirstDate
+				&& thisDate
+				&& (std::abs(thisDate - groupFirstDate)
+					<= kDeleteGroupTimeWindowSeconds);
+			const auto canExtend = sameAdmin
+				&& withinTimeWindow
+				&& !closeAfterCurrentEvent;
+			if (!canExtend) {
+				finalizeGroup(i);
+				groupStart = i;
+				groupAdmin = adminId;
+				groupFirstDate = thisDate;
+			}
+			currentEventId = eventId;
+			groupEventId = eventId;
+			++groupEventCount;
+
+			// Sticky: a previous old edge keeps its boundary across rebuilds.
+			if (previousAnchors.contains(eventId)) {
+				closeAfterCurrentEvent = true;
+			}
+		}
+	}
+	finalizeGroup(int(_items.size()));
+}
+
+OwnedItem InnerWidget::createGroupSummaryItem(
+		const DeleteGroup &group,
+		bool expanded) {
+	const auto admin = _history->owner().user(group.adminId);
+	const auto fromLink = admin->createOpenLink();
+	const auto fromLinkText = tr::link(admin->name(), QString());
+
+	// Collect unique author names from content messages in the group.
+	constexpr auto kMaxNames = 4;
+	auto authorNames = QStringList();
+	auto seenAuthors = base::flat_set<PeerId>();
+	auto totalAuthors = 0;
+	for (auto i = group.startIndex; i < group.endIndex; ++i) {
+		const auto item = _items[i]->data();
+		if (!item->isService()) {
+			const auto authorId = item->from()->id;
+			if (!seenAuthors.contains(authorId)) {
+				seenAuthors.emplace(authorId);
+				++totalAuthors;
+				if (authorNames.size() < kMaxNames) {
+					authorNames.push_back(item->from()->name());
+				}
+			}
+		}
+	}
+	auto names = authorNames.join(u", "_q);
+	if (totalAuthors > kMaxNames) {
+		names += u", \u2026"_q;
+	}
+
+	const auto toggleText = expanded
+		? tr::lng_admin_log_hide_all(tr::now)
+		: tr::lng_admin_log_show_all(tr::now);
+
+	const auto groupEventId = group.eventId;
+	const auto toggleLink = std::make_shared<LambdaClickHandler>(
+		[weak = QPointer<InnerWidget>(this), groupEventId] {
+			if (const auto strong = weak.data()) {
+				strong->toggleDeleteGroup(groupEventId);
+			}
+		});
+
+	auto text = tr::lng_admin_log_deleted_messages_collapsed(
+		tr::now,
+		lt_count,
+		group.eventCount,
+		lt_from,
+		fromLinkText,
+		lt_names,
+		{ names },
+		lt_link,
+		tr::link(toggleText, QString()),
+		tr::marked);
+
+	auto message = PreparedServiceText{ text };
+	message.links.push_back(fromLink);
+	message.links.push_back(toggleLink);
+
+	const auto date = (group.endIndex > group.startIndex)
+		? _items[group.endIndex - 1]->dateTime().toSecsSinceEpoch()
+		: 0;
+
+	return OwnedItem(this, _history->makeMessage({
+		.id = _history->nextNonHistoryEntryId(),
+		.flags = MessageFlag::AdminLogEntry,
+		.from = peerFromUser(group.adminId),
+		.date = TimeId(date),
+	}, std::move(message)));
+}
+
+void InnerWidget::setupExpandButton(
+		not_null<HistoryItem*> item,
+		int hiddenCount,
+		uint64 groupEventId) {
+	const auto text = tr::lng_admin_log_expand_more(
+		tr::now,
+		lt_count,
+		hiddenCount);
+
+	auto markup = HistoryMessageMarkupData();
+	markup.flags = ReplyMarkupFlag::Inline;
+	markup.rows.push_back({
+		HistoryMessageMarkupButton(
+			HistoryMessageMarkupButton::Type::Callback,
+			text,
+			{},
+			QByteArray()),
+	});
+	item->updateReplyMarkup(std::move(markup));
+	_expandMarkupItems.emplace(item);
+}
+
+void InnerWidget::clearExpandButtons() {
+	const auto hasExpandButton = [&](const Element *view) {
+		if (!view) {
+			return false;
+		}
+		for (const auto &item : _items) {
+			if (item.get() == view) {
+				return _expandMarkupItems.contains(item->data());
 			}
 		}
+		return false;
+	};
+	if (hasExpandButton(_mouseActionItem)) {
+		_mouseActionItem = nullptr;
+		_mouseAction = MouseAction::None;
+	}
+	if (hasExpandButton(Element::Hovered())) {
+		Element::Hovered(nullptr);
+		ClickHandler::clearActive();
+	}
+	if (hasExpandButton(Element::Pressed())) {
+		Element::Pressed(nullptr);
+		ClickHandler::unpressed();
+	}
+	if (hasExpandButton(Element::HoveredLink())) {
+		Element::HoveredLink(nullptr);
+		ClickHandler::clearActive();
 	}
+	if (hasExpandButton(Element::PressedLink())) {
+		Element::PressedLink(nullptr);
+		ClickHandler::unpressed();
+	}
+	if (hasExpandButton(Element::Moused())) {
+		Element::Moused(nullptr);
+	}
+	for (const auto &item : _expandMarkupItems) {
+		item->updateReplyMarkup({});
+	}
+	_expandMarkupItems.clear();
+}
+
+void InnerWidget::toggleDeleteGroup(uint64 groupEventId) {
+	_toggleAnimation.stop();
+
+	const auto scrollBefore = _visibleTop;
+	const auto anchor = captureScrollAnchor();
+
+	if (_expandedGroups.contains(groupEventId)) {
+		_expandedGroups.erase(groupEventId);
+	} else {
+		_expandedGroups.insert(groupEventId);
+	}
+
+	clearDisplayPointers(DisplayPointerScope::All);
+
+	_skipScrollRestore = true;
+	rebuildDisplayItems();
+	_skipScrollRestore = false;
+
+	const auto scrollTarget = anchor.view
+		? computeScrollFromAnchor(anchor)
+		: scrollBefore;
+
+	_scrollToSignal.fire_copy(scrollBefore);
+	if (scrollBefore != scrollTarget) {
+		const auto from = scrollBefore;
+		const auto to = scrollTarget;
+		_toggleAnimation.start(
+			[=] { _scrollToSignal.fire_copy(anim::interpolate(
+				from, to, _toggleAnimation.value(1.))); },
+			0.,
+			1.,
+			st::slideDuration,
+			anim::easeOutCubic);
+	}
+}
+
+bool InnerWidget::displayPointerMatches(
+		const Element *view,
+		DisplayPointerScope pointerScope) const {
+	if (!view) {
+		return false;
+	}
+	for (const auto &item : _summaryItems) {
+		if (item.get() == view) {
+			return true;
+		}
+	}
+	if (pointerScope == DisplayPointerScope::All) {
+		for (const auto &item : _items) {
+			if (item.get() == view) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+void InnerWidget::clearDisplayPointers(DisplayPointerScope pointerScope) {
+	const auto clearAll = (pointerScope == DisplayPointerScope::All);
+	const auto clearMember = [&](const Element *view) {
+		return clearAll || displayPointerMatches(view, pointerScope);
+	};
+	if (clearMember(_visibleTopItem)) {
+		_visibleTopItem = nullptr;
+		_visibleTopFromItem = 0;
+		_visibleTopDisplayIndex = -1;
+	}
+	if (clearMember(_scrollDateLastItem)) {
+		_scrollDateLastItem = nullptr;
+		_scrollDateLastItemTop = 0;
+	}
+	if (clearMember(_mouseActionItem)) {
+		_mouseActionItem = nullptr;
+		_mouseAction = MouseAction::None;
+	}
+	if (clearMember(_selectedItem)) {
+		_selectedItem = nullptr;
+		_selectedTextSelection = MessageSelection();
+	}
+	if (displayPointerMatches(Element::Hovered(), pointerScope)) {
+		Element::Hovered(nullptr);
+		ClickHandler::clearActive();
+	}
+	if (displayPointerMatches(Element::Pressed(), pointerScope)) {
+		Element::Pressed(nullptr);
+		ClickHandler::unpressed();
+	}
+	if (displayPointerMatches(Element::HoveredLink(), pointerScope)) {
+		Element::HoveredLink(nullptr);
+		ClickHandler::clearActive();
+	}
+	if (displayPointerMatches(Element::PressedLink(), pointerScope)) {
+		Element::PressedLink(nullptr);
+		ClickHandler::unpressed();
+	}
+	if (displayPointerMatches(Element::Moused(), pointerScope)) {
+		Element::Moused(nullptr);
+	}
+}
+
+void InnerWidget::clearDisplayItems(DisplayPointerScope pointerScope) {
+	clearExpandButtons();
+	clearDisplayPointers(pointerScope);
+	_summaryItems.clear();
+	_displayItems.clear();
+	_itemsByData.clear();
+}
+
+void InnerWidget::rebuildDisplayItems() {
+	clearDisplayItems(DisplayPointerScope::Transient);
+
+	const auto groupDisplayEnabled = _searchQuery.isEmpty();
+
+	// Build a set of group start indices for quick lookup.
+	auto groupByStart = base::flat_map<int, int>(); // startIndex -> group index
+	for (auto g = 0, gc = int(_deleteGroups.size()); g < gc; ++g) {
+		groupByStart.emplace(_deleteGroups[g].startIndex, g);
+	}
+
+	const auto append = [&](Element *view, int topItemsIndex) {
+		_displayItems.push_back({ view, topItemsIndex });
+		_itemsByData.emplace(view->data(), view);
+	};
+
+	auto i = 0;
+	const auto count = int(_items.size());
+	while (i < count) {
+		const auto git = groupByStart.find(i);
+		if (groupDisplayEnabled && git != groupByStart.end()) {
+			const auto &group = _deleteGroups[git->second];
+			if (group.eventCount > 3) {
+				const auto expanded = _expandedGroups.contains(group.eventId);
+				if (expanded) {
+					for (auto j = group.startIndex; j < group.endIndex; ++j) {
+						append(_items[j].get(), j);
+					}
+				} else if (group.endIndex >= group.startIndex + 2) {
+					// Collapsed: show only the content, skip the header.
+					const auto contentItem = _items[group.endIndex - 2]->data();
+					setupExpandButton(
+						contentItem,
+						group.eventCount - 1,
+						group.eventId);
+					append(
+						_items[group.endIndex - 2].get(),
+						group.endIndex - 2);
+				}
+				auto summary = createGroupSummaryItem(group, expanded);
+				append(summary.get(), group.endIndex - 1);
+				_summaryItems.push_back(std::move(summary));
+
+				i = group.endIndex;
+				continue;
+			}
+		}
+		append(_items[i].get(), i);
+		++i;
+	}
+
+	for (const auto &entry : _displayItems) {
+		entry.view->setAttachToPrevious(false);
+		entry.view->setAttachToNext(false);
+	}
+	for (auto d = 0, dc = int(_displayItems.size()); d < dc; ++d) {
+		const auto view = _displayItems[d].view;
+		if (d + 1 < dc) {
+			const auto previous = _displayItems[d + 1].view;
+			view->setDisplayDate(
+				view->dateTime().date() != previous->dateTime().date());
+			const auto attach = view->computeIsAttachToPrevious(previous);
+			view->setAttachToPrevious(attach, previous);
+			previous->setAttachToNext(attach, view);
+		} else {
+			view->setDisplayDate(true);
+		}
+	}
+
 	updateSize();
 }
 
 void InnerWidget::updateSize() {
-	TWidget::resizeToWidth(width());
+	RpWidget::resizeToWidth(width());
 	restoreScrollPosition();
 	updateVisibleTopItem();
 	checkPreloadMore();
@@ -1008,12 +1772,13 @@ int InnerWidget::resizeGetHeight(int newWidth) {
 
 	const auto resizeAllItems = (_itemsWidth != newWidth);
 	auto newHeight = 0;
-	for (const auto &item : ranges::views::reverse(_items)) {
-		item->setY(newHeight);
-		if (item->pendingResize() || resizeAllItems) {
-			newHeight += item->resizeGetHeight(newWidth);
+	for (auto it = _displayItems.rbegin(); it != _displayItems.rend(); ++it) {
+		const auto view = it->view;
+		view->setY(newHeight);
+		if (view->pendingResize() || resizeAllItems) {
+			newHeight += view->resizeGetHeight(newWidth);
 		} else {
-			newHeight += item->height();
+			newHeight += view->height();
 		}
 	}
 	_itemsWidth = newWidth;
@@ -1023,12 +1788,101 @@ int InnerWidget::resizeGetHeight(int newWidth) {
 }
 
 void InnerWidget::restoreScrollPosition() {
+	if (_skipScrollRestore) {
+		return;
+	}
 	const auto newVisibleTop = _visibleTopItem
 		? (itemTop(_visibleTopItem) + _visibleTopFromItem)
 		: ScrollMax;
 	_scrollToSignal.fire_copy(newVisibleTop);
 }
 
+auto InnerWidget::captureScrollAnchor() const -> ScrollAnchor {
+	if (_displayItems.empty()) {
+		return {};
+	}
+	// Skip summaries — they get a fresh HistoryItem on every rebuild.
+	auto begin = std::rbegin(_displayItems);
+	auto end = std::rend(_displayItems);
+	auto from = std::lower_bound(begin, end, _visibleTop,
+		[this](const DisplayEntry &elem, int top) {
+			return this->itemTop(elem.view) + elem.view->height() <= top;
+		});
+	for (auto it = from; it != end; ++it) {
+		const auto view = it->view;
+		if (_itemEventIds.contains(view->data())) {
+			return { view, _visibleTop - itemTop(view) };
+		}
+	}
+	auto it = from;
+	while (it != begin) {
+		--it;
+		const auto view = it->view;
+		if (_itemEventIds.contains(view->data())) {
+			return { view, _visibleTop - itemTop(view) };
+		}
+	}
+	return {};
+}
+
+int InnerWidget::computeScrollFromAnchor(ScrollAnchor anchor) const {
+	if (!anchor.view) {
+		return ScrollMax;
+	}
+	const auto it = _itemsByData.find(anchor.view->data());
+	if (it != _itemsByData.end() && it->second == anchor.view) {
+		return itemTop(anchor.view) + anchor.delta;
+	}
+	// Anchor was absorbed; snap to its group's summary instead.
+	auto anchorItemsIndex = -1;
+	for (auto i = 0, n = int(_items.size()); i != n; ++i) {
+		if (_items[i].get() == anchor.view) {
+			anchorItemsIndex = i;
+			break;
+		}
+	}
+	if (anchorItemsIndex >= 0) {
+		for (const auto &group : _deleteGroups) {
+			if (anchorItemsIndex >= group.startIndex
+					&& anchorItemsIndex < group.endIndex
+					&& group.endIndex >= group.startIndex + 2) {
+				const auto contentData =
+					_items[group.endIndex - 2]->data();
+				const auto contentIt = _itemsByData.find(contentData);
+				if (contentIt == _itemsByData.end()) {
+					break;
+				}
+				// Collapsed pair is [content, summary] — summary follows it.
+				const auto contentView = contentIt->second;
+				const auto displayIt = std::find_if(
+					_displayItems.begin(),
+					_displayItems.end(),
+					[&](const DisplayEntry &e) {
+						return e.view == contentView;
+					});
+				if (displayIt != _displayItems.end()
+						&& std::next(displayIt) != _displayItems.end()) {
+					return itemTop(std::next(displayIt)->view)
+						+ anchor.delta;
+				}
+				return itemTop(contentView) + anchor.delta;
+			}
+		}
+	}
+	return ScrollMax;
+}
+
+Ui::ChatPaintContext InnerWidget::preparePaintContext(QRect clip) const {
+	return _controller->preparePaintContext({
+		.theme = _theme.get(),
+		.clip = clip,
+		.visibleAreaPositionGlobal = mapToGlobal(QPoint(0, _visibleTop)),
+		.visibleAreaTop = _visibleTop,
+		.visibleAreaWidth = width(),
+		.visibleAreaHeight = _visibleBottom - _visibleTop,
+	});
+}
+
 void InnerWidget::paintEvent(QPaintEvent *e) {
 	if (_controller->contentOverlapped(this, e)) {
 		return;
@@ -1041,13 +1895,8 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
 	auto clip = e->rect();
-	auto context = _controller->preparePaintContext({
-		.theme = _theme.get(),
-		.clip = clip,
-		.visibleAreaPositionGlobal = mapToGlobal(QPoint(0, _visibleTop)),
-		.visibleAreaTop = _visibleTop,
-		.visibleAreaWidth = width(),
-	});
+	auto context = preparePaintContext(clip);
+	context.highlightPathCache = &_highlightPathCache;
 	if (_items.empty() && _upLoaded && _downLoaded) {
 		paintEmpty(p, context.st);
 	} else {
@@ -1056,23 +1905,29 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			width(),
 			std::min(st::msgMaxWidth / 2, width() / 2));
 
-		auto begin = std::rbegin(_items), end = std::rend(_items);
-		auto from = std::lower_bound(begin, end, clip.top(), [this](auto &elem, int top) {
-			return this->itemTop(elem) + elem->height() <= top;
+		auto begin = std::rbegin(_displayItems), end = std::rend(_displayItems);
+		auto from = std::lower_bound(begin, end, clip.top(), [this](const DisplayEntry &elem, int top) {
+			return this->itemTop(elem.view) + elem.view->height() <= top;
 		});
-		auto to = std::lower_bound(begin, end, clip.top() + clip.height(), [this](auto &elem, int bottom) {
-			return this->itemTop(elem) < bottom;
+		auto to = std::lower_bound(begin, end, clip.top() + clip.height(), [this](const DisplayEntry &elem, int bottom) {
+			return this->itemTop(elem.view) < bottom;
 		});
 		if (from != end) {
-			auto top = itemTop(from->get());
+			auto top = itemTop(from->view);
 			context.translate(0, -top);
 			p.translate(0, top);
 			for (auto i = from; i != to; ++i) {
-				const auto view = i->get();
+				const auto view = i->view;
 				context.outbg = view->hasOutLayout();
 				context.selection = (view == _selectedItem)
-					? _selectedText
+					? _selectedTextSelection.flatSelection()
 					: TextSelection();
+				context.fullMessageSelected = false;
+				context.messageSelection = ((view == _selectedItem)
+					&& !_selectedTextSelection.empty())
+					? &_selectedTextSelection
+					: nullptr;
+				context.highlight = _highlighter.state(view->data());
 				view->draw(p, context);
 
 				const auto height = view->height();
@@ -1151,17 +2006,19 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 }
 
 void InnerWidget::clearAfterFilterChange() {
-	_visibleTopItem = nullptr;
-	_visibleTopFromItem = 0;
-	_scrollDateLastItem = nullptr;
-	_scrollDateLastItemTop = 0;
-	_mouseActionItem = nullptr;
-	_selectedItem = nullptr;
-	_selectedText = TextSelection();
 	_filterChanged = false;
+	clearDisplayItems(DisplayPointerScope::All);
+	_deleteGroups.clear();
+	_expandedGroups.clear();
+	_itemEventIds.clear();
+	_eventAdminIds.clear();
+	_eventDates.clear();
+	_previousDeleteGroupAnchors.clear();
 	_items.clear();
 	_eventIds.clear();
 	_itemsByData.clear();
+	_itemsByRealMsgId.clear();
+	_highlighter.clear();
 	updateEmptyText();
 	updateSize();
 }
@@ -1189,7 +2046,7 @@ void InnerWidget::paintEmpty(Painter &p, not_null<const Ui::ChatStyle*> st) {
 
 TextForMimeData InnerWidget::getSelectedText() const {
 	return _selectedItem
-		? _selectedItem->selectedText(_selectedText)
+		? _selectedItem->selectedText(_selectedTextSelection)
 		: TextForMimeData();
 }
 
@@ -1214,13 +2071,15 @@ void InnerWidget::mouseDoubleClickEvent(QMouseEvent *e) {
 		request.flags |= Ui::Text::StateRequest::Flag::LookupSymbol;
 		auto dragState = _mouseActionItem->textState(_dragStartPosition, request);
 		if (dragState.cursor == CursorState::Text) {
-			_mouseTextSymbol = dragState.symbol;
+			_mouseTextAnchor = dragState;
 			_mouseSelectType = TextSelectType::Words;
 			if (_mouseAction == MouseAction::None) {
 				_mouseAction = MouseAction::Selecting;
-				auto selection = TextSelection { dragState.symbol, dragState.symbol };
 				repaintItem(std::exchange(_selectedItem, _mouseActionItem));
-				_selectedText = selection;
+				_selectedTextSelection = _mouseActionItem->selectionFromStates(
+					_mouseTextAnchor,
+					dragState,
+					_mouseSelectType);
 			}
 			mouseMoveEvent(e);
 
@@ -1244,10 +2103,7 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	auto hasSelected = 0;
 	if (_selectedItem) {
 		isUponSelected = -1;
-
-		auto selFrom = _selectedText.from;
-		auto selTo = _selectedText.to;
-		hasSelected = (selTo > selFrom) ? 1 : 0;
+		hasSelected = _selectedTextSelection.empty() ? 0 : 1;
 		if (Element::Moused() && Element::Moused() == Element::Hovered()) {
 			auto mousePos = mapPointToItem(
 				mapFromGlobal(_mousePosition),
@@ -1255,8 +2111,9 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			StateRequest request;
 			request.flags |= Ui::Text::StateRequest::Flag::LookupSymbol;
 			auto dragState = Element::Moused()->textState(mousePos, request);
-			if (dragState.cursor == CursorState::Text
-				&& base::in_range(dragState.symbol, selFrom, selTo)) {
+			if (Element::Moused()->selectionContains(
+					_selectedTextSelection,
+					dragState)) {
 				isUponSelected = 1;
 			}
 		}
@@ -1366,7 +2223,18 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		}
 	} else if (fromId) { // suggest to block
 		if (const auto participant = session().data().peer(fromId)) {
-			suggestRestrictParticipant(participant);
+			const auto item = view ? view->data().get() : nullptr;
+			auto realId = FullMsgId();
+			if (const auto itemId = item ? item->fullId() : FullMsgId()) {
+				const auto it = _realIdsForReport.find(itemId);
+				if (it != _realIdsForReport.end()) {
+					realId = FullMsgId(_channel->id, it->second);
+				}
+			}
+			suggestRestrictParticipant(participant, realId);
+			if (_overSenderUserpic) {
+				_menu->setForcedOrigin(Ui::PanelAnimation::Origin::BottomLeft);
+			}
 		}
 	} else { // maybe cursor on some text history item?
 		const auto item = view ? view->data().get() : nullptr;
@@ -1379,6 +2247,17 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				tr::lng_context_copy_selected(tr::now),
 				[this] { copySelectedText(); },
 				&st::menuIconCopy);
+			if (item && !Ui::SkipTranslate(getSelectedText().rich)) {
+				const auto peer = item->history()->peer;
+				_menu->addAction(tr::lng_context_translate_selected({}), [=] {
+					_controller->show(Box(
+						Ui::TranslateBox,
+						peer,
+						MsgId(),
+						getSelectedText().rich,
+						false));
+				}, &st::menuIconTranslate);
+			}
 		} else {
 			if (item && !isUponSelected) {
 				const auto media = view->media();
@@ -1400,6 +2279,17 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 						copyContextText(itemId);
 					}, &st::menuIconCopy);
 				}
+				if (!item->isService() && !Ui::SkipTranslate(item->originalText())) {
+					const auto peer = item->history()->peer;
+					_menu->addAction(tr::lng_context_translate({}), [=] {
+						_controller->show(Box(
+							Ui::TranslateBox,
+							peer,
+							MsgId(),
+							item->originalText(),
+							false));
+					}, &st::menuIconTranslate);
+				}
 			}
 		}
 
@@ -1494,12 +2384,11 @@ void InnerWidget::copyContextText(FullMsgId itemId) {
 }
 
 void InnerWidget::suggestRestrictParticipant(
-		not_null<PeerData*> participant) {
+		not_null<PeerData*> participant,
+		FullMsgId realId) {
 	Expects(_menu != nullptr);
 
-	if (!_channel->isMegagroup()
-		|| !_channel->canBanMembers()
-		|| _admins.empty()) {
+	if (!canRestrict()) {
 		return;
 	}
 	if (ranges::contains(_admins, participant)) {
@@ -1515,12 +2404,13 @@ void InnerWidget::suggestRestrictParticipant(
 				UserData *by,
 				TimeId since) {
 			auto weak = QPointer<InnerWidget>(this);
-			auto weakBox = std::make_shared<QPointer<Ui::BoxContent>>();
+			auto weakBox = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 			auto box = Box<EditRestrictedBox>(
 				_channel,
 				user,
 				hasAdminRights,
 				currentRights,
+				QString(),
 				by,
 				since);
 			box->setSaveCallback([=](
@@ -1545,7 +2435,7 @@ void InnerWidget::suggestRestrictParticipant(
 					tr::now,
 					lt_user,
 					participant->name());
-			auto weakBox = std::make_shared<QPointer<Ui::BoxContent>>();
+			auto weakBox = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 			const auto sure = crl::guard(this, [=] {
 				restrictParticipant(
 					participant,
@@ -1560,8 +2450,8 @@ void InnerWidget::suggestRestrictParticipant(
 			editRestrictions(true, {}, nullptr, 0);
 		} else {
 			_api.request(MTPchannels_GetParticipant(
-				_channel->inputChannel,
-				user->input
+				_channel->inputChannel(),
+				user->input()
 			)).done([=](const MTPchannels_ChannelParticipant &result) {
 				user->owner().processUsers(result.data().vusers());
 
@@ -1592,7 +2482,7 @@ void InnerWidget::suggestRestrictParticipant(
 			participant->session().changes().peerUpdates(
 				_channel,
 				Data::PeerUpdate::Flag::Members
-			) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+			) | rpl::on_next([=](const Data::PeerUpdate &update) {
 				_downLoaded = false;
 				preloadMore(Direction::Down);
 				lifetime->destroy();
@@ -1602,12 +2492,26 @@ void InnerWidget::suggestRestrictParticipant(
 				participant,
 				{ _channel->restrictions(), 0 });
 		};
-		Ui::Menu::CreateAddActionCallback(_menu)({
+		const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
+		addAction({
 			.text = tr::lng_context_ban_user(tr::now),
-			.handler = std::move(handler),
+			.handler = handler,
 			.icon = &st::menuIconBlockAttention,
 			.isAttention = true,
 		});
+
+		if (realId) {
+			addAction({
+				.text = tr::lng_report_and_ban(tr::now),
+				.handler = [=, show = _controller->uiShow()] {
+					Api::ReportSpam(participant, { realId });
+					handler();
+					show->showToast(tr::lng_report_spam_done(tr::now));
+				},
+				.icon = &st::menuIconReportAttention,
+				.isAttention = true,
+			});
+		}
 	}
 }
 
@@ -1619,6 +2523,7 @@ void InnerWidget::restrictParticipant(
 		restrictParticipantDone(participant, newRights);
 	};
 	const auto callback = SaveRestrictedCallback(
+		_controller->uiShow(),
 		_channel,
 		participant,
 		crl::guard(this, done),
@@ -1644,6 +2549,12 @@ void InnerWidget::restrictParticipantDone(
 	checkPreloadMore();
 }
 
+bool InnerWidget::canRestrict() const {
+	return _channel->isMegagroup()
+		&& _channel->canBanMembers()
+		&& !_admins.empty();
+}
+
 void InnerWidget::mousePressEvent(QMouseEvent *e) {
 	if (_menu) {
 		e->accept();
@@ -1669,7 +2580,7 @@ void InnerWidget::mouseReleaseEvent(QMouseEvent *e) {
 
 void InnerWidget::enterEventHook(QEnterEvent *e) {
 	mouseActionUpdate(QCursor::pos());
-	return TWidget::enterEventHook(e);
+	return RpWidget::enterEventHook(e);
 }
 
 void InnerWidget::leaveEventHook(QEvent *e) {
@@ -1683,7 +2594,7 @@ void InnerWidget::leaveEventHook(QEvent *e) {
 		_cursor = style::cur_default;
 		setCursor(_cursor);
 	}
-	return TWidget::leaveEventHook(e);
+	return RpWidget::leaveEventHook(e);
 }
 
 void InnerWidget::mouseActionStart(const QPoint &screenPos, Qt::MouseButton button) {
@@ -1717,10 +2628,12 @@ void InnerWidget::mouseActionStart(const QPoint &screenPos, Qt::MouseButton butt
 			request.flags = Ui::Text::StateRequest::Flag::LookupSymbol;
 			dragState = _mouseActionItem->textState(_dragStartPosition, request);
 			if (dragState.cursor == CursorState::Text) {
-				auto selection = TextSelection { dragState.symbol, dragState.symbol };
 				repaintItem(std::exchange(_selectedItem, _mouseActionItem));
-				_selectedText = selection;
-				_mouseTextSymbol = dragState.symbol;
+				_selectedTextSelection = _mouseActionItem->selectionFromStates(
+					dragState,
+					dragState,
+					TextSelectType::Paragraphs);
+				_mouseTextAnchor = dragState;
 				_mouseAction = MouseAction::Selecting;
 				_mouseSelectType = TextSelectType::Paragraphs;
 				mouseActionUpdate(_mousePosition);
@@ -1733,22 +2646,20 @@ void InnerWidget::mouseActionStart(const QPoint &screenPos, Qt::MouseButton butt
 		}
 		if (_mouseSelectType != TextSelectType::Paragraphs) {
 			if (Element::Pressed()) {
-				_mouseTextSymbol = dragState.symbol;
-				auto uponSelected = (dragState.cursor == CursorState::Text);
-				if (uponSelected) {
-					if (!_selectedItem || _selectedItem != _mouseActionItem) {
-						uponSelected = false;
-					} else if (_mouseTextSymbol < _selectedText.from || _mouseTextSymbol >= _selectedText.to) {
-						uponSelected = false;
-					}
-				}
+				auto uponSelected = _mouseActionItem
+					&& (_selectedItem == _mouseActionItem)
+					&& _mouseActionItem->selectionContains(
+						_selectedTextSelection,
+						dragState);
 				if (uponSelected) {
 					_mouseAction = MouseAction::PrepareDrag; // start text drag
 				} else if (!_pressWasInactive) {
-					if (dragState.afterSymbol) ++_mouseTextSymbol;
-					auto selection = TextSelection { _mouseTextSymbol, _mouseTextSymbol };
 					repaintItem(std::exchange(_selectedItem, _mouseActionItem));
-					_selectedText = selection;
+					_mouseTextAnchor = dragState;
+					_selectedTextSelection = _mouseActionItem->selectionFromStates(
+						_mouseTextAnchor,
+						dragState,
+						_mouseSelectType);
 					_mouseAction = MouseAction::Selecting;
 					repaintItem(_mouseActionItem);
 				}
@@ -1771,6 +2682,7 @@ void InnerWidget::mouseActionUpdate(const QPoint &screenPos) {
 void InnerWidget::mouseActionCancel() {
 	_mouseActionItem = nullptr;
 	_mouseAction = MouseAction::None;
+	_mouseTextAnchor = TextState();
 	_dragStartPosition = QPoint(0, 0);
 	_wasSelectedText = false;
 	//_widget->noSelectingScroll(); // TODO
@@ -1791,14 +2703,46 @@ void InnerWidget::mouseActionFinish(const QPoint &screenPos, Qt::MouseButton but
 	_wasSelectedText = false;
 
 	if (activated) {
+		// Intercept inline keyboard button clicks on items
+		// with our expand button markup.
+		if (_mouseActionItem) {
+			const auto view = _mouseActionItem;
+			const auto item = view->data();
+			if (dynamic_cast<ReplyMarkupClickHandler*>(activated.get())
+				&& _expandMarkupItems.contains(item)) {
+				const auto it = _itemEventIds.find(item);
+				if (it != _itemEventIds.end()) {
+					mouseActionCancel();
+					toggleDeleteGroup(it->second);
+					return;
+				}
+			}
+			if (const auto reply = view->Get<HistoryView::Reply>()
+				; reply && (activated == reply->link())) {
+				if (const auto data = item->Get<HistoryMessageReply>()) {
+					const auto to = data->resolvedMessage.get();
+					if (to && to->isAdminLogEntry()) {
+						const auto &fields = data->fields();
+						mouseActionCancel();
+						jumpToMessageInLog(to, {
+							.quote = (fields.manualQuote
+								? fields.quote
+								: TextWithEntities()),
+							.quoteOffset = int(fields.quoteOffset),
+							.todoItemId = fields.todoItemId,
+							.pollOption = fields.pollOption,
+						});
+						return;
+					}
+				}
+			}
+		}
 		mouseActionCancel();
 		ActivateClickHandler(window(), activated, {
 			button,
 			QVariant::fromValue(ClickHandlerContext{
-				.elementDelegate = [weak = Ui::MakeWeak(this)] {
-					return weak
-						? (ElementDelegate*)weak
-						: nullptr;
+				.elementDelegate = [weak = base::make_weak(this)] {
+					return (ElementDelegate*)weak.get();
 				},
 				.sessionWindow = base::make_weak(_controller),
 			})
@@ -1809,7 +2753,7 @@ void InnerWidget::mouseActionFinish(const QPoint &screenPos, Qt::MouseButton but
 		repaintItem(base::take(_selectedItem));
 	} else if (_mouseAction == MouseAction::Selecting) {
 		if (_selectedItem && !_pressWasInactive) {
-			if (_selectedText.from == _selectedText.to) {
+			if (_selectedTextSelection.empty()) {
 				_selectedItem = nullptr;
 				_controller->widget()->setInnerFocus();
 			}
@@ -1818,13 +2762,14 @@ void InnerWidget::mouseActionFinish(const QPoint &screenPos, Qt::MouseButton but
 	_mouseAction = MouseAction::None;
 	_mouseActionItem = nullptr;
 	_mouseSelectType = TextSelectType::Letters;
+	_mouseTextAnchor = TextState();
 	//_widget->noSelectingScroll(); // TODO
 
 	if (QGuiApplication::clipboard()->supportsSelection()
 		&& _selectedItem
-		&& _selectedText.from != _selectedText.to) {
+		&& !_selectedTextSelection.empty()) {
 		TextUtilities::SetClipboardText(
-			_selectedItem->selectedText(_selectedText),
+			_selectedItem->selectedText(_selectedTextSelection),
 			QClipboard::Selection);
 	}
 }
@@ -1836,13 +2781,13 @@ void InnerWidget::updateSelected() {
 		std::clamp(mousePosition.y(), _visibleTop, _visibleBottom));
 
 	auto itemPoint = QPoint();
-	auto begin = std::rbegin(_items), end = std::rend(_items);
+	auto begin = std::rbegin(_displayItems), end = std::rend(_displayItems);
 	auto from = (point.y() >= _itemsTop && point.y() < _itemsTop + _itemsHeight)
-		? std::lower_bound(begin, end, point.y(), [this](auto &elem, int top) {
-			return this->itemTop(elem) + elem->height() <= top;
+		? std::lower_bound(begin, end, point.y(), [this](const DisplayEntry &elem, int top) {
+			return this->itemTop(elem.view) + elem.view->height() <= top;
 		})
 		: end;
-	const auto view = (from != end) ? from->get() : nullptr;
+	const auto view = (from != end) ? from->view : nullptr;
 	const auto item = view ? view->data().get() : nullptr;
 	if (item) {
 		Element::Moused(view);
@@ -1861,6 +2806,7 @@ void InnerWidget::updateSelected() {
 
 	TextState dragState;
 	ClickHandlerHost *lnkhost = nullptr;
+	auto dragStateUserpic = false;
 	auto selectingText = _selectedItem
 		&& (view == _mouseActionItem)
 		&& (view == Element::Hovered());
@@ -1882,6 +2828,9 @@ void InnerWidget::updateSelected() {
 		}
 		dragState = view->textState(itemPoint, request);
 		lnkhost = view;
+		if (item->isService()) {
+			dragState.cursor = CursorState::LogAdminService;
+		}
 		if (!dragState.link && itemPoint.x() >= st::historyPhotoLeft && itemPoint.x() < st::historyPhotoLeft + st::msgPhotoSize) {
 			if (!item->isService() && view->hasFromPhoto()) {
 				enumerateUserpics([&](not_null<Element*> view, int userpicTop) {
@@ -1893,6 +2842,7 @@ void InnerWidget::updateSelected() {
 					// stop enumeration if we've found a userpic under the cursor
 					if (point.y() >= userpicTop && point.y() < userpicTop + st::msgPhotoSize) {
 						dragState.link = view->data()->from()->openLink();
+						dragStateUserpic = true;
 						lnkhost = view;
 						return false;
 					}
@@ -1901,13 +2851,15 @@ void InnerWidget::updateSelected() {
 			}
 		}
 	}
+	_overSenderUserpic = dragStateUserpic;
 	auto lnkChanged = ClickHandler::setActive(dragState.link, lnkhost);
 	if (lnkChanged || dragState.cursor != _mouseCursorState) {
 		Ui::Tooltip::Hide();
 	}
 	if (dragState.link
 		|| dragState.cursor == CursorState::Date
-		|| dragState.cursor == CursorState::Forwarded) {
+		|| dragState.cursor == CursorState::Forwarded
+		|| dragState.cursor == CursorState::LogAdminService) {
 		Ui::Tooltip::Show(1000, this);
 	}
 
@@ -1924,21 +2876,12 @@ void InnerWidget::updateSelected() {
 	} else if (item) {
 		if (_mouseAction == MouseAction::Selecting) {
 			if (selectingText) {
-				auto second = dragState.symbol;
-				if (dragState.afterSymbol && _mouseSelectType == TextSelectType::Letters) {
-					++second;
-				}
-				auto selection = TextSelection { qMin(second, _mouseTextSymbol), qMax(second, _mouseTextSymbol) };
-				if (_mouseSelectType != TextSelectType::Letters) {
-					selection = _mouseActionItem->adjustSelection(
-						selection,
-						_mouseSelectType);
-				}
-				if (_selectedText != selection) {
-					_selectedText = selection;
-					repaintItem(_mouseActionItem);
-				}
-				if (!_wasSelectedText && (selection.from != selection.to)) {
+				_selectedTextSelection = _mouseActionItem->selectionFromStates(
+					_mouseTextAnchor,
+					dragState,
+					_mouseSelectType);
+				repaintItem(_mouseActionItem);
+				if (!_wasSelectedText && !_selectedTextSelection.empty()) {
 					_wasSelectedText = true;
 					setFocus();
 				}
@@ -2080,6 +3023,17 @@ void InnerWidget::repaintItem(const Element *view) {
 	update(0, top + range.top, width(), range.height);
 }
 
+void InnerWidget::repaintItem(const Element *view, QRect rect) {
+	if (rect.isNull()) {
+		return repaintItem(view);
+	}
+	if (!view) {
+		return;
+	}
+	const auto top = itemTop(view);
+	update(rect.translated(0, top));
+}
+
 void InnerWidget::resizeItem(not_null<Element*> view) {
 	updateSize();
 }
@@ -2095,6 +3049,245 @@ QPoint InnerWidget::mapPointToItem(QPoint point, const Element *view) const {
 	return point - QPoint(0, itemTop(view));
 }
 
+bool InnerWidget::eventHook(QEvent *e) {
+	if (e->type() == QEvent::TouchBegin
+		|| e->type() == QEvent::TouchUpdate
+		|| e->type() == QEvent::TouchEnd
+		|| e->type() == QEvent::TouchCancel) {
+		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
+		if (ev->device()->type() == base::TouchDevice::TouchScreen) {
+			touchEvent(ev);
+			return true;
+		}
+	}
+	return RpWidget::eventHook(e);
+}
+
+void InnerWidget::onTouchSelect() {
+	_touchSelect = true;
+	mouseActionStart(_touchPos, Qt::LeftButton);
+}
+
+void InnerWidget::onTouchScrollTimer() {
+	auto nowTime = crl::now();
+	if (_touchScrollState == Ui::TouchScrollState::Acceleration
+		&& _touchWaitingAcceleration
+		&& (nowTime - _touchAccelerationTime) > 40) {
+		_touchScrollState = Ui::TouchScrollState::Manual;
+		touchResetSpeed();
+	} else if (_touchScrollState == Ui::TouchScrollState::Auto
+		|| _touchScrollState == Ui::TouchScrollState::Acceleration) {
+		int32 elapsed = int32(nowTime - _touchTime);
+		QPoint delta = _touchSpeed * elapsed / 1000;
+		bool hasScrolled = !delta.isNull();
+		if (hasScrolled) {
+			_scrollToSignal.fire_copy(_visibleTop - delta.y());
+		}
+
+		if (_touchSpeed.isNull() || !hasScrolled) {
+			_touchScrollState = Ui::TouchScrollState::Manual;
+			_touchScroll = false;
+			_touchScrollTimer.cancel();
+		} else {
+			_touchTime = nowTime;
+		}
+		touchDeaccelerate(elapsed);
+	}
+}
+
+void InnerWidget::touchUpdateSpeed() {
+	const auto nowTime = crl::now();
+	if (_touchPrevPosValid) {
+		const int elapsed = nowTime - _touchSpeedTime;
+		if (elapsed) {
+			const QPoint newPixelDiff = (_touchPos - _touchPrevPos);
+			const QPoint pixelsPerSecond = newPixelDiff * (1000 / elapsed);
+
+			const int newSpeedY = (qAbs(pixelsPerSecond.y())
+					> Ui::kFingerAccuracyThreshold)
+				? pixelsPerSecond.y()
+				: 0;
+			const int newSpeedX = (qAbs(pixelsPerSecond.x())
+					> Ui::kFingerAccuracyThreshold)
+				? pixelsPerSecond.x()
+				: 0;
+			if (_touchScrollState == Ui::TouchScrollState::Auto) {
+				const int oldSpeedY = _touchSpeed.y();
+				const int oldSpeedX = _touchSpeed.x();
+				if ((oldSpeedY <= 0 && newSpeedY <= 0) || ((oldSpeedY >= 0 && newSpeedY >= 0)
+					&& (oldSpeedX <= 0 && newSpeedX <= 0)) || (oldSpeedX >= 0 && newSpeedX >= 0)) {
+					_touchSpeed.setY(std::clamp(
+						(oldSpeedY + (newSpeedY / 4)),
+						-Ui::kMaxScrollAccelerated,
+						+Ui::kMaxScrollAccelerated));
+					_touchSpeed.setX(std::clamp(
+						(oldSpeedX + (newSpeedX / 4)),
+						-Ui::kMaxScrollAccelerated,
+						+Ui::kMaxScrollAccelerated));
+				} else {
+					_touchSpeed = QPoint();
+				}
+			} else {
+				if (!_touchSpeed.isNull()) {
+					_touchSpeed.setX(std::clamp(
+						(_touchSpeed.x() / 4) + (newSpeedX * 3 / 4),
+						-Ui::kMaxScrollFlick,
+						+Ui::kMaxScrollFlick));
+					_touchSpeed.setY(std::clamp(
+						(_touchSpeed.y() / 4) + (newSpeedY * 3 / 4),
+						-Ui::kMaxScrollFlick,
+						+Ui::kMaxScrollFlick));
+				} else {
+					_touchSpeed = QPoint(newSpeedX, newSpeedY);
+				}
+			}
+		}
+	} else {
+		_touchPrevPosValid = true;
+	}
+	_touchSpeedTime = nowTime;
+	_touchPrevPos = _touchPos;
+}
+
+void InnerWidget::touchResetSpeed() {
+	_touchSpeed = QPoint();
+	_touchPrevPosValid = false;
+}
+
+void InnerWidget::touchDeaccelerate(int32 elapsed) {
+	int32 x = _touchSpeed.x();
+	int32 y = _touchSpeed.y();
+	_touchSpeed.setX((x == 0)
+		? x
+		: (x > 0)
+		? qMax(0, x - elapsed)
+		: qMin(0, x + elapsed));
+	_touchSpeed.setY((y == 0)
+		? y
+		: (y > 0)
+		? qMax(0, y - elapsed)
+		: qMin(0, y + elapsed));
+}
+
+void InnerWidget::touchEvent(QTouchEvent *e) {
+	if (e->type() == QEvent::TouchCancel) {
+		if (!_touchInProgress) {
+			return;
+		}
+		_touchInProgress = false;
+		_touchSelectTimer.cancel();
+		_touchScroll = _touchSelect = false;
+		_touchScrollState = Ui::TouchScrollState::Manual;
+		mouseActionCancel();
+		return;
+	}
+
+	if (!e->touchPoints().isEmpty()) {
+		_touchPrevPos = _touchPos;
+		_touchPos = e->touchPoints().cbegin()->screenPos().toPoint();
+	}
+
+	switch (e->type()) {
+	case QEvent::TouchBegin: {
+		if (_menu) {
+			e->accept();
+			return;
+		}
+		if (_touchInProgress || e->touchPoints().isEmpty()) {
+			return;
+		}
+
+		_touchInProgress = true;
+		if (_touchScrollState == Ui::TouchScrollState::Auto) {
+			_touchScrollState = Ui::TouchScrollState::Acceleration;
+			_touchWaitingAcceleration = true;
+			_touchAccelerationTime = crl::now();
+			touchUpdateSpeed();
+			_touchStart = _touchPos;
+		} else {
+			_touchScroll = false;
+			_touchSelectTimer.callOnce(QApplication::startDragTime());
+		}
+		_touchSelect = false;
+		_touchStart = _touchPrevPos = _touchPos;
+	} break;
+
+	case QEvent::TouchUpdate: {
+		if (!_touchInProgress) {
+			return;
+		} else if (_touchSelect) {
+			mouseActionUpdate(_touchPos);
+		} else if (!_touchScroll
+				&& (_touchPos - _touchStart).manhattanLength()
+					>= QApplication::startDragDistance()) {
+			_touchSelectTimer.cancel();
+			_touchScroll = true;
+			touchUpdateSpeed();
+		}
+		if (_touchScroll) {
+			if (_touchScrollState == Ui::TouchScrollState::Manual) {
+				touchScrollUpdated(_touchPos);
+			} else if (_touchScrollState == Ui::TouchScrollState::Acceleration) {
+				touchUpdateSpeed();
+				_touchAccelerationTime = crl::now();
+				if (_touchSpeed.isNull()) {
+					_touchScrollState = Ui::TouchScrollState::Manual;
+				}
+			}
+		}
+	} break;
+
+	case QEvent::TouchEnd: {
+		if (!_touchInProgress) {
+			return;
+		}
+		_touchInProgress = false;
+		const auto notMoved = (_touchPos - _touchStart).manhattanLength()
+			< QApplication::startDragDistance();
+		auto weak = base::make_weak(this);
+		if (_touchSelect) {
+			if (notMoved) {
+				mouseActionFinish(_touchPos, Qt::RightButton);
+				auto contextMenu = QContextMenuEvent(
+					QContextMenuEvent::Mouse,
+					mapFromGlobal(_touchPos),
+					_touchPos);
+				showContextMenu(&contextMenu, true);
+			}
+			_touchScroll = false;
+		} else if (_touchScroll) {
+			if (_touchScrollState == Ui::TouchScrollState::Manual) {
+				_touchScrollState = Ui::TouchScrollState::Auto;
+				_touchPrevPosValid = false;
+				_touchScrollTimer.callEach(15);
+				_touchTime = crl::now();
+			} else if (_touchScrollState == Ui::TouchScrollState::Auto) {
+				_touchScrollState = Ui::TouchScrollState::Manual;
+				_touchScroll = false;
+				touchResetSpeed();
+			} else if (_touchScrollState == Ui::TouchScrollState::Acceleration) {
+				_touchScrollState = Ui::TouchScrollState::Auto;
+				_touchWaitingAcceleration = false;
+				_touchPrevPosValid = false;
+			}
+		} else if (notMoved) {
+			mouseActionStart(_touchPos, Qt::LeftButton);
+			mouseActionFinish(_touchPos, Qt::LeftButton);
+		}
+		if (weak) {
+			_touchSelectTimer.cancel();
+			_touchSelect = false;
+		}
+	} break;
+	}
+}
+
+void InnerWidget::touchScrollUpdated(const QPoint &screenPos) {
+	_touchPos = screenPos;
+	_scrollToSignal.fire_copy(_visibleTop - (_touchPos - _touchPrevPos).y());
+	touchUpdateSpeed();
+}
+
 InnerWidget::~InnerWidget() = default;
 
 } // namespace AdminLog
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
index db52cac1cbd286..22666e2306d539 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
@@ -8,12 +8,15 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "history/view/history_view_element.h"
+#include "history/view/history_view_cursor_state.h"
 #include "history/admin_log/history_admin_log_item.h"
 #include "history/admin_log/history_admin_log_filter_value.h"
+#include "history/history_view_highlight_manager.h"
 #include "menu/menu_antispam_validator.h"
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
 #include "ui/widgets/tooltip.h"
+#include "ui/widgets/scroll_area.h"
 #include "mtproto/sender.h"
 #include "base/timer.h"
 
@@ -36,6 +39,7 @@ class PopupMenu;
 class ChatStyle;
 class ChatTheme;
 struct PeerUserpicView;
+struct ChatPaintContext;
 } // namespace Ui
 
 namespace Window {
@@ -46,6 +50,14 @@ namespace AdminLog {
 
 class SectionMemento;
 
+struct DeleteGroup {
+	uint64 eventId = 0;
+	UserId adminId;
+	int startIndex = -1;
+	int endIndex = -1;
+	int eventCount = 0;
+};
+
 class InnerWidget final
 	: public Ui::RpWidget
 	, public Ui::AbstractTooltipShower
@@ -64,17 +76,21 @@ class InnerWidget final
 	[[nodiscard]] rpl::producer<> showSearchSignal() const;
 	[[nodiscard]] rpl::producer<int> scrollToSignal() const;
 	[[nodiscard]] rpl::producer<> cancelSignal() const;
+	[[nodiscard]] rpl::producer<int> newEventsCountValue() const;
+	void resetNewEventsCount();
 
 	[[nodiscard]] not_null<ChannelData*> channel() const {
 		return _channel;
 	}
 
+	Ui::ChatPaintContext preparePaintContext(QRect clip) const;
+
 	// Set the correct scroll position after being resized.
 	void restoreScrollPosition();
 
 	void resizeToWidth(int newWidth, int minHeight) {
 		_minHeight = minHeight;
-		return TWidget::resizeToWidth(newWidth);
+		return RpWidget::resizeToWidth(newWidth);
 	}
 
 	void saveState(not_null<SectionMemento*> memento);
@@ -94,7 +110,8 @@ class InnerWidget final
 	HistoryView::Context elementContext() override;
 	bool elementUnderCursor(
 		not_null<const HistoryView::Element*> view) override;
-	HistoryView::SelectionModeResult elementInSelectionMode() override;
+	HistoryView::SelectionModeResult elementInSelectionMode(
+		const HistoryView::Element *view) override;
 	bool elementIntersectsRange(
 		not_null<const HistoryView::Element*> view,
 		int from,
@@ -104,6 +121,12 @@ class InnerWidget final
 	void elementShowPollResults(
 		not_null<PollData*> poll,
 		FullMsgId context) override;
+	void elementShowAddPollOption(
+		not_null<HistoryView::Element*> view,
+		not_null<PollData*> poll,
+		FullMsgId context,
+		QRect optionRect) override;
+	void elementSubmitAddPollOption(FullMsgId context) override;
 	void elementOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) override;
@@ -111,10 +134,16 @@ class InnerWidget final
 		not_null<DocumentData*> document,
 		FullMsgId context,
 		bool showInMediaView = false) override;
+	bool elementScrollToLocalY(
+		not_null<const HistoryView::Element*> view,
+		int localTop) override;
 	void elementCancelUpload(const FullMsgId &context) override;
 	void elementShowTooltip(
 		const TextWithEntities &text,
 		Fn<void()> hiddenCallback) override;
+	void elementShowHiddenSenderTooltip(
+		FullMsgId itemId,
+		const TextWithEntities &text) override;
 	bool elementAnimationsPaused() override;
 	bool elementHideReply(
 		not_null<const HistoryView::Element*> view) override;
@@ -127,7 +156,7 @@ class InnerWidget final
 		const QString &query,
 		const FullMsgId &context) override;
 	void elementHandleViaClick(not_null<UserData*> bot) override;
-	bool elementIsChatWide() override;
+	HistoryView::ElementChatMode elementChatMode() override;
 	not_null<Ui::PathShiftGradient*> elementPathShiftGradient() override;
 	void elementReplyTo(const FullReplyTo &to) override;
 	void elementStartInteraction(
@@ -161,6 +190,7 @@ class InnerWidget final
 	void enterEventHook(QEnterEvent *e) override;
 	void leaveEventHook(QEvent *e) override;
 	void contextMenuEvent(QContextMenuEvent *e) override;
+	bool eventHook(QEvent *e) override;
 
 	// Resizes content and counts natural widget height for the desired width.
 	int resizeGetHeight(int newWidth) override;
@@ -183,6 +213,7 @@ class InnerWidget final
 	};
 	using TextState = HistoryView::TextState;
 	using CursorState = HistoryView::CursorState;
+	using MessageSelection = HistoryView::MessageSelection;
 	using PointState = HistoryView::PointState;
 	using StateRequest = HistoryView::StateRequest;
 
@@ -194,6 +225,7 @@ class InnerWidget final
 	void performDrag();
 	int itemTop(not_null<const Element*> view) const;
 	void repaintItem(const Element *view);
+	void repaintItem(const Element *view, QRect rect);
 	void refreshItem(not_null<const Element*> view);
 	void resizeItem(not_null<Element*> view);
 	QPoint mapPointToItem(QPoint point, const Element *view) const;
@@ -209,7 +241,9 @@ class InnerWidget final
 	void copyContextText(FullMsgId itemId);
 	void copySelectedText();
 	TextForMimeData getSelectedText() const;
-	void suggestRestrictParticipant(not_null<PeerData*> participant);
+	void suggestRestrictParticipant(
+		not_null<PeerData*> participant,
+		FullMsgId realId);
 	void restrictParticipant(
 		not_null<PeerData*> participant,
 		ChatRestrictionsInfo oldRights,
@@ -217,20 +251,62 @@ class InnerWidget final
 	void restrictParticipantDone(
 		not_null<PeerData*> participant,
 		ChatRestrictionsInfo rights);
+	[[nodiscard]] bool canRestrict() const;
 
 	void requestAdmins();
 	void checkPreloadMore();
+	[[nodiscard]] int displayItemsAboveVisibleTop() const;
 	void updateVisibleTopItem();
 	void preloadMore(Direction direction);
-	void itemsAdded(Direction direction, int addedCount);
+	void requestNewEvents();
+	void fetchNewEventsBatch(
+		uint64 pollMinId,
+		uint64 maxId,
+		std::shared_ptr<QVector<MTPChannelAdminLogEvent>> accumulated);
+	void flushNewEvents(const QVector<MTPChannelAdminLogEvent> &events);
+
+	struct ScrollAnchor {
+		Element *view = nullptr;
+		int delta = 0;
+	};
+	[[nodiscard]] ScrollAnchor captureScrollAnchor() const;
+	[[nodiscard]] int computeScrollFromAnchor(ScrollAnchor anchor) const;
 	void updateSize();
 	void updateMinMaxIds();
 	void updateEmptyText();
 	void paintEmpty(Painter &p, not_null<const Ui::ChatStyle*> st);
 	void clearAfterFilterChange();
 	void clearAndRequestLog();
-	void addEvents(Direction direction, const QVector<MTPChannelAdminLogEvent> &events);
-	Element *viewForItem(const HistoryItem *item);
+	void addEvents(
+		Direction direction,
+		const QVector<MTPChannelAdminLogEvent> &events);
+	enum class DisplayPointerScope {
+		Transient,
+		All,
+	};
+	void computeDeleteGroups();
+	void rebuildDisplayItems();
+	void clearDisplayItems(DisplayPointerScope pointerScope);
+	void clearDisplayPointers(DisplayPointerScope pointerScope);
+	[[nodiscard]] bool displayPointerMatches(
+		const Element *view,
+		DisplayPointerScope pointerScope) const;
+	void toggleDeleteGroup(uint64 groupEventId);
+	void expandGroupContaining(not_null<HistoryItem*> item);
+	void jumpToMessageInLog(
+		not_null<HistoryItem*> item,
+		MessageHighlightId highlight);
+	OwnedItem createGroupSummaryItem(
+		const DeleteGroup &group,
+		bool expanded);
+	void setupExpandButton(
+		not_null<HistoryItem*> item,
+		int hiddenCount,
+		uint64 groupEventId);
+	void clearExpandButtons();
+	[[nodiscard]] Element *viewForItem(const HistoryItem *item);
+	[[nodiscard]] bool myView(
+		not_null<const HistoryView::Element*> view) const;
 
 	void toggleScrollDateShown();
 	void repaintScrollDateCallback();
@@ -238,12 +314,13 @@ class InnerWidget final
 	void scrollDateHide();
 	void scrollDateCheck();
 	void scrollDateHideByTimer();
+	void scrollDateCheckDownward();
 
 	// This function finds all history items that are displayed and calls template method
 	// for each found message (in given direction) in the passed history with passed top offset.
 	//
 	// Method has "bool (*Method)(not_null<Element*> view, int itemtop, int itembottom)" signature
-	// if it returns false the enumeration stops immidiately.
+	// if it returns false the enumeration stops immediately.
 	template <EnumItemsDirection direction, typename Method>
 	void enumerateItems(Method method);
 
@@ -263,6 +340,14 @@ class InnerWidget final
 	template <typename Method>
 	void enumerateDates(Method method);
 
+	void touchEvent(QTouchEvent *e);
+	void touchScrollUpdated(const QPoint &screenPos);
+	void touchResetSpeed();
+	void touchUpdateSpeed();
+	void touchDeaccelerate(int32 elapsed);
+	void onTouchSelect();
+	void onTouchScrollTimer();
+
 	const not_null<Window::SessionController*> _controller;
 	const not_null<ChannelData*> _channel;
 	const not_null<History*> _history;
@@ -271,6 +356,9 @@ class InnerWidget final
 	const std::unique_ptr<Ui::PathShiftGradient> _pathGradient;
 	std::shared_ptr<Ui::ChatTheme> _theme;
 
+	HistoryView::ElementHighlighter _highlighter;
+	QPainterPath _highlightPathCache;
+
 	std::vector<OwnedItem> _items;
 	std::set<uint64> _eventIds;
 	std::map<not_null<const HistoryItem*>, not_null<Element*>> _itemsByData;
@@ -278,6 +366,30 @@ class InnerWidget final
 	base::flat_set<FullMsgId> _animatedStickersPlayed;
 	base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> _userpics;
 	base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> _userpicsCache;
+	base::flat_map<FullMsgId, MsgId> _realIdsForReport;
+	base::flat_map<MsgId, not_null<HistoryItem*>> _itemsByRealMsgId;
+
+	// Delete event grouping.
+	struct DisplayEntry {
+		Element *view = nullptr;
+		// Largest _items index covered by this entry (reverse layout).
+		int topItemsIndex = 0;
+	};
+	std::vector<DisplayEntry> _displayItems;
+	std::vector<DeleteGroup> _deleteGroups;
+	std::set<uint64> _expandedGroups;
+	std::vector<OwnedItem> _summaryItems;
+	base::flat_map<not_null<const HistoryItem*>, uint64> _itemEventIds;
+	base::flat_map<uint64, UserId> _eventAdminIds;
+	base::flat_map<uint64, TimeId> _eventDates;
+	// Old-edge eventId of each group from the previous pass; sticky boundary.
+	base::flat_set<uint64> _previousDeleteGroupAnchors;
+	base::flat_set<not_null<HistoryItem*>> _expandMarkupItems;
+	Ui::Animations::Simple _toggleAnimation;
+	Ui::Animations::Simple _scrollToAnimation;
+	bool _skipScrollRestore = false;
+	bool _skipUnreadEventPrune = false;
+
 	int _itemsTop = 0;
 	int _itemsWidth = 0;
 	int _itemsHeight = 0;
@@ -287,6 +399,7 @@ class InnerWidget final
 	int _visibleBottom = 0;
 	Element *_visibleTopItem = nullptr;
 	int _visibleTopFromItem = 0;
+	int _visibleTopDisplayIndex = -1;
 
 	bool _isChatWide = false;
 	bool _scrollDateShown = false;
@@ -295,12 +408,17 @@ class InnerWidget final
 	base::Timer _scrollDateHideTimer;
 	Element *_scrollDateLastItem = nullptr;
 	int _scrollDateLastItemTop = 0;
+	bool _scrollDateAfterDayCrossing = false;
 
 	// Up - max, Down - min.
 	uint64 _maxId = 0;
 	uint64 _minId = 0;
 	mtpRequestId _preloadUpRequestId = 0;
 	mtpRequestId _preloadDownRequestId = 0;
+	mtpRequestId _newEventsRequestId = 0;
+	base::Timer _newEventsTimer;
+	rpl::variable<int> _newEventsCount = 0;
+	base::flat_set<uint64> _unreadEventIds;
 
 	// Don't load anything until the memento was read.
 	bool _upLoaded = true;
@@ -314,11 +432,12 @@ class InnerWidget final
 	QPoint _mousePosition;
 	Element *_mouseActionItem = nullptr;
 	CursorState _mouseCursorState = CursorState();
-	uint16 _mouseTextSymbol = 0;
+	TextState _mouseTextAnchor;
 	bool _pressWasInactive = false;
+	bool _overSenderUserpic = false;
 
 	Element *_selectedItem = nullptr;
-	TextSelection _selectedText;
+	MessageSelection _selectedTextSelection;
 	bool _wasSelectedText = false; // was some text selected in current drag action
 	Qt::CursorShape _cursor = style::cur_default;
 
@@ -328,6 +447,22 @@ class InnerWidget final
 	QPoint _trippleClickPoint;
 	base::Timer _trippleClickTimer;
 
+	base::Timer _touchSelectTimer;
+	base::Timer _touchScrollTimer;
+
+	// Touch scroll support.
+	bool _touchScroll = false;
+	bool _touchSelect = false;
+	bool _touchInProgress = false;
+	QPoint _touchStart, _touchPrevPos, _touchPos;
+	Ui::TouchScrollState _touchScrollState = Ui::TouchScrollState::Manual;
+	bool _touchPrevPosValid = false;
+	bool _touchWaitingAcceleration = false;
+	QPoint _touchSpeed;
+	crl::time _touchSpeedTime = 0;
+	crl::time _touchAccelerationTime = 0;
+	crl::time _touchTime = 0;
+
 	FilterValue _filter;
 	QString _searchQuery;
 	std::vector<not_null<UserData*>> _admins;
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
index 09f22e3312285f..250eceb7a47644 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -80,6 +80,48 @@ TextWithEntities PrepareText(
 	}));
 }
 
+std::optional<MTPMessageReplyHeader> PrepareLogReply(
+		const MTPMessageReplyHeader *header) {
+	if (!header) {
+		return {};
+	}
+	return header->match([&](const MTPDmessageReplyHeader &data)
+	-> std::optional<MTPMessageReplyHeader> {
+		if (data.vreply_to_peer_id() || data.vreply_to_msg_id()) {
+			return *header;
+		} else if (data.is_forum_topic()) {
+			const auto topId = data.vreply_to_top_id().value_or(
+				data.vreply_to_msg_id().value_or_empty());
+			if (topId) {
+				using Flag = MTPDmessageReplyHeader::Flag;
+				const auto removeFlags = Flag::f_reply_from
+					| Flag::f_reply_media
+					| Flag::f_reply_to_scheduled
+					| Flag::f_quote
+					| Flag::f_quote_entities
+					| Flag::f_quote_offset
+					| Flag::f_quote_text;
+				return MTP_messageReplyHeader(
+					MTP_flags((data.vflags().v & ~removeFlags)
+						| Flag::f_reply_to_msg_id),
+					MTP_int(topId),
+					MTPPeer(), // reply_to_peer_id
+					MTPMessageFwdHeader(), // reply_from
+					MTPMessageMedia(), // reply_media
+					MTP_int(topId),
+					MTPstring(), // quote_text
+					MTPVector<MTPMessageEntity>(), // quote_entities
+					MTPint(), // quote_offset
+					MTPint(), // todo_item_id
+					MTPbytes()); // poll_option
+			}
+		}
+		return {};
+	}, [&](const MTPDmessageReplyStoryHeader &data) {
+		return std::optional<MTPMessageReplyHeader>();
+	});
+}
+
 MTPMessage PrepareLogMessage(const MTPMessage &message, TimeId newDate) {
 	return message.match([&](const MTPDmessageEmpty &data) {
 		return MTP_messageEmpty(
@@ -87,43 +129,60 @@ MTPMessage PrepareLogMessage(const MTPMessage &message, TimeId newDate) {
 			data.vid(),
 			data.vpeer_id() ? *data.vpeer_id() : MTPPeer());
 	}, [&](const MTPDmessageService &data) {
-		const auto removeFlags = MTPDmessageService::Flag::f_out
-			| MTPDmessageService::Flag::f_post
-			| MTPDmessageService::Flag::f_reply_to
-			| MTPDmessageService::Flag::f_ttl_period;
+		using Flag = MTPDmessageService::Flag;
+		const auto reply = PrepareLogReply(data.vreply_to());
+		const auto removeFlags = Flag::f_out
+			| Flag::f_post
+			| Flag::f_saved_peer_id
+			| Flag::f_reactions_are_possible
+			| Flag::f_reactions
+			| Flag::f_ttl_period
+			| (reply ? Flag() : Flag::f_reply_to);
 		return MTP_messageService(
 			MTP_flags(data.vflags().v & ~removeFlags),
 			data.vid(),
 			data.vfrom_id() ? *data.vfrom_id() : MTPPeer(),
 			data.vpeer_id(),
-			MTPMessageReplyHeader(),
+			MTPPeer(), // saved_peer_id
+			reply.value_or(MTPMessageReplyHeader()),
 			MTP_int(newDate),
 			data.vaction(),
+			MTPMessageReactions(),
 			MTPint()); // ttl_period
 	}, [&](const MTPDmessage &data) {
-		const auto removeFlags = MTPDmessage::Flag::f_out
-			| MTPDmessage::Flag::f_post
-			| MTPDmessage::Flag::f_reply_to
-			| MTPDmessage::Flag::f_replies
-			| MTPDmessage::Flag::f_edit_date
-			| MTPDmessage::Flag::f_grouped_id
-			| MTPDmessage::Flag::f_views
-			| MTPDmessage::Flag::f_forwards
-			//| MTPDmessage::Flag::f_reactions
-			| MTPDmessage::Flag::f_restriction_reason
-			| MTPDmessage::Flag::f_ttl_period
-			| MTPDmessage::Flag::f_factcheck;
+		using Flag = MTPDmessage::Flag;
+		const auto reply = PrepareLogReply(data.vreply_to());
+		const auto removeFlags = Flag::f_out
+			| Flag::f_post
+			| Flag::f_saved_peer_id
+			| (reply ? Flag() : Flag::f_reply_to)
+			| Flag::f_replies
+			| Flag::f_edit_date
+			| Flag::f_grouped_id
+			| Flag::f_views
+			| Flag::f_forwards
+			//| Flag::f_reactions
+			| Flag::f_restriction_reason
+			| Flag::f_ttl_period
+			| Flag::f_factcheck
+			| Flag::f_report_delivery_until_date
+			| Flag::f_suggested_post
+			| Flag::f_summary_from_language;
 		return MTP_message(
 			MTP_flags(data.vflags().v & ~removeFlags),
 			data.vid(),
 			data.vfrom_id() ? *data.vfrom_id() : MTPPeer(),
 			MTPint(), // from_boosts_applied
+			MTPstring(), // from_rank
 			data.vpeer_id(),
 			MTPPeer(), // saved_peer_id
 			data.vfwd_from() ? *data.vfwd_from() : MTPMessageFwdHeader(),
 			MTP_long(data.vvia_bot_id().value_or_empty()),
 			MTP_long(data.vvia_business_bot_id().value_or_empty()),
-			MTPMessageReplyHeader(),
+			(data.vguestchat_via_from()
+				? *data.vguestchat_via_from()
+				: MTPPeer()),
+			reply.value_or(MTPMessageReplyHeader()),
 			MTP_int(newDate),
 			data.vmessage(),
 			data.vmedia() ? *data.vmedia() : MTPMessageMedia(),
@@ -142,7 +201,13 @@ MTPMessage PrepareLogMessage(const MTPMessage &message, TimeId newDate) {
 			MTPint(), // ttl_period
 			MTPint(), // quick_reply_shortcut_id
 			MTP_long(data.veffect().value_or_empty()),
-			MTPFactCheck());
+			MTPFactCheck(),
+			MTPint(), // report_delivery_until_date
+			MTP_long(data.vpaid_message_stars().value_or_empty()),
+			MTPSuggestedPost(),
+			MTPint(), // schedule_repeat_period
+			MTPstring(), // summary_from_language
+			data.vrich_message() ? *data.vrich_message() : MTPRichMessage());
 	});
 }
 
@@ -212,7 +277,7 @@ TextWithEntities GenerateAdminChangeText(
 		tr::now,
 		lt_user,
 		user,
-		Ui::Text::WithEntities);
+		tr::marked);
 
 	const auto useInviteLinkPhrase = channel->isMegagroup()
 		&& channel->anyoneCanAddMembers();
@@ -232,18 +297,14 @@ TextWithEntities GenerateAdminChangeText(
 		{ Flag::ManageTopics, tr::lng_admin_log_admin_manage_topics },
 		{ Flag::PinMessages, tr::lng_admin_log_admin_pin_messages },
 		{ Flag::ManageCall, tr::lng_admin_log_admin_manage_calls },
+		{ Flag::ManageDirect, tr::lng_admin_log_admin_manage_direct },
+		{ Flag::ManageRanks, tr::lng_admin_log_admin_manage_ranks },
 		{ Flag::AddAdmins, tr::lng_admin_log_admin_add_admins },
 		{ Flag::Anonymous, tr::lng_admin_log_admin_remain_anonymous },
 	};
 	phraseMap[Flag::InviteByLinkOrAdd] = invitePhrase;
 	phraseMap[Flag::ManageCall] = callPhrase;
 
-	if (!channel->isMegagroup()) {
-		// Don't display "Ban users" changes in channels.
-		newRights.flags &= ~Flag::BanUsers;
-		prevRights.flags &= ~Flag::BanUsers;
-	}
-
 	const auto changes = CollectChanges(
 		phraseMap,
 		newRights.flags,
@@ -257,11 +318,12 @@ TextWithEntities GenerateAdminChangeText(
 
 QString GeneratePermissionsChangeText(
 		ChatRestrictionsInfo newRights,
-		ChatRestrictionsInfo prevRights) {
+		ChatRestrictionsInfo prevRights,
+		bool isUserSpecific = false) {
 	using Flag = ChatRestriction;
 	using Flags = ChatRestrictions;
 
-	static auto phraseMap = std::map<Flags, tr::phrase<>>{
+	auto phraseMap = std::map<Flags, tr::phrase<>>{
 		{ Flag::ViewMessages, tr::lng_admin_log_banned_view_messages },
 		{ Flag::SendOther, tr::lng_admin_log_banned_send_messages },
 		{ Flag::SendPhotos, tr::lng_admin_log_banned_send_photos },
@@ -279,11 +341,15 @@ QString GeneratePermissionsChangeText(
 			| Flag::SendInline
 			| Flag::SendGames, tr::lng_admin_log_banned_send_stickers },
 		{ Flag::EmbedLinks, tr::lng_admin_log_banned_embed_links },
+		{ Flag::SendReactions, tr::lng_admin_log_banned_send_reactions },
 		{ Flag::SendPolls, tr::lng_admin_log_banned_send_polls },
 		{ Flag::ChangeInfo, tr::lng_admin_log_admin_change_info },
 		{ Flag::AddParticipants, tr::lng_admin_log_admin_invite_users },
 		{ Flag::CreateTopics, tr::lng_admin_log_admin_create_topics },
 		{ Flag::PinMessages, tr::lng_admin_log_admin_pin_messages },
+		{ Flag::EditRank, isUserSpecific
+			? tr::lng_admin_log_banned_edit_rank_single
+			: tr::lng_admin_log_banned_edit_rank },
 	};
 	return CollectChanges(phraseMap, prevRights.flags, newRights.flags);
 }
@@ -300,11 +366,24 @@ TextWithEntities GeneratePermissionsChangeText(
 	const auto prevFlags = prevRights.flags;
 	const auto indefinitely = ChannelData::IsRestrictedForever(newUntil);
 	if (newFlags & Flag::ViewMessages) {
-		return tr::lng_admin_log_banned(
+		if (indefinitely) {
+			return tr::lng_admin_log_banned(
+				tr::now,
+				lt_user,
+				user,
+				tr::marked);
+		}
+		return tr::lng_admin_log_banned_until(
 			tr::now,
 			lt_user,
 			user,
-			Ui::Text::WithEntities);
+			lt_until,
+			tr::lng_admin_log_restricted_until(
+				tr::now,
+				lt_date,
+				{ langDateTime(base::unixtime::parse(newUntil)) },
+				tr::marked),
+			tr::marked);
 	} else if (newFlags == 0
 		&& (prevFlags & Flag::ViewMessages)
 		&& !peerIsUser(participantId)) {
@@ -312,7 +391,7 @@ TextWithEntities GeneratePermissionsChangeText(
 			tr::now,
 			lt_user,
 			user,
-			Ui::Text::WithEntities);
+			tr::marked);
 	}
 	const auto untilText = indefinitely
 		? tr::lng_admin_log_restricted_forever(tr::now)
@@ -326,8 +405,11 @@ TextWithEntities GeneratePermissionsChangeText(
 		user,
 		lt_until,
 		TextWithEntities { untilText },
-		Ui::Text::WithEntities);
-	const auto changes = GeneratePermissionsChangeText(newRights, prevRights);
+		tr::marked);
+	const auto changes = GeneratePermissionsChangeText(
+		newRights,
+		prevRights,
+		true);
 	if (!changes.isEmpty()) {
 		result.text.append('\n' + changes);
 	}
@@ -374,7 +456,7 @@ TextWithEntities GenerateInviteLinkLink(const MTPExportedChatInvite &data) {
 	const auto text = GenerateInviteLinkText(data);
 	return text.endsWith(Ui::kQEllipsis)
 		? TextWithEntities{ .text = text }
-		: Ui::Text::Link(text, InternalInviteLinkUrl(data));
+		: tr::link(text, InternalInviteLinkUrl(data));
 }
 
 TextWithEntities GenerateInviteLinkChangeText(
@@ -392,7 +474,7 @@ TextWithEntities GenerateInviteLinkChangeText(
 		tr::now,
 		lt_link,
 		link,
-		Ui::Text::WithEntities);
+		tr::marked);
 	result.text.append('\n');
 
 	const auto label = [](const MTPExportedChatInvite &link) {
@@ -514,7 +596,7 @@ auto GenerateParticipantString(
 		name,
 		lt_mention,
 		mention,
-		Ui::Text::WithEntities);
+		tr::marked);
 }
 
 auto GenerateParticipantChangeText(
@@ -559,7 +641,7 @@ auto GenerateParticipantChangeText(
 			tr::now,
 			lt_user,
 			user,
-			Ui::Text::WithEntities);
+			tr::marked);
 	};
 
 	auto result = [&] {
@@ -581,7 +663,7 @@ auto GenerateParticipantChangeText(
 				tr::now,
 				lt_user,
 				user,
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 		case Api::ChatParticipant::Type::Admin: {
 			const auto user = GenerateParticipantString(
@@ -666,14 +748,15 @@ TextWithEntities GenerateDefaultBannedRightsChangeText(
 		not_null<ChannelData*> channel,
 		const MTPForumTopic &topic) {
 	return topic.match([&](const MTPDforumTopic &data) {
-		return Ui::Text::Link(
+		const auto url = u"https://t.me/c/%1/%2"_q.arg(
+			peerToChannel(channel->id).bare).arg(
+				data.vid().v);
+		return tr::link(
 			Data::ForumTopicIconWithTitle(
 				data.vid().v,
 				data.vicon_emoji_id().value_or_empty(),
 				qs(data.vtitle())),
-			u"internal:url:https://t.me/c/%1/%2"_q.arg(
-				peerToChannel(channel->id).bare).arg(
-					data.vid().v));
+			UrlClickHandler::EncodeInternalWrappedUrl(url));
 	}, [](const MTPDforumTopicDeleted &) {
 		return TextWithEntities{ u"Deleted"_q };
 	});
@@ -781,6 +864,8 @@ void GenerateItems(
 	using LogChangeEmojiStatus = MTPDchannelAdminLogEventActionChangeEmojiStatus;
 	using LogToggleSignatureProfiles = MTPDchannelAdminLogEventActionToggleSignatureProfiles;
 	using LogParticipantSubExtend = MTPDchannelAdminLogEventActionParticipantSubExtend;
+	using LogToggleAutotranslation = MTPDchannelAdminLogEventActionToggleAutotranslation;
+	using LogParticipantEditRank = MTPDchannelAdminLogEventActionParticipantEditRank;
 
 	const auto session = &history->session();
 	const auto id = event.vid().v;
@@ -798,7 +883,7 @@ void GenerateItems(
 
 	const auto fromName = from->name();
 	const auto fromLink = from->createOpenLink();
-	const auto fromLinkText = Ui::Text::Link(fromName, QString());
+	const auto fromLinkText = tr::link(fromName, QString());
 
 	const auto addSimpleServiceMessage = [&](
 			const TextWithEntities &text,
@@ -826,7 +911,7 @@ void GenerateItems(
 				fromLinkText,
 				lt_title,
 				{ .text = qs(action.vnew_value()) },
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(std::move(text));
 	};
 
@@ -853,7 +938,7 @@ void GenerateItems(
 			: (newValue.isEmpty()
 				? tr::lng_admin_log_removed_description_channel
 				: tr::lng_admin_log_changed_description_channel)
-			)(tr::now, lt_from, fromLinkText, Ui::Text::WithEntities);
+			)(tr::now, lt_from, fromLinkText, tr::marked);
 		addSimpleServiceMessage(text);
 
 		const auto body = makeSimpleTextMessage(
@@ -878,7 +963,7 @@ void GenerateItems(
 			: (newValue.isEmpty()
 				? tr::lng_admin_log_removed_link_channel
 				: tr::lng_admin_log_changed_link_channel)
-			)(tr::now, lt_from, fromLinkText, Ui::Text::WithEntities);
+			)(tr::now, lt_from, fromLinkText, tr::marked);
 		addSimpleServiceMessage(text);
 
 		const auto body = makeSimpleTextMessage(newValue.isEmpty()
@@ -907,7 +992,7 @@ void GenerateItems(
 					tr::now,
 					lt_from,
 					fromLinkText,
-					Ui::Text::WithEntities);
+					tr::marked);
 			addSimpleServiceMessage(text, MsgId(), photo);
 		}, [&](const MTPDphotoEmpty &data) {
 			const auto text = (channel->isMegagroup()
@@ -916,7 +1001,7 @@ void GenerateItems(
 					tr::now,
 					lt_from,
 					fromLinkText,
-					Ui::Text::WithEntities);
+					tr::marked);
 			addSimpleServiceMessage(text);
 		});
 	};
@@ -929,7 +1014,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(text);
 	};
 
@@ -941,7 +1026,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(text);
 	};
 
@@ -955,7 +1040,7 @@ void GenerateItems(
 					tr::now,
 					lt_from,
 					fromLinkText,
-					Ui::Text::WithEntities);
+					tr::marked);
 			addSimpleServiceMessage(text, realId);
 
 			addPart(
@@ -970,7 +1055,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 			addSimpleServiceMessage(text);
 		});
 	};
@@ -1008,7 +1093,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(text, realId);
 
 		const auto body = history->createItem(
@@ -1021,12 +1106,40 @@ void GenerateItems(
 				tr::lng_admin_log_empty_text(tr::now));
 		}
 
+		auto prevPhoto = (PhotoData*)nullptr;
+		auto prevDocument = (DocumentData*)nullptr;
+		if (changedMedia
+			&& action.vprev_message().type() == mtpc_message) {
+			const auto &prev = action.vprev_message().c_message();
+			if (const auto media = prev.vmedia()) {
+				media->match([&](const MTPDmessageMediaPhoto &data) {
+					if (const auto photo = data.vphoto()) {
+						photo->match([&](const MTPDphoto &fields) {
+							prevPhoto = history->owner().processPhoto(fields);
+						}, [](const MTPDphotoEmpty &) {
+						});
+					}
+				}, [&](const MTPDmessageMediaDocument &data) {
+					if (const auto document = data.vdocument()) {
+						document->match([&](const MTPDdocument &fields) {
+							prevDocument = history->owner().processDocument(
+								fields);
+						}, [](const MTPDdocumentEmpty &) {
+						});
+					}
+				}, [](const auto &) {
+				});
+			}
+		}
+
 		body->addLogEntryOriginal(
 			id,
 			(canHaveCaption
 				? tr::lng_admin_log_previous_caption
 				: tr::lng_admin_log_previous_message)(tr::now),
-			oldValue);
+			oldValue,
+			prevPhoto,
+			prevDocument);
 		addPart(body, sentDate, realId);
 	};
 
@@ -1036,7 +1149,7 @@ void GenerateItems(
 			tr::now,
 			lt_from,
 			fromLinkText,
-			Ui::Text::WithEntities);
+			tr::marked);
 		addSimpleServiceMessage(text, realId);
 
 		addPart(
@@ -1055,7 +1168,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(text);
 	};
 
@@ -1066,7 +1179,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(text);
 	};
 
@@ -1106,7 +1219,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 			addSimpleServiceMessage(text);
 		} else {
 			const auto text = tr::lng_admin_log_changed_stickers_group(
@@ -1114,10 +1227,10 @@ void GenerateItems(
 				lt_from,
 				fromLinkText,
 				lt_sticker_set,
-				Ui::Text::Link(
+				tr::link(
 					tr::lng_admin_log_changed_stickers_set(tr::now),
 					QString()),
-				Ui::Text::WithEntities);
+				tr::marked);
 			const auto setLink = std::make_shared<LambdaClickHandler>([=](
 					ClickContext context) {
 				const auto my = context.other.value<ClickHandlerContext>();
@@ -1150,7 +1263,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 			addSimpleServiceMessage(text);
 		} else {
 			const auto text = tr::lng_admin_log_changed_emoji_group(
@@ -1158,10 +1271,10 @@ void GenerateItems(
 				lt_from,
 				fromLinkText,
 				lt_sticker_set,
-				Ui::Text::Link(
+				tr::link(
 					tr::lng_admin_log_changed_emoji_set(tr::now),
 					QString()),
-				Ui::Text::WithEntities);
+				tr::marked);
 			const auto setLink = std::make_shared<LambdaClickHandler>([=](
 					ClickContext context) {
 				const auto my = context.other.value<ClickHandlerContext>();
@@ -1195,7 +1308,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(text);
 	};
 
@@ -1214,7 +1327,7 @@ void GenerateItems(
 			tr::now,
 			lt_from,
 			fromLinkText,
-			Ui::Text::WithEntities);
+			tr::marked);
 		addSimpleServiceMessage(text, realId);
 
 		addPart(
@@ -1236,7 +1349,7 @@ void GenerateItems(
 					tr::now,
 					lt_from,
 					fromLinkText,
-					Ui::Text::WithEntities);
+					tr::marked);
 			addSimpleServiceMessage(text);
 		} else {
 			const auto text = (broadcast
@@ -1246,8 +1359,8 @@ void GenerateItems(
 					lt_from,
 					fromLinkText,
 					lt_chat,
-					Ui::Text::Link(now->name(), QString()),
-					Ui::Text::WithEntities);
+					tr::link(now->name(), QString()),
+					tr::marked);
 			const auto chatLink = std::make_shared<LambdaClickHandler>([=] {
 				if (const auto window = now->session().tryResolveWindow()) {
 					window->showPeerHistory(now);
@@ -1270,7 +1383,7 @@ void GenerateItems(
 			const auto address = qs(data.vaddress());
 			const auto link = data.vgeo_point().match([&](
 					const MTPDgeoPoint &data) {
-				return Ui::Text::Link(
+				return tr::link(
 					address,
 					LocationClickHandler::Url(Data::LocationPoint(data)));
 			}, [&](const MTPDgeoPointEmpty &) {
@@ -1282,14 +1395,14 @@ void GenerateItems(
 				fromLinkText,
 				lt_address,
 				link,
-				Ui::Text::WithEntities);
+				tr::marked);
 			addSimpleServiceMessage(text);
 		}, [&](const MTPDchannelLocationEmpty &) {
 			const auto text = tr::lng_admin_log_removed_location_chat(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 			addSimpleServiceMessage(text);
 		});
 	};
@@ -1305,14 +1418,14 @@ void GenerateItems(
 				fromLinkText,
 				lt_duration,
 				{ .text = duration },
-				Ui::Text::WithEntities);
+				tr::marked);
 			addSimpleServiceMessage(text);
 		} else {
 			const auto text = tr::lng_admin_log_removed_slow_mode(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 			addSimpleServiceMessage(text);
 		}
 	};
@@ -1324,7 +1437,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(text);
 	};
 
@@ -1335,7 +1448,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(text);
 	};
 
@@ -1364,7 +1477,7 @@ void GenerateItems(
 		const auto participantPeer = groupCallParticipantPeer(
 			data.vparticipant());
 		const auto participantPeerLink = participantPeer->createOpenLink();
-		const auto participantPeerLinkText = Ui::Text::Link(
+		const auto participantPeerLinkText = tr::link(
 			participantPeer->name(),
 			QString());
 		const auto text = (broadcast
@@ -1375,7 +1488,7 @@ void GenerateItems(
 			fromLinkText,
 			lt_user,
 			participantPeerLinkText,
-			Ui::Text::WithEntities);
+			tr::marked);
 		addServiceMessageWithLink(text, participantPeerLink);
 	};
 
@@ -1383,7 +1496,7 @@ void GenerateItems(
 		const auto participantPeer = groupCallParticipantPeer(
 			data.vparticipant());
 		const auto participantPeerLink = participantPeer->createOpenLink();
-		const auto participantPeerLinkText = Ui::Text::Link(
+		const auto participantPeerLinkText = tr::link(
 			participantPeer->name(),
 			QString());
 		const auto text = (broadcast
@@ -1394,7 +1507,7 @@ void GenerateItems(
 			fromLinkText,
 			lt_user,
 			participantPeerLinkText,
-			Ui::Text::WithEntities);
+			tr::marked);
 		addServiceMessageWithLink(text, participantPeerLink);
 	};
 
@@ -1410,7 +1523,7 @@ void GenerateItems(
 			tr::now,
 			lt_from,
 			fromLinkText,
-			Ui::Text::WithEntities);
+			tr::marked);
 		addSimpleServiceMessage(text);
 	};
 
@@ -1451,7 +1564,7 @@ void GenerateItems(
 				fromLinkText,
 				lt_link,
 				GenerateInviteLinkLink(data.vinvite()),
-				Ui::Text::WithEntities),
+				tr::marked),
 			data.vinvite());
 	};
 
@@ -1463,7 +1576,7 @@ void GenerateItems(
 				fromLinkText,
 				lt_link,
 				GenerateInviteLinkLink(data.vinvite()),
-				Ui::Text::WithEntities),
+				tr::marked),
 			data.vinvite());
 	};
 
@@ -1475,7 +1588,7 @@ void GenerateItems(
 				fromLinkText,
 				lt_link,
 				GenerateInviteLinkLink(data.vinvite()),
-				Ui::Text::WithEntities),
+				tr::marked),
 			data.vinvite());
 	};
 
@@ -1490,7 +1603,7 @@ void GenerateItems(
 		const auto participantPeer = groupCallParticipantPeer(
 			data.vparticipant());
 		const auto participantPeerLink = participantPeer->createOpenLink();
-		const auto participantPeerLinkText = Ui::Text::Link(
+		const auto participantPeerLinkText = tr::link(
 			participantPeer->name(),
 			QString());
 		const auto volume = data.vparticipant().match([&](
@@ -1508,7 +1621,7 @@ void GenerateItems(
 				participantPeerLinkText,
 				lt_percent,
 				{ .text = volumeText },
-				Ui::Text::WithEntities);
+				tr::marked);
 		addServiceMessageWithLink(text, participantPeerLink);
 	};
 
@@ -1528,7 +1641,7 @@ void GenerateItems(
 				fromLinkText,
 				lt_duration,
 				wrap(now),
-				Ui::Text::WithEntities)
+				tr::marked)
 			: !now
 			? tr::lng_admin_log_messages_ttl_removed(
 				tr::now,
@@ -1536,7 +1649,7 @@ void GenerateItems(
 				fromLinkText,
 				lt_duration,
 				wrap(was),
-				Ui::Text::WithEntities)
+				tr::marked)
 			: tr::lng_admin_log_messages_ttl_changed(
 				tr::now,
 				lt_from,
@@ -1545,7 +1658,7 @@ void GenerateItems(
 				wrap(was),
 				lt_duration,
 				wrap(now),
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(text);
 	};
 
@@ -1561,8 +1674,8 @@ void GenerateItems(
 					lt_from,
 					fromLinkText,
 					lt_user,
-					Ui::Text::Link(user->name(), QString()),
-					Ui::Text::WithEntities)
+					tr::link(user->name(), QString()),
+					tr::marked)
 			: (channel->isMegagroup()
 				? tr::lng_admin_log_participant_approved_by_link
 				: tr::lng_admin_log_participant_approved_by_link_channel)(
@@ -1572,8 +1685,8 @@ void GenerateItems(
 					lt_link,
 					linkText,
 					lt_user,
-					Ui::Text::Link(user->name(), QString()),
-					Ui::Text::WithEntities);
+					tr::link(user->name(), QString()),
+					tr::marked);
 		addInviteLinkServiceMessage(
 			text,
 			data.vinvite(),
@@ -1588,7 +1701,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(text);
 	};
 
@@ -1598,7 +1711,7 @@ void GenerateItems(
 			tr::now,
 			lt_from,
 			fromLinkText,
-			Ui::Text::WithEntities);
+			tr::marked);
 		addSimpleServiceMessage(text, realId);
 
 		addPart(
@@ -1618,7 +1731,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 		}, [&](const MTPDchatReactionsSome &data) {
 			using namespace Window::Notifications;
 			auto list = TextWithEntities();
@@ -1636,7 +1749,7 @@ void GenerateItems(
 				fromLinkText,
 				lt_emoji,
 				list,
-				Ui::Text::WithEntities);
+				tr::marked);
 		}, [&](const MTPDchatReactionsAll &data) {
 			return (data.is_allow_custom()
 				? tr::lng_admin_log_reactions_allowed_all
@@ -1644,7 +1757,7 @@ void GenerateItems(
 					tr::now,
 					lt_from,
 					fromLinkText,
-					Ui::Text::WithEntities);
+					tr::marked);
 		});
 		addSimpleServiceMessage(text);
 	};
@@ -1690,7 +1803,7 @@ void GenerateItems(
 							tr::now,
 							lt_from,
 							fromLinkText,
-							Ui::Text::WithEntities));
+							tr::marked));
 					const auto body = makeSimpleTextMessage(list(newValue));
 					body->addLogEntryOriginal(
 						id,
@@ -1719,7 +1832,7 @@ void GenerateItems(
 					fromLinkText,
 					lt_link,
 					{ changed },
-					Ui::Text::WithEntities));
+					tr::marked));
 			return;
 		}
 		// Probably will never happen.
@@ -1745,7 +1858,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(text);
 	};
 
@@ -1757,7 +1870,7 @@ void GenerateItems(
 			fromLinkText,
 			lt_topic,
 			topicLink,
-			Ui::Text::WithEntities));
+			tr::marked));
 	};
 
 	const auto createEditTopic = [&](const LogEditTopic &data) {
@@ -1772,7 +1885,7 @@ void GenerateItems(
 				prevLink,
 				lt_new_topic,
 				nowLink,
-				Ui::Text::WithEntities));
+				tr::marked));
 		}
 		const auto wasClosed = IsTopicClosed(data.vprev_topic());
 		const auto nowClosed = IsTopicClosed(data.vnew_topic());
@@ -1785,7 +1898,7 @@ void GenerateItems(
 					fromLinkText,
 					lt_topic,
 					nowLink,
-					Ui::Text::WithEntities));
+					tr::marked));
 		}
 		const auto wasHidden = IsTopicHidden(data.vprev_topic());
 		const auto nowHidden = IsTopicHidden(data.vnew_topic());
@@ -1798,7 +1911,7 @@ void GenerateItems(
 					fromLinkText,
 					lt_topic,
 					nowLink,
-					Ui::Text::WithEntities));
+					tr::marked));
 		}
 	};
 
@@ -1813,7 +1926,7 @@ void GenerateItems(
 			fromLinkText,
 			lt_topic,
 			topicLink,
-			Ui::Text::WithEntities));
+			tr::marked));
 	};
 
 	const auto createPinTopic = [&](const LogPinTopic &data) {
@@ -1825,7 +1938,7 @@ void GenerateItems(
 				fromLinkText,
 				lt_topic,
 				topicLink,
-				Ui::Text::WithEntities));
+				tr::marked));
 		} else if (const auto &previous = data.vprev_topic()) {
 			auto topicLink = GenerateTopicLink(channel, *previous);
 			addSimpleServiceMessage(tr::lng_admin_log_topics_unpinned(
@@ -1834,7 +1947,7 @@ void GenerateItems(
 				fromLinkText,
 				lt_topic,
 				topicLink,
-				Ui::Text::WithEntities));
+				tr::marked));
 		}
 	};
 
@@ -1846,7 +1959,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(text);
 	};
 
@@ -1857,8 +1970,12 @@ void GenerateItems(
 			const auto &setEmoji,
 			const auto &removeEmoji,
 			const auto &changeEmoji) {
-		const auto prevColor = was.data().vcolor();
-		const auto nextColor = now.data().vcolor();
+		const auto prevColor = (was.type() == mtpc_peerColor)
+			? was.c_peerColor().vcolor()
+			: tl::conditional<MTPint>();
+		const auto nextColor = (now.type() == mtpc_peerColor)
+			? now.c_peerColor().vcolor()
+			: tl::conditional<MTPint>();
 		if (prevColor != nextColor) {
 			const auto wrap = [&](tl::conditional<MTPint> value) {
 				return value
@@ -1873,11 +1990,15 @@ void GenerateItems(
 				{ '#' + QString::number(wrap(prevColor) + 1) },
 				lt_color,
 				{ '#' + QString::number(wrap(nextColor) + 1) },
-				Ui::Text::WithEntities);
+				tr::marked);
 			addSimpleServiceMessage(text);
 		}
-		const auto prevEmoji = was.data().vbackground_emoji_id().value_or_empty();
-		const auto nextEmoji = now.data().vbackground_emoji_id().value_or_empty();
+		const auto prevEmoji = (was.type() == mtpc_peerColor)
+			? was.c_peerColor().vbackground_emoji_id().value_or_empty()
+			: uint64();
+		const auto nextEmoji = (now.type() == mtpc_peerColor)
+			? now.c_peerColor().vbackground_emoji_id().value_or_empty()
+			: uint64();
 		if (prevEmoji != nextEmoji) {
 			const auto text = !prevEmoji
 				? setEmoji(
@@ -1887,7 +2008,7 @@ void GenerateItems(
 					lt_emoji,
 					Ui::Text::SingleCustomEmoji(
 						Data::SerializeCustomEmojiId(nextEmoji)),
-					Ui::Text::WithEntities)
+					tr::marked)
 				: !nextEmoji
 				? removeEmoji(
 					tr::now,
@@ -1896,7 +2017,7 @@ void GenerateItems(
 					lt_emoji,
 					Ui::Text::SingleCustomEmoji(
 						Data::SerializeCustomEmojiId(prevEmoji)),
-					Ui::Text::WithEntities)
+					tr::marked)
 				: changeEmoji(
 					tr::now,
 					lt_from,
@@ -1907,7 +2028,7 @@ void GenerateItems(
 					lt_emoji,
 					Ui::Text::SingleCustomEmoji(
 						Data::SerializeCustomEmojiId(nextEmoji)),
-					Ui::Text::WithEntities);
+					tr::marked);
 			addSimpleServiceMessage(text);
 		}
 	};
@@ -1946,7 +2067,7 @@ void GenerateItems(
 			tr::now,
 			lt_from,
 			fromLinkText,
-			Ui::Text::WithEntities));
+			tr::marked));
 	};
 
 	const auto createChangeEmojiStatus = [&](const LogChangeEmojiStatus &data) {
@@ -1954,17 +2075,19 @@ void GenerateItems(
 			return status.match([](
 					const MTPDemojiStatus &data) {
 				return data.vdocument_id().v;
+			}, [](const MTPDemojiStatusCollectible &data) {
+				return data.vdocument_id().v;
 			}, [](const MTPDemojiStatusEmpty &) {
 				return DocumentId();
-			}, [](const MTPDemojiStatusUntil &data) {
-				return data.vdocument_id().v;
+			}, [](const MTPDinputEmojiStatusCollectible &) {
+				return DocumentId();
 			});
 		};
 		const auto prevEmoji = parse(data.vprev_value());
 		const auto nextEmoji = parse(data.vnew_value());
 		const auto nextUntil = data.vnew_value().match([](
-				const MTPDemojiStatusUntil &data) {
-			return data.vuntil().v;
+				const MTPDemojiStatus &data) {
+			return TimeId(data.vuntil().value_or_empty());
 		}, [](const auto &) { return TimeId(); });
 
 		const auto text = !prevEmoji
@@ -1979,7 +2102,7 @@ void GenerateItems(
 					lt_date,
 					TextWithEntities{
 						langDateTime(base::unixtime::parse(nextUntil)) },
-					Ui::Text::WithEntities)
+					tr::marked)
 				: tr::lng_admin_log_set_status(
 					tr::now,
 					lt_from,
@@ -1987,7 +2110,7 @@ void GenerateItems(
 					lt_emoji,
 					Ui::Text::SingleCustomEmoji(
 						Data::SerializeCustomEmojiId(nextEmoji)),
-					Ui::Text::WithEntities))
+					tr::marked))
 			: !nextEmoji
 			? tr::lng_admin_log_removed_status(
 				tr::now,
@@ -1996,7 +2119,7 @@ void GenerateItems(
 				lt_emoji,
 				Ui::Text::SingleCustomEmoji(
 					Data::SerializeCustomEmojiId(prevEmoji)),
-				Ui::Text::WithEntities)
+				tr::marked)
 			: (nextUntil
 				? tr::lng_admin_log_change_status_until(
 					tr::now,
@@ -2011,7 +2134,7 @@ void GenerateItems(
 					lt_date,
 					TextWithEntities{
 						langDateTime(base::unixtime::parse(nextUntil)) },
-					Ui::Text::WithEntities)
+					tr::marked)
 				: tr::lng_admin_log_change_status(
 					tr::now,
 					lt_from,
@@ -2022,7 +2145,7 @@ void GenerateItems(
 					lt_emoji,
 					Ui::Text::SingleCustomEmoji(
 						Data::SerializeCustomEmojiId(nextEmoji)),
-					Ui::Text::WithEntities));
+					tr::marked));
 		addSimpleServiceMessage(text);
 	};
 
@@ -2034,7 +2157,7 @@ void GenerateItems(
 				tr::now,
 				lt_from,
 				fromLinkText,
-				Ui::Text::WithEntities);
+				tr::marked);
 		addSimpleServiceMessage(text);
 	};
 
@@ -2047,7 +2170,7 @@ void GenerateItems(
 		}
 		const auto participantPeer = channel->owner().peer(participant.id());
 		const auto participantPeerLink = participantPeer->createOpenLink();
-		const auto participantPeerLinkText = Ui::Text::Link(
+		const auto participantPeerLinkText = tr::link(
 			participantPeer->name(),
 			QString());
 		const auto parsed = base::unixtime::parse(
@@ -2059,10 +2182,97 @@ void GenerateItems(
 				participantPeerLinkText,
 				lt_date,
 				{ langDateTimeFull(parsed) },
-				Ui::Text::WithEntities),
+				tr::marked),
 			participantPeerLink);
 	};
 
+	const auto createToggleAutotranslation = [&](const LogToggleAutotranslation &action) {
+		const auto enabled = mtpIsTrue(action.vnew_value());
+		const auto text = (enabled
+			? tr::lng_admin_log_autotranslate_enabled
+			: tr::lng_admin_log_autotranslate_disabled)(
+				tr::now,
+				lt_from,
+				fromLinkText,
+				tr::marked);
+		addSimpleServiceMessage(text);
+	};
+
+	const auto createParticipantEditRank = [&](const LogParticipantEditRank &action) {
+		const auto user = history->owner().user(action.vuser_id().v);
+		const auto prevRank = qs(action.vprev_rank());
+		const auto newRank = qs(action.vnew_rank());
+		const auto isSelf = (user == from);
+		const auto text = [&] {
+			if (isSelf) {
+				if (newRank.isEmpty()) {
+					return tr::lng_admin_log_removed_own_rank(
+						tr::now,
+						lt_from,
+						fromLinkText,
+						lt_previous,
+						{ prevRank },
+						tr::marked);
+				} else if (prevRank.isEmpty()) {
+					return tr::lng_admin_log_set_own_rank(
+						tr::now,
+						lt_from,
+						fromLinkText,
+						lt_tag,
+						{ newRank },
+						tr::marked);
+				}
+				return tr::lng_admin_log_changed_own_rank_from(
+					tr::now,
+					lt_from,
+					fromLinkText,
+					lt_previous,
+					{ prevRank },
+					lt_tag,
+					{ newRank },
+					tr::marked);
+			}
+			const auto userLinkText = tr::link(user->name(), QString());
+			if (newRank.isEmpty()) {
+				return tr::lng_admin_log_removed_rank(
+					tr::now,
+					lt_from,
+					fromLinkText,
+					lt_user,
+					userLinkText,
+					lt_previous,
+					{ prevRank },
+					tr::marked);
+			} else if (prevRank.isEmpty()) {
+				return tr::lng_admin_log_set_rank(
+					tr::now,
+					lt_from,
+					fromLinkText,
+					lt_user,
+					userLinkText,
+					lt_tag,
+					{ newRank },
+					tr::marked);
+			}
+			return tr::lng_admin_log_changed_rank_from(
+				tr::now,
+				lt_from,
+				fromLinkText,
+				lt_user,
+				userLinkText,
+				lt_previous,
+				{ prevRank },
+				lt_tag,
+				{ newRank },
+				tr::marked);
+		}();
+		if (isSelf) {
+			addSimpleServiceMessage(text);
+		} else {
+			addServiceMessageWithLink(text, user->createOpenLink());
+		}
+	};
+
 	action.match(
 		createChangeTitle,
 		createChangeAbout,
@@ -2113,7 +2323,9 @@ void GenerateItems(
 		createChangeWallpaper,
 		createChangeEmojiStatus,
 		createToggleSignatureProfiles,
-		createParticipantSubExtend);
+		createParticipantSubExtend,
+		createToggleAutotranslation,
+		createParticipantEditRank);
 }
 
 } // namespace AdminLog
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
index 417223ae304a78..1790805f50e8f7 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
@@ -11,17 +11,19 @@ For license and copyright information please follow this link:
 #include "history/admin_log/history_admin_log_filter.h"
 #include "profile/profile_back_button.h"
 #include "core/shortcuts.h"
+#include "info/profile/info_profile_values.h"
+#include "ui/chat/chat_style.h"
+#include "ui/controls/jump_down_button.h"
+#include "ui/controls/swipe_handler.h"
 #include "ui/effects/animations.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/buttons.h"
+#include "ui/controls/userpic_button.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/ui_utility.h"
-#include "mainwidget.h"
-#include "mainwindow.h"
 #include "apiwrap.h"
 #include "window/themes/window_theme.h"
-#include "window/window_adaptive.h"
 #include "window/window_session_controller.h"
 #include "ui/boxes/confirm_box.h"
 #include "base/timer.h"
@@ -35,14 +37,13 @@ For license and copyright information please follow this link:
 
 namespace AdminLog {
 
-class FixedBar final : public TWidget {
+class FixedBar final : public Ui::RpWidget {
 public:
 	FixedBar(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
 		not_null<ChannelData*> channel);
 
-	[[nodiscard]] rpl::producer<> showFilterRequests() const;
 	[[nodiscard]] rpl::producer<> searchCancelRequests() const;
 	[[nodiscard]] rpl::producer<QString> searchRequests() const;
 
@@ -79,7 +80,6 @@ class FixedBar final : public TWidget {
 	object_ptr<Profile::BackButton> _backButton;
 	object_ptr<Ui::IconButton> _search;
 	object_ptr<Ui::CrossButton> _cancel;
-	object_ptr<Ui::RoundButton> _filter;
 
 	Ui::Animations::Simple _searchShownAnimation;
 	bool _searchShown = false;
@@ -107,37 +107,39 @@ object_ptr<Window::SectionWidget> SectionMemento::createWidget(
 FixedBar::FixedBar(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
-	not_null<ChannelData*> channel) : TWidget(parent)
+	not_null<ChannelData*> channel)
+: RpWidget(parent)
 , _controller(controller)
 , _channel(channel)
 , _field(this, st::defaultMultiSelectSearchField, tr::lng_dlg_filter())
-, _backButton(
-	this,
-	&controller->session(),
-	tr::lng_admin_log_title_all(tr::now),
-	controller->adaptive().oneColumnValue())
+, _backButton(this)
 , _search(this, st::topBarSearch)
-, _cancel(this, st::historyAdminLogCancelSearch)
-, _filter(this, tr::lng_admin_log_filter(), st::topBarButton) {
+, _cancel(this, st::historyAdminLogCancelSearch) {
 	_backButton->moveToLeft(0, 0);
 	_backButton->setClickedCallback([=] { goBack(); });
 	_search->setClickedCallback([=] { showSearch(); });
 	_cancel->setClickedCallback([=] { cancelSearch(); });
 	_field->hide();
-	_filter->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-	_field->cancelled(
-	) | rpl::start_with_next([=] {
+	_field->cancelled() | rpl::on_next([=] {
 		cancelSearch();
 	}, _field->lifetime());
-	_field->changes(
-	) | rpl::start_with_next([=] {
+	_field->changes() | rpl::on_next([=] {
 		searchUpdated();
 	}, _field->lifetime());
 	_field->submits(
-	) | rpl::start_with_next([=] { applySearch(); }, _field->lifetime());
+	) | rpl::on_next([=] { applySearch(); }, _field->lifetime());
 	_searchTimer.setCallback([=] { applySearch(); });
 
 	_cancel->hide(anim::type::instant);
+
+	_backButton->setSubtext(tr::lng_admin_log_title_all(tr::now));
+	Info::Profile::NameValue(channel) | rpl::on_next([=](QString name) {
+		_backButton->setText(name);
+	}, _backButton->lifetime());
+	_backButton->setWidget(Ui::CreateChild<Ui::UserpicButton>(
+		_backButton.get(),
+		channel,
+		st::topBarInfoButton));
 }
 
 void FixedBar::applyFilter(const FilterValue &value) {
@@ -184,6 +186,7 @@ void FixedBar::searchAnimationCallback() {
 			_searchShown ? &st::topBarBg : nullptr);
 		_search->setCursor(
 			_searchShown ? style::cur_default : style::cur_pointer);
+		_backButton->setOpacity(1.);
 	}
 	resizeToWidth(width());
 }
@@ -213,29 +216,33 @@ void FixedBar::applySearch() {
 }
 
 int FixedBar::resizeGetHeight(int newWidth) {
-	auto filterLeft = newWidth - _filter->width();
-	_filter->moveToLeft(filterLeft, 0);
-
-	auto cancelLeft = filterLeft - _cancel->width();
-	_cancel->moveToLeft(cancelLeft, 0);
-
-	auto searchShownLeft = st::topBarArrowPadding.left();
-	auto searchHiddenLeft = filterLeft - _search->width();
-	auto searchShown = _searchShownAnimation.value(_searchShown ? 1. : 0.);
-	auto searchCurrentLeft = anim::interpolate(searchHiddenLeft, searchShownLeft, searchShown);
+	const auto offset = st::historySendRight + st::lineWidth;
+	const auto searchShownLeft = st::topBarArrowPadding.left();
+	const auto searchHiddenLeft = newWidth - _search->width() - offset;
+	const auto searchShown = _searchShownAnimation.value(_searchShown
+		? 1.
+		: 0.);
+	const auto searchCurrentLeft = anim::interpolate(
+		searchHiddenLeft,
+		searchShownLeft,
+		searchShown);
 	_search->moveToLeft(searchCurrentLeft, 0);
+	_backButton->setOpacity(1. - searchShown);
 	_backButton->resizeToWidth(searchCurrentLeft);
 	_backButton->moveToLeft(0, 0);
 
-	auto newHeight = _backButton->height();
-	auto fieldLeft = searchShownLeft + _search->width();
-	_field->setGeometryToLeft(fieldLeft, st::historyAdminLogSearchTop, cancelLeft - fieldLeft, _field->height());
+	const auto cancelLeft = newWidth - _cancel->width() - offset;
+	_cancel->moveToLeft(cancelLeft, 0);
 
-	return newHeight;
-}
+	const auto newHeight = _backButton->height();
+	const auto fieldLeft = searchShownLeft + _search->width();
+	_field->setGeometryToLeft(
+		fieldLeft,
+		st::historyAdminLogSearchTop,
+		cancelLeft - fieldLeft,
+		_field->height());
 
-rpl::producer<> FixedBar::showFilterRequests() const {
-	return _filter->clicks() | rpl::to_empty;
+	return newHeight;
 }
 
 rpl::producer<> FixedBar::searchCancelRequests() const {
@@ -274,7 +281,7 @@ void FixedBar::mousePressEvent(QMouseEvent *e) {
 	if (e->button() == Qt::LeftButton) {
 		goBack();
 	} else {
-		TWidget::mousePressEvent(e);
+		RpWidget::mousePressEvent(e);
 	}
 }
 
@@ -286,54 +293,61 @@ Widget::Widget(
 , _scroll(this, st::historyScroll, false)
 , _fixedBar(this, controller, channel)
 , _fixedBarShadow(this)
-, _whatIsThis(
-		this,
-		tr::lng_admin_log_about(tr::now),
-		st::historyComposeButton) {
+, _settingsFilter(
+	this,
+	tr::lng_menu_settings(tr::now),
+	st::historyComposeButton)
+, _whatIsThis(this, st::historyAdminLogWhatIsThis)
+, _scrollDown(_scroll, st::historyToDown) {
 	_fixedBar->move(0, 0);
 	_fixedBar->resizeToWidth(width());
-	_fixedBar->showFilterRequests(
-	) | rpl::start_with_next([=] {
-		showFilter();
-	}, lifetime());
 	_fixedBar->searchCancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		setInnerFocus();
 	}, lifetime());
 	_fixedBar->searchRequests(
-	) | rpl::start_with_next([=](const QString &query) {
+	) | rpl::on_next([=](const QString &query) {
 		_inner->applySearch(query);
 	}, lifetime());
 	_fixedBar->show();
 
+	_whatIsThis->raise();
 	_fixedBarShadow->raise();
 
 	controller->adaptive().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateAdaptiveLayout();
 	}, lifetime());
 
-	_inner = _scroll->setOwnedWidget(object_ptr<InnerWidget>(this, controller, channel));
+	_inner = _scroll->setOwnedWidget(
+		object_ptr<InnerWidget>(this, controller, channel));
 	_inner->showSearchSignal(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_fixedBar->showSearch();
 	}, lifetime());
 	_inner->cancelSignal(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_fixedBar->goBack();
 	}, lifetime());
 	_inner->scrollToSignal(
-	) | rpl::start_with_next([=](int top) {
+	) | rpl::on_next([=](int top) {
 		_scroll->scrollToY(top);
 	}, lifetime());
+	_inner->newEventsCountValue(
+	) | rpl::on_next([=](int count) {
+		_scrollDown->setUnreadCount(count);
+		updateScrollDownVisibility();
+	}, lifetime());
 
 	_scroll->move(0, _fixedBar->height());
 	_scroll->show();
-	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	_scroll->scrolls() | rpl::on_next([=] {
 		onScroll();
 	}, lifetime());
 
+	_settingsFilter->setClickedCallback([=] {
+		showFilter();
+	});
 	_whatIsThis->setClickedCallback([=] {
 		controller->show(Ui::MakeInformBox(channel->isMegagroup()
 			? tr::lng_admin_log_about_text()
@@ -341,6 +355,80 @@ Widget::Widget(
 	});
 
 	setupShortcuts();
+	setupSwipeReply();
+	setupScrollDownButton();
+}
+
+void Widget::setupScrollDownButton() {
+	_scrollDown->setClickedCallback([=] { scrollDownClicked(); });
+	updateScrollDownVisibility();
+}
+
+void Widget::scrollDownClicked() {
+	_inner->resetNewEventsCount();
+	const auto scrollTo = _scroll->scrollTopMax();
+	auto scrollTop = _scroll->scrollTop();
+	if (scrollTop == scrollTo) {
+		_scrollToAnimation.stop();
+		return;
+	}
+	const auto maxAnimatedDelta = _scroll->height();
+	auto transition = anim::sineInOut;
+	if (scrollTo > scrollTop + maxAnimatedDelta) {
+		scrollTop = scrollTo - maxAnimatedDelta;
+		_scroll->scrollToY(scrollTop);
+		transition = anim::easeOutCubic;
+	}
+	_scrollToAnimation.stop();
+	_scrollToAnimation.start(
+		[=] { scrollToAnimationCallback(); },
+		scrollTop,
+		scrollTo,
+		st::slideDuration,
+		transition);
+}
+
+void Widget::scrollToAnimationCallback() {
+	const auto scrollTo = _scroll->scrollTopMax();
+	_scroll->scrollToY(qRound(_scrollToAnimation.value(scrollTo)));
+}
+
+void Widget::updateScrollDownVisibility() {
+	if (_scroll->isHidden()) {
+		return;
+	}
+	const auto top = _scroll->scrollTop() + st::historyToDownShownAfter / 4;
+	const auto hasPendingEvents = _scrollDown->unreadCount() > 0;
+	startScrollDownButtonAnimation(hasPendingEvents
+		|| top < _scroll->scrollTopMax());
+}
+
+void Widget::startScrollDownButtonAnimation(bool shown) {
+	if (_scrollDownIsShown == shown) {
+		return;
+	}
+	_scrollDownIsShown = shown;
+	_scrollDownShown.start(
+		[=] { updateScrollDownPosition(); },
+		_scrollDownIsShown ? 0. : 1.,
+		_scrollDownIsShown ? 1. : 0.,
+		st::historyToDownDuration);
+}
+
+void Widget::updateScrollDownPosition() {
+	// _scrollDown is a child widget of _scroll, not me.
+	const auto top = anim::interpolate(
+		0,
+		_scrollDown->height() + st::historyToDownPosition.y(),
+		_scrollDownShown.value(_scrollDownIsShown ? 1. : 0.));
+	_scrollDown->moveToRight(
+		st::historyToDownPosition.x(),
+		_scroll->height() - top);
+	const auto shouldBeHidden
+		= !_scrollDownIsShown && !_scrollDownShown.animating();
+	if (shouldBeHidden != _scrollDown->isHidden()) {
+		_scrollDown->setVisible(!shouldBeHidden);
+	}
 }
 
 void Widget::showFilter() {
@@ -369,10 +457,15 @@ Dialogs::RowDescriptor Widget::activeChat() const {
 	};
 }
 
-QPixmap Widget::grabForShowAnimation(const Window::SectionSlideParams &params) {
-	if (params.withTopBarShadow) _fixedBarShadow->hide();
+QPixmap Widget::grabForShowAnimation(
+		const Window::SectionSlideParams &params) {
+	if (params.withTopBarShadow) {
+		_fixedBarShadow->hide();
+	}
 	auto result = Ui::GrabWidget(this);
-	if (params.withTopBarShadow) _fixedBarShadow->show();
+	if (params.withTopBarShadow) {
+		_fixedBarShadow->show();
+	}
 	return result;
 }
 
@@ -394,7 +487,9 @@ bool Widget::showInternal(
 	return false;
 }
 
-void Widget::setInternalState(const QRect &geometry, not_null<SectionMemento*> memento) {
+void Widget::setInternalState(
+		const QRect &geometry,
+		not_null<SectionMemento*> memento) {
 	setGeometry(geometry);
 	Ui::SendPendingMoveResizeEvents(this);
 	restoreState(memento);
@@ -407,7 +502,7 @@ void Widget::setupShortcuts() {
 			&& Ui::InFocusChain(this)
 			&& !controller()->isLayerShown()
 			&& isActiveWindow();
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(Command::Search, 2) && request->handle([=] {
 			_fixedBar->showSearch();
@@ -416,6 +511,44 @@ void Widget::setupShortcuts() {
 	}, lifetime());
 }
 
+void Widget::setupSwipeReply() {
+	auto update = [=](Ui::Controls::SwipeContextData data) {
+		if (data.translation > 0) {
+			if (!_swipeBackData.callback) {
+				_swipeBackData = Ui::Controls::SetupSwipeBack(
+					this,
+					[=]() -> std::pair<QColor, QColor> {
+						auto context = _inner->preparePaintContext({});
+						return {
+							context.st->msgServiceBg()->c,
+							context.st->msgServiceFg()->c,
+						};
+					});
+			}
+			_swipeBackData.callback(data);
+			return;
+		} else if (_swipeBackData.lifetime) {
+			_swipeBackData = {};
+		}
+	};
+
+	auto init = [=](Ui::Controls::SwipeHandlerInitData data) {
+		if (data.direction == Qt::RightToLeft) {
+			return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
+				controller()->showBackFromStack();
+			});
+		}
+		return Ui::Controls::SwipeHandlerFinishData();
+	};
+
+	Ui::Controls::SetupSwipeHandler({
+		.widget = _inner.data(),
+		.scroll = _scroll.data(),
+		.update = std::move(update),
+		.init = std::move(init),
+	});
+}
+
 std::shared_ptr<Window::SectionMemento> Widget::createMemento() {
 	auto result = std::make_shared<SectionMemento>(channel());
 	saveState(result.get());
@@ -439,15 +572,17 @@ void Widget::resizeEvent(QResizeEvent *e) {
 		return;
 	}
 
-	auto contentWidth = width();
+	const auto contentWidth = width();
 
-	auto newScrollTop = _scroll->scrollTop() + topDelta();
+	const auto newScrollTop = _scroll->scrollTop() + topDelta();
 	_fixedBar->resizeToWidth(contentWidth);
 	_fixedBarShadow->resize(contentWidth, st::lineWidth);
 
-	auto bottom = height();
-	auto scrollHeight = bottom - _fixedBar->height() - _whatIsThis->height();
-	auto scrollSize = QSize(contentWidth, scrollHeight);
+	const auto bottom = height();
+	const auto scrollHeight = bottom
+		- _fixedBar->height()
+		- _settingsFilter->height();
+	const auto scrollSize = QSize(contentWidth, scrollHeight);
 	if (_scroll->size() != scrollSize) {
 		_scroll->resize(scrollSize);
 		_inner->resizeToWidth(scrollSize.width(), _scroll->height());
@@ -461,8 +596,17 @@ void Widget::resizeEvent(QResizeEvent *e) {
 		auto scrollTop = _scroll->scrollTop();
 		_inner->setVisibleTopBottom(scrollTop, scrollTop + _scroll->height());
 	}
-	auto fullWidthButtonRect = myrtlrect(0, bottom - _whatIsThis->height(), contentWidth, _whatIsThis->height());
-	_whatIsThis->setGeometry(fullWidthButtonRect);
+	const auto fullWidthButtonRect = myrtlrect(
+		0,
+		bottom - _settingsFilter->height(),
+		contentWidth,
+		_settingsFilter->height());
+	_settingsFilter->setGeometry(fullWidthButtonRect);
+	_whatIsThis->moveToRight(
+		st::historySendRight,
+		bottom - _whatIsThis->height());
+
+	updateScrollDownPosition();
 }
 
 void Widget::paintEvent(QPaintEvent *e) {
@@ -486,12 +630,15 @@ void Widget::paintEvent(QPaintEvent *e) {
 void Widget::onScroll() {
 	int scrollTop = _scroll->scrollTop();
 	_inner->setVisibleTopBottom(scrollTop, scrollTop + _scroll->height());
+	updateScrollDownVisibility();
 }
 
 void Widget::showAnimatedHook(
 		const Window::SectionSlideParams &params) {
 	_fixedBar->setAnimatingMode(true);
-	if (params.withTopBarShadow) _fixedBarShadow->show();
+	if (params.withTopBarShadow) {
+		_fixedBarShadow->show();
+	}
 }
 
 void Widget::showFinishedHook() {
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.h b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.h
index 8a547ee8177172..57717853b31f30 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.h
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.h
@@ -11,12 +11,16 @@ For license and copyright information please follow this link:
 #include "window/section_memento.h"
 #include "history/admin_log/history_admin_log_item.h"
 #include "history/admin_log/history_admin_log_filter_value.h"
+#include "ui/controls/swipe_handler_data.h"
+#include "ui/effects/animations.h"
 #include "mtproto/sender.h"
 
 namespace Ui {
 class ScrollArea;
 class PlainShadow;
 class FlatButton;
+class IconButton;
+class JumpDownButton;
 } // namespace Ui
 
 namespace Profile {
@@ -74,12 +78,26 @@ class Widget final : public Window::SectionWidget {
 	void saveState(not_null<SectionMemento*> memento);
 	void restoreState(not_null<SectionMemento*> memento);
 	void setupShortcuts();
+	void setupSwipeReply();
+	void setupScrollDownButton();
+	void scrollDownClicked();
+	void scrollToAnimationCallback();
+	void updateScrollDownVisibility();
+	void updateScrollDownPosition();
+	void startScrollDownButtonAnimation(bool shown);
 
 	object_ptr<Ui::ScrollArea> _scroll;
 	QPointer<InnerWidget> _inner;
 	object_ptr<FixedBar> _fixedBar;
 	object_ptr<Ui::PlainShadow> _fixedBarShadow;
-	object_ptr<Ui::FlatButton> _whatIsThis;
+	object_ptr<Ui::FlatButton> _settingsFilter;
+	object_ptr<Ui::IconButton> _whatIsThis;
+	object_ptr<Ui::JumpDownButton> _scrollDown;
+	Ui::Animations::Simple _scrollDownShown;
+	Ui::Animations::Simple _scrollToAnimation;
+	bool _scrollDownIsShown = false;
+
+	Ui::Controls::SwipeBackResult _swipeBackData;
 
 };
 
@@ -153,6 +171,29 @@ class SectionMemento : public Window::SectionMemento {
 	QString takeSearchQuery() {
 		return std::move(_searchQuery);
 	}
+	void setExpandedGroups(std::set<uint64> &&groups) {
+		_expandedGroups = std::move(groups);
+	}
+	std::set<uint64> takeExpandedGroups() {
+		return std::move(_expandedGroups);
+	}
+	void setDeleteEventMeta(
+			base::flat_map<not_null<const HistoryItem*>, uint64> &&itemEventIds,
+			base::flat_map<uint64, UserId> &&eventAdminIds,
+			base::flat_map<uint64, TimeId> &&eventDates) {
+		_itemEventIds = std::move(itemEventIds);
+		_eventAdminIds = std::move(eventAdminIds);
+		_eventDates = std::move(eventDates);
+	}
+	auto takeItemEventIds() {
+		return std::move(_itemEventIds);
+	}
+	auto takeEventAdminIds() {
+		return std::move(_eventAdminIds);
+	}
+	auto takeEventDates() {
+		return std::move(_eventDates);
+	}
 
 private:
 	not_null<ChannelData*> _channel;
@@ -165,6 +206,10 @@ class SectionMemento : public Window::SectionMemento {
 	bool _downLoaded = true;
 	FilterValue _filter;
 	QString _searchQuery;
+	std::set<uint64> _expandedGroups;
+	base::flat_map<not_null<const HistoryItem*>, uint64> _itemEventIds;
+	base::flat_map<uint64, UserId> _eventAdminIds;
+	base::flat_map<uint64, TimeId> _eventDates;
 
 };
 
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index f78b3f9068f8ab..624737b0f3beb3 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -15,24 +15,31 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "history/history_item_components.h"
 #include "history/history_item_helpers.h"
+#include "history/history_streamed_drafts.h"
 #include "history/history_translation.h"
 #include "history/history_unread_things.h"
 #include "core/ui_integration.h"
 #include "dialogs/ui/dialogs_layout.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/credits.h"
 #include "data/components/scheduled_messages.h"
 #include "data/components/sponsored_messages.h"
 #include "data/components/top_peers.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/stickers/data_stickers.h"
+#include "data/data_cloud_themes.h"
 #include "data/data_drafts.h"
+#include "data/data_saved_messages.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_media_types.h"
 #include "data/data_channel_admins.h"
 #include "data/data_changes.h"
 #include "data/data_chat_filters.h"
+#include "data/data_replies_list.h"
 #include "data/data_send_action.h"
+#include "data/data_star_gift.h"
+#include "data/data_emoji_statuses.h"
 #include "data/data_folder.h"
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
@@ -43,6 +50,10 @@ For license and copyright information please follow this link:
 #include "data/data_document.h"
 #include "data/data_histories.h"
 #include "data/data_history_messages.h"
+#include "api/api_text_entities.h"
+#include "api/api_updates.h"
+#include "data/data_poll.h"
+#include "data/data_todo_list.h"
 #include "lang/lang_keys.h"
 #include "apiwrap.h"
 #include "api/api_chat_participants.h"
@@ -50,6 +61,7 @@ For license and copyright information please follow this link:
 #include "mainwindow.h"
 #include "main/main_session.h"
 #include "window/notifications_manager.h"
+#include "window/window_session_controller.h"
 #include "calls/calls_instance.h"
 #include "spellcheck/spellcheck_types.h"
 #include "storage/localstorage.h"
@@ -61,6 +73,7 @@ For license and copyright information please follow this link:
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
+#include "ui/painter.h" // remove when History::paintUserpic accepts QPainter
 #include "payments/payments_checkout_process.h"
 #include "core/crash_reports.h"
 #include "core/application.h"
@@ -81,13 +94,40 @@ using UpdateFlag = Data::HistoryUpdate::Flag;
 	return fields;
 }
 
+[[nodiscard]] Dialogs::UnreadState AdjustedForumUnreadState(
+		Dialogs::UnreadState state) {
+	const auto allMuted = (state.chats == state.chatsMuted);
+	state.chatsMuted = (state.chats && allMuted) ? 1 : 0;
+	state.chats = state.chats ? 1 : 0;
+	return state;
+}
+
+[[nodiscard]] UserData *GuestChatBotForCurrentUser(
+		not_null<HistoryItem*> item) {
+	if (!item->isGuestChatBotMessage()) {
+		return nullptr;
+	}
+	const auto guestChat = item->Get<HistoryMessageGuestChat>();
+	const auto self = item->history()->session().user();
+	if (!guestChat
+		|| !guestChat->visitor
+		|| (guestChat->visitor->id != self->id)) {
+		return nullptr;
+	}
+	const auto bot = item->from()->asUser();
+	return (bot
+		&& bot->isBot()
+		&& bot->botInfo
+		&& bot->botInfo->supportsGuestChat) ? bot : nullptr;
+}
+
 } // namespace
 
 History::History(not_null<Data::Session*> owner, PeerId peerId)
 : Thread(owner, Type::History)
 , peer(owner->peer(peerId))
 , _delegateMixin(HistoryInner::DelegateMixin())
-, _chatListNameSortKey(owner->nameSortKey(peer->name()))
+, _chatListNameSortKey(TextUtilities::NameSortKey(peer->name()))
 , _sendActionPainter(this) {
 	Thread::setMuted(owner->notifySettings().isMuted(peer));
 
@@ -127,6 +167,10 @@ void History::setHasPendingResizedItems() {
 void History::itemRemoved(not_null<HistoryItem*> item) {
 	if (item == _joinedMessage) {
 		_joinedMessage = nullptr;
+	} else if (item == _newPeerNameChange) {
+		_newPeerNameChange = nullptr;
+	} else if (item == _newPeerPhotoChange) {
+		_newPeerPhotoChange = nullptr;
 	}
 	item->removeMainView();
 	if (_lastServerMessage == item) {
@@ -148,6 +192,12 @@ void History::itemRemoved(not_null<HistoryItem*> item) {
 	if (const auto topic = item->topic()) {
 		topic->applyItemRemoved(item->id);
 	}
+	if (const auto sublist = item->savedSublist()) {
+		sublist->applyItemRemoved(item->id);
+	}
+	if (const auto streamed = _streamedDrafts.get()) {
+		streamed->applyItemRemoved(item);
+	}
 	if (const auto chat = peer->asChat()) {
 		if (const auto to = chat->getMigrateToChannel()) {
 			if (const auto history = owner().historyLoaded(to)) {
@@ -166,7 +216,9 @@ void History::checkChatListMessageRemoved(not_null<HistoryItem*> item) {
 }
 
 void History::itemVanished(not_null<HistoryItem*> item) {
-	item->notificationThread()->removeNotification(item);
+	if (const auto thread = item->maybeNotificationThread()) {
+		thread->removeNotification(item);
+	}
 	if (lastKeyboardId == item->id) {
 		clearLastKeyboard();
 	}
@@ -176,10 +228,10 @@ void History::itemVanished(not_null<HistoryItem*> item) {
 		setUnreadCount(unreadCount() - 1);
 	}
 	if (const auto media = item->media()) {
-		if (const auto gift = media->gift()) {
+		if (media->gift()) {
 			using GiftAction = Data::GiftUpdate::Action;
 			owner().notifyGiftUpdate({
-				.itemId = item->fullId(),
+				.id = Data::SavedStarGiftId::User(item->id),
 				.action = GiftAction::Delete,
 			});
 		}
@@ -188,33 +240,42 @@ void History::itemVanished(not_null<HistoryItem*> item) {
 
 void History::takeLocalDraft(not_null<History*> from) {
 	const auto topicRootId = MsgId(0);
-	const auto i = from->_drafts.find(Data::DraftKey::Local(topicRootId));
+	const auto monoforumPeerId = PeerId(0);
+	const auto i = from->_drafts.find(
+		Data::DraftKey::Local(topicRootId, monoforumPeerId));
 	if (i == end(from->_drafts)) {
 		return;
 	}
 	auto &draft = i->second;
 	if (!draft->textWithTags.text.isEmpty()
-		&& !_drafts.contains(Data::DraftKey::Local(topicRootId))) {
+		&& !_drafts.contains(
+			Data::DraftKey::Local(topicRootId, monoforumPeerId))) {
 		// Edit and reply to drafts can't migrate.
 		// Cloud drafts do not migrate automatically.
 		draft->reply = FullReplyTo();
 		setLocalDraft(std::move(draft));
 	}
-	from->clearLocalDraft(topicRootId);
+	from->clearLocalDraft(topicRootId, monoforumPeerId);
 	session().api().saveDraftToCloudDelayed(from);
 }
 
-void History::createLocalDraftFromCloud(MsgId topicRootId) {
-	const auto draft = cloudDraft(topicRootId);
+void History::createLocalDraftFromCloud(
+		MsgId topicRootId,
+		PeerId monoforumPeerId) {
+	const auto draft = cloudDraft(topicRootId, monoforumPeerId);
 	if (!draft) {
-		clearLocalDraft(topicRootId);
+		clearLocalDraft(topicRootId, monoforumPeerId);
 		return;
 	} else if (Data::DraftIsNull(draft) || !draft->date) {
 		return;
 	}
 
 	draft->reply.topicRootId = topicRootId;
-	auto existing = localDraft(topicRootId);
+	draft->reply.monoforumPeerId = monoforumPeerId;
+	if (!suggestDraftAllowed()) {
+		draft->suggest = SuggestOptions();
+	}
+	auto existing = localDraft(topicRootId, monoforumPeerId);
 	if (Data::DraftIsNull(existing)
 		|| !existing->date
 		|| draft->date >= existing->date) {
@@ -222,12 +283,14 @@ void History::createLocalDraftFromCloud(MsgId topicRootId) {
 			setLocalDraft(std::make_unique<Data::Draft>(
 				draft->textWithTags,
 				draft->reply,
+				draft->suggest,
 				draft->cursor,
 				draft->webpage));
-			existing = localDraft(topicRootId);
+			existing = localDraft(topicRootId, monoforumPeerId);
 		} else if (existing != draft) {
 			existing->textWithTags = draft->textWithTags;
 			existing->reply = draft->reply;
+			existing->suggest = draft->suggest;
 			existing->cursor = draft->cursor;
 			existing->webpage = draft->webpage;
 		}
@@ -250,7 +313,7 @@ void History::setDraft(
 		return;
 	}
 	const auto cloudThread = key.isCloud()
-		? threadFor(key.topicRootId())
+		? threadFor(key.topicRootId(), key.monoforumPeerId())
 		: nullptr;
 	if (cloudThread) {
 		cloudThread->cloudDraftTextCache().clear();
@@ -280,7 +343,7 @@ void History::clearDraft(Data::DraftKey key) {
 void History::clearDrafts() {
 	for (auto &[key, draft] : base::take(_drafts)) {
 		const auto cloudThread = key.isCloud()
-			? threadFor(key.topicRootId())
+			? threadFor(key.topicRootId(), key.monoforumPeerId())
 			: nullptr;
 		if (cloudThread) {
 			cloudThread->cloudDraftTextCache().clear();
@@ -291,96 +354,125 @@ void History::clearDrafts() {
 
 Data::Draft *History::createCloudDraft(
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		const Data::Draft *fromDraft) {
 	if (Data::DraftIsNull(fromDraft)) {
 		setCloudDraft(std::make_unique<Data::Draft>(
 			TextWithTags(),
-			FullReplyTo{ .topicRootId = topicRootId },
+			FullReplyTo{
+				.topicRootId = topicRootId,
+				.monoforumPeerId = monoforumPeerId,
+			},
+			SuggestOptions(),
 			MessageCursor(),
 			Data::WebPageDraft()));
-		cloudDraft(topicRootId)->date = TimeId(0);
+		cloudDraft(topicRootId, monoforumPeerId)->date = TimeId(0);
 	} else {
-		auto existing = cloudDraft(topicRootId);
+		auto existing = cloudDraft(topicRootId, monoforumPeerId);
 		if (!existing) {
 			auto reply = fromDraft->reply;
 			reply.topicRootId = topicRootId;
+			reply.monoforumPeerId = monoforumPeerId;
 			setCloudDraft(std::make_unique<Data::Draft>(
 				fromDraft->textWithTags,
 				reply,
+				fromDraft->suggest,
 				fromDraft->cursor,
 				fromDraft->webpage));
-			existing = cloudDraft(topicRootId);
+			existing = cloudDraft(topicRootId, monoforumPeerId);
 		} else if (existing != fromDraft) {
 			existing->textWithTags = fromDraft->textWithTags;
 			existing->reply = fromDraft->reply;
+			existing->suggest = fromDraft->suggest;
 			existing->cursor = fromDraft->cursor;
 			existing->webpage = fromDraft->webpage;
 		}
 		existing->date = base::unixtime::now();
 		existing->reply.topicRootId = topicRootId;
+		existing->reply.monoforumPeerId = monoforumPeerId;
+		if (!suggestDraftAllowed()) {
+			existing->suggest = SuggestOptions();
+		}
 	}
 
-	if (const auto thread = threadFor(topicRootId)) {
+	if (const auto thread = threadFor(topicRootId, monoforumPeerId)) {
 		thread->cloudDraftTextCache().clear();
 		thread->updateChatListSortPosition();
 	}
 
-	return cloudDraft(topicRootId);
+	return cloudDraft(topicRootId, monoforumPeerId);
 }
 
-bool History::skipCloudDraftUpdate(MsgId topicRootId, TimeId date) const {
-	const auto i = _acceptCloudDraftsAfter.find(topicRootId);
-	return _savingCloudDraftRequests.contains(topicRootId)
+bool History::skipCloudDraftUpdate(
+		MsgId topicRootId,
+		PeerId monoforumPeerId,
+		TimeId date) const {
+	const auto key = Data::DraftKey::Local(topicRootId, monoforumPeerId);
+	const auto i = _acceptCloudDraftsAfter.find(key);
+	return _savingCloudDraftRequests.contains(key)
 		|| (i != _acceptCloudDraftsAfter.end() && date < i->second);
 }
 
-void History::startSavingCloudDraft(MsgId topicRootId) {
-	++_savingCloudDraftRequests[topicRootId];
+void History::startSavingCloudDraft(
+		MsgId topicRootId,
+		PeerId monoforumPeerId) {
+	const auto key = Data::DraftKey::Local(topicRootId, monoforumPeerId);
+	++_savingCloudDraftRequests[key];
 }
 
-void History::finishSavingCloudDraft(MsgId topicRootId, TimeId savedAt) {
-	const auto i = _savingCloudDraftRequests.find(topicRootId);
+void History::finishSavingCloudDraft(
+		MsgId topicRootId,
+		PeerId monoforumPeerId,
+		TimeId savedAt) {
+	const auto key = Data::DraftKey::Local(topicRootId, monoforumPeerId);
+	const auto i = _savingCloudDraftRequests.find(key);
 	if (i != _savingCloudDraftRequests.end()) {
 		if (--i->second <= 0) {
 			_savingCloudDraftRequests.erase(i);
 		}
 	}
-	auto &after = _acceptCloudDraftsAfter[topicRootId];
+	auto &after = _acceptCloudDraftsAfter[key];
 	after = std::max(after, savedAt + kSkipCloudDraftsFor);
 }
 
-void History::applyCloudDraft(MsgId topicRootId) {
+void History::applyCloudDraft(MsgId topicRootId, PeerId monoforumPeerId) {
 	if (!topicRootId && session().supportMode()) {
 		updateChatListEntry();
 		session().supportHelper().cloudDraftChanged(this);
 	} else {
-		createLocalDraftFromCloud(topicRootId);
-		if (const auto thread = threadFor(topicRootId)) {
+		createLocalDraftFromCloud(topicRootId, monoforumPeerId);
+		if (const auto thread = threadFor(topicRootId, monoforumPeerId)) {
 			thread->updateChatListSortPosition();
-			if (!topicRootId) {
-				session().changes().historyUpdated(
-					this,
-					UpdateFlag::CloudDraft);
-			} else {
+			if (topicRootId) {
 				session().changes().topicUpdated(
 					thread->asTopic(),
 					Data::TopicUpdate::Flag::CloudDraft);
+			} else if (monoforumPeerId) {
+				session().changes().sublistUpdated(
+					thread->asSublist(),
+					Data::SublistUpdate::Flag::CloudDraft);
+			} else {
+				session().changes().historyUpdated(
+					this,
+					UpdateFlag::CloudDraft);
 			}
 		}
 	}
 }
 
-void History::draftSavedToCloud(MsgId topicRootId) {
-	if (const auto thread = threadFor(topicRootId)) {
+void History::draftSavedToCloud(MsgId topicRootId, PeerId monoforumPeerId) {
+	if (const auto thread = threadFor(topicRootId, monoforumPeerId)) {
 		thread->updateChatListEntry();
 	}
 	session().local().writeDrafts(this);
 }
 
 const Data::ForwardDraft &History::forwardDraft(
-		MsgId topicRootId) const {
+		MsgId topicRootId,
+		PeerId monoforumPeerId) const {
+	const auto key = Data::DraftKey::Local(topicRootId, monoforumPeerId);
 	static const auto kEmpty = Data::ForwardDraft();
-	const auto i = _forwardDrafts.find(topicRootId);
+	const auto i = _forwardDrafts.find(key);
 	return (i != end(_forwardDrafts)) ? i->second : kEmpty;
 }
 
@@ -393,11 +485,12 @@ Data::ResolvedForwardDraft History::resolveForwardDraft(
 }
 
 Data::ResolvedForwardDraft History::resolveForwardDraft(
-		MsgId topicRootId) {
-	const auto &draft = forwardDraft(topicRootId);
+		MsgId topicRootId,
+		PeerId monoforumPeerId) {
+	const auto &draft = forwardDraft(topicRootId, monoforumPeerId);
 	auto result = resolveForwardDraft(draft);
 	if (result.items.size() != draft.ids.size()) {
-		setForwardDraft(topicRootId, {
+		setForwardDraft(topicRootId, monoforumPeerId, {
 			.ids = owner().itemsToIds(result.items),
 			.options = result.options,
 		});
@@ -407,24 +500,23 @@ Data::ResolvedForwardDraft History::resolveForwardDraft(
 
 void History::setForwardDraft(
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		Data::ForwardDraft &&draft) {
 	auto changed = false;
+	const auto key = Data::DraftKey::Local(topicRootId, monoforumPeerId);
 	if (draft.ids.empty()) {
-		changed = _forwardDrafts.remove(topicRootId);
+		changed = _forwardDrafts.remove(key);
 	} else {
-		auto &now = _forwardDrafts[topicRootId];
+		auto &now = _forwardDrafts[key];
 		if (now != draft) {
 			now = std::move(draft);
 			changed = true;
 		}
 	}
 	if (changed) {
-		const auto entry = topicRootId
-			? peer->forumTopicFor(topicRootId)
-			: (Dialogs::Entry*)this;
-		if (entry) {
+		if (const auto thread = threadFor(topicRootId, monoforumPeerId)) {
 			session().changes().entryUpdated(
-				entry,
+				thread,
 				Data::EntryUpdate::Flag::ForwardDraft);
 		}
 	}
@@ -436,9 +528,13 @@ not_null<HistoryItem*> History::createItem(
 		MessageFlags localFlags,
 		bool detachExistingItem,
 		bool newMessage) {
+	owner().fillMessagePeers(peer->id, message);
 	if (const auto result = owner().message(peer, id)) {
 		if (detachExistingItem) {
-			result->removeMainView();
+			result->removeMainView(Data::ViewRemovalReason::Detached);
+		}
+		if (result->needsUpdateForVideoQualities(message)) {
+			owner().updateEditedMessage(message);
 		}
 		return result;
 	}
@@ -447,6 +543,14 @@ not_null<HistoryItem*> History::createItem(
 	});
 	if (newMessage && result->out() && result->isRegular()) {
 		session().topPeers().increment(peer, result->date());
+		if (result->starsPaid()) {
+			session().credits().load(true);
+		}
+	}
+	if (newMessage && !result->out() && result->isRegular()) {
+		if (const auto bot = GuestChatBotForCurrentUser(result)) {
+			session().topGuestChatBots().increment(bot, result->date());
+		}
 	}
 	return result;
 }
@@ -459,8 +563,15 @@ std::vector<not_null<HistoryItem*>> History::createItems(
 	const auto detachExistingItem = true;
 	for (auto i = data.cend(), e = data.cbegin(); i != e;) {
 		const auto &data = *--i;
+		const auto id = IdFromMessage(data);
+		if ((id.bare == 1) && (data.type() == mtpc_messageEmpty)) {
+			// The first message of channels should be a service message
+			// about its creation. But if channel auto-cleaning is enabled,
+			// the first message comes empty and is displayed incorrectly.
+			continue;
+		}
 		result.emplace_back(createItem(
-			IdFromMessage(data),
+			id,
 			data,
 			localFlags,
 			detachExistingItem));
@@ -474,6 +585,18 @@ not_null<HistoryItem*> History::addNewMessage(
 		MessageFlags localFlags,
 		NewMessageType type) {
 	const auto newMessage = (type == NewMessageType::Unread);
+	if (newMessage && isUnknownMessageDeleted(id)) {
+		const auto &updates = session().updates();
+		LOG(("Unknown deleted message re-added. "
+			"Peer ID: %1, Message ID: %2, Source: %3.")
+			.arg(peer->id.value & PeerId::kChatTypeMask)
+			.arg(id.bare)
+			.arg(updates.handlingChannelDifference()
+				? u"channelDifference"_q
+				: updates.requestingDifference()
+				? u"commonDifference"_q
+				: u"globalUpdate"_q));
+	}
 	const auto detachExisting = newMessage;
 	const auto item = createItem(
 		id,
@@ -559,7 +682,10 @@ void History::destroyMessagesByDates(TimeId minDate, TimeId maxDate) {
 			toDestroy.push_back(message.get());
 		}
 	}
-	for (const auto item : toDestroy) {
+	if (!toDestroy.empty()) {
+		owner().notifyItemsAboutToBeDestroyed(toDestroy);
+	}
+	for (const auto &item : toDestroy) {
 		item->destroy();
 	}
 }
@@ -572,25 +698,59 @@ void History::destroyMessagesByTopic(MsgId topicRootId) {
 			toDestroy.push_back(message.get());
 		}
 	}
-	for (const auto item : toDestroy) {
+	if (!toDestroy.empty()) {
+		owner().notifyItemsAboutToBeDestroyed(toDestroy);
+	}
+	for (const auto &item : toDestroy) {
 		item->destroy();
 	}
 }
 
-void History::unpinMessagesFor(MsgId topicRootId) {
-	if (!topicRootId) {
+void History::destroyMessagesBySublist(not_null<PeerData*> sublistPeer) {
+	auto toDestroy = std::vector<not_null<HistoryItem*>>();
+	toDestroy.reserve(_items.size());
+	const auto peerId = sublistPeer->id;
+	for (const auto &message : _items) {
+		if (message->sublistPeerId() == peerId) {
+			toDestroy.push_back(message.get());
+		}
+	}
+	if (!toDestroy.empty()) {
+		owner().notifyItemsAboutToBeDestroyed(toDestroy);
+	}
+	for (const auto &item : toDestroy) {
+		item->destroy();
+	}
+}
+
+void History::unpinMessagesFor(MsgId topicRootId, PeerId monoforumPeerId) {
+	if (topicRootId) {
 		session().storage().remove(
 			Storage::SharedMediaRemoveAll(
 				peer->id,
+				topicRootId,
 				Storage::SharedMediaType::Pinned));
-		setHasPinnedMessages(false);
-		if (const auto forum = peer->forum()) {
-			forum->enumerateTopics([](not_null<Data::ForumTopic*> topic) {
-				topic->setHasPinnedMessages(false);
-			});
+		if (const auto topic = peer->forumTopicFor(topicRootId)) {
+			topic->setHasPinnedMessages(false);
 		}
 		for (const auto &item : _items) {
-			if (item->isPinned()) {
+			if (item->isPinned() && item->topicRootId() == topicRootId) {
+				item->setIsPinned(false);
+			}
+		}
+	} else if (monoforumPeerId) {
+		session().storage().remove(
+			Storage::SharedMediaRemoveAll(
+				peer->id,
+				monoforumPeerId,
+				Storage::SharedMediaType::Pinned));
+		if (const auto sublist = peer->monoforumSublistFor(
+				monoforumPeerId)) {
+			sublist->setHasPinnedMessages(false);
+		}
+		for (const auto &item : _items) {
+			if (item->isPinned()
+				&& item->sublistPeerId() == monoforumPeerId) {
 				item->setIsPinned(false);
 			}
 		}
@@ -598,13 +758,15 @@ void History::unpinMessagesFor(MsgId topicRootId) {
 		session().storage().remove(
 			Storage::SharedMediaRemoveAll(
 				peer->id,
-				topicRootId,
 				Storage::SharedMediaType::Pinned));
-		if (const auto topic = peer->forumTopicFor(topicRootId)) {
-			topic->setHasPinnedMessages(false);
+		setHasPinnedMessages(false);
+		if (const auto forum = peer->forum()) {
+			forum->enumerateTopics([](not_null<Data::ForumTopic*> topic) {
+				topic->setHasPinnedMessages(false);
+			});
 		}
 		for (const auto &item : _items) {
-			if (item->isPinned() && item->topicRootId() == topicRootId) {
+			if (item->isPinned()) {
 				item->setIsPinned(false);
 			}
 		}
@@ -639,7 +801,10 @@ not_null<HistoryItem*> History::addNewItem(
 	if (!loadedAtBottom() || peer->migrateTo()) {
 		setLastMessage(item);
 		if (unread) {
-			newItemAdded(item);
+			const auto type = item->out()
+				? NewAddType::Outgoing
+				: NewAddType::RegularIncoming;
+			newItemAdded(item, type);
 		}
 	} else {
 		addNewToBack(item, unread);
@@ -647,7 +812,7 @@ not_null<HistoryItem*> History::addNewItem(
 	}
 
 	if (const auto sublist = item->savedSublist()) {
-		sublist->applyMaybeLast(item, unread);
+		sublist->applyMaybeLast(item);
 	}
 
 	return item;
@@ -712,6 +877,14 @@ not_null<HistoryItem*> History::addNewLocalMessage(
 		true);
 }
 
+not_null<HistoryItem*> History::addNewLocalMessage(
+		not_null<HistoryItem*> item) {
+	Expects(item->history() == this);
+	Expects(item->isLocal());
+
+	return addNewItem(item, true);
+}
+
 not_null<HistoryItem*> History::addSponsoredMessage(
 		MsgId id,
 		Data::SponsoredFrom from,
@@ -754,11 +927,19 @@ void History::clearUnreadMentionsFor(MsgId topicRootId) {
 	}
 }
 
-void History::clearUnreadReactionsFor(MsgId topicRootId) {
+void History::clearUnreadReactionsFor(
+		MsgId topicRootId,
+		Data::SavedSublist *sublist) {
 	const auto forum = peer->forum();
-	if (!topicRootId) {
+	const auto monoforum = peer->monoforum();
+	const auto sublistPeerId = sublist ? sublist->sublistPeer()->id : 0;
+	if ((!topicRootId && !sublist)
+		|| (!topicRootId && forum)
+		|| (!sublist && monoforum)) {
 		if (forum) {
 			forum->clearAllUnreadReactions();
+		} else if (monoforum) {
+			monoforum->clearAllUnreadReactions();
 		}
 		unreadReactions().clear();
 		return;
@@ -766,6 +947,8 @@ void History::clearUnreadReactionsFor(MsgId topicRootId) {
 		if (const auto topic = forum->topicFor(topicRootId)) {
 			topic->unreadReactions().clear();
 		}
+	} else if (monoforum) {
+		sublist->unreadReactions().clear();
 	}
 	const auto &ids = unreadReactionsIds();
 	if (ids.empty()) {
@@ -777,7 +960,8 @@ void History::clearUnreadReactionsFor(MsgId topicRootId) {
 	items.reserve(ids.size());
 	for (const auto &id : ids) {
 		if (const auto item = owner->message(peerId, id)) {
-			if (item->topicRootId() == topicRootId) {
+			if ((topicRootId && item->topicRootId() == topicRootId)
+				|| (sublist && item->sublistPeerId() == sublistPeerId)) {
 				items.emplace(id);
 			}
 		}
@@ -787,6 +971,57 @@ void History::clearUnreadReactionsFor(MsgId topicRootId) {
 	}
 }
 
+int History::unreadPollVotesCount() const {
+	return _unreadPollVotesCount;
+}
+
+void History::setUnreadPollVotesCount(int count) {
+	if (_unreadPollVotesCount == count) {
+		return;
+	}
+	const auto notifier = unreadStateChangeNotifier(
+		useMyUnreadInParent());
+	_unreadPollVotesCount = count;
+	_unreadPollVotesCountChanges.fire_copy(count);
+}
+
+rpl::producer<int> History::unreadPollVotesCountChanges() const {
+	return _unreadPollVotesCountChanges.events();
+}
+
+void History::clearUnreadPollVotesFor(MsgId topicRootId) {
+	const auto forum = peer->forum();
+	if (!topicRootId) {
+		if (forum) {
+			forum->clearAllUnreadPollVotes();
+		}
+		unreadPollVotes().clear();
+		return;
+	} else if (forum) {
+		if (const auto topic = forum->topicFor(topicRootId)) {
+			topic->unreadPollVotes().clear();
+		}
+	}
+	const auto &ids = unreadPollVotesIds();
+	if (ids.empty()) {
+		return;
+	}
+	const auto owner = &this->owner();
+	const auto peerId = peer->id;
+	auto items = base::flat_set<MsgId>();
+	items.reserve(ids.size());
+	for (const auto &id : ids) {
+		if (const auto item = owner->message(peerId, id)) {
+			if (item->topicRootId() == topicRootId) {
+				items.emplace(id);
+			}
+		}
+	}
+	for (const auto &id : items) {
+		unreadPollVotes().erase(id);
+	}
+}
+
 not_null<HistoryItem*> History::addNewToBack(
 		not_null<HistoryItem*> item,
 		bool unread) {
@@ -805,6 +1040,7 @@ not_null<HistoryItem*> History::addNewToBack(
 			storage.add(Storage::SharedMediaAddExisting(
 				peer->id,
 				MsgId(0), // topicRootId
+				PeerId(0), // monoforumPeerId
 				types,
 				item->id,
 				{ from, till }));
@@ -816,6 +1052,7 @@ not_null<HistoryItem*> History::addNewToBack(
 				storage.add(Storage::SharedMediaAddExisting(
 					peer->id,
 					topic->rootId(),
+					PeerId(), // monoforumPeerId
 					types,
 					item->id,
 					{ item->id, item->id}));
@@ -823,101 +1060,114 @@ not_null<HistoryItem*> History::addNewToBack(
 					topic->setHasPinnedMessages(true);
 				}
 			}
+			if (const auto sublist = item->savedSublist()) {
+				storage.add(Storage::SharedMediaAddExisting(
+					peer->id,
+					MsgId(), // topicRootId
+					item->sublistPeerId(),
+					types,
+					item->id,
+					{ item->id, item->id }));
+				if (pinned) {
+					sublist->setHasPinnedMessages(true);
+				}
+			}
 		}
 	}
-	if (item->from()->id) {
-		if (auto user = item->from()->asUser()) {
-			auto getLastAuthors = [this]() -> std::deque<not_null<UserData*>>* {
-				if (auto chat = peer->asChat()) {
-					return &chat->lastAuthors;
-				} else if (auto channel = peer->asMegagroup()) {
-					return channel->canViewMembers()
-						? &channel->mgInfo->lastParticipants
-						: nullptr;
-				}
-				return nullptr;
-			};
-			if (auto megagroup = peer->asMegagroup()) {
-				if (user->isBot()) {
-					auto mgInfo = megagroup->mgInfo.get();
-					Assert(mgInfo != nullptr);
-					mgInfo->bots.insert(user);
-					if (mgInfo->botStatus != 0 && mgInfo->botStatus < 2) {
-						mgInfo->botStatus = 2;
-					}
-				}
+	const auto from = item->from();
+	const auto guestMessage = item->Has<HistoryMessageGuestChat>();
+	if (const auto user = guestMessage ? nullptr : from->asUser()) {
+		const auto lastAuthors = [&]() -> std::deque<not_null<UserData*>>* {
+			if (auto chat = peer->asChat()) {
+				return &chat->lastAuthors;
+			} else if (auto channel = peer->asMegagroup()) {
+				return channel->canViewMembers()
+					? &channel->mgInfo->lastParticipants
+					: nullptr;
 			}
-			if (auto lastAuthors = getLastAuthors()) {
-				auto prev = ranges::find(
-					*lastAuthors,
-					user,
-					[](not_null<UserData*> user) { return user.get(); });
-				auto index = (prev != lastAuthors->end())
-					? (lastAuthors->end() - prev)
-					: -1;
-				if (index > 0) {
-					lastAuthors->erase(prev);
-				} else if (index < 0 && peer->isMegagroup()) { // nothing is outdated if just reordering
-					// admins information outdated
-				}
-				if (index) {
-					lastAuthors->push_front(user);
-				}
-				if (auto megagroup = peer->asMegagroup()) {
-					session().changes().peerUpdated(
-						peer,
-						Data::PeerUpdate::Flag::Members);
-					owner().addNewMegagroupParticipant(megagroup, user);
+			return nullptr;
+		}();
+		if (const auto megagroup = peer->asMegagroup()) {
+			if (user->isBot()) {
+				const auto mgInfo = megagroup->mgInfo.get();
+				Assert(mgInfo != nullptr);
+				mgInfo->bots.insert(user);
+				if (mgInfo->botStatus == Data::BotStatus::NoBots) {
+					mgInfo->botStatus = Data::BotStatus::HasBots;
 				}
 			}
 		}
-		if (item->definesReplyKeyboard()) {
-			auto markupFlags = item->replyKeyboardFlags();
-			if (!(markupFlags & ReplyMarkupFlag::Selective)
-				|| item->mentionsMe()) {
-				auto getMarkupSenders = [this]() -> base::flat_set<not_null<PeerData*>>* {
-					if (auto chat = peer->asChat()) {
-						return &chat->markupSenders;
-					} else if (auto channel = peer->asMegagroup()) {
-						return &channel->mgInfo->markupSenders;
-					}
-					return nullptr;
-				};
-				if (auto markupSenders = getMarkupSenders()) {
-					markupSenders->insert(item->from());
+		if (lastAuthors) {
+			const auto prev = ranges::find(
+				*lastAuthors,
+				user,
+				[](not_null<UserData*> user) { return user.get(); });
+			const auto index = (prev != lastAuthors->end())
+				? (lastAuthors->end() - prev)
+				: -1;
+			if (index > 0) {
+				// nothing is outdated if just reordering
+				lastAuthors->erase(prev);
+			} else if (index < 0 && peer->isMegagroup()) {
+				// admins information outdated
+			}
+			if (index) {
+				lastAuthors->push_front(user);
+			}
+			if (const auto megagroup = peer->asMegagroup()) {
+				session().changes().peerUpdated(
+					peer,
+					Data::PeerUpdate::Flag::Members);
+				owner().addNewMegagroupParticipant(megagroup, user);
+			}
+		}
+	}
+	if (item->definesReplyKeyboard()) {
+		const auto markupFlags = item->replyKeyboardFlags();
+		if (!(markupFlags & ReplyMarkupFlag::Selective)
+			|| item->mentionsMe()) {
+			const auto markupSenders = [&]() -> base::flat_set<not_null<PeerData*>>* {
+				if (const auto chat = peer->asChat()) {
+					return &chat->markupSenders;
+				} else if (const auto channel = peer->asMegagroup()) {
+					return &channel->mgInfo->markupSenders;
 				}
-				if (markupFlags & ReplyMarkupFlag::None) {
-					// None markup means replyKeyboardHide.
-					if (lastKeyboardFrom == item->from()->id
-						|| (!lastKeyboardInited
-							&& !peer->isChat()
-							&& !peer->isMegagroup()
-							&& !item->out())) {
-						clearLastKeyboard();
-					}
+				return nullptr;
+			}();
+			if (markupSenders) {
+				markupSenders->insert(from);
+			}
+			if (markupFlags & ReplyMarkupFlag::None) {
+				// None markup means replyKeyboardHide.
+				if (lastKeyboardFrom == from->id
+					|| (!lastKeyboardInited
+						&& !peer->isChat()
+						&& !peer->isMegagroup()
+						&& !item->out())) {
+					clearLastKeyboard();
+				}
+			} else {
+				bool botNotInChat = false;
+				if (peer->isChat()) {
+					botNotInChat = from->isUser()
+						&& (!peer->asChat()->participants.empty()
+							|| !Data::CanSendAnything(peer))
+						&& !peer->asChat()->participants.contains(
+							from->asUser());
+				} else if (peer->isMegagroup()) {
+					botNotInChat = from->isUser()
+						&& (peer->asChannel()->mgInfo->botStatus != Data::BotStatus::Unknown
+							|| !Data::CanSendAnything(peer))
+						&& !peer->asChannel()->mgInfo->bots.contains(
+							from->asUser());
+				}
+				if (botNotInChat) {
+					clearLastKeyboard();
 				} else {
-					bool botNotInChat = false;
-					if (peer->isChat()) {
-						botNotInChat = item->from()->isUser()
-							&& (!peer->asChat()->participants.empty()
-								|| !Data::CanSendAnything(peer))
-							&& !peer->asChat()->participants.contains(
-								item->from()->asUser());
-					} else if (peer->isMegagroup()) {
-						botNotInChat = item->from()->isUser()
-							&& (peer->asChannel()->mgInfo->botStatus != 0
-								|| !Data::CanSendAnything(peer))
-							&& !peer->asChannel()->mgInfo->bots.contains(
-								item->from()->asUser());
-					}
-					if (botNotInChat) {
-						clearLastKeyboard();
-					} else {
-						lastKeyboardInited = true;
-						lastKeyboardId = item->id;
-						lastKeyboardFrom = item->from()->id;
-						lastKeyboardUsed = false;
-					}
+					lastKeyboardInited = true;
+					lastKeyboardId = item->id;
+					lastKeyboardFrom = from->id;
+					lastKeyboardUsed = false;
 				}
 			}
 		}
@@ -925,7 +1175,10 @@ not_null<HistoryItem*> History::addNewToBack(
 
 	setLastMessage(item);
 	if (unread) {
-		newItemAdded(item);
+		const auto type = item->out()
+			? NewAddType::Outgoing
+			: NewAddType::RegularIncoming;
+		newItemAdded(item, type);
 	}
 
 	owner().notifyHistoryChangeDelayed(this);
@@ -962,8 +1215,8 @@ void History::applyServiceChanges(
 		}
 		if (user->isBot()) {
 			mgInfo->bots.insert(user);
-			if (mgInfo->botStatus != 0 && mgInfo->botStatus < 2) {
-				mgInfo->botStatus = 2;
+			if (mgInfo->botStatus == Data::BotStatus::NoBots) {
+				mgInfo->botStatus = Data::BotStatus::HasBots;
 			}
 		}
 	};
@@ -1031,8 +1284,8 @@ void History::applyServiceChanges(
 						Data::PeerUpdate::Flag::Admins);
 				}
 				mgInfo->bots.remove(user);
-				if (mgInfo->bots.empty() && mgInfo->botStatus > 0) {
-					mgInfo->botStatus = -1;
+				if (mgInfo->bots.empty() && mgInfo->botStatus == Data::BotStatus::HasBots) {
+					mgInfo->botStatus = Data::BotStatus::NoBots;
 				}
 			}
 			Data::ChannelAdminChanges(megagroup).remove(uid);
@@ -1089,7 +1342,8 @@ void History::applyServiceChanges(
 				if (id && item) {
 					session().storage().add(Storage::SharedMediaAddSlice(
 						peer->id,
-						MsgId(0),
+						MsgId(0), // topicRootId
+						PeerId(0), // monoforumPeerId
 						Storage::SharedMediaType::Pinned,
 						{ id },
 						{ id, ServerMaxMsgId }));
@@ -1098,11 +1352,22 @@ void History::applyServiceChanges(
 						session().storage().add(Storage::SharedMediaAddSlice(
 							peer->id,
 							topic->rootId(),
+							PeerId(), // monoforumPeerId
 							Storage::SharedMediaType::Pinned,
 							{ id },
 							{ id, ServerMaxMsgId }));
 						topic->setHasPinnedMessages(true);
 					}
+					if (const auto sublist = item->savedSublist()) {
+						session().storage().add(Storage::SharedMediaAddSlice(
+							peer->id,
+							MsgId(), // topicRootId
+							item->sublistPeerId(),
+							Storage::SharedMediaType::Pinned,
+							{ id },
+							{ id, ServerMaxMsgId }));
+						sublist->setHasPinnedMessages(true);
+					}
 				}
 			}, [&](const MTPDmessageReplyStoryHeader &data) {
 				LOG(("API Error: story reply in messageActionPinMessage."));
@@ -1125,7 +1390,7 @@ void History::applyServiceChanges(
 			auto paid = std::optional<Payments::PaidInvoice>();
 			if (const auto message = payment->msg) {
 				if (const auto media = message->media()) {
-					if (const auto invoice = media->invoice()) {
+					if (media->invoice()) {
 						paid = Payments::CheckoutProcess::InvoicePaid(
 							message);
 					}
@@ -1138,28 +1403,27 @@ void History::applyServiceChanges(
 			}
 			if (paid) {
 				// Toast on a current active window.
-				const auto context = [=](not_null<QWidget*> toast) {
-					return Core::MarkedTextContext{
-						.session = &session(),
-						.customEmojiRepaint = [=] { toast->update(); },
-					};
-				};
 				Ui::Toast::Show({
 					.text = tr::lng_payments_success(
 						tr::now,
 						lt_amount,
-						Ui::Text::Wrapped(
-							payment->amount,
-							EntityType::Bold),
+						Ui::Text::Wrapped(payment->amount, EntityType::Bold),
 						lt_title,
-						Ui::Text::Bold(paid->title),
-						Ui::Text::WithEntities),
-					.textContext = context,
+						tr::bold(paid->title),
+						tr::marked),
+					.textContext = Core::TextContext({
+						.session = &session(),
+					}),
 				});
 			}
 		}
 	}, [&](const MTPDmessageActionSetChatTheme &data) {
-		peer->setThemeEmoji(qs(data.vemoticon()));
+		data.vtheme().match([&](const MTPDchatTheme &data) {
+			peer->setThemeToken(qs(data.vemoticon()));
+		}, [&](const MTPDchatThemeUniqueGift &data) {
+			peer->setThemeToken(
+				owner().cloudThemes().processGiftThemeGetToken(data));
+		});
 	}, [&](const MTPDmessageActionSetChatWallPaper &data) {
 		if (item->out() || data.is_for_both()) {
 			peer->setWallPaper(
@@ -1194,14 +1458,141 @@ void History::applyServiceChanges(
 				topic->setHidden(mtpIsTrue(*hidden));
 			}
 		}
+	}, [&](const MTPDmessageActionConferenceCall &data) {
+		if (!data.is_active() && !data.is_missed() && !item->out()) {
+			if (const auto user = item->history()->peer->asUser()) {
+				Core::App().calls().showConferenceInvite(user, item->id);
+			}
+		}
+	}, [&](const MTPDmessageActionTodoCompletions &data) {
+		if (const auto done = item->Get<HistoryServiceTodoCompletions>()) {
+			const auto list = done->msg
+				? done->msg
+				: owner().message(peer, done->msgId);
+			if (const auto media = list ? list->media() : nullptr) {
+				if (const auto todolist = media->todolist()) {
+					todolist->apply(item, data);
+				}
+			}
+		}
+	}, [&](const MTPDmessageActionTodoAppendTasks &data) {
+		if (const auto done = item->Get<HistoryServiceTodoCompletions>()) {
+			const auto list = done->msg
+				? done->msg
+				: owner().message(peer, done->msgId);
+			if (const auto media = list ? list->media() : nullptr) {
+				if (const auto todolist = media->todolist()) {
+					todolist->apply(data);
+				}
+			}
+		}
+	}, [&](const MTPDmessageActionPollAppendAnswer &data) {
+		if (const auto append = item->Get<HistoryServicePollAppendAnswer>()) {
+			const auto list = append->msg
+				? append->msg
+				: owner().message(peer, append->msgId);
+			if (const auto media = list ? list->media() : nullptr) {
+				if (const auto poll = media->poll()) {
+					data.vanswer().match([&](const MTPDpollAnswer &answer) {
+						auto parsed = PollAnswer();
+						parsed.option = answer.voption().v;
+						parsed.text = Api::ParseTextWithEntities(
+							&session(),
+							answer.vtext());
+						if (!poll->answerByOption(parsed.option)) {
+							poll->answers.push_back(std::move(parsed));
+							++poll->version;
+							owner().notifyPollUpdateDelayed(poll);
+						}
+					}, [](const auto &) {});
+				}
+			}
+		}
+	}, [&](const MTPDmessageActionPollDeleteAnswer &data) {
+		if (const auto del = item->Get<HistoryServicePollDeleteAnswer>()) {
+			const auto list = del->msg
+				? del->msg
+				: owner().message(peer, del->msgId);
+			if (const auto media = list ? list->media() : nullptr) {
+				if (const auto poll = media->poll()) {
+					const auto option = del->answer.option;
+					auto &answers = poll->answers;
+					const auto size = answers.size();
+					answers.erase(
+						ranges::remove(answers, option, &PollAnswer::option),
+						end(answers));
+					if (answers.size() != size) {
+						++poll->version;
+						owner().notifyPollUpdateDelayed(poll);
+					}
+				}
+			}
+		}
+	}, [&](const MTPDmessageActionStarGift &data) {
+		if (data.is_auction_acquired() && data.vto_id()) {
+			const auto to = peer->owner().peer(peerFromMTP(*data.vto_id()));
+			data.vgift().match([&](const MTPDstarGift &data) {
+				peer->owner().notifyGiftAuctionGot({ data.vid().v, to });
+			}, [](const auto &) {});
+		}
+	}, [&](const MTPDmessageActionNoForwardsToggle &data) {
+		if (const auto user = peer->asUser()) {
+			const auto enabled = mtpIsTrue(data.vnew_value());
+			user->setNoForwardsFlags(
+				enabled && item->out(),
+				enabled && !item->out());
+		}
+	}, [&](const MTPDmessageActionPaidMessagesPrice &data) {
+		if (const auto channel = peer->asBroadcast()) {
+			for (const auto &controller : session().windows()) {
+				if (controller->activeChatCurrent().peer() == peer.get()) {
+					channel->updateFullForced();
+					break;
+				}
+			}
+		}
 	}, [](const auto &) {
 	});
 }
 
+void History::viewHeightAdjusted(not_null<Element*> view, int delta) {
+	if (view->data()->mainView() == view) {
+		mainViewHeightAdjusted(view, delta);
+	}
+	owner().notifyViewHeightAdjusted(view, delta);
+}
+
+void History::mainViewHeightAdjusted(not_null<Element*> view, int delta) {
+	const auto viewInBlock = view->indexInBlock();
+	if (viewInBlock < 0 || _width <= 0) {
+		return;
+	}
+	const auto block = view->block();
+	for (auto i = viewInBlock + 1, count = int(block->messages.size())
+		; i != count
+		; ++i) {
+		const auto view = block->messages[i].get();
+		view->setY(view->y() + delta);
+	}
+	block->resizeGetHeight(
+		_width,
+		HistoryBlock::ResizeRequest::ResizePending);
+	const auto blockInHistory = block->indexInHistory();
+	for (auto i = blockInHistory + 1, count = int(blocks.size())
+		; i != count
+		; ++i) {
+		const auto block = blocks[i].get();
+		block->setY(block->y() + delta);
+	}
+	_height += delta;
+}
+
 void History::mainViewRemoved(
 		not_null<HistoryBlock*> block,
 		not_null<HistoryView::Element*> view) {
 	Expects(_joinedMessage != view->data());
+	Expects(_newPeerNameChange != view->data());
+	Expects(_newPeerPhotoChange != view->data());
 
 	if (_firstUnreadView == view) {
 		getNextFirstUnreadMessage();
@@ -1214,7 +1605,7 @@ void History::mainViewRemoved(
 	}
 }
 
-void History::newItemAdded(not_null<HistoryItem*> item) {
+void History::newItemAdded(not_null<HistoryItem*> item, NewAddType type) {
 	item->indexAsNewItem();
 	item->addToMessagesIndex();
 	if (const auto from = item->from() ? item->from()->asUser() : nullptr) {
@@ -1264,13 +1655,34 @@ void History::newItemAdded(not_null<HistoryItem*> item) {
 			inboxRead(item);
 		}
 	}
-	item->incrementReplyToTopCounter();
+	if (type != NewAddType::StreamedDraftFinish) {
+		// In StreamedDraftFinish setRealId() already incremented this.
+		item->incrementReplyToTopCounter();
+	}
 	if (!folderKnown()) {
 		owner().histories().requestDialogEntry(this);
 	}
 	if (const auto topic = item->topic()) {
 		topic->applyItemAdded(item);
 	}
+	if (const auto sublist = item->savedSublist()) {
+		sublist->applyItemAdded(item);
+	}
+	if (const auto media = item->media()) {
+		if (const auto gift = media->gift()) {
+			if (const auto unique = gift->unique.get()) {
+				if (unique->ownerId == session().userPeerId()
+					|| unique->hostId == session().userPeerId()) {
+					owner().emojiStatuses().refreshCollectibles();
+				}
+			}
+		}
+		if (type == NewAddType::Outgoing
+			&& !item->isLocal()
+			&& media->diceGameOutcome().stakeNanoTon > 0) {
+			session().credits().tonLoad(true);
+		}
+	}
 }
 
 void History::registerClientSideMessage(not_null<HistoryItem*> item) {
@@ -1348,6 +1760,19 @@ void History::addItemToBlock(not_null<HistoryItem*> item) {
 	const auto view = block->messages.back().get();
 	view->attachToBlock(block, block->messages.size() - 1);
 
+	if (item->Has<HistoryServiceNoForwardsToggle>()) {
+		if (const auto prev = view->previousInBlocks()) {
+			if (const auto nfr = prev->data()->Get<HistoryServiceNoForwardsRequest>()) {
+				if (!nfr->actionTaken) {
+					nfr->actionTaken = true;
+					if (nfr->expired) {
+						owner().requestItemViewRefresh(prev->data());
+					}
+				}
+			}
+		}
+	}
+
 	if (isBuildingFrontBlock() && _buildingFrontBlock->expectedItemsCount > 0) {
 		--_buildingFrontBlock->expectedItemsCount;
 	}
@@ -1361,6 +1786,7 @@ void History::addEdgesToSharedMedia() {
 		session().storage().add(Storage::SharedMediaAddSlice(
 			peer->id,
 			MsgId(0), // topicRootId
+			PeerId(0), // monoforumPeerId
 			type,
 			{},
 			{ from, till }));
@@ -1495,7 +1921,7 @@ void History::addItemsToLists(
 										&& !peer->asChat()->participants.contains(item->author()->asUser());
 								} else if (peer->isMegagroup()) {
 									botNotInChat = (!Data::CanSendAnything(peer)
-										|| peer->asChannel()->mgInfo->botStatus != 0)
+										|| peer->asChannel()->mgInfo->botStatus != Data::BotStatus::Unknown)
 										&& item->author()->isUser()
 										&& !peer->asChannel()->mgInfo->bots.contains(item->author()->asUser());
 								}
@@ -1574,6 +2000,7 @@ void History::addToSharedMedia(
 			session().storage().add(Storage::SharedMediaAddSlice(
 				peer->id,
 				MsgId(0), // topicRootId
+				PeerId(0), // monoforumPeerId
 				type,
 				std::move(medias[i]),
 				{ from, till }));
@@ -1796,13 +2223,17 @@ bool History::unreadCountKnown() const {
 	return _unreadCount.has_value();
 }
 
+bool History::useMyUnreadInParent() const {
+	return !isForum() && !amMonoforumAdmin();
+}
+
 void History::setUnreadCount(int newUnreadCount) {
 	Expects(folderKnown());
 
 	if (_unreadCount == newUnreadCount) {
 		return;
 	}
-	const auto notifier = unreadStateChangeNotifier(!isForum());
+	const auto notifier = unreadStateChangeNotifier(useMyUnreadInParent());
 	_unreadCount = newUnreadCount;
 
 	const auto lastOutgoing = [&] {
@@ -1841,7 +2272,7 @@ void History::setUnreadMark(bool unread) {
 		return;
 	}
 	const auto notifier = unreadStateChangeNotifier(
-		!unreadCount() && !isForum());
+		useMyUnreadInParent() && !unreadCount());
 	Thread::setUnreadMarkFlag(unread);
 }
 
@@ -1873,10 +2304,10 @@ void History::setMuted(bool muted) {
 	if (this->muted() == muted) {
 		return;
 	} else {
-		const auto state = isForum()
-			? Dialogs::BadgesState()
-			: computeBadgesState();
-		const auto notify = (state.unread || state.reaction);
+		const auto state = useMyUnreadInParent()
+			? computeBadgesState()
+			: Dialogs::BadgesState();
+		const auto notify = (state.unread || state.reaction || state.poll);
 		const auto notifier = unreadStateChangeNotifier(notify);
 		Thread::setMuted(muted);
 	}
@@ -2012,6 +2443,20 @@ void History::hasUnreadReactionChanged(bool has) {
 	notifyUnreadStateChange(was);
 }
 
+void History::hasUnreadPollVoteChanged(bool has) {
+	if (isForum()) {
+		return;
+	}
+	auto was = chatListUnreadState();
+	if (has) {
+		was.polls = was.pollsMuted = 0;
+	} else {
+		was.polls = 1;
+		was.pollsMuted = muted() ? was.polls : 0;
+	}
+	notifyUnreadStateChange(was);
+}
+
 void History::applyPinnedUpdate(const MTPDupdateDialogPinned &data) {
 	const auto folderId = data.vfolder_id().value_or_empty();
 	if (!folderKnown()) {
@@ -2026,7 +2471,7 @@ void History::applyPinnedUpdate(const MTPDupdateDialogPinned &data) {
 
 TimeId History::adjustedChatListTimeId() const {
 	const auto result = chatListTimeId();
-	if (const auto draft = cloudDraft(MsgId(0))) {
+	if (const auto draft = cloudDraft(MsgId(), PeerId())) {
 		if (!peer->forum()
 			&& !Data::DraftIsNull(draft)
 			&& !session().supportMode()) {
@@ -2180,7 +2625,10 @@ History *History::migrateSibling() const {
 
 Dialogs::UnreadState History::chatListUnreadState() const {
 	if (const auto forum = peer->forum()) {
-		return forum->topicsList()->unreadState();
+		return AdjustedForumUnreadState(forum->topicsList()->unreadState());
+	} else if (const auto monoforum = peer->monoforum()) {
+		return AdjustedForumUnreadState(
+			withMyMuted(monoforum->chatsList()->unreadState()));;
 	}
 	return computeUnreadState();
 }
@@ -2192,6 +2640,12 @@ Dialogs::BadgesState History::chatListBadgesState() const {
 				forum->topicsList()->unreadState(),
 				Dialogs::CountInBadge::Chats,
 				Dialogs::IncludeInBadge::UnmutedOrAll));
+	} else if (const auto monoforum = peer->monoforum()) {
+		return adjustBadgesStateByFolder(
+			Dialogs::BadgesForUnread(
+				withMyMuted(monoforum->chatsList()->unreadState()),
+				Dialogs::CountInBadge::Chats,
+				Dialogs::IncludeInBadge::All));
 	}
 	return computeBadgesState();
 }
@@ -2207,7 +2661,11 @@ Dialogs::BadgesState History::computeBadgesState() const {
 Dialogs::BadgesState History::adjustBadgesStateByFolder(
 		Dialogs::BadgesState state) const {
 	if (folder()) {
-		state.mentionMuted = state.reactionMuted = state.unreadMuted = true;
+		state.mentionMuted
+			= state.reactionMuted
+			= state.pollMuted
+			= state.unreadMuted
+			= true;
 	}
 	return state;
 }
@@ -2222,14 +2680,27 @@ Dialogs::UnreadState History::computeUnreadState() const {
 	result.marks = mark ? 1 : 0;
 	result.mentions = unreadMentions().has() ? 1 : 0;
 	result.reactions = unreadReactions().has() ? 1 : 0;
+	result.polls = unreadPollVotes().has() ? 1 : 0;
 	result.messagesMuted = muted ? result.messages : 0;
 	result.chatsMuted = muted ? result.chats : 0;
 	result.marksMuted = muted ? result.marks : 0;
 	result.reactionsMuted = muted ? result.reactions : 0;
+	result.pollsMuted = muted ? result.polls : 0;
 	result.known = _unreadCount.has_value();
 	return result;
 }
 
+Dialogs::UnreadState History::withMyMuted(Dialogs::UnreadState state) const {
+	if (muted()) {
+		state.chatsMuted = state.chats;
+		state.marksMuted = state.marks;
+		state.messagesMuted = state.messages;
+		state.reactionsMuted = state.reactions;
+		state.pollsMuted = state.polls;
+	}
+	return state;
+}
+
 void History::allowChatListMessageResolve() {
 	if (_flags & Flag::ResolveChatListMessage) {
 		return;
@@ -2277,6 +2748,9 @@ bool History::chatListMessageKnown() const {
 }
 
 const QString &History::chatListName() const {
+	if (const auto broadcast = peer->monoforumBroadcast()) {
+		return broadcast->name();
+	}
 	return peer->name();
 }
 
@@ -2285,7 +2759,7 @@ const QString &History::chatListNameSortKey() const {
 }
 
 void History::refreshChatListNameSortKey() {
-	_chatListNameSortKey = owner().nameSortKey(peer->name());
+	_chatListNameSortKey = TextUtilities::NameSortKey(peer->name());
 }
 
 const base::flat_set<QString> &History::chatListNameWords() const {
@@ -2333,6 +2807,18 @@ void History::finishBuildingFrontBlock() {
 			// we've added a new front block, so previous item for
 			// the old first item of a first block was changed
 			first->previousInBlocksChanged();
+
+			if (first->data()->Has<HistoryServiceNoForwardsToggle>()) {
+				const auto last = block->messages.back()->data();
+				if (const auto nfr = last->Get<HistoryServiceNoForwardsRequest>()) {
+					if (!nfr->actionTaken) {
+						nfr->actionTaken = true;
+						if (nfr->expired) {
+							owner().requestItemViewRefresh(last);
+						}
+					}
+				}
+			}
 		} else {
 			block->messages.back()->nextInBlocksRemoved();
 		}
@@ -2347,6 +2833,14 @@ bool History::loadedAtTop() const {
 	return _loadedAtTop;
 }
 
+bool History::hasGuestChatBotMessages() const {
+	return _flags & Flag::HasGuestChatBotMessages;
+}
+
+void History::setHasGuestChatBotMessages() {
+	_flags |= Flag::HasGuestChatBotMessages;
+}
+
 bool History::isReadyFor(MsgId msgId) {
 	if (msgId < 0 && -msgId < ServerMaxMsgId && peer->migrateFrom()) {
 		// Old group history.
@@ -2513,7 +3007,7 @@ auto History::computeChatListMessageFromLast() const
 	if (!last || !last->isGroupMigrate()) {
 		return _lastMessage;
 	}
-	if (const auto chat = peer->asChat()) {
+	if (peer->isChat()) {
 		// In chats we try to take the item before the 'last', which
 		// is the empty-displayed migration message.
 		if (!loadedAtBottom()) {
@@ -2591,7 +3085,7 @@ void History::setFakeChatListMessage() {
 			}
 		}
 		return;
-	} else if (const auto chat = peer->asChat()) {
+	} else if (peer->isChat()) {
 		// In chats we try to take the item before the 'last', which
 		// is the empty-displayed migration message.
 		owner().histories().requestFakeChatListMessage(this);
@@ -2751,11 +3245,19 @@ bool History::shouldBeInChatList() const {
 }
 
 void History::unknownMessageDeleted(MsgId messageId) {
+	LOG(("History::unknownMessageDeleted. Peer ID: %1, Message ID: %2.")
+		.arg(peer->id.value & PeerId::kChatTypeMask)
+		.arg(messageId.bare));
+	_unknownDeletedMessages[messageId] = base::unixtime::now();
 	if (_inboxReadBefore && messageId >= *_inboxReadBefore) {
 		owner().histories().requestDialogEntry(this);
 	}
 }
 
+bool History::isUnknownMessageDeleted(MsgId messageId) const {
+	return _unknownDeletedMessages.contains(messageId);
+}
+
 bool History::isServerSideUnread(not_null<const HistoryItem*> item) const {
 	Expects(item->isRegular());
 
@@ -2782,6 +3284,12 @@ void History::applyDialog(
 	setUnreadMark(data.is_unread_mark());
 	unreadMentions().setCount(data.vunread_mentions_count().v);
 	unreadReactions().setCount(data.vunread_reactions_count().v);
+	const auto pollVotesCount = data.vunread_poll_votes_count().v;
+	setUnreadPollVotesCount(pollVotesCount);
+	unreadPollVotes().setCount(pollVotesCount);
+	session().changes().historyUpdated(
+		this,
+		Data::HistoryUpdate::Flag::UnreadPollVotes);
 	if (const auto channel = peer->asChannel()) {
 		if (const auto pts = data.vpts()) {
 			channel->ptsReceived(pts->v);
@@ -2807,7 +3315,8 @@ void History::applyDialog(
 		Data::ApplyPeerCloudDraft(
 			&session(),
 			peer->id,
-			MsgId(0), // topicRootId
+			MsgId(), // topicRootId
+			PeerId(), // monoforumPeerId
 			draft->c_draftMessage());
 	}
 	if (const auto ttl = data.vttl_period()) {
@@ -2829,15 +3338,13 @@ void History::dialogEntryApplied() {
 		return;
 	}
 	if (!chatListMessage()) {
-		clear(ClearType::Unload);
+		clear(ClearType::Unload, true);
 		addNewerSlice(QVector<MTPMessage>());
 		addOlderSlice(QVector<MTPMessage>());
 		if (const auto channel = peer->asChannel()) {
 			const auto inviter = channel->inviter;
-			if (inviter && channel->amIn()) {
-				if (const auto from = owner().userLoaded(inviter)) {
-					insertJoinedMessage();
-				}
+			if (inviter && channel->amIn() && owner().userLoaded(inviter)) {
+				insertJoinedMessage();
 			}
 		}
 		return;
@@ -2848,10 +3355,9 @@ void History::dialogEntryApplied() {
 			const auto inviter = channel->inviter;
 			if (inviter
 				&& chatListTimeId() <= channel->inviteDate
-				&& channel->amIn()) {
-				if (const auto from = owner().userLoaded(inviter)) {
-					insertJoinedMessage();
-				}
+				&& channel->amIn()
+				&& owner().userLoaded(inviter)) {
+				insertJoinedMessage();
 			}
 		}
 	}
@@ -2945,8 +3451,127 @@ void History::applyDialogTopMessage(MsgId topMessageId) {
 	}
 }
 
+void History::tryMarkForumIntervalRead(
+		MsgId wasInboxReadBefore,
+		MsgId nowInboxReadBefore) {
+	if (!isForum()
+		|| !peer->useSubsectionTabs()
+		|| (nowInboxReadBefore <= wasInboxReadBefore)) {
+		return;
+	} else if (loadedAtBottom() && nowInboxReadBefore >= minMsgId()) {
+		// Count for each sublist how many messages are still not read.
+		auto counts = base::flat_map<not_null<Data::ForumTopic*>, int>();
+		for (const auto &block : blocks) {
+			for (const auto &message : block->messages) {
+				const auto item = message->data();
+				if (!item->isRegular() || item->id < nowInboxReadBefore) {
+					continue;
+				}
+				if (const auto topic = item->topic()) {
+					++counts[topic];
+				}
+			}
+		}
+		if (const auto forum = peer->forum()) {
+			forum->updateUnreadCounts(nowInboxReadBefore - 1, counts);
+		}
+	} else if (minMsgId() <= wasInboxReadBefore
+		&& maxMsgId() >= nowInboxReadBefore) {
+		// Count for each sublist how many messages were read.
+		for (const auto &block : blocks) {
+			for (const auto &message : block->messages) {
+				const auto item = message->data();
+				if (!item->isRegular() || item->id < wasInboxReadBefore) {
+					continue;
+				} else if (item->id >= nowInboxReadBefore) {
+					break;
+				}
+				if (const auto topic = item->topic()) {
+					const auto replies = topic->replies();
+					const auto unread = replies->unreadCountCurrent();
+					if (unread > 0) {
+						replies->setInboxReadTill(item->id, unread - 1);
+					}
+				}
+			}
+		}
+	} else {
+		// We can't invalidate sublist unread counts here, because no read
+		// request was yet sent to the server (so it can't return correct
+		// values yet), we need to do that after we send read request.
+		_flags |= Flag::MonoAndForumUnreadInvalidatePending;
+	}
+}
+
+void History::tryMarkMonoforumIntervalRead(
+		MsgId wasInboxReadBefore,
+		MsgId nowInboxReadBefore) {
+	if (!amMonoforumAdmin() || (nowInboxReadBefore <= wasInboxReadBefore)) {
+		return;
+	} else if (loadedAtBottom() && nowInboxReadBefore >= minMsgId()) {
+		// Count for each sublist how many messages are still not read.
+		auto counts = base::flat_map<not_null<Data::SavedSublist*>, int>();
+		for (const auto &block : blocks) {
+			for (const auto &message : block->messages) {
+				const auto item = message->data();
+				if (!item->isRegular() || item->id < nowInboxReadBefore) {
+					continue;
+				}
+				if (const auto sublist = item->savedSublist()) {
+					++counts[sublist];
+				}
+			}
+		}
+		if (const auto monoforum = peer->monoforum()) {
+			monoforum->updateUnreadCounts(nowInboxReadBefore - 1, counts);
+		}
+	} else if (minMsgId() <= wasInboxReadBefore
+		&& maxMsgId() >= nowInboxReadBefore) {
+		// Count for each sublist how many messages were read.
+		for (const auto &block : blocks) {
+			for (const auto &message : block->messages) {
+				const auto item = message->data();
+				if (!item->isRegular() || item->id < wasInboxReadBefore) {
+					continue;
+				} else if (item->id >= nowInboxReadBefore) {
+					break;
+				}
+				if (const auto sublist = item->savedSublist()) {
+					const auto unread = sublist->unreadCountCurrent();
+					if (unread > 0) {
+						sublist->setInboxReadTill(item->id, unread - 1);
+					}
+				}
+			}
+		}
+	} else {
+		// We can't invalidate sublist unread counts here, because no read
+		// request was yet sent to the server (so it can't return correct
+		// values yet), we need to do that after we send read request.
+		_flags |= Flag::MonoAndForumUnreadInvalidatePending;
+	}
+}
+
+void History::validateMonoAndForumUnread(MsgId readTillId) {
+	if (!(_flags & Flag::MonoAndForumUnreadInvalidatePending)) {
+		return;
+	}
+	_flags &= ~Flag::MonoAndForumUnreadInvalidatePending;
+	if (isForum()) {
+		if (const auto forum = peer->forum()) {
+			forum->markUnreadCountsUnknown(readTillId);
+		}
+	} else if (amMonoforumAdmin()) {
+		if (const auto monoforum = peer->monoforum()) {
+			monoforum->markUnreadCountsUnknown(readTillId);
+		}
+	}
+}
+
 void History::setInboxReadTill(MsgId upTo) {
 	if (_inboxReadBefore) {
+		tryMarkForumIntervalRead(*_inboxReadBefore, upTo + 1);
+		tryMarkMonoforumIntervalRead(*_inboxReadBefore, upTo + 1);
 		accumulate_max(*_inboxReadBefore, upTo + 1);
 	} else {
 		_inboxReadBefore = upTo + 1;
@@ -3040,20 +3665,26 @@ void History::forceFullResize() {
 	_flags |= Flag::HasPendingResizedItems;
 }
 
-Data::Thread *History::threadFor(MsgId topicRootId) {
+Data::Thread *History::threadFor(MsgId topicRootId, PeerId monoforumPeerId) {
 	return topicRootId
 		? peer->forumTopicFor(topicRootId)
+		: monoforumPeerId
+		? peer->monoforumSublistFor(monoforumPeerId)
 		: static_cast<Data::Thread*>(this);
 }
 
-const Data::Thread *History::threadFor(MsgId topicRootId) const {
-	return const_cast<History*>(this)->threadFor(topicRootId);
+const Data::Thread *History::threadFor(
+		MsgId topicRootId,
+		PeerId monoforumPeerId) const {
+	return const_cast<History*>(this)->threadFor(
+		topicRootId,
+		monoforumPeerId);
 }
 
 void History::forumChanged(Data::Forum *old) {
 	if (inChatList()) {
 		notifyUnreadStateChange(old
-			? old->topicsList()->unreadState()
+			? AdjustedForumUnreadState(old->topicsList()->unreadState())
 			: computeUnreadState());
 	}
 
@@ -3063,18 +3694,20 @@ void History::forumChanged(Data::Forum *old) {
 		forum->topicsList()->unreadStateChanges(
 		) | rpl::filter([=] {
 			return (_flags & Flag::IsForum) && inChatList();
-		}) | rpl::start_with_next([=](const Dialogs::UnreadState &old) {
+		}) | rpl::map(
+			AdjustedForumUnreadState
+		) | rpl::on_next([=](const Dialogs::UnreadState &old) {
 			notifyUnreadStateChange(old);
 		}, forum->lifetime());
 
 		forum->chatsListChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateChatListEntry();
 		}, forum->lifetime());
 	} else {
 		_flags &= ~Flag::IsForum;
 	}
-	if (cloudDraft(MsgId(0))) {
+	if (cloudDraft(MsgId(), PeerId())) {
 		updateChatListSortPosition();
 	}
 	_flags |= Flag::PendingAllItemsResize;
@@ -3084,6 +3717,65 @@ bool History::isForum() const {
 	return (_flags & Flag::IsForum);
 }
 
+void History::monoforumChanged(Data::SavedMessages *old) {
+	if (inChatList()) {
+		notifyUnreadStateChange(old
+			? AdjustedForumUnreadState(
+				withMyMuted(old->chatsList()->unreadState()))
+			: computeUnreadState());
+	}
+
+	if (const auto monoforum = peer->monoforum()) {
+		_flags |= Flag::IsMonoforumAdmin;
+
+		monoforum->chatsList()->unreadStateChanges(
+		) | rpl::filter([=] {
+			return (_flags & Flag::IsMonoforumAdmin) && inChatList();
+		}) | rpl::map([=](const Dialogs::UnreadState &was) {
+			return AdjustedForumUnreadState(withMyMuted(was));
+		}) | rpl::on_next([=](const Dialogs::UnreadState &old) {
+			notifyUnreadStateChange(old);
+		}, monoforum->lifetime());
+
+		monoforum->chatsListChanges(
+		) | rpl::on_next([=] {
+			updateChatListEntry();
+		}, monoforum->lifetime());
+	} else {
+		_flags &= ~Flag::IsMonoforumAdmin;
+	}
+	if (cloudDraft(MsgId(), PeerId())) {
+		updateChatListSortPosition();
+	}
+	_flags |= Flag::PendingAllItemsResize;
+}
+
+bool History::amMonoforumAdmin() const {
+	return (_flags & Flag::IsMonoforumAdmin);
+}
+
+bool History::suggestDraftAllowed() const {
+	return peer->isMonoforum() && !peer->amMonoforumAdmin();
+}
+
+bool History::hasForumThreadBars() const {
+	if (amMonoforumAdmin()) {
+		return true;
+	}
+	return peer->useSubsectionTabs();
+}
+
+void History::forumTabsChanged(bool forumTabs) {
+	for (auto &block : blocks) {
+		for (auto &view : block->messages) {
+			view->setPendingResize();
+			if (forumTabs || view->Has<HistoryView::ForumThreadBar>()) {
+				view->previousInBlocksChanged();
+			}
+		}
+	}
+}
+
 not_null<History*> History::migrateToOrMe() const {
 	if (const auto to = peer->migrateTo()) {
 		return owner().history(to);
@@ -3174,9 +3866,10 @@ Data::HistoryMessages *History::maybeMessages() {
 HistoryItem *History::insertJoinedMessage() {
 	const auto channel = peer->asChannel();
 	if (!channel
+		|| channel->isMonoforum()
 		|| _joinedMessage
 		|| !channel->amIn()
-		|| (peer->isMegagroup()
+		|| (channel->isMegagroup()
 			&& channel->mgInfo->joinedMessageFound)) {
 		return _joinedMessage;
 	}
@@ -3205,6 +3898,85 @@ HistoryItem *History::insertJoinedMessage() {
 	return _joinedMessage;
 }
 
+void History::checkNewPeerMessages() {
+	if (!loadedAtTop()) {
+		return;
+	}
+	const auto user = peer->asUser();
+	if (!user) {
+		return;
+	}
+	const auto photo = user->photoChangeDate();
+	const auto name = user->nameChangeDate();
+	if (!photo && _newPeerPhotoChange) {
+		_newPeerPhotoChange->destroy();
+	}
+	if (!name && _newPeerNameChange) {
+		_newPeerNameChange->destroy();
+	}
+	if ((!photo || _newPeerPhotoChange) && (!name || _newPeerNameChange)) {
+		return;
+	}
+
+	const auto when = [](TimeId date) {
+		const auto now = base::unixtime::now();
+		const auto passed = now - date;
+		if (passed < 3600) {
+			return tr::lng_new_contact_updated_now(tr::now);
+		} else if (passed < 24 * 3600) {
+			return tr::lng_new_contact_updated_hours(
+				tr::now,
+				lt_count,
+				(passed / 3600));
+		} else if (passed < 60 * 24 * 3600) {
+			return tr::lng_new_contact_updated_days(
+				tr::now,
+				lt_count,
+				(passed / (24 * 3600)));
+		}
+		return tr::lng_new_contact_updated_months(
+			tr::now,
+			lt_count,
+			(passed / (30 * 24 * 3600)));
+	};
+
+	auto firstDate = TimeId();
+	for (const auto &block : blocks) {
+		for (const auto &message : block->messages) {
+			const auto item = message->data();
+			if (item != _newPeerPhotoChange && item != _newPeerNameChange) {
+				firstDate = item->date();
+				break;
+			}
+		}
+		if (firstDate) {
+			break;
+		}
+	}
+	if (!firstDate) {
+		firstDate = base::unixtime::serialize(
+			QDateTime(QDate(2013, 8, 1), QTime(0, 0)));
+	}
+	const auto add = [&](tr::phrase<lngtag_when> phrase, TimeId date) {
+		const auto result = makeMessage({
+			.id = owner().nextLocalMessageId(),
+			.flags = MessageFlag::Local | MessageFlag::HideDisplayDate,
+			.date = (--firstDate),
+		}, PreparedServiceText{ TextWithEntities{
+			phrase(tr::now, lt_when, when(date)),
+		} });
+		insertMessageToBlocks(result);
+		return result;
+	};
+
+	if (photo && !_newPeerPhotoChange) {
+		_newPeerPhotoChange = add(tr::lng_new_contact_updated_photo, photo);
+	}
+	if (name && !_newPeerNameChange) {
+		_newPeerNameChange = add(tr::lng_new_contact_updated_name, name);
+	}
+}
+
 void History::insertMessageToBlocks(not_null<HistoryItem*> item) {
 	Expects(item->mainView() == nullptr);
 
@@ -3258,7 +4030,20 @@ void History::checkLocalMessages() {
 		&& peer->asChannel()->inviter
 		&& goodDate(peer->asChannel()->inviteDate)) {
 		insertJoinedMessage();
+	} else {
+		checkNewPeerMessages();
+	}
+}
+
+HistoryStreamedDrafts &History::streamedDrafts() {
+	if (!_streamedDrafts) {
+		_streamedDrafts = std::make_unique<HistoryStreamedDrafts>(this);
 	}
+	return *_streamedDrafts;
+}
+
+HistoryStreamedDrafts *History::streamedDraftsIfExists() const {
+	return _streamedDrafts.get();
 }
 
 HistoryItem *History::joinedMessageInstance() const {
@@ -3271,6 +4056,15 @@ void History::removeJoinedMessage() {
 	}
 }
 
+void History::removeNewPeerMessages() {
+	if (_newPeerNameChange) {
+		_newPeerNameChange->destroy();
+	}
+	if (_newPeerPhotoChange) {
+		_newPeerPhotoChange->destroy();
+	}
+}
+
 void History::reactionsEnabledChanged(bool enabled) {
 	if (!enabled) {
 		for (const auto &item : _items) {
@@ -3406,25 +4200,30 @@ std::vector<MsgId> History::collectMessagesFromParticipantToDelete(
 	return result;
 }
 
-void History::clear(ClearType type) {
+void History::clear(ClearType type, bool markEmpty) {
 	_unreadBarView = nullptr;
 	_firstUnreadView = nullptr;
 	removeJoinedMessage();
+	base::take(_streamedDrafts);
 
 	forgetScrollState();
 	blocks.clear();
 	owner().notifyHistoryUnloaded(this);
 	lastKeyboardInited = false;
 	if (type == ClearType::Unload) {
-		_loadedAtTop = _loadedAtBottom = false;
+		_loadedAtTop = _loadedAtBottom = markEmpty;
 	} else {
 		// Leave the 'sending' messages in local messages.
-		auto local = base::flat_set<not_null<HistoryItem*>>();
+		auto local = std::vector<not_null<HistoryItem*>>();
+		local.reserve(_clientSideMessages.size());
 		for (const auto &item : _clientSideMessages) {
 			if (!item->isSending()) {
-				local.emplace(item);
+				local.push_back(item);
 			}
 		}
+		if (!local.empty()) {
+			owner().notifyItemsAboutToBeDestroyed(local);
+		}
 		for (const auto &item : local) {
 			item->destroy();
 		}
@@ -3442,9 +4241,11 @@ void History::clear(ClearType type) {
 				_lastMessage = std::nullopt;
 			}
 		}
-		const auto tillId = (_lastMessage && *_lastMessage)
+		const auto tillId = (_lastMessage
+			&& (*_lastMessage)
+			&& (*_lastMessage)->isRegular())
 			? (*_lastMessage)->id
-			: std::numeric_limits<MsgId>::max();
+			: MsgId(std::numeric_limits<int64>::max());
 		clearUpTill(tillId);
 		if (blocks.empty() && _lastMessage && *_lastMessage) {
 			addItemToBlock(*_lastMessage);
@@ -3481,7 +4282,10 @@ void History::clearUpTill(MsgId availableMinId) {
 			remove.push_back(item.get());
 		}
 	}
-	for (const auto item : remove) {
+	if (!remove.empty()) {
+		owner().notifyItemsAboutToBeDestroyed(remove);
+	}
+	for (const auto &item : remove) {
 		item->destroy();
 	}
 	requestChatListMessage();
@@ -3549,6 +4353,11 @@ void History::translateOfferFrom(LanguageId id) {
 		}
 	} else if (!_translation) {
 		_translation = std::make_unique<HistoryTranslation>(this, id);
+		using Flag = PeerData::TranslationFlag;
+		if (peer->autoTranslation()
+			&& (peer->translationFlag() == Flag::Enabled)) {
+			translateTo(Core::App().settings().translateTo());
+		}
 	} else {
 		_translation->offerFrom(id);
 	}
@@ -3577,6 +4386,22 @@ HistoryTranslation *History::translation() const {
 	return _translation.get();
 }
 
+void History::refreshHiddenLinksItems() {
+	auto refresh = base::flat_set<FullMsgId>();
+	for (const auto &item : _items) {
+		if (item->hasHiddenLinks()) {
+			refresh.emplace(item->fullId());
+		}
+	}
+	const auto owner = &this->owner();
+	for (const auto &id : refresh) {
+		if (const auto item = owner->message(id)) {
+			item->setHasHiddenLinks(false);
+			owner->requestItemViewRefresh(item);
+		}
+	}
+}
+
 HistoryBlock::HistoryBlock(not_null<History*> history)
 : _history(history) {
 }
@@ -3606,9 +4431,12 @@ int HistoryBlock::resizeGetHeight(int newWidth, ResizeRequest request) {
 	return _height;
 }
 
-void HistoryBlock::remove(not_null<Element*> view) {
+void HistoryBlock::remove(
+		not_null<Element*> view,
+		Data::ViewRemovalReason reason) {
 	Expects(view->block() == this);
 
+	_history->owner().notifyViewAboutToBeRemoved(view, reason);
 	_history->mainViewRemoved(this, view);
 
 	const auto blockIndex = indexInHistory();
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index 73695785fa03c7..d76df92b088658 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -23,40 +23,19 @@ class HistoryItem;
 struct HistoryItemCommonFields;
 struct HistoryMessageMarkupData;
 class HistoryMainElementDelegateMixin;
+class HistoryStreamedDrafts;
 struct LanguageId;
 
 namespace Data {
-
 struct Draft;
+class Forum;
 class Session;
 class Folder;
 class ChatFilter;
 struct SponsoredFrom;
 class SponsoredMessages;
 class HistoryMessages;
-
-enum class ForwardOptions {
-	PreserveInfo,
-	NoSenderNames,
-	NoNamesAndCaptions,
-};
-
-struct ForwardDraft {
-	MessageIdsList ids;
-	ForwardOptions options = ForwardOptions::PreserveInfo;
-
-	friend inline auto operator<=>(
-		const ForwardDraft&,
-		const ForwardDraft&) = default;
-};
-
-using ForwardDrafts = base::flat_map<MsgId, ForwardDraft>;
-
-struct ResolvedForwardDraft {
-	HistoryItemsList items;
-	ForwardOptions options = ForwardOptions::PreserveInfo;
-};
-
+class SavedMessages;
 } // namespace Data
 
 namespace Dialogs {
@@ -74,6 +53,12 @@ enum class NewMessageType {
 	Existing,
 };
 
+enum class NewAddType : uchar {
+	Outgoing,
+	RegularIncoming,
+	StreamedDraftFinish,
+};
+
 class History final : public Data::Thread {
 public:
 	using Element = HistoryView::Element;
@@ -84,8 +69,12 @@ class History final : public Data::Thread {
 	[[nodiscard]] not_null<History*> owningHistory() override {
 		return this;
 	}
-	[[nodiscard]] Data::Thread *threadFor(MsgId topicRootId);
-	[[nodiscard]] const Data::Thread *threadFor(MsgId topicRootId) const;
+	[[nodiscard]] Data::Thread *threadFor(
+		MsgId topicRootId,
+		PeerId monoforumPeerId);
+	[[nodiscard]] const Data::Thread *threadFor(
+		MsgId topicRootId,
+		PeerId monoforumPeerId) const;
 
 	[[nodiscard]] auto delegateMixin() const
 			-> not_null<HistoryMainElementDelegateMixin*> {
@@ -95,6 +84,12 @@ class History final : public Data::Thread {
 	void forumChanged(Data::Forum *old);
 	[[nodiscard]] bool isForum() const;
 
+	void monoforumChanged(Data::SavedMessages *old);
+	[[nodiscard]] bool amMonoforumAdmin() const;
+	[[nodiscard]] bool suggestDraftAllowed() const;
+	[[nodiscard]] bool hasForumThreadBars() const;
+	void forumTabsChanged(bool forumTabs);
+
 	[[nodiscard]] not_null<History*> migrateToOrMe() const;
 	[[nodiscard]] History *migrateFrom() const;
 	[[nodiscard]] MsgRange rangeForDifferenceRequest() const;
@@ -103,9 +98,13 @@ class History final : public Data::Thread {
 	[[nodiscard]] const Data::HistoryMessages &messages() const;
 	[[nodiscard]] Data::HistoryMessages *maybeMessages();
 
+	[[nodiscard]] HistoryStreamedDrafts &streamedDrafts();
+	[[nodiscard]] HistoryStreamedDrafts *streamedDraftsIfExists() const;
+
 	[[nodiscard]] HistoryItem *joinedMessageInstance() const;
 	void checkLocalMessages();
 	void removeJoinedMessage();
+	void removeNewPeerMessages();
 
 	void reactionsEnabledChanged(bool enabled);
 
@@ -124,7 +123,7 @@ class History final : public Data::Thread {
 		DeleteChat,
 		ClearHistory,
 	};
-	void clear(ClearType type);
+	void clear(ClearType type, bool markEmpty = false);
 	void clearUpTill(MsgId availableMinId);
 
 	void applyGroupAdminChanges(const base::flat_set<UserId> &changes);
@@ -153,8 +152,9 @@ class History final : public Data::Thread {
 	void destroyMessage(not_null<HistoryItem*> item);
 	void destroyMessagesByDates(TimeId minDate, TimeId maxDate);
 	void destroyMessagesByTopic(MsgId topicRootId);
+	void destroyMessagesBySublist(not_null<PeerData*> sublistPeer);
 
-	void unpinMessagesFor(MsgId topicRootId);
+	void unpinMessagesFor(MsgId topicRootId, PeerId monoforumPeerId);
 
 	not_null<HistoryItem*> addNewMessage(
 		MsgId id,
@@ -180,6 +180,7 @@ class History final : public Data::Thread {
 	not_null<HistoryItem*> addNewLocalMessage(
 		HistoryItemCommonFields &&fields,
 		not_null<GameData*> game);
+	not_null<HistoryItem*> addNewLocalMessage(not_null<HistoryItem*> item);
 
 	not_null<HistoryItem*> addSponsoredMessage(
 		MsgId id,
@@ -199,7 +200,7 @@ class History final : public Data::Thread {
 	void addOlderSlice(const QVector<MTPMessage> &slice);
 	void addNewerSlice(const QVector<MTPMessage> &slice);
 
-	void newItemAdded(not_null<HistoryItem*> item);
+	void newItemAdded(not_null<HistoryItem*> item, NewAddType type);
 
 	void registerClientSideMessage(not_null<HistoryItem*> item);
 	void unregisterClientSideMessage(not_null<HistoryItem*> item);
@@ -247,6 +248,8 @@ class History final : public Data::Thread {
 	[[nodiscard]] bool loadedAtBottom() const; // last message is in the list
 	void setNotLoadedAtBottom();
 	[[nodiscard]] bool loadedAtTop() const; // nothing was added after loading history back
+	[[nodiscard]] bool hasGuestChatBotMessages() const;
+	void setHasGuestChatBotMessages();
 	[[nodiscard]] bool isReadyFor(MsgId msgId); // has messages for showing history at msgId
 	void getReadyFor(MsgId msgId);
 
@@ -255,6 +258,7 @@ class History final : public Data::Thread {
 	[[nodiscard]] bool lastMessageKnown() const;
 	[[nodiscard]] bool lastServerMessageKnown() const;
 	void unknownMessageDeleted(MsgId messageId);
+	[[nodiscard]] bool isUnknownMessageDeleted(MsgId messageId) const;
 	void applyDialogTopMessage(MsgId topMessageId);
 	void applyDialog(Data::Folder *requestFolder, const MTPDdialog &data);
 	void applyPinnedUpdate(const MTPDupdateDialogPinned &data);
@@ -290,13 +294,20 @@ class History final : public Data::Thread {
 	void setHasPendingResizedItems();
 
 	[[nodiscard]] auto sendActionPainter()
-	-> not_null<HistoryView::SendActionPainter*> override {
+	-> HistoryView::SendActionPainter* override {
 		return &_sendActionPainter;
 	}
 
 	void clearLastKeyboard();
 	void clearUnreadMentionsFor(MsgId topicRootId);
-	void clearUnreadReactionsFor(MsgId topicRootId);
+	void clearUnreadReactionsFor(
+		MsgId topicRootId,
+		Data::SavedSublist *sublist);
+	void clearUnreadPollVotesFor(MsgId topicRootId);
+
+	[[nodiscard]] int unreadPollVotesCount() const;
+	void setUnreadPollVotesCount(int count);
+	[[nodiscard]] rpl::producer<int> unreadPollVotesCountChanges() const;
 
 	Data::Draft *draft(Data::DraftKey key) const;
 	void setDraft(Data::DraftKey key, std::unique_ptr<Data::Draft> &&draft);
@@ -305,60 +316,89 @@ class History final : public Data::Thread {
 	[[nodiscard]] const Data::HistoryDrafts &draftsMap() const;
 	void setDraftsMap(Data::HistoryDrafts &&map);
 
-	Data::Draft *localDraft(MsgId topicRootId) const {
-		return draft(Data::DraftKey::Local(topicRootId));
+	Data::Draft *localDraft(
+			MsgId topicRootId,
+			PeerId monoforumPeerId) const {
+		return draft(Data::DraftKey::Local(topicRootId, monoforumPeerId));
 	}
-	Data::Draft *localEditDraft(MsgId topicRootId) const {
-		return draft(Data::DraftKey::LocalEdit(topicRootId));
+	Data::Draft *localEditDraft(
+			MsgId topicRootId,
+			PeerId monoforumPeerId) const {
+		return draft(
+			Data::DraftKey::LocalEdit(topicRootId, monoforumPeerId));
 	}
-	Data::Draft *cloudDraft(MsgId topicRootId) const {
-		return draft(Data::DraftKey::Cloud(topicRootId));
+	Data::Draft *cloudDraft(
+			MsgId topicRootId,
+			PeerId monoforumPeerId) const {
+		return draft(Data::DraftKey::Cloud(topicRootId, monoforumPeerId));
 	}
 	void setLocalDraft(std::unique_ptr<Data::Draft> &&draft) {
 		setDraft(
-			Data::DraftKey::Local(draft->reply.topicRootId),
+			Data::DraftKey::Local(
+				draft->reply.topicRootId,
+				draft->reply.monoforumPeerId),
 			std::move(draft));
 	}
 	void setLocalEditDraft(std::unique_ptr<Data::Draft> &&draft) {
 		setDraft(
-			Data::DraftKey::LocalEdit(draft->reply.topicRootId),
+			Data::DraftKey::LocalEdit(
+				draft->reply.topicRootId,
+				draft->reply.monoforumPeerId),
 			std::move(draft));
 	}
 	void setCloudDraft(std::unique_ptr<Data::Draft> &&draft) {
 		setDraft(
-			Data::DraftKey::Cloud(draft->reply.topicRootId),
+			Data::DraftKey::Cloud(
+				draft->reply.topicRootId,
+				draft->reply.monoforumPeerId),
 			std::move(draft));
 	}
-	void clearLocalDraft(MsgId topicRootId) {
-		clearDraft(Data::DraftKey::Local(topicRootId));
+	void clearLocalDraft(
+			MsgId topicRootId,
+			PeerId monoforumPeerId) {
+		clearDraft(Data::DraftKey::Local(topicRootId, monoforumPeerId));
 	}
-	void clearCloudDraft(MsgId topicRootId) {
-		clearDraft(Data::DraftKey::Cloud(topicRootId));
+	void clearCloudDraft(
+			MsgId topicRootId,
+			PeerId monoforumPeerId) {
+		clearDraft(Data::DraftKey::Cloud(topicRootId, monoforumPeerId));
 	}
-	void clearLocalEditDraft(MsgId topicRootId) {
-		clearDraft(Data::DraftKey::LocalEdit(topicRootId));
+	void clearLocalEditDraft(
+			MsgId topicRootId,
+			PeerId monoforumPeerId) {
+		clearDraft(Data::DraftKey::LocalEdit(topicRootId, monoforumPeerId));
 	}
 	void clearDrafts();
 	Data::Draft *createCloudDraft(
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		const Data::Draft *fromDraft);
 	[[nodiscard]] bool skipCloudDraftUpdate(
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		TimeId date) const;
-	void startSavingCloudDraft(MsgId topicRootId);
-	void finishSavingCloudDraft(MsgId topicRootId, TimeId savedAt);
+	void startSavingCloudDraft(MsgId topicRootId, PeerId monoforumPeerId);
+	void finishSavingCloudDraft(
+		MsgId topicRootId,
+		PeerId monoforumPeerId,
+		TimeId savedAt);
 	void takeLocalDraft(not_null<History*> from);
-	void applyCloudDraft(MsgId topicRootId);
-	void draftSavedToCloud(MsgId topicRootId);
+	void applyCloudDraft(MsgId topicRootId, PeerId monoforumPeerId);
+	void draftSavedToCloud(MsgId topicRootId, PeerId monoforumPeerId);
 	void requestChatListMessage();
 
 	[[nodiscard]] const Data::ForwardDraft &forwardDraft(
-		MsgId topicRootId) const;
+		MsgId topicRootId,
+		PeerId monoforumPeerId) const;
 	[[nodiscard]] Data::ResolvedForwardDraft resolveForwardDraft(
 		const Data::ForwardDraft &draft) const;
 	[[nodiscard]] Data::ResolvedForwardDraft resolveForwardDraft(
-		MsgId topicRootId);
-	void setForwardDraft(MsgId topicRootId, Data::ForwardDraft &&draft);
+		MsgId topicRootId,
+		PeerId monoforumPeerId);
+	void setForwardDraft(
+		MsgId topicRootId,
+		PeerId monoforumPeerId,
+		Data::ForwardDraft &&draft);
 
 	History *migrateSibling() const;
 	[[nodiscard]] bool useTopPromotion() const;
@@ -389,6 +429,7 @@ class History final : public Data::Thread {
 		PeerId dataPeerId,
 		const MTPmessages_Messages &data);
 
+	void viewHeightAdjusted(not_null<Element*> view, int delta);
 	void forgetScrollState() {
 		scrollTopItem = nullptr;
 	}
@@ -411,6 +452,13 @@ class History final : public Data::Thread {
 	// Interface for Data::Histories.
 	void setInboxReadTill(MsgId upTo);
 	std::optional<int> countStillUnreadLocal(MsgId readTillId) const;
+	void tryMarkMonoforumIntervalRead(
+		MsgId wasInboxReadBefore,
+		MsgId nowInboxReadBefore);
+	void tryMarkForumIntervalRead(
+		MsgId wasInboxReadBefore,
+		MsgId nowInboxReadBefore);
+	void validateMonoAndForumUnread(MsgId readTillId);
 
 	[[nodiscard]] bool isTopPromoted() const;
 
@@ -421,6 +469,8 @@ class History final : public Data::Thread {
 
 	[[nodiscard]] HistoryTranslation *translation() const;
 
+	void refreshHiddenLinksItems();
+
 	const not_null<PeerData*> peer;
 
 	// Still public data.
@@ -447,14 +497,17 @@ class History final : public Data::Thread {
 private:
 	friend class HistoryBlock;
 
-	enum class Flag : uchar {
+	enum class Flag : ushort {
 		HasPendingResizedItems = (1 << 0),
 		PendingAllItemsResize = (1 << 1),
 		IsTopPromoted = (1 << 2),
 		IsForum = (1 << 3),
-		FakeUnreadWhileOpened = (1 << 4),
-		HasPinnedMessages = (1 << 5),
-		ResolveChatListMessage = (1 << 6),
+		IsMonoforumAdmin = (1 << 4),
+		FakeUnreadWhileOpened = (1 << 5),
+		HasPinnedMessages = (1 << 6),
+		ResolveChatListMessage = (1 << 7),
+		MonoAndForumUnreadInvalidatePending = (1 << 8),
+		HasGuestChatBotMessages = (1 << 9),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) {
@@ -516,6 +569,7 @@ class History final : public Data::Thread {
 	void mainViewRemoved(
 		not_null<HistoryBlock*> block,
 		not_null<Element*> view);
+	void mainViewHeightAdjusted(not_null<Element*> view, int delta);
 
 	TimeId adjustedChatListTimeId() const override;
 	void changedChatListPinHook() override;
@@ -564,19 +618,26 @@ class History final : public Data::Thread {
 
 	void viewReplaced(not_null<const Element*> was, Element *now);
 
-	void createLocalDraftFromCloud(MsgId topicRootId);
+	void createLocalDraftFromCloud(
+		MsgId topicRootId,
+		PeerId monoforumPeerId);
 
 	HistoryItem *insertJoinedMessage();
 	void insertMessageToBlocks(not_null<HistoryItem*> item);
+	void checkNewPeerMessages();
 
 	[[nodiscard]] Dialogs::BadgesState computeBadgesState() const;
 	[[nodiscard]] Dialogs::BadgesState adjustBadgesStateByFolder(
 		Dialogs::BadgesState state) const;
 	[[nodiscard]] Dialogs::UnreadState computeUnreadState() const;
+	[[nodiscard]] Dialogs::UnreadState withMyMuted(
+		Dialogs::UnreadState state) const;
 	void setFolderPointer(Data::Folder *folder);
 
 	void hasUnreadMentionChanged(bool has) override;
 	void hasUnreadReactionChanged(bool has) override;
+	void hasUnreadPollVoteChanged(bool has) override;
+	[[nodiscard]] bool useMyUnreadInParent() const;
 
 	const std::unique_ptr<HistoryMainElementDelegateMixin> _delegateMixin;
 
@@ -586,6 +647,8 @@ class History final : public Data::Thread {
 	Element *_unreadBarView = nullptr;
 	Element *_firstUnreadView = nullptr;
 	HistoryItem *_joinedMessage = nullptr;
+	HistoryItem *_newPeerNameChange = nullptr;
+	HistoryItem *_newPeerPhotoChange = nullptr;
 	bool _loadedAtTop = false;
 	bool _loadedAtBottom = true;
 
@@ -594,12 +657,15 @@ class History final : public Data::Thread {
 	std::optional<MsgId> _inboxReadBefore;
 	std::optional<MsgId> _outboxReadBefore;
 	std::optional<int> _unreadCount;
+	int _unreadPollVotesCount = 0;
+	rpl::event_stream<int> _unreadPollVotesCountChanges;
 	std::optional<HistoryItem*> _lastMessage;
 	std::optional<HistoryItem*> _lastServerMessage;
 	base::flat_set<not_null<HistoryItem*>> _clientSideMessages;
 	std::unordered_set<std::unique_ptr<HistoryItem>> _items;
 
 	std::unique_ptr<Data::HistoryMessages> _messages;
+	std::unique_ptr<HistoryStreamedDrafts> _streamedDrafts;
 
 	// This almost always is equal to _lastMessage. The only difference is
 	// for a group that migrated to a supergroup. Then _lastMessage can
@@ -619,9 +685,11 @@ class History final : public Data::Thread {
 	std::unique_ptr<HistoryTranslation> _translation;
 
 	Data::HistoryDrafts _drafts;
-	base::flat_map<MsgId, TimeId> _acceptCloudDraftsAfter;
-	base::flat_map<MsgId, int> _savingCloudDraftRequests;
-	Data::ForwardDrafts _forwardDrafts;
+	base::flat_map<Data::DraftKey, TimeId> _acceptCloudDraftsAfter;
+	base::flat_map<Data::DraftKey, int> _savingCloudDraftRequests;
+	base::flat_map<Data::DraftKey, Data::ForwardDraft> _forwardDrafts;
+
+	base::flat_map<MsgId, TimeId> _unknownDeletedMessages;
 
 	QString _topPromotedMessage;
 	QString _topPromotedType;
@@ -648,7 +716,9 @@ class HistoryBlock {
 
 	std::vector<std::unique_ptr<Element>> messages;
 
-	void remove(not_null<Element*> view);
+	void remove(
+		not_null<Element*> view,
+		Data::ViewRemovalReason reason = Data::ViewRemovalReason::Removed);
 	void refreshView(not_null<Element*> view);
 
 	int resizeGetHeight(int newWidth, ResizeRequest request);
diff --git a/Telegram/SourceFiles/history/history_drag_area.cpp b/Telegram/SourceFiles/history/history_drag_area.cpp
index 4f99ec77826f58..c4eed69925d4db 100644
--- a/Telegram/SourceFiles/history/history_drag_area.cpp
+++ b/Telegram/SourceFiles/history/history_drag_area.cpp
@@ -24,8 +24,12 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "mainwidget.h"
 #include "storage/storage_media_prepare.h"
+#include "core/application.h"
+#include "core/mime_type.h"
+#include "core/local_url_handlers.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
+#include "styles/style_window.h"
 
 namespace {
 
@@ -37,6 +41,33 @@ constexpr auto kDragAreaEvents = {
 	QEvent::Leave,
 };
 
+[[nodiscard]] QString DetectProxyLink(const QMimeData *data) {
+	if (!data) {
+		return QString();
+	}
+	const auto check = [](const QString &text) -> QString {
+		const auto local = Core::TryConvertUrlToLocal(text.trimmed());
+		const auto proxy = [&](const QString &prefix) {
+			return local.startsWith(prefix, Qt::CaseInsensitive)
+				&& (local.size() > prefix.size());
+		};
+		return (proxy(u"tg://proxy?"_q) || proxy(u"tg://socks?"_q))
+			? local
+			: QString();
+	};
+	for (const auto &url : Core::ReadMimeUrls(data)) {
+		if (auto result = check(url.toString()); !result.isEmpty()) {
+			return result;
+		}
+	}
+	if (const auto text = Core::ReadMimeText(data); !text.isEmpty()) {
+		if (auto result = check(text); !result.isEmpty()) {
+			return result;
+		}
+	}
+	return QString();
+}
+
 } // namespace
 
 DragArea::Areas DragArea::SetupDragAreaToContainer(
@@ -93,6 +124,7 @@ DragArea::Areas DragArea::SetupDragAreaToContainer(
 			moveToTop(attachDragDocument);
 		break;
 		case DragState::PhotoFiles:
+		case DragState::MediaFiles:
 			attachDragDocument->resize(
 				width() - horizontalMargins,
 				(height() - verticalMargins) / 2);
@@ -147,6 +179,20 @@ DragArea::Areas DragArea::SetupDragAreaToContainer(
 			attachDragDocument->otherEnter();
 			attachDragPhoto->otherEnter();
 		break;
+		case DragState::MediaFiles:
+			attachDragDocument->setText(
+				tr::lng_drag_files_here(tr::now),
+				hideSubtext
+					? QString()
+					: tr::lng_drag_to_send_files(tr::now));
+			attachDragPhoto->setText(
+				tr::lng_drag_media_here(tr::now),
+				hideSubtext
+					? QString()
+					: tr::lng_drag_to_send_media(tr::now));
+			attachDragDocument->otherEnter();
+			attachDragPhoto->otherEnter();
+		break;
 		case DragState::Image:
 			attachDragPhoto->setText(
 				tr::lng_drag_images_here(tr::now),
@@ -160,7 +206,7 @@ DragArea::Areas DragArea::SetupDragAreaToContainer(
 	};
 
 	container->sizeValue(
-	) | rpl::start_with_next(updateAttachGeometry, lifetime);
+	) | rpl::on_next(updateAttachGeometry, lifetime);
 
 	const auto resetDragStateIfNeeded = [=] {
 		if (*attachDragState != DragState::None
@@ -220,7 +266,7 @@ DragArea::Areas DragArea::SetupDragAreaToContainer(
 	container->events(
 	) | rpl::filter([=](not_null<QEvent*> event) {
 		return ranges::contains(kDragAreaEvents, event->type());
-	}) | rpl::start_with_next([=](not_null<QEvent*> event) {
+	}) | rpl::on_next([=](not_null<QEvent*> event) {
 		const auto type = event->type();
 
 		if (processDragEvents(event)) {
@@ -246,6 +292,100 @@ DragArea::Areas DragArea::SetupDragAreaToContainer(
 	};
 }
 
+void DragArea::SetupProxyDropArea(
+		not_null<Ui::RpWidget*> container,
+		Fn<void(const QString &localUrl)> connectProxy) {
+	auto &lifetime = container->lifetime();
+	container->setAcceptDrops(true);
+
+	const auto area = Ui::CreateChild<DragArea>(container.get());
+	area->hide();
+	area->raise();
+	area->setText(
+		tr::lng_drag_proxy_here(tr::now),
+		tr::lng_drag_proxy_about(tr::now));
+
+	const auto updateGeometry = [=] {
+		const auto margin = st::dragMargin;
+		const auto width = st::windowMinWidth
+			- margin.left()
+			- margin.right();
+		area->setGeometry(
+			(container->width() - width) / 2,
+			margin.top(),
+			width,
+			container->height() / 3 - margin.top());
+	};
+	container->sizeValue(
+	) | rpl::on_next([=](QSize) {
+		updateGeometry();
+	}, lifetime);
+
+	const auto reset = [=] {
+		if (!area->isHidden()) {
+			area->otherLeave();
+		}
+	};
+
+	const auto dragEnterEvent = [=](QDragEnterEvent *e) {
+		if (Core::App().passcodeLocked()
+			|| DetectProxyLink(e->mimeData()).isEmpty()) {
+			reset();
+			return;
+		}
+		updateGeometry();
+		area->raise();
+		area->otherEnter();
+		e->setDropAction(Qt::IgnoreAction);
+		e->accept();
+	};
+
+	const auto dropEvent = [=](QDropEvent *e) {
+		area->hideFast();
+		e->setDropAction(Qt::IgnoreAction);
+		e->accept();
+	};
+
+	const auto processDragEvents = [=](not_null<QEvent*> event) {
+		switch (event->type()) {
+		case QEvent::DragEnter:
+			dragEnterEvent(static_cast<QDragEnterEvent*>(event.get()));
+			return true;
+		case QEvent::DragLeave:
+			reset();
+			return true;
+		case QEvent::Drop:
+			dropEvent(static_cast<QDropEvent*>(event.get()));
+			return true;
+		}
+		return false;
+	};
+
+	container->events(
+	) | rpl::filter([=](not_null<QEvent*> event) {
+		return ranges::contains(kDragAreaEvents, event->type());
+	}) | rpl::on_next([=](not_null<QEvent*> event) {
+		const auto type = event->type();
+		if (processDragEvents(event)) {
+			return;
+		} else if (type == QEvent::Leave
+			|| type == QEvent::MouseButtonRelease) {
+			reset();
+		}
+	}, lifetime);
+
+	base::install_event_filter(area, [=](not_null<QEvent*> event) {
+		processDragEvents(event);
+		return base::EventFilterResult::Continue;
+	});
+
+	area->setDroppedCallback([=](const QMimeData *data) {
+		if (const auto local = DetectProxyLink(data); !local.isEmpty()) {
+			connectProxy(local);
+		}
+	});
+}
+
 DragArea::DragArea(QWidget *parent) : Ui::RpWidget(parent) {
 	setMouseTracking(true);
 	setAcceptDrops(true);
diff --git a/Telegram/SourceFiles/history/history_drag_area.h b/Telegram/SourceFiles/history/history_drag_area.h
index c9c075c5af6909..8fc17b0108613c 100644
--- a/Telegram/SourceFiles/history/history_drag_area.h
+++ b/Telegram/SourceFiles/history/history_drag_area.h
@@ -34,6 +34,10 @@ class DragArea : public Ui::RpWidget {
 		CallbackComputeState &&computeState = nullptr,
 		bool hideSubtext = false);
 
+	static void SetupProxyDropArea(
+		not_null<Ui::RpWidget*> container,
+		Fn<void(const QString &localUrl)> connectProxy);
+
 	void setText(const QString &text, const QString &subtext);
 
 	void otherEnter();
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index dcc9d77e85f592..581d57e59be161 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -7,28 +7,39 @@ For license and copyright information please follow this link:
 */
 #include "history/history_inner_widget.h"
 
+#include "api/api_polls.h"
 #include "chat_helpers/stickers_emoji_pack.h"
+#include "core/application.h"
 #include "core/file_utilities.h"
 #include "core/click_handler_types.h"
+#include "core/phone_click_handler.h"
+#include "data/data_chat_participant_status.h"
 #include "history/history_item_helpers.h"
 #include "history/view/controls/history_view_forward_panel.h"
-#include "api/api_report.h"
 #include "history/view/controls/history_view_draft_options.h"
-#include "boxes/moderate_messages_box.h"
+#include "history/view/controls/history_view_suggest_options.h"
+#include "history/view/media/history_view_save_document_action.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/view/media/history_view_web_page.h"
+#include "history/view/reactions/history_view_reactions.h"
 #include "history/view/reactions/history_view_reactions_button.h"
 #include "history/view/reactions/history_view_reactions_selector.h"
 #include "history/view/history_view_about_view.h"
+#include "history/view/history_view_drag.h"
 #include "history/view/history_view_message.h"
 #include "history/view/history_view_service_message.h"
 #include "history/view/history_view_cursor_state.h"
+#include "history/view/history_view_reply_button.h"
 #include "history/view/history_view_context_menu.h"
+#include "history/view/history_view_reaction_preview.h"
 #include "history/view/history_view_quick_action.h"
+#include "history/view/history_view_add_poll_option.h"
+#include "history/view/history_view_element_overlay.h"
 #include "history/view/history_view_emoji_interactions.h"
+#include "history/view/history_view_top_peers_selector.h"
+#include "history/history_inner_widget_accessibility.h"
 #include "history/history_item_components.h"
 #include "history/history_item_text.h"
-#include "history/history_view_swipe.h"
 #include "payments/payments_reaction_process.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/menu/menu_multiline_action.h"
@@ -36,16 +47,17 @@ For license and copyright information please follow this link:
 #include "ui/effects/path_shift_gradient.h"
 #include "ui/effects/message_sending_animation_controller.h"
 #include "ui/effects/reaction_fly_animation.h"
-#include "ui/text/text_options.h"
 #include "ui/text/text_isolated_emoji.h"
-#include "ui/boxes/confirm_box.h"
+#include "ui/text/text_utilities.h"
 #include "ui/boxes/edit_factcheck_box.h"
 #include "ui/boxes/report_box_graphics.h"
-#include "ui/layers/generic_box.h"
 #include "ui/controls/delete_message_context_action.h"
+#include "ui/controls/who_reacted_context_action.h"
+#include "ui/controls/swipe_handler.h"
 #include "ui/inactive_press.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/screen_reader_mode.h"
 #include "ui/ui_utility.h"
 #include "window/window_session_controller.h"
 #include "window/window_controller.h"
@@ -55,54 +67,74 @@ For license and copyright information please follow this link:
 #include "info/statistics/info_statistics_widget.h"
 #include "boxes/about_sponsored_box.h"
 #include "boxes/delete_messages_box.h"
+#include "boxes/moderate_messages_box.h"
 #include "boxes/report_messages_box.h"
+#include "boxes/send_gif_with_caption_box.h"
+#include "boxes/star_gift_box.h" // ShowStarGiftBox
 #include "boxes/sticker_set_box.h"
-#include "boxes/premium_preview_box.h"
 #include "boxes/translate_box.h"
 #include "chat_helpers/message_field.h"
 #include "chat_helpers/emoji_interactions.h"
 #include "history/history_widget.h"
 #include "history/view/history_view_translate_tracker.h"
+#include "history/view/history_view_read_metrics_tracker.h"
 #include "base/platform/base_platform_info.h"
 #include "base/qt/qt_common_adapters.h"
 #include "base/qt/qt_key_modifiers.h"
 #include "base/unixtime.h"
 #include "base/call_delayed.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "mainwidget.h"
 #include "menu/menu_item_download_files.h"
+#include "menu/menu_item_rate_transcribe.h"
+#include "menu/menu_item_rate_transcribe_session.h"
+#include "menu/menu_timecode_action.h"
+#include "menu/menu_sponsored.h"
 #include "core/application.h"
 #include "apiwrap.h"
 #include "api/api_attached_stickers.h"
+#include "api/api_suggest_post.h"
+#include "api/api_stickers_creator.h"
 #include "api/api_toggling_media.h"
+#include "media/player/media_player_instance.h"
 #include "api/api_who_reacted.h"
 #include "api/api_views.h"
+#include "ui/accessible/ui_accessible_item.h"
 #include "lang/lang_keys.h"
 #include "data/components/factchecks.h"
 #include "data/components/sponsored_messages.h"
+#include "data/data_saved_music.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_document.h"
+#include "data/data_photo.h"
 #include "data/data_channel.h"
 #include "data/data_forum_topic.h"
 #include "data/data_photo_media.h"
 #include "data/data_peer_values.h"
 #include "data/data_chat.h"
 #include "data/data_user.h"
+#include "data/data_message_reaction_id.h"
+#include "data/data_poll.h"
 #include "data/data_file_click_handler.h"
 #include "data/data_histories.h"
 #include "data/data_changes.h"
 #include "dialogs/ui/dialogs_video_userpic.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
 
 #include <QtGui/QClipboard>
 #include <QtWidgets/QApplication>
+#include <QtCore/QCoreApplication>
 #include <QtCore/QMimeData>
 
 namespace {
 
 constexpr auto kScrollDateHideTimeout = 1000;
+constexpr auto kScrollDateHideOnDayCrossingTimeout = crl::time(3000);
 constexpr auto kUnloadHeavyPartsPages = 2;
 constexpr auto kClearUserpicsAfter = 50;
 
@@ -126,69 +158,6 @@ int BinarySearchBlocksOrItems(const T &list, int edge) {
 	return start;
 }
 
-[[nodiscard]] bool CanSendReply(not_null<const HistoryItem*> item) {
-	const auto peer = item->history()->peer;
-	const auto topic = item->topic();
-	return topic
-		? Data::CanSendAnything(topic)
-		: (Data::CanSendAnything(peer)
-			&& (!peer->isChannel() || peer->asChannel()->amIn()));
-}
-
-void FillSponsoredMessagesMenu(
-		not_null<Window::SessionController*> controller,
-		FullMsgId itemId,
-		not_null<Ui::PopupMenu*> menu) {
-	const auto &data = controller->session().sponsoredMessages();
-	const auto info = data.lookupDetails(itemId).info;
-	const auto show = controller->uiShow();
-	if (!info.empty()) {
-		auto fillSubmenu = [&](not_null<Ui::PopupMenu*> menu) {
-			const auto allText = ranges::accumulate(
-				info,
-				TextWithEntities(),
-				[](TextWithEntities a, TextWithEntities b) {
-					return a.text.isEmpty() ? b : a.append('\n').append(b);
-				}).text;
-			const auto callback = [=] {
-				QGuiApplication::clipboard()->setText(allText);
-				show->showToast(tr::lng_text_copied(tr::now));
-			};
-			for (const auto &i : info) {
-				auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
-					menu,
-					st::defaultMenu,
-					st::historySponsorInfoItem,
-					st::historyHasCustomEmojiPosition,
-					base::duplicate(i));
-				item->clicks(
-				) | rpl::start_with_next(callback, menu->lifetime());
-				menu->addAction(std::move(item));
-				if (i != info.back()) {
-					menu->addSeparator();
-				}
-			}
-		};
-		using namespace Ui::Menu;
-		CreateAddActionCallback(menu)(MenuCallback::Args{
-			.text = tr::lng_sponsored_info_menu(tr::now),
-			.handler = nullptr,
-			.icon = &st::menuIconChannel,
-			.fillSubmenu = std::move(fillSubmenu),
-		});
-		menu->addSeparator(&st::expandedMenuSeparator);
-	}
-	menu->addAction(tr::lng_sponsored_hide_ads(tr::now), [=] {
-		if (controller->session().premium()) {
-			using Result = Data::SponsoredReportResult;
-			controller->session().sponsoredMessages().createReportCallback(
-				itemId)(Result::Id("-1"), [](const auto &) {});
-		} else {
-			ShowPremiumPreviewBox(controller, PremiumFeature::NoAds);
-		}
-	}, &st::menuIconCancel);
-}
-
 } // namespace
 
 // flick scroll taken from http://qt-project.org/doc/qt-4.8/demos-embedded-anomaly-src-flickcharm-cpp.html
@@ -211,7 +180,11 @@ class HistoryMainElementDelegate final
 			not_null<const Element*> view) override {
 		return (Element::Moused() == view);
 	}
-	HistoryView::SelectionModeResult elementInSelectionMode() override {
+	HistoryView::SelectionModeResult elementInSelectionMode(
+			const Element *view) override {
+		if (view && view->data()->isSponsored()) {
+			return HistoryView::SelectionModeResult();
+		}
 		return _widget
 			? _widget->inSelectionMode()
 			: HistoryView::SelectionModeResult();
@@ -237,6 +210,20 @@ class HistoryMainElementDelegate final
 			_widget->elementShowPollResults(poll, context);
 		}
 	}
+	void elementShowAddPollOption(
+			not_null<Element*> view,
+			not_null<PollData*> poll,
+			FullMsgId context,
+			QRect optionRect) override {
+		if (_widget) {
+			_widget->elementShowAddPollOption(view, poll, context, optionRect);
+		}
+	}
+	void elementSubmitAddPollOption(FullMsgId context) override {
+		if (_widget) {
+			_widget->elementSubmitAddPollOption(context);
+		}
+	}
 	void elementOpenPhoto(
 			not_null<PhotoData*> photo,
 			FullMsgId context) override {
@@ -255,6 +242,13 @@ class HistoryMainElementDelegate final
 				showInMediaView);
 		}
 	}
+	bool elementScrollToLocalY(
+			not_null<const Element*> view,
+			int localTop) override {
+		return _widget
+			? _widget->scrollToElementLocalY(view, localTop)
+			: false;
+	}
 	void elementCancelUpload(const FullMsgId &context) override {
 		if (_widget) {
 			_widget->elementCancelUpload(context);
@@ -267,6 +261,13 @@ class HistoryMainElementDelegate final
 			_widget->elementShowTooltip(text, hiddenCallback);
 		}
 	}
+	void elementShowHiddenSenderTooltip(
+			FullMsgId itemId,
+			const TextWithEntities &text) override {
+		if (_widget) {
+			_widget->elementShowHiddenSenderTooltip(itemId, text);
+		}
+	}
 	bool elementAnimationsPaused() override {
 		return _widget ? _widget->elementAnimationsPaused() : false;
 	}
@@ -299,8 +300,9 @@ class HistoryMainElementDelegate final
 			_widget->elementHandleViaClick(bot);
 		}
 	}
-	bool elementIsChatWide() override {
-		return _widget ? _widget->elementIsChatWide() : false;
+	HistoryView::ElementChatMode elementChatMode() override {
+		using Mode = HistoryView::ElementChatMode;
+		return _widget ? _widget->elementChatMode() : Mode::Default;
 	}
 	not_null<Ui::PathShiftGradient*> elementPathShiftGradient() override {
 		Expects(_widget != nullptr);
@@ -370,6 +372,8 @@ HistoryInner::HistoryInner(
 	[=](not_null<const Element*> view) { return itemTop(view); }))
 , _migrated(history->migrateFrom())
 , _translateTracker(std::make_unique<HistoryView::TranslateTracker>(history))
+, _readMetricsTracker(std::make_unique<HistoryView::ReadMetricsTracker>(
+	_peer))
 , _pathGradient(
 	HistoryView::MakePathShiftGradient(
 		controller->chatStyle(),
@@ -378,8 +382,16 @@ HistoryInner::HistoryInner(
 	std::make_unique<HistoryView::Reactions::Manager>(
 		this,
 		[=](QRect updated) { update(updated); }))
+, _replyButtonManager(
+	std::make_unique<HistoryView::ReplyButton::Manager>(
+		[=](QRect updated) { update(updated); }))
 , _touchSelectTimer([=] { onTouchSelect(); })
 , _touchScrollTimer([=] { onTouchScrollTimer(); })
+, _middleClickAutoscroll(
+	[=](int d) { _scroll->scrollToY(_scroll->scrollTop() + d); },
+	[=](const QCursor &cursor) { setCursor(cursor); },
+	[=] { mouseActionUpdate(QCursor::pos()); setCursor(_cursor); },
+	[=] { return window()->isActiveWindow(); })
 , _scrollDateCheck([this] { scrollDateCheck(); })
 , _scrollDateHideTimer([this] { scrollDateHideByTimer(); }) {
 	_history->delegateMixin()->setCurrent(this);
@@ -391,7 +403,7 @@ HistoryInner::HistoryInner(
 	Window::ChatThemeValueFromPeer(
 		controller,
 		_peer
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
 		_theme = std::move(theme);
 		controller->setChatStyleTheme(_theme);
 	}, lifetime());
@@ -402,8 +414,13 @@ HistoryInner::HistoryInner(
 	refreshAboutView();
 
 	setMouseTracking(true);
+	setAccessibleName(tr::lng_sr_message_list(tr::now));
+	Core::App().inAppKeyPressed(
+	) | rpl::on_next([=] {
+		registerReadMetricsActivity();
+	}, lifetime());
 	_controller->gifPauseLevelChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!elementAnimationsPaused()) {
 			update();
 		}
@@ -414,32 +431,33 @@ HistoryInner::HistoryInner(
 	) | rpl::filter([=](const PlayRequest &request) {
 		return (request.item->history() == _history)
 			&& _controller->widget()->isActive();
-	}) | rpl::start_with_next([=](PlayRequest &&request) {
+	}) | rpl::on_next([=](PlayRequest &&request) {
 		if (const auto view = viewByItem(request.item)) {
 			_emojiInteractions->play(std::move(request), view);
 		}
 	}, lifetime());
 	_emojiInteractions->playStarted(
-	) | rpl::start_with_next([=](QString &&emoji) {
+	) | rpl::on_next([=](QString &&emoji) {
 		_controller->emojiInteractions().playStarted(_peer, std::move(emoji));
 	}, lifetime());
 
 	_reactionsManager->chosen(
-	) | rpl::start_with_next([=](ChosenReaction reaction) {
+	) | rpl::on_next([=](ChosenReaction reaction) {
 		_reactionsManager->updateButton({});
 		reactionChosen(reaction);
 	}, lifetime());
 
 	session().data().peerDecorationsUpdated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 	session().data().itemRemoved(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this](auto item) { itemRemoved(item); },
 		lifetime());
+	setupThanosEffect();
 	session().data().viewRemoved(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this](auto view) { viewRemoved(view); },
 		lifetime());
 	rpl::merge(
@@ -447,22 +465,25 @@ HistoryInner::HistoryInner(
 		session().data().historyCleared()
 	) | rpl::filter([this](not_null<const History*> history) {
 		return (_history == history);
-	}) | rpl::start_with_next([this] {
+	}) | rpl::on_next([this] {
 		mouseActionCancel();
 	}, lifetime());
 	session().data().viewRepaintRequest(
-	) | rpl::start_with_next([this](not_null<const Element*> view) {
-		repaintItem(view);
+	) | rpl::on_next([this](Data::RequestViewRepaint data) {
+		repaintItem(data.view, data.rect);
 	}, lifetime());
 	session().data().viewLayoutChanged(
 	) | rpl::filter([=](not_null<const Element*> view) {
-		return (view == viewByItem(view->data())) && view->isUnderCursor();
-	}) | rpl::start_with_next([=](not_null<const Element*> view) {
-		mouseActionUpdate();
+		return (view == viewByItem(view->data()));
+	}) | rpl::on_next([=](not_null<const Element*> view) {
+		markReadMetricsStale();
+		if (view->isUnderCursor()) {
+			mouseActionUpdate();
+		}
 	}, lifetime());
 
 	session().data().itemDataChanges(
-	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		if (const auto view = viewByItem(item)) {
 			view->itemDataChanged();
 		}
@@ -472,7 +493,7 @@ HistoryInner::HistoryInner(
 		_history,
 		(Data::HistoryUpdate::Flag::OutboxRead
 			| Data::HistoryUpdate::Flag::TranslatedTo)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
@@ -481,25 +502,36 @@ HistoryInner::HistoryInner(
 		_reactionsItem.value());
 
 	Core::App().settings().cornerReactionValue(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		_useCornerReaction = value;
 		if (!value) {
 			_reactionsManager->updateButton({});
 		}
 	}, lifetime());
 
+	Core::App().settings().cornerReplyValue(
+	) | rpl::on_next([=](bool value) {
+		_useCornerReply = value;
+		if (!value) {
+			_replyButtonManager->updateButton({});
+		}
+	}, lifetime());
+
 	controller->adaptive().chatWideValue(
-	) | rpl::start_with_next([=](bool wide) {
+	) | rpl::on_next([=](bool wide) {
 		_isChatWide = wide;
+		if (_overlayHost) {
+			_overlayHost->hide();
+		}
 	}, lifetime());
 
 	_selectScroll.scrolls(
-	) | rpl::start_with_next([=](int d) {
+	) | rpl::on_next([=](int d) {
 		_scroll->scrollToY(_scroll->scrollTop() + d);
 	}, _scroll->lifetime());
 
 	setupSharingDisallowed();
-	setupSwipeReply();
+	setupSwipeReplyAndBack();
 }
 
 void HistoryInner::reactionChosen(const ChosenReaction &reaction) {
@@ -546,48 +578,91 @@ Main::Session &HistoryInner::session() const {
 void HistoryInner::setupSharingDisallowed() {
 	Expects(_peer != nullptr);
 
-	if (_peer->isUser()) {
-		_sharingDisallowed = false;
-		return;
-	}
-	const auto chat = _peer->asChat();
-	const auto channel = _peer->asChannel();
-	_sharingDisallowed = chat
-		? Data::PeerFlagValue(chat, ChatDataFlag::NoForwards)
-		: Data::PeerFlagValue(
-			channel,
-			ChannelDataFlag::NoForwards
-		) | rpl::type_erased();
-
-	auto rights = chat
-		? chat->adminRightsValue()
-		: channel->adminRightsValue();
-	auto canDelete = std::move(
-		rights
-	) | rpl::map([=] {
-		return chat
-			? chat->canDeleteMessages()
-			: channel->canDeleteMessages();
-	});
-	rpl::combine(
-		_sharingDisallowed.value(),
-		std::move(canDelete)
-	) | rpl::filter([=](bool disallowed, bool canDelete) {
-		return hasSelectRestriction() && !getSelectedItems().empty();
-	}) | rpl::start_with_next([=] {
-		_widget->clearSelected();
-		if (_mouseAction == MouseAction::PrepareSelect) {
-			mouseActionCancel();
+	if (const auto user = _peer->asUser()) {
+		_sharingDisallowed = rpl::combine(
+			Data::PeerFlagValue(user, UserDataFlag::NoForwardsMyEnabled),
+			Data::PeerFlagValue(user, UserDataFlag::NoForwardsPeerEnabled)
+		) | rpl::map([](bool my, bool peer) {
+			return my || peer;
+		});
+	} else {
+		const auto chat = _peer->asChat();
+		const auto channel = _peer->asChannel();
+		_sharingDisallowed = chat
+			? Data::PeerFlagValue(chat, ChatDataFlag::NoForwards)
+			: Data::PeerFlagValue(
+				channel,
+				ChannelDataFlag::NoForwards
+			) | rpl::type_erased;
+	}
+
+	const auto clearIfRestricted = [=] {
+		if (hasSelectRestriction() && !getSelectedItems().empty()) {
+			_widget->clearSelected();
+			if (_mouseAction == MouseAction::PrepareSelect) {
+				mouseActionCancel();
+			}
 		}
-	}, lifetime());
+	};
+
+	if (const auto chat = _peer->asChat()) {
+		auto rights = chat->adminRightsValue();
+		auto canDelete = std::move(
+			rights
+		) | rpl::map([=] {
+			return chat->canDeleteMessages();
+		});
+		rpl::combine(
+			_sharingDisallowed.value(),
+			std::move(canDelete)
+		) | rpl::on_next([=] {
+			clearIfRestricted();
+		}, lifetime());
+	} else if (const auto channel = _peer->asChannel()) {
+		auto rights = channel->adminRightsValue();
+		auto canDelete = std::move(
+			rights
+		) | rpl::map([=] {
+			return channel->canDeleteMessages();
+		});
+		rpl::combine(
+			_sharingDisallowed.value(),
+			std::move(canDelete)
+		) | rpl::on_next([=] {
+			clearIfRestricted();
+		}, lifetime());
+	} else {
+		_sharingDisallowed.value(
+		) | rpl::on_next([=] {
+			clearIfRestricted();
+		}, lifetime());
+	}
 }
 
-void HistoryInner::setupSwipeReply() {
-	if (_peer && _peer->isChannel() && !_peer->isMegagroup()) {
+void HistoryInner::setupSwipeReplyAndBack() {
+	if (!_peer) {
 		return;
 	}
-	HistoryView::SetupSwipeHandler(this, _scroll, [=, history = _history](
-			HistoryView::ChatPaintGestureHorizontalData data) {
+
+	auto update = [=, history = _history](
+			Ui::Controls::SwipeContextData data) {
+		if (data.translation > 0) {
+			if (!_swipeBackData.callback) {
+				_swipeBackData = Ui::Controls::SetupSwipeBack(
+					_widget,
+					[=]() -> std::pair<QColor, QColor> {
+						auto context = preparePaintContext({});
+						return {
+							context.st->msgServiceBg()->c,
+							context.st->msgServiceFg()->c,
+						};
+					});
+			}
+			_swipeBackData.callback(data);
+			return;
+		} else if (_swipeBackData.lifetime) {
+			_swipeBackData = {};
+		}
 		const auto changed = (_gestureHorizontal.msgBareId != data.msgBareId)
 			|| (_gestureHorizontal.translation != data.translation)
 			|| (_gestureHorizontal.reachRatio != data.reachRatio);
@@ -600,8 +675,59 @@ void HistoryInner::setupSwipeReply() {
 				repaintItem(item);
 			}
 		}
-	}, [=, show = _controller->uiShow()](int cursorTop) {
-		auto result = HistoryView::SwipeHandlerFinishData();
+	};
+
+	const auto canConsumeHorizontalScroll = [=](QPoint position, int delta) {
+		auto result = false;
+		enumerateItems<EnumItemsDirection::BottomToTop>([&](
+				not_null<Element*> view,
+				int itemtop,
+				int itembottom) {
+			if ((position.y() < itemtop)
+				|| (position.y() > itembottom)
+				|| !view->data()->isRegular()
+				|| view->data()->isService()) {
+				return true;
+			}
+			result = view->canConsumeHorizontalScroll(
+				mapPointToItem(position, view),
+				delta);
+			return false;
+		});
+		return result;
+	};
+
+	auto init = [=, show = _controller->uiShow()](
+			Ui::Controls::SwipeHandlerInitData data) {
+		auto result = Ui::Controls::SwipeHandlerFinishData();
+		const auto horizontalScrollDelta = (data.direction == Qt::LeftToRight)
+			? 1
+			: -1;
+		if (canConsumeHorizontalScroll(
+				data.cursorPosition,
+				horizontalScrollDelta)) {
+			return result;
+		}
+		if (data.direction == Qt::RightToLeft) {
+			auto good = true;
+			enumerateItems<EnumItemsDirection::BottomToTop>([&](
+					not_null<Element*> view,
+					int itemtop,
+					int itembottom) {
+				if (view->data()->showSimilarChannels()) {
+					good = false;
+					return true;
+				}
+				return false;
+			});
+			if (good) {
+				return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
+					_controller->showBackFromStack();
+				});
+			} else {
+				return Ui::Controls::SwipeHandlerFinishData();
+			}
+		}
 		if (inSelectionMode().inSelectionMode) {
 			return result;
 		}
@@ -609,50 +735,75 @@ void HistoryInner::setupSwipeReply() {
 				not_null<Element*> view,
 				int itemtop,
 				int itembottom) {
-			if ((cursorTop < itemtop)
-				|| (cursorTop > itembottom)
+			if ((data.cursorPosition.y() < itemtop)
+				|| (data.cursorPosition.y() > itembottom)
 				|| !view->data()->isRegular()
+				|| view->data()->showSimilarChannels()
 				|| view->data()->isService()) {
 				return true;
 			}
-			const auto item = view->data();
+			const auto item = lookupItemByPoint(
+				data.cursorPosition,
+				view);
 			const auto canSendReply = CanSendReply(item);
 			const auto canReply = (canSendReply || item->allowsForward());
 			if (!canReply) {
 				return true;
 			}
-			result.msgBareId = item->fullId().msg.bare;
-			result.callback = [=, itemId = item->fullId()] {
-				const auto still = show->session().data().message(itemId);
-				const auto selected = selectedQuote(still);
-				const auto replyToItemId = (selected.item
+			if (_overlayHost) {
+				_overlayHost->hide();
+			}
+			const auto viewItemId = view->data()->fullId();
+			const auto itemId = item->fullId();
+			result.msgBareId = viewItemId.msg.bare;
+			result.callback = [=] {
+				const auto still = show->session().data().message(viewItemId);
+				const auto selected = still
+					? selectedQuote(still)
+					: HistoryView::SelectedQuote();
+				const auto exact = selected.item
 					? selected.item
-					: still)->fullId();
-				if (canSendReply) {
-					_widget->replyToMessage({
-						.messageId = replyToItemId,
-						.quote = selected.text,
-						.quoteOffset = selected.offset,
-					});
-					if (!selected.text.empty()) {
-						_widget->clearSelected();
-					}
-				} else {
-					HistoryView::Controls::ShowReplyToChatBox(show, {
-						.messageId = replyToItemId,
-						.quote = selected.text,
-						.quoteOffset = selected.offset,
-					});
+					: show->session().data().message(itemId);
+				if (!exact) {
+					return;
+				}
+				Window::ActivateWindow(_controller);
+				_widget->replyToMessage({
+					.messageId = exact->fullId(),
+					.quote = selected.highlight.quote,
+					.quoteOffset = selected.highlight.quoteOffset,
+				});
+				if (!selected.highlight.quote.empty()) {
+					_widget->clearSelected();
 				}
 			};
 			return false;
 		});
 		return result;
-	}, _touchMaybeSelecting.value());
+	};
+
+	Ui::Controls::SetupSwipeHandler({
+		.widget = this,
+		.scroll = _scroll,
+		.update = std::move(update),
+		.init = std::move(init),
+		.dontStart = _touchMaybeSelecting.value(),
+		.skipWheelEvent = [=](not_null<QWheelEvent*> event) {
+			const auto delta = Ui::ScrollDelta(event);
+			if (std::abs(delta.x()) <= std::abs(delta.y())) {
+				return false;
+			}
+			return canConsumeHorizontalScroll(
+				mapFromGlobal(event->globalPosition().toPoint()),
+				delta.x());
+		},
+	});
 }
 
 bool HistoryInner::hasSelectRestriction() const {
-	if (!_sharingDisallowed.current()) {
+	if (session().frozen()) {
+		return true;
+	} else if (!_sharingDisallowed.current()) {
 		return false;
 	} else if (const auto chat = _peer->asChat()) {
 		return !chat->canDeleteMessages();
@@ -718,6 +869,19 @@ void HistoryInner::repaintItem(const Element *view) {
 	}
 }
 
+void HistoryInner::repaintItem(const Element *view, QRect rect) {
+	if (rect.isNull()) {
+		return repaintItem(view);
+	}
+	if (_widget->skipItemRepaint()) {
+		return;
+	}
+	const auto top = itemTop(view);
+	if (top >= 0) {
+		update(rect.translated(0, top));
+	}
+}
+
 template <bool TopToBottom, typename Method>
 void HistoryInner::enumerateItemsInHistory(History *history, int historytop, Method method) {
 	// No displayed messages in this history.
@@ -728,7 +892,14 @@ void HistoryInner::enumerateItemsInHistory(History *history, int historytop, Met
 		return;
 	}
 
-	auto searchEdge = TopToBottom ? _visibleAreaTop : _visibleAreaBottom;
+	auto collapseGapsTotal = 0;
+	for (const auto &gap : _collapseGaps) {
+		collapseGapsTotal += gap.height;
+	}
+
+	auto searchEdge = TopToBottom
+		? (_visibleAreaTop - collapseGapsTotal)
+		: _visibleAreaBottom;
 
 	// Binary search for blockIndex of the first block that is not completely below the visible area.
 	auto blockIndex = BinarySearchBlocksOrItems<TopToBottom>(history->blocks, searchEdge - historytop);
@@ -739,17 +910,48 @@ void HistoryInner::enumerateItemsInHistory(History *history, int historytop, Met
 	auto blockbottom = blocktop + block->height();
 	auto itemIndex = BinarySearchBlocksOrItems<TopToBottom>(block->messages, searchEdge - blocktop);
 
+	const auto gapCount = int(_collapseGaps.size());
+	auto nextGapIndex = TopToBottom ? 0 : gapCount;
+	auto collapseShift = TopToBottom ? 0 : collapseGapsTotal;
+
 	while (true) {
 		while (true) {
 			auto view = block->messages[itemIndex].get();
-			auto itemtop = blocktop + view->y();
+			auto logicalTop = blocktop + view->y();
+
+			if (TopToBottom) {
+				while (nextGapIndex < gapCount) {
+					const auto &gap = _collapseGaps[nextGapIndex];
+					if (logicalTop < gap.absY) break;
+					collapseShift += gap.height;
+					++nextGapIndex;
+				}
+			} else {
+				while (nextGapIndex > 0) {
+					const auto &gap = _collapseGaps[nextGapIndex - 1];
+					if (logicalTop >= gap.absY) break;
+					collapseShift -= gap.height;
+					--nextGapIndex;
+				}
+			}
+
+			auto itemtop = logicalTop + collapseShift;
 			auto itembottom = itemtop + view->height();
 
-			// Binary search should've skipped all the items that are above / below the visible area.
 			if (TopToBottom) {
-				Assert(itembottom > _visibleAreaTop);
+				if (itembottom <= _visibleAreaTop) {
+					if (++itemIndex >= block->messages.size()) {
+						break;
+					}
+					continue;
+				}
 			} else {
-				Assert(itemtop < _visibleAreaBottom);
+				if (itemtop >= _visibleAreaBottom) {
+					if (--itemIndex < 0) {
+						break;
+					}
+					continue;
+				}
 			}
 
 			if (!method(view, itemtop, itembottom)) {
@@ -814,12 +1016,17 @@ bool HistoryInner::canHaveFromUserpics() const {
 		&& !_peer->isSelf()
 		&& !_peer->isRepliesChat()
 		&& !_peer->isVerifyCodes()
-		&& !_isChatWide) {
+		&& !_isChatWide
+		&& !_history->hasGuestChatBotMessages()) {
 		return false;
 	} else if (const auto channel = _peer->asBroadcast()) {
 		return channel->signatureProfiles();
 	}
-	return true;
+	return _isChatWide || !_removeFromUserpics;
+}
+
+void HistoryInner::toggleRemoveFromUserpics(bool remove) {
+	_removeFromUserpics = remove;
 }
 
 template <typename Method>
@@ -850,7 +1057,7 @@ void HistoryInner::enumerateUserpics(Method method) {
 				lowestAttachedItemTop = itemtop + view->marginTop();
 			}
 			// Attach userpic to the bottom of the visible area with the same margin as the last message.
-			auto userpicMinBottomSkip = st::historyPaddingBottom + st::msgMargin.bottom();
+			auto userpicMinBottomSkip = _historyMarginBottom + st::msgMargin.bottom();
 			auto userpicBottom = qMin(itembottom - view->marginBottom(), _visibleAreaBottom - userpicMinBottomSkip);
 
 			// Do not let the userpic go above the attached messages pack top line.
@@ -927,62 +1134,205 @@ void HistoryInner::enumerateDates(Method method) {
 	enumerateItems<EnumItemsDirection::BottomToTop>(dateCallback);
 }
 
-TextSelection HistoryInner::computeRenderSelection(
+template <typename Method>
+void HistoryInner::enumerateForumThreadBars(Method method) {
+	if (!_history->hasForumThreadBars()) {
+		return;
+	}
+
+	const auto skip = (_scrollDateOpacity.animating() || _scrollDateShown)
+		? int(base::SafeRound(
+			(_scrollDateOpacity.value(_scrollDateShown ? 1. : 0.)
+				* (st::msgServicePadding.bottom()
+					+ st::msgServiceFont->height
+					+ st::msgServicePadding.top()
+					+ st::msgServiceMargin.top()))))
+		: 0;
+
+	// Find and remember the bottom of an single-day messages pack
+	// -1 means we didn't find a same-day with previous message yet.
+	auto lowestInOneBunchItemBottom = -1;
+
+	auto barCallback = [&](not_null<Element*> view, int itemtop, int itembottom) {
+		const auto item = view->data();
+		if (lowestInOneBunchItemBottom < 0 && view->isInOneBunchWithPrevious()) {
+			lowestInOneBunchItemBottom = itembottom - view->marginBottom();
+		}
+
+		// Call method on a bar for all messages that have it and for those who are not showing it
+		// because they are in a one day together with the previous message if they are top-most visible.
+		if (view->displayForumThreadBar() || (!item->isEmpty() && itemtop <= _visibleAreaTop)) {
+			if (lowestInOneBunchItemBottom < 0) {
+				lowestInOneBunchItemBottom = itembottom - view->marginBottom();
+			}
+			// Attach bar to the top of the visible area with the same margin as it has in service message.
+			int barTop = qMax(itemtop + view->displayedDateHeight(), _visibleAreaTop + skip) + st::msgServiceMargin.top();
+
+			// Do not let the bar go below the single-bar messages pack bottom line.
+			int barHeight = st::msgServicePadding.bottom() + st::msgServiceFont->height + st::msgServicePadding.top();
+			barTop = qMin(barTop, lowestInOneBunchItemBottom - barHeight);
+
+			// Call the template callback function that was passed
+			// and return if it finished everything it needed.
+			if (!method(view, itemtop, barTop)) {
+				return false;
+			}
+		}
+
+		// Forget the found bottom of the pack, search for the next one from scratch.
+		if (!view->isInOneBunchWithPrevious()) {
+			lowestInOneBunchItemBottom = -1;
+		}
+
+		return true;
+	};
+
+	enumerateItems<EnumItemsDirection::BottomToTop>(barCallback);
+}
+
+auto HistoryInner::computeRenderSelection(
 		not_null<const SelectedItems*> selected,
-		not_null<Element*> view) const {
+		not_null<Element*> view) const -> RenderSelectionState {
+	auto result = RenderSelectionState();
 	if (view->isHiddenByGroup()) {
-		return TextSelection();
+		return result;
 	}
 	const auto item = view->data();
 	const auto itemSelection = [&](not_null<HistoryItem*> item) {
-		auto i = selected->find(item);
-		if (i != selected->end()) {
-			return i->second;
-		}
-		return TextSelection();
+		return selected->contains(item);
 	};
-	const auto result = itemSelection(item);
-	if (result != TextSelection() && result != FullSelection) {
-		return result;
-	}
 	if (const auto group = session().data().groups().find(item)) {
-		auto parts = TextSelection();
 		auto allFullSelected = true;
+		if (group->items.front() != item) {
+			return result;
+		}
 		const auto count = int(group->items.size());
 		for (auto i = 0; i != count; ++i) {
-			const auto part = group->items[i];
-			const auto selection = itemSelection(part);
-			if (part == item
-				&& selection != FullSelection
-				&& selection != TextSelection()) {
-				return selection;
-			} else if (selection == FullSelection) {
-				parts = AddGroupItemSelection(parts, i);
+			if (itemSelection(group->items[i])) {
+				result.selection = AddGroupItemSelection(result.selection, i);
 			} else {
 				allFullSelected = false;
 			}
 		}
-		return allFullSelected ? FullSelection : parts;
+		if (allFullSelected) {
+			result.selection = FullSelection;
+			result.fullMessageSelected = true;
+		}
+		return result;
 	}
-	return itemSelection(item);
+	if (itemSelection(item)) {
+		result.selection = FullSelection;
+		result.fullMessageSelected = true;
+	}
+	return result;
 }
 
-TextSelection HistoryInner::itemRenderSelection(
+auto HistoryInner::itemRenderSelection(
 		not_null<Element*> view,
 		int selfromy,
-		int seltoy) const {
+		int seltoy) const -> RenderSelectionState {
+	auto result = RenderSelectionState();
 	const auto item = view->data();
 	const auto y = view->block()->y() + view->y();
 	if (y >= selfromy && y < seltoy) {
 		if (_dragSelecting && !item->isService() && item->isRegular()) {
-			return FullSelection;
+			result.selection = FullSelection;
+			result.fullMessageSelected = true;
 		}
+		return result;
 	} else if (!_selected.empty()) {
 		return computeRenderSelection(&_selected, view);
+	} else if (item == _selectedTextItem) {
+		result.selection = _selectedTextSelection.flatSelection();
+		result.messageSelection = &_selectedTextSelection;
+	}
+	return result;
+}
+
+bool HistoryInner::hasSelectedText() const {
+	return (_selectedTextItem != nullptr) && !hasSelectedItems();
+}
+
+void HistoryInner::clearTextSelection() {
+	if (_selectedTextItem) {
+		if (const auto view = viewByItem(_selectedTextItem)) {
+			repaintItem(view);
+		}
+		_selectedTextItem = nullptr;
+		_selectedTextSelection = MessageSelection();
+		_selectedText = TextForMimeData();
+	}
+}
+
+void HistoryInner::setTextSelection(
+		not_null<Element*> view,
+		MessageSelection selection) {
+	if (!selection.empty()) {
+		ClickHandler::unpressed();
+	}
+	if (!_selected.empty()) {
+		_selected.clear();
+		_widget->updateTopBarSelection();
+		_widget->update();
+	}
+	const auto item = view->data();
+	if (_selectedTextItem != item) {
+		clearTextSelection();
+		_selectedTextItem = item;
+	}
+	_selectedTextSelection = selection;
+	_selectedText = !selection.empty()
+		? view->selectedText(selection)
+		: TextForMimeData();
+	repaintItem(view);
+	if (!_wasSelectedText && !_selectedText.empty()) {
+		_wasSelectedText = true;
+		setFocus();
+	}
+}
+
+TextSelection HistoryInner::getSelectedTextRange(
+		not_null<HistoryItem*> item) const {
+	if (!hasSelectedText()) {
+		return TextSelection();
+	} else if (_selectedTextItem == item) {
+		return _selectedTextSelection.flatRangeForEdit();
+	} else if (const auto view = viewByItem(_selectedTextItem)) {
+		if (view->textItem() == item) {
+			return _selectedTextSelection.flatRangeForEdit();
+		}
 	}
 	return TextSelection();
 }
 
+auto HistoryInner::getSelectedTextSelection(
+		not_null<HistoryItem*> item) const -> MessageSelection {
+	return hasSelectedText() && (_selectedTextItem == item)
+		? _selectedTextSelection
+		: MessageSelection();
+}
+
+bool HistoryInner::isPressInSelectedText(
+		not_null<const Element*> view,
+		TextState state) const {
+	return (_selectedTextItem == _mouseActionItem)
+		&& hasSelectedText()
+		&& view->selectionContains(_selectedTextSelection, state);
+}
+
+auto HistoryInner::selectedItemsForExport() const
+-> std::vector<not_null<HistoryItem*>> {
+	auto result = std::vector<not_null<HistoryItem*>>();
+	result.reserve(_selected.size());
+	for (const auto &item : _selected) {
+		result.push_back(item);
+	}
+	ranges::sort(result, {}, [](not_null<HistoryItem*> item) {
+		return item->fullId();
+	});
+	return result;
+}
+
 void HistoryInner::paintEmpty(
 		Painter &p,
 		not_null<const Ui::ChatStyle*> st,
@@ -1005,6 +1355,7 @@ Ui::ChatPaintContext HistoryInner::preparePaintContext(
 		.visibleAreaPositionGlobal = visibleAreaPositionGlobal,
 		.visibleAreaTop = _visibleAreaTop,
 		.visibleAreaWidth = width(),
+		.visibleAreaHeight = _visibleAreaBottom - _visibleAreaTop,
 	});
 }
 
@@ -1017,8 +1368,12 @@ void HistoryInner::startEffectOnRead(not_null<HistoryItem*> item) {
 }
 
 void HistoryInner::paintEvent(QPaintEvent *e) {
-	if (_controller->contentOverlapped(this, e)
-		|| hasPendingResizedItems()) {
+	const auto overlapped = _controller->contentOverlapped(this, e);
+	const auto pendingResized = hasPendingResizedItems();
+	_readMetricsTracker->setScreenActive(!overlapped
+		&& !pendingResized
+		&& _widget->markingContentsRead());
+	if (overlapped || pendingResized) {
 		return;
 	} else if (_recountedAfterPendingResizedItems) {
 		_recountedAfterPendingResizedItems = false;
@@ -1043,7 +1398,10 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 			&& clip.y() + clip.height() > _aboutView->top) {
 			const auto top = _aboutView->top;
 			context.translate(0, -top);
-			context.selection = computeRenderSelection(&_selected, view);
+			const auto selection = computeRenderSelection(&_selected, view);
+			context.selection = selection.selection;
+			context.fullMessageSelected = selection.fullMessageSelected;
+			context.messageSelection = selection.messageSelection;
 			p.translate(0, top);
 			view->draw(p, context);
 			context.translate(0, top);
@@ -1062,6 +1420,10 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 	}
 
 	_translateTracker->startBunch();
+	const auto metricsStale = base::take(_readMetricsStale);
+	if (metricsStale) {
+		_readMetricsTracker->startBatch(_visibleAreaTop, _visibleAreaBottom);
+	}
 	auto readTill = (HistoryItem*)nullptr;
 	auto readContents = base::flat_set<not_null<HistoryItem*>>();
 	auto startEffects = base::flat_set<not_null<const Element*>>();
@@ -1070,6 +1432,9 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 		if (_pinnedItem) {
 			_translateTracker->add(_pinnedItem);
 		}
+		if (metricsStale) {
+			_readMetricsTracker->endBatch();
+		}
 		_translateTracker->finishBunch();
 		if (!startEffects.empty()) {
 			for (const auto &view : startEffects) {
@@ -1091,6 +1456,9 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 			int height) {
 		_translateTracker->add(view);
 		const auto item = view->data();
+		if (metricsStale && height > 0) {
+			_readMetricsTracker->push(item, top, height);
+		}
 		const auto isSponsored = item->isSponsored();
 		const auto isUnread = !item->out()
 			&& item->unread(_history)
@@ -1125,6 +1493,9 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 				readContents.insert(item);
 				_widget->enqueueMessageHighlight({ item });
 			}
+			if (item->hasUnreadPollVote()) {
+				readContents.insert(item);
+			}
 		}
 		session().data().reactions().poll(item, context.now);
 		if (item->hasUnpaidContent()) {
@@ -1161,10 +1532,13 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 			context.reactionInfo
 				= _reactionsManager->currentReactionPaintInfo();
 			context.outbg = view->hasOutLayout();
-			context.selection = itemRenderSelection(
+			const auto selection = itemRenderSelection(
 				view,
 				selfromy - mtop,
 				seltoy - mtop);
+			context.selection = selection.selection;
+			context.fullMessageSelected = selection.fullMessageSelected;
+			context.messageSelection = selection.messageSelection;
 			context.highlight = _widget->itemHighlight(view->data());
 			view->draw(p, context);
 			processPainted(view, top, height);
@@ -1193,12 +1567,32 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 		auto iItem = (_curHistory == _history ? _curItem : 0);
 		auto view = block->messages[iItem].get();
 		auto top = htop + block->y() + view->y();
+
+		auto nextGapIndex = 0;
+		auto collapseShift = 0;
+		for (; nextGapIndex < int(_collapseGaps.size()); ++nextGapIndex) {
+			const auto &gap = _collapseGaps[nextGapIndex];
+			if (top < gap.absY) break;
+			collapseShift += gap.height;
+		}
+		top += collapseShift;
+
 		context.clip = clip.intersected(
 			QRect(0, hdrawtop, width(), clip.top() + clip.height()));
 		context.translate(0, -top);
 		p.translate(0, top);
 		const auto &sendingAnimation = _controller->sendingAnimation();
 		while (top < drawToY) {
+			while (nextGapIndex < int(_collapseGaps.size())) {
+				const auto &gap = _collapseGaps[nextGapIndex];
+				if (top - collapseShift < gap.absY) break;
+				top += gap.height;
+				collapseShift += gap.height;
+				context.translate(0, -gap.height);
+				p.translate(0, gap.height);
+				++nextGapIndex;
+			}
+
 			const auto height = view->height();
 			const auto item = view->data();
 			if ((context.clip.y() < height)
@@ -1207,10 +1601,13 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 				context.reactionInfo
 					= _reactionsManager->currentReactionPaintInfo();
 				context.outbg = view->hasOutLayout();
-				context.selection = itemRenderSelection(
+				const auto selection = itemRenderSelection(
 					view,
 					selfromy - htop,
 					seltoy - htop);
+				context.selection = selection.selection;
+				context.fullMessageSelected = selection.fullMessageSelected;
+				context.messageSelection = selection.messageSelection;
 				context.highlight = _widget->itemHighlight(item);
 				view->draw(p, context);
 				processPainted(view, top, height);
@@ -1302,14 +1699,6 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 	const auto dateHeight = st::msgServicePadding.bottom()
 		+ st::msgServiceFont->height
 		+ st::msgServicePadding.top();
-	//QDate lastDate;
-	//if (!_history->isEmpty()) {
-	//	lastDate = _history->blocks.back()->messages.back()->data()->date.date();
-	//}
-
-	//// if item top is before this value always show date as a floating date
-	//int showFloatingBefore = height() - 2 * (_visibleAreaBottom - _visibleAreaTop) - dateHeight;
-
 	auto scrollDateOpacity = _scrollDateOpacity.value(_scrollDateShown ? 1. : 0.);
 	enumerateDates([&](not_null<Element*> view, int itemtop, int dateTop) {
 		// stop the enumeration if the date is above the painted rect
@@ -1323,21 +1712,13 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 			const auto correctDateTop = itemtop + st::msgServiceMargin.top();
 			dateInPlace = (dateTop < correctDateTop + dateHeight);
 		}
-		//bool noFloatingDate = (item->date.date() == lastDate && displayDate);
-		//if (noFloatingDate) {
-		//	if (itemtop < showFloatingBefore) {
-		//		noFloatingDate = false;
-		//	}
-		//}
 
 		// paint the date if it intersects the painted rect
 		if (dateTop < clip.top() + clip.height()) {
-			auto opacity = (dateInPlace/* || noFloatingDate*/) ? 1. : scrollDateOpacity;
+			auto opacity = dateInPlace ? 1. : scrollDateOpacity;
 			if (opacity > 0.) {
 				p.setOpacity(opacity);
-				const auto dateY = false // noFloatingDate
-					? itemtop
-					: (dateTop - st::msgServiceMargin.top());
+				const auto dateY = dateTop - st::msgServiceMargin.top();
 				if (const auto date = view->Get<HistoryView::DateBadge>()) {
 					date->paint(p, context.st, dateY, _contentWidth, _isChatWide);
 				} else {
@@ -1355,6 +1736,39 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 	});
 	p.setOpacity(1.);
 
+	enumerateForumThreadBars([&](not_null<Element*> view, int itemtop, int barTop) {
+		// stop the enumeration if the bar is above the painted rect
+		if (barTop + dateHeight <= clip.top()) {
+			return false;
+		}
+
+		const auto displayBar = view->displayForumThreadBar();
+		auto barInPlace = displayBar;
+		if (barInPlace) {
+			const auto correctBarTop = itemtop + view->displayedDateHeight() + st::msgServiceMargin.top();
+			barInPlace = (barTop < correctBarTop + st::msgServiceMargin.top());
+		}
+
+		// paint the bar if it intersects the painted rect
+		if (barTop < clip.top() + clip.height()) {
+			const auto barY = barTop - st::msgServiceMargin.top();
+			if (const auto bar = view->Get<HistoryView::ForumThreadBar>()) {
+				bar->paint(p, context.st, barY, _contentWidth, _isChatWide, !barInPlace);
+			} else {
+				_forumThreadBarWidth = HistoryView::ForumThreadBar::PaintForGetWidth(
+					p,
+					context.st,
+					view,
+					_forumThreadBarUserpicView,
+					barY,
+					_contentWidth,
+					_isChatWide);
+			}
+		}
+		return true;
+	});
+
+	_replyButtonManager->paint(p, context);
 	_reactionsManager->paint(p, context);
 }
 
@@ -1429,10 +1843,13 @@ HistoryInner::VideoUserpic *HistoryInner::validateVideoUserpic(
 
 void HistoryInner::onTouchScrollTimer() {
 	auto nowTime = crl::now();
-	if (_touchScrollState == Ui::TouchScrollState::Acceleration && _touchWaitingAcceleration && (nowTime - _touchAccelerationTime) > 40) {
+	if (_touchScrollState == Ui::TouchScrollState::Acceleration
+		&& _touchWaitingAcceleration
+		&& (nowTime - _touchAccelerationTime) > 40) {
 		_touchScrollState = Ui::TouchScrollState::Manual;
 		touchResetSpeed();
-	} else if (_touchScrollState == Ui::TouchScrollState::Auto || _touchScrollState == Ui::TouchScrollState::Acceleration) {
+	} else if (_touchScrollState == Ui::TouchScrollState::Auto
+		|| _touchScrollState == Ui::TouchScrollState::Acceleration) {
 		int32 elapsed = int32(nowTime - _touchTime);
 		QPoint delta = _touchSpeed * elapsed / 1000;
 		const auto consumedHorizontal = consumeScrollAction(delta);
@@ -1536,6 +1953,7 @@ void HistoryInner::touchEvent(QTouchEvent *e) {
 		_touchPrevPos = _touchPos;
 		_touchPos = e->touchPoints().cbegin()->screenPos().toPoint();
 	}
+	registerReadMetricsActivity();
 
 	switch (e->type()) {
 	case QEvent::TouchBegin: {
@@ -1596,7 +2014,7 @@ void HistoryInner::touchEvent(QTouchEvent *e) {
 		_touchInProgress = false;
 		const auto notMoved = (_touchPos - _touchStart).manhattanLength()
 			< QApplication::startDragDistance();
-		auto weak = Ui::MakeWeak(this);
+		auto weak = base::make_weak(this);
 		if (_touchSelect) {
 			if (notMoved || _touchMaybeSelecting.current()) {
 				mouseActionFinish(_touchPos, Qt::RightButton);
@@ -1639,11 +2057,21 @@ void HistoryInner::touchEvent(QTouchEvent *e) {
 void HistoryInner::mouseMoveEvent(QMouseEvent *e) {
 	static auto lastGlobalPosition = e->globalPos();
 	auto reallyMoved = (lastGlobalPosition != e->globalPos());
+	if (_middleClickAutoscroll.active()) {
+		if (reallyMoved) {
+			_mouseActive = true;
+			lastGlobalPosition = e->globalPos();
+		}
+		e->accept();
+		return;
+	}
 	auto buttonsPressed = (e->buttons() & (Qt::LeftButton | Qt::MiddleButton));
 	if (!buttonsPressed && _mouseAction != MouseAction::None) {
 		mouseReleaseEvent(e);
 	}
 	if (reallyMoved) {
+		_mouseActive = true;
+		registerReadMetricsActivity();
 		lastGlobalPosition = e->globalPos();
 		if (!buttonsPressed || (_scrollDateLink && ClickHandler::getPressed() == _scrollDateLink)) {
 			keepScrollDateForNow();
@@ -1669,9 +2097,7 @@ void HistoryInner::touchScrollUpdated(const QPoint &screenPos) {
 
 QPoint HistoryInner::mapPointToItem(QPoint p, const Element *view) const {
 	if (view) {
-		const auto top = itemTop(view);
-		p.setY(p.y() - top);
-		return p;
+		return p - QPoint(SelectionViewOffset(this, view), itemTop(view));
 	}
 	return QPoint();
 }
@@ -1685,11 +2111,34 @@ QPoint HistoryInner::mapPointToItem(
 	return QPoint();
 }
 
+not_null<HistoryItem*> HistoryInner::lookupItemByPoint(
+		QPoint point,
+		not_null<Element*> view) const {
+	return HistoryView::LookupItemByPoint(view, mapPointToItem(point, view));
+}
+
 void HistoryInner::mousePressEvent(QMouseEvent *e) {
 	if (_menu) {
 		e->accept();
 		return; // ignore mouse press, that was hiding context menu
 	}
+	if (_overlayHost) {
+		_overlayHost->handleClickOutside(e->pos());
+	}
+	if (_middleClickAutoscroll.active()) {
+		_middleClickAutoscroll.stop();
+		e->accept();
+		return;
+	}
+	if (e->button() == Qt::MiddleButton) {
+		mouseActionCancel();
+		ClickHandler::unpressed();
+		_middleClickAutoscroll.toggleOrBeginHold(e->globalPos());
+		e->accept();
+		return;
+	}
+	_mouseActive = true;
+	registerReadMetricsActivity();
 	mouseActionStart(e->globalPos(), e->button());
 }
 
@@ -1720,77 +2169,56 @@ void HistoryInner::mouseActionStart(const QPoint &screenPos, Qt::MouseButton but
 		&& (!Element::Hovered()
 			|| !Element::Hovered()->allowTextSelectionByHandler(pressed))) {
 		_mouseAction = MouseAction::PrepareDrag;
-	} else if (inSelectionMode().inSelectionMode) {
+	} else if (hasSelectedItems()) {
 		if (_dragStateItem
 			&& _selected.find(_dragStateItem) != _selected.cend()
 			&& Element::Hovered()) {
 			_mouseAction = MouseAction::PrepareDrag; // start items drag
-		} else if (!_pressWasInactive) {
+		} else if (!_pressWasInactive && !hasSelectRestriction()) {
 			_mouseAction = MouseAction::PrepareSelect; // start items select
 		}
 	}
 	if (_mouseAction == MouseAction::None && mouseActionView) {
 		TextState dragState;
-		if (_trippleClickTimer.isActive() && (screenPos - _trippleClickPoint).manhattanLength() < QApplication::startDragDistance()) {
-			StateRequest request;
-			request.flags = Ui::Text::StateRequest::Flag::LookupSymbol;
-			dragState = mouseActionView->textState(_dragStartPosition, request);
-			if (dragState.cursor == CursorState::Text) {
-				TextSelection selStatus = { dragState.symbol, dragState.symbol };
-				if (selStatus != FullSelection && (_selected.empty() || _selected.cbegin()->second != FullSelection)) {
-					if (!_selected.empty()) {
-						repaintItem(_selected.cbegin()->first);
-						_selected.clear();
-					}
-					_selected.emplace(_mouseActionItem, selStatus);
-					_mouseTextSymbol = dragState.symbol;
-					_mouseAction = MouseAction::Selecting;
-					_mouseSelectType = TextSelectType::Paragraphs;
-					mouseActionUpdate(_mousePosition);
-					_trippleClickTimer.callOnce(
-						QApplication::doubleClickInterval());
-				}
-			}
-		} else if (Element::Pressed()) {
-			StateRequest request;
-			request.flags = Ui::Text::StateRequest::Flag::LookupSymbol;
-			dragState = mouseActionView->textState(_dragStartPosition, request);
+		const auto validStartPoint = ((screenPos - _trippleClickPoint)
+			.manhattanLength() < QApplication::startDragDistance());
+		StateRequest request;
+		request.flags = Ui::Text::StateRequest::Flag::LookupSymbol;
+		dragState = mouseActionView->textState(_dragStartPosition, request);
+		if (_trippleClickTimer.isActive()
+			&& validStartPoint
+			&& dragState.cursor == CursorState::Text) {
+			_mouseTextAnchor = dragState;
+			_mouseSelectType = TextSelectType::Paragraphs;
+			setTextSelection(
+				mouseActionView,
+				mouseActionView->selectionFromStates(
+					_mouseTextAnchor,
+					dragState,
+					_mouseSelectType));
+			_mouseAction = MouseAction::Selecting;
+			mouseActionUpdate(_mousePosition);
+			_trippleClickTimer.callOnce(
+				QApplication::doubleClickInterval());
 		}
 		if (_mouseSelectType != TextSelectType::Paragraphs) {
 			if (Element::Pressed()) {
-				_mouseTextSymbol = dragState.symbol;
-				bool uponSelected = (dragState.cursor == CursorState::Text);
-				if (uponSelected) {
-					if (_selected.empty()
-						|| _selected.cbegin()->second == FullSelection
-						|| _selected.cbegin()->first != _mouseActionItem) {
-						uponSelected = false;
-					} else {
-						uint16 selFrom = _selected.cbegin()->second.from, selTo = _selected.cbegin()->second.to;
-						if (_mouseTextSymbol < selFrom || _mouseTextSymbol >= selTo) {
-							uponSelected = false;
-						}
-					}
-				}
-				if (uponSelected) {
+				if (isPressInSelectedText(mouseActionView, dragState)) {
 					_mouseAction = MouseAction::PrepareDrag; // start text drag
 				} else if (!_pressWasInactive) {
 					if (_mouseCursorState == CursorState::Date) {
 						_mouseAction = MouseAction::PrepareDrag; // start sticker drag or by-date drag
-					} else {
-						if (dragState.afterSymbol) ++_mouseTextSymbol;
-						TextSelection selStatus = { _mouseTextSymbol, _mouseTextSymbol };
-						if (selStatus != FullSelection && (_selected.empty() || _selected.cbegin()->second != FullSelection)) {
-							if (!_selected.empty()) {
-								repaintItem(_selected.cbegin()->first);
-								_selected.clear();
-							}
-							_selected.emplace(_mouseActionItem, selStatus);
-							_mouseAction = MouseAction::Selecting;
-							repaintItem(_mouseActionItem);
-						} else if (!hasSelectRestriction()) {
-							_mouseAction = MouseAction::PrepareSelect;
-						}
+					} else if (!hasSelectedItems()) {
+						_mouseTextAnchor = dragState;
+						setTextSelection(
+							mouseActionView,
+							mouseActionView->selectionFromStates(
+								_mouseTextAnchor,
+								dragState,
+								_mouseSelectType));
+						_mouseAction = MouseAction::Selecting;
+					} else if (!hasSelectRestriction()) {
+						_mouseAction = MouseAction::PrepareSelect;
 					}
 				}
 			} else if (!_pressWasInactive && !hasSelectRestriction()) {
@@ -1810,8 +2238,10 @@ void HistoryInner::mouseActionCancel() {
 	_mouseActionItem = nullptr;
 	_dragStateItem = nullptr;
 	_mouseAction = MouseAction::None;
+	_mouseTextAnchor = TextState();
 	_dragStartPosition = QPoint(0, 0);
 	_dragSelFrom = _dragSelTo = nullptr;
+	_dragSelecting = false;
 	_wasSelectedText = false;
 	_selectScroll.cancel();
 }
@@ -1830,26 +2260,14 @@ std::unique_ptr<QMimeData> HistoryInner::prepareDrag() {
 	const auto pressedView = viewByItem(_mouseActionItem);
 	bool uponSelected = false;
 	if (pressedView) {
-		if (!_selected.empty() && _selected.cbegin()->second == FullSelection) {
+		if (hasSelectedItems()) {
 			uponSelected = _mouseActionItem
 				&& (_selected.find(_mouseActionItem) != _selected.cend());
 		} else {
 			StateRequest request;
 			request.flags |= Ui::Text::StateRequest::Flag::LookupSymbol;
 			auto dragState = pressedView->textState(_dragStartPosition, request);
-			uponSelected = (dragState.cursor == CursorState::Text);
-			if (uponSelected) {
-				if (_selected.empty()
-					|| _selected.cbegin()->second == FullSelection
-					|| _selected.cbegin()->first != _mouseActionItem) {
-					uponSelected = false;
-				} else {
-					uint16 selFrom = _selected.cbegin()->second.from, selTo = _selected.cbegin()->second.to;
-					if (dragState.symbol < selFrom || dragState.symbol >= selTo) {
-						uponSelected = false;
-					}
-				}
-			}
+			uponSelected = isPressInSelectedText(pressedView, dragState);
 		}
 	}
 	auto urls = QList<QUrl>();
@@ -1906,6 +2324,7 @@ std::unique_ptr<QMimeData> HistoryInner::prepareDrag() {
 			}
 		}
 
+		auto photoData = HistoryView::PhotoDragData();
 		if (pressedHandler) {
 			const auto lnkDocument = reinterpret_cast<DocumentData*>(
 				pressedHandler->property(
@@ -1916,9 +2335,17 @@ std::unique_ptr<QMimeData> HistoryInner::prepareDrag() {
 					urls.push_back(QUrl::fromLocalFile(filepath));
 				}
 			}
+			const auto lnkPhoto = reinterpret_cast<PhotoData*>(
+				pressedHandler->property(
+					kPhotoLinkMediaProperty).toULongLong());
+			if (lnkPhoto) {
+				photoData = HistoryView::PreparePhotoDragData(lnkPhoto);
+			}
 		}
 
-		if (forwardIds.empty() && urls.isEmpty()) {
+		if (forwardIds.empty()
+			&& urls.isEmpty()
+			&& photoData.image.isNull()) {
 			return nullptr;
 		}
 
@@ -1930,6 +2357,9 @@ std::unique_ptr<QMimeData> HistoryInner::prepareDrag() {
 		if (!urls.isEmpty()) {
 			result->setUrls(urls);
 		}
+		HistoryView::FillDragMimeWithPhoto(
+			result.get(),
+			std::move(photoData));
 		return result;
 	}
 	return nullptr;
@@ -1939,6 +2369,7 @@ void HistoryInner::performDrag() {
 	if (auto mimeData = prepareDrag()) {
 		// This call enters event loop and can destroy any QObject.
 		_reactionsManager->updateButton({});
+		_replyButtonManager->updateButton({});
 		_controller->widget()->launchDrag(
 			std::move(mimeData),
 			crl::guard(this, [=] { mouseActionUpdate(QCursor::pos()); }));
@@ -1957,6 +2388,12 @@ void HistoryInner::itemRemoved(not_null<const HistoryItem*> item) {
 	}
 	_animatedStickersPlayed.remove(item);
 	_reactionsManager->remove(item->fullId());
+	_replyButtonManager->remove(item->fullId());
+
+	if (_selectedTextItem == item) {
+		clearTextSelection();
+		_widget->updateTopBarSelection();
+	}
 
 	auto i = _selected.find(item);
 	if (i != _selected.cend()) {
@@ -1984,6 +2421,9 @@ void HistoryInner::itemRemoved(not_null<const HistoryItem*> item) {
 }
 
 void HistoryInner::viewRemoved(not_null<const Element*> view) {
+	if (_overlayHost) {
+		_overlayHost->viewGone(view);
+	}
 	const auto refresh = [&](auto &saved) {
 		if (saved == view) {
 			const auto now = viewByItem(view->data());
@@ -2000,32 +2440,36 @@ void HistoryInner::mouseActionFinish(
 		Qt::MouseButton button) {
 	mouseActionUpdate(screenPos);
 
-	auto activated = ClickHandler::unpressed();
-	if (_mouseAction == MouseAction::Dragging) {
-		activated = nullptr;
-	} else if (_mouseActionItem) {
-		// if we are in selecting items mode perhaps we want to
-		// toggle selection instead of activating the pressed link
-		if (_mouseAction == MouseAction::PrepareDrag
-			&& !_pressWasInactive
-			&& inSelectionMode().inSelectionMode
-			&& button != Qt::RightButton) {
-			if (const auto view = viewByItem(_mouseActionItem)) {
-				if (view->toggleSelectionByHandlerClick(activated)) {
-					activated = nullptr;
-				}
-			}
+	const auto toggleByHandler = [&](const ClickHandlerPtr &handler) {
+		if (const auto view = viewByItem(_mouseActionItem)) {
+			return view->toggleSelectionByHandlerClick(handler);
 		}
-	}
+		return false;
+	};
+
+	auto activated = ClickHandler::unpressed();
 	const auto pressedItemView = Element::Pressed();
 	if (pressedItemView) {
 		repaintItem(pressedItemView);
 		Element::Pressed(nullptr);
 	}
 
+	const auto simpleSelectionChange = _mouseActionItem
+		&& !_pressWasInactive
+		&& (button != Qt::RightButton)
+		&& (_mouseAction == MouseAction::PrepareSelect
+			|| _mouseAction == MouseAction::PrepareDrag);
+	const auto needItemSelectionToggle = simpleSelectionChange
+		&& (!activated || toggleByHandler(activated))
+		&& hasSelectedItems();
+	const auto needTextSelectionClear = simpleSelectionChange
+		&& hasSelectedText();
+
 	_wasSelectedText = false;
 
-	if (activated) {
+	if (_mouseAction == MouseAction::Dragging || needItemSelectionToggle) {
+		activated = nullptr;
+	} else if (activated) {
 		const auto pressedItemId = pressedItemView
 			? pressedItemView->data()->fullId()
 			: _mouseActionItem
@@ -2039,7 +2483,45 @@ void HistoryInner::mouseActionFinish(
 			prepareClickContext(button, pressedItemId));
 		return;
 	}
-	if ((_mouseAction == MouseAction::PrepareSelect)
+	if (needItemSelectionToggle) {
+		clearTextSelection();
+		const auto pointState = Element::Moused()
+			? Element::Moused()->pointState(
+				mapPointToItem(
+					mapFromGlobal(_mousePosition),
+					Element::Moused()))
+			: HistoryView::PointState::Outside;
+		if (pointState == HistoryView::PointState::GroupPart) {
+			const auto exactItem = _dragStateItem
+				? _dragStateItem
+				: _mouseActionItem;
+			if (exactItem
+				&& !exactItem->isService()
+				&& exactItem->isRegular()) {
+				changeSelection(
+					&_selected,
+					exactItem,
+					SelectAction::Invert);
+				repaintItem(_mouseActionItem);
+			} else {
+				_selected.clear();
+				update();
+			}
+		} else if (_mouseActionItem
+			&& !_mouseActionItem->isService()
+			&& _mouseActionItem->isRegular()) {
+			changeSelectionAsGroup(
+				&_selected,
+				_mouseActionItem,
+				SelectAction::Invert);
+			repaintItem(_mouseActionItem);
+		} else {
+			_selected.clear();
+			update();
+		}
+	} else if (needTextSelectionClear) {
+		clearTextSelection();
+	} else if ((_mouseAction == MouseAction::PrepareSelect)
 		&& !_pressWasInactive
 		&& inSelectionMode().inSelectionMode) {
 		changeSelectionAsGroup(
@@ -2047,34 +2529,25 @@ void HistoryInner::mouseActionFinish(
 			_mouseActionItem,
 			SelectAction::Invert);
 		repaintItem(_mouseActionItem);
-	} else if ((_mouseAction == MouseAction::PrepareDrag)
-		&& !_pressWasInactive
+	} else if (simpleSelectionChange
+		&& _mouseCursorState == CursorState::Date
+		&& !hasSelectRestriction()
 		&& _dragStateItem
-		&& (button != Qt::RightButton)) {
-		auto i = _selected.find(_dragStateItem);
-		if (i != _selected.cend() && i->second == FullSelection) {
-			_selected.erase(i);
-			repaintItem(_mouseActionItem);
-		} else if ((i == _selected.cend())
-			&& !_dragStateItem->isService()
-			&& _dragStateItem->isRegular()
-			&& inSelectionMode().inSelectionMode) {
-			if (_selected.size() < MaxSelectedItems) {
-				_selected.emplace(_dragStateItem, FullSelection);
-				repaintItem(_mouseActionItem);
-			}
-		} else {
-			_selected.clear();
-			update();
-		}
+		&& _dragStateItem->isRegular()
+		&& !_dragStateItem->isService()) {
+		clearTextSelection();
+		changeSelectionAsGroup(
+			&_selected,
+			_dragStateItem,
+			SelectAction::Select);
+		repaintItem(_mouseActionItem);
 	} else if (_mouseAction == MouseAction::Selecting) {
 		if (_dragSelFrom && _dragSelTo) {
 			applyDragSelection();
 			_dragSelFrom = _dragSelTo = nullptr;
-		} else if (!_selected.empty() && !_pressWasInactive) {
-			auto sel = _selected.cbegin()->second;
-			if (sel != FullSelection && sel.from == sel.to) {
-				_selected.clear();
+		} else if (_selectedTextItem && !_pressWasInactive) {
+			if (_selectedTextSelection.empty()) {
+				clearTextSelection();
 				_controller->widget()->setInnerFocus();
 			}
 		}
@@ -2082,23 +2555,37 @@ void HistoryInner::mouseActionFinish(
 	_mouseAction = MouseAction::None;
 	_mouseActionItem = nullptr;
 	_mouseSelectType = TextSelectType::Letters;
+	_mouseTextAnchor = TextState();
 	_selectScroll.cancel();
 	_widget->updateTopBarSelection();
 
 	if (QGuiApplication::clipboard()->supportsSelection()
-		&& !_selected.empty()
-		&& _selected.cbegin()->second != FullSelection
-		&& !hasCopyRestriction(_selected.cbegin()->first)) {
-		const auto &[item, selection] = *_selected.cbegin();
-		if (const auto view = viewByItem(item)) {
+		&& hasSelectedText()
+		&& !_selectedTextSelection.empty()
+		&& _selectedTextItem
+		&& !hasCopyRestriction(_selectedTextItem)) {
+		if (const auto view = viewByItem(_selectedTextItem)) {
+			TextUtilities::SetClipboardText(
+				view->selectedText(_selectedTextSelection),
+				QClipboard::Selection);
+		} else if (!_selectedText.empty()) {
 			TextUtilities::SetClipboardText(
-				view->selectedText(selection),
+				_selectedText,
 				QClipboard::Selection);
 		}
 	}
 }
 
 void HistoryInner::mouseReleaseEvent(QMouseEvent *e) {
+	if (_middleClickAutoscroll.finishHold(e->button())) {
+		e->accept();
+		return;
+	}
+	if (_middleClickAutoscroll.active()) {
+		e->accept();
+		return;
+	}
+	registerReadMetricsActivity();
 	mouseActionFinish(e->globalPos(), e->button());
 	if (!rect().contains(e->pos())) {
 		leaveEvent(e);
@@ -2106,31 +2593,28 @@ void HistoryInner::mouseReleaseEvent(QMouseEvent *e) {
 }
 
 void HistoryInner::mouseDoubleClickEvent(QMouseEvent *e) {
+	registerReadMetricsActivity();
 	mouseActionStart(e->globalPos(), e->button());
 
 	const auto mouseActionView = viewByItem(_mouseActionItem);
 	if (_mouseSelectType == TextSelectType::Letters
 		&& mouseActionView
-		&& ((_mouseAction == MouseAction::Selecting
-			&& !_selected.empty()
-			&& _selected.cbegin()->second != FullSelection)
-			|| (_mouseAction == MouseAction::None
-				&& (_selected.empty()
-					|| _selected.cbegin()->second != FullSelection)))) {
+		&& ((_mouseAction == MouseAction::Selecting && hasSelectedText())
+			|| (_mouseAction == MouseAction::None && !hasSelectedItems()))) {
 		StateRequest request;
 		request.flags |= Ui::Text::StateRequest::Flag::LookupSymbol;
 		auto dragState = mouseActionView->textState(_dragStartPosition, request);
 		if (dragState.cursor == CursorState::Text) {
-			_mouseTextSymbol = dragState.symbol;
+			_mouseTextAnchor = dragState;
 			_mouseSelectType = TextSelectType::Words;
 			if (_mouseAction == MouseAction::None) {
 				_mouseAction = MouseAction::Selecting;
-				TextSelection selStatus = { dragState.symbol, dragState.symbol };
-				if (!_selected.empty()) {
-					repaintItem(_selected.cbegin()->first);
-					_selected.clear();
-				}
-				_selected.emplace(_mouseActionItem, selStatus);
+				setTextSelection(
+					mouseActionView,
+					mouseActionView->selectionFromStates(
+						_mouseTextAnchor,
+						dragState,
+						_mouseSelectType));
 			}
 			mouseMoveEvent(e);
 
@@ -2163,11 +2647,11 @@ void HistoryInner::mouseDoubleClickEvent(QMouseEvent *e) {
 void HistoryInner::toggleFavoriteReaction(not_null<Element*> view) const {
 	const auto item = view->data();
 	const auto favorite = session().data().reactions().favoriteId();
-	if (!ranges::contains(
+	if (Window::ShowReactPremiumError(_controller, item, favorite)
+		|| !ranges::contains(
 			Data::LookupPossibleReactions(item).recent,
 			favorite,
-			&Data::Reaction::id)
-		|| Window::ShowReactPremiumError(_controller, item, favorite)) {
+			&Data::Reaction::id)) {
 		return;
 	} else if (!ranges::contains(item->chosenReactions(), favorite)) {
 		if (const auto top = itemTop(view); top >= 0) {
@@ -2179,16 +2663,14 @@ void HistoryInner::toggleFavoriteReaction(not_null<Element*> view) const {
 
 HistoryView::SelectedQuote HistoryInner::selectedQuote(
 		not_null<HistoryItem*> item) const {
-	if (_selected.size() != 1
-		|| _selected.begin()->first != item
-		|| _selected.begin()->second == FullSelection) {
+	if (!hasSelectedText() || _selectedTextItem != item) {
 		return {};
 	}
 	const auto view = item->mainView();
 	if (!view) {
 		return {};
 	}
-	return view->selectedQuote(_selected.begin()->second);
+	return view->selectedQuote(_selectedTextSelection);
 }
 
 void HistoryInner::contextMenuEvent(QContextMenuEvent *e) {
@@ -2198,10 +2680,16 @@ void HistoryInner::contextMenuEvent(QContextMenuEvent *e) {
 void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	if (e->reason() == QContextMenuEvent::Mouse) {
 		mouseActionUpdate(e->globalPos());
+	} else if (e->reason() == QContextMenuEvent::Keyboard) {
+		if (_accessibilityFocusedItem) {
+			_dragStateItem = _accessibilityFocusedItem;
+		}
 	}
 
 	const auto link = ClickHandler::getActive();
-	if (link
+	if (_controller->showFrozenError()) {
+		return;
+	} else if (link
 		&& !link->property(
 			kSendReactionEmojiProperty).value<Data::ReactionId>().empty()
 		&& _reactionsManager->showContextMenu(
@@ -2209,33 +2697,54 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			e,
 			session().data().reactions().favoriteId())) {
 		return;
+	} else if (link && link->property(kFastShareProperty).value<bool>()) {
+		if (const auto item = _dragStateItem) {
+			const auto view = viewByItem(item);
+			const auto rightSize = view->rightActionSize().value_or(QSize());
+			const auto reactionsSkip = view->embedReactionsInBubble()
+				? 0
+				: view->reactionButtonParameters({}, {}).reactionsHeight;
+			const auto top = itemTop(view)
+				+ view->height()
+				- reactionsSkip
+				- _visibleAreaTop
+				- rightSize.height();
+			const auto right = rect::right(view->innerGeometry())
+				- st::historyFastShareLeft
+				- rightSize.width();
+			HistoryView::ShowTopPeersSelector(
+				this,
+				_controller->uiShow(),
+				item->fullId(),
+				parentWidget()->mapToGlobal(QPoint(right, top)));
+			return;
+		}
 	}
 	auto selectedState = getSelectionState();
 
 	// -2 - has full selected items, but not over, -1 - has selection, but no over, 0 - no selection, 1 - over text, 2 - over full selected items
 	auto isUponSelected = 0;
 	auto hasSelected = 0;
-	if (!_selected.empty()) {
+	if (hasSelectedItems()) {
+		hasSelected = 2;
+		if (_dragStateItem && _selected.contains(_dragStateItem)) {
+			isUponSelected = 2;
+		} else {
+			isUponSelected = -2;
+		}
+	} else if (hasSelectedText()) {
 		isUponSelected = -1;
-		if (_selected.cbegin()->second == FullSelection) {
-			hasSelected = 2;
-			if (_dragStateItem && _selected.find(_dragStateItem) != _selected.cend()) {
-				isUponSelected = 2;
-			} else {
-				isUponSelected = -2;
-			}
-		} else if (Element::Moused()
+		hasSelected = _selectedTextSelection.empty() ? 0 : 1;
+		if (Element::Moused()
 			&& Element::Moused() == Element::Hovered()
-			&& _selected.cbegin()->first == Element::Moused()->data()) {
-			uint16 selFrom = _selected.cbegin()->second.from, selTo = _selected.cbegin()->second.to;
-			hasSelected = (selTo > selFrom) ? 1 : 0;
+			&& _selectedTextItem == Element::Moused()->data()) {
 			auto mousePos = mapPointToItem(mapFromGlobal(_mousePosition), Element::Moused());
 			StateRequest request;
 			request.flags |= Ui::Text::StateRequest::Flag::LookupSymbol;
 			auto dragState = Element::Moused()->textState(mousePos, request);
-			if (dragState.cursor == CursorState::Text
-				&& dragState.symbol >= selFrom
-				&& dragState.symbol < selTo) {
+			if (Element::Moused()->selectionContains(
+					_selectedTextSelection,
+					dragState)) {
 				isUponSelected = 1;
 			}
 		}
@@ -2252,31 +2761,113 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		}
 		return item;
 	};
-	const auto whoReactedItem = groupLeaderOrSelf(_dragStateItem);
-	const auto hasWhoReactedItem = whoReactedItem
-		&& Api::WhoReactedExists(whoReactedItem, Api::WhoReactedList::All);
-	const auto clickedReaction = link
-		? link->property(
-			kReactionsCountEmojiProperty).value<Data::ReactionId>()
-		: Data::ReactionId();
+	const auto leaderOrSelf = groupLeaderOrSelf(_dragStateItem);
+	const auto hasWhoReactedItem = leaderOrSelf
+		&& Api::WhoReactedExists(leaderOrSelf, Api::WhoReactedList::All);
+	using namespace HistoryView::Reactions;
+	const auto clickedReaction = ReactionIdOfLink(link);
+	const auto linkPhoneNumber = link
+		? link->property(kPhoneNumberLinkProperty).toString()
+		: QString();
+	const auto linkUserpicPeerId = (link && _dragStateUserpic)
+		? link->property(kPeerLinkPeerIdProperty).toULongLong()
+		: 0;
+	const auto todoListTaskId = link
+		? link->property(kTodoListItemIdProperty).toInt()
+		: 0;
+	const auto pollOptionLink = link
+		? link->property(kPollOptionProperty).toByteArray()
+		: QByteArray();
+	const auto session = &this->session();
 	_whoReactedMenuLifetime.destroy();
-	if (!clickedReaction.empty()
-		&& whoReactedItem
-		&& Api::WhoReactedExists(whoReactedItem, Api::WhoReactedList::One)) {
-		HistoryView::ShowWhoReactedMenu(
-			&_menu,
-			e->globalPos(),
-			this,
-			whoReactedItem,
-			clickedReaction,
-			_controller,
-			_whoReactedMenuLifetime);
-		e->accept();
+	if (!clickedReaction.empty() && leaderOrSelf) {
+		if (clickedReaction.paid()) {
+			Payments::ShowPaidReactionDetails(
+				_controller,
+				leaderOrSelf,
+				viewByItem(leaderOrSelf),
+				HistoryReactionSource::Selector);
+			e->accept();
+			return;
+		} else if (Api::WhoReactedExists(
+				leaderOrSelf,
+				Api::WhoReactedList::One)) {
+			HistoryView::ShowWhoReactedMenu(
+				&_menu,
+				e->globalPos(),
+				this,
+				leaderOrSelf,
+				clickedReaction,
+				_controller,
+				_whoReactedMenuLifetime);
+			e->accept();
+			return;
+		} else if (HistoryView::ShowReactionPreview(
+				_controller,
+				leaderOrSelf->fullId(),
+				clickedReaction)) {
+			return;
+		}
+	}
+	if (!linkPhoneNumber.isEmpty()) {
+		PhoneClickHandler(session, linkPhoneNumber).onClick(
+			prepareClickContext(
+				Qt::LeftButton,
+				_dragStateItem ? _dragStateItem->fullId() : FullMsgId()));
 		return;
 	}
 	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
-	const auto session = &this->session();
+	if (linkUserpicPeerId) {
+		_widget->fillSenderUserpicMenu(
+			_menu.get(),
+			session->data().peer(PeerId(linkUserpicPeerId)));
+		Window::AddSenderUserpicModerateAction(
+			_controller,
+			[&] {
+				auto moderateItem = _dragStateItem;
+				const auto contextY = mapFromGlobal(e->globalPos()).y();
+				enumerateItems<EnumItemsDirection::TopToBottom>(
+					[&](not_null<Element*> view, int top, int bottom) {
+						if (bottom <= contextY) {
+							return true;
+						} else if (top > contextY) {
+							return false;
+						}
+						const auto item = view->data();
+						if (item->from()->id == PeerId(linkUserpicPeerId)) {
+							moderateItem = item;
+						}
+						return false;
+					});
+				return moderateItem;
+			}(),
+			Ui::Menu::CreateAddActionCallback(_menu.get()));
+		if (_menu->empty()) {
+			_menu = nullptr;
+		} else {
+			_menu->setForcedOrigin(Ui::PanelAnimation::Origin::BottomLeft);
+			_menu->popup(e->globalPos());
+			e->accept();
+		}
+		return;
+	}
 	const auto controller = _controller;
+	const auto canViewMessageStats = [&](HistoryItem *item) {
+		if (!item
+			|| item->isService()
+			|| !peerIsChannel(item->fullId().peer)
+			|| _peer->isMegagroup()) {
+			return false;
+		}
+		const auto channel = _peer->asChannel();
+		if (!channel) {
+			return false;
+		}
+		constexpr auto kMinViewsCount = 10;
+		return ((channel->flags() & ChannelDataFlag::CanGetStatistics)
+			|| (channel->canPostMessages()
+				&& item->viewsCount() >= kMinViewsCount));
+	};
 	const auto addItemActions = [&](
 			HistoryItem *item,
 			HistoryItem *albumPartItem) {
@@ -2325,11 +2916,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			const auto editItemId = editItem->fullId();
 			_menu->addAction(tr::lng_context_edit_msg(tr::now), [=] {
 				if (const auto item = session->data().message(editItemId)) {
-					auto it = _selected.find(item);
-					const auto selection = ((it != _selected.end())
-							&& (it->second != FullSelection))
-						? it->second
-						: TextSelection();
+					const auto selection = getSelectedTextRange(item);
 					if (!selection.empty()) {
 						clearSelected(true);
 					}
@@ -2361,24 +2948,16 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				Window::ToggleMessagePinned(controller, pinItemId, !isPinned);
 			}), isPinned ? &st::menuIconUnpin : &st::menuIconPin);
 		}
-		if (!item->isService()
-			&& peerIsChannel(itemId.peer)
-			&& !_peer->isMegagroup()) {
-			constexpr auto kMinViewsCount = 10;
-			if (const auto channel = _peer->asChannel()) {
-				if ((channel->flags() & ChannelDataFlag::CanGetStatistics)
-					|| (channel->canPostMessages()
-						&& item->viewsCount() >= kMinViewsCount)) {
-					auto callback = crl::guard(controller, [=] {
-						controller->showSection(
-							Info::Statistics::Make(channel, itemId, {}));
-					});
-					_menu->addAction(
-						tr::lng_stats_title(tr::now),
-						std::move(callback),
-						&st::menuIconStats);
-				}
-			}
+		if (canViewMessageStats(item)) {
+			const auto channel = _peer->asChannel();
+			auto callback = crl::guard(controller, [=] {
+				controller->showSection(
+					Info::Statistics::Make(channel, itemId, {}));
+			});
+			_menu->addAction(
+				tr::lng_stats_title(tr::now),
+				std::move(callback),
+				&st::menuIconStats);
 		}
 	};
 	const auto addPhotoActions = [&](not_null<PhotoData*> photo, HistoryItem *item) {
@@ -2400,6 +2979,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			}, &st::menuIconStickers);
 		}
 	};
+	auto rateTranscriptionItem = (HistoryItem*)(nullptr);
 	const auto addDocumentActions = [&](not_null<DocumentData*> document, HistoryItem *item) {
 		if (document->loading()) {
 			_menu->addAction(tr::lng_context_cancel_download(tr::now), [=] {
@@ -2408,9 +2988,6 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			return;
 		}
 		const auto itemId = item ? item->fullId() : FullMsgId();
-		const auto lnkIsVideo = document->isVideoFile();
-		const auto lnkIsVoice = document->isVoiceMessage();
-		const auto lnkIsAudio = document->isAudioFile();
 		if (document->isGifv()) {
 			const auto notAutoplayedGif = [&] {
 				return item
@@ -2443,10 +3020,11 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				item,
 				document,
 				controller);
-			_menu->addAction(lnkIsVideo ? tr::lng_context_save_video(tr::now) : (lnkIsVoice ? tr::lng_context_save_audio(tr::now) : (lnkIsAudio ? tr::lng_context_save_audio_file(tr::now) : tr::lng_context_save_file(tr::now))), base::fn_delayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this, [=] {
-				saveDocumentToFile(itemId, document);
-			}), &st::menuIconDownload);
-
+			HistoryView::AddSaveDocumentAction(
+				Ui::Menu::CreateAddActionCallback(_menu),
+				item,
+				document,
+				controller);
 			HistoryView::AddCopyFilename(
 				_menu,
 				document,
@@ -2459,6 +3037,11 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					document);
 			}, &st::menuIconStickers);
 		}
+		if (item
+			&& (document->isVoiceMessage() || document->isVideoMessage())
+			&& Menu::HasRateTranscribeItem(item)) {
+			rateTranscriptionItem = item;
+		}
 	};
 
 #ifdef _DEBUG // Sometimes we need to save emoji to files.
@@ -2469,6 +3052,14 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				if (const auto sticker = emojiStickers->stickerForEmoji(
 						isolated)) {
 					addDocumentActions(sticker.document, item);
+				} else if (v::is<QString>(isolated.items.front())
+					&& v::is_null(isolated.items[1])) {
+					const auto id = v::get<QString>(isolated.items.front());
+					const auto docId = id.toULongLong();
+					const auto document = session->data().document(docId);
+					if (document->sticker()) {
+						addDocumentActions(document, item);
+					}
 				}
 			}
 		}
@@ -2489,9 +3080,13 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			const auto itemId = item->fullId();
 			_menu->addAction(tr::lng_context_select_msg(tr::now), [=] {
 				if (const auto item = session->data().message(itemId)) {
-					if (const auto view = viewByItem(item)) {
+					if ([[maybe_unused]] const auto view = viewByItem(item)) {
+						clearTextSelection();
 						if (asGroup) {
-							changeSelectionAsGroup(&_selected, item, SelectAction::Select);
+							changeSelectionAsGroup(
+								&_selected,
+								item,
+								SelectAction::Select);
 						} else {
 							changeSelection(&_selected, item, SelectAction::Select);
 						}
@@ -2539,7 +3134,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				auto nearestItem = (HistoryItem*)(nullptr);
 				{
 					auto minDiff = std::numeric_limits<int>::max();
-					for (const auto &[item, _] : _selected) {
+					for (const auto &item : _selected) {
 						const auto diff = item->fullId().msg.bare
 							- toItem->fullId().msg.bare;
 						if (std::abs(diff) < minDiff) {
@@ -2592,40 +3187,62 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		const auto canReply = canSendReply || item->allowsForward();
 		if (canReply) {
 			const auto selected = selectedQuote(item);
-			auto text = selected
-				? tr::lng_context_quote_and_reply(tr::now)
-				: tr::lng_context_reply_msg(tr::now);
+			auto text = (selected
+				? tr::lng_context_quote_and_reply
+				: todoListTaskId
+				? tr::lng_context_reply_to_task
+				: tr::lng_context_reply_msg)(
+					tr::now,
+					Ui::Text::FixAmpersandInAction);
 			const auto replyToItem = selected.item ? selected.item : item;
 			const auto itemId = replyToItem->fullId();
-			const auto quote = selected.text;
-			const auto quoteOffset = selected.offset;
-			text.replace('&', u"&&"_q);
-			_menu->addAction(text, [=] {
-				const auto still = session->data().message(itemId);
-				const auto forceAnotherChat = base::IsCtrlPressed()
-					&& still
-					&& still->allowsForward();
-				if (canSendReply && !forceAnotherChat) {
-					_widget->replyToMessage({
-						.messageId = itemId,
-						.quote = quote,
-						.quoteOffset = quoteOffset,
-					});
-					if (!quote.empty()) {
-						_widget->clearSelected();
-					}
-				} else {
-					const auto show = controller->uiShow();
-					HistoryView::Controls::ShowReplyToChatBox(show, {
-						.messageId = itemId,
-						.quote = quote,
-						.quoteOffset = quoteOffset,
-					});
+			_menu->addAction(std::move(text), [=] {
+				_widget->replyToMessage({
+					.messageId = itemId,
+					.quote = selected.highlight.quote,
+					.quoteOffset = selected.highlight.quoteOffset,
+					.todoItemId = todoListTaskId,
+				});
+				if (!selected.highlight.quote.empty()) {
+					_widget->clearSelected();
 				}
 			}, &st::menuIconReply);
+			const auto media = item->media();
+			const auto document = media
+				? media->document()
+				: nullptr;
+			if (canSendReply && document && document->isVoiceMessage()) {
+				const auto msgId = item->fullId();
+				if (const auto t = HistoryView::CurrentVoiceTimecode(msgId)) {
+					Menu::AddTimecodeAction(
+						_menu.get(),
+						*t,
+						HistoryView::VoiceTimecodeUpdates(msgId),
+						[=] {
+							const auto cur
+								= HistoryView::CurrentVoiceTimecode(msgId);
+							_widget->replyToMessage({ .messageId = msgId });
+							_widget->insertTextAtCursor(cur.value_or(*t));
+						});
+				}
+			}
 		}
 	};
 
+	const auto addTodoListAction = [&](HistoryItem *item) {
+		if (!item || !Window::PeerMenuShowAddTodoListTasks(item)) {
+			return;
+		}
+		const auto itemId = item->fullId();
+		_menu->addAction(
+			tr::lng_todo_add_title(tr::now),
+			crl::guard(this, [=] {
+				if (const auto item = session->data().message(itemId)) {
+					Window::PeerMenuAddTodoListTasks(_controller, item);
+				}
+			}),
+			&st::menuIconAdd);
+	};
 	const auto lnkPhoto = link
 		? reinterpret_cast<PhotoData*>(
 			link->property(kPhotoLinkMediaProperty).toULongLong())
@@ -2687,7 +3304,11 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				}, &st::menuIconDelete);
 			}
 			if (selectedState.count > 0 && !hasCopyRestrictionForSelected()) {
-				Menu::AddDownloadFilesAction(_menu, controller, _selected, this);
+				Menu::AddDownloadFilesAction(
+					_menu,
+					controller,
+					selectedItemsForExport(),
+					this);
 			}
 			_menu->addAction(tr::lng_context_clear_selection(tr::now), [=] {
 				_widget->clearSelected();
@@ -2701,9 +3322,21 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 						forwardItem(itemId);
 					}, &st::menuIconForward);
 				}
+				if (HistoryView::CanAddOfferToMessage(item)) {
+					_menu->addAction(tr::lng_context_add_offer(tr::now), [=] {
+						Api::AddOfferToMessage(_controller->uiShow(), itemId);
+					}, &st::menuIconTagSell);
+				}
 				if (item->canDelete()) {
 					const auto callback = [=] { deleteItem(itemId); };
 					if (item->isUploading()) {
+						if (item->media()
+							&& item->media()->allowsEditCaption()) {
+							_menu->addAction(
+								tr::lng_context_upload_edit_caption(tr::now),
+								[=] { editCaptionUploadLayer(item); },
+								&st::menuIconEdit);
+						}
 						_menu->addAction(tr::lng_context_cancel_upload(tr::now), callback, &st::menuIconCancel);
 					} else {
 						_menu->addAction(Ui::DeleteMessageContextAction(
@@ -2728,7 +3361,11 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		}
 	} else { // maybe cursor on some text history item?
 		const auto albumPartItem = _dragStateItem;
-		const auto item = [&] {
+		const auto item = [&]() -> HistoryItem* {
+			if (e->reason() == QContextMenuEvent::Keyboard
+				&& _dragStateItem) {
+				return groupLeaderOrSelf(_dragStateItem);
+			}
 			const auto result = Element::Hovered()
 				? Element::Hovered()->data().get()
 				: Element::HoveredLink()
@@ -2751,12 +3388,20 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			? link->copyToClipboardContextItemText()
 			: QString();
 
-		if (item && item->isSponsored()) {
-			FillSponsoredMessagesMenu(controller, item->fullId(), _menu);
+		const auto sponsored = (item && item->isSponsored())
+			? item
+			: (Element::Moused() && Element::Moused()->data()->isSponsored())
+			? Element::Moused()->data().get()
+			: nullptr;
+		if (sponsored) {
+			Menu::FillSponsored(
+				Ui::Menu::CreateAddActionCallback(_menu),
+				controller->uiShow(),
+				sponsored->fullId());
 		}
 		if (isUponSelected > 0) {
 			addReplyAction(item);
-			const auto selectedText = getSelectedText();
+				const auto selectedText = getSelectedText();
 			if (!hasCopyRestrictionForSelected() && !selectedText.empty()) {
 				_menu->addAction(
 					((isUponSelected > 1)
@@ -2776,19 +3421,42 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 						hasCopyRestrictionForSelected()));
 				}, &st::menuIconTranslate);
 			}
-			addItemActions(item, item);
+			const auto editItem = [&]() -> HistoryItem* {
+				const auto view = item->groupId()
+					? viewByItem(item)
+					: nullptr;
+				if (!view) {
+					return item;
+				} else if (const auto part = view->selectedQuote(
+						_selectedTextSelection).item) {
+					return part;
+				} else if (const auto textItem = view->textItem()) {
+					return textItem;
+				}
+				return item;
+			}();
+			addItemActions(item, editItem);
 		} else {
 			addReplyAction(partItemOrLeader);
+			addTodoListAction(partItemOrLeader);
 			addItemActions(item, albumPartItem);
 			if (item && !isUponSelected) {
 				const auto media = (view ? view->media() : nullptr);
 				const auto mediaHasTextForCopy = media && media->hasTextForCopy();
 				if (const auto document = media ? media->getDocument() : nullptr) {
 					if (!view->isIsolatedEmoji() && document->sticker()) {
+						const auto sending = item->isSending();
 						if (document->sticker()->set) {
 							_menu->addAction(document->isStickerSetInstalled() ? tr::lng_context_pack_info(tr::now) : tr::lng_context_pack_add(tr::now), [=] {
 								showStickerPackInfo(document);
 							}, &st::menuIconStickers);
+						} else if (!sending) {
+							Api::AddAddToOwnedSetAction(
+								Ui::Menu::CreateAddActionCallback(_menu),
+								_controller->uiShow(),
+								document);
+						}
+						if (!sending) {
 							const auto isFaved = session->data().stickers().isFaved(document);
 							_menu->addAction(isFaved ? tr::lng_faved_stickers_remove(tr::now) : tr::lng_faved_stickers_add(tr::now), [=] {
 								Api::ToggleFavedSticker(controller->uiShow(), document, itemId);
@@ -2808,16 +3476,50 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 							poll,
 							item,
 							HistoryView::Context::History,
-							_controller);
+							_controller,
+							!pollOptionLink.isEmpty(),
+							canViewMessageStats(item));
 					} else if (const auto contact = media->sharedContact()) {
 						const auto phone = contact->phoneNumber;
 						_menu->addAction(tr::lng_profile_copy_phone(tr::now), [=] {
 							QGuiApplication::clipboard()->setText(phone);
 						}, &st::menuIconCopy);
+					} else if (const auto gift = media->gift()) {
+						const auto peer = item->history()->peer;
+						const auto user = peer->asUser();
+						if (!user
+							|| (!user->isInaccessible()
+								&& !user->isNotificationsUser())) {
+							const auto controller = _controller;
+							const auto starGiftUpgrade = gift->upgrade
+								&& (gift->type == Data::GiftType::StarGift);
+							const auto isGift = gift->slug.isEmpty()
+								|| !gift->channel;
+							const auto out = item->out();
+							const auto outgoingGift = isGift
+								&& (starGiftUpgrade ? !out : out);
+							if (outgoingGift
+								&& gift->type
+									!= Data::GiftType::BirthdaySuggest) {
+								_menu->addAction(
+									tr::lng_context_gift_send(tr::now),
+									[=] {
+										Ui::ShowStarGiftBox(controller, peer);
+									},
+									&st::menuIconGiftPremium);
+							}
+						}
+					} else if (!rateTranscriptionItem && media->document()) {
+						if ((media->document()->isVoiceMessage()
+								|| media->document()->isVideoMessage())
+							&& Menu::HasRateTranscribeItem(item)) {
+							rateTranscriptionItem = item;
+						}
 					}
 				}
 				if (!item->isService() && view && actionText.isEmpty()) {
-					if (!hasCopyRestriction(item)
+					const auto hasRestriction = hasCopyRestriction(item);
+					if (!hasRestriction
 						&& (view->hasVisibleText() || mediaHasTextForCopy)) {
 						_menu->addAction(
 							tr::lng_context_copy_text(tr::now),
@@ -2826,6 +3528,8 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					}
 					if ((!item->translation() || !_history->translatedTo())
 						&& (view->hasVisibleText() || mediaHasTextForCopy)) {
+						const auto peer = item->history()->peer;
+						const auto itemId = item->id;
 						const auto translate = mediaHasTextForCopy
 							? (HistoryView::TransribedText(item)
 								.append('\n')
@@ -2836,12 +3540,10 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 							_menu->addAction(tr::lng_context_translate(tr::now), [=] {
 								_controller->show(Box(
 									Ui::TranslateBox,
-									item->history()->peer,
-									mediaHasTextForCopy
-										? MsgId()
-										: item->fullId().msg,
+									peer,
+									mediaHasTextForCopy ? MsgId() : itemId,
 									translate,
-									hasCopyRestriction(item)));
+									hasRestriction));
 							}, &st::menuIconTranslate);
 						}
 					}
@@ -2860,22 +3562,30 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				HistoryView::CopyPostLink(controller, itemId, HistoryView::Context::History);
 			}, &st::menuIconLink);
 		}
-		if (item && item->isSponsored()) {
-			if (!_menu->empty()) {
-				_menu->addSeparator(&st::expandedMenuSeparator);
+		if (sponsored) {
+			const auto hasAbout = ranges::any_of(
+				_menu->actions(),
+				[about = tr::lng_sponsored_menu_revenued_about(tr::now)](
+						const QAction *action) {
+					return action->text() == about;
+				});
+			if (!hasAbout) {
+				if (!_menu->empty()) {
+					_menu->addSeparator(&st::expandedMenuSeparator);
+				}
+				auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
+					_menu->menu(),
+					st::menuWithIcons,
+					st::historyHasCustomEmoji,
+					st::historySponsoredAboutMenuLabelPosition,
+					TextWithEntities{ tr::lng_sponsored_title(tr::now) },
+					&st::menuIconInfo);
+				item->clicks(
+				) | rpl::on_next([=] {
+					controller->show(Box(Ui::AboutSponsoredBox));
+				}, item->lifetime());
+				_menu->addAction(std::move(item));
 			}
-			auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
-				_menu,
-				st::menuWithIcons,
-				st::historyHasCustomEmoji,
-				st::historySponsoredAboutMenuLabelPosition,
-				TextWithEntities{ tr::lng_sponsored_title(tr::now) },
-				&st::menuIconInfo);
-			item->clicks(
-			) | rpl::start_with_next([=] {
-				controller->show(Box(Ui::AboutSponsoredBox));
-			}, item->lifetime());
-			_menu->addAction(std::move(item));
 		}
 		if (isUponSelected > 1) {
 			if (selectedState.count > 0 && selectedState.count == selectedState.canForwardCount) {
@@ -2889,7 +3599,11 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				}, &st::menuIconDelete);
 			}
 			if (selectedState.count > 0 && !hasCopyRestrictionForSelected()) {
-				Menu::AddDownloadFilesAction(_menu, controller, _selected, this);
+				Menu::AddDownloadFilesAction(
+					_menu,
+					controller,
+					selectedItemsForExport(),
+					this);
 			}
 			_menu->addAction(tr::lng_context_clear_selection(tr::now), [=] {
 				_widget->clearSelected();
@@ -2901,11 +3615,23 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 						forwardAsGroup(itemId);
 					}, &st::menuIconForward);
 				}
+				if (HistoryView::CanAddOfferToMessage(item)) {
+					_menu->addAction(tr::lng_context_add_offer(tr::now), [=] {
+						Api::AddOfferToMessage(_controller->uiShow(), itemId);
+					}, &st::menuIconTagSell);
+				}
 				if (canDelete) {
 					const auto callback = [=] {
 						deleteAsGroup(itemId);
 					};
 					if (item->isUploading()) {
+						if (item->media()
+							&& item->media()->allowsEditCaption()) {
+							_menu->addAction(
+								tr::lng_context_upload_edit_caption(tr::now),
+								[=] { editCaptionUploadLayer(item); },
+								&st::menuIconEdit);
+						}
 						_menu->addAction(tr::lng_context_cancel_upload(tr::now), callback, &st::menuIconCancel);
 					} else {
 						_menu->addAction(Ui::DeleteMessageContextAction(
@@ -2942,9 +3668,6 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			HistoryView::EmojiPacksSource::Message,
 			_controller);
 		const auto added = (_menu->actions().size() > wasAmount);
-		if (!added) {
-			_menu->addSeparator();
-		}
 		HistoryView::AddSelectRestrictionAction(
 			_menu,
 			textItem ? textItem : _dragStateItem,
@@ -2954,8 +3677,52 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		HistoryView::AddWhoReactedAction(
 			_menu,
 			this,
-			whoReactedItem,
+			leaderOrSelf,
 			_controller);
+	} else if (leaderOrSelf) {
+		HistoryView::MaybeAddWhenEditedForwardedAction(
+			_menu,
+			leaderOrSelf,
+			_controller);
+	}
+
+	if (!_menu->empty() && rateTranscriptionItem) {
+		_menu->insertAction(0, base::make_unique_q<Menu::RateTranscribe>(
+			_menu,
+			_menu->st().menu,
+			Menu::RateTranscribeCallbackFactory(rateTranscriptionItem)));
+	}
+
+	if (!pollOptionLink.isEmpty() && leaderOrSelf && !_menu->empty()) {
+		const auto pollItemId = leaderOrSelf->fullId();
+		_menu->stashContent([=](not_null<Ui::PopupMenu*> menu) {
+			HistoryView::FillPollOptionPage(
+				menu,
+				&session->data(),
+				pollItemId,
+				pollOptionLink,
+				_controller,
+				[=] {
+					_widget->replyToMessage({
+						.messageId = pollItemId,
+						.pollOption = pollOptionLink,
+					});
+				});
+		});
+	}
+
+	if (leaderOrSelf && !_menu->empty()) {
+		const auto media = leaderOrSelf->media();
+		const auto poll = media ? media->poll() : nullptr;
+		if (poll && !poll->closed()) {
+			if (poll->hideResultsUntilClose()) {
+				HistoryView::InsertPollHiddenResultsLabel(_menu.get());
+			}
+			HistoryView::InsertPollVoteRestrictionsLabel(
+				_menu.get(),
+				leaderOrSelf,
+				poll);
+		}
 	}
 
 	if (_menu->empty()) {
@@ -2979,7 +3746,9 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	if (attached == AttachSelectorResult::Failed) {
 		_menu = nullptr;
 		return;
-	} else if (attached == AttachSelectorResult::Attached) {
+	}
+	HistoryView::AttachPollOptionTabs(_menu.get(), desiredPosition);
+	if (attached == AttachSelectorResult::Attached) {
 		_menu->popupPrepared();
 	} else {
 		_menu->popup(desiredPosition);
@@ -3002,6 +3771,8 @@ bool HistoryInner::showCopyRestriction(HistoryItem *item) {
 	}
 	_controller->showToast(_peer->isBroadcast()
 		? tr::lng_error_nocopy_channel(tr::now)
+		: _peer->isUser()
+		? tr::lng_error_nocopy_user(tr::now)
 		: tr::lng_error_nocopy_group(tr::now));
 	return true;
 }
@@ -3012,6 +3783,8 @@ bool HistoryInner::showCopyMediaRestriction(not_null<HistoryItem*> item) {
 	}
 	_controller->showToast(_peer->isBroadcast()
 		? tr::lng_error_nocopy_channel(tr::now)
+		: _peer->isUser()
+		? tr::lng_error_nocopy_user(tr::now)
 		: tr::lng_error_nocopy_group(tr::now));
 	return true;
 }
@@ -3020,21 +3793,25 @@ bool HistoryInner::hasCopyRestrictionForSelected() const {
 	if (hasCopyRestriction()) {
 		return true;
 	}
-	for (const auto &[item, selection] : _selected) {
+	for (const auto &item : _selected) {
 		if (item && item->forbidsForward()) {
 			return true;
 		}
 	}
-	return false;
+	return hasSelectedText()
+		&& _selectedTextItem
+		&& _selectedTextItem->forbidsForward();
 }
 
 bool HistoryInner::showCopyRestrictionForSelected() {
-	for (const auto &[item, selection] : _selected) {
+	for (const auto &item : _selected) {
 		if (showCopyRestriction(item)) {
 			return true;
 		}
 	}
-	return false;
+	return hasSelectedText()
+		&& _selectedTextItem
+		&& showCopyRestriction(_selectedTextItem);
 }
 
 void HistoryInner::copySelectedText() {
@@ -3043,6 +3820,14 @@ void HistoryInner::copySelectedText() {
 	}
 }
 
+void HistoryInner::editCaptionUploadLayer(not_null<HistoryItem*> item) {
+	if (const auto view = viewByItem(item)) {
+		if (item->isUploading()) {
+			_controller->uiShow()->show(Box(Ui::EditCaptionBox, view));
+		}
+	}
+}
+
 void HistoryInner::savePhotoToFile(not_null<PhotoData*> photo) {
 	const auto media = photo->activeMediaView();
 	if (photo->isNull() || !media || !media->loaded()) {
@@ -3140,6 +3925,9 @@ void HistoryInner::copyContextText(FullMsgId itemId) {
 }
 
 void HistoryInner::resizeEvent(QResizeEvent *e) {
+	if (e->oldSize().width() != e->size().width() && _overlayHost) {
+		_overlayHost->hide();
+	}
 	mouseActionUpdate();
 }
 
@@ -3151,49 +3939,35 @@ TextForMimeData HistoryInner::getSelectedText() const {
 	}
 
 	if (selected.empty()) {
-		return TextForMimeData();
-	}
-	if (selected.cbegin()->second != FullSelection) {
-		const auto &[item, selection] = *selected.cbegin();
-		if (const auto view = viewByItem(item)) {
-			return view->selectedText(selection);
+		if (const auto view = viewByItem(_selectedTextItem)) {
+			return view->selectedText(_selectedTextSelection);
 		}
-		return TextForMimeData();
+		return _selectedText;
 	}
 
+	const auto richContext = (selected.size() > 1);
 	struct Part {
-		QString name;
-		QString time;
-		TextForMimeData unwrapped;
+		not_null<HistoryItem*> item;
+		const Data::Group *group = nullptr;
 	};
 
 	auto groups = base::flat_set<not_null<const Data::Group*>>();
-	auto fullSize = 0;
 	auto texts = base::flat_map<Data::MessagePosition, Part>();
 
-	const auto wrapItem = [&](
-			not_null<HistoryItem*> item,
-			TextForMimeData &&unwrapped) {
-		const auto i = texts.emplace(item->position(), Part{
-			.name = item->author()->name(),
-			.time = QString(", [%1]\n").arg(
-				QLocale().toString(ItemDateTime(item), QLocale::ShortFormat)),
-			.unwrapped = std::move(unwrapped),
-		}).first;
-		fullSize += i->second.name.size()
-			+ i->second.time.size()
-			+ i->second.unwrapped.expanded.size();
-	};
 	const auto addItem = [&](not_null<HistoryItem*> item) {
-		wrapItem(item, HistoryItemText(item));
+		texts.emplace(item->position(), Part{ .item = item });
 	};
 	const auto addGroup = [&](not_null<const Data::Group*> group) {
 		Expects(!group->items.empty());
 
-		wrapItem(group->items.back(), HistoryGroupText(group));
+		const auto item = group->items.back();
+		texts.emplace(item->position(), Part{
+			.item = item,
+			.group = group.get(),
+		});
 	};
 
-	for (const auto &[item, selection] : selected) {
+	for (const auto &item : selected) {
 		if (const auto group = session().data().groups().find(item)) {
 			if (groups.contains(group)) {
 				continue;
@@ -3208,15 +3982,33 @@ TextForMimeData HistoryInner::getSelectedText() const {
 			addItem(item);
 		}
 	}
-	if (texts.size() == 1) {
-		return texts.front().second.unwrapped;
+	if (!richContext && texts.size() == 1) {
+		const auto &part = texts.front().second;
+		if (part.group) {
+			return HistoryGroupText(not_null<const Data::Group*>{ part.group });
+		}
+		return HistoryItemText(part.item);
 	}
 	auto result = TextForMimeData();
-	const auto sep = u"\n\n"_q;
-	result.reserve(fullSize + (texts.size() - 1) * sep.size());
+	const auto sep = u"\n"_q;
 	for (auto i = texts.begin(), e = texts.end(); i != e;) {
-		result.append(i->second.name).append(i->second.time);
-		result.append(std::move(i->second.unwrapped));
+		const auto &part = i->second;
+		auto body = TextForMimeData();
+		if (part.group) {
+			const auto group = not_null<const Data::Group*>{ part.group };
+			body = richContext
+				? HistoryGroupTextForSelectedCopy(group)
+				: HistoryGroupText(group);
+		} else {
+			body = richContext
+				? HistoryItemTextForSelectedCopy(part.item)
+				: HistoryItemText(part.item);
+		}
+		auto wrapped = HistorySelectedItemWrappedText(
+			part.item,
+			std::move(body),
+			richContext);
+		result.append(std::move(wrapped));
 		if (++i != e) {
 			result.append(sep);
 		}
@@ -3225,9 +4017,146 @@ TextForMimeData HistoryInner::getSelectedText() const {
 }
 
 void HistoryInner::keyPressEvent(QKeyEvent *e) {
+	if (_middleClickAutoscroll.active() && e->key() == Qt::Key_Escape) {
+		_middleClickAutoscroll.stop();
+		return;
+	}
+
+	const auto count = accessibilityChildCount();
+	if (count > 0 && Ui::ScreenReaderModeActive()) {
+		if (_accessibilityFocusedItem
+			&& _accessibilityFocusedIndex >= 0) {
+			const auto elements = accessibleElements();
+			const auto barIndex
+				= accessibilityUnreadBarIndex();
+			const auto elementIndex = (barIndex >= 0
+				&& _accessibilityFocusedIndex > barIndex)
+				? (_accessibilityFocusedIndex - 1)
+				: _accessibilityFocusedIndex;
+			if (elementIndex < 0
+				|| elementIndex >= int(elements.size())
+				|| elements[elementIndex]->data().get()
+					!= _accessibilityFocusedItem) {
+				// The focused item is still the same message, but
+				// its index in accessibleElements() shifted (the list
+				// was mutated since the last navigation). Repair the
+				// cached index in-place without emitting a focus
+				// change — the framework still thinks the focused
+				// child is _accessibilityFocusedItem and we are only
+				// catching up our bookkeeping.
+				for (auto i = 0, n = int(elements.size());
+					i < n; ++i) {
+					if (elements[i]->data().get()
+						== _accessibilityFocusedItem) {
+						_accessibilityFocusedIndex =
+							(barIndex >= 0 && i >= barIndex)
+							? (i + 1)
+							: i;
+						break;
+					}
+				}
+			}
+		}
+		auto newIndex = _accessibilityFocusedIndex;
+		switch (e->key()) {
+		case Qt::Key_Down:
+			newIndex = std::min(
+				(newIndex < 0) ? (count - 1) : (newIndex + 1),
+				count - 1);
+			break;
+		case Qt::Key_Up:
+			newIndex = std::max(
+				(newIndex < 0) ? (count - 1) : (newIndex - 1),
+				0);
+			break;
+		case Qt::Key_PageDown: {
+			const auto pageHeight = _visibleAreaBottom
+				- _visibleAreaTop;
+			auto remaining = pageHeight;
+			while (newIndex + 1 < count && remaining > 0) {
+				++newIndex;
+				const auto rect = accessibilityChildRect(
+					newIndex);
+				remaining -= rect.height();
+			}
+			break;
+		}
+		case Qt::Key_PageUp: {
+			const auto pageHeight = _visibleAreaBottom
+				- _visibleAreaTop;
+			auto remaining = pageHeight;
+			while (newIndex - 1 >= 0 && remaining > 0) {
+				--newIndex;
+				const auto rect = accessibilityChildRect(
+					newIndex);
+				remaining -= rect.height();
+			}
+			break;
+		}
+		case Qt::Key_Home:
+			newIndex = 0;
+			break;
+		case Qt::Key_End:
+			newIndex = count - 1;
+			break;
+		default:
+			break;
+		}
+		if (newIndex != _accessibilityFocusedIndex
+			&& newIndex >= 0
+			&& newIndex < count) {
+			const auto elements = accessibleElements();
+			const auto barIndex
+				= accessibilityUnreadBarIndex();
+			const auto elementIndex = (barIndex >= 0
+				&& newIndex > barIndex)
+				? (newIndex - 1)
+				: newIndex;
+			const auto item = (elementIndex >= 0
+				&& elementIndex < int(elements.size()))
+				? elements[elementIndex]->data().get()
+				: nullptr;
+			setAccessibilityFocusedItem(newIndex, item);
+
+			const auto rect = accessibilityChildRect(newIndex);
+			if (!rect.isEmpty()) {
+				if (rect.top() < _visibleAreaTop) {
+					_scroll->scrollToY(rect.top());
+				} else if (rect.bottom() > _visibleAreaBottom) {
+					_scroll->scrollToY(
+						rect.bottom()
+							- (_visibleAreaBottom
+								- _visibleAreaTop));
+				}
+			}
+
+			if (_widget->markingMessagesRead()
+				&& (barIndex < 0 || newIndex != barIndex)
+				&& elementIndex >= 0
+				&& elementIndex < int(elements.size())) {
+				session().data().histories().readInboxTill(
+					elements[elementIndex]->data());
+			}
+
+			e->accept();
+			return;
+		}
+
+		if (e->key() == Qt::Key_Space) {
+			if (hasSelectedItems()) {
+				toggleMessageSelection();
+			} else {
+				playPauseFocusedMedia();
+			}
+			e->accept();
+			return;
+		}
+	}
+
 	if (e->key() == Qt::Key_Escape) {
 		_widget->escape();
-	} else if (e == QKeySequence::Copy && !_selected.empty()) {
+	} else if (e == QKeySequence::Copy
+		&& canCopySelected()) {
 		copySelectedText();
 #ifdef Q_OS_MAC
 	} else if (e->key() == Qt::Key_E
@@ -3241,6 +4170,23 @@ void HistoryInner::keyPressEvent(QKeyEvent *e) {
 			&& selectedState.canDeleteCount == selectedState.count) {
 			_widget->confirmDeleteSelected();
 		}
+	} else if (HistoryView::KeyboardTextSelection::IsExtendKey(e->key())
+		&& (e->modifiers() & Qt::ShiftModifier)
+		&& hasSelectedText()) {
+		const auto view = viewByItem(_selectedTextItem);
+		const auto next = view
+			? _keyboardTextSelection.extend(
+				view,
+				_selectedTextSelection,
+				e->key(),
+				e->modifiers())
+			: std::optional<MessageSelection>();
+		if (next) {
+			setTextSelection(view, *next);
+			e->accept();
+		} else {
+			e->ignore();
+		}
 	} else if (!(e->modifiers() & ~Qt::ShiftModifier)
 		&& e->key() != Qt::Key_Shift) {
 		_widget->tryProcessKeyInput(e);
@@ -3249,6 +4195,17 @@ void HistoryInner::keyPressEvent(QKeyEvent *e) {
 	}
 }
 
+void HistoryInner::markReadMetricsStale() {
+	_readMetricsStale = true;
+	update();
+}
+
+void HistoryInner::registerReadMetricsActivity() {
+	if (_widget->markingContentsRead()) {
+		_readMetricsTracker->registerActivity();
+	}
+}
+
 void HistoryInner::checkActivation() {
 	if (!_widget->markingMessagesRead()) {
 		return;
@@ -3285,20 +4242,20 @@ void HistoryInner::checkActivation() {
 	session().data().histories().readInboxTill(view->data());
 }
 
-void HistoryInner::recountHistoryGeometry() {
+void HistoryInner::recountHistoryGeometry(bool initial) {
 	_contentWidth = _scroll->width();
 
 	if (_history->hasPendingResizedItems()
 		|| (_migrated && _migrated->hasPendingResizedItems())) {
 		_recountedAfterPendingResizedItems = true;
 	}
-
+	const auto aboutAboveHistory = _aboutView && _aboutView->aboveHistory();
 	const auto visibleHeight = _scroll->height();
-	auto oldHistoryPaddingTop = qMax(
-		visibleHeight - historyHeight() - st::historyPaddingBottom,
+	auto oldHistoryMarginTop = qMax(
+		visibleHeight - historyHeight() - _historyMarginBottom,
 		0);
-	if (_aboutView) {
-		accumulate_max(oldHistoryPaddingTop, _aboutView->height);
+	if (aboutAboveHistory) {
+		accumulate_max(oldHistoryMarginTop, _aboutView->height);
 	}
 
 	updateBotInfo(false);
@@ -3328,26 +4285,32 @@ void HistoryInner::recountHistoryGeometry() {
 
 	if (const auto view = _aboutView ? _aboutView->view() : nullptr) {
 		_aboutView->height = view->resizeGetHeight(_contentWidth);
-		_aboutView->top = qMin(
-			_historyPaddingTop - _aboutView->height,
-			qMax(0, (_scroll->height() - _aboutView->height) / 2));
+		if (aboutAboveHistory) {
+			_aboutView->top = qMin(
+				_historyMarginTop - _aboutView->height,
+				qMax(0, (_scroll->height() - _aboutView->height) / 2));
+		} else {
+			_aboutView->top = qMax(
+				qMax(0, (_scroll->height() - _aboutView->height) / 2),
+				_historyMarginTop + historyHeight() - _historyMarginBottom);
+		}
 	} else if (_aboutView) {
 		_aboutView->top = _aboutView->height = 0;
 	}
 
-	auto newHistoryPaddingTop = qMax(
-		visibleHeight - historyHeight() - st::historyPaddingBottom,
+	auto newHistoryMarginTop = qMax(
+		visibleHeight - historyHeight() - _historyMarginBottom,
 		0);
-	if (_aboutView) {
-		accumulate_max(newHistoryPaddingTop, _aboutView->height);
+	if (aboutAboveHistory) {
+		accumulate_max(newHistoryMarginTop, _aboutView->height);
 	}
 
-	auto historyPaddingTopDelta = (newHistoryPaddingTop - oldHistoryPaddingTop);
-	if (historyPaddingTopDelta != 0) {
+	const auto marginDelta = newHistoryMarginTop - oldHistoryMarginTop;
+	if (!initial && marginDelta) {
 		if (_history->scrollTopItem) {
-			_history->scrollTopOffset += historyPaddingTopDelta;
+			_history->scrollTopOffset += marginDelta;
 		} else if (_migrated && _migrated->scrollTopItem) {
-			_migrated->scrollTopOffset += historyPaddingTopDelta;
+			_migrated->scrollTopOffset += marginDelta;
 		}
 	}
 }
@@ -3373,6 +4336,8 @@ void HistoryInner::visibleAreaUpdated(int top, int bottom) {
 	auto scrolledUp = (top < _visibleAreaTop);
 	_visibleAreaTop = top;
 	_visibleAreaBottom = bottom;
+	markReadMetricsStale();
+	registerReadMetricsActivity();
 	const auto visibleAreaHeight = bottom - top;
 
 	// if history has pending resize events we should not update scrollTopItem
@@ -3380,7 +4345,7 @@ void HistoryInner::visibleAreaUpdated(int top, int bottom) {
 		return;
 	}
 
-	if (bottom >= _historyPaddingTop + historyHeight() + st::historyPaddingBottom) {
+	if (bottom >= _historyMarginTop + historyHeight() + _historyMarginBottom) {
 		_history->forgetScrollState();
 		if (_migrated) {
 			_migrated->forgetScrollState();
@@ -3403,9 +4368,10 @@ void HistoryInner::visibleAreaUpdated(int top, int bottom) {
 		}
 	}
 	if (scrolledUp) {
+		_scrollDateAfterDayCrossing = false;
 		_scrollDateCheck.call();
 	} else {
-		scrollDateHideByTimer();
+		scrollDateCheckDownward();
 	}
 
 	// Unload userpics.
@@ -3429,6 +4395,10 @@ void HistoryInner::visibleAreaUpdated(int top, int bottom) {
 	_emojiInteractions->visibleAreaUpdated(
 		_visibleAreaTop,
 		_visibleAreaBottom);
+
+	if (_overlayHost) {
+		_overlayHost->updatePosition();
+	}
 }
 
 bool HistoryInner::displayScrollDate() const {
@@ -3458,8 +4428,42 @@ void HistoryInner::scrollDateCheck() {
 	}
 }
 
+void HistoryInner::scrollDateCheckDownward() {
+	const auto current = _history->scrollTopItem
+		? _history->scrollTopItem
+		: (_migrated ? _migrated->scrollTopItem : nullptr);
+	const auto currentTop = _history->scrollTopItem
+		? _history->scrollTopOffset
+		: (_migrated ? _migrated->scrollTopOffset : 0);
+	const auto previous = _scrollDateLastItem;
+	const auto previousDay = previous
+		? previous->dateTime().date()
+		: QDate();
+	const auto currentDay = current
+		? current->dateTime().date()
+		: QDate();
+	const auto crossedDay = previous
+		&& current
+		&& previousDay.isValid()
+		&& currentDay.isValid()
+		&& (previousDay != currentDay);
+	_scrollDateLastItem = current;
+	_scrollDateLastItemTop = currentTop;
+	if (crossedDay) {
+		if (!_scrollDateShown) {
+			toggleScrollDateShown();
+		}
+		_scrollDateAfterDayCrossing = true;
+		_scrollDateHideTimer.callOnce(
+			kScrollDateHideOnDayCrossingTimeout);
+	} else if (!_scrollDateAfterDayCrossing) {
+		scrollDateHideByTimer();
+	}
+}
+
 void HistoryInner::scrollDateHideByTimer() {
 	_scrollDateHideTimer.cancel();
+	_scrollDateAfterDayCrossing = false;
 	if (!_scrollDateLink || ClickHandler::getPressed() != _scrollDateLink) {
 		scrollDateHide();
 	}
@@ -3488,6 +4492,9 @@ void HistoryInner::toggleScrollDateShown() {
 void HistoryInner::repaintScrollDateCallback() {
 	int updateTop = _visibleAreaTop;
 	int updateHeight = st::msgServiceMargin.top() + st::msgServicePadding.top() + st::msgServiceFont->height + st::msgServicePadding.bottom();
+	if (_history->hasForumThreadBars()) {
+		updateHeight *= 2;
+	}
 	update(0, updateTop, width(), updateHeight);
 }
 
@@ -3495,6 +4502,13 @@ void HistoryInner::setItemsRevealHeight(int revealHeight) {
 	_revealHeight = revealHeight;
 }
 
+void HistoryInner::setCollapseGaps(std::vector<CollapseGap> gaps) {
+	if (_collapseGaps != gaps) {
+		_collapseGaps = std::move(gaps);
+		updateSize();
+	}
+}
+
 void HistoryInner::changeItemsRevealHeight(int revealHeight) {
 	if (_revealHeight == revealHeight) {
 		return;
@@ -3503,25 +4517,60 @@ void HistoryInner::changeItemsRevealHeight(int revealHeight) {
 	updateSize();
 }
 
+void HistoryInner::setPullBottomInset(int inset) {
+	if (_pullBottomInset == inset) {
+		return;
+	}
+	_pullBottomInset = inset;
+	updateSize();
+}
+
 void HistoryInner::updateSize() {
 	const auto visibleHeight = _scroll->height();
-	const auto itemsHeight = historyHeight() - _revealHeight;
-	auto newHistoryPaddingTop = qMax(visibleHeight - itemsHeight - st::historyPaddingBottom, 0);
-	if (_aboutView) {
-		accumulate_max(newHistoryPaddingTop, _aboutView->height);
+	auto collapseGapTotal = 0;
+	for (const auto &gap : _collapseGaps) {
+		collapseGapTotal += gap.height;
+	}
+	const auto itemsHeight = historyHeight() - _revealHeight + collapseGapTotal;
+	const auto aboutAboveHistory = _aboutView && _aboutView->aboveHistory();
+	const auto aboutBelowHistory = _aboutView && !aboutAboveHistory;
+	auto newHistoryMarginBottom = st::historyPaddingBottom;
+	if (aboutBelowHistory) {
+		accumulate_max(newHistoryMarginBottom, _aboutView->height);
+	}
+	auto newHistoryMarginTop = qMax(
+		visibleHeight - itemsHeight - newHistoryMarginBottom,
+		0);
+	if (aboutAboveHistory) {
+		accumulate_max(newHistoryMarginTop, _aboutView->height);
 	}
 
 	if (_aboutView && _aboutView->height > 0) {
-		_aboutView->top = qMin(
-			newHistoryPaddingTop - _aboutView->height,
-			qMax(0, (_scroll->height() - _aboutView->height) / 2));
+		if (aboutAboveHistory) {
+			_aboutView->top = qMin(
+				newHistoryMarginTop - _aboutView->height,
+				qMax(0, (_scroll->height() - _aboutView->height) / 2));
+		} else {
+			_aboutView->top = qMax(
+				qMax(0, (_scroll->height() - _aboutView->height) / 2),
+				(newHistoryMarginTop
+					+ itemsHeight
+					+ newHistoryMarginBottom
+					- _aboutView->height));
+		}
 	}
 
-	if (_historyPaddingTop != newHistoryPaddingTop) {
-		_historyPaddingTop = newHistoryPaddingTop;
+	if (_historyMarginTop != newHistoryMarginTop) {
+		_historyMarginTop = newHistoryMarginTop;
+	}
+	if (_historyMarginBottom != newHistoryMarginBottom) {
+		_historyMarginBottom = newHistoryMarginBottom;
 	}
 
-	int newHeight = _historyPaddingTop + itemsHeight + st::historyPaddingBottom;
+	const auto newHeight = _historyMarginTop
+		+ itemsHeight
+		+ _historyMarginBottom
+		+ _pullBottomInset;
 	if (width() != _scroll->width() || height() != newHeight) {
 		resize(_scroll->width(), newHeight);
 
@@ -3538,12 +4587,14 @@ void HistoryInner::setShownPinned(HistoryItem *item) {
 }
 
 void HistoryInner::enterEventHook(QEnterEvent *e) {
+	_mouseActive = true;
 	mouseActionUpdate(QCursor::pos());
-	return TWidget::enterEventHook(e);
+	return RpWidget::enterEventHook(e);
 }
 
 void HistoryInner::leaveEventHook(QEvent *e) {
 	_reactionsManager->updateButton({ .cursorLeft = true });
+	_replyButtonManager->updateButton({});
 	if (auto item = Element::Hovered()) {
 		repaintItem(item);
 		Element::Hovered(nullptr);
@@ -3554,10 +4605,58 @@ void HistoryInner::leaveEventHook(QEvent *e) {
 		_cursor = style::cur_default;
 		setCursor(_cursor);
 	}
-	return TWidget::leaveEventHook(e);
+	_mouseActive = false;
+	return RpWidget::leaveEventHook(e);
+}
+
+void HistoryInner::setupThanosEffect() {
+	const auto history = _history;
+	const auto migrated = [=] { return _migrated; };
+	_thanosController = std::make_unique<Ui::ThanosEffectController>(
+		&session(),
+		Ui::ThanosEffectController::Delegate{
+			.viewForItem = [=](not_null<const HistoryItem*> item)
+					-> HistoryView::Element* {
+				if (item->history() != history
+					&& item->history() != migrated()) {
+					return nullptr;
+				}
+				return item->mainView();
+			},
+			.itemTop = [=](not_null<const HistoryView::Element*> view) {
+				return itemTop(view);
+			},
+			.visibleAreaTop = [=] { return _visibleAreaTop; },
+			.visibleAreaBottom = [=] { return _visibleAreaBottom; },
+			.contentWidth = [=] { return width(); },
+			.preparePaintContext = [=](QRect clip) {
+				return preparePaintContext(clip);
+			},
+			.window = [=]() -> QWidget* { return window(); },
+			.scrollArea = [=]() -> not_null<Ui::ScrollArea*> {
+				return _scroll;
+			},
+			.scrollToY = [=](int y) {
+				_widget->synteticScrollToY(y);
+			},
+			.setCollapseGaps = [=](std::vector<CollapseGap> gaps) {
+				setCollapseGaps(std::move(gaps));
+			},
+		},
+		lifetime());
+
+	session().data().viewAboutToBeRemoved(
+	) | rpl::on_next([=](Data::ViewRemoval removal) {
+		if (removal.reason == Data::ViewRemovalReason::Removed) {
+			_thanosController->captureOnRemoval(removal.view->data());
+		}
+	}, lifetime());
 }
 
 HistoryInner::~HistoryInner() {
+	if (_overlayHost) {
+		_overlayHost->hide();
+	}
 	_aboutView = nullptr;
 	for (const auto &item : _animatedStickersPlayed) {
 		if (const auto view = item->mainView()) {
@@ -3575,8 +4674,8 @@ HistoryInner::~HistoryInner() {
 }
 
 bool HistoryInner::focusNextPrevChild(bool next) {
-	if (_selected.empty()) {
-		return TWidget::focusNextPrevChild(next);
+	if (!hasSelectedItems() && !hasSelectedText()) {
+		return RpWidget::focusNextPrevChild(next);
 	} else {
 		clearSelected();
 		return true;
@@ -3584,6 +4683,15 @@ bool HistoryInner::focusNextPrevChild(bool next) {
 }
 
 void HistoryInner::adjustCurrent(int32 y) const {
+	auto gapShift = 0;
+	for (const auto &gap : _collapseGaps) {
+		if (y < gap.absY + gapShift) {
+			break;
+		}
+		gapShift += gap.height;
+	}
+	y -= gapShift;
+
 	int32 htop = historyTop(), hdrawtop = historyDrawTop(), mtop = migratedTop();
 	_curHistory = nullptr;
 	if (mtop >= 0) {
@@ -3653,7 +4761,8 @@ auto HistoryInner::nextItem(Element *view) -> Element* {
 }
 
 bool HistoryInner::canCopySelected() const {
-	return !_selected.empty();
+	return hasSelectedItems()
+		|| (hasSelectedText() && !_selectedTextSelection.empty());
 }
 
 bool HistoryInner::canDeleteSelected() const {
@@ -3680,6 +4789,9 @@ HistoryView::SelectionModeResult HistoryInner::inSelectionMode() const {
 	const auto now = inSelectionMode;
 	if (_lastInSelectionMode != now) {
 		_lastInSelectionMode = now;
+		if (now && _overlayHost) {
+			_overlayHost->hide();
+		}
 		if (_inSelectionModeAnimation.animating()) {
 			const auto progress = !now
 				? _inSelectionModeAnimation.value(0.)
@@ -3729,17 +4841,64 @@ void HistoryInner::elementShowPollResults(
 	_controller->showPollResults(poll, context);
 }
 
+HistoryView::ElementOverlayHost &HistoryInner::ensureOverlayHost() {
+	if (!_overlayHost) {
+		_overlayHost = std::make_unique<HistoryView::ElementOverlayHost>(
+			this,
+			[=](not_null<const Element*> view) {
+				return itemTop(view);
+			});
+	}
+	return *_overlayHost;
+}
+
+void HistoryInner::elementShowAddPollOption(
+		not_null<HistoryView::Element*> view,
+		not_null<PollData*> poll,
+		FullMsgId context,
+		QRect optionRect) {
+	HistoryView::ShowAddPollOptionOverlay(
+		ensureOverlayHost(),
+		this,
+		view,
+		poll,
+		context,
+		_controller,
+		_controller->chatStyle());
+}
+
+void HistoryInner::elementSubmitAddPollOption(FullMsgId context) {
+	if (_overlayHost) {
+		_overlayHost->triggerSubmit(context);
+	}
+}
+
+void HistoryInner::hideElementOverlay() {
+	if (_overlayHost) {
+		_overlayHost->hide();
+	}
+}
+
 void HistoryInner::elementOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) {
-	_controller->openPhoto(photo, { context });
+	const auto draw = Data::CanSendAnyOf(
+		_history->peer,
+		Data::FilesSendRestrictions());
+	_controller->openPhoto(photo, { .id = context, .showDrawButton = draw });
 }
 
 void HistoryInner::elementOpenDocument(
 		not_null<DocumentData*> document,
 		FullMsgId context,
 		bool showInMediaView) {
-	_controller->openDocument(document, showInMediaView, { context });
+	const auto showDrawButton = Data::CanSendAnyOf(
+		_history->peer,
+		Data::FilesSendRestrictions());
+	_controller->openDocument(
+		document,
+		showInMediaView,
+		{ .id = context, .showDrawButton = showDrawButton });
 }
 
 void HistoryInner::elementCancelUpload(const FullMsgId &context) {
@@ -3754,6 +4913,26 @@ void HistoryInner::elementShowTooltip(
 	_widget->showInfoTooltip(text, std::move(hiddenCallback));
 }
 
+void HistoryInner::elementShowHiddenSenderTooltip(
+		FullMsgId itemId,
+		const TextWithEntities &text) {
+	auto area = QRect();
+	if (const auto item = _controller->session().data().message(itemId)) {
+		if (const auto view = viewByItem(item)) {
+			const auto tooltip
+				= view->Get<HistoryView::HiddenSenderTooltip>();
+			const auto top = itemTop(view);
+			if (tooltip && !tooltip->linkRect.isEmpty() && top >= 0) {
+				const auto local = tooltip->linkRect;
+				area = QRect(
+					mapToGlobal(QPoint(local.x(), top + local.y())),
+					local.size());
+			}
+		}
+	}
+	_widget->showHiddenSenderTooltip(area, text);
+}
+
 bool HistoryInner::elementAnimationsPaused() {
 	return _controller->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
 }
@@ -3767,9 +4946,7 @@ void HistoryInner::elementSendBotCommand(
 void HistoryInner::elementSearchInList(
 		const QString &query,
 		const FullMsgId &context) {
-	const auto inChat = _history->peer->isUser()
-		? Dialogs::Key()
-		: Dialogs::Key(_history);
+	const auto inChat = Dialogs::Key(_history);
 	_controller->searchMessages(query, inChat);
 }
 
@@ -3777,8 +4954,13 @@ void HistoryInner::elementHandleViaClick(not_null<UserData*> bot) {
 	_widget->insertBotCommand('@' + bot->username());
 }
 
-bool HistoryInner::elementIsChatWide() {
-	return _isChatWide;
+HistoryView::ElementChatMode HistoryInner::elementChatMode() {
+	using Mode = HistoryView::ElementChatMode;
+	return _isChatWide
+		? Mode::Wide
+		: _removeFromUserpics
+		? Mode::Narrow
+		: Mode::Default;
 }
 
 not_null<Ui::PathShiftGradient*> HistoryInner::elementPathShiftGradient() {
@@ -3818,32 +5000,38 @@ void HistoryInner::elementStartEffect(
 auto HistoryInner::getSelectionState() const
 -> HistoryView::TopBarWidget::SelectedState {
 	auto result = HistoryView::TopBarWidget::SelectedState {};
-	for (auto &selected : _selected) {
-		if (selected.second == FullSelection) {
-			++result.count;
-			if (selected.first->canDelete()) {
-				++result.canDeleteCount;
-			}
-			if (selected.first->allowsForward()) {
-				++result.canForwardCount;
-			}
-		} else if (selected.second.from != selected.second.to) {
-			result.textSelected = true;
+	for (const auto &item : _selected) {
+		++result.count;
+		if (item->canDelete()) {
+			++result.canDeleteCount;
+		}
+		if (item->allowsForward()) {
+			++result.canForwardCount;
 		}
 	}
+	result.textSelected = hasSelectedText()
+		&& !_selectedTextSelection.empty();
 	return result;
 }
 
 void HistoryInner::clearSelected(bool onlyTextSelection) {
-	if (!_selected.empty() && (!onlyTextSelection || _selected.cbegin()->second != FullSelection)) {
+	auto changed = false;
+	if (!onlyTextSelection && !_selected.empty()) {
 		_selected.clear();
+		changed = true;
+	}
+	if (_selectedTextItem) {
+		clearTextSelection();
+		changed = true;
+	}
+	if (changed) {
 		_widget->updateTopBarSelection();
 		_widget->update();
 	}
 }
 
 bool HistoryInner::hasSelectedItems() const {
-	return !_selected.empty() && _selected.cbegin()->second == FullSelection;
+	return !_selected.empty();
 }
 
 MessageIdsList HistoryInner::getSelectedItems() const {
@@ -3856,11 +5044,10 @@ MessageIdsList HistoryInner::getSelectedItems() const {
 	auto result = ranges::make_subrange(
 		_selected.begin(),
 		_selected.end()
-	) | views::filter([](const auto &selected) {
-		const auto item = selected.first;
-		return item && !item->isService() && item->isRegular();
-	}) | views::transform([](const auto &selected) {
-		return selected.first->fullId();
+	) | views::filter([](const auto &item) {
+		return !item->isService() && item->isRegular();
+	}) | views::transform([](const auto &item) {
+		return item->fullId();
 	}) | to_vector;
 
 	result |= actions::sort(less{}, [](const FullMsgId &msgId) {
@@ -3896,7 +5083,31 @@ auto HistoryInner::reactionButtonParameters(
 	auto result = view->reactionButtonParameters(
 		position,
 		reactionState
-	).translated({ 0, itemTop(view) });
+	).translated({ 0, top });
+	result.visibleTop = _visibleAreaTop;
+	result.visibleBottom = _visibleAreaBottom;
+	result.globalPointer = _mousePosition;
+	return result;
+}
+
+auto HistoryInner::replyButtonParameters(
+	not_null<const Element*> view,
+	QPoint position,
+	const HistoryView::TextState &replyState) const
+-> HistoryView::ReplyButton::ButtonParameters {
+	if (!_useCornerReply) {
+		return {};
+	}
+	const auto top = itemTop(view);
+	if (top < 0
+		|| _mouseAction == MouseAction::Dragging
+		|| inSelectionMode().inSelectionMode) {
+		return {};
+	}
+	auto result = view->replyButtonParameters(
+		position,
+		replyState
+	).translated({ 0, top });
 	result.visibleTop = _visibleAreaTop;
 	result.visibleBottom = _visibleAreaBottom;
 	result.globalPointer = _mousePosition;
@@ -3904,7 +5115,8 @@ auto HistoryInner::reactionButtonParameters(
 }
 
 void HistoryInner::mouseActionUpdate() {
-	if (hasPendingResizedItems()) {
+	if (hasPendingResizedItems()
+		|| (!_mouseActive && !window()->isActiveWindow())) {
 		return;
 	}
 
@@ -3917,8 +5129,15 @@ void HistoryInner::mouseActionUpdate() {
 	const auto reactionState = _reactionsManager->buttonTextState(point);
 	const auto reactionItem = session().data().message(reactionState.itemId);
 	const auto reactionView = viewByItem(reactionItem);
+	const auto replyBtnState = reactionView
+		? HistoryView::TextState()
+		: _replyButtonManager->buttonTextState(point);
+	const auto replyBtnItem = session().data().message(replyBtnState.itemId);
+	const auto replyBtnView = viewByItem(replyBtnItem);
 	const auto view = reactionView
 		? reactionView
+		: replyBtnView
+		? replyBtnView
 		: (_aboutView
 			&& _aboutView->view()
 			&& point.y() >= _aboutView->top
@@ -3928,10 +5147,6 @@ void HistoryInner::mouseActionUpdate() {
 		? _curHistory->blocks[_curBlock]->messages[_curItem].get()
 		: nullptr;
 	const auto item = view ? view->data().get() : nullptr;
-	const auto selectionViewOffset = view
-		? QPoint(SelectionViewOffset(this, view), 0)
-		: QPoint(0, 0);
-	point -= selectionViewOffset;
 	if (view) {
 		const auto changed = (Element::Moused() != view);
 		if (changed) {
@@ -3944,6 +5159,10 @@ void HistoryInner::mouseActionUpdate() {
 			view,
 			m,
 			reactionState));
+		_replyButtonManager->updateButton(replyButtonParameters(
+			view,
+			m,
+			replyBtnState));
 		if (changed) {
 			_reactionsItem = item;
 		}
@@ -3963,6 +5182,7 @@ void HistoryInner::mouseActionUpdate() {
 			Element::Moused(nullptr);
 		}
 		_reactionsManager->updateButton({});
+		_replyButtonManager->updateButton({});
 	}
 	if (_mouseActionItem && !viewByItem(_mouseActionItem)) {
 		mouseActionCancel();
@@ -3970,16 +5190,21 @@ void HistoryInner::mouseActionUpdate() {
 
 	TextState dragState;
 	ClickHandlerHost *lnkhost = nullptr;
+	auto dragStateUserpic = false;
 	auto selectingText = (item == _mouseActionItem)
 		&& (view == Element::Hovered())
-		&& !_selected.empty()
-		&& (_selected.cbegin()->second != FullSelection);
+		&& (_selectedTextItem == item)
+		&& hasSelectedText();
 	const auto overReaction = reactionView && reactionState.link;
+	const auto overReplyBtn = replyBtnView && replyBtnState.link;
 	if (overReaction) {
 		dragState = reactionState;
 		lnkhost = reactionView;
+	} else if (overReplyBtn) {
+		dragState = replyBtnState;
+		lnkhost = _replyButtonManager.get();
 	} else if (item) {
-		if (item != _mouseActionItem || ((m + selectionViewOffset) - _dragStartPosition).manhattanLength() >= QApplication::startDragDistance()) {
+		if (item != _mouseActionItem || (m - _dragStartPosition).manhattanLength() >= QApplication::startDragDistance()) {
 			if (_mouseAction == MouseAction::PrepareDrag) {
 				_mouseAction = MouseAction::Dragging;
 				InvokeQueued(this, [=] { performDrag(); });
@@ -4041,6 +5266,54 @@ void HistoryInner::mouseActionUpdate() {
 			}
 			return true;
 		});
+		if (!dragState.link) {
+			enumerateForumThreadBars([&](not_null<Element*> view, int itemtop, int barTop) {
+				// stop the enumeration if the bar is above our point
+				if (barTop + dateHeight <= point.y()) {
+					return false;
+				}
+
+				const auto displayBar = view->displayForumThreadBar();
+				auto barInPlace = displayBar;
+				if (barInPlace) {
+					const auto correctBarTop = itemtop + view->displayedDateHeight() + st::msgServiceMargin.top();
+					barInPlace = (barTop < correctBarTop + st::msgServiceMargin.top());
+				}
+
+				// stop enumeration if we've found a bar under the cursor
+				if (barTop <= point.y()) {
+					const auto item = view->data();
+					auto barWidth = 0;
+					if (const auto bar = view->Get<HistoryView::ForumThreadBar>()) {
+						barWidth = bar->width;
+					} else {
+						barWidth = _forumThreadBarWidth;
+					}
+					auto barLeft = st::msgServiceMargin.left();
+					auto maxwidth = _contentWidth;
+					if (_isChatWide) {
+						maxwidth = qMin(maxwidth, int32(st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left()));
+					}
+					auto widthForBar = maxwidth - st::msgServiceMargin.left() - st::msgServiceMargin.left();
+
+					barLeft += (widthForBar - barWidth) / 2;
+
+					if (point.x() >= barLeft && point.x() < barLeft + barWidth) {
+						if (!_forumThreadBarLink) {
+							_forumThreadBarLink = std::make_shared<Window::ForumThreadClickHandler>(item);
+						} else {
+							static_cast<Window::ForumThreadClickHandler*>(_forumThreadBarLink.get())->update(item);
+						}
+						dragState = TextState(
+							nullptr,
+							_forumThreadBarLink);
+						_dragStateItem = session().data().message(dragState.itemId);
+						lnkhost = view;
+					}
+				}
+				return true;
+			});
+		}
 		if (!dragState.link) {
 			StateRequest request;
 			if (_mouseAction == MouseAction::Selecting) {
@@ -4065,6 +5338,8 @@ void HistoryInner::mouseActionUpdate() {
 						// stop enumeration if we've found a userpic under the cursor
 						if (point.y() >= userpicTop && point.y() < userpicTop + st::msgPhotoSize) {
 							dragState = TextState(nullptr, view->fromPhotoLink());
+							dragState.cursor = CursorState::FromPhoto;
+							dragStateUserpic = true;
 							_dragStateItem = nullptr;
 							lnkhost = view;
 							return false;
@@ -4076,12 +5351,14 @@ void HistoryInner::mouseActionUpdate() {
 		}
 	}
 	auto lnkChanged = ClickHandler::setActive(dragState.link, lnkhost);
+	_dragStateUserpic = dragStateUserpic;
 	if (lnkChanged || dragState.cursor != _mouseCursorState) {
 		Ui::Tooltip::Hide();
 	}
 	if (dragState.link
 		|| dragState.cursor == CursorState::Date
 		|| dragState.cursor == CursorState::Forwarded
+		|| dragState.cursor == CursorState::FromPhoto
 		|| dragState.customTooltip) {
 		Ui::Tooltip::Show(1000, this);
 	}
@@ -4092,7 +5369,7 @@ void HistoryInner::mouseActionUpdate() {
 		_mouseCursorState = dragState.cursor;
 		if (dragState.link) {
 			cur = style::cur_pointer;
-		} else if (_mouseCursorState == CursorState::Text && (_selected.empty() || _selected.cbegin()->second != FullSelection)) {
+		} else if (_mouseCursorState == CursorState::Text && !hasSelectedItems()) {
 			cur = style::cur_text;
 		} else if (_mouseCursorState == CursorState::Date) {
 			//cur = style::cur_cross;
@@ -4100,28 +5377,12 @@ void HistoryInner::mouseActionUpdate() {
 	} else if (item) {
 		if (_mouseAction == MouseAction::Selecting) {
 			if (selectingText) {
-				uint16 second = dragState.symbol;
-				if (dragState.afterSymbol && _mouseSelectType == TextSelectType::Letters) {
-					++second;
-				}
-				auto selState = TextSelection { qMin(second, _mouseTextSymbol), qMax(second, _mouseTextSymbol) };
-				if (_mouseSelectType != TextSelectType::Letters) {
-					if (const auto view = viewByItem(_mouseActionItem)) {
-						selState = view->adjustSelection(selState, _mouseSelectType);
-					}
-				}
-				if (!selState.empty()) {
-					// We started selecting text in web page preview.
-					ClickHandler::unpressed();
-				}
-				if (_selected[_mouseActionItem] != selState) {
-					_selected[_mouseActionItem] = selState;
-					repaintItem(_mouseActionItem);
-				}
-				if (!_wasSelectedText && (selState == FullSelection || selState.from != selState.to)) {
-					_wasSelectedText = true;
-					setFocus();
-				}
+				setTextSelection(
+					view,
+					view->selectionFromStates(
+						_mouseTextAnchor,
+						dragState,
+						_mouseSelectType));
 				updateDragSelection(nullptr, nullptr, false);
 			} else {
 				auto selectingDown = (itemTop(_mouseActionItem) < itemTop(item)) || (_mouseActionItem == item && _dragStartPosition.y() < m.y());
@@ -4170,8 +5431,7 @@ void HistoryInner::mouseActionUpdate() {
 						: nullptr;
 				}
 				if (dragFirstAffected) {
-					auto i = _selected.find(dragFirstAffected->data());
-					dragSelecting = (i == _selected.cend() || i->second != FullSelection);
+					dragSelecting = !_selected.contains(dragFirstAffected->data());
 				}
 				updateDragSelection(dragSelFrom, dragSelTo, dragSelecting);
 			}
@@ -4181,8 +5441,7 @@ void HistoryInner::mouseActionUpdate() {
 		if (ClickHandler::getPressed()) {
 			cur = style::cur_pointer;
 		} else if ((_mouseAction == MouseAction::Selecting)
-			&& !_selected.empty()
-			&& (_selected.cbegin()->second != FullSelection)) {
+			&& hasSelectedText()) {
 			if (!_dragSelFrom || !_dragSelTo) {
 				cur = style::cur_text;
 			}
@@ -4258,7 +5517,7 @@ int HistoryInner::historyScrollTop() const {
 }
 
 int HistoryInner::migratedTop() const {
-	return (_migrated && !_migrated->isEmpty()) ? _historyPaddingTop : -1;
+	return (_migrated && !_migrated->isEmpty()) ? _historyMarginTop : -1;
 }
 
 int HistoryInner::historyTop() const {
@@ -4266,7 +5525,7 @@ int HistoryInner::historyTop() const {
 	return !_history->isEmpty()
 		? (mig >= 0
 			? (mig + _migrated->height() - _historySkipHeight)
-			: _historyPaddingTop)
+			: _historyMarginTop)
 		: -1;
 }
 
@@ -4313,6 +5572,21 @@ int HistoryInner::itemTop(const Element *view) const {
 	return (top < 0) ? top : (top + view->y() + view->block()->y());
 }
 
+bool HistoryInner::scrollToElementLocalY(
+		not_null<const Element*> view,
+		int localTop) {
+	const auto top = itemTop(view);
+	if (top < 0) {
+		return false;
+	}
+	const auto wanted = _scroll->computeScrollToY(top + localTop, -1);
+	if (wanted == _scroll->scrollTop()) {
+		return true;
+	}
+	_widget->animatedScrollToY(wanted, view->data());
+	return true;
+}
+
 auto HistoryInner::findViewForPinnedTracking(int top) const
 -> std::pair<Element*, int> {
 	const auto normalTop = historyTop();
@@ -4347,6 +5621,18 @@ void HistoryInner::refreshAboutView(bool force) {
 			_aboutView = std::make_unique<HistoryView::AboutView>(
 				_history,
 				_history->delegateMixin()->delegate());
+			_aboutView->refreshRequests() | rpl::on_next([=] {
+				updateBotInfo();
+			}, _aboutView->lifetime());
+			_aboutView->destroyRequests() | rpl::on_next([=] {
+				crl::on_main(this, [=] {
+					refreshAboutView(true);
+					update();
+				});
+			}, _aboutView->lifetime());
+			_aboutView->sendIntroSticker() | rpl::start_to_stream(
+				_sendIntroSticker,
+				_aboutView->lifetime());
 		}
 	};
 	if (const auto user = _peer->asUser()) {
@@ -4355,17 +5641,23 @@ void HistoryInner::refreshAboutView(bool force) {
 			if (!info->inited) {
 				session().api().requestFullPeer(user);
 			}
-		} else if (user->meRequiresPremiumToWrite()
-			&& !user->session().premium()
-			&& !historyHeight()) {
+		} else if (!user->isContact()
+			&& !user->phoneCountryCode().isEmpty()) {
 			refresh();
 		} else if (!historyHeight()) {
-			if (!user->isFullLoaded()) {
-				session().api().requestFullPeer(user);
-			} else {
+			if (user->starsPerMessage() > 0
+				|| (user->requiresPremiumToWrite()
+					&& !user->session().premium())
+				|| user->isFullLoaded()) {
 				refresh();
+			} else {
+				session().api().requestFullPeer(user);
 			}
 		}
+	} else if (const auto monoforum = _peer->asChannel()) {
+		if (monoforum->isMonoforum() && !monoforum->amMonoforumAdmin()) {
+			refresh();
+		}
 	}
 }
 
@@ -4392,8 +5684,7 @@ void HistoryInner::applyDragSelection() {
 bool HistoryInner::isSelected(
 		not_null<SelectedItems*> toItems,
 		not_null<HistoryItem*> item) const {
-	const auto i = toItems->find(item);
-	return (i != toItems->cend()) && (i->second == FullSelection);
+	return toItems->contains(item);
 }
 
 bool HistoryInner::isSelectedGroup(
@@ -4431,25 +5722,13 @@ bool HistoryInner::goodForSelection(
 void HistoryInner::addToSelection(
 		not_null<SelectedItems*> toItems,
 		not_null<HistoryItem*> item) const {
-	const auto i = toItems->find(item);
-	if (i == toItems->cend()) {
-		if (toItems->size() == 1
-			&& toItems->begin()->second != FullSelection) {
-			toItems->clear();
-		}
-		toItems->emplace(item, FullSelection);
-	} else if (i->second != FullSelection) {
-		i->second = FullSelection;
-	}
+	toItems->emplace(item);
 }
 
 void HistoryInner::removeFromSelection(
 		not_null<SelectedItems*> toItems,
 		not_null<HistoryItem*> item) const {
-	const auto i = toItems->find(item);
-	if (i != toItems->cend()) {
-		toItems->erase(i);
-	}
+	toItems->remove(item);
 }
 
 void HistoryInner::changeSelection(
@@ -4505,6 +5784,83 @@ void HistoryInner::changeSelectionAsGroup(
 	}
 }
 
+void HistoryInner::setAccessibilityFocusedItem(
+		int index,
+		HistoryItem *item) {
+	if (_accessibilityFocusedIndex == index
+		&& _accessibilityFocusedItem == item) {
+		return;
+	}
+	_accessibilityFocusedIndex = index;
+	_accessibilityFocusedItem = item;
+	announceAccessibilityFocus(index);
+}
+
+void HistoryInner::announceAccessibilityFocus(int index) {
+	if (index < 0) {
+		return;
+	}
+	accessibilityChildNameChanged(index);
+	accessibilityChildFocused(index);
+}
+
+void HistoryInner::toggleMessageSelection() {
+	if (!hasSelectedItems() || _accessibilityFocusedIndex < 0) {
+		return;
+	}
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && _accessibilityFocusedIndex == barIndex) {
+		return;
+	}
+	const auto elements = accessibleElements();
+	const auto elementIndex = (barIndex >= 0
+		&& _accessibilityFocusedIndex > barIndex)
+		? (_accessibilityFocusedIndex - 1)
+		: _accessibilityFocusedIndex;
+	if (elementIndex < 0 || elementIndex >= int(elements.size())) {
+		return;
+	}
+	const auto item = elements[elementIndex]->data();
+	clearTextSelection();
+	changeSelectionAsGroup(&_selected, item, SelectAction::Invert);
+	repaintItem(item);
+	_widget->updateTopBarSelection();
+	accessibilityChildStateChanged(
+		_accessibilityFocusedIndex,
+		{ .selected = true });
+	accessibilityChildNameChanged(_accessibilityFocusedIndex);
+}
+
+void HistoryInner::playPauseFocusedMedia() {
+	if (_accessibilityFocusedIndex < 0) {
+		return;
+	}
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && _accessibilityFocusedIndex == barIndex) {
+		return;
+	}
+	const auto elements = accessibleElements();
+	const auto elementIndex = (barIndex >= 0
+		&& _accessibilityFocusedIndex > barIndex)
+		? (_accessibilityFocusedIndex - 1)
+		: _accessibilityFocusedIndex;
+	if (elementIndex < 0 || elementIndex >= int(elements.size())) {
+		return;
+	}
+	const auto item = elements[elementIndex]->data();
+	if (const auto media = item->media()) {
+		if (const auto document = media->document()) {
+			if (document->isVoiceMessage()
+				|| document->isSong()
+				|| document->isAudioFile()
+				|| document->isVideoMessage()) {
+				::Media::Player::instance()->playPause(
+					{ document, item->fullId() });
+			}
+		}
+	}
+}
+
 void HistoryInner::forwardItem(FullMsgId itemId) {
 	Window::ShowForwardMessagesBox(_controller, { 1, itemId });
 }
@@ -4530,10 +5886,14 @@ void HistoryInner::deleteItem(not_null<HistoryItem*> item) {
 	}
 	const auto list = HistoryItemsList{ item };
 	if (CanCreateModerateMessagesBox(list)) {
-		_controller->show(Box(CreateModerateMessagesBox, list, nullptr));
+		const auto opt = DefaultModerateMessagesBoxOptions();
+		_controller->show(Box(
+			CreateModerateMessagesBox,
+			ModerateMessagesBoxEntry{ .items = list },
+			nullptr,
+			opt));
 	} else {
-		const auto suggestModerate = false;
-		_controller->show(Box<DeleteMessagesBox>(item, suggestModerate));
+		_controller->show(Box<DeleteMessagesBox>(item));
 	}
 }
 
@@ -4550,8 +5910,9 @@ void HistoryInner::deleteAsGroup(FullMsgId itemId) {
 		} else if (CanCreateModerateMessagesBox(group->items)) {
 			_controller->show(Box(
 				CreateModerateMessagesBox,
-				group->items,
-				nullptr));
+				ModerateMessagesBoxEntry{ .items = group->items },
+				nullptr,
+				ModerateMessagesBoxOptions{}));
 		} else {
 			_controller->show(Box<DeleteMessagesBox>(
 				&session(),
@@ -4579,7 +5940,7 @@ void HistoryInner::reportAsGroup(FullMsgId itemId) {
 }
 
 void HistoryInner::blockSenderItem(FullMsgId itemId) {
-	if (const auto item = session().data().message(itemId)) {
+	if ([[maybe_unused]] const auto item = session().data().message(itemId)) {
 		_controller->show(Box(
 			Window::BlockSenderFromRepliesBox,
 			_controller,
@@ -4622,9 +5983,6 @@ void HistoryInner::applyDragSelection(
 		return;
 	}
 
-	if (!toItems->empty() && toItems->cbegin()->second != FullSelection) {
-		toItems->clear();
-	}
 	const auto botAboutView = _aboutView ? _aboutView->view() : nullptr;
 	if (_dragSelecting) {
 		auto fromblock = (_dragSelFrom != botAboutView)
@@ -4669,14 +6027,14 @@ void HistoryInner::applyDragSelection(
 	} else {
 		auto toRemove = std::vector<not_null<HistoryItem*>>();
 		for (const auto &item : *toItems) {
-			auto iy = itemTop(item.first);
+			auto iy = itemTop(item);
 			if (iy < -1) {
-				toRemove.emplace_back(item.first);
+				toRemove.emplace_back(item);
 			} else if (iy >= 0 && iy >= selfromy && iy < seltoy) {
-				toRemove.emplace_back(item.first);
+				toRemove.emplace_back(item);
 			}
 		}
-		for (const auto item : toRemove) {
+		for (const auto &item : toRemove) {
 			changeSelectionAsGroup(toItems, item, SelectAction::Deselect);
 		}
 	}
@@ -4688,16 +6046,31 @@ QString HistoryInner::tooltipText() const {
 		if (const auto view = Element::Hovered()) {
 			return HistoryView::DateTooltipText(view);
 		}
-	} else if (_mouseCursorState == CursorState::Forwarded
+	}
+	if (_mouseCursorState == CursorState::Forwarded
 		&& _mouseAction == MouseAction::None) {
 		if (const auto view = Element::Moused()) {
 			if (const auto forwarded = view->data()->Get<HistoryMessageForwarded>()) {
 				return forwarded->text.toString();
 			}
 		}
-	} else if (const auto lnk = ClickHandler::getActive()) {
-		return lnk->tooltip();
-	} else if (const auto view = Element::Moused()) {
+	}
+	if (const auto lnk = ClickHandler::getActive()) {
+		using namespace HistoryView::Reactions;
+		const auto count = ReactionCountOfLink(_dragStateItem, lnk);
+		if (count.count && count.shortened) {
+			return Lang::FormatCountDecimal(count.count);
+		}
+		if (const auto text = lnk->tooltip(); !text.isEmpty()) {
+			return text;
+		}
+	}
+	if (const auto view = Element::Moused()) {
+		if (_mouseCursorState == CursorState::FromPhoto) {
+			if (const auto from = view->data()->displayFrom()) {
+				return from->name();
+			}
+		}
 		StateRequest request;
 		const auto local = mapFromGlobal(_mousePosition);
 		const auto point = _widget->clampMousePosition(local);
@@ -4771,7 +6144,295 @@ ClickContext HistoryInner::prepareClickContext(
 	};
 }
 
+auto HistoryInner::sendIntroSticker() const
+-> rpl::producer<not_null<DocumentData*>> {
+	return _sendIntroSticker.events();
+}
+
 auto HistoryInner::DelegateMixin()
 -> std::unique_ptr<HistoryMainElementDelegateMixin> {
 	return std::make_unique<HistoryMainElementDelegate>();
 }
+
+bool CanSendReply(not_null<const HistoryItem*> item) {
+	const auto peer = item->history()->peer;
+	if (const auto topic = item->topic()) {
+		return Data::CanSendAnything(topic);
+	} else if (!Data::CanSendAnything(peer)) {
+		return false;
+	} else if (const auto channel = peer->asChannel()) {
+		if (const auto sublist = item->savedSublist()) {
+			return (sublist->sublistPeer() != peer);
+		}
+		return channel->amIn();
+	}
+	return true;
+}
+
+// Accessibility.
+
+std::vector<HistoryView::Element*> HistoryInner::accessibleElements() const {
+	std::vector<Element*> result;
+	const auto gather = [&](not_null<History*> history) {
+		for (const auto &block : history->blocks) {
+			for (const auto &message : block->messages) {
+				if (!message->isHidden()) {
+					result.push_back(message.get());
+				}
+			}
+		}
+	};
+	if (_migrated) {
+		gather(_migrated);
+	}
+	gather(_history);
+	return result;
+}
+
+int HistoryInner::accessibilityUnreadBarIndex() const {
+	auto *barElement = _history->unreadBar();
+	if (!barElement && _migrated) {
+		barElement = _migrated->unreadBar();
+	}
+	if (!barElement) {
+		return -1;
+	}
+	const auto elements = accessibleElements();
+	for (auto i = 0, count = int(elements.size()); i < count; ++i) {
+		if (elements[i] == barElement) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+int HistoryInner::accessibilityChildCount() const {
+	const auto barIndex = accessibilityUnreadBarIndex();
+	return int(accessibleElements().size()) + (barIndex >= 0 ? 1 : 0);
+}
+
+QString HistoryInner::accessibilityChildName(int index) const {
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && index == barIndex) {
+		auto *barElement = _history->unreadBar();
+		if (!barElement && _migrated) {
+			barElement = _migrated->unreadBar();
+		}
+		return barElement
+			? HistoryView::UnreadBarAccessibilityName(barElement)
+			: tr::lng_unread_bar_some(tr::now);
+	}
+	const auto elements = accessibleElements();
+	const auto elementIndex = (barIndex >= 0 && index > barIndex)
+		? (index - 1)
+		: index;
+	if (elementIndex < 0 || elementIndex >= int(elements.size())) {
+		return {};
+	}
+	return HistoryView::MessageAccessibilityName(
+		elements[elementIndex],
+		_history);
+}
+
+QAccessible::State HistoryInner::accessibilityChildState(int index) const {
+	QAccessible::State state;
+	state.focusable = true;
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex < 0 || index != barIndex) {
+		state.selectable = true;
+		const auto elements = accessibleElements();
+		const auto elementIndex = (barIndex >= 0 && index > barIndex)
+			? (index - 1)
+			: index;
+		if (elementIndex >= 0
+			&& elementIndex < int(elements.size())) {
+			const auto item = elements[elementIndex]->data();
+			if (_selected.contains(item)) {
+				state.selected = true;
+			}
+		}
+	}
+	if (index == _accessibilityFocusedIndex) {
+		state.focused = true;
+		state.active = true;
+	}
+	return state;
+}
+
+QAccessible::Role HistoryInner::accessibilityChildRole() const {
+	return QAccessible::Role::ListItem;
+}
+
+QRect HistoryInner::accessibilityChildRect(int index) const {
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && index == barIndex) {
+		auto *barElement = _history->unreadBar();
+		if (!barElement && _migrated) {
+			barElement = _migrated->unreadBar();
+		}
+		if (barElement) {
+			const auto top = itemTop(barElement);
+			if (top >= 0) {
+				return QRect(
+					0,
+					top,
+					width(),
+					HistoryView::UnreadBar::height());
+			}
+		}
+		return QRect();
+	}
+
+	const auto elements = accessibleElements();
+	const auto elementIndex = (barIndex >= 0 && index > barIndex)
+		? (index - 1)
+		: index;
+	if (elementIndex < 0 || elementIndex >= int(elements.size())) {
+		return QRect();
+	}
+	const auto view = elements[elementIndex];
+	const auto top = itemTop(view);
+	if (top < 0) {
+		return QRect();
+	}
+	// When the unread bar is anchored to a message, that message is
+	// exposed at index barIndex + 1 in index-space (the bar itself
+	// is at barIndex). In element-space the same message sits at
+	// elementIndex == barIndex, so we clip the message rect below
+	// the overlay drawn at the top of the element.
+	if (barIndex >= 0 && elementIndex == barIndex) {
+		const auto barHeight = HistoryView::UnreadBar::height();
+		return QRect(0, top + barHeight, width(), view->height() - barHeight);
+	}
+	return QRect(0, top, width(), view->height());
+}
+
+int HistoryInner::accessibilityChildColumnCount(int row) const {
+	return computeActiveColumns(row).size();
+}
+
+QAccessible::Role HistoryInner::accessibilityChildSubItemRole() const {
+	return QAccessible::Cell;
+}
+
+QString HistoryInner::accessibilityChildSubItemName(
+		int row,
+		int column) const {
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && row == barIndex) {
+		return {};
+	}
+	const auto &active = computeActiveColumns(row);
+	if (column < 0 || column >= int(active.size())) {
+		return {};
+	}
+	return HistoryView::MessageSubItemLabel(active[column]);
+}
+
+QString HistoryInner::accessibilityChildSubItemValue(
+		int row,
+		int column) const {
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && row == barIndex) {
+		return {};
+	}
+	const auto &active = computeActiveColumns(row);
+	if (column < 0 || column >= int(active.size())) {
+		return {};
+	}
+	const auto elements = accessibleElements();
+	const auto elementIndex = (barIndex >= 0 && row > barIndex)
+		? (row - 1)
+		: row;
+	if (elementIndex < 0 || elementIndex >= int(elements.size())) {
+		return {};
+	}
+	return HistoryView::MessageSubItemValue(
+		elements[elementIndex],
+		_history,
+		active[column]);
+}
+
+auto HistoryInner::computeActiveColumns(int row) const
+-> const std::vector<HistoryView::MessageSubItem> & {
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && row == barIndex) {
+		_activeColumns.clear();
+		_activeColumnsView = nullptr;
+		return _activeColumns;
+	}
+	const auto elements = accessibleElements();
+	const auto elementIndex = (barIndex >= 0 && row > barIndex)
+		? (row - 1)
+		: row;
+	if (elementIndex < 0 || elementIndex >= int(elements.size())) {
+		_activeColumns.clear();
+		_activeColumnsView = nullptr;
+		return _activeColumns;
+	}
+	const auto view = elements[elementIndex];
+	if (_activeColumnsView == view) {
+		return _activeColumns;
+	}
+	_activeColumnsView = view;
+	_activeColumns = HistoryView::ActiveMessageSubItems(view, _history);
+	return _activeColumns;
+}
+
+void HistoryInner::focusInEvent(QFocusEvent *e) {
+	RpWidget::focusInEvent(e);
+
+	InvokeQueued(this, [=] {
+		if (!hasFocus()) {
+			return;
+		}
+		const auto count = accessibilityChildCount();
+		if (count <= 0) {
+			return;
+		}
+		if (_accessibilityFocusedItem) {
+			const auto elements = accessibleElements();
+			const auto barIndex = accessibilityUnreadBarIndex();
+			auto found = -1;
+			for (auto i = 0, n = int(elements.size()); i < n; ++i) {
+				if (elements[i]->data().get()
+					== _accessibilityFocusedItem) {
+					found = (barIndex >= 0 && i >= barIndex)
+						? (i + 1)
+						: i;
+					break;
+				}
+			}
+			if (found >= 0 && found < count) {
+				_accessibilityFocusedIndex = found;
+				announceAccessibilityFocus(found);
+				return;
+			}
+			// The cached focused item is no longer in the list (it
+			// was removed since we last had focus). Clear the cache
+			// in-place and fall through to the index-still-valid /
+			// auto-select branches below — those will pick a new
+			// focus target and emit the announcement.
+			_accessibilityFocusedItem = nullptr;
+		}
+		if (_accessibilityFocusedIndex >= 0
+			&& _accessibilityFocusedIndex < count) {
+			announceAccessibilityFocus(_accessibilityFocusedIndex);
+			return;
+		}
+		const auto barIndex = accessibilityUnreadBarIndex();
+		const auto index = (barIndex >= 0 && barIndex + 1 < count)
+			? (barIndex + 1)
+			: (count - 1);
+		const auto elements = accessibleElements();
+		const auto elementIndex = (barIndex >= 0
+			&& index > barIndex)
+			? (index - 1)
+			: index;
+		const auto item = (elementIndex >= 0
+			&& elementIndex < int(elements.size()))
+			? elements[elementIndex]->data().get()
+			: nullptr;
+		setAccessibilityFocusedItem(index, item);
+	});
+}
diff --git a/Telegram/SourceFiles/history/history_inner_widget.h b/Telegram/SourceFiles/history/history_inner_widget.h
index c19c3b8b0c7653..47fa95a0937a45 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.h
+++ b/Telegram/SourceFiles/history/history_inner_widget.h
@@ -10,11 +10,18 @@ For license and copyright information please follow this link:
 #include "base/timer.h"
 #include "data/data_report.h"
 #include "ui/rp_widget.h"
+#include "ui/controls/swipe_handler_data.h"
 #include "ui/effects/animations.h"
+#include "ui/effects/thanos_effect_controller.h"
 #include "ui/dragging_scroll_manager.h"
+#include "ui/widgets/middle_click_autoscroll.h"
 #include "ui/widgets/tooltip.h"
 #include "ui/widgets/scroll_area.h"
-#include "history/history_view_swipe_data.h"
+#include "ui/userpic_view.h"
+#include "history/history_message_selection.h"
+#include "history/history_inner_widget_accessibility.h"
+#include "history/view/history_view_cursor_state.h"
+#include "history/view/history_view_keyboard_text_selection.h"
 #include "history/view/history_view_top_bar_widget.h"
 
 #include <QtGui/QPainterPath>
@@ -34,9 +41,12 @@ struct SelectionModeResult;
 struct StateRequest;
 enum class CursorState : char;
 enum class PointState : char;
+enum class ElementChatMode : char;
+class ElementOverlayHost;
 class EmptyPainter;
 class Element;
 class TranslateTracker;
+class ReadMetricsTracker;
 struct PinnedId;
 struct SelectedQuote;
 class AboutView;
@@ -48,6 +58,11 @@ struct ChosenReaction;
 struct ButtonParameters;
 } // namespace HistoryView::Reactions
 
+namespace HistoryView::ReplyButton {
+class Manager;
+struct ButtonParameters;
+} // namespace HistoryView::ReplyButton
+
 namespace Window {
 class SessionController;
 } // namespace Window
@@ -100,6 +115,25 @@ class HistoryInner
 		not_null<History*> history);
 	~HistoryInner();
 
+	// Accessibility.
+	QAccessible::Role accessibilityRole() override {
+		return QAccessible::Role::List;
+	}
+	Qt::FocusPolicy accessibilityFocusPolicy() override {
+		return Qt::TabFocus;
+	}
+	int accessibilityChildCount() const override;
+	QString accessibilityChildName(int index) const override;
+	QAccessible::State accessibilityChildState(int index) const override;
+	QAccessible::Role accessibilityChildRole() const override;
+	QRect accessibilityChildRect(int index) const override;
+	int accessibilityChildColumnCount(int row) const override;
+	QAccessible::Role accessibilityChildSubItemRole() const override;
+	QString accessibilityChildSubItemName(
+		int row, int column) const override;
+	QString accessibilityChildSubItemValue(
+		int row, int column) const override;
+
 	[[nodiscard]] Main::Session &session() const;
 	[[nodiscard]] not_null<Ui::ChatTheme*> theme() const {
 		return _theme.get();
@@ -107,6 +141,9 @@ class HistoryInner
 
 	Ui::ChatPaintContext preparePaintContext(const QRect &clip) const;
 
+	using CollapseGap = Ui::CollapseGap;
+	void setCollapseGaps(std::vector<CollapseGap> gaps);
+
 	void messagesReceived(
 		not_null<PeerData*> peer,
 		const QVector<MTPMessage> &messages);
@@ -120,13 +157,18 @@ class HistoryInner
 
 	void setItemsRevealHeight(int revealHeight);
 	void changeItemsRevealHeight(int revealHeight);
+	void setPullBottomInset(int inset);
+	[[nodiscard]] int pullBottomInset() const {
+		return _pullBottomInset;
+	}
 	void checkActivation();
-	void recountHistoryGeometry();
+	void recountHistoryGeometry(bool initial = false);
 	void updateSize();
 	void setShownPinned(HistoryItem *item);
 
 	void repaintItem(const HistoryItem *item);
 	void repaintItem(const Element *view);
+	void repaintItem(const Element *view, QRect rect);
 
 	[[nodiscard]] bool canCopySelected() const;
 	[[nodiscard]] bool canDeleteSelected() const;
@@ -145,6 +187,13 @@ class HistoryInner
 	void elementShowPollResults(
 		not_null<PollData*> poll,
 		FullMsgId context);
+	void elementShowAddPollOption(
+		not_null<HistoryView::Element*> view,
+		not_null<PollData*> poll,
+		FullMsgId context,
+		QRect optionRect);
+	void elementSubmitAddPollOption(FullMsgId context);
+	void hideElementOverlay();
 	void elementOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context);
@@ -156,6 +205,9 @@ class HistoryInner
 	void elementShowTooltip(
 		const TextWithEntities &text,
 		Fn<void()> hiddenCallback);
+	void elementShowHiddenSenderTooltip(
+		FullMsgId itemId,
+		const TextWithEntities &text);
 	bool elementAnimationsPaused();
 	void elementSendBotCommand(
 		const QString &command,
@@ -164,7 +216,7 @@ class HistoryInner
 		const QString &query,
 		const FullMsgId &context);
 	void elementHandleViaClick(not_null<UserData*> bot);
-	bool elementIsChatWide();
+	HistoryView::ElementChatMode elementChatMode();
 	not_null<Ui::PathShiftGradient*> elementPathShiftGradient();
 	void elementReplyTo(const FullReplyTo &to);
 	void elementStartInteraction(not_null<const Element*> view);
@@ -192,11 +244,15 @@ class HistoryInner
 
 	void setChooseReportReason(Data::ReportInput reportInput);
 	void clearChooseReportReason();
+	void toggleRemoveFromUserpics(bool remove);
 
 	// -1 if should not be visible, -2 if bad history()
 	[[nodiscard]] int itemTop(const HistoryItem *item) const;
 	[[nodiscard]] int itemTop(const Element *view) const;
 	[[nodiscard]] Element *viewByItem(const HistoryItem *item) const;
+	bool scrollToElementLocalY(
+		not_null<const Element*> view,
+		int localTop);
 
 	// Returns (view, offset-from-top).
 	[[nodiscard]] std::pair<Element*, int> findViewForPinnedTracking(
@@ -221,10 +277,14 @@ class HistoryInner
 		Qt::MouseButton button,
 		FullMsgId itemId) const;
 
+	[[nodiscard]] auto sendIntroSticker() const
+		-> rpl::producer<not_null<DocumentData*>>;
+
 	[[nodiscard]] static auto DelegateMixin()
 	-> std::unique_ptr<HistoryMainElementDelegateMixin>;
 
 protected:
+	void focusInEvent(QFocusEvent *e) override;
 	bool focusNextPrevChild(bool next) override;
 
 	bool eventHook(QEvent *e) override; // calls touchEvent when necessary
@@ -241,8 +301,19 @@ class HistoryInner
 	void contextMenuEvent(QContextMenuEvent *e) override;
 
 private:
+	[[nodiscard]] std::vector<Element*> accessibleElements() const;
+	[[nodiscard]] int accessibilityUnreadBarIndex() const;
+	void toggleMessageSelection();
+	void playPauseFocusedMedia();
+	void setAccessibilityFocusedItem(int index, HistoryItem *item);
+	void announceAccessibilityFocus(int index);
+	[[nodiscard]] auto computeActiveColumns(int row) const
+		-> const std::vector<HistoryView::MessageSubItem> &;
+
 	void onTouchSelect();
 	void onTouchScrollTimer();
+	void markReadMetricsStale();
+	void registerReadMetricsActivity();
 
 	[[nodiscard]] static int SelectionViewOffset(
 		not_null<const HistoryInner*> inner,
@@ -250,7 +321,7 @@ class HistoryInner
 
 	using ChosenReaction = HistoryView::Reactions::ChosenReaction;
 	using VideoUserpic = Dialogs::Ui::VideoUserpic;
-	using SelectedItems = std::map<HistoryItem*, TextSelection, std::less<>>;
+	using SelectedItems = base::flat_set<not_null<HistoryItem*>, std::less<>>;
 	enum class MouseAction {
 		None,
 		PrepareDrag,
@@ -268,15 +339,21 @@ class HistoryInner
 		BottomToTop,
 	};
 	using CursorState = HistoryView::CursorState;
+	using MessageSelection = HistoryView::MessageSelection;
 	using PointState = HistoryView::PointState;
 	using TextState = HistoryView::TextState;
 	using StateRequest = HistoryView::StateRequest;
+	struct RenderSelectionState {
+		TextSelection selection;
+		bool fullMessageSelected = false;
+		const MessageSelection *messageSelection = nullptr;
+	};
 
 	// This function finds all history items that are displayed and calls template method
 	// for each found message (in given direction) in the passed history with passed top offset.
 	//
 	// Method has "bool (*Method)(not_null<Element*> view, int itemtop, int itembottom)" signature
-	// if it returns false the enumeration stops immidiately.
+	// if it returns false the enumeration stops immediately.
 	template <bool TopToBottom, typename Method>
 	void enumerateItemsInHistory(History *history, int historytop, Method method);
 
@@ -296,7 +373,7 @@ class HistoryInner
 	// for each found userpic (from the top to the bottom) using enumerateItems() method.
 	//
 	// Method has "bool (*Method)(not_null<Element*> view, int userpicTop)" signature
-	// if it returns false the enumeration stops immidiately.
+	// if it returns false the enumeration stops immediately.
 	template <typename Method>
 	void enumerateUserpics(Method method);
 
@@ -304,12 +381,21 @@ class HistoryInner
 	// for each found date element (from the bottom to the top) using enumerateItems() method.
 	//
 	// Method has "bool (*Method)(not_null<Element*> view, int itemtop, int dateTop)" signature
-	// if it returns false the enumeration stops immidiately.
+	// if it returns false the enumeration stops immediately.
 	template <typename Method>
 	void enumerateDates(Method method);
 
+	// This function finds all forum thread bar elements that are displayed and calls template method
+	// for each found date element (from the bottom to the top) using enumerateItems() method.
+	//
+	// Method has "bool (*Method)(not_null<Element*> view, int itemtop, int dateTop)" signature
+	// if it returns false the enumeration stops immediately.
+	template <typename Method>
+	void enumerateForumThreadBars(Method method);
+
 	void scrollDateCheck();
 	void scrollDateHideByTimer();
+	void scrollDateCheckDownward();
 	bool canHaveFromUserpics() const;
 	void mouseActionStart(const QPoint &screenPos, Qt::MouseButton button);
 	void mouseActionUpdate();
@@ -327,6 +413,9 @@ class HistoryInner
 
 	QPoint mapPointToItem(QPoint p, const Element *view) const;
 	QPoint mapPointToItem(QPoint p, const HistoryItem *item) const;
+	[[nodiscard]] not_null<HistoryItem*> lookupItemByPoint(
+		QPoint point,
+		not_null<Element*> view) const;
 	[[nodiscard]] HistoryView::SelectedQuote selectedQuote(
 		not_null<HistoryItem*> item) const;
 
@@ -354,12 +443,26 @@ class HistoryInner
 	void adjustCurrent(int32 y, History *history) const;
 	Element *prevItem(Element *item);
 	Element *nextItem(Element *item);
+	[[nodiscard]] bool hasSelectedText() const;
+	void clearTextSelection();
+	void setTextSelection(
+		not_null<Element*> view,
+		MessageSelection selection);
+	[[nodiscard]] TextSelection getSelectedTextRange(
+		not_null<HistoryItem*> item) const;
+	[[nodiscard]] MessageSelection getSelectedTextSelection(
+		not_null<HistoryItem*> item) const;
+	[[nodiscard]] bool isPressInSelectedText(
+		not_null<const Element*> view,
+		TextState state) const;
+	[[nodiscard]] auto selectedItemsForExport() const
+		-> std::vector<not_null<HistoryItem*>>;
 	void updateDragSelection(Element *dragSelFrom, Element *dragSelTo, bool dragSelecting);
-	TextSelection itemRenderSelection(
+	RenderSelectionState itemRenderSelection(
 		not_null<Element*> view,
 		int selfromy,
 		int seltoy) const;
-	TextSelection computeRenderSelection(
+	RenderSelectionState computeRenderSelection(
 		not_null<const SelectedItems*> selected,
 		not_null<Element*> view) const;
 
@@ -415,17 +518,23 @@ class HistoryInner
 	void blockSenderItem(FullMsgId itemId);
 	void blockSenderAsGroup(FullMsgId itemId);
 	void copySelectedText();
+	void editCaptionUploadLayer(not_null<HistoryItem*> item);
 
 	[[nodiscard]] auto reactionButtonParameters(
 		not_null<const Element*> view,
 		QPoint position,
 		const HistoryView::TextState &reactionState) const
 	-> HistoryView::Reactions::ButtonParameters;
+	[[nodiscard]] auto replyButtonParameters(
+		not_null<const Element*> view,
+		QPoint position,
+		const HistoryView::TextState &replyState) const
+	-> HistoryView::ReplyButton::ButtonParameters;
 	void toggleFavoriteReaction(not_null<Element*> view) const;
 	void reactionChosen(const ChosenReaction &reaction);
 
 	void setupSharingDisallowed();
-	void setupSwipeReply();
+	void setupSwipeReplyAndBack();
 	[[nodiscard]] bool hasCopyRestriction(HistoryItem *item = nullptr) const;
 	[[nodiscard]] bool hasCopyMediaRestriction(
 		not_null<HistoryItem*> item) const;
@@ -440,6 +549,11 @@ class HistoryInner
 	// Does any of the shown histories has this flag set.
 	bool hasPendingResizedItems() const;
 
+	int _accessibilityFocusedIndex = -1;
+	HistoryItem *_accessibilityFocusedItem = nullptr;
+	mutable const HistoryView::Element *_activeColumnsView = nullptr;
+	mutable std::vector<HistoryView::MessageSubItem> _activeColumns;
+
 	const not_null<HistoryWidget*> _widget;
 	const not_null<Ui::ScrollArea*> _scroll;
 	const not_null<Window::SessionController*> _controller;
@@ -452,8 +566,12 @@ class HistoryInner
 	History *_migrated = nullptr;
 	HistoryView::ElementDelegate *_migratedElementDelegate = nullptr;
 	int _contentWidth = 0;
-	int _historyPaddingTop = 0;
+	int _historyMarginTop = 0;
+	int _historyMarginBottom = 0;
 	int _revealHeight = 0;
+	int _pullBottomInset = 0;
+	int _forumThreadBarWidth = 0;
+	Ui::PeerUserpicView _forumThreadBarUserpicView;
 
 	// Save visible area coords for painting / pressing userpics.
 	int _visibleAreaTop = 0;
@@ -466,6 +584,9 @@ class HistoryInner
 	std::unique_ptr<HistoryView::AboutView> _aboutView;
 	std::unique_ptr<HistoryView::EmptyPainter> _emptyPainter;
 	std::unique_ptr<HistoryView::TranslateTracker> _translateTracker;
+	std::unique_ptr<HistoryView::ReadMetricsTracker> _readMetricsTracker;
+	bool _readMetricsStale = false;
+	rpl::event_stream<not_null<DocumentData*>> _sendIntroSticker;
 
 	mutable History *_curHistory = nullptr;
 	mutable int _curBlock = 0;
@@ -473,11 +594,16 @@ class HistoryInner
 
 	style::cursor _cursor = style::cur_default;
 	SelectedItems _selected;
+	HistoryItem *_selectedTextItem = nullptr;
+	MessageSelection _selectedTextSelection;
+	TextForMimeData _selectedText;
+	HistoryView::KeyboardTextSelection _keyboardTextSelection;
 	std::optional<Data::ReportInput> _chooseForReportReason;
 
 	const std::unique_ptr<Ui::PathShiftGradient> _pathGradient;
 	QPainterPath _highlightPathCache;
 	bool _isChatWide = false;
+	bool _removeFromUserpics = false;
 
 	base::flat_set<not_null<const HistoryItem*>> _animatedStickersPlayed;
 	base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> _userpics;
@@ -489,6 +615,7 @@ class HistoryInner
 
 	std::unique_ptr<HistoryView::Reactions::Manager> _reactionsManager;
 	rpl::variable<HistoryItem*> _reactionsItem;
+	std::unique_ptr<HistoryView::ReplyButton::Manager> _replyButtonManager;
 	HistoryItem *_pinnedItem = nullptr;
 
 	MouseAction _mouseAction = MouseAction::None;
@@ -498,9 +625,12 @@ class HistoryInner
 	HistoryItem *_mouseActionItem = nullptr;
 	HistoryItem *_dragStateItem = nullptr;
 	CursorState _mouseCursorState = CursorState();
-	uint16 _mouseTextSymbol = 0;
+	TextState _mouseTextAnchor;
+	bool _mouseActive = false;
+	bool _dragStateUserpic = false;
 	bool _pressWasInactive = false;
 	bool _recountedAfterPendingResizedItems = false;
+	bool _useCornerReply = false;
 	bool _useCornerReaction = false;
 	bool _acceptsHorizontalScroll = false;
 	bool _horizontalScrollLocked = false;
@@ -536,8 +666,10 @@ class HistoryInner
 	crl::time _touchAccelerationTime = 0;
 	crl::time _touchTime = 0;
 	base::Timer _touchScrollTimer;
+	Ui::MiddleClickAutoscroll _middleClickAutoscroll;
 
-	HistoryView::ChatPaintGestureHorizontalData _gestureHorizontal;
+	Ui::Controls::SwipeContextData _gestureHorizontal;
+	Ui::Controls::SwipeBackResult _swipeBackData;
 
 	// _menu must be destroyed before _whoReactedMenuLifetime.
 	rpl::lifetime _whoReactedMenuLifetime;
@@ -549,6 +681,18 @@ class HistoryInner
 	base::Timer _scrollDateHideTimer;
 	Element *_scrollDateLastItem = nullptr;
 	int _scrollDateLastItemTop = 0;
+	bool _scrollDateAfterDayCrossing = false;
 	ClickHandlerPtr _scrollDateLink;
+	ClickHandlerPtr _forumThreadBarLink;
+
+	[[nodiscard]] HistoryView::ElementOverlayHost &ensureOverlayHost();
+	std::unique_ptr<HistoryView::ElementOverlayHost> _overlayHost;
+
+	void setupThanosEffect();
+
+	std::unique_ptr<Ui::ThanosEffectController> _thanosController;
+	std::vector<CollapseGap> _collapseGaps;
 
 };
+
+[[nodiscard]] bool CanSendReply(not_null<const HistoryItem*> item);
diff --git a/Telegram/SourceFiles/history/history_inner_widget_accessibility.cpp b/Telegram/SourceFiles/history/history_inner_widget_accessibility.cpp
new file mode 100644
index 00000000000000..69b5171659caa1
--- /dev/null
+++ b/Telegram/SourceFiles/history/history_inner_widget_accessibility.cpp
@@ -0,0 +1,1178 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/history_inner_widget_accessibility.h"
+
+#include "base/unixtime.h"
+#include "data/data_document.h"
+#include "data/data_game.h"
+#include "data/data_media_types.h"
+#include "data/data_message_reaction_id.h"
+#include "data/data_photo.h"
+#include "data/data_poll.h"
+#include "data/data_session.h"
+#include "data/data_todo_list.h"
+#include "data/data_user.h"
+#include "data/data_web_page.h"
+#include "history/view/history_view_element.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
+#include "lang/lang_keys.h"
+#include "ui/text/format_values.h"
+
+namespace HistoryView {
+
+QString MessageAccessibilityName(
+		not_null<const Element*> view,
+		not_null<History*> history) {
+	const auto item = view->data();
+
+	if (item->isService()) {
+		const auto text = item->notificationText().text;
+		return text.isEmpty() ? QString() : text;
+	}
+
+	QStringList lines;
+
+	if (item->out()) {
+		lines.push_back(item->unread(history)
+			? tr::lng_sr_message_not_seen(tr::now)
+			: tr::lng_sr_message_seen(tr::now));
+	}
+
+	if (item->out()) {
+		lines.push_back(tr::lng_sr_from_me(tr::now));
+	} else if (const auto from = item->displayFrom()) {
+		lines.push_back(from->name());
+	}
+
+	if (const auto bot = item->viaBot()) {
+		lines.push_back(tr::lng_inline_bot_via(
+			tr::now,
+			lt_inline_bot,
+			'@' + bot->username()));
+	}
+
+	if (const auto reply = item->Get<HistoryMessageReply>()) {
+		if (const auto message = reply->resolvedMessage.get()) {
+			const auto replyFrom = message->displayFrom();
+			const auto replyName = replyFrom
+				? replyFrom->name()
+				: QString();
+			const auto replyText = message->inReplyText().text;
+			if (!replyName.isEmpty() || !replyText.isEmpty()) {
+				lines.push_back(tr::lng_sr_message_reply_to(
+					tr::now,
+					lt_name,
+					replyName.isEmpty()
+						? tr::lng_sr_from_me(tr::now)
+						: replyName,
+					lt_text,
+					replyText));
+			}
+		}
+	}
+
+	if (const auto forwarded = item->Get<HistoryMessageForwarded>()) {
+		if (forwarded->originalSender) {
+			lines.push_back(tr::lng_forwarded(
+				tr::now,
+				lt_user,
+				forwarded->originalSender->name()));
+		} else if (forwarded->originalHiddenSenderInfo) {
+			lines.push_back(tr::lng_forwarded(
+				tr::now,
+				lt_user,
+				forwarded->originalHiddenSenderInfo->name));
+		}
+	}
+
+	if (const auto media = item->media()) {
+		QStringList mediaParts;
+		if (const auto document = media->document()) {
+			if (document->isVoiceMessage()) {
+				mediaParts.push_back(tr::lng_in_dlg_audio(tr::now));
+			} else if (document->isVideoMessage()) {
+				mediaParts.push_back(tr::lng_in_dlg_video_message(tr::now));
+			} else if (document->isSong()) {
+				mediaParts.push_back(tr::lng_in_dlg_audio_file(tr::now));
+			} else if (document->isVideoFile()) {
+				mediaParts.push_back(tr::lng_in_dlg_video(tr::now));
+			} else if (document->isAnimation()) {
+				mediaParts.push_back(u"GIF"_q);
+			} else if (const auto sticker = document->sticker()) {
+				mediaParts.push_back(tr::lng_in_dlg_sticker(tr::now));
+				if (!sticker->alt.isEmpty()) {
+					mediaParts.push_back(sticker->alt);
+				}
+			} else {
+				mediaParts.push_back(tr::lng_in_dlg_file(tr::now));
+			}
+			if (document->loading()) {
+				mediaParts.push_back(
+					tr::lng_sr_message_downloading(tr::now));
+			} else if (!document->filepath(true).isEmpty()
+					|| document->loadedInMediaCache()) {
+				mediaParts.push_back(
+					tr::lng_emoji_set_ready(tr::now));
+			} else {
+				mediaParts.push_back(
+					tr::lng_sr_message_not_downloaded(tr::now));
+			}
+			if (document->isVoiceMessage()
+				|| document->isVideoMessage()) {
+				mediaParts.push_back(item->isUnreadMedia()
+					? tr::lng_sr_message_not_played(tr::now)
+					: tr::lng_sr_message_played(tr::now));
+			}
+			if (const auto song = document->song()) {
+				if (!song->performer.isEmpty()) {
+					mediaParts.push_back(song->performer);
+				}
+				if (!song->title.isEmpty()) {
+					mediaParts.push_back(song->title);
+				}
+			}
+			if (!document->isSong()
+				&& !document->isVoiceMessage()
+				&& !document->isVideoMessage()
+				&& !document->sticker()) {
+				const auto name = document->filename();
+				if (!name.isEmpty()) {
+					mediaParts.push_back(name);
+				}
+			}
+			const auto duration = document->duration();
+			if (duration > 0) {
+				mediaParts.push_back(
+					Ui::FormatDurationText(duration / 1000));
+			}
+			if (!document->dimensions.isEmpty()
+				&& (document->isVideoFile()
+					|| document->isImage())) {
+				mediaParts.push_back(
+					Ui::FormatImageSizeText(document->dimensions));
+			}
+			if (document->size > 0) {
+				mediaParts.push_back(
+					Ui::FormatSizeText(document->size));
+			}
+		} else if (const auto photo = media->photo()) {
+			mediaParts.push_back(tr::lng_in_dlg_photo(tr::now));
+			if (media->hasSpoiler()) {
+				mediaParts.push_back(
+					tr::lng_sr_message_spoiler(tr::now));
+			}
+			const auto large = photo->size(
+				Data::PhotoSize::Large);
+			if (large && !large->isEmpty()) {
+				mediaParts.push_back(
+					Ui::FormatImageSizeText(*large));
+			}
+		} else if (const auto call = media->call()) {
+			const auto notification = item->notificationText().text;
+			if (!notification.isEmpty()) {
+				mediaParts.push_back(notification);
+			}
+			if (call->duration > 0) {
+				mediaParts.push_back(
+					Ui::FormatDurationText(call->duration));
+			}
+		} else if (const auto poll = media->poll()) {
+			mediaParts.push_back(poll->quiz()
+				? tr::lng_polls_public_quiz(tr::now)
+				: tr::lng_polls_public(tr::now));
+			if (!poll->question.text.isEmpty()) {
+				mediaParts.push_back(poll->question.text);
+			}
+			if (poll->closed()) {
+				mediaParts.push_back(
+					tr::lng_hours_closed(tr::now));
+			}
+			mediaParts.push_back(tr::lng_polls_votes_count(
+				tr::now,
+				lt_count,
+				poll->totalVoters));
+		} else if (const auto contact = media->sharedContact()) {
+			auto contactName = contact->firstName;
+			if (!contact->lastName.isEmpty()) {
+				if (!contactName.isEmpty()) {
+					contactName += u" "_q;
+				}
+				contactName += contact->lastName;
+			}
+			if (!contactName.isEmpty()) {
+				mediaParts.push_back(contactName);
+			}
+			if (!contact->phoneNumber.isEmpty()) {
+				mediaParts.push_back(contact->phoneNumber);
+			}
+		} else if (media->location()) {
+			mediaParts.push_back(item->notificationText().text);
+		} else if (const auto game = media->game()) {
+			if (!game->title.isEmpty()) {
+				mediaParts.push_back(game->title);
+			}
+		} else if (const auto invoice = media->invoice()) {
+			if (!invoice->title.isEmpty()) {
+				mediaParts.push_back(invoice->title);
+			}
+			mediaParts.push_back(invoice->currency
+				+ u" "_q
+				+ QString::number(invoice->amount / 100.0, 'f', 2));
+		} else if (const auto gift = media->gift()) {
+			switch (gift->type) {
+			case Data::GiftType::Premium:
+				mediaParts.push_back(
+					tr::lng_sr_message_gift_premium(
+						tr::now,
+						lt_count,
+						gift->count));
+				break;
+			case Data::GiftType::Credits:
+			case Data::GiftType::StarGift:
+				mediaParts.push_back(
+					tr::lng_sr_message_gift_credits(
+						tr::now,
+						lt_count,
+						gift->count));
+				break;
+			default:
+				if (!gift->giftTitle.isEmpty()) {
+					mediaParts.push_back(gift->giftTitle);
+				}
+				break;
+			}
+		} else if (const auto todolist = media->todolist()) {
+			if (!todolist->title.text.isEmpty()) {
+				mediaParts.push_back(todolist->title.text);
+			}
+		} else if (media->giveawayStart() || media->giveawayResults()) {
+			mediaParts.push_back(item->notificationText().text);
+		} else {
+			const auto notification = item->notificationText().text;
+			if (!notification.isEmpty()) {
+				mediaParts.push_back(notification);
+			}
+		}
+		if (!mediaParts.isEmpty()) {
+			lines.push_back(mediaParts.join(u", "_q));
+		}
+		if (const auto webpage = media->webpage()) {
+			QStringList webParts;
+			if (!webpage->siteName.isEmpty()) {
+				webParts.push_back(webpage->siteName);
+			}
+			if (!webpage->title.isEmpty()) {
+				webParts.push_back(webpage->title);
+			}
+			if (!webpage->description.text.isEmpty()) {
+				webParts.push_back(webpage->description.text);
+			}
+			if (!webParts.isEmpty()) {
+				lines.push_back(webParts.join(u": "_q));
+			}
+		}
+		const auto &caption = item->originalText().text;
+		if (!caption.isEmpty()) {
+			lines.push_back(caption);
+		}
+	} else {
+		const auto &text = item->originalText().text;
+		if (!text.isEmpty()) {
+			lines.push_back(text);
+		}
+	}
+
+	const auto factcheck = item->factcheckText();
+	if (!factcheck.empty()) {
+		lines.push_back(factcheck.text);
+	}
+
+	if (item->isPinned()) {
+		lines.push_back(tr::lng_sr_chat_pinned(tr::now));
+	}
+
+	QStringList statusParts;
+	if (item->out()) {
+		if (item->isSending()) {
+			statusParts.push_back(tr::lng_sr_chat_sending(tr::now));
+		} else if (item->hasFailed()) {
+			statusParts.push_back(tr::lng_sr_chat_failed(tr::now));
+		} else {
+			statusParts.push_back(tr::lng_sr_chat_sent(tr::now));
+		}
+	} else {
+		statusParts.push_back(tr::lng_sr_chat_received(tr::now));
+	}
+	if (item->Has<HistoryMessageEdited>()) {
+		statusParts.push_back(tr::lng_edited(tr::now));
+	}
+	const auto dateTime = view->dateTime();
+	statusParts.push_back(
+		tr::lng_schedule_at(tr::now)
+		+ u" "_q
+		+ QLocale().toString(dateTime.time(), QLocale::ShortFormat));
+	if (const auto views = item->Get<HistoryMessageViews>()) {
+		if (views->views.count >= 0) {
+			statusParts.push_back(
+				QString::number(views->views.count)
+				+ u" "_q
+				+ tr::lng_stats_overview_message_views(tr::now));
+		}
+	}
+	if (const auto signed_ = item->Get<HistoryMessageSigned>()) {
+		if (!signed_->author.isEmpty()) {
+			statusParts.push_back(signed_->author);
+		}
+	}
+	lines.push_back(statusParts.join(u" "_q));
+
+	const auto &reactions = item->reactions();
+	if (!reactions.empty()) {
+		QStringList reactionParts;
+		for (const auto &reaction : reactions) {
+			auto text = reaction.id.emoji();
+			if (text.isEmpty()) {
+				if (const auto customId = reaction.id.custom()) {
+					const auto doc = item->history()->owner().document(
+						customId);
+					if (const auto sticker = doc->sticker()) {
+						text = tr::lng_sr_message_custom_emoji(
+							tr::now,
+							lt_emoji,
+							sticker->alt);
+					}
+				}
+			}
+			if (!text.isEmpty()) {
+				if (reaction.count > 1) {
+					reactionParts.push_back(
+						text + u" "_q + QString::number(reaction.count));
+				} else {
+					reactionParts.push_back(text);
+				}
+			}
+		}
+		if (!reactionParts.isEmpty()) {
+			lines.push_back(tr::lng_notification_reactions(tr::now)
+				+ u": "_q
+				+ reactionParts.join(u", "_q));
+		}
+	}
+
+	return lines.join(u"\n"_q);
+}
+
+QString UnreadBarAccessibilityName(not_null<const Element*> barElement) {
+	if (const auto bar = barElement->Get<HistoryView::UnreadBar>()) {
+		return bar->text;
+	}
+	return tr::lng_unread_bar_some(tr::now);
+}
+
+QString MessageSubItemLabel(MessageSubItem item) {
+	switch (item) {
+	case MessageSubItem::Seen:
+		return tr::lng_sr_message_seen(tr::now);
+	case MessageSubItem::Sender:
+		return tr::lng_sr_chat_column_sender(tr::now);
+	case MessageSubItem::ViaBot:
+		return tr::lng_inline_bot_via(tr::now, lt_inline_bot, QString());
+	case MessageSubItem::Reply:
+		return tr::lng_notification_reply(tr::now);
+	case MessageSubItem::Forward:
+		return tr::lng_sr_chat_column_forward(tr::now);
+	case MessageSubItem::MediaType:
+		return tr::lng_sr_message_column_media_type(tr::now);
+	case MessageSubItem::Download:
+		return tr::lng_media_download(tr::now);
+	case MessageSubItem::Played:
+		return tr::lng_sr_message_played(tr::now);
+	case MessageSubItem::Artist:
+		return tr::lng_sr_message_column_artist(tr::now);
+	case MessageSubItem::Title:
+		return tr::lng_sr_message_column_title(tr::now);
+	case MessageSubItem::Filename:
+		return tr::lng_sr_message_column_filename(tr::now);
+	case MessageSubItem::Duration:
+		return tr::lng_sr_message_column_duration(tr::now);
+	case MessageSubItem::Dimensions:
+		return tr::lng_sr_message_column_dimensions(tr::now);
+	case MessageSubItem::FileSize:
+		return tr::lng_sr_message_column_file_size(tr::now);
+	case MessageSubItem::Message:
+		return tr::lng_sr_chat_column_message(tr::now);
+	case MessageSubItem::Delivery:
+		return tr::lng_sr_chat_column_delivery(tr::now);
+	case MessageSubItem::Edited:
+		return tr::lng_edited(tr::now);
+	case MessageSubItem::Time:
+		return tr::lng_sr_chat_column_time(tr::now);
+	case MessageSubItem::Reactions:
+		return tr::lng_notification_reactions(tr::now);
+	case MessageSubItem::Views:
+		return tr::lng_stats_overview_message_views(tr::now);
+	case MessageSubItem::Signature:
+		return tr::lng_sr_message_column_signature(tr::now);
+	case MessageSubItem::Pinned:
+		return tr::lng_sr_chat_pinned(tr::now);
+	case MessageSubItem::WebSite:
+		return tr::lng_sr_message_column_web_site(tr::now);
+	case MessageSubItem::WebTitle:
+		return tr::lng_sr_message_column_web_title(tr::now);
+	case MessageSubItem::WebDescription:
+		return tr::lng_sr_message_column_web_description(tr::now);
+	case MessageSubItem::PollQuestion:
+		return tr::lng_sr_message_column_poll_question(tr::now);
+	case MessageSubItem::PollOptions:
+		return tr::lng_polls_create_options(tr::now);
+	case MessageSubItem::PollStatus:
+		return tr::lng_sr_message_column_poll_status(tr::now);
+	case MessageSubItem::ContactName:
+		return tr::lng_sr_message_column_contact_name(tr::now);
+	case MessageSubItem::ContactPhone:
+		return tr::lng_sr_message_column_contact_phone(tr::now);
+	case MessageSubItem::Location:
+		return tr::lng_sr_message_column_location(tr::now);
+	case MessageSubItem::StickerEmoji:
+		return tr::lng_sr_message_column_sticker_emoji(tr::now);
+	case MessageSubItem::GameTitle:
+		return tr::lng_sr_message_column_game_title(tr::now);
+	case MessageSubItem::GameDescription:
+		return tr::lng_sr_message_column_game_description(tr::now);
+	case MessageSubItem::InvoiceTitle:
+		return tr::lng_sr_message_column_invoice_title(tr::now);
+	case MessageSubItem::InvoiceAmount:
+		return tr::lng_sr_message_column_invoice_amount(tr::now);
+	case MessageSubItem::Spoiler:
+		return tr::lng_sr_message_column_spoiler(tr::now);
+	case MessageSubItem::Dice:
+		return tr::lng_sr_message_column_dice(tr::now);
+	case MessageSubItem::Giveaway:
+		return tr::lng_sr_message_column_giveaway(tr::now);
+	case MessageSubItem::Gift:
+		return tr::lng_sr_message_column_gift(tr::now);
+	case MessageSubItem::TodoTitle:
+		return tr::lng_sr_message_column_todo_title(tr::now);
+	case MessageSubItem::TodoItems:
+		return tr::lng_sr_message_column_todo_items(tr::now);
+	case MessageSubItem::Factcheck:
+		return tr::lng_sr_message_column_factcheck(tr::now);
+	case MessageSubItem::ForwardDate:
+		return tr::lng_sr_message_column_forward_date(tr::now);
+	case MessageSubItem::ForwardAuthor:
+		return tr::lng_sr_message_column_forward_author(tr::now);
+	case MessageSubItem::PaidReactions:
+		return tr::lng_sr_message_column_paid_reactions(tr::now);
+	case MessageSubItem::Count:
+		break;
+	}
+	return {};
+}
+
+QString MessageSubItemValue(
+		not_null<const Element*> view,
+		not_null<History*> history,
+		MessageSubItem item) {
+	const auto data = view->data();
+	if (data->isService()) {
+		if (item == MessageSubItem::Message) {
+			return data->notificationText().text;
+		}
+		return {};
+	}
+
+	switch (item) {
+	case MessageSubItem::Seen:
+		if (data->out()) {
+			return data->unread(history)
+				? tr::lng_sr_message_not_seen(tr::now)
+				: tr::lng_sr_message_seen(tr::now);
+		}
+		return {};
+	case MessageSubItem::Sender:
+		if (data->out()) {
+			return tr::lng_sr_from_me(tr::now);
+		} else if (const auto from = data->displayFrom()) {
+			return from->name();
+		}
+		return {};
+	case MessageSubItem::ViaBot:
+		if (const auto bot = data->viaBot()) {
+			return tr::lng_inline_bot_via(
+				tr::now,
+				lt_inline_bot,
+				'@' + bot->username());
+		}
+		return {};
+	case MessageSubItem::Reply:
+		if (const auto reply = data->Get<HistoryMessageReply>()) {
+			if (const auto message = reply->resolvedMessage.get()) {
+				const auto replyFrom = message->displayFrom();
+				const auto replyName = replyFrom
+					? replyFrom->name()
+					: QString();
+				const auto replyText = message->inReplyText().text;
+				if (!replyName.isEmpty() || !replyText.isEmpty()) {
+					return tr::lng_sr_message_reply_to(
+						tr::now,
+						lt_name,
+						replyName.isEmpty()
+							? tr::lng_sr_from_me(tr::now)
+							: replyName,
+						lt_text,
+						replyText);
+				}
+			}
+		}
+		return {};
+	case MessageSubItem::Forward:
+		if (const auto fwd = data->Get<HistoryMessageForwarded>()) {
+			if (fwd->originalSender) {
+				return tr::lng_forwarded(
+					tr::now,
+					lt_user,
+					fwd->originalSender->name());
+			} else if (fwd->originalHiddenSenderInfo) {
+				return tr::lng_forwarded(
+					tr::now,
+					lt_user,
+					fwd->originalHiddenSenderInfo->name);
+			}
+		}
+		return {};
+	case MessageSubItem::MediaType: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		if (const auto document = media->document()) {
+			if (document->isVoiceMessage()) {
+				return tr::lng_in_dlg_audio(tr::now);
+			} else if (document->isVideoMessage()) {
+				return tr::lng_in_dlg_video_message(tr::now);
+			} else if (document->isSong()) {
+				return tr::lng_in_dlg_audio_file(tr::now);
+			} else if (document->isVideoFile()) {
+				return tr::lng_in_dlg_video(tr::now);
+			} else if (document->isAnimation()) {
+				return u"GIF"_q;
+			} else if (document->sticker()) {
+				return tr::lng_in_dlg_sticker(tr::now);
+			}
+			return tr::lng_in_dlg_file(tr::now);
+		} else if (media->photo()) {
+			return tr::lng_in_dlg_photo(tr::now);
+		} else if (media->call()) {
+			return data->notificationText().text;
+		}
+		return data->notificationText().text;
+	}
+	case MessageSubItem::Download: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto document = media->document();
+		if (!document) {
+			return {};
+		}
+		if (document->loading()) {
+			return tr::lng_sr_message_downloading(tr::now);
+		} else if (!document->filepath(true).isEmpty()
+			|| document->loadedInMediaCache()) {
+			return tr::lng_emoji_set_ready(tr::now);
+		}
+		return tr::lng_sr_message_not_downloaded(tr::now);
+	}
+	case MessageSubItem::Played: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto document = media->document();
+		if (!document) {
+			return {};
+		}
+		if (document->isVoiceMessage()
+			|| document->isVideoMessage()) {
+			return data->isUnreadMedia()
+				? tr::lng_sr_message_not_played(tr::now)
+				: tr::lng_sr_message_played(tr::now);
+		}
+		return {};
+	}
+	case MessageSubItem::Artist: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto document = media->document();
+		if (!document) {
+			return {};
+		}
+		if (const auto song = document->song()) {
+			return song->performer;
+		}
+		return {};
+	}
+	case MessageSubItem::Title: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto document = media->document();
+		if (!document) {
+			return {};
+		}
+		if (const auto song = document->song()) {
+			return song->title;
+		}
+		return {};
+	}
+	case MessageSubItem::Filename: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto document = media->document();
+		if (!document
+			|| document->isSong()
+			|| document->isVoiceMessage()
+			|| document->isVideoMessage()
+			|| document->sticker()) {
+			return {};
+		}
+		return document->filename();
+	}
+	case MessageSubItem::Duration: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		if (const auto document = media->document()) {
+			const auto duration = document->duration();
+			if (duration > 0) {
+				return Ui::FormatDurationText(duration / 1000);
+			}
+		} else if (const auto call = media->call()) {
+			if (call->duration > 0) {
+				return Ui::FormatDurationText(call->duration);
+			}
+		}
+		return {};
+	}
+	case MessageSubItem::Dimensions: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		if (const auto document = media->document()) {
+			if (!document->dimensions.isEmpty()
+				&& (document->isVideoFile()
+					|| document->isImage())) {
+				return Ui::FormatImageSizeText(document->dimensions);
+			}
+		} else if (const auto photo = media->photo()) {
+			const auto large = photo->size(
+				Data::PhotoSize::Large);
+			if (large && !large->isEmpty()) {
+				return Ui::FormatImageSizeText(*large);
+			}
+		}
+		return {};
+	}
+	case MessageSubItem::FileSize: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto document = media->document();
+		if (!document || document->size <= 0) {
+			return {};
+		}
+		return Ui::FormatSizeText(document->size);
+	}
+	case MessageSubItem::Message: {
+		if (data->media()) {
+			return data->originalText().text;
+		}
+		return data->originalText().text;
+	}
+	case MessageSubItem::Delivery:
+		if (data->out()) {
+			if (data->isSending()) {
+				return tr::lng_sr_chat_sending(tr::now);
+			} else if (data->hasFailed()) {
+				return tr::lng_sr_chat_failed(tr::now);
+			}
+			return tr::lng_sr_chat_sent(tr::now);
+		}
+		return tr::lng_sr_chat_received(tr::now);
+	case MessageSubItem::Edited:
+		if (data->Has<HistoryMessageEdited>()) {
+			return tr::lng_edited(tr::now);
+		}
+		return {};
+	case MessageSubItem::Time: {
+		const auto dateTime = view->dateTime();
+		return tr::lng_schedule_at(tr::now)
+			+ u" "_q
+			+ QLocale().toString(dateTime.time(), QLocale::ShortFormat);
+	}
+	case MessageSubItem::Reactions: {
+		const auto &reactions = data->reactions();
+		if (reactions.empty()) {
+			return {};
+		}
+		QStringList reactionParts;
+		for (const auto &reaction : reactions) {
+			auto text = reaction.id.emoji();
+			if (text.isEmpty()) {
+				if (const auto customId = reaction.id.custom()) {
+					const auto doc = data->history()->owner().document(
+						customId);
+					if (const auto sticker = doc->sticker()) {
+						text = tr::lng_sr_message_custom_emoji(
+							tr::now,
+							lt_emoji,
+							sticker->alt);
+					}
+				}
+			}
+			if (!text.isEmpty()) {
+				if (reaction.count > 1) {
+					reactionParts.push_back(
+						text + u" "_q + QString::number(reaction.count));
+				} else {
+					reactionParts.push_back(text);
+				}
+			}
+		}
+		return reactionParts.join(u", "_q);
+	}
+	case MessageSubItem::Views: {
+		const auto views = data->Get<HistoryMessageViews>();
+		if (views && views->views.count >= 0) {
+			return QString::number(views->views.count);
+		}
+		return {};
+	}
+	case MessageSubItem::Signature: {
+		const auto signed_ = data->Get<HistoryMessageSigned>();
+		if (signed_ && !signed_->author.isEmpty()) {
+			return signed_->author;
+		}
+		return {};
+	}
+	case MessageSubItem::Pinned:
+		if (data->isPinned()) {
+			return tr::lng_sr_chat_pinned(tr::now);
+		}
+		return {};
+	case MessageSubItem::WebSite: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto webpage = media->webpage();
+		if (webpage) {
+			return webpage->siteName;
+		}
+		return {};
+	}
+	case MessageSubItem::WebTitle: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto webpage = media->webpage();
+		if (webpage) {
+			return webpage->title;
+		}
+		return {};
+	}
+	case MessageSubItem::WebDescription: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto webpage = media->webpage();
+		if (webpage) {
+			return webpage->description.text;
+		}
+		return {};
+	}
+	case MessageSubItem::PollQuestion: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto poll = media->poll();
+		if (poll) {
+			return poll->question.text;
+		}
+		return {};
+	}
+	case MessageSubItem::PollOptions: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto poll = media->poll();
+		if (!poll) {
+			return {};
+		}
+		QStringList options;
+		for (const auto &answer : poll->answers) {
+			auto line = answer.text.text;
+			if (poll->totalVoters > 0 && answer.votes > 0) {
+				const auto percent = (answer.votes * 100)
+					/ poll->totalVoters;
+				line += u" ("_q
+					+ QString::number(percent)
+					+ u"%, "_q
+					+ QString::number(answer.votes)
+					+ u")"_q;
+			}
+			if (answer.chosen) {
+				line += u" ✓"_q;
+			}
+			if (answer.correct) {
+				line += u" ✔"_q;
+			}
+			options.push_back(line);
+		}
+		return options.join(u"; "_q);
+	}
+	case MessageSubItem::PollStatus: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto poll = media->poll();
+		if (!poll) {
+			return {};
+		}
+		QStringList parts;
+		parts.push_back(poll->quiz()
+			? tr::lng_polls_public_quiz(tr::now)
+			: tr::lng_polls_public(tr::now));
+		if (poll->closed()) {
+			parts.push_back(
+				tr::lng_hours_closed(tr::now));
+		}
+		parts.push_back(tr::lng_polls_votes_count(
+			tr::now,
+			lt_count,
+			poll->totalVoters));
+		return parts.join(u", "_q);
+	}
+	case MessageSubItem::ContactName: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto contact = media->sharedContact();
+		if (!contact) {
+			return {};
+		}
+		auto name = contact->firstName;
+		if (!contact->lastName.isEmpty()) {
+			if (!name.isEmpty()) {
+				name += u" "_q;
+			}
+			name += contact->lastName;
+		}
+		return name;
+	}
+	case MessageSubItem::ContactPhone: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto contact = media->sharedContact();
+		if (contact) {
+			return contact->phoneNumber;
+		}
+		return {};
+	}
+	case MessageSubItem::Location: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		if (media->location()) {
+			return data->notificationText().text;
+		}
+		return {};
+	}
+	case MessageSubItem::StickerEmoji: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto document = media->document();
+		if (!document) {
+			return {};
+		}
+		if (const auto sticker = document->sticker()) {
+			return sticker->alt;
+		}
+		return {};
+	}
+	case MessageSubItem::GameTitle: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto game = media->game();
+		if (game) {
+			return game->title;
+		}
+		return {};
+	}
+	case MessageSubItem::GameDescription: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto game = media->game();
+		if (game) {
+			return game->description;
+		}
+		return {};
+	}
+	case MessageSubItem::InvoiceTitle: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto invoice = media->invoice();
+		if (invoice) {
+			return invoice->title;
+		}
+		return {};
+	}
+	case MessageSubItem::InvoiceAmount: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto invoice = media->invoice();
+		if (!invoice) {
+			return {};
+		}
+		auto result = invoice->currency
+			+ u" "_q
+			+ QString::number(invoice->amount / 100.0, 'f', 2);
+		if (invoice->receiptMsgId) {
+			result += u" ("_q
+				+ tr::lng_sr_message_invoice_paid(tr::now)
+				+ u")"_q;
+		} else {
+			result += u" ("_q
+				+ tr::lng_sr_message_invoice_unpaid(tr::now)
+				+ u")"_q;
+		}
+		return result;
+	}
+	case MessageSubItem::Spoiler: {
+		const auto media = data->media();
+		if (media && media->hasSpoiler()) {
+			return tr::lng_sr_message_spoiler(tr::now);
+		}
+		return {};
+	}
+	case MessageSubItem::Dice: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto notification = data->notificationText().text;
+		if (media->game() || media->poll()) {
+			return {};
+		}
+		if (!media->document()
+			&& !media->photo()
+			&& !media->sharedContact()
+			&& !media->location()
+			&& !media->invoice()
+			&& !media->giveawayStart()
+			&& !media->giveawayResults()
+			&& !media->gift()
+			&& !media->todolist()
+			&& !media->game()
+			&& !media->poll()
+			&& !media->webpage()
+			&& !notification.isEmpty()) {
+			return notification;
+		}
+		return {};
+	}
+	case MessageSubItem::Giveaway: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		if (const auto giveaway = media->giveawayStart()) {
+			QStringList parts;
+			if (giveaway->quantity > 0) {
+				parts.push_back(QString::number(giveaway->quantity)
+					+ u" winners"_q);
+			}
+			if (giveaway->months > 0) {
+				parts.push_back(QString::number(giveaway->months)
+					+ u" months Premium"_q);
+			}
+			if (giveaway->credits > 0) {
+				parts.push_back(QString::number(giveaway->credits)
+					+ u" stars"_q);
+			}
+			if (!giveaway->additionalPrize.isEmpty()) {
+				parts.push_back(giveaway->additionalPrize);
+			}
+			return parts.join(u", "_q);
+		}
+		if (const auto results = media->giveawayResults()) {
+			QStringList parts;
+			parts.push_back(QString::number(results->winnersCount)
+				+ u" winners"_q);
+			if (results->unclaimedCount > 0) {
+				parts.push_back(QString::number(results->unclaimedCount)
+					+ u" unclaimed"_q);
+			}
+			if (results->refunded) {
+				parts.push_back(u"refunded"_q);
+			}
+			return parts.join(u", "_q);
+		}
+		return {};
+	}
+	case MessageSubItem::Gift: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto gift = media->gift();
+		if (!gift) {
+			return {};
+		}
+		switch (gift->type) {
+		case Data::GiftType::Premium:
+			return tr::lng_sr_message_gift_premium(
+				tr::now,
+				lt_count,
+				gift->count);
+		case Data::GiftType::Credits:
+		case Data::GiftType::StarGift:
+			return tr::lng_sr_message_gift_credits(
+				tr::now,
+				lt_count,
+				gift->count);
+		default:
+			if (!gift->giftTitle.isEmpty()) {
+				return gift->giftTitle;
+			}
+			return {};
+		}
+	}
+	case MessageSubItem::TodoTitle: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto todolist = media->todolist();
+		if (todolist) {
+			return todolist->title.text;
+		}
+		return {};
+	}
+	case MessageSubItem::TodoItems: {
+		const auto media = data->media();
+		if (!media) {
+			return {};
+		}
+		const auto todolist = media->todolist();
+		if (!todolist) {
+			return {};
+		}
+		QStringList items;
+		for (const auto &todoItem : todolist->items) {
+			auto line = todoItem.text.text;
+			line += u" ("_q;
+			line += todoItem.completedBy
+				? tr::lng_sr_message_todo_completed(tr::now)
+				: tr::lng_sr_message_todo_not_completed(tr::now);
+			line += u")"_q;
+			items.push_back(line);
+		}
+		return items.join(u"; "_q);
+	}
+	case MessageSubItem::Factcheck: {
+		const auto text = data->factcheckText();
+		if (!text.empty()) {
+			return text.text;
+		}
+		return {};
+	}
+	case MessageSubItem::ForwardDate: {
+		const auto fwd = data->Get<HistoryMessageForwarded>();
+		if (!fwd) {
+			return {};
+		}
+		if (fwd->originalDate) {
+			const auto dt = base::unixtime::parse(fwd->originalDate);
+			return QLocale().toString(dt, QLocale::ShortFormat);
+		}
+		return {};
+	}
+	case MessageSubItem::ForwardAuthor: {
+		const auto fwd = data->Get<HistoryMessageForwarded>();
+		if (!fwd) {
+			return {};
+		}
+		if (!fwd->originalPostAuthor.isEmpty()) {
+			return fwd->originalPostAuthor;
+		}
+		if (fwd->imported) {
+			return u"Imported"_q;
+		}
+		return {};
+	}
+	case MessageSubItem::PaidReactions: {
+		const auto &reactions = data->reactions();
+		for (const auto &reaction : reactions) {
+			if (reaction.id.paid() && reaction.count > 0) {
+				return QString::number(reaction.count);
+			}
+		}
+		return {};
+	}
+	case MessageSubItem::Count:
+		break;
+	}
+	return {};
+}
+
+std::vector<MessageSubItem> ActiveMessageSubItems(
+		not_null<const Element*> view,
+		not_null<History*> history) {
+	auto result = std::vector<MessageSubItem>();
+	result.reserve(int(MessageSubItem::Count));
+	for (auto i = 0; i != int(MessageSubItem::Count); ++i) {
+		const auto item = MessageSubItem(i);
+		if (!MessageSubItemValue(view, history, item).isEmpty()) {
+			result.push_back(item);
+		}
+	}
+	return result;
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/history_inner_widget_accessibility.h b/Telegram/SourceFiles/history/history_inner_widget_accessibility.h
new file mode 100644
index 00000000000000..f01cbb7d9dd898
--- /dev/null
+++ b/Telegram/SourceFiles/history/history_inner_widget_accessibility.h
@@ -0,0 +1,81 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class History;
+
+namespace HistoryView {
+
+class Element;
+
+enum class MessageSubItem : int {
+	Seen,
+	Sender,
+	ViaBot,
+	Reply,
+	Forward,
+	MediaType,
+	Download,
+	Played,
+	Artist,
+	Title,
+	Filename,
+	Duration,
+	Dimensions,
+	FileSize,
+	Message,
+	Delivery,
+	Edited,
+	Time,
+	Reactions,
+	Views,
+	Signature,
+	Pinned,
+	WebSite,
+	WebTitle,
+	WebDescription,
+	PollQuestion,
+	PollOptions,
+	PollStatus,
+	ContactName,
+	ContactPhone,
+	Location,
+	StickerEmoji,
+	GameTitle,
+	GameDescription,
+	InvoiceTitle,
+	InvoiceAmount,
+	Spoiler,
+	Dice,
+	Giveaway,
+	Gift,
+	TodoTitle,
+	TodoItems,
+	Factcheck,
+	ForwardDate,
+	ForwardAuthor,
+	PaidReactions,
+
+	Count,
+};
+
+[[nodiscard]] QString MessageAccessibilityName(
+	not_null<const Element*> view,
+	not_null<History*> history);
+[[nodiscard]] QString UnreadBarAccessibilityName(
+	not_null<const Element*> barElement);
+[[nodiscard]] QString MessageSubItemLabel(MessageSubItem item);
+[[nodiscard]] QString MessageSubItemValue(
+	not_null<const Element*> view,
+	not_null<History*> history,
+	MessageSubItem item);
+[[nodiscard]] std::vector<MessageSubItem> ActiveMessageSubItems(
+	not_null<const Element*> view,
+	not_null<History*> history);
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index ec57dee505504e..e47dc7408bd936 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -7,9 +7,10 @@ For license and copyright information please follow this link:
 */
 #include "history/history_item.h"
 
+#include "api/api_premium.h"
 #include "api/api_sensitive_content.h"
+#include "api/api_transcribes.h"
 #include "lang/lang_keys.h"
-#include "mainwidget.h"
 #include "calls/calls_instance.h" // Core::App().calls().joinGroupCall.
 #include "history/view/history_view_item_preview.h"
 #include "history/view/history_view_message.h"
@@ -20,6 +21,7 @@ For license and copyright information please follow this link:
 #include "history/history_unread_things.h"
 #include "history/history.h"
 #include "iv/iv_data.h"
+#include "iv/iv_rich_page.h"
 #include "mtproto/mtproto_config.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_isolated_emoji.h"
@@ -27,9 +29,8 @@ For license and copyright information please follow this link:
 #include "settings/settings_credits_graphics.h" // ShowRefundInfoBox.
 #include "storage/file_upload.h"
 #include "storage/storage_shared_media.h"
-#include "main/main_account.h"
-#include "main/main_domain.h"
 #include "main/main_session.h"
+#include "main/main_app_config.h"
 #include "main/main_session_settings.h"
 #include "menu/menu_ttl_validator.h"
 #include "apiwrap.h"
@@ -59,10 +60,12 @@ For license and copyright information please follow this link:
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_game.h"
+#include "data/data_histories.h"
 #include "data/data_history_messages.h"
 #include "data/data_user.h"
 #include "data/data_group_call.h" // Data::GroupCall::id().
 #include "data/data_poll.h" // PollData::publicVotes.
+#include "data/data_todo_list.h"
 #include "data/data_stories.h"
 #include "data/data_web_page.h"
 #include "chat_helpers/stickers_gift_box_pack.h"
@@ -70,12 +73,12 @@ For license and copyright information please follow this link:
 #include "payments/payments_non_panel_process.h" // ProcessNonPanelPaymentFormFactory.
 #include "platform/platform_notifications_manager.h"
 #include "spellcheck/spellcheck_highlight_syntax.h"
-#include "styles/style_dialogs.h"
 
 namespace {
 
 constexpr auto kNotificationTextLimit = 255;
 constexpr auto kPinnedMessageTextLimit = 16;
+constexpr auto kMinLoginCode = 5;
 
 using ItemPreview = HistoryView::ItemPreview;
 
@@ -93,8 +96,14 @@ template <typename T>
 	return PreparedServiceText{ { tr::lng_message_empty(tr::now) } };
 }
 
-[[nodiscard]] TextWithEntities SpoilerLoginCode(TextWithEntities text) {
-	const auto r = QRegularExpression(u"([\\d\\-]{4,8})"_q);
+[[nodiscard]] TextWithEntities SpoilerLoginCode(
+		TextWithEntities text,
+		int minLength = 4) {
+	const auto innerMin = QString::number(std::max(minLength - 2, 0));
+	const auto r = QRegularExpression(
+		u"(?<![\\w\\-#])(\\d[\\d\\-]{"_q
+			+ innerMin
+			+ u",6}\\d)(?!\\w\\-)"_q);
 	const auto m = r.match(text.text);
 	if (!m.hasMatch()) {
 		return text;
@@ -132,25 +141,64 @@ template <typename T>
 	return false;
 }
 
+[[nodiscard]] std::shared_ptr<const Iv::RichPage> ParsedRichPage(
+		not_null<Main::Session*> session,
+		const MTPRichMessage *richMessage) {
+	return richMessage ? Iv::ParseRichPage(session, *richMessage) : nullptr;
+}
+
+[[nodiscard]] std::shared_ptr<const Iv::RichPage> BestRichPage(
+		const HistoryMessageRichPageSource *source) {
+	return source
+		? (source->fullPage ? source->fullPage : source->page)
+		: nullptr;
+}
+
 [[nodiscard]] HistoryItemCommonFields ForwardedFields(
 		HistoryItemCommonFields fields,
 		not_null<History*> history,
 		not_null<HistoryItem*> original) {
+	if (fields.flags & MessageFlag::FakeHistoryItem) {
+		return fields;
+	}
 	fields.flags |= NewForwardedFlags(history->peer, fields.from, original);
 	return fields;
 }
 
 [[nodiscard]] TextWithEntities AmountAndStarCurrency(
-		not_null<Main::Session*> session,
 		int64 amount,
 		const QString &currency) {
 	if (currency == Ui::kCreditsCurrency) {
-		return Ui::CreditsEmojiSmall(session).append(
+		return Ui::CreditsEmojiSmall().append(
 			Lang::FormatCountDecimal(std::abs(amount)));
 	}
 	return { Ui::FillAmountAndCurrency(amount, currency) };
 }
 
+[[nodiscard]] bool IsNavigableForInstantViewMedia(
+		DocumentData *document) {
+	Expects(document != nullptr);
+	return !document->isVideoMessage()
+		&& (document->isVideoFile() || document->isAnimation());
+}
+
+void UpdateInstantViewMediaCaption(
+		HistoryMessageMediaForInstantView *data,
+		const HistoryMessageMediaForInstantView::Item &item,
+		TextWithEntities caption) {
+	const auto i = ranges::find(data->items, item);
+	if (i == end(data->items)) {
+		return;
+	}
+	const auto index = size_t(i - begin(data->items));
+	if (index >= data->captions.size()) {
+		data->captions.resize(index + 1);
+	}
+	if (!caption.text.isEmpty() && data->captions[index].text.isEmpty()) {
+		data->captions[index] = std::move(caption);
+	}
+}
+
 } // namespace
 
 void HistoryItem::HistoryItem::Destroyer::operator()(HistoryItem *value) {
@@ -164,6 +212,7 @@ struct HistoryItem::CreateConfig {
 
 	UserId viaBotId = 0;
 	UserId viaBusinessBotId = 0;
+	PeerId guestChatViaFrom = 0;
 	int viewsCount = -1;
 	int forwardsCount = -1;
 	int boostsApplied = 0;
@@ -183,11 +232,14 @@ struct HistoryItem::CreateConfig {
 
 	PeerId savedFromSenderId = 0;
 	QString savedFromSenderName;
+	TimeId savedFromDate = 0;
 	bool savedFromOutgoing = false;
 
 	TimeId editDate = 0;
+	TimeId scheduleRepeatPeriod = 0;
 	HistoryMessageMarkupData markup;
 	HistoryMessageRepliesData replies;
+	HistoryMessageSuggestInfo suggest;
 	bool imported = false;
 
 	// For messages created from existing messages (forwarded).
@@ -219,6 +271,7 @@ void HistoryItem::FillForwardedInfo(
 	config.savedFromSenderName = qs(
 		data.vsaved_from_name().value_or_empty());
 	config.savedFromOutgoing = data.is_saved_out();
+	config.savedFromDate = data.vsaved_date().value_or_empty();
 
 	config.imported = data.is_imported();
 }
@@ -297,12 +350,20 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 			return nullptr;
 		}
 		return document->match([&](const MTPDdocument &document) -> Result {
-			return std::make_unique<Data::MediaFile>(
-				item,
-				item->history()->owner().processDocument(document),
-				media.is_nopremium(),
-				media.is_spoiler(),
-				media.vttl_seconds().value_or_empty());
+			const auto list = media.valt_documents();
+			const auto owner = &item->history()->owner();
+			const auto data = owner->processDocument(document, list);
+			using Args = Data::MediaFile::Args;
+			return std::make_unique<Data::MediaFile>(item, data, Args{
+				.ttlSeconds = media.vttl_seconds().value_or_empty(),
+				.videoCover = (media.vvideo_cover()
+					? owner->processPhoto(*media.vvideo_cover()).get()
+					: nullptr),
+				.videoTimestamp = media.vvideo_timestamp().value_or_empty(),
+				.hasQualitiesList = list && !list->v.isEmpty(),
+				.skipPremiumEffect = media.is_nopremium(),
+				.spoiler = media.is_spoiler(),
+			});
 		}, [](const MTPDdocumentEmpty &) -> Result {
 			return nullptr;
 		});
@@ -348,9 +409,21 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 		return std::make_unique<Data::MediaPoll>(
 			item,
 			item->history()->owner().processPoll(media));
+	}, [&](const MTPDmessageMediaToDo &media) -> Result {
+		return std::make_unique<Data::MediaTodoList>(
+			item,
+			item->history()->owner().processTodoList(item->fullId(), media));
 	}, [&](const MTPDmessageMediaDice &media) -> Result {
+		auto outcome = Data::DiceGameOutcome();
+		if (const auto game = media.vgame_outcome()) {
+			const auto &data = game->data();
+			outcome.seed = data.vseed().v;
+			outcome.nanoTon = data.vton_amount().v;
+			outcome.stakeNanoTon = data.vstake_ton_amount().v;
+		}
 		return std::make_unique<Data::MediaDice>(
 			item,
+			outcome,
 			qs(media.vemoticon()),
 			media.vvalue().v);
 	}, [&](const MTPDmessageMediaStory &media) -> Result {
@@ -370,6 +443,9 @@ std::unique_ptr<Data::Media> HistoryItem::CreateMedia(
 		return std::make_unique<Data::MediaInvoice>(
 			item,
 			Data::ComputeInvoiceData(item, media));
+	}, [](const MTPDmessageMediaVideoStream &) -> Result {
+		// Live stories.
+		return nullptr;
 	}, [](const MTPDmessageMediaEmpty &) -> Result {
 		return nullptr;
 	}, [](const MTPDmessageMediaUnsupported &) -> Result {
@@ -387,7 +463,9 @@ HistoryItem::HistoryItem(
 	.flags = FlagsFromMTP(id, data.vflags().v, localFlags),
 	.from = data.vfrom_id() ? peerFromMTP(*data.vfrom_id()) : PeerId(0),
 	.date = data.vdate().v,
+	.scheduleRepeatPeriod = data.vschedule_repeat_period().value_or_empty(),
 	.shortcutId = data.vquick_reply_shortcut_id().value_or_empty(),
+	.starsPaid = int(data.vpaid_message_stars().value_or_empty()),
 	.effectId = data.veffect().value_or_empty(),
 }) {
 	_boostsApplied = data.vfrom_boosts_applied().value_or_empty();
@@ -403,32 +481,52 @@ HistoryItem::HistoryItem(
 		_flags &= ~MessageFlag::HasPostAuthor;
 		_flags |= MessageFlag::Legacy;
 		createComponents(data);
-		setText(UnsupportedMessageText());
+		if (const auto richMessage = data.vrich_message()) {
+			const auto richPage = Iv::ParseRichPage(&history->session(), *richMessage);
+			setRichPage(richPage);
+			setText(Iv::FlattenRichPageSummary(richPage));
+		} else {
+			setText(UnsupportedMessageText());
+		}
+		if (!Has<HistoryMessageReplyMarkup>()) {
+			AddComponents(HistoryMessageReplyMarkup::Bit());
+		}
+		_flags |= MessageFlag::HasReplyMarkup;
+		Get<HistoryMessageReplyMarkup>()->updateData(
+			UnsupportedMessageMarkup());
 	} else if (checked == MediaCheckResult::Empty) {
 		AddComponents(HistoryServiceData::Bit());
 		setServiceText({
-			tr::lng_message_empty(tr::now, Ui::Text::WithEntities)
+			tr::lng_message_empty(tr::now, tr::marked)
 		});
 	} else if ((checked == MediaCheckResult::HasUnsupportedTimeToLive)
 			|| (checked == MediaCheckResult::HasExpiredMediaTimeToLive)) {
 		createServiceFromMtp(data);
+		setReactions(data.vreactions());
 		applyTTL(data);
 	} else if (checked == MediaCheckResult::HasStoryMention) {
 		setMedia(*data.vmedia());
 		createServiceFromMtp(data);
+		setReactions(data.vreactions());
 		applyTTL(data);
 	} else {
 		createComponents(data);
 		if (const auto media = data.vmedia()) {
 			setMedia(*media);
 		}
-		auto textWithEntities = TextWithEntities{
-			qs(data.vmessage()),
-			Api::EntitiesFromMTP(
-				&history->session(),
-				data.ventities().value_or_empty())
-		};
-		setText(_media ? textWithEntities : EnsureNonEmpty(textWithEntities));
+		if (const auto richMessage = data.vrich_message()) {
+			const auto richPage = Iv::ParseRichPage(&history->session(), *richMessage);
+			setRichPage(richPage);
+			setText(Iv::FlattenRichPageSummary(richPage));
+		} else {
+			auto textWithEntities = TextWithEntities{
+				qs(data.vmessage()),
+				Api::EntitiesFromMTP(
+					&history->session(),
+					data.ventities().value_or_empty())
+			};
+			setText(_media ? textWithEntities : EnsureNonEmpty(textWithEntities));
+		}
 		if (const auto groupedId = data.vgrouped_id()) {
 			setGroupId(
 				MessageGroupId::FromRaw(
@@ -444,6 +542,19 @@ HistoryItem::HistoryItem(
 			Get<HistoryMessageFactcheck>()->data = check;
 		}
 	}
+
+	if (const auto rank = data.vfrom_rank()) {
+		if (!rank->v.isEmpty()) {
+			AddComponents(HistoryMessageFromRank::Bit());
+			Get<HistoryMessageFromRank>()->rank = qs(*rank);
+		}
+	}
+
+	if (const auto until = data.vreport_delivery_until_date()) {
+		if (base::unixtime::now() < TimeId(until->v)) {
+			history->owner().histories().reportDelivery(this);
+		}
+	}
 }
 
 HistoryItem::HistoryItem(
@@ -457,15 +568,22 @@ HistoryItem::HistoryItem(
 	.from = data.vfrom_id() ? peerFromMTP(*data.vfrom_id()) : PeerId(0),
 	.date = data.vdate().v,
 }) {
-	if (data.vaction().type() != mtpc_messageActionPhoneCall) {
-		createServiceFromMtp(data);
-	} else {
+	data.vaction().match([&](const MTPDmessageActionPhoneCall &data) {
 		createComponents(CreateConfig());
 		_media = std::make_unique<Data::MediaCall>(
 			this,
-			Data::ComputeCallData(data.vaction().c_messageActionPhoneCall()));
+			Data::ComputeCallData(&history->owner(), data));
 		setTextValue({});
-	}
+	}, [&](const MTPDmessageActionConferenceCall &data) {
+		createComponents(CreateConfig());
+		_media = std::make_unique<Data::MediaCall>(
+			this,
+			Data::ComputeCallData(&history->owner(), data));
+		setTextValue({});
+	}, [&](const auto &) {
+		createServiceFromMtp(data);
+	});
+	setReactions(data.vreactions());
 	applyTTL(data);
 }
 
@@ -479,7 +597,7 @@ HistoryItem::HistoryItem(
 	{ .id = id, .flags = localFlags },
 	PreparedServiceText{ tr::lng_message_empty(
 		tr::now,
-		Ui::Text::WithEntities) }) {
+		tr::marked) }) {
 }
 
 HistoryItem::HistoryItem(
@@ -507,10 +625,12 @@ HistoryItem::HistoryItem(
 	auto config = CreateConfig();
 
 	const auto originalMedia = original->media();
-	const auto dropForwardInfo = original->computeDropForwardedInfo();
+	const auto dropForwardInfo = fields.ignoreForwardFrom
+		|| original->computeDropForwardedInfo();
 	const auto topicRootId = fields.replyTo.topicRootId;
 	config.reply.messageId = config.reply.topMessageId = topicRootId;
 	config.reply.topicPost = (topicRootId != 0) ? 1 : 0;
+	config.reply.monoforumPeerId = fields.replyTo.monoforumPeerId;
 	if (const auto originalReply = original->Get<HistoryMessageReply>()) {
 		if (originalReply->external()) {
 			config.reply = originalReply->fields().clone(this);
@@ -519,6 +639,7 @@ HistoryItem::HistoryItem(
 			}
 		}
 	}
+	config.suggest = fields.suggest;
 	if (!dropForwardInfo) {
 		config.originalDate = original->originalDate();
 		if (const auto info = original->originalHiddenSenderInfo()) {
@@ -595,9 +716,41 @@ HistoryItem::HistoryItem(
 		}
 	}
 
-	setText(dropForwardInfo
-		? DropDisallowedCustomEmoji(history->peer, original->originalText())
-		: original->originalText());
+	const auto dropText = fields.ignoreForwardCaptions
+		&& _media
+		&& (_media->allowsEditCaption() || _media->poll());
+	const auto forwardRichPage = dropText
+		? std::shared_ptr<const Iv::RichPage>()
+		: original->richPage();
+	const auto forwardText = [&] {
+		if (dropText) {
+			return TextWithEntities();
+		}
+		if (forwardRichPage) {
+			return Iv::FlattenRichPageSummary(forwardRichPage);
+		}
+		const auto &text = original->originalText();
+		if (!text.text.isEmpty()) {
+			return dropForwardInfo
+				? DropDisallowedCustomEmoji(history->peer, text)
+				: TextWithEntities(text);
+		}
+		if (const auto media = original->media()) {
+			return media->consumedMessageText();
+		}
+		return TextWithEntities();
+	}();
+	if (forwardRichPage) {
+		setRichPage(forwardRichPage);
+	}
+	setText(forwardText);
+
+	if (fields.groupedId) {
+		setGroupId(MessageGroupId::FromRaw(
+			history->peer->id,
+			fields.groupedId,
+			_flags & MessageFlag::IsOrWasScheduled));
+	}
 }
 
 HistoryItem::HistoryItem(
@@ -625,14 +778,13 @@ HistoryItem::HistoryItem(
 : HistoryItem(history, fields) {
 	createComponentsHelper(std::move(fields));
 
-	const auto skipPremiumEffect = !history->session().premium();
-	const auto spoiler = false;
-	_media = std::make_unique<Data::MediaFile>(
-		this,
-		document,
-		skipPremiumEffect,
-		spoiler,
-		/*ttlSeconds = */0);
+	const auto video = document->video();
+	using Args = Data::MediaFile::Args;
+	_media = std::make_unique<Data::MediaFile>(this, document, Args{
+		.hasQualitiesList = video && !video->qualities.empty(),
+		.skipPremiumEffect = !history->session().premium(),
+		.spoiler = fields.mediaSpoiler,
+	});
 	setText(caption);
 }
 
@@ -644,7 +796,7 @@ HistoryItem::HistoryItem(
 : HistoryItem(history, fields) {
 	createComponentsHelper(std::move(fields));
 
-	const auto spoiler = false;
+	const auto spoiler = fields.mediaSpoiler;
 	_media = std::make_unique<Data::MediaPhoto>(this, photo, spoiler);
 	setText(caption);
 }
@@ -690,9 +842,11 @@ HistoryItem::HistoryItem(
 		WebPageCollage(),
 		nullptr,
 		nullptr,
+		nullptr,
 		0,
 		QString(),
 		false,
+		false,
 		0);
 	auto webpageMedia = std::make_unique<Data::MediaWebPage>(
 		this,
@@ -711,6 +865,7 @@ HistoryItem::HistoryItem(
 	: history->peer)
 , _flags(FinalizeMessageFlags(history, fields.flags))
 , _date(fields.date)
+, _starsPaid(fields.starsPaid)
 , _shortcutId(fields.shortcutId)
 , _effectId(fields.effectId) {
 	Expects(!_shortcutId
@@ -723,6 +878,9 @@ HistoryItem::HistoryItem(
 	if (_effectId) {
 		_history->owner().reactions().preloadEffectImageFor(_effectId);
 	}
+	if (isGuestChatBotMessage()) {
+		_history->setHasGuestChatBotMessages();
+	}
 }
 
 HistoryItem::HistoryItem(
@@ -748,9 +906,6 @@ HistoryItem::~HistoryItem() {
 	if (const auto reply = Get<HistoryMessageReply>()) {
 		reply->clearData(this);
 	}
-	if (const auto saved = Get<HistoryMessageSaved>()) {
-		saved->sublist->removeOne(this);
-	}
 	clearDependencyMessage();
 	applyTTL(0);
 }
@@ -759,9 +914,19 @@ TimeId HistoryItem::date() const {
 	return _date;
 }
 
+int HistoryItem::starsPaid() const {
+	return _starsPaid;
+}
+
+bool HistoryItem::awaitingVideoProcessing() const {
+	return (_flags & MessageFlag::EstimatedDate);
+}
+
 HistoryServiceDependentData *HistoryItem::GetServiceDependentData() {
 	if (const auto pinned = Get<HistoryServicePinned>()) {
 		return pinned;
+	} else if (const auto clear = Get<HistoryServiceClearHistory>()) {
+		return clear;
 	} else if (const auto gamescore = Get<HistoryServiceGameScore>()) {
 		return gamescore;
 	} else if (const auto payment = Get<HistoryServicePayment>()) {
@@ -772,6 +937,16 @@ HistoryServiceDependentData *HistoryItem::GetServiceDependentData() {
 		return same;
 	} else if (const auto results = Get<HistoryServiceGiveawayResults>()) {
 		return results;
+	} else if (const auto done = Get<HistoryServiceTodoCompletions>()) {
+		return done;
+	} else if (const auto append = Get<HistoryServiceTodoAppendTasks>()) {
+		return append;
+	} else if (const auto poll = Get<HistoryServicePollAppendAnswer>()) {
+		return poll;
+	} else if (const auto decision = Get<HistoryServiceSuggestDecision>()) {
+		return decision;
+	} else if (const auto finish = Get<HistoryServiceSuggestFinish>()) {
+		return finish;
 	}
 	return nullptr;
 }
@@ -829,6 +1004,12 @@ void HistoryItem::updateDependentServiceText() {
 		updateServiceText(prepareGameScoreText());
 	} else if (Has<HistoryServicePayment>()) {
 		updateServiceText(preparePaymentSentText());
+	} else if (Has<HistoryServiceTodoCompletions>()) {
+		updateServiceText(prepareTodoCompletionsText());
+	} else if (Has<HistoryServiceTodoAppendTasks>()) {
+		updateServiceText(prepareTodoAppendTasksText());
+	} else if (Has<HistoryServicePollAppendAnswer>()) {
+		updateServiceText(preparePollAppendAnswerText());
 	}
 }
 
@@ -844,12 +1025,31 @@ void HistoryItem::updateServiceDependent(bool force) {
 	}
 
 	if (!dependent->lnk) {
+		auto todoItemId = 0;
+		auto pollOption = QByteArray();
+		if (const auto done = Get<HistoryServiceTodoCompletions>()) {
+			const auto &items = !done->completed.empty()
+				? done->completed
+				: done->incompleted;
+			if (items.size() == 1) {
+				todoItemId = items.front();
+			}
+		} else if (const auto append = Get<HistoryServiceTodoAppendTasks>()) {
+			if (append->list.size() == 1) {
+				todoItemId = append->list.front().id;
+			}
+		} else if (const auto pa = Get<HistoryServicePollAppendAnswer>()) {
+			pollOption = pa->answer.option;
+		} else if (const auto pd = Get<HistoryServicePollDeleteAnswer>()) {
+			pollOption = pd->answer.option;
+		}
 		dependent->lnk = JumpToMessageClickHandler(
 			(dependent->peerId
 				? _history->owner().peer(dependent->peerId)
 				: _history->peer),
 			dependent->msgId,
-			fullId());
+			fullId(),
+			{ .todoItemId = todoItemId, .pollOption = pollOption });
 	}
 	auto gotDependencyItem = false;
 	if (!dependent->msg) {
@@ -927,10 +1127,16 @@ void HistoryItem::resolveDependent(not_null<HistoryMessageReply*> reply) {
 	if (!reply->acquireResolve()) {
 		return;
 	} else if (const auto messageId = reply->messageId()) {
+		if (Data::IsScheduledMsgId(messageId)) {
+			reply->updateData(this);
+			if (!reply->acquireResolve()) {
+				return;
+			}
+		}
 		RequestDependentMessageItem(
 			this,
 			reply->externalPeerId(),
-			reply->messageId());
+			messageId);
 	} else if (reply->storyId()) {
 		RequestDependentMessageStory(
 			this,
@@ -986,14 +1192,14 @@ void HistoryItem::setGroupId(MessageGroupId groupId) {
 	_history->owner().groups().registerMessage(this);
 }
 
-bool HistoryItem::checkCommentsLinkedChat(ChannelId id) const {
+bool HistoryItem::checkDiscussionLink(ChannelId id) const {
 	if (!id) {
 		return true;
 	} else if (const auto channel = _history->peer->asChannel()) {
-		if (channel->linkedChatKnown()
+		if (channel->discussionLinkKnown()
 			|| !(channel->flags() & ChannelDataFlag::HasLink)) {
-			const auto linked = channel->linkedChat();
-			if (!linked || peerToChannel(linked->id) != id) {
+			const auto link = channel->discussionLink();
+			if (!link || peerToChannel(link->id) != id) {
 				return false;
 			}
 		}
@@ -1002,8 +1208,71 @@ bool HistoryItem::checkCommentsLinkedChat(ChannelId id) const {
 	return false;
 }
 
-void HistoryItem::setReplyMarkup(HistoryMessageMarkupData &&markup) {
+SuggestionActions HistoryItem::computeSuggestionActions() const {
+	return computeSuggestionActions(Get<HistoryMessageSuggestion>());
+}
+
+SuggestionActions HistoryItem::computeSuggestionActions(
+		const HistoryMessageSuggestion *suggest) const {
+	return suggest
+		? computeSuggestionActions(
+			suggest->accepted,
+			suggest->rejected,
+			suggest->gift ? suggest->date: 0)
+		: SuggestionActions::None;
+}
+
+SuggestionActions HistoryItem::computeSuggestionActions(
+		bool accepted,
+		bool rejected,
+		TimeId giftOfferExpiresAt) const {
+	if (giftOfferExpiresAt) {
+		const auto can = isRegular()
+			&& !(accepted || rejected)
+			&& !out()
+			&& (giftOfferExpiresAt > base::unixtime::now());
+		return can
+			? SuggestionActions::GiftOfferActions
+			: SuggestionActions::None;
+	}
+	const auto channelIsAuthor = from()->isChannel();
+	const auto amMonoforumAdmin = history()->peer->amMonoforumAdmin();
+	const auto broadcast = history()->peer->monoforumBroadcast();
+	const auto canDecline = isRegular()
+		&& !(accepted || rejected)
+		&& (channelIsAuthor ? !amMonoforumAdmin : amMonoforumAdmin);
+	const auto canAccept = canDecline
+		&& (channelIsAuthor
+			? !amMonoforumAdmin
+			: (amMonoforumAdmin
+				&& broadcast
+				&& broadcast->canPostMessages()));
+	return canAccept
+		? SuggestionActions::AcceptAndDecline
+		: canDecline
+		? SuggestionActions::Decline
+		: SuggestionActions::None;
+}
+
+void HistoryItem::updateSuggestControls(
+		const HistoryMessageSuggestion *suggest) {
+	if (const auto markup = Get<HistoryMessageReplyMarkup>()) {
+		markup->updateSuggestControls(computeSuggestionActions(suggest));
+	}
+}
+
+void HistoryItem::setReplyMarkup(
+		HistoryMessageMarkupData &&markup,
+		bool ignoreSuggestButtons) {
 	const auto requestUpdate = [&] {
+		const auto actions = computeSuggestionActions();
+		if (actions != SuggestionActions::None
+			&& !Has<HistoryMessageReplyMarkup>()) {
+			AddComponents(HistoryMessageReplyMarkup::Bit());
+		}
+		if (const auto markup = Get<HistoryMessageReplyMarkup>()) {
+			markup->updateSuggestControls(actions);
+		}
 		history()->owner().requestItemResize(this);
 		history()->session().changes().messageUpdated(
 			this,
@@ -1096,7 +1365,7 @@ bool HistoryItem::areCommentsUnread() const {
 	const auto views = Get<HistoryMessageViews>();
 	if (!views
 		|| !views->commentsMegagroupId
-		|| !checkCommentsLinkedChat(views->commentsMegagroupId)) {
+		|| !checkDiscussionLink(views->commentsMegagroupId)) {
 		return false;
 	}
 	const auto till = views->commentsInboxReadTillId;
@@ -1247,6 +1516,22 @@ uint8 HistoryItem::colorIndex() const {
 	Unexpected("No displayFrom and no displayHiddenSenderInfo.");
 }
 
+DocumentId HistoryItem::backgroundEmojiId() const {
+	if (const auto from = displayFrom()) {
+		return from->backgroundEmojiId();
+	}
+	return DocumentId();
+}
+
+auto HistoryItem::colorCollectible() const
+-> const std::shared_ptr<Ui::ColorCollectible> & {
+	if (const auto from = displayFrom()) {
+		return from->colorCollectible();
+	}
+	static const auto dummy = std::shared_ptr<Ui::ColorCollectible>();
+	return dummy;
+}
+
 PeerData *HistoryItem::contentColorsFrom() const {
 	if (const auto forwarded = Get<HistoryMessageForwarded>()) {
 		return forwarded->originalSender;
@@ -1263,6 +1548,27 @@ uint8 HistoryItem::contentColorIndex() const {
 	return colorIndex();
 }
 
+DocumentId HistoryItem::contentBackgroundEmojiId() const {
+	if (const auto forwarded = Get<HistoryMessageForwarded>()) {
+		return forwarded->originalSender
+			? forwarded->originalSender->backgroundEmojiId()
+			: DocumentId();
+	}
+	return backgroundEmojiId();
+}
+
+auto HistoryItem::contentColorCollectible() const
+-> const std::shared_ptr<Ui::ColorCollectible> & {
+	if (const auto forwarded = Get<HistoryMessageForwarded>()) {
+		if (forwarded->originalSender) {
+			return forwarded->originalSender->colorCollectible();
+		}
+		static const auto dummy = std::shared_ptr<Ui::ColorCollectible>();
+		return dummy;
+	}
+	return colorCollectible();
+}
+
 std::unique_ptr<HistoryView::Element> HistoryItem::createView(
 		not_null<HistoryView::ElementDelegate*> delegate,
 		HistoryView::Element *replacing) {
@@ -1295,6 +1601,96 @@ void HistoryItem::customEmojiRepaint() {
 	}
 }
 
+void HistoryItem::setMediaForInstantView(
+		QString url,
+		DocumentData *document,
+		PhotoData *photo) {
+	AddComponents(HistoryMessageMediaForInstantView::Bit());
+	const auto data = Get<HistoryMessageMediaForInstantView>();
+	data->url = std::move(url);
+	data->documents.clear();
+	data->photos.clear();
+	data->items.clear();
+	data->captions.clear();
+	if (document) {
+		data->documents.emplace(document);
+		if (IsNavigableForInstantViewMedia(document)) {
+			data->items.emplace_back(document);
+			data->captions.emplace_back();
+		}
+	}
+	if (photo) {
+		data->photos.emplace(photo);
+		data->items.emplace_back(photo);
+		data->captions.emplace_back();
+	}
+}
+
+void HistoryItem::addDocumentForInstantView(
+		not_null<DocumentData*> document,
+		TextWithEntities caption) {
+	AddComponents(HistoryMessageMediaForInstantView::Bit());
+	const auto data = Get<HistoryMessageMediaForInstantView>();
+	if (data->documents.emplace(document).second
+		&& IsNavigableForInstantViewMedia(document)) {
+		data->items.emplace_back(document.get());
+		data->captions.push_back(std::move(caption));
+	} else {
+		UpdateInstantViewMediaCaption(
+			data,
+			HistoryMessageMediaForInstantView::Item(document.get()),
+			std::move(caption));
+	}
+}
+
+void HistoryItem::addPhotoForInstantView(
+		not_null<PhotoData*> photo,
+		TextWithEntities caption) {
+	AddComponents(HistoryMessageMediaForInstantView::Bit());
+	const auto data = Get<HistoryMessageMediaForInstantView>();
+	if (data->photos.emplace(photo).second) {
+		data->items.emplace_back(photo.get());
+		data->captions.push_back(std::move(caption));
+	} else {
+		UpdateInstantViewMediaCaption(
+			data,
+			HistoryMessageMediaForInstantView::Item(photo.get()),
+			std::move(caption));
+	}
+}
+
+bool HistoryItem::needsUpdateForVideoQualities(const MTPMessage &data) {
+	// When video gets the converted alt-videos lists, we need to update
+	// the message data even without edit-message update.
+	return data.match([&](const MTPDmessage &data) {
+		const auto media = data.vmedia();
+		if (!media) {
+			return false;
+		}
+		return media->match([&](const MTPDmessageMediaDocument &data) {
+			const auto document = data.vdocument();
+			const auto alts = data.valt_documents();
+			if (!document || !alts || alts->v.isEmpty()) {
+				return false;
+			}
+			const auto id = document->match([](const auto &data) {
+				return DocumentId(data.vid().v);
+			});
+			const auto existingMedia = this->media();
+			const auto existingDocument = existingMedia
+				? existingMedia->document()
+				: nullptr;
+			return !existingDocument
+				|| (existingDocument->id != id)
+				|| existingDocument->resolveQualities(this).empty();
+		}, [](const auto &) {
+			return false;
+		});
+	}, [](const auto &) {
+		return false;
+	});
+}
+
 void HistoryItem::finishEditionToEmpty() {
 	finishEdition(-1);
 	_history->itemVanished(this);
@@ -1319,6 +1715,14 @@ bool HistoryItem::hasUnreadReaction() const {
 	return (_flags & MessageFlag::HasUnreadReaction);
 }
 
+bool HistoryItem::hasUnreadPollVote() const {
+	return (_flags & MessageFlag::HasUnreadPollVote);
+}
+
+void HistoryItem::setHasUnreadPollVote() {
+	_flags |= MessageFlag::HasUnreadPollVote;
+}
+
 bool HistoryItem::hasUnwatchedEffect() const {
 	return effectId() && !(_flags & MessageFlag::EffectWatched);
 }
@@ -1357,8 +1761,13 @@ bool HistoryItem::isIncomingUnreadMedia() const {
 }
 
 void HistoryItem::markMediaAndMentionRead() {
+	const auto wasUnreadMedia = isUnreadMedia();
 	_flags &= ~MessageFlag::MediaIsUnread;
 
+	if (wasUnreadMedia) {
+		invalidateChatListEntry();
+	}
+
 	if (mentionsMe()) {
 		_history->updateChatListEntry();
 		_history->unreadMentions().erase(id);
@@ -1392,21 +1801,40 @@ void HistoryItem::markReactionsRead() {
 	if (const auto topic = this->topic()) {
 		topic->updateChatListEntry();
 		topic->unreadReactions().erase(id);
+	} else if (const auto sublist = this->savedSublist()) {
+		sublist->updateChatListEntry();
+		sublist->unreadReactions().erase(id);
+	}
+}
+
+void HistoryItem::markPollVotesRead() {
+	_flags &= ~MessageFlag::HasUnreadPollVote;
+	_history->updateChatListEntry();
+	_history->unreadPollVotes().erase(id);
+	if (const auto topic = this->topic()) {
+		topic->updateChatListEntry();
+		topic->unreadPollVotes().erase(id);
 	}
 }
 
 bool HistoryItem::markContentsRead(bool fromThisClient) {
+	auto result = false;
 	if (hasUnreadReaction()) {
 		if (fromThisClient) {
 			_history->owner().requestUnreadReactionsAnimation(this);
 		}
 		markReactionsRead();
-		return true;
-	} else if (isUnreadMention() || isIncomingUnreadMedia()) {
+		result = true;
+	}
+	if (isUnreadMention() || isIncomingUnreadMedia()) {
 		markMediaAndMentionRead();
-		return true;
+		result = true;
 	}
-	return false;
+	if (hasUnreadPollVote()) {
+		markPollVotesRead();
+		result = true;
+	}
+	return result;
 }
 
 void HistoryItem::setIsPinned(bool pinned) {
@@ -1426,6 +1854,7 @@ void HistoryItem::setIsPinned(bool pinned) {
 		storage.add(Storage::SharedMediaAddExisting(
 			_history->peer->id,
 			MsgId(0), // topicRootId
+			PeerId(0), // monoforumPeerId
 			Storage::SharedMediaType::Pinned,
 			id,
 			{ id, id }));
@@ -1434,11 +1863,22 @@ void HistoryItem::setIsPinned(bool pinned) {
 			storage.add(Storage::SharedMediaAddExisting(
 				_history->peer->id,
 				topic->rootId(),
+				PeerId(), // monoforumPeerId
 				Storage::SharedMediaType::Pinned,
 				id,
 				{ id, id }));
 			topic->setHasPinnedMessages(true);
 		}
+		if (const auto sublist = this->savedSublist()) {
+			storage.add(Storage::SharedMediaAddExisting(
+				_history->peer->id,
+				MsgId(0), // topicRootId
+				sublistPeerId(),
+				Storage::SharedMediaType::Pinned,
+				id,
+				{ id, id }));
+			sublist->setHasPinnedMessages(true);
+		}
 	} else {
 		_flags &= ~MessageFlag::Pinned;
 		if (_flags & MessageFlag::StoryItem) {
@@ -1452,6 +1892,17 @@ void HistoryItem::setIsPinned(bool pinned) {
 	}
 }
 
+void HistoryItem::setStoryInProfile(bool inProfile) {
+	if (storyInProfile() == inProfile) {
+		return;
+	} else if (inProfile) {
+		_flags |= MessageFlag::StoryInProfile;
+	} else {
+		_flags &= ~MessageFlag::StoryInProfile;
+	}
+	_history->owner().notifyItemDataChange(this);
+}
+
 void HistoryItem::returnSavedMedia() {
 	if (!isEditingMedia()) {
 		return;
@@ -1470,18 +1921,24 @@ void HistoryItem::returnSavedMedia() {
 }
 
 void HistoryItem::savePreviousMedia() {
-	Expects(_media != nullptr);
-
 	AddComponents(HistoryMessageSavedMediaData::Bit());
 	const auto data = Get<HistoryMessageSavedMediaData>();
 	data->text = originalText();
-	data->media = _media->clone(this);
+	data->media = _media ? _media->clone(this) : nullptr;
 }
 
 bool HistoryItem::isEditingMedia() const {
 	return Has<HistoryMessageSavedMediaData>();
 }
 
+PaidPostType HistoryItem::paidType() const {
+	return (_flags & MessageFlag::StarsPaidSuggested)
+		? PaidPostType::Stars
+		: (_flags & MessageFlag::TonPaidSuggested)
+		? PaidPostType::Ton
+		: PaidPostType::None;
+}
+
 void HistoryItem::clearSavedMedia() {
 	RemoveComponents(HistoryMessageSavedMediaData::Bit());
 }
@@ -1514,14 +1971,18 @@ ReplyMarkupFlags HistoryItem::replyKeyboardFlags() const {
 void HistoryItem::addLogEntryOriginal(
 		WebPageId localId,
 		const QString &label,
-		const TextWithEntities &content) {
+		const TextWithEntities &content,
+		PhotoData *photo,
+		DocumentData *document) {
 	Expects(isAdminLogEntry());
 
 	AddComponents(HistoryMessageLogEntryOriginal::Bit());
 	Get<HistoryMessageLogEntryOriginal>()->page = _history->owner().webpage(
 		localId,
 		label,
-		content);
+		content,
+		photo,
+		document);
 }
 
 void HistoryItem::setFactcheck(MessageFactcheck info) {
@@ -1562,6 +2023,18 @@ TextWithEntities HistoryItem::factcheckText() const {
 	return {};
 }
 
+const Api::SummaryEntry &HistoryItem::summaryEntry() const {
+	if (!(_flags & MessageFlag::HasSummaryEntry)) {
+		static const auto empty = Api::SummaryEntry();
+		return empty;
+	}
+	return history()->session().api().transcribes().summary(this);
+}
+
+void HistoryItem::setHasSummaryEntry() {
+	_flags |= MessageFlag::HasSummaryEntry;
+}
+
 PeerData *HistoryItem::specialNotificationPeer() const {
 	return (mentionsMe() && !_history->peer->isUser())
 		? from().get()
@@ -1575,6 +2048,10 @@ UserData *HistoryItem::viaBot() const {
 	return nullptr;
 }
 
+bool HistoryItem::isGuestChatBotMessage() const {
+	return (_flags & MessageFlag::GuestChatViaFrom);
+}
+
 UserData *HistoryItem::getMessageBot() const {
 	if (const auto bot = viaBot()) {
 		return bot;
@@ -1586,6 +2063,10 @@ UserData *HistoryItem::getMessageBot() const {
 	return (bot && bot->isBot()) ? bot : nullptr;
 }
 
+bool HistoryItem::hideLinks() const {
+	return !out() && history()->peer->hideLinks();
+}
+
 bool HistoryItem::isHistoryEntry() const {
 	return (_flags & MessageFlag::HistoryEntry);
 }
@@ -1605,10 +2086,22 @@ bool HistoryItem::isScheduled() const {
 		&& (_flags & MessageFlag::IsOrWasScheduled);
 }
 
+TimeId HistoryItem::scheduleRepeatPeriod() const {
+	const auto period = Get<HistoryMessageSchedulePeriod>();
+	return period ? period->schedulePeriod : TimeId();
+}
+
 bool HistoryItem::isSponsored() const {
 	return _flags & MessageFlag::Sponsored;
 }
 
+bool HistoryItem::canLookupMessageAuthor() const {
+	return isRegular()
+		&& !isService()
+		&& _history->amMonoforumAdmin()
+		&& _from->isChannel();
+}
+
 bool HistoryItem::skipNotification() const {
 	if (isSilent() && (_flags & MessageFlag::IsContactSignUp)) {
 		return true;
@@ -1616,6 +2109,8 @@ bool HistoryItem::skipNotification() const {
 		if (forwarded->imported) {
 			return true;
 		}
+	} else if (canLookupMessageAuthor()) {
+		return true;
 	}
 	return false;
 }
@@ -1624,6 +2119,10 @@ bool HistoryItem::isUserpicSuggestion() const {
 	return (_flags & MessageFlag::IsUserpicSuggestion);
 }
 
+bool HistoryItem::isSavedMusicItem() const {
+	return (_flags & MessageFlag::SavedMusicItem);
+}
+
 BusinessShortcutId HistoryItem::shortcutId() const {
 	return _shortcutId;
 }
@@ -1648,7 +2147,18 @@ void HistoryItem::destroy() {
 not_null<Data::Thread*> HistoryItem::notificationThread() const {
 	if (const auto rootId = topicRootId()) {
 		if (const auto forum = _history->asForum()) {
-			return forum->enforceTopicFor(rootId);
+			if (!_history->peer->isBot()) {
+				return forum->enforceTopicFor(rootId);
+			}
+		}
+	}
+	return _history;
+}
+
+Data::Thread *HistoryItem::maybeNotificationThread() const {
+	if (const auto rootId = topicRootId()) {
+		if (const auto forum = _history->asForum()) {
+			return forum->topicFor(rootId);
 		}
 	}
 	return _history;
@@ -1670,10 +2180,10 @@ void HistoryItem::refreshMainView() {
 	}
 }
 
-void HistoryItem::removeMainView() {
+void HistoryItem::removeMainView(Data::ViewRemovalReason reason) {
 	if (const auto view = mainView()) {
 		_history->owner().notifyHistoryChangeDelayed(_history);
-		view->removeFromBlock();
+		view->removeFromBlock(reason);
 	}
 }
 
@@ -1698,6 +2208,9 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
 	}
 	Assert(!updatingSavedLocalEdit || !isLocalUpdateMedia());
 
+	const auto wasGrouped = !updatingSavedLocalEdit
+		&& history()->owner().groups().isGrouped(this);
+
 	if (edition.isEditHide) {
 		_flags |= MessageFlag::HideEdited;
 	} else {
@@ -1721,14 +2234,6 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
 	if (!edition.useSameMarkup) {
 		setReplyMarkup(base::take(edition.replyMarkup));
 	}
-	if (updatingSavedLocalEdit) {
-		Get<HistoryMessageSavedMediaData>()->media = edition.mtpMedia
-			? CreateMedia(this, *edition.mtpMedia)
-			: nullptr;
-	} else {
-		removeFromSharedMediaIndex();
-		refreshMedia(edition.mtpMedia);
-	}
 	if (!edition.useSameReactions) {
 		updateReactions(edition.mtpReactions);
 	}
@@ -1738,18 +2243,64 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
 	if (!edition.useSameForwards) {
 		setForwardsCount(edition.forwards);
 	}
+	const auto mediaCheck = edition.mtpMedia
+		? CheckMessageMedia(*edition.mtpMedia)
+		: MediaCheckResult::Good;
+	if (updatingSavedLocalEdit) {
+		Get<HistoryMessageSavedMediaData>()->media
+			= (mediaCheck != MediaCheckResult::Unsupported
+				&& edition.mtpMedia)
+			? CreateMedia(this, *edition.mtpMedia)
+			: nullptr;
+	} else {
+		removeFromSharedMediaIndex();
+		if (mediaCheck == MediaCheckResult::Unsupported) {
+			_media = nullptr;
+			_flags &= ~MessageFlag::HasPostAuthor;
+			_flags |= MessageFlag::Legacy;
+		} else {
+			refreshMedia(edition.mtpMedia);
+			if (_flags & MessageFlag::Legacy) {
+				_flags &= ~MessageFlag::Legacy;
+			}
+		}
+	}
 	const auto &checkedMedia = updatingSavedLocalEdit
 		? Get<HistoryMessageSavedMediaData>()->media
 		: _media;
-	auto updatedText = checkedMedia
+	clearFullRichPage();
+	if (edition.richPage) {
+		setRichPage(edition.richPage);
+	} else {
+		clearRichPage();
+	}
+	auto updatedText = edition.richPage
+		? Iv::FlattenRichPageSummary(edition.richPage)
+		: (mediaCheck == MediaCheckResult::Unsupported)
+		? UnsupportedMessageText()
+		: checkedMedia
 		? edition.textWithEntities
 		: EnsureNonEmpty(edition.textWithEntities);
+	auto serviceText = (!edition.richPage
+		&& !checkedMedia
+		&& edition.textWithEntities.empty()
+		&& edition.mtpMedia)
+		? prepareServiceTextForMessage(
+			*edition.mtpMedia,
+			edition.isMediaUnread)
+		: PreparedServiceText();
 	if (updatingSavedLocalEdit) {
 		Get<HistoryMessageSavedMediaData>()->text = std::move(updatedText);
+	} else if (!serviceText.text.empty()) {
+		setServiceText(std::move(serviceText));
+		addToSharedMediaIndex();
 	} else {
 		setText(std::move(updatedText));
 		addToSharedMediaIndex();
 	}
+	if (mediaCheck == MediaCheckResult::Unsupported) {
+		setReplyMarkup(UnsupportedMessageMarkup());
+	}
 	if (!edition.useSameReplies) {
 		if (!edition.replies.isNull) {
 			if (checkRepliesPts(edition.replies)) {
@@ -1760,9 +2311,49 @@ void HistoryItem::applyEdition(HistoryMessageEdition &&edition) {
 		}
 	}
 
+	if (!edition.useSameSuggest) {
+		if (edition.suggest.exists) {
+			if (!Has<HistoryMessageSuggestion>()) {
+				AddComponents(HistoryMessageSuggestion::Bit());
+			}
+			auto suggest = Get<HistoryMessageSuggestion>();
+			suggest->price = edition.suggest.price;
+			suggest->date = edition.suggest.date;
+			suggest->accepted = edition.suggest.accepted;
+			suggest->rejected = edition.suggest.rejected;
+			updateSuggestControls(suggest);
+		} else {
+			RemoveComponents(HistoryMessageSuggestion::Bit());
+			updateSuggestControls(nullptr);
+		}
+	}
+
+	if (edition.repeatPeriod) {
+		if (!Has<HistoryMessageSchedulePeriod>()) {
+			AddComponents(HistoryMessageSchedulePeriod::Bit());
+		}
+		const auto period = Get<HistoryMessageSchedulePeriod>();
+		period->schedulePeriod = edition.repeatPeriod;
+	} else {
+		RemoveComponents(HistoryMessageSchedulePeriod::Bit());
+	}
+
 	applyTTL(edition.ttl);
 	setFactcheck(FromMTP(this, edition.mtpFactcheck));
 
+	if (!edition.fromRank.isEmpty()) {
+		if (!Has<HistoryMessageFromRank>()) {
+			AddComponents(HistoryMessageFromRank::Bit());
+		}
+		Get<HistoryMessageFromRank>()->rank = edition.fromRank;
+	} else {
+		RemoveComponents(HistoryMessageFromRank::Bit());
+	}
+
+	if (wasGrouped && !history()->owner().groups().isGrouped(this)) {
+		history()->owner().groups().unregisterMessage(this);
+	}
+
 	finishEdition(keyboardTop);
 }
 
@@ -1777,16 +2368,12 @@ void HistoryItem::applyChanges(not_null<Data::Story*> story) {
 }
 
 void HistoryItem::setStoryFields(not_null<Data::Story*> story) {
-	const auto spoiler = false;
 	if (const auto photo = story->photo()) {
+		const auto spoiler = false;
 		_media = std::make_unique<Data::MediaPhoto>(this, photo, spoiler);
 	} else if (const auto document = story->document()) {
-		_media = std::make_unique<Data::MediaFile>(
-			this,
-			document,
-			/*skipPremiumEffect=*/false,
-			spoiler,
-			/*ttlSeconds = */0);
+		using Args = Data::MediaFile::Args;
+		_media = std::make_unique<Data::MediaFile>(this, document, Args{});
 	}
 	setText(story->caption());
 	if (story->pinnedToTop()) {
@@ -1794,13 +2381,20 @@ void HistoryItem::setStoryFields(not_null<Data::Story*> story) {
 	} else {
 		_flags &= ~MessageFlag::Pinned;
 	}
+	if (story->inProfile()) {
+		_flags |= MessageFlag::StoryInProfile;
+	} else {
+		_flags &= ~MessageFlag::StoryInProfile;
+	}
 }
 
 void HistoryItem::applyEdition(const MTPDmessageService &message) {
+	const auto wasNfr = Get<HistoryServiceNoForwardsRequest>();
+	const auto wasActionTaken = wasNfr && wasNfr->actionTaken;
 	const auto wasSublist = savedSublist();
 	if (message.vaction().type() == mtpc_messageActionHistoryClear) {
 		const auto wasGrouped = history()->owner().groups().isGrouped(this);
-		setReplyMarkup({});
+		setReplyMarkup({}, true);
 		removeFromSharedMediaIndex();
 		refreshMedia(nullptr);
 		setTextValue({});
@@ -1818,6 +2412,28 @@ void HistoryItem::applyEdition(const MTPDmessageService &message) {
 		applyServiceDateEdition(message);
 		finishEditionToEmpty();
 		_flags &= ~MessageFlag::DisplayFromChecked;
+	} else if (message.vaction().type() == mtpc_messageActionConferenceCall) {
+		removeFromSharedMediaIndex();
+		const auto owner = &history()->owner();
+		const auto &data = message.vaction().c_messageActionConferenceCall();
+		const auto info = Data::ComputeCallData(owner, data);
+		if (const auto user = history()->peer->asUser()) {
+			if (const auto conferenceId = out() ? info.conferenceId : 0) {
+				Core::App().calls().unregisterConferenceInvite(
+					conferenceId,
+					user,
+					id,
+					!out(),
+					true);
+			}
+		}
+		_media = nullptr;
+		_media = std::make_unique<Data::MediaCall>(this, info);
+		addToSharedMediaIndex();
+		finishEdition(-1);
+		_flags &= ~MessageFlag::DisplayFromChecked;
+
+		updateReactions(message.vreactions());
 	} else if (isService()) {
 		if (const auto reply = Get<HistoryMessageReply>()) {
 			reply->clearData(this);
@@ -1828,6 +2444,11 @@ void HistoryItem::applyEdition(const MTPDmessageService &message) {
 		applyServiceDateEdition(message);
 		finishEdition(-1);
 		_flags &= ~MessageFlag::DisplayFromChecked;
+
+		updateReactions(message.vreactions());
+	}
+	if (const auto nowNfr = Get<HistoryServiceNoForwardsRequest>()) {
+		nowNfr->actionTaken = wasActionTaken;
 	}
 	const auto nowSublist = savedSublist();
 	if (wasSublist && nowSublist != wasSublist) {
@@ -1853,12 +2474,7 @@ void HistoryItem::applySentMessage(const MTPDmessage &data) {
 		_flags &= ~MessageFlag::InvertMedia;
 	}
 
-	updateSentContent({
-		qs(data.vmessage()),
-		Api::EntitiesFromMTP(
-			&_history->session(),
-			data.ventities().value_or_empty())
-	}, data.vmedia());
+	updateSentContent(data);
 	updateReplyMarkup(HistoryMessageMarkupData(data.vreply_markup()));
 	updateForwardedInfo(data.vfwd_from());
 	changeViewsCount(data.vviews().value_or(-1));
@@ -1875,6 +2491,9 @@ void HistoryItem::applySentMessage(const MTPDmessage &data) {
 				: PeerId();
 			if (!replyToPeer || replyToPeer == history()->peer->id) {
 				if (const auto replyToId = data.vreply_to_msg_id()) {
+					if (!isService() && !Has<HistoryMessageReply>()) {
+						AddComponents(HistoryMessageReply::Bit());
+					}
 					setReplyFields(
 						replyToId->v,
 						data.vreply_to_top_id().value_or(replyToId->v),
@@ -1900,16 +2519,31 @@ void HistoryItem::applySentMessage(const MTPDmessage &data) {
 	_history->owner().updateDependentMessages(this);
 }
 
+void HistoryItem::updateSentContent(const MTPDmessage &data) {
+	updateSentContent({
+		qs(data.vmessage()),
+		Api::EntitiesFromMTP(
+			&_history->session(),
+			data.ventities().value_or_empty())
+	}, data.vmedia(), data.vrich_message());
+}
+
 void HistoryItem::applySentMessage(
 		const QString &text,
 		const MTPDupdateShortSentMessage &data,
 		bool wasAlready) {
+	const auto existingRichPage = Get<HistoryMessageRichPageSource>();
 	updateSentContent({
 		text,
 		Api::EntitiesFromMTP(
 			&_history->session(),
 			data.ventities().value_or_empty())
-		}, data.vmedia());
+		},
+		data.vmedia(),
+		existingRichPage ? existingRichPage->page : nullptr,
+		(existingRichPage && existingRichPage->page)
+			? existingRichPage->fullPage
+			: nullptr);
 	contributeToSlowmode(data.vdate().v);
 	if (!wasAlready) {
 		addToSharedMediaIndex();
@@ -1925,12 +2559,57 @@ void HistoryItem::applySentMessage(
 
 void HistoryItem::updateSentContent(
 		const TextWithEntities &textWithEntities,
-		const MTPMessageMedia *media) {
-	if (isEditingMedia()) {
-		return;
-	}
-	setText(textWithEntities);
-	if (_flags & MessageFlag::FromInlineBot) {
+		const MTPMessageMedia *media,
+		const MTPRichMessage *richMessage) {
+	updateSentContent(
+		textWithEntities,
+		media,
+		ParsedRichPage(&_history->session(), richMessage));
+}
+
+void HistoryItem::updateSentContent(
+		const TextWithEntities &textWithEntities,
+		const MTPMessageMedia *media,
+		std::shared_ptr<const Iv::RichPage> richPage,
+		std::shared_ptr<const Iv::RichPage> preservedFullPage) {
+	if (isEditingMedia()) {
+		return;
+	}
+	const auto mediaCheck = media
+		? CheckMessageMedia(*media)
+		: MediaCheckResult::Good;
+	if (mediaCheck == MediaCheckResult::Unsupported) {
+		_flags &= ~MessageFlag::HasPostAuthor;
+		_flags |= MessageFlag::Legacy;
+		if (richPage) {
+			setRichPage(richPage);
+			if (preservedFullPage) {
+				setFullRichPage(std::move(preservedFullPage));
+			}
+			setText(Iv::FlattenRichPageSummary(richPage));
+		} else {
+			clearRichPage();
+			setText(UnsupportedMessageText());
+		}
+		setReplyMarkup(UnsupportedMessageMarkup());
+	} else {
+		if (_flags & MessageFlag::Legacy) {
+			_flags &= ~MessageFlag::Legacy;
+		}
+		if (richPage) {
+			setRichPage(richPage);
+			if (preservedFullPage) {
+				setFullRichPage(std::move(preservedFullPage));
+			}
+			setText(Iv::FlattenRichPageSummary(richPage));
+		} else {
+			clearRichPage();
+			setText(textWithEntities);
+		}
+	}
+	if (mediaCheck == MediaCheckResult::Unsupported) {
+		_media = nullptr;
+	} else if (_flags & MessageFlag::FromInlineBot) {
 		if (!media || !_media || !_media->updateInlineResultMedia(*media)) {
 			refreshSentMedia(media);
 		}
@@ -1963,21 +2642,34 @@ void HistoryItem::updateForwardedInfo(const MTPMessageFwdHeader *fwd) {
 }
 
 void HistoryItem::applyEditionToHistoryCleared() {
+	const auto rootId = topicRootId();
+	const auto topicPost = (rootId != Data::ForumTopic::kGeneralId);
+	auto action = Api::SendAction(history());
+	action.replyTo = FullReplyTo{
+		.messageId = FullMsgId(_history->peer->id, topicPost ? rootId : 0),
+		.topicRootId = rootId,
+	};
+	using Flag = MTPDmessageService::Flag;
 	applyEdition(
 		MTP_messageService(
-			MTP_flags(0),
+			MTP_flags(Flag()
+				| (topicPost ? Flag::f_reply_to : Flag())),
 			MTP_int(id),
 			peerToMTP(PeerId(0)), // from_id
 			peerToMTP(_history->peer->id),
-			MTPMessageReplyHeader(),
+			MTPPeer(), // saved_peer_id
+			NewMessageReplyHeader(action),
 			MTP_int(date()),
 			MTP_messageActionHistoryClear(),
+			MTPMessageReactions(),
 			MTPint() // ttl_period
 		).c_messageService());
 }
 
-void HistoryItem::updateReplyMarkup(HistoryMessageMarkupData &&markup) {
-	setReplyMarkup(std::move(markup));
+void HistoryItem::updateReplyMarkup(
+		HistoryMessageMarkupData &&markup,
+		bool ignoreSuggestButtons) {
+	setReplyMarkup(std::move(markup), ignoreSuggestButtons);
 }
 
 void HistoryItem::contributeToSlowmode(TimeId realDate) {
@@ -1988,13 +2680,39 @@ void HistoryItem::contributeToSlowmode(TimeId realDate) {
 	}
 }
 
+void HistoryItem::clearMediaAsExpired() {
+	const auto media = this->media();
+	if (!media || !media->ttlSeconds()) {
+		return;
+	}
+	if (const auto document = media->document()) {
+		applyEditionToHistoryCleared();
+		auto text = (document->isVideoFile()
+			? tr::lng_ttl_video_expired
+			: document->isVoiceMessage()
+			? tr::lng_ttl_voice_expired
+			: document->isVideoMessage()
+			? tr::lng_ttl_round_expired
+			: tr::lng_message_empty)(tr::now, tr::marked);
+		updateServiceText({ std::move(text) });
+		_flags |= MessageFlag::ReactionsAllowed;
+	} else if (media->photo()) {
+		applyEditionToHistoryCleared();
+		updateServiceText({
+			tr::lng_ttl_photo_expired(tr::now, tr::marked)
+		});
+		_flags |= MessageFlag::ReactionsAllowed;
+	}
+}
+
 void HistoryItem::addToUnreadThings(HistoryUnreadThings::AddType type) {
 	if (!isRegular()) {
 		return;
 	}
 	const auto mention = isUnreadMention();
 	const auto reaction = hasUnreadReaction();
-	if (!mention && !reaction) {
+	const auto pollVote = hasUnreadPollVote();
+	if (!mention && !reaction && !pollVote) {
 		return;
 	}
 	const auto topic = this->topic();
@@ -2013,9 +2731,13 @@ void HistoryItem::addToUnreadThings(HistoryUnreadThings::AddType type) {
 		}
 	}
 	if (reaction) {
+		const auto sublist = this->savedSublist();
 		const auto toHistory = history->unreadReactions().add(id, type);
 		const auto toTopic = topic && topic->unreadReactions().add(id, type);
-		if (toHistory || toTopic) {
+		const auto toSublist = sublist
+			&& sublist->parentChat()
+			&& sublist->unreadReactions().add(id, type);
+		if (toHistory || toTopic || toSublist) {
 			if (type == HistoryUnreadThings::AddType::New) {
 				changes->messageUpdated(
 					this,
@@ -2032,6 +2754,28 @@ void HistoryItem::addToUnreadThings(HistoryUnreadThings::AddType type) {
 						topic,
 						Data::TopicUpdate::Flag::UnreadReactions);
 				}
+				if (toSublist) {
+					changes->sublistUpdated(
+						sublist,
+						Data::SublistUpdate::Flag::UnreadReactions);
+				}
+			}
+		}
+	}
+	if (pollVote) {
+		const auto toHistory = history->unreadPollVotes().add(id, type);
+		const auto toTopic = topic
+			&& topic->unreadPollVotes().add(id, type);
+		if (toHistory || toTopic) {
+			if (toHistory) {
+				changes->historyUpdated(
+					history,
+					Data::HistoryUpdate::Flag::UnreadPollVotes);
+			}
+			if (toTopic) {
+				changes->topicUpdated(
+					topic,
+					Data::TopicUpdate::Flag::UnreadPollVotes);
 			}
 		}
 	}
@@ -2048,6 +2792,14 @@ void HistoryItem::destroyHistoryEntry() {
 		history()->unreadReactions().erase(id);
 		if (const auto topic = this->topic()) {
 			topic->unreadReactions().erase(id);
+		} else if (const auto sublist = this->savedSublist()) {
+			sublist->unreadReactions().erase(id);
+		}
+	}
+	if (hasUnreadPollVote()) {
+		history()->unreadPollVotes().erase(id);
+		if (const auto topic = this->topic()) {
+			topic->unreadPollVotes().erase(id);
 		}
 	}
 	if (isRegular() && _history->peer->isMegagroup()) {
@@ -2086,6 +2838,7 @@ void HistoryItem::addToSharedMediaIndex() {
 			_history->session().storage().add(Storage::SharedMediaAddNew(
 				_history->peer->id,
 				topicRootId(),
+				sublistPeerId(),
 				types,
 				id));
 			if (types.test(Storage::SharedMediaType::Pinned)) {
@@ -2093,6 +2846,9 @@ void HistoryItem::addToSharedMediaIndex() {
 				if (const auto topic = this->topic()) {
 					topic->setHasPinnedMessages(true);
 				}
+				if (const auto sublist = this->savedSublist()) {
+					sublist->setHasPinnedMessages(true);
+				}
 			}
 		}
 	}
@@ -2119,7 +2875,8 @@ void HistoryItem::addToMessagesIndex() {
 }
 
 void HistoryItem::incrementReplyToTopCounter() {
-	if (isRegular() && _history->peer->isMegagroup()) {
+	if (isRegular()
+		&& (_history->peer->isMegagroup() || _history->peer->forum())) {
 		_history->session().changes().messageUpdated(
 			this,
 			Data::MessageUpdate::Flag::ReplyToTopAdded);
@@ -2159,12 +2916,19 @@ QString HistoryItem::notificationHeader() const {
 	return QString();
 }
 
+void HistoryItem::markTextAppearingStarted() {
+	_flags |= MessageFlag::TextAppearingStarted;
+}
+
 void HistoryItem::setRealId(MsgId newId) {
-	Expects(_flags & MessageFlag::BeingSent);
+	Expects(isSending() || textAppearing());
 	Expects(IsClientMsgId(id));
 
 	const auto oldId = std::exchange(id, newId);
 	_flags &= ~(MessageFlag::BeingSent | MessageFlag::Local);
+	if (textAppearing()) {
+		markTextAppearingStarted();
+	}
 	if (isBusinessShortcut()) {
 		_date = 0;
 	}
@@ -2185,9 +2949,15 @@ void HistoryItem::setRealId(MsgId newId) {
 	_history->owner().notifyItemDataChange(this);
 	_history->owner().groups().refreshMessage(this);
 	_history->owner().requestItemResize(this);
+	_history->owner().requestItemRepaint(this);
 
-	if (const auto reply = Get<HistoryMessageReply>()) {
-		incrementReplyToTopCounter();
+	incrementReplyToTopCounter();
+	_history->session().changes().messageUpdated(
+		this,
+		Data::MessageUpdate::Flag::NewMaybeAdded);
+
+	if (out() && starsPaid()) {
+		_history->session().credits().load(true);
 	}
 }
 
@@ -2205,7 +2975,12 @@ bool HistoryItem::allowsSendNow() const {
 		&& isScheduled()
 		&& !isSending()
 		&& !hasFailed()
-		&& !isEditingMedia();
+		&& !isEditingMedia()
+		&& (paidType() == PaidPostType::None);
+}
+
+bool HistoryItem::allowsReschedule() const {
+	return allowsSendNow() && !awaitingVideoProcessing();
 }
 
 bool HistoryItem::allowsForward() const {
@@ -2223,12 +2998,22 @@ bool HistoryItem::isTooOldForEdit(TimeId now) const {
 }
 
 bool HistoryItem::allowsEdit(TimeId now) const {
+	const auto richPageSource = Get<HistoryMessageRichPageSource>();
+	const auto richPage = BestRichPage(richPageSource);
 	return !isService()
 		&& canBeEdited()
 		&& !isTooOldForEdit(now)
+		&& (!richPage || richPageSource->canEdit)
 		&& (!_media || _media->allowsEdit())
 		&& !isLegacyMessage()
-		&& !isEditingMedia();
+		&& !isEditingMedia()
+		&& (paidType() == PaidPostType::None);
+}
+
+bool HistoryItem::allowsEditMedia() const {
+	return !awaitingVideoProcessing()
+		&& !richPage()
+		&& (!_media || _media->allowsEditMedia() || _media->webpage());
 }
 
 bool HistoryItem::canBeEdited() const {
@@ -2323,7 +3108,8 @@ bool HistoryItem::canDeleteForEveryone(TimeId now) const {
 	} else if (const auto user = peer->asUser()) {
 		// Bots receive all messages and there is no sense in revoking them.
 		// See https://github.com/telegramdesktop/tdesktop/issues/3818
-		if (user->isBot() && !user->isSupport()) {
+		if ((user->isBot() && !user->isSupport())
+			|| user->isInaccessible()) {
 			return false;
 		}
 	}
@@ -2349,7 +3135,7 @@ bool HistoryItem::canDeleteForEveryone(TimeId now) const {
 bool HistoryItem::suggestReport() const {
 	if (out() || isService() || !isRegular()) {
 		return false;
-	} else if (const auto channel = _history->peer->asChannel()) {
+	} else if (_history->peer->isChannel()) {
 		return true;
 	} else if (const auto user = _history->peer->asUser()) {
 		return user->isBot();
@@ -2398,22 +3184,37 @@ bool HistoryItem::requiresSendInlineRight() const {
 	return Has<HistoryMessageVia>();
 }
 
-std::optional<QString> HistoryItem::errorTextForForward(
+Data::SendError HistoryItem::errorTextForForward(
 		not_null<Data::Thread*> to) const {
 	const auto requiredRight = requiredSendRight();
 	const auto requiresInline = requiresSendInlineRight();
 	const auto peer = to->peer();
 	constexpr auto kInline = ChatRestriction::SendInline;
 	if (const auto error = Data::RestrictionError(peer, requiredRight)) {
-		return *error;
+		return error;
 	} else if (requiresInline && !Data::CanSend(to, kInline)) {
-		return Data::RestrictionError(peer, kInline).value_or(
-			tr::lng_forward_cant(tr::now));
-	} else if (_media
+		const auto forInline = Data::RestrictionError(peer, kInline);
+		return forInline ? forInline : tr::lng_forward_cant(tr::now);
+	} else if (const auto specific = errorTextForForwardIgnoreRights(to)) {
+		return specific;
+	} else if (!Data::CanSend(to, requiredRight, false)) {
+		return tr::lng_forward_cant(tr::now);
+	}
+	return {};
+}
+
+Data::SendError HistoryItem::errorTextForForwardIgnoreRights(
+		not_null<Data::Thread*> to) const {
+	const auto peer = to->peer();
+	if (_media
 		&& _media->poll()
 		&& _media->poll()->publicVotes()
 		&& peer->isBroadcast()) {
 		return tr::lng_restricted_send_public_polls(tr::now);
+	} else if (_media
+		&& _media->todolist()
+		&& (peer->isBroadcast() || peer->isMonoforum())) {
+		return tr::lng_restricted_send_todo_lists(tr::now);
 	} else if (_media
 		&& _media->invoice()
 		&& _media->invoice()->isPaidMedia
@@ -2421,8 +3222,6 @@ std::optional<QString> HistoryItem::errorTextForForward(
 		&& peer->isFullLoaded()
 		&& !peer->asBroadcast()->canPostPaidMedia()) {
 		return tr::lng_restricted_send_paid_media(tr::now);
-	} else if (!Data::CanSend(to, requiredRight, false)) {
-		return tr::lng_forward_cant(tr::now);
 	}
 	return {};
 }
@@ -2516,24 +3315,31 @@ void HistoryItem::translationDone(LanguageId to, TextWithEntities result) {
 }
 
 bool HistoryItem::canReact() const {
-	if (!isRegular() || isService()) {
+	if (!isRegular()) {
 		return false;
+	} else if (isService()) {
+		return (_flags & MessageFlag::ReactionsAllowed);
 	} else if (const auto media = this->media()) {
 		if (media->call()) {
-			return false;
+			return (_flags & MessageFlag::ReactionsAllowed);
 		}
 	}
-	return true;
+	const auto peer = history()->peer;
+	return (peer->isChat() || peer->isMegagroup())
+		? !peer->amRestricted(ChatRestriction::SendReactions)
+		: true;
 }
 
-void HistoryItem::addPaidReaction(int count, std::optional<bool> anonymous) {
+void HistoryItem::addPaidReaction(
+		int count,
+		std::optional<PeerId> shownPeer) {
 	Expects(count >= 0);
 	Expects(_history->peer->isBroadcast() || isDiscussionPost());
 
 	if (!_reactions) {
 		_reactions = std::make_unique<Data::MessageReactions>(this);
 	}
-	_reactions->scheduleSendPaid(count, anonymous);
+	_reactions->scheduleSendPaid(count, shownPeer);
 	if (count > 0) {
 		_history->owner().notifyItemDataChange(this);
 	}
@@ -2567,7 +3373,16 @@ void HistoryItem::toggleReaction(
 	Expects(!reaction.paid());
 
 	const auto addToRecent = (source == HistoryReactionSource::Selector);
-	if (!_reactions) {
+	if (_reactions
+		&& ranges::contains(_reactions->chosen(), reaction)) {
+		_reactions->remove(reaction);
+		if (_reactions->empty() && !_reactions->localPaidData()) {
+			_reactions = nullptr;
+			_flags &= ~MessageFlag::CanViewReactions;
+		}
+	} else if (!reactionsAreTags() && !canReact()) {
+		return;
+	} else if (!_reactions) {
 		_reactions = std::make_unique<Data::MessageReactions>(this);
 		const auto canViewReactions = !isDiscussionPost()
 			&& (_history->peer->isChat() || _history->peer->isMegagroup());
@@ -2575,18 +3390,33 @@ void HistoryItem::toggleReaction(
 			_flags |= MessageFlag::CanViewReactions;
 		}
 		_reactions->add(reaction, addToRecent);
-	} else if (ranges::contains(_reactions->chosen(), reaction)) {
-		_reactions->remove(reaction);
-		if (_reactions->empty() && !_reactions->localPaidData()) {
-			_reactions = nullptr;
-			_flags &= ~MessageFlag::CanViewReactions;
-		}
 	} else {
 		_reactions->add(reaction, addToRecent);
 	}
 	_history->owner().notifyItemDataChange(this);
 }
 
+bool HistoryItem::removeReactionsFromParticipant(
+		not_null<PeerData*> participant,
+		const Data::ReactionId &reaction) {
+	if (!_reactions) {
+		return false;
+	}
+	const auto hadUnread = hasUnreadReaction();
+	if (!_reactions->removeFromParticipant(participant, reaction)) {
+		return false;
+	}
+	if (_reactions->empty() && !_reactions->localPaidData()) {
+		_reactions = nullptr;
+		_flags &= ~MessageFlag::CanViewReactions;
+	}
+	if (hadUnread && (!_reactions || !_reactions->hasUnread())) {
+		markReactionsRead();
+	}
+	_history->owner().notifyItemDataChange(this);
+	return true;
+}
+
 void HistoryItem::updateReactionsUnknown() {
 	_reactionsLastRefreshed = 1;
 }
@@ -2629,6 +3459,12 @@ int HistoryItem::reactionsPaidScheduled() const {
 	return _reactions ? _reactions->scheduledPaid() : 0;
 }
 
+PeerId HistoryItem::reactionsLocalShownPeer() const {
+	return _reactions
+		? _reactions->localPaidShownPeer()
+		: _history->session().userPeerId();
+}
+
 bool HistoryItem::reactionsAreTags() const {
 	return _flags & MessageFlag::ReactionsAreTags;
 }
@@ -2654,9 +3490,8 @@ auto HistoryItem::topPaidReactionsWithLocal() const
 		result,
 		[](const TopPaid &entry) { return entry.my != 0; });
 	const auto peerForMine = [&] {
-		return _reactions->localPaidAnonymous()
-			? nullptr
-			: history()->session().user().get();
+		const auto peerId = _reactions->localPaidShownPeer();
+		return peerId ? history()->owner().peer(peerId).get() : nullptr;
 	};
 	if (const auto local = _reactions->localPaidCount()) {
 		const auto top = [&](int mine) {
@@ -2712,6 +3547,21 @@ Data::ReactionId HistoryItem::lookupUnreadReaction(
 	return {};
 }
 
+QByteArray HistoryItem::lookupUnreadPollVote(
+		not_null<PeerData*> from) const {
+	const auto m = media();
+	const auto poll = m ? m->poll() : nullptr;
+	if (!poll) {
+		return {};
+	}
+	for (const auto &answer : poll->answers) {
+		if (ranges::contains(answer.recentVoters, from)) {
+			return answer.option;
+		}
+	}
+	return {};
+}
+
 crl::time HistoryItem::lastReactionsRefreshTime() const {
 	return _reactionsLastRefreshed;
 }
@@ -2821,6 +3671,13 @@ QString HistoryItem::originalPostAuthor() const {
 	return QString();
 }
 
+QString HistoryItem::fromRank() const {
+	if (const auto component = Get<HistoryMessageFromRank>()) {
+		return component->rank;
+	}
+	return QString();
+}
+
 MsgId HistoryItem::originalId() const {
 	if (const auto forwarded = Get<HistoryMessageForwarded>()) {
 		return forwarded->originalId;
@@ -2850,11 +3707,40 @@ const TextWithEntities &HistoryItem::translatedText() const {
 TextWithEntities HistoryItem::translatedTextWithLocalEntities() const {
 	if (isService()) {
 		return {};
+	}
+	auto result = withLocalEntities(translatedText());
+
+	if (hideLinks()) {
+		const auto isUrl = [](const EntityInText &entity) {
+			const auto type = entity.type();
+			return (type == EntityType::Mention)
+				|| (type == EntityType::Hashtag)
+				|| (type == EntityType::Cashtag)
+				|| (type == EntityType::Url)
+				|| (type == EntityType::CustomUrl);
+		};
+		const auto from = ranges::remove_if(result.entities, isUrl);
+		if (from != result.entities.end()) {
+			result.entities.erase(from, result.entities.end());
+			setHasHiddenLinks(true);
+		}
+	}
+
+	return result;
+}
+
+void HistoryItem::setHasHiddenLinks(bool has) const {
+	if (has) {
+		_flags |= MessageFlag::HasHiddenLinks;
 	} else {
-		return withLocalEntities(translatedText());
+		_flags &= ~MessageFlag::HasHiddenLinks;
 	}
 }
 
+bool HistoryItem::hasHiddenLinks() const {
+	return _flags & MessageFlag::HasHiddenLinks;
+}
+
 TextForMimeData HistoryItem::clipboardText() const {
 	return isService()
 		? TextForMimeData()
@@ -3134,7 +4020,7 @@ int HistoryItem::viewsCount() const {
 
 int HistoryItem::repliesCount() const {
 	if (const auto views = Get<HistoryMessageViews>()) {
-		if (!checkCommentsLinkedChat(views->commentsMegagroupId)) {
+		if (!checkDiscussionLink(views->commentsMegagroupId)) {
 			return 0;
 		}
 		return std::max(views->replies.count, 0);
@@ -3145,7 +4031,7 @@ int HistoryItem::repliesCount() const {
 bool HistoryItem::repliesAreComments() const {
 	if (const auto views = Get<HistoryMessageViews>()) {
 		return (views->commentsMegagroupId != 0)
-			&& checkCommentsLinkedChat(views->commentsMegagroupId);
+			&& checkDiscussionLink(views->commentsMegagroupId);
 	}
 	return false;
 }
@@ -3271,9 +4157,19 @@ FullStoryId HistoryItem::replyToStory() const {
 	return {};
 }
 
+void HistoryItem::resolveAdminLogReplyTo(not_null<HistoryItem*> replyTo) {
+	if (const auto reply = Get<HistoryMessageReply>()) {
+		reply->setInLogReplyTo(this, replyTo);
+	}
+}
+
 FullReplyTo HistoryItem::replyTo() const {
+	const auto monoforumPeerId = _history->peer->amMonoforumAdmin()
+		? sublistPeerId()
+		: PeerId();
 	auto result = FullReplyTo{
 		.topicRootId = topicRootId(),
+		.monoforumPeerId = monoforumPeerId,
 	};
 	if (const auto reply = Get<HistoryMessageReply>()) {
 		const auto &fields = reply->fields();
@@ -3291,22 +4187,115 @@ FullReplyTo HistoryItem::replyTo() const {
 	return result;
 }
 
-void HistoryItem::setText(const TextWithEntities &textWithEntities) {
+void HistoryItem::detectTextLinks(
+		const TextWithEntities &textWithEntities) {
 	for (const auto &entity : textWithEntities.entities) {
 		auto type = entity.type();
 		if (type == EntityType::Url
 			|| type == EntityType::CustomUrl
 			|| type == EntityType::Phone
+			|| type == EntityType::BankCard
 			|| type == EntityType::Email) {
 			_flags |= MessageFlag::HasTextLinks;
 			break;
 		}
 	}
+}
+
+void HistoryItem::setText(TextWithEntities textWithEntities) {
+	detectTextLinks(textWithEntities);
 	setTextValue((_media && _media->consumeMessageText(textWithEntities))
 		? TextWithEntities()
 		: std::move(textWithEntities));
 }
 
+std::shared_ptr<const Iv::RichPage> HistoryItem::richPage() const {
+	const auto source = Get<HistoryMessageRichPageSource>();
+	return source ? source->page : nullptr;
+}
+
+std::shared_ptr<const Iv::RichPage> HistoryItem::fullRichPage() const {
+	const auto source = Get<HistoryMessageRichPageSource>();
+	return source ? source->fullPage : nullptr;
+}
+
+uint64 HistoryItem::fullRichPageVersion() const {
+	const auto source = Get<HistoryMessageRichPageSource>();
+	return source ? source->fullPageVersion : 0;
+}
+
+void HistoryItem::applyLocalRichPage(std::shared_ptr<const Iv::RichPage> page) {
+	const auto summary = page
+		? Iv::FlattenRichPageSummary(page)
+		: TextWithEntities();
+	applyLocalRichPage(std::move(page), summary);
+}
+
+void HistoryItem::applyLocalRichPage(
+		std::shared_ptr<const Iv::RichPage> page,
+		const TextWithEntities &summary) {
+	if (page) {
+		setRichPage(std::move(page));
+	} else {
+		clearRichPage();
+	}
+	setText(summary);
+	_history->owner().requestItemTextRefresh(this);
+	invalidateChatListEntry();
+}
+
+void HistoryItem::setRichPage(std::shared_ptr<const Iv::RichPage> page) {
+	if (page) {
+		AddComponents(HistoryMessageRichPageSource::Bit()
+			| HistoryMessageMediaForInstantView::Bit());
+		const auto source = Get<HistoryMessageRichPageSource>();
+		const auto media = Get<HistoryMessageMediaForInstantView>();
+		source->page = std::move(page);
+		if (source->fullPage) {
+			++source->fullPageVersion;
+		}
+		source->fullPage = nullptr;
+		source->canEdit = false;
+		media->url = QString();
+		media->documents.clear();
+		media->photos.clear();
+		media->items.clear();
+		media->captions.clear();
+	} else {
+		clearRichPage();
+	}
+}
+
+void HistoryItem::setFullRichPage(std::shared_ptr<const Iv::RichPage> page) {
+	if (page) {
+		AddComponents(HistoryMessageRichPageSource::Bit());
+		const auto source = Get<HistoryMessageRichPageSource>();
+		source->fullPage = std::move(page);
+		source->canEdit = false;
+	} else {
+		clearFullRichPage();
+	}
+}
+
+void HistoryItem::clearFullRichPage() {
+	const auto source = Get<HistoryMessageRichPageSource>();
+	if (!source) {
+		return;
+	}
+	++source->fullPageVersion;
+	source->fullPage = nullptr;
+	if (source->page) {
+		source->canEdit = false;
+	} else {
+		RemoveComponents(HistoryMessageRichPageSource::Bit());
+	}
+}
+
+void HistoryItem::clearRichPage() {
+	RemoveComponents(HistoryMessageRichPageSource::Bit()
+		| HistoryMessageMediaForInstantView::Bit());
+}
+
 void HistoryItem::setTextValue(TextWithEntities text, bool force) {
 	if (const auto processId = Spellchecker::TryHighlightSyntax(text)) {
 		_flags |= MessageFlag::InHighlightProcess;
@@ -3384,30 +4373,50 @@ bool HistoryItem::hasPossibleRestrictions() const {
 bool HistoryItem::isEmpty() const {
 	return _text.empty()
 		&& !_media
+		&& !Has<HistoryMessageRichPageSource>()
 		&& (!Has<HistoryMessageFactcheck>()
 			|| Get<HistoryMessageFactcheck>()->data.text.empty())
 		&& !Has<HistoryMessageLogEntryOriginal>();
 }
 
 Data::SavedSublist *HistoryItem::savedSublist() const {
-	if (const auto saved = Get<HistoryMessageSaved>()) {
-		return saved->sublist;
+	if (isBusinessShortcut() || isScheduled()) {
+		return nullptr;
+	} else if (const auto saved = Get<HistoryMessageSaved>()) {
+		if (saved->savedMessagesSublist) {
+			return saved->savedMessagesSublist;
+		} else if (const auto monoforum = _history->peer->monoforum()) {
+			const auto peer = _history->owner().peer(saved->sublistPeerId);
+			return monoforum->sublist(peer).get();
+		}
 	} else if (_history->peer->isSelf()) {
 		const auto sublist = _history->owner().savedMessages().sublist(
 			_history->peer);
 		const auto that = const_cast<HistoryItem*>(this);
 		that->AddComponents(HistoryMessageSaved::Bit());
-		that->Get<HistoryMessageSaved>()->sublist = sublist;
+		const auto saved = that->Get<HistoryMessageSaved>();
+		saved->sublistPeerId = _history->peer->id;
+		saved->savedMessagesSublist = sublist;
+		return sublist;
+	} else if (const auto monoforum = _history->peer->monoforum()) {
+		const auto sublist = monoforum->sublist(_from);
+		const auto that = const_cast<HistoryItem*>(this);
+		that->AddComponents(HistoryMessageSaved::Bit());
+		that->Get<HistoryMessageSaved>()->sublistPeerId = _from->id;
 		return sublist;
 	}
 	return nullptr;
 }
 
-PeerData *HistoryItem::savedSublistPeer() const {
-	if (const auto sublist = savedSublist()) {
-		return sublist->peer();
+PeerId HistoryItem::sublistPeerId() const {
+	if (const auto saved = Get<HistoryMessageSaved>()) {
+		return saved->sublistPeerId;
+	} else if (_history->peer->isSelf()) {
+		return _history->peer->id;
+	} else if (_history->peer->monoforum()) {
+		return _from->id;
 	}
-	return nullptr;
+	return PeerId();
 }
 
 PeerData *HistoryItem::savedFromSender() const {
@@ -3434,11 +4443,13 @@ TextWithEntities HistoryItem::notificationText(
 		}
 		return TextWithEntities();
 	}();
-	if (options.spoilerLoginCode
-		&& !out()
-		&& (history()->peer->isNotificationsUser()
-			|| history()->peer->isVerifyCodes())) {
-		result = SpoilerLoginCode(std::move(result));
+	if (options.spoilerLoginCode && !out()) {
+		const auto peer = history()->peer;
+		if (peer->isNotificationsUser()) {
+			result = SpoilerLoginCode(std::move(result), kMinLoginCode);
+		} else if (peer->isVerifyCodes()) {
+			result = SpoilerLoginCode(std::move(result));
+		}
 	}
 	if (result.text.size() <= kNotificationTextLimit) {
 		return result;
@@ -3474,11 +4485,15 @@ ItemPreview HistoryItem::toPreview(ToPreviewOptions options) const {
 		}
 		return {};
 	}();
-	if (options.spoilerLoginCode
-		&& !out()
-		&& (history()->peer->isNotificationsUser()
-			|| history()->peer->isVerifyCodes())) {
-		result.text = SpoilerLoginCode(std::move(result.text));
+	if (options.spoilerLoginCode && !out()) {
+		const auto peer = history()->peer;
+		if (peer->isNotificationsUser()) {
+			result.text = SpoilerLoginCode(
+			    std::move(result.text),
+				kMinLoginCode);
+		} else if (peer->isVerifyCodes()) {
+			result.text = SpoilerLoginCode(std::move(result.text));
+		}
 	}
 	const auto fromSender = [](not_null<PeerData*> sender) {
 		return sender->isSelf()
@@ -3510,7 +4525,7 @@ ItemPreview HistoryItem::toPreview(ToPreviewOptions options) const {
 	const auto sender = [&]() -> std::optional<QString> {
 		if (options.hideSender || isPostHidingAuthor() || isEmpty()) {
 			return {};
-		} else if (!_history->peer->isUser()) {
+		} else if (!_history->peer->isUser() || isGuestChatBotMessage()) {
 			if (const auto from = displayFrom()) {
 				return fromSender(from);
 			}
@@ -3536,6 +4551,7 @@ TextWithEntities HistoryItem::inReplyText() const {
 		return toPreview({
 			.hideSender = true,
 			.generateImages = false,
+			.ignoreGroup = true,
 			.translated = true,
 		}).text;
 	}
@@ -3566,6 +4582,9 @@ void HistoryItem::createComponents(CreateConfig &&config) {
 	if (config.viaBotId) {
 		mask |= HistoryMessageVia::Bit();
 	}
+	if (config.guestChatViaFrom) {
+		mask |= HistoryMessageGuestChat::Bit();
+	}
 	if (config.viewsCount >= 0 || !config.replies.isNull) {
 		mask |= HistoryMessageViews::Bit();
 	}
@@ -3596,7 +4615,15 @@ void HistoryItem::createComponents(CreateConfig &&config) {
 	} else if (config.inlineMarkup) {
 		mask |= HistoryMessageReplyMarkup::Bit();
 	}
-	if (_history->peer->isSelf()) {
+	if (config.scheduleRepeatPeriod) {
+		mask |= HistoryMessageSchedulePeriod::Bit();
+	}
+	const auto requiresMonoforumPeer = _history->peer->amMonoforumAdmin();
+	if (!isBusinessShortcut()
+		&& !isScheduled()
+		&& (_history->peer->isSelf()
+			|| config.savedSublistPeer
+			|| requiresMonoforumPeer)) {
 		mask |= HistoryMessageSaved::Bit();
 	}
 	if (!config.restrictions.empty()) {
@@ -3605,12 +4632,26 @@ void HistoryItem::createComponents(CreateConfig &&config) {
 			mask |= HistoryMessageRestrictions::Bit();
 		}
 	}
+	if (config.suggest.exists) {
+		mask |= HistoryMessageSuggestion::Bit();
+		if (computeSuggestionActions(
+			config.suggest.accepted,
+			config.suggest.rejected,
+			TimeId()
+		) != SuggestionActions::None) {
+			mask |= HistoryMessageReplyMarkup::Bit();
+		}
+	}
 
 	UpdateComponents(mask);
 
 	if (const auto saved = Get<HistoryMessageSaved>()) {
 		if (!config.savedSublistPeer) {
-			if (config.savedFromPeer) {
+			if (config.reply.monoforumPeerId) {
+				config.savedSublistPeer = config.reply.monoforumPeerId;
+			} else if (!_history->peer->isSelf()) {
+				config.savedSublistPeer = _from->id;
+			} else if (config.savedFromPeer) {
 				config.savedSublistPeer = config.savedFromPeer;
 			} else if (config.originalSenderId) {
 				config.savedSublistPeer = config.originalSenderId;
@@ -3620,10 +4661,17 @@ void HistoryItem::createComponents(CreateConfig &&config) {
 				config.savedSublistPeer = _history->session().userPeerId();
 			}
 		}
-		const auto peer = _history->owner().peer(config.savedSublistPeer);
-		saved->sublist = _history->owner().savedMessages().sublist(peer);
+		saved->sublistPeerId = config.savedSublistPeer;
+		if (_history->peer->isSelf()) {
+			saved->savedMessagesSublist
+				= _history->owner().savedMessages().sublist(
+					_history->owner().peer(saved->sublistPeerId));
+		}
 	}
 
+	if (const auto period = Get<HistoryMessageSchedulePeriod>()) {
+		period->schedulePeriod = config.scheduleRepeatPeriod;
+	}
 	if (const auto reply = Get<HistoryMessageReply>()) {
 		reply->set(std::move(config.reply));
 		reply->updateData(this);
@@ -3631,15 +4679,18 @@ void HistoryItem::createComponents(CreateConfig &&config) {
 	if (const auto via = Get<HistoryMessageVia>()) {
 		via->create(&_history->owner(), config.viaBotId);
 	}
-	if (const auto views = Get<HistoryMessageViews>()) {
+	if (const auto guestChat = Get<HistoryMessageGuestChat>()) {
+		guestChat->create(&_history->owner(), config.guestChatViaFrom);
+	}
+	if (Has<HistoryMessageViews>()) {
 		changeViewsCount(config.viewsCount);
 		if (config.replies.isNull
 			&& isSending()
 			&& config.markup.isNull()) {
 			if (const auto broadcast = _history->peer->asBroadcast()) {
-				if (const auto linked = broadcast->linkedChat()) {
+				if (const auto link = broadcast->discussionLink()) {
 					config.replies.isNull = false;
-					config.replies.channelId = peerToChannel(linked->id);
+					config.replies.channelId = peerToChannel(link->id);
 				}
 			}
 		}
@@ -3691,6 +4742,14 @@ void HistoryItem::createComponents(CreateConfig &&config) {
 		flagSensitiveContent();
 	}
 
+	if (const auto suggest = Get<HistoryMessageSuggestion>()) {
+		suggest->price = config.suggest.price;
+		suggest->date = config.suggest.date;
+		suggest->accepted = config.suggest.accepted;
+		suggest->rejected = config.suggest.rejected;
+		updateSuggestControls(suggest);
+	}
+
 	if (out() && isSending()) {
 		if (const auto channel = _history->peer->asMegagroup()) {
 			_boostsApplied = channel->mgInfo->boostsApplied;
@@ -3740,15 +4799,8 @@ void HistoryItem::setupForwardedComponent(const CreateConfig &config) {
 	forwarded->savedFromMsgId = config.savedFromMsgId;
 	forwarded->savedFromSender = _history->owner().peerLoaded(
 		config.savedFromSenderId);
-	if (forwarded->savedFromPeer
-		&& !forwarded->savedFromPeer->isFullLoaded()
-		&& forwarded->savedFromPeer->isChannel()) {
-		_history->session().api().requestFullPeer(forwarded->savedFromPeer);
-	} else if (config.savedFromPeer) {
-		_history->session().api().requestFullPeer(
-			_history->owner().peer(config.savedFromPeer));
-	}
 	forwarded->savedFromOutgoing = config.savedFromOutgoing;
+	forwarded->savedFromDate = config.savedFromDate;
 	if (!forwarded->savedFromSender
 		&& !config.savedFromSenderName.isEmpty()) {
 		forwarded->savedFromHiddenSenderInfo
@@ -3841,6 +4893,7 @@ void HistoryItem::createComponentsHelper(HistoryItemCommonFields &&fields) {
 	const auto &replyTo = fields.replyTo;
 	auto config = CreateConfig();
 	config.viaBotId = fields.viaBotId;
+	config.scheduleRepeatPeriod = fields.scheduleRepeatPeriod;
 	if (fields.flags & MessageFlag::HasReplyInfo) {
 		config.reply.messageId = replyTo.messageId.msg;
 		config.reply.storyId = replyTo.storyId.story;
@@ -3851,6 +4904,13 @@ void HistoryItem::createComponentsHelper(HistoryItemCommonFields &&fields) {
 			? replyTo.messageId.peer
 			: PeerId();
 		const auto to = LookupReplyTo(_history, replyTo.messageId);
+		config.reply.monoforumPeerId = (to && to->sublistPeerId())
+			? to->sublistPeerId()
+			: replyTo.monoforumPeerId
+			? replyTo.monoforumPeerId
+			: PeerId();
+		config.reply.todoItemId = replyTo.todoItemId;
+		config.reply.pollOption = replyTo.pollOption;
 		const auto replyToTop = replyTo.topicRootId
 			? replyTo.topicRootId
 			: LookupReplyToTop(_history, to);
@@ -3888,6 +4948,9 @@ void HistoryItem::createComponentsHelper(HistoryItemCommonFields &&fields) {
 	if (fields.flags & MessageFlag::HasViews) {
 		config.viewsCount = 1;
 	}
+	if (fields.suggest.exists) {
+		config.suggest = fields.suggest;
+	}
 
 	createComponents(std::move(config));
 }
@@ -4002,6 +5065,9 @@ void HistoryItem::createComponents(const MTPDmessage &data) {
 	}
 	config.viaBotId = data.vvia_bot_id().value_or_empty();
 	config.viaBusinessBotId = data.vvia_business_bot_id().value_or_empty();
+	config.guestChatViaFrom = data.vguestchat_via_from()
+		? peerFromMTP(*data.vguestchat_via_from())
+		: PeerId();
 	config.viewsCount = data.vviews().value_or(-1);
 	config.forwardsCount = data.vforwards().value_or(-1);
 	config.replies = isScheduled()
@@ -4009,9 +5075,12 @@ void HistoryItem::createComponents(const MTPDmessage &data) {
 		: HistoryMessageRepliesData(data.vreplies());
 	config.markup = HistoryMessageMarkupData(data.vreply_markup());
 	config.editDate = data.vedit_date().value_or_empty();
+	config.scheduleRepeatPeriod
+		= data.vschedule_repeat_period().value_or_empty();
 	config.postAuthor = qs(data.vpost_author().value_or_empty());
 	config.restrictions = Data::UnavailableReason::Extract(
 		data.vrestriction_reason());
+	config.suggest = HistoryMessageSuggestInfo(data.vsuggested_post());
 	createComponents(std::move(config));
 }
 
@@ -4043,23 +5112,20 @@ void HistoryItem::refreshSentMedia(const MTPMessageMedia *media) {
 	}
 }
 
-void HistoryItem::createServiceFromMtp(const MTPDmessage &message) {
-	AddComponents(HistoryServiceData::Bit());
-
-	const auto unread = message.is_media_unread();
-	const auto media = message.vmedia();
-	Assert(media != nullptr);
-
-	media->match([&](const MTPDmessageMediaPhoto &data) {
+PreparedServiceText HistoryItem::prepareServiceTextForMessage(
+		const MTPMessageMedia &media,
+		bool unread) {
+	return media.match([&](const MTPDmessageMediaStory &data) {
+		return prepareStoryMentionText();
+	}, [&](const MTPDmessageMediaPhoto &data) -> PreparedServiceText {
 		if (unread) {
 			const auto ttl = data.vttl_seconds();
 			Assert(ttl != nullptr);
 
-			setSelfDestruct(HistoryServiceSelfDestruct::Type::Photo, *ttl);
 			if (out()) {
-				setServiceText({
-					tr::lng_ttl_photo_sent(tr::now, Ui::Text::WithEntities)
-				});
+				return {
+					tr::lng_ttl_photo_sent(tr::now, tr::marked)
+				};
 			} else {
 				auto result = PreparedServiceText();
 				result.links.push_back(fromLink());
@@ -4067,29 +5133,26 @@ void HistoryItem::createServiceFromMtp(const MTPDmessage &message) {
 					tr::now,
 					lt_from,
 					fromLinkText(), // Link 1.
-					Ui::Text::WithEntities);
-				setServiceText(std::move(result));
+					tr::marked);
+				return result;
 			}
 		} else {
-			setServiceText({
-				tr::lng_ttl_photo_expired(tr::now, Ui::Text::WithEntities)
-			});
+			return {
+				tr::lng_ttl_photo_expired(tr::now, tr::marked)
+			};
 		}
-	}, [&](const MTPDmessageMediaDocument &data) {
+	}, [&](const MTPDmessageMediaDocument &data) -> PreparedServiceText {
 		if (unread) {
 			const auto ttl = data.vttl_seconds();
 			Assert(ttl != nullptr);
 
 			if (data.is_video()) {
-				setSelfDestruct(
-					HistoryServiceSelfDestruct::Type::Video,
-					*ttl);
 				if (out()) {
-					setServiceText({
+					return {
 						tr::lng_ttl_video_sent(
 							tr::now,
-							Ui::Text::WithEntities)
-					});
+							tr::marked)
+					};
 				} else {
 					auto result = PreparedServiceText();
 					result.links.push_back(fromLink());
@@ -4097,17 +5160,18 @@ void HistoryItem::createServiceFromMtp(const MTPDmessage &message) {
 						tr::now,
 						lt_from,
 						fromLinkText(), // Link 1.
-						Ui::Text::WithEntities);
-					setServiceText(std::move(result));
+						tr::marked);
+					return result;
 				}
 			} else if (out()) {
 				auto text = (data.is_voice()
 					? tr::lng_ttl_voice_sent
 					: data.is_round()
 					? tr::lng_ttl_round_sent
-					: tr::lng_message_empty)(tr::now, Ui::Text::WithEntities);
-				setServiceText({ std::move(text) });
+					: tr::lng_message_empty)(tr::now, tr::marked);
+				return { std::move(text) };
 			}
+			return {};
 		} else {
 			auto text = (data.is_video()
 				? tr::lng_ttl_video_expired
@@ -4115,18 +5179,44 @@ void HistoryItem::createServiceFromMtp(const MTPDmessage &message) {
 				? tr::lng_ttl_voice_expired
 				: data.is_round()
 				? tr::lng_ttl_round_expired
-				: tr::lng_message_empty)(tr::now, Ui::Text::WithEntities);
-			setServiceText({ std::move(text) });
+				: tr::lng_message_empty)(tr::now, tr::marked);
+			return { std::move(text) };
 		}
-	}, [&](const MTPDmessageMediaStory &data) {
-		setServiceText(prepareStoryMentionText());
 	}, [](const auto &) {
-		Unexpected("Media type in HistoryItem::createServiceFromMtp()");
+		return PreparedServiceText();
 	});
+}
 
-	if (const auto reactions = message.vreactions()) {
-		updateReactions(reactions);
-	}
+void HistoryItem::createServiceFromMtp(const MTPDmessage &message) {
+	AddComponents(HistoryServiceData::Bit());
+
+	_flags |= MessageFlag::ReactionsAllowed;
+
+	const auto unread = message.is_media_unread();
+	const auto media = message.vmedia();
+	Assert(media != nullptr);
+
+	media->match([&](const MTPDmessageMediaPhoto &data) {
+		if (unread) {
+			const auto ttl = data.vttl_seconds();
+			Assert(ttl != nullptr);
+
+			setSelfDestruct(HistoryServiceSelfDestruct::Type::Photo, *ttl);
+		}
+	}, [&](const MTPDmessageMediaDocument &data) {
+		if (unread) {
+			const auto ttl = data.vttl_seconds();
+			Assert(ttl != nullptr);
+
+			if (data.is_video()) {
+				setSelfDestruct(
+					HistoryServiceSelfDestruct::Type::Video,
+					*ttl);
+			}
+		}
+	}, [](const auto &) {});
+
+	setServiceText(prepareServiceTextForMessage(*media, unread));
 }
 
 void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
@@ -4136,6 +5226,8 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 	const auto type = action.type();
 	if (type == mtpc_messageActionPinMessage) {
 		UpdateComponents(HistoryServicePinned::Bit());
+	} else if (type == mtpc_messageActionHistoryClear) {
+		UpdateComponents(HistoryServiceClearHistory::Bit());
 	} else if (type == mtpc_messageActionTopicCreate
 		|| type == mtpc_messageActionTopicEdit) {
 		UpdateComponents(HistoryServiceTopicInfo::Bit());
@@ -4184,10 +5276,7 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 		payment->recurringInit = data.is_recurring_init();
 		payment->recurringUsed = data.is_recurring_used();
 		payment->isCreditsCurrency = (currency == Ui::kCreditsCurrency);
-		payment->amount = AmountAndStarCurrency(
-			&_history->session(),
-			amount,
-			currency);
+		payment->amount = AmountAndStarCurrency(amount, currency);
 		payment->invoiceLink = std::make_shared<LambdaClickHandler>([=](
 				ClickContext context) {
 			using namespace Payments;
@@ -4230,7 +5319,7 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 			: (*has)
 			? PeerHasThisCallValue(
 				peer,
-				id) | rpl::skip(1) | rpl::type_erased()
+				id) | rpl::skip(1) | rpl::type_erased
 			: rpl::producer<bool>();
 		if (!hasLink) {
 			RemoveComponents(HistoryServiceOngoingCall::Bit());
@@ -4241,7 +5330,7 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 			call->lifetime.destroy();
 
 			const auto users = data.vusers().v;
-			std::move(hasLink) | rpl::start_with_next([=](bool has) {
+			std::move(hasLink) | rpl::on_next([=](bool has) {
 				updateServiceText(
 					prepareInvitedToCallText(
 						ParseInvitedToCallUsers(this, users),
@@ -4269,12 +5358,137 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 		refund->transactionId = qs(data.vcharge().data().vid());
 		const auto id = fullId();
 		refund->link = std::make_shared<LambdaClickHandler>([=](
-				ClickContext context) {
+			ClickContext context) {
 			const auto my = context.other.value<ClickHandlerContext>();
 			if (const auto window = my.sessionWindow.get()) {
 				Settings::ShowRefundInfoBox(window, id);
 			}
 		});
+	} else if (type == mtpc_messageActionTodoCompletions) {
+		const auto &data = action.c_messageActionTodoCompletions();
+		UpdateComponents(HistoryServiceTodoCompletions::Bit());
+		const auto done = Get<HistoryServiceTodoCompletions>();
+		done->completed = data.vcompleted().v
+			| ranges::views::transform(&MTPint::v)
+			| ranges::to_vector;
+		done->incompleted = data.vincompleted().v
+			| ranges::views::transform(&MTPint::v)
+			| ranges::to_vector;
+	} else if (type == mtpc_messageActionTodoAppendTasks) {
+		const auto session = &_history->session();
+		const auto &data = action.c_messageActionTodoAppendTasks();
+		UpdateComponents(HistoryServiceTodoAppendTasks::Bit());
+		const auto append = Get<HistoryServiceTodoAppendTasks>();
+		append->list = ranges::views::all(
+			data.vlist().v
+		) | ranges::views::transform([&](const MTPTodoItem &item) {
+			return TodoListItemFromMTP(session, item);
+		}) | ranges::to_vector;
+	} else if (type == mtpc_messageActionPollAppendAnswer) {
+		const auto &data = action.c_messageActionPollAppendAnswer();
+		UpdateComponents(HistoryServicePollAppendAnswer::Bit());
+		const auto append = Get<HistoryServicePollAppendAnswer>();
+		data.vanswer().match([&](const MTPDpollAnswer &answer) {
+			append->answer.option = answer.voption().v;
+			append->answer.text = Api::ParseTextWithEntities(
+				&_history->session(),
+				answer.vtext());
+		}, [](const auto &) {
+		});
+	} else if (type == mtpc_messageActionPollDeleteAnswer) {
+		const auto &data = action.c_messageActionPollDeleteAnswer();
+		UpdateComponents(HistoryServicePollDeleteAnswer::Bit());
+		const auto del = Get<HistoryServicePollDeleteAnswer>();
+		data.vanswer().match([&](const MTPDpollAnswer &answer) {
+			del->answer.option = answer.voption().v;
+			del->answer.text = Api::ParseTextWithEntities(
+				&_history->session(),
+				answer.vtext());
+		}, [](const auto &) {
+		});
+	} else if (type == mtpc_messageActionSuggestedPostApproval) {
+		const auto &data = action.c_messageActionSuggestedPostApproval();
+		UpdateComponents(HistoryServiceSuggestDecision::Bit());
+		const auto decision = Get<HistoryServiceSuggestDecision>();
+		decision->price = CreditsAmountFromTL(data.vprice());
+		decision->balanceTooLow = data.is_balance_too_low();
+		decision->rejected = data.is_rejected();
+		decision->rejectComment = qs(data.vreject_comment().value_or_empty());
+		decision->date = data.vschedule_date().value_or_empty();
+	} else if (type == mtpc_messageActionSuggestedPostSuccess) {
+		const auto &data = action.c_messageActionSuggestedPostSuccess();
+		UpdateComponents(HistoryServiceSuggestFinish::Bit());
+		const auto finish = Get<HistoryServiceSuggestFinish>();
+		finish->price = CreditsAmountFromTL(data.vprice());
+	} else if (type == mtpc_messageActionSuggestedPostRefund) {
+		const auto &data = action.c_messageActionSuggestedPostRefund();
+		UpdateComponents(HistoryServiceSuggestFinish::Bit());
+		const auto finish = Get<HistoryServiceSuggestFinish>();
+		finish->refundType = data.is_payer_initiated()
+			? SuggestRefundType::User
+			: SuggestRefundType::Admin;
+	} else if (type == mtpc_messageActionStarGiftPurchaseOffer) {
+		const auto &data = action.c_messageActionStarGiftPurchaseOffer();
+		const auto accepted = data.is_accepted();
+		const auto rejected = data.is_declined();
+		const auto expiresAt = data.vexpires_at().v;
+		const auto gift = Api::FromTL(&history()->session(), data.vgift());
+		if (const auto unique = gift ? gift->unique : nullptr) {
+			auto mask = HistoryMessageSuggestion::Bit();
+			const auto actions = computeSuggestionActions(
+				accepted,
+				rejected,
+				expiresAt);
+			if (actions != SuggestionActions::None) {
+				mask |= HistoryMessageReplyMarkup::Bit();
+			}
+			UpdateComponents(mask);
+
+			const auto suggestion = Get<HistoryMessageSuggestion>();
+			suggestion->price = CreditsAmountFromTL(data.vprice());
+			suggestion->date = expiresAt;
+			suggestion->accepted = accepted;
+			suggestion->rejected = rejected;
+			suggestion->gift = unique;
+
+			if (actions != SuggestionActions::None) {
+				const auto markup = Get<HistoryMessageReplyMarkup>();
+				markup->updateSuggestControls(actions);
+			}
+		}
+	} else if (type == mtpc_messageActionStarGiftPurchaseOfferDeclined) {
+		const auto &data = action.c_messageActionStarGiftPurchaseOfferDeclined();
+		UpdateComponents(HistoryServiceSuggestFinish::Bit());
+		const auto finish = Get<HistoryServiceSuggestFinish>();
+		finish->refundType = data.is_expired()
+			? SuggestRefundType::Expired
+			: SuggestRefundType::User;
+		finish->price = CreditsAmountFromTL(data.vprice());
+	} else if (type == mtpc_messageActionNoForwardsToggle) {
+		AddComponents(HistoryServiceNoForwardsToggle::Bit());
+	} else if (type == mtpc_messageActionNoForwardsRequest) {
+		const auto &data = action.c_messageActionNoForwardsRequest();
+		const auto expired = data.is_expired();
+		const auto period = _history->session().appConfig()
+			.noForwardsRequestExpirePeriod();
+		const auto expiresAt = TimeId(_date + period);
+		const auto isExpired = expired
+			|| (expiresAt <= base::unixtime::now());
+		auto mask = HistoryServiceNoForwardsRequest::Bit();
+		const auto actions = (!isExpired && !out())
+			? SuggestionActions::NoForwardsRequest
+			: SuggestionActions::None;
+		if (actions != SuggestionActions::None) {
+			mask |= HistoryMessageReplyMarkup::Bit();
+		}
+		UpdateComponents(mask);
+		const auto request = Get<HistoryServiceNoForwardsRequest>();
+		request->expired = isExpired;
+		request->expiresAt = expiresAt;
+		if (actions != SuggestionActions::None) {
+			const auto markup = Get<HistoryMessageReplyMarkup>();
+			markup->updateSuggestControls(actions);
+		}
 	}
 	if (const auto replyTo = message.vreply_to()) {
 		replyTo->match([&](const MTPDmessageReplyHeader &data) {
@@ -4297,11 +5511,30 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 		}, [](const MTPDmessageReplyStoryHeader &data) {
 		});
 	}
-	setServiceMessageByAction(action);
-}
 
-void HistoryItem::setMedia(const MTPMessageMedia &media) {
-	_media = CreateMedia(this, media);
+	const auto savedSublistPeer = message.vsaved_peer_id()
+		? peerFromMTP(*message.vsaved_peer_id())
+		: PeerId();
+	const auto requiresMonoforumPeer = _history->peer->amMonoforumAdmin();
+	if (!isBusinessShortcut()
+		&& (savedSublistPeer || requiresMonoforumPeer)) {
+		AddComponents(HistoryMessageSaved::Bit());
+		const auto saved = Get<HistoryMessageSaved>();
+		saved->sublistPeerId = savedSublistPeer
+			? savedSublistPeer
+			: _from->id;
+		if (_history->peer->isSelf()) {
+			saved->savedMessagesSublist
+				= _history->owner().savedMessages().sublist(
+					_history->owner().peer(saved->sublistPeerId));
+		}
+	}
+
+	setServiceMessageByAction(action);
+}
+
+void HistoryItem::setMedia(const MTPMessageMedia &media) {
+	_media = CreateMedia(this, media);
 	checkStoryForwardInfo();
 	checkBuyButton();
 }
@@ -4345,7 +5578,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 					tr::now,
 					lt_from,
 					fromLinkText(), // Link 1.
-					Ui::Text::WithEntities);
+					tr::marked);
 			} else {
 				result.links.push_back(fromLink());
 				result.links.push_back(u->createOpenLink());
@@ -4354,8 +5587,8 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 					lt_from,
 					fromLinkText(), // Link 1.
 					lt_user,
-					Ui::Text::Link(u->name(), 2), // Link 2.
-					Ui::Text::WithEntities);
+					tr::link(u->name(), 2), // Link 2.
+					tr::marked);
 			}
 		} else if (users.isEmpty()) {
 			result.links.push_back(fromLink());
@@ -4365,14 +5598,14 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 				fromLinkText(), // Link 1.
 				lt_user,
 				{ .text = u"somebody"_q },
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.links.push_back(fromLink());
 			for (auto i = 0, l = int(users.size()); i != l; ++i) {
 				auto user = _history->owner().user(users[i].v);
 				result.links.push_back(user->createOpenLink());
 
-				auto linkText = Ui::Text::Link(user->name(), 2 + i);
+				auto linkText = tr::link(user->name(), 2 + i);
 				if (i == 0) {
 					result.text = linkText;
 				} else if (i + 1 == l) {
@@ -4382,7 +5615,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 						result.text,
 						lt_user,
 						linkText,
-						Ui::Text::WithEntities);
+						tr::marked);
 				} else {
 					result.text = tr::lng_action_add_users_and_one(
 						tr::now,
@@ -4390,7 +5623,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 						result.text,
 						lt_user,
 						linkText,
-						Ui::Text::WithEntities);
+						tr::marked);
 				}
 			}
 			result.text = tr::lng_action_add_users_many(
@@ -4399,7 +5632,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 				fromLinkText(), // Link 1.
 				lt_users,
 				result.text,
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 		return result;
 	};
@@ -4411,29 +5644,39 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			tr::now,
 			lt_from,
 			fromLinkText(), // Link 1.
-			Ui::Text::WithEntities);
+			tr::marked);
 		return result;
 	};
 
 	auto prepareChatCreate = [this](const MTPDmessageActionChatCreate &action) {
 		auto result = PreparedServiceText();
-		result.links.push_back(fromLink());
-		result.text = tr::lng_action_created_chat(
-			tr::now,
-			lt_from,
-			fromLinkText(), // Link 1.
-			lt_title,
-			{ .text = qs(action.vtitle()) },
-			Ui::Text::WithEntities);
+		if (_history->peer->isMonoforum()) {
+			result.text = tr::lng_action_created_monoforum(
+				tr::now,
+				tr::marked);
+		} else {
+			result.links.push_back(fromLink());
+			result.text = tr::lng_action_created_chat(
+				tr::now,
+				lt_from,
+				fromLinkText(), // Link 1.
+				lt_title,
+				{ .text = qs(action.vtitle()) },
+				tr::marked);
+		}
 		return result;
 	};
 
 	auto prepareChannelCreate = [this](const MTPDmessageActionChannelCreate &action) {
 		auto result = PreparedServiceText();
-		if (isPost()) {
+		if (_history->peer->isMonoforum()) {
+			result.text = tr::lng_action_created_monoforum(
+				tr::now,
+				tr::marked);
+		} else if (isPost()) {
 			result.text = tr::lng_action_created_channel(
 				tr::now,
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.links.push_back(fromLink());
 			result.text = tr::lng_action_created_chat(
@@ -4442,7 +5685,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 				fromLinkText(), // Link 1.
 				lt_title,
 				{ .text = qs(action.vtitle()) },
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 		return result;
 	};
@@ -4452,14 +5695,14 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		if (isPost()) {
 			result.text = tr::lng_action_removed_photo_channel(
 				tr::now,
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.links.push_back(fromLink());
 			result.text = tr::lng_action_removed_photo(
 				tr::now,
 				lt_from,
 				fromLinkText(), // Link 1.
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 		return result;
 	};
@@ -4472,7 +5715,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 				tr::now,
 				lt_from,
 				fromLinkText(), // Link 1.
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			auto user = _history->owner().user(action.vuser_id().v);
 			result.links.push_back(fromLink());
@@ -4482,8 +5725,8 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 				lt_from,
 				fromLinkText(), // Link 1.
 				lt_user,
-				Ui::Text::Link(user->name(), 2), // Link 2.
-				Ui::Text::WithEntities);
+				tr::link(user->name(), 2), // Link 2.
+				tr::marked);
 		}
 		return result;
 	};
@@ -4493,14 +5736,14 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		if (isPost()) {
 			result.text = tr::lng_action_changed_photo_channel(
 				tr::now,
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.links.push_back(fromLink());
 			result.text = tr::lng_action_changed_photo(
 				tr::now,
 				lt_from,
 				fromLinkText(), // Link 1.
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 		return result;
 	};
@@ -4512,7 +5755,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 				tr::now,
 				lt_title,
 				{ .text = (qs(action.vtitle())) },
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.links.push_back(fromLink());
 			result.text = tr::lng_action_changed_title(
@@ -4521,7 +5764,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 				fromLinkText(), // Link 1.
 				lt_title,
 				{ .text = qs(action.vtitle()) },
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 		return result;
 	};
@@ -4542,19 +5785,31 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		return preparePaymentSentText();
 	};
 
+	auto preparePaymentSentMe = [&](const MTPDmessageActionPaymentSentMe &data) {
+		auto result = PreparedServiceText();
+		result.text = (data.is_recurring_used()
+			? tr::lng_action_payment_bot_recurring
+			: tr::lng_action_payment_bot_done)(
+				tr::now,
+				lt_amount,
+				AmountAndStarCurrency(data.vtotal_amount().v, qs(data.vcurrency())),
+				tr::marked);
+		return result;
+	};
+
 	auto prepareScreenshotTaken = [this](const MTPDmessageActionScreenshotTaken &) {
 		auto result = PreparedServiceText();
 		if (out()) {
 			result.text = tr::lng_action_you_took_screenshot(
 				tr::now,
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.links.push_back(fromLink());
 			result.text = tr::lng_action_took_screenshot(
 				tr::now,
 				lt_from,
 				fromLinkText(), // Link 1.
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 		return result;
 	};
@@ -4588,15 +5843,15 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 				lt_app,
 				(url.isEmpty()
 					? TextWithEntities{ u"App"_q }
-					: Ui::Text::Link(info->title, url)),
-				Ui::Text::WithEntities);
+					: tr::link(info->title, url)),
+				tr::marked);
 		} else {
 			const auto domain = qs(action.vdomain().value_or_empty());
 			result.text = tr::lng_action_bot_allowed_from_domain(
 				tr::now,
 				lt_domain,
-				Ui::Text::Link(domain, u"http://"_q + domain),
-				Ui::Text::WithEntities);
+				tr::link(domain, u"http://"_q + domain),
+				tr::marked);
 		}
 		return result;
 	};
@@ -4634,10 +5889,10 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		result.text = tr::lng_action_secure_values_sent(
 			tr::now,
 			lt_user,
-			Ui::Text::Link(_history->peer->name(), QString()), // Link 1.
+			tr::link(_history->peer->name(), QString()), // Link 1.
 			lt_documents,
 			{ .text = documents.join(", ") },
-			Ui::Text::WithEntities);
+			tr::marked);
 		return result;
 	};
 
@@ -4648,7 +5903,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			tr::now,
 			lt_from,
 			fromLinkText(), // Link 1.
-			Ui::Text::WithEntities);
+			tr::marked);
 		return result;
 	};
 
@@ -4682,29 +5937,29 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 					lt_distance,
 					{ .text = distance },
 					lt_user,
-					Ui::Text::Link(toPeer->name(), QString()), // Link 1.
-					Ui::Text::WithEntities);
+					tr::link(toPeer->name(), QString()), // Link 1.
+					tr::marked);
 			} else if (toId == selfId) {
 				result.links.push_back(fromPeer->createOpenLink());
 				return tr::lng_action_proximity_reached_you(
 					tr::now,
 					lt_from,
-					Ui::Text::Link(fromPeer->name(), QString()), // Link 1.
+					tr::link(fromPeer->name(), QString()), // Link 1.
 					lt_distance,
 					{ .text = distance },
-					Ui::Text::WithEntities);
+					tr::marked);
 			} else {
 				result.links.push_back(fromPeer->createOpenLink());
 				result.links.push_back(toPeer->createOpenLink());
 				return tr::lng_action_proximity_reached(
 					tr::now,
 					lt_from,
-					Ui::Text::Link(fromPeer->name(), 1), // Link 1.
+					tr::link(fromPeer->name(), 1), // Link 1.
 					lt_distance,
 					{ .text = distance },
 					lt_user,
-					Ui::Text::Link(toPeer->name(), 2), // Link 2.
-					Ui::Text::WithEntities);
+					tr::link(toPeer->name(), 2), // Link 2.
+					tr::marked);
 			}
 		}();
 		return result;
@@ -4729,7 +5984,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 					tr::now,
 					lt_duration,
 					{ .text = text },
-					Ui::Text::WithEntities);
+					tr::marked);
 			} else {
 				result.links.push_back(fromLink());
 				result.text = tr::lng_action_group_call_finished_group(
@@ -4738,21 +5993,21 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 					fromLinkText(), // Link 1.
 					lt_duration,
 					{ .text = text },
-					Ui::Text::WithEntities);
+					tr::marked);
 			}
 			return result;
 		}
 		if (_history->peer->isBroadcast()) {
 			result.text = tr::lng_action_group_call_started_channel(
 				tr::now,
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.links.push_back(fromLink());
 			result.text = tr::lng_action_group_call_started_group(
 				tr::now,
 				lt_from,
 				fromLinkText(), // Link 1.
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 		return result;
 	};
@@ -4764,7 +6019,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		for (const auto &id : action.vusers().v) {
 			const auto user = owner->user(id.v);
 			if (callId) {
-				owner->registerInvitedToCallUser(callId, peer, user);
+				owner->registerInvitedToCallUser(callId, peer, user, false);
 			}
 		};
 		const auto linkCallId = PeerHasThisCall(peer, callId).value_or(false)
@@ -4788,14 +6043,14 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 						tr::now,
 						lt_duration,
 						{ .text = duration },
-						Ui::Text::WithEntities)
+						tr::marked)
 					: tr::lng_action_ttl_global(
 						tr::now,
 						lt_from,
-						Ui::Text::Link(peer->name(), 1), // Link 1.
+						tr::link(peer->name(), 1), // Link 1.
 						lt_duration,
 						{ .text = duration },
-						Ui::Text::WithEntities);
+						tr::marked);
 				return result;
 			}
 		}
@@ -4803,25 +6058,25 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			if (!period) {
 				result.text = tr::lng_action_ttl_removed_channel(
 					tr::now,
-					Ui::Text::WithEntities);
+					tr::marked);
 			} else {
 				result.text = tr::lng_action_ttl_changed_channel(
 					tr::now,
 					lt_duration,
 					{ .text = duration },
-					Ui::Text::WithEntities);
+					tr::marked);
 			}
 		} else if (_from->isSelf()) {
 			if (!period) {
 				result.text = tr::lng_action_ttl_removed_you(
 					tr::now,
-					Ui::Text::WithEntities);
+					tr::marked);
 			} else {
 				result.text = tr::lng_action_ttl_changed_you(
 					tr::now,
 					lt_duration,
 					{ .text = duration },
-					Ui::Text::WithEntities);
+					tr::marked);
 			}
 		} else {
 			result.links.push_back(fromLink());
@@ -4830,7 +6085,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 					tr::now,
 					lt_from,
 					fromLinkText(), // Link 1.
-					Ui::Text::WithEntities);
+					tr::marked);
 			} else {
 				result.text = tr::lng_action_ttl_changed(
 					tr::now,
@@ -4838,7 +6093,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 					fromLinkText(), // Link 1.
 					lt_duration,
 					{ .text = duration },
-					Ui::Text::WithEntities);
+					tr::marked);
 			}
 		}
 		return result;
@@ -4850,38 +6105,63 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 
 	auto prepareSetChatTheme = [this](const MTPDmessageActionSetChatTheme &action) {
 		auto result = PreparedServiceText();
-		const auto text = qs(action.vemoticon());
-		if (!text.isEmpty()) {
-			if (_from->isSelf()) {
-				result.text = tr::lng_action_you_theme_changed(
-					tr::now,
-					lt_emoji,
-					{ .text = text },
-					Ui::Text::WithEntities);
-			} else {
-				result.links.push_back(fromLink());
-				result.text = tr::lng_action_theme_changed(
-					tr::now,
-					lt_from,
-					fromLinkText(), // Link 1.
-					lt_emoji,
-					{ .text = text },
-					Ui::Text::WithEntities);
-			}
-		} else {
-			if (_from->isSelf()) {
-				result.text = tr::lng_action_you_theme_disabled(
-					tr::now,
-					Ui::Text::WithEntities);
+		action.vtheme().match([&](const MTPDchatTheme &data) {
+			const auto text = qs(data.vemoticon());
+			if (!text.isEmpty()) {
+				if (_from->isSelf()) {
+					result.text = tr::lng_action_you_theme_changed(
+						tr::now,
+						lt_emoji,
+						{ .text = text },
+						tr::marked);
+				} else {
+					result.links.push_back(fromLink());
+					result.text = tr::lng_action_theme_changed(
+						tr::now,
+						lt_from,
+						fromLinkText(), // Link 1.
+						lt_emoji,
+						{ .text = text },
+						tr::marked);
+				}
 			} else {
-				result.links.push_back(fromLink());
-				result.text = tr::lng_action_theme_disabled(
-					tr::now,
-					lt_from,
-					fromLinkText(), // Link 1.
-					Ui::Text::WithEntities);
+				if (_from->isSelf()) {
+					result.text = tr::lng_action_you_theme_disabled(
+						tr::now,
+						tr::marked);
+				} else {
+					result.links.push_back(fromLink());
+					result.text = tr::lng_action_theme_disabled(
+						tr::now,
+						lt_from,
+						fromLinkText(), // Link 1.
+						tr::marked);
+				}
 			}
-		}
+		}, [&](const MTPDchatThemeUniqueGift &data) {
+			data.vgift().match([&](const MTPDstarGiftUnique &data) {
+				const auto giftName = tr::bold(qs(data.vtitle())
+					+ u" #"_q
+					+ QString::number(data.vnum().v));
+				if (_from->isSelf()) {
+					result.text = tr::lng_action_you_gift_theme_changed(
+						tr::now,
+						lt_name,
+						giftName,
+						tr::marked);
+				} else {
+					result.links.push_back(fromLink());
+					result.text = tr::lng_action_gift_theme_changed(
+						tr::now,
+						lt_from,
+						fromLinkText(),
+						lt_name,
+						giftName,
+						tr::marked);
+				}
+			}, [](const MTPDstarGift &) {
+			});
+		});
 		return result;
 	};
 
@@ -4892,7 +6172,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			tr::now,
 			lt_from,
 			fromLinkText(), // Link 1.
-			Ui::Text::WithEntities);
+			tr::marked);
 		return result;
 	};
 
@@ -4902,7 +6182,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			tr::now,
 			lt_text,
 			{ .text = qs(action.vtext()) },
-			Ui::Text::WithEntities);
+			tr::marked);
 		return result;
 	};
 
@@ -4915,56 +6195,69 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		session->giftBoxStickersPacks().load();
 		const auto amount = action.vamount().v;
 		const auto currency = qs(action.vcurrency());
-		const auto cost = AmountAndStarCurrency(session, amount, currency);
+		const auto cost = AmountAndStarCurrency(amount, currency);
 		const auto anonymous = _from->isServiceUser();
 		if (anonymous) {
 			result.text = tr::lng_action_gift_received_anonymous(
 				tr::now,
 				lt_cost,
 				cost,
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.links.push_back(peer->createOpenLink());
 			result.text = isSelf
 				? tr::lng_action_gift_sent(tr::now,
 					lt_cost,
 					cost,
-					Ui::Text::WithEntities)
+					tr::marked)
 				: tr::lng_action_gift_received(
 					tr::now,
 					lt_user,
-					Ui::Text::Link(peer->shortName(), 1), // Link 1.
+					tr::link(peer->shortName(), 1), // Link 1.
 					lt_cost,
 					cost,
-					Ui::Text::WithEntities);
+					tr::marked);
 		}
 		return result;
 	};
 
 	auto prepareTopicCreate = [&](const MTPDmessageActionTopicCreate &action) {
 		auto result = PreparedServiceText();
-		const auto topicUrl = u"internal:url:https://t.me/c/%1/%2"_q
-			.arg(peerToChannel(_history->peer->id).bare)
-			.arg(id.bare);
+		const auto topicUrl = UrlClickHandler::EncodeInternalWrappedUrl(
+			u"https://t.me/c/%1/%2"_q
+				.arg(peerToChannel(_history->peer->id).bare)
+				.arg(id.bare));
 		result.text = tr::lng_action_topic_created(
 			tr::now,
 			lt_topic,
-			Ui::Text::Link(
+			tr::link(
 				Data::ForumTopicIconWithTitle(
 					id,
 					action.vicon_emoji_id().value_or_empty(),
 					qs(action.vtitle())),
 				topicUrl),
-			Ui::Text::WithEntities);
+			tr::marked);
 		return result;
 	};
 
 	auto prepareTopicEdit = [&](const MTPDmessageActionTopicEdit &action) {
 		auto result = PreparedServiceText();
+		const auto linkText = history()->peer->isBot()
+			? tr::lng_action_topic_bot_thread(tr::now)
+			: tr::lng_action_topic_placeholder(tr::now);
 		if (const auto closed = action.vclosed()) {
-			result.text = { mtpIsTrue(*closed)
-				? tr::lng_action_topic_closed_inside(tr::now)
-				: tr::lng_action_topic_reopened_inside(tr::now) };
+			result.links.push_back(fromLink());
+			result.text = (mtpIsTrue(*closed)
+				? tr::lng_action_topic_closed_inside_by(
+					tr::now,
+					lt_from,
+					fromLinkText(), // Link 1.
+					tr::marked)
+				: tr::lng_action_topic_reopened_inside_by(
+					tr::now,
+					lt_from,
+					fromLinkText(), // Link 1.
+					tr::marked));
 		} else if (const auto hidden = action.vhidden()) {
 			result.text = { mtpIsTrue(*hidden)
 				? tr::lng_action_topic_hidden_inside(tr::now)
@@ -4978,10 +6271,10 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 						lt_from,
 						fromLinkText(), // Link 1.
 						lt_link,
-						{ tr::lng_action_topic_placeholder(tr::now) },
+						{ linkText },
 						lt_emoji,
 						Data::SingleCustomEmoji(iconId),
-						Ui::Text::WithEntities);
+						tr::marked);
 				} else {
 					result.links.push_back(fromLink());
 					result.text = tr::lng_action_topic_icon_removed(
@@ -4989,8 +6282,8 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 						lt_from,
 						fromLinkText(), // Link 1.
 						lt_link,
-						{ tr::lng_action_topic_placeholder(tr::now) },
-						Ui::Text::WithEntities);
+						{ linkText },
+						tr::marked);
 				}
 			}
 		} else {
@@ -5000,13 +6293,13 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 				lt_from,
 				fromLinkText(), // Link 1.
 				lt_link,
-				{ tr::lng_action_topic_placeholder(tr::now) },
+				{ linkText },
 				lt_title,
 				Data::ForumTopicIconWithTitle(
 					topicRootId(),
 					action.vicon_emoji_id().value_or_empty(),
 					qs(*action.vtitle())),
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 		if (result.text.empty()) {
 			result.text = { tr::lng_message_empty(tr::now) };
@@ -5038,8 +6331,8 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 				: tr::lng_action_suggested_photo))(
 				tr::now,
 				lt_user,
-				Ui::Text::Link(name, 1), // Link 1.
-				Ui::Text::WithEntities);
+				tr::link(name, 1), // Link 1.
+				tr::marked);
 		return result;
 	};
 
@@ -5055,7 +6348,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			auto user = _history->owner().peer(id);
 			result.links.push_back(user->createOpenLink());
 
-			auto linkText = Ui::Text::Link(user->name(), 2 + i);
+			auto linkText = tr::link(user->name(), 2 + i);
 			if (i == 0) {
 				result.text = linkText;
 			} else if (i + 1 == count) {
@@ -5065,7 +6358,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 					result.text,
 					lt_user,
 					linkText,
-					Ui::Text::WithEntities);
+					tr::marked);
 			} else {
 				result.text = tr::lng_action_add_users_and_one(
 					tr::now,
@@ -5073,7 +6366,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 					result.text,
 					lt_user,
 					linkText,
-					Ui::Text::WithEntities);
+					tr::marked);
 			}
 		}
 
@@ -5082,8 +6375,8 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			lt_chat,
 			result.text,
 			lt_bot,
-			Ui::Text::Link(history()->peer->name(), 1),
-			Ui::Text::WithEntities);
+			tr::link(history()->peer->name(), 1),
+			tr::marked);
 		return result;
 	};
 
@@ -5106,20 +6399,20 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 				? tr::lng_action_set_wallpaper_both_me(
 					tr::now,
 					lt_user,
-					Ui::Text::Link(Ui::Text::Bold(name), 1),
-					Ui::Text::WithEntities)
+					tr::link(tr::bold(name), 1),
+					tr::marked)
 				: (same
 					? tr::lng_action_set_same_wallpaper_me
 					: tr::lng_action_set_wallpaper_me)(
 						tr::now,
-						Ui::Text::WithEntities))
+						tr::marked))
 			: (same
 				? tr::lng_action_set_same_wallpaper
 				: tr::lng_action_set_wallpaper)(
 					tr::now,
 					lt_user,
-					Ui::Text::Link(Ui::Text::Bold(name), 1),
-					Ui::Text::WithEntities);
+					tr::link(tr::bold(name), 1),
+					tr::marked);
 		return result;
 	};
 
@@ -5142,7 +6435,6 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			const auto isSelf = (_from->id == _from->session().userPeerId());
 			const auto peer = isSelf ? _history->peer : _from;
 			const auto cost = AmountAndStarCurrency(
-				&_history->session(),
 				action.vamount().value_or_empty(),
 				qs(action.vcurrency().value_or_empty()));
 			result.links.push_back(peer->createOpenLink());
@@ -5150,14 +6442,14 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 				? tr::lng_action_gift_sent(tr::now,
 					lt_cost,
 					cost,
-					Ui::Text::WithEntities)
+					tr::marked)
 				: tr::lng_action_gift_received(
 					tr::now,
 					lt_user,
-					Ui::Text::Link(peer->shortName(), 1), // Link 1.
+					tr::link(peer->shortName(), 1), // Link 1.
 					lt_cost,
 					cost,
-					Ui::Text::WithEntities);
+					tr::marked);
 
 		}
 		return result;
@@ -5179,15 +6471,15 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 						tr::now,
 						lt_count_decimal,
 						float64(credits),
-						Ui::Text::Bold),
-					Ui::Text::WithEntities)
+						tr::bold),
+					tr::marked)
 			: (_history->peer->isMegagroup()
 				? tr::lng_action_giveaway_started_group
 				: tr::lng_action_giveaway_started)(
 					tr::now,
 					lt_from,
 					fromLinkText(), // Link 1.
-					Ui::Text::WithEntities);
+					tr::marked);
 		return result;
 	};
 
@@ -5216,14 +6508,26 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 	auto prepareBoostApply = [&](const MTPDmessageActionBoostApply &action) {
 		auto result = PreparedServiceText();
 		const auto boosts = action.vboosts().v;
+		const auto isSelf = (_from->id == _from->session().userPeerId());
 		result.links.push_back(fromLink());
-		result.text = tr::lng_action_boost_apply(
-			tr::now,
-			lt_count,
-			boosts,
-			lt_from,
-			fromLinkText(), // Link 1.
-			Ui::Text::WithEntities);
+		result.text = isSelf
+			? tr::lng_action_boost_apply_me(tr::now, tr::marked)
+			: tr::lng_action_boost_apply(
+				tr::now,
+				lt_count,
+				boosts,
+				lt_from,
+				fromLinkText(), // Link 1.
+				tr::marked);
+		const auto channel = _history->peer->asChannel();
+		setCustomServiceLink(std::make_shared<LambdaClickHandler>([=](
+				ClickContext context) {
+			const auto my = context.other.value<ClickHandlerContext>();
+			const auto weak = my.sessionWindow;
+			if (const auto strong = channel ? weak.get() : nullptr) {
+				strong->resolveBoostState(channel);
+			}
+		}));
 		return result;
 	};
 	auto preparePaymentRefunded = [&](const MTPDmessageActionPaymentRefunded &action) {
@@ -5238,10 +6542,10 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		result.text = tr::lng_action_payment_refunded(
 			tr::now,
 			lt_peer,
-			Ui::Text::Link(refund->peer->name(), 1), // Link 1.
+			tr::link(refund->peer->name(), 1), // Link 1.
 			lt_amount,
-			AmountAndStarCurrency(&_history->session(), amount, currency),
-			Ui::Text::WithEntities);
+			AmountAndStarCurrency(amount, currency),
+			tr::marked);
 		return result;
 	};
 
@@ -5253,23 +6557,63 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		_history->session().giftBoxStickersPacks().load();
 		const auto amount = action.vamount().v;
 		const auto currency = qs(action.vcurrency());
-		const auto cost = AmountAndStarCurrency(
-			&_history->session(),
-			amount,
-			currency);
-		result.links.push_back(peer->createOpenLink());
-		result.text = isSelf
-			? tr::lng_action_gift_sent(tr::now,
+		const auto cost = AmountAndStarCurrency(amount, currency);
+		const auto anonymous = _from->isServiceUser();
+		if (anonymous) {
+			result.text = tr::lng_action_gift_received_anonymous(
+				tr::now,
 				lt_cost,
 				cost,
-				Ui::Text::WithEntities)
-			: tr::lng_action_gift_received(
+				tr::marked);
+		} else {
+			result.links.push_back(peer->createOpenLink());
+			result.text = isSelf
+				? tr::lng_action_gift_sent(tr::now,
+					lt_cost,
+					cost,
+					tr::marked)
+				: tr::lng_action_gift_received(
+					tr::now,
+					lt_user,
+					tr::link(peer->shortName(), 1), // Link 1.
+					lt_cost,
+					cost,
+					tr::marked);
+		}
+		return result;
+	};
+
+	auto prepareGiftTon = [&](
+			const MTPDmessageActionGiftTon &action) {
+		auto result = PreparedServiceText();
+		const auto isSelf = (_from->id == _from->session().userPeerId());
+		const auto peer = isSelf ? _history->peer : _from;
+		_history->session().giftBoxStickersPacks().tonLoad();
+		const auto amount = action.vamount().v;
+		const auto currency = qs(action.vcurrency());
+		const auto cost = AmountAndStarCurrency(amount, currency);
+		const auto anonymous = _from->isServiceUser();
+		if (anonymous) {
+			result.text = tr::lng_action_gift_received_anonymous(
 				tr::now,
-				lt_user,
-				Ui::Text::Link(peer->shortName(), 1), // Link 1.
 				lt_cost,
 				cost,
-				Ui::Text::WithEntities);
+				tr::marked);
+		} else {
+			result.links.push_back(peer->createOpenLink());
+			result.text = isSelf
+				? tr::lng_action_gift_sent(tr::now,
+					lt_cost,
+					cost,
+					tr::marked)
+				: tr::lng_action_gift_received(
+					tr::now,
+					lt_user,
+					tr::link(peer->shortName(), 1), // Link 1.
+					lt_cost,
+					cost,
+					tr::marked);
+		}
 		return result;
 	};
 
@@ -5292,37 +6636,650 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 	auto prepareStarGift = [&](
 			const MTPDmessageActionStarGift &action) {
 		auto result = PreparedServiceText();
+		const auto upgradeGifted = action.is_prepaid_upgrade();
+		const auto upgradeSeparate = action.is_upgrade_separate();
 		const auto isSelf = _from->isSelf();
 		const auto peer = isSelf ? _history->peer : _from;
-		const auto stars = action.vgift().data().vstars().v;
+		const auto stars = action.vgift().match([&](
+				const MTPDstarGift &data) {
+			return upgradeGifted
+				? uint64(action.vupgrade_stars().value_or_empty())
+				: upgradeSeparate
+				? uint64(data.vstars().v)
+				: (uint64(data.vstars().v)
+					+ uint64(action.vupgrade_stars().value_or_empty()));
+		}, [](const MTPDstarGiftUnique &) {
+			return uint64();
+		});
+		if (!stars) {
+			if (!isSelf) {
+				result.links.push_back(peer->createOpenLink());
+			}
+			result.text = isSelf
+				? tr::lng_action_gift_unique_sent(
+					tr::now,
+					tr::marked)
+				: tr::lng_action_gift_unique_received(
+					tr::now,
+					lt_user,
+					tr::link(peer->shortName(), 1), // Link 1.
+					tr::marked);
+			return result;
+		}
 		const auto cost = TextWithEntities{
 			tr::lng_action_gift_for_stars(tr::now, lt_count, stars),
 		};
-		const auto anonymous = _from->isServiceUser();
-		if (anonymous) {
-			result.text = tr::lng_action_gift_received_anonymous(
-				tr::now,
-				lt_cost,
-				cost,
-				Ui::Text::WithEntities);
+		const auto giftPeer = action.vpeer()
+			? peerFromMTP(*action.vpeer())
+			: PeerId();
+		const auto service = _from->isServiceUser();
+		const auto toChannel = service && peerIsChannel(giftPeer);
+		const auto anonymous = service && !toChannel;
+		if (toChannel) {
+			const auto fromId = action.vfrom_id()
+				? peerFromMTP(*action.vfrom_id())
+				: PeerId();
+			const auto from = fromId
+				? peer->owner().peer(fromId).get()
+				: nullptr;
+			const auto channel = peer->owner().channel(
+				peerToChannel(giftPeer));
+			if (!from || from->isSelf()) {
+				result.links.push_back(channel->createOpenLink());
+				if (upgradeGifted) {
+					result.text = tr::lng_action_gift_sent_upgrade_self_channel(
+						tr::now,
+						lt_cost,
+						cost,
+						lt_name,
+						tr::link(channel->name(), 1),
+						tr::marked);
+				} else {
+					result.text = tr::lng_action_gift_sent_self_channel(
+							tr::now,
+							lt_name,
+							tr::link(channel->name(), 1),
+							lt_cost,
+							cost,
+							tr::marked);
+				}
+			} else {
+				result.links.push_back(from->createOpenLink());
+				result.links.push_back(channel->createOpenLink());
+				if (upgradeGifted) {
+					result.text = tr::lng_action_gift_sent_upgrade_self_other(
+						tr::now,
+						lt_cost,
+						cost,
+						lt_name,
+						tr::link(channel->name(), 2),
+						lt_user,
+						tr::link(from->shortName(), 1),
+						tr::marked);
+				} else {
+					result.text = tr::lng_action_gift_sent_channel(
+						tr::now,
+						lt_user,
+						tr::link(from->shortName(), 1),
+						lt_name,
+						tr::link(channel->name(), 2),
+						lt_cost,
+						cost,
+						tr::marked);
+				}
+			}
+		} else if (anonymous || _history->peer->isSelf()) {
+			result.text = (action.is_auction_acquired()
+				? tr::lng_action_gift_auction_won
+				: anonymous
+				? tr::lng_action_gift_received_anonymous
+				: tr::lng_action_gift_self_bought)(
+					tr::now,
+					lt_cost,
+					cost,
+					tr::marked);
+		} else if (upgradeGifted) {
+			// Who sent the gift.
+			const auto fromId = action.vfrom_id()
+				? peerFromMTP(*action.vfrom_id())
+				: PeerId();
+			const auto from = fromId
+				? peer->owner().peer(fromId).get()
+				: nullptr;
+			if (isSelf) {
+				result.links.push_back(peer->createOpenLink());
+				if (!from || from->isSelf()) {
+					result.text = tr::lng_action_gift_sent_upgrade_self(
+						tr::now,
+						lt_cost,
+						cost,
+						tr::marked);
+				} else {
+					result.links.push_back(from->createOpenLink());
+					result.text = tr::lng_action_gift_sent_upgrade_self_other(
+						tr::now,
+						lt_cost,
+						cost,
+						lt_name,
+						tr::link(peer->shortName(), 1),
+						lt_user,
+						tr::link(from->shortName(), 2),
+						tr::marked);
+				}
+			} else {
+				result.links.push_back(peer->createOpenLink());
+				if (from && from != peer && !from->isSelf()) {
+					result.links.push_back(from->createOpenLink());
+					result.text = tr::lng_action_gift_sent_upgrade_other(
+						tr::now,
+						lt_from,
+						tr::link(peer->shortName(), 1),
+						lt_cost,
+						cost,
+						lt_user,
+						tr::link(from->shortName(), 2),
+						tr::marked);
+				} else {
+					result.text = tr::lng_action_gift_sent_upgrade(
+						tr::now,
+						lt_from,
+						tr::link(peer->shortName(), 1),
+						lt_cost,
+						cost,
+						tr::marked);
+				}
+			}
 		} else {
-			result.links.push_back(peer->createOpenLink());
+			if (!isSelf) {
+				result.links.push_back(peer->createOpenLink());
+			}
 			result.text = isSelf
-				? tr::lng_action_gift_sent(tr::now,
+				? tr::lng_action_gift_sent(
+					tr::now,
 					lt_cost,
 					cost,
-					Ui::Text::WithEntities)
+					tr::marked)
 				: tr::lng_action_gift_received(
 					tr::now,
 					lt_user,
-					Ui::Text::Link(peer->shortName(), 1), // Link 1.
+					tr::link(peer->shortName(), 1), // Link 1.
+					lt_cost,
+					cost,
+					tr::marked);
+		}
+		return result;
+	};
+
+	auto prepareStarGiftUnique = [&](
+			const MTPDmessageActionStarGiftUnique &action) {
+		auto result = PreparedServiceText();
+		const auto isSelf = _from->isSelf();
+		const auto resale = CreditsAmountFromTL(action.vresale_amount());
+		const auto fromOffer = action.is_from_offer();
+		const auto resaleCost = !resale
+			? tr::marked()
+			: tr::marked(PrepareCreditsAmountText(resale));
+		const auto giftPeer = action.vpeer()
+			? peerFromMTP(*action.vpeer())
+			: PeerId();
+		const auto service = _from->isServiceUser();
+		const auto toChannel = service && peerIsChannel(giftPeer);
+		const auto upgradeHelped = action.is_prepaid_upgrade();
+		const auto peer = isSelf ? _history->peer : _from;
+		const auto fromId = action.vfrom_id()
+			? peerFromMTP(*action.vfrom_id())
+			: PeerId();
+		const auto from = fromId ? peer->owner().peer(fromId) : peer;
+		if (toChannel) {
+			const auto channel = peer->owner().channel(
+				peerToChannel(giftPeer));
+			if (!from->isServiceUser() && !from->isSelf()) {
+				result.links.push_back(from->createOpenLink());
+				if (resale) {
+					result.links.push_back(channel->createOpenLink());
+				}
+				result.text = resale
+					? tr::lng_action_gift_sent_channel(
+						tr::now,
+						lt_user,
+						tr::link(from->shortName(), 1),
+						lt_name,
+						tr::link(channel->name(), 2),
+						lt_cost,
+						resaleCost,
+						tr::marked)
+					: (action.is_upgrade()
+						? tr::lng_action_gift_upgraded_channel
+						: tr::lng_action_gift_transferred_channel)(
+							tr::now,
+							lt_user,
+							tr::link(from->shortName(), 1),
+							lt_channel,
+							tr::link(channel->name(), 2),
+							tr::marked);
+			} else {
+				result.text = resale
+					? tr::lng_action_gift_sent_self_channel(
+						tr::now,
+						lt_name,
+						tr::link(channel->name(), 1),
+						lt_cost,
+						resaleCost,
+						tr::marked)
+					: (from->isServiceUser()
+						? tr::lng_action_gift_transferred_unknown_channel
+						: action.is_upgrade()
+						? tr::lng_action_gift_upgraded_self_channel
+						: tr::lng_action_gift_transferred_self_channel)(
+							tr::now,
+							lt_channel,
+							tr::link(channel->name(), 1),
+							tr::marked);
+			}
+			result.links.push_back(channel->createOpenLink());
+		} else {
+			if (upgradeHelped) {
+				result.links.push_back(peer->createOpenLink());
+				if (isSelf) {
+					result.text = tr::lng_action_gift_upgraded_helped_self(
+						tr::now,
+						lt_user,
+						tr::link(peer->shortName(), 1),
+						tr::marked);
+				} else {
+					result.text = tr::lng_action_gift_upgraded_helped(
+						tr::now,
+						lt_user,
+						tr::link(peer->shortName(), 1),
+						tr::marked);
+				}
+			} else if (!from->isServiceUser() && !_history->peer->isSelf()) {
+				if (!resale || !isSelf) {
+					result.links.push_back(from->createOpenLink());
+				}
+				result.text = fromOffer
+					? (isSelf
+						? tr::lng_action_gift_sent_sold(
+							tr::now,
+							lt_cost,
+							resaleCost,
+							tr::marked)
+						: tr::lng_action_gift_received_sold(
+							tr::now,
+							lt_user,
+							tr::link(peer->shortName(), 1), // Link 1.
+							lt_cost,
+							resaleCost,
+							tr::marked))
+					: resale
+					? (isSelf
+						? tr::lng_action_gift_sent(
+							tr::now,
+							lt_cost,
+							resaleCost,
+							tr::marked)
+						: tr::lng_action_gift_received(
+							tr::now,
+							lt_user,
+							tr::link(peer->shortName(), 1), // Link 1.
+							lt_cost,
+							resaleCost,
+							tr::marked))
+					: (action.is_upgrade()
+						? (isSelf
+							? tr::lng_action_gift_upgraded_mine
+							: tr::lng_action_gift_upgraded)
+						: (isSelf
+							? tr::lng_action_gift_transferred_mine
+							: tr::lng_action_gift_transferred))(
+								tr::now,
+								lt_user,
+								tr::link(from->shortName(), 1),
+								tr::marked);
+			} else if (action.is_assigned()) {
+				const auto gift = Api::FromTL(
+					&history()->session(),
+					action.vgift());
+				result.text = tr::lng_action_gift_displayed_self(
+					tr::now,
+					lt_name,
+					TextWithEntities{ (gift && gift->unique)
+						? Data::UniqueGiftName(*gift->unique)
+						: QString(),
+					},
+					tr::marked);
+			} else if (action.is_craft()) {
+				result.text = tr::lng_action_gift_crafted(
+					tr::now,
+					tr::marked);
+			} else {
+				result.text = resale
+					? tr::lng_action_gift_self_bought(
+						tr::now,
+						lt_cost,
+						resaleCost,
+						tr::marked)
+					: (from->isServiceUser()
+						? tr::lng_action_gift_transferred_unknown
+						: action.is_upgrade()
+						? tr::lng_action_gift_upgraded_self
+						: tr::lng_action_gift_transferred_self)(
+							tr::now,
+							tr::marked);
+			}
+		}
+		return result;
+	};
+
+	auto preparePaidMessagesRefunded = [&](const MTPDmessageActionPaidMessagesRefunded &action) {
+		auto result = PreparedServiceText();
+		const auto sublist = _history->amMonoforumAdmin()
+			? savedSublist()
+			: nullptr;
+		const auto recipient = sublist
+			? sublist->sublistPeer().get()
+			: _history->peer.get();
+		if (_from->isSelf() || sublist) {
+			result.links.push_back(recipient->createOpenLink());
+			result.text = tr::lng_action_paid_message_refund_self(
+				tr::now,
+				lt_count,
+				action.vstars().v,
+				lt_name,
+				tr::link(recipient->shortName(), 1),
+				tr::marked);
+		} else {
+			result.links.push_back(_from->createOpenLink());
+			result.text = tr::lng_action_paid_message_refund(
+				tr::now,
+				lt_count,
+				action.vstars().v,
+				lt_from,
+				tr::link(_from->shortName(), 1),
+				tr::marked);
+		}
+		return result;
+	};
+
+	auto preparePaidMessagesPrice = [&](const MTPDmessageActionPaidMessagesPrice &action) {
+		const auto stars = action.vstars().v;
+		const auto broadcastAllowed = action.is_broadcast_messages_allowed();
+		auto result = PreparedServiceText();
+		result.text = _history->peer->isBroadcast()
+			? (stars > 0
+				? tr::lng_action_direct_messages_paid(
+					tr::now,
+					lt_count,
+					stars,
+					tr::marked)
+				: broadcastAllowed
+				? tr::lng_action_direct_messages_enabled(
+					tr::now,
+					tr::marked)
+				: tr::lng_action_direct_messages_disabled(
+					tr::now,
+					tr::marked))
+			: stars
+			? tr::lng_action_message_price_paid(
+				tr::now,
+				lt_count,
+				stars,
+				tr::marked)
+			: tr::lng_action_message_price_free(
+				tr::now,
+				tr::marked);
+		return result;
+	};
+
+	auto prepareTodoCompletions = [&](const MTPDmessageActionTodoCompletions &) {
+		return prepareTodoCompletionsText();
+	};
+
+	auto prepareTodoAppendTasks = [&](const MTPDmessageActionTodoAppendTasks &) {
+		return prepareTodoAppendTasksText();
+	};
+
+	auto preparePollAppendAnswer = [&](const MTPDmessageActionPollAppendAnswer &) {
+		return preparePollAppendAnswerText();
+	};
+
+	auto preparePollDeleteAnswer = [&](const MTPDmessageActionPollDeleteAnswer &) {
+		return preparePollDeleteAnswerText();
+	};
+
+	auto prepareSuggestedPostApproval = [&](const MTPDmessageActionSuggestedPostApproval &data) {
+		return PreparedServiceText{ { data.is_rejected()
+			? tr::lng_action_post_rejected(tr::now)
+			: data.is_balance_too_low()
+			? tr::lng_action_not_enough_funds(tr::now)
+			: tr::lng_suggest_action_agreement(tr::now) } };
+	};
+
+	auto prepareSuggestedPostSuccess = [&](const MTPDmessageActionSuggestedPostSuccess &data) {
+		const auto price = CreditsAmountFromTL(&data.vprice());
+		auto result = PreparedServiceText();
+		result.links.push_back(_from->createOpenLink());
+		result.text = (price.stars()
+			? tr::lng_action_suggest_success_stars
+			: tr::lng_action_suggest_success_ton)(
+				tr::now,
+				lt_count_decimal,
+				price.value(),
+				lt_from,
+				tr::link(_from->shortName(), 1),
+				tr::marked);
+		return result;
+	};
+
+	auto prepareSuggestedPostRefund = [&](const MTPDmessageActionSuggestedPostRefund &data) {
+		return PreparedServiceText{ { data.is_payer_initiated()
+			? tr::lng_action_suggest_refund_user(tr::now)
+			: tr::lng_action_suggest_refund_admin(tr::now)
+		} };
+	};
+
+	auto prepareConferenceCall = [&](const MTPDmessageActionConferenceCall &) -> PreparedServiceText {
+		Unexpected("PhoneCall type in setServiceMessageFromMtp.");
+	};
+
+	auto prepareSuggestBirthday = [&](const MTPDmessageActionSuggestBirthday &action) {
+		auto result = PreparedServiceText{};
+		const auto isSelf = (_from->id == _from->session().userPeerId());
+		const auto peer = isSelf ? history()->peer : _from;
+		const auto user = peer->asUser();
+		const auto name = (user && !user->firstName.isEmpty())
+			? user->firstName
+			: peer->name();
+		result.links.push_back(peer->createOpenLink());
+		result.text = (isSelf
+			? tr::lng_action_suggested_birthday_me
+			: tr::lng_action_suggested_birthday)(
+				tr::now,
+				lt_user,
+				tr::link(name, 1), // Link 1.
+				tr::marked);
+		return result;
+	};
+
+	auto prepareStarGiftPurchaseOffer = [&](const MTPDmessageActionStarGiftPurchaseOffer &action) {
+		auto result = PreparedServiceText{};
+		action.vgift().match([&](const MTPDstarGiftUnique &data) {
+			const auto amount = CreditsAmountFromTL(action.vprice());
+			const auto cost = tr::marked(PrepareCreditsAmountText(amount));
+			const auto giftName = tr::bold(qs(data.vtitle())
+				+ u" #"_q
+				+ QString::number(data.vnum().v));
+			if (_from->isSelf()) {
+				result.text = tr::lng_action_gift_offer_you(
+					tr::now,
 					lt_cost,
 					cost,
-					Ui::Text::WithEntities);
+					lt_name,
+					giftName,
+					tr::marked);
+			} else {
+				result.text = tr::lng_action_gift_offer_incoming(
+					tr::now,
+					lt_amount,
+					cost,
+					tr::marked);
+			}
+		}, [](const MTPDstarGift &) {
+		});
+		return result;
+	};
+
+	auto prepareStarGiftPurchaseOfferDeclined = [&](const MTPDmessageActionStarGiftPurchaseOfferDeclined &action) {
+		auto result = PreparedServiceText{};
+		action.vgift().match([&](const MTPDstarGiftUnique &data) {
+			const auto amount = CreditsAmountFromTL(action.vprice());
+			const auto cost = tr::marked(PrepareCreditsAmountText(amount));
+			const auto giftName = tr::bold(qs(data.vtitle())
+				+ u" #"_q
+				+ QString::number(data.vnum().v));
+			const auto expired = action.is_expired();
+			if (_from->isSelf()) {
+				result.links.push_back(_history->peer->createOpenLink());
+				result.text = expired
+					? tr::lng_action_gift_offer_expired(
+						tr::now,
+						lt_user,
+						tr::link(st::wrap_rtl(_history->peer->name()), 1),
+						lt_name,
+						giftName,
+						lt_cost,
+						cost,
+						tr::marked)
+					: tr::lng_action_gift_offer_declined_you(
+						tr::now,
+						lt_user,
+						tr::link(st::wrap_rtl(_history->peer->name()), 1),
+						lt_name,
+						giftName,
+						lt_cost,
+						cost,
+						tr::marked);
+			} else {
+				if (!expired) {
+					result.links.push_back(fromLink());
+				}
+				result.text = expired
+					? tr::lng_action_gift_offer_expired_your(
+						tr::now,
+						lt_name,
+						giftName,
+						lt_cost,
+						cost,
+						tr::marked)
+					: tr::lng_action_gift_offer_declined(
+						tr::now,
+						lt_user,
+						fromLinkText(),
+						lt_name,
+						giftName,
+						lt_cost,
+						cost,
+						tr::marked);
+			}
+		}, [](const MTPDstarGift &) {
+		});
+		return result;
+	};
+
+	auto prepareNewCreatorPending = [this](const MTPDmessageActionNewCreatorPending &action) {
+		auto result = PreparedServiceText();
+		auto user = _history->owner().user(action.vnew_creator_id().v);
+		result.links.push_back(fromLink());
+		result.links.push_back(user->createOpenLink());
+		result.text = tr::lng_action_new_creator_pending(
+			tr::now,
+			lt_user,
+			tr::link(user->name(), 2),
+			lt_from,
+			fromLinkText(),
+			tr::marked);
+		return result;
+	};
+
+	auto prepareChangeCreator = [this](const MTPDmessageActionChangeCreator &action) {
+		auto result = PreparedServiceText();
+		auto user = _history->owner().user(action.vnew_creator_id().v);
+		result.links.push_back(fromLink());
+		result.links.push_back(user->createOpenLink());
+		result.text = tr::lng_action_change_creator(
+			tr::now,
+			lt_from,
+			fromLinkText(),
+			lt_user,
+			tr::link(user->name(), 2),
+			tr::marked);
+		return result;
+	};
+
+	auto prepareNoForwardsToggle = [this](const MTPDmessageActionNoForwardsToggle &action) {
+		auto result = PreparedServiceText();
+		const auto enabled = mtpIsTrue(action.vnew_value());
+		const auto prevEnabled = mtpIsTrue(action.vprev_value());
+		if (enabled == prevEnabled) {
+			result.text = tr::lng_action_no_forwards_still_disabled(
+				tr::now,
+				tr::marked);
+		} else if (out()) {
+			result.text = (enabled
+				? tr::lng_action_no_forwards_you_disabled
+				: tr::lng_action_no_forwards_you_enabled)(
+					tr::now,
+					tr::marked);
+		} else {
+			result.links.push_back(fromLink());
+			result.text = (enabled
+				? tr::lng_action_no_forwards_disabled
+				: tr::lng_action_no_forwards_enabled)(
+					tr::now,
+					lt_from,
+					fromLinkText(),
+					tr::marked);
 		}
 		return result;
 	};
 
+	auto prepareNoForwardsRequest = [this](const MTPDmessageActionNoForwardsRequest &action) {
+		auto result = PreparedServiceText();
+		const auto nfr = Get<HistoryServiceNoForwardsRequest>();
+		if (nfr && nfr->expired && !nfr->actionTaken) {
+			result.text = tr::lng_action_no_forwards_request_expired(
+				tr::now,
+				tr::marked);
+		} else if (_from->isSelf()) {
+			result.text = tr::lng_action_no_forwards_request_you(
+				tr::now,
+				tr::marked);
+		} else {
+			result.links.push_back(fromLink());
+			result.text = tr::lng_action_no_forwards_request(
+				tr::now,
+				lt_from,
+				fromLinkText(),
+				tr::marked);
+		}
+		return result;
+	};
+
+	auto prepareManagedBotCreated = [this](const MTPDmessageActionManagedBotCreated &action) {
+		auto result = PreparedServiceText();
+		auto bot = _history->owner().user(action.vbot_id().v);
+		result.links.push_back(fromLink());
+		result.links.push_back(bot->createOpenLink());
+		result.text = tr::lng_action_managed_bot_created(
+			tr::now,
+			lt_from,
+			fromLinkText(),
+			lt_bot,
+			tr::link(bot->name(), 2),
+			tr::marked);
+		return result;
+	};
+
 	setServiceText(action.match(
 		prepareChatAddUserText,
 		prepareChatJoinedByLink,
@@ -5345,7 +7302,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		prepareSecureValuesSent,
 		prepareContactSignUp,
 		prepareProximityReached,
-		PrepareErrorText<MTPDmessageActionPaymentSentMe>,
+		preparePaymentSentMe,
 		PrepareErrorText<MTPDmessageActionSecureValuesSentMe>,
 		prepareGroupCall,
 		prepareInviteToGroupCall,
@@ -5367,16 +7324,36 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		prepareBoostApply,
 		preparePaymentRefunded,
 		prepareGiftStars,
+		prepareGiftTon,
 		prepareGiftPrize,
 		prepareStarGift,
+		prepareStarGiftUnique,
+		preparePaidMessagesRefunded,
+		preparePaidMessagesPrice,
+		prepareConferenceCall,
+		prepareTodoCompletions,
+		prepareTodoAppendTasks,
+		preparePollAppendAnswer,
+		prepareSuggestedPostApproval,
+		prepareSuggestedPostSuccess,
+		prepareSuggestedPostRefund,
+		prepareSuggestBirthday,
+		prepareStarGiftPurchaseOffer,
+		prepareStarGiftPurchaseOfferDeclined,
+		prepareNewCreatorPending,
+		prepareChangeCreator,
+		prepareNoForwardsToggle,
+		prepareNoForwardsRequest,
+		prepareManagedBotCreated,
+		PrepareEmptyText<MTPDmessageActionPollAppendAnswer>,
+		preparePollDeleteAnswer,
 		PrepareEmptyText<MTPDmessageActionRequestedPeerSentMe>,
 		PrepareErrorText<MTPDmessageActionEmpty>));
 
-	// Additional information.
-	applyAction(action);
+	processAction(action);
 }
 
-void HistoryItem::applyAction(const MTPMessageAction &action) {
+void HistoryItem::processAction(const MTPMessageAction &action) {
 	action.match([&](const MTPDmessageActionChatAddUser &data) {
 		if (const auto channel = _history->peer->asMegagroup()) {
 			const auto selfUserId = _history->session().userId();
@@ -5418,19 +7395,15 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 			}
 		}
 	}, [&](const MTPDmessageActionGiftPremium &data) {
+		const auto session = &history()->session();
 		_media = std::make_unique<Data::MediaGiftBox>(
 			this,
 			_from,
 			Data::GiftCode{
 				.message = (data.vmessage()
-					? TextWithEntities{
-						.text = qs(data.vmessage()->data().vtext()),
-						.entities = Api::EntitiesFromMTP(
-							&history()->session(),
-							data.vmessage()->data().ventities().v),
-					}
+					? Api::ParseTextWithEntities(session, *data.vmessage())
 					: TextWithEntities()),
-				.count = data.vmonths().v,
+				.count = data.vdays().v,
 				.type = Data::GiftType::Premium,
 			});
 	}, [&](const MTPDmessageActionSuggestProfilePhoto &data) {
@@ -5454,6 +7427,20 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 					data.is_for_both());
 			}
 		}
+	}, [&](const MTPDmessageActionSetChatTheme &data) {
+		data.vtheme().match([](const MTPDchatTheme &) {
+		}, [&](const MTPDchatThemeUniqueGift &data) {
+			const auto session = &history()->session();
+			if (const auto gift = Api::FromTL(session, data.vgift())) {
+				_media = std::make_unique<Data::MediaGiftBox>(
+					this,
+					_from,
+					Data::GiftCode{
+						.unique = gift->unique,
+						.type = Data::GiftType::ChatTheme,
+					});
+			}
+		}, [](const MTPDchatTheme &) {});
 	}, [&](const MTPDmessageActionGiftCode &data) {
 		const auto boostedId = data.vboost_peer()
 			? peerToChannel(peerFromMTP(*data.vboost_peer()))
@@ -5464,17 +7451,14 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 			Data::GiftCode{
 				.slug = qs(data.vslug()),
 				.message = (data.vmessage()
-					? TextWithEntities{
-						.text = qs(data.vmessage()->data().vtext()),
-						.entities = Api::EntitiesFromMTP(
-							&history()->session(),
-							data.vmessage()->data().ventities().v),
-					}
+					? Api::ParseTextWithEntities(
+						&history()->session(),
+						*data.vmessage())
 					: TextWithEntities()),
 				.channel = (boostedId
 					? history()->owner().channel(boostedId).get()
 					: nullptr),
-				.count = data.vmonths().v,
+				.count = data.vdays().v,
 				.type = Data::GiftType::Premium,
 				.viaGiveaway = data.is_via_giveaway(),
 				.unclaimed = data.is_unclaimed(),
@@ -5485,6 +7469,12 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 			_from,
 			Data::GiftType::Credits,
 			data.vstars().v);
+	}, [&](const MTPDmessageActionGiftTon &data) {
+		_media = std::make_unique<Data::MediaGiftBox>(
+			this,
+			_from,
+			Data::GiftType::Ton,
+			data.vcrypto_amount().v);
 	}, [&](const MTPDmessageActionPrizeStars &data) {
 		_media = std::make_unique<Data::MediaGiftBox>(
 			this,
@@ -5500,29 +7490,170 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 				.unclaimed = data.is_unclaimed(),
 			});
 	}, [&](const MTPDmessageActionStarGift &data) {
-		const auto &gift = data.vgift().data();
-		const auto document = history()->owner().processDocument(
-			gift.vsticker());
+		const auto service = _from->isServiceUser();
+		const auto from = data.vfrom_id()
+			? peerFromMTP(*data.vfrom_id())
+			: PeerId();
+		const auto to = data.vpeer()
+			? peerFromMTP(*data.vpeer())
+			: PeerId();
+		const auto upgradeMsgId = data.vupgrade_msg_id().value_or_empty();
+		const auto giftMsgId = data.vgift_msg_id().value_or_empty();
+		const auto title = data.vgift().match([&](const MTPDstarGift &gift) {
+			return qs(gift.vtitle().value_or_empty());
+		}, [](const MTPDstarGiftUnique &) {
+			return QString();
+		});
+		const auto bid = data.vgift().match([&](const MTPDstarGift &gift) {
+			return data.is_auction_acquired()
+				? (int(gift.vstars().v)
+					+ int(gift.vupgrade_stars().value_or_empty()))
+				: 0;
+		}, [](const MTPDstarGiftUnique &) {
+			return 0;
+		});
+		const auto channel = (service && peerIsChannel(to))
+			? history()->owner().channel(peerToChannel(to)).get()
+			: nullptr;
+		const auto channelSavedId = channel
+			? data.vsaved_id().value_or_empty()
+			: uint64();
+		const auto realGiftMsgId = (peerIsUser(to) && data.vsaved_id())
+			? MsgId(data.vsaved_id().value_or_empty())
+			: upgradeMsgId
+			? upgradeMsgId
+			: giftMsgId;
+
 		using Fields = Data::GiftCode;
-		_media = std::make_unique<Data::MediaGiftBox>(this, _from, Fields{
-			.document = document->sticker() ? document.get() : nullptr,
+		auto fields = Fields{
 			.message = (data.vmessage()
-				? TextWithEntities{
-					.text = qs(data.vmessage()->data().vtext()),
-					.entities = Api::EntitiesFromMTP(
-						&history()->session(),
-						data.vmessage()->data().ventities().v),
-				}
+				? Api::ParseTextWithEntities(
+					&history()->session(),
+					*data.vmessage())
 				: TextWithEntities()),
-			.convertStars = int(data.vconvert_stars().v),
-			.limitedCount = gift.vavailability_total().value_or_empty(),
-			.limitedLeft = gift.vavailability_remains().value_or_empty(),
-			.count = int(gift.vstars().v),
+			.auctionTo = (service
+				&& data.is_auction_acquired()
+				&& data.vto_id())
+				? history()->owner().peer(
+					peerFromMTP(*data.vto_id())).get()
+				: nullptr,
+			.channel = channel,
+			.channelFrom = ((service && from)
+				? history()->owner().peer(from).get()
+				: nullptr),
+			.channelSavedId = channelSavedId,
+			.giftPrepayUpgradeHash = qs(
+				data.vprepaid_upgrade_hash().value_or_empty()),
+			.giftTitle = title,
+			.realGiftMsgId = realGiftMsgId,
+			.starsConverted = int(data.vconvert_stars().value_or_empty()),
+			.starsUpgradedBySender = int(
+				data.vupgrade_stars().value_or_empty()),
+			.starsBid = bid,
+			.giftNum = data.vgift_num().value_or_empty(),
 			.type = Data::GiftType::StarGift,
+			.upgradeSeparate = data.is_upgrade_separate(),
+			.upgradeGifted = data.is_prepaid_upgrade(),
+			.upgradable = data.is_can_upgrade(),
 			.anonymous = data.is_name_hidden(),
 			.converted = data.is_converted(),
+			.upgraded = data.is_upgraded(),
 			.saved = data.is_saved(),
-		});
+		};
+		if (auto gift = Api::FromTL(&history()->session(), data.vgift())) {
+			fields.stargiftId = gift->id;
+			fields.starsToUpgrade = gift->starsToUpgrade;
+			fields.document = gift->document;
+			fields.stargiftReleasedBy = gift->releasedBy;
+			fields.limitedCount = gift->limitedCount;
+			fields.limitedLeft = gift->limitedLeft;
+			fields.count = gift->stars;
+			fields.unique = gift->unique;
+		}
+		_media = std::make_unique<Data::MediaGiftBox>(
+			this,
+			_from,
+			std::move(fields));
+	}, [&](const MTPDmessageActionStarGiftUnique &data) {
+		const auto service = _from->isServiceUser();
+		const auto from = data.vfrom_id()
+			? peerFromMTP(*data.vfrom_id())
+			: PeerId();
+		const auto to = data.vpeer()
+			? peerFromMTP(*data.vpeer())
+			: PeerId();
+		const auto channel = (service && peerIsChannel(to))
+			? history()->owner().channel(peerToChannel(to)).get()
+			: nullptr;
+		const auto channelSavedId = channel
+			? data.vsaved_id().value_or_empty()
+			: uint64();
+		const auto realGiftMsgId = (peerIsUser(to) && data.vsaved_id())
+			? MsgId(data.vsaved_id().value_or_empty())
+			: id;
+
+		using Fields = Data::GiftCode;
+		auto fields = Fields{
+			.channel = channel,
+			.channelFrom = ((service && from)
+				? history()->owner().peer(from).get()
+				: nullptr),
+			.channelSavedId = channelSavedId,
+			.realGiftMsgId = realGiftMsgId,
+			.starsForDetailsRemove = int(
+				data.vdrop_original_details_stars().value_or_empty()),
+			.type = Data::GiftType::StarGift,
+			.transferred = data.is_transferred(),
+			.refunded = data.is_refunded(),
+			.upgrade = data.is_upgrade(),
+			.saved = data.is_saved(),
+			.craft = data.is_craft(),
+		};
+		if (auto gift = Api::FromTL(&history()->session(), data.vgift())) {
+			fields.stargiftId = gift->id;
+			fields.document = gift->document;
+			fields.stargiftReleasedBy = gift->releasedBy;
+			fields.limitedCount = gift->limitedCount;
+			fields.limitedLeft = gift->limitedLeft;
+			fields.count = gift->stars;
+			fields.unique = std::move(gift->unique);
+			if (const auto unique = fields.unique.get()) {
+				unique->starsForTransfer
+					= data.vtransfer_stars().value_or(-1);
+				unique->exportAt = data.vcan_export_at().value_or_empty();
+				unique->canTransferAt = data.vcan_transfer_at().value_or_empty();
+				unique->canResellAt = data.vcan_resell_at().value_or_empty();
+				unique->canCraftAt = data.vcan_craft_at().value_or_empty();
+			}
+		}
+		_media = std::make_unique<Data::MediaGiftBox>(
+			this,
+			_from,
+			std::move(fields));
+	}, [&](const MTPDmessageActionSuggestBirthday &data) {
+		const auto &fields = data.vbirthday().data();
+		_media = std::make_unique<Data::MediaGiftBox>(
+			this,
+			_from,
+			Data::GiftCode{
+				.count = Data::Birthday(
+					fields.vday().v,
+					fields.vmonth().v,
+					fields.vyear().value_or_empty()).serialize(),
+				.type = Data::GiftType::BirthdaySuggest,
+			});
+	}, [&](const MTPDmessageActionStarGiftPurchaseOffer &data) {
+		if (const auto suggestion = Get<HistoryMessageSuggestion>()) {
+			Assert(suggestion->gift != nullptr);
+
+			_media = std::make_unique<Data::MediaGiftBox>(
+				this,
+				_from,
+				Data::GiftCode{
+					.unique = suggestion->gift,
+					.type = Data::GiftType::GiftOffer,
+				});
+		}
 	}, [](const auto &) {
 	});
 }
@@ -5545,14 +7676,14 @@ PreparedServiceText HistoryItem::prepareInvitedToCallText(
 		CallId linkCallId) {
 	auto chatText = tr::lng_action_invite_user_chat(
 		tr::now,
-		Ui::Text::WithEntities);
+		tr::marked);
 	auto result = PreparedServiceText();
 	result.links.push_back(fromLink());
 	auto linkIndex = 1;
 	if (linkCallId) {
 		const auto peer = _history->peer;
 		result.links.push_back(GroupCallClickHandler(peer, linkCallId));
-		chatText = Ui::Text::Link(chatText.text, ++linkIndex);
+		chatText = tr::link(chatText.text, ++linkIndex);
 	}
 	if (users.size() == 1) {
 		auto user = users[0];
@@ -5562,10 +7693,10 @@ PreparedServiceText HistoryItem::prepareInvitedToCallText(
 			lt_from,
 			fromLinkText(), // Link 1.
 			lt_user,
-			Ui::Text::Link(user->name(), ++linkIndex), // Link N.
+			tr::link(user->name(), ++linkIndex), // Link N.
 			lt_chat,
 			chatText,
-			Ui::Text::WithEntities);
+			tr::marked);
 	} else if (users.empty()) {
 		result.text = tr::lng_action_invite_user(
 			tr::now,
@@ -5575,13 +7706,13 @@ PreparedServiceText HistoryItem::prepareInvitedToCallText(
 			{ .text = u"somebody"_q },
 			lt_chat,
 			chatText,
-			Ui::Text::WithEntities);
+			tr::marked);
 	} else {
 		for (auto i = 0, l = int(users.size()); i != l; ++i) {
 			const auto user = users[i];
 			result.links.push_back(user->createOpenLink());
 
-			auto linkText = Ui::Text::Link(user->name(), ++linkIndex);
+			auto linkText = tr::link(user->name(), ++linkIndex);
 			if (i == 0) {
 				result.text = linkText;
 			} else if (i + 1 == l) {
@@ -5591,7 +7722,7 @@ PreparedServiceText HistoryItem::prepareInvitedToCallText(
 					result.text,
 					lt_user,
 					linkText,
-					Ui::Text::WithEntities);
+					tr::marked);
 			} else {
 				result.text = tr::lng_action_invite_users_and_one(
 					tr::now,
@@ -5599,7 +7730,7 @@ PreparedServiceText HistoryItem::prepareInvitedToCallText(
 					result.text,
 					lt_user,
 					linkText,
-					Ui::Text::WithEntities);
+					tr::marked);
 			}
 		}
 		result.text = tr::lng_action_invite_users_many(
@@ -5610,7 +7741,7 @@ PreparedServiceText HistoryItem::prepareInvitedToCallText(
 			result.text,
 			lt_chat,
 			chatText,
-			Ui::Text::WithEntities);
+			tr::marked);
 	}
 	return result;
 }
@@ -5654,7 +7785,7 @@ PreparedServiceText HistoryItem::preparePinnedText() {
 				original = Ui::Text::Mid(original, 0, cutAt).append(
 					Ui::kQEllipsis);
 			}
-			original = Ui::Text::Link(
+			original = tr::link(
 				Ui::Text::Filtered(
 					std::move(original),
 					{
@@ -5670,15 +7801,15 @@ PreparedServiceText HistoryItem::preparePinnedText() {
 				fromLinkText(), // Link 1.
 				lt_text,
 				st::wrap_rtl(original), // Link 2.
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.text = tr::lng_action_pinned_media(
 				tr::now,
 				lt_from,
 				fromLinkText(), // Link 1.
 				lt_media,
-				Ui::Text::Link(mediaText, 2), // Link 2.
-				Ui::Text::WithEntities);
+				tr::link(mediaText, 2), // Link 2.
+				tr::marked);
 		}
 	} else if (pinned && pinned->msgId) {
 		result.links.push_back(fromLink());
@@ -5688,8 +7819,8 @@ PreparedServiceText HistoryItem::preparePinnedText() {
 			lt_from,
 			fromLinkText(), // Link 1.
 			lt_media,
-			Ui::Text::Link(tr::lng_contacts_loading(tr::now), 2), // Link 2.
-			Ui::Text::WithEntities);
+			tr::link(tr::lng_contacts_loading(tr::now), 2), // Link 2.
+			tr::marked);
 	} else {
 		result.links.push_back(fromLink());
 		result.text = tr::lng_action_pinned_media(
@@ -5698,7 +7829,7 @@ PreparedServiceText HistoryItem::preparePinnedText() {
 			fromLinkText(), // Link 1.
 			lt_media,
 			{ .text = tr::lng_deleted_message(tr::now) },
-			Ui::Text::WithEntities);
+			tr::marked);
 	}
 	return result;
 }
@@ -5720,12 +7851,12 @@ PreparedServiceText HistoryItem::prepareGameScoreText() {
 							column,
 							gamescore->msg->fullId()));
 					auto titleText = game->title;
-					return Ui::Text::Link(titleText, QString());
+					return tr::link(titleText, QString());
 				}
 			}
-			return tr::lng_deleted_message(tr::now, Ui::Text::WithEntities);
+			return tr::lng_deleted_message(tr::now, tr::marked);
 		} else if (gamescore && gamescore->msgId) {
-			return tr::lng_contacts_loading(tr::now, Ui::Text::WithEntities);
+			return tr::lng_contacts_loading(tr::now, tr::marked);
 		}
 		return {};
 	};
@@ -5738,7 +7869,7 @@ PreparedServiceText HistoryItem::prepareGameScoreText() {
 				tr::now,
 				lt_count,
 				scoreNumber,
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.text = tr::lng_action_game_you_scored(
 				tr::now,
@@ -5746,7 +7877,7 @@ PreparedServiceText HistoryItem::prepareGameScoreText() {
 				scoreNumber,
 				lt_game,
 				gameTitle,
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 	} else {
 		result.links.push_back(fromLink());
@@ -5758,7 +7889,7 @@ PreparedServiceText HistoryItem::prepareGameScoreText() {
 				scoreNumber,
 				lt_from,
 				fromLinkText(), // Link 1.
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.text = tr::lng_action_game_score(
 				tr::now,
@@ -5768,7 +7899,7 @@ PreparedServiceText HistoryItem::prepareGameScoreText() {
 				fromLinkText(), // Link 1.
 				lt_game,
 				gameTitle,
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 	}
 	return result;
@@ -5783,7 +7914,7 @@ PreparedServiceText HistoryItem::preparePaymentSentText() {
 		if (payment->msg) {
 			if (const auto media = payment->msg->media()) {
 				if (const auto invoice = media->invoice()) {
-					return Ui::Text::Link(invoice->title, QString());
+					return tr::link(invoice->title, QString());
 				}
 			}
 		}
@@ -5796,7 +7927,7 @@ PreparedServiceText HistoryItem::preparePaymentSentText() {
 				tr::now,
 				lt_amount,
 				payment->amount,
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.text = (payment->recurringInit
 				? tr::lng_action_payment_init_recurring
@@ -5806,7 +7937,7 @@ PreparedServiceText HistoryItem::preparePaymentSentText() {
 					payment->amount,
 					lt_user,
 					{ .text = _history->peer->name() },
-					Ui::Text::WithEntities);
+					tr::marked);
 		}
 	} else {
 		result.text = (payment->recurringInit
@@ -5819,7 +7950,7 @@ PreparedServiceText HistoryItem::preparePaymentSentText() {
 				{ .text = _history->peer->name() },
 				lt_invoice,
 				invoiceTitle,
-				Ui::Text::WithEntities);
+				tr::marked);
 		if (payment->msg) {
 			result.links.push_back(payment->lnk);
 		}
@@ -5842,10 +7973,10 @@ PreparedServiceText HistoryItem::prepareStoryMentionText() {
 		tr::now,
 		lt_user,
 		Ui::Text::Wrapped(
-			Ui::Text::Bold(peer->shortName()),
+			tr::bold(peer->shortName()),
 			EntityType::CustomUrl,
 			u"internal:index"_q + QChar(1)),
-		Ui::Text::WithEntities);
+		tr::marked);
 	return result;
 }
 
@@ -5867,7 +7998,7 @@ PreparedServiceText HistoryItem::prepareCallScheduledText(
 				tr::now,
 				lt_date,
 				{ .text = date },
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.links.push_back(fromLink());
 			result.text = tr::lng_action_group_call_scheduled_group(
@@ -5876,7 +8007,7 @@ PreparedServiceText HistoryItem::prepareCallScheduledText(
 				fromLinkText(), // Link 1.
 				lt_date,
 				{ .text = date },
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 	};
 	const auto time = QLocale().toString(
@@ -5908,15 +8039,153 @@ PreparedServiceText HistoryItem::prepareCallScheduledText(
 	if (nextIn) {
 		call->lifetime = base::timer_once(
 			(nextIn + 2) * crl::time(1000)
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateServiceText(prepareCallScheduledText(scheduleDate));
 		});
 	}
 	return result;
 }
 
+PreparedServiceText HistoryItem::composeTodoIncompleted(
+		not_null<HistoryServiceTodoCompletions*> done) {
+	const auto tasks = ComposeTodoTasksList(done->msg, done->incompleted);
+	if (out()) {
+		return {
+			tr::lng_action_todo_marked_not_done_self(
+				tr::now,
+				lt_tasks,
+				tasks,
+				tr::marked),
+		};
+	}
+	return {
+		.text = tr::lng_action_todo_marked_not_done(
+			tr::now,
+			lt_from,
+			fromLinkText(),
+			lt_tasks,
+			tasks,
+			tr::marked),
+		.links = { fromLink() },
+	};
+}
+
+PreparedServiceText HistoryItem::composeTodoCompleted(
+		not_null<HistoryServiceTodoCompletions*> done) {
+	const auto tasks = ComposeTodoTasksList(done->msg, done->completed);
+	if (out()) {
+		return {
+			tr::lng_action_todo_marked_done_self(
+				tr::now,
+				lt_tasks,
+				tasks,
+				tr::marked),
+		};
+	}
+	return {
+		.text = tr::lng_action_todo_marked_done(
+			tr::now,
+			lt_from,
+			fromLinkText(),
+			lt_tasks,
+			tasks,
+			tr::marked),
+		.links = { fromLink() },
+	};
+}
+
+PreparedServiceText HistoryItem::prepareTodoCompletionsText() {
+	auto result = PreparedServiceText();
+	const auto done = Get<HistoryServiceTodoCompletions>();
+	Assert(done != nullptr);
+
+	return done->completed.empty()
+		? composeTodoIncompleted(done)
+		: composeTodoCompleted(done);
+}
+
+PreparedServiceText HistoryItem::prepareTodoAppendTasksText() {
+	auto result = PreparedServiceText();
+	auto append = Get<HistoryServiceTodoAppendTasks>();
+	Assert(append != nullptr);
+
+	const auto tasks = ComposeTodoTasksList(append);
+	if (out()) {
+		return {
+			tr::lng_action_todo_added_self(
+				tr::now,
+				lt_tasks,
+				tasks,
+				tr::marked),
+		};
+	}
+	return {
+		.text = tr::lng_action_todo_added(
+			tr::now,
+			lt_from,
+			fromLinkText(),
+			lt_tasks,
+			tasks,
+			tr::marked),
+		.links = { fromLink() },
+	};
+	return result;
+}
+
+PreparedServiceText HistoryItem::preparePollAppendAnswerText() {
+	const auto append = Get<HistoryServicePollAppendAnswer>();
+	const auto option = append
+		? append->answer.text.text
+		: QString();
+	if (out()) {
+		return {
+			tr::lng_action_poll_added_answer_self(
+				tr::now,
+				lt_option,
+				{ option },
+				tr::marked),
+		};
+	}
+	return {
+		.text = tr::lng_action_poll_added_answer(
+			tr::now,
+			lt_from,
+			fromLinkText(),
+			lt_option,
+			{ option },
+			tr::marked),
+		.links = { fromLink() },
+	};
+}
+
+PreparedServiceText HistoryItem::preparePollDeleteAnswerText() {
+	const auto del = Get<HistoryServicePollDeleteAnswer>();
+	const auto option = del
+		? del->answer.text.text
+		: QString();
+	if (out()) {
+		return {
+			tr::lng_action_poll_deleted_answer_self(
+				tr::now,
+				lt_option,
+				{ option },
+				tr::marked),
+		};
+	}
+	return {
+		.text = tr::lng_action_poll_deleted_answer(
+			tr::now,
+			lt_from,
+			fromLinkText(),
+			lt_option,
+			{ option },
+			tr::marked),
+		.links = { fromLink() },
+	};
+}
+
 TextWithEntities HistoryItem::fromLinkText() const {
-	return Ui::Text::Link(st::wrap_rtl(_from->name()), 1);
+	return tr::link(st::wrap_rtl(_from->name()), 1);
 }
 
 ClickHandlerPtr HistoryItem::fromLink() const {
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index bab7f4d7cbb4c8..51ea3a9e9930b3 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -15,6 +15,8 @@ For license and copyright information please follow this link:
 
 class HiddenSenderInfo;
 class History;
+class DocumentData;
+class PhotoData;
 
 struct HistoryMessageReply;
 struct HistoryMessageViews;
@@ -22,17 +24,18 @@ struct HistoryMessageMarkupData;
 struct HistoryMessageReplyMarkup;
 struct HistoryMessageTranslation;
 struct HistoryMessageForwarded;
-struct HistoryMessageSavedMediaData;
-struct HistoryMessageFactcheck;
+struct HistoryMessageSuggestion;
 struct HistoryServiceDependentData;
+struct HistoryServiceTodoCompletions;
 enum class HistorySelfDestructType;
 struct PreparedServiceText;
 struct MessageFactcheck;
 class ReplyKeyboard;
 struct LanguageId;
+enum class SuggestionActions : uchar;
 
 namespace Api {
-struct SendOptions;
+struct SummaryEntry;
 } // namespace Api
 
 namespace base {
@@ -45,15 +48,6 @@ enum class SharedMediaType : signed char;
 using SharedMediaTypesMask = base::enum_mask<SharedMediaType>;
 } // namespace Storage
 
-namespace Ui {
-class RippleAnimation;
-} // namespace Ui
-
-namespace style {
-struct BotKeyboardButton;
-struct RippleAnimation;
-} // namespace style
-
 namespace Data {
 struct MessagePosition;
 struct RecentReaction;
@@ -68,26 +62,14 @@ struct SponsoredFrom;
 class Story;
 class SavedSublist;
 struct PaidReactionSend;
+struct SendError;
 } // namespace Data
 
-namespace Main {
-class Session;
-} // namespace Main
-
-namespace Window {
-class SessionController;
-} // namespace Window
-
 namespace HistoryUnreadThings {
 enum class AddType;
 } // namespace HistoryUnreadThings
 
 namespace HistoryView {
-struct TextState;
-struct StateRequest;
-enum class CursorState : char;
-enum class PointState : char;
-enum class Context : char;
 class ElementDelegate;
 class Element;
 class Message;
@@ -95,18 +77,32 @@ class Service;
 class ServiceMessagePainter;
 } // namespace HistoryView
 
+namespace Iv {
+struct RichPage;
+} // namespace Iv
+
+namespace Ui {
+struct ColorCollectible;
+} // namespace Ui
+
 struct HistoryItemCommonFields {
 	MsgId id = 0;
 	MessageFlags flags = 0;
 	PeerId from = 0;
 	FullReplyTo replyTo;
 	TimeId date = 0;
+	TimeId scheduleRepeatPeriod = 0;
 	BusinessShortcutId shortcutId = 0;
+	int starsPaid = 0;
 	UserId viaBotId = 0;
 	QString postAuthor;
 	uint64 groupedId = 0;
 	EffectId effectId = 0;
 	HistoryMessageMarkupData markup;
+	HistoryMessageSuggestInfo suggest;
+	bool ignoreForwardFrom = false;
+	bool ignoreForwardCaptions = false;
+	bool mediaSpoiler = false;
 };
 
 enum class HistoryReactionSource : char {
@@ -115,6 +111,12 @@ enum class HistoryReactionSource : char {
 	Existing,
 };
 
+enum class PaidPostType : uchar {
+	None,
+	Stars,
+	Ton,
+};
+
 class HistoryItem final : public RuntimeComposer<HistoryItem> {
 public:
 	[[nodiscard]] static std::unique_ptr<Data::Media> CreateMedia(
@@ -197,14 +199,19 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	void updateStoryMentionText();
 
 	[[nodiscard]] UserData *viaBot() const;
+	[[nodiscard]] bool isGuestChatBotMessage() const;
 	[[nodiscard]] UserData *getMessageBot() const;
+	[[nodiscard]] bool hideLinks() const;
 	[[nodiscard]] bool isHistoryEntry() const;
 	[[nodiscard]] bool isAdminLogEntry() const;
 	[[nodiscard]] bool isFromScheduled() const;
 	[[nodiscard]] bool isScheduled() const;
+	[[nodiscard]] TimeId scheduleRepeatPeriod() const;
 	[[nodiscard]] bool isSponsored() const;
+	[[nodiscard]] bool canLookupMessageAuthor() const;
 	[[nodiscard]] bool skipNotification() const;
 	[[nodiscard]] bool isUserpicSuggestion() const;
+	[[nodiscard]] bool isSavedMusicItem() const;
 	[[nodiscard]] BusinessShortcutId shortcutId() const;
 	[[nodiscard]] bool isBusinessShortcut() const;
 	void setRealShortcutId(BusinessShortcutId id);
@@ -213,12 +220,17 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	void addLogEntryOriginal(
 		WebPageId localId,
 		const QString &label,
-		const TextWithEntities &content);
+		const TextWithEntities &content,
+		PhotoData *photo = nullptr,
+		DocumentData *document = nullptr);
 	void setFactcheck(MessageFactcheck info);
 	[[nodiscard]] bool hasUnrequestedFactcheck() const;
 	[[nodiscard]] TextWithEntities factcheckText() const;
+	[[nodiscard]] const Api::SummaryEntry &summaryEntry() const;
+	void setHasSummaryEntry();
 
 	[[nodiscard]] not_null<Data::Thread*> notificationThread() const;
+	[[nodiscard]] Data::Thread *maybeNotificationThread() const;
 	[[nodiscard]] not_null<History*> history() const {
 		return _history;
 	}
@@ -234,7 +246,8 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	}
 	void refreshMainView();
 	void clearMainView();
-	void removeMainView();
+	void removeMainView(
+		Data::ViewRemovalReason reason = Data::ViewRemovalReason::Removed);
 
 	void invalidateChatListEntry();
 
@@ -248,21 +261,28 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	[[nodiscard]] bool invertMedia() const {
 		return _flags & MessageFlag::InvertMedia;
 	}
+	[[nodiscard]] bool storyInProfile() const {
+		return _flags & MessageFlag::StoryInProfile;
+	}
 	[[nodiscard]] bool unread(not_null<Data::Thread*> thread) const;
 	[[nodiscard]] bool showNotification() const;
 	void markClientSideAsRead();
 	[[nodiscard]] bool mentionsMe() const;
 	[[nodiscard]] bool isUnreadMention() const;
 	[[nodiscard]] bool hasUnreadReaction() const;
+	[[nodiscard]] bool hasUnreadPollVote() const;
+	void setHasUnreadPollVote();
 	[[nodiscard]] bool hasUnwatchedEffect() const;
 	bool markEffectWatched();
 	[[nodiscard]] bool isUnreadMedia() const;
 	[[nodiscard]] bool isIncomingUnreadMedia() const;
 	[[nodiscard]] bool hasUnreadMediaFlag() const;
 	void markReactionsRead();
+	void markPollVotesRead();
 	void markMediaAndMentionRead();
 	bool markContentsRead(bool fromThisClient = false);
 	void setIsPinned(bool isPinned);
+	void setStoryInProfile(bool inProfile);
 
 	// For edit media in history_message.
 	void returnSavedMedia();
@@ -318,6 +338,9 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	[[nodiscard]] bool hideEditedBadge() const {
 		return (_flags & MessageFlag::HideEdited);
 	}
+	[[nodiscard]] bool hideDisplayDate() const {
+		return isEmpty() || (_flags & MessageFlag::HideDisplayDate);
+	}
 	[[nodiscard]] bool isLocal() const {
 		return _flags & MessageFlag::Local;
 	}
@@ -327,6 +350,15 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	[[nodiscard]] bool showSimilarChannels() const {
 		return _flags & MessageFlag::ShowSimilarChannels;
 	}
+	[[nodiscard]] bool canBeSummarized() const {
+		return _flags & MessageFlag::CanBeSummarized;
+	}
+	[[nodiscard]] bool textAppearing() const {
+		return _flags & MessageFlag::TextAppearing;
+	}
+	[[nodiscard]] bool textAppearingStarted() const {
+		return _flags & MessageFlag::TextAppearingStarted;
+	}
 	[[nodiscard]] bool hasRealFromId() const;
 	[[nodiscard]] bool isPostHidingAuthor() const;
 	[[nodiscard]] bool isPostShowingAuthor() const;
@@ -340,6 +372,7 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	[[nodiscard]] bool hasUnpaidContent() const;
 	[[nodiscard]] bool inHighlightProcess() const;
 	void highlightProcessDone();
+	[[nodiscard]] PaidPostType paidType() const;
 
 	void setCommentsInboxReadTill(MsgId readTillId);
 	void setCommentsMaxId(MsgId maxId);
@@ -358,9 +391,7 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	void applyEdition(const MTPDmessageService &message);
 	void applyEdition(const QVector<MTPMessageExtendedMedia> &media);
 	void updateForwardedInfo(const MTPMessageFwdHeader *fwd);
-	void updateSentContent(
-		const TextWithEntities &textWithEntities,
-		const MTPMessageMedia *media);
+	void updateSentContent(const MTPDmessage &data);
 	void applySentMessage(const MTPDmessage &data);
 	void applySentMessage(
 		const QString &text,
@@ -370,9 +401,13 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	void overrideMedia(std::unique_ptr<Data::Media> media);
 
 	void applyEditionToHistoryCleared();
-	void updateReplyMarkup(HistoryMessageMarkupData &&markup);
+	void updateReplyMarkup(
+		HistoryMessageMarkupData &&markup,
+		bool ignoreSuggestButtons = false);
 	void contributeToSlowmode(TimeId realDate = 0);
 
+	void clearMediaAsExpired();
+
 	void addToUnreadThings(HistoryUnreadThings::AddType type);
 	void destroyHistoryEntry();
 	[[nodiscard]] Storage::SharedMediaTypesMask sharedMediaTypes() const;
@@ -416,9 +451,13 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 		bool isForumPost);
 	void setPostAuthor(const QString &author);
 	void setRealId(MsgId newId);
+	void markTextAppearingStarted();
 	void incrementReplyToTopCounter();
 	void applyEffectWatchedOnUnreadKnown();
 
+	void setHasHiddenLinks(bool has) const;
+	[[nodiscard]] bool hasHiddenLinks() const;
+
 	[[nodiscard]] bool emptyText() const {
 		return _text.empty();
 	}
@@ -429,8 +468,10 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	[[nodiscard]] bool forbidsForward() const;
 	[[nodiscard]] bool forbidsSaving() const;
 	[[nodiscard]] bool allowsSendNow() const;
+	[[nodiscard]] bool allowsReschedule() const;
 	[[nodiscard]] bool allowsForward() const;
 	[[nodiscard]] bool allowsEdit(TimeId now) const;
+	[[nodiscard]] bool allowsEditMedia() const;
 	[[nodiscard]] bool canDelete() const;
 	[[nodiscard]] bool canDeleteForEveryone(TimeId now) const;
 	[[nodiscard]] bool suggestReport() const;
@@ -438,7 +479,9 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	[[nodiscard]] bool suggestDeleteAllReport() const;
 	[[nodiscard]] ChatRestriction requiredSendRight() const;
 	[[nodiscard]] bool requiresSendInlineRight() const;
-	[[nodiscard]] std::optional<QString> errorTextForForward(
+	[[nodiscard]] Data::SendError errorTextForForward(
+		not_null<Data::Thread*> to) const;
+	[[nodiscard]] Data::SendError errorTextForForwardIgnoreRights(
 		not_null<Data::Thread*> to) const;
 	[[nodiscard]] const HistoryMessageTranslation *translation() const;
 	[[nodiscard]] bool translationShowRequiresCheck(LanguageId to) const;
@@ -449,7 +492,10 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	void toggleReaction(
 		const Data::ReactionId &reaction,
 		HistoryReactionSource source);
-	void addPaidReaction(int count, std::optional<bool> anonymous = {});
+	bool removeReactionsFromParticipant(
+		not_null<PeerData*> participant,
+		const Data::ReactionId &reaction);
+	void addPaidReaction(int count, std::optional<PeerId> shownPeer = {});
 	void cancelScheduledPaidReaction();
 	[[nodiscard]] Data::PaidReactionSend startPaidReactionSending();
 	void finishPaidReactionSending(
@@ -467,10 +513,13 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	[[nodiscard]] auto topPaidReactionsWithLocal() const
 		-> std::vector<Data::MessageReactionsTopPaid>;
 	[[nodiscard]] int reactionsPaidScheduled() const;
+	[[nodiscard]] PeerId reactionsLocalShownPeer() const;
 	[[nodiscard]] bool canViewReactions() const;
 	[[nodiscard]] std::vector<Data::ReactionId> chosenReactions() const;
 	[[nodiscard]] Data::ReactionId lookupUnreadReaction(
 		not_null<UserData*> from) const;
+	[[nodiscard]] QByteArray lookupUnreadPollVote(
+		not_null<PeerData*> from) const;
 	[[nodiscard]] crl::time lastReactionsRefreshTime() const;
 
 	[[nodiscard]] bool reactionsAreTags() const;
@@ -481,12 +530,24 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	[[nodiscard]] GlobalMsgId globalId() const;
 	[[nodiscard]] Data::MessagePosition position() const;
 	[[nodiscard]] TimeId date() const;
+	[[nodiscard]] bool awaitingVideoProcessing() const;
 
 	[[nodiscard]] Data::Media *media() const {
 		return _media.get();
 	}
+	[[nodiscard]] std::shared_ptr<const Iv::RichPage> richPage() const;
+	[[nodiscard]] std::shared_ptr<const Iv::RichPage> fullRichPage() const;
+	[[nodiscard]] uint64 fullRichPageVersion() const;
 	[[nodiscard]] bool computeDropForwardedInfo() const;
-	void setText(const TextWithEntities &textWithEntities);
+	void setText(TextWithEntities textWithEntities);
+	void applyLocalRichPage(std::shared_ptr<const Iv::RichPage> page);
+	void applyLocalRichPage(
+		std::shared_ptr<const Iv::RichPage> page,
+		const TextWithEntities &summary);
+	void setRichPage(std::shared_ptr<const Iv::RichPage> page);
+	void setFullRichPage(std::shared_ptr<const Iv::RichPage> page);
+	void clearFullRichPage();
+	void clearRichPage();
 
 	[[nodiscard]] MsgId replyToId() const;
 	[[nodiscard]] FullMsgId replyToFullId() const;
@@ -496,6 +557,8 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	[[nodiscard]] FullReplyTo replyTo() const;
 	[[nodiscard]] bool inThread(MsgId rootId) const;
 
+	void resolveAdminLogReplyTo(not_null<HistoryItem*> replyTo);
+
 	[[nodiscard]] not_null<PeerData*> author() const;
 
 	[[nodiscard]] TimeId originalDate() const;
@@ -506,7 +569,7 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	[[nodiscard]] MsgId originalId() const;
 
 	[[nodiscard]] Data::SavedSublist *savedSublist() const;
-	[[nodiscard]] PeerData *savedSublistPeer() const;
+	[[nodiscard]] PeerId sublistPeerId() const;
 	[[nodiscard]] PeerData *savedFromSender() const;
 	[[nodiscard]] const HiddenSenderInfo *savedFromHiddenSenderInfo() const;
 
@@ -535,12 +598,21 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	[[nodiscard]] bool isDiscussionPost() const;
 	[[nodiscard]] HistoryItem *lookupDiscussionPostOriginal() const;
 	[[nodiscard]] PeerData *displayFrom() const;
+
 	[[nodiscard]] uint8 colorIndex() const;
+	[[nodiscard]] DocumentId backgroundEmojiId() const;
+	[[nodiscard]] auto colorCollectible() const
+		-> const std::shared_ptr<Ui::ColorCollectible> &;
 
 	// In forwards we show name in sender's color, but the message
 	// content uses the color of the original sender.
 	[[nodiscard]] PeerData *contentColorsFrom() const;
 	[[nodiscard]] uint8 contentColorIndex() const;
+	[[nodiscard]] DocumentId contentBackgroundEmojiId() const;
+	[[nodiscard]] auto contentColorCollectible() const
+		-> const std::shared_ptr<Ui::ColorCollectible> &;
+
+	[[nodiscard]] int starsPaid() const;
 
 	[[nodiscard]] std::unique_ptr<HistoryView::Element> createView(
 		not_null<HistoryView::ElementDelegate*> delegate,
@@ -549,6 +621,26 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	void updateDate(TimeId newDate);
 	[[nodiscard]] bool canUpdateDate() const;
 	void customEmojiRepaint();
+	void setMediaForInstantView(
+		QString url,
+		DocumentData *document = nullptr,
+		PhotoData *photo = nullptr);
+	void addDocumentForInstantView(
+		not_null<DocumentData*> document,
+		TextWithEntities caption = {});
+	void addPhotoForInstantView(
+		not_null<PhotoData*> photo,
+		TextWithEntities caption = {});
+
+	[[nodiscard]] SuggestionActions computeSuggestionActions() const;
+	[[nodiscard]] SuggestionActions computeSuggestionActions(
+		const HistoryMessageSuggestion *suggest) const;
+	[[nodiscard]] SuggestionActions computeSuggestionActions(
+		bool accepted,
+		bool rejected,
+		TimeId giftOfferExpiresAt) const;
+
+	[[nodiscard]] bool needsUpdateForVideoQualities(const MTPMessage &data);
 
 	[[nodiscard]] TimeId ttlDestroyAt() const {
 		return _ttlDestroyAt;
@@ -558,6 +650,8 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 		return _boostsApplied;
 	}
 
+	[[nodiscard]] QString fromRank() const;
+
 	MsgId id;
 
 private:
@@ -575,15 +669,28 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	[[nodiscard]] bool generateLocalEntitiesByReply() const;
 	[[nodiscard]] TextWithEntities withLocalEntities(
 		const TextWithEntities &textWithEntities) const;
+	void detectTextLinks(const TextWithEntities &textWithEntities);
 	void setTextValue(TextWithEntities text, bool force = false);
 	[[nodiscard]] bool isTooOldForEdit(TimeId now) const;
 	[[nodiscard]] bool isLegacyMessage() const {
 		return _flags & MessageFlag::Legacy;
 	}
 
-	[[nodiscard]] bool checkCommentsLinkedChat(ChannelId id) const;
+	[[nodiscard]] bool checkDiscussionLink(ChannelId id) const;
+	void updateSentContent(
+		const TextWithEntities &textWithEntities,
+		const MTPMessageMedia *media,
+		const MTPRichMessage *richMessage);
+	void updateSentContent(
+		const TextWithEntities &textWithEntities,
+		const MTPMessageMedia *media,
+		std::shared_ptr<const Iv::RichPage> richPage,
+		std::shared_ptr<const Iv::RichPage> preservedFullPage = nullptr);
 
-	void setReplyMarkup(HistoryMessageMarkupData &&markup);
+	void setReplyMarkup(
+		HistoryMessageMarkupData &&markup,
+		bool ignoreSuggestButtons = false);
+	void updateSuggestControls(const HistoryMessageSuggestion *suggest);
 
 	void changeReplyToTopCounter(
 		not_null<HistoryMessageReply*> reply,
@@ -632,7 +739,7 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	void setReactions(const MTPMessageReactions *reactions);
 	[[nodiscard]] bool changeReactions(const MTPMessageReactions *reactions);
 	void setServiceMessageByAction(const MTPmessageAction &action);
-	void applyAction(const MTPMessageAction &action);
+	void processAction(const MTPMessageAction &action);
 	void refreshMedia(const MTPMessageMedia *media);
 	void refreshSentMedia(const MTPMessageMedia *media);
 	void createServiceFromMtp(const MTPDmessage &message);
@@ -655,6 +762,19 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 		CallId linkCallId);
 	[[nodiscard]] PreparedServiceText prepareCallScheduledText(
 		TimeId scheduleDate);
+	[[nodiscard]] PreparedServiceText prepareTodoCompletionsText();
+	[[nodiscard]] PreparedServiceText prepareTodoAppendTasksText();
+	[[nodiscard]] PreparedServiceText preparePollAppendAnswerText();
+	[[nodiscard]] PreparedServiceText preparePollDeleteAnswerText();
+
+	[[nodiscard]] PreparedServiceText composeTodoIncompleted(
+		not_null<HistoryServiceTodoCompletions*> done);
+	[[nodiscard]] PreparedServiceText composeTodoCompleted(
+		not_null<HistoryServiceTodoCompletions*> done);
+
+	[[nodiscard]] PreparedServiceText prepareServiceTextForMessage(
+		const MTPMessageMedia &media,
+		bool unread);
 
 	void flagSensitiveContent();
 	[[nodiscard]] PeerData *computeDisplayFrom() const;
@@ -673,6 +793,7 @@ class HistoryItem final : public RuntimeComposer<HistoryItem> {
 	TimeId _date = 0;
 	TimeId _ttlDestroyAt = 0;
 	int _boostsApplied = 0;
+	int _starsPaid = 0;
 	BusinessShortcutId _shortcutId = 0;
 
 	MessageGroupId _groupId = MessageGroupId();
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 55e9e09a54f49a..337d8383193cd1 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "api/api_text_entities.h"
 #include "base/qt/qt_key_modifiers.h"
+#include "base/options.h"
 #include "lang/lang_keys.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/effects/spoiler_mess.h"
@@ -20,6 +21,8 @@ For license and copyright information please follow this link:
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/painter.h"
+#include "ui/paint/blobs.h"
+#include "ui/rect.h"
 #include "ui/power_saving.h"
 #include "history/history.h"
 #include "history/history_item.h"
@@ -28,9 +31,9 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_service_message.h"
 #include "history/view/media/history_view_document.h"
 #include "core/click_handler_types.h"
+#include "core/local_url_handlers.h"
 #include "core/ui_integration.h"
 #include "layout/layout_position.h"
-#include "mainwindow.h"
 #include "media/audio/media_audio.h"
 #include "media/player/media_player_instance.h"
 #include "data/business/data_shortcut_messages.h"
@@ -46,11 +49,14 @@ For license and copyright information please follow this link:
 #include "data/data_file_click_handler.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
+#include "data/data_todo_list.h"
 #include "main/main_session.h"
 #include "window/window_session_controller.h"
 #include "api/api_bot.h"
+#include "support/support_helper.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
+#include "styles/style_credits.h"
 #include "styles/style_dialogs.h" // dialogsMiniReplyStory.
 #include "styles/style_settings.h"
 #include "styles/style_widgets.h"
@@ -61,8 +67,52 @@ namespace {
 
 const auto kPsaForwardedPrefix = "cloud_lng_forwarded_psa_";
 
+base::options::toggle FastButtonsModeOption({
+	.id = kOptionFastButtonsMode,
+	.name = "Fast buttons mode",
+	.description = "Trigger inline keyboard buttons by 1-9 keyboard keys.",
+});
+
+[[nodiscard]] TextWithEntities ComposeTodoTasksList(
+		int fullCount,
+		const std::vector<TextWithEntities> &names) {
+	const auto count = int(names.size());
+	if (!count) {
+		return tr::lng_action_todo_tasks_fallback(
+			tr::now,
+			lt_count,
+			fullCount,
+			tr::marked);
+	} else if (count == 1) {
+		return names.front();
+	}
+	auto full = names.front();
+	for (auto i = 1; i != count - 1; ++i) {
+		full = tr::lng_action_todo_tasks_and_one(
+			tr::now,
+			lt_tasks,
+			full,
+			lt_task,
+			names[i],
+			tr::marked);
+	}
+	return tr::lng_action_todo_tasks_and_last(
+		tr::now,
+		lt_tasks,
+		full,
+		lt_task,
+		names.back(),
+		tr::marked);
+}
+
 } // namespace
 
+const char kOptionFastButtonsMode[] = "fast-buttons-mode";
+
+bool FastButtonsMode() {
+	return FastButtonsModeOption.value();
+}
+
 void HistoryMessageVia::create(
 		not_null<Data::Session*> owner,
 		UserId userId) {
@@ -105,6 +155,43 @@ void HistoryMessageVia::resize(int32 availw) const {
 			tr::now,
 			lt_inline_bot,
 			'@' + bot->username());
+		maxWidth = st::msgServiceNameFont->width(text);
+		if (availw < maxWidth) {
+			text = st::msgServiceNameFont->elided(text, availw);
+			width = st::msgServiceNameFont->width(text);
+		} else if (width < maxWidth) {
+			width = maxWidth;
+		}
+	}
+}
+
+void HistoryMessageGuestChat::create(
+		not_null<Data::Session*> owner,
+		PeerId visitorId) {
+	visitor = owner->peer(visitorId);
+	const auto firstName = visitor->isUser()
+		? visitor->asUser()->firstName
+		: visitor->name();
+	maxWidth = st::msgServiceNameFont->width(
+		tr::lng_guest_chat_for(tr::now, lt_user, firstName));
+	link = std::make_shared<LambdaClickHandler>([peer = this->visitor](
+			ClickContext context) {
+		const auto my = context.other.value<ClickHandlerContext>();
+		if (const auto controller = my.sessionWindow.get()) {
+			controller->showPeerInfo(peer);
+		}
+	});
+}
+
+void HistoryMessageGuestChat::resize(int32 availw) const {
+	if (availw < 0) {
+		text = QString();
+		width = 0;
+	} else {
+		const auto firstName = visitor->isUser()
+			? visitor->asUser()->firstName
+			: visitor->name();
+		text = tr::lng_guest_chat_for(tr::now, lt_user, firstName);
 		if (availw < maxWidth) {
 			text = st::msgServiceNameFont->elided(text, availw);
 			width = st::msgServiceNameFont->width(text);
@@ -149,9 +236,14 @@ ClickHandlerPtr HiddenSenderInfo::ForwardClickHandler() {
 	static const auto hidden = std::make_shared<LambdaClickHandler>([](
 			ClickContext context) {
 		const auto my = context.other.value<ClickHandlerContext>();
-		const auto weak = my.sessionWindow;
-		if (const auto strong = weak.get()) {
-			strong->showToast(tr::lng_forwarded_hidden(tr::now));
+		auto text = tr::lng_forwarded_hidden(tr::now, Ui::Text::WithEntities);
+		const auto delegate = my.elementDelegate
+			? my.elementDelegate()
+			: nullptr;
+		if (delegate) {
+			delegate->elementShowHiddenSenderTooltip(my.itemId, text);
+		} else if (const auto strong = my.sessionWindow.get()) {
+			strong->showToast(std::move(text));
 		}
 	});
 	return hidden;
@@ -181,7 +273,7 @@ bool HiddenSenderInfo::paintCustomUserpic(
 		image.isNull() ? nullptr : &image,
 		image.isNull() ? &emptyUserpic : nullptr,
 		size * style::DevicePixelRatio(),
-		false);
+		Ui::PeerUserpicShape::Circle);
 	p.drawImage(QRect(x, y, size, size), view.cached);
 	return valid;
 }
@@ -190,7 +282,9 @@ void HistoryMessageForwarded::create(
 		const HistoryMessageVia *via,
 		not_null<const HistoryItem*> item) const {
 	auto phrase = TextWithEntities();
-	auto context = Core::MarkedTextContext{};
+	auto context = Core::TextContext({
+		.session = &item->history()->session(),
+	});
 	const auto fromChannel = originalSender
 		&& originalSender->isChannel()
 		&& !originalSender->isMegagroup();
@@ -200,8 +294,7 @@ void HistoryMessageForwarded::create(
 			: originalHiddenSenderInfo->name)
 	};
 	if (const auto copy = originalSender) {
-		context.session = &copy->owner().session();
-		context.customEmojiRepaint = [=] {
+		context.repaint = [=] {
 			// It is important to capture here originalSender by value,
 			// not capture the HistoryMessageForwarded* and read the
 			// originalSender field, because the components themselves
@@ -210,7 +303,7 @@ void HistoryMessageForwarded::create(
 			copy->owner().requestItemRepaint(item);
 		};
 		phrase = Ui::Text::SingleCustomEmoji(
-			context.session->data().customEmojiManager().peerUserpicEmojiData(
+			copy->owner().customEmojiManager().peerUserpicEmojiData(
 				copy,
 				st::fwdTextUserpicPadding));
 	}
@@ -222,7 +315,7 @@ void HistoryMessageForwarded::create(
 				name,
 				lt_user,
 				{ .text = originalPostAuthor },
-				Ui::Text::WithEntities));
+				tr::marked));
 	} else {
 		phrase.append(name);
 	}
@@ -231,9 +324,9 @@ void HistoryMessageForwarded::create(
 			tr::now,
 			lt_user,
 			Ui::Text::Wrapped(phrase, EntityType::CustomUrl, QString()), // Link 1.
-			Ui::Text::WithEntities);
+			tr::marked);
 	} else if (via && psaType.isEmpty()) {
-		const auto linkData = Ui::Text::Link(
+		const auto linkData = tr::link(
 			QString(),
 			1).entities.front().data(); // Link 1.
 		if (fromChannel) {
@@ -242,16 +335,16 @@ void HistoryMessageForwarded::create(
 				lt_channel,
 				Ui::Text::Wrapped(phrase, EntityType::CustomUrl, linkData), // Link 1.
 				lt_inline_bot,
-				Ui::Text::Link('@' + via->bot->username(), 2), // Link 2.
-				Ui::Text::WithEntities);
+				tr::link('@' + via->bot->username(), 2), // Link 2.
+				tr::marked);
 		} else {
 			phrase = tr::lng_forwarded_via(
 				tr::now,
 				lt_user,
 				Ui::Text::Wrapped(phrase, EntityType::CustomUrl, linkData), // Link 1.
 				lt_inline_bot,
-				Ui::Text::Link('@' + via->bot->username(), 2), // Link 2.
-				Ui::Text::WithEntities);
+				tr::link('@' + via->bot->username(), 2), // Link 2.
+				tr::marked);
 		}
 	} else {
 		if (fromChannel || !psaType.isEmpty()) {
@@ -277,14 +370,14 @@ void HistoryMessageForwarded::create(
 							phrase,
 							EntityType::CustomUrl,
 							QString()), // Link 1.
-						Ui::Text::WithEntities);
+						tr::marked);
 			}
 		} else {
 			phrase = tr::lng_forwarded(
 				tr::now,
 				lt_user,
 				Ui::Text::Wrapped(phrase, EntityType::CustomUrl, QString()), // Link 1.
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 	}
 	text.setMarkedText(st::fwdTextStyle, phrase, kMarkupTextOptions, context);
@@ -312,6 +405,8 @@ ReplyFields ReplyFields::clone(not_null<HistoryItem*> parent) const {
 		.messageId = messageId,
 		.topMessageId = topMessageId,
 		.storyId = storyId,
+		.todoItemId = todoItemId,
+		.pollOption = pollOption,
 		.quoteOffset = quoteOffset,
 		.manualQuote = manualQuote,
 		.topicPost = topicPost,
@@ -325,6 +420,8 @@ ReplyFields ReplyFieldsFromMTP(
 		auto result = ReplyFields();
 		if (const auto peer = data.vreply_to_peer_id()) {
 			result.externalPeerId = peerFromMTP(*peer);
+		} else if (item->isAdminLogEntry()) {
+			result.externalPeerId = item->history()->peer->id;
 		}
 		const auto owner = &item->history()->owner();
 		if (const auto id = data.vreply_to_msg_id().value_or_empty()) {
@@ -337,6 +434,8 @@ ReplyFields ReplyFieldsFromMTP(
 				= data.vreply_to_top_id().value_or(result.messageId.bare);
 			result.topicPost = data.is_forum_topic() ? 1 : 0;
 		}
+		result.todoItemId = data.vtodo_item_id().value_or_empty();
+		result.pollOption = data.vpoll_option().value_or_empty();
 		if (const auto header = data.vreply_from()) {
 			const auto &data = header->data();
 			result.externalPostAuthor
@@ -391,6 +490,8 @@ FullReplyTo ReplyToFromMTP(
 				data.vquote_entities().value_or_empty()),
 		};
 		result.quoteOffset = data.vquote_offset().value_or_empty();
+		result.todoItemId = data.vtodo_item_id().value_or_empty();
+		result.pollOption = data.vpoll_option().value_or_empty();
 		return result;
 	}, [&](const MTPDinputReplyToStory &data) {
 		if (const auto parsed = Data::PeerFromInputMTP(
@@ -401,6 +502,13 @@ FullReplyTo ReplyToFromMTP(
 			};
 		}
 		return FullReplyTo();
+	}, [&](const MTPDinputReplyToMonoForum &data) {
+		const auto parsed = Data::PeerFromInputMTP(
+			&history->owner(),
+			data.vmonoforum_peer_id());
+		return FullReplyTo{
+			.monoforumPeerId = parsed ? parsed->id : PeerId(),
+		};
 	});
 }
 
@@ -492,6 +600,23 @@ void HistoryMessageReply::updateData(
 	}
 }
 
+void HistoryMessageReply::setInLogReplyTo(
+		not_null<HistoryItem*> holder,
+		not_null<HistoryItem*> message) {
+	if (resolvedMessage.get() == message) {
+		return;
+	} else if (resolvedMessage) {
+		holder->history()->owner().unregisterDependentMessage(
+			holder,
+			resolvedMessage.get());
+		resolvedMessage = nullptr;
+	}
+	_fields.externalPeerId = PeerId();
+	_fields.messageId = message->id;
+	_unavailable = 0;
+	updateData(holder, true);
+}
+
 void HistoryMessageReply::set(ReplyFields fields) {
 	_fields = std::move(fields);
 }
@@ -583,7 +708,9 @@ void HistoryMessageReply::storyRemoved(
 void HistoryMessageReply::refreshReplyToMedia() {
 	replyToDocumentId = 0;
 	replyToWebPageId = 0;
-	if (const auto media = resolvedMessage ? resolvedMessage->media() : nullptr) {
+	if (const auto media = resolvedMessage
+			? resolvedMessage->media()
+			: nullptr) {
 		if (const auto document = media->document()) {
 			replyToDocumentId = document->id;
 		} else if (const auto webpage = media->webpage()) {
@@ -603,6 +730,11 @@ ReplyMarkupClickHandler::ReplyMarkupClickHandler(
 , _column(column) {
 }
 
+QString ReplyMarkupClickHandler::dragText() const {
+	const auto button = getUrlButton();
+	return button ? QString::fromUtf8(button->data) : QString();
+}
+
 // Copy to clipboard support.
 QString ReplyMarkupClickHandler::copyToClipboardText() const {
 	const auto button = getUrlButton();
@@ -651,6 +783,14 @@ QString ReplyMarkupClickHandler::buttonText() const {
 }
 
 QString ReplyMarkupClickHandler::tooltip() const {
+	if (const auto button = getButton()) {
+		if (button->type == HistoryMessageMarkupButton::Type::CopyText) {
+			return tr::lng_bot_copy_text_tooltip(
+				tr::now,
+				lt_text,
+				st::wrap_rtl(QString::fromUtf8(button->data)));
+		}
+	}
 	const auto button = getUrlButton();
 	const auto url = button ? QString::fromUtf8(button->data) : QString();
 	const auto text = _fullDisplayed ? QString() : buttonText();
@@ -679,14 +819,10 @@ ReplyKeyboard::ReplyKeyboard(
 , _st(std::move(s)) {
 	if (const auto markup = _item->Get<HistoryMessageReplyMarkup>()) {
 		const auto owner = &_item->history()->owner();
+		const auto session = &owner->session();
 		const auto context = _item->fullId();
 		const auto rowCount = int(markup->data.rows.size());
 		_rows.reserve(rowCount);
-		const auto buttonEmoji = Ui::Text::SingleCustomEmoji(
-			owner->customEmojiManager().registerInternalEmoji(
-				st::settingsPremiumIconStar,
-				QMargins(0, -st::moderateBoxExpandInnerSkip, 0, 0),
-				true));
 		for (auto i = 0; i != rowCount; ++i) {
 			const auto &row = markup->data.rows[i];
 			const auto rowSize = int(row.size());
@@ -695,33 +831,56 @@ ReplyKeyboard::ReplyKeyboard(
 			for (auto j = 0; j != rowSize; ++j) {
 				auto button = Button();
 				using Type = HistoryMessageMarkupButton::Type;
-				const auto isBuy = (row[j].type == Type::Buy);
 				static const auto RegExp = QRegularExpression("\\b"
 					+ Ui::kCreditsCurrency
 					+ "\\b");
-				const auto text = isBuy
+				const auto type = row[j].type;
+				const auto text = (type == Type::Buy)
 					? base::duplicate(row[j].text).replace(
 						RegExp,
 						QChar(0x2B50))
 					: row[j].text;
+				const auto withEmoji = [&](const style::IconEmoji &icon) {
+					return Ui::Text::IconEmoji(&icon).append(text);
+				};
 				const auto textWithEntities = [&] {
-					if (!isBuy) {
-						return TextWithEntities();
+					if (type == Type::SuggestAccept) {
+						return withEmoji(st::chatSuggestAcceptIcon);
+					} else if (type == Type::SuggestDecline) {
+						return withEmoji(st::chatSuggestDeclineIcon);
+					} else if (type == Type::SuggestChange) {
+						return withEmoji(st::chatSuggestChangeIcon);
 					}
 					auto result = TextWithEntities();
-					auto firstPart = true;
-					for (const auto &part : text.split(QChar(0x2B50))) {
-						if (!firstPart) {
-							result.append(buttonEmoji);
+					if (const auto iconId = row[j].visual.iconId) {
+						using namespace Data;
+						result.append(SingleCustomEmoji(iconId));
+						if (!text.isEmpty()) {
+							result.append(' ');
+						}
+					}
+					if (type == Type::Buy) {
+						auto firstPart = true;
+						for (const auto &part : text.split(QChar(0x2B50))) {
+							if (!firstPart) {
+								result.append(Ui::Text::IconEmoji(
+									&st::starIconEmojiLarge));
+							}
+							result.append(part);
+							firstPart = false;
 						}
-						result.append(part);
-						firstPart = false;
+					} else if (!result.entities.empty()) {
+						result.append(text);
 					}
 					return result.entities.empty()
 						? TextWithEntities()
 						: result;
 				}();
-				button.type = row.at(j).type;
+				button.type = type;
+				button.iconType = (type == Type::Url
+					&& Core::IsMiniAppUrl(QString::fromUtf8(row[j].data)))
+					? Type::WebView
+					: type;
 				button.link = std::make_shared<ReplyMarkupClickHandler>(
 					owner,
 					i,
@@ -732,10 +891,10 @@ ReplyKeyboard::ReplyKeyboard(
 						_st->textStyle(),
 						TextUtilities::SingleLine(textWithEntities),
 						kMarkupTextOptions,
-						Core::MarkedTextContext{
-							.session = &item->history()->owner().session(),
-							.customEmojiRepaint = [=] { _st->repaint(item); },
-						});
+						Core::TextContext({
+							.session = session,
+							.repaint = [=] { _st->repaint(_item); },
+						}));
 				} else {
 					button.text.setText(
 						_st->textStyle(),
@@ -743,6 +902,7 @@ ReplyKeyboard::ReplyKeyboard(
 						kPlainTextOptions);
 				}
 				button.characters = text.isEmpty() ? 1 : text.size();
+				button.color = row[j].visual.color;
 				newRow.push_back(std::move(button));
 			}
 			_rows.push_back(std::move(newRow));
@@ -757,7 +917,6 @@ void ReplyKeyboard::updateMessageId() {
 			button.link->setMessageId(msgId);
 		}
 	}
-
 }
 
 void ReplyKeyboard::resize(int width, int height) {
@@ -768,25 +927,26 @@ void ReplyKeyboard::resize(int width, int height) {
 		? float64(_st->buttonHeight())
 		: (float64(height + _st->buttonSkip()) / _rows.size());
 	for (auto &row : _rows) {
-		int s = row.size();
+		auto s = int(row.size());
 
-		int widthForButtons = _width - ((s - 1) * _st->buttonSkip());
-		int widthForText = widthForButtons;
-		int widthOfText = 0;
-		int maxMinButtonWidth = 0;
+		auto widthForButtons = _width - ((s - 1) * _st->buttonSkip());
+		auto widthForText = widthForButtons;
+		auto widthOfText = 0;
+		auto maxMinButtonWidth = 0;
 		for (const auto &button : row) {
 			widthOfText += qMax(button.text.maxWidth(), 1);
-			int minButtonWidth = _st->minButtonWidth(button.type);
+			int minButtonWidth = _st->minButtonWidth(button.iconType);
 			widthForText -= minButtonWidth;
 			accumulate_max(maxMinButtonWidth, minButtonWidth);
 		}
-		bool exact = (widthForText == widthOfText);
-		bool enough = (widthForButtons - s * maxMinButtonWidth) >= widthOfText;
+		const auto exact = (widthForText == widthOfText);
+		const auto enough
+			= (widthForButtons - s * maxMinButtonWidth) >= widthOfText;
 
-		float64 x = 0;
+		auto x = 0.;
 		for (auto &button : row) {
 			int buttonw = qMax(button.text.maxWidth(), 1);
-			float64 textw = buttonw, minw = _st->minButtonWidth(button.type);
+			float64 textw = buttonw, minw = _st->minButtonWidth(button.iconType);
 			float64 w = textw;
 			if (exact) {
 				w += minw;
@@ -799,10 +959,17 @@ void ReplyKeyboard::resize(int width, int height) {
 				accumulate_max(w, 2 * float64(_st->buttonPadding()));
 			}
 
-			int rectx = static_cast<int>(std::floor(x));
-			int rectw = static_cast<int>(std::floor(x + w)) - rectx;
-			button.rect = QRect(rectx, qRound(y), rectw, qRound(buttonHeight - _st->buttonSkip()));
-			if (rtl()) button.rect.setX(_width - button.rect.x() - button.rect.width());
+			const auto rectx = static_cast<int>(std::floor(x));
+			const auto rectw = static_cast<int>(std::floor(x + w)) - rectx;
+			button.rect = QRect(
+				rectx,
+				qRound(y),
+				rectw,
+				qRound(buttonHeight - _st->buttonSkip()));
+			if (rtl()) {
+				button.rect.setX(
+					_width - button.rect.x() - button.rect.width());
+			}
 			x += w + _st->buttonSkip();
 
 			button.link->setFullDisplayed(textw >= buttonw);
@@ -811,10 +978,12 @@ void ReplyKeyboard::resize(int width, int height) {
 	}
 }
 
-bool ReplyKeyboard::isEnoughSpace(int width, const style::BotKeyboardButton &st) const {
+bool ReplyKeyboard::isEnoughSpace(
+		int width,
+		const style::BotKeyboardButton &st) const {
 	for (const auto &row : _rows) {
-		int s = row.size();
-		int widthLeft = width - ((s - 1) * st.margin + s * 2 * st.padding);
+		auto s = int(row.size());
+		auto widthLeft = width - ((s - 1) * st.margin + s * 2 * st.padding);
 		for (const auto &button : row) {
 			widthLeft -= qMax(button.text.maxWidth(), 1);
 			if (widthLeft < 0) {
@@ -840,7 +1009,7 @@ int ReplyKeyboard::naturalWidth() const {
 		for (const auto &button : row) {
 			accumulate_max(
 				maxMinButtonWidth,
-				_st->minButtonWidth(button.type));
+				_st->minButtonWidth(button.iconType));
 		}
 		auto rowMaxButtonWidth = 0;
 		for (const auto &button : row) {
@@ -858,7 +1027,8 @@ int ReplyKeyboard::naturalWidth() const {
 }
 
 int ReplyKeyboard::naturalHeight() const {
-	return (_rows.size() - 1) * _st->buttonSkip() + _rows.size() * _st->buttonHeight();
+	return (_rows.size() - 1) * _st->buttonSkip()
+		+ _rows.size() * _st->buttonHeight();
 }
 
 void ReplyKeyboard::paint(
@@ -866,24 +1036,42 @@ void ReplyKeyboard::paint(
 		const Ui::ChatStyle *st,
 		Ui::BubbleRounding rounding,
 		int outerWidth,
-		const QRect &clip) const {
+		const QRect &clip,
+		bool paused) const {
 	Assert(_st != nullptr);
 	Assert(_width > 0);
 
-	_st->startPaint(p, st);
+	auto number = hasFastButtonMode() ? 1 : 0;
 	for (auto y = 0, rowsCount = int(_rows.size()); y != rowsCount; ++y) {
 		for (auto x = 0, count = int(_rows[y].size()); x != count; ++x) {
+			const auto guard = gsl::finally([&] { if (number) ++number; });
 			const auto &button = _rows[y][x];
 			const auto rect = button.rect;
-			if (rect.y() >= clip.y() + clip.height()) return;
-			if (rect.y() + rect.height() < clip.y()) continue;
+			if (rect.y() >= clip.y() + clip.height()) {
+				return;
+			} else if (rect.y() + rect.height() < clip.y()) {
+				continue;
+			}
 
 			// just ignore the buttons that didn't layout well
-			if (rect.x() + rect.width() > _width) break;
+			if (rect.x() + rect.width() > _width) {
+				break;
+			}
 
 			auto buttonRounding = Ui::BubbleRounding();
 			using Corner = Ui::BubbleCornerRounding;
-			buttonRounding.topLeft = buttonRounding.topRight = Corner::Small;
+			buttonRounding.topLeft = ((!y)
+				&& !x
+				&& !st
+				&& (rounding.topLeft == Corner::Large))
+				? Corner::Large
+				: Corner::Small;
+			buttonRounding.topRight = ((!y)
+				&& (x + 1 == count)
+				&& !st
+				&& (rounding.topRight == Corner::Large))
+				? Corner::Large
+				: Corner::Small;
 			buttonRounding.bottomLeft = ((y + 1 == rowsCount)
 				&& !x
 				&& (rounding.bottomLeft == Corner::Large))
@@ -894,11 +1082,34 @@ void ReplyKeyboard::paint(
 				&& (rounding.bottomRight == Corner::Large))
 				? Corner::Large
 				: Corner::Small;
-			_st->paintButton(p, st, outerWidth, button, buttonRounding);
+			_st->paintButton(
+				p,
+				st,
+				outerWidth,
+				button,
+				buttonRounding,
+				paused);
+
+			if (number) {
+				p.setFont(st::dialogsUnreadFont);
+				p.setPen(st->msgServiceFg());
+				p.drawText(
+					rect.x() + st::msgBotKbIconPadding,
+					rect.y() + st::dialogsUnreadFont->ascent,
+					QString::number(number));
+			}
 		}
 	}
 }
 
+bool ReplyKeyboard::hasFastButtonMode() const {
+	return FastButtonsMode()
+		&& _item->inlineReplyKeyboard()
+		&& (_item == _item->history()->lastMessage())
+		&& _item->history()->session().fastButtonsBots().enabled(
+			_item->history()->peer);
+}
+
 ClickHandlerPtr ReplyKeyboard::getLink(QPoint point) const {
 	Assert(_width > 0);
 
@@ -907,9 +1118,16 @@ ClickHandlerPtr ReplyKeyboard::getLink(QPoint point) const {
 			QRect rect(button.rect);
 
 			// just ignore the buttons that didn't layout well
-			if (rect.x() + rect.width() > _width) break;
+			if (rect.x() + rect.width() > _width) {
+				break;
+			}
 
 			if (rect.contains(point)) {
+				if (_item->isAdminLogEntry()
+					&& button.type != HistoryMessageMarkupButton::Type::Url
+					&& button.type != HistoryMessageMarkupButton::Type::Callback) {
+					return ClickHandlerPtr();
+				}
 				_savedCoords = point;
 				return button.link;
 			}
@@ -918,8 +1136,25 @@ ClickHandlerPtr ReplyKeyboard::getLink(QPoint point) const {
 	return ClickHandlerPtr();
 }
 
-void ReplyKeyboard::clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) {
-	if (!p) return;
+ClickHandlerPtr ReplyKeyboard::getLinkByIndex(int index) const {
+	auto number = 1;
+	for (const auto &row : _rows) {
+		for (const auto &button : row) {
+			if (number == index + 1) {
+				return button.link;
+			}
+			++number;
+		}
+	}
+	return ClickHandlerPtr();
+}
+
+void ReplyKeyboard::clickHandlerActiveChanged(
+		const ClickHandlerPtr &p,
+		bool active) {
+	if (!p) {
+		return;
+	}
 
 	_savedActive = active ? p : ClickHandlerPtr();
 	auto coords = findButtonCoordsByClickHandler(p);
@@ -928,7 +1163,8 @@ void ReplyKeyboard::clickHandlerActiveChanged(const ClickHandlerPtr &p, bool act
 	}
 }
 
-ReplyKeyboard::ButtonCoords ReplyKeyboard::findButtonCoordsByClickHandler(const ClickHandlerPtr &p) {
+ReplyKeyboard::ButtonCoords ReplyKeyboard::findButtonCoordsByClickHandler(
+		const ClickHandlerPtr &p) {
 	for (int i = 0, rows = _rows.size(); i != rows; ++i) {
 		auto &row = _rows[i];
 		for (int j = 0, cols = row.size(); j != cols; ++j) {
@@ -944,7 +1180,9 @@ void ReplyKeyboard::clickHandlerPressedChanged(
 		const ClickHandlerPtr &handler,
 		bool pressed,
 		Ui::BubbleRounding rounding) {
-	if (!handler) return;
+	if (!handler) {
+		return;
+	}
 
 	_savedPressed = pressed ? handler : ClickHandlerPtr();
 	auto coords = findButtonCoordsByClickHandler(handler);
@@ -1043,23 +1281,34 @@ void ReplyKeyboard::Style::paintButton(
 		const Ui::ChatStyle *st,
 		int outerWidth,
 		const ReplyKeyboard::Button &button,
-		Ui::BubbleRounding rounding) const {
-	const QRect &rect = button.rect;
-	paintButtonBg(p, st, rect, rounding, button.howMuchOver);
+		Ui::BubbleRounding rounding,
+		bool paused) const {
+	const auto &rect = button.rect;
+	paintButtonBg(p, st, rect, button.color, rounding, button.howMuchOver);
 	if (button.ripple) {
-		const auto color = st ? &st->msgBotKbRippleBg()->c : nullptr;
+		const auto color = st
+			? &st->msgBotKbRippleBg()->c
+			: (button.color != HistoryMessageMarkupButton::Color::Normal)
+			? &st::shadowFg->c
+			: nullptr;
 		button.ripple->paint(p, rect.x(), rect.y(), outerWidth, color);
 		if (button.ripple->empty()) {
 			button.ripple.reset();
 		}
 	}
-	paintButtonIcon(p, st, rect, outerWidth, button.type);
+	paintButtonIcon(p, st, rect, outerWidth, button.iconType);
 	if (button.type == HistoryMessageMarkupButton::Type::CallbackWithPassword
 		|| button.type == HistoryMessageMarkupButton::Type::Callback
 		|| button.type == HistoryMessageMarkupButton::Type::Game) {
 		if (const auto data = button.link->getButton()) {
 			if (data->requestId) {
-				paintButtonLoading(p, st, rect, outerWidth, rounding);
+				paintButtonLoading(
+					p,
+					st,
+					rect,
+					button.color,
+					outerWidth,
+					rounding);
 			}
 		}
 	}
@@ -1072,7 +1321,26 @@ void ReplyKeyboard::Style::paintButton(
 		tx += (tw - st::botKbStyle.font->elidew) / 2;
 		tw = st::botKbStyle.font->elidew;
 	}
-	button.text.drawElided(p, tx, rect.y() + _st->textTop + ((rect.height() - _st->height) / 2), tw, 1, style::al_top);
+	paintButtonStart(p, st, button.color);
+	button.text.draw(p, {
+		.position = {
+			tx,
+			rect.y() + _st->textTop + ((rect.height() - _st->height) / 2),
+		},
+		.availableWidth = tw,
+		.align = style::al_top,
+		.paused = paused || On(PowerSaving::kEmojiChat),
+		.elisionLines = 1,
+	});
+	if (button.type == HistoryMessageMarkupButton::Type::SimpleWebView) {
+		const auto &icon = st::markupWebview;
+		st::markupWebview.paint(
+			p,
+			rect::right(rect) - icon.width() - _st->padding / 2,
+			rect.y() + _st->padding / 2,
+			rect.width(),
+			p.pen().color());
+	}
 }
 
 void HistoryMessageReplyMarkup::createForwarded(
@@ -1100,6 +1368,131 @@ bool HistoryMessageReplyMarkup::hiddenBy(Data::Media *media) const {
 	return false;
 }
 
+void HistoryMessageReplyMarkup::updateSuggestControls(
+		SuggestionActions actions) {
+	if (actions == SuggestionActions::AcceptAndDecline
+		|| actions == SuggestionActions::GiftOfferActions
+		|| actions == SuggestionActions::NoForwardsRequest) {
+		data.flags |= ReplyMarkupFlag::SuggestionAccept;
+	} else {
+		data.flags &= ~ReplyMarkupFlag::SuggestionAccept;
+	}
+	if (actions == SuggestionActions::None) {
+		data.flags &= ~ReplyMarkupFlag::SuggestionDecline;
+	} else {
+		data.flags |= ReplyMarkupFlag::Inline
+			| ReplyMarkupFlag::SuggestionDecline;
+	}
+	using Type = HistoryMessageMarkupButton::Type;
+	using Visual = HistoryMessageMarkupButton::Visual;
+	const auto has = [&](Type type) {
+		return !data.rows.empty()
+			&& ranges::contains(
+				data.rows.back(),
+				type,
+				&HistoryMessageMarkupButton::type);
+	};
+	if (actions == SuggestionActions::GiftOfferActions) {
+		if (has(Type::SuggestAccept)) {
+			// Nothing changed.
+		}
+		data.rows.push_back({
+			{
+				Type::SuggestDecline,
+				tr::lng_action_gift_offer_decline(tr::now),
+				Visual(),
+			},
+			{
+				Type::SuggestAccept,
+				tr::lng_action_gift_offer_accept(tr::now),
+				Visual(),
+			},
+		});
+	} else if (actions == SuggestionActions::NoForwardsRequest) {
+		data.rows.push_back({
+			{
+				Type::SuggestDecline,
+				tr::lng_action_no_forwards_reject(tr::now),
+				Visual(),
+			},
+			{
+				Type::SuggestAccept,
+				tr::lng_action_no_forwards_accept(tr::now),
+				Visual(),
+			},
+		});
+	} else if (actions == SuggestionActions::AcceptAndDecline) {
+		//     ... rows ...
+		// [decline] | [accept]
+		//   [suggestchanges]
+		if (has(Type::SuggestChange)) {
+			// Nothing changed.
+		} else {
+			if (has(Type::SuggestDecline)) {
+				data.rows.pop_back();
+			}
+			data.rows.push_back({
+				{
+					Type::SuggestDecline,
+					tr::lng_suggest_action_decline(tr::now),
+					Visual(),
+				},
+				{
+					Type::SuggestAccept,
+					tr::lng_suggest_action_accept(tr::now),
+					Visual(),
+				},
+			});
+			data.rows.push_back({ {
+				Type::SuggestChange,
+				tr::lng_suggest_action_change(tr::now),
+				Visual(),
+			} });
+			data.flags |= ReplyMarkupFlag::SuggestionAccept
+				| ReplyMarkupFlag::SuggestionDecline;
+		}
+		if (data.rows.size() > 2) {
+			data.flags |= ReplyMarkupFlag::SuggestionSeparator;
+		} else {
+			data.flags &= ~ReplyMarkupFlag::SuggestionSeparator;
+		}
+	} else {
+		while (!data.rows.empty()) {
+			if (has(Type::SuggestChange) || has(Type::SuggestAccept)) {
+				data.rows.pop_back();
+			} else if (has(Type::SuggestDecline)
+				&& actions == SuggestionActions::None) {
+				data.rows.pop_back();
+			} else {
+				break;
+			}
+		}
+		data.flags &= ~ReplyMarkupFlag::SuggestionAccept;
+		if (actions == SuggestionActions::None) {
+			data.flags &= ~ReplyMarkupFlag::SuggestionDecline;
+			data.flags &= ~ReplyMarkupFlag::SuggestionSeparator;
+		} else {
+			if (!has(Type::SuggestDecline)) {
+				// ... rows ...
+				//  [decline]
+				data.rows.push_back({ {
+					Type::SuggestDecline,
+					tr::lng_suggest_action_decline(tr::now),
+					Visual(),
+				} });
+				data.flags |= ReplyMarkupFlag::SuggestionDecline;
+			}
+			if (data.rows.size() > 1) {
+				data.flags |= ReplyMarkupFlag::SuggestionSeparator;
+			} else {
+				data.flags &= ~ReplyMarkupFlag::SuggestionSeparator;
+			}
+		}
+	}
+
+	inlineKeyboard = nullptr;
+}
+
 HistoryMessageLogEntryOriginal::HistoryMessageLogEntryOriginal() = default;
 
 HistoryMessageLogEntryOriginal::HistoryMessageLogEntryOriginal(
@@ -1130,11 +1523,7 @@ MessageFactcheck FromMTP(
 	}
 	const auto &data = factcheck->data();
 	if (const auto text = data.vtext()) {
-		const auto &data = text->data();
-		result.text = {
-			qs(data.vtext()),
-			Api::EntitiesFromMTP(session, data.ventities().v),
-		};
+		result.text = Api::ParseTextWithEntities(session, *text);
 	}
 	if (const auto country = data.vcountry()) {
 		result.country = qs(country->v);
@@ -1144,8 +1533,40 @@ MessageFactcheck FromMTP(
 	return result;
 }
 
+TextWithEntities ComposeTodoTasksList(
+		HistoryItem *itemWithList,
+		const std::vector<int> &ids) {
+	const auto media = itemWithList ? itemWithList->media() : nullptr;
+	const auto list = media ? media->todolist() : nullptr;
+	auto names = std::vector<TextWithEntities>();
+	if (list) {
+		names.reserve(ids.size());
+		for (const auto &id : ids) {
+			const auto i = ranges::find(list->items, id, &TodoListItem::id);
+			if (i == end(list->items)) {
+				names.clear();
+				break;
+			}
+			names.push_back(
+				TextWithEntities().append('"').append(i->text).append('"'));
+		}
+	}
+	return ComposeTodoTasksList(ids.size(), names);
+}
+
+TextWithEntities ComposeTodoTasksList(
+		not_null<HistoryServiceTodoAppendTasks*> append) {
+	auto names = std::vector<TextWithEntities>();
+	names.reserve(append->list.size());
+	for (const auto &task : append->list) {
+		names.push_back(
+			TextWithEntities().append('"').append(task.text).append('"'));
+	}
+	return ComposeTodoTasksList(names.size(), names);
+}
+
 HistoryDocumentCaptioned::HistoryDocumentCaptioned()
-: caption(st::msgFileMinWidth - st::msgPadding.left() - st::msgPadding.right()) {
+: caption(st::msgFileMinWidth - rect::m::sum::h(st::msgPadding)) {
 }
 
 HistoryDocumentVoicePlayback::HistoryDocumentVoicePlayback(
@@ -1157,6 +1578,8 @@ HistoryDocumentVoicePlayback::HistoryDocumentVoicePlayback(
 }) {
 }
 
+HistoryDocumentVoicePlayback::~HistoryDocumentVoicePlayback() = default;
+
 void HistoryDocumentVoice::ensurePlayback(
 		const HistoryView::Document *that) const {
 	if (!playback) {
diff --git a/Telegram/SourceFiles/history/history_item_components.h b/Telegram/SourceFiles/history/history_item_components.h
index 8b38c294da342b..6742d86b8427a0 100644
--- a/Telegram/SourceFiles/history/history_item_components.h
+++ b/Telegram/SourceFiles/history/history_item_components.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "data/data_cloud_file.h"
+#include "data/data_poll.h"
 #include "history/history_item.h"
 #include "spellcheck/spellcheck_types.h" // LanguageId.
 #include "ui/empty_userpic.h"
@@ -15,7 +16,12 @@ For license and copyright information please follow this link:
 #include "ui/effects/ripple_animation.h"
 #include "ui/chat/message_bubble.h"
 
+#include <memory>
+
 struct WebPageData;
+struct TodoListItem;
+class DocumentData;
+class PhotoData;
 class VoiceSeekClickHandler;
 class ReplyKeyboard;
 
@@ -23,8 +29,13 @@ namespace Ui {
 struct ChatPaintContext;
 class ChatStyle;
 struct PeerUserpicView;
+struct VoiceOnceParticles;
 } // namespace Ui
 
+namespace Ui::Paint {
+class Blobs;
+} // namespace Ui::Paint
+
 namespace Ui::Text {
 struct GeometryDescriptor;
 } // namespace Ui::Text
@@ -44,6 +55,10 @@ namespace Images {
 struct CornersMaskRef;
 } // namespace Images
 
+namespace Iv {
+struct RichPage;
+} // namespace Iv
+
 namespace HistoryView {
 class Element;
 class Document;
@@ -54,7 +69,18 @@ namespace style {
 struct BotKeyboardButton;
 } // namespace style
 
-struct HistoryMessageVia : public RuntimeComponent<HistoryMessageVia, HistoryItem> {
+extern const char kOptionFastButtonsMode[];
+[[nodiscard]] bool FastButtonsMode();
+
+enum class SuggestionActions : uchar {
+	None,
+	Decline,
+	AcceptAndDecline,
+	GiftOfferActions,
+	NoForwardsRequest,
+};
+
+struct HistoryMessageVia : RuntimeComponent<HistoryMessageVia, HistoryItem> {
 	void create(not_null<Data::Session*> owner, UserId userId);
 	void resize(int32 availw) const;
 
@@ -65,7 +91,20 @@ struct HistoryMessageVia : public RuntimeComponent<HistoryMessageVia, HistoryIte
 	ClickHandlerPtr link;
 };
 
-struct HistoryMessageViews : public RuntimeComponent<HistoryMessageViews, HistoryItem> {
+struct HistoryMessageGuestChat
+: RuntimeComponent<HistoryMessageGuestChat, HistoryItem> {
+	void create(not_null<Data::Session*> owner, PeerId visitorId);
+	void resize(int32 availw) const;
+
+	PeerData *visitor = nullptr;
+	mutable QString text;
+	mutable int width = 0;
+	mutable int maxWidth = 0;
+	ClickHandlerPtr link;
+};
+
+struct HistoryMessageViews
+: RuntimeComponent<HistoryMessageViews, HistoryItem> {
 	static constexpr auto kMaxRecentRepliers = 3;
 
 	struct Part {
@@ -84,16 +123,42 @@ struct HistoryMessageViews : public RuntimeComponent<HistoryMessageViews, Histor
 	int forwardsCount = 0;
 };
 
-struct HistoryMessageSigned : public RuntimeComponent<HistoryMessageSigned, HistoryItem> {
+struct HistoryMessageSigned
+: RuntimeComponent<HistoryMessageSigned, HistoryItem> {
 	QString author;
 	UserData *viaBusinessBot = nullptr;
 	bool isAnonymousRank = false;
 };
 
-struct HistoryMessageEdited : public RuntimeComponent<HistoryMessageEdited, HistoryItem> {
+struct HistoryMessageFromRank
+: RuntimeComponent<HistoryMessageFromRank, HistoryItem> {
+	QString rank;
+};
+
+struct HistoryMessageEdited
+: RuntimeComponent<HistoryMessageEdited, HistoryItem> {
 	TimeId date = 0;
 };
 
+struct HistoryMessageMediaForInstantView
+: RuntimeComponent<HistoryMessageMediaForInstantView, HistoryItem> {
+	using Item = std::variant<PhotoData*, DocumentData*>;
+
+	QString url;
+	base::flat_set<not_null<DocumentData*>> documents;
+	base::flat_set<not_null<PhotoData*>> photos;
+	std::vector<Item> items;
+	std::vector<TextWithEntities> captions;
+};
+
+struct HistoryMessageRichPageSource
+: RuntimeComponent<HistoryMessageRichPageSource, HistoryItem> {
+	std::shared_ptr<const Iv::RichPage> page;
+	std::shared_ptr<const Iv::RichPage> fullPage;
+	uint64 fullPageVersion = 0;
+	bool canEdit = false;
+};
+
 class HiddenSenderInfo {
 public:
 	HiddenSenderInfo(
@@ -131,7 +196,8 @@ class HiddenSenderInfo {
 
 };
 
-struct HistoryMessageForwarded : public RuntimeComponent<HistoryMessageForwarded, HistoryItem> {
+struct HistoryMessageForwarded
+: RuntimeComponent<HistoryMessageForwarded, HistoryItem> {
 	void create(
 		const HistoryMessageVia *via,
 		not_null<const HistoryItem*> item) const;
@@ -150,6 +216,7 @@ struct HistoryMessageForwarded : public RuntimeComponent<HistoryMessageForwarded
 
 	PeerData *savedFromPeer = nullptr;
 	MsgId savedFromMsgId = 0;
+	TimeId savedFromDate = 0;
 
 	PeerData *savedFromSender = nullptr;
 	std::unique_ptr<HiddenSenderInfo> savedFromHiddenSenderInfo;
@@ -159,13 +226,19 @@ struct HistoryMessageForwarded : public RuntimeComponent<HistoryMessageForwarded
 	bool story = false;
 };
 
-struct HistoryMessageSavedMediaData : public RuntimeComponent<HistoryMessageSavedMediaData, HistoryItem> {
+struct HistoryMessageSavedMediaData
+: RuntimeComponent<HistoryMessageSavedMediaData, HistoryItem> {
 	TextWithEntities text;
 	std::unique_ptr<Data::Media> media;
 };
 
-struct HistoryMessageSaved : public RuntimeComponent<HistoryMessageSaved, HistoryItem> {
-	Data::SavedSublist *sublist = nullptr;
+struct HistoryMessageSaved
+: RuntimeComponent<HistoryMessageSaved, HistoryItem> {
+	PeerId sublistPeerId = 0;
+
+	// This can't change after the message is created, but is required
+	// frequently in reactions, so we cache the value here.
+	Data::SavedSublist *savedMessagesSublist = nullptr;
 };
 
 class ReplyToMessagePointer final {
@@ -253,9 +326,12 @@ struct ReplyFields {
 	QString externalSenderName;
 	QString externalPostAuthor;
 	PeerId externalPeerId = 0;
+	PeerId monoforumPeerId = 0;
 	MsgId messageId = 0;
 	MsgId topMessageId = 0;
 	StoryId storyId = 0;
+	int todoItemId = 0;
+	QByteArray pollOption;
 	uint32 quoteOffset : 30 = 0;
 	uint32 manualQuote : 1 = 0;
 	uint32 topicPost : 1 = 0;
@@ -270,7 +346,7 @@ struct ReplyFields {
 	const MTPInputReplyTo &reply);
 
 struct HistoryMessageReply
-	: public RuntimeComponent<HistoryMessageReply, HistoryItem> {
+: RuntimeComponent<HistoryMessageReply, HistoryItem> {
 	HistoryMessageReply();
 	HistoryMessageReply(const HistoryMessageReply &other) = delete;
 	HistoryMessageReply(HistoryMessageReply &&other) = delete;
@@ -288,6 +364,10 @@ struct HistoryMessageReply
 		bool topicPost);
 	void updateData(not_null<HistoryItem*> holder, bool force = false);
 
+	void setInLogReplyTo(
+		not_null<HistoryItem*> holder,
+		not_null<HistoryItem*> message);
+
 	// Must be called before destructor.
 	void clearData(not_null<HistoryItem*> holder);
 
@@ -354,7 +434,7 @@ struct HistoryMessageReply
 };
 
 struct HistoryMessageTranslation
-	: public RuntimeComponent<HistoryMessageTranslation, HistoryItem> {
+: RuntimeComponent<HistoryMessageTranslation, HistoryItem> {
 	TextWithEntities text;
 	LanguageId to;
 	bool requested = false;
@@ -363,11 +443,12 @@ struct HistoryMessageTranslation
 };
 
 struct HistoryMessageReplyMarkup
-	: public RuntimeComponent<HistoryMessageReplyMarkup, HistoryItem> {
+: RuntimeComponent<HistoryMessageReplyMarkup, HistoryItem> {
 	using Button = HistoryMessageMarkupButton;
 
 	void createForwarded(const HistoryMessageReplyMarkup &original);
 	void updateData(HistoryMessageMarkupData &&markup);
+	void updateSuggestControls(SuggestionActions actions);
 
 	[[nodiscard]] bool hiddenBy(Data::Media *media) const;
 
@@ -390,6 +471,8 @@ class ReplyMarkupClickHandler : public ClickHandler {
 		_fullDisplayed = full;
 	}
 
+	QString dragText() const override;
+
 	// Copy to clipboard support.
 	QString copyToClipboardText() const override;
 	QString copyToClipboardContextItemText() const override;
@@ -432,9 +515,6 @@ class ReplyKeyboard {
 		Style(const style::BotKeyboardButton &st) : _st(&st) {
 		}
 
-		virtual void startPaint(
-			QPainter &p,
-			const Ui::ChatStyle *st) const = 0;
 		virtual const style::TextStyle &textStyle() const = 0;
 
 		int buttonSkip() const;
@@ -453,8 +533,13 @@ class ReplyKeyboard {
 			QPainter &p,
 			const Ui::ChatStyle *st,
 			const QRect &rect,
+			HistoryMessageMarkupButton::Color color,
 			Ui::BubbleRounding rounding,
 			float64 howMuchOver) const = 0;
+		virtual void paintButtonStart(
+			QPainter &p,
+			const Ui::ChatStyle *st,
+			HistoryMessageMarkupButton::Color color) const = 0;
 		virtual void paintButtonIcon(
 			QPainter &p,
 			const Ui::ChatStyle *st,
@@ -465,6 +550,7 @@ class ReplyKeyboard {
 			QPainter &p,
 			const Ui::ChatStyle *st,
 			const QRect &rect,
+			HistoryMessageMarkupButton::Color color,
 			int outerWidth,
 			Ui::BubbleRounding rounding) const = 0;
 		virtual int minButtonWidth(
@@ -478,7 +564,8 @@ class ReplyKeyboard {
 			const Ui::ChatStyle *st,
 			int outerWidth,
 			const ReplyKeyboard::Button &button,
-			Ui::BubbleRounding rounding) const;
+			Ui::BubbleRounding rounding,
+			bool paused) const;
 		friend class ReplyKeyboard;
 
 	};
@@ -502,8 +589,10 @@ class ReplyKeyboard {
 		const Ui::ChatStyle *st,
 		Ui::BubbleRounding rounding,
 		int outerWidth,
-		const QRect &clip) const;
+		const QRect &clip,
+		bool paused) const;
 	ClickHandlerPtr getLink(QPoint point) const;
+	ClickHandlerPtr getLinkByIndex(int index) const;
 
 	void clickHandlerActiveChanged(
 		const ClickHandlerPtr &p,
@@ -528,15 +617,19 @@ class ReplyKeyboard {
 		QRect rect;
 		int characters = 0;
 		float64 howMuchOver = 0.;
-		HistoryMessageMarkupButton::Type type;
+		HistoryMessageMarkupButton::Type type = {};
+		HistoryMessageMarkupButton::Type iconType = {};
+		HistoryMessageMarkupButton::Color color = {};
 		std::shared_ptr<ReplyMarkupClickHandler> link;
 		mutable std::unique_ptr<Ui::RippleAnimation> ripple;
 	};
 	struct ButtonCoords {
-		int i, j;
+		int i = 0;
+		int j = 0;
 	};
 
 	void startAnimation(int i, int j, int direction);
+	[[nodiscard]] bool hasFastButtonMode() const;
 
 	ButtonCoords findButtonCoordsByClickHandler(const ClickHandlerPtr &p);
 
@@ -559,7 +652,7 @@ class ReplyKeyboard {
 
 // Special type of Component for the channel actions log.
 struct HistoryMessageLogEntryOriginal
-: public RuntimeComponent<HistoryMessageLogEntryOriginal, HistoryItem> {
+: RuntimeComponent<HistoryMessageLogEntryOriginal, HistoryItem> {
 	HistoryMessageLogEntryOriginal();
 	HistoryMessageLogEntryOriginal(HistoryMessageLogEntryOriginal &&other);
 	HistoryMessageLogEntryOriginal &operator=(HistoryMessageLogEntryOriginal &&other);
@@ -591,19 +684,29 @@ struct MessageFactcheck {
 	const tl::conditional<MTPFactCheck> &factcheck);
 
 struct HistoryMessageFactcheck
-: public RuntimeComponent<HistoryMessageFactcheck, HistoryItem> {
+: RuntimeComponent<HistoryMessageFactcheck, HistoryItem> {
 	MessageFactcheck data;
 	WebPageData *page = nullptr;
 	bool requested = false;
 };
 
+struct HistoryMessageSuggestion
+: RuntimeComponent<HistoryMessageSuggestion, HistoryItem> {
+	std::shared_ptr<Data::UniqueGift> gift;
+	CreditsAmount price;
+	TimeId date = 0;
+	mtpRequestId requestId = 0;
+	bool accepted = false;
+	bool rejected = false;
+};
+
 struct HistoryMessageRestrictions
-: public RuntimeComponent<HistoryMessageRestrictions, HistoryItem> {
+: RuntimeComponent<HistoryMessageRestrictions, HistoryItem> {
 	std::vector<Data::UnavailableReason> reasons;
 };
 
 struct HistoryServiceData
-: public RuntimeComponent<HistoryServiceData, HistoryItem> {
+: RuntimeComponent<HistoryServiceData, HistoryItem> {
 	std::vector<ClickHandlerPtr> textLinks;
 };
 
@@ -619,13 +722,18 @@ struct HistoryServiceDependentData {
 };
 
 struct HistoryServicePinned
-: public RuntimeComponent<HistoryServicePinned, HistoryItem>
-, public HistoryServiceDependentData {
+: RuntimeComponent<HistoryServicePinned, HistoryItem>
+, HistoryServiceDependentData {
+};
+
+struct HistoryServiceClearHistory
+: RuntimeComponent<HistoryServiceClearHistory, HistoryItem>
+, HistoryServiceDependentData {
 };
 
 struct HistoryServiceTopicInfo
-: public RuntimeComponent<HistoryServiceTopicInfo, HistoryItem>
-, public HistoryServiceDependentData {
+: RuntimeComponent<HistoryServiceTopicInfo, HistoryItem>
+, HistoryServiceDependentData {
 	QString title;
 	DocumentId iconId = 0;
 	bool closed = false;
@@ -645,15 +753,83 @@ struct HistoryServiceTopicInfo
 	}
 };
 
+struct HistoryServiceTodoCompletions
+: RuntimeComponent<HistoryServiceTodoCompletions, HistoryItem>
+, HistoryServiceDependentData {
+	std::vector<int> completed;
+	std::vector<int> incompleted;
+};
+
+[[nodiscard]] TextWithEntities ComposeTodoTasksList(
+	HistoryItem *itemWithList,
+	const std::vector<int> &ids);
+
+struct HistoryServiceTodoAppendTasks
+: RuntimeComponent<HistoryServiceTodoAppendTasks, HistoryItem>
+, HistoryServiceDependentData {
+	std::vector<TodoListItem> list;
+};
+
+[[nodiscard]] TextWithEntities ComposeTodoTasksList(
+	not_null<HistoryServiceTodoAppendTasks*> append);
+
+struct HistoryServicePollAppendAnswer
+: RuntimeComponent<HistoryServicePollAppendAnswer, HistoryItem>
+, HistoryServiceDependentData {
+	PollAnswer answer;
+};
+
+struct HistoryServicePollDeleteAnswer
+: RuntimeComponent<HistoryServicePollDeleteAnswer, HistoryItem>
+, HistoryServiceDependentData {
+	PollAnswer answer;
+};
+
+struct HistoryServiceSuggestDecision
+: RuntimeComponent<HistoryServiceSuggestDecision, HistoryItem>
+, HistoryServiceDependentData {
+	CreditsAmount price;
+	TimeId date = 0;
+	QString rejectComment;
+	bool rejected = false;
+	bool balanceTooLow = false;
+};
+
+enum class SuggestRefundType {
+	None,
+	User,
+	Admin,
+	Expired,
+};
+
+struct HistoryServiceSuggestFinish
+: RuntimeComponent<HistoryServiceSuggestFinish, HistoryItem>
+, HistoryServiceDependentData {
+	CreditsAmount price;
+	SuggestRefundType refundType = SuggestRefundType::None;
+};
+
+struct HistoryServiceNoForwardsRequest
+: RuntimeComponent<HistoryServiceNoForwardsRequest, HistoryItem> {
+	TimeId expiresAt = 0;
+	mtpRequestId requestId = 0;
+	bool expired = false;
+	bool actionTaken = false;
+};
+
+struct HistoryServiceNoForwardsToggle
+: RuntimeComponent<HistoryServiceNoForwardsToggle, HistoryItem> {
+};
+
 struct HistoryServiceGameScore
-: public RuntimeComponent<HistoryServiceGameScore, HistoryItem>
-, public HistoryServiceDependentData {
+: RuntimeComponent<HistoryServiceGameScore, HistoryItem>
+, HistoryServiceDependentData {
 	int score = 0;
 };
 
 struct HistoryServicePayment
-: public RuntimeComponent<HistoryServicePayment, HistoryItem>
-, public HistoryServiceDependentData {
+: RuntimeComponent<HistoryServicePayment, HistoryItem>
+, HistoryServiceDependentData {
 	QString slug;
 	TextWithEntities amount;
 	ClickHandlerPtr invoiceLink;
@@ -663,22 +839,22 @@ struct HistoryServicePayment
 };
 
 struct HistoryServiceSameBackground
-: public RuntimeComponent<HistoryServiceSameBackground, HistoryItem>
-, public HistoryServiceDependentData {
+: RuntimeComponent<HistoryServiceSameBackground, HistoryItem>
+, HistoryServiceDependentData {
 };
 
 struct HistoryServiceGiveawayResults
-: public RuntimeComponent<HistoryServiceGiveawayResults, HistoryItem>
-, public HistoryServiceDependentData {
+: RuntimeComponent<HistoryServiceGiveawayResults, HistoryItem>
+, HistoryServiceDependentData {
 };
 
 struct HistoryServiceCustomLink
-: public RuntimeComponent<HistoryServiceCustomLink, HistoryItem> {
+: RuntimeComponent<HistoryServiceCustomLink, HistoryItem> {
 	ClickHandlerPtr link;
 };
 
 struct HistoryServicePaymentRefund
-: public RuntimeComponent<HistoryServicePaymentRefund, HistoryItem> {
+: RuntimeComponent<HistoryServicePaymentRefund, HistoryItem> {
 	ClickHandlerPtr link;
 	PeerData *peer = nullptr;
 	QString transactionId;
@@ -701,7 +877,7 @@ struct TimeToLiveSingleView {
 };
 
 struct HistoryServiceSelfDestruct
-: public RuntimeComponent<HistoryServiceSelfDestruct, HistoryItem> {
+: RuntimeComponent<HistoryServiceSelfDestruct, HistoryItem> {
 	using Type = HistorySelfDestructType;
 
 	Type type = Type::Photo;
@@ -710,24 +886,25 @@ struct HistoryServiceSelfDestruct
 };
 
 struct HistoryServiceOngoingCall
-: public RuntimeComponent<HistoryServiceOngoingCall, HistoryItem> {
+: RuntimeComponent<HistoryServiceOngoingCall, HistoryItem> {
 	CallId id = 0;
 	ClickHandlerPtr link;
 	rpl::lifetime lifetime;
 };
 
 struct HistoryServiceChatThemeChange
-: public RuntimeComponent<HistoryServiceChatThemeChange, HistoryItem> {
+: RuntimeComponent<HistoryServiceChatThemeChange, HistoryItem> {
 	ClickHandlerPtr link;
 };
 
 struct HistoryServiceTTLChange
-: public RuntimeComponent<HistoryServiceTTLChange, HistoryItem> {
+: RuntimeComponent<HistoryServiceTTLChange, HistoryItem> {
 	ClickHandlerPtr link;
 };
 
 class FileClickHandler;
-struct HistoryDocumentThumbed : public RuntimeComponent<HistoryDocumentThumbed, HistoryView::Document> {
+struct HistoryDocumentThumbed
+: RuntimeComponent<HistoryDocumentThumbed, HistoryView::Document> {
 	std::shared_ptr<FileClickHandler> linksavel;
 	std::shared_ptr<FileClickHandler> linkopenwithl;
 	std::shared_ptr<FileClickHandler> linkcancell;
@@ -739,25 +916,32 @@ struct HistoryDocumentThumbed : public RuntimeComponent<HistoryDocumentThumbed,
 	mutable bool blurred : 1 = false;
 };
 
-struct HistoryDocumentCaptioned : public RuntimeComponent<HistoryDocumentCaptioned, HistoryView::Document> {
+struct HistoryDocumentCaptioned
+: RuntimeComponent<HistoryDocumentCaptioned, HistoryView::Document> {
 	HistoryDocumentCaptioned();
 
 	Ui::Text::String caption;
 };
 
-struct HistoryDocumentNamed : public RuntimeComponent<HistoryDocumentNamed, HistoryView::Document> {
+struct HistoryDocumentNamed
+: RuntimeComponent<HistoryDocumentNamed, HistoryView::Document> {
 	Ui::Text::String name;
 };
 
 struct HistoryDocumentVoicePlayback {
 	HistoryDocumentVoicePlayback(const HistoryView::Document *that);
+	~HistoryDocumentVoicePlayback();
 
 	int32 position = 0;
 	anim::value progress;
 	Ui::Animations::Basic progressAnimation;
+
+	std::unique_ptr<Ui::Paint::Blobs> blobs;
+	crl::time blobsLastUpdate = 0;
 };
 
-class HistoryDocumentVoice : public RuntimeComponent<HistoryDocumentVoice, HistoryView::Document> {
+class HistoryDocumentVoice
+: public RuntimeComponent<HistoryDocumentVoice, HistoryView::Document> {
 	// We don't use float64 because components should align to pointer even on 32bit systems.
 	static constexpr float64 kFloatToIntMultiplier = 65536.;
 
@@ -781,6 +965,8 @@ class HistoryDocumentVoice : public RuntimeComponent<HistoryDocumentVoice, Histo
 	Ui::Text::String transcribeText;
 	std::unique_ptr<Media::Player::RoundPainter> round;
 
+	mutable std::unique_ptr<Ui::VoiceOnceParticles> once;
+
 private:
 	bool _seeking = false;
 
@@ -788,3 +974,8 @@ class HistoryDocumentVoice : public RuntimeComponent<HistoryDocumentVoice, Histo
 	mutable int _seekingCurrent = 0;
 
 };
+
+struct HistoryMessageSchedulePeriod
+: RuntimeComponent<HistoryMessageSchedulePeriod, HistoryItem> {
+	TimeId schedulePeriod = 0;
+};
diff --git a/Telegram/SourceFiles/history/history_item_edition.cpp b/Telegram/SourceFiles/history/history_item_edition.cpp
index d66d0cf7bc0bf1..8299717e2843d6 100644
--- a/Telegram/SourceFiles/history/history_item_edition.cpp
+++ b/Telegram/SourceFiles/history/history_item_edition.cpp
@@ -8,12 +8,16 @@ For license and copyright information please follow this link:
 #include "history/history_item_edition.h"
 
 #include "api/api_text_entities.h"
+#include "iv/iv_rich_page.h"
 #include "main/main_session.h"
 
 HistoryMessageEdition::HistoryMessageEdition(
-		not_null<Main::Session*> session,
-		const MTPDmessage &message) {
+	not_null<Main::Session*> session,
+	const MTPDmessage &message)
+: suggest(HistoryMessageSuggestInfo(message.vsuggested_post())) {
 	isEditHide = message.is_edit_hide();
+	isMediaUnread = message.is_media_unread();
+	repeatPeriod = message.vschedule_repeat_period().value_or_empty();
 	editDate = message.vedit_date().value_or(-1);
 	textWithEntities = TextWithEntities{
 		qs(message.vmessage()),
@@ -25,12 +29,18 @@ HistoryMessageEdition::HistoryMessageEdition(
 	mtpMedia = message.vmedia();
 	mtpReactions = message.vreactions();
 	mtpFactcheck = message.vfactcheck();
+	if (const auto data = message.vrich_message()) {
+		richPage = Iv::ParseRichPage(session, *data);
+	}
 	views = message.vviews().value_or(-1);
 	forwards = message.vforwards().value_or(-1);
 	if (const auto mtpReplies = message.vreplies()) {
 		replies = HistoryMessageRepliesData(mtpReplies);
 	}
 	invertMedia = message.is_invert_media();
+	if (const auto rank = message.vfrom_rank()) {
+		fromRank = qs(*rank);
+	}
 
 	const auto period = message.vttl_period();
 	ttl = (period && period->v > 0) ? (message.vdate().v + period->v) : 0;
diff --git a/Telegram/SourceFiles/history/history_item_edition.h b/Telegram/SourceFiles/history/history_item_edition.h
index a44109299b556e..461d1413623997 100644
--- a/Telegram/SourceFiles/history/history_item_edition.h
+++ b/Telegram/SourceFiles/history/history_item_edition.h
@@ -9,6 +9,12 @@ For license and copyright information please follow this link:
 
 #include "history/history_item_reply_markup.h"
 
+#include <memory>
+
+namespace Iv {
+struct RichPage;
+} // namespace Iv
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -20,7 +26,9 @@ struct HistoryMessageEdition {
 		const MTPDmessage &message);
 
 	bool isEditHide = false;
-	int editDate = 0;
+	bool isMediaUnread = false;
+	TimeId repeatPeriod = 0;
+	TimeId editDate = 0;
 	int views = -1;
 	int forwards = -1;
 	int ttl = 0;
@@ -29,12 +37,16 @@ struct HistoryMessageEdition {
 	bool useSameReplies = false;
 	bool useSameMarkup = false;
 	bool useSameReactions = false;
+	bool useSameSuggest = false;
 	bool savePreviousMedia = false;
 	bool invertMedia = false;
 	TextWithEntities textWithEntities;
 	HistoryMessageMarkupData replyMarkup;
 	HistoryMessageRepliesData replies;
+	HistoryMessageSuggestInfo suggest;
+	std::shared_ptr<const Iv::RichPage> richPage;
 	const MTPMessageMedia *mtpMedia = nullptr;
 	const MTPMessageReactions *mtpReactions = nullptr;
 	const MTPFactCheck *mtpFactcheck = nullptr;
+	QString fromRank;
 };
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index dabd0ee8389e6b..1af7166acc9b2d 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "history/history_item_helpers.h"
 
+#include "api/api_reactions_notify_settings.h"
 #include "api/api_text_entities.h"
 #include "boxes/premium_preview_box.h"
 #include "calls/calls_instance.h"
@@ -21,9 +22,12 @@ For license and copyright information please follow this link:
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
 #include "data/data_message_reactions.h"
+#include "data/data_poll.h"
+#include "data/data_premium_limits.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_user.h"
+#include "history/view/controls/history_view_suggest_options.h"
 #include "history/history.h"
 #include "history/history_item_components.h"
 #include "main/main_account.h"
@@ -38,9 +42,14 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "core/application.h"
 #include "core/click_handler_types.h" // ClickHandlerContext.
+#include "settings/settings_credits_graphics.h"
+#include "storage/storage_account.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/boxes/emoji_stake_box.h" // InsufficientTonBox
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
+#include "ui/widgets/checkbox.h"
 #include "ui/item_text_options.h"
 #include "lang/lang_keys.h"
 
@@ -59,7 +68,37 @@ bool PeerCallKnown(not_null<PeerData*> peer) {
 
 } // namespace
 
-QString GetErrorTextForSending(
+int ComputeSendingMessagesCount(
+		not_null<History*> history,
+		const SendingErrorRequest &request) {
+	auto result = 0;
+	if (request.text && !request.text->empty()) {
+		auto sending = TextWithEntities();
+		auto left = TextWithEntities{
+			request.text->text,
+			TextUtilities::ConvertTextTagsToEntities(request.text->tags)
+		};
+		auto prepareFlags = Ui::ItemTextOptions(
+			history,
+			history->session().user()).flags;
+		const auto messageLengthLimit = Data::PremiumLimits(
+			&history->session()
+		).messageLengthCurrent();
+		TextUtilities::PrepareForSending(left, prepareFlags);
+
+		while (TextUtilities::CutPart(sending, left, messageLengthLimit)) {
+			++result;
+		}
+		if (!result) {
+			++result;
+		}
+	}
+	return result
+		+ (request.story ? 1 : 0)
+		+ (request.forward ? int(request.forward->size()) : 0);
+}
+
+Data::SendError GetErrorForSending(
 		not_null<PeerData*> peer,
 		SendingErrorRequest request) {
 	const auto forum = request.topicRootId ? peer->forum() : nullptr;
@@ -69,15 +108,18 @@ QString GetErrorTextForSending(
 	const auto thread = topic
 		? not_null<Data::Thread*>(topic)
 		: peer->owner().history(peer);
+	const auto messageLengthLimit = Data::PremiumLimits(
+		&thread->owningHistory()->session()
+	).messageLengthCurrent();
 	if (request.story) {
 		if (const auto error = request.story->errorTextForForward(thread)) {
-			return *error;
+			return error;
 		}
 	}
 	if (request.forward) {
 		for (const auto &item : *request.forward) {
 			if (const auto error = item->errorTextForForward(thread)) {
-				return *error;
+				return error;
 			}
 		}
 	}
@@ -87,15 +129,15 @@ QString GetErrorTextForSending(
 			peer,
 			ChatRestriction::SendOther);
 		if (error) {
-			return *error;
+			return error;
 		} else if (!Data::CanSendTexts(thread)) {
 			return tr::lng_forward_cant(tr::now);
 		}
 	}
 	if (peer->slowmodeApplied()) {
-		const auto count = (hasText ? 1 : 0)
-			+ (request.story ? 1 : 0)
-			+ (request.forward ? int(request.forward->size()) : 0);
+		const auto count = request.messagesCount
+			? request.messagesCount
+			: ComputeSendingMessagesCount(thread->owningHistory(), request);
 		if (const auto history = peer->owner().historyLoaded(peer)) {
 			if (!request.ignoreSlowmodeCountdown
 				&& (history->latestSendingMessage() != nullptr)
@@ -103,7 +145,7 @@ QString GetErrorTextForSending(
 				return tr::lng_slowmode_no_many(tr::now);
 			}
 		}
-		if (request.text && request.text->text.size() > MaxMessageSize) {
+		if (request.text && request.text->text.size() > messageLengthLimit) {
 			return tr::lng_slowmode_too_long(tr::now);
 		} else if ((hasText || request.story) && count > 1) {
 			return tr::lng_slowmode_no_many(tr::now);
@@ -133,15 +175,370 @@ QString GetErrorTextForSending(
 				Ui::FormatDurationWordsSlowmode(left));
 		}
 	}
-
-	return QString();
+	return {};
 }
 
-QString GetErrorTextForSending(
+Data::SendError GetErrorForSending(
 		not_null<Data::Thread*> thread,
 		SendingErrorRequest request) {
 	request.topicRootId = thread->topicRootId();
-	return GetErrorTextForSending(thread->peer(), std::move(request));
+	return GetErrorForSending(thread->peer(), std::move(request));
+}
+
+Data::SendErrorWithThread GetErrorForSending(
+		const std::vector<not_null<Data::Thread*>> &threads,
+		SendingErrorRequest request) {
+	for (const auto &thread : threads) {
+		const auto error = GetErrorForSending(thread, request);
+		if (error) {
+			return Data::SendErrorWithThread{ error, thread };
+		}
+	}
+	return {};
+}
+
+std::optional<SendPaymentDetails> ComputePaymentDetails(
+		not_null<PeerData*> peer,
+		int messagesCount) {
+	const auto user = peer->asUser();
+	const auto channel = user ? nullptr : peer->asChannel();
+	const auto has = (user && user->hasStarsPerMessage())
+		|| (channel && channel->hasStarsPerMessage());
+	if (!has) {
+		return SendPaymentDetails();
+	}
+
+	const auto known1 = peer->session().credits().loaded();
+	if (!known1) {
+		peer->session().credits().load();
+	}
+
+	const auto known2 = user
+		? user->messageMoneyRestrictionsKnown()
+		: channel->starsPerMessageKnown();
+	if (!known2) {
+		peer->updateFull();
+	}
+
+	if (!known1 || !known2) {
+		return {};
+	} else if (const auto perMessage = peer->starsPerMessageChecked()) {
+		return SendPaymentDetails{
+			.messages = messagesCount,
+			.stars = messagesCount * perMessage,
+		};
+	}
+	return SendPaymentDetails();
+}
+
+bool SuggestPaymentDataReady(
+		not_null<PeerData*> peer,
+		SuggestOptions suggest) {
+	if (!suggest.exists || !suggest.price() || peer->amMonoforumAdmin()) {
+		return true;
+	} else if (suggest.ton && !peer->session().credits().tonLoaded()) {
+		peer->session().credits().tonLoad();
+		return false;
+	} else if (!suggest.ton && !peer->session().credits().loaded()) {
+		peer->session().credits().load();
+		return false;
+	}
+	return true;
+}
+
+object_ptr<Ui::BoxContent> MakeSendErrorBox(
+		const Data::SendErrorWithThread &error,
+		bool withTitle) {
+	Expects(error.error.has_value() && error.thread != nullptr);
+
+	auto text = TextWithEntities();
+	if (withTitle) {
+		text.append(
+			tr::bold(error.thread->chatListName())
+		).append("\n\n");
+	}
+	if (error.error.boostsToLift) {
+		text.append(tr::link(error.error.text));
+	} else {
+		text.append(error.error.text);
+	}
+	const auto peer = error.thread->peer();
+	const auto lifting = error.error.boostsToLift;
+	const auto filter = [=](const auto &...) {
+		Expects(peer->isChannel());
+
+		const auto window = ChatHelpers::ResolveWindowDefault()(
+			&peer->session());
+		window->resolveBoostState(peer->asChannel(), lifting);
+		return false;
+	};
+	return Ui::MakeInformBox({
+		.text = text,
+		.labelFilter = filter,
+	});
+}
+
+void ShowSendPaidConfirm(
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		SendPaymentDetails details,
+		Fn<void()> confirmed,
+		PaidConfirmStyles styles,
+		int suggestStarsPrice) {
+	return ShowSendPaidConfirm(
+		navigation->uiShow(),
+		peer,
+		details,
+		confirmed,
+		styles,
+		suggestStarsPrice);
+}
+
+void ShowSendPaidConfirm(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<PeerData*> peer,
+		SendPaymentDetails details,
+		Fn<void()> confirmed,
+		PaidConfirmStyles styles,
+		int suggestStarsPrice) {
+	ShowSendPaidConfirm(
+		std::move(show),
+		std::vector<not_null<PeerData*>>{ peer },
+		details,
+		confirmed,
+		styles,
+		suggestStarsPrice);
+}
+
+void ShowSendPaidConfirm(
+		std::shared_ptr<Main::SessionShow> show,
+		const std::vector<not_null<PeerData*>> &peers,
+		SendPaymentDetails details,
+		Fn<void()> confirmed,
+		PaidConfirmStyles styles,
+		int suggestStarsPrice) {
+	Expects(!peers.empty());
+
+	const auto singlePeer = (peers.size() > 1)
+		? (PeerData*)nullptr
+		: peers.front().get();
+	const auto singlePeerId = singlePeer ? singlePeer->id : PeerId();
+	const auto check = [=] {
+		const auto required = details.stars + suggestStarsPrice;
+		if (!required) {
+			return;
+		}
+		const auto done = [=](Settings::SmallBalanceResult result) {
+			if (result == Settings::SmallBalanceResult::Success
+				|| result == Settings::SmallBalanceResult::Already) {
+				confirmed();
+			}
+		};
+		using namespace Settings;
+		MaybeRequestBalanceIncrease(
+			show,
+			required,
+			(suggestStarsPrice
+				? SmallBalanceSource(SmallBalanceForSuggest{ singlePeerId })
+				: SmallBalanceForMessage{ singlePeerId }),
+			done);
+	};
+	auto usersOnly = true;
+	for (const auto &peer : peers) {
+		if (!peer->isUser()) {
+			usersOnly = false;
+			break;
+		}
+	}
+	const auto singlePeerStars = singlePeer
+		? singlePeer->starsPerMessageChecked()
+		: 0;
+	if (singlePeer) {
+		const auto session = &singlePeer->session();
+		const auto trusted = session->local().isPeerTrustedPayForMessage(
+			singlePeerId,
+			singlePeerStars);
+		if (trusted) {
+			check();
+			return;
+		}
+	}
+	const auto messages = details.messages;
+	const auto stars = details.stars;
+	show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+		const auto trust = std::make_shared<base::weak_qptr<Ui::Checkbox>>();
+		const auto proceed = [=](Fn<void()> close) {
+			if (singlePeer && (*trust)->checked()) {
+				const auto session = &singlePeer->session();
+				session->local().markPeerTrustedPayForMessage(
+					singlePeerId,
+					singlePeerStars);
+			}
+			check();
+			close();
+		};
+		Ui::ConfirmBox(box, {
+			.text = (singlePeer
+				? tr::lng_payment_confirm_text(
+					tr::now,
+					lt_count,
+					stars / messages,
+					lt_name,
+					tr::bold(singlePeer->shortName()),
+					tr::rich)
+				: (usersOnly
+					? tr::lng_payment_confirm_users
+					: tr::lng_payment_confirm_chats)(
+						tr::now,
+						lt_count,
+						int(peers.size()),
+						tr::rich)).append(' ').append(
+							tr::lng_payment_confirm_sure(
+								tr::now,
+								lt_count,
+								messages,
+								lt_amount,
+								tr::lng_payment_confirm_amount(
+									tr::now,
+									lt_count,
+									stars,
+									tr::rich),
+								tr::rich)),
+			.confirmed = proceed,
+			.confirmText = tr::lng_payment_confirm_button(
+				lt_count,
+				rpl::single(messages * 1.)),
+			.labelStyle = styles.label,
+			.title = tr::lng_payment_confirm_title(),
+		});
+		if (singlePeer) {
+			const auto skip = st::defaultCheckbox.margin.top();
+			*trust = box->addRow(
+				object_ptr<Ui::Checkbox>(
+					box,
+					tr::lng_payment_confirm_dont_ask(tr::now),
+					false,
+					(styles.checkbox
+						? *styles.checkbox
+						: st::defaultCheckbox)),
+				st::boxRowPadding + QMargins(0, skip, 0, skip));
+		}
+	}));
+}
+
+bool SendPaymentHelper::check(
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		Api::SendOptions options,
+		int messagesCount,
+		Fn<void(int)> resend,
+		PaidConfirmStyles styles) {
+	return check(
+		navigation->uiShow(),
+		peer,
+		options,
+		messagesCount,
+		std::move(resend),
+		styles);
+}
+
+bool SendPaymentHelper::check(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<PeerData*> peer,
+		Api::SendOptions options,
+		int messagesCount,
+		Fn<void(int)> resend,
+		PaidConfirmStyles styles) {
+	clear();
+
+	const auto admin = peer->amMonoforumAdmin();
+	const auto suggest = options.suggest;
+	const auto starsApproved = options.starsApproved;
+	const auto checkSuggestPriceStars = (admin || suggest.ton)
+		? 0
+		: int(base::SafeRound(suggest.price().value()));
+	const auto checkSuggestPriceTon = (!admin && suggest.ton)
+		? suggest.price()
+		: CreditsAmount();
+	const auto details = ComputePaymentDetails(peer, messagesCount);
+	const auto suggestDetails = SuggestPaymentDataReady(peer, suggest);
+	if (!details || !suggestDetails) {
+		_resend = [=] { resend(starsApproved); };
+
+		if ((!details || !suggest.ton)
+			&& !peer->session().credits().loaded()) {
+			peer->session().credits().loadedValue(
+			) | rpl::filter(
+				rpl::mappers::_1
+			) | rpl::take(1) | rpl::on_next([=] {
+				if (const auto callback = base::take(_resend)) {
+					callback();
+				}
+			}, _lifetime);
+		}
+
+		if ((!suggestDetails && suggest.ton)
+			&& !peer->session().credits().tonLoaded()) {
+			peer->session().credits().tonLoadedValue(
+			) | rpl::filter(
+				rpl::mappers::_1
+			) | rpl::take(1) | rpl::on_next([=] {
+				if (const auto callback = base::take(_resend)) {
+					callback();
+				}
+			}, _lifetime);
+		}
+
+		peer->session().changes().peerUpdates(
+			peer,
+			Data::PeerUpdate::Flag::FullInfo
+		) | rpl::on_next([=] {
+			if (const auto callback = base::take(_resend)) {
+				callback();
+			}
+		}, _lifetime);
+
+		return false;
+	} else if (const auto stars = details->stars; stars > starsApproved) {
+		ShowSendPaidConfirm(show, peer, *details, [=] {
+			resend(stars);
+		}, styles, checkSuggestPriceStars);
+		return false;
+	} else if (checkSuggestPriceStars
+		&& (CreditsAmount(details->stars + checkSuggestPriceStars)
+			> peer->session().credits().balance())) {
+		using namespace Settings;
+		const auto broadcast = peer->monoforumBroadcast();
+		const auto broadcastId = (broadcast ? broadcast : peer)->id;
+		const auto forMessages = details->stars;
+		const auto required = forMessages + checkSuggestPriceStars;
+		const auto done = [=](SmallBalanceResult result) {
+			if (result == SmallBalanceResult::Success
+				|| result == SmallBalanceResult::Already) {
+				resend(forMessages);
+			}
+		};
+		MaybeRequestBalanceIncrease(
+			show,
+			required,
+			SmallBalanceForSuggest{ broadcastId },
+			done);
+		return false;
+	}
+	const auto session = &peer->session();
+	if (checkSuggestPriceTon
+		&& checkSuggestPriceTon > session->credits().tonBalance()) {
+		using namespace HistoryView;
+		show->show(
+			Box(Ui::InsufficientTonBox, session, checkSuggestPriceTon));
+		return false;
+	}
+	return true;
+}
+
+void SendPaymentHelper::clear() {
+	_lifetime.destroy();
+	_resend = nullptr;
 }
 
 void RequestDependentMessageItem(
@@ -198,6 +595,8 @@ TimeId NewMessageDate(const Api::SendOptions &options) {
 PeerId NewMessageFromId(const Api::SendAction &action) {
 	return action.options.sendAs
 		? action.options.sendAs->id
+		: action.history->peer->amMonoforumAdmin()
+		? action.history->peer->monoforumBroadcast()->id
 		: action.history->peer->amAnonymous()
 		? PeerId()
 		: action.history->session().userPeerId();
@@ -252,20 +651,27 @@ TextWithEntities DropDisallowedCustomEmoji(
 	if (to->session().premium() || to->isSelf()) {
 		return text;
 	}
+	const auto isLocalIconEmoji = [](const EntityInText &entity) {
+		return entity.data().startsWith(u"icon-emoji-"_q);
+	};
 	const auto channel = to->asMegagroup();
 	const auto allowSetId = channel ? channel->mgInfo->emojiSet.id : 0;
 	if (!allowSetId) {
+		const auto predicate = [&](const EntityInText &entity) {
+			return (entity.type() == EntityType::CustomEmoji)
+				&& !isLocalIconEmoji(entity);
+		};
 		text.entities.erase(
-			ranges::remove(
-				text.entities,
-				EntityType::CustomEmoji,
-				&EntityInText::type),
+			ranges::remove_if(text.entities, predicate),
 			text.entities.end());
 	} else {
 		const auto predicate = [&](const EntityInText &entity) {
 			if (entity.type() != EntityType::CustomEmoji) {
 				return false;
 			}
+			if (isLocalIconEmoji(entity)) {
+				return false;
+			}
 			if (const auto id = Data::ParseCustomEmojiData(entity.data())) {
 				const auto document = to->owner().document(id);
 				if (const auto sticker = document->sticker()) {
@@ -326,22 +732,19 @@ bool IsItemScheduledUntilOnline(not_null<const HistoryItem*> item) {
 ClickHandlerPtr JumpToMessageClickHandler(
 		not_null<HistoryItem*> item,
 		FullMsgId returnToId,
-		TextWithEntities highlightPart,
-		int highlightPartOffsetHint) {
+		MessageHighlightId highlight) {
 	return JumpToMessageClickHandler(
 		item->history()->peer,
 		item->id,
 		returnToId,
-		std::move(highlightPart),
-		highlightPartOffsetHint);
+		std::move(highlight));
 }
 
 ClickHandlerPtr JumpToMessageClickHandler(
 		not_null<PeerData*> peer,
 		MsgId msgId,
 		FullMsgId returnToId,
-		TextWithEntities highlightPart,
-		int highlightPartOffsetHint) {
+		MessageHighlightId highlight) {
 	return std::make_shared<LambdaClickHandler>([=] {
 		const auto separate = Core::App().separateWindowFor(peer);
 		const auto controller = separate
@@ -349,10 +752,10 @@ ClickHandlerPtr JumpToMessageClickHandler(
 			: peer->session().tryResolveWindow(peer);
 		if (controller) {
 			auto params = Window::SectionShow{
-				Window::SectionShow::Way::Forward
+				Window::SectionShow::Way::Forward,
 			};
-			params.highlightPart = highlightPart;
-			params.highlightPartOffsetHint = highlightPartOffsetHint;
+			params.highlight = highlight;
+			params.allowDuplicateInStack = true;
 			params.origin = Window::SectionShow::OriginMessage{
 				returnToId
 			};
@@ -394,7 +797,8 @@ ClickHandlerPtr HideSponsoredClickHandler() {
 			if (session.premium()) {
 				using Result = Data::SponsoredReportResult;
 				session.sponsoredMessages().createReportCallback(
-					my.itemId)(Result::Id("-1"), [](const auto &) {});
+					my.itemId
+				).callback(Result::Id("-1"), [](const auto &) {});
 			} else {
 				ShowPremiumPreviewBox(controller, PremiumFeature::NoAds);
 			}
@@ -409,11 +813,21 @@ ClickHandlerPtr ReportSponsoredClickHandler(not_null<HistoryItem*> item) {
 			Menu::ShowSponsored(
 				controller->widget(),
 				controller->uiShow(),
-				item);
+				item->fullId());
+		}
+	});
+}
+
+ClickHandlerPtr AboutSponsoredClickHandler() {
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		const auto my = context.other.value<ClickHandlerContext>();
+		if (const auto controller = my.sessionWindow.get()) {
+			Menu::ShowSponsoredAbout(controller->uiShow(), my.itemId);
 		}
 	});
 }
 
+
 MessageFlags FlagsFromMTP(
 		MsgId id,
 		MTPDmessage::Flags flags,
@@ -441,7 +855,21 @@ MessageFlags FlagsFromMTP(
 			: Flag())
 		| ((flags & MTP::f_views) ? Flag::HasViews : Flag())
 		| ((flags & MTP::f_noforwards) ? Flag::NoForwards : Flag())
-		| ((flags & MTP::f_invert_media) ? Flag::InvertMedia : Flag());
+		| ((flags & MTP::f_invert_media) ? Flag::InvertMedia : Flag())
+		| ((flags & MTP::f_video_processing_pending)
+			? Flag::EstimatedDate
+			: Flag())
+		| ((flags & MTP::f_paid_suggested_post_ton)
+			? Flag::TonPaidSuggested
+			: (flags & MTP::f_paid_suggested_post_stars)
+			? Flag::StarsPaidSuggested
+			: Flag())
+		| ((flags & MTP::f_summary_from_language)
+			? Flag::CanBeSummarized
+			: Flag())
+		| ((flags & MTP::f_guestchat_via_from)
+			? Flag::GuestChatViaFrom
+			: Flag());
 }
 
 MessageFlags FlagsFromMTP(
@@ -459,7 +887,10 @@ MessageFlags FlagsFromMTP(
 		| ((flags & MTP::f_post) ? Flag::Post : Flag())
 		| ((flags & MTP::f_legacy) ? Flag::Legacy : Flag())
 		| ((flags & MTP::f_from_id) ? Flag::HasFromId : Flag())
-		| ((flags & MTP::f_reply_to) ? Flag::HasReplyInfo : Flag());
+		| ((flags & MTP::f_reply_to) ? Flag::HasReplyInfo : Flag())
+		| ((flags & MTP::f_reactions_are_possible)
+			? Flag::ReactionsAllowed
+			: Flag());
 }
 
 MTPMessageReplyHeader NewMessageReplyHeader(const Api::SendAction &action) {
@@ -475,6 +906,8 @@ MTPMessageReplyHeader NewMessageReplyHeader(const Api::SendAction &action) {
 			? PeerId()
 			: replyTo.messageId.peer;
 		const auto replyToTop = LookupReplyToTop(action.history, replyTo);
+		const auto topicPost = replyTo.topicRootId
+			&& (replyTo.topicRootId != Data::ForumTopic::kGeneralId);
 		auto quoteEntities = Api::EntitiesToMTP(
 			&action.history->session(),
 			replyTo.quote.entities,
@@ -490,7 +923,12 @@ MTPMessageReplyHeader NewMessageReplyHeader(const Api::SendAction &action) {
 						| Flag::f_quote_offset))
 				| (quoteEntities.v.empty()
 					? Flag()
-					: Flag::f_quote_entities)),
+					: Flag::f_quote_entities)
+				| (replyTo.todoItemId ? Flag::f_todo_item_id : Flag())
+				| (replyTo.pollOption.isEmpty()
+					? Flag()
+					: Flag::f_poll_option)
+				| (topicPost ? Flag::f_forum_topic : Flag())),
 			MTP_int(replyTo.messageId.msg),
 			peerToMTP(externalPeerId),
 			MTPMessageFwdHeader(), // reply_from
@@ -498,7 +936,9 @@ MTPMessageReplyHeader NewMessageReplyHeader(const Api::SendAction &action) {
 			MTP_int(replyToTop),
 			MTP_string(replyTo.quote.text),
 			quoteEntities,
-			MTP_int(replyTo.quoteOffset));
+			MTP_int(replyTo.quoteOffset),
+			MTP_int(replyTo.todoItemId),
+			MTP_bytes(replyTo.pollOption));
 	}
 	return MTPMessageReplyHeader();
 }
@@ -573,6 +1013,8 @@ MediaCheckResult CheckMessageMedia(const MTPMessageMedia &media) {
 		return Result::Good;
 	}, [](const MTPDmessageMediaPoll &) {
 		return Result::Good;
+	}, [](const MTPDmessageMediaToDo &) {
+		return Result::Good;
 	}, [](const MTPDmessageMediaDice &) {
 		return Result::Good;
 	}, [](const MTPDmessageMediaStory &data) {
@@ -585,6 +1027,8 @@ MediaCheckResult CheckMessageMedia(const MTPMessageMedia &media) {
 		return Result::Good;
 	}, [](const MTPDmessageMediaPaidMedia &) {
 		return Result::Good;
+	}, [](const MTPDmessageMediaVideoStream &) {
+		return Result::Good;
 	}, [](const MTPDmessageMediaUnsupported &) {
 		return Result::Unsupported;
 	});
@@ -593,6 +1037,8 @@ MediaCheckResult CheckMessageMedia(const MTPMessageMedia &media) {
 [[nodiscard]] CallId CallIdFromInput(const MTPInputGroupCall &data) {
 	return data.match([&](const MTPDinputGroupCall &data) {
 		return data.vid().v;
+	}, [](const auto &) -> CallId {
+		Unexpected("slug/msg in CallIdFromInput.");
 	});
 }
 
@@ -619,14 +1065,14 @@ PreparedServiceText GenerateJoinedText(
 			: tr::lng_action_add_you)(
 				tr::now,
 				lt_from,
-				Ui::Text::Link(inviter->name(), QString()),
-				Ui::Text::WithEntities);
+				tr::link(inviter->name(), QString()),
+				tr::marked);
 		return result;
 	} else if (history->peer->isMegagroup()) {
 		if (viaRequest) {
 			return { tr::lng_action_you_joined_by_request(
 				tr::now,
-				Ui::Text::WithEntities) };
+				tr::marked) };
 		}
 		auto self = history->session().user();
 		auto result = PreparedServiceText();
@@ -634,15 +1080,15 @@ PreparedServiceText GenerateJoinedText(
 		result.text = tr::lng_action_user_joined(
 			tr::now,
 			lt_from,
-			Ui::Text::Link(self->name(), QString()),
-			Ui::Text::WithEntities);
+			tr::link(self->name(), QString()),
+			tr::marked);
 		return result;
 	}
 	return { viaRequest
 		? tr::lng_action_you_joined_by_request_channel(
 			tr::now,
-			Ui::Text::WithEntities)
-		: tr::lng_action_you_joined(tr::now, Ui::Text::WithEntities) };
+			tr::marked)
+		: tr::lng_action_you_joined(tr::now, tr::marked) };
 }
 
 not_null<HistoryItem*> GenerateJoinedMessage(
@@ -747,15 +1193,22 @@ void CheckReactionNotificationSchedule(
 	if (!item->hasUnreadReaction()) {
 		return;
 	}
+	const auto from = item->history()->session().api()
+		.reactionsNotifySettings().messagesFromCurrent();
+	if (from == Api::ReactionsNotifyFrom::None) {
+		return;
+	}
 	for (const auto &[emoji, reactions] : item->recentReactions()) {
 		for (const auto &reaction : reactions) {
 			if (!reaction.unread) {
 				continue;
 			}
 			const auto user = reaction.peer->asUser();
-			if (!user
-				|| !user->isContact()
-				|| ranges::contains(wasUsers, user)) {
+			if (!user || ranges::contains(wasUsers, user)) {
+				continue;
+			}
+			if (from == Api::ReactionsNotifyFrom::Contacts
+				&& !user->isContact()) {
 				continue;
 			}
 			using Status = PeerData::BlockStatus;
@@ -764,7 +1217,7 @@ void CheckReactionNotificationSchedule(
 			}
 			const auto notification = Data::ItemNotification{
 				.item = item,
-				.reactionSender = user,
+				.reactionOrVoteSender = user,
 				.type = Data::ItemNotificationType::Reaction,
 			};
 			item->notificationThread()->pushNotification(notification);
@@ -774,6 +1227,45 @@ void CheckReactionNotificationSchedule(
 	}
 }
 
+void CheckPollVoteNotificationSchedule(
+		not_null<HistoryItem*> item,
+		const std::vector<not_null<PeerData*>> &wasRecentVoters) {
+	const auto media = item->media();
+	const auto poll = media ? media->poll() : nullptr;
+	if (!poll || !poll->creator()) {
+		return;
+	}
+	const auto from = item->history()->session().api()
+		.reactionsNotifySettings().pollVotesFromCurrent();
+	if (from == Api::ReactionsNotifyFrom::None) {
+		return;
+	}
+	for (const auto &answer : poll->answers) {
+		for (const auto &voter : answer.recentVoters) {
+			const auto user = voter->asUser();
+			if (!user || ranges::contains(wasRecentVoters, voter)) {
+				continue;
+			}
+			if (from == Api::ReactionsNotifyFrom::Contacts
+				&& !user->isContact()) {
+				continue;
+			}
+			using Status = PeerData::BlockStatus;
+			if (user->blockStatus() == Status::Unknown) {
+				user->updateFull();
+			}
+			const auto notification = Data::ItemNotification{
+				.item = item,
+				.reactionOrVoteSender = user,
+				.type = Data::ItemNotificationType::PollVote,
+			};
+			item->notificationThread()->pushNotification(notification);
+			Core::App().notifications().schedule(notification);
+			return;
+		}
+	}
+}
+
 [[nodiscard]] MessageFlags NewForwardedFlags(
 		not_null<PeerData*> peer,
 		PeerId from,
@@ -835,6 +1327,20 @@ void CheckReactionNotificationSchedule(
 	return result;
 }
 
+HistoryMessageMarkupData UnsupportedMessageMarkup() {
+	using Button = HistoryMessageMarkupButton;
+	auto markup = HistoryMessageMarkupData();
+	markup.flags = ReplyMarkupFlag::Inline;
+	auto row = std::vector<Button>();
+	row.emplace_back(
+		Button::Type::Url,
+		tr::lng_update_telegram(tr::now),
+		Button::Visual(),
+		QByteArray("https://desktop.telegram.org"));
+	markup.rows.push_back(std::move(row));
+	return markup;
+}
+
 void ShowTrialTranscribesToast(int left, TimeId until) {
 	const auto window = Core::App().activeWindow();
 	if (!window) {
@@ -856,14 +1362,14 @@ void ShowTrialTranscribesToast(int left, TimeId until) {
 			left,
 			lt_date,
 			{ date },
-			Ui::Text::WithEntities)
+			tr::marked)
 		: tr::lng_audio_transcribe_trials_over(
 			tr::now,
 			lt_date,
-			Ui::Text::Bold(date),
+			tr::bold(date),
 			lt_link,
-			Ui::Text::Link(tr::lng_settings_privacy_premium_link(tr::now)),
-			Ui::Text::WithEntities);
+			tr::link(tr::lng_settings_privacy_premium_link(tr::now)),
+			tr::marked);
 	window->uiShow()->showToast(Ui::Toast::Config{
 		.text = text,
 		.filter = filter,
@@ -871,30 +1377,6 @@ void ShowTrialTranscribesToast(int left, TimeId until) {
 	});
 }
 
-void ClearMediaAsExpired(not_null<HistoryItem*> item) {
-	if (const auto media = item->media()) {
-		if (!media->ttlSeconds()) {
-			return;
-		}
-		if (const auto document = media->document()) {
-			item->applyEditionToHistoryCleared();
-			auto text = (document->isVideoFile()
-				? tr::lng_ttl_video_expired
-				: document->isVoiceMessage()
-				? tr::lng_ttl_voice_expired
-				: document->isVideoMessage()
-				? tr::lng_ttl_round_expired
-				: tr::lng_message_empty)(tr::now, Ui::Text::WithEntities);
-			item->updateServiceText(PreparedServiceText{ std::move(text) });
-		} else if (const auto photo = media->photo()) {
-			item->applyEditionToHistoryCleared();
-			item->updateServiceText(PreparedServiceText{
-				tr::lng_ttl_photo_expired(tr::now, Ui::Text::WithEntities)
-			});
-		}
-	}
-}
-
 int ItemsForwardSendersCount(const HistoryItemsList &list) {
 	auto peers = base::flat_set<not_null<PeerData*>>();
 	auto names = base::flat_set<QString>();
@@ -912,8 +1394,10 @@ int ItemsForwardCaptionsCount(const HistoryItemsList &list) {
 	auto result = 0;
 	for (const auto &item : list) {
 		if (const auto media = item->media()) {
-			if (!item->originalText().text.isEmpty()
-				&& media->allowsEditCaption()) {
+			const auto hasCaption = !item->originalText().text.isEmpty()
+				|| !media->consumedMessageText().text.isEmpty();
+			if (hasCaption
+				&& (media->allowsEditCaption() || media->poll())) {
 				++result;
 			}
 		}
diff --git a/Telegram/SourceFiles/history/history_item_helpers.h b/Telegram/SourceFiles/history/history_item_helpers.h
index dd5121dbed971f..7edd068c5b315d 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.h
+++ b/Telegram/SourceFiles/history/history_item_helpers.h
@@ -7,22 +7,46 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/object_ptr.h"
+
 class History;
 
+namespace style {
+struct FlatLabel;
+struct Checkbox;
+} // namespace style
+
 namespace Api {
 struct SendOptions;
 struct SendAction;
 } // namespace Api
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Data {
 class Story;
 class Thread;
+struct SendError;
+struct SendErrorWithThread;
 } // namespace Data
 
 namespace Main {
 class Session;
+class SessionShow;
 } // namespace Main
 
+namespace Ui {
+class BoxContent;
+} // namespace Ui
+
+namespace Window {
+class SessionNavigation;
+} // namespace Window
+
+struct HistoryMessageMarkupData;
+
 struct PreparedServiceText {
 	TextWithEntities text;
 	std::vector<ClickHandlerPtr> links;
@@ -62,6 +86,9 @@ using OnStackUsers = std::array<UserData*, kMaxUnreadReactions>;
 void CheckReactionNotificationSchedule(
 	not_null<HistoryItem*> item,
 	const OnStackUsers &wasUsers);
+void CheckPollVoteNotificationSchedule(
+	not_null<HistoryItem*> item,
+	const std::vector<not_null<PeerData*>> &wasRecentVoters);
 [[nodiscard]] MessageFlags NewForwardedFlags(
 	not_null<PeerData*> peer,
 	PeerId from,
@@ -73,6 +100,7 @@ void CheckReactionNotificationSchedule(
 [[nodiscard]] TextWithEntities EnsureNonEmpty(
 	const TextWithEntities &text = TextWithEntities());
 [[nodiscard]] TextWithEntities UnsupportedMessageText();
+[[nodiscard]] HistoryMessageMarkupData UnsupportedMessageMarkup();
 
 void RequestDependentMessageItem(
 	not_null<HistoryItem*> item,
@@ -106,15 +134,89 @@ struct SendingErrorRequest {
 	const HistoryItemsList *forward = nullptr;
 	const Data::Story *story = nullptr;
 	const TextWithTags *text = nullptr;
+	int messagesCount = 0;
 	bool ignoreSlowmodeCountdown = false;
 };
-[[nodiscard]] QString GetErrorTextForSending(
+[[nodiscard]] int ComputeSendingMessagesCount(
+	not_null<History*> history,
+	const SendingErrorRequest &request);
+[[nodiscard]] Data::SendError GetErrorForSending(
 	not_null<PeerData*> peer,
 	SendingErrorRequest request);
-[[nodiscard]] QString GetErrorTextForSending(
+[[nodiscard]] Data::SendError GetErrorForSending(
 	not_null<Data::Thread*> thread,
 	SendingErrorRequest request);
 
+struct SendPaymentDetails {
+	int messages = 0;
+	int stars = 0;
+};
+[[nodiscard]] std::optional<SendPaymentDetails> ComputePaymentDetails(
+	not_null<PeerData*> peer,
+	int messagesCount);
+
+[[nodiscard]] bool SuggestPaymentDataReady(
+	not_null<PeerData*> peer,
+	SuggestOptions suggest);
+
+struct PaidConfirmStyles {
+	const style::FlatLabel *label = nullptr;
+	const style::Checkbox *checkbox = nullptr;
+};
+void ShowSendPaidConfirm(
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	SendPaymentDetails details,
+	Fn<void()> confirmed,
+	PaidConfirmStyles styles = {},
+	int suggestStarsPrice = 0);
+void ShowSendPaidConfirm(
+	std::shared_ptr<Main::SessionShow> show,
+	not_null<PeerData*> peer,
+	SendPaymentDetails details,
+	Fn<void()> confirmed,
+	PaidConfirmStyles styles = {},
+	int suggestStarsPrice = 0);
+void ShowSendPaidConfirm(
+	std::shared_ptr<Main::SessionShow> show,
+	const std::vector<not_null<PeerData*>> &peers,
+	SendPaymentDetails details,
+	Fn<void()> confirmed,
+	PaidConfirmStyles styles = {},
+	int suggestStarsPrice = 0);
+
+class SendPaymentHelper final {
+public:
+	[[nodiscard]] bool check(
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		Api::SendOptions options,
+		int messagesCount,
+		Fn<void(int)> resend,
+		PaidConfirmStyles styles = {});
+	[[nodiscard]] bool check(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<PeerData*> peer,
+		Api::SendOptions options,
+		int messagesCount,
+		Fn<void(int)> resend,
+		PaidConfirmStyles styles = {});
+
+	void clear();
+
+private:
+	Fn<void()> _resend;
+	rpl::lifetime _lifetime;
+
+};
+
+[[nodiscard]] Data::SendErrorWithThread GetErrorForSending(
+	const std::vector<not_null<Data::Thread*>> &threads,
+	SendingErrorRequest request);
+[[nodiscard]] object_ptr<Ui::BoxContent> MakeSendErrorBox(
+	const Data::SendErrorWithThread &error,
+	bool withTitle);
+
 [[nodiscard]] TextWithEntities DropDisallowedCustomEmoji(
 	not_null<PeerData*> to,
 	TextWithEntities text);
@@ -133,13 +235,11 @@ struct SendingErrorRequest {
 	not_null<PeerData*> peer,
 	MsgId msgId,
 	FullMsgId returnToId = FullMsgId(),
-	TextWithEntities highlightPart = {},
-	int highlightPartOffsetHint = 0);
+	MessageHighlightId highlight = {});
 [[nodiscard]] ClickHandlerPtr JumpToMessageClickHandler(
 	not_null<HistoryItem*> item,
 	FullMsgId returnToId = FullMsgId(),
-	TextWithEntities highlightPart = {},
-	int highlightPartOffsetHint = 0);
+	MessageHighlightId highlight = {});
 [[nodiscard]] ClickHandlerPtr JumpToStoryClickHandler(
 	not_null<Data::Story*> story);
 ClickHandlerPtr JumpToStoryClickHandler(
@@ -148,6 +248,7 @@ ClickHandlerPtr JumpToStoryClickHandler(
 [[nodiscard]] ClickHandlerPtr HideSponsoredClickHandler();
 [[nodiscard]] ClickHandlerPtr ReportSponsoredClickHandler(
 	not_null<HistoryItem*> item);
+[[nodiscard]] ClickHandlerPtr AboutSponsoredClickHandler();
 
 [[nodiscard]] not_null<HistoryItem*> GenerateJoinedMessage(
 	not_null<History*> history,
@@ -167,7 +268,5 @@ ClickHandlerPtr JumpToStoryClickHandler(
 
 void ShowTrialTranscribesToast(int left, TimeId until);
 
-void ClearMediaAsExpired(not_null<HistoryItem*> item);
-
 [[nodiscard]] int ItemsForwardSendersCount(const HistoryItemsList &list);
 [[nodiscard]] int ItemsForwardCaptionsCount(const HistoryItemsList &list);
diff --git a/Telegram/SourceFiles/history/history_item_reply_markup.cpp b/Telegram/SourceFiles/history/history_item_reply_markup.cpp
index 5cd532ad5e8f98..92c75259b32b69 100644
--- a/Telegram/SourceFiles/history/history_item_reply_markup.cpp
+++ b/Telegram/SourceFiles/history/history_item_reply_markup.cpp
@@ -12,31 +12,35 @@ For license and copyright information please follow this link:
 #include "history/history_item_components.h"
 #include "inline_bots/bot_attach_web_view.h"
 
+#include <QtCore/QDataStream>
+
 namespace {
 
-[[nodiscard]] InlineBots::PeerTypes PeerTypesFromMTP(
-		const MTPvector<MTPInlineQueryPeerType> &types) {
-	using namespace InlineBots;
-	auto result = PeerTypes(0);
-	for (const auto &type : types.v) {
-		result |= type.match([&](const MTPDinlineQueryPeerTypePM &data) {
-			return PeerType::User;
-		}, [&](const MTPDinlineQueryPeerTypeChat &data) {
-			return PeerType::Group;
-		}, [&](const MTPDinlineQueryPeerTypeMegagroup &data) {
-			return PeerType::Group;
-		}, [&](const MTPDinlineQueryPeerTypeBroadcast &data) {
-			return PeerType::Broadcast;
-		}, [&](const MTPDinlineQueryPeerTypeBotPM &data) {
-			return PeerType::Bot;
-		}, [&](const MTPDinlineQueryPeerTypeSameBotPM &data) {
-			return PeerType();
-		});
+[[nodiscard]] HistoryMessageMarkupButton::Visual ParseVisual(
+		const tl::conditional<MTPKeyboardButtonStyle> &style) {
+	if (!style) {
+		return {};
 	}
-	return result;
+	using Color = HistoryMessageMarkupButton::Color;
+	const auto &data = style->data();
+	if (data.vicon()) {
+		[[maybe_unused]] int a = 0;
+	}
+	return {
+		.iconId = data.vicon().value_or_empty(),
+		.color = (data.is_bg_danger()
+			? Color::Danger
+			: data.is_bg_primary()
+			? Color::Primary
+			: data.is_bg_success()
+			? Color::Success
+			: Color::Normal),
+	};
 }
 
-[[nodiscard]] RequestPeerQuery RequestPeerQueryFromTL(
+} // namespace
+
+RequestPeerQuery RequestPeerQueryFromTL(
 		const MTPDkeyboardButtonRequestPeer &query) {
 	using Type = RequestPeerQuery::Type;
 	using Restriction = RequestPeerQuery::Restriction;
@@ -70,19 +74,42 @@ namespace {
 		result.hasUsername = restriction(data.vhas_username());
 		result.myRights = rights(data.vuser_admin_rights());
 		result.botRights = rights(data.vbot_admin_rights());
+	}, [](const MTPDrequestPeerTypeCreateBot &) {
 	});
 	return result;
 }
 
-} // namespace
+InlineBots::PeerTypes PeerTypesFromMTP(
+		const MTPvector<MTPInlineQueryPeerType> &types) {
+	using namespace InlineBots;
+	auto result = PeerTypes(0);
+	for (const auto &type : types.v) {
+		result |= type.match([&](const MTPDinlineQueryPeerTypePM &data) {
+			return PeerType::User;
+		}, [&](const MTPDinlineQueryPeerTypeChat &data) {
+			return PeerType::Group;
+		}, [&](const MTPDinlineQueryPeerTypeMegagroup &data) {
+			return PeerType::Group;
+		}, [&](const MTPDinlineQueryPeerTypeBroadcast &data) {
+			return PeerType::Broadcast;
+		}, [&](const MTPDinlineQueryPeerTypeBotPM &data) {
+			return PeerType::Bot;
+		}, [&](const MTPDinlineQueryPeerTypeSameBotPM &data) {
+			return PeerType();
+		});
+	}
+	return result;
+}
 
 HistoryMessageMarkupButton::HistoryMessageMarkupButton(
 	Type type,
 	const QString &text,
+	Visual visual,
 	const QByteArray &data,
 	const QString &forwardText,
 	int64 buttonId)
 : type(type)
+, visual(visual)
 , text(text)
 , forwardText(forwardText)
 , data(data)
@@ -122,38 +149,76 @@ void HistoryMessageMarkupData::fillRows(
 			row.reserve(data.vbuttons().v.size());
 			for (const auto &button : data.vbuttons().v) {
 				button.match([&](const MTPDkeyboardButton &data) {
-					row.emplace_back(Type::Default, qs(data.vtext()));
+					row.emplace_back(
+						Type::Default,
+						qs(data.vtext()),
+						ParseVisual(data.vstyle()));
 				}, [&](const MTPDkeyboardButtonCallback &data) {
 					row.emplace_back(
 						(data.is_requires_password()
 							? Type::CallbackWithPassword
 							: Type::Callback),
 						qs(data.vtext()),
+						ParseVisual(data.vstyle()),
 						qba(data.vdata()));
 				}, [&](const MTPDkeyboardButtonRequestGeoLocation &data) {
-					row.emplace_back(Type::RequestLocation, qs(data.vtext()));
+					row.emplace_back(
+						Type::RequestLocation,
+						qs(data.vtext()),
+						ParseVisual(data.vstyle()));
 				}, [&](const MTPDkeyboardButtonRequestPhone &data) {
-					row.emplace_back(Type::RequestPhone, qs(data.vtext()));
-				}, [&](const MTPDkeyboardButtonRequestPeer &data) {
-					const auto query = RequestPeerQueryFromTL(data);
 					row.emplace_back(
-						Type::RequestPeer,
+						Type::RequestPhone,
 						qs(data.vtext()),
-						QByteArray(
-							reinterpret_cast<const char*>(&query),
-							sizeof(query)),
-						QString(),
-						int64(data.vbutton_id().v));
+						ParseVisual(data.vstyle()));
+				}, [&](const MTPDkeyboardButtonRequestPeer &data) {
+					data.vpeer_type().match([&](
+							const MTPDrequestPeerTypeCreateBot &createData) {
+						auto serialized = QByteArray();
+						{
+							auto stream = QDataStream(
+								&serialized,
+								QIODevice::WriteOnly);
+							stream
+								<< qs(createData.vsuggested_name()
+									.value_or_empty())
+								<< qs(createData.vsuggested_username()
+									.value_or_empty());
+						}
+						row.emplace_back(
+							Type::CreateBot,
+							qs(data.vtext()),
+							ParseVisual(data.vstyle()),
+							serialized,
+							QString(),
+							int64(data.vbutton_id().v));
+					}, [&](const auto &) {
+						const auto query = RequestPeerQueryFromTL(data);
+						row.emplace_back(
+							Type::RequestPeer,
+							qs(data.vtext()),
+							ParseVisual(data.vstyle()),
+							QByteArray(
+								reinterpret_cast<const char*>(&query),
+								sizeof(query)),
+							QString(),
+							int64(data.vbutton_id().v));
+					});
 				}, [&](const MTPDkeyboardButtonUrl &data) {
 					row.emplace_back(
 						Type::Url,
 						qs(data.vtext()),
+						ParseVisual(data.vstyle()),
 						qba(data.vurl()));
 				}, [&](const MTPDkeyboardButtonSwitchInline &data) {
 					const auto type = data.is_same_peer()
 						? Type::SwitchInlineSame
 						: Type::SwitchInline;
-					row.emplace_back(type, qs(data.vtext()), qba(data.vquery()));
+					row.emplace_back(
+						type,
+						qs(data.vtext()),
+						ParseVisual(data.vstyle()),
+						qba(data.vquery()));
 					if (type == Type::SwitchInline) {
 						// Optimization flag.
 						// Fast check on all new messages if there is a switch button to auto-click it.
@@ -163,13 +228,20 @@ void HistoryMessageMarkupData::fillRows(
 						}
 					}
 				}, [&](const MTPDkeyboardButtonGame &data) {
-					row.emplace_back(Type::Game, qs(data.vtext()));
+					row.emplace_back(
+						Type::Game,
+						qs(data.vtext()),
+						ParseVisual(data.vstyle()));
 				}, [&](const MTPDkeyboardButtonBuy &data) {
-					row.emplace_back(Type::Buy, qs(data.vtext()));
+					row.emplace_back(
+						Type::Buy,
+						qs(data.vtext()),
+						ParseVisual(data.vstyle()));
 				}, [&](const MTPDkeyboardButtonUrlAuth &data) {
 					row.emplace_back(
 						Type::Auth,
 						qs(data.vtext()),
+						ParseVisual(data.vstyle()),
 						qba(data.vurl()),
 						qs(data.vfwd_text().value_or_empty()),
 						data.vbutton_id().v);
@@ -187,11 +259,13 @@ void HistoryMessageMarkupData::fillRows(
 					row.emplace_back(
 						Type::RequestPoll,
 						qs(data.vtext()),
+						ParseVisual(data.vstyle()),
 						quiz);
 				}, [&](const MTPDkeyboardButtonUserProfile &data) {
 					row.emplace_back(
 						Type::UserProfile,
 						qs(data.vtext()),
+						ParseVisual(data.vstyle()),
 						QByteArray::number(data.vuser_id().v));
 				}, [&](const MTPDinputKeyboardButtonUrlAuth &data) {
 					LOG(("API Error: inputKeyboardButtonUrlAuth."));
@@ -203,16 +277,19 @@ void HistoryMessageMarkupData::fillRows(
 					row.emplace_back(
 						Type::WebView,
 						qs(data.vtext()),
+						ParseVisual(data.vstyle()),
 						data.vurl().v);
 				}, [&](const MTPDkeyboardButtonSimpleWebView &data) {
 					row.emplace_back(
 						Type::SimpleWebView,
 						qs(data.vtext()),
+						ParseVisual(data.vstyle()),
 						data.vurl().v);
 				}, [&](const MTPDkeyboardButtonCopy &data) {
 					row.emplace_back(
 						Type::CopyText,
 						qs(data.vtext()),
+						ParseVisual(data.vstyle()),
 						data.vcopy_text().v);
 				}, [&](const MTPDinputKeyboardButtonRequestPeer &data) {
 					LOG(("API Error: inputKeyboardButtonRequestPeer."));
@@ -283,6 +360,7 @@ void HistoryMessageMarkupData::fillForwardedData(
 			row.emplace_back(
 				newType,
 				text,
+				button.visual,
 				button.data,
 				QString(),
 				button.buttonId);
@@ -312,7 +390,7 @@ HistoryMessageRepliesData::HistoryMessageRepliesData(
 	if (!data) {
 		return;
 	}
-	const auto &fields = data->c_messageReplies();
+	const auto &fields = data->data();
 	if (const auto list = fields.vrecent_repliers()) {
 		recentRepliers.reserve(list->v.size());
 		for (const auto &id : list->v) {
@@ -326,3 +404,31 @@ HistoryMessageRepliesData::HistoryMessageRepliesData(
 	isNull = false;
 	pts = fields.vreplies_pts().v;
 }
+
+HistoryMessageSuggestInfo::HistoryMessageSuggestInfo(
+		const MTPSuggestedPost *data) {
+	if (!data) {
+		return;
+	}
+	const auto &fields = data->data();
+	price = CreditsAmountFromTL(fields.vprice());
+	date = fields.vschedule_date().value_or_empty();
+	accepted = fields.is_accepted();
+	rejected = fields.is_rejected();
+	exists = true;
+}
+
+HistoryMessageSuggestInfo::HistoryMessageSuggestInfo(
+	const Api::SendOptions &options)
+: HistoryMessageSuggestInfo(options.suggest) {
+}
+
+HistoryMessageSuggestInfo::HistoryMessageSuggestInfo(
+		SuggestOptions options) {
+	if (!options.exists) {
+		return;
+	}
+	price = options.price();
+	date = options.date;
+	exists = true;
+}
diff --git a/Telegram/SourceFiles/history/history_item_reply_markup.h b/Telegram/SourceFiles/history/history_item_reply_markup.h
index 8d1d4e937734cd..8df3597074c19f 100644
--- a/Telegram/SourceFiles/history/history_item_reply_markup.h
+++ b/Telegram/SourceFiles/history/history_item_reply_markup.h
@@ -10,6 +10,10 @@ For license and copyright information please follow this link:
 #include "base/flags.h"
 #include "data/data_chat_participant_status.h"
 
+namespace Api {
+struct SendOptions;
+} // namespace Api
+
 namespace Data {
 class Session;
 } // namespace Data
@@ -19,6 +23,9 @@ enum class PeerType : uint8;
 using PeerTypes = base::flags<PeerType>;
 } // namespace InlineBots
 
+[[nodiscard]] InlineBots::PeerTypes PeerTypesFromMTP(
+	const MTPvector<MTPInlineQueryPeerType> &types);
+
 enum class ReplyMarkupFlag : uint32 {
 	None                  = (1U << 0),
 	ForceReply            = (1U << 1),
@@ -30,6 +37,9 @@ enum class ReplyMarkupFlag : uint32 {
 	IsNull                = (1U << 7),
 	OnlyBuyButton         = (1U << 8),
 	Persistent            = (1U << 9),
+	SuggestionDecline     = (1U << 10),
+	SuggestionAccept      = (1U << 11),
+	SuggestionSeparator   = (1U << 12),
 };
 inline constexpr bool is_flag_type(ReplyMarkupFlag) { return true; }
 using ReplyMarkupFlags = base::flags<ReplyMarkupFlag>;
@@ -59,8 +69,13 @@ struct RequestPeerQuery {
 };
 static_assert(std::is_trivially_copy_assignable_v<RequestPeerQuery>);
 
+class MTPDkeyboardButtonRequestPeer;
+
+[[nodiscard]] RequestPeerQuery RequestPeerQueryFromTL(
+	const MTPDkeyboardButtonRequestPeer &query);
+
 struct HistoryMessageMarkupButton {
-	enum class Type {
+	enum class Type : uchar {
 		Default,
 		Url,
 		Callback,
@@ -78,11 +93,29 @@ struct HistoryMessageMarkupButton {
 		WebView,
 		SimpleWebView,
 		CopyText,
+
+		SuggestDecline,
+		SuggestAccept,
+		SuggestChange,
+		CreateBot,
+	};
+
+	enum class Color : uchar {
+		Normal,
+		Primary,
+		Danger,
+		Success,
+	};
+
+	struct Visual {
+		DocumentId iconId = 0;
+		Color color = Color::Normal;
 	};
 
 	HistoryMessageMarkupButton(
 		Type type,
 		const QString &text,
+		Visual visual,
 		const QByteArray &data = QByteArray(),
 		const QString &forwardText = QString(),
 		int64 buttonId = 0);
@@ -94,6 +127,7 @@ struct HistoryMessageMarkupButton {
 		int column);
 
 	Type type;
+	Visual visual;
 	QString text, forwardText;
 	QByteArray data;
 	int64 buttonId = 0;
@@ -133,3 +167,16 @@ struct HistoryMessageRepliesData {
 	bool isNull = true;
 	int pts = 0;
 };
+
+struct HistoryMessageSuggestInfo {
+	HistoryMessageSuggestInfo() = default;
+	explicit HistoryMessageSuggestInfo(const MTPSuggestedPost *data);
+	explicit HistoryMessageSuggestInfo(const Api::SendOptions &options);
+	explicit HistoryMessageSuggestInfo(SuggestOptions options);
+
+	CreditsAmount price;
+	TimeId date = 0;
+	bool accepted = false;
+	bool rejected = false;
+	bool exists = false;
+};
diff --git a/Telegram/SourceFiles/history/history_item_text.cpp b/Telegram/SourceFiles/history/history_item_text.cpp
index ba35168cfe3cc0..be6b59aa6a54d0 100644
--- a/Telegram/SourceFiles/history/history_item_text.cpp
+++ b/Telegram/SourceFiles/history/history_item_text.cpp
@@ -7,70 +7,365 @@ For license and copyright information please follow this link:
 */
 #include "history/history_item_text.h"
 
-#include "history/history_item.h"
-#include "history/history_item_components.h"
-#include "data/data_media_types.h"
-#include "data/data_web_page.h"
 #include "data/data_groups.h"
+#include "data/data_media_types.h"
 #include "data/data_peer.h"
+#include "data/data_poll.h"
+#include "data/data_session.h"
+#include "data/data_story.h"
+#include "data/data_todo_list.h"
+#include "data/data_web_page.h"
+#include "history/history.h"
+#include "history/view/history_view_item_preview.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
+#include "history/history_item_helpers.h"
 #include "lang/lang_keys.h"
+#include "ui/text/text.h"
+#include "ui/text/text_entity.h"
 #include "ui/text/text_options.h"
 
-TextForMimeData HistoryItemText(not_null<HistoryItem*> item) {
+namespace {
+
+constexpr auto kSelectedCopyReplyPreviewLimit = 64;
+
+TextForMimeData LogEntryOriginalText(not_null<HistoryItem*> item) {
+	const auto entry = item->Get<HistoryMessageLogEntryOriginal>();
+	if (!entry) {
+		return TextForMimeData();
+	}
+	const auto title = TextUtilities::SingleLine(
+		entry->page->title.isEmpty()
+			? entry->page->author
+			: entry->page->title);
+	auto titleResult = TextForMimeData::Rich(
+		TextUtilities::ParseEntities(
+			title,
+			Ui::WebpageTextTitleOptions().flags));
+	auto descriptionResult = TextForMimeData::Rich(
+		base::duplicate(entry->page->description));
+	if (titleResult.empty()) {
+		return descriptionResult;
+	} else if (descriptionResult.empty()) {
+		return titleResult;
+	}
+	titleResult.append('\n').append(std::move(descriptionResult));
+	return titleResult;
+}
+
+TextForMimeData FactcheckText(not_null<HistoryItem*> item) {
+	const auto factcheck = item->Get<HistoryMessageFactcheck>();
+	return factcheck
+		? TextForMimeData::Rich(base::duplicate(factcheck->data.text))
+		: TextForMimeData();
+}
+
+TextForMimeData AppendExtraCopyText(
+		not_null<HistoryItem*> item,
+		TextForMimeData &&result) {
+	auto logEntryOriginalResult = LogEntryOriginalText(item);
+	auto factcheckResult = FactcheckText(item);
+	if (result.empty()) {
+		result = std::move(logEntryOriginalResult);
+	} else if (!logEntryOriginalResult.empty()) {
+		result.append(u"\n\n"_q).append(std::move(logEntryOriginalResult));
+	}
+	if (result.empty()) {
+		result = std::move(factcheckResult);
+	} else if (!factcheckResult.empty()) {
+		result.append(u"\n\n"_q).append(std::move(factcheckResult));
+	}
+	return result;
+}
+
+TextForMimeData HistoryItemMainText(not_null<HistoryItem*> item) {
 	const auto media = item->media();
 
 	auto mediaResult = media ? media->clipboardText() : TextForMimeData();
 	auto textResult = mediaResult.empty()
 		? item->clipboardText()
 		: TextForMimeData();
-	auto logEntryOriginalResult = [&] {
-		const auto entry = item->Get<HistoryMessageLogEntryOriginal>();
-		if (!entry) {
-			return TextForMimeData();
-		}
-		const auto title = TextUtilities::SingleLine(
-			entry->page->title.isEmpty()
-				? entry->page->author
-				: entry->page->title);
-		auto titleResult = TextForMimeData::Rich(
-			TextUtilities::ParseEntities(
-				title,
-				Ui::WebpageTextTitleOptions().flags));
-		auto descriptionResult = TextForMimeData::Rich(
-			base::duplicate(entry->page->description));
-		if (titleResult.empty()) {
-			return descriptionResult;
-		} else if (descriptionResult.empty()) {
-			return titleResult;
-		}
-		titleResult.append('\n').append(std::move(descriptionResult));
-		return titleResult;
-	}();
-	auto factcheckResult = [&] {
-		const auto factcheck = item->Get<HistoryMessageFactcheck>();
-		return factcheck
-			? TextForMimeData::Rich(base::duplicate(factcheck->data.text))
-			: TextForMimeData();
-	}();
 	auto result = textResult;
 	if (result.empty()) {
 		result = std::move(mediaResult);
 	} else if (!mediaResult.empty()) {
 		result.append(qstr("\n\n")).append(std::move(mediaResult));
 	}
-	if (result.empty()) {
-		result = std::move(logEntryOriginalResult);
-	} else if (!logEntryOriginalResult.empty()) {
-		result.append(u"\n\n"_q).append(std::move(logEntryOriginalResult));
+	return result;
+}
+
+TextForMimeData BracketedSelectedCopyLabel(TextWithEntities label) {
+	label = TextUtilities::SingleLine(label);
+	if (label.empty()) {
+		return TextForMimeData();
 	}
-	if (result.empty()) {
-		result = std::move(factcheckResult);
-	} else if (!factcheckResult.empty()) {
-		result.append(u"\n\n"_q).append(std::move(factcheckResult));
+	auto result = TextWithEntities();
+	result
+		.append(u"[ "_q)
+		.append(std::move(label))
+		.append(u" ]"_q);
+	return TextForMimeData::Rich(std::move(result));
+}
+
+TextForMimeData SelectedCopyMediaLabel(not_null<Data::Media*> media) {
+	return BracketedSelectedCopyLabel(media->toPreview({
+		.hideSender = true,
+		.hideCaption = true,
+		.ignoreMessageText = true,
+		.generateImages = false,
+		.ignoreGroup = true,
+		.ignoreTopic = true,
+		.translated = true,
+	}).text);
+}
+
+bool UsesSelectedCopyPlaceholder(not_null<Data::Media*> media) {
+	if (media->webpage()) {
+		return false;
+	} else if (media->photo() || media->document()) {
+		return true;
+	} else if (const auto invoice = media->invoice()) {
+		return invoice->isPaidMedia && !invoice->extendedMedia.empty();
+	}
+	return false;
+}
+
+bool SelectedCopyMediaBeforeText(
+		not_null<HistoryItem*> item,
+		not_null<Data::Media*> media) {
+	auto result = !media->webpage() && !media->invoice();
+	if (item->invertMedia() && !item->emptyText()) {
+		result = !result;
+	}
+	return result;
+}
+
+TextForMimeData CombineSelectedCopyTextAndMedia(
+		TextForMimeData &&text,
+		TextForMimeData &&media,
+		bool mediaBeforeText) {
+	if (text.empty()) {
+		return std::move(media);
+	} else if (media.empty()) {
+		return std::move(text);
+	} else if (mediaBeforeText) {
+		media.append(u"\n\n"_q).append(std::move(text));
+		return std::move(media);
+	}
+	text.append(u"\n\n"_q).append(std::move(media));
+	return std::move(text);
+}
+
+struct SelectedCopyAlbumCounts {
+	int photos = 0;
+	int videos = 0;
+	int audios = 0;
+	int files = 0;
+};
+
+SelectedCopyAlbumCounts CountSelectedCopyAlbumMedia(
+		not_null<const Data::Group*> group) {
+	auto result = SelectedCopyAlbumCounts();
+	for (const auto &item : group->items) {
+		const auto media = item->media();
+		if (!media || media->webpage()) {
+			continue;
+		} else if (media->photo()) {
+			++result.photos;
+		} else if (const auto document = media->document()) {
+			(document->isVideoFile()
+				? result.videos
+				: document->isAudioFile()
+				? result.audios
+				: result.files)++;
+		}
 	}
 	return result;
 }
 
+TextForMimeData SelectedCopyAlbumLabel(SelectedCopyAlbumCounts counts) {
+	const auto medias = counts.photos + counts.videos;
+	const auto label = (counts.photos && counts.videos)
+		? tr::lng_in_dlg_media_count(tr::now, lt_count, medias)
+		: (counts.photos > 1)
+		? tr::lng_in_dlg_photo_count(tr::now, lt_count, counts.photos)
+		: counts.photos
+		? tr::lng_in_dlg_photo(tr::now)
+		: (counts.videos > 1)
+		? tr::lng_in_dlg_video_count(tr::now, lt_count, counts.videos)
+		: counts.videos
+		? tr::lng_in_dlg_video(tr::now)
+		: (counts.audios > 1)
+		? tr::lng_in_dlg_audio_count(tr::now, lt_count, counts.audios)
+		: counts.audios
+		? tr::lng_in_dlg_audio(tr::now)
+		: (counts.files > 1)
+		? tr::lng_in_dlg_file_count(tr::now, lt_count, counts.files)
+		: counts.files
+		? tr::lng_in_dlg_file(tr::now)
+		: tr::lng_in_dlg_album(tr::now);
+	return BracketedSelectedCopyLabel(TextWithEntities{ label });
+}
+
+struct SelectedCopyReplyContext {
+	QString senderName;
+	TextForMimeData quote;
+};
+
+QString ReplySenderNameForSelectedCopy(
+		not_null<HistoryItem*> item,
+		not_null<HistoryMessageReply*> reply) {
+	const auto &fields = reply->fields();
+	const auto message = reply->resolvedMessage.get();
+	if (const auto story = reply->resolvedStory.get()) {
+		return story->peer()->name();
+	} else if (!message) {
+		auto &owner = item->history()->owner();
+		if (fields.externalSenderId) {
+			const auto name = owner.peer(fields.externalSenderId)->name();
+			if (!name.isEmpty()) {
+				return name;
+			}
+		}
+		if (!fields.externalSenderName.isEmpty()) {
+			return fields.externalSenderName;
+		}
+	} else if (item->Has<HistoryMessageForwarded>()) {
+		const auto forwarded = message->Get<HistoryMessageForwarded>();
+		if (forwarded) {
+			if (forwarded->originalSender) {
+				return forwarded->originalSender->name();
+			} else if (forwarded->originalHiddenSenderInfo) {
+				return forwarded->originalHiddenSenderInfo->name;
+			}
+		}
+	}
+	if (message) {
+		if (const auto from = message->displayFrom()) {
+			return from->name();
+		}
+		return message->author()->name();
+	} else if (fields.externalPeerId) {
+		return item->history()->owner().peer(fields.externalPeerId)->name();
+	}
+	return QString();
+}
+
+TextWithEntities ReplyPreviewTextForSelectedCopy(
+		not_null<HistoryMessageReply*> reply) {
+	if (!reply->displaying() && reply->unavailable()) {
+		return TextWithEntities();
+	}
+	const auto &fields = reply->fields();
+	const auto message = reply->resolvedMessage.get();
+	const auto media = message ? message->media() : nullptr;
+	const auto messageMedia = (message
+			&& (fields.todoItemId || !fields.pollOption.isEmpty()))
+		? media
+		: nullptr;
+	const auto messageTodoList = messageMedia
+		? messageMedia->todolist()
+		: nullptr;
+	const auto task = (messageTodoList && fields.todoItemId)
+		? messageTodoList->itemById(fields.todoItemId)
+		: nullptr;
+	const auto messagePoll = messageMedia
+		? messageMedia->poll()
+		: media
+		? media->poll()
+		: nullptr;
+	const auto pollAnswer = (messagePoll && !fields.pollOption.isEmpty())
+		? messagePoll->answerByOption(fields.pollOption)
+		: nullptr;
+	if (task) {
+		return task->text;
+	} else if (pollAnswer) {
+		return pollAnswer->text;
+	} else if (messagePoll) {
+		return messagePoll->question;
+	} else if (message && (fields.quote.empty() || !reply->manualQuote())) {
+		return message->inReplyText();
+	} else if (!fields.quote.empty()) {
+		return fields.quote;
+	} else if (const auto story = reply->resolvedStory.get()) {
+		return story->inReplyText();
+	} else if (const auto externalMedia = fields.externalMedia.get()) {
+		return externalMedia->toPreview({
+			.hideSender = true,
+			.hideCaption = true,
+			.ignoreMessageText = true,
+			.generateImages = false,
+			.ignoreGroup = true,
+			.ignoreTopic = true,
+		}).text;
+	}
+	return TextWithEntities();
+}
+
+TextWithEntities LimitNonExactReplyPreview(TextWithEntities text) {
+	auto left = TextUtilities::SingleLine(text);
+	if (left.text.size() <= kSelectedCopyReplyPreviewLimit) {
+		return left;
+	}
+	auto part = TextWithEntities();
+	if (!TextUtilities::CutPart(
+			part,
+			left,
+			kSelectedCopyReplyPreviewLimit)) {
+		return TextWithEntities();
+	}
+	TextUtilities::Trim(part);
+	TextUtilities::Trim(left);
+	if (!left.empty()) {
+		part.append(Ui::kQEllipsis);
+	}
+	return part;
+}
+
+std::optional<SelectedCopyReplyContext> ReplyContextForSelectedCopy(
+		not_null<HistoryItem*> item) {
+	const auto reply = item->Get<HistoryMessageReply>();
+	if (!reply) {
+		return std::nullopt;
+	}
+	const auto replyPointer = not_null{ reply };
+	const auto senderName = ReplySenderNameForSelectedCopy(
+		item,
+		replyPointer);
+	if (senderName.isEmpty()) {
+		return std::nullopt;
+	}
+	const auto &fields = reply->fields();
+	auto quote = (reply->manualQuote() && !fields.quote.empty())
+		? TextUtilities::SingleLine(fields.quote)
+		: LimitNonExactReplyPreview(ReplyPreviewTextForSelectedCopy(
+			replyPointer));
+	return SelectedCopyReplyContext{
+		.senderName = senderName,
+		.quote = TextForMimeData::WithExpandedLinks(quote),
+	};
+}
+
+TextForMimeData HistorySelectedItemPlainWrappedText(
+		not_null<HistoryItem*> item,
+		TextForMimeData &&body) {
+	auto result = TextForMimeData();
+	const auto time = u"[%1] "_q.arg(
+		QLocale().toString(ItemDateTime(item), QLocale::ShortFormat));
+	const auto author = item->author()->name();
+	const auto size = time.size() + author.size() + 2 + body.expanded.size();
+	result.reserve(size);
+	result.append(time).append(author).append(u": "_q);
+	result.append(std::move(body));
+	return result;
+}
+
+} // namespace
+
+TextForMimeData HistoryItemText(not_null<HistoryItem*> item) {
+	return AppendExtraCopyText(item, HistoryItemMainText(item));
+}
+
 TextForMimeData HistoryGroupText(not_null<const Data::Group*> group) {
 	Expects(!group->items.empty());
 
@@ -115,3 +410,84 @@ TextForMimeData HistoryGroupText(not_null<const Data::Group*> group) {
 		return (++first == end) ? result : TextForMimeData();
 	}();
 }
+
+TextForMimeData HistoryItemTextForSelectedCopy(not_null<HistoryItem*> item) {
+	const auto media = item->media();
+	if (!media) {
+		return HistoryItemText(item);
+	}
+	const auto mediaPointer = not_null{ media };
+	if (!UsesSelectedCopyPlaceholder(mediaPointer)) {
+		return HistoryItemText(item);
+	}
+	auto mediaResult = SelectedCopyMediaLabel(mediaPointer);
+	if (mediaResult.empty()) {
+		return HistoryItemText(item);
+	}
+	auto textResult = media->document()
+		? media->clipboardText()
+		: item->clipboardText();
+	auto result = CombineSelectedCopyTextAndMedia(
+		std::move(textResult),
+		std::move(mediaResult),
+		SelectedCopyMediaBeforeText(item, mediaPointer));
+	return AppendExtraCopyText(item, std::move(result));
+}
+
+TextForMimeData HistoryGroupTextForSelectedCopy(
+		not_null<const Data::Group*> group) {
+	Expects(!group->items.empty());
+
+	auto textResult = HistoryGroupText(group);
+	auto mediaResult = SelectedCopyAlbumLabel(CountSelectedCopyAlbumMedia(group));
+	const auto item = group->items.back();
+	const auto media = item->media();
+	return CombineSelectedCopyTextAndMedia(
+		std::move(textResult),
+		std::move(mediaResult),
+		media ? SelectedCopyMediaBeforeText(item, not_null{ media }) : true);
+}
+
+TextForMimeData HistorySelectedItemWrappedText(
+		not_null<HistoryItem*> item,
+		TextForMimeData &&body,
+		bool richContext) {
+	if (!richContext) {
+		return HistorySelectedItemPlainWrappedText(item, std::move(body));
+	}
+	auto context = ReplyContextForSelectedCopy(item);
+	if (!context) {
+		return HistorySelectedItemPlainWrappedText(item, std::move(body));
+	}
+	auto result = TextForMimeData();
+	const auto time = u"[%1] "_q.arg(
+		QLocale().toString(ItemDateTime(item), QLocale::ShortFormat));
+	const auto author = item->author()->name();
+	const auto replyTo = tr::lng_context_copy_in_reply_to(
+		tr::now,
+		lt_name,
+		context->senderName);
+	const auto size = time.size()
+		+ author.size()
+		+ 1
+		+ replyTo.size()
+		+ 2
+		+ context->quote.expanded.size()
+		+ body.expanded.size();
+	result.reserve(size);
+	result
+		.append(time)
+		.append(author)
+		.append(' ')
+		.append(replyTo)
+		.append(':');
+	if (context->quote.empty()) {
+		result.append(' ').append(std::move(body));
+	} else {
+		result.append(u"\n> "_q).append(std::move(context->quote));
+		if (!body.empty()) {
+			result.append('\n').append(std::move(body));
+		}
+	}
+	return result;
+}
diff --git a/Telegram/SourceFiles/history/history_item_text.h b/Telegram/SourceFiles/history/history_item_text.h
index 7c3e887101175e..f116517f529556 100644
--- a/Telegram/SourceFiles/history/history_item_text.h
+++ b/Telegram/SourceFiles/history/history_item_text.h
@@ -15,3 +15,10 @@ struct Group;
 
 TextForMimeData HistoryItemText(not_null<HistoryItem*> item);
 TextForMimeData HistoryGroupText(not_null<const Data::Group*> group);
+TextForMimeData HistoryItemTextForSelectedCopy(not_null<HistoryItem*> item);
+TextForMimeData HistoryGroupTextForSelectedCopy(
+	not_null<const Data::Group*> group);
+TextForMimeData HistorySelectedItemWrappedText(
+	not_null<HistoryItem*> item,
+	TextForMimeData &&body,
+	bool richContext);
diff --git a/Telegram/SourceFiles/history/history_location_manager.cpp b/Telegram/SourceFiles/history/history_location_manager.cpp
index 7810460bdf98ec..6cf1ecfdddf232 100644
--- a/Telegram/SourceFiles/history/history_location_manager.cpp
+++ b/Telegram/SourceFiles/history/history_location_manager.cpp
@@ -23,9 +23,9 @@ QString LocationClickHandler::copyToClipboardContextItemText() const {
 }
 
 void LocationClickHandler::onClick(ClickContext context) const {
-	if (!psLaunchMaps(_point)) {
-		File::OpenUrl(_text);
-	}
+	Platform::LaunchMaps(_point, [text = _text] {
+		File::OpenUrl(text);
+	});
 }
 
 void LocationClickHandler::setup() {
diff --git a/Telegram/SourceFiles/history/history_message_selection.h b/Telegram/SourceFiles/history/history_message_selection.h
new file mode 100644
index 00000000000000..a8bfc0fe89ad58
--- /dev/null
+++ b/Telegram/SourceFiles/history/history_message_selection.h
@@ -0,0 +1,200 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_article.h"
+#include "ui/text/text.h"
+
+namespace HistoryView {
+
+enum class MessageSelectionKind : char {
+	None,
+	Flat,
+	RichPage,
+};
+
+struct MessageSelectionFlatEndpoint {
+	uint16 symbol = 0;
+	bool afterSymbol = false;
+
+	[[nodiscard]] uint16 offset() const {
+		return uint16(symbol + (afterSymbol ? 1 : 0));
+	}
+
+	[[nodiscard]] bool operator==(
+		const MessageSelectionFlatEndpoint &other) const = default;
+};
+
+struct MessageSelectionEndpoint {
+	MessageSelectionKind kind = MessageSelectionKind::None;
+	MessageSelectionFlatEndpoint flat;
+	Iv::Markdown::MarkdownArticleSelectionPosition richPagePosition;
+	Iv::Markdown::MarkdownArticleSelectionEndpoint richPage;
+
+	[[nodiscard]] static MessageSelectionEndpoint Flat(
+			MessageSelectionFlatEndpoint value) {
+		auto result = MessageSelectionEndpoint();
+		result.kind = MessageSelectionKind::Flat;
+		result.flat = value;
+		return result;
+	}
+
+	[[nodiscard]] static MessageSelectionEndpoint RichPage(
+			Iv::Markdown::MarkdownArticleSelectionPosition position,
+			Iv::Markdown::MarkdownArticleSelectionEndpoint value) {
+		auto result = MessageSelectionEndpoint();
+		result.kind = MessageSelectionKind::RichPage;
+		result.richPagePosition = position;
+		result.richPage = value;
+		return result;
+	}
+
+	[[nodiscard]] bool isFlat() const {
+		return (kind == MessageSelectionKind::Flat);
+	}
+
+	[[nodiscard]] bool isRichPage() const {
+		return (kind == MessageSelectionKind::RichPage);
+	}
+
+	[[nodiscard]] bool valid() const {
+		return isFlat()
+			|| (isRichPage()
+				&& richPagePosition.valid()
+				&& richPage.valid());
+	}
+};
+
+struct MessageSelectionRichPage {
+	Iv::Markdown::MarkdownArticleSelection selection;
+	Iv::Markdown::MarkdownArticleSelectionEndpoints endpoints;
+
+	[[nodiscard]] bool empty() const {
+		return selection.empty();
+	}
+};
+
+[[nodiscard]] inline int CompareMessageSelectionPositions(
+		Iv::Markdown::MarkdownArticleSelectionPosition a,
+		Iv::Markdown::MarkdownArticleSelectionPosition b) {
+	if (a.segment != b.segment) {
+		return (a.segment < b.segment) ? -1 : 1;
+	} else if (a.offset != b.offset) {
+		return (a.offset < b.offset) ? -1 : 1;
+	}
+	return 0;
+}
+
+struct MessageSelection {
+	MessageSelectionKind kind = MessageSelectionKind::None;
+	TextSelection flat;
+	MessageSelectionRichPage richPage;
+	MessageSelectionEndpoint anchor;
+	MessageSelectionEndpoint focus;
+
+	[[nodiscard]] static MessageSelection Flat(
+			TextSelection selection,
+			MessageSelectionFlatEndpoint anchor,
+			MessageSelectionFlatEndpoint focus) {
+		auto result = MessageSelection();
+		if (selection.empty()) {
+			return result;
+		}
+		result.kind = MessageSelectionKind::Flat;
+		result.flat = selection;
+		result.anchor = MessageSelectionEndpoint::Flat(anchor);
+		result.focus = MessageSelectionEndpoint::Flat(focus);
+		return result;
+	}
+
+	[[nodiscard]] static MessageSelection Flat(
+			MessageSelectionFlatEndpoint anchor,
+			MessageSelectionFlatEndpoint focus) {
+		const auto anchorOffset = anchor.offset();
+		const auto focusOffset = focus.offset();
+		if (anchorOffset == focusOffset) {
+			return {};
+		}
+		return Flat(
+			(anchorOffset < focusOffset)
+				? TextSelection(anchorOffset, focusOffset)
+				: TextSelection(focusOffset, anchorOffset),
+			anchor,
+			focus);
+	}
+
+	[[nodiscard]] static MessageSelection RichPage(
+			Iv::Markdown::MarkdownArticleSelection selection,
+			Iv::Markdown::MarkdownArticleSelectionEndpoints endpoints,
+			Iv::Markdown::MarkdownArticleSelectionPosition anchorPosition,
+			Iv::Markdown::MarkdownArticleSelectionPosition focusPosition,
+			Iv::Markdown::MarkdownArticleSelectionEndpoint anchor,
+			Iv::Markdown::MarkdownArticleSelectionEndpoint focus) {
+		auto result = MessageSelection();
+		if (selection.empty()
+			|| !anchorPosition.valid()
+			|| !focusPosition.valid()
+			|| !anchor.valid()
+			|| !focus.valid()) {
+			return result;
+		}
+		if (CompareMessageSelectionPositions(selection.from, selection.to) > 0) {
+			const auto position = selection.from;
+			selection.from = selection.to;
+			selection.to = position;
+			const auto endpoint = endpoints.from;
+			endpoints.from = endpoints.to;
+			endpoints.to = endpoint;
+		}
+		result.kind = MessageSelectionKind::RichPage;
+		result.richPage.selection = selection;
+		result.richPage.endpoints = endpoints;
+		result.anchor = MessageSelectionEndpoint::RichPage(
+			anchorPosition,
+			anchor);
+		result.focus = MessageSelectionEndpoint::RichPage(
+			focusPosition,
+			focus);
+		return result;
+	}
+
+	[[nodiscard]] bool empty() const {
+		return (kind == MessageSelectionKind::Flat)
+			? flat.empty()
+			: (kind == MessageSelectionKind::RichPage)
+			? richPage.empty()
+			: true;
+	}
+
+	[[nodiscard]] bool isFlat() const {
+		return (kind == MessageSelectionKind::Flat) && !flat.empty();
+	}
+
+	[[nodiscard]] bool isRichPage() const {
+		return (kind == MessageSelectionKind::RichPage)
+			&& !richPage.empty();
+	}
+
+	[[nodiscard]] TextSelection flatSelection() const {
+		return isFlat() ? flat : TextSelection();
+	}
+
+	[[nodiscard]] TextSelection flatRangeForEdit() const {
+		return flatSelection();
+	}
+
+	[[nodiscard]] bool contains(
+			const MessageSelectionEndpoint &endpoint) const {
+		return isFlat()
+			&& endpoint.isFlat()
+			&& (endpoint.flat.symbol >= flat.from)
+			&& (endpoint.flat.symbol < flat.to);
+	}
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/history_streamed_drafts.cpp b/Telegram/SourceFiles/history/history_streamed_drafts.cpp
new file mode 100644
index 00000000000000..6da30e5f48336f
--- /dev/null
+++ b/Telegram/SourceFiles/history/history_streamed_drafts.cpp
@@ -0,0 +1,368 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/history_streamed_drafts.h"
+
+#include "api/api_text_entities.h"
+#include "chat_helpers/stickers_lottie.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_forum_topic.h"
+#include "data/data_peer_id.h"
+#include "data/data_saved_sublist.h"
+#include "data/data_session.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "iv/iv_rich_page.h"
+#include "main/main_session.h"
+
+namespace {
+
+constexpr auto kClearTimeout = 30 * crl::time(1000);
+
+[[nodiscard]] int CommonPrefixLength(const QString &a, const QString &b) {
+	const auto count = std::min(a.size(), b.size());
+	auto i = 0;
+	while (i < count && a[i] == b[i]) {
+		++i;
+	}
+	return i;
+}
+
+} // namespace
+
+HistoryStreamedDrafts::HistoryStreamedDrafts(not_null<History*> history)
+: _history(history)
+, _checkTimer([=] { check(); }) {
+}
+
+HistoryStreamedDrafts::~HistoryStreamedDrafts() {
+	for (const auto &[randomId, draft] : base::take(_drafts)) {
+		draft.message->destroy();
+	}
+}
+
+TextWithEntities HistoryStreamedDrafts::loadingEmoji() {
+	if (_loadingEmoji.empty()) {
+		_loadingEmoji = Data::SingleCustomEmoji(
+			ChatHelpers::GenerateLocalTgsSticker(
+				&_history->session(),
+				u"transcribe_loading"_q,
+				true));
+	}
+	return _loadingEmoji;
+}
+
+void HistoryStreamedDrafts::apply(
+		MsgId rootId,
+		PeerId fromId,
+		TimeId when,
+		const MTPDsendMessageTextDraftAction &data) {
+	const auto randomId = data.vrandom_id().v;
+	applyPrepared(rootId, fromId, when, randomId, prepareContent(data));
+}
+
+void HistoryStreamedDrafts::apply(
+		MsgId rootId,
+		PeerId fromId,
+		TimeId when,
+		const MTPDsendMessageRichMessageDraftAction &data) {
+	const auto randomId = data.vrandom_id().v;
+	applyPrepared(rootId, fromId, when, randomId, prepareContent(data));
+}
+
+HistoryStreamedDrafts::DraftContent HistoryStreamedDrafts::prepareContent(
+		const MTPDsendMessageTextDraftAction &data) {
+	auto content = DraftContent{
+		.text = Api::ParseTextWithEntities(
+			&_history->session(),
+			data.vtext()),
+		.kind = DraftKind::Text,
+	};
+	content.matchText = content.text.text;
+	content.text.append(loadingEmoji());
+	return content;
+}
+
+HistoryStreamedDrafts::DraftContent HistoryStreamedDrafts::prepareContent(
+		const MTPDsendMessageRichMessageDraftAction &data) {
+	auto content = DraftContent{
+		.richPage = Iv::ParseRichPage(
+			&_history->session(),
+			data.vrich_message()),
+		.kind = DraftKind::Rich,
+	};
+	content.text = Iv::FlattenRichPageSummary(content.richPage);
+	content.matchText = content.text.text;
+	if (content.text.empty()) {
+		content.text.append(loadingEmoji());
+	}
+	return content;
+}
+
+void HistoryStreamedDrafts::applyPrepared(
+		MsgId rootId,
+		PeerId fromId,
+		TimeId when,
+		uint64 randomId,
+		DraftContent &&content) {
+	const auto replyToId = rootId
+		? FullMsgId(_history->peer->id, rootId)
+		: FullMsgId();
+	if (!rootId) {
+		rootId = Data::ForumTopic::kGeneralId;
+	}
+	if (!when) {
+		clearByRandomId(randomId);
+		return;
+	}
+	if (_drafts.find(randomId) != end(_drafts)
+		&& update(randomId, std::move(content))) {
+		return;
+	}
+	const auto item = _history->addNewLocalMessage({
+		.id = _history->owner().nextLocalMessageId(),
+		.flags = (MessageFlag::Local
+			| MessageFlag::HasReplyInfo
+			| MessageFlag::TextAppearing),
+		.from = fromId,
+		.replyTo = {
+			.messageId = replyToId,
+			.topicRootId = rootId,
+		},
+		.date = when,
+	}, content.text, MTP_messageMediaEmpty());
+	if (content.richPage) {
+		item->setRichPage(content.richPage);
+		_history->owner().requestItemTextRefresh(item);
+	}
+	_drafts.emplace(randomId, Draft{
+		.message = item,
+		.rootId = rootId,
+		.fromId = fromId,
+		.updated = crl::now(),
+		.kind = content.kind,
+		.matchText = std::move(content.matchText),
+	});
+	if (!_checkTimer.isActive()) {
+		_checkTimer.callOnce(kClearTimeout);
+	}
+	crl::on_main(this, [=] {
+		crl::on_main(this, [=] {
+			// Thread topics create views for messages in double on_main:
+			// - First we postpone HistoryUpdate::Flag::ClientSideMessages.
+			// - Then we postpone RepliesList push of new messages list.
+			const auto i = _drafts.find(randomId);
+			if (i != end(_drafts)) {
+				i->second.message->markTextAppearingStarted();
+			}
+		});
+	});
+}
+
+bool HistoryStreamedDrafts::update(
+		uint64 randomId,
+		DraftContent &&content) {
+	const auto i = _drafts.find(randomId);
+	if (i == end(_drafts)) {
+		return false;
+	}
+	const auto item = i->second.message;
+	const auto currentRichPage = item->richPage();
+	const auto hadRichPage = (currentRichPage != nullptr);
+	const auto richPageChanged = content.richPage
+		? (currentRichPage != content.richPage)
+		: hadRichPage;
+	const auto textEmpty = content.text.empty();
+	if (content.richPage) {
+		item->setRichPage(content.richPage);
+	} else {
+		item->clearRichPage();
+	}
+	item->setText(std::move(content.text));
+	if (richPageChanged || textEmpty) {
+		_history->owner().requestItemTextRefresh(item);
+	}
+	item->invalidateChatListEntry();
+	i->second.kind = content.kind;
+	i->second.matchText = std::move(content.matchText);
+	i->second.updated = crl::now();
+	return true;
+}
+
+void HistoryStreamedDrafts::clearByRandomId(uint64 randomId) {
+	if (const auto draft = _drafts.take(randomId)) {
+		draft->message->destroy();
+	}
+	if (_drafts.empty()) {
+		scheduleDestroy();
+	}
+}
+
+bool HistoryStreamedDrafts::hasFor(not_null<HistoryItem*> item) const {
+	const auto rootId = item->topicRootId();
+	const auto from = item->from();
+	for (const auto &[randomId, draft] : _drafts) {
+		if (draft.rootId == rootId && draft.message->from() == from) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void HistoryStreamedDrafts::applyItemRemoved(not_null<HistoryItem*> item) {
+	for (auto i = begin(_drafts); i != end(_drafts); ++i) {
+		if (i->second.message == item) {
+			_drafts.erase(i);
+			if (_drafts.empty()) {
+				scheduleDestroy();
+			}
+			return;
+		}
+	}
+}
+
+HistoryItem *HistoryStreamedDrafts::adoptIncoming(
+		const MTPDmessage &data) {
+	if (_drafts.empty()) {
+		return nullptr;
+	}
+	const auto fromId = data.vfrom_id()
+		? peerFromMTP(*data.vfrom_id())
+		: _history->peer->id;
+	auto rootId = MsgId(0);
+	if (const auto reply = data.vreply_to()) {
+		reply->match([&](const MTPDmessageReplyHeader &d) {
+			if (d.is_forum_topic()) {
+				rootId = d.vreply_to_top_id().value_or_empty();
+				if (!rootId) {
+					rootId = d.vreply_to_msg_id().value_or_empty();
+				}
+			}
+		}, [](const MTPDmessageReplyStoryHeader &) {});
+	}
+	if (!rootId) {
+		rootId = Data::ForumTopic::kGeneralId;
+	}
+	auto incomingKind = DraftKind::Text;
+	auto incomingText = qs(data.vmessage());
+	if (const auto richMessage = data.vrich_message()) {
+		incomingKind = DraftKind::Rich;
+		incomingText = Iv::FlattenRichPageSummary(
+			Iv::ParseRichPage(&_history->session(), *richMessage)).text;
+	}
+	auto best = end(_drafts);
+	if (incomingKind == DraftKind::Rich && incomingText.isEmpty()) {
+		for (auto i = begin(_drafts); i != end(_drafts); ++i) {
+			const auto &draft = i->second;
+			if (draft.rootId != rootId) {
+				continue;
+			}
+			if (draft.message->from()->id != fromId) {
+				continue;
+			}
+			if (draft.kind != DraftKind::Rich) {
+				continue;
+			}
+			if (best == end(_drafts) || draft.updated > best->second.updated) {
+				best = i;
+			}
+		}
+	} else {
+		auto bestSameKind = end(_drafts);
+		auto bestSameKindPrefix = 0;
+		auto bestOtherKind = end(_drafts);
+		auto bestOtherKindPrefix = 0;
+		auto newestSameThreadRich = end(_drafts);
+		for (auto i = begin(_drafts); i != end(_drafts); ++i) {
+			const auto &draft = i->second;
+			if (draft.rootId != rootId) {
+				continue;
+			}
+			if (draft.message->from()->id != fromId) {
+				continue;
+			}
+			if (incomingKind == DraftKind::Rich
+				&& draft.kind == DraftKind::Rich
+				&& (newestSameThreadRich == end(_drafts)
+					|| draft.updated > newestSameThreadRich->second.updated)) {
+				newestSameThreadRich = i;
+			}
+			const auto prefix = CommonPrefixLength(
+				draft.matchText,
+				incomingText);
+			if (prefix <= 0) {
+				continue;
+			}
+			if (draft.kind == incomingKind) {
+				if (prefix > bestSameKindPrefix) {
+					bestSameKindPrefix = prefix;
+					bestSameKind = i;
+				}
+			} else if (prefix > bestOtherKindPrefix) {
+				bestOtherKindPrefix = prefix;
+				bestOtherKind = i;
+			}
+		}
+		best = (bestSameKind != end(_drafts))
+			? bestSameKind
+			: (bestOtherKind != end(_drafts))
+			? bestOtherKind
+			: newestSameThreadRich;
+	}
+	if (best == end(_drafts)) {
+		return nullptr;
+	}
+	const auto item = best->second.message.get();
+	_drafts.erase(best);
+
+	item->setRealId(data.vid().v);
+	if (const auto topic = item->topic()) {
+		topic->applyMaybeLast(item);
+	}
+	if (const auto sublist = item->savedSublist()) {
+		sublist->applyMaybeLast(item);
+	}
+	_history->owner().updateExistingMessage(data);
+	_history->newItemAdded(item, NewAddType::StreamedDraftFinish);
+
+	if (_drafts.empty()) {
+		scheduleDestroy();
+	}
+	return item;
+}
+
+void HistoryStreamedDrafts::check() {
+	auto closest = crl::time();
+	const auto now = crl::now();
+	for (auto i = begin(_drafts); i != end(_drafts);) {
+		if (now - i->second.updated >= kClearTimeout) {
+			const auto message = i->second.message;
+			i = _drafts.erase(i);
+			message->destroy();
+		} else {
+			if (!closest || closest > i->second.updated) {
+				closest = i->second.updated;
+			}
+			++i;
+		}
+	}
+	if (closest) {
+		_checkTimer.callOnce(kClearTimeout - (now - closest));
+	} else {
+		scheduleDestroy();
+	}
+}
+
+void HistoryStreamedDrafts::scheduleDestroy() {
+	Expects(_drafts.empty());
+
+	crl::on_main(this, [=] {
+		if (_drafts.empty()) {
+			_destroyRequests.fire({});
+		}
+	});
+}
diff --git a/Telegram/SourceFiles/history/history_streamed_drafts.h b/Telegram/SourceFiles/history/history_streamed_drafts.h
new file mode 100644
index 00000000000000..7d2f9f073dd31e
--- /dev/null
+++ b/Telegram/SourceFiles/history/history_streamed_drafts.h
@@ -0,0 +1,95 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "base/weak_ptr.h"
+
+#include <memory>
+
+class History;
+class MTPDmessage;
+class MTPDsendMessageRichMessageDraftAction;
+class MTPDsendMessageTextDraftAction;
+
+namespace Iv {
+struct RichPage;
+} // namespace Iv
+
+class HistoryStreamedDrafts final : public base::has_weak_ptr {
+public:
+	explicit HistoryStreamedDrafts(not_null<History*> history);
+	~HistoryStreamedDrafts();
+
+	[[nodiscard]] rpl::producer<> destroyRequests() const;
+
+	void apply(
+		MsgId rootId,
+		PeerId fromId,
+		TimeId when,
+		const MTPDsendMessageTextDraftAction &data);
+	void apply(
+		MsgId rootId,
+		PeerId fromId,
+		TimeId when,
+		const MTPDsendMessageRichMessageDraftAction &data);
+
+	[[nodiscard]] bool hasFor(not_null<HistoryItem*> item) const;
+	void applyItemRemoved(not_null<HistoryItem*> item);
+	HistoryItem *adoptIncoming(const MTPDmessage &data);
+
+private:
+	enum class DraftKind {
+		Text,
+		Rich,
+	};
+
+	struct DraftContent {
+		TextWithEntities text;
+		std::shared_ptr<const Iv::RichPage> richPage;
+		QString matchText;
+		DraftKind kind = DraftKind::Text;
+	};
+
+	struct Draft {
+		not_null<HistoryItem*> message;
+		MsgId rootId = 0;
+		PeerId fromId = 0;
+		crl::time updated = 0;
+		DraftKind kind = DraftKind::Text;
+		QString matchText;
+	};
+
+	bool update(uint64 randomId, DraftContent &&content);
+	void applyPrepared(
+		MsgId rootId,
+		PeerId fromId,
+		TimeId when,
+		uint64 randomId,
+		DraftContent &&content);
+	[[nodiscard]] DraftContent prepareContent(
+		const MTPDsendMessageTextDraftAction &data);
+	[[nodiscard]] DraftContent prepareContent(
+		const MTPDsendMessageRichMessageDraftAction &data);
+	void clearByRandomId(uint64 randomId);
+
+	void check();
+	void scheduleDestroy();
+
+	[[nodiscard]] TextWithEntities loadingEmoji();
+
+	const not_null<History*> _history;
+	base::flat_map<uint64, Draft> _drafts;
+
+	base::Timer _checkTimer;
+
+	rpl::event_stream<> _destroyRequests;
+
+	TextWithEntities _loadingEmoji;
+
+};
diff --git a/Telegram/SourceFiles/history/history_unread_things.cpp b/Telegram/SourceFiles/history/history_unread_things.cpp
index 4cca97437ec61c..dc55d65697ccf0 100644
--- a/Telegram/SourceFiles/history/history_unread_things.cpp
+++ b/Telegram/SourceFiles/history/history_unread_things.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "history/history_unread_things.h"
 
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
@@ -26,6 +27,7 @@ template <typename Update>
 	switch (type) {
 	case Type::Mentions: return Flag::UnreadMentions;
 	case Type::Reactions: return Flag::UnreadReactions;
+	case Type::PollVotes: return Flag::UnreadPollVotes;
 	}
 	Unexpected("Type in HistoryUnreadThings::UpdateFlag.");
 }
@@ -38,6 +40,15 @@ template <typename Update>
 	return UpdateFlag<Data::TopicUpdate>(type);
 }
 
+[[nodiscard]] Data::SublistUpdate::Flag SublistUpdateFlag(Type type) {
+	Expects(type == Type::Reactions || type == Type::PollVotes);
+
+	if (type == Type::PollVotes) {
+		return Data::SublistUpdate::Flag::UnreadPollVotes;
+	}
+	return Data::SublistUpdate::Flag::UnreadReactions;
+}
+
 } // namespace
 
 void Proxy::setCount(int count) {
@@ -51,6 +62,9 @@ void Proxy::setCount(int count) {
 		createData();
 	}
 	auto &list = resolveList();
+	if (!count) {
+		list.clear();
+	}
 	const auto loaded = list.loadedCount();
 	if (loaded > count) {
 		LOG(("API Warning: "
@@ -58,10 +72,23 @@ void Proxy::setCount(int count) {
 		count = loaded;
 	}
 	const auto had = (list.count() > 0);
-	const auto &other = (_type == Type::Mentions)
-		? _data->reactions
-		: _data->mentions;
-	if (!count && other.count(-1) == 0) {
+	const auto othersEmpty = [&] {
+		for (auto t : { Type::Mentions, Type::Reactions, Type::PollVotes }) {
+			if (t == _type) {
+				continue;
+			}
+			const auto &other = (t == Type::Mentions)
+				? _data->mentions
+				: (t == Type::Reactions)
+				? _data->reactions
+				: _data->pollVotes;
+			if (other.count(-1) != 0) {
+				return false;
+			}
+		}
+		return true;
+	}();
+	if (!count && othersEmpty) {
 		_data = nullptr;
 	} else {
 		list.setCount(count);
@@ -72,6 +99,8 @@ void Proxy::setCount(int count) {
 			_thread->hasUnreadMentionChanged(has);
 		} else if (_type == Type::Reactions) {
 			_thread->hasUnreadReactionChanged(has);
+		} else if (_type == Type::PollVotes) {
+			_thread->hasUnreadPollVoteChanged(has);
 		}
 	}
 }
@@ -136,17 +165,19 @@ void Proxy::addSlice(const MTPmessages_Messages &slice, int alreadyLoaded) {
 			"(Proxy::addSlice)"));
 		return 0;
 	}, [&](const MTPDmessages_messages &data) {
+		history->peer->processTopics(data.vtopics());
 		return int(data.vmessages().v.size());
 	}, [&](const MTPDmessages_messagesSlice &data) {
+		history->peer->processTopics(data.vtopics());
 		return data.vcount().v;
 	}, [&](const MTPDmessages_channelMessages &data) {
 		if (const auto channel = history->peer->asChannel()) {
 			channel->ptsReceived(data.vpts().v);
-			channel->processTopics(data.vtopics());
 		} else {
 			LOG(("API Error: received messages.channelMessages when "
 				"no channel was passed! (Proxy::addSlice)"));
 		}
+		history->peer->processTopics(data.vtopics());
 		return data.vcount().v;
 	});
 
@@ -174,10 +205,14 @@ void Proxy::addSlice(const MTPmessages_Messages &slice, int alreadyLoaded) {
 			message,
 			localFlags,
 			type);
+		if (_type == Type::PollVotes) {
+			item->setHasUnreadPollVote();
+		}
 		const auto is = [&] {
 			switch (_type) {
 			case Type::Mentions: return item->isUnreadMention();
 			case Type::Reactions: return item->hasUnreadReaction();
+			case Type::PollVotes: return item->hasUnreadPollVote();
 			}
 			Unexpected("Type in Proxy::addSlice.");
 		}();
@@ -194,7 +229,7 @@ void Proxy::addSlice(const MTPmessages_Messages &slice, int alreadyLoaded) {
 }
 
 void Proxy::checkAdd(MsgId msgId, bool resolved) {
-	Expects(_type == Type::Reactions);
+	Expects(_type == Type::Reactions || _type == Type::PollVotes);
 
 	if (!_data) {
 		return;
@@ -206,11 +241,19 @@ void Proxy::checkAdd(MsgId msgId, bool resolved) {
 	const auto history = _thread->owningHistory();
 	const auto peer = history->peer;
 	const auto item = peer->owner().message(peer, msgId);
-	if (item && item->hasUnreadReaction()) {
+	const auto matches = item
+		&& ((_type == Type::Reactions) ? item->hasUnreadReaction()
+			: item->hasUnreadPollVote());
+	if (matches) {
 		item->addToUnreadThings(AddType::Existing);
 	} else if (!item && !resolved) {
+		const auto type = _type;
 		peer->session().api().requestMessageData(peer, msgId, [=] {
-			history->unreadReactions().checkAdd(msgId, true);
+			if (type == Type::Reactions) {
+				history->unreadReactions().checkAdd(msgId, true);
+			} else {
+				history->unreadPollVotes().checkAdd(msgId, true);
+			}
 		});
 	}
 }
@@ -224,6 +267,10 @@ void Proxy::notifyUpdated() {
 		topic->session().changes().topicUpdated(
 			topic,
 			TopicUpdateFlag(_type));
+	} else if (const auto sublist = _thread->asSublist()) {
+		sublist->session().changes().sublistUpdated(
+			sublist,
+			SublistUpdateFlag(_type));
 	}
 }
 
@@ -232,6 +279,7 @@ void Proxy::createData() {
 	if (_known) {
 		_data->mentions.setCount(0);
 		_data->reactions.setCount(0);
+		_data->pollVotes.setCount(0);
 	}
 }
 
@@ -241,6 +289,7 @@ List &Proxy::resolveList() {
 	switch (_type) {
 	case Type::Mentions: return _data->mentions;
 	case Type::Reactions: return _data->reactions;
+	case Type::PollVotes: return _data->pollVotes;
 	}
 	Unexpected("Unread things type in Proxy::resolveList.");
 }
diff --git a/Telegram/SourceFiles/history/history_unread_things.h b/Telegram/SourceFiles/history/history_unread_things.h
index a8b874d11d1db3..493b46c513233b 100644
--- a/Telegram/SourceFiles/history/history_unread_things.h
+++ b/Telegram/SourceFiles/history/history_unread_things.h
@@ -23,6 +23,7 @@ enum class AddType {
 enum class Type {
 	Mentions,
 	Reactions,
+	PollVotes,
 };
 
 class List final {
@@ -70,6 +71,7 @@ class List final {
 struct All {
 	List mentions;
 	List reactions;
+	List pollVotes;
 };
 
 class ConstProxy {
@@ -117,7 +119,9 @@ class Proxy final : public ConstProxy {
 			? nullptr
 			: (type == Type::Mentions)
 			? &data->mentions
-			: &data->reactions),
+			: (type == Type::Reactions)
+			? &data->reactions
+			: &data->pollVotes),
 		known)
 	, _thread(thread)
 	, _data(data)
diff --git a/Telegram/SourceFiles/history/history_view_highlight_manager.cpp b/Telegram/SourceFiles/history/history_view_highlight_manager.cpp
index ee07a1571fd9a0..3b6fd683328d61 100644
--- a/Telegram/SourceFiles/history/history_view_highlight_manager.cpp
+++ b/Telegram/SourceFiles/history/history_view_highlight_manager.cpp
@@ -65,6 +65,8 @@ Ui::ChatPaintHighlight ElementHighlighter::state(
 	if (item->fullId() == _highlighted.itemId) {
 		auto result = _animation.state();
 		result.range = _highlighted.part;
+		result.todoItemId = _highlighted.todoListId;
+		result.pollOption = _highlighted.pollOption;
 		return result;
 	}
 	return {};
@@ -82,19 +84,44 @@ ElementHighlighter::Highlight ElementHighlighter::computeHighlight(
 		const auto i = ranges::find(group->items, item);
 		if (i != end(group->items)) {
 			const auto index = int(i - begin(group->items));
-			if (quote.text.empty()) {
+			if (quote.highlight.empty()) {
 				return { leaderId, AddGroupItemSelection({}, index) };
 			} else if (const auto leaderView = _viewForItem(leader)) {
-				return { leaderId, leaderView->selectionFromQuote(quote) };
+				return {
+					leaderId,
+					leaderView->selectionFromQuote(quote),
+					quote.highlight.todoItemId,
+					quote.highlight.pollOption,
+				};
 			}
 		}
-		return { leaderId };
-	} else if (quote.text.empty()) {
-		return { item->fullId() };
+		return {
+			leaderId,
+			{},
+			quote.highlight.todoItemId,
+			quote.highlight.pollOption,
+		};
+	} else if (quote.highlight.quote.empty()) {
+		return {
+			item->fullId(),
+			{},
+			quote.highlight.todoItemId,
+			quote.highlight.pollOption,
+		};
 	} else if (const auto view = _viewForItem(item)) {
-		return { item->fullId(), view->selectionFromQuote(quote) };
+		return {
+			item->fullId(),
+			view->selectionFromQuote(quote),
+			quote.highlight.todoItemId,
+			quote.highlight.pollOption,
+		};
 	}
-	return { item->fullId() };
+	return {
+		item->fullId(),
+		{},
+		quote.highlight.todoItemId,
+		quote.highlight.pollOption,
+	};
 }
 
 void ElementHighlighter::highlight(Highlight data) {
@@ -108,7 +135,9 @@ void ElementHighlighter::highlight(Highlight data) {
 				}
 			}
 			_highlighted = data;
-			_animation.start(!data.part.empty()
+			_animation.start((!data.part.empty()
+					|| data.todoListId
+					|| !data.pollOption.isEmpty())
 				&& !IsSubGroupSelection(data.part));
 
 			repaintHighlightedItem(view);
diff --git a/Telegram/SourceFiles/history/history_view_highlight_manager.h b/Telegram/SourceFiles/history/history_view_highlight_manager.h
index 5a3b43ca8e7ea3..2619db2d9138db 100644
--- a/Telegram/SourceFiles/history/history_view_highlight_manager.h
+++ b/Telegram/SourceFiles/history/history_view_highlight_manager.h
@@ -65,6 +65,8 @@ class ElementHighlighter final {
 	struct Highlight {
 		FullMsgId itemId;
 		TextSelection part;
+		int todoListId = 0;
+		QByteArray pollOption;
 
 		explicit operator bool() const {
 			return itemId.operator bool();
diff --git a/Telegram/SourceFiles/history/history_view_pull_to_next_channel.cpp b/Telegram/SourceFiles/history/history_view_pull_to_next_channel.cpp
new file mode 100644
index 00000000000000..f9d330c623746f
--- /dev/null
+++ b/Telegram/SourceFiles/history/history_view_pull_to_next_channel.cpp
@@ -0,0 +1,815 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/history_view_pull_to_next_channel.h"
+
+#include "apiwrap.h"
+#include "base/call_delayed.h"
+#include "base/event_filter.h"
+#include "base/platform/base_platform_haptic.h"
+#include "data/data_chat_filters.h"
+#include "data/data_messages.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/components/sponsored_messages.h"
+#include "dialogs/dialogs_indexed_list.h"
+#include "dialogs/dialogs_main_list.h"
+#include "dialogs/dialogs_row.h"
+#include "history/history.h"
+#include "history/history_inner_widget.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "storage/storage_shared_media.h"
+#include "support/support_preload.h"
+#include "ui/chat/chat_style.h"
+#include "ui/chat/continuous_scroll.h"
+#include "ui/widgets/elastic_scroll.h"
+#include "ui/rect.h"
+#include "ui/rp_widget.h"
+#include "ui/ui_utility.h"
+#include "ui/userpic_view.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_dialogs.h"
+
+namespace HistoryView {
+namespace {
+
+constexpr auto kDirectionLock = 8.;
+constexpr auto kResetReachedOn = 0.95;
+constexpr auto kReleaseShowDuration = crl::time(250);
+constexpr auto kReleaseHideDuration = crl::time(220);
+constexpr auto kPanelDuration = crl::time(320);
+constexpr auto kRetractDuration = crl::time(250);
+constexpr auto kExpandDuration = crl::time(250);
+constexpr auto kBounceDuration = crl::time(400);
+
+[[nodiscard]] History *FindNextUnreadChannel(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> current) {
+	auto &data = controller->session().data();
+	const auto filterId = controller->activeChatsFilterCurrent();
+	const auto list = filterId
+		? data.chatsFilters().chatsList(filterId)
+		: data.chatsList();
+	for (const auto &row : list->indexed()->all()) {
+		const auto history = row->history();
+		if (!history) {
+			continue;
+		}
+		const auto peer = history->peer;
+		if (peer != current
+			&& peer->isBroadcast()
+			&& history->unreadCount() > 0) {
+			return history;
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] Storage::SharedMediaResult TopPinnedSlice(
+		not_null<PeerData*> peer) {
+	return peer->session().storage().snapshot(Storage::SharedMediaQuery(
+		Storage::SharedMediaKey(
+			peer->id,
+			MsgId(0), // topicRootId
+			PeerId(0), // monoforumPeerId
+			Storage::SharedMediaType::Pinned,
+			ServerMaxMsgId - 1),
+		1,
+		1));
+}
+
+void PreloadPinnedBar(not_null<History*> next) {
+	const auto peer = next->peer;
+	if (TopPinnedSlice(peer).count.has_value()) {
+		return;
+	}
+	peer->session().api().requestSharedMedia(
+		peer,
+		MsgId(0), // topicRootId
+		PeerId(0), // monoforumPeerId
+		Storage::SharedMediaType::Pinned,
+		ServerMaxMsgId - 1,
+		Data::LoadDirection::Before);
+}
+
+[[nodiscard]] bool PinnedBarReady(not_null<History*> next) {
+	const auto peer = next->peer;
+	const auto slice = TopPinnedSlice(peer);
+	if (!slice.count.has_value()) {
+		return false;
+	} else if (slice.messageIds.empty()) {
+		return true;
+	}
+	const auto id = FullMsgId(peer->id, slice.messageIds.back());
+	return (peer->owner().message(id) != nullptr);
+}
+
+void PaintStroke(
+		QPainter &p,
+		const QPainterPath &path,
+		const QColor &fg,
+		float64 widthScale = 1.) {
+	auto pen = QPen(fg);
+	pen.setWidthF(st::historyPullNextArrowStroke * widthScale);
+	pen.setCapStyle(Qt::RoundCap);
+	pen.setJoinStyle(Qt::RoundJoin);
+	p.setPen(pen);
+	p.setBrush(Qt::NoBrush);
+	p.drawPath(path);
+}
+
+void PaintArrow(QPainter &p, QPointF center, float64 size, const QColor &fg) {
+	if (size <= 0.) {
+		return;
+	}
+	const auto progress = size / st::historyPullNextArrowSize;
+	const auto scale = style::ConvertFloatScale(progress);
+	auto path = QPainterPath();
+	path.moveTo(12.5, 4.);
+	path.lineTo(12.5, 22.);
+	path.moveTo(3.5, 12.);
+	path.lineTo(12.5, 3.5);
+	path.lineTo(21.5, 12.);
+	auto transform = QTransform();
+	transform.translate(
+		center.x(),
+		center.y() - st::historyPullNextArrowRaise);
+	transform.scale(scale, scale);
+	transform.translate(-12., 8.);
+	PaintStroke(p, transform.map(path), fg, progress);
+}
+
+void PaintCheck(QPainter &p, QPointF center, float64 size, const QColor &fg) {
+	if (size <= 0.) {
+		return;
+	}
+	const auto s = size / 2.4;
+	auto path = QPainterPath();
+	path.moveTo(center + QPointF(-s, 0.));
+	path.lineTo(center + QPointF(-s / 3., s * 0.7));
+	path.lineTo(center + QPointF(s, -s * 0.7));
+	PaintStroke(p, path, fg);
+}
+
+[[nodiscard]] float64 BounceProgress(float64 t) {
+	const auto ease = [](float64 x) {
+		if (x < 0.5) {
+			return 4. * x * x * x;
+		}
+		const auto u = -2. * x + 2.;
+		return 1. - u * u * u / 2.;
+	};
+	if (t < 0.45) {
+		return ease(t / 0.45);
+	} else if (t < 0.75) {
+		return 1. - ease((t - 0.45) / 0.3) * 1.5;
+	}
+	return -0.5 + ease((t - 0.75) / 0.25) * 0.5;
+}
+
+} // namespace
+
+class PullToNextChannel::Indicator final : public Ui::RpWidget {
+public:
+	Indicator(
+		not_null<QWidget*> parent,
+		not_null<const Ui::ChatStyle*> st);
+
+	void setData(float64 offset, bool ready, History *next);
+	void hideNow();
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	const not_null<const Ui::ChatStyle*> _st;
+
+	float64 _offset = 0.;
+	bool _ready = false;
+	History *_next = nullptr;
+	QString _name;
+	Ui::PeerUserpicView _userpic;
+	Ui::Animations::Simple _releaseProgress;
+	Ui::Animations::Simple _bounce;
+
+};
+
+PullToNextChannel::Indicator::Indicator(
+	not_null<QWidget*> parent,
+	not_null<const Ui::ChatStyle*> st)
+: RpWidget(parent)
+, _st(st) {
+	setAttribute(Qt::WA_TransparentForMouseEvents);
+	setAttribute(Qt::WA_TranslucentBackground);
+	hide();
+}
+
+void PullToNextChannel::Indicator::setData(
+		float64 offset,
+		bool ready,
+		History *next) {
+	if (_next != next) {
+		_next = next;
+		_userpic = {};
+		_name = next ? next->peer->name() : QString();
+		if (next) {
+			next->peer->loadUserpic();
+		}
+	}
+	_offset = offset;
+	if (_ready != ready) {
+		_ready = ready;
+		_releaseProgress.start(
+			[=] { update(); },
+			ready ? 0. : 1.,
+			ready ? 1. : 0.,
+			ready ? kReleaseShowDuration : kReleaseHideDuration,
+			anim::easeOutQuint);
+		if (ready) {
+			_bounce.start(
+				[=] { update(); },
+				0.,
+				1.,
+				kBounceDuration,
+				anim::linear);
+		}
+	}
+	if (offset <= 0.) {
+		hide();
+		return;
+	} else if (isHidden()) {
+		show();
+	}
+	update();
+}
+
+void PullToNextChannel::Indicator::hideNow() {
+	_offset = 0.;
+	_ready = false;
+	_releaseProgress.stop();
+	_bounce.stop();
+	hide();
+}
+
+void PullToNextChannel::Indicator::paintEvent(QPaintEvent *e) {
+	const auto offset = _offset;
+	if (offset <= st::lineWidth) {
+		return;
+	}
+
+	auto p = QPainter(this);
+	p.setRenderHint(QPainter::Antialiasing);
+
+	const auto card = float64(st::historyPullNextExpand);
+	const auto progress = (card > 0.)
+		? std::clamp(offset / card, 0., 1.)
+		: 0.;
+	const auto release = _releaseProgress.value(_ready ? 1. : 0.);
+	const auto alpha = std::clamp(progress, 0., 1.);
+	const auto h = float64(height());
+	const auto cx = width() / 2.;
+	const auto avatar = float64(st::historyPullNextAvatar);
+	const auto circleRadius = avatar / 2.;
+	const auto bg = _st->msgServiceBg()->c;
+	const auto fg = _st->msgServiceFg()->c;
+	const auto bounceOffset = -BounceProgress(_bounce.value(1.))
+		* st::historyPullNextBounce;
+
+	const auto widthRadius = std::clamp(
+		circleRadius * (offset - st::historyPullNextSkip)
+			/ (card - st::historyPullNextSkip),
+		0.,
+		circleRadius);
+	const auto widthRadius2 = std::max(
+		0.,
+		std::min(
+			circleRadius * progress,
+			offset / 2. - st::historyPullNextSkip * progress));
+	const auto size
+		= (widthRadius2 * 2. - st::historyPullNextInset) * (1. - release)
+		+ avatar * release;
+
+	if (release < 1.) {
+		const auto capsuleTop = h - offset;
+		const auto capsuleBottom = h
+			+ (-st::historyPullNextSkip * (1. - release)
+				+ (-offset + avatar) * release);
+		auto rect = QRectF(
+			cx - widthRadius,
+			capsuleTop,
+			2. * widthRadius,
+			capsuleBottom - capsuleTop);
+		auto bgAlpha = alpha;
+		if (release > 0.) {
+			const auto inset = st::historyPullNextInset * release;
+			rect = rect - Margins(inset);
+			bgAlpha = alpha * (1. - release);
+		}
+		if (rect.width() > 0. && rect.height() > 0.) {
+			auto capsule = QPainterPath();
+			capsule.addRoundedRect(rect, widthRadius, widthRadius);
+
+			p.setOpacity(bgAlpha);
+			p.setPen(Qt::NoPen);
+			p.setBrush(bg);
+			p.drawPath(capsule);
+
+			const auto arrowCy = h
+				+ (-offset
+					+ st::historyPullNextArrowSize
+					+ st::historyPullNextSkip * (1. - progress)
+					- st::historyPullNextRise * release);
+			p.save();
+			p.setClipRect(rect);
+			p.setOpacity(alpha * (1. - release));
+			PaintArrow(
+				p,
+				QPointF(cx, arrowCy),
+				st::historyPullNextArrowSize * progress,
+				fg);
+			p.restore();
+		}
+	}
+
+	const auto name = _next
+		? _name
+		: tr::lng_pull_no_unread_channels(tr::now);
+	if (release > 0. && !name.isEmpty()) {
+		const auto nameFont = st::historyPullNextNameFont;
+		const auto centerWidth = width() - st::historyScroll.width;
+		const auto avail = centerWidth - 4 * st::historyPullNextSkip;
+		const auto elName = nameFont->elided(name, avail);
+		const auto nameW = float64(nameFont->width(elName));
+		const auto y = h
+			+ (st::historyPullNextNameTop * (1. - release)
+				- st::historyPullNextRise * release)
+			+ bounceOffset;
+		const auto pill = QRectF(
+			(centerWidth - nameW) / 2. - st::historyPullNextSkip,
+			y - st::historyPullNextPadding,
+			nameW + 2 * st::historyPullNextSkip,
+			nameFont->height + st::historyPullNextSkip);
+		p.setOpacity(alpha * release);
+		p.setPen(Qt::NoPen);
+		p.setBrush(bg);
+		p.drawRoundedRect(
+			pill,
+			st::historyPullNextNameRadius,
+			st::historyPullNextNameRadius);
+		p.setPen(fg);
+		p.setFont(nameFont);
+		p.drawText(
+			QRectF((centerWidth - nameW) / 2., y, nameW, nameFont->height),
+			elName,
+			QTextOption(Qt::AlignCenter));
+	}
+
+	if (size >= 1.) {
+		const auto top = h
+			+ ((-st::historyPullNextSkip
+					- st::historyPullNextSkip * progress
+					- size) * (1. - release)
+				+ (-offset + st::historyPullNextPadding) * release)
+			+ bounceOffset;
+		const auto avRect = QRectF(cx - size / 2., top, size, size);
+		p.setOpacity(alpha);
+		if (_next) {
+			const auto count = _next->unreadCount();
+			const auto badgeShown = (count > 0) && (release > 0.);
+			const auto font = st::historyPullNextBadgeFont;
+			const auto badgeHeight = float64(st::historyPullNextBadge);
+			const auto string = badgeShown
+				? ((count > 999) ? u"999+"_q : QString::number(count))
+				: QString();
+			const auto badgeWidth = badgeShown
+				? std::max(
+					font->width(string) + badgeHeight - font->height,
+					badgeHeight)
+				: 0.;
+			const auto badge = badgeShown
+				? QRectF(
+					avRect.x() + avRect.width() - badgeWidth + badgeHeight / 3.,
+					avRect.y() - badgeHeight / 4.,
+					badgeWidth,
+					badgeHeight)
+				: QRectF();
+			const auto ringWidth = float64(st::historyPullNextBadgeRing);
+			const auto layerRect = badgeShown
+				? avRect.united(badge + Margins(ringWidth))
+				: avRect;
+
+			const auto ratio = style::DevicePixelRatio();
+			auto layer = QImage(
+				(layerRect.size() * ratio).toSize(),
+				QImage::Format_ARGB32_Premultiplied);
+			layer.setDevicePixelRatio(ratio);
+			layer.fill(Qt::transparent);
+			{
+				auto q = QPainter(&layer);
+				q.setRenderHint(QPainter::Antialiasing);
+				q.translate(-layerRect.topLeft());
+
+				q.save();
+				q.translate(rect::center(avRect));
+				q.scale(size / avatar, size / avatar);
+				q.translate(-avatar / 2., -avatar / 2.);
+				_next->peer->paintUserpic(q, _userpic, 0, 0, int(avatar), true);
+				q.restore();
+
+				if (badgeShown) {
+					q.translate(rect::center(badge));
+					q.scale(release, release);
+					q.translate(-rect::center(badge));
+					q.setPen(Qt::NoPen);
+					q.setBrush(st::dialogsUnreadBg->c);
+					q.drawRoundedRect(
+						badge,
+						badgeHeight / 2.,
+						badgeHeight / 2.);
+					q.setPen(st::dialogsUnreadFg->c);
+					q.setFont(font);
+					q.drawText(badge, string, QTextOption(Qt::AlignCenter));
+
+					auto pen = QPen(Qt::transparent);
+					pen.setWidthF(ringWidth);
+					const auto ring = badge + Margins(ringWidth / 2.);
+					q.setCompositionMode(QPainter::CompositionMode_Source);
+					q.setPen(pen);
+					q.setBrush(Qt::NoBrush);
+					q.drawRoundedRect(
+						ring,
+						ring.height() / 2.,
+						ring.height() / 2.);
+				}
+			}
+			p.setOpacity(alpha);
+			p.drawImage(layerRect.topLeft(), layer);
+		} else {
+			p.setPen(Qt::NoPen);
+			p.setBrush(bg);
+			p.drawEllipse(avRect);
+			PaintCheck(p, rect::center(avRect), size / 2., fg);
+		}
+	}
+}
+
+class PullToNextChannel::HintOverlay final : public Ui::RpWidget {
+public:
+	explicit HintOverlay(not_null<QWidget*> parent);
+
+	void setData(bool visible, bool ready, History *next);
+	void hideNow();
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	bool _visible = false;
+	bool _ready = false;
+	bool _has = false;
+	Ui::Animations::Simple _panel;
+	Ui::Animations::Simple _releaseProgress;
+
+};
+
+PullToNextChannel::HintOverlay::HintOverlay(not_null<QWidget*> parent)
+: RpWidget(parent) {
+	setAttribute(Qt::WA_TransparentForMouseEvents);
+	hide();
+}
+
+void PullToNextChannel::HintOverlay::setData(
+		bool visible,
+		bool ready,
+		History *next) {
+	_has = (next != nullptr);
+	const auto want = visible && _has;
+	if (_visible != want) {
+		_visible = want;
+		_panel.start([=] {
+			update();
+			if (!_panel.animating() && !_visible) {
+				hide();
+			}
+		}, want ? 0. : 1., want ? 1. : 0., kPanelDuration, anim::easeOutQuint);
+	}
+	if (_ready != ready) {
+		_ready = ready;
+		_releaseProgress.start(
+			[=] { update(); },
+			ready ? 0. : 1.,
+			ready ? 1. : 0.,
+			ready ? kReleaseShowDuration : kReleaseHideDuration,
+			anim::easeOutQuint);
+	}
+	if (want && isHidden()) {
+		show();
+	}
+	update();
+}
+
+void PullToNextChannel::HintOverlay::hideNow() {
+	_visible = false;
+	_ready = false;
+	_panel.stop();
+	_releaseProgress.stop();
+	hide();
+}
+
+void PullToNextChannel::HintOverlay::paintEvent(QPaintEvent *e) {
+	const auto panel = _panel.value(_visible ? 1. : 0.);
+	if (panel <= 0.) {
+		return;
+	}
+
+	auto p = QPainter(this);
+	p.setRenderHint(QPainter::Antialiasing);
+
+	p.setOpacity(panel);
+	p.fillRect(rect(), st::windowBg);
+
+	const auto release = _releaseProgress.value(_ready ? 1. : 0.);
+	const auto slide = st::historyPullNextHintSlide;
+	const auto font = st::historyPullNextHintFont;
+	const auto avail = width() - 4 * st::historyPullNextSkip;
+	const auto top = (height() - font->height) / 2.;
+	p.setFont(font);
+	p.setPen(st::windowSubTextFg);
+	if (release < 1.) {
+		p.setOpacity(panel * (1. - release));
+		const auto pull = font->elided(
+			tr::lng_pull_next_channel(tr::now),
+			avail);
+		p.drawText(
+			QRectF(0., top - slide * release, width(), font->height),
+			pull,
+			QTextOption(Qt::AlignCenter));
+	}
+	if (release > 0.) {
+		p.setOpacity(panel * release);
+		const auto rel = font->elided(
+			tr::lng_release_next_channel(tr::now),
+			avail);
+		p.drawText(
+			QRectF(0., top + slide * (1. - release), width(), font->height),
+			rel,
+			QTextOption(Qt::AlignCenter));
+	}
+}
+
+PullToNextChannel::PullToNextChannel(
+	not_null<Ui::RpWidget*> parent,
+	not_null<Ui::ContinuousScroll*> scroll,
+	not_null<Window::SessionController*> controller)
+: _parent(parent)
+, _scroll(scroll)
+, _controller(controller)
+, _indicator(base::make_unique_q<Indicator>(scroll, controller->chatStyle()))
+, _hint(base::make_unique_q<HintOverlay>(parent)) {
+}
+
+PullToNextChannel::~PullToNextChannel() = default;
+
+void PullToNextChannel::attachToContent(not_null<HistoryInner*> inner) {
+	reset();
+	_inner = inner.get();
+	_filter = base::unique_qptr<QObject>(base::install_event_filter(
+		inner,
+		[=](not_null<QEvent*> e) {
+			return (e->type() == QEvent::Wheel
+					&& processWheel(static_cast<QWheelEvent*>(e.get())))
+				? base::EventFilterResult::Cancel
+				: base::EventFilterResult::Continue;
+		}));
+}
+
+void PullToNextChannel::setHistory(History *history) {
+	if (_history == history) {
+		return;
+	}
+	_history = history;
+	reset();
+}
+
+bool PullToNextChannel::active() const {
+	return _history
+		&& _history->peer->isBroadcast()
+		&& atBottom()
+		&& !_controller->session().sponsoredMessages().hasUnshownFor(_history);
+}
+
+bool PullToNextChannel::atBottom() const {
+	return (_scroll->scrollTop() >= _scroll->scrollTopMax())
+		&& _history->loadedAtBottom();
+}
+
+bool PullToNextChannel::processWheel(not_null<QWheelEvent*> e) {
+	const auto phase = e->phase();
+	if (phase == Qt::NoScrollPhase) {
+		return false;
+	} else if (phase == Qt::ScrollBegin) {
+		reset();
+		return false;
+	} else if (phase == Qt::ScrollEnd || phase == Qt::ScrollMomentum) {
+		return release() || _retract.animating() || _swallowMomentum;
+	} else if (!_engaged
+		&& (_gaveUp
+			|| !_history
+			|| !_history->peer->isBroadcast()
+			|| !atBottom())) {
+		return false;
+	}
+	const auto delta = Ui::ScrollDeltaF(e);
+	return applyDelta(delta.x(), delta.y());
+}
+
+bool PullToNextChannel::applyDelta(float64 deltaX, float64 deltaY) {
+	if (!_engaged) {
+		_swipeX += deltaX;
+		_swipeY += deltaY;
+		const auto down = -_swipeY;
+		const auto sideways = std::abs(_swipeX);
+		if (sideways > kDirectionLock && sideways >= down) {
+			_gaveUp = true;
+			return false;
+		} else if (down < -kDirectionLock) {
+			_gaveUp = true;
+			return false;
+		} else if (!active()) {
+			return false;
+		} else if (down <= kDirectionLock || down <= sideways) {
+			return true;
+		}
+		_engaged = true;
+		_retract.stop();
+		_accumulated = down;
+		_next = FindNextUnreadChannel(_controller, _history->peer);
+		if (_next && !_next->isReadyFor(ShowAtUnreadMsgId)) {
+			[[maybe_unused]] const auto id = Support::SendPreloadRequest(
+				_next,
+				[] {});
+		}
+		if (_next) {
+			PreloadPinnedBar(_next);
+		}
+	} else {
+		_accumulated = std::max(0., _accumulated - deltaY);
+	}
+	const auto threshold = float64(st::historyPullNextThreshold);
+	_offset = std::max(0., std::min(
+		float64(st::historyPullNextMaxHeight),
+		float64(Ui::OverscrollFromAccumulated(
+			int(base::SafeRound(_accumulated))))));
+	const auto ratio = threshold ? (_offset / threshold) : 0.;
+	if (_next && !_reached && ratio >= 1.) {
+		_reached = true;
+		base::Platform::Haptic();
+		startExpand(true);
+	} else if (_reached && ratio < kResetReachedOn) {
+		_reached = false;
+		startExpand(false);
+	}
+	push(_offset, _reached, _offset > 0., _next);
+	return true;
+}
+
+bool PullToNextChannel::release() {
+	if (!_engaged) {
+		return false;
+	}
+	const auto next = _next;
+	const auto fromAccumulated = _accumulated;
+	const auto ready = (_offset >= float64(st::historyPullNextThreshold))
+		&& next
+		&& next->unreadCount() > 0;
+	_swallowMomentum = true;
+	clearState();
+	if (ready) {
+		crl::on_main(_parent.get(), [=] { jumpWhenReady(next, 0); });
+	} else {
+		startRetract(fromAccumulated, next);
+	}
+	return true;
+}
+
+void PullToNextChannel::push(
+		float64 offset,
+		bool ready,
+		bool visible,
+		History *next) {
+	_pushOffset = offset;
+	_pushVisible = visible;
+	_pushNext = next;
+	render(ready);
+}
+
+void PullToNextChannel::render(bool ready) {
+	const auto full = float64(st::historyPullNextExpand);
+	const auto expand = _expand.value(ready ? 1. : 0.);
+	const auto effective = _pushOffset + (full - _pushOffset) * expand;
+	applyShift(int(base::SafeRound(effective)));
+	_indicator->setData(effective, ready, _pushNext);
+	_hint->setData(_pushVisible, ready, _pushNext);
+}
+
+void PullToNextChannel::startExpand(bool ready) {
+	_expand.start(
+		[=] { render(_reached); },
+		ready ? 0. : 1.,
+		ready ? 1. : 0.,
+		kExpandDuration,
+		anim::easeOutQuint);
+}
+
+void PullToNextChannel::applyShift(int shift) {
+	if (_inner && _inner->pullBottomInset() != shift) {
+		_inner->setPullBottomInset(shift);
+		_scroll->scrollToY(_scroll->scrollTopMax());
+		_inner->update();
+	}
+}
+
+void PullToNextChannel::startRetract(float64 fromAccumulated, History *next) {
+	if (fromAccumulated <= 0.) {
+		push(0., false, false, nullptr);
+		return;
+	}
+	_retract.start([=] {
+		const auto progress = _retract.value(0.);
+		if (_retract.animating()) {
+			const auto offset = float64(Ui::OverscrollFromAccumulated(
+				int(base::SafeRound(fromAccumulated * progress))));
+			push(offset, false, true, next);
+		} else {
+			push(0., false, false, nullptr);
+		}
+	}, 1., 0., kRetractDuration, anim::sineInOut);
+}
+
+void PullToNextChannel::clearState() {
+	_expand.stop();
+	_accumulated = 0.;
+	_offset = 0.;
+	_swipeX = 0.;
+	_swipeY = 0.;
+	_engaged = false;
+	_reached = false;
+	_gaveUp = false;
+	_next = nullptr;
+}
+
+void PullToNextChannel::reset() {
+	_retract.stop();
+	_swallowMomentum = false;
+	clearState();
+	applyShift(0);
+	_indicator->hideNow();
+	_hint->hideNow();
+}
+
+void PullToNextChannel::updateGeometry() {
+	const auto height = st::historyPullNextMaxHeight;
+	_indicator->setGeometry(
+		0,
+		_scroll->height() - height,
+		_scroll->width(),
+		height);
+	_indicator->raise();
+
+	const auto top = _scroll->y() + _scroll->height();
+	const auto bottom = _parent->height();
+	if (bottom > top) {
+		_hint->setGeometry(_scroll->x(), top, _scroll->width(), bottom - top);
+		_hint->raise();
+	}
+}
+
+void PullToNextChannel::jumpWhenReady(
+		not_null<History*> next,
+		crl::time waited) {
+	constexpr auto kInterval = crl::time(100);
+	constexpr auto kMaxWait = crl::time(1500);
+	constexpr auto kPinnedMaxWait = crl::time(600);
+	const auto historyReady = next->isReadyFor(ShowAtUnreadMsgId);
+	const auto pinnedReady = (waited >= kPinnedMaxWait) || PinnedBarReady(next);
+	if ((historyReady && pinnedReady) || waited >= kMaxWait) {
+		jumpTo(next);
+		return;
+	}
+	base::call_delayed(kInterval, _parent.get(), [=] {
+		jumpWhenReady(next, waited + kInterval);
+	});
+}
+
+void PullToNextChannel::jumpTo(not_null<History*> history) {
+	auto params = Window::SectionShow(Window::SectionShow::Way::ClearStack);
+	params.slideFromBottom = true;
+	_controller->showPeerHistory(history, params);
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/history_view_pull_to_next_channel.h b/Telegram/SourceFiles/history/history_view_pull_to_next_channel.h
new file mode 100644
index 00000000000000..34dc2f01adb98d
--- /dev/null
+++ b/Telegram/SourceFiles/history/history_view_pull_to_next_channel.h
@@ -0,0 +1,91 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/unique_qptr.h"
+#include "ui/effects/animations.h"
+
+class History;
+class HistoryInner;
+class QEvent;
+class QWheelEvent;
+
+namespace Ui {
+class RpWidget;
+class ContinuousScroll;
+} // namespace Ui
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace HistoryView {
+
+class PullToNextChannel final {
+public:
+	PullToNextChannel(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Ui::ContinuousScroll*> scroll,
+		not_null<Window::SessionController*> controller);
+	~PullToNextChannel();
+
+	void attachToContent(not_null<HistoryInner*> inner);
+
+	void setHistory(History *history);
+
+	void updateGeometry();
+
+private:
+	class Indicator;
+	class HintOverlay;
+
+	[[nodiscard]] bool active() const;
+	[[nodiscard]] bool atBottom() const;
+	[[nodiscard]] bool processWheel(not_null<QWheelEvent*> e);
+	[[nodiscard]] bool applyDelta(float64 deltaX, float64 deltaY);
+	[[nodiscard]] bool release();
+	void push(float64 offset, bool ready, bool visible, History *next);
+	void render(bool ready);
+	void startExpand(bool ready);
+	void applyShift(int shift);
+	void startRetract(float64 fromAccumulated, History *next);
+	void clearState();
+	void reset();
+	void jumpWhenReady(not_null<History*> next, crl::time waited);
+	void jumpTo(not_null<History*> history);
+
+	const not_null<Ui::RpWidget*> _parent;
+	const not_null<Ui::ContinuousScroll*> _scroll;
+	const not_null<Window::SessionController*> _controller;
+	const base::unique_qptr<Indicator> _indicator;
+	const base::unique_qptr<HintOverlay> _hint;
+
+	QPointer<HistoryInner> _inner;
+	History *_history = nullptr;
+	History *_next = nullptr;
+
+	base::unique_qptr<QObject> _filter;
+	Ui::Animations::Simple _retract;
+	Ui::Animations::Simple _expand;
+
+	float64 _pushOffset = 0.;
+	bool _pushVisible = false;
+	History *_pushNext = nullptr;
+
+	float64 _accumulated = 0.;
+	float64 _offset = 0.;
+	float64 _swipeX = 0.;
+	float64 _swipeY = 0.;
+	bool _engaged = false;
+	bool _reached = false;
+	bool _gaveUp = false;
+	bool _swallowMomentum = false;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/history_view_swipe.cpp b/Telegram/SourceFiles/history/history_view_swipe.cpp
deleted file mode 100644
index 214310fead1105..00000000000000
--- a/Telegram/SourceFiles/history/history_view_swipe.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "history/history_view_swipe.h"
-
-#include "base/platform/base_platform_haptic.h"
-#include "base/platform/base_platform_info.h"
-#include "base/qt/qt_common_adapters.h"
-#include "base/event_filter.h"
-#include "history/history_view_swipe_data.h"
-#include "ui/chat/chat_style.h"
-#include "ui/ui_utility.h"
-#include "ui/widgets/elastic_scroll.h"
-#include "ui/widgets/scroll_area.h"
-
-#include <QtWidgets/QApplication>
-
-namespace HistoryView {
-namespace {
-
-constexpr auto kSwipeSlow = 0.2;
-
-} // namespace
-
-void SetupSwipeHandler(
-		not_null<Ui::RpWidget*> widget,
-		not_null<Ui::ScrollArea*> scroll,
-		Fn<void(ChatPaintGestureHorizontalData)> update,
-		Fn<SwipeHandlerFinishData(int)> generateFinishByTop,
-		rpl::producer<bool> dontStart) {
-	constexpr auto kThresholdWidth = 50;
-	constexpr auto kMaxRatio = 1.5;
-	const auto threshold = style::ConvertFloatScale(kThresholdWidth);
-	struct UpdateArgs {
-		QPoint globalCursor;
-		QPointF position;
-		QPointF delta;
-		bool touch = false;
-	};
-	struct State {
-		base::unique_qptr<QObject> filter;
-		Ui::Animations::Simple animationReach;
-		Ui::Animations::Simple animationEnd;
-		ChatPaintGestureHorizontalData data;
-		SwipeHandlerFinishData finishByTopData;
-		std::optional<Qt::Orientation> orientation;
-		QPointF startAt;
-		QPointF delta;
-		int cursorTop = 0;
-		bool dontStart = false;
-		bool started = false;
-		bool reached = false;
-		bool touch = false;
-
-		rpl::lifetime lifetime;
-	};
-	const auto state = widget->lifetime().make_state<State>();
-	std::move(
-		dontStart
-	) | rpl::start_with_next([=](bool dontStart) {
-		state->dontStart = dontStart;
-	}, state->lifetime);
-
-	const auto updateRatio = [=](float64 ratio) {
-		ratio = std::max(ratio, 0.);
-		state->data.ratio = ratio;
-		const auto overscrollRatio = std::max(ratio - 1., 0.);
-		const auto translation = int(
-			base::SafeRound(-std::min(ratio, 1.) * threshold)
-		) + Ui::OverscrollFromAccumulated(int(
-			base::SafeRound(-overscrollRatio * threshold)
-		));
-		state->data.msgBareId = state->finishByTopData.msgBareId;
-		state->data.translation = translation;
-		state->data.cursorTop = state->cursorTop;
-		update(state->data);
-	};
-	const auto setOrientation = [=](std::optional<Qt::Orientation> o) {
-		state->orientation = o;
-		const auto isHorizontal = (o == Qt::Horizontal);
-		scroll->viewport()->setAttribute(
-			Qt::WA_AcceptTouchEvents,
-			!isHorizontal);
-		scroll->disableScroll(isHorizontal);
-	};
-	const auto processEnd = [=](std::optional<QPointF> delta = {}) {
-		if (state->orientation == Qt::Horizontal) {
-			const auto ratio = std::clamp(
-				delta.value_or(state->delta).x() / threshold,
-				0.,
-				kMaxRatio);
-			if ((ratio >= 1) && state->finishByTopData.callback) {
-				Ui::PostponeCall(
-					widget,
-					state->finishByTopData.callback);
-			}
-			state->animationEnd.stop();
-			state->animationEnd.start(
-				updateRatio,
-				ratio,
-				0.,
-				std::min(1., ratio) * st::slideWrapDuration);
-		}
-		setOrientation(std::nullopt);
-		state->started = false;
-		state->reached = false;
-	};
-	scroll->scrolls() | rpl::start_with_next([=] {
-		if (state->orientation != Qt::Vertical) {
-			processEnd();
-		}
-	}, state->lifetime);
-	const auto animationReachCallback = [=](float64 value) {
-		state->data.reachRatio = value;
-		update(state->data);
-	};
-	const auto updateWith = [=](UpdateArgs args) {
-		if (!state->started || state->touch != args.touch) {
-			state->started = true;
-			state->touch = args.touch;
-			state->startAt = args.position;
-			state->delta = QPointF();
-			state->cursorTop = widget->mapFromGlobal(args.globalCursor).y();
-			state->finishByTopData = generateFinishByTop(
-				state->cursorTop);
-			if (!state->finishByTopData.callback) {
-				setOrientation(Qt::Vertical);
-			}
-		} else if (!state->orientation) {
-			state->delta = args.delta;
-			const auto diffXtoY = std::abs(args.delta.x())
-				- std::abs(args.delta.y());
-			constexpr auto kOrientationThreshold = 1.;
-			if (diffXtoY > kOrientationThreshold) {
-				if (!state->dontStart) {
-					setOrientation(Qt::Horizontal);
-				}
-			} else if (diffXtoY < -kOrientationThreshold) {
-				setOrientation(Qt::Vertical);
-			} else {
-				setOrientation(std::nullopt);
-			}
-		} else if (*state->orientation == Qt::Horizontal) {
-			state->delta = args.delta;
-			const auto ratio = args.delta.x() / threshold;
-			updateRatio(ratio);
-			constexpr auto kResetReachedOn = 0.95;
-			constexpr auto kBounceDuration = crl::time(500);
-			if (!state->reached && ratio >= 1.) {
-				state->reached = true;
-				state->animationReach.stop();
-				state->animationReach.start(
-					animationReachCallback,
-					0.,
-					1.,
-					kBounceDuration);
-				base::Platform::Haptic();
-			} else if (state->reached
-				&& ratio < kResetReachedOn) {
-				state->reached = false;
-			}
-		}
-	};
-	const auto filter = [=](not_null<QEvent*> e) {
-		const auto type = e->type();
-		switch (type) {
-		case QEvent::Leave: {
-			if (state->orientation == Qt::Horizontal) {
-				processEnd();
-			}
-		} break;
-		case QEvent::MouseMove: {
-			if (state->orientation == Qt::Horizontal) {
-				const auto m = static_cast<QMouseEvent*>(e.get());
-				if (std::abs(m->pos().y() - state->cursorTop)
-					> QApplication::startDragDistance()) {
-					processEnd();
-				}
-			}
-		} break;
-		case QEvent::TouchBegin:
-		case QEvent::TouchUpdate:
-		case QEvent::TouchEnd:
-		case QEvent::TouchCancel: {
-			const auto t = static_cast<QTouchEvent*>(e.get());
-			const auto touchscreen = t->device()
-				&& (t->device()->type() == base::TouchDevice::TouchScreen);
-			if (!touchscreen) {
-				break;
-			} else if (type == QEvent::TouchBegin) {
-				// Reset state in case we lost some TouchEnd.
-				processEnd();
-			}
-			const auto &touches = t->touchPoints();
-			const auto released = [&](int index) {
-				return (touches.size() > index)
-					&& (touches.at(index).state() & Qt::TouchPointReleased);
-			};
-			const auto cancel = released(0)
-				|| released(1)
-				|| (touches.size() != (touchscreen ? 1 : 2))
-				|| (type == QEvent::TouchEnd)
-				|| (type == QEvent::TouchCancel);
-			if (cancel) {
-				processEnd(touches.empty()
-					? std::optional<QPointF>()
-					: (state->startAt - touches[0].pos()));
-			} else {
-				const auto args = UpdateArgs{
-					.globalCursor = (touchscreen
-						? touches[0].screenPos().toPoint()
-						: QCursor::pos()),
-					.position = touches[0].pos(),
-					.delta = state->startAt - touches[0].pos(),
-					.touch = true,
-				};
-				updateWith(args);
-			}
-			return (touchscreen && state->orientation != Qt::Horizontal)
-				? base::EventFilterResult::Continue
-				: base::EventFilterResult::Cancel;
-		} break;
-		case QEvent::Wheel: {
-			const auto w = static_cast<QWheelEvent*>(e.get());
-			const auto phase = w->phase();
-			if (phase == Qt::NoScrollPhase) {
-				break;
-			} else if (phase == Qt::ScrollBegin) {
-				// Reset state in case we lost some TouchEnd.
-				processEnd();
-			}
-			const auto cancel = w->buttons()
-				|| (phase == Qt::ScrollEnd)
-				|| (phase == Qt::ScrollMomentum);
-			if (cancel) {
-				processEnd();
-			} else {
-				const auto invert = (w->inverted() ? -1 : 1);
-				const auto delta = Ui::ScrollDeltaF(w) * invert;
-				updateWith({
-					.globalCursor = w->globalPosition().toPoint(),
-					.position = QPointF(),
-					.delta = state->delta + delta * kSwipeSlow,
-					.touch = false,
-				});
-			}
-		} break;
-		}
-		return base::EventFilterResult::Continue;
-	};
-	state->filter = base::make_unique_q<QObject>(
-		base::install_event_filter(widget, filter));
-}
-
-} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/history_view_swipe_back_session.cpp b/Telegram/SourceFiles/history/history_view_swipe_back_session.cpp
new file mode 100644
index 00000000000000..2cf21160936eba
--- /dev/null
+++ b/Telegram/SourceFiles/history/history_view_swipe_back_session.cpp
@@ -0,0 +1,63 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/history_view_swipe_back_session.h"
+
+#include "history/view/history_view_list_widget.h"
+#include "ui/chat/chat_style.h"
+#include "ui/controls/swipe_handler.h"
+#include "ui/controls/swipe_handler_data.h"
+#include "window/window_session_controller.h"
+
+namespace Window {
+
+void SetupSwipeBackSection(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Ui::ScrollArea*> scroll,
+		not_null<HistoryView::ListWidget*> list) {
+	const auto swipeBackData
+		= list->lifetime().make_state<Ui::Controls::SwipeBackResult>();
+	auto update = [=](Ui::Controls::SwipeContextData data) {
+		if (data.translation > 0) {
+			if (!swipeBackData->callback) {
+				const auto color = [=]() -> std::pair<QColor, QColor> {
+					const auto c = list->delegate()->listPreparePaintContext({
+						.theme = list->delegate()->listChatTheme(),
+					});
+					return {
+						c.st->msgServiceBg()->c,
+						c.st->msgServiceFg()->c,
+					};
+				};
+				(*swipeBackData) = Ui::Controls::SetupSwipeBack(
+					parent,
+					color);
+			}
+			swipeBackData->callback(data);
+			return;
+		} else if (swipeBackData->lifetime) {
+			(*swipeBackData) = {};
+		}
+	};
+	auto init = [=](Ui::Controls::SwipeHandlerInitData data) {
+		if (data.direction != Qt::RightToLeft) {
+			return Ui::Controls::SwipeHandlerFinishData();
+		}
+		return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
+			list->controller()->showBackFromStack();
+		});
+	};
+	Ui::Controls::SetupSwipeHandler({
+		.widget = list,
+		.scroll = scroll,
+		.update = std::move(update),
+		.init = std::move(init),
+		.dontStart = list->touchMaybeSelectingValue(),
+	});
+}
+
+} // namespace Window
diff --git a/Telegram/SourceFiles/history/history_view_swipe.h b/Telegram/SourceFiles/history/history_view_swipe_back_session.h
similarity index 55%
rename from Telegram/SourceFiles/history/history_view_swipe.h
rename to Telegram/SourceFiles/history/history_view_swipe_back_session.h
index fe9ec2ea02f6ff..8d65f684e95d83 100644
--- a/Telegram/SourceFiles/history/history_view_swipe.h
+++ b/Telegram/SourceFiles/history/history_view_swipe_back_session.h
@@ -7,25 +7,24 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+class WindowListDelegate;
+
+namespace HistoryView {
+class ListWidget;
+} // namespace HistoryView
+
 namespace Ui {
 class RpWidget;
 class ScrollArea;
 } // namespace Ui
 
-namespace HistoryView {
-
-struct ChatPaintGestureHorizontalData;
+namespace Window {
 
-struct SwipeHandlerFinishData {
-	Fn<void(void)> callback;
-	int64 msgBareId = 0;
-};
+class SectionWidget;
 
-void SetupSwipeHandler(
-	not_null<Ui::RpWidget*> widget,
+void SetupSwipeBackSection(
+	not_null<Ui::RpWidget*> parent,
 	not_null<Ui::ScrollArea*> scroll,
-	Fn<void(ChatPaintGestureHorizontalData)> update,
-	Fn<SwipeHandlerFinishData(int)> generateFinishByTop,
-	rpl::producer<bool> dontStart = nullptr);
+	not_null<HistoryView::ListWidget*> list);
 
-} // namespace HistoryView
+} // namespace Window
diff --git a/Telegram/SourceFiles/history/history_view_top_toast.cpp b/Telegram/SourceFiles/history/history_view_top_toast.cpp
index 7736f971df949b..3bd6760266d453 100644
--- a/Telegram/SourceFiles/history/history_view_top_toast.cpp
+++ b/Telegram/SourceFiles/history/history_view_top_toast.cpp
@@ -7,14 +7,22 @@ For license and copyright information please follow this link:
 */
 #include "history/history_view_top_toast.h"
 
+#include "ui/rect.h"
 #include "ui/toast/toast.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/widgets/tooltip.h"
 #include "core/ui_integration.h"
 #include "styles/style_chat.h"
+#include "styles/style_layers.h"
+#include "styles/style_widgets.h"
 
 namespace HistoryView {
 
 namespace {
 
+constexpr auto kAnchoredTooltipDuration = 4 * crl::time(1000);
+
 [[nodiscard]] crl::time CountToastDuration(const TextWithEntities &text) {
 	return std::clamp(
 		crl::time(1000) * int(text.text.size()) / 14,
@@ -31,16 +39,11 @@ void InfoTooltip::show(
 		not_null<Main::Session*> session,
 		const TextWithEntities &text,
 		Fn<void()> hiddenCallback) {
-	const auto context = [=](not_null<QWidget*> toast) {
-		return Core::MarkedTextContext{
-			.session = session,
-			.customEmojiRepaint = [=] { toast->update(); },
-		};
-	};
 	hide(anim::type::normal);
 	_topToast = Ui::Toast::Show(parent, Ui::Toast::Config{
 		.text = text,
-		.textContext = context,
+		.textContext = Core::TextContext({ .session = session }),
+		.icon = &st::historyInfoToastIcon,
 		.st = &st::historyInfoToast,
 		.attach = RectPart::Top,
 		.duration = CountToastDuration(text),
@@ -67,4 +70,41 @@ void InfoTooltip::hide(anim::type animated) {
 	}
 }
 
+void AnchoredTooltip::show(
+		not_null<Ui::ScrollArea*> scroll,
+		QRect globalArea,
+		TextWithEntities text) {
+	if (globalArea.isEmpty()) {
+		globalArea = QRect(QCursor::pos(), Size(1));
+	}
+	_tooltip = base::make_unique_q<Ui::ImportantTooltip>(
+		scroll,
+		Ui::MakeNiceTooltipLabel(
+			scroll,
+			rpl::single(std::move(text)),
+			st::boxWideWidth,
+			st::defaultImportantTooltipLabel),
+		st::defaultImportantTooltip);
+	const auto raw = _tooltip.get();
+	raw->toggleFast(false);
+
+	const auto local = QRect(
+		scroll->mapFromGlobal(globalArea.topLeft()),
+		globalArea.size());
+	raw->pointAt(local, RectPart::Top | RectPart::Center);
+	raw->toggleAnimated(true);
+	raw->hideAfter(kAnchoredTooltipDuration);
+
+	scroll->scrolls(
+	) | rpl::on_next([=] {
+		raw->toggleAnimated(false);
+	}, raw->lifetime());
+}
+
+void AnchoredTooltip::hide() {
+	if (const auto raw = _tooltip.get()) {
+		raw->toggleAnimated(false);
+	}
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/history_view_top_toast.h b/Telegram/SourceFiles/history/history_view_top_toast.h
index 5c923f34cf1704..882d192a626a0b 100644
--- a/Telegram/SourceFiles/history/history_view_top_toast.h
+++ b/Telegram/SourceFiles/history/history_view_top_toast.h
@@ -7,12 +7,18 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/unique_qptr.h"
 #include "base/weak_ptr.h"
 
 namespace Main {
 class Session;
 } // namespace Main
 
+namespace Ui {
+class ImportantTooltip;
+class ScrollArea;
+} // namespace Ui
+
 namespace Ui::Toast {
 class Instance;
 } // namespace Ui::Toast
@@ -35,4 +41,17 @@ class InfoTooltip final {
 
 };
 
+class AnchoredTooltip final {
+public:
+	void show(
+		not_null<Ui::ScrollArea*> scroll,
+		QRect globalArea,
+		TextWithEntities text);
+	void hide();
+
+private:
+	base::unique_qptr<Ui::ImportantTooltip> _tooltip;
+
+};
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 56c61b71bad28f..f0e3c737b89e00 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -7,36 +7,46 @@ For license and copyright information please follow this link:
 */
 #include "history/history_widget.h"
 
+#include "api/api_compose_with_ai.h"
 #include "api/api_editing.h"
 #include "api/api_bot.h"
 #include "api/api_chat_participants.h"
+#include "api/api_global_privacy.h"
 #include "api/api_report.h"
 #include "api/api_sending.h"
 #include "api/api_send_progress.h"
 #include "api/api_unread_things.h"
+#include "base/random.h"
+#include "boxes/compose_ai_box.h"
 #include "ui/boxes/confirm_box.h"
 #include "boxes/delete_messages_box.h"
+#include "boxes/send_credits_box.h"
+#include "boxes/send_gif_with_caption_box.h"
 #include "boxes/send_files_box.h"
 #include "boxes/share_box.h"
 #include "boxes/edit_caption_box.h"
 #include "boxes/moderate_messages_box.h"
 #include "boxes/premium_limits_box.h"
 #include "boxes/premium_preview_box.h"
+#include "boxes/star_gift_box.h"
 #include "boxes/peers/edit_peer_permissions_box.h" // ShowAboutGigagroup.
 #include "boxes/peers/edit_peer_requests_box.h"
+#include "core/core_settings.h"
 #include "core/file_utilities.h"
 #include "core/mime_type.h"
+#include "history/view/history_view_draw_to_reply.h"
 #include "ui/emoji_config.h"
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/chat/choose_theme_controller.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/inner_dropdown.h"
 #include "ui/widgets/dropdown_menu.h"
 #include "ui/widgets/labels.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/effects/message_sending_animation_controller.h"
-#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
 #include "ui/chat/message_bar.h"
 #include "ui/chat/attach/attach_send_files_way.h"
 #include "ui/chat/choose_send_as.h"
@@ -45,6 +55,7 @@ For license and copyright information please follow this link:
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/power_saving.h"
+#include "ui/controls/compose_ai_button_factory.h"
 #include "ui/controls/emoji_button.h"
 #include "ui/controls/send_button.h"
 #include "ui/controls/send_as_button.h"
@@ -52,22 +63,27 @@ For license and copyright information please follow this link:
 #include "ui/ui_utility.h"
 #include "inline_bots/inline_bot_result.h"
 #include "base/event_filter.h"
+#include "base/options.h"
 #include "base/qt_signal_producer.h"
 #include "base/qt/qt_key_modifiers.h"
 #include "base/unixtime.h"
 #include "base/call_delayed.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/components/credits.h"
+#include "data/components/recent_inline_bots.h"
 #include "data/components/scheduled_messages.h"
 #include "data/components/sponsored_messages.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_changes.h"
 #include "data/data_drafts.h"
 #include "data/data_session.h"
+#include "data/data_todo_list.h"
 #include "data/data_web_page.h"
 #include "data/data_document.h"
+#include "data/data_document_media.h"
 #include "data/data_photo.h"
 #include "data/data_photo_media.h"
+#include "data/data_poll.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_forum.h"
@@ -84,19 +100,27 @@ For license and copyright information please follow this link:
 #include "data/stickers/data_custom_emoji.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "history/history_item_helpers.h" // GetErrorTextForSending.
+#include "history/history_item_helpers.h" // GetErrorForSending.
 #include "history/history_drag_area.h"
 #include "history/history_inner_widget.h"
 #include "history/history_item_components.h"
+#include "history/history_streamed_drafts.h"
 #include "history/history_unread_things.h"
+#include "history/history_view_pull_to_next_channel.h"
+#include "history/admin_log/history_admin_log_section.h"
+#include "history/view/controls/compose_controls_common.h"
 #include "history/view/controls/history_view_characters_limit.h"
+#include "history/view/controls/history_view_compose_ai_button.h"
+#include "history/view/controls/history_view_compose_ai_tooltip.h"
 #include "history/view/controls/history_view_compose_search.h"
 #include "history/view/controls/history_view_forward_panel.h"
 #include "history/view/controls/history_view_draft_options.h"
-#include "history/view/controls/history_view_voice_record_bar.h"
+#include "history/view/controls/history_view_suggest_options.h"
 #include "history/view/controls/history_view_ttl_button.h"
+#include "history/view/controls/history_view_voice_record_bar.h"
 #include "history/view/controls/history_view_webpage_processor.h"
 #include "history/view/reactions/history_view_reactions_button.h"
+#include "history/view/history_view_chat_section.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/history_view_service_message.h"
 #include "history/view/history_view_element.h"
@@ -109,13 +133,18 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_pinned_section.h"
 #include "history/view/history_view_pinned_bar.h"
 #include "history/view/history_view_group_call_bar.h"
+#include "history/view/history_view_group_members_widget.h"
 #include "history/view/history_view_item_preview.h"
 #include "history/view/history_view_reply.h"
 #include "history/view/history_view_requests_bar.h"
+#include "history/view/history_view_self_forwards_tagger.h"
 #include "history/view/history_view_sticker_toast.h"
+#include "history/view/history_view_subsection_tabs.h"
 #include "history/view/history_view_translate_bar.h"
 #include "history/view/media/history_view_media.h"
-#include "profile/profile_block_group_members.h"
+#ifdef TDESKTOP_IV_EDITOR
+#include "iv/editor/iv_editor_session.h"
+#endif // TDESKTOP_IV_EDITOR
 #include "core/click_handler_types.h"
 #include "chat_helpers/field_autocomplete.h"
 #include "chat_helpers/tabbed_panel.h"
@@ -124,9 +153,11 @@ For license and copyright information please follow this link:
 #include "chat_helpers/bot_keyboard.h"
 #include "chat_helpers/message_field.h"
 #include "menu/menu_send.h"
+#include "menu/menu_timecode_action.h"
 #include "mtproto/mtproto_config.h"
 #include "lang/lang_keys.h"
 #include "settings/business/settings_quick_replies.h"
+#include "settings/settings_credits_graphics.h"
 #include "storage/localimageloader.h"
 #include "storage/storage_account.h"
 #include "storage/file_upload.h"
@@ -144,12 +175,15 @@ For license and copyright information please follow this link:
 #include "ui/chat/chat_theme.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/continuous_scroll.h"
+#include "ui/widgets/checkbox.h"
 #include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/item_text_options.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "main/session/send_as_peers.h"
+#include "webrtc/webrtc_environment.h"
 #include "window/notifications_manager.h"
 #include "window/window_adaptive.h"
 #include "window/window_controller.h"
@@ -164,6 +198,7 @@ For license and copyright information please follow this link:
 #include "core/ui_integration.h"
 #include "support/support_common.h"
 #include "support/support_autocomplete.h"
+#include "support/support_helper.h"
 #include "support/support_preload.h"
 #include "dialogs/dialogs_key.h"
 #include "calls/calls_instance.h"
@@ -228,6 +263,7 @@ HistoryWidget::HistoryWidget(
 , _api(&controller->session().mtp())
 , _updateEditTimeLeftDisplay([=] { updateField(); })
 , _fieldBarCancel(this, st::historyReplyCancel)
+, _topBars(std::make_unique<Ui::RpWidget>(this))
 , _topBar(this, controller)
 , _scroll(
 	this,
@@ -238,10 +274,20 @@ HistoryWidget::HistoryWidget(
 	_scroll.data(),
 	controller->chatStyle(),
 	static_cast<HistoryView::CornerButtonsDelegate*>(this))
+, _pullToNext(std::make_unique<HistoryView::PullToNextChannel>(
+	this,
+	_scroll.data(),
+	controller))
 , _supportAutocomplete(session().supportMode()
 	? object_ptr<Support::Autocomplete>(this, &session())
 	: nullptr)
 , _send(std::make_shared<Ui::SendButton>(this, st::historySend))
+, _aiButton(Ui::CreateChild<HistoryView::Controls::ComposeAiButton>(
+	this,
+	st::historyAiComposeButton))
+, _sendAsFile(Ui::CreateChild<Ui::IconButton>(
+	this,
+	st::historySendAsFileButton))
 , _unblock(
 	this,
 	tr::lng_unblock_button(tr::now).toUpper(),
@@ -291,14 +337,14 @@ HistoryWidget::HistoryWidget(
 , _paidReactionToast(std::make_unique<HistoryView::PaidReactionToast>(
 	this,
 	&session().data(),
-	rpl::single(st::topBarHeight),
+	rpl::single(0),
 	[=](not_null<const HistoryView::Element*> view) {
 		return _list && _list->itemTop(view) >= 0;
 	}))
 , _topShadow(this) {
 	setAcceptDrops(true);
 
-	session().downloaderTaskFinished() | rpl::start_with_next([=] {
+	session().downloaderTaskFinished() | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
@@ -311,38 +357,34 @@ HistoryWidget::HistoryWidget(
 			? base::EventFilterResult::Cancel
 			: base::EventFilterResult::Continue;
 	});
-	_scroll->scrolls() | rpl::start_with_next([=] {
+	_scroll->scrolls() | rpl::on_next([=] {
 		handleScroll();
 	}, lifetime());
 	_scroll->geometryChanged(
-	) | rpl::start_with_next(crl::guard(_list, [=] {
+	) | rpl::on_next(crl::guard(_list, [=] {
 		_list->onParentGeometryChanged();
 	}), lifetime());
 
-	const auto weak = Ui::MakeWeak(this);
 	_scroll->addContentRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_history && _history->loadedAtBottom()) {
 			using Result = Data::SponsoredMessages::AppendResult;
 			const auto tryToAppend = [=] {
-				const auto r = session().sponsoredMessages().append(_history);
-				if (r == Result::Appended) {
+				const auto sponsored = &session().sponsoredMessages();
+				const auto result = sponsored->append(_history);
+				if (result == Result::Appended) {
 					_scroll->contentAdded();
 				}
-				return r;
+				return result;
 			};
-			if (tryToAppend() == Result::MediaLoading) {
-				const auto sharedLifetime = std::make_shared<rpl::lifetime>();
+			if (tryToAppend() == Result::MediaLoading
+				&& !_historySponsoredPreloading) {
 				session().downloaderTaskFinished(
-				) | rpl::start_with_next([=] {
-					if (const auto strong = weak.data()) {
-						if (tryToAppend() != Result::MediaLoading) {
-							sharedLifetime->destroy();
-						}
-					} else {
-						sharedLifetime->destroy();
+				) | rpl::on_next([=] {
+					if (tryToAppend() != Result::MediaLoading) {
+						_historySponsoredPreloading.destroy();
 					}
-				}, *sharedLifetime);
+				}, _historySponsoredPreloading);
 			}
 		}
 	}, lifetime());
@@ -350,77 +392,89 @@ HistoryWidget::HistoryWidget(
 	_fieldBarCancel->addClickHandler([=] { cancelFieldAreaState(); });
 	_send->addClickHandler([=] { sendButtonClicked(); });
 
-	_mediaEditManager.updateRequests() | rpl::start_with_next([this] {
+	_mediaEditManager.updateRequests() | rpl::on_next([this] {
 		updateOverStates(mapFromGlobal(QCursor::pos()));
 	}, lifetime());
 
-	{
-		using namespace SendMenu;
-		const auto sendAction = [=](Action action, Details) {
-			if (action.type == ActionType::CaptionUp
-				|| action.type == ActionType::CaptionDown
-				|| action.type == ActionType::SpoilerOn
-				|| action.type == ActionType::SpoilerOff) {
-				_mediaEditManager.apply(action);
-			} else if (action.type == ActionType::Send) {
-				send(action.options);
-			} else {
-				sendScheduled(action.options);
-			}
-		};
-		SetupMenuAndShortcuts(
-			_send.get(),
-			controller->uiShow(),
-			[=] { return sendButtonMenuDetails(); },
-			sendAction);
-	}
+	setupSendMenu(_send.get(), [=](SendMenu::Action action, SendMenu::Details) {
+		if (action.type == SendMenu::ActionType::Send) {
+			send(action.options);
+		} else {
+			sendScheduled(action.options);
+		}
+	});
 	_unblock->addClickHandler([=] { unblockUser(); });
 	_botStart->addClickHandler([=] { sendBotStartCommand(); });
 	_joinChannel->addClickHandler([=] { joinChannel(); });
 	_muteUnmute->addClickHandler([=] { toggleMuteUnmute(); });
+	setupGiftToChannelButton();
+	setupDirectMessageButton();
 	_reportMessages->addClickHandler([=] { reportSelectedMessages(); });
 	_field->submits(
-	) | rpl::start_with_next([=](Qt::KeyboardModifiers modifiers) {
+	) | rpl::on_next([=](Qt::KeyboardModifiers modifiers) {
 		sendWithModifiers(modifiers);
 	}, _field->lifetime());
 	_field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
+		if (_peer->amMonoforumAdmin()) {
+			QWidget::setEnabled(false);
+			crl::on_main([=] {
+				QWidget::setEnabled(true);
+				QWidget::setFocus();
+			});
+		}
 		escape();
 	}, _field->lifetime());
 	_field->tabbed(
-	) | rpl::start_with_next([=] {
-		fieldTabbed();
+	) | rpl::on_next([=](not_null<bool*> handled) {
+		if (_supportAutocomplete) {
+			_supportAutocomplete->activate(_field.data());
+			*handled = true;
+		}
 	}, _field->lifetime());
 	_field->heightChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		fieldResized();
 	}, _field->lifetime());
 	_field->focusedChanges(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		fieldFocused();
 	}, _field->lifetime());
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		fieldChanged();
 	}, _field->lifetime());
+	Data::AmPremiumValue(&session()) | rpl::on_next([=] {
+		checkCharsLimitation();
+		updateAiButtonVisibility();
+		updateSendAsFileVisibility();
+	}, lifetime());
 #ifdef Q_OS_MAC
 	// Removed an ability to insert text from the menu bar
 	// when the field is hidden.
 	_field->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		_field->setEnabled(shown);
 	}, _field->lifetime());
 #endif // Q_OS_MAC
 	controller->widget()->shownValue(
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		windowIsVisibleChanged();
 	}, lifetime());
 
 	initTabbedSelector();
 
 	_attachToggle->setClickedCallback([=] {
+		const auto toggle = _attachBotsMenu && _attachBotsMenu->isHidden();
 		base::call_delayed(st::historyAttach.ripple.hideDuration, this, [=] {
-			chooseAttach();
+			if (_attachBotsMenu && toggle) {
+				_attachBotsMenu->showAnimated();
+			} else {
+				chooseAttach();
+				if (_attachBotsMenu) {
+					_attachBotsMenu->hideAnimated();
+				}
+			}
 		});
 	});
 
@@ -430,7 +484,7 @@ HistoryWidget::HistoryWidget(
 		base::qt_signal_producer(
 			rawTextEdit,
 			&QTextEdit::cursorPositionChanged)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		saveDraftDelayed();
 	}, _field->lifetime());
 
@@ -441,17 +495,17 @@ HistoryWidget::HistoryWidget(
 	_kbScroll->hide();
 
 	controller->chatStyle()->paletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_scroll->updateBars();
 	}, lifetime());
 
 	_forwardPanel->itemsUpdated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateControlsVisibility();
 		updateControlsGeometry();
 	}, lifetime());
 
-	InitMessageField(controller, _field, [=](
+	_fieldChatStyle = InitMessageField(controller, _field, [=](
 			not_null<DocumentData*> document) {
 		if (_peer && Data::AllowEmojiWithoutPremium(_peer, document)) {
 			return true;
@@ -461,8 +515,12 @@ HistoryWidget::HistoryWidget(
 	});
 	InitMessageFieldFade(_field, st::historyComposeField.textBg);
 
+	setupFastButtonMode();
+	initAiButton();
+	initSendAsFileButton();
+
 	_fieldCharsCountManager.limitExceeds(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto hide = _fieldCharsCountManager.isLimitExceeded();
 		if (_silent) {
 			_silent->setVisible(!hide);
@@ -470,6 +528,9 @@ HistoryWidget::HistoryWidget(
 		if (_ttlInfo) {
 			_ttlInfo->setVisible(!hide);
 		}
+		if (_giftToUser) {
+			_giftToUser->setVisible(!hide);
+		}
 		if (_scheduled) {
 			_scheduled->setVisible(!hide);
 		}
@@ -477,8 +538,13 @@ HistoryWidget::HistoryWidget(
 		moveFieldControls();
 	}, lifetime());
 
+	_send->widthValue() | rpl::skip(1) | rpl::on_next([=] {
+		updateFieldSize();
+		moveFieldControls();
+	}, _send->lifetime());
+
 	_keyboard->sendCommandRequests(
-	) | rpl::start_with_next([=](Bot::SendCommandRequest r) {
+	) | rpl::on_next([=](Bot::SendCommandRequest r) {
 		sendBotCommand(r);
 	}, lifetime());
 
@@ -486,9 +552,26 @@ HistoryWidget::HistoryWidget(
 		supportInitAutocomplete();
 	}
 	_field->rawTextEdit()->installEventFilter(this);
-	_field->setMimeDataHook([=](
+	_field->setMimeDataHook(WrappedMessageFieldMimeHook([=](
 			not_null<const QMimeData*> data,
 			Ui::InputField::MimeAction action) {
+		const auto pasteResult = Ui::CheckLargeTextPaste(
+			&session(),
+			_field,
+			data);
+		if (pasteResult.exceeds) {
+			if (action == Ui::InputField::MimeAction::Check) {
+				return true;
+			}
+			const auto text = _field->getTextWithTags();
+			const auto cursor = _field->textCursor();
+			sendTextAsFile(
+				pasteResult.resultingText,
+				text,
+				cursor.position(),
+				cursor.anchor());
+			return true;
+		}
 		if (action == Ui::InputField::MimeAction::Check) {
 			return canSendFiles(data);
 		} else if (action == Ui::InputField::MimeAction::Insert) {
@@ -498,7 +581,7 @@ HistoryWidget::HistoryWidget(
 				Core::ReadMimeText(data));
 		}
 		Unexpected("action in MimeData hook.");
-	});
+	}, _field));
 
 	updateFieldSubmitSettings();
 
@@ -523,10 +606,11 @@ HistoryWidget::HistoryWidget(
 		session().attachWebView().attachBotsUpdates(),
 		session().changes().peerUpdates(
 			Data::PeerUpdate::Flag::Rights
+			| Data::PeerUpdate::Flag::StarsPerMessage
 		) | rpl::filter([=](const Data::PeerUpdate &update) {
 			return update.peer == _peer;
 		}) | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshAttachBotsMenu();
 	}, lifetime());
 
@@ -558,18 +642,26 @@ HistoryWidget::HistoryWidget(
 		Window::ActivateWindow(controller);
 	});
 
+	Core::App().mediaDevices().recordAvailabilityValue(
+	) | rpl::on_next([=](Webrtc::RecordAvailability value) {
+		_recordAvailability = value;
+		if (_list) {
+			updateSendButtonType();
+		}
+	}, lifetime());
+
 	session().data().newItemAdded(
-	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		newItemAdded(item);
 	}, lifetime());
 
 	session().data().historyChanged(
-	) | rpl::start_with_next([=](not_null<History*> history) {
+	) | rpl::on_next([=](not_null<History*> history) {
 		handleHistoryChange(history);
 	}, lifetime());
 
 	session().data().viewResizeRequest(
-	) | rpl::start_with_next([=](not_null<HistoryView::Element*> view) {
+	) | rpl::on_next([=](not_null<HistoryView::Element*> view) {
 		const auto item = view->data();
 		const auto history = item->history();
 		if (item->mainView() == view
@@ -577,22 +669,42 @@ HistoryWidget::HistoryWidget(
 			updateHistoryGeometry();
 		}
 	}, lifetime());
+	session().data().viewHeightAdjusted(
+	) | rpl::on_next([=](Data::Session::ViewHeightAdjusted data) {
+		const auto item = data.view->data();
+		const auto history = item->history();
+		if (item->mainView() == data.view
+			&& (history == _history || history == _migrated)) {
+			updateHistoryGeometry();
+		}
+	}, lifetime());
+
+	session().data().itemShowHighlightRequest(
+	) | rpl::on_next([=](not_null<HistoryItem*> item) {
+		const auto history = item->history();
+		if (history == _history || history == _migrated) {
+			if (item->mainView()) {
+				enqueueMessageHighlight({ item });
+				animatedScrollToItem(item->id);
+			}
+		}
+	}, lifetime());
 
 	session().data().itemDataChanges(
 	) | rpl::filter([=](not_null<HistoryItem*> item) {
 		return !_list && (item->mainView() != nullptr);
-	}) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	}) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		item->mainView()->itemDataChanged();
 	}, lifetime());
 
 	Core::App().settings().largeEmojiChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		crl::on_main(this, [=] {
 			updateHistoryGeometry();
 		});
 	}, lifetime());
 	Core::App().settings().sendSubmitWayValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		crl::on_main(this, [=] {
 			updateFieldSubmitSettings();
 		});
@@ -601,7 +713,7 @@ HistoryWidget::HistoryWidget(
 	session().data().channelDifferenceTooLong(
 	) | rpl::filter([=](not_null<ChannelData*> channel) {
 		return _peer == channel.get();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_cornerButtons.updateJumpDownVisibility();
 		preloadHistoryIfNeeded();
 	}, lifetime());
@@ -609,7 +721,7 @@ HistoryWidget::HistoryWidget(
 	session().data().userIsBotChanges(
 	) | rpl::filter([=](not_null<UserData*> user) {
 		return (_peer == user.get());
-	}) | rpl::start_with_next([=](not_null<UserData*> user) {
+	}) | rpl::on_next([=](not_null<UserData*> user) {
 		_list->refreshAboutView();
 		_list->updateBotInfo();
 		updateControlsVisibility();
@@ -619,7 +731,7 @@ HistoryWidget::HistoryWidget(
 	session().data().botCommandsChanges(
 	) | rpl::filter([=](not_null<PeerData*> peer) {
 		return _peer && (_peer == peer);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (updateCmdStartShown()) {
 			updateControlsVisibility();
 			updateControlsGeometry();
@@ -630,7 +742,7 @@ HistoryWidget::HistoryWidget(
 	session().changes().entryUpdates(
 		EntryUpdateFlag::HasPinnedMessages
 		| EntryUpdateFlag::ForwardDraft
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		if (_pinnedTracker
 			&& (update.flags & EntryUpdateFlag::HasPinnedMessages)
 			&& ((update.entry.get() == _history)
@@ -649,12 +761,13 @@ HistoryWidget::HistoryWidget(
 		| HistoryUpdateFlag::CloudDraft
 		| HistoryUpdateFlag::UnreadMentions
 		| HistoryUpdateFlag::UnreadReactions
+		| HistoryUpdateFlag::UnreadPollVotes
 		| HistoryUpdateFlag::UnreadView
 		| HistoryUpdateFlag::TopPromoted
 		| HistoryUpdateFlag::ClientSideMessages
 	) | rpl::filter([=](const Data::HistoryUpdate &update) {
 		return (_history == update.history.get());
-	}) | rpl::start_with_next([=](const Data::HistoryUpdate &update) {
+	}) | rpl::on_next([=](const Data::HistoryUpdate &update) {
 		const auto flags = update.flags;
 		if (flags & HistoryUpdateFlag::MessageSent) {
 			synteticScrollToY(_scroll->scrollTopMax());
@@ -669,7 +782,8 @@ HistoryWidget::HistoryWidget(
 			updateSendButtonType();
 		}
 		if ((flags & HistoryUpdateFlag::UnreadMentions)
-			|| (flags & HistoryUpdateFlag::UnreadReactions)) {
+			|| (flags & HistoryUpdateFlag::UnreadReactions)
+			|| (flags & HistoryUpdateFlag::UnreadPollVotes)) {
 			_cornerButtons.updateUnreadThingsVisibility();
 		}
 		if (flags & HistoryUpdateFlag::UnreadView) {
@@ -689,7 +803,7 @@ HistoryWidget::HistoryWidget(
 		| MessageUpdateFlag::Edited
 		| MessageUpdateFlag::ReplyMarkup
 		| MessageUpdateFlag::BotCallbackSent
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		const auto flags = update.flags;
 		if (flags & MessageUpdateFlag::Destroyed) {
 			itemRemoved(update.item);
@@ -710,23 +824,52 @@ HistoryWidget::HistoryWidget(
 
 	session().changes().realtimeMessageUpdates(
 		MessageUpdateFlag::NewUnreadReaction
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		maybeMarkReactionsRead(update.item);
 	}, lifetime());
 
+	session().data().sentToScheduled(
+	) | rpl::on_next([=](const Data::SentToScheduled &value) {
+		const auto history = value.history;
+		if (history == _history) {
+			const auto id = value.scheduledId;
+			crl::on_main(this, [=] {
+				if (history == _history) {
+					controller->showSection(
+						std::make_shared<HistoryView::ScheduledMemento>(
+							history,
+							id));
+				}
+			});
+			return;
+		}
+	}, lifetime());
+
+	session().data().sentFromScheduled(
+	) | rpl::on_next([=](const Data::SentFromScheduled &value) {
+		if (value.item->awaitingVideoProcessing()
+			&& !_sentFromScheduledTip
+			&& HistoryView::ShowScheduledVideoPublished(
+				controller,
+				value,
+				crl::guard(this, [=] { _sentFromScheduledTip = false; }))) {
+			_sentFromScheduledTip = true;
+		}
+	}, lifetime());
+
 	using MediaSwitch = Media::Player::Instance::Switch;
 	Media::Player::instance()->switchToNextEvents(
 	) | rpl::filter([=](const MediaSwitch &pair) {
 		return (pair.from.type() == AudioMsgId::Type::Voice);
-	}) | rpl::start_with_next([=](const MediaSwitch &pair) {
+	}) | rpl::on_next([=](const MediaSwitch &pair) {
 		scrollToCurrentVoiceMessage(pair.from.contextId(), pair.to);
 	}, lifetime());
 
 	session().user()->flagsValue(
-	) | rpl::start_with_next([=](UserData::Flags::Change change) {
+	) | rpl::on_next([=](UserData::Flags::Change change) {
 		if (change.diff & UserData::Flag::Premium) {
 			if (const auto user = _peer ? _peer->asUser() : nullptr) {
-				if (user->meRequiresPremiumToWrite()) {
+				if (user->requiresPremiumToWrite()) {
 					handlePeerUpdate();
 				}
 			}
@@ -744,19 +887,31 @@ HistoryWidget::HistoryWidget(
 		| PeerUpdateFlag::OnlineStatus
 		| PeerUpdateFlag::Notifications
 		| PeerUpdateFlag::ChannelAmIn
-		| PeerUpdateFlag::ChannelLinkedChat
+		| PeerUpdateFlag::DiscussionLink
 		| PeerUpdateFlag::Slowmode
 		| PeerUpdateFlag::BotStartToken
 		| PeerUpdateFlag::MessagesTTL
-		| PeerUpdateFlag::ChatThemeEmoji
+		| PeerUpdateFlag::ChatThemeToken
 		| PeerUpdateFlag::FullInfo
+		| PeerUpdateFlag::ManagedBot
+		| PeerUpdateFlag::StarsPerMessage
+		| PeerUpdateFlag::GiftSettings
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
-		return (update.peer.get() == _peer);
+		if (update.peer.get() == _peer) {
+			return true;
+		} else if (update.peer->isSelf()
+			&& (update.flags & PeerUpdateFlag::GiftSettings)) {
+			refreshSendGiftToggle();
+			updateControlsVisibility();
+			updateControlsGeometry();
+		}
+		return false;
 	}) | rpl::map([](const Data::PeerUpdate &update) {
 		return update.flags;
-	}) | rpl::start_with_next([=](Data::PeerUpdate::Flags flags) {
+	}) | rpl::on_next([=](Data::PeerUpdate::Flags flags) {
 		if (flags & PeerUpdateFlag::Rights) {
 			updateFieldPlaceholder();
+			updateSendButtonType();
 			_preview->checkNow(false);
 
 			const auto was = (_sendAs != nullptr);
@@ -784,34 +939,46 @@ HistoryWidget::HistoryWidget(
 				return;
 			}
 		}
-		if (flags & PeerUpdateFlag::BotStartToken) {
+		if (flags & PeerUpdateFlag::StarsPerMessage) {
+			updateFieldPlaceholder();
+			updateSendButtonType();
+		}
+		if (flags & PeerUpdateFlag::GiftSettings) {
+			refreshSendGiftToggle();
+		}
+		if (flags & (PeerUpdateFlag::BotStartToken
+			| PeerUpdateFlag::GiftSettings)) {
 			updateControlsVisibility();
 			updateControlsGeometry();
 		}
 		if (flags & PeerUpdateFlag::Slowmode) {
 			updateSendButtonType();
 		}
+		if ((flags & PeerUpdateFlag::ManagedBot) && _list) {
+			_list->refreshAboutView();
+			_list->updateBotInfo();
+		}
 		if (flags & (PeerUpdateFlag::IsBlocked
 			| PeerUpdateFlag::Admins
 			| PeerUpdateFlag::Members
 			| PeerUpdateFlag::OnlineStatus
 			| PeerUpdateFlag::Rights
 			| PeerUpdateFlag::ChannelAmIn
-			| PeerUpdateFlag::ChannelLinkedChat)) {
+			| PeerUpdateFlag::DiscussionLink)) {
 			handlePeerUpdate();
 		}
 		if (flags & PeerUpdateFlag::MessagesTTL) {
 			checkMessagesTTL();
 		}
-		if ((flags & PeerUpdateFlag::ChatThemeEmoji) && _list) {
-			const auto emoji = _peer->themeEmoji();
+		if ((flags & PeerUpdateFlag::ChatThemeToken) && _list) {
+			const auto emoji = _peer->themeToken();
 			if (Data::CloudThemes::TestingColors() && !emoji.isEmpty()) {
-				_peer->owner().cloudThemes().themeForEmojiValue(
+				_peer->owner().cloudThemes().themeForTokenValue(
 					emoji
 				) | rpl::filter_optional(
 				) | rpl::take(
 					1
-				) | rpl::start_with_next([=](const Data::CloudTheme &theme) {
+				) | rpl::on_next([=](const Data::CloudTheme &theme) {
 					const auto &themes = _peer->owner().cloudThemes();
 					const auto text = themes.prepareTestingLink(theme);
 					if (!text.isEmpty()) {
@@ -822,7 +989,10 @@ HistoryWidget::HistoryWidget(
 		}
 		if (flags & PeerUpdateFlag::FullInfo) {
 			fullInfoUpdated();
-			if (const auto channel = _peer ? _peer->asChannel() : nullptr) {
+			updateSendButtonType();
+			if (_peer->starsPerMessageChecked()) {
+				session().credits().load();
+			} else if (const auto channel = _peer->asChannel()) {
 				if (channel->allowedReactions().paidEnabled) {
 					session().credits().load();
 				}
@@ -835,7 +1005,7 @@ HistoryWidget::HistoryWidget(
 		session().data().notifySettings().defaultUpdates(Type::User),
 		session().data().notifySettings().defaultUpdates(Type::Group),
 		session().data().notifySettings().defaultUpdates(Type::Broadcast)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateNotifyControls();
 	}, lifetime());
 
@@ -846,7 +1016,7 @@ HistoryWidget::HistoryWidget(
 			&& (_history == query.item->history())
 			&& (query.item->mainView() != nullptr)
 			&& isVisible();
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			const Data::Session::ItemVisibilityQuery &query) {
 		if (const auto view = query.item->mainView()) {
 			auto top = _list->itemTop(view);
@@ -861,27 +1031,27 @@ HistoryWidget::HistoryWidget(
 	}, lifetime());
 
 	_topBar->membersShowAreaActive(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
 		setMembersShowAreaActive(active);
 	}, _topBar->lifetime());
 	_topBar->forwardSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		forwardSelected();
 	}, _topBar->lifetime());
 	_topBar->deleteSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmDeleteSelected();
 	}, _topBar->lifetime());
 	_topBar->clearSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		clearSelected();
 	}, _topBar->lifetime());
 	_topBar->cancelChooseForReportRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		setChooseReportMessagesDetails({}, nullptr);
 	}, _topBar->lifetime());
 	_topBar->searchRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_history) {
 			controller->searchInChat(_history);
 		}
@@ -889,13 +1059,28 @@ HistoryWidget::HistoryWidget(
 
 	session().api().sendActions(
 	) | rpl::filter([=](const Api::SendAction &action) {
+		if (_creatingBotTopic
+			&& action.history == _creatingBotTopic->owningHistory()
+			&& action.replyTo.topicRootId == _creatingBotTopic->rootId()) {
+			Ui::PostponeCall(_creatingBotTopic, [=] {
+				using namespace HistoryView;
+				const auto topic = base::take(_creatingBotTopic);
+				controller->showSection(
+					std::make_shared<ChatMemento>(ChatViewId{
+						.history = topic->owningHistory(),
+						.repliesRootId = topic->rootId(),
+					}),
+					Window::SectionShow::Way::ClearStack);
+			});
+			return false;
+		}
 		return (action.history == _history);
-	}) | rpl::start_with_next([=](const Api::SendAction &action) {
+	}) | rpl::on_next([=](const Api::SendAction &action) {
 		const auto lastKeyboardUsed = lastForceReplyReplied(
 			action.replyTo.messageId);
 		if (action.replaceMediaOf) {
 		} else if (action.options.scheduled) {
-			cancelReply(lastKeyboardUsed);
+			cancelReplyOrSuggest(lastKeyboardUsed);
 			crl::on_main(this, [=, history = action.history] {
 				controller->showSection(
 					std::make_shared<HistoryView::ScheduledMemento>(history));
@@ -903,7 +1088,7 @@ HistoryWidget::HistoryWidget(
 		} else {
 			fastShowAtEnd(action.history);
 			if (!_justMarkingAsRead
-				&& cancelReply(lastKeyboardUsed)
+				&& cancelReplyOrSuggest(lastKeyboardUsed)
 				&& !action.clearDraft) {
 				saveCloudDraft();
 			}
@@ -913,15 +1098,22 @@ HistoryWidget::HistoryWidget(
 		}
 	}, lifetime());
 
+	_selfForwardsTagger = std::make_unique<HistoryView::SelfForwardsTagger>(
+		controller,
+		this,
+		[=] { return _list; },
+		_scroll.data(),
+		[=] { return _history; });
+
 	if (session().supportMode()) {
 		session().data().chatListEntryRefreshes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			crl::on_main(this, [=] { checkSupportPreload(true); });
 		}, lifetime());
 	}
 
 	Core::App().materializeLocalDraftsRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		saveFieldToHistoryLocalDraft();
 	}, lifetime());
 
@@ -929,6 +1121,14 @@ HistoryWidget::HistoryWidget(
 	setupSendAsToggle();
 	orderWidgets();
 	setupShortcuts();
+
+	_attachToggle->setAccessibleName(tr::lng_attach(tr::now));
+	_tabbedSelectorToggle->setAccessibleName(tr::lng_emoji_sticker_gif(tr::now));
+	_botKeyboardShow->setAccessibleName(tr::lng_bot_keyboard_show(tr::now));
+	_botKeyboardHide->setAccessibleName(tr::lng_bot_keyboard_hide(tr::now));
+	_botCommandStart->setAccessibleName(tr::lng_bot_commands_start(tr::now));
+	_fieldBarCancel->setAccessibleName(tr::lng_cancel(tr::now));
+
 }
 
 void HistoryWidget::setGeometryWithTopMoved(
@@ -937,7 +1137,7 @@ void HistoryWidget::setGeometryWithTopMoved(
 	_topDelta = topDelta;
 	bool willBeResized = (size() != newGeometry.size());
 	if (geometry() != newGeometry) {
-		auto weak = Ui::MakeWeak(this);
+		auto weak = base::make_weak(this);
 		setGeometry(newGeometry);
 		if (!weak) {
 			return;
@@ -954,6 +1154,7 @@ Dialogs::EntryState HistoryWidget::computeDialogsEntryState() const {
 		.key = _history,
 		.section = Dialogs::EntryState::Section::History,
 		.currentReplyTo = replyTo(),
+		.currentSuggest = suggestOptions(),
 	};
 }
 
@@ -967,11 +1168,42 @@ void HistoryWidget::refreshJoinChannelText() {
 	}
 }
 
+void HistoryWidget::refreshGiftToChannelShown() {
+	if (!_giftToChannel || !_peer) {
+		return;
+	}
+	const auto channel = _peer->asChannel();
+	_giftToChannel->setVisible(channel
+		&& channel->isBroadcast()
+		&& channel->stargiftsAvailable());
+}
+
+void HistoryWidget::refreshDirectMessageShown() {
+	if (!_directMessage || !_peer) {
+		return;
+	}
+	const auto channel = _peer->asChannel();
+	const auto monoforum = channel ? channel->broadcastMonoforum() : nullptr;
+	const auto visible = monoforum && !monoforum->monoforumDisabled();
+	_directMessage->setVisible(visible);
+	if (visible) {
+		using Flags = Data::Flags<ChannelDataFlags>;
+		_directMessageLifetime = monoforum->flagsValue(
+		) | rpl::skip(
+			1
+		) | rpl::on_next([=](Flags::Change change) {
+			if (change.diff & ChannelDataFlag::MonoforumDisabled) {
+				refreshDirectMessageShown();
+			}
+		});
+	}
+}
+
 void HistoryWidget::refreshTopBarActiveChat() {
 	const auto state = computeDialogsEntryState();
 	_topBar->setActiveChat(state, _history->sendActionPainter());
 	if (state.key) {
-		controller()->setCurrentDialogsEntryState(state);
+		controller()->setDialogsEntryState(state);
 	}
 }
 
@@ -985,7 +1217,7 @@ void HistoryWidget::refreshTabbedPanel() {
 
 void HistoryWidget::initVoiceRecordBar() {
 	_voiceRecordBar->setStartRecordingFilter([=] {
-		const auto error = [&]() -> std::optional<QString> {
+		const auto error = [&]() -> Data::SendError {
 			if (_peer) {
 				if (const auto error = Data::RestrictionError(
 						_peer,
@@ -993,10 +1225,10 @@ void HistoryWidget::initVoiceRecordBar() {
 					return error;
 				}
 			}
-			return std::nullopt;
+			return {};
 		}();
 		if (error) {
-			controller()->showToast(*error);
+			Data::ShowSendErrorToast(controller(), _peer, error);
 			return true;
 		} else if (showSlowmodeError()) {
 			return true;
@@ -1015,13 +1247,13 @@ void HistoryWidget::initVoiceRecordBar() {
 	});
 
 	const auto applyLocalDraft = [=] {
-		if (_history && _history->localDraft({})) {
+		if (_history && _history->localDraft(MsgId(), PeerId())) {
 			applyDraft();
 		}
 	};
 
 	_voiceRecordBar->sendActionUpdates(
-	) | rpl::start_with_next([=](const auto &data) {
+	) | rpl::on_next([=](const auto &data) {
 		if (!_history) {
 			return;
 		}
@@ -1032,52 +1264,154 @@ void HistoryWidget::initVoiceRecordBar() {
 	}, lifetime());
 
 	_voiceRecordBar->sendVoiceRequests(
-	) | rpl::start_with_next([=](const auto &data) {
-		if (!canWriteMessage() || data.bytes.isEmpty() || !_history) {
-			return;
-		}
-
-		auto action = prepareSendAction(data.options);
-		session().api().sendVoiceMessage(
-			data.bytes,
-			data.waveform,
-			data.duration,
-			action);
-		_voiceRecordBar->clearListenState();
+	) | rpl::on_next([=](const VoiceToSend &data) {
+		sendVoice(data);
 	}, lifetime());
 
 	_voiceRecordBar->cancelRequests(
-	) | rpl::start_with_next(applyLocalDraft, lifetime());
+	) | rpl::on_next(applyLocalDraft, lifetime());
 
 	_voiceRecordBar->lockShowStarts(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_cornerButtons.updateJumpDownVisibility();
 		_cornerButtons.updateUnreadThingsVisibility();
 	}, lifetime());
 
+	_voiceRecordBar->errors(
+	) | rpl::on_next([=](::Media::Capture::Error error) {
+		using Error = ::Media::Capture::Error;
+		switch (error) {
+		case Error::AudioInit:
+		case Error::AudioTimeout:
+			controller()->showToast(tr::lng_record_audio_problem(tr::now));
+			break;
+		case Error::VideoInit:
+		case Error::VideoTimeout:
+			controller()->showToast(tr::lng_record_video_problem(tr::now));
+			break;
+		default:
+			controller()->showToast(u"Unknown error."_q);
+			break;
+		}
+	}, lifetime());
+
 	_voiceRecordBar->updateSendButtonTypeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateSendButtonType();
 	}, lifetime());
 
 	_voiceRecordBar->lockViewportEvents(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		_scroll->viewportEvent(e);
 	}, lifetime());
 
 	_voiceRecordBar->recordingTipRequests(
-	) | rpl::start_with_next([=] {
-		controller()->showToast(tr::lng_record_hold_tip(tr::now));
+	) | rpl::on_next([=] {
+		Core::App().settings().setRecordVideoMessages(
+			!Core::App().settings().recordVideoMessages());
+		updateSendButtonType();
+		switch (_send->type()) {
+		case Ui::SendButton::Type::Record: {
+			const auto can = Webrtc::RecordAvailability::VideoAndAudio;
+			controller()->showToast((_recordAvailability == can)
+				? tr::lng_record_voice_tip(tr::now)
+				: tr::lng_record_hold_tip(tr::now));
+		} break;
+		case Ui::SendButton::Type::Round:
+			controller()->showToast(tr::lng_record_video_tip(tr::now));
+			break;
+		}
 	}, lifetime());
 
 	_voiceRecordBar->recordingStateChanges(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
+		_field->setDisabled(active);
 		controller()->widget()->setInnerFocus();
+		updateAiButtonVisibility();
+		updateSendAsFileVisibility();
 	}, lifetime());
 
 	_voiceRecordBar->hideFast();
 }
 
+void HistoryWidget::initAiButton() {
+	_aiButton->hide();
+	_aiButton->setAccessibleName(tr::lng_ai_compose_title(tr::now));
+	_aiButton->setClickedCallback([=] {
+		if (_aiTooltipManager) {
+			_aiTooltipManager->hideAndRemember();
+		}
+		updateAiButtonVisibility();
+		showAiComposeBox();
+	});
+
+	_aiTooltipManager = std::make_unique<HistoryView::Controls::AiTooltipManager>(
+		this,
+		_aiButton,
+		tr::lng_ai_compose_tooltip(tr::rich),
+		"ai_compose_tooltip_hidden"_cs,
+		[=] { return width(); });
+}
+
+void HistoryWidget::initSendAsFileButton() {
+	_sendAsFile->hide();
+	_sendAsFile->setClickedCallback([=] {
+		if (_sendAsFileTooltipManager) {
+			_sendAsFileTooltipManager->hideAndRemember();
+		}
+		const auto cursor = _field->textCursor();
+		const auto text = _field->getTextWithTags();
+		sendTextAsFile(text.text, text, cursor.position(), cursor.anchor());
+	});
+
+	_sendAsFileTooltipManager = std::make_unique<HistoryView::Controls::AiTooltipManager>(
+		this,
+		_sendAsFile,
+		tr::lng_send_as_file_tooltip(tr::rich),
+		"send_as_file_tooltip_hidden"_cs,
+		[=] { return width(); });
+}
+
+void HistoryWidget::sendTextAsFile(
+		const QString &fileText,
+		TextWithTags restoreText,
+		int restorePosition,
+		int restoreAnchor) {
+	auto result = Ui::PrepareTextAsFile(fileText);
+
+	_field->setTextWithTags({});
+
+	auto box = Box<SendFilesBox>(
+		controller(),
+		std::move(result),
+		TextWithTags{},
+		_peer,
+		Api::SendType::Normal,
+		sendMenuDetails());
+	box->setReplyTo(replyTo());
+	box->setConfirmedCallback(crl::guard(this, [=](
+			std::shared_ptr<Ui::PreparedBundle> bundle,
+			Api::SendOptions options,
+			FullReplyTo currentReplyTo) {
+		if (!currentReplyTo.messageId && replyTo().messageId) {
+			cancelReply();
+		}
+		sendingFilesConfirmed(std::move(bundle), options);
+	}));
+	box->setCancelledCallback(crl::guard(this, [=] {
+		_field->setTextWithTags(restoreText);
+		auto cursor = _field->textCursor();
+		cursor.setPosition(restoreAnchor);
+		if (restorePosition != restoreAnchor) {
+			cursor.setPosition(restorePosition, QTextCursor::KeepAnchor);
+		}
+		_field->setTextCursor(cursor);
+	}));
+
+	Window::ActivateWindow(controller());
+	controller()->show(std::move(box));
+}
+
 void HistoryWidget::initTabbedSelector() {
 	refreshTabbedPanel();
 
@@ -1106,7 +1440,7 @@ void HistoryWidget::initTabbedSelector() {
 	selector->emojiChosen(
 	) | rpl::filter([=] {
 		return !isHidden() && !_field->isHidden();
-	}) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	}) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(_field->textCursor(), data.emoji);
 	}, lifetime());
 
@@ -1114,12 +1448,12 @@ void HistoryWidget::initTabbedSelector() {
 		selector->fileChosen() | filter,
 		selector->customEmojiChosen() | filter,
 		controller()->stickerOrEmojiChosen() | filter
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen &&data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen &&data) {
 		fileChosen(std::move(data));
 	}, lifetime());
 
 	selector->photoChosen(
-	) | filter | rpl::start_with_next([=](ChatHelpers::PhotoChosen data) {
+	) | filter | rpl::on_next([=](ChatHelpers::PhotoChosen data) {
 		sendExistingPhoto(data.photo, data.options);
 	}, lifetime());
 
@@ -1131,17 +1465,17 @@ void HistoryWidget::initTabbedSelector() {
 			showHistory(data.recipientOverride->id, ShowAtTheEndMsgId);
 		}
 		return (data.recipientOverride == _peer);
-	}) | rpl::start_with_next([=](ChatHelpers::InlineChosen data) {
+	}) | rpl::on_next([=](ChatHelpers::InlineChosen data) {
 		sendInlineResult(data);
 	}, lifetime());
 
 	selector->contextMenuRequested(
-	) | filter | rpl::start_with_next([=] {
+	) | filter | rpl::on_next([=] {
 		selector->showMenuWithDetails(sendMenuDetails());
 	}, lifetime());
 
 	selector->choosingStickerUpdated(
-	) | rpl::start_with_next([=](const Selector::Action &data) {
+	) | rpl::on_next([=](const Selector::Action &data) {
 		if (!_history) {
 			return;
 		}
@@ -1158,12 +1492,12 @@ void HistoryWidget::supportInitAutocomplete() {
 	_supportAutocomplete->hide();
 
 	_supportAutocomplete->insertRequests(
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		supportInsertText(text);
 	}, _supportAutocomplete->lifetime());
 
 	_supportAutocomplete->shareContactRequests(
-	) | rpl::start_with_next([=](const Support::Contact &contact) {
+	) | rpl::on_next([=](const Support::Contact &contact) {
 		supportShareContact(contact);
 	}, _supportAutocomplete->lifetime());
 }
@@ -1205,7 +1539,7 @@ void HistoryWidget::supportShareContact(Support::Contact contact) {
 		contact,
 		crl::guard(this, submit)));
 	box->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_field->document()->undo();
 	}, lifetime());
 }
@@ -1358,6 +1692,15 @@ int HistoryWidget::itemTopForHighlight(
 	const auto heightLeft = (visibleAreaHeight - viewHeight);
 	if (heightLeft >= 0) {
 		return std::max(itemTop - (heightLeft / 2), 0);
+	}
+	const auto highlight = itemHighlight(item);
+	if (const auto range = HistoryView::FindHighlightYRange(
+			view,
+			highlight)) {
+		return HistoryView::AdjustScrollForRange(
+			itemTop,
+			visibleAreaHeight,
+			range);
 	} else if (reactionCenter >= 0) {
 		const auto maxSize = st::reactionInlineImage;
 
@@ -1486,7 +1829,10 @@ void HistoryWidget::updateInlineBotQuery() {
 			_inlineLookingUpBot = true;
 			const auto username = _inlineBotUsername;
 			_inlineBotResolveRequestId = _api.request(
-				MTPcontacts_ResolveUsername(MTP_string(username))
+				MTPcontacts_ResolveUsername(
+					MTP_flags(0),
+					MTP_string(username),
+					MTP_string())
 			).done([=](const MTPcontacts_ResolvedPeer &result) {
 				const auto &data = result.data();
 				const auto resolvedBot = [&]() -> UserData* {
@@ -1541,10 +1887,16 @@ void HistoryWidget::applyInlineBotQuery(UserData *bot, const QString &query) {
 					InlineBots::ResultSelected result) {
 				if (result.open) {
 					const auto request = result.result->openRequest();
+					const auto showDrawButton = canWriteMessage();
 					if (const auto photo = request.photo()) {
-						controller()->openPhoto(photo, {});
+						controller()->openPhoto(
+							photo,
+							{ .showDrawButton = showDrawButton });
 					} else if (const auto document = request.document()) {
-						controller()->openDocument(document, false, {});
+						controller()->openDocument(
+							document,
+							false,
+							{ .showDrawButton = showDrawButton });
 					}
 				} else {
 					sendInlineResult(result);
@@ -1554,7 +1906,7 @@ void HistoryWidget::applyInlineBotQuery(UserData *bot, const QString &query) {
 				return sendMenuDetails();
 			});
 			_inlineResults->requesting(
-			) | rpl::start_with_next([=](bool requesting) {
+			) | rpl::on_next([=](bool requesting) {
 				_tabbedSelectorToggle->setLoading(requesting);
 			}, _inlineResults->lifetime());
 			updateControlsGeometry();
@@ -1572,15 +1924,24 @@ void HistoryWidget::applyInlineBotQuery(UserData *bot, const QString &query) {
 void HistoryWidget::orderWidgets() {
 	_voiceRecordBar->raise();
 	_send->raise();
+	_aiButton->raise();
+	_sendAsFile->raise();
+	_topBars->raise();
 	if (_businessBotStatus) {
 		_businessBotStatus->bar().raise();
 	}
 	if (_contactStatus) {
 		_contactStatus->bar().raise();
 	}
+	if (_paysStatus) {
+		_paysStatus->bar().raise();
+	}
 	if (_translateBar) {
 		_translateBar->raise();
 	}
+	if (_sponsoredMessageBar) {
+		_sponsoredMessageBar->raise();
+	}
 	if (_pinnedBar) {
 		_pinnedBar->raise();
 	}
@@ -1593,6 +1954,9 @@ void HistoryWidget::orderWidgets() {
 	if (_chooseTheme) {
 		_chooseTheme->raise();
 	}
+	if (_subsectionTabs) {
+		_subsectionTabs->raise();
+	}
 	_topShadow->raise();
 	if (_autocomplete) {
 		_autocomplete->raise();
@@ -1609,6 +1973,15 @@ void HistoryWidget::orderWidgets() {
 	if (_emojiSuggestions) {
 		_emojiSuggestions->raise();
 	}
+	if (_attachBotsMenu) {
+		_attachBotsMenu->raise();
+	}
+	if (_aiTooltipManager) {
+		_aiTooltipManager->raise();
+	}
+	if (_sendAsFileTooltipManager) {
+		_sendAsFileTooltipManager->raise();
+	}
 	_attachDragAreas.document->raise();
 	_attachDragAreas.photo->raise();
 }
@@ -1643,7 +2016,7 @@ void HistoryWidget::toggleChooseChatTheme(
 		controller(),
 		peer);
 	_chooseTheme->shouldBeShownValue(
-	) | rpl::start_with_next(update, _chooseTheme->lifetime());
+	) | rpl::on_next(update, _chooseTheme->lifetime());
 }
 
 Ui::ChatTheme *HistoryWidget::customChatTheme() const {
@@ -1682,6 +2055,8 @@ void HistoryWidget::fieldChanged() {
 		updateControlsVisibility();
 		updateControlsGeometry();
 	}
+	updateAiButtonVisibility();
+	updateSendAsFileVisibility();
 
 	_saveCloudDraftTimer.cancel();
 	if (!_peer || !(_textUpdateEvents & TextUpdateEvent::SaveDraft)) {
@@ -1727,25 +2102,30 @@ void HistoryWidget::saveFieldToHistoryLocalDraft() {
 	}
 
 	const auto topicRootId = MsgId();
+	const auto monoforumPeerId = PeerId();
 	if (_editMsgId) {
 		_history->setLocalEditDraft(std::make_unique<Data::Draft>(
 			_field,
 			FullReplyTo{
 				.messageId = FullMsgId(_history->peer->id, _editMsgId),
 				.topicRootId = topicRootId,
+				.monoforumPeerId = monoforumPeerId,
 			},
+			suggestOptions(true),
 			_preview->draft(),
 			_saveEditMsgRequestId));
 	} else {
-		if (_replyTo || !_field->empty()) {
+		const auto suggest = suggestOptions();
+		if (_replyTo || suggest.exists || !_field->empty()) {
 			_history->setLocalDraft(std::make_unique<Data::Draft>(
 				_field,
 				_replyTo,
+				suggest,
 				_preview->draft()));
 		} else {
-			_history->clearLocalDraft(topicRootId);
+			_history->clearLocalDraft(topicRootId, monoforumPeerId);
 		}
-		_history->clearLocalEditDraft(topicRootId);
+		_history->clearLocalEditDraft(topicRootId, monoforumPeerId);
 	}
 }
 
@@ -1763,7 +2143,30 @@ void HistoryWidget::fileChosen(ChatHelpers::FileChosen &&data) {
 		} else if (!_field->isHidden()) {
 			Data::InsertCustomEmoji(_field.data(), data.document);
 		}
-	} else {
+	} else if (_history) {
+		if (data.needsCaption) {
+			const auto document = data.document;
+			const auto from = data.messageSendingFrom;
+			Ui::SendGifWithCaption(
+				controller()->uiShow(),
+				_field,
+				document,
+				_peer,
+				sendMenuDetails(),
+				crl::guard(this, [=](
+						Api::SendOptions options,
+						TextWithTags caption) {
+					controller()->sendingAnimation().appendSending(from);
+					auto messageToSend = Api::MessageToSend(
+						prepareSendAction(options));
+					messageToSend.textWithTags = std::move(caption);
+					sendExistingDocument(
+						document,
+						std::move(messageToSend),
+						from.localId);
+				}));
+			return;
+		}
 		controller()->sendingAnimation().appendSending(
 			data.messageSendingFrom);
 		const auto localId = data.messageSendingFrom.localId;
@@ -1777,6 +2180,14 @@ void HistoryWidget::fileChosen(ChatHelpers::FileChosen &&data) {
 	}
 }
 
+bool HistoryWidget::processChosenSticker(ChatHelpers::FileChosen &&chosen) {
+	if (!_peer) {
+		return false;
+	}
+	fileChosen(std::move(chosen));
+	return true;
+}
+
 void HistoryWidget::saveCloudDraft() {
 	controller()->session().api().saveCurrentDraftToCloud();
 }
@@ -1835,7 +2246,7 @@ void HistoryWidget::activate() {
 
 void HistoryWidget::setInnerFocus() {
 	if (_list) {
-		if (isSearching()) {
+		if (isSearching() && !_nonEmptySelection) {
 			_composeSearch->setInnerFocus();
 		} else if (isChoosingTheme()) {
 			_chooseTheme->setFocus();
@@ -1865,24 +2276,12 @@ bool HistoryWidget::notify_switchInlineBotButtonReceived(
 		UserData *samePeerBot,
 		MsgId samePeerReplyTo) {
 	if (samePeerBot) {
-		if (_history) {
-			const auto textWithTags = TextWithTags{
-				'@' + samePeerBot->username() + ' ' + query,
-				TextWithTags::Tags(),
-			};
-			MessageCursor cursor = {
-				int(textWithTags.text.size()),
-				int(textWithTags.text.size()),
-				Ui::kQFixedMax,
-			};
-			_history->setLocalDraft(std::make_unique<Data::Draft>(
-				textWithTags,
-				FullReplyTo(),
-				cursor,
-				Data::WebPageDraft()));
-			applyDraft();
-			return true;
+		const auto to = controller()->dialogsEntryStateCurrent();
+		if (!to.key.owningHistory()) {
+			return false;
 		}
+		controller()->switchInlineQuery(to, samePeerBot, query);
+		return true;
 	} else if (const auto bot = _peer ? _peer->asUser() : nullptr) {
 		const auto to = bot->isBot()
 			? bot->botInfo->inlineReturnTo
@@ -1917,12 +2316,17 @@ void HistoryWidget::setupShortcuts() {
 			&& Ui::InFocusChain(this)
 			&& !controller()->isLayerShown()
 			&& window()->isActiveWindow();
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(Command::Search, 1) && request->handle([=] {
 			controller()->searchInChat(_history);
 			return true;
 		});
+		request->check(Command::ShowChatMenu, 1) && request->handle([=] {
+			Window::ActivateWindow(controller());
+			_topBar->showPeerMenu();
+			return true;
+		});
 		_canSendMessages
 			&& request->check(Command::ShowScheduled, 1)
 			&& request->handle([=] {
@@ -1931,6 +2335,49 @@ void HistoryWidget::setupShortcuts() {
 					std::make_shared<Scheduled>(_history));
 				return true;
 			});
+		_canSendTexts
+			&& _field->isVisible()
+			&& request->check(Command::ComposeAiApplyInPlace, 1)
+			&& request->handle([=] {
+				triggerAiApplyInPlace();
+				return true;
+			});
+		_preview
+			&& (_previewDrawPreview || _preview->draft().removed)
+			&& request->check(Command::ToggleWebPagePreview, 1)
+			&& request->handle([=] {
+				if (_previewDrawPreview) {
+					_preview->apply({ .removed = true });
+				} else {
+					_preview->apply({}, true);
+				}
+				return true;
+			});
+		if (showRecordButton()
+			&& _canSendMessages
+			&& _joinChannel->isHidden()
+			&& !_composeSearch) {
+			const auto isVoice = request->check(Command::RecordVoice, 1);
+			const auto isRound = !isVoice
+				&& request->check(Command::RecordRound, 1);
+			(isVoice || isRound) && request->handle([=] {
+				if (_voiceRecordBar) {
+					_voiceRecordBar->startRecordingAndLock(isRound);
+					return true;
+				}
+				return false;
+			});
+		}
+		const auto channel = _peer ? _peer->asChannel() : nullptr;
+		const auto hasRecentActions = channel
+			&& (channel->hasAdminRights() || channel->amCreator());
+		if (hasRecentActions) {
+			request->check(Command::ShowAdminLog, 1) && request->handle([=] {
+				controller()->showSection(
+					std::make_shared<AdminLog::SectionMemento>(channel));
+				return true;
+			});
+		}
 		if (session().supportMode()) {
 			request->check(
 				Command::SupportToggleMuted
@@ -1942,6 +2389,71 @@ void HistoryWidget::setupShortcuts() {
 	}, lifetime());
 }
 
+void HistoryWidget::setupGiftToChannelButton() {
+	_giftToChannel = Ui::CreateChild<Ui::IconButton>(
+		_muteUnmute.data(),
+		st::historyGiftToChannel);
+	_giftToChannel->setAccessibleName(tr::lng_gift_channel_title(tr::now));
+	widthValue() | rpl::on_next([=](int width) {
+		_giftToChannel->moveToRight(0, 0, width);
+	}, _giftToChannel->lifetime());
+	_giftToChannel->setClickedCallback([=] {
+		Ui::ShowStarGiftBox(controller(), _peer);
+	});
+	rpl::combine(
+		_muteUnmute->shownValue(),
+		_joinChannel->shownValue()
+	) | rpl::on_next([=](bool muteUnmute, bool joinChannel) {
+		const auto newParent = (muteUnmute && !joinChannel)
+			? _muteUnmute.data()
+			: (joinChannel && !muteUnmute)
+			? _joinChannel.data()
+			: nullptr;
+		if (newParent) {
+			_giftToChannel->setParent(newParent);
+			_giftToChannel->moveToRight(0, 0);
+			refreshGiftToChannelShown();
+		}
+	}, _giftToChannel->lifetime());
+}
+
+void HistoryWidget::setupDirectMessageButton() {
+	_directMessage = Ui::CreateChild<Ui::IconButton>(
+		_muteUnmute.data(),
+		st::historyDirectMessage);
+		_directMessage->setAccessibleName(tr::lng_profile_direct_messages(tr::now));
+	widthValue() | rpl::on_next([=](int width) {
+		_directMessage->moveToLeft(0, 0, width);
+	}, _directMessage->lifetime());
+	_directMessage->setClickedCallback([=] {
+		if (const auto channel = _peer ? _peer->asChannel() : nullptr) {
+			if (channel->invitePeekExpires()) {
+				controller()->showToast(
+					tr::lng_channel_invite_private(tr::now));
+			} else if (const auto monoforum = channel->monoforumLink()) {
+				controller()->showPeerHistory(
+					monoforum,
+					Window::SectionShow::Way::Forward);
+			}
+		}
+	});
+	rpl::combine(
+		_muteUnmute->shownValue(),
+		_joinChannel->shownValue()
+	) | rpl::on_next([=](bool muteUnmute, bool joinChannel) {
+		const auto newParent = (muteUnmute && !joinChannel)
+			? _muteUnmute.data()
+			: (joinChannel && !muteUnmute)
+			? _joinChannel.data()
+			: nullptr;
+		if (newParent) {
+			_directMessage->setParent(newParent);
+			_directMessage->moveToLeft(0, 0);
+			refreshDirectMessageShown();
+		}
+	}, _directMessage->lifetime());
+}
+
 void HistoryWidget::pushReplyReturn(not_null<HistoryItem*> item) {
 	if (item->history() != _history && item->history() != _migrated) {
 		return;
@@ -1973,6 +2485,10 @@ void HistoryWidget::fastShowAtEnd(not_null<History*> history) {
 	_pinnedClickedId = FullMsgId();
 	_minPinnedId = std::nullopt;
 	if (_history->isReadyFor(_showAtMsgId)) {
+		_history->forgetScrollState();
+		if (_migrated) {
+			_migrated->forgetScrollState();
+		}
 		historyLoaded();
 	} else {
 		firstLoadMessages();
@@ -1987,11 +2503,13 @@ bool HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 		}
 	});
 
-	const auto editDraft = _history ? _history->localEditDraft({}) : nullptr;
+	const auto editDraft = _history
+		? _history->localEditDraft(MsgId(), PeerId())
+		: nullptr;
 	const auto draft = editDraft
 		? editDraft
 		: _history
-		? _history->localDraft({})
+		? _history->localDraft(MsgId(), PeerId())
 		: nullptr;
 	auto fieldAvailable = canWriteMessage();
 	const auto editMsgId = editDraft ? editDraft->reply.messageId.msg : 0;
@@ -2040,12 +2558,21 @@ bool HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 		if (!_replyEditMsg) {
 			requestMessageData(_editMsgId);
 		}
-	} else if (!readyToForward()) {
-		const auto draft = _history->localDraft({});
+		if (editDraft && editDraft->suggest) {
+			using namespace HistoryView;
+			applySuggestOptions(editDraft->suggest, SuggestMode::Change);
+		} else {
+			cancelSuggestPost();
+		}
+	} else {
+		const auto draft = _history->localDraft(MsgId(), PeerId());
 		_processingReplyTo = draft ? draft->reply : FullReplyTo();
 		if (_processingReplyTo) {
 			_processingReplyItem = session().data().message(
 				_processingReplyTo.messageId);
+		} else if (draft && draft->suggest) {
+			using namespace HistoryView;
+			applySuggestOptions(draft->suggest, SuggestMode::New);
 		}
 		processReply();
 	}
@@ -2100,29 +2627,31 @@ bool HistoryWidget::insideJumpToEndInsteadOfToUnread() const {
 }
 
 void HistoryWidget::showHistory(
-		const PeerId &peerId,
+		PeerId peerId,
 		MsgId showAtMsgId,
-		const TextWithEntities &highlightPart,
-		int highlightPartOffsetHint) {
+		const Window::SectionShow &params) {
 	_pinnedClickedId = FullMsgId();
 	_minPinnedId = std::nullopt;
-	_showAtMsgHighlightPart = {};
-	_showAtMsgHighlightPartOffsetHint = 0;
+	_showAtMsgParams = {};
 
-	const auto wasDialogsEntryState = computeDialogsEntryState();
+	const auto wasState = controller()->dialogsEntryStateCurrent();
 	const auto startBot = (showAtMsgId == ShowAndStartBotMsgId);
-	if (startBot) {
+	_showAndMaybeSendStart = (showAtMsgId == ShowAndMaybeStartBotMsgId);
+	if (startBot || _showAndMaybeSendStart) {
 		showAtMsgId = ShowAtTheEndMsgId;
 	}
 
 	_highlighter.clear();
 	controller()->sendingAnimation().clear();
 	_topToast.hide(anim::type::instant);
+	_hiddenSenderTooltip.hide();
 	if (_history) {
 		if (_peer->id == peerId) {
 			updateForwarding();
 
-			if (showAtMsgId == ShowAtUnreadMsgId
+			if (params.reapplyLocalDraft) {
+				return;
+			} else if (showAtMsgId == ShowAtUnreadMsgId
 				&& insideJumpToEndInsteadOfToUnread()) {
 				DEBUG_LOG(("JumpToEnd(%1, %2, %3): "
 					"Jumping to end instead of unread."
@@ -2156,16 +2685,10 @@ void HistoryWidget::showHistory(
 						).arg(_history->inboxReadTillId().bare
 						).arg(Logs::b(_history->loadedAtBottom())
 						).arg(showAtMsgId.bare));
-					delayedShowAt(
-						showAtMsgId,
-						highlightPart,
-						highlightPartOffsetHint);
+					delayedShowAt(showAtMsgId, params);
 				} else if (_showAtMsgId != showAtMsgId) {
 					clearAllLoadRequests();
-					setMsgId(
-						showAtMsgId,
-						highlightPart,
-						highlightPartOffsetHint);
+					setMsgId(showAtMsgId, params);
 					firstLoadMessages();
 					doneShow();
 				}
@@ -2185,10 +2708,7 @@ void HistoryWidget::showHistory(
 					_cornerButtons.skipReplyReturn(skipId);
 				}
 
-				setMsgId(
-					showAtMsgId,
-					highlightPart,
-					highlightPartOffsetHint);
+				setMsgId(showAtMsgId, params);
 				if (_historyInited) {
 					DEBUG_LOG(("JumpToEnd(%1, %2, %3): "
 						"Showing instant at %4."
@@ -2213,12 +2733,12 @@ void HistoryWidget::showHistory(
 
 			if (const auto user = _peer->asUser()) {
 				if (const auto &info = user->botInfo) {
-					if (startBot) {
-						if (wasDialogsEntryState.key) {
-							info->inlineReturnTo = wasDialogsEntryState;
+					if (startBot || clearMaybeSendStart()) {
+						if (startBot && wasState.key) {
+							info->inlineReturnTo = wasState;
 						}
 						sendBotStartCommand();
-						_history->clearLocalDraft({});
+						_history->clearLocalDraft(MsgId(), PeerId());
 						applyDraft();
 						_send->finishAnimating();
 					}
@@ -2253,6 +2773,7 @@ void HistoryWidget::showHistory(
 		_history->showAtMsgId = _showAtMsgId;
 
 		destroyUnreadBarOnClose();
+		_sponsoredMessageBar = nullptr;
 		_pinnedBar = nullptr;
 		_translateBar = nullptr;
 		_pinnedTracker = nullptr;
@@ -2265,12 +2786,21 @@ void HistoryWidget::showHistory(
 		setHistory(nullptr);
 		_list = nullptr;
 		_peer = nullptr;
+		_suggestOptions = nullptr;
+		_sendPayment.clear();
 		_topicsRequested.clear();
 		_canSendMessages = false;
 		_canSendTexts = false;
 		_fieldDisabled = nullptr;
 		_silent.destroy();
 		updateBotKeyboard();
+
+		_subsectionCheckLifetime.destroy();
+		_subsectionTopicsLifetime.destroy();
+		if (_subsectionTabs) {
+			_subsectionTabsLifetime.destroy();
+			controller()->saveSubsectionTabs(base::take(_subsectionTabs));
+		}
 	} else {
 		Assert(_list == nullptr);
 	}
@@ -2281,42 +2811,56 @@ void HistoryWidget::showHistory(
 	_processingReplyItem = _replyEditMsg = nullptr;
 	_processingReplyTo = _replyTo = FullReplyTo();
 	_editMsgId = MsgId();
-	_canReplaceMedia = false;
+	_canReplaceMedia = _canAddMedia = false;
 	_photoEditMedia = nullptr;
 	updateReplaceMediaButton();
 	_fieldBarCancel->hide();
 
+	_mediaEditManager.cancel();
 	_membersDropdownShowTimer.cancel();
 	_scroll->takeWidget<HistoryInner>().destroy();
 
 	clearInlineBot();
 
 	_showAtMsgId = showAtMsgId;
-	_showAtMsgHighlightPart = highlightPart;
-	_showAtMsgHighlightPartOffsetHint = highlightPartOffsetHint;
+	_showAtMsgParams = params;
 	_historyInited = false;
+	_paysStatus = nullptr;
 	_contactStatus = nullptr;
 	_businessBotStatus = nullptr;
 
+	Core::App().mediaDevices().refreshRecordAvailability();
+
 	if (peerId) {
 		using namespace HistoryView;
 		_peer = session().data().peer(peerId);
 		_contactStatus = std::make_unique<ContactStatus>(
 			controller(),
-			this,
+			_topBars.get(),
 			_peer,
 			false);
 		_contactStatus->bar().heightValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updateControlsGeometry();
 		}, _contactStatus->bar().lifetime());
+
+		refreshGiftToChannelShown();
+		refreshDirectMessageShown();
 		if (const auto user = _peer->asUser()) {
+			_paysStatus = std::make_unique<PaysStatus>(
+				controller(),
+				_topBars.get(),
+				user);
+			_paysStatus->bar().heightValue(
+			) | rpl::on_next([=] {
+				updateControlsGeometry();
+			}, _paysStatus->bar().lifetime());
 			_businessBotStatus = std::make_unique<BusinessBotStatus>(
 				controller(),
-				this,
+				_topBars.get(),
 				user);
 			_businessBotStatus->bar().heightValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				updateControlsGeometry();
 			}, _businessBotStatus->bar().lifetime());
 		}
@@ -2371,7 +2915,9 @@ void HistoryWidget::showHistory(
 		} else if (_peer->isRepliesChat() || _peer->isVerifyCodes()) {
 			updateNotifyControls();
 		}
+		refreshSuggestPostToggle();
 		refreshScheduledToggle();
+		refreshSendGiftToggle();
 		refreshSendAsToggle();
 
 		if (_showAtMsgId == ShowAtUnreadMsgId) {
@@ -2388,22 +2934,35 @@ void HistoryWidget::showHistory(
 		_scroll->hide();
 		_list = _scroll->setOwnedWidget(
 			object_ptr<HistoryInner>(this, _scroll, controller(), _history));
+		_pullToNext->attachToContent(_list);
+		_list->sendIntroSticker(
+		) | rpl::on_next([=](not_null<DocumentData*> sticker) {
+			sendExistingDocument(
+				sticker,
+				Api::MessageToSend(prepareSendAction({})));
+		}, _list->lifetime());
 		_list->show();
 
 		if (const auto channel = _peer->asChannel()) {
 			channel->updateFull();
 			if (!channel->isBroadcast()) {
-				channel->flagsValue(
-				) | rpl::start_with_next([=] {
+				using Flags = Data::Flags<ChannelDataFlags>;
+				channel->flagsValue() | rpl::skip(
+					1
+				) | rpl::on_next([=](Flags::Change change) {
 					refreshJoinChannelText();
+					if (change.diff & ChannelDataFlag::MonoforumDisabled) {
+						updateCanSendMessage();
+						updateSendRestriction();
+						updateHistoryGeometry();
+					}
 				}, _list->lifetime());
-			} else {
-				refreshJoinChannelText();
 			}
+			refreshJoinChannelText();
 		}
 
 		controller()->adaptive().changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_history->forceFullResize();
 			if (_migrated) {
 				_migrated->forceFullResize();
@@ -2446,12 +3005,25 @@ void HistoryWidget::showHistory(
 
 		if (const auto user = _peer->asUser()) {
 			if (const auto &info = user->botInfo) {
-				if (startBot) {
-					if (wasDialogsEntryState.key) {
-						info->inlineReturnTo = wasDialogsEntryState;
+				if (startBot
+					|| (!_history->isEmpty() && clearMaybeSendStart())) {
+					if (startBot && wasState.key) {
+						info->inlineReturnTo = wasState;
 					}
 					sendBotStartCommand();
 				}
+			} else {
+				Info::Profile::BirthdayValue(
+					user
+				) | rpl::map(
+					Data::IsBirthdayTodayValue
+				) | rpl::flatten_latest(
+				) | rpl::distinct_until_changed(
+				) | rpl::on_next([=] {
+					refreshSendGiftToggle();
+					updateControlsVisibility();
+					updateControlsGeometry();
+				}, _list->lifetime());
 			}
 		}
 		if (!_history->folderKnown()) {
@@ -2472,12 +3044,9 @@ void HistoryWidget::showHistory(
 		unreadCountUpdated(); // set _historyDown badge.
 		showAboutTopPromotion();
 
-		{
+		if (!session().sponsoredMessages().isTopBarFor(_history)) {
 			_scroll->setTrackingContent(false);
-			const auto checkState = crl::guard(this, [=, history = _history] {
-				if (history != _history) {
-					return;
-				}
+			const auto checkState = [=] {
 				using State = Data::SponsoredMessages::State;
 				const auto state = session().sponsoredMessages().state(
 					_history);
@@ -2487,10 +3056,20 @@ void HistoryWidget::showHistory(
 						session().sponsoredMessages().canHaveFor(_history));
 				} else if (state == State::InjectToMiddle) {
 					injectSponsoredMessages();
+				} else if (state == State::AppendToTopBar) {
 				}
-			});
-			session().sponsoredMessages().request(_history, checkState);
+			};
+			const auto history = _history;
+			session().sponsoredMessages().request(
+				_history,
+				crl::guard(this, [=, this] {
+					if (history == _history) {
+						checkState();
+					}
+				}));
 			checkState();
+		} else {
+			requestSponsoredMessageBar();
 		}
 	} else {
 		_chooseForReport = nullptr;
@@ -2522,13 +3101,14 @@ void HistoryWidget::setHistory(History *history) {
 	if (_history == history) {
 		return;
 	}
+	_pullToNext->setHistory(history);
 
 	const auto was = _attachBotsMenu && _history && _history->peer->isUser();
 	const auto now = _attachBotsMenu && history && history->peer->isUser();
 	if (was && !now) {
 		_attachToggle->removeEventFilter(_attachBotsMenu.get());
 		_attachBotsMenu->hideFast();
-	} else if (now && !was) {
+	} else if (now && !was && !ChatHelpers::ShowPanelOnClick()) {
 		_attachToggle->installEventFilter(_attachBotsMenu.get());
 	}
 
@@ -2544,10 +3124,15 @@ void HistoryWidget::setHistory(History *history) {
 		unregisterDraftSources();
 		clearAllLoadRequests();
 		clearSupportPreloadRequest();
+		_historySponsoredPreloading.destroy();
 		const auto wasHistory = base::take(_history);
 		const auto wasMigrated = base::take(_migrated);
 		unloadHeavyViewParts(wasHistory);
 		unloadHeavyViewParts(wasMigrated);
+		if (const auto wasCreatingBotTopic = base::take(_creatingBotTopic)) {
+			wasCreatingBotTopic->forum()->discardCreatingId(
+				wasCreatingBotTopic->rootId());
+		}
 	}
 	if (history) {
 		_history = history;
@@ -2568,12 +3153,12 @@ void HistoryWidget::setupPreview() {
 
 	using namespace HistoryView::Controls;
 	_preview = std::make_unique<WebpageProcessor>(_history, _field);
-	_preview->repaintRequests() | rpl::start_with_next([=] {
+	_preview->repaintRequests() | rpl::on_next([=] {
 		updateField();
 	}, _preview->lifetime());
 
 	_preview->parsedValue(
-	) | rpl::start_with_next([=](WebpageParsed value) {
+	) | rpl::on_next([=](WebpageParsed value) {
 		_previewTitle.setText(
 			st::msgNameStyle,
 			value.title,
@@ -2610,15 +3195,18 @@ void HistoryWidget::refreshAttachBotsMenu() {
 		controller(),
 		_history->peer,
 		[=] { return prepareSendAction({}); },
+		[=] { return sendMenuDetails(); },
 		[=](bool compress) { chooseAttach(compress); });
 	if (!_attachBotsMenu) {
 		return;
 	}
 	_attachBotsMenu->setOrigin(
 		Ui::PanelAnimation::Origin::BottomLeft);
-	_attachToggle->installEventFilter(_attachBotsMenu.get());
+	if (!ChatHelpers::ShowPanelOnClick()) {
+		_attachToggle->installEventFilter(_attachBotsMenu.get());
+	}
 	_attachBotsMenu->heightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		moveFieldControls();
 	}, _attachBotsMenu->lifetime());
 }
@@ -2629,10 +3217,10 @@ void HistoryWidget::unregisterDraftSources() {
 	}
 	session().local().unregisterDraftSource(
 		_history,
-		Data::DraftKey::Local({}));
+		Data::DraftKey::Local(MsgId(), PeerId()));
 	session().local().unregisterDraftSource(
 		_history,
-		Data::DraftKey::LocalEdit({}));
+		Data::DraftKey::LocalEdit(MsgId(), PeerId()));
 }
 
 void HistoryWidget::registerDraftSource() {
@@ -2646,6 +3234,7 @@ void HistoryWidget::registerDraftSource() {
 			(editMsgId
 				? FullReplyTo{ FullMsgId(peerId, editMsgId) }
 				: _replyTo),
+			suggestOptions(editMsgId != 0),
 			_field->getTextWithTags(),
 			_preview->draft(),
 		};
@@ -2657,8 +3246,8 @@ void HistoryWidget::registerDraftSource() {
 	session().local().registerDraftSource(
 		_history,
 		(editMsgId
-			? Data::DraftKey::LocalEdit({})
-			: Data::DraftKey::Local({})),
+			? Data::DraftKey::LocalEdit(MsgId(), PeerId())
+			: Data::DraftKey::Local(MsgId(), PeerId())),
 		std::move(draftSource));
 }
 
@@ -2667,7 +3256,7 @@ void HistoryWidget::setEditMsgId(MsgId msgId) {
 	_editMsgId = msgId;
 	if (!msgId) {
 		_mediaEditManager.cancel();
-		_canReplaceMedia = false;
+		_canReplaceMedia = _canAddMedia = false;
 		if (_preview) {
 			_preview->setDisabled(false);
 		}
@@ -2723,14 +3312,19 @@ void HistoryWidget::clearAllLoadRequests() {
 }
 
 bool HistoryWidget::updateReplaceMediaButton() {
-	if (!_canReplaceMedia) {
+	if (!_canReplaceMedia && !_canAddMedia) {
 		const auto result = (_replaceMedia != nullptr);
 		_replaceMedia.destroy();
 		return result;
 	} else if (_replaceMedia) {
 		return false;
 	}
-	_replaceMedia.create(this, st::historyReplaceMedia);
+	_replaceMedia.create(
+		this,
+		_canReplaceMedia ? st::historyReplaceMedia : st::historyAddMedia);
+	_replaceMedia->setAccessibleName(_canReplaceMedia
+		? tr::lng_attach_replace(tr::now)
+		: tr::lng_attach(tr::now));
 	const auto hideDuration = st::historyReplaceMedia.ripple.hideDuration;
 	_replaceMedia->setClickedCallback([=] {
 		base::call_delayed(hideDuration, this, [=] {
@@ -2738,6 +3332,7 @@ bool HistoryWidget::updateReplaceMediaButton() {
 				controller(),
 				{ _history->peer->id, _editMsgId },
 				_field->getTextWithTags(),
+				suggestOptions(),
 				_mediaEditManager.spoilered(),
 				_mediaEditManager.invertCaption(),
 				crl::guard(_list, [=] { cancelEdit(); }));
@@ -2783,6 +3378,40 @@ void HistoryWidget::refreshSilentToggle() {
 	}
 }
 
+void HistoryWidget::setupFastButtonMode() {
+	const auto field = _field->rawTextEdit();
+	base::install_event_filter(field, [=](not_null<QEvent*> e) {
+		if (e->type() != QEvent::KeyPress
+			|| !_history
+			|| !FastButtonsMode()
+			|| !session().fastButtonsBots().enabled(_history->peer)
+			|| !_field->getLastText().isEmpty()) {
+			return base::EventFilterResult::Continue;
+		}
+		const auto k = static_cast<QKeyEvent*>(e.get());
+		const auto key = k->key();
+		if (key < Qt::Key_1 || key > Qt::Key_9 || k->modifiers()) {
+			return base::EventFilterResult::Continue;
+		}
+		const auto item = _history ? _history->lastMessage() : nullptr;
+		const auto markup = item ? item->inlineReplyKeyboard() : nullptr;
+		const auto link = markup
+			? markup->getLinkByIndex(key - Qt::Key_1)
+			: nullptr;
+		if (!link) {
+			return base::EventFilterResult::Continue;
+		}
+		ActivateClickHandler(window(), link, {
+			Qt::LeftButton,
+			QVariant::fromValue(ClickHandlerContext{
+				.itemId = item->fullId(),
+				.sessionWindow = base::make_weak(controller()),
+			}),
+		});
+		return base::EventFilterResult::Cancel;
+	});
+}
+
 void HistoryWidget::setupScheduledToggle() {
 	controller()->activeChatValue(
 	) | rpl::map([=](Dialogs::Key key) -> rpl::producer<> {
@@ -2794,7 +3423,7 @@ void HistoryWidget::setupScheduledToggle() {
 		}
 		return rpl::never<rpl::empty_value>();
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshScheduledToggle();
 		updateControlsVisibility();
 		updateControlsGeometry();
@@ -2807,6 +3436,7 @@ void HistoryWidget::refreshScheduledToggle() {
 		&& (session().scheduledMessages().count(_history) > 0);
 	if (!_scheduled && has) {
 		_scheduled.create(this, st::historyScheduledToggle);
+		_scheduled->setAccessibleName(tr::lng_scheduled_messages(tr::now));
 		_scheduled->show();
 		_scheduled->addClickHandler([=] {
 			controller()->showSection(
@@ -2818,50 +3448,128 @@ void HistoryWidget::refreshScheduledToggle() {
 	}
 }
 
-void HistoryWidget::setupSendAsToggle() {
-	session().sendAsPeers().updated(
-	) | rpl::filter([=](not_null<PeerData*> peer) {
-		return (peer == _peer);
-	}) | rpl::start_with_next([=] {
-		refreshSendAsToggle();
-		updateControlsVisibility();
-		updateControlsGeometry();
-		orderWidgets();
-	}, lifetime());
-}
+void HistoryWidget::refreshSendGiftToggle() {
+	using Type = Api::DisallowedGiftType;
+	const auto user = _peer ? _peer->asUser() : nullptr;
+	const auto disallowed = user ? user->disallowedGiftTypes() : Type();
+	const auto all = Type::Premium
+		| Type::Unlimited
+		| Type::Limited
+		| Type::Unique;
+	const auto has = user
+		&& _canSendMessages
+		&& !user->isServiceUser()
+		&& !user->isSelf()
+		&& !user->isBot()
+		&& ((disallowed & Type::SendHide)
+			|| (session().user()->disallowedGiftTypes() & Type::SendHide)
+			|| Data::IsBirthdayToday(user->birthday()))
+		&& ((disallowed & all) != all);
+	if (!_giftToUser && has) {
+		_giftToUser.create(this, st::historyGiftToUser);
+		_giftToUser->setAccessibleName(tr::lng_gift_send_title(tr::now));
+		_giftToUser->show();
+		_giftToUser->addClickHandler([=] {
+			Ui::ShowStarGiftBox(controller(), _peer);
+		});
+		orderWidgets(); // Raise drag areas to the top.
+	} else if (_giftToUser && !has) {
+		_giftToUser.destroy();
+	}
+}
+
+void HistoryWidget::applySuggestOptions(
+		SuggestOptions suggest,
+		HistoryView::SuggestMode mode) {
+	Expects(suggest.exists);
+
+	using namespace HistoryView;
+	_suggestOptions = std::make_unique<SuggestOptionsBar>(
+		controller()->uiShow(),
+		_peer,
+		suggest,
+		mode);
+	_suggestOptions->updates() | rpl::on_next([=] {
+		updateField();
+		saveDraftWithTextNow();
+	}, _suggestOptions->lifetime());
+	saveDraftWithTextNow();
+}
+
+void HistoryWidget::saveDraftWithTextNow() {
+	_saveDraftText = true;
+	_saveDraftStart = crl::now();
+	saveDraft();
+}
+
+void HistoryWidget::refreshSuggestPostToggle() {
+	const auto has = _peer
+		&& _peer->isMonoforum()
+		&& !_peer->amMonoforumAdmin();
+	if (!_toggleSuggestPost && has) {
+		_toggleSuggestPost.create(this, st::historySuggestPostToggle);
+		_toggleSuggestPost->setVisible(!_suggestOptions);
+		_toggleSuggestPost->addClickHandler([=] {
+			using namespace HistoryView;
+			applySuggestOptions({ .exists = 1 }, SuggestMode::New);
+			cancelReply();
+			_processingReplyTo = FullReplyTo();
+			_processingReplyItem = nullptr;
+			updateControlsVisibility();
+			updateControlsGeometry();
+		});
+		orderWidgets();
+	} else if (_toggleSuggestPost && !has) {
+		_toggleSuggestPost.destroy();
+		cancelSuggestPost();
+	}
+}
+
+void HistoryWidget::setupSendAsToggle() {
+	session().sendAsPeers().updated(
+	) | rpl::filter([=](Main::SendAsKey key) {
+		return (key.peer == _peer)
+			&& (key.type == Main::SendAsType::Message);
+	}) | rpl::on_next([=] {
+		refreshSendAsToggle();
+		updateControlsVisibility();
+		updateControlsGeometry();
+		orderWidgets();
+	}, lifetime());
+}
 
 void HistoryWidget::refreshSendAsToggle() {
 	Expects(_peer != nullptr);
 
-	if (_editMsgId || !session().sendAsPeers().shouldChoose(_peer)) {
+	const auto key = Main::SendAsKey{ _peer, Main::SendAsType::Message };
+	if (_editMsgId || !session().sendAsPeers().shouldChoose(key)) {
 		_sendAs.destroy();
 		return;
 	} else if (_sendAs) {
 		return;
 	}
-	_sendAs.create(this, st::sendAsButton);
-	Ui::SetupSendAsButton(_sendAs.data(), controller());
+	const auto &st = st::defaultComposeControls.chooseSendAs;
+	_sendAs.create(this, st.button);
+	_sendAs->setAccessibleName(tr::lng_send_as_title(tr::now));
+	Ui::SetupSendAsButton(_sendAs.data(), st, controller());
 }
 
 bool HistoryWidget::contentOverlapped(const QRect &globalRect) {
-	return (_attachDragAreas.document->overlaps(globalRect)
-			|| _attachDragAreas.photo->overlaps(globalRect)
-			|| (_autocomplete && _autocomplete->overlaps(globalRect))
-			|| (_tabbedPanel && _tabbedPanel->overlaps(globalRect))
-			|| (_inlineResults && _inlineResults->overlaps(globalRect)));
+	return _attachDragAreas.document->overlaps(globalRect)
+		|| _attachDragAreas.photo->overlaps(globalRect)
+		|| (_autocomplete && _autocomplete->overlaps(globalRect))
+		|| (_tabbedPanel && _tabbedPanel->overlaps(globalRect))
+		|| (_inlineResults && _inlineResults->overlaps(globalRect));
 }
 
 bool HistoryWidget::canWriteMessage() const {
-	if (!_history || !_canSendMessages) {
-		return false;
-	}
-	if (isBlocked() || isJoinChannel() || isMuteUnmute() || isBotStart()) {
-		return false;
-	}
-	if (isSearching()) {
-		return false;
-	}
-	return true;
+	return _history
+		&& _canSendMessages
+		&& !isBlocked()
+		&& !isJoinChannel()
+		&& !isMuteUnmute()
+		&& !isBotStart()
+		&& !isSearching();
 }
 
 void HistoryWidget::updateControlsVisibility() {
@@ -2893,17 +3601,12 @@ void HistoryWidget::updateControlsVisibility() {
 	} else if (!_firstLoadRequest && _scroll->isHidden()) {
 		_scroll->show();
 	}
-	if (_pinnedBar) {
-		_pinnedBar->show();
-	}
-	if (_translateBar) {
-		_translateBar->show();
-	}
-	if (_groupCallBar) {
-		_groupCallBar->show();
+	_topBars->show();
+	if (_sponsoredMessageBar && checkSponsoredMessageBarVisibility()) {
+		_sponsoredMessageBar->toggle(true, anim::type::normal);
 	}
-	if (_requestsBar) {
-		_requestsBar->show();
+	if (_paysStatus) {
+		_paysStatus->show();
 	}
 	if (_contactStatus) {
 		_contactStatus->show();
@@ -2911,6 +3614,9 @@ void HistoryWidget::updateControlsVisibility() {
 	if (_businessBotStatus) {
 		_businessBotStatus->show();
 	}
+	if (_subsectionTabs) {
+		_subsectionTabs->show();
+	}
 	if (isChoosingTheme()
 		|| (!editingMessage()
 			&& (isSearching()
@@ -2963,6 +3669,12 @@ void HistoryWidget::updateControlsVisibility() {
 		if (_scheduled) {
 			_scheduled->hide();
 		}
+		if (_toggleSuggestPost) {
+			_toggleSuggestPost->hide();
+		}
+		if (_giftToUser) {
+			_giftToUser->hide();
+		}
 		if (_ttlInfo) {
 			_ttlInfo->hide();
 		}
@@ -3074,6 +3786,22 @@ void HistoryWidget::updateControlsVisibility() {
 					rightButtonsChanged = true;
 				}
 			}
+			if (_toggleSuggestPost) {
+				const auto was = _toggleSuggestPost->isVisible();
+				const auto now = !_suggestOptions;
+				if (was != now) {
+					_toggleSuggestPost->setVisible(now);
+					rightButtonsChanged = true;
+				}
+			}
+			if (_giftToUser) {
+				const auto was = _giftToUser->isVisible();
+				const auto now = (!_editMsgId) && (!hideExtraButtons);
+				if (was != now) {
+					_giftToUser->setVisible(now);
+					rightButtonsChanged = true;
+				}
+			}
 			if (_ttlInfo) {
 				const auto was = _ttlInfo->isVisible();
 				const auto now = (!_editMsgId) && (!hideExtraButtons);
@@ -3095,7 +3823,8 @@ void HistoryWidget::updateControlsVisibility() {
 			|| _replyTo
 			|| readyToForward()
 			|| _previewDrawPreview
-			|| _kbReplyTo) {
+			|| _kbReplyTo
+			|| _suggestOptions) {
 			if (_fieldBarCancel->isHidden()) {
 				_fieldBarCancel->show();
 				updateControlsGeometry();
@@ -3124,6 +3853,12 @@ void HistoryWidget::updateControlsVisibility() {
 		if (_scheduled) {
 			_scheduled->hide();
 		}
+		if (_toggleSuggestPost) {
+			_toggleSuggestPost->hide();
+		}
+		if (_giftToUser) {
+			_giftToUser->hide();
+		}
 		if (_ttlInfo) {
 			_ttlInfo->hide();
 		}
@@ -3166,6 +3901,8 @@ void HistoryWidget::updateControlsVisibility() {
 		hideFieldIfVisible();
 	}
 	//checkTabbedSelectorToggleTooltip();
+	updateAiButtonVisibility();
+	updateSendAsFileVisibility();
 	updateMouseTracking();
 }
 
@@ -3193,10 +3930,10 @@ void HistoryWidget::showAboutTopPromotion() {
 		? QString()
 		: Lang::GetNonDefaultValue(kPsaAboutPrefix + type.toUtf8());
 	const auto text = type.isEmpty()
-		? tr::lng_proxy_sponsor_about(tr::now, Ui::Text::RichLangValue)
+		? tr::lng_proxy_sponsor_about(tr::now, tr::rich)
 		: custom.isEmpty()
-		? tr::lng_about_psa_default(tr::now, Ui::Text::RichLangValue)
-		: Ui::Text::RichLangValue(custom);
+		? tr::lng_about_psa_default(tr::now, tr::rich)
+		: tr::rich(custom);
 	showInfoTooltip(text, nullptr);
 }
 
@@ -3281,7 +4018,9 @@ void HistoryWidget::newItemAdded(not_null<HistoryItem*> item) {
 		}
 		return;
 	}
-	_itemRevealPending.emplace(item);
+	if (!item->history()->streamedDrafts().hasFor(item)) {
+		_itemRevealPending.emplace(item);
+	}
 }
 
 void HistoryWidget::maybeMarkReactionsRead(not_null<HistoryItem*> item) {
@@ -3304,6 +4043,37 @@ void HistoryWidget::maybeMarkReactionsRead(not_null<HistoryItem*> item) {
 	session().api().markContentsRead(item);
 }
 
+bool HistoryWidget::handleDrawToReplyRequest(
+		Data::DrawToReplyRequest request) {
+	if (!_peer || request.messageId.peer != _peer->id) {
+		return false;
+	}
+	auto image = HistoryView::ResolveDrawToReplyImage(
+		&session().data(),
+		request);
+	if (image.isNull()) {
+		return false;
+	}
+	const auto replyTo = request.messageId;
+	HistoryView::OpenDrawToReplyEditor(
+		controller(),
+		std::move(image),
+		crl::guard(this, [=](QImage &&result) {
+			if (result.isNull()) {
+				return;
+			}
+			if (replyTo) {
+				replyToMessage({ .messageId = replyTo });
+			}
+			auto list = Storage::PrepareMediaFromImage(
+				std::move(result),
+				QByteArray(),
+				st::sendMediaPreviewSize);
+			confirmSendingFiles(std::move(list));
+		}));
+	return true;
+}
+
 void HistoryWidget::unreadCountUpdated() {
 	if (_history->unreadMark() || (_migrated && _migrated->unreadMark())) {
 		crl::on_main(this, [=, history = _history] {
@@ -3316,6 +4086,8 @@ void HistoryWidget::unreadCountUpdated() {
 			|| !_history->trackUnreadMessages();
 		_cornerButtons.updateJumpDownVisibility(hideCounter
 			? 0
+			: _history->amMonoforumAdmin()
+			? _history->chatListUnreadState().messages
 			: _history->chatListBadgesState().unreadCounter);
 	}
 }
@@ -3340,7 +4112,7 @@ void HistoryWidget::messagesFailed(const MTP::Error &error, int requestId) {
 		closeCurrent();
 		const auto wasAccount = not_null(&was->account());
 		if (const auto primary = Core::App().windowFor(wasAccount)) {
-			primary->showToast((was && was->isMegagroup())
+			primary->showToast(was->isMegagroup()
 				? tr::lng_group_not_accessible(tr::now)
 				: tr::lng_channel_not_accessible(tr::now));
 		}
@@ -3391,6 +4163,7 @@ void HistoryWidget::messagesReceived(
 		auto &d(messages.c_messages_messages());
 		_history->owner().processUsers(d.vusers());
 		_history->owner().processChats(d.vchats());
+		peer->processTopics(d.vtopics());
 		histList = &d.vmessages().v;
 		count = histList->size();
 	} break;
@@ -3398,20 +4171,21 @@ void HistoryWidget::messagesReceived(
 		auto &d(messages.c_messages_messagesSlice());
 		_history->owner().processUsers(d.vusers());
 		_history->owner().processChats(d.vchats());
+		peer->processTopics(d.vtopics());
 		histList = &d.vmessages().v;
 		count = d.vcount().v;
 	} break;
 	case mtpc_messages_channelMessages: {
 		auto &d(messages.c_messages_channelMessages());
+		_history->owner().processUsers(d.vusers());
+		_history->owner().processChats(d.vchats());
 		if (const auto channel = peer->asChannel()) {
 			channel->ptsReceived(d.vpts().v);
-			channel->processTopics(d.vtopics());
 		} else {
 			LOG(("API Error: received messages.channelMessages when "
 				"no channel was passed! (HistoryWidget::messagesReceived)"));
 		}
-		_history->owner().processUsers(d.vusers());
-		_history->owner().processChats(d.vchats());
+		peer->processTopics(d.vtopics());
 		histList = &d.vmessages().v;
 		count = d.vcount().v;
 	} break;
@@ -3478,10 +4252,7 @@ void HistoryWidget::messagesReceived(
 		}
 
 		_delayedShowAtRequest = 0;
-		setMsgId(
-			_delayedShowAtMsgId,
-			_delayedShowAtMsgHighlightPart,
-			_delayedShowAtMsgHighlightPartOffsetHint);
+		setMsgId(_delayedShowAtMsgId, _delayedShowAtMsgParams);
 		historyLoaded();
 	}
 	if (session().supportMode()) {
@@ -3494,6 +4265,26 @@ void HistoryWidget::historyLoaded() {
 	doneShow();
 }
 
+bool HistoryWidget::clearMaybeSendStart() {
+	if (!_showAndMaybeSendStart || !_history) {
+		return false;
+	} else if (!_history->peer->isFullLoaded()) {
+		_history->peer->updateFull();
+		return false;
+	}
+	_showAndMaybeSendStart = false;
+	if (const auto user = _history ? _history->peer->asUser() : nullptr) {
+		if (user->blockStatus() == PeerData::BlockStatus::NotBlocked) {
+			if (const auto info = user->botInfo.get()) {
+				if (!info->startToken.isEmpty()) {
+					return true;
+				}
+			}
+		}
+	}
+	return false;
+}
+
 void HistoryWidget::windowShown() {
 	updateControlsGeometry();
 }
@@ -3569,7 +4360,7 @@ void HistoryWidget::firstLoadMessages() {
 	_firstLoadRequest = histories.sendRequest(history, type, [=](
 			Fn<void()> finish) {
 		return history->session().api().request(MTPmessages_GetHistory(
-			history->peer->input,
+			history->peer->input(),
 			MTP_int(offsetId),
 			MTP_int(offsetDate),
 			MTP_int(offset),
@@ -3627,7 +4418,7 @@ void HistoryWidget::loadMessages() {
 	_preloadRequest = histories.sendRequest(history, type, [=](
 			Fn<void()> finish) {
 		return history->session().api().request(MTPmessages_GetHistory(
-			history->peer->input,
+			history->peer->input(),
 			MTP_int(offsetId),
 			MTP_int(offsetDate),
 			MTP_int(addOffset),
@@ -3693,7 +4484,7 @@ void HistoryWidget::loadMessagesDown() {
 	_preloadDownRequest = histories.sendRequest(history, type, [=](
 			Fn<void()> finish) {
 		return history->session().api().request(MTPmessages_GetHistory(
-			history->peer->input,
+			history->peer->input(),
 			MTP_int(offsetId + 1),
 			MTP_int(offsetDate),
 			MTP_int(addOffset),
@@ -3713,15 +4504,11 @@ void HistoryWidget::loadMessagesDown() {
 
 void HistoryWidget::delayedShowAt(
 		MsgId showAtMsgId,
-		const TextWithEntities &highlightPart,
-		int highlightPartOffsetHint) {
+		const Window::SectionShow &params) {
 	if (!_history) {
 		return;
 	}
-	if (_delayedShowAtMsgHighlightPart != highlightPart) {
-		_delayedShowAtMsgHighlightPart = highlightPart;
-	}
-	_delayedShowAtMsgHighlightPartOffsetHint = highlightPartOffsetHint;
+	_delayedShowAtMsgParams = params;
 	if (_delayedShowAtRequest && _delayedShowAtMsgId == showAtMsgId) {
 		return;
 	}
@@ -3775,7 +4562,7 @@ void HistoryWidget::delayedShowAt(
 	_delayedShowAtRequest = histories.sendRequest(history, type, [=](
 			Fn<void()> finish) {
 		return history->session().api().request(MTPmessages_GetHistory(
-			history->peer->input,
+			history->peer->input(),
 			MTP_int(offsetId),
 			MTP_int(offsetDate),
 			MTP_int(offset),
@@ -3856,6 +4643,12 @@ void HistoryWidget::preloadHistoryIfNeeded() {
 		preloadHistoryByScroll();
 		checkReplyReturns();
 	}
+	const auto hasNonEmpty = _history->findFirstNonEmpty();
+	const auto readyForBotStart = hasNonEmpty
+		|| (_history->loadedAtTop() && _history->loadedAtBottom());
+	if (readyForBotStart && clearMaybeSendStart() && hasNonEmpty) {
+		sendBotStartCommand();
+	}
 }
 
 void HistoryWidget::preloadHistoryByScroll() {
@@ -3954,7 +4747,7 @@ void HistoryWidget::checkReplyReturns() {
 }
 
 void HistoryWidget::cancelInlineBot() {
-	auto &textWithTags = _field->getTextWithTags();
+	const auto &textWithTags = _field->getTextWithTags();
 	if (textWithTags.text.size() > _inlineBotUsername.size() + 2) {
 		setFieldText(
 			{ '@' + _inlineBotUsername + ' ', TextWithTags::Tags() },
@@ -3985,7 +4778,86 @@ TextWithEntities HistoryWidget::prepareTextForEditMsg() const {
 	return left;
 }
 
-void HistoryWidget::saveEditMsg() {
+void HistoryWidget::setupSendMenu(
+		not_null<Ui::RpWidget*> button,
+		Fn<void(SendMenu::Action, SendMenu::Details)> action) {
+	using namespace SendMenu;
+	SetupMenuAndShortcuts(
+		button,
+		controller()->uiShow(),
+		[=] { return sendButtonMenuDetails(); },
+		[=](Action value, Details details) {
+			if (value.type == ActionType::CaptionUp
+				|| value.type == ActionType::CaptionDown
+				|| value.type == ActionType::SpoilerOn
+				|| value.type == ActionType::SpoilerOff) {
+				_mediaEditManager.apply(value);
+			} else {
+				action(value, details);
+			}
+		});
+}
+
+void HistoryWidget::showAiComposeBox() {
+	const auto text = prepareTextForEditMsg();
+	if (text.text.isEmpty()) {
+		return;
+	}
+	auto send = Fn<void(TextWithEntities &&, Api::SendOptions, Fn<void()>)>(
+		nullptr);
+	auto setupMenu = Fn<void(
+		not_null<Ui::RpWidget*>,
+		Fn<void(Api::SendOptions)>)>(nullptr);
+	if (_list && canSendAiComposeDirect()) {
+		send = crl::guard(_list, [=](
+				TextWithEntities result,
+				Api::SendOptions options,
+				Fn<void()> done) {
+			sendWithTextOverride(std::move(result), options, std::move(done));
+		});
+		setupMenu = crl::guard(_list, [=](
+				not_null<Ui::RpWidget*> button,
+				Fn<void(Api::SendOptions)> sendCallback) {
+			setupSendMenu(
+				button,
+				SendMenu::DefaultCallback(
+					controller()->uiShow(),
+					sendCallback));
+		});
+	}
+	HistoryView::Controls::ShowComposeAiBox(controller()->uiShow(), {
+		.session = &session(),
+		.text = text,
+		.chatStyle = _fieldChatStyle,
+		.apply = crl::guard(this, [=](const TextWithEntities &result) {
+			const auto action = Ui::InputField::HistoryAction::NewEntry;
+			setFieldText({
+				result.text,
+				TextUtilities::ConvertEntitiesToTextTags(result.entities),
+			}, TextUpdateEvent::SaveDraft, action);
+		}),
+		.send = std::move(send),
+		.setupMenu = std::move(setupMenu),
+	});
+}
+
+void HistoryWidget::triggerAiApplyInPlace() {
+	Api::TriggerAiApplyInPlace(
+		&session(),
+		controller()->uiShow(),
+		this,
+		_field,
+		prepareTextForEditMsg(),
+		crl::guard(this, [=](TextWithTags textWithTags, int cursor) {
+			setFieldText(
+				textWithTags,
+				TextUpdateEvent::SaveDraft,
+				Ui::InputField::HistoryAction::NewEntry);
+			_field->setCursorPosition(cursor);
+		}));
+}
+
+void HistoryWidget::saveEditMessage(Api::SendOptions options) {
 	Expects(_history != nullptr);
 
 	if (_saveEditMsgRequestId) {
@@ -4008,15 +4880,16 @@ void HistoryWidget::saveEditMsg() {
 			|| webPageDraft.url.isEmpty()
 			|| !webPageDraft.manual)
 		&& !hasMediaWithCaption) {
-		const auto suggestModerateActions = false;
-		controller()->show(
-			Box<DeleteMessagesBox>(item, suggestModerateActions));
+		if (item->computeSuggestionActions() == SuggestionActions::None) {
+			controller()->show(Box<DeleteMessagesBox>(item));
+		}
 		return;
 	} else {
-		const auto maxCaptionSize = !hasMediaWithCaption
-			? MaxMessageSize
-			: Data::PremiumLimits(&session()).captionLengthCurrent();
-		const auto remove = _fieldCharsCountManager.count() - maxCaptionSize;
+		const auto limits = Data::PremiumLimits(&session());
+		const auto maxTextSize = hasMediaWithCaption
+			? limits.captionLengthCurrent()
+			: limits.messageLengthCurrent();
+		const auto remove = _fieldCharsCountManager.count() - maxTextSize;
 		if (remove > 0) {
 			controller()->showToast(
 				tr::lng_edit_limit_reached(tr::now, lt_count, remove));
@@ -4030,7 +4903,7 @@ void HistoryWidget::saveEditMsg() {
 		}
 	}
 
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto history = _history;
 
 	const auto done = [=](mtpRequestId requestId) {
@@ -4040,16 +4913,16 @@ void HistoryWidget::saveEditMsg() {
 				cancelEdit();
 			}
 		})();
-		if (const auto editDraft = history->localEditDraft({})) {
+		if (const auto editDraft = history->localEditDraft({}, {})) {
 			if (editDraft->saveRequestId == requestId) {
-				history->clearLocalEditDraft({});
+				history->clearLocalEditDraft(MsgId(), PeerId());
 				history->session().local().writeDrafts(history);
 			}
 		}
 	};
 
 	const auto fail = [=](const QString &error, mtpRequestId requestId) {
-		if (const auto editDraft = history->localEditDraft({})) {
+		if (const auto editDraft = history->localEditDraft({}, {})) {
 			if (editDraft->saveRequestId == requestId) {
 				editDraft->saveRequestId = 0;
 			}
@@ -4072,11 +4945,30 @@ void HistoryWidget::saveEditMsg() {
 		})();
 	};
 
+	options.invertCaption = _mediaEditManager.invertCaption();
+	options.suggest = suggestOptions(true);
+
+	if (item->computeSuggestionActions()
+		== SuggestionActions::AcceptAndDecline) {
+		const auto withPaymentApproved = [=](int approved) {
+			auto copy = options;
+			copy.starsApproved = approved;
+			saveEditMessage(copy);
+		};
+		const auto checked = checkSendPayment(
+			1 + int(_forwardPanel->items().size()),
+			options,
+			withPaymentApproved);
+		if (!checked) {
+			return;
+		}
+	}
+
 	_saveEditMsgRequestId = Api::EditTextMessage(
 		item,
 		sending,
 		webPageDraft,
-		{ .invertCaption = _mediaEditManager.invertCaption() },
+		options,
 		done,
 		fail,
 		_mediaEditManager.spoilered());
@@ -4090,17 +4982,12 @@ void HistoryWidget::hideChildWidgets() {
 	if (_tabbedPanel) {
 		_tabbedPanel->hideFast();
 	}
-	if (_pinnedBar) {
-		_pinnedBar->hide();
-	}
-	if (_translateBar) {
-		_translateBar->hide();
-	}
-	if (_groupCallBar) {
-		_groupCallBar->hide();
+	if (_sponsoredMessageBar) {
+		_sponsoredMessageBar->toggle(false, anim::type::instant);
 	}
-	if (_requestsBar) {
-		_requestsBar->hide();
+	_topBars->hide();
+	if (_subsectionTabs) {
+		_subsectionTabs->hide();
 	}
 	if (_voiceRecordBar) {
 		_voiceRecordBar->hideFast();
@@ -4111,6 +4998,9 @@ void HistoryWidget::hideChildWidgets() {
 	if (_chooseTheme) {
 		_chooseTheme->hide();
 	}
+	if (_paysStatus) {
+		_paysStatus->hide();
+	}
 	if (_contactStatus) {
 		_contactStatus->hide();
 	}
@@ -4136,9 +5026,41 @@ void HistoryWidget::hideSelectorControlsAnimated() {
 }
 
 Api::SendAction HistoryWidget::prepareSendAction(
-		Api::SendOptions options) const {
+		Api::SendOptions options) {
 	auto result = Api::SendAction(_history, options);
 	result.replyTo = replyTo();
+
+	if (const auto forum = _history->asForum()) {
+		if (forum->bot() && Data::IsBotUserCreatesTopics(_history->peer)) {
+			const auto readyRootId = [&]() -> MsgId {
+				if (const auto id = result.replyTo.messageId) {
+					if (const auto item = session().data().message(id)) {
+						return item->topicRootId();
+					}
+				}
+				return {};
+			}();
+			if (readyRootId) {
+				result.replyTo.topicRootId = readyRootId;
+			} else {
+				if (!_creatingBotTopic) {
+					_creatingBotTopic = forum->reserveNewBotTopic();
+					auto draft = _history->forwardDraft(MsgId(0), PeerId());
+					if (!draft.ids.empty()) {
+						_history->setForwardDraft(MsgId(0), PeerId(), {});
+						_history->setForwardDraft(
+							_creatingBotTopic->rootId(),
+							PeerId(),
+							std::move(draft));
+					}
+				}
+				result = Api::SendAction(_creatingBotTopic, options);
+				result.replyTo.topicRootId = _creatingBotTopic->rootId();
+			}
+		}
+	}
+
+	result.options.suggest = suggestOptions();
 	result.options.sendAs = _sendAs
 		? _history->session().sendAsPeers().resolveChosen(
 			_history->peer).get()
@@ -4146,49 +5068,107 @@ Api::SendAction HistoryWidget::prepareSendAction(
 	return result;
 }
 
+void HistoryWidget::sendVoice(const VoiceToSend &data) {
+	if (!canWriteMessage() || data.bytes.isEmpty() || !_history) {
+		return;
+	}
+
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = data;
+		copy.options.starsApproved = approved;
+		sendVoice(copy);
+	};
+	auto action = prepareSendAction(data.options);
+	const auto checked = checkSendPayment(
+		1 + int(_forwardPanel->items().size()),
+		action.options,
+		withPaymentApproved);
+	if (!checked) {
+		return;
+	}
+
+	session().api().sendVoiceMessage(
+		data.bytes,
+		data.waveform,
+		data.duration,
+		data.video,
+		action);
+	_voiceRecordBar->clearListenState();
+}
+
 void HistoryWidget::send(Api::SendOptions options) {
 	if (!_history) {
 		return;
 	} else if (_editMsgId) {
-		saveEditMsg();
+		saveEditMessage({});
 		return;
 	} else if (!options.scheduled && showSlowmodeError()) {
 		return;
-	}
-
-	if (_voiceRecordBar->isListenState()) {
+	} else if (_voiceRecordBar->isListenState()) {
 		_voiceRecordBar->requestToSendWithOptions(options);
 		return;
 	}
 
+	sendTextWithTags(
+		_field->getTextWithAppliedMarkdown(),
+		true,
+		options,
+		nullptr);
+}
+
+void HistoryWidget::sendTextWithTags(
+		TextWithTags textWithTags,
+		bool useWebPageDraft,
+		Api::SendOptions options,
+		Fn<void()> done) {
 	if (!options.scheduled) {
 		_cornerButtons.clearReplyReturns();
 	}
 
 	auto message = Api::MessageToSend(prepareSendAction(options));
-	message.textWithTags = _field->getTextWithAppliedMarkdown();
-	message.webPage = _preview->draft();
+	message.textWithTags = textWithTags;
+	if (useWebPageDraft && _preview) {
+		message.webPage = _preview->draft();
+	}
 
 	const auto ignoreSlowmodeCountdown = (options.scheduled != 0);
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = options;
+		copy.starsApproved = approved;
+		sendTextWithTags(textWithTags, useWebPageDraft, copy, done);
+	};
 	if (showSendMessageError(
 			message.textWithTags,
-			ignoreSlowmodeCountdown)) {
+			ignoreSlowmodeCountdown,
+			withPaymentApproved,
+			message.action.options)) {
 		return;
 	}
 
+	const auto nextLocalMessageId = session().data().nextLocalMessageId();
+	const auto hasText = !message.textWithTags.text.trimmed().isEmpty();
+
+	if (hasText
+		&& message.webPage.url.isEmpty()
+		&& (_field->document()->size().height() <= _field->height())) {
+		controller()->sendingAnimation().appendSending({
+			.type = Ui::MessageSendingAnimationFrom::Type::Text,
+			.localId = nextLocalMessageId,
+			.globalStartGeometry = _field->mapToGlobal(Rect(_field->size())),
+		});
+	}
+
 	// Just a flag not to drop reply info if we're not sending anything.
-	_justMarkingAsRead = !HasSendText(_field)
+	_justMarkingAsRead = !hasText
 		&& message.webPage.url.isEmpty();
-	session().api().sendMessage(std::move(message));
+	session().api().sendMessage(std::move(message), nextLocalMessageId);
 	_justMarkingAsRead = false;
 
 	clearFieldText();
 	if (_preview) {
 		_preview->apply({ .removed = true });
 	}
-	_saveDraftText = true;
-	_saveDraftStart = crl::now();
-	saveDraft();
+	saveDraftWithTextNow();
 
 	hideSelectorControlsAnimated();
 
@@ -4202,6 +5182,23 @@ void HistoryWidget::send(Api::SendOptions options) {
 		(options.scheduled
 			? Data::HistoryUpdate::Flag::ScheduledSent
 			: Data::HistoryUpdate::Flag::MessageSent));
+	if (done) {
+		done();
+	}
+}
+
+void HistoryWidget::sendWithTextOverride(
+		TextWithEntities text,
+		Api::SendOptions options,
+		Fn<void()> done) {
+	if (!canSendAiComposeDirect()) {
+		return;
+	}
+	const auto useWebPageDraft = (text.text == prepareTextForEditMsg().text);
+	sendTextWithTags({
+		text.text,
+		TextUtilities::ConvertEntitiesToTextTags(text.entities),
+	}, useWebPageDraft, options, std::move(done));
 }
 
 void HistoryWidget::sendWithModifiers(Qt::KeyboardModifiers modifiers) {
@@ -4230,6 +5227,8 @@ void HistoryWidget::sendScheduled(Api::SendOptions initialOptions) {
 SendMenu::Details HistoryWidget::sendMenuDetails() const {
 	const auto type = !_peer
 		? SendMenu::Type::Disabled
+		: _peer->starsPerMessageChecked()
+		? SendMenu::Type::SilentOnly
 		: _peer->isSelf()
 		? SendMenu::Type::Reminder
 		: HistoryView::CanScheduleUntilOnline(_peer)
@@ -4240,7 +5239,7 @@ SendMenu::Details HistoryWidget::sendMenuDetails() const {
 }
 
 SendMenu::Details HistoryWidget::saveMenuDetails() const {
-	return (_editMsgId && _replyEditMsg)
+	return (_editMsgId && _replyEditMsg && !_replyEditMsg->richPage())
 		? _mediaEditManager.sendMenuDetails(HasSendText(_field))
 		: SendMenu::Details();
 }
@@ -4253,11 +5252,25 @@ auto HistoryWidget::computeSendButtonType() const {
 	} else if (_isInlineBot) {
 		return Type::Cancel;
 	} else if (showRecordButton()) {
-		return Type::Record;
+		const auto both = Webrtc::RecordAvailability::VideoAndAudio;
+		const auto video = Core::App().settings().recordVideoMessages();
+		return (video && _recordAvailability == both)
+			? Type::Round
+			: Type::Record;
 	}
 	return Type::Send;
 }
 
+bool HistoryWidget::canSendAiComposeDirect() const {
+	using Type = Ui::SendButton::Type;
+	return _history
+		&& _peer
+		&& (computeSendButtonType() == Type::Send)
+		&& !_peer->slowmodeSecondsLeft()
+		&& !(_peer->slowmodeApplied() && _history->latestSendingMessage())
+		&& !_peer->starsPerMessageChecked();
+}
+
 SendMenu::Details HistoryWidget::sendButtonMenuDetails() const {
 	using Type = Ui::SendButton::Type;
 	const auto type = computeSendButtonType();
@@ -4342,12 +5355,8 @@ PeerData *HistoryWidget::peer() const {
 // Sometimes _showAtMsgId is set directly.
 void HistoryWidget::setMsgId(
 		MsgId showAtMsgId,
-		const TextWithEntities &highlightPart,
-		int highlightPartOffsetHint) {
-	if (_showAtMsgHighlightPart != highlightPart) {
-		_showAtMsgHighlightPart = highlightPart;
-	}
-	_showAtMsgHighlightPartOffsetHint = highlightPartOffsetHint;
+		const Window::SectionShow &params) {
+	_showAtMsgParams = params;
 	if (_showAtMsgId != showAtMsgId) {
 		_showAtMsgId = showAtMsgId;
 		if (_history) {
@@ -4365,6 +5374,8 @@ MsgId HistoryWidget::msgId() const {
 void HistoryWidget::showAnimated(
 		Window::SlideDirection direction,
 		const Window::SectionSlideParams &params) {
+	validateSubsectionTabs();
+
 	_showAnimation = nullptr;
 
 	// If we show pinned bar here, we don't want it to change the
@@ -4385,16 +5396,21 @@ void HistoryWidget::showAnimated(
 	if (_requestsBar) {
 		_requestsBar->finishAnimating();
 	}
-	_topShadow->setVisible(params.withTopBarShadow ? false : true);
+	const auto fromBottom = (direction == Window::SlideDirection::FromBottom);
+	_topShadow->setVisible(fromBottom
+		? params.withTopBarShadow
+		: !params.withTopBarShadow);
 	_preserveScrollTop = false;
 	_stickerToast = nullptr;
 
 	auto newContentCache = Ui::GrabWidget(this);
 
 	hideChildWidgets();
-	if (params.withTopBarShadow) _topShadow->show();
+	if (params.withTopBarShadow && !fromBottom) {
+		_topShadow->show();
+	}
 
-	if (_history) {
+	if (_history && !fromBottom) {
 		_topBar->show();
 		_topBar->setAnimatingMode(true);
 	}
@@ -4409,6 +5425,11 @@ void HistoryWidget::showAnimated(
 	activate();
 }
 
+void HistoryWidget::showFast() {
+	validateSubsectionTabs();
+	show();
+}
+
 void HistoryWidget::showFinished() {
 	_cornerButtons.finishAnimations();
 	if (_pinnedBar) {
@@ -4446,6 +5467,10 @@ void HistoryWidget::doneShow() {
 	if (_pinnedBar) {
 		_pinnedBar->finishAnimating();
 	}
+	checkSponsoredMessageBar();
+	if (_sponsoredMessageBar) {
+		_sponsoredMessageBar->finishAnimating();
+	}
 	if (_translateBar) {
 		_translateBar->finishAnimating();
 	}
@@ -4459,11 +5484,17 @@ void HistoryWidget::doneShow() {
 	controller()->widget()->setInnerFocus();
 	_preserveScrollTop = false;
 	checkSuggestToGigagroup();
+
+	if (_history) {
+		_history->saveMeAsActiveSubsectionThread();
+	}
 }
 
 void HistoryWidget::cornerButtonsShowAtPosition(
 		Data::MessagePosition position) {
-	if (position == Data::UnreadMessagePosition) {
+	if (!_peer) {
+		return;
+	} else if (position == Data::UnreadMessagePosition) {
 		DEBUG_LOG(("JumpToEnd(%1, %2, %3): Show at unread requested."
 			).arg(_history->peer->name()
 			).arg(_history->inboxReadTillId().bare
@@ -4488,6 +5519,19 @@ FullMsgId HistoryWidget::cornerButtonsCurrentId() {
 		: FullMsgId();
 }
 
+bool HistoryWidget::checkSendPayment(
+		int messagesCount,
+		Api::SendOptions options,
+		Fn<void(int)> withPaymentApproved) {
+	return _peer
+		&& _sendPayment.check(
+			controller(),
+			_peer,
+			options,
+			messagesCount,
+			std::move(withPaymentApproved));
+}
+
 void HistoryWidget::checkSuggestToGigagroup() {
 	const auto group = _peer ? _peer->asMegagroup() : nullptr;
 	if (!group || !group->owner().suggestToGigagroup(group)) {
@@ -4497,7 +5541,7 @@ void HistoryWidget::checkSuggestToGigagroup() {
 		if (!controller()->isLayerShown()) {
 			group->owner().setSuggestToGigagroup(group, false);
 			group->session().api().request(MTPhelp_DismissSuggestion(
-				group->input,
+				group->input(),
 				MTP_string("convert_to_gigagroup")
 			)).send();
 			controller()->show(Box([=](not_null<Ui::GenericBox*> box) {
@@ -4506,7 +5550,7 @@ void HistoryWidget::checkSuggestToGigagroup() {
 					object_ptr<Ui::FlatLabel>(
 						box,
 						tr::lng_gigagroup_suggest_text(
-						) | Ui::Text::ToRichLangValue(),
+						) | rpl::map(tr::rich),
 						st::infoAboutGigagroup));
 				box->addButton(
 					tr::lng_gigagroup_suggest_more(),
@@ -4537,7 +5581,7 @@ void HistoryWidget::chooseAttach(
 	if (!_peer || !_canSendMessages) {
 		return;
 	} else if (const auto error = Data::AnyFileRestrictionError(_peer)) {
-		controller()->showToast(*error);
+		Data::ShowSendErrorToast(controller(), _peer, error);
 		return;
 	} else if (showSlowmodeError()) {
 		return;
@@ -4587,14 +5631,15 @@ void HistoryWidget::sendButtonClicked() {
 	const auto type = _send->type();
 	if (type == Ui::SendButton::Type::Cancel) {
 		cancelInlineBot();
-	} else if (type != Ui::SendButton::Type::Record) {
+	} else if (type != Ui::SendButton::Type::Record
+		&& type != Ui::SendButton::Type::Round) {
 		send({});
 	}
 }
 
 void HistoryWidget::leaveEventHook(QEvent *e) {
 	if (hasMouseTracking()) {
-		mouseMoveEvent(nullptr);
+		clearOverStates();
 	}
 }
 
@@ -4612,7 +5657,11 @@ void HistoryWidget::updateOverStates(QPoint pos) {
 		st::historyReplyHeight);
 	const auto hasWebPage = !!_previewDrawPreview;
 	const auto inDetails = detailsRect.contains(pos)
-		&& (_editMsgId || replyTo() || isReadyToForward || hasWebPage);
+		&& (_editMsgId
+			|| replyTo()
+			|| isReadyToForward
+			|| hasWebPage
+			|| _suggestOptions);
 	const auto inPhotoEdit = inDetails
 		&& _photoEditMedia
 		&& QRect(
@@ -4641,10 +5690,30 @@ void HistoryWidget::updateOverStates(QPoint pos) {
 	}
 }
 
+void HistoryWidget::clearOverStates() {
+	if (_inPhotoEdit) {
+		_inPhotoEdit = false;
+		if (_photoEditMedia) {
+			_inPhotoEditOver.start(
+				[=] { updateField(); },
+				1.,
+				0.,
+				st::defaultMessageBar.duration);
+		} else {
+			_inPhotoEditOver.stop();
+		}
+	}
+	_inDetails = false;
+	if (_inClickable) {
+		_inClickable = false;
+		setCursor(style::cur_default);
+	}
+}
+
 void HistoryWidget::leaveToChildEvent(QEvent *e, QWidget *child) {
-// e -- from enterEvent() of child TWidget
+// e -- from enterEvent() of child RpWidget
 	if (hasMouseTracking()) {
-		updateOverStates(mapFromGlobal(QCursor::pos()));
+		clearOverStates();
 	}
 }
 
@@ -4652,13 +5721,34 @@ void HistoryWidget::mouseReleaseEvent(QMouseEvent *e) {
 }
 
 void HistoryWidget::sendBotCommand(const Bot::SendCommandRequest &request) {
-// replyTo != 0 from ReplyKeyboardMarkup, == 0 from command links
+	sendBotCommand(request, {});
+}
+
+void HistoryWidget::sendBotCommand(
+		const Bot::SendCommandRequest &request,
+		Api::SendOptions options) {
+	// replyTo != 0 from ReplyKeyboardMarkup, == 0 from command links
 	if (_peer != request.peer.get()) {
 		return;
 	} else if (showSlowmodeError()) {
 		return;
 	}
 
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = options;
+		copy.starsApproved = approved;
+		sendBotCommand(request, copy);
+	};
+
+	const auto action = prepareSendAction(options);
+	const auto checked = checkSendPayment(
+		1,
+		action.options,
+		withPaymentApproved);
+	if (!checked) {
+		return;
+	}
+
 	const auto forMsgId = _keyboard->forMsgId();
 	const auto lastKeyboardUsed = (forMsgId == request.replyTo.messageId)
 		&& (forMsgId == FullMsgId(_peer->id, _history->lastKeyboardId));
@@ -4668,7 +5758,7 @@ void HistoryWidget::sendBotCommand(const Bot::SendCommandRequest &request) {
 		? request.command
 		: Bot::WrapCommandInChat(_peer, request.command, request.context);
 
-	auto message = Api::MessageToSend(prepareSendAction({}));
+	auto message = Api::MessageToSend(action);
 	message.textWithTags = { toSend, TextWithTags::Tags() };
 	message.action.replyTo = request.replyTo
 		? ((!_peer->isUser()/* && (botStatus == 0 || botStatus == 2)*/)
@@ -4740,10 +5830,10 @@ bool HistoryWidget::insertBotCommand(const QString &cmd) {
 			? _peer->asChat()->botStatus
 			: _peer->isMegagroup()
 			? _peer->asChannel()->mgInfo->botStatus
-			: -1;
+			: Data::BotStatus::NoBots;
 		if ((toInsert.indexOf('@') < 0)
 			&& !username.isEmpty()
-			&& (botStatus == 0 || botStatus == 2)) {
+			&& (botStatus != Data::BotStatus::NoBots)) {
 			toInsert += '@' + username;
 		}
 	}
@@ -4778,6 +5868,13 @@ bool HistoryWidget::insertBotCommand(const QString &cmd) {
 	return false;
 }
 
+void HistoryWidget::insertTextAtCursor(const QString &text) {
+	if (!_canSendTexts) {
+		return;
+	}
+	Menu::InsertTextAtCursor(_field, text);
+}
+
 bool HistoryWidget::eventFilter(QObject *obj, QEvent *e) {
 	if (e->type() == QEvent::KeyPress) {
 		const auto k = static_cast<QKeyEvent*>(e);
@@ -4785,7 +5882,9 @@ bool HistoryWidget::eventFilter(QObject *obj, QEvent *e) {
 			if (k->key() == Qt::Key_Up) {
 #ifdef Q_OS_MAC
 				// Cmd + Up is used instead of Home.
-				if (HasSendText(_field)) {
+				if (HasSendText(_field)
+					&& !base::options::value<bool>(
+						HistoryView::Controls::kOptionMacCmdReplyImmediately)) {
 					return false;
 				}
 #endif
@@ -4793,7 +5892,9 @@ bool HistoryWidget::eventFilter(QObject *obj, QEvent *e) {
 			} else if (k->key() == Qt::Key_Down) {
 #ifdef Q_OS_MAC
 				// Cmd + Down is used instead of End.
-				if (HasSendText(_field)) {
+				if (HasSendText(_field)
+					&& !base::options::value<bool>(
+						HistoryView::Controls::kOptionMacCmdReplyImmediately)) {
 					return false;
 				}
 #endif
@@ -4801,7 +5902,7 @@ bool HistoryWidget::eventFilter(QObject *obj, QEvent *e) {
 			}
 		}
 	}
-	return TWidget::eventFilter(obj, e);
+	return RpWidget::eventFilter(obj, e);
 }
 
 bool HistoryWidget::floatPlayerHandleWheelEvent(QEvent *e) {
@@ -4857,7 +5958,10 @@ bool HistoryWidget::isBlocked() const {
 }
 
 bool HistoryWidget::isJoinChannel() const {
-	return _peer && _peer->isChannel() && !_peer->asChannel()->amIn();
+	if (const auto channel = _peer ? _peer->asChannel() : nullptr) {
+		return !channel->amIn() && !channel->isMonoforum();
+	}
+	return false;
 }
 
 bool HistoryWidget::isChoosingTheme() const {
@@ -4877,12 +5981,12 @@ bool HistoryWidget::isSearching() const {
 }
 
 bool HistoryWidget::showRecordButton() const {
-	return Media::Capture::instance()->available()
+	return (_recordAvailability != Webrtc::RecordAvailability::None)
 		&& !_voiceRecordBar->isListenState()
 		&& !_voiceRecordBar->isRecordingByAnotherBar()
 		&& !HasSendText(_field)
 		&& !_previewDrawPreview
-		&& !readyToForward()
+		&& (_replyTo || !readyToForward())
 		&& !_editMsgId;
 }
 
@@ -4894,21 +5998,47 @@ void HistoryWidget::updateSendButtonType() {
 	using Type = Ui::SendButton::Type;
 
 	const auto type = computeSendButtonType();
-	_send->setType(type);
-
-	// This logic is duplicated in RepliesWidget.
+	const auto forbidden = [&] {
+		if (type != Type::Record && type != Type::Round) {
+			return false;
+		}
+		if (!_peer) {
+			return false;
+		}
+		const auto restriction = (type == Type::Record)
+			? ChatRestriction::SendVoiceMessages
+			: ChatRestriction::SendVideoMessages;
+		return !!Data::RestrictionError(_peer, restriction);
+	}();
+	// This logic is duplicated in ChatWidget.
 	const auto disabledBySlowmode = _peer
 		&& _peer->slowmodeApplied()
 		&& (_history->latestSendingMessage() != nullptr);
-
 	const auto delay = [&] {
 		return (type != Type::Cancel && type != Type::Save && _peer)
 			? _peer->slowmodeSecondsLeft()
 			: 0;
 	}();
-	_send->setSlowmodeDelay(delay);
+	const auto perMessage = _peer ? _peer->starsPerMessageChecked() : 0;
+	const auto messages = !_peer
+		? 0
+		: _voiceRecordBar->isListenState()
+		? 1
+		: ComputeSendingMessagesCount(_history, {
+			.forward = &_forwardPanel->items(),
+			.text = &_field->getTextWithTags(),
+		});
+	const auto stars = perMessage ? (perMessage * messages) : 0;
+	_send->setState({
+		.type = (delay > 0) ? Type::Slowmode : type,
+		.slowmodeDelay = delay,
+		.starsToSend = stars,
+		.forbidden = forbidden,
+	});
 	_send->setDisabled(disabledBySlowmode
-		&& (type == Type::Send || type == Type::Record));
+		&& (type == Type::Send
+			|| type == Type::Record
+			|| type == Type::Round));
 
 	if (delay != 0) {
 		base::call_delayed(
@@ -4926,9 +6056,9 @@ bool HistoryWidget::updateCmdStartShown() {
 	if (_history
 		&& _peer
 		&& (false
-			|| (_peer->isChat() && _peer->asChat()->botStatus > 0)
+			|| (_peer->isChat() && !_peer->asChat()->botCommands().empty())
 			|| (_peer->isMegagroup()
-				&& _peer->asChannel()->mgInfo->botStatus > 0))) {
+				&& !_peer->asChannel()->mgInfo->botCommands().empty()))) {
 		if (!isBotStart()
 			&& !isBlocked()
 			&& !_keyboard->hasMarkup()
@@ -4964,8 +6094,6 @@ bool HistoryWidget::updateCmdStartShown() {
 			st::historyBotMenuButton);
 		orderWidgets();
 
-		_botMenu.button->setTextTransform(
-			Ui::RoundButton::TextTransform::NoTransform);
 		_botMenu.button->setFullRadius(true);
 		_botMenu.button->setClickedCallback([=] {
 			const auto user = _peer ? _peer->asUser() : nullptr;
@@ -4986,7 +6114,7 @@ bool HistoryWidget::updateCmdStartShown() {
 			}
 		});
 		_botMenu.button->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			if (width > st::historyBotMenuMaxWidth) {
 				_botMenu.button->setFullWidth(st::historyBotMenuMaxWidth);
 			} else {
@@ -4997,7 +6125,7 @@ bool HistoryWidget::updateCmdStartShown() {
 	const auto textSmall = _fieldCharsCountManager.count() > kSmallMenuAfter;
 	const auto textChanged = _botMenu.button
 		&& ((_botMenu.text != bot->botInfo->botMenuButtonText)
-		|| (_botMenu.small != textSmall));
+			|| (_botMenu.small != textSmall));
 	if (textChanged) {
 		_botMenu.text = bot->botInfo->botMenuButtonText;
 		if ((_botMenu.small = textSmall)) {
@@ -5013,12 +6141,20 @@ bool HistoryWidget::updateCmdStartShown() {
 	return commandsChanged || buttonChanged || textChanged;
 }
 
-bool HistoryWidget::searchInChatEmbedded(Dialogs::Key chat, QString query) {
+bool HistoryWidget::searchInChatEmbedded(
+		QString query,
+		Dialogs::Key chat,
+		PeerData *searchFrom) {
 	const auto peer = chat.peer(); // windows todo
-	if (!peer || Window::SeparateId(peer) != controller()->windowId()) {
+	const auto archiveWindow = (controller()->windowId().type
+		== Window::SeparateType::Archive);
+	if (!peer
+		|| ((Window::SeparateId(peer) != controller()->windowId())
+			&& !controller()->isPrimary()
+			&& !archiveWindow)) {
 		return false;
 	} else if (_peer != peer) {
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		controller()->showPeerHistory(peer);
 		if (!weak) {
 			return false;
@@ -5058,16 +6194,21 @@ void HistoryWidget::switchToSearch(QString query) {
 		update();
 		setInnerFocus();
 
+		using Activation = HistoryView::ComposeSearch::Activation;
 		_composeSearch->activations(
-		) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+		) | rpl::on_next([=](Activation activation) {
+			const auto item = activation.item;
+			auto params = ::Window::SectionShow(
+				::Window::SectionShow::Way::ClearStack);
+			params.highlight = Window::SearchHighlightId(activation.query);
 			controller()->showPeerHistory(
 				item->history()->peer->id,
-				::Window::SectionShow::Way::ClearStack,
+				params,
 				item->fullId().msg);
 		}, _composeSearch->lifetime());
 
 		_composeSearch->destroyRequests(
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			_composeSearch = nullptr;
 
 			update();
@@ -5113,7 +6254,8 @@ void HistoryWidget::toggleKeyboard(bool manual) {
 			if (!readyToForward()
 				&& !_previewDrawPreview
 				&& !_editMsgId
-				&& !_replyTo) {
+				&& !_replyTo
+				&& !_suggestOptions) {
 				_fieldBarCancel->hide();
 				updateMouseTracking();
 			}
@@ -5175,6 +6317,8 @@ void HistoryWidget::toggleKeyboard(bool manual) {
 		}
 	}
 	updateControlsGeometry();
+	updateAiButtonVisibility();
+	updateSendAsFileVisibility();
 	updateFieldPlaceholder();
 	if (_botKeyboardHide->isHidden()
 		&& canWriteMessage()
@@ -5215,11 +6359,7 @@ void HistoryWidget::showMembersDropdown() {
 	if (!_membersDropdown) {
 		_membersDropdown.create(this, st::membersInnerDropdown);
 		_membersDropdown->setOwnedWidget(
-			object_ptr<Profile::GroupMembersWidget>(
-				this,
-				controller(),
-				_peer,
-				st::membersInnerItem));
+			object_ptr<HistoryView::GroupMembersWidget>(this, controller(), _peer));
 		_membersDropdown->resizeToWidth(st::membersInnerWidth);
 
 		_membersDropdown->setMaxHeight(countMembersDropdownHeightMax());
@@ -5322,19 +6462,88 @@ bool HistoryWidget::fieldOrDisabledShown() const {
 	return !_field->isHidden() || _fieldDisabled;
 }
 
-void HistoryWidget::moveFieldControls() {
-	auto keyboardHeight = 0;
-	auto bottom = height();
-	auto maxKeyboardHeight = computeMaxFieldHeight() - fieldHeight();
-	_keyboard->resizeToWidth(width(), maxKeyboardHeight);
-	if (_kbShown) {
-		keyboardHeight = qMin(_keyboard->height(), maxKeyboardHeight);
+bool HistoryWidget::hasEnoughLinesForAi() const {
+	return _history
+		&& !_voiceRecordBar->isActive()
+		&& Ui::HasEnoughLinesForAi(&session(), _field);
+}
+
+bool HistoryWidget::textExceedsMaxSize() const {
+	return _history
+		&& !_voiceRecordBar->isActive()
+		&& (_field->getLastText().size()
+			> Data::PremiumLimits(&session()).messageLengthCurrent());
+}
+
+void HistoryWidget::updateAiButtonVisibility() {
+	const auto hidden = !hasEnoughLinesForAi()
+		|| !_send->isVisible()
+		|| !_field->isVisible();
+	if (_aiButton->isHidden() == hidden) {
+		return;
+	}
+	const auto shown = !hidden;
+	_aiButton->setVisible(shown);
+	if (shown) {
+		updateAiButtonGeometry();
+	}
+	if (_aiTooltipManager) {
+		_aiTooltipManager->updateVisibility(shown);
+	}
+}
+
+void HistoryWidget::updateAiButtonGeometry() {
+	if (_aiButton->isHidden()) {
+		return;
+	}
+	const auto x = _send->x() + _send->width() - _aiButton->width();
+	_aiButton->move(QPoint(x, _field->y()) + st::historyAiComposeButtonPosition);
+	if (_aiTooltipManager) {
+		_aiTooltipManager->updateGeometry();
+	}
+}
+
+void HistoryWidget::updateSendAsFileVisibility() {
+	const auto hidden = !textExceedsMaxSize()
+		|| _send->isHidden()
+		|| _field->isHidden()
+		|| editingMessage();
+	if (_sendAsFile->isHidden() == hidden) {
+		return;
+	}
+	_sendAsFile->setVisible(!hidden);
+	if (!hidden) {
+		updateSendAsFileGeometry();
+	}
+	if (_sendAsFileTooltipManager) {
+		_sendAsFileTooltipManager->updateVisibility(!hidden);
+	}
+}
+
+void HistoryWidget::updateSendAsFileGeometry() {
+	if (_sendAsFile->isHidden()) {
+		return;
+	}
+	const auto x = _send->x() + _send->width() - _sendAsFile->width();
+	_sendAsFile->move(QPoint(x, _field->y()) + st::historyAiComposeButtonPosition);
+	if (_sendAsFileTooltipManager) {
+		_sendAsFileTooltipManager->updateGeometry();
+	}
+}
+
+void HistoryWidget::moveFieldControls() {
+	auto keyboardHeight = 0;
+	auto bottom = height();
+	auto maxKeyboardHeight = computeMaxFieldHeight() - fieldHeight();
+	_keyboard->resizeToWidth(width(), maxKeyboardHeight);
+	if (_kbShown) {
+		keyboardHeight = qMin(_keyboard->height(), maxKeyboardHeight);
 		bottom -= keyboardHeight;
 		_kbScroll->setGeometryToLeft(0, bottom, width(), keyboardHeight);
 	}
 
 // (_botMenu.button) (_attachToggle|_replaceMedia) (_sendAs) ---- _inlineResults ------------------------------ _tabbedPanel ------ _fieldBarCancel
-// (_attachDocument|_attachPhoto) _field (_ttlInfo) (_scheduled) (_silent|_cmdStart|_kbShow) (_kbHide|_tabbedSelectorToggle) _send
+// (_attachDocument|_attachPhoto) _field (_ttlInfo) (_scheduled) (_giftToUser) (_silent|_cmdStart|_kbShow) (_toggleSuggestPost) (_kbHide|_tabbedSelectorToggle) _send
 // (_botStart|_unblock|_joinChannel|_muteUnmute|_reportMessages)
 
 	auto buttonsBottom = bottom - _attachToggle->height();
@@ -5376,6 +6585,14 @@ void HistoryWidget::moveFieldControls() {
 	if (kbShowShown || _cmdStartShown || _silent) {
 		right += _botCommandStart->width();
 	}
+	if (_toggleSuggestPost) {
+		_toggleSuggestPost->moveToRight(right, buttonsBottom);
+		right += _toggleSuggestPost->width();
+	}
+	if (_giftToUser) {
+		_giftToUser->moveToRight(right, buttonsBottom);
+		right += _giftToUser->width();
+	}
 	if (_scheduled) {
 		_scheduled->moveToRight(right, buttonsBottom);
 		right += _scheduled->width();
@@ -5383,6 +6600,8 @@ void HistoryWidget::moveFieldControls() {
 	if (_ttlInfo) {
 		_ttlInfo->move(width() - right - _ttlInfo->width(), buttonsBottom);
 	}
+	updateAiButtonGeometry();
+	updateSendAsFileGeometry();
 
 	_fieldBarCancel->moveToRight(
 		0,
@@ -5433,10 +6652,16 @@ void HistoryWidget::updateFieldSize() {
 	if (_cmdStartShown) {
 		fieldWidth -= _botCommandStart->width();
 	}
-	if (_silent && _silent->isVisible()) {
+	if (_silent && !_silent->isHidden()) {
 		fieldWidth -= _silent->width();
 	}
-	if (_scheduled && _scheduled->isVisible()) {
+	if (_toggleSuggestPost && !_toggleSuggestPost->isHidden()) {
+		fieldWidth -= _toggleSuggestPost->width();
+	}
+	if (_giftToUser && !_giftToUser->isHidden()) {
+		fieldWidth -= _giftToUser->width();
+	}
+	if (_scheduled && !_scheduled->isHidden()) {
 		fieldWidth -= _scheduled->width();
 	}
 	if (_ttlInfo && _ttlInfo->isVisible()) {
@@ -5480,6 +6705,8 @@ void HistoryWidget::inlineBotChanged() {
 
 void HistoryWidget::fieldResized() {
 	moveFieldControls();
+	updateAiButtonVisibility();
+	updateSendAsFileVisibility();
 	updateHistoryGeometry();
 	updateField();
 }
@@ -5487,10 +6714,14 @@ void HistoryWidget::fieldResized() {
 void HistoryWidget::fieldFocused() {
 	if (_list) {
 		_list->clearSelected(true);
+		_list->hideElementOverlay();
 	}
 }
 
 void HistoryWidget::updateFieldPlaceholder() {
+	_voiceRecordBar->setPauseInsteadSend(_history
+		&& _history->peer->starsPerMessageChecked() > 0);
+
 	if (!_editMsgId && _inlineBot && !_inlineLookingUpBot) {
 		_field->setPlaceholder(
 			rpl::single(_inlineBot->botInfo->inlinePlaceholder.mid(1)),
@@ -5499,14 +6730,19 @@ void HistoryWidget::updateFieldPlaceholder() {
 	}
 
 	_field->setPlaceholder([&]() -> rpl::producer<QString> {
+		const auto peer = _history ? _history->peer.get() : nullptr;
 		if (_editMsgId) {
 			return tr::lng_edit_message_text();
-		} else if (!_history) {
+		} else if (!peer) {
 			return tr::lng_message_ph();
 		} else if ((_kbShown || _keyboard->forceReply())
 			&& !_keyboard->placeholder().isEmpty()) {
 			return rpl::single(_keyboard->placeholder());
-		} else if (const auto channel = _history->peer->asChannel()) {
+		} else if (const auto stars = peer->starsPerMessageChecked()) {
+			return tr::lng_message_stars_ph(
+				lt_count,
+				rpl::single(stars * 1.));
+		} else if (const auto channel = peer->asChannel()) {
 			const auto topic = resolveReplyToTopic();
 			const auto topicRootId = topic
 				? topic->rootId()
@@ -5540,6 +6776,13 @@ void HistoryWidget::updateFieldPlaceholder() {
 			} else {
 				return tr::lng_message_ph();
 			}
+		} else if (const auto user = peer->asUser()) {
+			if (const auto &info = user->botInfo) {
+				if (info->forum() && !info->userCreatesTopics) {
+					return tr::lng_bot_off_thread_ph();
+				}
+			}
+			return tr::lng_message_ph();
 		} else {
 			return tr::lng_message_ph();
 		}
@@ -5549,47 +6792,13 @@ void HistoryWidget::updateFieldPlaceholder() {
 
 bool HistoryWidget::showSendingFilesError(
 		const Ui::PreparedList &list) const {
-	return showSendingFilesError(list, std::nullopt);
+	const auto show = controller()->uiShow();
+	return Data::ShowSendError(show, _peer, list, std::nullopt);
 }
 
 bool HistoryWidget::showSendingFilesError(
-		const Ui::PreparedList &list,
-		std::optional<bool> compress) const {
-	const auto text = [&] {
-		const auto error = _peer
-			? Data::FileRestrictionError(_peer, list, compress)
-			: std::nullopt;
-		if (error) {
-			return *error;
-		} else if (const auto left = _peer->slowmodeSecondsLeft()) {
-			return tr::lng_slowmode_enabled(
-				tr::now,
-				lt_left,
-				Ui::FormatDurationWordsSlowmode(left));
-		}
-		using Error = Ui::PreparedList::Error;
-		switch (list.error) {
-		case Error::None: return QString();
-		case Error::EmptyFile:
-		case Error::Directory:
-		case Error::NonLocalUrl: return tr::lng_send_image_empty(
-			tr::now,
-			lt_name,
-			list.errorData);
-		case Error::TooLargeFile: return u"(toolarge)"_q;
-		}
-		return tr::lng_forward_send_files_cant(tr::now);
-	}();
-	if (text.isEmpty()) {
-		return false;
-	} else if (text == u"(toolarge)"_q) {
-		const auto fileSize = list.files.back().size;
-		controller()->show(
-			Box(FileSizeLimitBox, &session(), fileSize, nullptr));
-		return true;
-	}
-	controller()->showToast(text);
-	return true;
+		const Ui::PreparedBundle &bundle) const {
+	return Data::ShowSendError(controller()->uiShow(), _peer, bundle);
 }
 
 MsgId HistoryWidget::resolveReplyToTopicRootId() {
@@ -5623,24 +6832,31 @@ Data::ForumTopic *HistoryWidget::resolveReplyToTopic() {
 
 bool HistoryWidget::showSendMessageError(
 		const TextWithTags &textWithTags,
-		bool ignoreSlowmodeCountdown) {
+		bool ignoreSlowmodeCountdown,
+		Fn<void(int starsApproved)> withPaymentApproved,
+		Api::SendOptions options) {
 	if (!_canSendMessages) {
 		return false;
 	}
 	const auto topicRootId = resolveReplyToTopicRootId();
-	const auto error = GetErrorTextForSending(
-		_peer,
-		{
-			.topicRootId = topicRootId,
-			.forward = &_forwardPanel->items(),
-			.text = &textWithTags,
-			.ignoreSlowmodeCountdown = ignoreSlowmodeCountdown,
-		});
-	if (error.isEmpty()) {
-		return false;
+	auto request = SendingErrorRequest{
+		.topicRootId = topicRootId,
+		.forward = &_forwardPanel->items(),
+		.text = &textWithTags,
+		.ignoreSlowmodeCountdown = ignoreSlowmodeCountdown,
+	};
+	request.messagesCount = ComputeSendingMessagesCount(_history, request);
+	const auto error = GetErrorForSending(_peer, request);
+	if (error) {
+		Data::ShowSendErrorToast(controller(), _peer, error);
+		return true;
 	}
-	controller()->showToast(error);
-	return true;
+
+	return withPaymentApproved
+		&& !checkSendPayment(
+			request.messagesCount,
+			options,
+			withPaymentApproved);
 }
 
 bool HistoryWidget::confirmSendingFiles(const QStringList &files) {
@@ -5664,12 +6880,13 @@ bool HistoryWidget::confirmSendingFiles(
 		Ui::PreparedList &&list,
 		const QString &insertTextOnCancel) {
 	if (_editMsgId) {
-		if (_canReplaceMedia) {
+		if (_canReplaceMedia || _canAddMedia) {
 			EditCaptionBox::StartMediaReplace(
 				controller(),
 				{ _history->peer->id, _editMsgId },
 				std::move(list),
 				_field->getTextWithTags(),
+				suggestOptions(),
 				_mediaEditManager.spoilered(),
 				_mediaEditManager.invertCaption(),
 				crl::guard(_list, [=] { cancelEdit(); }));
@@ -5677,7 +6894,7 @@ bool HistoryWidget::confirmSendingFiles(
 		}
 		controller()->showToast(tr::lng_edit_caption_attach(tr::now));
 		return false;
-	} else if (showSendingFilesError(list)) {
+	} else if (!_peer || showSendingFilesError(list)) {
 		return false;
 	}
 
@@ -5692,19 +6909,16 @@ bool HistoryWidget::confirmSendingFiles(
 		_peer,
 		Api::SendType::Normal,
 		sendMenuDetails());
+	box->setReplyTo(replyTo());
 	_field->setTextWithTags({});
 	box->setConfirmedCallback(crl::guard(this, [=](
-			Ui::PreparedList &&list,
-			Ui::SendFilesWay way,
-			TextWithTags &&caption,
+			std::shared_ptr<Ui::PreparedBundle> bundle,
 			Api::SendOptions options,
-			bool ctrlShiftEnter) {
-		sendingFilesConfirmed(
-			std::move(list),
-			way,
-			std::move(caption),
-			options,
-			ctrlShiftEnter);
+			FullReplyTo currentReplyTo) {
+		if (!currentReplyTo.messageId && replyTo().messageId) {
+			cancelReply();
+		}
+		sendingFilesConfirmed(std::move(bundle), options);
 	}));
 	box->setCancelledCallback(crl::guard(this, [=] {
 		_field->setTextWithTags(text);
@@ -5718,6 +6932,9 @@ bool HistoryWidget::confirmSendingFiles(
 			_field->textCursor().insertText(insertTextOnCancel);
 		}
 	}));
+	box->takeTextWithTagsRequests() | rpl::on_next([=](TextWithTags &&text) {
+		_field->setTextWithTags(std::move(text));
+	}, box->lifetime());
 
 	Window::ActivateWindow(controller());
 	controller()->show(std::move(box));
@@ -5726,40 +6943,36 @@ bool HistoryWidget::confirmSendingFiles(
 }
 
 void HistoryWidget::sendingFilesConfirmed(
-		Ui::PreparedList &&list,
-		Ui::SendFilesWay way,
-		TextWithTags &&caption,
-		Api::SendOptions options,
-		bool ctrlShiftEnter) {
-	Expects(list.filesToProcess.empty());
-
-	const auto compress = way.sendImagesAsPhotos();
-	if (showSendingFilesError(list, compress)) {
+		std::shared_ptr<Ui::PreparedBundle> bundle,
+		Api::SendOptions options) {
+	if (!_peer || showSendingFilesError(*bundle)) {
 		return;
 	}
-	auto groups = DivideByGroups(
-		std::move(list),
-		way,
-		_peer->slowmodeApplied());
+
+	const auto compress = bundle->way.sendImagesAsPhotos();
 	const auto type = compress ? SendMediaType::Photo : SendMediaType::File;
 	auto action = prepareSendAction(options);
 	action.clearDraft = false;
-	if ((groups.size() != 1 || !groups.front().sentWithCaption())
-		&& !caption.text.isEmpty()) {
-		auto message = Api::MessageToSend(action);
-		message.textWithTags = base::take(caption);
-		session().api().sendMessage(std::move(message));
+
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = options;
+		copy.starsApproved = approved;
+		sendingFilesConfirmed(bundle, copy);
+	};
+	const auto checked = checkSendPayment(
+		bundle->totalCount,
+		action.options,
+		withPaymentApproved);
+	if (!checked) {
+		return;
 	}
-	for (auto &group : groups) {
+
+	auto &api = session().api();
+	for (auto &group : bundle->groups) {
 		const auto album = (group.type != Ui::AlbumType::None)
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
-		session().api().sendFiles(
-			std::move(group.list),
-			type,
-			base::take(caption),
-			album,
-			action);
+		api.sendFiles(std::move(group.list), type, album, action);
 	}
 }
 
@@ -5798,7 +7011,11 @@ bool HistoryWidget::confirmSendingFiles(
 		std::optional<bool> overrideSendImagesAsPhotos,
 		const QString &insertTextOnCancel) {
 	if (!canWriteMessage()) {
-		return false;
+		if (_composeSearch) {
+			_composeSearch->hideAnimated();
+		} else {
+			return false;
+		}
 	}
 
 	const auto hasImage = data->hasImage();
@@ -5926,49 +7143,74 @@ void HistoryWidget::resizeEvent(QResizeEvent *e) {
 }
 
 void HistoryWidget::updateControlsGeometry() {
-	_topBar->resizeToWidth(width());
+	const auto width = this->width();
+
+	_topBar->resizeToWidth(width);
 	_topBar->moveToLeft(0, 0);
-	_voiceRecordBar->resizeToWidth(width());
+
+	const auto tabsLeftSkip = _subsectionTabs
+		? _subsectionTabs->leftSkip()
+		: 0;
+	const auto innerWidth = width - tabsLeftSkip;
+
+	_voiceRecordBar->resizeToWidth(width);
 
 	moveFieldControls();
 
-	const auto groupCallTop = _topBar->bottomNoMargins();
+	_topBars->move(tabsLeftSkip, _topBar->bottomNoMargins()
+		+ (_subsectionTabs ? _subsectionTabs->topSkip() : 0));
+	const auto groupCallTop = 0;
 	if (_groupCallBar) {
 		_groupCallBar->move(0, groupCallTop);
-		_groupCallBar->resizeToWidth(width());
+		_groupCallBar->resizeToWidth(innerWidth);
 	}
 	const auto requestsTop = groupCallTop
 		+ (_groupCallBar ? _groupCallBar->height() : 0);
 	if (_requestsBar) {
 		_requestsBar->move(0, requestsTop);
-		_requestsBar->resizeToWidth(width());
+		_requestsBar->resizeToWidth(innerWidth);
 	}
 	const auto pinnedBarTop = requestsTop
 		+ (_requestsBar ? _requestsBar->height() : 0);
 	if (_pinnedBar) {
 		_pinnedBar->move(0, pinnedBarTop);
-		_pinnedBar->resizeToWidth(width());
+		_pinnedBar->resizeToWidth(innerWidth);
 	}
-	const auto translateTop = pinnedBarTop
+	const auto sponsoredMessageBarTop = pinnedBarTop
 		+ (_pinnedBar ? _pinnedBar->height() : 0);
+	if (_sponsoredMessageBar) {
+		_sponsoredMessageBar->move(0, sponsoredMessageBarTop);
+		_sponsoredMessageBar->resizeToWidth(innerWidth);
+	}
+	const auto translateTop = sponsoredMessageBarTop
+		+ (_sponsoredMessageBar ? _sponsoredMessageBar->height() : 0);
 	if (_translateBar) {
 		_translateBar->move(0, translateTop);
-		_translateBar->resizeToWidth(width());
+		_translateBar->resizeToWidth(innerWidth);
 	}
-	const auto contactStatusTop = translateTop
+	const auto paysStatusTop = translateTop
 		+ (_translateBar ? _translateBar->height() : 0);
+	if (_paysStatus) {
+		_paysStatus->bar().move(0, paysStatusTop);
+	}
+	const auto contactStatusTop = paysStatusTop
+		+ (_paysStatus ? _paysStatus->bar().height() : 0);
 	if (_contactStatus) {
-		_contactStatus->bar().move(0, contactStatusTop);
+		_contactStatus->bar().move(tabsLeftSkip, contactStatusTop);
 	}
 	const auto businessBotTop = contactStatusTop
 		+ (_contactStatus ? _contactStatus->bar().height() : 0);
 	if (_businessBotStatus) {
-		_businessBotStatus->bar().move(0, businessBotTop);
+		_businessBotStatus->bar().move(tabsLeftSkip, businessBotTop);
 	}
-	const auto scrollAreaTop = businessBotTop
+	const auto scrollAreaTop = _topBars->y()
+		+ businessBotTop
 		+ (_businessBotStatus ? _businessBotStatus->bar().height() : 0);
-	if (_scroll->y() != scrollAreaTop) {
-		_scroll->moveToLeft(0, scrollAreaTop);
+	_topBars->resize(
+		innerWidth,
+		scrollAreaTop - _topBars->y() + st::lineWidth);
+	if (_scroll->y() != scrollAreaTop || _scroll->x() != tabsLeftSkip) {
+		_scroll->moveToLeft(tabsLeftSkip, scrollAreaTop);
 		if (_autocomplete) {
 			_autocomplete->setBoundings(_scroll->geometry());
 		}
@@ -5982,6 +7224,7 @@ void HistoryWidget::updateControlsGeometry() {
 	updateFieldSize();
 
 	_cornerButtons.updatePositions();
+	_pullToNext->updateGeometry();
 
 	if (_membersDropdown) {
 		_membersDropdown->setMaxHeight(countMembersDropdownHeightMax());
@@ -5998,7 +7241,7 @@ void HistoryWidget::updateControlsGeometry() {
 	_topShadow->setGeometryToLeft(
 		topShadowLeft,
 		_topBar->bottomNoMargins(),
-		width() - topShadowLeft - topShadowRight,
+		width - topShadowLeft - topShadowRight,
 		st::lineWidth);
 }
 
@@ -6039,11 +7282,20 @@ FullReplyTo HistoryWidget::replyTo() const {
 		? _replyTo
 		: _kbReplyTo
 		? FullReplyTo{ _kbReplyTo->fullId() }
-		: (_peer && _peer->forum())
+		: (_peer && _peer->forum() && !_peer->isBot())
 		? FullReplyTo{ .topicRootId = Data::ForumTopic::kGeneralId }
 		: FullReplyTo();
 }
 
+SuggestOptions HistoryWidget::suggestOptions(
+		bool skipNoAdminCheck) const {
+	const auto checked = skipNoAdminCheck
+		|| (_history && _history->suggestDraftAllowed());
+	return (checked && _suggestOptions)
+		? _suggestOptions->values()
+		: SuggestOptions();
+}
+
 bool HistoryWidget::hasSavedScroll() const {
 	Expects(_history != nullptr);
 
@@ -6070,8 +7322,7 @@ int HistoryWidget::countInitialScrollTop() {
 
 			enqueueMessageHighlight({
 				item,
-				base::take(_showAtMsgHighlightPart),
-				base::take(_showAtMsgHighlightPartOffsetHint),
+				base::take(_showAtMsgParams.highlight),
 			});
 			const auto result = itemTopForHighlight(view);
 			createUnreadBarIfBelowVisibleArea(result);
@@ -6133,39 +7384,50 @@ int HistoryWidget::countAutomaticScrollTop() {
 	return ScrollMax;
 }
 
-QString HistoryWidget::computeSendRestriction() const {
-	if (const auto user = _peer ? _peer->asUser() : nullptr) {
-		if (user->meRequiresPremiumToWrite()
-			&& !user->session().premium()) {
-			return u"premium_required"_q;
-		}
+Data::SendError HistoryWidget::computeSendRestriction() const {
+	if (!_canSendMessages
+		&& _peer->amMonoforumAdmin()
+		&& !_peer->asChannel()->monoforumDisabled()) {
+		return Data::SendError({
+			.text = tr::lng_monoforum_choose_to_reply(tr::now),
+			.monoforumAdmin = true,
+		});
 	}
 	const auto allWithoutPolls = Data::AllSendRestrictions()
 		& ~ChatRestriction::SendPolls;
-	const auto error = (_peer && !Data::CanSendAnyOf(_peer, allWithoutPolls))
+	return (_peer && !Data::CanSendAnyOf(_peer, allWithoutPolls))
 		? Data::RestrictionError(_peer, ChatRestriction::SendOther)
-		: std::nullopt;
-	return error ? (u"restriction:"_q + *error) : QString();
+		: Data::SendError();
 }
 
 void HistoryWidget::updateSendRestriction() {
 	const auto restriction = computeSendRestriction();
-	if (_sendRestrictionKey == restriction) {
+	if (_sendRestrictionKey == restriction.text) {
 		return;
 	}
-	_sendRestrictionKey = restriction;
-	if (restriction.isEmpty()) {
+	_sendRestrictionKey = restriction.text;
+	if (!restriction) {
 		_sendRestriction = nullptr;
-	} else if (restriction == u"premium_required"_q) {
+	} else if (restriction.frozen) {
+		const auto show = controller()->uiShow();
+		_sendRestriction = FrozenWriteRestriction(
+			this,
+			show,
+			FrozenWriteRestrictionType::MessageField);
+	} else if (restriction.premiumToLift) {
 		_sendRestriction = PremiumRequiredSendRestriction(
 			this,
 			_peer->asUser(),
 			controller());
-	} else if (restriction.startsWith(u"restriction:"_q)) {
-		const auto error = restriction.mid(12);
-		_sendRestriction = TextErrorSendRestriction(this, error);
+	} else if (const auto lifting = restriction.boostsToLift) {
+		const auto show = controller()->uiShow();
+		_sendRestriction = BoostsToLiftWriteRestriction(
+			this,
+			show,
+			_peer,
+			lifting);
 	} else {
-		Unexpected("Restriction type.");
+		_sendRestriction = TextErrorSendRestriction(this, restriction.text);
 	}
 	if (_sendRestriction) {
 		_sendRestriction->show();
@@ -6191,10 +7453,19 @@ void HistoryWidget::updateHistoryGeometry(
 		return;
 	}
 
-	auto newScrollHeight = height() - _topBar->height();
+	const auto newScrollWidth = width()
+		- (_subsectionTabs ? _subsectionTabs->leftSkip() : 0);
+	const auto subsectionTabsTop = _topBar->bottomNoMargins();
+	auto newScrollHeight = height()
+		- subsectionTabsTop
+		- (_subsectionTabs ? _subsectionTabs->topSkip() : 0)
+		- (_subsectionTabs ? _subsectionTabs->bottomSkip() : 0);
 	if (_translateBar) {
 		newScrollHeight -= _translateBar->height();
 	}
+	if (_sponsoredMessageBar) {
+		newScrollHeight -= _sponsoredMessageBar->height();
+	}
 	if (_pinnedBar) {
 		newScrollHeight -= _pinnedBar->height();
 	}
@@ -6204,6 +7475,9 @@ void HistoryWidget::updateHistoryGeometry(
 	if (_requestsBar) {
 		newScrollHeight -= _requestsBar->height();
 	}
+	if (_paysStatus) {
+		newScrollHeight -= _paysStatus->bar().height();
+	}
 	if (_contactStatus) {
 		newScrollHeight -= _contactStatus->bar().height();
 	}
@@ -6229,7 +7503,8 @@ void HistoryWidget::updateHistoryGeometry(
 		if (_editMsgId
 			|| replyTo()
 			|| readyToForward()
-			|| _previewDrawPreview) {
+			|| _previewDrawPreview
+			|| _suggestOptions) {
 			newScrollHeight -= st::historyReplyHeight;
 		}
 		if (_kbShown) {
@@ -6241,10 +7516,10 @@ void HistoryWidget::updateHistoryGeometry(
 	}
 	const auto wasScrollTop = _scroll->scrollTop();
 	const auto wasAtBottom = (wasScrollTop == _scroll->scrollTopMax());
-	const auto needResize = (_scroll->width() != width())
+	const auto needResize = (_scroll->width() != newScrollWidth)
 		|| (_scroll->height() != newScrollHeight);
 	if (needResize) {
-		_scroll->resize(width(), newScrollHeight);
+		_scroll->resize(newScrollWidth, newScrollHeight);
 		// on initial updateListSize we didn't put the _scroll->scrollTop
 		// correctly yet so visibleAreaUpdated() call will erase it
 		// with the new (undefined) value
@@ -6262,6 +7537,15 @@ void HistoryWidget::updateHistoryGeometry(
 		_cornerButtons.updatePositions();
 		controller()->floatPlayerAreaUpdated();
 	}
+	if (_subsectionTabs) {
+		const auto tabsBottomSkip = _subsectionTabs->bottomSkip();
+		const auto scrollBottom = _scroll->y() + newScrollHeight;
+		const auto areaHeight = scrollBottom
+			+ tabsBottomSkip
+			- subsectionTabsTop;
+		_subsectionTabs->setBoundingRect(
+			{ 0, subsectionTabsTop, width(), areaHeight });
+	}
 
 	updateListSize();
 	_updateHistoryGeometryRequired = false;
@@ -6285,6 +7569,23 @@ void HistoryWidget::updateHistoryGeometry(
 	}
 	const auto toY = std::clamp(newScrollTop, 0, _scroll->scrollTopMax());
 	synteticScrollToY(toY);
+	if (initial && _showAtMsgId) {
+		const auto timestamp = base::take(_showAtMsgParams.videoTimestamp);
+		if (timestamp.has_value()) {
+			const auto item = session().data().message(_peer, _showAtMsgId);
+			const auto media = item ? item->media() : nullptr;
+			const auto document = media ? media->document() : nullptr;
+			if (document && document->isVideoFile()) {
+				const auto draw = canWriteMessage();
+				controller()->openDocument(
+					document,
+					true,
+					{ .id = item->fullId(), .showDrawButton = draw },
+					nullptr,
+					timestamp);
+			}
+		}
+	}
 }
 
 void HistoryWidget::revealItemsCallback() {
@@ -6337,7 +7638,7 @@ void HistoryWidget::startItemRevealAnimations() {
 							[=] { revealItemsCallback(); },
 							0.,
 							1.,
-							HistoryView::ListWidget::kItemRevealDuration,
+							st::itemRevealDuration,
 							anim::easeOutCirc);
 						if (item->out() || _history->peer->isSelf()) {
 							_list->theme()->rotateComplexGradientBackground();
@@ -6351,12 +7652,16 @@ void HistoryWidget::startItemRevealAnimations() {
 
 void HistoryWidget::startMessageSendingAnimation(
 		not_null<HistoryItem*> item) {
+	if (_list->elementChatMode() == HistoryView::ElementChatMode::Default
+		&& width() > st::columnMaximalWidthLeft
+		&& !item->media()) {
+		return;
+	}
 	auto &sendingAnimation = controller()->sendingAnimation();
 	if (!sendingAnimation.checkExpectedType(item)) {
 		return;
 	}
 	Assert(item->mainView() != nullptr);
-	Assert(item->mainView()->media() != nullptr);
 
 	auto globalEndTopLeft = rpl::merge(
 		_scroll->innerResizes() | rpl::to_empty,
@@ -6386,7 +7691,7 @@ void HistoryWidget::startMessageSendingAnimation(
 void HistoryWidget::updateListSize() {
 	Expects(_list != nullptr);
 
-	_list->recountHistoryGeometry();
+	_list->recountHistoryGeometry(!_historyInited);
 	auto washidden = _scroll->isHidden();
 	if (washidden) {
 		_scroll->show();
@@ -6553,7 +7858,8 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) {
 			_kbReplyTo = nullptr;
 			if (!readyToForward()
 				&& !_previewDrawPreview
-				&& !_replyTo) {
+				&& !_replyTo
+				&& !_suggestOptions) {
 				_fieldBarCancel->hide();
 				updateMouseTracking();
 			}
@@ -6572,7 +7878,8 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) {
 		if (!readyToForward()
 			&& !_previewDrawPreview
 			&& !_replyTo
-			&& !_editMsgId) {
+			&& !_editMsgId
+			&& !_suggestOptions) {
 			_fieldBarCancel->hide();
 			updateMouseTracking();
 		}
@@ -6610,8 +7917,10 @@ void HistoryWidget::botCallbackSent(not_null<HistoryItem*> item) {
 int HistoryWidget::computeMaxFieldHeight() const {
 	const auto available = height()
 		- _topBar->height()
+		- (_paysStatus ? _paysStatus->bar().height() : 0)
 		- (_contactStatus ? _contactStatus->bar().height() : 0)
 		- (_businessBotStatus ? _businessBotStatus->bar().height() : 0)
+		- (_sponsoredMessageBar ? _sponsoredMessageBar->height() : 0)
 		- (_pinnedBar ? _pinnedBar->height() : 0)
 		- (_groupCallBar ? _groupCallBar->height() : 0)
 		- (_requestsBar ? _requestsBar->height() : 0)
@@ -6698,6 +8007,7 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
 			_photoEditMedia,
 			{ _history->peer->id, _editMsgId },
 			_field->getTextWithTags(),
+			suggestOptions(),
 			_mediaEditManager.spoilered(),
 			_mediaEditManager.invertCaption(),
 			crl::guard(_list, [=] { cancelEdit(); }));
@@ -6706,27 +8016,30 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
 	} else if (_previewDrawPreview) {
 		editDraftOptions();
 	} else if (_editMsgId) {
-		controller()->showPeerHistory(
-			_peer,
-			Window::SectionShow::Way::Forward,
-			_editMsgId);
-	} else if (isReadyToForward) {
-		if (e->button() != Qt::LeftButton) {
-			_forwardPanel->editToNextOption();
+		if (_suggestOptions) {
+			_suggestOptions->edit();
 		} else {
-			_forwardPanel->editOptions(controller()->uiShow());
+			controller()->showPeerHistory(
+				_peer,
+				Window::SectionShow::Way::Forward,
+				_editMsgId);
 		}
 	} else if (_replyTo
 		&& ((e->modifiers() & Qt::ControlModifier)
 			|| (e->button() != Qt::LeftButton))) {
 		jumpToReply(_replyTo);
-	} else if (_replyTo) {
+	} else if (_replyTo
+		|| (isReadyToForward && e->button() == Qt::LeftButton)) {
 		editDraftOptions();
+	} else if (isReadyToForward) {
+		_forwardPanel->editToNextOption();
 	} else if (_kbReplyTo) {
 		controller()->showPeerHistory(
 			_kbReplyTo->history()->peer->id,
 			Window::SectionShow::Way::Forward,
 			_kbReplyTo->id);
+	} else if (_suggestOptions) {
+		_suggestOptions->edit();
 	}
 }
 
@@ -6735,16 +8048,20 @@ void HistoryWidget::editDraftOptions() {
 
 	const auto history = _history;
 	const auto reply = _replyTo;
+	const auto suggest = suggestOptions();
 	const auto webpage = _preview->draft();
+	const auto forward = _forwardPanel->draft();
 
 	const auto done = [=](
 			FullReplyTo replyTo,
-			Data::WebPageDraft webpage) {
+			Data::WebPageDraft webpage,
+			Data::ForwardDraft forward) {
 		if (replyTo) {
 			replyToMessage(replyTo);
 		} else {
 			cancelReply();
 		}
+		history->setForwardDraft(MsgId(), PeerId(), std::move(forward));
 		_preview->apply(webpage);
 	};
 	const auto replyToId = reply.messageId;
@@ -6756,24 +8073,22 @@ void HistoryWidget::editDraftOptions() {
 	EditDraftOptions({
 		.show = controller()->uiShow(),
 		.history = history,
-		.draft = Data::Draft(_field, reply, _preview->draft()),
+		.draft = Data::Draft(_field, reply, suggest, _preview->draft()),
 		.usedLink = _preview->link(),
+		.forward = _forwardPanel->draft(),
 		.links = _preview->links(),
 		.resolver = _preview->resolver(),
 		.done = done,
 		.highlight = highlight,
-		.clearOldDraft = [=] { ClearDraftReplyTo(history, 0, replyToId); },
+		.clearOldDraft = [=] {
+			ClearDraftReplyTo(history, MsgId(), PeerId(), replyToId);
+		},
 	});
 }
 
 void HistoryWidget::jumpToReply(FullReplyTo to) {
 	if (const auto item = session().data().message(to.messageId)) {
-		JumpToMessageClickHandler(
-			item,
-			{},
-			to.quote,
-			to.quoteOffset
-		)->onClick({});
+		JumpToMessageClickHandler(item, {}, to.highlight())->onClick({});
 	}
 }
 
@@ -6796,17 +8111,32 @@ void HistoryWidget::keyPressEvent(QKeyEvent *e) {
 	} else if (e->key() == Qt::Key_Down && !commonModifiers) {
 		_scroll->keyPressEvent(e);
 	} else if (e->key() == Qt::Key_Up && !commonModifiers) {
-		const auto item = _history
-			? _history->lastEditableMessage()
-			: nullptr;
-		if (item
-			&& _field->empty()
-			&& !_editMsgId
-			&& !_replyTo) {
-			editMessage(item, {});
-			return;
+		if (!_field->empty()
+			|| !canWriteMessage()
+			|| _editMsgId
+			|| _replyTo) {
+			_scroll->keyPressEvent(e);
+		} else {
+			const auto last = _history->lastMessage();
+			if (last && last->isLocal()) {
+				if (last->media() && last->media()->allowsEdit()) {
+					if (const auto view = last->mainView()) {
+						controller()->show(Box(Ui::EditCaptionBox, view));
+					}
+				} else {
+					_scroll->keyPressEvent(e);
+				}
+				return;
+			}
+			const auto item = _history
+				? _history->lastEditableMessage()
+				: nullptr;
+			if (item) {
+				editMessage(item, {});
+			} else {
+				_scroll->keyPressEvent(e);
+			}
 		}
-		_scroll->keyPressEvent(e);
 	} else if (e->key() == Qt::Key_Up
 		&& commonModifiers == Qt::ControlModifier) {
 		if (!replyToPreviousMessage()) {
@@ -6882,10 +8212,18 @@ bool HistoryWidget::replyToPreviousMessage() {
 		(_field->isVisible()
 			? _replyTo.messageId.msg
 			: _highlighter.latestSingleHighlightedMsgId()));
+	const auto skipLocal = [](HistoryView::Element *from) {
+		auto view = from;
+		while (view && view->data()->isLocal()) {
+			view = view->previousDisplayedInBlocks();
+		}
+		return view;
+	};
 	if (const auto item = session().data().message(fullId)) {
 		if (const auto view = item->mainView()) {
-			if (const auto previousView = view->previousDisplayedInBlocks()) {
-				const auto previous = previousView->data();
+			if (const auto target = skipLocal(
+					view->previousDisplayedInBlocks())) {
+				const auto previous = target->data();
 				controller()->showMessage(previous);
 				if (_field->isVisible()) {
 					replyToMessage(previous);
@@ -6893,8 +8231,9 @@ bool HistoryWidget::replyToPreviousMessage() {
 				return true;
 			}
 		}
-	} else if (const auto previousView = _history->findLastDisplayed()) {
-		const auto previous = previousView->data();
+	} else if (const auto target = skipLocal(
+			_history->findLastDisplayed())) {
+		const auto previous = target->data();
 		controller()->showMessage(previous);
 		if (_field->isVisible()) {
 			replyToMessage(previous);
@@ -6918,11 +8257,15 @@ bool HistoryWidget::replyToNextMessage() {
 			: _highlighter.latestSingleHighlightedMsgId()));
 	if (const auto item = session().data().message(fullId)) {
 		if (const auto view = item->mainView()) {
-			if (const auto nextView = view->nextDisplayedInBlocks()) {
-				const auto next = nextView->data();
-				controller()->showMessage(next);
+			auto next = view->nextDisplayedInBlocks();
+			while (next && next->data()->isLocal()) {
+				next = next->nextDisplayedInBlocks();
+			}
+			if (next) {
+				const auto item = next->data();
+				controller()->showMessage(item);
 				if (_field->isVisible()) {
-					replyToMessage(next);
+					replyToMessage(item);
 				}
 			} else {
 				_highlighter.clear();
@@ -6943,7 +8286,7 @@ bool HistoryWidget::showSlowmodeError() {
 				Ui::FormatDurationWordsSlowmode(left));
 		} else if (_peer->slowmodeApplied()) {
 			if (const auto item = _history->latestSendingMessage()) {
-				if (const auto view = item->mainView()) {
+				if (item->mainView()) {
 					animatedScrollToItem(item->id);
 					enqueueMessageHighlight({ item });
 				}
@@ -6959,52 +8302,45 @@ bool HistoryWidget::showSlowmodeError() {
 	return true;
 }
 
-void HistoryWidget::fieldTabbed() {
-	if (_supportAutocomplete) {
-		_supportAutocomplete->activate(_field.data());
-	}
-}
-
 void HistoryWidget::sendInlineResult(InlineBots::ResultSelected result) {
 	if (!_peer || !_canSendMessages) {
 		return;
 	} else if (showSlowmodeError()) {
 		return;
+	} else if (const auto error = result.result->getErrorOnSend(_history)) {
+		Data::ShowSendErrorToast(controller(), _peer, error);
+		return;
 	}
 
-	auto errorText = result.result->getErrorOnSend(_history);
-	if (!errorText.isEmpty()) {
-		controller()->showToast(errorText);
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = result;
+		copy.options.starsApproved = approved;
+		sendInlineResult(copy);
+	};
+
+	auto action = prepareSendAction(result.options);
+	action.generateLocal = true;
+
+	const auto checked = checkSendPayment(
+		1,
+		action.options,
+		withPaymentApproved);
+	if (!checked) {
 		return;
 	}
 
 	controller()->sendingAnimation().appendSending(
 		result.messageSendingFrom);
-
-	auto action = prepareSendAction(result.options);
-	action.generateLocal = true;
 	session().api().sendInlineResult(
 		result.bot,
-		result.result,
+		result.result.get(),
 		action,
 		result.messageSendingFrom.localId);
 
 	clearFieldText();
-	_saveDraftText = true;
-	_saveDraftStart = crl::now();
-	saveDraft();
+	saveDraftWithTextNow();
 
-	auto &bots = cRefRecentInlineBots();
-	const auto index = bots.indexOf(result.bot);
-	if (index) {
-		if (index > 0) {
-			bots.removeAt(index);
-		} else if (bots.size() >= RecentInlineBotsLimit) {
-			bots.resize(RecentInlineBotsLimit - 1);
-		}
-		bots.push_front(result.bot);
-		session().local().writeRecentHashtagsAndBots();
-	}
+	session().recentInlineBots().bump(result.bot);
 
 	hideSelectorControlsAnimated();
 
@@ -7041,6 +8377,7 @@ void HistoryWidget::updatePinnedViewer() {
 		_minPinnedId = Data::ResolveMinPinnedId(
 			_peer,
 			MsgId(0), // topicRootId
+			PeerId(0), // monoforumPeerId
 			_migrated ? _migrated->peer.get() : nullptr);
 	}
 	if (_pinnedClickedId
@@ -7075,12 +8412,12 @@ void HistoryWidget::setupTranslateBar() {
 	Expects(_history != nullptr);
 
 	_translateBar = std::make_unique<HistoryView::TranslateBar>(
-		this,
+		_topBars.get(),
 		controller(),
 		_history);
 
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=, raw = _translateBar.get()](bool one) {
+	) | rpl::on_next([=, raw = _translateBar.get()](bool one) {
 		raw->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -7091,7 +8428,7 @@ void HistoryWidget::setupTranslateBar() {
 
 	_translateBarHeight = 0;
 	_translateBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_topDelta = _preserveScrollTop ? 0 : (height - _translateBarHeight);
 		_translateBarHeight = height;
 		updateHistoryGeometry();
@@ -7100,10 +8437,6 @@ void HistoryWidget::setupTranslateBar() {
 	}, _translateBar->lifetime());
 
 	orderWidgets();
-
-	if (_showAnimation) {
-		_translateBar->hide();
-	}
 }
 
 void HistoryWidget::setupPinnedTracker() {
@@ -7124,6 +8457,7 @@ void HistoryWidget::checkPinnedBarState() {
 	const auto currentPinnedId = Data::ResolveTopPinnedId(
 		_peer,
 		MsgId(0), // topicRootId
+		PeerId(0), // monoforumPeerId
 		_migrated ? _migrated->peer.get() : nullptr);
 	const auto universalPinnedId = !currentPinnedId
 		? int32(0)
@@ -7150,13 +8484,14 @@ void HistoryWidget::checkPinnedBarState() {
 	}
 
 	clearHidingPinnedBar();
-	_pinnedBar = std::make_unique<Ui::PinnedBar>(this, [=] {
+	_pinnedBar = std::make_unique<Ui::PinnedBar>(_topBars.get(), [=] {
 		return controller()->isGifPausedAtLeastFor(
 			Window::GifPauseReason::Any);
 	}, controller()->gifPauseLevelChanged());
 	auto pinnedRefreshed = Info::Profile::SharedMediaCountValue(
 		_peer,
 		MsgId(0), // topicRootId
+		PeerId(0), // monoforumPeerId
 		nullptr,
 		Storage::SharedMediaType::Pinned
 	) | rpl::distinct_until_changed(
@@ -7168,13 +8503,13 @@ void HistoryWidget::checkPinnedBarState() {
 		}
 		return (count > 1);
 	}) | rpl::distinct_until_changed();
-	auto markupRefreshed = HistoryView::PinnedBarItemWithReplyMarkup(
+	auto customButtonItem = HistoryView::PinnedBarItemWithCustomButton(
 		&session(),
 		_pinnedTracker->shownMessageId());
 	rpl::combine(
 		rpl::duplicate(pinnedRefreshed),
-		rpl::duplicate(markupRefreshed)
-	) | rpl::start_with_next([=](bool many, HistoryItem *item) {
+		rpl::duplicate(customButtonItem)
+	) | rpl::on_next([=](bool many, HistoryItem *item) {
 		refreshPinnedBarButton(many, item);
 	}, _pinnedBar->lifetime());
 
@@ -7184,7 +8519,7 @@ void HistoryWidget::checkPinnedBarState() {
 			_pinnedTracker->shownMessageId(),
 			[bar = _pinnedBar.get()] { bar->customEmojiRepaint(); }),
 		std::move(pinnedRefreshed),
-		std::move(markupRefreshed)
+		std::move(customButtonItem)
 	) | rpl::map([=](Ui::MessageBarContent &&content, bool, HistoryItem*) {
 		const auto id = (!content.title.isEmpty() || !content.text.empty())
 			? _pinnedTracker->currentMessageId().message
@@ -7206,7 +8541,7 @@ void HistoryWidget::checkPinnedBarState() {
 	}));
 
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=, raw = _pinnedBar.get()](bool one) {
+	) | rpl::on_next([=, raw = _pinnedBar.get()](bool one) {
 		raw->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -7216,7 +8551,7 @@ void HistoryWidget::checkPinnedBarState() {
 	}, _pinnedBar->lifetime());
 
 	_pinnedBar->barClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto id = _pinnedTracker->currentMessageId();
 		if (const auto item = session().data().message(id.message)) {
 			controller()->showPeerHistory(
@@ -7235,9 +8570,51 @@ void HistoryWidget::checkPinnedBarState() {
 		}
 	}, _pinnedBar->lifetime());
 
+	_pinnedBar->barRightClicks(
+	) | rpl::on_next([=] {
+		if (_pinnedBarHasCustomButton) {
+			return;
+		}
+		const auto reference = _pinnedClickedId
+			? _pinnedClickedId
+			: _pinnedTracker->currentMessageId().message;
+		if (!reference) {
+			return;
+		}
+		const auto universal = [&](FullMsgId id) {
+			return (!id || !_migrated || peerIsChannel(id.peer))
+				? id.msg
+				: (id.msg - ServerMaxMsgId);
+		};
+		const auto migrated = _migrated ? _migrated->peer.get() : nullptr;
+		const auto referenceId = universal(reference);
+		const auto top = Data::ResolveTopPinnedId(
+			_peer,
+			MsgId(0), // topicRootId
+			PeerId(0), // monoforumPeerId
+			migrated);
+		const auto targetId = (top && referenceId >= universal(top))
+			? Data::ResolveMinPinnedId(
+				_peer,
+				MsgId(0), // topicRootId
+				PeerId(0), // monoforumPeerId
+				migrated)
+			: _pinnedTracker->nextPinnedId(referenceId);
+		if (!targetId) {
+			return;
+		}
+		controller()->showPeerHistory(
+			session().data().peer(targetId.peer),
+			Window::SectionShow::Way::Forward,
+			targetId.msg);
+		_pinnedClickedId = FullMsgId();
+		_minPinnedId = std::nullopt;
+		updatePinnedViewer();
+	}, _pinnedBar->lifetime());
+
 	_pinnedBarHeight = 0;
 	_pinnedBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_topDelta = _preserveScrollTop ? 0 : (height - _pinnedBarHeight);
 		_pinnedBarHeight = height;
 		updateHistoryGeometry();
@@ -7246,10 +8623,6 @@ void HistoryWidget::checkPinnedBarState() {
 	}, _pinnedBar->lifetime());
 
 	orderWidgets();
-
-	if (_showAnimation) {
-		_pinnedBar->hide();
-	}
 }
 
 void HistoryWidget::clearHidingPinnedBar() {
@@ -7322,64 +8695,42 @@ void HistoryWidget::refreshPinnedBarButton(bool many, HistoryItem *item) {
 					? id.message.msg
 					: (id.message.msg - ServerMaxMsgId))));
 	};
-	if (const auto replyMarkup = item ? item->inlineReplyMarkup() : nullptr) {
-		const auto &rows = replyMarkup->data.rows;
-		if ((rows.size() == 1) && (rows.front().size() == 1)) {
-			const auto text = rows.front().front().text;
-			if (!text.isEmpty()) {
-				const auto &st = st::historyPinnedBotButton;
-				auto button = object_ptr<Ui::RoundButton>(
-					this,
-					rpl::never<QString>(),
-					st);
-				const auto label = Ui::CreateChild<Ui::FlatLabel>(
-					button.data(),
-					text,
-					st::historyPinnedBotLabel);
-				if (label->width() > st::historyPinnedBotButtonMaxWidth) {
-					label->resizeToWidth(st::historyPinnedBotButtonMaxWidth);
-				}
-				button->setFullWidth(label->width()
-					+ st.padding.left()
-					+ st.padding.right()
-					+ st.height);
-				label->moveToLeft(
-					st.padding.left() + st.height / 2,
-					(button->height() - label->height()) / 2);
-				label->setTextColorOverride(st.textFg->c);
-				label->setAttribute(Qt::WA_TransparentForMouseEvents);
-				button->setTextTransform(
-					Ui::RoundButton::TextTransform::NoTransform);
-				button->setFullRadius(true);
-				button->setClickedCallback([=] {
-					Api::ActivateBotCommand(
-						_list->prepareClickHandlerContext(item->fullId()),
-						0,
-						0);
-				});
-				struct State {
-					base::unique_qptr<Ui::PopupMenu> menu;
-				};
-				const auto state = button->lifetime().make_state<State>();
-				_pinnedBar->contextMenuRequested(
-				) | rpl::start_with_next([=, raw = button.data()] {
-					state->menu = base::make_unique_q<Ui::PopupMenu>(raw);
-					state->menu->addAction(
-						tr::lng_settings_events_pinned(tr::now),
-						openSection);
-					state->menu->popup(QCursor::pos());
-				}, button->lifetime());
-				_pinnedBar->setRightButton(std::move(button));
-				return;
-			}
+	const auto context = [copy = _list](FullMsgId itemId) {
+		if (const auto raw = copy.data()) {
+			return raw->prepareClickHandlerContext(itemId);
 		}
+		return ClickHandlerContext();
+	};
+	auto customButton = CreatePinnedBarCustomButton(this, item, context);
+	if (customButton) {
+		_pinnedBarHasCustomButton = true;
+		struct State {
+			base::unique_qptr<Ui::PopupMenu> menu;
+		};
+		const auto buttonRaw = customButton.data();
+		const auto state = buttonRaw->lifetime().make_state<State>();
+		_pinnedBar->contextMenuRequested(
+		) | rpl::on_next([=] {
+			state->menu = base::make_unique_q<Ui::PopupMenu>(buttonRaw);
+			state->menu->addAction(
+				tr::lng_settings_events_pinned(tr::now),
+				openSection);
+			state->menu->popup(QCursor::pos());
+		}, buttonRaw->lifetime());
+		_pinnedBar->setRightButton(std::move(customButton));
+		return;
 	}
+	_pinnedBarHasCustomButton = false;
+
 	const auto close = !many;
 	auto button = object_ptr<Ui::IconButton>(
 		this,
 		close ? st::historyReplyCancel : st::historyPinnedShowAll);
+	button->setAccessibleName(close
+		? tr::lng_pinned_unpin(tr::now)
+		: tr::lng_settings_events_pinned(tr::now));
 	button->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (close) {
 			hidePinnedMessage();
 		} else {
@@ -7398,7 +8749,7 @@ void HistoryWidget::setupGroupCallBar() {
 		return;
 	}
 	_groupCallBar = std::make_unique<Ui::GroupCallBar>(
-		this,
+		_topBars.get(),
 		HistoryView::GroupCallBarContentByPeer(
 			peer,
 			st::historyGroupCallUserpics.size,
@@ -7406,7 +8757,7 @@ void HistoryWidget::setupGroupCallBar() {
 		Core::App().appDeactivatedValue());
 
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=](bool one) {
+	) | rpl::on_next([=](bool one) {
 		_groupCallBar->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -7418,7 +8769,7 @@ void HistoryWidget::setupGroupCallBar() {
 	rpl::merge(
 		_groupCallBar->barClicks(),
 		_groupCallBar->joinClicks()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto peer = _history->peer;
 		if (peer->groupCall()) {
 			controller()->startOrJoinGroupCall(peer, {});
@@ -7427,7 +8778,7 @@ void HistoryWidget::setupGroupCallBar() {
 
 	_groupCallBarHeight = 0;
 	_groupCallBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_topDelta = _preserveScrollTop ? 0 : (height - _groupCallBarHeight);
 		_groupCallBarHeight = height;
 		updateHistoryGeometry();
@@ -7436,10 +8787,6 @@ void HistoryWidget::setupGroupCallBar() {
 	}, _groupCallBar->lifetime());
 
 	orderWidgets();
-
-	if (_showAnimation) {
-		_groupCallBar->hide();
-	}
 }
 
 void HistoryWidget::setupRequestsBar() {
@@ -7451,14 +8798,14 @@ void HistoryWidget::setupRequestsBar() {
 		return;
 	}
 	_requestsBar = std::make_unique<Ui::RequestsBar>(
-		this,
+		_topBars.get(),
 		HistoryView::RequestsBarContentByPeer(
 			peer,
 			st::historyRequestsUserpics.size,
 			false));
 
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=](bool one) {
+	) | rpl::on_next([=](bool one) {
 		_requestsBar->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -7468,13 +8815,13 @@ void HistoryWidget::setupRequestsBar() {
 	}, _requestsBar->lifetime());
 
 	_requestsBar->barClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		RequestsBoxController::Start(controller(), _peer);
 	}, _requestsBar->lifetime());
 
 	_requestsBarHeight = 0;
 	_requestsBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_topDelta = _preserveScrollTop ? 0 : (height - _requestsBarHeight);
 		_requestsBarHeight = height;
 		updateHistoryGeometry();
@@ -7483,10 +8830,6 @@ void HistoryWidget::setupRequestsBar() {
 	}, _requestsBar->lifetime());
 
 	orderWidgets();
-
-	if (_showAnimation) {
-		_requestsBar->hide();
-	}
 }
 
 void HistoryWidget::requestMessageData(MsgId msgId) {
@@ -7500,15 +8843,125 @@ void HistoryWidget::requestMessageData(MsgId msgId) {
 	session().api().requestMessageData(_peer, msgId, callback);
 }
 
+bool HistoryWidget::checkSponsoredMessageBarVisibility() const {
+	const auto h = _list->height()
+		- (_kbScroll->isHidden() ? 0 : _kbScroll->height());
+	return (h > _scroll->height());
+}
+
+void HistoryWidget::requestSponsoredMessageBar() {
+	if (!_history || !session().sponsoredMessages().isTopBarFor(_history)) {
+		return;
+	}
+	const auto checkState = [=, this] {
+		using State = Data::SponsoredMessages::State;
+		const auto state = session().sponsoredMessages().state(
+			_history);
+		_sponsoredMessagesStateKnown = (state != State::None);
+		if (state == State::AppendToTopBar) {
+			createSponsoredMessageBar();
+			if (checkSponsoredMessageBarVisibility()) {
+				_sponsoredMessageBar->toggle(true, anim::type::normal);
+			} else {
+				auto &lifetime = _sponsoredMessageBar->lifetime();
+				const auto heightLifetime
+					= lifetime.make_state<rpl::lifetime>();
+				_list->heightValue(
+				) | rpl::on_next([=, this] {
+					if (_sponsoredMessageBar->toggled()) {
+						heightLifetime->destroy();
+					} else if (checkSponsoredMessageBarVisibility()) {
+						_sponsoredMessageBar->toggle(
+							true,
+							anim::type::normal);
+						heightLifetime->destroy();
+					}
+				}, *heightLifetime);
+			}
+		}
+	};
+	const auto history = _history;
+	session().sponsoredMessages().request(
+		_history,
+		crl::guard(this, [=, this] {
+			if (history == _history) {
+				checkState();
+			}
+		}));
+}
+
+void HistoryWidget::checkSponsoredMessageBar() {
+	if (!_history || !session().sponsoredMessages().isTopBarFor(_history)) {
+		return;
+	}
+	const auto state = session().sponsoredMessages().state(_history);
+	if (state == Data::SponsoredMessages::State::AppendToTopBar) {
+		if (checkSponsoredMessageBarVisibility()) {
+			if (!_sponsoredMessageBar) {
+				createSponsoredMessageBar();
+			}
+			_sponsoredMessageBar->toggle(true, anim::type::instant);
+		}
+	}
+}
+
+void HistoryWidget::createSponsoredMessageBar() {
+	_sponsoredMessageBar = base::make_unique_q<Ui::SlideWrap<>>(
+		_topBars.get(),
+		object_ptr<Ui::RpWidget>(this));
+
+	_sponsoredMessageBar->entity()->resizeToWidth(_scroll->width());
+	const auto maybeFullId = session().sponsoredMessages().fillTopBar(
+		_history,
+		_sponsoredMessageBar->entity());
+	session().sponsoredMessages().itemRemoved(
+		maybeFullId
+	) | rpl::on_next([this] {
+		_sponsoredMessageBar->toggle(false, anim::type::normal);
+		_sponsoredMessageBar->shownValue() | rpl::filter(
+			!rpl::mappers::_1
+		) | rpl::on_next([this] {
+			_sponsoredMessageBar = nullptr;
+		}, _sponsoredMessageBar->lifetime());
+	}, _sponsoredMessageBar->lifetime());
+
+	if (maybeFullId) {
+		const auto viewLifetime
+			= _sponsoredMessageBar->lifetime().make_state<rpl::lifetime>();
+		rpl::combine(
+			_sponsoredMessageBar->entity()->heightValue(),
+			_sponsoredMessageBar->heightValue()
+		) | rpl::filter(
+			rpl::mappers::_1 == rpl::mappers::_2
+		) | rpl::on_next([=] {
+			session().sponsoredMessages().view(maybeFullId);
+			viewLifetime->destroy();
+		}, *viewLifetime);
+	}
+
+	_sponsoredMessageBarHeight = 0;
+	_sponsoredMessageBar->heightValue(
+	) | rpl::on_next([=](int height) {
+		_topDelta = _preserveScrollTop
+			? 0
+			: (height - _sponsoredMessageBarHeight);
+		_sponsoredMessageBarHeight = height;
+		updateHistoryGeometry();
+		updateControlsGeometry();
+		_topDelta = 0;
+	}, _sponsoredMessageBar->lifetime());
+	_sponsoredMessageBar->toggle(false, anim::type::instant);
+}
+
 bool HistoryWidget::sendExistingDocument(
 		not_null<DocumentData*> document,
 		Api::MessageToSend messageToSend,
 		std::optional<MsgId> localId) {
 	const auto error = _peer
 		? Data::RestrictionError(_peer, ChatRestriction::SendStickers)
-		: std::nullopt;
+		: Data::SendError();
 	if (error) {
-		controller()->showToast(*error);
+		Data::ShowSendErrorToast(controller(), _peer, error);
 		return false;
 	} else if (!_peer
 		|| !_canSendMessages
@@ -7516,6 +8969,18 @@ bool HistoryWidget::sendExistingDocument(
 		|| ShowSendPremiumError(controller(), document)) {
 		return false;
 	}
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = messageToSend;
+		copy.action.options.starsApproved = approved;
+		sendExistingDocument(document, std::move(copy), localId);
+	};
+	const auto checked = checkSendPayment(
+		1,
+		messageToSend.action.options,
+		withPaymentApproved);
+	if (!checked) {
+		return false;
+	}
 
 	Api::SendExistingDocument(
 		std::move(messageToSend),
@@ -7524,9 +8989,7 @@ bool HistoryWidget::sendExistingDocument(
 
 	if (_autocomplete && _autocomplete->stickersShown()) {
 		clearFieldText();
-		//_saveDraftText = true;
-		//_saveDraftStart = crl::now();
-		//saveDraft();
+		//saveDraftWithTextNow();
 
 		// won't be needed if SendInlineBotResult will clear the cloud draft
 		saveCloudDraft();
@@ -7543,19 +9006,31 @@ bool HistoryWidget::sendExistingPhoto(
 		Api::SendOptions options) {
 	const auto error = _peer
 		? Data::RestrictionError(_peer, ChatRestriction::SendPhotos)
-		: std::nullopt;
+		: Data::SendError();
 	if (error) {
-		controller()->showToast(*error);
+		Data::ShowSendErrorToast(controller(), _peer, error);
 		return false;
 	} else if (!_peer || !_canSendMessages) {
 		return false;
 	} else if (showSlowmodeError()) {
 		return false;
 	}
+	const auto action = prepareSendAction(options);
+
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = options;
+		copy.starsApproved = approved;
+		sendExistingPhoto(photo, copy);
+	};
+	const auto checked = checkSendPayment(
+		1,
+		action.options,
+		withPaymentApproved);
+	if (!checked) {
+		return false;
+	}
 
-	Api::SendExistingPhoto(
-		Api::MessageToSend(prepareSendAction(options)),
-		photo);
+	Api::SendExistingPhoto(Api::MessageToSend(action), photo);
 
 	hideSelectorControlsAnimated();
 
@@ -7573,6 +9048,12 @@ void HistoryWidget::showInfoTooltip(
 		std::move(hiddenCallback));
 }
 
+void HistoryWidget::showHiddenSenderTooltip(
+		QRect globalArea,
+		const TextWithEntities &text) {
+	_hiddenSenderTooltip.show(_scroll.data(), globalArea, text);
+}
+
 void HistoryWidget::showPremiumStickerTooltip(
 		not_null<const HistoryView::Element*> view) {
 	if (const auto media = view->data()->media()) {
@@ -7592,6 +9073,88 @@ void HistoryWidget::showPremiumToast(not_null<DocumentData*> document) {
 	_stickerToast->showFor(document);
 }
 
+void HistoryWidget::validateSubsectionTabs() {
+	if (!_subsectionCheckLifetime && _history) {
+		if (const auto group = _history->peer->asMegagroup()) {
+			_subsectionCheckLifetime = group->flagsValue(
+			) | rpl::skip(
+				1
+			) | rpl::filter([=](Data::Flags<ChannelDataFlags>::Change change) {
+				const auto mask = ChannelDataFlag::Forum
+					| ChannelDataFlag::ForumTabs
+					| ChannelDataFlag::MonoforumAdmin;
+				return change.diff & mask;
+			}) | rpl::on_next([=] {
+				validateSubsectionTabs();
+			});
+		} else if (const auto user = _history->peer->asBot()) {
+			_subsectionCheckLifetime = user->flagsValue(
+			) | rpl::skip(
+				1
+			) | rpl::filter([=](Data::Flags<UserDataFlags>::Change change) {
+				return change.diff & UserDataFlag::Forum;
+			}) | rpl::on_next([=] {
+				_subsectionTopicsLifetime.destroy();
+				validateSubsectionTabs();
+			});
+		}
+	}
+	if (_history && !_subsectionTopicsLifetime) {
+		if (const auto user = _history->peer->asBot()) {
+			if (const auto forum = user->forum()) {
+				_subsectionTopicsLifetime = forum->topicsList()->fullSize().value(
+				) | rpl::map([](int size) {
+					return size > 0;
+				}) | rpl::distinct_until_changed(
+				) | rpl::skip(
+					1
+				) | rpl::on_next([=] {
+					validateSubsectionTabs();
+				});
+			}
+		}
+	}
+	if (!_history || !HistoryView::SubsectionTabs::UsedFor(_history)) {
+		if (_subsectionTabs) {
+			_subsectionTabsLifetime.destroy();
+			_subsectionTabs = nullptr;
+			updateControlsGeometry();
+
+			const auto forum = _history ? _history->asForum() : nullptr;
+			if (forum && !_history->peer->isUser()) {
+				controller()->showForum(forum, {
+					Window::SectionShow::Way::Backward,
+					anim::type::normal,
+					anim::activation::background,
+				});
+			}
+		}
+		return;
+	} else if (_subsectionTabs) {
+		return;
+	}
+	_subsectionTabs = controller()->restoreSubsectionTabsFor(this, _history);
+	if (!_subsectionTabs) {
+		_subsectionTabs = std::make_unique<HistoryView::SubsectionTabs>(
+			controller(),
+			this,
+			_history);
+	}
+	_subsectionTabs->removeRequests() | rpl::on_next([=] {
+		_subsectionTabsLifetime.destroy();
+		_subsectionTabs = nullptr;
+		updateControlsGeometry();
+	}, _subsectionTabsLifetime);
+	_subsectionTabs->layoutRequests() | rpl::on_next([=] {
+		_list->toggleRemoveFromUserpics(_subsectionTabs->leftSkip() > 0);
+		updateControlsGeometry();
+		orderWidgets();
+	}, _subsectionTabsLifetime);
+	_list->toggleRemoveFromUserpics(_subsectionTabs->leftSkip() > 0);
+	updateControlsGeometry();
+	orderWidgets();
+}
+
 void HistoryWidget::checkCharsCount() {
 	_fieldCharsCountManager.setCount(Ui::ComputeFieldCharacterCount(_field));
 	checkCharsLimitation();
@@ -7609,10 +9172,11 @@ void HistoryWidget::checkCharsLimitation() {
 	}
 	const auto hasMediaWithCaption = item->media()
 		&& item->media()->allowsEditCaption();
-	const auto maxCaptionSize = !hasMediaWithCaption
-		? MaxMessageSize
-		: Data::PremiumLimits(&session()).captionLengthCurrent();
-	const auto remove = _fieldCharsCountManager.count() - maxCaptionSize;
+	const auto limits = Data::PremiumLimits(&session());
+	const auto maxTextSize = hasMediaWithCaption
+		? limits.captionLengthCurrent()
+		: limits.messageLengthCurrent();
+	const auto remove = _fieldCharsCountManager.count() - maxTextSize;
 	if (remove > 0) {
 		if (!_charsLimitation) {
 			_charsLimitation = base::make_unique_q<CharactersLimitLabel>(
@@ -7620,11 +9184,6 @@ void HistoryWidget::checkCharsLimitation() {
 				_send.get(),
 				style::al_bottom);
 			_charsLimitation->show();
-			Data::AmPremiumValue(
-				&session()
-			) | rpl::start_with_next([=] {
-				checkCharsLimitation();
-			}, _charsLimitation->lifetime());
 		}
 		_charsLimitation->setLeft(remove);
 	} else {
@@ -7659,22 +9218,26 @@ void HistoryWidget::clearFieldText(
 
 void HistoryWidget::replyToMessage(FullReplyTo id) {
 	if (const auto item = session().data().message(id.messageId)) {
-		replyToMessage(item, id.quote, id.quoteOffset);
+		if (CanSendReply(item) && !base::IsCtrlPressed()) {
+			replyToMessage(item, id);
+		} else if (item->allowsForward()) {
+			const auto show = controller()->uiShow();
+			HistoryView::Controls::ShowReplyToChatBox(show, id);
+		} else {
+			controller()->showToast(
+				tr::lng_error_cant_reply_other(tr::now));
+		}
 	}
 }
 
 void HistoryWidget::replyToMessage(
 		not_null<HistoryItem*> item,
-		TextWithEntities quote,
-		int quoteOffset) {
+		FullReplyTo fields) {
 	if (isJoinChannel()) {
 		return;
 	}
-	_processingReplyTo = {
-		.messageId = item->fullId(),
-		.quote = quote,
-		.quoteOffset = quoteOffset,
-	};
+	fields.messageId = item->fullId();
+	_processingReplyTo = fields;
 	_processingReplyItem = item;
 	processReply();
 }
@@ -7702,7 +9265,9 @@ void HistoryWidget::processReply() {
 
 	if (!_peer || !_processingReplyTo) {
 		return processCancel();
-	} else if (!_processingReplyItem) {
+	}
+	cancelSuggestPost();
+	if (!_processingReplyItem) {
 		session().api().requestMessageData(
 			session().data().peer(_processingReplyTo.messageId.peer),
 			_processingReplyTo.messageId.msg,
@@ -7723,7 +9288,7 @@ void HistoryWidget::processReply() {
 							{ .ids = { 1, itemId } });
 					}),
 					.confirmText = tr::lng_selected_forward(),
-					}));
+				}));
 		}
 		return processCancel();
 #endif
@@ -7732,7 +9297,9 @@ void HistoryWidget::processReply() {
 	} else if (const auto forum = _peer->forum()
 		; forum && _processingReplyItem->history() == _history) {
 		const auto topicRootId = _processingReplyItem->topicRootId();
-		if (forum->topicDeleted(topicRootId)) {
+		using namespace Data;
+		if (forum->topicDeleted(topicRootId)
+			&& !(topicRootId == ForumTopic::kGeneralId && _peer->isBot())) {
 			return processCancel();
 		} else if (const auto topic = forum->topicFor(topicRootId)) {
 			if (!Data::CanSendAnything(topic)) {
@@ -7752,7 +9319,6 @@ void HistoryWidget::setReplyFieldsFromProcessing() {
 		return;
 	}
 
-	_history->setForwardDraft(MsgId(), {});
 	if (_composeSearch) {
 		_composeSearch->hideAnimated();
 	}
@@ -7760,18 +9326,34 @@ void HistoryWidget::setReplyFieldsFromProcessing() {
 	const auto id = base::take(_processingReplyTo);
 	const auto item = base::take(_processingReplyItem);
 	if (_editMsgId) {
-		if (const auto localDraft = _history->localDraft({})) {
+		if (const auto localDraft = _history->localDraft({}, {})) {
 			localDraft->reply = id;
+			localDraft->suggest = SuggestOptions();
 		} else {
 			_history->setLocalDraft(std::make_unique<Data::Draft>(
 				TextWithTags(),
 				id,
+				SuggestOptions(),
 				MessageCursor(),
 				Data::WebPageDraft()));
 		}
 	} else {
 		_replyEditMsg = item;
 		_replyTo = id;
+		if (_replyTo) {
+			if (const auto i = session().data().message(_replyTo.messageId)) {
+				if (const auto media = i->media()) {
+					using namespace SendMenu;
+					const auto type = media->hasSpoiler()
+						? Action{ .type = Action::Type::SpoilerOn }
+						: Action{ .type = Action::Type::SpoilerOff };
+					_mediaEditManager.apply(type);
+				}
+			}
+		} else {
+			_mediaEditManager.cancel();
+		}
+		cancelSuggestPost();
 		updateReplyEditText(_replyEditMsg);
 		updateCanSendMessage();
 		updateBotKeyboard();
@@ -7782,22 +9364,30 @@ void HistoryWidget::setReplyFieldsFromProcessing() {
 		refreshTopBarActiveChat();
 	}
 
-	_saveDraftText = true;
-	_saveDraftStart = crl::now();
-	saveDraft();
-
+	saveDraftWithTextNow();
 	setInnerFocus();
 }
 
 void HistoryWidget::editMessage(
 		not_null<HistoryItem*> item,
 		const TextSelection &selection) {
-	if (_chooseTheme) {
+	if (item->richPage()) {
+#ifdef TDESKTOP_IV_EDITOR
+		Iv::Editor::ShowEditBox(controller(), item);
+#endif // TDESKTOP_IV_EDITOR
+		return;
+	} else if (_chooseTheme) {
 		toggleChooseChatTheme(_peer);
 	} else if (_voiceRecordBar->isActive()) {
 		controller()->showToast(tr::lng_edit_caption_voice(tr::now));
 		return;
-	} else if (_composeSearch) {
+	} else if (const auto media = item->media()) {
+		if (media->todolist()) {
+			Window::PeerMenuEditTodoList(controller(), item);
+			return;
+		}
+	}
+	if (_composeSearch) {
 		_composeSearch->hideAnimated();
 	}
 
@@ -7806,13 +9396,15 @@ void HistoryWidget::editMessage(
 		_send->clearState();
 	}
 	if (!_editMsgId) {
-		if (_replyTo || !_field->empty()) {
+		const auto suggest = suggestOptions();
+		if (_replyTo || suggest.exists || !_field->empty()) {
 			_history->setLocalDraft(std::make_unique<Data::Draft>(
 				_field,
 				_replyTo,
+				suggest,
 				_preview->draft()));
 		} else {
-			_history->clearLocalDraft({});
+			_history->clearLocalDraft(MsgId(), PeerId());
 		}
 	}
 
@@ -7826,6 +9418,7 @@ void HistoryWidget::editMessage(
 	_history->setLocalEditDraft(std::make_unique<Data::Draft>(
 		editData,
 		FullReplyTo{ item->fullId() },
+		SuggestOptions(),
 		cursor,
 		previewDraft));
 	applyDraft();
@@ -7842,13 +9435,27 @@ void HistoryWidget::editMessage(
 	updateField();
 	SelectTextInFieldWithMargins(_field, selection);
 
-	_saveDraftText = true;
-	_saveDraftStart = crl::now();
-	saveDraft();
-
+	saveDraftWithTextNow();
 	setInnerFocus();
 }
 
+void HistoryWidget::fillSenderUserpicMenu(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<PeerData*> peer) {
+	if (!_peer || _peer->isUser()) {
+		// No need to offer View Profile / Send Message in private chat.
+		return;
+	}
+	const auto inGroup = _peer && (_peer->isChat() || _peer->isMegagroup());
+	Window::FillSenderUserpicMenu(
+		controller(),
+		peer,
+		inGroup ? _peer : nullptr,
+		(inGroup && _canSendTexts) ? _field.data() : nullptr,
+		inGroup ? _peer->owner().history(_peer) : Dialogs::Key(),
+		Ui::Menu::CreateAddActionCallback(menu));
+}
+
 void HistoryWidget::hidePinnedMessage() {
 	Expects(_pinnedBar != nullptr);
 
@@ -7868,6 +9475,7 @@ void HistoryWidget::hidePinnedMessage() {
 			controller(),
 			_peer,
 			MsgId(0), // topicRootId
+			PeerId(0), // monoforumPeerId
 			crl::guard(this, callback));
 	}
 }
@@ -7889,6 +9497,12 @@ bool HistoryWidget::lastForceReplyReplied() const {
 			== FullMsgId(_peer->id, _history->lastKeyboardId));
 }
 
+bool HistoryWidget::cancelReplyOrSuggest(bool lastKeyboardUsed) {
+	const auto ok1 = cancelReply(lastKeyboardUsed);
+	const auto ok2 = cancelSuggestPost();
+	return ok1 || ok2;
+}
+
 bool HistoryWidget::cancelReply(bool lastKeyboardUsed) {
 	bool wasReply = false;
 	if (_replyTo) {
@@ -7899,7 +9513,8 @@ bool HistoryWidget::cancelReply(bool lastKeyboardUsed) {
 		mouseMoveEvent(0);
 		if (!readyToForward()
 			&& !_previewDrawPreview
-			&& !_kbReplyTo) {
+			&& !_kbReplyTo
+			&& !_suggestOptions) {
 			_fieldBarCancel->hide();
 			updateMouseTracking();
 		}
@@ -7910,19 +9525,17 @@ bool HistoryWidget::cancelReply(bool lastKeyboardUsed) {
 		updateControlsGeometry();
 		update();
 	} else if (const auto localDraft
-			= (_history ? _history->localDraft({}) : nullptr)) {
+			= (_history ? _history->localDraft({}, {}) : nullptr)) {
 		if (localDraft->reply) {
 			if (localDraft->textWithTags.text.isEmpty()) {
-				_history->clearLocalDraft({});
+				_history->clearLocalDraft(MsgId(), PeerId());
 			} else {
 				localDraft->reply = {};
 			}
 		}
 	}
 	if (wasReply) {
-		_saveDraftText = true;
-		_saveDraftStart = crl::now();
-		saveDraft();
+		saveDraftWithTextNow();
 	}
 	if (!_editMsgId
 		&& _keyboard->singleUse()
@@ -7936,7 +9549,7 @@ bool HistoryWidget::cancelReply(bool lastKeyboardUsed) {
 }
 
 void HistoryWidget::cancelReplyAfterMediaSend(bool lastKeyboardUsed) {
-	if (cancelReply(lastKeyboardUsed)) {
+	if (cancelReplyOrSuggest(lastKeyboardUsed)) {
 		saveCloudDraft();
 	}
 }
@@ -7954,12 +9567,13 @@ void HistoryWidget::cancelEdit() {
 		return;
 	}
 
-	_canReplaceMedia = false;
+	_canReplaceMedia = _canAddMedia = false;
 	_photoEditMedia = nullptr;
 	updateReplaceMediaButton();
 	_replyEditMsg = nullptr;
 	setEditMsgId(0);
-	_history->clearLocalEditDraft({});
+	_history->clearLocalEditDraft(MsgId(), PeerId());
+	cancelSuggestPost();
 	applyDraft();
 
 	if (_saveEditMsgRequestId) {
@@ -7967,14 +9581,13 @@ void HistoryWidget::cancelEdit() {
 		_saveEditMsgRequestId = 0;
 	}
 
-	_saveDraftText = true;
-	_saveDraftStart = crl::now();
-	saveDraft();
+	saveDraftWithTextNow();
 
 	mouseMoveEvent(nullptr);
 	if (!readyToForward()
 		&& !_previewDrawPreview
-		&& !replyTo()) {
+		&& !replyTo()
+		&& !_suggestOptions) {
 		_fieldBarCancel->hide();
 		updateMouseTracking();
 	}
@@ -7998,15 +9611,28 @@ void HistoryWidget::cancelFieldAreaState() {
 		_preview->apply({ .removed = true });
 	} else if (_editMsgId) {
 		cancelEdit();
-	} else if (readyToForward()) {
-		_history->setForwardDraft(MsgId(), {});
 	} else if (_replyTo) {
 		cancelReply();
+	} else if (readyToForward()) {
+		_history->setForwardDraft(MsgId(), PeerId(), {});
 	} else if (_kbReplyTo) {
 		toggleKeyboard();
+	} else if (_suggestOptions) {
+		cancelSuggestPost();
 	}
 }
 
+bool HistoryWidget::cancelSuggestPost() {
+	if (!_suggestOptions) {
+		return false;
+	}
+	_suggestOptions = nullptr;
+	updateControlsVisibility();
+	updateControlsGeometry();
+	saveDraftWithTextNow();
+	return true;
+}
+
 void HistoryWidget::fullInfoUpdated() {
 	auto refresh = false;
 	if (_list) {
@@ -8021,12 +9647,26 @@ void HistoryWidget::fullInfoUpdated() {
 
 		handlePeerUpdate();
 		checkSuggestToGigagroup();
+
+		const auto hasNonEmpty = _history->findFirstNonEmpty();
+		const auto readyForBotStart = hasNonEmpty
+			|| (_history->loadedAtTop() && _history->loadedAtBottom());
+		if (readyForBotStart && clearMaybeSendStart() && hasNonEmpty) {
+			sendBotStartCommand();
+		}
+		refreshGiftToChannelShown();
+		refreshDirectMessageShown();
 	}
 	if (updateCmdStartShown()) {
 		refresh = true;
 	} else if (!_scroll->isHidden() && _unblock->isHidden() == isBlocked()) {
 		refresh = true;
 	}
+	if (_history
+			&& HistoryView::SubsectionTabs::UsedFor(_history)
+			&& !_subsectionTabs) {
+		validateSubsectionTabs();
+	}
 	if (refresh) {
 		updateControlsVisibility();
 		updateControlsGeometry();
@@ -8045,7 +9685,7 @@ void HistoryWidget::handlePeerUpdate() {
 				== UserData::CallsStatus::Unknown))) {
 		session().api().requestFullPeer(_peer);
 	} else if (auto channel = _peer->asMegagroup()) {
-		if (!channel->mgInfo->botStatus) {
+		if (channel->mgInfo->botStatus == Data::BotStatus::Unknown) {
 			session().api().chatParticipants().requestBots(channel);
 		}
 		if (!channel->mgInfo->adminsLoaded) {
@@ -8080,10 +9720,17 @@ bool HistoryWidget::updateCanSendMessage() {
 	const auto topic = resolveReplyToTopic();
 	const auto allWithoutPolls = Data::AllSendRestrictions()
 		& ~ChatRestriction::SendPolls;
-	const auto newCanSendMessages = topic
+	const auto onlyReplies = _peer->amMonoforumAdmin();
+	const auto restrictedOnlyReplies = onlyReplies
+		&& (!_replyTo.messageId || _replyTo.messageId.peer != _peer->id);
+	const auto newCanSendMessages = restrictedOnlyReplies
+		? false
+		: topic
 		? Data::CanSendAnyOf(topic, allWithoutPolls)
 		: Data::CanSendAnyOf(_peer, allWithoutPolls);
-	const auto newCanSendTexts = topic
+	const auto newCanSendTexts = restrictedOnlyReplies
+		? false
+		: topic
 		? Data::CanSend(topic, ChatRestriction::SendOther)
 		: Data::CanSend(_peer, ChatRestriction::SendOther);
 	if (_canSendMessages == newCanSendMessages
@@ -8093,9 +9740,11 @@ bool HistoryWidget::updateCanSendMessage() {
 	_canSendMessages = newCanSendMessages;
 	_canSendTexts = newCanSendTexts;
 	if (!_canSendMessages) {
-		cancelReply();
+		cancelReplyOrSuggest();
 	}
+	refreshSuggestPostToggle();
 	refreshScheduledToggle();
+	refreshSendGiftToggle();
 	refreshSilentToggle();
 	return true;
 }
@@ -8104,9 +9753,9 @@ void HistoryWidget::forwardSelected() {
 	if (!_list) {
 		return;
 	}
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	Window::ShowForwardMessagesBox(controller(), getSelectedItems(), [=] {
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->clearSelected();
 		}
 	});
@@ -8121,10 +9770,12 @@ void HistoryWidget::confirmDeleteSelected() {
 	}
 	const auto items = session().data().idsToItems(ids);
 	if (CanCreateModerateMessagesBox(items)) {
+		const auto opt = DefaultModerateMessagesBoxOptions();
 		controller()->show(Box(
 			CreateModerateMessagesBox,
-			items,
-			crl::guard(this, [=] { clearSelected(); })));
+			ModerateMessagesBoxEntry{ .items = items },
+			crl::guard(this, [=] { clearSelected(); }),
+			opt));
 	} else {
 		auto box = Box<DeleteMessagesBox>(&session(), std::move(ids));
 		box->setDeleteConfirmedCallback(crl::guard(this, [=] {
@@ -8136,7 +9787,11 @@ void HistoryWidget::confirmDeleteSelected() {
 
 void HistoryWidget::escape() {
 	if (_composeSearch) {
-		_composeSearch->hideAnimated();
+		if (_nonEmptySelection) {
+			clearSelected();
+		} else {
+			_composeSearch->hideAnimated();
+		}
 	} else if (_chooseForReport) {
 		controller()->clearChooseReportMessages();
 	} else if (_nonEmptySelection && _list) {
@@ -8160,10 +9815,13 @@ void HistoryWidget::escape() {
 		} else {
 			cancelEdit();
 		}
+	} else if (readyToForward() && _history) {
+		_history->setForwardDraft(MsgId(), PeerId(), {});
 	} else if (_autocomplete && !_autocomplete->isHidden()) {
 		_autocomplete->hideAnimated();
-	} else if (_replyTo && _field->getTextWithTags().text.isEmpty()) {
-		cancelReply();
+	} else if ((_replyTo || _suggestOptions)
+		&& _field->getTextWithTags().empty()) {
+		cancelReplyOrSuggest();
 	} else if (auto &voice = _voiceRecordBar; voice->isActive()) {
 		voice->showDiscardBox(nullptr, anim::type::normal);
 	} else {
@@ -8226,17 +9884,18 @@ void HistoryWidget::updateTopBarSelection() {
 		_reportMessages->setAttribute(transparent, false);
 		_reportMessages->setColorOverride(std::nullopt);
 	}
-	_reportMessages->setText(Ui::Text::Upper(selectedState.count
+	_reportMessages->setText(selectedState.count
 		? tr::lng_report_messages_count(
 			tr::now,
 			lt_count,
-			selectedState.count)
-		: tr::lng_report_messages_none(tr::now)));
+			selectedState.count,
+			tr::upper)
+		: tr::lng_report_messages_none(tr::now, tr::upper));
 	updateControlsVisibility();
 	updateHistoryGeometry();
 	if (!controller()->isLayerShown()
 		&& !Core::App().passcodeLocked()) {
-		if (isSearching()) {
+		if (isSearching() && !_nonEmptySelection) {
 			_composeSearch->setInnerFocus();
 		} else if (_nonEmptySelection
 			|| (_list && _list->wasSelectedText())
@@ -8271,15 +9930,37 @@ void HistoryWidget::messageDataReceived(
 }
 
 void HistoryWidget::updateReplyEditText(not_null<HistoryItem*> item) {
-	const auto context = Core::MarkedTextContext{
+	const auto context = Core::TextContext({
 		.session = &session(),
-		.customEmojiRepaint = [=] { updateField(); },
-	};
+		.repaint = [=] { updateField(); },
+	});
+	const auto text = [&] {
+		const auto media = (_replyTo.todoItemId
+				|| !_replyTo.pollOption.isEmpty())
+			? item->media()
+			: nullptr;
+		if (const auto todolist = media ? media->todolist() : nullptr) {
+			const auto i = ranges::find(
+				todolist->items,
+				_replyTo.todoItemId,
+				&TodoListItem::id);
+			if (i != end(todolist->items)) {
+				return i->text;
+			}
+		}
+		if (const auto poll = media ? media->poll() : nullptr) {
+			if (const auto answer = poll->answerByOption(
+					_replyTo.pollOption)) {
+				return answer->text;
+			}
+		}
+		return (_editMsgId || _replyTo.quote.empty())
+			? item->inReplyText()
+			: _replyTo.quote;
+	}();
 	_replyEditMsgText.setMarkedText(
 		st::defaultTextStyle,
-		((_editMsgId || _replyTo.quote.empty())
-			? item->inReplyText()
-			: _replyTo.quote),
+		text,
 		Ui::DialogTextOptions(),
 		context);
 	if (fieldOrDisabledShown() || isRecording()) {
@@ -8303,13 +9984,27 @@ void HistoryWidget::updateReplyEditTexts(bool force) {
 		}
 	}
 	if (_replyEditMsg) {
+		const auto richPage = _replyEditMsg->richPage();
 		const auto editMedia = _editMsgId
 			? _replyEditMsg->media()
 			: nullptr;
-		if (_editMsgId && _replyEditMsg) {
+		if (_editMsgId && _replyEditMsg && !richPage) {
 			_mediaEditManager.start(_replyEditMsg);
+		} else {
+			_mediaEditManager.cancel();
+		}
+		_canReplaceMedia = _editMsgId
+			&& !richPage
+			&& _replyEditMsg->allowsEditMedia();
+		if (_canReplaceMedia && editMedia && editMedia->allowsEditMedia()) {
+			_canAddMedia = false;
+		} else {
+			_canAddMedia = base::take(_canReplaceMedia);
+		}
+		if (_canReplaceMedia || _canAddMedia) {
+			// Invalidate the button, maybe icon has changed.
+			_replaceMedia.destroy();
 		}
-		_canReplaceMedia = editMedia && editMedia->allowsEditMedia();
 		_photoEditMedia = (_canReplaceMedia
 			&& editMedia->photo()
 			&& !editMedia->photo()->isNull())
@@ -8339,11 +10034,8 @@ void HistoryWidget::updateReplyEditTexts(bool force) {
 
 void HistoryWidget::updateForwarding() {
 	_forwardPanel->update(_history, _history
-		? _history->resolveForwardDraft(MsgId())
+		? _history->resolveForwardDraft(MsgId(), PeerId())
 		: Data::ResolvedForwardDraft());
-	if (readyToForward()) {
-		cancelReply();
-	}
 	updateControlsVisibility();
 	updateControlsGeometry();
 }
@@ -8354,16 +10046,14 @@ void HistoryWidget::updateReplyToName() {
 	} else if (!_replyEditMsg && (_replyTo || !_kbReplyTo)) {
 		return;
 	}
-	const auto context = Core::MarkedTextContext{
+	const auto context = Core::TextContext({
 		.session = &_history->session(),
-		.customEmojiRepaint = [] {},
 		.customEmojiLoopLimit = 1,
-	};
+	});
 	const auto to = _replyEditMsg ? _replyEditMsg : _kbReplyTo;
-	const auto replyToQuote = _replyTo && !_replyTo.quote.empty();
 	_replyToName.setMarkedText(
 		st::fwdTextStyle,
-		HistoryView::Reply::ComposePreviewName(_history, to, replyToQuote),
+		HistoryView::Reply::ComposePreviewName(_history, to, _replyTo),
 		Ui::NameTextOptions(),
 		context);
 }
@@ -8384,13 +10074,12 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) {
 	auto backh = fieldHeight() + 2 * st::historySendPadding;
 	auto hasForward = readyToForward();
 	auto drawMsgText = (_editMsgId || _replyTo) ? _replyEditMsg : _kbReplyTo;
-	if (_editMsgId || _replyTo || (!hasForward && _kbReplyTo)) {
-		backy -= st::historyReplyHeight;
-		backh += st::historyReplyHeight;
-	} else if (hasForward) {
-		backy -= st::historyReplyHeight;
-		backh += st::historyReplyHeight;
-	} else if (_previewDrawPreview) {
+	if (_editMsgId
+		|| _replyTo
+		|| hasForward
+		|| _kbReplyTo
+		|| _previewDrawPreview
+		|| _suggestOptions) {
 		backy -= st::historyReplyHeight;
 		backh += st::historyReplyHeight;
 	}
@@ -8401,10 +10090,26 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) {
 	const auto media = (!_previewDrawPreview && drawMsgText)
 		? drawMsgText->media()
 		: nullptr;
-	const auto hasPreview = media && media->hasReplyPreview();
+	const auto poll = media ? media->poll() : nullptr;
+	const auto pollAnswer = poll
+		? poll->answerByOption(_replyTo.pollOption)
+		: nullptr;
+	const auto pollMediaPtr = pollAnswer
+		? &pollAnswer->media
+		: (poll && _replyTo.pollOption.isEmpty())
+		? &poll->attachedMedia
+		: nullptr;
+	const auto pollMediaHasPreview = pollMediaPtr
+		&& (pollMediaPtr->photo || pollMediaPtr->document);
+	const auto hasPreview = pollMediaHasPreview
+		|| (media && media->hasReplyPreview());
 	const auto preview = _mediaEditManager
 		? _mediaEditManager.mediaPreview()
-		: hasPreview
+		: pollMediaHasPreview
+		? (pollMediaPtr->photo
+			? pollMediaPtr->photo->getReplyPreview(drawMsgText)
+			: pollMediaPtr->document->getReplyPreview(drawMsgText))
+		: (media && media->hasReplyPreview())
 		? media->replyPreview()
 		: nullptr;
 	const auto spoilered = _mediaEditManager.spoilered();
@@ -8454,14 +10159,18 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) {
 		const auto paused = p.inactive();
 		const auto pausedSpoiler = paused || On(PowerSaving::kChatSpoiler);
 		auto replyLeft = st::historyReplySkip;
-		(_editMsgId
-			? st::historyEditIcon
-			: (_replyTo && !_replyTo.quote.empty())
-			? st::historyQuoteIcon
-			: st::historyReplyIcon).paint(
-				p,
-				st::historyReplyIconPosition + QPoint(0, backy),
-				width());
+		if (_suggestOptions) {
+			_suggestOptions->paintIcon(p, 0, backy, width());
+		} else {
+			(_editMsgId
+				? st::historyEditIcon
+				: (_replyTo && !_replyTo.quote.empty())
+				? st::historyQuoteIcon
+				: st::historyReplyIcon).paint(
+					p,
+					st::historyReplyIconPosition + QPoint(0, backy),
+					width());
+		}
 		if (drawMsgText) {
 			if (hasPreview) {
 				if (preview) {
@@ -8499,37 +10208,41 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) {
 				}
 				replyLeft += st::historyReplyPreview + st::msgReplyBarSkip;
 			}
-			p.setPen(st::historyReplyNameFg);
-			if (_editMsgId) {
-				paintEditHeader(p, rect, replyLeft, backy);
+			if (_suggestOptions) {
+				_suggestOptions->paintLines(p, replyLeft, backy, width());
 			} else {
-				_replyToName.drawElided(
-					p,
-					replyLeft,
-					backy + st::msgReplyPadding.top(),
-					width()
+				p.setPen(st::historyReplyNameFg);
+				if (_editMsgId) {
+					paintEditHeader(p, rect, replyLeft, backy);
+				} else {
+					_replyToName.drawElided(
+						p,
+						replyLeft,
+						backy + st::msgReplyPadding.top(),
+						width()
+							- replyLeft
+							- _fieldBarCancel->width()
+							- st::msgReplyPadding.right());
+				}
+				p.setPen(st::historyComposeAreaFg);
+				_replyEditMsgText.draw(p, {
+					.position = QPoint(
+						replyLeft,
+						st::msgReplyPadding.top()
+							+ st::msgServiceNameFont->height
+							+ backy),
+					.availableWidth = width()
 						- replyLeft
 						- _fieldBarCancel->width()
-						- st::msgReplyPadding.right());
+						- st::msgReplyPadding.right(),
+					.palette = &st::historyComposeAreaPalette,
+					.spoiler = Ui::Text::DefaultSpoilerCache(),
+					.now = now,
+					.pausedEmoji = paused || On(PowerSaving::kEmojiChat),
+					.pausedSpoiler = pausedSpoiler,
+					.elisionLines = 1,
+				});
 			}
-			p.setPen(st::historyComposeAreaFg);
-			_replyEditMsgText.draw(p, {
-				.position = QPoint(
-					replyLeft,
-					st::msgReplyPadding.top()
-						+ st::msgServiceNameFont->height
-						+ backy),
-				.availableWidth = width()
-					- replyLeft
-					- _fieldBarCancel->width()
-					- st::msgReplyPadding.right(),
-				.palette = &st::historyComposeAreaPalette,
-				.spoiler = Ui::Text::DefaultSpoilerCache(),
-				.now = now,
-				.pausedEmoji = paused || On(PowerSaving::kEmojiChat),
-				.pausedSpoiler = pausedSpoiler,
-				.elisionLines = 1,
-			});
 		} else {
 			p.setFont(st::msgDateFont);
 			p.setPen(st::historyComposeAreaFgService);
@@ -8555,6 +10268,8 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) {
 			- _fieldBarCancel->width()
 			- st::msgReplyPadding.right();
 		_forwardPanel->paint(p, x, backy, available, width());
+	} else if (_suggestOptions) {
+		_suggestOptions->paintBar(p, 0, backy, width());
 	}
 }
 
@@ -8656,7 +10371,8 @@ void HistoryWidget::paintEvent(QPaintEvent *e) {
 		if (restrictionHidden
 			|| replyTo()
 			|| readyToForward()
-			|| _kbShown) {
+			|| _kbShown
+			|| _suggestOptions) {
 			if (!isSearching()) {
 				drawField(p, clip);
 			}
@@ -8736,5 +10452,8 @@ HistoryWidget::~HistoryWidget() {
 
 		session().data().itemVisibilitiesUpdated();
 	}
+	_subsectionTabsLifetime.destroy();
+	_subsectionTopicsLifetime.destroy();
+	_subsectionTabs = nullptr;
 	setTabbedPanel(nullptr);
 }
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 7906fec3302075..2d012795d34809 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -10,12 +10,14 @@ For license and copyright information please follow this link:
 #include "history/view/controls/history_view_compose_media_edit_manager.h"
 #include "history/view/history_view_corner_buttons.h"
 #include "history/history_drag_area.h"
+#include "history/history_item_helpers.h"
 #include "history/history_view_highlight_manager.h"
 #include "history/history_view_top_toast.h"
 #include "history/history.h"
 #include "chat_helpers/field_characters_count_manager.h"
 #include "data/data_report.h"
 #include "window/section_widget.h"
+#include "window/window_session_controller.h"
 #include "ui/widgets/fields/input_field.h"
 #include "mtproto/sender.h"
 
@@ -28,10 +30,14 @@ class Error;
 } // namespace MTP
 
 namespace Data {
+class ForumTopic;
 class PhotoMedia;
+struct DrawToReplyRequest;
+struct SendError;
 } // namespace Data
 
 namespace SendMenu {
+struct Action;
 struct Details;
 } // namespace SendMenu
 
@@ -59,6 +65,7 @@ class DropdownMenu;
 class PlainShadow;
 class IconButton;
 class EmojiButton;
+class RpWidget;
 class SendButton;
 class SilentToggle;
 class FlatButton;
@@ -67,21 +74,25 @@ class PinnedBar;
 class GroupCallBar;
 class RequestsBar;
 struct PreparedList;
+struct PreparedBundle;
 class SendFilesWay;
 class SendAsButton;
 class SpoilerAnimation;
 class ChooseThemeController;
 class ContinuousScroll;
 struct ChatPaintHighlight;
+class ChatStyle;
+template <typename Widget>
+class SlideWrap;
 } // namespace Ui
 
 namespace Ui::Emoji {
 class SuggestionsController;
 } // namespace Ui::Emoji
 
-namespace Window {
-class SessionController;
-} // namespace Window
+namespace Webrtc {
+enum class RecordAvailability : uchar;
+} // namespace Webrtc
 
 namespace ChatHelpers {
 class TabbedPanel;
@@ -93,14 +104,20 @@ struct FileChosen;
 namespace HistoryView {
 class StickerToast;
 class PaidReactionToast;
+class SelfForwardsTagger;
 class TopBarWidget;
+class PaysStatus;
 class ContactStatus;
 class BusinessBotStatus;
 class Element;
 class PinnedTracker;
 class TranslateBar;
 class ComposeSearch;
+class SubsectionTabs;
+class PullToNextChannel;
 struct SelectedQuote;
+class SuggestOptionsBar;
+enum class SuggestMode;
 } // namespace HistoryView
 
 namespace HistoryView::Controls {
@@ -111,6 +128,10 @@ class TTLButton;
 class WebpageProcessor;
 class CharactersLimitLabel;
 class PhotoEditSpoilerManager;
+class ComposeAiButton;
+class ComposeTooltipManager;
+using AiTooltipManager = ComposeTooltipManager;
+struct VoiceToSend;
 } // namespace HistoryView::Controls
 
 class BotKeyboard;
@@ -149,14 +170,12 @@ class HistoryWidget final
 	bool isItemCompletelyHidden(HistoryItem *item) const;
 	void updateTopBarSelection();
 	void updateTopBarChooseForReport();
+	bool handleDrawToReplyRequest(Data::DrawToReplyRequest request);
 
 	void loadMessages();
 	void loadMessagesDown();
 	void firstLoadMessages();
-	void delayedShowAt(
-		MsgId showAtMsgId,
-		const TextWithEntities &highlightPart,
-		int highlightPartOffsetHint);
+	void delayedShowAt(MsgId showAtMsgId, const Window::SectionShow &params);
 
 	bool updateReplaceMediaButton();
 	void updateFieldPlaceholder();
@@ -169,10 +188,7 @@ class HistoryWidget final
 
 	History *history() const;
 	PeerData *peer() const;
-	void setMsgId(
-		MsgId showAtMsgId,
-		const TextWithEntities &highlightPart = {},
-		int highlightPartOffsetHint = 0);
+	void setMsgId(MsgId showAtMsgId, const Window::SectionShow &params = {});
 	MsgId msgId() const;
 
 	bool hasTopBarShadow() const {
@@ -181,6 +197,7 @@ class HistoryWidget final
 	void showAnimated(
 		Window::SlideDirection direction,
 		const Window::SectionSlideParams &params);
+	void showFast();
 	void finishAnimating();
 
 	void doneShow();
@@ -199,16 +216,23 @@ class HistoryWidget final
 	void replyToMessage(FullReplyTo id);
 	void replyToMessage(
 		not_null<HistoryItem*> item,
-		TextWithEntities quote = {},
-		int quoteOffset = 0);
+		FullReplyTo fields = {});
 	void editMessage(
 		not_null<HistoryItem*> item,
 		const TextSelection &selection);
 
+	void fillSenderUserpicMenu(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<PeerData*> peer);
+
 	[[nodiscard]] FullReplyTo replyTo() const;
+	[[nodiscard]] SuggestOptions suggestOptions(
+		bool skipNoAdminCheck = false) const;
 	bool lastForceReplyReplied(const FullMsgId &replyTo) const;
 	bool lastForceReplyReplied() const;
+	bool cancelReplyOrSuggest(bool lastKeyboardUsed = false);
 	bool cancelReply(bool lastKeyboardUsed = false);
+	bool cancelSuggestPost();
 	void cancelEdit();
 	void updateForwarding();
 
@@ -221,6 +245,7 @@ class HistoryWidget final
 	void sendBotCommand(const Bot::SendCommandRequest &request);
 	void hideSingleUseKeyboard(FullMsgId replyToId);
 	bool insertBotCommand(const QString &cmd);
+	void insertTextAtCursor(const QString &text);
 
 	bool eventFilter(QObject *obj, QEvent *e) override;
 
@@ -233,10 +258,9 @@ class HistoryWidget final
 	bool applyDraft(
 		FieldHistoryAction fieldHistoryAction = FieldHistoryAction::Clear);
 	void showHistory(
-		const PeerId &peer,
+		PeerId peerId,
 		MsgId showAtMsgId,
-		const TextWithEntities &highlightPart = {},
-		int highlightPartOffsetHint = 0);
+		const Window::SectionShow &params = {});
 	void setChooseReportMessagesDetails(
 		Data::ReportInput reportInput,
 		Fn<void(std::vector<MsgId>)> callback);
@@ -257,7 +281,10 @@ class HistoryWidget final
 	[[nodiscard]] rpl::producer<> cancelRequests() const {
 		return _cancelRequests.events();
 	}
-	bool searchInChatEmbedded(Dialogs::Key chat, QString query);
+	bool searchInChatEmbedded(
+		QString query,
+		Dialogs::Key chat,
+		PeerData *searchFrom = nullptr);
 
 	void updateNotifyControls();
 
@@ -269,7 +296,8 @@ class HistoryWidget final
 	void confirmDeleteSelected();
 	void clearSelected();
 
-	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
+	[[nodiscard]] SendMenu::Details sendMenuDetails() const override;
+	bool processChosenSticker(ChatHelpers::FileChosen &&chosen) override;
 	[[nodiscard]] SendMenu::Details saveMenuDetails() const;
 	bool sendExistingDocument(
 		not_null<DocumentData*> document,
@@ -282,6 +310,9 @@ class HistoryWidget final
 	void showInfoTooltip(
 		const TextWithEntities &text,
 		Fn<void()> hiddenCallback);
+	void showHiddenSenderTooltip(
+		QRect globalArea,
+		const TextWithEntities &text);
 	void showPremiumStickerTooltip(
 		not_null<const HistoryView::Element*> view);
 	void showPremiumToast(not_null<DocumentData*> document);
@@ -311,9 +342,13 @@ class HistoryWidget final
 	void mouseReleaseEvent(QMouseEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
 
+public:
+	void synteticScrollToY(int y);
+
 private:
 	using TabbedPanel = ChatHelpers::TabbedPanel;
 	using TabbedSelector = ChatHelpers::TabbedSelector;
+	using VoiceToSend = HistoryView::Controls::VoiceToSend;
 	enum ScrollChangeType {
 		ScrollChangeNone,
 
@@ -352,6 +387,11 @@ class HistoryWidget final
 	bool cornerButtonsUnreadMayBeShown() override;
 	bool cornerButtonsHas(HistoryView::CornerButtonType type) override;
 
+	[[nodiscard]] bool checkSendPayment(
+		int messagesCount,
+		Api::SendOptions options,
+		Fn<void(int)> withPaymentApproved);
+
 	void checkSuggestToGigagroup();
 	void processReply();
 	void setReplyFieldsFromProcessing();
@@ -363,7 +403,6 @@ class HistoryWidget final
 	void setTabbedPanel(std::unique_ptr<TabbedPanel> panel);
 	void updateField();
 	void fieldChanged();
-	void fieldTabbed();
 	void fieldFocused();
 	void fieldResized();
 
@@ -372,12 +411,17 @@ class HistoryWidget final
 	void saveDraft(bool delayed = false);
 	void saveCloudDraft();
 	void saveDraftDelayed();
+	void saveDraftWithTextNow();
 	void showMembersDropdown();
 	void windowIsVisibleChanged();
 	void saveFieldToHistoryLocalDraft();
 	void fileChosen(ChatHelpers::FileChosen &&data);
+	void setupSendMenu(
+		not_null<Ui::RpWidget*> button,
+		Fn<void(SendMenu::Action, SendMenu::Details)> action);
 
 	void updateFieldSubmitSettings();
+	bool clearMaybeSendStart();
 
 	// Checks if we are too close to the top or to the bottom
 	// in the scroll area and preloads history if needed.
@@ -390,11 +434,23 @@ class HistoryWidget final
 	void refreshTopBarActiveChat();
 
 	void refreshJoinChannelText();
+	void refreshGiftToChannelShown();
+	void refreshDirectMessageShown();
 	void requestMessageData(MsgId msgId);
 	void messageDataReceived(not_null<PeerData*> peer, MsgId msgId);
 
 	[[nodiscard]] Api::SendAction prepareSendAction(
-		Api::SendOptions options) const;
+		Api::SendOptions options);
+	void sendTextWithTags(
+		TextWithTags textWithTags,
+		bool useWebPageDraft,
+		Api::SendOptions options,
+		Fn<void()> done);
+	void sendVoice(const VoiceToSend &data);
+	void sendWithTextOverride(
+		TextWithEntities text,
+		Api::SendOptions options,
+		Fn<void()> done);
 	void send(Api::SendOptions options);
 	void sendWithModifiers(Qt::KeyboardModifiers modifiers);
 	void sendScheduled(Api::SendOptions initialOptions);
@@ -429,10 +485,11 @@ class HistoryWidget final
 	void supportInsertText(const QString &text);
 	void supportShareContact(Support::Contact contact);
 
-	auto computeSendButtonType() const;
+	[[nodiscard]] auto computeSendButtonType() const;
 
 	void showFinished();
 	void updateOverStates(QPoint pos);
+	void clearOverStates();
 	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos = {});
 	void sendButtonClicked();
 	void newItemAdded(not_null<HistoryItem*> item);
@@ -455,19 +512,21 @@ class HistoryWidget final
 		Ui::PreparedList &&list,
 		const QString &insertTextOnCancel = QString());
 	bool showSendingFilesError(const Ui::PreparedList &list) const;
-	bool showSendingFilesError(
-		const Ui::PreparedList &list,
-		std::optional<bool> compress) const;
+	bool showSendingFilesError(const Ui::PreparedBundle &bundle) const;
+
 	bool showSendMessageError(
 		const TextWithTags &textWithTags,
-		bool ignoreSlowmodeCountdown);
+		bool ignoreSlowmodeCountdown,
+		Fn<void(int starsApproved)> withPaymentApproved = nullptr,
+		Api::SendOptions options = {});
 
 	void sendingFilesConfirmed(
-		Ui::PreparedList &&list,
-		Ui::SendFilesWay way,
-		TextWithTags &&caption,
-		Api::SendOptions options,
-		bool ctrlShiftEnter);
+		std::shared_ptr<Ui::PreparedBundle> bundle,
+		Api::SendOptions options);
+
+	void sendBotCommand(
+		const Bot::SendCommandRequest &request,
+		Api::SendOptions options);
 
 	void uploadFile(const QByteArray &fileContent, SendMediaType type);
 	void itemRemoved(not_null<const HistoryItem*> item);
@@ -476,10 +535,26 @@ class HistoryWidget final
 	// like send button, emoji button and others.
 	void moveFieldControls();
 	void updateFieldSize();
+	void initAiButton();
+	void updateAiButtonVisibility();
+	void updateAiButtonGeometry();
+	void showAiComposeBox();
+	void triggerAiApplyInPlace();
+	void initSendAsFileButton();
+	void sendTextAsFile(
+		const QString &fileText,
+		TextWithTags restoreText,
+		int restorePosition,
+		int restoreAnchor);
+	void updateSendAsFileVisibility();
+	void updateSendAsFileGeometry();
+	[[nodiscard]] bool canSendAiComposeDirect() const;
 
 	[[nodiscard]] MsgId resolveReplyToTopicRootId();
 	[[nodiscard]] Data::ForumTopic *resolveReplyToTopic();
 	[[nodiscard]] bool canWriteMessage() const;
+	[[nodiscard]] bool hasEnoughLinesForAi() const;
+	[[nodiscard]] bool textExceedsMaxSize() const;
 	void orderWidgets();
 
 	[[nodiscard]] InlineBotQuery parseInlineBotQuery() const;
@@ -508,6 +583,8 @@ class HistoryWidget final
 	}
 
 	void setupShortcuts();
+	void setupGiftToChannelButton();
+	void setupDirectMessageButton();
 
 	void handlePeerMigration();
 
@@ -528,6 +605,11 @@ class HistoryWidget final
 	void setupGroupCallBar();
 	void setupRequestsBar();
 
+	void checkSponsoredMessageBar();
+	[[nodiscard]] bool checkSponsoredMessageBarVisibility() const;
+	void requestSponsoredMessageBar();
+	void createSponsoredMessageBar();
+
 	void sendInlineResult(InlineBots::ResultSelected result);
 
 	void drawField(Painter &p, const QRect &rect);
@@ -548,7 +630,7 @@ class HistoryWidget final
 	void createUnreadBarAndResize();
 
 	[[nodiscard]] TextWithEntities prepareTextForEditMsg() const;
-	void saveEditMsg();
+	void saveEditMessage(Api::SendOptions options = {});
 
 	void setupPreview();
 	void editDraftOptions();
@@ -560,7 +642,7 @@ class HistoryWidget final
 	void addMessagesToBack(not_null<PeerData*> peer, const QVector<MTPMessage> &messages);
 
 	void updateSendRestriction();
-	[[nodiscard]] QString computeSendRestriction() const;
+	[[nodiscard]] Data::SendError computeSendRestriction() const;
 	void updateHistoryGeometry(bool initial = false, bool loadedDown = false, const ScrollChange &change = { ScrollChangeNone, 0 });
 	void updateListSize();
 	void startItemRevealAnimations();
@@ -577,11 +659,6 @@ class HistoryWidget final
 	int itemTopForHighlight(not_null<HistoryView::Element*> view) const;
 	void scrollToCurrentVoiceMessage(FullMsgId fromId, FullMsgId toId);
 
-	// Scroll to current y without updating the _lastUserScrolled time.
-	// Used to distinguish between user scrolls and syntetic scrolls.
-	// This one is syntetic.
-	void synteticScrollToY(int y);
-
 	void writeDrafts();
 	void writeDraftTexts();
 	void writeDraftCursors();
@@ -600,6 +677,7 @@ class HistoryWidget final
 	void setHistory(History *history);
 	void setEditMsgId(MsgId msgId);
 
+	friend class HistoryInner;
 	HistoryItem *getItemFromHistoryOrMigrated(MsgId genericMsgId) const;
 	void animatedScrollToItem(MsgId msgId);
 	void animatedScrollToY(int scrollTo, HistoryItem *attachTo = nullptr);
@@ -633,11 +711,17 @@ class HistoryWidget final
 	[[nodiscard]] bool showRecordButton() const;
 	[[nodiscard]] bool showInlineBotCancel() const;
 	void refreshSilentToggle();
+	void setupFastButtonMode();
 
 	[[nodiscard]] bool isChoosingTheme() const;
 
 	void setupScheduledToggle();
 	void refreshScheduledToggle();
+	void refreshSendGiftToggle();
+	void refreshSuggestPostToggle();
+	void applySuggestOptions(
+		SuggestOptions suggest,
+		HistoryView::SuggestMode mode);
 	void setupSendAsToggle();
 	void refreshSendAsToggle();
 	void refreshAttachBotsMenu();
@@ -648,6 +732,8 @@ class HistoryWidget final
 
 	void switchToSearch(QString query);
 
+	void validateSubsectionTabs();
+
 	void checkCharsCount();
 	void checkCharsLimitation();
 
@@ -661,6 +747,7 @@ class HistoryWidget final
 	MsgId _editMsgId = 0;
 	std::shared_ptr<Data::PhotoMedia> _photoEditMedia;
 	bool _canReplaceMedia = false;
+	bool _canAddMedia = false;
 	HistoryView::MediaEditManager _mediaEditManager;
 
 	HistoryItem *_replyEditMsg = nullptr;
@@ -668,8 +755,12 @@ class HistoryWidget final
 	std::unique_ptr<Ui::SpoilerAnimation> _replySpoiler;
 	mutable base::Timer _updateEditTimeLeftDisplay;
 
+	std::unique_ptr<HistoryView::SuggestOptionsBar> _suggestOptions;
+
 	object_ptr<Ui::IconButton> _fieldBarCancel;
 
+	std::unique_ptr<Ui::RpWidget> _topBars;
+
 	std::unique_ptr<HistoryView::TranslateBar> _translateBar;
 	int _translateBarHeight = 0;
 
@@ -679,14 +770,19 @@ class HistoryWidget final
 	int _pinnedBarHeight = 0;
 	FullMsgId _pinnedClickedId;
 	std::optional<FullMsgId> _minPinnedId;
+	bool _pinnedBarHasCustomButton = false;
 
 	std::unique_ptr<Ui::GroupCallBar> _groupCallBar;
 	int _groupCallBarHeight = 0;
 	std::unique_ptr<Ui::RequestsBar> _requestsBar;
 	int _requestsBarHeight = 0;
 
+	base::unique_qptr<Ui::SlideWrap<Ui::RpWidget>> _sponsoredMessageBar;
+	int _sponsoredMessageBarHeight = 0;
+
 	bool _preserveScrollTop = false;
 	bool _repaintFieldScheduled = false;
+	bool _sentFromScheduledTip = false;
 
 	mtpRequestId _saveEditMsgRequestId = 0;
 
@@ -701,16 +797,15 @@ class HistoryWidget final
 	bool _canSendTexts = false;
 	MsgId _showAtMsgId = ShowAtUnreadMsgId;
 	base::flat_set<MsgId> _topicsRequested;
-	TextWithEntities _showAtMsgHighlightPart;
-	int _showAtMsgHighlightPartOffsetHint = 0;
+	Window::SectionShow _showAtMsgParams;
+	bool _showAndMaybeSendStart = false;
 
 	int _firstLoadRequest = 0; // Not real mtpRequestId.
 	int _preloadRequest = 0; // Not real mtpRequestId.
 	int _preloadDownRequest = 0; // Not real mtpRequestId.
 
 	MsgId _delayedShowAtMsgId = -1;
-	TextWithEntities _delayedShowAtMsgHighlightPart;
-	int _delayedShowAtMsgHighlightPartOffsetHint = 0;
+	Window::SectionShow _delayedShowAtMsgParams;
 	int _delayedShowAtRequest = 0; // Not real mtpRequestId.
 
 	History *_supportPreloadHistory = nullptr;
@@ -721,6 +816,9 @@ class HistoryWidget final
 	QPointer<HistoryInner> _list;
 	History *_migrated = nullptr;
 	History *_history = nullptr;
+	mutable Data::ForumTopic *_creatingBotTopic = nullptr;
+	rpl::lifetime _historySponsoredPreloading;
+
 	// Initial updateHistoryGeometry() was called.
 	bool _historyInited = false;
 	// If updateListSize() was called without updateHistoryGeometry().
@@ -735,6 +833,7 @@ class HistoryWidget final
 	Ui::Animations::Simple _scrollToAnimation;
 
 	HistoryView::CornerButtons _cornerButtons;
+	std::unique_ptr<HistoryView::PullToNextChannel> _pullToNext;
 
 	std::unique_ptr<ChatHelpers::FieldAutocomplete> _autocomplete;
 	std::unique_ptr<Ui::Emoji::SuggestionsController> _emojiSuggestions;
@@ -746,14 +845,22 @@ class HistoryWidget final
 	mtpRequestId _inlineBotResolveRequestId = 0;
 	bool _isInlineBot = false;
 
+	Webrtc::RecordAvailability _recordAvailability = {};
+
+	std::unique_ptr<HistoryView::PaysStatus> _paysStatus;
 	std::unique_ptr<HistoryView::ContactStatus> _contactStatus;
 	std::unique_ptr<HistoryView::BusinessBotStatus> _businessBotStatus;
 
 	const std::shared_ptr<Ui::SendButton> _send;
+	HistoryView::Controls::ComposeAiButton * const _aiButton = nullptr;
+	Ui::IconButton * const _sendAsFile = nullptr;
 	object_ptr<Ui::FlatButton> _unblock;
 	object_ptr<Ui::FlatButton> _botStart;
 	object_ptr<Ui::FlatButton> _joinChannel;
 	object_ptr<Ui::FlatButton> _muteUnmute;
+	QPointer<Ui::IconButton> _giftToChannel;
+	QPointer<Ui::IconButton> _directMessage;
+	rpl::lifetime _directMessageLifetime;
 	object_ptr<Ui::FlatButton> _reportMessages;
 	struct {
 		object_ptr<Ui::RoundButton> button = { nullptr };
@@ -767,16 +874,25 @@ class HistoryWidget final
 	object_ptr<Ui::IconButton> _botKeyboardShow;
 	object_ptr<Ui::IconButton> _botKeyboardHide;
 	object_ptr<Ui::IconButton> _botCommandStart;
+	object_ptr<Ui::IconButton> _toggleSuggestPost = { nullptr };
+	object_ptr<Ui::IconButton> _giftToUser = { nullptr };
 	object_ptr<Ui::SilentToggle> _silent = { nullptr };
 	object_ptr<Ui::IconButton> _scheduled = { nullptr };
 	std::unique_ptr<HistoryView::Controls::TTLButton> _ttlInfo;
 	const std::unique_ptr<VoiceRecordBar> _voiceRecordBar;
 	const std::unique_ptr<ForwardPanel> _forwardPanel;
 	std::unique_ptr<HistoryView::ComposeSearch> _composeSearch;
+	std::unique_ptr<HistoryView::SubsectionTabs> _subsectionTabs;
+	rpl::lifetime _subsectionTabsLifetime;
+	rpl::lifetime _subsectionCheckLifetime;
+	rpl::lifetime _subsectionTopicsLifetime;
+	std::unique_ptr<HistoryView::Controls::AiTooltipManager> _aiTooltipManager;
+	std::unique_ptr<HistoryView::Controls::AiTooltipManager> _sendAsFileTooltipManager;
+	std::shared_ptr<Ui::ChatStyle> _fieldChatStyle;
 	bool _cmdStartShown = false;
 	object_ptr<Ui::InputField> _field;
 	base::unique_qptr<Ui::RpWidget> _fieldDisabled;
-	base::unique_qptr<Ui::RpWidget> _sendRestriction;
+	std::unique_ptr<Ui::RpWidget> _sendRestriction;
 	using CharactersLimitLabel = HistoryView::Controls::CharactersLimitLabel;
 	base::unique_qptr<CharactersLimitLabel> _charsLimitation;
 	QString _sendRestrictionKey;
@@ -820,7 +936,9 @@ class HistoryWidget final
 	base::Timer _saveCloudDraftTimer;
 
 	HistoryView::InfoTooltip _topToast;
+	HistoryView::AnchoredTooltip _hiddenSenderTooltip;
 	std::unique_ptr<HistoryView::StickerToast> _stickerToast;
+	std::unique_ptr<HistoryView::SelfForwardsTagger> _selfForwardsTagger;
 	std::unique_ptr<ChooseMessagesForReport> _chooseForReport;
 
 	std::unique_ptr<HistoryView::PaidReactionToast> _paidReactionToast;
@@ -831,6 +949,7 @@ class HistoryWidget final
 		ItemRevealAnimation> _itemRevealAnimations;
 	int _itemsRevealHeight = 0;
 
+
 	bool _sponsoredMessagesStateKnown = false;
 	bool _justMarkingAsRead = false;
 
@@ -839,6 +958,8 @@ class HistoryWidget final
 
 	int _topDelta = 0;
 
+	SendPaymentHelper _sendPayment;
+
 	rpl::event_stream<> _cancelRequests;
 
 };
diff --git a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
index e51bae134d6404..1522a5f79e9076 100644
--- a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
+++ b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
@@ -7,16 +7,24 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "api/api_common.h"
+#include "ui/text/text_entity.h"
+
 namespace Api {
 enum class SendProgressType;
-struct SendOptions;
 struct SendAction;
 } // namespace Api
 
+namespace Data {
+class GroupCall;
+} // namespace Data
+
 class History;
 
 namespace HistoryView::Controls {
 
+extern const char kOptionMacCmdReplyImmediately[];
+
 struct MessageToEdit {
 	FullMsgId fullId;
 	Api::SendOptions options;
@@ -28,6 +36,7 @@ struct VoiceToSend {
 	VoiceWaveform waveform;
 	crl::time duration = 0;
 	Api::SendOptions options;
+	bool video = false;
 };
 struct SendActionUpdate {
 	Api::SendProgressType type = Api::SendProgressType();
@@ -39,6 +48,8 @@ enum class WriteRestrictionType {
 	None,
 	Rights,
 	PremiumRequired,
+	Frozen,
+	Hidden,
 };
 
 struct WriteRestriction {
@@ -47,6 +58,7 @@ struct WriteRestriction {
 	QString text;
 	QString button;
 	Type type = Type::None;
+	int boostsToLift = false;
 
 	[[nodiscard]] bool empty() const {
 		return (type == Type::None);
@@ -62,12 +74,16 @@ struct WriteRestriction {
 
 struct SetHistoryArgs {
 	required<History*> history;
+	std::shared_ptr<Data::GroupCall> videoStream;
 	MsgId topicRootId = 0;
+	PeerId monoforumPeerId = 0;
 	Fn<bool()> showSlowmodeError;
 	Fn<Api::SendAction()> sendActionFactory;
+	Fn<void(TextWithEntities, Api::SendOptions, Fn<void()>)> sendWithText;
 	rpl::producer<int> slowmodeSecondsLeft;
 	rpl::producer<bool> sendDisabledBySlowmode;
 	rpl::producer<bool> liked;
+	rpl::producer<int> minStarsCount;
 	rpl::producer<WriteRestriction> writeRestriction;
 };
 
@@ -80,4 +96,16 @@ struct ReplyNextRequest {
 	const Direction direction;
 };
 
+enum class ToggleCommentsState {
+	Empty,
+	Shown,
+	Hidden,
+	WithNew,
+};
+
+struct SendStarButtonEffect {
+	not_null<PeerData*> from;
+	int stars = 0;
+};
+
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_characters_limit.cpp b/Telegram/SourceFiles/history/view/controls/history_view_characters_limit.cpp
index c3f273674f4c44..f8bd4660dde2aa 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_characters_limit.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_characters_limit.cpp
@@ -10,36 +10,62 @@ For license and copyright information please follow this link:
 #include "ui/rect.h"
 #include "styles/style_chat_helpers.h"
 
+namespace {
+
+constexpr auto kMinus = QChar(0x2212);
+constexpr auto kLimit = int(999);
+
+[[nodiscard]] int CountDigits(int n) {
+	return n == 0 ? 1 : static_cast<int>(std::log10(std::abs(n))) + 1;
+}
+
+} // namespace
+
 namespace HistoryView::Controls {
 
 CharactersLimitLabel::CharactersLimitLabel(
 	not_null<Ui::RpWidget*> parent,
 	not_null<Ui::RpWidget*> widgetToAlign,
-	style::align align)
-: Ui::FlatLabel(parent, st::historyCharsLimitationLabel) {
+	style::align align,
+	QMargins margins)
+: Ui::FlatLabel(parent, st::historyCharsLimitationLabel)
+, _widgetToAlign(widgetToAlign)
+, _position((align == style::al_top)
+	? Fn<void(int, const QRect &)>([=](int height, const QRect &g) {
+		const auto w = textMaxWidth();
+		move(
+			g.x() + (g.width() - w) / 2 + margins.left(),
+			rect::bottom(g) + margins.top());
+	})
+	: Fn<void(int, const QRect &)>([=](int height, const QRect &g) {
+		const auto w = textMaxWidth();
+		move(
+			g.x() + (g.width() - w) / 2 + margins.left(),
+			g.y() - height - margins.bottom());
+	})) {
 	Expects((align == style::al_top) || align == style::al_bottom);
-	const auto w = st::historyCharsLimitationLabel.minWidth;
-	using F = Fn<void(int, const QRect &)>;
-	const auto position = (align == style::al_top)
-		? F([=](int height, const QRect &g) {
-			move(g.x() + (g.width() - w) / 2, rect::bottom(g));
-		})
-		: F([=](int height, const QRect &g) {
-			move(g.x() + (g.width() - w) / 2, g.y() - height);
-		});
 	rpl::combine(
 		Ui::RpWidget::heightValue(),
 		widgetToAlign->geometryValue()
-	) | rpl::start_with_next(position, lifetime());
+	) | rpl::on_next(_position, lifetime());
 }
 
 void CharactersLimitLabel::setLeft(int value) {
-	if (value <= 0) {
-		return;
+	const auto orderChanged = (CountDigits(value) != CountDigits(_lastValue));
+	_lastValue = value;
+
+	if (value > 0) {
+		setTextColorOverride(st::historyCharsLimitationLabel.textFg->c);
+		Ui::FlatLabel::setText(kMinus
+			+ QString::number(std::min(value, kLimit)));
+	} else {
+		setTextColorOverride(st::windowSubTextFg->c);
+		Ui::FlatLabel::setText(QString::number(-value));
+	}
+
+	if (orderChanged) {
+		_position(height(), _widgetToAlign->geometry());
 	}
-	constexpr auto kMinus = QChar(0x2212);
-	constexpr auto kLimit = int(999);
-	Ui::FlatLabel::setText(kMinus + QString::number(std::min(value, kLimit)));
 }
 
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_characters_limit.h b/Telegram/SourceFiles/history/view/controls/history_view_characters_limit.h
index 3b6054e1914e94..812354a11c6152 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_characters_limit.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_characters_limit.h
@@ -16,10 +16,16 @@ class CharactersLimitLabel final : public Ui::FlatLabel {
 	CharactersLimitLabel(
 		not_null<Ui::RpWidget*> parent,
 		not_null<Ui::RpWidget*> widgetToAlign,
-		style::align align);
+		style::align align,
+		QMargins margins = {});
 
 	void setLeft(int value);
 
+private:
+	int _lastValue = 0;
+	not_null<Ui::RpWidget*> _widgetToAlign;
+	Fn<void(int, const QRect &)> _position;
+
 };
 
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_ai_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_ai_button.cpp
new file mode 100644
index 00000000000000..bc33c029fb1cba
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_ai_button.cpp
@@ -0,0 +1,97 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/controls/history_view_compose_ai_button.h"
+
+#include "ui/effects/ripple_animation.h"
+#include "ui/painter.h"
+#include "styles/style_chat_helpers.h"
+
+namespace HistoryView::Controls {
+namespace {
+
+constexpr auto kAnimationDuration = crl::time(640);
+
+} // namespace
+
+ComposeAiButton::ComposeAiButton(
+	QWidget *parent,
+	const style::IconButton &st)
+: RippleButton(parent, st.ripple)
+, _st(st) {
+	resize(_st.width, _st.height);
+	setCursor(style::cur_pointer);
+
+	shownValue(
+	) | rpl::on_next([=](bool shown) {
+		if (shown) {
+			_animation.start([=] { update(); }, 0., 1., kAnimationDuration);
+		} else {
+			_animation.stop();
+		}
+	}, lifetime());
+}
+
+void ComposeAiButton::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	PainterHighQualityEnabler hq(p);
+
+	const auto over = isDown() || isOver() || forceRippled();
+	paintRipple(p, _st.rippleAreaPosition);
+
+	const auto progress = _animation.value(1.);
+	auto star1Opacity = 1.;
+	auto star2Opacity = 1.;
+	if (progress < 0.25) {
+		star1Opacity = 1. - (progress / 0.25);
+	} else if (progress < 0.5) {
+		star1Opacity = 0.;
+		star2Opacity = 1. - ((progress - 0.25) / 0.25);
+	} else if (progress < 0.75) {
+		star1Opacity = (progress - 0.5) / 0.25;
+		star2Opacity = 0.;
+	} else {
+		star2Opacity = (progress - 0.75) / 0.25;
+	}
+
+	const auto part = [&](const style::icon &icon) {
+		if (over) {
+			icon.paintInCenter(p, rect(), st::historyComposeIconFgOver->c);
+		} else {
+			icon.paintInCenter(p, rect());
+		}
+	};
+	part(st::historyAiComposeButtonLetters);
+	if (star1Opacity > 0.) {
+		p.setOpacity(star1Opacity);
+		part(st::historyAiComposeButtonStar1);
+	}
+	if (star2Opacity > 0.) {
+		p.setOpacity(star2Opacity);
+		part(st::historyAiComposeButtonStar2);
+	}
+}
+
+void ComposeAiButton::onStateChanged(State was, StateChangeSource source) {
+	RippleButton::onStateChanged(was, source);
+	update();
+}
+
+QImage ComposeAiButton::prepareRippleMask() const {
+	return Ui::RippleAnimation::EllipseMask(
+		QSize(_st.rippleAreaSize, _st.rippleAreaSize));
+}
+
+QPoint ComposeAiButton::prepareRippleStartPosition() const {
+	const auto result = mapFromGlobal(QCursor::pos()) - _st.rippleAreaPosition;
+	const auto rect = QRect(0, 0, _st.rippleAreaSize, _st.rippleAreaSize);
+	return rect.contains(result)
+		? result
+		: DisabledRippleStartPosition();
+}
+
+} // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_ai_button.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_ai_button.h
new file mode 100644
index 00000000000000..7d326b5d460a33
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_ai_button.h
@@ -0,0 +1,32 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/animations.h"
+#include "ui/widgets/buttons.h"
+
+namespace HistoryView::Controls {
+
+class ComposeAiButton final : public Ui::RippleButton {
+public:
+	ComposeAiButton(QWidget *parent, const style::IconButton &st);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void onStateChanged(State was, StateChangeSource source) override;
+
+	[[nodiscard]] QImage prepareRippleMask() const override;
+	[[nodiscard]] QPoint prepareRippleStartPosition() const override;
+
+private:
+	const style::IconButton &_st;
+	Ui::Animations::Simple _animation;
+
+};
+
+} // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_ai_tooltip.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_ai_tooltip.cpp
new file mode 100644
index 00000000000000..d26bf9df18d4b7
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_ai_tooltip.cpp
@@ -0,0 +1,90 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/controls/history_view_compose_ai_tooltip.h"
+
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "lang/lang_keys.h"
+#include "ui/widgets/tooltip.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_widgets.h"
+
+namespace HistoryView::Controls {
+
+ComposeTooltipManager::ComposeTooltipManager(
+	not_null<QWidget*> parent,
+	not_null<Ui::RpWidget*> button,
+	rpl::producer<TextWithEntities> text,
+	base::const_string prefKey,
+	Fn<int()> widthProvider)
+: _button(button)
+, _prefKey(prefKey)
+, _widthProvider(std::move(widthProvider)) {
+	_tooltip.reset(Ui::CreateChild<Ui::ImportantTooltip>(
+		parent,
+		Ui::MakeTooltipWithClose(
+			parent,
+			std::move(text),
+			st::historyMessagesTTLLabel.minWidth,
+			st::ttlMediaImportantTooltipLabel,
+			st::importantTooltipHide,
+			st::defaultImportantTooltip.padding,
+			[=] { hideAndRemember(); }),
+		st::historyRecordTooltip));
+	_tooltip->toggleFast(false);
+	_button->geometryValue(
+	) | rpl::on_next([=](const QRect &geometry) {
+		if (!geometry.isEmpty()) {
+			updateGeometry();
+		}
+	}, _tooltip->lifetime());
+}
+
+void ComposeTooltipManager::hideAndRemember() {
+	if (!Core::App().settings().readPref<bool>(_prefKey)) {
+		Core::App().settings().writePref<bool>(_prefKey, true);
+	}
+	_shown = false;
+	_tooltip->toggleAnimated(false);
+}
+
+void ComposeTooltipManager::updateVisibility(bool buttonShown) {
+	const auto showTooltip = buttonShown
+		&& !Core::App().settings().readPref<bool>(_prefKey);
+	if (showTooltip) {
+		updateGeometry();
+	}
+	if ((_shown != showTooltip)
+		|| (showTooltip && _tooltip->isHidden())) {
+		_shown = showTooltip;
+		_tooltip->toggleAnimated(showTooltip);
+	}
+}
+
+void ComposeTooltipManager::updateGeometry() {
+	if (_button->isHidden()) {
+		return;
+	}
+	const auto geometry = _button->geometry();
+	const auto maxWidth = _widthProvider();
+	const auto countPosition = [=](QSize size) {
+		const auto left = geometry.x()
+			+ geometry.width()
+			- size.width();
+		return QPoint(
+			std::max(std::min(left, maxWidth - size.width()), 0),
+			geometry.y() - size.height() - st::historyAiComposeTooltipSkip);
+	};
+	_tooltip->pointAt(geometry, RectPart::Top, countPosition);
+}
+
+void ComposeTooltipManager::raise() {
+	_tooltip->raise();
+}
+
+} // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_ai_tooltip.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_ai_tooltip.h
new file mode 100644
index 00000000000000..cc91d9105f1c66
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_ai_tooltip.h
@@ -0,0 +1,45 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/const_string.h"
+#include "base/unique_qptr.h"
+
+namespace Ui {
+class ImportantTooltip;
+class RpWidget;
+} // namespace Ui
+
+namespace HistoryView::Controls {
+
+class ComposeTooltipManager final {
+public:
+	ComposeTooltipManager(
+		not_null<QWidget*> parent,
+		not_null<Ui::RpWidget*> button,
+		rpl::producer<TextWithEntities> text,
+		base::const_string prefKey,
+		Fn<int()> widthProvider);
+
+	void hideAndRemember();
+	void updateVisibility(bool buttonShown);
+	void updateGeometry();
+	void raise();
+
+private:
+	const not_null<Ui::RpWidget*> _button;
+	const base::const_string _prefKey;
+	const Fn<int()> _widthProvider;
+	base::unique_qptr<Ui::ImportantTooltip> _tooltip;
+	bool _shown = false;
+
+};
+
+using AiTooltipManager = ComposeTooltipManager;
+
+} // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 47d0b9b6a227fb..a7878140fc6d74 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -9,26 +9,36 @@ For license and copyright information please follow this link:
 
 #include "base/call_delayed.h"
 #include "base/event_filter.h"
+#include "base/options.h"
 #include "base/platform/base_platform_info.h"
 #include "base/qt_signal_producer.h"
+#include "base/random.h"
 #include "base/timer_rpl.h"
 #include "base/unixtime.h"
+#include "boxes/compose_ai_box.h"
 #include "boxes/edit_caption_box.h"
+#include "boxes/send_files_box.h"
+#include "boxes/send_gif_with_caption_box.h"
+#include "calls/group/ui/calls_group_stars_coloring.h"
+#include "calls/group/calls_group_stars_box.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "chat_helpers/message_field.h"
-#include "menu/menu_send.h"
 #include "chat_helpers/tabbed_panel.h"
 #include "chat_helpers/tabbed_section.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "chat_helpers/field_autocomplete.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "core/shortcuts.h"
 #include "core/ui_integration.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_changes.h"
 #include "data/data_drafts.h"
+#include "data/data_group_call.h"
 #include "data/data_messages.h"
+#include "data/data_message_reactions.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_chat.h"
@@ -36,7 +46,10 @@ For license and copyright information please follow this link:
 #include "data/data_file_origin.h"
 #include "data/data_forum_topic.h"
 #include "data/data_peer_values.h"
+#include "data/data_document.h"
+#include "data/data_photo.h"
 #include "data/data_photo_media.h"
+#include "data/data_poll.h"
 #include "data/data_premium_limits.h" // Data::PremiumLimits.
 #include "data/stickers/data_stickers.h"
 #include "data/stickers/data_custom_emoji.h"
@@ -44,29 +57,42 @@ For license and copyright information please follow this link:
 #include "storage/storage_account.h"
 #include "apiwrap.h"
 #include "api/api_chat_participants.h"
+#include "api/api_compose_with_ai.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/color_int_conversion.h"
 #include "ui/painter.h"
 #include "ui/power_saving.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/view/controls/history_view_characters_limit.h"
+#include "history/view/controls/history_view_compose_ai_button.h"
+#include "history/view/controls/history_view_compose_ai_tooltip.h"
 #include "history/view/controls/history_view_compose_media_edit_manager.h"
 #include "history/view/controls/history_view_forward_panel.h"
 #include "history/view/controls/history_view_draft_options.h"
-#include "history/view/controls/history_view_voice_record_bar.h"
+#include "history/view/controls/history_view_suggest_options.h"
 #include "history/view/controls/history_view_ttl_button.h"
+#include "history/view/controls/history_view_voice_record_bar.h"
 #include "history/view/controls/history_view_webpage_processor.h"
 #include "history/view/history_view_reply.h"
+#include "history/view/history_view_schedule_box.h"
 #include "history/view/history_view_webpage_preview.h"
 #include "inline_bots/bot_attach_web_view.h"
 #include "inline_bots/inline_results_widget.h"
 #include "inline_bots/inline_bot_result.h"
+#ifdef TDESKTOP_IV_EDITOR
+#include "iv/editor/iv_editor_session.h"
+#endif // TDESKTOP_IV_EDITOR
 #include "lang/lang_keys.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
+#include "main/main_session_settings.h"
 #include "main/session/send_as_peers.h"
 #include "media/audio/media_audio_capture.h"
 #include "media/audio/media_audio.h"
-#include "settings/settings_premium.h"
+#include "menu/menu_checked_action.h"
+#include "menu/menu_send.h"
+#include "settings/sections/settings_premium.h"
 #include "ui/item_text_options.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
@@ -75,17 +101,23 @@ For license and copyright information please follow this link:
 #include "ui/widgets/dropdown_menu.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/text/format_values.h"
+#include "ui/controls/compose_ai_button_factory.h"
 #include "ui/controls/emoji_button.h"
 #include "ui/controls/send_button.h"
 #include "ui/controls/send_as_button.h"
 #include "ui/controls/silent_toggle.h"
 #include "ui/chat/choose_send_as.h"
 #include "ui/effects/spoiler_mess.h"
+#include "ui/effects/reaction_fly_animation.h"
+#include "webrtc/webrtc_environment.h"
 #include "window/window_adaptive.h"
+#include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
 #include "mainwindow.h"
+#include "styles/style_calls.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h"
 #include "styles/style_menu_icons.h"
 
 namespace HistoryView {
@@ -100,12 +132,27 @@ constexpr auto kMouseEvents = {
 	QEvent::MouseButtonRelease
 };
 constexpr auto kRefreshSlowmodeLabelTimeout = crl::time(200);
+constexpr auto kMaxStarSendEffects = 4;
+constexpr auto kMaxStarEffects = 4;
+constexpr auto kStarEffectDuration = 2 * crl::time(1000);
+constexpr auto kStarEffectRotationMax = 12;
+constexpr auto kStarEffectScaleMin = 0.3;
+constexpr auto kStarEffectScaleMax = 0.7;
 
 constexpr auto kCommonModifiers = 0
 	| Qt::ShiftModifier
 	| Qt::MetaModifier
 	| Qt::ControlModifier;
 
+base::options::toggle MacCmdReplyImmediately({
+	.id = Controls::kOptionMacCmdReplyImmediately,
+	.name = "Mac: instant reply on Cmd + Up/Down",
+	.description = "Reply to the previous or next message right away on "
+		"Cmd + Up/Down, instead of first moving the text cursor to the start "
+		"or end of the input field. Hold Shift to move the cursor as before.",
+	.scope = base::options::macos,
+});
+
 using FileChosen = ComposeControls::FileChosen;
 using PhotoChosen = ComposeControls::PhotoChosen;
 using MessageToEdit = ComposeControls::MessageToEdit;
@@ -117,6 +164,10 @@ using ForwardPanel = Controls::ForwardPanel;
 
 } // namespace
 
+namespace Controls {
+const char kOptionMacCmdReplyImmediately[] = "mac-cmd-reply-immediately";
+} // namespace Controls
+
 const ChatHelpers::PauseReason kDefaultPanelsLevel
 	= ChatHelpers::PauseReason::TabbedPanel;
 
@@ -131,7 +182,10 @@ class FieldHeader final : public Ui::RpWidget {
 	void updateTopicRootId(MsgId topicRootId);
 	void init();
 
-	void editMessage(FullMsgId id, bool photoEditAllowed = false);
+	void editMessage(
+		FullMsgId id,
+		SuggestOptions suggest,
+		bool photoEditAllowed = false);
 	void replyToMessage(FullReplyTo id);
 	void updateForwarding(
 		Data::Thread *thread,
@@ -145,6 +199,7 @@ class FieldHeader final : public Ui::RpWidget {
 	[[nodiscard]] bool isEditingMessage() const;
 	[[nodiscard]] bool readyToForward() const;
 	[[nodiscard]] const HistoryItemsList &forwardItems() const;
+	[[nodiscard]] const Data::ResolvedForwardDraft &forwardDraft() const;
 	[[nodiscard]] FullReplyTo replyingToMessage() const;
 	[[nodiscard]] FullMsgId editMsgId() const;
 	[[nodiscard]] rpl::producer<FullMsgId> editMsgIdValue() const;
@@ -155,6 +210,7 @@ class FieldHeader final : public Ui::RpWidget {
 	[[nodiscard]] SendMenu::Details saveMenuDetails(bool hasSendText) const;
 
 	[[nodiscard]] FullReplyTo getDraftReply() const;
+	[[nodiscard]] SuggestOptions suggestOptions() const;
 	[[nodiscard]] rpl::producer<> editCancelled() const {
 		return _editCancelled.events();
 	}
@@ -167,6 +223,9 @@ class FieldHeader final : public Ui::RpWidget {
 	[[nodiscard]] rpl::producer<> previewCancelled() const {
 		return _previewCancelled.events();
 	}
+	[[nodiscard]] rpl::producer<> saveDraftRequests() const {
+		return _saveDraftRequests.events();
+	}
 
 	[[nodiscard]] rpl::producer<bool> visibleChanged();
 
@@ -184,6 +243,9 @@ class FieldHeader final : public Ui::RpWidget {
 
 	bool hasPreview() const;
 
+	void applySuggestOptions(SuggestOptions suggest, SuggestMode mode);
+	void cancelSuggestPost();
+
 	struct Preview {
 		Controls::WebpageParsed parsed;
 		Ui::Text::String title;
@@ -195,17 +257,20 @@ class FieldHeader final : public Ui::RpWidget {
 
 	History *_history = nullptr;
 	MsgId _topicRootId = 0;
+	PeerId _monoforumPeerId = 0;
 
 	Preview _preview;
 	rpl::event_stream<> _editCancelled;
 	rpl::event_stream<> _replyCancelled;
 	rpl::event_stream<> _forwardCancelled;
 	rpl::event_stream<> _previewCancelled;
+	rpl::event_stream<> _saveDraftRequests;
 	rpl::lifetime _previewLifetime;
 
 	rpl::variable<FullMsgId> _editMsgId;
 	rpl::variable<FullReplyTo> _replyTo;
 	std::unique_ptr<ForwardPanel> _forwardPanel;
+	std::unique_ptr<SuggestOptionsBar> _suggestOptions;
 	rpl::producer<> _toForwardUpdated;
 
 	HistoryItem *_shownMessage = nullptr;
@@ -245,6 +310,7 @@ FieldHeader::FieldHeader(
 	std::make_unique<ForwardPanel>([=] { customEmojiRepaint(); }))
 , _data(&_show->session().data())
 , _cancel(Ui::CreateChild<Ui::IconButton>(this, st::historyReplyCancel)) {
+	_cancel->setAccessibleName(tr::lng_cancel(tr::now));
 	resize(QSize(parent->width(), st::historyReplyHeight));
 	init();
 }
@@ -252,6 +318,7 @@ FieldHeader::FieldHeader(
 void FieldHeader::setHistory(const SetHistoryArgs &args) {
 	_history = *args.history;
 	_topicRootId = args.topicRootId;
+	_monoforumPeerId = args.monoforumPeerId;
 }
 
 void FieldHeader::updateTopicRootId(MsgId topicRootId) {
@@ -260,55 +327,57 @@ void FieldHeader::updateTopicRootId(MsgId topicRootId) {
 
 void FieldHeader::init() {
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		updateControlsGeometry(size);
 	}, lifetime());
 
 	_forwardPanel->itemsUpdated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateVisible();
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		p.setInactive(_show->paused(Window::GifPauseReason::Any));
 		p.fillRect(rect(), st::historyComposeAreaBg);
 
 		const auto position = st::historyReplyIconPosition;
-		if (_preview.parsed) {
+		if (_suggestOptions) {
+			_suggestOptions->paintIcon(p, 0, 0, width());
+		} else if (_preview.parsed) {
 			st::historyLinkIcon.paint(p, position, width());
 		} else if (isEditingMessage()) {
 			st::historyEditIcon.paint(p, position, width());
-		} else if (readyToForward()) {
-			st::historyForwardIcon.paint(p, position, width());
-		} else if (const auto reply = replyingToMessage()) {
+		} else if (const auto reply = replyingToMessage(); reply.replying()) {
 			if (!reply.quote.empty()) {
 				st::historyQuoteIcon.paint(p, position, width());
 			} else {
 				st::historyReplyIcon.paint(p, position, width());
 			}
+		} else if (readyToForward()) {
+			st::historyForwardIcon.paint(p, position, width());
 		}
 
 		if (_preview.parsed) {
 			paintWebPage(
 				p,
 				_history ? _history->peer : _data->session().user());
-		} else if (isEditingMessage() || !readyToForward()) {
+		} else if (isEditingMessage() || replyingToMessage()) {
 			paintEditOrReplyToMessage(p);
-		} else {
+		} else if (readyToForward()) {
 			paintForwardInfo(p);
 		}
 	}, lifetime());
 
 	_editMsgId.value(
-	) | rpl::start_with_next([=](FullMsgId value) {
+	) | rpl::on_next([=](FullMsgId value) {
 		const auto shown = value ? value : _replyTo.current().messageId;
 		setShownMessage(_data->message(shown));
 	}, lifetime());
 
 	_replyTo.value(
-	) | rpl::start_with_next([=](const FullReplyTo &value) {
+	) | rpl::on_next([=](const FullReplyTo &value) {
 		if (!_editMsgId.current()) {
 			setShownMessage(_data->message(value.messageId));
 		}
@@ -319,7 +388,7 @@ void FieldHeader::init() {
 		| Data::MessageUpdate::Flag::Destroyed
 	) | rpl::filter([=](const Data::MessageUpdate &update) {
 		return (update.item == _shownMessage);
-	}) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	}) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		if (update.flags & Data::MessageUpdate::Flag::Destroyed) {
 			if (_editMsgId.current() == update.item->fullId()) {
 				_editCancelled.fire({});
@@ -338,10 +407,10 @@ void FieldHeader::init() {
 			_previewCancelled.fire({});
 		} else if (_editMsgId.current()) {
 			_editCancelled.fire({});
-		} else if (readyToForward()) {
-			_forwardCancelled.fire({});
 		} else if (_replyTo.current()) {
 			_replyCancelled.fire({});
+		} else if (readyToForward()) {
+			_forwardCancelled.fire({});
 		}
 		updateVisible();
 		update();
@@ -357,7 +426,7 @@ void FieldHeader::init() {
 				|| readyToForward()
 				|| replyingToMessage()
 				|| _preview.parsed);
-	}) | rpl::start_with_next([=](not_null<QEvent*> event) {
+	}) | rpl::on_next([=](not_null<QEvent*> event) {
 		const auto updateOver = [&](bool inClickable, bool inPhotoEdit) {
 			if (_inClickable != inClickable) {
 				_inClickable = inClickable;
@@ -380,7 +449,7 @@ void FieldHeader::init() {
 			return;
 		}
 		const auto e = static_cast<QMouseEvent*>(event.get());
-		const auto pos = e ? e->pos() : mapFromGlobal(QCursor::pos());
+		const auto pos = e->pos();
 		const auto inPreviewRect = _clickableRect.contains(pos);
 		const auto inPhotoEdit = _shownMessageHasPreview
 			&& _photoEditAllowed
@@ -399,15 +468,16 @@ void FieldHeader::init() {
 				if (_preview.parsed) {
 					_editOptionsRequests.fire({});
 				} else if (isEditingMessage()) {
-					_jumpToItemRequests.fire(FullReplyTo{
-						.messageId = _editMsgId.current()
-					});
-				} else if (readyToForward()) {
-					_forwardPanel->editOptions(_show);
-				} else if (reply
-					&& (e->modifiers() & Qt::ControlModifier)) {
+					if (_suggestOptions) {
+						_suggestOptions->edit();
+					} else {
+						_jumpToItemRequests.fire(FullReplyTo{
+							.messageId = _editMsgId.current()
+						});
+					}
+				} else if (reply && (e->modifiers() & Qt::ControlModifier)) {
 					_jumpToItemRequests.fire_copy(reply);
-				} else if (reply) {
+				} else if (reply || readyToForward()) {
 					_editOptionsRequests.fire({});
 				}
 			} else if (!isLeftButton) {
@@ -418,6 +488,8 @@ void FieldHeader::init() {
 						_hasSendText());
 				} else if (const auto reply = replyingToMessage()) {
 					_jumpToItemRequests.fire_copy(reply);
+				} else if (readyToForward()) {
+					_forwardPanel->editToNextOption();
 				}
 			}
 		}
@@ -427,10 +499,10 @@ void FieldHeader::init() {
 void FieldHeader::updateShownMessageText() {
 	Expects(_shownMessage != nullptr);
 
-	const auto context = Core::MarkedTextContext{
+	const auto context = Core::TextContext({
 		.session = &_data->session(),
-		.customEmojiRepaint = [=] { customEmojiRepaint(); },
-	};
+		.repaint = [=] { customEmojiRepaint(); },
+	});
 	const auto reply = replyingToMessage();
 	_shownMessageText.setMarkedText(
 		st::messageTextStyle,
@@ -463,16 +535,14 @@ void FieldHeader::setShownMessage(HistoryItem *item) {
 			tr::lng_edit_message(tr::now),
 			Ui::NameTextOptions());
 	} else if (item) {
-		const auto context = Core::MarkedTextContext{
+		const auto context = Core::TextContext({
 			.session = &_history->session(),
-			.customEmojiRepaint = [] {},
 			.customEmojiLoopLimit = 1,
-		};
+		});
 		const auto replyTo = _replyTo.current();
-		const auto quote = replyTo && !replyTo.quote.empty();
 		_shownMessageName.setMarkedText(
 			st::fwdTextStyle,
-			HistoryView::Reply::ComposePreviewName(_history, item, quote),
+			HistoryView::Reply::ComposePreviewName(_history, item, replyTo),
 			Ui::NameTextOptions(),
 			context);
 	} else {
@@ -514,7 +584,7 @@ void FieldHeader::previewReady(
 
 	std::move(
 		parsed
-	) | rpl::start_with_next([=](Controls::WebpageParsed parsed) {
+	) | rpl::on_next([=](Controls::WebpageParsed parsed) {
 		_preview.parsed = std::move(parsed);
 		_preview.title.setText(
 			st::msgNameStyle,
@@ -593,10 +663,27 @@ void FieldHeader::paintEditOrReplyToMessage(Painter &p) {
 	}
 
 	const auto media = _shownMessage->media();
-	_shownMessageHasPreview = media && media->hasReplyPreview();
+	const auto poll = media ? media->poll() : nullptr;
+	const auto reply = replyingToMessage();
+	const auto pollAnswer = poll
+		? poll->answerByOption(reply.pollOption)
+		: nullptr;
+	const auto pollMediaPtr = pollAnswer
+		? &pollAnswer->media
+		: (poll && reply.pollOption.isEmpty())
+		? &poll->attachedMedia
+		: nullptr;
+	const auto pollMediaHasPreview = pollMediaPtr
+		&& (pollMediaPtr->photo || pollMediaPtr->document);
+	_shownMessageHasPreview = pollMediaHasPreview
+		|| (media && media->hasReplyPreview());
 	const auto preview = _mediaEditManager
 		? _mediaEditManager.mediaPreview()
-		: _shownMessageHasPreview
+		: pollMediaHasPreview
+		? (pollMediaPtr->photo
+			? pollMediaPtr->photo->getReplyPreview(_shownMessage)
+			: pollMediaPtr->document->getReplyPreview(_shownMessage))
+		: (media && media->hasReplyPreview())
 		? media->replyPreview()
 		: nullptr;
 	const auto spoilered = _mediaEditManager.spoilered();
@@ -643,7 +730,11 @@ void FieldHeader::paintEditOrReplyToMessage(Painter &p) {
 			st::historyEditMedia.paintInCenter(p, to);
 			p.setOpacity(1.);
 		}
+	}
 
+	if (_suggestOptions) {
+		_suggestOptions->paintLines(p, textLeft, 0, width());
+		return;
 	}
 
 	p.setPen(st::historyReplyNameFg);
@@ -712,6 +803,10 @@ const HistoryItemsList &FieldHeader::forwardItems() const {
 	return _forwardPanel->items();
 }
 
+const Data::ResolvedForwardDraft &FieldHeader::forwardDraft() const {
+	return _forwardPanel->draft();
+}
+
 FullReplyTo FieldHeader::replyingToMessage() const {
 	return _replyTo.current();
 }
@@ -726,6 +821,12 @@ FullReplyTo FieldHeader::getDraftReply() const {
 		: _replyTo.current();
 }
 
+SuggestOptions FieldHeader::suggestOptions() const {
+	return _suggestOptions
+		? _suggestOptions->values()
+		: SuggestOptions();
+}
+
 void FieldHeader::updateControlsGeometry(QSize size) {
 	_cancel->moveToRight(0, 0);
 	_clickableRect = QRect(
@@ -740,22 +841,58 @@ void FieldHeader::updateControlsGeometry(QSize size) {
 		st::historyReplyPreview);
 }
 
-void FieldHeader::editMessage(FullMsgId id, bool photoEditAllowed) {
+void FieldHeader::editMessage(
+		FullMsgId id,
+		SuggestOptions suggest,
+		bool photoEditAllowed) {
 	_photoEditAllowed = photoEditAllowed;
 	_editMsgId = id;
 	if (!id) {
 		_mediaEditManager.cancel();
-	} else if (const auto item = _show->session().data().message(id)) {
+	} else if (const auto item = _show->session().data().message(id);
+			item && !item->richPage()) {
 		_mediaEditManager.start(item);
+	} else {
+		_mediaEditManager.cancel();
 	}
 	if (!photoEditAllowed) {
 		_inPhotoEdit = false;
 		_inPhotoEditOver.stop();
 	}
+	if (id && suggest) {
+		applySuggestOptions(suggest, SuggestMode::Change);
+	} else {
+		cancelSuggestPost();
+	}
 	update();
 }
 
+void FieldHeader::applySuggestOptions(
+		SuggestOptions suggest,
+		SuggestMode mode) {
+	Expects(suggest.exists);
+
+	using namespace HistoryView;
+	_suggestOptions = std::make_unique<SuggestOptionsBar>(
+		_show,
+		_history->peer,
+		suggest,
+		mode);
+	_suggestOptions->updates() | rpl::on_next([=] {
+		update();
+		_saveDraftRequests.fire({});
+	}, _suggestOptions->lifetime());
+}
+
+void FieldHeader::cancelSuggestPost() {
+	if (!_suggestOptions) {
+		return;
+	}
+	_suggestOptions = nullptr;
+}
+
 void FieldHeader::replyToMessage(FullReplyTo id) {
+	id.monoforumPeerId = 0;
 	_replyTo = id;
 }
 
@@ -763,9 +900,6 @@ void FieldHeader::updateForwarding(
 		Data::Thread *thread,
 		Data::ResolvedForwardDraft items) {
 	_forwardPanel->update(thread, std::move(items));
-	if (readyToForward()) {
-		replyToMessage({});
-	}
 	updateControlsGeometry(size());
 }
 
@@ -796,17 +930,102 @@ MessageToEdit FieldHeader::queryToEdit() {
 			.scheduled = item->isScheduled() ? item->date() : 0,
 			.shortcutId = item->shortcutId(),
 			.invertCaption = _mediaEditManager.invertCaption(),
+			.suggest = suggestOptions(),
 		},
 		.spoilered = _mediaEditManager.spoilered(),
 	};
 }
 
 SendMenu::Details FieldHeader::saveMenuDetails(bool hasSendText) const {
+	const auto item = _data->message(_editMsgId.current());
 	return isEditingMessage()
+		&& item
+		&& !item->richPage()
 		? _mediaEditManager.sendMenuDetails(hasSendText)
 		: SendMenu::Details();
 }
 
+struct ComposeControls::StarEffect {
+	StarEffect(
+		not_null<Ui::RpWidget*> canvas,
+		SendStarButtonEffect effect);
+
+	Ui::ReactionFlyAnimation around;
+	Ui::PeerUserpicView userpic;
+	QImage badge;
+	not_null<PeerData*> from;
+	crl::time start = 0;
+	float64 shift = 0.;
+	float64 progress = 0.;
+	int stars = 0;
+};
+
+ComposeControls::StarEffect::StarEffect(
+	not_null<Ui::RpWidget*> canvas,
+	SendStarButtonEffect effect)
+: around(
+	&effect.from->owner().reactions(),
+	Ui::ReactionFlyAnimationArgs{
+		.id = Data::ReactionId::Paid(),
+		.effectOnly = true,
+	},
+	[canvas] { canvas->update(); },
+	st::reactionInlineImage)
+, from(effect.from)
+, start(crl::now())
+, stars(effect.stars) {
+	auto price = Ui::Text::String(
+		st::whoReadDateStyle,
+		Ui::Text::IconEmoji(
+			&st::starIconEmojiSmall
+		).append(Lang::FormatCountDecimal(stars)),
+		kMarkupTextOptions);
+	const auto padding = st::groupCallEffectPadding;
+	const auto priceHeight = st::whoReadDateStyle.font->height;
+	const auto priceTop = padding.top();
+	const auto height = priceTop + priceHeight + padding.bottom();
+
+	const auto userpicPadding = st::groupCallEffectUserpicPadding;
+	const auto userpicSize = height
+		- userpicPadding.top()
+		- userpicPadding.bottom();
+
+	const auto leftSkip = userpicPadding.left()
+		+ userpicSize
+		+ userpicPadding.right();
+	const auto widthSkip = leftSkip + padding.right();
+
+	const auto width = widthSkip + price.maxWidth();
+	const auto priceLeft = leftSkip;
+
+	const auto ratio = style::DevicePixelRatio();
+	badge = QImage(
+		QSize(width, height) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	badge.fill(Qt::transparent);
+	badge.setDevicePixelRatio(ratio);
+
+	auto p = QPainter(&badge);
+	auto hq = PainterHighQualityEnabler(p);
+	const auto bg = Ui::ColorFromSerialized(StarsColoringForCount(
+		from->session().appConfig().groupCallColorings(),
+		stars).bgLight);
+	p.setPen(Qt::NoPen);
+	p.setBrush(bg);
+	p.drawRoundedRect(0, 0, width, height, height / 2., height / 2.);
+	from->paintUserpic(p, userpic, PaintUserpicContext{
+		.position = QPoint(userpicPadding.left(), userpicPadding.top()),
+		.size = userpicSize,
+		.shape = Ui::PeerUserpicShape::Circle,
+	});
+	p.setPen(st::white);
+	price.draw(p, {
+		.position = QPoint(priceLeft, priceTop),
+		.availableWidth = price.maxWidth(),
+	});
+	shift = base::RandomIndex(360) / 360.;
+}
+
 ComposeControls::ComposeControls(
 	not_null<Ui::RpWidget*> parent,
 	ComposeControlsDescriptor descriptor)
@@ -829,19 +1048,32 @@ ComposeControls::ComposeControls(
 			.show = _show,
 			.st = _st.tabbed,
 			.level = descriptor.panelsLevel,
-			.mode = ChatHelpers::TabbedSelector::Mode::Full,
+			.mode = (_features.emojiOnlyPanel
+				? ChatHelpers::TabbedSelector::Mode::EmojiOnly
+				: ChatHelpers::TabbedSelector::Mode::Full),
 			.features = _features,
 		}))
 , _selector((_regularWindow && _features.commonTabbedPanel)
 	? _regularWindow->tabbedSelector()
 	: not_null(_ownedSelector.get()))
 , _mode(descriptor.mode)
-, _wrap(std::make_unique<Ui::RpWidget>(parent))
+, _wrap(std::make_unique<Ui::RpWidget>(_parent))
 , _send(std::make_shared<Ui::SendButton>(_wrap.get(), _st.send))
+, _aiButton(Ui::CreateChild<Controls::ComposeAiButton>(
+	_wrap.get(),
+	st::historyAiComposeButton))
+, _sendAsFile(_features.attachments
+	? Ui::CreateChild<Ui::IconButton>(
+		_wrap.get(),
+		st::historySendAsFileButton)
+	: nullptr)
 , _like(_features.likes
 	? Ui::CreateChild<Ui::IconButton>(_wrap.get(), _st.like)
 	: nullptr)
-, _attachToggle(Ui::CreateChild<Ui::IconButton>(_wrap.get(), _st.attach))
+, _chosenStarsCount(_features.editMessageStars ? 0 : std::optional<int>())
+, _attachToggle(_features.attachments
+	? Ui::CreateChild<Ui::IconButton>(_wrap.get(), _st.attach)
+	: nullptr)
 , _tabbedSelectorToggle(Ui::CreateChild<Ui::EmojiButton>(
 	_wrap.get(),
 	_st.emoji))
@@ -866,7 +1098,7 @@ ComposeControls::ComposeControls(
 , _voiceRecordBar(std::make_unique<VoiceRecordBar>(
 	_wrap.get(),
 	Controls::VoiceRecordBarDescriptor{
-		.outerContainer = parent,
+		.outerContainer = _parent,
 		.show = _show,
 		.send = _send,
 		.customCancelText = descriptor.voiceCustomCancelText,
@@ -889,7 +1121,7 @@ ComposeControls::ComposeControls(
 	if (descriptor.scheduledToggleValue) {
 		std::move(
 			descriptor.scheduledToggleValue
-		) | rpl::start_with_next([=](bool hasScheduled) {
+		) | rpl::on_next([=](bool hasScheduled) {
 			if (!_scheduled && hasScheduled) {
 				_scheduled = base::make_unique_q<Ui::IconButton>(
 					_wrap.get(),
@@ -941,6 +1173,7 @@ void ComposeControls::updateShortcutId(BusinessShortcutId shortcutId) {
 void ComposeControls::setHistory(SetHistoryArgs &&args) {
 	_showSlowmodeError = std::move(args.showSlowmodeError);
 	_sendActionFactory = std::move(args.sendActionFactory);
+	_sendWithText = std::move(args.sendWithText);
 	_slowmodeSecondsLeft = rpl::single(0)
 		| rpl::then(std::move(args.slowmodeSecondsLeft));
 	_sendDisabledBySlowmode = rpl::single(false)
@@ -948,6 +1181,9 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 	_liked = args.liked ? std::move(args.liked) : rpl::single(false);
 	_writeRestriction = rpl::single(Controls::WriteRestriction())
 		| rpl::then(std::move(args.writeRestriction));
+	_minStarsCount = args.minStarsCount
+		? std::move(args.minStarsCount)
+		: rpl::single(0);
 	const auto history = *args.history;
 	if (_history == history) {
 		return;
@@ -955,6 +1191,7 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 	unregisterDraftSources();
 	_history = history;
 	_topicRootId = args.topicRootId;
+	_monoforumPeerId = args.monoforumPeerId;
 	_historyLifetime.destroy();
 	_header->setHistory(args);
 	registerDraftSource();
@@ -977,11 +1214,11 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 		return;
 	}
 	const auto peer = _history->peer;
-	initSendAsButton(peer);
+	initSendAsButton(peer, args.videoStream);
 	if (peer->isChat() && peer->asChat()->noParticipantInfo()) {
 		session().api().requestFullPeer(peer);
 	} else if (const auto channel = peer->asMegagroup()) {
-		if (!channel->mgInfo->botStatus) {
+		if (channel->mgInfo->botStatus == Data::BotStatus::Unknown) {
 			session().api().chatParticipants().requestBots(channel);
 		}
 	} else if (hasSilentBroadcastToggle()) {
@@ -992,12 +1229,137 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 	session().local().readDraftsWithCursors(_history);
 	applyDraft();
 	orderControls();
+	_field->setMode(args.videoStream
+		? Ui::InputField::Mode::NoNewlines
+		: Ui::InputField::Mode::MultiLine);
+}
+
+void ComposeControls::initLikeButton() {
+	if (_like) {
+		_like->setClickedCallback([=] { _likeToggled.fire({}); });
+		_liked.value(
+		) | rpl::on_next([=](bool liked) {
+			const auto icon = liked ? &_st.liked : nullptr;
+			_like->setIconOverride(icon, icon);
+		}, _like->lifetime());
+	}
+}
+
+void ComposeControls::initEditStarsButton() {
+	if (!editStarsButtonShown()) {
+		delete base::take(_editStars);
+		if (_chosenStarsCount) {
+			_chosenStarsCount = std::nullopt;
+			updateSendButtonType();
+		}
+		return;
+	}
+	if (_chosenStarsCount.value_or(0) < _minStarsCount.current()) {
+		_chosenStarsCount = _minStarsCount.current();
+		updateSendButtonType();
+	}
+	if (_editStars) {
+		return;
+	}
+	_editStars = Ui::CreateChild<Ui::IconButton>(
+		_wrap.get(),
+		_st.editStars);
+	_editStars->show();
+	_editStars->setClickedCallback([=] {
+		editStarsFrom();
+	});
+}
+
+void ComposeControls::editStarsFrom(int selected) {
+	const auto min = _minStarsCount.current();
+	if (!selected) {
+		selected = _chosenStarsCount.value_or(0);
+	}
+	_show->show(Calls::Group::MakeVideoStreamStarsBox({
+		.show = _show,
+		.min = min,
+		.current = std::max(selected, min),
+		.save = crl::guard(_editStars, [=](int count) {
+			_chosenStarsCount = count;
+			updateSendButtonType();
+		}),
+		.name = _history ? _history->peer->shortName() : QString(),
+	}));
+}
+
+void ComposeControls::updateControlsParents() {
+	const auto toggle = [&](auto &&control, bool inRestriction) {
+		if (!control) {
+			return;
+		}
+		const auto hidden = control->isHidden();
+		if (_writeRestricted && inRestriction) {
+			control->setParent(_writeRestricted.get());
+		} else {
+			control->setParent(_wrap.get());
+		}
+		if (!hidden) {
+			control->show();
+			updateControlsGeometry(_wrap->size());
+		}
+	};
+	using Type = Controls::WriteRestrictionType;
+	const auto &restriction = _writeRestriction.current();
+	toggle(_like, restriction.type == Type::PremiumRequired);
+	toggle(_commentsShown, restriction.type != Type::None);
+	toggle(_starsReaction, restriction.type != Type::None);
+}
+
+void ComposeControls::updateFeatures(ChatHelpers::ComposeFeatures features) {
+	auto changed = false;
+	const auto was = std::exchange(_features, features);
+	if (was.likes != features.likes) {
+		if (!features.likes) {
+			delete base::take(_like);
+			_likeShown = false;
+		} else {
+			_like = Ui::CreateChild<Ui::IconButton>(_wrap.get(), _st.like);
+			initLikeButton();
+			updateControlsParents();
+			if (updateLikeShown()) {
+				updateControlsVisibility();
+			}
+		}
+		changed = true;
+	}
+	if (was.editMessageStars != features.editMessageStars) {
+		initEditStarsButton();
+		changed = true;
+	}
+	if (was.recordMediaMessage != features.recordMediaMessage) {
+		clearChosenStarsForMessage();
+	}
+	if (was.attachments != features.attachments) {
+		if (!features.attachments) {
+			delete base::take(_attachToggle);
+		} else {
+			_attachToggle = Ui::CreateChild<Ui::IconButton>(
+				_wrap.get(),
+				_st.attach);
+			updateControlsVisibility();
+		}
+		updateAttachBotsMenu();
+		changed = true;
+	}
+	if (was.emojiOnlyPanel != features.emojiOnlyPanel) {
+		initFieldAutocomplete();
+	}
+	if (changed) {
+		updateControlsGeometry(_wrap->size());
+	}
 }
 
 void ComposeControls::setCurrentDialogsEntryState(
 		Dialogs::EntryState state) {
 	unregisterDraftSources();
 	state.currentReplyTo.topicRootId = _topicRootId;
+	state.currentReplyTo.monoforumPeerId = _monoforumPeerId;
+	state.currentSuggest = SuggestOptions();
 	_currentDialogsEntryState = state;
 	updateForwarding();
 	registerDraftSource();
@@ -1033,13 +1395,15 @@ void ComposeControls::setAutocompleteBoundingRect(QRect rect) {
 rpl::producer<int> ComposeControls::height() const {
 	using namespace rpl::mappers;
 	return rpl::conditional(
-		_writeRestriction.value() | rpl::map(!_1),
+		rpl::combine(
+			_writeRestriction.value(),
+			_hidden.value()) | rpl::map(!_1 && !_2),
 		_wrap->heightValue(),
 		rpl::single(_st.attach.height));
 }
 
 int ComposeControls::heightCurrent() const {
-	return _writeRestriction.current()
+	return (_writeRestriction.current() || _hidden.current())
 		? _st.attach.height
 		: _wrap->height();
 }
@@ -1048,10 +1412,338 @@ const HistoryItemsList &ComposeControls::forwardItems() const {
 	return _header->forwardItems();
 }
 
+void ComposeControls::setupCommentsShownNewDot() {
+	if (_commentsShownNewDot) {
+		return;
+	}
+	_commentsShownNewDot = Ui::CreateChild<Ui::RpWidget>(
+		_commentsShown);
+	_commentsShownNewDot->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	const auto size = _st.commentsUnreadSize;
+	const auto add = _st.commentsUnreadMargin;
+	const auto full = size + 2 * add;
+	_commentsShownNewDot->setGeometry(
+		QRect(_st.commentsUnreadPosition, QSize(full, full)));
+	_commentsShownNewDot->show();
+	_commentsShownNewDot->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(_commentsShownNewDot);
+		auto hq = PainterHighQualityEnabler(p);
+
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::groupCallMembersBg);
+		p.drawEllipse(_commentsShownNewDot->rect());
+		p.setBrush(st::attentionButtonFg);
+		p.drawEllipse(add, add, size, size);
+	}, _commentsShownNewDot->lifetime());
+}
+
+void ComposeControls::setToggleCommentsButton(
+		rpl::producer<ToggleCommentsState> state) {
+	if (!state) {
+		delete base::take(_commentsShown);
+	} else {
+		_commentsShown = Ui::CreateChild<Ui::IconButton>(
+			_wrap.get(),
+			_st.commentsShow);
+		_commentsShown->setClickedCallback([=] {
+			_commentsShownToggles.fire({});
+		});
+		updateControlsParents();
+		_commentsShownHidden.value(
+		) | rpl::on_next([=](bool hidden) {
+			if (_commentsShown->isHidden() != hidden) {
+				if (hidden) {
+					_commentsShown->hide();
+				} else {
+					_commentsShown->show();
+					updateControlsGeometry(_wrap->size());
+				}
+			}
+		}, _commentsShown->lifetime());
+		std::move(
+			state
+		) | rpl::on_next([=](ToggleCommentsState value) {
+			if (value == ToggleCommentsState::Empty) {
+				_commentsShownHidden = true;
+				return;
+			}
+			_commentsShownHidden = false;
+			const auto icon = (value == ToggleCommentsState::Shown)
+				? &_st.commentsShown
+				: nullptr;
+			_commentsShown->setIconOverride(icon, icon);
+			if (value == ToggleCommentsState::WithNew) {
+				setupCommentsShownNewDot();
+			} else {
+				delete base::take(_commentsShownNewDot);
+			}
+		}, _commentsShown->lifetime());
+	}
+	updateControlsVisibility();
+	updateControlsGeometry(_wrap->size());
+}
+
+rpl::producer<> ComposeControls::commentsShownToggles() const {
+	return _commentsShownToggles.events();
+}
+
+void ComposeControls::setStarsReactionCounter(
+		rpl::producer<Ui::SendStarButtonState> count,
+		rpl::producer<SendStarButtonEffect> effects) {
+	if (!count) {
+		delete base::take(_starsReaction);
+		updateControlsGeometry(_wrap->size());
+	} else {
+		_starsReaction = Ui::CreateChild<Ui::SendStarButton>(
+			_wrap.get(),
+			_st.attach,
+			_st.starsReactionCounter,
+			std::move(count));
+		updateControlsParents();
+		updateControlsVisibility();
+
+		_starsReaction->widthValue(
+		) | rpl::on_next([=](int width) {
+			updateControlsGeometry(_wrap->size());
+		}, _starsReaction->lifetime());
+
+		_starsReaction->setAcceptBoth();
+		_starsReaction->clicks(
+		) | rpl::on_next([=](Qt::MouseButton button) {
+			if (_chosenStarsCount && button == Qt::LeftButton) {
+				_starsReactionIncrements.fire({ .count = 1 });
+				startStarsSendEffect();
+			} else {
+				_show->show(Calls::Group::MakeVideoStreamStarsBox({
+					.show = _show,
+					.top = _starsReactionTop.current(),
+					.current = 0,
+					.sending = true,
+					.admin = !_chosenStarsCount,
+					.save = crl::guard(_starsReaction, [=](int count) {
+						_starsReactionIncrements.fire({
+							.count = count,
+							.fromBox = true,
+						});
+					}),
+					.name = _history ? _history->peer->shortName() : QString(),
+				}));
+			}
+		}, _starsReaction->lifetime());
+
+		std::move(
+			effects
+		) | rpl::on_next([=](const SendStarButtonEffect &event) {
+			startStarsEffect(event);
+		}, _starsReaction->lifetime());
+	}
+}
+
+void ComposeControls::startStarsSendEffect() {
+	if (!_starSendEffectsCanvas) {
+		setupStarsSendEffectsCanvas();
+	}
+	while (_starSendEffects.size() >= kMaxStarSendEffects) {
+		_starSendEffects.erase(begin(_starSendEffects));
+	}
+	_starSendEffects.push_back(std::make_unique<Ui::ReactionFlyAnimation>(
+		&_show->session().data().reactions(),
+		Ui::ReactionFlyAnimationArgs{
+			.id = Data::ReactionId::Paid(),
+			.effectOnly = true,
+		},
+		[raw = _starSendEffectsCanvas.get()] { raw->update(); },
+		st::reactionInlineImage));
+}
+
+void ComposeControls::setupStarsSendEffectsCanvas() {
+	_starSendEffectsCanvas = std::make_unique<Ui::RpWidget>(_parent);
+
+	const auto raw = _starSendEffectsCanvas.get();
+	raw->show();
+	raw->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	const auto effectSize = st::reactionInlineImage * 2;
+
+	rpl::combine(
+		_wrap->geometryValue(),
+		_writeRestricted->geometryValue(),
+		_starsReaction->geometryValue()
+	) | rpl::on_next([=](QRect wrap, QRect restriction, QRect star) {
+		const auto parent = (_starsReaction->parentWidget() == _wrap.get())
+			? wrap
+			: restriction;
+		const auto adjusted = star.translated(parent.topLeft());
+
+		raw->setGeometry(
+			adjusted.x() + (adjusted.width() - effectSize) / 2,
+			adjusted.y() + (adjusted.height() - effectSize) / 2,
+			effectSize,
+			effectSize);
+	}, raw->lifetime());
+
+	raw->paintRequest() | rpl::on_next([=] {
+		for (auto i = begin(_starSendEffects); i != end(_starSendEffects);) {
+			if ((*i)->finished()) {
+				i = _starSendEffects.erase(i);
+			} else {
+				++i;
+			}
+		}
+		if (_starSendEffects.empty()) {
+			crl::on_main(raw, [=] {
+				if (_starSendEffectsCanvas.get() == raw
+					&& _starSendEffects.empty()) {
+					_starSendEffectsCanvas = nullptr;
+				}
+			});
+			return;
+		}
+		auto p = QPainter(raw);
+		const auto now = crl::now();
+		const auto size = raw->width();
+		const auto color = st::radialFg->c;
+		const auto skip = (size - st::reactionInlineImage) / 2;
+		const auto target = QRect(
+			QPoint(skip, skip),
+			QSize(st::reactionInlineImage, st::reactionInlineImage));
+		for (const auto &animation : _starSendEffects) {
+			animation->paintGetArea(p, {}, target, color, {}, now);
+		}
+	}, raw->lifetime());
+}
+
+void ComposeControls::startStarsEffect(SendStarButtonEffect event) {
+	if (!_starEffectsCanvas) {
+		setupStarsEffectsCanvas();
+	}
+	while (_starEffects.size() >= kMaxStarEffects) {
+		_starEffects.erase(begin(_starEffects));
+	}
+	_starEffects.push_back(std::make_unique<StarEffect>(
+		_starEffectsCanvas.get(),
+		event));
+}
+
+void ComposeControls::setupStarsEffectsCanvas() {
+	_starEffectsCanvas = std::make_unique<Ui::RpWidget>(_parent);
+
+	const auto raw = _starEffectsCanvas.get();
+	raw->show();
+	raw->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	raw->lifetime().make_state<Ui::Animations::Basic>([=] {
+		raw->update();
+	})->start();
+
+	const auto effectSize = st::reactionInlineImage * 2;
+	const auto width = effectSize * 2;
+	const auto height = effectSize * 4;
+
+	rpl::combine(
+		_wrap->geometryValue(),
+		_writeRestricted->geometryValue(),
+		_starsReaction->geometryValue()
+	) | rpl::on_next([=](QRect wrap, QRect restriction, QRect star) {
+		const auto parent = (_starsReaction->parentWidget() == _wrap.get())
+			? wrap
+			: restriction;
+		const auto adjusted = star.translated(parent.topLeft());
+
+		raw->setGeometry(
+			adjusted.x() + (adjusted.width() - width) / 2,
+			adjusted.y() + adjusted.height() - height,
+			width,
+			height);
+	}, raw->lifetime());
+
+	raw->paintRequest() | rpl::on_next([=] {
+		const auto now = crl::now();
+		for (auto i = begin(_starEffects); i != end(_starEffects);) {
+			const auto progress = float64(now - (*i)->start)
+				/ kStarEffectDuration;
+			if (progress >= 1.) {
+				i = _starEffects.erase(i);
+			} else {
+				(*i)->progress = progress;
+				++i;
+			}
+		}
+		if (_starEffects.empty()) {
+			crl::on_main(raw, [=] {
+				if (_starEffectsCanvas.get() == raw
+					&& _starEffects.empty()) {
+					_starEffectsCanvas = nullptr;
+				}
+			});
+			return;
+		}
+		auto p = QPainter(raw);
+		auto hq = PainterHighQualityEnabler(p);
+		const auto color = st::radialFg->c;
+		const auto skip = (effectSize - st::reactionInlineImage) / 2;
+		for (const auto &animation : _starEffects) {
+			const auto progress = animation->progress;
+			const auto left = anim::interpolate(
+				0,
+				width - effectSize,
+				animation->shift);
+			const auto top = anim::interpolate(
+				height - effectSize,
+				0,
+				progress);
+			const auto opacity = (progress < 0.125) ?
+				(progress / 0.125) :
+				(progress > 0.875) ?
+				(1. - progress) / 0.125
+				: 1.;
+			const auto scale = kStarEffectScaleMin
+				+ (kStarEffectScaleMax - kStarEffectScaleMin) * opacity;
+
+			const auto rotation = qSin(-M_PI_2
+				+ M_PI * (animation->shift + animation->progress)
+			) * kStarEffectRotationMax;
+			const auto target = QRect(
+				QPoint(left + skip, top + skip),
+				QSize(st::reactionInlineImage, st::reactionInlineImage));
+			const auto size = animation->badge.size()
+				/ animation->badge.devicePixelRatio();
+			const auto dx = (target.width() - size.width()) / 2;
+			const auto dy = (target.height() - size.height()) / 2;
+
+			p.save();
+			p.translate(target.center());
+			p.rotate(rotation);
+			p.scale(scale, scale);
+			p.translate(-target.center());
+			p.setOpacity(opacity);
+			p.drawImage(target.topLeft() + QPoint(dx, dy), animation->badge);
+			p.restore();
+
+			animation->around.paintGetArea(p, {}, target, color, {}, now);
+		}
+	}, raw->lifetime());
+}
+
+void ComposeControls::setStarsReactionTop(
+		rpl::producer<std::vector<StarReactionTop>> top) {
+	_starsReactionTop = std::move(top);
+}
+
+auto ComposeControls::starsReactionIncrements() const
+-> rpl::producer<StarReactionIncrement> {
+	return _starsReactionIncrements.events();
+}
+
 bool ComposeControls::focus() {
-	if (_wrap->isHidden() || _field->isHidden() || isRecording()) {
+	if (_wrap->isHidden() || _field->isHidden()) {
 		return false;
 	}
+	if (isRecording()) {
+		_wrap->setFocus();
+		return true;
+	}
 	_field->setFocus();
 	return true;
 }
@@ -1108,8 +1800,37 @@ auto ComposeControls::sendContentRequests(SendRequestType requestType) const {
 		_sendCustomRequests.events());
 }
 
+rpl::producer<> ComposeControls::scrollToMaxRequests() const {
+	return _field->submits() | rpl::filter([=]{
+		if (_mode == Mode::Normal
+			&& !_voiceRecordBar->isListenState()
+			&& getTextWithAppliedMarkdown().text.isEmpty()) {
+			return true;
+		}
+		return false;
+	}) | rpl::to_empty;
+}
+
 rpl::producer<Api::SendOptions> ComposeControls::sendRequests() const {
-	return sendContentRequests(SendRequestType::Text);
+	return sendContentRequests(
+		SendRequestType::Text
+	) | rpl::filter([=] {
+		if (!_chosenStarsCount) {
+			return true;
+		}
+		using namespace Calls::Group::Ui;
+		const auto count = *_chosenStarsCount;
+		const auto &appConfig = _show->session().appConfig();
+		const auto &colorings = appConfig.groupCallColorings();
+		const auto required = StarsRequiredForMessage(
+			colorings,
+			getTextWithAppliedMarkdown());
+		if (required <= count) {
+			return true;
+		}
+		const_cast<ComposeControls*>(this)->editStarsFrom(required);
+		return false;
+	});
 }
 
 rpl::producer<VoiceToSend> ComposeControls::sendVoiceRequests() const {
@@ -1145,19 +1866,36 @@ rpl::producer<std::optional<bool>> ComposeControls::attachRequests() const {
 }
 
 void ComposeControls::setMimeDataHook(MimeDataHook hook) {
-	_field->setMimeDataHook(std::move(hook));
+	if (_sendAsFile) {
+		_field->setMimeDataHook(
+			WrappedMessageFieldMimeHook(
+				[=, originalHook = std::move(hook)](
+						not_null<const QMimeData*> data,
+						Ui::InputField::MimeAction action) {
+					if (checkLargeTextPaste(data, action)) {
+						return true;
+					}
+					return originalHook
+						? originalHook(data, action)
+						: false;
+				}, _field));
+	} else {
+		_field->setMimeDataHook(
+			WrappedMessageFieldMimeHook(std::move(hook), _field));
+	}
 }
 
 bool ComposeControls::confirmMediaEdit(Ui::PreparedList &list) {
 	if (!isEditingMessage() || !_regularWindow) {
 		return false;
-	} else if (_canReplaceMedia) {
+	} else if (_canReplaceMedia || _canAddMedia) {
 		const auto queryToEdit = _header->queryToEdit();
 		EditCaptionBox::StartMediaReplace(
 			_regularWindow,
 			_editingId,
 			std::move(list),
 			_field->getTextWithTags(),
+			_header->suggestOptions(),
 			queryToEdit.spoilered,
 			queryToEdit.options.invertCaption,
 			crl::guard(_wrap.get(), [=] { cancelEditMessage(); }));
@@ -1167,6 +1905,10 @@ bool ComposeControls::confirmMediaEdit(Ui::PreparedList &list) {
 	return true;
 }
 
+void ComposeControls::processChosenSticker(FileChosen &&chosen) {
+	_stickerOrEmojiChosen.fire(std::move(chosen));
+}
+
 rpl::producer<FileChosen> ComposeControls::fileChosen() const {
 	return _fileChosen.events();
 }
@@ -1190,9 +1932,7 @@ void ComposeControls::showStarted() {
 	if (_attachBotsMenu) {
 		_attachBotsMenu->hideFast();
 	}
-	if (_voiceRecordBar) {
-		_voiceRecordBar->hideFast();
-	}
+	_voiceRecordBar->hideFast();
 	if (_autocomplete) {
 		_autocomplete->hideFast();
 	}
@@ -1212,13 +1952,21 @@ void ComposeControls::showFinished() {
 	if (_attachBotsMenu) {
 		_attachBotsMenu->hideFast();
 	}
-	if (_voiceRecordBar) {
-		_voiceRecordBar->hideFast();
-	}
+	_voiceRecordBar->hideFast();
 	if (_autocomplete) {
 		_autocomplete->hideFast();
 	}
 	updateWrappingVisibility();
+	_aiButton->raise();
+	if (_sendAsFile) {
+		_sendAsFile->raise();
+	}
+	if (_aiTooltipManager) {
+		_aiTooltipManager->raise();
+	}
+	if (_sendAsFileTooltipManager) {
+		_sendAsFileTooltipManager->raise();
+	}
 	_voiceRecordBar->orderControls();
 }
 
@@ -1255,6 +2003,7 @@ void ComposeControls::clear() {
 		{},
 		saveTextDraft ? TextUpdateEvent::SaveDraft : TextUpdateEvent());
 	cancelReplyMessage();
+	clearChosenStarsForMessage();
 	if (_preview) {
 		_preview->apply({ .removed = true });
 	}
@@ -1293,7 +2042,11 @@ void ComposeControls::saveFieldToHistoryLocalDraft() {
 		const auto key = draftKeyCurrent();
 		_history->setDraft(
 			key,
-			std::make_unique<Data::Draft>(_field, id, _preview->draft()));
+			std::make_unique<Data::Draft>(
+				_field,
+				id,
+				SuggestOptions(),
+				_preview->draft()));
 	} else {
 		_history->clearDraft(draftKeyCurrent());
 	}
@@ -1336,52 +2089,58 @@ void ComposeControls::show() {
 }
 
 void ComposeControls::init() {
+	if (_attachToggle) {
+		_attachToggle->setAccessibleName(tr::lng_attach(tr::now));
+	}
+	_tabbedSelectorToggle->setAccessibleName(tr::lng_emoji_sticker_gif(tr::now));
+
 	initField();
 	initTabbedSelector();
 	initSendButton();
+	initAiButton();
+	initSendAsFileButton();
 	initWriteRestriction();
 	initVoiceRecordBar();
 	initKeyHandler();
+	initEditStarsButton();
+	_minStarsCount.changes() | rpl::on_next([=] {
+		initEditStarsButton();
+		updateControlsGeometry(_wrap->size());
+	}, _wrap->lifetime());
 
 	_hidden.changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateWrappingVisibility();
 	}, _wrap->lifetime());
 
 	if (_botCommandStart) {
+		_botCommandStart->setAccessibleName(tr::lng_bot_commands_start(tr::now));
 		_botCommandStart->setClickedCallback([=] { setText({ "/" }); });
 	}
 
-	if (_like) {
-		_like->setClickedCallback([=] { _likeToggled.fire({}); });
-		_liked.value(
-		) | rpl::start_with_next([=](bool liked) {
-			const auto icon = liked ? &_st.liked : nullptr;
-			_like->setIconOverride(icon, icon);
-		}, _like->lifetime());
-	}
+	initLikeButton();
 
 	_wrap->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		updateControlsGeometry(size);
 	}, _wrap->lifetime());
 
 	_wrap->geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		updateOuterGeometry(rect);
 	}, _wrap->lifetime());
 
 	_wrap->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(_wrap.get());
 		paintBackground(p, _wrap->rect(), clip);
 	}, _wrap->lifetime());
 
 	_header->editMsgIdValue(
-	) | rpl::start_with_next([=](const auto &id) {
+	) | rpl::on_next([=](const auto &id) {
 		unregisterDraftSources();
 		updateSendButtonType();
-		if (_history && updateSendAsButton()) {
+		if (_history && updateSendAsButton(nullptr)) {
 			updateControlsVisibility();
 			updateControlsGeometry(_wrap->size());
 			orderControls();
@@ -1390,33 +2149,41 @@ void ComposeControls::init() {
 	}, _wrap->lifetime());
 
 	_header->editPhotoRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto queryToEdit = _header->queryToEdit();
 		EditCaptionBox::StartPhotoEdit(
 			_regularWindow,
 			_photoEditMedia,
 			_editingId,
 			_field->getTextWithTags(),
+			_header->suggestOptions(),
 			queryToEdit.spoilered,
 			queryToEdit.options.invertCaption,
 			crl::guard(_wrap.get(), [=] { cancelEditMessage(); }));
 	}, _wrap->lifetime());
 
 	_header->editOptionsRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto history = _history;
 		const auto topicRootId = _topicRootId;
+		const auto monoforumPeerId = _monoforumPeerId;
 		const auto reply = _header->replyingToMessage();
+		const auto suggest = SuggestOptions();
 		const auto webpage = _preview->draft();
 
 		const auto done = [=](
 				FullReplyTo replyTo,
-				Data::WebPageDraft webpage) {
+				Data::WebPageDraft webpage,
+				Data::ForwardDraft forward) {
 			if (replyTo) {
 				replyToMessage(replyTo);
 			} else {
 				cancelReplyMessage();
 			}
+			history->setForwardDraft(
+				topicRootId,
+				monoforumPeerId,
+				std::move(forward));
 			_preview->apply(webpage);
 			_field->setFocus();
 		};
@@ -1429,8 +2196,9 @@ void ComposeControls::init() {
 		EditDraftOptions({
 			.show = _show,
 			.history = history,
-			.draft = Data::Draft(_field, reply, _preview->draft()),
+			.draft = Data::Draft(_field, reply, suggest, _preview->draft()),
 			.usedLink = _preview->link(),
+			.forward = _header->forwardDraft(),
 			.links = _preview->links(),
 			.resolver = _preview->resolver(),
 			.done = done,
@@ -1438,37 +2206,41 @@ void ComposeControls::init() {
 			.clearOldDraft = [=] { ClearDraftReplyTo(
 				history,
 				topicRootId,
+				monoforumPeerId,
 				replyToId); },
 		});
 	}, _wrap->lifetime());
 
 	_header->previewCancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_preview) {
 			_preview->apply({ .removed = true });
 		}
-		_saveDraftText = true;
-		_saveDraftStart = crl::now();
-		saveDraft();
+		saveDraftWithTextNow();
+	}, _wrap->lifetime());
+
+	_header->saveDraftRequests(
+	) | rpl::on_next([=] {
+		saveDraftWithTextNow();
 	}, _wrap->lifetime());
 
 	_header->editCancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		cancelEditMessage();
 	}, _wrap->lifetime());
 
 	_header->replyCancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		cancelReplyMessage();
 	}, _wrap->lifetime());
 
 	_header->forwardCancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		cancelForward();
 	}, _wrap->lifetime());
 
 	_header->visibleChanged(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		updateHeight();
 		if (shown) {
 			raisePanels();
@@ -1477,34 +2249,34 @@ void ComposeControls::init() {
 
 	sendContentRequests(
 		SendRequestType::Voice
-	) | rpl::start_with_next([=](Api::SendOptions options) {
+	) | rpl::on_next([=](Api::SendOptions options) {
 		_voiceRecordBar->requestToSendWithOptions(options);
 	}, _wrap->lifetime());
 
 	_header->editMsgIdValue(
-	) | rpl::start_with_next([=](const auto &id) {
+	) | rpl::on_next([=](const auto &id) {
 		_editingId = id;
 	}, _wrap->lifetime());
 
 	session().data().itemRemoved(
 	) | rpl::filter([=](not_null<const HistoryItem*> item) {
 		return (_editingId == item->fullId());
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		cancelEditMessage();
 	}, _wrap->lifetime());
 
 	Core::App().materializeLocalDraftsRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		saveFieldToHistoryLocalDraft();
 	}, _wrap->lifetime());
 
 	Core::App().settings().sendSubmitWayValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateSubmitSettings();
 	}, _wrap->lifetime());
 
 	session().attachWebView().attachBotsUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateAttachBotsMenu();
 	}, _wrap->lifetime());
 
@@ -1517,7 +2289,8 @@ void ComposeControls::orderControls() {
 }
 
 bool ComposeControls::showRecordButton() const {
-	return ::Media::Capture::instance()->available()
+	return _features.recordMediaMessage
+		&& (_recordAvailability != Webrtc::RecordAvailability::None)
 		&& !_voiceRecordBar->isListenState()
 		&& !_voiceRecordBar->isRecordingByAnotherBar()
 		&& !HasSendText(_field)
@@ -1525,15 +2298,46 @@ bool ComposeControls::showRecordButton() const {
 		&& !isEditingMessage();
 }
 
+bool ComposeControls::showEditStarsButton() const {
+	return editStarsButtonShown()
+		&& !HasSendText(_field)
+		&& !readyToForward()
+		&& !isEditingMessage()
+		&& !shownStarsPerMessage();
+}
+
+int ComposeControls::shownStarsPerMessage() const {
+	return _chosenStarsCount.value_or(
+		_history ? _history->peer->starsPerMessageChecked() : 0);
+}
+
 void ComposeControls::clearListenState() {
 	_voiceRecordBar->clearListenState();
 }
 
+void ComposeControls::clearChosenStarsForMessage() {
+	const auto empty = editStarsButtonShown()
+		? _minStarsCount.current()
+		: std::optional<int>();
+	if (_chosenStarsCount != empty) {
+		_chosenStarsCount = empty;
+		updateSendButtonType();
+	}
+}
+
+bool ComposeControls::editStarsButtonShown() const {
+	return _features.editMessageStars && !_videoStreamAdmin.current();
+}
+
+int ComposeControls::chosenStarsForMessage() const {
+	return _chosenStarsCount.value_or(0);
+}
+
 void ComposeControls::initKeyHandler() {
 	_wrap->events(
 	) | rpl::filter([=](not_null<QEvent*> event) {
 		return (event->type() == QEvent::KeyPress);
-	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
 		auto keyEvent = static_cast<QKeyEvent*>(e.get());
 		const auto key = keyEvent->key();
 		const auto isCtrl = keyEvent->modifiers() == Qt::ControlModifier;
@@ -1559,7 +2363,8 @@ void ComposeControls::initKeyHandler() {
 		}
 	}, _wrap->lifetime());
 
-	base::install_event_filter(_wrap.get(), _field, [=](not_null<QEvent*> e) {
+	base::install_event_filter(_wrap.get(), _field->rawTextEdit(), [=](
+			not_null<QEvent*> e) {
 		using Result = base::EventFilterResult;
 		if (e->type() != QEvent::KeyPress) {
 			return Result::Continue;
@@ -1570,7 +2375,7 @@ void ComposeControls::initKeyHandler() {
 			const auto isUp = (k->key() == Qt::Key_Up);
 			const auto isDown = (k->key() == Qt::Key_Down);
 			if (isUp || isDown) {
-				if (Platform::IsMac()) {
+				if (Platform::IsMac() && !MacCmdReplyImmediately.value()) {
 					// Cmd + Up is used instead of Home.
 					if ((isUp && (!_field->textCursor().atStart()))
 						// Cmd + Down is used instead of End.
@@ -1597,26 +2402,35 @@ void ComposeControls::initField() {
 	_field->setMaxHeight(st::historyComposeFieldMaxHeight);
 	updateSubmitSettings();
 	_field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		escape();
 	}, _field->lifetime());
 	_field->heightChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateHeight();
+		updateAiButtonVisibility();
+		updateSendAsFileVisibility();
 	}, _field->lifetime());
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		fieldChanged();
+		updateAiButtonVisibility();
+		updateSendAsFileVisibility();
 	}, _field->lifetime());
+	Data::AmPremiumValue(&session()) | rpl::on_next([=] {
+		checkCharsLimitation();
+		updateAiButtonVisibility();
+		updateSendAsFileVisibility();
+	}, _wrap->lifetime());
 #ifdef Q_OS_MAC
 	// Removed an ability to insert text from the menu bar
 	// when the field is hidden.
 	_field->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		_field->setEnabled(shown);
 	}, _field->lifetime());
 #endif // Q_OS_MAC
-	InitMessageField(_show, _field, [=](not_null<DocumentData*> emoji) {
+	_chatStyle = InitMessageField(_show, _field, [=](not_null<DocumentData*> emoji) {
 		if (_history
 			&& Data::AllowEmojiWithoutPremium(_history->peer, emoji)) {
 			return true;
@@ -1637,7 +2451,7 @@ void ComposeControls::initField() {
 		base::qt_signal_producer(
 			rawTextEdit,
 			&QTextEdit::cursorPositionChanged)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		saveDraftDelayed();
 	}, _field->lifetime());
 }
@@ -1652,7 +2466,7 @@ void ComposeControls::updateSubmitSettings() {
 void ComposeControls::initFieldAutocomplete() {
 	_emojiSuggestions = nullptr;
 	_autocomplete = nullptr;
-	if (!_history) {
+	if (!_history || _features.emojiOnlyPanel) {
 		return;
 	}
 	ChatHelpers::InitFieldAutocomplete(_autocomplete, {
@@ -1684,9 +2498,7 @@ void ComposeControls::initFieldAutocomplete() {
 			if (!_showSlowmodeError || !_showSlowmodeError()) {
 				setText({});
 			}
-			//_saveDraftText = true;
-			//_saveDraftStart = crl::now();
-			//saveDraft();
+			//saveDraftWithTextNow();
 			// Won't be needed if SendInlineBotResult clears the cloud draft.
 			//saveCloudDraft();
 			_fileChosen.fire(std::move(data));
@@ -1711,6 +2523,9 @@ void ComposeControls::initFieldAutocomplete() {
 }
 
 void ComposeControls::updateFieldPlaceholder() {
+	_voiceRecordBar->setPauseInsteadSend(_history
+		&& _history->peer->starsPerMessageChecked() > 0);
+
 	if (!isEditingMessage() && _isInlineBot) {
 		_field->setPlaceholder(
 			rpl::single(_inlineBot->botInfo->inlinePlaceholder.mid(1)),
@@ -1719,13 +2534,18 @@ void ComposeControls::updateFieldPlaceholder() {
 	}
 
 	_field->setPlaceholder([&] {
+		const auto peer = _history ? _history->peer.get() : nullptr;
 		if (_fieldCustomPlaceholder) {
 			return rpl::duplicate(_fieldCustomPlaceholder);
 		} else if (isEditingMessage()) {
 			return tr::lng_edit_message_text();
-		} else if (!_history) {
+		} else if (!peer) {
 			return tr::lng_message_ph();
-		} else if (const auto channel = _history->peer->asChannel()) {
+		} else if (const auto stars = peer->starsPerMessageChecked()) {
+			return tr::lng_message_stars_ph(
+				lt_count,
+				rpl::single(stars * 1.));
+		} else if (const auto channel = peer->asChannel()) {
 			if (channel->isBroadcast()) {
 				return session().data().notifySettings().silentPosts(channel)
 					? tr::lng_broadcast_silent_ph()
@@ -1795,9 +2615,10 @@ Data::DraftKey ComposeControls::draftKey(DraftType type) const {
 	switch (_currentDialogsEntryState.section) {
 	case Section::History:
 	case Section::Replies:
+	case Section::SavedSublist:
 		return (type == DraftType::Edit)
-			? Key::LocalEdit(_topicRootId)
-			: Key::Local(_topicRootId);
+			? Key::LocalEdit(_topicRootId, _monoforumPeerId)
+			: Key::Local(_topicRootId, _monoforumPeerId);
 	case Section::Scheduled:
 		return (type == DraftType::Edit)
 			? Key::ScheduledEdit()
@@ -1814,6 +2635,12 @@ Data::DraftKey ComposeControls::draftKeyCurrent() const {
 	return draftKey(isEditingMessage() ? DraftType::Edit : DraftType::Normal);
 }
 
+void ComposeControls::saveDraftWithTextNow() {
+	_saveDraftText = true;
+	_saveDraftStart = crl::now();
+	saveDraft();
+}
+
 void ComposeControls::saveDraft(bool delayed) {
 	if (delayed) {
 		const auto now = crl::now();
@@ -1866,6 +2693,7 @@ void ComposeControls::registerDraftSource() {
 		const auto draft = [=] {
 			return Storage::MessageDraft{
 				_header->getDraftReply(),
+				_header->suggestOptions(),
 				_field->getTextWithTags(),
 				_preview->draft(),
 			};
@@ -1916,6 +2744,9 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	const auto editingId = (draft && draft == editDraft)
 		? draft->reply.messageId
 		: FullMsgId();
+	const auto editingSuggest = (draft && draft == editDraft)
+		? draft->suggest
+		: SuggestOptions();
 
 	InvokeQueued(_autocomplete.get(), [=] {
 		if (_autocomplete) {
@@ -1936,13 +2767,13 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 		if (hadFocus) {
 			_field->setFocus();
 		}
-		_header->editMessage({});
+		_header->editMessage({}, {});
 		_header->replyToMessage({});
 		if (_preview) {
 			_preview->apply({ .removed = true });
 			_preview->setDisabled(false);
 		}
-		_canReplaceMedia = false;
+		_canReplaceMedia = _canAddMedia = false;
 		_photoEditMedia = nullptr;
 		return;
 	}
@@ -1961,10 +2792,21 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	if (draft == editDraft) {
 		const auto resolve = [=] {
 			if (const auto item = _history->owner().message(editingId)) {
+				const auto richPage = item->richPage();
 				const auto media = item->media();
-				_canReplaceMedia = media && media->allowsEditMedia();
+				_canReplaceMedia = !richPage && item->allowsEditMedia();
+				if (_canReplaceMedia && media && media->allowsEditMedia()) {
+					_canAddMedia = false;
+				} else {
+					_canAddMedia = base::take(_canReplaceMedia);
+				}
+				if (_canReplaceMedia || _canAddMedia) {
+					// Invalidate the button, maybe icon has changed.
+					_replaceMedia = nullptr;
+				}
 				_photoEditMedia = (_canReplaceMedia
 					&& _regularWindow
+					&& media
 					&& media->photo()
 					&& !media->photo()->isNull())
 					? media->photo()->createMediaView()
@@ -1974,7 +2816,10 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 						Data::PhotoSize::Large,
 						item->fullId());
 				}
-				_header->editMessage(editingId, _photoEditMedia != nullptr);
+				_header->editMessage(
+					editingId,
+					editingSuggest,
+					_photoEditMedia != nullptr);
 				if (_preview) {
 					_preview->apply(
 						Data::WebPageDraft::FromItem(item),
@@ -1983,9 +2828,9 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 				}
 				return true;
 			}
-			_canReplaceMedia = false;
+			_canReplaceMedia = _canAddMedia = false;
 			_photoEditMedia = nullptr;
-			_header->editMessage(editingId, false);
+			_header->editMessage(editingId, SuggestOptions(), false);
 			return false;
 		};
 		if (!resolve()) {
@@ -2004,13 +2849,10 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 		}
 		_header->replyToMessage({});
 	} else {
-		_canReplaceMedia = false;
+		_canReplaceMedia = _canAddMedia = false;
 		_photoEditMedia = nullptr;
 		_header->replyToMessage(draft->reply);
-		if (_header->replyingToMessage()) {
-			cancelForward();
-		}
-		_header->editMessage({});
+		_header->editMessage({}, {});
 		if (_preview) {
 			_preview->setDisabled(false);
 		}
@@ -2019,7 +2861,7 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
 }
 
 void ComposeControls::cancelForward() {
-	_history->setForwardDraft(_topicRootId, {});
+	_history->setForwardDraft(_topicRootId, _monoforumPeerId, {});
 	updateForwarding();
 }
 
@@ -2056,7 +2898,7 @@ void ComposeControls::initTabbedSelector() {
 	});
 
 	_selector->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(_field->textCursor(), data.emoji);
 	}, wrap->lifetime());
 
@@ -2064,7 +2906,7 @@ void ComposeControls::initTabbedSelector() {
 		_selector->fileChosen(),
 		_selector->customEmojiChosen(),
 		_stickerOrEmojiChosen.events()
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen &&data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen &&data) {
 		if (const auto info = data.document->sticker()
 			; info && info->setType == Data::StickersType::Emoji) {
 			if (data.document->isPremiumEmoji()
@@ -2079,6 +2921,25 @@ void ComposeControls::initTabbedSelector() {
 			} else {
 				Data::InsertCustomEmoji(_field, data.document);
 			}
+		} else if (data.needsCaption && _history) {
+			const auto document = data.document;
+			const auto from = data.messageSendingFrom;
+			Ui::SendGifWithCaption(
+				_show,
+				_field,
+				document,
+				_history->peer,
+				sendMenuDetails(),
+				crl::guard(_field, [=](
+						Api::SendOptions options,
+						TextWithTags caption) {
+					_fileChosen.fire({
+						.document = document,
+						.options = options,
+						.messageSendingFrom = from,
+						.caption = std::move(caption),
+					});
+				}));
 		} else {
 			_fileChosen.fire(std::move(data));
 		}
@@ -2091,12 +2952,12 @@ void ComposeControls::initTabbedSelector() {
 	) | rpl::start_to_stream(_inlineResultChosen, wrap->lifetime());
 
 	_selector->contextMenuRequested(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_selector->showMenuWithDetails(sendMenuDetails());
 	}, wrap->lifetime());
 
 	_selector->choosingStickerUpdated(
-	) | rpl::start_with_next([=](ChatHelpers::TabbedSelector::Action action) {
+	) | rpl::on_next([=](ChatHelpers::TabbedSelector::Action action) {
 		_sendActionUpdates.fire({
 			.type = Api::SendProgressType::ChooseSticker,
 			.cancel = (action == ChatHelpers::TabbedSelector::Action::Cancel),
@@ -2108,26 +2969,44 @@ void ComposeControls::initSendButton() {
 	rpl::combine(
 		_slowmodeSecondsLeft.value(),
 		_sendDisabledBySlowmode.value()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
+		updateSendButtonType();
+	}, _send->lifetime());
+
+	Core::App().mediaDevices().recordAvailabilityValue(
+	) | rpl::on_next([=](Webrtc::RecordAvailability value) {
+		_recordAvailability = value;
 		updateSendButtonType();
 	}, _send->lifetime());
 
 	_send->finishAnimating();
 
 	_send->clicks(
-	) | rpl::filter([=] {
-		return (_send->type() == Ui::SendButton::Type::Cancel);
-	}) | rpl::start_with_next([=] {
-		cancelInlineBot();
+	) | rpl::on_next([=] {
+		if (_send->type() == Ui::SendButton::Type::Cancel) {
+			cancelInlineBot();
+		}
 	}, _send->lifetime());
 
 	const auto send = crl::guard(_send.get(), [=](Api::SendOptions options) {
 		_sendCustomRequests.fire(std::move(options));
 	});
+	setupSendMenu(_send.get(), send);
+
+	_send->widthValue() | rpl::skip(1) | rpl::on_next([=] {
+		updateControlsGeometry(_wrap->size());
+	}, _send->lifetime());
+}
 
+void ComposeControls::setupSendMenu(
+		not_null<Ui::RpWidget*> button,
+		Fn<void(Api::SendOptions)> send) {
 	using namespace SendMenu;
 	const auto sendAction = [=](Action action, Details details) {
-		if (action.type == ActionType::CaptionUp
+		if (action.type == ActionType::ChangePrice) {
+			_chosenStarsCount = details.price.value_or(0);
+			updateSendButtonType();
+		} else if (action.type == ActionType::CaptionUp
 			|| action.type == ActionType::CaptionDown
 			|| action.type == ActionType::SpoilerOn
 			|| action.type == ActionType::SpoilerOff) {
@@ -2136,33 +3015,42 @@ void ComposeControls::initSendButton() {
 			SendMenu::DefaultCallback(_show, send)(action, details);
 		}
 	};
-
-
 	SendMenu::SetupMenuAndShortcuts(
-		_send.get(),
+		button,
 		_show,
 		[=] { return sendButtonMenuDetails(); },
-		sendAction);
+		sendAction,
+		&_st.tabbed.menu,
+		&_st.tabbed.icons);
 }
 
-void ComposeControls::initSendAsButton(not_null<PeerData*> peer) {
+void ComposeControls::initSendAsButton(
+		not_null<PeerData*> peer,
+		std::shared_ptr<Data::GroupCall> videoStream) {
 	using namespace rpl::mappers;
+	using namespace Main;
 
 	// SendAsPeers::shouldChoose checks Data::CanSendAnything(PeerData*).
+	const auto key = SendAsKey{
+		peer,
+		videoStream ? SendAsType::VideoStream : SendAsType::Message,
+	};
 	rpl::combine(
-		rpl::single(peer) | rpl::then(
-			session().sendAsPeers().updated() | rpl::filter(_1 == peer)
+		rpl::single(key) | rpl::then(
+			session().sendAsPeers().updated() | rpl::filter(_1 == key)
 		),
-		Data::CanSendAnythingValue(peer, false)
-	) | rpl::skip(1) | rpl::start_with_next([=] {
-		if (updateSendAsButton()) {
+		(videoStream
+			? rpl::single(true)
+			: Data::CanSendAnythingValue(key.peer, false))
+	) | rpl::skip(1) | rpl::on_next([=] {
+		if (updateSendAsButton(videoStream)) {
 			updateControlsVisibility();
 			updateControlsGeometry(_wrap->size());
 			orderControls();
 		}
 	}, _historyLifetime);
 
-	updateSendAsButton();
+	updateSendAsButton(videoStream);
 }
 
 void ComposeControls::cancelInlineBot() {
@@ -2210,7 +3098,7 @@ void SetupRestrictionView(
 		not_null<Ui::RpWidget*> widget,
 		not_null<const style::ComposeControls*> st,
 		std::shared_ptr<ChatHelpers::Show> show,
-		const QString &name,
+		not_null<PeerData*> peer,
 		rpl::producer<Controls::WriteRestriction> restriction,
 		Fn<void(QPainter &p, QRect clip)> paintBackground) {
 	struct State {
@@ -2222,7 +3110,9 @@ void SetupRestrictionView(
 	};
 	const auto state = widget->lifetime().make_state<State>();
 	state->updateGeometries = [=] {
-		if (!state->label) {
+		if (!state->label && state->button) {
+			state->button->setGeometry(widget->rect());
+		} else if (!state->label) {
 			return;
 		} else if (state->button) {
 			const auto available = widget->width()
@@ -2263,7 +3153,7 @@ void SetupRestrictionView(
 		label->show();
 		label->setAttribute(Qt::WA_TransparentForMouseEvents);
 		label->heightValue(
-		) | rpl::start_with_next(
+		) | rpl::on_next(
 			state->updateGeometries,
 			label->lifetime());
 		return label;
@@ -2276,7 +3166,6 @@ void SetupRestrictionView(
 			st->premiumRequired.button);
 		unlock->show();
 		unlock->setAttribute(Qt::WA_TransparentForMouseEvents);
-		unlock->setTextTransform(RoundButton::TextTransform::NoTransform);
 		unlock->setFullRadius(true);
 		return unlock;
 	};
@@ -2284,7 +3173,7 @@ void SetupRestrictionView(
 		auto icon = std::make_unique<Ui::RpWidget>(widget);
 		icon->resize(st->premiumRequired.icon.size());
 		icon->show();
-		icon->paintRequest() | rpl::start_with_next([st, raw = icon.get()] {
+		icon->paintRequest() | rpl::on_next([st, raw = icon.get()] {
 			auto p = QPainter(raw);
 			st->premiumRequired.icon.paint(p, {}, raw->width());
 		}, icon->lifetime());
@@ -2293,16 +3182,33 @@ void SetupRestrictionView(
 	std::move(
 		restriction
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](Controls::WriteRestriction value) {
+	) | rpl::on_next([=](Controls::WriteRestriction value) {
 		using Type = Controls::WriteRestriction::Type;
-		if (value.type == Type::Rights) {
+		if (value.type == Type::Frozen) {
+			state->icon = nullptr;
+			state->unlock = nullptr;
+			state->label = nullptr;
+			state->button = FrozenWriteRestriction(
+				widget,
+				show,
+				FrozenWriteRestrictionType::MessageField);
+		} else if (const auto lifting = value.boostsToLift) {
+			state->icon = nullptr;
+			state->unlock = nullptr;
+			state->label = nullptr;
+			state->button = BoostsToLiftWriteRestriction(
+				widget,
+				show,
+				peer,
+				lifting);
+		} else if (value.type == Type::Rights) {
 			state->icon = nullptr;
 			state->unlock = nullptr;
 			state->button = nullptr;
 			state->label = makeLabel(value.text, st->restrictionLabel);
 		} else if (value.type == Type::PremiumRequired) {
 			state->icon = makeIcon();
-			state->unlock = makeUnlock(value.button, name);
+			state->unlock = makeUnlock(value.button, peer->shortName());
 			state->button = std::make_unique<Ui::AbstractButton>(widget);
 			state->button->setClickedCallback([=] {
 				::Settings::ShowPremiumPromoToast(
@@ -2310,13 +3216,13 @@ void SetupRestrictionView(
 					tr::lng_send_non_premium_message_toast(
 						tr::now,
 						lt_user,
-						TextWithEntities{ name },
+						TextWithEntities{ peer->shortName() },
 						lt_link,
-						Ui::Text::Link(
-							Ui::Text::Bold(
+						tr::link(
+							tr::bold(
 								tr::lng_send_non_premium_message_toast_link(
 									tr::now))),
-						Ui::Text::RichLangValue),
+						tr::rich),
 					u"require_premium"_q);
 			});
 			state->label = makeLabel(value.text, st->premiumRequired.label);
@@ -2325,9 +3231,9 @@ void SetupRestrictionView(
 	}, widget->lifetime());
 
 	widget->sizeValue(
-	) | rpl::start_with_next(state->updateGeometries, widget->lifetime());
+	) | rpl::on_next(state->updateGeometries, widget->lifetime());
 
-	widget->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	widget->paintRequest() | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(widget);
 		paintBackground(p, clip);
 	}, widget->lifetime());
@@ -2346,14 +3252,14 @@ void ComposeControls::initWriteRestriction() {
 	_writeRestricted = std::make_unique<Ui::RpWidget>(_parent);
 	_writeRestricted->move(_wrap->pos());
 	_writeRestricted->resizeToWidth(_wrap->widthNoMargins());
-	_writeRestricted->sizeValue() | rpl::start_with_next([=] {
+	_writeRestricted->sizeValue() | rpl::on_next([=] {
 		if (_like && _like->parentWidget() == _writeRestricted.get()) {
 			updateControlsGeometry(_wrap->size());
 		}
 	}, _writeRestricted->lifetime());
 	_writeRestricted->resize(
 		_writeRestricted->width(),
-		st::historyUnblock.height);
+		_st.send.inner.height);
 	const auto background = [=](QPainter &p, QRect clip) {
 		paintBackground(p, _writeRestricted->rect(), clip);
 	};
@@ -2361,12 +3267,12 @@ void ComposeControls::initWriteRestriction() {
 		_writeRestricted.get(),
 		&_st,
 		_show,
-		_history->peer->shortName(),
+		_history->peer,
 		_writeRestriction.value(),
 		background);
 
 	_writeRestriction.value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateWrappingVisibility();
 	}, _writeRestricted->lifetime());
 }
@@ -2380,20 +3286,23 @@ void ComposeControls::changeFocusedControl() {
 
 void ComposeControls::initVoiceRecordBar() {
 	_voiceRecordBar->recordingStateChanges(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
 		if (active) {
 			_recording = true;
 			changeFocusedControl();
 		}
+		_field->setDisabled(active);
 		_field->setVisible(!active);
 		if (!active) {
 			changeFocusedControl();
 			_recording = false;
 		}
+		updateAiButtonVisibility();
+		updateSendAsFileVisibility();
 	}, _wrap->lifetime());
 
 	_voiceRecordBar->setStartRecordingFilter([=] {
-		const auto error = [&]() -> std::optional<QString> {
+		const auto error = [&]() -> Data::SendError {
 			const auto peer = _history ? _history->peer.get() : nullptr;
 			if (peer) {
 				if (const auto error = Data::RestrictionError(
@@ -2402,10 +3311,10 @@ void ComposeControls::initVoiceRecordBar() {
 					return error;
 				}
 			}
-			return std::nullopt;
+			return {};
 		}();
 		if (error) {
-			_show->showToast(*error);
+			Data::ShowSendErrorToast(_show, _history->peer, error);
 			return true;
 		} else if (_showSlowmodeError && _showSlowmodeError()) {
 			return true;
@@ -2413,35 +3322,201 @@ void ComposeControls::initVoiceRecordBar() {
 		return false;
 	});
 
+	_voiceRecordBar->recordingTipRequests(
+	) | rpl::on_next([=] {
+		Core::App().settings().setRecordVideoMessages(
+			!Core::App().settings().recordVideoMessages());
+		updateSendButtonType();
+		switch (_send->type()) {
+		case Ui::SendButton::Type::Record: {
+			const auto both = Webrtc::RecordAvailability::VideoAndAudio;
+			_show->showToast((_recordAvailability == both)
+				? tr::lng_record_voice_tip(tr::now)
+				: tr::lng_record_hold_tip(tr::now));
+		} break;
+		case Ui::SendButton::Type::Round:
+			_show->showToast(tr::lng_record_video_tip(tr::now));
+			break;
+		}
+	}, _wrap->lifetime());
+
+	_voiceRecordBar->errors(
+	) | rpl::on_next([=](::Media::Capture::Error error) {
+		using Error = ::Media::Capture::Error;
+		switch (error) {
+		case Error::AudioInit:
+		case Error::AudioTimeout:
+			_show->showToast(tr::lng_record_audio_problem(tr::now));
+			break;
+		case Error::VideoInit:
+		case Error::VideoTimeout:
+			_show->showToast(tr::lng_record_video_problem(tr::now));
+			break;
+		default:
+			_show->showToast(u"Unknown error."_q);
+			break;
+		}
+	}, _wrap->lifetime());
+
 	_voiceRecordBar->updateSendButtonTypeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateSendButtonType();
 	}, _wrap->lifetime());
+
+	Shortcuts::Requests(
+	) | rpl::filter([=] {
+		return Ui::AppInFocus();
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
+		using Command = Shortcuts::Command;
+		if (Data::CanSendAnything(_history->peer, !_topicRootId)) {
+			const auto isVoice = request->check(Command::RecordVoice, 1);
+			const auto isRound = !isVoice
+				&& request->check(Command::RecordRound, 1);
+			(isVoice || isRound) && request->handle([=] {
+				if (_voiceRecordBar) {
+					_voiceRecordBar->startRecordingAndLock(isRound);
+					return true;
+				}
+				return false;
+			});
+		}
+		_field
+			&& _field->isVisible()
+			&& Data::CanSendTexts(_history->peer)
+			&& request->check(Command::ComposeAiApplyInPlace, 1)
+			&& request->handle([=] {
+				triggerAiApplyInPlace();
+				return true;
+			});
+		_preview
+			&& (_previewShown || _preview->draft().removed)
+			&& request->check(Command::ToggleWebPagePreview, 1)
+			&& request->handle([=] {
+				if (_previewShown) {
+					_preview->apply({ .removed = true });
+				} else {
+					_preview->apply({}, true);
+				}
+				saveDraftWithTextNow();
+				return true;
+			});
+	}, _voiceRecordBar->lifetime());
+}
+
+void ComposeControls::initAiButton() {
+	_aiButton->hide();
+	_aiButton->setAccessibleName(tr::lng_ai_compose_title(tr::now));
+	_aiButton->setClickedCallback([=] {
+		if (_aiTooltipManager) {
+			_aiTooltipManager->hideAndRemember();
+		}
+		updateAiButtonVisibility();
+		showAiComposeBox();
+	});
+
+	_aiTooltipManager = std::make_unique<Controls::AiTooltipManager>(
+		_wrap.get(),
+		_aiButton,
+		tr::lng_ai_compose_tooltip(tr::rich),
+		"ai_compose_tooltip_hidden"_cs,
+		[=] { return _wrap->width(); });
+}
+
+void ComposeControls::initSendAsFileButton() {
+	if (!_sendAsFile) {
+		return;
+	}
+	_sendAsFile->hide();
+	_sendAsFile->setClickedCallback([=] {
+		if (_sendAsFileTooltipManager) {
+			_sendAsFileTooltipManager->hideAndRemember();
+		}
+		const auto text = _field->getTextWithTags();
+		auto restore = restoreTextCallback(QString());
+		fireSendTextAsFile(text.text, std::move(restore));
+	});
+
+	_sendAsFileTooltipManager = std::make_unique<Controls::AiTooltipManager>(
+		_wrap.get(),
+		_sendAsFile,
+		tr::lng_send_as_file_tooltip(tr::rich),
+		"send_as_file_tooltip_hidden"_cs,
+		[=] { return _wrap->width(); });
+}
+
+void ComposeControls::setSendAsFileConfirmed(
+		Fn<void(std::shared_ptr<Ui::PreparedBundle>, Api::SendOptions)> confirmed) {
+	_sendAsFileConfirmed = std::move(confirmed);
+}
+
+void ComposeControls::fireSendTextAsFile(
+		const QString &fileText,
+		Fn<void()> restoreText) {
+	if (!_sendAsFileConfirmed || !_history) {
+		return;
+	}
+	const auto peer = _history->peer;
+	const auto sendType = (_mode == Mode::Scheduled)
+		? (CanScheduleUntilOnline(peer)
+			? Api::SendType::ScheduledToUser
+			: Api::SendType::Scheduled)
+		: Api::SendType::Normal;
+	auto confirmed = [=, callback = _sendAsFileConfirmed](
+			std::shared_ptr<Ui::PreparedBundle> bundle,
+			Api::SendOptions options,
+			FullReplyTo replyTo) {
+		if (!replyTo.messageId
+				&& replyingToMessage().messageId) {
+			cancelReplyMessage();
+		}
+		callback(std::move(bundle), options);
+	};
+	_show->show(Box<SendFilesBox>(SendFilesBoxDescriptor{
+		.show = _show,
+		.list = Ui::PrepareTextAsFile(fileText),
+		.caption = TextWithTags{},
+		.toPeer = peer,
+		.limits = DefaultLimitsForPeer(peer),
+		.check = DefaultCheckForPeer(_show, peer),
+		.sendType = sendType,
+		.sendMenuDetails = _sendMenuDetails,
+		.stOverride = &_st,
+		.confirmed = std::move(confirmed),
+		.cancelled = std::move(restoreText),
+		.replyTo = replyingToMessage(),
+	}));
+}
+
+bool ComposeControls::checkLargeTextPaste(
+		not_null<const QMimeData*> data,
+		Ui::InputField::MimeAction action) {
+	const auto result = Ui::CheckLargeTextPaste(&session(), _field, data);
+	if (!result.exceeds) {
+		return false;
+	}
+	if (action == Ui::InputField::MimeAction::Check) {
+		return true;
+	}
+	auto restore = restoreTextCallback(QString());
+	fireSendTextAsFile(result.resultingText, std::move(restore));
+	return true;
 }
 
 void ComposeControls::updateWrappingVisibility() {
-	const auto hidden = _hidden.current();
 	const auto &restriction = _writeRestriction.current();
 	const auto restricted = !restriction.empty() && _writeRestricted;
+	using Type = HistoryView::Controls::WriteRestrictionType;
+	const auto hidden = _hidden.current()
+		|| (restriction.type == Type::Hidden);
 	if (_writeRestricted) {
 		_writeRestricted->setVisible(!hidden && restricted);
 	}
 	_wrap->setVisible(!hidden && !restricted);
-	using namespace Controls;
-	if (_like) {
-		const auto hidden = _like->isHidden();
-		if (_writeRestricted
-			&& restriction.type == WriteRestrictionType::PremiumRequired) {
-			_like->setParent(_writeRestricted.get());
-		} else {
-			_like->setParent(_wrap.get());
-		}
-		if (!hidden) {
-			_like->show();
-			updateControlsGeometry(_wrap->size());
-		}
-	}
+	updateControlsParents();
+	updateAiButtonVisibility();
+	updateSendAsFileVisibility();
 	if (!hidden && !restricted) {
+		updateControlsGeometry(_wrap->size());
 		_wrap->raise();
 	}
 }
@@ -2454,7 +3529,13 @@ auto ComposeControls::computeSendButtonType() const {
 	} else if (_isInlineBot) {
 		return Type::Cancel;
 	} else if (showRecordButton()) {
-		return Type::Record;
+		const auto both = Webrtc::RecordAvailability::VideoAndAudio;
+		const auto video = Core::App().settings().recordVideoMessages();
+		return (video && _recordAvailability == both)
+			? Type::Round
+			: Type::Record;
+	} else if (showEditStarsButton()) {
+		return Type::EditPrice;
 	}
 	return (_mode == Mode::Normal) ? Type::Send : Type::Schedule;
 }
@@ -2478,16 +3559,40 @@ SendMenu::Details ComposeControls::sendButtonMenuDetails() const {
 void ComposeControls::updateSendButtonType() {
 	using Type = Ui::SendButton::Type;
 	const auto type = computeSendButtonType();
-	_send->setType(type);
-
+	const auto forbidden = [&] {
+		if (type != Type::Record && type != Type::Round) {
+			return false;
+		}
+		if (!_history) {
+			return false;
+		}
+		const auto restriction = (type == Type::Record)
+			? ChatRestriction::SendVoiceMessages
+			: ChatRestriction::SendVideoMessages;
+		return !!Data::RestrictionError(_history->peer, restriction);
+	}();
 	const auto delay = [&] {
 		return (type != Type::Cancel && type != Type::Save)
 			? _slowmodeSecondsLeft.current()
 			: 0;
 	}();
-	_send->setSlowmodeDelay(delay);
+	using namespace Calls::Group::Ui;
+	const auto &appConfig = _show->session().appConfig();
+	_send->setState({
+		.type = type,
+		.fillBgOverride = (_chosenStarsCount.value_or(0)
+			? Ui::ColorFromSerialized(StarsColoringForCount(
+				appConfig.groupCallColorings(),
+				*_chosenStarsCount).bgLight)
+			: QColor()),
+		.slowmodeDelay = delay,
+		.starsToSend = shownStarsPerMessage(),
+		.forbidden = forbidden,
+	});
 	_send->setDisabled(_sendDisabledBySlowmode.current()
-		&& (type == Type::Send || type == Type::Record));
+		&& (type == Type::Send
+			|| type == Type::Record
+			|| type == Type::Round));
 }
 
 void ComposeControls::finishAnimating() {
@@ -2496,20 +3601,30 @@ void ComposeControls::finishAnimating() {
 }
 
 void ComposeControls::updateControlsGeometry(QSize size) {
-	// (_attachToggle|_replaceMedia) (_sendAs) -- _inlineResults ------ _tabbedPanel -- _fieldBarCancel
+	// (_commentsShown) (_attachToggle|_replaceMedia) (_sendAs) -- _inlineResults ------ _tabbedPanel -- _fieldBarCancel (_starsReaction)
 	// (_attachDocument|_attachPhoto) _field (_ttlInfo) (_scheduled) (_silent|_botCommandStart) _tabbedSelectorToggle _send
 
+	const auto commentsShown = _commentsShown
+		&& !_commentsShown->isHidden();
 	const auto fieldWidth = size.width()
-		- _attachToggle->width()
+		- (commentsShown
+			? (_commentsShown->width() + _st.commentsSkip)
+			: 0)
+		- ((_attachToggle || _sendAs) ? _st.padding.left() : _st.fieldLeft)
+		- (_attachToggle ? _attachToggle->width() : 0)
 		- (_sendAs ? _sendAs->width() : 0)
-		- st::historySendRight
+		- _st.padding.right()
 		- _send->width()
+		- (_editStars ? _editStars->width() : 0)
 		- _tabbedSelectorToggle->width()
 		- (_likeShown ? _like->width() : 0)
 		- (_botCommandShown ? _botCommandStart->width() : 0)
 		- (_silent ? _silent->width() : 0)
 		- (_scheduled ? _scheduled->width() : 0)
-		- (_ttlInfo ? _ttlInfo->width() : 0);
+		- (_ttlInfo ? _ttlInfo->width() : 0)
+		- (_starsReaction
+			? (_st.starsSkip + _starsReaction->width())
+			: 0);
 	{
 		const auto oldFieldHeight = _field->height();
 		_field->resizeToWidth(fieldWidth);
@@ -2520,30 +3635,46 @@ void ComposeControls::updateControlsGeometry(QSize size) {
 		}
 	}
 
-	const auto buttonsTop = size.height() - _attachToggle->height();
+	const auto buttonsTop = size.height() - _st.attach.height;
 
-	auto left = st::historySendRight;
+	auto left = 0;
+	if (commentsShown) {
+		_commentsShown->moveToLeft(left, buttonsTop);
+		left += _commentsShown->width() + _st.commentsSkip;
+	}
+	left += (_attachToggle || _sendAs) ? _st.padding.left() : _st.fieldLeft;
 	if (_replaceMedia) {
 		_replaceMedia->moveToLeft(left, buttonsTop);
 	}
-	_attachToggle->moveToLeft(left, buttonsTop);
-	left += _attachToggle->width();
+	if (_attachToggle) {
+		_attachToggle->moveToLeft(left, buttonsTop);
+		left += _attachToggle->width();
+	}
 	if (_sendAs) {
 		_sendAs->moveToLeft(left, buttonsTop);
 		left += _sendAs->width();
 	}
 	_field->moveToLeft(
 		left,
-		size.height() - _field->height() - st::historySendPadding);
+		size.height() - _st.padding.bottom() - _field->height());
 
 	_header->resizeToWidth(size.width());
 	_header->moveToLeft(
 		0,
-		_field->y() - _header->height() - st::historySendPadding);
+		_field->y() - _st.padding.top() - _header->height());
 
-	auto right = st::historySendRight;
+	auto right = 0;
+	if (_starsReaction) {
+		_starsReaction->moveToRight(right, buttonsTop);
+		right += _starsReaction->width() + _st.starsSkip;
+	}
+	right += _st.padding.right();
 	_send->moveToRight(right, buttonsTop);
 	right += _send->width();
+	if (_editStars) {
+		_editStars->moveToRight(right, buttonsTop);
+		right += _editStars->width();
+	}
 	_tabbedSelectorToggle->moveToRight(right, buttonsTop);
 	right += _tabbedSelectorToggle->width();
 	if (_like) {
@@ -2574,6 +3705,8 @@ void ComposeControls::updateControlsGeometry(QSize size) {
 	if (_ttlInfo) {
 		_ttlInfo->move(size.width() - right - _ttlInfo->width(), buttonsTop);
 	}
+	updateAiButtonGeometry();
+	updateSendAsFileGeometry();
 
 	_voiceRecordBar->resizeToWidth(size.width());
 	_voiceRecordBar->moveToLeft(
@@ -2588,6 +3721,9 @@ void ComposeControls::updateControlsVisibility() {
 	if (_like) {
 		_like->setVisible(_likeShown);
 	}
+	if (_editStars) {
+		_editStars->show();
+	}
 	if (_ttlInfo) {
 		_ttlInfo->show();
 	}
@@ -2596,13 +3732,81 @@ void ComposeControls::updateControlsVisibility() {
 	}
 	if (_replaceMedia) {
 		_replaceMedia->show();
-		_attachToggle->hide();
-	} else {
-		_attachToggle->show();
+	}
+	if (_attachToggle) {
+		_attachToggle->setVisible(!_replaceMedia);
 	}
 	if (_scheduled) {
 		_scheduled->setVisible(!isEditingMessage());
 	}
+	if (_commentsShown) {
+		_commentsShown->setVisible(!_commentsShownHidden.current());
+	}
+	if (_starsReaction) {
+		_starsReaction->show();
+	}
+	updateAiButtonVisibility();
+	updateSendAsFileVisibility();
+}
+
+void ComposeControls::updateAiButtonVisibility() {
+	const auto hidden = !hasEnoughLinesForAi()
+		|| !_wrap->isVisible()
+		|| _recording.current()
+		|| !_field->isVisible();
+	if (_aiButton->isHidden() == hidden) {
+		return;
+	}
+	const auto shown = !hidden;
+	_aiButton->setVisible(shown);
+	if (shown) {
+		updateAiButtonGeometry();
+	}
+	if (_aiTooltipManager) {
+		_aiTooltipManager->updateVisibility(shown);
+	}
+}
+
+void ComposeControls::updateAiButtonGeometry() {
+	if (_aiButton->isHidden()) {
+		return;
+	}
+	const auto x = _send->x() + _send->width() - _aiButton->width();
+	_aiButton->move(QPoint(x, _field->y()) + st::historyAiComposeButtonPosition);
+	if (_aiTooltipManager) {
+		_aiTooltipManager->updateGeometry();
+	}
+}
+
+void ComposeControls::updateSendAsFileVisibility() {
+	if (!_sendAsFile) {
+		return;
+	}
+	const auto hidden = !textExceedsMaxSize()
+		|| _wrap->isHidden()
+		|| _recording.current()
+		|| _field->isHidden();
+	if (_sendAsFile->isHidden() == hidden) {
+		return;
+	}
+	_sendAsFile->setVisible(!hidden);
+	if (!hidden) {
+		updateSendAsFileGeometry();
+	}
+	if (_sendAsFileTooltipManager) {
+		_sendAsFileTooltipManager->updateVisibility(!hidden);
+	}
+}
+
+void ComposeControls::updateSendAsFileGeometry() {
+	if (!_sendAsFile || _sendAsFile->isHidden()) {
+		return;
+	}
+	const auto x = _send->x() + _send->width() - _sendAsFile->width();
+	_sendAsFile->move(QPoint(x, _field->y()) + st::historyAiComposeButtonPosition);
+	if (_sendAsFileTooltipManager) {
+		_sendAsFileTooltipManager->updateGeometry();
+	}
 }
 
 bool ComposeControls::updateLikeShown() {
@@ -2614,15 +3818,101 @@ bool ComposeControls::updateLikeShown() {
 	return false;
 }
 
+void ComposeControls::showAiComposeBox() {
+	const auto text = prepareTextForEditMsg();
+	if (text.text.isEmpty()) {
+		return;
+	}
+	auto send = Fn<void(TextWithEntities, Api::SendOptions, Fn<void()>)>();
+	auto setupMenu = Fn<void(
+		not_null<Ui::RpWidget*>,
+		Fn<void(Api::SendOptions)>)>();
+	if (canSendAiComposeDirect() && _sendWithText) {
+		send = crl::guard(_wrap.get(), [=](
+				TextWithEntities result,
+				Api::SendOptions options,
+				Fn<void()> done) {
+			_sendWithText(std::move(result), options, std::move(done));
+		});
+		setupMenu = crl::guard(_wrap.get(), [=](
+				not_null<Ui::RpWidget*> button,
+				Fn<void(Api::SendOptions)> sendCallback) {
+			setupSendMenu(button, sendCallback);
+		});
+	}
+	Controls::ShowComposeAiBox(_show, {
+		.session = _session,
+		.text = text,
+		.chatStyle = _chatStyle,
+		.apply = crl::guard(_wrap.get(), [=](TextWithEntities result) {
+			const auto action = Ui::InputField::HistoryAction::NewEntry;
+			setFieldText({
+				result.text,
+				TextUtilities::ConvertEntitiesToTextTags(result.entities),
+			}, TextUpdateEvent::SaveDraft, action);
+		}),
+		.send = std::move(send),
+		.setupMenu = std::move(setupMenu),
+	});
+}
+
+void ComposeControls::triggerAiApplyInPlace() {
+	if (!_session) {
+		return;
+	}
+	const auto field = _field;
+	Api::TriggerAiApplyInPlace(
+		_session,
+		_show,
+		_wrap.get(),
+		field,
+		prepareTextForEditMsg(),
+		crl::guard(_wrap.get(), [=](TextWithTags textWithTags, int cursor) {
+			setFieldText(
+				textWithTags,
+				TextUpdateEvent::SaveDraft,
+				Ui::InputField::HistoryAction::NewEntry);
+			field->setCursorPosition(cursor);
+		}));
+}
+
+bool ComposeControls::canSendAiComposeDirect() const {
+	using Type = Ui::SendButton::Type;
+	return _history
+		&& (computeSendButtonType() == Type::Send)
+		&& (_slowmodeSecondsLeft.current() == 0)
+		&& !_sendDisabledBySlowmode.current()
+		&& !shownStarsPerMessage();
+}
+
+bool ComposeControls::hasEnoughLinesForAi() const {
+	return _history
+		&& !_recording.current()
+		&& Ui::HasEnoughLinesForAi(&session(), _field);
+}
+
+bool ComposeControls::textExceedsMaxSize() const {
+	return _history
+		&& !_recording.current()
+		&& (_field->getLastText().size()
+			> Data::PremiumLimits(&session()).messageLengthCurrent());
+}
+
 bool ComposeControls::updateBotCommandShown() {
 	auto shown = false;
 	const auto peer = _history ? _history->peer.get() : nullptr;
-	if (_botCommandStart
-		&& peer
-		&& ((peer->isChat() && peer->asChat()->botStatus > 0)
-			|| (peer->isMegagroup() && peer->asChannel()->mgInfo->botStatus > 0)
-			|| (peer->isUser() && peer->asUser()->isBot()))) {
-		if (!HasSendText(_field)) {
+	if (_botCommandStart && peer) {
+		const auto hasBotCommands = [&] {
+			if (peer->isChat()) {
+				return !peer->asChat()->botCommands().empty();
+			} else if (peer->isMegagroup()) {
+				return !peer->asChannel()->mgInfo->botCommands().empty();
+			} else if (peer->isUser()) {
+				return peer->asUser()->isBot();
+			}
+			return false;
+		}();
+		if (hasBotCommands && !HasSendText(_field)) {
 			shown = true;
 		}
 	}
@@ -2637,7 +3927,7 @@ void ComposeControls::updateOuterGeometry(QRect rect) {
 	if (_inlineResults) {
 		_inlineResults->moveBottom(rect.y());
 	}
-	const auto bottom = rect.y() + rect.height() - _attachToggle->height();
+	const auto bottom = rect.y() + rect.height() - _st.attach.height;
 	if (_tabbedPanel) {
 		_tabbedPanel->moveBottomRight(bottom, rect.x() + rect.width());
 	}
@@ -2666,34 +3956,43 @@ void ComposeControls::updateMessagesTTLShown() {
 	}
 }
 
-bool ComposeControls::updateSendAsButton() {
+bool ComposeControls::updateSendAsButton(
+		std::shared_ptr<Data::GroupCall> videoStream) {
 	const auto peer = _history ? _history->peer.get() : nullptr;
+	const auto type = videoStream
+		? Main::SendAsType::VideoStream
+		: Main::SendAsType::Message;
 	if (!_features.sendAs
 		|| !peer
-		|| !_regularWindow
 		|| isEditingMessage()
-		|| !session().sendAsPeers().shouldChoose(peer)) {
+		|| !session().sendAsPeers().shouldChoose({ peer, type })) {
 		if (!_sendAs) {
 			return false;
 		}
+		_videoStreamAdmin = false;
 		_sendAs = nullptr;
 		return true;
 	} else if (_sendAs) {
 		return false;
 	}
-	_sendAs = std::make_unique<Ui::SendAsButton>(
-		_wrap.get(),
-		st::sendAsButton);
-	Ui::SetupSendAsButton(
-		_sendAs.get(),
-		rpl::single(peer),
-		_regularWindow);
+	const auto &st = _st.chooseSendAs;
+	_sendAs = std::make_unique<Ui::SendAsButton>(_wrap.get(), st.button);
+	if (videoStream) {
+		Ui::SetupSendAsButton(_sendAs.get(), st, videoStream, _show);
+		_videoStreamAdmin = videoStream->creator();
+		initEditStarsButton();
+		updateControlsGeometry(_wrap->size());
+	} else {
+		Ui::SetupSendAsButton(_sendAs.get(), st, rpl::single(peer), _show);
+		_videoStreamAdmin = false;
+	}
 	return true;
 }
 
 void ComposeControls::updateAttachBotsMenu() {
 	_attachBotsMenu = nullptr;
 	if (!_features.attachBotsMenu
+		|| !_features.attachments
 		|| !_history
 		|| !_sendActionFactory
 		|| !_regularWindow) {
@@ -2704,6 +4003,7 @@ void ComposeControls::updateAttachBotsMenu() {
 		_regularWindow,
 		_history->peer,
 		_sendActionFactory,
+		[=] { return sendMenuDetails(); },
 		[=](bool compress) { _attachRequests.fire_copy(compress); });
 	if (!_attachBotsMenu) {
 		return;
@@ -2712,20 +4012,28 @@ void ComposeControls::updateAttachBotsMenu() {
 		Ui::PanelAnimation::Origin::BottomLeft);
 	_attachToggle->installEventFilter(_attachBotsMenu.get());
 	_attachBotsMenu->heightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateOuterGeometry(_wrap->geometry());
 	}, _attachBotsMenu->lifetime());
 }
 
 void ComposeControls::paintBackground(QPainter &p, QRect full, QRect clip) {
 	if (_backgroundRect) {
-		//p.setCompositionMode(QPainter::CompositionMode_Source);
-		//p.fillRect(clip, Qt::transparent);
-		//p.setCompositionMode(QPainter::CompositionMode_SourceOver);
-		//_backgroundRect->paint(p, _wrap->rect());
 		auto hq = PainterHighQualityEnabler(p);
 		p.setBrush(_st.bg);
 		p.setPen(Qt::NoPen);
+		const auto r = _st.radius;
+		if (_commentsShown && !_commentsShown->isHidden()) {
+			p.drawRoundedRect(_commentsShown->geometry(), r, r);
+			full.setLeft(full.left()
+				+ _commentsShown->width()
+				+ _st.commentsSkip);
+		}
+		if (_starsReaction) {
+			full.setWidth(full.width()
+				- _starsReaction->width()
+				- _st.starsSkip);
+		}
 		p.drawRoundedRect(full, _st.radius, _st.radius);
 	} else {
 		p.fillRect(clip, _st.bg);
@@ -2809,9 +4117,11 @@ void ComposeControls::toggleTabbedSelectorMode() {
 				&& !_regularWindow->adaptive().isOneColumn()) {
 			Core::App().settings().setTabbedSelectorSectionEnabled(true);
 			Core::App().saveSettingsDelayed();
-			const auto topic = _history->peer->forumTopicFor(_topicRootId);
+			const auto thread = _history->threadFor(
+				_topicRootId,
+				_monoforumPeerId);
 			pushTabbedSelectorToThirdSection(
-				(topic ? topic : (Data::Thread*)_history),
+				thread ? thread : _history,
 				Window::SectionShow::Way::ClearStack);
 		} else {
 			_tabbedPanel->toggleAnimated();
@@ -2822,9 +4132,10 @@ void ComposeControls::toggleTabbedSelectorMode() {
 }
 
 void ComposeControls::updateHeight() {
-	const auto height = _field->height()
-		+ (_header->isDisplayed() ? _header->height() : 0)
-		+ 2 * st::historySendPadding;
+	const auto height = (_header->isDisplayed() ? _header->height() : 0)
+		+ _st.padding.top()
+		+ _field->height()
+		+ _st.padding.bottom();
 	if (height != _wrap->height()) {
 		_wrap->resize(_wrap->width(), height);
 	}
@@ -2835,7 +4146,9 @@ void ComposeControls::editMessage(
 		const TextSelection &selection) {
 	if (const auto item = session().data().message(id)) {
 		editMessage(item);
-		SelectTextInFieldWithMargins(_field, selection);
+		if (!item->richPage()) {
+			SelectTextInFieldWithMargins(_field, selection);
+		}
 	}
 }
 
@@ -2843,9 +4156,24 @@ void ComposeControls::editMessage(not_null<HistoryItem*> item) {
 	Expects(_history != nullptr);
 	Expects(draftKeyCurrent() != Data::DraftKey::None());
 
-	if (_voiceRecordBar->isActive()) {
+	if (item->richPage()) {
+#ifdef TDESKTOP_IV_EDITOR
+		if (_regularWindow) {
+			Iv::Editor::ShowEditBox(_regularWindow, item);
+		} else {
+			_show->showToast(tr::lng_edit_error(tr::now));
+		}
+#endif // TDESKTOP_IV_EDITOR
+		return;
+	} else if (_voiceRecordBar->isActive()) {
 		_show->showBox(Ui::MakeInformBox(tr::lng_edit_caption_voice()));
 		return;
+	} else if (const auto media = item->media()) {
+		if (media->todolist()) {
+			Assert(_regularWindow != nullptr);
+			Window::PeerMenuEditTodoList(_regularWindow, item);
+			return;
+		}
 	}
 
 	if (!isEditingMessage()) {
@@ -2865,7 +4193,9 @@ void ComposeControls::editMessage(not_null<HistoryItem*> item) {
 			FullReplyTo{
 				.messageId = item->fullId(),
 				.topicRootId = key.topicRootId(),
+				.monoforumPeerId = key.monoforumPeerId(),
 			},
+			SuggestOptions(),
 			cursor,
 			Data::WebPageDraft::FromItem(item)));
 	applyDraft();
@@ -2882,7 +4212,7 @@ void ComposeControls::editMessage(not_null<HistoryItem*> item) {
 }
 
 bool ComposeControls::updateReplaceMediaButton() {
-	if (!_canReplaceMedia || !_regularWindow) {
+	if ((!_canReplaceMedia && !_canAddMedia) || !_regularWindow) {
 		const auto result = (_replaceMedia != nullptr);
 		_replaceMedia = nullptr;
 		return result;
@@ -2891,7 +4221,10 @@ bool ComposeControls::updateReplaceMediaButton() {
 	}
 	_replaceMedia = std::make_unique<Ui::IconButton>(
 		_wrap.get(),
-		st::historyReplaceMedia);
+		_canReplaceMedia ? st::historyReplaceMedia : st::historyAddMedia);
+	_replaceMedia->setAccessibleName(_canReplaceMedia
+		? tr::lng_attach_replace(tr::now)
+		: tr::lng_attach(tr::now));
 	const auto hideDuration = st::historyReplaceMedia.ripple.hideDuration;
 	_replaceMedia->setClickedCallback([=] {
 		base::call_delayed(hideDuration, _wrap.get(), [=] {
@@ -2900,6 +4233,7 @@ bool ComposeControls::updateReplaceMediaButton() {
 				_regularWindow,
 				_editingId,
 				_field->getTextWithTags(),
+				_header->suggestOptions(),
 				queryToEdit.spoilered,
 				queryToEdit.options.invertCaption,
 				crl::guard(_wrap.get(), [=] { cancelEditMessage(); }));
@@ -2914,10 +4248,7 @@ void ComposeControls::cancelEditMessage() {
 
 	_history->clearDraft(draftKey(DraftType::Edit));
 	applyDraft();
-
-	_saveDraftText = true;
-	_saveDraftStart = crl::now();
-	saveDraft();
+	saveDraftWithTextNow();
 }
 
 void ComposeControls::maybeCancelEditMessage() {
@@ -2945,6 +4276,7 @@ void ComposeControls::replyToMessage(FullReplyTo id) {
 	Expects(draftKeyCurrent() != Data::DraftKey::None());
 
 	id.topicRootId = _topicRootId;
+	id.monoforumPeerId = _monoforumPeerId;
 	if (!id) {
 		cancelReplyMessage();
 		return;
@@ -2952,6 +4284,7 @@ void ComposeControls::replyToMessage(FullReplyTo id) {
 	if (isEditingMessage()) {
 		const auto key = draftKey(DraftType::Normal);
 		Assert(key.topicRootId() == id.topicRootId);
+		Assert(key.monoforumPeerId() == id.monoforumPeerId);
 		if (const auto localDraft = _history->draft(key)) {
 			localDraft->reply = id;
 		} else {
@@ -2960,19 +4293,14 @@ void ComposeControls::replyToMessage(FullReplyTo id) {
 				std::make_unique<Data::Draft>(
 					TextWithTags(),
 					id,
+					SuggestOptions(),
 					MessageCursor(),
 					Data::WebPageDraft()));
 		}
 	} else {
 		_header->replyToMessage(id);
-		if (_header->replyingToMessage()) {
-			cancelForward();
-		}
 	}
-
-	_saveDraftText = true;
-	_saveDraftStart = crl::now();
-	saveDraft();
+	saveDraftWithTextNow();
 }
 
 void ComposeControls::cancelReplyMessage() {
@@ -2990,20 +4318,17 @@ void ComposeControls::cancelReplyMessage() {
 			}
 		}
 		if (wasReply) {
-			_saveDraftText = true;
-			_saveDraftStart = crl::now();
-			saveDraft();
+			saveDraftWithTextNow();
 		}
 	}
 }
 
 void ComposeControls::updateForwarding() {
-	const auto rootId = _topicRootId;
-	const auto thread = (_history && rootId)
-		? _history->peer->forumTopicFor(rootId)
+	const auto thread = (_history && (_topicRootId || _monoforumPeerId))
+		? _history->threadFor(_topicRootId, _monoforumPeerId)
 		: (Data::Thread*)_history;
 	_header->updateForwarding(thread, thread
-		? _history->resolveForwardDraft(rootId)
+		? _history->resolveForwardDraft(_topicRootId, _monoforumPeerId)
 		: Data::ResolvedForwardDraft());
 	updateSendButtonType();
 }
@@ -3018,12 +4343,12 @@ bool ComposeControls::handleCancelRequest() {
 	} else if (isEditingMessage()) {
 		maybeCancelEditMessage();
 		return true;
+	} else if (replyingToMessage().replying()) {
+		cancelReplyMessage();
+		return true;
 	} else if (readyToForward()) {
 		cancelForward();
 		return true;
-	} else if (replyingToMessage()) {
-		cancelReplyMessage();
-		return true;
 	}
 	return false;
 }
@@ -3038,6 +4363,7 @@ void ComposeControls::tryProcessKeyInput(not_null<QKeyEvent*> e) {
 void ComposeControls::initWebpageProcess() {
 	if (!_history) {
 		_preview = nullptr;
+		_previewShown = false;
 		_header->previewUnregister();
 		return;
 	}
@@ -3046,8 +4372,13 @@ void ComposeControls::initWebpageProcess() {
 		_history,
 		_field);
 
+	_preview->parsedValue(
+	) | rpl::on_next([=](Controls::WebpageParsed parsed) {
+		_previewShown = !!parsed;
+	}, _historyLifetime);
+
 	_preview->repaintRequests(
-	) | rpl::start_with_next(crl::guard(_header.get(), [=] {
+	) | rpl::on_next(crl::guard(_header.get(), [=] {
 		_header->update();
 	}), _historyLifetime);
 
@@ -3056,14 +4387,16 @@ void ComposeControls::initWebpageProcess() {
 		| Data::PeerUpdate::Flag::Notifications
 		| Data::PeerUpdate::Flag::MessagesTTL
 		| Data::PeerUpdate::Flag::FullInfo
+		| Data::PeerUpdate::Flag::StarsPerMessage
 	) | rpl::filter([peer = _history->peer](const Data::PeerUpdate &update) {
 		return (update.peer.get() == peer);
 	}) | rpl::map([](const Data::PeerUpdate &update) {
 		return update.flags;
-	}) | rpl::start_with_next([=](Data::PeerUpdate::Flags flags) {
+	}) | rpl::on_next([=](Data::PeerUpdate::Flags flags) {
 		if (flags & Data::PeerUpdate::Flag::Rights) {
 			_preview->checkNow(false);
 			updateFieldPlaceholder();
+			updateSendButtonType();
 		}
 		if (flags & Data::PeerUpdate::Flag::Notifications) {
 			updateSilentBroadcast();
@@ -3071,7 +4404,11 @@ void ComposeControls::initWebpageProcess() {
 		if (flags & Data::PeerUpdate::Flag::MessagesTTL) {
 			updateMessagesTTLShown();
 		}
+		if (flags & Data::PeerUpdate::Flag::StarsPerMessage) {
+			updateFieldPlaceholder();
+		}
 		if (flags & Data::PeerUpdate::Flag::FullInfo) {
+			updateSendButtonType();
 			if (updateBotCommandShown()) {
 				updateControlsVisibility();
 				updateControlsGeometry(_wrap->size());
@@ -3079,6 +4416,16 @@ void ComposeControls::initWebpageProcess() {
 		}
 	}, _historyLifetime);
 
+	session().data().botCommandsChanges(
+	) | rpl::filter([peer = _history->peer](not_null<PeerData*> p) {
+		return (p == peer);
+	}) | rpl::on_next([=] {
+		if (updateBotCommandShown()) {
+			updateControlsVisibility();
+			updateControlsGeometry(_wrap->size());
+		}
+	}, _historyLifetime);
+
 	_header->previewReady(_preview->parsedValue());
 }
 
@@ -3086,12 +4433,17 @@ void ComposeControls::initForwardProcess() {
 	using EntryUpdateFlag = Data::EntryUpdate::Flag;
 	session().changes().entryUpdates(
 		EntryUpdateFlag::ForwardDraft
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		if (const auto topic = update.entry->asTopic()) {
 			if (topic->history() == _history
 				&& topic->rootId() == _topicRootId) {
 				updateForwarding();
 			}
+		} else if (const auto sublist = update.entry->asSublist()) {
+			if (sublist->owningHistory() == _history
+				&& sublist->sublistPeer()->id == _monoforumPeerId) {
+				updateForwarding();
+			}
 		}
 	}, _wrap->lifetime());
 
@@ -3115,6 +4467,7 @@ bool ComposeControls::isEditingMessage() const {
 FullReplyTo ComposeControls::replyingToMessage() const {
 	auto result = _header->replyingToMessage();
 	result.topicRootId = _topicRootId;
+	result.monoforumPeerId = _monoforumPeerId;
 	return result;
 }
 
@@ -3149,8 +4502,9 @@ bool ComposeControls::isRecording() const {
 bool ComposeControls::isRecordingPressed() const {
 	return !_voiceRecordBar->isRecordingLocked()
 		&& (!_voiceRecordBar->isHidden()
-			|| (_send->type() == Ui::SendButton::Type::Record
-				&& _send->isDown()));
+			|| (_send->isDown()
+				&& (_send->type() == Ui::SendButton::Type::Record
+					|| _send->type() == Ui::SendButton::Type::Round)));
 }
 
 rpl::producer<bool> ComposeControls::recordingActiveValue() const {
@@ -3165,9 +4519,7 @@ rpl::producer<bool> ComposeControls::fieldMenuShownValue() const {
 	return _field->menuShownValue();
 }
 
-not_null<Ui::RpWidget*> ComposeControls::likeAnimationTarget() const {
-	Expects(_like != nullptr);
-
+Ui::RpWidget *ComposeControls::likeAnimationTarget() const {
 	return _like;
 }
 
@@ -3211,7 +4563,10 @@ void ComposeControls::updateInlineBotQuery() {
 			_inlineLookingUpBot = true;
 			const auto username = _inlineBotUsername;
 			_inlineBotResolveRequestId = api.request(
-				MTPcontacts_ResolveUsername(MTP_string(username))
+				MTPcontacts_ResolveUsername(
+					MTP_flags(0),
+					MTP_string(username),
+					MTP_string())
 			).done([=](const MTPcontacts_ResolvedPeer &result) {
 				Expects(result.type() == mtpc_contacts_resolvedPeer);
 
@@ -3288,7 +4643,7 @@ void ComposeControls::applyInlineBotQuery(
 				return sendMenuDetails();
 			});
 			_inlineResults->requesting(
-			) | rpl::start_with_next([=](bool requesting) {
+			) | rpl::on_next([=](bool requesting) {
 				_tabbedSelectorToggle->setLoading(requesting);
 			}, _inlineResults->lifetime());
 			updateOuterGeometry(_wrap->geometry());
@@ -3325,6 +4680,10 @@ Fn<void()> ComposeControls::restoreTextCallback(
 	});
 }
 
+Ui::InputField *ComposeControls::fieldForMention() const {
+	return _writeRestriction.current() ? nullptr : _field.get();
+}
+
 TextWithEntities ComposeControls::prepareTextForEditMsg() const {
 	if (!_history) {
 		return {};
@@ -3352,11 +4711,12 @@ void ComposeControls::checkCharsLimitation() {
 	}
 	const auto hasMediaWithCaption = item->media()
 		&& item->media()->allowsEditCaption();
-	const auto maxCaptionSize = !hasMediaWithCaption
-		? MaxMessageSize
-		: Data::PremiumLimits(&session()).captionLengthCurrent();
+	const auto limits = Data::PremiumLimits(&session());
+	const auto maxTextSize = hasMediaWithCaption
+		? limits.captionLengthCurrent()
+		: limits.messageLengthCurrent();
 	const auto remove = Ui::ComputeFieldCharacterCount(_field)
-		- maxCaptionSize;
+		- maxTextSize;
 	if (remove > 0) {
 		if (!_charsLimitation) {
 			using namespace Controls;
@@ -3365,11 +4725,6 @@ void ComposeControls::checkCharsLimitation() {
 				_send.get(),
 				style::al_bottom);
 			_charsLimitation->show();
-			Data::AmPremiumValue(
-				&session()
-			) | rpl::start_with_next([=] {
-				checkCharsLimitation();
-			}, _charsLimitation->lifetime());
 		}
 		_charsLimitation->setLeft(remove);
 	} else {
@@ -3412,7 +4767,7 @@ rpl::producer<bool> SendDisabledBySlowmode(not_null<PeerData*> peer) {
 	using namespace rpl::mappers;
 	const auto channel = peer->asChannel();
 	return (!channel || channel->amCreator())
-		? (rpl::single(false) | rpl::type_erased())
+		? (rpl::single(false) | rpl::type_erased)
 		: rpl::combine(
 			channel->slowmodeAppliedValue(),
 			std::move(hasSendingMessage),
@@ -3436,12 +4791,12 @@ void ShowPhotoEditSpoilerMenu(
 	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
 		parent,
 		st::popupMenuWithIcons);
-	menu->addAction(
-		spoilered
-			? tr::lng_context_disable_spoiler(tr::now)
-			: tr::lng_context_spoiler_effect(tr::now),
+	Menu::AddCheckedAction(
+		menu,
+		tr::lng_context_spoiler_effect(tr::now),
 		[=] { callback(!spoilered); },
-		spoilered ? &st::menuIconSpoilerOff : &st::menuIconSpoiler);
+		&st::menuIconSpoiler,
+		spoilered);
 	menu->popup(QCursor::pos());
 }
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index fc26079e79a103..294dcb0be4855c 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -46,7 +46,9 @@ struct MessagePosition;
 struct Draft;
 class DraftKey;
 class PhotoMedia;
+class GroupCall;
 struct WebPageDraft;
+struct MessageReactionsTopPaid;
 } // namespace Data
 
 namespace InlineBots {
@@ -59,13 +61,18 @@ struct ResultSelected;
 } // namespace InlineBots
 
 namespace Ui {
+class AbstractButton;
 class SendButton;
 class IconButton;
 class EmojiButton;
 class SendAsButton;
 class SilentToggle;
 class DropdownMenu;
+struct PreparedBundle;
 struct PreparedList;
+struct SendStarButtonState;
+class ReactionFlyAnimation;
+class ChatStyle;
 } // namespace Ui
 
 namespace Ui::Emoji {
@@ -74,8 +81,13 @@ class SuggestionsController;
 
 namespace Main {
 class Session;
+struct SendAsKey;
 } // namespace Main
 
+namespace Webrtc {
+enum class RecordAvailability : uchar;
+} // namespace Webrtc
+
 namespace Window {
 struct SectionShow;
 class SessionController;
@@ -90,6 +102,9 @@ class VoiceRecordBar;
 class TTLButton;
 class WebpageProcessor;
 class CharactersLimitLabel;
+class ComposeAiButton;
+class ComposeTooltipManager;
+using AiTooltipManager = ComposeTooltipManager;
 } // namespace HistoryView::Controls
 
 namespace HistoryView {
@@ -133,6 +148,8 @@ class ComposeControls final {
 	using ReplyNextRequest = Controls::ReplyNextRequest;
 	using FieldHistoryAction = Ui::InputField::HistoryAction;
 	using Mode = ComposeControlsMode;
+	using ToggleCommentsState = Controls::ToggleCommentsState;
+	using SendStarButtonEffect = Controls::SendStarButtonEffect;
 
 	ComposeControls(
 		not_null<Ui::RpWidget*> parent,
@@ -141,6 +158,7 @@ class ComposeControls final {
 
 	[[nodiscard]] Main::Session &session() const;
 	void setHistory(SetHistoryArgs &&args);
+	void updateFeatures(ChatHelpers::ComposeFeatures features);
 	void updateTopicRootId(MsgId topicRootId);
 	void updateShortcutId(BusinessShortcutId shortcutId);
 	void setCurrentDialogsEntryState(Dialogs::EntryState state);
@@ -154,6 +172,22 @@ class ComposeControls final {
 	[[nodiscard]] rpl::producer<int> height() const;
 	[[nodiscard]] int heightCurrent() const;
 
+	void setupCommentsShownNewDot();
+	void setToggleCommentsButton(rpl::producer<ToggleCommentsState> state);
+	[[nodiscard]] rpl::producer<> commentsShownToggles() const;
+	void setStarsReactionCounter(
+		rpl::producer<Ui::SendStarButtonState> count,
+		rpl::producer<SendStarButtonEffect> effects);
+	using StarReactionTop = Data::MessageReactionsTopPaid;
+	void setStarsReactionTop(
+		rpl::producer<std::vector<StarReactionTop>> top);
+	struct StarReactionIncrement {
+		int count = 0;
+		bool fromBox = false;
+	};
+	[[nodiscard]] auto starsReactionIncrements() const
+		-> rpl::producer<StarReactionIncrement>;
+
 	bool focus();
 	[[nodiscard]] bool focused() const;
 	[[nodiscard]] rpl::producer<bool> focusedValue() const;
@@ -164,6 +198,11 @@ class ComposeControls final {
 	[[nodiscard]] rpl::producer<QString> sendCommandRequests() const;
 	[[nodiscard]] rpl::producer<MessageToEdit> editRequests() const;
 	[[nodiscard]] rpl::producer<std::optional<bool>> attachRequests() const;
+	void setSendAsFileConfirmed(
+		Fn<void(
+			std::shared_ptr<Ui::PreparedBundle>,
+			Api::SendOptions)> confirmed);
+	void processChosenSticker(FileChosen &&chosen);
 	[[nodiscard]] rpl::producer<FileChosen> fileChosen() const;
 	[[nodiscard]] rpl::producer<PhotoChosen> photoChosen() const;
 	[[nodiscard]] rpl::producer<FullReplyTo> jumpToItemRequests() const;
@@ -179,6 +218,7 @@ class ComposeControls final {
 	-> rpl::producer<ReplyNextRequest>;
 	[[nodiscard]] rpl::producer<> focusRequests() const;
 	[[nodiscard]] rpl::producer<> showScheduledRequests() const;
+	[[nodiscard]] rpl::producer<> scrollToMaxRequests() const;
 
 	using MimeDataHook = Fn<bool(
 		not_null<const QMimeData*> data,
@@ -223,6 +263,9 @@ class ComposeControls final {
 	void hidePanelsAnimated();
 	void clearListenState();
 
+	void clearChosenStarsForMessage();
+	[[nodiscard]] int chosenStarsForMessage() const;
+
 	void hide();
 	void show();
 
@@ -234,7 +277,7 @@ class ComposeControls final {
 	[[nodiscard]] rpl::producer<bool> recordingActiveValue() const;
 	[[nodiscard]] rpl::producer<bool> hasSendTextValue() const;
 	[[nodiscard]] rpl::producer<bool> fieldMenuShownValue() const;
-	[[nodiscard]] not_null<Ui::RpWidget*> likeAnimationTarget() const;
+	[[nodiscard]] Ui::RpWidget *likeAnimationTarget() const;
 	[[nodiscard]] int fieldCharacterCount() const;
 
 	[[nodiscard]] TextWithEntities prepareTextForEditMsg() const;
@@ -245,7 +288,10 @@ class ComposeControls final {
 
 	Fn<void()> restoreTextCallback(const QString &insertTextOnCancel) const;
 
+	[[nodiscard]] Ui::InputField *fieldForMention() const;
+
 private:
+	struct StarEffect;
 	enum class TextUpdateEvent {
 		SaveDraft = (1 << 0),
 		SendTyping = (1 << 1),
@@ -266,21 +312,41 @@ class ComposeControls final {
 	void initFieldAutocomplete();
 	void initTabbedSelector();
 	void initSendButton();
-	void initSendAsButton(not_null<PeerData*> peer);
+	void initSendAsButton(
+		not_null<PeerData*> peer,
+		std::shared_ptr<Data::GroupCall> videoStream);
 	void initWebpageProcess();
 	void initForwardProcess();
 	void initWriteRestriction();
 	void initVoiceRecordBar();
 	void initKeyHandler();
+	void initLikeButton();
+	void initEditStarsButton();
+	void initAiButton();
+	void updateControlsParents();
 	void updateSubmitSettings();
 	void updateSendButtonType();
 	void updateMessagesTTLShown();
-	bool updateSendAsButton();
+	bool updateSendAsButton(std::shared_ptr<Data::GroupCall> videoStream);
 	void updateAttachBotsMenu();
 	void updateHeight();
 	void updateWrappingVisibility();
 	void updateControlsVisibility();
 	void updateControlsGeometry(QSize size);
+	void updateAiButtonVisibility();
+	void updateAiButtonGeometry();
+	void initSendAsFileButton();
+	void fireSendTextAsFile(
+		const QString &fileText,
+		Fn<void()> restoreText);
+	[[nodiscard]] bool checkLargeTextPaste(
+		not_null<const QMimeData*> data,
+		Ui::InputField::MimeAction action);
+	void updateSendAsFileVisibility();
+	void updateSendAsFileGeometry();
+	void setupSendMenu(
+		not_null<Ui::RpWidget*> button,
+		Fn<void(Api::SendOptions)> send);
 	bool updateReplaceMediaButton();
 	void updateOuterGeometry(QRect rect);
 	void paintBackground(QPainter &p, QRect full, QRect clip);
@@ -292,6 +358,7 @@ class ComposeControls final {
 
 	[[nodiscard]] auto sendContentRequests(
 		SendRequestType requestType = SendRequestType::Text) const;
+	void editStarsFrom(int selected = 0);
 
 	void orderControls();
 	void updateFieldPlaceholder();
@@ -303,16 +370,28 @@ class ComposeControls final {
 	void toggleTabbedSelectorMode();
 	void createTabbedPanel();
 	void setTabbedPanel(std::unique_ptr<ChatHelpers::TabbedPanel> panel);
+	void showAiComposeBox();
+	void triggerAiApplyInPlace();
+	[[nodiscard]] bool canSendAiComposeDirect() const;
 
-	bool showRecordButton() const;
+	[[nodiscard]] bool showRecordButton() const;
+	[[nodiscard]] bool showEditStarsButton() const;
+	[[nodiscard]] int shownStarsPerMessage() const;
 	bool updateBotCommandShown();
 	bool updateLikeShown();
+	[[nodiscard]] bool hasEnoughLinesForAi() const;
+	[[nodiscard]] bool textExceedsMaxSize() const;
 
 	void cancelInlineBot();
 	void clearInlineBot();
 	void inlineBotChanged();
 
-	bool hasSilentBroadcastToggle() const;
+	[[nodiscard]] bool hasSilentBroadcastToggle() const;
+	[[nodiscard]] bool editStarsButtonShown() const;
+	void startStarsSendEffect();
+	void setupStarsSendEffectsCanvas();
+	void startStarsEffect(SendStarButtonEffect event);
+	void setupStarsEffectsCanvas();
 
 	// Look in the _field for the inline bot and query string.
 	void updateInlineBotQuery();
@@ -325,6 +404,7 @@ class ComposeControls final {
 	[[nodiscard]] Data::DraftKey draftKeyCurrent() const;
 	void saveDraft(bool delayed = false);
 	void saveDraftDelayed();
+	void saveDraftWithTextNow();
 	void saveCloudDraft();
 
 	void writeDrafts();
@@ -346,8 +426,8 @@ class ComposeControls final {
 	void checkCharsLimitation();
 
 	const style::ComposeControls &_st;
-	const ChatHelpers::ComposeFeatures _features;
-	const not_null<QWidget*> _parent;
+	ChatHelpers::ComposeFeatures _features;
+	const not_null<Ui::RpWidget*> _parent;
 	const not_null<QWidget*> _panelsParent;
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const not_null<Main::Session*> _session;
@@ -359,9 +439,11 @@ class ComposeControls final {
 
 	History *_history = nullptr;
 	MsgId _topicRootId = 0;
+	PeerId _monoforumPeerId = 0;
 	BusinessShortcutId _shortcutId = 0;
 	Fn<bool()> _showSlowmodeError;
 	Fn<Api::SendAction()> _sendActionFactory;
+	Fn<void(TextWithEntities, Api::SendOptions, Fn<void()>)> _sendWithText;
 	rpl::variable<int> _slowmodeSecondsLeft;
 	rpl::variable<bool> _sendDisabledBySlowmode;
 	rpl::variable<bool> _liked;
@@ -376,14 +458,28 @@ class ComposeControls final {
 	std::optional<Ui::RoundRect> _backgroundRect;
 
 	const std::shared_ptr<Ui::SendButton> _send;
-	Ui::IconButton * const _like = nullptr;
-	const not_null<Ui::IconButton*> _attachToggle;
+	Controls::ComposeAiButton * const _aiButton = nullptr;
+	Ui::IconButton * const _sendAsFile = nullptr;
+	Ui::IconButton *_editStars = nullptr;
+	Ui::IconButton *_like = nullptr;
+	rpl::variable<int> _minStarsCount;
+	std::optional<int> _chosenStarsCount;
+	Ui::IconButton *_commentsShown = nullptr;
+	rpl::variable<bool> _commentsShownHidden;
+	Ui::RpWidget *_commentsShownNewDot = nullptr;
+	Ui::IconButton *_attachToggle = nullptr;
+	Ui::AbstractButton *_starsReaction = nullptr;
+	std::vector<std::unique_ptr<Ui::ReactionFlyAnimation>> _starSendEffects;
+	std::unique_ptr<Ui::RpWidget> _starSendEffectsCanvas;
+	std::vector<std::unique_ptr<StarEffect>> _starEffects;
+	std::unique_ptr<Ui::RpWidget> _starEffectsCanvas;
 	std::unique_ptr<Ui::IconButton> _replaceMedia;
 	const not_null<Ui::EmojiButton*> _tabbedSelectorToggle;
 	rpl::producer<QString> _fieldCustomPlaceholder;
 	const not_null<Ui::InputField*> _field;
 	Ui::IconButton * const _botCommandStart = nullptr;
 	std::unique_ptr<Ui::SendAsButton> _sendAs;
+	rpl::variable<bool> _videoStreamAdmin;
 	std::unique_ptr<Ui::SilentToggle> _silent;
 	std::unique_ptr<Controls::TTLButton> _ttlInfo;
 	base::unique_qptr<Controls::CharactersLimitLabel> _charsLimitation;
@@ -398,6 +494,9 @@ class ComposeControls final {
 	friend class FieldHeader;
 	const std::unique_ptr<FieldHeader> _header;
 	const std::unique_ptr<Controls::VoiceRecordBar> _voiceRecordBar;
+	std::unique_ptr<Controls::AiTooltipManager> _aiTooltipManager;
+	std::unique_ptr<Controls::AiTooltipManager> _sendAsFileTooltipManager;
+	std::shared_ptr<Ui::ChatStyle> _chatStyle;
 
 	const Fn<SendMenu::Details()> _sendMenuDetails;
 	const Fn<void(not_null<DocumentData*>)> _unavailableEmojiPasted;
@@ -412,10 +511,14 @@ class ComposeControls final {
 	rpl::event_stream<not_null<QKeyEvent*>> _scrollKeyEvents;
 	rpl::event_stream<not_null<QKeyEvent*>> _editLastMessageRequests;
 	rpl::event_stream<std::optional<bool>> _attachRequests;
+	Fn<void(std::shared_ptr<Ui::PreparedBundle>, Api::SendOptions)> _sendAsFileConfirmed;
 	rpl::event_stream<> _likeToggled;
 	rpl::event_stream<ReplyNextRequest> _replyNextRequests;
 	rpl::event_stream<> _focusRequests;
 	rpl::event_stream<> _showScheduledRequests;
+	rpl::event_stream<> _commentsShownToggles;
+	rpl::event_stream<StarReactionIncrement> _starsReactionIncrements;
+	rpl::variable<std::vector<StarReactionTop>> _starsReactionTop;
 	rpl::variable<bool> _recording;
 	rpl::variable<bool> _hasSendText;
 
@@ -436,12 +539,15 @@ class ComposeControls final {
 	bool _isInlineBot = false;
 	bool _botCommandShown = false;
 	bool _likeShown = false;
+	Webrtc::RecordAvailability _recordAvailability = {};
 
 	FullMsgId _editingId;
 	std::shared_ptr<Data::PhotoMedia> _photoEditMedia;
 	bool _canReplaceMedia = false;
+	bool _canAddMedia = false;
 
 	std::unique_ptr<Controls::WebpageProcessor> _preview;
+	bool _previewShown = false;
 
 	rpl::lifetime _historyLifetime;
 	rpl::lifetime _uploaderSubscriptions;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
index 35fbc2134bc01c..66659ad75a413f 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_media_edit_manager.cpp
@@ -29,13 +29,14 @@ void MediaEditManager::start(
 		std::optional<bool> invertCaption) {
 	const auto media = item->media();
 	if (!media) {
+		cancel();
 		return;
 	}
 	_item = item;
 	_spoilered = spoilered.value_or(media->hasSpoiler());
 	_invertCaption = invertCaption.value_or(item->invertMedia());
 	_lifetime = item->history()->owner().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> removed) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> removed) {
 		if (removed == _item) {
 			cancel();
 		}
@@ -59,6 +60,8 @@ void MediaEditManager::apply(SendMenu::Action action) {
 void MediaEditManager::cancel() {
 	_menu = nullptr;
 	_item = nullptr;
+	_spoilered = false;
+	_invertCaption = false;
 	_lifetime.destroy();
 }
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
index cc4463594d406c..1ddd1e17b66ae9 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
@@ -15,6 +15,7 @@ For license and copyright information please follow this link:
 #include "data/data_saved_messages.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "dialogs/dialogs_key.h"
 #include "dialogs/dialogs_search_from_controllers.h" // SearchFromBox
 #include "dialogs/dialogs_search_tags.h"
 #include "dialogs/ui/dialogs_layout.h"
@@ -31,6 +32,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/painter.h"
+#include "ui/ui_utility.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
@@ -41,6 +43,7 @@ For license and copyright information please follow this link:
 namespace HistoryView {
 namespace {
 
+using Activation = ComposeSearch::Activation;
 using SearchRequest = Api::MessagesSearchMerged::Request;
 
 [[nodiscard]] inline bool HasChooseFrom(not_null<History*> history) {
@@ -52,7 +55,9 @@ using SearchRequest = Api::MessagesSearchMerged::Request;
 
 class Row final : public PeerListRow {
 public:
-	explicit Row(std::unique_ptr<Dialogs::FakeRow> fakeRow);
+	explicit Row(
+		std::unique_ptr<Dialogs::FakeRow> fakeRow,
+		not_null<QString*> query);
 
 	[[nodiscard]] FullMsgId fullId() const;
 
@@ -71,15 +76,17 @@ class Row final : public PeerListRow {
 private:
 	const std::unique_ptr<Dialogs::FakeRow> _fakeRow;
 
+	not_null<QString*> _query;
 	int _outerWidth = 0;
 
 };
 
-Row::Row(std::unique_ptr<Dialogs::FakeRow> fakeRow)
+Row::Row(std::unique_ptr<Dialogs::FakeRow> fakeRow, not_null<QString*> query)
 : PeerListRow(
 	fakeRow->searchInChat().history()->peer,
 	fakeRow->item()->fullId().msg.bare)
-, _fakeRow(std::move(fakeRow)) {
+, _fakeRow(std::move(fakeRow))
+, _query(query) {
 }
 
 FullMsgId Row::fullId() const {
@@ -114,9 +121,11 @@ void Row::elementsPaint(
 		.st = &st::defaultDialogRow,
 		.currentBg = st::dialogsBg,
 		.now = crl::now(),
+		.searchLowerText = QStringView(*_query),
 		.width = outerWidth,
 		.selected = selected,
 		.paused = p.inactive(),
+		.search = true,
 	});
 }
 
@@ -132,6 +141,7 @@ class ListController final : public PeerListController {
 	void loadMoreRows() override;
 
 	void addItems(const MessageIdsList &ids, bool clear);
+	void setQuery(const QString &query);
 
 	[[nodiscard]] rpl::producer<FullMsgId> showItemRequests() const;
 	[[nodiscard]] rpl::producer<> searchMoreRequests() const;
@@ -143,6 +153,8 @@ class ListController final : public PeerListController {
 	rpl::event_stream<> _searchMoreRequests;
 	rpl::event_stream<> _resetScrollRequests;
 
+	QString _query;
+
 };
 
 ListController::ListController(not_null<History*> history)
@@ -150,7 +162,7 @@ ListController::ListController(not_null<History*> history)
 }
 
 Main::Session &ListController::session() const {
-	return _history->owner().session();
+	return _history->session();
 }
 
 void ListController::prepare() {
@@ -199,7 +211,8 @@ void ListController::addItems(const MessageIdsList &ids, bool clear) {
 				std::make_unique<Dialogs::FakeRow>(
 					key,
 					item,
-					[=] { delegate()->peerListUpdateRow(*shared); }));
+					[=] { delegate()->peerListUpdateRow(*shared); }),
+				&_query);
 			*shared = row.get();
 			delegate()->peerListAppendRow(std::move(row));
 		}
@@ -212,6 +225,10 @@ void ListController::addItems(const MessageIdsList &ids, bool clear) {
 	}
 }
 
+void ListController::setQuery(const QString &query) {
+	_query = query;
+}
+
 struct List {
 	base::unique_qptr<Ui::RpWidget> container;
 	std::unique_ptr<ListController> controller;
@@ -219,7 +236,8 @@ struct List {
 
 List CreateList(
 		not_null<Ui::RpWidget*> parent,
-		not_null<History*> history) {
+		not_null<History*> history,
+		rpl::producer<not_null<QKeyEvent*>> scrollKeys) {
 	auto list = List{
 		base::make_unique_q<Ui::RpWidget>(parent),
 		std::make_unique<ListController>(history),
@@ -234,12 +252,12 @@ List CreateList(
 		object_ptr<PeerListContent>(scroll, list.controller.get()));
 
 	list.controller->resetScrollRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		scroll->scrollToY(0);
 	}, scroll->lifetime());
 
 	scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto top = scroll->scrollTop();
 		content->setVisibleTopBottom(top, top + scroll->height());
 	}, scroll->lifetime());
@@ -248,18 +266,28 @@ List CreateList(
 	list.controller->setDelegate(delegate);
 
 	list.container->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		content->resize(size.width(), content->height());
 		scroll->resize(size);
 	}, list.container->lifetime());
 
 	list.container->paintRequest(
-	) | rpl::start_with_next([weak = Ui::MakeWeak(list.container.get())](
+	) | rpl::on_next([weak = base::make_weak(list.container.get())](
 			const QRect &r) {
-		auto p = QPainter(weak);
+		auto p = QPainter(weak.get());
 		p.fillRect(r, st::dialogsBg);
 	}, list.container->lifetime());
 
+	std::move(
+		scrollKeys
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
+		const auto delta = scroll->height();
+		const auto now = scroll->scrollTop();
+		scroll->scrollToY((e->key() == Qt::Key_PageUp)
+			? (now - delta)
+			: (now + delta));
+	}, scroll->lifetime());
+
 	return list;
 }
 
@@ -341,12 +369,12 @@ TopBar::TopBar(
 	moveToLeft(0, 0);
 
 	parent->geometryValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateSize();
 	}, lifetime());
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto height = st::topBarHeight;
 		_cancel->moveToLeft(0, (height - _cancel->height()) / 2);
 
@@ -357,7 +385,7 @@ TopBar::TopBar(
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(this);
 		p.fillRect(r, st::dialogsBg);
 	}, lifetime());
@@ -389,7 +417,9 @@ rpl::producer<not_null<QKeyEvent*>> TopBar::keyEvents() const {
 }
 
 void TopBar::setInnerFocus() {
-	_select->setInnerFocus();
+	if (Ui::AppInFocus() && Ui::InFocusChain(_select->window())) {
+		_select->setInnerFocus();
+	}
 }
 
 void TopBar::updateSize() {
@@ -446,12 +476,12 @@ void TopBar::refreshTags() {
 	parent->show();
 
 	_searchTags->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		updateSize();
 		shadow->setVisible(height > 0);
 	}, _searchTags->lifetime());
 
-	geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	geometryValue() | rpl::on_next([=](QRect geometry) {
 		shadow->setGeometry(
 			geometry.x(),
 			geometry.y() + geometry.height(),
@@ -460,13 +490,13 @@ void TopBar::refreshTags() {
 	}, shadow->lifetime());
 
 	_searchTags->selectedChanges(
-	) | rpl::start_with_next([=](std::vector<Data::ReactionId> &&list) {
+	) | rpl::on_next([=](std::vector<Data::ReactionId> &&list) {
 		_searchTagsSelected = std::move(list);
 		requestSearch(false);
 	}, _searchTags->lifetime());
 
 	_searchTags->menuRequests(
-	) | rpl::start_with_next([=](Data::ReactionId id) {
+	) | rpl::on_next([=](Data::ReactionId id) {
 		ShowTagInListMenu(
 			&_menu,
 			_mouseGlobalPosition.value_or(QCursor::pos()),
@@ -484,11 +514,11 @@ void TopBar::refreshTags() {
 	const auto padding = st::searchInChatTagsPadding;
 	const auto position = QPoint(padding.left(), padding.top());
 
-	_searchTags->repaintRequests() | rpl::start_with_next([=] {
+	_searchTags->repaintRequests() | rpl::on_next([=] {
 		parent->update();
 	}, _searchTags->lifetime());
 
-	widthValue() | rpl::start_with_next([=](int width) {
+	widthValue() | rpl::on_next([=](int width) {
 		width -= padding.left() + padding.right();
 		_searchTags->resizeToWidth(width);
 	}, _searchTags->lifetime());
@@ -496,19 +526,19 @@ void TopBar::refreshTags() {
 	rpl::combine(
 		widthValue(),
 		_searchTags->heightValue()
-	) | rpl::start_with_next([=](int width, int height) {
+	) | rpl::on_next([=](int width, int height) {
 		height += padding.top() + padding.bottom();
 		parent->setGeometry(0, st::topBarHeight, width, height);
 	}, _searchTags->lifetime());
 
-	parent->paintRequest() | rpl::start_with_next([=](const QRect &r) {
+	parent->paintRequest() | rpl::on_next([=](const QRect &r) {
 		auto p = Painter(parent);
 		p.fillRect(r, st::dialogsBg);
 		_searchTags->paint(p, position, crl::now(), false);
 	}, parent->lifetime());
 
 	parent->setMouseTracking(true);
-	parent->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	parent->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseMove) {
 			const auto mouse = static_cast<QMouseEvent*>(e.get());
 			_mouseGlobalPosition = mouse->globalPos();
@@ -667,7 +697,7 @@ BottomBar::BottomBar(not_null<Ui::RpWidget*> parent, bool fastShowChooseFrom)
 	_chooseFromUser->setVisible(fastShowChooseFrom);
 
 	parent->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		const auto height = st::historyComposeButton.height;
 		resize(r.width(), height);
 		moveToLeft(0, r.height() - height);
@@ -679,7 +709,7 @@ BottomBar::BottomBar(not_null<Ui::RpWidget*> parent, bool fastShowChooseFrom)
 		_chooseFromUser->shownValue() | mapSize,
 		_counter->sizeValue() | mapSize,
 		sizeValue()
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		_showList->setGeometry(QRect(QPoint(), s));
 		_previous->moveToRight(0, (s.height() - _previous->height()) / 2);
 		_next->moveToRight(
@@ -701,13 +731,13 @@ BottomBar::BottomBar(not_null<Ui::RpWidget*> parent, bool fastShowChooseFrom)
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(this);
 		p.fillRect(r, st::dialogsBg);
 	}, lifetime());
 
 	_current.value(
-	) | rpl::start_with_next([=](int current) {
+	) | rpl::on_next([=](int current) {
 		const auto nextDisabled = (current <= 0) || (current >= _total);
 		const auto prevDisabled = (current <= 1);
 		_next.enabled = !nextDisabled;
@@ -732,7 +762,7 @@ BottomBar::BottomBar(not_null<Ui::RpWidget*> parent, bool fastShowChooseFrom)
 	rpl::merge(
 		_next->clicks() | rpl::map_to(1),
 		_previous->clicks() | rpl::map_to(-1)
-	) | rpl::start_with_next([=](int way) {
+	) | rpl::on_next([=](int way) {
 		_current = _current.current() + way;
 	}, lifetime());
 }
@@ -808,7 +838,7 @@ rpl::producer<> BottomBar::showListRequests() const {
 void BottomBar::buttonFromToggleOn(rpl::producer<bool> &&visible) {
 	std::move(
 		visible
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		_chooseFromUser->setVisible(value);
 	}, _chooseFromUser->lifetime());
 }
@@ -816,7 +846,7 @@ void BottomBar::buttonFromToggleOn(rpl::producer<bool> &&visible) {
 void BottomBar::buttonCalendarToggleOn(rpl::producer<bool> &&visible) {
 	std::move(
 		visible
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		_jumpToDate->setVisible(value);
 	}, _jumpToDate->lifetime());
 }
@@ -836,8 +866,12 @@ class ComposeSearch::Inner final {
 	void hideAnimated();
 	void setInnerFocus();
 	void setQuery(const QString &query);
+	void setTopMsgId(MsgId topMsgId);
+	void setSearchFilter(Api::SearchFilter filter);
+	void setCalendarChat(const Dialogs::Key &chat);
+	void setCalendarJumpHandler(Fn<void(FullMsgId, Fn<void()>)> jump);
 
-	[[nodiscard]] rpl::producer<not_null<HistoryItem*>> activations() const;
+	[[nodiscard]] rpl::producer<Activation> activations() const;
 	[[nodiscard]] rpl::producer<> destroyRequests() const;
 	[[nodiscard]] rpl::lifetime &lifetime();
 
@@ -861,7 +895,13 @@ class ComposeSearch::Inner final {
 		rpl::event_stream<BottomBar::Index> jumps;
 	} _pendingJump;
 
-	rpl::event_stream<not_null<HistoryItem*>> _activations;
+	MsgId _topMsgId;
+	Api::SearchFilter _searchFilter = Api::SearchFilter::NoFilter;
+	rpl::variable<bool> _filterAllowsFrom = true;
+	Dialogs::Key _calendarChat;
+	Fn<void(FullMsgId, Fn<void()>)> _calendarJump;
+
+	rpl::event_stream<Activation> _activations;
 	rpl::event_stream<> _destroyRequests;
 
 };
@@ -876,49 +916,61 @@ ComposeSearch::Inner::Inner(
 , _history(history)
 , _topBar(base::make_unique_q<TopBar>(parent, window, history, from, query))
 , _bottomBar(base::make_unique_q<BottomBar>(parent, HasChooseFrom(history)))
-, _list(CreateList(parent, history))
-, _apiSearch(history) {
+, _list(
+	CreateList(
+		parent,
+		history,
+		_topBar->keyEvents() | rpl::filter([](not_null<QKeyEvent*> e) {
+			return e->key() == Qt::Key_PageDown || e->key() == Qt::Key_PageUp;
+		})))
+, _apiSearch(history)
+, _calendarChat(history) {
 	showAnimated();
 
 	rpl::combine(
 		_topBar->geometryValue(),
 		_bottomBar->geometryValue()
-	) | rpl::start_with_next([=](const QRect &top, const QRect &bottom) {
+	) | rpl::on_next([=](const QRect &top, const QRect &bottom) {
 		_list.container->setGeometry(QRect(
 			top.topLeft() + QPoint(0, top.height()),
 			bottom.topLeft() + QPoint(bottom.width(), 0)));
 	}, _list.container->lifetime());
 
 	_topBar->keyEvents(
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		if (!_bottomBar->handleKeyPress(e)) {
 			_topBar->handleKeyPress(e);
 		}
 	}, _topBar->lifetime());
 
 	_topBar->searchRequests(
-	) | rpl::start_with_next([=](const SearchRequest &search) {
+	) | rpl::on_next([=](SearchRequest search) {
 		if (search.query.isEmpty() && search.tags.empty()) {
 			if (!search.from || _history->peer->isSelf()) {
 				return;
 			}
 		}
+		search.topMsgId = _topMsgId;
+		search.filter = _searchFilter;
 		_apiSearch.clear();
+
+		_list.controller->addItems({}, true);
+		_list.controller->setQuery(search.query);
 		_apiSearch.search(search);
 	}, _topBar->lifetime());
 
 	_topBar->queryChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideList();
 	}, _topBar->lifetime());
 
 	_topBar->closeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideAnimated();
 	}, _topBar->lifetime());
 
 	_topBar->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_list.container->isHidden()) {
 			Ui::Animations::HideWidgets({ _list.container.get() });
 		} else {
@@ -927,9 +979,9 @@ ComposeSearch::Inner::Inner(
 	}, _topBar->lifetime());
 
 	_apiSearch.newFounds(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto &apiData = _apiSearch.messages();
-		const auto weak = Ui::MakeWeak(_bottomBar.get());
+		const auto weak = base::make_weak(_bottomBar.get());
 		_bottomBar->setTotal(apiData.total);
 		if (weak) {
 			// Activating the first search result may switch the chat.
@@ -938,7 +990,7 @@ ComposeSearch::Inner::Inner(
 	}, _topBar->lifetime());
 
 	_apiSearch.nextFounds(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_pendingJump.data.token == _apiSearch.messages().nextToken) {
 			_pendingJump.jumps.fire_copy(_pendingJump.data.index);
 		}
@@ -948,7 +1000,7 @@ ComposeSearch::Inner::Inner(
 	rpl::merge(
 		_pendingJump.jumps.events() | rpl::filter(rpl::mappers::_1 >= 0),
 		_bottomBar->showItemRequests()
-	) | rpl::start_with_next([=](BottomBar::Index index) {
+	) | rpl::on_next([=](BottomBar::Index index) {
 		const auto &apiData = _apiSearch.messages();
 		const auto &messages = apiData.messages;
 		const auto size = int(messages.size());
@@ -962,8 +1014,8 @@ ComposeSearch::Inner::Inner(
 		_pendingJump.data = {};
 		const auto item = _history->owner().message(messages[index]);
 		if (item) {
-			const auto weak = Ui::MakeWeak(_topBar.get());
-			_activations.fire_copy(item);
+			const auto weak = base::make_weak(_topBar.get());
+			_activations.fire_copy({ item, _apiSearch.request().query });
 			if (weak) {
 				hideList();
 			}
@@ -971,7 +1023,7 @@ ComposeSearch::Inner::Inner(
 	}, _bottomBar->lifetime());
 
 	_list.controller->showItemRequests(
-	) | rpl::start_with_next([=](const FullMsgId &id) {
+	) | rpl::on_next([=](const FullMsgId &id) {
 		const auto &messages = _apiSearch.messages().messages;
 		const auto it = ranges::find(messages, id);
 		if (it != end(messages)) {
@@ -980,7 +1032,7 @@ ComposeSearch::Inner::Inner(
 	}, _list.container->lifetime());
 
 	_list.controller->searchMoreRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto &apiData = _apiSearch.messages();
 		if (int(apiData.messages.size()) != apiData.total) {
 			_apiSearch.searchMore();
@@ -988,13 +1040,16 @@ ComposeSearch::Inner::Inner(
 	}, _list.container->lifetime());
 
 	_bottomBar->showCalendarRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideList();
-		_window->showCalendar({ _history }, QDate());
+		auto descriptor = Window::SessionController::ShowCalendarDescriptor();
+		descriptor.chat = _calendarChat;
+		descriptor.customJump = _calendarJump;
+		_window->showCalendar(std::move(descriptor));
 	}, _bottomBar->lifetime());
 
 	_bottomBar->showBoxFromRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto peer = _history->peer;
 		auto box = Dialogs::SearchFromBox(
 			peer,
@@ -1008,7 +1063,7 @@ ComposeSearch::Inner::Inner(
 	}, _bottomBar->lifetime());
 
 	_bottomBar->showListRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_list.container->isHidden()) {
 			Ui::Animations::ShowWidgets({ _list.container.get() });
 		} else {
@@ -1021,9 +1076,11 @@ ComposeSearch::Inner::Inner(
 		return !from;
 	}));
 
-	_bottomBar->buttonFromToggleOn(_topBar->fromValue(
-	) | rpl::map([=](PeerData *from) {
-		return HasChooseFrom(_history) && !from;
+	_bottomBar->buttonFromToggleOn(rpl::combine(
+		_topBar->fromValue(),
+		_filterAllowsFrom.value()
+	) | rpl::map([=](PeerData *from, bool allowed) {
+		return allowed && HasChooseFrom(_history) && !from;
 	}));
 
 	if (!query.isEmpty()) {
@@ -1032,13 +1089,36 @@ ComposeSearch::Inner::Inner(
 }
 
 void ComposeSearch::Inner::setInnerFocus() {
-	_topBar->setInnerFocus();
+	if (Ui::AppInFocus() && Ui::InFocusChain(_topBar->window())) {
+		_topBar->setInnerFocus();
+	}
 }
 
 void ComposeSearch::Inner::setQuery(const QString &query) {
 	_topBar->setQuery(query);
 }
 
+void ComposeSearch::Inner::setTopMsgId(MsgId topMsgId) {
+	if (topMsgId) {
+		_apiSearch.disableMigrated();
+	}
+	_topMsgId = topMsgId;
+}
+
+void ComposeSearch::Inner::setSearchFilter(Api::SearchFilter filter) {
+	_searchFilter = filter;
+	_filterAllowsFrom = (filter != Api::SearchFilter::Pinned);
+}
+
+void ComposeSearch::Inner::setCalendarChat(const Dialogs::Key &chat) {
+	_calendarChat = chat;
+}
+
+void ComposeSearch::Inner::setCalendarJumpHandler(
+		Fn<void(FullMsgId, Fn<void()>)> jump) {
+	_calendarJump = std::move(jump);
+}
+
 void ComposeSearch::Inner::showAnimated() {
 	// Don't animate bottom bar.
 	_bottomBar->show();
@@ -1058,8 +1138,7 @@ void ComposeSearch::Inner::hideList() {
 	}
 }
 
-auto ComposeSearch::Inner::activations() const
--> rpl::producer<not_null<HistoryItem*>> {
+rpl::producer<Activation> ComposeSearch::Inner::activations() const {
 	return _activations.events();
 }
 
@@ -1098,7 +1177,24 @@ void ComposeSearch::setQuery(const QString &query) {
 	_inner->setQuery(query);
 }
 
-rpl::producer<not_null<HistoryItem*>> ComposeSearch::activations() const {
+void ComposeSearch::setTopMsgId(MsgId topMsgId) {
+	_inner->setTopMsgId(topMsgId);
+}
+
+void ComposeSearch::setSearchFilter(Api::SearchFilter filter) {
+	_inner->setSearchFilter(filter);
+}
+
+void ComposeSearch::setCalendarChat(const Dialogs::Key &chat) {
+	_inner->setCalendarChat(chat);
+}
+
+void ComposeSearch::setCalendarJumpHandler(
+		Fn<void(FullMsgId, Fn<void()>)> jump) {
+	_inner->setCalendarJumpHandler(std::move(jump));
+}
+
+rpl::producer<ComposeSearch::Activation> ComposeSearch::activations() const {
 	return _inner->activations();
 }
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.h
index 67c995ddda3bed..34a77417b3dbdc 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.h
@@ -7,10 +7,18 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+namespace Dialogs {
+class Key;
+} // namespace Dialogs
+
 namespace Window {
 class SessionController;
 } // namespace Window
 
+namespace Api {
+enum class SearchFilter;
+} // namespace Api
+
 namespace Ui {
 class RpWidget;
 } // namespace Ui
@@ -33,7 +41,16 @@ class ComposeSearch final {
 	void setInnerFocus();
 	void setQuery(const QString &query);
 
-	[[nodiscard]] rpl::producer<not_null<HistoryItem*>> activations() const;
+	void setTopMsgId(MsgId topMsgId);
+	void setSearchFilter(Api::SearchFilter filter);
+	void setCalendarChat(const Dialogs::Key &chat);
+	void setCalendarJumpHandler(Fn<void(FullMsgId, Fn<void()>)> jump);
+
+	struct Activation {
+		not_null<HistoryItem*> item;
+		QString query;
+	};
+	[[nodiscard]] rpl::producer<Activation> activations() const;
 	[[nodiscard]] rpl::producer<> destroyRequests() const;
 
 	[[nodiscard]] rpl::lifetime &lifetime();
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
index d0c8ca2b8230f6..5bd0b2f04d7f08 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
@@ -7,8 +7,10 @@ For license and copyright information please follow this link:
 */
 #include "history/view/controls/history_view_draft_options.h"
 
+#include "base/random.h"
 #include "base/timer_rpl.h"
 #include "base/unixtime.h"
+#include "boxes/filters/edit_filter_chats_list.h"
 #include "boxes/peer_list_box.h"
 #include "boxes/peer_list_controllers.h"
 #include "chat_helpers/compose/compose_show.h"
@@ -19,12 +21,14 @@ For license and copyright information please follow this link:
 #include "data/data_thread.h"
 #include "data/data_user.h"
 #include "data/data_web_page.h"
+#include "history/view/controls/history_view_forward_panel.h"
 #include "history/view/controls/history_view_webpage_processor.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_components.h"
+#include "history/history_item_helpers.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/settings_common.h"
@@ -40,7 +44,9 @@ For license and copyright information please follow this link:
 #include "ui/ui_utility.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
+#include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
 #include "styles/style_chat.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
@@ -54,6 +60,7 @@ namespace {
 
 enum class Section {
 	Reply,
+	Forward,
 	Link,
 };
 
@@ -67,6 +74,7 @@ class PreviewDelegate final : public DefaultElementDelegate {
 	bool elementAnimationsPaused() override;
 	not_null<Ui::PathShiftGradient*> elementPathShiftGradient() override;
 	Context elementContext() override;
+	bool elementHideReply(not_null<const Element*> view) override;
 
 private:
 	const not_null<QWidget*> _parent;
@@ -102,6 +110,10 @@ class PreviewWrap final : public Ui::RpWidget {
 		not_null<History*> history);
 	~PreviewWrap();
 
+	[[nodiscard]] bool hasViewForItem(
+		not_null<const HistoryItem*> item) const;
+
+	void showForwardSelector(Data::ResolvedForwardDraft draft);
 	[[nodiscard]] rpl::producer<SelectedQuote> showQuoteSelector(
 		const SelectedQuote &quote);
 	[[nodiscard]] rpl::producer<QString> showLinkSelector(
@@ -115,6 +127,11 @@ class PreviewWrap final : public Ui::RpWidget {
 	}
 
 private:
+	struct Entry {
+		HistoryItem *item = nullptr;
+		std::unique_ptr<Element> view;
+	};
+
 	void paintEvent(QPaintEvent *e) override;
 	void leaveEventHook(QEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
@@ -127,7 +144,8 @@ class PreviewWrap final : public Ui::RpWidget {
 		_visibleBottom = bottom;
 	}
 
-	void initElement();
+	void clear(std::vector<Entry> entries);
+	void initElements();
 	void highlightUsedLink(
 		const TextWithTags &message,
 		const QString &usedLink,
@@ -142,8 +160,8 @@ class PreviewWrap final : public Ui::RpWidget {
 	const std::unique_ptr<PreviewDelegate> _delegate;
 
 	Section _section = Section::Reply;
-	HistoryItem *_draftItem = nullptr;
-	std::unique_ptr<Element> _element;
+	std::vector<Entry> _entries;
+	base::flat_set<not_null<const Element*>> _views;
 	rpl::variable<TextSelection> _selection;
 	rpl::event_stream<QString> _chosenUrl;
 	Ui::PeerUserpicView _userpic;
@@ -188,19 +206,19 @@ PreviewWrap::PreviewWrap(
 
 	const auto session = &_history->session();
 	session->data().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const Element*> view) {
-		if (view == _element.get()) {
+	) | rpl::on_next([=](Data::RequestViewRepaint data) {
+		if (_views.contains(data.view)) {
 			update();
 		}
 	}, lifetime());
 
-	_selection.changes() | rpl::start_with_next([=] {
+	_selection.changes() | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	_box->setAttribute(Qt::WA_OpaquePaintEvent, false);
 
-	_box->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_box->paintRequest() | rpl::on_next([=](QRect clip) {
 		const auto geometry = Ui::MapFrom(_box, this, rect());
 		const auto fill = geometry.intersected(clip);
 		if (!fill.isEmpty()) {
@@ -219,26 +237,96 @@ PreviewWrap::PreviewWrap(
 
 PreviewWrap::~PreviewWrap() {
 	_selection.reset(TextSelection());
+	base::take(_views);
+	clear(base::take(_entries));
+}
+
+void PreviewWrap::clear(std::vector<Entry> entries) {
 	_elementLifetime.destroy();
-	_element = nullptr;
-	if (_draftItem) {
-		_draftItem->destroy();
+	for (auto &entry : entries) {
+		entry.view = nullptr;
+		if (const auto item = entry.item) {
+			item->destroy();
+		}
+	}
+}
+
+bool PreviewWrap::hasViewForItem(not_null<const HistoryItem*> item) const {
+	return (item->history() == _history)
+		&& ranges::contains(_views, item, &Element::data);
+}
+
+void PreviewWrap::showForwardSelector(Data::ResolvedForwardDraft draft) {
+	Expects(!draft.items.empty());
+
+	_selection.reset(TextSelection());
+
+	auto was = base::take(_entries);
+	auto groups = base::flat_map<MessageGroupId, uint64>();
+	const auto groupByItem = [&](not_null<HistoryItem*> item) {
+		const auto groupId = item->groupId();
+		if (!groupId) {
+			return uint64();
+		}
+		auto i = groups.find(groupId);
+		if (i == end(groups)) {
+			i = groups.emplace(groupId, base::RandomValue<uint64>()).first;
+		}
+		return i->second;
+	};
+	const auto wasViews = base::take(_views);
+	using Options = Data::ForwardOptions;
+	draft.options = NormalizeForwardOptions(
+		&_history->session(),
+		draft.items,
+		draft.options);
+	const auto dropNames = (draft.options != Options::PreserveInfo);
+	const auto dropCaptions = (draft.options == Options::NoNamesAndCaptions);
+	for (const auto &source : draft.items) {
+		const auto groupedId = groupByItem(source);
+		const auto item = _history->addNewLocalMessage({
+			.id = _history->nextNonHistoryEntryId(),
+			.flags = (MessageFlag::FakeHistoryItem
+				| MessageFlag::Outgoing
+				| MessageFlag::HasFromId
+				| (source->invertMedia()
+					? MessageFlag::InvertMedia
+					: MessageFlag())),
+			.from = _history->session().userPeerId(),
+			.date = base::unixtime::now(),
+			.groupedId = groupedId,
+			.ignoreForwardFrom = dropNames,
+			.ignoreForwardCaptions = dropCaptions,
+		}, source);
+		_entries.push_back({ item });
+	}
+	for (auto &entry : _entries) {
+		entry.view = entry.item->createView(_delegate.get());
+		_views.emplace(entry.view.get());
 	}
+	_link = _pressedLink = nullptr;
+	clear(std::move(was));
+
+	_section = Section::Forward;
+
+	initElements();
 }
 
 rpl::producer<SelectedQuote> PreviewWrap::showQuoteSelector(
 		const SelectedQuote &quote) {
 	_selection.reset(TextSelection());
 
+	auto was = base::take(_entries);
+	const auto wasViews = base::take(_views);
 	const auto item = quote.item;
 	const auto group = item->history()->owner().groups().find(item);
 	const auto leader = group ? group->items.front().get() : item;
-	_element = leader->createView(_delegate.get());
+	_entries.push_back({
+		.view = leader->createView(_delegate.get()),
+	});
+	_views.emplace(_entries.back().view.get());
 	_link = _pressedLink = nullptr;
-
-	if (const auto was = base::take(_draftItem)) {
-		was->destroy();
-	}
+	clear(std::move(was));
 
 	const auto media = item->media();
 	_onlyMessageText = media
@@ -247,12 +335,13 @@ rpl::producer<SelectedQuote> PreviewWrap::showQuoteSelector(
 			|| (!media->photo() && !media->document()));
 	_section = Section::Reply;
 
-	initElement();
+	initElements();
 
-	_selection = _element->selectionFromQuote(quote);
+	const auto view = _entries.back().view.get();
+	_selection = view->selectionFromQuote(quote);
 	return _selection.value(
 	) | rpl::map([=](TextSelection selection) {
-		if (const auto result = _element->selectedQuote(selection)) {
+		if (const auto result = view->selectedQuote(selection)) {
 			return result;
 		}
 		return SelectedQuote{ item };
@@ -265,13 +354,11 @@ rpl::producer<QString> PreviewWrap::showLinkSelector(
 		const std::vector<MessageLinkRange> &links,
 		const QString &usedLink) {
 	_selection.reset(TextSelection());
+	base::take(_views);
+	clear(base::take(_entries));
 
-	_element = nullptr;
-	if (const auto was = base::take(_draftItem)) {
-		was->destroy();
-	}
 	using Flag = MTPDmessageMediaWebPage::Flag;
-	_draftItem = _history->addNewLocalMessage({
+	const auto item = _history->addNewLocalMessage({
 		.id = _history->nextNonHistoryEntryId(),
 		.flags = (MessageFlag::FakeHistoryItem
 			| MessageFlag::Outgoing
@@ -297,13 +384,15 @@ rpl::producer<QString> PreviewWrap::showLinkSelector(
 			MTP_long(webpage.id),
 			MTP_string(webpage.url),
 			MTP_int(0))));
-	_element = _draftItem->createView(_delegate.get());
+	_entries.push_back({ item, item->createView(_delegate.get()) });
+	_views.emplace(_entries.back().view.get());
+
 	_selectType = TextSelectType::Letters;
 	_symbol = _selectionStartSymbol = 0;
 	_afterSymbol = _selectionStartAfterSymbol = false;
 	_section = Section::Link;
 
-	initElement();
+	initElements();
 	highlightUsedLink(message, usedLink, links);
 
 	return _chosenUrl.events();
@@ -336,7 +425,8 @@ void PreviewWrap::highlightUsedLink(
 				text = text.mid(0, text.size() - 1);
 				--selection.to;
 			}
-			const auto basic = _element->textState(QPoint(0, 0), {
+			const auto view = _entries.back().view.get();
+			const auto basic = view->textState(QPoint(0, 0), {
 				.flags = Ui::Text::StateRequest::Flag::LookupSymbol,
 				.onlyMessageText = true,
 			});
@@ -351,30 +441,34 @@ void PreviewWrap::highlightUsedLink(
 }
 
 void PreviewWrap::paintEvent(QPaintEvent *e) {
-	if (!_element) {
-		return;
-	}
-
 	auto p = Painter(this);
 
+	p.translate(_position);
+
 	auto context = _theme->preparePaintContext(
 		_style.get(),
 		rect(),
+		rect(),
 		e->rect(),
 		!window()->isActiveWindow());
-	context.outbg = _element->hasOutLayout();
-	context.selection = _selecting
-		? resolveNewSelection()
-		: _selection.current();
+	for (const auto &entry : _entries) {
+		context.outbg = entry.view->hasOutLayout();
+		context.selection = _selecting
+			? resolveNewSelection()
+			: _selection.current();
 
-	p.translate(_position);
-	_element->draw(p, context);
+		entry.view->draw(p, context);
 
-	if (_element->displayFromPhoto()) {
+		const auto height = entry.view->height();
+		p.translate(0, height);
+		context.translate(0, -height);
+	}
+	const auto top = _entries.empty() ? nullptr : _entries.back().view.get();
+	if (top && top->displayFromPhoto()) {
 		auto userpicBottom = height()
-			- _element->marginBottom()
-			- _element->marginTop();
-		const auto item = _element->data();
+			- top->marginBottom()
+			- top->marginTop();
+		const auto item = top->data();
 		const auto userpicTop = userpicBottom - st::msgPhotoSize;
 		if (const auto from = item->displayFrom()) {
 			from->paintUserpicLeft(
@@ -413,7 +507,7 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 }
 
 void PreviewWrap::leaveEventHook(QEvent *e) {
-	if (!_element || !_over) {
+	if (!_over) {
 		return;
 	}
 	_over = false;
@@ -425,7 +519,7 @@ void PreviewWrap::leaveEventHook(QEvent *e) {
 }
 
 void PreviewWrap::mouseMoveEvent(QMouseEvent *e) {
-	if (!_element) {
+	if (_entries.empty()) {
 		return;
 	}
 	using Flag = Ui::Text::StateRequest::Flag;
@@ -436,7 +530,16 @@ void PreviewWrap::mouseMoveEvent(QMouseEvent *e) {
 		.onlyMessageText = (_section == Section::Link || _onlyMessageText),
 	};
 	const auto position = e->pos();
-	auto resolved = _element->textState(position - _position, request);
+	auto local = position - _position;
+	auto resolved = TextState();
+	for (auto &entry : _entries) {
+		const auto height = entry.view->height();
+		if (local.y() < height) {
+			resolved = entry.view->textState(local, request);
+			break;
+		}
+		local.setY(local.y() - height);
+	}
 	_over = true;
 	const auto text = (_section == Section::Reply)
 		&& (resolved.cursor == CursorState::Text);
@@ -516,27 +619,25 @@ void PreviewWrap::mouseDoubleClickEvent(QMouseEvent *e) {
 	}
 }
 
-void PreviewWrap::initElement() {
-	_elementLifetime.destroy();
-
-	if (!_element) {
-		return;
+void PreviewWrap::initElements() {
+	for (auto &entry : _entries) {
+		entry.view->initDimensions();
 	}
-	_element->initDimensions();
-
 	widthValue(
 	) | rpl::filter([=](int width) {
 		return width > st::msgMinWidth;
-	}) | rpl::start_with_next([=](int width) {
-		const auto height = _position.y()
-			+ _element->resizeGetHeight(width)
-			+ st::msgMargin.top();
+	}) | rpl::on_next([=](int width) {
+		auto height = _position.y();
+		for (const auto &entry : _entries) {
+			height += entry.view->resizeGetHeight(width);
+		}
+		height += st::msgMargin.top();
 		resize(width, height);
 	}, _elementLifetime);
 }
 
 TextSelection PreviewWrap::resolveNewSelection() const {
-	if (_section != Section::Reply) {
+	if (_section != Section::Reply || _entries.empty()) {
 		return TextSelection();
 	}
 	const auto make = [](uint16 symbol, bool afterSymbol) {
@@ -549,7 +650,7 @@ TextSelection PreviewWrap::resolveNewSelection() const {
 	const auto result = (first <= second)
 		? TextSelection{ first, second }
 		: TextSelection{ second, first };
-	return _element->adjustSelection(result, _selectType);
+	return _entries.back().view->adjustSelection(result, _selectType);
 }
 
 void PreviewWrap::startSelection(TextSelectType type) {
@@ -587,11 +688,19 @@ Context PreviewDelegate::elementContext() {
 	return Context::Replies;
 }
 
+bool PreviewDelegate::elementHideReply(not_null<const Element*> view) {
+	if (!view->isTopicRootReply()) {
+		return false;
+	}
+	const auto reply = view->data()->Get<HistoryMessageReply>();
+	return reply && !reply->fields().manualQuote;
+}
+
 void AddFilledSkip(not_null<Ui::VerticalLayout*> container) {
 	const auto skip = container->add(object_ptr<Ui::FixedHeightWidget>(
 		container,
 		st::settingsPrivacySkipTop));
-	skip->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	skip->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(skip).fillRect(clip, st::boxBg);
 	}, skip->lifetime());
 };
@@ -605,9 +714,10 @@ void DraftOptionsBox(
 
 	const auto &draft = args.draft;
 	struct State {
-		rpl::variable<Section> shown;
+		rpl::variable<Section> shown = Section::Link;
 		rpl::lifetime shownLifetime;
 		rpl::variable<SelectedQuote> quote;
+		Data::ResolvedForwardDraft forward;
 		Data::WebPageDraft webpage;
 		WebPageData *preview = nullptr;
 		QString link;
@@ -617,41 +727,89 @@ void DraftOptionsBox(
 		Fn<void(const QString &link, WebPageData *page)> performSwitch;
 		Fn<void(const QString &link, bool force)> requestAndSwitch;
 		rpl::lifetime resolveLifetime;
+
+		Fn<void()> rebuild;
 	};
 	const auto state = box->lifetime().make_state<State>();
+	state->link = args.usedLink;
 	state->quote = SelectedQuote{
 		replyItem,
-		draft.reply.quote,
-		draft.reply.quoteOffset,
+		{ draft.reply.quote, draft.reply.quoteOffset },
 	};
+	state->forward = std::move(args.forward);
 	state->webpage = draft.webpage;
 	state->preview = previewData;
-	state->shown = previewData ? Section::Link : Section::Reply;
-	if (replyItem && previewData) {
-		box->setNoContentMargin(true);
-		state->tabs = box->setPinnedToTopContent(
-			object_ptr<Ui::SettingsSlider>(
-				box.get(),
-				st::defaultTabsSlider));
-		state->tabs->resizeToWidth(st::boxWideWidth);
-		state->tabs->move(0, 0);
-		state->tabs->setRippleTopRoundRadius(st::boxRadius);
-		state->tabs->setSections({
-			tr::lng_reply_header_short(tr::now),
-			tr::lng_link_header_short(tr::now),
-		});
-		state->tabs->setActiveSectionFast(1);
-		state->tabs->sectionActivated(
-		) | rpl::start_with_next([=](int section) {
-			state->shown = section ? Section::Link : Section::Reply;
-		}, box->lifetime());
-	} else {
-		box->setTitle(previewData
-			? tr::lng_link_options_header()
-			: draft.reply.quote.empty()
-			? tr::lng_reply_options_header()
-			: tr::lng_reply_options_quote());
-	}
+
+	state->rebuild = [=] {
+		const auto hasLink = (state->preview != nullptr);
+		const auto hasReply = (state->quote.current().item != nullptr);
+		const auto hasForward = !state->forward.items.empty();
+		if (!hasLink && !hasReply && !hasForward) {
+			box->closeBox();
+			return;
+		}
+		const auto section = state->shown.current();
+		const auto changeSection = (section == Section::Link)
+			? !hasLink
+			: (section == Section::Reply)
+			? !hasReply
+			: !hasForward;
+		const auto now = !changeSection
+			? section
+			: hasLink
+			? Section::Link
+			: hasReply
+			? Section::Reply
+			: Section::Forward;
+		auto labels = std::vector<QString>();
+		auto indices = base::flat_map<Section, int>();
+		auto sections = std::vector<Section>();
+		const auto push = [&](Section section, tr::phrase<> phrase) {
+			indices[section] = labels.size();
+			labels.push_back(phrase(tr::now));
+			sections.push_back(section);
+		};
+		if (hasLink) {
+			push(Section::Link, tr::lng_link_header_short);
+		}
+		if (hasReply) {
+			push(Section::Reply, tr::lng_reply_header_short);
+		}
+		if (hasForward) {
+			push(Section::Forward, tr::lng_forward_header_short);
+		}
+		if (labels.size() > 1) {
+			box->setNoContentMargin(true);
+			state->tabs = box->setPinnedToTopContent(
+				object_ptr<Ui::SettingsSlider>(
+					box.get(),
+					st::defaultTabsSlider));
+			state->tabs->resizeToWidth(st::boxWideWidth);
+			state->tabs->move(0, 0);
+			state->tabs->setRippleTopRoundRadius(st::boxRadius);
+			state->tabs->setSections(labels);
+			state->tabs->setActiveSectionFast(indices[now]);
+			state->tabs->sectionActivated(
+			) | rpl::on_next([=](int index) {
+				state->shown = sections[index];
+			}, box->lifetime());
+		} else {
+			const auto forwardCount = state->forward.items.size();
+			box->setTitle(hasLink
+				? tr::lng_link_options_header()
+				: hasReply
+				? (state->quote.current().highlight.quote.empty()
+					? tr::lng_reply_options_header()
+					: tr::lng_reply_options_quote())
+				: (forwardCount == 1)
+				? tr::lng_forward_title()
+				: tr::lng_forward_many_title(
+					lt_count,
+					rpl::single(forwardCount * 1.0)));
+		}
+		state->shown.force_assign(now);
+	};
+	state->rebuild();
 
 	const auto bottom = box->setPinnedToBottomContent(
 		object_ptr<Ui::VerticalLayout>(box));
@@ -664,19 +822,32 @@ void DraftOptionsBox(
 		auto result = draft.reply;
 		if (const auto current = state->quote.current()) {
 			result.messageId = current.item->fullId();
-			result.quote = current.text;
-			result.quoteOffset = current.offset;
+			result.quote = current.highlight.quote;
+			result.quoteOffset = current.highlight.quoteOffset;
+//			result.todoItemId = current.highlight.todoItemId;
 		} else {
 			result.quote = {};
+//			result.todoItemId = 0;
 		}
 		return result;
 	};
 	const auto finish = [=](
 			FullReplyTo result,
-			Data::WebPageDraft webpage) {
-		const auto weak = Ui::MakeWeak(box);
-		done(std::move(result), std::move(webpage));
-		if (const auto strong = weak.data()) {
+			Data::WebPageDraft webpage,
+			std::optional<Data::ForwardOptions> options) {
+		const auto weak = base::make_weak(box);
+		auto forward = Data::ForwardDraft();
+		if (options) {
+			forward.options = NormalizeForwardOptions(
+				&show->session(),
+				state->forward.items,
+				*options);
+			for (const auto &item : state->forward.items) {
+				forward.ids.push_back(item->fullId());
+			}
+		}
+		done(std::move(result), std::move(webpage), std::move(forward));
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	};
@@ -695,7 +866,7 @@ void DraftOptionsBox(
 			});
 		}
 
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		Settings::AddButtonWithIcon(
 			bottom,
 			tr::lng_reply_show_in_chat(),
@@ -703,7 +874,7 @@ void DraftOptionsBox(
 			{ &st::menuIconShowInChat }
 		)->setClickedCallback([=] {
 			highlight(resolveReply());
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		});
@@ -714,7 +885,7 @@ void DraftOptionsBox(
 			st::settingsAttentionButtonWithIcon,
 			{ &st::menuIconDeleteAttention }
 		)->setClickedCallback([=] {
-			finish({}, state->webpage);
+			finish({}, state->webpage, state->forward.options);
 		});
 
 		if (!item->originalText().empty()) {
@@ -746,11 +917,17 @@ void DraftOptionsBox(
 			const auto small = state->webpage.forceSmallMedia
 				|| (!state->webpage.forceLargeMedia
 					&& state->preview->computeDefaultSmallMedia());
+			const auto hasVideo = state->preview->document
+				&& state->preview->document->isVideoFile();
 			Settings::AddButtonWithIcon(
 				bottom,
 				(small
-					? tr::lng_link_enlarge_photo()
-					: tr::lng_link_shrink_photo()),
+					? (hasVideo
+						? tr::lng_link_enlarge_video()
+						: tr::lng_link_enlarge_photo())
+					: (hasVideo
+						? tr::lng_link_shrink_video()
+						: tr::lng_link_shrink_photo())),
 				st::settingsButton,
 				{ small ? &st::menuIconEnlarge : &st::menuIconShrink }
 			)->setClickedCallback([=] {
@@ -772,7 +949,8 @@ void DraftOptionsBox(
 			st::settingsAttentionButtonWithIcon,
 			{ &st::menuIconDeleteAttention }
 		)->setClickedCallback([=] {
-			finish(resolveReply(), { .removed = true });
+			const auto options = state->forward.options;
+			finish(resolveReply(), { .removed = true }, options);
 		});
 
 		if (args.links.size() > 1) {
@@ -781,6 +959,103 @@ void DraftOptionsBox(
 		}
 	};
 
+	const auto setupForwardActions = [=] {
+		using Options = Data::ForwardOptions;
+		const auto &items = state->forward.items;
+		state->forward.options = NormalizeForwardOptions(
+			&show->session(),
+			items,
+			state->forward.options);
+		const auto now = state->forward.options;
+		const auto count = items.size();
+		const auto dropNames = (now != Options::PreserveInfo);
+		const auto sendersCount = ItemsForwardSendersCount(items);
+		const auto captionsCount = ItemsForwardCaptionsCount(items);
+		const auto canHideAuthor = CanHideForwardAuthor(
+			&show->session(),
+			items);
+		const auto canDropNames = canHideAuthor
+			&& HasDropForwardedInfoSetting(items);
+		const auto dropCaptions = (now == Options::NoNamesAndCaptions);
+
+		AddFilledSkip(bottom);
+
+		if (canDropNames) {
+			Settings::AddButtonWithIcon(
+				bottom,
+				(dropNames
+					? (sendersCount == 1
+						? tr::lng_forward_action_show_sender
+						: tr::lng_forward_action_show_senders)
+					: (sendersCount == 1
+						? tr::lng_forward_action_hide_sender
+						: tr::lng_forward_action_hide_senders))(),
+				st::settingsButton,
+				{ dropNames
+					? &st::menuIconUserShow
+					: &st::menuIconUserHide }
+			)->setClickedCallback([=] {
+				state->forward.options = dropNames
+					? Options::PreserveInfo
+					: Options::NoSenderNames;
+				state->shown.force_assign(Section::Forward);
+			});
+		}
+		if (captionsCount && canHideAuthor) {
+			Settings::AddButtonWithIcon(
+				bottom,
+				(dropCaptions
+					? (captionsCount == 1
+						? tr::lng_forward_action_show_caption
+						: tr::lng_forward_action_show_captions)
+					: (captionsCount == 1
+						? tr::lng_forward_action_hide_caption
+						: tr::lng_forward_action_hide_captions))(),
+				st::settingsButton,
+				{ dropCaptions
+					? &st::menuIconCaptionShow
+					: &st::menuIconCaptionHide }
+			)->setClickedCallback([=] {
+				state->forward.options = dropCaptions
+					? Options::NoSenderNames
+					: Options::NoNamesAndCaptions;
+				state->shown.force_assign(Section::Forward);
+			});
+		}
+
+		Settings::AddButtonWithIcon(
+			bottom,
+			tr::lng_forward_action_change_recipient(),
+			st::settingsButton,
+			{ &st::menuIconReplace }
+		)->setClickedCallback([=] {
+			auto draft = base::take(state->forward);
+			finish(resolveReply(), state->webpage, std::nullopt);
+			Window::ShowForwardMessagesBox(show, {
+				.ids = show->session().data().itemsToIds(draft.items),
+				.options = draft.options,
+			});
+		});
+
+		Settings::AddButtonWithIcon(
+			bottom,
+			tr::lng_forward_action_remove(),
+			st::settingsAttentionButtonWithIcon,
+			{ &st::menuIconDeleteAttention }
+		)->setClickedCallback([=] {
+			finish(resolveReply(), state->webpage, std::nullopt);
+		});
+
+		AddFilledSkip(bottom);
+		if (canDropNames) {
+			Ui::AddDividerText(bottom, (count == 1
+				? tr::lng_forward_about()
+				: tr::lng_forward_many_about()));
+		} else {
+			Ui::AddDivider(bottom);
+		}
+	};
+
 	const auto &resolver = args.resolver;
 	state->performSwitch = [=](const QString &link, WebPageData *page) {
 		const auto now = base::unixtime::now();
@@ -790,12 +1065,12 @@ void DraftOptionsBox(
 			const auto delay = std::max(page->pendingTill - now, TimeId());
 			base::timer_once(
 				(delay + 1) * crl::time(1000)
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				state->requestAndSwitch(link, true);
 			}, state->resolveLifetime);
 
 			page->owner().webPageUpdates(
-			) | rpl::start_with_next([=](not_null<WebPageData*> updated) {
+			) | rpl::on_next([=](not_null<WebPageData*> updated) {
 				if (updated == page && !updated->pendingTill) {
 					state->resolveLifetime.destroy();
 					state->performSwitch(link, page);
@@ -814,7 +1089,7 @@ void DraftOptionsBox(
 		resolver->request(link, force);
 
 		state->resolveLifetime = resolver->resolved(
-		) | rpl::start_with_next([=](const QString &resolved) {
+		) | rpl::on_next([=](const QString &resolved) {
 			if (resolved == link) {
 				state->resolveLifetime.destroy();
 				state->performSwitch(
@@ -835,30 +1110,37 @@ void DraftOptionsBox(
 
 	state->wrap = box->addRow(
 		object_ptr<PreviewWrap>(box, args.history),
-		{});
+		style::margins());
 	state->wrap->draggingScrollDelta(
-	) | rpl::start_with_next([=](int delta) {
+	) | rpl::on_next([=](int delta) {
 		box->scrollByDraggingDelta(delta);
 	}, state->wrap->lifetime());
 
 	const auto &linkRanges = args.links;
-	state->shown.value() | rpl::start_with_next([=](Section shown) {
+	state->shown.value() | rpl::on_next([=](Section shown) {
 		bottom->clear();
 		state->shownLifetime.destroy();
-		if (shown == Section::Reply) {
-			state->quote = state->wrap->showQuoteSelector(
-				state->quote.current());
-			setupReplyActions();
-		} else {
-			state->wrap->showLinkSelector(
-				draft.textWithTags,
-				state->webpage,
-				linkRanges,
-				state->link
-			) | rpl::start_with_next([=](QString link) {
-				switchTo(link);
-			}, state->shownLifetime);
-			setupLinkActions();
+		switch (shown) {
+			case Section::Reply: {
+				state->quote = state->wrap->showQuoteSelector(
+					state->quote.current());
+				setupReplyActions();
+			} break;
+			case Section::Link: {
+				state->wrap->showLinkSelector(
+					draft.textWithTags,
+					state->webpage,
+					linkRanges,
+					state->link
+				) | rpl::on_next([=](QString link) {
+					switchTo(link);
+				}, state->shownLifetime);
+				setupLinkActions();
+			} break;
+			case Section::Forward: {
+				state->wrap->showForwardSelector(state->forward);
+				setupForwardActions();
+			} break;
 		}
 	}, box->lifetime());
 
@@ -866,51 +1148,182 @@ void DraftOptionsBox(
 		state->quote.value(),
 		state->shown.value()
 	) | rpl::map([=](const SelectedQuote &quote, Section shown) {
-		return (quote.text.empty() || shown != Section::Reply)
+		return (quote.highlight.quote.empty() || shown != Section::Reply)
 			? tr::lng_settings_save()
 			: tr::lng_reply_quote_selected();
 	}) | rpl::flatten_latest();
-	box->addButton(std::move(save), [=] {
+	const auto submit = [=] {
 		if (state->quote.current().overflown) {
 			show->showToast({
 				.title = tr::lng_reply_quote_long_title(tr::now),
 				.text = { tr::lng_reply_quote_long_text(tr::now) },
 			});
 		} else {
-			finish(resolveReply(), state->webpage);
+			const auto options = NormalizeForwardOptions(
+				&show->session(),
+				state->forward.items,
+				state->forward.options);
+			finish(resolveReply(), state->webpage, options);
 		}
-	});
+	};
+	box->addButton(std::move(save), submit);
 
 	box->addButton(tr::lng_cancel(), [=] {
 		box->closeBox();
 	});
 
-	if (replyItem) {
-		args.show->session().data().itemRemoved(
-		) | rpl::filter([=](not_null<const HistoryItem*> removed) {
-			const auto current = state->quote.current().item;
-			if ((removed == replyItem) || (removed == current)) {
-				return true;
+	box->events() | rpl::on_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::KeyPress) {
+			const auto key = static_cast<QKeyEvent*>(e.get())->key();
+			if (key == Qt::Key_Enter || key == Qt::Key_Return) {
+				submit();
 			}
-			const auto group = current->history()->owner().groups().find(
-				current);
-			return (group && ranges::contains(group->items, removed));
-		}) | rpl::start_with_next([=] {
-			if (previewData) {
-				state->tabs = nullptr;
-				box->setPinnedToTopContent(
-					object_ptr<Ui::RpWidget>(nullptr));
-				box->setNoContentMargin(false);
-				box->setTitle(state->quote.current().text.empty()
-					? tr::lng_reply_options_header()
-					: tr::lng_reply_options_quote());
-				state->shown = Section::Link;
+		}
+	}, box->lifetime());
+
+	args.show->session().data().itemRemoved(
+	) | rpl::on_next([=](not_null<const HistoryItem*> removed) {
+		const auto inReply = (state->quote.current().item == removed);
+		if (inReply) {
+			state->quote = SelectedQuote();
+		}
+		const auto i = ranges::find(state->forward.items, removed);
+		const auto inForward = (i != end(state->forward.items));
+		if (inForward) {
+			state->forward.items.erase(i);
+		}
+		if (inReply || inForward) {
+			state->rebuild();
+		}
+	}, box->lifetime());
+
+	args.show->session().data().itemViewRefreshRequest(
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
+		if (state->wrap->hasViewForItem(item)) {
+			state->rebuild();
+		}
+	}, box->lifetime());
+
+}
+
+struct AuthorSelector {
+	object_ptr<Ui::RpWidget> content = { nullptr };
+	Fn<bool(int, int, int)> overrideKey;
+	Fn<void()> activate;
+};
+[[nodiscard]] AuthorSelector AuthorRowSelector(
+		not_null<Main::Session*> session,
+		FullReplyTo reply,
+		Fn<void(not_null<Data::Thread*>)> chosen) {
+	const auto item = session->data().message(reply.messageId);
+	if (!item) {
+		return {};
+	}
+	const auto displayFrom = item->displayFrom();
+	const auto from = displayFrom ? displayFrom : item->from().get();
+	if (!from->isUser() || from == item->history()->peer || from->isSelf()) {
+		return {};
+	}
+
+	class AuthorController final : public PeerListController {
+	public:
+		AuthorController(not_null<PeerData*> peer, Fn<void()> click)
+		: _peer(peer)
+		, _click(std::move(click)) {
+		}
+
+		void prepare() override {
+			delegate()->peerListAppendRow(
+				std::make_unique<ChatsListBoxController::Row>(
+					_peer->owner().history(_peer),
+					&computeListSt().item));
+			delegate()->peerListRefreshRows();
+			TrackMessageMoneyRestrictionsChanges(this, _lifetime);
+		}
+		void loadMoreRows() override {
+		}
+		void rowClicked(not_null<PeerListRow*> row) override {
+			if (RecipientRow::ShowLockedError(
+					this,
+					row,
+					WriteMoneyRestrictionError)) {
+				return;
+			} else if (const auto onstack = _click) {
+				onstack();
+			}
+		}
+		Main::Session &session() const override {
+			return _peer->session();
+		}
+
+	private:
+		const not_null<PeerData*> _peer;
+		Fn<void()> _click;
+		rpl::lifetime _lifetime;
+
+	};
+
+	auto result = object_ptr<Ui::VerticalLayout>((QWidget*)nullptr);
+	const auto container = result.data();
+
+	container->add(CreatePeerListSectionSubtitle(
+		container,
+		tr::lng_reply_in_author()));
+	Ui::AddSkip(container);
+
+	const auto activate = [=] {
+		chosen(from->owner().history(from));
+	};
+	const auto delegate = container->lifetime().make_state<
+		PeerListContentDelegateSimple
+	>();
+	const auto controller = container->lifetime().make_state<
+		AuthorController
+	>(from, activate);
+	controller->setStyleOverrides(&st::peerListSingleRow);
+	const auto content = container->add(object_ptr<PeerListContent>(
+		container,
+		controller));
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
+
+	Ui::AddSkip(container);
+	container->add(CreatePeerListSectionSubtitle(
+		container,
+		tr::lng_reply_in_chats_list()));
+
+	const auto overrideKey = [=](int direction, int from, int to) {
+		if (!content->isVisible()) {
+			return false;
+		} else if (direction > 0 && from < 0 && to >= 0) {
+			if (content->hasSelection()) {
+				const auto was = content->selectedIndex();
+				const auto now = content->selectSkip(1).reallyMovedTo;
+				if (was != now) {
+					return true;
+				}
+				content->clearSelection();
 			} else {
-				box->closeBox();
+				content->selectSkip(1);
+				return true;
 			}
-		}, box->lifetime());
-	}
+		} else if (direction < 0 && to < 0) {
+			if (!content->hasSelection()) {
+				content->selectLast();
+			} else if (from >= 0 || content->hasSelection()) {
+				content->selectSkip(-1);
+			}
+		}
+		return false;
+	};
+
+	return {
+		.content = std::move(result),
+		.overrideKey = overrideKey,
+		.activate = activate,
+	};
 }
+
 } // namespace
 
 void ShowReplyToChatBox(
@@ -921,14 +1334,27 @@ void ShowReplyToChatBox(
 	public:
 		using Chosen = not_null<Data::Thread*>;
 
-		Controller(not_null<Main::Session*> session)
+		Controller(not_null<Main::Session*> session, FullReplyTo reply)
 		: ChooseRecipientBoxController({
 			.session = session,
 			.callback = [=](Chosen thread) {
 				_singleChosen.fire_copy(thread);
 			},
-			.premiumRequiredError = WritePremiumRequiredError,
+			.moneyRestrictionError = WriteMoneyRestrictionError,
 		}) {
+			_authorRow = AuthorRowSelector(
+				session,
+				reply,
+				[=](Chosen thread) { _singleChosen.fire_copy(thread); });
+			if (_authorRow.content) {
+				setStyleOverrides(&st::peerListSmallSkips);
+			}
+		}
+
+		void noSearchSubmit() {
+			if (const auto onstack = _authorRow.activate) {
+				onstack();
+			}
 		}
 
 		[[nodiscard]] rpl::producer<Chosen> singleChosen() const {
@@ -939,13 +1365,26 @@ void ShowReplyToChatBox(
 			return tr::lng_saved_quote_here(tr::now);
 		}
 
+		bool overrideKeyboardNavigation(
+				int direction,
+				int fromIndex,
+				int toIndex) override {
+			return _authorRow.overrideKey
+				&& _authorRow.overrideKey(direction, fromIndex, toIndex);
+		}
+
 	private:
 		void prepareViewHook() override {
+			if (_authorRow.content) {
+				delegate()->peerListSetAboveWidget(
+					std::move(_authorRow.content));
+			}
 			ChooseRecipientBoxController::prepareViewHook();
 			delegate()->peerListSetTitle(tr::lng_reply_in_another_title());
 		}
 
 		rpl::event_stream<Chosen> _singleChosen;
+		AuthorSelector _authorRow;
 
 	};
 
@@ -956,11 +1395,15 @@ void ShowReplyToChatBox(
 	};
 	const auto session = &show->session();
 	const auto state = [&] {
-		auto controller = std::make_unique<Controller>(session);
+		auto controller = std::make_unique<Controller>(session, reply);
 		const auto controllerRaw = controller.get();
 		auto box = Box<PeerListBox>(std::move(controller), [=](
 				not_null<PeerListBox*> box) {
 			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+
+			box->noSearchSubmits() | rpl::on_next([=] {
+				controllerRaw->noSearchSubmit();
+			}, box->lifetime());
 		});
 		const auto boxRaw = box.data();
 		show->show(std::move(box));
@@ -971,18 +1414,21 @@ void ShowReplyToChatBox(
 	auto chosen = [=](not_null<Data::Thread*> thread) mutable {
 		const auto history = thread->owningHistory();
 		const auto topicRootId = thread->topicRootId();
-		const auto draft = history->localDraft(topicRootId);
+		const auto monoforumPeerId = thread->monoforumPeerId();
+		const auto draft = history->localDraft(topicRootId, monoforumPeerId);
 		const auto textWithTags = draft
 			? draft->textWithTags
 			: TextWithTags();
 		const auto cursor = draft ? draft->cursor : MessageCursor();
 		reply.topicRootId = topicRootId;
+		reply.monoforumPeerId = monoforumPeerId;
 		history->setLocalDraft(std::make_unique<Data::Draft>(
 			textWithTags,
 			reply,
+			SuggestOptions(),
 			cursor,
 			Data::WebPageDraft()));
-		history->clearLocalEditDraft(topicRootId);
+		history->clearLocalEditDraft(topicRootId, monoforumPeerId);
 		history->session().changes().entryUpdated(
 			thread,
 			Data::EntryUpdate::Flag::LocalDraftSet);
@@ -994,15 +1440,15 @@ void ShowReplyToChatBox(
 	};
 	auto callback = [=, chosen = std::move(chosen)](
 			Controller::Chosen thread) mutable {
-		const auto weak = Ui::MakeWeak(state->box);
+		const auto weak = base::make_weak(state->box);
 		if (!chosen(thread)) {
 			return;
-		} else if (const auto strong = weak.data()) {
+		} else if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	};
 	state->controller->singleChosen(
-	) | rpl::start_with_next(std::move(callback), state->box->lifetime());
+	) | rpl::on_next(std::move(callback), state->box->lifetime());
 }
 
 void EditDraftOptions(EditDraftOptionsArgs &&args) {
@@ -1017,7 +1463,7 @@ void EditDraftOptions(EditDraftOptionsArgs &&args) {
 		&& !previewDataRaw->failed)
 		? previewDataRaw
 		: nullptr;
-	if (!replyItem && !previewData) {
+	if (!replyItem && !previewData && args.forward.items.empty()) {
 		return;
 	}
 	args.show->show(
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.h b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.h
index abe19b39e755c0..d42c352af7f694 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.h
@@ -29,9 +29,10 @@ struct EditDraftOptionsArgs {
 	not_null<History*> history;
 	Data::Draft draft;
 	QString usedLink;
+	Data::ResolvedForwardDraft forward;
 	std::vector<MessageLinkRange> links;
 	std::shared_ptr<WebpageResolver> resolver;
-	Fn<void(FullReplyTo, Data::WebPageDraft)> done;
+	Fn<void(FullReplyTo, Data::WebPageDraft, Data::ForwardDraft)> done;
 	Fn<void(FullReplyTo)> highlight;
 	Fn<void()> clearOldDraft;
 };
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
index ca783f07a832a8..029069c7cade0b 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
@@ -12,9 +12,11 @@ For license and copyright information please follow this link:
 #include "history/history_item_helpers.h"
 #include "history/history_item_components.h"
 #include "history/view/history_view_item_preview.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_media_types.h"
 #include "data/data_forum_topic.h"
+#include "data/data_user.h"
 #include "main/main_session.h"
 #include "ui/chat/forward_options_box.h"
 #include "ui/effects/spoiler_mess.h"
@@ -44,19 +46,6 @@ constexpr auto kUnknownVersion = -1;
 constexpr auto kNameWithCaptionsVersion = -2;
 constexpr auto kNameNoCaptionsVersion = -3;
 
-[[nodiscard]] bool HasOnlyForcedForwardedInfo(const HistoryItemsList &list) {
-	for (const auto &item : list) {
-		if (const auto media = item->media()) {
-			if (!media->forceForwardedInfo()) {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
-	return true;
-}
-
 } // namespace
 
 ForwardPanel::ForwardPanel(Fn<void()> repaint)
@@ -78,13 +67,18 @@ void ForwardPanel::update(
 		Assert(to != nullptr);
 
 		_data.items.front()->history()->owner().itemRemoved(
-		) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+		) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 			itemRemoved(item);
 		}, _dataLifetime);
 
 		if (const auto topic = _to->asTopic()) {
 			topic->destroyed(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
+				update(nullptr, {});
+			}, _dataLifetime);
+		} else if (const auto sublist = _to->asSublist()) {
+			sublist->destroyed(
+			) | rpl::on_next([=] {
 				update(nullptr, {});
 			}, _dataLifetime);
 		}
@@ -112,10 +106,10 @@ void ForwardPanel::checkTexts() {
 		? kNameWithCaptionsVersion
 		: kNameNoCaptionsVersion;
 	if (keepNames) {
-		for (const auto item : _data.items) {
+		for (const auto &item : _data.items) {
 			if (const auto from = item->originalSender()) {
 				version += from->nameVersion();
-			} else if (const auto info = item->originalHiddenSenderInfo()) {
+			} else if (item->originalHiddenSenderInfo()) {
 				++version;
 			} else {
 				Unexpected("Corrupt forwarded information in message.");
@@ -149,7 +143,7 @@ void ForwardPanel::updateTexts() {
 		auto fullname = QString();
 		auto names = std::vector<QString>();
 		names.reserve(_data.items.size());
-		for (const auto item : _data.items) {
+		for (const auto &item : _data.items) {
 			if (const auto from = item->originalSender()) {
 				if (!insertedPeers.contains(from)) {
 					insertedPeers.emplace(from);
@@ -166,7 +160,7 @@ void ForwardPanel::updateTexts() {
 				Unexpected("Corrupt forwarded information in message.");
 			}
 		}
-		if (!keepNames) {
+		if (!keepNames || HasOnlyDroppedForwardedInfo(_data.items)) {
 			from = tr::lng_forward_sender_names_removed(tr::now);
 		} else if (names.size() > 2) {
 			from = tr::lng_forwarding_from(
@@ -203,10 +197,10 @@ void ForwardPanel::updateTexts() {
 		}
 	}
 	_from.setText(st::msgNameStyle, from, Ui::NameTextOptions());
-	const auto context = Core::MarkedTextContext{
+	const auto context = Core::TextContext({
 		.session = &_to->session(),
-		.customEmojiRepaint = _repaint,
-	};
+		.repaint = _repaint,
+	});
 	_text.setMarkedText(
 		st::defaultTextStyle,
 		text,
@@ -228,6 +222,10 @@ void ForwardPanel::itemRemoved(not_null<const HistoryItem*> item) {
 	}
 }
 
+const Data::ResolvedForwardDraft &ForwardPanel::draft() const {
+	return _data;
+}
+
 const HistoryItemsList &ForwardPanel::items() const {
 	return _data.items;
 }
@@ -236,86 +234,39 @@ bool ForwardPanel::empty() const {
 	return _data.items.empty();
 }
 
-void ForwardPanel::editOptions(std::shared_ptr<ChatHelpers::Show> show) {
-	using Options = Data::ForwardOptions;
-	const auto now = _data.options;
-	const auto count = _data.items.size();
-	const auto dropNames = (now != Options::PreserveInfo);
-	const auto sendersCount = ItemsForwardSendersCount(_data.items);
-	const auto captionsCount = ItemsForwardCaptionsCount(_data.items);
-	const auto hasOnlyForcedForwardedInfo = !captionsCount
-		&& HasOnlyForcedForwardedInfo(_data.items);
-	const auto dropCaptions = (now == Options::NoNamesAndCaptions);
-	const auto weak = base::make_weak(this);
-	const auto changeRecipient = crl::guard(this, [=] {
-		if (_data.items.empty()) {
-			return;
-		}
-		auto data = base::take(_data);
-		_to->owningHistory()->setForwardDraft(_to->topicRootId(), {});
-		Window::ShowForwardMessagesBox(show, {
-			.ids = _to->owner().itemsToIds(data.items),
-			.options = data.options,
-		});
-	});
-	if (hasOnlyForcedForwardedInfo) {
-		changeRecipient();
+void ForwardPanel::applyOptions(Data::ForwardOptions options) {
+	if (_data.items.empty()) {
 		return;
 	}
-	const auto optionsChanged = crl::guard(weak, [=](
-			Ui::ForwardOptions options) {
-		if (_data.items.empty()) {
-			return;
-		}
-		const auto newOptions = (options.captionsCount
-			&& options.dropCaptions)
-			? Options::NoNamesAndCaptions
-			: options.dropNames
-			? Options::NoSenderNames
-			: Options::PreserveInfo;
-		if (_data.options != newOptions) {
-			_data.options = newOptions;
-			_to->owningHistory()->setForwardDraft(_to->topicRootId(), {
-				.ids = _to->owner().itemsToIds(_data.items),
-				.options = newOptions,
-			});
-			_repaint();
-		}
-	});
-	show->showBox(Box(
-		Ui::ForwardOptionsBox,
-		count,
-		Ui::ForwardOptions{
-			.sendersCount = sendersCount,
-			.captionsCount = captionsCount,
-			.dropNames = dropNames,
-			.dropCaptions = dropCaptions,
-		},
-		optionsChanged,
-		changeRecipient));
+	options = NormalizeForwardOptions(&_to->session(), _data.items, options);
+	if (_data.options != options) {
+		const auto topicRootId = _to->topicRootId();
+		const auto monoforumPeerId = _to->monoforumPeerId();
+		_data.options = options;
+		_to->owningHistory()->setForwardDraft(topicRootId, monoforumPeerId, {
+			.ids = _to->owner().itemsToIds(_data.items),
+			.options = options,
+		});
+		_repaint();
+	}
 }
 
 void ForwardPanel::editToNextOption() {
 	using Options = Data::ForwardOptions;
-	const auto captionsCount = ItemsForwardCaptionsCount(_data.items);
-	const auto hasOnlyForcedForwardedInfo = !captionsCount
-		&& HasOnlyForcedForwardedInfo(_data.items);
-	if (hasOnlyForcedForwardedInfo) {
+	if (_data.items.empty()) {
 		return;
 	}
-
-	const auto now = _data.options;
+	const auto captionsCount = ItemsForwardCaptionsCount(_data.items);
+	const auto now = NormalizeForwardOptions(
+		&_to->session(),
+		_data.items,
+		_data.options);
 	const auto next = (now == Options::PreserveInfo)
 		? Options::NoSenderNames
 		: ((now == Options::NoSenderNames) && captionsCount)
 		? Options::NoNamesAndCaptions
 		: Options::PreserveInfo;
-
-	_to->owningHistory()->setForwardDraft(_to->topicRootId(), {
-		.ids = _to->owner().itemsToIds(_data.items),
-		.options = next,
-	});
-	_repaint();
+	applyOptions(next);
 }
 
 void ForwardPanel::paint(
@@ -387,20 +338,26 @@ void ForwardPanel::paint(
 void ClearDraftReplyTo(
 		not_null<History*> history,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		FullMsgId equalTo) {
-	const auto local = history->localDraft(topicRootId);
+	const auto local = history->localDraft(topicRootId, monoforumPeerId);
 	if (!local || (equalTo && local->reply.messageId != equalTo)) {
 		return;
 	}
 	auto draft = *local;
-	draft.reply = { .topicRootId = topicRootId };
+	draft.reply = {
+		.topicRootId = topicRootId,
+		.monoforumPeerId = monoforumPeerId,
+	};
+	draft.suggest = SuggestOptions();
 	if (Data::DraftIsNull(&draft)) {
-		history->clearLocalDraft(topicRootId);
+		history->clearLocalDraft(topicRootId, monoforumPeerId);
 	} else {
 		history->setLocalDraft(
 			std::make_unique<Data::Draft>(std::move(draft)));
 	}
-	if (const auto thread = history->threadFor(topicRootId)) {
+	const auto thread = history->threadFor(topicRootId, monoforumPeerId);
+	if (thread) {
 		history->session().api().saveDraftToCloudDelayed(thread);
 	}
 }
@@ -411,7 +368,7 @@ void EditWebPageOptions(
 		Data::WebPageDraft draft,
 		Fn<void(Data::WebPageDraft)> done) {
 	show->show(Box([=](not_null<Ui::GenericBox*> box) {
-		box->setTitle(rpl::single(u"Link Preview"_q));
+		box->setTitle(u"Link Preview"_q);
 
 		struct State {
 			rpl::variable<Data::WebPageDraft> result;
@@ -447,7 +404,7 @@ void EditWebPageOptions(
 		});
 
 		state->result.value(
-		) | rpl::start_with_next([=](const Data::WebPageDraft &draft) {
+		) | rpl::on_next([=](const Data::WebPageDraft &draft) {
 			state->large->setColorOverride(draft.forceLargeMedia
 				? st::windowActiveTextFg->c
 				: std::optional<QColor>());
@@ -473,11 +430,11 @@ void EditWebPageOptions(
 		});
 
 		box->addButton(tr::lng_settings_save(), [=] {
-			const auto weak = Ui::MakeWeak(box.get());
+			const auto weak = base::make_weak(box.get());
 			auto result = state->result.current();
 			result.manual = true;
 			done(result);
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		});
@@ -485,7 +442,72 @@ void EditWebPageOptions(
 			box->closeBox();
 		});
 	}));
+}
+
+bool HasOnlyForcedForwardedInfo(const HistoryItemsList &list) {
+	for (const auto &item : list) {
+		if (const auto media = item->media()) {
+			if (!media->forceForwardedInfo()) {
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
+	return true;
+}
+
+bool HasOnlyDroppedForwardedInfo(const HistoryItemsList &list) {
+	for (const auto &item : list) {
+		if (item->isSavedMusicItem() || !item->computeDropForwardedInfo()) {
+			return false;
+		}
+	}
+	return true;
+}
+
+bool HasDropForwardedInfoSetting(const HistoryItemsList &list) {
+	for (const auto &item : list) {
+		if (!item->computeDropForwardedInfo()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool HasRichPage(const HistoryItemsList &list) {
+	for (const auto &item : list) {
+		if (item->richPage()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool CanHideForwardAuthor(
+		not_null<Main::Session*> session,
+		const HistoryItemsList &list) {
+	if (list.empty()) {
+		return true;
+	}
+	if (HasOnlyForcedForwardedInfo(list)) {
+		return false;
+	}
+#ifndef _DEBUG
+	if (HasRichPage(list)) {
+		return false;
+	}
+#endif
+	return session->premium() || !HasRichPage(list);
+}
 
+Data::ForwardOptions NormalizeForwardOptions(
+		not_null<Main::Session*> session,
+		const HistoryItemsList &list,
+		Data::ForwardOptions options) {
+	return CanHideForwardAuthor(session, list)
+		? options
+		: Data::ForwardOptions::PreserveInfo;
 }
 
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h
index 59c079d6f10bc9..e12c13dbbc89c7 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h
@@ -23,6 +23,10 @@ class Thread;
 struct WebPageDraft;
 } // namespace Data
 
+namespace Main {
+class Session;
+} // namespace Main
+
 namespace Window {
 class SessionController;
 } // namespace Window
@@ -47,9 +51,10 @@ class ForwardPanel final : public base::has_weak_ptr {
 
 	[[nodiscard]] rpl::producer<> itemsUpdated() const;
 
-	void editOptions(std::shared_ptr<ChatHelpers::Show> show);
+	void applyOptions(Data::ForwardOptions options);
 	void editToNextOption();
 
+	[[nodiscard]] const Data::ResolvedForwardDraft &draft() const;
 	[[nodiscard]] const HistoryItemsList &items() const;
 	[[nodiscard]] bool empty() const;
 
@@ -75,6 +80,7 @@ class ForwardPanel final : public base::has_weak_ptr {
 void ClearDraftReplyTo(
 	not_null<History*> history,
 	MsgId topicRootId,
+	PeerId monoforumPeerId,
 	FullMsgId equalTo);
 
 void EditWebPageOptions(
@@ -83,4 +89,16 @@ void EditWebPageOptions(
 	Data::WebPageDraft draft,
 	Fn<void(Data::WebPageDraft)> done);
 
+[[nodiscard]] bool HasOnlyForcedForwardedInfo(const HistoryItemsList &list);
+[[nodiscard]] bool HasOnlyDroppedForwardedInfo(const HistoryItemsList &list);
+[[nodiscard]] bool HasDropForwardedInfoSetting(const HistoryItemsList &list);
+[[nodiscard]] bool HasRichPage(const HistoryItemsList &list);
+[[nodiscard]] bool CanHideForwardAuthor(
+	not_null<Main::Session*> session,
+	const HistoryItemsList &list);
+[[nodiscard]] Data::ForwardOptions NormalizeForwardOptions(
+	not_null<Main::Session*> session,
+	const HistoryItemsList &list,
+	Data::ForwardOptions options);
+
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
new file mode 100644
index 00000000000000..5540f376d1d17a
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
@@ -0,0 +1,977 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/controls/history_view_suggest_options.h"
+
+#include "base/unixtime.h"
+#include "boxes/star_gift_box.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "core/ui_integration.h"
+#include "data/components/credits.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_channel.h"
+#include "data/data_media_types.h"
+#include "data/data_session.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
+#include "history/history_item_helpers.h"
+#include "info/channel_statistics/earn/earn_icons.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "settings/settings_common.h"
+#include "settings/settings_credits_graphics.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/boxes/choose_date_time.h"
+#include "ui/boxes/emoji_stake_box.h"
+#include "ui/boxes/single_choice_box.h"
+#include "ui/controls/ton_common.h"
+#include "ui/widgets/fields/number_input.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/buttons.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/basic_click_handlers.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/vertical_list.h"
+#include "styles/style_boxes.h"
+#include "styles/style_channel_earn.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h"
+#include "styles/style_layers.h"
+#include "styles/style_settings.h"
+
+namespace HistoryView {
+namespace {
+
+[[nodiscard]] rpl::producer<CreditsAmount> StarsPriceValue(
+		rpl::producer<CreditsAmount> full) {
+	return rpl::single(
+		CreditsAmount()
+	) | rpl::then(std::move(
+		full
+	) | rpl::filter([=](CreditsAmount amount) {
+		return amount.stars();
+	}));
+}
+
+[[nodiscard]] rpl::producer<CreditsAmount> TonPriceValue(
+		rpl::producer<CreditsAmount> full) {
+	return rpl::single(
+		CreditsAmount()
+	) | rpl::then(std::move(
+		full
+	) | rpl::filter([=](CreditsAmount amount) {
+		return amount.ton();
+	}));
+}
+
+} // namespace
+
+void ChooseSuggestTimeBox(
+		not_null<Ui::GenericBox*> box,
+		SuggestTimeBoxArgs &&args) {
+	const auto now = base::unixtime::now();
+	const auto min = args.session->appConfig().suggestedPostDelayMin() + 60;
+	const auto max = args.session->appConfig().suggestedPostDelayMax();
+	const auto value = args.value
+		? std::clamp(args.value, now + min, now + max)
+		: (now + 86400);
+	const auto done = args.done;
+	Ui::ChooseDateTimeBox(box, {
+		.title = ((args.mode == SuggestMode::New
+			|| args.mode == SuggestMode::Publish)
+			? tr::lng_suggest_options_date()
+			: tr::lng_suggest_menu_edit_time()),
+		.submit = ((args.mode == SuggestMode::Publish)
+			? tr::lng_suggest_options_date_publish()
+			: (args.mode == SuggestMode::New)
+			? tr::lng_settings_save()
+			: tr::lng_suggest_options_update_date()),
+		.done = done,
+		.min = [=] { return now + min; },
+		.time = value,
+		.max = [=] { return now + max; },
+	});
+
+	box->addLeftButton((args.mode == SuggestMode::Publish)
+		? tr::lng_suggest_options_date_now()
+		: tr::lng_suggest_options_date_any(), [=] {
+		done(TimeId());
+	});
+}
+
+StarsTonPriceInput AddStarsTonPriceInput(
+		not_null<Ui::VerticalLayout*> container,
+		StarsTonPriceArgs &&args) {
+	struct State {
+		rpl::variable<bool> ton;
+		rpl::variable<CreditsAmount> price;
+		rpl::event_stream<> updates;
+		rpl::event_stream<> submits;
+	};
+	const auto state = container->lifetime().make_state<State>();
+	state->ton = std::move(args.showTon);
+	state->price = args.price;
+
+	const auto session = args.session;
+	const auto added = st::boxRowPadding - st::defaultSubsectionTitlePadding;
+
+	const auto starsWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto starsInner = starsWrap->entity();
+
+	Ui::AddSubsectionTitle(
+		starsInner,
+		tr::lng_suggest_options_stars_price(),
+		QMargins(
+			added.left(),
+			0,
+			added.right(),
+			-st::defaultSubsectionTitlePadding.bottom()));
+
+	const auto starsField = AddStarsInputField(starsInner, {
+		.value = ((args.price && args.price.stars())
+			? args.price.whole()
+			: std::optional<int64>()),
+	});
+
+	AddApproximateUsd(
+		starsField,
+		session,
+		StarsPriceValue(state->price.value()));
+
+	Ui::AddSkip(starsInner);
+	Ui::AddSkip(starsInner);
+	if (args.starsAbout) {
+		Ui::AddDividerText(starsInner, std::move(args.starsAbout));
+	}
+
+	const auto tonWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto tonInner = tonWrap->entity();
+
+	Ui::AddSubsectionTitle(
+		tonInner,
+		tr::lng_suggest_options_ton_price(),
+		QMargins(
+			added.left(),
+			0,
+			added.right(),
+			-st::defaultSubsectionTitlePadding.bottom()));
+
+	const auto tonField = AddTonInputField(tonInner, {
+		.value = (args.price && args.price.ton())
+			? (args.price.whole() * Ui::kNanosInOne + args.price.nano())
+			: 0,
+	});
+
+	AddApproximateUsd(
+		tonField,
+		session,
+		TonPriceValue(state->price.value()));
+
+	Ui::AddSkip(tonInner);
+	Ui::AddSkip(tonInner);
+	if (args.tonAbout) {
+		Ui::AddDividerText(tonInner, std::move(args.tonAbout));
+	}
+
+	tonWrap->toggleOn(state->ton.value(), anim::type::instant);
+	starsWrap->toggleOn(
+		state->ton.value() | rpl::map(!rpl::mappers::_1),
+		anim::type::instant);
+
+	auto computeResult = [=]() -> std::optional<CreditsAmount> {
+		auto amount = CreditsAmount();
+		const auto ton = state->ton.current();
+		if (ton) {
+			const auto text = tonField->getLastText();
+			const auto now = Ui::ParseTonAmountString(text);
+			amount = CreditsAmount(
+				now.value_or(0) / Ui::kNanosInOne,
+				now.value_or(0) % Ui::kNanosInOne,
+				CreditsType::Ton);
+			const auto bad = (!now || !*now)
+				? (!args.allowEmpty)
+				: ((*now < args.nanoTonMin) || (*now > args.nanoTonMax));
+			if (!bad) {
+				return amount;
+			}
+			tonField->showError();
+		} else {
+			const auto now = starsField->getLastText().toLongLong();
+			amount = CreditsAmount(now);
+			const auto bad = !now
+				? (!args.allowEmpty)
+				: ((now < args.starsMin) || (now > args.starsMax));
+			if (!bad) {
+				return amount;
+			}
+			starsField->showError();
+		}
+		if (const auto hook = args.errorHook) {
+			hook(amount);
+		}
+		return {};
+	};
+
+	const auto updatePrice = [=] {
+		if (auto result = computeResult()) {
+			state->price = *result;
+		}
+		state->updates.fire({});
+	};
+	const auto updateTonFromStars = [=] {
+		if (auto result = computeResult(); result && result->stars()) {
+			const auto v = Ui::TonFromStars(session, *result);
+			const auto amount = v.whole() * Ui::kNanosInOne + v.nano();
+			tonField->setText(
+				Ui::FormatTonAmount(amount, Ui::TonFormatFlag::Simple).full);
+		}
+	};
+	const auto updateStarsFromTon = [=] {
+		if (auto result = computeResult(); result && result->ton()) {
+			const auto v = Ui::StarsFromTon(session, *result);
+			starsField->setText(QString::number(v.whole()));
+		}
+	};
+	QObject::connect(starsField, &Ui::NumberInput::changed, starsField, [=] {
+		if (!state->ton.current()) {
+			updatePrice();
+			updateTonFromStars();
+		}
+	});
+	tonField->changes(
+	) | rpl::on_next([=] {
+		if (state->ton.current()) {
+			updatePrice();
+			updateStarsFromTon();
+		}
+	}, tonField->lifetime());
+
+	state->ton.changes(
+	) | rpl::on_next(updatePrice, container->lifetime());
+	if (state->ton.current()) {
+		updateStarsFromTon();
+	} else {
+		updateTonFromStars();
+	}
+
+	QObject::connect(
+		starsField,
+		&Ui::NumberInput::submitted,
+		container,
+		[=] { state->submits.fire({}); });
+	tonField->submits(
+	) | rpl::to_empty | rpl::start_to_stream(
+		state->submits,
+		tonField->lifetime());
+
+	auto focusCallback = [=] {
+		if (state->ton.current()) {
+			tonField->selectAll();
+			tonField->setFocusFast();
+		} else {
+			starsField->selectAll();
+			starsField->setFocusFast();
+		}
+	};
+
+	return {
+		.focusCallback = std::move(focusCallback),
+		.computeResult = std::move(computeResult),
+		.submits = state->submits.events(),
+		.updates = state->updates.events(),
+		.result = state->price.value(),
+	};
+}
+
+void ChooseSuggestPriceBox(
+		not_null<Ui::GenericBox*> box,
+		SuggestPriceBoxArgs &&args) {
+	struct Button {
+		QRect geometry;
+		Ui::Text::String text;
+		bool active = false;
+	};
+	struct State {
+		std::vector<Button> buttons;
+		rpl::event_stream<> fieldsChanges;
+		rpl::variable<CreditsAmount> price;
+		rpl::variable<TimeId> date;
+		rpl::variable<TimeId> offerDuration;
+		rpl::variable<bool> ton;
+		Fn<std::optional<CreditsAmount>()> computePrice;
+		Fn<void()> save;
+		std::optional<CreditsAmount> lastSmallPrice;
+		bool savePending = false;
+		bool inButton = false;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	state->date = args.value.date;
+	state->ton = (args.value.ton != 0);
+	state->price = args.value.price();
+
+	const auto peer = args.peer;
+	[[maybe_unused]] const auto details = ComputePaymentDetails(peer, 1);
+
+	const auto mode = args.mode;
+	const auto gift = (mode == SuggestMode::Gift);
+	const auto admin = peer->amMonoforumAdmin();
+	const auto broadcast = peer->monoforumBroadcast();
+	const auto usePeer = broadcast ? broadcast : peer;
+	const auto session = &peer->session();
+	const auto &appConfig = session->appConfig();
+	if (!admin) {
+		session->credits().load();
+		session->credits().tonLoad();
+	}
+	const auto container = box->verticalLayout();
+
+	box->setStyle(st::suggestPriceBox);
+
+	auto title = gift
+		? tr::lng_gift_offer_title()
+		: (mode == SuggestMode::New)
+		? tr::lng_suggest_options_title()
+		: tr::lng_suggest_options_change();
+	if (admin) {
+		box->setTitle(std::move(title));
+	} else {
+		box->setNoContentMargin(true);
+
+		Ui::AddSkip(container, st::boxTitleHeight * 1.1);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				std::move(title),
+				st::settingsPremiumUserTitle),
+			style::al_top);
+	}
+
+	state->buttons.push_back({
+		.text = Ui::Text::String(
+			st::semiboldTextStyle,
+			(admin
+				? tr::lng_suggest_options_stars_request(tr::now)
+				: tr::lng_suggest_options_stars_offer(tr::now))),
+		.active = !state->ton.current(),
+	});
+	state->buttons.push_back({
+		.text = Ui::Text::String(
+			st::semiboldTextStyle,
+			(admin
+				? tr::lng_suggest_options_ton_request(tr::now)
+				: tr::lng_suggest_options_ton_offer(tr::now))),
+		.active = state->ton.current(),
+	});
+
+	auto x = 0;
+	auto y = st::giftBoxTabsMargin.top();
+	const auto padding = st::giftBoxTabPadding;
+	for (auto &button : state->buttons) {
+		const auto width = button.text.maxWidth();
+		const auto height = st::semiboldTextStyle.font->height;
+		const auto r = QRect(0, 0, width, height).marginsAdded(padding);
+		button.geometry = QRect(QPoint(x, y), r.size());
+		x += r.width() + st::giftBoxTabSkip;
+	}
+	const auto buttonsSkip = admin ? 0 : st::normalFont->height;
+	const auto buttons = box->addRow(
+		object_ptr<Ui::RpWidget>(box),
+		(st::boxRowPadding
+			- QMargins(
+				padding.left() / 2,
+				-buttonsSkip,
+				padding.right() / 2,
+				0)));
+	const auto height = y
+		+ state->buttons.back().geometry.height()
+		+ st::giftBoxTabsMargin.bottom();
+	buttons->resize(buttons->width(), height);
+
+	buttons->setMouseTracking(true);
+	buttons->events() | rpl::on_next([=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		switch (type) {
+		case QEvent::MouseMove: {
+			const auto in = [&] {
+				const auto me = static_cast<QMouseEvent*>(e.get());
+				const auto position = me->pos();
+				for (const auto &button : state->buttons) {
+					if (button.geometry.contains(position)) {
+						return true;
+					}
+				}
+				return false;
+			}();
+			if (state->inButton != in) {
+				state->inButton = in;
+				buttons->setCursor(in
+					? style::cur_pointer
+					: style::cur_default);
+			}
+		} break;
+		case QEvent::MouseButtonPress: {
+			const auto me = static_cast<QMouseEvent*>(e.get());
+			if (me->button() != Qt::LeftButton) {
+				break;
+			}
+			const auto position = me->pos();
+			for (auto i = 0, c = int(state->buttons.size()); i != c; ++i) {
+				if (state->buttons[i].geometry.contains(position)) {
+					state->ton = (i != 0);
+					state->buttons[i].active = true;
+					state->buttons[1 - i].active = false;
+					buttons->update();
+					break;
+				}
+			}
+		} break;
+		}
+	}, buttons->lifetime());
+
+	buttons->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(buttons);
+		auto hq = PainterHighQualityEnabler(p);
+		const auto padding = st::giftBoxTabPadding;
+		for (const auto &button : state->buttons) {
+			const auto geometry = button.geometry;
+			if (button.active) {
+				p.setBrush(st::giftBoxTabBgActive);
+				p.setPen(Qt::NoPen);
+				const auto radius = geometry.height() / 2.;
+				p.drawRoundedRect(geometry, radius, radius);
+				p.setPen(st::giftBoxTabFgActive);
+			} else {
+				p.setPen(st::giftBoxTabFg);
+			}
+			button.text.draw(p, {
+				.position = geometry.marginsRemoved(padding).topLeft(),
+				.availableWidth = button.text.maxWidth(),
+			});
+		}
+	}, buttons->lifetime());
+
+	Ui::AddSkip(container);
+
+	const auto computePrice = [session](CreditsAmount amount) {
+		return PriceAfterCommission(session, amount).value();
+	};
+	const auto formatCommission = [session](CreditsAmount amount) {
+		return FormatAfterCommissionPercent(session, amount);
+	};
+	const auto youGet = [=](rpl::producer<CreditsAmount> price, bool stars) {
+		return (stars
+			? tr::lng_suggest_options_you_get_stars
+			: tr::lng_suggest_options_you_get_ton)(
+				lt_count_decimal,
+				rpl::duplicate(price) | rpl::map(computePrice),
+				lt_percent,
+				rpl::duplicate(price) | rpl::map(formatCommission));
+	};
+	auto starsAbout = admin
+		? rpl::combine(
+			youGet(StarsPriceValue(state->price.value()), true),
+			tr::lng_suggest_options_stars_warning(tr::rich)
+		) | rpl::map([=](const QString &t1, const TextWithEntities &t2) {
+			return TextWithEntities{ t1 }.append("\n\n").append(t2);
+		})
+		: gift
+		? tr::lng_gift_offer_stars_about(
+			lt_name,
+			rpl::single(tr::marked(args.giftName)),
+			tr::rich)
+		: tr::lng_suggest_options_stars_price_about(tr::rich);
+	auto tonAbout = admin
+		? youGet(
+			TonPriceValue(state->price.value()),
+			false
+		) | rpl::map(tr::rich)
+		: gift
+		? tr::lng_gift_offer_ton_about(
+			lt_name,
+			rpl::single(tr::marked(args.giftName)),
+			tr::rich)
+		: tr::lng_suggest_options_ton_price_about(tr::rich);
+	const auto nanoTonMin = gift
+		? appConfig.giftResaleNanoTonMin()
+		: appConfig.suggestedPostNanoTonMin();
+	const auto nanoTonMax = gift
+		? appConfig.giftResaleNanoTonMax()
+		: appConfig.suggestedPostNanoTonMax();
+	const auto starsMin = gift
+		? appConfig.giftResaleStarsMin()
+		: appConfig.suggestedPostStarsMin();
+	const auto starsMax = gift
+		? appConfig.giftResaleStarsMax()
+		: appConfig.suggestedPostStarsMax();
+	const auto recordBadAmount = [=](CreditsAmount amount) {
+		if (false
+			|| (amount.ton()
+				&& (amount.value()
+					> (nanoTonMin + nanoTonMax) / (2. * Ui::kNanosInOne)))
+			|| (!amount.ton()
+				&& (amount.whole() >= starsMax))) {
+			state->lastSmallPrice = {};
+			return;
+		}
+		state->lastSmallPrice = amount;
+	};
+	auto priceInput = AddStarsTonPriceInput(container, {
+		.session = session,
+		.showTon = state->ton.value(),
+		.price = args.value.price(),
+		.starsMin = starsMin,
+		.starsMax = starsMax,
+		.nanoTonMin = nanoTonMin,
+		.nanoTonMax = nanoTonMax,
+		.allowEmpty = !gift,
+		.errorHook = recordBadAmount,
+		.starsAbout = std::move(starsAbout),
+		.tonAbout = std::move(tonAbout),
+	});
+	state->price = std::move(priceInput.result);
+	state->computePrice = std::move(priceInput.computeResult);
+	box->setFocusCallback(std::move(priceInput.focusCallback));
+
+	Ui::AddSkip(container);
+
+	if (gift) {
+		const auto day = 86400;
+		auto durations = std::vector{
+			day / 4,
+			day / 2,
+			day,
+			day + day / 2,
+			day * 2,
+			day * 3,
+		};
+		if (peer->session().isTestMode()) {
+			durations.insert(begin(durations), 120);
+		}
+		const auto durationToText = [](TimeId date) {
+			return (date >= 3600)
+				? tr::lng_hours(tr::now, lt_count, date / 3600)
+				: tr::lng_minutes(tr::now, lt_count, date / 60);
+		};
+		state->offerDuration = day;
+		const auto duration = Settings::AddButtonWithLabel(
+			container,
+			tr::lng_gift_offer_duration(),
+			state->offerDuration.value() | rpl::map(durationToText),
+			st::settingsButtonNoIcon);
+
+		duration->setClickedCallback([=] {
+			box->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
+				const auto save = [=](int index) {
+					state->offerDuration = durations[index];
+				};
+				auto options = durations
+					| ranges::views::transform(durationToText)
+					| ranges::to_vector;
+				const auto selected = ranges::find(
+					durations,
+					state->offerDuration.current());
+				SingleChoiceBox(box, {
+					.title = tr::lng_gift_offer_duration(),
+					.options = options,
+					.initialSelection = int(selected - begin(durations)),
+					.callback = save,
+				});
+			}));
+		});
+
+		Ui::AddSkip(container);
+		Ui::AddDividerText(
+			container,
+			tr::lng_gift_offer_duration_about(
+				lt_user,
+				rpl::single(peer->shortName())));
+	} else {
+		const auto time = Settings::AddButtonWithLabel(
+			container,
+			tr::lng_suggest_options_date(),
+			state->date.value() | rpl::map([](TimeId date) {
+				return date
+					? langDateTime(base::unixtime::parse(date))
+					: tr::lng_suggest_options_date_any(tr::now);
+			}),
+			st::settingsButtonNoIcon);
+
+		time->setClickedCallback([=] {
+			const auto weak = std::make_shared<
+				base::weak_qptr<Ui::BoxContent>
+			>();
+			const auto parentWeak = base::make_weak(box);
+			const auto done = [=](TimeId result) {
+				if (parentWeak) {
+					state->date = result;
+				}
+				if (const auto strong = weak->get()) {
+					strong->closeBox();
+				}
+			};
+			auto dateBox = Box(ChooseSuggestTimeBox, SuggestTimeBoxArgs{
+				.session = session,
+				.done = done,
+				.value = state->date.current(),
+				.mode = args.mode,
+			});
+			*weak = dateBox.data();
+			box->uiShow()->show(std::move(dateBox));
+		});
+
+		Ui::AddSkip(container);
+		Ui::AddDividerText(container, tr::lng_suggest_options_date_about());
+	}
+
+	state->save = [=] {
+		const auto ton = uint32(state->ton.current() ? 1 : 0);
+		const auto price = state->computePrice();
+		if (!price) {
+			if (const auto amount = state->lastSmallPrice) {
+				box->uiShow()->showToast(amount->ton()
+					? tr::lng_gift_sell_min_price_ton(
+						tr::now,
+						lt_count,
+						nanoTonMin / float64(Ui::kNanosInOne),
+						tr::rich)
+					: tr::lng_gift_sell_min_price(
+						tr::now,
+						lt_count,
+						starsMin,
+						tr::rich));
+			}
+			return;
+		}
+		const auto value = *price;
+		const auto credits = &session->credits();
+		if (!admin && ton) {
+			if (!credits->tonLoaded()) {
+				state->savePending = true;
+				return;
+			} else if (credits->tonBalance() < value) {
+				box->uiShow()->show(
+					Box(Ui::InsufficientTonBox, session, value));
+				return;
+			}
+		}
+		const auto requiredStars = peer->starsPerMessageChecked()
+			+ (ton ? 0 : int(base::SafeRound(value.value())));
+		if (!admin && requiredStars) {
+			if (!credits->loaded()) {
+				state->savePending = true;
+				return;
+			}
+			if (credits->balance() < CreditsAmount(requiredStars)) {
+				using namespace Settings;
+				const auto done = [=](SmallBalanceResult result) {
+					if (result == SmallBalanceResult::Success
+						|| result == SmallBalanceResult::Already) {
+						state->save();
+					}
+				};
+				const auto source = gift
+					? Settings::SmallBalanceSource(SmallBalanceForOffer())
+					: SmallBalanceForSuggest{ usePeer->id };
+				MaybeRequestBalanceIncrease(
+					Main::MakeSessionShow(box->uiShow(), session),
+					requiredStars,
+					source,
+					done);
+				return;
+			}
+		}
+		args.done({
+			.exists = true,
+			.priceWhole = uint32(value.whole()),
+			.priceNano = uint32(value.nano()),
+			.ton = ton,
+			.date = state->date.current(),
+			.offerDuration = state->offerDuration.current(),
+		});
+	};
+
+	const auto credits = &session->credits();
+	rpl::combine(
+		credits->tonBalanceValue(),
+		credits->balanceValue()
+	) | rpl::filter([=] {
+		return state->savePending;
+	}) | rpl::on_next([=] {
+		state->savePending = false;
+		if (const auto onstack = state->save) {
+			onstack();
+		}
+	}, box->lifetime());
+
+	std::move(
+		priceInput.submits
+	) | rpl::on_next(state->save, box->lifetime());
+
+	auto helper = Ui::Text::CustomEmojiHelper();
+	const auto button = box->addButton(rpl::single(QString()), state->save);
+	const auto coloredTonIcon = helper.paletteDependent(
+		Ui::Earn::IconCurrencyEmoji());
+	button->setContext(helper.context());
+	button->setText(state->price.value(
+	) | rpl::map([=](CreditsAmount price) {
+		if (args.mode == SuggestMode::Change) {
+			return tr::lng_suggest_options_update(
+				tr::now,
+				tr::marked);
+		} else if (price.empty()) {
+			return tr::lng_suggest_options_offer_free(
+				tr::now,
+				tr::marked);
+		} else if (price.ton()) {
+			return tr::lng_suggest_options_offer(
+				tr::now,
+				lt_amount,
+				Ui::Text::IconEmoji(&st::tonIconEmoji).append(
+					Lang::FormatCreditsAmountDecimal(price)),
+				tr::marked);
+		}
+		return tr::lng_suggest_options_offer(
+			tr::now,
+			lt_amount,
+			Ui::Text::IconEmoji(&st::starIconEmoji).append(
+				Lang::FormatCreditsAmountDecimal(price)),
+			tr::marked);
+	}));
+	const auto buttonWidth = st::boxWidth
+		- rect::m::sum::h(st::suggestPriceBox.buttonPadding);
+	button->widthValue() | rpl::filter([=] {
+		return (button->widthNoMargins() != buttonWidth);
+	}) | rpl::on_next([=] {
+		button->resizeToWidth(buttonWidth);
+	}, button->lifetime());
+
+	if (admin) {
+		box->addTopButton(st::boxTitleClose, [=] {
+			box->closeBox();
+		});
+	} else {
+		const auto close = Ui::CreateChild<Ui::IconButton>(
+			container,
+			st::boxTitleClose);
+		close->setClickedCallback([=] { box->closeBox(); });
+		container->widthValue() | rpl::on_next([=](int) {
+			close->moveToRight(0, 0);
+		}, close->lifetime());
+
+		session->credits().load(true);
+		session->credits().tonLoad(true);
+		const auto balance = Settings::AddBalanceWidget(
+			container,
+			session,
+			rpl::conditional(
+				state->ton.value(),
+				session->credits().tonBalanceValue(),
+				session->credits().balanceValue()),
+			false);
+		rpl::combine(
+			balance->sizeValue(),
+			container->sizeValue()
+		) | rpl::on_next([=](const QSize &, const QSize &) {
+			balance->moveToLeft(
+				st::creditsHistoryRightSkip * 2,
+				st::creditsHistoryRightSkip);
+			balance->update();
+		}, balance->lifetime());
+	}
+}
+
+bool CanEditSuggestedMessage(not_null<HistoryItem*> item) {
+	if (item->richPage()) {
+		return false;
+	}
+	const auto media = item->media();
+	return !media || media->allowsEditCaption();
+}
+
+bool CanAddOfferToMessage(not_null<HistoryItem*> item) {
+	const auto history = item->history();
+	const auto broadcast = history->peer->monoforumBroadcast();
+	return broadcast
+		&& !history->amMonoforumAdmin()
+		&& !item->Get<HistoryMessageSuggestion>()
+		&& !item->groupId()
+		&& item->isRegular()
+		&& !item->isService()
+		&& !item->errorTextForForwardIgnoreRights(
+			history->owner().history(broadcast)).has_value();
+}
+
+CreditsAmount PriceAfterCommission(
+		not_null<Main::Session*> session,
+		CreditsAmount price) {
+	const auto appConfig = &session->appConfig();
+	const auto mul = price.stars()
+		? appConfig->suggestedPostCommissionStars()
+		: appConfig->suggestedPostCommissionTon();
+	const auto exact = price.multiplied(mul / 1000.);
+	return price.stars()
+		? CreditsAmount(exact.whole(), 0, CreditsType::Stars)
+		: exact;
+}
+
+QString FormatAfterCommissionPercent(
+		not_null<Main::Session*> session,
+		CreditsAmount price) {
+	const auto appConfig = &session->appConfig();
+	const auto mul = price.stars()
+		? appConfig->suggestedPostCommissionStars()
+		: appConfig->suggestedPostCommissionTon();
+	return QString::number(mul / 10.) + '%';
+}
+
+SuggestOptionsBar::SuggestOptionsBar(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<PeerData*> peer,
+	SuggestOptions values,
+	SuggestMode mode)
+: _show(std::move(show))
+, _peer(peer)
+, _mode(mode)
+, _values(values) {
+	updateTexts();
+}
+
+SuggestOptionsBar::~SuggestOptionsBar() = default;
+
+void SuggestOptionsBar::paintIcon(
+		QPainter &p,
+		int x,
+		int y,
+		int outerWidth) {
+	st::historySuggestIconActive.paint(
+		p,
+		QPoint(x, y) + st::historySuggestIconPosition,
+		outerWidth);
+}
+
+void SuggestOptionsBar::paintBar(QPainter &p, int x, int y, int outerWidth) {
+	paintIcon(p, x, y, outerWidth);
+	paintLines(p, x + st::historyReplySkip, y, outerWidth);
+}
+
+void SuggestOptionsBar::paintLines(
+		QPainter &p,
+		int x,
+		int y,
+		int outerWidth) {
+	auto available = outerWidth
+		- x
+		- st::historyReplyCancel.width
+		- st::msgReplyPadding.right();
+	p.setPen(st::windowActiveTextFg);
+	_title.draw(p, {
+		.position = QPoint(x, y + st::msgReplyPadding.top()),
+		.availableWidth = available,
+	});
+	p.setPen(st::windowSubTextFg);
+	_text.draw(p, {
+		.position = QPoint(
+			x,
+			y + st::msgReplyPadding.top() + st::msgServiceNameFont->height),
+		.availableWidth = available,
+	});
+}
+
+void SuggestOptionsBar::edit() {
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
+	const auto apply = [=](SuggestOptions values) {
+		_values = values;
+		updateTexts();
+		_updates.fire({});
+		if (const auto strong = weak->get()) {
+			strong->closeBox();
+		}
+	};
+	*weak = _show->show(Box(ChooseSuggestPriceBox, SuggestPriceBoxArgs{
+		.peer = _peer,
+		.done = apply,
+		.value = _values,
+		.mode = _mode,
+	}));
+}
+
+void SuggestOptionsBar::updateTexts() {
+	_title.setText(
+		st::semiboldTextStyle,
+		((_mode == SuggestMode::New)
+			? tr::lng_suggest_bar_title(tr::now)
+			: tr::lng_suggest_options_change(tr::now)));
+
+	auto helper = Ui::Text::CustomEmojiHelper();
+	const auto text = composeText(helper);
+	_text.setMarkedText(
+		st::defaultTextStyle,
+		text,
+		kMarkupTextOptions,
+		helper.context());
+}
+
+TextWithEntities SuggestOptionsBar::composeText(
+		Ui::Text::CustomEmojiHelper &helper) const {
+	const auto amount = _values.price().ton()
+		? helper.paletteDependent(Ui::Earn::IconCurrencyEmoji({
+			.size = st::suggestBarTonIconSize,
+			.margin = st::suggestBarTonIconMargins,
+		})).append(Lang::FormatCreditsAmountDecimal(_values.price()))
+		: helper.paletteDependent(
+			Ui::Earn::IconCreditsEmojiSmall()
+		).append(Lang::FormatCreditsAmountDecimal(_values.price()));
+	const auto date = langDateTime(base::unixtime::parse(_values.date));
+	if (!_values.price() && !_values.date) {
+		return tr::lng_suggest_bar_text(tr::now, tr::marked);
+	} else if (!_values.date) {
+		return tr::lng_suggest_bar_priced(
+			tr::now,
+			lt_amount,
+			amount,
+			tr::marked);
+	} else if (!_values.price()) {
+		return tr::lng_suggest_bar_dated(
+			tr::now,
+			lt_date,
+			tr::marked(date),
+			tr::marked);
+	}
+	return tr::marked().append(
+		amount
+	).append("   ").append(
+		QString::fromUtf8("\xf0\x9f\x93\x86 ")
+	).append(date);
+}
+
+SuggestOptions SuggestOptionsBar::values() const {
+	auto result = _values;
+	result.exists = 1;
+	return result;
+}
+
+rpl::producer<> SuggestOptionsBar::updates() const {
+	return _updates.events();
+}
+
+rpl::lifetime &SuggestOptionsBar::lifetime() {
+	return _lifetime;
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.h b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.h
new file mode 100644
index 00000000000000..fb5fd4fea0e075
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.h
@@ -0,0 +1,144 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "api/api_common.h"
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Ui {
+class GenericBox;
+class VerticalLayout;
+class NumberInput;
+class InputField;
+} // namespace Ui
+
+namespace Ui::Text {
+class CustomEmojiHelper;
+} // namespace Ui::Text
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace HistoryView {
+
+enum class SuggestMode {
+	New,
+	Change,
+	Publish,
+	Gift,
+};
+
+struct SuggestTimeBoxArgs {
+	not_null<Main::Session*> session;
+	Fn<void(TimeId)> done;
+	TimeId value = 0;
+	SuggestMode mode = SuggestMode::New;
+};
+void ChooseSuggestTimeBox(
+	not_null<Ui::GenericBox*> box,
+	SuggestTimeBoxArgs &&args);
+
+struct StarsTonPriceInput {
+	Fn<void()> focusCallback;
+	Fn<std::optional<CreditsAmount>()> computeResult;
+	rpl::producer<> submits;
+	rpl::producer<> updates;
+	rpl::producer<CreditsAmount> result;
+};
+
+struct StarsTonPriceArgs {
+	not_null<Main::Session*> session;
+	rpl::producer<bool> showTon;
+	CreditsAmount price;
+	int starsMin = 0;
+	int starsMax = 0;
+	int64 nanoTonMin = 0;
+	int64 nanoTonMax = 0;
+	bool allowEmpty = false;
+	Fn<void(CreditsAmount)> errorHook;
+	rpl::producer<TextWithEntities> starsAbout;
+	rpl::producer<TextWithEntities> tonAbout;
+};
+
+[[nodiscard]] StarsTonPriceInput AddStarsTonPriceInput(
+	not_null<Ui::VerticalLayout*> container,
+	StarsTonPriceArgs &&args);
+
+struct SuggestPriceBoxArgs {
+	not_null<PeerData*> peer;
+	bool updating = false;
+	Fn<void(SuggestOptions)> done;
+	SuggestOptions value;
+	SuggestMode mode = SuggestMode::New;
+	QString giftName;
+};
+void ChooseSuggestPriceBox(
+	not_null<Ui::GenericBox*> box,
+	SuggestPriceBoxArgs &&args);
+
+[[nodiscard]] bool CanEditSuggestedMessage(not_null<HistoryItem*> item);
+
+[[nodiscard]] bool CanAddOfferToMessage(not_null<HistoryItem*> item);
+
+[[nodiscard]] CreditsAmount PriceAfterCommission(
+	not_null<Main::Session*> session,
+	CreditsAmount price);
+[[nodiscard]] QString FormatAfterCommissionPercent(
+	not_null<Main::Session*> session,
+	CreditsAmount price);
+
+class SuggestOptionsBar final {
+public:
+	SuggestOptionsBar(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<PeerData*> peer,
+		SuggestOptions values,
+		SuggestMode mode);
+	~SuggestOptionsBar();
+
+	void paintBar(QPainter &p, int x, int y, int outerWidth);
+	void edit();
+
+	void paintIcon(QPainter &p, int x, int y, int outerWidth);
+	void paintLines(QPainter &p, int x, int y, int outerWidth);
+
+	[[nodiscard]] SuggestOptions values() const;
+
+	[[nodiscard]] rpl::producer<> updates() const;
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
+private:
+	void updateTexts();
+
+	[[nodiscard]] TextWithEntities composeText(
+		Ui::Text::CustomEmojiHelper &helper) const;
+
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const not_null<PeerData*> _peer;
+	const SuggestMode _mode = SuggestMode::New;
+
+	Ui::Text::String _title;
+	Ui::Text::String _text;
+
+	SuggestOptions _values;
+	rpl::event_stream<> _updates;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp
index f7e15f5e5014d9..71f7a2f943eab0 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_ttl_button.cpp
@@ -37,7 +37,7 @@ TTLButton::TTLButton(
 	peer->session().changes().peerFlagsValue(
 		peer,
 		Data::PeerUpdate::Flag::MessagesTTL
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_button.setText(Ui::FormatTTLTiny(peer->messagesTTL()));
 	}, _button.lifetime());
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 837cc0957fc30d..65dfe29a282c34 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 #include "base/random.h"
 #include "base/unixtime.h"
 #include "ui/boxes/confirm_box.h"
+#include "calls/calls_instance.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "core/application.h"
 #include "data/data_document.h"
@@ -24,30 +25,37 @@ For license and copyright information please follow this link:
 #include "mainwidget.h" // MainWidget::stopAndClosePlayer
 #include "mainwindow.h"
 #include "media/audio/media_audio.h"
+#include "media/audio/media_audio_edit.h"
 #include "media/audio/media_audio_capture.h"
 #include "media/player/media_player_button.h"
 #include "media/player/media_player_instance.h"
+#include "media/streaming/media_streaming_instance.h"
+#include "media/streaming/media_streaming_round_preview.h"
+#include "storage/storage_account.h"
+#include "ui/controls/round_video_recorder.h"
 #include "ui/controls/send_button.h"
 #include "ui/effects/animation_value.h"
 #include "ui/effects/animation_value_f.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
+#include "ui/dynamic_image.h"
 #include "ui/painter.h"
+#include "ui/widgets/fields/input_field.h" // ShouldSubmit.
 #include "ui/widgets/tooltip.h"
 #include "ui/rect.h"
 #include "ui/ui_utility.h"
+#include "webrtc/webrtc_video_track.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
 #include "styles/style_media_player.h"
 
+#include <tgcalls/VideoCaptureInterface.h>
+
 namespace HistoryView::Controls {
 namespace {
 
-using SendActionUpdate = VoiceRecordBar::SendActionUpdate;
-using VoiceToSend = VoiceRecordBar::VoiceToSend;
-
 constexpr auto kAudioVoiceUpdateView = crl::time(200);
 constexpr auto kAudioVoiceMaxLength = 100 * 60; // 100 minutes
 constexpr auto kMaxSamples
@@ -55,13 +63,12 @@ constexpr auto kMaxSamples
 constexpr auto kMinSamples
 	= ::Media::Player::kDefaultFrequency / 5; // 0.2 seconds
 
-constexpr auto kInactiveWaveformBarAlpha = int(255 * 0.6);
-
 constexpr auto kPrecision = 10;
 
 constexpr auto kLockArcAngle = 15.;
 
 constexpr auto kHideWaveformBgOffset = 50;
+constexpr auto kTrimPlaybackEpsilon = 0.0001;
 
 enum class FilterType {
 	Continue,
@@ -69,16 +76,63 @@ enum class FilterType {
 	Cancel,
 };
 
-[[nodiscard]] auto InactiveColor(const QColor &c) {
-	return QColor(c.red(), c.green(), c.blue(), kInactiveWaveformBarAlpha);
+class SoundedPreview final : public Ui::DynamicImage {
+public:
+	SoundedPreview(
+		not_null<DocumentData*> document,
+		rpl::producer<> repaints);
+	std::shared_ptr<DynamicImage> clone() override;
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	const not_null<DocumentData*> _document;
+	QImage _roundingMask;
+	Fn<void()> _repaint;
+	rpl::lifetime _lifetime;
+
+};
+
+SoundedPreview::SoundedPreview(
+	not_null<DocumentData*> document,
+	rpl::producer<> repaints)
+: _document(document) {
+	std::move(repaints) | rpl::on_next([=] {
+		if (const auto onstack = _repaint) {
+			onstack();
+		}
+	}, _lifetime);
 }
 
-[[nodiscard]] auto Progress(int low, int high) {
-	return std::clamp(float64(low) / high, 0., 1.);
+std::shared_ptr<Ui::DynamicImage> SoundedPreview::clone() {
+	Unexpected("ListenWrap::videoPreview::clone.");
+}
+
+QImage SoundedPreview::image(int size) {
+	const auto player = ::Media::Player::instance();
+	const auto streamed = player->roundVideoPreview(_document);
+	if (!streamed) {
+		return {};
+	}
+
+	const auto full = QSize(size, size) * style::DevicePixelRatio();
+	if (_roundingMask.size() != full) {
+		_roundingMask = Images::EllipseMask(full);
+	}
+	const auto frame = streamed->frameWithInfo({
+		.resize = full,
+		.outer = full,
+		.mask = _roundingMask,
+	});
+	return frame.image;
+}
+
+void SoundedPreview::subscribeToUpdates(Fn<void()> callback) {
+	_repaint = std::move(callback);
 }
 
-[[nodiscard]] crl::time Duration(int samples) {
-	return samples * crl::time(1000) / ::Media::Player::kDefaultFrequency;
+[[nodiscard]] auto Progress(int low, int high) {
+	return std::clamp(float64(low) / high, 0., 1.);
 }
 
 [[nodiscard]] auto FormatVoiceDuration(int samples) {
@@ -89,6 +143,16 @@ enum class FilterType {
 	return durationString + QLocale().decimalPoint() + decimalPart;
 }
 
+[[nodiscard]] QString FormatTrimDuration(crl::time duration) {
+	auto result = Ui::FormatDurationText(duration / 1000);
+	if ((result.size() == 5)
+		&& (result[0] == QChar('0'))
+		&& (result[2] == QChar(':'))) {
+		result.remove(0, 1);
+	}
+	return result;
+}
+
 [[nodiscard]] std::unique_ptr<VoiceData> ProcessCaptureResult(
 		const VoiceWaveform &waveform) {
 	auto voiceData = std::make_unique<VoiceData>();
@@ -116,6 +180,137 @@ enum class FilterType {
 		int32(0));
 }
 
+[[nodiscard]] VoiceWaveform ResampleWaveformToRange(
+		const VoiceWaveform &source,
+		float64 left,
+		float64 right) {
+	if (source.isEmpty() || (source[0] < 0)) {
+		return {};
+	}
+	const auto size = int(source.size());
+	if (size <= 0) {
+		return {};
+	}
+	left = std::clamp(left, 0., 1.);
+	right = std::clamp(right, left, 1.);
+	if ((right - left) <= 0.) {
+		return {};
+	}
+	const auto begin = left * size;
+	const auto end = right * size;
+	const auto range = end - begin;
+	if (range <= 0.) {
+		return {};
+	}
+	auto result = VoiceWaveform(size, 0);
+	for (auto i = 0; i != size; ++i) {
+		const auto segmentStart = begin + (range * i) / size;
+		const auto segmentEnd = begin + (range * (i + 1)) / size;
+		const auto from = std::clamp(
+			int(std::floor(segmentStart)),
+			0,
+			size - 1);
+		const auto till = std::clamp(
+			int(std::ceil(segmentEnd)) - 1,
+			from,
+			size - 1);
+		auto peak = uchar(0);
+		for (auto j = from; j <= till; ++j) {
+			peak = std::max(peak, uchar(source[j]));
+		}
+		result[i] = char(peak);
+	}
+	return result;
+}
+
+[[nodiscard]] VoiceWaveform ResampleWaveformToSize(
+		const VoiceWaveform &source,
+		int targetSize) {
+	if (source.isEmpty() || (source[0] < 0) || (targetSize <= 0)) {
+		return {};
+	}
+	const auto sourceSize = int(source.size());
+	if (sourceSize <= 0) {
+		return {};
+	}
+	if (sourceSize == targetSize) {
+		return source;
+	}
+	auto result = VoiceWaveform(targetSize, 0);
+	for (auto i = 0; i != targetSize; ++i) {
+		const auto segmentStart = (float64(sourceSize) * i) / targetSize;
+		const auto segmentEnd = (float64(sourceSize) * (i + 1)) / targetSize;
+		const auto from = std::clamp(
+			int(std::floor(segmentStart)),
+			0,
+			sourceSize - 1);
+		const auto till = std::clamp(
+			int(std::ceil(segmentEnd)) - 1,
+			from,
+			sourceSize - 1);
+		auto peak = uchar(0);
+		for (auto j = from; j <= till; ++j) {
+			peak = std::max(peak, uchar(source[j]));
+		}
+		result[i] = char(peak);
+	}
+	return result;
+}
+
+[[nodiscard]] VoiceWaveform MergeWaveformsByDuration(
+		const VoiceWaveform &first,
+		crl::time firstDuration,
+		const VoiceWaveform &second,
+		crl::time secondDuration) {
+	const auto totalDuration = firstDuration + secondDuration;
+	if (totalDuration <= 0) {
+		return {};
+	}
+	const auto targetSize = int(::Media::Player::kWaveformSamplesCount);
+	if (targetSize <= 0) {
+		return {};
+	}
+	auto firstSize = int(
+		((firstDuration * targetSize) + (totalDuration / 2))
+		/ totalDuration);
+	if ((firstDuration > 0) && (secondDuration > 0)) {
+		firstSize = std::clamp(firstSize, 1, targetSize - 1);
+	} else {
+		firstSize = std::clamp(firstSize, 0, targetSize);
+	}
+	const auto secondSize = targetSize - firstSize;
+	auto result = VoiceWaveform();
+	result.reserve(targetSize);
+	if (firstSize > 0) {
+		const auto part = ResampleWaveformToSize(first, firstSize);
+		if (part.isEmpty()) {
+			return {};
+		}
+		for (const auto value : part) {
+			result.push_back(value);
+		}
+	}
+	if (secondSize > 0) {
+		const auto part = ResampleWaveformToSize(second, secondSize);
+		if (part.isEmpty()) {
+			return {};
+		}
+		for (const auto value : part) {
+			result.push_back(value);
+		}
+	}
+	return (int(result.size()) == targetSize) ? result : VoiceWaveform();
+}
+
+[[nodiscard]] Ui::RoundVideoResult ToRoundVideoResult(
+		::Media::Capture::Result &&data) {
+	return Ui::RoundVideoResult{
+		.content = std::move(data.bytes),
+		.waveform = std::move(data.waveform),
+		.duration = data.duration,
+	};
+}
+
 void PaintWaveform(
 		QPainter &p,
 		not_null<const VoiceData*> voiceData,
@@ -201,6 +396,44 @@ void PaintWaveform(
 	}
 }
 
+void FillWithMinithumbs(
+		QPainter &p,
+		not_null<const Ui::RoundVideoResult*> data,
+		QRect rect,
+		float64 progress) {
+	if (!data->minithumbsCount || !data->minithumbSize || rect.isEmpty()) {
+		return;
+	}
+	const auto size = rect.height();
+	const auto single = data->minithumbSize;
+	const auto perrow = data->minithumbs.width() / single;
+	const auto thumbs = (rect.width() + size - 1) / size;
+	if (!thumbs || !perrow) {
+		return;
+	}
+	for (auto i = 0; i != thumbs - 1; ++i) {
+		const auto index = (i * data->minithumbsCount) / thumbs;
+		p.drawImage(
+			QRect(rect.x() + i * size, rect.y(), size, size),
+			data->minithumbs,
+			QRect(
+				(index % perrow) * single,
+				(index / perrow) * single,
+				single,
+				single));
+	}
+	const auto last = rect.width() - (thumbs - 1) * size;
+	const auto index = ((thumbs - 1) * data->minithumbsCount) / thumbs;
+	p.drawImage(
+		QRect(rect.x() + (thumbs - 1) * size, rect.y(), last, size),
+		data->minithumbs,
+		QRect(
+			(index % perrow) * single,
+			(index / perrow) * single,
+			(last * single) / size,
+			single));
+}
+
 [[nodiscard]] QRect DrawLockCircle(
 		QPainter &p,
 		const QRect &widgetRect,
@@ -269,7 +502,8 @@ class TTLButton final : public Ui::RippleButton {
 public:
 	TTLButton(
 		not_null<Ui::RpWidget*> parent,
-		const style::RecordBar &st);
+		const style::RecordBar &st,
+		bool recordingVideo);
 
 	void clearState() override;
 
@@ -288,7 +522,8 @@ class TTLButton final : public Ui::RippleButton {
 
 TTLButton::TTLButton(
 	not_null<Ui::RpWidget*> parent,
-	const style::RecordBar &st)
+	const style::RecordBar &st,
+	bool recordingVideo)
 : RippleButton(parent, st.lock.ripple)
 , _st(st)
 , _rippleRect(Rect(Size(st::historyRecordLockTopShadow.width()))
@@ -306,7 +541,7 @@ TTLButton::TTLButton(
 			st::universalDuration);
 	});
 
-	Ui::RpWidget::shownValue() | rpl::start_with_next([=](bool shown) {
+	Ui::RpWidget::shownValue() | rpl::on_next([=](bool shown) {
 		if (!shown) {
 			_tooltip = nullptr;
 			return;
@@ -315,10 +550,12 @@ TTLButton::TTLButton(
 		}
 		auto text = rpl::conditional(
 			Core::App().settings().ttlVoiceClickTooltipHiddenValue(),
-			tr::lng_record_once_active_tooltip(
-				Ui::Text::RichLangValue),
+			(recordingVideo
+				? tr::lng_record_once_active_video
+				: tr::lng_record_once_active_tooltip)(
+					tr::rich),
 			tr::lng_record_once_first_tooltip(
-				Ui::Text::RichLangValue));
+				tr::rich));
 		_tooltip.reset(Ui::CreateChild<Ui::ImportantTooltip>(
 			parent.get(),
 			object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
@@ -331,7 +568,7 @@ TTLButton::TTLButton(
 				st::defaultImportantTooltip.padding),
 			st::historyRecordTooltip));
 		Ui::RpWidget::geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			if (r.isEmpty()) {
 				return;
 			}
@@ -343,13 +580,14 @@ TTLButton::TTLButton(
 					r.top()
 						+ r.height()
 						- size.height()
+						- st::historyRecordTooltipSkip
 						+ st::historyRecordTooltip.padding.top());
 			});
 		}, _tooltip->lifetime());
 		_tooltip->show();
 		if (!Core::App().settings().ttlVoiceClickTooltipHidden()) {
 			clicks(
-			) | rpl::take(1) | rpl::start_with_next([=] {
+			) | rpl::take(1) | rpl::on_next([=] {
 				Core::App().settings().setTtlVoiceClickTooltipHidden(true);
 			}, _tooltip->lifetime());
 			_tooltip->toggleAnimated(true);
@@ -358,7 +596,7 @@ TTLButton::TTLButton(
 		}
 
 		clicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto toggled = !Ui::AbstractButton::isDisabled();
 			_tooltip->toggleAnimated(toggled);
 
@@ -372,17 +610,17 @@ TTLButton::TTLButton(
 		) | rpl::map([=](const QRect &r) {
 			return (r.left() + r.width() > parentWidget()->width());
 		}) | rpl::distinct_until_changed(
-		) | rpl::start_with_next([=](bool toHide) {
+		) | rpl::on_next([=](bool toHide) {
 			const auto isFirstTooltip
 				= !Core::App().settings().ttlVoiceClickTooltipHidden();
-			if (isFirstTooltip || (!isFirstTooltip && toHide)) {
+			if (isFirstTooltip || toHide) {
 				_tooltip->toggleAnimated(!toHide);
 			}
 		}, _tooltip->lifetime());
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(this);
 
 		const auto inner = DrawLockCircle(p, rect(), _st.lock, 1.);
@@ -402,6 +640,9 @@ TTLButton::TTLButton(
 		}
 
 	}, lifetime());
+	setAccessibleName((recordingVideo
+		? tr::lng_in_dlg_video_message_ttl
+		: tr::lng_in_dlg_voice_message_ttl)(tr::now));
 }
 
 void TTLButton::clearState() {
@@ -425,40 +666,77 @@ class ListenWrap final {
 	ListenWrap(
 		not_null<Ui::RpWidget*> parent,
 		const style::RecordBar &st,
+		std::shared_ptr<Ui::SendButton> send,
 		not_null<Main::Session*> session,
-		::Media::Capture::Result *data,
+		not_null<Ui::RoundVideoResult*> data,
+		bool allowTrim,
 		const style::font &font);
 
 	void requestPaintProgress(float64 progress);
-	rpl::producer<> stopRequests() const;
+	void prepareForSendAnimation();
+	[[nodiscard]] rpl::producer<> stopRequests() const;
+	void applyTrimBeforeSend();
 
 	void playPause();
+	[[nodiscard]] std::shared_ptr<Ui::DynamicImage> videoPreview();
 
-	rpl::lifetime &lifetime();
+	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
-	void init();
-	void initPlayButton();
-	void initPlayProgress();
+	struct TrimGeometry {
+		QRect frame;
+		QRect leftHandle;
+		QRect rightHandle;
+	};
 
-	bool isInPlayer(const ::Media::Player::TrackState &state) const;
-	bool isInPlayer() const;
+	struct TrimRange {
+		crl::time from = 0;
+		crl::time till = 0;
+	};
 
-	int computeTopMargin(int height) const;
-	QRect computeWaveformRect(const QRect &centerRect) const;
+	struct TrimBoundaries {
+		float64 left = 0.;
+		float64 right = 1.;
+	};
 
-	not_null<Ui::RpWidget*> _parent;
+	void init();
+	void initPlayButton();
+	void initPlayProgress();
+	void applyTrimSelection(bool resetSelection);
+	void updateControlGeometry();
+	void updateTrimGeometry();
+	[[nodiscard]] TrimGeometry computeTrimGeometry(
+		const QRect &trimRect) const;
+	void updateDurationText();
+
+	[[nodiscard]] bool isInPlayer(
+		const ::Media::Player::TrackState &state) const;
+	[[nodiscard]] bool isInPlayer() const;
+	[[nodiscard]] bool canTrim() const;
+	[[nodiscard]] float64 trimProgressFromPosition(int x) const;
+	[[nodiscard]] float64 minimumTrimProgress() const;
+	[[nodiscard]] float64 minimumControlTrimProgress() const;
+	[[nodiscard]] crl::time selectedDuration() const;
+	[[nodiscard]] std::optional<TrimRange> selectedTrimRange() const;
+	[[nodiscard]] TrimBoundaries selectedTrimBoundaries() const;
+
+	[[nodiscard]] int computeTopMargin(int height) const;
+	[[nodiscard]] QRect computeWaveformRect(const QRect &centerRect) const;
+
+	const not_null<Ui::RpWidget*> _parent;
 
 	const style::RecordBar &_st;
+	const std::shared_ptr<Ui::SendButton> _send;
 	const not_null<Main::Session*> _session;
 	const not_null<DocumentData*> _document;
 	const std::unique_ptr<VoiceData> _voiceData;
 	const std::shared_ptr<Data::DocumentMedia> _mediaView;
-	const not_null<::Media::Capture::Result*> _data;
+	const not_null<Ui::RoundVideoResult*> _data;
+	const bool _allowTrim = false;
 	const base::unique_qptr<Ui::IconButton> _delete;
 	const style::font &_durationFont;
-	const QString _duration;
-	const int _durationWidth;
+	QString _duration;
+	int _durationWidth = 0;
 	const style::MediaPlayerButton &_playPauseSt;
 	const base::unique_qptr<Ui::AbstractButton> _playPauseButton;
 	const QColor _activeWaveformBar;
@@ -469,12 +747,23 @@ class ListenWrap final {
 	QRect _waveformBgRect;
 	QRect _waveformBgFinalCenterRect;
 	QRect _waveformFgRect;
+	QRect _controlRect;
+	bool _controlHasDuration = true;
+	QRect _trimFrameRect;
+	QRect _trimLeftHandleRect;
+	QRect _trimRightHandleRect;
+	float64 _trimLeftProgress = 0.;
+	float64 _trimRightProgress = 1.;
 
 	::Media::Player::PlayButtonLayout _playPause;
 
 	anim::value _playProgress;
 
 	rpl::variable<float64> _showProgress = 0.;
+	rpl::event_stream<> _videoRepaints;
+	QImage _sendAnimationCache;
+	bool _useSendAnimationCache = false;
+	bool _playPauseHiddenForSendAnimation = false;
 
 	rpl::lifetime _lifetime;
 
@@ -483,26 +772,33 @@ class ListenWrap final {
 ListenWrap::ListenWrap(
 	not_null<Ui::RpWidget*> parent,
 	const style::RecordBar &st,
+	std::shared_ptr<Ui::SendButton> send,
 	not_null<Main::Session*> session,
-	::Media::Capture::Result *data,
+	not_null<Ui::RoundVideoResult*> data,
+	bool allowTrim,
 	const style::font &font)
 : _parent(parent)
 , _st(st)
+, _send(send)
 , _session(session)
 , _document(DummyDocument(&session->data()))
 , _voiceData(ProcessCaptureResult(data->waveform))
 , _mediaView(_document->createMediaView())
 , _data(data)
+, _allowTrim(allowTrim)
 , _delete(base::make_unique_q<Ui::IconButton>(parent, _st.remove))
 , _durationFont(font)
-, _duration(Ui::FormatDurationText(
-	float64(_data->samples) / ::Media::Player::kDefaultFrequency))
+, _duration(FormatTrimDuration(_data->duration))
 , _durationWidth(_durationFont->width(_duration))
 , _playPauseSt(st::mediaPlayerButton)
 , _playPauseButton(base::make_unique_q<Ui::AbstractButton>(parent))
 , _activeWaveformBar(st::historyRecordVoiceFgActiveIcon->c)
-, _inactiveWaveformBar(InactiveColor(_activeWaveformBar))
+, _inactiveWaveformBar(
+	anim::with_alpha(
+		_activeWaveformBar,
+		st::historyRecordWaveformInactiveAlpha))
 , _playPause(_playPauseSt, [=] { _playPauseButton->update(); }) {
+	_delete->setAccessibleName(tr::lng_record_lock_delete(tr::now));
 	init();
 }
 
@@ -513,33 +809,33 @@ void ListenWrap::init() {
 	}) | rpl::distinct_until_changed();
 	_delete->showOn(std::move(deleteShow));
 
-	_parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	rpl::combine(
+		_parent->sizeValue(),
+		_send->widthValue()
+	) | rpl::on_next([=](QSize size, int send) {
 		_waveformBgRect = QRect({ 0, 0 }, size)
 			.marginsRemoved(st::historyRecordWaveformBgMargins);
 		{
-			const auto m = _st.remove.width + _waveformBgRect.height() / 2;
+			const auto left = _st.remove.width;
+			const auto right = send;
 			_waveformBgFinalCenterRect = _waveformBgRect.marginsRemoved(
-				style::margins(m, 0, m, 0));
-		}
-		{
-			const auto &play = _playPauseSt.playOuter;
-			const auto &final = _waveformBgFinalCenterRect;
-			_playPauseButton->moveToLeft(
-				final.x() - (final.height() - play.width()) / 2,
-				final.y());
+				style::margins(left, 0, right, 0));
 		}
 		_waveformFgRect = computeWaveformRect(_waveformBgFinalCenterRect);
+		updateTrimGeometry();
+		updateControlGeometry();
 	}, _lifetime);
 
 	_parent->paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(_parent);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto progress = _showProgress.current();
+		const auto useSendAnimationCache = _useSendAnimationCache
+			&& !_sendAnimationCache.isNull();
 		p.setOpacity(progress);
 		const auto &remove = _st.remove;
-		if (progress > 0. && progress < 1.) {
+		if (progress > 0. && progress < 1. && !useSendAnimationCache) {
 			remove.icon.paint(p, remove.iconPosition, _parent->width());
 		}
 
@@ -550,7 +846,7 @@ void ListenWrap::init() {
 			const auto deleteIconLeft = remove.iconPosition.x();
 			const auto bgRectRight = anim::interpolate(
 				deleteIconLeft,
-				remove.width,
+				_send->width(),
 				_isShowAnimation ? progress : 1.);
 			const auto bgRectLeft = anim::interpolate(
 				_parent->width() - deleteIconLeft - _waveformBgRect.height(),
@@ -562,16 +858,26 @@ void ListenWrap::init() {
 				bgRectRight + hideOffset,
 				0);
 			const auto bgRect = _waveformBgRect.marginsRemoved(bgRectMargins);
-
-			const auto horizontalMargin = bgRect.width() - bgRect.height();
-			const auto bgLeftCircleRect = bgRect.marginsRemoved(
-				style::margins(0, 0, horizontalMargin, 0));
-			const auto bgRightCircleRect = bgRect.marginsRemoved(
-				style::margins(horizontalMargin, 0, 0, 0));
-
-			const auto halfHeight = bgRect.height() / 2;
+			const auto radius = st::historyRecordWaveformBgRadius;
 			const auto bgCenterRect = bgRect.marginsRemoved(
-				style::margins(halfHeight, 0, halfHeight, 0));
+				style::margins(radius, 0, radius, 0));
+			if (useSendAnimationCache) {
+				p.save();
+				p.setClipRect(bgRect);
+				p.drawImage(bgRect.topLeft(), _sendAnimationCache);
+				p.restore();
+				return;
+			}
+			const auto trimGeometry = (progress == 1.)
+				? TrimGeometry{
+					.frame = _trimFrameRect,
+					.leftHandle = _trimLeftHandleRect,
+					.rightHandle = _trimRightHandleRect,
+				}
+				: computeTrimGeometry(bgCenterRect);
+			const auto &trimFrameRect = trimGeometry.frame;
+			const auto &trimLeftHandleRect = trimGeometry.leftHandle;
+			const auto &trimRightHandleRect = trimGeometry.rightHandle;
 
 			if (!_isShowAnimation) {
 				p.setOpacity(progress);
@@ -579,44 +885,180 @@ void ListenWrap::init() {
 				p.fillRect(bgRect, _st.bg);
 			}
 			p.setPen(Qt::NoPen);
-			p.setBrush(_st.cancelActive);
-			auto path = QPainterPath();
-			path.setFillRule(Qt::WindingFill);
-			path.addEllipse(bgLeftCircleRect);
-			path.addEllipse(bgRightCircleRect);
-			path.addRect(bgCenterRect);
-			p.drawPath(path);
-
-			// Duration paint.
-			{
-				p.setFont(_durationFont);
-				p.setPen(st::historyRecordVoiceFgActiveIcon);
-
-				const auto top = computeTopMargin(_durationFont->ascent);
-				const auto rect = bgCenterRect.marginsRemoved(
-					style::margins(
-						bgCenterRect.width() - _durationWidth,
-						top,
-						0,
-						top));
-				p.drawText(rect, style::al_left, _duration);
+			p.setBrush(anim::with_alpha(
+				_st.cancelActive->c,
+				st::historyRecordWaveformOutsideAlpha));
+			p.drawRoundedRect(bgRect, radius, radius);
+			if (canTrim() && !trimFrameRect.isEmpty()) {
+				const auto activeBgRect = trimFrameRect.intersected(bgRect);
+				auto clipPath = QPainterPath();
+				clipPath.addRoundedRect(bgRect, radius, radius);
+				p.save();
+				p.setClipPath(clipPath);
+				if (activeBgRect.isEmpty()) {
+					p.fillRect(bgRect, _st.cancelActive);
+				} else {
+					if (activeBgRect.x() > bgRect.x()) {
+						p.fillRect(
+							QRect(
+								bgRect.x(),
+								bgRect.y(),
+								activeBgRect.x() - bgRect.x(),
+								bgRect.height()),
+							_st.cancelActive);
+					}
+					if (rect::right(activeBgRect) < rect::right(bgRect)) {
+						p.fillRect(
+							QRect(
+								rect::right(activeBgRect) + 1,
+								bgRect.y(),
+								rect::right(bgRect)
+									- rect::right(activeBgRect),
+								bgRect.height()),
+							_st.cancelActive);
+					}
+				}
+				p.restore();
 			}
 
 			// Waveform paint.
-			{
-				const auto rect = (progress == 1.)
-					? _waveformFgRect
-					: computeWaveformRect(bgCenterRect);
-				if (rect.width() > 0) {
-					p.translate(rect.topLeft());
-					PaintWaveform(
-						p,
-						_voiceData.get(),
-						rect.width(),
+			const auto waveformRect = (progress == 1.)
+				? _waveformFgRect
+				: computeWaveformRect(bgCenterRect);
+			if (!waveformRect.isEmpty()) {
+				const auto playProgress = _playProgress.current();
+				const auto paintWaveform = [&](
+						QRect rect,
+						float64 opacity,
+						const QColor &activeBar,
+						const QColor &inactiveBar) {
+					if (rect.isEmpty() || (opacity <= 0.)) {
+						return;
+					}
+					p.save();
+					p.setClipRect(rect);
+					p.setOpacity(p.opacity() * opacity);
+					if (_data->minithumbs.isNull()) {
+						p.translate(waveformRect.topLeft());
+						PaintWaveform(
+							p,
+							_voiceData.get(),
+							waveformRect.width(),
+							activeBar,
+							inactiveBar,
+							playProgress);
+					} else {
+						FillWithMinithumbs(
+							p,
+							_data,
+							waveformRect,
+							playProgress);
+					}
+					p.restore();
+				};
+				const auto activeWaveformRect = trimFrameRect.intersected(
+					waveformRect);
+				if (canTrim() && !activeWaveformRect.isEmpty()) {
+					const auto outsideOpacity = std::clamp(
+						st::historyRecordWaveformOutsideAlpha,
+						0.,
+						1.);
+					paintWaveform(
+						activeWaveformRect,
+						1.,
 						_activeWaveformBar,
+						_inactiveWaveformBar);
+					paintWaveform(
+						QRect(
+							waveformRect.x(),
+							waveformRect.y(),
+							std::max(
+								0,
+								activeWaveformRect.x() - waveformRect.x()),
+							waveformRect.height()),
+						outsideOpacity,
+						_inactiveWaveformBar,
+						_inactiveWaveformBar);
+					paintWaveform(
+						QRect(
+							rect::right(activeWaveformRect) + 1,
+							waveformRect.y(),
+							std::max(
+								0,
+								rect::right(waveformRect)
+									- rect::right(activeWaveformRect)),
+							waveformRect.height()),
+						outsideOpacity,
 						_inactiveWaveformBar,
-						_playProgress.current());
-					p.resetTransform();
+						_inactiveWaveformBar);
+				} else {
+					paintWaveform(
+						waveformRect,
+						1.,
+						_activeWaveformBar,
+						_inactiveWaveformBar);
+				}
+				if (canTrim() && !trimFrameRect.isEmpty()) {
+					p.setPen(Qt::NoPen);
+					const auto inner = st::historyRecordTrimHandleInnerSize;
+					const auto drawInner = [&](const QRect &handle) {
+						const auto width = std::min(
+							inner.width(),
+							handle.width());
+						const auto height = std::min(
+							inner.height(),
+							handle.height());
+						const auto x = handle.x()
+							+ (handle.width() - width) / 2;
+						const auto y = handle.y()
+							+ (handle.height() - height) / 2;
+						p.drawRoundedRect(
+							QRect(x, y, width, height),
+							width / 2.,
+							width / 2.);
+					};
+					p.setBrush(_activeWaveformBar);
+					drawInner(trimLeftHandleRect);
+					drawInner(trimRightHandleRect);
+					p.setBrush(_st.bg);
+					const auto lineTop = trimLeftHandleRect.y();
+					const auto lineHeight = trimLeftHandleRect.height();
+					const auto leftLineX = trimFrameRect.x();
+					const auto rightLineX = rect::right(trimFrameRect);
+					if (lineHeight > 0) {
+						p.fillRect(leftLineX, lineTop, 1, lineHeight, _st.bg);
+						if (rightLineX != leftLineX) {
+							p.fillRect(
+								rightLineX,
+								lineTop,
+								1,
+								lineHeight,
+								_st.bg);
+						}
+					}
+				}
+
+				if (!_controlRect.isEmpty()) {
+					p.setPen(Qt::NoPen);
+					p.setBrush(_st.cancelActive);
+					p.drawRoundedRect(
+						_controlRect,
+						_controlRect.height() / 2.,
+						_controlRect.height() / 2.);
+
+					if (_controlHasDuration) {
+						p.setFont(_durationFont);
+						p.setPen(st::historyRecordVoiceFgActiveIcon);
+						const auto ascent = _durationFont->ascent;
+						const auto left = rect::right(_playPauseButton)
+							/*+ st::historyRecordCenterControlTextSkip*/;
+						const auto top = _controlRect.y()
+							+ (_controlRect.height() - ascent) / 2;
+						p.drawText(
+							QRect(left, top, _durationWidth, ascent),
+							style::al_left,
+							_duration);
+					}
 				}
 			}
 		}
@@ -630,44 +1072,52 @@ void ListenWrap::initPlayButton() {
 	using namespace ::Media::Player;
 	using State = TrackState;
 
-	_mediaView->setBytes(_data->bytes);
-	_document->size = _data->bytes.size();
-	_document->type = VoiceDocument;
+	_mediaView->setBytes(_data->content);
+	_document->size = _data->content.size();
+	_document->type = _data->minithumbs.isNull()
+		? VoiceDocument
+		: RoundVideoDocument;
 
 	const auto &play = _playPauseSt.playOuter;
-	const auto &width = _waveformBgFinalCenterRect.height();
-	_playPauseButton->resize(width, width);
+	updateControlGeometry();
 	_playPauseButton->show();
+	_playPauseButton->setAccessibleName(tr::lng_record_lock_play(tr::now));
 
 	_playPauseButton->paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(_playPauseButton);
+		const auto size = _playPauseButton->size();
 
-		const auto progress = _showProgress.current();
-		p.translate(width / 2, width / 2);
-		if (progress < 1.) {
-			p.scale(progress, progress);
-		}
+		const auto progress = _showProgress.current()
+			* st::historyRecordCenterControlIconScale;
+		p.translate(size.width() / 2, size.height() / 2);
+		p.scale(progress, progress);
 		p.translate(-play.width() / 2, -play.height() / 2);
 		_playPause.paint(p, st::historyRecordVoiceFgActiveIcon);
 	}, _playPauseButton->lifetime());
 
 	_playPauseButton->setClickedCallback([=] {
-		instance()->playPause({ _document, FullMsgId() });
+		playPause();
 	});
 
 	const auto showPause = _lifetime.make_state<rpl::variable<bool>>(false);
 	showPause->changes(
-	) | rpl::start_with_next([=](bool pause) {
+	) | rpl::on_next([=](bool pause) {
+		_playPauseButton->setAccessibleName(pause
+			? tr::lng_record_lock_pause(tr::now)
+			: tr::lng_record_lock_play(tr::now));
 		_playPause.setState(pause
 			? PlayButtonLayout::State::Pause
 			: PlayButtonLayout::State::Play);
 	}, _lifetime);
 
 	instance()->updatedNotifier(
-	) | rpl::start_with_next([=](const State &state) {
+	) | rpl::on_next([=](const State &state) {
 		if (isInPlayer(state)) {
 			*showPause = ShowPauseIcon(state.state);
+			if (!_data->minithumbs.isNull()) {
+				_videoRepaints.fire({});
+			}
 		} else if (showPause->current()) {
 			*showPause = false;
 		}
@@ -675,41 +1125,106 @@ void ListenWrap::initPlayButton() {
 
 	instance()->stops(
 		AudioMsgId::Type::Voice
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		*showPause = false;
 	}, _lifetime);
+
+	_lifetime.add([=] {
+		const auto current = instance()->current(AudioMsgId::Type::Voice);
+		if (current.audio() == _document) {
+			instance()->stop(AudioMsgId::Type::Voice, true);
+		}
+	});
 }
 
 void ListenWrap::initPlayProgress() {
 	using namespace ::Media::Player;
 	using State = TrackState;
+	enum class DragMode {
+		None,
+		Seek,
+		TrimLeft,
+		TrimRight,
+	};
 
 	const auto animation = _lifetime.make_state<Ui::Animations::Basic>();
-	const auto isPointer = _lifetime.make_state<rpl::variable<bool>>(false);
+	const auto dragMode = _lifetime.make_state<DragMode>(DragMode::None);
+	const auto trimPlaybackSeekInProgress = _lifetime.make_state<bool>(false);
 	const auto &voice = AudioMsgId::Type::Voice;
+	const auto stopPlayingPreviewOnTrim = [=] {
+		const auto state = instance()->getState(voice);
+		if (isInPlayer(state) && ShowPauseIcon(state.state)) {
+			instance()->stop(voice, true);
+		}
+	};
+	const auto canSeekAt = [=](const QPoint &p) {
+		return isInPlayer()
+			&& _waveformFgRect.contains(p)
+			&& (_controlRect.isEmpty() || !_controlRect.contains(p));
+	};
 
 	const auto updateCursor = [=](const QPoint &p) {
-		*isPointer = isInPlayer() ? _waveformFgRect.contains(p) : false;
+		if (canTrim()
+			&& (_trimLeftHandleRect.contains(p)
+				|| _trimRightHandleRect.contains(p))) {
+			_parent->setCursor(style::cur_sizehor);
+		} else if (canSeekAt(p)) {
+			_parent->setCursor(style::cur_pointer);
+		} else {
+			_parent->setCursor(style::cur_default);
+		}
 	};
+	_parent->setMouseTracking(canTrim());
 
 	rpl::merge(
 		instance()->startsPlay(voice) | rpl::map_to(true),
 		instance()->stops(voice) | rpl::map_to(false)
-	) | rpl::start_with_next([=](bool play) {
-		_parent->setMouseTracking(isInPlayer() && play);
+	) | rpl::on_next([=](bool play) {
+		_parent->setMouseTracking(canTrim() || (isInPlayer() && play));
 		updateCursor(_parent->mapFromGlobal(QCursor::pos()));
 	}, _lifetime);
 
 	instance()->updatedNotifier(
-	) | rpl::start_with_next([=](const State &state) {
+	) | rpl::on_next([=](const State &state) {
+		if (*trimPlaybackSeekInProgress) {
+			return;
+		}
 		if (!isInPlayer(state)) {
 			return;
+		} else if (!_isShowAnimation && (_showProgress.current() < 1.)) {
+			return;
 		}
-		const auto progress = state.length
-			? Progress(state.position, state.length)
+		const auto [leftBoundary, rightBoundary] = selectedTrimBoundaries();
+		const auto playbackTrimmed = canTrim()
+			&& ((leftBoundary > kTrimPlaybackEpsilon)
+				|| (rightBoundary < (1. - kTrimPlaybackEpsilon)));
+		const auto length = int(state.length);
+		const auto position = std::min(state.position, int64(length));
+		auto progress = length
+			? Progress(position, length)
 			: 0.;
+		if (playbackTrimmed && length > 0) {
+			if (ShowPauseIcon(state.state)
+				&& (progress < (leftBoundary - kTrimPlaybackEpsilon))) {
+				*trimPlaybackSeekInProgress = true;
+				instance()->startSeeking(voice);
+				instance()->finishSeeking(voice, leftBoundary);
+				*trimPlaybackSeekInProgress = false;
+				return;
+			}
+			if (ShowPauseIcon(state.state)
+				&& (progress >= (rightBoundary - kTrimPlaybackEpsilon))) {
+				instance()->stop(voice, true);
+				_playProgress = anim::value(leftBoundary, leftBoundary);
+				_parent->update(_waveformFgRect);
+				return;
+			}
+			progress = std::clamp(progress, leftBoundary, rightBoundary);
+		}
 		if (IsStopped(state.state)) {
-			_playProgress = anim::value();
+			_playProgress = playbackTrimmed
+				? anim::value(leftBoundary, leftBoundary)
+				: anim::value();
 		} else {
 			_playProgress.start(progress);
 		}
@@ -734,51 +1249,91 @@ void ListenWrap::initPlayProgress() {
 	};
 	animation->init(std::move(animationCallback));
 
-	const auto isPressed = _lifetime.make_state<bool>(false);
-
-	isPointer->changes(
-	) | rpl::start_with_next([=](bool pointer) {
-		_parent->setCursor(pointer ? style::cur_pointer : style::cur_default);
-	}, _lifetime);
-
 	_parent->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return (e->type() == QEvent::MouseMove
 			|| e->type() == QEvent::MouseButtonPress
 			|| e->type() == QEvent::MouseButtonRelease);
-	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
-		if (!isInPlayer()) {
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
+		if (!isInPlayer() && !canTrim()) {
 			return;
 		}
 
 		const auto type = e->type();
-		const auto isMove = (type == QEvent::MouseMove);
 		const auto &pos = static_cast<QMouseEvent*>(e.get())->pos();
-		if (*isPressed) {
-			*isPointer = true;
-		} else if (isMove) {
+		if ((type == QEvent::MouseMove) && (*dragMode == DragMode::None)) {
 			updateCursor(pos);
 		}
+
 		if (type == QEvent::MouseButtonPress) {
-			if (isPointer->current() && !(*isPressed)) {
+			if (canTrim() && _trimLeftHandleRect.contains(pos)) {
+				stopPlayingPreviewOnTrim();
+				*dragMode = DragMode::TrimLeft;
+				_parent->setCursor(style::cur_sizehor);
+				return;
+			} else if (canTrim() && _trimRightHandleRect.contains(pos)) {
+				stopPlayingPreviewOnTrim();
+				*dragMode = DragMode::TrimRight;
+				_parent->setCursor(style::cur_sizehor);
+				return;
+			}
+			if (canSeekAt(pos)) {
 				instance()->startSeeking(voice);
-				*isPressed = true;
+				*dragMode = DragMode::Seek;
 			}
-		} else if (*isPressed) {
-			const auto &rect = _waveformFgRect;
-			const auto left = float64(pos.x() - rect.x());
-			const auto progress = Progress(left, rect.width());
-			const auto isRelease = (type == QEvent::MouseButtonRelease);
-			if (isRelease || isMove) {
+			return;
+		}
+
+		const auto isRelease = (type == QEvent::MouseButtonRelease);
+		if (*dragMode == DragMode::Seek) {
+			if (isRelease || (type == QEvent::MouseMove)) {
+				auto progress = trimProgressFromPosition(pos.x());
+				if (canTrim()) {
+					const auto [left, right] = selectedTrimBoundaries();
+					progress = std::clamp(progress, left, right);
+				}
 				_playProgress = anim::value(progress, progress);
 				_parent->update(_waveformFgRect);
 				if (isRelease) {
 					instance()->finishSeeking(voice, progress);
-					*isPressed = false;
+					*dragMode = DragMode::None;
+					updateCursor(pos);
+				}
+			}
+			return;
+		}
+
+		if ((*dragMode == DragMode::TrimLeft)
+			|| (*dragMode == DragMode::TrimRight)) {
+			if (isRelease || (type == QEvent::MouseMove)) {
+				const auto progress = trimProgressFromPosition(pos.x());
+				const auto minDelta = minimumTrimProgress();
+				if (*dragMode == DragMode::TrimLeft) {
+					_trimLeftProgress = std::clamp(
+						progress,
+						0.,
+						std::max(0., _trimRightProgress - minDelta));
+				} else {
+					_trimRightProgress = std::clamp(
+						progress,
+						std::min(1., _trimLeftProgress + minDelta),
+						1.);
+				}
+				updateDurationText();
+				updateTrimGeometry();
+				updateControlGeometry();
+				_parent->update();
+				if (isRelease) {
+					*dragMode = DragMode::None;
+					updateCursor(pos);
 				}
 			}
+			return;
 		}
 
+		if (isRelease) {
+			updateCursor(pos);
+		}
 	}, _lifetime);
 }
 
@@ -792,16 +1347,327 @@ bool ListenWrap::isInPlayer() const {
 	return isInPlayer(::Media::Player::instance()->getState(Type::Voice));
 }
 
+bool ListenWrap::canTrim() const {
+	return _allowTrim;
+}
+
+float64 ListenWrap::trimProgressFromPosition(int x) const {
+	const auto width = _waveformBgFinalCenterRect.width() - 1;
+	if (width <= 0) {
+		return 0.;
+	}
+	return std::clamp(
+		float64(x - _waveformBgFinalCenterRect.x()) / width,
+		0.,
+		1.);
+}
+
+float64 ListenWrap::minimumTrimProgress() const {
+	const auto samplesProgress = [&] {
+		const auto samples = int((_data->duration
+			* ::Media::Player::kDefaultFrequency) / crl::time(1000));
+		if (samples <= 0) {
+			return 0.;
+		}
+		return std::clamp(
+			float64(kMinSamples) / samples,
+			0.,
+			1.);
+	}();
+	return std::max(samplesProgress, minimumControlTrimProgress());
+}
+
+float64 ListenWrap::minimumControlTrimProgress() const {
+	if (!canTrim() || _waveformBgFinalCenterRect.isEmpty()) {
+		return 0.;
+	}
+	const auto trimRect = _waveformBgFinalCenterRect;
+	const auto handleWidth = std::max(
+		1,
+		std::min(
+			st::historyRecordTrimHandleWidth,
+			trimRect.width() / 2));
+	const auto previewRange = std::max(
+		1,
+		trimRect.width() - (handleWidth * 2));
+	const auto controlHeight = std::min(
+		st::historyRecordCenterControlHeight,
+		trimRect.height());
+	const auto iconWidth = controlHeight;
+	const auto minControlWidth = (st::historyRecordCenterControlPadding * 2)
+		+ iconWidth
+		+ st::historyRecordCenterControlMinimumProgressPadding * 2;
+	return std::clamp(float64(minControlWidth) / previewRange, 0., 1.);
+}
+
+crl::time ListenWrap::selectedDuration() const {
+	if (!canTrim()) {
+		return _data->duration;
+	}
+	if (const auto range = selectedTrimRange()) {
+		return std::max(crl::time(0), range->till - range->from);
+	}
+	return _data->duration;
+}
+
+std::optional<ListenWrap::TrimRange> ListenWrap::selectedTrimRange() const {
+	if (!canTrim()) {
+		return std::nullopt;
+	}
+	const auto left = std::clamp(_trimLeftProgress, 0., 1.);
+	const auto right = std::clamp(_trimRightProgress, left, 1.);
+	if ((left <= 0.) && (right >= 1.)) {
+		return std::nullopt;
+	}
+	const auto currentSamples = int((_data->duration
+		* ::Media::Player::kDefaultFrequency) / crl::time(1000));
+	if (currentSamples <= 0) {
+		return std::nullopt;
+	}
+	const auto fromSamples = base::SafeRound(currentSamples * left);
+	const auto tillSamples = base::SafeRound(currentSamples * right);
+	if (tillSamples <= fromSamples) {
+		return std::nullopt;
+	}
+	const auto from = (fromSamples * crl::time(1000))
+		/ ::Media::Player::kDefaultFrequency;
+	const auto till = (tillSamples * crl::time(1000))
+		/ ::Media::Player::kDefaultFrequency;
+	if (till <= from) {
+		return std::nullopt;
+	}
+	return TrimRange{ .from = crl::time(from), .till = crl::time(till) };
+}
+
+ListenWrap::TrimBoundaries ListenWrap::selectedTrimBoundaries() const {
+	const auto dur = _data->duration;
+	if (const auto range = selectedTrimRange(); range && (dur > 0)) {
+		const auto left = std::clamp(float64(range->from) / dur, 0., 1.);
+		const auto right = std::clamp(float64(range->till) / dur, left, 1.);
+		return { left, right };
+	}
+	return { 0., 1. };
+}
+
+ListenWrap::TrimGeometry ListenWrap::computeTrimGeometry(
+		const QRect &trimRect) const {
+	auto result = TrimGeometry();
+	if (!canTrim() || trimRect.isEmpty()) {
+		return result;
+	}
+	const auto width = trimRect.width();
+	if (width <= 0) {
+		return result;
+	}
+	const auto handleWidth = std::max(
+		1,
+		std::min(
+			st::historyRecordTrimHandleWidth,
+			width / 2));
+	const auto previewRange = std::max(1, width - (handleWidth * 2));
+	const auto minBoundary = trimRect.x() + handleWidth;
+	const auto maxBoundary = trimRect.right() - handleWidth + 1;
+	if (maxBoundary < minBoundary) {
+		return result;
+	}
+	const auto leftProgress = std::clamp(_trimLeftProgress, 0., 1.);
+	const auto rightProgress = std::clamp(
+		_trimRightProgress,
+		leftProgress,
+		1.);
+	const auto leftBoundary = std::clamp(
+		minBoundary + int(base::SafeRound(previewRange * leftProgress)),
+		minBoundary,
+		maxBoundary);
+	const auto rightBoundary = std::clamp(
+		minBoundary + int(base::SafeRound(previewRange * rightProgress)),
+		leftBoundary,
+		maxBoundary);
+	result.leftHandle = QRect(
+		leftBoundary - handleWidth,
+		trimRect.y(),
+		handleWidth,
+		trimRect.height());
+	result.rightHandle = QRect(
+		rightBoundary,
+		trimRect.y(),
+		handleWidth,
+		trimRect.height());
+	const auto previewLeft = leftBoundary;
+	const auto previewRight = std::max(previewLeft, rightBoundary - 1);
+	result.frame = QRect(
+		QPoint(previewLeft, trimRect.y()),
+		QPoint(previewRight, rect::bottom(trimRect)));
+	return result;
+}
+
+void ListenWrap::updateControlGeometry() {
+	const auto availableRect = (canTrim() && !_trimFrameRect.isEmpty())
+		? _trimFrameRect
+		: _waveformBgFinalCenterRect;
+	if (availableRect.isEmpty()) {
+		_controlRect = QRect();
+		_controlHasDuration = false;
+		return;
+	}
+	const auto controlHeight = std::min(
+		st::historyRecordCenterControlHeight,
+		availableRect.height());
+	const auto iconWidth = controlHeight;
+	const auto iconOnlyWidth = (st::historyRecordCenterControlPadding * 2)
+		+ iconWidth;
+	const auto fullWidth = iconOnlyWidth
+		+ st::historyRecordCenterControlTextSkip
+		+ _durationWidth;
+	const auto skip = st::historyRecordCenterControlMinimumProgressPadding;
+	_controlHasDuration = (availableRect.width() - skip * 2 >= fullWidth);
+	auto controlWidth = _controlHasDuration ? fullWidth : iconOnlyWidth;
+	controlWidth = std::min(controlWidth, availableRect.width());
+	if (controlWidth <= 0 || controlHeight <= 0) {
+		_controlRect = QRect();
+		_controlHasDuration = false;
+		return;
+	}
+	_controlRect = QRect(
+		availableRect.x() + (availableRect.width() - controlWidth) / 2,
+		availableRect.y() + (availableRect.height() - controlHeight) / 2,
+		controlWidth,
+		controlHeight);
+	_playPauseButton->resize(iconWidth, controlHeight);
+	const auto iconLeft = _controlHasDuration
+		? (_controlRect.x() + st::historyRecordCenterControlPadding)
+		: (_controlRect.x() + (_controlRect.width() - iconWidth) / 2);
+	_playPauseButton->moveToLeft(
+		iconLeft,
+		_controlRect.y());
+}
+
+void ListenWrap::updateTrimGeometry() {
+	if (!canTrim() || _waveformBgFinalCenterRect.isEmpty()) {
+		_trimFrameRect = QRect();
+		_trimLeftHandleRect = QRect();
+		_trimRightHandleRect = QRect();
+		return;
+	}
+	const auto minDelta = minimumTrimProgress();
+	if ((_trimRightProgress - _trimLeftProgress) < minDelta) {
+		const auto center = (_trimLeftProgress + _trimRightProgress) / 2.;
+		const auto half = minDelta / 2.;
+		auto left = center - half;
+		auto right = center + half;
+		if (left < 0.) {
+			right = std::min(1., right - left);
+			left = 0.;
+		}
+		if (right > 1.) {
+			left = std::max(0., left - (right - 1.));
+			right = 1.;
+		}
+		_trimLeftProgress = left;
+		_trimRightProgress = right;
+	}
+	const auto geometry = computeTrimGeometry(_waveformBgFinalCenterRect);
+	_trimFrameRect = geometry.frame;
+	_trimLeftHandleRect = geometry.leftHandle;
+	_trimRightHandleRect = geometry.rightHandle;
+}
+
+void ListenWrap::applyTrimSelection(bool resetSelection) {
+	if (!canTrim()) {
+		return;
+	}
+	const auto range = selectedTrimRange();
+	if (!range) {
+		return;
+	}
+	const auto [waveLeft, waveRight] = selectedTrimBoundaries();
+	auto waveform = ResampleWaveformToRange(
+		_data->waveform,
+		waveLeft,
+		waveRight);
+	const auto from = range->from;
+	const auto till = range->till;
+	const auto selected = till - from;
+	const auto selectedSamples = int((selected
+		* ::Media::Player::kDefaultFrequency) / crl::time(1000));
+	if (selectedSamples < kMinSamples) {
+		return;
+	}
+	const auto trimmed = ::Media::TrimAudioToRange(_data->content, from, till);
+	if (trimmed.content.isEmpty()) {
+		return;
+	}
+	if (isInPlayer()) {
+		::Media::Player::instance()->stop(AudioMsgId::Type::Voice, true);
+	}
+	_data->content = std::move(trimmed.content);
+	if (waveform.isEmpty()) {
+		waveform = std::move(trimmed.waveform);
+	}
+	_data->waveform = std::move(waveform);
+	_data->duration = trimmed.duration;
+	_mediaView->setBytes(_data->content);
+	_document->size = _data->content.size();
+	_voiceData->waveform = _data->waveform;
+	_voiceData->wavemax = _voiceData->waveform.empty()
+		? uchar(0)
+		: *ranges::max_element(_voiceData->waveform);
+	if (resetSelection) {
+		_trimLeftProgress = 0.;
+		_trimRightProgress = 1.;
+	}
+	updateDurationText();
+	_waveformFgRect = computeWaveformRect(_waveformBgFinalCenterRect);
+	updateTrimGeometry();
+	updateControlGeometry();
+	_playProgress = anim::value();
+	_parent->update();
+}
+
+void ListenWrap::updateDurationText() {
+	_duration = FormatTrimDuration(selectedDuration());
+	_durationWidth = _durationFont->width(_duration);
+}
+
+void ListenWrap::applyTrimBeforeSend() {
+	applyTrimSelection(true);
+}
+
+void ListenWrap::prepareForSendAnimation() {
+	if (_waveformBgRect.isEmpty()) {
+		return;
+	}
+	const auto cacheRect = _waveformBgRect
+		- style::margins(_st.remove.width, 0, _send->width(), 0);
+	if (cacheRect.isEmpty()) {
+		return;
+	}
+	const auto deleteVisible = _delete->isVisible();
+	if (deleteVisible) {
+		_delete->hide();
+	}
+	_sendAnimationCache = Ui::GrabWidgetToImage(_parent, cacheRect);
+	if (deleteVisible) {
+		_delete->show();
+	}
+	_useSendAnimationCache = !_sendAnimationCache.isNull();
+	if (_useSendAnimationCache && _playPauseButton->isVisible()) {
+		_playPauseButton->hide();
+		_playPauseHiddenForSendAnimation = true;
+	}
+	if (_useSendAnimationCache) {
+		_parent->update(cacheRect);
+	}
+}
+
 void ListenWrap::playPause() {
-	_playPauseButton->clicked(Qt::NoModifier, Qt::LeftButton);
+	::Media::Player::instance()->playPause({ _document, FullMsgId() });
 }
 
 QRect ListenWrap::computeWaveformRect(const QRect &centerRect) const {
 	const auto top = computeTopMargin(st::msgWaveformMax);
-	const auto left = (_playPauseSt.playOuter.width() + centerRect.height())
-		/ 2;
-	const auto right = st::historyRecordWaveformRightSkip + _durationWidth;
-	return centerRect.marginsRemoved(style::margins(left, top, right, top));
+	const auto left = st::historyRecordTrimHandleWidth;
+	return centerRect - style::margins(left, top, left, top);
 }
 
 int ListenWrap::computeTopMargin(int height) const {
@@ -810,6 +1676,18 @@ int ListenWrap::computeTopMargin(int height) const {
 
 void ListenWrap::requestPaintProgress(float64 progress) {
 	_isShowAnimation = (_showProgress.current() < progress);
+	if (_isShowAnimation && _useSendAnimationCache) {
+		_useSendAnimationCache = false;
+		_sendAnimationCache = QImage();
+		if (_playPauseHiddenForSendAnimation) {
+			_playPauseButton->show();
+			_playPauseHiddenForSendAnimation = false;
+		}
+	}
+	if (!_isShowAnimation && (progress < 1.)) {
+		const auto value = _playProgress.current();
+		_playProgress = anim::value(value, value);
+	}
 	_showProgress = progress;
 }
 
@@ -817,6 +1695,12 @@ rpl::producer<> ListenWrap::stopRequests() const {
 	return _delete->clicks() | rpl::to_empty;
 }
 
+std::shared_ptr<Ui::DynamicImage> ListenWrap::videoPreview() {
+	return std::make_shared<SoundedPreview>(
+		_document,
+		_videoRepaints.events());
+}
+
 rpl::lifetime &ListenWrap::lifetime() {
 	return _lifetime;
 }
@@ -831,6 +1715,7 @@ class RecordLock final : public Ui::RippleButton {
 	void requestPaintLockToStopProgress(float64 progress);
 	void requestPaintPauseToInputProgress(float64 progress);
 	void setVisibleTopPart(int part);
+	void setRecordingVideo(bool value);
 
 	[[nodiscard]] rpl::producer<> locks() const;
 	[[nodiscard]] bool isLocked() const;
@@ -859,6 +1744,7 @@ class RecordLock final : public Ui::RippleButton {
 	float64 _pauseToInputProgress = 0.;
 	rpl::variable<float64> _progress = 0.;
 	int _visibleTopPart = -1;
+	bool _recordingVideo = false;
 
 };
 
@@ -882,9 +1768,13 @@ void RecordLock::setVisibleTopPart(int part) {
 	_visibleTopPart = part;
 }
 
+void RecordLock::setRecordingVideo(bool value) {
+	_recordingVideo = value;
+}
+
 void RecordLock::init() {
 	shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		resize(
 			st::historyRecordLockTopShadow.width(),
 			st::historyRecordLockSize.height());
@@ -899,7 +1789,7 @@ void RecordLock::init() {
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		if (!_visibleTopPart) {
 			return;
 		}
@@ -918,6 +1808,7 @@ void RecordLock::init() {
 		}
 		drawProgress(p);
 	}, lifetime());
+	setAccessibleName(tr::lng_record_lock(tr::now));
 }
 
 void RecordLock::drawProgress(QPainter &p) {
@@ -972,9 +1863,10 @@ void RecordLock::drawProgress(QPainter &p) {
 			p.setBrush(_st.fg);
 			if (_pauseToInputProgress > 0.) {
 				p.setOpacity(_pauseToInputProgress);
-				st::historyRecordLockInput.paintInCenter(
-					p,
-					blockRect.toRect());
+				const auto &icon = _recordingVideo
+					? st::historyRecordLockRound
+					: st::historyRecordLockInput;
+				icon.paintInCenter(p, blockRect.toRect());
 				p.setOpacity(1. - _pauseToInputProgress);
 			}
 			p.drawRoundedRect(
@@ -1163,6 +2055,7 @@ CancelButton::CancelButton(
 , _width(st::historyRecordCancelButtonWidth)
 , _rippleRect(QRect(0, (height - _width) / 2, _width, _width))
 , _text(st::semiboldTextStyle, tr::lng_selected_clear(tr::now)) {
+	setAccessibleName(tr::lng_record_cancel_recording(tr::now));
 	resize(_width, height);
 	init();
 }
@@ -1170,12 +2063,12 @@ CancelButton::CancelButton(
 void CancelButton::init() {
 	_showProgress.value(
 	) | rpl::map(rpl::mappers::_1 > 0.) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool hasProgress) {
+	) | rpl::on_next([=](bool hasProgress) {
 		setVisible(hasProgress);
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(this);
 
 		p.setOpacity(_showProgress.current());
@@ -1244,7 +2137,7 @@ VoiceRecordBar::VoiceRecordBar(
 }
 
 VoiceRecordBar::~VoiceRecordBar() {
-	if (isRecording()) {
+	if (isActive()) {
 		stopRecording(StopType::Cancel);
 	}
 }
@@ -1298,7 +2191,12 @@ void VoiceRecordBar::updateTTLGeometry(
 	const auto parent = parentWidget();
 	const auto me = Ui::MapFrom(_outerContainer, parent, geometry());
 	const auto anyTop = me.y() - st::historyRecordLockPosition.y();
-	const auto ttlFrom = anyTop - _ttlButton->height() * 2;
+	const auto lockHiddenProgress = (_lockShowing.current() || !_fullRecord)
+		? 0.
+		: (1. - _showLockAnimation.value(0.));
+	const auto ttlFrom = anyTop
+		- _ttlButton->height()
+		- (_ttlButton->height() * (1. - lockHiddenProgress));
 	if (type == TTLAnimationType::RightLeft) {
 		const auto finalRight = _outerContainer->width()
 			- rect::right(me)
@@ -1332,19 +2230,19 @@ void VoiceRecordBar::init() {
 		) | rpl::filter([](not_null<QEvent*> e) {
 			return e->type() == QEvent::ZOrderChange;
 		}) | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		orderControls();
 	}, lifetime());
 
 	shownValue(
-	) | rpl::start_with_next([=](bool show) {
+	) | rpl::on_next([=](bool show) {
 		if (!show) {
 			finish();
 		}
 	}, lifetime());
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		_centerY = size.height() / 2;
 		{
 			const auto maxD = st::historyRecordSignalRadius * 2;
@@ -1367,7 +2265,7 @@ void VoiceRecordBar::init() {
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(this);
 		if (_showAnimation.animating()) {
 			p.setOpacity(showAnimationRatio());
@@ -1401,12 +2299,12 @@ void VoiceRecordBar::init() {
 	}, lifetime());
 
 	_inField.changes(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		activeAnimate(value);
 	}, lifetime());
 
 	_lockShowing.changes(
-	) | rpl::start_with_next([=](bool show) {
+	) | rpl::on_next([=](bool show) {
 		const auto to = show ? 1. : 0.;
 		const auto from = show ? 0. : 1.;
 		const auto &duration = st::historyRecordLockShowDuration;
@@ -1416,7 +2314,10 @@ void VoiceRecordBar::init() {
 			if (value == 0. && !show) {
 				_lock->hide();
 			} else if (value == 1. && show) {
-				computeAndSetLockProgress(QCursor::pos());
+				_lock->requestPaintProgress(calcLockProgress(QCursor::pos()));
+			}
+			if (_fullRecord && !show) {
+				updateTTLGeometry(TTLAnimationType::RightLeft, 1.);
 			}
 		};
 		_showLockAnimation.start(std::move(callback), from, to, duration);
@@ -1426,7 +2327,7 @@ void VoiceRecordBar::init() {
 		_level->setType(VoiceRecordButton::Type::Send);
 
 		_level->clicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			stop(true);
 		}, _recordingLifetime);
 
@@ -1434,13 +2335,15 @@ void VoiceRecordBar::init() {
 			false
 		) | rpl::then(
 			_level->actives()
-		) | rpl::start_with_next([=](bool enter) {
+		) | rpl::on_next([=](bool enter) {
 			_inField = enter;
 		}, _recordingLifetime);
 	};
 
 	const auto paintShowListenCallback = [=](float64 value) {
-		_listen->requestPaintProgress(value);
+		if (_listen) {
+			_listen->requestPaintProgress(value);
+		}
 		_level->requestPaintProgress(1. - value);
 		_lock->requestPaintPauseToInputProgress(value);
 		update();
@@ -1448,6 +2351,7 @@ void VoiceRecordBar::init() {
 
 	_lock->setClickedCallback([=] {
 		if (isListenState()) {
+			applyListenTrimForResume();
 			startRecording();
 			_showListenAnimation.stop();
 			_showListenAnimation.start([=](float64 value) {
@@ -1469,11 +2373,13 @@ void VoiceRecordBar::init() {
 	});
 
 	_paused.value() | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool paused) {
+	) | rpl::on_next([=](bool paused) {
+		_lock->setAccessibleName(paused
+			? tr::lng_record_lock_resume(tr::now)
+			: tr::lng_record_lock(tr::now));
 		if (!paused) {
 			return;
 		}
-		// _lockShowing = false;
 
 		const auto to = 1.;
 		auto callback = [=](float64 value) {
@@ -1491,12 +2397,13 @@ void VoiceRecordBar::init() {
 	}, lifetime());
 
 	_lock->locks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_hasTTLFilter && _hasTTLFilter()) {
 			if (!_ttlButton) {
 				_ttlButton = std::make_unique<TTLButton>(
 					_outerContainer,
-					_st);
+					_st,
+					_recordingVideo);
 			}
 			_ttlButton->show();
 		}
@@ -1506,6 +2413,7 @@ void VoiceRecordBar::init() {
 
 		auto callback = [=](float64 value) {
 			_lock->requestPaintLockToStopProgress(value);
+			_level->requestPaintColor(activeAnimationRatio());
 			update();
 			updateTTLGeometry(TTLAnimationType::RightLeft, value);
 		};
@@ -1524,17 +2432,15 @@ void VoiceRecordBar::init() {
 			&& !_lock->isLocked()
 			&& (e->type() == QEvent::MouseButtonPress
 				|| e->type() == QEvent::MouseButtonRelease);
-	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonPress) {
 			if (_startRecordingFilter && _startRecordingFilter()) {
 				return;
 			}
-			_recordingTipRequired = true;
+			prepareOnSendPress();
 			_startTimer.callOnce(st::universalDuration);
 		} else if (e->type() == QEvent::MouseButtonRelease) {
-			if (base::take(_recordingTipRequired)) {
-				_recordingTipRequests.fire({});
-			}
+			checkTipRequired();
 			_startTimer.cancel();
 		}
 	}, lifetime());
@@ -1542,9 +2448,9 @@ void VoiceRecordBar::init() {
 	_listenChanges.events(
 	) | rpl::filter([=] {
 		return _listen != nullptr;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_listen->stopRequests(
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			hideAnimated();
 		}, _listen->lifetime());
 
@@ -1561,6 +2467,23 @@ void VoiceRecordBar::init() {
 	initLevelGeometry();
 }
 
+void VoiceRecordBar::prepareOnSendPress() {
+	_recordingTipRequire = crl::now();
+	_recordingVideo = (_send->type() == Ui::SendButton::Type::Round);
+	_fullRecord = false;
+	_ttlButton = nullptr;
+	clearResumeState();
+	_lock->setRecordingVideo(_recordingVideo);
+}
+
+void VoiceRecordBar::applyListenTrimForResume() {
+	const auto beforeDuration = _data.duration;
+	const auto beforeSize = _data.content.size();
+	_listen->applyTrimBeforeSend();
+	_resumeFromTrimmedListen = (_data.duration != beforeDuration)
+		|| (_data.content.size() != beforeSize);
+}
+
 void VoiceRecordBar::activeAnimate(bool active) {
 	const auto to = active ? 1. : 0.;
 	if (_activeAnimation.animating()) {
@@ -1579,6 +2502,11 @@ void VoiceRecordBar::activeAnimate(bool active) {
 }
 
 void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
+	if (_send->type() == Ui::SendButton::Type::Round) {
+		_level->setType(VoiceRecordButton::Type::Round);
+	} else {
+		_level->setType(VoiceRecordButton::Type::Record);
+	}
 	const auto to = show ? 1. : 0.;
 	const auto from = show ? 0. : 1.;
 	auto animationCallback = [=, callback = std::move(callback)](auto value) {
@@ -1612,17 +2540,21 @@ void VoiceRecordBar::setTTLFilter(FilterCallback &&callback) {
 	_hasTTLFilter = std::move(callback);
 }
 
+void VoiceRecordBar::setPauseInsteadSend(bool pauseInsteadSend) {
+	_pauseInsteadSend = pauseInsteadSend;
+}
+
 void VoiceRecordBar::initLockGeometry() {
 	const auto parent = static_cast<Ui::RpWidget*>(parentWidget());
 	rpl::merge(
 		_lock->heightValue() | rpl::to_empty,
 		geometryValue() | rpl::to_empty,
 		parent->geometryValue() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateLockGeometry();
 	}, lifetime());
 	parent->geometryValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateTTLGeometry(TTLAnimationType::RightLeft, 1.);
 	}, lifetime());
 }
@@ -1632,7 +2564,7 @@ void VoiceRecordBar::initLevelGeometry() {
 		_send->geometryValue(),
 		geometryValue(),
 		static_cast<Ui::RpWidget*>(parentWidget())->geometryValue()
-	) | rpl::start_with_next([=](QRect send, auto, auto) {
+	) | rpl::on_next([=](QRect send, auto, auto) {
 		const auto mapped = Ui::MapFrom(
 			_outerContainer,
 			_send->parentWidget(),
@@ -1642,6 +2574,24 @@ void VoiceRecordBar::initLevelGeometry() {
 	}, lifetime());
 }
 
+void VoiceRecordBar::startRecordingAndLock(bool round) {
+	{
+		auto sendState = _send->state();
+		sendState.type = round
+			? Ui::SendButton::Type::Round
+			: Ui::SendButton::Type::Record;
+		_send->setState(std::move(sendState));
+	}
+	if (_startRecordingFilter && _startRecordingFilter()) {
+		return;
+	}
+	prepareOnSendPress();
+
+	_lock->show();
+	_lock->requestPaintProgress(1.);
+	startRecording();
+}
+
 void VoiceRecordBar::startRecording() {
 	if (isRecording()) {
 		return;
@@ -1652,6 +2602,10 @@ void VoiceRecordBar::startRecording() {
 		}
 
 		using namespace ::Media::Capture;
+		if (_recordingVideo && !createVideoRecorder()) {
+			stop(false);
+			return;
+		}
 		if (!instance()->available()) {
 			stop(false);
 			return;
@@ -1663,17 +2617,49 @@ void VoiceRecordBar::startRecording() {
 		_recording = true;
 		if (_paused.current()) {
 			_paused = false;
-			instance()->pause(false, nullptr);
+			if (_videoRecorder) {
+				instance()->pause(false, nullptr);
+				_videoRecorder->resume({
+					.video = std::move(_data),
+				});
+				clearResumePrefix();
+			} else {
+				instance()->pause(false, nullptr);
+				if (_resumeFromTrimmedListen && (_pausedRawDuration > 0)) {
+					setupResumePrefixFromCurrentData();
+					_recordingSamples = _resumePrefixSamples;
+				} else {
+					clearResumePrefix();
+				}
+				_resumeFromTrimmedListen = false;
+				update(_durationRect);
+			}
 		} else {
-			instance()->start();
+			clearResumePrefix();
+			instance()->start(_videoRecorder
+				? _videoRecorder->audioChunkProcessor()
+				: nullptr);
 		}
 		instance()->updated(
-		) | rpl::start_with_next_error([=](const Update &update) {
-			_recordingTipRequired = (update.samples < kMinSamples);
+		) | rpl::on_next_error([=](const Update &update) {
 			recordUpdated(update.level, update.samples);
 		}, [=] {
 			stop(false);
 		}, _recordingLifetime);
+		if (_videoRecorder) {
+			_videoRecorder->updated(
+			) | rpl::on_next_error([=](const Update &update) {
+				recordUpdated(update.level, update.samples);
+				if (update.finished) {
+					_fullRecord = true;
+					stopRecording(StopType::Listen);
+					_lockShowing = false;
+				}
+			}, [=](Error error) {
+				stop(false);
+				_errors.fire_copy(error);
+			}, _recordingLifetime);
+		}
 		_recordingLifetime.add([=] {
 			_recording = false;
 		});
@@ -1683,13 +2669,59 @@ void VoiceRecordBar::startRecording() {
 
 	_inField = true;
 
+	struct FloatingState {
+		Ui::Animations::Basic animation;
+		float64 animationProgress = 0;
+		float64 cursorProgress = 0;
+		bool lockCapturedByInput = false;
+		float64 frameCounter = 0;
+		rpl::lifetime lifetime;
+	};
+	const auto stateOwned
+		= _recordingLifetime.make_state<std::unique_ptr<FloatingState>>(
+			std::make_unique<FloatingState>());
+	const auto state = stateOwned->get();
+
+	_lock->locks() | rpl::on_next([=] {
+		stateOwned->reset();
+	}, state->lifetime);
+
+	constexpr auto kAnimationThreshold = 0.35;
+	const auto calcStateRatio = [=](float64 counter) {
+		return (1 - std::cos(std::fmod(counter, 2 * M_PI))) * 0.5;
+	};
+	state->animation.init([=](crl::time now) {
+		if (state->cursorProgress > kAnimationThreshold) {
+			state->lockCapturedByInput = true;
+		}
+		if (state->lockCapturedByInput) {
+			if (state->cursorProgress < 0.01) {
+				state->lockCapturedByInput = false;
+				state->frameCounter = 0;
+			} else {
+				_lock->requestPaintProgress(state->cursorProgress);
+				return;
+			}
+		}
+		const auto progress = anim::interpolateF(
+			state->cursorProgress,
+			kAnimationThreshold,
+			calcStateRatio(state->frameCounter));
+		state->frameCounter += 0.01;
+		_lock->requestPaintProgress(progress);
+	});
+	state->animation.start();
+	if (hasDuration()) {
+		stateOwned->reset();
+	}
+
 	_send->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return (e->type() == QEvent::MouseMove
 			|| e->type() == QEvent::MouseButtonRelease)
 			&& isTypeRecord()
 			&& !_lock->isLocked();
-	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::MouseMove) {
 			const auto mouse = static_cast<QMouseEvent*>(e.get());
@@ -1703,30 +2735,85 @@ void VoiceRecordBar::startRecording() {
 			if (_showLockAnimation.animating() || !hasDuration()) {
 				return;
 			}
-			computeAndSetLockProgress(mouse->globalPos());
-		} else if (type == QEvent::MouseButtonRelease) {
-			if (base::take(_recordingTipRequired)) {
-				_recordingTipRequests.fire({});
+			const auto inputProgress = calcLockProgress(mouse->globalPos());
+			if (inputProgress > state->animationProgress) {
+				state->cursorProgress = inputProgress;
 			}
+		} else if (type == QEvent::MouseButtonRelease) {
+			checkTipRequired();
 			stop(_inField.current());
 		}
 	}, _recordingLifetime);
+
+	_listenChanges.events_starting_with(
+		rpl::empty_value()
+	) | rpl::filter([=] {
+		return _listen == nullptr;
+	}) | rpl::on_next([=] {
+		auto keyFilterCallback = [=](not_null<QEvent*> e) {
+			using Result = base::EventFilterResult;
+			if (_send->type() != Ui::SendButton::Type::Record
+				&& _send->type() != Ui::SendButton::Type::Round) {
+				return Result::Continue;
+			}
+			switch(e->type()) {
+			case QEvent::KeyPress: {
+				if (!_warningShown
+					&& isRecordingLocked()
+					&& Ui::ShouldSubmit(
+						static_cast<QKeyEvent*>(e.get()),
+						Core::App().settings().sendSubmitWay())) {
+					stop(true);
+					return Result::Cancel;
+				}
+				return Result::Continue;
+			}
+			default: return Result::Continue;
+			}
+		};
+
+		_keyFilterInRecordingState = base::unique_qptr{
+			base::install_event_filter(
+				QCoreApplication::instance(),
+				std::move(keyFilterCallback)).get()
+		};
+	}, lifetime());
+}
+
+void VoiceRecordBar::checkTipRequired() {
+	const auto require = base::take(_recordingTipRequire);
+	const auto duration = st::universalDuration
+		+ (kMinSamples * crl::time(1000)
+			/ ::Media::Player::kDefaultFrequency);
+	if (require && (require + duration > crl::now())) {
+		_recordingTipRequests.fire({});
+	}
 }
 
 void VoiceRecordBar::recordUpdated(quint16 level, int samples) {
 	_level->requestPaintLevel(level);
-	_recordingSamples = samples;
-	if (samples < 0 || samples >= kMaxSamples) {
-		stop(samples > 0 && _inField.current());
+	const auto resumedSamples = std::max(0, samples - _resumeRawSamples);
+	const auto totalSamples = _resumePrefixSamples + resumedSamples;
+	_recordingSamples = totalSamples;
+	if (totalSamples < 0 || totalSamples >= kMaxSamples) {
+		stop(totalSamples > 0 && _inField.current());
 	}
 	Core::App().updateNonIdle();
 	update(_durationRect);
-	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice });
+	const auto type = _recordingVideo
+		? Api::SendProgressType::RecordRound
+		: Api::SendProgressType::RecordVoice;
+	_sendActionUpdates.fire({ type });
 }
 
 void VoiceRecordBar::stop(bool send) {
 	if (isHidden() && !send) {
 		return;
+	} else if (send && _pauseInsteadSend) {
+		_fullRecord = true;
+		stopRecording(StopType::Listen);
+		_lockShowing = false;
+		return;
 	}
 	const auto ttlBeforeHide = peekTTLState();
 	auto disappearanceCallback = [=] {
@@ -1735,7 +2822,6 @@ void VoiceRecordBar::stop(bool send) {
 		const auto type = send ? StopType::Send : StopType::Cancel;
 		stopRecording(type, ttlBeforeHide);
 	};
-	// _lockShowing = false;
 	visibilityAnimate(false, std::move(disappearanceCallback));
 }
 
@@ -1754,7 +2840,10 @@ void VoiceRecordBar::finish() {
 
 	[[maybe_unused]] const auto s = takeTTLState();
 
-	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice, -1 });
+	const auto type = _recordingVideo
+		? Api::SendProgressType::RecordRound
+		: Api::SendProgressType::RecordVoice;
+	_sendActionUpdates.fire({ type, -1 });
 
 	_data = {};
 }
@@ -1764,44 +2853,180 @@ void VoiceRecordBar::hideFast() {
 	_lock->hide();
 	_level->hide();
 	[[maybe_unused]] const auto s = takeTTLState();
+	_keyFilterInRecordingState = nullptr;
+}
+
+void VoiceRecordBar::clearResumePrefix() {
+	_resumePrefixData = {};
+	_resumePrefixSamples = 0;
+	_resumeRawSamples = 0;
+	_resumeRawDuration = 0;
+	_resumeFromTrimmedListen = false;
+}
+
+void VoiceRecordBar::clearResumeState() {
+	_pausedRawDuration = 0;
+	clearResumePrefix();
+}
+
+void VoiceRecordBar::setupResumePrefixFromCurrentData() {
+	_resumePrefixData = _data;
+	_resumePrefixSamples = samplesFromDuration(_resumePrefixData.duration);
+	_resumeRawDuration = _pausedRawDuration;
+	_resumeRawSamples = samplesFromDuration(_resumeRawDuration);
+}
+
+int VoiceRecordBar::samplesFromDuration(crl::time duration) const {
+	return int((duration * ::Media::Player::kDefaultFrequency)
+		/ crl::time(1000));
+}
+
+Ui::RoundVideoResult VoiceRecordBar::mergeWithResumePrefix(
+		Ui::RoundVideoResult data) {
+	if (_recordingVideo || _resumePrefixData.content.isEmpty()) {
+		return data;
+	}
+	if (data.content.isEmpty()) {
+		return _resumePrefixData;
+	}
+	const auto tail = (_resumeRawDuration > 0)
+		? ::Media::TrimAudioToRange(
+			data.content,
+			_resumeRawDuration,
+			data.duration)
+		: ::Media::AudioEditResult();
+	if ((_resumeRawDuration > 0) && tail.content.isEmpty()) {
+		return _resumePrefixData;
+	}
+	const auto combined = ::Media::ConcatAudio(
+		_resumePrefixData.content,
+		(_resumeRawDuration > 0) ? tail.content : data.content);
+	if (combined.content.isEmpty()) {
+		return _resumePrefixData;
+	}
+	const auto tailDuration = (_resumeRawDuration > 0)
+		? tail.duration
+		: data.duration;
+	const auto duration = combined.duration
+		? combined.duration
+		: (_resumePrefixData.duration + tailDuration);
+	auto waveform = MergeWaveformsByDuration(
+		_resumePrefixData.waveform,
+		_resumePrefixData.duration,
+		(_resumeRawDuration > 0) ? tail.waveform : data.waveform,
+		tailDuration);
+	if (waveform.isEmpty()) {
+		waveform = std::move(combined.waveform);
+	}
+	return Ui::RoundVideoResult{
+		.content = std::move(combined.content),
+		.waveform = std::move(waveform),
+		.duration = duration,
+	};
 }
 
 void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 	using namespace ::Media::Capture;
 	if (type == StopType::Cancel) {
+		clearResumeState();
+		if (_videoRecorder) {
+			_videoRecorder->hide();
+		}
 		instance()->stop(crl::guard(this, [=](Result &&data) {
 			_cancelRequests.fire({});
 		}));
 	} else if (type == StopType::Listen) {
-		instance()->pause(true, crl::guard(this, [=](Result &&data) {
-			if (data.bytes.isEmpty()) {
-				// Close everything.
-				stop(false);
-				return;
-			}
-			_paused = true;
-			_data = std::move(data);
-
-			window()->raise();
-			window()->activateWindow();
-			_listen = std::make_unique<ListenWrap>(
-				this,
-				_st,
-				&_show->session(),
-				&_data,
-				_cancelFont);
-			_listenChanges.fire({});
-
-			// _lockShowing = false;
-		}));
+		if (const auto recorder = _videoRecorder.get()) {
+			const auto weak = base::make_weak(recorder);
+			recorder->pause([=](Ui::RoundVideoResult data) {
+				crl::on_main(weak, [=, data = std::move(data)]() mutable {
+					window()->raise();
+					window()->activateWindow();
+
+					_paused = true;
+					_data = std::move(data);
+					_listen = std::make_unique<ListenWrap>(
+						this,
+						_st,
+						_send,
+						&_show->session(),
+						&_data,
+						false,
+						_cancelFont);
+					_listenChanges.fire({});
+
+					using SilentPreview = ::Media::Streaming::RoundPreview;
+					recorder->showPreview(
+						std::make_shared<SilentPreview>(
+							_data.content,
+							recorder->previewSize()),
+						_listen->videoPreview());
+				});
+			});
+			instance()->pause(true);
+		} else {
+			instance()->pause(true, crl::guard(this, [=](Result &&data) {
+				const auto rawDuration = data.duration;
+				auto combined = mergeWithResumePrefix(
+					ToRoundVideoResult(std::move(data)));
+				clearResumePrefix();
+				if (combined.content.isEmpty()) {
+					// Close everything.
+					stop(false);
+					return;
+				}
+				_pausedRawDuration = rawDuration;
+				_paused = true;
+				_data = std::move(combined);
+
+				window()->raise();
+				window()->activateWindow();
+				_listen = std::make_unique<ListenWrap>(
+					this,
+					_st,
+					_send,
+					&_show->session(),
+					&_data,
+					true,
+					_cancelFont);
+				_listenChanges.fire({});
+			}));
+		}
 	} else if (type == StopType::Send) {
+		if (_videoRecorder) {
+			const auto weak = base::make_weak(this);
+			_videoRecorder->hide([=](Ui::RoundVideoResult data) {
+				crl::on_main([=, data = std::move(data)]() mutable {
+					if (weak) {
+						window()->raise();
+						window()->activateWindow();
+						const auto options = Api::SendOptions{
+							.ttlSeconds = (ttlBeforeHide
+								? std::numeric_limits<int>::max()
+								: 0),
+						};
+						_sendVoiceRequests.fire({
+							.bytes = data.content,
+							//.waveform = {},
+							.duration = data.duration,
+							.options = options,
+							.video = true,
+						});
+					}
+				});
+			});
+		}
 		instance()->stop(crl::guard(this, [=](Result &&data) {
-			if (data.bytes.isEmpty()) {
+			_pausedRawDuration = 0;
+			auto combined = mergeWithResumePrefix(
+				ToRoundVideoResult(std::move(data)));
+			clearResumePrefix();
+			if (combined.content.isEmpty()) {
 				// Close everything.
 				stop(false);
 				return;
 			}
-			_data = std::move(data);
+			_data = std::move(combined);
 
 			window()->raise();
 			window()->activateWindow();
@@ -1811,10 +3036,10 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 					: 0),
 			};
 			_sendVoiceRequests.fire({
-				_data.bytes,
-				_data.waveform,
-				Duration(_data.samples),
-				options,
+				.bytes = _data.content,
+				.waveform = _data.waveform,
+				.duration = _data.duration,
+				.options = options,
 			});
 		}));
 	}
@@ -1832,8 +3057,8 @@ void VoiceRecordBar::startRedCircleAnimation() {
 	if (anim::Disabled()) {
 		return;
 	}
-	const auto animation = _recordingLifetime
-		.make_state<Ui::Animations::Basic>();
+	const auto animation
+		= _recordingLifetime.make_state<Ui::Animations::Basic>();
 	animation->init([=](crl::time now) {
 		const auto diffTime = now - animation->started();
 		_redCircleProgress = std::abs(std::sin(diffTime / 400.));
@@ -1877,11 +3102,16 @@ void VoiceRecordBar::requestToSendWithOptions(Api::SendOptions options) {
 		if (takeTTLState()) {
 			options.ttlSeconds = std::numeric_limits<int>::max();
 		}
+		if (_listen) {
+			_listen->prepareForSendAnimation();
+			_listen->applyTrimBeforeSend();
+		}
 		_sendVoiceRequests.fire({
-			_data.bytes,
-			_data.waveform,
-			Duration(_data.samples),
-			options,
+			.bytes = _data.content,
+			.waveform = _data.waveform,
+			.duration = _data.duration,
+			.options = options,
+			.video = !_data.minithumbs.isNull(),
 		});
 	}
 }
@@ -1954,6 +3184,10 @@ rpl::producer<> VoiceRecordBar::recordingTipRequests() const {
 	return _recordingTipRequests.events();
 }
 
+auto VoiceRecordBar::errors() const -> rpl::producer<Error> {
+	return _errors.events();
+}
+
 bool VoiceRecordBar::isLockPresent() const {
 	return _lockShowing.current();
 }
@@ -1963,7 +3197,8 @@ bool VoiceRecordBar::isListenState() const {
 }
 
 bool VoiceRecordBar::isTypeRecord() const {
-	return (_send->type() == Ui::SendButton::Type::Record);
+	return (_send->type() == Ui::SendButton::Type::Record)
+		|| (_send->type() == Ui::SendButton::Type::Round);
 }
 
 bool VoiceRecordBar::isRecordingByAnotherBar() const {
@@ -1979,6 +3214,9 @@ bool VoiceRecordBar::hasDuration() const {
 }
 
 float64 VoiceRecordBar::activeAnimationRatio() const {
+	if (isRecordingLocked()) {
+		return 1.;
+	}
 	return _activeAnimation.value(_inField.current() ? 1. : 0.);
 }
 
@@ -2003,10 +3241,14 @@ float64 VoiceRecordBar::showListenAnimationRatio() const {
 }
 
 void VoiceRecordBar::computeAndSetLockProgress(QPoint globalPos) {
+	_lock->requestPaintProgress(calcLockProgress(globalPos));
+}
+
+float64 VoiceRecordBar::calcLockProgress(QPoint globalPos) {
 	const auto localPos = mapFromGlobal(globalPos);
 	const auto lower = _lock->height();
 	const auto higher = 0;
-	_lock->requestPaintProgress(Progress(localPos.y(), higher - lower));
+	return Progress(localPos.y(), higher - lower);
 }
 
 bool VoiceRecordBar::peekTTLState() const {
@@ -2029,6 +3271,7 @@ void VoiceRecordBar::orderControls() {
 }
 
 void VoiceRecordBar::installListenStateFilter() {
+	_keyFilterInRecordingState = nullptr;
 	auto keyFilterCallback = [=](not_null<QEvent*> e) {
 		using Result = base::EventFilterResult;
 		if (!(_send->type() == Ui::SendButton::Type::Send
@@ -2085,8 +3328,12 @@ void VoiceRecordBar::showDiscardBox(
 	};
 	_show->showBox(Ui::MakeConfirmBox({
 		.text = (isListenState()
-			? tr::lng_record_listen_cancel_sure
-			: tr::lng_record_lock_cancel_sure)(),
+			? (_recordingVideo
+				? tr::lng_record_listen_cancel_sure_round
+				: tr::lng_record_listen_cancel_sure)
+			: (_recordingVideo
+				? tr::lng_record_lock_cancel_sure_round
+				: tr::lng_record_lock_cancel_sure))(),
 		.confirmed = std::move(sure),
 		.confirmText = tr::lng_record_lock_discard(),
 		.confirmStyle = &st::attentionBoxButton,
@@ -2094,4 +3341,52 @@ void VoiceRecordBar::showDiscardBox(
 	_warningShown = true;
 }
 
+bool VoiceRecordBar::createVideoRecorder() {
+	if (_videoRecorder) {
+		return true;
+	}
+	const auto hiding = [=](not_null<Ui::RoundVideoRecorder*> which) {
+		if (_videoRecorder.get() == which) {
+			_videoHiding.push_back(base::take(_videoRecorder));
+		}
+	};
+	const auto hidden = [=](not_null<Ui::RoundVideoRecorder*> which) {
+		if (_videoRecorder.get() == which) {
+			_videoRecorder = nullptr;
+		}
+		_videoHiding.erase(
+			ranges::remove(
+				_videoHiding,
+				which.get(),
+				&std::unique_ptr<Ui::RoundVideoRecorder>::get),
+			end(_videoHiding));
+	};
+	auto capturer = Core::App().calls().getVideoCapture();
+	auto track = std::make_shared<Webrtc::VideoTrack>(
+		Webrtc::VideoState::Active);
+	capturer->setOutput(track->sink());
+	capturer->setPreferredAspectRatio(1.);
+	_videoCapturerLifetime = track->stateValue(
+	) | rpl::on_next([=](Webrtc::VideoState state) {
+		capturer->setState((state == Webrtc::VideoState::Active)
+			? tgcalls::VideoState::Active
+			: tgcalls::VideoState::Inactive);
+	});
+	_videoRecorder = std::make_unique<Ui::RoundVideoRecorder>(
+		Ui::RoundVideoRecorderDescriptor{
+			.container = _outerContainer,
+			.hiding = hiding,
+			.hidden = hidden,
+			.capturer = std::move(capturer),
+			.track = std::move(track),
+			.placeholder = _show->session().local().readRoundPlaceholder(),
+		});
+	_videoRecorder->placeholderUpdates(
+	) | rpl::on_next([=](QImage &&placeholder) {
+		_show->session().local().writeRoundPlaceholder(placeholder);
+	}, _videoCapturerLifetime);
+
+	return true;
+}
+
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 332bf5b1f616ab..43e121422ea984 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "base/timer.h"
 #include "history/view/controls/compose_controls_common.h"
 #include "media/audio/media_audio_capture_common.h"
+#include "ui/controls/round_video_recorder.h"
 #include "ui/effects/animations.h"
 #include "ui/round_rect.h"
 #include "ui/rp_widget.h"
@@ -21,9 +22,14 @@ namespace style {
 struct RecordBar;
 } // namespace style
 
+namespace Media::Capture {
+enum class Error : uchar;
+} // namespace Media::Capture
+
 namespace Ui {
 class AbstractButton;
 class SendButton;
+class RoundVideoRecorder;
 } // namespace Ui
 
 namespace Window {
@@ -56,6 +62,7 @@ class VoiceRecordBar final : public Ui::RpWidget {
 	using SendActionUpdate = Controls::SendActionUpdate;
 	using VoiceToSend = Controls::VoiceToSend;
 	using FilterCallback = Fn<bool()>;
+	using Error = ::Media::Capture::Error;
 
 	VoiceRecordBar(
 		not_null<Ui::RpWidget*> parent,
@@ -71,7 +78,8 @@ class VoiceRecordBar final : public Ui::RpWidget {
 		Fn<void()> &&callback,
 		anim::type animated = anim::type::instant);
 
-	void startRecording();
+	void startRecordingAndLock(bool round);
+
 	void finishAnimating();
 	void hideAnimated();
 	void hideFast();
@@ -87,11 +95,13 @@ class VoiceRecordBar final : public Ui::RpWidget {
 	[[nodiscard]] rpl::producer<not_null<QEvent*>> lockViewportEvents() const;
 	[[nodiscard]] rpl::producer<> updateSendButtonTypeRequests() const;
 	[[nodiscard]] rpl::producer<> recordingTipRequests() const;
+	[[nodiscard]] rpl::producer<Error> errors() const;
 
 	void requestToSendWithOptions(Api::SendOptions options);
 
 	void setStartRecordingFilter(FilterCallback &&callback);
 	void setTTLFilter(FilterCallback &&callback);
+	void setPauseInsteadSend(bool pauseInsteadSend);
 
 	[[nodiscard]] bool isRecording() const;
 	[[nodiscard]] bool isRecordingLocked() const;
@@ -123,14 +133,12 @@ class VoiceRecordBar final : public Ui::RpWidget {
 	void updateTTLGeometry(TTLAnimationType type, float64 progress);
 
 	void recordUpdated(quint16 level, int samples);
-
-	[[nodiscard]] bool recordingAnimationCallback(crl::time now);
+	void checkTipRequired();
 
 	void stop(bool send);
 	void stopRecording(StopType type, bool ttlBeforeHide = false);
 	void visibilityAnimate(bool show, Fn<void()> &&callback);
 
-	[[nodiscard]] bool showRecordButton() const;
 	void drawDuration(QPainter &p);
 	void drawRedCircle(QPainter &p);
 	void drawMessage(QPainter &p, float64 recordActive);
@@ -138,6 +146,16 @@ class VoiceRecordBar final : public Ui::RpWidget {
 	void startRedCircleAnimation();
 	void installListenStateFilter();
 
+	void startRecording();
+	void prepareOnSendPress();
+	void applyListenTrimForResume();
+	void clearResumePrefix();
+	void clearResumeState();
+	void setupResumePrefixFromCurrentData();
+	[[nodiscard]] int samplesFromDuration(crl::time duration) const;
+	[[nodiscard]] Ui::RoundVideoResult mergeWithResumePrefix(
+		Ui::RoundVideoResult data);
+
 	[[nodiscard]] bool isTypeRecord() const;
 	[[nodiscard]] bool hasDuration() const;
 
@@ -149,10 +167,13 @@ class VoiceRecordBar final : public Ui::RpWidget {
 	[[nodiscard]] float64 activeAnimationRatio() const;
 
 	void computeAndSetLockProgress(QPoint globalPos);
+	[[nodiscard]] float64 calcLockProgress(QPoint globalPos);
 
 	[[nodiscard]] bool peekTTLState() const;
 	[[nodiscard]] bool takeTTLState() const;
 
+	[[nodiscard]] bool createVideoRecorder();
+
 	const style::RecordBar &_st;
 	const not_null<Ui::RpWidget*> _outerContainer;
 	const std::shared_ptr<ChatHelpers::Show> _show;
@@ -163,7 +184,13 @@ class VoiceRecordBar final : public Ui::RpWidget {
 	std::unique_ptr<Ui::AbstractButton> _ttlButton;
 	std::unique_ptr<ListenWrap> _listen;
 
-	::Media::Capture::Result _data;
+	Ui::RoundVideoResult _data;
+	Ui::RoundVideoResult _resumePrefixData;
+	int _resumePrefixSamples = 0;
+	int _resumeRawSamples = 0;
+	crl::time _pausedRawDuration = 0;
+	crl::time _resumeRawDuration = 0;
+	bool _resumeFromTrimmedListen = false;
 	rpl::variable<bool> _paused;
 
 	base::Timer _startTimer;
@@ -172,6 +199,7 @@ class VoiceRecordBar final : public Ui::RpWidget {
 	rpl::event_stream<VoiceToSend> _sendVoiceRequests;
 	rpl::event_stream<> _cancelRequests;
 	rpl::event_stream<> _listenChanges;
+	rpl::event_stream<Error> _errors;
 
 	int _centerY = 0;
 	QRect _redCircleRect;
@@ -183,7 +211,10 @@ class VoiceRecordBar final : public Ui::RpWidget {
 	FilterCallback _startRecordingFilter;
 	FilterCallback _hasTTLFilter;
 
+	base::unique_qptr<QObject> _keyFilterInRecordingState;
+
 	bool _warningShown = false;
+	bool _pauseInsteadSend = false;
 
 	rpl::variable<bool> _recording = false;
 	rpl::variable<bool> _inField = false;
@@ -192,9 +223,15 @@ class VoiceRecordBar final : public Ui::RpWidget {
 	float64 _redCircleProgress = 0.;
 
 	rpl::event_stream<> _recordingTipRequests;
-	bool _recordingTipRequired = false;
+	crl::time _recordingTipRequire = 0;
 	bool _lockFromBottom = false;
 
+	std::unique_ptr<Ui::RoundVideoRecorder> _videoRecorder;
+	std::vector<std::unique_ptr<Ui::RoundVideoRecorder>> _videoHiding;
+	rpl::lifetime _videoCapturerLifetime;
+	bool _recordingVideo = false;
+	bool _fullRecord = false;
+
 	const style::font &_cancelFont;
 
 	rpl::lifetime _recordingLifetime;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index 986ea9d6e1caba..dcbec6690a77ba 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -7,11 +7,13 @@ For license and copyright information please follow this link:
 */
 #include "history/view/controls/history_view_voice_record_button.h"
 
+#include "lottie/lottie_icon.h"
 #include "ui/paint/blobs.h"
 #include "ui/painter.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
+#include "lang/lang_keys.h"
 
 #include <QtMath>
 
@@ -24,6 +26,8 @@ constexpr auto kBlobAlpha = 76. / 255.;
 constexpr auto kBlobMaxSpeed = 5.0;
 constexpr auto kLevelDuration = 100. + 500. * 0.33;
 constexpr auto kBlobsScaleEnterDuration = crl::time(250);
+constexpr auto kVoiceIconIndex = 0;
+constexpr auto kRoundIconIndex = 1;
 
 auto Blobs() {
 	return std::vector<Ui::Paint::Blobs::BlobData>{
@@ -80,7 +84,7 @@ void VoiceRecordButton::init() {
 		anim::Disabled()
 	) | rpl::then(
 		anim::Disables()
-	) | rpl::start_with_next([=](bool hide) {
+	) | rpl::on_next([=](bool hide) {
 		if (hide) {
 			_blobs->setLevel(0.);
 		}
@@ -94,7 +98,7 @@ void VoiceRecordButton::init() {
 	const auto mainRadiusDiff = st::historyRecordMainBlobMaxRadius
 		- mainRadiusMin;
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = QPainter(this);
 
 		const auto hideProgress = _blobsHideLastTime
@@ -135,18 +139,28 @@ void VoiceRecordButton::init() {
 				p.scale(scale, scale);
 			}
 			const auto state = *currentState;
-			const auto icon = (state == Type::Send)
-				? st::historySendIcon
-				: st::historyRecordVoiceActive;
-			const auto position = (state == Type::Send)
-				? st::historyRecordSendIconPosition
-				: QPoint(0, 0);
-			icon.paint(
-				p,
-				-icon.width() / 2 + position.x(),
-				-icon.height() / 2 + position.y(),
-				0,
-				st::historyRecordVoiceFgActiveIcon->c);
+			if (state == Type::Send) {
+				const auto icon = st::historySendIcon;
+				const auto position = st::historyRecordSendIconPosition;
+				icon.paint(
+					p,
+					-icon.width() / 2 + position.x(),
+					-icon.height() / 2 + position.y(),
+					0,
+					st::historyRecordVoiceFgActiveIcon->c);
+			} else {
+				const auto index = (state == Type::Record)
+					? kVoiceIconIndex
+					: kRoundIconIndex;
+				auto &icon = _voiceRoundIcons[index];
+				if (!icon) {
+					initVoiceRoundIcon(index);
+				}
+				icon->paintInCenter(
+					p,
+					rect().translated(-_center, -_center),
+					st::historyRecordVoiceFgActiveIcon->c);
+			}
 		}
 	}, lifetime());
 
@@ -166,7 +180,7 @@ void VoiceRecordButton::init() {
 		shownValue(),
 		_showProgress.value(
 		) | rpl::map(rpl::mappers::_1 != 0.) | rpl::distinct_until_changed()
-	) | rpl::start_with_next([=](bool show) {
+	) | rpl::on_next([=](bool show) {
 		setVisible(show);
 		setMouseTracking(show);
 		if (!show) {
@@ -183,12 +197,12 @@ void VoiceRecordButton::init() {
 
 	actives(
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
 		setPointerCursor(active);
 	}, lifetime());
 
 	_state.changes(
-	) | rpl::start_with_next([=](Type newState) {
+	) | rpl::on_next([=](Type newState) {
 		const auto to = 1.;
 		auto callback = [=](float64 value) {
 			if (value >= (to * .5)) {
@@ -201,6 +215,18 @@ void VoiceRecordButton::init() {
 	}, lifetime());
 }
 
+void VoiceRecordButton::initVoiceRoundIcon(int index) {
+	Expects(index >= 0 && index < 2);
+
+	_voiceRoundIcons[index] = Lottie::MakeIcon({
+		.path = ((index == kVoiceIconIndex)
+			? u":/animations/chat/voice_to_video.tgs"_q
+			: u":/animations/chat/video_to_voice.tgs"_q),
+		.sizeOverride = st::historySend.recordSize,
+		.colorizeUsingAlpha = true,
+	});
+}
+
 rpl::producer<bool> VoiceRecordButton::actives() const {
 	return events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
@@ -255,6 +281,19 @@ void VoiceRecordButton::requestPaintColor(float64 progress) {
 
 void VoiceRecordButton::setType(Type state) {
 	_state = state;
+
+	setAccessibleName([&] {
+		switch (state) {
+		case Type::Send:
+			return tr::lng_send_button(tr::now);
+		case Type::Record:
+			return tr::lng_send_action_record_round(tr::now);
+		case Type::Round:
+			return tr::lng_send_action_record_round(tr::now);
+		}
+		Unexpected("Voice record button type.");
+	}());
+
 }
 
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
index bd3f0150c0a933..4465a959259a71 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
@@ -15,6 +15,10 @@ namespace style {
 struct RecordBar;
 } // namespace style
 
+namespace Lottie {
+class Icon;
+} // namespace Lottie
+
 namespace Ui::Paint {
 class Blobs;
 } // namespace Ui::Paint
@@ -31,6 +35,7 @@ class VoiceRecordButton final : public Ui::AbstractButton {
 	enum class Type {
 		Send,
 		Record,
+		Round,
 	};
 
 	void setType(Type state);
@@ -46,8 +51,10 @@ class VoiceRecordButton final : public Ui::AbstractButton {
 
 private:
 	void init();
+	void initVoiceRoundIcon(int index);
 
 	std::unique_ptr<Ui::Paint::Blobs> _blobs;
+	std::array<std::unique_ptr<Lottie::Icon>, 2> _voiceRoundIcons;
 
 	crl::time _lastUpdateTime = 0;
 	crl::time _blobsHideLastTime = 0;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_webpage_processor.cpp b/Telegram/SourceFiles/history/view/controls/history_view_webpage_processor.cpp
index 214de059c43a64..644bf210308477 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_webpage_processor.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_webpage_processor.cpp
@@ -158,11 +158,15 @@ void WebpageResolver::request(const QString &link, bool force) {
 			MTP_flags(0),
 			MTP_string(link),
 			MTPVector<MTPMessageEntity>()
-	)).done([=](const MTPMessageMedia &result, mtpRequestId requestId) {
+	)).done([=](
+			const MTPmessages_WebPagePreview &result,
+			mtpRequestId requestId) {
 		if (_requestId == requestId) {
 			_requestId = 0;
 		}
-		result.match([=](const MTPDmessageMediaWebPage &data) {
+		const auto &data = result.data();
+		_session->data().processUsers(data.vusers());
+		data.vmedia().match([=](const MTPDmessageMediaWebPage &data) {
 			done(data);
 		}, [&](const auto &d) {
 			fail();
@@ -178,6 +182,7 @@ void WebpageResolver::request(const QString &link, bool force) {
 void WebpageResolver::cancel(const QString &link) {
 	if (_requestLink == link) {
 		_api.request(base::take(_requestId)).cancel();
+		_requestLink = QString();
 	}
 }
 
@@ -196,26 +201,26 @@ WebpageProcessor::WebpageProcessor(
 	_history->session().downloaderTaskFinished(
 	) | rpl::filter([=] {
 		return _data && (_data->document || _data->photo);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_repaintRequests.fire({});
 	}, _lifetime);
 
 	_history->owner().webPageUpdates(
 	) | rpl::filter([=](not_null<WebPageData*> page) {
 		return (_data == page.get());
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_draft.id = _data->id;
 		_draft.url = _data->url;
 		updateFromData();
 	}, _lifetime);
 
 	_parser.list().changes(
-	) | rpl::start_with_next([=](QStringList &&parsed) {
+	) | rpl::on_next([=](QStringList &&parsed) {
 		_parsedLinks = std::move(parsed);
 		checkPreview();
 	}, _lifetime);
 
-	_resolver->resolved() | rpl::start_with_next([=](QString link) {
+	_resolver->resolved() | rpl::on_next([=](QString link) {
 		if (_link != link
 			|| _draft.removed
 			|| (_draft.manual && _draft.url != link)) {
diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.cpp b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
index 3e6a46bc8a394d..c30fcf2597a07c 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.cpp
@@ -7,21 +7,32 @@ For license and copyright information please follow this link:
 */
 #include "history/view/history_view_about_view.h"
 
+#include "api/api_peer_colors.h"
 #include "api/api_premium.h"
 #include "api/api_sending.h"
 #include "apiwrap.h"
 #include "base/random.h"
+#include "base/unixtime.h"
+#include "ui/effects/premium_stars.h"
 #include "boxes/premium_preview_box.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "core/click_handler_types.h"
+#include "core/ui_integration.h"
+#include "countries/countries_instance.h"
 #include "data/business/data_business_common.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_channel.h"
 #include "data/data_document.h"
+#include "data/data_emoji_statuses.h"
+#include "data/data_photo.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "history/view/history_view_group_call_bar.h"
 #include "history/view/media/history_view_media_generic.h"
 #include "history/view/media/history_view_service_box.h"
 #include "history/view/media/history_view_sticker_player_abstract.h"
 #include "history/view/media/history_view_sticker.h"
+#include "history/view/media/history_view_unique_gift.h"
 #include "history/view/history_view_element.h"
 #include "history/history.h"
 #include "history/history_item.h"
@@ -30,29 +41,50 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/business/settings_chat_intro.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_credits.h" // BuyStarsHandler
+#include "settings/sections/settings_premium.h"
 #include "ui/chat/chat_style.h"
+#include "ui/image/image_location_factory.h"
+#include "ui/text/custom_emoji_instance.h"
 #include "ui/text/text_utilities.h"
 #include "ui/text/text_options.h"
+#include "ui/dynamic_image.h"
+#include "ui/empty_userpic.h"
 #include "ui/painter.h"
+#include "ui/top_background_gradient.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h" // GroupCallUserpics
+#include "styles/style_credits.h"
+#include "styles/style_menu_icons.h"
 
 namespace HistoryView {
 namespace {
 
-class PremiumRequiredBox final : public ServiceBoxContent {
+constexpr auto kLabelOpacity = 0.85;
+constexpr auto kMaxCommonChatsUserpics = 3;
+
+class EmptyChatLockedBox final
+	: public ServiceBoxContent
+	, public base::has_weak_ptr {
 public:
-	explicit PremiumRequiredBox(not_null<Element*> parent);
-	~PremiumRequiredBox();
+	enum class Type {
+		PremiumRequired,
+		StarsCharged,
+		FreeDirect,
+	};
+
+	EmptyChatLockedBox(not_null<Element*> parent, Type type);
+	~EmptyChatLockedBox();
 
 	int width() override;
 	int top() override;
 	QSize size() override;
-	QString title() override;
+	TextWithEntities title() override;
 	TextWithEntities subtitle() override;
 	int buttonSkip() override;
 	rpl::producer<QString> button() override;
+	std::optional<Ui::Premium::MiniStarsType> buttonMinistars() override;
 	void draw(
 		Painter &p,
 		const PaintContext &context,
@@ -71,18 +103,158 @@ class PremiumRequiredBox final : public ServiceBoxContent {
 	bool hasHeavyPart() override;
 	void unloadHeavyPart() override;
 
+private:
+	const not_null<Element*> _parent;
+	Settings::BuyStarsHandler _buyStars;
+	rpl::variable<bool> _buyStarsLoading;
+	Type _type = {};
+
+};
+
+class UserpicsList final : public Ui::DynamicImage {
+public:
+	UserpicsList(
+		std::vector<not_null<PeerData*>> peers,
+		const style::GroupCallUserpics &st,
+		int countOverride = 0);
+
+	[[nodiscard]] int width() const;
+
+	std::shared_ptr<Ui::DynamicImage> clone() override;
+
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	struct Subscribed {
+		explicit Subscribed(Fn<void()> callback)
+		: callback(std::move(callback)) {
+		}
+
+		std::vector<HistoryView::UserpicInRow> list;
+		bool someNotLoaded = false;
+		Fn<void()> callback;
+		int paletteVersion = 0;
+	};
+
+	const std::vector<not_null<PeerData*>> _peers;
+	const style::GroupCallUserpics &_st;
+	const int _countOverride = 0;
+
+	QImage _frame;
+	std::unique_ptr<Subscribed> _subscribed;
+
+};
+
+class NewBotThreadDottedLine final : public MediaGenericPart {
+public:
+	explicit NewBotThreadDottedLine(not_null<Element*> parent);
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
 private:
 	const not_null<Element*> _parent;
 
 };
 
+UserpicsList::UserpicsList(
+	std::vector<not_null<PeerData*>> peers,
+	const style::GroupCallUserpics &st,
+	int countOverride)
+: _peers(std::move(peers))
+, _st(st)
+, _countOverride(countOverride) {
+}
+
+std::shared_ptr<Ui::DynamicImage> UserpicsList::clone() {
+	return std::make_shared<UserpicsList>(_peers, _st);
+}
+
+QImage UserpicsList::image(int size) {
+	Expects(_subscribed != nullptr);
+
+	const auto regenerate = [&] {
+		const auto version = style::PaletteVersion();
+		if (_subscribed->paletteVersion != version) {
+			_subscribed->paletteVersion = version;
+			return true;
+		}
+		return NeedRegenerateUserpics(_frame, _subscribed->list);
+	}();
+	if (regenerate) {
+		const auto max = std::max(_countOverride, int(_peers.size()));
+		GenerateUserpicsInRow(_frame, _subscribed->list, _st, max);
+	}
+	return _frame;
+}
+
+void UserpicsList::subscribeToUpdates(Fn<void()> callback) {
+	if (!callback) {
+		_subscribed = nullptr;
+		return;
+	}
+	_subscribed = std::make_unique<Subscribed>(std::move(callback));
+	for (const auto &peer : _peers) {
+		_subscribed->list.push_back({ .peer = peer });
+	}
+}
+
+int UserpicsList::width() const {
+	const auto count = std::max(_countOverride, int(_peers.size()));
+	if (!count) {
+		return 0;
+	}
+	const auto shifted = count - 1;
+	return _st.size + (shifted * (_st.size - _st.shift));
+}
+
+
+
+NewBotThreadDottedLine::NewBotThreadDottedLine(not_null<Element*> parent)
+: _parent(parent) {
+}
+
+void NewBotThreadDottedLine::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	const auto skip = st::monoforumBarUserpicSkip;
+	auto pen = context.st->msgServiceBg()->p;
+	pen.setWidthF(skip);
+	pen.setCapStyle(Qt::RoundCap);
+	pen.setDashPattern({ 2., 2. });
+	p.setPen(pen);
+	const auto top = -st::newBotThreadTopSkip / 2;
+	p.drawLine(context.viewport.x(), top, context.viewport.width(), top);
+}
+
+QSize NewBotThreadDottedLine::countOptimalSize() {
+	return { 0, 0 };
+}
+
+QSize NewBotThreadDottedLine::countCurrentSize(int newWidth) {
+	return { 0, 0 };
+}
+
 auto GenerateChatIntro(
 	not_null<Element*> parent,
 	Element *replacing,
 	const Data::ChatIntro &data,
-	Fn<void(not_null<DocumentData*>)> helloChosen)
--> Fn<void(Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
-	return [=](Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
+	Fn<void(not_null<DocumentData*>)> helloChosen,
+	Fn<void(not_null<DocumentData*>)> sendIntroSticker)
+-> Fn<void(
+		not_null<MediaGeneric*>,
+		Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](
+			not_null<MediaGeneric*> media,
+			Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
 		auto pushText = [&](
 				TextWithEntities text,
 				QMargins margins = {},
@@ -93,6 +265,7 @@ auto GenerateChatIntro(
 			push(std::make_unique<MediaGenericTextPart>(
 				std::move(text),
 				margins,
+				st::defaultTextStyle,
 				links));
 		};
 		const auto title = data.customPhrases()
@@ -101,7 +274,7 @@ auto GenerateChatIntro(
 		const auto description = data.customPhrases()
 			? data.description
 			: tr::lng_chat_intro_default_message(tr::now);
-		pushText(Ui::Text::Bold(title), st::chatIntroTitleMargin);
+		pushText(tr::bold(title), st::chatIntroTitleMargin);
 		pushText({ description }, title.isEmpty()
 			? st::chatIntroTitleMargin
 			: st::chatIntroMargin);
@@ -119,9 +292,7 @@ auto GenerateChatIntro(
 				}
 			}
 			const auto send = [=] {
-				Api::SendExistingDocument(Api::MessageToSend(
-					Api::SendAction(parent->history())
-				), sticker);
+				sendIntroSticker(sticker);
 			};
 			return StickerInBubblePart::Data{
 				.sticker = sticker,
@@ -138,73 +309,375 @@ auto GenerateChatIntro(
 	};
 }
 
-PremiumRequiredBox::PremiumRequiredBox(not_null<Element*> parent)
-: _parent(parent) {
+auto GenerateNewBotThread(
+	not_null<Element*> parent,
+	Element *replacing)
+-> Fn<void(
+		not_null<MediaGeneric*>,
+		Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](
+			not_null<MediaGeneric*> media,
+			Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
+		auto pushText = [&](
+				TextWithEntities text,
+				QMargins margins = {},
+				const base::flat_map<uint16, ClickHandlerPtr> &links = {}) {
+			if (text.empty()) {
+				return;
+			}
+			push(std::make_unique<MediaGenericTextPart>(
+				std::move(text),
+				margins,
+				st::defaultTextStyle,
+				links));
+		};
+		const auto title = tr::lng_bot_new_thread_title(tr::now);
+		const auto description = tr::lng_bot_new_thread_about(tr::now);
+		push(std::make_unique<NewBotThreadDottedLine>(parent));
+		push(std::make_unique<LambdaGenericPart>(
+			QSize(
+				st::newThreadAboutIconOuter,
+				st::newThreadAboutIconOuter + st::newThreadAboutIconSkip),
+			[=](
+				Painter &p,
+				not_null<const MediaGeneric*> owner,
+				const PaintContext &context,
+				int outerWidth) {
+					const auto size = st::newThreadAboutIconOuter;
+					const auto &icon = st::newThreadAboutIcon;
+					const auto x = (outerWidth - icon.width()) / 2;
+					const auto y = (size - icon.height()) / 2
+						+ st::newThreadAboutIconSkip;
+					auto hq = PainterHighQualityEnabler(p);
+					p.setPen(Qt::NoPen);
+					p.setBrush(context.st->msgServiceBgSelected());
+					p.drawEllipse(
+						(outerWidth - size) / 2,
+						st::newThreadAboutIconSkip,
+						size,
+						size);
+					const auto color = context.st->msgServiceFg();
+					icon.paint(p, x, y, outerWidth, color->c);
+				}));
+		pushText(tr::bold(title), st::chatIntroTitleMargin);
+		pushText({ description }, st::chatIntroMargin);
+		push(std::make_unique<LambdaGenericPart>(
+			st::newBotThreadDown.size() / 4 * 3,
+			[=, h = st::newBotThreadDown.height() / 2 + st::lineWidth * 4](
+				Painter &p,
+				not_null<const MediaGeneric*> owner,
+				const PaintContext &context,
+				int outerWidth) {
+					auto color = context.st->msgServiceFg()->c;
+					color.setAlphaF(color.alphaF() * kLabelOpacity);
+					st::newBotThreadDown.paintInCenter(
+						p,
+						QRect(0, 0, outerWidth, h),
+						color);
+			}));
+
+		parent->addVerticalMargins(
+			st::newBotThreadTopSkip - st::msgServiceMargin.top(),
+			st::msgServiceMargin.top());
+	};
+}
+
+auto GenerateNewPeerInfo(
+	not_null<Element*> parent,
+	Element *replacing,
+	not_null<UserData*> user,
+	std::vector<not_null<PeerData*>> commonGroups)
+-> Fn<void(
+		not_null<MediaGeneric*>,
+		Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](
+			not_null<MediaGeneric*> media,
+			Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
+		const auto normalFg = [](const PaintContext &context) {
+			return context.st->msgServiceFg()->c;
+		};
+		const auto fadedFg = [](const PaintContext &context) {
+			auto result = context.st->msgServiceFg()->c;
+			result.setAlphaF(result.alphaF() * kLabelOpacity);
+			return result;
+		};
+		push(std::make_unique<MediaGenericTextPart>(
+			tr::bold(user->name()),
+			st::newPeerTitleMargin));
+		push(std::make_unique<TextPartColored>(
+			tr::lng_new_contact_not_contact(tr::now, tr::marked),
+			st::newPeerSubtitleMargin,
+			fadedFg));
+
+		auto entries = std::vector<AttributeTable::Entry>();
+		const auto country = user->phoneCountryCode();
+		if (!country.isEmpty()) {
+			const auto &countries = Countries::Instance();
+			const auto name = countries.countryNameByISO2(country);
+			const auto flag = countries.flagEmojiByISO2(country);
+			entries.push_back({
+				tr::lng_new_contact_phone_number(tr::now),
+				tr::bold(flag + QChar(0xA0) + name),
+			});
+		}
+		const auto month = user->registrationMonth();
+		const auto year = user->registrationYear();
+		if (month && year) {
+			entries.push_back({
+				tr::lng_new_contact_registration(tr::now),
+				tr::bold(langMonthOfYearFull(month, year)),
+			});
+		}
+
+		const auto context = Core::TextContext({
+			.session = &parent->history()->session(),
+			.repaint = [parent] { parent->repaint(); },
+		});
+		const auto kUserpicsPrefix = u"userpics-list/"_q;
+		if (const auto count = user->commonChatsCount()) {
+			const auto url = u"internal:common_groups/"_q
+				+ QString::number(user->id.value);
+			auto ids = QStringList();
+			const auto userpics = std::min(count, kMaxCommonChatsUserpics);
+			for (auto i = 0; i != userpics; ++i) {
+				ids.push_back(QString::number(i < commonGroups.size()
+					? commonGroups[i]->id.value
+					: 0));
+			}
+			auto userpicsData = kUserpicsPrefix + ids.join(',');
+			entries.push_back({
+				tr::lng_new_contact_common_groups(tr::now),
+				Ui::Text::Wrapped(
+					tr::lng_new_contact_groups(
+						tr::now,
+						lt_count,
+						count,
+						lt_emoji,
+						Ui::Text::SingleCustomEmoji(userpicsData),
+						lt_arrow,
+						Ui::Text::IconEmoji(&st::textMoreIconEmoji),
+						tr::bold),
+					EntityType::CustomUrl,
+					url),
+			});
+		}
+
+		auto copy = context;
+		copy.customEmojiFactory = [=, old = copy.customEmojiFactory](
+			QStringView data,
+			const Ui::Text::MarkedContext &context
+		) -> std::unique_ptr<Ui::Text::CustomEmoji> {
+			if (!data.startsWith(kUserpicsPrefix)) {
+				return old(data, context);
+			}
+			const auto ids = data.mid(kUserpicsPrefix.size()).split(',');
+			auto peers = std::vector<not_null<PeerData*>>();
+			for (const auto &id : ids) {
+				if (const auto peerId = PeerId(id.toULongLong())) {
+					peers.push_back(user->owner().peer(peerId));
+				}
+			}
+			auto image = std::make_shared<UserpicsList>(
+				std::move(peers),
+				st::newPeerUserpics,
+				ids.size());
+			const auto size = image->width();
+			return std::make_unique<Ui::CustomEmoji::DynamicImageEmoji>(
+				data.toString(),
+				std::move(image),
+				context.repaint,
+				st::newPeerUserpicsPadding,
+				size);
+		};
+		push(std::make_unique<AttributeTable>(
+			std::move(entries),
+			st::newPeerSubtitleMargin,
+			fadedFg,
+			normalFg,
+			copy));
+
+		const auto details = user->botVerifyDetails();
+		const auto text = details
+			? Data::SingleCustomEmoji(
+				details->iconId
+			).append(' ').append(details->description)
+			: Ui::Text::IconEmoji(
+				&st::newPeerNonOfficial
+			).append(' ').append(tr::lng_new_contact_not_official(tr::now));
+		push(std::make_unique<TextPartColored>(
+			text,
+			st::newPeerSubtitleMargin,
+			fadedFg,
+			st::defaultTextStyle,
+			base::flat_map<uint16, ClickHandlerPtr>(),
+			context));
+	};
+}
+
+EmptyChatLockedBox::EmptyChatLockedBox(not_null<Element*> parent, Type type)
+: _parent(parent)
+, _type(type) {
 }
 
-PremiumRequiredBox::~PremiumRequiredBox() = default;
+EmptyChatLockedBox::~EmptyChatLockedBox() = default;
 
-int PremiumRequiredBox::width() {
-	return st::premiumRequiredWidth;
+int EmptyChatLockedBox::width() {
+	return (_type == Type::PremiumRequired)
+		? st::premiumRequiredWidth
+		: st::starsPerMessageWidth;
 }
 
-int PremiumRequiredBox::top() {
+int EmptyChatLockedBox::top() {
 	return st::msgServiceGiftBoxButtonMargins.top();
 }
 
-QSize PremiumRequiredBox::size() {
+QSize EmptyChatLockedBox::size() {
 	return { st::msgServicePhotoWidth, st::msgServicePhotoWidth };
 }
 
-QString PremiumRequiredBox::title() {
-	return QString();
+TextWithEntities EmptyChatLockedBox::title() {
+	return {};
 }
 
-int PremiumRequiredBox::buttonSkip() {
+int EmptyChatLockedBox::buttonSkip() {
 	return st::storyMentionButtonSkip;
 }
 
-rpl::producer<QString> PremiumRequiredBox::button() {
-	return tr::lng_send_non_premium_go();
+rpl::producer<QString> EmptyChatLockedBox::button() {
+	return (_type == Type::FreeDirect)
+		? nullptr
+		: (_type == Type::PremiumRequired)
+		? tr::lng_send_non_premium_go()
+		: tr::lng_send_charges_stars_go();
 }
 
-TextWithEntities PremiumRequiredBox::subtitle() {
+auto EmptyChatLockedBox::buttonMinistars()
+-> std::optional<Ui::Premium::MiniStarsType> {
+	return Ui::Premium::MiniStarsType::SlowStars;
+}
+
+TextWithEntities EmptyChatLockedBox::subtitle() {
 	return _parent->data()->notificationText();
 }
 
-ClickHandlerPtr PremiumRequiredBox::createViewLink() {
-	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+ClickHandlerPtr EmptyChatLockedBox::createViewLink() {
+	_buyStarsLoading = _buyStars.loadingValue();
+	const auto handler = [=](ClickContext context) {
 		const auto my = context.other.value<ClickHandlerContext>();
 		if (const auto controller = my.sessionWindow.get()) {
-			Settings::ShowPremium(controller, u"require_premium"_q);
+			if (_type == Type::PremiumRequired) {
+				Settings::ShowPremium(controller, u"require_premium"_q);
+			} else if (!_buyStarsLoading.current()) {
+				_buyStars.handler(controller->uiShow())();
+			}
 		}
-	});
+	};
+	return std::make_shared<LambdaClickHandler>(crl::guard(this, handler));
 }
 
-void PremiumRequiredBox::draw(
+void EmptyChatLockedBox::draw(
 		Painter &p,
 		const PaintContext &context,
 		const QRect &geometry) {
 	p.setBrush(context.st->msgServiceBg()); // ?
 	p.setPen(Qt::NoPen);
 	p.drawEllipse(geometry);
-	st::premiumRequiredIcon.paintInCenter(p, geometry);
+	(_type == Type::PremiumRequired
+		? st::premiumRequiredIcon
+		: st::directMessagesIcon).paintInCenter(p, geometry);
 }
 
-void PremiumRequiredBox::stickerClearLoopPlayed() {
+void EmptyChatLockedBox::stickerClearLoopPlayed() {
 }
 
-std::unique_ptr<StickerPlayer> PremiumRequiredBox::stickerTakePlayer(
+std::unique_ptr<StickerPlayer> EmptyChatLockedBox::stickerTakePlayer(
 		not_null<DocumentData*> data,
 		const Lottie::ColorReplacements *replacements) {
 	return nullptr;
 }
 
-bool PremiumRequiredBox::hasHeavyPart() {
+bool EmptyChatLockedBox::hasHeavyPart() {
 	return false;
 }
 
-void PremiumRequiredBox::unloadHeavyPart() {
+void EmptyChatLockedBox::unloadHeavyPart() {
+}
+
+QImage GenerateManagedBotImage(not_null<UserData*> user) {
+	auto centerColor = QColor();
+	auto edgeColor = QColor();
+	if (const auto collectible = user->emojiStatusId().collectible) {
+		centerColor = collectible->centerColor;
+		edgeColor = collectible->edgeColor;
+	} else if (const auto color
+		= user->session().api().peerColors().colorProfileFor(user)) {
+		if (color->bg.size() > 1) {
+			centerColor = color->bg[1];
+			edgeColor = color->bg[0];
+		}
+	}
+	if (!centerColor.isValid()) {
+		const auto colorIndex = Ui::EmptyUserpic::ColorIndex(
+			user->id.value);
+		const auto colors = Ui::EmptyUserpic::UserpicColor(colorIndex);
+		centerColor = colors.color1->c;
+		edgeColor = colors.color2->c;
+	}
+
+	const auto size = QSize(
+		st::managedBotImageWidth,
+		st::managedBotImageHeight);
+	auto image = Ui::CreateTopBgGradient(
+		size,
+		centerColor,
+		edgeColor,
+		false);
+	if (image.isNull()) {
+		return image;
+	}
+
+	auto p = QPainter(&image);
+	auto hq = PainterHighQualityEnabler(p);
+
+	auto iconColor = edgeColor.toHsv();
+	iconColor.setHsv(
+		iconColor.hsvHue(),
+		iconColor.hsvSaturation(),
+		std::max(iconColor.value() - 64, 0));
+	iconColor = iconColor.toRgb();
+	const auto width = size.width();
+	const auto height = size.height();
+	const auto &icon = st::menuIconBot;
+	const auto &points = Ui::PatternBgPoints();
+	for (const auto &point : points) {
+		const auto cx = point.position.x() * width;
+		const auto cy = point.position.y() * height;
+		p.save();
+		p.setOpacity(point.opacity);
+		if (point.scale < 1.) {
+			p.translate(cx, cy);
+			p.scale(point.scale, point.scale);
+			p.translate(-cx, -cy);
+		}
+		const auto x = int(cx) - icon.width() / 2;
+		const auto y = int(cy) - icon.height() / 2;
+		icon.paint(p, x, y, width, iconColor);
+		p.restore();
+	}
+
+	const auto ratio = style::DevicePixelRatio();
+	const auto iheight = st::managedBotCodeIcon.height();
+	const auto scale = (size.height() * ratio * 100) / iheight;
+	auto iconImage = st::managedBotCodeIcon.instance(Qt::white, scale, true);
+	iconImage.setDevicePixelRatio(ratio);
+	const auto iw = iconImage.width() / ratio;
+	const auto ih = iconImage.height() / ratio;
+	p.drawImage(
+		QRect((width - iw) / 2, (height - ih) / 2, iw, ih),
+		iconImage);
+
+	p.end();
+	return image;
 }
 
 } // namespace
@@ -235,22 +708,63 @@ HistoryItem *AboutView::item() const {
 	return nullptr;
 }
 
+bool AboutView::aboveHistory() const {
+	if (!_history->peer->isBot() || !_history->isForum()) {
+		return true;
+	}
+	const auto info = _history->peer->asUser()->botInfo.get();
+	return !(info->userCreatesTopics
+		&& info->startToken.isEmpty()
+		&& (!_history->isEmpty() || _history->lastMessage()));
+}
+
 bool AboutView::refresh() {
+	if (_history->peer->isVerifyCodes()) {
+		if (_item) {
+			return false;
+		}
+		setItem(makeAboutVerifyCodes(), nullptr);
+		return true;
+	}
 	const auto user = _history->peer->asUser();
+	const auto monoforum = _history->peer->isMonoforum()
+		? _history->peer->asChannel()
+		: nullptr;
 	const auto info = user ? user->botInfo.get() : nullptr;
 	if (!info) {
-		if (user && !user->isSelf() && _history->isDisplayedEmpty()) {
+		if (user
+			&& !user->isContact()
+			&& !user->phoneCountryCode().isEmpty()) {
+			if (_item && !_commonGroupsStale) {
+				return false;
+			}
+			loadCommonGroups();
+			setItem(makeNewPeerInfo(user), nullptr);
+			return true;
+		} else if (user && !user->isSelf() && _history->isDisplayedEmpty()) {
 			if (_item) {
 				return false;
-			} else if (user->meRequiresPremiumToWrite()
+			} else if (user->requiresPremiumToWrite()
 				&& !user->session().premium()) {
 				setItem(makePremiumRequired(), nullptr);
 			} else if (user->isBlocked()) {
 				setItem(makeBlocked(), nullptr);
+			} else if (user->businessDetails().intro) {
+				makeIntro(user);
+			} else if (const auto stars = user->starsPerMessageChecked()) {
+				setItem(makeStarsPerMessage(stars), nullptr);
 			} else {
 				makeIntro(user);
 			}
 			return true;
+		} else if (monoforum && _history->isDisplayedEmpty()) {
+			if (_item) {
+				return false;
+			}
+			setItem(
+				makeStarsPerMessage(monoforum->starsPerMessageChecked()),
+				nullptr);
+			return true;
 		}
 		if (_item) {
 			setItem({}, nullptr);
@@ -258,12 +772,46 @@ bool AboutView::refresh() {
 		}
 		_version = 0;
 		return false;
+	} else if (_history->peer->isForum()
+			&& info->userCreatesTopics
+			&& info->startToken.isEmpty()
+			&& (!_history->isEmpty() || _history->lastMessage())) {
+		if (_item) {
+			return false;
+		}
+		setItem(makeNewBotThread(), nullptr);
+		return true;
+	} else if (user->botManagerId()
+			&& info
+			&& info->description.isEmpty()
+			&& info->canEditInformation
+			&& _history->isEmpty()
+			&& !_history->lastMessage()) {
+		if (_item) {
+			return false;
+		}
+		setItem(makeManagedBotInfo(user), nullptr);
+		_history->session().data().newItemAdded(
+		) | rpl::on_next([=](not_null<HistoryItem*> item) {
+			if (item->history() == _history) {
+				_destroyRequests.fire({});
+			}
+		}, lifetime());
+		return true;
 	}
 	const auto version = info->descriptionVersion;
 	if (_version == version) {
 		return false;
 	}
 	_version = version;
+	if (_history->peer->isBot() && _history->peer->isForum()) {
+		_history->session().data().newItemAdded(
+		) | rpl::on_next([=](not_null<HistoryItem*> item) {
+			if (item->history() == _history) {
+				_destroyRequests.fire({});
+			}
+		}, lifetime());
+	}
 	setItem(makeAboutBot(info), nullptr);
 	return true;
 }
@@ -285,7 +833,7 @@ void AboutView::make(Data::ChatIntro data, bool preview) {
 			| MessageFlag::FakeHistoryItem
 			| MessageFlag::Local),
 		.from = _history->peer->id,
-	}, PreparedServiceText{ { text }});
+	}, PreparedServiceText{ { text } });
 
 	if (data.sticker) {
 		_helloChosen = nullptr;
@@ -309,12 +857,21 @@ void AboutView::make(Data::ChatIntro data, bool preview) {
 			}
 		}
 	};
+	const auto sendIntroSticker = [=](not_null<DocumentData*> sticker) {
+		_sendIntroSticker.fire_copy(sticker);
+	};
+	owned->data()->setCustomServiceLink(
+		std::make_shared<LambdaClickHandler>(handler));
 	owned->overrideMedia(std::make_unique<HistoryView::MediaGeneric>(
 		owned.get(),
-		GenerateChatIntro(owned.get(), _item.get(), data, helloChosen),
+		GenerateChatIntro(
+			owned.get(),
+			_item.get(),
+			data,
+			helloChosen,
+			sendIntroSticker),
 		HistoryView::MediaGenericDescriptor{
 			.maxWidth = st::chatIntroWidth,
-			.serviceLink = std::make_shared<LambdaClickHandler>(handler),
 			.service = true,
 			.hideServiceText = preview || text.isEmpty(),
 		}));
@@ -324,6 +881,22 @@ void AboutView::make(Data::ChatIntro data, bool preview) {
 	setItem(std::move(owned), data.sticker);
 }
 
+rpl::producer<not_null<DocumentData*>> AboutView::sendIntroSticker() const {
+	return _sendIntroSticker.events();
+}
+
+rpl::producer<> AboutView::refreshRequests() const {
+	return _refreshRequests.events();
+}
+
+rpl::producer<> AboutView::destroyRequests() const {
+	return _destroyRequests.events();
+}
+
+rpl::lifetime &AboutView::lifetime() {
+	return _lifetime;
+}
+
 void AboutView::toggleStickerRegistered(bool registered) {
 	if (const auto item = _item ? _item->data().get() : nullptr) {
 		if (_sticker) {
@@ -340,6 +913,75 @@ void AboutView::toggleStickerRegistered(bool registered) {
 	}
 }
 
+void AboutView::loadCommonGroups() {
+	if (_commonGroupsRequested) {
+		return;
+	}
+	_commonGroupsRequested = true;
+
+	const auto user = _history->peer->asUser();
+	if (!user) {
+		return;
+	}
+
+	struct Cached {
+		std::vector<not_null<PeerData*>> list;
+	};
+	struct Session {
+		base::flat_map<not_null<UserData*>, Cached> data;
+	};
+	static auto Map = base::flat_map<not_null<Main::Session*>, Session>();
+	const auto session = &_history->session();
+	auto i = Map.find(session);
+	if (i == end(Map)) {
+		i = Map.emplace(session).first;
+		session->lifetime().add([session] {
+			Map.remove(session);
+		});
+	}
+	auto &cached = i->second.data[user];
+
+	const auto count = user->commonChatsCount();
+	if (!count) {
+		cached = {};
+		return;
+	} else while (cached.list.size() > count) {
+		cached.list.pop_back();
+	}
+	_commonGroups = cached.list;
+	const auto requestId = _history->session().api().request(
+		MTPmessages_GetCommonChats(
+			user->inputUser(),
+			MTP_long(0),
+			MTP_int(kMaxCommonChatsUserpics))
+	).done([=](const MTPmessages_Chats &result) {
+		const auto chats = result.match([](const auto &data) {
+			return &data.vchats().v;
+		});
+		auto &owner = user->session().data();
+		auto list = std::vector<not_null<PeerData*>>();
+		list.reserve(chats->size());
+		for (const auto &chat : *chats) {
+			if (const auto peer = owner.processChat(chat)) {
+				list.push_back(peer);
+				if (list.size() == kMaxCommonChatsUserpics) {
+					break;
+				}
+			}
+		}
+		if (_commonGroups != list) {
+			Map[session].data[user].list = list;
+			_commonGroups = std::move(list);
+			_commonGroupsStale = true;
+			_refreshRequests.fire({});
+		}
+	}).send();
+
+	_lifetime.add([=] {
+		_history->session().api().request(requestId).cancel();
+	});
+}
+
 void AboutView::setHelloChosen(not_null<DocumentData*> sticker) {
 	_helloChosen = sticker;
 	toggleStickerRegistered(false);
@@ -354,10 +996,48 @@ void AboutView::setItem(AdminLog::OwnedItem item, DocumentData *sticker) {
 	toggleStickerRegistered(true);
 }
 
+AdminLog::OwnedItem AboutView::makeNewPeerInfo(not_null<UserData*> user) {
+	_commonGroupsStale = false;
+
+	const auto text = user->name();
+	const auto item = _history->makeMessage({
+		.id = _history->nextNonHistoryEntryId(),
+		.flags = (MessageFlag::FakeAboutView
+			| MessageFlag::FakeHistoryItem
+			| MessageFlag::Local),
+		.from = _history->peer->id,
+	}, PreparedServiceText{ { text } });
+
+	auto owned = AdminLog::OwnedItem(_delegate, item);
+	owned->overrideMedia(std::make_unique<HistoryView::MediaGeneric>(
+		owned.get(),
+		GenerateNewPeerInfo(owned.get(), _item.get(), user, _commonGroups),
+		HistoryView::MediaGenericDescriptor{
+			.maxWidth = st::newPeerWidth,
+			.service = true,
+			.hideServiceText = true,
+		}));
+	return owned;
+}
+
+AdminLog::OwnedItem AboutView::makeAboutVerifyCodes() {
+	return makeAboutSimple(
+		tr::lng_verification_codes_about(tr::now, tr::rich));
+}
+
 AdminLog::OwnedItem AboutView::makeAboutBot(not_null<BotInfo*> info) {
-	const auto textWithEntities = TextUtilities::ParseEntities(
-		info->description,
-		Ui::ItemTextBotNoMonoOptions().flags);
+	return makeAboutSimple(
+		TextUtilities::ParseEntities(
+			info->description,
+			Ui::ItemTextBotNoMonoOptions().flags),
+		info->document,
+		info->photo);
+}
+
+AdminLog::OwnedItem AboutView::makeAboutSimple(
+		TextWithEntities textWithEntities,
+		DocumentData *document,
+		PhotoData *photo) {
 	const auto make = [&](auto &&...args) {
 		return _history->makeMessage({
 			.id = _history->nextNonHistoryEntryId(),
@@ -367,10 +1047,10 @@ AdminLog::OwnedItem AboutView::makeAboutBot(not_null<BotInfo*> info) {
 			.from = _history->peer->id,
 		}, std::forward<decltype(args)>(args)...);
 	};
-	const auto item = info->document
-		? make(info->document, textWithEntities)
-		: info->photo
-		? make(info->photo, textWithEntities)
+	const auto item = document
+		? make(document, textWithEntities)
+		: photo
+		? make(photo, textWithEntities)
 		: make(textWithEntities, MTP_messageMediaEmpty());
 	return AdminLog::OwnedItem(_delegate, item);
 }
@@ -385,13 +1065,59 @@ AdminLog::OwnedItem AboutView::makePremiumRequired() {
 	}, PreparedServiceText{ tr::lng_send_non_premium_text(
 		tr::now,
 		lt_user,
-		Ui::Text::Bold(_history->peer->shortName()),
-		Ui::Text::RichLangValue),
+		tr::bold(_history->peer->shortName()),
+		tr::rich),
+	});
+	auto result = AdminLog::OwnedItem(_delegate, item);
+	result->overrideMedia(std::make_unique<ServiceBox>(
+		result.get(),
+		std::make_unique<EmptyChatLockedBox>(
+			result.get(),
+			EmptyChatLockedBox::Type::PremiumRequired)));
+	return result;
+}
+
+AdminLog::OwnedItem AboutView::makeStarsPerMessage(int stars) {
+	auto name = tr::bold(_history->peer->shortName());
+	auto cost = Ui::Text::IconEmoji(
+		&st::starIconEmoji
+	).append(tr::bold(Lang::FormatCountDecimal(stars)));
+	const auto item = _history->makeMessage({
+		.id = _history->nextNonHistoryEntryId(),
+		.flags = (MessageFlag::FakeAboutView
+			| MessageFlag::FakeHistoryItem
+			| MessageFlag::Local),
+		.from = _history->peer->id,
+	}, PreparedServiceText{ !_history->peer->isMonoforum()
+		? tr::lng_send_charges_stars_text(
+			tr::now,
+			lt_user,
+			std::move(name),
+			lt_amount,
+			std::move(cost),
+			tr::rich)
+		: stars
+		? tr::lng_send_charges_stars_channel(
+			tr::now,
+			lt_channel,
+			std::move(name),
+			lt_amount,
+			std::move(cost),
+			tr::rich)
+		: tr::lng_send_free_channel(
+			tr::now,
+			lt_channel,
+			std::move(name),
+			tr::rich),
 	});
 	auto result = AdminLog::OwnedItem(_delegate, item);
 	result->overrideMedia(std::make_unique<ServiceBox>(
 		result.get(),
-		std::make_unique<PremiumRequiredBox>(result.get())));
+		std::make_unique<EmptyChatLockedBox>(
+			result.get(),
+			(stars
+				? EmptyChatLockedBox::Type::StarsCharged
+				: EmptyChatLockedBox::Type::FreeDirect))));
 	return result;
 }
 
@@ -408,4 +1134,63 @@ AdminLog::OwnedItem AboutView::makeBlocked() {
 	return AdminLog::OwnedItem(_delegate, item);
 }
 
+AdminLog::OwnedItem AboutView::makeNewBotThread() {
+	const auto item = _history->makeMessage({
+		.id = _history->nextNonHistoryEntryId(),
+		.flags = (MessageFlag::FakeAboutView
+			| MessageFlag::FakeHistoryItem
+			| MessageFlag::Local),
+		.from = _history->peer->id,
+	}, PreparedServiceText{
+		tr::lng_bot_new_thread_about(tr::now, tr::rich)
+	});
+	auto result = AdminLog::OwnedItem(_delegate, item);
+	result->overrideMedia(std::make_unique<MediaGeneric>(
+		result.get(),
+		GenerateNewBotThread(result.get(), _item.get()),
+		HistoryView::MediaGenericDescriptor{
+			.maxWidth = st::newThreadAboutMaxWidth,
+			.service = true,
+			.hideServiceText = true,
+		}));
+	return result;
+}
+
+AdminLog::OwnedItem AboutView::makeManagedBotInfo(
+		not_null<UserData*> user) {
+	const auto image = GenerateManagedBotImage(user);
+	const auto photoImage = image.isNull()
+		? ImageWithLocation()
+		: Images::FromImageInMemory(image, "PNG");
+	const auto photo = _history->session().data().photo(
+		base::RandomValue<PhotoId>(),
+		uint64(0),
+		QByteArray(),
+		base::unixtime::now(),
+		0,
+		false,
+		QByteArray(),
+		ImageWithLocation{},
+		photoImage,
+		photoImage,
+		ImageWithLocation{},
+		ImageWithLocation{},
+		crl::time(0));
+
+	const auto managerId = user->botManagerId();
+	const auto managerUser = user->owner().userLoaded(managerId);
+	const auto parentName = managerUser
+		? managerUser->name()
+		: QString();
+	auto text = tr::lng_managed_bot_ready(
+		tr::now,
+		lt_name,
+		tr::bold(user->name()),
+		lt_parent,
+		tr::bold(parentName),
+		tr::rich);
+
+	return makeAboutSimple(text, nullptr, photo);
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.h b/Telegram/SourceFiles/history/view/history_view_about_view.h
index 0f4d90491ecbd7..e9fed1829a3a39 100644
--- a/Telegram/SourceFiles/history/view/history_view_about_view.h
+++ b/Telegram/SourceFiles/history/view/history_view_about_view.h
@@ -25,30 +25,60 @@ class AboutView final : public ClickHandlerHost {
 	[[nodiscard]] not_null<History*> history() const;
 	[[nodiscard]] Element *view() const;
 	[[nodiscard]] HistoryItem *item() const;
+	[[nodiscard]] bool aboveHistory() const;
 
 	bool refresh();
 
 	void make(Data::ChatIntro data, bool preview = false);
 
+	[[nodiscard]] auto sendIntroSticker() const
+		-> rpl::producer<not_null<DocumentData*>>;
+	[[nodiscard]] rpl::producer<> refreshRequests() const;
+	[[nodiscard]] rpl::producer<> destroyRequests() const;
+	[[nodiscard]] rpl::lifetime &lifetime();
+
 	int top = 0;
 	int height = 0;
 
 private:
+	[[nodiscard]] AdminLog::OwnedItem makeAboutVerifyCodes();
 	[[nodiscard]] AdminLog::OwnedItem makeAboutBot(not_null<BotInfo*> info);
+	[[nodiscard]] AdminLog::OwnedItem makeAboutSimple(
+		TextWithEntities textWithEntities,
+		DocumentData *document = nullptr,
+		PhotoData *photo = nullptr);
 	[[nodiscard]] AdminLog::OwnedItem makePremiumRequired();
+	[[nodiscard]] AdminLog::OwnedItem makeStarsPerMessage(int stars);
+	[[nodiscard]] AdminLog::OwnedItem makeNewPeerInfo(
+		not_null<UserData*> user);
 	[[nodiscard]] AdminLog::OwnedItem makeBlocked();
+	[[nodiscard]] AdminLog::OwnedItem makeNewBotThread();
+	[[nodiscard]] AdminLog::OwnedItem makeManagedBotInfo(
+		not_null<UserData*> user);
 	void makeIntro(not_null<UserData*> user);
 	void setItem(AdminLog::OwnedItem item, DocumentData *sticker);
 	void setHelloChosen(not_null<DocumentData*> sticker);
 	void toggleStickerRegistered(bool registered);
 
+	void loadCommonGroups();
+
 	const not_null<History*> _history;
 	const not_null<ElementDelegate*> _delegate;
 	AdminLog::OwnedItem _item;
+
 	DocumentData *_helloChosen = nullptr;
 	DocumentData *_sticker = nullptr;
 	int _version = 0;
 
+	rpl::event_stream<not_null<DocumentData*>> _sendIntroSticker;
+
+	bool _commonGroupsStale = false;
+	bool _commonGroupsRequested = false;
+	std::vector<not_null<PeerData*>> _commonGroups;
+	rpl::event_stream<> _refreshRequests;
+	rpl::event_stream<> _destroyRequests;
+	rpl::lifetime _lifetime;
+
 };
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_add_poll_option.cpp b/Telegram/SourceFiles/history/view/history_view_add_poll_option.cpp
new file mode 100644
index 00000000000000..376665efb1cf38
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_add_poll_option.cpp
@@ -0,0 +1,552 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_add_poll_option.h"
+
+#include "history/view/history_view_element.h"
+#include "history/view/history_view_element_overlay.h"
+#include "history/view/controls/history_view_webpage_processor.h"
+#include "history/view/media/history_view_media.h"
+#include "history/view/media/menu/history_view_poll_menu.h"
+#include "api/api_polls.h"
+#include "apiwrap.h"
+#include "base/event_filter.h"
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "core/file_utilities.h"
+#include "core/ui_integration.h"
+#include "data/data_peer.h"
+#include "data/data_poll.h"
+#include "data/data_user.h"
+#include "data/data_session.h"
+#include "data/data_web_page.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "poll/poll_link_box.h"
+#include "poll/poll_link_thumbnail.h"
+#include "poll/poll_media_upload.h"
+#include "ui/chat/attach/attach_prepare.h"
+#include "ui/dynamic_thumbnails.h"
+#include "ui/chat/chat_style.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "window/section_widget.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_polls.h"
+
+namespace HistoryView {
+namespace {
+
+class AddPollOptionWidget final : public Ui::RpWidget {
+public:
+	AddPollOptionWidget(
+		not_null<QWidget*> parent,
+		not_null<PollData*> poll,
+		FullMsgId itemId,
+		not_null<Window::SessionController*> controller);
+
+	void setPlaceholderColorOverride(const style::color &color);
+	void setIconColorOverride(QColor color);
+	void updatePosition(QPoint topLeft, int width);
+	void triggerSubmit();
+
+	[[nodiscard]] rpl::producer<> submitted() const;
+	[[nodiscard]] rpl::producer<> cancelled() const;
+
+private:
+	void setupField();
+	void setupEmojiPanel();
+	void setupAttach();
+	void showStickerPanel();
+	void subscribeToPollUpdates();
+	void chooseLink();
+	void resolveLink(QString url);
+	void applyResolvedWebPage(not_null<WebPageData*> page);
+	void subscribeToWebPageUpdates(not_null<WebPageData*> page);
+	void clearMedia();
+	[[nodiscard]] static QString mapErrorToText(const QString &error);
+
+	const not_null<PollData*> _poll;
+	const FullMsgId _itemId;
+	const not_null<Window::SessionController*> _controller;
+	const not_null<Main::Session*> _session;
+
+	Ui::InputField *_field = nullptr;
+	Ui::IconButton *_emoji = nullptr;
+	PollMediaUpload::PollMediaButton *_attach = nullptr;
+	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
+	base::unique_qptr<ChatHelpers::TabbedPanel> _stickerPanel;
+	base::unique_qptr<Ui::PopupMenu> _mediaMenu;
+	std::unique_ptr<PollMediaUpload::PollMediaUploader> _uploader;
+	std::shared_ptr<PollMediaUpload::PollMediaState> _mediaState;
+	std::shared_ptr<HistoryView::Controls::WebpageResolver> _webpageResolver;
+	rpl::lifetime _webpageLifetime;
+
+	rpl::event_stream<> _submittedEvents;
+	rpl::event_stream<> _cancelledEvents;
+
+};
+
+AddPollOptionWidget::AddPollOptionWidget(
+	not_null<QWidget*> parent,
+	not_null<PollData*> poll,
+	FullMsgId itemId,
+	not_null<Window::SessionController*> controller)
+: RpWidget(parent)
+, _poll(poll)
+, _itemId(itemId)
+, _controller(controller)
+, _session(&controller->session())
+, _mediaState(std::make_shared<PollMediaUpload::PollMediaState>())
+, _webpageResolver(
+	std::make_shared<HistoryView::Controls::WebpageResolver>(_session)) {
+	const auto item = _session->data().message(_itemId);
+	const auto peer = item ? item->history()->peer.get() : nullptr;
+	if (peer) {
+		_uploader = std::make_unique<PollMediaUpload::PollMediaUploader>(
+			PollMediaUpload::PollMediaUploader::Args{
+				.session = _session,
+				.peer = peer,
+				.showError = [=](const QString &text) {
+					Ui::Toast::Show(parentWidget(), text);
+				},
+			});
+	}
+	setupField();
+	setupEmojiPanel();
+	setupAttach();
+	subscribeToPollUpdates();
+}
+
+void AddPollOptionWidget::setupField() {
+	_field = Ui::CreateChild<Ui::InputField>(
+		this,
+		st::historyPollAddOptionField,
+		Ui::InputField::Mode::NoNewlines,
+		tr::lng_polls_add_option_placeholder());
+
+	_emoji = Ui::CreateChild<Ui::IconButton>(
+		this,
+		st::historyPollAddOptionEmoji);
+
+	_attach = Ui::CreateChild<PollMediaUpload::PollMediaButton>(
+		this,
+		st::historyPollAddOptionAttach,
+		_mediaState);
+
+	_field->setMaxLength(100);
+	_field->setCustomTextContext(Core::TextContext({
+		.session = _session,
+	}));
+
+	const auto field = _field;
+	const auto emoji = _emoji;
+	const auto attach = _attach;
+	sizeValue(
+	) | rpl::on_next([field, emoji, attach](QSize size) {
+		field->setGeometry(0, 0, size.width(), size.height());
+		const auto bsize = st::historyPollAddOptionButtonSize;
+		const auto by = (size.height() - bsize) / 2;
+		emoji->moveToLeft(st::historyPollAddOptionEmojiLeft, by);
+		attach->moveToRight(0, by, size.width());
+	}, _field->lifetime());
+
+	_field->submits(
+	) | rpl::on_next([=] {
+		triggerSubmit();
+	}, _field->lifetime());
+
+	base::install_event_filter(_field, [=](not_null<QEvent*> event) {
+		if (event->type() == QEvent::KeyPress) {
+			if (static_cast<QKeyEvent*>(event.get())->key() == Qt::Key_Escape) {
+				if (_emojiPanel && !_emojiPanel->isHidden()) {
+					_emojiPanel->hideAnimated();
+				} else {
+					_cancelledEvents.fire({});
+				}
+				return base::EventFilterResult::Cancel;
+			}
+		}
+		return base::EventFilterResult::Continue;
+	});
+
+	_field->setFocusFast();
+}
+
+void AddPollOptionWidget::setupEmojiPanel() {
+	using Selector = ChatHelpers::TabbedSelector;
+
+	const auto parent = parentWidget();
+	_emojiPanel = base::make_unique_q<ChatHelpers::TabbedPanel>(
+		parent,
+		_controller,
+		object_ptr<Selector>(
+			nullptr,
+			_controller->uiShow(),
+			Window::GifPauseReason::Layer,
+			Selector::Mode::EmojiOnly));
+
+	const auto panel = _emojiPanel.get();
+	panel->setDesiredHeightValues(
+		1.,
+		st::emojiPanMinHeight / 2,
+		st::emojiPanMinHeight);
+	panel->hide();
+	panel->selector()->setCurrentPeer(_session->user().get());
+
+	_emoji->installEventFilter(panel);
+	_emoji->addClickHandler([=] {
+		const auto button = QRect(
+			_emoji->mapTo(parent, QPoint()),
+			_emoji->size());
+		const auto isDropDown = button.y() < parent->height() / 2;
+		panel->setDropDown(isDropDown);
+		if (isDropDown) {
+			panel->moveTopRight(
+				button.y() + button.height(),
+				button.x() + button.width());
+		} else {
+			panel->moveBottomRight(
+				button.y(),
+				button.x() + button.width());
+		}
+		panel->toggleAnimated();
+	});
+
+	panel->selector()->emojiChosen(
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
+		Ui::InsertEmojiAtCursor(_field->textCursor(), data.emoji);
+	}, panel->lifetime());
+
+	panel->selector()->customEmojiChosen(
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+		Data::InsertCustomEmoji(_field, data.document);
+	}, panel->lifetime());
+}
+
+void AddPollOptionWidget::setupAttach() {
+	if (!_uploader) {
+		return;
+	}
+	_attach->addClickHandler([=] {
+		if (ShowPollMediaPreview(_controller, _mediaState, {
+			.choosePhotoOrVideo = [=] {
+				_uploader->choosePhotoOrVideo(this, _mediaState);
+			},
+			.chooseDocument = [=] {
+				_uploader->chooseDocument(this, _mediaState);
+			},
+			.chooseSticker = [=] { showStickerPanel(); },
+			.editPhoto = [=](Ui::PreparedList list) {
+				_uploader->applyPreparedPhotoList(
+					_mediaState,
+					std::move(list));
+			},
+			.remove = [=] { clearMedia(); },
+		})) {
+			return;
+		}
+		_mediaMenu = base::make_unique_q<Ui::PopupMenu>(
+			_attach,
+			st::popupMenuWithIcons);
+		_mediaMenu->setForcedOrigin(
+			Ui::PanelAnimation::Origin::TopRight);
+		_mediaMenu->addAction(
+			tr::lng_attach_photo_or_video(tr::now),
+			[=] { _uploader->choosePhotoOrVideo(this, _mediaState); },
+			&st::menuIconPhoto);
+		_mediaMenu->addAction(
+			tr::lng_attach_file(tr::now),
+			[=] { _uploader->chooseDocument(this, _mediaState); },
+			&st::menuIconFile);
+		_mediaMenu->addAction(
+			tr::lng_chat_intro_choose_sticker(tr::now),
+			[=] { showStickerPanel(); },
+			&st::menuIconStickers);
+		_mediaMenu->addAction(
+			tr::lng_polls_create_option_link(tr::now),
+			[=] { chooseLink(); },
+			&st::menuIconLink);
+		_mediaMenu->popup(QCursor::pos());
+	});
+	_uploader->installDropToField(_field, _mediaState, false);
+}
+
+void AddPollOptionWidget::chooseLink() {
+	const auto initial = _mediaState->media.url;
+	const auto callback = crl::guard(this, [=](QString url) {
+		auto pollMedia = PollMedia();
+		pollMedia.url = url;
+		_uploader->setMedia(
+			_mediaState,
+			pollMedia,
+			Poll::MakeLinkThumbnail(),
+			false);
+		resolveLink(url);
+	});
+	const auto box = _controller->show(Box(
+		Poll::AddPollOptionLinkBox,
+		initial,
+		callback));
+	if (const auto raw = box.get()) {
+		raw->boxClosing(
+		) | rpl::on_next(crl::guard(this, [this] {
+			_field->setFocus();
+		}), raw->lifetime());
+	}
+}
+
+void AddPollOptionWidget::applyResolvedWebPage(
+		not_null<WebPageData*> page) {
+	auto pollMedia = PollMedia();
+	pollMedia.webpage = page;
+	pollMedia.url = page->url.isEmpty()
+		? _mediaState->media.url
+		: page->url;
+	auto thumb = page->photo
+		? Ui::MakePhotoThumbnailCenterCrop(page->photo, FullMsgId())
+		: Poll::MakeLinkThumbnail();
+	const auto rounded = (page->photo != nullptr);
+	_uploader->setMedia(_mediaState, pollMedia, std::move(thumb), rounded);
+}
+
+void AddPollOptionWidget::subscribeToWebPageUpdates(
+		not_null<WebPageData*> page) {
+	_session->data().webPageUpdates(
+	) | rpl::filter([=](not_null<WebPageData*> updated) {
+		return (updated == page) && (_mediaState->media.webpage == page);
+	}) | rpl::on_next([=] {
+		applyResolvedWebPage(page);
+	}, _webpageLifetime);
+}
+
+void AddPollOptionWidget::resolveLink(QString url) {
+	_webpageLifetime.destroy();
+	const auto token = _mediaState->token;
+	const auto apply = [=](const QString &resolvedUrl) {
+		if (_mediaState->token != token || resolvedUrl != url) {
+			return;
+		}
+		const auto cached = _webpageResolver->lookup(url);
+		if (!cached || !*cached) {
+			return;
+		}
+		const auto page = *cached;
+		applyResolvedWebPage(page);
+		subscribeToWebPageUpdates(page);
+	};
+	if (const auto cached = _webpageResolver->lookup(url)) {
+		if (*cached) {
+			applyResolvedWebPage(*cached);
+			subscribeToWebPageUpdates(*cached);
+		}
+		return;
+	}
+	_webpageResolver->resolved(
+	) | rpl::filter([=](const QString &resolvedUrl) {
+		return (resolvedUrl == url) && (_mediaState->token == token);
+	}) | rpl::take(1) | rpl::on_next(apply, _webpageLifetime);
+	_webpageResolver->request(url);
+}
+
+void AddPollOptionWidget::clearMedia() {
+	_webpageLifetime.destroy();
+	_uploader->clearMedia(_mediaState);
+}
+
+void AddPollOptionWidget::showStickerPanel() {
+	const auto parent = parentWidget();
+	if (!_stickerPanel) {
+		_stickerPanel = CreatePollStickerPanel(parent, _controller);
+		_stickerPanel->selector()->fileChosen(
+		) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+			if (Window::ShowSendPremiumError(
+					_controller,
+					data.document)) {
+				return;
+			}
+			_uploader->setMedia(
+				_mediaState,
+				PollMedia{ .document = data.document },
+				Ui::MakeEmojiThumbnail(
+					&_session->data(),
+					Data::SerializeCustomEmojiId(data.document)),
+				false);
+			_stickerPanel->hideAnimated();
+		}, _stickerPanel->lifetime());
+	}
+	const auto panel = _stickerPanel.get();
+	const auto button = QRect(
+		_attach->mapTo(parent, QPoint()),
+		_attach->size());
+	const auto isDropDown = button.y() < parent->height() / 2;
+	panel->setDropDown(isDropDown);
+	if (isDropDown) {
+		panel->moveTopRight(
+			button.y() + button.height(),
+			button.x() + button.width());
+	} else {
+		panel->moveBottomRight(
+			button.y(),
+			button.x() + button.width());
+	}
+	panel->toggleAnimated();
+}
+
+void AddPollOptionWidget::subscribeToPollUpdates() {
+	_session->data().pollUpdates(
+	) | rpl::filter([=](not_null<PollData*> poll) {
+		return (poll == _poll);
+	}) | rpl::on_next([=](not_null<PollData*> poll) {
+		if (poll->closed()
+			|| (int(poll->answers.size())
+				>= _session->appConfig().pollOptionsLimit())) {
+			_cancelledEvents.fire({});
+		}
+	}, lifetime());
+
+	_session->data().itemRemoved(
+	) | rpl::filter([=](not_null<const HistoryItem*> item) {
+		return (item->fullId() == _itemId);
+	}) | rpl::on_next([=] {
+		_cancelledEvents.fire({});
+	}, lifetime());
+}
+
+void AddPollOptionWidget::triggerSubmit() {
+	const auto textWithTags = _field->getTextWithAppliedMarkdown();
+	auto fullText = TextWithEntities{
+		textWithTags.text,
+		TextUtilities::ConvertTextTagsToEntities(textWithTags.tags),
+	};
+	TextUtilities::Trim(fullText);
+	if (fullText.text.isEmpty()) {
+		return;
+	}
+	if (int(_poll->answers.size())
+		>= _session->appConfig().pollOptionsLimit()) {
+		Ui::Toast::Show(
+			parentWidget(),
+			tr::lng_polls_max_options_reached(tr::now));
+		return;
+	}
+
+	_field->setEnabled(false);
+
+	const auto media = _mediaState ? _mediaState->media : PollMedia();
+	_session->api().polls().addAnswer(
+		_itemId,
+		fullText,
+		media,
+		[=] { _submittedEvents.fire({}); },
+		[=](QString error) {
+			_field->setEnabled(true);
+			Ui::Toast::Show(
+				parentWidget(),
+				mapErrorToText(error));
+		});
+}
+
+QString AddPollOptionWidget::mapErrorToText(const QString &error) {
+	if (error == u"POLL_ANSWERS_TOO_MUCH"_q) {
+		return tr::lng_polls_max_options_reached(tr::now);
+	} else if (error == u"POLL_ANSWER_DUPLICATE"_q) {
+		return tr::lng_polls_add_option_duplicate(tr::now);
+	} else if (error.startsWith(u"POLL"_q) && error.contains(u"CLOSE"_q)) {
+		return tr::lng_polls_add_option_closed(tr::now);
+	}
+	return tr::lng_polls_add_option_error(tr::now);
+}
+
+void AddPollOptionWidget::updatePosition(QPoint topLeft, int w) {
+	setGeometry(
+		topLeft.x(),
+		topLeft.y() + st::historyPollAddOptionTop,
+		w,
+		st::historyPollAddOptionField.heightMin);
+}
+
+rpl::producer<> AddPollOptionWidget::submitted() const {
+	return _submittedEvents.events();
+}
+
+rpl::producer<> AddPollOptionWidget::cancelled() const {
+	return _cancelledEvents.events();
+}
+
+void AddPollOptionWidget::setPlaceholderColorOverride(
+		const style::color &color) {
+	_field->setPlaceholderColorOverride(color);
+}
+
+void AddPollOptionWidget::setIconColorOverride(QColor color) {
+	_emoji->setIconColorOverride(color);
+	_attach->setIconColorOverride(color);
+	_attach->setRippleColorOverride(anim::with_alpha(color, 0.15));
+}
+
+} // namespace
+
+void ShowAddPollOptionOverlay(
+		ElementOverlayHost &host,
+		not_null<QWidget*> parent,
+		not_null<Element*> view,
+		not_null<PollData*> poll,
+		FullMsgId context,
+		not_null<Window::SessionController*> controller,
+		not_null<const Ui::ChatStyle*> st) {
+	auto widget = base::make_unique_q<AddPollOptionWidget>(
+		parent,
+		poll,
+		context,
+		controller);
+	const auto raw = widget.get();
+	const auto &msgSt = st->messageStyle(view->hasOutLayout(), false);
+	raw->setPlaceholderColorOverride(msgSt.msgDateFg);
+	raw->setIconColorOverride(msgSt.msgDateFg->c);
+	host.show(
+		view,
+		context,
+		std::move(widget),
+		rpl::merge(raw->submitted(), raw->cancelled()),
+		[raw](not_null<Element*> v, int top) {
+			const auto media = v->media();
+			if (!media) {
+				return false;
+			}
+			const auto mediaPos = v->mediaTopLeft();
+			const auto innerWidth = v->innerGeometry().width()
+				- st::msgPadding.left()
+				- st::msgPadding.right();
+			const auto rect = media->addOptionRect(innerWidth);
+			raw->updatePosition(
+				QPoint(
+					mediaPos.x() + rect.x(),
+					top + mediaPos.y() + rect.y()),
+				rect.width());
+			return true;
+		},
+		[](not_null<Element*> v, bool active) {
+			if (const auto media = v->media()) {
+				media->setAddOptionActive(active);
+			}
+		},
+		[raw] { raw->triggerSubmit(); });
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_add_poll_option.h b/Telegram/SourceFiles/history/view/history_view_add_poll_option.h
new file mode 100644
index 00000000000000..41796a9577ce43
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_add_poll_option.h
@@ -0,0 +1,34 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+struct PollData;
+
+namespace Ui {
+class ChatStyle;
+} // namespace Ui
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace HistoryView {
+
+class Element;
+class ElementOverlayHost;
+
+void ShowAddPollOptionOverlay(
+	ElementOverlayHost &host,
+	not_null<QWidget*> parent,
+	not_null<Element*> view,
+	not_null<PollData*> poll,
+	FullMsgId context,
+	not_null<Window::SessionController*> controller,
+	not_null<const Ui::ChatStyle*> st);
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
index 6784c7ecaf84f8..12101bf4c8547e 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
@@ -10,15 +10,20 @@ For license and copyright information please follow this link:
 #include "ui/chat/message_bubble.h"
 #include "ui/chat/chat_style.h"
 #include "ui/effects/reaction_fly_animation.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
 #include "ui/painter.h"
+#include "core/ui_integration.h"
 #include "lang/lang_keys.h"
 #include "history/history_item_components.h"
 #include "history/history_item.h"
 #include "history/history.h"
+#include "history/view/media/history_view_media.h"
 #include "history/view/history_view_message.h"
 #include "history/view/history_view_cursor_state.h"
+#include "base/unixtime.h"
 #include "chat_helpers/emoji_interactions.h"
 #include "core/click_handler_types.h"
 #include "main/main_session.h"
@@ -28,9 +33,57 @@ For license and copyright information please follow this link:
 #include "data/data_message_reactions.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
+#include "styles/style_credits.h"
 #include "styles/style_dialogs.h"
 
 namespace HistoryView {
+namespace {
+
+[[nodiscard]] QString SchedulePeriodText(TimeId period) {
+	struct Entry {
+		TimeId period = 0;
+		QString text;
+	};
+	const auto map = std::vector<Entry>{
+		{ 60, u"minutely"_q },
+		{ 300, u"5-minutely"_q },
+		{ 24 * 60 * 60, tr::lng_repeated_daily(tr::now) },
+		{ 7 * 24 * 60 * 60, tr::lng_repeated_weekly(tr::now) },
+		{ 14 * 24 * 60 * 60, tr::lng_repeated_biweekly(tr::now) },
+		{ 30 * 24 * 60 * 60, tr::lng_repeated_monthly(tr::now) },
+		{
+			91 * 24 * 60 * 60,
+			tr::lng_repeated_every_month(tr::now, lt_count, 3)
+		},
+		{
+			182 * 24 * 60 * 60,
+			tr::lng_repeated_every_month(tr::now, lt_count, 6)
+		},
+		{ 365 * 24 * 60 * 60, tr::lng_repeated_yearly(tr::now) },
+	};
+	for (const auto &entry : map) {
+		if (entry.period >= period) {
+			return entry.text;
+		}
+	}
+	return map.back().text;
+}
+
+[[nodiscard]] QString FormatEditedDate(QDateTime sent, QDateTime edited) {
+	const auto today = QDateTime::currentDateTime().date();
+	const auto time = QLocale().toString(edited.time(), QLocale::ShortFormat);
+	if (sent.date() == today && edited.date() == today) {
+		return tr::lng_edited_at(tr::now, lt_time, time);
+	}
+	return tr::lng_edited_on(
+		tr::now,
+		lt_date,
+		langDayOfMonthShort(edited.date()),
+		lt_time,
+		time);
+}
+
+} // namespace
 
 struct BottomInfo::Effect {
 	mutable std::unique_ptr<Ui::ReactionFlyAnimation> animation;
@@ -99,10 +152,12 @@ int BottomInfo::firstLineWidth() const {
 
 bool BottomInfo::isWide() const {
 	return (_data.flags & Data::Flag::Edited)
+		|| _data.scheduleRepeatPeriod
 		|| !_data.author.isEmpty()
 		|| !_views.isEmpty()
 		|| !_replies.isEmpty()
-		|| _effect;
+		|| _effect
+		|| _data.tonStake;
 }
 
 TextState BottomInfo::textState(
@@ -195,7 +250,7 @@ ClickHandlerPtr BottomInfo::replayEffectLink(
 	const auto weak = base::make_weak(view);
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
 		const auto my = context.other.value<ClickHandlerContext>();
-		if (const auto controller = my.sessionWindow.get()) {
+		if ([[maybe_unused]] const auto controller = my.sessionWindow.get()) {
 			if (const auto strong = weak.get()) {
 				strong->delegate()->elementStartEffect(strong, nullptr);
 			}
@@ -247,6 +302,18 @@ void BottomInfo::paint(
 		authorEditedWidth,
 		outerWidth);
 
+	if (_data.flags & Data::Flag::Silent) {
+		const auto &icon = inverted
+			? st->historySilentInvertedIcon()
+			: stm->historySilentIcon;
+		right -= st::historySilentWidth;
+		icon.paint(
+			p,
+			right,
+			firstLineBottom + st::historySilentTop,
+			outerWidth);
+	}
+
 	if (_data.flags & Data::Flag::Pinned) {
 		const auto &icon = inverted
 			? st->historyPinInvertedIcon()
@@ -405,14 +472,24 @@ void BottomInfo::layout() {
 }
 
 void BottomInfo::layoutDateText() {
-	const auto edited = (_data.flags & Data::Flag::Edited)
+	const auto editedPrimary = (_data.flags & Data::Flag::EditedPrimary)
+		&& !(_data.flags & Data::Flag::ForwardedDate);
+	const auto edited = editedPrimary
+		? QString()
+		: (_data.flags & Data::Flag::Edited)
 		? (tr::lng_edited(tr::now) + ' ')
+		: (_data.flags & Data::Flag::EstimateDate)
+		? (tr::lng_approximate(tr::now) + ' ')
+		: _data.scheduleRepeatPeriod
+		? (SchedulePeriodText(_data.scheduleRepeatPeriod) + ' ')
 		: QString();
 	const auto author = _data.author;
 	const auto prefix = !author.isEmpty() ? u", "_q : QString();
-	const auto date = edited + QLocale().toString(
-		_data.date.time(),
-		QLocale::ShortFormat);
+	const auto date = editedPrimary
+		? FormatEditedDate(_data.date, _data.editedDate)
+		: edited + ((_data.flags & Data::Flag::ForwardedDate)
+		? Ui::FormatDateTimeSavedFrom(_data.date)
+		: QLocale().toString(_data.date.time(), QLocale::ShortFormat));
 	const auto afterAuthor = prefix + date;
 	const auto afterAuthorWidth = st::msgDateFont->width(afterAuthor);
 	const auto authorWidth = st::msgDateFont->width(author);
@@ -429,10 +506,33 @@ void BottomInfo::layoutDateText() {
 		: name.isEmpty()
 		? date
 		: (name + afterAuthor);
-	_authorEditedDate.setText(
+	auto helper = Ui::Text::CustomEmojiHelper(
+		Core::TextContext({ .session = &_reactionsOwner->session() }));
+	auto marked = TextWithEntities();
+	if (const auto count = _data.stars) {
+		marked.append(
+			Ui::Text::IconEmoji(&st::starIconEmojiSmall)
+		).append(Lang::FormatCountToShort(count).string).append(u", "_q);
+	}
+	if (const auto stake = _data.tonStake) {
+		marked.append(
+			QString::number(stake / 1e9)
+		).append(helper.image({
+			.image = Ui::Emoji::SinglePixmap(
+				Ui::Emoji::Find(QString::fromUtf8("\xf0\x9f\x92\x8e")),
+				Ui::Emoji::GetSizeNormal()).toImage().scaledToHeight(
+					st::stakeIconEmojiSize * style::DevicePixelRatio(),
+					Qt::SmoothTransformation),
+			.margin = QMargins(0, st::stakeIconEmojiTop, 0, 0),
+			.textColor = false,
+		})).append("  ");
+	}
+	marked.append(full);
+	_authorEditedDate.setMarkedText(
 		st::msgDateTextStyle,
-		full,
-		Ui::NameTextOptions());
+		marked,
+		Ui::NameTextOptions(),
+		helper.context());
 }
 
 void BottomInfo::layoutViewsText() {
@@ -491,6 +591,9 @@ QSize BottomInfo::countOptimalSize() {
 	if (_data.flags & Data::Flag::Pinned) {
 		width += st::historyPinWidth;
 	}
+	if (_data.flags & Data::Flag::Silent) {
+		width += st::historySilentWidth;
+	}
 	_effectMaxWidth = countEffectMaxWidth();
 	width += _effectMaxWidth;
 	const auto dateHeight = (_data.flags & Data::Flag::Sponsored)
@@ -505,19 +608,6 @@ BottomInfo::Effect BottomInfo::prepareEffectWithId(EffectId id) {
 	return result;
 }
 
-void BottomInfo::animateEffect(
-		Ui::ReactionFlyAnimationArgs &&args,
-		Fn<void()> repaint) {
-	if (!_effect || args.id.custom() != _effect->id) {
-		return;
-	}
-	_effect->animation = std::make_unique<Ui::ReactionFlyAnimation>(
-		_reactionsOwner,
-		args.translated(QPoint(width(), height())),
-		std::move(repaint),
-		st::effectInfoImage);
-}
-
 auto BottomInfo::takeEffectAnimation()
 -> std::unique_ptr<Ui::ReactionFlyAnimation> {
 	return _effect ? std::move(_effect->animation) : nullptr;
@@ -580,8 +670,12 @@ BottomInfo::Data BottomInfoDataFromMessage(not_null<Message*> message) {
 			}
 		}
 	}
-	if (message->displayedEditDate()) {
+	if (const auto editedDate = message->displayedEditDate()) {
 		result.flags |= Flag::Edited;
+		if (item->history()->session().messagePrimaryEditedDate()) {
+			result.flags |= Flag::EditedPrimary;
+			result.editedDate = base::unixtime::parse(editedDate);
+		}
 	}
 	if (const auto views = item->Get<HistoryMessageViews>()) {
 		if (views->views.count >= 0) {
@@ -597,10 +691,48 @@ BottomInfo::Data BottomInfoDataFromMessage(not_null<Message*> message) {
 	if (item->isSending() || item->hasFailed()) {
 		result.flags |= Flag::Sending;
 	}
+	if (!item->history()->peer->isUser()) {
+		const auto mine = PaidInformation{
+			.messages = 1,
+			.stars = item->starsPaid(),
+		};
+		const auto media = message->media();
+		auto info = media ? media->paidInformation().value_or(mine) : mine;
+		if (const auto total = info.stars) {
+			result.stars = total;
+		}
+	}
+	if (const auto media = item->media()) {
+		if (const auto outcome = media->diceGameOutcome()) {
+			result.tonStake = outcome.stakeNanoTon;
+		}
+	}
 	const auto forwarded = item->Get<HistoryMessageForwarded>();
 	if (forwarded && forwarded->imported) {
 		result.flags |= Flag::Imported;
 	}
+	if (item->awaitingVideoProcessing()) {
+		result.flags |= Flag::EstimateDate;
+	}
+	if (item->isScheduled()) {
+		result.scheduleRepeatPeriod = item->scheduleRepeatPeriod();
+		if (item->isSilent()) {
+			result.flags |= Flag::Silent;
+		}
+	}
+	if (!forwarded) {
+		return result;
+	}
+	if (forwarded->savedFromMsgId && forwarded->savedFromDate) {
+		result.date = base::unixtime::parse(forwarded->savedFromDate);
+		result.flags |= Flag::ForwardedDate;
+	} else if (forwarded->originalDate
+		&& (message->context() == Context::SavedSublist
+			|| item->history()->peer->isSelf())
+		&& !item->externalReply()) {
+		result.date = base::unixtime::parse(forwarded->originalDate);
+		result.flags |= Flag::ForwardedDate;
+	}
 	// We don't want to pass and update it in Data for now.
 	//if (item->unread()) {
 	//	result.flags |= Flag::Unread;
diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.h b/Telegram/SourceFiles/history/view/history_view_bottom_info.h
index 594a488f1394a3..ff7f68ed19be0e 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.h
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.h
@@ -32,23 +32,31 @@ struct TextState;
 class BottomInfo final : public Object {
 public:
 	struct Data {
-		enum class Flag : uchar {
-			Edited         = 0x01,
-			OutLayout      = 0x02,
-			Sending        = 0x04,
-			RepliesContext = 0x08,
-			Sponsored      = 0x10,
-			Pinned         = 0x20,
-			Imported       = 0x40,
-			Shortcut       = 0x80,
+		enum class Flag : uint16 {
+			Edited         = 0x001,
+			OutLayout      = 0x002,
+			Sending        = 0x004,
+			RepliesContext = 0x008,
+			Sponsored      = 0x010,
+			Pinned         = 0x020,
+			Imported       = 0x040,
+			Shortcut       = 0x080,
+			EstimateDate   = 0x100,
+			ForwardedDate  = 0x200,
+			Silent         = 0x400,
+			EditedPrimary  = 0x800,
 			//Unread, // We don't want to pass and update it in Date for now.
 		};
 		friend inline constexpr bool is_flag_type(Flag) { return true; };
 		using Flags = base::flags<Flag>;
 
 		QDateTime date;
+		QDateTime editedDate;
 		QString author;
 		EffectId effectId = 0;
+		int64 tonStake = 0;
+		int stars = 0;
+		TimeId scheduleRepeatPeriod = 0;
 		std::optional<int> views;
 		std::optional<int> replies;
 		std::optional<int> forwardsCount;
@@ -74,9 +82,6 @@ class BottomInfo final : public Object {
 		bool inverted,
 		const PaintContext &context) const;
 
-	void animateEffect(
-		Ui::ReactionFlyAnimationArgs &&args,
-		Fn<void()> repaint);
 	[[nodiscard]] auto takeEffectAnimation()
 		-> std::unique_ptr<Ui::ReactionFlyAnimation>;
 	void continueEffectAnimation(
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 4747ce6096f88e..64314bb7497ae1 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -16,6 +16,7 @@ For license and copyright information please follow this link:
 #include "data/data_peer.h"
 #include "data/data_peer_values.h"
 #include "data/data_replies_list.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_thread.h"
 #include "history/view/reactions/history_view_reactions_button.h"
@@ -24,6 +25,7 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_components.h"
+#include "info/profile/info_profile_badge.h"
 #include "info/profile/info_profile_cover.h"
 #include "info/profile/info_profile_values.h"
 #include "lang/lang_keys.h"
@@ -38,11 +40,13 @@ For license and copyright information please follow this link:
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/shadow.h"
 #include "ui/ui_utility.h"
+#include "ui/unread_badge.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_settings.h"
 
 #ifdef Q_OS_WIN
 #include "ui/platform/win/ui_windows_direct_manipulation.h"
@@ -56,7 +60,7 @@ class Item final
 	, private ListDelegate
 	, private CornerButtonsDelegate {
 public:
-	Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread);
+	Item(not_null<Ui::Menu::Menu*> parent, not_null<Data::Thread*> thread);
 
 	[[nodiscard]] not_null<QAction*> action() const override;
 	[[nodiscard]] bool isEnabled() const override;
@@ -95,7 +99,8 @@ class Item final
 	void listMarkContentsRead(
 		const base::flat_set<not_null<HistoryItem*>> &items) override;
 	MessagesBarData listMessagesBar(
-		const std::vector<not_null<Element*>> &elements) override;
+		const std::vector<not_null<Element*>> &elements,
+		bool markLastAsRead) override;
 	void listContentRefreshed() override;
 	void listUpdateDateLink(
 		ClickHandlerPtr &link,
@@ -161,6 +166,8 @@ class Item final
 	bool listShowReactPremiumError(
 		not_null<HistoryItem*> item,
 		const Data::ReactionId &id) override;
+	base::unique_qptr<Ui::PopupMenu> listFillSenderUserpicMenu(
+		PeerId userpicPeerId) override;
 	void listWindowSetInnerFocus() override;
 	bool listAllowsDragForward() override;
 	void listLaunchDrag(
@@ -181,6 +188,7 @@ class Item final
 	const not_null<Main::Session*> _session;
 	const not_null<Data::Thread*> _thread;
 	const std::shared_ptr<Data::RepliesList> _replies;
+	Data::SavedSublist * const _sublist = nullptr;
 	const not_null<History*> _history;
 	const not_null<PeerData*> _peer;
 	const std::shared_ptr<Ui::ChatTheme> _theme;
@@ -189,6 +197,8 @@ class Item final
 	const std::unique_ptr<Ui::ElasticScroll> _scroll;
 	const std::unique_ptr<Ui::FlatButton> _markRead;
 
+	Info::Profile::Badge _badge;
+
 	QPointer<ListWidget> _inner;
 	std::unique_ptr<CornerButtons> _cornerButtons;
 	rpl::event_stream<ChatPreviewAction> _actions;
@@ -244,15 +254,34 @@ struct StatusFields {
 		}
 		Unexpected("Peer type in ChatPreview Item.");
 	});
+}
 
+[[nodiscard]] rpl::producer<Info::Profile::Badge::Content> ContentForPeer(
+		not_null<PeerData*> peer) {
+	using namespace Info::Profile;
+	if (peer->isSelf()
+		|| peer->isRepliesChat()
+		|| peer->isSavedHiddenAuthor()) {
+		return rpl::single(Badge::Content{});
+	}
+	return rpl::combine(
+		BadgeContentForPeer(peer),
+		VerifiedContentForPeer(peer)
+	) | rpl::map([](Badge::Content &&content, Badge::Content &&verified) {
+		if (verified.badge == BadgeType::Verified) {
+			content.badge = BadgeType::Verified;
+		}
+		return content;
+	});
 }
 
-Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
+Item::Item(not_null<Ui::Menu::Menu*> parent, not_null<Data::Thread*> thread)
 : Ui::Menu::ItemBase(parent, st::previewMenu.menu)
 , _dummyAction(new QAction(parent))
 , _session(&thread->session())
 , _thread(thread)
 , _replies(thread->asTopic() ? thread->asTopic()->replies() : nullptr)
+, _sublist(thread->asSublist())
 , _history(thread->owningHistory())
 , _peer(thread->peer())
 , _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
@@ -263,7 +292,15 @@ Item::Item(not_null<Ui::RpWidget*> parent, not_null<Data::Thread*> thread)
 	std::make_unique<Ui::FlatButton>(
 		this,
 		tr::lng_context_mark_read(tr::now),
-		st::previewMarkRead)) {
+		st::previewMarkRead))
+, _badge(
+		_top.get(),
+		st::settingsInfoPeerBadge,
+		_session,
+		ContentForPeer(_peer),
+		nullptr,
+		nullptr,
+		1) {
 	_chatStyle->apply(_theme.get());
 	setPointerCursor(false);
 	setMinWidth(st::previewMenu.menu.widthMin);
@@ -291,7 +328,7 @@ void Item::setupTop() {
 	_top->setClickedCallback([=] {
 		_actions.fire({ .openInfo = true });
 	});
-	_top->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_top->paintRequest() | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(_top.get());
 		p.fillRect(clip, st::topBarBg);
 	}, _top->lifetime());
@@ -321,13 +358,13 @@ void Item::setupTop() {
 		: Ui::CreateChild<Ui::FlatLabel>(
 			_top.get(),
 			(topic
-				? Info::Profile::NameValue(topic->channel())
+				? Info::Profile::NameValue(topic->peer())
 				: std::move(statusText)),
 			st::previewStatus);
 	if (status) {
 		std::move(
 			statusFields
-		) | rpl::start_with_next([=](const StatusFields &fields) {
+		) | rpl::on_next([=](const StatusFields &fields) {
 			status->setTextColorOverride(fields.active
 				? st::windowActiveTextFg->c
 				: std::optional<QColor>());
@@ -338,8 +375,9 @@ void Item::setupTop() {
 		? nullptr
 		: Ui::CreateChild<Ui::UserpicButton>(
 			_top.get(),
-			_thread->peer(),
-			st::previewUserpic);
+			_thread->peer()->userpicPaintingPeer(),
+			st::previewUserpic,
+			_thread->peer()->userpicShape());
 	if (userpic) {
 		userpic->showSavedMessagesOnSelf(true);
 		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -357,12 +395,14 @@ void Item::setupTop() {
 	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
 	rpl::combine(
 		_top->widthValue(),
-		std::move(nameValue)
-	) | rpl::start_with_next([=](int width, const auto &) {
+		std::move(nameValue),
+		rpl::single(rpl::empty) | rpl::then(_badge.updated())
+	) | rpl::on_next([=](int width, const auto &, const auto &) {
 		const auto &st = st::previewTop;
 		name->resizeToNaturalWidth(width
 			- st.namePosition.x()
-			- st.photoPosition.x());
+			- st.photoPosition.x()
+			- (_badge.widget() ? _badge.widget()->width() : 0));
 		if (status) {
 			name->move(st::previewTop.namePosition);
 		} else {
@@ -370,9 +410,13 @@ void Item::setupTop() {
 				st::previewTop.namePosition.x(),
 				(st::previewTop.height - name->height()) / 2);
 		}
+		_badge.move(
+			name->x() + name->width() + st::normalFont->spacew,
+			name->y(),
+			name->y() + name->height());
 	}, name->lifetime());
 
-	_top->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	_top->geometryValue() | rpl::on_next([=](QRect geometry) {
 		const auto &st = st::previewTop;
 		if (status) {
 			status->resizeToWidth(geometry.width()
@@ -404,12 +448,13 @@ void Item::setupMarkRead() {
 	) | rpl::then(
 		_thread->owner().chatsListFor(_thread)->unreadStateChanges(
 		) | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto state = _thread->chatListBadgesState();
 		const auto unread = (state.unreadCounter || state.unread);
-		const auto hidden = _thread->asTopic()
+		const auto hidden = (_thread->asTopic() || _thread->asSublist())
 			? (!unread)
-			: _thread->peer()->isForum();
+			: (_thread->peer()->isForum()
+				|| _thread->peer()->amMonoforumAdmin());
 		if (hidden) {
 			_markRead->hide();
 			return;
@@ -424,7 +469,7 @@ void Item::setupMarkRead() {
 	}, _markRead->lifetime());
 
 	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
-	_markRead->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	_markRead->geometryValue() | rpl::on_next([=](QRect geometry) {
 		shadow->setGeometry(
 			geometry.x(),
 			geometry.y() - st::lineWidth,
@@ -449,7 +494,7 @@ void Item::setupBackground() {
 			QRect(QPoint(), size()));
 	};
 	paint();
-	_theme->repaintBackgroundRequests() | rpl::start_with_next([=] {
+	_theme->repaintBackgroundRequests() | rpl::on_next([=] {
 		paint();
 		update();
 	}, lifetime());
@@ -465,7 +510,7 @@ void Item::setupHistory() {
 		_chatStyle.get(),
 		static_cast<CornerButtonsDelegate*>(this));
 
-	_markRead->shownValue() | rpl::start_with_next([=](bool shown) {
+	_markRead->shownValue() | rpl::on_next([=](bool shown) {
 		const auto top = _top->height();
 		const auto bottom = shown ? _markRead->height() : 0;
 		_scroll->setGeometry(rect().marginsRemoved({ 0, top, 0, bottom }));
@@ -473,7 +518,7 @@ void Item::setupHistory() {
 	}, _markRead->lifetime());
 
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateInnerVisibleArea();
 	}, lifetime());
 	_scroll->setOverscrollBg(QColor(0, 0, 0, 0));
@@ -481,11 +526,11 @@ void Item::setupHistory() {
 	_scroll->setOverscrollTypes(Type::Real, Type::Real);
 
 	_inner->scrollKeyEvents(
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		_scroll->keyPressEvent(e);
 	}, lifetime());
 
-	_scroll->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	_scroll->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonDblClick) {
 			const auto button = static_cast<QMouseEvent*>(e.get())->button();
 			if (button == Qt::LeftButton) {
@@ -556,6 +601,8 @@ rpl::producer<Data::MessagesSlice> Item::listSource(
 		int limitAfter) {
 	return _replies
 		? _replies->source(aroundId, limitBefore, limitAfter)
+		: _sublist
+		? _sublist->source(aroundId, limitBefore, limitAfter)
 		: Data::HistoryMessagesViewer(
 			_thread->asHistory(),
 			aroundId,
@@ -602,35 +649,48 @@ void Item::listMarkContentsRead(
 }
 
 MessagesBarData Item::listMessagesBar(
-		const std::vector<not_null<Element*>> &elements) {
+		const std::vector<not_null<Element*>> &elements,
+		bool markLastAsRead) {
 	if (elements.empty()) {
 		return {};
-	} else if (!_replies && !_history->unreadCount()) {
+	} else if (!_replies && !_sublist && !_history->unreadCount()) {
 		return {};
 	}
 	const auto repliesTill = _replies
 		? _replies->computeInboxReadTillFull()
 		: MsgId();
-	const auto migrated = _replies ? nullptr : _history->migrateFrom();
+	const auto sublistTill = _sublist
+		? _sublist->computeInboxReadTillFull()
+		: MsgId();
+	const auto migrated = (_replies || _sublist)
+		? nullptr
+		: _history->migrateFrom();
 	const auto migratedTill = (migrated && migrated->unreadCount() > 0)
 		? migrated->inboxReadTillId()
 		: 0;
-	const auto historyTill = (_replies || !_history->unreadCount())
+	const auto historyTill = (_replies
+		|| _sublist
+		|| !_history->unreadCount()
+		|| _history->amMonoforumAdmin())
 		? 0
 		: _history->inboxReadTillId();
-	if (!_replies && !migratedTill && !historyTill) {
+	if (!_replies && !_sublist && !migratedTill && !historyTill) {
 		return {};
 	}
 
 	auto skipped = false;
-	const auto hidden = _replies && (repliesTill < 2);
+	const auto hidden = (_replies && (repliesTill < 2))
+		|| (_sublist && (sublistTill < 2));
 	for (auto i = 0, count = int(elements.size()); i != count; ++i) {
 		const auto item = elements[i]->data();
-		if (!item->isRegular() || (_replies && !item->replyToId())) {
+		if (!item->isRegular()
+			|| (_replies && !item->replyToId())
+			|| (_sublist && !item->sublistPeerId())) {
 			continue;
 		}
 		const auto inHistory = (item->history() == _history);
 		const auto unread = (_replies && item->id > repliesTill)
+			|| (_sublist && item->id > sublistTill)
 			|| (migratedTill && (inHistory || item->id > migratedTill))
 			|| (historyTill && inHistory && item->id > historyTill);
 		if (!unread) {
@@ -802,6 +862,11 @@ Ui::ChatPaintContext Item::listPreparePaintContext(
 		Ui::ChatPaintContextArgs &&args) {
 	const auto visibleAreaTopLocal = mapFromGlobal(
 		args.visibleAreaPositionGlobal).y();
+	const auto area = QRect(
+		0,
+		args.visibleAreaTop,
+		args.visibleAreaWidth,
+		args.visibleAreaHeight);
 	const auto viewport = QRect(
 		0,
 		args.visibleAreaTop - visibleAreaTopLocal,
@@ -810,6 +875,7 @@ Ui::ChatPaintContext Item::listPreparePaintContext(
 	return args.theme->preparePaintContext(
 		_chatStyle.get(),
 		viewport,
+		area,
 		args.clip,
 		false);
 }
@@ -828,6 +894,11 @@ bool Item::listShowReactPremiumError(
 	return false;
 }
 
+base::unique_qptr<Ui::PopupMenu> Item::listFillSenderUserpicMenu(
+		PeerId userpicPeerId) {
+	return nullptr;
+}
+
 void Item::listWindowSetInnerFocus() {
 }
 
@@ -897,13 +968,13 @@ ChatPreview MakeChatPreview(
 	};
 	const auto menu = result.menu.get();
 
-	auto action = base::make_unique_q<Item>(menu, thread);
+	auto action = base::make_unique_q<Item>(menu->menu(), thread);
 	result.actions = action->actions();
 	menu->addAction(std::move(action));
 	if (const auto topic = thread->asTopic()) {
-		const auto weak = Ui::MakeWeak(menu);
-		topic->destroyed() | rpl::start_with_next([weak] {
-			if (const auto strong = weak.data()) {
+		const auto weak = base::make_weak(menu);
+		topic->destroyed() | rpl::on_next([weak] {
+			if (const auto strong = weak.get()) {
 				LOG(("Preview hidden for a destroyed topic."));
 				strong->hideMenu(true);
 			}
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
similarity index 50%
rename from Telegram/SourceFiles/history/view/history_view_replies_section.cpp
rename to Telegram/SourceFiles/history/view/history_view_chat_section.cpp
index 1ae6f36c5b69fd..09e5b789aa4f00 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
@@ -5,9 +5,10 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "history/view/history_view_replies_section.h"
+#include "history/view/history_view_chat_section.h"
 
 #include "history/view/controls/history_view_compose_controls.h"
+#include "history/view/controls/history_view_compose_search.h"
 #include "history/view/controls/history_view_draft_options.h"
 #include "history/view/history_view_top_bar_widget.h"
 #include "history/view/history_view_schedule_box.h"
@@ -16,34 +17,42 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_contact_status.h"
 #include "history/view/history_view_scheduled_section.h"
 #include "history/view/history_view_service_message.h"
+#include "history/view/history_view_subsection_tabs.h"
 #include "history/view/history_view_pinned_tracker.h"
 #include "history/view/history_view_pinned_section.h"
 #include "history/view/history_view_translate_bar.h"
 #include "history/view/history_view_translate_tracker.h"
+#include "history/view/history_view_self_forwards_tagger.h"
+#include "history/view/history_view_draw_to_reply.h"
 #include "history/history.h"
 #include "history/history_drag_area.h"
 #include "history/history_item_components.h"
-#include "history/history_item_helpers.h" // GetErrorTextForSending.
-#include "history/history_view_swipe.h"
+#include "history/history_item_helpers.h" // GetErrorForSending.
 #include "ui/chat/pinned_bar.h"
 #include "ui/chat/chat_style.h"
+#include "ui/controls/swipe_handler.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/effects/message_sending_animation_controller.h"
+#include "ui/rect.h"
 #include "ui/ui_utility.h"
 #include "base/timer_rpl.h"
 #include "api/api_bot.h"
+#include "api/api_chat_participants.h"
 #include "api/api_editing.h"
 #include "api/api_sending.h"
 #include "apiwrap.h"
 #include "ui/boxes/confirm_box.h"
+#include "chat_helpers/message_field.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/send_files_box.h"
 #include "boxes/premium_limits_box.h"
+#include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "window/window_peer_menu.h"
 #include "base/call_delayed.h"
@@ -54,7 +63,12 @@ For license and copyright information please follow this link:
 #include "core/mime_type.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "menu/menu_timecode_action.h"
+#include "data/components/recent_inline_bots.h"
 #include "data/components/scheduled_messages.h"
+#include "data/data_histories.h"
+#include "data/data_saved_messages.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_chat.h"
@@ -75,6 +89,7 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_info.h"
 #include "styles/style_window.h"
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
@@ -95,7 +110,7 @@ rpl::producer<Ui::MessageBarContent> RootViewContent(
 	) | rpl::map([=](Ui::MessageBarContent &&content) {
 		const auto item = history->owner().message(history->peer, rootId);
 		if (!item) {
-			content.text = Ui::Text::Link(tr::lng_deleted_message(tr::now));
+			content.text = tr::link(tr::lng_deleted_message(tr::now));
 		}
 		const auto sender = (item && item->discussionPostOriginalSender())
 			? item->discussionPostOriginalSender()
@@ -109,32 +124,32 @@ rpl::producer<Ui::MessageBarContent> RootViewContent(
 
 } // namespace
 
-RepliesMemento::RepliesMemento(
-	not_null<History*> history,
-	MsgId rootId,
+ChatMemento::ChatMemento(
+	ChatViewId id,
 	MsgId highlightId,
-	const TextWithEntities &highlightPart,
-	int highlightPartOffsetHint)
-: _history(history)
-, _rootId(rootId)
-, _highlightPart(highlightPart)
-, _highlightPartOffsetHint(highlightPartOffsetHint)
-, _highlightId(highlightId) {
-	if (highlightId) {
+	MessageHighlightId highlight)
+: _id(id)
+, _highlightId(highlightId)
+, _highlight(std::move(highlight)) {
+	if (highlightId || _id.sublist) {
 		_list.setAroundPosition({
-			.fullId = FullMsgId(_history->peer->id, highlightId),
+			.fullId = FullMsgId(_id.history->peer->id, highlightId),
 			.date = TimeId(0),
 		});
 	}
 }
 
-RepliesMemento::RepliesMemento(
+ChatMemento::ChatMemento(
+	Comments,
 	not_null<HistoryItem*> commentsItem,
 	MsgId commentId)
-: RepliesMemento(commentsItem->history(), commentsItem->id, commentId) {
+: ChatMemento({
+	.history = commentsItem->history(),
+	.repliesRootId = commentsItem->id,
+}, commentId) {
 }
 
-void RepliesMemento::setFromTopic(not_null<Data::ForumTopic*> topic) {
+void ChatMemento::setFromTopic(not_null<Data::ForumTopic*> topic) {
 	_replies = topic->replies();
 	if (!_list.aroundPosition()) {
 		_list = *topic->listMemento();
@@ -142,31 +157,39 @@ void RepliesMemento::setFromTopic(not_null<Data::ForumTopic*> topic) {
 }
 
 
-Data::ForumTopic *RepliesMemento::topicForRemoveRequests() const {
-	return _history->peer->forumTopicFor(_rootId);
+Data::ForumTopic *ChatMemento::topicForRemoveRequests() const {
+	return _id.repliesRootId
+		? _id.history->peer->forumTopicFor(_id.repliesRootId)
+		: nullptr;
 }
 
-void RepliesMemento::setReadInformation(
+Data::SavedSublist *ChatMemento::sublistForRemoveRequests() const {
+	return _id.sublist;
+}
+
+void ChatMemento::setReadInformation(
 		MsgId inboxReadTillId,
 		int unreadCount,
 		MsgId outboxReadTillId) {
-	if (!_replies) {
-		if (const auto forum = _history->asForum()) {
-			if (const auto topic = forum->topicFor(_rootId)) {
+	if (!_id.repliesRootId) {
+		return;
+	} else if (!_replies) {
+		if (const auto forum = _id.history->asForum()) {
+			if (const auto topic = forum->topicFor(_id.repliesRootId)) {
 				_replies = topic->replies();
 			}
 		}
 		if (!_replies) {
 			_replies = std::make_shared<Data::RepliesList>(
-				_history,
-				_rootId);
+				_id.history,
+				_id.repliesRootId);
 		}
 	}
 	_replies->setInboxReadTill(inboxReadTillId, unreadCount);
 	_replies->setOutboxReadTill(outboxReadTillId);
 }
 
-object_ptr<Window::SectionWidget> RepliesMemento::createWidget(
+object_ptr<Window::SectionWidget> ChatMemento::createWidget(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
 		Window::Column column,
@@ -181,43 +204,56 @@ object_ptr<Window::SectionWidget> RepliesMemento::createWidget(
 		_list.setScrollTopState(ListMemento::ScrollTopState{
 			Data::MinMessagePosition
 		});
+	} else if (!_list.aroundPosition().fullId
+		&& _id.sublist
+		&& _id.sublist->computeInboxReadTillFull() == MsgId(1)) {
+		_list.setAroundPosition(Data::MinMessagePosition);
+		_list.setScrollTopState(ListMemento::ScrollTopState{
+			Data::MinMessagePosition
+		});
 	}
-	auto result = object_ptr<RepliesWidget>(
-		parent,
-		controller,
-		_history,
-		_rootId);
+	auto result = object_ptr<ChatWidget>(parent, controller, _id);
 	result->setInternalState(geometry, this);
 	return result;
 }
 
-void RepliesMemento::setupTopicViewer() {
-	_history->owner().itemIdChanged(
-	) | rpl::start_with_next([=](const Data::Session::IdChange &change) {
-		if (_rootId == change.oldId) {
-			_rootId = change.newId.msg;
-			_replies = nullptr;
-		}
-	}, _lifetime);
+void ChatMemento::setupTopicViewer() {
+	if (_id.repliesRootId) {
+		_id.history->owner().itemIdChanged(
+		) | rpl::on_next([=](const Data::Session::IdChange &change) {
+			if (_id.repliesRootId == change.oldId) {
+				_id.repliesRootId = change.newId.msg;
+				_replies = nullptr;
+			}
+		}, _lifetime);
+	}
 }
 
-RepliesWidget::RepliesWidget(
+ChatWidget::ChatWidget(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
-	not_null<History*> history,
-	MsgId rootId)
-: Window::SectionWidget(parent, controller, history->peer)
+	ChatViewId id)
+: Window::SectionWidget(parent, controller, id.history->peer)
 , WindowListDelegate(controller)
-, _history(history)
-, _rootId(rootId)
-, _root(lookupRoot())
+, _history(id.history)
+, _peer(_history->peer)
+, _id(id)
+, _repliesRootId(_id.repliesRootId)
+, _repliesRoot(lookupRepliesRoot())
 , _topic(lookupTopic())
 , _areComments(computeAreComments())
-, _sendAction(history->owner().sendActionManager().repliesPainter(
-	history,
-	rootId))
+, _sublist(_id.sublist)
+, _monoforumPeerId((_sublist && _sublist->parentChat())
+	? _sublist->sublistPeer()->id
+	: PeerId())
+, _sendAction(_repliesRootId
+	? _history->owner().sendActionManager().repliesPainter(
+		_history,
+		_repliesRootId)
+	: nullptr)
 , _topBar(this, controller)
 , _topBarShadow(this)
+, _topBars(std::make_unique<Ui::RpWidget>(this))
 , _composeControls(std::make_unique<ComposeControls>(
 	this,
 	ComposeControlsDescriptor{
@@ -234,10 +270,11 @@ RepliesWidget::RepliesWidget(
 				session().scheduledMessages().updates(_topic->owningHistory())
 			) | rpl::map([=] {
 				return session().scheduledMessages().hasFor(_topic);
-			}) | rpl::type_erased()
+			}) | rpl::type_erased
 			: rpl::single(false),
 	}))
-, _translateBar(std::make_unique<TranslateBar>(this, controller, history))
+, _translateBar(
+	std::make_unique<TranslateBar>(_topBars.get(), controller, _history))
 , _scroll(std::make_unique<Ui::ScrollArea>(
 	this,
 	controller->chatStyle()->value(lifetime(), st::historyScroll),
@@ -247,24 +284,31 @@ RepliesWidget::RepliesWidget(
 		controller->chatStyle(),
 		static_cast<HistoryView::CornerButtonsDelegate*>(this)) {
 	controller->chatStyle()->paletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_scroll->updateBars();
 	}, _scroll->lifetime());
 
 	Window::ChatThemeValueFromPeer(
 		controller,
-		history->peer
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
+		_peer
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
 		_theme = std::move(theme);
 		controller->setChatStyleTheme(_theme);
 	}, lifetime());
 
 	setupRoot();
 	setupRootView();
+	setupOpenChatButton();
+	setupAboutHiddenAuthor();
 	setupShortcuts();
 	setupTranslateBar();
 
-	_history->peer->updateFull();
+	_peer->updateFull();
+	if (const auto channel = _peer->asMegagroup()) {
+		if (!channel->mgInfo->adminsLoaded) {
+			session().api().chatParticipants().requestAdmins(channel);
+		}
+	}
 
 	refreshTopBarActiveChat();
 
@@ -272,29 +316,32 @@ RepliesWidget::RepliesWidget(
 	_topBar->resizeToWidth(width());
 	_topBar->show();
 
-	if (_rootView) {
-		_rootView->move(0, _topBar->height());
+	if (_repliesRootView) {
+		_repliesRootView->move(0, 0);
 	}
 
 	_topBar->deleteSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmDeleteSelected();
 	}, _topBar->lifetime());
 	_topBar->forwardSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmForwardSelected();
 	}, _topBar->lifetime());
 	_topBar->clearSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		clearSelected();
 	}, _topBar->lifetime());
 	_topBar->searchRequest(
-	) | rpl::start_with_next([=] {
-		searchInTopic();
+	) | rpl::on_next([=] {
+		searchRequested();
 	}, _topBar->lifetime());
+	if (_sublist) {
+		_topBar->setCustomTitle(tr::lng_contacts_loading(tr::now));
+	}
 
 	controller->adaptive().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateAdaptiveLayout();
 	}, lifetime());
 
@@ -305,29 +352,31 @@ RepliesWidget::RepliesWidget(
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		onScroll();
 	}, lifetime());
 
 	_inner->editMessageRequested(
 	) | rpl::filter([=] {
 		return !_joinGroup;
-	}) | rpl::start_with_next([=](auto fullId) {
+	}) | rpl::on_next([=](auto fullId) {
 		if (const auto item = session().data().message(fullId)) {
 			const auto media = item->media();
 			if (!media || media->webpage() || media->allowsEditCaption()) {
 				_composeControls->editMessage(
 					fullId,
 					_inner->getSelectedTextRange(item));
+			} else if (media->todolist()) {
+				Window::PeerMenuEditTodoList(controller, item);
 			}
 		}
 	}, _inner->lifetime());
 
 	_inner->replyToMessageRequested(
-	) | rpl::start_with_next([=](ListWidget::ReplyToMessageRequest request) {
+	) | rpl::on_next([=](ListWidget::ReplyToMessageRequest request) {
 		const auto canSendReply = _topic
 			? Data::CanSendAnything(_topic)
-			: Data::CanSendAnything(_history->peer);
+			: Data::CanSendAnything(_peer);
 		const auto &to = request.to;
 		const auto still = _history->owner().message(to.messageId);
 		const auto allowInAnotherChat = still && still->allowsForward();
@@ -337,37 +386,48 @@ RepliesWidget::RepliesWidget(
 		} else if (!_joinGroup && canSendReply) {
 			replyToMessage(to);
 			_composeControls->focus();
+			if (_composeSearch) {
+				_composeSearch->hideAnimated();
+			}
 		}
 	}, _inner->lifetime());
 
 	_inner->showMessageRequested(
-	) | rpl::start_with_next([=](auto fullId) {
+	) | rpl::on_next([=](auto fullId) {
 		if (const auto item = session().data().message(fullId)) {
 			showAtPosition(item->position());
 		}
 	}, _inner->lifetime());
 
+	_inner->setInsertTextCallback([=](const QString &text) {
+		if (const auto field = _composeControls->fieldForMention()) {
+			Menu::InsertTextAtCursor(field, text);
+		}
+	});
+
 	_composeControls->sendActionUpdates(
-	) | rpl::start_with_next([=](ComposeControls::SendActionUpdate &&data) {
-		if (!data.cancel) {
+	) | rpl::on_next([=](ComposeControls::SendActionUpdate &&data) {
+		if (!_repliesRootId) {
+			return;
+		} else if (!data.cancel) {
 			session().sendProgressManager().update(
 				_history,
-				_rootId,
+				_repliesRootId,
 				data.type,
 				data.progress);
 		} else {
 			session().sendProgressManager().cancel(
 				_history,
-				_rootId,
+				_repliesRootId,
 				data.type);
 		}
 	}, lifetime());
 
 	_history->session().changes().messageUpdates(
 		Data::MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
-		if (update.item == _root) {
-			_root = nullptr;
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
+		if (update.item == _repliesRoot) {
+			_repliesRoot = nullptr;
 			updatePinnedVisibility();
 			if (!_topic) {
 				controller->showBackFromStack();
@@ -375,11 +435,13 @@ RepliesWidget::RepliesWidget(
 		}
 	}, lifetime());
 
-	if (!_topic) {
+	if (_sublist) {
+		subscribeToSublist();
+	} else if (!_topic) {
 		_history->session().changes().historyUpdates(
 			_history,
 			Data::HistoryUpdate::Flag::OutboxRead
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_inner->update();
 		}, lifetime());
 	} else {
@@ -387,7 +449,7 @@ RepliesWidget::RepliesWidget(
 		) | rpl::filter([=](const Api::SendAction &action) {
 			return (action.history == _history)
 				&& (action.replyTo.topicRootId == _topic->topicRootId());
-		}) | rpl::start_with_next([=](const Api::SendAction &action) {
+		}) | rpl::on_next([=](const Api::SendAction &action) {
 			if (action.options.scheduled) {
 				_composeControls->cancelReplyMessage();
 				crl::on_main(this, [=, t = _topic] {
@@ -398,9 +460,16 @@ RepliesWidget::RepliesWidget(
 		}, lifetime());
 	}
 
+	_selfForwardsTagger = std::make_unique<HistoryView::SelfForwardsTagger>(
+		controller,
+		this,
+		[=] { return _inner.data(); },
+		_scroll.get(),
+		[=] { return _history; });
+
 	setupTopicViewer();
 	setupComposeControls();
-	setupSwipeReply();
+	setupSwipeReplyAndBack();
 	orderWidgets();
 
 	if (_pinnedBar) {
@@ -408,12 +477,20 @@ RepliesWidget::RepliesWidget(
 	}
 }
 
-RepliesWidget::~RepliesWidget() {
+ChatWidget::~ChatWidget() {
 	base::take(_sendAction);
-	session().api().saveCurrentDraftToCloud();
-	controller()->sendingAnimation().clear();
+	if (_repliesRootId) {
+		controller()->sendingAnimation().clear();
+	}
+	if (_subsectionTabs && !_subsectionTabs->dying()) {
+		_subsectionTabsLifetime.destroy();
+		controller()->saveSubsectionTabs(base::take(_subsectionTabs));
+	}
 	if (_topic) {
 		if (_topic->creating()) {
+			if (controller()->activeChatCurrent().topic() == _topic) {
+				controller()->setActiveChatEntry(Dialogs::Key());
+			}
 			_emptyPainter = nullptr;
 			_topic->discard();
 			_topic = nullptr;
@@ -421,104 +498,111 @@ RepliesWidget::~RepliesWidget() {
 			_inner->saveState(_topic->listMemento());
 		}
 	}
-	_history->owner().sendActionManager().repliesPainterRemoved(
-		_history,
-		_rootId);
+	if (_repliesRootId) {
+		_history->owner().sendActionManager().repliesPainterRemoved(
+			_history,
+			_repliesRootId);
+	}
 }
 
-void RepliesWidget::orderWidgets() {
+void ChatWidget::orderWidgets() {
+	_topBars->raise();
 	_translateBar->raise();
 	if (_topicReopenBar) {
 		_topicReopenBar->bar().raise();
 	}
-	if (_rootView) {
-		_rootView->raise();
+	if (_repliesRootView) {
+		_repliesRootView->raise();
 	}
 	if (_pinnedBar) {
 		_pinnedBar->raise();
 	}
-	if (_topBar) {
-		_topBar->raise();
+	if (_subsectionTabs) {
+		_subsectionTabs->raise();
 	}
+	_topBar->raise();
 	_topBarShadow->raise();
 	_composeControls->raisePanels();
 }
 
-void RepliesWidget::setupRoot() {
-	if (!_root) {
+void ChatWidget::setupRoot() {
+	if (_repliesRootId && !_repliesRoot) {
 		const auto done = crl::guard(this, [=] {
-			_root = lookupRoot();
-			if (_root) {
+			_repliesRoot = lookupRepliesRoot();
+			if (_repliesRoot) {
 				_areComments = computeAreComments();
 				_inner->update();
 			}
 			updatePinnedVisibility();
 		});
 		_history->session().api().requestMessageData(
-			_history->peer,
-			_rootId,
+			_peer,
+			_repliesRootId,
 			done);
 	}
 }
 
-void RepliesWidget::setupRootView() {
-	if (_topic) {
+void ChatWidget::setupRootView() {
+	if (_topic || !_repliesRootId) {
 		return;
 	}
-	_rootView = std::make_unique<Ui::PinnedBar>(this, [=] {
+	_repliesRootView = std::make_unique<Ui::PinnedBar>(_topBars.get(), [=] {
 		return controller()->isGifPausedAtLeastFor(
 			Window::GifPauseReason::Any);
 	}, controller()->gifPauseLevelChanged());
-	_rootView->setContent(rpl::combine(
+	_repliesRootView->setContent(rpl::combine(
 		RootViewContent(
 			_history,
-			_rootId,
-			[bar = _rootView.get()] { bar->customEmojiRepaint(); }),
-		_rootVisible.value()
+			_repliesRootId,
+			[bar = _repliesRootView.get()] { bar->customEmojiRepaint(); }),
+		_repliesRootVisible.value()
 	) | rpl::map([=](Ui::MessageBarContent &&content, bool show) {
 		const auto shown = !content.title.isEmpty() && !content.text.empty();
 		_shownPinnedItem = shown
-			? _history->owner().message(_history->peer->id, _rootId)
+			? _history->owner().message(_peer->id, _repliesRootId)
 			: nullptr;
 		return show ? std::move(content) : Ui::MessageBarContent();
 	}));
 
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=](bool one) {
-		_rootView->setShadowGeometryPostprocess([=](QRect geometry) {
+	) | rpl::on_next([=](bool one) {
+		_repliesRootView->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
 			}
 			return geometry;
 		});
-	}, _rootView->lifetime());
+	}, _repliesRootView->lifetime());
 
-	_rootView->barClicks(
-	) | rpl::start_with_next([=] {
+	_repliesRootView->barClicks(
+	) | rpl::on_next([=] {
 		showAtStart();
 	}, lifetime());
 
-	_rootViewHeight = 0;
-	_rootView->heightValue(
-	) | rpl::start_with_next([=](int height) {
-		if (const auto delta = height - _rootViewHeight) {
-			_rootViewHeight = height;
+	_repliesRootViewHeight = 0;
+	_repliesRootView->heightValue(
+	) | rpl::on_next([=](int height) {
+		if (const auto delta = height - _repliesRootViewHeight) {
+			_repliesRootViewHeight = height;
 			setGeometryWithTopMoved(geometry(), delta);
 		}
-	}, _rootView->lifetime());
+	}, _repliesRootView->lifetime());
 }
 
-void RepliesWidget::setupTopicViewer() {
+void ChatWidget::setupTopicViewer() {
+	if (!_repliesRootId) {
+		return;
+	}
 	const auto owner = &_history->owner();
 	owner->itemIdChanged(
-	) | rpl::start_with_next([=](const Data::Session::IdChange &change) {
-		if (_rootId == change.oldId) {
-			_rootId = change.newId.msg;
-			_composeControls->updateTopicRootId(_rootId);
+	) | rpl::on_next([=](const Data::Session::IdChange &change) {
+		if (_repliesRootId == change.oldId) {
+			_repliesRootId = _id.repliesRootId = change.newId.msg;
+			_composeControls->updateTopicRootId(_repliesRootId);
 			_sendAction = owner->sendActionManager().repliesPainter(
 				_history,
-				_rootId);
-			_root = lookupRoot();
+				_repliesRootId);
+			_repliesRoot = lookupRepliesRoot();
 			if (_topic && _topic->rootId() == change.oldId) {
 				setTopic(_topic->forum()->topicFor(change.newId.msg));
 			} else {
@@ -537,14 +621,16 @@ void RepliesWidget::setupTopicViewer() {
 	}
 }
 
-void RepliesWidget::subscribeToTopic() {
+void ChatWidget::subscribeToTopic() {
 	Expects(_topic != nullptr);
 
-	_topicReopenBar = std::make_unique<TopicReopenBar>(this, _topic);
+	_topicReopenBar = std::make_unique<TopicReopenBar>(
+		_topBars.get(),
+		_topic);
 	_topicReopenBar->bar().setVisible(!animatingShow());
 	_topicReopenBarHeight = _topicReopenBar->bar().height();
 	_topicReopenBar->bar().heightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto height = _topicReopenBar->bar().height();
 		_scrollTopDelta = (height - _topicReopenBarHeight);
 		if (_scrollTopDelta) {
@@ -559,9 +645,13 @@ void RepliesWidget::subscribeToTopic() {
 		_topic,
 		(Flag::UnreadMentions
 			| Flag::UnreadReactions
+			| Flag::UnreadPollVotes
 			| Flag::CloudDraft)
-	) | rpl::start_with_next([=](const Data::TopicUpdate &update) {
-		if (update.flags & (Flag::UnreadMentions | Flag::UnreadReactions)) {
+	) | rpl::on_next([=](const Data::TopicUpdate &update) {
+		if (update.flags
+			& (Flag::UnreadMentions
+				| Flag::UnreadReactions
+				| Flag::UnreadPollVotes)) {
 			_cornerButtons.updateUnreadThingsVisibility();
 		}
 		if (update.flags & Flag::CloudDraft) {
@@ -570,10 +660,8 @@ void RepliesWidget::subscribeToTopic() {
 	}, _topicLifetime);
 
 	_topic->destroyed(
-	) | rpl::start_with_next([=] {
-		controller()->showBackFromStack(Window::SectionShow(
-			anim::type::normal,
-			anim::activation::background));
+	) | rpl::on_next([=] {
+		closeCurrent();
 	}, _topicLifetime);
 
 	if (!_topic->creating()) {
@@ -587,14 +675,26 @@ void RepliesWidget::subscribeToTopic() {
 	_cornerButtons.updateUnreadThingsVisibility();
 }
 
-void RepliesWidget::subscribeToPinnedMessages() {
+void ChatWidget::closeCurrent() {
+	const auto thread = controller()->windowId().chat();
+	if ((_sublist && thread == _sublist) || (_topic && thread == _topic)) {
+		controller()->window().close();
+	} else {
+		controller()->showBackFromStack(Window::SectionShow(
+			anim::type::normal,
+			anim::activation::background));
+	}
+}
+
+void ChatWidget::subscribeToPinnedMessages() {
 	using EntryUpdateFlag = Data::EntryUpdate::Flag;
 	session().changes().entryUpdates(
 		EntryUpdateFlag::HasPinnedMessages
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		if (_pinnedTracker
 			&& (update.flags & EntryUpdateFlag::HasPinnedMessages)
-			&& (_topic == update.entry.get())) {
+			&& (_topic == update.entry.get()
+				|| _sublist == update.entry.get())) {
 			checkPinnedBarState();
 		}
 	}, lifetime());
@@ -602,7 +702,7 @@ void RepliesWidget::subscribeToPinnedMessages() {
 	setupPinnedTracker();
 }
 
-void RepliesWidget::setTopic(Data::ForumTopic *topic) {
+void ChatWidget::setTopic(Data::ForumTopic *topic) {
 	if (_topic == topic) {
 		return;
 	}
@@ -610,11 +710,12 @@ void RepliesWidget::setTopic(Data::ForumTopic *topic) {
 	_topic = topic;
 	refreshReplies();
 	refreshTopBarActiveChat();
+	validateSubsectionTabs();
 	if (_topic) {
-		if (_rootView) {
+		if (_repliesRootView) {
 			_shownPinnedItem = nullptr;
-			_rootView = nullptr;
-			_rootViewHeight = 0;
+			_repliesRootView = nullptr;
+			_repliesRootViewHeight = 0;
 		}
 		subscribeToTopic();
 	}
@@ -625,18 +726,22 @@ void RepliesWidget::setTopic(Data::ForumTopic *topic) {
 	}
 }
 
-HistoryItem *RepliesWidget::lookupRoot() const {
-	return _history->owner().message(_history->peer, _rootId);
+HistoryItem *ChatWidget::lookupRepliesRoot() const {
+	return _repliesRootId
+		? _history->owner().message(_peer, _repliesRootId)
+		: nullptr;
 }
 
-Data::ForumTopic *RepliesWidget::lookupTopic() {
-	if (const auto forum = _history->asForum()) {
-		if (const auto result = forum->topicFor(_rootId)) {
+Data::ForumTopic *ChatWidget::lookupTopic() {
+	if (!_repliesRootId) {
+		return nullptr;
+	} else if (const auto forum = _history->asForum()) {
+		if (const auto result = forum->topicFor(_repliesRootId)) {
 			return result;
 		} else {
-			forum->requestTopic(_rootId, crl::guard(this, [=] {
+			forum->requestTopic(_repliesRootId, crl::guard(this, [=] {
 				if (const auto forum = _history->asForum()) {
-					setTopic(forum->topicFor(_rootId));
+					setTopic(forum->topicFor(_repliesRootId));
 				}
 			}));
 		}
@@ -644,39 +749,51 @@ Data::ForumTopic *RepliesWidget::lookupTopic() {
 	return nullptr;
 }
 
-bool RepliesWidget::computeAreComments() const {
-	return _root && _root->isDiscussionPost();
+bool ChatWidget::computeAreComments() const {
+	return _repliesRoot && _repliesRoot->isDiscussionPost();
 }
 
-void RepliesWidget::setupComposeControls() {
+void ChatWidget::setupComposeControls() {
 	auto topicWriteRestrictions = rpl::single(
 	) | rpl::then(session().changes().topicUpdates(
 		Data::TopicUpdate::Flag::Closed
 	) | rpl::filter([=](const Data::TopicUpdate &update) {
 		return (update.topic->history() == _history)
-			&& (update.topic->rootId() == _rootId);
+			&& (update.topic->rootId() == _repliesRootId);
 	}) | rpl::to_empty) | rpl::map([=] {
 		const auto topic = _topic
 			? _topic
-			: _history->peer->forumTopicFor(_rootId);
+			: _peer->forumTopicFor(_repliesRootId);
 		return (!topic || topic->canToggleClosed() || !topic->closed())
-			? std::optional<QString>()
+			? Data::SendError()
 			: tr::lng_forum_topic_closed(tr::now);
 	});
 	auto writeRestriction = rpl::combine(
+		session().frozenValue(),
 		session().changes().peerFlagsValue(
-			_history->peer,
+			_peer,
 			Data::PeerUpdate::Flag::Rights),
-		Data::CanSendAnythingValue(_history->peer),
-		std::move(topicWriteRestrictions)
-	) | rpl::map([=](auto, auto, std::optional<QString> topicRestriction) {
+		Data::CanSendAnythingValue(_peer),
+		(_repliesRootId
+			? std::move(topicWriteRestrictions)
+			: (rpl::single(Data::SendError()) | rpl::type_erased))
+	) | rpl::map([=](
+			const Main::FreezeInfo &info,
+			auto,
+			auto,
+			Data::SendError topicRestriction) {
+		if (info) {
+			return Controls::WriteRestriction{
+				.type = Controls::WriteRestrictionType::Frozen,
+			};
+		}
 		const auto allWithoutPolls = Data::AllSendRestrictions()
 			& ~ChatRestriction::SendPolls;
 		const auto canSendAnything = _topic
 			? Data::CanSendAnyOf(_topic, allWithoutPolls)
-			: Data::CanSendAnyOf(_history->peer, allWithoutPolls);
+			: Data::CanSendAnyOf(_peer, allWithoutPolls);
 		const auto restriction = Data::RestrictionError(
-			_history->peer,
+			_peer,
 			ChatRestriction::SendOther);
 		auto text = !canSendAnything
 			? (restriction
@@ -686,27 +803,35 @@ void RepliesWidget::setupComposeControls() {
 				: tr::lng_group_not_accessible(tr::now))
 			: topicRestriction
 			? std::move(topicRestriction)
-			: std::optional<QString>();
+			: Data::SendError();
 		return text ? Controls::WriteRestriction{
 			.text = std::move(*text),
 			.type = Controls::WriteRestrictionType::Rights,
+			.boostsToLift = text.boostsToLift,
 		} : Controls::WriteRestriction();
 	});
 
 	_composeControls->setHistory({
 		.history = _history.get(),
-		.topicRootId = _topic ? _topic->rootId() : MsgId(0),
+		.topicRootId = _topic ? _topic->rootId() : MsgId(),
+		.monoforumPeerId = _monoforumPeerId,
 		.showSlowmodeError = [=] { return showSlowmodeError(); },
 		.sendActionFactory = [=] { return prepareSendAction({}); },
-		.slowmodeSecondsLeft = SlowmodeSecondsLeft(_history->peer),
-		.sendDisabledBySlowmode = SendDisabledBySlowmode(_history->peer),
+		.sendWithText = [=](
+				TextWithEntities &&text,
+				Api::SendOptions options,
+				Fn<void()> done) {
+			sendWithTextOverride(std::move(text), options, std::move(done));
+		},
+		.slowmodeSecondsLeft = SlowmodeSecondsLeft(_peer),
+		.sendDisabledBySlowmode = SendDisabledBySlowmode(_peer),
 		.writeRestriction = std::move(writeRestriction),
 	});
 
 	_composeControls->height(
 	) | rpl::filter([=] {
 		return !_joinGroup;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		const auto wasMax = (_scroll->scrollTopMax() == _scroll->scrollTop());
 		updateControlsGeometry();
 		if (wasMax) {
@@ -715,22 +840,27 @@ void RepliesWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		listCancelRequest();
 	}, lifetime());
 
 	_composeControls->sendRequests(
-	) | rpl::start_with_next([=](Api::SendOptions options) {
+	) | rpl::on_next([=](Api::SendOptions options) {
 		send(options);
 	}, lifetime());
 
+	_composeControls->scrollToMaxRequests(
+	) | rpl::on_next([=] {
+		listScrollTo(_scroll->scrollTopMax());
+	}, lifetime());
+
 	_composeControls->sendVoiceRequests(
-	) | rpl::start_with_next([=](ComposeControls::VoiceToSend &&data) {
-		sendVoice(std::move(data));
+	) | rpl::on_next([=](const ComposeControls::VoiceToSend &data) {
+		sendVoice(data);
 	}, lifetime());
 
 	_composeControls->sendCommandRequests(
-	) | rpl::start_with_next([=](const QString &command) {
+	) | rpl::on_next([=](const QString &command) {
 		if (showSlowmodeError()) {
 			return;
 		}
@@ -740,7 +870,7 @@ void RepliesWidget::setupComposeControls() {
 
 	const auto saveEditMsgRequestId = lifetime().make_state<mtpRequestId>(0);
 	_composeControls->editRequests(
-	) | rpl::start_with_next([=](auto data) {
+	) | rpl::on_next([=](auto data) {
 		if (const auto item = session().data().message(data.fullId)) {
 			const auto spoiler = data.spoilered;
 			edit(item, data.options, saveEditMsgRequestId, spoiler);
@@ -750,7 +880,7 @@ void RepliesWidget::setupComposeControls() {
 	_composeControls->attachRequests(
 	) | rpl::filter([=] {
 		return !_choosingAttach;
-	}) | rpl::start_with_next([=](std::optional<bool> overrideCompress) {
+	}) | rpl::on_next([=](std::optional<bool> overrideCompress) {
 		_choosingAttach = true;
 		base::call_delayed(
 			st::historyAttach.ripple.hideDuration,
@@ -758,8 +888,14 @@ void RepliesWidget::setupComposeControls() {
 			[=] { chooseAttach(overrideCompress); });
 	}, lifetime());
 
+	_composeControls->setSendAsFileConfirmed(crl::guard(this, [=](
+			std::shared_ptr<Ui::PreparedBundle> bundle,
+			Api::SendOptions options) {
+		sendingFilesConfirmed(std::move(bundle), options);
+	}));
+
 	_composeControls->fileChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		controller()->hideLayer(anim::type::normal);
 		controller()->sendingAnimation().appendSending(
 			data.messageSendingFrom);
@@ -773,12 +909,12 @@ void RepliesWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->photoChosen(
-	) | rpl::start_with_next([=](ChatHelpers::PhotoChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::PhotoChosen chosen) {
 		sendExistingPhoto(chosen.photo, chosen.options);
 	}, lifetime());
 
 	_composeControls->inlineResultChosen(
-	) | rpl::start_with_next([=](ChatHelpers::InlineChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::InlineChosen chosen) {
 		controller()->sendingAnimation().appendSending(
 			chosen.messageSendingFrom);
 		const auto localId = chosen.messageSendingFrom.localId;
@@ -786,33 +922,28 @@ void RepliesWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->jumpToItemRequests(
-	) | rpl::start_with_next([=](FullReplyTo to) {
+	) | rpl::on_next([=](FullReplyTo to) {
 		if (const auto item = session().data().message(to.messageId)) {
-			JumpToMessageClickHandler(
-				item,
-				{},
-				to.quote,
-				to.quoteOffset
-			)->onClick({});
+			JumpToMessageClickHandler(item, {}, to.highlight())->onClick({});
 		}
 	}, lifetime());
 
 	rpl::merge(
 		_composeControls->scrollKeyEvents(),
 		_inner->scrollKeyEvents()
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		_scroll->keyPressEvent(e);
 	}, lifetime());
 
 	_composeControls->editLastMessageRequests(
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		if (!_inner->lastMessageEditRequestNotify()) {
 			_scroll->keyPressEvent(e);
 		}
 	}, lifetime());
 
 	_composeControls->replyNextRequests(
-	) | rpl::start_with_next([=](ComposeControls::ReplyNextRequest &&data) {
+	) | rpl::on_next([=](ComposeControls::ReplyNextRequest &&data) {
 		using Direction = ComposeControls::ReplyNextRequest::Direction;
 		_inner->replyNextMessage(
 			data.replyId,
@@ -820,7 +951,7 @@ void RepliesWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->showScheduledRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		controller()->showSection(
 			_topic
 				? std::make_shared<HistoryView::ScheduledMemento>(_topic)
@@ -842,25 +973,25 @@ void RepliesWidget::setupComposeControls() {
 	});
 
 	_composeControls->lockShowStarts(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_cornerButtons.updateJumpDownVisibility();
 		_cornerButtons.updateUnreadThingsVisibility();
 	}, lifetime());
 
 	_composeControls->viewportEvents(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		_scroll->viewportEvent(e);
 	}, lifetime());
 
 	_composeControls->finishAnimating();
 
-	if (const auto channel = _history->peer->asChannel()) {
+	if (const auto channel = _peer->asChannel()) {
 		channel->updateFull();
 		if (!channel->isBroadcast()) {
 			rpl::combine(
 				Data::CanSendAnythingValue(channel),
 				channel->flagsValue()
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				refreshJoinGroupButton();
 			}, lifetime());
 		} else {
@@ -869,11 +1000,11 @@ void RepliesWidget::setupComposeControls() {
 	}
 }
 
-void RepliesWidget::setupSwipeReply() {
+void ChatWidget::setupSwipeReplyAndBack() {
 	const auto can = [=](not_null<HistoryItem*> still) {
 		const auto canSendReply = _topic
 			? Data::CanSendAnything(_topic)
-			: Data::CanSendAnything(_history->peer);
+			: Data::CanSendAnything(_peer);
 		const auto allowInAnotherChat = still && still->allowsForward();
 		if (allowInAnotherChat && (_joinGroup || !canSendReply)) {
 			return true;
@@ -882,59 +1013,126 @@ void RepliesWidget::setupSwipeReply() {
 		}
 		return false;
 	};
-	HistoryView::SetupSwipeHandler(_inner, _scroll.get(), [=](
-			HistoryView::ChatPaintGestureHorizontalData data) {
+
+	auto update = [=](Ui::Controls::SwipeContextData data) {
+		if (data.translation > 0) {
+			if (!_swipeBackData.callback) {
+				_swipeBackData = Ui::Controls::SetupSwipeBack(
+					this,
+					[=]() -> std::pair<QColor, QColor> {
+						const auto context = listPreparePaintContext({
+							.theme = listChatTheme(),
+						});
+						return {
+							context.st->msgServiceBg()->c,
+							context.st->msgServiceFg()->c,
+						};
+					});
+			}
+			_swipeBackData.callback(data);
+			return;
+		} else if (_swipeBackData.lifetime) {
+			_swipeBackData = {};
+		}
 		const auto changed = (_gestureHorizontal.msgBareId != data.msgBareId)
 			|| (_gestureHorizontal.translation != data.translation)
 			|| (_gestureHorizontal.reachRatio != data.reachRatio);
 		if (changed) {
 			_gestureHorizontal = data;
-			const auto item = _history->peer->owner().message(
-				_history->peer->id,
+			const auto item = _peer->owner().message(
+				_peer->id,
 				MsgId{ data.msgBareId });
 			if (item) {
 				_history->owner().requestItemRepaint(item);
 			}
 		}
-	}, [=, show = controller()->uiShow()](int cursorTop) {
-		auto result = HistoryView::SwipeHandlerFinishData();
-		if (_inner->elementInSelectionMode().inSelectionMode) {
+	};
+
+	auto init = [=, show = controller()->uiShow()](
+			Ui::Controls::SwipeHandlerInitData data) {
+		auto result = Ui::Controls::SwipeHandlerFinishData();
+		const auto horizontalScrollDelta = (data.direction == Qt::LeftToRight)
+			? 1
+			: -1;
+		if (_inner->canConsumeHorizontalScroll(
+				data.cursorPosition,
+				horizontalScrollDelta)) {
+			return result;
+		}
+		if (data.direction == Qt::RightToLeft) {
+			return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
+				controller()->showBackFromStack();
+			});
+		}
+		if (_inner->elementInSelectionMode(nullptr).inSelectionMode) {
 			return result;
 		}
-		const auto view = _inner->lookupItemByY(cursorTop);
+		const auto view = _inner->lookupItemByY(data.cursorPosition.y());
 		if (!view
 			|| !view->data()->isRegular()
 			|| view->data()->isService()) {
 			return result;
 		}
-		if (!can(view->data())) {
+		const auto item = _inner->lookupItemByPoint(
+			data.cursorPosition,
+			view);
+		if (!can(item)) {
 			return result;
 		}
 
-		result.msgBareId = view->data()->fullId().msg.bare;
-		result.callback = [=, itemId = view->data()->fullId()] {
-			const auto still = show->session().data().message(itemId);
-			const auto view = _inner->viewByPosition(still->position());
-			const auto selected = view->selectedQuote(
-				_inner->getSelectedTextRange(still));
-			const auto replyToItemId = (selected.item
+		_inner->hideElementOverlay();
+		const auto viewItemId = view->data()->fullId();
+		const auto itemId = item->fullId();
+		result.msgBareId = viewItemId.msg.bare;
+		result.callback = [=] {
+			const auto still = show->session().data().message(viewItemId);
+			const auto view = still
+				? _inner->viewByPosition(still->position())
+				: nullptr;
+			const auto selected = (still && view)
+				? view->selectedQuote(_inner->getSelectedTextSelection(still))
+				: SelectedQuote();
+			const auto exact = selected.item
 				? selected.item
-				: still)->fullId();
+				: show->session().data().message(itemId);
+			if (!exact) {
+				return;
+			}
+			Window::ActivateWindow(controller());
 			_inner->replyToMessageRequestNotify({
-				.messageId = replyToItemId,
-				.quote = selected.text,
-				.quoteOffset = selected.offset,
+				.messageId = exact->fullId(),
+				.quote = selected.highlight.quote,
+				.quoteOffset = selected.highlight.quoteOffset,
+				.todoItemId = selected.highlight.todoItemId,
+				.pollOption = selected.highlight.pollOption,
 			});
 		};
 		return result;
-	}, _inner->touchMaybeSelectingValue());
+	};
+
+	Ui::Controls::SetupSwipeHandler({
+		.widget = _inner,
+		.scroll = _scroll.get(),
+		.update = std::move(update),
+		.init = std::move(init),
+		.dontStart = _inner->touchMaybeSelectingValue(),
+		.skipWheelEvent = [=](not_null<QWheelEvent*> event) {
+			const auto delta = Ui::ScrollDelta(event);
+			if (std::abs(delta.x()) <= std::abs(delta.y())) {
+				return false;
+			}
+			return _inner->canConsumeHorizontalScroll(
+				_inner->mapFromGlobal(event->globalPosition().toPoint()),
+				delta.x());
+		},
+	});
 }
 
-void RepliesWidget::chooseAttach(
+void ChatWidget::chooseAttach(
 		std::optional<bool> overrideSendImagesAsPhotos) {
 	_choosingAttach = false;
-	if (const auto error = Data::AnyFileRestrictionError(_history->peer)) {
-		controller()->showToast(*error);
+	if (const auto error = Data::AnyFileRestrictionError(_peer)) {
+		Data::ShowSendErrorToast(controller(), _peer, error);
 		return;
 	} else if (showSlowmodeError()) {
 		return;
@@ -973,7 +1171,7 @@ void RepliesWidget::chooseAttach(
 	}), nullptr);
 }
 
-bool RepliesWidget::confirmSendingFiles(
+bool ChatWidget::confirmSendingFiles(
 		not_null<const QMimeData*> data,
 		std::optional<bool> overrideSendImagesAsPhotos,
 		const QString &insertTextOnCancel) {
@@ -1007,7 +1205,7 @@ bool RepliesWidget::confirmSendingFiles(
 	return false;
 }
 
-bool RepliesWidget::confirmSendingFiles(
+bool ChatWidget::confirmSendingFiles(
 		Ui::PreparedList &&list,
 		const QString &insertTextOnCancel) {
 	if (_composeControls->confirmMediaEdit(list)) {
@@ -1020,25 +1218,26 @@ bool RepliesWidget::confirmSendingFiles(
 		controller(),
 		std::move(list),
 		_composeControls->getTextWithAppliedMarkdown(),
-		_history->peer,
+		_peer,
 		Api::SendType::Normal,
 		sendMenuDetails());
+	box->setReplyTo(_composeControls->replyingToMessage());
 
 	box->setConfirmedCallback(crl::guard(this, [=](
-			Ui::PreparedList &&list,
-			Ui::SendFilesWay way,
-			TextWithTags &&caption,
+			std::shared_ptr<Ui::PreparedBundle> bundle,
 			Api::SendOptions options,
-			bool ctrlShiftEnter) {
-		sendingFilesConfirmed(
-			std::move(list),
-			way,
-			std::move(caption),
-			options,
-			ctrlShiftEnter);
+			FullReplyTo currentReplyTo) {
+		if (!currentReplyTo.messageId
+				&& _composeControls->replyingToMessage().messageId) {
+			_composeControls->cancelReplyMessage();
+		}
+		sendingFilesConfirmed(std::move(bundle), options);
 	}));
 	box->setCancelledCallback(_composeControls->restoreTextCallback(
 		insertTextOnCancel));
+	box->takeTextWithTagsRequests() | rpl::on_next([=](TextWithTags &&text) {
+		_composeControls->setText(std::move(text));
+	}, box->lifetime());
 
 	//ActivateWindow(controller());
 	controller()->show(std::move(box));
@@ -1046,42 +1245,48 @@ bool RepliesWidget::confirmSendingFiles(
 	return true;
 }
 
-void RepliesWidget::sendingFilesConfirmed(
-		Ui::PreparedList &&list,
-		Ui::SendFilesWay way,
-		TextWithTags &&caption,
+bool ChatWidget::checkSendPayment(
+		int messagesCount,
 		Api::SendOptions options,
-		bool ctrlShiftEnter) {
-	Expects(list.filesToProcess.empty());
+		Fn<void(int)> withPaymentApproved) {
+	return _sendPayment.check(
+		controller(),
+		_peer,
+		options,
+		messagesCount,
+		std::move(withPaymentApproved));
+}
 
-	if (showSendingFilesError(list, way.sendImagesAsPhotos())) {
+void ChatWidget::sendingFilesConfirmed(
+		std::shared_ptr<Ui::PreparedBundle> bundle,
+		Api::SendOptions options) {
+	if (showSendingFilesError(*bundle)) {
 		return;
 	}
-	auto groups = DivideByGroups(
-		std::move(list),
-		way,
-		_history->peer->slowmodeApplied());
-	const auto type = way.sendImagesAsPhotos()
-		? SendMediaType::Photo
-		: SendMediaType::File;
+
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = options;
+		copy.starsApproved = approved;
+		sendingFilesConfirmed(bundle, copy);
+	};
+	const auto checked = checkSendPayment(
+		bundle->totalCount,
+		options,
+		withPaymentApproved);
+	if (!checked) {
+		return;
+	}
+
+	const auto compress = bundle->way.sendImagesAsPhotos();
+	const auto type = compress ? SendMediaType::Photo : SendMediaType::File;
 	auto action = prepareSendAction(options);
 	action.clearDraft = false;
-	if ((groups.size() != 1 || !groups.front().sentWithCaption())
-		&& !caption.text.isEmpty()) {
-		auto message = Api::MessageToSend(action);
-		message.textWithTags = base::take(caption);
-		session().api().sendMessage(std::move(message));
-	}
-	for (auto &group : groups) {
+	auto &api = session().api();
+	for (auto &group : bundle->groups) {
 		const auto album = (group.type != Ui::AlbumType::None)
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
-		session().api().sendFiles(
-			std::move(group.list),
-			type,
-			base::take(caption),
-			album,
-			action);
+		api.sendFiles(std::move(group.list), type, album, action);
 	}
 	if (_composeControls->replyingToMessage().messageId
 			== action.replyTo.messageId) {
@@ -1091,7 +1296,7 @@ void RepliesWidget::sendingFilesConfirmed(
 	finishSending();
 }
 
-bool RepliesWidget::confirmSendingFiles(
+bool ChatWidget::confirmSendingFiles(
 		QImage &&image,
 		QByteArray &&content,
 		std::optional<bool> overrideSendImagesAsPhotos,
@@ -1108,14 +1313,14 @@ bool RepliesWidget::confirmSendingFiles(
 	return confirmSendingFiles(std::move(list), insertTextOnCancel);
 }
 
-bool RepliesWidget::showSlowmodeError() {
+bool ChatWidget::showSlowmodeError() {
 	const auto text = [&] {
-		if (const auto left = _history->peer->slowmodeSecondsLeft()) {
+		if (const auto left = _peer->slowmodeSecondsLeft()) {
 			return tr::lng_slowmode_enabled(
 				tr::now,
 				lt_left,
 				Ui::FormatDurationWordsSlowmode(left));
-		} else if (_history->peer->slowmodeApplied()) {
+		} else if (_peer->slowmodeApplied()) {
 			if (const auto item = _history->latestSendingMessage()) {
 				showAtPosition(item->position());
 				return tr::lng_slowmode_no_many(tr::now);
@@ -1130,13 +1335,15 @@ bool RepliesWidget::showSlowmodeError() {
 	return true;
 }
 
-void RepliesWidget::pushReplyReturn(not_null<HistoryItem*> item) {
-	if (item->history() == _history && item->inThread(_rootId)) {
-		_cornerButtons.pushReplyReturn(item);
+void ChatWidget::pushReplyReturn(not_null<HistoryItem*> item) {
+	if (_repliesRootId) {
+		if (item->history() == _history && item->inThread(_repliesRootId)) {
+			_cornerButtons.pushReplyReturn(item);
+		}
 	}
 }
 
-void RepliesWidget::checkReplyReturns() {
+void ChatWidget::checkReplyReturns() {
 	const auto currentTop = _scroll->scrollTop();
 	while (const auto replyReturn = _cornerButtons.replyReturn()) {
 		const auto position = replyReturn->position();
@@ -1152,58 +1359,24 @@ void RepliesWidget::checkReplyReturns() {
 	}
 }
 
-void RepliesWidget::uploadFile(
+void ChatWidget::uploadFile(
 		const QByteArray &fileContent,
 		SendMediaType type) {
 	session().api().sendFile(fileContent, type, prepareSendAction({}));
 }
 
-bool RepliesWidget::showSendingFilesError(
+bool ChatWidget::showSendingFilesError(
 		const Ui::PreparedList &list) const {
-	return showSendingFilesError(list, std::nullopt);
+	const auto show = controller()->uiShow();
+	return Data::ShowSendError(show, _peer, list, std::nullopt);
 }
 
-bool RepliesWidget::showSendingFilesError(
-		const Ui::PreparedList &list,
-		std::optional<bool> compress) const {
-	const auto text = [&] {
-		const auto peer = _history->peer;
-		const auto error = Data::FileRestrictionError(peer, list, compress);
-		if (error) {
-			return *error;
-		} else if (const auto left = _history->peer->slowmodeSecondsLeft()) {
-			return tr::lng_slowmode_enabled(
-				tr::now,
-				lt_left,
-				Ui::FormatDurationWordsSlowmode(left));
-		}
-		using Error = Ui::PreparedList::Error;
-		switch (list.error) {
-		case Error::None: return QString();
-		case Error::EmptyFile:
-		case Error::Directory:
-		case Error::NonLocalUrl: return tr::lng_send_image_empty(
-			tr::now,
-			lt_name,
-			list.errorData);
-		case Error::TooLargeFile: return u"(toolarge)"_q;
-		}
-		return tr::lng_forward_send_files_cant(tr::now);
-	}();
-	if (text.isEmpty()) {
-		return false;
-	} else if (text == u"(toolarge)"_q) {
-		const auto fileSize = list.files.back().size;
-		controller()->show(
-			Box(FileSizeLimitBox, &session(), fileSize, nullptr));
-		return true;
-	}
-
-	controller()->showToast(text);
-	return true;
+bool ChatWidget::showSendingFilesError(
+		const Ui::PreparedBundle &bundle) const {
+	return Data::ShowSendError(controller()->uiShow(), _peer, bundle);
 }
 
-Api::SendAction RepliesWidget::prepareSendAction(
+Api::SendAction ChatWidget::prepareSendAction(
 		Api::SendOptions options) const {
 	auto result = Api::SendAction(_history, options);
 	result.replyTo = replyTo();
@@ -1211,19 +1384,33 @@ Api::SendAction RepliesWidget::prepareSendAction(
 	return result;
 }
 
-void RepliesWidget::send() {
+void ChatWidget::send() {
 	if (_composeControls->getTextWithAppliedMarkdown().text.isEmpty()) {
 		return;
 	}
 	send({});
 }
 
-void RepliesWidget::sendVoice(ComposeControls::VoiceToSend &&data) {
+void ChatWidget::sendVoice(const ComposeControls::VoiceToSend &data) {
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = data;
+		copy.options.starsApproved = approved;
+		sendVoice(copy);
+	};
+	const auto checked = checkSendPayment(
+		1,
+		data.options,
+		withPaymentApproved);
+	if (!checked) {
+		return;
+	}
+
 	auto action = prepareSendAction(data.options);
 	session().api().sendVoiceMessage(
 		data.bytes,
 		data.waveform,
 		data.duration,
+		data.video,
 		std::move(action));
 
 	_composeControls->cancelReplyMessage();
@@ -1231,49 +1418,109 @@ void RepliesWidget::sendVoice(ComposeControls::VoiceToSend &&data) {
 	finishSending();
 }
 
-void RepliesWidget::send(Api::SendOptions options) {
+void ChatWidget::send(Api::SendOptions options) {
 	if (!options.scheduled && showSlowmodeError()) {
 		return;
 	}
 
+	sendTextWithTags(
+		_composeControls->getTextWithAppliedMarkdown(),
+		true,
+		options,
+		nullptr);
+}
+
+void ChatWidget::sendTextWithTags(
+		TextWithTags textWithTags,
+		bool useCurrentWebPageDraft,
+		Api::SendOptions options,
+		Fn<void()> done) {
 	if (!options.scheduled) {
 		_cornerButtons.clearReplyReturns();
 	}
 
 	auto message = Api::MessageToSend(prepareSendAction(options));
-	message.textWithTags = _composeControls->getTextWithAppliedMarkdown();
-	message.webPage = _composeControls->webPageDraft();
-
-	const auto error = GetErrorTextForSending(
-		_history->peer,
-		{
-			.topicRootId = _topic ? _topic->rootId() : MsgId(0),
-			.forward = &_composeControls->forwardItems(),
-			.text = &message.textWithTags,
-			.ignoreSlowmodeCountdown = (options.scheduled != 0),
-		});
-	if (!error.isEmpty()) {
-		controller()->showToast(error);
+	message.textWithTags = textWithTags;
+	if (useCurrentWebPageDraft) {
+		message.webPage = _composeControls->webPageDraft();
+	}
+
+	auto request = SendingErrorRequest{
+		.topicRootId = _topic ? _topic->rootId() : MsgId(0),
+		.forward = &_composeControls->forwardItems(),
+		.text = &message.textWithTags,
+		.ignoreSlowmodeCountdown = (options.scheduled != 0),
+	};
+	request.messagesCount = ComputeSendingMessagesCount(_history, request);
+	const auto error = GetErrorForSending(_peer, request);
+	if (error) {
+		Data::ShowSendErrorToast(controller(), _peer, error);
 		return;
 	}
+	if (!options.scheduled) {
+		const auto withPaymentApproved = [=](int approved) {
+			auto copy = options;
+			copy.starsApproved = approved;
+			sendTextWithTags(textWithTags, useCurrentWebPageDraft, copy, done);
+		};
+		const auto checked = checkSendPayment(
+			request.messagesCount,
+			options,
+			withPaymentApproved);
+		if (!checked) {
+			return;
+		}
+	}
 
-	session().api().sendMessage(std::move(message));
+	const auto nextLocalMessageId = session().data().nextLocalMessageId();
+	const auto hasText = !message.textWithTags.text.trimmed().isEmpty();
+
+	if (const auto field = _composeControls->fieldForMention(); field
+		&& hasText
+		&& message.webPage.url.isEmpty()
+		&& (field->document()->size().height() <= field->height())) {
+		controller()->sendingAnimation().appendSending({
+			.type = Ui::MessageSendingAnimationFrom::Type::Text,
+			.localId = nextLocalMessageId,
+			.globalStartGeometry = field->mapToGlobal(
+				Rect(field->size())),
+		});
+	}
+
+	session().api().sendMessage(std::move(message), nextLocalMessageId);
 
 	_composeControls->clear();
-	session().sendProgressManager().update(
-		_history,
-		_rootId,
-		Api::SendProgressType::Typing,
-		-1);
+	if (_repliesRootId) {
+		session().sendProgressManager().update(
+			_history,
+			_repliesRootId,
+			Api::SendProgressType::Typing,
+			-1);
+	}
 
 	//_saveDraftText = true;
 	//_saveDraftStart = crl::now();
 	//onDraftSave();
 
 	finishSending();
+	if (done) {
+		done();
+	}
 }
 
-void RepliesWidget::edit(
+void ChatWidget::sendWithTextOverride(
+		TextWithEntities text,
+		Api::SendOptions options,
+		Fn<void()> done) {
+	const auto useCurrentWebPageDraft
+		= (text.text == _composeControls->prepareTextForEditMsg().text);
+	sendTextWithTags({
+		text.text,
+		TextUtilities::ConvertEntitiesToTextTags(text.entities),
+	}, useCurrentWebPageDraft, options, std::move(done));
+}
+
+void ChatWidget::edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
 		mtpRequestId *const saveEditMsgRequestId,
@@ -1289,17 +1536,18 @@ void RepliesWidget::edit(
 		&& item->media()->allowsEditCaption();
 	if (sending.text.isEmpty() && !hasMediaWithCaption) {
 		if (item) {
-			controller()->show(Box<DeleteMessagesBox>(item, false));
+			controller()->show(Box<DeleteMessagesBox>(item));
 		} else {
 			doSetInnerFocus();
 		}
 		return;
 	} else {
-		const auto maxCaptionSize = !hasMediaWithCaption
-			? MaxMessageSize
-			: Data::PremiumLimits(&session()).captionLengthCurrent();
+		const auto limits = Data::PremiumLimits(&session());
+		const auto maxTextSize = hasMediaWithCaption
+			? limits.captionLengthCurrent()
+			: limits.messageLengthCurrent();
 		const auto remove = _composeControls->fieldCharacterCount()
-			- maxCaptionSize;
+			- maxTextSize;
 		if (remove > 0) {
 			controller()->showToast(
 				tr::lng_edit_limit_reached(tr::now, lt_count, remove));
@@ -1352,7 +1600,99 @@ void RepliesWidget::edit(
 	doSetInnerFocus();
 }
 
-void RepliesWidget::refreshJoinGroupButton() {
+void ChatWidget::validateSubsectionTabs() {
+	if (!_subsectionCheckLifetime) {
+		if (const auto group = _history->peer->asMegagroup()) {
+			_subsectionCheckLifetime = group->flagsValue(
+			) | rpl::skip(
+				1
+			) | rpl::filter([=](Data::Flags<ChannelDataFlags>::Change change) {
+				const auto mask = ChannelDataFlag::Forum
+					| ChannelDataFlag::ForumTabs
+					| ChannelDataFlag::MonoforumAdmin;
+				return change.diff & mask;
+			}) | rpl::on_next([=] {
+				validateSubsectionTabs();
+			});
+		} else if (!_topic) {
+			if (const auto user = _history->peer->asBot()) {
+				_subsectionCheckLifetime = user->flagsValue(
+				) | rpl::skip(
+					1
+				) | rpl::filter([=](Data::Flags<UserDataFlags>::Change change) {
+					return change.diff & UserDataFlag::Forum;
+				}) | rpl::on_next([=] {
+					_subsectionTopicsLifetime.destroy();
+					validateSubsectionTabs();
+				});
+			}
+		}
+	}
+	if (!_subsectionTopicsLifetime && !_topic) {
+		if (const auto user = _history->peer->asBot()) {
+			if (const auto forum = user->forum()) {
+				_subsectionTopicsLifetime = forum->topicsList()->fullSize().value(
+				) | rpl::map([](int size) {
+					return size > 0;
+				}) | rpl::distinct_until_changed(
+				) | rpl::skip(
+					1
+				) | rpl::on_next([=] {
+					validateSubsectionTabs();
+				});
+			}
+		}
+	}
+	const auto thread = _topic ? (Data::Thread*)_topic : _sublist;
+	if (!thread || !HistoryView::SubsectionTabs::UsedFor(_history)) {
+		if (_subsectionTabs) {
+			_subsectionTabsLifetime.destroy();
+			_subsectionTabs = nullptr;
+			updateControlsGeometry();
+
+			if (const auto forum = _history->asForum()
+				; forum && !_history->peer->isUser()) {
+				controller()->showForum(forum, {
+					Window::SectionShow::Way::Backward,
+					anim::type::normal,
+					anim::activation::background,
+				});
+			}
+		}
+		return;
+	} else if (_subsectionTabs) {
+		return;
+	}
+	_subsectionTabs = controller()->restoreSubsectionTabsFor(this, thread);
+	if (!_subsectionTabs) {
+		_subsectionTabs = std::make_unique<HistoryView::SubsectionTabs>(
+			controller(),
+			this,
+			thread);
+	}
+	_subsectionTabs->removeRequests() | rpl::on_next([=] {
+		_subsectionTabsLifetime.destroy();
+		_subsectionTabs = nullptr;
+		updateControlsGeometry();
+	}, _subsectionTabsLifetime);
+	_subsectionTabs->layoutRequests() | rpl::on_next([=] {
+		_inner->overrideChatMode((_subsectionTabs->leftSkip() > 0)
+			? ElementChatMode::Narrow
+			: std::optional<ElementChatMode>());
+		updateControlsGeometry();
+		orderWidgets();
+	}, _subsectionTabsLifetime);
+	_inner->overrideChatMode((_subsectionTabs->leftSkip() > 0)
+		? ElementChatMode::Narrow
+		: std::optional<ElementChatMode>());
+	updateControlsGeometry();
+	orderWidgets();
+}
+
+void ChatWidget::refreshJoinGroupButton() {
+	if (!_repliesRootId || !_peer->isChannel()) {
+		return;
+	}
 	const auto set = [&](std::unique_ptr<Ui::FlatButton> button) {
 		if (!button && !_joinGroup) {
 			return;
@@ -1372,13 +1712,15 @@ void RepliesWidget::refreshJoinGroupButton() {
 			listScrollTo(_scroll->scrollTopMax());
 		}
 	};
-	const auto channel = _history->peer->asChannel();
+	const auto channel = _peer->asChannel();
 	const auto canSend = !channel->isForum()
 		? Data::CanSendAnything(channel)
 		: (_topic && Data::CanSendAnything(_topic));
 	if (channel->amIn() || canSend) {
+		_canSendTexts = true;
 		set(nullptr);
 	} else {
+		_canSendTexts = false;
 		if (!_joinGroup) {
 			set(std::make_unique<Ui::FlatButton>(
 				this,
@@ -1396,20 +1738,32 @@ void RepliesWidget::refreshJoinGroupButton() {
 	}
 }
 
-bool RepliesWidget::sendExistingDocument(
+bool ChatWidget::sendExistingDocument(
 		not_null<DocumentData*> document,
 		Api::MessageToSend messageToSend,
 		std::optional<MsgId> localId) {
 	const auto error = Data::RestrictionError(
-		_history->peer,
+		_peer,
 		ChatRestriction::SendStickers);
 	if (error) {
-		controller()->showToast(*error);
+		Data::ShowSendErrorToast(controller(), _peer, error);
 		return false;
 	} else if (showSlowmodeError()
 		|| ShowSendPremiumError(controller(), document)) {
 		return false;
 	}
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = messageToSend;
+		copy.action.options.starsApproved = approved;
+		sendExistingDocument(document, std::move(copy), localId);
+	};
+	const auto checked = checkSendPayment(
+		1,
+		messageToSend.action.options,
+		withPaymentApproved);
+	if (!checked) {
+		return false;
+	}
 
 	Api::SendExistingDocument(
 		std::move(messageToSend),
@@ -1421,23 +1775,36 @@ bool RepliesWidget::sendExistingDocument(
 	return true;
 }
 
-void RepliesWidget::sendExistingPhoto(not_null<PhotoData*> photo) {
+void ChatWidget::sendExistingPhoto(not_null<PhotoData*> photo) {
 	sendExistingPhoto(photo, {});
 }
 
-bool RepliesWidget::sendExistingPhoto(
+bool ChatWidget::sendExistingPhoto(
 		not_null<PhotoData*> photo,
 		Api::SendOptions options) {
 	const auto error = Data::RestrictionError(
-		_history->peer,
+		_peer,
 		ChatRestriction::SendPhotos);
 	if (error) {
-		controller()->showToast(*error);
+		Data::ShowSendErrorToast(controller(), _peer, error);
 		return false;
 	} else if (showSlowmodeError()) {
 		return false;
 	}
 
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = options;
+		copy.starsApproved = approved;
+		sendExistingPhoto(photo, copy);
+	};
+	const auto checked = checkSendPayment(
+		1,
+		options,
+		withPaymentApproved);
+	if (!checked) {
+		return false;
+	}
+
 	Api::SendExistingPhoto(
 		Api::MessageToSend(prepareSendAction(options)),
 		photo);
@@ -1447,15 +1814,14 @@ bool RepliesWidget::sendExistingPhoto(
 	return true;
 }
 
-void RepliesWidget::sendInlineResult(
-		not_null<InlineBots::Result*> result,
+void ChatWidget::sendInlineResult(
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot) {
-	const auto errorText = result->getErrorOnSend(_history);
-	if (!errorText.isEmpty()) {
-		controller()->showToast(errorText);
+	if (const auto error = result->getErrorOnSend(_history)) {
+		Data::ShowSendErrorToast(controller(), _peer, error);
 		return;
 	}
-	sendInlineResult(result, bot, {}, std::nullopt);
+	sendInlineResult(std::move(result), bot, {}, std::nullopt);
 	//const auto callback = [=](Api::SendOptions options) {
 	//	sendInlineResult(result, bot, options);
 	//};
@@ -1464,71 +1830,106 @@ void RepliesWidget::sendInlineResult(
 	//	Ui::LayerOption::KeepOther);
 }
 
-void RepliesWidget::sendInlineResult(
-		not_null<InlineBots::Result*> result,
+void ChatWidget::sendInlineResult(
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot,
 		Api::SendOptions options,
 		std::optional<MsgId> localMessageId) {
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = options;
+		copy.starsApproved = approved;
+		sendInlineResult(result, bot, copy, localMessageId);
+	};
+	const auto checked = checkSendPayment(
+		1,
+		options,
+		withPaymentApproved);
+	if (!checked) {
+		return;
+	}
+
 	auto action = prepareSendAction(options);
 	action.generateLocal = true;
-	session().api().sendInlineResult(bot, result, action, localMessageId);
+	session().api().sendInlineResult(
+		bot,
+		result.get(),
+		action,
+		localMessageId);
 
 	_composeControls->clear();
 	//_saveDraftText = true;
 	//_saveDraftStart = crl::now();
 	//onDraftSave();
 
-	auto &bots = cRefRecentInlineBots();
-	const auto index = bots.indexOf(bot);
-	if (index) {
-		if (index > 0) {
-			bots.removeAt(index);
-		} else if (bots.size() >= RecentInlineBotsLimit) {
-			bots.resize(RecentInlineBotsLimit - 1);
-		}
-		bots.push_front(bot);
-		bot->session().local().writeRecentHashtagsAndBots();
-	}
+	bot->session().recentInlineBots().bump(bot);
 	finishSending();
 }
 
-SendMenu::Details RepliesWidget::sendMenuDetails() const {
+SendMenu::Details ChatWidget::sendMenuDetails() const {
 	using Type = SendMenu::Type;
-	const auto type = _topic ? Type::Scheduled : Type::SilentOnly;
+	const auto type = (_topic && !_peer->starsPerMessageChecked())
+		? Type::Scheduled
+		: Type::SilentOnly;
 	return SendMenu::Details{ .type = type };
 }
 
-FullReplyTo RepliesWidget::replyTo() const {
+bool ChatWidget::processChosenSticker(ChatHelpers::FileChosen &&chosen) {
+	_composeControls->processChosenSticker(std::move(chosen));
+	return true;
+}
+
+FullReplyTo ChatWidget::replyTo() const {
 	if (auto custom = _composeControls->replyingToMessage()) {
-		custom.topicRootId = _rootId;
-		return custom;
+		const auto item = custom.messageId
+			? session().data().message(custom.messageId)
+			: nullptr;
+		const auto sublistPeerId = item ? item->sublistPeerId() : PeerId();
+		if (!item
+			|| !_monoforumPeerId
+			|| (sublistPeerId == _monoforumPeerId)) {
+			// Never answer to a message in a wrong monoforum peer id.
+			custom.topicRootId = _repliesRootId;
+			custom.monoforumPeerId = _monoforumPeerId;
+			return custom;
+		}
 	}
 	return FullReplyTo{
-		.messageId = FullMsgId(_history->peer->id, _rootId),
-		.topicRootId = _rootId,
+		.messageId = (_repliesRootId
+			? FullMsgId(_peer->id, _repliesRootId)
+			: FullMsgId()),
+		.topicRootId = _repliesRootId,
+		.monoforumPeerId = _monoforumPeerId,
 	};
 }
 
-void RepliesWidget::refreshTopBarActiveChat() {
+void ChatWidget::refreshTopBarActiveChat() {
 	using namespace Dialogs;
+
 	const auto state = EntryState{
-		.key = (_topic ? Key{ _topic } : Key{ _history }),
-		.section = EntryState::Section::Replies,
+		.key = (_sublist
+			? Key{ _sublist }
+			: _topic
+			? Key{ _topic }
+			: Key{ _history }),
+		.section = _sublist
+			? EntryState::Section::SavedSublist
+			: EntryState::Section::Replies,
 		.currentReplyTo = replyTo(),
+		.currentSuggest = SuggestOptions(),
 	};
 	_topBar->setActiveChat(state, _sendAction.get());
 	_composeControls->setCurrentDialogsEntryState(state);
-	controller()->setCurrentDialogsEntryState(state);
+	controller()->setDialogsEntryState(state);
 }
 
-void RepliesWidget::refreshUnreadCountBadge(std::optional<int> count) {
+void ChatWidget::refreshUnreadCountBadge(std::optional<int> count) {
 	if (count.has_value()) {
 		_cornerButtons.updateJumpDownVisibility(count);
 	}
 }
 
-void RepliesWidget::updatePinnedViewer() {
-	if (_scroll->isHidden() || !_topic || !_pinnedTracker) {
+void ChatWidget::updatePinnedViewer() {
+	if (_scroll->isHidden() || (!_topic && !_sublist) || !_pinnedTracker) {
 		return;
 	}
 	const auto visibleBottom = _scroll->scrollTop() + _scroll->height();
@@ -1545,7 +1946,10 @@ void RepliesWidget::updatePinnedViewer() {
 		_pinnedClickedId = FullMsgId();
 	}
 	if (_pinnedClickedId && !_minPinnedId) {
-		_minPinnedId = Data::ResolveMinPinnedId(_history->peer, _rootId);
+		_minPinnedId = Data::ResolveMinPinnedId(
+			_peer,
+			_repliesRootId,
+			_monoforumPeerId);
 	}
 	if (_pinnedClickedId && _minPinnedId && _minPinnedId >= _pinnedClickedId) {
 		// After click on the last pinned message we should the top one.
@@ -1555,10 +1959,10 @@ void RepliesWidget::updatePinnedViewer() {
 	}
 }
 
-void RepliesWidget::checkLastPinnedClickedIdReset(
+void ChatWidget::checkLastPinnedClickedIdReset(
 		int wasScrollTop,
 		int nowScrollTop) {
-	if (_scroll->isHidden() || !_topic) {
+	if (_scroll->isHidden() || (!_topic && !_sublist)) {
 		return;
 	}
 	if (wasScrollTop < nowScrollTop && _pinnedClickedId) {
@@ -1569,9 +1973,56 @@ void RepliesWidget::checkLastPinnedClickedIdReset(
 	}
 }
 
-void RepliesWidget::setupTranslateBar() {
+void ChatWidget::setupOpenChatButton() {
+	if (!_sublist || _sublist->sublistPeer()->isSavedHiddenAuthor()) {
+		return;
+	} else if (_sublist->parentChat()) {
+		_canSendTexts = true;
+		return;
+	}
+	_openChatButton = std::make_unique<Ui::FlatButton>(
+		this,
+		(_sublist->sublistPeer()->isBroadcast()
+			? tr::lng_saved_open_channel(tr::now)
+			: _sublist->sublistPeer()->isUser()
+			? tr::lng_saved_open_chat(tr::now)
+			: tr::lng_saved_open_group(tr::now)),
+		st::historyComposeButton);
+
+	_openChatButton->setClickedCallback([=] {
+		controller()->showPeerHistory(
+			_sublist->sublistPeer(),
+			Window::SectionShow::Way::Forward);
+	});
+}
+
+void ChatWidget::setupAboutHiddenAuthor() {
+	if (!_sublist || !_sublist->sublistPeer()->isSavedHiddenAuthor()) {
+		return;
+	} else if (_sublist->parentChat()) {
+		_canSendTexts = true;
+		return;
+	}
+	_aboutHiddenAuthor = std::make_unique<Ui::RpWidget>(this);
+	_aboutHiddenAuthor->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(_aboutHiddenAuthor.get());
+		auto rect = _aboutHiddenAuthor->rect();
+
+		p.fillRect(rect, st::historyReplyBg);
+
+		p.setFont(st::normalFont);
+		p.setPen(st::windowSubTextFg);
+		p.drawText(
+			rect.marginsRemoved(
+				QMargins(st::historySendPadding, 0, st::historySendPadding, 0)),
+			tr::lng_saved_about_hidden(tr::now),
+			style::al_center);
+	}, _aboutHiddenAuthor->lifetime());
+}
+
+void ChatWidget::setupTranslateBar() {
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=, raw = _translateBar.get()](bool one) {
+	) | rpl::on_next([=, raw = _translateBar.get()](bool one) {
 		raw->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -1582,7 +2033,7 @@ void RepliesWidget::setupTranslateBar() {
 
 	_translateBarHeight = 0;
 	_translateBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		if (const auto delta = height - _translateBarHeight) {
 			_translateBarHeight = height;
 			setGeometryWithTopMoved(geometry(), delta);
@@ -1592,52 +2043,62 @@ void RepliesWidget::setupTranslateBar() {
 	_translateBar->finishAnimating();
 }
 
-void RepliesWidget::setupPinnedTracker() {
-	Expects(_topic != nullptr);
+void ChatWidget::setupPinnedTracker() {
+	Expects(_topic || _sublist);
 
-	_pinnedTracker = std::make_unique<HistoryView::PinnedTracker>(_topic);
+	const auto thread = _topic ? (Data::Thread*)_topic : _sublist;
+	_pinnedTracker = std::make_unique<HistoryView::PinnedTracker>(thread);
 	_pinnedBar = nullptr;
 
 	SharedMediaViewer(
-		&_topic->session(),
+		&session(),
 		Storage::SharedMediaKey(
-			_topic->channel()->id,
-			_rootId,
+			_peer->id,
+			_repliesRootId,
+			_monoforumPeerId,
 			Storage::SharedMediaType::Pinned,
 			ServerMaxMsgId - 1),
 		1,
 		1
 	) | rpl::filter([=](const SparseIdsSlice &result) {
 		return result.fullCount().has_value();
-	}) | rpl::start_with_next([=](const SparseIdsSlice &result) {
-		_topic->setHasPinnedMessages(*result.fullCount() != 0);
+	}) | rpl::on_next([=](const SparseIdsSlice &result) {
+		thread->setHasPinnedMessages(*result.fullCount() != 0);
 		if (result.skippedAfter() == 0) {
 			auto &settings = _history->session().settings();
-			const auto peerId = _history->peer->id;
+			const auto peerId = _peer->id;
 			const auto hiddenId = settings.hiddenPinnedMessageId(
 				peerId,
-				_rootId);
+				_repliesRootId,
+				_monoforumPeerId);
 			const auto last = result.size() ? result[result.size() - 1] : 0;
 			if (hiddenId && hiddenId != last) {
-				settings.setHiddenPinnedMessageId(peerId, _rootId, 0);
+				settings.setHiddenPinnedMessageId(
+					peerId,
+					_repliesRootId,
+					_monoforumPeerId,
+					0);
 				_history->session().saveSettingsDelayed();
 			}
 		}
 		checkPinnedBarState();
-	}, _topicLifetime);
+	}, lifetime());
 }
 
-void RepliesWidget::checkPinnedBarState() {
+void ChatWidget::checkPinnedBarState() {
 	Expects(_pinnedTracker != nullptr);
 	Expects(_inner != nullptr);
 
-	const auto peer = _history->peer;
-	const auto hiddenId = peer->canPinMessages()
+	const auto hiddenId = _peer->canPinMessages()
 		? MsgId(0)
-		: peer->session().settings().hiddenPinnedMessageId(
-			peer->id,
-			_rootId);
-	const auto currentPinnedId = Data::ResolveTopPinnedId(peer, _rootId);
+		: _peer->session().settings().hiddenPinnedMessageId(
+			_peer->id,
+			_repliesRootId,
+			_monoforumPeerId);
+	const auto currentPinnedId = Data::ResolveTopPinnedId(
+		_peer,
+		_repliesRootId,
+		_monoforumPeerId);
 	const auto universalPinnedId = !currentPinnedId
 		? MsgId(0)
 		: currentPinnedId.msg;
@@ -1661,13 +2122,14 @@ void RepliesWidget::checkPinnedBarState() {
 	}
 
 	clearHidingPinnedBar();
-	_pinnedBar = std::make_unique<Ui::PinnedBar>(this, [=] {
+	_pinnedBar = std::make_unique<Ui::PinnedBar>(_topBars.get(), [=] {
 		return controller()->isGifPausedAtLeastFor(
 			Window::GifPauseReason::Any);
 	}, controller()->gifPauseLevelChanged());
 	auto pinnedRefreshed = Info::Profile::SharedMediaCountValue(
-		_history->peer,
-		_rootId,
+		_peer,
+		_repliesRootId,
+		_monoforumPeerId,
 		nullptr,
 		Storage::SharedMediaType::Pinned
 	) | rpl::distinct_until_changed(
@@ -1679,13 +2141,13 @@ void RepliesWidget::checkPinnedBarState() {
 		}
 		return (count > 1);
 	}) | rpl::distinct_until_changed();
-	auto markupRefreshed = HistoryView::PinnedBarItemWithReplyMarkup(
+	auto customButtonItem = HistoryView::PinnedBarItemWithCustomButton(
 		&session(),
 		_pinnedTracker->shownMessageId());
 	rpl::combine(
 		rpl::duplicate(pinnedRefreshed),
-		rpl::duplicate(markupRefreshed)
-	) | rpl::start_with_next([=](bool many, HistoryItem *item) {
+		rpl::duplicate(customButtonItem)
+	) | rpl::on_next([=](bool many, HistoryItem *item) {
 		refreshPinnedBarButton(many, item);
 	}, _pinnedBar->lifetime());
 
@@ -1695,8 +2157,8 @@ void RepliesWidget::checkPinnedBarState() {
 			_pinnedTracker->shownMessageId(),
 			[bar = _pinnedBar.get()] { bar->customEmojiRepaint(); }),
 		std::move(pinnedRefreshed),
-		std::move(markupRefreshed),
-		_rootVisible.value()
+		std::move(customButtonItem),
+		_repliesRootVisible.value()
 	) | rpl::map([=](Ui::MessageBarContent &&content, auto, auto, bool show) {
 		const auto shown = !content.title.isEmpty() && !content.text.empty();
 		_shownPinnedItem = shown
@@ -1709,7 +2171,7 @@ void RepliesWidget::checkPinnedBarState() {
 	}));
 
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=, raw = _pinnedBar.get()](bool one) {
+	) | rpl::on_next([=, raw = _pinnedBar.get()](bool one) {
 		raw->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -1719,7 +2181,7 @@ void RepliesWidget::checkPinnedBarState() {
 	}, _pinnedBar->lifetime());
 
 	_pinnedBar->barClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto id = _pinnedTracker->currentMessageId();
 		if (const auto item = session().data().message(id.message)) {
 			showAtPosition(item->position());
@@ -1735,9 +2197,53 @@ void RepliesWidget::checkPinnedBarState() {
 		}
 	}, _pinnedBar->lifetime());
 
+	_pinnedBar->barRightClicks(
+	) | rpl::on_next([=] {
+		if (_pinnedBarHasCustomButton) {
+			return;
+		}
+		const auto reference = _pinnedClickedId
+			? _pinnedClickedId
+			: _pinnedTracker->currentMessageId().message;
+		if (!reference) {
+			return;
+		}
+		const auto top = Data::ResolveTopPinnedId(
+			_peer,
+			_repliesRootId,
+			_monoforumPeerId);
+		const auto targetId = (top && reference.msg >= top.msg)
+			? Data::ResolveMinPinnedId(
+				_peer,
+				_repliesRootId,
+				_monoforumPeerId)
+			: _pinnedTracker->nextPinnedId(reference.msg);
+		if (!targetId) {
+			return;
+		}
+		const auto jump = crl::guard(this, [=] {
+			const auto item = session().data().message(targetId);
+			if (!item) {
+				return;
+			}
+			showAtPosition(item->position());
+			_pinnedClickedId = FullMsgId();
+			_minPinnedId = std::nullopt;
+			updatePinnedViewer();
+		});
+		if (session().data().message(targetId)) {
+			jump();
+		} else {
+			session().api().requestMessageData(
+				session().data().peer(targetId.peer),
+				targetId.msg,
+				jump);
+		}
+	}, _pinnedBar->lifetime());
+
 	_pinnedBarHeight = 0;
 	_pinnedBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		if (const auto delta = height - _pinnedBarHeight) {
 			_pinnedBarHeight = height;
 			setGeometryWithTopMoved(geometry(), delta);
@@ -1745,13 +2251,9 @@ void RepliesWidget::checkPinnedBarState() {
 	}, _pinnedBar->lifetime());
 
 	orderWidgets();
-
-	if (animatingShow()) {
-		_pinnedBar->hide();
-	}
 }
 
-void RepliesWidget::clearHidingPinnedBar() {
+void ChatWidget::clearHidingPinnedBar() {
 	if (!_hidingPinnedBar) {
 		return;
 	}
@@ -1762,7 +2264,7 @@ void RepliesWidget::clearHidingPinnedBar() {
 	_hidingPinnedBar = nullptr;
 }
 
-void RepliesWidget::refreshPinnedBarButton(bool many, HistoryItem *item) {
+void ChatWidget::refreshPinnedBarButton(bool many, HistoryItem *item) {
 	if (!_pinnedBar) {
 		return; // It can be in process of hiding.
 	}
@@ -1773,53 +2275,45 @@ void RepliesWidget::refreshPinnedBarButton(bool many, HistoryItem *item) {
 		if (!id.message) {
 			return;
 		}
+		const auto thread = _topic ? (Data::Thread*)_topic : _sublist;
 		controller()->showSection(
-			std::make_shared<PinnedMemento>(_topic, id.message.msg));
+			std::make_shared<PinnedMemento>(thread, id.message.msg));
 	};
-	if (const auto replyMarkup = item ? item->inlineReplyMarkup() : nullptr) {
-		const auto &rows = replyMarkup->data.rows;
-		if ((rows.size() == 1) && (rows.front().size() == 1)) {
-			const auto text = rows.front().front().text;
-			if (!text.isEmpty()) {
-				auto button = object_ptr<Ui::RoundButton>(
-					this,
-					rpl::single(text),
-					st::historyPinnedBotButton);
-				button->setTextTransform(
-					Ui::RoundButton::TextTransform::NoTransform);
-				button->setFullRadius(true);
-				button->setClickedCallback([=] {
-					Api::ActivateBotCommand(
-						_inner->prepareClickHandlerContext(item->fullId()),
-						0,
-						0);
-				});
-				if (button->width() > st::historyPinnedBotButtonMaxWidth) {
-					button->setFullWidth(st::historyPinnedBotButtonMaxWidth);
-				}
-				struct State {
-					base::unique_qptr<Ui::PopupMenu> menu;
-				};
-				const auto state = button->lifetime().make_state<State>();
-				_pinnedBar->contextMenuRequested(
-				) | rpl::start_with_next([=, raw = button.data()] {
-					state->menu = base::make_unique_q<Ui::PopupMenu>(raw);
-					state->menu->addAction(
-						tr::lng_settings_events_pinned(tr::now),
-						openSection);
-					state->menu->popup(QCursor::pos());
-				}, button->lifetime());
-				_pinnedBar->setRightButton(std::move(button));
-				return;
-			}
+	const auto context = [copy = _inner](FullMsgId itemId) {
+		if (const auto raw = copy.data()) {
+			return raw->prepareClickHandlerContext(itemId);
 		}
+		return ClickHandlerContext();
+	};
+	auto customButton = CreatePinnedBarCustomButton(this, item, context);
+	if (customButton) {
+		_pinnedBarHasCustomButton = true;
+		struct State {
+			base::unique_qptr<Ui::PopupMenu> menu;
+		};
+		const auto buttonRaw = customButton.data();
+		const auto state = buttonRaw->lifetime().make_state<State>();
+		_pinnedBar->contextMenuRequested(
+		) | rpl::on_next([=] {
+			state->menu = base::make_unique_q<Ui::PopupMenu>(buttonRaw);
+			state->menu->addAction(
+				tr::lng_settings_events_pinned(tr::now),
+				openSection);
+			state->menu->popup(QCursor::pos());
+		}, buttonRaw->lifetime());
+		_pinnedBar->setRightButton(std::move(customButton));
+		return;
 	}
+	_pinnedBarHasCustomButton = false;
 	const auto close = !many;
 	auto button = object_ptr<Ui::IconButton>(
 		this,
 		close ? st::historyReplyCancel : st::historyPinnedShowAll);
+	button->setAccessibleName(close
+		? tr::lng_pinned_unpin(tr::now)
+		: tr::lng_settings_events_pinned(tr::now));
 	button->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (close) {
 			hidePinnedMessage();
 		} else {
@@ -1829,14 +2323,14 @@ void RepliesWidget::refreshPinnedBarButton(bool many, HistoryItem *item) {
 	_pinnedBar->setRightButton(std::move(button));
 }
 
-void RepliesWidget::hidePinnedMessage() {
+void ChatWidget::hidePinnedMessage() {
 	Expects(_pinnedBar != nullptr);
 
 	const auto id = _pinnedTracker->currentMessageId();
 	if (!id.message) {
 		return;
 	}
-	if (_history->peer->canPinMessages()) {
+	if (_peer->canPinMessages()) {
 		Window::ToggleMessagePinned(controller(), id.message, false);
 	} else {
 		const auto callback = [=] {
@@ -1846,30 +2340,35 @@ void RepliesWidget::hidePinnedMessage() {
 		};
 		Window::HidePinnedBar(
 			controller(),
-			_history->peer,
-			_rootId,
+			_peer,
+			_repliesRootId,
+			_monoforumPeerId,
 			crl::guard(this, callback));
 	}
 }
 
-void RepliesWidget::cornerButtonsShowAtPosition(
+void ChatWidget::cornerButtonsShowAtPosition(
 		Data::MessagePosition position) {
 	showAtPosition(position);
 }
 
-Data::Thread *RepliesWidget::cornerButtonsThread() {
-	return _topic ? static_cast<Data::Thread*>(_topic) : _history;
+Data::Thread *ChatWidget::cornerButtonsThread() {
+	return _sublist
+		? static_cast<Data::Thread*>(_sublist)
+		: _topic
+		? static_cast<Data::Thread*>(_topic)
+		: _history;
 }
 
-FullMsgId RepliesWidget::cornerButtonsCurrentId() {
+FullMsgId ChatWidget::cornerButtonsCurrentId() {
 	return _lastShownAt;
 }
 
-bool RepliesWidget::cornerButtonsIgnoreVisibility() {
+bool ChatWidget::cornerButtonsIgnoreVisibility() {
 	return animatingShow();
 }
 
-std::optional<bool> RepliesWidget::cornerButtonsDownShown() {
+std::optional<bool> ChatWidget::cornerButtonsDownShown() {
 	if (_composeControls->isLockPresent()
 		|| _composeControls->isTTLButtonShown()) {
 		return false;
@@ -1883,25 +2382,27 @@ std::optional<bool> RepliesWidget::cornerButtonsDownShown() {
 	return std::nullopt;
 }
 
-bool RepliesWidget::cornerButtonsUnreadMayBeShown() {
+bool ChatWidget::cornerButtonsUnreadMayBeShown() {
 	return _loaded
 		&& !_composeControls->isLockPresent()
 		&& !_composeControls->isTTLButtonShown();
 }
 
-bool RepliesWidget::cornerButtonsHas(CornerButtonType type) {
-	return _topic || (type == CornerButtonType::Down);
+bool ChatWidget::cornerButtonsHas(CornerButtonType type) {
+	return _topic
+		|| (_sublist && type == CornerButtonType::Reactions)
+		|| (type == CornerButtonType::Down);
 }
 
-void RepliesWidget::showAtStart() {
+void ChatWidget::showAtStart() {
 	showAtPosition(Data::MinMessagePosition);
 }
 
-void RepliesWidget::showAtEnd() {
+void ChatWidget::showAtEnd() {
 	showAtPosition(Data::MaxMessagePosition);
 }
 
-void RepliesWidget::finishSending() {
+void ChatWidget::finishSending() {
 	_composeControls->hidePanelsAnimated();
 	//if (_previewData && _previewData->pendingTill) previewCancel();
 	doSetInnerFocus();
@@ -1909,54 +2410,53 @@ void RepliesWidget::finishSending() {
 	refreshTopBarActiveChat();
 }
 
-void RepliesWidget::showAtPosition(
+void ChatWidget::showAtPosition(
 		Data::MessagePosition position,
 		FullMsgId originItemId) {
 	showAtPosition(position, originItemId, {});
 }
 
-void RepliesWidget::showAtPosition(
+void ChatWidget::showAtPosition(
 		Data::MessagePosition position,
 		FullMsgId originItemId,
 		const Window::SectionShow &params) {
 	_lastShownAt = position.fullId;
 	controller()->setActiveChatEntry(activeChat());
-	const auto ignore = (position.fullId.msg == _rootId);
+	const auto ignore = _repliesRootId
+		&& (position.fullId.msg == _repliesRootId);
 	_inner->showAtPosition(
 		position,
 		params,
 		_cornerButtons.doneJumpFrom(position.fullId, originItemId, ignore));
 }
 
-void RepliesWidget::updateAdaptiveLayout() {
+void ChatWidget::updateAdaptiveLayout() {
 	_topBarShadow->moveToLeft(
 		controller()->adaptive().isOneColumn() ? 0 : st::lineWidth,
 		_topBar->height());
 }
 
-not_null<History*> RepliesWidget::history() const {
-	return _history;
-}
-
-Dialogs::RowDescriptor RepliesWidget::activeChat() const {
+Dialogs::RowDescriptor ChatWidget::activeChat() const {
 	const auto messageId = _lastShownAt
 		? _lastShownAt
-		: FullMsgId(_history->peer->id, ShowAtUnreadMsgId);
-	if (_topic) {
+		: FullMsgId(_peer->id, ShowAtUnreadMsgId);
+	if (_sublist) {
+		return { _sublist, messageId };
+	} else if (_topic) {
 		return { _topic, messageId };
 	}
 	return { _history, messageId };
 }
 
-bool RepliesWidget::preventsClose(Fn<void()> &&continueCallback) const {
+bool ChatWidget::preventsClose(Fn<void()> &&continueCallback) const {
 	if (_composeControls->preventsClose(base::duplicate(continueCallback))) {
 		return true;
 	} else if (!_newTopicDiscarded
 		&& _topic
 		&& _topic->creating()) {
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		auto sure = [=](Fn<void()> &&close) {
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->_newTopicDiscarded = true;
 			}
 			close();
@@ -1975,7 +2475,7 @@ bool RepliesWidget::preventsClose(Fn<void()> &&continueCallback) const {
 	return false;
 }
 
-QPixmap RepliesWidget::grabForShowAnimation(const Window::SectionSlideParams &params) {
+QPixmap ChatWidget::grabForShowAnimation(const Window::SectionSlideParams &params) {
 	_topBar->updateControlsVisibility();
 	if (params.withTopBarShadow) _topBarShadow->hide();
 	if (_joinGroup) {
@@ -1987,41 +2487,42 @@ QPixmap RepliesWidget::grabForShowAnimation(const Window::SectionSlideParams &pa
 	if (params.withTopBarShadow) {
 		_topBarShadow->show();
 	}
-	if (_rootView) {
-		_rootView->hide();
+	_topBars->hide();
+	if (_subsectionTabs) {
+		_subsectionTabs->hide();
 	}
-	if (_pinnedBar) {
-		_pinnedBar->hide();
-	}
-	_translateBar->hide();
 	return result;
 }
 
-void RepliesWidget::checkActivation() {
+void ChatWidget::checkActivation() {
 	_inner->checkActivation();
 }
 
-void RepliesWidget::doSetInnerFocus() {
-	if (!_inner->getSelectedText().rich.text.isEmpty()
+void ChatWidget::doSetInnerFocus() {
+	if (_composeSearch
+		&& _inner->getSelectedText().rich.text.isEmpty()
+		&& _inner->getSelectedItems().empty()) {
+		_composeSearch->setInnerFocus();
+	} else if (!_inner->getSelectedText().rich.text.isEmpty()
 		|| !_inner->getSelectedItems().empty()
 		|| !_composeControls->focus()) {
 		_inner->setFocus();
 	}
 }
 
-bool RepliesWidget::showInternal(
+bool ChatWidget::showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) {
-	if (auto logMemento = dynamic_cast<RepliesMemento*>(memento.get())) {
-		if (logMemento->getHistory() == history()
-			&& logMemento->getRootId() == _rootId) {
-			restoreState(logMemento);
-			if (!logMemento->highlightId()) {
-				showAtPosition(Data::UnreadMessagePosition);
-			}
+	if (auto logMemento = dynamic_cast<ChatMemento*>(memento.get())) {
+		if (logMemento->id() == _id) {
 			if (params.reapplyLocalDraft) {
 				_composeControls->applyDraft(
 					ComposeControls::FieldHistoryAction::NewEntry);
+			} else {
+				restoreState(logMemento);
+				if (!logMemento->highlightId()) {
+					showAtPosition(Data::UnreadMessagePosition);
+				}
 			}
 			return true;
 		}
@@ -2029,15 +2530,19 @@ bool RepliesWidget::showInternal(
 	return false;
 }
 
-void RepliesWidget::setInternalState(
+bool ChatWidget::sameTypeAs(not_null<Window::SectionMemento*> memento) {
+	return dynamic_cast<ChatMemento*>(memento.get()) != nullptr;
+}
+
+void ChatWidget::setInternalState(
 		const QRect &geometry,
-		not_null<RepliesMemento*> memento) {
+		not_null<ChatMemento*> memento) {
 	setGeometry(geometry);
 	Ui::SendPendingMoveResizeEvents(this);
 	restoreState(memento);
 }
 
-bool RepliesWidget::pushTabbedSelectorToThirdSection(
+bool ChatWidget::pushTabbedSelectorToThirdSection(
 		not_null<Data::Thread*> thread,
 		const Window::SectionShow &params) {
 	return _composeControls->pushTabbedSelectorToThirdSection(
@@ -2045,26 +2550,32 @@ bool RepliesWidget::pushTabbedSelectorToThirdSection(
 		params);
 }
 
-bool RepliesWidget::returnTabbedSelector() {
+bool ChatWidget::returnTabbedSelector() {
 	return _composeControls->returnTabbedSelector();
 }
 
-std::shared_ptr<Window::SectionMemento> RepliesWidget::createMemento() {
-	auto result = std::make_shared<RepliesMemento>(history(), _rootId);
+std::shared_ptr<Window::SectionMemento> ChatWidget::createMemento() {
+	auto result = std::make_shared<ChatMemento>(_id);
 	saveState(result.get());
 	return result;
 }
 
-bool RepliesWidget::showMessage(
+bool ChatWidget::showMessage(
 		PeerId peerId,
 		const Window::SectionShow &params,
 		MsgId messageId) {
-	if (peerId != _history->peer->id) {
+	if (peerId != _peer->id) {
 		return false;
 	}
-	const auto id = FullMsgId(_history->peer->id, messageId);
+	const auto id = FullMsgId(_peer->id, messageId);
 	const auto message = _history->owner().message(id);
-	if (!message || (!message->inThread(_rootId) && id.msg != _rootId)) {
+	if (!message) {
+		return false;
+	} else if (_repliesRootId
+		&& !message->inThread(_repliesRootId)
+		&& id.msg != _repliesRootId) {
+		return false;
+	} else if (_sublist && message->savedSublist() != _sublist) {
 		return false;
 	}
 	const auto originMessage = [&]() -> HistoryItem* {
@@ -2073,7 +2584,11 @@ bool RepliesWidget::showMessage(
 			if (const auto returnTo = session().data().message(origin->id)) {
 				if (returnTo->history() != _history) {
 					return nullptr;
-				} else if (returnTo->inThread(_rootId)) {
+				} else if (_repliesRootId
+					&& returnTo->inThread(_repliesRootId)) {
+					return returnTo;
+				} else if (_sublist
+					&& returnTo->savedSublist() == _sublist) {
 					return returnTo;
 				}
 			}
@@ -2090,24 +2605,26 @@ bool RepliesWidget::showMessage(
 	return true;
 }
 
-Window::SectionActionResult RepliesWidget::sendBotCommand(
+Window::SectionActionResult ChatWidget::sendBotCommand(
 		Bot::SendCommandRequest request) {
-	if (request.peer != _history->peer) {
+	if (!_repliesRootId) {
+		return Window::SectionActionResult::Fallback;
+	} else if (request.peer != _peer) {
 		return Window::SectionActionResult::Ignore;
 	}
 	listSendBotCommand(request.command, request.context);
 	return Window::SectionActionResult::Handle;
 }
 
-bool RepliesWidget::confirmSendingFiles(const QStringList &files) {
+bool ChatWidget::confirmSendingFiles(const QStringList &files) {
 	return confirmSendingFiles(files, QString());
 }
 
-bool RepliesWidget::confirmSendingFiles(not_null<const QMimeData*> data) {
+bool ChatWidget::confirmSendingFiles(not_null<const QMimeData*> data) {
 	return confirmSendingFiles(data, std::nullopt);
 }
 
-bool RepliesWidget::confirmSendingFiles(
+bool ChatWidget::confirmSendingFiles(
 		const QStringList &files,
 		const QString &insertTextOnCancel) {
 	const auto premium = controller()->session().user()->isPremium();
@@ -2116,39 +2633,40 @@ bool RepliesWidget::confirmSendingFiles(
 		insertTextOnCancel);
 }
 
-void RepliesWidget::replyToMessage(FullReplyTo id) {
+void ChatWidget::replyToMessage(FullReplyTo id) {
 	_composeControls->replyToMessage(std::move(id));
 	refreshTopBarActiveChat();
 }
 
-void RepliesWidget::saveState(not_null<RepliesMemento*> memento) {
+void ChatWidget::saveState(not_null<ChatMemento*> memento) {
 	memento->setReplies(_replies);
 	memento->setReplyReturns(_cornerButtons.replyReturns());
 	_inner->saveState(memento->list());
 }
 
-void RepliesWidget::refreshReplies() {
+void ChatWidget::refreshReplies() {
+	if (!_repliesRootId) {
+		return;
+	}
 	auto old = base::take(_replies);
 	setReplies(_topic
 		? _topic->replies()
-		: std::make_shared<Data::RepliesList>(_history, _rootId));
+		: std::make_shared<Data::RepliesList>(_history, _repliesRootId));
 	if (old) {
 		_inner->refreshViewer();
 	}
 }
 
-void RepliesWidget::setReplies(std::shared_ptr<Data::RepliesList> replies) {
+void ChatWidget::setReplies(std::shared_ptr<Data::RepliesList> replies) {
 	_replies = std::move(replies);
 	_repliesLifetime.destroy();
 
 	_replies->unreadCountValue(
-	) | rpl::start_with_next([=](std::optional<int> count) {
+	) | rpl::on_next([=](std::optional<int> count) {
 		refreshUnreadCountBadge(count);
 	}, lifetime());
 
-	refreshUnreadCountBadge(_replies->unreadCountKnown()
-		? _replies->unreadCountCurrent()
-		: std::optional<int>());
+	unreadCountUpdated();
 
 	const auto isTopic = (_topic != nullptr);
 	const auto isTopicCreating = isTopic && _topic->creating();
@@ -2175,33 +2693,118 @@ void RepliesWidget::setReplies(std::shared_ptr<Data::RepliesList> replies) {
 				? tr::lng_comments_header_none
 				: tr::lng_replies_header_none)();
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		_topBar->setCustomTitle(text);
 	}, _repliesLifetime);
 }
 
-void RepliesWidget::restoreState(not_null<RepliesMemento*> memento) {
+void ChatWidget::subscribeToSublist() {
+	Expects(_sublist != nullptr);
+
+	// Must be done before unreadCountUpdated(), or we auto-close.
+	if (_sublist->unreadMark()) {
+		_sublist->owner().histories().changeSublistUnreadMark(
+			_sublist,
+			false);
+	}
+
+	_sublist->unreadCountValue(
+	) | rpl::on_next([=](std::optional<int> count) {
+		refreshUnreadCountBadge(count);
+	}, lifetime());
+
+	using Flag = Data::SublistUpdate::Flag;
+	session().changes().sublistUpdates(
+		_sublist,
+		(Flag::UnreadView
+			| Flag::UnreadReactions
+			| Flag::UnreadPollVotes
+			| Flag::CloudDraft)
+	) | rpl::on_next([=](const Data::SublistUpdate &update) {
+		if (update.flags & Flag::UnreadView) {
+			unreadCountUpdated();
+		}
+		if (update.flags
+			& (Flag::UnreadReactions | Flag::UnreadPollVotes)) {
+			_cornerButtons.updateUnreadThingsVisibility();
+		}
+		if (update.flags & Flag::CloudDraft) {
+			_composeControls->applyCloudDraft();
+		}
+	}, lifetime());
+
+	_sublist->destroyed(
+	) | rpl::on_next([=] {
+		closeCurrent();
+	}, lifetime());
+
+	unreadCountUpdated();
+	subscribeToPinnedMessages();
+}
+
+void ChatWidget::unreadCountUpdated() {
+	if (_sublist && _sublist->unreadMark()) {
+		crl::on_main(this, [=] {
+			const auto guard = base::make_weak(this);
+			controller()->showPeerHistory(_sublist->owningHistory());
+			if (guard) {
+				closeCurrent();
+			}
+		});
+	} else {
+		refreshUnreadCountBadge(_replies
+			? (_replies->unreadCountKnown()
+				? _replies->unreadCountCurrent()
+				: std::optional<int>())
+			: _sublist
+			? (_sublist->unreadCountKnown()
+				? _sublist->unreadCountCurrent()
+				: std::optional<int>())
+			: std::optional<int>());
+	}
+}
+
+void ChatWidget::restoreState(not_null<ChatMemento*> memento) {
 	if (auto replies = memento->getReplies()) {
 		setReplies(std::move(replies));
-	} else if (!_replies) {
+	} else if (!_replies && _repliesRootId) {
 		refreshReplies();
 	}
 	_cornerButtons.setReplyReturns(memento->replyReturns());
+
+	// Custom initial scroll for post comments, from "Discussion started".
+	if (!memento->highlightId()
+		&& _repliesRoot
+		&& _repliesRoot->isDiscussionPost()
+		&& _replies->computeInboxReadTillFull() == MsgId(1)) {
+		_inner->overrideInitialScroll([=] {
+			const auto divider = _replies ? _replies->divider() : nullptr;
+			if (!divider) {
+				return false;
+			}
+			const auto view = _inner->viewByPosition(divider->position());
+			if (!view) {
+				return false;
+			}
+			const auto top = std::max(view->y() - st::topBarHeight, 0);
+			listScrollTo(top);
+			return true;
+		});
+	}
 	_inner->restoreState(memento->list());
 	if (const auto highlight = memento->highlightId()) {
 		auto params = Window::SectionShow(
 			Window::SectionShow::Way::Forward,
 			anim::type::instant);
-		params.highlightPart = memento->highlightPart();
-		params.highlightPartOffsetHint = memento->highlightPartOffsetHint();
+		params.highlight = memento->highlight();
 		showAtPosition(Data::MessagePosition{
-			.fullId = FullMsgId(_history->peer->id, highlight),
+			.fullId = FullMsgId(_peer->id, highlight),
 			.date = TimeId(0),
 		}, {}, params);
 	}
 }
 
-void RepliesWidget::resizeEvent(QResizeEvent *e) {
+void ChatWidget::resizeEvent(QResizeEvent *e) {
 	if (!width() || !height()) {
 		return;
 	}
@@ -2210,32 +2813,40 @@ void RepliesWidget::resizeEvent(QResizeEvent *e) {
 	updateControlsGeometry();
 }
 
-void RepliesWidget::recountChatWidth() {
+void ChatWidget::recountChatWidth() {
 	auto layout = (width() < st::adaptiveChatWideWidth)
 		? Window::Adaptive::ChatLayout::Normal
 		: Window::Adaptive::ChatLayout::Wide;
 	controller()->adaptive().setChatLayout(layout);
 }
 
-void RepliesWidget::updateControlsGeometry() {
+void ChatWidget::updateControlsGeometry() {
 	const auto contentWidth = width();
 
-	const auto newScrollTop = _scroll->isHidden()
+	const auto newScrollDelta = _scroll->isHidden()
 		? std::nullopt
 		: _scroll->scrollTop()
-		? base::make_optional(_scroll->scrollTop()
-			+ topDelta()
-			+ _scrollTopDelta)
+		? base::make_optional(topDelta() + _scrollTopDelta)
 		: 0;
 	_topBar->resizeToWidth(contentWidth);
 	_topBarShadow->resize(contentWidth, st::lineWidth);
-	if (_rootView) {
-		_rootView->resizeToWidth(contentWidth);
-	}
-	auto top = _topBar->height() + _rootViewHeight;
+	const auto tabsLeftSkip = _subsectionTabs
+		? _subsectionTabs->leftSkip()
+		: 0;
+	const auto tabsBottomSkip = _subsectionTabs
+		? _subsectionTabs->bottomSkip()
+		: 0;
+	const auto innerWidth = contentWidth - tabsLeftSkip;
+	const auto subsectionTabsTop = _topBar->bottomNoMargins();
+	_topBars->move(tabsLeftSkip, subsectionTabsTop
+		+ (_subsectionTabs ? _subsectionTabs->topSkip() : 0));
+	if (_repliesRootView) {
+		_repliesRootView->resizeToWidth(innerWidth);
+	}
+	auto top = _repliesRootViewHeight;
 	if (_pinnedBar) {
 		_pinnedBar->move(0, top);
-		_pinnedBar->resizeToWidth(contentWidth);
+		_pinnedBar->resizeToWidth(innerWidth);
 		top += _pinnedBarHeight;
 	}
 	if (_topicReopenBar) {
@@ -2243,42 +2854,65 @@ void RepliesWidget::updateControlsGeometry() {
 		top += _topicReopenBar->bar().height();
 	}
 	_translateBar->move(0, top);
-	_translateBar->resizeToWidth(contentWidth);
+	_translateBar->resizeToWidth(innerWidth);
 	top += _translateBarHeight;
 
-	const auto bottom = height();
-	const auto controlsHeight = _joinGroup
-		? _joinGroup->height()
-		: _composeControls->heightCurrent();
-	const auto scrollHeight = bottom - top - controlsHeight;
-	const auto scrollSize = QSize(contentWidth, scrollHeight);
+	auto bottom = height();
+	if (_openChatButton) {
+		_openChatButton->resizeToWidth(width());
+		bottom -= _openChatButton->height();
+		_openChatButton->move(0, bottom);
+	} else if (_aboutHiddenAuthor) {
+		_aboutHiddenAuthor->resize(width(), st::historyUnblock.height);
+		bottom -= _aboutHiddenAuthor->height();
+		_aboutHiddenAuthor->move(0, bottom);
+	} else if (_joinGroup) {
+		_joinGroup->resizeToWidth(width());
+		bottom -= _joinGroup->height();
+		_joinGroup->move(0, bottom);
+	} else {
+		bottom -= _composeControls->heightCurrent();
+	}
+	const auto composeTop = bottom;
+	bottom -= tabsBottomSkip;
+
+	_topBars->resize(innerWidth, top + st::lineWidth);
+	top += _topBars->y();
+
+	const auto scrollHeight = bottom - top;
+	const auto scrollSize = QSize(innerWidth, scrollHeight);
 	if (_scroll->size() != scrollSize) {
 		_skipScrollEvent = true;
 		_scroll->resize(scrollSize);
 		_inner->resizeToWidth(scrollSize.width(), _scroll->height());
 		_skipScrollEvent = false;
 	}
-	_scroll->move(0, top);
+	_scroll->move(tabsLeftSkip, top);
 	if (!_scroll->isHidden()) {
+		const auto newScrollTop = (newScrollDelta && _scroll->scrollTop())
+			? (_scroll->scrollTop() + *newScrollDelta)
+			: std::optional<int>();
 		if (newScrollTop) {
 			_scroll->scrollToY(*newScrollTop);
 		}
 		updateInnerVisibleArea();
 	}
-	if (_joinGroup) {
-		_joinGroup->setGeometry(
-			0,
-			bottom - _joinGroup->height(),
-			contentWidth,
-			_joinGroup->height());
-	}
-	_composeControls->move(0, bottom - controlsHeight);
+	_composeControls->move(0, composeTop);
 	_composeControls->setAutocompleteBoundingRect(_scroll->geometry());
 
+	if (_subsectionTabs) {
+		const auto scrollBottom = _scroll->y() + scrollHeight;
+		const auto areaHeight = scrollBottom
+			+ tabsBottomSkip
+			- subsectionTabsTop;
+		_subsectionTabs->setBoundingRect(
+			{ 0, subsectionTabsTop, width(), areaHeight });
+	}
+
 	_cornerButtons.updatePositions();
 }
 
-void RepliesWidget::paintEvent(QPaintEvent *e) {
+void ChatWidget::paintEvent(QPaintEvent *e) {
 	if (animatingShow()) {
 		SectionWidget::paintEvent(e);
 		return;
@@ -2292,20 +2926,20 @@ void RepliesWidget::paintEvent(QPaintEvent *e) {
 	SectionWidget::PaintBackground(controller(), _theme.get(), this, bg);
 }
 
-bool RepliesWidget::emptyShown() const {
+bool ChatWidget::emptyShown() const {
 	return _topic
 		&& (_inner->isEmpty()
-			|| (_topic->lastKnownServerMessageId() == _rootId));
+			|| (_topic->lastKnownServerMessageId() == _repliesRootId));
 }
 
-void RepliesWidget::onScroll() {
+void ChatWidget::onScroll() {
 	if (_skipScrollEvent) {
 		return;
 	}
 	updateInnerVisibleArea();
 }
 
-void RepliesWidget::updateInnerVisibleArea() {
+void ChatWidget::updateInnerVisibleArea() {
 	if (!_inner->animatedScrolling()) {
 		checkReplyReturns();
 	}
@@ -2323,18 +2957,21 @@ void RepliesWidget::updateInnerVisibleArea() {
 	}
 }
 
-void RepliesWidget::updatePinnedVisibility() {
-	if (!_loaded) {
+void ChatWidget::updatePinnedVisibility() {
+	if (_sublist) {
+		setPinnedVisibility(true);
 		return;
-	} else if (!_topic && (!_root || _root->isEmpty())) {
-		setPinnedVisibility(!_root);
+	} else if (!_loaded || !_repliesRootId) {
+		return;
+	} else if (!_topic && (!_repliesRoot || _repliesRoot->isEmpty())) {
+		setPinnedVisibility(!_repliesRoot);
 		return;
 	}
 	const auto rootItem = [&] {
-		if (const auto group = _history->owner().groups().find(_root)) {
+		if (const auto group = _history->owner().groups().find(_repliesRoot)) {
 			return group->items.front().get();
 		}
-		return _root;
+		return _repliesRoot;
 	};
 	const auto view = _inner->viewByPosition(_topic
 		? Data::MinMessagePosition
@@ -2344,14 +2981,17 @@ void RepliesWidget::updatePinnedVisibility() {
 	setPinnedVisibility(visible || (_topic && !view->data()->isPinned()));
 }
 
-void RepliesWidget::setPinnedVisibility(bool shown) {
+void ChatWidget::setPinnedVisibility(bool shown) {
 	if (animatingShow()) {
+	} else if (_sublist) {
+		_repliesRootVisible = shown;
+	} else if (!_repliesRootId) {
 		return;
 	} else if (!_topic) {
-		if (!_rootViewInitScheduled) {
+		if (!_repliesRootViewInitScheduled) {
 			const auto height = shown ? st::historyReplyHeight : 0;
-			if (const auto delta = height - _rootViewHeight) {
-				_rootViewHeight = height;
+			if (const auto delta = height - _repliesRootViewHeight) {
+				_repliesRootViewHeight = height;
 				if (_scroll->scrollTop() == _scroll->scrollTopMax()) {
 					setGeometryWithTopMoved(geometry(), delta);
 				} else {
@@ -2359,22 +2999,22 @@ void RepliesWidget::setPinnedVisibility(bool shown) {
 				}
 			}
 		}
-		_rootVisible = shown;
-		if (!_rootViewInited) {
-			_rootView->finishAnimating();
-			if (!_rootViewInitScheduled) {
-				_rootViewInitScheduled = true;
+		_repliesRootVisible = shown;
+		if (!_repliesRootViewInited) {
+			_repliesRootView->finishAnimating();
+			if (!_repliesRootViewInitScheduled) {
+				_repliesRootViewInitScheduled = true;
 				InvokeQueued(this, [=] {
-					_rootViewInited = true;
+					_repliesRootViewInited = true;
 				});
 			}
 		}
 	} else {
-		_rootVisible = shown;
+		_repliesRootVisible = shown;
 	}
 }
 
-void RepliesWidget::showAnimatedHook(
+void ChatWidget::showAnimatedHook(
 		const Window::SectionSlideParams &params) {
 	_topBar->setAnimatingMode(true);
 	if (params.withTopBarShadow) {
@@ -2383,9 +3023,9 @@ void RepliesWidget::showAnimatedHook(
 	_composeControls->showStarted();
 }
 
-void RepliesWidget::showFinishedHook() {
+void ChatWidget::showFinishedHook() {
 	_topBar->setAnimatingMode(false);
-	if (_joinGroup) {
+	if (_joinGroup || _openChatButton || _aboutHiddenAuthor) {
 		if (Ui::InFocusChain(this)) {
 			_inner->setFocus();
 		}
@@ -2394,15 +3034,9 @@ void RepliesWidget::showFinishedHook() {
 		_composeControls->showFinished();
 	}
 	_inner->showFinished();
-	if (_rootView) {
-		_rootView->show();
-	}
-	if (_pinnedBar) {
-		_pinnedBar->show();
-	}
-	_translateBar->show();
-	if (_topicReopenBar) {
-		_topicReopenBar->bar().show();
+	_topBars->show();
+	if (_subsectionTabs) {
+		_subsectionTabs->show();
 	}
 
 	// We should setup the drag area only after
@@ -2410,21 +3044,31 @@ void RepliesWidget::showFinishedHook() {
 	// because after that the method showChildren() is called.
 	setupDragArea();
 	updatePinnedVisibility();
+
+	if (_topic) {
+		_topic->saveMeAsActiveSubsectionThread();
+	} else if (_sublist) {
+		_sublist->saveMeAsActiveSubsectionThread();
+	}
 }
 
-bool RepliesWidget::floatPlayerHandleWheelEvent(QEvent *e) {
+bool ChatWidget::floatPlayerHandleWheelEvent(QEvent *e) {
 	return _scroll->viewportEvent(e);
 }
 
-QRect RepliesWidget::floatPlayerAvailableRect() {
+QRect ChatWidget::floatPlayerAvailableRect() {
 	return mapToGlobal(_scroll->geometry());
 }
 
-Context RepliesWidget::listContext() {
-	return Context::Replies;
+Context ChatWidget::listContext() {
+	return !_sublist
+		? Context::Replies
+		: _sublist->parentChat()
+		? Context::Monoforum
+		: Context::SavedSublist;
 }
 
-bool RepliesWidget::listScrollTo(int top, bool syntetic) {
+bool ChatWidget::listScrollTo(int top, bool syntetic) {
 	top = std::clamp(top, 0, _scroll->scrollTopMax());
 	const auto scrolled = (_scroll->scrollTop() != top);
 	_synteticScrollEvent = syntetic;
@@ -2437,7 +3081,17 @@ bool RepliesWidget::listScrollTo(int top, bool syntetic) {
 	return scrolled;
 }
 
-void RepliesWidget::listCancelRequest() {
+void ChatWidget::listCancelRequest() {
+	if (_composeSearch) {
+		if (_inner &&
+			(!_inner->getSelectedItems().empty()
+				|| !_inner->getSelectedText().rich.text.isEmpty())) {
+			clearSelected();
+		} else {
+			_composeSearch->hideAnimated();
+		}
+		return;
+	}
 	if (_inner && !_inner->getSelectedItems().empty()) {
 		clearSelected();
 		return;
@@ -2448,15 +3102,36 @@ void RepliesWidget::listCancelRequest() {
 	controller()->showBackFromStack();
 }
 
-void RepliesWidget::listDeleteRequest() {
+void ChatWidget::listDeleteRequest() {
 	confirmDeleteSelected();
 }
 
-void RepliesWidget::listTryProcessKeyInput(not_null<QKeyEvent*> e) {
+void ChatWidget::listTryProcessKeyInput(not_null<QKeyEvent*> e) {
 	_composeControls->tryProcessKeyInput(e);
 }
 
-rpl::producer<Data::MessagesSlice> RepliesWidget::listSource(
+void ChatWidget::markLoaded() {
+	if (!_loaded) {
+		_loaded = true;
+		crl::on_main(this, [=] {
+			updatePinnedVisibility();
+		});
+	}
+}
+
+rpl::producer<Data::MessagesSlice> ChatWidget::listSource(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) {
+	if (_replies) {
+		return repliesSource(aroundId, limitBefore, limitAfter);
+	} else if (_sublist) {
+		return sublistSource(aroundId, limitBefore, limitAfter);
+	}
+	Unexpected("ChatWidget::listSource in unknown mode");
+}
+
+rpl::producer<Data::MessagesSlice> ChatWidget::repliesSource(
 		Data::MessagePosition aroundId,
 		int limitBefore,
 		int limitAfter) {
@@ -2465,31 +3140,50 @@ rpl::producer<Data::MessagesSlice> RepliesWidget::listSource(
 		limitBefore,
 		limitAfter
 	) | rpl::before_next([=] { // after_next makes a copy of value.
-		if (!_loaded) {
-			_loaded = true;
-			crl::on_main(this, [=] {
-				updatePinnedVisibility();
-			});
-		}
+		markLoaded();
 	});
 }
 
-bool RepliesWidget::listAllowsMultiSelect() {
+rpl::producer<Data::MessagesSlice> ChatWidget::sublistSource(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) {
+	return _sublist->source(
+		aroundId,
+		limitBefore,
+		limitAfter
+	) | rpl::before_next([=](const Data::MessagesSlice &result) {
+		 // after_next makes a copy of value.
+		_topBar->setCustomTitle(!result.fullCount
+			? tr::lng_contacts_loading(tr::now)
+			: (_sublist->parentChat()
+				? tr::lng_forum_messages
+				: tr::lng_profile_saved_messages)(
+					tr::now,
+					lt_count_decimal,
+					*result.fullCount));
+		markLoaded();
+	});
+}
+
+bool ChatWidget::listAllowsMultiSelect() {
 	return true;
 }
 
-bool RepliesWidget::listIsItemGoodForSelection(
+bool ChatWidget::listIsItemGoodForSelection(
 		not_null<HistoryItem*> item) {
 	return item->isRegular() && !item->isService();
 }
 
-bool RepliesWidget::listIsLessInOrder(
+bool ChatWidget::listIsLessInOrder(
 		not_null<HistoryItem*> first,
 		not_null<HistoryItem*> second) {
-	return first->position() < second->position();
+	return _sublist
+		? (first->id < second->id)
+		: first->position() < second->position();
 }
 
-void RepliesWidget::listSelectionChanged(SelectedItems &&items) {
+void ChatWidget::listSelectionChanged(SelectedItems &&items) {
 	HistoryView::TopBarWidget::SelectedState state;
 	state.count = items.size();
 	for (const auto &item : items) {
@@ -2501,32 +3195,56 @@ void RepliesWidget::listSelectionChanged(SelectedItems &&items) {
 		}
 	}
 	_topBar->showSelected(state);
+	if ((state.count > 0) && _composeSearch) {
+		_composeSearch->hideAnimated();
+	}
 	if (items.empty()) {
 		doSetInnerFocus();
 	}
 }
 
-void RepliesWidget::listMarkReadTill(not_null<HistoryItem*> item) {
-	_replies->readTill(item);
+void ChatWidget::listMarkReadTill(not_null<HistoryItem*> item) {
+	if (_replies) {
+		_replies->readTill(item);
+	} else if (_sublist) {
+		_sublist->readTill(item);
+	}
 }
 
-void RepliesWidget::listMarkContentsRead(
+void ChatWidget::listMarkContentsRead(
 		const base::flat_set<not_null<HistoryItem*>> &items) {
 	session().api().markContentsRead(items);
 }
 
-MessagesBarData RepliesWidget::listMessagesBar(
-		const std::vector<not_null<Element*>> &elements) {
-	if (elements.empty()) {
+MessagesBarData ChatWidget::listMessagesBar(
+		const std::vector<not_null<Element*>> &elements,
+		bool markLastAsRead) {
+	if ((!_sublist && !_replies) || elements.empty()) {
+		return {};
+	} else if (_sublist && !_sublist->parentChat()) {
 		return {};
 	}
-	const auto till = _replies->computeInboxReadTillFull();
+	const auto till = _replies
+		? _replies->computeInboxReadTillFull()
+		: _sublist->computeInboxReadTillFull();
 	const auto hidden = (till < 2);
 	for (auto i = 0, count = int(elements.size()); i != count; ++i) {
 		const auto item = elements[i]->data();
 		if (item->isRegular() && item->id > till) {
-			if (item->out() || !item->replyToId()) {
-				_replies->readTill(item);
+			if (markLastAsRead
+				|| item->out()
+				|| (_replies && !item->replyToId())) {
+				if (markLastAsRead) {
+					if (item->isUnreadMention() && !item->isUnreadMedia()) {
+						session().api().markContentsRead(item);
+					}
+					item->markClientSideAsRead();
+				}
+				if (_replies) {
+					_replies->readTill(item);
+				} else {
+					_sublist->readTill(item);
+				}
 			} else {
 				return {
 					.bar = {
@@ -2542,10 +3260,10 @@ MessagesBarData RepliesWidget::listMessagesBar(
 	return {};
 }
 
-void RepliesWidget::listContentRefreshed() {
+void ChatWidget::listContentRefreshed() {
 }
 
-void RepliesWidget::listUpdateDateLink(
+void ChatWidget::listUpdateDateLink(
 		ClickHandlerPtr &link,
 		not_null<Element*> view) {
 	if (!_topic) {
@@ -2560,17 +3278,19 @@ void RepliesWidget::listUpdateDateLink(
 	}
 }
 
-bool RepliesWidget::listElementHideReply(not_null<const Element*> view) {
-	if (const auto reply = view->data()->Get<HistoryMessageReply>()) {
+bool ChatWidget::listElementHideReply(not_null<const Element*> view) {
+	if (_sublist) {
+		return false;
+	} else if (const auto reply = view->data()->Get<HistoryMessageReply>()) {
 		const auto replyToPeerId = reply->externalPeerId()
 			? reply->externalPeerId()
-			: _history->peer->id;
+			: _peer->id;
 		if (reply->fields().manualQuote) {
 			return false;
-		} else if (replyToPeerId == _history->peer->id) {
-			return (reply->messageId() == _rootId);
-		} else if (_root) {
-			const auto forwarded = _root->Get<HistoryMessageForwarded>();
+		} else if (replyToPeerId == _peer->id) {
+			return (_repliesRootId && reply->messageId() == _repliesRootId);
+		} else if (const auto root = _repliesRoot) {
+			const auto forwarded = root->Get<HistoryMessageForwarded>();
 			if (forwarded
 				&& forwarded->savedFromPeer
 				&& forwarded->savedFromPeer->id == replyToPeerId
@@ -2582,62 +3302,96 @@ bool RepliesWidget::listElementHideReply(not_null<const Element*> view) {
 	return false;
 }
 
-bool RepliesWidget::listElementShownUnread(not_null<const Element*> view) {
-	return _replies->isServerSideUnread(view->data());
+bool ChatWidget::listElementShownUnread(not_null<const Element*> view) {
+	const auto item = view->data();
+	return _replies
+		? _replies->isServerSideUnread(item)
+		: _sublist
+		? _sublist->isServerSideUnread(item)
+		: item->unread(item->history());
 }
 
-bool RepliesWidget::listIsGoodForAroundPosition(
+bool ChatWidget::listIsGoodForAroundPosition(
 		not_null<const Element*> view) {
 	return view->data()->isRegular();
 }
 
-void RepliesWidget::listSendBotCommand(
+void ChatWidget::listSendBotCommand(
 		const QString &command,
 		const FullMsgId &context) {
+	if (!_sublist || _sublist->parentChat()) {
+		sendBotCommandWithOptions(command, context, {});
+	}
+}
+
+void ChatWidget::sendBotCommandWithOptions(
+		const QString &command,
+		const FullMsgId &context,
+		Api::SendOptions options) {
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = options;
+		copy.starsApproved = approved;
+		sendBotCommandWithOptions(command, context, copy);
+	};
+	const auto checked = checkSendPayment(
+		1,
+		options,
+		withPaymentApproved);
+	if (!checked) {
+		return;
+	}
+
 	const auto text = Bot::WrapCommandInChat(
-		_history->peer,
+		_peer,
 		command,
 		context);
-	auto message = Api::MessageToSend(prepareSendAction({}));
+	auto message = Api::MessageToSend(prepareSendAction(options));
 	message.textWithTags = { text };
 	session().api().sendMessage(std::move(message));
 	finishSending();
 }
 
-void RepliesWidget::listSearch(
+void ChatWidget::listSearch(
 		const QString &query,
 		const FullMsgId &context) {
-	controller()->searchMessages(query, _history);
+	const auto inChat = !_sublist
+		? Dialogs::Key(_history)
+		: Data::SearchTagFromQuery(query)
+		? Dialogs::Key(_sublist)
+		: Dialogs::Key();
+	controller()->searchMessages(query, inChat);
 }
 
-void RepliesWidget::listHandleViaClick(not_null<UserData*> bot) {
-	_composeControls->setText({ '@' + bot->username() + ' ' });
+void ChatWidget::listHandleViaClick(not_null<UserData*> bot) {
+	if (_canSendTexts) {
+		_composeControls->setText({ '@' + bot->username() + ' ' });
+	}
 }
 
-not_null<Ui::ChatTheme*> RepliesWidget::listChatTheme() {
+not_null<Ui::ChatTheme*> ChatWidget::listChatTheme() {
 	return _theme.get();
 }
 
-CopyRestrictionType RepliesWidget::listCopyRestrictionType(
+CopyRestrictionType ChatWidget::listCopyRestrictionType(
 		HistoryItem *item) {
-	return CopyRestrictionTypeFor(_history->peer, item);
+	return CopyRestrictionTypeFor(_peer, item);
 }
 
-CopyRestrictionType RepliesWidget::listCopyMediaRestrictionType(
+CopyRestrictionType ChatWidget::listCopyMediaRestrictionType(
 		not_null<HistoryItem*> item) {
-	return CopyMediaRestrictionTypeFor(_history->peer, item);
+	return CopyMediaRestrictionTypeFor(_peer, item);
 }
 
-CopyRestrictionType RepliesWidget::listSelectRestrictionType() {
-	return SelectRestrictionTypeFor(_history->peer);
+CopyRestrictionType ChatWidget::listSelectRestrictionType() {
+	return SelectRestrictionTypeFor(_peer);
 }
 
-auto RepliesWidget::listAllowedReactionsValue()
+auto ChatWidget::listAllowedReactionsValue()
 -> rpl::producer<Data::AllowedReactions> {
-	return Data::PeerAllowedReactionsValue(_history->peer);
+	return Data::PeerAllowedReactionsValue(_peer);
 }
 
-void RepliesWidget::listShowPremiumToast(not_null<DocumentData*> document) {
+void ChatWidget::listShowPremiumToast(not_null<DocumentData*> document) {
 	if (!_stickerToast) {
 		_stickerToast = std::make_unique<HistoryView::StickerToast>(
 			controller(),
@@ -2647,23 +3401,59 @@ void RepliesWidget::listShowPremiumToast(not_null<DocumentData*> document) {
 	_stickerToast->showFor(document);
 }
 
-void RepliesWidget::listOpenPhoto(
+bool ChatWidget::handleDrawToReplyRequest(Data::DrawToReplyRequest request) {
+	if (request.messageId.peer != _peer->id) {
+		return false;
+	}
+	auto image = ResolveDrawToReplyImage(&session().data(), request);
+	if (image.isNull()) {
+		return false;
+	}
+	const auto replyTo = request.messageId;
+	OpenDrawToReplyEditor(
+		controller(),
+		std::move(image),
+		crl::guard(this, [=](QImage &&result) {
+			if (result.isNull()) {
+				return;
+			}
+			if (replyTo) {
+				replyToMessage({ .messageId = replyTo });
+			}
+			auto list = Storage::PrepareMediaFromImage(
+				std::move(result),
+				QByteArray(),
+				st::sendMediaPreviewSize);
+			confirmSendingFiles(std::move(list));
+		}));
+	return true;
+}
+
+void ChatWidget::listOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) {
-	controller()->openPhoto(photo, { context, _rootId });
+	const auto showDrawButton = _topic
+		? Data::CanSendAnyOf(_topic, Data::FilesSendRestrictions())
+		: Data::CanSendAnyOf(_peer, Data::FilesSendRestrictions());
+	controller()->openPhoto(
+		photo,
+		{ context, _repliesRootId, _monoforumPeerId, showDrawButton });
 }
 
-void RepliesWidget::listOpenDocument(
+void ChatWidget::listOpenDocument(
 		not_null<DocumentData*> document,
 		FullMsgId context,
 		bool showInMediaView) {
+	const auto showDrawButton = _topic
+		? Data::CanSendAnyOf(_topic, Data::FilesSendRestrictions())
+		: Data::CanSendAnyOf(_peer, Data::FilesSendRestrictions());
 	controller()->openDocument(
 		document,
 		showInMediaView,
-		{ context, _rootId });
+		{ context, _repliesRootId, _monoforumPeerId, showDrawButton });
 }
 
-void RepliesWidget::listPaintEmpty(
+void ChatWidget::listPaintEmpty(
 		Painter &p,
 		const Ui::ChatPaintContext &context) {
 	if (!emptyShown()) {
@@ -2674,29 +3464,29 @@ void RepliesWidget::listPaintEmpty(
 	_emptyPainter->paint(p, context.st, width(), _scroll->height());
 }
 
-QString RepliesWidget::listElementAuthorRank(not_null<const Element*> view) {
+QString ChatWidget::listElementAuthorRank(not_null<const Element*> view) {
 	return (_topic && view->data()->from()->id == _topic->creatorId())
 		? tr::lng_topic_author_badge(tr::now)
 		: QString();
 }
 
-bool RepliesWidget::listElementHideTopicButton(
+bool ChatWidget::listElementHideTopicButton(
 		not_null<const Element*> view) {
 	return true;
 }
 
-History *RepliesWidget::listTranslateHistory() {
+History *ChatWidget::listTranslateHistory() {
 	return _history;
 }
 
-void RepliesWidget::listAddTranslatedItems(
+void ChatWidget::listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) {
 	if (_shownPinnedItem) {
 		tracker->add(_shownPinnedItem);
 	}
 }
 
-Ui::ChatPaintContext RepliesWidget::listPreparePaintContext(
+Ui::ChatPaintContext ChatWidget::listPreparePaintContext(
 		Ui::ChatPaintContextArgs &&args) {
 	auto context = WindowListDelegate::listPreparePaintContext(
 		std::move(args));
@@ -2704,7 +3494,34 @@ Ui::ChatPaintContext RepliesWidget::listPreparePaintContext(
 	return context;
 }
 
-void RepliesWidget::setupEmptyPainter() {
+base::unique_qptr<Ui::PopupMenu> ChatWidget::listFillSenderUserpicMenu(
+		PeerId userpicPeerId) {
+	const auto searchInEntry = _topic
+		? Dialogs::Key(_topic)
+		: Dialogs::Key(_history);
+	auto menu = base::make_unique_q<Ui::PopupMenu>(
+		this,
+		st::popupMenuWithIcons);
+	const auto senderPeer = _history->owner().peer(userpicPeerId);
+	const auto groupPeer = (_history->peer->isChat()
+		|| _history->peer->isMegagroup())
+		? _history->peer.get()
+		: nullptr;
+	Window::FillSenderUserpicMenu(
+		controller(),
+		senderPeer,
+		groupPeer,
+		_composeControls->fieldForMention(),
+		searchInEntry,
+		Ui::Menu::CreateAddActionCallback(menu.get()));
+	return menu->empty() ? nullptr : std::move(menu);
+}
+
+Ui::ScrollArea *ChatWidget::listScrollArea() const {
+	return _scroll.get();
+}
+
+void ChatWidget::setupEmptyPainter() {
 	Expects(_topic != nullptr);
 
 	_emptyPainter = std::make_unique<EmptyPainter>(_topic, [=] {
@@ -2719,27 +3536,26 @@ void RepliesWidget::setupEmptyPainter() {
 	});
 }
 
-void RepliesWidget::confirmDeleteSelected() {
+void ChatWidget::confirmDeleteSelected() {
 	ConfirmDeleteSelectedItems(_inner);
 }
 
-void RepliesWidget::confirmForwardSelected() {
+void ChatWidget::confirmForwardSelected() {
 	ConfirmForwardSelectedItems(_inner);
 }
 
-void RepliesWidget::clearSelected() {
+void ChatWidget::clearSelected() {
 	_inner->cancelSelection();
 }
 
-void RepliesWidget::setupDragArea() {
+void ChatWidget::setupDragArea() {
 	const auto filter = [=](const auto &d) {
 		if (!_history || _composeControls->isRecording()) {
 			return false;
 		}
-		const auto peer = _history->peer;
 		return _topic
 			? Data::CanSendAnyOf(_topic, Data::FilesSendRestrictions())
-			: Data::CanSendAnyOf(peer, Data::FilesSendRestrictions());
+			: Data::CanSendAnyOf(_peer, Data::FilesSendRestrictions());
 	};
 	const auto areas = DragArea::SetupDragAreaToContainer(
 		this,
@@ -2757,27 +3573,115 @@ void RepliesWidget::setupDragArea() {
 	areas.photo->setDroppedCallback(droppedCallback(true));
 }
 
-void RepliesWidget::setupShortcuts() {
+void ChatWidget::setupShortcuts() {
 	Shortcuts::Requests(
 	) | rpl::filter([=] {
-		return _topic
-			&& Ui::AppInFocus()
+		return Ui::AppInFocus()
 			&& Ui::InFocusChain(this)
 			&& !controller()->isLayerShown()
 			&& (Core::App().activeWindow() == &controller()->window());
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(Command::Search, 1) && request->handle([=] {
-			searchInTopic();
+			searchRequested();
 			return true;
 		});
 	}, lifetime());
 }
 
-void RepliesWidget::searchInTopic() {
+void ChatWidget::searchRequested() {
+	if (_sublist) {
+		controller()->searchInChat(_sublist);
+	} else if (!preventsClose(crl::guard(this, [=] { searchInTopic(); }))) {
+		searchInTopic();
+	}
+}
+
+void ChatWidget::searchInTopic() {
 	if (_topic) {
 		controller()->searchInChat(_topic);
+	} else {
+		const auto update = [=] {
+			if (_composeSearch) {
+				_composeControls->hide();
+			} else {
+				_composeControls->show();
+			}
+			updateControlsGeometry();
+		};
+		const auto from = (PeerData*)(nullptr);
+		_composeSearch = std::make_unique<HistoryView::ComposeSearch>(
+			this,
+			controller(),
+			_history,
+			from);
+		_composeSearch->setTopMsgId(_repliesRootId);
+
+		update();
+		doSetInnerFocus();
+
+		using Activation = HistoryView::ComposeSearch::Activation;
+		_composeSearch->activations(
+		) | rpl::on_next([=](Activation activation) {
+			showAtPosition(activation.item->position());
+		}, _composeSearch->lifetime());
+
+		_composeSearch->destroyRequests(
+		) | rpl::take(1) | rpl::on_next([=] {
+			_composeSearch = nullptr;
+
+			update();
+			doSetInnerFocus();
+		}, _composeSearch->lifetime());
+	}
+}
+
+bool ChatWidget::searchInChatEmbedded(
+		QString query,
+		Dialogs::Key chat,
+		PeerData *searchFrom) {
+	const auto sublist = chat.sublist();
+	if (!sublist || sublist != _sublist) {
+		return false;
+	} else if (_composeSearch) {
+		_composeSearch->setQuery(query);
+		_composeSearch->setInnerFocus();
+		return true;
 	}
+	_composeSearch = std::make_unique<ComposeSearch>(
+		this,
+		controller(),
+		_history,
+		sublist->sublistPeer(),
+		query);
+	_composeSearch->setCalendarChat(Dialogs::Key(sublist));
+
+	updateControlsGeometry();
+	setInnerFocus();
+
+	_composeSearch->activations(
+	) | rpl::on_next([=](ComposeSearch::Activation activation) {
+		const auto item = activation.item;
+		auto params = ::Window::SectionShow(
+			::Window::SectionShow::Way::ClearStack);
+		params.highlight = Window::SearchHighlightId(activation.query);
+		controller()->showPeerHistory(
+			item->history()->peer->id,
+			params,
+			item->fullId().msg);
+	}, _composeSearch->lifetime());
+
+	_composeSearch->destroyRequests(
+	) | rpl::take(
+		1
+	) | rpl::on_next([=] {
+		_composeSearch = nullptr;
+
+		updateControlsGeometry();
+		setInnerFocus();
+	}, _composeSearch->lifetime());
+
+	return true;
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_chat_section.h
similarity index 73%
rename from Telegram/SourceFiles/history/view/history_view_replies_section.h
rename to Telegram/SourceFiles/history/view/history_view_chat_section.h
index 71321f14c5df43..c87f64cf689d33 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_chat_section.h
@@ -11,8 +11,9 @@ For license and copyright information please follow this link:
 #include "window/section_memento.h"
 #include "history/view/history_view_corner_buttons.h"
 #include "history/view/history_view_list_widget.h"
-#include "history/history_view_swipe_data.h"
+#include "history/history_item_helpers.h"
 #include "data/data_messages.h"
+#include "ui/controls/swipe_handler_data.h"
 #include "base/timer.h"
 
 class History;
@@ -38,6 +39,7 @@ class PlainShadow;
 class FlatButton;
 class PinnedBar;
 struct PreparedList;
+struct PreparedBundle;
 class SendFilesWay;
 } // namespace Ui
 
@@ -52,6 +54,7 @@ class Result;
 namespace Data {
 class RepliesList;
 class ForumTopic;
+struct DrawToReplyRequest;
 } // namespace Data
 
 namespace HistoryView {
@@ -62,28 +65,40 @@ struct VoiceToSend;
 
 class Element;
 class TopBarWidget;
-class RepliesMemento;
+class ChatMemento;
 class ComposeControls;
+class ComposeSearch;
 class SendActionPainter;
 class StickerToast;
 class TopicReopenBar;
 class EmptyPainter;
 class PinnedTracker;
 class TranslateBar;
+class SubsectionTabs;
+class SelfForwardsTagger;
 
-class RepliesWidget final
+struct ChatViewId {
+	not_null<History*> history;
+	MsgId repliesRootId;
+	Data::SavedSublist *sublist = nullptr;
+
+	friend inline bool operator==(ChatViewId, ChatViewId) = default;
+};
+
+class ChatWidget final
 	: public Window::SectionWidget
 	, private WindowListDelegate
 	, private CornerButtonsDelegate {
 public:
-	RepliesWidget(
+	ChatWidget(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
-		not_null<History*> history,
-		MsgId rootId);
-	~RepliesWidget();
+		ChatViewId id);
+	~ChatWidget();
 
-	[[nodiscard]] not_null<History*> history() const;
+	[[nodiscard]] ChatViewId id() const {
+		return _id;
+	}
 	Dialogs::RowDescriptor activeChat() const override;
 	bool preventsClose(Fn<void()> &&continueCallback) const override;
 
@@ -97,6 +112,7 @@ class RepliesWidget final
 	bool showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
+	bool sameTypeAs(not_null<Window::SectionMemento*> memento) override;
 	std::shared_ptr<Window::SectionMemento> createMemento() override;
 	bool showMessage(
 		PeerId peerId,
@@ -106,12 +122,17 @@ class RepliesWidget final
 	Window::SectionActionResult sendBotCommand(
 		Bot::SendCommandRequest request) override;
 
+	bool searchInChatEmbedded(
+		QString query,
+		Dialogs::Key chat,
+		PeerData *searchFrom = nullptr) override;
+
 	bool confirmSendingFiles(const QStringList &files) override;
 	bool confirmSendingFiles(not_null<const QMimeData*> data) override;
 
 	void setInternalState(
 		const QRect &geometry,
-		not_null<RepliesMemento*> memento);
+		not_null<ChatMemento*> memento);
 
 	// Tabbed selector management.
 	bool pushTabbedSelectorToThirdSection(
@@ -143,7 +164,8 @@ class RepliesWidget final
 	void listMarkContentsRead(
 		const base::flat_set<not_null<HistoryItem*>> &items) override;
 	MessagesBarData listMessagesBar(
-		const std::vector<not_null<Element*>> &elements) override;
+		const std::vector<not_null<Element*>> &elements,
+		bool markLastAsRead) override;
 	void listContentRefreshed() override;
 	void listUpdateDateLink(
 		ClickHandlerPtr &link,
@@ -166,6 +188,7 @@ class RepliesWidget final
 	auto listAllowedReactionsValue()
 		->rpl::producer<Data::AllowedReactions> override;
 	void listShowPremiumToast(not_null<DocumentData*> document) override;
+	bool handleDrawToReplyRequest(Data::DrawToReplyRequest request);
 	void listOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) override;
@@ -183,6 +206,9 @@ class RepliesWidget final
 		not_null<TranslateTracker*> tracker) override;
 	Ui::ChatPaintContext listPreparePaintContext(
 		Ui::ChatPaintContextArgs &&args) override;
+	base::unique_qptr<Ui::PopupMenu> listFillSenderUserpicMenu(
+		PeerId userpicPeerId) override;
+	Ui::ScrollArea *listScrollArea() const override;
 
 	// CornerButtonsDelegate delegate.
 	void cornerButtonsShowAtPosition(
@@ -204,12 +230,29 @@ class RepliesWidget final
 	void checkActivation() override;
 	void doSetInnerFocus() override;
 
+	[[nodiscard]] bool checkSendPayment(
+		int messagesCount,
+		Api::SendOptions options,
+		Fn<void(int)> withPaymentApproved);
+
+	void markLoaded();
+	[[nodiscard]] rpl::producer<Data::MessagesSlice> repliesSource(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter);
+	[[nodiscard]] rpl::producer<Data::MessagesSlice> sublistSource(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter);
+
 	void onScroll();
+	void closeCurrent();
+	void unreadCountUpdated();
 	void updateInnerVisibleArea();
 	void updateControlsGeometry();
 	void updateAdaptiveLayout();
-	void saveState(not_null<RepliesMemento*> memento);
-	void restoreState(not_null<RepliesMemento*> memento);
+	void saveState(not_null<ChatMemento*> memento);
+	void restoreState(not_null<ChatMemento*> memento);
 	void setReplies(std::shared_ptr<Data::RepliesList> replies);
 	void refreshReplies();
 	void showAtStart();
@@ -224,18 +267,24 @@ class RepliesWidget final
 	void finishSending();
 
 	void setupComposeControls();
-	void setupSwipeReply();
+	void setupSwipeReplyAndBack();
 
 	void setupRoot();
 	void setupRootView();
 	void setupTopicViewer();
 	void subscribeToTopic();
+	void subscribeToSublist();
 	void subscribeToPinnedMessages();
 	void setTopic(Data::ForumTopic *topic);
+
+	void setupOpenChatButton();
+	void setupAboutHiddenAuthor();
+
 	void setupDragArea();
 	void setupShortcuts();
 	void setupTranslateBar();
 
+	void searchRequested();
 	void searchInTopic();
 	void updatePinnedVisibility();
 
@@ -246,18 +295,28 @@ class RepliesWidget final
 
 	[[nodiscard]] Api::SendAction prepareSendAction(
 		Api::SendOptions options) const;
+	void sendTextWithTags(
+		TextWithTags textWithTags,
+		bool useCurrentWebPageDraft,
+		Api::SendOptions options,
+		Fn<void()> done);
+	void sendWithTextOverride(
+		TextWithEntities text,
+		Api::SendOptions options,
+		Fn<void()> done);
 	void send();
 	void send(Api::SendOptions options);
-	void sendVoice(Controls::VoiceToSend &&data);
+	void sendVoice(const Controls::VoiceToSend &data);
 	void edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
 		mtpRequestId *const saveEditMsgRequestId,
 		bool spoilered);
 	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos);
-	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
+	[[nodiscard]] SendMenu::Details sendMenuDetails() const override;
+	bool processChosenSticker(ChatHelpers::FileChosen &&chosen) override;
 	[[nodiscard]] FullReplyTo replyTo() const;
-	[[nodiscard]] HistoryItem *lookupRoot() const;
+	[[nodiscard]] HistoryItem *lookupRepliesRoot() const;
 	[[nodiscard]] Data::ForumTopic *lookupTopic();
 	[[nodiscard]] bool computeAreComments() const;
 	void orderWidgets();
@@ -296,15 +355,16 @@ class RepliesWidget final
 		std::optional<bool> overrideSendImagesAsPhotos,
 		const QString &insertTextOnCancel = QString());
 	bool showSendingFilesError(const Ui::PreparedList &list) const;
-	bool showSendingFilesError(
-		const Ui::PreparedList &list,
-		std::optional<bool> compress) const;
+	bool showSendingFilesError(const Ui::PreparedBundle &bundle) const;
+
 	void sendingFilesConfirmed(
-		Ui::PreparedList &&list,
-		Ui::SendFilesWay way,
-		TextWithTags &&caption,
-		Api::SendOptions options,
-		bool ctrlShiftEnter);
+		std::shared_ptr<Ui::PreparedBundle> bundle,
+		Api::SendOptions options);
+
+	void sendBotCommandWithOptions(
+		const QString &command,
+		const FullMsgId &context,
+		Api::SendOptions options);
 
 	bool sendExistingDocument(
 		not_null<DocumentData*> document,
@@ -315,37 +375,54 @@ class RepliesWidget final
 		not_null<PhotoData*> photo,
 		Api::SendOptions options);
 	void sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot);
 	void sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot,
 		Api::SendOptions options,
 		std::optional<MsgId> localMessageId);
 
+	void validateSubsectionTabs() override;
 	void setupEmptyPainter();
 	void refreshJoinGroupButton();
 	[[nodiscard]] bool emptyShown() const;
 	[[nodiscard]] bool showSlowmodeError();
 
 	const not_null<History*> _history;
-	MsgId _rootId = 0;
-	std::shared_ptr<Ui::ChatTheme> _theme;
-	HistoryItem *_root = nullptr;
+	const not_null<PeerData*> _peer;
+	ChatViewId _id;
+
+	MsgId _repliesRootId = 0;
+	HistoryItem *_repliesRoot = nullptr;
 	Data::ForumTopic *_topic = nullptr;
 	mutable bool _newTopicDiscarded = false;
-
 	std::shared_ptr<Data::RepliesList> _replies;
 	rpl::lifetime _repliesLifetime;
 	rpl::variable<bool> _areComments = false;
+
+	Data::SavedSublist *_sublist = nullptr;
+	PeerId _monoforumPeerId;
+
 	std::shared_ptr<SendActionPainter> _sendAction;
+	std::shared_ptr<Ui::ChatTheme> _theme;
 	QPointer<ListWidget> _inner;
 	object_ptr<TopBarWidget> _topBar;
 	object_ptr<Ui::PlainShadow> _topBarShadow;
+	std::unique_ptr<Ui::RpWidget> _topBars;
 	std::unique_ptr<ComposeControls> _composeControls;
+	std::unique_ptr<ComposeSearch> _composeSearch;
 	std::unique_ptr<Ui::FlatButton> _joinGroup;
+	std::unique_ptr<Ui::FlatButton> _payForMessage;
 	std::unique_ptr<TopicReopenBar> _topicReopenBar;
+	std::unique_ptr<Ui::FlatButton> _openChatButton;
+	std::unique_ptr<Ui::RpWidget> _aboutHiddenAuthor;
 	std::unique_ptr<EmptyPainter> _emptyPainter;
+	std::unique_ptr<SubsectionTabs> _subsectionTabs;
+	rpl::lifetime _subsectionTabsLifetime;
+	rpl::lifetime _subsectionCheckLifetime;
+	rpl::lifetime _subsectionTopicsLifetime;
+	bool _canSendTexts = false;
 	bool _skipScrollEvent = false;
 	bool _synteticScrollEvent = false;
 
@@ -358,13 +435,14 @@ class RepliesWidget final
 	int _pinnedBarHeight = 0;
 	FullMsgId _pinnedClickedId;
 	std::optional<FullMsgId> _minPinnedId;
+	bool _pinnedBarHasCustomButton = false;
 	HistoryItem *_shownPinnedItem = nullptr;
 
-	std::unique_ptr<Ui::PinnedBar> _rootView;
-	int _rootViewHeight = 0;
-	bool _rootViewInited = false;
-	bool _rootViewInitScheduled = false;
-	rpl::variable<bool> _rootVisible = false;
+	std::unique_ptr<Ui::PinnedBar> _repliesRootView;
+	int _repliesRootViewHeight = 0;
+	bool _repliesRootViewInited = false;
+	bool _repliesRootViewInitScheduled = false;
+	rpl::variable<bool> _repliesRootVisible = false;
 
 	std::unique_ptr<Ui::ScrollArea> _scroll;
 	std::unique_ptr<HistoryView::StickerToast> _stickerToast;
@@ -373,7 +451,10 @@ class RepliesWidget final
 	HistoryView::CornerButtons _cornerButtons;
 	rpl::lifetime _topicLifetime;
 
-	HistoryView::ChatPaintGestureHorizontalData _gestureHorizontal;
+	Ui::Controls::SwipeContextData _gestureHorizontal;
+	Ui::Controls::SwipeBackResult _swipeBackData;
+
+	SendPaymentHelper _sendPayment;
 
 	int _lastScrollTop = 0;
 	int _topicReopenBarHeight = 0;
@@ -383,17 +464,21 @@ class RepliesWidget final
 
 	bool _loaded = false;
 
+	std::unique_ptr<HistoryView::SelfForwardsTagger> _selfForwardsTagger;
+
 };
 
-class RepliesMemento final : public Window::SectionMemento {
+class ChatMemento final : public Window::SectionMemento {
 public:
-	RepliesMemento(
-		not_null<History*> history,
-		MsgId rootId,
+	explicit ChatMemento(
+		ChatViewId id,
 		MsgId highlightId = 0,
-		const TextWithEntities &highlightPart = {},
-		int highlightPartOffsetHint = 0);
-	explicit RepliesMemento(
+		MessageHighlightId highlight = {});
+
+	struct Comments {
+	};
+	explicit ChatMemento(
+		Comments,
 		not_null<HistoryItem*> commentsItem,
 		MsgId commentId = 0);
 
@@ -408,11 +493,8 @@ class RepliesMemento final : public Window::SectionMemento {
 		Window::Column column,
 		const QRect &geometry) override;
 
-	[[nodiscard]] not_null<History*> getHistory() const {
-		return _history;
-	}
-	[[nodiscard]] MsgId getRootId() const {
-		return _rootId;
+	[[nodiscard]] ChatViewId id() const {
+		return _id;
 	}
 
 	void setReplies(std::shared_ptr<Data::RepliesList> replies) {
@@ -432,6 +514,7 @@ class RepliesMemento final : public Window::SectionMemento {
 	}
 
 	Data::ForumTopic *topicForRemoveRequests() const override;
+	Data::SavedSublist *sublistForRemoveRequests() const override;
 
 	[[nodiscard]] not_null<ListMemento*> list() {
 		return &_list;
@@ -439,21 +522,16 @@ class RepliesMemento final : public Window::SectionMemento {
 	[[nodiscard]] MsgId highlightId() const {
 		return _highlightId;
 	}
-	[[nodiscard]] const TextWithEntities &highlightPart() const {
-		return _highlightPart;
-	}
-	[[nodiscard]] int highlightPartOffsetHint() const {
-		return _highlightPartOffsetHint;
+	[[nodiscard]] const MessageHighlightId &highlight() const {
+		return _highlight;
 	}
 
 private:
 	void setupTopicViewer();
 
-	const not_null<History*> _history;
-	MsgId _rootId = 0;
-	const TextWithEntities _highlightPart;
-	const int _highlightPartOffsetHint = 0;
+	ChatViewId _id;
 	const MsgId _highlightId = 0;
+	const MessageHighlightId _highlight;
 	ListMemento _list;
 	std::shared_ptr<Data::RepliesList> _replies;
 	QVector<FullMsgId> _replyReturns;
diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
index a764199da6ad5d..f3c826f09d5f91 100644
--- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
@@ -21,10 +21,13 @@ For license and copyright information please follow this link:
 #include "ui/text/text_utilities.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/layers/generic_box.h"
+#include "chat_helpers/message_field.h" // PaidSendButtonText
 #include "core/click_handler_types.h"
 #include "core/ui_integration.h"
+#include "history/history.h"
 #include "data/business/data_business_chatbots.h"
 #include "data/notify/data_notify_settings.h"
+#include "data/data_emoji_statuses.h"
 #include "data/data_peer.h"
 #include "data/data_user.h"
 #include "data/data_chat.h"
@@ -35,7 +38,7 @@ For license and copyright information please follow this link:
 #include "data/data_forum_topic.h"
 #include "data/data_peer_values.h"
 #include "data/stickers/data_custom_emoji.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "window/window_peer_menu.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
@@ -73,6 +76,19 @@ namespace {
 	return false;
 }
 
+void FinalizeSetBotPhotoFirstOpenState(not_null<PeerData*> peer) {
+	using State = BotInfo::SetBotPhotoOpenState;
+
+	const auto user = peer->asUser();
+	const auto info = user ? user->botInfo.get() : nullptr;
+	if (!info || (info->setBotPhotoOpenState != State::Unknown)) {
+		return;
+	}
+	info->setBotPhotoOpenState = peer->owner().history(peer)->lastMessage()
+		? State::OpenedWithHistory
+		: State::OpenedEmpty;
+}
+
 [[nodiscard]] rpl::producer<TextWithEntities> ResolveIsCustom(
 		not_null<Data::Session*> owner,
 		DocumentId id) {
@@ -98,7 +114,7 @@ namespace {
 				text.size(),
 				Data::SerializeCustomEmojiId(document)) },
 		};
-	});
+	}) | rpl::map_error_to_done();
 }
 
 [[nodiscard]] rpl::producer<TextWithEntities> PeerCustomStatus(
@@ -112,8 +128,11 @@ namespace {
 		Data::PeerUpdate::Flag::EmojiStatus
 	) | rpl::map([=] {
 		const auto id = peer->emojiStatusId();
-		return id
-			? ResolveIsCustom(owner, id)
+		return id.collectible
+			? rpl::single(Ui::Text::SingleCustomEmoji(
+				Data::EmojiStatusCustomId(id)))
+			: id.documentId
+			? ResolveIsCustom(owner, id.documentId)
 			: rpl::single(TextWithEntities());
 	}) | rpl::flatten_latest() | rpl::distinct_until_changed();
 }
@@ -126,7 +145,7 @@ namespace {
 		st::historyContactStatusButton.ripple);
 	const auto raw = result.data();
 	raw->paintRequest(
-	) | rpl::start_with_next([=, &icon] {
+	) | rpl::on_next([=, &icon] {
 		auto p = QPainter(raw);
 		p.fillRect(raw->rect(), st::historyContactStatusButton.bgColor);
 		raw->paintRipple(p, 0, 0);
@@ -135,6 +154,53 @@ namespace {
 	return result;
 }
 
+[[nodiscard]] object_ptr<Ui::RippleButton> SetupSetBotPhotoButton(
+		object_ptr<Ui::RippleButton> button) {
+	const auto raw = button.data();
+
+	const auto icon = Ui::CreateChild<Ui::RpWidget>(raw);
+	icon->setAttribute(Qt::WA_TransparentForMouseEvents);
+	icon->paintRequest(
+	) | rpl::on_next([=] {
+		auto p = QPainter(icon);
+		st::historySetBotPhotoIcon.paintInCenter(p, icon->rect());
+	}, icon->lifetime());
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		tr::lng_managed_bot_set_photo(tr::now),
+		st::historySetBotPhotoLabel);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	raw->sizeValue(
+	) | rpl::on_next([=](QSize size) {
+		const auto closeWidth = st::historyReplyCancel.width;
+		const auto iconWidth = st::historySetBotPhotoIconSize;
+		const auto margin = st::historySetBotPhotoLabelMarginRight;
+		const auto available = size.width() - closeWidth - margin;
+		const auto labelNatural = label->naturalWidth();
+		const auto labelWidth = std::max(
+			0,
+			std::min(labelNatural, available - iconWidth));
+		const auto totalContent = iconWidth + labelWidth;
+		const auto contentLeft = std::max(0, (available - totalContent) / 2);
+		icon->setGeometry(
+			contentLeft,
+			0,
+			iconWidth,
+			size.height());
+		label->resizeToWidth(labelWidth);
+		label->moveToLeft(
+			contentLeft + iconWidth,
+			(size.height() - label->height()) / 2,
+			size.width());
+		icon->raise();
+		label->raise();
+	}, raw->lifetime());
+
+	return button;
+}
+
 } // namespace
 
 class ContactStatus::BgButton final : public Ui::RippleButton {
@@ -158,7 +224,7 @@ class ContactStatus::Bar final : public Ui::RpWidget {
 	void showState(
 		State state,
 		TextWithEntities status,
-		Fn<std::any(Fn<void()> customEmojiRepaint)> context);
+		Ui::Text::MarkedContext context);
 
 	[[nodiscard]] rpl::producer<> unarchiveClicks() const;
 	[[nodiscard]] rpl::producer<> addClicks() const;
@@ -168,6 +234,7 @@ class ContactStatus::Bar final : public Ui::RpWidget {
 	[[nodiscard]] rpl::producer<> closeClicks() const;
 	[[nodiscard]] rpl::producer<> requestInfoClicks() const;
 	[[nodiscard]] rpl::producer<> emojiStatusClicks() const;
+	[[nodiscard]] rpl::producer<> setBotPhotoClicks() const;
 
 private:
 	int resizeGetHeight(int newWidth) override;
@@ -187,6 +254,7 @@ class ContactStatus::Bar final : public Ui::RpWidget {
 	object_ptr<Ui::FlatLabel> _requestChatInfo;
 	object_ptr<Ui::PaddingWrap<Ui::FlatLabel>> _emojiStatusInfo;
 	object_ptr<Ui::PlainShadow> _emojiStatusShadow;
+	object_ptr<Ui::RippleButton> _setBotPhoto;
 	bool _emojiStatusRepaintScheduled = false;
 	bool _narrow = false;
 	rpl::event_stream<> _emojiStatusClicks;
@@ -255,10 +323,16 @@ ContactStatus::Bar::Bar(
 		st::topBarArrowPadding.top(),
 		st::historyContactStatusMinSkip,
 		st::topBarArrowPadding.top()))
-, _emojiStatusShadow(this) {
+, _emojiStatusShadow(this)
+, _setBotPhoto(
+	SetupSetBotPhotoButton(
+		object_ptr<BgButton>(this, st::historyContactStatusButton))) {
+	_close->setAccessibleName(tr::lng_cancel(tr::now));
+	_unarchiveIcon->setAccessibleName(tr::lng_new_contact_unarchive(tr::now));
+	_reportIcon->setAccessibleName(tr::lng_report_spam(tr::now));
 	_requestChatInfo->setAttribute(Qt::WA_TransparentForMouseEvents);
 	_emojiStatusInfo->paintRequest(
-	) | rpl::start_with_next([=, raw = _emojiStatusInfo.data()](QRect clip) {
+	) | rpl::on_next([=, raw = _emojiStatusInfo.data()](QRect clip) {
 		_emojiStatusRepaintScheduled = false;
 		QPainter(raw).fillRect(clip, st::historyComposeButtonBg);
 	}, lifetime());
@@ -267,7 +341,7 @@ ContactStatus::Bar::Bar(
 void ContactStatus::Bar::showState(
 		State state,
 		TextWithEntities status,
-		Fn<std::any(Fn<void()> customEmojiRepaint)> context) {
+		Ui::Text::MarkedContext context) {
 	using Type = State::Type;
 	const auto type = state.type;
 	_add->setVisible(type == Type::AddOrBlock || type == Type::Add);
@@ -278,30 +352,37 @@ void ContactStatus::Bar::showState(
 	_block->setVisible(type == Type::AddOrBlock
 		|| type == Type::UnarchiveOrBlock);
 	_share->setVisible(type == Type::SharePhoneNumber);
-	_close->setVisible(!_narrow && type != Type::RequestChatInfo);
+	_close->setVisible(
+		(!_narrow && type != Type::RequestChatInfo)
+		|| type == Type::SetBotPhoto);
 	const auto report = (type == Type::ReportSpam)
 		|| (type == Type::UnarchiveOrReport);
 	_report->setVisible(!_narrow && report);
 	_reportIcon->setVisible(_narrow && report);
 	_requestChatInfo->setVisible(type == Type::RequestChatInfo);
 	_requestChatBg->setVisible(type == Type::RequestChatInfo);
+	_setBotPhoto->setVisible(type == Type::SetBotPhoto);
 	const auto has = !status.empty();
 	_emojiStatusShadow->setVisible(
 		has && (type == Type::AddOrBlock || type == Type::UnarchiveOrBlock));
 	if (has) {
+		context.repaint = [=] { emojiStatusRepaint(); };
 		_emojiStatusInfo->entity()->setMarkedText(
 			tr::lng_new_contact_about_status(
 				tr::now,
 				lt_emoji,
 				status,
 				lt_link,
-				Ui::Text::Link(
+				tr::link(
 					tr::lng_new_contact_about_status_link(tr::now)),
-				Ui::Text::WithEntities),
-			context([=] { emojiStatusRepaint(); }));
+				tr::marked),
+			context);
 		_emojiStatusInfo->entity()->overrideLinkClickHandler([=] {
 			_emojiStatusClicks.fire({});
 		});
+		_emojiStatusInfo->entity()->setAnimationsPausedCallback([] {
+			return Ui::FlatLabel::WhichAnimationsPaused::CustomEmoji;
+		});
 	}
 	_emojiStatusInfo->setVisible(has);
 	_add->setText((type == Type::Add)
@@ -316,10 +397,10 @@ void ContactStatus::Bar::showState(
 			: tr::lng_new_contact_from_request_group)(
 			tr::now,
 			lt_user,
-			Ui::Text::Bold(_name),
+			tr::bold(_name),
 			lt_name,
-			Ui::Text::Bold(state.requestChatName),
-			Ui::Text::WithEntities));
+			tr::bold(state.requestChatName),
+			tr::marked));
 	resizeToWidth(width());
 }
 
@@ -361,12 +442,18 @@ rpl::producer<> ContactStatus::Bar::emojiStatusClicks() const {
 	return _emojiStatusClicks.events();
 }
 
+rpl::producer<> ContactStatus::Bar::setBotPhotoClicks() const {
+	return _setBotPhoto->clicks() | rpl::to_empty;
+}
+
 int ContactStatus::Bar::resizeGetHeight(int newWidth) {
 	_close->moveToRight(0, 0, newWidth);
 	const auto narrow = (newWidth < _close->width() * 2);
 	if (_narrow != narrow) {
 		_narrow = narrow;
-		_close->setVisible(_requestChatInfo->isHidden() && !_narrow);
+		_close->setVisible(
+			(_requestChatInfo->isHidden() && !_narrow)
+			|| !_setBotPhoto->isHidden());
 		const auto report = !_report->isHidden() || !_reportIcon->isHidden();
 		_report->setVisible(!_narrow && report);
 		_reportIcon->setVisible(_narrow && report);
@@ -376,6 +463,13 @@ int ContactStatus::Bar::resizeGetHeight(int newWidth) {
 		_unarchiveIcon->setVisible(_narrow && unarchive);
 	}
 
+	if (!_setBotPhoto->isHidden()) {
+		const auto closeHeight = _close->height();
+		_setBotPhoto->setGeometry(0, 0, newWidth, closeHeight);
+		_close->raise();
+		return closeHeight;
+	}
+
 	if (!_unarchiveIcon->isHidden()) {
 		const auto half = newWidth / 2;
 		_unarchiveIcon->setGeometry(0, 0, half, _close->height());
@@ -490,12 +584,12 @@ SlidingBar::SlidingBar(
 
 void SlidingBar::setup(not_null<Ui::RpWidget*> parent) {
 	parent->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_wrapped.resizeToWidth(width);
 	}, _wrapped.lifetime());
 
 	_wrapped.geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
+	) | rpl::on_next([=](QRect geometry) {
 		_shadow.setGeometry(
 			geometry.x(),
 			geometry.y() + geometry.height(),
@@ -556,6 +650,7 @@ ContactStatus::ContactStatus(
 : _controller(window)
 , _inner(Ui::CreateChild<Bar>(parent.get(), peer->shortName()))
 , _bar(parent, object_ptr<Bar>::fromRaw(_inner)) {
+	FinalizeSetBotPhotoFirstOpenState(peer);
 	setupState(peer, showInForum);
 	setupHandlers(peer);
 }
@@ -573,12 +668,22 @@ auto ContactStatus::PeerState(not_null<PeerData*> peer)
 			return flags.diff
 				& (Flag::Contact | Flag::MutualContact | Flag::Blocked);
 		});
+		auto managedBotChanges = user->session().changes().peerFlagsValue(
+			user,
+			Data::PeerUpdate::Flag::ManagedBot);
+		auto photoChanges = user->session().changes().peerFlagsValue(
+			user,
+			Data::PeerUpdate::Flag::Photo);
 		return rpl::combine(
 			std::move(changes),
-			user->barSettingsValue()
+			user->barSettingsValue(),
+			std::move(photoChanges),
+			std::move(managedBotChanges)
 		) | rpl::map([=](
 				FlagsChange flags,
-				SettingsChange settings) -> State {
+				SettingsChange settings,
+				const auto &,
+				const auto &) -> State {
 			if (flags.value & Flag::Blocked) {
 				return { Type::None };
 			} else if (user->isContact()) {
@@ -591,9 +696,9 @@ auto ContactStatus::PeerState(not_null<PeerData*> peer)
 				return {
 					.type = Type::RequestChatInfo,
 					.requestChatName = peer->requestChatTitle(),
+					.requestDate = peer->requestChatDate(),
 					.requestChatIsBroadcast = !!(settings.value
 						& PeerBarSetting::RequestChatIsBroadcast),
-					.requestDate = peer->requestChatDate(),
 				};
 			} else if (settings.value & PeerBarSetting::AutoArchived) {
 				return { Type::UnarchiveOrBlock };
@@ -601,6 +706,22 @@ auto ContactStatus::PeerState(not_null<PeerData*> peer)
 				return { Type::AddOrBlock };
 			} else if (settings.value & PeerBarSetting::AddContact) {
 				return { Type::Add };
+			} else if (user->botManagerId()) {
+				if (const auto info = user->botInfo.get()) {
+					if (info->canEditInformation) {
+						const auto hasUserpic = user->hasUserpic();
+						if (hasUserpic) {
+							info->setBotPhotoHidden = true;
+						}
+						using State = BotInfo::SetBotPhotoOpenState;
+						if (info->setBotPhotoOpenState == State::OpenedEmpty
+							&& !info->setBotPhotoHidden
+							&& !hasUserpic) {
+							return { Type::SetBotPhoto };
+						}
+					}
+				}
+				return { Type::None };
 			} else {
 				return { Type::None };
 			}
@@ -623,12 +744,7 @@ void ContactStatus::setupState(not_null<PeerData*> peer, bool showInForum) {
 		peer->session().api().requestPeerSettings(peer);
 	}
 
-	_context = [=](Fn<void()> customEmojiRepaint) {
-		return Core::MarkedTextContext{
-			.session = &peer->session(),
-			.customEmojiRepaint = customEmojiRepaint,
-		};
-	};
+	_context = Core::TextContext({ .session = &peer->session() });
 	_inner->showState({}, {}, _context);
 	const auto channel = peer->asChannel();
 	rpl::combine(
@@ -636,8 +752,8 @@ void ContactStatus::setupState(not_null<PeerData*> peer, bool showInForum) {
 		PeerCustomStatus(peer),
 		((channel && !showInForum)
 			? Data::PeerFlagValue(channel, ChannelData::Flag::Forum)
-			: (rpl::single(false) | rpl::type_erased()))
-	) | rpl::start_with_next([=](
+			: (rpl::single(false) | rpl::type_erased))
+	) | rpl::on_next([=](
 			State state,
 			TextWithEntities status,
 			bool hiddenByForum) {
@@ -658,6 +774,7 @@ void ContactStatus::setupHandlers(not_null<PeerData*> peer) {
 		setupAddHandler(user);
 		setupBlockHandler(user);
 		setupShareHandler(user);
+		setupSetBotPhotoHandler(user);
 	}
 	setupUnarchiveHandler(peer);
 	setupReportHandler(peer);
@@ -668,14 +785,14 @@ void ContactStatus::setupHandlers(not_null<PeerData*> peer) {
 
 void ContactStatus::setupAddHandler(not_null<UserData*> user) {
 	_inner->addClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->window().show(Box(EditContactBox, _controller, user));
 	}, _bar.lifetime());
 }
 
 void ContactStatus::setupBlockHandler(not_null<UserData*> user) {
 	_inner->blockClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->window().show(Box(
 			Window::PeerMenuBlockUserBox,
 			&_controller->window(),
@@ -687,12 +804,12 @@ void ContactStatus::setupBlockHandler(not_null<UserData*> user) {
 
 void ContactStatus::setupShareHandler(not_null<UserData*> user) {
 	_inner->shareClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto show = _controller->uiShow();
 		const auto share = [=](Fn<void()> &&close) {
 			user->setBarSettings(0);
 			user->session().api().request(MTPcontacts_AcceptContact(
-				user->inputUser
+				user->inputUser()
 			)).done([=](const MTPUpdates &result) {
 				user->session().api().applyUpdates(result);
 				show->showToast(tr::lng_new_contact_share_done(
@@ -706,11 +823,11 @@ void ContactStatus::setupShareHandler(not_null<UserData*> user) {
 			.text = tr::lng_new_contact_share_sure(
 				tr::now,
 				lt_phone,
-				Ui::Text::WithEntities(
+				tr::marked(
 					Ui::FormatPhone(user->session().user()->phone())),
 				lt_user,
-				Ui::Text::Bold(user->name()),
-				Ui::Text::WithEntities),
+				tr::bold(user->name()),
+				tr::marked),
 			.confirmed = share,
 			.confirmText = tr::lng_box_ok(),
 		}));
@@ -719,7 +836,7 @@ void ContactStatus::setupShareHandler(not_null<UserData*> user) {
 
 void ContactStatus::setupUnarchiveHandler(not_null<PeerData*> peer) {
 	_inner->unarchiveClicks(
-	) | rpl::start_with_next([=, show = _controller->uiShow()] {
+	) | rpl::on_next([=, show = _controller->uiShow()] {
 		using namespace Window;
 		ToggleHistoryArchived(show, peer->owner().history(peer), false);
 		peer->owner().notifySettings().resetToDefault(peer);
@@ -734,7 +851,7 @@ void ContactStatus::setupUnarchiveHandler(not_null<PeerData*> peer) {
 
 void ContactStatus::setupReportHandler(not_null<PeerData*> peer) {
 	_inner->reportClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Expects(!peer->isUser());
 
 		const auto show = _controller->uiShow();
@@ -742,7 +859,7 @@ void ContactStatus::setupReportHandler(not_null<PeerData*> peer) {
 			close();
 
 			peer->session().api().request(MTPmessages_ReportSpam(
-				peer->input
+				peer->input()
 			)).send();
 
 			crl::on_main(&peer->session(), [=] {
@@ -777,10 +894,20 @@ void ContactStatus::setupCloseHandler(not_null<PeerData*> peer) {
 	_inner->closeClicks(
 	) | rpl::filter([=] {
 		return !(*request);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
+		if (_state.type == State::Type::SetBotPhoto) {
+			if (const auto user = peer->asUser()) {
+				if (const auto info = user->botInfo.get()) {
+					info->setBotPhotoHidden = true;
+				}
+			}
+			_state = {};
+			_bar.toggleContent(false);
+			return;
+		}
 		peer->setBarSettings(0);
 		*request = peer->session().api().request(
-			MTPmessages_HidePeerSettingsBar(peer->input)
+			MTPmessages_HidePeerSettingsBar(peer->input())
 		).send();
 	}, _bar.lifetime());
 }
@@ -790,7 +917,7 @@ void ContactStatus::setupRequestInfoHandler(not_null<PeerData*> peer) {
 	_inner->requestInfoClicks(
 	) | rpl::filter([=] {
 		return !(*request);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_controller->show(Box([=](not_null<Ui::GenericBox*> box) {
 			box->setTitle((_state.requestChatIsBroadcast
 				? tr::lng_from_request_title_channel
@@ -800,12 +927,12 @@ void ContactStatus::setupRequestInfoHandler(not_null<PeerData*> peer) {
 				box,
 				tr::lng_from_request_body(
 					lt_name,
-					rpl::single(Ui::Text::Bold(_state.requestChatName)),
+					rpl::single(tr::bold(_state.requestChatName)),
 					lt_date,
-					rpl::single(langDateTimeFull(
+					rpl::single(tr::marked(langDateTimeFull(
 						base::unixtime::parse(_state.requestDate)
-					)) | Ui::Text::ToWithEntities(),
-					Ui::Text::WithEntities),
+					))),
+					tr::marked),
 				st::boxLabel));
 
 			box->addButton(tr::lng_from_request_understand(), [=] {
@@ -814,7 +941,7 @@ void ContactStatus::setupRequestInfoHandler(not_null<PeerData*> peer) {
 				}
 				peer->setBarSettings(0);
 				*request = peer->session().api().request(
-					MTPmessages_HidePeerSettingsBar(peer->input)
+					MTPmessages_HidePeerSettingsBar(peer->input())
 				).send();
 				box->closeBox();
 			});
@@ -824,11 +951,18 @@ void ContactStatus::setupRequestInfoHandler(not_null<PeerData*> peer) {
 
 void ContactStatus::setupEmojiStatusHandler(not_null<PeerData*> peer) {
 	_inner->emojiStatusClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Settings::ShowEmojiStatusPremium(_controller, peer);
 	}, _bar.lifetime());
 }
 
+void ContactStatus::setupSetBotPhotoHandler(not_null<UserData*> user) {
+	_inner->setBotPhotoClicks(
+	) | rpl::on_next([=] {
+		_controller->showEditPeerBox(user);
+	}, _bar.lifetime());
+}
+
 void ContactStatus::show() {
 	if (!_shown) {
 		_shown = true;
@@ -885,8 +1019,6 @@ BusinessBotStatus::Bar::Bar(QWidget *parent)
 	_name->setAttribute(Qt::WA_TransparentForMouseEvents);
 	_status->setAttribute(Qt::WA_TransparentForMouseEvents);
 	_togglePaused->setFullRadius(true);
-	_togglePaused->setTextTransform(
-		Ui::RoundButton::TextTransform::NoTransform);
 	_settings->setClickedCallback([=] {
 		showMenu();
 	});
@@ -943,8 +1075,8 @@ void BusinessBotStatus::Bar::showMenu() {
 		this,
 		st::popupMenuExpandedSeparator);
 	_menu->setDestroyedCallback([
-		weak = Ui::MakeWeak(this),
-		weakButton = Ui::MakeWeak(_settings.data()),
+		weak = base::make_weak(this),
+		weakButton = base::make_weak(_settings.data()),
 		menu = _menu.get()] {
 		if (weak && weak->_menu == menu) {
 			if (weakButton) {
@@ -1038,7 +1170,7 @@ void BusinessBotStatus::setupState(not_null<PeerData*> peer) {
 	}
 	PeerState(
 		peer
-	) | rpl::start_with_next([=](State state) {
+	) | rpl::on_next([=](State state) {
 		_state = state;
 		if (!state.bot) {
 			_bar.toggleContent(false);
@@ -1051,22 +1183,22 @@ void BusinessBotStatus::setupState(not_null<PeerData*> peer) {
 
 void BusinessBotStatus::setupHandlers(not_null<PeerData*> peer) {
 	_inner->pauseClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		peer->owner().chatbots().togglePaused(peer, true);
 	}, _bar.lifetime());
 
 	_inner->resumeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		peer->owner().chatbots().togglePaused(peer, false);
 	}, _bar.lifetime());
 
 	_inner->removeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		peer->owner().chatbots().removeFrom(peer);
 	}, _bar.lifetime());
 
 	_inner->manageClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		UrlClickHandler::Open(
 			_state.manageUrl,
 			QVariant::fromValue(ClickHandlerContext{
@@ -1106,8 +1238,10 @@ TopicReopenBar::TopicReopenBar(
 
 void TopicReopenBar::setupState() {
 	const auto channel = _topic->channel();
-	auto canToggle = (_topic->my() || channel->amCreator())
-		? (rpl::single(true) | rpl::type_erased())
+	auto canToggle = !channel
+		? (rpl::single(false) | rpl::type_erased)
+		: (_topic->my() || channel->amCreator())
+		? (rpl::single(true) | rpl::type_erased)
 		: channel->adminRightsValue(
 		) | rpl::map([=] { return _topic->canToggleClosed(); });
 
@@ -1116,7 +1250,7 @@ void TopicReopenBar::setupState() {
 			_topic,
 			Data::TopicUpdate::Flag::Closed),
 		std::move(canToggle)
-	) | rpl::start_with_next([=](const auto &, bool can) {
+	) | rpl::on_next([=](const auto &, bool can) {
 		_bar.toggleContent(can && _topic->closed());
 	}, _bar.lifetime());
 }
@@ -1127,4 +1261,118 @@ void TopicReopenBar::setupHandler() {
 	});
 }
 
+class PaysStatus::Bar final : public Ui::RpWidget {
+public:
+	Bar(QWidget *parent, not_null<PeerData*> peer);
+
+	void showState(State state);
+
+	[[nodiscard]] rpl::producer<> removeClicks() const;
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	int resizeGetHeight(int newWidth) override;
+
+	not_null<PeerData*> _peer;
+	object_ptr<Ui::FlatLabel> _label;
+	object_ptr<Ui::LinkButton> _remove;
+	rpl::event_stream<> _removeClicks;
+
+};
+
+PaysStatus::Bar::Bar(QWidget *parent, not_null<PeerData*> peer)
+: RpWidget(parent)
+, _peer(peer)
+, _label(this, st::paysStatusLabel)
+, _remove(this, tr::lng_payment_bar_button(tr::now)) {
+	_label->setAttribute(Qt::WA_TransparentForMouseEvents);
+}
+
+void PaysStatus::Bar::showState(State state) {
+	_label->setMarkedText(tr::lng_payment_bar_text(
+		tr::now,
+		lt_name,
+		TextWithEntities{ _peer->shortName() },
+		lt_cost,
+		PaidSendButtonText(tr::now, state.perMessage),
+		tr::marked));
+	resizeToWidth(width());
+}
+
+rpl::producer<> PaysStatus::Bar::removeClicks() const {
+	return _remove->clicks() | rpl::to_empty;
+}
+
+void PaysStatus::Bar::paintEvent(QPaintEvent *e) {
+	QPainter p(this);
+	p.fillRect(e->rect(), st::historyContactStatusButton.bgColor);
+}
+
+int PaysStatus::Bar::resizeGetHeight(int newWidth) {
+	const auto skip = st::defaultPeerListItem.photoPosition.y();
+	_label->resizeToWidth(newWidth - skip);
+	_label->moveToLeft(skip, skip, newWidth);
+	_remove->move(
+		(newWidth - _remove->width()) / 2,
+		skip + _label->height() + skip);
+	return _remove->y() + _remove->height() + skip;
+}
+
+PaysStatus::PaysStatus(
+	not_null<Window::SessionController*> window,
+	not_null<Ui::RpWidget*> parent,
+	not_null<UserData*> user)
+: _controller(window)
+, _user(user)
+, _paidAlready(std::make_shared<rpl::variable<int>>())
+, _inner(Ui::CreateChild<Bar>(parent.get(), user))
+, _bar(parent, object_ptr<Bar>::fromRaw(_inner)) {
+	setupState();
+	setupHandlers();
+}
+
+void PaysStatus::setupState() {
+	_user->session().api().requestPeerSettings(_user);
+
+	_user->session().changes().peerFlagsValue(
+		_user,
+		Data::PeerUpdate::Flag::PaysPerMessage
+	) | rpl::on_next([=] {
+		_state = State{ _user->paysPerMessage() };
+		if (_state.perMessage > 0) {
+			_inner->showState(_state);
+			_bar.toggleContent(true);
+		} else {
+			_bar.toggleContent(false);
+		}
+	}, _bar.lifetime());
+}
+
+void PaysStatus::setupHandlers() {
+	_inner->removeClicks(
+	) | rpl::on_next([=] {
+		Window::PeerMenuConfirmToggleFee(
+			_controller,
+			_paidAlready,
+			_user->session().user(),
+			_user,
+			true);
+	}, _bar.lifetime());
+}
+
+void PaysStatus::show() {
+	if (!_shown) {
+		_shown = true;
+		if (_state.perMessage > 0) {
+			_inner->showState(_state);
+			_bar.toggleContent(true);
+		}
+	}
+	_bar.show();
+}
+
+void PaysStatus::hide() {
+	_bar.hide();
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.h b/Telegram/SourceFiles/history/view/history_view_contact_status.h
index aafc23a6a734e4..b9250747d55153 100644
--- a/Telegram/SourceFiles/history/view/history_view_contact_status.h
+++ b/Telegram/SourceFiles/history/view/history_view_contact_status.h
@@ -93,11 +93,13 @@ class ContactStatus final {
 			UnarchiveOrReport,
 			SharePhoneNumber,
 			RequestChatInfo,
+			SetBotPhoto,
 		};
 		Type type = Type::None;
+		int starsPerMessage = 0;
 		QString requestChatName;
-		bool requestChatIsBroadcast = false;
 		TimeId requestDate = 0;
+		bool requestChatIsBroadcast = false;
 	};
 
 	void setupState(not_null<PeerData*> peer, bool showInForum);
@@ -110,13 +112,14 @@ class ContactStatus final {
 	void setupCloseHandler(not_null<PeerData*> peer);
 	void setupRequestInfoHandler(not_null<PeerData*> peer);
 	void setupEmojiStatusHandler(not_null<PeerData*> peer);
+	void setupSetBotPhotoHandler(not_null<UserData*> user);
 
 	static rpl::producer<State> PeerState(not_null<PeerData*> peer);
 
 	const not_null<Window::SessionController*> _controller;
 	State _state;
 	TextWithEntities _status;
-	Fn<std::any(Fn<void()> customEmojiRepaint)> _context;
+	Ui::Text::MarkedContext _context;
 	QPointer<Bar> _inner;
 	SlidingBar _bar;
 	bool _hiddenByForum = false;
@@ -181,4 +184,38 @@ class TopicReopenBar final {
 
 };
 
+class PaysStatus final {
+public:
+	PaysStatus(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::RpWidget*> parent,
+		not_null<UserData*> user);
+
+	void show();
+	void hide();
+
+	[[nodiscard]] SlidingBar &bar() {
+		return _bar;
+	}
+
+private:
+	class Bar;
+
+	struct State {
+		int perMessage = 0;
+	};
+
+	void setupState();
+	void setupHandlers();
+
+	const not_null<Window::SessionController*> _controller;
+	const not_null<UserData*> _user;
+	std::shared_ptr<rpl::variable<int>> _paidAlready;
+	State _state;
+	QPointer<Bar> _inner;
+	SlidingBar _bar;
+	bool _shown = false;
+
+};
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index e2eeb2988ff3c2..d2d541fa24d23b 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -15,6 +15,7 @@ For license and copyright information please follow this link:
 #include "api/api_ringtones.h"
 #include "api/api_transcribes.h"
 #include "api/api_who_reacted.h"
+#include "api/api_stickers_creator.h"
 #include "api/api_toggling_media.h" // Api::ToggleFavedSticker
 #include "base/qt/qt_key_modifiers.h"
 #include "base/unixtime.h"
@@ -22,27 +23,40 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_cursor_state.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/history_item_components.h"
 #include "history/history_item_text.h"
 #include "history/view/history_view_schedule_box.h"
 #include "history/view/media/history_view_media.h"
+#include "history/view/media/menu/history_view_poll_menu.h"
+#include "history/view/media/history_view_save_document_action.h"
 #include "history/view/media/history_view_web_page.h"
 #include "history/view/reactions/history_view_reactions_list.h"
 #include "info/info_memento.h"
-#include "info/profile/info_profile_widget.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/menu/menu_action.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/menu/menu_common.h"
 #include "ui/widgets/menu/menu_multiline_action.h"
+#include "ui/widgets/menu/menu_separator.h"
 #include "ui/image/image.h"
 #include "ui/toast/toast.h"
 #include "ui/text/format_song_document_name.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/controls/delete_message_context_action.h"
 #include "ui/controls/who_reacted_context_action.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
 #include "ui/boxes/edit_factcheck_box.h"
 #include "ui/boxes/report_box_graphics.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/ui_utility.h"
+#include "ui/widgets/pill_tabs.h"
 #include "menu/menu_item_download_files.h"
+#include "menu/menu_item_rate_transcribe.h"
+#include "menu/menu_item_rate_transcribe_session.h"
+#include "menu/menu_timecode_action.h"
 #include "menu/menu_send.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/boxes/show_or_premium_box.h"
@@ -59,6 +73,7 @@ For license and copyright information please follow this link:
 #include "data/data_photo_media.h"
 #include "data/data_document.h"
 #include "data/data_media_types.h"
+#include "data/data_poll.h"
 #include "data/data_forum_topic.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
@@ -66,7 +81,6 @@ For license and copyright information please follow this link:
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_file_click_handler.h"
-#include "data/data_file_origin.h"
 #include "data/data_message_reactions.h"
 #include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
@@ -75,14 +89,17 @@ For license and copyright information please follow this link:
 #include "core/click_handler_types.h"
 #include "base/platform/base_platform_info.h"
 #include "base/call_delayed.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "window/window_peer_menu.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "lang/lang_keys.h"
 #include "core/application.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "media/audio/media_audio.h"
+#include "media/player/media_player_instance.h"
 #include "spellcheck/spellcheck_types.h"
 #include "apiwrap.h"
 #include "styles/style_chat.h"
@@ -97,6 +114,7 @@ namespace {
 
 constexpr auto kRescheduleLimit = 20;
 constexpr auto kTagNameLimit = 12;
+constexpr auto kPublicPostLinkToastDuration = 4 * crl::time(1000);
 
 bool HasEditMessageAction(
 		const ContextMenuRequest &request,
@@ -111,7 +129,8 @@ bool HasEditMessageAction(
 		|| (context != Context::History
 			&& context != Context::Replies
 			&& context != Context::ShortcutMessages
-			&& context != Context::ScheduledTopic)) {
+			&& context != Context::ScheduledTopic
+			&& context != Context::Monoforum)) {
 		return false;
 	}
 	const auto peer = item->history()->peer;
@@ -231,39 +250,6 @@ void ShowInFolder(not_null<DocumentData*> document) {
 	}
 }
 
-void AddSaveDocumentAction(
-		not_null<Ui::PopupMenu*> menu,
-		HistoryItem *item,
-		not_null<DocumentData*> document,
-		not_null<ListWidget*> list) {
-	if (list->hasCopyMediaRestriction(item) || ItemHasTtl(item)) {
-		return;
-	}
-	const auto origin = item ? item->fullId() : FullMsgId();
-	const auto save = [=] {
-		DocumentSaveClickHandler::SaveAndTrack(
-			origin,
-			document,
-			DocumentSaveClickHandler::Mode::ToNewFile);
-	};
-
-	menu->addAction(
-		(document->isVideoFile()
-			? tr::lng_context_save_video(tr::now)
-			: (document->isVoiceMessage()
-				? tr::lng_context_save_audio(tr::now)
-				: (document->isAudioFile()
-					? tr::lng_context_save_audio_file(tr::now)
-					: (document->sticker()
-						? tr::lng_context_save_image(tr::now)
-						: tr::lng_context_save_file(tr::now))))),
-		base::fn_delayed(
-			st::defaultDropdownMenu.menu.ripple.hideDuration,
-			&document->session(),
-			save),
-		&st::menuIconDownload);
-}
-
 void AddDocumentActions(
 		not_null<Ui::PopupMenu*> menu,
 		not_null<DocumentData*> document,
@@ -284,9 +270,9 @@ void AddDocumentActions(
 			item->history()->peer,
 			document);
 		if (notAutoplayedGif) {
-			const auto weak = Ui::MakeWeak(list.get());
+			const auto weak = base::make_weak(list.get());
 			menu->addAction(tr::lng_context_open_gif(tr::now), [=] {
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					OpenGif(strong, contextId);
 				}
 			}, &st::menuIconShowInChat);
@@ -304,6 +290,15 @@ void AddDocumentActions(
 				: tr::lng_context_pack_add(tr::now)),
 			[=] { ShowStickerPackInfo(document, list); },
 			&st::menuIconStickers);
+	}
+	const auto sending = item && item->isSending();
+	if (!sending && document->sticker() && !document->sticker()->set) {
+		Api::AddAddToOwnedSetAction(
+			Ui::Menu::CreateAddActionCallback(menu),
+			controller->uiShow(),
+			document);
+	}
+	if (!sending && document->sticker()) {
 		const auto isFaved = document->owner().stickers().isFaved(document);
 		menu->addAction(
 			(isFaved
@@ -335,6 +330,16 @@ void AddDocumentActions(
 		const auto controller = list->controller();
 		AddSaveSoundForNotifications(menu, item, document, controller);
 	}
+	if ((document->isVoiceMessage()
+			|| document->isVideoMessage())
+		&& Menu::HasRateTranscribeItem(item)) {
+		if (!menu->empty()) {
+			menu->insertAction(0, base::make_unique_q<Menu::RateTranscribe>(
+				menu,
+				menu->st().menu,
+				Menu::RateTranscribeCallbackFactory(item)));
+		}
+	}
 	AddSaveDocumentAction(menu, item, document, list);
 	AddCopyFilename(
 		menu,
@@ -387,9 +392,9 @@ bool AddForwardSelectedAction(
 	}
 
 	menu->addAction(tr::lng_context_forward_selected(tr::now), [=] {
-		const auto weak = Ui::MakeWeak(list);
+		const auto weak = base::make_weak(list);
 		const auto callback = [=] {
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->cancelSelection();
 			}
 		};
@@ -468,7 +473,7 @@ bool AddSendNowSelectedAction(
 	const auto history = *histories.begin();
 
 	menu->addAction(tr::lng_context_send_now_selected(tr::now), [=] {
-		const auto weak = Ui::MakeWeak(list);
+		const auto weak = base::make_weak(list);
 		const auto callback = [=] {
 			request.navigation->showBackFromStack();
 		};
@@ -521,7 +526,7 @@ bool AddRescheduleAction(
 	const auto owner = &request.navigation->session().data();
 
 	const auto goodSingle = HasEditMessageAction(request, list)
-		&& request.item->isScheduled();
+		&& request.item->allowsReschedule();
 	const auto goodMany = [&] {
 		if (goodSingle) {
 			return false;
@@ -533,7 +538,7 @@ bool AddRescheduleAction(
 		if (items.size() > kRescheduleLimit) {
 			return false;
 		}
-		return ranges::all_of(items, &SelectedItem::canSendNow);
+		return ranges::all_of(items, &SelectedItem::canReschedule);
 	}();
 	if (!goodSingle && !goodMany) {
 		return false;
@@ -579,6 +584,8 @@ bool AddRescheduleAction(
 		const auto peer = firstItem->history()->peer;
 		const auto sendMenuType = !peer
 			? SendMenu::Type::Disabled
+			: peer->starsPerMessageChecked()
+			? SendMenu::Type::SilentOnly
 			: peer->isSelf()
 			? SendMenu::Type::Reminder
 			: HistoryView::CanScheduleUntilOnline(peer)
@@ -589,6 +596,7 @@ bool AddRescheduleAction(
 		const auto date = (itemDate == Api::kScheduledUntilOnlineTimestamp)
 			? HistoryView::DefaultScheduleTime()
 			: itemDate + (firstItem->isScheduled() ? 0 : crl::time(600));
+		const auto repeatPeriod = firstItem->scheduleRepeatPeriod();
 
 		const auto box = request.navigation->parentController()->show(
 			HistoryView::PrepareScheduleBox(
@@ -596,11 +604,11 @@ bool AddRescheduleAction(
 				request.navigation->uiShow(),
 				{ .type = sendMenuType, .effectAllowed = false },
 				callback,
-				{}, // initial options
+				{ .scheduleRepeatPeriod = repeatPeriod },
 				date));
 
 		owner->itemRemoved(
-		) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+		) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 			if (ranges::contains(ids, item->fullId())) {
 				box->closeBox();
 			}
@@ -621,7 +629,9 @@ bool AddReplyToMessageAction(
 	const auto peer = item ? item->history()->peer.get() : nullptr;
 	if (!item
 		|| !item->isRegular()
-		|| (context != Context::History && context != Context::Replies)) {
+		|| (context != Context::History
+			&& context != Context::Replies
+			&& context != Context::Monoforum)) {
 		return false;
 	}
 	const auto canSendReply = topic
@@ -632,22 +642,52 @@ bool AddReplyToMessageAction(
 		return false;
 	}
 
+	const auto todoListTaskId = request.link
+		? request.link->property(kTodoListItemIdProperty).toInt()
+		: 0;
 	const auto &quote = request.quote;
-	auto text = quote.text.empty()
-		? tr::lng_context_reply_msg(tr::now)
-		: tr::lng_context_quote_and_reply(tr::now);
-	text.replace('&', u"&&"_q);
-	const auto itemId = item->fullId();
-	menu->addAction(text, [=] {
+	auto text = (todoListTaskId
+		? tr::lng_context_reply_to_task
+		: quote.highlight.quote.empty()
+		? tr::lng_context_reply_msg
+		: tr::lng_context_quote_and_reply)(
+			tr::now,
+			Ui::Text::FixAmpersandInAction);
+	menu->addAction(std::move(text), [=, itemId = item->fullId()] {
 		list->replyToMessageRequestNotify({
 			.messageId = itemId,
-			.quote = quote.text,
-			.quoteOffset = quote.offset,
+			.quote = quote.highlight.quote,
+			.quoteOffset = quote.highlight.quoteOffset,
+			.todoItemId = todoListTaskId,
 		}, base::IsCtrlPressed());
 	}, &st::menuIconReply);
 	return true;
 }
 
+bool AddTodoListAction(
+		not_null<Ui::PopupMenu*> menu,
+		const ContextMenuRequest &request,
+		not_null<ListWidget*> list) {
+	const auto context = list->elementContext();
+	const auto item = request.item;
+	if (!item
+		|| !Window::PeerMenuShowAddTodoListTasks(item)
+		|| (context != Context::History
+			&& context != Context::Replies
+			&& context != Context::Monoforum
+			&& context != Context::Pinned)) {
+		return false;
+	}
+	const auto itemId = item->fullId();
+	const auto controller = list->controller();
+	menu->addAction(tr::lng_todo_add_title(tr::now), [=] {
+		if (const auto item = controller->session().data().message(itemId)) {
+			Window::PeerMenuAddTodoListTasks(controller, item);
+		}
+	}, &st::menuIconAdd);
+	return true;
+}
+
 bool AddViewRepliesAction(
 		not_null<Ui::PopupMenu*> menu,
 		const ContextMenuRequest &request,
@@ -752,8 +792,12 @@ bool AddPinMessageAction(
 		return false;
 	}
 	const auto topic = item->topic();
+	const auto sublist = item->savedSublist();
 	if (context != Context::History && context != Context::Pinned) {
-		if (context != Context::Replies || !topic) {
+		if ((context != Context::Replies || !topic)
+			&& (context != Context::Monoforum
+				|| !sublist
+				|| !item->history()->amMonoforumAdmin())) {
 			return false;
 		}
 	}
@@ -781,8 +825,9 @@ bool AddGoToMessageAction(
 	const auto view = request.view;
 	if (!view
 		|| !view->data()->isRegular()
-		|| context != Context::Pinned
-		|| !view->hasOutLayout()) {
+		|| (context != Context::Pinned
+			&& context != Context::ChatPreview)
+		|| (context == Context::Pinned && !view->hasOutLayout())) {
 		return false;
 	}
 	const auto itemId = view->data()->fullId();
@@ -866,12 +911,14 @@ bool AddDeleteMessageAction(
 			}
 			const auto list = HistoryItemsList{ item };
 			if (CanCreateModerateMessagesBox(list)) {
-				controller->show(
-					Box(CreateModerateMessagesBox, list, nullptr));
+				const auto opt = DefaultModerateMessagesBoxOptions();
+				controller->show(Box(
+					CreateModerateMessagesBox,
+					ModerateMessagesBoxEntry{ .items = list },
+					nullptr,
+					opt));
 			} else {
-				const auto suggestModerateActions = false;
-				controller->show(
-					Box<DeleteMessagesBox>(item, suggestModerateActions));
+				controller->show(Box<DeleteMessagesBox>(item));
 			}
 		}
 	});
@@ -1076,7 +1123,7 @@ void EditTagBox(
 	} else {
 		owner->reactions().preloadReactionImageFor(id);
 	}
-	field->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	field->paintRequest() | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(field);
 		const auto top = st::editTagField.textMargins.top();
 		if (const auto custom = state->custom.get()) {
@@ -1108,15 +1155,15 @@ void EditTagBox(
 			field->showError();
 			return;
 		}
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		controller->session().data().reactions().renameTag(id, text);
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	};
 
 	field->submits(
-	) | rpl::start_with_next(save, field->lifetime());
+	) | rpl::on_next(save, field->lifetime());
 
 	box->addButton(tr::lng_settings_save(), save);
 	box->addButton(tr::lng_cancel(), [=] {
@@ -1124,38 +1171,236 @@ void EditTagBox(
 	});
 }
 
-void ShowWhoReadInfo(
+[[nodiscard]] Fn<void(Ui::WhoReadParticipant)> MakeModerateReactionChosen(
 		not_null<Window::SessionController*> controller,
 		FullMsgId itemId,
-		Ui::WhoReadParticipant who) {
-	const auto peer = controller->session().data().peer(itemId.peer);
-	const auto participant = peer->owner().peer(PeerId(who.id));
-	const auto migrated = participant->migrateFrom();
-	const auto origin = who.dateReacted
-		? Info::Profile::Origin{
-			Info::Profile::GroupReactionOrigin{ peer, itemId.msg },
-		}
-		: Info::Profile::Origin();
-	auto memento = std::make_shared<Info::Memento>(
-		std::vector<std::shared_ptr<Info::ContentMemento>>{
-		std::make_shared<Info::Profile::Memento>(
+		not_null<PeerData*> peer,
+		Fn<void()> hideMenu) {
+	if (!Reactions::CanModerateReactionByDeleteMessages(peer)) {
+		return {};
+	}
+	return [=, hideMenu = std::move(hideMenu)](Ui::WhoReadParticipant who) {
+		if (who.id == 0 || who.customEntityData.isEmpty()) {
+			return;
+		}
+		const auto item = controller->session().data().message(itemId);
+		if (!item) {
+			return;
+		}
+		const auto participant = item->history()->peer->owner().peer(
+			PeerId(who.id));
+		if (participant->isSelf()) {
+			return;
+		}
+		if (hideMenu) {
+			hideMenu();
+		}
+		Reactions::ShowModerateReactionBox(
+			controller,
+			item->history()->peer,
+			itemId.msg,
 			participant,
-			migrated ? migrated->id : PeerId(),
-			origin),
+			who.reaction);
+	};
+}
+
+[[nodiscard]] rpl::producer<not_null<UserData*>> LookupMessageAuthor(
+		not_null<HistoryItem*> item) {
+	struct Author {
+		UserData *user = nullptr;
+		std::vector<Fn<void(UserData*)>> callbacks;
+	};
+	struct Authors {
+		base::flat_map<FullMsgId, Author> map;
+	};
+	static auto Cache = base::flat_map<not_null<Main::Session*>, Authors>();
+
+	const auto channel = item->history()->peer->asChannel();
+	const auto session = &channel->session();
+	const auto id = item->fullId();
+	if (!Cache.contains(session)) {
+		Cache.emplace(session);
+		session->lifetime().add([session] {
+			Cache.remove(session);
+		});
+	}
+
+	return [channel, id](auto consumer) {
+		const auto session = &channel->session();
+		auto &map = Cache[session].map;
+		auto i = map.find(id);
+		if (i == end(map)) {
+			i = map.emplace(id).first;
+			const auto finishWith = [=](UserData *user) {
+				auto &entry = Cache[session].map[id];
+				entry.user = user;
+				for (const auto &callback : base::take(entry.callbacks)) {
+					callback(user);
+				}
+			};
+			session->api().request(MTPchannels_GetMessageAuthor(
+				channel->inputChannel(),
+				MTP_int(id.msg.bare)
+			)).done([=](const MTPUser &result) {
+				finishWith(session->data().processUser(result));
+			}).fail([=] {
+				finishWith(nullptr);
+			}).send();
+		} else if (const auto user = i->second.user
+			; user || i->second.callbacks.empty()) {
+			if (user) {
+				consumer.put_next(not_null(user));
+			}
+			return rpl::lifetime();
+		}
+
+		auto lifetime = rpl::lifetime();
+		const auto done = [=](UserData *result) {
+			if (result) {
+				consumer.put_next(not_null(result));
+			}
+		};
+		const auto guard = lifetime.make_state<base::has_weak_ptr>();
+		i->second.callbacks.push_back(crl::guard(guard, done));
+		return lifetime;
+	};
+}
+
+[[nodiscard]] base::unique_qptr<Ui::Menu::ItemBase> MakeMessageAuthorAction(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<HistoryItem*> item,
+		not_null<Window::SessionController*> controller) {
+	const auto parent = menu->menu();
+	const auto user = std::make_shared<UserData*>(nullptr);
+	const auto action = Ui::Menu::CreateAction(
+		parent,
+		tr::lng_contacts_loading(tr::now),
+		[=] { if (*user) { controller->showPeerInfo(*user); } });
+	action->setDisabled(true);
+	auto lifetime = LookupMessageAuthor(
+		item
+	) | rpl::on_next([=](not_null<UserData*> author) {
+		action->setText(
+			tr::lng_context_sent_by(tr::now, lt_user, author->name()));
+		action->setDisabled(false);
+		*user = author;
 	});
-	controller->showSection(std::move(memento));
+	auto result = base::make_unique_q<Ui::Menu::Action>(
+		menu->menu(),
+		st::whoSentItem,
+		action,
+		nullptr,
+		nullptr);
+	result->lifetime().add(std::move(lifetime));
+	return result;
 }
 
 } // namespace
 
+std::optional<QString> CurrentVoiceTimecode(FullMsgId itemId) {
+	const auto state = ::Media::Player::instance()->getState(
+		AudioMsgId::Type::Voice);
+	if (state.id.contextId() == itemId
+		&& !::Media::Player::IsStoppedOrStopping(state.state)
+		&& state.frequency > 0) {
+		return Ui::FormatDurationText(state.position / state.frequency);
+	}
+	return std::nullopt;
+}
+
+rpl::producer<QString> VoiceTimecodeUpdates(FullMsgId itemId) {
+	return ::Media::Player::instance()->updatedNotifier(
+	) | rpl::filter([=](const ::Media::Player::TrackState &state) {
+		return (state.id.type() == AudioMsgId::Type::Voice)
+			&& (state.id.contextId() == itemId);
+	}) | rpl::filter([](const ::Media::Player::TrackState &state) {
+		return !::Media::Player::IsStoppedOrStopping(state.state)
+			&& state.frequency > 0;
+	}) | rpl::map([](const ::Media::Player::TrackState &state) {
+		return Ui::FormatDurationText(state.position / state.frequency);
+	}) | rpl::distinct_until_changed();
+}
+
+void InsertPollMenuLabel(
+		not_null<Ui::PopupMenu*> menu,
+		TextWithEntities text,
+		const style::MenuSeparator &separatorSt) {
+	auto label = base::make_unique_q<Ui::Menu::MultilineAction>(
+		menu->menu(),
+		menu->st().menu,
+		st::historyHasCustomEmoji,
+		st::historyHasCustomEmojiPosition,
+		std::move(text));
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	menu->insertAction(0, std::move(label));
+	const auto sepAction = new QAction(menu->menu());
+	sepAction->setSeparator(true);
+	auto separator = base::make_unique_q<Ui::Menu::Separator>(
+		menu->menu(),
+		menu->st().menu,
+		separatorSt,
+		sepAction);
+	menu->insertAction(1, std::move(separator));
+}
+
+void InsertPollHiddenResultsLabel(not_null<Ui::PopupMenu*> menu) {
+	InsertPollMenuLabel(
+		menu,
+		tr::lng_polls_context_ends(tr::now, tr::rich),
+		menu->st().menu.separator);
+}
+
+[[nodiscard]] TextWithEntities PollVoteRestrictionsLabelText(
+		not_null<HistoryItem*> item,
+		not_null<PollData*> poll) {
+	auto result = TextWithEntities();
+	if (poll->subscribersOnly()) {
+		const auto peer = item->history()->peer.get();
+		const auto channel = peer->isBroadcast()
+			? peer->name()
+			: QString();
+		result = channel.isEmpty()
+			? tr::lng_polls_vote_restricted_subscribers_recent(
+				tr::now,
+				tr::rich)
+			: tr::lng_polls_vote_restricted_subscribers_channel(
+				tr::now,
+				lt_channel,
+				tr::bold(channel),
+				tr::rich);
+	}
+	if (!poll->countries.empty()) {
+		auto countriesText = PollCountriesRestrictionText(poll->countries);
+		if (result.text.isEmpty()) {
+			result = std::move(countriesText);
+		} else {
+			result.append('\n').append(std::move(countriesText));
+		}
+	}
+	return result;
+}
+
+void InsertPollVoteRestrictionsLabel(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<HistoryItem*> item,
+		not_null<PollData*> poll) {
+	auto text = PollVoteRestrictionsLabelText(item, poll);
+	if (text.text.isEmpty()) {
+		return;
+	}
+	InsertPollMenuLabel(menu, std::move(text), st::expandedMenuSeparator);
+}
+
 ContextMenuRequest::ContextMenuRequest(
 	not_null<Window::SessionNavigation*> navigation)
 : navigation(navigation) {
 }
 
-base::unique_qptr<Ui::PopupMenu> FillContextMenu(
+void FillContextMenuItems(
+		not_null<Ui::PopupMenu*> result,
 		not_null<ListWidget*> list,
-		const ContextMenuRequest &request) {
+		const ContextMenuRequest &request,
+		bool skipWhoReacted = false) {
 	const auto link = request.link;
 	const auto view = request.view;
 	const auto item = request.item;
@@ -1176,11 +1421,37 @@ base::unique_qptr<Ui::PopupMenu> FillContextMenu(
 	const auto hasWhoReactedItem = item
 		&& Api::WhoReactedExists(item, Api::WhoReactedList::All);
 
-	auto result = base::make_unique_q<Ui::PopupMenu>(
-		list,
-		st::popupMenuWithIcons);
-
 	AddReplyToMessageAction(result, request, list);
+	if (item) {
+		const auto media = item->media();
+		const auto document = media ? media->document() : nullptr;
+		const auto topic = item->topic();
+		const auto peer = item->history()->peer.get();
+		const auto canSendText = topic
+			? Data::CanSendAnything(topic)
+			: Data::CanSendAnything(peer);
+		if (canSendText && document && document->isVoiceMessage()) {
+			const auto msgId = item->fullId();
+			if (const auto timecode = CurrentVoiceTimecode(msgId)) {
+				const auto weak = base::make_weak(list.get());
+				Menu::AddTimecodeAction(
+					result,
+					*timecode,
+					VoiceTimecodeUpdates(msgId),
+					[=] {
+						const auto tc = CurrentVoiceTimecode(msgId);
+						if (const auto strong = weak.get()) {
+							strong->replyToMessageRequestNotify(
+								{ .messageId = msgId },
+								base::IsCtrlPressed());
+							strong->insertTextAtCursor(
+								tc.value_or(*timecode));
+						}
+					});
+			}
+		}
+	}
+	AddTodoListAction(result, request, list);
 
 	if (request.overSelection
 		&& !list->hasCopyRestrictionForSelected()
@@ -1216,7 +1487,13 @@ base::unique_qptr<Ui::PopupMenu> FillContextMenu(
 		AddDocumentActions(result, lnkDocument, item, list);
 	} else if (poll) {
 		const auto context = list->elementContext();
-		AddPollActions(result, poll, item, context, list->controller());
+		AddPollActions(
+			result,
+			poll,
+			item,
+			context,
+			list->controller(),
+			skipWhoReacted);
 	} else if (!request.overSelection && view && !hasSelection) {
 		const auto owner = &view->history()->owner();
 		const auto media = view->media();
@@ -1277,42 +1554,103 @@ base::unique_qptr<Ui::PopupMenu> FillContextMenu(
 			HistoryView::EmojiPacksSource::Message,
 			list->controller());
 	}
-	{
+	if (item) {
 		const auto added = (result->actions().size() > wasAmount);
-		if (!added) {
-			result->addSeparator();
-		}
 		AddSelectRestrictionAction(result, item, !added);
 	}
-	if (hasWhoReactedItem) {
-		AddWhoReactedAction(result, list, item, list->controller());
+	if (!skipWhoReacted) {
+		if (hasWhoReactedItem) {
+			AddWhoReactedAction(result, list, item, list->controller());
+		} else if (item) {
+			MaybeAddWhenEditedForwardedAction(
+				result,
+				item,
+				list->controller());
+		}
+	}
+}
+
+base::unique_qptr<Ui::PopupMenu> FillContextMenu(
+		not_null<ListWidget*> list,
+		const ContextMenuRequest &request) {
+	const auto link = request.link;
+	const auto item = request.item;
+	const auto itemId = item ? item->fullId() : FullMsgId();
+	const auto pollOption = link
+		? link->property(kPollOptionProperty).toByteArray()
+		: QByteArray();
+	const auto hasPollOption = !pollOption.isEmpty() && item;
+
+	auto result = base::make_unique_q<Ui::PopupMenu>(
+		list,
+		st::popupMenuWithIcons);
+
+	// Build the full message menu.
+	FillContextMenuItems(result, list, request, hasPollOption);
+
+	if (item) {
+		const auto media = item->media();
+		const auto poll = media ? media->poll() : nullptr;
+		if (poll && !poll->closed()) {
+			if (poll->hideResultsUntilClose()) {
+				InsertPollHiddenResultsLabel(result.get());
+			}
+			InsertPollVoteRestrictionsLabel(result.get(), item, poll);
+		}
 	}
 
+	if (hasPollOption) {
+		const auto raw = result.get();
+		const auto owner = &item->history()->owner();
+		const auto controller = list->controller();
+		raw->stashContent([=](not_null<Ui::PopupMenu*> menu) {
+			FillPollOptionPage(
+				menu,
+				owner,
+				itemId,
+				pollOption,
+				controller,
+				[=] {
+					list->replyToMessageRequestNotify({
+						.messageId = itemId,
+						.pollOption = pollOption,
+					}, base::IsCtrlPressed());
+				});
+		});
+	}
 	return result;
 }
 
 void CopyPostLink(
 		not_null<Window::SessionController*> controller,
 		FullMsgId itemId,
-		Context context) {
-	CopyPostLink(controller->uiShow(), itemId, context);
+		Context context,
+		std::optional<TimeId> videoTimestamp) {
+	CopyPostLink(controller->uiShow(), itemId, context, videoTimestamp);
 }
 
 void CopyPostLink(
 		std::shared_ptr<Main::SessionShow> show,
 		FullMsgId itemId,
-		Context context) {
+		Context context,
+		std::optional<TimeId> videoTimestamp) {
 	const auto item = show->session().data().message(itemId);
 	if (!item || !item->hasDirectLink()) {
 		return;
 	}
 	const auto inRepliesContext = (context == Context::Replies);
+	const auto forceNonPublicLink = !videoTimestamp && base::IsCtrlPressed();
 	QGuiApplication::clipboard()->setText(
 		item->history()->session().api().exportDirectMessageLink(
 			item,
-			inRepliesContext));
+			inRepliesContext,
+			forceNonPublicLink,
+			videoTimestamp));
 
 	const auto isPublicLink = [&] {
+		if (forceNonPublicLink) {
+			return false;
+		}
 		const auto channel = item->history()->peer->asChannel();
 		Assert(channel != nullptr);
 		if (const auto rootId = item->replyToTop()) {
@@ -1328,10 +1666,26 @@ void CopyPostLink(
 		}
 		return channel->hasUsername();
 	}();
-
-	show->showToast(isPublicLink
-		? tr::lng_channel_public_link_copied(tr::now)
-		: tr::lng_context_about_private_link(tr::now));
+	if (isPublicLink && !videoTimestamp) {
+		show->showToast({
+			.text = tr::lng_channel_public_link_copied(
+				tr::now, tr::bold
+			).append('\n').append(Platform::IsMac()
+				? tr::lng_public_post_private_hint_cmd(tr::now)
+				: tr::lng_public_post_private_hint_ctrl(tr::now)),
+			.iconLottie = u"toast/voip_invite"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+			.duration = kPublicPostLinkToastDuration,
+		});
+	} else if (isPublicLink) {
+		show->showToast({
+			.text = { tr::lng_channel_public_link_copied(tr::now) },
+			.iconLottie = u"toast/voip_invite"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
+	} else {
+		show->showToast(tr::lng_context_about_private_link(tr::now));
+	}
 }
 
 void CopyStoryLink(
@@ -1345,7 +1699,241 @@ void CopyStoryLink(
 	const auto story = *maybeStory;
 	QGuiApplication::clipboard()->setText(
 		session->api().exportDirectStoryLink(story));
-	show->showToast(tr::lng_channel_public_link_copied(tr::now));
+	show->showToast({
+		.text = { tr::lng_channel_public_link_copied(tr::now) },
+		.iconLottie = u"toast/voip_invite"_q,
+		.iconLottieSize = st::toastLottieIconSize,
+	});
+}
+
+void FillPollOptionPage(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<Data::Session*> owner,
+		FullMsgId itemId,
+		const QByteArray &pollOption,
+		not_null<Window::SessionController*> controller,
+		Fn<void()> replyToOption) {
+	const auto item = owner->message(itemId);
+	if (!item) {
+		return;
+	}
+	const auto media = item->media();
+	const auto poll = media ? media->poll() : nullptr;
+	if (!poll) {
+		return;
+	}
+	if (!poll->closed()
+		&& !poll->quiz()
+		&& poll->voted()
+		&& !poll->revotingDisabled()) {
+		menu->addAction(
+			tr::lng_polls_retract(tr::now),
+			[=] { poll->session().api().polls().sendVotes(itemId, {}); },
+			&st::menuIconRetractVote);
+	}
+	if (replyToOption) {
+		menu->addAction(
+			tr::lng_context_reply_to_poll_option(
+				tr::now,
+				Ui::Text::FixAmpersandInAction),
+			std::move(replyToOption),
+			&st::menuIconReply);
+	}
+	const auto a = poll->answerByOption(pollOption);
+	if (!a) {
+		return;
+	}
+	auto text = a->text;
+	menu->addAction(
+		tr::lng_context_copy_poll_option(tr::now),
+		[text = TextForMimeData::Rich(std::move(text))] {
+			TextUtilities::SetClipboardText(text);
+		},
+		&st::menuIconCopy);
+	if (item->hasDirectLink()) {
+		const auto link = item->history()->session().api()
+			.exportDirectMessageLink(item, false);
+		const auto separator = (link.indexOf('?') >= 0) ? u'&' : u'?';
+		const auto optionLink = link
+			+ separator
+			+ u"option="_q
+			+ PollOptionToLink(pollOption);
+		menu->addAction(
+			tr::lng_context_copy_poll_option_link(tr::now),
+			[optionLink] {
+				QGuiApplication::clipboard()->setText(optionLink);
+			},
+			&st::menuIconLink);
+	}
+	const auto canDelete = [&] {
+		if (!a->addedDate) {
+			return false;
+		}
+		if (poll->creator()) {
+			return true;
+		}
+		if (a->addedBy && a->addedBy->isSelf()) {
+			const auto period = poll->session()
+				.appConfig()
+				.pollAnswerDeletePeriod();
+			return (base::unixtime::now() - a->addedDate) < period;
+		}
+		return false;
+	}();
+	if (canDelete) {
+		menu->addAction(
+			tr::lng_context_delete_poll_option(tr::now),
+			[=] {
+				if (const auto item = owner->message(itemId)) {
+					if (const auto media = item->media()) {
+						if (const auto poll = media->poll()) {
+							poll->session().api().polls()
+								.deleteAnswer(itemId, pollOption);
+						}
+					}
+				}
+			},
+			&st::menuIconDelete);
+	}
+	if (const auto addedBy = a->addedBy) {
+		menu->addSeparator(&st::expandedMenuSeparator);
+		const auto date = a->addedDate
+			? Ui::FormatDateTime(
+				base::unixtime::parse(a->addedDate))
+			: QString();
+		auto action = base::make_unique_q<Ui::WhoReactedEntryAction>(
+			menu->menu(),
+			nullptr,
+			menu->menu()->st(),
+			Ui::WhoReactedEntryData());
+		const auto raw = action.get();
+		const auto thumbnail = Ui::MakeUserpicThumbnail(addedBy);
+		const auto size = st::defaultWhoRead.photoSize;
+		const auto refresh = [=] {
+			raw->setData({
+				.text = tr::lng_polls_option_added_by(
+					tr::now,
+					lt_user,
+					addedBy->shortName()),
+				.date = date,
+				.type = Ui::WhoReactedType::RefRecipient,
+				.userpic = thumbnail->image(size),
+				.callback = [=] { controller->showPeerInfo(addedBy); },
+			});
+		};
+		thumbnail->subscribeToUpdates(refresh);
+		refresh();
+		menu->lifetime().add([=] {
+			thumbnail->subscribeToUpdates(nullptr);
+		});
+		menu->addAction(std::move(action));
+	}
+	{
+		auto packIds = std::vector<StickerSetIdentifier>();
+		for (const auto &entity : a->text.entities) {
+			if (entity.type() == EntityType::CustomEmoji) {
+				const auto id = Data::ParseCustomEmojiData(entity.data());
+				if (const auto set = owner->document(id)->sticker()) {
+					if (set->set.id
+						&& !ranges::contains(
+							packIds,
+							set->set.id,
+							&StickerSetIdentifier::id)) {
+						packIds.push_back(set->set);
+					}
+				}
+			}
+		}
+		AddEmojiPacksAction(
+			menu,
+			std::move(packIds),
+			EmojiPacksSource::PollOption,
+			controller);
+	}
+}
+
+void AttachPollOptionTabs(
+		not_null<Ui::PopupMenu*> menu,
+		QPoint desiredPosition) {
+	if (!menu->hasStashedContent()) {
+		return;
+	}
+	const auto &tabsSt = st::popupMenuPillTabs;
+	const auto tabs = Ui::CreateChild<Ui::PillTabs>(
+		menu.get(),
+		std::vector<QString>{
+			tr::lng_context_poll_option_tab(tr::now),
+			tr::lng_context_poll_message_tab(tr::now),
+		},
+		0,
+		tabsSt);
+
+	const auto height = tabsSt.height;
+	const auto margin = tabsSt.margin;
+	tabs->setShadow(st::defaultBoxShadow);
+	tabs->show();
+
+	// Reserve space for tabs by increasing additional padding top.
+	{
+		auto padding = menu->additionalMenuPadding();
+		auto margins = menu->additionalMenuMargins();
+		padding.setTop(padding.top() + height + margin);
+		menu->setAdditionalMenuPadding(padding, margins);
+		menu->prepareGeometryFor(desiredPosition);
+	}
+
+	// Position tabs just above _inner (in the reserved padding space).
+	const auto reposition = [=] {
+		const auto inner = menu->inner();
+		tabs->setGeometry(tabs->shadowExtend()
+			+ QRect(
+				inner.x(),
+				inner.y() - height - margin,
+				inner.width(),
+				height));
+	};
+	reposition();
+
+	// Wire tab changes to swap stashed content.
+	tabs->activeIndexChanges(
+	) | rpl::on_next([=](int index) {
+		const auto direction = (index > 0)
+			? Ui::PopupMenu::SwitchDirection::LeftToRight
+			: Ui::PopupMenu::SwitchDirection::RightToLeft;
+		crl::on_main(menu, [=] {
+			menu->swapStashed(direction);
+		});
+	}, tabs->lifetime());
+
+	// Reposition after geometry is prepared.
+	menu->animatePhaseValue(
+	) | rpl::on_next([=](Ui::PopupMenu::AnimatePhase phase) {
+		if (phase == Ui::PopupMenu::AnimatePhase::StartShow) {
+			reposition();
+		}
+	}, tabs->lifetime());
+
+	menu->showStateValue(
+	) | rpl::on_next([=](Ui::PopupMenu::ShowState showState) {
+		if (showState.appearing) {
+			tabs->show();
+			tabs->raise();
+			const auto raw = showState.widthProgress;
+			const auto delayed = std::clamp(
+				(raw - 0.4) / 0.6,
+				0.,
+				1.);
+			tabs->setShowProgress(
+				delayed,
+				showState.opacity * delayed);
+		} else if (showState.toggling) {
+			tabs->setShowProgress(1., showState.opacity);
+		} else {
+			tabs->show();
+			tabs->setShowProgress(1., 1.);
+			reposition();
+		}
+	}, tabs->lifetime());
 }
 
 void AddPollActions(
@@ -1353,7 +1941,9 @@ void AddPollActions(
 		not_null<PollData*> poll,
 		not_null<HistoryItem*> item,
 		Context context,
-		not_null<Window::SessionController*> controller) {
+		not_null<Window::SessionController*> controller,
+		bool skipRetractVote,
+		bool skipViewStats) {
 	{
 		constexpr auto kRadio = "\xf0\x9f\x94\x98";
 		const auto radio = QString::fromUtf8(kRadio);
@@ -1375,14 +1965,23 @@ void AddPollActions(
 	if ((context != Context::History)
 		&& (context != Context::Replies)
 		&& (context != Context::Pinned)
-		&& (context != Context::ScheduledTopic)) {
+		&& (context != Context::ScheduledTopic)
+		&& (context != Context::ChatPreview)) {
 		return;
 	}
+	const auto itemId = item->fullId();
+	if (poll->canViewStats() && item->isRegular() && !skipViewStats) {
+		menu->addAction(tr::lng_polls_view_stats(tr::now), [=] {
+			ShowPollStatsBox(controller, itemId);
+		}, &st::menuIconStats);
+	}
 	if (poll->closed()) {
 		return;
 	}
-	const auto itemId = item->fullId();
-	if (poll->voted() && !poll->quiz()) {
+	if (!skipRetractVote
+		&& poll->voted()
+		&& !poll->quiz()
+		&& !poll->revotingDisabled()) {
 		menu->addAction(tr::lng_polls_retract(tr::now), [=] {
 			poll->session().api().polls().sendVotes(itemId, {});
 		}, &st::menuIconRetractVote);
@@ -1419,11 +2018,11 @@ void AddSaveSoundForNotifications(
 		return;
 	} else if (int(ringtones.list().size()) >= ringtones.maxSavedCount()) {
 		return;
-	} else if (const auto song = document->song()) {
+	} else if (document->song()) {
 		if (document->duration() > ringtones.maxDuration()) {
 			return;
 		}
-	} else if (const auto voice = document->voice()) {
+	} else if (document->voice()) {
 		if (document->duration() > ringtones.maxDuration()) {
 			return;
 		}
@@ -1441,16 +2040,65 @@ void AddSaveSoundForNotifications(
 	}, &st::menuIconSoundAdd);
 }
 
+void AddWhenEditedForwardedAuthorActionHelper(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<HistoryItem*> item,
+		not_null<Window::SessionController*> controller,
+		bool insertSeparator) {
+	if (const auto forwarded = item->Get<HistoryMessageForwarded>()) {
+		if (!forwarded->story && forwarded->psaType.isEmpty()) {
+			if (insertSeparator && !menu->empty()) {
+				menu->addSeparator(&st::expandedMenuSeparator);
+			}
+			menu->addAction(Ui::WhenReadContextAction(
+				menu.get(),
+				Api::WhenOriginal(item->from(), forwarded->originalDate)));
+		}
+	} else if (const auto edited = item->Get<HistoryMessageEdited>()) {
+		if (!item->hideEditedBadge()) {
+			if (insertSeparator && !menu->empty()) {
+				menu->addSeparator(&st::expandedMenuSeparator);
+			}
+			if (item->history()->session().messagePrimaryEditedDate()) {
+				const auto sent = base::unixtime::parse(item->date());
+				auto label = base::make_unique_q<Ui::Menu::MultilineAction>(
+					menu->menu(),
+					menu->st().menu,
+					st::historyHasCustomEmoji,
+					st::historyHasCustomEmojiPosition,
+					tr::marked(tr::lng_sent_on(
+						tr::now,
+						lt_date,
+						langDayOfMonthShort(sent.date()),
+						lt_time,
+						QLocale().toString(sent.time(), QLocale::ShortFormat))));
+				label->setAttribute(Qt::WA_TransparentForMouseEvents);
+				menu->addAction(std::move(label));
+			} else {
+				menu->addAction(Ui::WhenReadContextAction(
+					menu.get(),
+					Api::WhenEdited(item->from(), edited->date)));
+			}
+		}
+	}
+	if (item->canLookupMessageAuthor()) {
+		if (insertSeparator && !menu->empty()) {
+			menu->addSeparator(&st::expandedMenuSeparator);
+		}
+		menu->addAction(MakeMessageAuthorAction(menu, item, controller));
+	}
+}
+
 void AddWhoReactedAction(
 		not_null<Ui::PopupMenu*> menu,
 		not_null<QWidget*> context,
 		not_null<HistoryItem*> item,
 		not_null<Window::SessionController*> controller) {
 	const auto whoReadIds = std::make_shared<Api::WhoReadList>();
-	const auto weak = Ui::MakeWeak(menu.get());
+	const auto weak = base::make_weak(menu.get());
 	const auto user = item->history()->peer;
 	const auto showOrPremium = [=] {
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->hideMenu();
 		}
 		const auto type = Ui::ShowOrPremium::ReadTime;
@@ -1465,28 +2113,50 @@ void AddWhoReactedAction(
 	};
 	const auto itemId = item->fullId();
 	const auto participantChosen = [=](Ui::WhoReadParticipant who) {
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->hideMenu();
 		}
-		ShowWhoReadInfo(controller, itemId, who);
+		const auto participant = user->owner().peer(PeerId(who.id));
+		Reactions::ShowReactionParticipantInfo(
+			controller,
+			participant,
+			user,
+			itemId.msg,
+			who.dateReacted);
 	};
+	const auto moderateReactionChosen = MakeModerateReactionChosen(
+		controller,
+		itemId,
+		user,
+		[=] {
+			if (const auto strong = weak.get()) {
+				strong->hideMenu();
+			}
+		});
 	const auto showAllChosen = [=, itemId = item->fullId()]{
 		// Pressing on an item that has a submenu doesn't hide it :(
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->hideMenu();
 		}
 		if (const auto item = controller->session().data().message(itemId)) {
-			controller->window().show(Reactions::FullListBox(
-				controller,
-				item,
-				{},
-				whoReadIds));
+			controller->showSection(
+				std::make_shared<Info::Memento>(
+					whoReadIds,
+					itemId,
+					HistoryView::Reactions::DefaultSelectedTab(
+						item,
+						whoReadIds)));
 		}
 	};
 	if (!menu->empty()) {
 		menu->addSeparator(&st::expandedMenuSeparator);
 	}
 	if (item->history()->peer->isUser()) {
+		AddWhenEditedForwardedAuthorActionHelper(
+			menu,
+			item,
+			controller,
+			false);
 		menu->addAction(Ui::WhenReadContextAction(
 			menu.get(),
 			Api::WhoReacted(item, context, st::defaultWhoRead, whoReadIds),
@@ -1497,10 +2167,23 @@ void AddWhoReactedAction(
 			Api::WhoReacted(item, context, st::defaultWhoRead, whoReadIds),
 			Data::ReactedMenuFactory(&controller->session()),
 			participantChosen,
-			showAllChosen));
+			showAllChosen,
+			moderateReactionChosen));
+		AddWhenEditedForwardedAuthorActionHelper(
+			menu,
+			item,
+			controller,
+			true);
 	}
 }
 
+void MaybeAddWhenEditedForwardedAction(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<HistoryItem*> item,
+		not_null<Window::SessionController*> controller) {
+	AddWhenEditedForwardedAuthorActionHelper(menu, item, controller, true);
+}
+
 void AddEditTagAction(
 		not_null<Ui::PopupMenu*> menu,
 		const Data::ReactionId &id,
@@ -1640,14 +2323,30 @@ void ShowWhoReactedMenu(
 	};
 	const auto itemId = item->fullId();
 	const auto participantChosen = [=](Ui::WhoReadParticipant who) {
-		ShowWhoReadInfo(controller, itemId, who);
+		const auto originPeer = item->history()->peer;
+		const auto participant = originPeer->owner().peer(PeerId(who.id));
+		Reactions::ShowReactionParticipantInfo(
+			controller,
+			participant,
+			originPeer,
+			itemId.msg,
+			who.dateReacted);
 	};
+	const auto moderateReactionChosen = MakeModerateReactionChosen(
+		controller,
+		itemId,
+		item->history()->peer,
+		[=] {
+			if (*menu) {
+				(*menu)->hideMenu();
+			}
+		});
 	const auto showAllChosen = [=, itemId = item->fullId()]{
 		if (const auto item = controller->session().data().message(itemId)) {
-			controller->window().show(Reactions::FullListBox(
-				controller,
-				item,
-				id));
+			controller->showSection(std::make_shared<Info::Memento>(
+				nullptr,
+				itemId,
+				HistoryView::Reactions::DefaultSelectedTab(item, id)));
 		}
 	};
 	const auto owner = &controller->session().data();
@@ -1661,7 +2360,8 @@ void ShowWhoReactedMenu(
 	const auto filler = lifetime.make_state<Ui::WhoReactedListMenu>(
 		Data::ReactedMenuFactory(&controller->session()),
 		participantChosen,
-		showAllChosen);
+		showAllChosen,
+		moderateReactionChosen);
 	const auto state = lifetime.make_state<State>();
 	Api::WhoReacted(
 		item,
@@ -1670,7 +2370,7 @@ void ShowWhoReactedMenu(
 		st::defaultWhoRead
 	) | rpl::filter([=](const Ui::WhoReadContent &content) {
 		return content.state != Ui::WhoReadState::Unknown;
-	}) | rpl::start_with_next([=, &lifetime](Ui::WhoReadContent &&content) {
+	}) | rpl::on_next([=, &lifetime](Ui::WhoReadContent &&content) {
 		const auto creating = !*menu;
 		const auto refillTop = [=] {
 			if (activeNonQuick) {
@@ -1776,25 +2476,25 @@ void AddEmojiPacksAction(
 					tr::now,
 					lt_count,
 					count,
-					Ui::Text::RichLangValue)
+					tr::rich)
 				: tr::lng_context_animated_emoji(
 					tr::now,
 					lt_name,
 					TextWithEntities{ name },
-					Ui::Text::RichLangValue);
+					tr::rich);
 		case EmojiPacksSource::Tag:
 			return tr::lng_context_animated_tag(
 				tr::now,
 				lt_name,
 				TextWithEntities{ name },
-				Ui::Text::RichLangValue);
+				tr::rich);
 		case EmojiPacksSource::Reaction:
 			if (!name.text.isEmpty()) {
 				return tr::lng_context_animated_reaction(
 					tr::now,
 					lt_name,
 					TextWithEntities{ name },
-					Ui::Text::RichLangValue);
+					tr::rich);
 			}
 			[[fallthrough]];
 		case EmojiPacksSource::Reactions:
@@ -1803,12 +2503,24 @@ void AddEmojiPacksAction(
 					tr::now,
 					lt_count,
 					count,
-					Ui::Text::RichLangValue)
+					tr::rich)
 				: tr::lng_context_animated_reactions(
 					tr::now,
 					lt_name,
 					TextWithEntities{ name },
-					Ui::Text::RichLangValue);
+					tr::rich);
+		case EmojiPacksSource::PollOption:
+			return name.text.isEmpty()
+				? tr::lng_context_animated_poll_option_many(
+					tr::now,
+					lt_count,
+					count,
+					tr::rich)
+				: tr::lng_context_animated_poll_option(
+					tr::now,
+					lt_name,
+					TextWithEntities{ name },
+					tr::rich);
 		}
 		Unexpected("Source in AddEmojiPacksAction.");
 	}();
@@ -1819,7 +2531,7 @@ void AddEmojiPacksAction(
 		st::historyHasCustomEmojiPosition,
 		std::move(text));
 	const auto weak = base::make_weak(controller);
-	button->setClickedCallback([=] {
+	button->setActionTriggered([=] {
 		const auto strong = weak.get();
 		if (!strong) {
 			return;
@@ -1857,23 +2569,33 @@ void AddSelectRestrictionAction(
 		|| item->isSponsored()) {
 		return;
 	}
+	if (addIcon && !menu->empty()) {
+		menu->addSeparator();
+	}
+	const auto user = peer->asUser();
 	auto button = base::make_unique_q<Ui::Menu::MultilineAction>(
 		menu->menu(),
 		menu->st().menu,
 		st::historyHasCustomEmoji,
-		addIcon
+		((addIcon && !user)
 			? st::historySponsoredAboutMenuLabelPosition
-			: st::historyHasCustomEmojiPosition,
+			: st::historyHasCustomEmojiPosition),
 		(peer->isMegagroup()
-			? tr::lng_context_noforwards_info_group
+			? tr::lng_context_noforwards_info_group(tr::now, tr::rich)
 			: (peer->isChannel())
-			? tr::lng_context_noforwards_info_channel
-			: (peer->isUser() && peer->asUser()->isBot())
-			? tr::lng_context_noforwards_info_channel
-			: tr::lng_context_noforwards_info_bot)(
-			tr::now,
-			Ui::Text::RichLangValue),
-		addIcon ? &st::menuIconCopyright : nullptr);
+			? tr::lng_context_noforwards_info_channel(tr::now, tr::rich)
+			: (user && user->isBot())
+			? tr::lng_context_noforwards_info_bot(tr::now, tr::rich)
+			: user
+			? ((user->flags() & UserDataFlag::NoForwardsMyEnabled)
+				? tr::lng_context_noforwards_info_mine(tr::now, tr::rich)
+				: tr::lng_context_noforwards_info_his(
+					tr::now,
+					lt_user,
+					tr::bold(user->shortName()),
+					tr::rich))
+			: tr::lng_context_noforwards_info_channel(tr::now, tr::rich)),
+		(addIcon && !user) ? &st::menuIconCopyright : nullptr);
 	button->setAttribute(Qt::WA_TransparentForMouseEvents);
 	menu->addAction(std::move(button));
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.h b/Telegram/SourceFiles/history/view/history_view_context_menu.h
index 1b14804aae14bd..d1b585718532e6 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.h
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.h
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_element.h"
 
 namespace Data {
+class Session;
 struct ReactionId;
 } // namespace Data
 
@@ -57,23 +58,48 @@ base::unique_qptr<Ui::PopupMenu> FillContextMenu(
 	not_null<ListWidget*> list,
 	const ContextMenuRequest &request);
 
+void InsertPollHiddenResultsLabel(not_null<Ui::PopupMenu*> menu);
+void InsertPollVoteRestrictionsLabel(
+	not_null<Ui::PopupMenu*> menu,
+	not_null<HistoryItem*> item,
+	not_null<PollData*> poll);
+
 void CopyPostLink(
 	not_null<Window::SessionController*> controller,
 	FullMsgId itemId,
-	Context context);
+	Context context,
+	std::optional<TimeId> videoTimestamp = {});
 void CopyPostLink(
 	std::shared_ptr<Main::SessionShow> show,
 	FullMsgId itemId,
-	Context context);
+	Context context,
+	std::optional<TimeId> videoTimestamp = {});
 void CopyStoryLink(
 	std::shared_ptr<Main::SessionShow> show,
 	FullStoryId storyId);
+void FillPollOptionPage(
+	not_null<Ui::PopupMenu*> menu,
+	not_null<Data::Session*> owner,
+	FullMsgId itemId,
+	const QByteArray &pollOption,
+	not_null<Window::SessionController*> controller,
+	Fn<void()> replyToOption = nullptr);
+
+void AttachPollOptionTabs(
+	not_null<Ui::PopupMenu*> menu,
+	QPoint desiredPosition);
+
+[[nodiscard]] std::optional<QString> CurrentVoiceTimecode(FullMsgId itemId);
+[[nodiscard]] rpl::producer<QString> VoiceTimecodeUpdates(FullMsgId itemId);
+
 void AddPollActions(
 	not_null<Ui::PopupMenu*> menu,
 	not_null<PollData*> poll,
 	not_null<HistoryItem*> item,
 	Context context,
-	not_null<Window::SessionController*> controller);
+	not_null<Window::SessionController*> controller,
+	bool skipRetractVote = false,
+	bool skipViewStats = false);
 void AddSaveSoundForNotifications(
 	not_null<Ui::PopupMenu*> menu,
 	not_null<HistoryItem*> item,
@@ -84,6 +110,10 @@ void AddWhoReactedAction(
 	not_null<QWidget*> context,
 	not_null<HistoryItem*> item,
 	not_null<Window::SessionController*> controller);
+void MaybeAddWhenEditedForwardedAction(
+	not_null<Ui::PopupMenu*> menu,
+	not_null<HistoryItem*> item,
+	not_null<Window::SessionController*> controller);
 void ShowWhoReactedMenu(
 	not_null<base::unique_qptr<Ui::PopupMenu>*> menu,
 	QPoint position,
@@ -108,6 +138,7 @@ enum class EmojiPacksSource {
 	Reaction,
 	Reactions,
 	Tag,
+	PollOption,
 };
 [[nodiscard]] std::vector<StickerSetIdentifier> CollectEmojiPacks(
 	not_null<HistoryItem*> item,
diff --git a/Telegram/SourceFiles/history/view/history_view_corner_buttons.cpp b/Telegram/SourceFiles/history/view/history_view_corner_buttons.cpp
index 37885d8e0e5b9f..270979e778eddc 100644
--- a/Telegram/SourceFiles/history/view/history_view_corner_buttons.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_corner_buttons.cpp
@@ -68,10 +68,14 @@ CornerButtons::CornerButtons(
 	st->value(_stLifetime, st::historyUnreadMentions))
 , _reactions(
 		parent,
-		st->value(_stLifetime, st::historyUnreadReactions)) {
+		st->value(_stLifetime, st::historyUnreadReactions))
+, _pollVotes(
+		parent,
+		st->value(_stLifetime, st::historyUnreadPollVotes)) {
 	_down.widget->addClickHandler([=] { downClick(); });
 	_mentions.widget->addClickHandler([=] { mentionsClick(); });
 	_reactions.widget->addClickHandler([=] { reactionsClick(); });
+	_pollVotes.widget->addClickHandler([=] { pollVotesClick(); });
 
 	const auto filterScroll = [&](CornerButton &button) {
 		button.widget->installEventFilter(this);
@@ -79,6 +83,7 @@ CornerButtons::CornerButtons(
 	filterScroll(_down);
 	filterScroll(_mentions);
 	filterScroll(_reactions);
+	filterScroll(_pollVotes);
 
 	SendMenu::SetupUnreadMentionsMenu(_mentions.widget.data(), [=] {
 		return _delegate->cornerButtonsThread();
@@ -86,13 +91,17 @@ CornerButtons::CornerButtons(
 	SendMenu::SetupUnreadReactionsMenu(_reactions.widget.data(), [=] {
 		return _delegate->cornerButtonsThread();
 	});
+	SendMenu::SetupUnreadPollVotesMenu(_pollVotes.widget.data(), [=] {
+		return _delegate->cornerButtonsThread();
+	});
 }
 
 bool CornerButtons::eventFilter(QObject *o, QEvent *e) {
 	if (e->type() == QEvent::Wheel
 		&& (o == _down.widget
 			|| o == _mentions.widget
-			|| o == _reactions.widget)) {
+			|| o == _reactions.widget
+			|| o == _pollVotes.widget)) {
 		return _scrollViewportEvent(e);
 	}
 	return QObject::eventFilter(o, e);
@@ -142,6 +151,15 @@ void CornerButtons::reactionsClick() {
 	showAt(thread->unreadReactions().minLoaded());
 }
 
+void CornerButtons::pollVotesClick() {
+	const auto history = lookupHistory();
+	if (!history) {
+		return;
+	}
+	const auto thread = _delegate->cornerButtonsThread();
+	showAt(thread->unreadPollVotes().minLoaded());
+}
+
 void CornerButtons::clearReplyReturns() {
 	_replyReturns.clear();
 	_replyReturn = nullptr;
@@ -195,7 +213,7 @@ void CornerButtons::pushReplyReturn(not_null<HistoryItem*> item) {
 	if (!_replyReturnStarted) {
 		_replyReturnStarted = true;
 		item->history()->owner().itemRemoved(
-		) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+		) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 			while (item == _replyReturn) {
 				calculateNextReplyReturn();
 			}
@@ -208,6 +226,7 @@ CornerButton &CornerButtons::buttonByType(Type type) {
 	case Type::Down: return _down;
 	case Type::Mentions: return _mentions;
 	case Type::Reactions: return _reactions;
+	case Type::PollVotes: return _pollVotes;
 	}
 	Unexpected("Type in CornerButtons::buttonByType.");
 }
@@ -245,6 +264,7 @@ void CornerButtons::updateUnreadThingsVisibility() {
 	if (!thread) {
 		updateVisibility(Type::Mentions, false);
 		updateVisibility(Type::Reactions, false);
+		updateVisibility(Type::PollVotes, false);
 		return;
 	}
 	auto &unreadThings = thread->session().api().unreadThings();
@@ -278,6 +298,18 @@ void CornerButtons::updateUnreadThingsVisibility() {
 	} else {
 		updateVisibility(Type::Reactions, false);
 	}
+
+	if (_delegate->cornerButtonsHas(Type::PollVotes)
+		&& unreadThings.trackPollVotes(thread)) {
+		if (const auto count = thread->unreadPollVotes().count(0)) {
+			_pollVotes.widget->setUnreadCount(count);
+		}
+		updateWithCount(
+			Type::PollVotes,
+			thread->unreadPollVotes().loadedCount());
+	} else {
+		updateVisibility(Type::PollVotes, false);
+	}
 }
 
 void CornerButtons::updateJumpDownVisibility(std::optional<int> counter) {
@@ -306,6 +338,7 @@ void CornerButtons::updatePositions() {
 	const auto historyDownShown = shown(_down);
 	const auto unreadMentionsShown = shown(_mentions);
 	const auto unreadReactionsShown = shown(_reactions);
+	const auto unreadPollVotesShown = shown(_pollVotes);
 	const auto skip = st::historyUnreadThingsSkip;
 	{
 		const auto top = anim::interpolate(
@@ -350,16 +383,41 @@ void CornerButtons::updatePositions() {
 			- shift;
 		_reactions.widget->moveToRight(right, top);
 	}
+	{
+		const auto right = anim::interpolate(
+			-_pollVotes.widget->width(),
+			st::historyToDownPosition.x(),
+			unreadPollVotesShown);
+		const auto shift = anim::interpolate(
+			0,
+			_down.widget->height() + skip,
+			historyDownShown
+		) + anim::interpolate(
+			0,
+			_mentions.widget->height() + skip,
+			unreadMentionsShown
+		) + anim::interpolate(
+			0,
+			_reactions.widget->height() + skip,
+			unreadReactionsShown);
+		const auto top = _parent->height()
+			- _pollVotes.widget->height()
+			- st::historyToDownPosition.y()
+			- shift;
+		_pollVotes.widget->moveToRight(right, top);
+	}
 
 	checkVisibility(_down);
 	checkVisibility(_mentions);
 	checkVisibility(_reactions);
+	checkVisibility(_pollVotes);
 }
 
 void CornerButtons::finishAnimations() {
 	_down.animation.stop();
 	_mentions.animation.stop();
 	_reactions.animation.stop();
+	_pollVotes.animation.stop();
 	updatePositions();
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_corner_buttons.h b/Telegram/SourceFiles/history/view/history_view_corner_buttons.h
index ae7b5b110ccedc..7d3d5aae2b946c 100644
--- a/Telegram/SourceFiles/history/view/history_view_corner_buttons.h
+++ b/Telegram/SourceFiles/history/view/history_view_corner_buttons.h
@@ -42,6 +42,7 @@ enum class CornerButtonType {
 	Down,
 	Mentions,
 	Reactions,
+	PollVotes,
 };
 
 class CornerButtonsDelegate {
@@ -72,6 +73,7 @@ class CornerButtons final : private QObject {
 	void downClick();
 	void mentionsClick();
 	void reactionsClick();
+	void pollVotesClick();
 
 	void clearReplyReturns();
 	[[nodiscard]] QVector<FullMsgId> replyReturns() const;
@@ -119,6 +121,7 @@ class CornerButtons final : private QObject {
 	CornerButton _down;
 	CornerButton _mentions;
 	CornerButton _reactions;
+	CornerButton _pollVotes;
 
 	HistoryItem *_replyReturn = nullptr;
 	QVector<FullMsgId> _replyReturns;
diff --git a/Telegram/SourceFiles/history/view/history_view_cursor_state.cpp b/Telegram/SourceFiles/history/view/history_view_cursor_state.cpp
index 56ca495c339751..c6f42b8a1e5cda 100644
--- a/Telegram/SourceFiles/history/view/history_view_cursor_state.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_cursor_state.cpp
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #include "history/view/history_view_cursor_state.h"
 
+#include "data/data_session.h"
+#include "history/history.h"
 #include "history/history_item.h"
 #include "history/view/history_view_element.h"
 
@@ -25,7 +27,11 @@ TextState::TextState(
 	: CursorState::None)
 , link(state.link)
 , symbol(state.symbol)
-, afterSymbol(state.afterSymbol) {
+, afterSymbol(state.afterSymbol)
+, selectionCursor(MessageSelectionEndpoint::Flat({
+	state.symbol,
+	state.afterSymbol,
+})) {
 }
 
 TextState::TextState(
@@ -60,11 +66,51 @@ TextState::TextState(
 	: CursorState::None)
 , link(state.link)
 , symbol(state.symbol)
-, afterSymbol(state.afterSymbol) {
+, afterSymbol(state.afterSymbol)
+, selectionCursor(MessageSelectionEndpoint::Flat({
+	state.symbol,
+	state.afterSymbol,
+})) {
 }
 
 TextState::TextState(std::nullptr_t, ClickHandlerPtr link)
 : link(link) {
 }
 
+void SyncFlatSelectionCursor(not_null<TextState*> state) {
+	if (!state->selectionCursor.isRichPage()) {
+		state->selectionCursor = MessageSelectionEndpoint::Flat({
+			state->symbol,
+			state->afterSymbol,
+		});
+	}
+}
+
+void SetTextStatePosition(
+		not_null<TextState*> state,
+		uint16 symbol,
+		bool afterSymbol) {
+	state->symbol = symbol;
+	state->afterSymbol = afterSymbol;
+	SyncFlatSelectionCursor(state);
+}
+
+void AddTextStateOffset(not_null<TextState*> state, uint16 offset) {
+	state->symbol = uint16(state->symbol + offset);
+	SyncFlatSelectionCursor(state);
+}
+
+not_null<HistoryItem*> LookupItemByPoint(
+		not_null<Element*> view,
+		QPoint itemPoint) {
+	if (view->pointState(itemPoint) == PointState::GroupPart) {
+		const auto state = view->textState(itemPoint, {});
+		const auto &owner = view->data()->history()->owner();
+		if (const auto item = owner.message(state.itemId)) {
+			return item;
+		}
+	}
+	return view->data();
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_cursor_state.h b/Telegram/SourceFiles/history/view/history_view_cursor_state.h
index 3ad78e5333e933..e9d54a41876817 100644
--- a/Telegram/SourceFiles/history/view/history_view_cursor_state.h
+++ b/Telegram/SourceFiles/history/view/history_view_cursor_state.h
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "history/history_message_selection.h"
+
 class HistoryItem;
 
 namespace HistoryView {
@@ -24,6 +26,8 @@ enum class CursorState : char {
 	Date,
 	Enlarge,
 	Forwarded,
+	FromPhoto,
+	LogAdminService,
 };
 
 struct TextState {
@@ -52,6 +56,7 @@ struct TextState {
 	ClickHandlerPtr link;
 	uint16 symbol = 0;
 	bool afterSymbol = false;
+	MessageSelectionEndpoint selectionCursor;
 	bool overMessageText = false;
 	bool customTooltip = false;
 	bool horizontalScroll = false;
@@ -59,6 +64,13 @@ struct TextState {
 
 };
 
+void SyncFlatSelectionCursor(not_null<TextState*> state);
+void SetTextStatePosition(
+	not_null<TextState*> state,
+	uint16 symbol,
+	bool afterSymbol);
+void AddTextStateOffset(not_null<TextState*> state, uint16 offset);
+
 struct StateRequest {
 	Ui::Text::StateRequest::Flags flags = Ui::Text::StateRequest::Flag::LookupLink;
 	Ui::Text::StateRequest forText() const {
@@ -75,4 +87,8 @@ enum class InfoDisplayType : char {
 	Background,
 };
 
+[[nodiscard]] not_null<HistoryItem*> LookupItemByPoint(
+	not_null<Element*> view,
+	QPoint itemPoint);
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_drag.cpp b/Telegram/SourceFiles/history/view/history_view_drag.cpp
new file mode 100644
index 00000000000000..1ef974650a915c
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_drag.cpp
@@ -0,0 +1,47 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_drag.h"
+
+#include "data/data_photo.h"
+#include "data/data_photo_media.h"
+
+#include <QtCore/QMimeData>
+
+namespace HistoryView {
+
+PhotoDragData PreparePhotoDragData(not_null<PhotoData*> photo) {
+	if (photo->isNull()) {
+		return {};
+	}
+	const auto media = photo->activeMediaView();
+	constexpr auto kSize = Data::PhotoSize::Large;
+	const auto animated = media
+		&& !media->videoContent(kSize).isEmpty();
+	if (!media || !media->loaded() || animated) {
+		return {};
+	}
+	auto result = PhotoDragData();
+	if (const auto image = media->image(kSize)) {
+		result.image = image->original();
+	}
+	result.bytes = media->imageBytes(kSize);
+	return result;
+}
+
+void FillDragMimeWithPhoto(not_null<QMimeData*> mime, PhotoDragData &&data) {
+	if (data.image.isNull()) {
+		return;
+	}
+	mime->setImageData(std::move(data.image));
+	if (!data.bytes.isEmpty()) {
+		mime->setData(u"image/jpeg"_q, std::move(data.bytes));
+		mime->setData(u"application/x-td-use-jpeg"_q, "1");
+	}
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_drag.h b/Telegram/SourceFiles/history/view/history_view_drag.h
new file mode 100644
index 00000000000000..1e735f9861e02c
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_drag.h
@@ -0,0 +1,27 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include <QtCore/QByteArray>
+#include <QtGui/QImage>
+
+class QMimeData;
+class PhotoData;
+
+namespace HistoryView {
+
+struct PhotoDragData {
+	QImage image;
+	QByteArray bytes;
+};
+
+[[nodiscard]] PhotoDragData PreparePhotoDragData(not_null<PhotoData*> photo);
+
+void FillDragMimeWithPhoto(not_null<QMimeData*> mime, PhotoDragData &&data);
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_draw_to_reply.cpp b/Telegram/SourceFiles/history/view/history_view_draw_to_reply.cpp
new file mode 100644
index 00000000000000..cf5eda953255f9
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_draw_to_reply.cpp
@@ -0,0 +1,88 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_draw_to_reply.h"
+
+#include "data/data_document.h"
+#include "data/data_document_media.h"
+#include "data/data_photo_media.h"
+#include "data/data_session.h"
+#include "editor/editor_layer_widget.h"
+#include "editor/photo_editor.h"
+#include "mainwidget.h"
+#include "ui/image/image.h"
+#include "window/window_session_controller.h"
+
+namespace HistoryView {
+
+QImage ResolveDrawToReplyImage(
+		not_null<Data::Session*> data,
+		const Data::DrawToReplyRequest &request) {
+	auto image = QImage();
+	if (request.photoId) {
+		const auto photo = data->photo(request.photoId);
+		const auto media = photo->createMediaView();
+		if (const auto large = media->image(Data::PhotoSize::Large)) {
+			image = large->original();
+		}
+	}
+	if (image.isNull() && request.documentId) {
+		const auto document = data->document(request.documentId);
+		if (!document->isImage()) {
+			return QImage();
+		}
+		const auto media = document->createMediaView();
+		document->saveFromDataSilent();
+		auto &location = document->location(true);
+		if (location.accessEnable()) {
+			image = Images::Read({ .path = location.name() }).image;
+		} else {
+			image = Images::Read({ .content = media->bytes() }).image;
+		}
+		location.accessDisable();
+	}
+	return image;
+}
+
+void OpenDrawToReplyEditor(
+		not_null<Window::SessionController*> controller,
+		QImage image,
+		Fn<void(QImage &&)> done) {
+	if (image.isNull()) {
+		return;
+	}
+	const auto parent = controller->content();
+	const auto parentWidget = not_null<QWidget*>{ parent.get() };
+	auto fileImage = std::make_shared<Image>(std::move(image));
+	auto editor = base::make_unique_q<Editor::PhotoEditor>(
+		parentWidget,
+		&controller->window(),
+		fileImage,
+		Editor::PhotoModifications());
+	const auto raw = editor.get();
+	auto layer = std::make_unique<Editor::LayerWidget>(
+		parentWidget,
+		std::move(editor));
+	Editor::InitEditorLayer(
+		layer.get(),
+		raw,
+		[fileImage, done = std::move(done)](
+				Editor::PhotoModifications mods) mutable {
+			auto result = Editor::ImageModified(
+				fileImage->original(),
+				mods);
+			if (result.isNull()) {
+				return;
+			}
+			if (done) {
+				done(std::move(result));
+			}
+		});
+	controller->showLayer(std::move(layer), Ui::LayerOption::KeepOther);
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_draw_to_reply.h b/Telegram/SourceFiles/history/view/history_view_draw_to_reply.h
new file mode 100644
index 00000000000000..150d1f0b1363ea
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_draw_to_reply.h
@@ -0,0 +1,30 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+class Session;
+struct DrawToReplyRequest;
+} // namespace Data
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace HistoryView {
+
+[[nodiscard]] QImage ResolveDrawToReplyImage(
+	not_null<Data::Session*> data,
+	const Data::DrawToReplyRequest &request);
+
+void OpenDrawToReplyEditor(
+	not_null<Window::SessionController*> controller,
+	QImage image,
+	Fn<void(QImage &&)> done);
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 880b58f75a16a3..ea030eb7f5da9e 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -7,14 +7,20 @@ For license and copyright information please follow this link:
 */
 #include "history/view/history_view_element.h"
 
+#include "apiwrap.h"
+#include "api/api_transcribes.h"
 #include "history/view/history_view_service_message.h"
 #include "history/view/history_view_message.h"
+#include "history/view/media/history_view_media_generic.h"
 #include "history/view/media/history_view_media_grouped.h"
 #include "history/view/media/history_view_similar_channels.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/view/media/history_view_large_emoji.h"
 #include "history/view/media/history_view_custom_emoji.h"
+#include "history/view/media/history_view_no_forwards_request.h"
+#include "history/view/media/history_view_suggest_decision.h"
 #include "history/view/reactions/history_view_reactions_button.h"
+#include "history/view/history_view_reply_button.h"
 #include "history/view/reactions/history_view_reactions.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/history_view_reply.h"
@@ -22,15 +28,25 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item_components.h"
 #include "history/history_item_helpers.h"
+#include "data/data_channel.h"
+#include "data/data_session.h"
+#include "iv/iv_cached_media.h"
+#include "iv/iv_rich_page.h"
 #include "base/unixtime.h"
+#include "boxes/premium_preview_box.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "core/click_handler_types.h"
 #include "core/ui_integration.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
+#include "spellcheck/spellcheck_highlight_syntax.h"
 #include "chat_helpers/stickers_emoji_pack.h"
+#include "payments/payments_reaction_process.h" // TryAddingPaidReaction.
 #include "window/window_session_controller.h"
+#include "window/section_widget.h"
+#include "ui/chat/chat_style.h"
+#include "ui/effects/glare.h"
 #include "ui/effects/path_shift_gradient.h"
 #include "ui/effects/reaction_fly_animation.h"
 #include "ui/toast/toast.h"
@@ -38,20 +54,44 @@ For license and copyright information please follow this link:
 #include "ui/item_text_options.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/round_rect.h"
 #include "data/components/sponsored_messages.h"
-#include "data/data_session.h"
+#include "data/data_saved_sublist.h"
+#include "data/data_todo_list.h"
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
 #include "data/data_message_reactions.h"
 #include "data/data_user.h"
 #include "lang/lang_keys.h"
 #include "styles/style_chat.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_iv.h"
 
 namespace HistoryView {
 namespace {
 
+[[nodiscard]] auto FlatSelectionEndpointFromState(const TextState &state)
+-> MessageSelectionFlatEndpoint {
+	if (state.selectionCursor.isFlat()) {
+		return state.selectionCursor.flat;
+	}
+	return {
+		.symbol = state.symbol,
+		.afterSymbol = state.afterSymbol,
+	};
+}
+
+[[nodiscard]] auto FlatSelectionEndpointFromOffset(uint16 offset)
+-> MessageSelectionFlatEndpoint {
+	return {
+		.symbol = offset,
+		.afterSymbol = false,
+	};
+}
+
 // A new message from the same sender is attached to previous within 15 minutes.
 constexpr int kAttachMessageToPreviousSecondsDelta = 900;
+constexpr auto kMaxShownLine = 1024 * 1024;
 
 Element *HoveredElement/* = nullptr*/;
 Element *PressedElement/* = nullptr*/;
@@ -59,6 +99,328 @@ Element *HoveredLinkElement/* = nullptr*/;
 Element *PressedLinkElement/* = nullptr*/;
 Element *MousedElement/* = nullptr*/;
 
+class KeyboardStyle : public ReplyKeyboard::Style {
+public:
+	KeyboardStyle(const style::BotKeyboardButton &st, Fn<void()> repaint);
+
+	Images::CornersMaskRef buttonRounding(
+		Ui::BubbleRounding outer,
+		RectParts sides) const override;
+
+	const style::TextStyle &textStyle() const override;
+	void repaint(not_null<const HistoryItem*> item) const override;
+
+protected:
+	void paintButtonBg(
+		QPainter &p,
+		const Ui::ChatStyle *st,
+		const QRect &rect,
+		HistoryMessageMarkupButton::Color color,
+		Ui::BubbleRounding rounding,
+		float64 howMuchOver) const override;
+	void paintButtonStart(
+		QPainter &p,
+		const Ui::ChatStyle *st,
+		HistoryMessageMarkupButton::Color color) const override;
+	void paintButtonIcon(
+		QPainter &p,
+		const Ui::ChatStyle *st,
+		const QRect &rect,
+		int outerWidth,
+		HistoryMessageMarkupButton::Type type) const override;
+	void paintButtonLoading(
+		QPainter &p,
+		const Ui::ChatStyle *st,
+		const QRect &rect,
+		HistoryMessageMarkupButton::Color color,
+		int outerWidth,
+		Ui::BubbleRounding rounding) const override;
+	int minButtonWidth(HistoryMessageMarkupButton::Type type) const override;
+
+private:
+	struct CachedBg {
+		QImage image;
+		QColor color;
+	};
+	using BubbleRoundingKey = uchar;
+	struct CacheKey {
+		BubbleRoundingKey rounding;
+		HistoryMessageMarkupButton::Color color;
+
+		friend inline constexpr auto operator<=>(
+			CacheKey,
+			CacheKey) = default;
+	};
+	mutable base::flat_map<CacheKey, CachedBg> _cachedBg;
+	mutable base::flat_map<CacheKey, QPainterPath> _cachedOutline;
+	mutable std::unique_ptr<Ui::GlareEffect> _glare;
+	Fn<void()> _repaint;
+
+};
+
+KeyboardStyle::KeyboardStyle(
+	const style::BotKeyboardButton &st,
+	Fn<void()> repaint)
+: ReplyKeyboard::Style(st)
+, _repaint(std::move(repaint)) {
+}
+
+void KeyboardStyle::paintButtonStart(
+		QPainter &p,
+		const Ui::ChatStyle *st,
+		HistoryMessageMarkupButton::Color color) const {
+	using Color = HistoryMessageMarkupButton::Color;
+	Expects(st != nullptr);
+
+	p.setPen((color == Color::Normal) ? st->msgServiceFg() : st::white);
+}
+
+const style::TextStyle &KeyboardStyle::textStyle() const {
+	return st::serviceTextStyle;
+}
+
+void KeyboardStyle::repaint(not_null<const HistoryItem*> item) const {
+	item->history()->owner().requestItemRepaint(item);
+}
+
+Images::CornersMaskRef KeyboardStyle::buttonRounding(
+		Ui::BubbleRounding outer,
+		RectParts sides) const {
+	using namespace Images;
+	using namespace Ui;
+	using Radius = CachedCornerRadius;
+	using Corner = BubbleCornerRounding;
+	auto result = CornersMaskRef(CachedCornersMasks(Radius::BubbleSmall));
+	if (sides & RectPart::Bottom) {
+		const auto &large = CachedCornersMasks(Radius::BubbleLarge);
+		auto round = [&](RectPart side, int index) {
+			if ((sides & side) && (outer[index] == Corner::Large)) {
+				result.p[index] = &large[index];
+			}
+		};
+		round(RectPart::Left, kBottomLeft);
+		round(RectPart::Right, kBottomRight);
+	}
+	return result;
+}
+
+void KeyboardStyle::paintButtonBg(
+		QPainter &p,
+		const Ui::ChatStyle *st,
+		const QRect &rect,
+		HistoryMessageMarkupButton::Color color,
+		Ui::BubbleRounding rounding,
+		float64 howMuchOver) const {
+	Expects(st != nullptr);
+
+	using Corner = Ui::BubbleCornerRounding;
+	const auto key = CacheKey{ rounding.key(), color };
+	auto &cachedBg = _cachedBg[key];
+
+	const auto sti = &st->imageStyle(false);
+	const auto ratio = style::DevicePixelRatio();
+	if (cachedBg.image.isNull()
+		|| cachedBg.image.width() != (rect.width() * ratio)
+		|| cachedBg.color != sti->msgServiceBg->c) {
+		cachedBg.color = sti->msgServiceBg->c;
+		cachedBg.image = QImage(
+			rect.size() * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		cachedBg.image.setDevicePixelRatio(ratio);
+		cachedBg.image.fill(Qt::transparent);
+		{
+			auto painter = QPainter(&cachedBg.image);
+
+			using Color = HistoryMessageMarkupButton::Color;
+			const auto normal = (color == Color::Normal);
+			const auto colored = style::owned_color((color == Color::Primary)
+				? st::botKbInlinePrimaryBg->c
+				: (color == Color::Danger)
+				? st::botKbInlineDangerBg->c
+				: st::botKbInlineSuccessBg->c);
+			const auto smallColored = normal
+				? Ui::CornersPixmaps()
+				: Ui::PrepareCornerPixmaps(
+					Ui::BubbleRadiusSmall(),
+					colored.color());
+			const auto largeColored = normal
+				? Ui::CornersPixmaps()
+				: Ui::PrepareCornerPixmaps(
+					Ui::BubbleRadiusLarge(),
+					colored.color());
+			const auto small = normal
+				? &sti->msgServiceBgCornersSmall
+				: &smallColored;
+			const auto large = normal
+				? &sti->msgServiceBgCornersLarge
+				: &largeColored;
+			auto corners = Ui::CornersPixmaps();
+			int radiuses[4];
+			for (auto i = 0; i != 4; ++i) {
+				const auto isLarge = (rounding[i] == Corner::Large);
+				corners.p[i] = (isLarge ? large : small)->p[i];
+				radiuses[i] = Ui::CachedCornerRadiusValue(isLarge
+					? Ui::CachedCornerRadius::BubbleLarge
+					: Ui::CachedCornerRadius::BubbleSmall);
+			}
+			const auto r = Rect(rect.size());
+			_cachedOutline[key] = Ui::ComplexRoundedRectPath(
+				r - Margins(st::lineWidth),
+				radiuses[0],
+				radiuses[1],
+				radiuses[2],
+				radiuses[3]);
+			Ui::FillRoundRect(
+				painter,
+				r,
+				normal ? sti->msgServiceBg : colored.color(),
+				corners);
+		}
+	}
+	p.drawImage(rect.topLeft(), cachedBg.image);
+	if (howMuchOver > 0) {
+		auto o = p.opacity();
+		p.setOpacity(o * howMuchOver);
+		const auto &small = st->msgBotKbOverBgAddCornersSmall();
+		const auto &large = st->msgBotKbOverBgAddCornersLarge();
+		auto over = Ui::CornersPixmaps();
+		for (auto i = 0; i != 4; ++i) {
+			over.p[i] = (rounding[i] == Corner::Large ? large : small).p[i];
+		}
+		Ui::FillRoundRect(p, rect, st->msgBotKbOverBgAdd(), over);
+		p.setOpacity(o);
+	}
+}
+
+void KeyboardStyle::paintButtonIcon(
+		QPainter &p,
+		const Ui::ChatStyle *st,
+		const QRect &rect,
+		int outerWidth,
+		HistoryMessageMarkupButton::Type type) const {
+	Expects(st != nullptr);
+
+	using Type = HistoryMessageMarkupButton::Type;
+	const auto icon = [&]() -> const style::icon* {
+		switch (type) {
+		case Type::Url:
+		case Type::Auth: return &st->msgBotKbUrlIcon();
+		case Type::Buy: return &st->msgBotKbPaymentIcon();
+		case Type::SwitchInlineSame:
+		case Type::SwitchInline: return &st->msgBotKbSwitchPmIcon();
+		case Type::WebView:
+		case Type::SimpleWebView: return &st->msgBotKbWebviewIcon();
+		case Type::CopyText: return &st->msgBotKbCopyIcon();
+		}
+		return nullptr;
+	}();
+	if (icon) {
+		icon->paint(p, rect.x() + rect.width() - icon->width() - st::msgBotKbIconPadding, rect.y() + st::msgBotKbIconPadding, outerWidth);
+	}
+}
+
+void KeyboardStyle::paintButtonLoading(
+		QPainter &p,
+		const Ui::ChatStyle *st,
+		const QRect &rect,
+		HistoryMessageMarkupButton::Color color,
+		int outerWidth,
+		Ui::BubbleRounding rounding) const {
+	Expects(st != nullptr);
+
+	if (anim::Disabled()) {
+		const auto &icon = st->historySendingInvertedIcon();
+		icon.paint(
+			p,
+			rect::right(rect) - icon.width() - st::msgBotKbIconPadding,
+			rect::bottom(rect) - icon.height() - st::msgBotKbIconPadding,
+			rect.x() * 2 + rect.width());
+		return;
+	}
+
+	const auto key = CacheKey{ rounding.key(), color };
+	auto &cachedBg = _cachedBg[key];
+	if (!cachedBg.image.isNull()) {
+		if (_glare && _glare->glare.birthTime) {
+			const auto progress = _glare->progress(crl::now());
+			const auto w = _glare->width;
+			const auto h = rect.height();
+			const auto x = (-w) + (w * 2) * progress;
+
+			auto frame = cachedBg.image;
+			frame.fill(Qt::transparent);
+			{
+				auto painter = QPainter(&frame);
+				auto hq = PainterHighQualityEnabler(painter);
+				painter.setPen(Qt::NoPen);
+				painter.drawTiledPixmap(x, 0, w, h, _glare->pixmap, 0, 0);
+
+				auto path = QPainterPath();
+				path.addRect(Rect(rect.size()));
+				path -= _cachedOutline[key];
+
+				constexpr auto kBgOutlineAlpha = 0.5;
+				constexpr auto kFgOutlineAlpha = 0.8;
+				const auto &c = st::premiumButtonFg->c;
+				painter.setPen(Qt::NoPen);
+				painter.setBrush(c);
+				painter.setOpacity(kBgOutlineAlpha);
+				painter.drawPath(path);
+				auto gradient = QLinearGradient(-w, 0, w * 2, 0);
+				{
+					constexpr auto kShiftLeft = 0.01;
+					constexpr auto kShiftRight = 0.99;
+					auto stops = _glare->computeGradient(c).stops();
+					stops[1] = {
+						std::clamp(progress, kShiftLeft, kShiftRight),
+						QColor(c.red(), c.green(), c.blue(), kFgOutlineAlpha),
+					};
+					gradient.setStops(std::move(stops));
+				}
+				painter.setBrush(QBrush(gradient));
+				painter.setOpacity(1);
+				painter.drawPath(path);
+
+				painter.setCompositionMode(
+					QPainter::CompositionMode_DestinationIn);
+				painter.drawImage(0, 0, cachedBg.image);
+			}
+			p.drawImage(rect.x(), rect.y(), frame);
+		} else {
+			_glare = std::make_unique<Ui::GlareEffect>();
+			_glare->width = outerWidth;
+
+			constexpr auto kTimeout = crl::time(0);
+			constexpr auto kDuration = crl::time(1100);
+			const auto color = st::premiumButtonFg->c;
+			_glare->validate(color, _repaint, kTimeout, kDuration);
+		}
+	}
+}
+
+int KeyboardStyle::minButtonWidth(
+		HistoryMessageMarkupButton::Type type) const {
+	using Type = HistoryMessageMarkupButton::Type;
+	int result = 2 * buttonPadding(), iconWidth = 0;
+	switch (type) {
+	case Type::Url:
+	case Type::Auth: iconWidth = st::msgBotKbUrlIcon.width(); break;
+	case Type::Buy: iconWidth = st::msgBotKbPaymentIcon.width(); break;
+	case Type::SwitchInlineSame:
+	case Type::SwitchInline: iconWidth = st::msgBotKbSwitchPmIcon.width(); break;
+	case Type::Callback:
+	case Type::CallbackWithPassword:
+	case Type::Game: iconWidth = st::historySendingInvertedIcon.width(); break;
+	case Type::WebView:
+	case Type::SimpleWebView: iconWidth = st::msgBotKbWebviewIcon.width(); break;
+	case Type::CopyText: return st::msgBotKbCopyIcon.width(); break;
+	}
+	if (iconWidth > 0) {
+		result = std::max(result, 2 * iconWidth + 4 * int(st::msgBotKbIconPadding));
+	}
+	return result;
+}
+
 [[nodiscard]] bool IsAttachedToPreviousInSavedMessages(
 		not_null<HistoryItem*> previous,
 		HistoryMessageForwarded *prevForwarded,
@@ -94,6 +456,40 @@ Element *MousedElement/* = nullptr*/;
 	return session->tryResolveWindow();
 }
 
+[[nodiscard]] TextSelection ApplyModificationsFrom(
+		TextSelection result,
+		const Ui::Text::String &text) {
+	if (result.empty()) {
+		return result;
+	}
+	for (const auto &modification : text.modifications()) {
+		if (modification.position >= result.to) {
+			break;
+		}
+		if (modification.added) {
+			result.to += modification.added;
+		}
+		const auto shiftTo = std::min(
+			int(modification.skipped),
+			result.to - modification.position);
+		result.to -= shiftTo;
+		if (modification.position < result.from) {
+			if (modification.added) {
+				result.from += modification.added;
+			}
+			const auto shiftFrom = std::min(
+				int(modification.skipped),
+				result.from - modification.position);
+			result.from -= shiftFrom;
+		} else if (modification.position == result.from) {
+			if (!modification.skipped) {
+				result.from += modification.added;
+			}
+		}
+	}
+	return result;
+}
+
 } // namespace
 
 std::unique_ptr<Ui::PathShiftGradient> MakePathShiftGradient(
@@ -111,7 +507,8 @@ bool DefaultElementDelegate::elementUnderCursor(
 	return false;
 }
 
-SelectionModeResult DefaultElementDelegate::elementInSelectionMode() {
+SelectionModeResult DefaultElementDelegate::elementInSelectionMode(
+		const Element *view) {
 	return {};
 }
 
@@ -131,6 +528,16 @@ void DefaultElementDelegate::elementShowPollResults(
 	FullMsgId context) {
 }
 
+void DefaultElementDelegate::elementShowAddPollOption(
+	not_null<Element*> view,
+	not_null<PollData*> poll,
+	FullMsgId context,
+	QRect optionRect) {
+}
+
+void DefaultElementDelegate::elementSubmitAddPollOption(FullMsgId context) {
+}
+
 void DefaultElementDelegate::elementOpenPhoto(
 	not_null<PhotoData*> photo,
 	FullMsgId context) {
@@ -142,6 +549,12 @@ void DefaultElementDelegate::elementOpenDocument(
 	bool showInMediaView) {
 }
 
+bool DefaultElementDelegate::elementScrollToLocalY(
+		not_null<const Element*> view,
+		int localTop) {
+	return false;
+}
+
 void DefaultElementDelegate::elementCancelUpload(const FullMsgId &context) {
 }
 
@@ -150,6 +563,11 @@ void DefaultElementDelegate::elementShowTooltip(
 	Fn<void()> hiddenCallback) {
 }
 
+void DefaultElementDelegate::elementShowHiddenSenderTooltip(
+	FullMsgId itemId,
+	const TextWithEntities &text) {
+}
+
 bool DefaultElementDelegate::elementHideReply(
 		not_null<const Element*> view) {
 	return false;
@@ -174,8 +592,8 @@ void DefaultElementDelegate::elementHandleViaClick(
 	not_null<UserData*> bot) {
 }
 
-bool DefaultElementDelegate::elementIsChatWide() {
-	return false;
+ElementChatMode DefaultElementDelegate::elementChatMode() {
+	return ElementChatMode::Default;
 }
 
 void DefaultElementDelegate::elementReplyTo(const FullReplyTo &to) {
@@ -264,6 +682,9 @@ QString DateTooltipText(not_null<Element*> view) {
 	const auto format = QLocale::LongFormat;
 	const auto item = view->data();
 	auto dateText = locale.toString(view->dateTime(), format);
+	if (item->awaitingVideoProcessing()) {
+		dateText += '\n' + tr::lng_approximate_about(tr::now);
+	}
 	if (const auto editedDate = view->displayedEditDate()) {
 		dateText += '\n' + tr::lng_edited_date(
 			tr::now,
@@ -282,6 +703,17 @@ QString DateTooltipText(not_null<Element*> view) {
 				dateText = tr::lng_forwarded_imported(tr::now)
 					+ "\n\n" + dateText;
 			}
+			if (forwarded->savedFromDate
+				&& forwarded->savedFromDate != forwarded->originalDate) {
+				const auto parsed = base::unixtime::parse(
+					forwarded->savedFromDate);
+				if (parsed != view->dateTime()) {
+					dateText += '\n' + tr::lng_forwarded_forwarded_date(
+						tr::now,
+						lt_date,
+						locale.toString(parsed, format));
+				}
+			}
 		}
 	}
 	if (view->isSignedAuthorElided()) {
@@ -295,6 +727,9 @@ QString DateTooltipText(not_null<Element*> view) {
 	if (item->isScheduled() && item->isSilent()) {
 		dateText += '\n' + QChar(0xD83D) + QChar(0xDD15);
 	}
+	if (const auto stars = item->out() ? item->starsPaid() : 0) {
+		dateText += '\n' + tr::lng_you_paid_stars(tr::now, lt_count, stars);
+	}
 	return dateText;
 }
 
@@ -316,7 +751,7 @@ void UnreadBar::paint(
 		const PaintContext &context,
 		int y,
 		int w,
-		bool chatWide) const {
+		ElementChatMode mode) const {
 	const auto previousTranslation = p.transform().dx();
 	if (previousTranslation != 0) {
 		p.translate(-previousTranslation, 0);
@@ -340,7 +775,7 @@ void UnreadBar::paint(
 	p.setPen(st->historyUnreadBarFg());
 
 	int maxwidth = w;
-	if (chatWide) {
+	if (mode == ElementChatMode::Wide) {
 		maxwidth = qMin(
 			maxwidth,
 			st::msgMaxWidth
@@ -383,42 +818,264 @@ void DateBadge::paint(
 	ServiceMessagePainter::PaintDate(p, st, text, width, y, w, chatWide);
 }
 
-void ServicePreMessage::init(TextWithEntities string) {
+void ForumThreadBar::init(
+		not_null<PeerData*> parentChat,
+		not_null<Data::Thread*> thread) {
+	this->thread = thread;
+	const auto sublist = thread->asSublist();
+	if (sublist) {
+		text.setText(st::semiboldTextStyle, sublist->sublistPeer()->name());
+	} else if (const auto topic = thread->asTopic()) {
+		text.setMarkedText(
+			st::semiboldTextStyle,
+			topic->titleWithIconOrLogo(),
+			kMarkupTextOptions,
+			Core::TextContext({
+				.session = &topic->session(),
+				.customEmojiLoopLimit = -1, // First frame only
+			}));
+	}
+	const auto skip = st::monoforumBarUserpicSkip;
+	const auto userpic = sublist
+		? (st::msgServicePadding.top()
+			+ st::msgServiceFont->height
+			+ st::msgServicePadding.bottom()
+			- 2 * skip)
+		: (st::msgServicePadding.left() - 3 * skip);
+
+	width = skip
+		+ userpic
+		+ skip * 2
+		+ text.maxWidth()
+		+ st::topicButtonArrowSkip
+		+ st::msgServicePadding.right();
+}
+
+int ForumThreadBar::height() const {
+	return st::msgServiceMargin.top()
+		+ st::msgServicePadding.top()
+		+ st::msgServiceFont->height
+		+ st::msgServicePadding.bottom()
+		+ st::msgServiceMargin.bottom();
+}
+
+void ForumThreadBar::paint(
+		Painter &p,
+		not_null<const Ui::ChatStyle*> st,
+		int y,
+		int w,
+		bool chatWide,
+		bool skipPatternLine) const {
+	if (const auto strong = thread.get()) {
+		Paint(
+			p,
+			st,
+			strong,
+			text,
+			width,
+			view,
+			y,
+			w,
+			chatWide,
+			skipPatternLine);
+	}
+}
+
+int ForumThreadBar::PaintForGetWidth(
+		Painter &p,
+		not_null<const Ui::ChatStyle*> st,
+		not_null<Element*> itemView,
+		Ui::PeerUserpicView &userpicView,
+		int y,
+		int w,
+		bool chatWide) {
+	const auto item = itemView->data();
+	const auto topic = item->topic();
+	const auto sublist = item->savedSublist();
+	const auto sender = topic
+		? (Data::Thread*)topic
+		: (sublist && sublist->parentChat())
+		? (Data::Thread*)sublist
+		: nullptr;
+	auto text = Ui::Text::String();
+	if (!sender
+		|| !topic
+		|| (sublist && sublist->sublistPeer()->isMonoforum())) {
+		return 0;
+	} else if (topic) {
+		text.setMarkedText(
+			st::semiboldTextStyle,
+			topic->titleWithIconOrLogo(),
+			kMarkupTextOptions,
+			Core::TextContext({
+				.session = &topic->session(),
+				.customEmojiLoopLimit = -1, // First frame only
+			}));
+	} else {
+		text.setText(st::semiboldTextStyle, sublist->sublistPeer()->name());
+	}
+	const auto skip = st::monoforumBarUserpicSkip;
+	const auto userpic = sublist
+		? (st::msgServicePadding.top()
+			+ st::msgServiceFont->height
+			+ st::msgServicePadding.bottom()
+			- 2 * skip)
+		: (st::msgServicePadding.left() - 3 * skip);
+	const auto width = skip
+		+ userpic
+		+ skip * 2
+		+ text.maxWidth()
+		+ st::topicButtonArrowSkip
+		+ st::msgServicePadding.right();
+	Paint(p, st, sender, text, width, userpicView, y, w, chatWide, true);
+	return width;
+}
+
+void ForumThreadBar::Paint(
+		Painter &p,
+		not_null<const Ui::ChatStyle*> st,
+		not_null<Data::Thread*> thread,
+		const Ui::Text::String &text,
+		int width,
+		Ui::PeerUserpicView &view,
+		int y,
+		int w,
+		bool chatWide,
+		bool skipPatternLine) {
+	int left = st::msgServiceMargin.left();
+	const auto maxwidth = chatWide
+		? std::min(w, WideChatWidth())
+		: w;
+	w = maxwidth - st::msgServiceMargin.left() - st::msgServiceMargin.left();
+
+	const auto use = std::min(w, width);
+
+	left += (w - use) / 2;
+	int h = st::msgServicePadding.top() + st::msgServiceFont->height + st::msgServicePadding.bottom();
+	ServiceMessagePainter::PaintBubble(
+		p,
+		st->msgServiceBg(),
+		st->serviceBgCornersNormal(),
+		QRect(left, y + st::msgServiceMargin.top(), use, h));
+
+	const auto skip = st::monoforumBarUserpicSkip;
+	if (!skipPatternLine) {
+		auto pen = st->msgServiceBg()->p;
+		pen.setWidthF(skip);
+		pen.setCapStyle(Qt::RoundCap);
+		pen.setDashPattern({ 2., 2. });
+		p.setPen(pen);
+		const auto top = y + st::msgServiceMargin.top() + (h / 2);
+		p.drawLine(0, top, left, top);
+		p.drawLine(left + use, top, 2 * w, top);
+	}
+
+	const auto sublist = thread->asSublist();
+	const auto userpic = sublist
+		? (st::msgServicePadding.top()
+			+ st::msgServiceFont->height
+			+ st::msgServicePadding.bottom()
+			- 2 * skip)
+		: (st::msgServicePadding.left() - 3 * skip);
+	const auto available = use
+		- (skip
+			+ userpic
+			+ skip * 2
+			+ st::topicButtonArrowSkip
+			+ st::msgServicePadding.right());
+
+	if (sublist) {
+		sublist->sublistPeer()->paintUserpic(
+			p,
+			view,
+			left + skip,
+			y + st::msgServiceMargin.top() + skip,
+			userpic);
+	}
+
+	const auto textLeft = left + skip + userpic + skip * 2;
+	const auto textTop = y
+		+ st::msgServiceMargin.top()
+		+ st::msgServicePadding.top();
+	p.setFont(st::msgServiceFont);
+	p.setPen(st->msgServiceFg());
+	text.draw(p, {
+		.position = { textLeft, textTop },
+		.availableWidth = available,
+		.paused = true,
+		.elisionLines = 1,
+	});
+
+	st::topicButtonArrow.paint(
+		p,
+		textLeft + available + st::topicButtonArrowPosition.x(),
+		textTop + st::topicButtonArrowPosition.y(),
+		w,
+		st->msgServiceFg()->c);
+}
+
+void ServicePreMessage::init(
+		not_null<Element*> view,
+		PreparedServiceText string,
+		ClickHandlerPtr fullClickHandler,
+		std::unique_ptr<Media> media,
+		bool below) {
+	this->below = below;
 	text = Ui::Text::String(
 		st::serviceTextStyle,
-		string,
+		string.text,
 		kMarkupTextOptions,
-		st::msgMinWidth);
+		st::msgMinWidth,
+		Core::TextContext({
+			.session = &view->history()->session(),
+			.repaint = [=] { view->customEmojiRepaint(); },
+		}));
+	handler = std::move(fullClickHandler);
+	for (auto i = 0; i != int(string.links.size()); ++i) {
+		text.setLink(i + 1, string.links[i]);
+	}
+	this->media = std::move(media);
 }
 
-int ServicePreMessage::resizeToWidth(int newWidth, bool chatWide) {
+int ServicePreMessage::resizeToWidth(int newWidth, ElementChatMode mode) {
 	width = newWidth;
-	if (chatWide) {
+	if (mode == ElementChatMode::Wide) {
 		accumulate_min(
 			width,
 			st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left());
 	}
-	auto contentWidth = width;
-	contentWidth -= st::msgServiceMargin.left() + st::msgServiceMargin.left(); // two small margins
-	if (contentWidth < st::msgServicePadding.left() + st::msgServicePadding.right() + 1) {
-		contentWidth = st::msgServicePadding.left() + st::msgServicePadding.right() + 1;
+
+	if (media) {
+		media->initDimensions();
+		media->resizeGetHeight(width);
+	}
+
+	if (media && media->hideServiceText()) {
+		height = media->height() + st::msgServiceMargin.bottom();
+	} else {
+		auto contentWidth = width;
+		contentWidth -= st::msgServiceMargin.left() + st::msgServiceMargin.right();
+		if (contentWidth < st::msgServicePadding.left() + st::msgServicePadding.right() + 1) {
+			contentWidth = st::msgServicePadding.left() + st::msgServicePadding.right() + 1;
+		}
+
+		auto maxWidth = text.maxWidth()
+			+ st::msgServicePadding.left()
+			+ st::msgServicePadding.right();
+		auto minHeight = text.minHeight();
+
+		auto nwidth = qMax(contentWidth
+			- st::msgServicePadding.left()
+			- st::msgServicePadding.right(), 0);
+		height = (contentWidth >= maxWidth)
+			? minHeight
+			: text.countHeight(nwidth);
+		height += st::msgServicePadding.top()
+			+ st::msgServicePadding.bottom()
+			+ st::msgServiceMargin.top()
+			+ st::msgServiceMargin.bottom();
 	}
 
-	auto maxWidth = text.maxWidth()
-		+ st::msgServicePadding.left()
-		+ st::msgServicePadding.right();
-	auto minHeight = text.minHeight();
-
-	auto nwidth = qMax(contentWidth
-		- st::msgServicePadding.left()
-		- st::msgServicePadding.right(), 0);
-	height = (contentWidth >= maxWidth)
-		? minHeight
-		: text.countHeight(nwidth);
-	height += st::msgServicePadding.top()
-		+ st::msgServicePadding.bottom()
-		+ st::msgServiceMargin.top()
-		+ st::msgServiceMargin.bottom();
 	return height;
 }
 
@@ -426,37 +1083,89 @@ void ServicePreMessage::paint(
 		Painter &p,
 		const PaintContext &context,
 		QRect g,
-		bool chatWide) const {
-	const auto top = g.top() - height - st::msgMargin.top();
-	p.translate(0, top);
+		ElementChatMode mode) const {
+	if (media && media->hideServiceText()) {
+		const auto left = (width - media->width()) / 2;
+		const auto top = below
+			? (g.top() + g.height() - st::msgServiceMargin.top() + st::msgServiceMargin.bottom())
+			: (g.top() - height - st::msgMargin.bottom());
+		const auto position = QPoint(left, top);
+		p.translate(position);
+		media->draw(p, context.selected()
+			? context.translated(-position)
+			: context.translated(-position).withSelection({}));
+		p.translate(-position);
+	} else {
+		const auto top = below
+			? (g.top() + g.height() - st::msgServiceMargin.top() + st::msgServiceMargin.bottom())
+			: (g.top() - height - st::msgMargin.top());
+		p.translate(0, top);
+
+		const auto rect = QRect(0, 0, width, height)
+			- st::msgServiceMargin;
+		const auto trect = rect - st::msgServicePadding;
+
+		ServiceMessagePainter::PaintComplexBubble(
+			p,
+			context.st,
+			rect.left(),
+			rect.width(),
+			text,
+			trect);
+
+		p.setBrush(Qt::NoBrush);
+		p.setPen(context.st->msgServiceFg());
+		p.setFont(st::msgServiceFont);
+		text.draw(p, {
+			.position = trect.topLeft(),
+			.availableWidth = trect.width(),
+			.align = style::al_top,
+			.palette = &context.st->serviceTextPalette(),
+			.now = context.now,
+			.fullWidthSelection = false,
+			//.selection = context.selection,
+		});
 
-	const auto rect = QRect(0, 0, width, height)
+		p.translate(0, -top);
+	}
+}
+
+ClickHandlerPtr ServicePreMessage::textState(
+		QPoint point,
+		const StateRequest &request,
+		QRect g) const {
+	if (media && media->hideServiceText()) {
+		const auto left = (width - media->width()) / 2;
+		const auto top = below
+			? (g.top() + g.height() - st::msgServiceMargin.top() + st::msgServiceMargin.bottom())
+			: (g.top() - height - st::msgMargin.bottom());
+		const auto position = QPoint(left, top);
+		return media->textState(point - position, request).link;
+	}
+	const auto top = below
+		? (g.top() + g.height() - st::msgServiceMargin.top() + st::msgServiceMargin.bottom())
+		: (g.top() - height - st::msgMargin.top());
+	const auto rect = QRect(0, top, width, height)
 		- st::msgServiceMargin;
 	const auto trect = rect - st::msgServicePadding;
+	if (trect.contains(point)) {
+		auto textRequest = request.forText();
+		textRequest.align = style::al_center;
+		const auto link = text.getState(
+			point - trect.topLeft(),
+			trect.width(),
+			textRequest).link;
+		if (link) {
+			return link;
+		}
+	}
+	if (handler && rect.contains(point)) {
+		return handler;
+	}
+	return {};
+}
 
-	ServiceMessagePainter::PaintComplexBubble(
-		p,
-		context.st,
-		rect.left(),
-		rect.width(),
-		text,
-		trect);
-
-	p.setBrush(Qt::NoBrush);
-	p.setPen(context.st->msgServiceFg());
-	p.setFont(st::msgServiceFont);
-	text.draw(p, {
-		.position = trect.topLeft(),
-		.availableWidth = trect.width(),
-		.align = style::al_top,
-		.palette = &context.st->serviceTextPalette(),
-		.now = context.now,
-		.fullWidthSelection = false,
-		//.selection = context.selection,
-	});
 
-	p.translate(0, -top);
-}
 
 void FakeBotAboutTop::init() {
 	if (!text.isEmpty()) {
@@ -500,12 +1209,17 @@ Element::Element(
 		if (user
 			&& user->isBot()
 			&& !user->isRepliesChat()
-			&& !user->isVerifyCodes()) {
+			&& !user->isVerifyCodes()
+			&& !user->botManagerId()) {
 			AddComponents(FakeBotAboutTop::Bit());
 		}
 	}
 }
 
+bool Element::embedReactionsInBubble() const {
+	return false;
+}
+
 not_null<ElementDelegate*> Element::delegate() const {
 	return _delegate;
 }
@@ -522,10 +1236,24 @@ uint8 Element::colorIndex() const {
 	return data()->colorIndex();
 }
 
+auto Element::colorCollectible() const
+-> const std::shared_ptr<Ui::ColorCollectible> & {
+	return data()->colorCollectible();
+}
+
 uint8 Element::contentColorIndex() const {
 	return data()->contentColorIndex();
 }
 
+DocumentId Element::contentBackgroundEmojiId() const {
+	return data()->contentBackgroundEmojiId();
+}
+
+auto Element::contentColorCollectible() const
+-> const std::shared_ptr<Ui::ColorCollectible> & {
+	return data()->contentColorCollectible();
+}
+
 QDateTime Element::dateTime() const {
 	return _dateTime;
 }
@@ -570,6 +1298,9 @@ void Element::hideSpoilers() {
 	if (_media) {
 		_media->hideSpoilers();
 	}
+	if (const auto rich = richpage()) {
+		rich->article.hideSpoilers();
+	}
 }
 
 void Element::customEmojiRepaint() {
@@ -614,8 +1345,8 @@ void Element::prepareCustomEmojiPaint(
 	}
 }
 
-void Element::repaint() const {
-	history()->owner().requestViewRepaint(this);
+void Element::repaint(QRect r) const {
+	history()->owner().requestViewRepaint(this, r);
 }
 
 void Element::paintHighlight(
@@ -660,6 +1391,17 @@ bool Element::isLastAndSelfMessage() const {
 	return false;
 }
 
+void Element::addVerticalMargins(int top, int bottom) {
+	if (top || bottom) {
+		AddComponents(ViewAddedMargins::Bit());
+		const auto margins = Get<ViewAddedMargins>();
+		margins->top = top;
+		margins->bottom = bottom;
+	} else {
+		RemoveComponents(ViewAddedMargins::Bit());
+	}
+}
+
 void Element::setPendingResize() {
 	_flags |= Flag::NeedsResize;
 	if (_context == Context::History) {
@@ -723,8 +1465,7 @@ void Element::overrideMedia(std::unique_ptr<Media> media) {
 	Expects(!history()->owner().groups().find(data()));
 
 	_text = Ui::Text::String(st::msgMinWidth);
-	_textWidth = -1;
-	_textHeight = 0;
+	invalidateTextSizeCache();
 
 	_media = std::move(media);
 	if (!pendingResize()) {
@@ -733,6 +1474,40 @@ void Element::overrideMedia(std::unique_ptr<Media> media) {
 	_flags |= Flag::MediaOverriden;
 }
 
+void Element::overrideRightBadge(const QString &text, BadgeRole role) {
+	if (text.isEmpty()) {
+		if (Has<RightBadge>()) {
+			Get<RightBadge>()->overridden = false;
+			RemoveComponents(RightBadge::Bit());
+		}
+		return;
+	}
+	if (!Has<RightBadge>()) {
+		AddComponents(RightBadge::Bit());
+	}
+	const auto badge = Get<RightBadge>();
+	badge->overridden = true;
+	badge->role = role;
+	badge->tag.setMarkedText(
+		st::defaultTextStyle,
+		{ text },
+		Ui::NameTextOptions());
+	badge->boosts.clear();
+	if (role == BadgeRole::User) {
+		badge->width = badge->tag.maxWidth();
+	} else {
+		const auto &padding = st::msgTagBadgePadding;
+		const auto tagTextWidth = badge->tag.maxWidth();
+		const auto contentWidth = padding.left()
+			+ tagTextWidth
+			+ padding.right();
+		const auto pillHeight = padding.top()
+			+ st::msgFont->height
+			+ padding.bottom();
+		badge->width = std::max(contentWidth, pillHeight);
+	}
+}
+
 not_null<PurchasedTag*> Element::enforcePurchasedTag() {
 	if (const auto purchased = Get<PurchasedTag>()) {
 		return purchased;
@@ -744,7 +1519,8 @@ not_null<PurchasedTag*> Element::enforcePurchasedTag() {
 int Element::AdditionalSpaceForSelectionCheckbox(
 		not_null<const Element*> view,
 		QRect countedGeometry) {
-	if (!view->hasOutLayout() || view->delegate()->elementIsChatWide()) {
+	if (!view->hasOutLayout()
+		|| view->delegate()->elementChatMode() == ElementChatMode::Wide) {
 		return 0;
 	}
 	if (countedGeometry.isEmpty()) {
@@ -819,6 +1595,26 @@ void Element::refreshMedia(Element *replacing) {
 				this,
 				std::make_unique<LargeEmoji>(this, emoji));
 		}
+	} else if (const auto nfr = item->Get<HistoryServiceNoForwardsRequest>()
+		; nfr && (!nfr->expired || nfr->actionTaken)) {
+		_media = std::make_unique<MediaGeneric>(
+			this,
+			GenerateNoForwardsRequestMedia(this, nfr),
+			MediaGenericDescriptor{
+				.maxWidth = st::chatSuggestInfoWidth,
+				.service = true,
+				.hideServiceText = true,
+			});
+	} else if (const auto decision = item->Get<HistoryServiceSuggestDecision>()) {
+		_media = std::make_unique<MediaGeneric>(
+			this,
+			GenerateSuggestDecisionMedia(this, decision),
+			MediaGenericDescriptor{
+				.maxWidth = st::chatSuggestInfoWidth,
+				.fullAreaLink = decision->lnk,
+				.service = true,
+				.hideServiceText = true,
+			});
 	} else {
 		_media = nullptr;
 	}
@@ -836,10 +1632,35 @@ Ui::Text::OnlyCustomEmoji Element::onlyCustomEmoji() const {
 	return _text.toOnlyCustomEmoji();
 }
 
+void Element::skipInactiveTextAppearing() {
+	if (pendingResize()) {
+		// This message isn't displayed right now,
+		// so we can skip text animation.
+		if (const auto appearing = Get<TextAppearing>()) {
+			appearing->widthAnimation.stop();
+			appearing->heightAnimation.stop();
+			appearing->shownLine = kMaxShownLine;
+			appearing->shownWidth
+				= appearing->shownHeight
+				= appearing->revealedLineWidth
+				= 0;
+			appearing->geometryValid = false;
+		}
+	}
+}
+
 const Ui::Text::String &Element::text() const {
 	return _text;
 }
 
+HistoryMessageRichPage *Element::richpage() {
+	return Get<HistoryMessageRichPage>();
+}
+
+const HistoryMessageRichPage *Element::richpage() const {
+	return const_cast<Element*>(this)->richpage();
+}
+
 OnlyEmojiAndSpaces Element::isOnlyEmojiAndSpaces() const {
 	if (data()->Has<HistoryMessageTranslation>()) {
 		return OnlyEmojiAndSpaces::No;
@@ -854,11 +1675,33 @@ OnlyEmojiAndSpaces Element::isOnlyEmojiAndSpaces() const {
 	}
 }
 
-int Element::textHeightFor(int textWidth) {
-	validateText();
+int Element::richPageWidthFor(int textWidth) const {
+    return textWidth + st::msgPadding.left() + st::msgPadding.right();
+}
+
+int Element::textHeightFor(int textWidth) const {
+	constexpr auto kMaxWidth = (1 << 16) - 1;
+	if (textWidth <= 0 || textWidth > kMaxWidth) {
+		return 0;
+	}
+	const_cast<Element*>(this)->validateText();
 	if (_textWidth != textWidth) {
 		_textWidth = textWidth;
-		_textHeight = _text.countHeight(textWidth);
+		if (const auto rich = const_cast<Element*>(this)->richpage()) {
+			const auto articleHeight = rich->article.resizeGetHeight(
+				richPageWidthFor(textWidth));
+			_textHeight = articleHeight
+				+ (_text.hasSkipBlock() ? skipBlockHeight() : 0);
+			rich->article.setVisibleTopBottom(0, articleHeight);
+			_textRealWidth = std::clamp(
+				rich->article.lastLayoutWidth(),
+				0,
+				kMaxWidth);
+		} else {
+			const auto result = _text.countSize(textWidth);
+			_textRealWidth = std::clamp(result.width(), 0, kMaxWidth);
+			_textHeight = result.height();
+		}
 	}
 	return _textHeight;
 }
@@ -883,21 +1726,23 @@ auto Element::contextDependentServiceText() -> TextWithLinks {
 		return {};
 	}
 	const auto from = item->from();
-	const auto topicUrl = u"internal:url:https://t.me/c/%1/%2"_q
-		.arg(peerToChannel(peerId).bare)
-		.arg(topicRootId.bare);
+	const auto topicUrl = UrlClickHandler::EncodeInternalWrappedUrl(
+		u"https://t.me/c/%1/%2"_q
+			.arg(peerToChannel(peerId).bare)
+			.arg(topicRootId.bare));
 	const auto fromLink = [&](int index) {
-		return Ui::Text::Link(from->name(), index);
+		return tr::link(from->name(), index);
 	};
 	const auto placeholderLink = [&] {
-		return Ui::Text::Link(
-			tr::lng_action_topic_placeholder(tr::now),
-			topicUrl);
+		const auto linkText = history()->peer->isBot()
+			? tr::lng_action_topic_bot_thread(tr::now)
+			: tr::lng_action_topic_placeholder(tr::now);
+		return tr::link(linkText, topicUrl);
 	};
 	const auto wrapTopic = [&](
 			const QString &title,
 			std::optional<DocumentId> iconId) {
-		return Ui::Text::Link(
+		return tr::link(
 			Data::ForumTopicIconWithTitle(
 				topicRootId,
 				iconId.value_or(0),
@@ -925,19 +1770,25 @@ auto Element::contextDependentServiceText() -> TextWithLinks {
 
 	if (info->closed) {
 		return {
-			tr::lng_action_topic_closed(
+			tr::lng_action_topic_closed_by(
 				tr::now,
+				lt_from,
+				fromLink(1),
 				lt_topic,
 				wrapParentTopic(),
-				Ui::Text::WithEntities),
+				tr::marked),
+			{ from->createOpenLink() },
 		};
 	} else if (info->reopened) {
 		return {
-			tr::lng_action_topic_reopened(
+			tr::lng_action_topic_reopened_by(
 				tr::now,
+				lt_from,
+				fromLink(1),
 				lt_topic,
 				wrapParentTopic(),
-				Ui::Text::WithEntities),
+				tr::marked),
+			{ from->createOpenLink() },
 		};
 	} else if (info->hidden) {
 		return {
@@ -945,7 +1796,7 @@ auto Element::contextDependentServiceText() -> TextWithLinks {
 				tr::now,
 				lt_topic,
 				wrapParentTopic(),
-				Ui::Text::WithEntities),
+				tr::marked),
 		};
 	} else if (info->unhidden) {
 		return {
@@ -953,7 +1804,7 @@ auto Element::contextDependentServiceText() -> TextWithLinks {
 				tr::now,
 				lt_topic,
 				wrapParentTopic(),
-				Ui::Text::WithEntities),
+				tr::marked),
 		};
 	} else if (info->renamed) {
 		return {
@@ -969,7 +1820,7 @@ auto Element::contextDependentServiceText() -> TextWithLinks {
 					(info->reiconed
 						? info->iconId
 						: std::optional<DocumentId>())),
-				Ui::Text::WithEntities),
+				tr::marked),
 			{ from->createOpenLink() },
 		};
 	} else if (info->reiconed) {
@@ -983,7 +1834,7 @@ auto Element::contextDependentServiceText() -> TextWithLinks {
 					placeholderLink(),
 					lt_emoji,
 					Data::SingleCustomEmoji(iconId),
-					Ui::Text::WithEntities),
+					tr::marked),
 				{ from->createOpenLink() },
 			};
 		} else {
@@ -994,7 +1845,7 @@ auto Element::contextDependentServiceText() -> TextWithLinks {
 					fromLink(1),
 					lt_link,
 					placeholderLink(),
-					Ui::Text::WithEntities),
+					tr::marked),
 				{ from->createOpenLink() },
 			};
 		}
@@ -1004,31 +1855,149 @@ auto Element::contextDependentServiceText() -> TextWithLinks {
 }
 
 void Element::validateText() {
+	const auto clearRichPage = [&] {
+		if (Has<HistoryMessageRichPage>()) {
+			RemoveComponents(0
+				| HistoryMessageRichPage::Bit()
+				| InstantViewMediaRuntime::Bit());
+			invalidateTextSizeCache();
+		}
+	};
+	const auto ensureRichPage = [&](
+			std::shared_ptr<const Iv::RichPage> page) {
+		const auto message = dynamic_cast<Message*>(this);
+		if (!message || !page) {
+			clearRichPage();
+			return;
+		}
+		if (!Has<HistoryMessageRichPage>()) {
+			AddComponents(0
+				| HistoryMessageRichPage::Bit()
+				| InstantViewMediaRuntime::Bit());
+		}
+		const auto runtime = Get<HistoryMessageRichPage>();
+		const auto needsBinding = (runtime->article.mediaBlockHost()
+			!= runtime->host.get());
+		const auto needsHighlightSubscription = !runtime->highlightReadyLifetime;
+		if (needsBinding || needsHighlightSubscription) {
+			const auto weak = base::make_weak(message);
+			runtime->host->owner = weak;
+			if (needsBinding) {
+				runtime->article.setMediaBlockHost(runtime->host.get());
+				runtime->article.setTextRepaintCallbacks(
+					[weak] {
+						if (const auto owner = weak.get()) {
+							owner->requestRichPageRepaint(QRect());
+						}
+					},
+					[weak](QRect articleRect) {
+						if (const auto owner = weak.get()) {
+							owner->requestRichPageRepaint(articleRect);
+						}
+					},
+					[weak](const ClickContext &context) {
+						const auto owner = weak.get();
+						if (context.button != Qt::LeftButton || !owner) {
+							return false;
+						}
+						owner->history()->owner().registerShownSpoiler(owner);
+						return true;
+					});
+			}
+		}
+		if (needsHighlightSubscription) {
+			Spellchecker::HighlightReady(
+			) | rpl::on_next([weak = runtime->host->owner](
+					Spellchecker::HighlightProcessId processId) {
+				if (const auto owner = weak.get()) {
+					if (const auto rich = owner->richpage()) {
+						if (rich->article.highlightProcessDone(processId)) {
+							owner->requestRichPageRepaint(QRect());
+						}
+					}
+				}
+			}, runtime->highlightReadyLifetime);
+		}
+		if (runtime->page == page && runtime->mediaRuntime) {
+			return;
+		}
+		const auto &layoutSt = st::messageMarkdown;
+		const auto session = &history()->session();
+		const auto richLimits = Iv::ResolveRichMessageLimits(session);
+		runtime->page = std::move(page);
+		runtime->mediaRuntime = Iv::CreateMessageMediaRuntime(
+			session,
+			not_null<Element*>{ this },
+			[](QString) {}, // openChannel
+			[](QString) {}); // joinChannel
+		auto prepared = Iv::Markdown::TryPrepareNativeInstantView({
+			.richPage = runtime->page,
+			.mediaRuntime = runtime->mediaRuntime,
+			.dimensionsOverride = Iv::Markdown::CaptureMarkdownPrepareDimensions(
+				layoutSt),
+			.tableRenderLimits = Iv::Markdown::PrepareTableRenderLimitsForRichMessage(
+				richLimits),
+		});
+		if (!prepared.supported()) {
+			clearRichPage();
+			return;
+		}
+		runtime->article.setContent(std::move(prepared.content));
+		runtime->handler = nullptr;
+		runtime->handlerPreparedLink = std::nullopt;
+		runtime->handlerMediaActivation = {};
+		runtime->handlerPlaceholderId = {};
+		runtime->handlerPlaceholderPoint = QPoint();
+		invalidateTextSizeCache();
+	};
 	const auto item = data();
 	const auto media = item->media();
 	const auto storyMention = media && media->storyMention();
-	if (media && media->storyExpired()) {
+	const auto storyExpired = media && media->storyExpired();
+	const auto storyUnsupported = media && media->storyUnsupported();
+	if (storyExpired || storyUnsupported) {
 		_media = nullptr;
 		_textItem = item;
+		clearRichPage();
 		if (!storyMention) {
 			if (_text.isEmpty()) {
-				setTextWithLinks(Ui::Text::Italic(
-					tr::lng_forwarded_story_expired(tr::now)));
+				setTextWithLinks(tr::italic(storyUnsupported
+					? tr::lng_stories_unsupported(tr::now)
+					: tr::lng_forwarded_story_expired(tr::now)));
 			}
 			return;
 		}
 	}
 
 	// Albums may show text of a different item than the parent one.
+	// Media::itemForText may initialize data within the object.
 	_textItem = _media ? _media->itemForText() : item.get();
+
+	const auto &summary = item->summaryEntry();
+	const auto summaryShownWas = (_flags & Flag::SummaryShown) != 0;
+	const auto summaryShownNow = !summary.result.empty() && summary.shown;
+	const auto summaryShownChanged = (summaryShownWas != summaryShownNow);
+	if (summaryShownNow) {
+		_flags |= Flag::SummaryShown;
+		if (summaryShownChanged) {
+			setTextWithLinks(summary.result);
+		}
+		clearRichPage();
+		return;
+	} else {
+		_flags &= ~Flag::SummaryShown;
+	}
+
 	if (!_textItem) {
 		if (!_text.isEmpty()) {
 			setTextWithLinks({});
 		}
+		clearRichPage();
 		return;
 	}
 	const auto &text = _textItem->_text;
-	if (_text.isEmpty() == text.empty()) {
+	auto richPage = std::shared_ptr<const Iv::RichPage>();
+	if (!summaryShownChanged && _text.isEmpty() == text.empty()) {
 	} else if (_flags & Flag::ServiceMessage) {
 		const auto contextDependentText = contextDependentServiceText();
 		const auto &markedText = contextDependentText.text.empty()
@@ -1038,23 +2007,49 @@ void Element::validateText() {
 			? _textItem->customTextLinks()
 			: contextDependentText.links;
 		setTextWithLinks(markedText, customLinks);
+
+		if (const auto done = item->Get<HistoryServiceTodoCompletions>()) {
+			if (!done->completed.empty() && !done->incompleted.empty()) {
+				const auto todoItemId = (done->incompleted.size() == 1)
+					? done->incompleted.front()
+					: 0;
+				setServicePreMessage(
+					item->composeTodoIncompleted(done),
+					JumpToMessageClickHandler(
+						(done->peerId
+							? history()->owner().peer(done->peerId)
+							: history()->peer),
+						done->msgId,
+						item->fullId(),
+						{ .todoItemId = todoItemId }));
+			} else {
+				setServicePreMessage({});
+			}
+		}
 	} else {
 		const auto unavailable = item->computeUnavailableReason();
 		if (!unavailable.isEmpty()) {
-			setTextWithLinks(Ui::Text::Italic(unavailable));
+			setTextWithLinks(tr::italic(unavailable));
 		} else {
 			setTextWithLinks(_textItem->translatedTextWithLocalEntities());
+			richPage = _textItem->richPage();
 		}
 	}
+	if (!richPage
+		&& !(_flags & Flag::ServiceMessage)
+		&& item->computeUnavailableReason().isEmpty()) {
+		richPage = _textItem->richPage();
+	}
+	ensureRichPage(std::move(richPage));
 }
 
 void Element::setTextWithLinks(
 		const TextWithEntities &text,
 		const std::vector<ClickHandlerPtr> &links) {
-	const auto context = Core::MarkedTextContext{
+	const auto context = Core::TextContext({
 		.session = &history()->session(),
-		.customEmojiRepaint = [=] { customEmojiRepaint(); },
-	};
+		.repaint = [=] { customEmojiRepaint(); },
+	});
 	if (_flags & Flag::ServiceMessage) {
 		const auto &options = Ui::ItemTextServiceOptions();
 		_text.setMarkedText(st::serviceTextStyle, text, options, context);
@@ -1082,24 +2077,43 @@ void Element::setTextWithLinks(
 		}
 	}
 	InitElementTextPart(this, _text);
-	_textWidth = -1;
-	_textHeight = 0;
+	if (const auto next = _text.nextFormattedDateUpdate()) {
+		history()->session().data().registerFormattedDateUpdate(next, this);
+	}
+	invalidateTextSizeCache();
 }
 
 void Element::validateTextSkipBlock(bool has, int width, int height) {
 	validateText();
 	if (!has) {
 		if (_text.removeSkipBlock()) {
-			_textWidth = -1;
-			_textHeight = 0;
+			invalidateTextSizeCache();
 		}
 	} else if (_text.updateSkipBlock(width, height)) {
-		_textWidth = -1;
-		_textHeight = 0;
+		invalidateTextSizeCache();
 	}
 }
 
+void Element::validateInlineKeyboard(HistoryMessageReplyMarkup *markup) {
+	if (!markup
+		|| markup->inlineKeyboard
+		|| markup->hiddenBy(data()->media())) {
+		return;
+	}
+	const auto item = data();
+	//if (item->hideLinks()) {
+	//	item->setHasHiddenLinks(true);
+	//	return;
+	//}
+	markup->inlineKeyboard = std::make_unique<ReplyKeyboard>(
+		item,
+		std::make_unique<KeyboardStyle>(
+			st::msgBotKbButton,
+			[=] { item->history()->owner().requestItemRepaint(item); }));
+}
+
 void Element::previousInBlocksChanged() {
+	recountThreadBarInBlocks();
 	recountDisplayDateInBlocks();
 	recountAttachToPreviousInBlocks();
 }
@@ -1128,6 +2142,7 @@ bool Element::computeIsAttachToPrevious(not_null<Element*> previous) {
 		return !item->isService()
 			&& !item->isEmpty()
 			&& !item->isPostHidingAuthor()
+			&& !item->isGuestChatBotMessage()
 			&& (!item->history()->peer->isMegagroup()
 				|| !view->hasOutLayout()
 				|| !item->from()->isChannel());
@@ -1135,7 +2150,8 @@ bool Element::computeIsAttachToPrevious(not_null<Element*> previous) {
 	const auto item = data();
 	if (!Has<DateBadge>()
 		&& !Has<UnreadBar>()
-		&& !Has<ServicePreMessage>()) {
+		&& !Has<ServicePreMessage>()
+		&& !Has<ForumThreadBar>()) {
 		const auto prev = previous->data();
 		const auto previousMarkup = prev->inlineReplyMarkup();
 		const auto possible = (std::abs(prev->date() - item->date())
@@ -1158,9 +2174,18 @@ bool Element::computeIsAttachToPrevious(not_null<Element*> previous) {
 					prevForwarded,
 					item,
 					forwarded);
-			} else {
-				return prev->from() == item->from();
+			} else if (prev->from() != item->from()) {
+			    return false;
+			} else if (!item->author()->isMegagroup()) {
+				return true;
 			}
+			const auto rank = [&](not_null<HistoryItem*> item) {
+			    const auto msgsigned = item->Get<HistoryMessageSigned>();
+				return (msgsigned && msgsigned->isAnonymousRank)
+					? msgsigned->author
+					: QString();
+			};
+			return rank(item) == rank(prev);
 		}
 	}
 	return false;
@@ -1210,7 +2235,7 @@ void Element::createUnreadBar(rpl::producer<QString> text) {
 	const auto bar = Get<UnreadBar>();
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		if (const auto bar = Get<UnreadBar>()) {
 			bar->init(text);
 		}
@@ -1247,6 +2272,14 @@ bool Element::isInOneDayWithPrevious() const {
 	return !data()->isEmpty() && !displayDate();
 }
 
+bool Element::displayForumThreadBar() const {
+	return Has<ForumThreadBar>();
+}
+
+bool Element::isInOneBunchWithPrevious() const {
+	return !data()->isEmpty() && !displayForumThreadBar();
+}
+
 void Element::recountAttachToPreviousInBlocks() {
 	if (isHidden() || data()->isEmpty()) {
 		if (const auto next = nextDisplayedInBlocks()) {
@@ -1265,6 +2298,52 @@ void Element::recountAttachToPreviousInBlocks() {
 	setAttachToPrevious(attachToPrevious, previous);
 }
 
+void Element::recountThreadBarInBlocks() {
+	const auto item = data();
+	const auto topic = item->topic();
+	const auto sublist = item->savedSublist();
+	const auto parentChat = (topic && topic->peer()->useSubsectionTabs())
+		? topic->peer().get()
+		: sublist
+		? sublist->parentChat()
+		: nullptr;
+	const auto barThread = [&]() -> Data::Thread* {
+		if (!parentChat
+			|| isHidden()
+			|| item->isEmpty()
+			|| item->isSponsored()) {
+			return nullptr;
+		}
+		if (const auto previous = previousDisplayedInBlocks()) {
+			const auto prev = previous->data();
+			if (const auto prevTopic = prev->topic()) {
+				Assert(prevTopic->peer() == parentChat);
+				const auto topicRootId = topic->rootId();
+				if (prevTopic->rootId() == topicRootId) {
+					return nullptr;
+				}
+			} else if (const auto prevSublist = prev->savedSublist()) {
+				Assert(prevSublist->parentChat() == parentChat);
+				const auto sublistPeer = sublist->sublistPeer();
+				if (prevSublist->sublistPeer() == sublistPeer) {
+					return nullptr;
+				}
+			}
+		}
+		return topic
+			? (Data::Thread*)topic
+			: (sublist && sublist->sublistPeer() != parentChat)
+			? (Data::Thread*)sublist
+			: nullptr;
+	}();
+	if (barThread && !Has<ForumThreadBar>()) {
+		AddComponents(ForumThreadBar::Bit());
+		Get<ForumThreadBar>()->init(parentChat, barThread);
+	} else if (!barThread && Has<ForumThreadBar>()) {
+		RemoveComponents(ForumThreadBar::Bit());
+	}
+}
+
 void Element::recountDisplayDateInBlocks() {
 	setDisplayDate([&] {
 		const auto item = data();
@@ -1277,7 +2356,7 @@ void Element::recountDisplayDateInBlocks() {
 
 		if (const auto previous = previousDisplayedInBlocks()) {
 			const auto prev = previous->data();
-			return prev->isEmpty()
+			return prev->hideDisplayDate()
 				|| (previous->dateTime().date() != dateTime().date());
 		}
 		return true;
@@ -1307,6 +2386,9 @@ bool Element::countIsTopicRootReply() const {
 
 void Element::setDisplayDate(bool displayDate) {
 	const auto item = data();
+	if (item->hideDisplayDate()) {
+		displayDate = false;
+	}
 	if (displayDate && !Has<DateBadge>()) {
 		AddComponents(DateBadge::Bit());
 		Get<DateBadge>()->init(
@@ -1318,11 +2400,39 @@ void Element::setDisplayDate(bool displayDate) {
 	}
 }
 
-void Element::setServicePreMessage(TextWithEntities text) {
-	if (!text.empty()) {
+void Element::setServicePreMessage(
+		PreparedServiceText text,
+		ClickHandlerPtr fullClickHandler,
+		std::unique_ptr<Media> media) {
+	if (!text.text.empty() || media) {
 		AddComponents(ServicePreMessage::Bit());
 		const auto service = Get<ServicePreMessage>();
-		service->init(std::move(text));
+		service->init(
+			this,
+			std::move(text),
+			std::move(fullClickHandler),
+			std::move(media),
+			false);
+		setPendingResize();
+	} else if (Has<ServicePreMessage>()) {
+		RemoveComponents(ServicePreMessage::Bit());
+		setPendingResize();
+	}
+}
+
+void Element::setServicePostMessage(
+		PreparedServiceText text,
+		ClickHandlerPtr fullClickHandler,
+		std::unique_ptr<Media> media) {
+	if (!text.text.empty() || media) {
+		AddComponents(ServicePreMessage::Bit());
+		const auto service = Get<ServicePreMessage>();
+		service->init(
+			this,
+			std::move(text),
+			std::move(fullClickHandler),
+			std::move(media),
+			true);
 		setPendingResize();
 	} else if (Has<ServicePreMessage>()) {
 		RemoveComponents(ServicePreMessage::Bit());
@@ -1411,7 +2521,8 @@ bool Element::hasOutLayout() const {
 }
 
 bool Element::hasRightLayout() const {
-	return hasOutLayout() && !_delegate->elementIsChatWide();
+	return hasOutLayout()
+		&& (_delegate->elementChatMode() != ElementChatMode::Wide);
 }
 
 bool Element::drawBubble() const {
@@ -1426,14 +2537,6 @@ bool Element::unwrapped() const {
 	return true;
 }
 
-bool Element::hasFastReply() const {
-	return false;
-}
-
-bool Element::displayFastReply() const {
-	return false;
-}
-
 std::optional<QSize> Element::rightActionSize() const {
 	return std::nullopt;
 }
@@ -1466,7 +2569,7 @@ bool Element::allowTextSelectionByHandler(
 }
 
 bool Element::usesBubblePattern(const PaintContext &context) const {
-	return (context.selection != FullSelection)
+	return !context.selected()
 		&& hasOutLayout()
 		&& context.bubblesPattern
 		&& !context.viewport.isEmpty()
@@ -1478,6 +2581,9 @@ bool Element::hasVisibleText() const {
 }
 
 int Element::textualMaxWidth() const {
+	if (const auto rich = richpage()) {
+		return rich->article.maxWidth();
+	}
 	return st::msgPadding.left()
 		+ (hasVisibleText() ? text().maxWidth() : 0)
 		+ st::msgPadding.right();
@@ -1491,11 +2597,14 @@ auto Element::verticalRepaintRange() const -> VerticalRepaintRange {
 }
 
 bool Element::hasHeavyPart() const {
-	return (_flags & Flag::HeavyCustomEmoji);
+	const auto rich = richpage();
+	return (_flags & Flag::HeavyCustomEmoji)
+		|| (_media && _media->hasHeavyPart())
+		|| (rich && rich->article.hasHeavyPart());
 }
 
 void Element::checkHeavyPart() {
-	if (!hasHeavyPart() && (!_media || !_media->hasHeavyPart())) {
+	if (!hasHeavyPart()) {
 		history()->owner().unregisterHeavyViewPart(this);
 	}
 }
@@ -1504,33 +2613,167 @@ bool Element::isSignedAuthorElided() const {
 	return false;
 }
 
+void Element::setupReactions(Element *replacing) {
+	refreshReactions();
+	auto animations = replacing
+		? replacing->takeReactionAnimations()
+		: base::flat_map<
+		Data::ReactionId,
+		std::unique_ptr<Ui::ReactionFlyAnimation>>();
+	if (!animations.empty()) {
+		const auto repainter = [=] { repaint(); };
+		for (const auto &[id, animation] : animations) {
+			animation->setRepaintCallback(repainter);
+		}
+		if (_reactions) {
+			_reactions->continueAnimations(std::move(animations));
+		}
+	}
+}
+
+void Element::refreshReactions() {
+	using namespace Reactions;
+	auto reactionsData = InlineListDataFromMessage(this);
+	if (reactionsData.reactions.empty()) {
+		setReactions(nullptr);
+		return;
+	}
+	if (!_reactions) {
+		const auto handlerFactory = [=](ReactionId id) {
+			const auto weak = base::make_weak(this);
+			return std::make_shared<LambdaClickHandler>([=](
+					ClickContext context) {
+				const auto strong = weak.get();
+				if (!strong) {
+					return;
+				}
+				const auto item = strong->data();
+				const auto controller = ExtractController(context);
+				const auto wasChosen = ranges::contains(
+					item->chosenReactions(),
+					id);
+				if (item->reactionsAreTags()) {
+					if (item->history()->session().premium()) {
+						const auto tag = Data::SearchTagToQuery(id);
+						HashtagClickHandler(tag).onClick(context);
+					} else if (controller) {
+						ShowPremiumPreviewBox(
+							controller,
+							PremiumFeature::TagsForMessages);
+					}
+					return;
+				}
+				if (id.paid()) {
+					Payments::TryAddingPaidReaction(
+						item,
+						weak.get(),
+						1,
+						std::nullopt,
+						controller->uiShow());
+					return;
+				} else if (!wasChosen
+					&& controller
+					&& Window::ShowReactPremiumError(controller, item, id)) {
+					return;
+				} else {
+					const auto source = HistoryReactionSource::Existing;
+					item->toggleReaction(id, source);
+				}
+				if (const auto now = weak.get()) {
+					const auto chosen = now->data()->chosenReactions();
+					if (id.paid() || ranges::contains(chosen, id)) {
+						now->animateReaction({
+							.id = id,
+						});
+					}
+				}
+			});
+		};
+		setReactions(std::make_unique<InlineList>(
+			&history()->owner().reactions(),
+			handlerFactory,
+			[=] { customEmojiRepaint(); },
+			std::move(reactionsData)));
+	} else {
+		auto was = _reactions->computeTagsList();
+		_reactions->update(std::move(reactionsData), width());
+		auto now = _reactions->computeTagsList();
+		if (!was.empty() || !now.empty()) {
+			auto &owner = history()->owner();
+			owner.viewTagsChanged(this, std::move(was), std::move(now));
+		}
+	}
+}
+
+void Element::setReactions(std::unique_ptr<Reactions::InlineList> list) {
+	auto was = _reactions
+		? _reactions->computeTagsList()
+		: std::vector<Data::ReactionId>();
+	_reactions = std::move(list);
+	auto now = _reactions
+		? _reactions->computeTagsList()
+		: std::vector<Data::ReactionId>();
+	if (!was.empty() || !now.empty()) {
+		auto &owner = history()->owner();
+		owner.viewTagsChanged(this, std::move(was), std::move(now));
+	}
+}
+
+bool Element::updateReactions() {
+	const auto wasReactions = _reactions
+		? _reactions->currentSize()
+		: QSize();
+	refreshReactions();
+	const auto nowReactions = _reactions
+		? _reactions->currentSize()
+		: QSize();
+	return (wasReactions != nowReactions);
+}
+
 void Element::itemDataChanged() {
+	if (updateReactions()) {
+		history()->owner().requestViewResize(this);
+	} else {
+		repaint();
+	}
 }
 
 void Element::itemTextUpdated() {
 	if (const auto media = _media.get()) {
 		media->parentTextUpdated();
 	}
+	_flags &= ~Flag::SummaryShown;
 	clearSpecialOnlyEmoji();
 	_text = Ui::Text::String(st::msgMinWidth);
-	_textWidth = -1;
-	_textHeight = 0;
+	invalidateTextSizeCache();
 	if (_media && !data()->media()) {
 		refreshMedia(nullptr);
 	}
 }
 
 void Element::blockquoteExpandChanged() {
-	_textWidth = -1;
-	_textHeight = 0;
+	invalidateTextSizeCache();
 	history()->owner().requestViewResize(this);
 }
 
+void Element::invalidateTextSizeCache() {
+	_textWidth = 0;
+	_textHeight = 0;
+	_textRealWidth = 0;
+	invalidateTextDependentCache();
+}
+
 void Element::unloadHeavyPart() {
 	history()->owner().unregisterHeavyViewPart(this);
+	if (_reactions) {
+		_reactions->unloadCustomEmoji();
+	}
 	if (_media) {
 		_media->unloadHeavyPart();
 	}
+	if (const auto rich = richpage()) {
+		rich->article.unloadHeavyPart();
+	}
 	if (_flags & Flag::HeavyCustomEmoji) {
 		_flags &= ~Flag::HeavyCustomEmoji;
 		_text.unloadPersistentAnimation();
@@ -1560,10 +2803,10 @@ void Element::attachToBlock(not_null<HistoryBlock*> block, int index) {
 	previousInBlocksChanged();
 }
 
-void Element::removeFromBlock() {
+void Element::removeFromBlock(Data::ViewRemovalReason reason) {
 	Expects(_block != nullptr);
 
-	_block->remove(this);
+	_block->remove(this, reason);
 }
 
 void Element::refreshInBlock() {
@@ -1645,12 +2888,80 @@ TextState Element::bottomInfoTextState(
 	return TextState();
 }
 
+MessageSelection Element::selectionFromStates(
+		const TextState &anchor,
+		const TextState &current,
+		TextSelectType type) const {
+	if (anchor.selectionCursor.isRichPage()
+		|| current.selectionCursor.isRichPage()) {
+		return {};
+	}
+	return adjustSelection(
+		MessageSelection::Flat(
+			FlatSelectionEndpointFromState(anchor),
+			FlatSelectionEndpointFromState(current)),
+		type);
+}
+
+TextForMimeData Element::selectedText(
+		const MessageSelection &selection) const {
+	if (const auto flat = selection.flatSelection(); !flat.empty()) {
+		return selectedText(flat);
+	}
+	return {};
+}
+
+SelectedQuote Element::selectedQuote(
+		const MessageSelection &selection) const {
+	if (const auto flat = selection.flatSelection(); !flat.empty()) {
+		return selectedQuote(flat);
+	}
+	return {};
+}
+
 TextSelection Element::adjustSelection(
 		TextSelection selection,
 		TextSelectType type) const {
 	return selection;
 }
 
+MessageSelection Element::adjustSelection(
+		const MessageSelection &selection,
+		TextSelectType type) const {
+	if (!selection.isFlat()) {
+		return {};
+	}
+	const auto adjusted = adjustSelection(selection.flatSelection(), type);
+	if (adjusted.empty() || (adjusted == FullSelection)) {
+		return {};
+	}
+	const auto anchorOffset = selection.anchor.isFlat()
+		? selection.anchor.flat.offset()
+		: adjusted.from;
+	const auto focusOffset = selection.focus.isFlat()
+		? selection.focus.flat.offset()
+		: adjusted.to;
+	return MessageSelection::Flat(
+		(anchorOffset <= focusOffset)
+			? FlatSelectionEndpointFromOffset(adjusted.from)
+			: FlatSelectionEndpointFromOffset(adjusted.to),
+		(anchorOffset <= focusOffset)
+			? FlatSelectionEndpointFromOffset(adjusted.to)
+			: FlatSelectionEndpointFromOffset(adjusted.from));
+}
+
+TextSelection Element::selectionForEdit(
+		const MessageSelection &selection) const {
+	return selection.flatRangeForEdit();
+}
+
+bool Element::selectionContains(
+		const MessageSelection &selection,
+		const TextState &state) const {
+	return (state.cursor == CursorState::Text)
+		&& selection.contains(state.selectionCursor);
+}
+
 SelectedQuote Element::FindSelectedQuote(
 		const Ui::Text::String &text,
 		TextSelection selection,
@@ -1662,16 +2973,23 @@ SelectedQuote Element::FindSelectedQuote(
 	for (const auto &modification : text.modifications()) {
 		if (modification.position >= selection.to) {
 			break;
-		} else if (modification.position <= selection.from) {
+		} else if (modification.position < selection.from) {
 			modified.from += modification.skipped;
-			if (modification.added
-				&& modification.position < selection.from) {
-				--modified.from;
+			if (modification.added) {
+				modified.from = uint16(std::max(
+					0,
+					int(modified.from) - int(modification.added)));
+			}
+		} else if (modification.position == selection.from) {
+			if (!modification.added) {
+				modified.from += modification.skipped;
 			}
 		}
 		modified.to += modification.skipped;
 		if (modification.added && modified.to > modified.from) {
-			--modified.to;
+			modified.to = uint16(std::max(
+				int(modified.from),
+				int(modified.to) - int(modification.added)));
 		}
 	}
 	auto result = item->originalText();
@@ -1694,6 +3012,7 @@ SelectedQuote Element::FindSelectedQuote(
 		EntityType::StrikeOut,
 		EntityType::Spoiler,
 		EntityType::CustomEmoji,
+		EntityType::FormattedDate,
 	};
 	for (auto i = result.entities.begin(); i != result.entities.end();) {
 		const auto offset = i->offset();
@@ -1710,7 +3029,7 @@ SelectedQuote Element::FindSelectedQuote(
 			++i;
 		}
 	}
-	return { item, result, modified.from, overflown };
+	return { item, { result, modified.from }, overflown };
 }
 
 TextSelection Element::FindSelectionFromQuote(
@@ -1718,12 +3037,18 @@ TextSelection Element::FindSelectionFromQuote(
 		const SelectedQuote &quote) {
 	Expects(quote.item != nullptr);
 
-	if (quote.text.empty()) {
+	const auto &rich = quote.highlight.quote;
+	if (rich.empty()) {
 		return {};
 	}
 	const auto &original = quote.item->originalText();
+	if (quote.highlight.quoteOffset == kSearchQueryOffsetHint) {
+		return ApplyModificationsFrom(
+			FindSearchQueryHighlight(original.text, rich.text),
+			text);
+	}
 	const auto length = int(original.text.size());
-	const auto qlength = int(quote.text.text.size());
+	const auto qlength = int(rich.text.size());
 	const auto checkAt = [&](int offset) {
 		return TextSelection{
 			uint16(offset),
@@ -1734,7 +3059,7 @@ TextSelection Element::FindSelectionFromQuote(
 		if (offset > length - qlength) {
 			return TextSelection();
 		}
-		const auto i = original.text.indexOf(quote.text.text, offset);
+		const auto i = original.text.indexOf(rich.text, offset);
 		return (i >= 0) ? checkAt(i) : TextSelection();
 	};
 	const auto findOneBefore = [&](int offset) {
@@ -1743,7 +3068,7 @@ TextSelection Element::FindSelectionFromQuote(
 		}
 		const auto end = std::min(offset + qlength - 1, length);
 		const auto from = end - length - 1;
-		const auto i = original.text.lastIndexOf(quote.text.text, from);
+		const auto i = original.text.lastIndexOf(rich.text, from);
 		return (i >= 0) ? checkAt(i) : TextSelection();
 	};
 	const auto findAfter = [&](int offset) {
@@ -1781,32 +3106,11 @@ TextSelection Element::FindSelectionFromQuote(
 			? before
 			: after;
 	};
-	auto result = findTwoWays(quote.offset);
+	auto result = findTwoWays(quote.highlight.quoteOffset);
 	if (result.empty()) {
 		return {};
 	}
-	for (const auto &modification : text.modifications()) {
-		if (modification.position >= result.to) {
-			break;
-		}
-		if (modification.added) {
-			++result.to;
-		}
-		const auto shiftTo = std::min(
-			int(modification.skipped),
-			result.to - modification.position);
-		result.to -= shiftTo;
-		if (modification.position <= result.from) {
-			if (modification.added) {
-				++result.from;
-			}
-			const auto shiftFrom = std::min(
-				int(modification.skipped),
-				result.from - modification.position);
-			result.from -= shiftFrom;
-		}
-	}
-	return result;
+	return ApplyModificationsFrom(result, text);
 }
 
 Reactions::ButtonParameters Element::reactionButtonParameters(
@@ -1815,6 +3119,12 @@ Reactions::ButtonParameters Element::reactionButtonParameters(
 	return {};
 }
 
+ReplyButton::ButtonParameters Element::replyButtonParameters(
+		QPoint position,
+		const TextState &replyState) const {
+	return {};
+}
+
 int Element::reactionsOptimalWidth() const {
 	return 0;
 }
@@ -1844,9 +3154,6 @@ void Element::clickHandlerPressedChanged(
 	}
 }
 
-void Element::animateReaction(Ui::ReactionFlyAnimationArgs &&args) {
-}
-
 void Element::animateUnreadReactions() {
 	const auto &recent = data()->recentReactions();
 	for (const auto &[id, list] : recent) {
@@ -1860,12 +3167,12 @@ auto Element::takeReactionAnimations()
 -> base::flat_map<
 		Data::ReactionId,
 		std::unique_ptr<Ui::ReactionFlyAnimation>> {
+	if (_reactions) {
+		return _reactions->takeAnimations();
+	}
 	return {};
 }
 
-void Element::animateEffect(Ui::ReactionFlyAnimationArgs &&args) {
-}
-
 void Element::animateUnreadEffect() {
 }
 
@@ -1878,7 +3185,13 @@ QRect Element::effectIconGeometry() const {
 	return QRect();
 }
 
+QPoint Element::mediaTopLeft() const {
+	return innerGeometry().topLeft();
+}
+
 Element::~Element() {
+	setReactions(nullptr);
+
 	// Delete media while owner still exists.
 	clearSpecialOnlyEmoji();
 	base::take(_media);
@@ -1887,6 +3200,10 @@ Element::~Element() {
 		_text.unloadPersistentAnimation();
 		checkHeavyPart();
 	}
+	if (const auto rich = richpage(); rich && rich->article.hasHeavyPart()) {
+		rich->article.clearBeforeDestroy();
+		checkHeavyPart();
+	}
 	if (_data->mainView() == this) {
 		_data->clearMainView();
 	}
@@ -1944,4 +3261,296 @@ void Element::ClearGlobal() {
 	MousedElement = nullptr;
 }
 
+int FindViewY(not_null<Element*> view, uint16 symbol, int yfrom) {
+	auto request = HistoryView::StateRequest();
+	request.flags = Ui::Text::StateRequest::Flag::LookupSymbol;
+	const auto single = st::messageTextStyle.font->height;
+	const auto inner = view->innerGeometry();
+	const auto origin = inner.topLeft();
+	const auto top = 0;
+	const auto bottom = view->height();
+	if (origin.y() < top
+		|| origin.y() + inner.height() > bottom
+		|| inner.height() <= 0) {
+		return yfrom;
+	}
+	const auto fory = [&](int y) {
+		return view->textState(origin + QPoint(0, y), request).symbol;
+	};
+	yfrom = std::max(yfrom - origin.y(), 0);
+	auto ytill = inner.height() - 1;
+	auto symbolfrom = fory(yfrom);
+	auto symboltill = fory(ytill);
+	if ((yfrom >= ytill) || (symbolfrom >= symbol)) {
+		return origin.y() + yfrom;
+	} else if (symboltill <= symbol) {
+		return origin.y() + ytill;
+	}
+	while (ytill - yfrom >= 2 * single) {
+		const auto middle = (yfrom + ytill) / 2;
+		const auto found = fory(middle);
+		if (found == symbol
+			|| symbolfrom > found
+			|| symboltill < found) {
+			return middle;
+		} else if (found < symbol) {
+			yfrom = middle;
+			symbolfrom = found;
+		} else {
+			ytill = middle;
+			symboltill = found;
+		}
+	}
+	return origin.y() + (yfrom + ytill) / 2;
+}
+
+int FindViewTaskY(not_null<Element*> view, int taskId, int yfrom) {
+	auto request = HistoryView::StateRequest();
+	request.flags = Ui::Text::StateRequest::Flag::LookupLink;
+	const auto single = st::messageTextStyle.font->height;
+	const auto inner = view->innerGeometry();
+	const auto origin = inner.topLeft();
+	const auto top = 0;
+	const auto bottom = view->height();
+	if (origin.y() < top
+		|| origin.y() + inner.height() > bottom
+		|| inner.height() <= 0) {
+		return yfrom;
+	}
+	const auto media = view->data()->media();
+	const auto todolist = media ? media->todolist() : nullptr;
+	if (!todolist) {
+		return yfrom;
+	}
+	const auto &items = todolist->items;
+	const auto indexOf = [&](int id) -> int {
+		return ranges::find(items, id, &TodoListItem::id) - begin(items);
+	};
+	const auto index = indexOf(taskId);
+	const auto count = int(items.size());
+	if (index == count) {
+		return yfrom;
+	}
+	yfrom = std::max(yfrom - origin.y(), 0);
+	auto ytill = inner.height() - 1;
+	const auto middle = (yfrom + ytill) / 2;
+	const auto fory = [&](int y) {
+		const auto state = view->textState(origin + QPoint(0, y), request);
+		const auto &link = state.link;
+		const auto id = link
+			? link->property(kTodoListItemIdProperty).toInt()
+			: -1;
+		const auto index = (id >= 0) ? indexOf(id) : int(items.size());
+		return (index < count) ? index : (y < middle) ? -1 : count;
+	};
+	auto indexfrom = fory(yfrom);
+	auto indextill = fory(ytill);
+	if ((yfrom >= ytill) || (indexfrom >= index)) {
+		return origin.y() + yfrom;
+	} else if (indextill <= index) {
+		return origin.y() + ytill;
+	}
+	while (ytill - yfrom >= 2 * single) {
+		const auto middle = (yfrom + ytill) / 2;
+		const auto found = fory(middle);
+		if (found == index
+			|| indexfrom > found
+			|| indextill < found) {
+			return origin.y() + middle;
+		} else if (found < index) {
+			yfrom = middle;
+			indexfrom = found;
+		} else {
+			ytill = middle;
+			indextill = found;
+		}
+	}
+	return origin.y() + (yfrom + ytill) / 2;
+}
+
+int FindViewPollOptionY(
+		not_null<Element*> view,
+		const QByteArray &option,
+		int yfrom) {
+	auto request = HistoryView::StateRequest();
+	request.flags = Ui::Text::StateRequest::Flag::LookupLink;
+	const auto single = st::messageTextStyle.font->height;
+	const auto inner = view->innerGeometry();
+	const auto origin = inner.topLeft();
+	if (origin.y() < 0
+		|| origin.y() + inner.height() > view->height()
+		|| inner.height() <= 0) {
+		return yfrom;
+	}
+	const auto media = view->data()->media();
+	const auto poll = media ? media->poll() : nullptr;
+	if (!poll) {
+		return yfrom;
+	}
+	const auto &answers = poll->answers;
+	const auto indexOf = [&](const QByteArray &opt) -> int {
+		return int(ranges::find(
+			answers, opt, &PollAnswer::option) - begin(answers));
+	};
+	const auto index = indexOf(option);
+	const auto count = int(answers.size());
+	if (index == count) {
+		return yfrom;
+	}
+	yfrom = std::max(yfrom - origin.y(), 0);
+	auto ytill = inner.height() - 1;
+	const auto middle = (yfrom + ytill) / 2;
+	const auto fory = [&](int y) {
+		const auto state = view->textState(origin + QPoint(0, y), request);
+		const auto &link = state.link;
+		const auto opt = link
+			? link->property(kPollOptionProperty).toByteArray()
+			: QByteArray();
+		const auto idx = !opt.isEmpty() ? indexOf(opt) : count;
+		return (idx < count) ? idx : (y < middle) ? -1 : count;
+	};
+	auto indexfrom = fory(yfrom);
+	auto indextill = fory(ytill);
+	if ((yfrom >= ytill) || (indexfrom >= index)) {
+		return origin.y() + yfrom;
+	} else if (indextill <= index) {
+		return origin.y() + ytill;
+	}
+	while (ytill - yfrom >= 2 * single) {
+		const auto mid = (yfrom + ytill) / 2;
+		const auto found = fory(mid);
+		if (found == index
+			|| indexfrom > found
+			|| indextill < found) {
+			return origin.y() + mid;
+		} else if (found < index) {
+			yfrom = mid;
+			indexfrom = found;
+		} else {
+			ytill = mid;
+			indextill = found;
+		}
+	}
+	return origin.y() + (yfrom + ytill) / 2;
+}
+
+HighlightYRange FindHighlightYRange(
+		not_null<Element*> view,
+		const Ui::ChatPaintHighlight &highlight) {
+	const auto sel = highlight.range;
+	const auto single = st::messageTextStyle.font->height;
+	if (IsSubGroupSelection(sel)) {
+		const auto index = FirstGroupItemIndex(sel);
+		if (index < 0) {
+			return {};
+		}
+		const auto media = view->media();
+		if (!media) {
+			return {};
+		}
+		const auto rect = media->groupItemRect(index);
+		if (rect.isEmpty()) {
+			return {};
+		}
+		const auto inner = view->innerGeometry();
+		return {
+			inner.y() + rect.y() - 2 * single,
+			inner.y() + rect.y() + rect.height() + 2 * single,
+		};
+	}
+	if (highlight.todoItemId) {
+		const auto y = FindViewTaskY(view, highlight.todoItemId);
+		return { y - 4 * single, y + 4 * single };
+	}
+	if (!highlight.pollOption.isEmpty()) {
+		const auto y = FindViewPollOptionY(view, highlight.pollOption);
+		return { y - 4 * single, y + 4 * single };
+	}
+	if (!sel.empty()) {
+		const auto begin = FindViewY(view, sel.from) - single;
+		const auto end = FindViewY(view, sel.to, begin + single)
+			+ 2 * single;
+		return { begin, end };
+	}
+	return {};
+}
+
+int AdjustScrollForRange(
+		int viewTop,
+		int available,
+		HighlightYRange range) {
+	auto result = viewTop;
+	if (range.end > available) {
+		result = std::max(result, viewTop + range.end - available);
+	}
+	if (viewTop + range.begin < result) {
+		result = viewTop + range.begin;
+	}
+	return result;
+}
+
+Window::SessionController *ExtractController(const ClickContext &context) {
+	const auto my = context.other.value<ClickHandlerContext>();
+	if (const auto controller = my.sessionWindow.get()) {
+		return controller;
+	}
+	return nullptr;
+}
+
+TextSelection FindSearchQueryHighlight(
+		const QString &text,
+		const QString &query) {
+	const auto lower = query.toLower();
+	return FindSearchQueryHighlight(text, QStringView(lower));
+}
+
+TextSelection FindSearchQueryHighlight(
+		const QString &text,
+		QStringView lower) {
+	const auto inside = text.toLower();
+	const auto find = [&](QStringView part) {
+		auto skip = 0;
+		if (const auto from = inside.indexOf(part, skip); from >= 0) {
+			if (!from || !inside[from - 1].isLetterOrNumber()) {
+				return int(from);
+			}
+			skip = from + 1;
+		}
+		return -1;
+	};
+	if (const auto from = find(lower); from >= 0) {
+		const auto till = from + lower.size();
+		if (till >= inside.size()
+			|| !(inside.begin() + till)->isLetterOrNumber()) {
+			return { uint16(from), uint16(till) };
+		}
+	}
+	const auto tillEndOfWord = [&](int from) {
+		for (auto till = from + 1; till != inside.size(); ++till) {
+			if (!inside[till].isLetterOrNumber()) {
+				return TextSelection{ uint16(from), uint16(till) };
+			}
+		}
+		return TextSelection{ uint16(from), uint16(inside.size()) };
+	};
+	const auto words = Ui::Text::Words(lower);
+	for (const auto &word : words) {
+		const auto length = int(word.size());
+		const auto cut = length / 2;
+		const auto part = word.mid(0, length - cut);
+		const auto offset = find(part);
+		if (offset < 0) {
+			continue;
+		}
+		for (auto i = 0; i != cut; ++i) {
+			const auto part = word.mid(0, length - i);
+			if (const auto from = find(part); from >= 0) {
+				return tillEndOfWord(from);
+			}
+		}
+		return tillEndOfWord(offset);
+	}
+	return {};
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index be41e07dcb41b9..ecfa07ba022ef0 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -11,13 +11,17 @@ For license and copyright information please follow this link:
 #include "base/runtime_composer.h"
 #include "base/flags.h"
 #include "base/weak_ptr.h"
+#include "ui/userpic_view.h"
 
 class History;
 class HistoryBlock;
 class HistoryItem;
 struct HistoryMessageReply;
+struct PreparedServiceText;
+struct HistoryMessageReplyMarkup;
 
 namespace Data {
+class Thread;
 struct Reaction;
 struct ReactionId;
 } // namespace Data
@@ -30,10 +34,12 @@ namespace Ui {
 class PathShiftGradient;
 struct BubblePattern;
 struct ChatPaintContext;
+struct ChatPaintHighlight;
 class ChatStyle;
 struct ReactionFlyAnimationArgs;
 class ReactionFlyAnimation;
 class RippleAnimation;
+struct ColorCollectible;
 } // namespace Ui
 
 namespace HistoryView::Reactions {
@@ -41,15 +47,22 @@ struct ButtonParameters;
 class InlineList;
 } // namespace HistoryView::Reactions
 
+namespace HistoryView::ReplyButton {
+struct ButtonParameters;
+} // namespace HistoryView::ReplyButton
+
 namespace HistoryView {
 
 using PaintContext = Ui::ChatPaintContext;
+enum class BadgeRole : uchar;
 enum class PointState : char;
 enum class InfoDisplayType : char;
 struct StateRequest;
 struct TextState;
+struct MessageSelection;
 class Media;
 class Reply;
+struct HistoryMessageRichPage;
 
 enum class Context : char {
 	History,
@@ -57,6 +70,7 @@ enum class Context : char {
 	Pinned,
 	AdminLog,
 	ContactPreview,
+	Monoforum,
 	SavedSublist,
 	TTLViewer,
 	ShortcutMessages,
@@ -75,12 +89,19 @@ struct SelectionModeResult {
 	float64 progress = 0.0;
 };
 
+enum class ElementChatMode : char {
+	Default,
+	Wide,
+	Narrow, // monoforum with left tabs
+};
+
 class Element;
 class ElementDelegate {
 public:
 	virtual Context elementContext() = 0;
 	virtual bool elementUnderCursor(not_null<const Element*> view) = 0;
-	virtual SelectionModeResult elementInSelectionMode() = 0;
+	virtual SelectionModeResult elementInSelectionMode(
+		const Element *view) = 0;
 	virtual bool elementIntersectsRange(
 		not_null<const Element*> view,
 		int from,
@@ -89,6 +110,12 @@ class ElementDelegate {
 	virtual void elementShowPollResults(
 		not_null<PollData*> poll,
 		FullMsgId context) = 0;
+	virtual void elementShowAddPollOption(
+		not_null<Element*> view,
+		not_null<PollData*> poll,
+		FullMsgId context,
+		QRect optionRect) = 0;
+	virtual void elementSubmitAddPollOption(FullMsgId context) = 0;
 	virtual void elementOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) = 0;
@@ -96,10 +123,16 @@ class ElementDelegate {
 		not_null<DocumentData*> document,
 		FullMsgId context,
 		bool showInMediaView = false) = 0;
+	virtual bool elementScrollToLocalY(
+		not_null<const Element*> view,
+		int localTop) = 0;
 	virtual void elementCancelUpload(const FullMsgId &context) = 0;
 	virtual void elementShowTooltip(
 		const TextWithEntities &text,
 		Fn<void()> hiddenCallback) = 0;
+	virtual void elementShowHiddenSenderTooltip(
+		FullMsgId itemId,
+		const TextWithEntities &text) = 0;
 	virtual bool elementAnimationsPaused() = 0;
 	virtual bool elementHideReply(not_null<const Element*> view) = 0;
 	virtual bool elementShownUnread(not_null<const Element*> view) = 0;
@@ -110,7 +143,7 @@ class ElementDelegate {
 		const QString &query,
 		const FullMsgId &context) = 0;
 	virtual void elementHandleViaClick(not_null<UserData*> bot) = 0;
-	virtual bool elementIsChatWide() = 0;
+	virtual ElementChatMode elementChatMode() = 0;
 	virtual not_null<Ui::PathShiftGradient*> elementPathShiftGradient() = 0;
 	virtual void elementReplyTo(const FullReplyTo &to) = 0;
 	virtual void elementStartInteraction(not_null<const Element*> view) = 0;
@@ -136,7 +169,7 @@ class ElementDelegate {
 class DefaultElementDelegate : public ElementDelegate {
 public:
 	bool elementUnderCursor(not_null<const Element*> view) override;
-	SelectionModeResult elementInSelectionMode() override;
+	SelectionModeResult elementInSelectionMode(const Element *view) override;
 	bool elementIntersectsRange(
 		not_null<const Element*> view,
 		int from,
@@ -145,6 +178,12 @@ class DefaultElementDelegate : public ElementDelegate {
 	void elementShowPollResults(
 		not_null<PollData*> poll,
 		FullMsgId context) override;
+	void elementShowAddPollOption(
+		not_null<Element*> view,
+		not_null<PollData*> poll,
+		FullMsgId context,
+		QRect optionRect) override;
+	void elementSubmitAddPollOption(FullMsgId context) override;
 	void elementOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) override;
@@ -152,10 +191,16 @@ class DefaultElementDelegate : public ElementDelegate {
 		not_null<DocumentData*> document,
 		FullMsgId context,
 		bool showInMediaView = false) override;
+	bool elementScrollToLocalY(
+		not_null<const Element*> view,
+		int localTop) override;
 	void elementCancelUpload(const FullMsgId &context) override;
 	void elementShowTooltip(
 		const TextWithEntities &text,
 		Fn<void()> hiddenCallback) override;
+	void elementShowHiddenSenderTooltip(
+		FullMsgId itemId,
+		const TextWithEntities &text) override;
 	bool elementHideReply(not_null<const Element*> view) override;
 	bool elementShownUnread(not_null<const Element*> view) override;
 	void elementSendBotCommand(
@@ -165,7 +210,7 @@ class DefaultElementDelegate : public ElementDelegate {
 		const QString &query,
 		const FullMsgId &context) override;
 	void elementHandleViaClick(not_null<UserData*> bot) override;
-	bool elementIsChatWide() override;
+	ElementChatMode elementChatMode() override;
 	void elementReplyTo(const FullReplyTo &to) override;
 	void elementStartInteraction(not_null<const Element*> view) override;
 	void elementStartPremium(
@@ -218,7 +263,7 @@ QString DateTooltipText(not_null<Element*> view);
 
 // Any HistoryView::Element can have this Component for
 // displaying the unread messages bar above the message.
-struct UnreadBar : public RuntimeComponent<UnreadBar, Element> {
+struct UnreadBar : RuntimeComponent<UnreadBar, Element> {
 	void init(const QString &string);
 
 	static int height();
@@ -229,7 +274,7 @@ struct UnreadBar : public RuntimeComponent<UnreadBar, Element> {
 		const PaintContext &context,
 		int y,
 		int w,
-		bool chatWide) const;
+		ElementChatMode mode) const;
 
 	QString text;
 	int width = 0;
@@ -239,7 +284,7 @@ struct UnreadBar : public RuntimeComponent<UnreadBar, Element> {
 
 // Any HistoryView::Element can have this Component for
 // displaying the day mark above the message.
-struct DateBadge : public RuntimeComponent<DateBadge, Element> {
+struct DateBadge : RuntimeComponent<DateBadge, Element> {
 	void init(const QString &date);
 
 	int height() const;
@@ -255,27 +300,80 @@ struct DateBadge : public RuntimeComponent<DateBadge, Element> {
 
 };
 
+struct ForumThreadBar : RuntimeComponent<ForumThreadBar, Element> {
+	void init(
+		not_null<PeerData*> parentChat,
+		not_null<Data::Thread*> thread);
+
+	int height() const;
+	void paint(
+		Painter &p,
+		not_null<const Ui::ChatStyle*> st,
+		int y,
+		int w,
+		bool chatWide,
+		bool skipPatternLine) const;
+	static int PaintForGetWidth(
+		Painter &p,
+		not_null<const Ui::ChatStyle*> st,
+		not_null<Element*> itemView,
+		Ui::PeerUserpicView &userpicView,
+		int y,
+		int w,
+		bool chatWide);
+
+	base::weak_ptr<Data::Thread> thread;
+	Ui::Text::String text;
+	mutable Ui::PeerUserpicView view;
+	int width = 0;
+
+private:
+	static void Paint(
+		Painter &p,
+		not_null<const Ui::ChatStyle*> st,
+		not_null<Data::Thread*> thread,
+		const Ui::Text::String &text,
+		int width,
+		Ui::PeerUserpicView &view,
+		int y,
+		int w,
+		bool chatWide,
+		bool skipPatternLine);
+
+};
+
 // Any HistoryView::Element can have this Component for
 // displaying some text in layout of a service message above the message.
-struct ServicePreMessage
-	: public RuntimeComponent<ServicePreMessage, Element> {
-	void init(TextWithEntities string);
+struct ServicePreMessage : RuntimeComponent<ServicePreMessage, Element> {
+	void init(
+		not_null<Element*> view,
+		PreparedServiceText string,
+		ClickHandlerPtr fullClickHandler,
+		std::unique_ptr<Media> media,
+		bool below);
 
-	int resizeToWidth(int newWidth, bool chatWide);
+	int resizeToWidth(int newWidth, ElementChatMode mode);
 
 	void paint(
 		Painter &p,
 		const PaintContext &context,
 		QRect g,
-		bool chatWide) const;
+		ElementChatMode mode) const;
+	[[nodiscard]] ClickHandlerPtr textState(
+		QPoint point,
+		const StateRequest &request,
+		QRect g) const;
 
+	std::unique_ptr<Media> media;
 	Ui::Text::String text;
+	ClickHandlerPtr handler;
 	int width = 0;
 	int height = 0;
+	bool below = false;
 
 };
 
-struct FakeBotAboutTop : public RuntimeComponent<FakeBotAboutTop, Element> {
+struct FakeBotAboutTop : RuntimeComponent<FakeBotAboutTop, Element> {
 	void init();
 
 	Ui::Text::String text;
@@ -283,10 +381,15 @@ struct FakeBotAboutTop : public RuntimeComponent<FakeBotAboutTop, Element> {
 	int height = 0;
 };
 
-struct PurchasedTag : public RuntimeComponent<PurchasedTag, Element> {
+struct PurchasedTag : RuntimeComponent<PurchasedTag, Element> {
 	Ui::Text::String text;
 };
 
+struct ViewAddedMargins : RuntimeComponent<ViewAddedMargins, Element> {
+	int top = 0;
+	int bottom = 0;
+};
+
 struct TopicButton {
 	std::unique_ptr<Ui::RippleAnimation> ripple;
 	ClickHandlerPtr link;
@@ -297,12 +400,11 @@ struct TopicButton {
 
 struct SelectedQuote {
 	HistoryItem *item = nullptr;
-	TextWithEntities text;
-	int offset = 0;
+	MessageHighlightId highlight;
 	bool overflown = false;
 
 	explicit operator bool() const {
-		return item && !text.empty();
+		return item && !highlight.quote.empty();
 	}
 	friend inline bool operator==(SelectedQuote, SelectedQuote) = default;
 };
@@ -327,6 +429,7 @@ class Element
 		TopicRootReply           = 0x0400,
 		MediaOverriden           = 0x0800,
 		HeavyCustomEmoji         = 0x1000,
+		SummaryShown             = 0x2000,
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
@@ -337,6 +440,8 @@ class Element
 		Element *replacing,
 		Flag serviceFlag);
 
+	[[nodiscard]] virtual bool embedReactionsInBubble() const;
+
 	[[nodiscard]] not_null<ElementDelegate*> delegate() const;
 	[[nodiscard]] not_null<HistoryItem*> data() const;
 	[[nodiscard]] not_null<History*> history() const;
@@ -345,7 +450,14 @@ class Element
 	void refreshDataId();
 
 	[[nodiscard]] uint8 colorIndex() const;
+	[[nodiscard]] auto colorCollectible() const
+		-> const std::shared_ptr<Ui::ColorCollectible> &;
+
 	[[nodiscard]] uint8 contentColorIndex() const;
+	[[nodiscard]] DocumentId contentBackgroundEmojiId() const;
+	[[nodiscard]] auto contentColorCollectible() const
+		-> const std::shared_ptr<Ui::ColorCollectible> &;
+
 	[[nodiscard]] QDateTime dateTime() const;
 
 	[[nodiscard]] int y() const;
@@ -354,6 +466,8 @@ class Element
 	[[nodiscard]] virtual int marginTop() const = 0;
 	[[nodiscard]] virtual int marginBottom() const = 0;
 
+	void addVerticalMargins(int top, int bottom);
+
 	void setPendingResize();
 	[[nodiscard]] bool pendingResize() const;
 	[[nodiscard]] bool isUnderCursor() const;
@@ -388,6 +502,7 @@ class Element
 	[[nodiscard]] HistoryItem *textItem() const;
 	[[nodiscard]] Ui::Text::IsolatedEmoji isolatedEmoji() const;
 	[[nodiscard]] Ui::Text::OnlyCustomEmoji onlyCustomEmoji() const;
+	void skipInactiveTextAppearing();
 
 	[[nodiscard]] OnlyEmojiAndSpaces isOnlyEmojiAndSpaces() const;
 
@@ -400,7 +515,14 @@ class Element
 
 	// For blocks context this should be called only from recountDisplayDate().
 	void setDisplayDate(bool displayDate);
-	void setServicePreMessage(TextWithEntities text);
+	void setServicePreMessage(
+		PreparedServiceText text,
+		ClickHandlerPtr fullClickHandler = nullptr,
+		std::unique_ptr<Media> media = nullptr);
+	void setServicePostMessage(
+		PreparedServiceText text,
+		ClickHandlerPtr fullClickHandler = nullptr,
+		std::unique_ptr<Media> media = nullptr);
 
 	bool computeIsAttachToPrevious(not_null<Element*> previous);
 
@@ -411,6 +533,9 @@ class Element
 	[[nodiscard]] bool displayDate() const;
 	[[nodiscard]] bool isInOneDayWithPrevious() const;
 
+	[[nodiscard]] bool displayForumThreadBar() const;
+	[[nodiscard]] bool isInOneBunchWithPrevious() const;
+
 	virtual void draw(Painter &p, const PaintContext &context) const = 0;
 	[[nodiscard]] virtual PointState pointState(QPoint point) const = 0;
 	[[nodiscard]] virtual TextState textState(
@@ -429,14 +554,30 @@ class Element
 		int bottom,
 		QPoint point,
 		InfoDisplayType type) const;
+	[[nodiscard]] virtual MessageSelection selectionFromStates(
+		const TextState &anchor,
+		const TextState &current,
+		TextSelectType type) const;
 	virtual TextForMimeData selectedText(TextSelection selection) const = 0;
+	virtual TextForMimeData selectedText(
+		const MessageSelection &selection) const;
 	virtual SelectedQuote selectedQuote(
 		TextSelection selection) const = 0;
+	virtual SelectedQuote selectedQuote(
+		const MessageSelection &selection) const;
 	virtual TextSelection selectionFromQuote(
 		const SelectedQuote &quote) const = 0;
 	[[nodiscard]] virtual TextSelection adjustSelection(
 		TextSelection selection,
 		TextSelectType type) const;
+	[[nodiscard]] virtual MessageSelection adjustSelection(
+		const MessageSelection &selection,
+		TextSelectType type) const;
+	[[nodiscard]] virtual TextSelection selectionForEdit(
+		const MessageSelection &selection) const;
+	[[nodiscard]] virtual bool selectionContains(
+		const MessageSelection &selection,
+		const TextState &state) const;
 
 	[[nodiscard]] static SelectedQuote FindSelectedQuote(
 		const Ui::Text::String &text,
@@ -449,6 +590,9 @@ class Element
 	[[nodiscard]] virtual auto reactionButtonParameters(
 		QPoint position,
 		const TextState &reactionState) const -> Reactions::ButtonParameters;
+	[[nodiscard]] virtual auto replyButtonParameters(
+		QPoint position,
+		const TextState &replyState) const -> ReplyButton::ButtonParameters;
 	[[nodiscard]] virtual int reactionsOptimalWidth() const;
 
 	// ClickHandlerHost interface.
@@ -476,8 +620,6 @@ class Element
 	[[nodiscard]] virtual int minWidthForMedia() const {
 		return 0;
 	}
-	[[nodiscard]] virtual bool hasFastReply() const;
-	[[nodiscard]] virtual bool displayFastReply() const;
 	[[nodiscard]] virtual std::optional<QSize> rightActionSize() const;
 	virtual void drawRightAction(
 		Painter &p,
@@ -512,7 +654,6 @@ class Element
 	void itemTextUpdated();
 	void blockquoteExpandChanged();
 
-	[[nodiscard]] virtual bool hasHeavyPart() const;
 	virtual void unloadHeavyPart();
 	void checkHeavyPart();
 
@@ -527,7 +668,8 @@ class Element
 	[[nodiscard]] HistoryBlock *block();
 	[[nodiscard]] const HistoryBlock *block() const;
 	void attachToBlock(not_null<HistoryBlock*> block, int index);
-	void removeFromBlock();
+	void removeFromBlock(
+		Data::ViewRemovalReason reason = Data::ViewRemovalReason::Removed);
 	void refreshInBlock();
 	void setIndexInBlock(int index);
 	[[nodiscard]] int indexInBlock() const;
@@ -540,6 +682,7 @@ class Element
 
 	[[nodiscard]] virtual QRect effectIconGeometry() const;
 	[[nodiscard]] virtual QRect innerGeometry() const = 0;
+	[[nodiscard]] virtual QPoint mediaTopLeft() const;
 
 	void customEmojiRepaint();
 	void prepareCustomEmojiPaint(
@@ -552,7 +695,7 @@ class Element
 		const Reactions::InlineList &reactions) const;
 	void clearCustomEmojiRepaint() const;
 	void hideSpoilers();
-	void repaint() const;
+	void repaint(QRect r = QRect()) const;
 
 	[[nodiscard]] ClickHandlerPtr fromPhotoLink() const {
 		return fromLink();
@@ -560,19 +703,19 @@ class Element
 
 	[[nodiscard]] bool markSponsoredViewed(int shownFromTop) const;
 
-	virtual void animateReaction(Ui::ReactionFlyAnimationArgs &&args);
+	virtual void animateReaction(Ui::ReactionFlyAnimationArgs &&args) = 0;
 	void animateUnreadReactions();
-	[[nodiscard]] virtual auto takeReactionAnimations()
+	[[nodiscard]] auto takeReactionAnimations()
 	-> base::flat_map<
 		Data::ReactionId,
 		std::unique_ptr<Ui::ReactionFlyAnimation>>;
 
-	virtual void animateEffect(Ui::ReactionFlyAnimationArgs &&args);
 	void animateUnreadEffect();
 	[[nodiscard]] virtual auto takeEffectAnimation()
 	-> std::unique_ptr<Ui::ReactionFlyAnimation>;
 
 	void overrideMedia(std::unique_ptr<Media> media);
+	void overrideRightBadge(const QString &text, BadgeRole role);
 
 	[[nodiscard]] not_null<PurchasedTag*> enforcePurchasedTag();
 
@@ -583,6 +726,11 @@ class Element
 	virtual bool consumeHorizontalScroll(QPoint position, int delta) {
 		return false;
 	}
+	[[nodiscard]] virtual bool canConsumeHorizontalScroll(
+			QPoint position,
+			int delta) const {
+		return false;
+	}
 
 	virtual ~Element();
 
@@ -606,25 +754,40 @@ class Element
 
 	[[nodiscard]] ClickHandlerPtr fromLink() const;
 
+	[[nodiscard]] virtual bool hasHeavyPart() const;
 	virtual void refreshDataIdHook();
 
 	[[nodiscard]] const Ui::Text::String &text() const;
-	[[nodiscard]] int textHeightFor(int textWidth);
+	[[nodiscard]] HistoryMessageRichPage *richpage();
+	[[nodiscard]] const HistoryMessageRichPage *richpage() const;
+	[[nodiscard]] int richPageWidthFor(int textWidth) const;
+	[[nodiscard]] int textHeightFor(int textWidth) const;
+	[[nodiscard]] int textRealWidth() const { return _textRealWidth; }
 	void validateText();
 	void validateTextSkipBlock(bool has, int width, int height);
+	void validateInlineKeyboard(HistoryMessageReplyMarkup *markup);
 
 	void clearSpecialOnlyEmoji();
 	void checkSpecialOnlyEmoji();
 
+	void setupReactions(Element *replacing);
+	void refreshReactions();
+	bool updateReactions();
+
+	std::unique_ptr<Reactions::InlineList> _reactions;
+
 private:
+	void recountThreadBarInBlocks();
+
 	// This should be called only from previousInBlocksChanged()
 	// to add required bits to the Composer mask
 	// after that always use Has<DateBadge>().
 	void recountDisplayDateInBlocks();
 
 	// This should be called only from previousInBlocksChanged() or when
-	// DateBadge or UnreadBar bit is changed in the Composer mask
-	// then the result should be cached in a client side flag
+	// DateBadge or UnreadBar or MonoforumSenderBar bit
+	// is changed in the Composer mask then the result
+	// should be cached in a client side flag
 	// HistoryView::Element::Flag::AttachedToPrevious.
 	void recountAttachToPreviousInBlocks();
 
@@ -635,11 +798,15 @@ class Element
 
 	virtual QSize performCountOptimalSize() = 0;
 	virtual QSize performCountCurrentSize(int newWidth) = 0;
+	virtual void invalidateTextDependentCache() {
+	}
 
 	void refreshMedia(Element *replacing);
+	void invalidateTextSizeCache();
 	void setTextWithLinks(
 		const TextWithEntities &text,
 		const std::vector<ClickHandlerPtr> &links = {});
+	void setReactions(std::unique_ptr<Reactions::InlineList> list);
 
 	struct TextWithLinks {
 		TextWithEntities text;
@@ -656,7 +823,8 @@ class Element
 
 	HistoryItem *_textItem = nullptr;
 	mutable Ui::Text::String _text;
-	mutable int _textWidth = -1;
+	mutable uint32 _textWidth : 16 = 0;
+	mutable uint32 _textRealWidth : 16 = 0;
 	mutable int _textHeight = 0;
 
 	int _y = 0;
@@ -667,4 +835,48 @@ class Element
 
 };
 
+[[nodiscard]] int FindViewY(
+	not_null<Element*> view,
+	uint16 symbol,
+	int yfrom = 0);
+
+[[nodiscard]] int FindViewTaskY(
+	not_null<Element*> view,
+	int taskId,
+	int yfrom = 0);
+
+[[nodiscard]] int FindViewPollOptionY(
+	not_null<Element*> view,
+	const QByteArray &option,
+	int yfrom = 0);
+
+struct HighlightYRange {
+	int begin = 0;
+	int end = 0;
+
+	explicit operator bool() const {
+		return begin != end;
+	}
+};
+
+[[nodiscard]] HighlightYRange FindHighlightYRange(
+	not_null<Element*> view,
+	const Ui::ChatPaintHighlight &highlight);
+
+[[nodiscard]] int AdjustScrollForRange(
+	int viewTop,
+	int available,
+	HighlightYRange range);
+
+[[nodiscard]] Window::SessionController *ExtractController(
+	const ClickContext &context);
+
+[[nodiscard]] TextSelection FindSearchQueryHighlight(
+	const QString &text,
+	const QString &query);
+
+[[nodiscard]] TextSelection FindSearchQueryHighlight(
+	const QString &text,
+	QStringView lower);
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_element_overlay.cpp b/Telegram/SourceFiles/history/view/history_view_element_overlay.cpp
new file mode 100644
index 00000000000000..794b5123c94edf
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_element_overlay.cpp
@@ -0,0 +1,132 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_element_overlay.h"
+
+#include "history/view/history_view_element.h"
+#include "ui/rp_widget.h"
+
+namespace HistoryView {
+
+ElementOverlayHost::ElementOverlayHost(
+	not_null<QWidget*> container,
+	ItemTopFn itemTopFn)
+: _container(container)
+, _itemTopFn(std::move(itemTopFn)) {
+}
+
+void ElementOverlayHost::show(
+		not_null<Element*> view,
+		FullMsgId context,
+		base::unique_qptr<Ui::RpWidget> widget,
+		rpl::producer<> closeRequests,
+		PositionFn positionFn,
+		MediaStateFn mediaStateFn,
+		Fn<void()> submitFn) {
+	if (_widget && _context == context) {
+		hide();
+		return;
+	}
+	hide();
+
+	_view = view;
+	_context = context;
+	_positionFn = std::move(positionFn);
+	_mediaStateFn = std::move(mediaStateFn);
+	_submitFn = std::move(submitFn);
+
+	if (_mediaStateFn) {
+		_mediaStateFn(view, true);
+	}
+
+	_widget = std::move(widget);
+
+	std::move(
+		closeRequests
+	) | rpl::on_next([=] {
+		hide();
+	}, _closeLifetime);
+
+	updatePosition();
+	_widget->show();
+}
+
+void ElementOverlayHost::hide() {
+	if (!_widget) {
+		return;
+	}
+	cleanup(true);
+}
+
+void ElementOverlayHost::viewGone(not_null<const Element*> view) {
+	if (_view != view.get()) {
+		return;
+	}
+	cleanup(false);
+}
+
+void ElementOverlayHost::cleanup(bool notifyMedia) {
+	if (notifyMedia && _view && _mediaStateFn) {
+		_mediaStateFn(_view, false);
+	}
+	_widget = nullptr;
+	_view = nullptr;
+	_context = FullMsgId();
+	_positionFn = nullptr;
+	_mediaStateFn = nullptr;
+	_submitFn = nullptr;
+	_closeLifetime.destroy();
+	if (const auto callback = _hiddenCallback) {
+		callback();
+	}
+}
+
+void ElementOverlayHost::updatePosition() {
+	if (!_widget || !_view || !_positionFn) {
+		return;
+	}
+	const auto top = _itemTopFn(_view);
+	if (top < 0) {
+		return;
+	}
+	if (!_positionFn(_view, top)) {
+		hide();
+	}
+}
+
+void ElementOverlayHost::handleClickOutside(QPoint clickPos) {
+	if (!_widget || !_view) {
+		return;
+	}
+	const auto top = _itemTopFn(_view);
+	const auto viewRect = (top >= 0)
+		? QRect(0, top, _container->width(), _view->height())
+		: QRect();
+	if (!viewRect.contains(clickPos)) {
+		hide();
+	}
+}
+
+void ElementOverlayHost::triggerSubmit(FullMsgId context) {
+	if (_widget && _context == context && _submitFn) {
+		_submitFn();
+	}
+}
+
+void ElementOverlayHost::setHiddenCallback(Fn<void()> callback) {
+	_hiddenCallback = std::move(callback);
+}
+
+bool ElementOverlayHost::active() const {
+	return _widget != nullptr;
+}
+
+FullMsgId ElementOverlayHost::context() const {
+	return _context;
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_element_overlay.h b/Telegram/SourceFiles/history/view/history_view_element_overlay.h
new file mode 100644
index 00000000000000..45555d48df6046
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_element_overlay.h
@@ -0,0 +1,66 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/unique_qptr.h"
+#include "data/data_messages.h"
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace HistoryView {
+
+class Element;
+
+class ElementOverlayHost final {
+public:
+	using ItemTopFn = Fn<int(not_null<const Element*>)>;
+	using PositionFn = Fn<bool(not_null<Element*>, int itemTop)>;
+	using MediaStateFn = Fn<void(not_null<Element*>, bool active)>;
+
+	explicit ElementOverlayHost(
+		not_null<QWidget*> container,
+		ItemTopFn itemTopFn);
+
+	void show(
+		not_null<Element*> view,
+		FullMsgId context,
+		base::unique_qptr<Ui::RpWidget> widget,
+		rpl::producer<> closeRequests,
+		PositionFn positionFn,
+		MediaStateFn mediaStateFn = nullptr,
+		Fn<void()> submitFn = nullptr);
+
+	void hide();
+	void viewGone(not_null<const Element*> view);
+	void updatePosition();
+	void handleClickOutside(QPoint clickPos);
+	void triggerSubmit(FullMsgId context);
+	void setHiddenCallback(Fn<void()> callback);
+
+	[[nodiscard]] bool active() const;
+	[[nodiscard]] FullMsgId context() const;
+
+private:
+	void cleanup(bool notifyMedia);
+
+	const not_null<QWidget*> _container;
+	const ItemTopFn _itemTopFn;
+
+	base::unique_qptr<Ui::RpWidget> _widget;
+	Element *_view = nullptr;
+	FullMsgId _context;
+	PositionFn _positionFn;
+	MediaStateFn _mediaStateFn;
+	Fn<void()> _submitFn;
+	Fn<void()> _hiddenCallback;
+	rpl::lifetime _closeLifetime;
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
index fed0bddf07779e..86fc4c17edd60c 100644
--- a/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_emoji_interactions.cpp
@@ -58,7 +58,7 @@ EmojiInteractions::EmojiInteractions(
 	_session->data().viewRemoved(
 	) | rpl::filter([=] {
 		return !_plays.empty() || !_delayed.empty();
-	}) | rpl::start_with_next([=](not_null<const Element*> view) {
+	}) | rpl::on_next([=](not_null<const Element*> view) {
 		_plays.erase(ranges::remove(_plays, view, &Play::view), end(_plays));
 		_delayed.erase(
 			ranges::remove(_delayed, view, &Delayed::view),
@@ -66,7 +66,7 @@ EmojiInteractions::EmojiInteractions(
 	}, _lifetime);
 
 	_session->data().reactions().effectsUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkPendingEffects();
 	}, _lifetime);
 }
@@ -169,7 +169,7 @@ void EmojiInteractions::playEffect(not_null<const Element*> view) {
 	} else if (view->data()->effectId()) {
 		if (resolved.document && !_downloadLifetime) {
 			_downloadLifetime = _session->downloaderTaskFinished(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				checkPendingEffects();
 			});
 		}
@@ -266,7 +266,7 @@ void EmojiInteractions::checkPendingEffects() {
 		_downloadLifetime.destroy();
 	} else if (!_downloadLifetime) {
 		_downloadLifetime = _session->downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			checkPendingEffects();
 		});
 	}
@@ -294,7 +294,7 @@ void EmojiInteractions::play(
 		const auto raw = _layer.get();
 		raw->setAttribute(Qt::WA_TransparentForMouseEvents);
 		raw->show();
-		raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+		raw->paintRequest() | rpl::on_next([=](QRect clip) {
 			paint(raw, clip);
 		}, raw->lifetime());
 	}
@@ -315,7 +315,7 @@ void EmojiInteractions::play(
 		: QPoint();
 	const auto raw = lottie.get();
 	lottie->updates(
-	) | rpl::start_with_next([=](Lottie::Update update) {
+	) | rpl::on_next([=](Lottie::Update update) {
 		v::match(update.data, [&](const Lottie::Information &information) {
 		}, [&](const Lottie::DisplayFrameRequest &request) {
 			const auto i = ranges::find(_plays, raw, [](const Play &p) {
diff --git a/Telegram/SourceFiles/history/view/history_view_empty_list_bubble.cpp b/Telegram/SourceFiles/history/view/history_view_empty_list_bubble.cpp
index 0b47a0183b0fe3..ba26b76ddb2595 100644
--- a/Telegram/SourceFiles/history/view/history_view_empty_list_bubble.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_empty_list_bubble.cpp
@@ -21,7 +21,7 @@ EmptyListBubbleWidget::EmptyListBubbleWidget(
 , _padding(padding)
 , _st(st) {
 	parent->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		updateGeometry(s);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_fake_items.cpp b/Telegram/SourceFiles/history/view/history_view_fake_items.cpp
index 8390d09fa805b5..5c41eee59ebb63 100644
--- a/Telegram/SourceFiles/history/view/history_view_fake_items.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_fake_items.cpp
@@ -57,10 +57,12 @@ PeerId GenerateUser(not_null<History*> history, const QString &name) {
 		MTPstring(), // lang code
 		MTPEmojiStatus(),
 		MTPVector<MTPUsername>(),
-		MTPint(), // stories_max_id
+		MTPRecentStory(),
 		MTPPeerColor(), // color
 		MTPPeerColor(), // profile_color
-		MTPint())); // bot_active_users
+		MTPint(), // bot_active_users
+		MTPlong(), // bot_verification_icon
+		MTPlong())); // send_paid_messages_stars
 	return peerId;
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
index c460ab1e01fb17..75abbbd0343888 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp
@@ -65,6 +65,43 @@ void GenerateUserpicsInRow(
 	}
 }
 
+bool NeedRegenerateUserpics(
+		const QImage &image,
+		const std::vector<UserpicInRow> &list) {
+	if (image.isNull()) {
+		return true;
+	}
+	for (auto &entry : list) {
+		const auto peer = entry.peer;
+		auto &view = entry.view;
+		const auto wasView = view.cloud.get();
+		if (peer->userpicUniqueKey(view) != entry.uniqueKey
+			|| view.cloud.get() != wasView) {
+			return true;
+		}
+	}
+	return false;
+}
+
+PreparedUserpicsInRow PrepareUserpicsInRow(
+		const std::vector<not_null<PeerData*>> &peers,
+		const style::GroupCallUserpics &st,
+		int limit) {
+	auto rows = std::vector<UserpicInRow>();
+	rows.reserve(peers.size());
+	for (const auto &peer : peers) {
+		rows.push_back({ .peer = peer });
+	}
+	auto result = PreparedUserpicsInRow();
+	if (!rows.empty()) {
+		GenerateUserpicsInRow(result.image, rows, st, limit);
+	}
+	result.width = result.image.isNull()
+		? 0
+		: (result.image.width() / style::DevicePixelRatio());
+	return result;
+}
+
 rpl::producer<Ui::GroupCallBarContent> GroupCallBarContentByCall(
 		not_null<Data::GroupCall*> call,
 		int userpicSize) {
@@ -85,19 +122,29 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallBarContentByCall(
 		return (~uint64(0)) - result; // sorting with less(), so invert.
 	};
 
+	static const auto RtmpCallTopBarParticipants = [](
+			not_null<Data::GroupCall*> call) {
+		using Participant = Data::GroupCallParticipant;
+		return std::vector<Participant>{ Participant{
+			.peer = call->peer(),
+		} };
+	};
+
 	constexpr auto kLimit = 3;
 	static const auto FillMissingUserpics = [](
 			not_null<State*> state,
 			not_null<Data::GroupCall*> call) {
 		const auto already = int(state->userpics.size());
-		const auto &participants = call->participants();
+		const auto &participants = call->rtmp()
+			? RtmpCallTopBarParticipants(call)
+			: call->participants();
 		if (already >= kLimit || participants.size() <= already) {
 			return false;
 		}
 		std::array<const Data::GroupCallParticipant*, kLimit> adding{
 			{ nullptr }
 		};
-		for (const auto &participant : call->participants()) {
+		for (const auto &participant : participants) {
 			const auto alreadyInList = ranges::contains(
 				state->userpics,
 				participant.peer,
@@ -186,6 +233,9 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallBarContentByCall(
 			int userpicSize) {
 		Expects(state->userpics.size() <= kLimit);
 
+		if (call->rtmp()) {
+			return false;
+		}
 		const auto &participants = call->participants();
 		auto i = begin(state->userpics);
 
@@ -278,7 +328,7 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallBarContentByCall(
 
 		using ParticipantUpdate = Data::GroupCall::ParticipantUpdate;
 		call->participantUpdated(
-		) | rpl::start_with_next([=](const ParticipantUpdate &update) {
+		) | rpl::on_next([=](const ParticipantUpdate &update) {
 			const auto participantPeer = update.now
 				? update.now->peer
 				: update.was->peer;
@@ -328,12 +378,12 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallBarContentByCall(
 		call->participantsReloaded(
 		) | rpl::filter([=] {
 			return RegenerateUserpics(state, call, userpicSize);
-		}) | rpl::start_with_next(pushNext, lifetime);
+		}) | rpl::on_next(pushNext, lifetime);
 
 		call->peer()->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return state->someUserpicsNotLoaded;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			for (const auto &userpic : state->userpics) {
 				if (userpic.peer->userpicUniqueKey(userpic.view)
 					!= userpic.uniqueKey) {
@@ -350,7 +400,7 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallBarContentByCall(
 			call->titleValue(),
 			call->scheduleDateValue(),
 			call->fullCountValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QString &title,
 				TimeId scheduleDate,
 				int count) {
@@ -376,7 +426,7 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallBarContentByPeer(
 			Data::PeerUpdate::Flag::GroupCall),
 		Core::App().calls().currentGroupCallValue(),
 		((showInForum || !channel)
-			? (rpl::single(false) | rpl::type_erased())
+			? (rpl::single(false) | rpl::type_erased)
 			: Data::PeerFlagValue(channel, ChannelData::Flag::Forum))
 	) | rpl::map([=](auto, Calls::GroupCall *current, bool hiddenByForum) {
 		const auto call = peer->groupCall();
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_bar.h b/Telegram/SourceFiles/history/view/history_view_group_call_bar.h
index fd96caba46bf48..d56a0a0c2414ab 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_bar.h
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_bar.h
@@ -37,6 +37,20 @@ void GenerateUserpicsInRow(
 	const style::GroupCallUserpics &st,
 	int maxElements = 0);
 
+[[nodiscard]] bool NeedRegenerateUserpics(
+	const QImage &image,
+	const std::vector<UserpicInRow> &list);
+
+struct PreparedUserpicsInRow {
+	QImage image;
+	int width = 0;
+};
+
+[[nodiscard]] PreparedUserpicsInRow PrepareUserpicsInRow(
+	const std::vector<not_null<PeerData*>> &peers,
+	const style::GroupCallUserpics &st,
+	int limit = 0);
+
 [[nodiscard]] auto GroupCallBarContentByCall(
 	not_null<Data::GroupCall*> call,
 	int userpicSize)
diff --git a/Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp b/Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp
new file mode 100644
index 00000000000000..36a6585844d976
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp
@@ -0,0 +1,113 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_group_members_widget.h"
+
+#include "boxes/peers/edit_participants_box.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat.h"
+
+namespace HistoryView {
+namespace {
+
+class GroupMembersWidgetController : public ParticipantsBoxController {
+public:
+	using ParticipantsBoxController::ParticipantsBoxController;
+
+protected:
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override {
+		return nullptr;
+	}
+
+};
+
+} // namespace
+
+GroupMembersWidget::GroupMembersWidget(
+not_null<Ui::RpWidget*> parent,
+not_null<Window::SessionNavigation*> navigation,
+not_null<PeerData*> peer)
+: Ui::RpWidget(parent)
+, _show(navigation->uiShow())
+, _listController(std::make_unique<GroupMembersWidgetController>(
+		navigation,
+		peer,
+		ParticipantsBoxController::Role::Profile)) {
+	_listController->setStoriesShown(true);
+	setupList();
+	setContent(_list.data());
+	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
+}
+
+void GroupMembersWidget::setupList() {
+	const auto topSkip = 0;
+	_listController->setStyleOverrides(&st::groupMembersWidgetList);
+	_listController->setStoriesShown(true);
+	_list = object_ptr<PeerListContent>(this, _listController.get());
+	widthValue() | rpl::on_next([this](int newWidth) {
+		if (newWidth > 0) {
+			_list->resizeToWidth(newWidth);
+		}
+	}, _list->lifetime());
+	_list->heightValue() | rpl::on_next([=](int listHeight) {
+		if (const auto newHeight = topSkip + listHeight; newHeight > 0) {
+			resize(width(), newHeight);
+		}
+	}, _list->lifetime());
+	_list->moveToLeft(0, topSkip);
+}
+
+void GroupMembersWidget::peerListSetTitle(rpl::producer<QString> title) {
+}
+
+void GroupMembersWidget::peerListSetAdditionalTitle(
+	rpl::producer<QString> title) {
+}
+
+bool GroupMembersWidget::peerListIsRowChecked(not_null<PeerListRow*> row) {
+	return false;
+}
+
+int GroupMembersWidget::peerListSelectedRowsCount() {
+	return 0;
+}
+
+void GroupMembersWidget::peerListScrollToTop() {
+}
+
+void GroupMembersWidget::peerListAddSelectedPeerInBunch(
+		not_null<PeerData*> peer) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void GroupMembersWidget::peerListAddSelectedRowInBunch(
+		not_null<PeerListRow*> row) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void GroupMembersWidget::peerListFinishSelectedRowsBunch() {
+}
+
+std::shared_ptr<Main::SessionShow> GroupMembersWidget::peerListUiShow() {
+	return _show;
+}
+
+void GroupMembersWidget::peerListSetDescription(
+		object_ptr<Ui::FlatLabel> description) {
+	description.destroy();
+}
+
+void GroupMembersWidget::peerListShowRowMenu(
+	not_null<PeerListRow*> row,
+	bool highlightRow,
+	Fn<void(not_null<Ui::PopupMenu*>)> destroyed) {
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_group_members_widget.h b/Telegram/SourceFiles/history/view/history_view_group_members_widget.h
new file mode 100644
index 00000000000000..a16b6d60948674
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_group_members_widget.h
@@ -0,0 +1,58 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "boxes/peer_list_box.h"
+
+namespace Window {
+class SessionNavigation;
+} // namespace Window
+
+class ParticipantsBoxController;
+
+namespace HistoryView {
+
+class GroupMembersWidget
+	: public Ui::RpWidget
+	, public PeerListContentDelegate {
+public:
+	GroupMembersWidget(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer);
+
+private:
+	void setupList();
+
+	// PeerListContentDelegate interface.
+	void peerListSetTitle(rpl::producer<QString> title) override;
+	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
+	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
+	int peerListSelectedRowsCount() override;
+	void peerListScrollToTop() override;
+	void peerListAddSelectedPeerInBunch(
+		not_null<PeerData*> peer) override;
+	void peerListAddSelectedRowInBunch(
+		not_null<PeerListRow*> row) override;
+	void peerListFinishSelectedRowsBunch() override;
+	void peerListSetDescription(
+		object_ptr<Ui::FlatLabel> description) override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
+	void peerListShowRowMenu(
+		not_null<PeerListRow*> row,
+		bool highlightRow,
+		Fn<void(not_null<Ui::PopupMenu*>)> destroyed = nullptr) override;
+	// PeerListContentDelegate interface.
+
+	std::shared_ptr<Main::SessionShow> _show;
+	object_ptr<PeerListContent> _list = { nullptr };
+	std::unique_ptr<ParticipantsBoxController> _listController;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_item_preview.h b/Telegram/SourceFiles/history/view/history_view_item_preview.h
index b29da9442d1f65..79ff2ba631f4da 100644
--- a/Telegram/SourceFiles/history/view/history_view_item_preview.h
+++ b/Telegram/SourceFiles/history/view/history_view_item_preview.h
@@ -16,6 +16,9 @@ struct ItemPreviewImage {
 	[[nodiscard]] bool hasSpoiler() const {
 		return (cacheKey & 1);
 	}
+	[[nodiscard]] bool isEllipse() const {
+		return (cacheKey & 2);
+	}
 
 	explicit operator bool() const {
 		return !data.isNull();
@@ -38,6 +41,7 @@ struct ItemPreview {
 
 struct ToPreviewOptions {
 	const std::vector<ItemPreviewImage> *existing = nullptr;
+	QStringView searchLowerText;
 	bool hideSender = false;
 	bool hideCaption = false;
 	bool ignoreMessageText = false;
diff --git a/Telegram/SourceFiles/history/view/history_view_keyboard_text_selection.cpp b/Telegram/SourceFiles/history/view/history_view_keyboard_text_selection.cpp
new file mode 100644
index 00000000000000..aea5fa595474e1
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_keyboard_text_selection.cpp
@@ -0,0 +1,107 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_keyboard_text_selection.h"
+
+#include "history/view/history_view_element.h"
+#include "history/history_item.h"
+#include "ui/text/text.h"
+
+namespace HistoryView {
+
+bool KeyboardTextSelection::IsExtendKey(int key) {
+	return (key == Qt::Key_Left)
+		|| (key == Qt::Key_Right)
+		|| (key == Qt::Key_Home)
+		|| (key == Qt::Key_End);
+}
+
+std::optional<MessageSelection> KeyboardTextSelection::extend(
+		not_null<Element*> view,
+		const MessageSelection &current,
+		int key,
+		Qt::KeyboardModifiers modifiers) {
+	if (!IsExtendKey(key)) {
+		return std::nullopt;
+	}
+	const auto maxOffset = int(view->adjustSelection(
+		TextSelection(0, 0xFFFF),
+		TextSelectType::Letters).to);
+	if (maxOffset >= 0xFFFF) {
+		return std::nullopt;
+	}
+	const auto item = view->data().get();
+	const auto continuing = _has
+		&& (_item == item)
+		&& (current.flatSelection() == _produced);
+	if (!continuing) {
+		if (!current.isFlat()) {
+			return std::nullopt;
+		}
+		const auto flat = current.flat;
+		const auto rawAnchor = current.anchor.isFlat()
+			? current.anchor.flat.offset()
+			: flat.from;
+		const auto rawFocus = current.focus.isFlat()
+			? current.focus.flat.offset()
+			: flat.to;
+		const auto focusAtEnd = (rawFocus >= rawAnchor);
+		_anchor = { focusAtEnd ? flat.from : flat.to, false };
+		_focus = { focusAtEnd ? flat.to : flat.from, false };
+	}
+
+	const auto position = int(_focus.offset());
+	const auto forward = (key == Qt::Key_Right);
+#ifdef Q_OS_MAC
+	const auto byWord = (modifiers & Qt::AltModifier) != 0;
+#else // Q_OS_MAC
+	const auto byWord = (modifiers & Qt::ControlModifier) != 0;
+#endif // Q_OS_MAC
+	auto wanted = position;
+	if (key == Qt::Key_Home) {
+		wanted = 0;
+	} else if (key == Qt::Key_End) {
+		wanted = maxOffset;
+	} else if (byWord) {
+		const auto separator = [&](int symbol) {
+			const auto one = view->selectedText(
+				TextSelection(uint16(symbol), uint16(symbol + 1))).rich.text;
+			return one.isEmpty() || Ui::Text::IsWordSeparator(one[0]);
+		};
+		auto symbol = position;
+		if (forward) {
+			while (symbol < maxOffset && separator(symbol)) {
+				++symbol;
+			}
+			while (symbol < maxOffset && !separator(symbol)) {
+				++symbol;
+			}
+		} else {
+			if (symbol > 0) {
+				--symbol;
+			}
+			while (symbol > 0 && separator(symbol)) {
+				--symbol;
+			}
+			while (symbol > 0 && !separator(symbol - 1)) {
+				--symbol;
+			}
+		}
+		wanted = symbol;
+	} else {
+		wanted = position + (forward ? 1 : -1);
+	}
+	_focus = { uint16(std::clamp(wanted, 0, maxOffset)), false };
+
+	auto result = MessageSelection::Flat(_anchor, _focus);
+	_has = true;
+	_item = item;
+	_produced = result.flatSelection();
+	return result;
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_keyboard_text_selection.h b/Telegram/SourceFiles/history/view/history_view_keyboard_text_selection.h
new file mode 100644
index 00000000000000..78603116c3424f
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_keyboard_text_selection.h
@@ -0,0 +1,37 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "history/history_message_selection.h"
+
+class HistoryItem;
+
+namespace HistoryView {
+
+class Element;
+
+class KeyboardTextSelection final {
+public:
+	[[nodiscard]] static bool IsExtendKey(int key);
+
+	[[nodiscard]] std::optional<MessageSelection> extend(
+		not_null<Element*> view,
+		const MessageSelection &current,
+		int key,
+		Qt::KeyboardModifiers modifiers);
+
+private:
+	HistoryItem *_item = nullptr;
+	TextSelection _produced;
+	bool _has = false;
+	MessageSelectionFlatEndpoint _anchor;
+	MessageSelectionFlatEndpoint _focus;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 2e2c087b04a933..8a7ef1288e73e0 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -10,28 +10,39 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "base/qt/qt_key_modifiers.h"
 #include "base/qt/qt_common_adapters.h"
+#include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_components.h"
 #include "history/history_item_helpers.h"
 #include "history/history_item_text.h"
+#include "history/history_streamed_drafts.h"
 #include "history/view/media/history_view_media.h"
 #include "history/view/media/history_view_sticker.h"
+#include "history/view/reactions/history_view_reactions.h"
 #include "history/view/reactions/history_view_reactions_button.h"
+#include "history/view/history_view_reply_button.h"
 #include "history/view/reactions/history_view_reactions_selector.h"
 #include "history/view/history_view_context_menu.h"
+#include "history/view/history_view_drag.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_emoji_interactions.h"
 #include "history/view/history_view_message.h"
 #include "history/view/history_view_service_message.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/history_view_translate_tracker.h"
+#include "history/view/history_view_read_metrics_tracker.h"
+#include "history/view/history_view_add_poll_option.h"
+#include "history/view/history_view_element_overlay.h"
+#include "data/data_poll.h"
+#include "history/view/history_view_top_peers_selector.h"
 #include "history/view/history_view_quick_action.h"
 #include "chat_helpers/message_field.h"
 #include "mainwindow.h"
 #include "mainwidget.h"
-#include "core/click_handler_types.h"
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "core/core_settings.h"
+#include "core/phone_click_handler.h"
 #include "apiwrap.h"
 #include "api/api_who_reacted.h"
 #include "api/api_views.h"
@@ -42,6 +53,9 @@ For license and copyright information please follow this link:
 #include "window/window_session_controller.h"
 #include "window/window_peer_menu.h"
 #include "main/main_session.h"
+#include "media/player/media_player_instance.h"
+#include "ui/layers/generic_box.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/toast/toast.h"
@@ -52,9 +66,12 @@ For license and copyright information please follow this link:
 #include "ui/chat/chat_theme.h"
 #include "ui/chat/chat_style.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/screen_reader_mode.h"
 #include "ui/ui_utility.h"
 #include "lang/lang_keys.h"
 #include "boxes/delete_messages_box.h"
+#include "boxes/moderate_messages_box.h"
 #include "boxes/premium_preview_box.h"
 #include "boxes/peers/edit_participant_box.h"
 #include "core/crash_reports.h"
@@ -64,6 +81,7 @@ For license and copyright information please follow this link:
 #include "data/data_folder.h"
 #include "data/data_media_types.h"
 #include "data/data_document.h"
+#include "data/data_photo.h"
 #include "data/data_peer.h"
 #include "data/data_user.h"
 #include "data/data_chat.h"
@@ -72,6 +90,7 @@ For license and copyright information please follow this link:
 #include "data/data_message_reactions.h"
 #include "data/data_peer_values.h"
 #include "styles/style_chat.h"
+#include "styles/style_window.h" // columnMaximalWidthLeft
 
 #include <QtWidgets/QApplication>
 #include <QtCore/QMimeData>
@@ -84,15 +103,24 @@ constexpr auto kPreloadIfLessThanScreens = 2;
 constexpr auto kPreloadedScreensCountFull
 	= kPreloadedScreensCount + 1 + kPreloadedScreensCount;
 constexpr auto kClearUserpicsAfter = 50;
+constexpr auto kScrollDateHideOnDayCrossingTimeout = crl::time(3000);
 
 [[nodiscard]] std::unique_ptr<TranslateTracker> MaybeTranslateTracker(
 		History *history) {
 	return history ? std::make_unique<TranslateTracker>(history) : nullptr;
 }
 
-} // namespace
+[[nodiscard]] std::unique_ptr<ReadMetricsTracker> MaybeReadMetricsTracker(
+		Context context,
+		History *history) {
+	if (!history
+		|| (context != Context::History && context != Context::Replies)) {
+		return nullptr;
+	}
+	return std::make_unique<ReadMetricsTracker>(history->peer);
+}
 
-const crl::time ListWidget::kItemRevealDuration = crl::time(150);
+} // namespace
 
 WindowListDelegate::WindowListDelegate(
 	not_null<Window::SessionController*> window)
@@ -170,6 +198,11 @@ bool WindowListDelegate::listShowReactPremiumError(
 	return Window::ShowReactPremiumError(_window, item, id);
 }
 
+auto WindowListDelegate::listFillSenderUserpicMenu(PeerId userpicPeerId)
+-> base::unique_qptr<Ui::PopupMenu> {
+	return nullptr;
+}
+
 void WindowListDelegate::listWindowSetInnerFocus() {
 	_window->widget()->setInnerFocus();
 }
@@ -210,13 +243,18 @@ void ListWidget::enumerateItems(Method method) {
 		return;
 	}
 
+	auto collapseGapsTotal = 0;
+	for (const auto &gap : _collapseGaps) {
+		collapseGapsTotal += gap.height;
+	}
+
 	const auto beginning = begin(_items);
 	const auto ending = end(_items);
 	auto from = TopToBottom
 		? std::lower_bound(
 			beginning,
 			ending,
-			_visibleTop,
+			_visibleTop - collapseGapsTotal,
 			[this](auto &elem, int top) {
 				return this->itemTop(elem) + elem->height() <= top;
 			})
@@ -231,27 +269,58 @@ void ListWidget::enumerateItems(Method method) {
 	if (wasEnd) {
 		--from;
 	}
+
+	const auto gapCount = int(_collapseGaps.size());
+	auto nextGapIndex = 0;
+	auto collapseShift = 0;
 	if (TopToBottom) {
-		Assert(itemTop(from->get()) + from->get()->height() > _visibleTop);
-	} else {
-		if (itemTop(from->get()) >= _visibleBottom) {
-			setGeometryCrashAnnotations(*from);
-			Unexpected("itemTop(from->get()) >= _visibleBottom");
+		const auto firstTop = itemTop(from->get());
+		for (; nextGapIndex < gapCount; ++nextGapIndex) {
+			if (firstTop < _collapseGaps[nextGapIndex].absY) break;
+			collapseShift += _collapseGaps[nextGapIndex].height;
 		}
+	} else {
+		collapseShift = collapseGapsTotal;
+		nextGapIndex = gapCount;
 	}
 
 	while (true) {
 		auto view = from->get();
-		auto itemtop = itemTop(view);
+		auto logicalTop = itemTop(view);
+
+		if (TopToBottom) {
+			while (nextGapIndex < gapCount) {
+				const auto &gap = _collapseGaps[nextGapIndex];
+				if (logicalTop < gap.absY) break;
+				collapseShift += gap.height;
+				++nextGapIndex;
+			}
+		} else {
+			while (nextGapIndex > 0) {
+				const auto &gap = _collapseGaps[nextGapIndex - 1];
+				if (logicalTop >= gap.absY) break;
+				collapseShift -= gap.height;
+				--nextGapIndex;
+			}
+		}
+
+		auto itemtop = logicalTop + collapseShift;
 		auto itembottom = itemtop + view->height();
 
-		// Binary search should've skipped all the items that are above / below the visible area.
 		if (TopToBottom) {
-			Assert(itembottom > _visibleTop);
+			if (itembottom <= _visibleTop) {
+				if (++from == ending) {
+					break;
+				}
+				continue;
+			}
 		} else {
 			if (itemtop >= _visibleBottom) {
-				setGeometryCrashAnnotations(view);
-				Unexpected("itemtop >= _visibleBottom");
+				if (from == beginning) {
+					break;
+				}
+				--from;
+				continue;
 			}
 		}
 
@@ -394,7 +463,12 @@ ListWidget::ListWidget(
 , _reactionsManager(_delegate->listMakeReactionsManager(
 	this,
 	[=](QRect updated) { update(updated); }))
+, _replyButtonManager(std::make_unique<ReplyButton::Manager>(
+	[=](QRect updated) { update(updated); }))
 , _translateTracker(MaybeTranslateTracker(_delegate->listTranslateHistory()))
+, _readMetricsTracker(MaybeReadMetricsTracker(
+	_delegate->listContext(),
+	_delegate->listTranslateHistory()))
 , _scrollDateCheck([this] { scrollDateCheck(); })
 , _applyUpdatedScrollState([this] { applyUpdatedScrollState(); })
 , _selectEnabled(_delegate->listAllowsMultiSelect())
@@ -403,62 +477,88 @@ ListWidget::ListWidget(
 	[=](const HistoryItem *item) { return viewForItem(item); },
 	[=](const Element *view) { repaintItem(view); })
 , _touchSelectTimer([=] { onTouchSelect(); })
-, _touchScrollTimer([=] { onTouchScrollTimer(); }) {
+, _touchScrollTimer([=] { onTouchScrollTimer(); })
+, _middleClickAutoscroll(
+		[=](int d) { _delegate->listScrollTo(_visibleTop + d, false); },
+		[=](const QCursor &cursor) { setCursor(cursor); },
+		[=] { mouseActionUpdate(QCursor::pos()); setCursor(_cursor); },
+		[=] { return window()->isActiveWindow(); }) {
 	setAttribute(Qt::WA_AcceptTouchEvents);
 	setMouseTracking(true);
+	setAccessibleName(tr::lng_sr_message_list(tr::now));
+	if (_readMetricsTracker) {
+		Core::App().inAppKeyPressed(
+		) | rpl::on_next([=] {
+			registerReadMetricsActivity();
+		}, lifetime());
+	}
+
 	_scrollDateHideTimer.setCallback([this] { scrollDateHideByTimer(); });
 	_session->data().viewRepaintRequest(
-	) | rpl::start_with_next([this](auto view) {
-		if (view->delegate() == this) {
-			repaintItem(view);
+	) | rpl::on_next([this](Data::RequestViewRepaint data) {
+		if (data.view->delegate() == this) {
+			repaintItem(data.view, data.rect);
 		}
 	}, lifetime());
 	_session->data().viewResizeRequest(
-	) | rpl::start_with_next([this](auto view) {
+	) | rpl::on_next([this](auto view) {
 		if (view->delegate() == this) {
 			resizeItem(view);
 		}
 	}, lifetime());
+	_session->data().viewHeightAdjusted(
+	) | rpl::on_next([this](Data::Session::ViewHeightAdjusted data) {
+		if (data.view->delegate() == this) {
+			viewHeightAdjusted(data.view);
+		}
+	}, lifetime());
 	_session->data().itemViewRefreshRequest(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		if (const auto view = viewForItem(item)) {
 			refreshItem(view);
 		}
 	}, lifetime());
+	_session->data().itemShowHighlightRequest(
+	) | rpl::on_next([this](auto item) {
+		showItemHighlight(item);
+	}, lifetime());
 	_session->data().viewLayoutChanged(
-	) | rpl::start_with_next([this](auto view) {
+	) | rpl::on_next([this](auto view) {
 		if (view->delegate() == this) {
+			markReadMetricsStale();
 			if (view->isUnderCursor()) {
 				mouseActionUpdate();
 			}
 		}
 	}, lifetime());
 	_session->data().itemDataChanges(
-	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		if (const auto view = viewForItem(item)) {
 			view->itemDataChanged();
 		}
 	}, lifetime());
 
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	_session->data().peerDecorationsUpdated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	_session->data().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		itemRemoved(item);
 	}, lifetime());
 
+	setupThanosEffect();
+
 	using MessageUpdateFlag = Data::MessageUpdate::Flag;
 	_session->changes().realtimeMessageUpdates(
 		MessageUpdateFlag::NewUnreadReaction
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		maybeMarkReactionsRead(update.item);
 	}, lifetime());
 
@@ -466,13 +566,13 @@ ListWidget::ListWidget(
 		_session->changes().historyUpdates(
 			history,
 			Data::HistoryUpdate::Flag::TranslatedTo
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			update();
 		}, lifetime());
 	}
 
 	_session->data().itemVisibilityQueries(
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const Data::Session::ItemVisibilityQuery &query) {
 		if (const auto view = viewForItem(query.item)) {
 			const auto top = itemTop(view);
@@ -486,7 +586,7 @@ ListWidget::ListWidget(
 
 	if (_reactionsManager) {
 		_reactionsManager->chosen(
-		) | rpl::start_with_next([=](ChosenReaction reaction) {
+		) | rpl::on_next([=](ChosenReaction reaction) {
 			_reactionsManager->updateButton({});
 			reactionChosen(reaction);
 		}, lifetime());
@@ -496,7 +596,7 @@ ListWidget::ListWidget(
 			_reactionsItem.value());
 
 		Core::App().settings().cornerReactionValue(
-		) | rpl::start_with_next([=](bool value) {
+		) | rpl::on_next([=](bool value) {
 			_useCornerReaction = value;
 			if (!value) {
 				_reactionsManager->updateButton({});
@@ -504,13 +604,26 @@ ListWidget::ListWidget(
 		}, lifetime());
 	}
 
+	if (_replyButtonManager) {
+		Core::App().settings().cornerReplyValue(
+		) | rpl::on_next([=](bool value) {
+			_useCornerReply = value;
+			if (!value) {
+				_replyButtonManager->updateButton({});
+			}
+		}, lifetime());
+	}
+
 	_delegate->listChatWideValue(
-	) | rpl::start_with_next([=](bool wide) {
+	) | rpl::on_next([=](bool wide) {
 		_isChatWide = wide;
+		if (_overlayHost) {
+			_overlayHost->hide();
+		}
 	}, lifetime());
 
 	_selectScroll.scrolls(
-	) | rpl::start_with_next([=](int d) {
+	) | rpl::on_next([=](int d) {
 		delegate->listScrollTo(_visibleTop + d, false);
 	}, lifetime());
 }
@@ -534,7 +647,7 @@ void ListWidget::refreshViewer() {
 		_aroundPosition,
 		_idsLimit,
 		_idsLimit
-	) | rpl::start_with_next([=](Data::MessagesSlice &&slice) {
+	) | rpl::on_next([=](Data::MessagesSlice &&slice) {
 		_refreshingViewer = false;
 		std::swap(_slice, slice);
 		refreshRows(slice);
@@ -577,8 +690,16 @@ void ListWidget::setGeometryCrashAnnotations(not_null<Element*> view) {
 void ListWidget::refreshRows(const Data::MessagesSlice &old) {
 	Expects(_viewsCapacity.empty());
 
+	if (_thanosController) {
+		_thanosController->clearPreCaptured();
+	}
+
 	saveScrollState();
 
+	const auto scrolledTillEnd = _itemsKnownTillEnd
+		&& (_visibleBottom == height())
+		&& (_visibleBottom > _visibleTop);
+
 	const auto addedToEndFrom = (old.skippedAfter == 0
 		&& (_slice.skippedAfter == 0)
 		&& !old.ids.empty())
@@ -616,7 +737,10 @@ void ListWidget::refreshRows(const Data::MessagesSlice &old) {
 		_translateTracker->addBunchFrom(_items);
 	}
 	for (auto e = end(_items), i = e - addedToEndCount; i != e; ++i) {
-		_itemRevealPending.emplace(*i);
+		const auto item = (*i)->data();
+		if (!item->history()->streamedDrafts().hasFor(item)) {
+			_itemRevealPending.emplace(*i);
+		}
 	}
 	updateAroundPositionFromNearest(nearestIndex);
 
@@ -637,7 +761,8 @@ void ListWidget::refreshRows(const Data::MessagesSlice &old) {
 	}
 	_viewsCapacity.clear();
 
-	checkUnreadBarCreation();
+	const auto markLastAsRead = (scrolledTillEnd && markingMessagesRead());
+	checkUnreadBarCreation(markLastAsRead);
 	restoreScrollState();
 	if (!_itemsRevealHeight) {
 		mouseActionUpdate(QCursor::pos());
@@ -704,7 +829,15 @@ std::optional<int> ListWidget::scrollTopForView(
 	const auto top = view->y();
 	const auto height = view->height();
 	const auto available = _visibleBottom - _visibleTop;
-	return top - std::max((available - height) / 2, 0);
+	const auto heightLeft = (available - height);
+	if (heightLeft >= 0) {
+		return std::max(top - (heightLeft / 2), 0);
+	}
+	const auto highlight = _highlighter.state(view->data());
+	if (const auto range = FindHighlightYRange(view, highlight)) {
+		return AdjustScrollForRange(top, available, range);
+	}
+	return top;
 }
 
 void ListWidget::scrollTo(
@@ -791,10 +924,9 @@ bool ListWidget::isBelowPosition(Data::MessagePosition position) const {
 
 void ListWidget::highlightMessage(
 		FullMsgId itemId,
-		const TextWithEntities &part,
-		int partOffsetHint) {
+		const MessageHighlightId &highlight) {
 	if (const auto view = viewForItem(itemId)) {
-		_highlighter.highlight({ view->data(), part, partOffsetHint });
+		_highlighter.highlight({ view->data(), highlight });
 	}
 }
 
@@ -807,6 +939,10 @@ void ListWidget::showAroundPosition(
 	refreshViewer();
 }
 
+void ListWidget::overrideInitialScroll(Fn<bool()> callback) {
+	_overrideInitialScroll = std::move(callback);
+}
+
 bool ListWidget::jumpToBottomInsteadOfUnread() const {
 	// If we want to jump to unread, but we're at the unread already,
 	// then jump to the end of the list.
@@ -866,24 +1002,29 @@ bool ListWidget::showAtPositionNow(
 		Data::MessagePosition position,
 		const Window::SectionShow &params,
 		Fn<void(bool found)> done) {
-	if (const auto scrollTop = scrollTopForPosition(position)) {
-		computeScrollTo(*scrollTop, position, params.animated);
-		if (position != Data::MaxMessagePosition
-			&& position != Data::UnreadMessagePosition) {
-			highlightMessage(
-				position.fullId,
-				params.highlightPart,
-				params.highlightPartOffsetHint);
-		}
-		if (done) {
-			const auto found = !position.fullId.peer
-				|| !IsServerMsgId(position.fullId.msg)
-				|| viewForItem(position.fullId);
-			done(found);
+	auto scrollTop = scrollTopForPosition(position);
+	if (!scrollTop.has_value()) {
+		return false;
+	}
+	if (position != Data::MaxMessagePosition
+		&& position != Data::UnreadMessagePosition) {
+		const auto item = session().data().message(position.fullId);
+		const auto mayScrollToPart = !params.highlight.empty()
+			|| (item && item->groupId());
+		highlightMessage(position.fullId, params.highlight);
+		if (mayScrollToPart) {
+			scrollTop = scrollTopForPosition(position);
+			Assert(scrollTop.has_value());
 		}
-		return true;
 	}
-	return false;
+	computeScrollTo(*scrollTop, position, params.animated);
+	if (done) {
+		const auto found = !position.fullId.peer
+			|| !IsServerMsgId(position.fullId.msg)
+			|| viewForItem(position.fullId);
+		done(found);
+	}
+	return true;
 }
 
 void ListWidget::computeScrollTo(
@@ -906,18 +1047,21 @@ void ListWidget::computeScrollTo(
 	scrollTo(wanted, position, scrollDelta, type);
 }
 
-void ListWidget::checkUnreadBarCreation() {
-	if (!_bar.element) {
-		if (auto data = _delegate->listMessagesBar(_items); data.bar.element) {
-			_bar = std::move(data.bar);
-			_barText = std::move(data.text);
-			if (!_bar.hidden) {
-				_bar.element->createUnreadBar(_barText.value());
-				const auto i = ranges::find(_items, not_null{ _bar.element });
-				Assert(i != end(_items));
-				refreshAttachmentsAtIndex(i - begin(_items));
-			}
-		}
+void ListWidget::checkUnreadBarCreation(bool markLastAsRead) {
+	if (_bar.element) {
+		return;
+	}
+	auto data = _delegate->listMessagesBar(_items, markLastAsRead);
+	if (!data.bar.element) {
+		return;
+	}
+	_bar = std::move(data.bar);
+	_barText = std::move(data.text);
+	if (!_bar.hidden) {
+		_bar.element->createUnreadBar(_barText.value());
+		const auto i = ranges::find(_items, not_null{ _bar.element });
+		Assert(i != end(_items));
+		refreshAttachmentsAtIndex(i - begin(_items));
 	}
 }
 
@@ -1049,29 +1193,6 @@ int ListWidget::findNearestItem(Data::MessagePosition position) const {
 		: int(after - begin(_items));
 }
 
-HistoryItemsList ListWidget::collectVisibleItems() const {
-	auto result = HistoryItemsList();
-	const auto from = std::lower_bound(
-		begin(_items),
-		end(_items),
-		_visibleTop,
-		[this](auto &elem, int top) {
-			return this->itemTop(elem) + elem->height() <= top;
-		});
-	const auto to = std::lower_bound(
-		begin(_items),
-		end(_items),
-		_visibleBottom,
-		[this](auto &elem, int bottom) {
-			return this->itemTop(elem) < bottom;
-		});
-	result.reserve(to - from);
-	for (auto i = from; i != to; ++i) {
-		result.push_back((*i)->data());
-	}
-	return result;
-}
-
 void ListWidget::visibleTopBottomUpdated(
 		int visibleTop,
 		int visibleBottom) {
@@ -1083,6 +1204,8 @@ void ListWidget::visibleTopBottomUpdated(
 	const auto scrolledUp = (visibleTop < _visibleTop);
 	_visibleTop = visibleTop;
 	_visibleBottom = visibleBottom;
+	markReadMetricsStale();
+	registerReadMetricsActivity();
 
 	// Unload userpics.
 	if (_userpics.size() > kClearUserpicsAfter) {
@@ -1094,15 +1217,19 @@ void ListWidget::visibleTopBottomUpdated(
 	}
 	updateVisibleTopItem();
 	if (scrolledUp) {
+		_scrollDateAfterDayCrossing = false;
 		_scrollDateCheck.call();
 	} else {
-		scrollDateHideByTimer();
+		scrollDateCheckDownward();
 	}
 	_delegate->listVisibleAreaUpdated();
 	session().data().itemVisibilitiesUpdated();
 	_applyUpdatedScrollState.call();
 
 	_emojiInteractions->visibleAreaUpdated(_visibleTop, _visibleBottom);
+	if (_overlayHost) {
+		_overlayHost->updatePosition();
+	}
 }
 
 void ListWidget::applyUpdatedScrollState() {
@@ -1141,8 +1268,33 @@ void ListWidget::scrollDateCheck() {
 	}
 }
 
+void ListWidget::scrollDateCheckDownward() {
+	const auto previousDay = _scrollDateLastItem
+		? _scrollDateLastItem->dateTime().date()
+		: QDate();
+	const auto currentDay = _visibleTopItem
+		? _visibleTopItem->dateTime().date()
+		: QDate();
+	const auto crossedDay = previousDay.isValid()
+		&& currentDay.isValid()
+		&& (previousDay != currentDay);
+	_scrollDateLastItem = _visibleTopItem;
+	_scrollDateLastItemTop = _visibleTopFromItem;
+	if (crossedDay) {
+		if (!_scrollDateShown) {
+			toggleScrollDateShown();
+		}
+		_scrollDateAfterDayCrossing = true;
+		_scrollDateHideTimer.callOnce(
+			kScrollDateHideOnDayCrossingTimeout);
+	} else if (!_scrollDateAfterDayCrossing) {
+		scrollDateHideByTimer();
+	}
+}
+
 void ListWidget::scrollDateHideByTimer() {
 	_scrollDateHideTimer.cancel();
+	_scrollDateAfterDayCrossing = false;
 	if (!_scrollDateLink || ClickHandler::getPressed() != _scrollDateLink) {
 		scrollDateHide();
 	}
@@ -1183,6 +1335,7 @@ auto ListWidget::collectSelectedItems() const -> SelectedItems {
 		result.canDelete = selection.canDelete;
 		result.canForward = selection.canForward;
 		result.canSendNow = selection.canSendNow;
+		result.canReschedule = selection.canReschedule;
 		return result;
 	};
 	auto items = SelectedItems();
@@ -1235,6 +1388,9 @@ SelectionModeResult ListWidget::inSelectionMode() const {
 		|| (_mouseAction == MouseAction::Selecting && _lastInSelectionMode);
 	if (_lastInSelectionMode != now) {
 		_lastInSelectionMode = now;
+		if (now && _overlayHost) {
+			_overlayHost->hide();
+		}
 		if (_inSelectionModeAnimation.animating()) {
 			const auto progress = !now
 				? _inSelectionModeAnimation.value(0.)
@@ -1317,6 +1473,7 @@ bool ListWidget::addToSelection(
 	iterator->second.canDelete = item->canDelete();
 	iterator->second.canForward = item->allowsForward();
 	iterator->second.canSendNow = item->allowsSendNow();
+	iterator->second.canReschedule = item->allowsReschedule();
 	return true;
 }
 
@@ -1408,11 +1565,7 @@ bool ListWidget::isInsideSelection(
 		const auto dragState = view->textState(
 			state.point,
 			stateRequest);
-		if (dragState.cursor == CursorState::Text
-			&& base::in_range(
-				dragState.symbol,
-				_selectedTextRange.from,
-				_selectedTextRange.to)) {
+		if (view->selectionContains(_selectedTextSelection, dragState)) {
 			return true;
 		}
 	}
@@ -1431,18 +1584,15 @@ bool ListWidget::requiredToStartDragging(not_null<Element*> view) const {
 	return (_mouseCursorState == CursorState::Date);
 }
 
-bool ListWidget::isPressInSelectedText(TextState state) const {
-	if (state.cursor != CursorState::Text) {
-		return false;
-	}
+bool ListWidget::isPressInSelectedText(
+		not_null<const Element*> view,
+		TextState state) const {
 	if (!hasSelectedText()
 		|| !_selectedTextItem
 		|| _selectedTextItem->fullId() != _pressState.itemId) {
 		return false;
 	}
-	auto from = _selectedTextRange.from;
-	auto to = _selectedTextRange.to;
-	return (state.symbol >= from && state.symbol < to);
+	return view->selectionContains(_selectedTextSelection, state);
 }
 
 void ListWidget::cancelSelection() {
@@ -1453,7 +1603,7 @@ void ListWidget::cancelSelection() {
 void ListWidget::selectItem(not_null<HistoryItem*> item) {
 	if (hasSelectRestriction()) {
 		return;
-	} else if (const auto view = viewForItem(item)) {
+	} else if ([[maybe_unused]] const auto view = viewForItem(item)) {
 		clearTextSelection();
 		changeSelection(
 			_selected,
@@ -1466,7 +1616,7 @@ void ListWidget::selectItem(not_null<HistoryItem*> item) {
 void ListWidget::selectItemAsGroup(not_null<HistoryItem*> item) {
 	if (hasSelectRestriction()) {
 		return;
-	} else if (const auto view = viewForItem(item)) {
+	} else if ([[maybe_unused]] const auto view = viewForItem(item)) {
 		clearTextSelection();
 		changeSelectionAsGroup(
 			_selected,
@@ -1497,22 +1647,25 @@ void ListWidget::clearTextSelection() {
 			repaintItem(view);
 		}
 		_selectedTextItem = nullptr;
-		_selectedTextRange = TextSelection();
+		_selectedTextSelection = MessageSelection();
 		_selectedText = TextForMimeData();
 	}
 }
 
 void ListWidget::setTextSelection(
 		not_null<Element*> view,
-		TextSelection selection) {
+		MessageSelection selection) {
+	if (!selection.empty()) {
+		ClickHandler::unpressed();
+	}
 	clearSelected();
 	const auto item = view->data();
 	if (_selectedTextItem != item) {
 		clearTextSelection();
 		_selectedTextItem = view->data();
 	}
-	_selectedTextRange = selection;
-	_selectedText = (selection.from != selection.to)
+	_selectedTextSelection = selection;
+	_selectedText = !selection.empty()
 		? view->selectedText(selection)
 		: TextForMimeData();
 	repaintItem(view);
@@ -1561,6 +1714,8 @@ bool ListWidget::showCopyRestriction(HistoryItem *item) {
 	}
 	_delegate->listUiShow()->showToast((type == CopyRestrictionType::Channel)
 		? tr::lng_error_nocopy_channel(tr::now)
+		: (type == CopyRestrictionType::User)
+		? tr::lng_error_nocopy_user(tr::now)
 		: tr::lng_error_nocopy_group(tr::now));
 	return true;
 }
@@ -1572,6 +1727,8 @@ bool ListWidget::showCopyMediaRestriction(not_null<HistoryItem*> item) {
 	}
 	_delegate->listUiShow()->showToast((type == CopyRestrictionType::Channel)
 		? tr::lng_error_nocopy_channel(tr::now)
+		: (type == CopyRestrictionType::User)
+		? tr::lng_error_nocopy_user(tr::now)
 		: tr::lng_error_nocopy_group(tr::now));
 	return true;
 }
@@ -1610,14 +1767,29 @@ bool ListWidget::showCopyRestrictionForSelected() {
 }
 
 bool ListWidget::hasSelectRestriction() const {
-	return _delegate->listSelectRestrictionType()
-		!= CopyRestrictionType::None;
+	return session().frozen()
+		|| (_delegate->listSelectRestrictionType()
+			!= CopyRestrictionType::None);
 }
 
 Element *ListWidget::lookupItemByY(int y) const {
 	return strictFindItemByY(y);
 }
 
+not_null<HistoryItem*> ListWidget::lookupItemByPoint(
+		QPoint point,
+		not_null<Element*> view) const {
+	return LookupItemByPoint(view, mapPointToItem(point, view));
+}
+
+bool ListWidget::canConsumeHorizontalScroll(QPoint position, int delta) const {
+	const auto view = lookupItemByY(position.y());
+	return view
+		&& view->canConsumeHorizontalScroll(
+			mapPointToItem(position, view),
+			delta);
+}
+
 auto ListWidget::findViewForPinnedTracking(int top) const
 -> std::pair<Element*, int> {
 	const auto findScrollTopItem = [&](int top)
@@ -1779,7 +1951,11 @@ bool ListWidget::elementUnderCursor(
 	return (_overElement == view);
 }
 
-SelectionModeResult ListWidget::elementInSelectionMode() {
+SelectionModeResult ListWidget::elementInSelectionMode(
+		const HistoryView::Element *view) {
+	if (view && !_delegate->listIsItemGoodForSelection(view->data())) {
+		return {};
+	}
 	return inSelectionMode();
 }
 
@@ -1803,6 +1979,47 @@ void ListWidget::elementShowPollResults(
 	_delegate->listShowPollResults(poll, context);
 }
 
+ElementOverlayHost &ListWidget::ensureOverlayHost() {
+	if (!_overlayHost) {
+		_overlayHost = std::make_unique<ElementOverlayHost>(
+			this,
+			[=](not_null<const Element*> view) {
+				return itemTop(view);
+			});
+		_overlayHost->setHiddenCallback([=] {
+			_delegate->listWindowSetInnerFocus();
+		});
+	}
+	return *_overlayHost;
+}
+
+void ListWidget::elementShowAddPollOption(
+		not_null<Element*> view,
+		not_null<PollData*> poll,
+		FullMsgId context,
+		QRect optionRect) {
+	ShowAddPollOptionOverlay(
+		ensureOverlayHost(),
+		this,
+		view,
+		poll,
+		context,
+		controller(),
+		_delegate->listChatStyle());
+}
+
+void ListWidget::elementSubmitAddPollOption(FullMsgId context) {
+	if (_overlayHost) {
+		_overlayHost->triggerSubmit(context);
+	}
+}
+
+void ListWidget::hideElementOverlay() {
+	if (_overlayHost) {
+		_overlayHost->hide();
+	}
+}
+
 void ListWidget::elementOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) {
@@ -1816,6 +2033,21 @@ void ListWidget::elementOpenDocument(
 	_delegate->listOpenDocument(document, context, showInMediaView);
 }
 
+bool ListWidget::elementScrollToLocalY(
+		not_null<const Element*> view,
+		int localTop) {
+	const auto currentScrollTop = _visibleTop;
+	const auto currentScrollHeight = (_visibleBottom - _visibleTop);
+	const auto wanted = std::max(
+		std::min(itemTop(view) + localTop, height() - currentScrollHeight),
+		0);
+	if (wanted == currentScrollTop) {
+		return true;
+	}
+	computeScrollTo(wanted, view->data()->position(), anim::type::normal);
+	return true;
+}
+
 void ListWidget::elementCancelUpload(const FullMsgId &context) {
 	if (const auto item = session().data().message(context)) {
 		_delegate->listCancelUploadLayer(item);
@@ -1829,6 +2061,27 @@ void ListWidget::elementShowTooltip(
 	_topToast.show(parentWidget(), &session(), text, hiddenCallback);
 }
 
+void ListWidget::elementShowHiddenSenderTooltip(
+		FullMsgId itemId,
+		const TextWithEntities &text) {
+	const auto scroll = _delegate->listScrollArea();
+	if (!scroll) {
+		return;
+	}
+	auto area = QRect();
+	if (const auto view = viewForItem(itemId)) {
+		if (const auto tooltip = view->Get<HiddenSenderTooltip>()) {
+			const auto local = tooltip->linkRect;
+			if (!local.isEmpty()) {
+				area = QRect(
+					mapToGlobal(QPoint(local.x(), itemTop(view) + local.y())),
+					local.size());
+			}
+		}
+	}
+	_hiddenSenderTooltip.show(scroll, area, text);
+}
+
 bool ListWidget::elementAnimationsPaused() {
 	return _delegate->listAnimationsPaused();
 }
@@ -1857,8 +2110,10 @@ void ListWidget::elementHandleViaClick(not_null<UserData*> bot) {
 	_delegate->listHandleViaClick(bot);
 }
 
-bool ListWidget::elementIsChatWide() {
-	return _overrideIsChatWide.value_or(_isChatWide);
+ElementChatMode ListWidget::elementChatMode() {
+	return _overrideChatMode.value_or(_isChatWide
+		? ElementChatMode::Wide
+		: ElementChatMode::Default);
 }
 
 not_null<Ui::PathShiftGradient*> ListWidget::elementPathShiftGradient() {
@@ -1866,7 +2121,7 @@ not_null<Ui::PathShiftGradient*> ListWidget::elementPathShiftGradient() {
 }
 
 void ListWidget::elementReplyTo(const FullReplyTo &to) {
-	replyToMessageRequestNotify(to);
+	replyToMessageRequestNotify(to, base::IsCtrlPressed());
 }
 
 void ListWidget::elementStartInteraction(not_null<const Element*> view) {
@@ -1944,8 +2199,11 @@ void ListWidget::updateSize() {
 }
 
 void ListWidget::resizeToWidth(int newWidth, int minHeight) {
+	if (width() != newWidth && _overlayHost) {
+		_overlayHost->hide();
+	}
 	_minHeight = minHeight;
-	TWidget::resizeToWidth(newWidth);
+	RpWidget::resizeToWidth(newWidth);
 	restoreScrollPosition();
 }
 
@@ -1961,8 +2219,8 @@ void ListWidget::startItemRevealAnimations() {
 					[=] { revealItemsCallback(); },
 					0.,
 					1.,
-					kItemRevealDuration,
-					anim::easeOutCirc);
+					st::itemRevealDuration,
+					anim::easeOutQuint);
 				if (view->data()->out()) {
 					_delegate->listChatTheme()->rotateComplexGradientBackground();
 				}
@@ -1973,6 +2231,11 @@ void ListWidget::startItemRevealAnimations() {
 
 void ListWidget::startMessageSendingAnimation(
 		not_null<HistoryItem*> item) {
+	if (elementChatMode() == HistoryView::ElementChatMode::Default
+		&& width() > st::columnMaximalWidthLeft
+		&& !item->media()) {
+		return;
+	}
 	const auto sendingAnimation = _delegate->listSendingAnimation();
 	if (!sendingAnimation || !sendingAnimation->checkExpectedType(item)) {
 		return;
@@ -2033,9 +2296,14 @@ void ListWidget::revealItemsCallback() {
 		_itemsTop = (_minHeight > _itemsHeight + st::historyPaddingBottom)
 			? (_minHeight - _itemsHeight - st::historyPaddingBottom)
 			: 0;
+		auto collapseGapTotal = 0;
+		for (const auto &gap : _collapseGaps) {
+			collapseGapTotal += gap.height;
+		}
 		const auto wasHeight = height();
 		const auto nowHeight = _itemsTop
 			+ _itemsHeight
+			+ collapseGapTotal
 			+ st::historyPaddingBottom;
 		if (wasHeight != nowHeight) {
 			resize(width(), nowHeight);
@@ -2071,13 +2339,20 @@ int ListWidget::resizeGetHeight(int newWidth) {
 	startItemRevealAnimations();
 	_itemsWidth = newWidth;
 	_itemsHeight = newHeight - _itemsRevealHeight;
+	auto collapseGapTotal = 0;
+	for (const auto &gap : _collapseGaps) {
+		collapseGapTotal += gap.height;
+	}
 	_itemsTop = (_minHeight > _itemsHeight + st::historyPaddingBottom)
 		? (_minHeight - _itemsHeight - st::historyPaddingBottom)
 		: 0;
 	if (_emptyInfo) {
 		_emptyInfo->setVisible(isEmpty());
 	}
-	return _itemsTop + _itemsHeight + st::historyPaddingBottom;
+	return _itemsTop
+		+ _itemsHeight
+		+ collapseGapTotal
+		+ st::historyPaddingBottom;
 }
 
 void ListWidget::restoreScrollPosition() {
@@ -2087,60 +2362,61 @@ void ListWidget::restoreScrollPosition() {
 	_delegate->listScrollTo(newVisibleTop);
 }
 
-TextSelection ListWidget::computeRenderSelection(
+auto ListWidget::computeRenderSelection(
 		not_null<const SelectedMap*> selected,
-		not_null<const Element*> view) const {
+		not_null<const Element*> view) const -> RenderSelectionState {
+	auto result = RenderSelectionState();
 	const auto itemSelection = [&](not_null<HistoryItem*> item) {
-		auto i = selected->find(item->fullId());
-		if (i != selected->end()) {
-			return FullSelection;
-		}
-		return TextSelection();
+		return selected->contains(item->fullId());
 	};
 	const auto item = view->data();
 	if (const auto group = session().data().groups().find(item)) {
 		if (group->items.front() != item) {
-			return TextSelection();
+			return result;
 		}
-		auto result = TextSelection();
+		result.selection = TextSelection();
 		auto allFullSelected = true;
 		const auto count = int(group->items.size());
 		for (auto i = 0; i != count; ++i) {
-			if (itemSelection(group->items[i]) == FullSelection) {
-				result = AddGroupItemSelection(result, i);
+			if (itemSelection(group->items[i])) {
+				result.selection = AddGroupItemSelection(result.selection, i);
 			} else {
 				allFullSelected = false;
 			}
 		}
 		if (allFullSelected) {
-			return FullSelection;
-		}
-		const auto leaderSelection = itemSelection(item);
-		if (leaderSelection != FullSelection
-			&& leaderSelection != TextSelection()) {
-			return leaderSelection;
+			result.selection = FullSelection;
+			result.fullMessageSelected = true;
 		}
 		return result;
 	}
-	return itemSelection(item);
+	if (itemSelection(item)) {
+		result.selection = FullSelection;
+		result.fullMessageSelected = true;
+	}
+	return result;
 }
 
-TextSelection ListWidget::itemRenderSelection(
-		not_null<const Element*> view) const {
+auto ListWidget::itemRenderSelection(
+		not_null<const Element*> view) const -> RenderSelectionState {
+	auto result = RenderSelectionState();
 	if (!_dragSelected.empty()) {
 		const auto i = _dragSelected.find(view->data()->fullId());
 		if (i != _dragSelected.end()) {
-			return (_dragSelectAction == DragSelectAction::Selecting)
+			result.selection = (_dragSelectAction == DragSelectAction::Selecting)
 				? FullSelection
 				: TextSelection();
+			result.fullMessageSelected = (result.selection == FullSelection);
+			return result;
 		}
 	}
 	if (!_selected.empty() || !_dragSelected.empty()) {
 		return computeRenderSelection(&_selected, view);
 	} else if (view->data() == _selectedTextItem) {
-		return _selectedTextRange;
+		result.selection = _selectedTextSelection.flatSelection();
+		result.messageSelection = &_selectedTextSelection;
 	}
-	return TextSelection();
+	return result;
 }
 
 Ui::ChatPaintContext ListWidget::preparePaintContext(
@@ -2151,6 +2427,7 @@ Ui::ChatPaintContext ListWidget::preparePaintContext(
 		.visibleAreaPositionGlobal = mapToGlobal(QPoint(0, _visibleTop)),
 		.visibleAreaTop = _visibleTop,
 		.visibleAreaWidth = width(),
+		.visibleAreaHeight = _visibleBottom - _visibleTop,
 	});
 }
 
@@ -2188,11 +2465,21 @@ void ListWidget::checkActivation() {
 }
 
 void ListWidget::paintEvent(QPaintEvent *e) {
-	if (_delegate->listIgnorePaintEvent(this, e)) {
+	const auto overlapped = _delegate->listIgnorePaintEvent(this, e);
+	if (_readMetricsTracker) {
+		_readMetricsTracker->setScreenActive(
+			!overlapped && markingContentsRead());
+	}
+	if (overlapped) {
 		return;
 	} else if (_translateTracker) {
 		_translateTracker->startBunch();
 	}
+	const auto metricsStale = _readMetricsTracker
+		&& base::take(_readMetricsStale);
+	if (metricsStale) {
+		_readMetricsTracker->startBatch(_visibleTop, _visibleBottom);
+	}
 	auto readTill = (HistoryItem*)nullptr;
 	auto readContents = base::flat_set<not_null<HistoryItem*>>();
 	const auto markingAsViewed = markingMessagesRead();
@@ -2201,6 +2488,9 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 			_delegate->listAddTranslatedItems(_translateTracker.get());
 			_translateTracker->finishBunch();
 		}
+		if (metricsStale) {
+			_readMetricsTracker->endBatch();
+		}
 		if (markingAsViewed && readTill) {
 			_delegate->listMarkReadTill(readTill);
 		}
@@ -2219,7 +2509,12 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 
 	auto clip = e->rect();
 
-	auto from = std::lower_bound(begin(_items), end(_items), clip.top(), [this](auto &elem, int top) {
+	auto collapseGapsTotal = 0;
+	for (const auto &gap : _collapseGaps) {
+		collapseGapsTotal += gap.height;
+	}
+
+	auto from = std::lower_bound(begin(_items), end(_items), clip.top() - collapseGapsTotal, [this](auto &elem, int top) {
 		return this->itemTop(elem) + elem->height() <= top;
 	});
 	auto to = std::lower_bound(begin(_items), end(_items), clip.top() + clip.height(), [this](auto &elem, int bottom) {
@@ -2238,10 +2533,30 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 
 	const auto session = &this->session();
 	auto top = itemTop(from->get());
+
+	auto nextGapIndex = 0;
+	auto collapseShift = 0;
+	for (; nextGapIndex < int(_collapseGaps.size()); ++nextGapIndex) {
+		const auto &gap = _collapseGaps[nextGapIndex];
+		if (top < gap.absY) break;
+		collapseShift += gap.height;
+	}
+	top += collapseShift;
+
 	context = context.translated(0, -top);
 	p.translate(0, top);
 	const auto sendingAnimation = _delegate->listSendingAnimation();
 	for (auto i = from; i != to; ++i) {
+		while (nextGapIndex < int(_collapseGaps.size())) {
+			const auto &gap = _collapseGaps[nextGapIndex];
+			if (top - collapseShift < gap.absY) break;
+			top += gap.height;
+			collapseShift += gap.height;
+			context.translate(0, -gap.height);
+			p.translate(0, gap.height);
+			++nextGapIndex;
+		}
+
 		const auto view = *i;
 		const auto item = view->data();
 		const auto height = view->height();
@@ -2252,13 +2567,19 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 					= _reactionsManager->currentReactionPaintInfo();
 			}
 			context.outbg = view->hasOutLayout();
-			context.selection = itemRenderSelection(view);
+			const auto selection = itemRenderSelection(view);
+			context.selection = selection.selection;
+			context.fullMessageSelected = selection.fullMessageSelected;
+			context.messageSelection = selection.messageSelection;
 			context.highlight = _highlighter.state(item);
 			view->draw(p, context);
 		}
 		if (_translateTracker) {
 			_translateTracker->add(view);
 		}
+		if (metricsStale && height > 0) {
+			_readMetricsTracker->push(item, top, height);
+		}
 		const auto isSponsored = item->isSponsored();
 		const auto isUnread = _delegate->listElementShownUnread(view)
 			&& item->isRegular();
@@ -2291,6 +2612,9 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 				readContents.insert(item);
 				_highlighter.enqueue({ item });
 			}
+			if (item->hasUnreadPollVote()) {
+				readContents.insert(item);
+			}
 		}
 		session->data().reactions().poll(item, context.now);
 		if (item->hasUnpaidContent()) {
@@ -2311,6 +2635,9 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 	paintUserpics(p, context, clip);
 	paintDates(p, context, clip);
 
+	if (_replyButtonManager) {
+		_replyButtonManager->paint(p, context);
+	}
 	if (_reactionsManager) {
 		_reactionsManager->paint(p, context);
 	}
@@ -2506,40 +2833,27 @@ TextForMimeData ListWidget::getSelectedText() const {
 
 	if (selected.empty()) {
 		if (const auto view = viewForItem(_selectedTextItem)) {
-			return view->selectedText(_selectedTextRange);
+			return view->selectedText(_selectedTextSelection);
 		}
 		return _selectedText;
 	}
 
-	auto groups = base::flat_set<not_null<const Data::Group*>>();
-	auto fullSize = 0;
-	auto texts = std::vector<std::pair<
-		not_null<HistoryItem*>,
-		TextForMimeData>>();
-	texts.reserve(selected.size());
-
-	const auto wrapItem = [&](
-			not_null<HistoryItem*> item,
-			TextForMimeData &&unwrapped) {
-		auto time = QString(", [%1]\n").arg(
-			QLocale().toString(ItemDateTime(item), QLocale::ShortFormat));
-		auto part = TextForMimeData();
-		auto size = item->author()->name().size()
-			+ time.size()
-			+ unwrapped.expanded.size();
-		part.reserve(size);
-		part.append(item->author()->name()).append(time);
-		part.append(std::move(unwrapped));
-		texts.emplace_back(std::move(item), std::move(part));
-		fullSize += size;
+	const auto richContext = (selected.size() > 1);
+	struct CopyEntry {
+		not_null<HistoryItem*> item;
+		const Data::Group *group = nullptr;
 	};
+	auto groups = base::flat_set<not_null<const Data::Group*>>();
+	auto entries = std::vector<CopyEntry>();
+	entries.reserve(selected.size());
+
 	const auto addItem = [&](not_null<HistoryItem*> item) {
-		wrapItem(item, HistoryItemText(item));
+		entries.push_back({ item, nullptr });
 	};
 	const auto addGroup = [&](not_null<const Data::Group*> group) {
 		Expects(!group->items.empty());
 
-		wrapItem(group->items.back(), HistoryGroupText(group));
+		entries.push_back({ group->items.back(), group.get() });
 	};
 
 	for (const auto &[itemId, data] : selected) {
@@ -2559,17 +2873,29 @@ TextForMimeData ListWidget::getSelectedText() const {
 			}
 		}
 	}
-	ranges::sort(texts, [&](
-			const std::pair<not_null<HistoryItem*>, TextForMimeData> &a,
-			const std::pair<not_null<HistoryItem*>, TextForMimeData> &b) {
-		return _delegate->listIsLessInOrder(a.first, b.first);
+	ranges::sort(entries, [&](const CopyEntry &a, const CopyEntry &b) {
+		return _delegate->listIsLessInOrder(a.item, b.item);
 	});
 
 	auto result = TextForMimeData();
-	auto sep = u"\n\n"_q;
-	result.reserve(fullSize + (texts.size() - 1) * sep.size());
-	for (auto i = begin(texts), e = end(texts); i != e;) {
-		result.append(std::move(i->second));
+	auto sep = u"\n"_q;
+	for (auto i = begin(entries), e = end(entries); i != e;) {
+		auto body = TextForMimeData();
+		if (i->group) {
+			const auto group = not_null<const Data::Group*>{ i->group };
+			body = richContext
+				? HistoryGroupTextForSelectedCopy(group)
+				: HistoryGroupText(group);
+		} else {
+			body = richContext
+				? HistoryItemTextForSelectedCopy(i->item)
+				: HistoryItemText(i->item);
+		}
+		auto part = HistorySelectedItemWrappedText(
+			i->item,
+			std::move(body),
+			richContext);
+		result.append(std::move(part));
 		if (++i != e) {
 			result.append(sep);
 		}
@@ -2585,14 +2911,32 @@ SelectedItems ListWidget::getSelectedItems() const {
 	return collectSelectedItems();
 }
 
-const TextSelection &ListWidget::getSelectedTextRange(
+TextSelection ListWidget::getSelectedTextRange(
 		not_null<HistoryItem*> item) const {
-	return _selectedTextRange;
+	return (_selectedTextItem == item)
+		? _selectedTextSelection.flatRangeForEdit()
+		: TextSelection();
+}
+
+MessageSelection ListWidget::getSelectedTextSelection(
+		not_null<HistoryItem*> item) const {
+	return (_selectedTextItem == item)
+		? _selectedTextSelection
+		: MessageSelection();
 }
 
 int ListWidget::findItemIndexByY(int y) const {
 	Expects(!_items.empty());
 
+	auto gapShift = 0;
+	for (const auto &gap : _collapseGaps) {
+		if (y < gap.absY + gapShift) {
+			break;
+		}
+		gapShift += gap.height;
+	}
+	y -= gapShift;
+
 	if (y < _itemsTop) {
 		return 0;
 	}
@@ -2614,7 +2958,11 @@ Element *ListWidget::strictFindItemByY(int y) const {
 	if (_items.empty()) {
 		return nullptr;
 	}
-	return (y >= _itemsTop && y < _itemsTop + _itemsHeight)
+	auto gapTotal = 0;
+	for (const auto &gap : _collapseGaps) {
+		gapTotal += gap.height;
+	}
+	return (y >= _itemsTop && y < _itemsTop + _itemsHeight + gapTotal)
 		? findItemByY(y).get()
 		: nullptr;
 }
@@ -2636,6 +2984,137 @@ void ListWidget::keyPressEvent(QKeyEvent *e) {
 	const auto hasModifiers = (Qt::NoModifier !=
 		(e->modifiers()
 			& ~(Qt::KeypadModifier | Qt::GroupSwitchModifier)));
+	if (_middleClickAutoscroll.active() && key == Qt::Key_Escape) {
+		_middleClickAutoscroll.stop();
+		return;
+	}
+
+	const auto count = accessibilityChildCount();
+	if (count > 0 && Ui::ScreenReaderModeActive()) {
+		if (_accessibilityFocusedItem
+			&& _accessibilityFocusedIndex >= 0) {
+			const auto elements = accessibleElements();
+			const auto barIndex
+				= accessibilityUnreadBarIndex();
+			const auto elementIndex = (barIndex >= 0
+				&& _accessibilityFocusedIndex > barIndex)
+				? (_accessibilityFocusedIndex - 1)
+				: _accessibilityFocusedIndex;
+			if (elementIndex < 0
+				|| elementIndex >= int(elements.size())
+				|| elements[elementIndex]->data().get()
+					!= _accessibilityFocusedItem) {
+				// The focused item is still the same message, but
+				// its index in accessibleElements() shifted (the list
+				// was mutated since the last navigation). Repair the
+				// cached index in-place without emitting a focus
+				// change — the framework still thinks the focused
+				// child is _accessibilityFocusedItem and we are only
+				// catching up our bookkeeping.
+				for (auto i = 0, n = int(elements.size());
+					i < n; ++i) {
+					if (elements[i]->data().get()
+						== _accessibilityFocusedItem) {
+						_accessibilityFocusedIndex =
+							(barIndex >= 0 && i >= barIndex)
+							? (i + 1)
+							: i;
+						break;
+					}
+				}
+			}
+		}
+		auto newIndex = _accessibilityFocusedIndex;
+		switch (key) {
+		case Qt::Key_Down:
+			newIndex = std::min(
+				(newIndex < 0) ? (count - 1) : (newIndex + 1),
+				count - 1);
+			break;
+		case Qt::Key_Up:
+			newIndex = std::max(
+				(newIndex < 0) ? (count - 1) : (newIndex - 1),
+				0);
+			break;
+		case Qt::Key_PageDown: {
+			const auto pageHeight = _visibleBottom - _visibleTop;
+			auto remaining = pageHeight;
+			while (newIndex + 1 < count && remaining > 0) {
+				++newIndex;
+				const auto rect = accessibilityChildRect(newIndex);
+				remaining -= rect.height();
+			}
+			break;
+		}
+		case Qt::Key_PageUp: {
+			const auto pageHeight = _visibleBottom - _visibleTop;
+			auto remaining = pageHeight;
+			while (newIndex - 1 >= 0 && remaining > 0) {
+				--newIndex;
+				const auto rect = accessibilityChildRect(newIndex);
+				remaining -= rect.height();
+			}
+			break;
+		}
+		case Qt::Key_Home:
+			newIndex = 0;
+			break;
+		case Qt::Key_End:
+			newIndex = count - 1;
+			break;
+		default:
+			break;
+		}
+		if (newIndex != _accessibilityFocusedIndex
+			&& newIndex >= 0
+			&& newIndex < count) {
+			const auto elements = accessibleElements();
+			const auto barIndex
+				= accessibilityUnreadBarIndex();
+			const auto elementIndex = (barIndex >= 0
+				&& newIndex > barIndex)
+				? (newIndex - 1)
+				: newIndex;
+			const auto item = (elementIndex >= 0
+				&& elementIndex < int(elements.size()))
+				? elements[elementIndex]->data().get()
+				: nullptr;
+			setAccessibilityFocusedItem(newIndex, item);
+
+			const auto rect = accessibilityChildRect(newIndex);
+			if (!rect.isEmpty()) {
+				if (rect.top() < _visibleTop) {
+					_delegate->listScrollTo(rect.top());
+				} else if (rect.bottom() > _visibleBottom) {
+					_delegate->listScrollTo(
+						rect.bottom()
+							- (_visibleBottom - _visibleTop));
+				}
+			}
+
+			if (markingMessagesRead()
+				&& (barIndex < 0 || newIndex != barIndex)
+				&& elementIndex >= 0
+				&& elementIndex < int(elements.size())) {
+				_delegate->listMarkReadTill(
+					elements[elementIndex]->data());
+			}
+
+			e->accept();
+			return;
+		}
+
+		if (key == Qt::Key_Space) {
+			if (hasSelectedItems()) {
+				toggleMessageSelection();
+			} else {
+				playPauseFocusedMedia();
+			}
+			e->accept();
+			return;
+		}
+	}
+
 	if (key == Qt::Key_Escape || key == Qt::Key_Back) {
 		if (hasSelectedText() || hasSelectedItems()) {
 			cancelSelection();
@@ -2656,6 +3135,23 @@ void ListWidget::keyPressEvent(QKeyEvent *e) {
 #endif // Q_OS_MAC
 	} else if (e == QKeySequence::Delete || key == Qt::Key_Backspace) {
 		_delegate->listDeleteRequest();
+	} else if (KeyboardTextSelection::IsExtendKey(key)
+		&& (e->modifiers() & Qt::ShiftModifier)
+		&& hasSelectedText()) {
+		const auto view = viewForItem(_selectedTextItem);
+		const auto next = view
+			? _keyboardTextSelection.extend(
+				view,
+				_selectedTextSelection,
+				key,
+				e->modifiers())
+			: std::optional<MessageSelection>();
+		if (next) {
+			setTextSelection(view, *next);
+			e->accept();
+		} else {
+			e->ignore();
+		}
 	} else if (!hasModifiers
 		&& ((key == Qt::Key_Up)
 			|| (key == Qt::Key_Down)
@@ -2676,6 +3172,7 @@ auto ListWidget::scrollKeyEvents() const
 }
 
 void ListWidget::mouseDoubleClickEvent(QMouseEvent *e) {
+	registerReadMetricsActivity();
 	mouseActionStart(e->globalPos(), e->button());
 	trySwitchToWordSelection();
 	if (!ClickHandler::getActive()
@@ -2701,11 +3198,11 @@ void ListWidget::mouseDoubleClickEvent(QMouseEvent *e) {
 void ListWidget::toggleFavoriteReaction(not_null<Element*> view) const {
 	const auto item = view->data();
 	const auto favorite = session().data().reactions().favoriteId();
-	if (!ranges::contains(
+	if (_delegate->listShowReactPremiumError(item, favorite)
+		|| !ranges::contains(
 			Data::LookupPossibleReactions(item).recent,
 			favorite,
-			&Data::Reaction::id)
-		|| _delegate->listShowReactPremiumError(item, favorite)) {
+			&Data::Reaction::id)) {
 		return;
 	} else if (!ranges::contains(item->chosenReactions(), favorite)) {
 		if (const auto top = itemTop(view); top >= 0) {
@@ -2737,14 +3234,16 @@ void ListWidget::switchToWordSelection() {
 	if (dragState.cursor != CursorState::Text) {
 		return;
 	}
-	_mouseTextSymbol = dragState.symbol;
+	_mouseTextAnchor = dragState;
 	_mouseSelectType = TextSelectType::Words;
 	if (_mouseAction == MouseAction::None) {
 		_mouseAction = MouseAction::Selecting;
-		setTextSelection(_overElement, TextSelection(
-			dragState.symbol,
-			dragState.symbol
-		));
+		setTextSelection(
+			_overElement,
+			_overElement->selectionFromStates(
+				_mouseTextAnchor,
+				dragState,
+				_mouseSelectType));
 	}
 	mouseActionUpdate();
 
@@ -2768,10 +3267,18 @@ void ListWidget::contextMenuEvent(QContextMenuEvent *e) {
 void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	if (e->reason() == QContextMenuEvent::Mouse) {
 		mouseActionUpdate(e->globalPos());
+	} else if (e->reason() == QContextMenuEvent::Keyboard
+		&& _accessibilityFocusedItem) {
+		_overItemExact = _accessibilityFocusedItem;
+		if (const auto view = viewForItem(_accessibilityFocusedItem)) {
+			_overElement = view;
+		}
 	}
 
 	const auto link = ClickHandler::getActive();
-	if (link
+	if (controller()->showFrozenError()) {
+		return;
+	} else if (link
 		&& !link->property(
 			kSendReactionEmojiProperty).value<Data::ReactionId>().empty()
 		&& _reactionsManager
@@ -2786,10 +3293,37 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		: _overElement
 		? _overElement->data().get()
 		: nullptr;
-	const auto clickedReaction = link
-		? link->property(
-			kReactionsCountEmojiProperty).value<Data::ReactionId>()
-		: Data::ReactionId();
+	if (link
+		&& link->property(kFastShareProperty).value<bool>()
+		&& overItem) {
+		if (const auto view = viewForItem(overItem)) {
+			const auto rightSize = view->rightActionSize().value_or(QSize());
+			const auto reactionsSkip = view->embedReactionsInBubble()
+				? 0
+				: view->reactionButtonParameters({}, {}).reactionsHeight;
+			const auto top = itemTop(view)
+				+ view->height()
+				- reactionsSkip
+				- _visibleTop
+				- rightSize.height();
+			const auto right = rect::right(view->innerGeometry())
+				- st::historyFastShareLeft
+				- rightSize.width();
+			ShowTopPeersSelector(
+				this,
+				controller()->uiShow(),
+				overItem->fullId(),
+				parentWidget()->mapToGlobal(QPoint(right, top)));
+			return;
+		}
+	}
+	const auto clickedReaction = Reactions::ReactionIdOfLink(link);
+	const auto linkPhoneNumber = link
+		? link->property(kPhoneNumberLinkProperty).toString()
+		: QString();
+	const auto linkUserpicPeerId = (link && _overSenderUserpic)
+		? PeerId(link->property(kPeerLinkPeerIdProperty).toULongLong())
+		: PeerId();
 	_whoReactedMenuLifetime.destroy();
 	if (!clickedReaction.empty()
 		&& overItem
@@ -2804,6 +3338,29 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			_whoReactedMenuLifetime);
 		e->accept();
 		return;
+	} else if (!linkPhoneNumber.isEmpty()) {
+		PhoneClickHandler(&session(), linkPhoneNumber).onClick(
+			prepareClickContext(
+				Qt::LeftButton,
+				_overItemExact ? _overItemExact->fullId() : FullMsgId()));
+		return;
+	} else if (linkUserpicPeerId) {
+		_menu = _delegate->listFillSenderUserpicMenu(linkUserpicPeerId);
+		if (_menu) {
+			Window::AddSenderUserpicModerateAction(
+				controller(),
+				[&] {
+					const auto contextY = _visibleTop
+						+ mapFromGlobal(e->globalPos()).y();
+					const auto contextView = strictFindItemByY(contextY);
+					return contextView ? contextView->data().get() : overItem;
+				}(),
+				Ui::Menu::CreateAddActionCallback(_menu.get()));
+			_menu->setForcedOrigin(Ui::PanelAnimation::Origin::BottomLeft);
+			_menu->popup(e->globalPos());
+			e->accept();
+			return;
+		}
 	}
 
 	auto request = ContextMenuRequest(controller());
@@ -2814,7 +3371,7 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	request.pointState = _overState.pointState;
 	request.quote = (_overElement
 		&& _selectedTextItem == _overElement->data())
-		? _overElement->selectedQuote(_selectedTextRange)
+		? _overElement->selectedQuote(_selectedTextSelection)
 		: SelectedQuote();
 	request.selectedText = _selectedText;
 	request.selectedItems = collectSelectedItems();
@@ -2851,7 +3408,9 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	if (attached == AttachSelectorResult::Failed) {
 		_menu = nullptr;
 		return;
-	} else if (attached == AttachSelectorResult::Attached) {
+	}
+	HistoryView::AttachPollOptionTabs(_menu.get(), desiredPosition);
+	if (attached == AttachSelectorResult::Attached) {
 		_menu->popupPrepared();
 	} else {
 		_menu->popup(desiredPosition);
@@ -2898,6 +3457,23 @@ void ListWidget::mousePressEvent(QMouseEvent *e) {
 		e->accept();
 		return; // ignore mouse press, that was hiding context menu
 	}
+	if (_overlayHost) {
+		_overlayHost->handleClickOutside(e->pos());
+	}
+	if (_middleClickAutoscroll.active()) {
+		_middleClickAutoscroll.stop();
+		e->accept();
+		return;
+	}
+	if (e->button() == Qt::MiddleButton) {
+		mouseActionCancel();
+		ClickHandler::unpressed();
+		_middleClickAutoscroll.toggleOrBeginHold(e->globalPos());
+		e->accept();
+		return;
+	}
+	_mouseActive = true;
+	registerReadMetricsActivity();
 	mouseActionStart(e->globalPos(), e->button());
 }
 
@@ -3001,6 +3577,7 @@ void ListWidget::touchEvent(QTouchEvent *e) {
 		_touchPrevPos = _touchPos;
 		_touchPos = e->touchPoints().cbegin()->screenPos().toPoint();
 	}
+	registerReadMetricsActivity();
 
 	switch (e->type()) {
 	case QEvent::TouchBegin: {
@@ -3056,7 +3633,7 @@ void ListWidget::touchEvent(QTouchEvent *e) {
 			return;
 		}
 		_touchInProgress = false;
-		auto weak = Ui::MakeWeak(this);
+		auto weak = base::make_weak(this);
 		const auto notMoved = (_touchPos - _touchStart).manhattanLength()
 			< QApplication::startDragDistance();
 		if (_touchSelect) {
@@ -3100,11 +3677,21 @@ void ListWidget::touchEvent(QTouchEvent *e) {
 void ListWidget::mouseMoveEvent(QMouseEvent *e) {
 	static auto lastGlobalPosition = e->globalPos();
 	auto reallyMoved = (lastGlobalPosition != e->globalPos());
+	if (_middleClickAutoscroll.active()) {
+		if (reallyMoved) {
+			_mouseActive = true;
+			lastGlobalPosition = e->globalPos();
+		}
+		e->accept();
+		return;
+	}
 	auto buttonsPressed = (e->buttons() & (Qt::LeftButton | Qt::MiddleButton));
 	if (!buttonsPressed && _mouseAction != MouseAction::None) {
 		mouseReleaseEvent(e);
 	}
 	if (reallyMoved) {
+		_mouseActive = true;
+		registerReadMetricsActivity();
 		lastGlobalPosition = e->globalPos();
 		if (!buttonsPressed
 			|| (_scrollDateLink
@@ -3116,12 +3703,32 @@ void ListWidget::mouseMoveEvent(QMouseEvent *e) {
 }
 
 void ListWidget::mouseReleaseEvent(QMouseEvent *e) {
+	if (_middleClickAutoscroll.finishHold(e->button())) {
+		e->accept();
+		return;
+	}
+	if (_middleClickAutoscroll.active()) {
+		e->accept();
+		return;
+	}
+	registerReadMetricsActivity();
 	mouseActionFinish(e->globalPos(), e->button());
 	if (!rect().contains(e->pos())) {
 		leaveEvent(e);
 	}
 }
 
+void ListWidget::markReadMetricsStale() {
+	_readMetricsStale = true;
+	update();
+}
+
+void ListWidget::registerReadMetricsActivity() {
+	if (_readMetricsTracker && markingContentsRead()) {
+		_readMetricsTracker->registerActivity();
+	}
+}
+
 void ListWidget::touchScrollUpdated(const QPoint &screenPos) {
 	_touchPos = screenPos;
 	_delegate->listScrollTo(
@@ -3135,14 +3742,18 @@ rpl::producer<bool> ListWidget::touchMaybeSelectingValue() const {
 }
 
 void ListWidget::enterEventHook(QEnterEvent *e) {
+	_mouseActive = true;
 	mouseActionUpdate(QCursor::pos());
-	return TWidget::enterEventHook(e);
+	return RpWidget::enterEventHook(e);
 }
 
 void ListWidget::leaveEventHook(QEvent *e) {
 	if (_reactionsManager) {
 		_reactionsManager->updateButton({ .cursorLeft = true });
 	}
+	if (_replyButtonManager) {
+		_replyButtonManager->updateButton({});
+	}
 	if (const auto view = _overElement) {
 		if (_overState.pointState != PointState::Outside) {
 			repaintItem(view);
@@ -3155,7 +3766,8 @@ void ListWidget::leaveEventHook(QEvent *e) {
 		_cursor = style::cur_default;
 		setCursor(_cursor);
 	}
-	return TWidget::leaveEventHook(e);
+	_mouseActive = false;
+	return RpWidget::leaveEventHook(e);
 }
 
 void ListWidget::updateDragSelection() {
@@ -3363,7 +3975,11 @@ void ListWidget::mouseActionStart(
 		Ui::MarkInactivePress(window(), false);
 	}
 
-	if (ClickHandler::getPressed()) {
+	const auto pressed = ClickHandler::getPressed();
+	if (pressed
+		&& (!_overElement
+			|| _overState.pointState == PointState::Outside
+			|| !_overElement->allowTextSelectionByHandler(pressed))) {
 		_mouseAction = MouseAction::PrepareDrag;
 	} else if (hasSelectedItems()) {
 		if (overSelectedItems()) {
@@ -3375,47 +3991,47 @@ void ListWidget::mouseActionStart(
 	if (_mouseAction == MouseAction::None && pressElement) {
 		validateTrippleClickStartTime();
 		TextState dragState;
-		auto startDistance = (globalPosition - _trippleClickPoint).manhattanLength();
-		auto validStartPoint = startDistance < QApplication::startDragDistance();
-		if (_trippleClickStartTime != 0 && validStartPoint) {
-			StateRequest request;
-			request.flags = Ui::Text::StateRequest::Flag::LookupSymbol;
-			dragState = pressElement->textState(_pressState.point, request);
-			if (dragState.cursor == CursorState::Text) {
-				setTextSelection(pressElement, TextSelection(
-					dragState.symbol,
-					dragState.symbol
-				));
-				_mouseTextSymbol = dragState.symbol;
-				_mouseAction = MouseAction::Selecting;
-				_mouseSelectType = TextSelectType::Paragraphs;
-				mouseActionUpdate();
-				_trippleClickStartTime = crl::now();
-			}
-		} else if (pressElement) {
-			StateRequest request;
-			request.flags = Ui::Text::StateRequest::Flag::LookupSymbol;
-			dragState = pressElement->textState(_pressState.point, request);
+		const auto startDistance = (globalPosition - _trippleClickPoint)
+			.manhattanLength();
+		const auto validStartPoint = startDistance
+			< QApplication::startDragDistance();
+		StateRequest request;
+		request.flags = Ui::Text::StateRequest::Flag::LookupSymbol;
+		dragState = pressElement->textState(_pressState.point, request);
+		if (_trippleClickStartTime != 0
+			&& validStartPoint
+			&& dragState.cursor == CursorState::Text) {
+			_mouseTextAnchor = dragState;
+			_mouseSelectType = TextSelectType::Paragraphs;
+			setTextSelection(
+				pressElement,
+				pressElement->selectionFromStates(
+					_mouseTextAnchor,
+					dragState,
+					_mouseSelectType));
+			_mouseAction = MouseAction::Selecting;
+			mouseActionUpdate();
+			_trippleClickStartTime = crl::now();
 		}
 		if (_mouseSelectType != TextSelectType::Paragraphs) {
-			_mouseTextSymbol = dragState.symbol;
-			if (isPressInSelectedText(dragState)) {
-				_mouseAction = MouseAction::PrepareDrag; // start text drag
+			if (isPressInSelectedText(pressElement, dragState)) {
+				_mouseAction = MouseAction::PrepareDrag;
 			} else if (!_pressWasInactive) {
 				if (requiredToStartDragging(pressElement)
 					&& _pressState.pointState != PointState::Outside) {
 					_mouseAction = MouseAction::PrepareDrag;
-				} else {
-					if (dragState.afterSymbol) ++_mouseTextSymbol;
-					if (!hasSelectedItems()
-						&& _overState.pointState != PointState::Outside) {
-						setTextSelection(pressElement, TextSelection(
-							_mouseTextSymbol,
-							_mouseTextSymbol));
-						_mouseAction = MouseAction::Selecting;
-					} else if (!hasSelectRestriction()) {
-						_mouseAction = MouseAction::PrepareSelect;
-					}
+				} else if (!hasSelectedItems()
+					&& _overState.pointState != PointState::Outside) {
+					_mouseTextAnchor = dragState;
+					setTextSelection(
+						pressElement,
+						pressElement->selectionFromStates(
+							_mouseTextAnchor,
+							dragState,
+							_mouseSelectType));
+					_mouseAction = MouseAction::Selecting;
+				} else if (!hasSelectRestriction()) {
+					_mouseAction = MouseAction::PrepareSelect;
 				}
 			}
 		}
@@ -3444,7 +4060,30 @@ Reactions::ButtonParameters ListWidget::reactionButtonParameters(
 	auto result = view->reactionButtonParameters(
 		position,
 		reactionState
-	).translated({ 0, itemTop(view) });
+	).translated({ 0, top });
+	result.visibleTop = _visibleTop;
+	result.visibleBottom = _visibleBottom;
+	result.globalPointer = _mousePosition;
+	return result;
+}
+
+ReplyButton::ButtonParameters ListWidget::replyButtonParameters(
+		not_null<const Element*> view,
+		QPoint position,
+		const TextState &replyState) const {
+	if (!_useCornerReply) {
+		return {};
+	}
+	const auto top = itemTop(view);
+	if (top < 0
+		|| _mouseAction == MouseAction::Dragging
+		|| inSelectionMode().inSelectionMode) {
+		return {};
+	}
+	auto result = view->replyButtonParameters(
+		position,
+		replyState
+	).translated({ 0, top });
 	result.visibleTop = _visibleTop;
 	result.visibleBottom = _visibleBottom;
 	result.globalPointer = _mousePosition;
@@ -3460,6 +4099,7 @@ void ListWidget::mouseActionCancel() {
 	_pressState = MouseState();
 	_pressItemExact = nullptr;
 	_mouseAction = MouseAction::None;
+	_mouseTextAnchor = TextState();
 	clearDragSelection();
 	_wasSelectedText = false;
 	_selectScroll.cancel();
@@ -3495,9 +4135,7 @@ void ListWidget::mouseActionFinish(
 
 	_wasSelectedText = false;
 
-	if (_mouseAction == MouseAction::Dragging
-		|| _mouseAction == MouseAction::Selecting
-		|| needItemSelectionToggle) {
+	if (_mouseAction == MouseAction::Dragging || needItemSelectionToggle) {
 		activated = nullptr;
 	} else if (activated) {
 		mouseActionCancel();
@@ -3526,11 +4164,25 @@ void ListWidget::mouseActionFinish(
 		}
 	} else if (needTextSelectionClear) {
 		clearTextSelection();
+	} else if (simpleSelectionChange
+		&& _mouseCursorState == CursorState::Date
+		&& !hasSelectRestriction()) {
+		if (const auto item = session().data().message(pressState.itemId)) {
+			if (_delegate->listIsItemGoodForSelection(item)) {
+				clearTextSelection();
+				changeSelectionAsGroup(
+					_selected,
+					item,
+					SelectAction::Select);
+				pushSelectedItems();
+				update();
+			}
+		}
 	} else if (_mouseAction == MouseAction::Selecting) {
 		if (!_dragSelected.empty()) {
 			applyDragSelection();
 		} else if (_selectedTextItem && !_pressWasInactive) {
-			if (_selectedTextRange.from == _selectedTextRange.to) {
+			if (_selectedTextSelection.empty()) {
 				clearTextSelection();
 				_delegate->listWindowSetInnerFocus();
 			}
@@ -3538,32 +4190,36 @@ void ListWidget::mouseActionFinish(
 	}
 	_mouseAction = MouseAction::None;
 	_mouseSelectType = TextSelectType::Letters;
+	_mouseTextAnchor = TextState();
 	_selectScroll.cancel();
 
 	if (QGuiApplication::clipboard()->supportsSelection()
 		&& _selectedTextItem
-		&& _selectedTextRange.from != _selectedTextRange.to
+		&& !_selectedTextSelection.empty()
 		&& !hasCopyRestriction(_selectedTextItem)) {
-		if (const auto view = viewForItem(_selectedTextItem)) {
-			TextUtilities::SetClipboardText(
-				view->selectedText(_selectedTextRange),
-				QClipboard::Selection);
-		}
+		TextUtilities::SetClipboardText(_selectedText, QClipboard::Selection);
 	}
 }
 
 ClickHandlerContext ListWidget::prepareClickHandlerContext(FullMsgId id) {
 	return {
 		.itemId = id,
-		.elementDelegate = [weak = Ui::MakeWeak(this)] {
-			return weak
-				? (ElementDelegate*)weak
-				: nullptr;
+		.elementDelegate = [weak = base::make_weak(this)] {
+			return (ElementDelegate*)weak.get();
 		},
 		.sessionWindow = base::make_weak(controller()),
 	};
 }
 
+ClickContext ListWidget::prepareClickContext(
+		Qt::MouseButton button,
+		FullMsgId itemId) {
+	return {
+		button,
+		QVariant::fromValue(prepareClickHandlerContext(itemId)),
+	};
+}
+
 int ListWidget::SelectionViewOffset(
 		not_null<const ListWidget*> inner,
 		not_null<const Element*> view) {
@@ -3578,6 +4234,10 @@ int ListWidget::SelectionViewOffset(
 
 
 void ListWidget::mouseActionUpdate() {
+	if (!_mouseActive && !window()->isActiveWindow()) {
+		return;
+	}
+
 	auto mousePosition = mapFromGlobal(_mousePosition);
 	auto point = QPoint(
 		std::clamp(mousePosition.x(), 0, width()),
@@ -3588,13 +4248,17 @@ void ListWidget::mouseActionUpdate() {
 		: TextState();
 	const auto reactionItem = session().data().message(reactionState.itemId);
 	const auto reactionView = viewForItem(reactionItem);
+	const auto replyBtnState = (_replyButtonManager && !reactionView)
+		? _replyButtonManager->buttonTextState(point)
+		: TextState();
+	const auto replyBtnItem = session().data().message(replyBtnState.itemId);
+	const auto replyBtnView = viewForItem(replyBtnItem);
 	const auto view = reactionView
 		? reactionView
+		: replyBtnView
+		? replyBtnView
 		: strictFindItemByY(point.y());
 	const auto item = view ? view->data().get() : nullptr;
-	if (view) {
-		point -= QPoint(SelectionViewOffset(this, view), 0);
-	}
 	const auto itemPoint = mapPointToItem(point, view);
 	_overState = MouseState(
 		item ? item->fullId() : FullMsgId(),
@@ -3616,6 +4280,11 @@ void ListWidget::mouseActionUpdate() {
 				reactionState)
 			: Reactions::ButtonParameters());
 	}
+	if (_replyButtonManager) {
+		_replyButtonManager->updateButton(view
+			? replyButtonParameters(view, itemPoint, replyBtnState)
+			: ReplyButton::ButtonParameters());
+	}
 	if (viewChanged && view) {
 		_reactionsItem = item;
 	}
@@ -3625,10 +4294,15 @@ void ListWidget::mouseActionUpdate() {
 	auto inTextSelection = (_overState.pointState != PointState::Outside)
 		&& (_overState.itemId == _pressState.itemId)
 		&& hasSelectedText();
+	auto dragStateUserpic = false;
+	const auto overReplyBtn = replyBtnView && replyBtnState.link;
 	const auto overReaction = reactionView && reactionState.link;
 	if (overReaction) {
 		dragState = reactionState;
 		lnkhost = reactionView;
+	} else if (overReplyBtn) {
+		dragState = replyBtnState;
+		lnkhost = _replyButtonManager.get();
 	} else if (view) {
 		auto cursorDeltaLength = [&] {
 			auto cursorDelta = (_overState.point - _pressState.point);
@@ -3723,6 +4397,7 @@ void ListWidget::mouseActionUpdate() {
 						// stop enumeration if we've found a userpic under the cursor
 						if (point.y() >= userpicTop && point.y() < userpicTop + st::msgPhotoSize) {
 							dragState = TextState(nullptr, view->fromPhotoLink());
+							dragStateUserpic = true;
 							_overItemExact = nullptr;
 							lnkhost = view;
 							return false;
@@ -3734,6 +4409,7 @@ void ListWidget::mouseActionUpdate() {
 		}
 	}
 	const auto lnkChanged = ClickHandler::setActive(dragState.link, lnkhost);
+	_overSenderUserpic = dragStateUserpic;
 	if (lnkChanged || dragState.cursor != _mouseCursorState) {
 		Ui::Tooltip::Hide();
 	}
@@ -3752,21 +4428,12 @@ void ListWidget::mouseActionUpdate() {
 	} else if (view) {
 		if (_mouseAction == MouseAction::Selecting) {
 			if (inTextSelection) {
-				auto second = dragState.symbol;
-				if (dragState.afterSymbol
-					&& _mouseSelectType == TextSelectType::Letters) {
-					++second;
-				}
-				auto selection = TextSelection(
-					qMin(second, _mouseTextSymbol),
-					qMax(second, _mouseTextSymbol)
-				);
-				if (_mouseSelectType != TextSelectType::Letters) {
-					selection = view->adjustSelection(
-						selection,
-						_mouseSelectType);
-				}
-				setTextSelection(view, selection);
+				setTextSelection(
+					view,
+					view->selectionFromStates(
+						_mouseTextAnchor,
+						dragState,
+						_mouseSelectType));
 				clearDragSelection();
 			} else if (_pressState.itemId) {
 				updateDragSelection();
@@ -3881,6 +4548,7 @@ std::unique_ptr<QMimeData> ListWidget::prepareDrag() {
 			}
 		}
 
+		auto photoData = PhotoDragData();
 		if (pressedHandler) {
 			const auto lnkDocument = reinterpret_cast<DocumentData*>(
 				pressedHandler->property(
@@ -3891,9 +4559,17 @@ std::unique_ptr<QMimeData> ListWidget::prepareDrag() {
 					urls.push_back(QUrl::fromLocalFile(filepath));
 				}
 			}
+			const auto lnkPhoto = reinterpret_cast<PhotoData*>(
+				pressedHandler->property(
+					kPhotoLinkMediaProperty).toULongLong());
+			if (lnkPhoto) {
+				photoData = PreparePhotoDragData(lnkPhoto);
+			}
 		}
 
-		if (forwardIds.empty() && urls.isEmpty()) {
+		if (forwardIds.empty()
+			&& urls.isEmpty()
+			&& photoData.image.isNull()) {
 			return nullptr;
 		}
 
@@ -3905,6 +4581,7 @@ std::unique_ptr<QMimeData> ListWidget::prepareDrag() {
 		if (!urls.isEmpty()) {
 			result->setUrls(urls);
 		}
+		FillDragMimeWithPhoto(result.get(), std::move(photoData));
 		return result;
 	}
 	return nullptr;
@@ -3926,6 +4603,66 @@ int ListWidget::itemTop(not_null<const Element*> view) const {
 	return _itemsTop + view->y();
 }
 
+void ListWidget::setCollapseGaps(std::vector<Ui::CollapseGap> gaps) {
+	if (_collapseGaps == gaps) {
+		return;
+	}
+	_collapseGaps = std::move(gaps);
+	auto gapTotal = 0;
+	for (const auto &gap : _collapseGaps) {
+		gapTotal += gap.height;
+	}
+	const auto nowHeight = _itemsTop
+		+ _itemsHeight
+		+ gapTotal
+		+ st::historyPaddingBottom;
+	if (height() != nowHeight) {
+		resize(width(), nowHeight);
+	}
+	update();
+}
+
+void ListWidget::setupThanosEffect() {
+	if (!_delegate->listThanosEffectEnabled()) {
+		return;
+	}
+	const auto scroll = _delegate->listScrollArea();
+	if (!scroll) {
+		return;
+	}
+	_thanosController = std::make_unique<Ui::ThanosEffectController>(
+		_session,
+		Ui::ThanosEffectController::Delegate{
+			.viewForItem = [=](not_null<const HistoryItem*> item)
+					-> HistoryView::Element* {
+				const auto i = _views.find(item);
+				return (i != end(_views))
+					? i->second.get()
+					: nullptr;
+			},
+			.itemTop = [=](not_null<const HistoryView::Element*> view) {
+				return itemTop(view);
+			},
+			.visibleAreaTop = [=] { return _visibleTop; },
+			.visibleAreaBottom = [=] { return _visibleBottom; },
+			.contentWidth = [=] { return width(); },
+			.preparePaintContext = [=](QRect clip) {
+				return preparePaintContext(clip);
+			},
+			.window = [=]() -> QWidget* { return window(); },
+			.scrollArea = [=]() -> not_null<Ui::ScrollArea*> {
+				return scroll;
+			},
+			.scrollToY = [=](int y) {
+				scroll->scrollToY(y);
+			},
+			.setCollapseGaps = [=](std::vector<Ui::CollapseGap> gaps) {
+				setCollapseGaps(std::move(gaps));
+			},
+		},
+		lifetime());
+}
+
 void ListWidget::repaintItem(const Element *view) {
 	if (!view) {
 		return;
@@ -3942,6 +4679,17 @@ void ListWidget::repaintItem(const Element *view) {
 	}
 }
 
+void ListWidget::repaintItem(const Element *view, QRect rect) {
+	if (rect.isNull()) {
+		return repaintItem(view);
+	}
+	if (!view) {
+		return;
+	}
+	const auto top = itemTop(view);
+	update(rect.translated(0, top));
+}
+
 void ListWidget::repaintItem(FullMsgId itemId) {
 	if (const auto view = viewForItem(itemId)) {
 		repaintItem(view);
@@ -3998,7 +4746,8 @@ void ListWidget::refreshAttachmentsFromTill(int from, int till) {
 			const auto viewDate = view->dateTime();
 			const auto nextDate = next->dateTime();
 			next->setDisplayDate(_context != Context::ShortcutMessages
-				&& nextDate.date() != viewDate.date());
+				&& (nextDate.date() != viewDate.date()
+					|| view->data()->hideDisplayDate()));
 			auto attached = next->computeIsAttachToPrevious(view);
 			next->setAttachToPrevious(attached, view);
 			view->setAttachToNext(attached, next);
@@ -4010,6 +4759,30 @@ void ListWidget::refreshAttachmentsFromTill(int from, int till) {
 	}
 }
 
+void ListWidget::viewHeightAdjusted(not_null<Element*> view) {
+	const auto i = ranges::find(_items, view);
+	if (i == end(_items)) {
+		return;
+	}
+	auto next = i + 1;
+	const auto was = (next != end(_items))
+		? (*next)->y()
+		: _itemsHeight;
+	const auto now = view->y() + view->height();
+	const auto delta = now - was;
+	for (; next != end(_items); ++next) {
+		(*next)->setY((*next)->y() + delta);
+	}
+	_itemsHeight += delta;
+	_itemsTop = (_minHeight > _itemsHeight + st::historyPaddingBottom)
+		? (_minHeight - _itemsHeight - st::historyPaddingBottom)
+		: 0;
+	resize(width(), _itemsTop + _itemsHeight + st::historyPaddingBottom);
+	restoreScrollPosition();
+	updateVisibleTopItem();
+	update();
+}
+
 void ListWidget::refreshItem(not_null<const Element*> view) {
 	const auto i = ranges::find(_items, view);
 	const auto index = i - begin(_items);
@@ -4035,7 +4808,33 @@ void ListWidget::refreshItem(not_null<const Element*> view) {
 	}
 }
 
+void ListWidget::showItemHighlight(not_null<HistoryItem*> item) {
+	const auto history = _delegate->listTranslateHistory();
+	if (history && item->history() != history) {
+		return;
+	} else if (!history && !viewForItem(item)) {
+		return;
+	}
+	const auto position = item->position();
+	auto params = Window::SectionShow{
+		Window::SectionShow::Way::Forward
+	};
+	params.animated = anim::type::normal;
+	if (!showAtPositionNow(position, params, nullptr)) {
+		showAroundPosition(position, [=, this] {
+			return showAtPositionNow(position, params, nullptr);
+		});
+	}
+}
+
 void ListWidget::viewReplaced(not_null<const Element*> was, Element *now) {
+	if (_activeColumnsView == was.get()) {
+		_activeColumnsView = nullptr;
+		_activeColumns.clear();
+	}
+	if (_overlayHost) {
+		_overlayHost->viewGone(was);
+	}
 	if (_visibleTopItem == was) _visibleTopItem = now;
 	if (_scrollDateLastItem == was) _scrollDateLastItem = now;
 	if (_overElement == was) _overElement = now;
@@ -4078,11 +4877,18 @@ void ListWidget::itemRemoved(not_null<const HistoryItem*> item) {
 	if (_pressItemExact == item) {
 		_pressItemExact = nullptr;
 	}
+	if (_accessibilityFocusedItem == item) {
+		_accessibilityFocusedItem = nullptr;
+	}
 	const auto i = _views.find(item);
 	if (i == end(_views)) {
 		return;
 	}
 
+	if (_thanosController) {
+		_thanosController->captureOnRemoval(item);
+	}
+
 	saveScrollState();
 	const auto guard = gsl::finally([&] {
 		restoreScrollState();
@@ -4098,6 +4904,9 @@ void ListWidget::itemRemoved(not_null<const HistoryItem*> item) {
 	if (_reactionsManager) {
 		_reactionsManager->remove(item->fullId());
 	}
+	if (_replyButtonManager) {
+		_replyButtonManager->remove(item->fullId());
+	}
 	updateItemsGeometry();
 }
 
@@ -4107,7 +4916,8 @@ QPoint ListWidget::mapPointToItem(
 	if (!view) {
 		return QPoint();
 	}
-	return point - QPoint(0, itemTop(view));
+	return point
+		- QPoint(SelectionViewOffset(this, view), itemTop(view));
 }
 
 rpl::producer<FullMsgId> ListWidget::editMessageRequested() const {
@@ -4155,6 +4965,16 @@ rpl::producer<FullMsgId> ListWidget::showMessageRequested() const {
 	return _requestedToShowMessage.events();
 }
 
+void ListWidget::setInsertTextCallback(Fn<void(QString)> callback) {
+	_insertTextCallback = std::move(callback);
+}
+
+void ListWidget::insertTextAtCursor(const QString &text) {
+	if (_insertTextCallback) {
+		_insertTextCallback(text);
+	}
+}
+
 void ListWidget::replyNextMessage(FullMsgId fullId, bool next) {
 	const auto reply = [&](Element *view) {
 		if (view) {
@@ -4204,13 +5024,352 @@ void ListWidget::setEmptyInfoWidget(base::unique_qptr<Ui::RpWidget> &&w) {
 	}
 }
 
-void ListWidget::overrideIsChatWide(bool isWide) {
-	_overrideIsChatWide = isWide;
+void ListWidget::overrideChatMode(std::optional<ElementChatMode> mode) {
+	_overrideChatMode = mode;
 }
 
 ListWidget::~ListWidget() {
 	// Destroy child widgets first, because they may invoke leaveEvent-s.
 	_emptyInfo = nullptr;
+	if (const auto raw = _menu.release()) {
+		crl::on_main(raw, [=] {
+			delete raw;
+		});
+	}
+}
+
+// Accessibility.
+
+std::vector<HistoryView::Element*> ListWidget::accessibleElements() const {
+	auto result = std::vector<Element*>();
+	result.reserve(_items.size());
+	for (const auto &view : _items) {
+		if (!view->isHidden()) {
+			result.push_back(view.get());
+		}
+	}
+	return result;
+}
+
+int ListWidget::accessibilityUnreadBarIndex() const {
+	if (!_bar.element || _bar.hidden) {
+		return -1;
+	}
+	const auto elements = accessibleElements();
+	for (auto i = 0, count = int(elements.size()); i != count; ++i) {
+		if (elements[i] == _bar.element) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+auto ListWidget::computeActiveColumns(int row) const
+-> const std::vector<HistoryView::MessageSubItem> & {
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && row == barIndex) {
+		_activeColumns.clear();
+		_activeColumnsView = nullptr;
+		return _activeColumns;
+	}
+	const auto elements = accessibleElements();
+	const auto elementIndex = (barIndex >= 0 && row > barIndex)
+		? (row - 1)
+		: row;
+	if (elementIndex < 0 || elementIndex >= int(elements.size())) {
+		_activeColumns.clear();
+		_activeColumnsView = nullptr;
+		return _activeColumns;
+	}
+	const auto view = elements[elementIndex];
+	if (_activeColumnsView == view) {
+		return _activeColumns;
+	}
+	_activeColumnsView = view;
+	_activeColumns = HistoryView::ActiveMessageSubItems(
+		view,
+		view->data()->history());
+	return _activeColumns;
+}
+
+void ListWidget::setAccessibilityFocusedItem(
+		int index,
+		HistoryItem *item) {
+	if (_accessibilityFocusedIndex == index
+		&& _accessibilityFocusedItem == item) {
+		return;
+	}
+	_accessibilityFocusedIndex = index;
+	_accessibilityFocusedItem = item;
+	announceAccessibilityFocus(index);
+}
+
+void ListWidget::announceAccessibilityFocus(int index) {
+	if (index < 0) {
+		return;
+	}
+	accessibilityChildNameChanged(index);
+	accessibilityChildFocused(index);
+}
+
+void ListWidget::toggleMessageSelection() {
+	if (!hasSelectedItems() || _accessibilityFocusedIndex < 0) {
+		return;
+	}
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && _accessibilityFocusedIndex == barIndex) {
+		return;
+	}
+	const auto elements = accessibleElements();
+	const auto elementIndex = (barIndex >= 0
+		&& _accessibilityFocusedIndex > barIndex)
+		? (_accessibilityFocusedIndex - 1)
+		: _accessibilityFocusedIndex;
+	if (elementIndex < 0 || elementIndex >= int(elements.size())) {
+		return;
+	}
+	const auto view = elements[elementIndex];
+	const auto item = view->data();
+	clearTextSelection();
+	changeSelectionAsGroup(_selected, item, SelectAction::Invert);
+	repaintItem(view);
+	pushSelectedItems();
+	accessibilityChildStateChanged(
+		_accessibilityFocusedIndex,
+		{ .selected = true });
+	accessibilityChildNameChanged(_accessibilityFocusedIndex);
+}
+
+void ListWidget::playPauseFocusedMedia() {
+	if (_accessibilityFocusedIndex < 0) {
+		return;
+	}
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && _accessibilityFocusedIndex == barIndex) {
+		return;
+	}
+	const auto elements = accessibleElements();
+	const auto elementIndex = (barIndex >= 0
+		&& _accessibilityFocusedIndex > barIndex)
+		? (_accessibilityFocusedIndex - 1)
+		: _accessibilityFocusedIndex;
+	if (elementIndex < 0 || elementIndex >= int(elements.size())) {
+		return;
+	}
+	const auto item = elements[elementIndex]->data();
+	if (const auto media = item->media()) {
+		if (const auto document = media->document()) {
+			if (document->isVoiceMessage()
+				|| document->isSong()
+				|| document->isAudioFile()
+				|| document->isVideoMessage()) {
+				::Media::Player::instance()->playPause(
+					{ document, item->fullId() });
+			}
+		}
+	}
+}
+
+int ListWidget::accessibilityChildCount() const {
+	const auto barIndex = accessibilityUnreadBarIndex();
+	return int(accessibleElements().size()) + (barIndex >= 0 ? 1 : 0);
+}
+
+QString ListWidget::accessibilityChildName(int index) const {
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && index == barIndex) {
+		return _bar.element
+			? HistoryView::UnreadBarAccessibilityName(_bar.element)
+			: tr::lng_unread_bar_some(tr::now);
+	}
+	const auto elements = accessibleElements();
+	const auto elementIndex = (barIndex >= 0 && index > barIndex)
+		? (index - 1)
+		: index;
+	if (elementIndex < 0 || elementIndex >= int(elements.size())) {
+		return {};
+	}
+	const auto view = elements[elementIndex];
+	return HistoryView::MessageAccessibilityName(
+		view,
+		view->data()->history());
+}
+
+QAccessible::State ListWidget::accessibilityChildState(int index) const {
+	QAccessible::State state;
+	state.focusable = true;
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex < 0 || index != barIndex) {
+		state.selectable = true;
+		const auto elements = accessibleElements();
+		const auto elementIndex = (barIndex >= 0 && index > barIndex)
+			? (index - 1)
+			: index;
+		if (elementIndex >= 0
+			&& elementIndex < int(elements.size())) {
+			const auto item = elements[elementIndex]->data();
+			if (_selected.contains(item->fullId())) {
+				state.selected = true;
+			}
+		}
+	}
+	if (index == _accessibilityFocusedIndex) {
+		state.focused = true;
+		state.active = true;
+	}
+	return state;
+}
+
+QAccessible::Role ListWidget::accessibilityChildRole() const {
+	return QAccessible::Role::ListItem;
+}
+
+QRect ListWidget::accessibilityChildRect(int index) const {
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && index == barIndex) {
+		if (_bar.element) {
+			const auto top = itemTop(_bar.element);
+			if (top >= 0) {
+				return QRect(
+					0,
+					top,
+					width(),
+					HistoryView::UnreadBar::height());
+			}
+		}
+		return QRect();
+	}
+	const auto elements = accessibleElements();
+	const auto elementIndex = (barIndex >= 0 && index > barIndex)
+		? (index - 1)
+		: index;
+	if (elementIndex < 0 || elementIndex >= int(elements.size())) {
+		return QRect();
+	}
+	const auto view = elements[elementIndex];
+	const auto top = itemTop(view);
+	if (top < 0) {
+		return QRect();
+	}
+	// When the unread bar is anchored to a message, that message is
+	// exposed at index barIndex + 1 in index-space (the bar itself
+	// is at barIndex). In element-space the same message sits at
+	// elementIndex == barIndex, so we clip the message rect below
+	// the overlay drawn at the top of the element.
+	if (barIndex >= 0 && elementIndex == barIndex) {
+		const auto barHeight = HistoryView::UnreadBar::height();
+		return QRect(
+			0,
+			top + barHeight,
+			width(),
+			view->height() - barHeight);
+	}
+	return QRect(0, top, width(), view->height());
+}
+
+int ListWidget::accessibilityChildColumnCount(int row) const {
+	return computeActiveColumns(row).size();
+}
+
+QAccessible::Role ListWidget::accessibilityChildSubItemRole() const {
+	return QAccessible::Cell;
+}
+
+QString ListWidget::accessibilityChildSubItemName(
+		int row,
+		int column) const {
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && row == barIndex) {
+		return {};
+	}
+	const auto &active = computeActiveColumns(row);
+	if (column < 0 || column >= int(active.size())) {
+		return {};
+	}
+	return HistoryView::MessageSubItemLabel(active[column]);
+}
+
+QString ListWidget::accessibilityChildSubItemValue(
+		int row,
+		int column) const {
+	const auto barIndex = accessibilityUnreadBarIndex();
+	if (barIndex >= 0 && row == barIndex) {
+		return {};
+	}
+	const auto &active = computeActiveColumns(row);
+	if (column < 0 || column >= int(active.size())) {
+		return {};
+	}
+	const auto elements = accessibleElements();
+	const auto elementIndex = (barIndex >= 0 && row > barIndex)
+		? (row - 1)
+		: row;
+	if (elementIndex < 0 || elementIndex >= int(elements.size())) {
+		return {};
+	}
+	const auto view = elements[elementIndex];
+	return HistoryView::MessageSubItemValue(
+		view,
+		view->data()->history(),
+		active[column]);
+}
+
+void ListWidget::focusInEvent(QFocusEvent *e) {
+	RpWidget::focusInEvent(e);
+
+	InvokeQueued(this, [=] {
+		if (!hasFocus()) {
+			return;
+		}
+		const auto count = accessibilityChildCount();
+		if (count <= 0) {
+			return;
+		}
+		if (_accessibilityFocusedItem) {
+			const auto elements = accessibleElements();
+			const auto barIndex = accessibilityUnreadBarIndex();
+			auto found = -1;
+			for (auto i = 0, n = int(elements.size()); i < n; ++i) {
+				if (elements[i]->data().get()
+					== _accessibilityFocusedItem) {
+					found = (barIndex >= 0 && i >= barIndex)
+						? (i + 1)
+						: i;
+					break;
+				}
+			}
+			if (found >= 0 && found < count) {
+				_accessibilityFocusedIndex = found;
+				announceAccessibilityFocus(found);
+				return;
+			}
+			// The cached focused item is no longer in the list (it
+			// was removed since we last had focus). Clear the cache
+			// in-place and fall through to the index-still-valid /
+			// auto-select branches below — those will pick a new
+			// focus target and emit the announcement.
+			_accessibilityFocusedItem = nullptr;
+		}
+		if (_accessibilityFocusedIndex >= 0
+			&& _accessibilityFocusedIndex < count) {
+			announceAccessibilityFocus(_accessibilityFocusedIndex);
+			return;
+		}
+		const auto barIndex = accessibilityUnreadBarIndex();
+		const auto index = (barIndex >= 0 && barIndex + 1 < count)
+			? (barIndex + 1)
+			: (count - 1);
+		const auto elements = accessibleElements();
+		const auto elementIndex = (barIndex >= 0
+			&& index > barIndex)
+			? (index - 1)
+			: index;
+		const auto item = (elementIndex >= 0
+			&& elementIndex < int(elements.size()))
+			? elements[elementIndex]->data().get()
+			: nullptr;
+		setAccessibilityFocusedItem(index, item);
+	});
 }
 
 void ConfirmDeleteSelectedItems(not_null<ListWidget*> widget) {
@@ -4218,18 +5377,34 @@ void ConfirmDeleteSelectedItems(not_null<ListWidget*> widget) {
 	if (items.empty()) {
 		return;
 	}
+	const auto controller = widget->controller();
+	const auto owner = &controller->session().data();
+	auto historyItems = std::vector<not_null<HistoryItem*>>();
+	historyItems.reserve(items.size());
 	for (const auto &item : items) {
 		if (!item.canDelete) {
 			return;
+		} else if (const auto i = owner->message(item.msgId)) {
+			historyItems.push_back(i);
 		}
 	}
-	auto box = Box<DeleteMessagesBox>(
-		&widget->session(),
-		widget->getSelectedIds());
-	box->setDeleteConfirmedCallback(crl::guard(widget, [=] {
+	const auto confirmed = crl::guard(widget, [=] {
 		widget->cancelSelection();
-	}));
-	widget->controller()->show(std::move(box));
+	});
+	if (CanCreateModerateMessagesBox(historyItems)) {
+		const auto opt = DefaultModerateMessagesBoxOptions();
+		controller->show(Box(
+			CreateModerateMessagesBox,
+			ModerateMessagesBoxEntry{ .items = historyItems },
+			confirmed,
+			opt));
+	} else {
+		auto box = Box<DeleteMessagesBox>(
+			&widget->session(),
+			widget->getSelectedIds());
+		box->setDeleteConfirmedCallback(confirmed);
+		controller->show(std::move(box));
+	}
 }
 
 void ConfirmForwardSelectedItems(not_null<ListWidget*> widget) {
@@ -4243,9 +5418,9 @@ void ConfirmForwardSelectedItems(not_null<ListWidget*> widget) {
 		}
 	}
 	auto ids = widget->getSelectedIds();
-	const auto weak = Ui::MakeWeak(widget);
+	const auto weak = base::make_weak(widget);
 	Window::ShowForwardMessagesBox(widget->controller(), std::move(ids), [=] {
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->cancelSelection();
 		}
 	});
@@ -4274,8 +5449,8 @@ void ConfirmSendNowSelectedItems(not_null<ListWidget*> widget) {
 	if (!history) {
 		return;
 	}
-	const auto clearSelection = [weak = Ui::MakeWeak(widget)] {
-		if (const auto strong = weak.data()) {
+	const auto clearSelection = [weak = base::make_weak(widget)] {
+		if (const auto strong = weak.get()) {
 			strong->cancelSelection();
 		}
 	};
@@ -4291,6 +5466,8 @@ CopyRestrictionType CopyRestrictionTypeFor(
 		HistoryItem *item) {
 	return (peer->allowsForwarding() && (!item || !item->forbidsForward()))
 		? CopyRestrictionType::None
+		: peer->isUser()
+		? CopyRestrictionType::User
 		: peer->isBroadcast()
 		? CopyRestrictionType::Channel
 		: CopyRestrictionType::Group;
@@ -4305,6 +5482,8 @@ CopyRestrictionType CopyMediaRestrictionTypeFor(
 	}
 	return !item->forbidsSaving()
 		? CopyRestrictionType::None
+		: peer->isUser()
+		? CopyRestrictionType::User
 		: peer->isBroadcast()
 		? CopyRestrictionType::Channel
 		: CopyRestrictionType::Group;
@@ -4321,7 +5500,7 @@ CopyRestrictionType SelectRestrictionTypeFor(
 			? CopyRestrictionType::None
 			: CopyRestrictionTypeFor(peer);
 	}
-	return CopyRestrictionType::None;
+	return CopyRestrictionTypeFor(peer);
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index 02ec9a370ba07f..5d0aac2c7cc963 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -10,11 +10,16 @@ For license and copyright information please follow this link:
 #include "base/timer.h"
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
+#include "ui/effects/thanos_effect_controller.h"
 #include "ui/dragging_scroll_manager.h"
+#include "ui/widgets/middle_click_autoscroll.h"
 #include "ui/widgets/tooltip.h"
 #include "mtproto/sender.h"
 #include "data/data_messages.h"
 #include "history/view/history_view_element.h"
+#include "history/view/history_view_cursor_state.h"
+#include "history/view/history_view_keyboard_text_selection.h"
+#include "history/history_inner_widget_accessibility.h"
 #include "history/history_view_highlight_manager.h"
 #include "history/history_view_top_toast.h"
 
@@ -52,6 +57,11 @@ struct ChosenReaction;
 struct ButtonParameters;
 } // namespace HistoryView::Reactions
 
+namespace HistoryView::ReplyButton {
+class Manager;
+struct ButtonParameters;
+} // namespace HistoryView::ReplyButton
+
 namespace Window {
 struct SectionShow;
 } // namespace Window
@@ -60,8 +70,10 @@ namespace HistoryView {
 
 struct TextState;
 struct StateRequest;
+class ElementOverlayHost;
 class EmojiInteractions;
 class TranslateTracker;
+class ReadMetricsTracker;
 enum class CursorState : char;
 enum class PointState : char;
 enum class Context : char;
@@ -70,6 +82,7 @@ enum class CopyRestrictionType : char {
 	None,
 	Group,
 	Channel,
+	User,
 };
 
 struct SelectedItem {
@@ -80,6 +93,7 @@ struct SelectedItem {
 	bool canDelete = false;
 	bool canForward = false;
 	bool canSendNow = false;
+	bool canReschedule = false;
 };
 
 struct MessagesBar {
@@ -116,7 +130,8 @@ class ListDelegate {
 	virtual void listMarkContentsRead(
 		const base::flat_set<not_null<HistoryItem*>> &items) = 0;
 	virtual MessagesBarData listMessagesBar(
-		const std::vector<not_null<Element*>> &elements) = 0;
+		const std::vector<not_null<Element*>> &elements,
+		bool markLastAsRead) = 0;
 	virtual void listContentRefreshed() = 0;
 	virtual void listUpdateDateLink(
 		ClickHandlerPtr &link,
@@ -184,11 +199,15 @@ class ListDelegate {
 	virtual bool listShowReactPremiumError(
 		not_null<HistoryItem*> item,
 		const Data::ReactionId &id) = 0;
+	virtual base::unique_qptr<Ui::PopupMenu> listFillSenderUserpicMenu(
+		PeerId userpicPeerId) = 0;
 	virtual void listWindowSetInnerFocus() = 0;
 	virtual bool listAllowsDragForward() = 0;
 	virtual void listLaunchDrag(
 		std::unique_ptr<QMimeData> data,
 		Fn<void()> finished) = 0;
+	virtual Ui::ScrollArea *listScrollArea() const { return nullptr; }
+	virtual bool listThanosEffectEnabled() const { return true; }
 };
 
 class WindowListDelegate : public ListDelegate {
@@ -217,6 +236,8 @@ class WindowListDelegate : public ListDelegate {
 	bool listShowReactPremiumError(
 		not_null<HistoryItem*> item,
 		const Data::ReactionId &id) override;
+	base::unique_qptr<Ui::PopupMenu> listFillSenderUserpicMenu(
+		PeerId userpicPeerId) override;
 	void listWindowSetInnerFocus() override;
 	bool listAllowsDragForward() override;
 	void listLaunchDrag(
@@ -232,6 +253,7 @@ struct SelectionData {
 	bool canDelete = false;
 	bool canForward = false;
 	bool canSendNow = false;
+	bool canReschedule = false;
 };
 
 using SelectedMap = base::flat_map<
@@ -286,8 +308,6 @@ class ListWidget final
 		not_null<Main::Session*> session,
 		not_null<ListDelegate*> delegate);
 
-	static const crl::time kItemRevealDuration;
-
 	[[nodiscard]] Main::Session &session() const;
 	[[nodiscard]] not_null<Window::SessionController*> controller() const;
 	[[nodiscard]] not_null<ListDelegate*> delegate() const;
@@ -308,19 +328,21 @@ class ListWidget final
 	bool isBelowPosition(Data::MessagePosition position) const;
 	void highlightMessage(
 		FullMsgId itemId,
-		const TextWithEntities &part,
-		int partOffsetHint);
+		const MessageHighlightId &highlight);
 
 	void showAtPosition(
 		Data::MessagePosition position,
 		const Window::SectionShow &params,
 		Fn<void(bool found)> done = nullptr);
 	void refreshViewer();
+	void overrideInitialScroll(Fn<bool()> callback);
 
 	[[nodiscard]] TextForMimeData getSelectedText() const;
 	[[nodiscard]] MessageIdsList getSelectedIds() const;
 	[[nodiscard]] SelectedItems getSelectedItems() const;
-	[[nodiscard]] const TextSelection &getSelectedTextRange(
+	[[nodiscard]] TextSelection getSelectedTextRange(
+		not_null<HistoryItem*> item) const;
+	[[nodiscard]] MessageSelection getSelectedTextSelection(
 		not_null<HistoryItem*> item) const;
 	void cancelSelection();
 	void selectItem(not_null<HistoryItem*> item);
@@ -349,11 +371,20 @@ class ListWidget final
 	[[nodiscard]] bool showCopyRestrictionForSelected();
 	[[nodiscard]] bool hasSelectRestriction() const;
 	[[nodiscard]] Element *lookupItemByY(int y) const;
+	[[nodiscard]] not_null<HistoryItem*> lookupItemByPoint(
+		QPoint point,
+		not_null<Element*> view) const;
+	[[nodiscard]] bool canConsumeHorizontalScroll(
+		QPoint position,
+		int delta) const;
 
 	[[nodiscard]] std::pair<Element*, int> findViewForPinnedTracking(
 		int top) const;
 	[[nodiscard]] ClickHandlerContext prepareClickHandlerContext(
 		FullMsgId id);
+	[[nodiscard]] ClickContext prepareClickContext(
+		Qt::MouseButton button,
+		FullMsgId itemId);
 
 	// AbstractTooltipShower interface
 	QString tooltipText() const override;
@@ -374,12 +405,18 @@ class ListWidget final
 		bool forceAnotherChat = false);
 	[[nodiscard]] rpl::producer<FullMsgId> readMessageRequested() const;
 	[[nodiscard]] rpl::producer<FullMsgId> showMessageRequested() const;
+	void setInsertTextCallback(Fn<void(QString)> callback);
+	void insertTextAtCursor(const QString &text);
 	void replyNextMessage(FullMsgId fullId, bool next = true);
 
 	[[nodiscard]] Reactions::ButtonParameters reactionButtonParameters(
 		not_null<const Element*> view,
 		QPoint position,
 		const TextState &reactionState) const;
+	[[nodiscard]] ReplyButton::ButtonParameters replyButtonParameters(
+		not_null<const Element*> view,
+		QPoint position,
+		const TextState &replyState) const;
 	void toggleFavoriteReaction(not_null<Element*> view) const;
 
 
@@ -389,7 +426,7 @@ class ListWidget final
 	// ElementDelegate interface.
 	Context elementContext() override;
 	bool elementUnderCursor(not_null<const Element*> view) override;
-	SelectionModeResult elementInSelectionMode() override;
+	SelectionModeResult elementInSelectionMode(const Element *view) override;
 	bool elementIntersectsRange(
 		not_null<const Element*> view,
 		int from,
@@ -398,6 +435,13 @@ class ListWidget final
 	void elementShowPollResults(
 		not_null<PollData*> poll,
 		FullMsgId context) override;
+	void elementShowAddPollOption(
+		not_null<Element*> view,
+		not_null<PollData*> poll,
+		FullMsgId context,
+		QRect optionRect) override;
+	void elementSubmitAddPollOption(FullMsgId context) override;
+	void hideElementOverlay();
 	void elementOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) override;
@@ -405,10 +449,16 @@ class ListWidget final
 		not_null<DocumentData*> document,
 		FullMsgId context,
 		bool showInMediaView = false) override;
+	bool elementScrollToLocalY(
+		not_null<const Element*> view,
+		int localTop) override;
 	void elementCancelUpload(const FullMsgId &context) override;
 	void elementShowTooltip(
 		const TextWithEntities &text,
 		Fn<void()> hiddenCallback) override;
+	void elementShowHiddenSenderTooltip(
+		FullMsgId itemId,
+		const TextWithEntities &text) override;
 	bool elementAnimationsPaused() override;
 	bool elementHideReply(not_null<const Element*> view) override;
 	bool elementShownUnread(not_null<const Element*> view) override;
@@ -419,7 +469,7 @@ class ListWidget final
 		const QString &query,
 		const FullMsgId &context) override;
 	void elementHandleViaClick(not_null<UserData*> bot) override;
-	bool elementIsChatWide() override;
+	ElementChatMode elementChatMode() override;
 	not_null<Ui::PathShiftGradient*> elementPathShiftGradient() override;
 	void elementReplyTo(const FullReplyTo &to) override;
 	void elementStartInteraction(not_null<const Element*> view) override;
@@ -433,8 +483,29 @@ class ListWidget final
 	QString elementAuthorRank(not_null<const Element*> view) override;
 	bool elementHideTopicButton(not_null<const Element*> view) override;
 
+	void setCollapseGaps(std::vector<Ui::CollapseGap> gaps);
+
 	void setEmptyInfoWidget(base::unique_qptr<Ui::RpWidget> &&w);
-	void overrideIsChatWide(bool isWide);
+	void overrideChatMode(std::optional<ElementChatMode> mode);
+
+	// Accessibility.
+	QAccessible::Role accessibilityRole() override {
+		return QAccessible::Role::List;
+	}
+	Qt::FocusPolicy accessibilityFocusPolicy() override {
+		return Qt::TabFocus;
+	}
+	int accessibilityChildCount() const override;
+	QString accessibilityChildName(int index) const override;
+	QAccessible::State accessibilityChildState(int index) const override;
+	QAccessible::Role accessibilityChildRole() const override;
+	QRect accessibilityChildRect(int index) const override;
+	int accessibilityChildColumnCount(int row) const override;
+	QAccessible::Role accessibilityChildSubItemRole() const override;
+	QString accessibilityChildSubItemName(
+		int row, int column) const override;
+	QString accessibilityChildSubItemValue(
+		int row, int column) const override;
 
 	~ListWidget();
 
@@ -446,6 +517,7 @@ class ListWidget final
 	bool eventHook(QEvent *e) override; // calls touchEvent when necessary
 	void touchEvent(QTouchEvent *e);
 	void paintEvent(QPaintEvent *e) override;
+	void focusInEvent(QFocusEvent *e) override;
 	void keyPressEvent(QKeyEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
@@ -471,6 +543,15 @@ class ListWidget final
 		not_null<HistoryItem*>,
 		std::unique_ptr<Element>>;
 
+	[[nodiscard]] std::vector<Element*> accessibleElements() const;
+	[[nodiscard]] int accessibilityUnreadBarIndex() const;
+	void toggleMessageSelection();
+	void playPauseFocusedMedia();
+	void setAccessibilityFocusedItem(int index, HistoryItem *item);
+	void announceAccessibilityFocus(int index);
+	[[nodiscard]] auto computeActiveColumns(int row) const
+		-> const std::vector<HistoryView::MessageSubItem> &;
+
 	struct MouseState {
 		MouseState();
 		MouseState(
@@ -524,6 +605,8 @@ class ListWidget final
 
 	void onTouchSelect();
 	void onTouchScrollTimer();
+	void markReadMetricsStale();
+	void registerReadMetricsActivity();
 
 	void updateAroundPositionFromNearest(int nearestIndex);
 	void refreshRows(const Data::MessagesSlice &old);
@@ -563,8 +646,11 @@ class ListWidget final
 	int itemTop(not_null<const Element*> view) const;
 	void repaintItem(FullMsgId itemId);
 	void repaintItem(const Element *view);
+	void repaintItem(const Element *view, QRect rect);
 	void resizeItem(not_null<Element*> view);
 	void refreshItem(not_null<const Element*> view);
+	void viewHeightAdjusted(not_null<Element*> view);
+	void showItemHighlight(not_null<HistoryItem*> item);
 	void itemRemoved(not_null<const HistoryItem*> item);
 	QPoint mapPointToItem(QPoint point, const Element *view) const;
 
@@ -580,7 +666,6 @@ class ListWidget final
 	[[nodiscard]] Element *strictFindItemByY(int y) const;
 	[[nodiscard]] int findNearestItem(Data::MessagePosition position) const;
 	void viewReplaced(not_null<const Element*> was, Element *now);
-	[[nodiscard]] HistoryItemsList collectVisibleItems() const;
 
 	void checkMoveToOtherViewer();
 	void updateVisibleTopItem();
@@ -596,6 +681,7 @@ class ListWidget final
 	void scrollDateCheck();
 	void scrollDateHideByTimer();
 	void keepScrollDateForNow();
+	void scrollDateCheckDownward();
 
 	void computeScrollTo(
 		int to,
@@ -628,7 +714,7 @@ class ListWidget final
 	void clearSelected();
 	void setTextSelection(
 		not_null<Element*> view,
-		TextSelection selection);
+		MessageSelection selection);
 	int itemMinimalHeight() const;
 
 	bool isGoodForSelection(
@@ -664,7 +750,9 @@ class ListWidget final
 		not_null<HistoryItem*> exactItem,
 		const MouseState &state) const;
 	bool requiredToStartDragging(not_null<Element*> view) const;
-	bool isPressInSelectedText(TextState state) const;
+	bool isPressInSelectedText(
+		not_null<const Element*> view,
+		TextState state) const;
 	void updateDragSelection();
 	void updateDragSelection(
 		const Element *fromView,
@@ -680,12 +768,17 @@ class ListWidget final
 	void clearDragSelection();
 	void applyDragSelection();
 	void applyDragSelection(SelectedMap &applyTo) const;
-	TextSelection itemRenderSelection(
+	struct RenderSelectionState {
+		TextSelection selection;
+		bool fullMessageSelected = false;
+		const MessageSelection *messageSelection = nullptr;
+	};
+	[[nodiscard]] RenderSelectionState itemRenderSelection(
 		not_null<const Element*> view) const;
-	TextSelection computeRenderSelection(
+	[[nodiscard]] RenderSelectionState computeRenderSelection(
 		not_null<const SelectedMap*> selected,
 		not_null<const Element*> view) const;
-	void checkUnreadBarCreation();
+	void checkUnreadBarCreation(bool markLastAsRead = false);
 	void applyUpdatedScrollState();
 	void scrollToAnimationCallback(FullMsgId attachToId, int relativeTo);
 	void startItemRevealAnimations();
@@ -757,6 +850,7 @@ class ListWidget final
 		not_null<Element*>,
 		ItemRevealAnimation> _itemRevealAnimations;
 	int _itemsRevealHeight = 0;
+	std::vector<Ui::CollapseGap> _collapseGaps;
 	base::flat_set<FullMsgId> _animatedStickersPlayed;
 	base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> _userpics;
 	base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> _userpicsCache;
@@ -769,9 +863,14 @@ class ListWidget final
 
 	std::unique_ptr<HistoryView::Reactions::Manager> _reactionsManager;
 	rpl::variable<HistoryItem*> _reactionsItem;
+	bool _useCornerReply = false;
 	bool _useCornerReaction = false;
 
+	std::unique_ptr<ReplyButton::Manager> _replyButtonManager;
+
 	std::unique_ptr<TranslateTracker> _translateTracker;
+	std::unique_ptr<ReadMetricsTracker> _readMetricsTracker;
+	bool _readMetricsStale = false;
 
 	int _minHeight = 0;
 	int _visibleTop = 0;
@@ -789,6 +888,7 @@ class ListWidget final
 	base::Timer _scrollDateHideTimer;
 	Element *_scrollDateLastItem = nullptr;
 	int _scrollDateLastItemTop = 0;
+	bool _scrollDateAfterDayCrossing = false;
 	ClickHandlerPtr _scrollDateLink;
 	SingleQueuedInvokation _applyUpdatedScrollState;
 
@@ -804,13 +904,16 @@ class ListWidget final
 	HistoryItem *_overItemExact = nullptr;
 	HistoryItem *_pressItemExact = nullptr;
 	CursorState _mouseCursorState = CursorState();
-	uint16 _mouseTextSymbol = 0;
+	TextState _mouseTextAnchor;
 	bool _pressWasInactive = false;
+	bool _overSenderUserpic = false;
+	bool _mouseActive = false;
 
 	bool _selectEnabled = false;
 	HistoryItem *_selectedTextItem = nullptr;
-	TextSelection _selectedTextRange;
+	MessageSelection _selectedTextSelection;
 	TextForMimeData _selectedText;
+	KeyboardTextSelection _keyboardTextSelection;
 	SelectedMap _selected;
 	base::flat_set<FullMsgId> _dragSelected;
 	DragSelectAction _dragSelectAction = DragSelectAction::None;
@@ -823,7 +926,12 @@ class ListWidget final
 	bool _refreshingViewer = false;
 	bool _showFinished = false;
 	bool _resizePending = false;
-	std::optional<bool> _overrideIsChatWide;
+	std::optional<ElementChatMode> _overrideChatMode;
+
+	int _accessibilityFocusedIndex = -1;
+	HistoryItem *_accessibilityFocusedItem = nullptr;
+	mutable const HistoryView::Element *_activeColumnsView = nullptr;
+	mutable std::vector<HistoryView::MessageSubItem> _activeColumns;
 
 	// _menu must be destroyed before _whoReactedMenuLifetime.
 	rpl::lifetime _whoReactedMenuLifetime;
@@ -848,6 +956,7 @@ class ListWidget final
 	Ui::DraggingScrollManager _selectScroll;
 
 	InfoTooltip _topToast;
+	AnchoredTooltip _hiddenSenderTooltip;
 
 	Ui::TouchScrollState _touchScrollState = Ui::TouchScrollState();
 	bool _touchPrevPosValid = false;
@@ -857,13 +966,21 @@ class ListWidget final
 	crl::time _touchAccelerationTime = 0;
 	crl::time _touchTime = 0;
 	base::Timer _touchScrollTimer;
+	Ui::MiddleClickAutoscroll _middleClickAutoscroll;
 
 	rpl::event_stream<FullMsgId> _requestedToEditMessage;
 	rpl::event_stream<ReplyToMessageRequest> _requestedToReplyToMessage;
 	rpl::event_stream<FullMsgId> _requestedToReadMessage;
 	rpl::event_stream<FullMsgId> _requestedToShowMessage;
+	Fn<void(QString)> _insertTextCallback;
 	rpl::event_stream<not_null<QKeyEvent*>> _scrollKeyEvents;
 
+	[[nodiscard]] ElementOverlayHost &ensureOverlayHost();
+	std::unique_ptr<ElementOverlayHost> _overlayHost;
+
+	void setupThanosEffect();
+	std::unique_ptr<Ui::ThanosEffectController> _thanosController;
+
 	rpl::lifetime _viewerLifetime;
 
 };
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index c57dc284812892..2f18ce34ef3d3b 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -7,38 +7,54 @@ For license and copyright information please follow this link:
 */
 #include "history/view/history_view_message.h"
 
+#include "api/api_suggest_post.h"
+#include "api/api_transcribes.h"
+#include "base/options.h"
+#include "base/qt/qt_key_modifiers.h"
+#include "base/unixtime.h"
+#include "core/application.h"
 #include "core/click_handler_types.h" // ClickHandlerContext
 #include "core/ui_integration.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/history_item_components.h"
 #include "history/history_item_helpers.h"
+#include "history/view/media/history_view_media_generic.h"
 #include "history/view/media/history_view_web_page.h"
+#include "history/view/media/history_view_suggest_decision.h"
 #include "history/view/reactions/history_view_reactions.h"
 #include "history/view/reactions/history_view_reactions_button.h"
+#include "history/view/history_view_reply_button.h"
 #include "history/view/history_view_group_call_bar.h" // UserpicInRow.
 #include "history/view/history_view_reply.h"
+#include "history/view/history_view_transcribe_button.h"
+#include "history/view/history_view_summary_header.h"
 #include "history/view/history_view_view_button.h" // ViewButton.
 #include "history/history.h"
+#include "iv/iv_instance.h"
+#include "iv/iv_rich_page.h"
 #include "boxes/premium_preview_box.h"
 #include "boxes/share_box.h"
-#include "ui/effects/glare.h"
+#include "boxes/peers/tag_info_box.h"
 #include "ui/effects/reaction_fly_animation.h"
-#include "ui/rect.h"
-#include "ui/round_rect.h"
+#include "ui/effects/ripple_animation.h"
 #include "ui/text/text_utilities.h"
+#include "ui/text/text_custom_emoji.h"
 #include "ui/text/text_extended_data.h"
 #include "ui/power_saving.h"
+#include "ui/rect.h"
+//#include "ui/round_rect.h"
 #include "data/components/factchecks.h"
 #include "data/components/sponsored_messages.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "data/data_chat.h"
 #include "data/data_channel.h"
 #include "data/data_forum_topic.h"
 #include "data/data_message_reactions.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "main/main_session.h"
-#include "payments/payments_reaction_process.h" // TryAddingPaidReaction.
+#include "settings/sections/settings_premium.h"
 #include "ui/text/text_options.h"
 #include "ui/painter.h"
 #include "window/themes/window_theme.h" // IsNightMode.
@@ -47,304 +63,326 @@ For license and copyright information please follow this link:
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_dialogs.h"
+#include "styles/style_iv.h"
+#include "styles/style_polls.h"
 
 namespace HistoryView {
 namespace {
 
+base::options::toggle UnlimitedMessageWidth({
+	.id = kOptionUnlimitedMessageWidth,
+	.name = "Unlimited message width",
+	.description = "Allow text-only message bubbles "
+		"to expand beyond the default maximum width.",
+	.restartRequired = true,
+});
+
 constexpr auto kPlayStatusLimit = 2;
+constexpr auto kMaxWidth = (1 << 16) - 1;
+constexpr auto kMaxNiceToReadLines = 6;
 const auto kPsaTooltipPrefix = "cloud_lng_tooltip_psa_";
+constexpr auto kFullLineAppearDuration = crl::time(300);
+constexpr auto kFullLineAppearFinalDuration = crl::time(120);
+constexpr auto kLineHeightAppearDuration = crl::time(100);
+constexpr auto kLineHeightAppearFinalDuration = crl::time(60);
+constexpr auto kMinWidthAppearDuration = crl::time(160);
+
+[[nodiscard]] int RevealLineRight(const Ui::Text::LineLayoutInfo &line) {
+	return line.left + line.width;
+}
+
+using PreparedLink = Iv::Markdown::PreparedLink;
+using PreparedLinkKind = Iv::Markdown::PreparedLinkKind;
+using MediaActivation = Iv::Markdown::MediaActivation;
+using MediaActivationKind = Iv::Markdown::MediaActivationKind;
+using MarkdownArticleSelection = Iv::Markdown::MarkdownArticleSelection;
+using MarkdownArticleSelectionEndpoint = Iv::Markdown::MarkdownArticleSelectionEndpoint;
+using MarkdownArticleSelectionEndpoints = Iv::Markdown::MarkdownArticleSelectionEndpoints;
+
+[[nodiscard]] auto FlatSelectionEndpointFromState(const TextState &state)
+-> MessageSelectionFlatEndpoint {
+	return state.selectionCursor.isFlat()
+		? state.selectionCursor.flat
+		: MessageSelectionFlatEndpoint{
+			.symbol = state.symbol,
+			.afterSymbol = state.afterSymbol,
+		};
+}
 
-[[nodiscard]] Window::SessionController *ExtractController(
-		const ClickContext &context) {
-	const auto my = context.other.value<ClickHandlerContext>();
-	if (const auto controller = my.sessionWindow.get()) {
-		return controller;
+void SetRichPageSelectionCursor(
+		not_null<TextState*> state,
+		int segment,
+		int offset,
+		bool direct) {
+	state->selectionCursor = MessageSelectionEndpoint::RichPage(
+		{
+			.segment = segment,
+			.offset = offset,
+		},
+		MarkdownArticleSelectionEndpoint{
+			.segment = segment,
+			.direct = direct,
+		});
+}
+
+[[nodiscard]] QString OpenableTargetForPreparedLink(const PreparedLink &link) {
+	return link.fragment.isEmpty()
+		? link.target
+		: (link.target + u"#"_q + link.fragment);
+}
+
+[[nodiscard]] std::optional<EntityLinkData> ExternalEntityLinkData(
+		const PreparedLink &link) {
+	if (link.kind != PreparedLinkKind::External || link.target.isEmpty()) {
+		return std::nullopt;
+	}
+	switch (link.entityType) {
+	case EntityType::Url:
+	case EntityType::CustomUrl:
+	case EntityType::Email:
+		return EntityLinkData{
+			.text = !link.copyText.isEmpty() ? link.copyText : link.target,
+			.data = link.target,
+			.type = link.entityType,
+			.shown = link.shown,
+		};
+	default:
+		return std::nullopt;
 	}
-	return nullptr;
 }
 
-class KeyboardStyle : public ReplyKeyboard::Style {
-public:
-	KeyboardStyle(const style::BotKeyboardButton &st);
-
-	Images::CornersMaskRef buttonRounding(
-		Ui::BubbleRounding outer,
-		RectParts sides) const override;
-
-	void startPaint(
-		QPainter &p,
-		const Ui::ChatStyle *st) const override;
-	const style::TextStyle &textStyle() const override;
-	void repaint(not_null<const HistoryItem*> item) const override;
-
-protected:
-	void paintButtonBg(
-		QPainter &p,
-		const Ui::ChatStyle *st,
-		const QRect &rect,
-		Ui::BubbleRounding rounding,
-		float64 howMuchOver) const override;
-	void paintButtonIcon(
-		QPainter &p,
-		const Ui::ChatStyle *st,
-		const QRect &rect,
-		int outerWidth,
-		HistoryMessageMarkupButton::Type type) const override;
-	void paintButtonLoading(
-		QPainter &p,
-		const Ui::ChatStyle *st,
-		const QRect &rect,
-		int outerWidth,
-		Ui::BubbleRounding rounding) const override;
-	int minButtonWidth(HistoryMessageMarkupButton::Type type) const override;
-
-private:
-	using BubbleRoundingKey = uchar;
-	mutable base::flat_map<BubbleRoundingKey, QImage> _cachedBg;
-	mutable base::flat_map<BubbleRoundingKey, QPainterPath> _cachedOutline;
-	mutable std::unique_ptr<Ui::GlareEffect> _glare;
-	rpl::lifetime _lifetime;
-
-};
-
-KeyboardStyle::KeyboardStyle(const style::BotKeyboardButton &st)
-: ReplyKeyboard::Style(st) {
-	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
-		_cachedBg = {};
-		_cachedOutline = {};
-	}, _lifetime);
+[[nodiscard]] ClickHandler::TextEntity TextEntityForPreparedLink(
+		const PreparedLink &link) {
+	if (const auto external = ExternalEntityLinkData(link)) {
+		return {
+			.type = external->type,
+			.data = external->data,
+		};
+	}
+	return {};
 }
 
-void KeyboardStyle::startPaint(
-		QPainter &p,
-		const Ui::ChatStyle *st) const {
-	Expects(st != nullptr);
+[[nodiscard]] QString CopyTextForPreparedLink(const PreparedLink &link) {
+	if (const auto external = ExternalEntityLinkData(link)) {
+		return external->text;
+	}
+	switch (link.kind) {
+	case PreparedLinkKind::Anchor:
+	case PreparedLinkKind::FootnoteBacklink:
+		return link.target.isEmpty() ? QString() : (u"#"_q + link.target);
+	case PreparedLinkKind::Footnote:
+		return !link.copyText.isEmpty() ? link.copyText : link.target;
+	case PreparedLinkKind::LocalFile:
+	case PreparedLinkKind::InstantViewPage:
+		return OpenableTargetForPreparedLink(link);
+	case PreparedLinkKind::External:
+		return link.target;
+	case PreparedLinkKind::RejectedRelative:
+	case PreparedLinkKind::ToggleDetails:
+		return QString();
+	}
+	return QString();
+}
+
+[[nodiscard]] QString CopyLabelForPreparedLink(const PreparedLink &link) {
+	if (const auto external = ExternalEntityLinkData(link)) {
+		return (external->type == EntityType::Email)
+			? Ui::Integration::Instance().phraseContextCopyEmail()
+			: Ui::Integration::Instance().phraseContextCopyLink();
+	}
+	switch (link.kind) {
+	case PreparedLinkKind::RejectedRelative:
+	case PreparedLinkKind::ToggleDetails:
+		return QString();
+	case PreparedLinkKind::External:
+	case PreparedLinkKind::InstantViewPage:
+	case PreparedLinkKind::Anchor:
+	case PreparedLinkKind::Footnote:
+	case PreparedLinkKind::FootnoteBacklink:
+	case PreparedLinkKind::LocalFile:
+		return tr::lng_context_copy_link(tr::now);
+	}
+	return QString();
+}
+
+void CopyRichPageCodeBlockText(TextForMimeData text, ClickContext context) {
+	if (context.button != Qt::LeftButton || text.empty()) {
+		return;
+	} else if (!text.rich.text.endsWith('\n')) {
+		text.rich.text.append('\n');
+	}
+	if (!text.expanded.endsWith('\n')) {
+		text.expanded.append('\n');
+	}
+	if (Ui::Integration::Instance().copyPreOnClick(context.other)) {
+		TextUtilities::SetClipboardText(std::move(text));
+	}
+}
+
+[[nodiscard]] bool SamePreparedLink(
+		const std::optional<PreparedLink> &a,
+		const std::optional<PreparedLink> &b) {
+	if (!a || !b) {
+		return !a && !b;
+	}
+	return (a->index == b->index)
+		&& (a->kind == b->kind)
+		&& (a->target == b->target)
+		&& (a->fragment == b->fragment)
+		&& (a->copyText == b->copyText)
+		&& (a->entityType == b->entityType)
+		&& (a->shown == b->shown)
+		&& (a->webpageId == b->webpageId);
+}
+
+[[nodiscard]] bool SameEmbedRequest(
+		const Iv::Markdown::EmbedRequest &a,
+		const Iv::Markdown::EmbedRequest &b) {
+	return (a.html == b.html)
+		&& (a.url == b.url)
+		&& (a.width == b.width)
+		&& (a.height == b.height)
+		&& (a.fullWidth == b.fullWidth)
+		&& (a.fixedHeight == b.fixedHeight)
+		&& (a.allowScrolling == b.allowScrolling);
+}
+
+[[nodiscard]] bool SameMediaActivation(
+		const MediaActivation &a,
+		const MediaActivation &b) {
+	return (a.kind == b.kind)
+		&& (a.url == b.url)
+		&& SameEmbedRequest(a.embed, b.embed)
+		&& (a.placeholderId.value == b.placeholderId.value)
+		&& (a.photo.get() == b.photo.get())
+		&& (a.document.get() == b.document.get())
+		&& (a.channel.get() == b.channel.get());
+}
+
+class RichPageActionClickHandler final : public ClickHandler {
+public:
+	RichPageActionClickHandler(
+		Fn<void(ClickContext)> callback,
+		std::optional<PreparedLink> link = std::nullopt)
+	: _callback(std::move(callback))
+	, _link(std::move(link)) {
+	}
 
-	p.setPen(st->msgServiceFg());
-}
+	void onClick(ClickContext context) const override {
+		if (_callback) {
+			_callback(std::move(context));
+		}
+	}
 
-const style::TextStyle &KeyboardStyle::textStyle() const {
-	return st::serviceTextStyle;
-}
+	QString url() const override {
+		return _link ? _link->target : QString();
+	}
 
-void KeyboardStyle::repaint(not_null<const HistoryItem*> item) const {
-	item->history()->owner().requestItemRepaint(item);
-	if (_glare && !_glare->glare.birthTime) {
-		constexpr auto kTimeout = crl::time(0);
-		constexpr auto kDuration = crl::time(1100);
-		_glare->validate(
-			st::premiumButtonFg->c,
-			[=] { repaint(item); },
-			kTimeout,
-			kDuration);
+	QString copyToClipboardText() const override {
+		return _link ? CopyTextForPreparedLink(*_link) : QString();
 	}
-}
 
-Images::CornersMaskRef KeyboardStyle::buttonRounding(
-		Ui::BubbleRounding outer,
-		RectParts sides) const {
-	using namespace Images;
-	using namespace Ui;
-	using Radius = CachedCornerRadius;
-	using Corner = BubbleCornerRounding;
-	auto result = CornersMaskRef(CachedCornersMasks(Radius::BubbleSmall));
-	if (sides & RectPart::Bottom) {
-		const auto &large = CachedCornersMasks(Radius::BubbleLarge);
-		auto round = [&](RectPart side, int index) {
-			if ((sides & side) && (outer[index] == Corner::Large)) {
-				result.p[index] = &large[index];
-			}
-		};
-		round(RectPart::Left, kBottomLeft);
-		round(RectPart::Right, kBottomRight);
+	QString copyToClipboardContextItemText() const override {
+		return _link ? CopyLabelForPreparedLink(*_link) : QString();
 	}
-	return result;
-}
 
-void KeyboardStyle::paintButtonBg(
-		QPainter &p,
-		const Ui::ChatStyle *st,
-		const QRect &rect,
-		Ui::BubbleRounding rounding,
-		float64 howMuchOver) const {
-	Expects(st != nullptr);
+	TextEntity getTextEntity() const override {
+		return _link ? TextEntityForPreparedLink(*_link) : TextEntity();
+	}
 
-	using Corner = Ui::BubbleCornerRounding;
-	auto &cachedBg = _cachedBg[rounding.key()];
+private:
+	const Fn<void(ClickContext)> _callback;
+	const std::optional<PreparedLink> _link;
+};
 
-	if (cachedBg.isNull()
-		|| cachedBg.width() != (rect.width() * style::DevicePixelRatio())) {
-		cachedBg = QImage(
-			rect.size() * style::DevicePixelRatio(),
+void ApplyRevealGradient(
+		not_null<const TextAppearing*> appearing,
+		QImage &cache,
+		int availableWidth) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto maskWidth = int(st::textRevealGradient) * ratio;
+	if (appearing->gradientMask.width() != maskWidth) {
+		auto mask = QImage(
+			QSize(maskWidth, 1),
 			QImage::Format_ARGB32_Premultiplied);
-		cachedBg.setDevicePixelRatio(style::DevicePixelRatio());
-		cachedBg.fill(Qt::transparent);
+		mask.setDevicePixelRatio(ratio);
+		mask.fill(Qt::transparent);
 		{
-			auto painter = QPainter(&cachedBg);
-
-			const auto sti = &st->imageStyle(false);
-			const auto &small = sti->msgServiceBgCornersSmall;
-			const auto &large = sti->msgServiceBgCornersLarge;
-			auto corners = Ui::CornersPixmaps();
-			int radiuses[4];
-			for (auto i = 0; i != 4; ++i) {
-				const auto isLarge = (rounding[i] == Corner::Large);
-				corners.p[i] = (isLarge ? large : small).p[i];
-				radiuses[i] = Ui::CachedCornerRadiusValue(isLarge
-					? Ui::CachedCornerRadius::BubbleLarge
-					: Ui::CachedCornerRadius::BubbleSmall);
-			}
-			const auto r = Rect(rect.size());
-			_cachedOutline[rounding.key()] = Ui::ComplexRoundedRectPath(
-				r - Margins(st::lineWidth),
-				radiuses[0],
-				radiuses[1],
-				radiuses[2],
-				radiuses[3]);
-			Ui::FillRoundRect(painter, r, sti->msgServiceBg, corners);
-		}
-	}
-	p.drawImage(rect.topLeft(), cachedBg);
-	if (howMuchOver > 0) {
-		auto o = p.opacity();
-		p.setOpacity(o * howMuchOver);
-		const auto &small = st->msgBotKbOverBgAddCornersSmall();
-		const auto &large = st->msgBotKbOverBgAddCornersLarge();
-		auto over = Ui::CornersPixmaps();
-		for (auto i = 0; i != 4; ++i) {
-			over.p[i] = (rounding[i] == Corner::Large ? large : small).p[i];
-		}
-		Ui::FillRoundRect(p, rect, st->msgBotKbOverBgAdd(), over);
-		p.setOpacity(o);
-	}
-}
-
-void KeyboardStyle::paintButtonIcon(
-		QPainter &p,
-		const Ui::ChatStyle *st,
-		const QRect &rect,
-		int outerWidth,
-		HistoryMessageMarkupButton::Type type) const {
-	Expects(st != nullptr);
-
-	using Type = HistoryMessageMarkupButton::Type;
-	const auto icon = [&]() -> const style::icon* {
-		switch (type) {
-		case Type::Url:
-		case Type::Auth: return &st->msgBotKbUrlIcon();
-		case Type::Buy: return &st->msgBotKbPaymentIcon();
-		case Type::SwitchInlineSame:
-		case Type::SwitchInline: return &st->msgBotKbSwitchPmIcon();
-		case Type::WebView:
-		case Type::SimpleWebView: return &st->msgBotKbWebviewIcon();
-		case Type::CopyText: return &st->msgBotKbCopyIcon();
-		}
-		return nullptr;
-	}();
-	if (icon) {
-		icon->paint(p, rect.x() + rect.width() - icon->width() - st::msgBotKbIconPadding, rect.y() + st::msgBotKbIconPadding, outerWidth);
+			const auto logicalWidth = int(st::textRevealGradient);
+			auto p = QPainter(&mask);
+			auto gradient = QLinearGradient(0, 0, logicalWidth, 0);
+			gradient.setStops({
+				{ 0., QColor(255, 255, 255, 255) },
+				{ 1., QColor(255, 255, 255, 0) },
+			});
+			p.fillRect(0, 0, logicalWidth, 1, gradient);
+		}
+		appearing->gradientMask = std::move(mask);
+	}
+
+	const auto cacheW = int(cache.width() / cache.devicePixelRatio());
+	const auto cacheH = int(cache.height() / cache.devicePixelRatio());
+	const auto revealedWidth = appearing->revealedLineWidth;
+	const auto gradientWidth = std::min(
+		int(st::textRevealGradient),
+		revealedWidth);
+	const auto lineRtl = appearing->lines[appearing->shownLine].rtl;
+
+	auto p = QPainter(&cache);
+	p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+	if (lineRtl) {
+		const auto clampedAvailableWidth = std::min(
+			std::max(availableWidth, 0),
+			cacheW);
+		const auto rightEdge = clampedAvailableWidth - revealedWidth;
+		p.fillRect(
+			QRect(0, 0, rightEdge, cacheH),
+			Qt::transparent);
+		p.save();
+		p.translate(rightEdge + gradientWidth, 0);
+		p.scale(-1, 1);
+		p.drawImage(
+			QRect(0, 0, gradientWidth, cacheH),
+			appearing->gradientMask);
+		p.restore();
+	} else {
+		p.fillRect(
+			QRect(revealedWidth, 0, cacheW - revealedWidth, cacheH),
+			Qt::transparent);
+		p.drawImage(
+			QRect(revealedWidth - gradientWidth, 0, gradientWidth, cacheH),
+			appearing->gradientMask);
 	}
 }
 
-void KeyboardStyle::paintButtonLoading(
-		QPainter &p,
-		const Ui::ChatStyle *st,
-		const QRect &rect,
-		int outerWidth,
-		Ui::BubbleRounding rounding) const {
-	Expects(st != nullptr);
-
-	if (anim::Disabled()) {
-		const auto &icon = st->historySendingInvertedIcon();
-		icon.paint(
-			p,
-			rect::right(rect) - icon.width() - st::msgBotKbIconPadding,
-			rect::bottom(rect) - icon.height() - st::msgBotKbIconPadding,
-			rect.x() * 2 + rect.width());
-		return;
-	}
-
-	const auto cacheKey = rounding.key();
-	auto &cachedBg = _cachedBg[cacheKey];
-	if (!cachedBg.isNull()) {
-		if (_glare && _glare->glare.birthTime) {
-			const auto progress = _glare->progress(crl::now());
-			const auto w = _glare->width;
-			const auto h = rect.height();
-			const auto x = (-w) + (w * 2) * progress;
-
-			auto frame = cachedBg;
-			frame.fill(Qt::transparent);
-			{
-				auto painter = QPainter(&frame);
-				auto hq = PainterHighQualityEnabler(painter);
-				painter.setPen(Qt::NoPen);
-				painter.drawTiledPixmap(x, 0, w, h, _glare->pixmap, 0, 0);
-
-				auto path = QPainterPath();
-				path.addRect(Rect(rect.size()));
-				path -= _cachedOutline[cacheKey];
-
-				constexpr auto kBgOutlineAlpha = 0.5;
-				constexpr auto kFgOutlineAlpha = 0.8;
-				const auto &c = st::premiumButtonFg->c;
-				painter.setPen(Qt::NoPen);
-				painter.setBrush(c);
-				painter.setOpacity(kBgOutlineAlpha);
-				painter.drawPath(path);
-				auto gradient = QLinearGradient(-w, 0, w * 2, 0);
-				{
-					constexpr auto kShiftLeft = 0.01;
-					constexpr auto kShiftRight = 0.99;
-					auto stops = _glare->computeGradient(c).stops();
-					stops[1] = {
-						std::clamp(progress, kShiftLeft, kShiftRight),
-						QColor(c.red(), c.green(), c.blue(), kFgOutlineAlpha),
-					};
-					gradient.setStops(std::move(stops));
-				}
-				painter.setBrush(QBrush(gradient));
-				painter.setOpacity(1);
-				painter.drawPath(path);
+struct SecondRightAction {
+	std::unique_ptr<Ui::RippleAnimation> ripple;
+	ClickHandlerPtr link;
+};
 
-				painter.setCompositionMode(
-					QPainter::CompositionMode_DestinationIn);
-				painter.drawImage(0, 0, cachedBg);
-			}
-			p.drawImage(rect.x(), rect.y(), frame);
-		} else {
-			_glare = std::make_unique<Ui::GlareEffect>();
-			_glare->width = outerWidth;
-		}
-	}
-}
+struct BadgePillGeometry {
+	int textWidth = 0;
+	int width = 0;
+	int height = 0;
+};
 
-int KeyboardStyle::minButtonWidth(
-		HistoryMessageMarkupButton::Type type) const {
-	using Type = HistoryMessageMarkupButton::Type;
-	int result = 2 * buttonPadding(), iconWidth = 0;
-	switch (type) {
-	case Type::Url:
-	case Type::Auth: iconWidth = st::msgBotKbUrlIcon.width(); break;
-	case Type::Buy: iconWidth = st::msgBotKbPaymentIcon.width(); break;
-	case Type::SwitchInlineSame:
-	case Type::SwitchInline: iconWidth = st::msgBotKbSwitchPmIcon.width(); break;
-	case Type::Callback:
-	case Type::CallbackWithPassword:
-	case Type::Game: iconWidth = st::historySendingInvertedIcon.width(); break;
-	case Type::WebView:
-	case Type::SimpleWebView: iconWidth = st::msgBotKbWebviewIcon.width(); break;
-	case Type::CopyText: return st::msgBotKbCopyIcon.width(); break;
-	}
-	if (iconWidth > 0) {
-		result = std::max(result, 2 * iconWidth + 4 * int(st::msgBotKbIconPadding));
+[[nodiscard]] bool IsRippleLink(const ClickHandlerPtr &handler) {
+	switch (handler->getTextEntity().type) {
+	case EntityType::Url:
+	case EntityType::CustomUrl:
+	case EntityType::Email:
+	case EntityType::Hashtag:
+	case EntityType::Cashtag:
+	case EntityType::Mention:
+	case EntityType::MentionName:
+	case EntityType::BotCommand:
+	case EntityType::Phone:
+	case EntityType::BankCard:
+	case EntityType::FormattedDate:
+		return true;
+	default:
+		return false;
 	}
-	return result;
-}
-
-QString FastReplyText() {
-	return tr::lng_fast_reply(tr::now);
 }
 
 [[nodiscard]] ClickHandlerPtr MakeTopicButtonLink(
@@ -364,13 +402,28 @@ QString FastReplyText() {
 	});
 }
 
-struct SecondRightAction final {
-	std::unique_ptr<Ui::RippleAnimation> ripple;
-	ClickHandlerPtr link;
-};
+[[nodiscard]] BadgePillGeometry ComputeBadgePillGeometry(
+		not_null<const RightBadge*> badge) {
+	const auto &padding = st::msgTagBadgePadding;
+	const auto textWidth = badge->tag.maxWidth();
+	const auto contentWidth = padding.left()
+		+ textWidth
+		+ padding.right();
+	const auto height = padding.top()
+		+ st::msgFont->height
+		+ padding.bottom();
+	return {
+		.textWidth = textWidth,
+		.width = std::max(contentWidth, height),
+		.height = height,
+	};
+}
 
 } // namespace
 
+const char kOptionUnlimitedMessageWidth[]
+	= "unlimited-message-width";
+
 struct Message::CommentsButton {
 	std::unique_ptr<Ui::RippleAnimation> ripple;
 	std::vector<UserpicInRow> userpics;
@@ -381,8 +434,9 @@ struct Message::CommentsButton {
 };
 
 struct Message::FromNameStatus {
-	DocumentId id = 0;
+	EmojiStatusId id;
 	std::unique_ptr<Ui::Text::CustomEmoji> custom;
+	ClickHandlerPtr link;
 	int skip = 0;
 };
 
@@ -393,6 +447,13 @@ struct Message::RightAction {
 	std::unique_ptr<SecondRightAction> second;
 };
 
+struct Message::LinkRipple {
+	std::unique_ptr<Ui::RippleAnimation> ripple;
+	ClickHandlerPtr link;
+	QPoint maskOffset;
+	int cachedWidth = 0;
+};
+
 LogEntryOriginal::LogEntryOriginal() = default;
 
 LogEntryOriginal::LogEntryOriginal(LogEntryOriginal &&other)
@@ -416,29 +477,20 @@ Message::Message(
 , _bottomInfo(
 		&data->history()->owner().reactions(),
 		BottomInfoDataFromMessage(this)) {
-	if (const auto media = data->media()) {
+	if (data->Get<HistoryMessageSuggestion>()) {
+		_hideReply = 1;
+	} else if (const auto media = data->media()) {
 		if (media->giveawayResults()) {
 			_hideReply = 1;
 		}
 	}
 	initLogEntryOriginal();
 	initPsa();
-	refreshReactions();
-	auto animations = replacing
-		? replacing->takeReactionAnimations()
-		: base::flat_map<
-			Data::ReactionId,
-			std::unique_ptr<Ui::ReactionFlyAnimation>>();
-	auto animation = replacing ? replacing->takeEffectAnimation() : nullptr;
-	if (!animations.empty()) {
-		const auto repainter = [=] { repaint(); };
-		for (const auto &[id, animation] : animations) {
-			animation->setRepaintCallback(repainter);
-		}
-		if (_reactions) {
-			_reactions->continueAnimations(std::move(animations));
-		}
+	if (data->displayHiddenSenderInfo()) {
+		AddComponents(HiddenSenderTooltip::Bit());
 	}
+	setupReactions(replacing);
+	auto animation = replacing ? replacing->takeEffectAnimation() : nullptr;
 	if (animation) {
 		_bottomInfo.continueEffectAnimation(std::move(animation));
 	}
@@ -453,6 +505,28 @@ Message::Message(
 			_rightAction->second->link = ReportSponsoredClickHandler(data);
 		}
 	}
+	initPaidInformation();
+
+	if (data->textAppearing()) {
+		AddComponents(TextAppearing::Bit());
+		const auto appearing = Get<TextAppearing>();
+		if (replacing) {
+			if (const auto was = replacing->Get<TextAppearing>()) {
+				*appearing = std::move(*was);
+				appearing->widthAnimation.setCallback([=] {
+					textAppearWidthCallback();
+				});
+				appearing->heightAnimation.setCallback([=] {
+					textAppearHeightCallback();
+				});
+			}
+		}
+		if (data->textAppearingStarted()
+			&& !appearing->widthAnimation.animating()
+			&& !appearing->heightAnimation.animating()) {
+			skipInactiveTextAppearing();
+		}
+	}
 }
 
 Message::~Message() {
@@ -461,96 +535,555 @@ Message::~Message() {
 		_fromNameStatus = nullptr;
 		checkHeavyPart();
 	}
-	setReactions(nullptr);
 }
 
-void Message::setReactions(std::unique_ptr<Reactions::InlineList> list) {
-	auto was = _reactions
-		? _reactions->computeTagsList()
-		: std::vector<Data::ReactionId>();
-	_reactions = std::move(list);
-	auto now = _reactions
-		? _reactions->computeTagsList()
-		: std::vector<Data::ReactionId>();
-	if (!was.empty() || !now.empty()) {
-		auto &owner = history()->owner();
-		owner.viewTagsChanged(this, std::move(was), std::move(now));
+void HistoryMessageRichPage::Host::requestRepaint(QRect articleRect) {
+	if (const auto strong = owner.get()) {
+		crl::on_main(strong, [weak = owner, articleRect] {
+			if (const auto owner = weak.get()) {
+				owner->requestRichPageRepaint(articleRect);
+			}
+		});
+	}
+}
+
+void HistoryMessageRichPage::Host::requestRelayout(QRect articleRect) {
+	if (const auto strong = owner.get()) {
+		crl::on_main(strong, [weak = owner, articleRect] {
+			if (const auto owner = weak.get()) {
+				owner->requestRichPageRelayout(articleRect);
+			}
+		});
 	}
 }
 
+HistoryMessageRichPage::HistoryMessageRichPage()
+: host(std::make_unique<Host>())
+, article(st::messageMarkdown) {
+}
+
+void Message::setInstantViewMediaRuntime(QString pageUrl) {
+	Expects(Has<InstantViewMediaRuntime>()
+		|| !Has<HistoryMessageRichPage>());
+	// We mustn't add the component here if we're in rich message,
+	// because we call this method where we remember RichPage reference.
+
+	AddComponents(InstantViewMediaRuntime::Bit());
+	Get<InstantViewMediaRuntime>()->pageUrl = std::move(pageUrl);
+}
+
+bool Message::hasRichPage() const {
+	return (richpage() != nullptr);
+}
+
+void Message::requestRichPageRepaint(QRect articleRect) const {
+	Q_UNUSED(articleRect);
+	repaint();
+}
+
+void Message::requestRichPageRelayout(QRect articleRect) {
+	Q_UNUSED(articleRect);
+	if (const auto rich = const_cast<Message*>(this)->richpage()) {
+		rich->article.invalidateLayout();
+	}
+	setPendingResize();
+	history()->owner().requestViewResize(this);
+}
+
+void Message::activateRichPagePreparedLink(
+		const PreparedLink &link,
+		ClickContext context) const {
+	if (context.button != Qt::LeftButton
+		&& context.button != Qt::MiddleButton) {
+		return;
+	}
+	const auto resolveInlineAnchor = [owner = const_cast<Message*>(this)](
+			const QString &anchorId) {
+		if (anchorId.isEmpty()) {
+			return false;
+		}
+		const auto rich = owner->richpage();
+		if (!rich) {
+			return false;
+		}
+		auto top = rich->article.anchorTop(anchorId);
+		auto trect = QRect();
+		auto haveTrect = false;
+		if (top < 0) {
+			const auto expansion = rich->article.expandDetailsToAnchor(anchorId);
+			if (expansion.changed) {
+				haveTrect = owner->prepareRichPageTextRect(trect);
+				if (!haveTrect) {
+					return false;
+				}
+				const auto rect = owner->richPageRect(trect);
+				static_cast<void>(rich->article.resizeGetHeight(rect.width()));
+				top = rich->article.anchorTop(anchorId);
+				owner->requestRichPageRelayout(QRect());
+			} else {
+				top = rich->article.anchorTop(anchorId);
+			}
+			if (top < 0) {
+				return false;
+			}
+		}
+		if (!haveTrect && !owner->prepareRichPageTextRect(trect)) {
+			return false;
+		}
+		return owner->delegate()->elementScrollToLocalY(
+			owner,
+			owner->richPageRect(trect).top() + top);
+	};
+	switch (link.kind) {
+	case PreparedLinkKind::External:
+		if (const auto data = ExternalEntityLinkData(link)) {
+			if (const auto handler = Ui::Integration::Instance()
+					.createLinkHandler(*data, Ui::Text::MarkedContext())) {
+				handler->onClick(std::move(context));
+			}
+		}
+		break;
+	case PreparedLinkKind::InstantViewPage: {
+		const auto target = OpenableTargetForPreparedLink(link);
+		if (target.isEmpty()) {
+			return;
+		}
+		if (const auto controller = ExtractController(context)) {
+			Core::App().iv().openWithIvPreferred(
+				controller,
+				target,
+				context.other);
+		} else {
+			UrlClickHandler::Open(target, context.other);
+		}
+	} break;
+	case PreparedLinkKind::Anchor:
+	case PreparedLinkKind::Footnote:
+	case PreparedLinkKind::FootnoteBacklink: {
+		if (resolveInlineAnchor(link.target)) {
+			break;
+		}
+		const auto rich = richpage();
+		if (rich && rich->page && rich->page->part) {
+			if (const auto controller = ExtractController(context)) {
+				Core::App().iv().showRichMessage(
+					controller,
+					data(),
+					link.target);
+			}
+		} else if (const auto controller = ExtractController(context)) {
+			controller->showToast(
+				tr::lng_iv_not_found_in_message(tr::now));
+		}
+		break;
+	}
+	case PreparedLinkKind::LocalFile: {
+		const auto target = OpenableTargetForPreparedLink(link);
+		if (!target.isEmpty()) {
+			UrlClickHandler::Open(target, context.other);
+		}
+	} break;
+	case PreparedLinkKind::RejectedRelative:
+		break;
+	case PreparedLinkKind::ToggleDetails:
+		if (const auto rich = const_cast<Message*>(this)->richpage()
+			; rich && rich->article.toggleDetails(link.target)) {
+			const_cast<Message*>(this)->requestRichPageRelayout(QRect());
+		}
+		break;
+	}
+}
+
+QRect Message::richPageRect(QRect trect) const {
+	return trect.marginsAdded(
+		{ st::msgPadding.left(), 0, st::msgPadding.right(), 0 });
+}
+
+bool Message::prepareRichPageTextRect(QRect &trect) const {
+	if (!hasVisibleText()) {
+		return false;
+	}
+	const auto item = data();
+	const auto media = this->media();
+	auto g = countGeometry();
+	if (g.width() < 1 || isHidden() || !drawBubble()) {
+		return false;
+	}
+	const auto reactionsInBubble = _reactions && embedReactionsInBubble();
+	const auto mediaDisplayed = media && media->isDisplayed();
+	if (_reactions && !reactionsInBubble) {
+		g.setHeight(g.height() - st::mediaInBubbleSkip - _reactions->height());
+	}
+	if (const auto keyboard = item->inlineReplyKeyboard()) {
+		g.setHeight(
+			g.height()
+			- st::msgBotKbButton.margin
+			- keyboard->naturalHeight());
+	}
+	auto inner = g;
+	if (_comments) {
+		inner.setHeight(inner.height() - st::historyCommentsButtonHeight);
+	}
+	trect = inner.marginsRemoved(st::msgPadding);
+	const auto additionalInfoSkip = (mediaDisplayed
+		&& !media->additionalInfoString().isEmpty())
+		? st::msgDateFont->height
+		: 0;
+	const auto reactionsTop = (reactionsInBubble && !_viewButton)
+		? (additionalInfoSkip + st::mediaInBubbleSkip)
+		: additionalInfoSkip;
+	const auto reactionsHeight = reactionsInBubble
+		? (reactionsTop + _reactions->height())
+		: 0;
+	if (reactionsInBubble) {
+		trect.setHeight(trect.height() - reactionsHeight);
+	}
+	if (_viewButton) {
+		trect.setHeight(trect.height() - _viewButton->height());
+		if (reactionsInBubble) {
+			trect.setHeight(
+				trect.height()
+				- st::mediaInBubbleSkip
+				+ st::msgPadding.bottom());
+		} else if (mediaDisplayed) {
+			trect.setHeight(trect.height() - st::mediaInBubbleSkip);
+		}
+	}
+	const auto check = factcheckBlock();
+	const auto entry = logEntryOriginal();
+	const auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom())
+		|| check
+		|| entry;
+	const auto mediaOnTop = (mediaDisplayed && media->isBubbleTop())
+		|| (entry && entry->isBubbleTop());
+	if (mediaOnBottom) {
+		trect.setHeight(trect.height() + st::msgPadding.bottom());
+	}
+	if (mediaOnTop) {
+		trect.setY(trect.y() - st::msgPadding.top());
+	} else {
+		if (displayFromName()) {
+			trect.setTop(trect.top() + st::msgNameFont->height);
+		}
+		if (displayedTopicButton()) {
+			trect.setTop(trect.top()
+				+ st::topicButtonSkip
+				+ st::topicButtonPadding.top()
+				+ st::msgNameFont->height
+				+ st::topicButtonPadding.bottom()
+				+ st::topicButtonSkip);
+		}
+		if (displayForwardedFrom()) {
+			const auto forwarded = item->Get<HistoryMessageForwarded>();
+			const auto skip = forwarded->psaType.isEmpty()
+				? 0
+				: st::historyPsaIconSkip1;
+			const auto fits = (forwarded->text.maxWidth()
+				<= (trect.width() - skip));
+			trect.setTop(trect.top()
+				+ ((fits ? 1 : 2) * st::semiboldFont->height));
+		}
+		if (item->Has<HistoryMessageVia>()
+			&& !displayFromName()
+			&& !displayForwardedFrom()) {
+			trect.setTop(trect.top() + st::msgNameFont->height);
+		}
+		if (const auto reply = Get<Reply>()) {
+			trect.setTop(trect.top() + reply->height());
+		}
+		if (const auto summaryHeader = Get<SummaryHeader>()) {
+			trect.setTop(trect.top() + summaryHeader->height());
+		}
+	}
+	if (entry) {
+		trect.setHeight(trect.height() - entry->height());
+	}
+	if (check) {
+		trect.setHeight(
+			trect.height()
+			- check->height()
+			- st::mediaInBubbleSkip);
+	}
+	if (mediaDisplayed && _invertMedia) {
+		const auto mediaTop = trect.y()
+			+ (mediaOnTop ? 0 : st::mediaInBubbleSkip);
+		trect.setY(mediaTop
+			+ media->height()
+			+ (mediaOnBottom ? 0 : st::mediaInBubbleSkip));
+	}
+	return true;
+}
+
+QPoint Message::prepareRichPageStateRect(QPoint point, QRect &trect) const {
+	if (const auto botTop = Get<FakeBotAboutTop>()) {
+		trect.setY(trect.y() + botTop->height);
+	}
+	trect = richPageRect(trect);
+	return point - trect.topLeft();
+}
+
+void Message::activateRichPageMedia(
+		const MediaActivation &activation,
+		ClickContext context) const {
+	if (context.button != Qt::LeftButton
+		&& context.button != Qt::MiddleButton) {
+		return;
+	}
+	switch (activation.kind) {
+	case MediaActivationKind::None:
+		break;
+	case MediaActivationKind::Embed:
+		if (!activation.embed.url.isEmpty()) {
+			HiddenUrlClickHandler::Open(
+				activation.embed.url,
+				context.other);
+		}
+		break;
+	case MediaActivationKind::ExternalUrl:
+		if (!activation.url.isEmpty()) {
+			HiddenUrlClickHandler::Open(activation.url, context.other);
+		}
+		break;
+	case MediaActivationKind::Photo:
+		if (activation.photo) {
+			activation.photo->open(context.button);
+		}
+		break;
+	case MediaActivationKind::Document:
+		if (activation.document) {
+			activation.document->open(context.button);
+		}
+		break;
+	case MediaActivationKind::OpenChannel:
+		if (activation.channel) {
+			activation.channel->open(context.button);
+		}
+		break;
+	case MediaActivationKind::JoinChannel:
+		if (activation.channel) {
+			activation.channel->join(context.button);
+		}
+		break;
+	}
+}
+
+void Message::refreshSuggestedInfo(
+		not_null<HistoryItem*> item,
+		not_null<const HistoryMessageSuggestion*> suggest,
+		const HistoryMessageReply *replyData) {
+	const auto link = (replyData && replyData->resolvedMessage)
+		? JumpToMessageClickHandler(
+			replyData->resolvedMessage.get(),
+			item->fullId())
+		: ClickHandlerPtr();
+	setServicePreMessage({}, link, std::make_unique<MediaGeneric>(
+		this,
+		GenerateSuggestRequestMedia(this, suggest),
+		MediaGenericDescriptor{
+			.maxWidth = st::chatSuggestWidth,
+			.fullAreaLink = link,
+			.service = true,
+			.hideServiceText = true,
+		}));
+}
+
+void Message::initPaidInformation() {
+	const auto item = data();
+	if (item->history()->peer->isMonoforum()) {
+		if (const auto suggest = item->Get<HistoryMessageSuggestion>()) {
+			const auto replyData = item->Get<HistoryMessageReply>();
+			refreshSuggestedInfo(item, suggest, replyData);
+		}
+		return;
+	} else if (!item->history()->peer->isUser()) {
+		return;
+	}
+	const auto media = this->media();
+	const auto mine = PaidInformation{
+		.messages = 1,
+		.stars = item->starsPaid(),
+	};
+	auto info = media ? media->paidInformation().value_or(mine) : mine;
+	if (!info) {
+		return;
+	}
+	const auto action = [&] {
+		return (info.messages == 1)
+			? tr::lng_action_paid_message_one(
+				tr::now,
+				tr::marked)
+			: tr::lng_action_paid_message_some(
+				tr::now,
+				lt_count,
+				info.messages,
+				tr::marked);
+	};
+	auto text = PreparedServiceText{
+		.text = item->out()
+			? tr::lng_action_paid_message_sent(
+				tr::now,
+				lt_count,
+				info.stars,
+				lt_action,
+				action(),
+				tr::marked)
+			: tr::lng_action_paid_message_got(
+				tr::now,
+				lt_count,
+				info.stars,
+				lt_name,
+				tr::link(item->from()->shortName(), 1),
+				tr::marked),
+	};
+	if (!item->out()) {
+		text.links.push_back(item ->from()->createOpenLink());
+	}
+	setServicePreMessage(std::move(text));
+}
+
 void Message::refreshRightBadge() {
+	if (const auto badge = Get<RightBadge>(); badge && badge->overridden) {
+		return;
+	}
+	if (hasOutLayout()) {
+		if (Has<RightBadge>()) {
+			RemoveComponents(RightBadge::Bit());
+		}
+		return;
+	}
 	const auto item = data();
-	const auto text = [&] {
+	const auto [text, role, special] = [&]() -> std::tuple<QString, BadgeRole, bool> {
 		if (item->isDiscussionPost()) {
-			return (delegate()->elementContext() == Context::Replies)
-				? QString()
-				: tr::lng_channel_badge(tr::now);
+			return {
+				(delegate()->elementContext() == Context::Replies)
+					? QString()
+					: tr::lng_channel_badge(tr::now),
+				BadgeRole::User,
+				true,
+			};
 		} else if (item->author()->isMegagroup()) {
 			if (const auto msgsigned = item->Get<HistoryMessageSigned>()) {
 				if (!msgsigned->viaBusinessBot) {
 					Assert(msgsigned->isAnonymousRank);
-					return msgsigned->author;
+					return { msgsigned->author, BadgeRole::User, false };
 				}
 			}
 		}
 		const auto channel = item->history()->peer->asMegagroup();
 		const auto user = item->author()->asUser();
-		if (!channel || !user) {
-			return QString();
+		if (!channel) {
+			if (const auto chat = item->history()->peer->asChat()) {
+				if (user) {
+					const auto j = chat->memberRanks.find(
+						peerToUser(user->id));
+					if (j != chat->memberRanks.end()) {
+						const auto basicRole
+							= (peerToUser(user->id) == chat->creator)
+							? BadgeRole::Creator
+							: chat->admins.contains(user)
+							? BadgeRole::Admin
+							: BadgeRole::User;
+						return { j->second, basicRole, false };
+					}
+				}
+			}
+			return { QString(), BadgeRole::User, false };
+		}
+		if (!user) {
+			return { QString(), BadgeRole::User, false };
 		}
 		const auto info = channel->mgInfo.get();
-		const auto i = info->admins.find(peerToUser(user->id));
-		const auto custom = (i != info->admins.end())
-			? i->second
-			: (info->creator == user)
-			? info->creatorRank
-			: QString();
-		return !custom.isEmpty()
-			? custom
-			: (info->creator == user)
-			? tr::lng_owner_badge(tr::now)
-			: (i != info->admins.end())
-			? tr::lng_admin_badge(tr::now)
-			: QString();
+		const auto userId = peerToUser(user->id);
+		const auto isCreator = (info->creator == user);
+		const auto isAdmin = info->admins.contains(userId);
+		if (isCreator || isAdmin) {
+			const auto r = info->memberRanks.find(userId);
+			if (r != info->memberRanks.end() && !r->second.isEmpty()) {
+				return {
+					r->second,
+					isCreator ? BadgeRole::Creator : BadgeRole::Admin,
+					false,
+				};
+			}
+			if (isCreator) {
+				return { tr::lng_owner_badge(tr::now), BadgeRole::Creator, false };
+			}
+			return { tr::lng_admin_badge(tr::now), BadgeRole::Admin, false };
+		}
+		const auto fromRank = item->fromRank();
+		if (!fromRank.isEmpty()) {
+			return { fromRank, BadgeRole::User, false };
+		}
+		return { QString(), BadgeRole::User, false };
 	}();
-	auto badge = TextWithEntities{
+	auto tagText = TextWithEntities{
 		(text.isEmpty()
 			? delegate()->elementAuthorRank(this)
 			: TextUtilities::RemoveEmoji(TextUtilities::SingleLine(text)))
 	};
-	_rightBadgeHasBoosts = 0;
-	if (const auto boosts = item->boostsApplied()) {
-		_rightBadgeHasBoosts = 1;
-
+	const auto boosts = item->boostsApplied();
+	const auto needBadge = !tagText.empty() || boosts;
+	if (!needBadge) {
+		if (Has<RightBadge>()) {
+			RemoveComponents(RightBadge::Bit());
+		}
+		return;
+	}
+	if (!Has<RightBadge>()) {
+		AddComponents(RightBadge::Bit());
+	}
+	const auto badge = Get<RightBadge>();
+	badge->role = role;
+	badge->special = special || (text.isEmpty() && !tagText.empty());
+	badge->tagLink = nullptr;
+	badge->ripple = nullptr;
+	if (tagText.empty()) {
+		badge->tag.clear();
+	} else {
+		badge->tag.setMarkedText(
+			st::defaultTextStyle,
+			tagText,
+			Ui::NameTextOptions());
+	}
+	if (boosts) {
 		const auto many = (boosts > 1);
-		const auto &icon = many
-			? st::boostsMessageIcon
-			: st::boostMessageIcon;
-		const auto padding = many
-			? st::boostsMessageIconPadding
-			: st::boostMessageIconPadding;
-		const auto owner = &item->history()->owner();
-		auto added = Ui::Text::SingleCustomEmoji(
-			owner->customEmojiManager().registerInternalEmoji(icon, padding)
+		auto boostText = Ui::Text::IconEmoji(many
+			? &st::boostsMessageIcon
+			: &st::boostMessageIcon
 		).append(many ? QString::number(boosts) : QString());
-		badge.append(' ').append(Ui::Text::Colorized(added, 1));
+		badge->boosts.setMarkedText(
+			st::defaultTextStyle,
+			boostText,
+			Ui::NameTextOptions());
+	} else {
+		badge->boosts.clear();
 	}
-	if (badge.empty()) {
-		_rightBadge.clear();
+	const auto boostWidth = badge->boosts.isEmpty()
+		? 0
+		: (st::msgTagBadgeBoostSkip + badge->boosts.maxWidth());
+	if (badge->role == BadgeRole::User) {
+		const auto tagWidth = badge->tag.isEmpty()
+			? 0
+			: badge->tag.maxWidth();
+		badge->width = tagWidth + boostWidth;
 	} else {
-		const auto context = Core::MarkedTextContext{
-			.session = &item->history()->session(),
-			.customEmojiRepaint = [] {},
-			.customEmojiLoopLimit = 1,
-		};
-		_rightBadge.setMarkedText(
-			st::defaultTextStyle,
-			badge,
-			Ui::NameTextOptions(),
-			context);
+		const auto &padding = st::msgTagBadgePadding;
+		const auto textWidth = badge->tag.maxWidth();
+		const auto contentWidth = padding.left()
+			+ textWidth
+			+ padding.right();
+		const auto pillHeight = padding.top()
+			+ st::msgFont->height
+			+ padding.bottom();
+		badge->width = std::max(contentWidth, pillHeight) + boostWidth;
 	}
 }
 
+int Message::rightBadgeWidth() const {
+	const auto badge = Get<RightBadge>();
+	return badge ? badge->width : 0;
+}
+
 void Message::applyGroupAdminChanges(
 		const base::flat_set<UserId> &changes) {
 	if (!data()->out()
@@ -572,12 +1105,6 @@ void Message::animateReaction(Ui::ReactionFlyAnimationArgs &&args) {
 	const auto bubble = drawBubble();
 	const auto reactionsInBubble = _reactions && embedReactionsInBubble();
 	const auto mediaDisplayed = media && media->isDisplayed();
-	const auto keyboard = item->inlineReplyKeyboard();
-	auto keyboardHeight = 0;
-	if (keyboard) {
-		keyboardHeight = keyboard->naturalHeight();
-		g.setHeight(g.height() - st::msgBotKbButton.margin - keyboardHeight);
-	}
 
 	if (_reactions && !reactionsInBubble) {
 		const auto reactionsHeight = st::mediaInBubbleSkip + _reactions->height();
@@ -590,41 +1117,6 @@ void Message::animateReaction(Ui::ReactionFlyAnimationArgs &&args) {
 		return;
 	}
 
-	if (bubble) {
-		// Entry page is always a bubble bottom.
-		auto inner = g;
-		if (_comments) {
-			inner.setHeight(inner.height() - st::historyCommentsButtonHeight);
-		}
-		auto trect = inner.marginsRemoved(st::msgPadding);
-		const auto reactionsTop = (reactionsInBubble && !_viewButton)
-			? st::mediaInBubbleSkip
-			: 0;
-		const auto reactionsHeight = reactionsInBubble
-			? (reactionsTop + _reactions->height())
-			: 0;
-		if (reactionsInBubble) {
-			trect.setHeight(trect.height() - reactionsHeight);
-			const auto reactionsPosition = QPoint(trect.left(), trect.top() + trect.height() + reactionsTop);
-			_reactions->animate(args.translated(-reactionsPosition), repainter);
-			return;
-		}
-	}
-}
-
-void Message::animateEffect(Ui::ReactionFlyAnimationArgs &&args) {
-	const auto item = data();
-	const auto media = this->media();
-
-	auto g = countGeometry();
-	if (g.width() < 1 || isHidden()) {
-		return;
-	}
-	const auto repainter = [=] { repaint(); };
-
-	const auto bubble = drawBubble();
-	const auto reactionsInBubble = _reactions && embedReactionsInBubble();
-	const auto mediaDisplayed = media && media->isDisplayed();
 	const auto keyboard = item->inlineReplyKeyboard();
 	auto keyboardHeight = 0;
 	if (keyboard) {
@@ -632,17 +1124,8 @@ void Message::animateEffect(Ui::ReactionFlyAnimationArgs &&args) {
 		g.setHeight(g.height() - st::msgBotKbButton.margin - keyboardHeight);
 	}
 
-	const auto animateInBottomInfo = [&](QPoint bottomRight) {
-		_bottomInfo.animateEffect(args.translated(-bottomRight), repainter);
-	};
 	if (bubble) {
-		const auto entry = logEntryOriginal();
-		const auto check = factcheckBlock();
-
 		// Entry page is always a bubble bottom.
-		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
-		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
-
 		auto inner = g;
 		if (_comments) {
 			inner.setHeight(inner.height() - st::historyCommentsButtonHeight);
@@ -654,56 +1137,15 @@ void Message::animateEffect(Ui::ReactionFlyAnimationArgs &&args) {
 		const auto reactionsHeight = reactionsInBubble
 			? (reactionsTop + _reactions->height())
 			: 0;
-		if (_viewButton) {
-			const auto belowInfo = _viewButton->belowMessageInfo();
-			const auto infoHeight = reactionsInBubble
-				? (reactionsHeight + 2 * st::mediaInBubbleSkip)
-				: _bottomInfo.height();
-			const auto heightMargins = QMargins(0, 0, 0, infoHeight);
-			if (belowInfo) {
-				inner -= heightMargins;
-			}
-			trect.setHeight(trect.height() - _viewButton->height());
-			if (reactionsInBubble) {
-				trect.setHeight(trect.height() - st::mediaInBubbleSkip + st::msgPadding.bottom());
-			} else if (mediaDisplayed) {
-				trect.setHeight(trect.height() - st::mediaInBubbleSkip);
-			}
-		}
-		if (mediaOnBottom) {
-			trect.setHeight(trect.height()
-				+ st::msgPadding.bottom()
-				- viewButtonHeight());
-		}
-		if (mediaOnTop) {
-			trect.setY(trect.y() - st::msgPadding.top());
-		}
-		if (mediaDisplayed && mediaOnBottom && media->customInfoLayout()) {
-			auto mediaHeight = media->height();
-			auto mediaLeft = trect.x() - st::msgPadding.left();
-			auto mediaTop = (trect.y() + trect.height() - mediaHeight);
-			animateInBottomInfo(QPoint(mediaLeft, mediaTop) + media->resolveCustomInfoRightBottom());
-		} else {
-			animateInBottomInfo({
-				inner.left() + inner.width() - (st::msgPadding.right() - st::msgDateDelta.x()),
-				inner.top() + inner.height() - (st::msgPadding.bottom() - st::msgDateDelta.y()),
-			});
+		if (reactionsInBubble) {
+			trect.setHeight(trect.height() - reactionsHeight);
+			const auto reactionsPosition = QPoint(trect.left(), trect.top() + trect.height() + reactionsTop);
+			_reactions->animate(args.translated(-reactionsPosition), repainter);
+			return;
 		}
-	} else if (mediaDisplayed) {
-		animateInBottomInfo(g.topLeft() + media->resolveCustomInfoRightBottom());
 	}
 }
 
-auto Message::takeReactionAnimations()
--> base::flat_map<
-		Data::ReactionId,
-		std::unique_ptr<Ui::ReactionFlyAnimation>> {
-	if (_reactions) {
-		return _reactions->takeAnimations();
-	}
-	return {};
-}
-
 auto Message::takeEffectAnimation()
 -> std::unique_ptr<Ui::ReactionFlyAnimation> {
 	return _bottomInfo.takeEffectAnimation();
@@ -796,11 +1238,42 @@ QSize Message::performCountOptimalSize() {
 	const auto item = data();
 
 	const auto replyData = item->Get<HistoryMessageReply>();
+	const auto &summary = item->summaryEntry();
+	const auto showSummaryReply = !summary.result.empty() && summary.shown;
+
 	if (replyData && !_hideReply) {
 		AddComponents(Reply::Bit());
 	} else {
 		RemoveComponents(Reply::Bit());
 	}
+	if (showSummaryReply) {
+		AddComponents(SummaryHeader::Bit());
+	} else {
+		RemoveComponents(SummaryHeader::Bit());
+	}
+
+	if (item->history()->peer->isMonoforum()) {
+		if (const auto suggest = item->Get<HistoryMessageSuggestion>()) {
+			if (const auto service = Get<ServicePreMessage>()) {
+				// Ok, we didn't have the message, but now we have.
+				// That means this is not a plain post suggestion,
+				// but a suggestion of changes to previous suggestion.
+				if (service->media
+					&& !service->handler
+					&& replyData
+					&& replyData->resolvedMessage) {
+					refreshSuggestedInfo(item, suggest, replyData);
+				}
+			}
+		}
+	}
+
+	if (const auto postSender = item->discussionPostOriginalSender()) {
+		if (!postSender->isFullLoaded()) {
+			// We need it for available reactions list.
+			postSender->updateFull();
+		}
+	}
 
 	const auto factcheck = item->Get<HistoryMessageFactcheck>();
 	if (factcheck && !factcheck->data.text.empty()) {
@@ -811,12 +1284,19 @@ QSize Message::performCountOptimalSize() {
 	} else {
 		RemoveComponents(Factcheck::Bit());
 	}
+	refreshRightBadge();
 
 	const auto markup = item->inlineReplyMarkup();
 	const auto reactionsKey = [&] {
 		return embedReactionsInBubble() ? 0 : 1;
 	};
 	const auto oldKey = reactionsKey();
+	if (_summarize) {
+		const auto &summary = item->summaryEntry();
+		if (_summarize->loading() != summary.loading) {
+			_summarize->setLoading(summary.loading);
+		}
+	}
 	validateText();
 	validateInlineKeyboard(markup);
 	updateViewButtonExistence();
@@ -834,12 +1314,14 @@ QSize Message::performCountOptimalSize() {
 	if (oldKey != reactionsKey()) {
 		refreshReactions();
 	}
-	refreshRightBadge();
 	refreshInfoSkipBlock(textItem);
 
 	const auto botTop = item->isFakeAboutView()
 		? Get<FakeBotAboutTop>()
 		: nullptr;
+	const auto bubble = drawBubble();
+	auto withVisibleText = false;
+	auto fullTextualWidth = 0;
 	if (botTop) {
 		botTop->init();
 	}
@@ -856,8 +1338,14 @@ QSize Message::performCountOptimalSize() {
 	if (reply) {
 		reply->update(this, replyData);
 	}
+	const auto summaryHeader = Get<SummaryHeader>();
+	if (summaryHeader) {
+		if (showSummaryReply) {
+			summaryHeader->update(this);
+		}
+	}
 
-	if (drawBubble()) {
+	if (bubble) {
 		const auto forwarded = item->Get<HistoryMessageForwarded>();
 		const auto via = item->Get<HistoryMessageVia>();
 		const auto entry = logEntryOriginal();
@@ -879,22 +1367,31 @@ QSize Message::performCountOptimalSize() {
 		}
 
 		// Entry page is always a bubble bottom.
-		const auto withVisibleText = hasVisibleText();
-		const auto textualWidth = textualMaxWidth();
+		withVisibleText = hasVisibleText();
+		fullTextualWidth = textualMaxWidth();
+		const auto textualWidth = bubbleTextualWidth();
 		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
 		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
 		maxWidth = textualWidth;
-		if (context() == Context::Replies && item->isDiscussionPost()) {
+		auto nonTextMax = 0;
+		if (isCommentsRootView()) {
 			maxWidth = std::max(maxWidth, st::msgMaxWidth);
+			accumulate_max(nonTextMax, st::msgMaxWidth);
 		}
-		minHeight = withVisibleText ? text().minHeight() : 0;
+		minHeight = withVisibleText
+			? hasRichPage()
+				? textHeightFor(bubbleTextWidth(textualWidth))
+				: text().minHeight()
+			: 0;
 		if (reactionsInBubble) {
 			const auto reactionsMaxWidth = st::msgPadding.left()
 				+ _reactions->maxWidth()
 				+ st::msgPadding.right();
-			accumulate_max(
-				maxWidth,
-				std::min(st::msgMaxWidth, reactionsMaxWidth));
+			const auto reactionsLimited = std::min(
+				st::msgMaxWidth,
+				reactionsMaxWidth);
+			accumulate_max(maxWidth, reactionsLimited);
+			accumulate_max(nonTextMax, reactionsLimited);
 			if (mediaDisplayed
 				&& !media->additionalInfoString().isEmpty()) {
 				// In round videos in a web page status text is painted
@@ -931,12 +1428,6 @@ QSize Message::performCountOptimalSize() {
 				const auto innerWidth = maxWidth
 					- st::msgPadding.left()
 					- st::msgPadding.right();
-				if (withVisibleText) {
-					if (maxWidth < textualWidth) {
-						minHeight -= text().minHeight();
-						minHeight += text().countHeight(innerWidth);
-					}
-				}
 				if (reactionsInBubble) {
 					minHeight -= _reactions->minHeight();
 					minHeight
@@ -965,28 +1456,27 @@ QSize Message::performCountOptimalSize() {
 					namew += st::msgServiceFont->spacew + via->maxWidth
 						+ (_fromNameStatus ? st::msgServiceFont->spacew : 0);
 				}
-				const auto replyWidth = hasFastReply()
-					? st::msgFont->width(FastReplyText())
-					: 0;
-				if (!_rightBadge.isEmpty()) {
-					const auto badgeWidth = _rightBadge.maxWidth();
-					namew += st::msgPadding.right()
-						+ std::max(badgeWidth, replyWidth);
-				} else if (replyWidth) {
-					namew += st::msgPadding.right() + replyWidth;
+				if (const auto guestChat = item->Get<HistoryMessageGuestChat>()) {
+					namew += st::msgServiceFont->spacew + guestChat->maxWidth;
+				}
+				if (Has<RightBadge>()) {
+					namew += st::msgPadding.right() + rightBadgeWidth();
 				}
 				accumulate_max(maxWidth, namew);
+				accumulate_max(nonTextMax, namew);
 			} else if (via && !displayForwardedFrom()) {
-				accumulate_max(maxWidth, st::msgPadding.left() + via->maxWidth + st::msgPadding.right());
+				const auto viaw = st::msgPadding.left() + via->maxWidth + st::msgPadding.right();
+				accumulate_max(maxWidth, viaw);
+				accumulate_max(nonTextMax, viaw);
 			}
 			if (displayedTopicButton()) {
 				const auto padding = st::msgPadding + st::topicButtonPadding;
-				accumulate_max(
-					maxWidth,
-					(padding.left()
-						+ _topicButton->name.maxWidth()
-						+ st::topicButtonArrowSkip
-						+ padding.right()));
+				const auto topicw = padding.left()
+					+ _topicButton->name.maxWidth()
+					+ st::topicButtonArrowSkip
+					+ padding.right();
+				accumulate_max(maxWidth, topicw);
+				accumulate_max(nonTextMax, topicw);
 			}
 			if (displayForwardedFrom()) {
 				const auto skip1 = forwarded->psaType.isEmpty()
@@ -997,27 +1487,41 @@ QSize Message::performCountOptimalSize() {
 					namew += st::msgServiceFont->spacew + via->maxWidth;
 				}
 				accumulate_max(maxWidth, namew);
+				accumulate_max(nonTextMax, namew);
 			}
 			if (reply) {
 				const auto replyw = st::msgPadding.left()
 					+ reply->maxWidth()
 					+ st::msgPadding.right();
 				accumulate_max(maxWidth, replyw);
+				accumulate_max(nonTextMax, replyw);
+			}
+			if (summaryHeader) {
+				const auto summaryHeaderWidth = st::msgPadding.left()
+					+ summaryHeader->maxWidth()
+					+ st::msgPadding.right();
+				accumulate_max(maxWidth, summaryHeaderWidth);
+				accumulate_max(nonTextMax, summaryHeaderWidth);
 			}
 			if (check) {
 				accumulate_max(maxWidth, check->maxWidth());
+				accumulate_max(nonTextMax, check->maxWidth());
 				minHeight += check->minHeight();
 			}
 			if (entry) {
 				accumulate_max(maxWidth, entry->maxWidth());
+				accumulate_max(nonTextMax, entry->maxWidth());
 				minHeight += entry->minHeight();
 			}
 		}
 		if (withVisibleText && botTop) {
 			accumulate_max(maxWidth, botTop->maxWidth);
+			accumulate_max(nonTextMax, botTop->maxWidth);
 			minHeight += botTop->height;
 		}
 		accumulate_max(maxWidth, minWidthForMedia());
+		accumulate_max(nonTextMax, minWidthForMedia());
+		_nonTextMaxWidth = std::min(nonTextMax, kMaxWidth);
 	} else if (media) {
 		media->initDimensions();
 		maxWidth = media->maxWidth();
@@ -1030,16 +1534,36 @@ QSize Message::performCountOptimalSize() {
 	// but if we have only media we don't do that
 	if (markup && markup->inlineKeyboard && hasVisibleText()) {
 		accumulate_max(maxWidth, markup->inlineKeyboard->naturalWidth());
+		if (bubble) {
+			const auto kbw = markup->inlineKeyboard->naturalWidth();
+			if (kbw > int(_nonTextMaxWidth)) {
+				_nonTextMaxWidth = std::min(kbw, kMaxWidth);
+			}
+		}
+	}
+	if (bubble && withVisibleText && maxWidth < fullTextualWidth) {
+		minHeight -= hasRichPage()
+			? textHeightFor(bubbleTextWidth(bubbleTextualWidth()))
+			: text().minHeight();
+		minHeight += textHeightFor(bubbleTextWidth(maxWidth));
+	}
+	if (const auto appearing = Get<TextAppearing>()) {
+		appearing->geometryValid = false;
+		appearing->startedForText = false;
+		appearing->finalizing = item->isRegular();
 	}
 	return QSize(maxWidth, minHeight);
 }
 
 void Message::refreshTopicButton() {
 	const auto item = data();
-	if (isAttachedToPrevious()
-		|| delegate()->elementHideTopicButton(this)) {
+	if (isAttachedToPrevious() || delegate()->elementHideTopicButton(this)) {
 		_topicButton = nullptr;
 	} else if (const auto topic = item->topic()) {
+		if (topic->peer()->useSubsectionTabs()) {
+			_topicButton = nullptr;
+			return;
+		}
 		if (!_topicButton) {
 			_topicButton = std::make_unique<TopicButton>();
 		}
@@ -1047,11 +1571,11 @@ void Message::refreshTopicButton() {
 		_topicButton->link = MakeTopicButtonLink(topic, jumpToId);
 		if (_topicButton->nameVersion != topic->titleVersion()) {
 			_topicButton->nameVersion = topic->titleVersion();
-			const auto context = Core::MarkedTextContext{
+			const auto context = Core::TextContext({
 				.session = &history()->session(),
-				.customEmojiRepaint = [=] { customEmojiRepaint(); },
+				.repaint = [=] { customEmojiRepaint(); },
 				.customEmojiLoopLimit = 1,
-			};
+			});
 			_topicButton->name.setMarkedText(
 				st::fwdTextStyle,
 				topic->titleWithIcon(),
@@ -1076,14 +1600,34 @@ int Message::marginTop() const {
 	if (const auto bar = Get<UnreadBar>()) {
 		result += bar->height();
 	}
+	if (const auto bar = Get<ForumThreadBar>()) {
+		result += bar->height();
+	}
 	if (const auto service = Get<ServicePreMessage>()) {
-		result += service->height;
+		if (!service->below) {
+			result += service->height;
+		}
+	}
+	if (const auto margins = Get<ViewAddedMargins>()) {
+		result += margins->top;
 	}
 	return result;
 }
 
 int Message::marginBottom() const {
-	return isHidden() ? 0 : st::msgMargin.bottom();
+	if (isHidden()) {
+		return 0;
+	}
+	auto result = st::msgMargin.bottom();
+	if (const auto service = Get<ServicePreMessage>()) {
+		if (service->below) {
+			result += service->height;
+		}
+	}
+	if (const auto margins = Get<ViewAddedMargins>()) {
+		result += margins->bottom;
+	}
+	return result;
 }
 
 void Message::draw(Painter &p, const PaintContext &context) const {
@@ -1100,7 +1644,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 	if (hasGesture) {
 		p.translate(context.gestureHorizontal.translation, 0);
 	}
-	const auto selectionModeResult = delegate()->elementInSelectionMode();
+	const auto selectionModeResult = delegate()->elementInSelectionMode(this);
 	const auto selectionTranslation = (selectionModeResult.progress > 0)
 		? (selectionModeResult.progress
 			* AdditionalSpaceForSelectionCheckbox(this, g))
@@ -1118,24 +1662,22 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 
 	if (const auto bar = Get<UnreadBar>()) {
 		auto unreadbarh = bar->height();
-		auto dateh = 0;
+		auto aboveh = 0;
 		if (const auto date = Get<DateBadge>()) {
-			dateh = date->height();
+			aboveh += date->height();
 		}
-		if (context.clip.intersects(QRect(0, dateh, width(), unreadbarh))) {
-			p.translate(0, dateh);
-			bar->paint(
-				p,
-				context,
-				0,
-				width(),
-				delegate()->elementIsChatWide());
-			p.translate(0, -dateh);
+		if (const auto bar = Get<ForumThreadBar>()) {
+			aboveh += bar->height();
+		}
+		if (context.clip.intersects(QRect(0, aboveh, width(), unreadbarh))) {
+			p.translate(0, aboveh);
+			bar->paint(p, context, 0, width(), delegate()->elementChatMode());
+			p.translate(0, -aboveh);
 		}
 	}
 
 	if (const auto service = Get<ServicePreMessage>()) {
-		service->paint(p, context, g, delegate()->elementIsChatWide());
+		service->paint(p, context, g, delegate()->elementChatMode());
 	}
 
 	if (isHidden()) {
@@ -1153,13 +1695,17 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 	const auto displayInfo = needInfoDisplay();
 	const auto reactionsInBubble = _reactions && embedReactionsInBubble();
 
+	// We need to count geometry without keyboard and reactions
+	// for bubble selection intervals counting below.
+	auto gForIntervals = g;
+	if (_reactions && !reactionsInBubble) {
+		const auto reactionsHeight = st::mediaInBubbleSkip + _reactions->height();
+		gForIntervals.setHeight(gForIntervals.height() - reactionsHeight);
+	}
 	const auto keyboard = item->inlineReplyKeyboard();
-	const auto fullGeometry = g;
 	if (keyboard) {
-		// We need to count geometry without keyboard for bubble selection
-		// intervals counting below.
 		const auto keyboardHeight = st::msgBotKbButton.margin + keyboard->naturalHeight();
-		g.setHeight(g.height() - keyboardHeight);
+		gForIntervals.setHeight(gForIntervals.height() - keyboardHeight);
 	}
 
 	auto mediaSelectionIntervals = (!context.selected() && mediaDisplayed)
@@ -1168,7 +1714,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 	auto localMediaTop = 0;
 	const auto customHighlight = mediaDisplayed && media->customHighlight();
 	if (!mediaSelectionIntervals.empty() || customHighlight) {
-		auto localMediaBottom = g.top() + g.height();
+		auto localMediaBottom = gForIntervals.top() + gForIntervals.height();
 		if (data()->repliesAreComments() || data()->externalReply()) {
 			localMediaBottom -= st::historyCommentsButtonHeight;
 		}
@@ -1180,6 +1726,9 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 		}
 		if (!mediaOnBottom && (!_viewButton || !reactionsInBubble)) {
 			localMediaBottom -= st::msgPadding.bottom();
+			if (mediaDisplayed) {
+				localMediaBottom -= st::mediaInBubbleSkip;
+			}
 		}
 		if (check) {
 			localMediaBottom -= check->height();
@@ -1200,7 +1749,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 		if (customHighlight) {
 			media->drawHighlight(p, context, localMediaTop);
 		} else {
-			paintHighlight(p, context, fullGeometry.height());
+			paintHighlight(p, context, g.height());
 		}
 		if (selectionTranslation) {
 			p.translate(selectionTranslation, 0);
@@ -1210,27 +1759,14 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 	const auto roll = media ? media->bubbleRoll() : Media::BubbleRoll();
 	if (roll) {
 		p.save();
-		p.translate(fullGeometry.center());
+		p.translate(g.center());
 		p.rotate(roll.rotate);
 		p.scale(roll.scale, roll.scale);
-		p.translate(-fullGeometry.center());
+		p.translate(-g.center());
 	}
 
 	p.setTextPalette(stm->textPalette);
 
-	const auto messageRounding = countMessageRounding();
-	if (keyboard) {
-		const auto keyboardPosition = QPoint(g.left(), g.top() + g.height() + st::msgBotKbButton.margin);
-		p.translate(keyboardPosition);
-		keyboard->paint(
-			p,
-			context.st,
-			messageRounding,
-			g.width(),
-			context.clip.translated(-keyboardPosition));
-		p.translate(-keyboardPosition);
-	}
-
 	if (_reactions && !reactionsInBubble) {
 		const auto reactionsHeight = st::mediaInBubbleSkip + _reactions->height();
 		const auto reactionsLeft = (!bubble && mediaDisplayed)
@@ -1247,6 +1783,23 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 		p.translate(-reactionsPosition);
 	}
 
+	const auto messageRounding = countMessageRounding();
+	if (keyboard) {
+		const auto keyboardHeight = st::msgBotKbButton.margin + keyboard->naturalHeight();
+		g.setHeight(g.height() - keyboardHeight);
+
+		const auto keyboardPosition = QPoint(g.left(), g.top() + g.height() + st::msgBotKbButton.margin);
+		p.translate(keyboardPosition);
+		keyboard->paint(
+			p,
+			context.st,
+			messageRounding,
+			g.width(),
+			context.clip.translated(-keyboardPosition),
+			context.paused);
+		p.translate(-keyboardPosition);
+	}
+
 	if (context.highlightPathCache) {
 		context.highlightInterpolateTo = g;
 		context.highlightPathCache->clear();
@@ -1334,6 +1887,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 			paintForwardedInfo(p, trect, context);
 			paintViaBotIdInfo(p, trect, context);
 			paintReplyInfo(p, trect, context);
+			paintSummaryHeaderInfo(p, trect, context);
 		}
 		if (entry) {
 			trect.setHeight(trect.height() - entry->height());
@@ -1358,6 +1912,7 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 			const auto maybeMediaHighlight = context.highlightPathCache
 				&& context.highlightPathCache->isEmpty();
 			auto mediaPosition = QPoint(inner.left(), top);
+			_lastMediaPosition = mediaPosition;
 			p.translate(mediaPosition);
 			media->draw(p, context.translated(
 				-mediaPosition
@@ -1386,10 +1941,24 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 			textSelection = media->skipSelection(textSelection);
 			highlightRange = media->skipSelection(highlightRange);
 		}
-		auto copy = context;
-		copy.selection = textSelection;
-		copy.highlight.range = highlightRange;
-		paintText(p, trect, copy);
+		const auto drawText = context.skipDrawingParts
+			!= PaintContext::SkipDrawingParts::Content;
+		const auto drawOnlyText = drawText
+			&& (context.skipDrawingParts
+				!= PaintContext::SkipDrawingParts::None);
+		if (drawOnlyText) {
+			p.save();
+			p.setClipping(false);
+		}
+		if (drawText) {
+			auto copy = context;
+			copy.selection = textSelection;
+			copy.highlight.range = highlightRange;
+			paintText(p, trect, copy);
+		}
+		if (drawOnlyText) {
+			p.restore();
+		}
 		if (mediaDisplayed && !_invertMedia) {
 			paintMedia(trect.y() + trect.height() - mediaHeight);
 			if (context.reactionInfo && !displayInfo && !_reactions) {
@@ -1454,24 +2023,48 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 				p.setOpacity(o);
 			}
 		}
-		if (const auto size = rightActionSize()) {
-			const auto fastShareSkip = std::clamp(
-				(g.height() - size->height()) / 2,
-				0,
-				st::historyFastShareBottom);
+		ensureSummarizeButton();
+		if (const auto size = rightActionSize(); size || _summarize) {
+			const auto rightActionWidth = size
+				? size->width()
+				: _summarize->size().width();
+			const auto fastShareSkip = size
+				? std::clamp(
+					(g.height() - size->height()) / 2,
+					0,
+					st::historyFastShareBottom)
+				: st::historyFastShareBottom;
 			const auto fastShareLeft = hasRightLayout()
-				? (g.left() - size->width() - st::historyFastShareLeft)
+				? (g.left()
+					- (_summarize ? 0 : rightActionWidth)
+					- st::historyFastShareLeft)
 				: (g.left() + g.width() + st::historyFastShareLeft);
-			const auto fastShareTop = data()->isSponsored()
-				? g.top() + fastShareSkip
-				: g.top() + g.height() - fastShareSkip - size->height();
-			const auto o = p.opacity();
-			if (selectionModeResult.progress > 0) {
-				p.setOpacity(1. - selectionModeResult.progress);
+			const auto fastShareTop = g.top() + (data()->isSponsored()
+				? fastShareSkip
+				: g.height() - fastShareSkip - (size ? size->height() : 0));
+			if (size) {
+				const auto o = p.opacity();
+				if (selectionModeResult.progress > 0) {
+					p.setOpacity(1. - selectionModeResult.progress);
+				}
+				drawRightAction(
+					p,
+					context,
+					fastShareLeft,
+					fastShareTop,
+					width());
+				if (selectionModeResult.progress > 0) {
+					p.setOpacity(o);
+				}
 			}
-			drawRightAction(p, context, fastShareLeft, fastShareTop, width());
-			if (selectionModeResult.progress > 0) {
-				p.setOpacity(o);
+			if (_summarize) {
+				paintSummarize(
+					p,
+					fastShareLeft,
+					fastShareTop,
+					!context.outbg,
+					context,
+					g);
 			}
 		}
 
@@ -1528,8 +2121,8 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 		constexpr auto kMaxHeightRatio = 3.5;
 		constexpr auto kStrokeWidth = 2.;
 		constexpr auto kWaveWidth = 10.;
-		const auto isLeftSize = (!context.outbg)
-			|| delegate()->elementIsChatWide();
+		const auto isLeftSize = !context.outbg
+			|| (delegate()->elementChatMode() == ElementChatMode::Wide);
 		const auto ratio = std::min(context.gestureHorizontal.ratio, 1.);
 		const auto reachRatio = context.gestureHorizontal.reachRatio;
 		const auto size = st::historyFastShareSize;
@@ -1597,49 +2190,59 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 		p.translate(-selectionTranslation, 0);
 	}
 	if (selectionModeResult.progress) {
-		const auto progress = selectionModeResult.progress;
-		if (progress <= 1.) {
-			if (context.selected()) {
-				if (!_selectionRoundCheckbox) {
-					_selectionRoundCheckbox
-						= std::make_unique<Ui::RoundCheckbox>(
-							st::msgSelectionCheck,
-							[this] { repaint(); });
+		if (!context.skipSelectionCheck) {
+			const auto progress = selectionModeResult.progress;
+			if (progress <= 1.) {
+				if (context.selected()) {
+					if (!_selectionRoundCheckbox) {
+						_selectionRoundCheckbox
+							= std::make_unique<Ui::RoundCheckbox>(
+								st::msgSelectionCheck,
+								[this] { repaint(); });
+					}
 				}
+				if (_selectionRoundCheckbox) {
+					_selectionRoundCheckbox->setChecked(
+						context.selected(),
+						anim::type::normal);
+				}
+				const auto o = ScopedPainterOpacity(p, progress);
+				const auto &st = st::msgSelectionCheck;
+				const auto right = (delegate()->elementChatMode()
+					== ElementChatMode::Wide)
+					? std::min(
+						int(_bubbleWidthLimit
+							+ st::msgPhotoSkip
+							+ st::msgSelectionOffset
+							+ st::msgPadding.left()
+							+ st.size),
+						width())
+					: width();
+				const auto pos = QPoint(
+					(right
+						- (st::msgSelectionOffset * progress - st.size) / 2
+						- st::msgPadding.right() / 2
+						- st.size
+						- st::historyScroll.deltax),
+					rect::bottom(g) - st.size - st::msgSelectionBottomSkip);
+				{
+					p.setPen(QPen(st.border, st.width));
+					p.setBrush(context.st->msgServiceBg());
+					auto hq = PainterHighQualityEnabler(p);
+					p.drawEllipse(QRect(pos, Size(st.size)));
+				}
+				if (_selectionRoundCheckbox) {
+					_selectionRoundCheckbox->paint(
+						p,
+						pos.x(),
+						pos.y(),
+						width());
+				}
+			} else {
+				_selectionRoundCheckbox = nullptr;
 			}
-			if (_selectionRoundCheckbox) {
-				_selectionRoundCheckbox->setChecked(
-					context.selected(),
-					anim::type::normal);
-			}
-			const auto o = ScopedPainterOpacity(p, progress);
-			const auto &st = st::msgSelectionCheck;
-			const auto right = delegate()->elementIsChatWide()
-				? (st::msgMaxWidth
-					+ st::msgPhotoSkip
-					+ st::msgSelectionOffset
-					+ st::msgPadding.left()
-					+ st.size)
-				: width();
-			const auto pos = QPoint(
-				(right
-					- (st::msgSelectionOffset * progress - st.size) / 2
-					- st::msgPadding.right() / 2
-					- st.size),
-				g.y() + (g.height() - st.size) / 2);
-			{
-				p.setPen(QPen(st.border, st.width));
-				p.setBrush(context.st->msgServiceBg());
-				auto hq = PainterHighQualityEnabler(p);
-				p.drawEllipse(QRect(pos, Size(st.size)));
-			}
-			if (_selectionRoundCheckbox) {
-				_selectionRoundCheckbox->paint(p, pos.x(), pos.y(), width());
-			}
-		} else {
-			_selectionRoundCheckbox = nullptr;
 		}
-	} else {
+	} else if (!context.skipSelectionCheck) {
 		_selectionRoundCheckbox = nullptr;
 	}
 }
@@ -1777,27 +2380,21 @@ void Message::paintFromName(
 	if (!displayFromName()) {
 		return;
 	}
-	const auto badgeWidth = _rightBadge.isEmpty() ? 0 : _rightBadge.maxWidth();
-	const auto replyWidth = [&] {
-		if (isUnderCursor() && displayFastReply()) {
-			return st::msgFont->width(FastReplyText());
-		}
-		return 0;
-	}();
-	const auto rightWidth = replyWidth ? replyWidth : badgeWidth;
+	const auto badgeWidth = rightBadgeWidth();
 	auto availableLeft = trect.left();
 	auto availableWidth = trect.width();
-	if (rightWidth) {
-		availableWidth -= st::msgPadding.right() + rightWidth;
+	if (badgeWidth) {
+		availableWidth -= st::msgPadding.right() + badgeWidth;
 	}
 
 	const auto stm = context.messageStyle();
 	const auto from = item->displayFrom();
 	const auto info = from ? nullptr : item->displayHiddenSenderInfo();
 	Assert(from || info);
-	const auto nameFg = !context.outbg
-		? FromNameFg(context, colorIndex())
-		: stm->msgServiceFg->c;
+	const auto nameFg = FromNameFg(
+		context,
+		colorIndex(),
+		colorCollectible());
 	const auto nameText = [&] {
 		if (from) {
 			validateFromNameText(from);
@@ -1808,19 +2405,22 @@ void Message::paintFromName(
 	const auto statusWidth = _fromNameStatus
 		? st::dialogsPremiumIcon.icon.width()
 		: 0;
+	const auto nameAvailableWidth = (statusWidth && availableWidth > statusWidth)
+		? (availableWidth - statusWidth)
+		: availableWidth;
 	if (statusWidth && availableWidth > statusWidth) {
 		const auto x = availableLeft
-			+ std::min(availableWidth - statusWidth, nameText->maxWidth());
+			+ std::min(nameAvailableWidth, nameText->maxWidth());
 		const auto y = trect.top();
 		auto color = nameFg;
 		color.setAlpha(115);
-		const auto id = from ? from->emojiStatusId() : 0;
+		const auto id = from ? from->emojiStatusId() : EmojiStatusId();
 		if (_fromNameStatus->id != id) {
 			const auto that = const_cast<Message*>(this);
 			_fromNameStatus->custom = id
-				? std::make_unique<Ui::Text::LimitedLoopsEmoji>(
+				? MakeWrappedEmoji<Ui::Text::LimitedLoopsEmoji>(
 					history()->owner().customEmojiManager().create(
-						id,
+						Data::EmojiStatusCustomId(id),
 						[=] { that->customEmojiRepaint(); }),
 					kPlayStatusLimit)
 				: nullptr;
@@ -1844,13 +2444,30 @@ void Message::paintFromName(
 		} else {
 			st::dialogsPremiumIcon.icon.paint(p, x, y, width(), color);
 		}
-		availableWidth -= statusWidth;
 	}
 	p.setFont(st::msgNameFont);
 	p.setPen(nameFg);
+	const auto nameLinkHandler = fromLink();
+	const auto nameWidth = std::min(
+		nameText->maxWidth(),
+		nameAvailableWidth);
+	if (!from) {
+		if (const auto tooltip = Get<HiddenSenderTooltip>()) {
+			tooltip->linkRect = QRect(
+				availableLeft,
+				trect.top(),
+				nameWidth,
+				st::msgNameFont->height);
+		}
+	}
+	paintLinkRipple(
+		p,
+		nameLinkHandler,
+		QRect(availableLeft, trect.top(), nameWidth, st::msgNameFont->height),
+		trect.topLeft());
 	nameText->draw(p, {
 		.position = { availableLeft, trect.top() },
-		.availableWidth = availableWidth,
+		.availableWidth = nameAvailableWidth,
 		.elisionLines = 1,
 	});
 	const auto skipWidth = nameText->maxWidth()
@@ -1865,37 +2482,120 @@ void Message::paintFromName(
 	auto via = item->Get<HistoryMessageVia>();
 	if (via && !displayForwardedFrom() && availableWidth > 0) {
 		p.setPen(stm->msgServiceFg);
+		paintLinkRipple(
+			p,
+			via->link,
+			QRect(availableLeft, trect.top(), via->width, st::msgServiceFont->height),
+			trect.topLeft());
 		p.drawText(availableLeft, trect.top() + st::msgServiceFont->ascent, via->text);
 		auto skipWidth = via->width + st::msgServiceFont->spacew;
 		availableLeft += skipWidth;
 		availableWidth -= skipWidth;
 	}
-	if (rightWidth) {
+	if (const auto guestChat = item->Get<HistoryMessageGuestChat>()) {
+		if (availableWidth > 0) {
+			p.setPen(stm->msgServiceFg);
+			paintLinkRipple(
+				p,
+				guestChat->link,
+				QRect(availableLeft, trect.top(), guestChat->width, st::msgServiceFont->height),
+				trect.topLeft());
+			p.drawText(availableLeft, trect.top() + st::msgServiceFont->ascent, guestChat->text);
+			auto skipWidth = guestChat->width + st::msgServiceFont->spacew;
+			availableLeft += skipWidth;
+			availableWidth -= skipWidth;
+		}
+	}
+	if (badgeWidth) {
 		p.setPen(stm->msgDateFg);
-		if (replyWidth) {
-			p.setFont(ClickHandler::showAsActive(_fastReplyLink)
-				? st::msgFont->underline()
-				: st::msgFont);
-			p.drawText(
-				trect.left() + trect.width() - rightWidth,
-				trect.top() + st::msgFont->ascent,
-				FastReplyText());
-		} else {
-			const auto shift = QPoint(trect.width() - rightWidth, 0);
-			const auto pen = !_rightBadgeHasBoosts
-				? QPen()
-				: !context.outbg
-				? QPen(FromNameFg(context, colorIndex()))
-				: stm->msgServiceFg->p;
-			auto colored = std::array<Ui::Text::SpecialColor, 1>{
-				{ { &pen, &pen } },
-			};
-			_rightBadge.draw(p, {
-				.position = trect.topLeft() + shift,
-				.availableWidth = rightWidth,
-				.colors = colored,
-				.now = context.now,
-			});
+		if (const auto badge = Get<RightBadge>()) {
+			const auto badgeColor = (badge->role == BadgeRole::Creator)
+				? st::rankOwnerFg->c
+				: (badge->role == BadgeRole::Admin)
+				? st::rankAdminFg->c
+				: st::rankUserFg->c;
+			const auto badgeLeft = trect.left()
+				+ trect.width()
+				- badge->width;
+			if (badge->role != BadgeRole::User) {
+				auto bgColor = badgeColor;
+				bgColor.setAlphaF(0.15);
+				const auto pill = ComputeBadgePillGeometry(badge);
+				const auto &padding = st::msgTagBadgePadding;
+				const auto badgeTop = trect.top()
+					+ (st::msgNameFont->height - pill.height) / 2;
+				const auto pillRect = QRect(
+					badgeLeft,
+					badgeTop,
+					pill.width,
+					pill.height);
+				p.setPen(Qt::NoPen);
+				p.setBrush(bgColor);
+				{
+					auto hq = PainterHighQualityEnabler(p);
+					p.drawRoundedRect(
+						pillRect,
+						pill.height / 2.,
+						pill.height / 2.);
+				}
+				if (badge->ripple) {
+					auto rippleColor = badgeColor;
+					rippleColor.setAlphaF(0.1);
+					badge->ripple->paint(
+						p,
+						badgeLeft,
+						badgeTop,
+						width(),
+						&rippleColor);
+					if (badge->ripple->empty()) {
+						badge->ripple.reset();
+					}
+				}
+				p.setPen(badgeColor);
+				badge->tag.draw(p, {
+					.position = QPoint(
+						badgeLeft + (pill.width - pill.textWidth) / 2,
+						badgeTop + padding.top()),
+					.availableWidth = pill.textWidth,
+					.now = context.now,
+				});
+			} else if (!badge->tag.isEmpty()) {
+				if (badge->ripple) {
+					const auto pill = ComputeBadgePillGeometry(badge);
+					const auto &padding = st::msgTagBadgePadding;
+					const auto pillLeft = badgeLeft
+						- (pill.width - pill.textWidth) / 2;
+					const auto pillTop = trect.top() - padding.top();
+					auto rippleColor = badgeColor;
+					rippleColor.setAlphaF(0.1);
+					badge->ripple->paint(
+						p,
+						pillLeft,
+						pillTop,
+						width(),
+						&rippleColor);
+					if (badge->ripple->empty()) {
+						badge->ripple.reset();
+					}
+				}
+				p.setPen(st::rankUserFg);
+				badge->tag.draw(p, {
+					.position = QPoint(badgeLeft, trect.top()),
+					.availableWidth = badge->tag.maxWidth(),
+					.now = context.now,
+				});
+			}
+			if (!badge->boosts.isEmpty()) {
+				const auto boostWidth = badge->boosts.maxWidth();
+				p.setPen(badgeColor);
+				badge->boosts.draw(p, {
+					.position = QPoint(
+						trect.left() + trect.width() - boostWidth,
+						trect.top()),
+					.availableWidth = boostWidth,
+					.now = context.now,
+				});
+			}
 		}
 	}
 	trect.setY(trect.y() + st::msgNameFont->height);
@@ -1992,10 +2692,76 @@ void Message::paintForwardedInfo(
 			? st->boxTextFgGood()
 			: stm->msgServiceFg);
 		p.setFont(serviceFont);
-		p.setTextPalette(!forwarded->psaType.isEmpty()
+		const auto &fwdPalette = !forwarded->psaType.isEmpty()
 			? st->historyPsaForwardPalette()
-			: stm->fwdTextPalette);
-		forwarded->text.drawElided(p, trect.x(), trect.y(), useWidth, 2, style::al_left, 0, -1, 0, breakEverywhere);
+			: stm->fwdTextPalette;
+		const auto rippleLinkRange = (_linkRipple && _linkRipple->link)
+			? forwarded->text.linkRangeFor(_linkRipple->link)
+			: TextSelection();
+		const auto rippleBelongsHere = !rippleLinkRange.empty();
+		if (_linkRipple
+			&& _linkRipple->ripple
+			&& _linkRipple->cachedWidth != useWidth
+			&& rippleBelongsHere) {
+			_linkRipple = nullptr;
+		}
+		if (_linkRipple && _linkRipple->ripple && rippleBelongsHere) {
+			auto color = p.pen().color();
+			color.setAlphaF(0.1);
+			_linkRipple->ripple->paint(
+				p,
+				trect.x() + _linkRipple->maskOffset.x(),
+				trect.y() + _linkRipple->maskOffset.y(),
+				width(),
+				&color);
+			if (_linkRipple->ripple->empty()) {
+				_linkRipple = nullptr;
+			}
+		}
+		const auto needRippleMask = _linkRipple
+			&& _linkRipple->link
+			&& !_linkRipple->ripple
+			&& rippleBelongsHere;
+		const auto hiddenTooltip = Get<HiddenSenderTooltip>();
+		const auto recomputeHidden = hiddenTooltip
+			&& (hiddenTooltip->cachedWidth != useWidth);
+		const auto hiddenSenderRange = recomputeHidden
+			? forwarded->text.linkRangeFor(
+				HiddenSenderInfo::ForwardClickHandler())
+			: TextSelection();
+		auto highlightPath = QPainterPath();
+		auto highlightRequest = Ui::Text::HighlightInfoRequest{
+			.range = needRippleMask ? rippleLinkRange : hiddenSenderRange,
+			.outPath = &highlightPath,
+		};
+		const auto needHighlight = needRippleMask
+			|| !hiddenSenderRange.empty();
+		forwarded->text.draw(p, {
+			.position = { trect.x(), trect.y() },
+			.availableWidth = useWidth,
+			.palette = &fwdPalette,
+			.paused = p.inactive(),
+			.highlight = needHighlight ? &highlightRequest : nullptr,
+			.elisionLines = 2,
+			.elisionBreakEverywhere = breakEverywhere,
+		});
+		if (recomputeHidden) {
+			hiddenTooltip->cachedWidth = useWidth;
+			if (!hiddenSenderRange.empty() && !highlightPath.isEmpty()) {
+				hiddenTooltip->linkRect
+					= highlightPath.boundingRect().toRect();
+			}
+		}
+		if (needRippleMask && !highlightPath.isEmpty()) {
+			createLinkRippleMask(
+				highlightPath,
+				trect.topLeft(),
+				useWidth,
+				st::nameRipplePadding,
+				st::nameRippleRadius);
+		} else if (needRippleMask) {
+			_linkRipple = nullptr;
+		}
 		p.setTextPalette(stm->textPalette);
 
 		if (!forwarded->psaType.isEmpty()) {
@@ -2044,6 +2810,23 @@ void Message::paintReplyInfo(
 	}
 }
 
+void Message::paintSummaryHeaderInfo(
+		Painter &p,
+		QRect &trect,
+		const PaintContext &context) const {
+	if (const auto summaryHeader = Get<SummaryHeader>()) {
+		summaryHeader->paint(
+			p,
+			this,
+			context,
+			trect.x(),
+			trect.y(),
+			trect.width(),
+			true);
+		trect.setY(trect.y() + summaryHeader->height());
+	}
+}
+
 void Message::paintViaBotIdInfo(
 		Painter &p,
 		QRect &trect,
@@ -2054,6 +2837,11 @@ void Message::paintViaBotIdInfo(
 			const auto stm = context.messageStyle();
 			p.setFont(st::msgServiceNameFont);
 			p.setPen(stm->msgServiceFg);
+			paintLinkRipple(
+				p,
+				via->link,
+				QRect(trect.x(), trect.y(), via->width, st::msgServiceNameFont->height),
+				trect.topLeft());
 			p.drawTextLeft(trect.left(), trect.top(), width(), via->text);
 			trect.setY(trect.y() + st::msgServiceNameFont->height);
 		}
@@ -2070,7 +2858,6 @@ void Message::paintText(
 	const auto stm = context.messageStyle();
 	p.setPen(stm->historyTextFg);
 	p.setFont(st::msgFont);
-	prepareCustomEmojiPaint(p, context, text());
 	if (const auto botTop = Get<FakeBotAboutTop>()) {
 		botTop->text.drawLeftElided(
 			p,
@@ -2080,22 +2867,216 @@ void Message::paintText(
 			width());
 		trect.setY(trect.y() + botTop->height);
 	}
+	if (const auto rich = const_cast<Message*>(this)->richpage()) {
+	    paintRichText(p, rich, richPageRect(trect), context);
+		return;
+	}
+
+	if (!context.clip.intersects(trect)
+		&& context.skipDrawingParts == PaintContext::SkipDrawingParts::None
+		&& !context.gestureHorizontal.translation) {
+		return;
+	}
+	prepareCustomEmojiPaint(p, context, text());
+
+	const auto rippleLinkRange = (_linkRipple && _linkRipple->link)
+		? text().linkRangeFor(_linkRipple->link)
+		: TextSelection();
+	const auto rippleBelongsHere = !rippleLinkRange.empty();
+	if (_linkRipple
+		&& _linkRipple->ripple
+		&& _linkRipple->cachedWidth != trect.width()
+		&& rippleBelongsHere) {
+		_linkRipple = nullptr;
+	}
+	if (_linkRipple && _linkRipple->ripple && rippleBelongsHere) {
+		auto color = stm->textPalette.linkFg->c;
+		color.setAlphaF(0.1);
+		_linkRipple->ripple->paint(
+			p,
+			trect.x() + _linkRipple->maskOffset.x(),
+			trect.y() + _linkRipple->maskOffset.y(),
+			width(),
+			&color);
+		if (_linkRipple->ripple->empty()) {
+			_linkRipple = nullptr;
+		}
+	}
+	const auto needRippleMask = _linkRipple
+		&& _linkRipple->link
+		&& !_linkRipple->ripple
+		&& rippleBelongsHere;
+	auto ripplePath = QPainterPath();
+	auto rippleRequest = Ui::Text::HighlightInfoRequest{
+		.range = rippleLinkRange,
+		.outPath = &ripplePath,
+	};
+
+	const auto appearing = Get<TextAppearing>();
+	const auto appearingClip = appearing && appearing->use;
+	auto linePostprocess = std::optional<Ui::Text::LinePostprocess>();
+	if (appearingClip) {
+		const auto shown = appearing->shownLine;
+		const auto &line = appearing->lines[shown];
+
+		p.save();
+		p.setClipRect(QRect(
+			trect.x(),
+			trect.y(),
+			trect.width(),
+			line.bottom));
+
+		const auto revealedWidth = appearing->revealedLineWidth;
+		const auto lineWidth = line.width;
+		const auto availableWidth = textRealWidth();
+		linePostprocess.emplace(Ui::Text::LinePostprocess{
+			.method = [=](int lineIndex) -> Fn<void(QImage&)> {
+				if (lineIndex != shown || revealedWidth >= lineWidth) {
+					return nullptr;
+				}
+				return [=](QImage &cache) {
+					ApplyRevealGradient(appearing, cache, availableWidth);
+				};
+			},
+			.cache = &appearing->lineCache,
+		});
+	}
+
 	auto highlightRequest = context.computeHighlightCache();
 	text().draw(p, {
 		.position = trect.topLeft(),
-		.availableWidth = trect.width(),
+		.availableWidth = std::max(textRealWidth(), trect.width()),
 		.palette = &stm->textPalette,
 		.pre = stm->preCache.get(),
-		.blockquote = context.quoteCache(contentColorIndex()),
+		.blockquote = context.quoteCache(
+			contentColorCollectible(),
+			contentColorIndex()),
 		.colors = context.st->highlightColors(),
 		.spoiler = Ui::Text::DefaultSpoilerCache(),
 		.now = context.now,
 		.pausedEmoji = context.paused || On(PowerSaving::kEmojiChat),
 		.pausedSpoiler = context.paused || On(PowerSaving::kChatSpoiler),
 		.selection = context.selection,
-		.highlight = highlightRequest ? &*highlightRequest : nullptr,
+		.highlight = needRippleMask
+			? &rippleRequest
+			: (highlightRequest ? &*highlightRequest : nullptr),
 		.useFullWidth = true,
+		.linePostprocess = linePostprocess ? &*linePostprocess : nullptr,
 	});
+	if (needRippleMask && !ripplePath.isEmpty()) {
+		createLinkRippleMask(
+			ripplePath,
+			trect.topLeft(),
+			trect.width(),
+			st::linkRipplePadding,
+			st::linkRippleRadius);
+	} else if (needRippleMask) {
+		_linkRipple = nullptr;
+	}
+	if (appearingClip) {
+		p.restore();
+	}
+}
+
+void Message::paintRichText(
+		Painter &p,
+		not_null<HistoryMessageRichPage*> rich,
+		QRect rect,
+		const PaintContext &context) const {
+	const auto stm = context.messageStyle();
+	const auto paletteVersion = context.st->paletteVersion();
+	if (rich->paletteVersion != paletteVersion) {
+		rich->paletteVersion = paletteVersion;
+		rich->article.invalidatePaletteCache();
+	}
+	const auto appearing = Get<TextAppearing>();
+	const auto appearingClip = appearing
+		&& appearing->use
+		&& (appearing->shownLine < int(appearing->lines.size()));
+	const auto viewportClip = QRect(
+		QPoint(),
+		rect.size()
+	).intersected(context.clip.translated(-rect.topLeft()));
+	auto articleClip = viewportClip;
+	if (appearingClip) {
+		const auto &line = appearing->lines[appearing->shownLine];
+		const auto shownHeight = std::min(
+			std::max(appearing->shownHeight, 0),
+			std::max(line.bottom, 0));
+		articleClip = articleClip.intersected(QRect(
+			0,
+			0,
+			rect.width(),
+			shownHeight));
+	}
+	rich->article.setVisibleTopBottom(
+		std::clamp(viewportClip.top(), 0, rect.height()),
+		std::clamp(viewportClip.bottom() + 1, 0, rect.height()));
+	auto articleContext = Iv::Markdown::MarkdownArticlePaintContext(
+		context).translated(-rect.topLeft());
+	if (context.messageSelection && context.messageSelection->isRichPage()) {
+		articleContext.selectionState.selection
+			= context.messageSelection->richPage.selection;
+		articleContext.selectionState.endpoints
+			= &context.messageSelection->richPage.endpoints;
+	}
+	articleContext.clip = articleClip;
+	articleContext.caches = {
+		.pre = stm->preCache.get(),
+		.blockquote = context.quoteCache(
+			contentColorCollectible(),
+			contentColorIndex()),
+		.thinking = &rich->thinkingPaintCache,
+		.pathShiftGradient = delegate()->elementPathShiftGradient().get(),
+		.colors = context.st->highlightColors(),
+		.st = &stm->richPageStyle,
+		.repaint = [weak = base::make_weak(const_cast<Message*>(this))] {
+			if (const auto owner = weak.get()) {
+				owner->requestRichPageRepaint(QRect());
+			}
+		},
+		.repaintRect = [weak = base::make_weak(const_cast<Message*>(this))](
+				QRect articleRect) {
+			if (const auto owner = weak.get()) {
+				owner->requestRichPageRepaint(articleRect);
+			}
+		},
+	};
+	auto revealPostprocess
+		= std::optional<Iv::Markdown::MarkdownArticleRevealPostprocess>();
+	auto revealState
+		= std::optional<Iv::Markdown::MarkdownArticleRevealPaintState>();
+	if (appearingClip) {
+		revealPostprocess.emplace(
+			Iv::Markdown::MarkdownArticleRevealPostprocess{
+				.method = [=](
+						int lineIndex,
+						int availableWidth) -> Fn<void(QImage&)> {
+					if (lineIndex != appearing->shownLine
+						|| appearing->revealedLineWidth
+							>= appearing->lines[lineIndex].width) {
+						return nullptr;
+					}
+					return [=](QImage &cache) {
+						ApplyRevealGradient(
+							appearing,
+							cache,
+							availableWidth);
+					};
+				},
+				.cache = &appearing->lineCache,
+			});
+		revealState.emplace(Iv::Markdown::MarkdownArticleRevealPaintState{
+			.activeLine = appearing->shownLine,
+			.nextLine = 0,
+			.postprocess = &*revealPostprocess,
+		});
+		articleContext.reveal = &*revealState;
+	}
+	p.save();
+	p.translate(rect.topLeft());
+	rich->article.paint(p, articleContext);
+	p.restore();
 }
 
 PointState Message::pointState(QPoint point) const {
@@ -2118,6 +3099,7 @@ PointState Message::pointState(QPoint point) const {
 
 			// Entry page is always a bubble bottom.
 			auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || check || (entry/* && entry->isBubbleBottom()*/);
+			auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
 
 			if (item->repliesAreComments() || item->externalReply()) {
 				g.setHeight(g.height() - st::historyCommentsButtonHeight);
@@ -2158,11 +3140,18 @@ PointState Message::pointState(QPoint point) const {
 				trect.setHeight(trect.height() - entryHeight);
 			}
 
-			auto mediaHeight = media->height();
-			auto mediaLeft = trect.x() - st::msgPadding.left();
-			auto mediaTop = (trect.y() + trect.height() - mediaHeight);
-
-			if (point.y() >= mediaTop && point.y() < mediaTop + mediaHeight) {
+			const auto mediaHeight = mediaDisplayed ? media->height() : 0;
+			const auto mediaLeft = trect.x() - st::msgPadding.left();
+			const auto mediaTop = (!mediaDisplayed || _invertMedia)
+				? (trect.y() + (mediaOnTop ? 0 : st::mediaInBubbleSkip))
+				: (trect.y() + trect.height() - mediaHeight);
+			if (mediaDisplayed && _invertMedia) {
+				trect.setY(mediaTop
+					+ mediaHeight
+					+ (mediaOnBottom ? 0 : st::mediaInBubbleSkip));
+			}
+			if (point.y() >= mediaTop
+				&& point.y() < mediaTop + mediaHeight) {
 				return media->pointState(point - QPoint(mediaLeft, mediaTop));
 			}
 		}
@@ -2180,6 +3169,16 @@ bool Message::displayFromPhoto() const {
 void Message::clickHandlerPressedChanged(
 		const ClickHandlerPtr &handler,
 		bool pressed) {
+	const auto startLinkRipple = [&] {
+		if (!_linkRipple) {
+			if (!pressed) {
+				return;
+			}
+			_linkRipple = std::make_unique<LinkRipple>();
+		}
+		_linkRipple->link = handler;
+		toggleLinkRipple(pressed);
+	};
 	if (const auto markup = data()->Get<HistoryMessageReplyMarkup>()) {
 		if (const auto keyboard = markup->inlineKeyboard.get()) {
 			keyboard->clickHandlerPressedChanged(
@@ -2225,6 +3224,73 @@ void Message::clickHandlerPressedChanged(
 	} else if (const auto reply = Get<Reply>()
 		; reply && (handler == reply->link())) {
 		toggleReplyRipple(pressed);
+	} else if (const auto summaryHeader = Get<SummaryHeader>()
+		; summaryHeader && (handler == summaryHeader->link())) {
+		toggleSummaryHeaderRipple(pressed);
+	} else if (_summarize && (handler == _summarize->link())) {
+		if (pressed) {
+			_summarize->addRipple([=] { repaint(); });
+		} else {
+			_summarize->stopRipple();
+		}
+	} else if (const auto badge = Get<RightBadge>()
+		; badge && badge->tagLink && handler == badge->tagLink) {
+		toggleBadgeRipple(pressed);
+	} else if (displayFromName() && handler == fromLink()) {
+		if (_fromLinkRipplePointSet || !pressed) {
+			startLinkRipple();
+		}
+	} else if (const auto via = data()->Get<HistoryMessageVia>()
+		; via
+		&& (handler == via->link)
+		&& !displayForwardedFrom()) {
+		startLinkRipple();
+	} else if (const auto guestChat = data()->Get<HistoryMessageGuestChat>()
+		; guestChat
+		&& (handler == guestChat->link)) {
+		startLinkRipple();
+	} else if (const auto forwarded = data()->Get<HistoryMessageForwarded>()
+		; forwarded
+		&& displayForwardedFrom()
+		&& !forwarded->text.linkRangeFor(handler).empty()) {
+		startLinkRipple();
+	} else if (hasVisibleText()
+		&& IsRippleLink(handler)
+		&& !text().linkRangeFor(handler).empty()) {
+		startLinkRipple();
+	} else if (const auto rich = richpage()
+		; rich
+		&& ((handler == rich->handler)
+			|| (handler == rich->handlerHorizontalScrollPressed))) {
+		if (pressed) {
+			if ((handler == rich->handler)
+				&& rich->handlerHorizontalScrollHit
+				&& rich->article.beginHorizontalScroll(
+					rich->handlerHorizontalScrollPoint,
+					false)) {
+				rich->handlerHorizontalScrollActive = true;
+				rich->handlerHorizontalScrollPressed = handler;
+			}
+		} else if (rich->handlerHorizontalScrollActive
+			&& (handler == rich->handlerHorizontalScrollPressed)) {
+			rich->article.endHorizontalScroll();
+			rich->handlerHorizontalScrollActive = false;
+			rich->handlerHorizontalScrollPressed = nullptr;
+		}
+		if ((handler == rich->handler) && rich->handlerPlaceholderId) {
+			if (pressed) {
+				rich->article.addPlaceholderRipple(
+					rich->handlerPlaceholderId,
+					rich->handlerPlaceholderPoint);
+			} else {
+				rich->article.stopPlaceholderRipple(rich->handlerPlaceholderId);
+			}
+		}
+	} else if (_reactions) {
+		_reactions->clickHandlerPressedChanged(
+			handler,
+			pressed,
+			[=] { repaint(); });
 	}
 }
 
@@ -2267,6 +3333,27 @@ void Message::toggleRightActionRipple(bool pressed) {
 	}
 }
 
+void Message::toggleBadgeRipple(bool pressed) {
+	const auto badge = Get<RightBadge>();
+	if (!badge) {
+		return;
+	} else if (pressed) {
+		if (!badge->ripple) {
+			const auto pill = ComputeBadgePillGeometry(badge);
+			auto mask = Ui::RippleAnimation::RoundRectMask(
+				QSize(pill.width, pill.height),
+				pill.height / 2);
+			badge->ripple = std::make_unique<Ui::RippleAnimation>(
+				st::defaultRippleAnimation,
+				std::move(mask),
+				[=] { repaint(); });
+		}
+		badge->ripple->add(badge->lastPoint);
+	} else if (badge->ripple) {
+		badge->ripple->lastStop();
+	}
+}
+
 void Message::toggleReplyRipple(bool pressed) {
 	const auto reply = Get<Reply>();
 	if (!reply) {
@@ -2289,6 +3376,26 @@ void Message::toggleReplyRipple(bool pressed) {
 	}
 }
 
+void Message::toggleSummaryHeaderRipple(bool pressed) {
+	const auto summaryHeader = Get<SummaryHeader>();
+	if (!summaryHeader) {
+		return;
+	}
+
+	if (pressed) {
+		if (!unwrapped()) {
+			const auto size = QSize(
+				countGeometry().width() - rect::m::sum::h(st::msgPadding),
+				summaryHeader->height()
+					- rect::m::sum::v(summaryHeader->margins()));
+			summaryHeader->createRippleAnimation(this, size);
+		}
+		summaryHeader->addRipple();
+	} else {
+		summaryHeader->stopLastRipple();
+	}
+}
+
 BottomRippleMask Message::bottomRippleMask(int buttonHeight) const {
 	using namespace Ui;
 	using namespace Images;
@@ -2382,6 +3489,119 @@ void Message::toggleTopicButtonRipple(bool pressed) {
 	}
 }
 
+void Message::paintLinkRipple(
+		Painter &p,
+		const ClickHandlerPtr &handler,
+		QRect linkRect,
+		QPoint textPosition) const {
+	const auto raw = _linkRipple.get();
+	if (!raw || raw->link != handler) {
+		return;
+	}
+	if (const auto ripple = raw->ripple.get()) {
+		auto color = p.pen().color();
+		color.setAlpha(25);
+		ripple->paint(
+			p,
+			textPosition.x() + raw->maskOffset.x(),
+			textPosition.y() + raw->maskOffset.y(),
+			width(),
+			&color);
+		if (ripple->empty()) {
+			_linkRipple = nullptr;
+		}
+	} else {
+		createLinkRippleMask(
+			linkRect,
+			textPosition,
+			st::nameRipplePadding,
+			st::nameRippleRadius);
+	}
+}
+
+void Message::toggleLinkRipple(bool pressed) {
+	if (!drawBubble()) {
+		return;
+	} else if (pressed) {
+		repaint();
+	} else if (const auto ripple = _linkRipple
+		? _linkRipple->ripple.get()
+		: nullptr) {
+		ripple->lastStop();
+	}
+}
+
+void Message::recordLinkRipplePoint(
+		QPoint point,
+		QPoint textOrigin) const {
+	_linkRippleLastPoint = point - textOrigin;
+}
+
+void Message::createLinkRippleMask(
+		const QPainterPath &path,
+		QPoint textPosition,
+		int useWidth,
+		style::margins padding,
+		int radius) const {
+	auto rects = std::vector<QRect>();
+	for (const auto &polygon : path.toSubpathPolygons()) {
+		rects.push_back(polygon.boundingRect().toAlignedRect());
+	}
+	auto boundingRect = QRect();
+	for (auto &rect : rects) {
+		rect = rect.marginsAdded(padding);
+		if (boundingRect.isEmpty()) {
+			boundingRect = rect;
+		} else {
+			boundingRect = boundingRect.united(rect);
+		}
+	}
+	if (boundingRect.isEmpty()) {
+		return;
+	}
+	const auto topLeft = boundingRect.topLeft();
+	const auto maskOrigin = topLeft - textPosition;
+	auto mask = Ui::RippleAnimation::MaskByDrawer(
+		boundingRect.size(),
+		false,
+		[&](QPainter &p) {
+			for (const auto &rect : rects) {
+				const auto shifted = rect.translated(-topLeft);
+				p.drawRoundedRect(shifted, radius, radius);
+			}
+		});
+	_linkRipple->maskOffset = maskOrigin;
+	_linkRipple->cachedWidth = useWidth;
+	_linkRipple->ripple = std::make_unique<Ui::RippleAnimation>(
+		st::defaultRippleAnimation,
+		std::move(mask),
+		[=] { repaint(); });
+	_linkRipple->ripple->add(_linkRippleLastPoint - maskOrigin);
+}
+
+void Message::createLinkRippleMask(
+		QRect linkRect,
+		QPoint textPosition,
+		style::margins padding,
+		int radius) const {
+	auto rect = linkRect.marginsAdded(padding);
+	const auto maskOrigin = rect.topLeft() - textPosition;
+	const auto size = rect.size();
+	auto mask = Ui::RippleAnimation::MaskByDrawer(
+		size,
+		false,
+		[&](QPainter &p) {
+			p.drawRoundedRect(QRect(QPoint(), size), radius, radius);
+		});
+	_linkRipple->maskOffset = maskOrigin;
+	_linkRipple->cachedWidth = 0;
+	_linkRipple->ripple = std::make_unique<Ui::RippleAnimation>(
+		st::defaultRippleAnimation,
+		std::move(mask),
+		[=] { repaint(); });
+	_linkRipple->ripple->add(_linkRippleLastPoint - maskOrigin);
+}
+
 void Message::createTopicButtonRipple() {
 	const auto geometry = countGeometry().marginsRemoved(st::msgPadding);
 	const auto availableWidth = geometry.width();
@@ -2414,13 +3634,13 @@ bool Message::hasHeavyPart() const {
 
 void Message::unloadHeavyPart() {
 	Element::unloadHeavyPart();
-	if (_reactions) {
-		_reactions->unloadCustomEmoji();
-	}
 	_comments = nullptr;
 	if (_fromNameStatus) {
 		_fromNameStatus->custom = nullptr;
-		_fromNameStatus->id = 0;
+		_fromNameStatus->id = EmojiStatusId();
+	}
+	if (const auto summaryHeader = Get<SummaryHeader>()) {
+		summaryHeader->unloadHeavyPart();
 	}
 }
 
@@ -2431,6 +3651,8 @@ bool Message::hasFromPhoto() const {
 	switch (context()) {
 	case Context::AdminLog:
 		return true;
+	case Context::Monoforum:
+		return (delegate()->elementChatMode() == ElementChatMode::Wide);
 	case Context::History:
 	case Context::ChatPreview:
 	case Context::TTLViewer:
@@ -2447,18 +3669,23 @@ bool Message::hasFromPhoto() const {
 			return true;
 		} else if (item->isEmpty()
 			|| item->isFakeAboutView()
-			|| (context() == Context::Replies && item->isDiscussionPost())) {
+			|| isCommentsRootView()) {
 			return false;
-		} else if (delegate()->elementIsChatWide()) {
-			return true;
+		}
+		const auto mode = delegate()->elementChatMode();
+		if (mode != ElementChatMode::Default) {
+			return (mode == ElementChatMode::Wide);
 		} else if (item->history()->peer->isVerifyCodes()) {
 			return !hasOutLayout();
-		} else if (const auto forwarded = item->Get<HistoryMessageForwarded>()) {
+		} else if (item->Has<HistoryMessageForwarded>()) {
 			const auto peer = item->history()->peer;
 			if (peer->isSelf() || peer->isRepliesChat()) {
 				return !hasOutLayout();
 			}
 		}
+		if (item->isGuestChatBotMessage()) {
+			return true;
+		}
 		return !item->out() && !item->history()->peer->isUser();
 	} break;
 	case Context::ContactPreview:
@@ -2471,6 +3698,8 @@ bool Message::hasFromPhoto() const {
 TextState Message::textState(
 		QPoint point,
 		StateRequest request) const {
+	_fromLinkRipplePointSet = 0;
+
 	const auto item = data();
 	const auto media = this->media();
 
@@ -2480,22 +3709,23 @@ TextState Message::textState(
 	const auto minSymbol = (_invertMedia && request.onlyMessageText)
 		? visibleMediaTextLen
 		: 0;
-	result.symbol = minSymbol;
+	SetTextStatePosition(&result, minSymbol, false);
 
 	auto g = countGeometry();
 	if (g.width() < 1 || isHidden()) {
 		return result;
 	}
 
+	if (const auto service = Get<ServicePreMessage>()) {
+		result.link = service->textState(point, request, g);
+		if (result.link) {
+			return result;
+		}
+	}
+
 	const auto bubble = drawBubble();
 	const auto reactionsInBubble = _reactions && embedReactionsInBubble();
 	const auto mediaDisplayed = media && media->isDisplayed();
-	auto keyboard = item->inlineReplyKeyboard();
-	auto keyboardHeight = 0;
-	if (keyboard) {
-		keyboardHeight = keyboard->naturalHeight();
-		g.setHeight(g.height() - st::msgBotKbButton.margin - keyboardHeight);
-	}
 
 	if (_reactions && !reactionsInBubble) {
 		const auto reactionsHeight = st::mediaInBubbleSkip + _reactions->height();
@@ -2505,11 +3735,27 @@ TextState Message::textState(
 		g.setHeight(g.height() - reactionsHeight);
 		const auto reactionsPosition = QPoint(reactionsLeft + g.left(), g.top() + g.height() + st::mediaInBubbleSkip);
 		if (_reactions->getState(point - reactionsPosition, &result)) {
-			result.symbol += visibleMediaTextLen + visibleTextLen;
+			AddTextStateOffset(&result, visibleMediaTextLen + visibleTextLen);
 			return result;
 		}
 	}
 
+	const auto keyboard = item->inlineReplyKeyboard();
+	auto keyboardHeight = 0;
+	if (keyboard) {
+		keyboardHeight = keyboard->naturalHeight();
+		g.setHeight(g.height() - st::msgBotKbButton.margin - keyboardHeight);
+
+		if (item->isHistoryEntry() || item->isAdminLogEntry()) {
+			const auto keyboardPosition = QPoint(g.left(), g.top() + g.height() + st::msgBotKbButton.margin);
+			if (QRect(keyboardPosition, QSize(g.width(), keyboardHeight)).contains(point)) {
+				AddTextStateOffset(&result, visibleMediaTextLen + visibleTextLen);
+				result.link = keyboard->getLink(point - keyboardPosition);
+				return result;
+			}
+		}
+	}
+
 	if (bubble) {
 		const auto inBubble = g.contains(point);
 		const auto check = factcheckBlock();
@@ -2521,7 +3767,7 @@ TextState Message::textState(
 
 		auto inner = g;
 		if (getStateCommentsButton(point, inner, &result)) {
-			result.symbol += visibleMediaTextLen + visibleTextLen;
+			AddTextStateOffset(&result, visibleMediaTextLen + visibleTextLen);
 			return result;
 		}
 		auto trect = inner.marginsRemoved(st::msgPadding);
@@ -2539,7 +3785,7 @@ TextState Message::textState(
 			trect.setHeight(trect.height() - reactionsHeight);
 			const auto reactionsPosition = QPoint(trect.left(), trect.top() + trect.height() + reactionsTop);
 			if (_reactions->getState(point - reactionsPosition, &result)) {
-				result.symbol += visibleMediaTextLen + visibleTextLen;
+				AddTextStateOffset(&result, visibleMediaTextLen + visibleTextLen);
 				return result;
 			}
 		}
@@ -2555,7 +3801,7 @@ TextState Message::textState(
 						? inner
 						: inner - heightMargins),
 					&result)) {
-				result.symbol += visibleMediaTextLen + visibleTextLen;
+				AddTextStateOffset(&result, visibleMediaTextLen + visibleTextLen);
 				return result;
 			}
 			if (belowInfo) {
@@ -2589,6 +3835,9 @@ TextState Message::textState(
 			if (getStateReplyInfo(point, trect, &result)) {
 				return result;
 			}
+			if (getStateSummaryHeaderInfo(point, trect, &result)) {
+				return result;
+			}
 		}
 		if (entry) {
 			auto entryHeight = entry->height();
@@ -2599,8 +3848,9 @@ TextState Message::textState(
 				result = entry->textState(
 					point - QPoint(entryLeft, entryTop),
 					request);
-				result.symbol += visibleTextLength()
-					+ visibleMediaTextLength();
+				AddTextStateOffset(
+					&result,
+					visibleTextLength() + visibleMediaTextLength());
 			}
 		}
 		if (check) {
@@ -2612,8 +3862,9 @@ TextState Message::textState(
 				result = check->textState(
 					point - QPoint(checkLeft, checkTop),
 					request);
-				result.symbol += visibleTextLength()
-					+ visibleMediaTextLength();
+				AddTextStateOffset(
+					&result,
+					visibleTextLength() + visibleMediaTextLength());
 			}
 		}
 
@@ -2635,7 +3886,7 @@ TextState Message::textState(
 		};
 		if (!inBubble) {
 			if (point.y() >= g.y() + g.height()) {
-				result.symbol += visibleTextLen + visibleMediaTextLen;
+				AddTextStateOffset(&result, visibleTextLen + visibleMediaTextLen);
 			}
 		} else if (result.symbol <= minSymbol) {
 			const auto mediaHeight = mediaDisplayed ? media->height() : 0;
@@ -2655,20 +3906,18 @@ TextState Message::textState(
 					request);
 				if (_invertMedia) {
 					if (request.onlyMessageText) {
-						result.symbol = minSymbol;
-						result.afterSymbol = false;
+						SetTextStatePosition(&result, minSymbol, false);
 						result.cursor = CursorState::None;
 					}
 				} else if (request.onlyMessageText) {
-					result.symbol = visibleTextLen;
-					result.afterSymbol = false;
+					SetTextStatePosition(&result, visibleTextLen, false);
 					result.cursor = CursorState::None;
 				} else {
-					result.symbol += visibleTextLen;
+					AddTextStateOffset(&result, visibleTextLen);
 				}
 			} else if (getStateText(point, trect, &result, request)) {
 				if (_invertMedia) {
-					result.symbol += visibleMediaTextLen;
+					AddTextStateOffset(&result, visibleMediaTextLen);
 				}
 				result.overMessageText = true;
 				checkBottomInfoState();
@@ -2699,26 +3948,16 @@ TextState Message::textState(
 					- QPoint(fastShareLeft, fastShareTop));
 			}
 		}
+		if (_summarize && _summarize->contains(point)) {
+			result.link = _summarize->link();
+		}
 	} else if (media && media->isDisplayed()) {
 		result = media->textState(point - g.topLeft(), request);
 		if (request.onlyMessageText) {
-			result.symbol = 0;
-			result.afterSymbol = false;
+			SetTextStatePosition(&result, 0, false);
 			result.cursor = CursorState::None;
 		}
-		result.symbol += visibleTextLength();
-	}
-
-	if (keyboard && item->isHistoryEntry()) {
-		const auto keyboardTop = g.top()
-			+ g.height()
-			+ st::msgBotKbButton.margin
-			+ ((_reactions && !reactionsInBubble)
-				? (st::mediaInBubbleSkip + _reactions->height())
-				: 0);
-		if (QRect(g.left(), keyboardTop, g.width(), keyboardHeight).contains(point)) {
-			result.link = keyboard->getLink(point - QPoint(g.left(), keyboardTop));
-		}
+		AddTextStateOffset(&result, visibleTextLength());
 	}
 
 	return result;
@@ -2779,25 +4018,12 @@ bool Message::getStateFromName(
 	if (!displayFromName()) {
 		return false;
 	}
-	const auto replyWidth = [&] {
-		if (isUnderCursor() && displayFastReply()) {
-			return st::msgFont->width(FastReplyText());
-		}
-		return 0;
-	}();
-	if (replyWidth
-		&& point.x() >= trect.left() + trect.width() - replyWidth
-		&& point.x() < trect.left() + trect.width() + st::msgPadding.right()
-		&& point.y() >= trect.top() - st::msgPadding.top()
-		&& point.y() < trect.top() + st::msgServiceFont->height) {
-		outResult->link = fastReplyLink();
-		return true;
-	}
 	if (point.y() >= trect.top() && point.y() < trect.top() + st::msgNameFont->height) {
 		auto availableLeft = trect.left();
 		auto availableWidth = trect.width();
-		if (replyWidth) {
-			availableWidth -= st::msgPadding.right() + replyWidth;
+		const auto badgeWidth = rightBadgeWidth();
+		if (badgeWidth) {
+			availableWidth -= st::msgPadding.right() + badgeWidth;
 		}
 		const auto item = data();
 		const auto from = item->displayFrom();
@@ -2811,26 +4037,171 @@ bool Message::getStateFromName(
 				Unexpected("Corrupt forwarded information in message.");
 			}
 		}();
+
+		const auto statusWidth = (from && _fromNameStatus)
+			? st::dialogsPremiumIcon.icon.width()
+			: 0;
+		if (statusWidth && availableWidth > statusWidth) {
+			const auto x = availableLeft + std::min(
+				availableWidth - statusWidth,
+				nameText->maxWidth()
+			) - (_fromNameStatus->custom ? (2 * _fromNameStatus->skip) : 0);
+			const auto checkWidth = _fromNameStatus->custom
+				? (st::emojiSize - 2 * _fromNameStatus->skip)
+				: statusWidth;
+			if (point.x() >= x && point.x() < x + checkWidth) {
+				ensureFromNameStatusLink(from);
+				outResult->link = _fromNameStatus->link;
+				return true;
+			}
+		}
 		if (point.x() >= availableLeft
 			&& point.x() < availableLeft + availableWidth
 			&& point.x() < availableLeft + nameText->maxWidth()) {
 			outResult->link = fromLink();
+			recordLinkRipplePoint(point, trect.topLeft());
+			_fromLinkRipplePointSet = 1;
 			return true;
 		}
+
+		const auto skipWidth = nameText->maxWidth()
+			+ (_fromNameStatus
+				? (st::dialogsPremiumIcon.icon.width()
+					+ st::msgServiceFont->spacew)
+				: 0)
+			+ st::msgServiceFont->spacew;
+		availableLeft += skipWidth;
+		availableWidth -= skipWidth;
+
 		auto via = item->Get<HistoryMessageVia>();
 		if (via
 			&& !displayForwardedFrom()
-			&& point.x() >= availableLeft + nameText->maxWidth() + st::msgServiceFont->spacew
+			&& point.x() >= availableLeft
 			&& point.x() < availableLeft + availableWidth
-			&& point.x() < availableLeft + nameText->maxWidth() + st::msgServiceFont->spacew + via->width) {
+			&& point.x() < availableLeft + via->width) {
 			outResult->link = via->link;
+			recordLinkRipplePoint(point, trect.topLeft());
 			return true;
 		}
+		if (const auto guestChat = item->Get<HistoryMessageGuestChat>()) {
+			auto guestChatLeft = availableLeft;
+			if (via && !displayForwardedFrom()) {
+				guestChatLeft += via->width + st::msgServiceFont->spacew;
+			}
+			if (point.x() >= guestChatLeft
+				&& point.x() < availableLeft + availableWidth
+				&& point.x() < guestChatLeft + guestChat->width) {
+				outResult->link = guestChat->link;
+				recordLinkRipplePoint(point, trect.topLeft());
+				return true;
+			}
+		}
+		if (badgeWidth) {
+			const auto badge = Get<RightBadge>();
+			const auto badgeLeft = trect.left()
+				+ trect.width()
+				- badgeWidth;
+			const auto badgeRight = trect.left()
+				+ trect.width()
+				+ st::msgPadding.right();
+			const auto boostTextWidth = (badge && !badge->boosts.isEmpty())
+				? badge->boosts.maxWidth()
+				: 0;
+			const auto boostLeft = boostTextWidth
+				? (trect.left() + trect.width() - boostTextWidth)
+				: 0;
+			if (boostTextWidth
+				&& point.x() >= boostLeft
+				&& point.x() < badgeRight) {
+				if (!badge->boostsLink) {
+					const auto fullId = item->fullId();
+					badge->boostsLink = std::make_shared<LambdaClickHandler>([
+						fullId
+					](ClickContext context) {
+						if (const auto controller = ExtractController(context)) {
+							if (const auto item = controller->session().data().message(fullId)) {
+								if (const auto channel = item->history()->peer->asChannel()) {
+									controller->resolveBoostState(channel);
+								}
+							}
+						}
+					});
+				}
+				outResult->link = badge->boostsLink;
+				return true;
+			}
+			const auto tagRight = boostTextWidth
+				? (boostLeft - st::msgTagBadgeBoostSkip)
+				: badgeRight;
+			if (point.x() >= badgeLeft && point.x() < tagRight) {
+				if (badge->special) {
+					return false;
+				}
+				if (!badge->tagLink) {
+					const auto weak = base::make_weak(this);
+					badge->tagLink = std::make_shared<LambdaClickHandler>([
+						weak
+					](ClickContext context) {
+						if (const auto controller = ExtractController(context)) {
+							if (const auto view = weak.get()) {
+								const auto badge = view->Get<RightBadge>();
+								if (!badge) {
+									return;
+								}
+								const auto item = view->data();
+								const auto peer = item->history()->peer;
+								const auto author = item->author();
+								controller->uiShow()->show(Box(
+									TagInfoBox,
+									controller->uiShow(),
+									peer,
+									author,
+									badge->tag.toString(),
+									badge->role));
+							}
+						}
+					});
+				}
+				{
+					const auto pill = ComputeBadgePillGeometry(badge);
+					const auto &padding = st::msgTagBadgePadding;
+					if (badge->role != BadgeRole::User) {
+						const auto badgeTop = trect.top()
+							+ (st::msgNameFont->height - pill.height) / 2;
+						badge->lastPoint = point
+							- QPoint(badgeLeft, badgeTop);
+					} else {
+						const auto pillLeft = badgeLeft
+							- (pill.width - pill.textWidth) / 2;
+						const auto pillTop = trect.top() - padding.top();
+						badge->lastPoint = point
+							- QPoint(pillLeft, pillTop);
+					}
+				}
+				outResult->link = badge->tagLink;
+				return true;
+			}
+		}
 	}
 	trect.setTop(trect.top() + st::msgNameFont->height);
 	return false;
 }
 
+void Message::ensureFromNameStatusLink(not_null<PeerData*> peer) const {
+	Expects(_fromNameStatus != nullptr);
+
+	if (_fromNameStatus->link) {
+		return;
+	}
+	_fromNameStatus->link = std::make_shared<LambdaClickHandler>([=](
+			ClickContext context) {
+		const auto controller = ExtractController(context);
+		if (controller) {
+			Settings::ShowEmojiStatusPremium(controller, peer);
+		}
+	});
+}
+
 bool Message::getStateTopicButton(
 		QPoint point,
 		QRect &trect,
@@ -2908,8 +4279,10 @@ bool Message::getStateForwardedInfo(
 			point - trect.topLeft(),
 			useWidth,
 			textRequest));
-		outResult->symbol = 0;
-		outResult->afterSymbol = false;
+		if (outResult->link) {
+			recordLinkRipplePoint(point, trect.topLeft());
+		}
+		SetTextStatePosition(outResult, 0, false);
 		if (breakEverywhere) {
 			outResult->cursor = CursorState::Forwarded;
 		} else {
@@ -2933,7 +4306,7 @@ ClickHandlerPtr Message::psaTooltipLink() const {
 		const auto custom = type.isEmpty()
 			? QString()
 			: Lang::GetNonDefaultValue(kPsaTooltipPrefix + type.toUtf8());
-		auto text = Ui::Text::RichLangValue(
+		auto text = tr::rich(
 			(custom.isEmpty()
 				? tr::lng_tooltip_psa_default(tr::now)
 				: custom));
@@ -2989,6 +4362,32 @@ bool Message::getStateReplyInfo(
 	return false;
 }
 
+bool Message::getStateSummaryHeaderInfo(
+		QPoint point,
+		QRect &trect,
+		not_null<TextState*> outResult) const {
+	if (const auto summaryHeader = Get<SummaryHeader>()) {
+		const auto margins = summaryHeader->margins();
+		const auto height = summaryHeader->height();
+		if (point.y() >= trect.top() && point.y() < trect.top() + height) {
+			const auto g = QRect(
+				trect.x(),
+				trect.y() + margins.top(),
+				trect.width(),
+				height - margins.top() - margins.bottom());
+			if (g.contains(point)) {
+				if (const auto link = summaryHeader->link()) {
+					outResult->link = summaryHeader->link();
+					summaryHeader->saveRipplePoint(point - g.topLeft());
+				}
+			}
+			return true;
+		}
+		trect.setTop(trect.top() + height);
+	}
+	return false;
+}
+
 bool Message::getStateViaBotIdInfo(
 		QPoint point,
 		QRect &trect,
@@ -2998,6 +4397,7 @@ bool Message::getStateViaBotIdInfo(
 		if (!displayFromName() && !displayForwardedFrom()) {
 			if (QRect(trect.x(), trect.y(), via->width, st::msgNameFont->height).contains(point)) {
 				outResult->link = via->link;
+				recordLinkRipplePoint(point, trect.topLeft());
 				return true;
 			}
 			trect.setTop(trect.top() + st::msgNameFont->height);
@@ -3013,15 +4413,119 @@ bool Message::getStateText(
 		StateRequest request) const {
 	if (!hasVisibleText()) {
 		return false;
-	} else if (const auto botTop = Get<FakeBotAboutTop>()) {
+	}
+	const auto item = this->textItem();
+	if (const auto rich = richpage()) {
+		const auto local = prepareRichPageStateRect(point, trect);
+		if (!base::in_range(point.y(), trect.y(), trect.y() + trect.height())) {
+			return false;
+		}
+		const auto clearHorizontalScrollHandler = [&] {
+			rich->handlerHorizontalScrollHit = std::nullopt;
+			rich->handlerHorizontalScrollPoint = {};
+		};
+		const auto horizontalScrollHit = rich->article.horizontalScrollHit(local);
+		*outResult = TextState(item);
+		outResult->horizontalScroll = horizontalScrollHit.scrollable;
+		const auto hit = rich->article.hitTest(
+			local,
+			request.flags | Ui::Text::StateRequest::Flag::LookupSymbol);
+		if (horizontalScrollHit.overScrollbar) {
+			rich->handlerPreparedLink = std::nullopt;
+			rich->handlerMediaActivation = {};
+			rich->handlerPlaceholderId = {};
+			rich->handlerPlaceholderPoint = {};
+			if (!rich->handlerHorizontalScrollHit || !rich->handler) {
+				rich->handler = std::make_shared<RichPageActionClickHandler>(
+					[](ClickContext) {
+					});
+			}
+			rich->handlerHorizontalScrollHit = horizontalScrollHit;
+			rich->handlerHorizontalScrollPoint = local;
+			outResult->link = rich->handler;
+			return true;
+		}
+		if (!hit.valid()) {
+			clearHorizontalScrollHandler();
+			return horizontalScrollHit.scrollable;
+		}
+		const auto offset = rich->article.selectionOffsetFromHit(
+			hit,
+			TextSelectType::Letters);
+		SetRichPageSelectionCursor(
+			outResult,
+			hit.segmentIndex,
+			offset,
+			hit.direct);
+		if (hit.codeHeaderCopy) {
+			const auto text = rich->article.textForContext(hit);
+			clearHorizontalScrollHandler();
+			rich->handlerPreparedLink = std::nullopt;
+			rich->handlerMediaActivation = {};
+			rich->handlerPlaceholderId = {};
+			rich->handlerPlaceholderPoint = {};
+			rich->handler = std::make_shared<RichPageActionClickHandler>(
+				[text](ClickContext context) {
+					CopyRichPageCodeBlockText(text, std::move(context));
+				});
+			outResult->link = rich->handler;
+		} else if (hit.preparedLink
+			|| hit.mediaActivation.kind != MediaActivationKind::None) {
+			const auto prepared = hit.preparedLink;
+			const auto activation = hit.mediaActivation;
+			const auto reuse = SamePreparedLink(
+					rich->handlerPreparedLink,
+					prepared)
+				&& SameMediaActivation(
+					rich->handlerMediaActivation,
+					activation);
+			clearHorizontalScrollHandler();
+			rich->handlerPlaceholderId = hit.mediaActivation.placeholderId;
+			rich->handlerPlaceholderPoint = hit.placeholderLocalPoint;
+			if (!reuse) {
+				rich->handlerPreparedLink = prepared;
+				rich->handlerMediaActivation = activation;
+				rich->handler = std::make_shared<RichPageActionClickHandler>(
+					[weak = base::make_weak(const_cast<Message*>(this)),
+						prepared,
+						activation](ClickContext context) {
+						if (const auto owner = weak.get()) {
+							if (prepared) {
+								owner->activateRichPagePreparedLink(
+									*prepared,
+									std::move(context));
+							} else {
+								owner->activateRichPageMedia(
+									activation,
+									std::move(context));
+							}
+						}
+					},
+					prepared);
+			}
+			outResult->link = rich->handler;
+		} else {
+			clearHorizontalScrollHandler();
+			outResult->link = hit.state.link;
+		}
+		outResult->cursor = (!outResult->link && hit.direct)
+			? CursorState::Text
+			: CursorState::None;
+		return true;
+	}
+	if (const auto botTop = Get<FakeBotAboutTop>()) {
 		trect.setY(trect.y() + botTop->height);
 	}
-	const auto item = data();
 	if (base::in_range(point.y(), trect.y(), trect.y() + trect.height())) {
 		*outResult = TextState(item, text().getState(
 			point - trect.topLeft(),
-			trect.width(),
+			std::max(textRealWidth(), trect.width()),
 			request.forText()));
+		if (outResult->link
+			&& IsRippleLink(outResult->link)
+			&& !text().linkRangeFor(outResult->link).empty()) {
+			recordLinkRipplePoint(point, trect.topLeft());
+		}
 		return true;
 	}
 	return false;
@@ -3029,6 +4533,17 @@ bool Message::getStateText(
 
 // Forward to media.
 void Message::updatePressed(QPoint point) {
+	if (const auto rich = richpage()
+		; rich
+		&& rich->handlerHorizontalScrollActive
+		&& (ClickHandler::getPressed()
+			== rich->handlerHorizontalScrollPressed)) {
+		auto trect = QRect();
+		if (prepareRichPageTextRect(trect)) {
+			(void)rich->article.updateHorizontalScroll(
+				prepareRichPageStateRect(point, trect));
+		}
+	}
 	const auto item = data();
 	const auto media = this->media();
 	if (!media) {
@@ -3036,7 +4551,14 @@ void Message::updatePressed(QPoint point) {
 	}
 
 	auto g = countGeometry();
-	auto keyboard = item->inlineReplyKeyboard();
+
+	const auto reactionsInBubble = _reactions && embedReactionsInBubble();
+	if (_reactions && !reactionsInBubble) {
+		const auto reactionsHeight = st::mediaInBubbleSkip + _reactions->height();
+		g.setHeight(g.height() - reactionsHeight);
+	}
+
+	const auto keyboard = item->inlineReplyKeyboard();
 	if (keyboard) {
 		auto keyboardHeight = st::msgBotKbButton.margin + keyboard->naturalHeight();
 		g.setHeight(g.height() - keyboardHeight);
@@ -3067,7 +4589,10 @@ void Message::updatePressed(QPoint point) {
 			if (const auto reply = Get<Reply>()) {
 				trect.setTop(trect.top() + reply->height());
 			}
-			if (const auto via = item->Get<HistoryMessageVia>()) {
+			if (const auto summaryHeader = Get<SummaryHeader>()) {
+				trect.setTop(trect.top() + summaryHeader->height());
+			}
+			if (item->Has<HistoryMessageVia>()) {
 				if (!displayFromName() && !displayForwardedFrom()) {
 					trect.setTop(trect.top() + st::msgNameFont->height);
 				}
@@ -3088,6 +4613,96 @@ void Message::updatePressed(QPoint point) {
 	}
 }
 
+bool Message::consumeHorizontalScroll(QPoint position, int delta) {
+	const auto rich = richpage();
+	auto trect = QRect();
+	if (!rich || !prepareRichPageTextRect(trect)) {
+		return false;
+	}
+	return rich->article.consumeHorizontalScroll(
+		prepareRichPageStateRect(position, trect),
+		delta);
+}
+
+bool Message::canConsumeHorizontalScroll(QPoint position, int delta) const {
+	const auto rich = richpage();
+	auto trect = QRect();
+	if (!rich || !prepareRichPageTextRect(trect)) {
+		return false;
+	}
+	return rich->article.canConsumeHorizontalScroll(
+		prepareRichPageStateRect(position, trect),
+		delta);
+}
+
+MessageSelection Message::selectionFromStates(
+		const TextState &anchor,
+		const TextState &current,
+		TextSelectType type) const {
+	if (anchor.selectionCursor.isRichPage()
+		|| current.selectionCursor.isRichPage()) {
+		if (!anchor.selectionCursor.valid()
+			|| !current.selectionCursor.valid()
+			|| !anchor.selectionCursor.isRichPage()
+			|| !current.selectionCursor.isRichPage()) {
+			return {};
+		}
+		auto selection = MarkdownArticleSelection{
+			.from = anchor.selectionCursor.richPagePosition,
+			.to = current.selectionCursor.richPagePosition,
+		};
+		const auto endpoints = MarkdownArticleSelectionEndpoints{
+			.from = anchor.selectionCursor.richPage,
+			.to = current.selectionCursor.richPage,
+		};
+		if (type != TextSelectType::Letters
+			&& (selection.from.segment == selection.to.segment)) {
+			const auto rich = richpage();
+			if (!rich) {
+				return {};
+			}
+			const auto adjusted = rich->article.adjustSelection(
+				selection.from.segment,
+				TextSelection(
+					uint16(std::min(selection.from.offset, selection.to.offset)),
+					uint16(std::max(selection.from.offset, selection.to.offset))),
+				type);
+			if (adjusted.empty()) {
+				return {};
+			}
+			selection = {
+				.from = {
+					.segment = selection.from.segment,
+					.offset = adjusted.from,
+				},
+				.to = {
+					.segment = selection.from.segment,
+					.offset = adjusted.to,
+				},
+			};
+		}
+		return MessageSelection::RichPage(
+			selection,
+			endpoints,
+			anchor.selectionCursor.richPagePosition,
+			current.selectionCursor.richPagePosition,
+			anchor.selectionCursor.richPage,
+			current.selectionCursor.richPage);
+	}
+	const auto anchorEndpoint = FlatSelectionEndpointFromState(anchor);
+	const auto currentEndpoint = FlatSelectionEndpointFromState(current);
+	auto selection = TextSelection(
+		uint16(std::min(anchorEndpoint.offset(), currentEndpoint.offset())),
+		uint16(std::max(anchorEndpoint.offset(), currentEndpoint.offset())));
+	if (type != TextSelectType::Letters) {
+		selection = adjustSelection(selection, type);
+	}
+	return MessageSelection::Flat(
+		selection,
+		anchorEndpoint,
+		currentEndpoint);
+}
+
 TextForMimeData Message::selectedText(TextSelection selection) const {
 	const auto media = this->media();
 	auto logEntryOriginalResult = TextForMimeData();
@@ -3143,6 +4758,20 @@ TextForMimeData Message::selectedText(TextSelection selection) const {
 	return result;
 }
 
+TextForMimeData Message::selectedText(
+		const MessageSelection &selection) const {
+	if (const auto flat = selection.flatSelection(); !flat.empty()) {
+		return selectedText(flat);
+	} else if (selection.isRichPage()) {
+		if (const auto rich = richpage()) {
+			return rich->article.textForSelection(
+				selection.richPage.selection,
+				&selection.richPage.endpoints);
+		}
+	}
+	return {};
+}
+
 SelectedQuote Message::selectedQuote(TextSelection selection) const {
 	const auto textItem = this->textItem();
 	const auto item = textItem ? textItem : data().get();
@@ -3168,11 +4797,19 @@ SelectedQuote Message::selectedQuote(TextSelection selection) const {
 	return {};
 }
 
+SelectedQuote Message::selectedQuote(
+		const MessageSelection &selection) const {
+	if (const auto flat = selection.flatSelection(); !flat.empty()) {
+		return selectedQuote(flat);
+	}
+	return {};
+}
+
 TextSelection Message::selectionFromQuote(
 		const SelectedQuote &quote) const {
 	Expects(quote.item != nullptr);
 
-	if (quote.text.empty()) {
+	if (quote.highlight.quote.empty()) {
 		return {};
 	}
 	const auto item = quote.item;
@@ -3277,6 +4914,105 @@ TextSelection Message::adjustSelection(
 	return result;
 }
 
+MessageSelection Message::adjustSelection(
+		const MessageSelection &selection,
+		TextSelectType type) const {
+	if (selection.isFlat()) {
+		const auto adjusted = adjustSelection(selection.flatSelection(), type);
+		if (adjusted.empty() || (adjusted == FullSelection)) {
+			return {};
+		}
+		return MessageSelection::Flat(
+			adjusted,
+			selection.anchor.isFlat()
+				? selection.anchor.flat
+				: MessageSelectionFlatEndpoint{
+					.symbol = adjusted.from,
+					.afterSymbol = false,
+				},
+			selection.focus.isFlat()
+				? selection.focus.flat
+				: MessageSelectionFlatEndpoint{
+					.symbol = adjusted.to,
+					.afterSymbol = false,
+				});
+	} else if (selection.isRichPage()) {
+		if (type == TextSelectType::Letters
+			|| !selection.anchor.valid()
+			|| !selection.focus.valid()
+			|| !selection.anchor.isRichPage()
+			|| !selection.focus.isRichPage()) {
+			return selection;
+		}
+		const auto anchor = selection.anchor.richPagePosition;
+		const auto focus = selection.focus.richPagePosition;
+		if (!anchor.valid()
+			|| !focus.valid()
+			|| (anchor.segment != focus.segment)) {
+			return selection;
+		}
+		const auto rich = richpage();
+		if (!rich) {
+			return {};
+		}
+		const auto adjusted = rich->article.adjustSelection(
+			anchor.segment,
+			TextSelection(
+				uint16(std::min(anchor.offset, focus.offset)),
+				uint16(std::max(anchor.offset, focus.offset))),
+			type);
+		if (adjusted.empty()) {
+			return {};
+		}
+		return MessageSelection::RichPage(
+			{
+				.from = {
+					.segment = anchor.segment,
+					.offset = adjusted.from,
+				},
+				.to = {
+					.segment = anchor.segment,
+					.offset = adjusted.to,
+				},
+			},
+			selection.richPage.endpoints,
+			anchor,
+			focus,
+			selection.anchor.richPage,
+			selection.focus.richPage);
+	}
+	return {};
+}
+
+TextSelection Message::selectionForEdit(
+		const MessageSelection &selection) const {
+	return selection.isFlat()
+		? selection.flatRangeForEdit()
+		: TextSelection();
+}
+
+bool Message::selectionContains(
+		const MessageSelection &selection,
+		const TextState &state) const {
+	if (!selection.isRichPage()) {
+		return Element::selectionContains(selection, state);
+	}
+	const auto rich = richpage();
+	if (!rich
+		|| !state.overMessageText
+		|| !state.selectionCursor.isRichPage()) {
+		return false;
+	}
+	auto hit = Iv::Markdown::MarkdownArticleHitTestResult();
+	hit.segmentIndex = state.selectionCursor.richPagePosition.segment;
+	hit.forcedOffset = state.selectionCursor.richPagePosition.offset;
+	hit.direct = state.selectionCursor.richPage.direct;
+	return rich->article.selectionContains(
+		selection.richPage.selection,
+		&selection.richPage.endpoints,
+		hit);
+}
+
 Reactions::ButtonParameters Message::reactionButtonParameters(
 		QPoint position,
 		const TextState &reactionState) const {
@@ -3294,6 +5030,7 @@ Reactions::ButtonParameters Message::reactionButtonParameters(
 	const auto reactionsHeight = (_reactions && !embedReactionsInBubble())
 		? (st::mediaInBubbleSkip + _reactions->height())
 		: 0;
+	result.reactionsHeight = reactionsHeight;
 	const auto innerHeight = geometry.height()
 		- keyboardHeight
 		- reactionsHeight;
@@ -3325,6 +5062,31 @@ Reactions::ButtonParameters Message::reactionButtonParameters(
 	return result;
 }
 
+ReplyButton::ButtonParameters Message::replyButtonParameters(
+		QPoint position,
+		const TextState &replyState) const {
+	using namespace ReplyButton;
+	if (!displayFastReply() || unwrapped()) {
+		return {};
+	}
+	auto result = ButtonParameters{ .context = data()->fullId() };
+	const auto geometry = countGeometry();
+	result.pointer = position;
+	const auto reactionInnerRight = st::reactionCornerCenter.x()
+		+ st::reactionCornerSize.width() / 2;
+	const auto replyInnerWidth = ReplyButton::ComputeInnerWidth();
+	const auto relativeCenter = QPoint(
+		geometry.width() + reactionInnerRight - replyInnerWidth,
+		st::replyCornerCenter.y());
+	result.center = geometry.topLeft() + relativeCenter;
+	if (replyState.itemId != result.context
+		&& !geometry.contains(position)) {
+		result.outside = true;
+	}
+	result.link = fastReplyLink();
+	return result;
+}
+
 int Message::reactionsOptimalWidth() const {
 	return _reactions ? _reactions->countNiceWidth() : 0;
 }
@@ -3413,7 +5175,7 @@ TextState Message::bottomInfoTextState(
 }
 
 int Message::infoWidth() const {
-	return _bottomInfo.optimalSize().width();
+	return _bottomInfo.maxWidth();
 }
 
 int Message::bottomInfoFirstLineWidth() const {
@@ -3435,84 +5197,6 @@ bool Message::embedReactionsInBubble() const {
 	return needInfoDisplay();
 }
 
-void Message::refreshReactions() {
-	using namespace Reactions;
-	auto reactionsData = InlineListDataFromMessage(this);
-	if (reactionsData.reactions.empty()) {
-		setReactions(nullptr);
-		return;
-	}
-	if (!_reactions) {
-		const auto handlerFactory = [=](ReactionId id) {
-			const auto weak = base::make_weak(this);
-			return std::make_shared<LambdaClickHandler>([=](
-					ClickContext context) {
-				const auto strong = weak.get();
-				if (!strong) {
-					return;
-				}
-				const auto item = strong->data();
-				const auto controller = ExtractController(context);
-				if (item->reactionsAreTags()) {
-					if (item->history()->session().premium()) {
-						const auto tag = Data::SearchTagToQuery(id);
-						HashtagClickHandler(tag).onClick(context);
-					} else if (controller) {
-						ShowPremiumPreviewBox(
-							controller,
-							PremiumFeature::TagsForMessages);
-					}
-					return;
-				}
-				if (id.paid()) {
-					Payments::TryAddingPaidReaction(
-						item,
-						weak.get(),
-						1,
-						std::nullopt,
-						controller->uiShow());
-					return;
-				} else {
-					const auto source = HistoryReactionSource::Existing;
-					item->toggleReaction(id, source);
-				}
-				if (const auto now = weak.get()) {
-					const auto chosen = now->data()->chosenReactions();
-					if (id.paid() || ranges::contains(chosen, id)) {
-						now->animateReaction({
-							.id = id,
-						});
-					}
-				}
-			});
-		};
-		setReactions(std::make_unique<InlineList>(
-			&history()->owner().reactions(),
-			handlerFactory,
-			[=] { customEmojiRepaint(); },
-			std::move(reactionsData)));
-	} else {
-		auto was = _reactions->computeTagsList();
-		_reactions->update(std::move(reactionsData), width());
-		auto now = _reactions->computeTagsList();
-		if (!was.empty() || !now.empty()) {
-			auto &owner = history()->owner();
-			owner.viewTagsChanged(this, std::move(was), std::move(now));
-		}
-	}
-}
-
-void Message::validateInlineKeyboard(HistoryMessageReplyMarkup *markup) {
-	if (!markup
-		|| markup->inlineKeyboard
-		|| markup->hiddenBy(data()->media())) {
-		return;
-	}
-	markup->inlineKeyboard = std::make_unique<ReplyKeyboard>(
-		data(),
-		std::make_unique<KeyboardStyle>(st::msgBotKbButton));
-}
-
 void Message::validateFromNameText(PeerData *from) const {
 	if (!from) {
 		if (_fromNameStatus) {
@@ -3543,18 +5227,18 @@ void Message::validateFromNameText(PeerData *from) const {
 	}
 }
 
-void Message::itemDataChanged() {
+bool Message::updateBottomInfo() {
 	const auto wasInfo = _bottomInfo.currentSize();
-	const auto wasReactions = _reactions
-		? _reactions->currentSize()
-		: QSize();
-	refreshReactions();
 	_bottomInfo.update(BottomInfoDataFromMessage(this), width());
-	const auto nowInfo = _bottomInfo.currentSize();
-	const auto nowReactions = _reactions
-		? _reactions->currentSize()
-		: QSize();
-	if (wasInfo != nowInfo || wasReactions != nowReactions) {
+	return (_bottomInfo.currentSize() != wasInfo);
+}
+
+void Message::itemDataChanged() {
+	const auto infoChanged = updateBottomInfo();
+	const auto reactionsChanged = updateReactions();
+	const auto media = this->media();
+	const auto mediaChanged = media && media->updateItemData();
+	if (infoChanged || reactionsChanged || mediaChanged) {
 		history()->owner().requestViewResize(this);
 	} else {
 		repaint();
@@ -3587,32 +5271,116 @@ void Message::refreshDataIdHook() {
 }
 
 int Message::monospaceMaxWidth() const {
+	const auto fromText = hasRichPage()
+		? std::max(
+			textualMaxWidth()
+				- st::msgPadding.left()
+				- st::msgPadding.right(),
+			richpage()->article.lastLayoutWidth())
+		: hasVisibleText()
+		? text().countMaxMonospaceWidth()
+		: 0;
+	const auto fromMedia = this->media()
+		? this->media()->contributedMaxMonospaceWidth()
+		: 0;
 	return st::msgPadding.left()
-		+ (hasVisibleText() ? text().countMaxMonospaceWidth() : 0)
+		+ std::max(fromText, fromMedia)
 		+ st::msgPadding.right();
 }
 
+int Message::bubbleTextWidth(int bubbleWidth) const {
+	// For rich pages the article is laid out exactly at the bubble width,
+	// so richPageWidthFor(bubbleTextWidth(width)) must give width back.
+	// Clamping by msgMinWidth here would lay the article out wider than
+	// the bubble shrunk to its content, painting centered blocks (like
+	// display math formulas) shifted right and cut by the bubble edge.
+	const auto floored = hasRichPage()
+		? bubbleWidth
+		: std::max(bubbleWidth, st::msgMinWidth);
+	return floored
+		- st::msgPadding.left()
+		- st::msgPadding.right();
+}
+
+int Message::bubbleTextualWidth() const {
+	const auto full = textualMaxWidth();
+	if (hasRichPage()) {
+		const auto innerWidth = bubbleTextWidth(full);
+		[[maybe_unused]] const auto laidOutHeight = textHeightFor(innerWidth);
+		const auto laidOutWidth = richpage()->article.lastLayoutWidth();
+		return st::msgPadding.left()
+			+ std::max(laidOutWidth, 1)
+			+ st::msgPadding.right();
+	}
+	const auto media = this->media();
+	if (!hasVisibleText()
+		|| !media
+		|| !media->allowsNarrowBubble()) {
+		return full;
+	}
+	const auto minimum = std::max(
+		media->minBubbleWidthForNarrowBubble(),
+		st::msgMinWidth);
+	if (_bubbleTextualWidthMinimum != minimum) {
+		_bubbleTextualWidthMinimum = minimum;
+		if (minimum >= full) {
+			_bubbleTextualWidthCache = minimum;
+		} else {
+			const auto lineHeight = text().style()->font->height;
+			const auto fullTextHeight = textHeightFor(bubbleTextWidth(full));
+			if (fullTextHeight > kMaxNiceToReadLines * lineHeight) {
+				_bubbleTextualWidthCache = full;
+			} else {
+				auto left = minimum;
+				auto right = full;
+				while (left < right) {
+					const auto middle = left + (right - left) / 2;
+					const auto middleHeight = textHeightFor(
+						bubbleTextWidth(middle));
+					if (middleHeight <= kMaxNiceToReadLines * lineHeight) {
+						right = middle;
+					} else {
+						left = middle + 1;
+					}
+				}
+				_bubbleTextualWidthCache = right;
+				[[maybe_unused]] const auto ensureRightCache
+					= textHeightFor(bubbleTextWidth(right));
+			}
+		}
+	}
+	return _bubbleTextualWidthCache;
+}
+
 int Message::viewButtonHeight() const {
 	return _viewButton ? _viewButton->height() : 0;
 }
 
 void Message::updateViewButtonExistence() {
 	const auto item = data();
-	const auto media = item->media();
-	const auto has = (media && ViewButton::MediaHasViewButton(media));
-	if (!has) {
-		_viewButton = nullptr;
-		return;
-	} else if (_viewButton) {
-		return;
-	}
-	auto make = [=](auto &&from) {
+	const auto make = [=](auto &&from) {
 		return std::make_unique<ViewButton>(
 			std::forward<decltype(from)>(from),
 			colorIndex(),
 			[=] { repaint(); });
 	};
-	_viewButton = make(media);
+	if (const auto richPage = item->richPage(); richPage && richPage->part) {
+		const auto itemId = item->fullId();
+		if (_viewButton && _viewButton->matches(itemId)) {
+			return;
+		}
+		_viewButton = make(itemId);
+		return;
+	}
+	const auto media = item->media();
+	if (media && ViewButton::MediaHasViewButton(media)) {
+		if (_viewButton && _viewButton->matches(media)) {
+			return;
+		}
+		_viewButton = make(media);
+		return;
+	}
+	_viewButton = nullptr;
 }
 
 void Message::initLogEntryOriginal() {
@@ -3678,6 +5446,8 @@ bool Message::hasFromName() const {
 	switch (context()) {
 	case Context::AdminLog:
 		return true;
+	case Context::Monoforum:
+		return data()->out() || data()->from()->isChannel();
 	case Context::History:
 	case Context::ChatPreview:
 	case Context::TTLViewer:
@@ -3695,7 +5465,7 @@ bool Message::hasFromName() const {
 				}
 			}
 			return false;
-		} else if (!peer->isUser()) {
+		} else if (!peer->isUser() || item->isGuestChatBotMessage()) {
 			if (const auto media = this->media()) {
 				return !media->hideFromName();
 			}
@@ -3754,7 +5524,8 @@ bool Message::hasOutLayout() const {
 			if (context() == Context::ShortcutMessages) {
 				return true;
 			}
-			return (context() == Context::SavedSublist)
+			return (context() == Context::SavedSublist
+					|| context() == Context::History)
 				&& (!forwarded->forwardOfForward()
 					? (forwarded->originalSender
 						&& forwarded->originalSender->isSelf())
@@ -3772,6 +5543,9 @@ bool Message::hasOutLayout() const {
 			}
 		}
 	}
+	if (item->isGuestChatBotMessage()) {
+		return false;
+	}
 	return item->out() && !item->isPost();
 }
 
@@ -3812,6 +5586,12 @@ bool Message::unwrapped() const {
 }
 
 int Message::minWidthForMedia() const {
+	// InstantViewMediaRuntime without a rich page means a media view
+	// hosted inside an article, it doesn't draw a bubble with info.
+	// Rich page messages are real bubbles and need the minimal width.
+	if (Get<InstantViewMediaRuntime>() && !hasRichPage()) {
+		return 0;
+	}
 	auto result = infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x());
 	const auto views = data()->Get<HistoryMessageViews>();
 	if (data()->repliesAreComments() && !views->replies.text.isEmpty()) {
@@ -3838,12 +5618,15 @@ int Message::minWidthForMedia() const {
 		accumulate_max(result, added + st::semiboldFont->width(
 			tr::lng_replies_view_original(tr::now)));
 	}
+	if (const auto keyboard = data()->inlineReplyKeyboard()) {
+		accumulate_max(result, keyboard->naturalWidth());
+	}
 	return result;
 }
 
 bool Message::hasFastReply() const {
 	if (context() == Context::Replies) {
-		if (data()->isDiscussionPost()) {
+		if (isCommentsRootView()) {
 			return false;
 		}
 	} else if (context() != Context::History) {
@@ -3866,7 +5649,7 @@ bool Message::displayFastReply() const {
 	return hasFastReply()
 		&& data()->isRegular()
 		&& canSendAnything()
-		&& !delegate()->elementInSelectionMode().inSelectionMode;
+		&& !delegate()->elementInSelectionMode(this).inSelectionMode;
 }
 
 bool Message::displayRightActionComments() const {
@@ -3924,6 +5707,8 @@ bool Message::displayFastShare() const {
 bool Message::displayGoToOriginal() const {
 	if (isPinnedContext()) {
 		return !hasOutLayout();
+	} else if (context() == Context::Monoforum) {
+		return false;
 	}
 	const auto item = data();
 	if (const auto forwarded = item->Get<HistoryMessageForwarded>()) {
@@ -4030,7 +5815,7 @@ void Message::drawRightAction(
 
 ClickHandlerPtr Message::rightActionLink(
 		std::optional<QPoint> pressPoint) const {
-	if (delegate()->elementInSelectionMode().progress > 0) {
+	if (delegate()->elementInSelectionMode(this).progress > 0) {
 		return nullptr;
 	}
 	ensureRightAction();
@@ -4110,7 +5895,17 @@ ClickHandlerPtr Message::prepareRightActionLink() const {
 			}
 		};
 	};
-	return std::make_shared<LambdaClickHandler>([=](
+
+	class FastShareClickHandler : public LambdaClickHandler {
+	public:
+		FastShareClickHandler(Fn<void(ClickContext)> handler)
+			: LambdaClickHandler(std::move(handler)) {}
+		QString tooltip() const override {
+			return tr::lng_fast_share_tooltip(tr::now);
+		}
+	};
+
+	const auto result = std::make_shared<FastShareClickHandler>([=](
 			ClickContext context) {
 		const auto controller = ExtractController(context);
 		if (!controller || controller->session().uniqueId() != sessionId) {
@@ -4125,11 +5920,19 @@ ClickHandlerPtr Message::prepareRightActionLink() const {
 					savedFromPeer,
 					Window::SectionShow::Way::Forward,
 					savedFromMsgId);
+			} else if (base::IsCtrlPressed()) {
+				FastShareMessageToSelf(controller->uiShow(), item);
 			} else {
 				FastShareMessage(controller, item);
 			}
 		}
 	});
+	const auto navigates = data()->externalReply()
+		|| (savedFromPeer && savedFromMsgId);
+	if (!navigates) {
+		result->setProperty(kFastShareProperty, QVariant::fromValue(true));
+	}
+	return result;
 }
 
 ClickHandlerPtr Message::fastReplyLink() const {
@@ -4137,9 +5940,9 @@ ClickHandlerPtr Message::fastReplyLink() const {
 		return _fastReplyLink;
 	}
 	const auto itemId = data()->fullId();
-	_fastReplyLink = std::make_shared<LambdaClickHandler>([=] {
+	_fastReplyLink = std::make_shared<LambdaClickHandler>(crl::guard(this, [=] {
 		delegate()->elementReplyTo({ itemId });
-	});
+	}));
 	return _fastReplyLink;
 }
 
@@ -4228,14 +6031,8 @@ void Message::updateMediaInBubbleState() {
 
 void Message::fromNameUpdated(int width) const {
 	const auto item = data();
-	const auto replyWidth = hasFastReply()
-		? st::msgFont->width(FastReplyText())
-		: 0;
-	if (!_rightBadge.isEmpty()) {
-		const auto badgeWidth = _rightBadge.maxWidth();
-		width -= st::msgPadding.right() + std::max(badgeWidth, replyWidth);
-	} else if (replyWidth) {
-		width -= st::msgPadding.right() + replyWidth;
+	if (Has<RightBadge>()) {
+		width -= st::msgPadding.right() + rightBadgeWidth();
 	}
 	const auto from = item->displayFrom();
 	validateFromNameText(from);
@@ -4254,13 +6051,40 @@ void Message::fromNameUpdated(int width) const {
 				- st::msgPadding.left()
 				- st::msgPadding.right()
 				- nameText->maxWidth()
-				+ (_fromNameStatus
+				- (_fromNameStatus
 					? (st::dialogsPremiumIcon.icon.width()
 						+ st::msgServiceFont->spacew)
 					: 0)
 				- st::msgServiceFont->spacew);
 		}
 	}
+	if (const auto guestChat = item->Get<HistoryMessageGuestChat>()) {
+		const auto nameText = [&]() -> const Ui::Text::String * {
+			if (from) {
+				return &_fromName;
+			} else if (const auto info = item->originalHiddenSenderInfo()) {
+				return &info->nameText();
+			} else {
+				Unexpected("Corrupted forwarded information in message.");
+			}
+		}();
+		auto viaWidth = 0;
+		if (const auto via = item->Get<HistoryMessageVia>()) {
+			if (!displayForwardedFrom()) {
+				viaWidth = st::msgServiceFont->spacew + via->width;
+			}
+		}
+		guestChat->resize(width
+			- st::msgPadding.left()
+			- st::msgPadding.right()
+			- nameText->maxWidth()
+			- (_fromNameStatus
+				? (st::dialogsPremiumIcon.icon.width()
+					+ st::msgServiceFont->spacew)
+				: 0)
+			- st::msgServiceFont->spacew
+			- viaWidth);
+	}
 }
 
 TextSelection Message::skipTextSelection(TextSelection selection) const {
@@ -4288,14 +6112,18 @@ QRect Message::innerGeometry() const {
 			width()));
 	}
 	if (hasBubble()) {
-		result.translate(0, st::msgPadding.top() + st::mediaInBubbleSkip);
+		const auto cut = [&](int amount) {
+			amount = std::min(amount, result.height());
+			result.setTop(result.top() + amount);
+		};
+		cut(st::msgPadding.top() + st::mediaInBubbleSkip);
 
 		if (displayFromName()) {
 			// See paintFromName().
-			result.translate(0, st::msgNameFont->height);
+			cut(st::msgNameFont->height);
 		}
 		if (displayedTopicButton()) {
-			result.translate(0, st::topicButtonSkip
+			cut(st::topicButtonSkip
 				+ st::topicButtonPadding.top()
 				+ st::msgNameFont->height
 				+ st::topicButtonPadding.bottom()
@@ -4304,33 +6132,45 @@ QRect Message::innerGeometry() const {
 		if (!displayFromName() && !displayForwardedFrom()) {
 			// See paintViaBotIdInfo().
 			if (data()->Has<HistoryMessageVia>()) {
-				result.translate(0, st::msgServiceNameFont->height);
+				cut(st::msgServiceNameFont->height);
 			}
 		}
 		// Skip displayForwardedFrom() until there are no animations for it.
 		if (const auto reply = Get<Reply>()) {
 			// See paintReplyInfo().
-			result.translate(0, reply->height());
+			cut(reply->height());
 		}
 	}
 	return result;
 }
 
+QPoint Message::mediaTopLeft() const {
+	return _lastMediaPosition;
+}
+
+bool Message::isCommentsRootView() const {
+	return context() == Context::Replies
+		&& data()->isDiscussionPost()
+		&& !data()->history()->isForum();
+}
+
 QRect Message::countGeometry() const {
 	const auto item = data();
 	const auto centeredView = item->isFakeAboutView()
-		|| (context() == Context::Replies && item->isDiscussionPost());
+		|| isCommentsRootView();
 	const auto media = this->media();
-	const auto mediaWidth = (media && media->isDisplayed())
-		? media->width()
-		: width();
+	const auto mediaDisplayed = media && media->isDisplayed();
+	const auto mediaWidth = mediaDisplayed ? media->width() : width();
 	const auto outbg = hasOutLayout();
+	const auto useMoreSpace = (delegate()->elementChatMode()
+		== ElementChatMode::Narrow);
+	const auto wideSkip = useMoreSpace
+		? st::msgMargin.left()
+		: st::msgMargin.right();
 	const auto availableWidth = width()
 		- st::msgMargin.left()
-		- (centeredView ? st::msgMargin.left() : st::msgMargin.right());
-	auto contentLeft = hasRightLayout()
-		? st::msgMargin.right()
-		: st::msgMargin.left();
+		- (centeredView ? st::msgMargin.left() : wideSkip);
+	auto contentLeft = hasRightLayout() ? wideSkip : st::msgMargin.left();
 	auto contentWidth = availableWidth;
 	if (hasFromPhoto()) {
 		contentLeft += st::msgPhotoSkip;
@@ -4343,15 +6183,27 @@ QRect Message::countGeometry() const {
 	accumulate_min(contentWidth, maxWidth());
 	accumulate_min(contentWidth, int(_bubbleWidthLimit));
 	if (mediaWidth < contentWidth) {
-		const auto textualWidth = textualMaxWidth();
+		const auto textualWidth = bubbleTextualWidth();
 		if (mediaWidth < textualWidth
 			&& (!media || !media->enforceBubbleWidth())) {
 			accumulate_min(contentWidth, textualWidth);
 		} else {
 			contentWidth = mediaWidth;
 		}
+	} else if (!mediaDisplayed) {
+		const auto appearing = Get<TextAppearing>();
+		const auto use = (appearing && appearing->use)
+			? appearing->shownWidth
+			: textRealWidth();
+		if (use > 0) {
+			const auto shrunk = std::max(
+				use + st::msgPadding.left() + st::msgPadding.right(),
+				int(_nonTextMaxWidth));
+			accumulate_min(contentWidth, shrunk);
+		}
 	}
-	if (contentWidth < availableWidth && !delegate()->elementIsChatWide()) {
+	if (contentWidth < availableWidth
+		&& delegate()->elementChatMode() != ElementChatMode::Wide) {
 		if (outbg) {
 			contentLeft += availableWidth - contentWidth;
 		} else if (centeredView) {
@@ -4381,7 +6233,7 @@ Ui::BubbleRounding Message::countMessageRounding() const {
 		|| (media && media->skipBubbleTail())
 		|| (keyboard != nullptr)
 		|| item->isFakeAboutView()
-		|| (context() == Context::Replies && item->isDiscussionPost());
+		|| isCommentsRootView();
 	const auto right = hasRightLayout();
 	using Corner = Ui::BubbleCornerRounding;
 	return Ui::BubbleRounding{
@@ -4402,7 +6254,7 @@ Ui::BubbleRounding Message::countMessageRounding() const {
 
 Ui::BubbleRounding Message::countBubbleRounding(
 		Ui::BubbleRounding messageRounding) const {
-	if (const auto keyboard = data()->inlineReplyKeyboard()) {
+	if ([[maybe_unused]] const auto _ = data()->inlineReplyKeyboard()) {
 		messageRounding.bottomLeft
 			= messageRounding.bottomRight
 			= Ui::BubbleCornerRounding::Small;
@@ -4425,7 +6277,7 @@ int Message::resizeContentGetHeight(int newWidth) {
 	const auto postShowingAuthor = item->isPostShowingAuthor() ? 1 : 0;
 	if (_postShowingAuthor != postShowingAuthor) {
 		_postShowingAuthor = postShowingAuthor;
-		_fromNameVersion = -1;
+		_fromNameVersion = 0;
 		previousInBlocksChanged();
 
 		const auto size = _bottomInfo.currentSize();
@@ -4437,15 +6289,6 @@ int Message::resizeContentGetHeight(int newWidth) {
 		}
 	}
 
-	auto newHeight = minHeight();
-
-	if (const auto service = Get<ServicePreMessage>()) {
-		service->resizeToWidth(newWidth, delegate()->elementIsChatWide());
-	}
-
-	const auto botTop = item->isFakeAboutView()
-		? Get<FakeBotAboutTop>()
-		: nullptr;
 	const auto media = this->media();
 	const auto mediaDisplayed = media ? media->isDisplayed() : false;
 	const auto bubble = drawBubble();
@@ -4454,22 +6297,29 @@ int Message::resizeContentGetHeight(int newWidth) {
 
 	// This code duplicates countGeometry() but also resizes media.
 	const auto centeredView = item->isFakeAboutView()
-		|| (context() == Context::Replies && item->isDiscussionPost());
+		|| isCommentsRootView();
+	const auto useMoreSpace = (delegate()->elementChatMode()
+		== ElementChatMode::Narrow);
+	const auto wideSkip = useMoreSpace
+		? st::msgMargin.left()
+		: st::msgMargin.right();
 	auto contentWidth = newWidth
 		- st::msgMargin.left()
-		- (centeredView ? st::msgMargin.left() : st::msgMargin.right());
+		- (centeredView ? st::msgMargin.left() : wideSkip);
 	if (hasFromPhoto()) {
 		if (const auto size = rightActionSize()) {
 			contentWidth -= size->width() + (st::msgPhotoSkip - st::historyFastShareSize);
 		}
 	}
 	accumulate_min(contentWidth, maxWidth());
-	_bubbleWidthLimit = std::max(st::msgMaxWidth, monospaceMaxWidth());
+	_bubbleWidthLimit = (UnlimitedMessageWidth.value() && !mediaDisplayed)
+		? 0x3FFFFFF
+		: std::max(st::msgMaxWidth, monospaceMaxWidth());
 	accumulate_min(contentWidth, int(_bubbleWidthLimit));
+	const auto textualWidth = bubbleTextualWidth();
 	if (mediaDisplayed) {
 		media->resizeGetHeight(contentWidth);
 		if (media->width() < contentWidth) {
-			const auto textualWidth = textualMaxWidth();
 			if (media->width() < textualWidth
 				&& !media->enforceBubbleWidth()) {
 				accumulate_min(contentWidth, textualWidth);
@@ -4478,13 +6328,53 @@ int Message::resizeContentGetHeight(int newWidth) {
 			}
 		}
 	}
-	const auto textWidth = qMax(contentWidth - st::msgPadding.left() - st::msgPadding.right(), 1);
+	if (!mediaDisplayed && bubble && hasVisibleText()) {
+		const auto probeTextWidth = bubbleTextWidth(contentWidth);
+		[[maybe_unused]] const auto probe = textHeightFor(probeTextWidth);
+		if (!Get<TextAppearing>()) {
+			const auto use = textRealWidth();
+			if (use > 0) {
+				const auto shrunk = std::max(
+					use + st::msgPadding.left() + st::msgPadding.right(),
+					int(_nonTextMaxWidth));
+				accumulate_min(contentWidth, shrunk);
+			}
+		}
+	}
+	const auto bottomInfoWidth = qMax(
+		contentWidth - st::msgPadding.left() - st::msgPadding.right(),
+		1);
+	const auto textWidth = bubble
+		? bubbleTextWidth(contentWidth)
+		: bottomInfoWidth;
+
+	auto appearing = Get<TextAppearing>();
+	if (appearing) {
+		if (appearing->textWidth != textWidth) {
+			appearing->geometryValid = false;
+			appearing->textWidth = textWidth;
+		}
+		// This may invalidate composer structure by removing TextAppearing.
+		if (!textAppearValidate(appearing)) {
+			appearing = nullptr;
+		}
+	}
+
 	const auto reactionsInBubble = _reactions && embedReactionsInBubble();
 	const auto bottomInfoHeight = _bottomInfo.resizeGetHeight(
 		std::min(
-			_bottomInfo.optimalSize().width(),
-			textWidth - 2 * st::msgDateDelta.x()));
+			_bottomInfo.maxWidth(),
+			bottomInfoWidth - 2 * st::msgDateDelta.x()));
+
+	auto newHeight = minHeight();
+
+	if (const auto service = Get<ServicePreMessage>()) {
+		service->resizeToWidth(newWidth, delegate()->elementChatMode());
+	}
 
+	const auto botTop = item->isFakeAboutView()
+		? Get<FakeBotAboutTop>()
+		: nullptr;
 	if (bubble) {
 		auto reply = Get<Reply>();
 		auto via = item->Get<HistoryMessageVia>();
@@ -4498,9 +6388,9 @@ int Message::resizeContentGetHeight(int newWidth) {
 		if (reactionsInBubble) {
 			_reactions->resizeGetHeight(textWidth);
 		}
-
-		if (contentWidth == maxWidth()) {
+		if (contentWidth == maxWidth() && !appearing) {
 			if (mediaDisplayed) {
+				newHeight += media->height() - media->minHeight();
 				if (check) {
 					newHeight += check->resizeGetHeight(contentWidth) + st::mediaInBubbleSkip;
 				}
@@ -4523,7 +6413,11 @@ int Message::resizeContentGetHeight(int newWidth) {
 				if (botTop) {
 					newHeight += botTop->height;
 				}
-				newHeight += textHeightFor(textWidth);
+				if (appearing) {
+					newHeight += appearing->shownHeight;
+				} else {
+					newHeight += textHeightFor(textWidth);
+				}
 			}
 			if (!mediaOnBottom && (!_viewButton || !reactionsInBubble)) {
 				newHeight += st::msgPadding.bottom();
@@ -4588,6 +6482,11 @@ int Message::resizeContentGetHeight(int newWidth) {
 				- st::msgPadding.left()
 				- st::msgPadding.right());
 		}
+		if (const auto summaryHeader = Get<SummaryHeader>()) {
+			newHeight += summaryHeader->resizeToWidth(contentWidth
+				- st::msgPadding.left()
+				- st::msgPadding.right());
+		}
 		if (needInfoDisplay()) {
 			newHeight += (bottomInfoHeight - st::msgDateFont->height);
 		}
@@ -4625,6 +6524,248 @@ int Message::resizeContentGetHeight(int newWidth) {
 	return newHeight;
 }
 
+void Message::invalidateTextDependentCache() {
+	_bubbleTextualWidthMinimum = -1;
+	_bubbleTextualWidthCache = 0;
+}
+
+bool Message::textAppearValidate(not_null<TextAppearing*> appearing) {
+	while (true) {
+		if (!textAppearCheckLine(appearing)) {
+			return false;
+		} else if (!appearing->use
+			|| appearing->widthAnimation.animating()
+			|| appearing->heightAnimation.animating()) {
+			return true;
+		}
+		++appearing->shownLine;
+		appearing->revealedLineWidth = 0;
+		appearing->startLineWidth = 0;
+		appearing->targetLineWidth = 0;
+	}
+}
+
+bool Message::textAppearCheckLine(not_null<TextAppearing*> appearing) {
+	const auto recount = !appearing->geometryValid;
+	if (recount) {
+		appearing->geometryValid = true;
+		validateText();
+		if (const auto rich = richpage()) {
+			const auto articleWidth = richPageWidthFor(appearing->textWidth);
+			appearing->lines = rich->article.countRevealLinesGeometry(
+				articleWidth);
+			if (appearing->lines.empty()) {
+				const auto height = textHeightFor(appearing->textWidth);
+				if (height > 0) {
+					appearing->lines.push_back({
+						.left = 0,
+						.width = std::max(textRealWidth(), 1),
+						.bottom = height,
+						.rtl = false,
+						.baseline = height,
+					});
+				}
+			}
+		} else {
+			appearing->lines = text().countLinesGeometry(
+				appearing->textWidth);
+			auto &lines = appearing->lines;
+			if (lines.size() > 1 && text().hasSkipBlock()) {
+				const auto &last = lines.back();
+				const auto &prev = lines[lines.size() - 2];
+				if (last.width == skipBlockWidth()
+					&& last.bottom - prev.bottom == skipBlockHeight()) {
+					const auto bottom = last.bottom;
+					lines.pop_back();
+					lines.back().bottom = bottom;
+				}
+			}
+		}
+	}
+	const auto lines = int(appearing->lines.size());
+	const auto shown = appearing->shownLine;
+	const auto line = (shown < lines) ? &appearing->lines[shown] : nullptr;
+	const auto finalLineHeight = line
+		? (hasRichPage() && text().hasSkipBlock() && (shown + 1 == lines)
+			? line->bottom + skipBlockHeight()
+			: line->bottom)
+		: 0;
+	const auto use = appearing->use = !anim::Disabled()
+		&& line
+		&& ((shown + 1 < lines)
+			|| (shown + 1 == lines
+				&& ((appearing->revealedLineWidth < line->width)
+					|| (appearing->shownHeight < finalLineHeight))));
+	if (!use) {
+		if (data()->isRegular()) {
+			// We are inside these animations' tick, can't destroy them now.
+			crl::on_main(this, [=] {
+				if (Has<TextAppearing>() && !Get<TextAppearing>()->use) {
+					RemoveComponents(TextAppearing::Bit());
+				}
+			});
+			return false;
+		} else if (recount && lines) {
+			appearing->shownLine = lines - 1;
+			const auto &line = appearing->lines.back();
+			appearing->revealedLineWidth = line.width;
+			appearing->shownWidth = textRealWidth();
+			appearing->shownHeight = line.bottom
+				+ ((hasRichPage() && text().hasSkipBlock())
+					? skipBlockHeight()
+					: 0);
+			appearing->widthAnimation.stop();
+			appearing->heightAnimation.stop();
+		}
+		return true;
+	}
+	if (appearing->targetLineWidth != line->width) {
+		if (appearing->revealedLineWidth >= line->width) {
+			appearing->widthAnimation.stop();
+			appearing->revealedLineWidth
+				= appearing->targetLineWidth
+				= line->width;
+		} else {
+			textAppearStartWidthAnimation(appearing);
+		}
+	}
+	const auto targetHeight = textAppearTargetHeight(appearing);
+	if (appearing->targetHeight != targetHeight) {
+		if (!shown) {
+			appearing->shownHeight = appearing->lines.front().bottom
+				+ (appearing->lines.size() > 1 ? skipBlockHeight() : 0);
+		}
+		if (appearing->shownHeight >= targetHeight) {
+			appearing->heightAnimation.stop();
+			appearing->shownHeight = appearing->targetHeight = targetHeight;
+		} else {
+			const auto widthStart = appearing->startLineWidth;
+			const auto widthTarget = appearing->targetLineWidth;
+			const auto width = appearing->revealedLineWidth;
+			const auto progress = (width >= widthTarget)
+				? 1.
+				: (width - widthStart) / float64(widthTarget - widthStart);
+			const auto left = (1. - progress) * appearing->widthDuration;
+			const auto duration = appearing->finalizing
+				? kLineHeightAppearFinalDuration
+				: kLineHeightAppearDuration;
+			if (appearing->heightAnimation.animating()
+				|| !appearing->widthAnimation.animating()
+				|| left <= duration) {
+				textAppearStartHeightAnimation(appearing, targetHeight);
+			}
+		}
+	}
+	return true;
+}
+
+void Message::textAppearStartWidthAnimation(
+		not_null<TextAppearing*> appearing) {
+	Expects(appearing->use);
+
+	const auto shown = appearing->shownLine;
+	const auto lines = int(appearing->lines.size());
+	const auto lineWidth = appearing->lines[shown].width;
+	const auto lineDuration = appearing->finalizing
+		? kFullLineAppearFinalDuration
+		: kFullLineAppearDuration;
+	const auto computed = (shown + 1 == lines)
+		? lineDuration
+		: std::max(
+			lineDuration * lineWidth / st::msgMaxWidth,
+			crl::time(10));
+	const auto duration = std::exchange(appearing->startedForText, true)
+		? computed
+		: std::max(computed, kMinWidthAppearDuration);
+	appearing->widthDuration = duration;
+	const auto from
+		= appearing->startLineWidth
+		= appearing->revealedLineWidth;
+	const auto to = appearing->targetLineWidth = lineWidth;
+
+	Assert(from < to);
+	appearing->widthAnimation.start([=] {
+		textAppearWidthCallback();
+	}, from, to, duration, anim::linear);
+}
+
+void Message::textAppearStartHeightAnimation(
+		not_null<TextAppearing*> appearing,
+		int targetHeight) {
+	Expects(appearing->use);
+
+	const auto from = appearing->shownHeight;
+	const auto to = appearing->targetHeight = targetHeight;
+	const auto duration = appearing->finalizing
+		? kLineHeightAppearFinalDuration
+		: kLineHeightAppearDuration;
+	appearing->heightAnimation.start([=] {
+		textAppearHeightCallback();
+	}, from, to, duration, anim::easeOutCubic);
+}
+
+int Message::textAppearTargetHeight(
+		not_null<TextAppearing*> appearing) const {
+	const auto next = appearing->shownLine + 1;
+	const auto lines = int(appearing->lines.size());
+	if (next + 1 >= lines) {
+		return appearing->lines.back().bottom
+			+ ((hasRichPage() && text().hasSkipBlock())
+				? skipBlockHeight()
+				: 0);
+	}
+	const auto &line = appearing->lines[next];
+	const auto bottom = line.bottom;
+	const auto rich = hasRichPage();
+	const auto nextWidth = rich ? RevealLineRight(line) : line.width;
+	const auto available = std::max(
+		(rich
+			? RevealLineRight(appearing->lines[appearing->shownLine])
+			: appearing->lines[appearing->shownLine].width),
+		appearing->shownWidth);
+	if (nextWidth + skipBlockWidth() <= available && !line.rtl) {
+		return bottom;
+	}
+	return bottom + skipBlockHeight();
+}
+
+void Message::textAppearWidthCallback() {
+	const auto appearing = Get<TextAppearing>();
+	const auto now = int(base::SafeRound(
+		appearing->widthAnimation.value(appearing->targetLineWidth)));
+	if (now != appearing->revealedLineWidth) {
+		appearing->revealedLineWidth = now;
+		const auto &line = appearing->lines[appearing->shownLine];
+		if (line.rtl) {
+			appearing->shownWidth = textRealWidth();
+		} else {
+			const auto shownWidth = hasRichPage()
+				? line.left + now + skipBlockWidth()
+				: now + skipBlockWidth();
+			appearing->shownWidth = std::min(
+				std::max(
+					appearing->shownWidth,
+					shownWidth),
+				textRealWidth());
+		}
+		repaint();
+	}
+	textAppearValidate(appearing);
+}
+
+void Message::textAppearHeightCallback() {
+	const auto appearing = Get<TextAppearing>();
+	const auto now = int(base::SafeRound(
+		appearing->heightAnimation.value(appearing->targetHeight)));
+	if (const auto delta = now - appearing->shownHeight) {
+		appearing->shownHeight = now;
+		adjustHeight(delta);
+		history()->viewHeightAdjusted(this, delta);
+		repaint();
+	}
+	textAppearValidate(appearing);
+}
+
 bool Message::needInfoDisplay() const {
 	const auto media = this->media();
 	const auto mediaDisplayed = media ? media->isDisplayed() : false;
@@ -4647,13 +6788,16 @@ bool Message::hasVisibleText() const {
 	const auto textItem = this->textItem();
 	if (!textItem) {
 		return false;
+	}
+	const auto media = this->media();
+	if (hasRichPage()) {
+		return !media || !media->hideMessageText();
 	} else if (textItem->emptyText()) {
 		if (const auto media = textItem->media()) {
-			return media->storyExpired();
+			return media->storyExpired() || media->storyUnsupported();
 		}
 		return false;
 	}
-	const auto media = this->media();
 	return !media || !media->hideMessageText();
 }
 
@@ -4679,7 +6823,7 @@ void Message::refreshInfoSkipBlock(HistoryItem *textItem) {
 	const auto hasTextSkipBlock = [&] {
 		if (!textItem || textItem->_text.empty()) {
 			if (const auto media = data()->media()) {
-				return media->storyExpired();
+				return media->storyExpired() || media->storyUnsupported();
 			}
 			return false;
 		} else if (factcheckBlock()
@@ -4733,4 +6877,42 @@ const HistoryMessageEdited *Message::displayedEditBadge() const {
 	return data()->Get<HistoryMessageEdited>();
 }
 
+void Message::ensureSummarizeButton() const {
+	if (data()->canBeSummarized()
+		/*&& item->originalText().text.size() >= kSummarizeThreshold*/) {
+		if (!_summarize) {
+			_summarize
+				= std::make_unique<TranscribeButton>(data(), false, true);
+		}
+	} else {
+		_summarize = nullptr;
+	}
+}
+
+void Message::paintSummarize(
+		Painter &p,
+		int x,
+		int y,
+		bool right,
+		const PaintContext &context,
+		QRect g) const {
+	if (!_summarize) {
+		return;
+	}
+	const auto s = _summarize->size();
+	const auto bottomY = y - s.height() - st::msgDateImgDelta;
+	if (bottomY < g.top()) {
+		return;
+	}
+	const auto topY = g.top();
+	const auto buttonY = std::min(
+		std::max(topY, context.area.y() + st::msgDateImgDelta),
+		bottomY);
+	_summarize->paint(
+		p,
+		x - (right ? 0 : s.width()),
+		buttonY,
+		context);
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_message.h b/Telegram/SourceFiles/history/view/history_view_message.h
index dc35277df79cbf..04b319c980dfef 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.h
+++ b/Telegram/SourceFiles/history/view/history_view_message.h
@@ -9,12 +9,15 @@ For license and copyright information please follow this link:
 
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_bottom_info.h"
+#include "iv/markdown/iv_markdown_article.h"
 #include "ui/effects/animations.h"
 
 class HistoryItem;
 struct HistoryMessageEdited;
 struct HistoryMessageForwarded;
 struct HistoryMessageReplyMarkup;
+struct HistoryMessageSuggestion;
+struct HistoryMessageReply;
 
 namespace Data {
 struct ReactionId;
@@ -29,14 +32,19 @@ namespace HistoryView {
 
 class ViewButton;
 class WebPage;
+class TranscribeButton;
+class Message;
 
 namespace Reactions {
 class InlineList;
 } // namespace Reactions
 
+namespace ReplyButton {
+struct ButtonParameters;
+} // namespace ReplyButton
+
 // Special type of Component for the channel actions log.
-struct LogEntryOriginal
-	: public RuntimeComponent<LogEntryOriginal, Element> {
+struct LogEntryOriginal : RuntimeComponent<LogEntryOriginal, Element> {
 	LogEntryOriginal();
 	LogEntryOriginal(LogEntryOriginal &&other);
 	LogEntryOriginal &operator=(LogEntryOriginal &&other);
@@ -45,24 +53,110 @@ struct LogEntryOriginal
 	std::unique_ptr<WebPage> page;
 };
 
-struct Factcheck
-: public RuntimeComponent<Factcheck, Element> {
+struct Factcheck : RuntimeComponent<Factcheck, Element> {
 	std::unique_ptr<WebPage> page;
 	bool expanded = false;
 };
 
-struct PsaTooltipState : public RuntimeComponent<PsaTooltipState, Element> {
+struct PsaTooltipState : RuntimeComponent<PsaTooltipState, Element> {
 	QString type;
 	mutable ClickHandlerPtr link;
 	mutable Ui::Animations::Simple buttonVisibleAnimation;
 	mutable bool buttonVisible = true;
 };
 
+struct HiddenSenderTooltip
+: RuntimeComponent<HiddenSenderTooltip, Element> {
+	mutable QRect linkRect;
+	mutable int cachedWidth = -1;
+};
+
+struct InstantViewMediaRuntime
+: RuntimeComponent<InstantViewMediaRuntime, Element> {
+	QString pageUrl;
+};
+
+struct HistoryMessageRichPage
+: RuntimeComponent<HistoryMessageRichPage, Element> {
+	HistoryMessageRichPage();
+
+	struct Host final : Iv::Markdown::MediaBlockHost {
+		base::weak_ptr<Message> owner;
+
+		void requestRepaint(QRect articleRect) override;
+		void requestRelayout(QRect articleRect) override;
+	};
+
+	std::shared_ptr<const Iv::RichPage> page;
+	std::shared_ptr<Iv::Markdown::MediaRuntime> mediaRuntime;
+
+	// The article and its media blocks keep a raw MediaBlockHost pointer,
+	// while components are moved on each composer mask change, so the
+	// host must live on the heap to have a stable address.
+	std::unique_ptr<Host> host;
+
+	Iv::Markdown::MarkdownArticle article;
+	Iv::Markdown::MarkdownArticleThinkingPaintCache thinkingPaintCache;
+	rpl::lifetime highlightReadyLifetime;
+	int paletteVersion = -1;
+	mutable ClickHandlerPtr handler;
+	mutable std::optional<Iv::Markdown::MarkdownArticleHorizontalScrollHit> handlerHorizontalScrollHit;
+	mutable QPoint handlerHorizontalScrollPoint;
+	mutable bool handlerHorizontalScrollActive = false;
+	mutable ClickHandlerPtr handlerHorizontalScrollPressed;
+	mutable std::optional<Iv::Markdown::PreparedLink> handlerPreparedLink;
+	mutable Iv::Markdown::MediaActivation handlerMediaActivation;
+	mutable Iv::Markdown::PreparedPlaceholderBlockId handlerPlaceholderId;
+	mutable QPoint handlerPlaceholderPoint;
+};
+
+enum class BadgeRole : uchar {
+	User,
+	Admin,
+	Creator,
+};
+
+struct RightBadge : RuntimeComponent<RightBadge, Element> {
+	Ui::Text::String tag;
+	Ui::Text::String boosts;
+	mutable ClickHandlerPtr tagLink;
+	mutable ClickHandlerPtr boostsLink;
+	int width = 0;
+	BadgeRole role = BadgeRole::User;
+	bool overridden = false;
+	bool special = false;
+	mutable std::unique_ptr<Ui::RippleAnimation> ripple;
+	mutable QPoint lastPoint;
+};
+
+struct TextAppearing : RuntimeComponent<TextAppearing, Element> {
+	std::vector<Ui::Text::LineLayoutInfo> lines;
+	int textWidth = 0;
+	int shownLine = 0;
+	int revealedLineWidth = 0;
+	int startLineWidth = 0;
+	int targetLineWidth = 0;
+	int shownWidth = 0;
+	int shownHeight = 0;
+	int targetHeight = 0;
+	crl::time widthDuration = 0;
+	Ui::Animations::Simple widthAnimation;
+	Ui::Animations::Simple heightAnimation;
+	bool geometryValid = false;
+	bool startedForText = false;
+	bool finalizing = false;
+	bool use = false;
+	mutable QImage lineCache;
+	mutable QImage gradientMask;
+};
+
 struct BottomRippleMask {
 	QImage image;
 	int shift = 0;
 };
 
+extern const char kOptionUnlimitedMessageWidth[];
+
 class Message final : public Element {
 public:
 	Message(
@@ -78,7 +172,7 @@ class Message final : public Element {
 	[[nodiscard]] const HistoryMessageEdited *displayedEditBadge() const;
 	[[nodiscard]] HistoryMessageEdited *displayedEditBadge();
 
-	[[nodiscard]] bool embedReactionsInBubble() const;
+	bool embedReactionsInBubble() const override;
 
 	int marginTop() const override;
 	int marginBottom() const override;
@@ -88,6 +182,10 @@ class Message final : public Element {
 		QPoint point,
 		StateRequest request) const override;
 	void updatePressed(QPoint point) override;
+	bool consumeHorizontalScroll(QPoint position, int delta) override;
+	[[nodiscard]] bool canConsumeHorizontalScroll(
+		QPoint position,
+		int delta) const override;
 	void drawInfo(
 		Painter &p,
 		const PaintContext &context,
@@ -100,20 +198,38 @@ class Message final : public Element {
 		int bottom,
 		QPoint point,
 		InfoDisplayType type) const override;
+	MessageSelection selectionFromStates(
+		const TextState &anchor,
+		const TextState &current,
+		TextSelectType type) const override;
 	TextForMimeData selectedText(TextSelection selection) const override;
+	TextForMimeData selectedText(
+		const MessageSelection &selection) const override;
 	SelectedQuote selectedQuote(TextSelection selection) const override;
+	SelectedQuote selectedQuote(
+		const MessageSelection &selection) const override;
 	TextSelection selectionFromQuote(
 		const SelectedQuote &quote) const override;
 	TextSelection adjustSelection(
 		TextSelection selection,
 		TextSelectType type) const override;
+	MessageSelection adjustSelection(
+		const MessageSelection &selection,
+		TextSelectType type) const override;
+	TextSelection selectionForEdit(
+		const MessageSelection &selection) const override;
+	bool selectionContains(
+		const MessageSelection &selection,
+		const TextState &state) const override;
 
 	Reactions::ButtonParameters reactionButtonParameters(
 		QPoint position,
 		const TextState &reactionState) const override;
+	ReplyButton::ButtonParameters replyButtonParameters(
+		QPoint position,
+		const TextState &replyState) const override;
 	int reactionsOptimalWidth() const override;
 
-	bool hasHeavyPart() const override;
 	void unloadHeavyPart() override;
 
 	// hasFromPhoto() returns true even if we don't display the photo
@@ -129,8 +245,6 @@ class Message final : public Element {
 	TopicButton *displayedTopicButton() const override;
 	bool unwrapped() const override;
 	int minWidthForMedia() const override;
-	bool hasFastReply() const override;
-	bool displayFastReply() const override;
 	bool displayRightActionComments() const;
 	std::optional<QSize> rightActionSize() const override;
 	void drawRightAction(
@@ -159,27 +273,36 @@ class Message final : public Element {
 		const base::flat_set<UserId> &changes) override;
 
 	void animateReaction(Ui::ReactionFlyAnimationArgs &&args) override;
-	auto takeReactionAnimations()
-	-> base::flat_map<
-		Data::ReactionId,
-		std::unique_ptr<Ui::ReactionFlyAnimation>> override;
 
-	void animateEffect(Ui::ReactionFlyAnimationArgs &&args) override;
 	auto takeEffectAnimation()
 	-> std::unique_ptr<Ui::ReactionFlyAnimation> override;
 
 	QRect effectIconGeometry() const override;
 	QRect innerGeometry() const override;
+	QPoint mediaTopLeft() const override;
 	[[nodiscard]] BottomRippleMask bottomRippleMask(int buttonHeight) const;
 
-protected:
-	void refreshDataIdHook() override;
+	void setInstantViewMediaRuntime(QString pageUrl);
+	[[nodiscard]] bool hasRichPage() const;
+	void requestRichPageRepaint(QRect articleRect) const;
+	void requestRichPageRelayout(QRect articleRect);
 
 private:
 	struct CommentsButton;
+	struct LinkRipple;
 	struct FromNameStatus;
 	struct RightAction;
 
+	void refreshDataIdHook() override;
+	bool hasHeavyPart() const override;
+
+	bool updateBottomInfo();
+
+	void initPaidInformation();
+	void refreshSuggestedInfo(
+		not_null<HistoryItem*> item,
+		not_null<const HistoryMessageSuggestion*> suggest,
+		const HistoryMessageReply *reply);
 	void initLogEntryOriginal();
 	void initPsa();
 	void fromNameUpdated(int width) const;
@@ -195,9 +318,32 @@ class Message final : public Element {
 	void toggleTopicButtonRipple(bool pressed);
 	void createTopicButtonRipple();
 
+	void toggleLinkRipple(bool pressed);
+	void recordLinkRipplePoint(
+		QPoint point,
+		QPoint textOrigin) const;
+	void paintLinkRipple(
+		Painter &p,
+		const ClickHandlerPtr &handler,
+		QRect linkRect,
+		QPoint textPosition) const;
+	void createLinkRippleMask(
+		const QPainterPath &path,
+		QPoint textPosition,
+		int useWidth,
+		style::margins padding,
+		int radius) const;
+	void createLinkRippleMask(
+		QRect linkRect,
+		QPoint textPosition,
+		style::margins padding,
+		int radius) const;
+
 	void toggleRightActionRipple(bool pressed);
+	void toggleBadgeRipple(bool pressed);
 
 	void toggleReplyRipple(bool pressed);
+	void toggleSummaryHeaderRipple(bool pressed);
 
 	void paintCommentsButton(
 		Painter &p,
@@ -219,6 +365,10 @@ class Message final : public Element {
 		Painter &p,
 		QRect &trect,
 		const PaintContext &context) const;
+	void paintSummaryHeaderInfo(
+		Painter &p,
+		QRect &trect,
+		const PaintContext &context) const;
 	// This method draws "via @bot" if it is not painted
 	// in forwarded info or in from name.
 	void paintViaBotIdInfo(
@@ -229,6 +379,11 @@ class Message final : public Element {
 		Painter &p,
 		QRect &trect,
 		const PaintContext &context) const;
+	void paintRichText(
+		Painter &p,
+		not_null<HistoryMessageRichPage*> rich,
+		QRect rect,
+		const PaintContext &context) const;
 
 	bool getStateCommentsButton(
 		QPoint point,
@@ -251,6 +406,10 @@ class Message final : public Element {
 		QPoint point,
 		QRect &trect,
 		not_null<TextState*> outResult) const;
+	bool getStateSummaryHeaderInfo(
+		QPoint point,
+		QRect &trect,
+		not_null<TextState*> outResult) const;
 	bool getStateViaBotIdInfo(
 		QPoint point,
 		QRect &trect,
@@ -276,8 +435,11 @@ class Message final : public Element {
 	[[nodiscard]] int visibleMediaTextLength() const;
 	[[nodiscard]] bool needInfoDisplay() const;
 	[[nodiscard]] bool invertMedia() const;
+	[[nodiscard]] bool hasFastReply() const;
+	[[nodiscard]] bool displayFastReply() const;
 
 	[[nodiscard]] bool isPinnedContext() const;
+	[[nodiscard]] bool isCommentsRootView() const;
 
 	[[nodiscard]] bool displayFastShare() const;
 	[[nodiscard]] bool displayGoToOriginal() const;
@@ -288,10 +450,31 @@ class Message final : public Element {
 	void refreshTopicButton();
 	void refreshInfoSkipBlock(HistoryItem *textItem);
 	[[nodiscard]] int monospaceMaxWidth() const;
+	[[nodiscard]] int bubbleTextWidth(int bubbleWidth) const;
+	[[nodiscard]] int bubbleTextualWidth() const;
+
+	void ensureSummarizeButton() const;
+	void paintSummarize(
+		Painter &p,
+		int x,
+		int y,
+		bool right,
+		const PaintContext &context,
+		QRect g) const;
 
-	void validateInlineKeyboard(HistoryMessageReplyMarkup *markup);
 	void updateViewButtonExistence();
 	[[nodiscard]] int viewButtonHeight() const;
+	[[nodiscard]] bool prepareRichPageTextRect(QRect &trect) const;
+	[[nodiscard]] QRect richPageRect(QRect trect) const;
+	[[nodiscard]] QPoint prepareRichPageStateRect(
+		QPoint point,
+		QRect &trect) const;
+	void activateRichPagePreparedLink(
+		const Iv::Markdown::PreparedLink &link,
+		ClickContext context) const;
+	void activateRichPageMedia(
+		const Iv::Markdown::MediaActivation &activation,
+		ClickContext context) const;
 
 	[[nodiscard]] WebPage *logEntryOriginal() const;
 	[[nodiscard]] WebPage *factcheckBlock() const;
@@ -299,31 +482,48 @@ class Message final : public Element {
 	[[nodiscard]] ClickHandlerPtr createGoToCommentsLink() const;
 	[[nodiscard]] ClickHandlerPtr psaTooltipLink() const;
 	void psaTooltipToggled(bool shown) const;
+	void invalidateTextDependentCache() override;
+
+	bool textAppearValidate(not_null<TextAppearing*> appearing);
+	bool textAppearCheckLine(not_null<TextAppearing*> appearing);
+	void textAppearStartWidthAnimation(not_null<TextAppearing*> appearing);
+	void textAppearStartHeightAnimation(
+		not_null<TextAppearing*> appearing,
+		int targetHeight);
+	void textAppearWidthCallback();
+	void textAppearHeightCallback();
+	[[nodiscard]] int textAppearTargetHeight(
+		not_null<TextAppearing*> appearing) const;
 
-	void setReactions(std::unique_ptr<Reactions::InlineList> list);
 	void refreshRightBadge();
-	void refreshReactions();
+	[[nodiscard]] int rightBadgeWidth() const;
 	void validateFromNameText(PeerData *from) const;
+	void ensureFromNameStatusLink(not_null<PeerData*> peer) const;
 
 	mutable std::unique_ptr<RightAction> _rightAction;
 	mutable ClickHandlerPtr _fastReplyLink;
 	mutable std::unique_ptr<ViewButton> _viewButton;
-	std::unique_ptr<Reactions::InlineList> _reactions;
 	std::unique_ptr<TopicButton> _topicButton;
+	mutable std::unique_ptr<LinkRipple> _linkRipple;
+	mutable QPoint _linkRippleLastPoint;
 	mutable std::unique_ptr<CommentsButton> _comments;
+	mutable std::unique_ptr<TranscribeButton> _summarize;
 
 	mutable Ui::Text::String _fromName;
 	mutable std::unique_ptr<FromNameStatus> _fromNameStatus;
 	mutable std::unique_ptr<Ui::RoundCheckbox> _selectionRoundCheckbox;
-	Ui::Text::String _rightBadge;
-	mutable int _fromNameVersion = 0;
-	uint32 _bubbleWidthLimit : 28 = 0;
+	mutable uint32 _fromNameVersion : 16 = 0;
+	uint32 _nonTextMaxWidth : 16 = 0;
+	mutable int _bubbleTextualWidthMinimum : 16 = -1;
+	mutable int _bubbleTextualWidthCache : 16 = 0;
+	uint32 _bubbleWidthLimit : 26 = 0;
 	uint32 _invertMedia : 1 = 0;
 	uint32 _hideReply : 1 = 0;
-	uint32 _rightBadgeHasBoosts : 1 = 0;
 	uint32 _postShowingAuthor : 1 = 0;
+	mutable uint32 _fromLinkRipplePointSet : 1 = 0;
 
 	BottomInfo _bottomInfo;
+	mutable QPoint _lastMediaPosition;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/history_view_object.h b/Telegram/SourceFiles/history/view/history_view_object.h
index 9072b90bedd4d8..c61847c1bf5e0f 100644
--- a/Telegram/SourceFiles/history/view/history_view_object.h
+++ b/Telegram/SourceFiles/history/view/history_view_object.h
@@ -54,6 +54,9 @@ class Object {
 		_width = size.width();
 		_height = size.height();
 	}
+	void adjustHeight(int delta) {
+		_height += delta;
+	}
 
 private:
 	virtual QSize countOptimalSize() = 0;
diff --git a/Telegram/SourceFiles/history/view/history_view_paid_reaction_toast.cpp b/Telegram/SourceFiles/history/view/history_view_paid_reaction_toast.cpp
index 566b1f72db73c2..1a9f03d41ac74c 100644
--- a/Telegram/SourceFiles/history/view/history_view_paid_reaction_toast.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_paid_reaction_toast.cpp
@@ -7,10 +7,13 @@ For license and copyright information please follow this link:
 */
 #include "history/view/history_view_paid_reaction_toast.h"
 
+#include "calls/group/calls_group_call.h"
+#include "calls/group/calls_group_messages.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_message_reactions.h"
+#include "data/data_peer.h"
 #include "data/data_session.h"
 #include "history/view/history_view_element.h"
 #include "history/history_item.h"
@@ -29,8 +32,6 @@ For license and copyright information please follow this link:
 namespace HistoryView {
 namespace {
 
-constexpr auto kPremiumToastDuration = 5 * crl::time(1000);
-
 [[nodiscard]] not_null<Ui::AbstractButton*> MakeUndoButton(
 		not_null<QWidget*> parent,
 		int width,
@@ -88,7 +89,7 @@ constexpr auto kPremiumToastDuration = 5 * crl::time(1000);
 		result->update();
 	};
 
-	result->paintRequest() | rpl::start_with_next([=] {
+	result->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(result);
 
 		const auto font = st::historyPremiumViewSet.style.font;
@@ -103,7 +104,6 @@ constexpr auto kPremiumToastDuration = 5 * crl::time(1000);
 			(result->height() - st::toastUndoDiameter) / 2,
 			st::toastUndoDiameter,
 			st::toastUndoDiameter);
-		p.setFont(st::toastUndoFont);
 		state->countdown.paint(
 			p,
 			inner.x() + (inner.width() - state->countdown.countWidth()) / 2,
@@ -122,7 +122,7 @@ constexpr auto kPremiumToastDuration = 5 * crl::time(1000);
 	}, result->lifetime());
 	result->resize(width, st::historyPremiumViewSet.height);
 
-	std::move(finish) | rpl::start_with_next([=](crl::time value) {
+	std::move(finish) | rpl::on_next([=](crl::time value) {
 		state->finish = value;
 		state->update();
 	}, result->lifetime());
@@ -147,11 +147,27 @@ PaidReactionToast::PaidReactionToast(
 	_owner->viewPaidReactionSent(
 	) | rpl::filter(
 		std::move(mine)
-	) | rpl::start_with_next([=](not_null<const Element*> view) {
+	) | rpl::on_next([=](not_null<const Element*> view) {
 		maybeShowFor(view->data());
 	}, _lifetime);
 }
 
+PaidReactionToast::PaidReactionToast(
+	not_null<Ui::RpWidget*> parent,
+	not_null<Data::Session*> owner,
+	rpl::producer<int> topOffset,
+	Fn<bool(not_null<Calls::GroupCall*> call)> mine)
+: _parent(parent)
+, _owner(owner)
+, _topOffset(std::move(topOffset)) {
+	_owner->callPaidReactionSent(
+	) | rpl::filter(
+		std::move(mine)
+	) | rpl::on_next([=](not_null<Calls::GroupCall*> call) {
+		maybeShowFor(call);
+	}, _lifetime);
+}
+
 PaidReactionToast::~PaidReactionToast() {
 	_hiding.push_back(_weak);
 	for (const auto &weak : base::take(_hiding)) {
@@ -161,8 +177,20 @@ PaidReactionToast::~PaidReactionToast() {
 	}
 }
 
+rpl::producer<FullMsgId> PaidReactionToast::shownForId() const {
+	return _shownForId.value();
+}
+
+rpl::producer<Calls::GroupCall*> PaidReactionToast::shownForCall() const {
+	return shownForId() | rpl::map([=](FullMsgId id) {
+		const auto i = _idsForCalls.find(id);
+		return (i != end(_idsForCalls)) ? i->second.get() : nullptr;
+	});
+}
+
 bool PaidReactionToast::maybeShowFor(not_null<HistoryItem*> item) {
 	const auto count = item->reactionsPaidScheduled();
+	const auto shownPeer = item->reactionsLocalShownPeer();
 	const auto at = _owner->reactions().sendingScheduledPaidAt(item);
 	if (!count || !at) {
 		return false;
@@ -172,13 +200,30 @@ bool PaidReactionToast::maybeShowFor(not_null<HistoryItem*> item) {
 	if (at <= crl::now() + ignore) {
 		return false;
 	}
-	showFor(item->fullId(), count, at - ignore, total);
+	showFor(item->fullId(), count, shownPeer, at - ignore, total);
+	return true;
+}
+
+bool PaidReactionToast::maybeShowFor(not_null<Calls::GroupCall*> call) {
+	const auto count = call->messages()->reactionsPaidScheduled();
+	const auto shownPeer = call->messagesFrom()->id;
+	const auto at = _owner->reactions().sendingScheduledPaidAt(call);
+	if (!count || !at) {
+		return false;
+	}
+	const auto total = Data::Reactions::ScheduledPaidDelay();
+	const auto ignore = total % 1000;
+	if (at <= crl::now() + ignore) {
+		return false;
+	}
+	showFor(idForCall(call), count, shownPeer, at - ignore, total);
 	return true;
 }
 
 void PaidReactionToast::showFor(
 		FullMsgId itemId,
 		int count,
+		PeerId shownPeer,
 		crl::time finish,
 		crl::time total) {
 	const auto old = _weak.get();
@@ -186,6 +231,7 @@ void PaidReactionToast::showFor(
 	if (i != end(_stack)) {
 		if (old && i + 1 == end(_stack)) {
 			_count = count;
+			_shownPeer = shownPeer;
 			_timeFinish = finish;
 			return;
 		}
@@ -199,18 +245,26 @@ void PaidReactionToast::showFor(
 		_hiding.push_back(base::take(_weak));
 	}
 	_count.reset();
+	_shownPeer.reset();
 	_timeFinish.reset();
 	_count = count;
+	_shownPeer = shownPeer;
 	_timeFinish = finish;
 	auto text = rpl::combine(
-		tr::lng_paid_react_toast(
-			lt_count,
-			_count.value() | tr::to_count(),
-			Ui::Text::Bold),
+		rpl::conditional(
+			_shownPeer.value() | rpl::map(rpl::mappers::_1 == PeerId()),
+			tr::lng_paid_react_toast_anonymous(
+				lt_count,
+				_count.value() | tr::to_count(),
+				tr::bold),
+			tr::lng_paid_react_toast(
+				lt_count,
+				_count.value() | tr::to_count(),
+				tr::bold)),
 		tr::lng_paid_react_toast_text(
 			lt_count_decimal,
 			_count.value() | tr::to_count(),
-			Ui::Text::RichLangValue)
+			tr::rich)
 	) | rpl::map([](TextWithEntities &&title, TextWithEntities &&body) {
 		title.append('\n').append(body);
 		return std::move(title);
@@ -241,6 +295,7 @@ void PaidReactionToast::showFor(
 		.padding = rpl::single(QMargins(leftSkip, 0, rightSkip, 0)),
 		.st = &st,
 		.attach = RectPart::Top,
+		.addToAttachSide = _topOffset.value(),
 		.acceptinput = true,
 		.infinite = true,
 	});
@@ -248,11 +303,16 @@ void PaidReactionToast::showFor(
 	if (!strong) {
 		return;
 	}
+
+	_shownForId = itemId;
 	const auto widget = strong->widget();
 	const auto hideToast = [=, weak = _weak] {
 		if (const auto strong = weak.get()) {
 			if (strong == _weak.get()) {
 				_stack.erase(ranges::remove(_stack, itemId), end(_stack));
+				if (_shownForId.current() == itemId) {
+					_shownForId = FullMsgId();
+				}
 
 				_hiding.push_back(base::take(_weak));
 				strong->hideAnimated();
@@ -263,6 +323,9 @@ void PaidReactionToast::showFor(
 							break;
 						}
 					}
+					if (_shownForId.current() == _stack.back()) {
+						_shownForId = FullMsgId();
+					}
 					_stack.pop_back();
 				}
 			}
@@ -270,7 +333,12 @@ void PaidReactionToast::showFor(
 	};
 
 	const auto undo = [=] {
-		if (const auto item = _owner->message(itemId)) {
+		const auto i = _idsForCalls.find(itemId);
+		if (i != end(_idsForCalls)) {
+			if (const auto strong = i->second.get()) {
+				_owner->reactions().undoScheduledPaid(strong);
+			}
+		} else if (const auto item = _owner->message(itemId)) {
 			_owner->reactions().undoScheduledPaid(item);
 		}
 		hideToast();
@@ -287,7 +355,7 @@ void PaidReactionToast::showFor(
 	rpl::combine(
 		widget->sizeValue(),
 		button->sizeValue()
-	) | rpl::start_with_next([=](QSize outer, QSize inner) {
+	) | rpl::on_next([=](QSize outer, QSize inner) {
 		button->moveToRight(
 			0,
 			(outer.height() - inner.height()) / 2,
@@ -301,6 +369,24 @@ void PaidReactionToast::showFor(
 	setupLottiePreview(preview, size);
 }
 
+FullMsgId PaidReactionToast::idForCall(not_null<Calls::GroupCall*> call) {
+	for (auto i = begin(_idsForCalls); i != end(_idsForCalls);) {
+		const auto strong = i->second.get();
+		if (strong == call) {
+			return i->first;
+		} else if (!strong) {
+			i = _idsForCalls.erase(i);
+		} else {
+			++i;
+		}
+	}
+	const auto itemId = FullMsgId(
+		call->peer()->id,
+		call->peer()->owner().nextLocalMessageId());
+	_idsForCalls.emplace(itemId, call);
+	return itemId;
+}
+
 void PaidReactionToast::clearHiddenHiding() {
 	_hiding.erase(
 		ranges::remove(
@@ -324,7 +410,7 @@ void PaidReactionToast::setupLottiePreview(
 		Lottie::Quality::Default);
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!player->ready()) {
 			return;
 		}
@@ -338,7 +424,7 @@ void PaidReactionToast::setupLottiePreview(
 	}, widget->lifetime());
 
 	player->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		widget->update();
 	}, widget->lifetime());
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_paid_reaction_toast.h b/Telegram/SourceFiles/history/view/history_view_paid_reaction_toast.h
index 593fc0208b1679..d2cc5448aa7788 100644
--- a/Telegram/SourceFiles/history/view/history_view_paid_reaction_toast.h
+++ b/Telegram/SourceFiles/history/view/history_view_paid_reaction_toast.h
@@ -9,6 +9,10 @@ For license and copyright information please follow this link:
 
 #include "styles/style_widgets.h"
 
+namespace Calls {
+class GroupCall;
+} // namespace Calls
+
 namespace Data {
 class Session;
 } // namespace Data
@@ -33,16 +37,28 @@ class PaidReactionToast final {
 		not_null<Data::Session*> owner,
 		rpl::producer<int> topOffset,
 		Fn<bool(not_null<const Element*> view)> mine);
+	PaidReactionToast(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Data::Session*> owner,
+		rpl::producer<int> topOffset,
+		Fn<bool(not_null<Calls::GroupCall*> call)> mine);
 	~PaidReactionToast();
 
+	[[nodiscard]] rpl::producer<FullMsgId> shownForId() const;
+	[[nodiscard]] rpl::producer<Calls::GroupCall*> shownForCall() const;
+
 private:
 	bool maybeShowFor(not_null<HistoryItem*> item);
+	bool maybeShowFor(not_null<Calls::GroupCall*> call);
 	void showFor(
 		FullMsgId itemId,
 		int count,
+		PeerId shownPeer,
 		crl::time left,
 		crl::time total);
 
+	[[nodiscard]] FullMsgId idForCall(not_null<Calls::GroupCall*> call);
+
 	void setupLottiePreview(not_null<Ui::RpWidget*> widget, int size);
 	void clearHiddenHiding();
 
@@ -53,10 +69,15 @@ class PaidReactionToast final {
 	base::weak_ptr<Ui::Toast::Instance> _weak;
 	std::vector<base::weak_ptr<Ui::Toast::Instance>> _hiding;
 	rpl::variable<int> _count;
+	rpl::variable<PeerId> _shownPeer;
 	rpl::variable<crl::time> _timeFinish;
 
 	std::vector<FullMsgId> _stack;
 
+	base::flat_map<FullMsgId, base::weak_ptr<Calls::GroupCall>> _idsForCalls;
+
+	rpl::variable<FullMsgId> _shownForId;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index eebbb184800151..5ac0728691da69 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -7,17 +7,24 @@ For license and copyright information please follow this link:
 */
 #include "history/view/history_view_pinned_bar.h"
 
+#include "api/api_bot.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "data/data_poll.h"
+#include "data/data_web_page.h"
 #include "history/view/history_view_pinned_tracker.h"
 #include "history/history_item.h"
+#include "history/history_item_components.h"
 #include "history/history.h"
+#include "core/click_handler_types.h"
 #include "core/ui_integration.h"
 #include "base/weak_ptr.h"
 #include "apiwrap.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/basic_click_handlers.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 
@@ -29,10 +36,10 @@ namespace {
 		Fn<void()> repaint) {
 	return Ui::MessageBarContent{
 		.text = item->inReplyText(),
-		.context = Core::MarkedTextContext{
+		.context = Core::TextContext({
 			.session = &item->history()->session(),
-			.customEmojiRepaint = std::move(repaint),
-		},
+			.repaint = std::move(repaint),
+		}),
 	};
 }
 
@@ -153,6 +160,44 @@ auto WithPinnedTitle(not_null<Main::Session*> session, PinnedId id) {
 	};
 }
 
+[[nodiscard]] object_ptr<Ui::RoundButton> MakePinnedBarCustomButton(
+		not_null<QWidget*> parent,
+		const QString &buttonText,
+		Fn<void()> clickCallback) {
+	const auto &stButton = st::historyPinnedBotButton;
+	const auto &stLabel = st::historyPinnedBotLabel;
+
+	auto button = object_ptr<Ui::RoundButton>(
+		parent,
+		rpl::never<QString>(), // Text is handled by the inner label.
+		stButton);
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		button.data(),
+		buttonText,
+		stLabel);
+
+	if (label->width() > st::historyPinnedBotButtonMaxWidth) {
+		label->resizeToWidth(st::historyPinnedBotButtonMaxWidth);
+	}
+	button->setFullWidth(label->width()
+		+ stButton.padding.left()
+		+ stButton.padding.right()
+		+ stButton.height); // stButton.height is likely for icon spacing.
+
+	label->moveToLeft(
+		stButton.padding.left() + stButton.height / 2,
+		(button->height() - label->height()) / 2);
+
+	label->setTextColorOverride(stButton.textFg->c); // Use button's text color for label.
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	button->setFullRadius(true);
+	button->setClickedCallback(std::move(clickCallback));
+
+	return button;
+}
+
 } // namespace
 
 rpl::producer<Ui::MessageBarContent> MessageBarContentByItemId(
@@ -178,7 +223,7 @@ rpl::producer<Ui::MessageBarContent> PinnedBarContent(
 	}) | rpl::flatten_latest();
 }
 
-rpl::producer<HistoryItem*> PinnedBarItemWithReplyMarkup(
+rpl::producer<HistoryItem*> PinnedBarItemWithCustomButton(
 		not_null<Main::Session*> session,
 		rpl::producer<PinnedId> id) {
 	return rpl::make_producer<HistoryItem*>([=,
@@ -187,7 +232,7 @@ rpl::producer<HistoryItem*> PinnedBarItemWithReplyMarkup(
 		consumer.put_next(nullptr);
 
 		struct State {
-			bool hasReplyMarkup = false;
+			bool hasCustomButton = false;
 			base::has_weak_ptr guard;
 			rpl::lifetime lifetime;
 			FullMsgId resolvedId;
@@ -196,10 +241,17 @@ rpl::producer<HistoryItem*> PinnedBarItemWithReplyMarkup(
 
 		const auto pushUnique = [=](not_null<HistoryItem*> item) {
 			const auto replyMarkup = item->inlineReplyMarkup();
-			if (!state->hasReplyMarkup && !replyMarkup) {
+			const auto media = item->media();
+			const auto page = media ? media->webpage() : nullptr;
+			const auto possiblyHasCustomButton = replyMarkup
+				|| (page
+					&& (page->type == WebPageType::VoiceChat
+						|| page->type == WebPageType::Livestream
+						|| page->type == WebPageType::ConferenceCall));
+			if (!state->hasCustomButton && !possiblyHasCustomButton) {
 				return;
 			}
-			state->hasReplyMarkup = (replyMarkup != nullptr);
+			state->hasCustomButton = possiblyHasCustomButton;
 			consumer.put_next(item.get());
 		};
 
@@ -207,7 +259,7 @@ rpl::producer<HistoryItem*> PinnedBarItemWithReplyMarkup(
 			id
 		) | rpl::filter([=](PinnedId current) {
 			return current.message && (current.message != state->resolvedId);
-		}) | rpl::start_with_next([=](PinnedId current) {
+		}) | rpl::on_next([=](PinnedId current) {
 			const auto fullId = current.message;
 			state->lifetime.destroy();
 			state->resolvedId = fullId;
@@ -217,12 +269,14 @@ rpl::producer<HistoryItem*> PinnedBarItemWithReplyMarkup(
 				using Update = Data::MessageUpdate;
 				session->changes().messageUpdates(
 					item,
-					Update::Flag::ReplyMarkup | Update::Flag::Destroyed
-				) | rpl::start_with_next([=](const Update &update) {
+					(Update::Flag::ReplyMarkup
+						| Update::Flag::Edited
+						| Update::Flag::Destroyed)
+				) | rpl::on_next([=](const Update &update) {
 					if (update.flags & Update::Flag::Destroyed) {
 						state->lifetime.destroy();
 						invalidate_weak_ptrs(&state->guard);
-						state->hasReplyMarkup = false;
+						state->hasCustomButton = false;
 						consumer.put_next(nullptr);
 					} else {
 						pushUnique(update.item);
@@ -248,4 +302,42 @@ rpl::producer<HistoryItem*> PinnedBarItemWithReplyMarkup(
 	});
 }
 
+[[nodiscard]] object_ptr<Ui::RoundButton> CreatePinnedBarCustomButton(
+		not_null<QWidget*> parent,
+		HistoryItem *item,
+		Fn<ClickHandlerContext(FullMsgId)> context) {
+	if (!item) {
+		return nullptr;
+	} else if (const auto replyMarkup = item->inlineReplyMarkup()) {
+		const auto &rows = replyMarkup->data.rows;
+		if ((rows.size() == 1) && (rows.front().size() == 1)) {
+			const auto text = rows.front().front().text;
+			if (!text.isEmpty()) {
+				const auto contextId = item->fullId();
+				const auto callback = [=] {
+					Api::ActivateBotCommand(context(contextId), 0, 0);
+				};
+				return MakePinnedBarCustomButton(parent, text, callback);
+			}
+		}
+	} else if (const auto media = item->media()) {
+		if (const auto page = media->webpage()) {
+			if (page->type == WebPageType::VoiceChat
+				|| page->type == WebPageType::Livestream
+				|| page->type == WebPageType::ConferenceCall) {
+				const auto url = page->url;
+				const auto contextId = item->fullId();
+				const auto callback = [=] {
+					UrlClickHandler::Open(
+						url,
+						QVariant::fromValue(context(contextId)));
+				};
+				const auto text = tr::lng_group_call_join(tr::now);
+				return MakePinnedBarCustomButton(parent, text, callback);
+			}
+		}
+	}
+	return nullptr;
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
index 535cabc6cb4fe4..acb27c1c36a96c 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
@@ -7,10 +7,13 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/object_ptr.h"
 #include "ui/chat/message_bar.h"
 
 #include <tuple>
 
+struct ClickHandlerContext;
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -18,6 +21,7 @@ class Session;
 namespace Ui {
 class IconButton;
 class PlainShadow;
+class RoundButton;
 struct MessageBarContent;
 } // namespace Ui
 
@@ -51,8 +55,13 @@ struct PinnedId {
 	rpl::producer<PinnedId> id,
 	Fn<void()> repaint);
 
-[[nodiscard]] rpl::producer<HistoryItem*> PinnedBarItemWithReplyMarkup(
+[[nodiscard]] rpl::producer<HistoryItem*> PinnedBarItemWithCustomButton(
 	not_null<Main::Session*> session,
 	rpl::producer<PinnedId> id);
 
+[[nodiscard]] object_ptr<Ui::RoundButton> CreatePinnedBarCustomButton(
+	not_null<QWidget*> parent,
+	HistoryItem *item,
+	Fn<ClickHandlerContext(FullMsgId)> context);
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 7a9ecd8dcccf28..184eb385206b63 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -10,9 +10,14 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_top_bar_widget.h"
 #include "history/view/history_view_translate_bar.h"
 #include "history/view/history_view_list_widget.h"
+#include "history/view/controls/history_view_compose_search.h"
+#include "api/api_messages_search.h"
+#include "data/data_forum_topic.h"
+#include "data/data_chat_participant_status.h"
 #include "history/history.h"
 #include "history/history_item_components.h"
 #include "history/history_item.h"
+#include "history/history_view_swipe_back_session.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
@@ -32,7 +37,9 @@ For license and copyright information please follow this link:
 #include "base/event_filter.h"
 #include "base/call_delayed.h"
 #include "base/qt/qt_key_modifiers.h"
+#include "core/application.h"
 #include "core/file_utilities.h"
+#include "core/shortcuts.h"
 #include "main/main_session.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -89,6 +96,10 @@ Data::ForumTopic *PinnedMemento::topicForRemoveRequests() const {
 	return _thread->asTopic();
 }
 
+Data::SavedSublist *PinnedMemento::sublistForRemoveRequests() const {
+	return _thread->asSublist();
+}
+
 PinnedWidget::PinnedWidget(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
@@ -116,14 +127,14 @@ PinnedWidget::PinnedWidget(
 		controller->chatStyle(),
 		static_cast<HistoryView::CornerButtonsDelegate*>(this)) {
 	controller->chatStyle()->paletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_scroll->updateBars();
 	}, _scroll->lifetime());
 
 	Window::ChatThemeValueFromPeer(
 		controller,
 		thread->peer()
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
 		_theme = std::move(theme);
 		controller->setChatStyleTheme(_theme);
 	}, lifetime());
@@ -141,22 +152,26 @@ PinnedWidget::PinnedWidget(
 	_topBar->setCustomTitle(tr::lng_contacts_loading(tr::now));
 
 	_topBar->deleteSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmDeleteSelected();
 	}, _topBar->lifetime());
 	_topBar->forwardSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmForwardSelected();
 	}, _topBar->lifetime());
 	_topBar->clearSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		clearSelected();
 	}, _topBar->lifetime());
+	_topBar->searchRequest(
+	) | rpl::on_next([=] {
+		searchInPinned();
+	}, _topBar->lifetime());
 
 	_translateBar->raise();
 	_topBarShadow->raise();
 	controller->adaptive().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateAdaptiveLayout();
 	}, lifetime());
 
@@ -167,12 +182,19 @@ PinnedWidget::PinnedWidget(
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		onScroll();
 	}, lifetime());
 
+	_inner->scrollKeyEvents(
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
+		_scroll->keyPressEvent(e);
+	}, lifetime());
+
 	setupClearButton();
 	setupTranslateBar();
+	setupShortcuts();
+	Window::SetupSwipeBackSection(this, _scroll.get(), _inner);
 }
 
 PinnedWidget::~PinnedWidget() = default;
@@ -180,7 +202,7 @@ PinnedWidget::~PinnedWidget() = default;
 void PinnedWidget::setupClearButton() {
 	Data::CanPinMessagesValue(
 		_history->peer
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshClearButtonText();
 	}, _clearButton->lifetime());
 
@@ -193,6 +215,7 @@ void PinnedWidget::setupClearButton() {
 				controller(),
 				_history->peer,
 				_thread->topicRootId(),
+				_thread->monoforumPeerId(),
 				crl::guard(this, callback));
 		} else {
 			Window::UnpinAllMessages(controller(), _thread);
@@ -202,7 +225,7 @@ void PinnedWidget::setupClearButton() {
 
 void PinnedWidget::setupTranslateBar() {
 	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=, raw = _translateBar.get()](bool one) {
+	) | rpl::on_next([=, raw = _translateBar.get()](bool one) {
 		raw->setShadowGeometryPostprocess([=](QRect geometry) {
 			if (!one) {
 				geometry.setLeft(geometry.left() + st::lineWidth);
@@ -213,7 +236,7 @@ void PinnedWidget::setupTranslateBar() {
 
 	_translateBarHeight = 0;
 	_translateBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		if (const auto delta = height - _translateBarHeight) {
 			_translateBarHeight = height;
 			setGeometryWithTopMoved(geometry(), delta);
@@ -223,6 +246,95 @@ void PinnedWidget::setupTranslateBar() {
 	_translateBar->finishAnimating();
 }
 
+void PinnedWidget::setupShortcuts() {
+	Shortcuts::Requests(
+	) | rpl::filter([=] {
+		return Ui::AppInFocus()
+			&& Ui::InFocusChain(this)
+			&& !controller()->isLayerShown()
+			&& (Core::App().activeWindow() == &controller()->window())
+			&& !_history->peer->isSelf();
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
+		using Command = Shortcuts::Command;
+		request->check(Command::Search, 1) && request->handle([=] {
+			searchInPinned();
+			return true;
+		});
+	}, lifetime());
+}
+
+void PinnedWidget::searchInPinned() {
+	if (_history->peer->isSelf()) {
+		return;
+	}
+	if (_composeSearch) {
+		_composeSearch->setInnerFocus();
+		return;
+	}
+	_composeSearch = std::make_unique<ComposeSearch>(
+		this,
+		controller(),
+		_history,
+		nullptr);
+	_composeSearch->setSearchFilter(Api::SearchFilter::Pinned);
+	_composeSearch->setCalendarChat(Dialogs::Key(_thread));
+	_composeSearch->setCalendarJumpHandler(crl::guard(this, [=](
+			FullMsgId id,
+			Fn<void()> close) {
+		const auto universalId = (id.peer == _history->peer->id)
+			? id.msg
+			: (id.msg - ServerMaxMsgId);
+		SharedMediaMergedViewer(
+			&_thread->session(),
+			SharedMediaMergedKey(
+				SparseIdsMergedSlice::Key(
+					_history->peer->id,
+					_thread->topicRootId(),
+					_thread->monoforumPeerId(),
+					_migratedPeer ? _migratedPeer->id : 0,
+					universalId),
+				Storage::SharedMediaType::Pinned),
+			1,
+			1
+		) | rpl::filter([=](const SparseIdsMergedSlice &slice) {
+			return (slice.size() > 0)
+				|| (slice.fullCount().value_or(-1) == 0);
+		}) | rpl::take(1) | rpl::on_next([=](
+				const SparseIdsMergedSlice &slice) {
+			if (const auto nearest = slice.nearest(universalId)) {
+				showAtPosition(Data::MessagePosition{
+					.fullId = *nearest,
+					.date = TimeId(0),
+				});
+			}
+			close();
+		}, lifetime());
+	}));
+	if (const auto topic = _thread->asTopic()) {
+		_composeSearch->setTopMsgId(topic->rootId());
+	}
+
+	_topBarShadow->hide();
+	_clearButton->hide();
+	updateControlsGeometry();
+	doSetInnerFocus();
+
+	_composeSearch->activations(
+	) | rpl::on_next([=](ComposeSearch::Activation activation) {
+		showAtPosition(activation.item->position());
+	}, _composeSearch->lifetime());
+
+	_composeSearch->destroyRequests(
+	) | rpl::take(1) | rpl::on_next([=] {
+		_composeSearch = nullptr;
+
+		_topBarShadow->show();
+		_clearButton->show();
+		updateControlsGeometry();
+		doSetInnerFocus();
+	}, _composeSearch->lifetime());
+}
+
 void PinnedWidget::cornerButtonsShowAtPosition(
 		Data::MessagePosition position) {
 	showAtPosition(position);
@@ -255,7 +367,8 @@ bool PinnedWidget::cornerButtonsUnreadMayBeShown() {
 }
 
 bool PinnedWidget::cornerButtonsHas(CornerButtonType type) {
-	return (type == CornerButtonType::Down);
+	return (type == CornerButtonType::Down)
+		|| (type == CornerButtonType::PollVotes);
 }
 
 void PinnedWidget::showAtPosition(
@@ -298,7 +411,11 @@ void PinnedWidget::checkActivation() {
 }
 
 void PinnedWidget::doSetInnerFocus() {
-	_inner->setFocus();
+	if (_composeSearch) {
+		_composeSearch->setInnerFocus();
+	} else {
+		_inner->setFocus();
+	}
 }
 
 bool PinnedWidget::showInternal(
@@ -515,6 +632,7 @@ rpl::producer<Data::MessagesSlice> PinnedWidget::listSource(
 			SparseIdsMergedSlice::Key(
 				_history->peer->id,
 				_thread->topicRootId(),
+				_thread->monoforumPeerId(),
 				_migratedPeer ? _migratedPeer->id : 0,
 				messageId),
 			Storage::SharedMediaType::Pinned),
@@ -585,7 +703,8 @@ void PinnedWidget::listMarkContentsRead(
 }
 
 MessagesBarData PinnedWidget::listMessagesBar(
-		const std::vector<not_null<Element*>> &elements) {
+		const std::vector<not_null<Element*>> &elements,
+		bool markLastAsRead) {
 	return {};
 }
 
@@ -660,14 +779,23 @@ void PinnedWidget::listShowPremiumToast(not_null<DocumentData*> document) {
 void PinnedWidget::listOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) {
-	controller()->openPhoto(photo, { context });
+	const auto draw = Data::CanSendAnyOf(
+		_thread,
+		Data::FilesSendRestrictions());
+	controller()->openPhoto(photo, { .id = context, .showDrawButton = draw });
 }
 
 void PinnedWidget::listOpenDocument(
 		not_null<DocumentData*> document,
 		FullMsgId context,
 		bool showInMediaView) {
-	controller()->openDocument(document, showInMediaView, { context });
+	const auto draw = Data::CanSendAnyOf(
+		_thread,
+		Data::FilesSendRestrictions());
+	controller()->openDocument(
+		document,
+		showInMediaView,
+		{ .id = context, .showDrawButton = draw });
 }
 
 void PinnedWidget::listPaintEmpty(
@@ -692,6 +820,14 @@ void PinnedWidget::listAddTranslatedItems(
 	not_null<TranslateTracker*> tracker) {
 }
 
+Ui::ScrollArea *PinnedWidget::listScrollArea() const {
+	return _scroll.get();
+}
+
+bool PinnedWidget::listThanosEffectEnabled() const {
+	return false;
+}
+
 void PinnedWidget::confirmDeleteSelected() {
 	ConfirmDeleteSelectedItems(_inner);
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.h b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
index 75956e403d038e..6c3c962d74d064 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -31,6 +31,7 @@ namespace HistoryView {
 
 class Element;
 class TopBarWidget;
+class ComposeSearch;
 class PinnedMemento;
 class TranslateBar;
 
@@ -97,7 +98,8 @@ class PinnedWidget final
 	void listMarkContentsRead(
 		const base::flat_set<not_null<HistoryItem*>> &items) override;
 	MessagesBarData listMessagesBar(
-		const std::vector<not_null<Element*>> &elements) override;
+		const std::vector<not_null<Element*>> &elements,
+		bool markLastAsRead) override;
 	void listContentRefreshed() override;
 	void listUpdateDateLink(
 		ClickHandlerPtr &link,
@@ -136,6 +138,8 @@ class PinnedWidget final
 	History *listTranslateHistory() override;
 	void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) override;
+	Ui::ScrollArea *listScrollArea() const override;
+	bool listThanosEffectEnabled() const override;
 
 	// CornerButtonsDelegate delegate.
 	void cornerButtonsShowAtPosition(
@@ -169,6 +173,8 @@ class PinnedWidget final
 
 	void setupClearButton();
 	void setupTranslateBar();
+	void setupShortcuts();
+	void searchInPinned();
 
 	void confirmDeleteSelected();
 	void confirmForwardSelected();
@@ -192,6 +198,7 @@ class PinnedWidget final
 	bool _skipScrollEvent = false;
 	std::unique_ptr<Ui::ScrollArea> _scroll;
 	std::unique_ptr<Ui::FlatButton> _clearButton;
+	std::unique_ptr<ComposeSearch> _composeSearch;
 
 	CornerButtons _cornerButtons;
 
@@ -225,6 +232,7 @@ class PinnedMemento : public Window::SectionMemento {
 	}
 
 	Data::ForumTopic *topicForRemoveRequests() const override;
+	Data::SavedSublist *sublistForRemoveRequests() const override;
 
 private:
 	const not_null<Data::Thread*> _thread;
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
index 24abaa03feadac..cd1e99644e9a94 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
@@ -50,7 +50,7 @@ PinnedTracker::PinnedTracker(not_null<Data::Thread*> thread)
 			: nullptr),
 		_1 || _2
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool has) {
+	) | rpl::on_next([=](bool has) {
 		if (has) {
 			refreshViewer();
 		} else {
@@ -73,6 +73,19 @@ PinnedId PinnedTracker::currentMessageId() const {
 	return _current.current();
 }
 
+FullMsgId PinnedTracker::nextPinnedId(UniversalMsgId messageId) const {
+	const auto proj1 = [](FullMsgId id) {
+		return peerIsChannel(id.peer) ? id.msg : (id.msg - ServerMaxMsgId);
+	};
+	const auto proj2 = [](FullMsgId id) {
+		return id.msg;
+	};
+	const auto i = _migratedPeer
+		? ranges::upper_bound(_slice.ids, messageId, ranges::less(), proj1)
+		: ranges::upper_bound(_slice.ids, messageId, ranges::less(), proj2);
+	return (i != end(_slice.ids)) ? *i : FullMsgId();
+}
+
 void PinnedTracker::refreshViewer() {
 	if (_viewerAroundId == _aroundId) {
 		return;
@@ -86,12 +99,13 @@ void PinnedTracker::refreshViewer() {
 			SparseIdsMergedSlice::Key(
 				peer->id,
 				_thread->topicRootId(),
+				_thread->monoforumPeerId(),
 				_migratedPeer ? _migratedPeer->id : 0,
 				_viewerAroundId),
 			Storage::SharedMediaType::Pinned),
 		kLoadedLimit,
 		kLoadedLimit
-	) | rpl::start_with_next([=](const SparseIdsMergedSlice &result) {
+	) | rpl::on_next([=](const SparseIdsMergedSlice &result) {
 		_slice.fullCount = result.fullCount();
 		_slice.skippedBefore = result.skippedBefore();
 		_slice.skippedAfter = result.skippedAfter();
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
index 85a8249ad1c3c0..cf2629c16c3a81 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
@@ -27,6 +27,7 @@ class PinnedTracker final {
 
 	[[nodiscard]] rpl::producer<PinnedId> shownMessageId() const;
 	[[nodiscard]] PinnedId currentMessageId() const;
+	[[nodiscard]] FullMsgId nextPinnedId(UniversalMsgId messageId) const;
 	void trackAround(UniversalMsgId messageId);
 	void reset();
 
diff --git a/Telegram/SourceFiles/history/view/history_view_reaction_preview.cpp b/Telegram/SourceFiles/history/view/history_view_reaction_preview.cpp
new file mode 100644
index 00000000000000..32d1af52793293
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_reaction_preview.cpp
@@ -0,0 +1,395 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_reaction_preview.h"
+
+#include "base/call_delayed.h"
+#include "base/event_filter.h"
+#include "boxes/sticker_set_box.h"
+#include "data/data_document.h"
+#include "data/data_photo.h"
+#include "data/data_message_reactions.h"
+#include "data/data_session.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "mainwindow.h"
+#include "ui/cached_special_layer_shadow_corners.h"
+#include "ui/effects/show_animation.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/dropdown_menu.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/text/text_utilities.h"
+#include "window/window_media_preview.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_layers.h"
+
+namespace HistoryView {
+namespace {
+
+void SetupOverlayHideOnEscape(
+		not_null<Ui::AbstractButton*> clickable,
+		Fn<void()> hideAll) {
+	clickable->setClickedCallback(hideAll);
+	base::install_event_filter(QCoreApplication::instance(), [=](
+			not_null<QEvent*> e) {
+		if (e->type() == QEvent::KeyPress
+			&& clickable->window()->isActiveWindow()) {
+			const auto k = static_cast<QKeyEvent*>(e.get());
+			if (k->key() == Qt::Key_Escape) {
+				hideAll();
+				return base::EventFilterResult::Cancel;
+			}
+		}
+		return base::EventFilterResult::Continue;
+	}, clickable->lifetime());
+}
+
+struct PreviewOverlayState {
+	base::unique_qptr<Window::MediaPreviewWidget> mediaPreview;
+	base::unique_qptr<Ui::AbstractButton> clickable;
+	base::unique_qptr<Ui::FadeWrap<Ui::DropdownMenu>> menuWrap;
+	base::unique_qptr<Ui::AbstractButton> background;
+	base::unique_qptr<Ui::FlatLabel> label;
+	Fn<void()> extraHide;
+	rpl::lifetime shutdownGuard;
+
+	void clear() {
+		shutdownGuard.destroy();
+		menuWrap.reset();
+		background.reset();
+		label.reset();
+		mediaPreview.reset();
+		clickable.reset();
+	}
+};
+
+struct PreviewOverlay {
+	std::shared_ptr<PreviewOverlayState> state;
+	Fn<void()> hideAll;
+};
+
+template <typename MediaData>
+[[nodiscard]] PreviewOverlay CreatePreviewOverlay(
+		not_null<Window::SessionController*> controller,
+		FullMsgId origin,
+		MediaData media) {
+	const auto state = std::make_shared<PreviewOverlayState>();
+
+	const auto mainwidget = controller->widget()->bodyWidget();
+	state->mediaPreview = base::make_unique_q<Window::MediaPreviewWidget>(
+		mainwidget,
+		controller);
+	state->mediaPreview->setCustomDuration(st::defaultToggle.duration);
+	state->clickable = base::make_unique_q<Ui::AbstractButton>(mainwidget);
+	const auto hideAll = [=] {
+		state->clickable->setAttribute(Qt::WA_TransparentForMouseEvents);
+		state->mediaPreview->hidePreview();
+		if (state->extraHide) {
+			state->extraHide();
+		}
+		base::call_delayed(
+			st::defaultToggle.duration,
+			[=] { state->clear(); });
+	};
+	SetupOverlayHideOnEscape(state->clickable.get(), hideAll);
+	state->mediaPreview->showPreview(origin, media);
+	state->clickable->show();
+	const auto clickableRaw = state->clickable.get();
+
+	mainwidget->sizeValue(
+	) | rpl::skip(1) | rpl::on_next([=](QSize) {
+		hideAll();
+	}, clickableRaw->lifetime());
+
+	mainwidget->sizeValue() | rpl::on_next([=](QSize size) {
+		clickableRaw->setGeometry(Rect(size));
+		clickableRaw->raise();
+	}, clickableRaw->lifetime());
+
+	// Prevent running state destructor from within a child widget's
+	// destructor, which would trigger a double-delete through unique_qptr.
+	mainwidget->death() | rpl::on_next([s = state] {
+	}, state->shutdownGuard);
+
+	return { state, hideAll };
+}
+
+void SetupPreviewMenu(
+		not_null<Window::SessionController*> controller,
+		const PreviewOverlay &overlay,
+		Fn<void(not_null<Ui::DropdownMenu*>)> fillMenu) {
+	const auto &state = overlay.state;
+	const auto mainwidget = controller->widget()->bodyWidget();
+	if (fillMenu) {
+		state->mediaPreview->setHideEmoji(true);
+		auto menu = object_ptr<Ui::DropdownMenu>(
+			mainwidget,
+			st::dropdownMenuWithIcons);
+		menu->setAutoHiding(false);
+		menu->setHiddenCallback(
+			crl::guard(state->clickable.get(), overlay.hideAll));
+		fillMenu(menu.data());
+		state->menuWrap = base::make_unique_q<Ui::FadeWrap<Ui::DropdownMenu>>(
+			mainwidget,
+			std::move(menu));
+		state->menuWrap->setDuration(st::defaultToggle.duration);
+		state->menuWrap->hide(anim::type::instant);
+	}
+	const auto wrapRaw = state->menuWrap.get();
+	state->extraHide = [=] {
+		if (wrapRaw) {
+			wrapRaw->hide(anim::type::normal);
+		}
+	};
+
+	const auto mediaPreviewRaw = state->mediaPreview.get();
+	mainwidget->sizeValue() | rpl::on_next([=](QSize size) {
+		mediaPreviewRaw->setGeometry(Rect(size));
+
+		if (wrapRaw) {
+			const auto menuRaw = wrapRaw->entity();
+			menuRaw->showFast();
+			const auto gap = st::defaultMenu.itemPadding.top();
+			const auto menuH = menuRaw->height();
+			const auto shift = -(gap + menuH) / 2;
+			mediaPreviewRaw->setContentShift(shift);
+
+			const auto menuX = (size.width() - menuRaw->width()) / 2;
+			const auto menuY = mediaPreviewRaw->contentBottom() + gap;
+			wrapRaw->move(menuX, menuY);
+			wrapRaw->show(anim::type::normal);
+			wrapRaw->raise();
+		}
+	}, mediaPreviewRaw->lifetime());
+}
+
+} // namespace
+
+bool ShowStickerPreview(
+		not_null<Window::SessionController*> controller,
+		FullMsgId origin,
+		not_null<DocumentData*> document,
+		Fn<void(not_null<Ui::DropdownMenu*>)> fillMenu) {
+	SetupPreviewMenu(
+		controller,
+		CreatePreviewOverlay(controller, origin, document),
+		std::move(fillMenu));
+	return true;
+}
+
+bool ShowPhotoPreview(
+		not_null<Window::SessionController*> controller,
+		FullMsgId origin,
+		not_null<PhotoData*> photo,
+		Fn<void(not_null<Ui::DropdownMenu*>)> fillMenu) {
+	SetupPreviewMenu(
+		controller,
+		CreatePreviewOverlay(controller, origin, photo),
+		std::move(fillMenu));
+	return true;
+}
+
+bool ShowReactionPreview(
+		not_null<Window::SessionController*> controller,
+		FullMsgId origin,
+		Data::ReactionId reactionId,
+		bool emojiPreview) {
+	auto document = (DocumentData*)(nullptr);
+	if (const auto custom = reactionId.custom()) {
+		document = controller->session().data().document(custom);
+	} else if (const auto resolved
+			= controller->session().data().reactions().lookupTemporary(
+				reactionId)) {
+		document = resolved->selectAnimation;
+	}
+	if (!document) {
+		return false;
+	}
+	const auto overlay = CreatePreviewOverlay(controller, origin, document);
+	const auto &state = overlay.state;
+
+	const auto mainwidget = controller->widget()->bodyWidget();
+	const auto shadowExtend = st::boxRoundShadow.extend;
+
+	if (reactionId.custom() && document->sticker()) {
+		const auto setId = document->sticker()->set;
+		const auto packName
+			= document->owner().customEmojiManager().lookupSetName(setId.id);
+		if (!packName.isEmpty()) {
+			state->background = base::make_unique_q<Ui::AbstractButton>(
+				mainwidget);
+			const auto show = controller->uiShow();
+			const auto hideAll = overlay.hideAll;
+			state->background->setClickedCallback([=] {
+				hideAll();
+				show->show(Box<StickerSetBox>(
+					show,
+					setId,
+					Data::StickersType::Emoji));
+			});
+			state->label = base::make_unique_q<Ui::FlatLabel>(
+				state->background.get(),
+				(emojiPreview
+					? tr::lng_context_animated_emoji_preview
+					: tr::lng_context_animated_reaction)(
+						lt_name,
+						rpl::single(Ui::Text::Colorized(packName)),
+						tr::rich));
+			state->label->setAttribute(Qt::WA_TransparentForMouseEvents);
+			const auto backgroundRaw = state->background.get();
+			const auto labelRaw = state->label.get();
+
+			backgroundRaw->paintOn([=](QPainter &p) {
+				const auto innerRect = backgroundRaw->rect() - shadowExtend;
+				Ui::Shadow::paint(
+					p,
+					innerRect,
+					backgroundRaw->width(),
+					st::boxRoundShadow,
+					Ui::SpecialLayerShadowCorners(),
+					RectPart::Full);
+				auto hq = PainterHighQualityEnabler(p);
+				p.setPen(Qt::NoPen);
+				p.setBrush(st::windowBg);
+				p.drawRoundedRect(
+					innerRect,
+					st::boxRadius,
+					st::boxRadius);
+			});
+
+			labelRaw->show();
+			Ui::Animations::ShowWidgets({ backgroundRaw });
+		}
+	}
+	const auto backgroundRaw = state->background.get();
+	const auto labelRaw = state->label.get();
+	state->extraHide = [=] {
+		if (backgroundRaw && labelRaw) {
+			Ui::Animations::HideWidgets({
+				backgroundRaw,
+				labelRaw,
+			});
+		}
+	};
+
+	const auto mediaPreviewRaw = state->mediaPreview.get();
+	mainwidget->sizeValue() | rpl::on_next([=](QSize size) {
+		mediaPreviewRaw->setGeometry(Rect(size));
+
+		if (backgroundRaw && labelRaw) {
+			const auto maxLabelWidth = labelRaw->textMaxWidth() / 2;
+			labelRaw->resizeToWidth(maxLabelWidth);
+			const auto labelHeight = labelRaw->height() * 2;
+			const auto padding = st::msgServicePadding;
+			const auto innerWidth = maxLabelWidth + rect::m::sum::h(padding);
+			const auto innerHeight = labelHeight + rect::m::sum::v(padding);
+			const auto bgWidth = innerWidth + rect::m::sum::h(shadowExtend);
+			const auto bgHeight = innerHeight + rect::m::sum::v(shadowExtend);
+			const auto bgX = (size.width() - bgWidth) / 2;
+			const auto bgY = (size.height() * 3 / 4) - (bgHeight / 2);
+
+			backgroundRaw->setGeometry(bgX, bgY, bgWidth, bgHeight);
+			labelRaw->setGeometry(
+				shadowExtend.left() + padding.left(),
+				shadowExtend.top() + padding.top(),
+				maxLabelWidth,
+				labelHeight);
+			backgroundRaw->raise();
+		}
+	}, mediaPreviewRaw->lifetime());
+	return true;
+}
+
+void ShowWidgetPreview(
+		not_null<Window::SessionController*> controller,
+		Fn<void(not_null<Ui::RpWidget*>)> setupContent,
+		Fn<void(not_null<Ui::DropdownMenu*>)> fillMenu) {
+	struct State {
+		base::unique_qptr<Ui::RpWidget> preview;
+		base::unique_qptr<Ui::AbstractButton> clickable;
+		base::unique_qptr<Ui::FadeWrap<Ui::DropdownMenu>> menuWrap;
+	};
+	const auto state = std::make_shared<State>();
+	const auto mainwidget = controller->widget()->bodyWidget();
+
+	state->preview = base::make_unique_q<Ui::RpWidget>(mainwidget);
+	const auto previewRaw = state->preview.get();
+	setupContent(previewRaw);
+	previewRaw->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	state->clickable = base::make_unique_q<Ui::AbstractButton>(mainwidget);
+	state->clickable->paintOn([=](QPainter &p) {
+		p.fillRect(state->clickable->rect(), st::stickerPreviewBg);
+	});
+
+	const auto hideAll = [=] {
+		state->clickable->setAttribute(Qt::WA_TransparentForMouseEvents);
+		if (state->menuWrap) {
+			state->menuWrap->hide(anim::type::normal);
+		}
+		base::call_delayed(
+			st::defaultToggle.duration,
+			[s = state] {
+				s->preview.reset();
+				s->menuWrap.reset();
+				s->clickable.reset();
+			});
+	};
+	SetupOverlayHideOnEscape(state->clickable.get(), hideAll);
+
+	auto menu = object_ptr<Ui::DropdownMenu>(
+		mainwidget,
+		st::dropdownMenuWithIcons);
+	menu->setAutoHiding(false);
+	menu->setHiddenCallback(
+		crl::guard(state->clickable.get(), hideAll));
+	fillMenu(menu.data());
+	state->menuWrap = base::make_unique_q<Ui::FadeWrap<Ui::DropdownMenu>>(
+		mainwidget,
+		std::move(menu));
+	state->menuWrap->setDuration(st::defaultToggle.duration);
+	state->menuWrap->hide(anim::type::instant);
+
+	const auto wrapRaw = state->menuWrap.get();
+	state->clickable->show();
+	previewRaw->show();
+
+	mainwidget->sizeValue(
+	) | rpl::skip(1) | rpl::on_next([=](QSize) {
+		hideAll();
+	}, previewRaw->lifetime());
+
+	const auto fullW = previewRaw->width();
+	const auto fullH = previewRaw->height();
+
+	mainwidget->sizeValue() | rpl::on_next([=](QSize size) {
+		state->clickable->setGeometry(Rect(size));
+		state->clickable->raise();
+
+		const auto menuRaw = wrapRaw->entity();
+		menuRaw->showFast();
+		const auto gap = st::defaultMenu.itemPadding.top();
+		const auto totalH = fullH + gap + menuRaw->height();
+		const auto previewY = (size.height() - totalH) / 2;
+		previewRaw->move((size.width() - fullW) / 2, previewY);
+		previewRaw->raise();
+
+		wrapRaw->move(
+			(size.width() - menuRaw->width()) / 2,
+			previewY + fullH + gap);
+		wrapRaw->show(anim::type::normal);
+		wrapRaw->raise();
+	}, previewRaw->lifetime());
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_reaction_preview.h b/Telegram/SourceFiles/history/view/history_view_reaction_preview.h
new file mode 100644
index 00000000000000..e02cf530484229
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_reaction_preview.h
@@ -0,0 +1,51 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class DocumentData;
+class PhotoData;
+
+namespace Ui {
+class DropdownMenu;
+class RpWidget;
+} // namespace Ui
+
+namespace Data {
+struct ReactionId;
+} // namespace Data
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace HistoryView {
+
+bool ShowStickerPreview(
+	not_null<Window::SessionController*> controller,
+	FullMsgId origin,
+	not_null<DocumentData*> document,
+	Fn<void(not_null<Ui::DropdownMenu*>)> fillMenu = nullptr);
+
+bool ShowPhotoPreview(
+	not_null<Window::SessionController*> controller,
+	FullMsgId origin,
+	not_null<PhotoData*> photo,
+	Fn<void(not_null<Ui::DropdownMenu*>)> fillMenu = nullptr);
+
+void ShowWidgetPreview(
+	not_null<Window::SessionController*> controller,
+	Fn<void(not_null<Ui::RpWidget*>)> setupContent,
+	Fn<void(not_null<Ui::DropdownMenu*>)> fillMenu);
+
+bool ShowReactionPreview(
+	not_null<Window::SessionController*> controller,
+	FullMsgId origin,
+	Data::ReactionId reactionId,
+	bool emojiPreview = false);
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_read_metrics_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_read_metrics_tracker.cpp
new file mode 100644
index 00000000000000..3956be11f91bde
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_read_metrics_tracker.cpp
@@ -0,0 +1,353 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_read_metrics_tracker.h"
+
+#include "api/api_read_metrics.h"
+#include "apiwrap.h"
+#include "base/random.h"
+#include "core/application.h"
+#include "data/data_peer.h"
+#include "history/history_item.h"
+#include "main/main_session.h"
+
+namespace HistoryView {
+namespace {
+
+constexpr auto kGracePeriod = crl::time(300);
+constexpr auto kActivityTimeout = 15 * crl::time(1000);
+constexpr auto kMaxTrackingDuration = 5 * 60 * crl::time(1000);
+constexpr auto kMinReportThreshold = crl::time(300);
+
+} // namespace
+
+ReadMetricsTracker::ReadMetricsTracker(not_null<PeerData*> peer)
+: _peer(peer)
+, _timer([=] { onTimeout(); }) {
+	Core::App().appDeactivatedValue(
+	) | rpl::on_next([=](bool deactivated) {
+		const auto appActive = !deactivated;
+		if (_appActive == appActive) {
+			return;
+		}
+		_appActive = appActive;
+		refreshPaused(crl::now());
+	}, _lifetime);
+}
+
+ReadMetricsTracker::~ReadMetricsTracker() {
+	finalizeAll();
+}
+
+void ReadMetricsTracker::startBatch(int visibleTop, int visibleBottom) {
+	_batchNow = crl::now();
+	sync(_batchNow);
+	_batchViewportHeight = visibleBottom - visibleTop;
+	_batchVisibleTop = visibleTop;
+	_batchVisibleBottom = visibleBottom;
+	_batchVisible.clear();
+}
+
+void ReadMetricsTracker::push(
+		not_null<HistoryItem*> item,
+		int itemTop,
+		int itemHeight) {
+	if (!ShouldTrack(item)) {
+		return;
+	}
+	const auto msgId = item->id;
+	_batchVisible.emplace(msgId);
+
+	const auto clippedTop = std::max(itemTop, _batchVisibleTop) - itemTop;
+	const auto clippedBottom = std::min(
+		itemTop + itemHeight,
+		_batchVisibleBottom) - itemTop;
+
+	const auto addTracked = [&] {
+		auto tracked = TrackedItem();
+		tracked.entryGracePending = true;
+		tracked.entryGraceStart = _batchNow;
+		tracked.maxItemHeight = itemHeight;
+		tracked.maxViewportHeight = _batchViewportHeight;
+		tracked.seenTop = clippedTop;
+		tracked.seenBottom = clippedBottom;
+		_tracked.emplace(msgId, tracked);
+	};
+
+	auto it = _tracked.find(msgId);
+	if (it == end(_tracked)) {
+		addTracked();
+		return;
+	}
+	auto &tracked = it->second;
+	if (tracked.exitGracePending) {
+		if (_batchNow - tracked.exitGraceStart >= kGracePeriod) {
+			finalize(msgId, tracked);
+			_tracked.erase(it);
+			addTracked();
+			return;
+		}
+		tracked.exitGracePending = false;
+		tracked.exitGraceStart = 0;
+		tracked.lastUpdate = _batchNow;
+	}
+	tracked.seenTop = std::min(tracked.seenTop, clippedTop);
+	tracked.seenBottom = std::max(tracked.seenBottom, clippedBottom);
+	accumulate_max(tracked.maxItemHeight, itemHeight);
+	accumulate_max(tracked.maxViewportHeight, _batchViewportHeight);
+}
+
+void ReadMetricsTracker::endBatch() {
+	for (auto it = _tracked.begin(); it != _tracked.end();) {
+		if (_batchVisible.contains(it->first)) {
+			++it;
+			continue;
+		}
+		auto &tracked = it->second;
+		if (tracked.entryGracePending) {
+			it = _tracked.erase(it);
+			continue;
+		}
+		if (!tracked.exitGracePending) {
+			tracked.exitGracePending = true;
+			tracked.exitGraceStart = _batchNow;
+		}
+		++it;
+	}
+
+	_currentlyVisible = std::move(_batchVisible);
+	restartTimer();
+}
+
+void ReadMetricsTracker::registerActivity() {
+	if (!_appActive || !_screenActive) {
+		return;
+	}
+	const auto now = crl::now();
+	const auto activityDeadline = activeUntil();
+	if (activityDeadline && activityDeadline < now) {
+		sync(now);
+	}
+	_lastActivity = now;
+	restartTimer();
+}
+
+void ReadMetricsTracker::setScreenActive(bool active) {
+	if (_screenActive == active) {
+		return;
+	}
+	_screenActive = active;
+	refreshPaused(crl::now());
+}
+
+void ReadMetricsTracker::pauseTracking() {
+	setScreenActive(false);
+}
+
+void ReadMetricsTracker::resumeTracking() {
+	setScreenActive(true);
+}
+
+void ReadMetricsTracker::onTimeout() {
+	sync(crl::now());
+}
+
+void ReadMetricsTracker::sync(crl::time now) {
+	const auto activeUntil = this->activeUntil();
+	processTransitions(now, activeUntil);
+	accumulate(now, activeUntil);
+	restartTimer();
+}
+
+void ReadMetricsTracker::processTransitions(
+		crl::time now,
+		crl::time activeUntil) {
+	for (auto it = _tracked.begin(); it != _tracked.end();) {
+		auto &tracked = it->second;
+		if (tracked.entryGracePending
+			&& !_paused
+			&& now - tracked.entryGraceStart >= kGracePeriod) {
+			tracked.entryGracePending = false;
+			do {
+				tracked.viewId = base::RandomValue<uint64>();
+			} while (!tracked.viewId);
+			tracked.trackingStarted = tracked.entryGraceStart;
+			tracked.lastUpdate = tracked.trackingStarted;
+		}
+		if (tracked.exitGracePending
+			&& !_paused
+			&& now - tracked.exitGraceStart >= kGracePeriod) {
+			finalize(it->first, tracked);
+			it = _tracked.erase(it);
+			continue;
+		}
+		if (tracked.viewId && !tracked.entryGracePending && !tracked.exitGracePending) {
+			const auto deadline = tracked.trackingStarted + kMaxTrackingDuration;
+			if (now >= deadline) {
+				if (!_paused
+					&& _currentlyVisible.contains(it->first)
+					&& tracked.lastUpdate < deadline) {
+					addElapsed(tracked, tracked.lastUpdate, deadline, activeUntil);
+					tracked.lastUpdate = deadline;
+				}
+				finalize(it->first, tracked);
+				it = _tracked.erase(it);
+				continue;
+			}
+		}
+		++it;
+	}
+}
+
+void ReadMetricsTracker::accumulate(crl::time now, crl::time activeUntil) {
+	for (auto &[msgId, tracked] : _tracked) {
+		if (!tracked.viewId
+			|| tracked.entryGracePending
+			|| tracked.exitGracePending
+			|| tracked.lastUpdate <= 0) {
+			continue;
+		}
+		if (_paused || !_currentlyVisible.contains(msgId)) {
+			tracked.lastUpdate = now;
+			continue;
+		}
+		addElapsed(tracked, tracked.lastUpdate, now, activeUntil);
+		tracked.lastUpdate = now;
+	}
+}
+
+void ReadMetricsTracker::refreshPaused(crl::time now) {
+	const auto paused = !_appActive || !_screenActive;
+	if (_paused == paused) {
+		return;
+	} else if (paused) {
+		const auto activeUntil = this->activeUntil();
+		processTransitions(now, activeUntil);
+		accumulate(now, activeUntil);
+		_pausedSince = now;
+		for (auto &[msgId, tracked] : _tracked) {
+			if (tracked.entryGracePending || tracked.exitGracePending) {
+				continue;
+			}
+			tracked.lastUpdate = now;
+		}
+	} else {
+		const auto delta = now - _pausedSince;
+		for (auto &[msgId, tracked] : _tracked) {
+			if (tracked.entryGracePending) {
+				tracked.entryGraceStart = (tracked.entryGraceStart < _pausedSince)
+					? (tracked.entryGraceStart + delta)
+					: now;
+			} else if (tracked.exitGracePending) {
+				tracked.exitGraceStart = (tracked.exitGraceStart < _pausedSince)
+					? (tracked.exitGraceStart + delta)
+					: now;
+			} else if (tracked.viewId) {
+				tracked.lastUpdate = now;
+			}
+		}
+		_pausedSince = 0;
+	}
+	_paused = paused;
+	restartTimer();
+}
+
+void ReadMetricsTracker::restartTimer() {
+	if (_tracked.empty()) {
+		_timer.cancel();
+		return;
+	}
+	const auto now = crl::now();
+	auto nearest = crl::time(0);
+	const auto updateNearest = [&](crl::time deadline) {
+		if (!deadline) {
+			return;
+		}
+		if (!nearest || deadline < nearest) {
+			nearest = deadline;
+		}
+	};
+
+	const auto activityDeadline = activeUntil();
+	for (const auto &[msgId, tracked] : _tracked) {
+		if (tracked.entryGracePending && !_paused) {
+			updateNearest(tracked.entryGraceStart + kGracePeriod);
+		} else if (tracked.exitGracePending && !_paused) {
+			updateNearest(tracked.exitGraceStart + kGracePeriod);
+		} else if (tracked.viewId) {
+			updateNearest(tracked.trackingStarted + kMaxTrackingDuration);
+			if (!_paused && _currentlyVisible.contains(msgId) && activityDeadline > now) {
+				updateNearest(activityDeadline);
+			}
+		}
+	}
+	if (!nearest) {
+		_timer.cancel();
+		return;
+	}
+	_timer.callOnce(std::max(nearest - now, crl::time(0)));
+}
+
+crl::time ReadMetricsTracker::activeUntil() const {
+	return _lastActivity ? (_lastActivity + kActivityTimeout) : 0;
+}
+
+void ReadMetricsTracker::addElapsed(
+		TrackedItem &tracked,
+		crl::time from,
+		crl::time till,
+		crl::time activeUntil) const {
+	if (till <= from) {
+		return;
+	}
+	tracked.totalInView += (till - from);
+	if (activeUntil > from) {
+		tracked.activeInView += std::max(std::min(till, activeUntil) - from, crl::time(0));
+		tracked.activeInView = std::min(tracked.activeInView, tracked.totalInView);
+	}
+}
+
+void ReadMetricsTracker::finalize(
+		MsgId msgId,
+		const TrackedItem &tracked) {
+	if (tracked.viewId == 0 || tracked.totalInView < kMinReportThreshold) {
+		return;
+	}
+	const auto heightRatio = (tracked.maxViewportHeight > 0)
+		? qRound((tracked.maxItemHeight * 1000.0) / tracked.maxViewportHeight)
+		: 0;
+	const auto seenRange = (tracked.maxItemHeight > 0)
+		? std::clamp(
+			qRound(((tracked.seenBottom - tracked.seenTop) * 1000.0)
+				/ tracked.maxItemHeight),
+			0,
+			1000)
+		: 0;
+	_peer->session().api().readMetrics().add(_peer, {
+		.msgId = msgId,
+		.viewId = tracked.viewId,
+		.timeInViewMs = int(tracked.totalInView),
+		.activeTimeInViewMs = int(tracked.activeInView),
+		.heightToViewportRatioPermille = heightRatio,
+		.seenRangeRatioPermille = seenRange,
+	});
+}
+
+void ReadMetricsTracker::finalizeAll() {
+	sync(crl::now());
+	for (const auto &[msgId, tracked] : _tracked) {
+		finalize(msgId, tracked);
+	}
+	_tracked.clear();
+	_timer.cancel();
+}
+
+bool ReadMetricsTracker::ShouldTrack(not_null<HistoryItem*> item) {
+	return item->isRegular() && item->hasViews();
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_read_metrics_tracker.h b/Telegram/SourceFiles/history/view/history_view_read_metrics_tracker.h
new file mode 100644
index 00000000000000..1be6087a7eeee4
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_read_metrics_tracker.h
@@ -0,0 +1,81 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+
+class PeerData;
+class HistoryItem;
+
+namespace HistoryView {
+
+class ReadMetricsTracker final {
+public:
+	explicit ReadMetricsTracker(not_null<PeerData*> peer);
+	~ReadMetricsTracker();
+
+	void startBatch(int visibleTop, int visibleBottom);
+	void push(not_null<HistoryItem*> item, int itemTop, int itemHeight);
+	void endBatch();
+	void registerActivity();
+	void setScreenActive(bool active);
+	void pauseTracking();
+	void resumeTracking();
+
+private:
+	struct TrackedItem {
+		uint64 viewId = 0;
+		crl::time entryGraceStart = 0;
+		crl::time trackingStarted = 0;
+		crl::time lastUpdate = 0;
+		crl::time totalInView = 0;
+		crl::time activeInView = 0;
+		int seenTop = std::numeric_limits<int>::max();
+		int seenBottom = 0;
+		int maxItemHeight = 0;
+		int maxViewportHeight = 0;
+		bool entryGracePending = false;
+		bool exitGracePending = false;
+		crl::time exitGraceStart = 0;
+	};
+
+	void onTimeout();
+	void sync(crl::time now);
+	void processTransitions(crl::time now, crl::time activeUntil);
+	void accumulate(crl::time now, crl::time activeUntil);
+	void refreshPaused(crl::time now);
+	void restartTimer();
+	[[nodiscard]] crl::time activeUntil() const;
+	void addElapsed(
+		TrackedItem &tracked,
+		crl::time from,
+		crl::time till,
+		crl::time activeUntil) const;
+	void finalize(MsgId msgId, const TrackedItem &tracked);
+	void finalizeAll();
+	[[nodiscard]] static bool ShouldTrack(not_null<HistoryItem*> item);
+
+	const not_null<PeerData*> _peer;
+	base::flat_map<MsgId, TrackedItem> _tracked;
+	base::flat_set<MsgId> _currentlyVisible;
+	crl::time _batchNow = 0;
+	int _batchViewportHeight = 0;
+	int _batchVisibleTop = 0;
+	int _batchVisibleBottom = 0;
+	base::flat_set<MsgId> _batchVisible;
+	crl::time _lastActivity = 0;
+	bool _appActive = true;
+	bool _screenActive = true;
+	bool _paused = false;
+	crl::time _pausedSince = 0;
+	base::Timer _timer;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_reply.cpp b/Telegram/SourceFiles/history/view/history_view_reply.cpp
index d2043b02739ebe..6ddb53ad9d0ddf 100644
--- a/Telegram/SourceFiles/history/view/history_view_reply.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_reply.cpp
@@ -11,9 +11,13 @@ For license and copyright information please follow this link:
 #include "core/ui_integration.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_channel.h"
+#include "data/data_document.h"
 #include "data/data_peer.h"
+#include "data/data_photo.h"
+#include "data/data_poll.h"
 #include "data/data_session.h"
 #include "data/data_story.h"
+#include "data/data_todo_list.h"
 #include "data/data_user.h"
 #include "history/view/history_view_item_preview.h"
 #include "history/history.h"
@@ -25,6 +29,7 @@ For license and copyright information please follow this link:
 #include "ui/chat/chat_style.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/effects/spoiler_mess.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
 #include "ui/painter.h"
@@ -32,16 +37,101 @@ For license and copyright information please follow this link:
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
+#include "styles/style_polls.h"
 
 namespace HistoryView {
 namespace {
 
 constexpr auto kNonExpandedLinesLimit = 5;
 
+[[nodiscard]] QImage MakeTaskImage() {
+	const auto diameter = st::normalFont->ascent;
+	const auto line = st::historyPollRadio.thickness;
+	const auto size = 2 * line + diameter;
+	const auto ratio = style::DevicePixelRatio();
+	auto result = QImage(
+		QSize(size, size) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	result.fill(Qt::transparent);
+	result.setDevicePixelRatio(ratio);
+
+	auto p = QPainter(&result);
+	PainterHighQualityEnabler hq(p);
+
+	p.setOpacity(st::historyPollRadioOpacity);
+
+	const auto rect = QRectF(line, line, diameter, diameter).marginsRemoved(
+		QMarginsF(line / 2., line / 2., line / 2., line / 2.));
+	auto pen = QPen(QColor(255, 255, 255));
+	pen.setWidth(line);
+	p.setPen(pen);
+	p.drawEllipse(rect);
+
+	p.end();
+
+	return result;
+}
+
+template <typename PaintShape>
+[[nodiscard]] QImage MakeCheckedImage(PaintShape paintShape) {
+	const auto white = QColor(255, 255, 255);
+	const auto black = QColor(0, 0, 0);
+
+	const auto diameter = st::normalFont->ascent;
+	const auto line = st::historyPollRadio.thickness;
+	const auto size = 2 * line + diameter;
+	const auto ratio = style::DevicePixelRatio();
+	auto result = QImage(
+		QSize(size, size) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	result.fill(black);
+	result.setDevicePixelRatio(ratio);
+
+	auto p = QPainter(&result);
+	PainterHighQualityEnabler hq(p);
+
+	const auto rect = QRectF(line, line, diameter, diameter).marginsRemoved(
+		QMarginsF(line / 2., line / 2., line / 2., line / 2.));
+	paintShape(p, rect);
+	const auto &icon = st::historyPollInChoiceRight;
+	icon.paint(
+		p,
+		line + (diameter - icon.width()) / 2,
+		line + (diameter - icon.height()) / 2,
+		size,
+		black);
+	p.end();
+
+	return style::colorizeImage(result, white);
+}
+
+[[nodiscard]] QImage MakeTaskDoneImage() {
+	return MakeCheckedImage([](QPainter &p, QRectF rect) {
+		const auto white = QColor(255, 255, 255);
+		const auto line = st::historyPollRadio.thickness;
+		auto pen = QPen(white);
+		pen.setWidth(line);
+		p.setPen(pen);
+		p.setBrush(white);
+		p.drawEllipse(rect);
+	});
+}
+
+[[nodiscard]] QImage MakePollAnswerImage() {
+	return MakeCheckedImage([](QPainter &p, QRectF rect) {
+		const auto white = QColor(255, 255, 255);
+		const auto line = st::historyPollRadio.thickness;
+		p.setPen(Qt::NoPen);
+		p.setBrush(white);
+		p.drawRoundedRect(rect, line * 2, line * 2);
+	});
+}
+
 } // namespace
 
 void ValidateBackgroundEmoji(
 		DocumentId backgroundEmojiId,
+		const std::shared_ptr<Ui::ColorCollectible> &collectible,
 		not_null<Ui::BackgroundEmojiData*> data,
 		not_null<Ui::BackgroundEmojiCache*> cache,
 		not_null<Ui::Text::QuotePaintCache*> quote,
@@ -52,16 +142,43 @@ void ValidateBackgroundEmoji(
 			backgroundEmojiId,
 			crl::guard(view, [=] { view->repaint(); }));
 	}
-	ValidateBackgroundEmoji(backgroundEmojiId, data, cache, quote);
+	if (collectible && data->firstGiftFrame.isNull() && !data->gift) {
+		data->gift = CreateBackgroundGiftInstance(
+			&view->history()->owner(),
+			collectible->giftEmojiId,
+			crl::guard(view, [=] { view->repaint(); }));
+	}
+	ValidateBackgroundEmoji(data, cache, quote);
 }
 
 void ValidateBackgroundEmoji(
-		DocumentId backgroundEmojiId,
 		not_null<Ui::BackgroundEmojiData*> data,
 		not_null<Ui::BackgroundEmojiCache*> cache,
 		not_null<Ui::Text::QuotePaintCache*> quote) {
 	Expects(!data->firstFrameMask.isNull() || data->emoji != nullptr);
 
+	if (data->gift && data->firstGiftFrame.isNull()) {
+		if (data->gift->ready()) {
+			const auto tag = Data::CustomEmojiSizeTag::Normal;
+			const auto size = Data::FrameSizeFromTag(tag);
+			data->firstGiftFrame = QImage(
+				QSize(size, size),
+				QImage::Format_ARGB32_Premultiplied);
+			data->firstGiftFrame.fill(Qt::transparent);
+			data->firstGiftFrame.setDevicePixelRatio(style::DevicePixelRatio());
+			auto p = Painter(&data->firstGiftFrame);
+			data->gift->paint(p, {
+				.textColor = QColor(255, 255, 255),
+				.position = QPoint(0, 0),
+				.internal = {
+					.forceFirstFrame = true,
+				},
+			});
+			p.end();
+
+			data->gift = nullptr;
+		}
+	}
 	if (data->firstFrameMask.isNull()) {
 		if (!cache->frames[0].isNull()) {
 			for (auto &frame : cache->frames) {
@@ -136,16 +253,32 @@ auto CreateBackgroundEmojiInstance(
 		Data::CustomEmojiSizeTag::Isolated);
 }
 
+auto CreateBackgroundGiftInstance(
+	not_null<Data::Session*> owner,
+	DocumentId giftEmojiId,
+	Fn<void()> repaint)
+-> std::unique_ptr<Ui::Text::CustomEmoji> {
+	return owner->customEmojiManager().create(
+		giftEmojiId,
+		repaint,
+		Data::CustomEmojiSizeTag::Normal);
+}
+
 void FillBackgroundEmoji(
 		QPainter &p,
 		const QRect &rect,
 		bool quote,
-		const Ui::BackgroundEmojiCache &cache) {
+		const Ui::BackgroundEmojiCache &cache,
+		const QImage &firstGiftFrame) {
 	p.setClipRect(rect);
 
 	const auto &frames = cache.frames;
 	const auto right = rect.x() + rect.width();
-	const auto paint = [&](int x, int y, int index, float64 opacity) {
+	const auto paintImage = [&](
+			int x,
+			int y,
+			const QImage &frame,
+			float64 opacity) {
 		y = style::ConvertScale(y);
 		if (y >= rect.height()) {
 			return;
@@ -154,10 +287,17 @@ void FillBackgroundEmoji(
 		p.drawImage(
 			right - style::ConvertScale(x + (quote ? 12 : 0)),
 			rect.y() + y,
-			frames[index]);
+			frame);
+	};
+	const auto paint = [&](int x, int y, int index, float64 opacity) {
+		paintImage(x, y, frames[index], opacity);
 	};
 
-	paint(28, 4, 2, 0.32);
+	if (firstGiftFrame.isNull()) {
+		paint(28, 4, 2, 0.32);
+	} else {
+		paintImage(28, 4, firstGiftFrame, 1.);
+	}
 	paint(51, 15, 1, 0.32);
 	paint(64, -2, 0, 0.28);
 	paint(87, 11, 1, 0.24);
@@ -193,6 +333,31 @@ void Reply::update(
 	const auto item = view->data();
 	const auto &fields = data->fields();
 	const auto message = data->resolvedMessage.get();
+	const auto messageMedia = (message
+			&& (fields.todoItemId || !fields.pollOption.isEmpty()))
+		? message->media()
+		: nullptr;
+	const auto messageTodoList = messageMedia
+		? messageMedia->todolist()
+		: nullptr;
+	const auto taskIndex = messageTodoList
+		? int(ranges::find(
+			messageTodoList->items,
+			fields.todoItemId,
+			&TodoListItem::id) - begin(messageTodoList->items))
+		: -1;
+	const auto task = (taskIndex >= 0
+		&& taskIndex < messageTodoList->items.size())
+		? &messageTodoList->items[taskIndex]
+		: nullptr;
+	const auto messagePoll = messageMedia
+		? messageMedia->poll()
+		: message
+		? (message->media() ? message->media()->poll() : nullptr)
+		: nullptr;
+	const auto pollAnswer = (messagePoll && !fields.pollOption.isEmpty())
+		? messagePoll->answerByOption(fields.pollOption)
+		: nullptr;
 	const auto story = data->resolvedStory.get();
 	const auto externalMedia = fields.externalMedia.get();
 	if (!_externalSender) {
@@ -210,29 +375,60 @@ void Reply::update(
 	_hiddenSenderColorIndexPlusOne = (!_colorPeer && message)
 		? (message->originalHiddenSenderInfo()->colorIndex + 1)
 		: 0;
-
+	const auto pollMediaPtr = pollAnswer
+		? &pollAnswer->media
+		: (messagePoll && fields.pollOption.isEmpty())
+		? &messagePoll->attachedMedia
+		: nullptr;
 	const auto hasPreview = (story && story->hasReplyPreview())
 		|| (message
 			&& message->media()
 			&& message->media()->hasReplyPreview())
-		|| (externalMedia && externalMedia->hasReplyPreview());
+		|| (externalMedia && externalMedia->hasReplyPreview())
+		|| (pollMediaPtr
+			&& (pollMediaPtr->photo || pollMediaPtr->document));
 	_hasPreview = hasPreview ? 1 : 0;
 	_displaying = data->displaying() ? 1 : 0;
 	_multiline = data->multiline() ? 1 : 0;
-	_replyToStory = (fields.storyId != 0);
 	const auto hasQuoteIcon = _displaying
 		&& fields.manualQuote
 		&& !fields.quote.empty();
 	_hasQuoteIcon = hasQuoteIcon ? 1 : 0;
 
+	const auto repaint = [=] { item->customEmojiRepaint(); };
+	auto helper = Ui::Text::CustomEmojiHelper(Core::TextContext({
+		.session = &view->history()->session(),
+		.repaint = repaint,
+	}));
 	const auto text = (!_displaying && data->unavailable())
 		? TextWithEntities()
+		: task
+		? Ui::Text::Colorized(task->completionDate
+			? helper.image({
+				.image = MakeTaskDoneImage(),
+				.margin = QMargins(0, st::lineWidth, st::lineWidth, 0),
+			})
+			: helper.image({
+				.image = MakeTaskImage(),
+				.margin = QMargins(0, st::lineWidth, st::lineWidth, 0),
+			})).append(task->text)
+		: pollAnswer
+		? Ui::Text::Colorized(helper.image({
+			.image = MakePollAnswerImage(),
+			.margin = QMargins(0, st::lineWidth, st::lineWidth, 0),
+		})).append(pollAnswer->text)
+		: messagePoll
+		? Ui::Text::Colorized(
+			Ui::Text::IconEmoji(&st::historyPollReplyIcon)
+		).append(messagePoll->question)
 		: (message && (fields.quote.empty() || !fields.manualQuote))
 		? message->inReplyText()
 		: !fields.quote.empty()
 		? fields.quote
 		: story
-		? story->inReplyText()
+		? Ui::Text::Colorized(
+			Ui::Text::IconEmoji(&st::historyReplyStoryIcon)
+		).append(story->inReplyText())
 		: externalMedia
 		? externalMedia->toPreview({
 			.hideSender = true,
@@ -243,16 +439,11 @@ void Reply::update(
 			.ignoreTopic = true,
 		}).text
 		: TextWithEntities();
-	const auto repaint = [=] { item->customEmojiRepaint(); };
-	const auto context = Core::MarkedTextContext{
-		.session = &view->history()->session(),
-		.customEmojiRepaint = repaint,
-	};
 	_text.setMarkedText(
 		st::defaultTextStyle,
 		text,
 		_multiline ? Ui::ItemTextDefaultOptions() : Ui::DialogTextOptions(),
-		context);
+		helper.context());
 
 	updateName(view, data);
 
@@ -282,12 +473,15 @@ void Reply::setLinkFrom(
 		not_null<HistoryMessageReply*> data) {
 	const auto weak = base::make_weak(view);
 	const auto &fields = data->fields();
+	const auto isAdminLogEntry = view->data()->isAdminLogEntry();
 	const auto externalChannelId = peerToChannel(fields.externalPeerId);
 	const auto messageId = fields.messageId;
-	const auto quote = fields.manualQuote
-		? fields.quote
-		: TextWithEntities();
-	const auto quoteOffset = fields.quoteOffset;
+	const auto highlight = MessageHighlightId{
+		.quote = fields.manualQuote ? fields.quote : TextWithEntities(),
+		.quoteOffset = int(fields.quoteOffset),
+		.todoItemId = fields.todoItemId,
+		.pollOption = fields.pollOption,
+	};
 	const auto returnToId = view->data()->fullId();
 	const auto externalLink = [=](ClickContext context) {
 		const auto my = context.other.value<ClickHandlerContext>();
@@ -310,8 +504,7 @@ void Reply::setLinkFrom(
 							channel,
 							messageId,
 							returnToId,
-							quote,
-							quoteOffset
+							highlight
 						)->onClick(context);
 					} else {
 						controller->showPeerInfo(channel);
@@ -331,8 +524,10 @@ void Reply::setLinkFrom(
 	};
 	const auto message = data->resolvedMessage.get();
 	const auto story = data->resolvedStory.get();
-	_link = message
-		? JumpToMessageClickHandler(message, returnToId, quote, quoteOffset)
+	_link = isAdminLogEntry
+		? std::make_shared<LambdaClickHandler>(externalLink)
+		: message
+		? JumpToMessageClickHandler(message, returnToId, highlight)
 		: story
 		? JumpToStoryClickHandler(story)
 		: (data->external()
@@ -448,26 +643,26 @@ void Reply::updateName(
 		: 0;
 	auto nameFull = TextWithEntities();
 	if (displayAsExternal && !groupNameAdded && !fields.storyId) {
-		nameFull.append(PeerEmoji(history, sender));
+		nameFull.append(PeerEmoji(sender));
 	}
 	nameFull.append(name);
 	if (groupNameAdded) {
-		nameFull.append(' ').append(PeerEmoji(history, externalPeer));
+		nameFull.append(' ').append(PeerEmoji(externalPeer));
 		nameFull.append(externalPeer->name());
 	} else if (originalNameAdded) {
-		nameFull.append(' ').append(ForwardEmoji(&history->owner()));
-		nameFull.append(forwarded->originalSender
+		nameFull.append(' ').append(
+			st::historyReplyForward
+		).append(forwarded->originalSender
 			? forwarded->originalSender->name()
 			: forwarded->originalHiddenSenderInfo->name);
 	}
 	if (!viaBotUsername.isEmpty()) {
 		nameFull.append(u" @"_q).append(viaBotUsername);
 	}
-	const auto context = Core::MarkedTextContext{
+	const auto context = Core::TextContext({
 		.session = &history->session(),
-		.customEmojiRepaint = [] {},
 		.customEmojiLoopLimit = 1,
-	};
+	});
 	_name.setMarkedText(
 		st::fwdTextStyle,
 		nameFull,
@@ -478,18 +673,14 @@ void Reply::updateName(
 	}
 	const auto nameMaxWidth = previewSkip
 		+ _name.maxWidth()
+		+ st::messageGiftIconSkip
 		+ (_hasQuoteIcon
 			? st::messageTextStyle.blockquote.icon.width()
 			: 0);
-	const auto storySkip = fields.storyId
-		? (st::dialogsMiniReplyStory.skipText
-			+ st::dialogsMiniReplyStory.icon.icon.width())
-		: 0;
 	const auto optimalTextSize = _multiline
 		? countMultilineOptimalSize(previewSkip)
 		: QSize(
 			(previewSkip
-				+ storySkip
 				+ std::min(_text.maxWidth(), st::maxSignatureSize)),
 			st::normalFont->height);
 	_maxWidth = std::max(nameMaxWidth, optimalTextSize.width());
@@ -608,14 +799,24 @@ void Reply::paint(
 	const auto colorIndexPlusOne = _colorPeer
 		? (_colorPeer->colorIndex() + 1)
 		: _hiddenSenderColorIndexPlusOne;
+	const auto &colorCollectible = _colorPeer
+		? _colorPeer->colorCollectible()
+		: nullptr;
+	const auto useColorCollectible = colorCollectible && !context.outbg;
 	const auto useColorIndex = colorIndexPlusOne && !context.outbg;
-	const auto colorPattern = colorIndexPlusOne
+	const auto colorPattern = colorCollectible
+		? st->collectiblePatternIndex(colorCollectible)
+		: colorIndexPlusOne
 		? st->colorPatternIndex(colorIndexPlusOne - 1)
 		: 0;
 	const auto cache = !inBubble
 		? (_hasQuoteIcon
 			? st->serviceQuoteCache(colorPattern)
 			: st->serviceReplyCache(colorPattern)).get()
+		: useColorCollectible
+		? (_hasQuoteIcon
+			? st->collectibleQuoteCache(selected, colorCollectible)
+			: st->collectibleReplyCache(selected, colorCollectible)).get()
 		: useColorIndex
 		? (_hasQuoteIcon
 			? st->coloredQuoteCache(selected, colorIndexPlusOne - 1)
@@ -626,31 +827,39 @@ void Reply::paint(
 	const auto &quoteSt = _hasQuoteIcon
 		? st::messageTextStyle.blockquote
 		: st::messageQuoteStyle;
-	const auto backgroundEmoji = backgroundEmojiId
-		? st->backgroundEmojiData(backgroundEmojiId).get()
+	const auto backgroundEmojiData = backgroundEmojiId
+		? st->backgroundEmojiData(backgroundEmojiId, colorCollectible).get()
 		: nullptr;
-	const auto backgroundEmojiCache = backgroundEmoji
-		? &backgroundEmoji->caches[Ui::BackgroundEmojiData::CacheIndex(
+	const auto backgroundEmojiCache = !backgroundEmojiData
+		? nullptr
+		: useColorCollectible
+		? &backgroundEmojiData->collectibleCaches[colorCollectible]
+		: &backgroundEmojiData->caches[Ui::BackgroundEmojiData::CacheIndex(
 			selected,
 			context.outbg,
 			inBubble,
-			colorIndexPlusOne)]
-		: nullptr;
+			useColorIndex ? colorIndexPlusOne : 0)];
 	const auto rippleColor = cache->bg;
 	if (!inBubble) {
 		cache->bg = QColor(0, 0, 0, 0);
 	}
 	Ui::Text::ValidateQuotePaintCache(*cache, quoteSt);
 	Ui::Text::FillQuotePaint(p, rect, *cache, quoteSt);
-	if (backgroundEmoji) {
+	if (backgroundEmojiData) {
 		ValidateBackgroundEmoji(
 			backgroundEmojiId,
-			backgroundEmoji,
+			colorCollectible,
+			backgroundEmojiData,
 			backgroundEmojiCache,
 			cache,
 			view);
 		if (!backgroundEmojiCache->frames[0].isNull()) {
-			FillBackgroundEmoji(p, rect, _hasQuoteIcon, *backgroundEmojiCache);
+			FillBackgroundEmoji(
+				p,
+				rect,
+				_hasQuoteIcon,
+				*backgroundEmojiCache,
+				backgroundEmojiData->firstGiftFrame);
 		}
 	}
 	if (!inBubble) {
@@ -658,9 +867,11 @@ void Reply::paint(
 	}
 
 	if (_ripple.animation) {
+		_ripple.lastPaintedPoint = inBubble ? QPoint(x, y) : QPoint();
 		_ripple.animation->paint(p, x, y, w, &rippleColor);
 		if (_ripple.animation->empty()) {
 			_ripple.animation.reset();
+			_ripple.lastPaintedPoint = {};
 		}
 	}
 
@@ -691,15 +902,42 @@ void Reply::paint(
 					? data->resolvedMessage.get()
 					: nullptr;
 				const auto media = message ? message->media() : nullptr;
-				const auto image = media
-					? media->replyPreview()
-					: !data
-					? nullptr
-					: data->resolvedStory
-					? data->resolvedStory->replyPreview()
-					: data->fields().externalMedia
-					? data->fields().externalMedia->replyPreview()
+				const auto messagePoll = media ? media->poll() : nullptr;
+				const auto pollAnswer = messagePoll
+					? messagePoll->answerByOption(
+						data->fields().pollOption)
 					: nullptr;
+				const auto pollMediaPtr = pollAnswer
+					? &pollAnswer->media
+					: (messagePoll
+						&& data->fields().pollOption.isEmpty())
+					? &messagePoll->attachedMedia
+					: nullptr;
+				const auto image = [&]() -> Image* {
+					if (pollMediaPtr) {
+						if (pollMediaPtr->photo) {
+							return pollMediaPtr->photo->getReplyPreview(
+								message);
+						} else if (pollMediaPtr->document) {
+							return pollMediaPtr->document->getReplyPreview(
+								message);
+						}
+					}
+					if (media) {
+						return media->replyPreview();
+					}
+					if (!data) {
+						return nullptr;
+					}
+					if (data->resolvedStory) {
+						return data->resolvedStory->replyPreview();
+					}
+					if (data->fields().externalMedia) {
+						return data->fields().externalMedia
+							->replyPreview();
+					}
+					return nullptr;
+				}();
 				if (image) {
 					auto to = style::rtlrect(
 						x + st::historyReplyPreviewMargin.left(),
@@ -734,6 +972,7 @@ void Reply::paint(
 				- st::historyReplyPadding.right();
 			const auto namew = textw
 				- previewSkip
+				- st::messageGiftIconSkip
 				- (_hasQuoteIcon
 					? st::messageTextStyle.blockquote.icon.width()
 					: 0);
@@ -741,8 +980,11 @@ void Reply::paint(
 			if (namew > 0) {
 				p.setPen(!inBubble
 					? st->msgImgReplyBarColor()->c
-					: useColorIndex
-					? FromNameFg(context, colorIndexPlusOne - 1)
+					: (colorCollectible || colorIndexPlusOne)
+					? FromNameFg(
+						context,
+						colorIndexPlusOne - 1,
+						colorCollectible)
 					: stm->msgServiceFg->c);
 				_name.drawLeftElided(
 					p,
@@ -758,6 +1000,8 @@ void Reply::paint(
 				view->prepareCustomEmojiPaint(p, context, _text);
 				auto replyToTextPalette = &(!inBubble
 					? st->imgReplyTextPalette()
+					: useColorCollectible
+					? st->collectibleTextPalette(selected, colorCollectible)
 					: useColorIndex
 					? st->coloredTextPalette(selected, colorIndexPlusOne - 1)
 					: stm->replyTextPalette);
@@ -769,16 +1013,6 @@ void Reply::paint(
 					copy->linkFg = owned->color();
 					replyToTextPalette = &*copy;
 				}
-				if (_replyToStory) {
-					st::dialogsMiniReplyStory.icon.icon.paint(
-						p,
-						textLeft + firstLineSkip,
-						textTop,
-						w + 2 * x,
-						replyToTextPalette->linkFg->c);
-					firstLineSkip += st::dialogsMiniReplyStory.skipText
-						+ st::dialogsMiniReplyStory.icon.icon.width();
-				}
 				_text.draw(p, {
 					.position = { textLeft, textTop },
 					.geometry = textGeometry(textw, firstLineSkip),
@@ -816,7 +1050,11 @@ void Reply::createRippleAnimation(
 		Ui::RippleAnimation::RoundRectMask(
 			size,
 			st::messageQuoteStyle.radius),
-		[=] { view->repaint(); });
+		[=] {
+			view->repaint(_ripple.lastPaintedPoint.isNull()
+				? QRect()
+				: QRect(_ripple.lastPaintedPoint, size));
+		});
 }
 
 void Reply::saveRipplePoint(QPoint point) const {
@@ -835,61 +1073,62 @@ void Reply::stopLastRipple() {
 	}
 }
 
-TextWithEntities Reply::PeerEmoji(
-		not_null<History*> history,
-		PeerData *peer) {
-	return PeerEmoji(&history->owner(), peer);
-}
-
-TextWithEntities Reply::PeerEmoji(
-		not_null<Data::Session*> owner,
-		PeerData *peer) {
+TextWithEntities Reply::PeerEmoji(PeerData *peer) {
 	using namespace std;
 	const auto icon = !peer
-		? pair(&st::historyReplyUser, st::historyReplyUserPadding)
+		? &st::historyReplyUser
 		: peer->isBroadcast()
-		? pair(&st::historyReplyChannel, st::historyReplyChannelPadding)
+		? &st::historyReplyChannel
 		: (peer->isChannel() || peer->isChat())
-		? pair(&st::historyReplyGroup, st::historyReplyGroupPadding)
-		: pair(&st::historyReplyUser, st::historyReplyUserPadding);
-	return Ui::Text::SingleCustomEmoji(
-		owner->customEmojiManager().registerInternalEmoji(
-			*icon.first,
-			icon.second));
-}
-
-TextWithEntities Reply::ForwardEmoji(not_null<Data::Session*> owner) {
-	return Ui::Text::SingleCustomEmoji(
-		owner->customEmojiManager().registerInternalEmoji(
-			st::historyReplyForward,
-			st::historyReplyForwardPadding));
+		? &st::historyReplyGroup
+		: &st::historyReplyUser;
+	return Ui::Text::IconEmoji(icon);
 }
 
 TextWithEntities Reply::ComposePreviewName(
 		not_null<History*> history,
 		not_null<HistoryItem*> to,
-		bool quote) {
+		const FullReplyTo &replyTo) {
 	const auto sender = [&] {
 		if (const auto from = to->displayFrom()) {
 			return not_null(from);
 		}
 		return to->author();
 	}();
+	if (const auto media = (replyTo.todoItemId
+			|| !replyTo.pollOption.isEmpty())
+		? to->media()
+		: nullptr) {
+		if (const auto todolist = media->todolist()) {
+			return tr::lng_preview_reply_to_task(
+				tr::now,
+				lt_title,
+				todolist->title,
+				tr::marked);
+		} else if (const auto poll = media->poll()) {
+			return tr::lng_preview_reply_to_poll_option(
+				tr::now,
+				lt_title,
+				poll->question,
+				tr::marked);
+		}
+	}
 	const auto toPeer = to->history()->peer;
 	const auto displayAsExternal = (to->history() != history);
 	const auto groupNameAdded = displayAsExternal
 		&& (toPeer != sender)
 		&& (toPeer->isChat() || toPeer->isMegagroup());
+	const auto quote = replyTo && !replyTo.quote.empty();
 	const auto shorten = groupNameAdded || quote;
 
 	auto nameFull = TextWithEntities();
 	using namespace HistoryView;
 	if (displayAsExternal && !groupNameAdded) {
-		nameFull.append(Reply::PeerEmoji(history, sender));
+		nameFull.append(Reply::PeerEmoji(sender));
 	}
 	nameFull.append(shorten ? sender->shortName() : sender->name());
 	if (groupNameAdded) {
-		nameFull.append(' ').append(Reply::PeerEmoji(history, toPeer));
+		nameFull.append(' ').append(Reply::PeerEmoji(toPeer));
 		nameFull.append(toPeer->name());
 	}
 	return (quote
@@ -898,7 +1137,7 @@ TextWithEntities Reply::ComposePreviewName(
 			tr::now,
 			lt_name,
 			nameFull,
-			Ui::Text::WithEntities);
+			tr::marked);
 
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_reply.h b/Telegram/SourceFiles/history/view/history_view_reply.h
index 416f4c0097968c..00b553f5fc3cf1 100644
--- a/Telegram/SourceFiles/history/view/history_view_reply.h
+++ b/Telegram/SourceFiles/history/view/history_view_reply.h
@@ -17,6 +17,7 @@ namespace Ui {
 class SpoilerAnimation;
 struct BackgroundEmojiData;
 struct BackgroundEmojiCache;
+struct ColorCollectible;
 } // namespace Ui
 
 namespace Ui::Text {
@@ -28,6 +29,7 @@ namespace HistoryView {
 
 void ValidateBackgroundEmoji(
 	DocumentId backgroundEmojiId,
+	const std::shared_ptr<Ui::ColorCollectible> &collectible,
 	not_null<Ui::BackgroundEmojiData*> data,
 	not_null<Ui::BackgroundEmojiCache*> cache,
 	not_null<Ui::Text::QuotePaintCache*> quote,
@@ -35,7 +37,6 @@ void ValidateBackgroundEmoji(
 
 // For this one data->firstFrameMask or data->emoji must be already set.
 void ValidateBackgroundEmoji(
-	DocumentId backgroundEmojiId,
 	not_null<Ui::BackgroundEmojiData*> data,
 	not_null<Ui::BackgroundEmojiCache*> cache,
 	not_null<Ui::Text::QuotePaintCache*> quote);
@@ -44,12 +45,18 @@ void ValidateBackgroundEmoji(
 	DocumentId backgroundEmojiId,
 	Fn<void()> repaint)
 -> std::unique_ptr<Ui::Text::CustomEmoji>;
+[[nodiscard]] auto CreateBackgroundGiftInstance(
+	not_null<Data::Session*> owner,
+	DocumentId giftEmojiId,
+	Fn<void()> repaint)
+-> std::unique_ptr<Ui::Text::CustomEmoji>;
 
 void FillBackgroundEmoji(
 	QPainter &p,
 	const QRect &rect,
 	bool quote,
-	const Ui::BackgroundEmojiCache &cache);
+	const Ui::BackgroundEmojiCache &cache,
+	const QImage &firstGiftFrame);
 
 class Reply final : public RuntimeComponent<Reply, Element> {
 public:
@@ -99,18 +106,11 @@ class Reply final : public RuntimeComponent<Reply, Element> {
 		return _link;
 	}
 
-	[[nodiscard]] static TextWithEntities PeerEmoji(
-		not_null<History*> history,
-		PeerData *peer);
-	[[nodiscard]] static TextWithEntities PeerEmoji(
-		not_null<Data::Session*> owner,
-		PeerData *peer);
-	[[nodiscard]] static TextWithEntities ForwardEmoji(
-		not_null<Data::Session*> owner);
+	[[nodiscard]] static TextWithEntities PeerEmoji(PeerData *peer);
 	[[nodiscard]] static TextWithEntities ComposePreviewName(
 		not_null<History*> history,
 		not_null<HistoryItem*> to,
-		bool quote);
+		const FullReplyTo &replyTo);
 
 private:
 	[[nodiscard]] Ui::Text::GeometryDescriptor textGeometry(
@@ -139,8 +139,9 @@ class Reply final : public RuntimeComponent<Reply, Element> {
 	mutable PeerData *_externalSender = nullptr;
 	mutable PeerData *_colorPeer = nullptr;
 	mutable struct {
-		mutable std::unique_ptr<Ui::RippleAnimation> animation;
+		std::unique_ptr<Ui::RippleAnimation> animation;
 		QPoint lastPoint;
+		QPoint lastPaintedPoint;
 	} _ripple;
 	mutable Ui::Text::String _name;
 	mutable Ui::Text::String _text;
@@ -151,7 +152,6 @@ class Reply final : public RuntimeComponent<Reply, Element> {
 	mutable int _nameVersion = 0;
 	uint8 _hiddenSenderColorIndexPlusOne : 7 = 0;
 	uint8 _hasQuoteIcon : 1 = 0;
-	uint8 _replyToStory : 1 = 0;
 	uint8 _expanded : 1 = 0;
 	mutable uint8 _expandable : 1 = 0;
 	mutable uint8 _minHeightExpandable : 1 = 0;
diff --git a/Telegram/SourceFiles/history/view/history_view_reply_button.cpp b/Telegram/SourceFiles/history/view/history_view_reply_button.cpp
new file mode 100644
index 00000000000000..834995b2933132
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_reply_button.cpp
@@ -0,0 +1,395 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_reply_button.h"
+
+#include "history/view/history_view_cursor_state.h"
+#include "ui/chat/chat_style.h"
+#include "ui/effects/ripple_animation.h"
+#include "lang/lang_keys.h"
+#include "styles/style_chat.h"
+#include "styles/style_widgets.h"
+
+namespace HistoryView::ReplyButton {
+namespace {
+
+constexpr auto kToggleDuration = crl::time(120);
+constexpr auto kButtonShowDelay = crl::time(0);
+constexpr auto kButtonHideDelay = crl::time(300);
+
+[[nodiscard]] float64 ScaleForState(ButtonState state) {
+	switch (state) {
+	case ButtonState::Hidden: return 0.;
+	case ButtonState::Shown:
+	case ButtonState::Active:
+	case ButtonState::Inside: return 1.;
+	}
+	Unexpected("State in ReplyButton::ScaleForState.");
+}
+
+[[nodiscard]] float64 OpacityForScale(float64 scale) {
+	return scale;
+}
+
+[[nodiscard]] QSize ComputeInnerSize() {
+	return QSize(ComputeInnerWidth(), st::replyCornerHeight);
+}
+
+[[nodiscard]] QSize ComputeOuterSize() {
+	return QRect(
+		QPoint(),
+		ComputeInnerSize()
+	).marginsAdded(st::replyCornerShadow).size();
+}
+
+} // namespace
+
+int ComputeInnerWidth() {
+	struct Cached {
+		QString text;
+		int result = 0;
+	};
+	static auto cached = Cached();
+	const auto &text = tr::lng_fast_reply(tr::now);
+	if (cached.text != text) {
+		const auto &padding = st::replyCornerTextPadding;
+		const auto textWidth = st::msgDateTextStyle.font->width(text);
+		cached.result = padding.left() + textWidth + padding.right();
+		cached.text = text;
+	}
+	return cached.result;
+}
+
+Button::Button(
+	Fn<void(QRect)> update,
+	ButtonParameters parameters,
+	Fn<void()> hide,
+	QSize outer)
+: _update(std::move(update))
+, _finalScale(ScaleForState(_state))
+, _collapsed(QPoint(), outer)
+, _geometry(_collapsed)
+, _hideTimer(hide) {
+	applyParameters(parameters, nullptr);
+}
+
+Button::~Button() = default;
+
+bool Button::isHidden() const {
+	return (_state == ButtonState::Hidden)
+		&& !_opacityAnimation.animating();
+}
+
+QRect Button::geometry() const {
+	return _geometry;
+}
+
+float64 Button::currentScale() const {
+	return _scaleAnimation.value(_finalScale);
+}
+
+float64 Button::currentOpacity() const {
+	return _opacityAnimation.value(
+		OpacityForScale(ScaleForState(_state)));
+}
+
+void Button::applyParameters(ButtonParameters parameters) {
+	applyParameters(std::move(parameters), _update);
+}
+
+void Button::applyParameters(
+		ButtonParameters parameters,
+		Fn<void(QRect)> update) {
+	const auto shift = parameters.center - _collapsed.center();
+	_collapsed = _collapsed.translated(shift);
+	updateGeometry(update);
+	applyState(ButtonState::Shown, update);
+	if (parameters.outside) {
+		_hideTimer.callOnce(kButtonHideDelay);
+	} else {
+		_hideTimer.cancel();
+	}
+}
+
+void Button::updateGeometry(Fn<void(QRect)> update) {
+	if (_geometry != _collapsed) {
+		if (update) {
+			update(_geometry);
+		}
+		_geometry = _collapsed;
+		if (update) {
+			update(_geometry);
+		}
+	}
+}
+
+void Button::applyState(ButtonState state) {
+	applyState(state, _update);
+}
+
+void Button::applyState(ButtonState state, Fn<void(QRect)> update) {
+	if (state == ButtonState::Hidden) {
+		_hideTimer.cancel();
+	}
+	updateGeometry(update);
+	if (_state == state) {
+		return;
+	}
+	const auto finalScale = ScaleForState(state);
+	_opacityAnimation.start(
+		[=] { _update(_geometry); },
+		OpacityForScale(ScaleForState(_state)),
+		OpacityForScale(ScaleForState(state)),
+		kToggleDuration,
+		anim::sineInOut);
+	if (state != ButtonState::Hidden && _finalScale != finalScale) {
+		_scaleAnimation.start(
+			[=] { _update(_geometry); },
+			_finalScale,
+			finalScale,
+			kToggleDuration,
+			anim::sineInOut);
+		_finalScale = finalScale;
+	}
+	_state = state;
+}
+
+Manager::Manager(Fn<void(QRect)> buttonUpdate)
+: _outer(ComputeOuterSize())
+, _inner(QRect(QPoint(), ComputeInnerSize()))
+, _cachedRound(
+	ComputeInnerSize(),
+	st::replyCornerShadow,
+	ComputeInnerSize().height())
+, _buttonShowTimer([=] { showButtonDelayed(); })
+, _buttonUpdate(std::move(buttonUpdate))
+, _text(st::msgDateTextStyle.font->width(tr::lng_fast_reply(tr::now))) {
+	_text.setText(st::msgDateTextStyle, tr::lng_fast_reply(tr::now));
+	_inner.translate(
+		QRect(QPoint(), _outer).center() - _inner.center());
+}
+
+Manager::~Manager() = default;
+
+void Manager::updateButton(ButtonParameters parameters) {
+	const auto contextChanged = (_buttonContext != parameters.context);
+	if (contextChanged) {
+		if (_button) {
+			_button->applyState(ButtonState::Hidden);
+			_buttonHiding.push_back(std::move(_button));
+		}
+		_buttonShowTimer.cancel();
+		_scheduledParameters = std::nullopt;
+		_ripple = nullptr;
+	}
+	_buttonContext = parameters.context;
+	_lastPointer = parameters.pointer;
+	if (parameters.link) {
+		_link = parameters.link;
+	}
+	if (!_buttonContext) {
+		return;
+	} else if (_button) {
+		_button->applyParameters(parameters);
+		return;
+	} else if (parameters.outside) {
+		_buttonShowTimer.cancel();
+		_scheduledParameters = std::nullopt;
+		return;
+	}
+	const auto globalPositionChanged = _scheduledParameters
+		&& (_scheduledParameters->globalPointer
+			!= parameters.globalPointer);
+	const auto positionChanged = _scheduledParameters
+		&& (_scheduledParameters->pointer != parameters.pointer);
+	_scheduledParameters = parameters;
+	if ((_buttonShowTimer.isActive() && positionChanged)
+		|| globalPositionChanged) {
+		_buttonShowTimer.callOnce(kButtonShowDelay);
+	}
+}
+
+void Manager::showButtonDelayed() {
+	clearAppearAnimations();
+	_button = std::make_unique<Button>(
+		_buttonUpdate,
+		*_scheduledParameters,
+		[=] { updateButton({}); },
+		_outer);
+}
+
+void Manager::paint(QPainter &p, const PaintContext &context) {
+	removeStaleButtons();
+	for (const auto &button : _buttonHiding) {
+		paintButton(p, context, button.get());
+	}
+	if (const auto current = _button.get()) {
+		if (context.gestureHorizontal.ratio) {
+			current->applyState(ButtonState::Hidden);
+			_buttonHiding.push_back(std::move(_button));
+		}
+		paintButton(p, context, current);
+	}
+}
+
+void Manager::paintButton(
+		QPainter &p,
+		const PaintContext &context,
+		not_null<Button*> button) {
+	const auto geometry = button->geometry();
+	if (!context.clip.intersects(geometry)) {
+		return;
+	}
+	constexpr auto kFramesCount = Ui::RoundAreaWithShadow::kFramesCount;
+	const auto scale = button->currentScale();
+	const auto scaleMin = ScaleForState(ButtonState::Hidden);
+	const auto scaleMax = ScaleForState(ButtonState::Shown);
+	const auto progress = (scale - scaleMin) / (scaleMax - scaleMin);
+	const auto frame = int(
+		base::SafeRound(progress * (kFramesCount - 1)));
+	const auto useScale = scaleMin
+		+ (frame / float64(kFramesCount - 1))
+			* (scaleMax - scaleMin);
+	paintButton(p, context, button, frame, useScale);
+}
+
+void Manager::paintButton(
+		QPainter &p,
+		const PaintContext &context,
+		not_null<Button*> button,
+		int frameIndex,
+		float64 scale) {
+	const auto opacity = button->currentOpacity();
+	if (opacity == 0.) {
+		return;
+	}
+	const auto geometry = button->geometry();
+	const auto position = geometry.topLeft();
+	if (opacity != 1.) {
+		p.setOpacity(opacity);
+	}
+	const auto shadow = context.st->shadowFg()->c;
+	const auto background = context.st->windowBg()->c;
+	_cachedRound.setShadowColor(shadow);
+	_cachedRound.setBackgroundColor(background);
+	const auto radius = _inner.height() / 2.;
+	const auto frame = _cachedRound.validateFrame(
+		frameIndex,
+		scale,
+		radius);
+	p.drawImage(position, *frame.image, frame.rect);
+
+	if (_ripple && !_ripple->empty() && _button && button == _button.get()) {
+		const auto color = context.st->windowBgOver()->c;
+		_ripple->paint(
+			p,
+			position.x() + _inner.x(),
+			position.y() + _inner.y(),
+			_inner.width(),
+			&color);
+		if (_ripple->empty()) {
+			_ripple.reset();
+		}
+	}
+
+	const auto textLeft = position.x()
+		+ _inner.x()
+		+ st::replyCornerTextPadding.left();
+	const auto textTop = position.y()
+		+ _inner.y()
+		+ (_inner.height() - st::msgDateTextStyle.font->height) / 2;
+	const auto &incomingStyle = context.st->messageStyle(false, false);
+	p.setPen(incomingStyle.msgDateFg);
+	p.setFont(st::msgDateTextStyle.font);
+	_text.draw(p, {
+		.position = QPoint(textLeft, textTop),
+		.availableWidth = _text.maxWidth(),
+	});
+	if (opacity != 1.) {
+		p.setOpacity(1.);
+	}
+}
+
+TextState Manager::buttonTextState(QPoint position) const {
+	if (overCurrentButton(position)) {
+		auto result = TextState(nullptr, _link);
+		result.itemId = _buttonContext;
+		return result;
+	}
+	return {};
+}
+
+bool Manager::overCurrentButton(QPoint position) const {
+	if (!_button) {
+		return false;
+	}
+	return buttonInner().contains(position);
+}
+
+QMargins Manager::innerMargins() const {
+	return {
+		_inner.x(),
+		_inner.y(),
+		_outer.width() - _inner.x() - _inner.width(),
+		_outer.height() - _inner.y() - _inner.height(),
+	};
+}
+
+QRect Manager::buttonInner() const {
+	return buttonInner(_button.get());
+}
+
+QRect Manager::buttonInner(not_null<Button*> button) const {
+	return button->geometry().marginsRemoved(innerMargins());
+}
+
+void Manager::remove(FullMsgId context) {
+	if (_buttonContext == context) {
+		_buttonContext = {};
+		_button = nullptr;
+		_ripple = nullptr;
+	}
+}
+
+void Manager::clickHandlerPressedChanged(
+		const ClickHandlerPtr &action,
+		bool pressed) {
+	if (action != _link || !_button) {
+		return;
+	}
+	if (pressed) {
+		const auto inner = buttonInner();
+		if (!_ripple) {
+			const auto mask = Ui::RippleAnimation::RoundRectMask(
+				inner.size(),
+				inner.height() / 2);
+			_ripple = std::make_unique<Ui::RippleAnimation>(
+				st::defaultRippleAnimation,
+				mask,
+				[=] { if (_button) _buttonUpdate(_button->geometry()); });
+		}
+		_ripple->add(_lastPointer - inner.topLeft());
+	} else if (_ripple) {
+		_ripple->lastStop();
+	}
+}
+
+void Manager::removeStaleButtons() {
+	_buttonHiding.erase(
+		ranges::remove_if(_buttonHiding, &Button::isHidden),
+		end(_buttonHiding));
+}
+
+void Manager::clearAppearAnimations() {
+	for (const auto &button : base::take(_buttonHiding)) {
+		if (!button->isHidden()) {
+			button->repaint();
+		}
+	}
+}
+
+} // namespace HistoryView::ReplyButton
diff --git a/Telegram/SourceFiles/history/view/history_view_reply_button.h b/Telegram/SourceFiles/history/view/history_view_reply_button.h
new file mode 100644
index 00000000000000..77223a467f6a59
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_reply_button.h
@@ -0,0 +1,152 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "base/weak_ptr.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/round_area_with_shadow.h"
+#include "ui/text/text.h"
+
+namespace Ui {
+class RippleAnimation;
+struct ChatPaintContext;
+} // namespace Ui
+
+namespace HistoryView {
+using PaintContext = Ui::ChatPaintContext;
+struct TextState;
+} // namespace HistoryView
+
+namespace HistoryView::ReplyButton {
+
+struct ButtonParameters {
+	[[nodiscard]] ButtonParameters translated(QPoint delta) const {
+		auto result = *this;
+		result.center += delta;
+		result.pointer += delta;
+		return result;
+	}
+
+	FullMsgId context;
+	QPoint center;
+	QPoint pointer;
+	QPoint globalPointer;
+	ClickHandlerPtr link;
+	int visibleTop = 0;
+	int visibleBottom = 0;
+	bool outside = false;
+};
+
+[[nodiscard]] int ComputeInnerWidth();
+
+enum class ButtonState {
+	Hidden,
+	Shown,
+	Active,
+	Inside,
+};
+
+class Button final {
+public:
+	Button(
+		Fn<void(QRect)> update,
+		ButtonParameters parameters,
+		Fn<void()> hide,
+		QSize outer);
+	~Button();
+
+	void applyParameters(ButtonParameters parameters);
+	void applyState(ButtonState state);
+
+	[[nodiscard]] bool isHidden() const;
+	[[nodiscard]] QRect geometry() const;
+	[[nodiscard]] float64 currentScale() const;
+	[[nodiscard]] float64 currentOpacity() const;
+
+	void repaint() const {
+		_update(_geometry);
+	}
+
+private:
+	void updateGeometry(Fn<void(QRect)> update);
+	void applyState(ButtonState state, Fn<void(QRect)> update);
+	void applyParameters(
+		ButtonParameters parameters,
+		Fn<void(QRect)> update);
+
+	const Fn<void(QRect)> _update;
+
+	ButtonState _state = ButtonState::Hidden;
+	float64 _finalScale = 0.;
+	Ui::Animations::Simple _scaleAnimation;
+	Ui::Animations::Simple _opacityAnimation;
+
+	QRect _collapsed;
+	QRect _geometry;
+
+	base::Timer _hideTimer;
+
+};
+
+class Manager final
+	: public base::has_weak_ptr
+	, public ClickHandlerHost {
+public:
+	Manager(Fn<void(QRect)> buttonUpdate);
+	~Manager();
+
+	void updateButton(ButtonParameters parameters);
+	void paint(QPainter &p, const PaintContext &context);
+	[[nodiscard]] TextState buttonTextState(QPoint position) const;
+	void remove(FullMsgId context);
+
+protected:
+	void clickHandlerPressedChanged(
+		const ClickHandlerPtr &action,
+		bool pressed) override;
+
+private:
+	void showButtonDelayed();
+	[[nodiscard]] bool overCurrentButton(QPoint position) const;
+	void paintButton(
+		QPainter &p,
+		const PaintContext &context,
+		not_null<Button*> button);
+	void paintButton(
+		QPainter &p,
+		const PaintContext &context,
+		not_null<Button*> button,
+		int frame,
+		float64 scale);
+	void removeStaleButtons();
+	void clearAppearAnimations();
+	[[nodiscard]] QMargins innerMargins() const;
+	[[nodiscard]] QRect buttonInner() const;
+	[[nodiscard]] QRect buttonInner(not_null<Button*> button) const;
+
+	QSize _outer;
+	QRect _inner;
+	Ui::RoundAreaWithShadow _cachedRound;
+
+	ClickHandlerPtr _link;
+	FullMsgId _buttonContext;
+
+	std::optional<ButtonParameters> _scheduledParameters;
+	base::Timer _buttonShowTimer;
+	const Fn<void(QRect)> _buttonUpdate;
+	std::unique_ptr<Button> _button;
+	std::vector<std::unique_ptr<Button>> _buttonHiding;
+
+	Ui::Text::String _text;
+	std::unique_ptr<Ui::RippleAnimation> _ripple;
+	QPoint _lastPointer;
+
+};
+
+} // namespace HistoryView::ReplyButton
diff --git a/Telegram/SourceFiles/history/view/history_view_requests_bar.cpp b/Telegram/SourceFiles/history/view/history_view_requests_bar.cpp
index e10a50b8a7b584..505a3f64ec0d7b 100644
--- a/Telegram/SourceFiles/history/view/history_view_requests_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_requests_bar.cpp
@@ -26,6 +26,8 @@ rpl::producer<Ui::RequestsBarContent> RequestsBarContentByPeer(
 		not_null<PeerData*> peer,
 		int userpicSize,
 		bool showInForum) {
+	Expects(peer->isChat() || peer->isChannel());
+
 	struct State {
 		explicit State(not_null<PeerData*> peer)
 		: peer(peer) {
@@ -109,7 +111,9 @@ rpl::producer<Ui::RequestsBarContent> RequestsBarContentByPeer(
 		auto state = lifetime.make_state<State>(peer);
 
 		const auto pushNext = [=](bool now = false) {
-			if ((!showInForum && peer->isForum())
+			if ((!showInForum
+				&& peer->isForum()
+				&& !peer->useSubsectionTabs())
 				|| (std::min(state->current.count, kRecentRequestsLimit)
 					!= state->users.size())) {
 				return;
@@ -133,7 +137,7 @@ rpl::producer<Ui::RequestsBarContent> RequestsBarContentByPeer(
 				Data::PeerFlagValue(
 					channel,
 					ChannelData::Flag::Forum
-				) | rpl::start_with_next([=](bool hiddenByForum) {
+				) | rpl::on_next([=](bool hiddenByForum) {
 					if (hiddenByForum) {
 						consumer.put_next({});
 					} else {
@@ -146,7 +150,7 @@ rpl::producer<Ui::RequestsBarContent> RequestsBarContentByPeer(
 		peer->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return state->someUserpicsNotLoaded;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			for (const auto &userpic : state->userpics) {
 				if (userpic.peer->userpicUniqueKey(userpic.view)
 					!= userpic.uniqueKey) {
@@ -161,7 +165,7 @@ rpl::producer<Ui::RequestsBarContent> RequestsBarContentByPeer(
 			peer
 		) | rpl::filter([=](int count) {
 			return (state->current.count != count);
-		}) | rpl::start_with_next([=](int count) {
+		}) | rpl::on_next([=](int count) {
 			const auto &requesters = peer->isChat()
 				? peer->asChat()->recentRequesters()
 				: peer->asChannel()->recentRequesters();
diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
index 9ab0af794e97a7..b42c48b1d91268 100644
--- a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
@@ -8,22 +8,44 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_schedule_box.h"
 
 #include "api/api_common.h"
+#include "chat_helpers/compose/compose_show.h"
 #include "data/data_peer.h"
+#include "data/data_peer_values.h"
 #include "data/data_user.h"
 #include "lang/lang_keys.h"
 #include "base/event_filter.h"
 #include "base/qt/qt_key_modifiers.h"
 #include "base/unixtime.h"
+#include "lottie/lottie_icon.h"
+#include "ui/controls/warning_tooltip.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/layers/generic_box.h"
+#include "ui/rect.h"
+#include "ui/text/text_utilities.h"
+#include "ui/ui_utility.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/wrap/padding_wrap.h"
+#include "main/main_session.h"
 #include "menu/menu_send.h"
+#include "settings/sections/settings_premium.h"
+#include "styles/style_boxes.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_chat.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_widgets.h"
+
+namespace HistoryView::details {
+
+not_null<Main::Session*> SessionFromShow(
+		const std::shared_ptr<ChatHelpers::Show> &show) {
+	return &show->session();
+}
+
+} // namespace HistoryView::details
 
 namespace HistoryView {
 namespace {
@@ -46,6 +68,136 @@ void FillSendUntilOnlineMenu(
 	});
 }
 
+constexpr auto kNotifyRestFrame = 40;
+constexpr auto kNotifyLastFrame = 80;
+constexpr auto kNotifyTooltipDuration = crl::time(5000);
+
+class NotifyToggleButton final : public Ui::RippleButton {
+public:
+	NotifyToggleButton(
+		QWidget *parent,
+		not_null<Ui::GenericBox*> box,
+		const style::IconButton &st,
+		std::shared_ptr<bool> silent);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+private:
+	void toggle();
+	[[nodiscard]] QRect rippleArea() const;
+
+	const style::IconButton &_st;
+	const not_null<Ui::GenericBox*> _box;
+	const std::shared_ptr<bool> _silent;
+	const std::unique_ptr<Lottie::Icon> _icon;
+	Ui::WarningTooltip _tooltip;
+
+};
+
+NotifyToggleButton::NotifyToggleButton(
+	QWidget *parent,
+	not_null<Ui::GenericBox*> box,
+	const style::IconButton &st,
+	std::shared_ptr<bool> silent)
+: RippleButton(parent, st.ripple)
+, _st(st)
+, _box(box)
+, _silent(std::move(silent))
+, _icon(Lottie::MakeIcon({
+	.path = u":/icons/notify_toggle.lottie"_q,
+	.color = &st::boxTitleCloseFg,
+	.sizeOverride = Size(st::scheduleNotifyIconSize),
+	.frame = kNotifyRestFrame,
+})) {
+	resize(_st.width, _st.height);
+	setPointerCursor(true);
+	setAccessibleName(tr::lng_send_silent_message(tr::now));
+
+	clicks(
+	) | rpl::on_next([=] { toggle(); }, lifetime());
+}
+
+void NotifyToggleButton::toggle() {
+	const auto silent = !*_silent;
+	*_silent = silent;
+	_icon->animate(
+		[=] { update(); },
+		silent ? kNotifyRestFrame : 0,
+		silent ? kNotifyLastFrame : kNotifyRestFrame);
+	update();
+
+	const auto outer = _box->getDelegate()->outerContainer();
+	if (!outer) {
+		return;
+	}
+	const auto parent = static_cast<Ui::RpWidget*>(outer.data());
+	const auto button = this;
+	_tooltip.show({
+		.parent = parent,
+		.target = button,
+		.text = rpl::single(TextWithEntities{ silent
+			? tr::lng_schedule_notify_off(tr::now)
+			: tr::lng_schedule_notify_on(tr::now) }),
+		.side = RectPart::Top | RectPart::Left,
+		.countPosition = [=](QSize size) {
+			const auto area = Ui::MapFrom(parent, button, button->rect());
+			const auto &tip = st::defaultImportantTooltip;
+			const auto middle = rect::center(area).x();
+			auto left = middle + tip.arrowSkip - size.width();
+			left = std::min(
+				left,
+				parent->width() - tip.margin.right() - size.width());
+			left = std::max(left, tip.margin.left());
+			left = std::max(
+				left,
+				middle + tip.arrow + tip.arrowSkipMin - size.width());
+			left = std::min(left, middle - tip.arrow - tip.arrowSkipMin);
+			return QPoint(
+				left,
+				area.y() - size.height() + st::scheduleNotifyTooltipShift);
+		},
+		.duration = kNotifyTooltipDuration,
+	});
+}
+
+QRect NotifyToggleButton::rippleArea() const {
+	const auto size = Size(_st.rippleAreaSize);
+	return QRect(
+		QPoint(
+			(_st.width - size.width()) / 2,
+			(_st.height - size.height()) / 2),
+		size);
+}
+
+void NotifyToggleButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	const auto area = rippleArea();
+	paintRipple(p, area.topLeft());
+	_icon->paintInCenter(
+		p,
+		area,
+		(isOver()
+			? st::boxTitleCloseFgOver
+			: st::boxTitleCloseFg)->c);
+}
+
+QImage NotifyToggleButton::prepareRippleMask() const {
+	return Ui::RippleAnimation::EllipseMask(Size(_st.rippleAreaSize));
+}
+
+QPoint NotifyToggleButton::prepareRippleStartPosition() const {
+	const auto result = mapFromGlobal(QCursor::pos())
+		- rippleArea().topLeft();
+	const auto area = Rect(Size(_st.rippleAreaSize));
+	return area.contains(result)
+		? result
+		: DisabledRippleStartPosition();
+}
+
 } // namespace
 
 ScheduleBoxStyleArgs::ScheduleBoxStyleArgs()
@@ -62,27 +214,36 @@ bool CanScheduleUntilOnline(not_null<PeerData*> peer) {
 	if (const auto user = peer->asUser()) {
 		return !user->isSelf()
 			&& !user->isBot()
-			&& !user->lastseen().isHidden();
+			&& !user->lastseen().isHidden()
+			&& !user->starsPerMessageChecked()
+			&& !user->isNotificationsUser();
 	}
 	return false;
 }
 
 void ScheduleBox(
 		not_null<Ui::GenericBox*> box,
-		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<Main::Session*> session,
+		std::shared_ptr<ChatHelpers::Show> maybeShow,
 		const Api::SendOptions &initialOptions,
 		const SendMenu::Details &details,
 		Fn<void(Api::SendOptions)> done,
 		TimeId time,
 		ScheduleBoxStyleArgs style) {
+	const auto repeat = std::make_shared<TimeId>(
+		initialOptions.scheduleRepeatPeriod);
+	const auto silent = std::make_shared<bool>(false);
 	const auto submit = [=](Api::SendOptions options) {
 		if (!options.scheduled) {
 			return;
 		}
 		// Pro tip: Hold Ctrl key to send a silent scheduled message!
-		if (base::IsCtrlPressed()) {
+		if (base::IsCtrlPressed() || *silent) {
 			options.silent = true;
 		}
+		if (repeat) {
+			options.scheduleRepeatPeriod = *repeat;
+		}
 		const auto copy = done;
 		box->closeBox();
 		copy(options);
@@ -102,6 +263,42 @@ void ScheduleBox(
 		.style = style.chooseDateTimeArgs,
 	});
 
+	if (repeat) {
+		const auto boxShow = box->uiShow();
+		const auto showPremiumPromo = [=] {
+			if (session->premium()) {
+				return false;
+			}
+			Settings::ShowPremiumPromoToast(
+				Main::MakeSessionShow(boxShow, session),
+				ChatHelpers::ResolveWindowDefault(),
+				tr::lng_schedule_repeat_promo(
+					tr::now,
+					lt_link,
+					tr::link(
+						tr::bold(
+							tr::lng_schedule_repeat_promo_link(tr::now))),
+					tr::rich),
+				u"schedule_repeat"_q);
+			return true;
+		};
+		auto locked = Data::AmPremiumValue(
+			session
+		) | rpl::map([=](bool premium) {
+			return !premium;
+		});
+		const auto row = box->addRow(Ui::ChooseRepeatPeriod(box, {
+			.value = session->premium() ? *repeat : TimeId(),
+			.locked = std::move(locked),
+			.filter = showPremiumPromo,
+			.changed = [=](TimeId value) { *repeat = value; },
+			.test = session->isTestMode(),
+		}), st::scheduleRepeatMargin, style::al_top);
+		std::move(descriptor.width) | rpl::on_next([=](int width) {
+			row->setNaturalWidth(width);
+		}, row->lifetime());
+	}
+
 	using namespace SendMenu;
 	const auto childType = (details.type == Type::Disabled)
 		? Type::Disabled
@@ -124,7 +321,7 @@ void ScheduleBox(
 	});
 	SetupMenuAndShortcuts(
 		descriptor.submit.data(),
-		show,
+		maybeShow,
 		[=] { return childDetails; },
 		sendAction);
 
@@ -136,6 +333,12 @@ void ScheduleBox(
 			[=] { submit(with(timestamp)); },
 			style);
 	}
+
+	box->addTopButton(object_ptr<NotifyToggleButton>(
+		box,
+		box,
+		*style.topButtonStyle,
+		silent));
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.h b/Telegram/SourceFiles/history/view/history_view_schedule_box.h
index 5f5385c73e584d..aa97de8344cc82 100644
--- a/Telegram/SourceFiles/history/view/history_view_schedule_box.h
+++ b/Telegram/SourceFiles/history/view/history_view_schedule_box.h
@@ -23,6 +23,13 @@ namespace SendMenu {
 struct Details;
 } // namespace SendMenu
 
+namespace HistoryView::details {
+
+[[nodiscard]] not_null<Main::Session*> SessionFromShow(
+	const std::shared_ptr<ChatHelpers::Show> &show);
+
+} // namespace HistoryView::details
+
 namespace HistoryView {
 
 [[nodiscard]] TimeId DefaultScheduleTime();
@@ -37,7 +44,8 @@ struct ScheduleBoxStyleArgs {
 
 void ScheduleBox(
 	not_null<Ui::GenericBox*> box,
-	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<Main::Session*> session,
+	std::shared_ptr<ChatHelpers::Show> maybeShow,
 	const Api::SendOptions &initialOptions,
 	const SendMenu::Details &details,
 	Fn<void(Api::SendOptions)> done,
@@ -53,8 +61,10 @@ template <typename Guard, typename Submit>
 		const Api::SendOptions &initialOptions = {},
 		TimeId scheduleTime = DefaultScheduleTime(),
 		ScheduleBoxStyleArgs style = ScheduleBoxStyleArgs()) {
+	const auto session = details::SessionFromShow(show);
 	return Box(
 		ScheduleBox,
+		session,
 		std::move(show),
 		initialOptions,
 		details,
@@ -63,4 +73,24 @@ template <typename Guard, typename Submit>
 		std::move(style));
 }
 
+template <typename Guard, typename Submit>
+[[nodiscard]] object_ptr<Ui::GenericBox> PrepareScheduleBox(
+		Guard &&guard,
+		not_null<Main::Session*> session,
+		const SendMenu::Details &details,
+		Submit &&submit,
+		const Api::SendOptions &initialOptions = {},
+		TimeId scheduleTime = DefaultScheduleTime(),
+		ScheduleBoxStyleArgs style = ScheduleBoxStyleArgs()) {
+	return Box(
+		ScheduleBox,
+		session,
+		nullptr,
+		initialOptions,
+		details,
+		crl::guard(std::forward<Guard>(guard), std::forward<Submit>(submit)),
+		scheduleTime,
+		std::move(style));
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index cb5352f0b8e657..cc6c7c952d332b 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -12,14 +12,21 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_top_bar_widget.h"
 #include "history/view/history_view_schedule_box.h"
 #include "history/view/history_view_sticker_toast.h"
+#include "data/data_chat_participant_status.h"
 #include "history/history.h"
 #include "history/history_drag_area.h"
-#include "history/history_item_helpers.h" // GetErrorTextForSending.
+#include "history/history_item_helpers.h" // GetErrorForSending.
+#include "history/history_view_swipe_back_session.h"
 #include "menu/menu_send.h" // SendMenu::Type.
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/tooltip.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
 #include "ui/chat/chat_style.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
 #include "ui/ui_utility.h"
 #include "api/api_editing.h"
 #include "api/api_sending.h"
@@ -34,7 +41,11 @@ For license and copyright information please follow this link:
 #include "core/mime_type.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "main/main_session.h"
+#include "mainwindow.h"
+#include "data/components/recent_inline_bots.h"
 #include "data/components/scheduled_messages.h"
+#include "data/data_document.h"
+#include "data/data_file_origin.h"
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
 #include "data/data_session.h"
@@ -55,12 +66,47 @@ For license and copyright information please follow this link:
 #include <QtCore/QMimeData>
 
 namespace HistoryView {
+namespace {
 
-ScheduledMemento::ScheduledMemento(not_null<History*> history)
+constexpr auto kVideoProcessingInfoDuration = 4 * crl::time(1000);
+
+[[nodiscard]] DocumentData *FindVideoFile(not_null<HistoryItem*> item) {
+	const auto fromItem = [](not_null<HistoryItem*> item) {
+		if (const auto media = item->media()) {
+			if (const auto document = media->document()) {
+				if (document->isVideoFile()) {
+					return document;
+				}
+			}
+		}
+		return (DocumentData*)nullptr;
+	};
+	if (const auto group = item->history()->owner().groups().find(item)) {
+		for (const auto &entry : group->items) {
+			if (const auto result = fromItem(entry)) {
+				return result;
+			}
+		}
+	} else if (const auto result = fromItem(item)) {
+		return result;
+	}
+	return nullptr;
+}
+
+} // namespace
+
+ScheduledMemento::ScheduledMemento(
+	not_null<History*> history,
+	MsgId sentToScheduledId)
 : _history(history)
-, _forumTopic(nullptr) {
+, _forumTopic(nullptr)
+, _sentToScheduledId(sentToScheduledId) {
 	const auto list = _history->session().scheduledMessages().list(_history);
-	if (!list.ids.empty()) {
+	if (sentToScheduledId) {
+		_list.setScrollTopState({
+			.item = { .fullId = { _history->peer->id, sentToScheduledId } },
+		});
+	} else if (!list.ids.empty()) {
 		_list.setScrollTopState({ .item = { .fullId = list.ids.front() } });
 	}
 }
@@ -71,15 +117,15 @@ ScheduledMemento::ScheduledMemento(not_null<Data::ForumTopic*> forumTopic)
 	const auto list = _history->session().scheduledMessages().list(
 		_forumTopic);
 	if (!list.ids.empty()) {
-		_list.setScrollTopState({ .item = { .fullId = list.ids.front() } });
+		_list.setScrollTopState({ .item = {.fullId = list.ids.front() } });
 	}
 }
 
 object_ptr<Window::SectionWidget> ScheduledMemento::createWidget(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		Window::Column column,
-		const QRect &geometry) {
+	QWidget *parent,
+	not_null<Window::SessionController*> controller,
+	Window::Column column,
+	const QRect &geometry) {
 	if (column == Window::Column::Third) {
 		return nullptr;
 	}
@@ -121,18 +167,18 @@ ScheduledWidget::ScheduledWidget(
 		.stickerOrEmojiChosen = controller->stickerOrEmojiChosen(),
 	}))
 , _cornerButtons(
-		_scroll.data(),
-		controller->chatStyle(),
-		static_cast<HistoryView::CornerButtonsDelegate*>(this)) {
+	_scroll.data(),
+	controller->chatStyle(),
+	static_cast<HistoryView::CornerButtonsDelegate*>(this)) {
 	controller->chatStyle()->paletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_scroll->updateBars();
 	}, _scroll->lifetime());
 
 	Window::ChatThemeValueFromPeer(
 		controller,
 		history->peer
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
 		_theme = std::move(theme);
 		controller->setChatStyleTheme(_theme);
 	}, lifetime());
@@ -143,28 +189,28 @@ ScheduledWidget::ScheduledWidget(
 	};
 	_topBar->setActiveChat(state, nullptr);
 	_composeControls->setCurrentDialogsEntryState(state);
-	controller->setCurrentDialogsEntryState(state);
+	controller->setDialogsEntryState(state);
 
 	_topBar->move(0, 0);
 	_topBar->resizeToWidth(width());
 	_topBar->show();
 
 	_topBar->sendNowSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmSendNowSelected();
 	}, _topBar->lifetime());
 	_topBar->deleteSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		confirmDeleteSelected();
 	}, _topBar->lifetime());
 	_topBar->clearSelectionRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		clearSelected();
 	}, _topBar->lifetime());
 
 	_topBarShadow->raise();
 	controller->adaptive().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateAdaptiveLayout();
 	}, lifetime());
 
@@ -175,18 +221,20 @@ ScheduledWidget::ScheduledWidget(
 	_scroll->move(0, _topBar->height());
 	_scroll->show();
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		onScroll();
 	}, lifetime());
 
 	_inner->editMessageRequested(
-	) | rpl::start_with_next([=](auto fullId) {
+	) | rpl::on_next([=](auto fullId) {
 		if (const auto item = session().data().message(fullId)) {
 			const auto media = item->media();
 			if (!media || media->webpage() || media->allowsEditCaption()) {
 				_composeControls->editMessage(
 					fullId,
 					_inner->getSelectedTextRange(item));
+			} else if (media->todolist()) {
+				Window::PeerMenuEditTodoList(controller, item);
 			}
 		}
 	}, _inner->lifetime());
@@ -196,12 +244,13 @@ ScheduledWidget::ScheduledWidget(
 			_inner,
 			controller->chatStyle(),
 			st::msgServicePadding);
-		const auto emptyText = Ui::Text::Semibold(
+		const auto emptyText = tr::semibold(
 			tr::lng_scheduled_messages_empty(tr::now));
 		emptyInfo->setText(emptyText);
 		_inner->setEmptyInfoWidget(std::move(emptyInfo));
 	}
 	setupComposeControls();
+	Window::SetupSwipeBackSection(this, _scroll, _inner);
 }
 
 ScheduledWidget::~ScheduledWidget() = default;
@@ -217,21 +266,28 @@ void ScheduledWidget::setupComposeControls() {
 					&& (update.topic->rootId() == _forumTopic->rootId());
 			}) | rpl::to_empty) | rpl::map([=] {
 				return (!_forumTopic
-						|| _forumTopic->canToggleClosed()
-						|| !_forumTopic->closed())
-					? std::optional<QString>()
+					|| _forumTopic->canToggleClosed()
+					|| !_forumTopic->closed())
+					? Data::SendError()
 					: tr::lng_forum_topic_closed(tr::now);
 			});
 			return rpl::combine(
+				session().frozenValue(),
 				session().changes().peerFlagsValue(
 					_history->peer,
 					Data::PeerUpdate::Flag::Rights),
 				Data::CanSendAnythingValue(_history->peer),
 				std::move(topicWriteRestrictions)
 			) | rpl::map([=](
+					const Main::FreezeInfo &info,
 					auto,
 					auto,
-					std::optional<QString> topicRestriction) {
+					Data::SendError topicRestriction) {
+				if (info) {
+					return Controls::WriteRestriction{
+						.type = Controls::WriteRestrictionType::Frozen,
+					};
+				}
 				const auto allWithoutPolls = Data::AllSendRestrictions()
 					& ~ChatRestriction::SendPolls;
 				const auto canSendAnything = Data::CanSendAnyOf(
@@ -248,20 +304,27 @@ void ScheduledWidget::setupComposeControls() {
 						: tr::lng_group_not_accessible(tr::now))
 					: topicRestriction
 					? std::move(topicRestriction)
-					: std::optional<QString>();
+					: Data::SendError();
 				return text ? Controls::WriteRestriction{
 					.text = std::move(*text),
 					.type = Controls::WriteRestrictionType::Rights,
+					.boostsToLift = text.boostsToLift,
 				} : Controls::WriteRestriction();
-			}) | rpl::type_erased();
+			}) | rpl::type_erased;
 		}()
 		: [&] {
 			return rpl::combine(
+				session().frozenValue(),
 				session().changes().peerFlagsValue(
 					_history->peer,
 					Data::PeerUpdate::Flag::Rights),
 				Data::CanSendAnythingValue(_history->peer)
-			) | rpl::map([=] {
+			) | rpl::map([=](const Main::FreezeInfo &info, auto, auto) {
+				if (info) {
+					return Controls::WriteRestriction{
+						.type = Controls::WriteRestrictionType::Frozen,
+					};
+				}
 				const auto allWithoutPolls = Data::AllSendRestrictions()
 					& ~ChatRestriction::SendPolls;
 				const auto canSendAnything = Data::CanSendAnyOf(
@@ -275,12 +338,13 @@ void ScheduledWidget::setupComposeControls() {
 					? (restriction
 						? restriction
 						: tr::lng_group_not_accessible(tr::now))
-					: std::optional<QString>();
+					: Data::SendError();
 				return text ? Controls::WriteRestriction{
 					.text = std::move(*text),
 					.type = Controls::WriteRestrictionType::Rights,
+					.boostsToLift = text.boostsToLift,
 				} : Controls::WriteRestriction();
-			}) | rpl::type_erased();
+			}) | rpl::type_erased;
 		}();
 	_composeControls->setHistory({
 		.history = _history.get(),
@@ -288,7 +352,7 @@ void ScheduledWidget::setupComposeControls() {
 	});
 
 	_composeControls->height(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto wasMax = (_scroll->scrollTopMax() == _scroll->scrollTop());
 		updateControlsGeometry();
 		if (wasMax) {
@@ -297,32 +361,34 @@ void ScheduledWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		listCancelRequest();
 	}, lifetime());
 
 	_composeControls->sendRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		send();
 	}, lifetime());
 
 	_composeControls->sendVoiceRequests(
-	) | rpl::start_with_next([=](ComposeControls::VoiceToSend &&data) {
-		sendVoice(data.bytes, data.waveform, data.duration);
+	) | rpl::on_next([=](ComposeControls::VoiceToSend &&data) {
+		sendVoice(std::move(data));
 	}, lifetime());
 
 	_composeControls->sendCommandRequests(
-	) | rpl::start_with_next([=](const QString &command) {
+	) | rpl::on_next([=](const QString &command) {
 		listSendBotCommand(command, FullMsgId());
 	}, lifetime());
 
 	const auto saveEditMsgRequestId = lifetime().make_state<mtpRequestId>(0);
 	_composeControls->editRequests(
-	) | rpl::start_with_next([=](auto data) {
+	) | rpl::on_next([=](auto data) {
 		if (const auto item = session().data().message(data.fullId)) {
 			if (item->isScheduled()) {
 				const auto spoiler = data.spoilered;
-				edit(item, data.options, saveEditMsgRequestId, spoiler);
+				auto &options = data.options;
+				options.scheduleRepeatPeriod = item->scheduleRepeatPeriod();
+				edit(item, options, saveEditMsgRequestId, spoiler);
 			}
 		}
 	}, lifetime());
@@ -330,7 +396,7 @@ void ScheduledWidget::setupComposeControls() {
 	_composeControls->attachRequests(
 	) | rpl::filter([=] {
 		return !_choosingAttach;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_choosingAttach = true;
 		base::call_delayed(
 			st::historyAttach.ripple.hideDuration,
@@ -338,8 +404,14 @@ void ScheduledWidget::setupComposeControls() {
 			[=] { _choosingAttach = false; chooseAttach(); });
 	}, lifetime());
 
+	_composeControls->setSendAsFileConfirmed(crl::guard(this, [=](
+			std::shared_ptr<Ui::PreparedBundle> bundle,
+			Api::SendOptions options) {
+		sendingFilesConfirmed(std::move(bundle), options);
+	}));
+
 	_composeControls->fileChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		controller()->hideLayer(anim::type::normal);
 		const auto document = data.document;
 		const auto callback = crl::guard(this, [=](Api::SendOptions options) {
@@ -353,27 +425,23 @@ void ScheduledWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->photoChosen(
-	) | rpl::start_with_next([=](ChatHelpers::PhotoChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::PhotoChosen chosen) {
 		sendExistingPhoto(chosen.photo);
 	}, lifetime());
 
 	_composeControls->inlineResultChosen(
-	) | rpl::start_with_next([=](ChatHelpers::InlineChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::InlineChosen chosen) {
 		sendInlineResult(chosen.result, chosen.bot);
 	}, lifetime());
 
 	_composeControls->jumpToItemRequests(
-	) | rpl::start_with_next([=](FullReplyTo to) {
+	) | rpl::on_next([=](FullReplyTo to) {
 		if (const auto item = session().data().message(to.messageId)) {
 			if (item->isScheduled() && item->history() == _history) {
 				showAtPosition(item->position());
 			} else {
-				JumpToMessageClickHandler(
-					item,
-					{},
-					to.quote,
-					to.quoteOffset
-				)->onClick({});
+				const auto highlight = to.highlight();
+				JumpToMessageClickHandler(item, {}, highlight)->onClick({});
 			}
 		}
 	}, lifetime());
@@ -381,20 +449,20 @@ void ScheduledWidget::setupComposeControls() {
 	rpl::merge(
 		_composeControls->scrollKeyEvents(),
 		_inner->scrollKeyEvents()
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		_scroll->keyPressEvent(e);
 	}, lifetime());
 
 	_composeControls->editLastMessageRequests(
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		if (!_inner->lastMessageEditRequestNotify()) {
 			_scroll->keyPressEvent(e);
 		}
 	}, lifetime());
 
 	_composeControls->setMimeDataHook([=](
-			not_null<const QMimeData*> data,
-			Ui::InputField::MimeAction action) {
+		not_null<const QMimeData*> data,
+		Ui::InputField::MimeAction action) {
 		if (action == Ui::InputField::MimeAction::Check) {
 			return Core::CanSendFiles(data);
 		} else if (action == Ui::InputField::MimeAction::Insert) {
@@ -407,26 +475,26 @@ void ScheduledWidget::setupComposeControls() {
 	});
 
 	_composeControls->lockShowStarts(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_cornerButtons.updateJumpDownVisibility();
 		_cornerButtons.updateUnreadThingsVisibility();
 	}, lifetime());
 
 	_composeControls->viewportEvents(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		_scroll->viewportEvent(e);
 	}, lifetime());
 }
 
 void ScheduledWidget::chooseAttach() {
 	if (const auto error = Data::AnyFileRestrictionError(_history->peer)) {
-		controller()->showToast(*error);
+		Data::ShowSendErrorToast(controller(), _history->peer, error);
 		return;
 	}
 
 	const auto filter = FileDialog::AllOrImagesFilter();
 	FileDialog::GetOpenPaths(this, tr::lng_choose_files(tr::now), filter, crl::guard(this, [=](
-			FileDialog::OpenResult &&result) {
+		FileDialog::OpenResult &&result) {
 		if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
 			return;
 		}
@@ -434,7 +502,7 @@ void ScheduledWidget::chooseAttach() {
 		if (!result.remoteContent.isEmpty()) {
 			auto read = Images::Read({
 				.content = result.remoteContent,
-			});
+				});
 			if (!read.image.isNull() && !read.animated) {
 				confirmSendingFiles(
 					std::move(read.image),
@@ -454,9 +522,9 @@ void ScheduledWidget::chooseAttach() {
 }
 
 bool ScheduledWidget::confirmSendingFiles(
-		not_null<const QMimeData*> data,
-		std::optional<bool> overrideSendImagesAsPhotos,
-		const QString &insertTextOnCancel) {
+	not_null<const QMimeData*> data,
+	std::optional<bool> overrideSendImagesAsPhotos,
+	const QString &insertTextOnCancel) {
 	const auto hasImage = data->hasImage();
 	const auto premium = controller()->session().user()->isPremium();
 
@@ -488,8 +556,8 @@ bool ScheduledWidget::confirmSendingFiles(
 }
 
 bool ScheduledWidget::confirmSendingFiles(
-		Ui::PreparedList &&list,
-		const QString &insertTextOnCancel) {
+	Ui::PreparedList &&list,
+	const QString &insertTextOnCancel) {
 	if (_composeControls->confirmMediaEdit(list)) {
 		return true;
 	} else if (showSendingFilesError(list)) {
@@ -507,20 +575,16 @@ bool ScheduledWidget::confirmSendingFiles(
 		SendMenu::Details());
 
 	box->setConfirmedCallback(crl::guard(this, [=](
-			Ui::PreparedList &&list,
-			Ui::SendFilesWay way,
-			TextWithTags &&caption,
+			std::shared_ptr<Ui::PreparedBundle> bundle,
 			Api::SendOptions options,
-			bool ctrlShiftEnter) {
-		sendingFilesConfirmed(
-			std::move(list),
-			way,
-			std::move(caption),
-			options,
-			ctrlShiftEnter);
+			FullReplyTo) {
+		sendingFilesConfirmed(std::move(bundle), options);
 	}));
 	box->setCancelledCallback(_composeControls->restoreTextCallback(
 		insertTextOnCancel));
+	box->takeTextWithTagsRequests() | rpl::on_next([=](TextWithTags &&text) {
+		_composeControls->setText(std::move(text));
+	}, box->lifetime());
 
 	//ActivateWindow(controller());
 	controller()->show(std::move(box));
@@ -529,38 +593,21 @@ bool ScheduledWidget::confirmSendingFiles(
 }
 
 void ScheduledWidget::sendingFilesConfirmed(
-		Ui::PreparedList &&list,
-		Ui::SendFilesWay way,
-		TextWithTags &&caption,
-		Api::SendOptions options,
-		bool ctrlShiftEnter) {
-	Expects(list.filesToProcess.empty());
-
-	if (showSendingFilesError(list, way.sendImagesAsPhotos())) {
+		std::shared_ptr<Ui::PreparedBundle> bundle,
+		Api::SendOptions options) {
+	if (showSendingFilesError(*bundle)) {
 		return;
 	}
-	auto groups = DivideByGroups(std::move(list), way, false);
-	const auto type = way.sendImagesAsPhotos()
-		? SendMediaType::Photo
-		: SendMediaType::File;
+	const auto compress = bundle->way.sendImagesAsPhotos();
+	const auto type = compress ? SendMediaType::Photo : SendMediaType::File;
 	auto action = prepareSendAction(options);
 	action.clearDraft = false;
-	if ((groups.size() != 1 || !groups.front().sentWithCaption())
-		&& !caption.text.isEmpty()) {
-		auto message = Api::MessageToSend(action);
-		message.textWithTags = base::take(caption);
-		session().api().sendMessage(std::move(message));
-	}
-	for (auto &group : groups) {
+	auto &api = session().api();
+	for (auto &group : bundle->groups) {
 		const auto album = (group.type != Ui::AlbumType::None)
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
-		session().api().sendFiles(
-			std::move(group.list),
-			type,
-			base::take(caption),
-			album,
-			action);
+		api.sendFiles(std::move(group.list), type, album, action);
 	}
 }
 
@@ -618,41 +665,15 @@ void ScheduledWidget::uploadFile(
 
 bool ScheduledWidget::showSendingFilesError(
 		const Ui::PreparedList &list) const {
-	return showSendingFilesError(list, std::nullopt);
+	const auto peer = _history->peer;
+	const auto show = controller()->uiShow();
+	return Data::ShowSendError(show, peer, list, std::nullopt, true);
 }
 
 bool ScheduledWidget::showSendingFilesError(
-		const Ui::PreparedList &list,
-		std::optional<bool> compress) const {
-	const auto text = [&] {
-		using Error = Ui::PreparedList::Error;
-		const auto peer = _history->peer;
-		const auto error = Data::FileRestrictionError(peer, list, compress);
-		if (error) {
-			return *error;
-		} else switch (list.error) {
-		case Error::None: return QString();
-		case Error::EmptyFile:
-		case Error::Directory:
-		case Error::NonLocalUrl: return tr::lng_send_image_empty(
-			tr::now,
-			lt_name,
-			list.errorData);
-		case Error::TooLargeFile: return u"(toolarge)"_q;
-		}
-		return tr::lng_forward_send_files_cant(tr::now);
-	}();
-	if (text.isEmpty()) {
-		return false;
-	} else if (text == u"(toolarge)"_q) {
-		const auto fileSize = list.files.back().size;
-		controller()->show(
-			Box(FileSizeLimitBox, &session(), fileSize, nullptr));
-		return true;
-	}
-
-	controller()->showToast(text);
-	return true;
+		const Ui::PreparedBundle &bundle) const {
+	const auto show = controller()->uiShow();
+	return Data::ShowSendError(show, _history->peer, bundle, true);
 }
 
 Api::SendAction ScheduledWidget::prepareSendAction(
@@ -674,7 +695,7 @@ void ScheduledWidget::send() {
 		return;
 	}
 
-	const auto error = GetErrorTextForSending(
+	const auto error = GetErrorForSending(
 		_history->peer,
 		{
 			.topicRootId = _forumTopic
@@ -686,8 +707,8 @@ void ScheduledWidget::send() {
 			.text = &textWithTags,
 			.ignoreSlowmodeCountdown = true,
 		});
-	if (!error.isEmpty()) {
-		controller()->showToast(error);
+	if (error) {
+		Data::ShowSendErrorToast(controller(), _history->peer, error);
 		return;
 	}
 	const auto callback = [=](Api::SendOptions options) { send(options); };
@@ -716,26 +737,22 @@ void ScheduledWidget::send(Api::SendOptions options) {
 	_composeControls->focus();
 }
 
-void ScheduledWidget::sendVoice(
-		QByteArray bytes,
-		VoiceWaveform waveform,
-		crl::time duration) {
+void ScheduledWidget::sendVoice(const Controls::VoiceToSend &data) {
 	const auto callback = [=](Api::SendOptions options) {
-		sendVoice(bytes, waveform, duration, options);
+		sendVoice(base::duplicate(data), options);
 	};
 	controller()->show(
 		PrepareScheduleBox(this, _show, sendMenuDetails(), callback));
 }
 
 void ScheduledWidget::sendVoice(
-		QByteArray bytes,
-		VoiceWaveform waveform,
-		crl::time duration,
+		const Controls::VoiceToSend &data,
 		Api::SendOptions options) {
 	session().api().sendVoiceMessage(
-		bytes,
-		waveform,
-		duration,
+		data.bytes,
+		data.waveform,
+		data.duration,
+		data.video,
 		prepareSendAction(options));
 	_composeControls->clearListenState();
 }
@@ -756,17 +773,18 @@ void ScheduledWidget::edit(
 		&& item->media()->allowsEditCaption();
 	if (sending.text.isEmpty() && !hasMediaWithCaption) {
 		if (item) {
-			controller()->show(Box<DeleteMessagesBox>(item, false));
+			controller()->show(Box<DeleteMessagesBox>(item));
 		} else {
 			_composeControls->focus();
 		}
 		return;
 	} else {
-		const auto maxCaptionSize = !hasMediaWithCaption
-			? MaxMessageSize
-			: Data::PremiumLimits(&session()).captionLengthCurrent();
+		const auto limits = Data::PremiumLimits(&session());
+		const auto maxTextSize = hasMediaWithCaption
+			? limits.captionLengthCurrent()
+			: limits.messageLengthCurrent();
 		const auto remove = _composeControls->fieldCharacterCount()
-			- maxCaptionSize;
+			- maxTextSize;
 		if (remove > 0) {
 			controller()->showToast(
 				tr::lng_edit_limit_reached(tr::now, lt_count, remove));
@@ -826,7 +844,7 @@ bool ScheduledWidget::sendExistingDocument(
 		_history->peer,
 		ChatRestriction::SendStickers);
 	if (error) {
-		controller()->showToast(*error);
+		Data::ShowSendErrorToast(controller(), _history->peer, error);
 		return false;
 	} else if (ShowSendPremiumError(controller(), document)) {
 		return false;
@@ -854,7 +872,7 @@ bool ScheduledWidget::sendExistingPhoto(
 		_history->peer,
 		ChatRestriction::SendPhotos);
 	if (error) {
-		controller()->showToast(*error);
+		Data::ShowSendErrorToast(controller(), _history->peer, error);
 		return false;
 	}
 
@@ -868,11 +886,10 @@ bool ScheduledWidget::sendExistingPhoto(
 }
 
 void ScheduledWidget::sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot) {
-	const auto errorText = result->getErrorOnSend(_history);
-	if (!errorText.isEmpty()) {
-		controller()->showToast(errorText);
+	if (const auto error = result->getErrorOnSend(_history)) {
+		Data::ShowSendErrorToast(controller(), _history->peer, error);
 		return;
 	}
 	const auto callback = [=](Api::SendOptions options) {
@@ -883,29 +900,23 @@ void ScheduledWidget::sendInlineResult(
 }
 
 void ScheduledWidget::sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot,
 		Api::SendOptions options) {
 	auto action = prepareSendAction(options);
 	action.generateLocal = true;
-	session().api().sendInlineResult(bot, result, action, std::nullopt);
+	session().api().sendInlineResult(
+		bot,
+		result.get(),
+		action,
+		std::nullopt);
 
 	_composeControls->clear();
 	//_saveDraftText = true;
 	//_saveDraftStart = crl::now();
 	//onDraftSave();
 
-	auto &bots = cRefRecentInlineBots();
-	const auto index = bots.indexOf(bot);
-	if (index) {
-		if (index > 0) {
-			bots.removeAt(index);
-		} else if (bots.size() >= RecentInlineBotsLimit) {
-			bots.resize(RecentInlineBotsLimit - 1);
-		}
-		bots.push_front(bot);
-		bot->session().local().writeRecentHashtagsAndBots();
-	}
+	bot->session().recentInlineBots().bump(bot);
 
 	_composeControls->hidePanelsAnimated();
 	_composeControls->focus();
@@ -921,6 +932,11 @@ SendMenu::Details ScheduledWidget::sendMenuDetails() const {
 	return { .type = type, .effectAllowed = effectAllowed };
 }
 
+bool ScheduledWidget::processChosenSticker(ChatHelpers::FileChosen &&chosen) {
+	_composeControls->processChosenSticker(std::move(chosen));
+	return true;
+}
+
 void ScheduledWidget::cornerButtonsShowAtPosition(
 		Data::MessagePosition position) {
 	showAtPosition(position);
@@ -1067,6 +1083,24 @@ void ScheduledWidget::saveState(not_null<ScheduledMemento*> memento) {
 
 void ScheduledWidget::restoreState(not_null<ScheduledMemento*> memento) {
 	_inner->restoreState(memento->list());
+	if (const auto id = memento->sentToScheduledId()) {
+		const auto item = _history->owner().message(_history->peer, id);
+		if (item) {
+			controller()->showToast({
+				.title = tr::lng_scheduled_video_tip_title(tr::now),
+				.text = { tr::lng_scheduled_video_tip_text(tr::now) },
+				.attach = RectPart::Top,
+				.duration = kVideoProcessingInfoDuration,
+			});
+			clearProcessingVideoTracking(false);
+			_processingVideoPosition = item->position();
+			_processingVideoTipTimer.setCallback([=] {
+				_processingVideoCanShow = true;
+				updateInnerVisibleArea();
+			});
+			_processingVideoTipTimer.callOnce(kVideoProcessingInfoDuration);
+		}
+	}
 }
 
 void ScheduledWidget::resizeEvent(QResizeEvent *e) {
@@ -1138,9 +1172,153 @@ void ScheduledWidget::updateInnerVisibleArea() {
 		checkReplyReturns();
 	}
 	const auto scrollTop = _scroll->scrollTop();
-	_inner->setVisibleTopBottom(scrollTop, scrollTop + _scroll->height());
+	const auto scrollBottom = scrollTop + _scroll->height();
+	_inner->setVisibleTopBottom(scrollTop, scrollBottom);
 	_cornerButtons.updateJumpDownVisibility();
 	_cornerButtons.updateUnreadThingsVisibility();
+	if (!_processingVideoLifetime) {
+		if (const auto &position = _processingVideoPosition) {
+			if (const auto view = _inner->viewByPosition(position)) {
+				initProcessingVideoView(view);
+			}
+		}
+	}
+	checkProcessingVideoTooltip(scrollTop, scrollBottom);
+}
+
+void ScheduledWidget::initProcessingVideoView(not_null<Element*> view) {
+	_processingVideoView = view;
+
+	controller()->session().data().sentFromScheduled(
+	) | rpl::on_next([=](const Data::SentFromScheduled &value) {
+		if (value.item->position() == _processingVideoPosition) {
+			controller()->showPeerHistory(
+				value.item->history(),
+				Window::SectionShow::Way::Backward,
+				value.sentId);
+		}
+	}, _processingVideoLifetime);
+
+	controller()->session().data().viewRemoved(
+	) | rpl::on_next([=](not_null<const Element*> view) {
+		if (view == _processingVideoView.get()) {
+			const auto position = _processingVideoPosition;
+			if (const auto now = _inner->viewByPosition(position)) {
+				_processingVideoView = now;
+				updateProcessingVideoTooltipPosition();
+			} else {
+				clearProcessingVideoTracking(true);
+			}
+		}
+	}, _processingVideoLifetime);
+
+	controller()->session().data().viewResizeRequest(
+	) | rpl::on_next([this](not_null<const Element*> view) {
+		if (view->delegate() == _inner.data()) {
+			if (!_processingVideoUpdateScheduled) {
+				if (const auto tooltip = _processingVideoTooltip.get()) {
+					_processingVideoUpdateScheduled = true;
+					crl::on_main(tooltip, [=] {
+						_processingVideoUpdateScheduled = false;
+						updateProcessingVideoTooltipPosition();
+					});
+				}
+			}
+		}
+	}, _processingVideoLifetime);
+}
+
+void ScheduledWidget::clearProcessingVideoTracking(bool fast) {
+	if (const auto tooltip = _processingVideoTooltip.release()) {
+		tooltip->toggleAnimated(false);
+	}
+	_processingVideoPosition = {};
+	if (const auto tooltip = _processingVideoTooltip.release()) {
+		if (fast) {
+			tooltip->toggleFast(false);
+		} else {
+			tooltip->toggleAnimated(false);
+		}
+	}
+	_processingVideoTooltipShown = false;
+	_processingVideoCanShow = false;
+	_processingVideoView = nullptr;
+	_processingVideoTipTimer.cancel();
+	_processingVideoLifetime.destroy();
+}
+
+void ScheduledWidget::checkProcessingVideoTooltip(
+		int visibleTop,
+		int visibleBottom) {
+	if (_processingVideoTooltip
+		|| _processingVideoTooltipShown
+		|| !_processingVideoCanShow) {
+		return;
+	}
+	const auto view = _processingVideoView.get();
+	if (!view) {
+		_processingVideoCanShow = false;
+		return;
+	}
+	const auto rect = view->effectIconGeometry();
+	if (rect.top() > visibleTop
+		&& rect.top() + rect.height() <= visibleBottom) {
+		showProcessingVideoTooltip();
+	}
+}
+
+void ScheduledWidget::updateProcessingVideoTooltipPosition() {
+	const auto tooltip = _processingVideoTooltip.get();
+	if (!tooltip) {
+		return;
+	}
+	const auto view = _processingVideoView.get();
+	if (!view) {
+		clearProcessingVideoTracking(true);
+		return;
+	}
+	const auto shift = view->skipBlockWidth() / 2;
+	const auto rect = view->effectIconGeometry().translated(shift, 0);
+	const auto countPosition = [=](QSize size) {
+		const auto origin = rect.bottomLeft();
+		return origin - QPoint(
+			size.width() / 2,
+			size.height() + st::processingVideoTipShift);
+	};
+	tooltip->pointAt(rect, RectPart::Top, countPosition);
+}
+
+void ScheduledWidget::showProcessingVideoTooltip() {
+	_processingVideoTooltipShown = true;
+	_processingVideoTooltip = std::make_unique<Ui::ImportantTooltip>(
+		_inner.data(),
+		Ui::MakeNiceTooltipLabel(
+			_inner.data(),
+			tr::lng_scheduled_video_tip(tr::marked),
+			st::processingVideoTipMaxWidth,
+			st::defaultImportantTooltipLabel),
+		st::defaultImportantTooltip);
+	const auto tooltip = _processingVideoTooltip.get();
+	const auto weak = base::make_weak(tooltip);
+	const auto destroy = [=] {
+		delete weak.get();
+	};
+	tooltip->setAttribute(Qt::WA_TransparentForMouseEvents);
+	tooltip->setHiddenCallback([=] {
+		const auto tip = _processingVideoTooltip.get();
+		if (tooltip == tip) {
+			_processingVideoTooltip.release();
+		}
+		crl::on_main(tip, [=] {
+			delete tip;
+		});
+	});
+	updateProcessingVideoTooltipPosition();
+	tooltip->toggleAnimated(true);
+	_processingVideoTipTimer.setCallback(crl::guard(tooltip, [=] {
+		tooltip->toggleAnimated(false);
+	}));
+	_processingVideoTipTimer.callOnce(kVideoProcessingInfoDuration);
 }
 
 void ScheduledWidget::showAnimatedHook(
@@ -1289,7 +1467,8 @@ void ScheduledWidget::listMarkContentsRead(
 }
 
 MessagesBarData ScheduledWidget::listMessagesBar(
-		const std::vector<not_null<Element*>> &elements) {
+		const std::vector<not_null<Element*>> &elements,
+		bool markLastAsRead) {
 	return {};
 }
 
@@ -1430,14 +1609,27 @@ void ScheduledWidget::listShowPremiumToast(
 void ScheduledWidget::listOpenPhoto(
 		not_null<PhotoData*> photo,
 		FullMsgId context) {
-	controller()->openPhoto(photo, { context });
+	const auto draw = _forumTopic
+		? Data::CanSendAnyOf(_forumTopic, Data::FilesSendRestrictions())
+		: Data::CanSendAnyOf(
+			_history->peer,
+			Data::FilesSendRestrictions());
+	controller()->openPhoto(photo, { .id = context, .showDrawButton = draw });
 }
 
 void ScheduledWidget::listOpenDocument(
 		not_null<DocumentData*> document,
 		FullMsgId context,
 		bool showInMediaView) {
-	controller()->openDocument(document, showInMediaView, { context });
+	const auto draw = _forumTopic
+		? Data::CanSendAnyOf(_forumTopic, Data::FilesSendRestrictions())
+		: Data::CanSendAnyOf(
+			_history->peer,
+			Data::FilesSendRestrictions());
+	controller()->openDocument(
+		document,
+		showInMediaView,
+		{ .id = context, .showDrawButton = draw });
 }
 
 void ScheduledWidget::listPaintEmpty(
@@ -1463,6 +1655,14 @@ void ScheduledWidget::listAddTranslatedItems(
 	not_null<TranslateTracker*> tracker) {
 }
 
+Ui::ScrollArea *ScheduledWidget::listScrollArea() const {
+	return _scroll.data();
+}
+
+bool ScheduledWidget::listThanosEffectEnabled() const {
+	return false;
+}
+
 void ScheduledWidget::confirmSendNowSelected() {
 	ConfirmSendNowSelectedItems(_inner);
 }
@@ -1492,4 +1692,112 @@ void ScheduledWidget::setupDragArea() {
 	areas.photo->setDroppedCallback(droppedCallback(true));
 }
 
+bool ShowScheduledVideoPublished(
+		not_null<Window::SessionController*> controller,
+		const Data::SentFromScheduled &info,
+		Fn<void()> hidden) {
+	if (!controller->widget()->isActive()) {
+		return false;
+	}
+	const auto document = FindVideoFile(info.item);
+	if (!document) {
+		return false;
+	}
+	const auto history = info.item->history();
+	const auto itemId = info.sentId;
+
+	const auto text = tr::lng_scheduled_video_published(
+		tr::now,
+		tr::bold);
+	const auto &st = st::processingVideoToast;
+	const auto skip = st::processingVideoPreviewSkip;
+	const auto size = st.style.font->height * 2;
+	const auto view = tr::lng_scheduled_video_view(tr::now);
+	const auto additional = QMargins(
+		skip + size,
+		0,
+		(st::processingVideoView.style.font->width(view)
+			- (st::processingVideoView.width / 2)),
+		0);
+
+	const auto parent = controller->uiShow()->toastParent();
+	const auto weak = Ui::Toast::Show(parent, Ui::Toast::Config{
+		.text = text,
+		.padding = rpl::single(additional),
+		.st = &st,
+		.attach = RectPart::Top,
+		.acceptinput = true,
+		.duration = kVideoProcessingInfoDuration,
+	});
+	const auto strong = weak.get();
+	if (!strong) {
+		return false;
+	}
+	const auto widget = strong->widget();
+	const auto hideToast = [weak] {
+		if (const auto strong = weak.get()) {
+			strong->hideAnimated();
+		}
+	};
+
+	const auto clickableBackground = Ui::CreateChild<Ui::AbstractButton>(
+		widget.get());
+	clickableBackground->setPointerCursor(false);
+	clickableBackground->setAcceptBoth();
+	clickableBackground->show();
+	clickableBackground->addClickHandler([=](Qt::MouseButton button) {
+		if (button == Qt::RightButton) {
+			hideToast();
+		}
+	});
+
+	const auto button = Ui::CreateChild<Ui::RoundButton>(
+		widget.get(),
+		rpl::single(view),
+		st::processingVideoView);
+	button->show();
+	rpl::combine(
+		widget->sizeValue(),
+		button->sizeValue()
+	) | rpl::on_next([=](QSize outer, QSize inner) {
+		button->moveToRight(
+			0,
+			(outer.height() - inner.height()) / 2,
+			outer.width());
+		clickableBackground->resize(outer);
+	}, widget->lifetime());
+	const auto preview = Ui::CreateChild<Ui::RpWidget>(widget.get());
+	preview->moveToLeft(skip, skip);
+	preview->resize(size, size);
+	preview->show();
+
+	const auto thumbnail = Ui::MakeDocumentThumbnail(document, FullMsgId(
+		history->peer->id,
+		itemId));
+	thumbnail->subscribeToUpdates([=] {
+		preview->update();
+	});
+	preview->paintRequest(
+	) | rpl::on_next([=] {
+		auto p = QPainter(preview);
+		const auto image = Images::Round(
+			thumbnail->image(size),
+			ImageRoundRadius::Small);
+		p.drawImage(QRect(0, 0, size, size), image);
+	}, preview->lifetime());
+
+	button->setClickedCallback([=] {
+		controller->showPeerHistory(
+			history,
+			Window::SectionShow::Way::Forward,
+			itemId);
+		hideToast();
+	});
+
+	if (hidden) {
+		widget->lifetime().add(std::move(hidden));
+	}
+	return true;
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 0a7ff39b0ffa14..d73c492874fd09 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -21,6 +21,10 @@ namespace ChatHelpers {
 class Show;
 } // namespace ChatHelpers
 
+namespace Data {
+struct SentFromScheduled;
+} // namespace Data
+
 namespace SendMenu {
 struct Details;
 } // namespace SendMenu
@@ -36,7 +40,9 @@ class ScrollArea;
 class PlainShadow;
 class FlatButton;
 struct PreparedList;
+struct PreparedBundle;
 class SendFilesWay;
+class ImportantTooltip;
 } // namespace Ui
 
 namespace Profile {
@@ -47,6 +53,14 @@ namespace InlineBots {
 class Result;
 } // namespace InlineBots
 
+namespace HistoryView::Controls {
+struct VoiceToSend;
+} // namespace HistoryView::Controls
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
 namespace HistoryView {
 
 class Element;
@@ -125,7 +139,8 @@ class ScheduledWidget final
 	void listMarkContentsRead(
 		const base::flat_set<not_null<HistoryItem*>> &items) override;
 	MessagesBarData listMessagesBar(
-		const std::vector<not_null<Element*>> &elements) override;
+		const std::vector<not_null<Element*>> &elements,
+		bool markLastAsRead) override;
 	void listContentRefreshed() override;
 	void listUpdateDateLink(
 		ClickHandlerPtr &link,
@@ -164,6 +179,8 @@ class ScheduledWidget final
 	History *listTranslateHistory() override;
 	void listAddTranslatedItems(
 		not_null<TranslateTracker*> tracker) override;
+	Ui::ScrollArea *listScrollArea() const override;
+	bool listThanosEffectEnabled() const override;
 
 	// CornerButtonsDelegate delegate.
 	void cornerButtonsShowAtPosition(
@@ -195,6 +212,12 @@ class ScheduledWidget final
 		Data::MessagePosition position,
 		FullMsgId originId = {});
 
+	void initProcessingVideoView(not_null<Element*> view);
+	void checkProcessingVideoTooltip(int visibleTop, int visibleBottom);
+	void showProcessingVideoTooltip();
+	void updateProcessingVideoTooltipPosition();
+	void clearProcessingVideoTracking(bool fast);
+
 	void setupComposeControls();
 
 	void setupDragArea();
@@ -207,14 +230,9 @@ class ScheduledWidget final
 		Api::SendOptions options) const;
 	void send();
 	void send(Api::SendOptions options);
+	void sendVoice(const Controls::VoiceToSend &data);
 	void sendVoice(
-		QByteArray bytes,
-		VoiceWaveform waveform,
-		crl::time duration);
-	void sendVoice(
-		QByteArray bytes,
-		VoiceWaveform waveform,
-		crl::time duration,
+		const Controls::VoiceToSend &data,
 		Api::SendOptions options);
 	void edit(
 		not_null<HistoryItem*> item,
@@ -223,7 +241,8 @@ class ScheduledWidget final
 		bool spoilered);
 	void highlightSingleNewMessage(const Data::MessagesSlice &slice);
 	void chooseAttach();
-	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
+	[[nodiscard]] SendMenu::Details sendMenuDetails() const override;
+	bool processChosenSticker(ChatHelpers::FileChosen &&chosen) override;
 
 	void pushReplyReturn(not_null<HistoryItem*> item);
 	void checkReplyReturns();
@@ -242,15 +261,11 @@ class ScheduledWidget final
 		std::optional<bool> overrideSendImagesAsPhotos,
 		const QString &insertTextOnCancel = QString());
 	bool showSendingFilesError(const Ui::PreparedList &list) const;
-	bool showSendingFilesError(
-		const Ui::PreparedList &list,
-		std::optional<bool> compress) const;
+	bool showSendingFilesError(const Ui::PreparedBundle &bundle) const;
+
 	void sendingFilesConfirmed(
-		Ui::PreparedList &&list,
-		Ui::SendFilesWay way,
-		TextWithTags &&caption,
-		Api::SendOptions options,
-		bool ctrlShiftEnter);
+		std::shared_ptr<Ui::PreparedBundle> bundle,
+		Api::SendOptions options);
 
 	bool sendExistingDocument(
 		not_null<DocumentData*> document,
@@ -260,10 +275,10 @@ class ScheduledWidget final
 		not_null<PhotoData*> photo,
 		Api::SendOptions options);
 	void sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot);
 	void sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot,
 		Api::SendOptions options);
 
@@ -278,7 +293,16 @@ class ScheduledWidget final
 	std::unique_ptr<ComposeControls> _composeControls;
 	bool _skipScrollEvent = false;
 
+	Data::MessagePosition _processingVideoPosition;
+	base::weak_ptr<Element> _processingVideoView;
+	rpl::lifetime _processingVideoLifetime;
+
 	std::unique_ptr<HistoryView::StickerToast> _stickerToast;
+	std::unique_ptr<Ui::ImportantTooltip> _processingVideoTooltip;
+	base::Timer _processingVideoTipTimer;
+	bool _processingVideoUpdateScheduled = false;
+	bool _processingVideoTooltipShown = false;
+	bool _processingVideoCanShow = false;
 
 	CornerButtons _cornerButtons;
 
@@ -289,7 +313,9 @@ class ScheduledWidget final
 
 class ScheduledMemento final : public Window::SectionMemento {
 public:
-	ScheduledMemento(not_null<History*> history);
+	ScheduledMemento(
+		not_null<History*> history,
+		MsgId sentToScheduledId = 0);
 	ScheduledMemento(not_null<Data::ForumTopic*> forumTopic);
 
 	object_ptr<Window::SectionWidget> createWidget(
@@ -298,19 +324,29 @@ class ScheduledMemento final : public Window::SectionMemento {
 		Window::Column column,
 		const QRect &geometry) override;
 
-	not_null<History*> getHistory() const {
+	[[nodiscard]] not_null<History*> getHistory() const {
 		return _history;
 	}
 
-	not_null<ListMemento*> list() {
+	[[nodiscard]] not_null<ListMemento*> list() {
 		return &_list;
 	}
 
+	[[nodiscard]] MsgId sentToScheduledId() const {
+		return _sentToScheduledId;
+	}
+
 private:
 	const not_null<History*> _history;
 	const Data::ForumTopic *_forumTopic;
 	ListMemento _list;
+	MsgId _sentToScheduledId = 0;
 
 };
 
+bool ShowScheduledVideoPublished(
+	not_null<Window::SessionController*> controller,
+	const Data::SentFromScheduled &info,
+	Fn<void()> hidden = nullptr);
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.cpp b/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.cpp
new file mode 100644
index 00000000000000..68174032ad0139
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.cpp
@@ -0,0 +1,415 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_self_forwards_tagger.h"
+
+#include "base/call_delayed.h"
+#include "base/event_filter.h"
+#include "base/timer_rpl.h"
+#include "boxes/choose_filter_box.h"
+#include "chat_helpers/share_message_phrase_factory.h"
+#include "core/ui_integration.h"
+#include "data/data_chat_filters.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/view/reactions/history_view_reactions_selector.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/rect.h"
+#include "ui/effects/show_animation.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast_widget.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/tooltip.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_info.h"
+
+namespace HistoryView {
+namespace {
+
+constexpr auto kInitTimer = crl::time(3000);
+constexpr auto kTimerOnLeave = crl::time(2000);
+
+} // namespace
+
+SelfForwardsTagger::SelfForwardsTagger(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::RpWidget*> parent,
+	Fn<Ui::RpWidget*()> listWidget,
+	not_null<QWidget*> scroll,
+	Fn<History*()> history)
+: _controller(controller)
+, _parent(parent)
+, _listWidget(std::move(listWidget))
+, _scroll(scroll)
+, _history(std::move(history)) {
+	setup();
+}
+
+SelfForwardsTagger::~SelfForwardsTagger() = default;
+
+void SelfForwardsTagger::setup() {
+	_controller->session().data().recentSelfForwards(
+	) | rpl::on_next([=](const Data::RecentSelfForwards &data) {
+		const auto history = _history ? _history() : nullptr;
+		if (!history || history->peer->id != data.fromPeerId) {
+			return;
+		}
+		showSelectorForMessages(data.ids);
+	}, _lifetime);
+	_controller->session().data().recentJoinChat(
+	) | rpl::on_next([=](const Data::RecentJoinChat &data) {
+		if (!_controller->session().data().chatsFilters().has()) {
+			return;
+		}
+		const auto history = _history ? _history() : nullptr;
+		if (!history || history->peer->id != data.fromPeerId) {
+			return;
+		}
+		const auto peerId = data.joinedPeerId;
+		if (const auto peer = _controller->session().data().peer(peerId)) {
+			showChannelFilterToast(peer);
+		}
+	}, _lifetime);
+}
+
+void SelfForwardsTagger::showSelectorForMessages(
+		const MessageIdsList &ids) {
+	if (ids.empty()) {
+		return;
+	}
+	const auto lastId = ids.back();
+	const auto item = _controller->session().data().message(lastId);
+	if (!item) {
+		return;
+	}
+	using namespace Reactions;
+	const auto reactions = Data::LookupPossibleReactions(item, true);
+	if (reactions.recent.empty()) {
+		return;
+	}
+
+	showToast(
+		rpl::variable<TextWithEntities>(
+			ChatHelpers::ForwardedMessagePhrase({
+			.toCount = 1,
+			.singleMessage = (ids.size() == 1),
+			.to1 = _controller->session().user(),
+			.toSelfWithPremiumIsEmpty = false,
+		})).current(),
+		nullptr);
+
+	const auto toastWidget = [&]() -> Ui::RpWidget* {
+		if (const auto toast = _toast.get()) {
+			return toast->widget();
+		}
+		return nullptr;
+	}();
+	if (!toastWidget) {
+		return;
+	}
+
+	const auto toastWidth = toastWidget->width();
+	const auto selector = Ui::CreateChild<Selector>(
+		toastWidget->parentWidget(),
+		st::reactPanelEmojiPan,
+		_controller->uiShow(),
+		reactions,
+		tr::lng_add_tag_selector(
+			tr::now,
+			lt_count,
+			float64(ids.size()),
+			TextWithEntities::Simple),
+		[](bool) {},
+		IconFactory(),
+		[] { return false; },
+		false);
+	selector->setBubbleUp(true);
+	selector->setExpandDown(true);
+
+	const auto destroyFast = [
+			selectorWeak = base::make_weak(selector),
+			toastWidgetWeak = _toast] {
+		if (const auto toast = toastWidgetWeak.get()) {
+			delete toast->widget();
+		}
+		if (const auto selector = selectorWeak.get()) {
+			delete selector;
+		}
+	};
+	const auto hideAndDestroy = [
+			selectorWeak = base::make_weak(selector),
+			toastWidgetWeak = _toast] {
+		const auto selector = selectorWeak.get();
+		const auto toastWidget = toastWidgetWeak.get();
+		if (!selector || !toastWidget) {
+			return;
+		}
+		Ui::Animations::HideWidgets({ toastWidget->widget(), selector });
+		selector->shownValue(
+		) | rpl::on_next([toastWidgetWeak](bool shown) {
+			if (!shown) {
+				if (const auto toast = toastWidgetWeak.get()) {
+					delete toast->widget();
+				}
+			}
+		}, selector->lifetime());
+	};
+
+	selector->chosen(
+	) | rpl::on_next([=](ChosenReaction reaction) {
+		selector->setAttribute(Qt::WA_TransparentForMouseEvents);
+		for (const auto &id : ids) {
+			if (const auto item = _controller->session().data().message(id)) {
+				item->toggleReaction(
+					reaction.id,
+					HistoryReactionSource::Selector);
+			}
+		}
+		hideAndDestroy();
+		base::call_delayed(st::defaultToggle.duration, _parent, [=] {
+			showTaggedToast(reaction.id.custom());
+		});
+	}, selector->lifetime());
+
+	const auto eventFilterCallback = [=](not_null<QEvent*> event) {
+		if (event->type() == QEvent::MouseButtonPress) {
+			hideAndDestroy();
+			return base::EventFilterResult::Cancel;
+		}
+		return base::EventFilterResult::Continue;
+	};
+	base::install_event_filter(selector, _parent, eventFilterCallback);
+	if (const auto list = _listWidget()) {
+		list->lifetime().add(destroyFast);
+		base::install_event_filter(selector, list, eventFilterCallback);
+	}
+
+	const auto state = selector->lifetime().make_state<ToastTimerState>();
+
+	selector->willExpand() | rpl::on_next([=] {
+		state->expanded = true;
+	}, selector->lifetime());
+
+	setupToastTimer(selector, state, hideAndDestroy);
+
+	QObject::connect(
+		_toast->widget(),
+		&QObject::destroyed,
+		selector,
+		[=] { delete selector; });
+
+	const auto selectorWidth = toastWidth;
+	selector->countWidth(selectorWidth, selectorWidth);
+	selector->initGeometry(_parent->height() / 2);
+
+	_toast->widget()->geometryValue(
+	) | rpl::on_next([=](const QRect &rect) {
+		if (rect.isEmpty()) {
+			return;
+		}
+		selector->moveToLeft(
+			rect.x() + (rect.width() - selector->width()) / 2,
+			rect::bottom(rect) - st::selfForwardsTaggerStripSkip);
+	}, selector->lifetime());
+	selector->show();
+}
+
+void SelfForwardsTagger::showToast(
+		const TextWithEntities &text,
+		Fn<void()> callback) {
+	hideToast();
+	_toast = Ui::Toast::Show(_scroll, Ui::Toast::Config{
+		.text = text,
+		.textContext = Core::TextContext({
+			.session = &_controller->session(),
+		}),
+		.filter = ChatHelpers::ForwardedToSavedMessagesFilter(
+			&_controller->session()),
+		.iconLottie = u"toast/saved_messages"_q,
+		.iconPadding = st::selfForwardsTaggerIconPadding,
+		.st = &st::selfForwardsTaggerToast,
+		.attach = RectPart::Top,
+		.infinite = true,
+	});
+	if (const auto strong = _toast.get()) {
+		if (callback) {
+			QObject::connect(strong->widget(), &QObject::destroyed, callback);
+		}
+	} else if (callback) {
+		callback();
+	}
+}
+
+
+void SelfForwardsTagger::showTaggedToast(DocumentId reaction) {
+	auto text = tr::lng_message_tagged_with(
+		tr::now,
+		lt_emoji,
+		Data::SingleCustomEmoji(reaction),
+		tr::marked);
+	hideToast();
+
+	const auto &st = st::selfForwardsTaggerToast;
+	const auto viewText = tr::lng_tagged_view_saved(tr::now);
+	const auto viewFont = st::historyPremiumViewSet.style.font;
+	const auto rightSkip = viewFont->width(viewText)
+		+ st::toastUndoSpace;
+
+	_toast = Ui::Toast::Show(_scroll, Ui::Toast::Config{
+		.text = text,
+		.textContext = Core::TextContext({
+			.session = &_controller->session(),
+		}),
+		.iconLottie = u"toast/tagged"_q,
+		.iconPadding = st::selfForwardsTaggerIconPadding,
+		.padding = rpl::single(QMargins(0, 0, rightSkip, 0)),
+		.st = &st,
+		.attach = RectPart::Top,
+		.acceptinput = true,
+		.duration = crl::time(3000),
+	});
+	if (const auto strong = _toast.get()) {
+		const auto widget = strong->widget();
+
+		const auto button = Ui::CreateChild<Ui::AbstractButton>(widget.get());
+		button->setClickedCallback([=] {
+			_controller->showPeerHistory(_controller->session().user());
+			hideToast();
+		});
+
+		button->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(button);
+			const auto font = st::historyPremiumViewSet.style.font;
+			const auto top = (button->height() - font->height) / 2;
+			p.setPen(st::historyPremiumViewSet.textFg);
+			p.setFont(font);
+			p.drawText(0, top + font->ascent, viewText);
+		}, button->lifetime());
+
+		button->resize(
+			viewFont->width(viewText),
+			st::historyPremiumViewSet.height);
+
+		rpl::combine(
+			widget->sizeValue(),
+			button->sizeValue()
+		) | rpl::on_next([=](const QSize &outer, const QSize &inner) {
+			button->moveToRight(
+				st.padding.right(),
+				(outer.height() - inner.height()) / 2,
+				outer.width());
+		}, widget->lifetime());
+
+		button->show();
+	}
+}
+
+void SelfForwardsTagger::showChannelFilterToast(not_null<PeerData*> peer) {
+	hideToast();
+	const auto toastText = peer->isChannel() && !peer->isMegagroup()
+		? tr::lng_add_channel_to_filter_selector(tr::now)
+		: tr::lng_add_group_to_filter_selector(tr::now);
+	_toast = Ui::Toast::Show(_scroll, Ui::Toast::Config{
+		.text = { .text = toastText },
+		.iconLottie = u"toast/chats_filter_in"_q,
+		.iconPadding = st::selfForwardsTaggerIconPadding,
+		.st = &st::joinChatAddToFilterToast,
+		.attach = RectPart::Top,
+		.acceptinput = true,
+		.infinite = true,
+	});
+	if (const auto strong = _toast.get()) {
+		const auto widget = strong->widget();
+		const auto rightButton = createRightButton(widget);
+		const auto history = peer->owner().history(peer);
+
+		const auto state = widget->lifetime().make_state<ToastTimerState>();
+
+		rightButton->setClickedCallback([=] {
+			state->expanded = true;
+			state->timerLifetime.destroy();
+			const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+				rightButton,
+				st::foldersMenu);
+			menu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
+			FillChooseFilterMenu(_controller, menu, history);
+			if (!menu->empty()) {
+				menu->popup(
+					rightButton->mapToGlobal(
+						QPoint(
+							rightButton->width(),
+							rightButton->height() + rightButton->y())));
+				QObject::connect(menu, &QObject::destroyed, [=] {
+					hideToast();
+				});
+			} else {
+				hideToast();
+			}
+		});
+
+		setupToastTimer(widget, state, [=] { hideToast(); });
+	}
+}
+
+not_null<Ui::AbstractButton*> SelfForwardsTagger::createRightButton(
+		not_null<Ui::RpWidget*> widget) {
+	const auto button = Ui::CreateChild<Ui::IconButton>(
+		widget.get(),
+		st::joinChatAddToFilterToastButton);
+	widget->sizeValue() | rpl::on_next([=](const QSize &size) {
+		button->moveToRight(
+			st::lineWidth * 4,
+			(size.height() - button->height()) / 2);
+	}, button->lifetime());
+
+	button->show();
+	return button;
+}
+
+void SelfForwardsTagger::setupToastTimer(
+		not_null<Ui::RpWidget*> widget,
+		not_null<ToastTimerState*> state,
+		Fn<void()> hideCallback) {
+	const auto restartTimer = [=](crl::time ms) {
+		state->timerLifetime.destroy();
+		base::timer_once(ms) | rpl::on_next([=] {
+			hideCallback();
+		}, state->timerLifetime);
+	};
+
+	base::install_event_filter(widget, [=](not_null<QEvent*> event) {
+		if (event->type() == QEvent::MouseButtonPress) {
+			state->timerLifetime.destroy();
+			return base::EventFilterResult::Continue;
+		} else if (!state->expanded && event->type() == QEvent::Enter) {
+			state->timerLifetime.destroy();
+			return base::EventFilterResult::Continue;
+		} else if (!state->expanded && event->type() == QEvent::Leave) {
+			restartTimer(kTimerOnLeave);
+			return base::EventFilterResult::Continue;
+		}
+		return base::EventFilterResult::Continue;
+	}, widget->lifetime());
+
+	restartTimer(kInitTimer);
+}
+
+void SelfForwardsTagger::hideToast() {
+	if (const auto strong = _toast.get()) {
+		strong->hideAnimated();
+	}
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.h b/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.h
new file mode 100644
index 00000000000000..d01102983158c3
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_self_forwards_tagger.h
@@ -0,0 +1,83 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/weak_ptr.h"
+
+class History;
+
+namespace Data {
+class Session;
+} // namespace Data
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+class RpWidget;
+class AbstractButton;
+} // namespace Ui
+
+namespace Ui::Toast {
+class Instance;
+} // namespace Ui::Toast
+
+namespace Reactions {
+struct ChosenReaction;
+} // namespace Reactions
+
+namespace HistoryView {
+
+class SelfForwardsTagger final : public base::has_weak_ptr {
+public:
+	SelfForwardsTagger(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::RpWidget*> parent,
+		Fn<Ui::RpWidget*()> listWidget,
+		not_null<QWidget*> scroll,
+		Fn<History*()> history);
+
+	~SelfForwardsTagger();
+
+private:
+	struct ToastTimerState {
+		rpl::lifetime timerLifetime;
+		bool expanded = false;
+	};
+
+	void setup();
+	void showSelectorForMessages(const MessageIdsList &ids);
+	void showToast(const TextWithEntities &text, Fn<void()> callback);
+	void showTaggedToast(DocumentId);
+	void showChannelFilterToast(not_null<PeerData*> peer);
+	not_null<Ui::AbstractButton*> createRightButton(
+		not_null<Ui::RpWidget*> widget);
+	void setupToastTimer(
+		not_null<Ui::RpWidget*> widget,
+		not_null<ToastTimerState*> state,
+		Fn<void()> hideCallback);
+	void hideToast();
+	[[nodiscard]] QRect toastGeometry() const;
+
+	const not_null<Window::SessionController*> _controller;
+	const not_null<Ui::RpWidget*> _parent;
+	const Fn<Ui::RpWidget*()> _listWidget;
+	const not_null<QWidget*> _scroll;
+	const Fn<History*()> _history;
+
+	base::weak_ptr<Ui::Toast::Instance> _toast;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_send_action.cpp b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
index 460941e6d18cc8..045c27257fb0bd 100644
--- a/Telegram/SourceFiles/history/view/history_view_send_action.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
@@ -131,8 +131,11 @@ bool SendActionPainter::updateNeedsAnimating(
 		Unexpected("EmojiInteraction here.");
 	}, [&](const MTPDsendMessageEmojiInteractionSeen &) {
 		// #TODO interaction
+	}, [&](const MTPDsendMessageTextDraftAction &) {
+	}, [&](const MTPDsendMessageRichMessageDraftAction &) {
 	}, [&](const MTPDsendMessageCancelAction &) {
 		Unexpected("CancelAction here.");
+	}, [&](const auto &) {
 	});
 	return updateNeedsAnimating(now, true);
 }
@@ -386,14 +389,10 @@ bool SendActionPainter::updateNeedsAnimating(crl::time now, bool force) {
 	if (force
 		|| sendActionChanged
 		|| (sendActionResult && !anim::Disabled())) {
-		const auto height = std::max(
-			st::normalFont->height,
-			st::dialogsMiniPreviewTop + st::dialogsMiniPreview);
+		const auto width = _sendActionAnimation.width() + _animationLeft;
 		_history->peer->owner().sendActionManager().updateAnimation({
 			_topic ? ((Data::Thread*)_topic) : _history,
-			0,
-			_sendActionAnimation.width() + _animationLeft,
-			height,
+			{ 0, 0, width, st::normalFont->height },
 			(force || sendActionChanged)
 		});
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_send_action.h b/Telegram/SourceFiles/history/view/history_view_send_action.h
index 2a0e2e6b3b4508..d3771fc089fd8e 100644
--- a/Telegram/SourceFiles/history/view/history_view_send_action.h
+++ b/Telegram/SourceFiles/history/view/history_view_send_action.h
@@ -57,6 +57,10 @@ class SendActionPainter final {
 		const MTPSendMessageAction &action);
 	void clear(not_null<UserData*> from);
 
+	[[nodiscard]] QString actionText() const {
+		return _sendActionString;
+	}
+
 private:
 	const not_null<History*> _history;
 	const MsgId _rootId = 0;
diff --git a/Telegram/SourceFiles/history/view/history_view_service_message.cpp b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
index 0de40ca7a57363..2c08e5bb701017 100644
--- a/Telegram/SourceFiles/history/view/history_view_service_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_service_message.h"
 
 #include "history/view/media/history_view_media.h"
+#include "history/view/reactions/history_view_reactions.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/history.h"
 #include "history/history_item.h"
@@ -16,8 +17,10 @@ For license and copyright information please follow this link:
 #include "data/data_abstract_structure.h"
 #include "data/data_chat.h"
 #include "data/data_channel.h"
+#include "data/data_todo_list.h"
 #include "info/profile/info_profile_cover.h"
 #include "ui/chat/chat_style.h"
+#include "ui/effects/reaction_fly_animation.h"
 #include "ui/text/text_options.h"
 #include "ui/painter.h"
 #include "ui/power_saving.h"
@@ -197,6 +200,15 @@ void SetText(Ui::Text::String &text, const QString &content) {
 	text.setText(st::serviceTextStyle, content, EmptyLineOptions);
 }
 
+[[nodiscard]] Ui::BubbleRounding KeyboardRounding() {
+	return Ui::BubbleRounding{
+		.topLeft = Ui::BubbleCornerRounding::Large,
+		.topRight = Ui::BubbleCornerRounding::Large,
+		.bottomLeft = Ui::BubbleCornerRounding::Large,
+		.bottomRight = Ui::BubbleCornerRounding::Large,
+	};
+}
+
 } // namespace
 
 int WideChatWidth() {
@@ -405,6 +417,21 @@ Service::Service(
 	not_null<HistoryItem*> data,
 	Element *replacing)
 : Element(delegate, data, replacing, Flag::ServiceMessage) {
+	setupReactions(replacing);
+}
+
+void Service::clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed) {
+	if (const auto markup = data()->Get<HistoryMessageReplyMarkup>()) {
+		if (const auto keyboard = markup->inlineKeyboard.get()) {
+			keyboard->clickHandlerPressedChanged(
+				handler,
+				pressed,
+				KeyboardRounding());
+		}
+	}
+	Element::clickHandlerPressedChanged(handler, pressed);
 }
 
 QRect Service::innerGeometry() const {
@@ -420,56 +447,97 @@ bool Service::consumeHorizontalScroll(QPoint position, int delta) {
 
 QRect Service::countGeometry() const {
 	auto result = QRect(0, 0, width(), height());
-	if (delegate()->elementIsChatWide()) {
+	if (delegate()->elementChatMode() == ElementChatMode::Wide) {
 		result.setWidth(qMin(result.width(), st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left()));
 	}
-	return result.marginsRemoved(st::msgServiceMargin);
+	auto margins = st::msgServiceMargin;
+	margins.setTop(marginTop());
+	return result.marginsRemoved(margins);
 }
 
-QSize Service::performCountCurrentSize(int newWidth) {
-	auto newHeight = displayedDateHeight();
-	if (const auto bar = Get<UnreadBar>()) {
-		newHeight += bar->height();
+void Service::animateReaction(Ui::ReactionFlyAnimationArgs &&args) {
+	auto g = countGeometry();
+	if (g.width() < 1 || isHidden()) {
+		return;
 	}
+	const auto repainter = [=] { repaint(); };
+
+	if (_reactions) {
+		const auto reactionsHeight = st::mediaInBubbleSkip + _reactions->height();
+		const auto reactionsLeft = 0;
+		g.setHeight(g.height() - reactionsHeight);
+		const auto reactionsPosition = QPoint(reactionsLeft + g.left(), g.top() + g.height() + st::mediaInBubbleSkip);
+		_reactions->animate(args.translated(-reactionsPosition), repainter);
+	}
+}
+
+QSize Service::performCountCurrentSize(int newWidth) {
+	auto newHeight = marginTop();
 
 	data()->resolveDependent();
 
+	if (const auto service = Get<ServicePreMessage>()) {
+		service->resizeToWidth(newWidth, delegate()->elementChatMode());
+	}
+
 	if (isHidden()) {
 		return { newWidth, newHeight };
 	}
 	const auto media = this->media();
 	const auto mediaDisplayed = media && media->isDisplayed();
+	auto contentWidth = newWidth;
+	if (delegate()->elementChatMode() == ElementChatMode::Wide) {
+		accumulate_min(contentWidth, st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left());
+	}
+	contentWidth -= st::msgServiceMargin.left() + st::msgServiceMargin.left(); // two small margins
+	if (contentWidth < st::msgServicePadding.left() + st::msgServicePadding.right() + 1) {
+		contentWidth = st::msgServicePadding.left() + st::msgServicePadding.right() + 1;
+	}
 	if (mediaDisplayed && media->hideServiceText()) {
-		newHeight += st::msgServiceMargin.top()
-			+ media->resizeGetHeight(newWidth)
-			+ st::msgServiceMargin.bottom();
+		newHeight += media->resizeGetHeight(newWidth) + marginBottom();
 	} else if (!text().isEmpty()) {
-		auto contentWidth = newWidth;
-		if (delegate()->elementIsChatWide()) {
-			accumulate_min(contentWidth, st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left());
-		}
-		contentWidth -= st::msgServiceMargin.left() + st::msgServiceMargin.left(); // two small margins
-		if (contentWidth < st::msgServicePadding.left() + st::msgServicePadding.right() + 1) {
-			contentWidth = st::msgServicePadding.left() + st::msgServicePadding.right() + 1;
-		}
-
 		auto nwidth = qMax(contentWidth - st::msgServicePadding.left() - st::msgServicePadding.right(), 0);
 		newHeight += (contentWidth >= maxWidth())
 			? minHeight()
 			: textHeightFor(nwidth);
-		newHeight += st::msgServicePadding.top() + st::msgServicePadding.bottom() + st::msgServiceMargin.top() + st::msgServiceMargin.bottom();
+		newHeight += st::msgServicePadding.top() + st::msgServicePadding.bottom();
 		if (mediaDisplayed) {
 			const auto mediaWidth = std::min(media->maxWidth(), nwidth);
 			newHeight += st::msgServiceMargin.top()
 				+ media->resizeGetHeight(mediaWidth);
 		}
+		newHeight += marginBottom();
+	} else {
+		newHeight -= st::msgServiceMargin.top();
+	}
+
+	if (_reactions) {
+		newHeight += st::mediaInBubbleSkip
+			+ _reactions->resizeGetHeight(contentWidth);
+		if (hasRightLayout()) {
+			_reactions->flipToRight();
+		}
+	}
+
+	const auto item = data();
+	if (const auto keyboard = item->inlineReplyKeyboard()) {
+		const auto keyboardWidth = mediaDisplayed ? media->width() : contentWidth;
+		const auto keyboardHeight = st::msgBotKbButton.margin + keyboard->naturalHeight();
+		newHeight += keyboardHeight;
+		keyboard->resize(keyboardWidth, keyboardHeight - st::msgBotKbButton.margin);
 	}
 
 	return { newWidth, newHeight };
 }
 
 QSize Service::performCountOptimalSize() {
+	const auto markup = data()->inlineReplyMarkup();
 	validateText();
+	validateInlineKeyboard(markup);
+
+	if (_reactions) {
+		_reactions->initDimensions();
+	}
 
 	if (const auto media = this->media()) {
 		media->initDimensions();
@@ -487,11 +555,29 @@ bool Service::isHidden() const {
 }
 
 int Service::marginTop() const {
-	return st::msgServiceMargin.top();
+	auto result = isHidden() ? 0 : st::msgServiceMargin.top();
+	result += displayedDateHeight();
+	if (const auto bar = Get<UnreadBar>()) {
+		result += bar->height();
+	}
+	if (const auto bar = Get<ForumThreadBar>()) {
+		result += bar->height();
+	}
+	if (const auto service = Get<ServicePreMessage>()) {
+		result += service->height;
+	}
+	if (const auto margins = Get<ViewAddedMargins>()) {
+		result += margins->top;
+	}
+	return result;
 }
 
 int Service::marginBottom() const {
-	return st::msgServiceMargin.bottom();
+	auto result = st::msgServiceMargin.bottom();
+	if (const auto margins = Get<ViewAddedMargins>()) {
+		result += margins->bottom;
+	}
+	return result;
 }
 
 void Service::draw(Painter &p, const PaintContext &context) const {
@@ -499,42 +585,38 @@ void Service::draw(Painter &p, const PaintContext &context) const {
 	if (g.width() < 1) {
 		return;
 	}
-	const auto &margin = st::msgServiceMargin;
 
 	const auto st = context.st;
-	auto height = this->height() - margin.top() - margin.bottom();
-	auto dateh = 0;
-	auto unreadbarh = 0;
-	auto clip = context.clip;
-	if (auto date = Get<DateBadge>()) {
-		dateh = date->height();
-		p.translate(0, dateh);
-		clip.translate(0, -dateh);
-		height -= dateh;
-	}
 	if (const auto bar = Get<UnreadBar>()) {
-		unreadbarh = bar->height();
-		if (clip.intersects(QRect(0, 0, width(), unreadbarh))) {
+		auto unreadbarh = bar->height();
+		auto aboveh = 0;
+		if (const auto date = Get<DateBadge>()) {
+			aboveh += date->height();
+		}
+		if (const auto bar = Get<ForumThreadBar>()) {
+			aboveh += bar->height();
+		}
+		if (context.clip.intersects(QRect(0, aboveh, width(), unreadbarh))) {
+			p.translate(0, aboveh);
 			bar->paint(
 				p,
 				context,
 				0,
 				width(),
-				delegate()->elementIsChatWide());
+				delegate()->elementChatMode());
+			p.translate(0, -aboveh);
 		}
-		p.translate(0, unreadbarh);
-		clip.translate(0, -unreadbarh);
-		height -= unreadbarh;
+	}
+
+	if (const auto service = Get<ServicePreMessage>()) {
+		service->paint(p, context, g, delegate()->elementChatMode());
 	}
 
 	if (isHidden()) {
-		if (auto skiph = dateh + unreadbarh) {
-			p.translate(0, -skiph);
-		}
 		return;
 	}
 
-	paintHighlight(p, context, height);
+	paintHighlight(p, context, g.height());
 
 	p.setTextPalette(st->serviceTextPalette());
 
@@ -542,13 +624,49 @@ void Service::draw(Painter &p, const PaintContext &context) const {
 	const auto mediaDisplayed = media && media->isDisplayed();
 	const auto onlyMedia = (mediaDisplayed && media->hideServiceText());
 
-	if (!onlyMedia) {
-		if (mediaDisplayed) {
-			height -= margin.top() + media->height();
+	if (_reactions) {
+		const auto reactionsHeight = st::mediaInBubbleSkip + _reactions->height();
+		const auto reactionsLeft = 0;
+		g.setHeight(g.height() - reactionsHeight);
+		const auto reactionsPosition = QPoint(reactionsLeft + g.left(), g.top() + g.height() + st::mediaInBubbleSkip);
+		p.translate(reactionsPosition);
+		prepareCustomEmojiPaint(p, context, *_reactions);
+		_reactions->paint(p, context, g.width(), context.clip.translated(-reactionsPosition));
+		if (context.reactionInfo) {
+			context.reactionInfo->position = reactionsPosition;
 		}
-		const auto trect = QRect(g.left(), margin.top(), g.width(), height)
+		p.translate(-reactionsPosition);
+	}
+
+	const auto item = data();
+	const auto keyboard = item->inlineReplyKeyboard();
+	if (keyboard) {
+		// We need to count geometry without keyboard for bubble selection
+		// intervals counting below.
+		const auto keyboardHeight = st::msgBotKbButton.margin + keyboard->naturalHeight();
+		g.setHeight(g.height() - keyboardHeight);
+
+		const auto keyboardWidth = mediaDisplayed ? media->width() : g.width();
+		const auto keyboardPosition = QPoint(
+			g.left() + (g.width() - keyboardWidth) / 2,
+			g.top() + g.height() + st::msgBotKbButton.margin);
+		p.translate(keyboardPosition);
+		keyboard->paint(
+			p,
+			context.st,
+			KeyboardRounding(),
+			keyboardWidth,
+			context.clip.translated(-keyboardPosition),
+			context.paused);
+		p.translate(-keyboardPosition);
+	}
+
+	if (!onlyMedia) {
+		const auto mediaSkip = mediaDisplayed ? (st::msgServiceMargin.top() + media->height()) : 0;
+		const auto trect = QRect(g.left(), g.top(), g.width(), g.height() - mediaSkip)
 			- st::msgServicePadding;
 
+		p.translate(0, g.top() - st::msgServiceMargin.top());
 		ServiceMessagePainter::PaintComplexBubble(
 			p,
 			context.st,
@@ -556,6 +674,7 @@ void Service::draw(Painter &p, const PaintContext &context) const {
 			g.width(),
 			text(),
 			trect);
+		p.translate(0, -g.top() + st::msgServiceMargin.top());
 
 		p.setBrush(Qt::NoBrush);
 		p.setPen(st->msgServiceFg());
@@ -575,15 +694,12 @@ void Service::draw(Painter &p, const PaintContext &context) const {
 		});
 	}
 	if (mediaDisplayed) {
-		const auto left = margin.left() + (g.width() - media->width()) / 2;
-		const auto top = margin.top() + (onlyMedia ? 0 : (height + margin.top()));
-		p.translate(left, top);
-		media->draw(p, context.translated(-left, -top).withSelection({}));
-		p.translate(-left, -top);
-	}
-
-	if (auto skiph = dateh + unreadbarh) {
-		p.translate(0, -skiph);
+		const auto left = g.left() + (g.width() - media->width()) / 2;
+		const auto top = g.top() + (onlyMedia ? 0 : (g.height() - media->height()));
+		const auto position = QPoint(left, top);
+		p.translate(position);
+		media->draw(p, context.translated(-position).withSelection({}));
+		p.translate(-position);
 	}
 }
 
@@ -596,12 +712,6 @@ PointState Service::pointState(QPoint point) const {
 		return PointState::Outside;
 	}
 
-	if (const auto dateh = displayedDateHeight()) {
-		g.setTop(g.top() + dateh);
-	}
-	if (const auto bar = Get<UnreadBar>()) {
-		g.setTop(g.top() + bar->height());
-	}
 	if (mediaDisplayed) {
 		const auto centerPadding = (g.width() - media->width()) / 2;
 		const auto r = g - QMargins(centerPadding, 0, centerPadding, 0);
@@ -626,24 +736,52 @@ TextState Service::textState(QPoint point, StateRequest request) const {
 		return result;
 	}
 
-	if (const auto dateh = displayedDateHeight()) {
-		point.setY(point.y() - dateh);
-		g.setHeight(g.height() - dateh);
+	if (const auto service = Get<ServicePreMessage>()) {
+		result.link = service->textState(point, request, g);
+		if (result.link) {
+			return result;
+		}
 	}
-	if (const auto bar = Get<UnreadBar>()) {
-		auto unreadbarh = bar->height();
-		point.setY(point.y() - unreadbarh);
-		g.setHeight(g.height() - unreadbarh);
+
+	if (_reactions) {
+		const auto reactionsHeight = st::mediaInBubbleSkip + _reactions->height();
+		const auto reactionsLeft = 0;
+		g.setHeight(g.height() - reactionsHeight);
+		const auto reactionsPosition = QPoint(reactionsLeft + g.left(), g.top() + g.height() + st::mediaInBubbleSkip);
+		if (_reactions->getState(point - reactionsPosition, &result)) {
+			//result.symbol += visibleMediaTextLen + visibleTextLen;
+			return result;
+		}
+	}
+
+	auto keyboard = item->inlineReplyKeyboard();
+	auto keyboardHeight = 0;
+	if (keyboard) {
+		keyboardHeight = keyboard->naturalHeight();
+		g.setHeight(g.height() - st::msgBotKbButton.margin - keyboardHeight);
+
+		if (item->isHistoryEntry()) {
+			const auto keyboardWidth = mediaDisplayed ? media->width() : g.width();
+			const auto keyboardPosition = QPoint(
+				g.left() + (g.width() - keyboardWidth) / 2,
+				g.top() + g.height() + st::msgBotKbButton.margin);
+			if (QRect(keyboardPosition, QSize(keyboardWidth, keyboardHeight)).contains(point)) {
+				result.link = keyboard->getLink(point - keyboardPosition);
+				if (result.link) {
+					return result;
+				}
+			}
+		}
 	}
 
 	if (onlyMedia) {
-		return media->textState(point - QPoint(st::msgServiceMargin.left() + (g.width() - media->width()) / 2, st::msgServiceMargin.top()), request);
+		return media->textState(point - QPoint(st::msgServiceMargin.left() + (g.width() - media->width()) / 2, g.top()), request);
 	} else if (mediaDisplayed) {
 		g.setHeight(g.height() - (st::msgServiceMargin.top() + media->height()));
 	}
 	const auto mediaLeft = st::msgServiceMargin.left()
 		+ (media ? ((g.width() - media->width()) / 2) : 0);
-	const auto mediaTop = st::msgServiceMargin.top()
+	const auto mediaTop = g.top()
 		+ g.height()
 		+ st::msgServiceMargin.top();
 	const auto mediaPoint = point - QPoint(mediaLeft, mediaTop);
@@ -681,6 +819,16 @@ TextState Service::textState(QPoint point, StateRequest request) const {
 				result.link = custom->link;
 			} else if (const auto payment = item->Get<HistoryServicePaymentRefund>()) {
 				result.link = payment->link;
+			} else if (const auto done = item->Get<HistoryServiceTodoCompletions>()) {
+				result.link = done->lnk;
+			} else if (const auto append = item->Get<HistoryServiceTodoAppendTasks>()) {
+				result.link = append->lnk;
+			} else if (const auto pollAppend = item->Get<HistoryServicePollAppendAnswer>()) {
+				result.link = pollAppend->lnk;
+			} else if (const auto pollDelete = item->Get<HistoryServicePollDeleteAnswer>()) {
+				result.link = pollDelete->lnk;
+			} else if (const auto finish = item->Get<HistoryServiceSuggestFinish>()) {
+				result.link = finish->lnk;
 			} else if (media && data()->showSimilarChannels()) {
 				result = media->textState(mediaPoint, request);
 			}
@@ -826,7 +974,8 @@ void EmptyPainter::paint(
 	if (_icon) {
 		_icon->paintInRect(
 			p,
-			QRect(bubbleLeft, top, bubbleWidth, iconHeight));
+			QRect(bubbleLeft, top, bubbleWidth, iconHeight),
+			st->msgServiceFg()->c);
 		top += iconHeight + st::historyGroupAboutHeaderSkip;
 	}
 
diff --git a/Telegram/SourceFiles/history/view/history_view_service_message.h b/Telegram/SourceFiles/history/view/history_view_service_message.h
index 76bf73e0295037..a4adae0b51414d 100644
--- a/Telegram/SourceFiles/history/view/history_view_service_message.h
+++ b/Telegram/SourceFiles/history/view/history_view_service_message.h
@@ -33,6 +33,10 @@ class Service final : public Element {
 		not_null<HistoryItem*> data,
 		Element *replacing);
 
+	void clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed) override;
+
 	int marginTop() const override;
 	int marginBottom() const override;
 	bool isHidden() const override;
@@ -54,6 +58,8 @@ class Service final : public Element {
 
 	bool consumeHorizontalScroll(QPoint position, int delta) override;
 
+	void animateReaction(Ui::ReactionFlyAnimationArgs &&args) override;
+
 private:
 	[[nodiscard]] QRect countGeometry() const;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp b/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp
index b35239841a78ce..68446736c5e8a1 100644
--- a/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_sticker_toast.cpp
@@ -21,7 +21,7 @@ For license and copyright information please follow this link:
 #include "boxes/premium_preview_box.h"
 #include "lottie/lottie_single_player.h"
 #include "window/window_session_controller.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "apiwrap.h"
 #include "styles/style_chat.h"
 
@@ -36,7 +36,14 @@ StickerToast::StickerToast(
 	not_null<Window::SessionController*> controller,
 	not_null<QWidget*> parent,
 	Fn<void()> destroy)
-: _controller(controller)
+: StickerToast(controller->uiShow(), parent, std::move(destroy)) {
+}
+
+StickerToast::StickerToast(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<QWidget*> parent,
+	Fn<void()> destroy)
+: _show(std::move(show))
 , _parent(parent)
 , _destroy(std::move(destroy)) {
 }
@@ -104,7 +111,7 @@ void StickerToast::requestSet() {
 	Expects(_for != nullptr);
 
 	if (const auto sticker = _for->sticker()) {
-		const auto api = &_controller->session().api();
+		const auto api = &_show->session().api();
 		_setRequestId = api->request(MTPmessages_GetStickerSet(
 			Data::InputStickerSet(sticker->set),
 			MTP_int(0) // hash
@@ -112,7 +119,7 @@ void StickerToast::requestSet() {
 			_setRequestId = 0;
 			result.match([&](const MTPDmessages_stickerSet &data) {
 				data.vset().match([&](const MTPDstickerSet &data) {
-					const auto owner = &_controller->session().data();
+					const auto owner = &_show->session().data();
 					showWithTitle(owner->stickers().getSetTitle(data));
 				});
 			}, [&](const MTPDmessages_stickerSetNotModified &) {
@@ -125,7 +132,7 @@ void StickerToast::requestSet() {
 }
 
 void StickerToast::cancelRequest() {
-	_controller->session().api().request(base::take(_setRequestId)).cancel();
+	_show->session().api().request(base::take(_setRequestId)).cancel();
 }
 
 void StickerToast::showWithTitle(const QString &title) {
@@ -138,14 +145,14 @@ void StickerToast::showWithTitle(const QString &title) {
 	const auto toSaved = isEmoji
 		&& (_section == Section::Message)
 		&& !(++counter % 2);
-	const auto text = Ui::Text::Bold(
+	const auto text = tr::bold(
 		title
 	).append('\n').append(
 		(toSaved
-			? tr::lng_animated_emoji_saved(tr::now, Ui::Text::RichLangValue)
+			? tr::lng_animated_emoji_saved(tr::now, tr::rich)
 			: isEmoji
-			? tr::lng_animated_emoji_text(tr::now, Ui::Text::RichLangValue)
-			: tr::lng_sticker_premium_text(tr::now, Ui::Text::RichLangValue))
+			? tr::lng_animated_emoji_text(tr::now, tr::rich)
+			: tr::lng_sticker_premium_text(tr::now, tr::rich))
 	);
 	_st = st::historyPremiumToast;
 	const auto skip = _st.padding.top();
@@ -195,12 +202,11 @@ void StickerToast::showWithTitle(const QString &title) {
 		widget.get(),
 		rpl::single(view),
 		st::historyPremiumViewSet);
-	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	button->show();
 	rpl::combine(
 		widget->sizeValue(),
 		button->sizeValue()
-	) | rpl::start_with_next([=](QSize outer, QSize inner) {
+	) | rpl::on_next([=](QSize outer, QSize inner) {
 		button->moveToRight(
 			0,
 			(outer.height() - inner.height()) / 2,
@@ -219,29 +225,28 @@ void StickerToast::showWithTitle(const QString &title) {
 	}
 	button->setClickedCallback([=] {
 		if (toSaved) {
-			_controller->showPeerHistory(
-				_controller->session().userPeerId(),
-				Window::SectionShow::Way::Forward);
+			if (const auto window = _show->resolveWindow()) {
+				window->showPeerHistory(
+					window->session().userPeerId(),
+					Window::SectionShow::Way::Forward);
+			}
 			hideToast();
 			return;
 		} else if (_section == Section::TopicIcon) {
-			Settings::ShowPremium(_controller, u"forum_topic_icon"_q);
+			if (const auto window = _show->resolveWindow()) {
+				Settings::ShowPremium(window, u"forum_topic_icon"_q);
+			}
 			return;
 		}
-		const auto id = _for->sticker()->set.id;
+		const auto id = _for->sticker()->set;
 		const auto &sets = _for->owner().stickers().sets();
-		const auto i = sets.find(id);
+		const auto i = sets.find(id.id);
 		if (isEmoji
 			&& (i != end(sets))
 			&& (i->second->flags & Data::StickersSetFlag::Installed)) {
-			ShowPremiumPreviewBox(
-				_controller,
-				PremiumFeature::AnimatedEmoji);
+			ShowPremiumPreviewBox(_show, PremiumFeature::AnimatedEmoji);
 		} else {
-			_controller->show(Box<StickerSetBox>(
-				_controller->uiShow(),
-				_for->sticker()->set,
-				setType));
+			_show->show(Box<StickerSetBox>(_show, id, setType));
 		}
 		hideToast();
 	});
@@ -304,7 +309,7 @@ void StickerToast::setupEmojiPreview(
 		[=] { widget->update(); });
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(widget);
 		const auto size = Ui::Emoji::GetSizeLarge()
 			/ style::DevicePixelRatio();
@@ -330,7 +335,7 @@ void StickerToast::setupLottiePreview(not_null<Ui::RpWidget*> widget, int size)
 		Lottie::Quality::Default);
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!player->ready()) {
 			return;
 		}
@@ -342,7 +347,7 @@ void StickerToast::setupLottiePreview(not_null<Ui::RpWidget*> widget, int size)
 	}, widget->lifetime());
 
 	player->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		widget->update();
 	}, widget->lifetime());
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_sticker_toast.h b/Telegram/SourceFiles/history/view/history_view_sticker_toast.h
index 75cd372e86dca3..eb8da4466ba695 100644
--- a/Telegram/SourceFiles/history/view/history_view_sticker_toast.h
+++ b/Telegram/SourceFiles/history/view/history_view_sticker_toast.h
@@ -9,6 +9,10 @@ For license and copyright information please follow this link:
 
 #include "styles/style_widgets.h"
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Ui {
 class Show;
 class RpWidget;
@@ -30,6 +34,10 @@ class StickerToast final {
 		not_null<Window::SessionController*> controller,
 		not_null<QWidget*> parent,
 		Fn<void()> destroy);
+	StickerToast(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<QWidget*> parent,
+		Fn<void()> destroy);
 	~StickerToast();
 
 	enum class Section {
@@ -50,7 +58,7 @@ class StickerToast final {
 	void setupLottiePreview(not_null<Ui::RpWidget*> widget, int size);
 	void clearHiddenHiding();
 
-	const not_null<Window::SessionController*> _controller;
+	const std::shared_ptr<ChatHelpers::Show> _show;
 	const not_null<QWidget*> _parent;
 	Section _section = {};
 	style::Toast _st;
diff --git a/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp b/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
deleted file mode 100644
index f934a55fe9181b..00000000000000
--- a/Telegram/SourceFiles/history/view/history_view_sublist_section.cpp
+++ /dev/null
@@ -1,785 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "history/view/history_view_sublist_section.h"
-
-#include "main/main_session.h"
-#include "core/application.h"
-#include "core/shortcuts.h"
-#include "data/data_message_reaction_id.h"
-#include "data/data_saved_messages.h"
-#include "data/data_saved_sublist.h"
-#include "data/data_session.h"
-#include "data/data_peer_values.h"
-#include "data/data_user.h"
-#include "history/view/controls/history_view_compose_search.h"
-#include "history/view/history_view_top_bar_widget.h"
-#include "history/view/history_view_translate_bar.h"
-#include "history/view/history_view_list_widget.h"
-#include "history/history.h"
-#include "history/history_item.h"
-#include "lang/lang_keys.h"
-#include "ui/chat/chat_style.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/scroll_area.h"
-#include "ui/widgets/shadow.h"
-#include "ui/ui_utility.h"
-#include "window/window_session_controller.h"
-#include "styles/style_chat.h"
-#include "styles/style_chat_helpers.h"
-#include "styles/style_window.h"
-
-namespace HistoryView {
-namespace {
-
-} // namespace
-
-SublistMemento::SublistMemento(not_null<Data::SavedSublist*> sublist)
-: _sublist(sublist) {
-	const auto selfId = sublist->session().userPeerId();
-	_list.setAroundPosition({
-		.fullId = FullMsgId(selfId, ShowAtUnreadMsgId),
-		.date = TimeId(0),
-	});
-}
-
-object_ptr<Window::SectionWidget> SublistMemento::createWidget(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		Window::Column column,
-		const QRect &geometry) {
-	if (column == Window::Column::Third) {
-		return nullptr;
-	}
-	auto result = object_ptr<SublistWidget>(
-		parent,
-		controller,
-		_sublist);
-	result->setInternalState(geometry, this);
-	return result;
-}
-
-SublistWidget::SublistWidget(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller,
-	not_null<Data::SavedSublist*> sublist)
-: Window::SectionWidget(parent, controller, sublist->peer())
-, WindowListDelegate(controller)
-, _sublist(sublist)
-, _history(sublist->owner().history(sublist->session().user()))
-, _topBar(this, controller)
-, _topBarShadow(this)
-, _translateBar(std::make_unique<TranslateBar>(this, controller, _history))
-, _scroll(std::make_unique<Ui::ScrollArea>(
-	this,
-	controller->chatStyle()->value(lifetime(), st::historyScroll),
-	false))
-, _cornerButtons(
-		_scroll.get(),
-		controller->chatStyle(),
-		static_cast<HistoryView::CornerButtonsDelegate*>(this)) {
-	controller->chatStyle()->paletteChanged(
-	) | rpl::start_with_next([=] {
-		_scroll->updateBars();
-	}, _scroll->lifetime());
-
-	setupOpenChatButton();
-	setupAboutHiddenAuthor();
-
-	Window::ChatThemeValueFromPeer(
-		controller,
-		sublist->peer()
-	) | rpl::start_with_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
-		_theme = std::move(theme);
-		controller->setChatStyleTheme(_theme);
-	}, lifetime());
-
-	_topBar->setActiveChat(
-		TopBarWidget::ActiveChat{
-			.key = sublist,
-			.section = Dialogs::EntryState::Section::SavedSublist,
-		},
-		nullptr);
-
-	_topBar->move(0, 0);
-	_topBar->resizeToWidth(width());
-	_topBar->show();
-
-	_topBar->deleteSelectionRequest(
-	) | rpl::start_with_next([=] {
-		confirmDeleteSelected();
-	}, _topBar->lifetime());
-	_topBar->forwardSelectionRequest(
-	) | rpl::start_with_next([=] {
-		confirmForwardSelected();
-	}, _topBar->lifetime());
-	_topBar->clearSelectionRequest(
-	) | rpl::start_with_next([=] {
-		clearSelected();
-	}, _topBar->lifetime());
-	_topBar->searchRequest(
-	) | rpl::start_with_next([=] {
-		searchInSublist();
-	}, _topBar->lifetime());
-
-	_translateBar->raise();
-	_topBarShadow->raise();
-	controller->adaptive().value(
-	) | rpl::start_with_next([=] {
-		updateAdaptiveLayout();
-	}, lifetime());
-
-	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
-		this,
-		&controller->session(),
-		static_cast<ListDelegate*>(this)));
-	_scroll->move(0, _topBar->height());
-	_scroll->show();
-	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
-		onScroll();
-	}, lifetime());
-
-	setupShortcuts();
-	setupTranslateBar();
-}
-
-SublistWidget::~SublistWidget() = default;
-
-void SublistWidget::setupOpenChatButton() {
-	if (_sublist->peer()->isSavedHiddenAuthor()) {
-		return;
-	}
-	_openChatButton = std::make_unique<Ui::FlatButton>(
-		this,
-		(_sublist->peer()->isBroadcast()
-			? tr::lng_saved_open_channel(tr::now)
-			: _sublist->peer()->isUser()
-			? tr::lng_saved_open_chat(tr::now)
-			: tr::lng_saved_open_group(tr::now)),
-		st::historyComposeButton);
-
-	_openChatButton->setClickedCallback([=] {
-		controller()->showPeerHistory(
-			_sublist->peer(),
-			Window::SectionShow::Way::Forward);
-	});
-}
-
-void SublistWidget::setupAboutHiddenAuthor() {
-	if (!_sublist->peer()->isSavedHiddenAuthor()) {
-		return;
-	}
-	_aboutHiddenAuthor = std::make_unique<Ui::RpWidget>(this);
-	_aboutHiddenAuthor->paintRequest() | rpl::start_with_next([=] {
-		auto p = QPainter(_aboutHiddenAuthor.get());
-		auto rect = _aboutHiddenAuthor->rect();
-
-		p.fillRect(rect, st::historyReplyBg);
-
-		p.setFont(st::normalFont);
-		p.setPen(st::windowSubTextFg);
-		p.drawText(
-			rect.marginsRemoved(
-				QMargins(st::historySendPadding, 0, st::historySendPadding, 0)),
-			tr::lng_saved_about_hidden(tr::now),
-			style::al_center);
-	}, _aboutHiddenAuthor->lifetime());
-}
-
-void SublistWidget::setupTranslateBar() {
-	controller()->adaptive().oneColumnValue(
-	) | rpl::start_with_next([=, raw = _translateBar.get()](bool one) {
-		raw->setShadowGeometryPostprocess([=](QRect geometry) {
-			if (!one) {
-				geometry.setLeft(geometry.left() + st::lineWidth);
-			}
-			return geometry;
-		});
-	}, _translateBar->lifetime());
-
-	_translateBarHeight = 0;
-	_translateBar->heightValue(
-	) | rpl::start_with_next([=](int height) {
-		if (const auto delta = height - _translateBarHeight) {
-			_translateBarHeight = height;
-			setGeometryWithTopMoved(geometry(), delta);
-		}
-	}, _translateBar->lifetime());
-
-	_translateBar->finishAnimating();
-}
-
-void SublistWidget::cornerButtonsShowAtPosition(
-		Data::MessagePosition position) {
-	showAtPosition(position);
-}
-
-Data::Thread *SublistWidget::cornerButtonsThread() {
-	return nullptr;
-}
-
-FullMsgId SublistWidget::cornerButtonsCurrentId() {
-	return _lastShownAt;
-}
-
-bool SublistWidget::cornerButtonsIgnoreVisibility() {
-	return animatingShow();
-}
-
-std::optional<bool> SublistWidget::cornerButtonsDownShown() {
-	const auto top = _scroll->scrollTop() + st::historyToDownShownAfter;
-	if (top < _scroll->scrollTopMax() || _cornerButtons.replyReturn()) {
-		return true;
-	} else if (_inner->loadedAtBottomKnown()) {
-		return !_inner->loadedAtBottom();
-	}
-	return std::nullopt;
-}
-
-bool SublistWidget::cornerButtonsUnreadMayBeShown() {
-	return _inner->loadedAtBottomKnown();
-}
-
-bool SublistWidget::cornerButtonsHas(CornerButtonType type) {
-	return (type == CornerButtonType::Down);
-}
-
-void SublistWidget::showAtPosition(
-		Data::MessagePosition position,
-		FullMsgId originId) {
-	showAtPosition(position, originId, {});
-}
-
-void SublistWidget::showAtPosition(
-		Data::MessagePosition position,
-		FullMsgId originItemId,
-		const Window::SectionShow &params) {
-	_lastShownAt = position.fullId;
-	controller()->setActiveChatEntry(activeChat());
-	_inner->showAtPosition(
-		position,
-		params,
-		_cornerButtons.doneJumpFrom(position.fullId, originItemId));
-}
-void SublistWidget::updateAdaptiveLayout() {
-	_topBarShadow->moveToLeft(
-		controller()->adaptive().isOneColumn() ? 0 : st::lineWidth,
-		_topBar->height());
-}
-
-not_null<Data::SavedSublist*> SublistWidget::sublist() const {
-	return _sublist;
-}
-
-Dialogs::RowDescriptor SublistWidget::activeChat() const {
-	const auto messageId = _lastShownAt
-		? _lastShownAt
-		: FullMsgId(_history->peer->id, ShowAtUnreadMsgId);
-	return { _sublist, messageId };
-}
-
-QPixmap SublistWidget::grabForShowAnimation(
-		const Window::SectionSlideParams &params) {
-	_topBar->updateControlsVisibility();
-	if (params.withTopBarShadow) _topBarShadow->hide();
-	auto result = Ui::GrabWidget(this);
-	if (params.withTopBarShadow) _topBarShadow->show();
-	_translateBar->hide();
-	return result;
-}
-
-void SublistWidget::checkActivation() {
-	_inner->checkActivation();
-}
-
-void SublistWidget::doSetInnerFocus() {
-	if (_composeSearch) {
-		_composeSearch->setInnerFocus();
-	} else {
-		_inner->setFocus();
-	}
-}
-
-bool SublistWidget::showInternal(
-		not_null<Window::SectionMemento*> memento,
-		const Window::SectionShow &params) {
-	if (auto logMemento = dynamic_cast<SublistMemento*>(memento.get())) {
-		if (logMemento->getSublist() == sublist()) {
-			restoreState(logMemento);
-			return true;
-		}
-	}
-	return false;
-}
-
-bool SublistWidget::sameTypeAs(not_null<Window::SectionMemento*> memento) {
-	return dynamic_cast<SublistMemento*>(memento.get()) != nullptr;
-}
-
-void SublistWidget::setInternalState(
-		const QRect &geometry,
-		not_null<SublistMemento*> memento) {
-	setGeometry(geometry);
-	Ui::SendPendingMoveResizeEvents(this);
-	restoreState(memento);
-}
-
-bool SublistWidget::searchInChatEmbedded(Dialogs::Key chat, QString query) {
-	const auto sublist = chat.sublist();
-	if (!sublist || sublist != _sublist) {
-		return false;
-	} else if (_composeSearch) {
-		_composeSearch->setQuery(query);
-		_composeSearch->setInnerFocus();
-		return true;
-	}
-	_composeSearch = std::make_unique<HistoryView::ComposeSearch>(
-		this,
-		controller(),
-		_history,
-		sublist->peer(),
-		query);
-
-	updateControlsGeometry();
-	setInnerFocus();
-
-	_composeSearch->activations(
-	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
-		controller()->showPeerHistory(
-			item->history()->peer->id,
-			::Window::SectionShow::Way::ClearStack,
-			item->fullId().msg);
-	}, _composeSearch->lifetime());
-
-	_composeSearch->destroyRequests(
-	) | rpl::take(
-		1
-	) | rpl::start_with_next([=] {
-		_composeSearch = nullptr;
-
-		updateControlsGeometry();
-		setInnerFocus();
-	}, _composeSearch->lifetime());
-
-	return true;
-}
-
-std::shared_ptr<Window::SectionMemento> SublistWidget::createMemento() {
-	auto result = std::make_shared<SublistMemento>(sublist());
-	saveState(result.get());
-	return result;
-}
-
-bool SublistWidget::showMessage(
-		PeerId peerId,
-		const Window::SectionShow &params,
-		MsgId messageId) {
-	const auto id = FullMsgId(_history->peer->id, messageId);
-	const auto message = _history->owner().message(id);
-	if (!message || message->savedSublist() != _sublist) {
-		return false;
-	}
-	const auto originMessage = [&]() -> HistoryItem* {
-		using OriginMessage = Window::SectionShow::OriginMessage;
-		if (const auto origin = std::get_if<OriginMessage>(&params.origin)) {
-			if (const auto returnTo = session().data().message(origin->id)) {
-				if (returnTo->savedSublist() == _sublist) {
-					return returnTo;
-				}
-			}
-		}
-		return nullptr;
-	}();
-	const auto currentReplyReturn = _cornerButtons.replyReturn();
-	const auto originItemId = !originMessage
-		? FullMsgId()
-		: (currentReplyReturn != originMessage)
-		? originMessage->fullId()
-		: FullMsgId();
-	showAtPosition(message->position(), originItemId, params);
-	return true;
-}
-
-void SublistWidget::saveState(not_null<SublistMemento*> memento) {
-	_inner->saveState(memento->list());
-}
-
-void SublistWidget::restoreState(not_null<SublistMemento*> memento) {
-	_inner->restoreState(memento->list());
-}
-
-void SublistWidget::resizeEvent(QResizeEvent *e) {
-	if (!width() || !height()) {
-		return;
-	}
-	recountChatWidth();
-	updateControlsGeometry();
-}
-
-void SublistWidget::recountChatWidth() {
-	auto layout = (width() < st::adaptiveChatWideWidth)
-		? Window::Adaptive::ChatLayout::Normal
-		: Window::Adaptive::ChatLayout::Wide;
-	controller()->adaptive().setChatLayout(layout);
-}
-
-void SublistWidget::updateControlsGeometry() {
-	const auto contentWidth = width();
-
-	const auto newScrollTop = _scroll->isHidden()
-		? std::nullopt
-		: base::make_optional(_scroll->scrollTop() + topDelta());
-	_topBar->resizeToWidth(contentWidth);
-	_topBarShadow->resize(contentWidth, st::lineWidth);
-
-	auto bottom = height();
-	if (_openChatButton) {
-		_openChatButton->resizeToWidth(width());
-		bottom -= _openChatButton->height();
-		_openChatButton->move(0, bottom);
-	}
-	if (_aboutHiddenAuthor) {
-		_aboutHiddenAuthor->resize(width(), st::historyUnblock.height);
-		bottom -= _aboutHiddenAuthor->height();
-		_aboutHiddenAuthor->move(0, bottom);
-	}
-	const auto controlsHeight = 0;
-	auto top = _topBar->height();
-	_translateBar->move(0, top);
-	_translateBar->resizeToWidth(contentWidth);
-	top += _translateBarHeight;
-	const auto scrollHeight = bottom - top - controlsHeight;
-	const auto scrollSize = QSize(contentWidth, scrollHeight);
-	if (_scroll->size() != scrollSize) {
-		_skipScrollEvent = true;
-		_scroll->resize(scrollSize);
-		_inner->resizeToWidth(scrollSize.width(), _scroll->height());
-		_skipScrollEvent = false;
-	}
-	_scroll->move(0, top);
-	if (!_scroll->isHidden()) {
-		if (newScrollTop) {
-			_scroll->scrollToY(*newScrollTop);
-		}
-		updateInnerVisibleArea();
-	}
-
-	_cornerButtons.updatePositions();
-}
-
-void SublistWidget::paintEvent(QPaintEvent *e) {
-	if (animatingShow()) {
-		SectionWidget::paintEvent(e);
-		return;
-	} else if (controller()->contentOverlapped(this, e)) {
-		return;
-	}
-
-	const auto aboveHeight = _topBar->height();
-	const auto bg = e->rect().intersected(
-		QRect(0, aboveHeight, width(), height() - aboveHeight));
-	SectionWidget::PaintBackground(controller(), _theme.get(), this, bg);
-}
-
-void SublistWidget::onScroll() {
-	if (_skipScrollEvent) {
-		return;
-	}
-	updateInnerVisibleArea();
-}
-
-void SublistWidget::updateInnerVisibleArea() {
-	const auto scrollTop = _scroll->scrollTop();
-	_inner->setVisibleTopBottom(scrollTop, scrollTop + _scroll->height());
-	_cornerButtons.updateJumpDownVisibility();
-	_cornerButtons.updateUnreadThingsVisibility();
-}
-
-void SublistWidget::showAnimatedHook(
-		const Window::SectionSlideParams &params) {
-	_topBar->setAnimatingMode(true);
-	if (params.withTopBarShadow) {
-		_topBarShadow->show();
-	}
-}
-
-void SublistWidget::showFinishedHook() {
-	_topBar->setAnimatingMode(false);
-	_inner->showFinished();
-	_translateBar->show();
-}
-
-bool SublistWidget::floatPlayerHandleWheelEvent(QEvent *e) {
-	return _scroll->viewportEvent(e);
-}
-
-QRect SublistWidget::floatPlayerAvailableRect() {
-	return mapToGlobal(_scroll->geometry());
-}
-
-Context SublistWidget::listContext() {
-	return Context::SavedSublist;
-}
-
-bool SublistWidget::listScrollTo(int top, bool syntetic) {
-	top = std::clamp(top, 0, _scroll->scrollTopMax());
-	if (_scroll->scrollTop() == top) {
-		updateInnerVisibleArea();
-		return false;
-	}
-	_scroll->scrollToY(top);
-	return true;
-}
-
-void SublistWidget::listCancelRequest() {
-	if (_inner && !_inner->getSelectedIds().empty()) {
-		clearSelected();
-		return;
-	}
-	controller()->showBackFromStack();
-}
-
-void SublistWidget::listDeleteRequest() {
-	confirmDeleteSelected();
-}
-
-void SublistWidget::listTryProcessKeyInput(not_null<QKeyEvent*> e) {
-}
-
-rpl::producer<Data::MessagesSlice> SublistWidget::listSource(
-		Data::MessagePosition aroundId,
-		int limitBefore,
-		int limitAfter) {
-	const auto messageId = aroundId.fullId.msg
-		? aroundId.fullId.msg
-		: (ServerMaxMsgId - 1);
-	return [=](auto consumer) {
-		const auto pushSlice = [=] {
-			auto result = Data::MessagesSlice();
-			result.fullCount = _sublist->fullCount();
-			_topBar->setCustomTitle(result.fullCount
-				? tr::lng_forum_messages(
-					tr::now,
-					lt_count_decimal,
-					*result.fullCount)
-				: tr::lng_contacts_loading(tr::now));
-			const auto &messages = _sublist->messages();
-			const auto i = ranges::lower_bound(
-				messages,
-				messageId,
-				ranges::greater(),
-				[](not_null<HistoryItem*> item) { return item->id; });
-			const auto before = int(end(messages) - i);
-			const auto useBefore = std::min(before, limitBefore);
-			const auto after = int(i - begin(messages));
-			const auto useAfter = std::min(after, limitAfter);
-			const auto from = i - useAfter;
-			const auto till = i + useBefore;
-			auto nearestDistance = std::numeric_limits<int64>::max();
-			result.ids.reserve(useAfter + useBefore);
-			for (auto j = till; j != from;) {
-				const auto item = *--j;
-				result.ids.push_back(item->fullId());
-				const auto distance = std::abs((messageId - item->id).bare);
-				if (nearestDistance > distance) {
-					nearestDistance = distance;
-					result.nearestToAround = result.ids.back();
-				}
-			}
-			result.skippedAfter = after - useAfter;
-			result.skippedBefore = result.fullCount
-				? (*result.fullCount - after - useBefore)
-				: std::optional<int>();
-			if (!result.fullCount || useBefore < limitBefore) {
-				_sublist->owner().savedMessages().loadMore(_sublist);
-			}
-			consumer.put_next(std::move(result));
-		};
-		auto lifetime = rpl::lifetime();
-		_sublist->changes() | rpl::start_with_next(pushSlice, lifetime);
-		pushSlice();
-		return lifetime;
-	};
-}
-
-bool SublistWidget::listAllowsMultiSelect() {
-	return true;
-}
-
-bool SublistWidget::listIsItemGoodForSelection(
-		not_null<HistoryItem*> item) {
-	return item->isRegular() && !item->isService();
-}
-
-bool SublistWidget::listIsLessInOrder(
-		not_null<HistoryItem*> first,
-		not_null<HistoryItem*> second) {
-	return first->id < second->id;
-}
-
-void SublistWidget::listSelectionChanged(SelectedItems &&items) {
-	HistoryView::TopBarWidget::SelectedState state;
-	state.count = items.size();
-	for (const auto &item : items) {
-		if (item.canDelete) {
-			++state.canDeleteCount;
-		}
-		if (item.canForward) {
-			++state.canForwardCount;
-		}
-	}
-	_topBar->showSelected(state);
-	if ((state.count > 0) && _composeSearch) {
-		_composeSearch->hideAnimated();
-	}
-}
-
-void SublistWidget::listMarkReadTill(not_null<HistoryItem*> item) {
-}
-
-void SublistWidget::listMarkContentsRead(
-	const base::flat_set<not_null<HistoryItem*>> &items) {
-}
-
-MessagesBarData SublistWidget::listMessagesBar(
-		const std::vector<not_null<Element*>> &elements) {
-	return {};
-}
-
-void SublistWidget::listContentRefreshed() {
-}
-
-void SublistWidget::listUpdateDateLink(
-	ClickHandlerPtr &link,
-	not_null<Element*> view) {
-}
-
-bool SublistWidget::listElementHideReply(not_null<const Element*> view) {
-	return false;
-}
-
-bool SublistWidget::listElementShownUnread(not_null<const Element*> view) {
-	return view->data()->unread(view->data()->history());
-}
-
-bool SublistWidget::listIsGoodForAroundPosition(
-		not_null<const Element*> view) {
-	return view->data()->isRegular();
-}
-
-void SublistWidget::listSendBotCommand(
-	const QString &command,
-	const FullMsgId &context) {
-}
-
-void SublistWidget::listSearch(
-		const QString &query,
-		const FullMsgId &context) {
-	const auto inChat = Data::SearchTagFromQuery(query)
-		? Dialogs::Key(_sublist)
-		: Dialogs::Key();
-	controller()->searchMessages(query, inChat);
-}
-
-void SublistWidget::listHandleViaClick(not_null<UserData*> bot) {
-}
-
-not_null<Ui::ChatTheme*> SublistWidget::listChatTheme() {
-	return _theme.get();
-}
-
-CopyRestrictionType SublistWidget::listCopyRestrictionType(
-		HistoryItem *item) {
-	return CopyRestrictionTypeFor(_history->peer, item);
-}
-
-CopyRestrictionType SublistWidget::listCopyMediaRestrictionType(
-		not_null<HistoryItem*> item) {
-	return CopyMediaRestrictionTypeFor(_history->peer, item);
-}
-
-CopyRestrictionType SublistWidget::listSelectRestrictionType() {
-	return SelectRestrictionTypeFor(_history->peer);
-}
-
-auto SublistWidget::listAllowedReactionsValue()
--> rpl::producer<Data::AllowedReactions> {
-	return Data::PeerAllowedReactionsValue(_history->peer);
-}
-
-void SublistWidget::listShowPremiumToast(not_null<DocumentData*> document) {
-}
-
-void SublistWidget::listOpenPhoto(
-		not_null<PhotoData*> photo,
-		FullMsgId context) {
-	controller()->openPhoto(photo, { context });
-}
-
-void SublistWidget::listOpenDocument(
-		not_null<DocumentData*> document,
-		FullMsgId context,
-		bool showInMediaView) {
-	controller()->openDocument(document, showInMediaView, { context });
-}
-
-void SublistWidget::listPaintEmpty(
-	Painter &p,
-	const Ui::ChatPaintContext &context) {
-}
-
-QString SublistWidget::listElementAuthorRank(not_null<const Element*> view) {
-	return {};
-}
-
-bool SublistWidget::listElementHideTopicButton(
-		not_null<const Element*> view) {
-	return true;
-}
-
-History *SublistWidget::listTranslateHistory() {
-	return _history;
-}
-
-void SublistWidget::listAddTranslatedItems(
-	not_null<TranslateTracker*> tracker) {
-}
-
-void SublistWidget::confirmDeleteSelected() {
-	ConfirmDeleteSelectedItems(_inner);
-}
-
-void SublistWidget::confirmForwardSelected() {
-	ConfirmForwardSelectedItems(_inner);
-}
-
-void SublistWidget::clearSelected() {
-	_inner->cancelSelection();
-}
-
-void SublistWidget::setupShortcuts() {
-	Shortcuts::Requests(
-	) | rpl::filter([=] {
-		return Ui::AppInFocus()
-			&& Ui::InFocusChain(this)
-			&& !controller()->isLayerShown()
-			&& (Core::App().activeWindow() == &controller()->window());
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
-		using Command = Shortcuts::Command;
-		request->check(Command::Search, 1) && request->handle([=] {
-			searchInSublist();
-			return true;
-		});
-	}, lifetime());
-}
-
-void SublistWidget::searchInSublist() {
-	controller()->searchInChat(_sublist);
-}
-
-} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_sublist_section.h b/Telegram/SourceFiles/history/view/history_view_sublist_section.h
deleted file mode 100644
index 6379c984532336..00000000000000
--- a/Telegram/SourceFiles/history/view/history_view_sublist_section.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include "window/section_widget.h"
-#include "window/section_memento.h"
-#include "history/view/history_view_list_widget.h"
-#include "history/view/history_view_corner_buttons.h"
-#include "data/data_messages.h"
-#include "base/weak_ptr.h"
-#include "base/timer.h"
-
-class History;
-
-namespace Ui {
-class ScrollArea;
-class PlainShadow;
-class FlatButton;
-} // namespace Ui
-
-namespace Profile {
-class BackButton;
-} // namespace Profile
-
-namespace HistoryView {
-
-class Element;
-class TopBarWidget;
-class SublistMemento;
-class TranslateBar;
-class ComposeSearch;
-
-class SublistWidget final
-	: public Window::SectionWidget
-	, private WindowListDelegate
-	, private CornerButtonsDelegate {
-public:
-	SublistWidget(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		not_null<Data::SavedSublist*> sublist);
-	~SublistWidget();
-
-	[[nodiscard]] not_null<Data::SavedSublist*> sublist() const;
-	Dialogs::RowDescriptor activeChat() const override;
-
-	bool hasTopBarShadow() const override {
-		return true;
-	}
-
-	QPixmap grabForShowAnimation(
-		const Window::SectionSlideParams &params) override;
-
-	bool showInternal(
-		not_null<Window::SectionMemento*> memento,
-		const Window::SectionShow &params) override;
-	bool sameTypeAs(not_null<Window::SectionMemento*> memento) override;
-
-	std::shared_ptr<Window::SectionMemento> createMemento() override;
-	bool showMessage(
-		PeerId peerId,
-		const Window::SectionShow &params,
-		MsgId messageId) override;
-
-	void setInternalState(
-		const QRect &geometry,
-		not_null<SublistMemento*> memento);
-
-	Window::SectionActionResult sendBotCommand(
-			Bot::SendCommandRequest request) override {
-		return Window::SectionActionResult::Fallback;
-	}
-
-	bool searchInChatEmbedded(Dialogs::Key chat, QString query) override;
-
-	// Float player interface.
-	bool floatPlayerHandleWheelEvent(QEvent *e) override;
-	QRect floatPlayerAvailableRect() override;
-
-	// ListDelegate interface.
-	Context listContext() override;
-	bool listScrollTo(int top, bool syntetic = true) override;
-	void listCancelRequest() override;
-	void listDeleteRequest() override;
-	void listTryProcessKeyInput(not_null<QKeyEvent*> e) override;
-	rpl::producer<Data::MessagesSlice> listSource(
-		Data::MessagePosition aroundId,
-		int limitBefore,
-		int limitAfter) override;
-	bool listAllowsMultiSelect() override;
-	bool listIsItemGoodForSelection(not_null<HistoryItem*> item) override;
-	bool listIsLessInOrder(
-		not_null<HistoryItem*> first,
-		not_null<HistoryItem*> second) override;
-	void listSelectionChanged(SelectedItems &&items) override;
-	void listMarkReadTill(not_null<HistoryItem*> item) override;
-	void listMarkContentsRead(
-		const base::flat_set<not_null<HistoryItem*>> &items) override;
-	MessagesBarData listMessagesBar(
-		const std::vector<not_null<Element*>> &elements) override;
-	void listContentRefreshed() override;
-	void listUpdateDateLink(
-		ClickHandlerPtr &link,
-		not_null<Element*> view) override;
-	bool listElementHideReply(not_null<const Element*> view) override;
-	bool listElementShownUnread(not_null<const Element*> view) override;
-	bool listIsGoodForAroundPosition(not_null<const Element*> view) override;
-	void listSendBotCommand(
-		const QString &command,
-		const FullMsgId &context) override;
-	void listSearch(
-		const QString &query,
-		const FullMsgId &context) override;
-	void listHandleViaClick(not_null<UserData*> bot) override;
-	not_null<Ui::ChatTheme*> listChatTheme() override;
-	CopyRestrictionType listCopyRestrictionType(HistoryItem *item) override;
-	CopyRestrictionType listCopyMediaRestrictionType(
-		not_null<HistoryItem*> item) override;
-	CopyRestrictionType listSelectRestrictionType() override;
-	auto listAllowedReactionsValue()
-		-> rpl::producer<Data::AllowedReactions> override;
-	void listShowPremiumToast(not_null<DocumentData*> document) override;
-	void listOpenPhoto(
-		not_null<PhotoData*> photo,
-		FullMsgId context) override;
-	void listOpenDocument(
-		not_null<DocumentData*> document,
-		FullMsgId context,
-		bool showInMediaView) override;
-	void listPaintEmpty(
-		Painter &p,
-		const Ui::ChatPaintContext &context) override;
-	QString listElementAuthorRank(not_null<const Element*> view) override;
-	bool listElementHideTopicButton(not_null<const Element*> view) override;
-	History *listTranslateHistory() override;
-	void listAddTranslatedItems(
-		not_null<TranslateTracker*> tracker) override;
-
-	// CornerButtonsDelegate delegate.
-	void cornerButtonsShowAtPosition(
-		Data::MessagePosition position) override;
-	Data::Thread *cornerButtonsThread() override;
-	FullMsgId cornerButtonsCurrentId() override;
-	bool cornerButtonsIgnoreVisibility() override;
-	std::optional<bool> cornerButtonsDownShown() override;
-	bool cornerButtonsUnreadMayBeShown() override;
-	bool cornerButtonsHas(CornerButtonType type) override;
-
-private:
-	void resizeEvent(QResizeEvent *e) override;
-	void paintEvent(QPaintEvent *e) override;
-
-	void showAnimatedHook(
-		const Window::SectionSlideParams &params) override;
-	void showFinishedHook() override;
-	void doSetInnerFocus() override;
-	void checkActivation() override;
-
-	void onScroll();
-	void updateInnerVisibleArea();
-	void updateControlsGeometry();
-	void updateAdaptiveLayout();
-	void saveState(not_null<SublistMemento*> memento);
-	void restoreState(not_null<SublistMemento*> memento);
-	void showAtPosition(
-		Data::MessagePosition position,
-		FullMsgId originId = {});
-	void showAtPosition(
-		Data::MessagePosition position,
-		FullMsgId originItemId,
-		const Window::SectionShow &params);
-
-	void setupOpenChatButton();
-	void setupAboutHiddenAuthor();
-	void setupTranslateBar();
-	void setupShortcuts();
-
-	void confirmDeleteSelected();
-	void confirmForwardSelected();
-	void clearSelected();
-	void recountChatWidth();
-	void searchInSublist();
-
-	const not_null<Data::SavedSublist*> _sublist;
-	const not_null<History*> _history;
-	std::shared_ptr<Ui::ChatTheme> _theme;
-	QPointer<ListWidget> _inner;
-	object_ptr<TopBarWidget> _topBar;
-	object_ptr<Ui::PlainShadow> _topBarShadow;
-
-	std::unique_ptr<TranslateBar> _translateBar;
-	int _translateBarHeight = 0;
-
-	bool _skipScrollEvent = false;
-	std::unique_ptr<Ui::ScrollArea> _scroll;
-	std::unique_ptr<Ui::FlatButton> _openChatButton;
-	std::unique_ptr<Ui::RpWidget> _aboutHiddenAuthor;
-	std::unique_ptr<ComposeSearch> _composeSearch;
-
-	FullMsgId _lastShownAt;
-	CornerButtons _cornerButtons;
-
-};
-
-class SublistMemento : public Window::SectionMemento {
-public:
-	explicit SublistMemento(not_null<Data::SavedSublist*> sublist);
-
-	object_ptr<Window::SectionWidget> createWidget(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		Window::Column column,
-		const QRect &geometry) override;
-
-	[[nodiscard]] not_null<Data::SavedSublist*> getSublist() const {
-		return _sublist;
-	}
-
-	[[nodiscard]] not_null<ListMemento*> list() {
-		return &_list;
-	}
-
-private:
-	const not_null<Data::SavedSublist*> _sublist;
-	ListMemento _list;
-
-};
-
-} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
new file mode 100644
index 00000000000000..6ccb7c5750fccd
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
@@ -0,0 +1,1013 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_subsection_tabs.h"
+
+#include "apiwrap.h"
+#include "base/qt/qt_key_modifiers.h"
+#include "core/ui_integration.h"
+#include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_forum_topic.h"
+#include "data/data_forum.h"
+#include "data/data_saved_messages.h"
+#include "data/data_saved_sublist.h"
+#include "data/data_session.h"
+#include "data/data_thread.h"
+#include "data/data_user.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "dialogs/dialogs_main_list.h"
+#include "history/history.h"
+#include "lang/lang_keys.h"
+#include "main/main_session_settings.h"
+#include "main/main_session.h"
+#include "ui/controls/subsection_tabs_slider_reorder.h"
+#include "ui/controls/subsection_tabs_slider.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/text/text_utilities.h"
+#include "ui/ui_utility.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/discrete_sliders.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/widgets/shadow.h"
+#include "window/window_peer_menu.h"
+#include "window/window_separate_id.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+
+namespace HistoryView {
+namespace {
+
+constexpr auto kDefaultLimit = 12;
+
+} // namespace
+
+SubsectionTabs::SubsectionTabs(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::RpWidget*> parent,
+	not_null<Data::Thread*> thread)
+: _controller(controller)
+, _history(thread->owningHistory())
+, _active(thread)
+, _around(thread)
+, _beforeLimit(kDefaultLimit)
+, _afterLimit(kDefaultLimit) {
+	track();
+	refreshSlice();
+	setup(parent);
+
+	session().data().pinnedDialogsOrderUpdated() | rpl::on_next([=] {
+		_refreshed.fire({});
+	}, _lifetime);
+
+	dataChanged() | rpl::on_next([=] {
+		if (_loading) {
+			_loading = false;
+			refreshSlice();
+		}
+	}, _lifetime);
+}
+
+SubsectionTabs::~SubsectionTabs() {
+	delete base::take(_horizontal);
+	delete base::take(_vertical);
+	delete base::take(_bottom);
+	delete base::take(_shadow);
+}
+
+void SubsectionTabs::setup(not_null<Ui::RpWidget*> parent) {
+	const auto peerId = _history->peer->id;
+	const auto mode = session().settings().subsectionTabsMode(peerId);
+	if (mode == qint32(SubsectionTabsMode::Left)) {
+		setupVertical(parent);
+	} else if (mode == qint32(SubsectionTabsMode::Bottom)) {
+		setupHorizontal(parent, true);
+	} else {
+		setupHorizontal(parent, false);
+	}
+}
+
+void SubsectionTabs::setupHorizontal(
+		not_null<QWidget*> parent,
+		bool bottom) {
+	delete base::take(_vertical);
+	delete base::take(bottom ? _horizontal : _bottom);
+	auto &widgetRef = bottom ? _bottom : _horizontal;
+	widgetRef = Ui::CreateChild<Ui::RpWidget>(parent);
+	widgetRef->show();
+	const auto widget = widgetRef;
+
+	if (!_shadow) {
+		_shadow = Ui::CreateChild<Ui::PlainShadow>(parent);
+		_shadow->show();
+	} else {
+		_shadow->raise();
+	}
+
+	const auto toggle = Ui::CreateChild<Ui::IconButton>(
+		widget,
+		st::chatTabsToggle);
+	toggle->show();
+	toggle->setIconOverride(
+		bottom ? &st::chatTabsToggleIconBottom : &st::chatTabsToggleIconTop,
+		(bottom
+			? &st::chatTabsToggleIconBottomOver
+			: &st::chatTabsToggleIconTopOver));
+	toggle->setClickedCallback([=] {
+		toggleModes();
+	});
+	toggle->move(0, 0);
+	const auto scroll = Ui::CreateChild<Ui::ScrollArea>(
+		widget,
+		st::chatTabsScroll,
+		true);
+	scroll->show();
+	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(widget);
+	const auto slider = scroll->setOwnedWidget(
+		object_ptr<Ui::HorizontalSlider>(scroll));
+	_reorder = std::make_unique<Ui::SubsectionSliderReorder>(slider, scroll);
+	setupSlider(scroll, slider, false);
+
+	shadow->showOn(rpl::single(
+		rpl::empty
+	) | rpl::then(
+		scroll->scrolls()
+	) | rpl::map([=] { return scroll->scrollLeft() > 0; }));
+	shadow->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	widget->resize(
+		widget->width(),
+		std::max(toggle->height(), slider->height()));
+
+	scroll->setCustomWheelProcess([=](not_null<QWheelEvent*> e) {
+		const auto pixelDelta = e->pixelDelta();
+		const auto angleDelta = e->angleDelta();
+		if (std::abs(pixelDelta.x()) + std::abs(angleDelta.x())) {
+			return false;
+		}
+		const auto y = pixelDelta.y() ? pixelDelta.y() : angleDelta.y();
+		scroll->scrollToX(scroll->scrollLeft() - y);
+		return true;
+	});
+
+	widget->sizeValue(
+	) | rpl::on_next([=](QSize size) {
+		const auto togglew = toggle->width();
+		const auto height = size.height();
+		scroll->setGeometry(togglew, 0, size.width() - togglew, height);
+		shadow->setGeometry(togglew, 0, st::lineWidth, height);
+	}, scroll->lifetime());
+
+	widget->paintRequest() | rpl::on_next([=](QRect clip) {
+		auto p = QPainter(widget);
+
+		const auto line = st::lineWidth;
+		p.fillRect(
+			clip.intersected(
+				widget->rect().marginsRemoved(
+					{ 0, bottom ? line : 0, 0, bottom ? 0 : line })),
+			st::windowBg);
+		if (bottom) {
+			const auto shadow = QRect(
+				0,
+				widget->height() - line,
+				widget->width(),
+				line);
+			if (clip.intersects(shadow)) {
+				p.fillRect(clip.intersected(shadow), st::shadowFg);
+			}
+		}
+	}, widget->lifetime());
+
+	_layoutRequests.fire({});
+
+	startFillingSlider(scroll, slider, false);
+}
+
+void SubsectionTabs::setupVertical(not_null<QWidget*> parent) {
+	delete base::take(_horizontal);
+	delete base::take(_bottom);
+	_vertical = Ui::CreateChild<Ui::RpWidget>(parent);
+	_vertical->show();
+
+	if (!_shadow) {
+		_shadow = Ui::CreateChild<Ui::PlainShadow>(parent);
+		_shadow->show();
+	}
+
+	const auto toggle = Ui::CreateChild<Ui::IconButton>(
+		_vertical,
+		st::chatTabsToggle);
+	toggle->show();
+	toggle->setIconOverride(
+		&st::chatTabsToggleIconLeft,
+		&st::chatTabsToggleIconLeftOver);
+	toggle->setClickedCallback([=] {
+		toggleModes();
+	});
+	toggle->move(0, 0);
+	const auto scroll = Ui::CreateChild<Ui::ScrollArea>(
+		_vertical,
+		st::chatTabsScroll);
+	scroll->show();
+	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(_vertical);
+	const auto slider = scroll->setOwnedWidget(
+		object_ptr<Ui::VerticalSlider>(scroll));
+	_reorder = std::make_unique<Ui::SubsectionSliderReorder>(slider, scroll);
+	setupSlider(scroll, slider, true);
+
+	shadow->showOn(rpl::single(
+		rpl::empty
+	) | rpl::then(
+		scroll->scrolls()
+	) | rpl::map([=] { return scroll->scrollTop() > 0; }));
+	shadow->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	_vertical->resize(
+		std::max(toggle->width(), slider->width()),
+		_vertical->height());
+
+	_vertical->sizeValue(
+	) | rpl::on_next([=](QSize size) {
+		const auto toggleh = toggle->height();
+		const auto width = size.width();
+		scroll->setGeometry(0, toggleh, width, size.height() - toggleh);
+		shadow->setGeometry(0, toggleh, width, st::lineWidth);
+	}, scroll->lifetime());
+
+	_vertical->paintRequest() | rpl::on_next([=](QRect clip) {
+		QPainter(_vertical).fillRect(clip, st::windowBg);
+	}, _vertical->lifetime());
+
+	_layoutRequests.fire({});
+
+	startFillingSlider(scroll, slider, true);
+}
+
+void SubsectionTabs::setupSlider(
+		not_null<Ui::ScrollArea*> scroll,
+		not_null<Ui::SubsectionSlider*> slider,
+		bool vertical) {
+	slider->sectionActivated() | rpl::on_next([=](int active) {
+		if (_reordering) {
+			return;
+		}
+		const auto guard = base::make_weak(slider);
+		const auto newWindow = base::IsCtrlPressed();
+		if (active >= 0 && active < _slice.size()) {
+			const auto thread = _slice[active].thread;
+			if (newWindow) {
+				_controller->showInNewWindow(Window::SeparateId(thread));
+				if (guard) {
+					// This should activate current section.
+					_refreshed.fire({});
+				}
+			} else {
+				auto params = Window::SectionShow();
+				params.way = Window::SectionShow::Way::ClearStack;
+				params.animated = anim::type::instant;
+				_controller->showThread(thread, ShowAtUnreadMsgId, params);
+			}
+		}
+		if (guard) {
+			_reorder->finishReordering();
+		}
+	}, slider->lifetime());
+
+	_reorder->updates(
+	) | rpl::on_next([=](Ui::SubsectionSliderReorder::Single data) {
+		using State = Ui::SubsectionSliderReorder::State;
+		if (data.state == State::Started) {
+			++_reordering;
+		} else {
+			Ui::PostponeCall(slider, [=] {
+				--_reordering;
+			});
+			if (data.state == State::Applied) {
+				applyReorder(data.widget, data.oldPosition, data.newPosition);
+				slider->recalculatePinnedPositions();
+			}
+		}
+	}, slider->lifetime());
+
+	slider->setIsReorderingCallback([=] {
+		return _reordering > 0;
+	});
+
+	slider->sectionContextMenu() | rpl::on_next([=](int index) {
+		if (index >= 0 && index < _slice.size()) {
+			showThreadContextMenu(_slice[index].thread);
+		}
+	}, slider->lifetime());
+
+	slider->requestShown(
+	) | rpl::on_next([=](Ui::ScrollToRequest request) {
+		const auto full = vertical ? scroll->height() : scroll->width();
+		const auto tab = request.ymax - request.ymin;
+		if (tab < full) {
+			const auto add = std::min(full - tab, tab) / 2;
+			request.ymax += add;
+			request.ymin -= add;
+		}
+		const auto scrollValue = vertical
+			? scroll->scrollTop()
+			: scroll->scrollLeft();
+		if (request.ymin < scrollValue) {
+			if (vertical) {
+				scroll->scrollToY(request.ymin);
+			} else {
+				scroll->scrollToX(request.ymin);
+			}
+		} else if (request.ymax > scrollValue + full) {
+			const auto value = std::min(request.ymin, request.ymax - full);
+			if (vertical) {
+				scroll->scrollToY(value);
+			} else {
+				scroll->scrollToX(value);
+			}
+		}
+	}, slider->lifetime());
+}
+
+void SubsectionTabs::startScrollChecking(
+		not_null<Ui::ScrollArea*> scroll,
+		not_null<Ui::SubsectionSlider*> slider,
+		bool vertical) {
+	rpl::merge(
+		scroll->scrolls(),
+		_scrollCheckRequests.events(),
+		(vertical
+			? scroll->heightValue()
+			: scroll->widthValue()) | rpl::skip(1) | rpl::map_to(rpl::empty)
+	) | rpl::on_next([=] {
+		const auto full = vertical ? scroll->height() : scroll->width();
+		const auto scrollValue = vertical
+			? scroll->scrollTop()
+			: scroll->scrollLeft();
+		const auto scrollMax = vertical
+			? scroll->scrollTopMax()
+			: scroll->scrollLeftMax();
+		const auto availableFrom = scrollValue;
+		const auto availableTill = (scrollMax - scrollValue);
+		const auto needMore = (scrollMax <= 3 * full && _afterAvailable > 0);
+		if (needMore) {
+			_beforeLimit *= 2;
+			_afterLimit *= 2;
+		}
+		if (availableFrom < full
+			&& _beforeSkipped.value_or(0) > 0
+			&& !_slice.empty()) {
+			refreshAroundMiddle(scroll, slider);
+		} else if (availableTill < full) {
+			if (_afterAvailable > 0) {
+				refreshAroundMiddle(scroll, slider);
+			} else if (!_afterSkipped.has_value()) {
+				_loading = true;
+				loadMore();
+			}
+		} else if (needMore) {
+			refreshAroundMiddle(scroll, slider);
+		}
+	}, scroll->lifetime());
+
+	session().changes().peerUpdates(
+		Data::PeerUpdate::Flag::Rights
+	) | rpl::filter([=](const Data::PeerUpdate &update) {
+		return (update.peer == _history->peer);
+	}) | rpl::on_next([=] {
+		if (_reorder) {
+			_reorder->cancel();
+			if (_history->peer->canManageTopics()) {
+				_reorder->start();
+			}
+		}
+	}, _lifetime);
+}
+
+void SubsectionTabs::startFillingSlider(
+		not_null<Ui::ScrollArea*> scroll,
+		not_null<Ui::SubsectionSlider*> slider,
+		bool vertical) {
+	// We need to fill the content after the initial size is set.
+
+	using ImagePointer = std::shared_ptr<Ui::DynamicImage>;
+	struct Cache {
+		base::flat_map<not_null<PeerData*>, ImagePointer> userpics;
+	};
+	const auto cache = std::make_shared<Cache>();
+
+	_refreshed.events_starting_with_copy(
+		rpl::empty
+	) | rpl::on_next([=] {
+		const auto manager = &_history->owner().customEmojiManager();
+		const auto paused = [=] {
+			return _controller->isGifPausedAtLeastFor(
+				Window::GifPauseReason::Any);
+		};
+		auto updated = Cache();
+		auto sections = std::vector<Ui::SubsectionTab>();
+		auto activeIndex = -1;
+		auto fixedCount = 1; // 1 is the first button.
+		auto pinnedCount = 0;
+		for (const auto &item : _slice) {
+			const auto index = int(sections.size());
+			if (item.thread == _active) {
+				activeIndex = index;
+			}
+			if (item.thread->fixedOnTopIndex()) {
+				++fixedCount;
+			}
+			if (item.thread->isPinnedDialog(FilterId())
+				&& item.thread->asTopic()) {
+				++pinnedCount;
+			}
+			const auto textFg = [=] {
+				return anim::color(
+					st::windowSubTextFg,
+					st::windowActiveTextFg,
+					slider->buttonActive(slider->buttonAt(index)));
+			};
+			if (const auto topic = item.thread->asTopic()) {
+				if (vertical) {
+					const auto general = topic->isGeneral();
+					sections.push_back({
+						.text = { item.name },
+						.userpic = (item.iconId
+							? Ui::MakeEmojiThumbnail(
+								&topic->owner(),
+								Data::SerializeCustomEmojiId(item.iconId),
+								paused,
+								textFg)
+							: Ui::MakeEmojiThumbnail(
+								&topic->owner(),
+								Data::TopicIconEmojiEntity({
+									.title = (general
+										? Data::ForumGeneralIconTitle()
+										: item.name),
+									.colorId = (general
+										? Data::ForumGeneralIconColor(
+											st::windowSubTextFg->c)
+										: topic->colorId()),
+								}),
+								paused,
+								textFg)),
+					});
+				} else {
+					sections.push_back({
+						.text = topic->titleWithIcon(),
+					});
+				}
+			} else if (const auto sublist = item.thread->asSublist()) {
+				const auto peer = sublist->sublistPeer();
+				if (vertical) {
+					auto was = cache->userpics[peer];
+					auto userpic = updated.userpics[peer] = was
+						? was
+						: Ui::MakeUserpicThumbnail(peer);
+					sections.push_back({
+						.text = { peer->shortName() },
+						.userpic = std::move(userpic),
+					});
+				} else {
+					sections.push_back({
+						.text = TextWithEntities().append(
+							Ui::Text::SingleCustomEmoji(
+								manager->peerUserpicEmojiData(peer),
+								u"@"_q)
+						).append(' ').append(peer->shortName()),
+					});
+				}
+			// } else if (Data::IsBotUserCreatesTopics(item.thread->peer())) {
+			// 	sections.push_back({
+			// 		.text = { tr::lng_bot_new_chat(tr::now) },
+			// 	});
+			// 	if (vertical) {
+			// 		auto &last = sections.back();
+			// 		last.userpic = Ui::MakeNewChatSubsectionsThumbnail(
+			// 			textFg);
+			// 	}
+			} else {
+				sections.push_back({
+					.text = { tr::lng_filters_all_short(tr::now) },
+				});
+				if (vertical) {
+					auto &last = sections.back();
+					last.userpic = Ui::MakeAllSubsectionsThumbnail(textFg);
+				}
+			}
+			auto &section = sections.back();
+			section.badges = item.badges;
+		}
+		*cache = std::move(updated);
+
+		auto scrollSavingThread = (Data::Thread*)nullptr;
+		auto scrollSavingShift = 0;
+		auto scrollSavingIndex = -1;
+		if (const auto count = slider->sectionsCount()) {
+			const auto scrollValue = vertical
+				? scroll->scrollTop()
+				: scroll->scrollLeft();
+			auto indexPosition = slider->lookupSectionPosition(0);
+			for (auto index = 0; index != count; ++index) {
+				const auto nextPosition = (index + 1 != count)
+					? slider->lookupSectionPosition(index + 1)
+					: (indexPosition + scrollValue + 1);
+				if (indexPosition <= scrollValue && nextPosition > scrollValue) {
+					scrollSavingThread = _sectionsSlice[index].thread;
+					scrollSavingShift = scrollValue - indexPosition;
+					break;
+				}
+				indexPosition = nextPosition;
+			}
+			scrollSavingIndex = scrollSavingThread
+				? int(ranges::find(
+					_slice,
+					not_null(scrollSavingThread),
+					&Item::thread
+				) - begin(_slice))
+				: -1;
+			if (scrollSavingIndex == _slice.size()) {
+				scrollSavingIndex = -1;
+				for (auto index = 0; index != count; ++index) {
+					const auto thread = _sectionsSlice[index].thread;
+					const auto i = ranges::find(
+						_slice,
+						thread,
+						&Item::thread);
+					if (i != end(_slice)) {
+						scrollSavingThread = thread;
+						scrollSavingShift = scrollValue
+							- slider->lookupSectionPosition(index);
+						scrollSavingIndex = int(i - begin(_slice));
+						break;
+					}
+				}
+			}
+		}
+		slider->setSections({
+			.tabs = std::move(sections),
+			.context = Core::TextContext({
+				.session = &session(),
+			}),
+			.fixed = fixedCount,
+			.pinned = pinnedCount,
+		}, paused);
+		_reorder->clearPinnedIntervals();
+		_reorder->addPinnedInterval(0, 1);
+		if (pinnedCount > 1) {
+			const auto from = 1 + pinnedCount;
+			_reorder->addPinnedInterval(from, slider->sectionsCount() - from);
+		}
+
+		const auto ignoreActiveScroll = (scrollSavingIndex >= 0);
+		slider->setActiveSectionFast(activeIndex, ignoreActiveScroll);
+
+		_sectionsSlice = _slice;
+		Assert(slider->sectionsCount() == _slice.size());
+
+		_reorder->cancel();
+		if ((pinnedCount > 1) && _history->peer->canManageTopics()) {
+			_reorder->start();
+		}
+
+		if (ignoreActiveScroll) {
+			Assert(scrollSavingIndex < slider->sectionsCount());
+			const auto position = scrollSavingShift
+				+ slider->lookupSectionPosition(scrollSavingIndex);
+			if (vertical) {
+				scroll->scrollToY(position);
+			} else {
+				scroll->scrollToX(position);
+			}
+		}
+
+		_scrollCheckRequests.fire({});
+	}, scroll->lifetime());
+
+	startScrollChecking(scroll, slider, vertical);
+}
+
+void SubsectionTabs::showThreadContextMenu(not_null<Data::Thread*> thread) {
+	_menu = nullptr;
+	_menu = base::make_unique_q<Ui::PopupMenu>(
+		activeWidget(),
+		st::popupMenuExpandedSeparator);
+
+	const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
+	Window::FillDialogsEntryMenu(
+		_controller,
+		Dialogs::EntryState{
+			.key = Dialogs::Key{ thread },
+			.section = Dialogs::EntryState::Section::SubsectionTabsMenu,
+		},
+		addAction);
+	if (_menu->empty()) {
+		_menu = nullptr;
+	} else {
+		_menu->popup(QCursor::pos());
+	}
+}
+
+void SubsectionTabs::loadMore() {
+	if (const auto forum = _history->peer->forum()) {
+		forum->requestTopics();
+	} else if (const auto monoforum = _history->peer->monoforum()) {
+		monoforum->loadMore();
+	} else {
+		Unexpected("Peer in SubsectionTabs::loadMore.");
+	}
+}
+
+rpl::producer<> SubsectionTabs::dataChanged() const {
+	if (const auto forum = _history->peer->forum()) {
+		return forum->chatsListChanges();
+	} else if (const auto monoforum = _history->peer->monoforum()) {
+		return monoforum->chatsListChanges();
+	} else {
+		Unexpected("Peer in SubsectionTabs::dataChanged.");
+	}
+}
+
+void SubsectionTabs::toggleModes() {
+	Expects((_horizontal || _vertical || _bottom) && _shadow);
+
+	const auto peerId = _history->peer->id;
+	const auto parent = activeWidget()->parentWidget();
+	const auto current = session().settings().subsectionTabsMode(peerId);
+	const auto next = (current == qint32(SubsectionTabsMode::Top))
+		? SubsectionTabsMode::Bottom
+		: (current == qint32(SubsectionTabsMode::Bottom))
+		? SubsectionTabsMode::Left
+		: SubsectionTabsMode::Top;
+	session().settings().setSubsectionTabsMode(
+		peerId,
+		qint32(next));
+	session().saveSettingsDelayed();
+
+	if (next == SubsectionTabsMode::Left) {
+		setupVertical(parent);
+	} else if (next == SubsectionTabsMode::Bottom) {
+		setupHorizontal(parent, true);
+	} else {
+		setupHorizontal(parent, false);
+	}
+}
+
+bool SubsectionTabs::dying() const {
+	return !UsedFor(_history);
+}
+
+rpl::producer<> SubsectionTabs::removeRequests() const {
+	if (const auto forum = _history->peer->forum()) {
+		return forum->destroyed();
+	} else if (const auto monoforum = _history->peer->monoforum()) {
+		return monoforum->destroyed();
+	} else {
+		Unexpected("Peer in SubsectionTabs::removeRequests.");
+	}
+}
+
+void SubsectionTabs::extractToParent(not_null<Ui::RpWidget*> parent) {
+	Expects((_horizontal || _vertical || _bottom) && _shadow);
+
+	const auto widget = activeWidget();
+	widget->hide();
+	widget->setParent(parent);
+	_shadow->hide();
+	_shadow->setParent(parent);
+}
+
+void SubsectionTabs::setBoundingRect(QRect boundingRect) {
+	Expects((_horizontal || _vertical || _bottom) && _shadow);
+
+	if (_horizontal) {
+		_horizontal->setGeometry(
+			boundingRect.x(),
+			boundingRect.y(),
+			boundingRect.width(),
+			_horizontal->height());
+		_shadow->setGeometry(
+			boundingRect.x(),
+			_horizontal->y() + _horizontal->height() - st::lineWidth,
+			boundingRect.width(),
+			st::lineWidth);
+	} else if (_vertical) {
+		_vertical->setGeometry(
+			boundingRect.x(),
+			boundingRect.y(),
+			_vertical->width(),
+			boundingRect.height());
+		_shadow->setGeometry(
+			_vertical->x() + _vertical->width(),
+			boundingRect.y(),
+			st::lineWidth,
+			boundingRect.height());
+	} else {
+		_bottom->setGeometry(
+			boundingRect.x(),
+			boundingRect.y() + boundingRect.height()
+				- _bottom->height(),
+			boundingRect.width(),
+			_bottom->height());
+		_shadow->setGeometry(
+			boundingRect.x(),
+			_bottom->y(),
+			boundingRect.width(),
+			st::lineWidth);
+	}
+}
+
+rpl::producer<> SubsectionTabs::layoutRequests() const {
+	return _layoutRequests.events();
+}
+
+int SubsectionTabs::leftSkip() const {
+	return _vertical ? _vertical->width() : 0;
+}
+
+int SubsectionTabs::topSkip() const {
+	return _horizontal ? (_horizontal->height() - st::lineWidth) : 0;
+}
+
+int SubsectionTabs::bottomSkip() const {
+	return _bottom ? (_bottom->height() - st::lineWidth) : 0;
+}
+
+void SubsectionTabs::raise() {
+	Expects((_horizontal || _vertical || _bottom) && _shadow);
+
+	activeWidget()->raise();
+	_shadow->raise();
+}
+
+void SubsectionTabs::show() {
+	setVisible(true);
+}
+
+void SubsectionTabs::hide() {
+	setVisible(false);
+}
+
+void SubsectionTabs::setVisible(bool shown) {
+	Expects((_horizontal || _vertical || _bottom) && _shadow);
+
+	activeWidget()->setVisible(shown);
+	_shadow->setVisible(shown);
+}
+
+void SubsectionTabs::track() {
+	using Event = Data::Session::ChatListEntryRefresh;
+	if (const auto forum = _history->peer->forum()) {
+		forum->topicDestroyed(
+		) | rpl::on_next([=](not_null<Data::ForumTopic*> topic) {
+			if (_around == topic) {
+				_around = _history;
+				refreshSlice();
+			}
+		}, _lifetime);
+
+		forum->topicsList()->unreadStateChanges(
+		) | rpl::on_next([=] {
+			scheduleRefresh();
+		}, _lifetime);
+
+		forum->owner().chatListEntryRefreshes(
+		) | rpl::filter([=](const Event &event) {
+			const auto topic = event.filterId ? nullptr : event.key.topic();
+			return (topic && topic->forum() == forum);
+		}) | rpl::on_next([=] {
+			scheduleRefresh();
+		}, _lifetime);
+
+		forum->session().changes().topicUpdates(
+			Data::TopicUpdate::Flag::Title
+			| Data::TopicUpdate::Flag::IconId
+			| Data::TopicUpdate::Flag::ColorId
+		) | rpl::filter([=](const Data::TopicUpdate &update) {
+			return update.topic->forum() == forum;
+		}) | rpl::on_next([=] {
+			scheduleRefresh();
+		}, _lifetime);
+	} else if (const auto monoforum = _history->peer->monoforum()) {
+		monoforum->sublistDestroyed(
+		) | rpl::on_next([=](not_null<Data::SavedSublist*> sublist) {
+			if (_around == sublist) {
+				_around = _history;
+				refreshSlice();
+			}
+		}, _lifetime);
+
+		monoforum->chatsList()->unreadStateChanges(
+		) | rpl::on_next([=] {
+			scheduleRefresh();
+		}, _lifetime);
+
+		monoforum->owner().chatListEntryRefreshes(
+		) | rpl::filter([=](const Event &event) {
+			const auto sublist = event.filterId
+				? nullptr
+				: event.key.sublist();
+			return (sublist && sublist->parent() == monoforum);
+		}) | rpl::on_next([=] {
+			scheduleRefresh();
+		}, _lifetime);
+	} else {
+		Unexpected("Peer in SubsectionTabs::track.");
+	}
+}
+
+void SubsectionTabs::refreshAroundMiddle(
+		not_null<Ui::ScrollArea*> scroll,
+		not_null<Ui::SubsectionSlider*> slider) {
+	Expects(!_slice.empty());
+
+	const auto full = _vertical ? scroll->height() : scroll->width();
+	const auto scrollValue = _vertical
+		? scroll->scrollTop()
+		: scroll->scrollLeft();
+	const auto scrollMax = _vertical
+		? scroll->scrollTopMax()
+		: scroll->scrollLeftMax();
+
+	auto best = -1;
+	auto bestDistance = -1;
+	const auto ideal = scrollValue + (full / 2);
+	for (auto i = 0, count = int(_slice.size()); i != count; ++i) {
+		const auto a = slider->lookupSectionPosition(i);
+		const auto b = (i + 1 == count)
+			? (full + scrollMax)
+			: slider->lookupSectionPosition(i + 1);
+		const auto middle = (a + b) / 2;
+		const auto distance = std::abs(middle - ideal);
+		if (best < 0 || distance < bestDistance) {
+			best = i;
+			bestDistance = distance;
+		}
+	}
+
+	Assert(best >= 0 && best < _slice.size());
+
+	_around = _slice[best].thread;
+	refreshSlice();
+}
+
+void SubsectionTabs::refreshSlice() {
+	_refreshScheduled = false;
+
+	const auto forum = _history->peer->forum();
+	const auto monoforum = _history->peer->monoforum();
+	Assert(forum || monoforum);
+
+	const auto list = forum
+		? forum->topicsList()
+		: monoforum->chatsList();
+	auto slice = std::vector<Item>();
+	slice.reserve(_slice.size() + 10);
+	const auto guard = gsl::finally([&] {
+		if (_slice != slice) {
+			_slice = std::move(slice);
+			_refreshed.fire({});
+			Assert((!_horizontal && !_vertical && !_bottom)
+				|| (_slice.size() == _sectionsSlice.size()));
+		}
+	});
+	const auto push = [&](not_null<Data::Thread*> thread) {
+		const auto topic = thread->asTopic();
+		const auto sublist = thread->asSublist();
+		auto badges = [&] {
+			if (!topic && !sublist) {
+				return Dialogs::BadgesState();
+			} else if (thread->chatListUnreadState().known) {
+				return thread->chatListBadgesState();
+			}
+			const auto i = ranges::find(_slice, thread, &Item::thread);
+			if (i != end(_slice)) {
+				// While the unread count is unknown (possibly loading)
+				// we can preserve the old badges state, because it won't
+				// glitch that way when we stop knowing it for a moment.
+				return i->badges;
+			}
+			return thread->chatListBadgesState();
+		}();
+		if (topic && badges.unreadCounter <= 0) {
+			// Don't show the small indicators for non-visited unread topics.
+			badges.unread = false;
+		}
+		slice.push_back({
+			.thread = thread,
+			.badges = badges,
+			.iconId = topic ? topic->iconId() : DocumentId(),
+			.name = thread->chatListName(),
+		});
+	};
+	if (!list) {
+		push(_history);
+		_beforeSkipped = _afterSkipped = 0;
+		_afterAvailable = 0;
+		return;
+	}
+	const auto &chats = list->indexed()->all();
+	auto i = (_around == _history)
+		? chats.end()
+		: ranges::find(chats, _around, [](not_null<Dialogs::Row*> row) {
+			return not_null(row->thread());
+		});
+	if (i == chats.end()) {
+		i = chats.begin();
+	}
+	const auto takeBefore = std::min(_beforeLimit, int(i - chats.begin()));
+	const auto takeAfter = std::min(_afterLimit, int(chats.end() - i));
+	const auto from = i - takeBefore;
+	const auto till = i + takeAfter;
+	_beforeSkipped = std::max(0, int(from - chats.begin()));
+	_afterAvailable = std::max(0, int(chats.end() - till));
+	_afterSkipped = list->loaded() ? _afterAvailable : std::optional<int>();
+	if (from == chats.begin()) {
+		push(_history);
+	}
+	for (auto i = from; i != till; ++i) {
+		push((*i)->thread());
+	}
+}
+
+void SubsectionTabs::scheduleRefresh() {
+	if (_refreshScheduled) {
+		return;
+	}
+	_refreshScheduled = true;
+	InvokeQueued(_shadow, [=] {
+		if (_refreshScheduled) {
+			refreshSlice();
+		}
+	});
+}
+
+Main::Session &SubsectionTabs::session() {
+	return _history->session();
+}
+
+Ui::RpWidget *SubsectionTabs::activeWidget() const {
+	return _horizontal ? _horizontal : _vertical ? _vertical : _bottom;
+}
+
+bool SubsectionTabs::switchTo(
+		not_null<Data::Thread*> thread,
+		not_null<Ui::RpWidget*> parent) {
+	Expects((_horizontal || _vertical || _bottom) && _shadow);
+
+	if (thread->owningHistory() != _history) {
+		return false;
+	}
+	_active = thread;
+	const auto widget = activeWidget();
+	widget->setParent(parent);
+	widget->show();
+	_shadow->setParent(parent);
+	_shadow->show();
+	_refreshed.fire({});
+	return true;
+}
+
+bool SubsectionTabs::UsedFor(not_null<Data::Thread*> thread) {
+	const auto history = thread->owningHistory();
+	return history->amMonoforumAdmin()
+		|| history->peer->displaySubsectionTabs();
+}
+
+void SubsectionTabs::applyReorder(
+		not_null<Ui::RpWidget*> widget,
+		int oldPosition,
+		int newPosition) {
+	if (newPosition == oldPosition) {
+		return;
+	}
+
+	Assert(oldPosition >= 0 && oldPosition < _slice.size());
+	Assert(newPosition >= 0 && newPosition < _slice.size());
+
+	base::reorder(_slice, oldPosition, newPosition);
+
+	if (const auto forum = _history->asForum()) {
+		auto topicIds = QVector<MTPint>();
+		for (const auto &item : _slice) {
+			if (item.thread->isPinnedDialog(FilterId())) {
+				if (const auto topic = item.thread->asTopic()) {
+					topicIds.push_back(MTP_int(topic->rootId()));
+				}
+			}
+		}
+		forum->topicsList()->pinned()->applyList(forum, topicIds);
+		session().api().savePinnedOrder(forum);
+	}
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_subsection_tabs.h b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.h
new file mode 100644
index 00000000000000..987b9ceb2617a3
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.h
@@ -0,0 +1,155 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/unique_qptr.h"
+#include "dialogs/dialogs_common.h"
+
+class History;
+
+namespace Data {
+class Thread;
+} // namespace Data
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+class RpWidget;
+class PopupMenu;
+class ScrollArea;
+class SubsectionSlider;
+class SubsectionSliderReorder;
+} // namespace Ui
+
+namespace HistoryView {
+
+enum class SubsectionTabsMode : qint32 {
+	Top = 0,
+	Left = 1,
+	Bottom = 2,
+};
+
+class SubsectionTabs final {
+public:
+	SubsectionTabs(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::RpWidget*> parent,
+		not_null<Data::Thread*> thread);
+	~SubsectionTabs();
+
+	[[nodiscard]] Main::Session &session();
+
+	[[nodiscard]] bool switchTo(
+		not_null<Data::Thread*> thread,
+		not_null<Ui::RpWidget*> parent);
+
+	[[nodiscard]] static bool UsedFor(not_null<Data::Thread*> thread);
+
+	[[nodiscard]] bool dying() const;
+	[[nodiscard]] rpl::producer<> removeRequests() const;
+
+	void extractToParent(not_null<Ui::RpWidget*> parent);
+
+	void setBoundingRect(QRect boundingRect);
+	[[nodiscard]] rpl::producer<> layoutRequests() const;
+	[[nodiscard]] int leftSkip() const;
+	[[nodiscard]] int topSkip() const;
+	[[nodiscard]] int bottomSkip() const;
+
+	void raise();
+	void show();
+	void hide();
+
+private:
+	struct Item {
+		not_null<Data::Thread*> thread;
+		Dialogs::BadgesState badges;
+		DocumentId iconId = 0;
+		QString name;
+
+		friend inline auto operator<=>(
+			const Item &,
+			const Item &) = default;
+		friend inline bool operator==(
+			const Item &,
+			const Item &) = default;
+	};
+
+	void track();
+	void setupHorizontal(not_null<QWidget*> parent, bool bottom);
+	void setupVertical(not_null<QWidget*> parent);
+	void toggleModes();
+	void setVisible(bool shown);
+	void refreshSlice();
+	void refreshAroundMiddle(
+		not_null<Ui::ScrollArea*> scroll,
+		not_null<Ui::SubsectionSlider*> slider);
+	void scheduleRefresh();
+	void loadMore();
+	void setup(not_null<Ui::RpWidget*> parent);
+	[[nodiscard]] rpl::producer<> dataChanged() const;
+	[[nodiscard]] Ui::RpWidget *activeWidget() const;
+
+	void setupSlider(
+		not_null<Ui::ScrollArea*> scroll,
+		not_null<Ui::SubsectionSlider*> slider,
+		bool vertical);
+	void startScrollChecking(
+		not_null<Ui::ScrollArea*> scroll,
+		not_null<Ui::SubsectionSlider*> slider,
+		bool vertical);
+	void startFillingSlider(
+		not_null<Ui::ScrollArea*> scroll,
+		not_null<Ui::SubsectionSlider*> slider,
+		bool vertical);
+	void showThreadContextMenu(not_null<Data::Thread*> thread);
+	void applyReorder(
+		not_null<Ui::RpWidget*> widget,
+		int oldPosition,
+		int newPosition);
+
+	const not_null<Window::SessionController*> _controller;
+	const not_null<History*> _history;
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
+	Ui::RpWidget *_horizontal = nullptr;
+	Ui::RpWidget *_vertical = nullptr;
+	Ui::RpWidget *_bottom = nullptr;
+	Ui::RpWidget *_shadow = nullptr;
+	std::unique_ptr<Ui::SubsectionSliderReorder> _reorder;
+	int _reordering = 0;
+
+	std::vector<Item> _slice;
+	std::vector<Item> _sectionsSlice;
+
+	not_null<Data::Thread*> _active;
+	not_null<Data::Thread*> _around;
+	int _beforeLimit = 0;
+	int _afterLimit = 0;
+	int _afterAvailable = 0;
+	bool _loading = false;
+	bool _refreshScheduled = false;
+	std::optional<int> _beforeSkipped;
+	std::optional<int> _afterSkipped;
+
+	rpl::event_stream<> _layoutRequests;
+	rpl::event_stream<> _refreshed;
+	rpl::event_stream<> _scrollCheckRequests;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_summary_header.cpp b/Telegram/SourceFiles/history/view/history_view_summary_header.cpp
new file mode 100644
index 00000000000000..70ee9ec07cd9da
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_summary_header.cpp
@@ -0,0 +1,319 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_summary_header.h"
+
+#include "api/api_transcribes.h"
+#include "apiwrap.h"
+#include "core/click_handler_types.h"
+#include "core/ui_integration.h"
+#include "data/data_session.h"
+#include "history/history_item_components.h"
+#include "history/history.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/boxes/about_cocoon_box.h"
+#include "ui/chat/chat_style.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/power_saving.h"
+#include "ui/rect.h"
+#include "ui/text/text_options.h"
+#include "ui/text/text_utilities.h"
+#include "ui/ui_utility.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+
+namespace HistoryView {
+
+SummaryHeader::SummaryHeader()
+: _name(st::maxSignatureSize / 2)
+, _text(st::maxSignatureSize / 2) {
+}
+
+SummaryHeader &SummaryHeader::operator=(SummaryHeader &&other) = default;
+
+SummaryHeader::~SummaryHeader() = default;
+
+void SummaryHeader::update(not_null<Element*> view) {
+	const auto item = view->data();
+
+	if (!_animation) {
+		ensureAnimation();
+	}
+	if (!_lottie) {
+		ensureLottie();
+	}
+
+	_text.setText(
+		st::defaultTextStyle,
+		tr::lng_summarize_header_about(tr::now));
+
+	_name.setText(
+		st::msgNameStyle,
+		tr::lng_summarize_header_title(tr::now));
+
+	_maxWidth = st::historyReplyPadding.left()
+		+ st::maxSignatureSize / 2
+		+ st::historyReplyPadding.right();
+
+	const auto session = &item->history()->session();
+	const auto itemId = item->fullId();
+	_link = std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		if (Rect(iconRect().size()).contains(_iconRipple.lastPoint)) {
+			const auto my = context.other.value<ClickHandlerContext>();
+			if (const auto controller = my.sessionWindow.get()) {
+				controller->show(Box(Ui::AboutCocoonBox));
+				return;
+			}
+		}
+		if (const auto item = session->data().message(itemId)) {
+			session->api().transcribes().toggleSummary(item);
+		}
+	});
+}
+
+bool SummaryHeader::isNameUpdated(not_null<const Element*> view) const {
+	return false;
+}
+
+int SummaryHeader::resizeToWidth(int width) const {
+	_ripple.animation = nullptr;
+	_height = st::historyReplyPadding.top()
+		+ st::msgServiceNameFont->height * 2
+		+ st::historyReplyPadding.bottom();
+	_width = width;
+	return _height;
+}
+
+int SummaryHeader::height() const {
+	return _height + st::historyReplyTop + st::historyReplyBottom;
+}
+
+QMargins SummaryHeader::margins() const {
+	return QMargins(0, st::historyReplyTop, 0, st::historyReplyBottom);
+}
+
+void SummaryHeader::paint(
+		Painter &p,
+		not_null<const Element*> view,
+		const Ui::ChatPaintContext &context,
+		int x,
+		int y,
+		int w,
+		bool inBubble) const {
+	const auto st = context.st;
+	const auto stm = context.messageStyle();
+
+	y += st::historyReplyTop;
+	const auto rect = QRect(x, y, w, _height);
+	const auto colorPattern = 0;
+	const auto cache = !inBubble
+		? st->serviceReplyCache(colorPattern).get()
+		: stm->replyCache[colorPattern].get();
+	const auto &quoteSt = st::messageQuoteStyle;
+	const auto rippleColor = cache->bg;
+	const auto nameColor = !inBubble
+		? st->msgImgReplyBarColor()->c
+		: stm->msgServiceFg->c;
+	if (!inBubble) {
+		cache->bg = QColor(0, 0, 0, 0);
+	}
+	Ui::Text::ValidateQuotePaintCache(*cache, quoteSt);
+	Ui::Text::FillQuotePaint(p, rect, *cache, quoteSt);
+	if (!inBubble) {
+		cache->bg = rippleColor;
+	}
+
+	if (!_lottie) {
+		ensureLottie();
+	}
+	{
+		const auto r = iconRect().translated(x, y);
+		const auto lottieX = r.x() + st::historySummaryHeaderIconSizeInner;
+		const auto lottieY = r.y() + st::historySummaryHeaderIconSizeInner;
+		_lottie->paint(p, lottieX, lottieY, nameColor);
+		if (_iconRipple.animation) {
+			_iconRipple.animation->paint(
+				p,
+				r.x(),
+				r.y(),
+				r.width(),
+				&rippleColor);
+			if (_iconRipple.animation->empty()) {
+				_iconRipple.animation.reset();
+			}
+		}
+	}
+
+	if (!_animation) {
+		ensureAnimation();
+	}
+	{
+		const auto size = QSize(w, _height);
+		if (_animation->cachedSize != size) {
+			_animation->path = QPainterPath();
+			_animation->path.addRoundedRect(
+				QRect(0, 0, w, _height),
+				quoteSt.radius,
+				quoteSt.radius);
+			_animation->cachedSize = size;
+		}
+		p.translate(x, y);
+		p.setClipPath(_animation->path);
+		_animation->particles.setColor(nameColor);
+		const auto paused = context.paused || On(PowerSaving::kChatEffects);
+		_animation->particles.paint(
+			p,
+			QRect(0, 0, w, _height),
+			context.now,
+			paused);
+		if (!paused) {
+			const auto session = &view->history()->session();
+			const auto r = QRect(x, y, w, _height);
+			Ui::PostponeCall(session, [=, itemId = view->data()->fullId()] {
+				if (const auto i = session->data().message(itemId)) {
+					session->data().requestItemRepaint(i, r);
+				}
+			});
+		}
+		p.setClipping(false);
+		p.translate(-x, -y);
+	}
+
+	auto textLeft = x + st::historyReplyPadding.left();
+	auto textTop = y + st::historyReplyPadding.top()
+		+ st::msgServiceNameFont->height;
+	if (w > st::historyReplyPadding.left()) {
+		const auto iconSpace = st::historySummaryHeaderIconSize
+			+ st::historySummaryHeaderIconSizeInner * 2;
+		const auto textw = w
+			- st::historyReplyPadding.left()
+			- st::historyReplyPadding.right()
+			- iconSpace;
+		const auto namew = textw;
+		if (namew > 0) {
+			p.setPen(nameColor);
+			_name.drawLeftElided(
+				p,
+				x + st::historyReplyPadding.left(),
+				y + st::historyReplyPadding.top(),
+				namew,
+				w + 2 * x,
+				1);
+
+			p.setPen(inBubble
+				? stm->historyTextFg
+				: st->msgImgReplyBarColor());
+			view->prepareCustomEmojiPaint(p, context, _text);
+			auto replyToTextPalette = &(!inBubble
+				? st->imgReplyTextPalette()
+				: stm->replyTextPalette);
+			_text.draw(p, {
+				.position = { textLeft, textTop },
+				.availableWidth = textw,
+				.palette = replyToTextPalette,
+				.spoiler = Ui::Text::DefaultSpoilerCache(),
+				.now = context.now,
+				.pausedEmoji = (context.paused
+					|| On(PowerSaving::kEmojiChat)),
+				.pausedSpoiler = (context.paused
+					|| On(PowerSaving::kChatSpoiler)),
+				.elisionLines = 1,
+			});
+			p.setTextPalette(stm->textPalette);
+		}
+	}
+
+	if (_ripple.animation) {
+		_ripple.animation->paint(p, x, y, w, &rippleColor);
+		if (_ripple.animation->empty()) {
+			_ripple.animation.reset();
+		}
+	}
+}
+
+void SummaryHeader::createRippleAnimation(
+		not_null<const Element*> view,
+		QSize size) {
+	_ripple.animation = std::make_unique<Ui::RippleAnimation>(
+		st::defaultRippleAnimation,
+		Ui::RippleAnimation::RoundRectMask(
+			size,
+			st::messageQuoteStyle.radius),
+		[=] { view->repaint(); });
+	const auto rippleIconSize = st::historySummaryHeaderIconSize;
+	_iconRipple.animation = std::make_unique<Ui::RippleAnimation>(
+		st::defaultRippleAnimation,
+		Ui::RippleAnimation::EllipseMask(Size(rippleIconSize)),
+		[=] { view->repaint(); });
+}
+
+void SummaryHeader::saveRipplePoint(QPoint point) const {
+	_ripple.lastPoint = point;
+	const auto rect = iconRect();
+	if (rect.contains(point)) {
+		_iconRipple.lastPoint = point - rect.topLeft();
+	} else {
+		_iconRipple.lastPoint = QPoint(-1, -1);
+	}
+}
+
+void SummaryHeader::addRipple() {
+	if (_iconRipple.lastPoint.x() >= 0 && _iconRipple.animation) {
+		_iconRipple.animation->add(_iconRipple.lastPoint);
+	} else if (_ripple.animation) {
+		_ripple.animation->add(_ripple.lastPoint);
+	}
+}
+
+void SummaryHeader::stopLastRipple() {
+	if (_ripple.animation) {
+		_ripple.animation->lastStop();
+	}
+	if (_iconRipple.animation) {
+		_iconRipple.animation->lastStop();
+	}
+}
+
+void SummaryHeader::unloadHeavyPart() {
+	_unloadTime = crl::now();
+	_animation = nullptr;
+	_ripple.animation = nullptr;
+	_iconRipple.animation = nullptr;
+	_lottie = nullptr;
+}
+
+QRect SummaryHeader::iconRect() const {
+	const auto size = st::historySummaryHeaderIconSize;
+	const auto shift = st::historySummaryHeaderIconSizeInner;
+	return QRect(_width - size - shift, (_height - size) / 2, size, size);
+}
+
+void SummaryHeader::ensureAnimation() const {
+	using namespace Ui;
+	_animation = std::make_unique<Animation>(Animation{
+		.particles = StarParticles(
+			StarParticles::Type::Right,
+			15,
+			st::lineWidth * 8),
+	});
+	_animation->particles.setSpeed(0.05);
+}
+
+void SummaryHeader::ensureLottie() const {
+	_lottie = Lottie::MakeIcon(Lottie::IconDescriptor{
+		.name = u"cocoon"_q,
+		.color = &st::attentionButtonFg,
+		.sizeOverride = Size(st::historySummaryHeaderIconSize
+			- st::historySummaryHeaderIconSizeInner * 2),
+		.colorizeUsingAlpha = true,
+	});
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_summary_header.h b/Telegram/SourceFiles/history/view/history_view_summary_header.h
new file mode 100644
index 00000000000000..d9f37050ead6b0
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_summary_header.h
@@ -0,0 +1,86 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "history/view/history_view_element.h"
+#include "ui/effects/ministar_particles.h"
+#include "lottie/lottie_icon.h"
+
+namespace HistoryView {
+
+class SummaryHeader final : public RuntimeComponent<SummaryHeader, Element> {
+public:
+	SummaryHeader();
+	SummaryHeader(const SummaryHeader &other) = delete;
+	SummaryHeader(SummaryHeader &&other) = delete;
+	SummaryHeader &operator=(const SummaryHeader &other) = delete;
+	SummaryHeader &operator=(SummaryHeader &&other);
+	~SummaryHeader();
+
+	void update(not_null<Element*> view);
+
+	[[nodiscard]] bool isNameUpdated(not_null<const Element*> view) const;
+	[[nodiscard]] int resizeToWidth(int width) const;
+	[[nodiscard]] int height() const;
+	[[nodiscard]] QMargins margins() const;
+
+	void paint(
+		Painter &p,
+		not_null<const Element*> view,
+		const Ui::ChatPaintContext &context,
+		int x,
+		int y,
+		int w,
+		bool inBubble) const;
+
+	void createRippleAnimation(not_null<const Element*> view, QSize size);
+	void saveRipplePoint(QPoint point) const;
+	void addRipple();
+	void stopLastRipple();
+
+	[[nodiscard]] int maxWidth() const {
+		return _maxWidth;
+	}
+	[[nodiscard]] ClickHandlerPtr link() const {
+		return _link;
+	}
+
+	void unloadHeavyPart();
+
+private:
+	void ensureAnimation() const;
+	void ensureLottie() const;
+
+	[[nodiscard]] QRect iconRect() const;
+	struct Animation {
+		Ui::StarParticles particles;
+		QPainterPath path;
+		QSize cachedSize;
+	};
+
+	ClickHandlerPtr _link;
+	mutable std::unique_ptr<Animation> _animation;
+	mutable struct {
+		mutable std::unique_ptr<Ui::RippleAnimation> animation;
+		QPoint lastPoint;
+	} _ripple;
+	mutable struct {
+		mutable std::unique_ptr<Ui::RippleAnimation> animation;
+		QPoint lastPoint;
+	} _iconRipple;
+	mutable Ui::Text::String _name;
+	mutable Ui::Text::String _text;
+	mutable int _maxWidth = 0;
+	mutable int _height = 0;
+	mutable int _width = 0;
+	mutable std::unique_ptr<Lottie::Icon> _lottie;
+	mutable crl::time _unloadTime = 0;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_text_helper.cpp b/Telegram/SourceFiles/history/view/history_view_text_helper.cpp
index fbe97ed567ae15..5465ddf4871652 100644
--- a/Telegram/SourceFiles/history/view/history_view_text_helper.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_text_helper.cpp
@@ -7,10 +7,15 @@ For license and copyright information please follow this link:
 */
 #include "history/view/history_view_text_helper.h"
 
+#include "core/click_handler_types.h"
+#include "data/data_document.h"
 #include "data/data_session.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "history/view/history_view_element.h"
+#include "history/view/history_view_reaction_preview.h"
 #include "history/history.h"
 #include "main/main_session.h"
+#include "window/window_session_controller.h"
 #include "base/weak_ptr.h"
 
 namespace HistoryView {
@@ -36,6 +41,31 @@ void InitElementTextPart(not_null<Element*> view, Ui::Text::String &text) {
 			}
 		});
 	}
+	if (text.hasCustomEmoji()) {
+		text.setCustomEmojiClickHandler(
+			[](QStringView entityData) {
+				return Data::ParseCustomEmojiData(entityData) != 0;
+			},
+			[weak = base::make_weak(view)](
+					QStringView entityData,
+					ClickContext context) {
+				const auto view = weak.get();
+				if (!view) {
+					return;
+				}
+				const auto my = context.other.value<ClickHandlerContext>();
+				if (const auto controller = my.sessionWindow.get()) {
+					const auto documentId = Data::ParseCustomEmojiData(entityData);
+					if (documentId) {
+						ShowReactionPreview(
+							controller,
+							my.itemId,
+							Data::ReactionId{ documentId },
+							true);
+					}
+				}
+			});
+	}
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
index 3912e538921154..e34d1f2c53f280 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -29,6 +29,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/effects/radial_animation.h"
 #include "ui/boxes/report_box_graphics.h" // Ui::ReportReason
@@ -41,10 +42,12 @@ For license and copyright information please follow this link:
 #include "window/window_session_controller.h"
 #include "window/window_peer_menu.h"
 #include "calls/calls_instance.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_peer_values.h"
 #include "data/data_group_call.h" // GroupCall::input.
 #include "data/data_folder.h"
 #include "data/data_forum.h"
+#include "data/data_saved_messages.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
@@ -54,7 +57,9 @@ For license and copyright information please follow this link:
 #include "data/data_changes.h"
 #include "data/data_forum_topic.h"
 #include "data/data_send_action.h"
+#include "dialogs/dialogs_main_list.h"
 #include "chat_helpers/emoji_interactions.h"
+#include "base/call_delayed.h"
 #include "base/unixtime.h"
 #include "support/support_helper.h"
 #include "apiwrap.h"
@@ -72,16 +77,18 @@ namespace {
 
 constexpr auto kEmojiInteractionSeenDuration = 3 * crl::time(1000);
 
-inline bool HasGroupCallMenu(const not_null<PeerData*> &peer) {
-	return !peer->groupCall()
-		&& ((peer->isChannel() && peer->asChannel()->amCreator())
-			|| (peer->isChat() && peer->asChat()->amCreator()));
+[[nodiscard]] inline bool HasGroupCallMenu(not_null<PeerData*> peer) {
+	return !peer->isUser()
+		&& !peer->groupCall()
+		&& peer->canManageGroupCall();
 }
 
 QString TopBarNameText(
 		not_null<PeerData*> peer,
-		Dialogs::EntryState::Section section) {
-	if (section == Dialogs::EntryState::Section::SavedSublist) {
+		const Dialogs::EntryState &state) {
+	if (state.section == Dialogs::EntryState::Section::SavedSublist
+		&& state.key.sublist()
+		&& state.key.sublist()->owningHistory()->peer->isSelf()) {
 		if (peer->isSelf()) {
 			return tr::lng_my_notes(tr::now);
 		} else if (peer->isSavedHiddenAuthor()) {
@@ -125,8 +132,13 @@ TopBarWidget::TopBarWidget(
 , _onlineUpdater([=] { updateOnlineDisplay(); }) {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
+	_clear->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
+	_forward->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
+	_sendNow->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
+	_delete->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
+
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
@@ -137,9 +149,16 @@ TopBarWidget::TopBarWidget(
 	_delete->setClickedCallback([=] { _deleteSelection.fire({}); });
 	_delete->setWidthChangedCallback([=] { updateControlsGeometry(); });
 	_clear->setClickedCallback([=] { _clearSelection.fire({}); });
-	_call->setClickedCallback([=] { call(); });
+	_call->setClickedCallback([=] { call({}); });
+	_call->setAcceptBoth(true, true);
+	_call->addClickHandler([=](Qt::MouseButton button) {
+		if (button == Qt::RightButton) {
+			showCallMenu();
+		}
+	});
 	_groupCall->setClickedCallback([=] { groupCall(); });
-	_menuToggle->setClickedCallback([=] { showPeerMenu(); });
+	_menuToggle->addClickHandler([=](auto) { showPeerMenu(); });
+	_menuToggle->setAcceptBoth(true, true);
 	_infoToggle->setClickedCallback([=] { toggleInfoSection(); });
 	_back->setAcceptBoth();
 	_back->addClickHandler([=](Qt::MouseButton) {
@@ -161,7 +180,7 @@ TopBarWidget::TopBarWidget(
 		const auto activeChanged = (active != std::get<0>(previous));
 		const auto searchInChat = search && (active == search);
 		return std::make_tuple(searchInChat, activeChanged);
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			bool searchInActiveChat,
 			bool activeChanged) {
 		auto animated = activeChanged
@@ -171,7 +190,7 @@ TopBarWidget::TopBarWidget(
 	}, lifetime());
 
 	controller->adaptive().changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateAdaptiveLayout();
 	}, lifetime());
 
@@ -181,7 +200,7 @@ TopBarWidget::TopBarWidget(
 		session().data().sendActionManager().animationUpdated(
 		) | rpl::filter([=](const AnimationUpdate &update) {
 			return (update.thread == _activeChat.key.thread());
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			update();
 		}, lifetime());
 	}
@@ -194,7 +213,12 @@ TopBarWidget::TopBarWidget(
 		| UpdateFlag::SupportInfo
 		| UpdateFlag::Rights
 		| UpdateFlag::EmojiStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+		| UpdateFlag::Name
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
+		if ((update.flags & UpdateFlag::Name)
+			&& (update.peer == titleNamePeer())) {
+			TopBarWidget::update();
+		}
 		if (update.flags & UpdateFlag::HasCalls) {
 			if (update.peer->isUser()
 				&& (update.peer->isSelf()
@@ -224,16 +248,23 @@ TopBarWidget::TopBarWidget(
 	rpl::combine(
 		Core::App().settings().thirdSectionInfoEnabledValue(),
 		Core::App().settings().tabbedReplacedWithInfoValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateInfoToggleActive();
 	}, lifetime());
 
 	Core::App().settings().proxy().connectionTypeValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateConnectingState();
 	}, lifetime());
 
 	setCursor(style::cur_pointer);
+	_call->setAccessibleName(tr::lng_profile_action_short_call(tr::now));
+	_groupCall->setAccessibleName(tr::lng_group_call_title(tr::now));
+	_search->setAccessibleName(tr::lng_shortcuts_search(tr::now));
+	_infoToggle->setAccessibleName(tr::lng_settings_section_info(tr::now));
+	_menuToggle->setAccessibleName(tr::lng_chat_menu(tr::now));
+	_back->setAccessibleName(tr::lng_go_back(tr::now));
+	_cancelChoose->setAccessibleName(tr::lng_cancel(tr::now));
 }
 
 TopBarWidget::~TopBarWidget() = default;
@@ -271,16 +302,20 @@ void TopBarWidget::refreshLang() {
 	InvokeQueued(this, [this] { updateControlsGeometry(); });
 }
 
-void TopBarWidget::call() {
-	if (const auto peer = _activeChat.key.peer()) {
+void TopBarWidget::call(Calls::StartOutgoingCallArgs args) {
+	if (_controller->showFrozenError()) {
+		return;
+	} else if (const auto peer = _activeChat.key.peer()) {
 		if (const auto user = peer->asUser()) {
-			Core::App().calls().startOutgoingCall(user, false);
+			Core::App().calls().startOutgoingCall(user, std::move(args));
 		}
 	}
 }
 
 void TopBarWidget::groupCall() {
-	if (const auto peer = _activeChat.key.peer()) {
+	if (_controller->showFrozenError()) {
+		return;
+	} else if (const auto peer = _activeChat.key.peer()) {
 		if (HasGroupCallMenu(peer)) {
 			showGroupCallMenu(peer);
 		} else {
@@ -321,16 +356,20 @@ void TopBarWidget::setChooseForReportReason(
 		: style::cur_default);
 }
 
-bool TopBarWidget::createMenu(not_null<Ui::IconButton*> button) {
+bool TopBarWidget::createMenu(
+		not_null<Ui::IconButton*> button,
+		bool withIcons) {
 	if (!_activeChat.key || _menu) {
 		return false;
 	}
 	_menu = base::make_unique_q<Ui::PopupMenu>(
 		this,
-		st::popupMenuExpandedSeparator);
+		withIcons
+			? st::popupMenuExpandedSeparator
+			: st::defaultPopupMenu);
 	_menu->setDestroyedCallback([
-			weak = Ui::MakeWeak(this),
-			weakButton = Ui::MakeWeak(button),
+			weak = base::make_weak(this),
+			weakButton = base::make_weak(button),
 			menu = _menu.get()] {
 		if (weak && weak->_menu == menu) {
 			if (weakButton) {
@@ -353,9 +392,15 @@ void TopBarWidget::showPeerMenu() {
 		_menu = nullptr;
 	} else {
 		_menu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
-		_menu->popup(mapToGlobal(QPoint(
-			width() + st::topBarMenuPosition.x(),
-			st::topBarMenuPosition.y())));
+		_menu->popup(Ui::PopupMenu::ConstrainToParentScreen(
+			_menu,
+			mapToGlobal(
+				QPoint(
+					width()
+						+ st::topBarMenuPosition.x()
+						+ Ui::BoxShadow::ExtendFor(
+							_menu->st().shadow).right(),
+					st::topBarMenuPosition.y()))));
 	}
 }
 
@@ -372,6 +417,30 @@ void TopBarWidget::showGroupCallMenu(not_null<PeerData*> peer) {
 		st::topBarMenuPosition.y())));
 }
 
+void TopBarWidget::showCallMenu() {
+	const auto created = createMenu(_call, false);
+	if (!created) {
+		return;
+	}
+	const auto perform = [&](bool video) {
+		return [=] {
+			base::call_delayed(st::defaultPopupMenu.showDuration, this, [=] {
+				call({ .video = video, .isConfirmed = true });
+			});
+		};
+	};
+	_menu->addAction(
+		tr::lng_profile_action_short_call(tr::now),
+		perform(false));
+	_menu->addAction(
+		tr::lng_call_start_video(tr::now),
+		perform(true));
+	_menu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
+	_menu->popup(mapToGlobal(QPoint(
+		_call->x() + _call->width() + st::topBarMenuGroupCallSkip,
+		st::topBarMenuPosition.y())));
+}
+
 void TopBarWidget::toggleInfoSection() {
 	const auto isThreeColumn = _controller->adaptive().isThreeColumn();
 	if (isThreeColumn
@@ -387,6 +456,10 @@ void TopBarWidget::toggleInfoSection() {
 					(_activeChat.key.topic()
 						? std::make_shared<Info::Memento>(
 							_activeChat.key.topic())
+						: (_activeChat.key.sublist()
+							&& _activeChat.key.sublist()->parentChat())
+						? std::make_shared<Info::Memento>(
+							_activeChat.key.sublist())
 						: Info::Memento::Default(_activeChat.key.peer())),
 					Window::SectionShow().withThirdColumn());
 			} else {
@@ -450,12 +523,14 @@ void TopBarWidget::paintTopBar(Painter &p) {
 		return;
 	}
 	auto nameleft = _leftTaken;
+	auto statusleft = nameleft;
 	auto nametop = st::topBarArrowPadding.top();
 	auto statustop = st::topBarHeight - st::topBarArrowPadding.bottom() - st::dialogsTextFont->height;
-	auto availableWidth = width()
+	auto namewidth = width()
 		- _rightTaken
 		- nameleft
 		- st::topBarNameRightPadding;
+	auto statuswidth = namewidth;
 
 	if (_chooseForReportReason) {
 		const auto text = _chooseForReportReason->optionText;
@@ -478,20 +553,15 @@ void TopBarWidget::paintTopBar(Painter &p) {
 		? _activeChat.key.owningHistory()->peer.get()
 		: nullptr;
 	const auto folder = _activeChat.key.folder();
-	const auto sublist = _activeChat.key.sublist();
 	const auto topic = _activeChat.key.topic();
-	const auto history = _activeChat.key.history();
-	const auto namePeer = history
-		? history->peer.get()
-		: sublist ? sublist->peer().get()
-		: nullptr;
+	const auto namePeer = titleNamePeer();
 	if (topic && _activeChat.section == Section::Replies) {
 		p.setPen(st::dialogsNameFg);
 		topic->chatListNameText().drawElided(
 			p,
 			nameleft,
 			nametop,
-			availableWidth);
+			namewidth);
 
 		p.setFont(st::dialogsTextFont);
 		if (!paintConnectingState(p, nameleft, statustop, width())
@@ -499,7 +569,7 @@ void TopBarWidget::paintTopBar(Painter &p) {
 				p,
 				nameleft,
 				statustop,
-				availableWidth,
+				namewidth,
 				width(),
 				st::historyStatusFgTyping,
 				now)) {
@@ -507,7 +577,9 @@ void TopBarWidget::paintTopBar(Painter &p) {
 			p.drawTextLeft(nameleft, statustop, width(), _customTitleText);
 		}
 	} else if (folder
-		|| (peer && (peer->sharedMediaInfo() || peer->isVerifyCodes()))
+		|| (peer
+			&& (peer->sharedMediaInfo() || peer->isVerifyCodes())
+			&& _activeChat.section != Section::SavedSublist)
 		|| (_activeChat.section == Section::Scheduled)
 		|| (_activeChat.section == Section::Pinned)) {
 		auto text = (_activeChat.section == Section::Scheduled)
@@ -526,8 +598,8 @@ void TopBarWidget::paintTopBar(Painter &p) {
 			? tr::lng_verification_codes(tr::now)
 			: peer->name();
 		const auto textWidth = st::historySavedFont->width(text);
-		if (availableWidth < textWidth) {
-			text = st::historySavedFont->elided(text, availableWidth);
+		if (namewidth < textWidth) {
+			text = st::historySavedFont->elided(text, namewidth);
 		}
 		p.setPen(st::dialogsNameFg);
 		p.setFont(st::historySavedFont);
@@ -546,46 +618,59 @@ void TopBarWidget::paintTopBar(Painter &p) {
 			tr::lng_manage_discussion_group(tr::now));
 
 		p.setFont(st::dialogsTextFont);
-		if (!paintConnectingState(p, nameleft, statustop, width())
+		if (!paintConnectingState(p, statusleft, statustop, width())
 			&& !paintSendAction(
 				p,
-				nameleft,
+				statusleft,
 				statustop,
-				availableWidth,
+				statuswidth,
 				width(),
 				st::historyStatusFgTyping,
 				now)) {
-			paintStatus(p, nameleft, statustop, availableWidth, width());
+			paintStatus(p, statusleft, statustop, statuswidth, width());
 		}
 	} else if (namePeer) {
 		if (_titleNameVersion < namePeer->nameVersion()) {
 			_titleNameVersion = namePeer->nameVersion();
 			_title.setText(
 				st::msgNameStyle,
-				TopBarNameText(namePeer, _activeChat.section),
+				TopBarNameText(namePeer, _activeChat),
 				Ui::NameTextOptions());
 		}
-		const auto badgeWidth = _titleBadge.drawGetWidth(
-			p,
-			QRect(
+		if (const auto info = namePeer->botVerifyDetails()) {
+			if (!_titleBadge.ready(info)) {
+				_titleBadge.set(
+					info,
+					namePeer->owner().customEmojiManager().factory(
+						Data::CustomEmojiSizeTag::Isolated),
+					[=] { update(); });
+			}
+			const auto position = QPoint{ nameleft, nametop };
+			const auto skip = _titleBadge.drawVerified(p, position, st::dialogsVerifiedColors);
+			nameleft += skip + st::dialogsChatTypeSkip;
+			namewidth -= skip + st::dialogsChatTypeSkip;
+		}
+		const auto badgeWidth = _titleBadge.drawGetWidth(p, {
+			.peer = namePeer,
+			.rectForName = QRect(
 				nameleft,
 				nametop,
-				availableWidth,
+				namewidth,
 				st::msgNameStyle.font->height),
-			_title.maxWidth(),
-			width(),
-			{
-				.peer = namePeer,
-				.verified = &st::dialogsVerifiedIcon,
-				.premium = &st::dialogsPremiumIcon.icon,
-				.scam = &st::attentionButtonFg,
-				.premiumFg = &st::dialogsVerifiedIconBg,
-				.customEmojiRepaint = [=] { update(); },
-				.now = now,
-				.paused = _controller->isGifPausedAtLeastFor(
-					Window::GifPauseReason::Any),
-			});
-		const auto namewidth = availableWidth - badgeWidth;
+			.nameWidth = _title.maxWidth(),
+			.outerWidth = width(),
+			.verified = &st::dialogsVerifiedIcon,
+			.premium = &st::dialogsPremiumIcon.icon,
+			.scam = &st::attentionButtonFg,
+			.direct = &st::windowSubTextFg,
+			.premiumFg = &st::dialogsVerifiedIconBg,
+			.customEmojiRepaint = [=] { update(); },
+			.now = now,
+			.bothVerifyAndStatus = true,
+			.paused = _controller->isGifPausedAtLeastFor(
+				Window::GifPauseReason::Any),
+		});
+		namewidth -= badgeWidth;
 
 		p.setPen(st::dialogsNameFg);
 		_title.draw(p, {
@@ -595,20 +680,35 @@ void TopBarWidget::paintTopBar(Painter &p) {
 		});
 
 		p.setFont(st::dialogsTextFont);
-		if (!paintConnectingState(p, nameleft, statustop, width())
+		if (!paintConnectingState(p, statusleft, statustop, width())
 			&& !paintSendAction(
 				p,
-				nameleft,
+				statusleft,
 				statustop,
-				availableWidth,
+				statuswidth,
 				width(),
 				st::historyStatusFgTyping,
 				now)) {
-			paintStatus(p, nameleft, statustop, availableWidth, width());
+			paintStatus(p, statusleft, statustop, statuswidth, width());
 		}
 	}
 }
 
+PeerData *TopBarWidget::titleNamePeer() const {
+	const auto history = _activeChat.key.history();
+	const auto broadcastForMonoforum = history
+		? history->peer->monoforumBroadcast()
+		: nullptr;
+	const auto sublist = _activeChat.key.sublist();
+	return broadcastForMonoforum
+		? broadcastForMonoforum
+		: history
+		? history->peer.get()
+		: sublist
+		? sublist->sublistPeer().get()
+		: nullptr;
+}
+
 bool TopBarWidget::paintSendAction(
 		Painter &p,
 		int x,
@@ -723,9 +823,7 @@ void TopBarWidget::infoClicked() {
 	} else if (const auto topic = key.topic()) {
 		_controller->showSection(std::make_shared<Info::Memento>(topic));
 	} else if (const auto sublist = key.sublist()) {
-		_controller->showSection(std::make_shared<Info::Memento>(
-			_controller->session().user(),
-			Info::Section(Storage::SharedMediaType::Photo)));
+		_controller->showSection(std::make_shared<Info::Memento>(sublist));
 	} else if (key.peer()->savedSublistsInfo()) {
 		_controller->showSection(std::make_shared<Info::Memento>(
 			key.peer(),
@@ -788,16 +886,19 @@ void TopBarWidget::setActiveChat(
 			) | rpl::map([](int count) {
 				return (count == 0);
 			}) | rpl::distinct_until_changed(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				updateControlsVisibility();
 				updateControlsGeometry();
 			}, _activeChatLifetime);
 
 			if (const auto channel = peer->asChannel()) {
 				if (channel->canEditStories()
-					&& !channel->owner().stories().archiveCountKnown(
-						channel->id)) {
-					channel->owner().stories().archiveLoadMore(channel->id);
+					&& !channel->owner().stories().albumIdsCountKnown(
+						channel->id,
+						Data::kStoriesAlbumIdArchive)) {
+					channel->owner().stories().albumIdsLoadMore(
+						channel->id,
+						Data::kStoriesAlbumIdArchive);
 				}
 			}
 		}
@@ -807,15 +908,15 @@ void TopBarWidget::setActiveChat(
 			_controller->emojiInteractions().seen(
 			) | rpl::filter([=](const InteractionSeen &seen) {
 				return (seen.peer == history->peer);
-			}) | rpl::start_with_next([=](const InteractionSeen &seen) {
+			}) | rpl::on_next([=](const InteractionSeen &seen) {
 				handleEmojiInteractionSeen(seen.emoticon);
 			}, _activeChatLifetime);
 		}
 
 		if (const auto topic = _activeChat.key.topic()) {
 			Info::Profile::NameValue(
-				topic->channel()
-			) | rpl::start_with_next([=](const QString &name) {
+				topic->peer()
+			) | rpl::on_next([=](const QString &name) {
 				_titlePeerText.setText(st::dialogsTextStyle, name);
 				_titlePeerTextOnline = false;
 				update();
@@ -824,7 +925,7 @@ void TopBarWidget::setActiveChat(
 			// _menuToggle visibility depends on "View topic info",
 			// "View topic info" visibility depends on activeChatCurrent.
 			_controller->activeChatChanges(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				updateControlsVisibility();
 			}, _activeChatLifetime);
 		}
@@ -900,16 +1001,30 @@ void TopBarWidget::refreshInfoButton() {
 			&& !rootChatsListBar())) {
 		_info.destroy();
 	} else if (const auto peer = _activeChat.key.peer()) {
+		const auto sublist = _activeChat.key.sublist();
+		const auto infoPeer = sublist ? sublist->sublistPeer().get() : peer;
 		auto info = object_ptr<Ui::UserpicButton>(
 			this,
-			peer,
-			st::topBarInfoButton);
+			_controller,
+			infoPeer->userpicPaintingPeer(),
+			Ui::UserpicButton::Role::Custom,
+			Ui::UserpicButton::Source::PeerPhoto,
+			st::topBarInfoButton,
+			infoPeer->userpicShape());
 		info->showSavedMessagesOnSelf(true);
+		info->showMyNotesOnSelf(true);
 		_info.destroy();
 		_info = std::move(info);
 	}
 	if (_info) {
 		_info->setAttribute(Qt::WA_TransparentForMouseEvents);
+		_info->setAccessibleName(tr::lng_settings_section_info(tr::now));
+		if (_back && _info) {
+			QWidget::setTabOrder(_back.data(), _info.data());
+		}
+		if (_info && _search) {
+			QWidget::setTabOrder(_info.data(), _search.data());
+		}
 	}
 }
 
@@ -923,9 +1038,13 @@ int TopBarWidget::countSelectedButtonsTop(float64 selectedShown) {
 }
 
 void TopBarWidget::updateSearchVisibility() {
+	const auto pinnedInSavedMessages = (_activeChat.section == Section::Pinned)
+		&& _activeChat.key.peer()
+		&& _activeChat.key.peer()->isSelf();
 	const auto searchAllowedMode = (_activeChat.section == Section::History)
-		|| (_activeChat.section == Section::Replies
-			&& _activeChat.key.topic())
+		|| (_activeChat.section == Section::Replies)
+		|| (_activeChat.section == Section::Pinned
+			&& !pinnedInSavedMessages)
 		|| (_activeChat.section == Section::SavedSublist
 			&& _activeChat.key.sublist());
 	_search->setVisible(searchAllowedMode && !_chooseForReportReason);
@@ -977,6 +1096,36 @@ void TopBarWidget::updateControlsGeometry() {
 	}
 
 	_delete->moveToLeft(buttonsLeft, selectedButtonsTop);
+	{
+		const auto large = st::topBarActionButtonLargeRadius;
+		const auto &buttonSt = st::defaultActiveButton;
+		const auto small = buttonSt.radius
+			? buttonSt.radius
+			: st::buttonRadius;
+		const auto buttons = std::array{
+			_forward.data(),
+			_sendNow.data(),
+			_delete.data(),
+		};
+		auto first = (Ui::RoundButton*)(nullptr);
+		auto last = (Ui::RoundButton*)(nullptr);
+		for (const auto button : buttons) {
+			if (!button->isHidden()) {
+				if (!first) {
+					first = button;
+				}
+				last = button;
+			}
+		}
+		for (const auto button : buttons) {
+			if (button->isHidden()) {
+				continue;
+			}
+			const auto left = (button == first) ? large : small;
+			const auto right = (button == last) ? large : small;
+			button->setCornerRadii(left, right, left, right);
+		}
+	}
 	_clear->moveToRight(st::topBarActionSkip, selectedButtonsTop);
 
 	if (!_cancelChoose->isHidden()) {
@@ -1024,18 +1173,18 @@ void TopBarWidget::updateControlsGeometry() {
 			fieldWidth,
 			_searchField->height());
 
-		auto right = fieldLeft + fieldWidth;
-		_searchCancel->moveToLeft(
-			right - _searchCancel->width(),
-			_searchField->y());
-		right -= st::dialogsCalendar.width;
+		const auto fieldY = _searchField->y();
+		const auto cancelLeft = fieldLeft
+			+ fieldWidth
+			- _searchCancel->width();
+		_searchCancel->moveToLeft(cancelLeft, fieldY);
 		if (_jumpToDate) {
-			_jumpToDate->moveToLeft(right, _searchField->y());
-		}
-		right -= st::dialogsSearchFrom.width;
-		if (_chooseFromUser) {
-			_chooseFromUser->moveToLeft(right, _searchField->y());
+			_jumpToDate->moveToLeft(
+				cancelLeft - st::dialogsCalendarTopBar.width,
+				fieldY);
 		}
+		updateChooseFromUserGeometry();
+		updateSearchJumpToDateVisibility();
 	}
 
 	_rightTaken = 0;
@@ -1084,10 +1233,12 @@ void TopBarWidget::updateControlsVisibility() {
 		hideChildren();
 		return;
 	}
-	_clear->show();
-	_delete->setVisible(_canDelete);
-	_forward->setVisible(_canForward);
-	_sendNow->setVisible(_canSendNow);
+	const auto visible = showSelectedState() || _selectedShown.animating();
+	_clear->setVisible(visible);
+	_delete->setVisible(_canDelete && visible);
+	_forward->setVisible(_canForward && visible);
+	_sendNow->setVisible(_canSendNow && visible);
+
 
 	const auto isOneColumn = _controller->adaptive().isOneColumn();
 	const auto backVisible = !rootChatsListBar()
@@ -1110,6 +1261,9 @@ void TopBarWidget::updateControlsVisibility() {
 	const auto hasPollsMenu = (_activeChat.key.peer()
 		&& _activeChat.key.peer()->canCreatePolls())
 		|| (topic && Data::CanSend(topic, ChatRestriction::SendPolls));
+	const auto hasTodoListsMenu = (_activeChat.key.peer()
+		&& _activeChat.key.peer()->canCreateTodoLists())
+		|| (topic && Data::CanSend(topic, ChatRestriction::SendPolls));
 	const auto hasTopicMenu = [&] {
 		if (!topic || section != Section::Replies) {
 			return false;
@@ -1129,31 +1283,30 @@ void TopBarWidget::updateControlsVisibility() {
 		&& (section == Section::History
 			? true
 			: (section == Section::Scheduled)
-			? hasPollsMenu
+			? (hasPollsMenu || hasTodoListsMenu)
 			: (section == Section::Replies)
-			? (hasPollsMenu || hasTopicMenu)
+			? (hasPollsMenu || hasTodoListsMenu || hasTopicMenu)
 			: (section == Section::ChatsList)
 			? (_activeChat.key.peer() && _activeChat.key.peer()->isForum())
+			: (section == Section::SavedSublist)
+			? (_activeChat.key.peer()
+				&& _activeChat.key.peer()->isChannel()
+				&& _activeChat.key.peer()->owner().commonStarsPerMessage(
+					_activeChat.key.peer()->asChannel()))
 			: false);
 	const auto hasInfo = !_activeChat.key.folder()
 		&& (section == Section::History
 			? true
 			: (section == Section::Replies)
 			? (_activeChat.key.topic() != nullptr)
+			: (section == Section::SavedSublist)
+			? (_activeChat.key.sublist() != nullptr
+				&& _activeChat.key.sublist()->parentChat())
 			: false);
 	updateSearchVisibility();
 	if (_searchMode) {
-		const auto hasSearchQuery = _searchField
-			&& !_searchField->getLastText().isEmpty();
-		if (!_jumpToDate || hasSearchQuery) {
-			_searchCancel->show(anim::type::normal);
-			if (_jumpToDate) {
-				_jumpToDate->hide(anim::type::normal);
-			}
-		} else {
-			_searchCancel->hide(anim::type::normal);
-			_jumpToDate->show(anim::type::normal);
-		}
+		_searchCancel->show(anim::type::normal);
+		updateSearchJumpToDateVisibility();
 	}
 	_menuToggle->setVisible(hasMenu
 		&& !_chooseForReportReason
@@ -1167,6 +1320,7 @@ void TopBarWidget::updateControlsVisibility() {
 			if (const auto user = peer->asUser()) {
 				return !user->isSelf()
 					&& !user->isBot()
+					&& !user->isInaccessible()
 					&& !peer->isServiceUser();
 			}
 		}
@@ -1177,7 +1331,7 @@ void TopBarWidget::updateControlsVisibility() {
 		&& !_chooseForReportReason);
 	const auto groupCallsEnabled = [&] {
 		if (const auto peer = _activeChat.key.peer()) {
-			if (peer->canManageGroupCall()) {
+			if (!peer->isUser() && peer->canManageGroupCall()) {
 				return true;
 			} else if (const auto call = peer->groupCall()) {
 				return (call->fullCount() == 0);
@@ -1207,7 +1361,8 @@ void TopBarWidget::updateMembersShowArea() {
 		} else if (const auto chat = peer->asChat()) {
 			return chat->amIn();
 		} else if (const auto megagroup = peer->asMegagroup()) {
-			return megagroup->canViewMembers()
+			return !megagroup->isMonoforum()
+				&& megagroup->canViewMembers()
 				&& (megagroup->membersCount()
 					< megagroup->session().serverConfig().chatSizeMax);
 		}
@@ -1269,7 +1424,8 @@ void TopBarWidget::showSelected(SelectedState state) {
 			_delete->finishNumbersAnimation();
 		}
 	}
-	if (visibilityChanged) {
+	if (visibilityChanged
+		|| (!wasSelectedState && nowSelectedState)) {
 		updateControlsVisibility();
 	}
 	if (wasSelectedState != nowSelectedState && !_chooseForReportReason) {
@@ -1301,15 +1457,15 @@ bool TopBarWidget::toggleSearch(bool shown, anim::type animated) {
 		_searchCancel->show(anim::type::instant);
 		_searchCancel->setClickedCallback([=] { _searchCancelled.fire({}); });
 		_searchField->submits(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_searchSubmitted.fire({});
 		}, _searchField->lifetime());
 		_searchField->changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto was = _searchQuery.current();
 			const auto now = _searchField->getLastText();
 			if (_jumpToDate && was.isEmpty() != now.isEmpty()) {
-				updateControlsVisibility();
+				updateSearchJumpToDateVisibility();
 			}
 			if (_chooseFromUser) {
 				auto switchToChooseFrom = SwitchToChooseFromQuery();
@@ -1350,10 +1506,11 @@ void TopBarWidget::searchEnableJumpToDate(bool enable) {
 	} else if (!_jumpToDate) {
 		_jumpToDate.create(
 			this,
-			object_ptr<Ui::IconButton>(this, st::dialogsCalendar));
-		_jumpToDate->toggle(
-			_searchField->getLastText().isEmpty(),
-			anim::type::instant);
+			object_ptr<Ui::IconButton>(this, st::dialogsCalendarTopBar));
+		_jumpToDate->toggle(false, anim::type::instant);
+		_jumpToDate->setUpdatedCallback([=](float64) {
+			updateChooseFromUserGeometry();
+		});
 		_jumpToDate->entity()->clicks(
 		) | rpl::to_empty | rpl::start_to_stream(
 			_jumpToDateRequests,
@@ -1363,6 +1520,51 @@ void TopBarWidget::searchEnableJumpToDate(bool enable) {
 	updateControlsGeometry();
 }
 
+bool TopBarWidget::searchJumpToDateFits() const {
+	if (!_searchField) {
+		return false;
+	}
+	const auto &fieldSt = st::dialogsFilter;
+	const auto placeholderWidth = fieldSt.textMargins.left()
+		+ fieldSt.placeholderMargins.left()
+		+ fieldSt.placeholderFont->width(tr::lng_dlg_filter(tr::now))
+		+ fieldSt.placeholderMargins.right();
+	const auto required = placeholderWidth
+		+ st::dialogsFilterPadding.x()
+		+ st::dialogsSearchFromTopBar.width
+		+ st::dialogsCalendarTopBar.width
+		+ st::dialogsCancelSearch.width;
+	return (_searchField->width() >= required);
+}
+
+void TopBarWidget::updateChooseFromUserGeometry() {
+	if (!_searchField || !_searchCancel || !_chooseFromUser) {
+		return;
+	}
+	const auto fieldRight = st::dialogsFilterSkip
+		+ st::dialogsFilterPadding.x();
+	const auto cancelLeft = width() - fieldRight - _searchCancel->width();
+	const auto reserved = _jumpToDate
+		? anim::interpolate(
+			0,
+			st::dialogsCalendarTopBar.width,
+			_jumpToDate->shownProgress())
+		: 0;
+	_chooseFromUser->moveToLeft(
+		cancelLeft - reserved - st::dialogsSearchFromTopBar.width,
+		_searchField->y());
+}
+
+void TopBarWidget::updateSearchJumpToDateVisibility() {
+	if (!_searchMode || !_jumpToDate || !_searchField) {
+		return;
+	}
+	const auto empty = _searchField->getLastText().isEmpty();
+	_jumpToDate->toggle(
+		empty && searchJumpToDateFits(),
+		anim::type::normal);
+}
+
 void TopBarWidget::searchEnableChooseFromUser(bool enable, bool visible) {
 	if (!_searchMode) {
 		return;
@@ -1371,7 +1573,7 @@ void TopBarWidget::searchEnableChooseFromUser(bool enable, bool visible) {
 	} else if (!_chooseFromUser) {
 		_chooseFromUser.create(
 			this,
-			object_ptr<Ui::IconButton>(this, st::dialogsSearchFrom));
+			object_ptr<Ui::IconButton>(this, st::dialogsSearchFromTopBar));
 		_chooseFromUser->toggle(visible, anim::type::instant);
 		_chooseFromUser->entity()->clicks(
 		) | rpl::to_empty | rpl::start_to_stream(
@@ -1481,6 +1683,9 @@ bool TopBarWidget::showSelectedActions() const {
 }
 
 void TopBarWidget::slideAnimationCallback() {
+	if (!_selectedShown.animating() && !_searchShown.animating()) {
+		updateControlsVisibility();
+	}
 	updateControlsGeometry();
 	update();
 }
@@ -1503,16 +1708,16 @@ void TopBarWidget::refreshUnreadBadge() {
 	rpl::combine(
 		_back->geometryValue(),
 		_unreadBadge->widthValue()
-	) | rpl::start_with_next([=](QRect geometry, int width) {
+	) | rpl::on_next([=](QRect geometry, int width) {
 		_unreadBadge->move(
 			geometry.x() + geometry.width() - width,
 			geometry.y() + st::titleUnreadCounterTop);
 	}, _unreadBadge->lifetime());
 
-	_unreadBadge->show();
+	_unreadBadge->setVisible(!rootChatsListBar());
 	_unreadBadge->setAttribute(Qt::WA_TransparentForMouseEvents);
 	_controller->session().data().unreadBadgeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateUnreadBadge();
 	}, _unreadBadge->lifetime());
 	updateUnreadBadge();
@@ -1560,7 +1765,7 @@ void TopBarWidget::setupDragOnBackButton() {
 	_back->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return e->type() == QEvent::DragEnter;
-	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
 		using namespace Storage;
 		const auto d = static_cast<QDragEnterEvent*>(e.get());
 		const auto data = d->mimeData();
@@ -1577,7 +1782,7 @@ void TopBarWidget::setupDragOnBackButton() {
 		) | rpl::filter([=](not_null<QEvent*> e) {
 			return e->type() == QEvent::DragMove
 				|| e->type() == QEvent::DragLeave;
-		}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		}) | rpl::on_next([=](not_null<QEvent*> e) {
 			if (e->type() == QEvent::DragMove) {
 				timer->callOnce(ChoosePeerByDragTimeout);
 			} else if (e->type() == QEvent::DragLeave) {
@@ -1654,6 +1859,14 @@ void TopBarWidget::updateOnlineDisplay() {
 				text = tr::lng_group_status(tr::now);
 			}
 		}
+	} else if (const auto monoforum = peer->monoforum()) {
+		const auto chats = monoforum->chatsList();
+		const auto count = chats->fullSize().current();
+		text = (count > 0)
+			? tr::lng_filters_chats_count(tr::now, lt_count, count)
+			: tr::lng_filters_no_chats(tr::now);
+	} else if (peer->isMonoforum()) {
+		text = tr::lng_chat_status_direct(tr::now);
 	} else if (const auto channel = peer->asChannel()) {
 		if (channel->isMegagroup()
 			&& channel->canViewMembers()
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
index dc5a78aff11f3c..b25d15ea06f585 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
@@ -36,6 +36,10 @@ namespace Window {
 class SessionController;
 } // namespace Window
 
+namespace Calls {
+struct StartOutgoingCallArgs;
+} // namespace Calls
+
 namespace HistoryView {
 
 class SendActionPainter;
@@ -119,6 +123,7 @@ class TopBarWidget final : public Ui::RpWidget {
 		QRect geometry,
 		int narrowWidth,
 		float64 narrowRatio);
+	void showPeerMenu();
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
@@ -135,18 +140,23 @@ class TopBarWidget final : public Ui::RpWidget {
 	void refreshInfoButton();
 	void refreshLang();
 	void updateSearchVisibility();
+	void updateSearchJumpToDateVisibility();
+	[[nodiscard]] bool searchJumpToDateFits() const;
+	void updateChooseFromUserGeometry();
 	void updateControlsGeometry();
 	void slideAnimationCallback();
 	void updateInfoToggleActive();
 	void setupDragOnBackButton();
 
-	void call();
+	void call(Calls::StartOutgoingCallArgs);
 	void groupCall();
-	void showPeerMenu();
 	void showGroupCallMenu(not_null<PeerData*> peer);
+	void showCallMenu();
 	void toggleInfoSection();
 
-	[[nodiscard]] bool createMenu(not_null<Ui::IconButton*> button);
+	[[nodiscard]] bool createMenu(
+		not_null<Ui::IconButton*> button,
+		bool withIcons = true);
 
 	void handleEmojiInteractionSeen(const QString &emoticon);
 	bool paintSendAction(
@@ -164,6 +174,7 @@ class TopBarWidget final : public Ui::RpWidget {
 	void connectingAnimationCallback();
 
 	void paintTopBar(Painter &p);
+	[[nodiscard]] PeerData *titleNamePeer() const;
 	void paintStatus(
 		Painter &p,
 		int left,
@@ -233,7 +244,7 @@ class TopBarWidget final : public Ui::RpWidget {
 	object_ptr<Ui::IconButton> _menuToggle;
 	base::unique_qptr<Ui::PopupMenu> _menu;
 
-	object_ptr<TWidget> _membersShowArea = { nullptr };
+	object_ptr<RpWidget> _membersShowArea = { nullptr };
 	rpl::event_stream<bool> _membersShowAreaActive;
 
 	float64 _narrowRatio = 0.;
diff --git a/Telegram/SourceFiles/history/view/history_view_top_peers_selector.cpp b/Telegram/SourceFiles/history/view/history_view_top_peers_selector.cpp
new file mode 100644
index 00000000000000..f76301f0fb9ad6
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_top_peers_selector.cpp
@@ -0,0 +1,227 @@
+// This file is part of Telegram Desktop,
+// the official desktop application for the Telegram messaging service.
+//
+// For license and copyright information please follow this link:
+// https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+//
+#include "history/view/history_view_top_peers_selector.h"
+
+#include "apiwrap.h"
+#include "base/unique_qptr.h"
+#include "chat_helpers/share_message_phrase_factory.h"
+#include "data/components/top_peers.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "history/history.h"
+#include "info/profile/info_profile_values.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "main/session/session_show.h"
+#include "ui/controls/dynamic_images_strip.h"
+#include "ui/controls/popup_selector.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
+#include "ui/effects/animations.h"
+#include "ui/rect.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/wrap/padding_wrap.h"
+#include "styles/style_chat_helpers.h"
+
+namespace HistoryView {
+namespace {
+
+constexpr auto kMaxPeers = 5;
+
+[[nodiscard]] std::vector<not_null<PeerData*>> CollectPeers(
+		not_null<Main::Session*> session) {
+	const auto user = session->user();
+	auto topPeers = session->topPeers().list();
+	const auto it = ranges::find(topPeers, user);
+	if (it != topPeers.end()) {
+		topPeers.erase(it);
+	}
+	auto result = std::vector<not_null<PeerData*>>();
+	result.push_back(user);
+	for (const auto &peer : topPeers | ranges::views::take(kMaxPeers - 1)) {
+		result.push_back(peer);
+	}
+	return result;
+}
+
+} // namespace
+
+void ShowTopPeersSelector(
+		not_null<Ui::RpWidget*> parent,
+		std::shared_ptr<Main::SessionShow> show,
+		FullMsgId fullId,
+		QPoint globalPos) {
+	const auto session = &show->session();
+	const auto peers = CollectPeers(session);
+	auto thumbnails = std::vector<std::shared_ptr<Ui::DynamicImage>>();
+	thumbnails.reserve(peers.size());
+	for (const auto &peer : peers) {
+		thumbnails.push_back(peer->isSelf()
+			? Ui::MakeSavedMessagesThumbnail()
+			: Ui::MakeUserpicThumbnail(peer));
+	}
+
+	const auto send = [=](not_null<PeerData*> peer) {
+		if (const auto item = session->data().message(fullId)) {
+			const auto items = session->data().idsToItems(
+				session->data().itemOrItsGroup(item));
+			const auto single = (items.size() == 1);
+			session->api().forwardMessages(
+				Data::ResolvedForwardDraft{ .items = items },
+				Api::SendAction(session->data().history(peer)),
+				[=] {
+					using namespace ChatHelpers;
+					auto text = rpl::variable<TextWithEntities>(
+						ForwardedMessagePhrase({
+							.toCount = 1,
+							.singleMessage = single,
+							.to1 = peer,
+						})).current();
+					show->showToast({
+						.text = std::move(text),
+						.filter = ForwardedToSavedMessagesFilter(session),
+					});
+				});
+		}
+	};
+
+	const auto contentWidth = peers.size() * st::topPeersSelectorUserpicSize
+		+ (peers.size() - 1) * st::topPeersSelectorUserpicGap;
+	const auto contentHeight = int(
+		st::topPeersSelectorUserpicSize
+			* (1. + st::topPeersSelectorUserpicExpand));
+	const auto selectorHeight = contentHeight
+		+ 2 * st::topPeersSelectorPadding;
+	const auto selectorWidth = (peers.size() == 1)
+		? selectorHeight
+		: (contentWidth + 2 * st::topPeersSelectorPadding);
+
+	struct State {
+		base::unique_qptr<Ui::PopupSelector> selector;
+		base::unique_qptr<Ui::ImportantTooltip> tooltip;
+		Ui::Animations::Simple animation;
+		bool finishing = false;
+	};
+	const auto state = std::make_shared<State>();
+
+	state->selector = base::make_unique_q<Ui::PopupSelector>(
+		parent,
+		QSize(selectorWidth, selectorHeight));
+	const auto selector = state->selector.get();
+	selector->setHideFinishedCallback([=, state = std::weak_ptr(state)] {
+		if (const auto s = state.lock()) {
+			s->selector = nullptr;
+			s->tooltip = nullptr;
+		}
+	});
+	const auto userpicsWidget = Ui::CreateChild<Ui::DynamicImagesStrip>(
+		selector,
+		std::move(thumbnails),
+		st::topPeersSelectorUserpicSize,
+		st::topPeersSelectorUserpicGap);
+	const auto margins = selector->marginsForShadow();
+	const auto x = (selectorWidth - contentWidth) / 2 + margins.left();
+	const auto y = (selectorHeight - contentHeight) / 2 + margins.top();
+	userpicsWidget->setGeometry(
+		QRect(x, y, contentWidth, contentHeight)
+			+ Margins(int(st::topPeersSelectorUserpicSize
+				* st::topPeersSelectorUserpicExpand)));
+	userpicsWidget->setCursor(style::cur_pointer);
+
+	const auto hideAll = [=] {
+		state->finishing = true;
+		if (state->tooltip) {
+			state->tooltip->toggleAnimated(false);
+		}
+		selector->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+		selector->hideAnimated();
+	};
+
+	userpicsWidget->setClickCallback([=](int index) {
+		if (state->finishing) {
+			return;
+		}
+		send(peers[index]);
+		hideAll();
+	});
+	userpicsWidget->hoveredItemValue(
+	) | rpl::on_next([=](Ui::HoveredItemInfo info) {
+		if (info.index < 0) {
+			state->tooltip = nullptr;
+			return;
+		}
+		using namespace Info::Profile;
+		state->tooltip = base::make_unique_q<Ui::ImportantTooltip>(
+			parent,
+			object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
+				selector,
+				Ui::MakeNiceTooltipLabel(
+					parent,
+					peers[info.index]->isSelf()
+						? tr::lng_saved_messages(tr::rich)
+						: NameValue(peers[info.index]) | rpl::map(tr::rich),
+					std::max(
+						userpicsWidget->width(),
+						st::topPeersSelectorImportantTooltipLabel.minWidth
+							+ st::lineWidth),
+					st::topPeersSelectorImportantTooltipLabel),
+				st::topPeersSelectorImportantTooltip.padding),
+			st::topPeersSelectorImportantTooltip);
+		state->tooltip->setWindowFlags(Qt::WindowFlags(Qt::ToolTip)
+			| Qt::BypassWindowManagerHint
+			| Qt::NoDropShadowWindowHint
+			| Qt::FramelessWindowHint);
+		state->tooltip->setAttribute(Qt::WA_NoSystemBackground, true);
+		state->tooltip->setAttribute(Qt::WA_TranslucentBackground, true);
+		state->tooltip->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+		const auto step = st::topPeersSelectorUserpicSize
+			+ st::topPeersSelectorUserpicGap;
+		const auto shift = (userpicsWidget->height()
+			- st::topPeersSelectorUserpicSize) / 2;
+		const auto localX = info.index * step + shift;
+		const auto avatarRect = QRect(
+			localX,
+			-shift,
+			st::topPeersSelectorUserpicSize,
+			st::topPeersSelectorUserpicSize);
+		const auto globalRect = QRect(
+			userpicsWidget->mapToGlobal(avatarRect.topLeft()),
+			avatarRect.size());
+		state->tooltip->pointAt(globalRect, RectPart::Top);
+		state->tooltip->toggleAnimated(true);
+	}, selector->lifetime());
+	selector->updateShowState(0, 0, true);
+	selector->popup((!globalPos.isNull() ? globalPos : QCursor::pos())
+		- QPoint(selector->width() / 2, selector->height())
+		+ st::topPeersSelectorSkip);
+	selector->events(
+	) | rpl::on_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::KeyPress) {
+			const auto key = static_cast<QKeyEvent*>(e.get());
+			if (key->key() == Qt::Key_Escape) {
+				hideAll();
+			} else {
+				userpicsWidget->handleKeyPressEvent(key);
+			}
+		}
+	}, selector->lifetime());
+	crl::on_main(selector, [=] {
+		selector->setFocus();
+	});
+
+	constexpr auto kShift = 0.15;
+	state->animation.start([=](float64 value) {
+		const auto userpicsProgress = std::clamp((value - kShift), 0., 1.);
+		userpicsWidget->setProgress(anim::easeInQuint(1, userpicsProgress));
+		value = std::clamp(value, 0., 1.);
+		selector->updateShowState(value, value, true);
+	}, 0., 1. + kShift, st::fadeWrapDuration * 3, anim::easeOutQuint);
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_top_peers_selector.h b/Telegram/SourceFiles/history/view/history_view_top_peers_selector.h
new file mode 100644
index 00000000000000..6de3b03f8e491e
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_top_peers_selector.h
@@ -0,0 +1,25 @@
+// This file is part of Telegram Desktop,
+// the official desktop application for the Telegram messaging service.
+//
+// For license and copyright information please follow this link:
+// https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+//
+#pragma once
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Main {
+class SessionShow;
+} // namespace Main
+
+namespace HistoryView {
+
+void ShowTopPeersSelector(
+	not_null<Ui::RpWidget*> parent,
+	std::shared_ptr<Main::SessionShow> show,
+	FullMsgId fullId,
+	QPoint globalPos);
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_transcribe_button.cpp b/Telegram/SourceFiles/history/view/history_view_transcribe_button.cpp
index 1688b8f6c18127..d4144224357ccf 100644
--- a/Telegram/SourceFiles/history/view/history_view_transcribe_button.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_transcribe_button.cpp
@@ -16,6 +16,7 @@ For license and copyright information please follow this link:
 #include "data/data_session.h"
 #include "main/main_session.h"
 #include "lang/lang_keys.h"
+#include "settings/sections/settings_premium.h"
 #include "ui/chat/chat_style.h"
 #include "ui/effects/radial_animation.h"
 #include "ui/effects/ripple_animation.h"
@@ -31,6 +32,8 @@ namespace {
 
 constexpr auto kInNonChosenOpacity = 0.12;
 constexpr auto kOutNonChosenOpacity = 0.18;
+constexpr auto kArrowPivotNear = 0.349;
+constexpr auto kArrowPivotFar = 1. - kArrowPivotNear;
 
 void ClipPainterForLock(QPainter &p, bool roundview, const QRect &r) {
 	const auto &pos = roundview
@@ -51,10 +54,12 @@ void ClipPainterForLock(QPainter &p, bool roundview, const QRect &r) {
 
 TranscribeButton::TranscribeButton(
 	not_null<HistoryItem*> item,
-	bool roundview)
+	bool roundview,
+	bool summarize)
 : _item(item)
 , _roundview(roundview)
-, _size(!roundview
+, _summarize(summarize)
+, _size(!roundview && !_summarize
 	? st::historyTranscribeSize
 	: QSize(st::historyFastShareSize, st::historyFastShareSize)) {
 }
@@ -65,21 +70,35 @@ QSize TranscribeButton::size() const {
 	return _size;
 }
 
-void TranscribeButton::setLoading(bool loading, Fn<void()> update) {
+void TranscribeButton::setLoading(bool loading) {
 	if (_loading == loading) {
 		return;
 	}
 	_loading = loading;
 	if (_loading) {
+		const auto session = &_item->history()->session();
 		_animation = std::make_unique<Ui::InfiniteRadialAnimation>(
-			update,
-			st::defaultInfiniteRadialAnimation);
+			[=, itemId = _item->fullId()] {
+				if (const auto item = session->data().message(itemId)) {
+					session->data().requestItemRepaint(
+						item,
+						_lastPaintedPoint.isNull()
+							? QRect()
+							: (QRect(_lastPaintedPoint, size()))
+								+ Margins(st::lineWidth));
+				}
+			},
+			st::historyTranscribeRadialAnimation);
 		_animation->start();
 	} else if (_animation) {
-		_animation->stop();
+		_animation->stopWithFade();
 	}
 }
 
+bool TranscribeButton::loading() const {
+	return _loading;
+}
+
 void TranscribeButton::paint(
 		QPainter &p,
 		int x,
@@ -88,7 +107,7 @@ void TranscribeButton::paint(
 	auto hq = PainterHighQualityEnabler(p);
 	const auto opened = _openedAnimation.value(_opened ? 1. : 0.);
 	const auto stm = context.messageStyle();
-	if (_roundview) {
+	if (_roundview || _summarize) {
 		_lastPaintedPoint = { x, y };
 		const auto r = QRect(QPoint(x, y), size());
 
@@ -105,12 +124,106 @@ void TranscribeButton::paint(
 			}
 		}
 
+		const auto state = _animation
+			? _animation->computeState()
+			: Ui::RadialState();
+		const auto staticLoading = anim::Disabled() && state.shown > 0;
+
 		auto hq = PainterHighQualityEnabler(p);
 		p.setPen(Qt::NoPen);
 		p.setBrush(context.st->msgServiceBg());
 
 		p.drawEllipse(r);
-		if (!_loading && hasLock()) {
+		if (_summarize) {
+			if (hasLock()) {
+				context.st->historyFastTranscribeLock().paint(
+					p,
+					r.topLeft() + st::historyFastSummaryLockPos,
+					r.width());
+			}
+			if (!staticLoading) [[likely]] {
+				const auto shown = _item->history()
+					->session().api().transcribes().summary(_item).shown;
+				if (_summaryShown != shown) {
+					_summaryShown = shown;
+					const auto session = &_item->history()->session();
+					_openedAnimation.start(
+						[=, itemId = _item->fullId()] {
+							if (const auto i = session->data().message(
+									itemId)) {
+								session->data().requestItemRepaint(i);
+							}
+						},
+						shown ? 0. : 1.,
+						shown ? 1. : 0.,
+						st::fadeWrapDuration);
+				}
+				const auto t
+					= _openedAnimation.value(_summaryShown ? 1. : 0.);
+
+				const auto fg = context.st->msgServiceFg()->c;
+				st::historySummaryStars.paintInCenter(p, r, fg);
+
+				const auto &arrow = st::historySummaryArrows;
+				const auto sz = r.width();
+				const auto cx = r.x() + sz / 2.;
+				const auto cy = r.y() + sz / 2.;
+
+				// First arrow.
+				{
+					p.save();
+					if (t < 0.5) {
+						const auto s = std::abs(t - 0.5) + 0.5;
+						p.translate(cx, cy);
+						p.scale(s, s);
+						p.translate(-cx, -cy);
+					}
+					if (t > 0.5) {
+						const auto s = std::abs(t - 0.5) + 0.5;
+						const auto px = r.x() + sz * kArrowPivotNear;
+						const auto py = r.y() + sz * kArrowPivotFar;
+						p.translate(px, py);
+						p.scale(-s, -s);
+						p.translate(-px, -py);
+						p.translate(
+							-sz * (1. - s) * 0.4,
+							sz * (1. - s) * 0.4);
+					}
+					arrow.paintInCenter(p, QRectF(r), fg);
+					p.restore();
+				}
+
+				// Second arrow (rotated 180 degrees).
+				{
+					p.save();
+					if (t < 0.5) {
+						const auto s = std::abs(t - 0.5) + 0.5;
+						p.translate(cx, cy);
+						p.scale(s, s);
+						p.translate(-cx, -cy);
+					}
+					if (t > 0.5) {
+						const auto s = std::abs(t - 0.5) + 0.5;
+						const auto px = r.x() + sz * kArrowPivotFar;
+						const auto py = r.y() + sz * kArrowPivotNear;
+						p.translate(px, py);
+						p.scale(-s, -s);
+						p.translate(-px, -py);
+					}
+					p.translate(cx, cy);
+					p.rotate(180.);
+					p.translate(-cx, -cy);
+					if (t > 0.5) {
+						const auto s = std::abs(t - 0.5) + 0.5;
+						p.translate(
+							-sz * (1. - s) * 0.4,
+							sz * (1. - s) * 0.4);
+					}
+					arrow.paintInCenter(p, QRectF(r), fg);
+					p.restore();
+				}
+			}
+		} else if (!_loading && hasLock()) {
 			ClipPainterForLock(p, true, r);
 			context.st->historyFastTranscribeIcon().paintInCenter(p, r);
 			p.setClipping(false);
@@ -122,14 +235,10 @@ void TranscribeButton::paint(
 			context.st->historyFastTranscribeIcon().paintInCenter(p, r);
 		}
 
-		const auto state = _animation
-			? _animation->computeState()
-			: Ui::RadialState();
-
 		auto pen = QPen(st::msgServiceFg);
 		pen.setCapStyle(Qt::RoundCap);
 		p.setPen(pen);
-		if (_animation && state.shown > 0 && anim::Disabled()) {
+		if (staticLoading) [[unlikely]] {
 			const auto _st = &st::defaultRadio;
 			anim::DrawStaticLoading(
 				p,
@@ -222,10 +331,14 @@ void TranscribeButton::paint(
 
 bool TranscribeButton::hasLock() const {
 	const auto session = &_item->history()->session();
+	if (session->premium()) {
+		return false;
+	}
 	const auto transcribes = &session->api().transcribes();
-	if (session->premium()
-		|| transcribes->freeFor(_item)
-		|| transcribes->trialsCount()) {
+	if (_summarize) {
+		return transcribes->summary(_item).premiumRequired;
+	}
+	if (transcribes->freeFor(_item) || transcribes->trialsCount()) {
 		return false;
 	}
 	const auto until = transcribes->trialsRefreshAt();
@@ -259,20 +372,28 @@ ClickHandlerPtr TranscribeButton::link() {
 	}
 	const auto session = &_item->history()->session();
 	const auto id = _item->fullId();
+	const auto summarize = _summarize;
 	_link = std::make_shared<LambdaClickHandler>([=](ClickContext context) {
 		const auto item = session->data().message(id);
 		if (!item) {
 			return;
 		}
 		if (session->premium()) {
-			return session->api().transcribes().toggle(item);
+			auto &transcribes = session->api().transcribes();
+			return summarize
+				? transcribes.toggleSummary(item)
+				: transcribes.toggle(item);
 		}
 		const auto my = context.other.value<ClickHandlerContext>();
 		if (hasLock()) {
 			if (const auto controller = my.sessionWindow.get()) {
-				ShowPremiumPreviewBox(
-					controller,
-					PremiumFeature::VoiceToText);
+				if (summarize) {
+					Settings::ShowPremium(controller, u"summary"_q);
+				} else {
+					ShowPremiumPreviewBox(
+						controller,
+						PremiumFeature::VoiceToText);
+				}
 			}
 		} else {
 			const auto max = session->api().transcribes().trialsMaxLengthMs();
@@ -288,7 +409,11 @@ ClickHandlerPtr TranscribeButton::link() {
 					}
 				}
 			}
-			session->api().transcribes().toggle(item);
+			if (summarize) {
+				session->api().transcribes().toggleSummary(item);
+			} else {
+				session->api().transcribes().toggle(item);
+			}
 		}
 	});
 	return _link;
@@ -296,7 +421,12 @@ ClickHandlerPtr TranscribeButton::link() {
 
 bool TranscribeButton::contains(const QPoint &p) {
 	_lastStatePoint = p - _lastPaintedPoint;
-	return QRect(_lastPaintedPoint, size()).contains(p);
+	if (_summarize) {
+		_summarizeHovered = QRect(_lastPaintedPoint, size()).contains(p);
+		return _summarizeHovered;
+	} else {
+		return QRect(_lastPaintedPoint, size()).contains(p);
+	}
 }
 
 void TranscribeButton::addRipple(Fn<void()> callback) {
diff --git a/Telegram/SourceFiles/history/view/history_view_transcribe_button.h b/Telegram/SourceFiles/history/view/history_view_transcribe_button.h
index db318eb5a28ae4..3b05110f6a9d24 100644
--- a/Telegram/SourceFiles/history/view/history_view_transcribe_button.h
+++ b/Telegram/SourceFiles/history/view/history_view_transcribe_button.h
@@ -21,13 +21,17 @@ using PaintContext = Ui::ChatPaintContext;
 
 class TranscribeButton final {
 public:
-	explicit TranscribeButton(not_null<HistoryItem*> item, bool roundview);
+	explicit TranscribeButton(
+		not_null<HistoryItem*> item,
+		bool roundview,
+		bool summarize = false);
 	~TranscribeButton();
 
 	[[nodiscard]] QSize size() const;
 
 	void setOpened(bool opened, Fn<void()> update);
-	void setLoading(bool loading, Fn<void()> update);
+	void setLoading(bool loading);
+	[[nodiscard]] bool loading() const;
 	void paint(QPainter &p, int x, int y, const PaintContext &context);
 	void addRipple(Fn<void()> callback);
 	void stopRipple() const;
@@ -40,17 +44,20 @@ class TranscribeButton final {
 
 	const not_null<HistoryItem*> _item;
 	const bool _roundview = false;
+	const bool _summarize = false;
 	const QSize _size;
 
-	mutable std::unique_ptr<Ui::InfiniteRadialAnimation> _animation;
-	std::unique_ptr<Ui::RippleAnimation> _ripple;
 	ClickHandlerPtr _link;
-	QString _text;
+	std::unique_ptr<Ui::InfiniteRadialAnimation> _animation;
+	std::unique_ptr<Ui::RippleAnimation> _ripple;
 	Ui::Animations::Simple _openedAnimation;
-	bool _loading = false;
-	bool _opened = false;
+	QString _text;
 	QPoint _lastPaintedPoint;
 	QPoint _lastStatePoint;
+	bool _summarizeHovered = false;
+	bool _loading = false;
+	bool _opened = false;
+	bool _summaryShown = false;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
index 88db9ee2d686f7..a6f3c60bf84750 100644
--- a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
@@ -8,25 +8,34 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_translate_bar.h"
 
 #include "boxes/translate_box.h"
+#include "ui/boxes/about_cocoon_box.h"
+#include "chat_helpers/stickers_lottie.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "core/ui_integration.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_changes.h"
+#include "data/data_document.h"
 #include "history/history.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "settings/settings_credits_graphics.h" // CreditsEntryBoxStyleOverrides
+#include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/boxes/choose_language_box.h" // EditSkipTranslationLanguages.
 #include "ui/layers/box_content.h"
+#include "ui/layers/generic_box.h"
 #include "ui/widgets/menu/menu_item_base.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
+#include "ui/widgets/menu/menu_multiline_action.h"
 #include "ui/widgets/buttons.h"
-#include "ui/widgets/labels.h"
 #include "ui/widgets/popup_menu.h"
-#include "ui/widgets/shadow.h"
 #include "ui/painter.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
+#include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
 
 #include <QtGui/QtEvents>
@@ -39,7 +48,7 @@ constexpr auto kToastDuration = 4 * crl::time(1000);
 class TwoTextAction final : public Ui::Menu::ItemBase {
 public:
 	TwoTextAction(
-		not_null<Ui::RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &st,
 		const QString &text1,
 		const QString &text2,
@@ -81,7 +90,7 @@ TextParseOptions MenuTextOptions = {
 };
 
 TwoTextAction::TwoTextAction(
-	not_null<Ui::RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &st,
 	const QString &text1,
 	const QString &text2,
@@ -89,7 +98,7 @@ TwoTextAction::TwoTextAction(
 	const style::icon *icon,
 	const style::icon *iconOver)
 : ItemBase(parent, st)
-, _dummyAction(new QAction(parent))
+, _dummyAction(Ui::CreateChild<QAction>(parent))
 , _st(st)
 , _icon(icon)
 , _iconOver(iconOver)
@@ -98,11 +107,11 @@ TwoTextAction::TwoTextAction(
 	+ _st.itemStyle.font->height
 	+ st::ttlItemTimerFont->height
 	+ st::ttlItemPadding.bottom()) {
-	initResizeHook(parent->sizeValue());
-	setClickedCallback(std::move(callback));
+	fitToMenuWidth();
+	setActionTriggered(std::move(callback));
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
@@ -232,7 +241,7 @@ TranslateBar::TranslateBar(
 : _controller(controller)
 , _history(history)
 , _wrap(parent, object_ptr<Ui::AbstractButton>(parent))
-, _shadow(std::make_unique<Ui::PlainShadow>(_wrap.parentWidget())) {
+, _shadow(std::make_unique<Ui::PlainShadow>(parent)) {
 	_wrap.hide(anim::type::instant);
 	_shadow->hide();
 
@@ -268,7 +277,7 @@ void TranslateBar::updateShadowGeometry(QRect wrapGeometry) {
 
 void TranslateBar::setup(not_null<History*> history) {
 	_wrap.geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		updateShadowGeometry(rect);
 	}, _wrap.lifetime());
 
@@ -283,7 +292,7 @@ void TranslateBar::setup(not_null<History*> history) {
 	button->setAttribute(Qt::WA_OpaquePaintEvent);
 
 	button->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(button).fillRect(clip, st::historyComposeButtonBg);
 	}, button->lifetime());
 
@@ -298,7 +307,7 @@ void TranslateBar::setup(not_null<History*> history) {
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
 	icon->setAttribute(Qt::WA_TransparentForMouseEvents);
 	icon->resize(st::historyTranslateIcon.size());
-	icon->paintRequest() | rpl::start_with_next([=] {
+	icon->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(icon);
 		st::historyTranslateIcon.paint(p, 0, 0, icon->width());
 	}, icon->lifetime());
@@ -327,7 +336,7 @@ void TranslateBar::setup(not_null<History*> history) {
 			(_wrap.height() - icon->height()) / 2);
 	};
 
-	_wrap.sizeValue() | rpl::start_with_next([=](QSize size) {
+	_wrap.sizeValue() | rpl::on_next([=](QSize size) {
 		settings->moveToRight(0, 0, size.width());
 		updateLabelGeometry();
 	}, lifetime());
@@ -354,7 +363,7 @@ void TranslateBar::setup(not_null<History*> history) {
 	) | rpl::filter([=](LanguageId should) {
 		const auto now = history->translatedTo();
 		return now && (now != should);
-	}) | rpl::start_with_next([=](LanguageId should) {
+	}) | rpl::on_next([=](LanguageId should) {
 		translateTo(should);
 	}, _wrap.lifetime());
 
@@ -372,16 +381,22 @@ void TranslateBar::setup(not_null<History*> history) {
 			const auto&,
 			const auto&) {
 		using Flag = PeerData::TranslationFlag;
+		const auto automatic = history->peer->autoTranslation();
 		return (history->peer->translationFlag() != Flag::Enabled)
 			? rpl::single(QString())
 			: history->translatedTo()
-			? tr::lng_translate_show_original()
+			? (automatic
+				? tr::lng_translate_return_original(
+					lt_language,
+					rpl::single(Ui::LanguageName(
+						history->translateOfferedFrom())))
+				: tr::lng_translate_show_original())
 			: history->translateOfferedFrom()
 			? Ui::TranslateBarTo(to)
 			: rpl::single(QString());
 	}) | rpl::flatten_latest(
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](QString phrase) {
+	) | rpl::on_next([=](QString phrase) {
 		_shouldBeShown = !phrase.isEmpty();
 		if (_shouldBeShown) {
 			label->setText(phrase);
@@ -403,8 +418,8 @@ base::unique_qptr<Ui::PopupMenu> TranslateBar::createMenu(
 		st::popupMenuExpandedSeparator);
 	result->setDestroyedCallback([
 		this,
-		weak = Ui::MakeWeak(&_wrap),
-		weakButton = Ui::MakeWeak(button),
+		weak = base::make_weak(&_wrap),
+		weakButton = base::make_weak(button),
 		menu = result.get()
 	] {
 		if (weak && _menu == menu) {
@@ -424,7 +439,7 @@ void TranslateBar::showMenu(base::unique_qptr<Ui::PopupMenu> menu) {
 	_menu = std::move(menu);
 	_menu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
 
-	const auto guard = Ui::MakeWeak(&_wrap);
+	const auto guard = base::make_weak(&_wrap);
 	const auto now = _history->translatedTo();
 	const auto to = now ? now : Ui::ChooseTranslateTo(_history);
 	const auto weak = base::make_weak(_controller);
@@ -470,6 +485,36 @@ void TranslateBar::showMenu(base::unique_qptr<Ui::PopupMenu> menu) {
 		tr::lng_translate_menu_hide(tr::now),
 		hideBar,
 		&st::menuIconCancel);
+	_menu->addSeparator();
+
+	const auto cocoon = ChatHelpers::GenerateLocalTgsSticker(
+		&_history->session(),
+		u"cocoon"_q,
+		true);
+	auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
+		_menu->menu(),
+		st::defaultMenu,
+		st::historyTranslateCocoonLabel,
+		QPoint(
+			st::defaultMenu.itemPadding.left(),
+			st::defaultMenu.itemPadding.top()),
+		tr::lng_translate_cocoon_menu(
+			tr::now,
+			lt_emoji,
+			Data::SingleCustomEmoji(cocoon),
+			lt_link,
+			tr::link(tr::lng_translate_cocoon_link(tr::now, tr::bold)),
+			tr::rich),
+		Core::TextContext({
+			.session = &_history->session(),
+			.customEmojiLoopLimit = -1,
+		}));
+	item->clicks(
+	) | rpl::on_next([controller = _controller] {
+		controller->show(Box(Ui::AboutCocoonBox));
+	}, item->lifetime());
+	_menu->addAction(std::move(item));
+
 	_menu->popup(_wrap.mapToGlobal(
 		QPoint(_wrap.width(), 0) + st::historyTranslateMenuPosition));
 }
@@ -481,14 +526,14 @@ void TranslateBar::showSettingsToast(
 	const auto text = tr::lng_translate_dont_added(
 		tr::now,
 		lt_name,
-		Ui::Text::Bold(Ui::LanguageName(ignored)),
-		Ui::Text::WithEntities);
+		tr::bold(Ui::LanguageName(ignored)),
+		tr::marked);
 	showToast(text, tr::lng_translate_settings(tr::now), [=] {
 		if (const auto strong = weak.get()) {
 			const auto box = strong->show(
 				Ui::EditSkipTranslationLanguages());
 			if (box) {
-				box->boxClosing() | rpl::start_with_next([=] {
+				box->boxClosing() | rpl::on_next([=] {
 					const auto in = ranges::contains(
 						Core::App().settings().skipTranslationLanguages(),
 						ignored);
@@ -507,7 +552,7 @@ void TranslateBar::showHiddenToast(not_null<PeerData*> peer) {
 		: peer->isBroadcast()
 		? tr::lng_translate_hidden_channel
 		: tr::lng_translate_hidden_group;
-	const auto proj = Ui::Text::WithEntities;
+	const auto proj = tr::marked;
 	showToast(phrase(tr::now, proj), tr::lng_translate_undo(tr::now), [=] {
 		peer->saveTranslationDisabled(false);
 	});
@@ -555,12 +600,11 @@ void TranslateBar::showToast(
 		widget.get(),
 		rpl::single(buttonText),
 		st::historyPremiumViewSet);
-	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	button->show();
 	rpl::combine(
 		widget->sizeValue(),
 		button->sizeValue()
-	) | rpl::start_with_next([=](QSize outer, QSize inner) {
+	) | rpl::on_next([=](QSize outer, QSize inner) {
 		button->moveToRight(
 			0,
 			(outer.height() - inner.height()) / 2,
diff --git a/Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp
index cc7652f62ecbff..245a9f7b0073d0 100644
--- a/Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp
@@ -8,16 +8,20 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_translate_tracker.h"
 
 #include "apiwrap.h"
-#include "api/api_text_entities.h"
+#include "api/api_transcribes.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_flags.h"
+#include "data/data_peer.h"
 #include "data/data_peer_values.h" // Data::AmPremiumValue.
 #include "data/data_session.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_components.h"
 #include "history/view/history_view_element.h"
+#include "lang/translate_provider.h"
 #include "main/main_session.h"
 #include "spellcheck/platform/platform_language.h"
 
@@ -34,6 +38,7 @@ constexpr auto kRequestCountLimit = 20;
 
 TranslateTracker::TranslateTracker(not_null<History*> history)
 : _history(history)
+, _provider(Ui::CreateTranslateProvider(&_history->session()))
 , _limit(kEnoughForRecognition) {
 	setup();
 }
@@ -51,24 +56,29 @@ void TranslateTracker::setup() {
 	const auto peer = _history->peer;
 	peer->updateFull();
 
+	const auto channel = peer->asChannel();
+	auto autoTranslationValue = (channel
+		? (channel->flagsValue() | rpl::type_erased)
+		: rpl::single(Data::Flags<ChannelDataFlags>::Change({}, {}))
+		) | rpl::map([=](Data::Flags<ChannelDataFlags>::Change data) {
+		return (data.value & ChannelDataFlag::AutoTranslation);
+	}) | rpl::distinct_until_changed();
+
 	using namespace rpl::mappers;
 	_trackingLanguage = rpl::combine(
-		Data::AmPremiumValue(&_history->session()),
 		Core::App().settings().translateChatEnabledValue(),
-		_1 && _2);
-
-	_trackingLanguage.value(
-	) | rpl::start_with_next([=](bool tracking) {
+		Data::AmPremiumValue(&_history->session()),
+		std::move(autoTranslationValue),
+		_1 && (_2 || _3));
+	_trackingLanguage.value() | rpl::on_next([=](bool tracking) {
 		_trackingLifetime.destroy();
 		if (tracking) {
 			recognizeCollected();
 			trackSkipLanguages();
+			trackTranslationDisabled();
 		} else {
 			checkRecognized({});
-			_history->translateTo({});
-			if (const auto migrated = _history->migrateFrom()) {
-				migrated->translateTo({});
-			}
+			stopAndRevert();
 		}
 	}, _lifetime);
 }
@@ -101,7 +111,7 @@ bool TranslateTracker::add(
 		bool skipDependencies) {
 	Expects(_addedInBunch >= 0);
 
-	if (item->out()
+	if ((item->out() && !item->history()->peer->autoTranslation())
 		|| item->isService()
 		|| !item->isRegular()
 		|| item->isOnlyEmojiAndSpaces()) {
@@ -148,6 +158,8 @@ bool TranslateTracker::add(
 void TranslateTracker::switchTranslation(
 		not_null<HistoryItem*> item,
 		LanguageId id) {
+	_history->session().api().transcribes().checkSummaryToTranslate(
+		item->fullId());
 	if (item->translationShowRequiresRequest(id)) {
 		_itemsToRequest.emplace(
 			item->fullId(),
@@ -224,19 +236,38 @@ void TranslateTracker::cancelToRequest() {
 }
 
 void TranslateTracker::cancelSentRequest() {
-	if (_requestId) {
+	if (_requestInProcess) {
 		const auto owner = &_history->owner();
 		for (const auto &id : base::take(_requested)) {
 			if (const auto item = owner->message(id)) {
 				item->translationShowRequiresRequest({});
 			}
 		}
-		_history->session().api().request(base::take(_requestId)).cancel();
+		++_requestToken;
+		_requestInProcess = false;
+	}
+}
+
+void TranslateTracker::stopAndRevert() {
+	cancelToRequest();
+	cancelSentRequest();
+	const auto owner = &_history->owner();
+	for (const auto &[id, entry] : _itemsForRecognize) {
+		if (const auto item = owner->message(id)) {
+			if (item->translation()
+				&& item->translationShowRequiresCheck({})) {
+				item->translationShowRequiresRequest({});
+			}
+		}
+	}
+	_history->translateTo({});
+	if (const auto migrated = _history->migrateFrom()) {
+		migrated->translateTo({});
 	}
 }
 
 void TranslateTracker::requestSome() {
-	if (_requestId || _itemsToRequest.empty()) {
+	if (_requestInProcess || _itemsToRequest.empty()) {
 		return;
 	}
 	const auto to = _history->translatedTo();
@@ -248,60 +279,69 @@ void TranslateTracker::requestSome() {
 	_requested.reserve(_itemsToRequest.size());
 	const auto session = &_history->session();
 	const auto peerId = _itemsToRequest.back().first.peer;
-	auto peer = (peerId == _history->peer->id)
-		? _history->peer
-		: session->data().peer(peerId);
 	auto length = 0;
-	auto list = QVector<MTPint>();
-	list.reserve(_itemsToRequest.size());
 	for (auto i = _itemsToRequest.end(); i != _itemsToRequest.begin();) {
 		if ((--i)->first.peer != peerId) {
 			break;
 		}
 		length += i->second.length;
 		_requested.push_back(i->first);
-		list.push_back(MTP_int(i->first.msg));
 		i = _itemsToRequest.erase(i);
-		if (list.size() >= kRequestCountLimit
+		if (_requested.size() >= kRequestCountLimit
 			|| length >= kRequestLengthLimit) {
 			break;
 		}
 	}
-	using Flag = MTPmessages_TranslateText::Flag;
-	_requestId = session->api().request(MTPmessages_TranslateText(
-		MTP_flags(Flag::f_peer | Flag::f_id),
-		peer->input,
-		MTP_vector<MTPint>(list),
-		MTPVector<MTPTextWithEntities>(),
-		MTP_string(to.twoLetterCode())
-	)).done([=](const MTPmessages_TranslatedText &result) {
-		requestDone(to, result.data().vresult().v);
-	}).fail([=] {
-		requestDone(to, {});
-	}).send();
-}
-
-void TranslateTracker::requestDone(
-		LanguageId to,
-		const QVector<MTPTextWithEntities> &list) {
-	auto index = 0;
-	const auto session = &_history->session();
+	if (_requested.empty()) {
+		return;
+	}
 	const auto owner = &session->data();
-	for (const auto &id : base::take(_requested)) {
+	auto requests = std::vector<Ui::TranslateProviderRequest>();
+	requests.reserve(_requested.size());
+	auto ids = std::vector<FullMsgId>();
+	ids.reserve(_requested.size());
+	for (const auto &id : _requested) {
 		if (const auto item = owner->message(id)) {
-			const auto data = (index >= list.size())
-				? nullptr
-				: &list[index].data();
-			auto text = data ? TextWithEntities{
-				qs(data->vtext()),
-				Api::EntitiesFromMTP(session, data->ventities().v)
-			} : TextWithEntities();
-			item->translationDone(to, std::move(text));
+			requests.push_back(Ui::PrepareTranslateProviderRequest(
+				_provider.get(),
+				session->data().peer(id.peer),
+				id.msg,
+				item->originalText()));
+			ids.push_back(id);
 		}
-		++index;
 	}
-	_requestId = 0;
-	requestSome();
+	_requested = std::move(ids);
+	if (_requested.empty()) {
+		requestSome();
+		return;
+	}
+	_requestInProcess = true;
+	const auto requestToken = ++_requestToken;
+	_provider->requestBatch(
+		std::move(requests),
+		to,
+		[=](int index, Ui::TranslateProviderResult result) {
+			if (!_requestInProcess || (_requestToken != requestToken)) {
+				return;
+			}
+			if (index < 0 || index >= _requested.size()) {
+				return;
+			}
+			const auto &id = _requested[index];
+			if (const auto item = owner->message(id)) {
+				item->translationDone(
+					to,
+					result.text.value_or(TextWithEntities()));
+			}
+		},
+		[=] {
+			if (!_requestInProcess || (_requestToken != requestToken)) {
+				return;
+			}
+			_requestInProcess = false;
+			_requested.clear();
+			requestSome();
+		});
 }
 
 void TranslateTracker::applyLimit() {
@@ -345,8 +385,29 @@ void TranslateTracker::recognizeCollected() {
 
 void TranslateTracker::trackSkipLanguages() {
 	Core::App().settings().skipTranslationLanguagesValue(
-	) | rpl::start_with_next([=](const std::vector<LanguageId> &skip) {
+	) | rpl::on_next([=](const std::vector<LanguageId> &skip) {
+		const auto wasOfferedFrom = _history->translateOfferedFrom();
+		const auto wasTranslatedTo = _history->translatedTo();
 		checkRecognized(skip);
+		if (wasTranslatedTo
+			&& wasOfferedFrom
+			&& !_history->translateOfferedFrom()) {
+			stopAndRevert();
+		}
+	}, _trackingLifetime);
+}
+
+void TranslateTracker::trackTranslationDisabled() {
+	using PeerFlag = Data::PeerUpdate::Flag;
+	_history->session().changes().peerFlagsValue(
+		_history->peer,
+		PeerFlag::TranslationDisabled
+	) | rpl::skip(1) | rpl::on_next([=] {
+		using TranslationFlag = PeerData::TranslationFlag;
+		if (_history->peer->translationFlag() == TranslationFlag::Disabled
+			&& _history->translatedTo()) {
+			stopAndRevert();
+		}
 	}, _trackingLifetime);
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_translate_tracker.h b/Telegram/SourceFiles/history/view/history_view_translate_tracker.h
index 9e2ca8b69dfa08..b758e54e7347c0 100644
--- a/Telegram/SourceFiles/history/view/history_view_translate_tracker.h
+++ b/Telegram/SourceFiles/history/view/history_view_translate_tracker.h
@@ -11,6 +11,9 @@ For license and copyright information please follow this link:
 
 class History;
 class HistoryItem;
+namespace Ui {
+class TranslateProvider;
+} // namespace Ui
 
 namespace HistoryView {
 
@@ -46,19 +49,18 @@ class TranslateTracker final {
 	bool add(not_null<HistoryItem*> item, bool skipDependencies);
 	void recognizeCollected();
 	void trackSkipLanguages();
+	void trackTranslationDisabled();
 	void checkRecognized();
 	void checkRecognized(const std::vector<LanguageId> &skip);
 	void applyLimit();
 	void requestSome();
 	void cancelToRequest();
 	void cancelSentRequest();
+	void stopAndRevert();
 	void switchTranslation(not_null<HistoryItem*> item, LanguageId id);
 
-	void requestDone(
-		LanguageId to,
-		const QVector<MTPTextWithEntities> &list);
-
 	const not_null<History*> _history;
+	const std::unique_ptr<Ui::TranslateProvider> _provider;
 	rpl::variable<bool> _trackingLanguage = false;
 	base::flat_map<FullMsgId, ItemForRecognize> _itemsForRecognize;
 	uint64 _generation = 0;
@@ -70,7 +72,8 @@ class TranslateTracker final {
 	base::flat_map<not_null<HistoryItem*>, LanguageId> _switchTranslations;
 	base::flat_map<FullMsgId, ItemToRequest> _itemsToRequest;
 	std::vector<FullMsgId> _requested;
-	mtpRequestId _requestId = 0;
+	uint64 _requestToken = 0;
+	bool _requestInProcess = false;
 
 	rpl::lifetime _trackingLifetime;
 	rpl::lifetime _lifetime;
diff --git a/Telegram/SourceFiles/history/view/history_view_view_button.cpp b/Telegram/SourceFiles/history/view/history_view_view_button.cpp
index 5f981bd186d9da..d6421d94301750 100644
--- a/Telegram/SourceFiles/history/view/history_view_view_button.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_view_button.cpp
@@ -8,22 +8,20 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_view_button.h"
 
 #include "boxes/gift_premium_box.h"
+#include "core/application.h"
 #include "core/click_handler_types.h"
+#include "data/data_session.h"
 #include "history/history.h"
 #include "history/history_item_components.h"
 #include "history/view/history_view_cursor_state.h"
-#include "iv/iv_data.h"
-#include "iv/iv_controller.h"
+#include "iv/iv_instance.h"
 #include "lang/lang_keys.h"
+#include "main/main_session.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/painter.h"
-#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
 
-#include "core/application.h"
-#include "iv/iv_instance.h"
-
 namespace HistoryView {
 namespace {
 
@@ -63,7 +61,26 @@ namespace {
 [[nodiscard]] QString MakeMediaButtonText(not_null<Data::Media*> media) {
 	Expects(media->giveawayStart() || media->giveawayResults());
 
-	return Ui::Text::Upper(tr::lng_prizes_how_works(tr::now));
+	return tr::lng_prizes_how_works(tr::now, tr::upper);
+}
+
+[[nodiscard]] ClickHandlerPtr MakeRichMessageButtonClickHandler(
+		FullMsgId itemId) {
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		const auto my = context.other.value<ClickHandlerContext>();
+		const auto controller = my.sessionWindow.get();
+		const auto item = controller
+			? controller->session().data().message(itemId)
+			: nullptr;
+		if (!controller || !item) {
+			return;
+		}
+		Core::App().iv().showRichMessage(controller, not_null{ item });
+	});
+}
+
+[[nodiscard]] QString MakeRichMessageButtonText() {
+	return tr::lng_view_button_full_article(tr::now);
 }
 
 } // namespace
@@ -73,13 +90,20 @@ struct ViewButton::Inner {
 		not_null<Data::Media*> media,
 		uint8 colorIndex,
 		Fn<void()> updateCallback);
+	Inner(
+		FullMsgId itemId,
+		uint8 colorIndex,
+		Fn<void()> updateCallback);
 
-	void updateMask(int height);
-	void toggleRipple(bool pressed);
+	void createRipple(int height);
+	void toggleRipple(bool pressed, int height);
 
+	const Kind kind;
 	const style::margins &margins;
 	const ClickHandlerPtr link;
 	const Fn<void()> updateCallback;
+	Data::Media *media = nullptr;
+	FullMsgId itemId;
 	uint32 lastWidth : 24 = 0;
 	uint32 colorIndex : 6 = 0;
 	uint32 aboveInfo : 1 = 0;
@@ -97,30 +121,50 @@ ViewButton::Inner::Inner(
 	not_null<Data::Media*> media,
 	uint8 colorIndex,
 	Fn<void()> updateCallback)
-: margins(st::historyViewButtonMargins)
+: kind(Kind::Giveaway)
+, margins(st::historyViewButtonMargins)
 , link(MakeMediaButtonClickHandler(media))
 , updateCallback(std::move(updateCallback))
+, media(media)
 , colorIndex(colorIndex)
 , aboveInfo(1)
 , text(st::historyViewButtonTextStyle, MakeMediaButtonText(media)) {
 }
 
-void ViewButton::Inner::updateMask(int height) {
+ViewButton::Inner::Inner(
+	FullMsgId itemId,
+	uint8 colorIndex,
+	Fn<void()> updateCallback)
+: kind(Kind::RichMessage)
+, margins(st::historyViewButtonMargins)
+, link(MakeRichMessageButtonClickHandler(itemId))
+, updateCallback(std::move(updateCallback))
+, itemId(itemId)
+, colorIndex(colorIndex)
+, aboveInfo(1)
+, text(st::historyViewButtonTextStyle, MakeRichMessageButtonText()) {
+}
+
+void ViewButton::Inner::createRipple(int height) {
+	const auto radius = (kind == Kind::RichMessage)
+		? st::historyPagePreview.radius
+		: st::roundRadiusLarge;
 	ripple = std::make_unique<Ui::RippleAnimation>(
 		st::defaultRippleAnimation,
 		Ui::RippleAnimation::RoundRectMask(
 			QSize(lastWidth, height - margins.top() - margins.bottom()),
-			st::roundRadiusLarge),
+			radius),
 		updateCallback);
 }
 
-void ViewButton::Inner::toggleRipple(bool pressed) {
-	if (ripple) {
-		if (pressed) {
-			ripple->add(lastPoint);
-		} else {
-			ripple->lastStop();
+void ViewButton::Inner::toggleRipple(bool pressed, int height) {
+	if (pressed) {
+		if (!ripple) {
+			createRipple(height);
 		}
+		ripple->add(lastPoint);
+	} else if (ripple) {
+		ripple->lastStop();
 	}
 }
 
@@ -134,15 +178,39 @@ ViewButton::ViewButton(
 	std::move(updateCallback))) {
 }
 
+ViewButton::ViewButton(
+		FullMsgId itemId,
+		uint8 colorIndex,
+		Fn<void()> updateCallback)
+: _inner(std::make_unique<Inner>(
+	itemId,
+	colorIndex,
+	std::move(updateCallback))) {
+}
+
 ViewButton::~ViewButton() {
 }
 
+bool ViewButton::matches(not_null<Data::Media*> media) const {
+	return (_inner->kind == Kind::Giveaway) && (_inner->media == media);
+}
+
+bool ViewButton::matches(FullMsgId itemId) const {
+	return (_inner->kind == Kind::RichMessage) && (_inner->itemId == itemId);
+}
+
 void ViewButton::resized() const {
-	_inner->updateMask(height());
+	if (_inner->ripple) {
+		_inner->createRipple(height());
+	}
 }
 
 int ViewButton::height() const {
-	return st::historyViewButtonHeight;
+	return (_inner->kind == Kind::RichMessage)
+		? (st::historyPageButtonHeight
+			+ _inner->margins.top()
+			+ _inner->margins.bottom())
+		: st::historyViewButtonHeight;
 }
 
 bool ViewButton::belowMessageInfo() const {
@@ -159,35 +227,66 @@ void ViewButton::draw(
 	const auto cache = context.outbg
 		? stm->replyCache[st->colorPatternIndex(_inner->colorIndex)].get()
 		: st->coloredReplyCache(selected, _inner->colorIndex).get();
-	const auto radius = st::historyPagePreview.radius;
-
-	if (_inner->ripple && !_inner->ripple->empty()) {
-		_inner->ripple->paint(p, r.left(), r.top(), r.width(), &cache->bg);
-	}
-
-	PainterHighQualityEnabler hq(p);
-	p.setPen(Qt::NoPen);
-	p.setBrush(cache->bg);
-	p.drawRoundedRect(r, radius, radius);
-
-	p.setPen(cache->icon);
-	_inner->text.drawElided(
-		p,
-		r.left(),
-		r.top() + (r.height() - _inner->text.minHeight()) / 2,
-		r.width(),
-		1,
-		style::al_top);
+	if (_inner->kind == Kind::RichMessage) {
+		Ui::Text::ValidateQuotePaintCache(*cache, st::historyPagePreview);
+		Ui::Text::FillQuotePaint(p, r, *cache, st::historyPagePreview);
+		if (_inner->ripple) {
+			_inner->ripple->paint(p, r.left(), r.top(), r.width(), &cache->bg);
+			if (_inner->ripple->empty()) {
+				_inner->ripple = nullptr;
+			}
+		}
+		const auto padding = st::historyPageButtonPadding;
+		const auto availableWidth = r.width()
+			- padding.left()
+			- padding.right();
+		if (availableWidth > 0) {
+			const auto textWidth = (_inner->text.maxWidth() < availableWidth)
+				? _inner->text.maxWidth()
+				: availableWidth;
+			p.setPen(cache->icon);
+			_inner->text.drawElided(
+				p,
+				r.left()
+					+ padding.left()
+					+ (availableWidth - textWidth) / 2,
+				r.top() + padding.top(),
+				textWidth,
+				1,
+				style::al_top);
+		}
+	} else {
+		const auto radius = st::historyPagePreview.radius;
+		if (_inner->ripple) {
+			_inner->ripple->paint(p, r.left(), r.top(), r.width(), &cache->bg);
+			if (_inner->ripple->empty()) {
+				_inner->ripple = nullptr;
+			}
+		}
+		PainterHighQualityEnabler hq(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(cache->bg);
+		p.drawRoundedRect(r, radius, radius);
 
-	if (_inner->externalLink) {
-		const auto &icon = st::msgBotKbUrlIcon;
-		const auto padding = st::msgBotKbIconPadding;
-		icon.paint(
+		p.setPen(cache->icon);
+		_inner->text.drawElided(
 			p,
-			r.left() + r.width() - icon.width() - padding,
-			r.top() + padding,
+			r.left(),
+			r.top() + (r.height() - _inner->text.minHeight()) / 2,
 			r.width(),
-			cache->icon);
+			1,
+			style::al_top);
+
+		if (_inner->externalLink) {
+			const auto &icon = st::msgBotKbUrlIcon;
+			const auto padding = st::msgBotKbIconPadding;
+			icon.paint(
+				p,
+				r.left() + r.width() - icon.width() - padding,
+				r.top() + padding,
+				r.width(),
+				cache->icon);
+		}
 	}
 	if (_inner->lastWidth != r.width()) {
 		_inner->lastWidth = r.width();
@@ -203,7 +302,7 @@ bool ViewButton::checkLink(const ClickHandlerPtr &other, bool pressed) {
 	if (_inner->link != other) {
 		return false;
 	}
-	_inner->toggleRipple(pressed);
+	_inner->toggleRipple(pressed, height());
 	return true;
 }
 
@@ -215,6 +314,9 @@ bool ViewButton::getState(
 		return false;
 	}
 	outResult->link = _inner->link;
+	if (!_inner->ripple) {
+		_inner->lastWidth = g.width();
+	}
 	_inner->lastPoint = point - g.topLeft();
 	return true;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_view_button.h b/Telegram/SourceFiles/history/view/history_view_view_button.h
index e6a3744d40ad36..430195cd518ceb 100644
--- a/Telegram/SourceFiles/history/view/history_view_view_button.h
+++ b/Telegram/SourceFiles/history/view/history_view_view_button.h
@@ -13,6 +13,7 @@ namespace Data {
 class Media;
 } // namespace Data
 
+struct FullMsgId;
 struct WebPageData;
 
 namespace HistoryView {
@@ -21,15 +22,26 @@ struct TextState;
 
 class ViewButton {
 public:
+	enum class Kind {
+		Giveaway,
+		RichMessage,
+	};
+
 	ViewButton(
 		not_null<Data::Media*> media,
 		uint8 colorIndex,
 		Fn<void()> updateCallback);
+	ViewButton(
+		FullMsgId itemId,
+		uint8 colorIndex,
+		Fn<void()> updateCallback);
 	~ViewButton();
 
 	[[nodiscard]] static bool MediaHasViewButton(
 		not_null<Data::Media*> media);
 
+	[[nodiscard]] bool matches(not_null<Data::Media*> media) const;
+	[[nodiscard]] bool matches(FullMsgId itemId) const;
 	[[nodiscard]] int height() const;
 	[[nodiscard]] bool belowMessageInfo() const;
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_birthday_suggestion.cpp b/Telegram/SourceFiles/history/view/media/history_view_birthday_suggestion.cpp
new file mode 100644
index 00000000000000..c838896b513e08
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_birthday_suggestion.cpp
@@ -0,0 +1,202 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/media/history_view_birthday_suggestion.h"
+
+#include "boxes/star_gift_box.h"
+#include "chat_helpers/stickers_lottie.h"
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_birthday.h"
+#include "data/data_media_types.h"
+#include "data/data_session.h"
+#include "data/data_star_gift.h"
+#include "history/view/media/history_view_media_generic.h"
+#include "history/view/media/history_view_premium_gift.h"
+#include "history/view/media/history_view_unique_gift.h"
+#include "history/view/history_view_cursor_state.h"
+#include "history/view/history_view_element.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/settings_credits_graphics.h"
+#include "ui/chat/chat_style.h"
+#include "ui/effects/premium_stars_colored.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/painter.h"
+#include "ui/power_saving.h"
+#include "ui/rect.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_credits.h"
+
+namespace HistoryView {
+
+[[nodiscard]] auto GenerateSuggetsBirthdayMedia(
+	not_null<Element*> parent,
+	Element *replacing,
+	Data::Birthday birthday)
+-> Fn<void(
+		not_null<MediaGeneric*>,
+		Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](
+			not_null<MediaGeneric*> media,
+			Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
+		const auto session = &media->parent()->history()->session();
+		const auto document = ChatHelpers::GenerateLocalTgsSticker(
+			session,
+			u"cake"_q);
+		const auto sticker = [=] {
+			using Tag = ChatHelpers::StickerLottieSize;
+			return StickerInBubblePart::Data{
+				.sticker = document,
+				.size = st::birthdaySuggestStickerSize,
+				.cacheTag = Tag::ChatIntroHelloSticker,
+				.stopOnLastFrame = true,
+			};
+		};
+		push(std::make_unique<StickerInBubblePart>(
+			parent,
+			replacing,
+			sticker,
+			st::birthdaySuggestStickerPadding));
+
+		const auto from = media->parent()->data()->from();
+		const auto isSelf = (from->id == from->session().userPeerId());
+		const auto peer = isSelf ? media->parent()->history()->peer : from;
+		push(std::make_unique<MediaGenericTextPart>(
+			(isSelf
+				? tr::lng_action_suggested_birthday_me
+				: tr::lng_action_suggested_birthday)(
+					tr::now,
+					lt_user,
+					TextWithEntities{ peer->shortName() },
+					tr::marked),
+			st::birthdaySuggestTextPadding));
+
+		push(std::make_unique<BirthdayTable>(
+			birthday,
+			(isSelf
+				? st::birthdaySuggestTableLastPadding
+				: st::birthdaySuggestTablePadding)));
+		if (!isSelf) {
+			auto link = std::make_shared<LambdaClickHandler>([=](
+					ClickContext context) {
+				Core::App().openInternalUrl(
+					(u"internal:edit_birthday:suggestion_"_q
+						+ QString::number(birthday.serialize())),
+					context.other);
+			});
+			push(MakeGenericButtonPart(
+				tr::lng_sticker_premium_view(tr::now),
+				st::chatUniqueButtonPadding,
+				[=] { parent->repaint(); },
+				std::move(link)));
+		}
+	};
+}
+
+BirthdayTable::BirthdayTable(Data::Birthday birthday, QMargins margins)
+: _margins(margins) {
+	const auto push = [&](QString label, QString value) {
+		_parts.push_back({
+			.label = Ui::Text::String(st::defaultTextStyle, label),
+			.value = Ui::Text::String(
+				st::defaultTextStyle,
+				tr::bold(value)),
+		});
+	};
+	push(tr::lng_date_input_day(tr::now), QString::number(birthday.day()));
+	push(
+		tr::lng_date_input_month(tr::now),
+		Lang::Month(birthday.month())(tr::now));
+	if (const auto year = birthday.year()) {
+		push(tr::lng_date_input_year(tr::now), QString::number(year));
+	}
+}
+
+void BirthdayTable::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	const auto top = _margins.top();
+	const auto palette = &context.st->serviceTextPalette();
+	const auto paint = [&](
+			const Ui::Text::String &text,
+			int left,
+			int yskip = 0) {
+		text.draw(p, {
+			.position = { left, top + yskip},
+			.outerWidth = outerWidth,
+			.availableWidth = text.maxWidth(),
+			.palette = palette,
+			.spoiler = Ui::Text::DefaultSpoilerCache(),
+			.now = context.now,
+			.pausedEmoji = context.paused || On(PowerSaving::kEmojiChat),
+			.pausedSpoiler = context.paused || On(PowerSaving::kChatSpoiler),
+			.elisionLines = 1,
+		});
+	};
+
+	p.setPen(context.st->msgServiceFg()->c);
+	for (const auto &part : _parts) {
+		p.setOpacity(0.7);
+		paint(part.label, part.labelLeft);
+
+		p.setOpacity(1.);
+		paint(
+			part.value,
+			part.valueLeft,
+			st::normalFont->height + st::birthdaySuggestTableSkip);
+	}
+}
+
+TextState BirthdayTable::textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const {
+	return {};
+}
+
+QSize BirthdayTable::countOptimalSize() {
+	auto width = 0;
+	for (const auto &part : _parts) {
+		width += std::max(part.label.maxWidth(), part.value.maxWidth());
+	}
+	width += st::normalFont->spacew * (_parts.size() - 1);
+
+	const auto height = st::normalFont->height * 2
+		+ st::birthdaySuggestTableSkip;
+	return {
+		_margins.left() + width + _margins.right(),
+		_margins.top() + height + _margins.bottom(),
+	};
+}
+
+QSize BirthdayTable::countCurrentSize(int newWidth) {
+	auto available = newWidth - _margins.left() - _margins.right();
+	for (const auto &part : _parts) {
+		available -= std::max(part.label.maxWidth(), part.value.maxWidth());
+	}
+	const auto skip = available / int(_parts.size() + 1);
+	auto left = _margins.left() + skip;
+	for (auto &part : _parts) {
+		auto full = std::max(part.label.maxWidth(), part.value.maxWidth());
+		part.labelLeft = left + (full - part.label.maxWidth()) / 2;
+		part.valueLeft = left + (full - part.value.maxWidth()) / 2;
+		left += full + skip;
+	}
+	return { newWidth, minHeight() };
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_birthday_suggestion.h b/Telegram/SourceFiles/history/view/media/history_view_birthday_suggestion.h
new file mode 100644
index 00000000000000..32a493f0e851ff
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_birthday_suggestion.h
@@ -0,0 +1,70 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "history/view/media/history_view_media_generic.h"
+
+class Painter;
+
+namespace Data {
+class MediaGiftBox;
+struct UniqueGift;
+class Birthday;
+} // namespace Data
+
+namespace Ui {
+struct ChatPaintContext;
+} // namespace Ui
+
+namespace HistoryView {
+
+class Element;
+class MediaGeneric;
+class MediaGenericPart;
+
+[[nodiscard]] auto GenerateSuggetsBirthdayMedia(
+	not_null<Element*> parent,
+	Element *replacing,
+	Data::Birthday birthday)
+-> Fn<void(
+	not_null<MediaGeneric*>,
+	Fn<void(std::unique_ptr<MediaGenericPart>)>)>;
+
+class BirthdayTable final : public MediaGenericPart {
+public:
+	BirthdayTable(Data::Birthday birthday, QMargins margins);
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+	TextState textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const override;
+
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
+private:
+	struct Part {
+		Ui::Text::String label;
+		Ui::Text::String value;
+		int labelLeft = 0;
+		int valueLeft = 0;
+	};
+
+	std::vector<Part> _parts;
+	QMargins _margins;
+	Fn<QColor(const PaintContext &)> _labelColor;
+	Fn<QColor(const PaintContext &)> _valueColor;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_call.cpp b/Telegram/SourceFiles/history/view/media/history_view_call.cpp
index 954ce579eaffcc..0e58229f31bcc1 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_call.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_call.cpp
@@ -17,20 +17,21 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "calls/calls_instance.h"
 #include "data/data_media_types.h"
 #include "data/data_user.h"
 #include "main/main_session.h"
+#include "window/window_session_controller.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
 
-using FinishReason = Data::CallFinishReason;
+using State = Data::CallState;
 
-[[nodiscard]] int ComputeDuration(FinishReason reason, int duration) {
-	return (reason != FinishReason::Missed
-		&& reason != FinishReason::Busy)
+[[nodiscard]] int ComputeDuration(State state, int duration) {
+	return (state != State::Missed && state != State::Busy)
 		? duration
 		: 0;
 }
@@ -41,11 +42,12 @@ Call::Call(
 	not_null<Element*> parent,
 	not_null<Data::Call*> call)
 : Media(parent)
-, _duration(ComputeDuration(call->finishReason, call->duration))
-, _reason(call->finishReason)
+, _duration(ComputeDuration(call->state, call->duration))
+, _state(call->state)
+, _conference(call->conferenceId != 0)
 , _video(call->video) {
 	const auto item = parent->data();
-	_text = Data::MediaCall::Text(item, _reason, _video);
+	_text = Data::MediaCall::Text(item, _state, _conference, _video);
 	_status = QLocale().toString(
 		parent->dateTime().time(),
 		QLocale::ShortFormat);
@@ -61,13 +63,22 @@ Call::Call(
 
 QSize Call::countOptimalSize() {
 	const auto user = _parent->history()->peer->asUser();
+	const auto conference = _conference;
 	const auto video = _video;
-	_link = std::make_shared<LambdaClickHandler>([=] {
-		if (user) {
-			Core::App().calls().startOutgoingCall(user, video);
+	const auto contextId = _parent->data()->fullId();
+	const auto id = _parent->data()->id;
+	_link = std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		if (conference) {
+			const auto my = context.other.value<ClickHandlerContext>();
+			const auto weak = my.sessionWindow;
+			if (const auto strong = weak.get()) {
+				QSize();
+				strong->resolveConferenceCall(id, contextId);
+			}
+		} else if (user) {
+			Core::App().calls().startOutgoingCall(user, { video });
 		}
 	});
-
 	auto maxWidth = st::historyCallWidth;
 	auto minHeight = st::historyCallHeight;
 	if (!isBubbleTop()) {
@@ -96,8 +107,7 @@ void Call::draw(Painter &p, const PaintContext &context) const {
 	p.drawTextLeft(nameleft, nametop, paintw, _text);
 
 	auto statusleft = nameleft;
-	auto missed = (_reason == FinishReason::Missed)
-		|| (_reason == FinishReason::Busy);
+	auto missed = (_state == State::Missed) || (_state == State::Busy);
 	const auto &arrow = missed
 		? stm->historyCallArrowMissed
 		: stm->historyCallArrow;
@@ -110,6 +120,8 @@ void Call::draw(Painter &p, const PaintContext &context) const {
 
 	const auto &icon = _video
 		? stm->historyCallCameraIcon
+		: _conference
+		? stm->historyCallGroupIcon
 		: stm->historyCallIcon;
 	icon.paint(p, paintw - st::historyCallIconPosition.x() - icon.width(), st::historyCallIconPosition.y() - topMinus, paintw);
 }
diff --git a/Telegram/SourceFiles/history/view/media/history_view_call.h b/Telegram/SourceFiles/history/view/media/history_view_call.h
index 8689b4ce96db67..891d7620b95a1c 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_call.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_call.h
@@ -10,7 +10,7 @@ For license and copyright information please follow this link:
 #include "history/view/media/history_view_media.h"
 
 namespace Data {
-enum class CallFinishReason : char;
+enum class CallState : char;
 struct Call;
 } // namespace Data
 
@@ -40,12 +40,13 @@ class Call : public Media {
 	}
 
 private:
-	using FinishReason = Data::CallFinishReason;
+	using State = Data::CallState;
 
 	QSize countOptimalSize() override;
 
 	const int _duration = 0;
-	const FinishReason _reason;
+	const State _state = {};
+	const bool _conference = false;
 	const bool _video = false;
 
 	QString _text;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_contact.cpp b/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
index dc8995903dd10a..6474f908bb0d06 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
@@ -37,7 +37,7 @@ For license and copyright information please follow this link:
 namespace HistoryView {
 namespace {
 
-class ContactClickHandler : public LambdaClickHandler {
+class ContactClickHandler final : public LambdaClickHandler {
 public:
 	using LambdaClickHandler::LambdaClickHandler;
 
@@ -45,7 +45,7 @@ class ContactClickHandler : public LambdaClickHandler {
 		_dragText = t;
 	}
 
-	QString dragText() const override {
+	QString dragText() const override final {
 		return _dragText;
 	}
 
@@ -227,13 +227,6 @@ Contact::Contact(
 		st::webPageDescriptionStyle,
 		Ui::FormatPhone(data.phoneNumber),
 		Ui::WebpageTextTitleOptions());
-
-#if 0 // No info.
-	_infoLine.setText(
-		st::webPageDescriptionStyle,
-		phone,
-		Ui::WebpageTextTitleOptions());
-#endif
 }
 
 Contact::~Contact() {
@@ -322,10 +315,6 @@ QSize Contact::countOptimalSize() {
 		accumulate_max(maxWidth, lineLeft + _phoneLine.maxWidth());
 		textMinHeight += 1 * lineHeight;
 	}
-	if (!_infoLine.isEmpty()) {
-		accumulate_max(maxWidth, lineLeft + _infoLine.maxWidth());
-		textMinHeight += std::min(_infoLine.minHeight(), 1 * lineHeight);
-	}
 	minHeight = std::max(textMinHeight, st::contactsPhotoSize);
 
 	if (!_buttons.empty()) {
@@ -360,28 +349,41 @@ void Contact::draw(Painter &p, const PaintContext &context) const {
 		? _contact->colorIndex()
 		: Data::DecideColorIndex(
 			Data::FakePeerIdForJustName(_nameLine.toString()));
-	const auto cache = context.outbg
-		? stm->replyCache[st->colorPatternIndex(colorIndex)].get()
-		: st->coloredReplyCache(selected, colorIndex).get();
+	const auto &colorCollectible = _contact
+		? _contact->colorCollectible()
+		: nullptr;
+	const auto colorPattern = colorCollectible
+		? st->collectiblePatternIndex(colorCollectible)
+		: st->colorPatternIndex(colorIndex);
+	const auto useColorCollectible = colorCollectible && !context.outbg;
+	const auto useColorIndex = !context.outbg;
+	const auto cache = useColorCollectible
+		? st->collectibleReplyCache(selected, colorCollectible).get()
+		: useColorIndex
+		? st->coloredReplyCache(selected, colorIndex).get()
+		: stm->replyCache[colorPattern].get();
 	const auto backgroundEmojiId = _contact
 		? _contact->backgroundEmojiId()
 		: DocumentId();
-	const auto backgroundEmoji = backgroundEmojiId
-		? st->backgroundEmojiData(backgroundEmojiId).get()
+	const auto backgroundEmojiData = backgroundEmojiId
+		? st->backgroundEmojiData(backgroundEmojiId, colorCollectible).get()
 		: nullptr;
-	const auto backgroundEmojiCache = backgroundEmoji
-		? &backgroundEmoji->caches[Ui::BackgroundEmojiData::CacheIndex(
+	const auto backgroundEmojiCache = !backgroundEmojiData
+		? nullptr
+		: useColorCollectible
+		? &backgroundEmojiData->collectibleCaches[colorCollectible]
+		: &backgroundEmojiData->caches[Ui::BackgroundEmojiData::CacheIndex(
 			selected,
 			context.outbg,
 			true,
-			colorIndex + 1)]
-		: nullptr;
+			useColorIndex ? (colorIndex + 1) : 0)];
 	Ui::Text::ValidateQuotePaintCache(*cache, _st);
 	Ui::Text::FillQuotePaint(p, outer, *cache, _st);
-	if (backgroundEmoji) {
+	if (backgroundEmojiData) {
 		ValidateBackgroundEmoji(
 			backgroundEmojiId,
-			backgroundEmoji,
+			colorCollectible,
+			backgroundEmojiData,
 			backgroundEmojiCache,
 			cache,
 			view);
@@ -389,7 +391,12 @@ void Contact::draw(Painter &p, const PaintContext &context) const {
 			const auto end = rect::bottom(inner) + _st.padding.bottom();
 			const auto r = outer
 				- QMargins(0, 0, 0, rect::bottom(outer) - end);
-			FillBackgroundEmoji(p, r, false, *backgroundEmojiCache);
+			FillBackgroundEmoji(
+				p,
+				r,
+				false,
+				*backgroundEmojiCache,
+				backgroundEmojiData->firstGiftFrame);
 		}
 	}
 
@@ -435,9 +442,11 @@ void Contact::draw(Painter &p, const PaintContext &context) const {
 
 	{
 		p.setPen(cache->icon);
-		p.setTextPalette(context.outbg
-			? stm->semiboldPalette
-			: st->coloredTextPalette(selected, colorIndex));
+		p.setTextPalette(useColorCollectible
+			? st->collectibleTextPalette(selected, colorCollectible)
+			: useColorIndex
+			? st->coloredTextPalette(selected, colorIndex)
+			: stm->semiboldPalette);
 
 		const auto endskip = _nameLine.hasSkipBlock()
 			? _parent->skipBlockWidth()
@@ -480,26 +489,6 @@ void Contact::draw(Painter &p, const PaintContext &context) const {
 			toTitleSelection(context.selection));
 		tshift += 1 * lineHeight;
 	}
-	if (!_infoLine.isEmpty()) {
-		tshift += st::lineWidth * 3; // Additional skip.
-		const auto endskip = _infoLine.hasSkipBlock()
-			? _parent->skipBlockWidth()
-			: 0;
-		_parent->prepareCustomEmojiPaint(p, context, _infoLine);
-		_infoLine.draw(p, {
-			.position = { lineLeft, tshift },
-			.outerWidth = width(),
-			.availableWidth = lineWidth,
-			.spoiler = Ui::Text::DefaultSpoilerCache(),
-			.now = context.now,
-			.pausedEmoji = context.paused || On(PowerSaving::kEmojiChat),
-			.pausedSpoiler = context.paused || On(PowerSaving::kChatSpoiler),
-			.selection = toDescriptionSelection(context.selection),
-			.elisionHeight = (1 * lineHeight),
-			.elisionRemoveFromEnd = endskip,
-		});
-		tshift += (1 * lineHeight);
-	}
 
 	if (!_buttons.empty()) {
 		p.setFont(st::semiboldFont);
@@ -537,7 +526,7 @@ TextState Contact::textState(QPoint point, StateRequest request) const {
 
 	_lastPoint = point;
 
-	if (_buttons.size() > 1) {
+	if (!hasSingleLink()) {
 		const auto end = rect::bottom(inner) + _st.padding.bottom();
 		const auto bWidth = inner.width() / float64(_buttons.size());
 		const auto bHeight = rect::bottom(outer) - end;
@@ -564,6 +553,14 @@ bool Contact::hasHeavyPart() const {
 	return !_userpic.null();
 }
 
+bool Contact::hasSingleLink() const {
+	return (_buttons.size() > 1)
+		? false
+		: (_buttons.size() == 1 && _buttons.front().link == _mainButton.link)
+		? true
+		: (_buttons.empty() && _mainButton.link);
+}
+
 void Contact::clickHandlerPressedChanged(
 		const ClickHandlerPtr &p,
 		bool pressed) {
@@ -571,7 +568,7 @@ void Contact::clickHandlerPressedChanged(
 	const auto outer = full - inBubblePadding();
 	const auto inner = outer - innerMargin();
 	const auto end = rect::bottom(inner) + _st.padding.bottom();
-	if ((_lastPoint.y() < end) || (_buttons.size() <= 1)) {
+	if ((_lastPoint.y() < end) || hasSingleLink()) {
 		if (p != _mainButton.link) {
 			return;
 		}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_contact.h b/Telegram/SourceFiles/history/view/media/history_view_contact.h
index ada5877213ac05..87110112ecd800 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_contact.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_contact.h
@@ -68,6 +68,8 @@ class Contact final : public Media {
 	[[nodiscard]] TextSelection toDescriptionSelection(
 		TextSelection selection) const;
 
+	[[nodiscard]] bool hasSingleLink() const;
+
 	const style::QuoteStyle &_st;
 	const int _pixh;
 
@@ -76,7 +78,6 @@ class Contact final : public Media {
 
 	Ui::Text::String _nameLine;
 	Ui::Text::String _phoneLine;
-	Ui::Text::String _infoLine;
 
 	Fn<void(not_null<Ui::GenericBox*>)> _vcardBoxFactory;
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_custom_emoji.cpp b/Telegram/SourceFiles/history/view/media/history_view_custom_emoji.cpp
index 51c69c89b74108..94de0a30c2f243 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_custom_emoji.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_custom_emoji.cpp
@@ -108,6 +108,9 @@ CustomEmoji::CustomEmoji(
 }
 
 void CustomEmoji::customEmojiResolveDone(not_null<DocumentData*> document) {
+	if (!document->sticker()) {
+		return;
+	}
 	_resolving = false;
 	const auto id = document->id;
 	for (auto &line : _lines) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_dice.cpp b/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
index 0ce2500b499eb2..a2453a61518cae 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
@@ -12,7 +12,9 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_components.h"
+#include "history/history_item_helpers.h"
 #include "history/view/history_view_element.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "styles/style_chat.h"
 
@@ -42,10 +44,68 @@ Dice::Dice(not_null<Element*> parent, not_null<Data::MediaDice*> dice)
 	if (_showLastFrame) {
 		_drawingEnd = true;
 	}
+	if (const auto outcome = _dice->diceGameOutcome()) {
+		_outcomeSet = true;
+		_outcomeValue = _dice->value();
+		_outcomeNanoTon = outcome.nanoTon;
+		_outcomeStakeNanoTon = outcome.stakeNanoTon;
+		_outcomeStartedUnknown = (_outcomeValue == 0);
+		updateOutcomeMessage();
+	}
 }
 
 Dice::~Dice() = default;
 
+void Dice::updateOutcomeMessage() {
+	if ((_outcomeStartedUnknown && !_outcomeLastPainted)
+		|| (!_outcomeValue && !_outcomeNanoTon)) {
+		_parent->setServicePostMessage({});
+		return;
+	}
+	const auto item = _parent->data();
+	const auto forwarded = item->Get<HistoryMessageForwarded>();
+	const auto originalSender = forwarded
+		? forwarded->originalSender
+		: nullptr;
+	const auto from = originalSender ? originalSender : item->from().get();
+	const auto originalPostAuthor = item->originalPostAuthor();
+	const auto fromName = !originalPostAuthor.isEmpty()
+		? originalPostAuthor
+		: forwarded && forwarded->originalHiddenSenderInfo
+		? forwarded->originalHiddenSenderInfo->name
+		: from->name();
+	const auto out = (item->out() || from->isSelf()) && !forwarded;
+	const auto won = (_outcomeNanoTon > 0);
+	const auto displayNano = won ? _outcomeNanoTon : _outcomeStakeNanoTon;
+	const auto amount = tr::marked(QString::fromUtf8("\xf0\x9f\x92\x8e")
+		+ " "
+		+ QString::number(displayNano / 1e9));
+	const auto text = out
+		? (won
+			? tr::lng_action_stake_game_won_you
+			: tr::lng_action_stake_game_lost_you)(
+				tr::now,
+				lt_amount,
+				amount,
+				tr::marked)
+		: (won
+			? tr::lng_action_stake_game_won
+			: tr::lng_action_stake_game_lost)(
+				tr::now,
+				lt_from,
+				tr::link(st::wrap_rtl(fromName), 1),
+				lt_amount,
+				amount,
+				tr::marked);
+	auto prepared = PreparedServiceText{ text };
+	if (!out) {
+		if (const auto link = forwarded ? originalSender : from) {
+			prepared.links.push_back(link->createOpenLink());
+		}
+	}
+	_parent->setServicePostMessage(prepared, _link);
+}
+
 QSize Dice::countOptimalSize() {
 	return _start ? _start->countOptimalSize() : Sticker::EmojiSize();
 }
@@ -54,6 +114,28 @@ ClickHandlerPtr Dice::link() {
 	return _link;
 }
 
+bool Dice::updateItemData() {
+	const auto outcome = _dice->diceGameOutcome();
+	const auto outcomeSet = !!outcome;
+	const auto outcomeNanoTon = outcomeSet ? outcome.nanoTon : 0;
+	const auto outcomeStakeNanoTon = outcomeSet ? outcome.stakeNanoTon : 0;
+	const auto outcomeValue = _dice->value();
+	if (_outcomeSet == outcomeSet
+		&& _outcomeNanoTon == outcomeNanoTon
+		&& _outcomeStakeNanoTon == outcomeStakeNanoTon
+		&& _outcomeValue == outcomeValue) {
+		return false;
+	}
+	_outcomeSet = outcomeSet;
+	_outcomeNanoTon = outcomeNanoTon;
+	_outcomeStakeNanoTon = outcomeStakeNanoTon;
+	_outcomeValue = outcomeValue;
+	if (_outcomeSet) {
+		updateOutcomeMessage();
+	}
+	return true;
+}
+
 void Dice::draw(Painter &p, const PaintContext &context, const QRect &r) {
 	if (!_start) {
 		if (const auto document = Lookup(_parent, _dice->emoji(), 0)) {
@@ -76,6 +158,15 @@ void Dice::draw(Painter &p, const PaintContext &context, const QRect &r) {
 	}
 	if (_drawingEnd) {
 		_end->draw(p, context, r);
+		if (!_outcomeLastPainted && _end->stoppedOnLastFrame()) {
+			_outcomeLastPainted = true;
+			if (_outcomeSet) {
+				crl::on_main(this, [=] {
+					updateOutcomeMessage();
+					_parent->history()->owner().requestViewResize(_parent);
+				});
+			}
+		}
 	} else if (_start) {
 		_start->draw(p, context, r);
 		if (_end
diff --git a/Telegram/SourceFiles/history/view/media/history_view_dice.h b/Telegram/SourceFiles/history/view/media/history_view_dice.h
index 68a5368d0f1da4..4a225ce74a74ce 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_dice.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_dice.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/weak_ptr.h"
 #include "history/view/media/history_view_media_unwrapped.h"
 #include "history/view/media/history_view_sticker.h"
 
@@ -16,7 +17,9 @@ class MediaDice;
 
 namespace HistoryView {
 
-class Dice final : public UnwrappedMedia::Content {
+class Dice final
+	: public UnwrappedMedia::Content
+	, public base::has_weak_ptr {
 public:
 	Dice(not_null<Element*> parent, not_null<Data::MediaDice*> dice);
 	~Dice();
@@ -42,14 +45,24 @@ class Dice final : public UnwrappedMedia::Content {
 		}
 	}
 
+	bool updateItemData() override;
+
 private:
+	void updateOutcomeMessage();
+
 	const not_null<Element*> _parent;
 	const not_null<Data::MediaDice*> _dice;
 	ClickHandlerPtr _link;
 	std::optional<Sticker> _start;
 	std::optional<Sticker> _end;
+	int64 _outcomeNanoTon = 0;
+	int64 _outcomeStakeNanoTon = 0;
+	int _outcomeValue = 0;
 	mutable bool _showLastFrame = false;
 	mutable bool _drawingEnd = false;
+	bool _outcomeSet = false;
+	bool _outcomeLastPainted = false;
+	bool _outcomeStartedUnknown = false;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 4f43cc9fd14b2f..51b786de868e74 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -16,17 +16,21 @@ For license and copyright information please follow this link:
 #include "media/audio/media_audio.h"
 #include "media/player/media_player_instance.h"
 #include "history/history_item_components.h"
-#include "history/history_item_helpers.h" // ClearMediaAsExpired.
+#include "history/history_item.h"
 #include "history/history.h"
 #include "core/click_handler_types.h" // kDocumentFilenameTooltipProperty.
 #include "history/view/history_view_element.h"
+#include "history/view/history_view_message.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/history_view_transcribe_button.h"
 #include "history/view/media/history_view_media_common.h"
 #include "ui/text/format_values.h"
 #include "ui/text/format_song_document_name.h"
+#include "ui/text/text_lottie_custom_emoji.h"
 #include "ui/text/text_utilities.h"
 #include "ui/chat/chat_style.h"
+#include "ui/effects/voice_once_particles.h"
+#include "ui/paint/blobs.h"
 #include "ui/painter.h"
 #include "ui/power_saving.h"
 #include "ui/rect.h"
@@ -45,6 +49,40 @@ namespace {
 
 constexpr auto kAudioVoiceMsgUpdateView = crl::time(100);
 
+constexpr auto kVoiceBlobAlpha = 0.25;
+constexpr auto kVoiceBlobMaxSpeed = 2.5;
+constexpr auto kVoiceBlobLevelDuration = 100. + 500. * 0.33;
+constexpr auto kVoiceBlobMinorScale = 0.88;
+constexpr auto kVoiceBlobMajorScale = 0.85;
+constexpr auto kVoiceBlobIdleLevel = 0.45;
+
+[[nodiscard]] std::vector<Ui::Paint::Blobs::BlobData> VoicePlaybackBlobs() {
+	return {
+		{
+			.segmentsCount = 6,
+			.minScale = kVoiceBlobMinorScale,
+			.minRadius = float(st::msgVoicePlaybackMinorBlobMinRadius),
+			.maxRadius = float(st::msgVoicePlaybackMinorBlobMaxRadius),
+			.speedScale = 1.,
+			.alpha = kVoiceBlobAlpha,
+			.maxSpeed = kVoiceBlobMaxSpeed,
+		},
+		{
+			.segmentsCount = 8,
+			.minScale = kVoiceBlobMajorScale,
+			.minRadius = float(st::msgVoicePlaybackMajorBlobMinRadius),
+			.maxRadius = float(st::msgVoicePlaybackMajorBlobMaxRadius),
+			.speedScale = 1.,
+			.alpha = kVoiceBlobAlpha,
+			.maxSpeed = kVoiceBlobMaxSpeed,
+		},
+	};
+}
+
+[[nodiscard]] bool IsHostedInstantViewMedia(not_null<const Element*> parent) {
+	return parent->Get<InstantViewMediaRuntime>() != nullptr;
+}
+
 [[nodiscard]] QRect TTLRectFromInner(const QRect &inner) {
 	return QRect(
 		rect::right(inner)
@@ -169,7 +207,7 @@ void FillThumbnailOverlay(
 }
 
 void FillWaveform(VoiceData *roundData) {
-	if (!roundData->waveform.empty()) {
+	if (!roundData || !roundData->waveform.empty()) {
 		return;
 	}
 	const auto &size = ::Media::Player::kWaveformSamplesCount;
@@ -192,7 +230,9 @@ void PaintWaveform(
 		const VoiceData *voiceData,
 		int availableWidth,
 		float64 progress,
-		bool ttl) {
+		bool ttl,
+		float64 hoverProgress = -1,
+		Ui::WaveformParticles *ttlParticles = nullptr) {
 	const auto wf = [&]() -> const VoiceWaveform* {
 		if (!voiceData) {
 			return nullptr;
@@ -216,6 +256,9 @@ void PaintWaveform(
 		? int(wf->size())
 		: ::Media::Player::kWaveformSamplesCount;
 	const auto activeWidth = base::SafeRound(availableWidth * progress);
+	const auto hoverWidth = (hoverProgress >= 0)
+		? base::SafeRound(availableWidth * hoverProgress)
+		: -1.;
 
 	const auto &barWidth = st::msgWaveformBar;
 	const auto barCount = std::min(
@@ -225,6 +268,9 @@ void PaintWaveform(
 	const auto maxDelta = st::msgWaveformMax - st::msgWaveformMin;
 	p.setPen(Qt::NoPen);
 	auto hq = PainterHighQualityEnabler(p);
+	auto edgeTop = 0.;
+	auto edgeHeight = 0.;
+	auto edgeFound = false;
 	for (auto i = 0, barLeft = 0, sum = 0, maxValue = 0; i < wfSize; ++i) {
 		const auto value = wf ? wf->at(i) : 0;
 		if (sum + barCount < wfSize) {
@@ -242,6 +288,11 @@ void PaintWaveform(
 		const auto barHeight = st::msgWaveformMin + barValue;
 		const auto barTop = st::lineWidth + (st::msgWaveformMax - barValue) / 2.;
 
+		if (barLeft < activeWidth) {
+			edgeTop = barTop;
+			edgeHeight = barHeight;
+			edgeFound = true;
+		}
 		if ((barLeft < activeWidth) && (barLeft + barWidth > activeWidth)) {
 			const auto leftWidth = activeWidth - barLeft;
 			const auto rightWidth = barWidth - leftWidth;
@@ -257,10 +308,33 @@ void PaintWaveform(
 			const auto &color = (barLeft >= activeWidth) ? inactive : active;
 			p.fillRect(QRectF(barLeft, barTop, barWidth, barHeight), color);
 		}
+		if (hoverWidth >= 0) {
+			const auto hoverFrom = std::min(activeWidth, hoverWidth);
+			const auto hoverTo = std::max(activeWidth, hoverWidth);
+			if (barLeft < hoverTo && barLeft + barWidth > hoverFrom) {
+				const auto left = std::max(double(barLeft), hoverFrom);
+				const auto right = std::min(
+					double(barLeft + barWidth),
+					hoverTo);
+				p.fillRect(
+					QRectF(left, barTop, right - left, barHeight),
+					anim::with_alpha(active->c, 0.30));
+			}
+		}
 		barLeft += barWidth + st::msgWaveformSkip;
 
 		maxValue = (sum < (barCount + 1) / 2) ? 0 : value;
 	}
+	if (ttl && ttlParticles) {
+		const auto emitArea = (edgeFound && activeWidth < availableWidth)
+			? QRectF(
+				activeWidth - barWidth,
+				edgeTop,
+				barWidth * 2.,
+				edgeHeight)
+			: QRectF();
+		ttlParticles->paint(p, emitArea, active->c, 1.);
+	}
 }
 
 [[nodiscard]] int MaxStatusWidth(not_null<DocumentData*> document) {
@@ -271,10 +345,10 @@ void PaintWaveform(
 	};
 	add(FormatDownloadText(document->size, document->size));
 	const auto duration = document->duration() / 1000;
-	if (const auto song = document->song()) {
+	if (document->song()) {
 		add(FormatPlayedText(duration, duration));
 		add(FormatDurationAndSizeText(duration, document->size));
-	} else if (const auto voice = document->voice() ? document->voice() : document->round()) {
+	} else if (document->voice() ? document->voice() : document->round()) {
 		add(FormatPlayedText(duration, duration));
 		add(FormatDurationAndSizeText(duration, document->size));
 	} else if (document->isVideoFile()) {
@@ -306,12 +380,14 @@ Document::Document(
 		_tooltipFilename.setTooltipText(named->name.toString());
 	}
 
+	const auto media = _parent->data()->media();
 	if ((_data->isVoiceMessage() || isRound)
-		&& _parent->data()->media()->ttlSeconds()) {
+		&& media
+		&& media->ttlSeconds()) {
 		const auto fullId = _realParent->fullId();
 		if (_parent->delegate()->elementContext() == Context::TTLViewer) {
 			auto lifetime = std::make_shared<rpl::lifetime>();
-			TTLVoiceStops(fullId) | rpl::start_with_next([=]() mutable {
+			TTLVoiceStops(fullId) | rpl::on_next([=]() mutable {
 				if (lifetime) {
 					base::take(lifetime)->destroy();
 				}
@@ -324,13 +400,13 @@ Document::Document(
 				_openl = nullptr;
 
 				auto lifetime = std::make_shared<rpl::lifetime>();
-				TTLVoiceStops(fullId) | rpl::start_with_next([=]() mutable {
+				TTLVoiceStops(fullId) | rpl::on_next([=]() mutable {
 					if (lifetime) {
 						base::take(lifetime)->destroy();
 					}
 					if (const auto item = data->message(fullId)) {
 						// Destroys this.
-						ClearMediaAsExpired(item);
+						item->clearMediaAsExpired();
 					}
 				}, *lifetime);
 
@@ -377,6 +453,8 @@ void Document::createComponents() {
 		if (_data->hasThumbnail() && !_data->isSong()) {
 			_data->loadThumbnail(_realParent->fullId());
 			mask |= HistoryDocumentThumbed::Bit();
+		} else if (_data->isSvgImage()) {
+			mask |= HistoryDocumentThumbed::Bit();
 		}
 	}
 	UpdateComponents(mask);
@@ -395,7 +473,8 @@ void Document::createComponents() {
 			_realParent->fullId());
 	}
 	if (const auto voice = Get<HistoryDocumentVoice>()) {
-		voice->seekl = !_parent->data()->media()->ttlSeconds()
+		const auto media = _parent->data()->media();
+		voice->seekl = (!media || !media->ttlSeconds())
 			? std::make_shared<VoiceSeekClickHandler>(_data, [](FullMsgId) {})
 			: nullptr;
 		if (_transcribedRound) {
@@ -418,11 +497,15 @@ QSize Document::countOptimalSize() {
 		const auto history = _realParent->history();
 		const auto session = &history->session();
 		const auto transcribes = &session->api().transcribes();
-		if (_parent->data()->media()->ttlSeconds()
+		const auto media = _parent->data()->media();
+		if ((media && media->ttlSeconds())
 			|| _realParent->isScheduled()
+			|| _realParent->isAdminLogEntry()
 			|| (!session->premium()
 				&& !transcribes->freeFor(_realParent)
-				&& !transcribes->trialsSupport())) {
+				&& !transcribes->trialsSupport())
+			|| (!session->premium()
+				&& _data->duration() > transcribes->trialsMaxLengthMs())) {
 			voice->transcribe = nullptr;
 			voice->transcribeText = {};
 		} else {
@@ -435,17 +518,26 @@ QSize Document::countOptimalSize() {
 			const auto &entry = transcribes->entry(_realParent);
 			const auto update = [=] { repaint(); };
 			voice->transcribe->setLoading(
-				entry.shown && (entry.requestId || entry.pending),
-				update);
+				entry.shown && (entry.requestId || entry.pending));
+			const auto pending = entry.pending;
+			auto descriptor = pending
+				? Lottie::IconDescriptor{
+					.name = u"transcribe_loading"_q,
+					.color = &st::attentionButtonFg, // Any contrast.
+					.sizeOverride = Size(st::historyTranscribeLoadingSize),
+					.colorizeUsingAlpha = true,
+				}
+				: Lottie::IconDescriptor();
 			auto text = (entry.requestId || !entry.shown)
 				? TextWithEntities()
 				: entry.toolong
-				? Ui::Text::Italic(tr::lng_audio_transcribe_long(tr::now))
+				? tr::italic(tr::lng_audio_transcribe_long(tr::now))
 				: entry.failed
-				? Ui::Text::Italic(tr::lng_attach_failed(tr::now))
-				: TextWithEntities{
-					entry.result + (entry.pending ? " [...]" : ""),
-				};
+				? tr::italic(tr::lng_attach_failed(tr::now))
+				: TextWithEntities{ entry.result }.append(
+					pending
+						? Ui::Text::LottieEmoji(descriptor)
+						: TextWithEntities());
 			voice->transcribe->setOpened(
 				!text.empty(),
 				creating ? Fn<void()>() : update);
@@ -458,7 +550,11 @@ QSize Document::countOptimalSize() {
 				voice->transcribeText = Ui::Text::String(minResizeWidth);
 				voice->transcribeText.setMarkedText(
 					st::messageTextStyle,
-					text);
+					text,
+					kMarkupTextOptions,
+					pending
+						? Ui::Text::LottieEmojiContext(std::move(descriptor))
+						: Ui::Text::MarkedContext());
 				hasTranscribe = true;
 				if (const auto skipBlockWidth = _parent->hasVisibleText()
 					? 0
@@ -474,11 +570,15 @@ QSize Document::countOptimalSize() {
 	auto thumbed = Get<HistoryDocumentThumbed>();
 	const auto &st = thumbed ? st::msgFileThumbLayout : st::msgFileLayout;
 	if (thumbed) {
-		const auto &location = _data->thumbnailLocation();
-		auto tw = style::ConvertScale(location.width());
-		auto th = style::ConvertScale(location.height());
-		if (tw > th) {
-			thumbed->thumbw = (tw * st.thumbSize) / th;
+		if (_data->hasThumbnail()) {
+			const auto &location = _data->thumbnailLocation();
+			auto tw = style::ConvertScale(location.width());
+			auto th = style::ConvertScale(location.height());
+			if (tw > th) {
+				thumbed->thumbw = (tw * st.thumbSize) / th;
+			} else {
+				thumbed->thumbw = st.thumbSize;
+			}
 		} else {
 			thumbed->thumbw = st.thumbSize;
 		}
@@ -501,9 +601,19 @@ QSize Document::countOptimalSize() {
 		accumulate_max(maxWidth, tleft + named->name.maxWidth() + tright);
 		accumulate_min(maxWidth, st::msgMaxWidth);
 	}
-	if (voice && voice->transcribe) {
-		maxWidth += st::historyTranscribeSkip
-			+ voice->transcribe->size().width();
+	if (voice) {
+		const auto maxWaveformWidth = ::Media::Player::kWaveformSamplesCount *
+			(st::msgWaveformBar + st::msgWaveformSkip);
+		const auto transcribeWidth = voice->transcribe
+			? (voice->transcribe->size().width() + st::historyTranscribeSkip)
+			: 0;
+		accumulate_max(
+			maxWidth,
+			maxWaveformWidth
+				+ rect::m::sum::h(st.padding)
+				+ st.thumbSize
+				+ st.thumbSkip
+				+ transcribeWidth);
 	}
 
 	auto minHeight = st.padding.top() + st.thumbSize + st.padding.bottom();
@@ -540,15 +650,29 @@ QSize Document::countCurrentSize(int newWidth) {
 	const auto hasTranscribe = voice && !voice->transcribeText.isEmpty();
 	const auto thumbed = Get<HistoryDocumentThumbed>();
 	const auto &st = thumbed ? st::msgFileThumbLayout : st::msgFileLayout;
+	const auto hostedInstantViewAudio = IsHostedInstantViewMedia(_parent)
+		&& (_data->isAudioFile() || _data->isVoiceMessage());
 	if (!captioned && !hasTranscribe) {
 		auto result = File::countCurrentSize(newWidth);
+		if (hostedInstantViewAudio) {
+			result.setWidth(std::max(newWidth, result.width()));
+		}
 		if (isBubbleBottom()) {
-			if (const auto link = thumbedLinkMaxWidth()) {
+			const auto thumbedWidth = thumbedLinkMaxWidth();
+			const auto statusWidth = thumbedWidth
+				? 0
+				: st::normalFont->width(_statusText);
+			if (thumbedWidth || statusWidth) {
 				const auto needed = st.padding.left()
-					+ st.thumbSize
-					+ st.thumbSkip
-					+ link
+					+ (thumbedWidth
+						? st.thumbSize + st.thumbSkip
+						: st::msgFileLayout.thumbSize
+							+ st::mediaUnreadSkip)
+					+ (thumbedWidth + statusWidth)
 					+ st.thumbSkip
+					+ (_realParent->isUnreadMedia()
+						? st::mediaUnreadSkip + st::mediaUnreadSize
+						: 0)
 					+ _parent->bottomInfoFirstLineWidth()
 					+ st.padding.right();
 				if (result.width() < needed) {
@@ -561,7 +685,9 @@ QSize Document::countCurrentSize(int newWidth) {
 		return result;
 	}
 
-	accumulate_min(newWidth, maxWidth());
+	if (!hostedInstantViewAudio) {
+		accumulate_min(newWidth, maxWidth());
+	}
 	auto newHeight = st.padding.top() + st.thumbSize + st.padding.bottom();
 	if (!isBubbleTop()) {
 		newHeight -= st::msgFileTopMinus;
@@ -601,7 +727,7 @@ void Document::draw(
 
 	const auto cornerDownload = downloadInCorner();
 
-	if (!_dataMedia->canBePlayed(_realParent)) {
+	if (!_dataMedia->canBePlayed()) {
 		_dataMedia->automaticLoad(_realParent->fullId(), _realParent);
 	}
 	bool loaded = dataLoaded(), displayLoading = _data->displayLoading();
@@ -693,6 +819,8 @@ void Document::draw(
 			&& _openl;
 		const auto ttlRect = hasTtlBadge ? TTLRectFromInner(inner) : QRect();
 
+		paintPlaybackBlobs(p, context, inner);
+
 		const auto coverDrawn = _data->isSongWithCover()
 			&& DrawThumbnailAsSongCover(
 				p,
@@ -737,8 +865,8 @@ void Document::draw(
 				return _data->isSongWithCover()
 					? sti->historyFileThumbPause
 					: stm->historyFilePause;
-			} else if (loaded || _dataMedia->canBePlayed(_realParent)) {
-				return _dataMedia->canBePlayed(_realParent)
+			} else if (loaded || _dataMedia->canBePlayed()) {
+				return _dataMedia->canBePlayed()
 					? (_data->isSongWithCover()
 						? sti->historyFileThumbPlay
 						: stm->historyFilePlay)
@@ -815,6 +943,35 @@ void Document::draw(
 				_iconCache);
 		}
 
+		if (_drawTtl) {
+			const auto voice = Get<HistoryDocumentVoice>();
+			const auto progress = (voice && voice->playback)
+				? voice->playback->progress.current()
+				: 0.;
+			if (voice && progress > 0.) {
+				if (!voice->once) {
+					voice->once
+						= std::make_unique<Ui::VoiceOnceParticles>();
+				}
+				const auto stepInside = style::ConvertScaleExact(1.5) * 2;
+				const auto arcRect = QRectF(inner - Margins(stepInside));
+				const auto center = arcRect.center();
+				const auto radius = arcRect.width() / 2.;
+				const auto degrees = 90. + 360. * (1. - progress);
+				const auto angle = degrees * M_PI / 180.;
+				const auto cosa = std::cos(angle);
+				const auto sina = std::sin(angle);
+				voice->once->radial.paint(
+					p,
+					QPointF(
+						center.x() + radius * cosa,
+						center.y() - radius * sina),
+					QPointF(-sina, -cosa),
+					stm->msgBg->c,
+					1.);
+			}
+		}
+
 		drawCornerDownload(p, context, mode);
 	}
 	auto namewidth = width - nameleft - nameright;
@@ -853,6 +1010,10 @@ void Document::draw(
 			voiceStatusOverride = Ui::FormatPlayedText(
 				base::SafeRound(progress * voice->lastDurationMs) / 1000,
 				voice->lastDurationMs / 1000);
+		} else if (_voiceHoverProgress >= 0 && voice->lastDurationMs > 0) {
+			voiceStatusOverride = Ui::FormatPlayedText(
+				base::SafeRound(_voiceHoverProgress * voice->lastDurationMs) / 1000,
+				voice->lastDurationMs / 1000);
 		}
 		if (voice->transcribe) {
 			const auto size = voice->transcribe->size();
@@ -869,12 +1030,17 @@ void Document::draw(
 		}
 		const auto inTTLViewer = _parent->delegate()->elementContext()
 			== Context::TTLViewer;
+		if (inTTLViewer && !voice->once) {
+			voice->once = std::make_unique<Ui::VoiceOnceParticles>();
+		}
 		PaintWaveform(p,
 			context,
 			_transcribedRound ? _data->round() : _data->voice(),
 			namewidth + st::msgWaveformSkip,
 			progress,
-			inTTLViewer);
+			inTTLViewer,
+			_voiceHoverProgress,
+			inTTLViewer ? &voice->once->waveform : nullptr);
 		p.restore();
 	} else if (const auto named = Get<HistoryDocumentNamed>()) {
 		p.setPen(stm->historyFileNameFg);
@@ -893,7 +1059,7 @@ void Document::draw(
 	p.setPen(stm->mediaFg);
 	p.drawTextLeft(nameleft, statustop, width, statusText);
 
-	if (_realParent->hasUnreadMediaFlag()) {
+	if (_realParent->isUnreadMedia()) {
 		auto w = st::normalFont->width(statusText);
 		if (w + st::mediaUnreadSkip + st::mediaUnreadSize <= statuswidth) {
 			p.setPen(Qt::NoPen);
@@ -917,13 +1083,16 @@ void Document::draw(
 	if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
 		p.setPen(stm->historyTextFg);
 		_parent->prepareCustomEmojiPaint(p, context, captioned->caption);
+
 		auto highlightRequest = context.computeHighlightCache();
 		captioned->caption.draw(p, {
 			.position = { st::msgPadding.left(), captiontop },
 			.availableWidth = captionw,
 			.palette = &stm->textPalette,
 			.pre = stm->preCache.get(),
-			.blockquote = context.quoteCache(parent()->contentColorIndex()),
+			.blockquote = context.quoteCache(
+				parent()->contentColorCollectible(),
+				parent()->contentColorIndex()),
 			.colors = context.st->highlightColors(),
 			.spoiler = Ui::Text::DefaultSpoilerCache(),
 			.now = context.now,
@@ -960,9 +1129,16 @@ void Document::validateThumbnail(
 		not_null<const HistoryDocumentThumbed*> thumbed,
 		int size,
 		Ui::BubbleRounding rounding) const {
-	const auto normal = _dataMedia->thumbnail();
+	const auto good = _data->isSvgImage()
+		? _dataMedia->goodThumbnail()
+		: nullptr;
+	const auto normal = good ? good : _dataMedia->thumbnail();
 	const auto blurred = _dataMedia->thumbnailInline();
 	if (!normal && !blurred) {
+		if (_data->isSvgImage()) {
+			_dataMedia->goodThumbnailWanted();
+			Data::DocumentMedia::CheckGoodThumbnail(_data);
+		}
 		return;
 	}
 	const auto outer = QSize(size, size);
@@ -1019,13 +1195,17 @@ void Document::ensureDataMediaCreated() const {
 		|| _transcribedRound) {
 		_dataMedia->thumbnailWanted(_realParent->fullId());
 	}
+	if (_data->isSvgImage()) {
+		_dataMedia->goodThumbnailWanted();
+		Data::DocumentMedia::CheckGoodThumbnail(_data);
+	}
 	history()->owner().registerHeavyViewPart(_parent);
 }
 
 bool Document::downloadInCorner() const {
 	return _data->isAudioFile()
 		&& _realParent->allowsForward()
-		&& _data->canBeStreamed(_realParent)
+		&& _data->canBeStreamed()
 		&& !_data->inappPlaybackFailed();
 }
 
@@ -1202,6 +1382,14 @@ TextState Document::textState(
 			const auto state = ::Media::Player::instance()->getState(AudioMsgId::Type::Voice);
 			if (state.id == AudioMsgId(_data, _realParent->fullId(), state.id.externalPlayId())
 				&& !::Media::Player::IsStoppedOrStopping(state.state)) {
+				const auto hover = std::clamp(
+					(point.x() - nameleft) / float64(namewidth),
+					0.,
+					1.);
+				if (_voiceHoverProgress != hover) {
+					_voiceHoverProgress = hover;
+					repaint();
+				}
 				if (!voice->seeking()) {
 					voice->setSeekingStart((point.x() - nameleft) / float64(namewidth));
 				}
@@ -1209,6 +1397,10 @@ TextState Document::textState(
 				return result;
 			}
 		}
+		if (_voiceHoverProgress >= 0) {
+			_voiceHoverProgress = -1;
+			repaint();
+		}
 		transcribeLength = voice->transcribeText.length();
 		if (transcribeLength > 0) {
 			auto captionw = width - st::msgPadding.left() - st::msgPadding.right();
@@ -1254,7 +1446,7 @@ TextState Document::textState(
 		&& (!_data->loading() || downloadInCorner())
 		&& !_data->uploading()
 		&& !_data->isNull()) {
-		if (loaded || _dataMedia->canBePlayed(_realParent)) {
+		if (loaded || _dataMedia->canBePlayed()) {
 			result.link = _openl;
 		} else {
 			result.link = _savel;
@@ -1530,35 +1722,51 @@ QMargins Document::bubbleMargins() const {
 }
 
 void Document::refreshCaption(bool last) {
-	const auto now = Get<HistoryDocumentCaptioned>();
-	auto caption = createCaption();
-	if (!caption.isEmpty()) {
-		if (now) {
-			return;
-		}
-		AddComponents(HistoryDocumentCaptioned::Bit());
-		auto captioned = Get<HistoryDocumentCaptioned>();
-		captioned->caption = std::move(caption);
+	const auto applySkipBlock = [&](Ui::Text::String &caption) {
 		const auto skip = last ? _parent->skipBlockWidth() : 0;
 		if (skip) {
-			captioned->caption.updateSkipBlock(
+			caption.updateSkipBlock(
 				_parent->skipBlockWidth(),
 				_parent->skipBlockHeight());
 		} else {
-			captioned->caption.removeSkipBlock();
+			caption.removeSkipBlock();
 		}
-	} else if (now) {
-		RemoveComponents(HistoryDocumentCaptioned::Bit());
+	};
+	if (const auto now = Get<HistoryDocumentCaptioned>()) {
+		applySkipBlock(now->caption);
+		return;
+	}
+	auto caption = createCaption();
+	if (caption.isEmpty()) {
+		return;
 	}
+	AddComponents(HistoryDocumentCaptioned::Bit());
+	const auto captioned = Get<HistoryDocumentCaptioned>();
+	captioned->caption = std::move(caption);
+	applySkipBlock(captioned->caption);
+}
+
+int Document::widenGroupingMaxWidth(int current, bool last) {
+	refreshCaption(last);
+	const auto captioned = Get<HistoryDocumentCaptioned>();
+	if (!captioned) {
+		return current;
+	}
+	const auto &caption = captioned->caption;
+	const auto padding = st::msgPadding.left() + st::msgPadding.right();
+	const auto proseFull = padding + caption.maxWidth();
+	const auto proseCapped = std::min(proseFull, int(st::msgMaxWidth));
+	const auto monospaceRaw = caption.countMaxMonospaceWidth();
+	const auto monospaceFull = monospaceRaw
+		? (padding + monospaceRaw)
+		: 0;
+	return std::max({ current, proseCapped, monospaceFull });
 }
 
 QSize Document::sizeForGroupingOptimal(int maxWidth, bool last) const {
 	const auto thumbed = Get<HistoryDocumentThumbed>();
 	const auto &st = (thumbed ? st::msgFileThumbLayoutGrouped : st::msgFileLayoutGrouped);
 	auto height = st.padding.top() + st.thumbSize + st.padding.bottom();
-
-	const_cast<Document*>(this)->refreshCaption(last);
-
 	if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
 		auto captionw = maxWidth
 			- st::msgPadding.left()
@@ -1592,7 +1800,16 @@ void Document::drawGrouped(
 		not_null<QPixmap*> cache) const {
 	const auto maybeMediaHighlight = context.highlightPathCache
 		&& context.highlightPathCache->isEmpty();
-	p.translate(geometry.topLeft());
+	const auto origin = geometry.topLeft();
+#if defined(Q_OS_WIN) && defined(_M_ARM64)
+	// Workaround MSVC ARM64 /O2 codegen bug: QPointF(QPoint(0, -3))
+	// produces yp == ~4.29e9 instead of -3.0 here. Touching the ints
+	// through a volatile load first forces correct sign-extension on
+	// the path that feeds QPointF's int->double conversion.
+	[[maybe_unused]] volatile auto touch = 0 + origin.x() + origin.y();
+#endif // defined(Q_OS_WIN) && defined(_M_ARM64)
+	const auto forigin = QPointF(origin);
+	p.translate(forigin);
 	draw(
 		p,
 		context.translated(-geometry.topLeft()),
@@ -1619,6 +1836,64 @@ TextState Document::getStateGrouped(
 		LayoutMode::Grouped);
 }
 
+void Document::paintPlaybackBlobs(
+		Painter &p,
+		const PaintContext &context,
+		QRect inner) const {
+	if (anim::Disabled() || _drawTtl) {
+		return;
+	}
+	const auto voice = Get<HistoryDocumentVoice>();
+	if (!voice || !voice->playback) {
+		return;
+	}
+	const auto voiceData = _transcribedRound
+		? _data->round()
+		: _data->voice();
+	if (!voiceData) {
+		return;
+	}
+	auto &playback = *voice->playback;
+	if (!playback.blobs) {
+		playback.blobs = std::make_unique<Ui::Paint::Blobs>(
+			VoicePlaybackBlobs(),
+			kVoiceBlobLevelDuration,
+			1.);
+	}
+
+	const auto &waveform = voiceData->waveform;
+	auto loudness = 0.;
+	if (!waveform.isEmpty() && waveform.at(0) >= 0) {
+		const auto count = int(waveform.size());
+		const auto progress = std::clamp(playback.progress.current(), 0., 1.);
+		const auto center = std::clamp(int(progress * count), 0, count - 1);
+		auto peak = 0;
+		for (auto i = center - 1; i <= center + 1; ++i) {
+			if (i >= 0 && i < count) {
+				peak = std::max(peak, int(waveform.at(i)));
+			}
+		}
+		const auto maxValue = std::max(1, int(voiceData->wavemax));
+		loudness = std::sqrt(std::clamp(peak / float64(maxValue), 0., 1.));
+	}
+	const auto level = kVoiceBlobIdleLevel
+		+ (1. - kVoiceBlobIdleLevel) * loudness;
+	playback.blobs->setLevel(level);
+
+	const auto now = context.now;
+	if (!playback.blobsLastUpdate) {
+		playback.blobsLastUpdate = now;
+	}
+	playback.blobs->updateLevel(now - playback.blobsLastUpdate);
+	playback.blobsLastUpdate = now;
+
+	p.save();
+	p.translate(QRectF(inner).center());
+	auto hq = PainterHighQualityEnabler(p);
+	playback.blobs->paint(p, QBrush(context.messageStyle()->msgFileBg->c));
+	p.restore();
+}
+
 bool Document::voiceProgressAnimationCallback(crl::time now) {
 	if (anim::Disabled()) {
 		now += (2 * kAudioVoiceMsgUpdateView);
@@ -1640,6 +1915,17 @@ bool Document::voiceProgressAnimationCallback(crl::time now) {
 	return false;
 }
 
+void Document::clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) {
+	if (!active && _voiceHoverProgress >= 0) {
+		if (const auto voice = Get<HistoryDocumentVoice>()) {
+			if (p == voice->seekl) {
+				_voiceHoverProgress = -1;
+				repaint();
+			}
+		}
+	}
+}
+
 void Document::clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) {
 	if (auto voice = Get<HistoryDocumentVoice>()) {
 		if (pressed && p == voice->seekl && !voice->seeking()) {
@@ -1670,6 +1956,11 @@ void Document::refreshParentId(not_null<HistoryItem*> realParent) {
 	if (auto thumbed = Get<HistoryDocumentThumbed>()) {
 		if (thumbed->linksavel) {
 			thumbed->linksavel->setMessageId(fullId);
+		}
+		if (thumbed->linkopenwithl) {
+			thumbed->linkopenwithl->setMessageId(fullId);
+		}
+		if (thumbed->linkcancell) {
 			thumbed->linkcancell->setMessageId(fullId);
 		}
 	}
@@ -1694,6 +1985,13 @@ Ui::Text::String Document::createCaption() const {
 	return File::createCaption(_realParent);
 }
 
+int Document::contributedMaxMonospaceWidth() const {
+	if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
+		return captioned->caption.countMaxMonospaceWidth();
+	}
+	return 0;
+}
+
 void Document::TooltipFilename::setElided(bool value) {
 	if (_elided != value) {
 		_elided = value;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.h b/Telegram/SourceFiles/history/view/media/history_view_document.h
index d47cf20456a0ef..05a998552c5a60 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.h
@@ -71,6 +71,8 @@ class Document final
 
 	QSize sizeForGroupingOptimal(int maxWidth, bool last) const override;
 	QSize sizeForGrouping(int width) const override;
+	int widenGroupingMaxWidth(int current, bool last) override;
+	int contributedMaxMonospaceWidth() const override;
 	void drawGrouped(
 		Painter &p,
 		const PaintContext &context,
@@ -88,6 +90,7 @@ class Document final
 
 	bool voiceProgressAnimationCallback(crl::time now);
 
+	void clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) override;
 	void clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) override;
 
 	void refreshParentId(not_null<HistoryItem*> realParent) override;
@@ -146,6 +149,10 @@ class Document final
 		Painter &p,
 		const PaintContext &context,
 		LayoutMode mode) const;
+	void paintPlaybackBlobs(
+		Painter &p,
+		const PaintContext &context,
+		QRect inner) const;
 	[[nodiscard]] TextState cornerDownloadTextState(
 		QPoint point,
 		StateRequest request,
@@ -175,6 +182,8 @@ class Document final
 
 	TtlPaintCallback _drawTtl;
 
+	mutable float64 _voiceHoverProgress = -1;
+
 	bool _transcribedRound = false;
 
 };
diff --git a/Telegram/SourceFiles/history/view/media/history_view_game.cpp b/Telegram/SourceFiles/history/view/media/history_view_game.cpp
index d8a92fdceae5ad..8ac406cd82f8f5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_game.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_game.cpp
@@ -38,10 +38,10 @@ Game::Game(
 , _title(st::msgMinWidth - _st.padding.left() - _st.padding.right())
 , _description(st::msgMinWidth - _st.padding.left() - _st.padding.right()) {
 	if (!consumed.text.isEmpty()) {
-		const auto context = Core::MarkedTextContext{
+		const auto context = Core::TextContext({
 			.session = &history()->session(),
-			.customEmojiRepaint = [=] { _parent->customEmojiRepaint(); },
-		};
+			.repaint = [=] { _parent->customEmojiRepaint(); },
+		});
 		_description.setMarkedText(
 			st::webPageDescriptionStyle,
 			consumed,
@@ -69,7 +69,10 @@ QSize Game::countOptimalSize() {
 
 	// init attach
 	if (!_attach) {
-		_attach = CreateAttach(_parent, _data->document, _data->photo);
+		_attach = CreateAttach(
+			_parent,
+			_data->document,
+			_data->document ? nullptr : _data->photo);
 	}
 
 	// init strings
@@ -121,10 +124,9 @@ QSize Game::countOptimalSize() {
 
 		_attach->initDimensions();
 		QMargins bubble(_attach->bubbleMargins());
-		auto maxMediaWidth = _attach->maxWidth() - bubble.left() - bubble.right();
-		if (isBubbleBottom() && _attach->customInfoLayout()) {
-			maxMediaWidth += skipBlockWidth;
-		}
+		const auto maxMediaWidth = _attach->maxWidth()
+			- bubble.left()
+			- bubble.right();
 		accumulate_max(maxWidth, maxMediaWidth);
 		minHeight += _attach->minHeight() - bubble.top() - bubble.bottom();
 	}
@@ -218,12 +220,19 @@ void Game::draw(Painter &p, const PaintContext &context) const {
 	auto inner = outer.marginsRemoved(innerMargin());
 	auto tshift = inner.top();
 	auto paintw = inner.width();
-
-	const auto colorIndex = parent()->contentColorIndex();
 	const auto selected = context.selected();
-	const auto cache = context.outbg
-		? stm->replyCache[st->colorPatternIndex(colorIndex)].get()
-		: st->coloredReplyCache(selected, colorIndex).get();
+	const auto colorIndex = parent()->contentColorIndex();
+	const auto &colorCollectible = parent()->contentColorCollectible();
+	const auto colorPattern = colorCollectible
+		? st->collectiblePatternIndex(colorCollectible)
+		: st->colorPatternIndex(colorIndex);
+	const auto useColorCollectible = colorCollectible && !context.outbg;
+	const auto useColorIndex = !context.outbg;
+	const auto cache = useColorCollectible
+		? st->collectibleReplyCache(selected, colorCollectible).get()
+		: useColorIndex
+		? st->coloredReplyCache(selected, colorIndex).get()
+		: stm->replyCache[colorPattern].get();
 	Ui::Text::ValidateQuotePaintCache(*cache, _st);
 	Ui::Text::FillQuotePaint(p, outer, *cache, _st);
 
@@ -237,9 +246,11 @@ void Game::draw(Painter &p, const PaintContext &context) const {
 	auto lineHeight = UnitedLineHeight();
 	if (_titleLines) {
 		p.setPen(cache->icon);
-		p.setTextPalette(context.outbg
-			? stm->semiboldPalette
-			: st->coloredTextPalette(selected, colorIndex));
+		p.setTextPalette(useColorCollectible
+			? st->collectibleTextPalette(selected, colorCollectible)
+			: useColorIndex
+			? st->coloredTextPalette(selected, colorIndex)
+			: stm->semiboldPalette);
 
 		auto endskip = 0;
 		if (_title.hasSkipBlock()) {
@@ -500,10 +511,10 @@ void Game::parentTextUpdated() {
 	if (const auto media = _parent->data()->media()) {
 		const auto consumed = media->consumedMessageText();
 		if (!consumed.text.isEmpty()) {
-			const auto context = Core::MarkedTextContext{
+			const auto context = Core::TextContext({
 				.session = &history()->session(),
-				.customEmojiRepaint = [=] { _parent->customEmojiRepaint(); },
-			};
+				.repaint = [=] { _parent->customEmojiRepaint(); },
+			});
 			_description.setMarkedText(
 				st::webPageDescriptionStyle,
 				consumed,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index f3de7fe3d8314f..00529180dc84b9 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -15,19 +15,21 @@ For license and copyright information please follow this link:
 #include "main/main_session_settings.h"
 #include "media/audio/media_audio.h"
 #include "media/clip/media_clip_reader.h"
+#include "media/media_common.h"
 #include "media/player/media_player_instance.h"
 #include "media/streaming/media_streaming_instance.h"
 #include "media/streaming/media_streaming_player.h"
 #include "media/streaming/media_streaming_utility.h"
+#include "media/view/media_view_open_common.h"
 #include "media/view/media_view_playback_progress.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "history/history_item_components.h"
-#include "history/history_item_helpers.h"
 #include "history/history_item.h"
 #include "history/history.h"
 #include "history/view/history_view_element.h"
+#include "history/view/history_view_message.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/history_view_reply.h"
 #include "history/view/history_view_transcribe_button.h"
@@ -36,6 +38,7 @@ For license and copyright information please follow this link:
 #include "history/view/media/history_view_media_spoiler.h"
 #include "window/window_session_controller.h"
 #include "core/application.h" // Application::showDocument.
+#include "core/core_settings.h"
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/chat/chat_style.h"
 #include "ui/image/image.h"
@@ -46,6 +49,8 @@ For license and copyright information please follow this link:
 #include "ui/ui_utility.h"
 #include "ui/effects/path_shift_gradient.h"
 #include "ui/effects/spoiler_mess.h"
+#include "data/data_photo.h"
+#include "data/data_photo_media.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_streaming.h"
@@ -53,9 +58,12 @@ For license and copyright information please follow this link:
 #include "data/data_file_click_handler.h"
 #include "data/data_file_origin.h"
 #include "data/data_document_media.h"
+#include "data/data_web_page.h"
+#include "storage/storage_account.h"
 #include "styles/style_chat.h"
 
 #include <QSvgRenderer>
+#include <QtWidgets/QApplication>
 
 namespace HistoryView {
 namespace {
@@ -63,6 +71,15 @@ namespace {
 constexpr auto kMaxGifForwardedBarLines = 4;
 constexpr auto kUseNonBlurredThreshold = 240;
 constexpr auto kMaxInlineArea = 1920 * 1080;
+constexpr auto kMaxInstantViewInlineArea = 1920 * 1920;
+constexpr auto kSeekAnimationDuration = crl::time(200);
+constexpr auto kSeekTrackOpacity = 0.2;
+
+using ::Media::ValidFrameSize;
+
+[[nodiscard]] bool IsHostedInstantViewMedia(not_null<const Element*> parent) {
+	return parent->Get<InstantViewMediaRuntime>() != nullptr;
+}
 
 [[nodiscard]] int GifMaxStatusWidth(not_null<DocumentData*> document) {
 	auto result = st::normalFont->width(
@@ -109,8 +126,10 @@ constexpr auto kMaxInlineArea = 1920 * 1080;
 
 struct Gif::Streamed {
 	Streamed(
+		not_null<DocumentData*> chosen,
 		std::shared_ptr<::Media::Streaming::Document> shared,
 		Fn<void()> waitingCallback);
+	const not_null<DocumentData*> chosen;
 	::Media::Streaming::Instance instance;
 	::Media::Streaming::FrameRequest frozenRequest;
 	QImage frozenFrame;
@@ -118,9 +137,11 @@ struct Gif::Streamed {
 };
 
 Gif::Streamed::Streamed(
+	not_null<DocumentData*> chosen,
 	std::shared_ptr<::Media::Streaming::Document> shared,
 	Fn<void()> waitingCallback)
-: instance(std::move(shared), std::move(waitingCallback)) {
+: chosen(chosen)
+, instance(std::move(shared), std::move(waitingCallback)) {
 }
 
 [[nodiscard]] bool IsHiddenRoundMessage(not_null<Element*> parent) {
@@ -136,6 +157,7 @@ Gif::Gif(
 	bool spoiler)
 : File(parent, realParent)
 , _data(document)
+, _videoCover(LookupVideoCover(document, realParent))
 , _storyId(realParent->media()
 	? realParent->media()->storyId()
 	: FullStoryId())
@@ -145,8 +167,11 @@ Gif::Gif(
 	? std::make_unique<MediaSpoiler>()
 	: nullptr)
 , _downloadSize(Ui::FormatSizeText(_data->size))
-, _sensitiveSpoiler(realParent->isMediaSensitive()) {
-	if (_data->isVideoMessage() && _parent->data()->media()->ttlSeconds()) {
+, _videoTimestamp(::Media::View::ExtractVideoTimestamp(realParent))
+, _sensitiveSpoiler(realParent->isMediaSensitive())
+, _hasVideoCover(realParent->media() && realParent->media()->videoCover()) {
+	const auto media = _parent->data()->media();
+	if (_data->isVideoMessage() && media && media->ttlSeconds()) {
 		if (_spoiler) {
 			_drawTtl = CreateTtlPaintCallback([=] { repaint(); });
 		}
@@ -156,14 +181,14 @@ Gif::Gif(
 		_parent->data()->removeFromSharedMediaIndex();
 		setDocumentLinks(_data, realParent, [=] {
 			auto lifetime = std::make_shared<rpl::lifetime>();
-			TTLVoiceStops(fullId) | rpl::start_with_next([=]() mutable {
+			TTLVoiceStops(fullId) | rpl::on_next([=]() mutable {
 				if (lifetime) {
 					base::take(lifetime)->destroy();
 				}
 				if (!isOut) {
 					if (const auto item = data->message(fullId)) {
 						// Destroys this.
-						ClearMediaAsExpired(item);
+						item->clearMediaAsExpired();
 					}
 				}
 			}, *lifetime);
@@ -172,10 +197,10 @@ Gif::Gif(
 		});
 	} else {
 		setDocumentLinks(_data, realParent, [=] {
-			if (!_data->createMediaView()->canBePlayed(realParent)
+			if (!_data->createMediaView()->canBePlayed()
 				|| !_data->isAnimation()
 				|| _data->isVideoMessage()
-				|| !CanPlayInline(_data)) {
+				|| !canPlayInline()) {
 				return false;
 			}
 			playAnimation(false);
@@ -185,12 +210,24 @@ Gif::Gif(
 
 	setStatusSize(Ui::FileStatusSizeReady);
 
+	if (_data->isVideoMessage() && (!media || !media->ttlSeconds())) {
+		_seekl = std::make_shared<VoiceSeekClickHandler>(
+			_data,
+			[](FullMsgId) {});
+	}
+
 	if (_spoiler) {
 		createSpoilerLink(_spoiler.get());
 	}
 
 	if ((_dataMedia = _data->activeMediaView())) {
 		dataMediaCreated();
+	} else if (_videoCover) {
+		if (_videoCover->inlineThumbnailBytes().isEmpty()
+			&& (_videoCover->hasExact(Data::PhotoSize::Small)
+				|| _videoCover->hasExact(Data::PhotoSize::Thumbnail))) {
+			_videoCover->load(Data::PhotoSize::Small, realParent->fullId());
+		}
 	} else {
 		_data->loadThumbnail(realParent->fullId());
 		if (!autoplayEnabled()) {
@@ -217,8 +254,17 @@ Gif::~Gif() {
 }
 
 bool Gif::CanPlayInline(not_null<DocumentData*> document) {
-	const auto dimensions = document->dimensions;
-	return dimensions.width() * dimensions.height() <= kMaxInlineArea;
+	return ValidFrameSize(document->dimensions, kMaxInlineArea);
+}
+
+int Gif::maxInlineArea() const {
+	return IsHostedInstantViewMedia(_parent)
+		? kMaxInstantViewInlineArea
+		: kMaxInlineArea;
+}
+
+bool Gif::canPlayInline() const {
+	return ValidFrameSize(_data->dimensions, maxInlineArea());
 }
 
 QSize Gif::sizeForAspectRatio() const {
@@ -229,19 +275,29 @@ QSize Gif::sizeForAspectRatio() const {
 	//}
 	if (_data->hasThumbnail()) {
 		const auto &location = _data->thumbnailLocation();
-		return { location.width(), location.height() };
+		return NonEmptySize({ location.width(), location.height() });
 	}
 	return { 1, 1 };
 }
 
 QSize Gif::countThumbSize(int &inOutWidthMax) const {
-	const auto maxSize = _data->isVideoFile()
-		? st::maxMediaSize
-		: _data->isVideoMessage()
-		? st::maxVideoMessageSize
-		: st::maxGifSize;
+	const auto hostedInstantView = IsHostedInstantViewMedia(_parent);
+	const auto maxSize = [&] {
+		if (hostedInstantView) {
+			return std::max(inOutWidthMax, 1);
+		} else if (_data->isVideoFile()) {
+			return st::maxMediaSize;
+		} else if (_data->isVideoMessage()) {
+			return st::maxVideoMessageSize;
+		}
+		return st::maxGifSize;
+	}();
 	const auto size = style::ConvertScale(videoSize());
-	accumulate_min(inOutWidthMax, maxSize);
+	if (hostedInstantView) {
+		inOutWidthMax = std::max(inOutWidthMax, 1);
+	} else {
+		accumulate_min(inOutWidthMax, maxSize);
+	}
 	return DownscaledSize(size, { inOutWidthMax, maxSize });
 }
 
@@ -250,16 +306,19 @@ QSize Gif::countOptimalSize() {
 		const auto &entry = _data->session().api().transcribes().entry(
 			_realParent);
 		_transcribe->setLoading(
-			entry.shown && (entry.requestId || entry.pending),
-			[=] { repaint(); });
+			entry.shown && (entry.requestId || entry.pending));
 	}
 
+	const auto hostedInstantView = IsHostedInstantViewMedia(_parent);
+	const auto maxMediaWidth = hostedInstantView
+		? std::max(st::msgMaxWidth, st::maxMediaSize)
+		: st::maxMediaSize;
 	const auto minWidth = std::clamp(
 		_parent->minWidthForMedia(),
 		(_parent->hasBubble()
 			? st::historyPhotoBubbleMinWidth
 			: st::minPhotoSize),
-		st::maxMediaSize);
+		maxMediaWidth);
 	auto thumbMaxWidth = st::msgMaxWidth;
 	const auto scaled = countThumbSize(thumbMaxWidth);
 	auto maxWidth = std::min(
@@ -294,13 +353,17 @@ QSize Gif::countOptimalSize() {
 QSize Gif::countCurrentSize(int newWidth) {
 	auto availableWidth = newWidth;
 
+	const auto hostedInstantView = IsHostedInstantViewMedia(_parent);
 	auto thumbMaxWidth = newWidth;
 	const auto scaled = countThumbSize(thumbMaxWidth);
-	const auto minWidthByInfo = _parent->infoWidth()
-		+ 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x());
+	const auto minWidthByInfo = hostedInstantView
+		? _parent->minWidthForMedia()
+		: (_parent->infoWidth()
+			+ 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
+	const auto minPhotoWidth = std::min(st::minPhotoSize, thumbMaxWidth);
 	newWidth = std::clamp(
 		std::max(scaled.width(), minWidthByInfo),
-		st::minPhotoSize,
+		minPhotoWidth,
 		thumbMaxWidth);
 	auto newHeight = qMax(scaled.height(), st::minPhotoSize);
 	if (!activeCurrentStreamed()) {
@@ -383,10 +446,18 @@ bool Gif::downloadInCorner() const {
 	return _data->isVideoFile()
 		&& (_data->loading() || !autoplayEnabled())
 		&& _realParent->allowsForward()
-		&& _data->canBeStreamed(_realParent)
+		&& _data->canBeStreamed()
 		&& !_data->inappPlaybackFailed();
 }
 
+bool Gif::autoplayUnderCursor() const {
+	return (_videoTimestamp || _hasVideoCover);
+}
+
+bool Gif::underCursor() const {
+	return ClickHandler::getActive() == currentVideoLink();
+}
+
 bool Gif::autoplayEnabled() const {
 	if (_realParent->isSponsored()) {
 		return true;
@@ -404,6 +475,8 @@ bool Gif::hideMessageText() const {
 void Gif::draw(Painter &p, const PaintContext &context) const {
 	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return;
 
+	_smallGroupPart = false;
+
 	ensureDataMediaCreated();
 	const auto item = _parent->data();
 	const auto loaded = dataLoaded();
@@ -411,10 +484,10 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 	const auto st = context.st;
 	const auto sti = context.imageStyle();
 	const auto cornerDownload = downloadInCorner();
-	const auto canBePlayed = _dataMedia->canBePlayed(_realParent);
+	const auto canBePlayed = _dataMedia->canBePlayed();
 	const auto autoplay = autoplayEnabled()
 		&& canBePlayed
-		&& CanPlayInline(_data);
+		&& canPlayInline();
 	const auto activeRoundPlaying = activeRoundStreamed();
 
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
@@ -422,8 +495,13 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 	const auto rightLayout = _parent->hasRightLayout();
 	const auto inWebPage = (_parent->media() != this);
 	const auto isRound = _data->isVideoMessage();
+	const auto hostedInstantView = IsHostedInstantViewMedia(_parent);
 
-	const auto rounding = inWebPage
+	const auto inWebPageWithoutOwnRounding = inWebPage
+		&& bubbleRounding() == Ui::BubbleRounding();
+	const auto rounding = hostedInstantView
+		? std::optional<Ui::BubbleRounding>(Ui::BubbleRounding())
+		: inWebPageWithoutOwnRounding
 		? std::optional<Ui::BubbleRounding>()
 		: adjustedBubbleRounding();
 
@@ -449,6 +527,7 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 	const auto inTTLViewer = _parent->delegate()->elementContext()
 		== Context::TTLViewer;
 	const auto revealed = (isRound
+			&& item->media()
 			&& item->media()->ttlSeconds()
 			&& !inTTLViewer)
 		? 0
@@ -460,11 +539,14 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 		validateSpoilerImageCache(rthumb.size(), rounding);
 	}
 
-	const auto startPlay = autoplay
+	const auto canStartPlay = autoplay
 		&& !_streamed
 		&& !activeRoundPlaying
 		&& !fullHiddenBySpoiler;
-	if (startPlay) {
+	const auto shouldBePlaying = !autoplayUnderCursor() || underCursor();
+	if (!shouldBePlaying && _videoTimestamp != 0) {
+		const_cast<Gif*>(this)->stopAnimation();
+	} else if (canStartPlay) {
 		const_cast<Gif*>(this)->playAnimation(true);
 	} else {
 		checkStreamedIsStarted();
@@ -498,15 +580,19 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 	const auto radial = isRadialAnimation()
 		|| (streamedForWaiting && streamedForWaiting->waitingShown());
 
-	if (!bubble && !unwrapped) {
+	if (!bubble && !unwrapped && !hostedInstantView) {
 		Assert(rounding.has_value());
 		fillImageShadow(p, rthumb, *rounding, context);
 	}
 
 	const auto skipDrawingContent = context.skipDrawingParts
 		== PaintContext::SkipDrawingParts::Content;
-	if (streamed && !skipDrawingContent && !fullHiddenBySpoiler) {
-		auto paused = context.paused;
+	const auto drawStreamed = streamed && (shouldBePlaying || !_videoCover);
+	if (drawStreamed && !skipDrawingContent && !fullHiddenBySpoiler) {
+		if (!_seekLastFrame.isNull()) {
+			_seekLastFrame = QImage();
+		}
+		auto paused = context.paused || !shouldBePlaying;
 		auto request = ::Media::Streaming::FrameRequest{
 			.outer = QSize(usew, painth) * style::DevicePixelRatio(),
 			.blurredBackground = true,
@@ -541,39 +627,28 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 
 			const auto frame = streamed->frameWithInfo(request);
 			p.drawImage(rthumb, frame.image);
+			if (_seeking) {
+				_seekLastFrame = frame.image;
+			}
 			if (!paused) {
 				streamed->markFrameShown();
 			}
 		}
-
-		if (const auto playback = videoPlayback()) {
-			const auto value = playback->value();
-			if (value > 0.) {
-				auto pen = st->historyVideoMessageProgressFg()->p;
-				const auto was = p.pen();
-				pen.setWidth(st::radialLine);
-				pen.setCapStyle(Qt::RoundCap);
-				p.setPen(pen);
-				p.setOpacity(st::historyVideoMessageProgressOpacity);
-
-				const auto from = arc::kQuarterLength;
-				const auto len = std::round(arc::kFullLength
-					* (inTTLViewer ? (1. - value) : -value));
-				const auto stepInside = st::radialLine / 2;
-				{
-					auto hq = PainterHighQualityEnabler(p);
-					p.drawArc(rthumb - Margins(stepInside), from, len);
-				}
-
-				p.setPen(was);
-				p.setOpacity(1.);
-			}
-		}
+	} else if (!_seekLastFrame.isNull()
+			&& !skipDrawingContent
+			&& !fullHiddenBySpoiler) {
+		p.drawImage(rthumb, _seekLastFrame);
 	} else if (!skipDrawingContent && !fullHiddenBySpoiler) {
 		ensureDataMediaCreated();
 		validateThumbCache({ usew, painth }, isRound, rounding);
 		p.drawImage(rthumb, _thumbCache);
 	}
+	if (isRound) {
+		paintRoundPlaybackProgress(p, context, rthumb, inTTLViewer);
+	}
+	if (!isRound) {
+		paintTimestampMark(p, rthumb, rounding);
+	}
 
 	if (revealed < 1.) {
 		p.setOpacity(1. - revealed);
@@ -700,7 +775,11 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 	} else if (!skipDrawingSurrounding) {
 		if (isRound) {
 			const auto mediaUnread = item->hasUnreadMediaFlag();
-			auto statusW = st::normalFont->width(_statusText) + 2 * st::msgDateImgPadding.x();
+			const auto statusText = _seeking
+				? Ui::FormatDurationText(1 + int64(base::SafeRound(
+					(1. - _seekingCurrent) * _data->duration() / 1000.)))
+				: _statusText;
+			auto statusW = st::normalFont->width(statusText) + 2 * st::msgDateImgPadding.x();
 			auto statusH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
 			auto statusX = usex + paintx + st::msgDateImgDelta + st::msgDateImgPadding.x();
 			auto statusY = painty + painth - st::msgDateImgDelta - statusH + st::msgDateImgPadding.y();
@@ -710,7 +789,7 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 			Ui::FillRoundRect(p, style::rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, width()), sti->msgServiceBg, sti->msgServiceBgCornersSmall);
 			p.setFont(st::normalFont);
 			p.setPen(st->msgServiceFg());
-			p.drawTextLeft(statusX, statusY, width(), _statusText, statusW - 2 * st::msgDateImgPadding.x());
+			p.drawTextLeft(statusX, statusY, width(), statusText, statusW - 2 * st::msgDateImgPadding.x());
 			if (mediaUnread) {
 				p.setPen(Qt::NoPen);
 				p.setBrush(st->msgServiceFg());
@@ -801,7 +880,7 @@ void Gif::draw(Painter &p, const PaintContext &context) const {
 				p,
 				context,
 				fullRight,
-				fullBottom,
+				fullBottom - st::msgDateImgDelta,
 				2 * paintx + paintw,
 				(unwrapped
 					? InfoDisplayType::Background
@@ -859,6 +938,126 @@ void Gif::paintTranscribe(
 		context);
 }
 
+void Gif::paintTimestampMark(
+		Painter &p,
+		QRect rthumb,
+		std::optional<Ui::BubbleRounding> rounding) const {
+	if (_videoTimestamp <= 0 && _videoPosition < crl::time(200)) {
+		return;
+	}
+	const auto convert = [](Ui::BubbleCornerRounding rounding) {
+		return (rounding == Ui::BubbleCornerRounding::Small)
+			? Ui::BubbleRadiusSmall()
+			: (rounding == Ui::BubbleCornerRounding::Large)
+			? Ui::BubbleRadiusLarge()
+			: 0;
+	};
+	const auto radiusl = rounding
+		? convert(rounding->bottomLeft)
+		: st::roundRadiusSmall;
+	const auto radiusr = rounding
+		? convert(rounding->bottomRight)
+		: st::roundRadiusSmall;
+	const auto line = st::historyVideoTimestampProgressLine;
+	const auto duration = _data->duration();
+	const auto position = (_videoPosition > 0)
+		? _videoPosition
+		: (_videoTimestamp * crl::time(1000));
+	if (rthumb.height() <= line
+		|| rthumb.width() <= radiusl + radiusr
+		|| position > duration) {
+		return;
+	}
+	auto hq = PainterHighQualityEnabler(p);
+	const auto used = rthumb.width() - radiusl - radiusr;
+	const auto progress = position / float64(duration);
+	const auto edge = radiusl + int(base::SafeRound(used * progress));
+	const auto top = rthumb.y() + rthumb.height() - line;
+	p.save();
+	p.setPen(Qt::NoPen);
+	if (edge > 0) {
+		p.setBrush(st::windowBgActive);
+
+		p.setClipRect(rthumb.x(), top, edge, line);
+		p.drawRoundedRect(
+			rthumb.x(),
+			top - 2 * radiusl,
+			edge + radiusl,
+			line + 2 * radiusl,
+			radiusl,
+			radiusl);
+	}
+	if (const auto width = rthumb.width() - edge; width > 0) {
+		const auto left = rthumb.x() + edge;
+		p.setBrush(st::mediaviewPlaybackProgressFg);
+		p.setClipRect(left, top, width, line);
+		p.drawRoundedRect(
+			left - radiusr,
+			top - 2 * radiusr,
+			width + radiusr,
+			line + 2 * radiusr,
+			radiusr,
+			radiusr);
+	}
+	p.restore();
+}
+
+void Gif::paintRoundPlaybackProgress(
+		Painter &p,
+		const PaintContext &context,
+		QRect rthumb,
+		bool inTTLViewer) const {
+	const auto st = context.st;
+	const auto playback = videoPlayback();
+	const auto seekAmount = _seekAnimation.value(_seeking ? 1. : 0.);
+	const auto value = _seeking
+		? _seekingCurrent
+		: playback
+		? playback->value()
+		: (seekAmount > 0.)
+		? _seekingCurrent
+		: 0.;
+	if (value <= 0. && seekAmount <= 0.) {
+		return;
+	}
+	auto pen = st->historyVideoMessageProgressFg()->p;
+	const auto was = p.pen();
+	pen.setWidth(st::radialLine);
+	pen.setCapStyle(Qt::RoundCap);
+	p.setPen(pen);
+
+	const auto from = arc::kQuarterLength;
+	const auto normalInset = 1.5 * st::radialLine;
+	const auto seekInset = st::historyVideoMessageSeekInset;
+	const auto stepInside = normalInset
+		+ (seekInset - normalInset) * seekAmount;
+	const auto arcRect = QRectF(rthumb) - Margins(stepInside);
+	auto hq = PainterHighQualityEnabler(p);
+	if (seekAmount > 0.) {
+		p.setOpacity(kSeekTrackOpacity * seekAmount);
+		p.drawArc(arcRect, 0, arc::kFullLength);
+	}
+	p.setOpacity(st::historyVideoMessageProgressOpacity);
+	const auto len = std::round(arc::kFullLength
+		* (inTTLViewer ? (1. - value) : -value));
+	p.drawArc(arcRect, from, len);
+	if (seekAmount > 0.) {
+		const auto dotSize = float64(st::historyVideoMessageSeekDotSize);
+		const auto angle = M_PI / 2. - value * 2. * M_PI;
+		const auto radius = arcRect.width() / 2.;
+		const auto center = arcRect.center();
+		const auto cx = center.x() + radius * cos(angle);
+		const auto cy = center.y() - radius * sin(angle);
+		p.setOpacity(seekAmount);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st->historyVideoMessageProgressFg());
+		p.drawEllipse(QPointF(cx, cy), dotSize / 2., dotSize / 2.);
+	}
+	p.setBrush(Qt::NoBrush);
+	p.setPen(was);
+	p.setOpacity(1.);
+}
+
 void Gif::drawSpoilerTag(
 		Painter &p,
 		QRect rthumb,
@@ -882,6 +1081,8 @@ QImage Gif::spoilerTagBackground() const {
 }
 
 void Gif::validateVideoThumbnail() const {
+	Expects(!_videoCover);
+
 	const auto content = _dataMedia->videoThumbnailContent();
 	if (_videoThumbnailFrame || content.isEmpty()) {
 		return;
@@ -897,13 +1098,25 @@ void Gif::validateThumbCache(
 		QSize outer,
 		bool isEllipse,
 		std::optional<Ui::BubbleRounding> rounding) const {
-	const auto good = _dataMedia->goodThumbnail();
-	const auto normal = good ? good : _dataMedia->thumbnail();
+	const auto good = _videoCoverMedia
+		? _videoCoverMedia->image(Data::PhotoSize::Large)
+		: _dataMedia->goodThumbnail();
+	const auto normal = good
+		? good
+		: _videoCoverMedia
+		? nullptr
+		: _dataMedia->thumbnail();
 	if (!normal) {
-		_data->loadThumbnail(_realParent->fullId());
-		validateVideoThumbnail();
+		if (_videoCoverMedia) {
+			_videoCover->load(Data::PhotoSize::Small, _realParent->fullId());
+		} else {
+			_data->loadThumbnail(_realParent->fullId());
+			validateVideoThumbnail();
+		}
 	}
-	const auto videothumb = normal ? nullptr : _videoThumbnailFrame.get();
+	const auto videothumb = (normal || _videoCoverMedia)
+		? nullptr
+		: _videoThumbnailFrame.get();
 	const auto blurred = normal
 		? (!good
 			&& (normal->width() < kUseNonBlurredThreshold)
@@ -925,9 +1138,17 @@ void Gif::validateThumbCache(
 }
 
 QImage Gif::prepareThumbCache(QSize outer) const {
-	const auto good = _dataMedia->goodThumbnail();
-	const auto normal = good ? good : _dataMedia->thumbnail();
-	const auto videothumb = normal ? nullptr : _videoThumbnailFrame.get();
+	const auto good = _videoCoverMedia
+		? _videoCoverMedia->image(Data::PhotoSize::Large)
+		: _dataMedia->goodThumbnail();
+	const auto normal = good
+		? good
+		: _videoCoverMedia
+		? nullptr
+		: _dataMedia->thumbnail();
+	const auto videothumb = (normal || _videoCoverMedia)
+		? nullptr
+		: _videoThumbnailFrame.get();
 	auto blurred = (!good
 		&& normal
 		&& (normal->width() < kUseNonBlurredThreshold)
@@ -937,6 +1158,10 @@ QImage Gif::prepareThumbCache(QSize outer) const {
 	const auto blurFromLarge = good || (normal && !blurred);
 	const auto large = blurFromLarge ? normal : videothumb;
 	if (videothumb) {
+	} else if (_videoCoverMedia) {
+		if (const auto embedded = _videoCoverMedia->thumbnailInline()) {
+			blurred = embedded;
+		}
 	} else if (const auto embedded = _dataMedia->thumbnailInline()) {
 		blurred = embedded;
 	}
@@ -962,7 +1187,9 @@ void Gif::validateSpoilerImageCache(
 		&& _spoiler->backgroundRounding == rounding) {
 		return;
 	}
-	const auto normal = _dataMedia->thumbnail();
+	const auto normal = _videoCoverMedia
+		? _videoCoverMedia->image(Data::PhotoSize::Small)
+		: _dataMedia->thumbnail();
 	auto container = std::optional<Image>();
 	const auto downscale = [&](Image *image) {
 		if (!image || (image->width() <= 40 && image->height() <= 40)) {
@@ -974,7 +1201,9 @@ void Gif::validateSpoilerImageCache(
 			Qt::SmoothTransformation));
 		return &*container;
 	};
-	const auto embedded = _dataMedia->thumbnailInline();
+	const auto embedded = _videoCoverMedia
+		? _videoCoverMedia->thumbnailInline()
+		: _dataMedia->thumbnailInline();
 	const auto blurred = embedded ? embedded : downscale(normal);
 	_spoiler->background = Images::Round(
 		PrepareWithBlurredBackground(
@@ -1159,21 +1388,18 @@ TextState Gif::textState(QPoint point, StateRequest request) const {
 	}
 	if (QRect(usex + paintx, painty, usew, painth).contains(point)) {
 		ensureDataMediaCreated();
-		result.link = (_spoiler && !_spoiler->revealed)
-			? (_sensitiveSpoiler
+		if (_spoiler && !_spoiler->revealed) {
+			const auto media = _parent->data()->media();
+			result.link = _sensitiveSpoiler
 				? spoilerTagLink()
-				: (isRound && _parent->data()->media()->ttlSeconds())
-				? _openl // Overriden.
-				: _spoiler->link)
-			: _data->uploading()
-			? _cancell
-			: _realParent->isSending()
-			? nullptr
-			: (dataLoaded() || _dataMedia->canBePlayed(_realParent))
-			? _openl
-			: _data->loading()
-			? _cancell
-			: _savel;
+				: (isRound && media && media->ttlSeconds())
+				? _openl
+				: _spoiler->link;
+		} else if (_seekl && isRoundSeekable()) {
+			result.link = _seekl;
+		} else {
+			result.link = currentVideoLink();
+		}
 	}
 	const auto checkBottomInfo = !inWebPage
 		&& (unwrapped || !bubble || isBubbleBottom());
@@ -1240,6 +1466,32 @@ TextState Gif::textState(QPoint point, StateRequest request) const {
 void Gif::clickHandlerPressedChanged(
 		const ClickHandlerPtr &handler,
 		bool pressed) {
+	if (_seekl && handler == _seekl) {
+		if (pressed && !_seeking) {
+			_seekPressPoint = QPoint(-1, -1);
+			if (const auto playback = videoPlayback()) {
+				_seekingCurrent = playback->value();
+			}
+		} else if (!pressed) {
+			if (_seeking) {
+				if (isRoundSeekable()) {
+					::Media::Player::instance()->finishSeeking(
+						AudioMsgId::Type::Voice,
+						_seekingCurrent);
+				}
+				_seeking = false;
+				_seekAnimation.start(
+					[=] { repaint(); },
+					1.,
+					0.,
+					kSeekAnimationDuration);
+			} else if (_seekPressPoint != QPoint()) {
+				_seekPressPoint = QPoint();
+				::Media::Player::instance()->playPauseCancelClicked(
+					AudioMsgId::Type::Voice);
+			}
+		}
+	}
 	File::clickHandlerPressedChanged(handler, pressed);
 	if (!handler) {
 		return;
@@ -1252,6 +1504,61 @@ void Gif::clickHandlerPressedChanged(
 	}
 }
 
+void Gif::updatePressed(QPoint point) {
+	if (!_seeking && _seekPressPoint == QPoint()) {
+		return;
+	}
+	const auto item = _parent->data();
+	auto paintx = 0, painty = 0, paintw = width(), painth = height();
+	const auto unwrapped = isUnwrapped();
+	auto usew = paintw, usex = 0;
+	const auto via = unwrapped ? item->Get<HistoryMessageVia>() : nullptr;
+	const auto reply = unwrapped ? _parent->Get<Reply>() : nullptr;
+	const auto forwarded = unwrapped
+		? item->Get<HistoryMessageForwarded>()
+		: nullptr;
+	if (via || reply || forwarded) {
+		usew = maxWidth() - additionalWidth(reply, via, forwarded);
+		if (unwrapped && _parent->hasRightLayout()) {
+			usex = width() - usew;
+		}
+	}
+	accumulate_min(usew, painth);
+	if (rtl()) usex = width() - usex - usew;
+	const auto rthumb = QRect(
+		style::rtlrect(usex + paintx, painty, usew, painth, width()));
+
+	if (!_seeking) {
+		if (_seekPressPoint == QPoint(-1, -1)) {
+			_seekPressPoint = point;
+			return;
+		}
+		if ((point - _seekPressPoint).manhattanLength()
+				<= QApplication::startDragDistance()) {
+			return;
+		}
+		_seeking = true;
+		_seekPressPoint = QPoint();
+		::Media::Player::instance()->startSeeking(
+			AudioMsgId::Type::Voice);
+		_seekAnimation.start(
+			[=] { repaint(); },
+			0.,
+			1.,
+			kSeekAnimationDuration);
+	}
+
+	const auto center = rthumb.center();
+	const auto dx = float64(point.x() - center.x());
+	const auto dy = float64(point.y() - center.y());
+	const auto angle = atan2(-dy, dx);
+	_seekingCurrent = std::clamp(
+		fmod((M_PI / 2. - angle) / (2. * M_PI) + 1., 1.),
+		0.,
+		1.);
+	repaint();
+}
+
 bool Gif::fullFeaturedGrouped(RectParts sides) const {
 	return (sides & RectPart::Left) && (sides & RectPart::Right);
 }
@@ -1281,9 +1588,9 @@ void Gif::drawGrouped(
 		|| _data->displayLoading();
 	const auto st = context.st;
 	const auto sti = context.imageStyle();
-	const auto fullFeatured = fullFeaturedGrouped(sides);
-	const auto cornerDownload = fullFeatured && downloadInCorner();
-	const auto canBePlayed = _dataMedia->canBePlayed(_realParent);
+	_smallGroupPart = !fullFeaturedGrouped(sides);
+	const auto cornerDownload = !_smallGroupPart && downloadInCorner();
+	const auto canBePlayed = _dataMedia->canBePlayed();
 
 	const auto revealed = _spoiler
 		? _spoiler->revealAnimation.value(_spoiler->revealed ? 1. : 0.)
@@ -1293,16 +1600,22 @@ void Gif::drawGrouped(
 		validateSpoilerImageCache(geometry.size(), rounding);
 	}
 
-	const auto autoplay = fullFeatured
+	const auto autoplay = !_smallGroupPart
 		&& autoplayEnabled()
 		&& canBePlayed
-		&& CanPlayInline(_data);
-	const auto startPlay = autoplay && !_streamed;
-	if (startPlay) {
+		&& canPlayInline();
+	const auto canStartPlay = autoplay
+		&& !_streamed
+		&& !fullHiddenBySpoiler;
+	const auto shouldBePlaying = !autoplayUnderCursor() || underCursor();
+	if (!shouldBePlaying && _videoTimestamp != 0) {
+		const_cast<Gif*>(this)->stopAnimation();
+	} else if (canStartPlay) {
 		const_cast<Gif*>(this)->playAnimation(true);
 	} else {
 		checkStreamedIsStarted();
 	}
+
 	const auto streamingMode = _streamed || autoplay;
 	const auto activeOwnPlaying = activeOwnStreamed();
 
@@ -1355,7 +1668,9 @@ void Gif::drawGrouped(
 				activeOwnPlaying->frozenStatusText = QString();
 			}
 			p.drawImage(geometry, streamed->frame(request));
-			if (!context.paused) {
+			const auto paused = context.paused
+				|| (autoplayUnderCursor() && !underCursor());
+			if (!paused) {
 				streamed->markFrameShown();
 			}
 		}
@@ -1470,7 +1785,7 @@ void Gif::drawGrouped(
 		}
 		p.setOpacity(1.);
 	}
-	if (fullFeatured) {
+	if (!_smallGroupPart) {
 		drawCornerStatus(p, context, geometry.topLeft());
 	}
 }
@@ -1483,41 +1798,63 @@ TextState Gif::getStateGrouped(
 	if (!geometry.contains(point)) {
 		return {};
 	}
-	if (fullFeaturedGrouped(sides)) {
-		if (const auto state = cornerStatusTextState(point, request, geometry.topLeft()); state.link) {
+	if (!_smallGroupPart) {
+		const auto state = cornerStatusTextState(
+			point,
+			request,
+			geometry.topLeft());
+		if (state.link) {
 			return state;
 		}
 	}
 	ensureDataMediaCreated();
+
 	auto link = (_spoiler && !_spoiler->revealed)
 		? (_sensitiveSpoiler ? spoilerTagLink() : _spoiler->link)
-		: _data->uploading()
+		: currentVideoLink();
+	return TextState(_parent, std::move(link));
+}
+
+ClickHandlerPtr Gif::currentVideoLink() const {
+	return _data->uploading()
 		? _cancell
 		: _realParent->isSending()
 		? nullptr
-		: (dataLoaded() || _dataMedia->canBePlayed(_realParent))
+		: dataLoaded()
+		? _openl
+		: (_data->loading() && _smallGroupPart)
+		? _cancell
+		: _dataMedia->canBePlayed()
 		? _openl
 		: _data->loading()
 		? _cancell
 		: _savel;
-	return TextState(_parent, std::move(link));
 }
 
 void Gif::ensureDataMediaCreated() const {
-	if (_dataMedia) {
+	if (_dataMedia && (!_videoCover || _videoCoverMedia)) {
 		return;
 	}
 	_dataMedia = _data->createMediaView();
+	_videoCoverMedia = _videoCover
+		? _videoCover->createMediaView()
+		: nullptr;
 	dataMediaCreated();
 }
 
 void Gif::dataMediaCreated() const {
 	Expects(_dataMedia != nullptr);
 
-	_dataMedia->goodThumbnailWanted();
-	_dataMedia->thumbnailWanted(_realParent->fullId());
-	if (!autoplayEnabled()) {
-		_dataMedia->videoThumbnailWanted(_realParent->fullId());
+	if (_videoCoverMedia) {
+		_videoCoverMedia->wanted(
+			Data::PhotoSize::Large,
+			_realParent->fullId());
+	} else {
+		_dataMedia->goodThumbnailWanted();
+		_dataMedia->thumbnailWanted(_realParent->fullId());
+		if (!autoplayEnabled()) {
+			_dataMedia->videoThumbnailWanted(_realParent->fullId());
+		}
 	}
 	history()->owner().registerHeavyViewPart(_parent);
 	togglePollingStory(true);
@@ -1654,12 +1991,18 @@ void Gif::validateGroupedCache(
 
 	ensureDataMediaCreated();
 
-	const auto good = _dataMedia->goodThumbnail();
-	const auto thumb = _dataMedia->thumbnail();
+	const auto good = _videoCoverMedia
+		? _videoCoverMedia->image(Data::PhotoSize::Large)
+		: _dataMedia->goodThumbnail();
+	const auto thumb = _videoCoverMedia
+		? nullptr
+		: _dataMedia->thumbnail();
 	const auto image = good
 		? good
 		: thumb
 		? thumb
+		: _videoCoverMedia
+		? _videoCoverMedia->thumbnailInline()
 		: _dataMedia->thumbnailInline();
 	const auto blur = !good
 		&& (!thumb
@@ -1723,14 +2066,15 @@ void Gif::updateStatusText() const {
 		statusSize = _data->uploadingData->offset;
 	} else if (!downloadInCorner() && _data->loading()) {
 		statusSize = _data->loadOffset();
-	} else if (dataLoaded() || _dataMedia->canBePlayed(_realParent)) {
+	} else if (dataLoaded() || _dataMedia->canBePlayed()) {
 		statusSize = Ui::FileStatusSizeLoaded;
 	} else {
 		statusSize = Ui::FileStatusSizeReady;
 	}
 	const auto round = activeRoundStreamed();
 	const auto own = activeOwnStreamed();
-	if (round || (own && own->frozenFrame.isNull() && _data->isVideoFile())) {
+	if (round || (own && _data->isVideoFile())) {
+		const auto frozen = own && !own->frozenFrame.isNull();
 		const auto streamed = round ? round : &own->instance;
 		const auto state = streamed->player().prepareLegacyState();
 		if (state.length) {
@@ -1740,9 +2084,17 @@ void Gif::updateStatusText() const {
 			} else if (!::Media::Player::IsStoppedOrStopping(state.state)) {
 				position = state.position;
 			}
-			statusSize = -1 - int((state.length - position) / state.frequency + 1);
+			if (!frozen) {
+				statusSize = -1 - int((state.length - position) / state.frequency + 1);
+			}
+			_videoPosition = std::max(
+				crl::time(position * crl::time(1000) / state.frequency),
+				crl::time(1));
 		} else {
-			statusSize = -1 - (_data->duration() / 1000);
+			if (!frozen) {
+				statusSize = -1 - (_data->duration() / 1000);
+			}
+			_videoPosition = 0;
 		}
 	}
 	if (statusSize != _statusSize) {
@@ -1774,6 +2126,7 @@ void Gif::unloadHeavyPart() {
 		_spoiler->animation = nullptr;
 	}
 	_thumbCache = QImage();
+	_seekLastFrame = QImage();
 	_videoThumbnailFrame = nullptr;
 	togglePollingStory(false);
 }
@@ -1802,6 +2155,19 @@ ::Media::Streaming::Instance *Gif::activeRoundStreamed() const {
 	return ::Media::Player::instance()->roundVideoStreamed(_parent->data());
 }
 
+bool Gif::isRoundSeekable() const {
+	if (!activeRoundStreamed()) {
+		return false;
+	}
+	const auto state = ::Media::Player::instance()->getState(
+		AudioMsgId::Type::Voice);
+	return (state.id == AudioMsgId(
+			_data,
+			_realParent->fullId(),
+			state.id.externalPlayId()))
+		&& !::Media::Player::IsStoppedOrStopping(state.state);
+}
+
 Gif::Streamed *Gif::activeOwnStreamed() const {
 	return (_streamed
 		&& _streamed->instance.player().ready()
@@ -1839,7 +2205,7 @@ void Gif::playAnimation(bool autoplay) {
 	}
 	if (_streamed) {
 		stopAnimation();
-	} else if (_dataMedia->canBePlayed(_realParent)) {
+	} else if (_dataMedia->canBePlayed()) {
 		if (!autoplayEnabled()) {
 			history()->owner().checkPlayingAnimations();
 		}
@@ -1848,23 +2214,49 @@ void Gif::playAnimation(bool autoplay) {
 }
 
 void Gif::createStreamedPlayer() {
+	const auto quality = _data->initialPlaybackVideoQuality(
+		Core::App().settings().videoQuality());
+	const auto chosen = _data->chooseQuality(_realParent, quality);
+	if (_streamed && _streamed->chosen == chosen) {
+		return;
+	}
 	auto shared = _data->owner().streaming().sharedDocument(
+		chosen,
 		_data,
+		_realParent,
 		_realParent->fullId());
 	if (!shared) {
 		return;
 	}
 	setStreamed(std::make_unique<Streamed>(
+		chosen,
 		std::move(shared),
 		[=] { repaintStreamedContent(); }));
 
 	_streamed->instance.player().updates(
-	) | rpl::start_with_next_error([=](::Media::Streaming::Update &&update) {
+	) | rpl::on_next_error([=](::Media::Streaming::Update &&update) {
 		handleStreamingUpdate(std::move(update));
 	}, [=](::Media::Streaming::Error &&error) {
 		handleStreamingError(std::move(error));
 	}, _streamed->instance.lifetime());
 
+	_streamed->instance.switchQualityRequests(
+	) | rpl::on_next([=](int requested) {
+		if (quality.manual) {
+			return;
+		}
+		auto now = Core::App().settings().videoQuality();
+		if (now.manual || now.height == requested) {
+			return;
+		}
+		Core::App().settings().setVideoQuality({
+			.manual = 0,
+			.height = uint32(requested),
+		});
+		Core::App().saveSettingsDelayed();
+		createStreamedPlayer();
+	}, _streamed->instance.lifetime());
+
 	if (_streamed->instance.ready()) {
 		streamingReady(base::duplicate(_streamed->instance.info()));
 	}
@@ -1880,6 +2272,10 @@ void Gif::startStreamedPlayer() const {
 	//if (!_streamed->withSound) {
 	options.mode = ::Media::Streaming::Mode::Video;
 	options.loop = true;
+	options.position = _videoTimestamp
+		? (_videoTimestamp * crl::time(1000))
+		: _parent->history()->session().local().mediaLastPlaybackPosition(
+			_data->id);
 	//}
 	_streamed->instance.play(options);
 }
@@ -1887,10 +2283,12 @@ void Gif::startStreamedPlayer() const {
 void Gif::checkStreamedIsStarted() const {
 	if (!_streamed || _streamed->instance.playerLocked()) {
 		return;
-	} else if (_streamed->instance.paused()) {
-		_streamed->instance.resume();
 	}
-	if (!_streamed->instance.active() && !_streamed->instance.failed()) {
+	if (_streamed->instance.active()) {
+		if (_streamed->instance.paused()) {
+			_streamed->instance.resume();
+		}
+	} else if (!_streamed->instance.failed()) {
 		startStreamedPlayer();
 	}
 }
@@ -1903,6 +2301,7 @@ void Gif::setStreamed(std::unique_ptr<Streamed> value) {
 		history()->owner().registerHeavyViewPart(_parent);
 		togglePollingStory(true);
 	} else if (removed) {
+		_videoPosition = 0;
 		_parent->checkHeavyPart();
 	}
 }
@@ -1912,14 +2311,15 @@ void Gif::handleStreamingUpdate(::Media::Streaming::Update &&update) {
 
 	v::match(update.data, [&](Information &update) {
 		streamingReady(std::move(update));
-	}, [&](const PreloadedVideo &update) {
-	}, [&](const UpdateVideo &update) {
+	}, [](PreloadedVideo) {
+	}, [&](UpdateVideo) {
 		repaintStreamedContent();
-	}, [&](const PreloadedAudio &update) {
-	}, [&](const UpdateAudio &update) {
-	}, [&](const WaitingForData &update) {
-	}, [&](MutedByOther) {
-	}, [&](Finished) {
+	}, [](PreloadedAudio) {
+	}, [](UpdateAudio) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
+	}, [](Finished) {
 	});
 }
 
@@ -1938,9 +2338,10 @@ void Gif::repaintStreamedContent() {
 }
 
 void Gif::streamingReady(::Media::Streaming::Information &&info) {
-	if (info.video.size.width() * info.video.size.height()
-		> kMaxInlineArea) {
-		_data->dimensions = info.video.size;
+	if (!ValidFrameSize(info.video.size, maxInlineArea())) {
+		if (!info.video.size.isEmpty()) {
+			_data->dimensions = info.video.size;
+		}
 		stopAnimation();
 	} else {
 		history()->owner().requestViewResize(_parent);
@@ -1982,10 +2383,12 @@ bool Gif::dataLoaded() const {
 }
 
 bool Gif::needInfoDisplay() const {
-	if (_parent->data()->isFakeAboutView()) {
+	const auto item = _parent->data();
+	if (item->isFakeAboutView()) {
 		return false;
 	}
-	return _parent->data()->isSending()
+	return item->isSending()
+		|| item->awaitingVideoProcessing()
 		|| _data->uploading()
 		|| _parent->isUnderCursor()
 		|| (_parent->delegate()->elementContext() == Context::ChatPreview)
@@ -1999,9 +2402,11 @@ bool Gif::needCornerStatusDisplay() const {
 }
 
 void Gif::ensureTranscribeButton() const {
+	const auto media = _parent->data()->media();
 	if (_data->isVideoMessage()
-		&& !_parent->data()->media()->ttlSeconds()
+		&& (!media || !media->ttlSeconds())
 		&& !_parent->data()->isScheduled()
+		&& !_parent->data()->isAdminLogEntry()
 		&& (_data->session().premium()
 			|| _data->session().api().transcribes().trialsSupport())) {
 		if (!_transcribe) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.h b/Telegram/SourceFiles/history/view/media/history_view_gif.h
index 45edc9ce3b72db..3c9fb44c3a51b2 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.h
@@ -15,9 +15,12 @@ struct HistoryMessageVia;
 struct HistoryMessageReply;
 struct HistoryMessageForwarded;
 class Painter;
+class PhotoData;
+class VoiceSeekClickHandler;
 
 namespace Data {
 class DocumentMedia;
+class PhotoMedia;
 } // namespace Data
 
 namespace Media {
@@ -37,6 +40,7 @@ enum class Error;
 
 namespace HistoryView {
 
+class Photo;
 class Reply;
 class TranscribeButton;
 
@@ -62,6 +66,7 @@ class Gif final : public File {
 	void clickHandlerPressedChanged(
 		const ClickHandlerPtr &p,
 		bool pressed) override;
+	void updatePressed(QPoint point) override;
 
 	bool uploading() const override;
 
@@ -137,6 +142,10 @@ class Gif final : public File {
 	void dataMediaCreated() const;
 
 	[[nodiscard]] bool autoplayEnabled() const;
+	[[nodiscard]] bool autoplayUnderCursor() const;
+	[[nodiscard]] bool underCursor() const;
+	[[nodiscard]] int maxInlineArea() const;
+	[[nodiscard]] bool canPlayInline() const;
 
 	void playAnimation(bool autoplay) override;
 	QSize countOptimalSize() override;
@@ -146,6 +155,7 @@ class Gif final : public File {
 	Streamed *activeOwnStreamed() const;
 	::Media::Streaming::Instance *activeCurrentStreamed() const;
 	::Media::View::PlaybackProgress *videoPlayback() const;
+	bool isRoundSeekable() const;
 
 	void createStreamedPlayer();
 	void checkStreamedIsStarted() const;
@@ -163,6 +173,15 @@ class Gif final : public File {
 		int y,
 		bool right,
 		const PaintContext &context) const;
+	void paintTimestampMark(
+		Painter &p,
+		QRect rthumb,
+		std::optional<Ui::BubbleRounding> rounding) const;
+	void paintRoundPlaybackProgress(
+		Painter &p,
+		const PaintContext &context,
+		QRect rthumb,
+		bool inTTLViewer) const;
 
 	[[nodiscard]] bool needInfoDisplay() const;
 	[[nodiscard]] bool needCornerStatusDisplay() const;
@@ -202,28 +221,41 @@ class Gif final : public File {
 		QPoint point,
 		StateRequest request,
 		QPoint position) const;
+	[[nodiscard]] ClickHandlerPtr currentVideoLink() const;
 
 	void togglePollingStory(bool enabled) const;
 
 	TtlRoundPaintCallback _drawTtl;
 
 	const not_null<DocumentData*> _data;
+	PhotoData *_videoCover = nullptr;
 	const FullStoryId _storyId;
 	std::unique_ptr<Streamed> _streamed;
 	const std::unique_ptr<MediaSpoiler> _spoiler;
 	mutable std::unique_ptr<MediaSpoilerTag> _spoilerTag;
 	mutable std::unique_ptr<TranscribeButton> _transcribe;
 	mutable std::shared_ptr<Data::DocumentMedia> _dataMedia;
+	mutable std::shared_ptr<Data::PhotoMedia> _videoCoverMedia;
 	mutable std::unique_ptr<Image> _videoThumbnailFrame;
 	QString _downloadSize;
 	mutable QImage _thumbCache;
 	mutable QImage _roundingMask;
+	mutable crl::time _videoPosition = 0;
+	std::shared_ptr<VoiceSeekClickHandler> _seekl;
+	mutable Ui::Animations::Simple _seekAnimation;
+	float64 _seekingCurrent = 0.;
+	QPoint _seekPressPoint;
+	mutable QImage _seekLastFrame;
+	mutable TimeId _videoTimestamp = 0;
 	mutable std::optional<Ui::BubbleRounding> _thumbCacheRounding;
 	mutable bool _thumbCacheBlurred : 1 = false;
 	mutable bool _thumbIsEllipse : 1 = false;
 	mutable bool _pollingStory : 1 = false;
 	mutable bool _purchasedPriceTag : 1 = false;
+	mutable bool _seeking : 1 = false;
+	mutable bool _smallGroupPart : 1 = false;
 	const bool _sensitiveSpoiler : 1 = false;
+	const bool _hasVideoCover : 1 = false;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
index 4641caa07771fc..2c0d63fcdc79df 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_giveaway.cpp
@@ -32,8 +32,12 @@ constexpr auto kOutlineRatio = 0.85;
 auto GenerateGiveawayStart(
 	not_null<Element*> parent,
 	not_null<Data::GiveawayStart*> data)
--> Fn<void(Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
-	return [=](Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
+-> Fn<void(
+		not_null<MediaGeneric*>,
+		Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](
+			not_null<MediaGeneric*> media,
+			Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
 		const auto months = data->months;
 		const auto quantity = data->quantity;
 
@@ -44,7 +48,7 @@ auto GenerateGiveawayStart(
 			return Data{
 				.sticker = packs.lookup(months),
 				.size = st::msgServiceGiftBoxStickerSize,
-				.singleTimePlayback = true,
+				.stopOnLastFrame = true,
 			};
 		};
 		push(std::make_unique<StickerWithBadgePart>(
@@ -74,10 +78,11 @@ auto GenerateGiveawayStart(
 			push(std::make_unique<MediaGenericTextPart>(
 				std::move(text),
 				margins,
+				st::defaultTextStyle,
 				links));
 		};
 		pushText(
-			Ui::Text::Bold(
+			tr::bold(
 				tr::lng_prizes_title(tr::now, lt_count, quantity)),
 			st::chatGiveawayPrizesTitleMargin);
 
@@ -89,7 +94,7 @@ auto GenerateGiveawayStart(
 					quantity,
 					lt_prize,
 					TextWithEntities{ data->additionalPrize },
-					Ui::Text::RichLangValue),
+					tr::rich),
 				st::chatGiveawayPrizesMargin);
 			push(std::make_unique<TextDelimeterPart>(
 				tr::lng_prizes_additional_with(tr::now),
@@ -104,8 +109,8 @@ auto GenerateGiveawayStart(
 					tr::now,
 					lt_count,
 					data->credits,
-					Ui::Text::RichLangValue),
-				Ui::Text::RichLangValue)
+					tr::rich),
+				tr::rich)
 			: (data->credits && (quantity > 1))
 			? tr::lng_prizes_credits_about(
 				tr::now,
@@ -116,18 +121,18 @@ auto GenerateGiveawayStart(
 					tr::now,
 					lt_count,
 					data->credits,
-					Ui::Text::RichLangValue),
-				Ui::Text::RichLangValue)
+					tr::rich),
+				tr::rich)
 			: tr::lng_prizes_about(
 				tr::now,
 				lt_count,
 				quantity,
 				lt_duration,
-				Ui::Text::Bold(GiftDuration(months)),
-				Ui::Text::RichLangValue),
+				tr::bold(GiftDuration(months * 30)),
+				tr::rich),
 			st::chatGiveawayPrizesMargin);
 		pushText(
-			Ui::Text::Bold(tr::lng_prizes_participants(tr::now)),
+			tr::bold(tr::lng_prizes_participants(tr::now)),
 			st::chatGiveawayPrizesTitleMargin);
 
 		const auto hasChannel = ranges::any_of(
@@ -187,7 +192,7 @@ auto GenerateGiveawayStart(
 		}
 
 		pushText(
-			Ui::Text::Bold(tr::lng_prizes_date(tr::now)),
+			tr::bold(tr::lng_prizes_date(tr::now)),
 			(countries.empty()
 				? st::chatGiveawayNoCountriesTitleMargin
 				: st::chatGiveawayPrizesMargin));
@@ -200,8 +205,12 @@ auto GenerateGiveawayStart(
 auto GenerateGiveawayResults(
 	not_null<Element*> parent,
 	not_null<Data::GiveawayResults*> data)
--> Fn<void(Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
-	return [=](Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
+-> Fn<void(
+		not_null<MediaGeneric*>,
+		Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](
+			not_null<MediaGeneric*> media,
+			Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
 		const auto quantity = data->winnersCount;
 
 		using Data = StickerWithBadgePart::Data;
@@ -212,7 +221,8 @@ auto GenerateGiveawayResults(
 			return Data{
 				.sticker = packs.lookup(emoji, 0),
 				.skipTop = st::chatGiveawayWinnersTopSkip,
-				.singleTimePlayback = true,
+				.size = st::maxAnimatedEmojiSize,
+				.stopOnLastFrame = true,
 			};
 		};
 		push(std::make_unique<StickerWithBadgePart>(
@@ -242,13 +252,14 @@ auto GenerateGiveawayResults(
 			push(std::make_unique<MediaGenericTextPart>(
 				std::move(text),
 				margins,
+				st::defaultTextStyle,
 				links));
 		};
 		const auto isSingleWinner = (data->winnersCount == 1);
 		pushText(
 			(isSingleWinner
 				? tr::lng_prizes_results_title_one
-				: tr::lng_prizes_results_title)(tr::now, Ui::Text::Bold),
+				: tr::lng_prizes_results_title)(tr::now, tr::bold),
 			st::chatGiveawayPrizesTitleMargin);
 		const auto showGiveawayHandler = JumpToMessageClickHandler(
 			data->channel,
@@ -260,14 +271,14 @@ auto GenerateGiveawayResults(
 				lt_count,
 				quantity,
 				lt_link,
-				Ui::Text::Link(tr::lng_prizes_results_link(tr::now)),
-				Ui::Text::RichLangValue),
+				tr::link(tr::lng_prizes_results_link(tr::now)),
+				tr::rich),
 			st::chatGiveawayPrizesMargin,
 			{ { 1, showGiveawayHandler } });
 		pushText(
 			(isSingleWinner
 				? tr::lng_prizes_results_winner
-				: tr::lng_prizes_results_winners)(tr::now, Ui::Text::Bold),
+				: tr::lng_prizes_results_winners)(tr::now, tr::bold),
 			st::chatGiveawayPrizesTitleMargin);
 
 		push(std::make_unique<PeerBubbleListPart>(
@@ -275,7 +286,7 @@ auto GenerateGiveawayResults(
 			data->winners));
 		if (data->winnersCount > data->winners.size()) {
 			pushText(
-				Ui::Text::Bold(tr::lng_prizes_results_more(
+				tr::bold(tr::lng_prizes_results_more(
 					tr::now,
 					lt_count,
 					data->winnersCount - data->winners.size())),
diff --git a/Telegram/SourceFiles/history/view/media/history_view_giveaway.h b/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
index 23f223bd2965e8..0b74d3caeca8eb 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_giveaway.h
@@ -15,16 +15,21 @@ struct GiveawayResults;
 namespace HistoryView {
 
 class Element;
+class MediaGeneric;
 class MediaGenericPart;
 
 [[nodiscard]] auto GenerateGiveawayStart(
 	not_null<Element*> parent,
 	not_null<Data::GiveawayStart*> data)
--> Fn<void(Fn<void(std::unique_ptr<MediaGenericPart>)>)>;
+-> Fn<void(
+	not_null<MediaGeneric*>,
+	Fn<void(std::unique_ptr<MediaGenericPart>)>)>;
 
 [[nodiscard]] auto GenerateGiveawayResults(
 	not_null<Element*> parent,
 	not_null<Data::GiveawayResults*> data)
--> Fn<void(Fn<void(std::unique_ptr<MediaGenericPart>)>)>;
+-> Fn<void(
+	not_null<MediaGeneric*>,
+	Fn<void(std::unique_ptr<MediaGenericPart>)>)>;
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_location.cpp b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
index 5b8b18e61b31d1..d8cd48fced5fa4 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_location.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
@@ -13,9 +13,13 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "history/history_location_manager.h"
 #include "history/view/history_view_element.h"
+#include "history/view/history_view_message.h"
 #include "history/view/history_view_cursor_state.h"
 #include "lang/lang_keys.h"
 #include "ui/chat/chat_style.h"
+#include "ui/dynamic_thumbnails.h"
+#include "ui/dynamic_image.h"
+#include "ui/widgets/shadow.h"
 #include "ui/image/image.h"
 #include "ui/text/text_options.h"
 #include "ui/cached_round_corners.h"
@@ -31,6 +35,10 @@ namespace {
 constexpr auto kUntilOffPeriod = std::numeric_limits<TimeId>::max();
 constexpr auto kLiveElapsedPartOpacity = 0.2;
 
+[[nodiscard]] bool IsHostedInstantViewMedia(not_null<const Element*> parent) {
+	return parent->Get<InstantViewMediaRuntime>() != nullptr;
+}
+
 [[nodiscard]] TimeId ResolveUpdateDate(not_null<Element*> view) {
 	const auto item = view->data();
 	const auto edited = item->Get<HistoryMessageEdited>();
@@ -90,13 +98,16 @@ Location::Location(
 	not_null<Data::CloudImage*> data,
 	Data::LocationPoint point,
 	Element *replacing,
-	TimeId livePeriod)
+	TimeId livePeriod,
+	QSize sizeOverride)
 : Media(parent)
 , _data(data)
 , _live(CreateLiveTracker(parent, livePeriod))
 , _title(st::msgMinWidth)
 , _description(st::msgMinWidth)
-, _link(std::make_shared<LocationClickHandler>(point)) {
+, _link(std::make_shared<LocationClickHandler>(point))
+, _sizeOverride(sizeOverride)
+, _liveLocation(livePeriod > 0) {
 	if (_live) {
 		_title.setText(
 			st::webPageTitleStyle,
@@ -160,7 +171,13 @@ void Location::checkLiveFinish() {
 	const auto item = _parent->data();
 	const auto start = item->date();
 	if (_live->period != kUntilOffPeriod && now - start >= _live->period) {
+		const auto had = hasHeavyPart();
+		_title.clear();
+		_description.clear();
 		_live = nullptr;
+		if (had && !hasHeavyPart()) {
+			_parent->checkHeavyPart();
+		}
 		item->history()->owner().requestViewResize(_parent);
 	} else {
 		_parent->repaint();
@@ -240,13 +257,19 @@ QImage Location::locationTakeImage() {
 
 void Location::unloadHeavyPart() {
 	_media = nullptr;
+	if (_userpic) {
+		_userpic->subscribeToUpdates(nullptr);
+		_userpic = nullptr;
+	}
 	if (_live) {
 		_live->previous = QImage();
 	}
 }
 
 bool Location::hasHeavyPart() const {
-	return (_media != nullptr) || (_live && !_live->previous.isNull());
+	return (_media != nullptr)
+		|| (_userpic != nullptr)
+		|| (_live && !_live->previous.isNull());
 }
 
 void Location::ensureMediaCreated() const {
@@ -258,17 +281,32 @@ void Location::ensureMediaCreated() const {
 	history()->owner().registerHeavyViewPart(_parent);
 }
 
+void Location::ensureUserpicCreated() const {
+	if (_userpic) {
+		return;
+	}
+	const auto peer = _parent->data()->from();
+	_userpic = Ui::MakeUserpicThumbnail(peer, true);
+	_userpic->subscribeToUpdates([parent = _parent] {
+		parent->repaint();
+	});
+	history()->owner().registerHeavyViewPart(_parent);
+}
+
 QSize Location::countOptimalSize() {
+	const auto hostedInstantView = IsHostedInstantViewMedia(_parent);
 	auto tw = fullWidth();
 	auto th = fullHeight();
-	if (tw > st::maxMediaSize) {
+	if (!hostedInstantView && tw > st::maxMediaSize) {
 		th = (st::maxMediaSize * th) / tw;
 		tw = st::maxMediaSize;
 	}
-	auto minWidth = std::clamp(
-		_parent->minWidthForMedia(),
-		st::minPhotoSize,
-		st::maxMediaSize);
+	auto minWidth = hostedInstantView
+		? std::max(_parent->minWidthForMedia(), 1)
+		: std::clamp(
+			_parent->minWidthForMedia(),
+			st::minPhotoSize,
+			st::maxMediaSize);
 	auto maxWidth = qMax(tw, minWidth);
 	auto minHeight = qMax(th, st::minPhotoSize);
 
@@ -281,14 +319,8 @@ QSize Location::countOptimalSize() {
 		}
 		if (!_title.isEmpty() || !_description.isEmpty()) {
 			minHeight += st::mediaInBubbleSkip;
-			if (_live) {
-				if (isBubbleBottom()) {
-					minHeight += st::msgPadding.bottom();
-				}
-			} else {
-				if (isBubbleTop()) {
-					minHeight += st::msgPadding.top();
-				}
+			if (isBubbleBottom()) {
+				minHeight += st::msgPadding.bottom();
 			}
 		}
 	}
@@ -298,9 +330,10 @@ QSize Location::countOptimalSize() {
 QSize Location::countCurrentSize(int newWidth) {
 	accumulate_min(newWidth, maxWidth());
 
+	const auto hostedInstantView = IsHostedInstantViewMedia(_parent);
 	auto tw = fullWidth();
 	auto th = fullHeight();
-	if (tw > st::maxMediaSize) {
+	if (!hostedInstantView && tw > st::maxMediaSize) {
 		th = (st::maxMediaSize * th) / tw;
 		tw = st::maxMediaSize;
 	}
@@ -310,12 +343,15 @@ QSize Location::countCurrentSize(int newWidth) {
 	} else {
 		newWidth = tw;
 	}
-	auto minWidth = std::clamp(
-		_parent->minWidthForMedia(),
-		st::minPhotoSize,
-		std::min(newWidth, st::maxMediaSize));
+	auto minWidth = hostedInstantView
+		? std::max(_parent->minWidthForMedia(), 1)
+		: std::clamp(
+			_parent->minWidthForMedia(),
+			st::minPhotoSize,
+			std::min(newWidth, st::maxMediaSize));
 	accumulate_max(newWidth, minWidth);
 	accumulate_max(newHeight, st::minPhotoSize);
+	_thumbnailHeight = newHeight;
 	if (_live) {
 		_live->thumbnailHeight = newHeight;
 	}
@@ -328,14 +364,8 @@ QSize Location::countCurrentSize(int newWidth) {
 		}
 		if (!_title.isEmpty() || !_description.isEmpty()) {
 			newHeight += st::mediaInBubbleSkip;
-			if (_live) {
-				if (isBubbleBottom()) {
-					newHeight += st::msgPadding.bottom();
-				}
-			} else {
-				if (isBubbleTop()) {
-					newHeight += st::msgPadding.top();
-				}
+			if (isBubbleBottom()) {
+				newHeight += st::msgPadding.bottom();
 			}
 		}
 	}
@@ -357,24 +387,21 @@ void Location::draw(Painter &p, const PaintContext &context) const {
 		return;
 	}
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
+	const auto hostedInstantView = IsHostedInstantViewMedia(_parent);
 	bool bubble = _parent->hasBubble();
 	const auto st = context.st;
 	const auto stm = context.messageStyle();
 
 	const auto hasText = !_title.isEmpty() || !_description.isEmpty();
-	const auto rounding = adjustedBubbleRounding(_live
-		? RectPart::FullBottom
-		: hasText
-		? RectPart::FullTop
-		: RectPart());
+	const auto square = hasText ? RectPart::FullBottom : RectPart();
+	const auto rounding = hostedInstantView
+		? Ui::BubbleRounding()
+		: adjustedBubbleRounding(square);
 	const auto paintText = [&] {
-		if (_live) {
-			painty += st::mediaInBubbleSkip;
-		} else if (!hasText) {
+		if (!hasText && !_live) {
 			return;
-		} else if (isBubbleTop()) {
-			painty += st::msgPadding.top();
 		}
+		painty += st::mediaInBubbleSkip;
 
 		auto textw = width() - st::msgPadding.left() - st::msgPadding.right();
 
@@ -390,17 +417,10 @@ void Location::draw(Painter &p, const PaintContext &context) const {
 			_description.drawLeftElided(p, paintx + st::msgPadding.left(), painty, textw, width(), 3, style::al_left, 0, -1, 0, false, toDescriptionSelection(context.selection));
 			painty += qMin(_description.countHeight(textw), 3 * st::webPageDescriptionFont->height);
 		}
-		if (!_live) {
-			painty += st::mediaInBubbleSkip;
-			painth -= painty;
-		}
 	};
-	if (!_live) {
-		paintText();
-	}
-	const auto thumbh = _live ? _live->thumbnailHeight : painth;
+	const auto thumbh = _thumbnailHeight;
 	auto rthumb = QRect(paintx, painty, paintw, thumbh);
-	if (!bubble) {
+	if (!bubble && !hostedInstantView) {
 		fillImageShadow(p, rthumb, rounding, context);
 	}
 
@@ -436,24 +456,90 @@ void Location::draw(Painter &p, const PaintContext &context) const {
 				.rounding = rounding,
 			});
 	}
-	const auto paintMarker = [&](const style::icon &icon) {
-		icon.paint(
+	if (_liveLocation) {
+		ensureUserpicCreated();
+
+		const auto pinRadius = st::historyMapPinRadius;
+		const auto userpicSize = st::historyMapPinUserpicSize;
+		const auto tailHeight = st::historyMapPinTailHeight;
+		const auto tailHalfWidth = st::historyMapPinTailHalfWidth;
+
+		const auto cx = float64(rthumb.x() + rthumb.width() / 2);
+		const auto tipY = float64(rthumb.y() + rthumb.height() / 2);
+		const auto circleY = tipY - tailHeight - pinRadius;
+
+		const auto r = float64(pinRadius);
+		const auto w = float64(tailHalfWidth);
+		const auto attachAngle = std::asin(w / r) * 180.0 / M_PI;
+
+		const auto circleRect = QRectF(cx - r, circleY - r, 2.0 * r, 2.0 * r);
+
+		auto pin = QPainterPath();
+		pin.arcMoveTo(circleRect, 270.0 - attachAngle);
+		pin.arcTo(
+			circleRect,
+			270.0 - attachAngle,
+			-(360.0 - 2.0 * attachAngle));
+		pin.lineTo(cx, tipY);
+		pin.closeSubpath();
+
+		if (!_pinShadow) {
+			_pinShadow = std::make_unique<Ui::BoxShadow>(
+				st::historyMapPinShadow);
+		}
+		_pinShadow->paint(
 			p,
-			rthumb.x() + ((rthumb.width() - icon.width()) / 2),
-			rthumb.y() + (rthumb.height() / 2) - icon.height(),
-			width());
-	};
-	paintMarker(st->historyMapPoint());
-	paintMarker(st->historyMapPointInner());
+			circleRect.toAlignedRect(),
+			pinRadius);
+
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+
+		const auto dotRadius = st::historyMapPinDotRadius;
+		const auto dotStroke = st::historyMapPinDotStroke;
+		p.setBrush(st::mapPointDot);
+		p.drawEllipse(
+			QPointF(cx, tipY + dotRadius + dotStroke),
+			dotRadius + dotStroke,
+			dotRadius + dotStroke);
+		p.setBrush(st::mapPointDrop);
+		p.drawEllipse(
+			QPointF(cx, tipY + dotRadius + dotStroke),
+			dotRadius,
+			dotRadius);
+
+		p.setBrush(st::mapPointDot);
+		p.drawPath(pin);
+
+		const auto userpicImage = _userpic->image(userpicSize);
+		p.drawImage(
+			QRectF(
+				cx - userpicSize / 2.0,
+				circleY - userpicSize / 2.0,
+				userpicSize,
+				userpicSize),
+			userpicImage);
+	} else {
+		const auto paintMarker = [&](const style::icon &icon) {
+			icon.paint(
+				p,
+				rthumb.x() + ((rthumb.width() - icon.width()) / 2),
+				rthumb.y() + (rthumb.height() / 2) - icon.height(),
+				width());
+		};
+		paintMarker(st->historyMapPoint());
+		paintMarker(st->historyMapPointInner());
+	}
 	if (context.selected()) {
 		fillImageOverlay(p, rthumb, rounding, context);
 	}
+	painty += thumbh;
 	if (_live) {
-		painty += _live->thumbnailHeight;
-		painth -= _live->thumbnailHeight;
+		painth -= thumbh;
 		paintLiveRemaining(p, context, { paintx, painty, paintw, painth });
-		paintText();
-	} else if (_parent->media() == this) {
+	}
+	paintText();
+	if (!_live && !hasText && _parent->media() == this) {
 		auto fullRight = paintx + paintw;
 		auto fullBottom = height();
 		_parent->drawInfo(
@@ -593,17 +679,15 @@ TextState Location::textState(QPoint point, StateRequest request) const {
 	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) {
 		return result;
 	}
-	auto paintx = 0, painty = 0, paintw = width(), painth = height();
+	auto paintx = 0, painty = 0, paintw = width();
 	bool bubble = _parent->hasBubble();
 
+	const auto hasText = !_title.isEmpty() || !_description.isEmpty();
 	auto checkText = [&] {
-		if (_live) {
-			painty += st::mediaInBubbleSkip;
-		} else if (_title.isEmpty() && _description.isEmpty()) {
+		if (!hasText && !_live) {
 			return false;
-		} else if (isBubbleTop()) {
-			painty += st::msgPadding.top();
 		}
+		painty += st::mediaInBubbleSkip;
 
 		auto textw = width() - st::msgPadding.left() - st::msgPadding.right();
 
@@ -636,26 +720,17 @@ TextState Location::textState(QPoint point, StateRequest request) const {
 			}
 			painty += descriptionh;
 		}
-		if (!_title.isEmpty() || !_description.isEmpty()) {
-			painty += st::mediaInBubbleSkip;
-		}
-		painth -= painty;
 		return false;
 	};
-	if (!_live && checkText()) {
-		return result;
-	}
-	const auto thumbh = _live ? _live->thumbnailHeight : painth;
+	const auto thumbh = _thumbnailHeight;
 	if (QRect(paintx, painty, paintw, thumbh).contains(point) && _data) {
 		result.link = _link;
 	}
-	if (_live) {
-		painty += _live->thumbnailHeight;
-		painth -= _live->thumbnailHeight;
-		if (checkText()) {
-			return result;
-		}
-	} else if (_parent->media() == this) {
+	painty += thumbh;
+	if (checkText()) {
+		return result;
+	}
+	if (!_live && !hasText && _parent->media() == this) {
 		auto fullRight = paintx + paintw;
 		auto fullBottom = height();
 		const auto bottomInfoResult = _parent->bottomInfoTextState(
@@ -728,11 +803,15 @@ QPoint Location::resolveCustomInfoRightBottom() const {
 }
 
 int Location::fullWidth() const {
-	return st::locationSize.width();
+	return (_sizeOverride.width() > 0)
+		? _sizeOverride.width()
+		: st::locationSize.width();
 }
 
 int Location::fullHeight() const {
-	return st::locationSize.height();
+	return (_sizeOverride.height() > 0)
+		? _sizeOverride.height()
+		: st::locationSize.height();
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_location.h b/Telegram/SourceFiles/history/view/media/history_view_location.h
index 9e431ef740244a..b4ecc4b61f91b0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_location.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_location.h
@@ -14,6 +14,11 @@ namespace Data {
 class CloudImage;
 } // namespace Data
 
+namespace Ui {
+class BoxShadow;
+class DynamicImage;
+} // namespace Ui
+
 namespace HistoryView {
 
 class Location : public Media {
@@ -23,7 +28,8 @@ class Location : public Media {
 		not_null<Data::CloudImage*> data,
 		Data::LocationPoint point,
 		Element *replacing = nullptr,
-		TimeId livePeriod = 0);
+		TimeId livePeriod = 0,
+		QSize sizeOverride = QSize());
 	Location(
 		not_null<Element*> parent,
 		not_null<Data::CloudImage*> data,
@@ -56,12 +62,14 @@ class Location : public Media {
 
 	bool needsBubble() const override;
 	bool customInfoLayout() const override {
-		return true;
+		return _live || (_title.isEmpty() && _description.isEmpty());
 	}
 	QPoint resolveCustomInfoRightBottom() const override;
 
 	bool skipBubbleTail() const override {
-		return isRoundedInBubbleBottom();
+		return _title.isEmpty()
+			&& _description.isEmpty()
+			&& isRoundedInBubbleBottom();
 	}
 
 	QImage locationTakeImage() override;
@@ -76,6 +84,7 @@ class Location : public Media {
 		TimeId period);
 
 	void ensureMediaCreated() const;
+	void ensureUserpicCreated() const;
 
 	void validateImageCache(
 		QSize outer,
@@ -110,9 +119,14 @@ class Location : public Media {
 	const not_null<Data::CloudImage*> _data;
 	mutable std::unique_ptr<Live> _live;
 	mutable std::shared_ptr<QImage> _media;
+	mutable std::shared_ptr<Ui::DynamicImage> _userpic;
+	mutable std::unique_ptr<Ui::BoxShadow> _pinShadow;
 	Ui::Text::String _title, _description;
 	ClickHandlerPtr _link;
+	QSize _sizeOverride;
+	bool _liveLocation = false;
 
+	int _thumbnailHeight = 0;
 	mutable QImage _imageCache;
 	mutable Ui::BubbleRounding _imageCacheRounding;
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.cpp b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
index d41c93febe452e..a116d6ac2061de 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
@@ -131,9 +131,9 @@ TextWithEntities AddTimestampLinks(
 		return text;
 	}
 	static const auto expression = QRegularExpression(
-		"(?<![^\\s\\(\\)\"\\,\\.\\-])"
+		"(?<![^\\s\\(\\)\\[\\]\"\\,\\.\\-])"
 		"(?:(?:(\\d{1,2}):)?(\\d))?(\\d):(\\d\\d)"
-		"(?![^\\s\\(\\)\",\\.\\-\\+])");
+		"(?![^\\s\\(\\)\\[\\]\",\\.\\-\\+])");
 	const auto &string = text.text;
 	auto offset = 0;
 	while (true) {
@@ -161,9 +161,13 @@ TextWithEntities AddTimestampLinks(
 			from,
 			std::less<>(),
 			&EntityInText::offset);
+		const auto allowsTimestampLink = [](const EntityInText &entity) {
+			return (entity.type() == EntityType::Spoiler)
+				|| (entity.type() == EntityType::Blockquote);
+		};
 		while (i != entities.end()
 			&& i->offset() < till
-			&& i->type() == EntityType::Spoiler) {
+			&& allowsTimestampLink(*i)) {
 			++i;
 		}
 		if (i != entities.end() && i->offset() < till) {
@@ -172,7 +176,7 @@ TextWithEntities AddTimestampLinks(
 
 		const auto intersects = [&](const EntityInText &entity) {
 			return (entity.offset() + entity.length() > from)
-				&& (entity.type() != EntityType::Spoiler);
+				&& !allowsTimestampLink(entity);
 		};
 		auto j = std::make_reverse_iterator(i);
 		const auto e = std::make_reverse_iterator(entities.begin());
@@ -241,13 +245,12 @@ void Media::drawPurchasedTag(
 		if (!amount) {
 			return;
 		}
-		const auto session = &item->history()->session();
-		auto text = Ui::Text::Colorized(Ui::CreditsEmojiSmall(session));
+		auto text = Ui::Text::Colorized(Ui::CreditsEmojiSmall());
 		text.append(Lang::FormatCountDecimal(amount));
-		purchased->text.setMarkedText(st::defaultTextStyle, text, kMarkupTextOptions, Core::MarkedTextContext{
-			.session = session,
-			.customEmojiRepaint = [] {},
-		});
+		purchased->text.setMarkedText(
+			st::defaultTextStyle,
+			text,
+			kMarkupTextOptions);
 	}
 
 	const auto st = context.st;
@@ -402,8 +405,7 @@ void Media::drawSpoilerTag(
 				tr::lng_sensitive_tag(tr::now));
 			iconSkip = st::mediaMenuIconStealth.width() * 1.4;
 		} else {
-			const auto session = &history()->session();
-			auto price = Ui::Text::Colorized(Ui::CreditsEmoji(session));
+			auto price = Ui::Text::Colorized(Ui::CreditsEmoji());
 			price.append(Lang::FormatCountDecimal(tag->price));
 			text.setMarkedText(
 				st::semiboldTextStyle,
@@ -411,12 +413,8 @@ void Media::drawSpoilerTag(
 					tr::now,
 					lt_price,
 					price,
-					Ui::Text::WithEntities),
-				kMarkupTextOptions,
-				Core::MarkedTextContext{
-					.session = session,
-					.customEmojiRepaint = [] {},
-				});
+					tr::marked),
+				kMarkupTextOptions);
 		}
 		const auto width = iconSkip + text.maxWidth();
 		const auto inner = QRect(0, 0, width, text.minHeight());
@@ -484,7 +482,9 @@ void Media::setupSpoilerTag(std::unique_ptr<MediaSpoilerTag> &tag) const {
 	}
 	const auto media = parent()->data()->media();
 	const auto invoice = media ? media->invoice() : nullptr;
-	if (const auto price = invoice->isPaidMedia ? invoice->amount : 0) {
+	if (const auto price = (invoice && invoice->isPaidMedia)
+		? invoice->amount
+		: 0) {
 		tag = std::make_unique<MediaSpoilerTag>();
 		tag->price = price;
 	}
@@ -541,10 +541,10 @@ Ui::Text::String Media::createCaption(not_null<HistoryItem*> item) const {
 		- st::msgPadding.left()
 		- st::msgPadding.right();
 	auto result = Ui::Text::String(minResizeWidth);
-	const auto context = Core::MarkedTextContext{
+	const auto context = Core::TextContext({
 		.session = &history()->session(),
-		.customEmojiRepaint = [=] { _parent->customEmojiRepaint(); },
-	};
+		.repaint = [=] { _parent->customEmojiRepaint(); },
+	});
 	result.setMarkedText(
 		st::messageTextStyle,
 		item->translatedTextWithLocalEntities(),
@@ -591,6 +591,10 @@ QImage Media::locationTakeImage() {
 	return QImage();
 }
 
+std::vector<Media::TodoTaskInfo> Media::takeTasksInfo() {
+	return {};
+}
+
 TextState Media::getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.h b/Telegram/SourceFiles/history/view/media/history_view_media.h
index 93c877b660a9f8..db1ed752b2bac7 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.h
@@ -78,6 +78,15 @@ enum class MediaInBubbleState : uchar {
 	TimeId duration,
 	const QString &base);
 
+struct PaidInformation {
+	int messages = 0;
+	int stars = 0;
+
+	explicit operator bool() const {
+		return stars != 0;
+	}
+};
+
 class Media : public Object, public base::has_weak_ptr {
 public:
 	explicit Media(not_null<Element*> parent) : _parent(parent) {
@@ -121,6 +130,10 @@ class Media : public Object, public base::has_weak_ptr {
 	[[nodiscard]] virtual bool allowsFastShare() const {
 		return false;
 	}
+	[[nodiscard]] virtual auto paidInformation() const
+	-> std::optional<PaidInformation> {
+		return {};
+	}
 	virtual void refreshParentId(not_null<HistoryItem*> realParent) {
 	}
 	virtual void drawHighlight(
@@ -128,6 +141,9 @@ class Media : public Object, public base::has_weak_ptr {
 		const PaintContext &context,
 		int top) const {
 	}
+	[[nodiscard]] virtual QRect groupItemRect(int index) const {
+		return {};
+	}
 	virtual void draw(Painter &p, const PaintContext &context) const = 0;
 	[[nodiscard]] virtual PointState pointState(QPoint point) const;
 	[[nodiscard]] virtual TextState textState(
@@ -171,6 +187,12 @@ class Media : public Object, public base::has_weak_ptr {
 	virtual void clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) {
 	}
 
+	[[nodiscard]] virtual QRect addOptionRect(int innerWidth) const {
+		return {};
+	}
+	virtual void setAddOptionActive(bool active) {
+	}
+
 	[[nodiscard]] virtual bool uploading() const {
 		return false;
 	}
@@ -196,6 +218,14 @@ class Media : public Object, public base::has_weak_ptr {
 		not_null<DocumentData*> data,
 		const Lottie::ColorReplacements *replacements);
 	virtual QImage locationTakeImage();
+
+	struct TodoTaskInfo {
+		int id = 0;
+		PeerData *completedBy = nullptr;
+		TimeId completionDate = TimeId();
+	};
+	virtual std::vector<TodoTaskInfo> takeTasksInfo();
+
 	virtual void checkAnimation() {
 	}
 
@@ -309,6 +339,20 @@ class Media : public Object, public base::has_weak_ptr {
 	[[nodiscard]] virtual bool enforceBubbleWidth() const {
 		return false;
 	}
+	[[nodiscard]] virtual bool allowsNarrowBubble() const {
+		return false;
+	}
+	[[nodiscard]] virtual int minBubbleWidthForNarrowBubble() const {
+		return 0;
+	}
+
+	[[nodiscard]] virtual int contributedMaxMonospaceWidth() const {
+		return 0;
+	}
+
+	virtual int widenGroupingMaxWidth(int current, bool last) {
+		return current;
+	}
 
 	// Sometimes click on media in message is overloaded by the message:
 	// (for example it can open a link or a game instead of opening media)
@@ -333,6 +377,9 @@ class Media : public Object, public base::has_weak_ptr {
 	[[nodiscard]] virtual QMargins bubbleRollRepaintMargins() const {
 		return QMargins();
 	}
+	virtual bool updateItemData() {
+		return false;
+	}
 	virtual void paintBubbleFireworks(
 		Painter &p,
 		const QRect &bubble,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
index b899d9fc98af8d..b46a9aa0a7e80a 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "api/api_sensitive_content.h"
 #include "api/api_views.h"
 #include "apiwrap.h"
+#include "inline_bots/bot_attach_web_view.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/format_values.h"
@@ -18,6 +19,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/checkbox.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/painter.h"
+#include "core/application.h"
 #include "core/click_handler_types.h"
 #include "data/data_document.h"
 #include "data/data_session.h"
@@ -34,18 +36,76 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "history/history.h"
 #include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "mainwindow.h"
 #include "media/streaming/media_streaming_utility.h"
 #include "payments/payments_checkout_process.h"
 #include "payments/payments_non_panel_process.h"
+#include "settings/settings_common.h"
+#include "webrtc/webrtc_environment.h"
+#include "webview/webview_interface.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
+#include "styles/style_layers.h"
+#include "styles/style_settings.h"
 
 namespace HistoryView {
 namespace {
 
 constexpr auto kMediaUnlockedTooltipDuration = 5 * crl::time(1000);
+const auto kVerifyAgeAboutPrefix = "cloud_lng_age_verify_about_";
+
+rpl::producer<TextWithEntities> AgeVerifyAbout(
+		not_null<Main::Session*> session) {
+	const auto appConfig = &session->appConfig();
+	return rpl::single(
+		rpl::empty
+	) | rpl::then(
+		Lang::Updated()
+	) | rpl::map([=] {
+		const auto country = appConfig->ageVerifyCountry().toLower();
+		const auto age = appConfig->ageVerifyMinAge();
+		const auto [shift, string] = Lang::Plural(
+			Lang::kPluralKeyBaseForCloudValue,
+			age,
+			lt_count);
+		const auto postfixes = {
+			"#zero",
+			"#one",
+			"#two",
+			"#few",
+			"#many",
+			"#other"
+		};
+		Assert(shift >= 0 && shift < postfixes.size());
+		const auto postfix = *(begin(postfixes) + shift);
+		return tr::rich(Lang::GetNonDefaultValue(
+			kVerifyAgeAboutPrefix + country.toUtf8() + postfix
+		).replace(u"{count}"_q, string));
+	});
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> AgeVerifyIcon(
+		not_null<QWidget*> parent) {
+	const auto padding = st::settingsAgeVerifyIconPadding;
+	const auto full = st::settingsAgeVerifyIcon.size().grownBy(padding);
+	auto result = object_ptr<Ui::RpWidget>(parent);
+	const auto raw = result.data();
+	raw->resize(full);
+	raw->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(raw);
+		const auto x = (raw->width() - full.width()) / 2;
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(st::windowBgActive);
+		p.setPen(Qt::NoPen);
+		const auto inner = QRect(QPoint(x, 0), full);
+		p.drawEllipse(inner);
+		st::settingsAgeVerifyIcon.paintInCenter(p, inner);
+	}, raw->lifetime());
+	return result;
+}
 
 } // namespace
 
@@ -224,22 +284,22 @@ void ShowPaidMediaUnlockedToast(
 		: nullptr;
 	auto text = tr::lng_credits_media_done_title(
 		tr::now,
-		Ui::Text::Bold
+		tr::bold
 	).append('\n').append(user
 		? tr::lng_credits_media_done_text_user(
 			tr::now,
 			lt_count,
 			invoice->amount,
 			lt_user,
-			Ui::Text::Bold(user->shortName()),
-			Ui::Text::RichLangValue)
+			tr::bold(user->shortName()),
+			tr::rich)
 		: tr::lng_credits_media_done_text(
 			tr::now,
 			lt_count,
 			invoice->amount,
 			lt_chat,
-			Ui::Text::Bold(broadcast->name()),
-			Ui::Text::RichLangValue));
+			tr::bold(broadcast->name()),
+			tr::rich));
 	controller->showToast(std::move(text), kMediaUnlockedTooltipDuration);
 }
 
@@ -278,61 +338,266 @@ ClickHandlerPtr MakePaidMediaLink(not_null<HistoryItem*> item) {
 	});
 }
 
+void ShowAgeVerification(
+		std::shared_ptr<Ui::Show> show,
+		not_null<UserData*> bot,
+		Fn<void()> reveal) {
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		box->setNoContentMargin(true);
+		box->setStyle(st::settingsAgeVerifyBox);
+		box->setWidth(st::boxWideWidth);
+
+		box->addRow(AgeVerifyIcon(box), st::settingsAgeVerifyIconMargin);
+
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_age_verify_title(),
+				st::settingsAgeVerifyTitle),
+			st::boxRowPadding + st::settingsAgeVerifyMargin,
+			style::al_top);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				AgeVerifyAbout(&bot->session()),
+				st::settingsAgeVerifyText),
+			st::boxRowPadding + st::settingsAgeVerifyMargin,
+			style::al_top);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_age_verify_here(tr::rich),
+				st::settingsAgeVerifyText),
+			st::boxRowPadding + st::settingsAgeVerifyMargin,
+			style::al_top);
+
+		const auto weak = QPointer<Ui::GenericBox>(box);
+		const auto done = crl::guard(&bot->session(), [=](int age) {
+			const auto min = bot->session().appConfig().ageVerifyMinAge();
+			if (age >= min) {
+				reveal();
+				bot->session().api().sensitiveContent().update(true);
+			} else {
+				show->showToast({
+					.title = tr::lng_age_verify_sorry_title(tr::now),
+					.text = { tr::lng_age_verify_sorry_text(tr::now) },
+					.duration = Ui::Toast::kDefaultDuration * 3,
+				});
+			}
+			if (const auto strong = weak.data()) {
+				strong->closeBox();
+			}
+		});
+		const auto button = box->addButton(tr::lng_age_verify_button(), [=] {
+			bot->session().attachWebView().open({
+				.bot = bot,
+				.parentShow = box->uiShow(),
+				.context = { .maySkipConfirmation = true },
+				.source = InlineBots::WebViewSourceAgeVerification{
+					.done = done,
+				},
+			});
+		});
+		box->widthValue(
+		) | rpl::on_next([=](int width) {
+			const auto &padding = st::settingsAgeVerifyBox.buttonPadding;
+			button->resizeToWidth(width
+				- padding.left()
+				- padding.right());
+			button->moveToLeft(padding.left(), padding.top());
+		}, button->lifetime());
+
+		const auto close = Ui::CreateChild<Ui::IconButton>(
+			box.get(),
+			st::boxTitleClose);
+		close->setClickedCallback([=] {
+			box->closeBox();
+		});
+		box->widthValue(
+		) | rpl::on_next([=](int width) {
+			close->moveToRight(0, 0);
+		}, box->lifetime());
+		crl::on_main(close, [=] { close->raise(); });
+	}));
+}
+
+void ShowAgeVerificationMobile(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Main::Session*> session) {
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(tr::lng_age_verify_title());
+		box->setWidth(st::boxWideWidth);
+
+		const auto size = st::settingsCloudPasswordIconSize;
+		auto icon = Settings::CreateLottieIcon(
+			box->verticalLayout(),
+			{
+				.name = u"phone"_q,
+				.sizeOverride = { size, size },
+			},
+			st::peerAppearanceIconPadding);
+
+		box->showFinishes(
+		) | rpl::on_next([animate = std::move(icon.animate)] {
+			animate(anim::repeat::once);
+		}, box->lifetime());
+
+		box->addRow(std::move(icon.widget));
+
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				AgeVerifyAbout(session),
+				st::settingsAgeVerifyText),
+			st::boxRowPadding + st::settingsAgeVerifyMargin,
+			style::al_top);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_age_verify_mobile(tr::rich),
+				st::settingsAgeVerifyText),
+			st::boxRowPadding + st::settingsAgeVerifyMargin,
+			style::al_top);
+
+		box->addButton(tr::lng_box_ok(), [=] {
+			box->closeBox();
+		});
+	}));
+}
+
+void ShowAgeVerificationRequired(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Main::Session*> session,
+		Fn<void()> reveal) {
+	struct State {
+		Fn<void()> check;
+		rpl::lifetime lifetime;
+		std::optional<PeerData*> bot;
+	};
+	const auto state = std::make_shared<State>();
+	const auto username = session->appConfig().ageVerifyBotUsername();
+	const auto bot = session->data().peerByUsername(username);
+	if (username.isEmpty() || bot) {
+		state->bot = bot;
+	} else {
+		session->api().request(MTPcontacts_ResolveUsername(
+			MTP_flags(0),
+			MTP_string(username),
+			MTPstring()
+		)).done([=](const MTPcontacts_ResolvedPeer &result) {
+			const auto &data = result.data();
+			session->data().processUsers(data.vusers());
+			session->data().processChats(data.vchats());
+			const auto botId = peerFromMTP(data.vpeer());
+			state->bot = session->data().peerLoaded(botId);
+			state->check();
+		}).fail([=] {
+			state->bot = nullptr;
+			state->check();
+		}).send();
+	}
+	state->check = [=] {
+		const auto sensitive = &session->api().sensitiveContent();
+		const auto ready = sensitive->loaded();
+		if (!ready) {
+			state->lifetime = sensitive->loadedValue(
+			) | rpl::filter(
+				rpl::mappers::_1
+			) | rpl::take(1) | rpl::on_next(state->check);
+			return;
+		} else if (!state->bot.has_value()) {
+			return;
+		}
+		const auto has = Core::App().mediaDevices().recordAvailability();
+		const auto available = Webview::Availability();
+		const auto bot = (*state->bot)->asUser();
+		if (available.error == Webview::Available::Error::None
+			&& has == Webrtc::RecordAvailability::VideoAndAudio
+			&& sensitive->canChangeCurrent()
+			&& bot
+			&& bot->isBot()
+			&& bot->botInfo->hasMainApp) {
+			ShowAgeVerification(show, bot, reveal);
+		} else {
+			ShowAgeVerificationMobile(show, session);
+		}
+		state->lifetime.destroy();
+		state->check = nullptr;
+	};
+	state->check();
+}
+
+void ShowSensitiveConfirm(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Main::Session*> session,
+		Fn<void()> reveal) {
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		struct State {
+			rpl::variable<bool> canChange;
+			Ui::Checkbox *checkbox = nullptr;
+		};
+		const auto state = box->lifetime().make_state<State>();
+		const auto sensitive = &session->api().sensitiveContent();
+		state->canChange = sensitive->canChange();
+		const auto done = [=](Fn<void()> close) {
+			if (state->canChange.current()
+				&& state->checkbox->checked()) {
+				show->showToast({
+					.text = tr::lng_sensitive_toast(
+						tr::now,
+						tr::rich),
+					.adaptive = true,
+					.duration = 5 * crl::time(1000),
+				});
+				sensitive->update(true);
+			} else {
+				reveal();
+			}
+			close();
+		};
+		Ui::ConfirmBox(box, {
+			.text = tr::lng_sensitive_text(tr::rich),
+			.confirmed = done,
+			.confirmText = tr::lng_sensitive_view(),
+			.title = tr::lng_sensitive_title(),
+		});
+		const auto skip = st::defaultCheckbox.margin.bottom();
+		const auto wrap = box->addRow(
+			object_ptr<Ui::SlideWrap<Ui::Checkbox>>(
+				box,
+				object_ptr<Ui::Checkbox>(
+					box,
+					tr::lng_sensitive_always(tr::now),
+					false)),
+			st::boxRowPadding + QMargins(0, 0, 0, skip));
+		wrap->toggleOn(state->canChange.value());
+		wrap->finishAnimating();
+		state->checkbox = wrap->entity();
+	}));
+}
+
 ClickHandlerPtr MakeSensitiveMediaLink(
 		ClickHandlerPtr reveal,
 		not_null<HistoryItem*> item) {
 	const auto session = &item->history()->session();
+	session->api().sensitiveContent().preload();
+
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		const auto plain = [reveal, context] {
+			if (const auto raw = reveal.get()) {
+				raw->onClick(context);
+			}
+		};
 		const auto my = context.other.value<ClickHandlerContext>();
 		const auto controller = my.sessionWindow.get();
 		const auto show = controller ? controller->uiShow() : my.show;
 		if (!show) {
-			reveal->onClick(context);
-			return;
+			plain();
+		} else if (session->appConfig().ageVerifyNeeded()) {
+			ShowAgeVerificationRequired(show, session, plain);
+		} else {
+			ShowSensitiveConfirm(show, session, plain);
 		}
-		show->show(Box([=](not_null<Ui::GenericBox*> box) {
-			struct State {
-				rpl::variable<bool> canChange;
-				Ui::Checkbox *checkbox = nullptr;
-			};
-			const auto state = box->lifetime().make_state<State>();
-			const auto sensitive = &session->api().sensitiveContent();
-			state->canChange = sensitive->canChange();
-			const auto done = [=](Fn<void()> close) {
-				if (state->canChange.current()
-					&& state->checkbox->checked()) {
-					show->showToast({
-						.text = tr::lng_sensitive_toast(
-							tr::now,
-							Ui::Text::RichLangValue),
-						.adaptive = true,
-						.duration = 5 * crl::time(1000),
-					});
-					sensitive->update(true);
-				} else {
-					reveal->onClick(context);
-				}
-				close();
-			};
-			Ui::ConfirmBox(box, {
-				.text = tr::lng_sensitive_text(Ui::Text::RichLangValue),
-				.confirmed = done,
-				.confirmText = tr::lng_sensitive_view(),
-				.title = tr::lng_sensitive_title(),
-			});
-			const auto skip = st::defaultCheckbox.margin.bottom();
-			const auto wrap = box->addRow(
-				object_ptr<Ui::SlideWrap<Ui::Checkbox>>(
-					box,
-					object_ptr<Ui::Checkbox>(
-						box,
-						tr::lng_sensitive_always(tr::now),
-						false)),
-				st::boxRowPadding + QMargins(0, 0, 0, skip));
-			wrap->toggleOn(state->canChange.value());
-			wrap->finishAnimating();
-			state->checkbox = wrap->entity();
-		}));
 	});
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_common.h b/Telegram/SourceFiles/history/view/media/history_view_media_common.h
index 03646372f5a023..be8fdba808597f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_common.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_common.h
@@ -19,10 +19,18 @@ namespace Data {
 class Media;
 } // namespace Data
 
+namespace Main {
+class Session;
+} // namespace Main
+
 namespace Media::Streaming {
 struct ExpandDecision;
 } // namespace Media::Streaming
 
+namespace Ui {
+class Show;
+} // namespace Ui
+
 namespace HistoryView {
 
 class Media;
@@ -75,6 +83,11 @@ void PaintInterpolatedIcon(
 	int newWidth,
 	int maxWidth);
 
+void ShowAgeVerificationRequired(
+	std::shared_ptr<Ui::Show> show,
+	not_null<Main::Session*> session,
+	Fn<void()> reveal);
+
 [[nodiscard]] ClickHandlerPtr MakePaidMediaLink(
 	not_null<HistoryItem*> item);
 [[nodiscard]] ClickHandlerPtr MakeSensitiveMediaLink(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp
index 18625b684da407..e5608b35130c60 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_generic.cpp
@@ -14,7 +14,6 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
 #include "ui/chat/chat_style.h"
-#include "ui/widgets/tooltip.h"
 #include "ui/dynamic_image.h"
 #include "ui/dynamic_thumbnails.h"
 #include "ui/painter.h"
@@ -28,19 +27,6 @@ namespace {
 
 constexpr auto kAdditionalPrizesWithLineOpacity = 0.6;
 
-[[nodiscard]] QSize CountOptimalTextSize(
-		const Ui::Text::String &text,
-		int minWidth,
-		int maxWidth) {
-	if (text.maxWidth() <= maxWidth) {
-		return { text.maxWidth(), text.minHeight() };
-	}
-	const auto height = text.countHeight(maxWidth);
-	return { Ui::FindNiceTooltipWidth(minWidth, maxWidth, [&](int width) {
-		return text.countHeight(width);
-	}), height };
-}
-
 } // namespace
 
 TextState MediaGenericPart::textState(
@@ -69,23 +55,40 @@ auto MediaGenericPart::stickerTakePlayer(
 	return nullptr;
 }
 
+uint16 MediaGenericPart::fullSelectionLength() const {
+	return 0;
+}
+
+TextSelection MediaGenericPart::adjustSelection(
+		TextSelection selection,
+		TextSelectType type) const {
+	return selection;
+}
+
+TextForMimeData MediaGenericPart::selectedText(
+		TextSelection selection) const {
+	return {};
+}
+
 MediaGeneric::MediaGeneric(
 	not_null<Element*> parent,
-	Fn<void(Fn<void(std::unique_ptr<Part>)>)> generate,
+	Fn<void(
+		not_null<MediaGeneric*>,
+		Fn<void(std::unique_ptr<Part>)>)> generate,
 	MediaGenericDescriptor &&descriptor)
 : Media(parent)
+, _paintBgFactory(std::move(descriptor.paintBgFactory))
+, _paintBg(_paintBgFactory ? _paintBgFactory() : nullptr)
+, _fullAreaLink(descriptor.fullAreaLink)
 , _maxWidthCap(descriptor.maxWidth)
+, _expandCurrentWidth(descriptor.expandCurrentWidth)
 , _service(descriptor.service)
 , _hideServiceText(descriptor.hideServiceText) {
-	generate([&](std::unique_ptr<Part> part) {
+	generate(this, [&](std::unique_ptr<Part> part) {
 		_entries.push_back({
 			.object = std::move(part),
 		});
 	});
-	if (descriptor.serviceLink) {
-		parent->data()->setCustomServiceLink(
-			std::move(descriptor.serviceLink));
-	}
 }
 
 MediaGeneric::~MediaGeneric() {
@@ -110,27 +113,62 @@ QSize MediaGeneric::countOptimalSize() {
 }
 
 QSize MediaGeneric::countCurrentSize(int newWidth) {
-	return { maxWidth(), minHeight() };
+	if (!_expandCurrentWidth && newWidth > maxWidth()) {
+		newWidth = maxWidth();
+	}
+	auto top = 0;
+	for (auto &entry : _entries) {
+		top += entry.object->resizeGetHeight(newWidth);
+	}
+	return { newWidth, top };
 }
 
 void MediaGeneric::draw(Painter &p, const PaintContext &context) const {
 	const auto outer = width();
 	if (outer < st::msgPadding.left() + st::msgPadding.right() + 1) {
 		return;
+	}
+	if (!_paintBg && _paintBgFactory) {
+		_paintBg = _paintBgFactory();
+	}
+	if (_paintBg) {
+		_paintBg(p, context, this);
 	} else if (_service) {
 		PainterHighQualityEnabler hq(p);
 		const auto radius = st::msgServiceGiftBoxRadius;
 		p.setPen(Qt::NoPen);
 		p.setBrush(context.st->msgServiceBg());
-		p.drawRoundedRect(QRect(0, 0, width(), height()), radius, radius);
+		const auto rect = QRect(0, 0, width(), height());
+		if (parent()->data()->inlineReplyKeyboard()) {
+			const auto half = rect.height() / 2;
+			p.setClipRect(rect - QMargins(0, 0, 0, half));
+			p.drawRoundedRect(rect, radius, radius);
+			p.setClipRect(rect - QMargins(0, rect.height() - half, 0, 0));
+			const auto small = Ui::BubbleRadiusSmall();
+			p.drawRoundedRect(rect, small, small);
+			p.setClipping(false);
+		} else {
+			p.drawRoundedRect(rect, radius, radius);
+		}
 	}
 
+	const auto fullSelection = context.selected();
 	auto translated = 0;
+	auto symbolOffset = uint16(0);
 	for (const auto &entry : _entries) {
 		const auto raw = entry.object.get();
 		const auto height = raw->height();
-		raw->draw(p, this, context, outer);
+		const auto length = raw->fullSelectionLength();
+		if (length > 0 && !fullSelection) {
+			const auto local = UnshiftItemSelection(
+				context.selection,
+				symbolOffset);
+			raw->draw(p, this, context.withSelection(local), outer);
+		} else {
+			raw->draw(p, this, context, outer);
+		}
 		translated += height;
+		symbolOffset = uint16(symbolOffset + length);
 		p.translate(0, height);
 	}
 	p.translate(0, -translated);
@@ -146,16 +184,34 @@ TextState MediaGeneric::textState(
 		return result;
 	}
 
+	if (_fullAreaLink && QRect(0, 0, width(), height()).contains(point)) {
+		result.link = _fullAreaLink;
+		return result;
+	}
+
+	auto symbolOffset = uint16(0);
 	for (const auto &entry : _entries) {
 		const auto raw = entry.object.get();
 		const auto height = raw->height();
+		const auto length = raw->fullSelectionLength();
 		if (point.y() >= 0 && point.y() < height) {
 			const auto part = raw->textState(point, request, outer);
 			result.link = part.link;
+			result.cursor = part.cursor;
+			if (length > 0) {
+				result.symbol = uint16(symbolOffset + part.symbol);
+				result.afterSymbol = part.afterSymbol;
+				result.overMessageText
+					= (part.cursor == CursorState::Text);
+			} else {
+				result.symbol = symbolOffset;
+			}
 			return result;
 		}
 		point.setY(point.y() - height);
+		symbolOffset = uint16(symbolOffset + length);
 	}
+	result.symbol = symbolOffset;
 	return result;
 }
 
@@ -172,6 +228,83 @@ void MediaGeneric::clickHandlerPressedChanged(
 	}
 }
 
+bool MediaGeneric::hasTextForCopy() const {
+	return fullSelectionLength() > 0;
+}
+
+uint16 MediaGeneric::fullSelectionLength() const {
+	auto total = uint16(0);
+	for (const auto &entry : _entries) {
+		total = uint16(total + entry.object->fullSelectionLength());
+	}
+	return total;
+}
+
+TextForMimeData MediaGeneric::selectedText(TextSelection selection) const {
+	auto offset = uint16(0);
+	auto result = TextForMimeData();
+	for (const auto &entry : _entries) {
+		const auto length = entry.object->fullSelectionLength();
+		if (length > 0) {
+			auto part = entry.object->selectedText(
+				UnshiftItemSelection(selection, offset));
+			if (!part.empty()) {
+				if (result.empty()) {
+					result = std::move(part);
+				} else {
+					result.append('\n').append(std::move(part));
+				}
+			}
+		}
+		offset = uint16(offset + length);
+	}
+	return result;
+}
+
+TextSelection MediaGeneric::adjustSelection(
+		TextSelection selection,
+		TextSelectType type) const {
+	if (selection == FullSelection) {
+		return selection;
+	}
+	auto offset = uint16(0);
+	auto firstFrom = std::optional<uint16>();
+	auto firstOffset = uint16(0);
+	auto lastTo = uint16(0);
+	auto lastOffset = uint16(0);
+	for (const auto &entry : _entries) {
+		const auto length = entry.object->fullSelectionLength();
+		if (length > 0) {
+			const auto end = uint16(offset + length);
+			if (selection.from < end && selection.to > offset) {
+				const auto from = uint16((selection.from > offset)
+					? (selection.from - offset)
+					: 0);
+				const auto to = uint16((selection.to < end)
+					? (selection.to - offset)
+					: length);
+				const auto local = entry.object->adjustSelection(
+					{ from, to },
+					type);
+				if (!firstFrom.has_value()) {
+					firstFrom = local.from;
+					firstOffset = offset;
+				}
+				lastTo = local.to;
+				lastOffset = offset;
+			}
+		}
+		offset = uint16(offset + length);
+	}
+	if (!firstFrom.has_value()) {
+		return selection;
+	}
+	return {
+		uint16(firstOffset + *firstFrom),
+		uint16(lastOffset + lastTo),
+	};
+}
+
 std::unique_ptr<StickerPlayer> MediaGeneric::stickerTakePlayer(
 		not_null<DocumentData*> data,
 		const Lottie::ColorReplacements *replacements) {
@@ -203,6 +336,7 @@ bool MediaGeneric::hasHeavyPart() const {
 }
 
 void MediaGeneric::unloadHeavyPart() {
+	_paintBg = nullptr;
 	for (const auto &entry : _entries) {
 		entry.object->unloadHeavyPart();
 	}
@@ -223,12 +357,15 @@ QMargins MediaGeneric::inBubblePadding() const {
 MediaGenericTextPart::MediaGenericTextPart(
 	TextWithEntities text,
 	QMargins margins,
+	const style::TextStyle &st,
 	const base::flat_map<uint16, ClickHandlerPtr> &links,
-	const std::any &context)
+	const Ui::Text::MarkedContext &context,
+	style::align align)
 : _text(st::msgMinWidth)
-, _margins(margins) {
+, _margins(margins)
+, _align(align) {
 	_text.setMarkedText(
-		st::defaultTextStyle,
+		st,
 		text,
 		kMarkupTextOptions,
 		context);
@@ -242,53 +379,101 @@ void MediaGenericTextPart::draw(
 		not_null<const MediaGeneric*> owner,
 		const PaintContext &context,
 		int outerWidth) const {
-	const auto service = owner->service();
-	p.setPen(service
-		? context.st->msgServiceFg()
-		: context.messageStyle()->historyTextFg);
+	const auto use = (width() - _margins.left() - _margins.right());
+	setupPen(p, owner, context);
 	_text.draw(p, {
-		.position = { (outerWidth - width()) / 2, _margins.top() },
+		.position = {
+			((_align == style::al_top)
+				? ((outerWidth - use) / 2)
+				: _margins.left()),
+			_margins.top(),
+		},
 		.outerWidth = outerWidth,
-		.availableWidth = width(),
-		.align = style::al_top,
-		.palette = &(service
+		.availableWidth = use,
+		.align = _align,
+		.palette = &(owner->service()
 			? context.st->serviceTextPalette()
 			: context.messageStyle()->textPalette),
 		.spoiler = Ui::Text::DefaultSpoilerCache(),
 		.now = context.now,
 		.pausedEmoji = context.paused || On(PowerSaving::kEmojiChat),
 		.pausedSpoiler = context.paused || On(PowerSaving::kChatSpoiler),
+		.selection = context.selection,
+		.elisionLines = elisionLines(),
 	});
 }
 
+void MediaGenericTextPart::setupPen(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context) const {
+	const auto service = owner->service();
+	p.setPen(service
+		? context.st->msgServiceFg()
+		: context.messageStyle()->historyTextFg);
+}
+
+int MediaGenericTextPart::elisionLines() const {
+	return 0;
+}
+
 TextState MediaGenericTextPart::textState(
 		QPoint point,
 		StateRequest request,
 		int outerWidth) const {
-	point -= QPoint{ (outerWidth - width()) / 2, _margins.top() };
-	auto result = TextState();
+	const auto use = (width() - _margins.left() - _margins.right());
+	point -= QPoint{
+		((_align == style::al_top)
+			? ((outerWidth - use) / 2)
+			: _margins.left()),
+		_margins.top(),
+	};
 	auto forText = request.forText();
-	forText.align = style::al_top;
-	result.link = _text.getState(point, width(), forText).link;
-	return result;
+	forText.align = _align;
+	return TextState(nullptr, _text.getState(point, use, forText));
+}
+
+uint16 MediaGenericTextPart::fullSelectionLength() const {
+	return _text.length();
+}
+
+TextSelection MediaGenericTextPart::adjustSelection(
+		TextSelection selection,
+		TextSelectType type) const {
+	return _text.adjustSelection(selection, type);
+}
+
+TextForMimeData MediaGenericTextPart::selectedText(
+		TextSelection selection) const {
+	return _text.toTextForMimeData(selection);
 }
 
 QSize MediaGenericTextPart::countOptimalSize() {
+	const auto lines = elisionLines();
+	const auto height = lines
+		? std::min(_text.minHeight(), lines * _text.style()->font->height)
+		: _text.minHeight();
 	return {
 		_margins.left() + _text.maxWidth() + _margins.right(),
-		_margins.top() + _text.minHeight() + _margins.bottom(),
+		_margins.top() + height + _margins.bottom(),
 	};
 }
 
 QSize MediaGenericTextPart::countCurrentSize(int newWidth) {
 	auto skip = _margins.left() + _margins.right();
-	const auto size = CountOptimalTextSize(
-		_text,
-		st::msgMinWidth,
-		newWidth - skip);
+	const auto size = (_align == style::al_top)
+		? Ui::Text::CountOptimalTextSize(
+			_text,
+			st::msgMinWidth,
+			std::max(st::msgMinWidth, newWidth - skip))
+		: QSize(newWidth - skip, _text.countHeight(newWidth - skip));
+	const auto lines = elisionLines();
+	const auto height = lines
+		? std::min(size.height(), lines * _text.style()->font->height)
+		: size.height();
 	return {
 		size.width() + skip,
-		_margins.top() + size.height() + _margins.bottom(),
+		_margins.top() + height + _margins.bottom(),
 	};
 }
 
@@ -343,6 +528,35 @@ QSize TextDelimeterPart::countCurrentSize(int newWidth) {
 	return { newWidth, minHeight() };
 }
 
+LambdaGenericPart::LambdaGenericPart(
+	QSize size,
+	Fn<void(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth)> draw)
+: _size(size)
+, _draw(std::move(draw)) {
+}
+
+void LambdaGenericPart::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	if (_draw) {
+		_draw(p, owner, context, outerWidth);
+	}
+}
+
+QSize LambdaGenericPart::countOptimalSize() {
+	return _size;
+}
+
+QSize LambdaGenericPart::countCurrentSize(int newWidth) {
+	return { newWidth, _size.height() };
+}
+
 StickerInBubblePart::StickerInBubblePart(
 	not_null<Element*> parent,
 	Element *replacing,
@@ -429,13 +643,13 @@ void StickerInBubblePart::ensureCreated(Element *replacing) const {
 		return;
 	} else if (const auto data = _lookup()) {
 		const auto sticker = data.sticker;
-		if (const auto info = sticker->sticker()) {
+		if (sticker->sticker()) {
 			const auto skipPremiumEffect = true;
 			_link = data.link;
 			_skipTop = data.skipTop;
 			_sticker.emplace(_parent, sticker, skipPremiumEffect, replacing);
-			if (data.singleTimePlayback) {
-				_sticker->setDiceIndex(info->alt, 1);
+			if (data.stopOnLastFrame) {
+				_sticker->setStopOnLastFrame(true);
 			}
 			_sticker->initSize(data.size);
 			_sticker->setCustomCachingTag(data.cacheTag);
@@ -545,7 +759,7 @@ void StickerWithBadgePart::paintBadge(
 void StickerWithBadgePart::validateBadge(
 		const PaintContext &context) const {
 	const auto stm = context.messageStyle();
-	const auto &badgeFg = stm->historyFileRadialFg->c;
+	const auto &badgeFg = st::premiumButtonFg->c;
 	const auto &badgeBorder = stm->msgBg->c;
 	if (!_badge.isNull()
 		&& _badgeFg == badgeFg
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_generic.h b/Telegram/SourceFiles/history/view/media/history_view_media_generic.h
index f406e44490d665..3f7aa7e7a13851 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_generic.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_generic.h
@@ -15,12 +15,26 @@ class DynamicImage;
 class RippleAnimation;
 } // namespace Ui
 
+namespace style {
+struct TextStyle;
+} // namespace style
+
+namespace st {
+extern const style::TextStyle &defaultTextStyle;
+} // namespace st
+
 namespace HistoryView {
 
 class MediaGeneric;
 
 class MediaGenericPart : public Object {
 public:
+	using PaintBg = Fn<void(
+		Painter&,
+		const PaintContext&,
+		not_null<const MediaGeneric*>)>;
+	using PaintBgFactory = Fn<PaintBg()>;
+
 	virtual ~MediaGenericPart() = default;
 
 	virtual void draw(
@@ -41,11 +55,20 @@ class MediaGenericPart : public Object {
 		not_null<DocumentData*> data,
 		const Lottie::ColorReplacements *replacements
 	) -> std::unique_ptr<StickerPlayer>;
+
+	[[nodiscard]] virtual uint16 fullSelectionLength() const;
+	[[nodiscard]] virtual TextSelection adjustSelection(
+		TextSelection selection,
+		TextSelectType type) const;
+	[[nodiscard]] virtual TextForMimeData selectedText(
+		TextSelection selection) const;
 };
 
 struct MediaGenericDescriptor {
 	int maxWidth = 0;
-	ClickHandlerPtr serviceLink;
+	MediaGenericPart::PaintBgFactory paintBgFactory;
+	ClickHandlerPtr fullAreaLink;
+	bool expandCurrentWidth = false;
 	bool service = false;
 	bool hideServiceText = false;
 };
@@ -56,7 +79,9 @@ class MediaGeneric final : public Media {
 
 	MediaGeneric(
 		not_null<Element*> parent,
-		Fn<void(Fn<void(std::unique_ptr<Part>)>)> generate,
+		Fn<void(
+			not_null<MediaGeneric*>,
+			Fn<void(std::unique_ptr<Part>)>)> generate,
 		MediaGenericDescriptor &&descriptor = {});
 	~MediaGeneric();
 
@@ -67,6 +92,14 @@ class MediaGeneric final : public Media {
 	void draw(Painter &p, const PaintContext &context) const override;
 	TextState textState(QPoint point, StateRequest request) const override;
 
+	[[nodiscard]] bool hasTextForCopy() const override;
+	[[nodiscard]] TextForMimeData selectedText(
+		TextSelection selection) const override;
+	[[nodiscard]] TextSelection adjustSelection(
+		TextSelection selection,
+		TextSelectType type) const override;
+	[[nodiscard]] uint16 fullSelectionLength() const override;
+
 	void clickHandlerActiveChanged(
 		const ClickHandlerPtr &p,
 		bool active) override;
@@ -110,19 +143,25 @@ class MediaGeneric final : public Media {
 	[[nodiscard]] QMargins inBubblePadding() const;
 
 	std::vector<Entry> _entries;
+	Part::PaintBgFactory _paintBgFactory;
+	mutable Part::PaintBg _paintBg;
+	ClickHandlerPtr _fullAreaLink;
 	int _maxWidthCap = 0;
+	bool _expandCurrentWidth : 1 = false;
 	bool _service : 1 = false;
 	bool _hideServiceText : 1 = false;
 
 };
 
-class MediaGenericTextPart final : public MediaGenericPart {
+class MediaGenericTextPart : public MediaGenericPart {
 public:
 	MediaGenericTextPart(
 		TextWithEntities text,
 		QMargins margins,
+		const style::TextStyle &st = st::defaultTextStyle,
 		const base::flat_map<uint16, ClickHandlerPtr> &links = {},
-		const std::any &context = {});
+		const Ui::Text::MarkedContext &context = {},
+		style::align align = style::al_top);
 
 	void draw(
 		Painter &p,
@@ -134,12 +173,27 @@ class MediaGenericTextPart final : public MediaGenericPart {
 		StateRequest request,
 		int outerWidth) const override;
 
+	[[nodiscard]] uint16 fullSelectionLength() const override;
+	[[nodiscard]] TextSelection adjustSelection(
+		TextSelection selection,
+		TextSelectType type) const override;
+	[[nodiscard]] TextForMimeData selectedText(
+		TextSelection selection) const override;
+
 	QSize countOptimalSize() override;
 	QSize countCurrentSize(int newWidth) override;
 
+protected:
+	virtual void setupPen(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context) const;
+	virtual int elisionLines() const;
+
 private:
 	Ui::Text::String _text;
 	QMargins _margins;
+	style::align _align = {};
 
 };
 
@@ -162,6 +216,35 @@ class TextDelimeterPart final : public MediaGenericPart {
 
 };
 
+class LambdaGenericPart final : public MediaGenericPart {
+public:
+	LambdaGenericPart(
+		QSize size,
+		Fn<void(
+			Painter &p,
+			not_null<const MediaGeneric*> owner,
+			const PaintContext &context,
+			int outerWidth)> draw);
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
+private:
+	QSize _size;
+	Fn<void(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth)> _draw;
+
+};
+
 class StickerInBubblePart final : public MediaGenericPart {
 public:
 	struct Data {
@@ -169,7 +252,7 @@ class StickerInBubblePart final : public MediaGenericPart {
 		int skipTop = 0;
 		int size = 0;
 		ChatHelpers::StickerLottieSize cacheTag = {};
-		bool singleTimePlayback = false;
+		bool stopOnLastFrame = false;
 		ClickHandlerPtr link;
 
 		explicit operator bool() const {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
index 5cf80255f596ef..ac98500078d0bb 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
+#include "history/view/history_view_message.h"
 #include "data/data_document.h"
 #include "data/data_media_types.h"
 #include "data/data_session.h"
@@ -30,6 +31,10 @@ For license and copyright information please follow this link:
 namespace HistoryView {
 namespace {
 
+[[nodiscard]] bool IsHostedInstantViewMedia(not_null<const Element*> parent) {
+	return parent->Get<InstantViewMediaRuntime>() != nullptr;
+}
+
 std::vector<Ui::GroupMediaLayout> LayoutPlaylist(
 		const std::vector<QSize> &sizes) {
 	Expects(!sizes.empty());
@@ -146,6 +151,13 @@ QSize GroupedMedia::countOptimalSize() {
 			media->initDimensions();
 			accumulate_max(maxWidth, media->maxWidth());
 		}
+		auto index = 0;
+		for (const auto &part : _parts) {
+			const auto last = (++index == _parts.size());
+			accumulate_max(
+				maxWidth,
+				part.content->widenGroupingMaxWidth(maxWidth, last));
+		}
 	}
 	auto index = 0;
 	for (const auto &part : _parts) {
@@ -172,7 +184,9 @@ QSize GroupedMedia::countOptimalSize() {
 		_parts[i].sides = item.sides;
 	}
 
-	if (_mode == Mode::Column && _parts.back().item->emptyText()) {
+	if (_mode == Mode::Column
+		&& isBubbleBottom()
+		&& _parts.back().item->emptyText()) {
 		const auto item = _parent->data();
 		const auto msgsigned = item->Get<HistoryMessageSigned>();
 		const auto views = item->Get<HistoryMessageViews>();
@@ -191,7 +205,11 @@ QSize GroupedMedia::countOptimalSize() {
 }
 
 QSize GroupedMedia::countCurrentSize(int newWidth) {
-	accumulate_min(newWidth, maxWidth());
+	const auto hostedInstantView = (_mode == Mode::Grid)
+		&& IsHostedInstantViewMedia(_parent);
+	if (!hostedInstantView) {
+		accumulate_min(newWidth, maxWidth());
+	}
 	auto newHeight = 0;
 	if (_mode == Mode::Grid && newWidth < st::historyGroupWidthMin) {
 		return { newWidth, newHeight };
@@ -236,7 +254,9 @@ QSize GroupedMedia::countCurrentSize(int newWidth) {
 			accumulate_max(newHeight, top + height);
 		}
 	}
-	if (_mode == Mode::Column && _parts.back().item->emptyText()) {
+	if (_mode == Mode::Column
+		&& isBubbleBottom()
+		&& _parts.back().item->emptyText()) {
 		const auto item = _parent->data();
 		const auto msgsigned = item->Get<HistoryMessageSigned>();
 		const auto views = item->Get<HistoryMessageViews>();
@@ -297,6 +317,15 @@ QMargins GroupedMedia::groupedPadding() const {
 		(normal.bottom() - grouped.bottom()) + addToBottom);
 }
 
+QRect GroupedMedia::groupItemRect(int index) const {
+	if (index >= 0 && index < int(_parts.size())) {
+		return _parts[index].geometry.translated(
+			0,
+			groupedPadding().top());
+	}
+	return {};
+}
+
 Media *GroupedMedia::lookupSpoilerTagMedia() const {
 	if (_parts.empty()) {
 		return nullptr;
@@ -387,13 +416,15 @@ void GroupedMedia::draw(Painter &p, const PaintContext &context) const {
 	auto nowCache = false;
 	const auto groupPadding = groupedPadding();
 	auto selection = context.selection;
-	const auto fullSelection = (selection == FullSelection);
+	const auto fullSelection = context.selected();
 	const auto textSelection = (_mode == Mode::Column)
 		&& !fullSelection
 		&& !IsSubGroupSelection(selection);
 	const auto inWebPage = (_parent->media() != this);
 	constexpr auto kSmall = Ui::BubbleCornerRounding::Small;
-	const auto rounding = inWebPage
+	const auto rounding = IsHostedInstantViewMedia(_parent)
+		? Ui::BubbleRounding()
+		: inWebPage
 		? Ui::BubbleRounding{ kSmall, kSmall, kSmall, kSmall }
 		: adjustedBubbleRounding();
 	auto highlight = context.highlight.range;
@@ -488,7 +519,7 @@ TextState GroupedMedia::getPartState(
 				part.sides,
 				point,
 				request);
-			result.symbol += shift;
+			AddTextStateOffset(&result, uint16(shift));
 			result.itemId = part.item->fullId();
 			return result;
 		}
@@ -867,10 +898,32 @@ QPoint GroupedMedia::resolveCustomInfoRightBottom() const {
 	return QPoint(width() - skipx, height() - skipy);
 }
 
+std::optional<PaidInformation> GroupedMedia::paidInformation() const {
+	auto result = PaidInformation();
+	for (const auto &part : _parts) {
+		++result.messages;
+		result.stars += part.item->starsPaid();
+	}
+	return result;
+}
+
 bool GroupedMedia::enforceBubbleWidth() const {
 	return _mode == Mode::Grid;
 }
 
+int GroupedMedia::contributedMaxMonospaceWidth() const {
+	if (_mode != Mode::Column) {
+		return 0;
+	}
+	auto result = 0;
+	for (const auto &part : _parts) {
+		accumulate_max(
+			result,
+			part.content->contributedMaxMonospaceWidth());
+	}
+	return result;
+}
+
 bool GroupedMedia::computeNeedBubble() const {
 	Expects(_mode == Mode::Column || _captionItem.has_value());
 
@@ -893,9 +946,11 @@ bool GroupedMedia::computeNeedBubble() const {
 }
 
 bool GroupedMedia::needInfoDisplay() const {
+	const auto item = _parent->data();
 	return (_mode != Mode::Column)
-		&& (_parent->data()->isSending()
-			|| _parent->data()->hasFailed()
+		&& (item->isSending()
+			|| item->awaitingVideoProcessing()
+			|| item->hasFailed()
 			|| _parent->isUnderCursor()
 			|| (_parent->delegate()->elementContext() == Context::ChatPreview)
 			|| _parent->isLastAndSelfMessage());
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
index 459eb4b1c4f230..7845c778eda5ce 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
@@ -93,10 +93,13 @@ class GroupedMedia : public Media {
 	bool allowsFastShare() const override {
 		return true;
 	}
+	std::optional<PaidInformation> paidInformation() const override;
 	bool customHighlight() const override {
 		return true;
 	}
+	QRect groupItemRect(int index) const override;
 	bool enforceBubbleWidth() const override;
+	int contributedMaxMonospaceWidth() const override;
 
 	void stopAnimation() override;
 	void checkAnimation() override;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
index 8f8b15ecf7a913..413538c213c84a 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
@@ -218,7 +218,7 @@ UnwrappedMedia::SurroundingInfo UnwrappedMedia::surroundingInfo(
 		panelHeight += reply->height()
 			- ((forwarded || via) ? 0 : replyMargins.top())
 			- replyMargins.bottom();
-	} else {
+	} else if (panelHeight) {
 		panelHeight += st::msgReplyPadding.bottom();
 	}
 	const auto total = (topicSize.isEmpty() ? 0 : topicSize.height())
@@ -580,7 +580,10 @@ QPoint UnwrappedMedia::resolveCustomInfoRightBottom() const {
 	const auto fullRight = calculateFullRight(inner);
 	const auto skipx = st::msgDateImgPadding.x();
 	const auto skipy = st::msgDateImgPadding.y();
-	return QPoint(fullRight - skipx, fullBottom - skipy);
+	const auto infoWidth = _parent->infoWidth()
+		+ st::msgDateImgPadding.x() * 2
+		+ st::msgReplyPadding.left();
+	return QPoint(fullRight - skipx - infoWidth, fullBottom - skipy);
 }
 
 std::unique_ptr<StickerPlayer> UnwrappedMedia::stickerTakePlayer(
@@ -664,7 +667,7 @@ int UnwrappedMedia::additionalWidth(
 		accumulate_max(result, 2 * st::msgReplyPadding.left() + via->maxWidth + st::msgReplyPadding.right());
 	}
 	if (reply) {
-		accumulate_max(result, reply->maxWidth());
+		accumulate_max(result, st::msgReplyPadding.left() + reply->maxWidth());
 	}
 	return result;
 }
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h
index 0259392d6fd63b..bf2c406c87695a 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h
@@ -58,6 +58,9 @@ class UnwrappedMedia final : public Media {
 		virtual bool hasTextForCopy() const {
 			return false;
 		}
+		virtual bool updateItemData() {
+			return false;
+		}
 		virtual ~Content() = default;
 	};
 
@@ -93,6 +96,10 @@ class UnwrappedMedia final : public Media {
 	std::optional<int> reactionButtonCenterOverride() const override;
 	QPoint resolveCustomInfoRightBottom() const override;
 
+	bool updateItemData() override {
+		return _content->updateItemData();
+	}
+
 	void stickerClearLoopPlayed() override {
 		_content->stickerClearLoopPlayed();
 	}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_no_forwards_request.cpp b/Telegram/SourceFiles/history/view/media/history_view_no_forwards_request.cpp
new file mode 100644
index 00000000000000..5c3c5ea6a500ce
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_no_forwards_request.cpp
@@ -0,0 +1,137 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/media/history_view_no_forwards_request.h"
+
+#include "data/data_peer.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
+#include "history/view/history_view_element.h"
+#include "history/view/media/history_view_media_generic.h"
+#include "lang/lang_keys.h"
+#include "ui/chat/chat_style.h"
+#include "ui/painter.h"
+#include "ui/text/text_utilities.h"
+#include "styles/style_chat.h"
+
+namespace HistoryView {
+namespace {
+
+class BulletPointPart final : public MediaGenericTextPart {
+public:
+	BulletPointPart(
+		TextWithEntities text,
+		QMargins margins);
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+
+private:
+	int _bulletLeft = 0;
+	int _bulletTop = 0;
+
+};
+
+BulletPointPart::BulletPointPart(
+	TextWithEntities text,
+	QMargins margins)
+: MediaGenericTextPart(
+	std::move(text),
+	QMargins(
+		margins.left() + st::chatSuggestBulletLeftExtra + st::historyGroupAboutBulletSkip,
+		margins.top(),
+		margins.right(),
+		margins.bottom()),
+	st::serviceTextStyle,
+	{},
+	{},
+	style::al_left)
+, _bulletLeft(margins.left() + st::chatSuggestBulletLeftExtra)
+, _bulletTop(margins.top()) {
+}
+
+void BulletPointPart::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	MediaGenericTextPart::draw(p, owner, context, outerWidth);
+
+	const auto &font = st::serviceTextStyle.font;
+	const auto size = st::mediaUnreadSize;
+	const auto top = _bulletTop + (font->height - size) / 2;
+
+	p.setBrush(context.st->msgServiceFg());
+
+	PainterHighQualityEnabler hq(p);
+	p.setPen(Qt::NoPen);
+	p.drawEllipse(_bulletLeft, top, size, size);
+}
+
+} // namespace
+
+auto GenerateNoForwardsRequestMedia(
+	not_null<Element*> parent,
+	not_null<const HistoryServiceNoForwardsRequest*> request)
+-> Fn<void(
+	not_null<MediaGeneric*>,
+	Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](
+			not_null<MediaGeneric*> media,
+			Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
+		const auto item = parent->data();
+		const auto from = item->from();
+
+		auto pushText = [&](
+				TextWithEntities text,
+				QMargins margins,
+				style::align align = style::al_left) {
+			push(std::make_unique<MediaGenericTextPart>(
+				std::move(text),
+				margins,
+				st::serviceTextStyle,
+				base::flat_map<uint16, ClickHandlerPtr>(),
+				Ui::Text::MarkedContext(),
+				align));
+		};
+
+		pushText(
+			(from->isSelf()
+				? tr::lng_action_no_forwards_request_you(
+					tr::now,
+					tr::marked)
+				: tr::lng_action_no_forwards_request(
+					tr::now,
+					lt_from,
+					tr::bold(from->shortName()),
+					tr::marked)),
+			st::chatSuggestInfoTitleMargin,
+			style::al_top);
+
+		const auto features = {
+			tr::lng_action_no_forwards_feature_forwarding(tr::now),
+			tr::lng_action_no_forwards_feature_saving(tr::now),
+			tr::lng_action_no_forwards_feature_copying(tr::now),
+		};
+		auto isLast = false;
+		auto index = 0;
+		const auto count = int(features.size());
+		for (const auto &feature : features) {
+			isLast = (++index == count);
+			push(std::make_unique<BulletPointPart>(
+				TextWithEntities{ feature },
+				isLast
+					? st::chatSuggestInfoLastMargin
+					: st::chatSuggestInfoMiddleMargin));
+		}
+	};
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_no_forwards_request.h b/Telegram/SourceFiles/history/view/media/history_view_no_forwards_request.h
new file mode 100644
index 00000000000000..7ac6d49a64a608
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_no_forwards_request.h
@@ -0,0 +1,25 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+struct HistoryServiceNoForwardsRequest;
+
+namespace HistoryView {
+
+class Element;
+class MediaGeneric;
+class MediaGenericPart;
+
+auto GenerateNoForwardsRequestMedia(
+	not_null<Element*> parent,
+	not_null<const HistoryServiceNoForwardsRequest*> request
+) -> Fn<void(
+	not_null<MediaGeneric*>,
+	Fn<void(std::unique_ptr<MediaGenericPart>)>)>;
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index ff7c4872e11dc9..b86e8dfb76e219 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "history/history.h"
 #include "history/view/history_view_element.h"
+#include "history/view/history_view_message.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/media/history_view_media_common.h"
 #include "history/view/media/history_view_media_spoiler.h"
@@ -53,6 +54,18 @@ constexpr auto kStoryHeight = 1280;
 
 using Data::PhotoSize;
 
+[[nodiscard]] bool IsHostedInstantViewMedia(not_null<const Element*> parent) {
+	return parent->Get<InstantViewMediaRuntime>() != nullptr;
+}
+
+[[nodiscard]] QSize PhotoDesiredMediaSize(
+		QSize dimensions,
+		bool hostedInstantView) {
+	return hostedInstantView
+		? NonEmptySize(style::ConvertScale(dimensions))
+		: CountDesiredMediaSize(dimensions);
+}
+
 } // namespace
 
 struct Photo::Streamed {
@@ -196,24 +209,31 @@ QSize Photo::countOptimalSize() {
 	if (_serviceWidth > 0) {
 		return { int(_serviceWidth), int(_serviceWidth) };
 	}
+	const auto hostedInstantView = IsHostedInstantViewMedia(_parent);
 	const auto dimensions = photoSize();
-	const auto scaled = CountDesiredMediaSize(dimensions);
+	const auto scaled = PhotoDesiredMediaSize(dimensions, hostedInstantView);
+	const auto maxMediaWidth = hostedInstantView
+		? std::max(scaled.width(), st::maxMediaSize)
+		: st::maxMediaSize;
 	const auto minWidth = std::clamp(
 		_parent->minWidthForMedia(),
 		(_parent->hasBubble()
 			? st::historyPhotoBubbleMinWidth
 			: st::minPhotoSize),
-		st::maxMediaSize);
+		maxMediaWidth);
 	const auto maxActualWidth = qMax(scaled.width(), minWidth);
 	auto maxWidth = qMax(maxActualWidth, scaled.height());
 	auto minHeight = qMax(scaled.height(), st::minPhotoSize);
 	if (_parent->hasBubble()) {
+		const auto botTop = _parent->Get<FakeBotAboutTop>();
 		const auto captionMaxWidth = _parent->textualMaxWidth();
-		const auto maxWithCaption = qMin(st::msgMaxWidth, captionMaxWidth);
-		maxWidth = qMin(qMax(maxWidth, maxWithCaption), st::msgMaxWidth);
-		minHeight = adjustHeightForLessCrop(
-			dimensions,
-			{ maxWidth, minHeight });
+		if (botTop || !_parent->data()->isFakeAboutView()) {
+			const auto maxWithCaption = qMin(st::msgMaxWidth, captionMaxWidth);
+			maxWidth = qMin(qMax(maxWidth, maxWithCaption), st::msgMaxWidth);
+			minHeight = adjustHeightForLessCrop(
+				dimensions,
+				{ maxWidth, minHeight });
+		}
 	}
 	return { maxWidth, minHeight };
 }
@@ -222,7 +242,10 @@ QSize Photo::countCurrentSize(int newWidth) {
 	if (_serviceWidth) {
 		return { int(_serviceWidth), int(_serviceWidth) };
 	}
-	const auto thumbMaxWidth = qMin(newWidth, st::maxMediaSize);
+	const auto hostedInstantView = IsHostedInstantViewMedia(_parent);
+	const auto thumbMaxWidth = hostedInstantView
+		? std::max(newWidth, 1)
+		: qMin(newWidth, st::maxMediaSize);
 	const auto minWidth = std::clamp(
 		_parent->minWidthForMedia(),
 		qMin(thumbMaxWidth, _parent->hasBubble()
@@ -230,14 +253,15 @@ QSize Photo::countCurrentSize(int newWidth) {
 			: st::minPhotoSize),
 		thumbMaxWidth);
 	const auto dimensions = photoSize();
+	const auto desired = PhotoDesiredMediaSize(dimensions, hostedInstantView);
 	auto pix = _data->extendedMediaVideoDuration()
 		? CountMediaSize(
-			CountDesiredMediaSize(dimensions),
+			desired,
 			newWidth)
 		: CountPhotoMediaSize(
-			CountDesiredMediaSize(dimensions),
+			desired,
 			newWidth,
-			maxWidth());
+			hostedInstantView ? newWidth : maxWidth());
 	newWidth = qMax(pix.width(), minWidth);
 	auto newHeight = qMax(pix.height(), st::minPhotoSize);
 	if (_parent->hasBubble()) {
@@ -246,11 +270,15 @@ QSize Photo::countCurrentSize(int newWidth) {
 		if (botTop) {
 			accumulate_max(captionMaxWidth, botTop->maxWidth);
 		}
-		const auto maxWithCaption = qMin(st::msgMaxWidth, captionMaxWidth);
-		newWidth = qMin(qMax(newWidth, maxWithCaption), thumbMaxWidth);
-		newHeight = adjustHeightForLessCrop(
-			dimensions,
-			{ newWidth, newHeight });
+		if (botTop || !_parent->data()->isFakeAboutView()) {
+			const auto maxWithCaption = qMin(
+				st::msgMaxWidth,
+				captionMaxWidth);
+			newWidth = qMin(qMax(newWidth, maxWithCaption), thumbMaxWidth);
+			newHeight = adjustHeightForLessCrop(
+				dimensions,
+				{ newWidth, newHeight });
+		}
 	}
 	if (newWidth >= maxWidth()) {
 		newHeight = qMin(newHeight, minHeight());
@@ -293,6 +321,7 @@ void Photo::draw(Painter &p, const PaintContext &context) const {
 	const auto loaded = preview || _dataMedia->loaded();
 	const auto displayLoading = !preview && _data->displayLoading();
 
+	const auto hostedInstantView = IsHostedInstantViewMedia(_parent);
 	auto inWebPage = (_parent->media() != this);
 	auto paintx = 0, painty = 0, paintw = width(), painth = height();
 	auto bubble = _parent->hasBubble();
@@ -309,10 +338,12 @@ void Photo::draw(Painter &p, const PaintContext &context) const {
 	if (_serviceWidth > 0) {
 		paintUserpicFrame(p, context, rthumb.topLeft());
 	} else {
-		const auto rounding = inWebPage
+		const auto rounding = hostedInstantView
+			? std::optional<Ui::BubbleRounding>(Ui::BubbleRounding())
+			: inWebPage
 			? std::optional<Ui::BubbleRounding>()
 			: adjustedBubbleRounding();
-		if (!bubble) {
+		if (!bubble && !hostedInstantView) {
 			Assert(rounding.has_value());
 			fillImageShadow(p, rthumb, *rounding, context);
 		}
@@ -529,8 +560,8 @@ QImage Photo::prepareImageCacheWithLarge(QSize outer, Image *large) const {
 		blurred = thumbnail;
 	} else if (const auto small = _dataMedia->image(Size::Small)) {
 		blurred = small;
-	} else {
-		blurred = large;
+		} else {
+			blurred = large;
 	}
 	const auto resize = large
 		? ::Media::Streaming::DecideFrameResize(outer, large->size())
@@ -539,9 +570,9 @@ QImage Photo::prepareImageCacheWithLarge(QSize outer, Image *large) const {
 }
 
 void Photo::paintUserpicFrame(
-		Painter &p,
-		QPoint photoPosition,
-		bool markFrameShown) const {
+	Painter &p,
+	QPoint photoPosition,
+	bool markFrameShown) const {
 	const auto autoplay = _data->videoCanBePlayed()
 		&& videoAutoplayEnabled();
 	const auto startPlay = autoplay && !_streamed;
@@ -596,9 +627,9 @@ void Photo::paintUserpicFrame(
 }
 
 void Photo::paintUserpicFrame(
-		Painter &p,
-		const PaintContext &context,
-		QPoint photoPosition) const {
+	Painter &p,
+	const PaintContext &context,
+	QPoint photoPosition) const {
 	paintUserpicFrame(p, photoPosition, !context.paused);
 
 	if (_data->videoCanBePlayed() && !_streamed) {
@@ -628,6 +659,9 @@ void Photo::paintUserpicFrame(
 QSize Photo::photoSize() const {
 	if (_storyId) {
 		return { kStoryWidth, kStoryHeight };
+	} else if (_parent->data()->isFakeAboutView()
+		&& !_parent->Get<FakeBotAboutTop>()) {
+		return { st::managedBotImageWidth, st::managedBotImageHeight };
 	}
 	return QSize(_data->width(), _data->height());
 }
@@ -946,7 +980,7 @@ bool Photo::createStreamingObjects() {
 			_data,
 			_realParent->fullId())));
 	_streamed->instance.player().updates(
-	) | rpl::start_with_next_error([=](Update &&update) {
+	) | rpl::on_next_error([=](Update &&update) {
 		handleStreamingUpdate(std::move(update));
 	}, [=](Error &&error) {
 		handleStreamingError(std::move(error));
@@ -979,14 +1013,15 @@ void Photo::handleStreamingUpdate(::Media::Streaming::Update &&update) {
 
 	v::match(update.data, [&](Information &update) {
 		streamingReady(std::move(update));
-	}, [&](const PreloadedVideo &update) {
-	}, [&](const UpdateVideo &update) {
+	}, [](PreloadedVideo) {
+	}, [&](UpdateVideo) {
 		repaintStreamedContent();
-	}, [&](const PreloadedAudio &update) {
-	}, [&](const UpdateAudio &update) {
-	}, [&](const WaitingForData &update) {
-	}, [&](MutedByOther) {
-	}, [&](Finished) {
+	}, [](PreloadedAudio) {
+	}, [](UpdateAudio) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
+	}, [](Finished) {
 	});
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.h b/Telegram/SourceFiles/history/view/media/history_view_photo.h
index 710901f76296ff..14c6f83448533c 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.h
@@ -114,7 +114,6 @@ class Photo final : public File {
 
 	void ensureDataMediaCreated() const;
 	void dataMediaCreated() const;
-	void setupSpoilerTag() const;
 
 	QSize countOptimalSize() override;
 	QSize countCurrentSize(int newWidth) override;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
index 72b1df9ba4db30..af67d95642e46f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
@@ -7,15 +7,27 @@ For license and copyright information please follow this link:
 */
 #include "history/view/media/history_view_poll.h"
 
-#include "core/ui_integration.h" // Core::MarkedTextContext.
+#include "core/click_handler_types.h"
+#include "core/ui_integration.h" // TextContext
+#include "data/data_cloud_file.h"
+#include "data/data_location.h"
 #include "lang/lang_keys.h"
+#include "lang/lang_tag.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/history_item_components.h"
 #include "history/view/history_view_message.h"
 #include "history/view/history_view_cursor_state.h"
+#include "history/view/history_view_reaction_preview.h"
+#include "history/view/history_view_text_helper.h"
+#include "history/view/media/menu/history_view_poll_menu.h"
 #include "calls/calls_instance.h"
+#include "ui/widgets/dropdown_menu.h"
+#include "ui/widgets/menu/menu_action.h"
 #include "ui/chat/message_bubble.h"
 #include "ui/chat/chat_style.h"
+#include "ui/image/image.h"
+#include "ui/item_text_options.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
 #include "ui/text/format_values.h"
@@ -25,19 +37,54 @@ For license and copyright information please follow this link:
 #include "ui/effects/fireworks_animation.h"
 #include "ui/toast/toast.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
+#include "poll/poll_link_thumbnail.h"
+#include "poll/poll_media_upload.h"
+#include "history/view/media/history_view_location.h"
+#include "history/view/media/history_view_media_common.h"
+#include "history/view/history_view_group_call_bar.h"
 #include "data/data_media_types.h"
+#include "data/data_document.h"
+#include "data/data_channel.h"
+#include "data/data_photo.h"
+#include "data/data_photo_media.h"
+#include "data/data_file_origin.h"
 #include "data/data_poll.h"
 #include "data/data_user.h"
 #include "data/data_session.h"
+#include "data/data_web_page.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "base/crc32hash.h"
 #include "base/unixtime.h"
 #include "base/timer.h"
+#include "base/qt/qt_key_modifiers.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
 #include "api/api_polls.h"
+#include "window/window_session_controller.h"
+#include "ui/layers/generic_box.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/widgets/labels.h"
+#include "history/view/controls/history_view_webpage_processor.h"
+#include "history/view/media/history_view_web_page.h"
+#include "history/admin_log/history_admin_log_item.h"
+#include "history/history.h"
+#include "ui/chat/chat_style.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/effects/path_shift_gradient.h"
+#include "window/themes/window_theme.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_polls.h"
 #include "styles/style_widgets.h"
 #include "styles/style_window.h"
 
+
 namespace HistoryView {
 namespace {
 
@@ -47,8 +94,33 @@ constexpr auto kRotateAmplitude = 3.;
 constexpr auto kScaleSegments = 2;
 constexpr auto kScaleAmplitude = 0.03;
 constexpr auto kRollDuration = crl::time(400);
-constexpr auto kLargestRadialDuration = 30 * crl::time(1000);
-constexpr auto kCriticalCloseDuration = 5 * crl::time(1000);
+constexpr auto kExpiringVoteRestrictionDuration = 10 * 60 * crl::time(1000);
+constexpr auto kVoteRestrictionToastDuration = 5 * crl::time(1000);
+
+[[nodiscard]] bool IsExpiringVoteRestriction(
+		PollData::VoteRestriction restriction) {
+	using Restriction = PollData::VoteRestriction;
+	return (restriction == Restriction::SubscribersOnly)
+		|| (restriction == Restriction::SubscribersJoinedTooRecently);
+}
+
+[[nodiscard]] int PollAnswerMediaSize() {
+	return st::historyPollRadio.diameter * 2;
+}
+
+[[nodiscard]] int PollAnswerMediaSkip() {
+	return st::historyPollPercentSkip * 2;
+}
+
+enum class PollThumbnailKind {
+	None,
+	Photo,
+	Document,
+	Audio,
+	Emoji,
+	Geo,
+	Webpage,
+};
 
 struct PercentCounterItem {
 	int index = 0;
@@ -127,6 +199,464 @@ void CountNicePercent(
 	}
 }
 
+[[nodiscard]] uint32 HashPollShuffleValue(
+		UserId userId,
+		PollId pollId,
+		const QByteArray &option) {
+	auto hash = QByteArray::number(quint64(userId.bare))
+		+ option
+		+ QByteArray::number(quint64(pollId));
+	return uint32(base::crc32(hash.constData(), hash.size()));
+}
+
+[[nodiscard]] bool WebPageHasRichPreview(WebPageData *webpage) {
+	return webpage
+		&& (!webpage->title.isEmpty()
+			|| !webpage->description.text.isEmpty()
+			|| webpage->photo
+			|| !webpage->siteName.isEmpty());
+}
+
+class OpenLinkPreviewDelegate final
+	: public HistoryView::SimpleElementDelegate {
+public:
+	using HistoryView::SimpleElementDelegate::SimpleElementDelegate;
+
+	HistoryView::Context elementContext() override {
+		return HistoryView::Context::History;
+	}
+};
+
+class OpenLinkPreviewWidget final : public Ui::RpWidget {
+public:
+	OpenLinkPreviewWidget(
+		not_null<QWidget*> parent,
+		not_null<Window::SessionController*> controller,
+		not_null<WebPageData*> webpage,
+		Fn<void()> close);
+	~OpenLinkPreviewWidget();
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+	void resizeMedia(int width);
+	void updateActiveLink(QPoint point);
+
+	const base::weak_ptr<Window::SessionController> _controller;
+	const Fn<void()> _close;
+	const std::unique_ptr<Ui::ChatTheme> _theme;
+	const std::unique_ptr<Ui::ChatStyle> _style;
+	const std::unique_ptr<OpenLinkPreviewDelegate> _delegate;
+	const not_null<History*> _history;
+	AdminLog::OwnedItem _item;
+
+};
+
+OpenLinkPreviewWidget::OpenLinkPreviewWidget(
+	not_null<QWidget*> parent,
+	not_null<Window::SessionController*> controller,
+	not_null<WebPageData*> webpage,
+	Fn<void()> close)
+: RpWidget(parent)
+, _controller(base::make_weak(controller))
+, _close(std::move(close))
+, _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
+, _style(std::make_unique<Ui::ChatStyle>(
+	controller->session().colorIndicesValue()))
+, _delegate(std::make_unique<OpenLinkPreviewDelegate>(
+	controller,
+	[=] { update(); }))
+, _history(controller->session().data().history(
+	controller->session().userPeerId())) {
+	_style->apply(_theme.get());
+	setMouseTracking(true);
+
+	const auto item = _history->makeMessage({
+		.id = _history->nextNonHistoryEntryId(),
+		.flags = (MessageFlag::FakeHistoryItem | MessageFlag::Local),
+		.from = _history->peer->id,
+	}, TextWithEntities(), MTP_messageMediaEmpty());
+	auto owned = AdminLog::OwnedItem(_delegate.get(), item);
+	owned->overrideMedia(std::make_unique<HistoryView::WebPage>(
+		owned.get(),
+		webpage,
+		MediaWebPageFlags{}));
+	_item = std::move(owned);
+	if (const auto media = _item->media()) {
+		media->setInBubbleState(MediaInBubbleState::Middle);
+		media->initDimensions();
+	}
+
+	_history->session().downloaderTaskFinished(
+	) | rpl::on_next([=] {
+		update();
+	}, lifetime());
+
+	_history->owner().viewRepaintRequest(
+	) | rpl::on_next([=](Data::RequestViewRepaint data) {
+		if (data.view == _item.get()) {
+			update();
+		}
+	}, lifetime());
+
+	widthValue(
+	) | rpl::filter([=](int w) {
+		return w > 0;
+	}) | rpl::on_next([=](int w) {
+		resizeMedia(w);
+	}, lifetime());
+}
+
+OpenLinkPreviewWidget::~OpenLinkPreviewWidget() {
+	const auto raw = _item.get();
+	if (Element::Pressed() == raw) {
+		Element::Pressed(nullptr);
+	}
+	if (Element::Hovered() == raw) {
+		Element::Hovered(nullptr);
+	}
+	if (Element::PressedLink() == raw) {
+		Element::PressedLink(nullptr);
+	}
+	if (Element::HoveredLink() == raw) {
+		Element::HoveredLink(nullptr);
+	}
+	if (Element::Moused() == raw) {
+		Element::Moused(nullptr);
+	}
+}
+
+void OpenLinkPreviewWidget::resizeMedia(int width) {
+	if (const auto media = _item->media()) {
+		const auto height = media->resizeGetHeight(width);
+		resize(width, height);
+	}
+}
+
+void OpenLinkPreviewWidget::paintEvent(QPaintEvent *e) {
+	const auto media = _item->media();
+	if (!media) {
+		return;
+	}
+	auto p = Painter(this);
+	auto context = _theme->preparePaintContext(
+		_style.get(),
+		rect(),
+		rect(),
+		e->rect(),
+		!window()->isActiveWindow());
+	media->draw(p, context);
+}
+
+void OpenLinkPreviewWidget::updateActiveLink(QPoint point) {
+	const auto media = _item->media();
+	if (!media) {
+		return;
+	}
+	const auto state = media->textState(point, StateRequest());
+	ClickHandler::setActive(state.link, _item.get());
+	setCursor(state.link ? style::cur_pointer : style::cur_default);
+}
+
+void OpenLinkPreviewWidget::mouseMoveEvent(QMouseEvent *e) {
+	updateActiveLink(e->pos());
+}
+
+void OpenLinkPreviewWidget::mousePressEvent(QMouseEvent *e) {
+	if (e->button() != Qt::LeftButton) {
+		return;
+	}
+	updateActiveLink(e->pos());
+	Element::Pressed(_item.get());
+	ClickHandler::pressed();
+}
+
+void OpenLinkPreviewWidget::mouseReleaseEvent(QMouseEvent *e) {
+	if (e->button() != Qt::LeftButton) {
+		return;
+	}
+	const auto activated = ClickHandler::unpressed();
+	if (Element::Pressed() == _item.get()) {
+		Element::Pressed(nullptr);
+	}
+	if (!activated) {
+		return;
+	}
+	const auto externalUrl = activated->url();
+	if (!externalUrl.isEmpty()) {
+		UrlClickHandler::Open(externalUrl);
+	} else if (const auto controller = _controller.get()) {
+		activated->onClick({
+			e->button(),
+			QVariant::fromValue(ClickHandlerContext{
+				.itemId = _item->data()->fullId(),
+				.sessionWindow = _controller,
+				.show = controller->uiShow(),
+			})
+		});
+	}
+	if (_close) {
+		_close();
+	}
+}
+
+void OpenLinkPreviewWidget::leaveEventHook(QEvent *e) {
+	ClickHandler::clearActive(_item.get());
+	setCursor(style::cur_default);
+	RpWidget::leaveEventHook(e);
+}
+
+void OpenPollOptionLinkBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> controller,
+		QString url,
+		WebPageData *webpage) {
+	box->setTitle(tr::lng_polls_option_open_link_title());
+	const auto content = box->verticalLayout();
+
+	const auto openAndClose = [=] {
+		UrlClickHandler::Open(url);
+		box->closeBox();
+	};
+
+	const auto urlContainer = content->add(
+		object_ptr<Ui::RpWidget>(content),
+		st::pollOpenLinkUrlOuterPadding);
+	const auto urlLabel = Ui::CreateChild<Ui::FlatLabel>(
+		urlContainer,
+		rpl::single(url),
+		st::pollOpenLinkUrlLabel);
+	urlLabel->setBreakEverywhere(true);
+	urlLabel->setSelectable(true);
+	const auto inner = st::pollOpenLinkUrlInnerPadding;
+	urlContainer->widthValue(
+	) | rpl::on_next([=](int width) {
+		urlLabel->resizeToWidth(
+			std::max(width - inner.left() - inner.right(), 1));
+		urlLabel->moveToLeft(inner.left(), inner.top());
+	}, urlContainer->lifetime());
+	urlLabel->heightValue(
+	) | rpl::on_next([=](int height) {
+		urlContainer->resize(
+			urlContainer->width(),
+			height + inner.top() + inner.bottom());
+	}, urlContainer->lifetime());
+	urlContainer->paintRequest(
+	) | rpl::on_next([=] {
+		auto p = QPainter(urlContainer);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::windowBgOver);
+		p.drawRoundedRect(
+			urlContainer->rect(),
+			st::pollOpenLinkUrlRadius,
+			st::pollOpenLinkUrlRadius);
+	}, urlContainer->lifetime());
+
+	if (webpage && !webpage->failed && WebPageHasRichPreview(webpage)) {
+		content->add(
+			object_ptr<OpenLinkPreviewWidget>(
+				content,
+				controller,
+				webpage,
+				[=] { box->closeBox(); }),
+			st::pollOpenLinkPreviewOuterPadding);
+	}
+
+	box->addButton(tr::lng_open_link(), openAndClose);
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+}
+
+struct PollThumbnailData {
+	std::shared_ptr<Ui::DynamicImage> thumbnail;
+	ClickHandlerPtr handler;
+	PollThumbnailKind kind = PollThumbnailKind::None;
+	bool rounded = false;
+	bool isVideo = false;
+	uint64 id = 0;
+};
+
+[[nodiscard]] PollThumbnailData MakePollThumbnail(
+		not_null<PollData*> poll,
+		const PollAnswer &answer,
+		Window::SessionController::MessageContext messageContext,
+		Fn<bool()> paused = nullptr);
+
+[[nodiscard]] PollThumbnailData MakePollThumbnail(
+		not_null<PollData*> poll,
+		const PollMedia &media,
+		Window::SessionController::MessageContext messageContext,
+		Fn<bool()> paused = nullptr) {
+	auto result = PollThumbnailData();
+	if (!media) {
+		return result;
+	}
+	if (media.photo) {
+		result.id = uint64(media.photo->id);
+		result.thumbnail = Ui::MakePhotoThumbnailCenterCrop(
+			media.photo,
+			messageContext.id);
+		result.rounded = true;
+		result.kind = PollThumbnailKind::Photo;
+	} else if (media.document) {
+		result.id = uint64(media.document->id);
+		if (media.document->sticker()) {
+			result.thumbnail = Ui::MakeEmojiThumbnail(
+				&poll->owner(),
+				Data::SerializeCustomEmojiId(media.document),
+				paused);
+			result.kind = PollThumbnailKind::Emoji;
+		} else if (media.document->isSong()
+			|| media.document->isVoiceMessage()) {
+			result.thumbnail = Ui::MakeDocumentFilePreviewThumbnail(
+				media.document,
+				messageContext.id);
+			result.kind = PollThumbnailKind::Audio;
+		} else {
+			result.thumbnail = Ui::MakeDocumentThumbnailCenterCrop(
+				media.document,
+				messageContext.id);
+			result.rounded = true;
+			result.kind = PollThumbnailKind::Document;
+			result.isVideo = media.document->isVideoFile()
+				|| media.document->isVideoMessage()
+				|| media.document->isAnimation();
+		}
+	} else if (media.geo) {
+		result.id = uint64(media.geo->hash());
+		const auto cloudImage = poll->owner().location(*media.geo);
+		result.thumbnail = Ui::MakeGeoThumbnailWithPin(
+			cloudImage,
+			&poll->session(),
+			Data::FileOrigin());
+		result.rounded = true;
+		result.kind = PollThumbnailKind::Geo;
+	} else if (media.webpage || !media.url.isEmpty()) {
+		const auto webpage = media.webpage;
+		const auto photo = webpage ? webpage->photo : nullptr;
+		if (photo) {
+			result.id = uint64(photo->id);
+			result.thumbnail = Ui::MakePhotoThumbnailCenterCrop(
+				photo,
+				messageContext.id);
+			result.rounded = true;
+		} else {
+			result.thumbnail = ::Poll::MakeLinkThumbnail();
+			result.rounded = true;
+		}
+		result.kind = PollThumbnailKind::Webpage;
+	}
+	if (result.kind == PollThumbnailKind::Photo && result.id) {
+		const auto photo = media.photo;
+		const auto session = &poll->session();
+		result.handler = std::make_shared<LambdaClickHandler>(
+			[=](ClickContext context) {
+				const auto my = context.other.value<ClickHandlerContext>();
+				const auto controller = my.sessionWindow.get();
+				if (!controller || (&controller->session() != session)) {
+					return;
+				}
+				controller->openPhoto(photo, messageContext);
+			});
+	} else if ((result.kind == PollThumbnailKind::Document
+		|| result.kind == PollThumbnailKind::Audio) && result.id) {
+		const auto document = media.document;
+		const auto session = &poll->session();
+		result.handler = std::make_shared<LambdaClickHandler>(
+			[=](ClickContext context) {
+				const auto my = context.other.value<ClickHandlerContext>();
+				const auto controller = my.sessionWindow.get();
+				if (!controller || (&controller->session() != session)) {
+					return;
+				}
+				controller->openDocument(document, true, messageContext);
+			});
+	} else if (result.kind == PollThumbnailKind::Geo && media.geo) {
+		const auto point = *media.geo;
+		const auto session = &poll->session();
+		result.handler = std::make_shared<LambdaClickHandler>(
+			[=](ClickContext context) {
+				const auto my = context.other.value<ClickHandlerContext>();
+				const auto controller = my.sessionWindow.get();
+				if (!controller || (&controller->session() != session)) {
+					return;
+				}
+				HistoryView::ShowPollGeoPreview(controller, point);
+			});
+	} else if (result.kind == PollThumbnailKind::Webpage) {
+		const auto url = !media.url.isEmpty()
+			? media.url
+			: (media.webpage ? media.webpage->url : QString());
+		const auto webpage = media.webpage;
+		const auto session = &poll->session();
+		if (!url.isEmpty()) {
+			result.handler = std::make_shared<LambdaClickHandler>(
+				[=](ClickContext clickContext) {
+					const auto my = clickContext.other.value<
+						ClickHandlerContext>();
+					const auto controller = my.sessionWindow.get();
+					if (!controller
+						|| (&controller->session() != session)) {
+						UrlClickHandler::Open(url);
+						return;
+					}
+					controller->show(Box(
+						OpenPollOptionLinkBox,
+						controller,
+						url,
+						webpage));
+				});
+		}
+	}
+	return result;
+}
+
+PollThumbnailData MakePollThumbnail(
+		not_null<PollData*> poll,
+		const PollAnswer &answer,
+		Window::SessionController::MessageContext messageContext,
+		Fn<bool()> paused) {
+	auto result
+		= MakePollThumbnail(poll, answer.media, messageContext, paused);
+	if (result.kind == PollThumbnailKind::Emoji && result.id) {
+		const auto documentId = DocumentId(result.id);
+		const auto option = answer.option;
+		const auto session = &poll->session();
+		result.handler = std::make_shared<LambdaClickHandler>(
+			[=](ClickContext context) {
+				const auto my = context.other.value<ClickHandlerContext>();
+				const auto controller = my.sessionWindow.get();
+				if (!controller || (&controller->session() != session)) {
+					return;
+				}
+				const auto document = poll->owner().document(documentId);
+				const auto itemId = messageContext.id;
+				ShowStickerPreview(
+					controller,
+					itemId,
+					document,
+					[=](not_null<Ui::DropdownMenu*> menu) {
+						FillPollAnswerMenu(
+							menu,
+							poll,
+							option,
+							document,
+							itemId,
+							controller);
+					});
+			});
+	}
+	if (result.handler) {
+		result.handler->setProperty(
+			kPollOptionProperty,
+			answer.option);
+	}
+	return result;
+}
+
 } // namespace
 
 struct Poll::AnswerAnimation {
@@ -158,7 +688,13 @@ struct Poll::Answer {
 	void fillData(
 		not_null<PollData*> poll,
 		const PollAnswer &original,
-		Core::MarkedTextContext context);
+		Ui::Text::MarkedContext context);
+	void fillMedia(
+		not_null<PollData*> poll,
+		const PollAnswer &original,
+		Window::SessionController::MessageContext messageContext,
+		Fn<void()> repaint,
+		Fn<bool()> paused);
 
 	Ui::Text::String text;
 	QByteArray option;
@@ -167,22 +703,38 @@ struct Poll::Answer {
 	int votesPercentWidth = 0;
 	float64 filling = 0.;
 	QString votesPercentString;
+	QString votesCountString;
+	int votesCountWidth = 0;
 	bool chosen = false;
 	bool correct = false;
 	bool selected = false;
 	ClickHandlerPtr handler;
+	ClickHandlerPtr mediaHandler;
 	Ui::Animations::Simple selectedAnimation;
+	std::shared_ptr<Ui::DynamicImage> thumbnail;
+	bool thumbnailRounded = false;
+	bool thumbnailIsVideo = false;
+	PollThumbnailKind thumbnailKind = PollThumbnailKind::None;
+	uint64 thumbnailId = 0;
 	mutable std::unique_ptr<Ui::RippleAnimation> ripple;
+	std::vector<UserpicInRow> recentVoters;
+	mutable QImage recentVotersImage;
 };
 
-struct Poll::CloseInformation {
-	CloseInformation(TimeId date, TimeId period, Fn<void()> repaint);
+struct Poll::AttachedMedia {
+	std::shared_ptr<Ui::DynamicImage> thumbnail;
+	ClickHandlerPtr handler;
+	PhotoData *photo = nullptr;
+	std::shared_ptr<Data::PhotoMedia> photoMedia;
+	QSize photoSize;
+	PollThumbnailKind kind = PollThumbnailKind::None;
+	bool rounded = false;
+	uint64 id = 0;
+};
 
-	crl::time start = 0;
-	crl::time finish = 0;
-	crl::time duration = 0;
-	base::Timer timer;
-	Ui::Animations::Basic radial;
+struct Poll::SolutionMedia {
+	PollThumbnailKind kind = PollThumbnailKind::None;
+	uint64 id = 0;
 };
 
 struct Poll::RecentVoter {
@@ -190,162 +742,1699 @@ struct Poll::RecentVoter {
 	mutable Ui::PeerUserpicView userpic;
 };
 
-template <typename Callback>
-Poll::SendingAnimation::SendingAnimation(
-	const QByteArray &option,
-	Callback &&callback)
-: option(option)
-, animation(
-	std::forward<Callback>(callback),
-	st::historyPollRadialAnimation) {
-}
+struct Poll::Part {
+	explicit Part(not_null<Poll*> owner) : _owner(owner) {}
+	virtual ~Part() = default;
 
-Poll::Answer::Answer() : text(st::msgMinWidth / 2) {
-}
+	[[nodiscard]] virtual int countHeight(int innerWidth) const = 0;
+	virtual void draw(
+		Painter &p,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		const PaintContext &context) const = 0;
+	[[nodiscard]] virtual TextState textState(
+		QPoint point,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		StateRequest request) const = 0;
+	virtual void clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed) {}
+	virtual void clickHandlerActiveChanged(
+		const ClickHandlerPtr &handler,
+		bool active) {}
+	[[nodiscard]] virtual bool hasHeavyPart() const { return false; }
+	virtual void unloadHeavyPart() {}
+	[[nodiscard]] virtual uint16 selectionLength() const { return 0; }
 
-void Poll::Answer::fillData(
-		not_null<PollData*> poll,
-		const PollAnswer &original,
-		Core::MarkedTextContext context) {
-	chosen = original.chosen;
-	correct = poll->quiz() ? original.correct : chosen;
-	if (!text.isEmpty() && text.toTextWithEntities() == original.text) {
-		return;
-	}
-	text.setMarkedText(
-		st::historyPollAnswerStyle,
-		original.text,
-		Ui::WebpageTextTitleOptions(),
-		context);
-}
+protected:
+	const not_null<Poll*> _owner;
+};
 
-Poll::CloseInformation::CloseInformation(
-	TimeId date,
-	TimeId period,
-	Fn<void()> repaint)
-: duration(period * crl::time(1000))
-, timer(std::move(repaint)) {
-	const auto left = std::clamp(date - base::unixtime::now(), 0, period);
-	finish = crl::now() + left * crl::time(1000);
-}
+struct Poll::Footer : public Poll::Part {
+	explicit Footer(not_null<Poll*> owner);
 
-Poll::Poll(
-	not_null<Element*> parent,
-	not_null<PollData*> poll)
-: Media(parent)
-, _poll(poll)
-, _question(st::msgMinWidth / 2)
-, _showResultsLink(
-	std::make_shared<LambdaClickHandler>(crl::guard(
-		this,
-		[=] { showResults(); })))
-, _sendVotesLink(
-	std::make_shared<LambdaClickHandler>(crl::guard(
-		this,
-		[=] { sendMultiOptions(); }))) {
-	history()->owner().registerPollView(_poll, _parent);
+	int countHeight(int innerWidth) const override;
+	void draw(
+		Painter &p,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		const PaintContext &context) const override;
+	TextState textState(
+		QPoint point,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		StateRequest request) const override;
+	void clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed) override;
+
+	void updateTotalVotes();
+
+	Ui::Text::String _totalVotesLabel;
+	Ui::Text::String _adminVotesLabel;
+	Ui::Text::String _adminBackVoteLabel;
+	ClickHandlerPtr _showResultsLink;
+	ClickHandlerPtr _sendVotesLink;
+	ClickHandlerPtr _adminVotesLink;
+	ClickHandlerPtr _adminBackVoteLink;
+	ClickHandlerPtr _saveOptionLink;
+	mutable std::unique_ptr<Ui::RippleAnimation> _linkRipple;
+	mutable int _linkRippleShift = 0;
+	mutable base::Timer _closeTimer;
+
+private:
+	struct Layout {
+		enum class Kind {
+			PassiveLabel,
+			SaveOption,
+			AdminVotes,
+			AdminBack,
+			LinkButton,
+		};
+		Kind kind = Kind::PassiveLabel;
+		ClickHandlerPtr link;
+		bool compact = false;
+		bool timerFolded = false;
+		bool timerSeparate = false;
+		int topSkip = 0;
+		int textY = 0;
+		int timerY = 0;
+		int totalHeight = 0;
+	};
+	[[nodiscard]] Layout computeLayout(int innerWidth) const;
+	[[nodiscard]] bool hasCloseDate() const;
+	[[nodiscard]] QString closeTimerText() const;
+	[[nodiscard]] QRect timerRect(
+		const Layout &layout,
+		int left,
+		int innerWidth) const;
+	[[nodiscard]] bool timerFooterMultiline(int paintw) const;
+	[[nodiscard]] bool centeredOverlapsInfo(
+		int textWidth,
+		int innerWidth) const;
+	[[nodiscard]] QString linkButtonText() const;
+	void toggleLinkRipple(bool pressed);
+};
+
+bool Poll::Footer::hasCloseDate() const {
+	return _owner->_poll->closeDate > 0
+		&& !(_owner->_flags & PollData::Flag::Closed);
 }
 
-QSize Poll::countOptimalSize() {
-	updateTexts();
+auto Poll::Footer::computeLayout(int innerWidth) const -> Layout {
+	Layout result;
+	result.compact = _owner->inlineFooter();
+	result.topSkip = _owner->canAddOption()
+		? 0
+		: st::historyPollTotalVotesSkip;
 
-	const auto paddings = st::msgPadding.left() + st::msgPadding.right();
+	const auto timerText = closeTimerText();
+	const auto hasTimer = !timerText.isEmpty();
+	const auto lineHeight = st::msgDateFont->height;
 
-	auto maxWidth = st::msgFileMinWidth;
-	accumulate_max(maxWidth, paddings + _question.maxWidth());
-	for (const auto &answer : _answers) {
-		accumulate_max(
-			maxWidth,
-			paddings
-			+ st::historyPollAnswerPadding.left()
-			+ answer.text.maxWidth()
-			+ st::historyPollAnswerPadding.right());
+	if (result.compact) {
+		result.kind = Layout::Kind::PassiveLabel;
+		if (hasTimer) {
+			if (timerFooterMultiline(innerWidth)) {
+				result.timerSeparate = true;
+			} else {
+				result.timerFolded = true;
+			}
+		}
+	} else if (_owner->_addOptionActive) {
+		result.kind = Layout::Kind::SaveOption;
+		result.link = _saveOptionLink;
+	} else if (_owner->isAuthorNotVoted()
+		&& !_owner->_adminShowResults
+		&& !_owner->canSendVotes()) {
+		if (_owner->_totalVotes > 0) {
+			result.kind = Layout::Kind::AdminVotes;
+			result.link = _adminVotesLink;
+		} else {
+			result.kind = Layout::Kind::PassiveLabel;
+		}
+	} else if (_owner->_adminShowResults
+		&& _owner->isAuthorNotVoted()) {
+		result.kind = Layout::Kind::AdminBack;
+		result.link = _adminBackVoteLink;
+	} else if (_owner->showVotersCount()) {
+		result.kind = Layout::Kind::PassiveLabel;
+		if (hasTimer) {
+			if (timerFooterMultiline(innerWidth)) {
+				result.timerSeparate = true;
+			} else {
+				result.timerFolded = true;
+			}
+		}
+	} else {
+		result.kind = Layout::Kind::LinkButton;
+		const auto votedPublic = _owner->_voted
+			&& (_owner->_flags & PollData::Flag::PublicVotes);
+		result.link = (_owner->showVotes() || votedPublic)
+			? _showResultsLink
+			: _owner->canSendVotes()
+			? _sendVotesLink
+			: nullptr;
+		if (hasTimer) {
+			result.timerSeparate = true;
+		}
 	}
 
-	const auto answersHeight = ranges::accumulate(ranges::views::all(
-		_answers
-	) | ranges::views::transform([](const Answer &answer) {
-		return st::historyPollAnswerPadding.top()
-			+ answer.text.minHeight()
-			+ st::historyPollAnswerPadding.bottom();
-	}), 0);
-
-	const auto bottomButtonHeight = inlineFooter()
+	const auto buttonSkip = result.compact
 		? 0
 		: st::historyPollBottomButtonSkip;
-	auto minHeight = st::historyPollQuestionTop
-		+ _question.minHeight()
-		+ st::historyPollSubtitleSkip
-		+ st::msgDateFont->height
-		+ st::historyPollAnswersSkip
-		+ answersHeight
-		+ st::historyPollTotalVotesSkip
-		+ bottomButtonHeight
-		+ st::msgDateFont->height
-		+ st::msgPadding.bottom();
-	if (!isBubbleTop()) {
-		minHeight -= st::msgFileTopMinus;
+	result.textY = result.compact
+		? st::msgPadding.bottom()
+		: (result.topSkip
+			+ st::msgPadding.bottom()
+			+ st::historyPollBottomButtonTop);
+	result.timerY = result.textY + lineHeight;
+
+	auto bottomW = 0;
+	if (result.timerSeparate) {
+		bottomW = st::msgDateFont->width(timerText);
+	} else if (!result.timerFolded) {
+		switch (result.kind) {
+		case Layout::Kind::PassiveLabel:
+			bottomW = _totalVotesLabel.maxWidth();
+			break;
+		case Layout::Kind::SaveOption:
+			bottomW = st::semiboldFont->width(
+				tr::lng_polls_add_option_save(tr::now));
+			break;
+		case Layout::Kind::AdminVotes:
+			bottomW = _adminVotesLabel.maxWidth();
+			break;
+		case Layout::Kind::AdminBack:
+			bottomW = _adminBackVoteLabel.maxWidth();
+			break;
+		case Layout::Kind::LinkButton:
+			bottomW = st::semiboldFont->width(linkButtonText());
+			break;
+		}
 	}
-	return { maxWidth, minHeight };
-}
+	const auto dateInfoPad = (bottomW > 0
+		&& centeredOverlapsInfo(bottomW, innerWidth))
+		? lineHeight
+		: 0;
 
-bool Poll::showVotes() const {
-	return _voted || (_flags & PollData::Flag::Closed);
-}
+	result.totalHeight = result.topSkip
+		+ buttonSkip
+		+ lineHeight
+		+ (result.timerSeparate ? lineHeight : 0)
+		+ dateInfoPad
+		+ st::msgPadding.bottom();
 
-bool Poll::canVote() const {
-	return !showVotes() && _parent->data()->isRegular();
+	return result;
 }
 
-bool Poll::canSendVotes() const {
-	return canVote() && _hasSelected;
+QString Poll::Footer::linkButtonText() const {
+	const auto votedPublic = _owner->_voted
+		&& (_owner->_flags & PollData::Flag::PublicVotes);
+	return (_owner->showVotes() || votedPublic)
+		? ((_owner->_flags & PollData::Flag::PublicVotes)
+			? tr::lng_polls_view_votes(
+				tr::now,
+				lt_count,
+				_owner->_totalVotes)
+			: tr::lng_polls_view_results(tr::now))
+		: tr::lng_polls_submit_votes(tr::now);
 }
 
-bool Poll::showVotersCount() const {
-	return showVotes()
-		? (!_totalVotes || !(_flags & PollData::Flag::PublicVotes))
-		: !(_flags & PollData::Flag::MultiChoice);
+int Poll::Footer::countHeight(int innerWidth) const {
+	return computeLayout(innerWidth).totalHeight;
 }
 
-bool Poll::inlineFooter() const {
-	return !(_flags
-		& (PollData::Flag::PublicVotes | PollData::Flag::MultiChoice));
+void Poll::Footer::draw(
+		Painter &p,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		const PaintContext &context) const {
+	const auto layout = computeLayout(innerWidth);
+	const auto stm = context.messageStyle();
+
+	if (!layout.link) {
+		_linkRipple.reset();
+	}
+
+	if (_linkRipple && !layout.compact) {
+		p.setOpacity(st::historyPollRippleOpacity);
+		_linkRipple->paint(
+			p,
+			left - st::msgPadding.left() - _linkRippleShift,
+			layout.topSkip,
+			outerWidth,
+			&stm->msgWaveformInactive->c);
+		if (_linkRipple->empty()) {
+			_linkRipple.reset();
+		}
+		p.setOpacity(1.);
+	}
+
+	switch (layout.kind) {
+	case Layout::Kind::PassiveLabel: {
+		p.setPen(stm->msgDateFg);
+		if (layout.timerFolded) {
+			p.setFont(st::msgDateFont);
+			const auto sep = QString::fromUtf8(" \xC2\xB7 ");
+			const auto full = _totalVotesLabel.toString()
+				+ sep
+				+ closeTimerText();
+			const auto fullw = st::msgDateFont->width(full);
+			p.drawTextLeft(
+				left + (innerWidth - fullw) / 2,
+				layout.textY,
+				outerWidth,
+				full,
+				fullw);
+		} else {
+			const auto labelWidth = _totalVotesLabel.maxWidth();
+			const auto labelLeft = left
+				+ (innerWidth - labelWidth) / 2;
+			_totalVotesLabel.drawLeftElided(
+				p,
+				labelLeft,
+				layout.textY,
+				labelWidth,
+				outerWidth);
+		}
+		break;
+	}
+	case Layout::Kind::SaveOption: {
+		p.setFont(st::semiboldFont);
+		p.setPen(stm->msgFileThumbLinkFg);
+		const auto text = tr::lng_polls_add_option_save(tr::now);
+		const auto textw = st::semiboldFont->width(text);
+		p.drawTextLeft(
+			left + (innerWidth - textw) / 2,
+			layout.textY,
+			outerWidth,
+			text,
+			textw);
+		break;
+	}
+	case Layout::Kind::AdminVotes: {
+		p.setPen(stm->msgFileThumbLinkFg);
+		const auto labelWidth = _adminVotesLabel.maxWidth();
+		_adminVotesLabel.drawLeft(
+			p,
+			left + (innerWidth - labelWidth) / 2,
+			layout.textY,
+			labelWidth,
+			outerWidth);
+		break;
+	}
+	case Layout::Kind::AdminBack: {
+		p.setPen(stm->msgFileThumbLinkFg);
+		const auto backw = _adminBackVoteLabel.maxWidth();
+		_adminBackVoteLabel.drawLeft(
+			p,
+			left + (innerWidth - backw) / 2,
+			layout.textY,
+			backw,
+			outerWidth);
+		break;
+	}
+	case Layout::Kind::LinkButton: {
+		p.setFont(st::semiboldFont);
+		p.setPen(layout.link
+			? stm->msgFileThumbLinkFg
+			: stm->msgDateFg);
+		const auto string = linkButtonText();
+		const auto stringw = st::semiboldFont->width(string);
+		p.drawTextLeft(
+			left + (innerWidth - stringw) / 2,
+			layout.textY,
+			outerWidth,
+			string,
+			stringw);
+		break;
+	}
+	}
+
+	if (layout.timerSeparate) {
+		p.setFont(st::msgDateFont);
+		p.setPen(stm->msgDateFg);
+		const auto timerText = closeTimerText();
+		const auto timerw = st::msgDateFont->width(timerText);
+		p.drawTextLeft(
+			left + (innerWidth - timerw) / 2,
+			layout.timerY,
+			outerWidth,
+			timerText,
+			timerw);
+	}
+}
+
+TextState Poll::Footer::textState(
+		QPoint point,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		StateRequest request) const {
+	const auto layout = computeLayout(innerWidth);
+	TextState result;
+
+	const auto timer = timerRect(layout, left, innerWidth);
+	if (!timer.isEmpty() && timer.contains(point)) {
+		result.customTooltip = true;
+		using Flag = Ui::Text::StateRequest::Flag;
+		if (request.flags & Flag::LookupCustomTooltip) {
+			result.customTooltipText = langDateTimeFull(
+				base::unixtime::parse(_owner->_poll->closeDate));
+		}
+	}
+	if (layout.compact) {
+		return result;
+	}
+	if (point.y() < layout.topSkip
+		|| point.y() >= layout.totalHeight) {
+		return result;
+	}
+	_owner->_lastLinkPoint = point;
+	result.link = layout.link;
+	return result;
+}
+
+void Poll::Footer::clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed) {
+	if (handler == _sendVotesLink
+		|| handler == _showResultsLink
+		|| handler == _adminVotesLink
+		|| handler == _adminBackVoteLink
+		|| handler == _saveOptionLink) {
+		toggleLinkRipple(pressed);
+	}
+}
+
+void Poll::Footer::toggleLinkRipple(bool pressed) {
+	if (pressed) {
+		const auto outerWidth = _owner->width();
+		const auto innerWidth = outerWidth
+			- st::msgPadding.left()
+			- st::msgPadding.right();
+		const auto layout = computeLayout(innerWidth);
+		const auto rippleTop = layout.topSkip;
+		const auto linkHeight = layout.totalHeight - rippleTop;
+		if (!_linkRipple) {
+			auto mask = _owner->isRoundedInBubbleBottom()
+				? static_cast<Message*>(_owner->_parent.get())
+					->bottomRippleMask(linkHeight)
+				: BottomRippleMask{
+					Ui::RippleAnimation::RectMask(
+						{ outerWidth, linkHeight }),
+				};
+			_linkRipple = std::make_unique<Ui::RippleAnimation>(
+				st::defaultRippleAnimation,
+				std::move(mask.image),
+				[owner = _owner] { owner->repaint(); });
+			_linkRippleShift = mask.shift;
+		}
+		_linkRipple->add(
+			_owner->_lastLinkPoint
+				+ QPoint(_linkRippleShift, -rippleTop));
+	} else if (_linkRipple) {
+		_linkRipple->lastStop();
+	}
+}
+
+void Poll::Footer::updateTotalVotes() {
+	if (_owner->_totalVotes == _owner->_poll->totalVoters
+		&& !_totalVotesLabel.isEmpty()) {
+		return;
+	}
+	_owner->_totalVotes = _owner->_poll->totalVoters;
+	const auto quiz = _owner->_poll->quiz();
+	const auto string = !_owner->_totalVotes
+		? (quiz
+			? tr::lng_polls_answers_none
+			: tr::lng_polls_votes_none)(tr::now)
+		: (quiz
+			? tr::lng_polls_answers_count
+			: tr::lng_polls_votes_count)(
+				tr::now,
+				lt_count_short,
+				_owner->_totalVotes);
+	_totalVotesLabel.setText(st::msgDateTextStyle, string);
+	_adminVotesLabel.setMarkedText(
+		st::semiboldTextStyle,
+		tr::lng_polls_admin_votes(
+			tr::now,
+			lt_count,
+			_owner->_totalVotes,
+			lt_arrow,
+			Ui::Text::IconEmoji(&st::textMoreIconEmoji),
+			tr::marked));
+}
+
+struct Poll::AddOption : public Poll::Part {
+	explicit AddOption(not_null<Poll*> owner);
+
+	int countHeight(int innerWidth) const override;
+	void draw(
+		Painter &p,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		const PaintContext &context) const override;
+	TextState textState(
+		QPoint point,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		StateRequest request) const override;
+	void clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed) override;
+
+	ClickHandlerPtr _addOptionLink;
+	mutable std::unique_ptr<Ui::RippleAnimation> _addOptionRipple;
+
+private:
+	[[nodiscard]] int rowHeight() const;
+	void toggleRipple(bool pressed);
+};
+
+Poll::AddOption::AddOption(not_null<Poll*> owner)
+: Part(owner)
+, _addOptionLink(
+	std::make_shared<LambdaClickHandler>(crl::guard(
+		owner.get(),
+		[=](ClickContext context) {
+			const auto my = context.other.value<ClickHandlerContext>();
+			if (const auto delegate = my.elementDelegate
+				? my.elementDelegate()
+				: nullptr) {
+				const auto innerWidth = owner->width()
+					- st::msgPadding.left()
+					- st::msgPadding.right();
+				delegate->elementShowAddPollOption(
+					owner->_parent,
+					owner->_poll,
+					owner->_parent->data()->fullId(),
+					owner->addOptionRect(innerWidth));
+			}
+		}))) {
+}
+
+int Poll::AddOption::rowHeight() const {
+	return st::historyPollAnswerPaddingNoMedia.top()
+		+ st::msgDateFont->height
+		+ st::historyPollAnswerPaddingNoMedia.bottom();
+}
+
+int Poll::AddOption::countHeight(int innerWidth) const {
+	return _owner->canAddOption() ? rowHeight() : 0;
+}
+
+void Poll::AddOption::draw(
+		Painter &p,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		const PaintContext &context) const {
+	if (!_owner->canAddOption() || _owner->_addOptionActive) {
+		return;
+	}
+	const auto stm = context.messageStyle();
+	const auto &padding = st::historyPollAnswerPaddingNoMedia;
+	const auto textTop = padding.top();
+
+	if (_addOptionRipple) {
+		p.setOpacity(st::historyPollRippleOpacity);
+		_addOptionRipple->paint(
+			p,
+			left - st::msgPadding.left(),
+			0,
+			outerWidth,
+			&stm->msgWaveformInactive->c);
+		if (_addOptionRipple->empty()) {
+			_addOptionRipple.reset();
+		}
+		p.setOpacity(1.);
+	}
+
+	const auto color = stm->msgDateFg->c;
+	const auto &icon = st::pollBoxOutlinePollAddIcon;
+	const auto &radio = st::historyPollRadio;
+	const auto iconLeft = left
+		+ (radio.diameter - icon.width()) / 2;
+	const auto iconTop = textTop
+		+ (st::msgDateFont->height - icon.height()) / 2;
+	icon.paint(p, iconLeft, iconTop, outerWidth, color);
+
+	p.setFont(st::normalFont);
+	p.setPen(stm->msgDateFg);
+	const auto text = tr::lng_polls_add_option(tr::now);
+	const auto textw = st::normalFont->width(text);
+	p.drawTextLeft(
+		left + st::historyPollAnswerPadding.left(),
+		textTop,
+		outerWidth,
+		text,
+		textw);
+}
+
+TextState Poll::AddOption::textState(
+		QPoint point,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		StateRequest request) const {
+	TextState result;
+	if (!_owner->canAddOption()) {
+		return result;
+	}
+	const auto h = rowHeight();
+	if (point.y() >= 0 && point.y() < h) {
+		_owner->_lastLinkPoint = point;
+		result.link = _addOptionLink;
+	}
+	return result;
+}
+
+void Poll::AddOption::clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed) {
+	if (handler == _addOptionLink) {
+		toggleRipple(pressed);
+	}
+}
+
+void Poll::AddOption::toggleRipple(bool pressed) {
+	if (pressed) {
+		const auto outerWidth = _owner->width();
+		const auto h = rowHeight();
+		if (!_addOptionRipple) {
+			auto mask = Ui::RippleAnimation::RectMask(
+				QSize(outerWidth, h));
+			_addOptionRipple = std::make_unique<Ui::RippleAnimation>(
+				st::defaultRippleAnimation,
+				std::move(mask),
+				[owner = _owner] { owner->repaint(); });
+		}
+		_addOptionRipple->add(_owner->_lastLinkPoint);
+	} else if (_addOptionRipple) {
+		_addOptionRipple->lastStop();
+	}
+}
+
+struct Poll::Header : public Poll::Part {
+	explicit Header(not_null<Poll*> owner)
+	: Part(owner)
+	, _description(st::msgMinWidth / 2)
+	, _question(st::msgMinWidth / 2)
+	, _attachedMedia(std::make_unique<AttachedMedia>()) {
+	}
+
+	int countHeight(int innerWidth) const override;
+	void draw(
+		Painter &p,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		const PaintContext &context) const override;
+	TextState textState(
+		QPoint point,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		StateRequest request) const override;
+	void clickHandlerActiveChanged(
+		const ClickHandlerPtr &handler,
+		bool active) override;
+	void clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed) override;
+	bool hasHeavyPart() const override;
+	void unloadHeavyPart() override;
+	uint16 selectionLength() const override;
+
+	void updateDescription();
+	void updateAttachedMedia();
+	[[nodiscard]] int countTopContentSkip(int pollWidth = 0) const;
+	[[nodiscard]] int countTopMediaHeight(int pollWidth = 0) const;
+	[[nodiscard]] int countAttachHeight(int pollWidth = 0) const;
+	[[nodiscard]] QRect countTopMediaRect(int top) const;
+	[[nodiscard]] Ui::BubbleRounding topMediaRounding() const;
+	void validateTopMediaCache(QSize size) const;
+	[[nodiscard]] int countDescriptionHeight(int innerWidth) const;
+	[[nodiscard]] int countQuestionTop(
+		int innerWidth,
+		int pollWidth = 0) const;
+	[[nodiscard]] uint16 solutionSelectionLength() const;
+	[[nodiscard]] TextSelection toSolutionSelection(
+		TextSelection selection) const;
+	[[nodiscard]] TextSelection fromSolutionSelection(
+		TextSelection selection) const;
+	[[nodiscard]] TextSelection toQuestionSelection(
+		TextSelection selection) const;
+	[[nodiscard]] TextSelection fromQuestionSelection(
+		TextSelection selection) const;
+	void updateRecentVoters();
+	void paintRecentVoters(
+		Painter &p,
+		int left,
+		int top,
+		const PaintContext &context) const;
+	void paintShowSolution(
+		Painter &p,
+		int right,
+		int top,
+		const PaintContext &context) const;
+	void showSolution() const;
+	void solutionToggled(
+		bool solutionShown,
+		anim::type animated = anim::type::normal) const;
+	[[nodiscard]] bool canShowSolution() const;
+	[[nodiscard]] bool inShowSolution(
+		QPoint point,
+		int right,
+		int top) const;
+	void updateSolutionText();
+	void updateSolutionMedia();
+	[[nodiscard]] int countSolutionBlockHeight(int innerWidth) const;
+	[[nodiscard]] int countSolutionMediaHeight(int mediaWidth) const;
+	void paintSolutionBlock(
+		Painter &p,
+		int left,
+		int top,
+		int paintw,
+		const PaintContext &context) const;
+
+	Ui::Text::String _description;
+	Ui::Text::String _question;
+	Ui::Text::String _subtitle;
+	std::unique_ptr<AttachedMedia> _attachedMedia;
+	std::unique_ptr<Media> _attachedMediaAttach;
+	mutable QImage _attachedMediaCache;
+	mutable Ui::BubbleRounding _attachedMediaCacheRounding;
+	mutable bool _attachedMediaCacheBlurred = false;
+	std::vector<RecentVoter> _recentVoters;
+	QImage _recentVotersImage;
+	mutable ClickHandlerPtr _showSolutionLink;
+	Ui::Text::String _solutionText;
+	mutable ClickHandlerPtr _closeSolutionLink;
+	std::unique_ptr<SolutionMedia> _solutionMedia;
+	std::unique_ptr<Media> _solutionAttach;
+	mutable Ui::Animations::Simple _solutionButtonAnimation;
+	mutable bool _solutionShown = false;
+	mutable bool _solutionButtonVisible = false;
+	mutable QImage _userpicCircleCache;
+};
+
+int Poll::Header::countHeight(int innerWidth) const {
+	const auto pollWidth = innerWidth
+		+ st::msgPadding.left()
+		+ st::msgPadding.right();
+	return countQuestionTop(innerWidth, pollWidth)
+		+ _question.countHeight(innerWidth)
+		+ st::historyPollSubtitleSkip
+		+ st::msgDateFont->height
+		+ st::historyPollAnswersSkip;
+}
+
+void Poll::Header::draw(
+		Painter &p,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		const PaintContext &context) const {
+	const auto stm = context.messageStyle();
+	auto tshift = countTopContentSkip();
+
+	if (const auto mediaHeight = countTopMediaHeight()) {
+		if (_attachedMediaAttach) {
+			const auto sideSkip = st::historyPollMediaSideSkip;
+			_attachedMediaAttach->setBubbleRounding(
+				topMediaRounding());
+			p.translate(sideSkip, tshift);
+			_attachedMediaAttach->draw(
+				p,
+				context.translated(-sideSkip, -tshift)
+					.withSelection(TextSelection()));
+			p.translate(-sideSkip, -tshift);
+		} else {
+			const auto target = countTopMediaRect(tshift);
+			p.setPen(Qt::NoPen);
+			p.setBrush(stm->msgFileBg);
+			PainterHighQualityEnabler hq(p);
+			if (_attachedMedia->kind
+					== PollThumbnailKind::Emoji) {
+				p.drawRoundedRect(
+					target,
+					st::roundRadiusLarge,
+					st::roundRadiusLarge);
+				const auto image
+					= _attachedMedia->thumbnail->image(
+						std::max(target.width(), target.height()));
+				if (!image.isNull()) {
+					const auto source = QRectF(
+						QPointF(),
+						QSizeF(image.size()));
+					const auto kx = target.width() / source.width();
+					const auto ky = target.height() / source.height();
+					const auto scale = std::min(kx, ky);
+					const auto imageSize = QSizeF(
+						source.width() * scale,
+						source.height() * scale);
+					const auto geometry = QRectF(
+						target.x()
+							+ (target.width()
+								- imageSize.width()) / 2.,
+						target.y()
+							+ (target.height()
+								- imageSize.height()) / 2.,
+						imageSize.width(),
+						imageSize.height());
+					p.save();
+					auto path = QPainterPath();
+					path.addRoundedRect(
+						target,
+						st::roundRadiusLarge,
+						st::roundRadiusLarge);
+					p.setClipPath(path);
+					p.drawImage(geometry, image, source);
+					p.restore();
+				}
+			} else {
+				validateTopMediaCache(target.size());
+				if (!_attachedMediaCache.isNull()) {
+					p.drawImage(target.topLeft(),
+						_attachedMediaCache);
+				}
+			}
+		}
+		tshift += mediaHeight + st::historyPollMediaSkip;
+	}
+
+	if (const auto descriptionHeight
+			= countDescriptionHeight(innerWidth)) {
+		p.setPen(stm->historyTextFg);
+		_owner->_parent->prepareCustomEmojiPaint(
+			p, context, _description);
+		_description.draw(p, {
+			.position = { left, tshift },
+			.outerWidth = outerWidth,
+			.availableWidth = innerWidth,
+			.spoiler = Ui::Text::DefaultSpoilerCache(),
+			.now = context.now,
+			.pausedEmoji = context.paused,
+			.pausedSpoiler = context.paused,
+			.selection = context.selection,
+			.useFullWidth = true,
+		});
+		tshift += descriptionHeight + st::historyPollDescriptionSkip;
+	}
+
+	if (const auto solutionHeight
+			= countSolutionBlockHeight(innerWidth)) {
+		paintSolutionBlock(
+			p, left, tshift, innerWidth, context);
+		tshift += solutionHeight + st::historyPollExplanationSkip;
+	}
+
+	p.setPen(stm->historyTextFg);
+	_owner->_parent->prepareCustomEmojiPaint(p, context, _question);
+	_question.draw(p, {
+		.position = { left, tshift },
+		.outerWidth = outerWidth,
+		.availableWidth = innerWidth,
+		.spoiler = Ui::Text::DefaultSpoilerCache(),
+		.now = context.now,
+		.pausedEmoji = context.paused,
+		.pausedSpoiler = context.paused,
+		.selection = toQuestionSelection(context.selection),
+	});
+	tshift += _question.countHeight(innerWidth)
+		+ st::historyPollSubtitleSkip;
+
+	p.setPen(stm->msgDateFg);
+	_subtitle.drawLeftElided(
+		p, left, tshift, innerWidth, outerWidth);
+	paintRecentVoters(
+		p, left + _subtitle.maxWidth(), tshift, context);
+	paintShowSolution(
+		p, left + innerWidth, tshift, context);
+}
+
+TextState Poll::Header::textState(
+		QPoint point,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		StateRequest request) const {
+	TextState result(_owner->_parent);
+	auto tshift = countTopContentSkip();
+
+	if (const auto mediaHeight = countTopMediaHeight()) {
+		if (_attachedMediaAttach) {
+			const auto sideSkip = st::historyPollMediaSideSkip;
+			if (QRect(
+					sideSkip,
+					tshift,
+					_attachedMediaAttach->width(),
+					mediaHeight).contains(point)) {
+				result = _attachedMediaAttach->textState(
+					point - QPoint(sideSkip, tshift),
+					request);
+				SetTextStatePosition(&result, 0, false);
+				return result;
+			}
+		} else if (_attachedMedia
+			&& _attachedMedia->handler
+			&& QRect(0, tshift, outerWidth, mediaHeight)
+				.contains(point)) {
+			result.link = _attachedMedia->handler;
+			return result;
+		}
+		tshift += mediaHeight + st::historyPollMediaSkip;
+	}
+
+	auto symbolAdd = uint16(0);
+	if (const auto descriptionHeight
+			= countDescriptionHeight(innerWidth)) {
+		if (QRect(left, tshift, innerWidth, descriptionHeight)
+				.contains(point)) {
+			result = TextState(
+				_owner->_parent,
+				_description.getStateLeft(
+					point - QPoint(left, tshift),
+					innerWidth,
+					outerWidth,
+					request.forText()));
+			return result;
+		}
+		if (point.y() >= tshift + descriptionHeight) {
+			symbolAdd += _description.length();
+		}
+		tshift += descriptionHeight + st::historyPollDescriptionSkip;
+	}
+
+	if (const auto solutionHeight
+			= countSolutionBlockHeight(innerWidth)) {
+		if (QRect(left, tshift, innerWidth, solutionHeight)
+				.contains(point)) {
+			const auto &qst = st::historyPagePreview;
+			const auto innerLeft = left + qst.padding.left();
+			const auto innerRight = left
+				+ innerWidth
+				- qst.padding.right();
+			const auto closeArea
+				= st::historyPollExplanationCloseSize;
+			const auto closeLeft = innerRight - closeArea;
+			const auto closeTop = tshift + qst.padding.top();
+			if (QRect(
+				closeLeft,
+				closeTop,
+				closeArea,
+				st::semiboldFont->height).contains(point)) {
+				result.link = _closeSolutionLink;
+				return result;
+			}
+			const auto textTop = tshift
+				+ qst.padding.top()
+				+ st::semiboldFont->height
+				+ st::historyPollExplanationTitleSkip;
+			const auto textWidth = innerRight - innerLeft;
+			const auto textHeight
+				= _solutionText.countHeight(textWidth);
+			if (QRect(
+				innerLeft,
+				textTop,
+				textWidth,
+				textHeight).contains(point)) {
+				result = TextState(
+					_owner->_parent,
+					_solutionText.getStateLeft(
+						point - QPoint(innerLeft, textTop),
+						textWidth,
+						outerWidth,
+						request.forText()));
+				AddTextStateOffset(&result, symbolAdd);
+				return result;
+			}
+			if (_solutionAttach) {
+				if (const auto mh
+						= countSolutionMediaHeight(
+							textWidth)) {
+					const auto mediaTop = textTop
+						+ textHeight
+						+ st::historyPollExplanationMediaSkip;
+					const auto isDocument = _solutionMedia
+						&& (_solutionMedia->kind
+								== PollThumbnailKind::Document
+							|| _solutionMedia->kind
+								== PollThumbnailKind::Audio);
+					const auto isThumbed = isDocument
+						&& _owner->_poll->solutionMedia.document
+						&& _owner->_poll->solutionMedia.document
+							->hasThumbnail()
+						&& !_owner->_poll->solutionMedia.document
+							->isSong();
+					const auto &fileSt = isThumbed
+						? st::msgFileThumbLayout
+						: st::msgFileLayout;
+					const auto shift = isDocument
+						? fileSt.padding.left()
+						: 0;
+					const auto mediaLeft = innerLeft - shift;
+					if (QRect(
+							mediaLeft,
+							mediaTop,
+							_solutionAttach->width(),
+							mh).contains(point)) {
+						result = _solutionAttach->textState(
+							point - QPoint(mediaLeft, mediaTop),
+							request);
+						SetTextStatePosition(&result, 0, false);
+					}
+				}
+			}
+			return result;
+		}
+		if (point.y() >= tshift + solutionHeight) {
+			symbolAdd += _solutionText.length();
+		}
+		tshift += solutionHeight + st::historyPollExplanationSkip;
+	}
+
+	const auto questionH = _question.countHeight(innerWidth);
+	if (QRect(left, tshift, innerWidth, questionH).contains(point)) {
+		result = TextState(
+			_owner->_parent,
+			_question.getState(
+				point - QPoint(left, tshift),
+				innerWidth,
+				request.forText()));
+		AddTextStateOffset(&result, symbolAdd);
+		return result;
+	}
+	if (point.y() >= tshift + questionH) {
+		symbolAdd += _question.length();
+	}
+	tshift += questionH + st::historyPollSubtitleSkip;
+	if (inShowSolution(
+			point, left + innerWidth, tshift)) {
+		result.link = _showSolutionLink;
+		return result;
+	}
+
+	return result;
+}
+
+void Poll::Header::clickHandlerActiveChanged(
+		const ClickHandlerPtr &handler,
+		bool active) {
+	if (_attachedMediaAttach) {
+		_attachedMediaAttach->clickHandlerActiveChanged(
+			handler, active);
+	}
+}
+
+void Poll::Header::clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed) {
+	if (_attachedMediaAttach) {
+		_attachedMediaAttach->clickHandlerPressedChanged(
+			handler, pressed);
+	}
+	if (_solutionAttach) {
+		_solutionAttach->clickHandlerPressedChanged(
+			handler, pressed);
+	}
+}
+
+bool Poll::Header::hasHeavyPart() const {
+	for (const auto &recent : _recentVoters) {
+		if (!recent.userpic.null()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void Poll::Header::unloadHeavyPart() {
+	for (auto &recent : _recentVoters) {
+		recent.userpic = {};
+	}
+}
+
+uint16 Poll::Header::selectionLength() const {
+	return _owner->fullSelectionLength();
+}
+
+struct Poll::Options : public Poll::Part {
+	using Part::Part;
+
+	int countHeight(int innerWidth) const override;
+	void draw(
+		Painter &p,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		const PaintContext &context) const override;
+	TextState textState(
+		QPoint point,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		StateRequest request) const override;
+	void clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed) override;
+	bool hasHeavyPart() const override;
+
+	void checkSendingAnimation() const;
+	void unloadHeavyPart() override;
+
+	[[nodiscard]] int countAnswerContentWidth(
+		const Answer &answer,
+		int innerWidth) const;
+	[[nodiscard]] int countVotesExtraHeight(
+		const Answer &answer,
+		int textWidth) const;
+	[[nodiscard]] int countAnswerHeight(
+		const Answer &answer,
+		int innerWidth) const;
+	void resetAnswersAnimation() const;
+	void radialAnimationCallback() const;
+	int paintAnswer(
+		Painter &p,
+		const Answer &answer,
+		const AnswerAnimation *animation,
+		int left,
+		int top,
+		int width,
+		int outerWidth,
+		const PaintContext &context) const;
+	void paintRadio(
+		Painter &p,
+		const Answer &answer,
+		int left,
+		int top,
+		const PaintContext &context) const;
+	void paintPercent(
+		Painter &p,
+		const QString &percent,
+		int percentWidth,
+		int left,
+		int top,
+		int topPadding,
+		int outerWidth,
+		const PaintContext &context) const;
+	void paintFilling(
+		Painter &p,
+		bool chosen,
+		bool correct,
+		float64 filling,
+		int left,
+		int top,
+		int topPadding,
+		int width,
+		int contentWidth,
+		int contentHeight,
+		const PaintContext &context) const;
+	[[nodiscard]] bool checkAnimationStart() const;
+	[[nodiscard]] bool answerVotesChanged() const;
+	void saveStateInAnimation() const;
+	void startAnswersAnimation() const;
+	void toggleRipple(Answer &answer, bool pressed);
+	void clearSelected();
+	void toggleMultiOption(const QByteArray &option);
+	void sendMultiOptions();
+	void showResults();
+	void showAnswerVotesTooltip(const QByteArray &option);
+	void checkQuizAnswered();
+	[[nodiscard]] ClickHandlerPtr createAnswerClickHandler(
+		const Answer &answer);
+	void updateAnswers();
+	void updateAnswerVotes();
+	void updateAnswerVotesFromOriginal(
+		Answer &answer,
+		const PollAnswer &original,
+		int percent,
+		int maxVotes,
+		bool showPercent);
+
+	std::vector<Answer> _answers;
+	mutable std::unique_ptr<AnswersAnimation> _answersAnimation;
+	mutable std::unique_ptr<SendingAnimation> _sendingAnimation;
+	mutable QImage _fillingIconCache;
+	bool _anyAnswerHasMedia = false;
+	bool _hasSelected = false;
+	bool _votedFromHere = false;
+};
+
+int Poll::Options::countHeight(int innerWidth) const {
+	auto result = ranges::accumulate(ranges::views::all(
+		_answers
+	) | ranges::views::transform([&](const Answer &answer) {
+		return countAnswerHeight(answer, innerWidth);
+	}), 0);
+	if (_owner->canAddOption()) {
+		result += (st::historyPollChoiceRight.height()
+			- st::historyPollFillingHeight) / 2;
+	}
+	return result;
+}
+
+void Poll::Options::draw(
+		Painter &p,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		const PaintContext &context) const {
+	checkSendingAnimation();
+
+	const auto progress = _answersAnimation
+		? _answersAnimation->progress.value(1.)
+		: 1.;
+	if (progress == 1.) {
+		resetAnswersAnimation();
+	}
+
+	auto tshift = 0;
+	auto &&answers = ranges::views::zip(
+		_answers,
+		ranges::views::ints(0, int(_answers.size())));
+	for (const auto &[answer, index] : answers) {
+		const auto animation = _answersAnimation
+			? &_answersAnimation->data[index]
+			: nullptr;
+		if (animation) {
+			animation->percent.update(progress, anim::linear);
+			animation->filling.update(
+				progress,
+				_owner->showVotes()
+					? anim::easeOutCirc
+					: anim::linear);
+			animation->opacity.update(progress, anim::linear);
+		}
+		const auto height = paintAnswer(
+			p,
+			answer,
+			animation,
+			left,
+			tshift,
+			innerWidth,
+			outerWidth,
+			context);
+		tshift += height;
+	}
+}
+
+TextState Poll::Options::textState(
+		QPoint point,
+		int left,
+		int innerWidth,
+		int outerWidth,
+		StateRequest request) const {
+	TextState result;
+	const auto can = _owner->canVote();
+	const auto show = _owner->showVotes();
+
+	auto tshift = 0;
+	for (const auto &answer : _answers) {
+		const auto height = countAnswerHeight(answer, innerWidth);
+		if (point.y() >= tshift && point.y() < tshift + height) {
+			const auto media = answer.thumbnail
+				? PollAnswerMediaSize()
+				: 0;
+			if (media
+				&& answer.mediaHandler
+				&& QRect(
+					left + innerWidth
+						- st::historyPollAnswerPadding.right()
+						- media,
+					tshift + (answer.thumbnail
+						? st::historyPollAnswerPadding
+						: st::historyPollAnswerPaddingNoMedia).top(),
+					media,
+					media).contains(point)) {
+				result.link = answer.mediaHandler;
+			} else {
+				const auto &answerPadding = answer.thumbnail
+					? st::historyPollAnswerPadding
+					: st::historyPollAnswerPaddingNoMedia;
+				const auto aleft = left
+					+ st::historyPollAnswerPadding.left();
+				const auto atop = tshift + answerPadding.top();
+				const auto textWidth = countAnswerContentWidth(
+					answer,
+					innerWidth);
+				const auto textState = answer.text.getStateLeft(
+					point - QPoint(aleft, atop),
+					textWidth,
+					outerWidth,
+					request.forText());
+				if (textState.link) {
+					result.link = textState.link;
+				} else {
+					if (can) {
+						_owner->_lastLinkPoint = point;
+					}
+					result.link = answer.handler;
+				}
+			}
+			if (!can && show) {
+				result.customTooltip = true;
+				using Flag = Ui::Text::StateRequest::Flag;
+				if (request.flags & Flag::LookupCustomTooltip) {
+					const auto quiz = _owner->_poll->quiz();
+					result.customTooltipText = answer.votes
+						? (quiz
+							? tr::lng_polls_answers_count
+							: tr::lng_polls_votes_count)(
+								tr::now,
+								lt_count_decimal,
+								answer.votes)
+						: (quiz
+							? tr::lng_polls_answers_none
+							: tr::lng_polls_votes_none)(tr::now);
+				}
+			}
+			return result;
+		}
+		tshift += height;
+	}
+	return result;
+}
+
+void Poll::Options::clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed) {
+	const auto i = ranges::find(
+		_answers,
+		handler,
+		&Answer::handler);
+	if (i != end(_answers)) {
+		if (_owner->canVote()) {
+			toggleRipple(*i, pressed);
+		}
+	}
+}
+
+bool Poll::Options::hasHeavyPart() const {
+	for (const auto &answer : _answers) {
+		if (!answer.recentVotersImage.isNull()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void Poll::Options::unloadHeavyPart() {
+	for (auto &answer : _answers) {
+		for (auto &recent : answer.recentVoters) {
+			recent.view = {};
+		}
+		answer.recentVotersImage = QImage();
+	}
+}
+
+template <typename Callback>
+Poll::SendingAnimation::SendingAnimation(
+	const QByteArray &option,
+	Callback &&callback)
+: option(option)
+, animation(
+	std::forward<Callback>(callback),
+	st::historyPollRadialAnimation) {
+}
+
+Poll::Answer::Answer() : text(st::msgMinWidth / 2) {
+}
+
+void Poll::Answer::fillData(
+		not_null<PollData*> poll,
+		const PollAnswer &original,
+		Ui::Text::MarkedContext context) {
+	chosen = original.chosen;
+	correct = poll->quiz() ? original.correct : chosen;
+	if (!text.isEmpty() && text.toTextWithEntities() == original.text) {
+		return;
+	}
+	text.setMarkedText(
+		st::historyPollAnswerStyle,
+		original.text,
+		Ui::WebpageTextTitleOptions(),
+		context);
+}
+
+void Poll::Answer::fillMedia(
+		not_null<PollData*> poll,
+		const PollAnswer &original,
+		Window::SessionController::MessageContext messageContext,
+		Fn<void()> repaint,
+		Fn<bool()> paused) {
+	const auto updated = MakePollThumbnail(
+		poll,
+		original,
+		messageContext,
+		paused);
+	const auto same = (updated.kind == thumbnailKind)
+		&& (updated.id == thumbnailId)
+		&& (updated.rounded == thumbnailRounded);
+	if (same) {
+		return;
+	}
+	if (thumbnail) {
+		thumbnail->subscribeToUpdates(nullptr);
+	}
+	thumbnail = updated.thumbnail;
+	mediaHandler = updated.handler;
+	thumbnailRounded = updated.rounded;
+	thumbnailIsVideo = updated.isVideo;
+	thumbnailKind = updated.kind;
+	thumbnailId = updated.id;
+	if (thumbnail) {
+		thumbnail->subscribeToUpdates(std::move(repaint));
+	}
+}
+
+Poll::Footer::Footer(not_null<Poll*> owner)
+: Part(owner)
+, _showResultsLink(
+	std::make_shared<LambdaClickHandler>(crl::guard(
+		owner,
+		[=] { owner->_optionsPart->showResults(); })))
+, _sendVotesLink(
+	std::make_shared<LambdaClickHandler>(crl::guard(
+		owner,
+		[=] { owner->_optionsPart->sendMultiOptions(); })))
+, _adminVotesLink(
+	std::make_shared<LambdaClickHandler>(crl::guard(
+		owner,
+		[=] {
+			if (owner->_flags & PollData::Flag::PublicVotes) {
+				owner->_optionsPart->showResults();
+			} else {
+				owner->_optionsPart->saveStateInAnimation();
+				owner->_adminShowResults = true;
+				owner->_optionsPart->updateAnswerVotes();
+				owner->_optionsPart->startAnswersAnimation();
+				owner->history()->owner().requestViewResize(owner->_parent);
+			}
+		})))
+, _adminBackVoteLink(
+	std::make_shared<LambdaClickHandler>(crl::guard(
+		owner,
+		[=] {
+			owner->_optionsPart->saveStateInAnimation();
+			owner->_adminShowResults = false;
+			owner->_optionsPart->updateAnswerVotes();
+			owner->_optionsPart->startAnswersAnimation();
+			owner->history()->owner().requestViewResize(owner->_parent);
+		})))
+, _saveOptionLink(
+	std::make_shared<LambdaClickHandler>(crl::guard(
+		owner,
+		[=](ClickContext context) {
+			const auto my = context.other.value<ClickHandlerContext>();
+			if (const auto delegate = my.elementDelegate
+				? my.elementDelegate()
+				: nullptr) {
+				delegate->elementSubmitAddPollOption(
+					owner->_parent->data()->fullId());
+			}
+		})))
+, _closeTimer([=] { owner->repaint(); }) {
+}
+
+Poll::Poll(
+	not_null<Element*> parent,
+	not_null<PollData*> poll,
+	const TextWithEntities &consumed)
+: Media(parent)
+, _poll(poll)
+{
+	_headerPart = std::make_unique<Header>(this);
+	_optionsPart = std::make_unique<Options>(this);
+	_addOptionPart = std::make_unique<AddOption>(this);
+	_footerPart = std::make_unique<Footer>(this);
+	if (!consumed.text.isEmpty()) {
+		_headerPart->updateDescription();
+	}
+	history()->owner().registerPollView(_poll, _parent);
+}
+
+QSize Poll::countOptimalSize() {
+	updateTexts();
+
+	const auto paddings = st::msgPadding.left() + st::msgPadding.right();
+
+	auto maxWidth = st::msgFileMinWidth;
+	accumulate_max(maxWidth, paddings + _headerPart->_description.maxWidth());
+	accumulate_max(maxWidth, paddings + _headerPart->_question.maxWidth());
+	for (const auto &answer : _optionsPart->_answers) {
+		const auto media = answer.thumbnail
+			? (PollAnswerMediaSize() + PollAnswerMediaSkip())
+			: 0;
+		accumulate_max(
+			maxWidth,
+			paddings
+			+ st::historyPollAnswerPadding.left()
+			+ answer.text.maxWidth()
+			+ media
+			+ st::historyPollAnswerPadding.right());
+	}
+
+	const auto innerWidth = maxWidth - paddings;
+	auto minHeight = _headerPart->countHeight(innerWidth)
+		+ _optionsPart->countHeight(innerWidth)
+		+ _addOptionPart->countHeight(innerWidth)
+		+ _footerPart->countHeight(innerWidth);
+	return { maxWidth, minHeight };
+}
+
+bool Poll::showVotes() const {
+	if (_adminShowResults) {
+		return true;
+	}
+	if (_flags & PollData::Flag::HideResultsUntilClose) {
+		return (_flags & PollData::Flag::Closed) || _poll->creator();
+	}
+	return _voted
+		|| (_flags & PollData::Flag::Closed)
+		|| voteRestricted();
+}
+
+PollData::VoteRestriction Poll::knownVoteRestriction() const {
+	const auto fromServer = _poll->voteRestriction();
+	if (fromServer != PollData::VoteRestriction::None) {
+		if (IsExpiringVoteRestriction(fromServer)) {
+			const auto updated = _poll->voteRestrictionUpdated();
+			if (updated > 0
+				&& (updated + kExpiringVoteRestrictionDuration <= crl::now())) {
+				return PollData::VoteRestriction::None;
+			}
+		}
+		return fromServer;
+	}
+	if (_poll->subscribersOnly()) {
+		const auto channel = _parent->data()->history()->peer->asChannel();
+		if (channel && !channel->amIn()) {
+			return PollData::VoteRestriction::SubscribersOnly;
+		}
+	}
+	if (!_poll->countries.empty()) {
+		const auto userIso2 = _poll->session().appConfig().phoneCountryIso2();
+		if (!userIso2.isEmpty()) {
+			const auto inList = ranges::any_of(
+				_poll->countries,
+				[&](const QString &iso2) {
+					return !iso2.compare(userIso2, Qt::CaseInsensitive);
+				});
+			if (!inList) {
+				return PollData::VoteRestriction::Countries;
+			}
+		}
+	}
+	return PollData::VoteRestriction::None;
+}
+
+bool Poll::voteRestricted() const {
+	if (knownVoteRestriction() == PollData::VoteRestriction::None) {
+		return false;
+	} else if (_voted
+		|| _adminShowResults
+		|| !_parent->data()->isRegular()) {
+		return false;
+	} else if (_flags & PollData::Flag::HideResultsUntilClose) {
+		return !(_flags & PollData::Flag::Closed) && !_poll->creator();
+	}
+	return !(_flags & PollData::Flag::Closed);
+}
+
+void Poll::showVoteRestrictionToast() const {
+	const auto restriction = knownVoteRestriction();
+	if (restriction == PollData::VoteRestriction::None) {
+		return;
+	}
+	const auto peer = _parent->data()->history()->peer;
+	auto text = PollVoteRestrictionText(restriction, peer, _poll);
+	if (text.text.isEmpty()) {
+		return;
+	}
+	if (const auto window = peer->session().tryResolveWindow(peer)) {
+		window->showToast({
+			.text = std::move(text),
+			.iconLottie = u"ban"_q,
+			.iconLottieSize = st::pollToastIconSize,
+			.duration = kVoteRestrictionToastDuration,
+		});
+	}
+}
+
+bool Poll::isAuthorNotVoted() const {
+	return _parent->data()->out()
+		&& !_voted
+		&& !(_flags & PollData::Flag::Closed);
+}
+
+bool Poll::canVote() const {
+	return !showVotes()
+		&& !_voted
+		&& _parent->data()->isRegular()
+		&& (knownVoteRestriction() == PollData::VoteRestriction::None);
+}
+
+bool Poll::canSendVotes() const {
+	return canVote() && _optionsPart->_hasSelected;
+}
+
+bool Poll::showVotersCount() const {
+	if (voteRestricted()) {
+		return true;
+	}
+	if (_voted && !showVotes()) {
+		return !(_flags & PollData::Flag::PublicVotes);
+	}
+	return showVotes()
+		? (!_totalVotes || !(_flags & PollData::Flag::PublicVotes))
+		: !(_flags & PollData::Flag::MultiChoice);
+}
+
+bool Poll::inlineFooter() const {
+	return !(_flags
+		& (PollData::Flag::PublicVotes | PollData::Flag::MultiChoice));
+}
+
+bool Poll::canAddOption() const {
+	return (_flags & PollData::Flag::OpenAnswers)
+		&& !(_flags & PollData::Flag::Closed)
+		&& !_parent->data()->Has<HistoryMessageForwarded>()
+		&& (int(_poll->answers.size())
+			< _poll->session().appConfig().pollOptionsLimit());
+}
+
+QRect Poll::addOptionRect(int innerWidth) const {
+	const auto answersHeight = ranges::accumulate(ranges::views::all(
+		_optionsPart->_answers
+	) | ranges::views::transform([&](const Answer &answer) {
+		return _optionsPart->countAnswerHeight(answer, innerWidth);
+	}), 0);
+	const auto top = _headerPart->countQuestionTop(innerWidth)
+		+ _headerPart->_question.countHeight(innerWidth)
+		+ st::historyPollSubtitleSkip
+		+ st::msgDateFont->height
+		+ st::historyPollAnswersSkip
+		+ answersHeight
+		+ (st::historyPollChoiceRight.height()
+			- st::historyPollFillingHeight) / 2;
+	return QRect(
+		st::msgPadding.left(),
+		top,
+		innerWidth,
+		_addOptionPart->countHeight(innerWidth));
 }
 
-int Poll::countAnswerTop(
-		const Answer &answer,
-		int innerWidth) const {
-	auto tshift = st::historyPollQuestionTop;
-	if (!isBubbleTop()) {
-		tshift -= st::msgFileTopMinus;
+void Poll::setAddOptionActive(bool active) {
+	if (_addOptionActive != active) {
+		_addOptionActive = active;
+		history()->owner().requestViewResize(_parent);
 	}
-	tshift += _question.countHeight(innerWidth) + st::historyPollSubtitleSkip;
-	tshift += st::msgDateFont->height + st::historyPollAnswersSkip;
-	const auto i = ranges::find(
-		_answers,
-		&answer,
-		[](const Answer &answer) { return &answer; });
-	const auto countHeight = [&](const Answer &answer) {
-		return countAnswerHeight(answer, innerWidth);
-	};
-	tshift += ranges::accumulate(
-		begin(_answers),
-		i,
-		0,
-		ranges::plus(),
-		countHeight);
-	return tshift;
 }
 
-int Poll::countAnswerHeight(
+int Poll::Options::countAnswerContentWidth(
 		const Answer &answer,
 		int innerWidth) const {
 	const auto answerWidth = innerWidth
 		- st::historyPollAnswerPadding.left()
 		- st::historyPollAnswerPadding.right();
-	return st::historyPollAnswerPadding.top()
-		+ answer.text.countHeight(answerWidth)
-		+ st::historyPollAnswerPadding.bottom();
+	const auto mediaWidth = answer.thumbnail
+		? (PollAnswerMediaSize() + PollAnswerMediaSkip())
+		: 0;
+	return std::max(1, answerWidth - mediaWidth);
+}
+
+int Poll::Options::countVotesExtraHeight(
+		const Answer &answer,
+		int textWidth) const {
+	if (answer.votesCountString.isEmpty()
+		&& answer.recentVoters.empty()) {
+		return 0;
+	}
+	const auto lineWidths = answer.text.countLineWidths(textWidth);
+	if (lineWidths.empty()) {
+		return 0;
+	}
+	const auto voterCount = int(answer.recentVoters.size());
+	const auto &ust = st::historyPollAnswerUserpics;
+	const auto userpicsWidth = voterCount
+		? (ust.size + (voterCount - 1) * (ust.size - ust.shift))
+		: 0;
+	const auto userpicsExtra = userpicsWidth
+		? (st::historyPollAnswerUserpicsSkip + userpicsWidth)
+		: 0;
+	const auto votesWidth = answer.votesCountWidth
+		+ userpicsExtra
+		+ st::historyPollFillingRight
+		+ st::historyPollPercentSkip;
+	const auto lastLineWidth = lineWidths.back();
+	if (lastLineWidth + votesWidth <= textWidth) {
+		return 0;
+	}
+	return st::normalFont->height;
+}
+
+int Poll::Options::countAnswerHeight(
+		const Answer &answer,
+		int innerWidth) const {
+	const auto media = answer.thumbnail ? PollAnswerMediaSize() : 0;
+	const auto textWidth = countAnswerContentWidth(answer, innerWidth);
+	const auto &padding = answer.thumbnail
+		? st::historyPollAnswerPadding
+		: st::historyPollAnswerPaddingNoMedia;
+	const auto textHeight = answer.text.countHeight(textWidth);
+	const auto multiline = (textHeight
+		> st::historyPollPercentFont->height);
+	const auto votesExtra = _owner->showVotes()
+		? countVotesExtraHeight(answer, textWidth)
+		: 0;
+	const auto fillingWithChoice = (_owner->showVotes()
+		&& (media || multiline || votesExtra))
+		? (std::max(textHeight, st::historyPollPercentFont->height)
+			+ votesExtra
+			+ st::historyPollFillingTop
+			+ (st::historyPollFillingHeight
+				+ st::historyPollChoiceRight.height()) / 2)
+		: 0;
+	return padding.top()
+		+ std::max({
+			textHeight,
+			media,
+			fillingWithChoice,
+		})
+		+ padding.bottom();
 }
 
 QSize Poll::countCurrentSize(int newWidth) {
@@ -354,58 +2443,50 @@ QSize Poll::countCurrentSize(int newWidth) {
 		- st::msgPadding.left()
 		- st::msgPadding.right();
 
-	const auto answersHeight = ranges::accumulate(ranges::views::all(
-		_answers
-	) | ranges::views::transform([&](const Answer &answer) {
-		return countAnswerHeight(answer, innerWidth);
-	}), 0);
-
-	const auto bottomButtonHeight = inlineFooter()
-		? 0
-		: st::historyPollBottomButtonSkip;
-	auto newHeight = st::historyPollQuestionTop
-		+ _question.countHeight(innerWidth)
-		+ st::historyPollSubtitleSkip
-		+ st::msgDateFont->height
-		+ st::historyPollAnswersSkip
-		+ answersHeight
-		+ st::historyPollTotalVotesSkip
-		+ bottomButtonHeight
-		+ st::msgDateFont->height
-		+ st::msgPadding.bottom();
-	if (!isBubbleTop()) {
-		newHeight -= st::msgFileTopMinus;
-	}
+	auto newHeight = _headerPart->countHeight(innerWidth)
+		+ _optionsPart->countHeight(innerWidth)
+		+ _addOptionPart->countHeight(innerWidth)
+		+ _footerPart->countHeight(innerWidth);
 	return { newWidth, newHeight };
 }
 
 void Poll::updateTexts() {
+	const auto current = _poll->owner().poll(_poll->id);
+	if (_poll != current) {
+		_poll = current;
+		_pollVersion = 0;
+	}
 	if (_pollVersion == _poll->version) {
 		return;
 	}
 	const auto first = !_pollVersion;
 	_pollVersion = _poll->version;
 
-	const auto willStartAnimation = checkAnimationStart();
+	const auto willStartAnimation = _optionsPart->checkAnimationStart();
 	const auto voted = _voted;
 
-	if (_question.toTextWithEntities() != _poll->question) {
+	_headerPart->updateDescription();
+	if (_headerPart->_question.toTextWithEntities() != _poll->question) {
 		auto options = Ui::WebpageTextTitleOptions();
 		options.maxw = options.maxh = 0;
-		_question.setMarkedText(
+		_headerPart->_question.setMarkedText(
 			st::historyPollQuestionStyle,
 			_poll->question,
 			options,
-			Core::MarkedTextContext{
+			Core::TextContext({
 				.session = &_poll->session(),
-				.customEmojiRepaint = [=] { repaint(); },
+				.repaint = [=] {
+					if (!_parent->delegate()->elementAnimationsPaused()) {
+						repaint();
+					}
+				},
 				.customEmojiLoopLimit = 2,
-			});
+			}));
 	}
-	if (_flags != _poll->flags() || _subtitle.isEmpty()) {
+	if (_flags != _poll->flags() || _headerPart->_subtitle.isEmpty()) {
 		using Flag = PollData::Flag;
 		_flags = _poll->flags();
-		_subtitle.setText(
+		_headerPart->_subtitle.setText(
 			st::msgDateTextStyle,
 			((_flags & Flag::Closed)
 				? tr::lng_polls_closed(tr::now)
@@ -417,23 +2498,424 @@ void Poll::updateTexts() {
 					? tr::lng_polls_public(tr::now)
 					: tr::lng_polls_anonymous(tr::now))));
 	}
-	updateRecentVoters();
-	updateAnswers();
+	if (_footerPart->_adminBackVoteLabel.isEmpty()) {
+		_footerPart->_adminBackVoteLabel.setMarkedText(
+			st::semiboldTextStyle,
+			tr::lng_polls_admin_back_vote(
+				tr::now,
+				lt_arrow,
+				Ui::Text::IconEmoji(&st::textBackIconEmoji),
+				tr::marked));
+	}
+	_headerPart->updateRecentVoters();
+	_optionsPart->updateAnswers();
+	_headerPart->updateAttachedMedia();
+	_headerPart->updateSolutionText();
+	_headerPart->updateSolutionMedia();
+	refreshWebpageSubscriptions();
 	updateVotes();
 
 	if (willStartAnimation) {
-		startAnswersAnimation();
+		_optionsPart->startAnswersAnimation();
 		if (!voted) {
-			checkQuizAnswered();
+			_optionsPart->checkQuizAnswered();
 		}
 	}
-	solutionToggled(
-		_solutionShown,
+	_headerPart->solutionToggled(
+		_headerPart->_solutionShown,
 		first ? anim::type::instant : anim::type::normal);
 }
 
-void Poll::checkQuizAnswered() {
-	if (!_voted || !_votedFromHere || !_poll->quiz() || anim::Disabled()) {
+void Poll::Header::updateDescription() {
+	const auto media = _owner->_parent->data()->media();
+	const auto consumed = media
+		? media->consumedMessageText()
+		: TextWithEntities();
+	if (consumed.text.isEmpty()) {
+		_description = Ui::Text::String(st::msgMinWidth / 2);
+		return;
+	}
+	if (_description.toTextWithEntities() == consumed) {
+		return;
+	}
+	const auto context = Core::TextContext({
+		.session = &_owner->_poll->session(),
+		.repaint = [=] {
+			if (!_owner->_parent->delegate()->elementAnimationsPaused()) {
+				_owner->_parent->customEmojiRepaint();
+			}
+		},
+		.customEmojiLoopLimit = 2,
+	});
+	_description.setMarkedText(
+		st::webPageDescriptionStyle,
+		consumed,
+		Ui::ItemTextOptions(_owner->_parent->data()),
+		context);
+	InitElementTextPart(_owner->_parent, _description);
+}
+
+void Poll::Header::updateSolutionText() {
+	if (_owner->_poll->solution.text.isEmpty()) {
+		_solutionText = Ui::Text::String();
+		return;
+	}
+	if (_solutionText.toTextWithEntities() == _owner->_poll->solution) {
+		return;
+	}
+	_solutionText = Ui::Text::String(st::msgMinWidth);
+	_solutionText.setMarkedText(
+		st::webPageDescriptionStyle,
+		_owner->_poll->solution,
+		Ui::ItemTextOptions(_owner->_parent->data()),
+		Core::TextContext({
+			.session = &_owner->_poll->session(),
+			.repaint = [=] {
+				if (!_owner->_parent->delegate()->elementAnimationsPaused()) {
+					_owner->repaint();
+				}
+			},
+		}));
+	InitElementTextPart(_owner->_parent, _solutionText);
+}
+
+void Poll::Header::updateSolutionMedia() {
+	const auto item = _owner->_parent->data();
+	const auto messageContext = Window::SessionController::MessageContext{
+		.id = item->fullId(),
+		.topicRootId = item->topicRootId(),
+		.monoforumPeerId = item->sublistPeerId(),
+	};
+	const auto paused = [=] {
+		return _owner->_parent->delegate()->elementAnimationsPaused();
+	};
+	const auto updated = MakePollThumbnail(
+		_owner->_poll,
+		_owner->_poll->solutionMedia,
+		messageContext,
+		paused);
+	if (!updated.thumbnail) {
+		_solutionMedia = nullptr;
+		_solutionAttach = nullptr;
+		return;
+	}
+	if (_solutionMedia
+		&& _solutionMedia->kind == updated.kind
+		&& _solutionMedia->id == updated.id) {
+		return;
+	}
+	if (!_solutionMedia) {
+		_solutionMedia = std::make_unique<SolutionMedia>();
+	}
+	_solutionMedia->kind = updated.kind;
+	_solutionMedia->id = updated.id;
+	auto photo = (PhotoData*)(nullptr);
+	auto document = (DocumentData*)(nullptr);
+	if (updated.kind == PollThumbnailKind::Photo && updated.id) {
+		photo = _owner->_poll->owner().photo(PhotoId(updated.id));
+	} else if (updated.kind == PollThumbnailKind::Document && updated.id) {
+		document = _owner->_poll->owner().document(DocumentId(updated.id));
+	} else if (updated.kind == PollThumbnailKind::Audio && updated.id) {
+		document = _owner->_poll->owner().document(DocumentId(updated.id));
+	} else if (updated.kind == PollThumbnailKind::Geo
+		&& _owner->_poll->solutionMedia.geo) {
+		const auto &point = *_owner->_poll->solutionMedia.geo;
+		const auto cloudImage = _owner->_poll->owner().location(point);
+		_solutionAttach = std::make_unique<Location>(
+			_owner->_parent,
+			cloudImage,
+			point,
+			QString(),
+			QString());
+		return;
+	}
+	_solutionAttach = (photo || document)
+		? CreateAttach(_owner->_parent, document, photo)
+		: nullptr;
+}
+
+void Poll::Header::updateAttachedMedia() {
+	const auto item = _owner->_parent->data();
+	const auto messageContext = Window::SessionController::MessageContext{
+		.id = item->fullId(),
+		.topicRootId = item->topicRootId(),
+		.monoforumPeerId = item->sublistPeerId(),
+	};
+	const auto paused = [=] {
+		return _owner->_parent->delegate()->elementAnimationsPaused();
+	};
+	const auto updated = MakePollThumbnail(
+		_owner->_poll,
+		_owner->_poll->attachedMedia,
+		messageContext,
+		paused);
+	const auto same = (_attachedMedia->kind == updated.kind)
+		&& (_attachedMedia->id == updated.id)
+		&& (_attachedMedia->rounded == updated.rounded);
+	if (same) {
+		return;
+	}
+	if (_attachedMedia->thumbnail) {
+		_attachedMedia->thumbnail->subscribeToUpdates(nullptr);
+	}
+	_attachedMediaCache = QImage();
+	_attachedMedia->thumbnail = updated.thumbnail;
+	_attachedMedia->handler = updated.handler;
+	_attachedMedia->kind = updated.kind;
+	_attachedMedia->rounded = updated.rounded;
+	_attachedMedia->id = updated.id;
+	_attachedMedia->photo = nullptr;
+	_attachedMedia->photoMedia = nullptr;
+	_attachedMedia->photoSize = QSize();
+	if (updated.kind == PollThumbnailKind::Photo && updated.id) {
+		const auto photo = _owner->_poll->owner().photo(PhotoId(updated.id));
+		_attachedMedia->photo = photo;
+		_attachedMedia->photoMedia = photo->createMediaView();
+		_attachedMedia->photoMedia->wanted(
+			Data::PhotoSize::Large,
+			_owner->_parent->data()->fullId());
+		if (const auto size = photo->size(Data::PhotoSize::Large)) {
+			_attachedMedia->photoSize = *size;
+		} else if (const auto s = photo->size(Data::PhotoSize::Thumbnail)) {
+			_attachedMedia->photoSize = *s;
+		}
+	}
+	if ((updated.kind == PollThumbnailKind::Document
+		|| updated.kind == PollThumbnailKind::Audio) && updated.id) {
+		const auto document = _owner->_poll->owner().document(
+			DocumentId(updated.id));
+		_attachedMediaAttach = CreateAttach(
+			_owner->_parent,
+			document,
+			nullptr);
+	} else {
+		_attachedMediaAttach = nullptr;
+	}
+	if (_attachedMedia->thumbnail) {
+		_attachedMedia->thumbnail->subscribeToUpdates(
+			crl::guard(_owner, [=] {
+				if (!_owner->_parent->delegate()->elementAnimationsPaused()) {
+					_attachedMediaCache = QImage();
+					_owner->repaint();
+				}
+			}));
+	}
+}
+
+int Poll::Header::countTopContentSkip(int pollWidth) const {
+	return countTopMediaHeight(pollWidth)
+		? st::historyPollMediaTopSkip
+		: _owner->isBubbleTop()
+		? st::historyPollQuestionTop
+		: (st::historyPollQuestionTop - st::msgFileTopMinus);
+}
+
+int Poll::Header::countTopMediaHeight(int pollWidth) const {
+	if (!_attachedMedia || !_attachedMedia->thumbnail) {
+		return 0;
+	}
+	if (_attachedMediaAttach) {
+		return countAttachHeight(pollWidth);
+	}
+	if (_attachedMedia->kind == PollThumbnailKind::Photo
+		&& !_attachedMedia->photoSize.isEmpty()) {
+		const auto w = pollWidth > 0 ? pollWidth : _owner->width();
+		const auto sideSkip = st::historyPollMediaSideSkip;
+		const auto availableWidth = w - 2 * sideSkip;
+		const auto &original = _attachedMedia->photoSize;
+		return std::max(
+			1,
+			int(original.height() * availableWidth / original.width()));
+	}
+	return st::historyPollMediaHeight;
+}
+
+int Poll::Header::countAttachHeight(int pollWidth) const {
+	if (!_attachedMediaAttach) {
+		return 0;
+	}
+	_attachedMediaAttach->initDimensions();
+	const auto w = pollWidth > 0 ? pollWidth : _owner->width();
+	const auto sideSkip = st::historyPollMediaSideSkip;
+	const auto innerWidth = w - 2 * sideSkip;
+	return _attachedMediaAttach->resizeGetHeight(
+		std::max(1, innerWidth));
+}
+
+QRect Poll::Header::countTopMediaRect(int top) const {
+	const auto sideSkip = st::historyPollMediaSideSkip;
+	const auto mediaHeight = countTopMediaHeight();
+	return mediaHeight
+		? QRect(
+			sideSkip,
+			top,
+			std::max(1, _owner->width() - 2 * sideSkip),
+			mediaHeight)
+		: QRect();
+}
+
+Ui::BubbleRounding Poll::Header::topMediaRounding() const {
+	using Corner = Ui::BubbleCornerRounding;
+	auto result = _owner->adjustedBubbleRounding(
+		RectPart::BottomLeft | RectPart::BottomRight);
+	const auto normalize = [](Corner value) {
+		return (value == Corner::Large)
+			? Corner::Large
+			: (value == Corner::None)
+			? Corner::None
+			: Corner::Small;
+	};
+	result.topLeft = normalize(result.topLeft);
+	result.topRight = normalize(result.topRight);
+	result.bottomLeft = Corner::Small;
+	result.bottomRight = Corner::Small;
+	return result;
+}
+
+void Poll::Header::validateTopMediaCache(QSize size) const {
+	if (!_attachedMedia || !_attachedMedia->thumbnail || size.isEmpty()) {
+		return;
+	}
+	const auto ratio = style::DevicePixelRatio();
+	const auto rounding = topMediaRounding();
+	auto source = QImage();
+	auto blurred = false;
+	if (_attachedMedia->photoMedia) {
+		if (const auto image
+			= _attachedMedia->photoMedia->image(Data::PhotoSize::Large)) {
+			source = image->original();
+		} else if (const auto image
+			= _attachedMedia->photoMedia->image(
+				Data::PhotoSize::Thumbnail)) {
+			source = image->original();
+			blurred = true;
+		} else if (const auto image
+			= _attachedMedia->photoMedia->thumbnailInline()) {
+			source = image->original();
+			blurred = true;
+		}
+	}
+	if (source.isNull()) {
+		source = _attachedMedia->thumbnail->image(
+			std::max(size.width(), size.height()) * ratio);
+	}
+	if (source.isNull()) {
+		return;
+	}
+	if ((_attachedMediaCache.size() == (size * ratio))
+		&& (_attachedMediaCacheRounding == rounding)
+		&& (_attachedMediaCacheBlurred == blurred)) {
+		return;
+	}
+	const auto sw = source.width();
+	const auto sh = source.height();
+	const auto tw = size.width() * ratio;
+	const auto th = size.height() * ratio;
+	if (sw * th != sh * tw) {
+		const auto cropW = std::min(sw, sh * tw / th);
+		const auto cropH = std::min(sh, sw * th / tw);
+		source = source.copy(
+			(sw - cropW) / 2,
+			(sh - cropH) / 2,
+			cropW,
+			cropH);
+	}
+	const auto options = blurred
+		? Images::Option::Blur
+		: Images::Option();
+	auto prepared = Images::Prepare(
+		source,
+		size * ratio,
+		{ .options = options, .outer = size });
+	prepared = Images::Round(
+		std::move(prepared),
+		MediaRoundingMask(rounding));
+	prepared.setDevicePixelRatio(ratio);
+	_attachedMediaCache = std::move(prepared);
+	_attachedMediaCacheRounding = rounding;
+	_attachedMediaCacheBlurred = blurred;
+}
+
+int Poll::Header::countDescriptionHeight(int innerWidth) const {
+	return _description.isEmpty() ? 0 : _description.countHeight(innerWidth);
+}
+
+int Poll::Header::countSolutionMediaHeight(int mediaWidth) const {
+	if (!_solutionAttach) {
+		return 0;
+	}
+	_solutionAttach->initDimensions();
+	return _solutionAttach->resizeGetHeight(mediaWidth);
+}
+
+int Poll::Header::countSolutionBlockHeight(int innerWidth) const {
+	if (!_solutionShown || !canShowSolution()) {
+		return 0;
+	}
+	const auto &qst = st::historyPagePreview;
+	const auto textWidth = innerWidth
+		- qst.padding.left()
+		- qst.padding.right();
+	auto height = qst.padding.top();
+	height += st::semiboldFont->height;
+	height += st::historyPollExplanationTitleSkip;
+	height += _solutionText.countHeight(textWidth);
+	if (const auto mediaHeight = countSolutionMediaHeight(textWidth)) {
+		height += st::historyPollExplanationMediaSkip + mediaHeight;
+	}
+	height += qst.padding.bottom();
+	return height;
+}
+
+int Poll::Header::countQuestionTop(int innerWidth, int pollWidth) const {
+	auto result = countTopContentSkip(pollWidth);
+	if (const auto mediaHeight = countTopMediaHeight(pollWidth)) {
+		result += mediaHeight + st::historyPollMediaSkip;
+	}
+	if (const auto descriptionHeight = countDescriptionHeight(innerWidth)) {
+		result += descriptionHeight + st::historyPollDescriptionSkip;
+	}
+	if (const auto solutionHeight = countSolutionBlockHeight(innerWidth)) {
+		result += solutionHeight + st::historyPollExplanationSkip;
+	}
+	return result;
+}
+
+uint16 Poll::Header::solutionSelectionLength() const {
+	return (_solutionShown && canShowSolution())
+		? _solutionText.length()
+		: uint16(0);
+}
+
+TextSelection Poll::Header::toSolutionSelection(
+		TextSelection selection) const {
+	return UnshiftItemSelection(selection, _description);
+}
+
+TextSelection Poll::Header::fromSolutionSelection(
+		TextSelection selection) const {
+	return ShiftItemSelection(selection, _description);
+}
+
+TextSelection Poll::Header::toQuestionSelection(
+		TextSelection selection) const {
+	return UnshiftItemSelection(
+		selection,
+		uint16(_description.length() + solutionSelectionLength()));
+}
+
+TextSelection Poll::Header::fromQuestionSelection(
+		TextSelection selection) const {
+	return ShiftItemSelection(
+		selection,
+		uint16(_description.length() + solutionSelectionLength()));
+}
+
+void Poll::Options::checkQuizAnswered() {
+	if (!_owner->_voted
+		|| !_votedFromHere
+		|| !_owner->_poll->quiz()
+		|| anim::Disabled()) {
 		return;
 	}
 	const auto i = ranges::find(_answers, true, &Answer::chosen);
@@ -441,29 +2923,26 @@ void Poll::checkQuizAnswered() {
 		return;
 	}
 	if (i->correct) {
-		_fireworksAnimation = std::make_unique<Ui::FireworksAnimation>(
-			[=] { repaint(); });
+		_owner->_fireworksAnimation = std::make_unique<Ui::FireworksAnimation>(
+			[=] { _owner->repaint(); });
 	} else {
-		_wrongAnswerAnimation.start(
-			[=] { repaint(); },
+		_owner->_wrongAnswerAnimation.start(
+			[=] { _owner->repaint(); },
 			0.,
 			1.,
 			kRollDuration,
 			anim::linear);
-		showSolution();
+		_owner->_headerPart->showSolution();
 	}
 }
 
-void Poll::showSolution() const {
-	if (!_poll->solution.text.isEmpty()) {
+void Poll::Header::showSolution() const {
+	if (!_owner->_poll->solution.text.isEmpty()) {
 		solutionToggled(true);
-		_parent->delegate()->elementShowTooltip(
-			_poll->solution,
-			crl::guard(this, [=] { solutionToggled(false); }));
 	}
 }
 
-void Poll::solutionToggled(
+void Poll::Header::solutionToggled(
 		bool solutionShown,
 		anim::type animated) const {
 	_solutionShown = solutionShown;
@@ -472,27 +2951,26 @@ void Poll::solutionToggled(
 		if (animated == anim::type::instant
 			&& _solutionButtonAnimation.animating()) {
 			_solutionButtonAnimation.stop();
-			repaint();
+			_owner->repaint();
 		}
 		return;
 	}
 	_solutionButtonVisible = visible;
-	history()->owner().notifyViewLayoutChange(_parent);
 	if (animated == anim::type::instant) {
 		_solutionButtonAnimation.stop();
-		repaint();
 	} else {
 		_solutionButtonAnimation.start(
-			[=] { repaint(); },
+			[=] { _owner->repaint(); },
 			visible ? 0. : 1.,
 			visible ? 1. : 0.,
 			st::fadeWrapDuration);
 	}
+	_owner->history()->owner().requestViewResize(_owner->_parent);
 }
 
-void Poll::updateRecentVoters() {
+void Poll::Header::updateRecentVoters() {
 	auto &&sliced = ranges::views::all(
-		_poll->recentVoters
+		_owner->_poll->recentVoters
 	) | ranges::views::take(kShowRecentVotersCount);
 	const auto changed = !ranges::equal(
 		_recentVoters,
@@ -505,7 +2983,7 @@ void Poll::updateRecentVoters() {
 		) | ranges::views::transform([](not_null<PeerData*> peer) {
 			return RecentVoter{ peer };
 		}) | ranges::to_vector;
-		const auto has = hasHeavyPart();
+		const auto has = _owner->hasHeavyPart();
 		if (has) {
 			for (auto &voter : updated) {
 				const auto i = ranges::find(
@@ -518,64 +2996,157 @@ void Poll::updateRecentVoters() {
 			}
 		}
 		_recentVoters = std::move(updated);
-		if (has && !hasHeavyPart()) {
-			_parent->checkHeavyPart();
+		if (has && !_owner->hasHeavyPart()) {
+			_owner->_parent->checkHeavyPart();
 		}
 	}
 }
 
-void Poll::updateAnswers() {
-	const auto context = Core::MarkedTextContext{
-		.session = &_poll->session(),
-		.customEmojiRepaint = [=] { repaint(); },
+void Poll::Options::updateAnswers() {
+	const auto context = Core::TextContext({
+		.session = &_owner->_poll->session(),
+		.repaint = [=] {
+			if (!_owner->_parent->delegate()->elementAnimationsPaused()) {
+				_owner->repaint();
+			}
+		},
 		.customEmojiLoopLimit = 2,
+	});
+	const auto repaintThumbnail = crl::guard(_owner, [=] {
+		if (!_owner->_parent->delegate()->elementAnimationsPaused()) {
+			_owner->repaint();
+		}
+	});
+	const auto paused = [=] {
+		return _owner->_parent->delegate()->elementAnimationsPaused();
 	};
-	const auto changed = !ranges::equal(
-		_answers,
-		_poll->answers,
-		ranges::equal_to(),
-		&Answer::option,
-		&PollAnswer::option);
+	const auto item = _owner->_parent->data();
+	const auto messageContext = Window::SessionController::MessageContext{
+		.id = item->fullId(),
+		.topicRootId = item->topicRootId(),
+		.monoforumPeerId = item->sublistPeerId(),
+	};
+	auto options = ranges::views::all(
+		_owner->_poll->answers
+	) | ranges::views::transform(&PollAnswer::option) | ranges::to_vector;
+	if ((_owner->_flags & PollData::Flag::ShuffleAnswers)
+		&& !(_owner->_flags & PollData::Flag::Creator)) {
+		const auto userId = _owner->_poll->session().userId();
+		const auto pollId = _owner->_poll->id;
+		ranges::sort(options, [&](const QByteArray &a, const QByteArray &b) {
+			const auto hashA = HashPollShuffleValue(userId, pollId, a);
+			const auto hashB = HashPollShuffleValue(userId, pollId, b);
+			return (hashA == hashB) ? (a < b) : (hashA < hashB);
+		});
+	}
+	const auto changed = (_answers.size() != options.size())
+		|| !ranges::equal(
+			_answers,
+			options,
+			ranges::equal_to(),
+			&Answer::option);
 	if (!changed) {
-		auto &&answers = ranges::views::zip(_answers, _poll->answers);
-		for (auto &&[answer, original] : answers) {
-			answer.fillData(_poll, original, context);
+		for (auto &answer : _answers) {
+			const auto i = ranges::find(
+				_owner->_poll->answers,
+				answer.option,
+				&PollAnswer::option);
+			Assert(i != end(_owner->_poll->answers));
+			answer.fillData(_owner->_poll, *i, context);
+			answer.fillMedia(
+				_owner->_poll,
+				*i,
+				messageContext,
+				repaintThumbnail,
+				paused);
 		}
+		_anyAnswerHasMedia = ranges::any_of(_answers, [](const Answer &a) {
+			return a.thumbnail != nullptr;
+		});
 		return;
 	}
-	_answers = ranges::views::all(
-		_poll->answers
-	) | ranges::views::transform([&](const PollAnswer &answer) {
+	_answers = ranges::views::all(options) | ranges::views::transform([&](
+			const QByteArray &option) {
 		auto result = Answer();
-		result.option = answer.option;
-		result.fillData(_poll, answer, context);
+		result.option = option;
+		const auto i = ranges::find(
+			_owner->_poll->answers,
+			option,
+			&PollAnswer::option);
+		Assert(i != end(_owner->_poll->answers));
+		result.fillData(_owner->_poll, *i, context);
+		result.fillMedia(
+			_owner->_poll,
+			*i,
+			messageContext,
+			repaintThumbnail,
+			paused);
 		return result;
 	}) | ranges::to_vector;
 
+	if ((_owner->_flags & PollData::Flag::ShuffleAnswers)
+		&& !(_owner->_flags & PollData::Flag::Creator)) {
+		const auto visitorId = _owner->_poll->session().userId();
+		const auto pollId = _owner->_poll->id;
+		ranges::sort(_answers, [&](const Answer &a, const Answer &b) {
+			return HashPollShuffleValue(visitorId, pollId, a.option)
+				< HashPollShuffleValue(visitorId, pollId, b.option);
+		});
+	}
+
 	for (auto &answer : _answers) {
 		answer.handler = createAnswerClickHandler(answer);
 	}
+	_anyAnswerHasMedia = ranges::any_of(_answers, [](const Answer &a) {
+		return a.thumbnail != nullptr;
+	});
 
 	resetAnswersAnimation();
 }
 
-ClickHandlerPtr Poll::createAnswerClickHandler(
+ClickHandlerPtr Poll::Options::createAnswerClickHandler(
 		const Answer &answer) {
 	const auto option = answer.option;
-	if (_flags & PollData::Flag::MultiChoice) {
-		return std::make_shared<LambdaClickHandler>(crl::guard(this, [=] {
-			toggleMultiOption(option);
+	auto result = ClickHandlerPtr();
+	if (_owner->_flags & PollData::Flag::MultiChoice) {
+		result = std::make_shared<LambdaClickHandler>(crl::guard(_owner, [=] {
+			if (Logs::DebugEnabled() && base::IsCtrlPressed()) {
+				TextUtilities::SetClipboardText(
+					TextForMimeData::Simple(_owner->_poll->debugString()));
+				return;
+			}
+			if (_owner->canVote()) {
+				_owner->_optionsPart->toggleMultiOption(option);
+			} else if (_owner->voteRestricted()) {
+				_owner->showVoteRestrictionToast();
+			} else if (_owner->showVotes()) {
+				_owner->_optionsPart->showAnswerVotesTooltip(option);
+			}
+		}));
+	} else {
+		result = std::make_shared<LambdaClickHandler>(crl::guard(_owner, [=] {
+			if (Logs::DebugEnabled() && base::IsCtrlPressed()) {
+				TextUtilities::SetClipboardText(
+					TextForMimeData::Simple(_owner->_poll->debugString()));
+				return;
+			}
+			if (_owner->canVote()) {
+				_owner->_optionsPart->_votedFromHere = true;
+				_owner->history()->session().api().polls().sendVotes(
+					_owner->_parent->data()->fullId(),
+					{ option });
+			} else if (_owner->voteRestricted()) {
+				_owner->showVoteRestrictionToast();
+			} else if (_owner->showVotes()) {
+				_owner->_optionsPart->showAnswerVotesTooltip(option);
+			}
 		}));
 	}
-	return std::make_shared<LambdaClickHandler>(crl::guard(this, [=] {
-		_votedFromHere = true;
-		history()->session().api().polls().sendVotes(
-			_parent->data()->fullId(),
-			{ option });
-	}));
+	result->setProperty(kPollOptionProperty, option);
+	return result;
 }
 
-void Poll::toggleMultiOption(const QByteArray &option) {
+void Poll::Options::toggleMultiOption(const QByteArray &option) {
 	const auto i = ranges::find(
 		_answers,
 		option,
@@ -584,7 +3155,7 @@ void Poll::toggleMultiOption(const QByteArray &option) {
 		const auto selected = i->selected;
 		i->selected = !selected;
 		i->selectedAnimation.start(
-			[=] { repaint(); },
+			[=] { _owner->repaint(); },
 			selected ? 1. : 0.,
 			selected ? 0. : 1.,
 			st::defaultCheck.duration);
@@ -597,11 +3168,31 @@ void Poll::toggleMultiOption(const QByteArray &option) {
 		} else {
 			_hasSelected = true;
 		}
-		repaint();
+		_owner->repaint();
+	}
+}
+
+void Poll::Options::clearSelected() {
+	auto changed = false;
+	for (auto &answer : _answers) {
+		if (answer.selected) {
+			answer.selected = false;
+			changed = true;
+		}
+		if (answer.selectedAnimation.animating()) {
+			answer.selectedAnimation.stop();
+		}
+	}
+	if (_hasSelected) {
+		_hasSelected = false;
+		changed = true;
+	}
+	if (changed) {
+		_owner->repaint();
 	}
 }
 
-void Poll::sendMultiOptions() {
+void Poll::Options::sendMultiOptions() {
 	auto chosen = _answers | ranges::views::filter(
 		&Answer::selected
 	) | ranges::views::transform(
@@ -609,16 +3200,35 @@ void Poll::sendMultiOptions() {
 	) | ranges::to_vector;
 	if (!chosen.empty()) {
 		_votedFromHere = true;
-		history()->session().api().polls().sendVotes(
-			_parent->data()->fullId(),
+		_owner->history()->session().api().polls().sendVotes(
+			_owner->_parent->data()->fullId(),
 			std::move(chosen));
 	}
 }
 
-void Poll::showResults() {
-	_parent->delegate()->elementShowPollResults(
-		_poll,
-		_parent->data()->fullId());
+void Poll::Options::showAnswerVotesTooltip(const QByteArray &option) {
+	const auto answer = _owner->_poll->answerByOption(option);
+	if (!answer) {
+		return;
+	}
+	const auto quiz = _owner->_poll->quiz();
+	const auto text = answer->votes
+		? (quiz
+			? tr::lng_polls_answers_count
+			: tr::lng_polls_votes_count)(
+				tr::now,
+				lt_count_decimal,
+				answer->votes)
+		: (quiz
+			? tr::lng_polls_answers_none
+			: tr::lng_polls_votes_none)(tr::now);
+	_owner->_parent->delegate()->elementShowTooltip({ text }, [] {});
+}
+
+void Poll::Options::showResults() {
+	_owner->_parent->delegate()->elementShowPollResults(
+		_owner->_poll,
+		_owner->_parent->data()->fullId());
 }
 
 void Poll::updateVotes() {
@@ -626,21 +3236,35 @@ void Poll::updateVotes() {
 	if (_voted != voted) {
 		_voted = voted;
 		if (_voted) {
-			for (auto &answer : _answers) {
-				answer.selected = false;
+			_optionsPart->clearSelected();
+			if (_optionsPart->_votedFromHere
+				&& (_flags & PollData::Flag::HideResultsUntilClose)
+				&& !(_flags & PollData::Flag::Closed)) {
+				Ui::Toast::Show({
+					.text = tr::lng_polls_results_after_close(
+						tr::now,
+						tr::marked),
+					.iconLottie = u"toast_hide_results"_q,
+					.iconLottieSize = st::pollToastIconSize,
+					.duration = crl::time(3000),
+				});
 			}
 		} else {
-			_votedFromHere = false;
+			_optionsPart->_votedFromHere = false;
+			_optionsPart->clearSelected();
 		}
 	}
-	updateAnswerVotes();
-	updateTotalVotes();
+	if (voteRestricted()) {
+		_optionsPart->clearSelected();
+	}
+	_optionsPart->updateAnswerVotes();
+	_footerPart->updateTotalVotes();
 }
 
-void Poll::checkSendingAnimation() const {
-	const auto &sending = _poll->sendingVotes;
+void Poll::Options::checkSendingAnimation() const {
+	const auto &sending = _owner->_poll->sendingVotes;
 	const auto sendingRadial = (sending.size() == 1)
-		&& !(_flags & PollData::Flag::MultiChoice);
+		&& !(_owner->_flags & PollData::Flag::MultiChoice);
 	if (sendingRadial == (_sendingAnimation != nullptr)) {
 		if (_sendingAnimation) {
 			_sendingAnimation->option = sending.front();
@@ -659,31 +3283,13 @@ void Poll::checkSendingAnimation() const {
 	_sendingAnimation->animation.start();
 }
 
-void Poll::updateTotalVotes() {
-	if (_totalVotes == _poll->totalVoters && !_totalVotesLabel.isEmpty()) {
-		return;
-	}
-	_totalVotes = _poll->totalVoters;
-	const auto quiz = _poll->quiz();
-	const auto string = !_totalVotes
-		? (quiz
-			? tr::lng_polls_answers_none
-			: tr::lng_polls_votes_none)(tr::now)
-		: (quiz
-			? tr::lng_polls_answers_count
-			: tr::lng_polls_votes_count)(
-				tr::now,
-				lt_count_short,
-				_totalVotes);
-	_totalVotesLabel.setText(st::msgDateTextStyle, string);
-}
-
-void Poll::updateAnswerVotesFromOriginal(
+void Poll::Options::updateAnswerVotesFromOriginal(
 		Answer &answer,
 		const PollAnswer &original,
 		int percent,
-		int maxVotes) {
-	if (!showVotes()) {
+		int maxVotes,
+		bool showPercent) {
+	if (!_owner->showVotes() || !showPercent) {
 		answer.votesPercent = 0;
 		answer.votesPercentString.clear();
 		answer.votesPercentWidth = 0;
@@ -694,202 +3300,136 @@ void Poll::updateAnswerVotesFromOriginal(
 		answer.votesPercentWidth = st::historyPollPercentFont->width(
 			answer.votesPercentString);
 	}
+	answer.chosen = original.chosen;
 	answer.votes = original.votes;
-	answer.filling = answer.votes / float64(maxVotes);
+	answer.filling = percent / 100.;
+	if (_owner->showVotes() && answer.votes) {
+		answer.votesCountString = Lang::FormatCountDecimal(answer.votes);
+		answer.votesCountWidth = st::normalFont->width(
+			answer.votesCountString);
+	} else {
+		answer.votesCountString.clear();
+		answer.votesCountWidth = 0;
+	}
+	const auto changed = !ranges::equal(
+		answer.recentVoters,
+		original.recentVoters,
+		ranges::equal_to(),
+		&UserpicInRow::peer);
+	if (changed) {
+		auto updated = std::vector<UserpicInRow>();
+		updated.reserve(original.recentVoters.size());
+		for (const auto &peer : original.recentVoters) {
+			const auto i = ranges::find(
+				answer.recentVoters,
+				peer,
+				&UserpicInRow::peer);
+			if (i != end(answer.recentVoters)) {
+				updated.push_back(std::move(*i));
+			} else {
+				updated.push_back({ .peer = peer });
+			}
+		}
+		answer.recentVoters = std::move(updated);
+		answer.recentVotersImage = QImage();
+	}
 }
 
-void Poll::updateAnswerVotes() {
-	if (_poll->answers.size() != _answers.size()
-		|| _poll->answers.empty()) {
+void Poll::Options::updateAnswerVotes() {
+	if (_owner->_poll->answers.size() != _answers.size()
+		|| _owner->_poll->answers.empty()) {
 		return;
 	}
-	const auto totalVotes = std::max(1, _poll->totalVoters);
+	const auto totalVotes = _owner->_poll->totalVoters;
+	const auto showPercent = (totalVotes > 0)
+		&& ranges::all_of(_owner->_poll->answers, [=](const PollAnswer &a) {
+			return a.votes <= totalVotes;
+		});
 	const auto maxVotes = std::max(1, ranges::max_element(
-		_poll->answers,
+		_owner->_poll->answers,
 		ranges::less(),
 		&PollAnswer::votes)->votes);
-
-	constexpr auto kMaxCount = PollData::kMaxOptions;
-	const auto count = size_type(_poll->answers.size());
-	Assert(count <= kMaxCount);
-	int PercentsStorage[kMaxCount] = { 0 };
-	int VotesStorage[kMaxCount] = { 0 };
-
-	ranges::copy(
-		ranges::views::all(
-			_poll->answers
-		) | ranges::views::transform(&PollAnswer::votes),
-		ranges::begin(VotesStorage));
-
-	CountNicePercent(
-		gsl::make_span(VotesStorage).subspan(0, count),
-		totalVotes,
-		gsl::make_span(PercentsStorage).subspan(0, count));
-
-	auto &&answers = ranges::views::zip(
-		_answers,
-		_poll->answers,
-		PercentsStorage);
-	for (auto &&[answer, original, percent] : answers) {
-		updateAnswerVotesFromOriginal(
-			answer,
-			original,
-			percent,
-			maxVotes);
-	}
-}
-
-void Poll::draw(Painter &p, const PaintContext &context) const {
-	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return;
-	auto paintw = width();
-
-	checkSendingAnimation();
-	if (_poll->checkResultsReload(context.now)) {
-		history()->session().api().polls().reloadResults(_parent->data());
-	}
-
-	const auto stm = context.messageStyle();
-	const auto padding = st::msgPadding;
-	auto tshift = st::historyPollQuestionTop;
-	if (!isBubbleTop()) {
-		tshift -= st::msgFileTopMinus;
-	}
-	paintw -= padding.left() + padding.right();
-
-	p.setPen(stm->historyTextFg);
-	_question.drawLeft(p, padding.left(), tshift, paintw, width(), style::al_left, 0, -1, context.selection);
-	tshift += _question.countHeight(paintw) + st::historyPollSubtitleSkip;
-
-	p.setPen(stm->msgDateFg);
-	_subtitle.drawLeftElided(p, padding.left(), tshift, paintw, width());
-	paintRecentVoters(p, padding.left() + _subtitle.maxWidth(), tshift, context);
-	paintCloseByTimer(p, padding.left() + paintw, tshift, context);
-	paintShowSolution(p, padding.left() + paintw, tshift, context);
-	tshift += st::msgDateFont->height + st::historyPollAnswersSkip;
-
-	const auto progress = _answersAnimation
-		? _answersAnimation->progress.value(1.)
-		: 1.;
-	if (progress == 1.) {
-		resetAnswersAnimation();
-	}
-
-	auto &&answers = ranges::views::zip(
-		_answers,
-		ranges::views::ints(0, int(_answers.size())));
-	for (const auto &[answer, index] : answers) {
-		const auto animation = _answersAnimation
-			? &_answersAnimation->data[index]
-			: nullptr;
-		if (animation) {
-			animation->percent.update(progress, anim::linear);
-			animation->filling.update(
-				progress,
-				showVotes() ? anim::easeOutCirc : anim::linear);
-			animation->opacity.update(progress, anim::linear);
-		}
-		const auto height = paintAnswer(
-			p,
-			answer,
-			animation,
-			padding.left(),
-			tshift,
-			paintw,
-			width(),
-			context);
-		tshift += height;
+
+	constexpr auto kMaxCount = PollData::kMaxOptions;
+	const auto count = size_type(_owner->_poll->answers.size());
+	Assert(count <= kMaxCount);
+	int PercentsStorage[kMaxCount] = { 0 };
+	int VotesStorage[kMaxCount] = { 0 };
+
+	ranges::copy(
+		ranges::views::all(
+			_owner->_poll->answers
+		) | ranges::views::transform(&PollAnswer::votes),
+		ranges::begin(VotesStorage));
+
+	if (showPercent) {
+		CountNicePercent(
+			gsl::make_span(VotesStorage).subspan(0, count),
+			totalVotes,
+			gsl::make_span(PercentsStorage).subspan(0, count));
 	}
-	if (!inlineFooter()) {
-		paintBottom(p, padding.left(), tshift, paintw, context);
-	} else if (!_totalVotesLabel.isEmpty()) {
-		tshift += st::msgPadding.bottom();
-		paintInlineFooter(p, padding.left(), tshift, paintw, context);
+
+	for (auto &answer : _answers) {
+		const auto i = ranges::find(
+			_owner->_poll->answers,
+			answer.option,
+			&PollAnswer::option);
+		Assert(i != end(_owner->_poll->answers));
+		const auto index = int(i - begin(_owner->_poll->answers));
+		updateAnswerVotesFromOriginal(
+			answer,
+			*i,
+			PercentsStorage[index],
+			maxVotes,
+			showPercent);
 	}
 }
 
-void Poll::paintInlineFooter(
-		Painter &p,
-		int left,
-		int top,
-		int paintw,
-		const PaintContext &context) const {
-	const auto stm = context.messageStyle();
-	p.setPen(stm->msgDateFg);
-	_totalVotesLabel.drawLeftElided(
-		p,
-		left,
-		top,
-		_parent->data()->reactions().empty()
-			? std::min(
-				_totalVotesLabel.maxWidth(),
-				paintw - _parent->bottomInfoFirstLineWidth())
-			: _totalVotesLabel.maxWidth(),
-		width());
-}
+void Poll::draw(Painter &p, const PaintContext &context) const {
+	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return;
+	auto paintw = width();
 
-void Poll::paintBottom(
-		Painter &p,
-		int left,
-		int top,
-		int paintw,
-		const PaintContext &context) const {
-	const auto stringtop = top
-		+ st::msgPadding.bottom()
-		+ st::historyPollBottomButtonTop;
-	const auto stm = context.messageStyle();
-	if (showVotersCount()) {
-		p.setPen(stm->msgDateFg);
-		_totalVotesLabel.draw(p, left, stringtop, paintw, style::al_top);
-	} else {
-		const auto link = showVotes()
-			? _showResultsLink
-			: canSendVotes()
-			? _sendVotesLink
-			: nullptr;
-		if (_linkRipple) {
-			const auto linkHeight = bottomButtonHeight();
-			p.setOpacity(st::historyPollRippleOpacity);
-			_linkRipple->paint(
-				p,
-				left - st::msgPadding.left() - _linkRippleShift,
-				height() - linkHeight,
-				width(),
-				&stm->msgWaveformInactive->c);
-			if (_linkRipple->empty()) {
-				_linkRipple.reset();
-			}
-			p.setOpacity(1.);
+	if (_poll->checkResultsReload(context.now)) {
+		history()->session().api().polls().reloadResults(_parent->data());
+	}
+
+	const auto padding = st::msgPadding;
+	paintw -= padding.left() + padding.right();
+
+	const Part *parts[] = {
+		_headerPart.get(),
+		_optionsPart.get(),
+		_addOptionPart.get(),
+		_footerPart.get(),
+	};
+	auto tshift = 0;
+	for (const auto part : parts) {
+		const auto h = part->countHeight(paintw);
+		if (h > 0) {
+			const auto saved = p.transform();
+			p.translate(0, tshift);
+			part->draw(p, padding.left(), paintw, width(), context);
+			p.setTransform(saved);
 		}
-		p.setFont(st::semiboldFont);
-		p.setPen(link ? stm->msgFileThumbLinkFg : stm->msgDateFg);
-		const auto string = showVotes()
-			? tr::lng_polls_view_results(tr::now, Ui::Text::Upper)
-			: tr::lng_polls_submit_votes(tr::now, Ui::Text::Upper);
-		const auto stringw = st::semiboldFont->width(string);
-		p.drawTextLeft(
-			left + (paintw - stringw) / 2,
-			stringtop,
-			width(),
-			string,
-			stringw);
+		tshift += h;
 	}
 }
 
-void Poll::resetAnswersAnimation() const {
+void Poll::Options::resetAnswersAnimation() const {
 	_answersAnimation = nullptr;
-	if (_poll->sendingVotes.size() != 1
-		|| (_flags & PollData::Flag::MultiChoice)) {
+	if (_owner->_poll->sendingVotes.size() != 1
+		|| (_owner->_flags & PollData::Flag::MultiChoice)) {
 		_sendingAnimation = nullptr;
 	}
 }
 
-void Poll::radialAnimationCallback() const {
+void Poll::Options::radialAnimationCallback() const {
 	if (!anim::Disabled()) {
-		repaint();
+		_owner->repaint();
 	}
 }
 
-void Poll::paintRecentVoters(
+void Poll::Header::paintRecentVoters(
 		Painter &p,
 		int left,
 		int top,
@@ -908,7 +3448,7 @@ void Poll::paintRecentVoters(
 	pen.setWidth(st::lineWidth);
 
 	auto created = false;
-	for (auto &recent : _recentVoters) {
+	for (const auto &recent : ranges::views::reverse(_recentVoters)) {
 		const auto was = !recent.userpic.null();
 		recent.peer->paintUserpic(p, recent.userpic, x, y, size);
 		if (!was && !recent.userpic.null()) {
@@ -920,7 +3460,7 @@ void Poll::paintRecentVoters(
 			PainterHighQualityEnabler hq(p);
 			p.drawEllipse(x, y, size, size);
 		};
-		if (usesBubblePattern(context)) {
+		if (_owner->usesBubblePattern(context)) {
 			const auto add = st::lineWidth * 2;
 			const auto target = QRect(x, y, size, size).marginsAdded(
 				{ add, add, add, add });
@@ -937,79 +3477,11 @@ void Poll::paintRecentVoters(
 		x -= st::historyPollRecentVoterSkip;
 	}
 	if (created) {
-		history()->owner().registerHeavyViewPart(_parent);
-	}
-}
-
-void Poll::paintCloseByTimer(
-		Painter &p,
-		int right,
-		int top,
-		const PaintContext &context) const {
-	if (!canVote() || _poll->closeDate <= 0 || _poll->closePeriod <= 0) {
-		_close = nullptr;
-		return;
-	}
-	if (!_close) {
-		_close = std::make_unique<CloseInformation>(
-			_poll->closeDate,
-			_poll->closePeriod,
-			[=] { repaint(); });
-	}
-	const auto now = crl::now();
-	const auto left = std::max(_close->finish - now, crl::time(0));
-	const auto radial = std::min(_close->duration, kLargestRadialDuration);
-	if (!left) {
-		_close->radial.stop();
-	} else if (left < radial && !anim::Disabled()) {
-		if (!_close->radial.animating()) {
-			_close->radial.init([=] {
-				repaint();
-			});
-			_close->radial.start();
-		}
-	} else {
-		_close->radial.stop();
-	}
-	const auto time = Ui::FormatDurationText(int(std::ceil(left / 1000.)));
-	const auto st = context.st;
-	const auto stm = context.messageStyle();
-	const auto &icon = stm->historyQuizTimer;
-	const auto x = right - icon.width();
-	const auto y = top
-		+ (st::normalFont->height - icon.height()) / 2
-		- st::lineWidth;
-	const auto &regular = (left < kCriticalCloseDuration)
-		? st->boxTextFgError()
-		: stm->msgDateFg;
-	p.setPen(regular);
-	const auto timeWidth = st::normalFont->width(time);
-	p.drawTextLeft(x - timeWidth, top, width(), time, timeWidth);
-	if (left < radial) {
-		auto hq = PainterHighQualityEnabler(p);
-		const auto part = std::max(
-			left / float64(radial),
-			1. / arc::kFullLength);
-		const auto length = int(base::SafeRound(arc::kFullLength * part));
-		auto pen = regular->p;
-		pen.setWidth(st::historyPollRadio.thickness);
-		pen.setCapStyle(Qt::RoundCap);
-		p.setPen(pen);
-		const auto size = icon.width() / 2;
-		const auto left = (x + (icon.width() - size) / 2);
-		const auto top = (y + (icon.height() - size) / 2) + st::lineWidth;
-		p.drawArc(left, top, size, size, (arc::kFullLength / 4), length);
-	} else {
-		icon.paint(p, x, y, width());
-	}
-
-	if (left > (anim::Disabled() ? 0 : (radial - 1))) {
-		const auto next = (left % 1000);
-		_close->timer.callOnce((next ? next : 1000) + 1);
+		_owner->history()->owner().registerHeavyViewPart(_owner->_parent);
 	}
 }
 
-void Poll::paintShowSolution(
+void Poll::Header::paintShowSolution(
 		Painter &p,
 		int right,
 		int top,
@@ -1021,25 +3493,134 @@ void Poll::paintShowSolution(
 	}
 	if (!_showSolutionLink) {
 		_showSolutionLink = std::make_shared<LambdaClickHandler>(
-			crl::guard(this, [=] { showSolution(); }));
+			crl::guard(_owner, [=] { _owner->_headerPart->showSolution(); }));
 	}
 	const auto stm = context.messageStyle();
 	const auto &icon = stm->historyQuizExplain;
 	const auto x = right - icon.width();
 	const auto y = top + (st::normalFont->height - icon.height()) / 2;
 	if (shown == 1.) {
-		icon.paint(p, x, y, width());
+		icon.paint(p, x, y, _owner->width());
 	} else {
 		p.save();
 		p.translate(x + icon.width() / 2, y + icon.height() / 2);
 		p.scale(shown, shown);
 		p.setOpacity(shown);
-		icon.paint(p, -icon.width() / 2, -icon.height() / 2, width());
+		icon.paint(p, -icon.width() / 2, -icon.height() / 2, _owner->width());
 		p.restore();
 	}
 }
 
-int Poll::paintAnswer(
+void Poll::Header::paintSolutionBlock(
+		Painter &p,
+		int left,
+		int top,
+		int paintw,
+		const PaintContext &context) const {
+	if (!_solutionShown || !canShowSolution()) {
+		return;
+	}
+	if (!_closeSolutionLink) {
+		_closeSolutionLink = std::make_shared<LambdaClickHandler>(
+			crl::guard(
+				_owner,
+				[=] { _owner->_headerPart->solutionToggled(false); }));
+	}
+
+	const auto &qst = st::historyPagePreview;
+	const auto blockHeight = countSolutionBlockHeight(paintw);
+	const auto outer = QRect(left, top, paintw, blockHeight);
+
+	const auto stm = context.messageStyle();
+	const auto view = _owner->_parent;
+	const auto selected = context.selected();
+	const auto colorIndex = view->contentColorIndex();
+	const auto &chatSt = *context.st;
+	const auto colorPattern = chatSt.colorPatternIndex(colorIndex);
+	const auto useColorIndex = !context.outbg;
+	const auto cache = useColorIndex
+		? chatSt.coloredReplyCache(selected, colorIndex).get()
+		: stm->replyCache[colorPattern].get();
+
+	Ui::Text::ValidateQuotePaintCache(*cache, qst);
+	Ui::Text::FillQuotePaint(p, outer, *cache, qst);
+
+	const auto innerLeft = left + qst.padding.left();
+	const auto innerRight = left + paintw - qst.padding.right();
+	const auto textWidth = innerRight - innerLeft;
+	auto yshift = top + qst.padding.top();
+
+	p.setPen(cache->outlines[0]);
+	p.setFont(st::semiboldFont);
+	const auto closeArea = st::historyPollExplanationCloseSize;
+	p.drawTextLeft(
+		innerLeft,
+		yshift,
+		_owner->width(),
+		tr::lng_polls_solution_title(tr::now),
+		textWidth - closeArea);
+
+	{
+		const auto iconSize = st::historyPollExplanationCloseIconSize;
+		const auto centerX = innerRight - closeArea / 2;
+		const auto centerY = yshift + st::semiboldFont->height / 2;
+		const auto half = iconSize / 2;
+		auto pen = QPen(cache->outlines[0]);
+		pen.setWidthF(st::historyPollExplanationCloseStroke * 1.);
+		pen.setCapStyle(Qt::RoundCap);
+		p.setPen(pen);
+		p.setRenderHint(QPainter::Antialiasing);
+		p.drawLine(
+			centerX - half, centerY - half,
+			centerX + half, centerY + half);
+		p.drawLine(
+			centerX + half, centerY - half,
+			centerX - half, centerY + half);
+		p.setRenderHint(QPainter::Antialiasing, false);
+	}
+
+	yshift += st::semiboldFont->height + st::historyPollExplanationTitleSkip;
+
+	p.setPen(stm->historyTextFg);
+	_owner->_parent->prepareCustomEmojiPaint(p, context, _solutionText);
+	_solutionText.draw(p, {
+		.position = { innerLeft, yshift },
+		.outerWidth = _owner->width(),
+		.availableWidth = textWidth,
+		.spoiler = Ui::Text::DefaultSpoilerCache(),
+		.now = context.now,
+		.pausedEmoji = context.paused,
+		.pausedSpoiler = context.paused,
+		.selection = toSolutionSelection(context.selection),
+	});
+
+	if (countSolutionMediaHeight(textWidth)) {
+		yshift += _solutionText.countHeight(textWidth)
+			+ st::historyPollExplanationMediaSkip;
+		const auto isDocument = _solutionMedia
+			&& (_solutionMedia->kind == PollThumbnailKind::Document
+				|| _solutionMedia->kind == PollThumbnailKind::Audio);
+		const auto isThumbed = isDocument
+			&& _owner->_poll->solutionMedia.document
+			&& _owner->_poll->solutionMedia.document->hasThumbnail()
+			&& !_owner->_poll->solutionMedia.document->isSong();
+		const auto &fileSt = isThumbed
+			? st::msgFileThumbLayout
+			: st::msgFileLayout;
+		const auto shift = isDocument ? fileSt.padding.left() : 0;
+		const auto attachLeft = rtl()
+			? (_owner->width() - innerLeft + shift - _solutionAttach->width())
+			: (innerLeft - shift);
+		p.translate(attachLeft, yshift);
+		_solutionAttach->draw(
+			p,
+			context.translated(-attachLeft, -yshift)
+				.withSelection(TextSelection()));
+		p.translate(-attachLeft, -yshift);
+	}
+}
+
+int Poll::Options::paintAnswer(
 		Painter &p,
 		const Answer &answer,
 		const AnswerAnimation *animation,
@@ -1049,11 +3630,68 @@ int Poll::paintAnswer(
 		int outerWidth,
 		const PaintContext &context) const {
 	const auto height = countAnswerHeight(answer, width);
+	if (!context.highlight.pollOption.isEmpty()
+		&& context.highlight.pollOption == answer.option
+		&& context.highlight.collapsion > 0.) {
+		const auto hlTextWidth = countAnswerContentWidth(answer, width);
+		const auto hlTextHeight = answer.text.countHeight(hlTextWidth);
+		const auto hlMultiline = (hlTextHeight
+			> st::historyPollPercentFont->height);
+		const auto hlVotesExtra = countVotesExtraHeight(
+			answer,
+			hlTextWidth);
+		const auto fillingExtra = (_owner->showVotes()
+			&& !answer.thumbnail
+			&& !hlMultiline
+			&& !hlVotesExtra)
+			? (st::historyPollChoiceRight.height() / 2)
+			: 0;
+		const auto absoluteTop = top
+			+ _owner->_headerPart->countHeight(width);
+		const auto to = context.highlightInterpolateTo;
+		const auto toProgress = (1. - context.highlight.collapsion);
+		if (toProgress >= 1.) {
+			context.highlightPathCache->addRect(to);
+		} else if (toProgress <= 0.) {
+			context.highlightPathCache->addRect(
+				0,
+				absoluteTop + fillingExtra,
+				_owner->width(),
+				height + fillingExtra);
+		} else {
+			const auto lerp = [=](int from, int to) {
+				return from + (to - from) * toProgress;
+			};
+			context.highlightPathCache->addRect(
+				lerp(0, to.x()),
+				lerp(absoluteTop, to.y()) + fillingExtra,
+				lerp(_owner->width(), to.width()),
+				lerp(height + fillingExtra, to.height()));
+		}
+	}
 	const auto stm = context.messageStyle();
+	const auto &answerPadding = answer.thumbnail
+		? st::historyPollAnswerPadding
+		: st::historyPollAnswerPaddingNoMedia;
 	const auto aleft = left + st::historyPollAnswerPadding.left();
 	const auto awidth = width
 		- st::historyPollAnswerPadding.left()
 		- st::historyPollAnswerPadding.right();
+	const auto media = answer.thumbnail ? PollAnswerMediaSize() : 0;
+	const auto textWidth = countAnswerContentWidth(answer, width);
+	const auto textContentHeight = answer.text.countHeight(textWidth);
+	const auto multilineAnswer = (textContentHeight
+		> st::historyPollPercentFont->height);
+	const auto votesExtraHeight = countVotesExtraHeight(
+		answer,
+		textWidth);
+	const auto fillingContentHeight = (multilineAnswer || votesExtraHeight)
+		? (textContentHeight + votesExtraHeight)
+		: textContentHeight;
+	const auto anyMediaWidth = _anyAnswerHasMedia
+		? (PollAnswerMediaSize() + PollAnswerMediaSkip())
+		: 0;
+	const auto barContentWidth = std::max(1, awidth - anyMediaWidth);
 
 	if (answer.ripple) {
 		p.setOpacity(st::historyPollRippleOpacity);
@@ -1069,6 +3707,61 @@ int Poll::paintAnswer(
 		p.setOpacity(1.);
 	}
 
+	const auto paintVotesCount = [&](float64 opacity = 1.) {
+		if (answer.votesCountString.isEmpty()) {
+			return;
+		}
+		if (!answer.recentVoters.empty()) {
+			if (NeedRegenerateUserpics(
+					answer.recentVotersImage,
+					answer.recentVoters)) {
+				const auto was = !answer.recentVotersImage.isNull();
+				GenerateUserpicsInRow(
+					answer.recentVotersImage,
+					answer.recentVoters,
+					st::historyPollAnswerUserpics);
+				if (!was) {
+					_owner->history()->owner().registerHeavyViewPart(
+						_owner->_parent);
+				}
+			}
+		}
+		const auto userpicsWidth = answer.recentVotersImage.isNull()
+			? 0
+			: (answer.recentVotersImage.width()
+				/ style::DevicePixelRatio());
+		const auto userpicsExtra = userpicsWidth
+			? (st::historyPollAnswerUserpicsSkip + userpicsWidth)
+			: 0;
+		const auto rightEdge = aleft + awidth
+			- anyMediaWidth
+			- st::historyPollFillingRight;
+		const auto countX = rightEdge
+			- answer.votesCountWidth
+			- userpicsExtra;
+		const auto atop = top + answerPadding.top()
+			+ ((multilineAnswer || votesExtraHeight)
+				? (textContentHeight
+					- (votesExtraHeight ? 0 : st::normalFont->height))
+				: 0);
+		p.setOpacity(opacity);
+		p.setFont(st::normalFont);
+		p.setPen(stm->msgDateFg);
+		p.drawTextLeft(
+			countX,
+			atop,
+			outerWidth,
+			answer.votesCountString,
+			answer.votesCountWidth);
+		if (userpicsWidth) {
+			const auto userpicsX = rightEdge - userpicsWidth;
+			const auto userpicsY = atop
+				+ (st::normalFont->height
+					- st::historyPollAnswerUserpics.size) / 2;
+			p.drawImage(userpicsX, userpicsY, answer.recentVotersImage);
+		}
+	};
+
 	if (animation) {
 		const auto opacity = animation->opacity.current();
 		if (opacity < 1.) {
@@ -1087,8 +3780,10 @@ int Poll::paintAnswer(
 				percentWidth,
 				left,
 				top,
+				answerPadding.top(),
 				outerWidth,
 				context);
+			paintVotesCount(opacity);
 			p.setOpacity(sqrt(opacity));
 			paintFilling(
 				p,
@@ -1097,12 +3792,14 @@ int Poll::paintAnswer(
 				animation->filling.current(),
 				left,
 				top,
+				answerPadding.top(),
 				width,
-				height,
+				barContentWidth,
+				fillingContentHeight,
 				context);
 			p.setOpacity(1.);
 		}
-	} else if (!showVotes()) {
+	} else if (!_owner->showVotes()) {
 		paintRadio(p, answer, left, top, context);
 	} else {
 		paintPercent(
@@ -1111,8 +3808,10 @@ int Poll::paintAnswer(
 			answer.votesPercentWidth,
 			left,
 			top,
+			answerPadding.top(),
 			outerWidth,
 			context);
+		paintVotesCount();
 		paintFilling(
 			p,
 			answer.chosen,
@@ -1120,25 +3819,126 @@ int Poll::paintAnswer(
 			answer.filling,
 			left,
 			top,
+			answerPadding.top(),
 			width,
-			height,
+			barContentWidth,
+			fillingContentHeight,
 			context);
 	}
 
-	top += st::historyPollAnswerPadding.top();
+	top += answerPadding.top();
+	if (answer.thumbnail) {
+		const auto target = QRect(
+			aleft + awidth - media,
+			top,
+			media,
+			media);
+		if (!target.isEmpty()) {
+			const auto webpagePlaceholder
+				= (answer.thumbnailKind == PollThumbnailKind::Webpage)
+					&& !answer.thumbnailId;
+			const auto selected = context.selected();
+			const auto &linkIcon = context.outbg
+				? (selected
+					? st::historyPollLinkOutIconSelected
+					: st::historyPollLinkOutIcon)
+				: (selected
+					? st::historyPollLinkInIconSelected
+					: st::historyPollLinkInIcon);
+			if (webpagePlaceholder) {
+				const auto cache = stm->replyCache[0].get();
+				p.save();
+				auto hq = PainterHighQualityEnabler(p);
+				auto path = QPainterPath();
+				path.addRoundedRect(
+					target,
+					st::historyPollAnswerThumbRadius,
+					st::historyPollAnswerThumbRadius);
+				p.fillPath(path, cache->bg);
+				if (selected) {
+					p.setClipPath(path);
+					p.fillRect(target, context.st->msgSelectOverlay());
+				}
+				p.restore();
+				const auto iconX = target.x()
+					+ (target.width() - linkIcon.width()) / 2;
+				const auto iconY = target.y()
+					+ (target.height() - linkIcon.height()) / 2;
+				linkIcon.paint(p, iconX, iconY, outerWidth, cache->icon);
+			} else {
+				const auto image = answer.thumbnail->image(media);
+				if (!image.isNull()) {
+					const auto source = QRectF(
+						QPointF(),
+						QSizeF(image.size()));
+					const auto kx = target.width() / source.width();
+					const auto ky = target.height() / source.height();
+					const auto scale = std::max(kx, ky);
+					const auto size = QSizeF(
+						source.width() * scale,
+						source.height() * scale);
+					const auto geometry = QRectF(
+						target.x() + (target.width() - size.width()) / 2.,
+						target.y() + (target.height() - size.height()) / 2.,
+						size.width(),
+						size.height());
+					p.save();
+					auto hq = PainterHighQualityEnabler(p);
+					if (answer.thumbnailRounded) {
+						auto path = QPainterPath();
+						path.addRoundedRect(
+							target,
+							st::historyPollAnswerThumbRadius,
+							st::historyPollAnswerThumbRadius);
+						p.setClipPath(path);
+					}
+					p.drawImage(geometry, image, source);
+					p.restore();
+					if (answer.thumbnailIsVideo) {
+						st::dialogsMiniPlay.paintInCenter(p, target);
+					}
+					if (answer.thumbnailKind
+						== PollThumbnailKind::Webpage) {
+						p.save();
+						auto hq = PainterHighQualityEnabler(p);
+						auto path = QPainterPath();
+						path.addRoundedRect(
+							target,
+							st::historyPollAnswerThumbRadius,
+							st::historyPollAnswerThumbRadius);
+						p.setClipPath(path);
+						p.fillRect(target, st::songCoverOverlayFg);
+						linkIcon.paintInCenter(p, target);
+						p.restore();
+					}
+				}
+			}
+		}
+	}
 	p.setPen(stm->historyTextFg);
-	answer.text.drawLeft(p, aleft, top, awidth, outerWidth);
+	answer.text.draw(p, {
+		.position = { aleft, top },
+		.outerWidth = outerWidth,
+		.availableWidth = textWidth,
+		.spoiler = Ui::Text::DefaultSpoilerCache(),
+		.now = context.now,
+		.pausedEmoji = context.paused,
+		.pausedSpoiler = context.paused,
+	});
 
 	return height;
 }
 
-void Poll::paintRadio(
+void Poll::Options::paintRadio(
 		Painter &p,
 		const Answer &answer,
 		int left,
 		int top,
 		const PaintContext &context) const {
-	top += st::historyPollAnswerPadding.top();
+	const auto &answerPadding = answer.thumbnail
+		? st::historyPollAnswerPadding
+		: st::historyPollAnswerPaddingNoMedia;
+	top += answerPadding.top();
 
 	const auto stm = context.messageStyle();
 
@@ -1147,15 +3947,24 @@ void Poll::paintRadio(
 	const auto over = ClickHandler::showAsActive(answer.handler);
 	const auto &regular = stm->msgDateFg;
 
-	const auto checkmark = answer.selectedAnimation.value(answer.selected ? 1. : 0.);
+	const auto chosen = answer.chosen;
+	const auto checkmark = chosen
+		? 1.
+		: answer.selectedAnimation.value(answer.selected ? 1. : 0.);
 
 	const auto o = p.opacity();
 	if (checkmark < 1.) {
 		p.setBrush(Qt::NoBrush);
-		p.setOpacity(o * (over ? st::historyPollRadioOpacityOver : st::historyPollRadioOpacity));
+		p.setOpacity(o
+			* (over
+				? st::historyPollRadioOpacityOver
+				: st::historyPollRadioOpacity));
 	}
 
-	const auto rect = QRectF(left, top, radio.diameter, radio.diameter).marginsRemoved(QMarginsF(radio.thickness / 2., radio.thickness / 2., radio.thickness / 2., radio.thickness / 2.));
+	const auto multiChoice = (_owner->_flags & PollData::Flag::MultiChoice);
+	const auto rect = QRectF(left, top, radio.diameter, radio.diameter)
+		- Margins(radio.thickness / 2.);
+	const auto radius = st::historyPollCheckboxRadius;
 	if (_sendingAnimation && _sendingAnimation->option == answer.option) {
 		const auto &active = stm->msgServiceFg;
 		if (anim::Disabled()) {
@@ -1166,17 +3975,25 @@ void Poll::paintRadio(
 			pen.setWidth(radio.thickness);
 			pen.setCapStyle(Qt::RoundCap);
 			p.setPen(pen);
-			p.drawArc(
-				rect,
-				state.arcFrom,
-				state.arcLength);
+			if (multiChoice) {
+				p.drawRoundedRect(rect, radius, radius);
+			} else {
+				p.drawArc(
+					rect,
+					state.arcFrom,
+					state.arcLength);
+			}
 		}
 	} else {
 		if (checkmark < 1.) {
 			auto pen = regular->p;
 			pen.setWidth(radio.thickness);
 			p.setPen(pen);
-			p.drawEllipse(rect);
+			if (multiChoice) {
+				p.drawRoundedRect(rect, radius, radius);
+			} else {
+				p.drawEllipse(rect);
+			}
 		}
 		if (checkmark > 0.) {
 			const auto removeFull = (radio.diameter / 2 - radio.thickness);
@@ -1186,59 +4003,75 @@ void Poll::paintRadio(
 			pen.setWidth(radio.thickness);
 			p.setPen(pen);
 			p.setBrush(color);
-			p.drawEllipse(rect.marginsRemoved({ removeNow, removeNow, removeNow, removeNow }));
+			const auto inner = rect - Margins(removeNow);
+			if (multiChoice) {
+				p.drawRoundedRect(inner, radius, radius);
+			} else {
+				p.drawEllipse(inner);
+			}
 			const auto &icon = stm->historyPollChosen;
-			icon.paint(p, left + (radio.diameter - icon.width()) / 2, top + (radio.diameter - icon.height()) / 2, width());
+			icon.paint(
+				p,
+				left + (radio.diameter - icon.width()) / 2,
+				top + (radio.diameter - icon.height()) / 2,
+				_owner->width());
 		}
 	}
 
 	p.setOpacity(o);
 }
 
-void Poll::paintPercent(
+void Poll::Options::paintPercent(
 		Painter &p,
 		const QString &percent,
 		int percentWidth,
 		int left,
 		int top,
+		int topPadding,
 		int outerWidth,
 		const PaintContext &context) const {
 	const auto stm = context.messageStyle();
 	const auto aleft = left + st::historyPollAnswerPadding.left();
 
-	top += st::historyPollAnswerPadding.top();
+	top += topPadding;
 
 	p.setFont(st::historyPollPercentFont);
 	p.setPen(stm->historyTextFg);
 	const auto pleft = aleft - percentWidth - st::historyPollPercentSkip;
-	p.drawTextLeft(pleft, top + st::historyPollPercentTop, outerWidth, percent, percentWidth);
+	p.drawTextLeft(
+		pleft,
+		top + st::historyPollPercentTop,
+		outerWidth,
+		percent,
+		percentWidth);
 }
 
-void Poll::paintFilling(
+void Poll::Options::paintFilling(
 		Painter &p,
 		bool chosen,
 		bool correct,
 		float64 filling,
 		int left,
 		int top,
+		int topPadding,
 		int width,
-		int height,
+		int contentWidth,
+		int contentHeight,
 		const PaintContext &context) const {
-	const auto bottom = top + height;
 	const auto st = context.st;
 	const auto stm = context.messageStyle();
 	const auto aleft = left + st::historyPollAnswerPadding.left();
-	const auto awidth = width
-		- st::historyPollAnswerPadding.left()
-		- st::historyPollAnswerPadding.right();
 
-	top += st::historyPollAnswerPadding.top();
+	top += topPadding;
 
 	const auto thickness = st::historyPollFillingHeight;
-	const auto max = awidth - st::historyPollFillingRight;
-	const auto size = anim::interpolate(st::historyPollFillingMin, max, filling);
+	const auto max = contentWidth - st::historyPollFillingRight;
+	const auto size
+		= anim::interpolate(st::historyPollFillingMin, max, filling);
 	const auto radius = st::historyPollFillingRadius;
-	const auto ftop = bottom - st::historyPollFillingBottom - thickness;
+	const auto ftop = top
+		+ std::max(st::historyPollPercentFont->height, contentHeight)
+		+ st::historyPollFillingTop;
 
 	enum class Style {
 		Incorrect,
@@ -1248,7 +4081,10 @@ void Poll::paintFilling(
 	const auto style = [&] {
 		if (chosen && !correct) {
 			return Style::Incorrect;
-		} else if (chosen && correct && _poll->quiz() && !context.outbg) {
+		} else if (chosen
+			&& correct
+			&& _owner->_poll->quiz()
+			&& !context.outbg) {
 			return Style::Correct;
 		} else {
 			return Style::Default;
@@ -1262,8 +4098,12 @@ void Poll::paintFilling(
 		? st->boxTextFgGood()
 		: stm->msgFileBg;
 	p.setPen(Qt::NoPen);
-	p.setBrush(color);
 	PainterHighQualityEnabler hq(p);
+	{
+		p.setBrush(anim::with_alpha(color->c, st::historyPollFillingBgOpacity));
+		p.drawRoundedRect(barleft, ftop, max, thickness, radius, radius);
+	}
+	p.setBrush(color);
 	if (chosen || correct) {
 		const auto &icon = (style == Style::Incorrect)
 			? st->historyPollChoiceWrong()
@@ -1272,12 +4112,22 @@ void Poll::paintFilling(
 			: stm->historyPollChoiceRight;
 		const auto cleft = aleft - st::historyPollPercentSkip - icon.width();
 		const auto ctop = ftop - (icon.height() - thickness) / 2;
-		p.drawEllipse(cleft, ctop, icon.width(), icon.height());
+		if (_owner->_flags & PollData::Flag::MultiChoice) {
+			p.drawRoundedRect(
+				cleft,
+				ctop,
+				icon.width(),
+				icon.height(),
+				st::historyPollCheckboxRadius,
+				st::historyPollCheckboxRadius);
+		} else {
+			p.drawEllipse(cleft, ctop, icon.width(), icon.height());
+		}
 
 		const auto paintContent = [&](QPainter &p) {
 			icon.paint(p, cleft, ctop, width);
 		};
-		if (style == Style::Default && usesBubblePattern(context)) {
+		if (style == Style::Default && _owner->usesBubblePattern(context)) {
 			const auto add = st::lineWidth * 2;
 			const auto target = QRect(
 				cleft,
@@ -1303,24 +4153,30 @@ void Poll::paintFilling(
 	}
 }
 
-bool Poll::answerVotesChanged() const {
-	if (_poll->answers.size() != _answers.size()
-		|| _poll->answers.empty()) {
+bool Poll::Options::answerVotesChanged() const {
+	if (_owner->_poll->answers.size() != _answers.size()
+		|| _owner->_poll->answers.empty()) {
 		return false;
 	}
-	return !ranges::equal(
-		_answers,
-		_poll->answers,
-		ranges::equal_to(),
-		&Answer::votes,
-		&PollAnswer::votes);
+	for (const auto &answer : _answers) {
+		const auto i = ranges::find(
+			_owner->_poll->answers,
+			answer.option,
+			&PollAnswer::option);
+		if (i == end(_owner->_poll->answers)) {
+			return false;
+		} else if (answer.votes != i->votes) {
+			return true;
+		}
+	}
+	return false;
 }
 
-void Poll::saveStateInAnimation() const {
+void Poll::Options::saveStateInAnimation() const {
 	if (_answersAnimation) {
 		return;
 	}
-	const auto show = showVotes();
+	const auto show = _owner->showVotes();
 	_answersAnimation = std::make_unique<AnswersAnimation>();
 	_answersAnimation->data.reserve(_answers.size());
 	const auto convert = [&](const Answer &answer) {
@@ -1338,12 +4194,13 @@ void Poll::saveStateInAnimation() const {
 		convert);
 }
 
-bool Poll::checkAnimationStart() const {
-	if (_poll->answers.size() != _answers.size()) {
+bool Poll::Options::checkAnimationStart() const {
+	if (_owner->_poll->answers.size() != _answers.size()) {
 		// Skip initial changes.
 		return false;
 	}
-	const auto result = (showVotes() != (_poll->voted() || _poll->closed()))
+	const auto result = _owner->showVotes()
+		!= (_owner->_poll->voted() || _owner->_poll->closed())
 		|| answerVotesChanged();
 	if (result) {
 		saveStateInAnimation();
@@ -1351,12 +4208,12 @@ bool Poll::checkAnimationStart() const {
 	return result;
 }
 
-void Poll::startAnswersAnimation() const {
+void Poll::Options::startAnswersAnimation() const {
 	if (!_answersAnimation) {
 		return;
 	}
 
-	const auto show = showVotes();
+	const auto show = _owner->showVotes();
 	auto &&both = ranges::views::zip(_answers, _answersAnimation->data);
 	for (auto &&[answer, data] : both) {
 		data.percent.start(show ? float64(answer.votesPercent) : 0.);
@@ -1366,7 +4223,7 @@ void Poll::startAnswersAnimation() const {
 		data.correct = data.correct || answer.correct;
 	}
 	_answersAnimation->progress.start(
-		[=] { repaint(); },
+		[=] { _owner->repaint(); },
 		0.,
 		1.,
 		st::historyPollDuration);
@@ -1375,15 +4232,73 @@ void Poll::startAnswersAnimation() const {
 TextSelection Poll::adjustSelection(
 		TextSelection selection,
 		TextSelectType type) const {
-	return _question.adjustSelection(selection, type);
+	const auto descLen = _headerPart->_description.length();
+	const auto solLen = _headerPart->solutionSelectionLength();
+	const auto descSolLen = uint16(descLen + solLen);
+
+	if (descLen == 0 && solLen == 0) {
+		return _headerPart->_question.adjustSelection(selection, type);
+	}
+	if (selection.to <= descLen && descLen > 0) {
+		return _headerPart->_description.adjustSelection(selection, type);
+	}
+	if (solLen > 0
+		&& selection.from >= descLen
+		&& selection.to <= descSolLen) {
+		const auto adjusted = _headerPart->_solutionText.adjustSelection(
+			_headerPart->toSolutionSelection(selection),
+			type);
+		return _headerPart->fromSolutionSelection(adjusted);
+	}
+	const auto questionSelection = _headerPart->_question.adjustSelection(
+		_headerPart->toQuestionSelection(selection),
+		type);
+	if (selection.from >= descSolLen) {
+		return _headerPart->fromQuestionSelection(questionSelection);
+	}
+	const auto from = (selection.from < descLen && descLen > 0)
+		? _headerPart->_description.adjustSelection(selection, type).from
+		: (solLen > 0 && selection.from < descSolLen)
+		? _headerPart->fromSolutionSelection(
+			_headerPart->_solutionText.adjustSelection(
+				_headerPart->toSolutionSelection(selection),
+				type)).from
+		: _headerPart->fromQuestionSelection(questionSelection).from;
+	const auto to = (selection.to <= descSolLen && solLen > 0)
+		? _headerPart->fromSolutionSelection(
+			_headerPart->_solutionText.adjustSelection(
+				_headerPart->toSolutionSelection(selection),
+				type)).to
+		: _headerPart->fromQuestionSelection(questionSelection).to;
+	return { from, to };
 }
 
 uint16 Poll::fullSelectionLength() const {
-	return _question.length();
+	return _headerPart->_description.length()
+		+ _headerPart->solutionSelectionLength()
+		+ _headerPart->_question.length();
 }
 
 TextForMimeData Poll::selectedText(TextSelection selection) const {
-	return _question.toTextForMimeData(selection);
+	auto description = _headerPart->_description.toTextForMimeData(selection);
+	auto solution = _headerPart->_solutionText.toTextForMimeData(
+		_headerPart->toSolutionSelection(selection));
+	auto question = _headerPart->_question.toTextForMimeData(
+		_headerPart->toQuestionSelection(selection));
+	auto result = TextForMimeData();
+	const auto append = [&](TextForMimeData &&part) {
+		if (part.empty()) {
+			return;
+		}
+		if (!result.empty()) {
+			result.append('\n');
+		}
+		result.append(std::move(part));
+	};
+	append(std::move(description));
+	append(std::move(solution));
+	append(std::move(question));
+	return result;
 }
 
 TextState Poll::textState(QPoint point, StateRequest request) const {
@@ -1392,76 +4307,48 @@ TextState Poll::textState(QPoint point, StateRequest request) const {
 		return result;
 	}
 
-	const auto can = canVote();
-	const auto show = showVotes();
 	const auto padding = st::msgPadding;
-	auto paintw = width();
-	auto tshift = st::historyPollQuestionTop;
-	if (!isBubbleTop()) {
-		tshift -= st::msgFileTopMinus;
-	}
-	paintw -= padding.left() + padding.right();
+	auto paintw = width() - padding.left() - padding.right();
 
-	const auto questionH = _question.countHeight(paintw);
-	if (QRect(padding.left(), tshift, paintw, questionH).contains(point)) {
-		result = TextState(_parent, _question.getState(
-			point - QPoint(padding.left(), tshift),
-			paintw,
-			request.forText()));
-		return result;
-	}
-	tshift += questionH + st::historyPollSubtitleSkip;
-	if (inShowSolution(point, padding.left() + paintw, tshift)) {
-		result.link = _showSolutionLink;
-		return result;
-	}
-	tshift += st::msgDateFont->height + st::historyPollAnswersSkip;
-	for (const auto &answer : _answers) {
-		const auto height = countAnswerHeight(answer, paintw);
-		if (point.y() >= tshift && point.y() < tshift + height) {
-			if (can) {
-				_lastLinkPoint = point;
-				result.link = answer.handler;
-			} else if (show) {
-				result.customTooltip = true;
-				using Flag = Ui::Text::StateRequest::Flag;
-				if (request.flags & Flag::LookupCustomTooltip) {
-					const auto quiz = _poll->quiz();
-					result.customTooltipText = answer.votes
-						? (quiz
-							? tr::lng_polls_answers_count
-							: tr::lng_polls_votes_count)(
-								tr::now,
-								lt_count_decimal,
-								answer.votes)
-						: (quiz
-							? tr::lng_polls_answers_none
-							: tr::lng_polls_votes_none)(tr::now);
-				}
+	const Part *parts[] = {
+		_headerPart.get(),
+		_optionsPart.get(),
+		_addOptionPart.get(),
+		_footerPart.get(),
+	};
+	auto tshift = 0;
+	auto symbolAdd = uint16(0);
+	for (const auto part : parts) {
+		const auto h = part->countHeight(paintw);
+		if (h > 0) {
+			auto partResult = part->textState(
+				point - QPoint(0, tshift),
+				padding.left(),
+				paintw,
+				width(),
+				request);
+			if (partResult.link) {
+				partResult.itemId = result.itemId;
+				AddTextStateOffset(&partResult, symbolAdd);
+				return partResult;
 			}
-			return result;
-		}
-		tshift += height;
-	}
-	if (!showVotersCount()) {
-		const auto link = showVotes()
-			? _showResultsLink
-			: canSendVotes()
-			? _sendVotesLink
-			: nullptr;
-		if (link) {
-			const auto linkHeight = bottomButtonHeight();
-			const auto linkTop = height() - linkHeight;
-			if (QRect(0, linkTop, width(), linkHeight).contains(point)) {
-				_lastLinkPoint = point;
-				result.link = link;
-				return result;
+			if (point.y() >= tshift && point.y() < tshift + h) {
+				partResult.itemId = result.itemId;
+				AddTextStateOffset(&partResult, symbolAdd);
+				return partResult;
 			}
 		}
+		symbolAdd += part->selectionLength();
+		tshift += h;
 	}
 	return result;
 }
 
+void Poll::parentTextUpdated() {
+	_headerPart->updateDescription();
+	history()->owner().requestViewResize(_parent);
+}
+
 auto Poll::bubbleRoll() const -> BubbleRoll {
 	const auto value = _wrongAnswerAnimation.value(1.);
 	_wrongAnswerAnimated = (value < 1.);
@@ -1504,40 +4391,49 @@ void Poll::paintBubbleFireworks(
 	_fireworksAnimation = nullptr;
 }
 
+void Poll::clickHandlerActiveChanged(
+		const ClickHandlerPtr &handler,
+		bool active) {
+	_headerPart->clickHandlerActiveChanged(handler, active);
+}
+
 void Poll::clickHandlerPressedChanged(
 		const ClickHandlerPtr &handler,
 		bool pressed) {
 	if (!handler) return;
 
-	const auto i = ranges::find(
-		_answers,
-		handler,
-		&Answer::handler);
-	if (i != end(_answers)) {
-		toggleRipple(*i, pressed);
-	} else if (handler == _sendVotesLink || handler == _showResultsLink) {
-		toggleLinkRipple(pressed);
+	_headerPart->clickHandlerPressedChanged(handler, pressed);
+	_optionsPart->clickHandlerPressedChanged(handler, pressed);
+	_addOptionPart->clickHandlerPressedChanged(handler, pressed);
+	_footerPart->clickHandlerPressedChanged(handler, pressed);
+}
+
+void Poll::hideSpoilers() {
+	if (_headerPart->_description.hasSpoilers()) {
+		_headerPart->_description.setSpoilerRevealed(
+			false,
+			anim::type::instant);
+	}
+	if (_headerPart->_solutionText.hasSpoilers()) {
+		_headerPart->_solutionText.setSpoilerRevealed(
+			false,
+			anim::type::instant);
 	}
 }
 
 void Poll::unloadHeavyPart() {
-	for (auto &recent : _recentVoters) {
-		recent.userpic = {};
-	}
+	_headerPart->unloadHeavyPart();
+	_optionsPart->unloadHeavyPart();
 }
 
 bool Poll::hasHeavyPart() const {
-	for (auto &recent : _recentVoters) {
-		if (!recent.userpic.null()) {
-			return true;
-		}
-	}
-	return false;
+	return _headerPart->hasHeavyPart()
+		|| _optionsPart->hasHeavyPart();
 }
 
-void Poll::toggleRipple(Answer &answer, bool pressed) {
+void Poll::Options::toggleRipple(Answer &answer, bool pressed) {
 	if (pressed) {
-		const auto outerWidth = width();
+		const auto outerWidth = _owner->width();
 		const auto innerWidth = outerWidth
 			- st::msgPadding.left()
 			- st::msgPadding.right();
@@ -1548,20 +4444,28 @@ void Poll::toggleRipple(Answer &answer, bool pressed) {
 			answer.ripple = std::make_unique<Ui::RippleAnimation>(
 				st::defaultRippleAnimation,
 				std::move(mask),
-				[=] { repaint(); });
+				[=] { _owner->repaint(); });
+		}
+		// _owner->_lastLinkPoint is Options-local, compute answer's
+		// position within Options (sum of heights above it).
+		auto answerTop = 0;
+		for (const auto &a : _answers) {
+			if (&a == &answer) {
+				break;
+			}
+			answerTop += countAnswerHeight(a, innerWidth);
 		}
-		const auto top = countAnswerTop(answer, innerWidth);
-		answer.ripple->add(_lastLinkPoint - QPoint(0, top));
+		answer.ripple->add(_owner->_lastLinkPoint - QPoint(0, answerTop));
 	} else if (answer.ripple) {
 		answer.ripple->lastStop();
 	}
 }
 
-bool Poll::canShowSolution() const {
-	return showVotes() && !_poll->solution.text.isEmpty();
+bool Poll::Header::canShowSolution() const {
+	return _owner->showVotes() && !_owner->_poll->solution.text.isEmpty();
 }
 
-bool Poll::inShowSolution(
+bool Poll::Header::inShowSolution(
 		QPoint point,
 		int right,
 		int top) const {
@@ -1574,43 +4478,90 @@ bool Poll::inShowSolution(
 	return QRect(x, y, icon.width(), icon.height()).contains(point);
 }
 
-int Poll::bottomButtonHeight() const {
-	const auto skip = st::historyPollChoiceRight.height()
-		- st::historyPollFillingBottom
-		- st::historyPollFillingHeight
-		- (st::historyPollChoiceRight.height() - st::historyPollFillingHeight) / 2;
-	return st::historyPollTotalVotesSkip
-		- skip
-		+ st::historyPollBottomButtonSkip
-		+ st::msgDateFont->height
-		+ st::msgPadding.bottom();
+QString Poll::Footer::closeTimerText() const {
+	if (_owner->_poll->closeDate <= 0
+		|| (_owner->_flags & PollData::Flag::Closed)) {
+		_closeTimer.cancel();
+		return {};
+	}
+	const auto left = _owner->_poll->closeDate - base::unixtime::now();
+	if (left <= 0) {
+		_closeTimer.cancel();
+		return {};
+	}
+	if (!_closeTimer.isActive()) {
+		_closeTimer.callEach(1000);
+	}
+	const auto hideResults = (_owner->_flags
+		& PollData::Flag::HideResultsUntilClose);
+	if (left >= 86400) {
+		const auto days = (left + 86399) / 86400;
+		return hideResults
+			? tr::lng_polls_results_in_days(tr::now, lt_count, days)
+			: tr::lng_polls_ends_in_days(tr::now, lt_count, days);
+	}
+	const auto timer = Ui::FormatDurationText(left);
+	return hideResults
+		? tr::lng_polls_results_in_time(tr::now, lt_time, timer)
+		: tr::lng_polls_ends_in_time(tr::now, lt_time, timer);
 }
 
-void Poll::toggleLinkRipple(bool pressed) {
-	if (pressed) {
-		const auto linkWidth = width();
-		const auto linkHeight = bottomButtonHeight();
-		if (!_linkRipple) {
-			auto mask = isRoundedInBubbleBottom()
-				? static_cast<Message*>(_parent.get())->bottomRippleMask(
-					bottomButtonHeight())
-				: BottomRippleMask{
-					Ui::RippleAnimation::RectMask({ linkWidth, linkHeight }),
-				};
-			_linkRipple = std::make_unique<Ui::RippleAnimation>(
-				st::defaultRippleAnimation,
-				std::move(mask.image),
-				[=] { repaint(); });
-			_linkRippleShift = mask.shift;
-		}
-		_linkRipple->add(_lastLinkPoint
-			+ QPoint(_linkRippleShift, linkHeight - height()));
-	} else if (_linkRipple) {
-		_linkRipple->lastStop();
+QRect Poll::Footer::timerRect(
+		const Layout &layout,
+		int left,
+		int innerWidth) const {
+	const auto timerText = closeTimerText();
+	if (timerText.isEmpty()) {
+		return {};
+	}
+	const auto lineHeight = st::msgDateFont->height;
+	const auto timerw = st::msgDateFont->width(timerText);
+	if (layout.timerSeparate) {
+		return QRect(
+			left + (innerWidth - timerw) / 2,
+			layout.timerY,
+			timerw,
+			lineHeight);
+	} else if (layout.timerFolded) {
+		const auto sep = QString::fromUtf8(" \xC2\xB7 ");
+		const auto label = _totalVotesLabel.toString();
+		const auto prefixw = st::msgDateFont->width(label + sep);
+		const auto fullw = prefixw + timerw;
+		return QRect(
+			left + (innerWidth - fullw) / 2 + prefixw,
+			layout.textY,
+			timerw,
+			lineHeight);
+	}
+	return {};
+}
+
+bool Poll::Footer::timerFooterMultiline(int paintw) const {
+	const auto timerText = closeTimerText();
+	if (timerText.isEmpty()) {
+		return false;
 	}
+	if (_owner->_voted && !_owner->showVotes()) {
+		return true;
+	}
+	const auto sep = QString::fromUtf8(" \xC2\xB7 ");
+	const auto full = _totalVotesLabel.toString()
+		+ sep
+		+ timerText;
+	return centeredOverlapsInfo(st::msgDateFont->width(full), paintw);
+}
+
+bool Poll::Footer::centeredOverlapsInfo(
+		int textWidth,
+		int innerWidth) const {
+	const auto skipw = _owner->_parent->skipBlockWidth();
+	return (innerWidth + textWidth) / 2 > innerWidth - skipw;
 }
 
 Poll::~Poll() {
+	for (const auto webpage : _registeredWebpages) {
+		history()->owner().unregisterWebPageView(webpage, _parent);
+	}
 	history()->owner().unregisterPollView(_poll, _parent);
 	if (hasHeavyPart()) {
 		unloadHeavyPart();
@@ -1618,4 +4569,26 @@ Poll::~Poll() {
 	}
 }
 
+void Poll::refreshWebpageSubscriptions() {
+	auto wanted = std::vector<WebPageData*>();
+	for (const auto &answer : _poll->answers) {
+		if (const auto webpage = answer.media.webpage) {
+			if (!ranges::contains(wanted, webpage)) {
+				wanted.push_back(webpage);
+			}
+		}
+	}
+	for (const auto webpage : _registeredWebpages) {
+		if (!ranges::contains(wanted, webpage)) {
+			history()->owner().unregisterWebPageView(webpage, _parent);
+		}
+	}
+	for (const auto webpage : wanted) {
+		if (!ranges::contains(_registeredWebpages, webpage)) {
+			history()->owner().registerWebPageView(webpage, _parent);
+		}
+	}
+	_registeredWebpages = std::move(wanted);
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_poll.h b/Telegram/SourceFiles/history/view/media/history_view_poll.h
index ea919b53956461..53c585a777fa8d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_poll.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_poll.h
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "ui/effects/animations.h"
 #include "data/data_poll.h"
 #include "base/weak_ptr.h"
+#include "base/timer.h"
 
 namespace Ui {
 class RippleAnimation;
@@ -25,7 +26,8 @@ class Poll final : public Media {
 public:
 	Poll(
 		not_null<Element*> parent,
-		not_null<PollData*> poll);
+		not_null<PollData*> poll,
+		const TextWithEntities &consumed);
 	~Poll();
 
 	void draw(Painter &p, const PaintContext &context) const override;
@@ -58,174 +60,74 @@ class Poll final : public Media {
 		const QRect &bubble,
 		crl::time ms) const override;
 
+	void clickHandlerActiveChanged(
+		const ClickHandlerPtr &handler,
+		bool active) override;
 	void clickHandlerPressedChanged(
 		const ClickHandlerPtr &handler,
 		bool pressed) override;
 
+	void hideSpoilers() override;
+
 	void unloadHeavyPart() override;
 	bool hasHeavyPart() const override;
+	void parentTextUpdated() override;
+
+	[[nodiscard]] QRect addOptionRect(int innerWidth) const override;
+	void setAddOptionActive(bool active) override;
 
 private:
+	struct Part;
+	struct Header;
+	struct Options;
+	struct AddOption;
+	struct Footer;
+
 	struct AnswerAnimation;
 	struct AnswersAnimation;
 	struct SendingAnimation;
 	struct Answer;
-	struct CloseInformation;
+	struct AttachedMedia;
+	struct SolutionMedia;
 	struct RecentVoter;
 
 	QSize countOptimalSize() override;
 	QSize countCurrentSize(int newWidth) override;
 
 	[[nodiscard]] bool showVotes() const;
+	[[nodiscard]] PollData::VoteRestriction knownVoteRestriction() const;
+	[[nodiscard]] bool voteRestricted() const;
+	void showVoteRestrictionToast() const;
 	[[nodiscard]] bool canVote() const;
 	[[nodiscard]] bool canSendVotes() const;
-
-	[[nodiscard]] int countAnswerTop(
-		const Answer &answer,
-		int innerWidth) const;
-	[[nodiscard]] int countAnswerHeight(
-		const Answer &answer,
-		int innerWidth) const;
-	[[nodiscard]] ClickHandlerPtr createAnswerClickHandler(
-		const Answer &answer);
+	[[nodiscard]] bool isAuthorNotVoted() const;
 	void updateTexts();
-	void updateRecentVoters();
-	void updateAnswers();
 	void updateVotes();
-	void updateTotalVotes();
 	bool showVotersCount() const;
 	bool inlineFooter() const;
-	void updateAnswerVotes();
-	void updateAnswerVotesFromOriginal(
-		Answer &answer,
-		const PollAnswer &original,
-		int percent,
-		int maxVotes);
-	void checkSendingAnimation() const;
-
-	void paintRecentVoters(
-		Painter &p,
-		int left,
-		int top,
-		const PaintContext &context) const;
-	void paintCloseByTimer(
-		Painter &p,
-		int right,
-		int top,
-		const PaintContext &context) const;
-	void paintShowSolution(
-		Painter &p,
-		int right,
-		int top,
-		const PaintContext &context) const;
-	int paintAnswer(
-		Painter &p,
-		const Answer &answer,
-		const AnswerAnimation *animation,
-		int left,
-		int top,
-		int width,
-		int outerWidth,
-		const PaintContext &context) const;
-	void paintRadio(
-		Painter &p,
-		const Answer &answer,
-		int left,
-		int top,
-		const PaintContext &context) const;
-	void paintPercent(
-		Painter &p,
-		const QString &percent,
-		int percentWidth,
-		int left,
-		int top,
-		int outerWidth,
-		const PaintContext &context) const;
-	void paintFilling(
-		Painter &p,
-		bool chosen,
-		bool correct,
-		float64 filling,
-		int left,
-		int top,
-		int width,
-		int height,
-		const PaintContext &context) const;
-	void paintInlineFooter(
-		Painter &p,
-		int left,
-		int top,
-		int paintw,
-		const PaintContext &context) const;
-	void paintBottom(
-		Painter &p,
-		int left,
-		int top,
-		int paintw,
-		const PaintContext &context) const;
-
-	bool checkAnimationStart() const;
-	bool answerVotesChanged() const;
-	void saveStateInAnimation() const;
-	void startAnswersAnimation() const;
-	void resetAnswersAnimation() const;
-	void radialAnimationCallback() const;
-
-	void toggleRipple(Answer &answer, bool pressed);
-	void toggleLinkRipple(bool pressed);
-	void toggleMultiOption(const QByteArray &option);
-	void sendMultiOptions();
-	void showResults();
-	void checkQuizAnswered();
-	void showSolution() const;
-	void solutionToggled(
-		bool solutionShown,
-		anim::type animated = anim::type::normal) const;
-
-	[[nodiscard]] bool canShowSolution() const;
-	[[nodiscard]] bool inShowSolution(
-		QPoint point,
-		int right,
-		int top) const;
-
-	[[nodiscard]] int bottomButtonHeight() const;
-
-	const not_null<PollData*> _poll;
+
+	[[nodiscard]] bool canAddOption() const;
+	void refreshWebpageSubscriptions();
+
+	not_null<PollData*> _poll;
+	std::vector<WebPageData*> _registeredWebpages;
 	int _pollVersion = 0;
 	int _totalVotes = 0;
 	bool _voted = false;
 	PollData::Flags _flags = PollData::Flags();
 
-	Ui::Text::String _question;
-	Ui::Text::String _subtitle;
-	std::vector<RecentVoter> _recentVoters;
-	QImage _recentVotersImage;
-
-	std::vector<Answer> _answers;
-	Ui::Text::String _totalVotesLabel;
-	ClickHandlerPtr _showResultsLink;
-	ClickHandlerPtr _sendVotesLink;
-	mutable ClickHandlerPtr _showSolutionLink;
-	mutable std::unique_ptr<Ui::RippleAnimation> _linkRipple;
-	mutable int _linkRippleShift = 0;
-
-	mutable std::unique_ptr<AnswersAnimation> _answersAnimation;
-	mutable std::unique_ptr<SendingAnimation> _sendingAnimation;
 	mutable std::unique_ptr<Ui::FireworksAnimation> _fireworksAnimation;
 	Ui::Animations::Simple _wrongAnswerAnimation;
 	mutable QPoint _lastLinkPoint;
-	mutable QImage _userpicCircleCache;
-	mutable QImage _fillingIconCache;
-
-	mutable std::unique_ptr<CloseInformation> _close;
 
-	mutable Ui::Animations::Simple _solutionButtonAnimation;
-	mutable bool _solutionShown = false;
-	mutable bool _solutionButtonVisible = false;
-
-	bool _hasSelected = false;
-	bool _votedFromHere = false;
+	bool _addOptionActive = false;
 	mutable bool _wrongAnswerAnimated = false;
+	mutable bool _adminShowResults = false;
+
+	std::unique_ptr<Header> _headerPart;
+	std::unique_ptr<Options> _optionsPart;
+	std::unique_ptr<AddOption> _addOptionPart;
+	std::unique_ptr<Footer> _footerPart;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
index e12ab3d3f50bad..548d3e90b79d1b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
@@ -7,10 +7,15 @@ For license and copyright information please follow this link:
 */
 #include "history/view/media/history_view_premium_gift.h"
 
+#include "apiwrap.h"
+#include "api/api_credits.h" // InputSavedStarGiftId
+#include "api/api_premium.h"
 #include "base/unixtime.h"
 #include "boxes/gift_premium_box.h" // ResolveGiftCode
+#include "boxes/star_gift_box.h" // GiftReleasedByHandler
 #include "chat_helpers/stickers_gift_box_pack.h"
 #include "core/click_handler_types.h" // ClickHandlerContext
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_channel.h"
 #include "data/data_credits.h"
 #include "data/data_document.h"
@@ -21,10 +26,11 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_element.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "settings/settings_credits.h" // Settings::CreditsId
-#include "settings/settings_credits_graphics.h"
+#include "settings/sections/settings_credits.h" // Settings::CreditsId
 #include "settings/settings_credits_graphics.h" // GiftedCreditsBox
-#include "settings/settings_premium.h" // Settings::ShowGiftPremium
+#include "settings/sections/settings_premium.h" // Settings::ShowGiftPremium
+#include "ui/chat/chat_style.h"
+#include "ui/controls/ton_common.h" // kNanosInOne
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "window/window_session_controller.h"
@@ -43,54 +49,155 @@ PremiumGift::PremiumGift(
 PremiumGift::~PremiumGift() = default;
 
 int PremiumGift::top() {
-	return starGift() ? 0 : st::msgServiceGiftBoxStickerTop;
+	return (starGift() || tonGift())
+		? st::msgServiceStarGiftStickerTop
+		: st::msgServiceGiftBoxStickerTop;
+}
+
+int PremiumGift::width() {
+	return st::msgServiceStarGiftBoxWidth;
 }
 
 QSize PremiumGift::size() {
-	return QSize(
-		st::msgServiceGiftBoxStickerSize,
-		st::msgServiceGiftBoxStickerSize);
+	return (starGift() || tonGift())
+		? QSize(
+			st::msgServiceStarGiftStickerSize,
+			st::msgServiceStarGiftStickerSize)
+		: QSize(
+			st::msgServiceGiftBoxStickerSize,
+			st::msgServiceGiftBoxStickerSize);
 }
 
-QString PremiumGift::title() {
-	if (starGift()) {
-		return (outgoingGift()
-			? tr::lng_action_gift_sent_subtitle
-			: tr::lng_action_gift_got_subtitle)(
+TextWithEntities PremiumGift::title() {
+	if (tonGift()) {
+		return tr::lng_gift_ton_amount(
+			tr::now,
+			lt_count_decimal,
+			CreditsAmount(0, _data.count, CreditsType::Ton).value(),
+			tr::marked);
+	} else if (starGift()) {
+		const auto peer = _parent->history()->peer;
+		const auto to = _data.auctionTo ? _data.auctionTo : peer.get();
+		return peer->isSelf()
+			? tr::lng_action_gift_self_subtitle(tr::now, tr::marked)
+			: (peer->isServiceUser() && _data.channelFrom)
+			? tr::lng_action_gift_got_subtitle(
 				tr::now,
 				lt_user,
-				_parent->history()->peer->shortName());
+				tr::marked()
+					.append(Ui::Text::SingleCustomEmoji(
+						peer->owner().customEmojiManager(
+						).peerUserpicEmojiData(_data.channelFrom)))
+					.append(' ')
+					.append(_data.channelFrom->shortName()),
+				tr::marked)
+			: (!_data.auctionTo && peer->isServiceUser())
+			? tr::lng_gift_link_label_gift(tr::now, tr::marked)
+			: (outgoingGift()
+				? tr::lng_action_gift_sent_subtitle
+				: tr::lng_action_gift_got_subtitle)(
+					tr::now,
+					lt_user,
+					tr::marked()
+						.append(Ui::Text::SingleCustomEmoji(
+							to->owner().customEmojiManager(
+							).peerUserpicEmojiData(to)))
+						.append(' ')
+						.append(to->shortName()),
+					tr::marked);
 	} else if (creditsPrize()) {
-		return tr::lng_prize_title(tr::now);
-	} else if (const auto count = credits()) {
-		return tr::lng_gift_stars_title(tr::now, lt_count, count);
+		return tr::lng_prize_title(tr::now, tr::marked);
+	} else if (const auto stars = credits()) {
+		return tr::lng_gift_stars_title(tr::now, lt_count_decimal, stars, tr::marked);
 	}
 	return gift()
-		? tr::lng_action_gift_premium_months(tr::now, lt_count, _data.count)
+		? tr::lng_action_gift_premium_months(
+			tr::now,
+			lt_count,
+			premiumMonths(),
+			tr::marked)
 		: _data.unclaimed
-		? tr::lng_prize_unclaimed_title(tr::now)
-		: tr::lng_prize_title(tr::now);
+		? tr::lng_prize_unclaimed_title(tr::now, tr::marked)
+		: tr::lng_prize_title(tr::now, tr::marked);
+}
+
+TextWithEntities PremiumGift::author() {
+	if (!_data.stargiftReleasedBy) {
+		return {};
+	}
+	return tr::lng_gift_released_by(
+		tr::now,
+		lt_name,
+		tr::link('@' + _data.stargiftReleasedBy->username()),
+		tr::marked);
 }
 
 TextWithEntities PremiumGift::subtitle() {
-	if (starGift()) {
+	if (tonGift()) {
+		return tr::lng_action_gift_got_ton(tr::now, tr::marked);
+	} else if (starGift()) {
+		const auto toChannel = _data.channel
+			&& _parent->history()->peer->isServiceUser();
 		return !_data.message.empty()
 			? _data.message
+			: _data.refunded
+			? tr::lng_action_gift_refunded(tr::now, tr::rich)
 			: outgoingGift()
-			? tr::lng_action_gift_sent_text(
-				tr::now,
-				lt_count,
-				_data.convertStars,
-				lt_user,
-				Ui::Text::Bold(_parent->history()->peer->shortName()),
-				Ui::Text::RichLangValue)
+			? (_data.auctionTo
+				? tr::lng_action_gift_self_auction(
+					tr::now,
+					lt_cost,
+					tr::lng_action_gift_for_stars(
+						tr::now,
+						lt_count_decimal,
+						_data.starsBid,
+						tr::marked),
+					tr::rich)
+				: _data.starsUpgradedBySender
+				? tr::lng_action_gift_sent_upgradable(
+					tr::now,
+					lt_user,
+					tr::bold(_parent->history()->peer->shortName()),
+					tr::rich)
+				: tr::lng_action_gift_sent_text(
+					tr::now,
+					lt_count_decimal,
+					_data.starsConverted,
+					lt_user,
+					tr::bold(_parent->history()->peer->shortName()),
+					tr::rich))
+			: _data.starsUpgradedBySender
+			? tr::lng_action_gift_got_upgradable_text(tr::now, tr::rich)
+			: (_data.starsToUpgrade
+				&& !_data.converted
+				&& _parent->history()->peer->isSelf())
+			? tr::lng_action_gift_self_about_unique(tr::now, tr::rich)
+			: (_data.starsToUpgrade
+				&& !_data.converted
+				&& _parent->history()->peer->isServiceUser()
+				&& _data.channel)
+			? tr::lng_action_gift_channel_about_unique(tr::now, tr::rich)
+			: (!_data.converted && !_data.starsConverted)
+			? (_data.saved
+				? (toChannel
+					? tr::lng_action_gift_can_remove_channel
+					: tr::lng_action_gift_can_remove_text)
+				: (toChannel
+					? tr::lng_action_gift_got_gift_channel
+					: tr::lng_action_gift_got_gift_text))(tr::now, tr::rich)
 			: (_data.converted
-				? tr::lng_gift_got_stars
+				? (toChannel
+					? tr::lng_gift_channel_got
+					: tr::lng_gift_got_stars)
+				: _parent->history()->peer->isSelf()
+				? tr::lng_action_gift_self_about
+				: toChannel
+				? tr::lng_action_gift_channel_about
 				: tr::lng_action_gift_got_stars_text)(
 					tr::now,
 					lt_count,
-					_data.convertStars,
-					Ui::Text::RichLangValue);
+					_data.starsConverted,
+					tr::rich);
 	}
 	const auto isCreditsPrize = creditsPrize();
 	if (const auto count = credits(); count && !isCreditsPrize) {
@@ -98,15 +205,13 @@ TextWithEntities PremiumGift::subtitle() {
 			? tr::lng_gift_stars_outgoing(
 				tr::now,
 				lt_user,
-				Ui::Text::Bold(_parent->history()->peer->shortName()),
-				Ui::Text::RichLangValue)
-			: tr::lng_gift_stars_incoming(tr::now, Ui::Text::WithEntities);
+				tr::bold(_parent->history()->peer->shortName()),
+				tr::rich)
+			: tr::lng_gift_stars_incoming(tr::now, tr::marked);
 	} else if (gift()) {
 		return !_data.message.empty()
 			? _data.message
-			: tr::lng_action_gift_premium_about(
-				tr::now,
-				Ui::Text::RichLangValue);
+			: tr::lng_action_gift_premium_about(tr::now, tr::rich);
 	}
 	const auto name = _data.channel ? _data.channel->name() : "channel";
 	auto result = (_data.unclaimed
@@ -116,8 +221,8 @@ TextWithEntities PremiumGift::subtitle() {
 		: tr::lng_prize_gift_about)(
 			tr::now,
 			lt_channel,
-			Ui::Text::Bold(name),
-			Ui::Text::RichLangValue);
+			tr::bold(name),
+			tr::rich);
 	result.append("\n\n");
 	result.append(isCreditsPrize
 		? tr::lng_prize_credits(
@@ -125,10 +230,10 @@ TextWithEntities PremiumGift::subtitle() {
 			lt_amount,
 			tr::lng_prize_credits_amount(
 				tr::now,
-				lt_count,
+				lt_count_decimal,
 				credits(),
-				Ui::Text::RichLangValue),
-			Ui::Text::RichLangValue)
+				tr::marked),
+			tr::rich)
 		: (_data.unclaimed
 			? tr::lng_prize_unclaimed_duration
 			: _data.viaGiveaway
@@ -136,71 +241,108 @@ TextWithEntities PremiumGift::subtitle() {
 			: tr::lng_prize_gift_duration)(
 				tr::now,
 				lt_duration,
-				Ui::Text::Bold(GiftDuration(_data.count)),
-				Ui::Text::RichLangValue));
+				tr::bold(GiftDuration(premiumDays())),
+				tr::rich));
 	return result;
 }
 
 rpl::producer<QString> PremiumGift::button() {
 	return (starGift() && outgoingGift())
-		? nullptr
+		? tr::lng_sticker_premium_view()
 		: creditsPrize()
 		? tr::lng_view_button_giftcode()
+		: (starGift() && _data.starsUpgradedBySender && !_data.upgraded)
+		? tr::lng_gift_view_unpack()
 		: (gift() && (outgoingGift() || !_data.unclaimed))
 		? tr::lng_sticker_premium_view()
 		: tr::lng_prize_open();
 }
 
+std::optional<Ui::Premium::MiniStarsType> PremiumGift::buttonMinistars() {
+	return tonGift()
+		? Ui::Premium::MiniStarsType::SlowDiamondStars
+		: Ui::Premium::MiniStarsType::SlowStars;
+}
+
 ClickHandlerPtr PremiumGift::createViewLink() {
-	if (starGift() && outgoingGift()) {
-		return nullptr;
+	if (tonGift()) {
+		const auto lifetime = std::make_shared<rpl::lifetime>();
+		return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+			const auto my = context.other.value<ClickHandlerContext>();
+			const auto weak = my.sessionWindow;
+			if (const auto window = weak.get()) {
+				window->session().credits().tonLoad();
+				*lifetime = window->session().credits().tonLoadedValue(
+				) | rpl::filter([=] {
+					if (const auto window = weak.get()) {
+						return window->session().credits().tonLoaded();
+					}
+					return false;
+				}) | rpl::take(1) | rpl::on_next([=] {
+					if (const auto window = weak.get()) {
+						window->showSettings(Settings::CurrencyId());
+					}
+				});
+			}
+		});
+	}
+	if (auto link = OpenStarGiftLink(_parent->data())) {
+		return link;
 	}
 	const auto from = _gift->from();
-	const auto itemId = _parent->data()->fullId();
 	const auto peer = _parent->history()->peer;
 	const auto date = _parent->data()->date();
 	const auto data = *_gift->gift();
-	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
-		const auto my = context.other.value<ClickHandlerContext>();
-		if (const auto controller = my.sessionWindow.get()) {
-			const auto selfId = controller->session().userPeerId();
-			const auto sent = (from->id == selfId);
-			if (starGift()) {
-				const auto item = controller->session().data().message(itemId);
-				if (item) {
-					controller->show(Box(
-						Settings::StarGiftViewBox,
-						controller,
-						data,
-						item));
-				}
-			} else if (creditsPrize()) {
-				controller->show(Box(
-					Settings::CreditsPrizeBox,
-					controller,
-					data,
-					date));
-			} else if (data.type == Data::GiftType::Credits) {
-				const auto to = sent ? peer : peer->session().user();
-				controller->show(Box(
-					Settings::GiftedCreditsBox,
-					controller,
-					from,
-					to,
-					data.count,
-					date));
-			} else if (data.slug.isEmpty()) {
-				const auto months = data.count;
-				Settings::ShowGiftPremium(controller, peer, months, sent);
-			} else {
-				const auto fromId = from->id;
-				const auto toId = sent ? peer->id : selfId;
-				ResolveGiftCode(controller, data.slug, fromId, toId);
-			}
+	const auto showForWeakWindow = [=](
+			base::weak_ptr<Window::SessionController> weak) {
+		const auto controller = weak.get();
+		if (!controller) {
+			return;
 		}
+		const auto selfId = controller->session().userPeerId();
+		const auto sent = (from->id == selfId);
+		if (creditsPrize()) {
+			controller->show(Box(
+				Settings::CreditsPrizeBox,
+				controller,
+				data,
+				date));
+		} else if (data.type == Data::GiftType::Credits) {
+			const auto to = sent ? peer : peer->session().user();
+			controller->show(Box(
+				Settings::GiftedCreditsBox,
+				controller,
+				from,
+				to,
+				data.count,
+				date));
+		} else if (data.slug.isEmpty()) {
+			const auto days = data.count;
+			Settings::ShowGiftPremium(controller, peer, days, sent);
+		} else {
+			const auto fromId = from->id;
+			const auto toId = sent ? peer->id : selfId;
+			ResolveGiftCode(controller, data.slug, fromId, toId);
+		}
+	};
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		showForWeakWindow(
+			context.other.value<ClickHandlerContext>().sessionWindow);
 	});
 }
 
+ClickHandlerPtr PremiumGift::authorLink() {
+	if (const auto by = _data.stargiftReleasedBy) {
+		if (!_authorLink) {
+			_authorLink = std::make_shared<LambdaClickHandler>([=] {
+				Ui::GiftReleasedByHandler(by);
+			});
+		}
+		return _authorLink;
+	}
+	return nullptr;
+}
+
 int PremiumGift::buttonSkip() {
 	return st::msgServiceGiftBoxButtonMargins.top();
 }
@@ -216,18 +358,42 @@ void PremiumGift::draw(
 	}
 }
 
-QString PremiumGift::cornerTagText() {
-	if (const auto count = _data.limitedCount) {
-		return (count == 1)
-			? tr::lng_gift_limited_of_one(tr::now)
-			: tr::lng_gift_limited_of_count(
-				tr::now,
-				lt_amount,
-				((count % 1000)
-					? Lang::FormatCountDecimal(count)
-					: Lang::FormatCountToShort(count).string));
+QImage PremiumGift::cornerTag(const PaintContext &context) {
+	auto badge = Info::PeerGifts::GiftBadge();
+	if (_data.unique) {
+		const auto burned = _data.unique->burned;
+		const auto burnedBg = Info::PeerGifts::BurnedBadgeBg();
+		badge = {
+			.text = (burned
+				? tr::lng_gift_burned_tag(tr::now)
+				: tr::lng_gift_collectible_tag(tr::now)),
+			.bg1 = (burned ? burnedBg : _data.unique->backdrop.edgeColor),
+			.bg2 = (burned ? burnedBg : _data.unique->backdrop.patternColor),
+			.fg = (burned ? st::white->c : _data.unique->backdrop.textColor),
+		};
+	} else if (const auto count = _data.limitedCount) {
+		badge = {
+			.text = ((count == 1)
+				? tr::lng_gift_limited_of_one(tr::now)
+				: tr::lng_gift_limited_of_count(
+					tr::now,
+					lt_amount,
+					(((count % 1000) && (count < 10'000))
+						? Lang::FormatCountDecimal(count)
+						: Lang::FormatCountToShort(count).string))),
+			.bg1 = context.st->msgServiceBg()->c,
+			.fg = context.st->msgServiceFg()->c,
+		};
+	} else {
+		return {};
 	}
-	return QString();
+	if (_badgeCache.isNull() || _badgeKey != badge) {
+		_badgeKey = badge;
+		_badgeCache = ValidateRotatedBadge(
+			badge,
+			st::msgServiceGiftBoxBadgePadding);
+	}
+	return _badgeCache;
 }
 
 bool PremiumGift::hideServiceText() {
@@ -259,19 +425,29 @@ void PremiumGift::unloadHeavyPart() {
 }
 
 bool PremiumGift::incomingGift() const {
-	return gift() && !_parent->data()->out();
+	const auto out = _parent->data()->out();
+	return gift() && !_data.auctionTo && (starGiftUpgrade() ? out : !out);
 }
 
 bool PremiumGift::outgoingGift() const {
-	return gift() && _parent->data()->out();
+	const auto out = _parent->data()->out();
+	return gift() && (_data.auctionTo || (starGiftUpgrade() ? !out : out));
 }
 
 bool PremiumGift::gift() const {
 	return _data.slug.isEmpty() || !_data.channel;
 }
 
+bool PremiumGift::tonGift() const {
+	return (_data.type == Data::GiftType::Ton);
+}
+
 bool PremiumGift::starGift() const {
-	return _data.type == Data::GiftType::StarGift;
+	return (_data.type == Data::GiftType::StarGift);
+}
+
+bool PremiumGift::starGiftUpgrade() const {
+	return (_data.type == Data::GiftType::StarGift) && _data.upgrade;
 }
 
 bool PremiumGift::creditsPrize() const {
@@ -284,30 +460,159 @@ int PremiumGift::credits() const {
 	return (_data.type == Data::GiftType::Credits) ? _data.count : 0;
 }
 
+int PremiumGift::premiumDays() const {
+	return (_data.type == Data::GiftType::Premium) ? _data.count : 0;
+}
+
+int PremiumGift::premiumMonths() const {
+	return premiumDays() / 30;
+}
+
 void PremiumGift::ensureStickerCreated() const {
 	if (_sticker) {
 		return;
-	} else if (const auto document = _data.document) {
-		if (const auto sticker = document->sticker()) {
-			const auto skipPremiumEffect = false;
-			_sticker.emplace(_parent, document, skipPremiumEffect, _parent);
-			_sticker->setDiceIndex(sticker->alt, 1);
-			_sticker->initSize(st::msgServiceGiftBoxStickerSize);
-			return;
+	} else if (tonGift()) {
+		const auto &session = _parent->history()->session();
+		auto &packs = session.giftBoxStickersPacks();
+		const auto count = _data.count / Ui::kNanosInOne;
+		if (const auto document = packs.tonLookup(count)) {
+			if (document->sticker()) {
+				const auto skipPremiumEffect = false;
+				_sticker.emplace(_parent, document, skipPremiumEffect, _parent);
+				_sticker->setStopOnLastFrame(true);
+				_sticker->initSize(st::msgServiceGiftBoxStickerSize);
+			}
 		}
+		return;
+	} else if (const auto document = _data.document) {
+		const auto sticker = document->sticker();
+		Assert(sticker != nullptr);
+		_sticker.emplace(_parent, document, false, _parent);
+		_sticker->setPlayingOnce(true);
+		_sticker->initSize(st::msgServiceStarGiftStickerSize);
+		_parent->repaint();
+		return;
 	}
 	const auto &session = _parent->history()->session();
 	auto &packs = session.giftBoxStickersPacks();
 	const auto count = credits();
-	const auto months = count ? packs.monthsForStars(count) : _data.count;
+	const auto months = count
+		? packs.monthsForStars(count)
+		: premiumMonths();
 	if (const auto document = packs.lookup(months)) {
-		if (const auto sticker = document->sticker()) {
+		if (document->sticker()) {
 			const auto skipPremiumEffect = false;
 			_sticker.emplace(_parent, document, skipPremiumEffect, _parent);
-			_sticker->setDiceIndex(sticker->alt, 1);
+			_sticker->setStopOnLastFrame(true);
 			_sticker->initSize(st::msgServiceGiftBoxStickerSize);
 		}
 	}
 }
 
+ClickHandlerPtr OpenStarGiftLink(not_null<HistoryItem*> item) {
+	const auto media = item->media();
+	const auto gift = media ? media->gift() : nullptr;
+	if (!gift || gift->type != Data::GiftType::StarGift) {
+		return nullptr;
+	}
+	const auto data = *gift;
+	const auto itemId = item->fullId();
+	const auto upgradedMsgId = data.upgraded
+		? data.realGiftMsgId
+		: MsgId(0);
+	const auto openInsteadId = data.realGiftMsgId
+		? Data::SavedStarGiftId::User(data.realGiftMsgId)
+		: (data.channel && data.channelSavedId)
+		? Data::SavedStarGiftId::Chat(data.channel, data.channelSavedId)
+		: Data::SavedStarGiftId();
+	const auto requesting = std::make_shared<bool>();
+	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		const auto my = context.other.value<ClickHandlerContext>();
+		const auto weak = my.sessionWindow;
+		const auto controller = weak.get();
+		if (!controller) {
+			return;
+		} else if (data.unique && data.unique->burned) {
+			controller->showToast(tr::lng_gift_burned_message(tr::now));
+			return;
+		}
+		const auto quick = [=](not_null<Window::SessionController*> window) {
+			Settings::ShowStarGiftViewBox(window, data, itemId);
+		};
+		if (!openInsteadId) {
+			quick(controller);
+			return;
+		} else if (*requesting) {
+			return;
+		}
+		*requesting = true;
+		const auto requestSavedGift = [=] {
+			controller->session().api().request(MTPpayments_GetSavedStarGift(
+				MTP_vector<MTPInputSavedStarGift>(
+					1,
+					Api::InputSavedStarGiftId(openInsteadId))
+			)).done([=](const MTPpayments_SavedStarGifts &result) {
+				*requesting = false;
+				if (const auto window = weak.get()) {
+					const auto &data = result.data();
+					window->session().data().processUsers(data.vusers());
+					window->session().data().processChats(data.vchats());
+					const auto owner = openInsteadId.chat()
+						? openInsteadId.chat()
+						: window->session().user();
+					const auto &list = data.vgifts().v;
+					if (list.empty()) {
+						quick(window);
+					} else if (auto g = Api::FromTL(owner, list[0])) {
+						Settings::ShowSavedStarGiftBox(window, owner, *g);
+					}
+				}
+			}).fail([=](const MTP::Error &error) {
+				*requesting = false;
+				if (const auto window = weak.get()) {
+					if (!Ui::ShowGiftErrorToast(window->uiShow(), error)) {
+						window->showToast(error.type());
+						quick(window);
+					}
+				}
+			}).send();
+		};
+		if (const auto msgId = upgradedMsgId) {
+			const auto session = &controller->session();
+			const auto owner = &controller->session().data();
+			const auto processItem = [=](not_null<HistoryItem*> item) {
+				const auto media = item->media();
+				if (!media || !media->gift() || !media->gift()->unique) {
+					*requesting = false;
+					if (const auto window = weak.get()) {
+						quick(window);
+					}
+					return;
+				}
+				// It is not possible to request a saved star gift
+				// when it is transferred and does not belong to you.
+				if (!media->gift()->transferred) {
+					return requestSavedGift();
+				}
+				*requesting = false;
+				const auto local = u"nft/"_q + media->gift()->unique->slug;
+				UrlClickHandler::Open(session->createInternalLinkFull(local));
+			};
+			if (const auto item = owner->nonChannelMessage(msgId)) {
+				processItem(item);
+			} else {
+				session->api().requestMessageData(nullptr, msgId, [=] {
+					if (const auto item = owner->nonChannelMessage(msgId)) {
+						processItem(item);
+					} else {
+						*requesting = false;
+					}
+				});
+			}
+		} else {
+			requestSavedGift();
+		}
+	});
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
index 00883240db7de7..0dae6ab65b34c9 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.h
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "history/view/media/history_view_sticker.h"
 #include "history/view/media/history_view_service_box.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
 
 namespace Data {
 class MediaGiftBox;
@@ -25,17 +26,21 @@ class PremiumGift final : public ServiceBoxContent {
 	~PremiumGift();
 
 	int top() override;
+	int width() override;
 	QSize size() override;
-	QString title() override;
+	TextWithEntities title() override;
+	TextWithEntities author() override;
 	TextWithEntities subtitle() override;
 	rpl::producer<QString> button() override;
-	QString cornerTagText() override;
+	std::optional<Ui::Premium::MiniStarsType> buttonMinistars() override;
+	QImage cornerTag(const PaintContext &context) override;
 	int buttonSkip() override;
 	void draw(
 		Painter &p,
 		const PaintContext &context,
 		const QRect &geometry) override;
 	ClickHandlerPtr createViewLink() override;
+	ClickHandlerPtr authorLink() override;
 
 	bool hideServiceText() override;
 	void stickerClearLoopPlayed() override;
@@ -49,17 +54,26 @@ class PremiumGift final : public ServiceBoxContent {
 private:
 	[[nodiscard]] bool incomingGift() const;
 	[[nodiscard]] bool outgoingGift() const;
+	[[nodiscard]] bool tonGift() const;
 	[[nodiscard]] bool starGift() const;
+	[[nodiscard]] bool starGiftUpgrade() const;
 	[[nodiscard]] bool gift() const;
 	[[nodiscard]] bool creditsPrize() const;
 	[[nodiscard]] int credits() const;
+	[[nodiscard]] int premiumDays() const;
+	[[nodiscard]] int premiumMonths() const;
 	void ensureStickerCreated() const;
 
 	const not_null<Element*> _parent;
 	const not_null<Data::MediaGiftBox*> _gift;
 	const Data::GiftCode &_data;
+	ClickHandlerPtr _authorLink;
+	QImage _badgeCache;
+	Info::PeerGifts::GiftBadge _badgeKey;
 	mutable std::optional<Sticker> _sticker;
 
 };
 
+[[nodiscard]] ClickHandlerPtr OpenStarGiftLink(not_null<HistoryItem*> item);
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_save_document_action.cpp b/Telegram/SourceFiles/history/view/media/history_view_save_document_action.cpp
new file mode 100644
index 00000000000000..6bb6eeb4e64f96
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_save_document_action.cpp
@@ -0,0 +1,132 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/media/history_view_save_document_action.h"
+
+#include "base/call_delayed.h"
+#include "data/data_document.h"
+#include "data/data_file_click_handler.h"
+#include "data/data_file_origin.h"
+#include "data/data_peer.h"
+#include "data/data_saved_music.h"
+#include "data/data_session.h"
+#include "history/view/history_view_context_menu.h"
+#include "history/view/history_view_list_widget.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "lang/lang_keys.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/menu/menu_multiline_action.h"
+#include "ui/widgets/popup_menu.h"
+#include "window/window_peer_menu.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_widgets.h"
+
+namespace HistoryView {
+
+void AddSaveDocumentAction(
+		const Ui::Menu::MenuCallback &addAction,
+		not_null<HistoryItem*> item,
+		not_null<DocumentData*> document,
+		not_null<Window::SessionController*> controller) {
+	const auto contextId = item->fullId();
+	const auto fromSaved = item->history()->peer->isSelf();
+	const auto savedMusic = &document->owner().savedMusic();
+	const auto show = controller->uiShow();
+	const auto inProfile = savedMusic->has(document);
+	const auto &ripple = st::defaultDropdownMenu.menu.ripple;
+	const auto duration = ripple.hideDuration;
+	const auto saveAs = base::fn_delayed(duration, controller, [=] {
+		DocumentSaveClickHandler::SaveAndTrack(
+			contextId,
+			document,
+			DocumentSaveClickHandler::Mode::ToNewFile);
+	});
+	if (!document->isMusicForProfile() || (fromSaved && inProfile)) {
+		const auto text = document->isVideoFile()
+			? tr::lng_context_save_video(tr::now)
+			: document->isVoiceMessage()
+			? tr::lng_context_save_audio(tr::now)
+			: document->isAudioFile()
+			? tr::lng_context_save_audio_file(tr::now)
+			: document->sticker()
+			? tr::lng_context_save_image(tr::now)
+			: tr::lng_context_save_file(tr::now);
+		addAction(text, saveAs, &st::menuIconDownload);
+		return;
+	}
+	const auto fill = [&](not_null<Ui::PopupMenu*> menu) {
+		if (!inProfile) {
+			const auto saved = [=] {
+				savedMusic->save(document, contextId);
+				show->showToast({
+					.text = { tr::lng_saved_music_added(tr::now) },
+					.iconLottie = u"toast/save_to_music"_q,
+					.iconLottieSize = st::toastLottieIconSize,
+				});
+			};
+			menu->addAction(
+				tr::lng_context_save_music_profile(tr::now),
+				saved,
+				&st::menuIconProfile);
+		}
+		if (!fromSaved) {
+			menu->addAction(
+				tr::lng_context_save_music_saved(tr::now),
+				[=] { Window::ForwardToSelf(show, { { contextId } }); },
+				&st::menuIconSavedMessages);
+		}
+		menu->addAction(
+			tr::lng_context_save_music_folder(tr::now),
+			saveAs,
+			&st::menuIconDownload);
+
+		menu->addSeparator(&st::expandedMenuSeparator);
+
+		auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
+			menu->menu(),
+			st::saveMusicInfoMenu,
+			st::historyHasCustomEmoji,
+			QPoint(
+				st::saveMusicInfoMenu.itemPadding.left(),
+				st::saveMusicInfoMenu.itemPadding.top()),
+			TextWithEntities{ tr::lng_context_save_music_about(tr::now) });
+		item->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+		item->setPointerCursor(false);
+		menu->addAction(std::move(item));
+	};
+	addAction(Ui::Menu::MenuCallback::Args{
+		.text = tr::lng_context_save_music_to(tr::now),
+		.handler = nullptr,
+		.icon = &st::menuIconSoundAdd,
+		.fillSubmenu = fill,
+		.submenuSt = &st::popupMenuWithIcons,
+	});
+}
+
+void AddSaveDocumentAction(
+		not_null<Ui::PopupMenu*> menu,
+		HistoryItem *item,
+		not_null<DocumentData*> document,
+		not_null<ListWidget*> list) {
+	if (!item || list->hasCopyMediaRestriction(item) || ItemHasTtl(item)) {
+		return;
+	}
+	AddSaveDocumentAction(
+		Ui::Menu::CreateAddActionCallback(menu),
+		item,
+		document,
+		list->controller());
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_save_document_action.h b/Telegram/SourceFiles/history/view/media/history_view_save_document_action.h
new file mode 100644
index 00000000000000..d4893fc5717245
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_save_document_action.h
@@ -0,0 +1,41 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class DocumentData;
+class HistoryItem;
+
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
+namespace Ui::Menu {
+struct MenuCallback;
+} // namespace Ui::Menu
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace HistoryView {
+
+class ListWidget;
+
+void AddSaveDocumentAction(
+	const Ui::Menu::MenuCallback &addAction,
+	not_null<HistoryItem*> item,
+	not_null<DocumentData*> document,
+	not_null<Window::SessionController*> controller);
+
+void AddSaveDocumentAction(
+	not_null<Ui::PopupMenu*> menu,
+	HistoryItem *item,
+	not_null<DocumentData*> document,
+	not_null<ListWidget*> list);
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
index 0252e32817bd2b..e2e657205a5639 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_service_box.cpp
@@ -8,19 +8,25 @@ For license and copyright information please follow this link:
 #include "history/view/media/history_view_service_box.h"
 
 #include "core/ui_integration.h"
+#include "data/data_session.h"
 #include "history/view/media/history_view_sticker_player_abstract.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_text_helper.h"
 #include "history/history.h"
+#include "history/history_item.h"
 #include "lang/lang_keys.h"
 #include "ui/chat/chat_style.h"
 #include "ui/effects/animation_value.h"
+#include "ui/effects/premium_stars_colored.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/text_utilities.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/power_saving.h"
 #include "styles/style_chat.h"
+#include "styles/style_credits.h"
+#include "styles/style_polls.h"
 #include "styles/style_premium.h"
 #include "styles/style_layers.h"
 
@@ -43,7 +49,16 @@ ServiceBox::ServiceBox(
 , _title(
 	st::defaultSubsectionTitle.style,
 	_content->title(),
-	kDefaultTextOptions,
+	kMarkupTextOptions,
+	_maxWidth,
+	Core::TextContext({
+		.session = &parent->history()->session(),
+		.repaint = [parent] { parent->customEmojiRepaint(); },
+	}))
+, _author(
+	st::uniqueGiftReleasedBy.style,
+	_content->author(),
+	kMarkupTextOptions,
 	_maxWidth)
 , _subtitle(
 	st::premiumPreviewAbout.style,
@@ -59,10 +74,10 @@ ServiceBox::ServiceBox(
 		}),
 	kMarkupTextOptions,
 	_maxWidth,
-	Core::MarkedTextContext{
+	Core::TextContext({
 		.session = &parent->history()->session(),
-		.customEmojiRepaint = [parent] { parent->customEmojiRepaint(); },
-	})
+		.repaint = [parent] { parent->customEmojiRepaint(); },
+	}))
 , _size(
 	_content->width(),
 	(st::msgServiceGiftBoxTopSkip
@@ -73,6 +88,12 @@ ServiceBox::ServiceBox(
 			? 0
 			: (_title.countHeight(_maxWidth)
 				+ st::msgServiceGiftBoxTitlePadding.bottom()))
+		+ (_author.isEmpty()
+			? 0
+			: (st::giftBoxReleasedByMargin.top()
+				+ st::uniqueGiftReleasedBy.style.font->height
+				+ st::giftBoxReleasedByMargin.bottom()
+				+ st::msgServiceGiftBoxTitlePadding.bottom()))
 		+ _subtitle.countHeight(_maxWidth)
 		+ (!_content->button()
 			? 0
@@ -82,7 +103,7 @@ ServiceBox::ServiceBox(
 	InitElementTextPart(_parent, _subtitle);
 	if (auto text = _content->button()) {
 		_button.repaint = [=] { repaint(); };
-		std::move(text) | rpl::start_with_next([=](QString value) {
+		std::move(text) | rpl::on_next([=](QString value) {
 			_button.text.setText(st::semiboldTextStyle, value);
 			const auto height = st::msgServiceGiftBoxButtonHeight;
 			const auto &padding = st::msgServiceGiftBoxButtonPadding;
@@ -98,10 +119,57 @@ ServiceBox::ServiceBox(
 			}
 		}, _lifetime);
 	}
+	if (const auto type = _content->buttonMinistars()) {
+		_button.stars = std::make_unique<Ui::Premium::ColoredMiniStars>(
+			[=](const QRect &) { repaint(); },
+			*type);
+		_button.lastFg = std::make_unique<QColor>();
+	}
+
+	if (auto changes = _content->changes()) {
+		std::move(changes) | rpl::on_next([=] {
+			applyContentChanges();
+		}, _lifetime);
+	}
 }
 
 ServiceBox::~ServiceBox() = default;
 
+void ServiceBox::applyContentChanges() {
+	const auto subtitleWas = _subtitle.countHeight(_maxWidth);
+
+	const auto parent = _parent;
+	_subtitle = Ui::Text::String(
+		st::premiumPreviewAbout.style,
+		Ui::Text::Filtered(
+			_content->subtitle(),
+			{
+				EntityType::Bold,
+				EntityType::StrikeOut,
+				EntityType::Underline,
+				EntityType::Italic,
+				EntityType::Spoiler,
+				EntityType::CustomEmoji,
+			}),
+			kMarkupTextOptions,
+			_maxWidth,
+			Core::TextContext({
+				.session = &parent->history()->session(),
+				.repaint = [parent] { parent->customEmojiRepaint(); },
+			}));
+	InitElementTextPart(parent, _subtitle);
+	const auto subtitleNow = _subtitle.countHeight(_maxWidth);
+	if (subtitleNow != subtitleWas) {
+		_size.setHeight(_size.height() - subtitleWas + subtitleNow);
+		_innerSize = _size - QSize(0, st::msgServiceGiftBoxTopSkip);
+
+		const auto item = parent->data();
+		item->history()->owner().requestItemResize(item);
+	} else {
+		parent->repaint();
+	}
+}
+
 QSize ServiceBox::countOptimalSize() {
 	return _size;
 }
@@ -114,10 +182,36 @@ void ServiceBox::draw(Painter &p, const PaintContext &context) const {
 	p.translate(0, st::msgServiceGiftBoxTopSkip);
 
 	PainterHighQualityEnabler hq(p);
-	const auto radius = st::msgServiceGiftBoxRadius;
 	p.setPen(Qt::NoPen);
 	p.setBrush(context.st->msgServiceBg());
-	p.drawRoundedRect(QRect(QPoint(), _innerSize), radius, radius);
+
+	const auto radius = st::msgServiceGiftBoxRadius;
+	if (_parent->data()->inlineReplyKeyboard()) {
+		const auto r = Rect(_innerSize);
+		const auto half = r.height() / 2;
+		p.setClipRect(r - QMargins(0, 0, 0, half));
+		p.drawRoundedRect(r, radius, radius);
+		p.setClipRect(r - QMargins(0, r.height() - half, 0, 0));
+		const auto small = Ui::BubbleRadiusSmall();
+		p.drawRoundedRect(r, small, small);
+		p.setClipping(false);
+	} else {
+		p.drawRoundedRect(Rect(_innerSize), radius, radius);
+	}
+
+	if (_button.stars) {
+		const auto &c = context.st->msgServiceFg()->c;
+		if ((*_button.lastFg) != c) {
+			_button.lastFg->setRgb(c.red(), c.green(), c.blue());
+			const auto padding = _button.size.height() / 2;
+			_button.stars->setColorOverride(QGradientStops{
+				{ 0., anim::with_alpha(c, .3) },
+				{ 1., c },
+			});
+			_button.stars->setCenter(
+				Rect(_button.size) - QMargins(padding, 0, padding, 0));
+		}
+	}
 
 	const auto content = contentRect();
 	auto top = content.top() + content.height();
@@ -126,9 +220,49 @@ void ServiceBox::draw(Painter &p, const PaintContext &context) const {
 		const auto &padding = st::msgServiceGiftBoxTitlePadding;
 		top += padding.top();
 		if (!_title.isEmpty()) {
-			_title.draw(p, st::msgPadding.left(), top, _maxWidth, style::al_top);
+			_title.draw(p, {
+				.position = QPoint(st::msgPadding.left(), top),
+				.availableWidth = _maxWidth,
+				.align = style::al_top,
+				.palette = &context.st->serviceTextPalette(),
+				.spoiler = Ui::Text::DefaultSpoilerCache(),
+				.now = context.now,
+				.pausedEmoji = context.paused || On(PowerSaving::kEmojiChat),
+				.pausedSpoiler = context.paused || On(PowerSaving::kChatSpoiler),
+			});
 			top += _title.countHeight(_maxWidth) + padding.bottom();
 		}
+		if (!_author.isEmpty()) {
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(context.st->msgServiceBg());
+			const auto use = std::min(_maxWidth, _author.maxWidth())
+				+ st::giftBoxReleasedByMargin.left()
+				+ st::giftBoxReleasedByMargin.right();
+			const auto left = st::msgPadding.left() + (_maxWidth - use) / 2;
+			const auto height = st::giftBoxReleasedByMargin.top()
+				+ st::uniqueGiftReleasedBy.style.font->height
+				+ st::giftBoxReleasedByMargin.bottom();
+			const auto radius = height / 2.;
+			p.drawRoundedRect(left, top, use, height, radius, radius);
+
+			auto fg = context.st->msgServiceFg()->c;
+			fg.setAlphaF(0.65 * fg.alphaF());
+			p.setPen(fg);
+			_author.draw(p, {
+				.position = QPoint(
+					left + st::giftBoxReleasedByMargin.left(),
+					top + st::giftBoxReleasedByMargin.top()),
+				.availableWidth = (use
+					- st::giftBoxReleasedByMargin.left()
+					- st::giftBoxReleasedByMargin.right()),
+				.palette = &context.st->serviceTextPalette(),
+				.elisionLines = 1,
+			});
+			p.setPen(context.st->msgServiceFg());
+
+			top += height + st::msgServiceGiftBoxTitlePadding.bottom();
+		}
 		_parent->prepareCustomEmojiPaint(p, context, _subtitle);
 		_subtitle.draw(p, {
 			.position = QPoint(st::msgPadding.left(), top),
@@ -149,6 +283,9 @@ void ServiceBox::draw(Painter &p, const PaintContext &context) const {
 
 		p.setPen(Qt::NoPen);
 		p.setBrush(context.st->msgServiceBg()); // ?
+		if (const auto stars = _button.stars.get()) {
+			stars->setPaused(context.paused);
+		}
 		_button.drawBg(p);
 		p.setPen(context.st->msgServiceFg());
 		if (_button.ripple) {
@@ -174,28 +311,9 @@ void ServiceBox::draw(Painter &p, const PaintContext &context) const {
 
 	_content->draw(p, context, content);
 
-	if (const auto tag = _content->cornerTagText(); !tag.isEmpty()) {
-		const auto font = st::semiboldFont;
-		p.setFont(font);
-		p.setPen(Qt::NoPen);
-		const auto twidth = font->width(tag);
-		const auto pos = QPoint(_innerSize.width() - twidth, font->height);
-		const auto add = style::ConvertScale(2);
-		p.save();
-		p.setClipRect(
-			-add,
-			-add,
-			_innerSize.width() + 2 * add,
-			_innerSize.height() + 2 * add);
-		p.translate(pos);
-		p.rotate(45.);
-		p.translate(-pos);
-		p.setPen(Qt::NoPen);
-		p.setBrush(context.st->msgServiceBg()); // ?
-		p.drawRect(-5 * twidth, 0, twidth * 12, font->height);
-		p.setPen(context.st->msgServiceFg());
-		p.drawText(pos - QPoint(0, font->descent), tag);
-		p.restore();
+	if (const auto tag = _content->cornerTag(context); !tag.isNull()) {
+		const auto width = tag.width() / tag.devicePixelRatio();
+		p.drawImage(_innerSize.width() - width, 0, tag);
 	}
 
 	p.translate(0, -st::msgServiceGiftBoxTopSkip);
@@ -203,16 +321,32 @@ void ServiceBox::draw(Painter &p, const PaintContext &context) const {
 
 TextState ServiceBox::textState(QPoint point, StateRequest request) const {
 	auto result = TextState(_parent);
+	point.setY(point.y() - st::msgServiceGiftBoxTopSkip);
 	const auto content = contentRect();
 	const auto lookupSubtitleLink = [&] {
-		auto top = st::msgServiceGiftBoxTopSkip
-			+ content.top()
-			+ content.height();
+		auto top = content.top() + content.height();
 		const auto &padding = st::msgServiceGiftBoxTitlePadding;
 		top += padding.top();
 		if (!_title.isEmpty()) {
 			top += _title.countHeight(_maxWidth) + padding.bottom();
 		}
+		if (!_author.isEmpty()) {
+			const auto use = std::min(_maxWidth, _author.maxWidth())
+				+ st::giftBoxReleasedByMargin.left()
+				+ st::giftBoxReleasedByMargin.right();
+			const auto left = st::msgPadding.left() + (_maxWidth - use) / 2;
+			const auto height = st::giftBoxReleasedByMargin.top()
+				+ st::defaultTextStyle.font->height
+				+ st::giftBoxReleasedByMargin.bottom();
+			if (point.x() >= left
+				&& point.y() >= top
+				&& point.x() < left + use
+				&& point.y() < top + height) {
+				result.link = _content->authorLink();
+			}
+			top += height + st::msgServiceGiftBoxTitlePadding.bottom();
+		}
+
 		auto subtitleRequest = request.forText();
 		subtitleRequest.align = style::al_top;
 		const auto state = _subtitle.getState(
@@ -340,7 +474,15 @@ bool ServiceBox::Button::empty() const {
 
 void ServiceBox::Button::drawBg(QPainter &p) const {
 	const auto radius = size.height() / 2.;
-	p.drawRoundedRect(0, 0, size.width(), size.height(), radius, radius);
+	const auto r = Rect(size);
+	p.drawRoundedRect(r, radius, radius);
+	if (stars) {
+		auto clipPath = QPainterPath();
+		clipPath.addRoundedRect(r, radius, radius);
+		p.setClipPath(clipPath);
+		stars->paint(p);
+		p.setClipping(false);
+	}
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_service_box.h b/Telegram/SourceFiles/history/view/media/history_view_service_box.h
index 2a52e7336b720a..235ed2a4ca587e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_service_box.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_service_box.h
@@ -13,6 +13,11 @@ namespace Ui {
 class RippleAnimation;
 } // namespace Ui
 
+namespace Ui::Premium {
+class ColoredMiniStars;
+enum class MiniStarsType;
+} // namespace Ui::Premium
+
 namespace HistoryView {
 
 class ServiceBoxContent {
@@ -22,13 +27,26 @@ class ServiceBoxContent {
 	[[nodiscard]] virtual int width();
 	[[nodiscard]] virtual int top() = 0;
 	[[nodiscard]] virtual QSize size() = 0;
-	[[nodiscard]] virtual QString title() = 0;
+	[[nodiscard]] virtual TextWithEntities title() = 0;
+	[[nodiscard]] virtual TextWithEntities author() {
+		return {};
+	}
 	[[nodiscard]] virtual TextWithEntities subtitle() = 0;
 	[[nodiscard]] virtual int buttonSkip() {
 		return top();
 	}
 	[[nodiscard]] virtual rpl::producer<QString> button() = 0;
-	[[nodiscard]] virtual QString cornerTagText() {
+
+	// For now only subtitle() changes are observed.
+	[[nodiscard]] virtual rpl::producer<> changes() {
+		return nullptr;
+	}
+
+	[[nodiscard]] virtual auto buttonMinistars()
+	-> std::optional<Ui::Premium::MiniStarsType> {
+		return std::nullopt;
+	}
+	[[nodiscard]] virtual QImage cornerTag(const PaintContext &context) {
 		return {};
 	}
 	virtual void draw(
@@ -36,6 +54,9 @@ class ServiceBoxContent {
 		const PaintContext &context,
 		const QRect &geometry) = 0;
 	[[nodiscard]] virtual ClickHandlerPtr createViewLink() = 0;
+	[[nodiscard]] virtual ClickHandlerPtr authorLink() {
+		return nullptr;
+	}
 
 	[[nodiscard]] virtual bool hideServiceText() = 0;
 
@@ -90,6 +111,8 @@ class ServiceBox final : public Media {
 	[[nodiscard]] QRect buttonRect() const;
 	[[nodiscard]] QRect contentRect() const;
 
+	void applyContentChanges();
+
 	const not_null<Element*> _parent;
 	const std::unique_ptr<ServiceBoxContent> _content;
 	mutable ClickHandlerPtr _contentLink;
@@ -106,15 +129,18 @@ class ServiceBox final : public Media {
 
 		ClickHandlerPtr link;
 		std::unique_ptr<Ui::RippleAnimation> ripple;
+		std::unique_ptr<Ui::Premium::ColoredMiniStars> stars;
+		std::unique_ptr<QColor> lastFg;
 
 		mutable QPoint lastPoint;
 	} _button;
 
 	const int _maxWidth = 0;
 	Ui::Text::String _title;
+	Ui::Text::String _author;
 	Ui::Text::String _subtitle;
-	const QSize _size;
-	const QSize _innerSize;
+	QSize _size;
+	QSize _innerSize;
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/history/view/media/history_view_similar_channels.cpp b/Telegram/SourceFiles/history/view/media/history_view_similar_channels.cpp
index aa14b12c1b5f97..2309d67572147d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_similar_channels.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_similar_channels.cpp
@@ -18,12 +18,12 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_cursor_state.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "info/similar_channels/info_similar_channels_widget.h"
+#include "info/similar_peers/info_similar_peers_widget.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/effects/ripple_animation.h"
@@ -33,11 +33,12 @@ For license and copyright information please follow this link:
 #include "ui/painter.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
+#include "styles/style_polls.h"
 
 namespace HistoryView {
 namespace {
 
-using Channels = Api::ChatParticipants::Channels;
+using Channels = Api::ChatParticipants::Peers;
 
 //void SimilarChannelsController::prepare() {
 //	for (const auto &channel : _channels.list) {
@@ -70,11 +71,11 @@ using Channels = Api::ChatParticipants::Channels;
 						lt_count,
 						upto,
 						lt_link,
-						Ui::Text::Link(
-							Ui::Text::Bold(
+						tr::link(
+							tr::bold(
 								tr::lng_similar_channels_premium_all_link(
 									tr::now))),
-						Ui::Text::RichLangValue),
+						tr::rich),
 					u"similar_channels"_q);
 				return;
 			}
@@ -86,7 +87,7 @@ using Channels = Api::ChatParticipants::Channels;
 			strong->showSection(
 				std::make_shared<Info::Memento>(
 					channel,
-					Info::Section::Type::SimilarChannels));
+					Info::Section::Type::SimilarPeers));
 		}
 	});
 }
@@ -519,7 +520,7 @@ QSize SimilarChannels::countOptimalSize() {
 	_channels.clear();
 	_moreThumbnails = {};
 	const auto api = &channel->session().api();
-	api->chatParticipants().loadSimilarChannels(channel);
+	api->chatParticipants().loadSimilarPeers(channel);
 	const auto premium = channel->session().premium();
 	const auto &similar = api->chatParticipants().similar(channel);
 	_empty = similar.list.empty() ? 1 : 0;
@@ -543,9 +544,14 @@ QSize SimilarChannels::countOptimalSize() {
 		? limit
 		: int(similar.list.size());
 	const auto more = similar.more + int(similar.list.size() - take);
-	auto &&channels = ranges::views::all(similar.list)
+	auto &&peers = ranges::views::all(similar.list)
 		| ranges::views::take(limit);
-	for (const auto &channel : channels) {
+	for (const auto &peer : peers) {
+		const auto channel = peer->asBroadcast();
+		if (!channel) {
+			continue;
+		}
+
 		const auto moreCounter = (_channels.size() + 1 == take) ? more : 0;
 		_channels.push_back({
 			.geometry = QRect(QPoint(x, y), outer.size()),
@@ -566,8 +572,8 @@ QSize SimilarChannels::countOptimalSize() {
 			: channel->openLink();
 
 		const auto counter = moreCounter
-			? moreCounter :
-			channel->membersCount();
+			? moreCounter
+			: channel->membersCount();
 		if (moreCounter || counter > 1) {
 			last.counter = (moreCounter ? u"+"_q : QString())
 				+ Lang::FormatCountToShort(counter).string;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
index 69e8bc0af80b1d..4ef4cc7be12884 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "history/view/media/history_view_sticker.h"
 
+#include "base/options.h"
 #include "boxes/sticker_set_box.h"
 #include "history/history.h"
 #include "history/history_item_components.h"
@@ -15,6 +16,7 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/media/history_view_media_common.h"
 #include "history/view/media/history_view_sticker_player.h"
+#include "lang/lang_keys.h"
 #include "ui/image/image.h"
 #include "ui/chat/chat_style.h"
 #include "ui/effects/path_shift_gradient.h"
@@ -33,6 +35,8 @@ For license and copyright information please follow this link:
 #include "data/data_file_origin.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_menu_icons.h"
 
 namespace HistoryView {
 namespace {
@@ -43,6 +47,11 @@ constexpr auto kPremiumMultiplier = (1 + 0.245 * 2);
 constexpr auto kEmojiMultiplier = 3;
 constexpr auto kMessageEffectMultiplier = 2;
 
+base::options::option<int> OptionStickerSize({
+	.id = "sticker-size",
+	.name = "Sticker size",
+});
+
 [[nodiscard]] QImage CacheDiceImage(
 		const QString &emoji,
 		int index,
@@ -86,7 +95,8 @@ Sticker::Sticker(
 , _data(data)
 , _replacements(replacements)
 , _cachingTag(ChatHelpers::StickerLottieSize::MessageHistory)
-, _skipPremiumEffect(skipPremiumEffect) {
+, _skipPremiumEffect(skipPremiumEffect)
+, _sensitiveBlurred(parent->data()->isMediaSensitive()) {
 	if ((_dataMedia = _data->activeMediaView())) {
 		dataMediaCreated();
 	} else {
@@ -168,11 +178,11 @@ QSize Sticker::countOptimalSize() {
 }
 
 bool Sticker::readyToDrawAnimationFrame() {
-	if (!_lastDiceFrame.isNull()) {
+	if (!_lastFrameCached.isNull()) {
 		return true;
 	}
 	const auto sticker = _data->sticker();
-	if (!sticker) {
+	if (!sticker || _sensitiveBlurred) {
 		return false;
 	}
 
@@ -189,6 +199,13 @@ bool Sticker::readyToDrawAnimationFrame() {
 
 QSize Sticker::Size() {
 	const auto side = std::min(st::maxStickerSize, kMaxSizeFixed);
+	if (OptionStickerSize.value() > 0) [[unlikely]] {
+		const auto scaled = std::clamp(
+			style::ConvertScale(OptionStickerSize.value()),
+			style::ConvertScale(50),
+			side);
+		return { scaled, scaled };
+	}
 	return { side, side };
 }
 
@@ -234,6 +251,43 @@ void Sticker::draw(
 		|| !paintPixmap(p, context, r)) {
 		paintPath(p, context, r);
 	}
+	if (_sensitiveBlurred) {
+		paintSensitiveTag(p, context, r);
+	}
+}
+
+void Sticker::paintSensitiveTag(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &r) {
+	auto text = Ui::Text::String();
+	auto iconSkip = 0;
+	text.setText(
+		st::semiboldTextStyle,
+		tr::lng_sensitive_tag(tr::now));
+	iconSkip = st::mediaMenuIconStealth.width() * 1.4;
+	const auto width = iconSkip + text.maxWidth();
+	const auto inner = QRect(0, 0, width, text.minHeight());
+	const auto outer = style::centerrect(
+		r,
+		inner.marginsAdded(st::paidTagPadding));
+	const auto size = outer.size();
+	const auto real = outer.marginsRemoved(st::paidTagPadding);
+	const auto radius = std::min(size.width(), size.height()) / 2;
+	p.setPen(Qt::NoPen);
+	p.setBrush(context.st->msgServiceBg());
+	p.drawRoundedRect(outer, radius, radius);
+	p.setPen(context.st->msgServiceFg());
+	if (iconSkip) {
+		st::mediaMenuIconStealth.paint(
+			p,
+			real.x(),
+			(outer.y()
+				+ (size.height() - st::mediaMenuIconStealth.height()) / 2),
+			outer.width(),
+			context.st->msgServiceFg()->c);
+	}
+	text.draw(p, real.x() + iconSkip, real.y(), width);
 }
 
 ClickHandlerPtr Sticker::link() {
@@ -248,9 +302,14 @@ DocumentData *Sticker::document() {
 	return _data;
 }
 
+bool Sticker::stoppedOnLastFrame() const {
+	return _stopOnLastFrame && (!_lastFrameCached.isNull() || atTheEnd());
+}
+
 void Sticker::stickerClearLoopPlayed() {
-	_oncePlayed = false;
-	_premiumEffectPlayed = false;
+	if (!_playingOnce) {
+		_oncePlayed = false;
+	}
 	_premiumEffectSkipped = false;
 }
 
@@ -260,13 +319,14 @@ void Sticker::paintAnimationFrame(
 		const QRect &r) {
 	const auto colored = (customEmojiPart() && _data->emojiUsesTextColor())
 		? ComputeEmojiTextColor(context)
-		: (context.selected() && !_nextLastDiceFrame)
+		: (context.selected() && !_nextLastFrame)
 		? context.st->msgStickerOverlay()->c
 		: QColor(0, 0, 0, 0);
-	const auto powerSavingFlag = (emojiSticker() || _diceIndex >= 0)
+	const auto powerSavingFlag = emojiSticker()
 		? PowerSaving::kEmojiChat
 		: PowerSaving::kStickersChat;
-	const auto paused = context.paused || On(powerSavingFlag);
+	const auto paused = context.paused
+		|| (_diceIndex < 0 && On(powerSavingFlag));
 	const auto frame = _player
 		? _player->frame(
 			_size,
@@ -275,14 +335,16 @@ void Sticker::paintAnimationFrame(
 			context.now,
 			paused)
 		: StickerPlayer::FrameInfo();
-	if (_nextLastDiceFrame) {
-		_nextLastDiceFrame = false;
-		_lastDiceFrame = CacheDiceImage(_diceEmoji, _diceIndex, frame.image);
+	if (_nextLastFrame) {
+		_nextLastFrame = false;
+		_lastFrameCached = (_diceIndex > 0)
+			? CacheDiceImage(_diceEmoji, _diceIndex, frame.image)
+			: frame.image;
 	}
-	const auto &image = _lastDiceFrame.isNull()
+	const auto &image = _lastFrameCached.isNull()
 		? frame.image
-		: _lastDiceFrame;
-	const auto prepared = (!_lastDiceFrame.isNull() && context.selected())
+		: _lastFrameCached;
+	const auto prepared = (!_lastFrameCached.isNull() && context.selected())
 		? Images::Colored(
 			base::duplicate(image),
 			context.st->msgStickerOverlay()->c)
@@ -295,25 +357,25 @@ void Sticker::paintAnimationFrame(
 				r.y() + (r.height() - size.height()) / 2),
 			size),
 		prepared);
-	if (!_lastDiceFrame.isNull()) {
+	if (!_lastFrameCached.isNull()) {
 		return;
 	}
 
 	const auto count = _player->framesCount();
 	_frameIndex = frame.index;
 	_framesCount = count;
-	_nextLastDiceFrame = !paused
-		&& (_diceIndex > 0)
+	_nextLastFrame = !paused
+		&& _stopOnLastFrame
 		&& (_frameIndex + 2 == count);
-	const auto playOnce = (_diceIndex > 0)
+	const auto playOnce = _playingOnce
 		? true
 		: (_diceIndex == 0)
 		? false
 		: ((!customEmojiPart() && emojiSticker())
 			|| !Core::App().settings().loopAnimatedStickers());
-	const auto lastDiceFrame = (_diceIndex > 0) && atTheEnd();
+	const auto lastFrame = _stopOnLastFrame && atTheEnd();
 	const auto switchToNext = !playOnce
-		|| (!lastDiceFrame && (_frameIndex != 0 || !_oncePlayed));
+		|| (!lastFrame && (_frameIndex != 0 || !_oncePlayed));
 	if (!paused
 		&& switchToNext
 		&& _player->markFrameShown()
@@ -333,10 +395,10 @@ bool Sticker::paintPixmap(
 	if (pixmap.isNull()) {
 		return false;
 	}
-	const auto position = QPoint(
-		r.x() + (r.width() - _size.width()) / 2,
-		r.y() + (r.height() - _size.height()) / 2);
 	const auto size = pixmap.size() / pixmap.devicePixelRatio();
+	const auto position = QPoint(
+		r.x() + (r.width() - size.width()) / 2,
+		r.y() + (r.height() - size.height()) / 2);
 	const auto mirror = mirrorHorizontal();
 	if (mirror) {
 		p.save();
@@ -387,26 +449,39 @@ void Sticker::paintPath(
 
 QPixmap Sticker::paintedPixmap(const PaintContext &context) const {
 	auto helper = std::optional<style::owned_color>();
+	const auto sticker = _data->sticker();
+	const auto ratio = style::DevicePixelRatio();
+	const auto adjust = [&](int side) {
+		return (((side * ratio) / 8) * 8) / ratio;
+	};
+	const auto useSize = (sticker && sticker->type == StickerType::Tgs)
+		? QSize(adjust(_size.width()), adjust(_size.height()))
+		: _size;
 	const auto colored = (customEmojiPart() && _data->emojiUsesTextColor())
 		? &helper.emplace(ComputeEmojiTextColor(context)).color()
 		: context.selected()
 		? &context.st->msgStickerOverlay()
 		: nullptr;
-	const auto good = _dataMedia->goodThumbnail();
-	if (const auto image = _dataMedia->getStickerLarge()) {
-		return image->pix(_size, { .colored = colored });
+	const auto good = _sensitiveBlurred
+		? nullptr
+		: _dataMedia->goodThumbnail();
+	const auto image = _sensitiveBlurred
+		? nullptr
+		: _dataMedia->getStickerLarge();
+	if (image) {
+		return image->pix(useSize, { .colored = colored });
 	//
 	// Inline thumbnails can't have alpha channel.
 	//
 	//} else if (const auto blurred = _data->thumbnailInline()) {
 	//	return blurred->pix(
-	//		_size,
+	//		useSize,
 	//		{ .colored = colored, .options = Images::Option::Blur });
 	} else if (good) {
-		return good->pix(_size, { .colored = colored });
+		return good->pix(useSize, { .colored = colored });
 	} else if (const auto thumbnail = _dataMedia->thumbnail()) {
 		return thumbnail->pix(
-			_size,
+			useSize,
 			{ .colored = colored, .options = Images::Option::Blur });
 	}
 	return QPixmap();
@@ -434,7 +509,9 @@ void Sticker::refreshLink() {
 		return;
 	}
 	const auto sticker = _data->sticker();
-	if (emojiSticker()) {
+	if (_sensitiveBlurred) {
+		_link = MakeSensitiveMediaLink(nullptr, _parent->data());
+	} else if (emojiSticker()) {
 		const auto weak = base::make_weak(this);
 		_link = std::make_shared<LambdaClickHandler>([weak] {
 			if (const auto that = weak.get()) {
@@ -510,6 +587,17 @@ void Sticker::dataMediaCreated() const {
 void Sticker::setDiceIndex(const QString &emoji, int index) {
 	_diceEmoji = emoji;
 	_diceIndex = index;
+	_playingOnce = (index > 0);
+	_stopOnLastFrame = (index > 0);
+}
+
+void Sticker::setPlayingOnce(bool once) {
+	_playingOnce = once;
+}
+
+void Sticker::setStopOnLastFrame(bool stop) {
+	_stopOnLastFrame = stop;
+	_playingOnce = true;
 }
 
 void Sticker::setCustomCachingTag(ChatHelpers::StickerLottieSize tag) {
@@ -582,8 +670,8 @@ void Sticker::unloadPlayer() {
 	if (!_player) {
 		return;
 	}
-	if (_diceIndex > 0 && _lastDiceFrame.isNull()) {
-		_nextLastDiceFrame = false;
+	if (_stopOnLastFrame && _lastFrameCached.isNull()) {
+		_nextLastFrame = false;
 		_oncePlayed = false;
 	}
 	_player = nullptr;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.h b/Telegram/SourceFiles/history/view/media/history_view_sticker.h
index 91a69f7e2d1bea..536e12dd4c0c71 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.h
@@ -51,6 +51,7 @@ class Sticker final
 	ClickHandlerPtr link() override;
 
 	[[nodiscard]] bool ready() const;
+	[[nodiscard]] bool stoppedOnLastFrame() const;
 	DocumentData *document() override;
 	void stickerClearLoopPlayed() override;
 	std::unique_ptr<StickerPlayer> stickerTakePlayer(
@@ -66,6 +67,8 @@ class Sticker final
 	}
 
 	void setDiceIndex(const QString &emoji, int index);
+	void setPlayingOnce(bool once);
+	void setStopOnLastFrame(bool stop);
 	void setCustomCachingTag(ChatHelpers::StickerLottieSize tag);
 	void setCustomEmojiPart();
 	void setEmojiSticker();
@@ -109,6 +112,10 @@ class Sticker final
 	void paintPath(Painter &p, const PaintContext &context, const QRect &r);
 	[[nodiscard]] QPixmap paintedPixmap(const PaintContext &context) const;
 	[[nodiscard]] bool mirrorHorizontal() const;
+	void paintSensitiveTag(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &r);
 
 	void ensureDataMediaCreated() const;
 	void dataMediaCreated() const;
@@ -127,7 +134,7 @@ class Sticker final
 	mutable std::shared_ptr<Data::DocumentMedia> _dataMedia;
 	ClickHandlerPtr _link;
 	QSize _size;
-	QImage _lastDiceFrame;
+	QImage _lastFrameCached;
 	QString _diceEmoji;
 	int _diceIndex = -1;
 	mutable int _frameIndex = -1;
@@ -136,11 +143,14 @@ class Sticker final
 	mutable bool _oncePlayed : 1 = false;
 	mutable bool _premiumEffectPlayed : 1 = false;
 	mutable bool _premiumEffectSkipped : 1 = false;
-	mutable bool _nextLastDiceFrame : 1 = false;
+	mutable bool _nextLastFrame : 1 = false;
 	bool _skipPremiumEffect : 1 = false;
 	bool _customEmojiPart : 1 = false;
 	bool _emojiSticker : 1 = false;
 	bool _webpagePart : 1 = false;
+	bool _playingOnce : 1 = false;
+	bool _stopOnLastFrame : 1 = false;
+	bool _sensitiveBlurred : 1 = false;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker_player.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker_player.cpp
index 64f6a883b0fc02..947681e16a971e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker_player.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker_player.cpp
@@ -21,8 +21,12 @@ LottiePlayer::LottiePlayer(std::unique_ptr<Lottie::SinglePlayer> lottie)
 }
 
 void LottiePlayer::setRepaintCallback(Fn<void()> callback) {
+	if (!callback) {
+		_repaintLifetime.destroy();
+		return;
+	}
 	_repaintLifetime = _lottie->updates(
-	) | rpl::start_with_next([=](Lottie::Update update) {
+	) | rpl::on_next([=](Lottie::Update update) {
 		v::match(update.data, [&](const Lottie::Information &) {
 			callback();
 			//markFramesTillExternal();
@@ -82,7 +86,9 @@ void WebmPlayer::clipCallback(ClipNotification notification) {
 	case ClipNotification::Repaint: break;
 	}
 
-	_repaintCallback();
+	if (const auto onstack = _repaintCallback) {
+		onstack();
+	}
 }
 
 void WebmPlayer::setRepaintCallback(Fn<void()> callback) {
@@ -133,7 +139,9 @@ StaticStickerPlayer::StaticStickerPlayer(
 }
 
 void StaticStickerPlayer::setRepaintCallback(Fn<void()> callback) {
-	callback();
+	if (callback) {
+		callback();
+	}
 }
 
 bool StaticStickerPlayer::ready() {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
index a2b2d65ba0e0e1..534a74d588189b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_story_mention.cpp
@@ -35,7 +35,7 @@ For license and copyright information please follow this link:
 #include "mainwidget.h"
 #include "apiwrap.h"
 #include "api/api_peer_photo.h"
-#include "settings/settings_information.h" // UpdatePhotoLocally
+#include "settings/sections/settings_information.h" // UpdatePhotoLocally
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -68,8 +68,8 @@ QSize StoryMention::size() {
 	return { st::msgServicePhotoWidth, st::msgServicePhotoWidth };
 }
 
-QString StoryMention::title() {
-	return QString();
+TextWithEntities StoryMention::title() {
+	return {};
 }
 
 int StoryMention::buttonSkip() {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_story_mention.h b/Telegram/SourceFiles/history/view/media/history_view_story_mention.h
index 60182346022543..18d42847775d0a 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_story_mention.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_story_mention.h
@@ -30,7 +30,7 @@ class StoryMention final
 
 	int top() override;
 	QSize size() override;
-	QString title() override;
+	TextWithEntities title() override;
 	TextWithEntities subtitle() override;
 	int buttonSkip() override;
 	rpl::producer<QString> button() override;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_suggest_decision.cpp b/Telegram/SourceFiles/history/view/media/history_view_suggest_decision.cpp
new file mode 100644
index 00000000000000..f0c565ec9a7bad
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_suggest_decision.cpp
@@ -0,0 +1,370 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/media/history_view_suggest_decision.h"
+
+#include "base/unixtime.h"
+#include "data/data_channel.h"
+#include "data/data_session.h"
+#include "history/view/media/history_view_media_generic.h"
+#include "history/view/media/history_view_unique_gift.h"
+#include "history/view/history_view_element.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
+#include "lang/lang_keys.h"
+#include "ui/chat/chat_style.h"
+#include "ui/text/text_utilities.h"
+#include "ui/text/format_values.h"
+#include "styles/style_chat.h"
+#include "styles/style_credits.h"
+
+namespace HistoryView {
+namespace {
+
+constexpr auto kFadedOpacity = 0.85;
+
+enum EmojiType {
+	kAgreement,
+	kCalendar,
+	kMoney,
+	kHourglass,
+	kReload,
+	kDecline,
+	kDiscard,
+	kWarning,
+};
+
+[[nodiscard]] const char *Raw(EmojiType type) {
+	switch (type) {
+	case EmojiType::kAgreement: return "\xf0\x9f\xa4\x9d";
+	case EmojiType::kCalendar: return "\xf0\x9f\x93\x86";
+	case EmojiType::kMoney: return "\xf0\x9f\x92\xb0";
+	case EmojiType::kHourglass: return "\xe2\x8c\x9b\xef\xb8\x8f";
+	case EmojiType::kReload: return "\xf0\x9f\x94\x84";
+	case EmojiType::kDecline: return "\xe2\x9d\x8c";
+	case EmojiType::kDiscard: return "\xf0\x9f\x9a\xab";
+	case EmojiType::kWarning: return "\xe2\x9a\xa0\xef\xb8\x8f";
+	}
+	Unexpected("EmojiType in Raw.");
+}
+
+[[nodiscard]] QString Emoji(EmojiType type) {
+	return QString::fromUtf8(Raw(type));
+}
+
+struct Changes {
+	bool date = false;
+	bool price = false;
+	bool message = true;
+};
+[[nodiscard]] std::optional<Changes> ResolveChanges(
+		not_null<HistoryItem*> changed,
+		HistoryItem *original) {
+	const auto wasSuggest = original
+		? original->Get<HistoryMessageSuggestion>()
+		: nullptr;
+	const auto nowSuggest = changed->Get<HistoryMessageSuggestion>();
+	if (!wasSuggest || !nowSuggest) {
+		return {};
+	}
+	auto result = Changes();
+	if (wasSuggest->date != nowSuggest->date) {
+		result.date = true;
+	}
+	if (wasSuggest->price != nowSuggest->price) {
+		result.price = true;
+	}
+	const auto wasText = original->originalText();
+	const auto nowText = changed->originalText();
+	const auto mediaSame = [&] {
+		const auto wasMedia = original->media();
+		const auto nowMedia = changed->media();
+		if (!wasMedia && !nowMedia) {
+			return true;
+		} else if (!wasMedia
+			|| !nowMedia
+			|| !wasMedia->allowsEditCaption()
+			|| !nowMedia->allowsEditCaption()) {
+			return false;
+		}
+		// We treat as "same" only same photo or same file.
+		return (wasMedia->photo() == nowMedia->photo())
+			&& (wasMedia->document() == nowMedia->document());
+	};
+	if (!result.price && !result.date) {
+		result.message = true;
+	} else if (wasText == nowText && mediaSame()) {
+		result.message = false;
+	}
+	return result;
+}
+
+} // namespace
+
+auto GenerateSuggestDecisionMedia(
+	not_null<Element*> parent,
+	not_null<const HistoryServiceSuggestDecision*> decision)
+	-> Fn<void(
+		not_null<MediaGeneric*>,
+		Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](
+			not_null<MediaGeneric*> media,
+			Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
+		const auto peer = parent->history()->peer;
+		const auto broadcast = peer->monoforumBroadcast();
+		if (!broadcast) {
+			return;
+		}
+
+		const auto sublistPeerId = parent->data()->sublistPeerId();
+		const auto sublistPeer = peer->owner().peer(sublistPeerId);
+
+		auto pushText = [&](
+				TextWithEntities text,
+				QMargins margins = {},
+				style::align align = style::al_left,
+				const base::flat_map<uint16, ClickHandlerPtr> &links = {}) {
+			push(std::make_unique<MediaGenericTextPart>(
+				std::move(text),
+				margins,
+				st::defaultTextStyle,
+				links,
+				Ui::Text::MarkedContext(),
+				align));
+		};
+
+		if (decision->balanceTooLow) {
+			pushText(
+				TextWithEntities(
+				).append(Emoji(kWarning)).append(' ').append(
+					(sublistPeer->isSelf()
+						? (decision->price.ton()
+							? tr::lng_suggest_action_your_not_enough_ton
+							: tr::lng_suggest_action_your_not_enough_stars)
+						: (decision->price.ton()
+							? tr::lng_suggest_action_his_not_enough_ton
+							: tr::lng_suggest_action_his_not_enough_stars))(
+							tr::now,
+							tr::rich)),
+				st::chatSuggestInfoFullMargin,
+				style::al_top);
+		} else if (decision->rejected) {
+			const auto withComment = !decision->rejectComment.isEmpty();
+			pushText(
+				TextWithEntities(
+				).append(Emoji(kDecline)).append(' ').append(
+					(withComment
+						? tr::lng_suggest_action_declined_reason
+						: tr::lng_suggest_action_declined)(
+							tr::now,
+							lt_from,
+							tr::bold(broadcast->name()),
+							tr::marked)),
+				(withComment
+					? st::chatSuggestInfoTitleMargin
+					: st::chatSuggestInfoFullMargin));
+			if (withComment) {
+				const auto fadedFg = [](const PaintContext &context) {
+					auto result = context.st->msgServiceFg()->c;
+					result.setAlphaF(result.alphaF() * kFadedOpacity);
+					return result;
+				};
+				push(std::make_unique<TextPartColored>(
+					TextWithEntities().append('"').append(
+						decision->rejectComment
+					).append('"'),
+					st::chatSuggestInfoLastMargin,
+					fadedFg));
+			}
+		} else {
+			const auto price = decision->price;
+			pushText(
+				TextWithEntities(
+				).append(Emoji(kAgreement)).append(' ').append(
+					tr::bold(tr::lng_suggest_action_agreement(tr::now))
+				),
+				st::chatSuggestInfoTitleMargin,
+				style::al_top);
+			const auto date = base::unixtime::parse(decision->date);
+			pushText(
+				TextWithEntities(
+				).append(Emoji(kCalendar)).append(' ').append(
+					tr::lng_suggest_action_agree_date(
+						tr::now,
+						lt_channel,
+						tr::bold(broadcast->name()),
+						lt_date,
+						tr::bold(tr::lng_mediaview_date_time(
+							tr::now,
+							lt_date,
+							QLocale().toString(
+								date.date(),
+								QLocale::ShortFormat),
+							lt_time,
+							QLocale().toString(
+								date.time(),
+								QLocale::ShortFormat))),
+						tr::marked)),
+				(price
+					? st::chatSuggestInfoMiddleMargin
+					: st::chatSuggestInfoLastMargin));
+			if (price) {
+				pushText(
+					TextWithEntities(
+					).append(Emoji(kMoney)).append(' ').append(
+						(sublistPeer->isSelf()
+							? (price.stars()
+								? tr::lng_suggest_action_your_charged_stars
+								: tr::lng_suggest_action_your_charged_ton)(
+									tr::now,
+									lt_count_decimal,
+									price.value(),
+									tr::rich)
+							: (price.stars()
+								? tr::lng_suggest_action_his_charged_stars
+								: tr::lng_suggest_action_his_charged_ton)(
+									tr::now,
+									lt_count_decimal,
+									price.value(),
+									lt_from,
+									tr::bold(sublistPeer->shortName()),
+									tr::rich))),
+					st::chatSuggestInfoMiddleMargin);
+
+				pushText(
+					TextWithEntities(
+					).append(Emoji(kHourglass)).append(' ').append(
+						(price.ton()
+							? tr::lng_suggest_action_agree_receive_ton
+							: tr::lng_suggest_action_agree_receive_stars)(
+							tr::now,
+							lt_channel,
+							tr::bold(broadcast->name()),
+							tr::marked)),
+					st::chatSuggestInfoMiddleMargin);
+
+				pushText(
+					TextWithEntities(
+					).append(Emoji(kReload)).append(' ').append(
+						(price.ton()
+							? tr::lng_suggest_action_agree_removed_ton
+							: tr::lng_suggest_action_agree_removed_stars)(
+							tr::now,
+							lt_channel,
+							tr::bold(broadcast->name()),
+							tr::marked)),
+					st::chatSuggestInfoLastMargin);
+			}
+		}
+	};
+}
+
+auto GenerateSuggestRequestMedia(
+	not_null<Element*> parent,
+	not_null<const HistoryMessageSuggestion*> suggest)
+	-> Fn<void(
+		not_null<MediaGeneric*>,
+		Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](
+			not_null<MediaGeneric*> media,
+			Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
+		const auto normalFg = [](const PaintContext &context) {
+			return context.st->msgServiceFg()->c;
+		};
+		const auto fadedFg = [](const PaintContext &context) {
+			auto result = context.st->msgServiceFg()->c;
+			result.setAlphaF(result.alphaF() * kFadedOpacity);
+			return result;
+		};
+		const auto item = parent->data();
+		const auto replyData = item->Get<HistoryMessageReply>();
+		const auto original = replyData
+			? replyData->resolvedMessage.get()
+			: nullptr;
+		const auto changes = ResolveChanges(item, original);
+		const auto from = item->from();
+
+		auto pushText = [&](
+				TextWithEntities text,
+				QMargins margins = {},
+				style::align align = style::al_left,
+				const base::flat_map<uint16, ClickHandlerPtr> &links = {}) {
+			push(std::make_unique<MediaGenericTextPart>(
+				std::move(text),
+				margins,
+				st::defaultTextStyle,
+				links,
+				Ui::Text::MarkedContext(),
+				align));
+		};
+
+		pushText(
+			((!changes && from->isSelf())
+				? tr::lng_suggest_action_your(
+					tr::now,
+					tr::marked)
+				: (!changes
+					? tr::lng_suggest_action_his
+					: changes->message
+					? tr::lng_suggest_change_content
+					: (changes->date && changes->price)
+					? tr::lng_suggest_change_price_time
+					: changes->price
+					? tr::lng_suggest_change_price
+					: tr::lng_suggest_change_time)(
+						tr::now,
+						lt_from,
+						tr::bold(from->shortName()),
+						tr::marked)),
+			st::chatSuggestInfoTitleMargin,
+			style::al_top);
+
+		auto entries = std::vector<AttributeTable::Entry>();
+		entries.push_back({
+			((changes && changes->price)
+				? tr::lng_suggest_change_price_label
+				: tr::lng_suggest_action_price_label)(tr::now),
+			tr::bold(!suggest->price
+				? tr::lng_suggest_action_price_free(tr::now)
+				: suggest->price.stars()
+				? tr::lng_suggest_stars_amount(
+					tr::now,
+					lt_count_decimal,
+					suggest->price.value())
+				: tr::lng_suggest_ton_amount(
+					tr::now,
+					lt_count_decimal,
+					suggest->price.value())),
+		});
+		entries.push_back({
+			((changes && changes->date)
+				? tr::lng_suggest_change_time_label
+				: tr::lng_suggest_action_time_label)(tr::now),
+			tr::bold(suggest->date
+				? Ui::FormatDateTime(base::unixtime::parse(suggest->date))
+				: tr::lng_suggest_action_time_any(tr::now)),
+		});
+		push(std::make_unique<AttributeTable>(
+			std::move(entries),
+			((changes && changes->message)
+				? st::chatSuggestTableMiddleMargin
+				: st::chatSuggestTableLastMargin),
+			fadedFg,
+			normalFg));
+		if (changes && changes->message) {
+			push(std::make_unique<TextPartColored>(
+				tr::lng_suggest_change_text_label(
+					tr::now,
+					tr::marked),
+				st::chatSuggestInfoLastMargin,
+				fadedFg));
+		}
+	};
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_suggest_decision.h b/Telegram/SourceFiles/history/view/media/history_view_suggest_decision.h
new file mode 100644
index 00000000000000..6bbf5fef6eaec3
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_suggest_decision.h
@@ -0,0 +1,33 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+struct HistoryMessageSuggestion;
+struct HistoryServiceSuggestDecision;
+
+namespace HistoryView {
+
+class Element;
+class MediaGeneric;
+class MediaGenericPart;
+
+auto GenerateSuggestDecisionMedia(
+	not_null<Element*> parent,
+	not_null<const HistoryServiceSuggestDecision*> decision
+) -> Fn<void(
+	not_null<MediaGeneric*>,
+	Fn<void(std::unique_ptr<MediaGenericPart>)>)>;
+
+auto GenerateSuggestRequestMedia(
+	not_null<Element*> parent,
+	not_null<const HistoryMessageSuggestion*> suggest
+) -> Fn<void(
+	not_null<MediaGeneric*>,
+	Fn<void(std::unique_ptr<MediaGenericPart>)>)>;
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index 66db7403677a39..12df63ef0233c3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -8,12 +8,15 @@ For license and copyright information please follow this link:
 #include "history/view/media/history_view_theme_document.h"
 
 #include "apiwrap.h"
+#include "base/unixtime.h"
 #include "boxes/background_preview_box.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/history_item_components.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/media/history_view_sticker_player_abstract.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_changes.h"
 #include "data/data_document.h"
 #include "data/data_session.h"
@@ -27,16 +30,19 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/cached_round_corners.h"
 #include "ui/painter.h"
+#include "ui/top_background_gradient.h"
 #include "ui/ui_utility.h"
 #include "window/section_widget.h"
 #include "window/window_session_controller.h"
 #include "window/themes/window_theme.h"
 #include "styles/style_chat.h"
+#include "styles/style_credits.h"
 
 namespace HistoryView {
 namespace {
@@ -91,7 +97,8 @@ ThemeDocument::ThemeDocument(
 : File(parent, parent->data())
 , _data(document)
 , _serviceWidth(serviceWidth) {
-	Expects(params.has_value() || _data->hasThumbnail() || _data->isTheme());
+	Expects(params.has_value()
+		|| (_data && (_data->hasThumbnail() || _data->isTheme())));
 
 	if (params) {
 		_background = params->backgroundColors();
@@ -476,7 +483,7 @@ ThemeDocumentBox::ThemeDocumentBox(
 	Window::WallPaperResolved(
 		&_parent->history()->owner(),
 		&paper
-	) | rpl::start_with_next([=](const Data::WallPaper *paper) {
+	) | rpl::on_next([=](const Data::WallPaper *paper) {
 		_parent->repaint();
 		if (!paper) {
 			_preview.reset();
@@ -508,8 +515,8 @@ QSize ThemeDocumentBox::size() {
 		: QSize(st::msgServicePhotoWidth, st::msgServicePhotoWidth);
 }
 
-QString ThemeDocumentBox::title() {
-	return QString();
+TextWithEntities ThemeDocumentBox::title() {
+	return {};
 }
 
 TextWithEntities ThemeDocumentBox::subtitle() {
@@ -548,7 +555,7 @@ ClickHandlerPtr ThemeDocumentBox::createViewLink() {
 					const auto api = &controller->session().api();
 					api->request(MTPmessages_SetChatWallPaper(
 						MTP_flags(MTPmessages_SetChatWallPaper::Flag::f_revert),
-						view->data()->history()->peer->input,
+						view->data()->history()->peer->input(),
 						MTPInputWallPaper(),
 						MTPWallPaperSettings(),
 						MTPint()
@@ -604,4 +611,283 @@ void ThemeDocumentBox::unloadHeavyPart() {
 	}
 }
 
+GiftServiceBox::GiftServiceBox(
+	not_null<Element*> parent,
+	not_null<Data::MediaGiftBox*> gift)
+: _parent(parent)
+, _data(*gift->gift()) {
+}
+
+GiftServiceBox::~GiftServiceBox() = default;
+
+int GiftServiceBox::top() {
+	return st::msgServiceStarGiftStickerTop;
+}
+
+int GiftServiceBox::width() {
+	return st::msgServiceStarGiftBoxWidth;
+}
+
+QSize GiftServiceBox::size() {
+	return QSize(
+		st::msgServiceGiftThemeStickerSize,
+		st::msgServiceGiftThemeStickerSize).grownBy(
+			st::msgServiceGiftThemeStickerPadding);
+}
+
+TextWithEntities GiftServiceBox::title() {
+	return {};
+}
+
+TextWithEntities GiftServiceBox::subtitle() {
+	const auto giftName = tr::bold(Data::UniqueGiftName(*_data.unique));
+	if (_data.type == Data::GiftType::GiftOffer) {
+		const auto item = _parent->data();
+		if (const auto suggestion = item->Get<HistoryMessageSuggestion>()) {
+			const auto amount = suggestion->price;
+			const auto cost = tr::bold(PrepareCreditsAmountText(amount));
+			auto text = tr::marked();
+			if (_parent->data()->out()) {
+				text.append(tr::lng_action_gift_offer_you(
+					tr::now,
+					lt_cost,
+					cost,
+					lt_name,
+					giftName,
+					tr::marked));
+			} else {
+				text.append(tr::lng_action_gift_offer_incoming(
+					tr::now,
+					lt_amount,
+					cost,
+					tr::marked));
+			}
+			text.append(u"\n\n"_q);
+
+			const auto ends = suggestion->date;
+			const auto now = base::unixtime::now();
+			const auto expired = (now >= ends);
+
+			checkKeyboardRemoval(suggestion, expired);
+
+			if (suggestion->accepted) {
+				text.append(
+					tr::lng_action_gift_offer_state_accepted(tr::now));
+			} else if (suggestion->rejected) {
+				text.append(
+					tr::lng_action_gift_offer_state_rejected(tr::now));
+			} else {
+				if (expired) {
+					text.append(
+						tr::lng_action_gift_offer_state_expired(tr::now));
+				} else {
+					auto time = QString();
+					const auto left = (ends - now) + 59;
+					if (left >= 3600) {
+						const auto hours = left / 3600;
+						const auto minutes = (left % 3600) / 60;
+						time = minutes
+							? tr::lng_action_gift_offer_time_medium(
+								tr::now,
+								lt_hours,
+								QString::number(hours),
+								lt_minutes,
+								QString::number(minutes))
+							: tr::lng_action_gift_offer_time_large(
+								tr::now,
+								lt_hours,
+								QString::number(hours));
+					} else {
+						const auto minutes = left / 60;
+						time = tr::lng_action_gift_offer_time_small(
+							tr::now,
+							lt_minutes,
+							QString::number(minutes));
+					}
+					text.append(tr::lng_action_gift_offer_state_expires(
+						tr::now,
+						lt_time,
+						tr::bold(time),
+						tr::marked));
+
+					const auto tillNext = left % 60;
+					_changeTimer.setCallback([=] { _changes.fire({}); });
+					_changeTimer.callOnce((tillNext ? tillNext : 60)
+						* crl::time(1000));
+				}
+			}
+			return text;
+		}
+	} else if (_parent->data()->out()) {
+		return tr::lng_action_you_gift_theme_changed(
+			tr::now,
+			lt_name,
+			giftName,
+			tr::marked);
+	} else {
+		return tr::lng_action_gift_theme_changed(
+			tr::now,
+			lt_from,
+			tr::bold(_parent->data()->from()->shortName()),
+			lt_name,
+			giftName,
+			tr::marked);
+	}
+	return _parent->data()->originalText();
+}
+
+void GiftServiceBox::checkKeyboardRemoval(
+		not_null<const HistoryMessageSuggestion*> suggestion,
+		bool expired) {
+	Expects(_data.type == Data::GiftType::GiftOffer);
+
+	const auto item = _parent->data();
+	if (const auto markup = item->Get<HistoryMessageReplyMarkup>()) {
+		if (!markup->data.isTrivial()) {
+			if (suggestion->accepted || suggestion->rejected || expired) {
+				crl::on_main(this, [=] {
+					clearKeyboard();
+				});
+			}
+		}
+	}
+}
+
+void GiftServiceBox::clearKeyboard() {
+	Expects(_data.type == Data::GiftType::GiftOffer);
+
+	const auto item = _parent->data();
+	if (const auto markup = item->Get<HistoryMessageReplyMarkup>()) {
+		markup->updateSuggestControls(SuggestionActions::None);
+		item->history()->owner().requestItemResize(item);
+	}
+}
+
+rpl::producer<> GiftServiceBox::changes() {
+	if (_data.type != Data::GiftType::GiftOffer) {
+		return nullptr;
+	}
+	return _changes.events();
+}
+
+rpl::producer<QString> GiftServiceBox::button() {
+	if (_data.type == Data::GiftType::GiftOffer) {
+		return nullptr;
+	}
+	return tr::lng_sticker_premium_view();
+}
+
+ClickHandlerPtr GiftServiceBox::createViewLink() {
+	return std::make_shared<UrlClickHandler>(
+		u"tg://nft?slug="_q + _data.unique->slug);
+}
+
+int GiftServiceBox::buttonSkip() {
+	return st::msgServiceGiftBoxButtonMargins.top();
+}
+
+void GiftServiceBox::cacheUniqueBackground(int width, int height) {
+	if (!_patternEmoji) {
+		const auto session = &_parent->data()->history()->session();
+		_patternEmoji = session->data().customEmojiManager().create(
+			_data.unique->pattern.document,
+			[=] { _parent->repaint(); },
+			Data::CustomEmojiSizeTag::Large);
+		[[maybe_unused]] const auto preload = _patternEmoji->ready();
+	}
+	const auto inner = QRect(0, 0, width, height);
+	const auto ratio = style::DevicePixelRatio();
+	if (_backgroundCache.size() != inner.size() * ratio) {
+		_backgroundCache = QImage(
+			inner.size() * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		_backgroundCache.fill(Qt::transparent);
+		_backgroundCache.setDevicePixelRatio(ratio);
+
+		const auto radius = st::giftBoxGiftRadius;
+		auto p = QPainter(&_backgroundCache);
+		auto hq = PainterHighQualityEnabler(p);
+		auto gradient = QRadialGradient(inner.center(), inner.width() / 2);
+		gradient.setStops({
+			{ 0., _data.unique->backdrop.centerColor },
+			{ 1., _data.unique->backdrop.edgeColor },
+		});
+		p.setBrush(gradient);
+		p.setPen(Qt::NoPen);
+		p.drawRoundedRect(inner, radius, radius);
+		_backroundPatterned = false;
+	}
+	if (!_backroundPatterned && _patternEmoji->ready()) {
+		_backroundPatterned = true;
+		auto p = QPainter(&_backgroundCache);
+		p.setClipRect(inner);
+		const auto skip = inner.width() / 3;
+		Ui::PaintBgPoints(
+			p,
+			Ui::PatternBgPointsSmall(),
+			_patternCache,
+			_patternEmoji.get(),
+			*_data.unique,
+			QRect(-skip, 0, inner.width() + 2 * skip, inner.height()));
+	}
+}
+
+void GiftServiceBox::draw(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &geometry) {
+	cacheUniqueBackground(geometry.width(), geometry.height());
+	p.drawImage(geometry.topLeft(), _backgroundCache);
+
+	if (_sticker) {
+		_sticker->draw(
+			p,
+			context,
+			geometry.marginsRemoved(st::msgServiceGiftThemeStickerPadding));
+	} else {
+		ensureStickerCreated();
+	}
+}
+
+bool GiftServiceBox::hideServiceText() {
+	return true;
+}
+
+void GiftServiceBox::stickerClearLoopPlayed() {
+	if (_sticker) {
+		_sticker->stickerClearLoopPlayed();
+	}
+}
+
+std::unique_ptr<StickerPlayer> GiftServiceBox::stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) {
+	return _sticker
+		? _sticker->stickerTakePlayer(data, replacements)
+		: nullptr;
+}
+
+bool GiftServiceBox::hasHeavyPart() {
+	return (_sticker ? _sticker->hasHeavyPart() : false);
+}
+
+void GiftServiceBox::unloadHeavyPart() {
+	if (_sticker) {
+		_sticker->unloadHeavyPart();
+	}
+}
+
+void GiftServiceBox::ensureStickerCreated() const {
+	if (_sticker) {
+		return;
+	}
+	const auto document = _data.unique->model.document;
+	const auto sticker = document->sticker();
+	Assert(sticker != nullptr);
+	_sticker.emplace(_parent, document, false, _parent);
+	_sticker->setPlayingOnce(true);
+	_sticker->initSize(st::msgServiceGiftThemeStickerSize);
+	_parent->repaint();
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.h b/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
index 3e1d34ecfc94f4..23006073fb8dd5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
@@ -9,12 +9,16 @@ For license and copyright information please follow this link:
 
 #include "history/view/media/history_view_file.h"
 #include "history/view/media/history_view_service_box.h"
+#include "history/view/media/history_view_sticker.h"
 
 class Image;
+struct HistoryMessageSuggestion;
 
 namespace Data {
 class DocumentMedia;
 class WallPaper;
+class MediaGiftBox;
+struct GiftCode;
 } // namespace Data
 
 namespace HistoryView {
@@ -97,7 +101,7 @@ class ThemeDocumentBox final : public ServiceBoxContent {
 
 	int top() override;
 	QSize size() override;
-	QString title() override;
+	TextWithEntities title() override;
 	TextWithEntities subtitle() override;
 	rpl::producer<QString> button() override;
 	void draw(
@@ -128,4 +132,57 @@ class ThemeDocumentBox final : public ServiceBoxContent {
 
 };
 
+class GiftServiceBox final
+	: public ServiceBoxContent
+	, public base::has_weak_ptr {
+public:
+	GiftServiceBox(
+		not_null<Element*> parent,
+		not_null<Data::MediaGiftBox*> gift);
+	~GiftServiceBox();
+
+	int top() override;
+	int width() override;
+	QSize size() override;
+	TextWithEntities title() override;
+	TextWithEntities subtitle() override;
+	rpl::producer<QString> button() override;
+	int buttonSkip() override;
+	void draw(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &geometry) override;
+	ClickHandlerPtr createViewLink() override;
+
+	rpl::producer<> changes() override;
+
+	bool hideServiceText() override;
+	void stickerClearLoopPlayed() override;
+	std::unique_ptr<StickerPlayer> stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) override;
+
+	bool hasHeavyPart() override;
+	void unloadHeavyPart() override;
+
+private:
+	void ensureStickerCreated() const;
+	void cacheUniqueBackground(int width, int height);
+	void checkKeyboardRemoval(
+		not_null<const HistoryMessageSuggestion*> suggestion,
+		bool expired);
+	void clearKeyboard();
+
+	const not_null<Element*> _parent;
+	const Data::GiftCode &_data;
+	std::unique_ptr<Ui::Text::CustomEmoji> _patternEmoji;
+	QImage _backgroundCache;
+	base::flat_map<float64, QImage> _patternCache;
+	bool _backroundPatterned = false;
+	mutable std::optional<Sticker> _sticker;
+	rpl::event_stream<> _changes;
+	base::Timer _changeTimer;
+
+};
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_todo_list.cpp b/Telegram/SourceFiles/history/view/media/history_view_todo_list.cpp
new file mode 100644
index 00000000000000..2cea736d6d0a2c
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_todo_list.cpp
@@ -0,0 +1,912 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/media/history_view_todo_list.h"
+
+#include "base/unixtime.h"
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "core/ui_integration.h" // TextContext
+#include "lang/lang_keys.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
+#include "history/view/history_view_message.h"
+#include "history/view/history_view_cursor_state.h"
+#include "history/view/history_view_text_helper.h"
+#include "calls/calls_instance.h"
+#include "ui/chat/message_bubble.h"
+#include "ui/chat/chat_style.h"
+#include "ui/text/text_options.h"
+#include "ui/text/text_utilities.h"
+#include "ui/text/format_values.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/radial_animation.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/effects/fireworks_animation.h"
+#include "ui/toast/toast.h"
+#include "ui/painter.h"
+#include "ui/power_saving.h"
+#include "data/data_media_types.h"
+#include "data/data_poll.h"
+#include "data/data_user.h"
+#include "data/data_session.h"
+#include "base/unixtime.h"
+#include "base/timer.h"
+#include "main/main_session.h"
+#include "apiwrap.h"
+#include "api/api_todo_lists.h"
+#include "window/window_peer_menu.h"
+#include "styles/style_chat.h"
+#include "styles/style_polls.h"
+#include "styles/style_widgets.h"
+#include "styles/style_window.h"
+
+namespace HistoryView {
+
+struct TodoList::Task {
+	Task();
+
+	void fillData(
+		not_null<Element*> view,
+		not_null<TodoListData*> todolist,
+		const TodoListItem &original,
+		Ui::Text::MarkedContext context);
+	void setCompletedBy(PeerData *by);
+
+	Ui::Text::String text;
+	Ui::Text::String name;
+	PeerData *completedBy = nullptr;
+	mutable Ui::PeerUserpicView userpic;
+	TimeId completionDate = 0;
+	int id = 0;
+	ClickHandlerPtr handler;
+	Ui::Animations::Simple selectedAnimation;
+	mutable std::unique_ptr<Ui::RippleAnimation> ripple;
+};
+
+TodoList::Task::Task()
+: text(st::msgMinWidth / 2)
+, name(st::msgMinWidth / 2) {
+}
+
+void TodoList::Task::fillData(
+		not_null<Element*> view,
+		not_null<TodoListData*> todolist,
+		const TodoListItem &original,
+		Ui::Text::MarkedContext context) {
+	id = original.id;
+	setCompletedBy(original.completedBy);
+	completionDate = original.completionDate;
+	if (!text.isEmpty() && text.toTextWithEntities() == original.text) {
+		return;
+	}
+	text.setMarkedText(
+		st::historyPollAnswerStyle,
+		original.text,
+		Ui::WebpageTextTitleOptions(),
+		context);
+	InitElementTextPart(view, text);
+}
+
+void TodoList::Task::setCompletedBy(PeerData *by) {
+	if (!by || completedBy == by) {
+		return;
+	}
+	completedBy = by;
+	name.setText(st::historyPollAnswerStyle, completedBy->name());
+}
+
+TodoList::TodoList(
+	not_null<Element*> parent,
+	not_null<TodoListData*> todolist,
+	Element *replacing)
+: Media(parent)
+, _todolist(todolist)
+, _title(st::msgMinWidth / 2) {
+	history()->owner().registerTodoListView(_todolist, _parent);
+	if (const auto media = replacing ? replacing->media() : nullptr) {
+		const auto info = media->takeTasksInfo();
+		if (!info.empty()) {
+			setupPreviousState(info);
+		}
+	}
+}
+
+void TodoList::setupPreviousState(const std::vector<TodoTaskInfo> &info) {
+	// If we restore state from the view we're replacing we'll be able to
+	// animate the changes properly.
+	updateTasks(true);
+	for (auto &task : _tasks) {
+		const auto i = ranges::find(info, task.id, &TodoTaskInfo::id);
+		if (i != end(info)) {
+			task.setCompletedBy(i->completedBy);
+			task.completionDate = i->completionDate;
+		}
+	}
+}
+
+QSize TodoList::countOptimalSize() {
+ 	updateTexts();
+
+	const auto paddings = st::msgPadding.left() + st::msgPadding.right();
+
+	auto maxWidth = st::msgFileMinWidth;
+	accumulate_max(maxWidth, paddings + _title.maxWidth());
+	for (const auto &task : _tasks) {
+		accumulate_max(
+			maxWidth,
+			paddings
+			+ st::historyChecklistTaskPadding.left()
+			+ task.text.maxWidth()
+			+ st::historyChecklistTaskPadding.right());
+	}
+
+	const auto tasksHeight = ranges::accumulate(ranges::views::all(
+		_tasks
+	) | ranges::views::transform([](const Task &task) {
+		return st::historyChecklistTaskPadding.top()
+			+ task.text.minHeight()
+			+ st::historyChecklistTaskPadding.bottom();
+	}), 0);
+
+	const auto bottomButtonHeight = st::historyPollBottomButtonSkip;
+	auto minHeight = st::historyPollQuestionTop
+		+ _title.minHeight()
+		+ st::historyPollSubtitleSkip
+		+ st::msgDateFont->height
+		+ st::historyPollAnswersSkip
+		+ tasksHeight
+		+ st::historyPollTotalVotesSkip
+		+ bottomButtonHeight
+		+ st::msgDateFont->height
+		+ st::msgPadding.bottom();
+	if (!isBubbleTop()) {
+		minHeight -= st::msgFileTopMinus;
+	}
+	return { maxWidth, minHeight };
+}
+
+bool TodoList::canComplete() const {
+	return (_parent->data()->out()
+		|| _parent->history()->peer->isSelf()
+		|| _todolist->othersCanComplete())
+		&& _parent->data()->isRegular()
+		&& !_parent->data()->Has<HistoryMessageForwarded>();
+}
+
+int TodoList::countTaskTop(
+		const Task &task,
+		int innerWidth) const {
+	auto tshift = st::historyPollQuestionTop;
+	if (!isBubbleTop()) {
+		tshift -= st::msgFileTopMinus;
+	}
+	tshift += _title.countHeight(innerWidth) + st::historyPollSubtitleSkip;
+	tshift += st::msgDateFont->height + st::historyPollAnswersSkip;
+	const auto i = ranges::find(
+		_tasks,
+		&task,
+		[](const Task &task) { return &task; });
+	const auto countHeight = [&](const Task &task) {
+		return countTaskHeight(task, innerWidth);
+	};
+	tshift += ranges::accumulate(
+		begin(_tasks),
+		i,
+		0,
+		ranges::plus(),
+		countHeight);
+	return tshift;
+}
+
+int TodoList::countTaskHeight(
+		const Task &task,
+		int innerWidth) const {
+	const auto answerWidth = innerWidth
+		- st::historyChecklistTaskPadding.left()
+		- st::historyChecklistTaskPadding.right();
+	return st::historyChecklistTaskPadding.top()
+		+ task.text.countHeight(answerWidth)
+		+ st::historyChecklistTaskPadding.bottom();
+}
+
+QSize TodoList::countCurrentSize(int newWidth) {
+	accumulate_min(newWidth, maxWidth());
+	const auto innerWidth = newWidth
+		- st::msgPadding.left()
+		- st::msgPadding.right();
+
+	const auto tasksHeight = ranges::accumulate(ranges::views::all(
+		_tasks
+	) | ranges::views::transform([&](const Task &task) {
+		return countTaskHeight(task, innerWidth);
+	}), 0);
+
+	const auto bottomButtonHeight = st::historyPollBottomButtonSkip;
+	auto newHeight = st::historyPollQuestionTop
+		+ _title.countHeight(innerWidth)
+		+ st::historyPollSubtitleSkip
+		+ st::msgDateFont->height
+		+ st::historyPollAnswersSkip
+		+ tasksHeight
+		+ st::historyPollTotalVotesSkip
+		+ bottomButtonHeight
+		+ st::msgDateFont->height
+		+ st::msgPadding.bottom();
+	if (!isBubbleTop()) {
+		newHeight -= st::msgFileTopMinus;
+	}
+	return { newWidth, newHeight };
+}
+
+void TodoList::updateTexts() {
+	if (_todoListVersion == _todolist->version) {
+		return;
+	}
+	const auto skipAnimations = _tasks.empty();
+	_todoListVersion = _todolist->version;
+
+	if (_title.toTextWithEntities() != _todolist->title) {
+		auto options = Ui::WebpageTextTitleOptions();
+		options.maxw = options.maxh = 0;
+		_title.setMarkedText(
+			st::historyPollQuestionStyle,
+			_todolist->title,
+			options,
+			Core::TextContext({
+				.session = &_todolist->session(),
+				.repaint = [=] { repaint(); },
+				.customEmojiLoopLimit = 2,
+			}));
+		InitElementTextPart(_parent, _title);
+	}
+	if (_flags != _todolist->flags() || _subtitle.isEmpty()) {
+		_flags = _todolist->flags();
+		_subtitle.setText(
+			st::msgDateTextStyle,
+			(!_todolist->othersCanComplete()
+				? tr::lng_todo_title(tr::now)
+				: _parent->data()->history()->peer->isUser()
+				? tr::lng_todo_title_user(tr::now)
+				: tr::lng_todo_title_group(tr::now)));
+	}
+	updateTasks(skipAnimations);
+}
+
+void TodoList::updateTasks(bool skipAnimations) {
+	const auto context = Core::TextContext({
+		.session = &_todolist->session(),
+		.repaint = [=] { repaint(); },
+		.customEmojiLoopLimit = 2,
+	});
+	const auto changed = !ranges::equal(
+		_tasks,
+		_todolist->items,
+		ranges::equal_to(),
+		&Task::id,
+		&TodoListItem::id);
+	if (!changed) {
+		auto animated = false;
+		auto &&tasks = ranges::views::zip(_tasks, _todolist->items);
+		for (auto &&[task, original] : tasks) {
+			const auto wasDate = task.completionDate;
+			task.fillData(_parent, _todolist, original, context);
+			if (!skipAnimations && (!wasDate != !task.completionDate)) {
+				startToggleAnimation(task);
+				animated = true;
+			}
+		}
+		updateCompletionStatus();
+		if (animated) {
+			maybeStartFireworks();
+		}
+		return;
+	}
+	const auto has = hasHeavyPart();
+	_tasks = ranges::views::all(
+		_todolist->items
+	) | ranges::views::transform([&](const TodoListItem &item) {
+		auto result = Task();
+		result.id = item.id;
+		result.fillData(_parent, _todolist, item, context);
+		return result;
+	}) | ranges::to_vector;
+
+	for (auto &task : _tasks) {
+		task.handler = createTaskClickHandler(task);
+	}
+
+	updateCompletionStatus();
+
+	if (has && !hasHeavyPart()) {
+		_parent->checkHeavyPart();
+	}
+}
+
+ClickHandlerPtr TodoList::createTaskClickHandler(
+		const Task &task) {
+	const auto id = task.id;
+	auto result = std::make_shared<LambdaClickHandler>(crl::guard(this, [=] {
+		toggleCompletion(id);
+	}));
+	result->setProperty(kTodoListItemIdProperty, id);
+	return result;
+}
+
+void TodoList::startToggleAnimation(Task &task) {
+	const auto selected = (task.completionDate != 0);
+	task.selectedAnimation.start(
+		[=] { repaint(); },
+		selected ? 0. : 1.,
+		selected ? 1. : 0.,
+		st::defaultCheck.duration);
+}
+
+void TodoList::toggleCompletion(int id) {
+	if (_parent->data()->isBusinessShortcut()) {
+		return;
+	} else if (_parent->data()->Has<HistoryMessageForwarded>()) {
+		_parent->delegate()->elementShowTooltip(
+			tr::lng_todo_mark_forwarded(tr::now, tr::rich),
+			[] {});
+		return;
+	} else if (!canComplete()) {
+		_parent->delegate()->elementShowTooltip(
+			tr::lng_todo_mark_restricted(
+				tr::now,
+				lt_user,
+				tr::bold(_parent->data()->from()->shortName()),
+				tr::rich), [] {});
+		return;
+	} else if (!_parent->history()->session().premium()) {
+		Window::PeerMenuTodoWantsPremium(Window::TodoWantsPremium::Mark);
+		return;
+	}
+	const auto i = ranges::find(
+		_tasks,
+		id,
+		&Task::id);
+	if (i == end(_tasks)) {
+		return;
+	}
+
+	const auto selected = (i->completionDate != 0);
+	i->completionDate = selected ? TimeId() : base::unixtime::now();
+	if (!selected) {
+		i->setCompletedBy(_parent->history()->session().user());
+	}
+
+	const auto parentMedia = _parent->data()->media();
+	const auto baseList = parentMedia ? parentMedia->todolist() : nullptr;
+	if (baseList) {
+		const auto j = ranges::find(baseList->items, id, &TodoListItem::id);
+		if (j != end(baseList->items)) {
+			j->completionDate = i->completionDate;
+			j->completedBy = i->completedBy;
+		}
+		history()->owner().updateDependentMessages(_parent->data());
+	}
+
+	startToggleAnimation(*i);
+	repaint();
+
+	history()->session().api().todoLists().toggleCompletion(
+		_parent->data()->fullId(),
+		id,
+		!selected);
+
+	maybeStartFireworks();
+}
+
+void TodoList::maybeStartFireworks() {
+	if (!ranges::contains(_tasks, TimeId(), &Task::completionDate)
+		&& !_fireworksAnimation) {
+		_fireworksAnimation = std::make_unique<Ui::FireworksAnimation>(
+			[=] { repaint(); });
+	}
+}
+
+void TodoList::updateCompletionStatus() {
+	const auto incompleted = int(ranges::count(
+		_todolist->items,
+		nullptr,
+		&TodoListItem::completedBy));
+	const auto total = int(_todolist->items.size());
+	if (_total == total
+		&& _incompleted == incompleted
+		&& !_completionStatusLabel.isEmpty()) {
+		return;
+	}
+	_total = total;
+	_incompleted = incompleted;
+	const auto totalText = QString::number(total);
+	const auto string = (incompleted == total)
+		? tr::lng_todo_completed_none(tr::now, lt_total, totalText)
+		: tr::lng_todo_completed(
+			tr::now,
+			lt_count,
+			total - incompleted,
+			lt_total,
+			totalText);
+	_completionStatusLabel.setText(st::msgDateTextStyle, string);
+}
+
+void TodoList::draw(Painter &p, const PaintContext &context) const {
+	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return;
+	auto paintw = width();
+
+	const auto stm = context.messageStyle();
+	const auto padding = st::msgPadding;
+	auto tshift = st::historyPollQuestionTop;
+	if (!isBubbleTop()) {
+		tshift -= st::msgFileTopMinus;
+	}
+	paintw -= padding.left() + padding.right();
+
+	p.setPen(stm->historyTextFg);
+	_title.draw(p, {
+		.position = { padding.left(), tshift },
+		.availableWidth = paintw,
+		.palette = &stm->textPalette,
+		.spoiler = Ui::Text::DefaultSpoilerCache(),
+		.now = context.now,
+		.pausedEmoji = context.paused || On(PowerSaving::kEmojiChat),
+		.pausedSpoiler = context.paused || On(PowerSaving::kChatSpoiler),
+		.selection = context.selection,
+	});
+	tshift += _title.countHeight(paintw) + st::historyPollSubtitleSkip;
+
+	p.setPen(stm->msgDateFg);
+	_subtitle.drawLeftElided(p, padding.left(), tshift, paintw, width());
+	tshift += st::msgDateFont->height + st::historyPollAnswersSkip;
+
+	auto heavy = false;
+	auto created = false;
+	auto &&tasks = ranges::views::zip(
+		_tasks,
+		ranges::views::ints(0, int(_tasks.size())));
+	for (const auto &[task, index] : tasks) {
+		const auto was = !task.userpic.null();
+		const auto height = paintTask(
+			p,
+			task,
+			padding.left(),
+			tshift,
+			paintw,
+			width(),
+			context);
+		appendTaskHighlight(task.id, tshift, height, context);
+		if (was) {
+			heavy = true;
+		} else if (!task.userpic.null()) {
+			created = true;
+		}
+		tshift += height;
+	}
+	if (!heavy && created) {
+		history()->owner().registerHeavyViewPart(_parent);
+	}
+	paintBottom(p, padding.left(), tshift, paintw, context);
+}
+
+void TodoList::paintBottom(
+		Painter &p,
+		int left,
+		int top,
+		int paintw,
+		const PaintContext &context) const {
+	const auto stringtop = top
+		+ st::msgPadding.bottom()
+		+ st::historyChecklistBottomTop;
+	const auto stm = context.messageStyle();
+
+	p.setPen(stm->msgDateFg);
+	_completionStatusLabel.draw(p, left, stringtop, paintw, style::al_top);
+}
+
+void TodoList::radialAnimationCallback() const {
+	if (!anim::Disabled()) {
+		repaint();
+	}
+}
+
+int TodoList::paintTask(
+		Painter &p,
+		const Task &task,
+		int left,
+		int top,
+		int width,
+		int outerWidth,
+		const PaintContext &context) const {
+	const auto height = countTaskHeight(task, width);
+	const auto stm = context.messageStyle();
+	const auto aleft = left + st::historyChecklistTaskPadding.left();
+	const auto awidth = width
+		- st::historyChecklistTaskPadding.left()
+		- st::historyChecklistTaskPadding.right();
+
+	if (task.ripple) {
+		p.setOpacity(st::historyPollRippleOpacity);
+		task.ripple->paint(
+			p,
+			left - st::msgPadding.left(),
+			top,
+			outerWidth,
+			&stm->msgWaveformInactive->c);
+		if (task.ripple->empty()) {
+			task.ripple.reset();
+		}
+		p.setOpacity(1.);
+	}
+
+	if (canComplete()) {
+		paintRadio(p, task, left, top, context);
+	} else {
+		paintStatus(p, task, left, top, context);
+	}
+
+	top += task.completionDate
+		? st::historyChecklistCheckedTop
+		: st::historyChecklistTaskPadding.top();
+	p.setPen(stm->historyTextFg);
+	task.text.draw(p, {
+		.position = { aleft, top },
+		.availableWidth = awidth,
+		.palette = &stm->textPalette,
+		.spoiler = Ui::Text::DefaultSpoilerCache(),
+		.now = context.now,
+		.pausedEmoji = context.paused || On(PowerSaving::kEmojiChat),
+		.pausedSpoiler = context.paused || On(PowerSaving::kChatSpoiler),
+	});
+	if (task.completionDate) {
+		const auto nameTop = top
+			+ height
+			- st::historyChecklistTaskPadding.bottom()
+			+ st::historyChecklistCheckedTop
+			- st::normalFont->height;
+		p.setPen(stm->msgDateFg);
+		task.name.drawLeft(p, aleft, nameTop, awidth, outerWidth);
+	}
+	return height;
+}
+
+void TodoList::appendTaskHighlight(
+		int id,
+		int top,
+		int height,
+		const PaintContext &context) const {
+	if (context.highlight.todoItemId != id
+		|| context.highlight.collapsion <= 0.) {
+		return;
+	}
+	const auto to = context.highlightInterpolateTo;
+	const auto toProgress = (1. - context.highlight.collapsion);
+	if (toProgress >= 1.) {
+		context.highlightPathCache->addRect(to);
+	} else if (toProgress <= 0.) {
+		context.highlightPathCache->addRect(0, top, width(), height);
+	} else {
+		const auto lerp = [=](int from, int to) {
+			return from + (to - from) * toProgress;
+		};
+		context.highlightPathCache->addRect(
+			lerp(0, to.x()),
+			lerp(top, to.y()),
+			lerp(width(), to.width()),
+			lerp(height, to.height()));
+	}
+}
+
+void TodoList::paintRadio(
+		Painter &p,
+		const Task &task,
+		int left,
+		int top,
+		const PaintContext &context) const {
+	top += st::historyChecklistTaskPadding.top();
+
+	const auto stm = context.messageStyle();
+
+	PainterHighQualityEnabler hq(p);
+	const auto &radio = st::historyPollRadio;
+	const auto over = ClickHandler::showAsActive(task.handler);
+	const auto &regular = stm->msgDateFg;
+
+	const auto checkmark = task.selectedAnimation.value(
+		task.completionDate ? 1. : 0.);
+
+	const auto o = p.opacity();
+	if (checkmark < 1.) {
+		p.setBrush(Qt::NoBrush);
+		p.setOpacity(o * (over ? st::historyPollRadioOpacityOver : st::historyPollRadioOpacity));
+	}
+
+	const auto rect = QRectF(left, top, radio.diameter, radio.diameter).marginsRemoved(QMarginsF(radio.thickness / 2., radio.thickness / 2., radio.thickness / 2., radio.thickness / 2.));
+	if (checkmark > 0. && task.completedBy) {
+		const auto skip = st::lineWidth;
+		const auto userpic = QRect(
+			left + (radio.diameter / 2) + skip,
+			top + skip,
+			radio.diameter - 2 * skip,
+			radio.diameter - 2 * skip);
+		if (checkmark < 1.) {
+			p.save();
+			p.setOpacity(checkmark);
+			p.translate(QRectF(userpic).center());
+			const auto ratio = 0.4 + 0.6 * checkmark;
+			p.scale(ratio, ratio);
+			p.translate(-QRectF(userpic).center());
+		}
+		task.completedBy->paintUserpic(
+			p,
+			task.userpic,
+			userpic.left(),
+			userpic.top(),
+			userpic.width());
+		if (checkmark < 1.) {
+			p.restore();
+		}
+	}
+	if (checkmark < 1.) {
+		auto pen = regular->p;
+		pen.setWidth(radio.thickness);
+		p.setPen(pen);
+		p.drawEllipse(rect);
+	}
+
+	if (checkmark > 0.) {
+		const auto removeFull = (radio.diameter / 2 - radio.thickness);
+		const auto removeNow = removeFull * (1. - checkmark);
+		const auto color = stm->msgFileThumbLinkFg;
+		auto pen = color->p;
+		pen.setWidth(radio.thickness);
+		p.setPen(pen);
+		p.setBrush(color);
+		p.drawEllipse(rect.marginsRemoved({ removeNow, removeNow, removeNow, removeNow }));
+		const auto &icon = stm->historyPollChosen;
+		icon.paint(p, left + (radio.diameter - icon.width()) / 2, top + (radio.diameter - icon.height()) / 2, width());
+
+		const auto stm = context.messageStyle();
+		auto bgpen = stm->msgBg->p;
+		bgpen.setWidth(st::lineWidth);
+		const auto outline = QRect(left, top, radio.diameter, radio.diameter);
+		const auto paintContent = [&](QPainter &p) {
+			p.setPen(bgpen);
+			p.setBrush(Qt::NoBrush);
+			PainterHighQualityEnabler hq(p);
+			p.drawEllipse(outline);
+		};
+		if (usesBubblePattern(context)) {
+			const auto add = st::lineWidth * 3;
+			const auto target = outline.marginsAdded(
+				{ add, add, add, add });
+			Ui::PaintPatternBubblePart(
+				p,
+				context.viewport,
+				context.bubblesPattern->pixmap,
+				target,
+				paintContent,
+				_userpicCircleCache);
+		} else {
+			paintContent(p);
+		}
+	}
+
+	p.setOpacity(o);
+}
+
+void TodoList::paintStatus(
+		Painter &p,
+		const Task &task,
+		int left,
+		int top,
+		const PaintContext &context) const {
+	top += st::historyChecklistTaskPadding.top();
+
+	const auto stm = context.messageStyle();
+
+	const auto &radio = st::historyPollRadio;
+	const auto completed = (task.completionDate != 0);
+
+	const auto rect = QRect(left, top, radio.diameter, radio.diameter);
+	if (completed) {
+		const auto &icon = stm->historyPollChosen;
+		icon.paint(
+			p,
+			left + (radio.diameter - icon.width()) / 2,
+			top + (radio.diameter - icon.height()) / 2,
+			width(),
+			stm->msgFileBg->c);
+	} else {
+		p.setPen(Qt::NoPen);
+		p.setBrush(stm->msgFileBg);
+
+		PainterHighQualityEnabler hq(p);
+		p.drawEllipse(style::centerrect(
+			rect,
+			QRect(0, 0, st::mediaUnreadSize, st::mediaUnreadSize)));
+	}
+}
+
+TextSelection TodoList::adjustSelection(
+		TextSelection selection,
+		TextSelectType type) const {
+	return _title.adjustSelection(selection, type);
+}
+
+uint16 TodoList::fullSelectionLength() const {
+	return _title.length();
+}
+
+TextForMimeData TodoList::selectedText(TextSelection selection) const {
+	return _title.toTextForMimeData(selection);
+}
+
+TextState TodoList::textState(QPoint point, StateRequest request) const {
+	auto result = TextState(_parent);
+	const auto padding = st::msgPadding;
+	auto paintw = width();
+	auto tshift = st::historyPollQuestionTop;
+	if (!isBubbleTop()) {
+		tshift -= st::msgFileTopMinus;
+	}
+	paintw -= padding.left() + padding.right();
+
+	const auto questionH = _title.countHeight(paintw);
+	if (QRect(padding.left(), tshift, paintw, questionH).contains(point)) {
+		result = TextState(_parent, _title.getState(
+			point - QPoint(padding.left(), tshift),
+			paintw,
+			request.forText()));
+		return result;
+	}
+	const auto aleft = padding.left()
+		+ st::historyChecklistTaskPadding.left();
+	const auto awidth = paintw
+		- st::historyChecklistTaskPadding.left()
+		- st::historyChecklistTaskPadding.right();
+	tshift += questionH + st::historyPollSubtitleSkip;
+	tshift += st::msgDateFont->height + st::historyPollAnswersSkip;
+	for (const auto &task : _tasks) {
+		const auto height = countTaskHeight(task, paintw);
+		if (point.y() >= tshift && point.y() < tshift + height) {
+			const auto atop = tshift
+				+ (task.completionDate
+					? st::historyChecklistCheckedTop
+					: st::historyChecklistTaskPadding.top());
+			auto taskTextResult = task.text.getState(
+				point - QPoint(aleft, atop),
+				awidth,
+				request.forText());
+			if (taskTextResult.link) {
+				result.link = taskTextResult.link;
+			} else {
+				_lastLinkPoint = point;
+				result.link = task.handler;
+			}
+			if (task.completionDate) {
+				result.customTooltip = true;
+				using Flag = Ui::Text::StateRequest::Flag;
+				if (request.flags & Flag::LookupCustomTooltip) {
+					result.customTooltipText = langDateTimeFull(
+						base::unixtime::parse(task.completionDate));
+				}
+			}
+			return result;
+		}
+		tshift += height;
+	}
+	return result;
+}
+
+void TodoList::paintBubbleFireworks(
+		Painter &p,
+		const QRect &bubble,
+		crl::time ms) const {
+	if (!_fireworksAnimation || _fireworksAnimation->paint(p, bubble)) {
+		return;
+	}
+	_fireworksAnimation = nullptr;
+}
+
+void TodoList::clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed) {
+	if (!handler) return;
+
+	const auto i = ranges::find(
+		_tasks,
+		handler,
+		&Task::handler);
+	if (i != end(_tasks)) {
+		toggleRipple(*i, pressed);
+	}
+}
+
+void TodoList::unloadHeavyPart() {
+	for (auto &task : _tasks) {
+		task.userpic = {};
+	}
+}
+
+bool TodoList::hasHeavyPart() const {
+	for (auto &task : _tasks) {
+		if (!task.userpic.null()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void TodoList::hideSpoilers() {
+	if (_title.hasSpoilers()) {
+		_title.setSpoilerRevealed(false, anim::type::instant);
+	}
+	for (auto &task : _tasks) {
+		if (task.text.hasSpoilers()) {
+			task.text.setSpoilerRevealed(false, anim::type::instant);
+		}
+	}
+}
+
+std::vector<Media::TodoTaskInfo> TodoList::takeTasksInfo() {
+	if (_tasks.empty()) {
+		return {};
+	}
+	return _tasks | ranges::views::transform([](const Task &task) {
+		return TodoTaskInfo{
+			.id = task.id,
+			.completedBy = task.completedBy,
+			.completionDate = task.completionDate,
+		};
+	}) | ranges::to_vector;
+}
+
+void TodoList::toggleRipple(Task &task, bool pressed) {
+	if (pressed) {
+		const auto outerWidth = width();
+		const auto innerWidth = outerWidth
+			- st::msgPadding.left()
+			- st::msgPadding.right();
+		if (!task.ripple) {
+			auto mask = Ui::RippleAnimation::RectMask(QSize(
+				outerWidth,
+				countTaskHeight(task, innerWidth)));
+			task.ripple = std::make_unique<Ui::RippleAnimation>(
+				st::defaultRippleAnimation,
+				std::move(mask),
+				[=] { repaint(); });
+		}
+		const auto top = countTaskTop(task, innerWidth);
+		task.ripple->add(_lastLinkPoint - QPoint(0, top));
+	} else if (task.ripple) {
+		task.ripple->lastStop();
+	}
+}
+
+int TodoList::bottomButtonHeight() const {
+	const auto skip = st::historyPollChoiceRight.height()
+		- st::historyPollFillingBottom
+		- st::historyPollFillingHeight
+		- (st::historyPollChoiceRight.height() - st::historyPollFillingHeight) / 2;
+	return st::historyPollTotalVotesSkip
+		- skip
+		+ st::historyPollBottomButtonSkip
+		+ st::msgDateFont->height
+		+ st::msgPadding.bottom();
+}
+
+TodoList::~TodoList() {
+	history()->owner().unregisterTodoListView(_todolist, _parent);
+	if (hasHeavyPart()) {
+		unloadHeavyPart();
+		_parent->checkHeavyPart();
+	}
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_todo_list.h b/Telegram/SourceFiles/history/view/media/history_view_todo_list.h
new file mode 100644
index 00000000000000..b17e7853ccec2d
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_todo_list.h
@@ -0,0 +1,152 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "history/view/media/history_view_media.h"
+#include "ui/effects/animations.h"
+#include "data/data_todo_list.h"
+#include "base/weak_ptr.h"
+
+namespace Ui {
+class RippleAnimation;
+class FireworksAnimation;
+} // namespace Ui
+
+namespace HistoryView {
+
+class Message;
+
+class TodoList final : public Media {
+public:
+	TodoList(
+		not_null<Element*> parent,
+		not_null<TodoListData*> todolist,
+		Element *replacing);
+	~TodoList();
+
+	void draw(Painter &p, const PaintContext &context) const override;
+	TextState textState(QPoint point, StateRequest request) const override;
+
+	bool toggleSelectionByHandlerClick(const ClickHandlerPtr &p) const override {
+		return true;
+	}
+	bool dragItemByHandler(const ClickHandlerPtr &p) const override {
+		return true;
+	}
+
+	bool needsBubble() const override {
+		return true;
+	}
+	bool customInfoLayout() const override {
+		return false;
+	}
+
+	[[nodiscard]] TextSelection adjustSelection(
+		TextSelection selection,
+		TextSelectType type) const override;
+	uint16 fullSelectionLength() const override;
+	TextForMimeData selectedText(TextSelection selection) const override;
+
+	void paintBubbleFireworks(
+		Painter &p,
+		const QRect &bubble,
+		crl::time ms) const override;
+
+	void clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed) override;
+
+	void unloadHeavyPart() override;
+	bool hasHeavyPart() const override;
+
+	void hideSpoilers() override;
+
+	std::vector<TodoTaskInfo> takeTasksInfo() override;
+
+private:
+	struct Task;
+
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
+	[[nodiscard]] bool canComplete() const;
+
+	[[nodiscard]] int countTaskTop(
+		const Task &task,
+		int innerWidth) const;
+	[[nodiscard]] int countTaskHeight(
+		const Task &task,
+		int innerWidth) const;
+	[[nodiscard]] ClickHandlerPtr createTaskClickHandler(
+		const Task &task);
+	void updateTexts();
+	void updateTasks(bool skipAnimations);
+	void startToggleAnimation(Task &task);
+	void updateCompletionStatus();
+	void maybeStartFireworks();
+	void setupPreviousState(const std::vector<TodoTaskInfo> &info);
+
+	int paintTask(
+		Painter &p,
+		const Task &task,
+		int left,
+		int top,
+		int width,
+		int outerWidth,
+		const PaintContext &context) const;
+	void paintRadio(
+		Painter &p,
+		const Task &task,
+		int left,
+		int top,
+		const PaintContext &context) const;
+	void paintStatus(
+		Painter &p,
+		const Task &task,
+		int left,
+		int top,
+		const PaintContext &context) const;
+	void paintBottom(
+		Painter &p,
+		int left,
+		int top,
+		int paintw,
+		const PaintContext &context) const;
+	void appendTaskHighlight(
+		int id,
+		int top,
+		int height,
+		const PaintContext &context) const;
+
+	void radialAnimationCallback() const;
+
+	void toggleRipple(Task &task, bool pressed);
+	void toggleCompletion(int id);
+
+	[[nodiscard]] int bottomButtonHeight() const;
+
+	const not_null<TodoListData*> _todolist;
+	int _todoListVersion = 0;
+	int _total = 0;
+	int _incompleted = 0;
+	TodoListData::Flags _flags = TodoListData::Flags();
+
+	Ui::Text::String _title;
+	Ui::Text::String _subtitle;
+
+	std::vector<Task> _tasks;
+	Ui::Text::String _completionStatusLabel;
+
+	mutable std::unique_ptr<Ui::FireworksAnimation> _fireworksAnimation;
+	mutable QPoint _lastLinkPoint;
+	mutable QImage _userpicCircleCache;
+	mutable QImage _fillingIconCache;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_unique_gift.cpp b/Telegram/SourceFiles/history/view/media/history_view_unique_gift.cpp
new file mode 100644
index 00000000000000..b52f25072597dd
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_unique_gift.cpp
@@ -0,0 +1,869 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/media/history_view_unique_gift.h"
+
+#include "base/unixtime.h"
+#include "boxes/star_gift_box.h"
+#include "chat_helpers/stickers_lottie.h"
+#include "core/click_handler_types.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_birthday.h"
+#include "data/data_media_types.h"
+#include "data/data_session.h"
+#include "data/data_star_gift.h"
+#include "data/data_web_page.h"
+#include "history/view/media/history_view_media_generic.h"
+#include "history/view/media/history_view_premium_gift.h"
+#include "history/view/history_view_cursor_state.h"
+#include "history/view/history_view_element.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/settings_credits_graphics.h"
+#include "ui/chat/chat_style.h"
+#include "ui/effects/ministar_particles.h"
+#include "ui/effects/premium_stars_colored.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/painter.h"
+#include "ui/power_saving.h"
+#include "ui/rect.h"
+#include "ui/top_background_gradient.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_credits.h"
+#include "styles/style_polls.h"
+
+namespace HistoryView {
+namespace {
+
+class ButtonPart final : public MediaGenericPart {
+public:
+	ButtonPart(
+		const QString &text,
+		QMargins margins,
+		Fn<void()> repaint,
+		ClickHandlerPtr link,
+		QColor bg = QColor(0, 0, 0, 0));
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+	TextState textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const override;
+
+	void clickHandlerPressedChanged(
+		const ClickHandlerPtr &p,
+		bool pressed) override;
+
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
+private:
+	Ui::Text::String _text;
+	QMargins _margins;
+	QColor _bg;
+	QSize _size;
+
+	ClickHandlerPtr _link;
+	std::unique_ptr<Ui::RippleAnimation> _ripple;
+	mutable Ui::Premium::ColoredMiniStars _stars;
+	mutable std::optional<QColor> _starsLastColor;
+	Fn<void()> _repaint;
+
+	mutable QPoint _lastPoint;
+
+};
+
+class TextBubblePart final : public MediaGenericTextPart {
+public:
+	TextBubblePart(
+		TextWithEntities text,
+		QMargins margins,
+		Data::UniqueGiftBackdrop backdrop,
+		ClickHandlerPtr link);
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+	TextState textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const override;
+
+private:
+	void setupPen(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context) const override;
+	int elisionLines() const override;
+
+	Data::UniqueGiftBackdrop _backdrop;
+	ClickHandlerPtr _link;
+
+};
+
+TextBubblePart::TextBubblePart(
+	TextWithEntities text,
+	QMargins margins,
+	Data::UniqueGiftBackdrop backdrop,
+	ClickHandlerPtr link)
+: MediaGenericTextPart(
+	std::move(text),
+	margins,
+	st::uniqueGiftReleasedBy.style,
+	{},
+	{},
+	style::al_top)
+, _backdrop(backdrop)
+, _link(std::move(link)) {
+}
+
+void TextBubblePart::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	p.setOpacity(0.5);
+	p.setBrush(_backdrop.patternColor);
+	const auto radius = height() / 2.;
+	const auto left = (outerWidth - width()) / 2;
+	const auto r = QRect(left, 0, width(), height());
+	p.drawRoundedRect(r, radius, radius);
+	p.setOpacity(1.);
+
+	MediaGenericTextPart::draw(p, owner, context, outerWidth);
+}
+
+TextState TextBubblePart::textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const {
+	auto result = TextState();
+	const auto left = (outerWidth - width()) / 2;
+	if (point.x() >= left
+		&& point.y() >= 0
+		&& point.x() < left + width()
+		&& point.y() < height()) {
+		result.link = _link;
+	}
+	return result;
+}
+
+void TextBubblePart::setupPen(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context) const {
+	p.setPen(_backdrop.textColor);
+}
+
+int TextBubblePart::elisionLines() const {
+	return 1;
+}
+
+ButtonPart::ButtonPart(
+	const QString &text,
+	QMargins margins,
+	Fn<void()> repaint,
+	ClickHandlerPtr link,
+	QColor bg)
+: _text(st::semiboldTextStyle, text)
+, _margins(margins)
+, _bg(bg)
+, _size(
+	(_text.maxWidth()
+		+ st::msgServiceGiftBoxButtonHeight
+		+ st::msgServiceGiftBoxButtonPadding.left()
+		+ st::msgServiceGiftBoxButtonPadding.right()),
+	st::msgServiceGiftBoxButtonHeight)
+, _link(std::move(link))
+, _stars([=](const QRect &) {
+	repaint();
+}, Ui::Premium::MiniStarsType::SlowStars)
+, _repaint(std::move(repaint)) {
+}
+
+void ButtonPart::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	PainterHighQualityEnabler hq(p);
+
+	const auto customColors = (_bg.alpha() > 0);
+
+	const auto position = QPoint(
+		(outerWidth - width()) / 2 + _margins.left(),
+		_margins.top());
+	p.translate(position);
+
+	p.setPen(Qt::NoPen);
+	p.setBrush(customColors ? QBrush(_bg) : context.st->msgServiceBg());
+	const auto radius = _size.height() / 2.;
+	const auto r = Rect(_size);
+	p.drawRoundedRect(r, radius, radius);
+
+	auto white = QColor(255, 255, 255);
+	const auto fg = customColors ? white : context.st->msgServiceFg()->c;
+	if (!_starsLastColor || *_starsLastColor != fg) {
+		_starsLastColor = fg;
+		_stars.setColorOverride(QGradientStops{
+			{ 0., anim::with_alpha(fg, .3) },
+			{ 1., fg },
+		});
+		const auto padding = _size.height() / 2;
+		_stars.setCenter(
+			Rect(_size) - QMargins(padding, 0, padding, 0));
+	}
+
+	auto clipPath = QPainterPath();
+	clipPath.addRoundedRect(r, radius, radius);
+	p.setClipPath(clipPath);
+	_stars.setPaused(context.paused);
+	_stars.paint(p);
+	p.setClipping(false);
+
+	if (_ripple) {
+		const auto opacity = p.opacity();
+		const auto ripple = customColors
+			? anim::with_alpha(fg, .3)
+			: context.messageStyle()->msgWaveformInactive->c;
+		p.setOpacity(st::historyPollRippleOpacity);
+		_ripple->paint(
+			p,
+			0,
+			0,
+			width(),
+			&ripple);
+		p.setOpacity(opacity);
+	}
+
+	p.setPen(fg);
+	_text.draw(
+		p,
+		0,
+		(_size.height() - _text.minHeight()) / 2,
+		_size.width(),
+		style::al_top);
+
+	p.translate(-position);
+}
+
+TextState ButtonPart::textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const {
+	point -= QPoint{
+		(outerWidth - width()) / 2 + _margins.left(),
+		_margins.top()
+	};
+	if (QRect(QPoint(), _size).contains(point)) {
+		auto result = TextState();
+		result.link = _link;
+		_lastPoint = point;
+		return result;
+	}
+	return {};
+}
+
+void ButtonPart::clickHandlerPressedChanged(
+		const ClickHandlerPtr &p,
+		bool pressed) {
+	if (p != _link) {
+		return;
+	} else if (pressed) {
+		if (!_ripple) {
+			const auto radius = _size.height() / 2;
+			_ripple = std::make_unique<Ui::RippleAnimation>(
+				st::defaultRippleAnimation,
+				Ui::RippleAnimation::RoundRectMask(_size, radius),
+				_repaint);
+		}
+		_ripple->add(_lastPoint);
+	} else if (_ripple) {
+		_ripple->lastStop();
+	}
+}
+
+QSize ButtonPart::countOptimalSize() {
+	return {
+		_margins.left() + _size.width() + _margins.right(),
+		_margins.top() + _size.height() + _margins.bottom(),
+	};
+}
+
+QSize ButtonPart::countCurrentSize(int newWidth) {
+	return optimalSize();
+}
+
+} // namespace
+
+auto GenerateUniqueGiftMedia(
+	not_null<Element*> parent,
+	Element *replacing,
+	std::shared_ptr<Data::UniqueGift> gift)
+-> Fn<void(
+		not_null<MediaGeneric*>,
+		Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](
+			not_null<MediaGeneric*> media,
+			Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
+		auto pushText = [&](
+				TextWithEntities text,
+				const style::TextStyle &st,
+				QColor color,
+				QMargins margins) {
+			if (text.empty()) {
+				return;
+			}
+			push(std::make_unique<TextPartColored>(
+				std::move(text),
+				margins,
+				[color](const auto&) { return color; },
+				st));
+		};
+
+		const auto item = parent->data();
+		const auto itemMedia = item->media();
+		const auto fields = itemMedia ? itemMedia->gift() : nullptr;
+		const auto upgrade = fields && fields->upgrade;
+		const auto outgoing = upgrade ? !item->out() : item->out();
+
+		const auto white = QColor(255, 255, 255);
+		const auto sticker = [=] {
+			using Tag = ChatHelpers::StickerLottieSize;
+			return StickerInBubblePart::Data{
+				.sticker = gift->model.document,
+				.size = st::chatIntroStickerSize,
+				.cacheTag = Tag::ChatIntroHelloSticker,
+			};
+		};
+		push(std::make_unique<StickerInBubblePart>(
+			parent,
+			replacing,
+			sticker,
+			st::chatUniqueStickerPadding));
+		const auto peer = parent->history()->peer;
+		pushText(
+			tr::bold(peer->isSelf()
+				? (gift->crafted
+					? tr::lng_action_gift_crafted_subtitle(tr::now)
+					: tr::lng_action_gift_self_subtitle(tr::now))
+				: peer->isServiceUser()
+				? tr::lng_gift_link_label_gift(tr::now)
+				: (outgoing
+					? tr::lng_action_gift_sent_subtitle
+					: tr::lng_action_gift_got_subtitle)(
+						tr::now,
+						lt_user,
+						peer->shortName())),
+			st::chatUniqueTitle,
+			white,
+			st::chatUniqueTitlePadding);
+		pushText(
+			tr::bold(Data::UniqueGiftName(*gift)),
+			st::chatUniqueTextStyle,
+			gift->backdrop.textColor,
+			st::chatUniqueTextPadding);
+
+		if (const auto by = gift->releasedBy) {
+			const auto handler = std::make_shared<LambdaClickHandler>([=] {
+				Ui::GiftReleasedByHandler(by);
+			});
+			push(std::make_unique<TextBubblePart>(
+				tr::lng_gift_released_by(
+					tr::now,
+					lt_name,
+					tr::link('@' + by->username()),
+					tr::marked),
+				st::giftBoxReleasedByMargin,
+				gift->backdrop,
+				handler));
+		}
+
+		const auto name = [](const Data::UniqueGiftAttribute &value) {
+			return tr::bold(value.name);
+		};
+		auto attributes = std::vector<AttributeTable::Entry>{
+			{ tr::lng_gift_unique_model(tr::now), name(gift->model) },
+			{ tr::lng_gift_unique_symbol(tr::now), name(gift->pattern) },
+			{ tr::lng_gift_unique_backdrop(tr::now), name(gift->backdrop) },
+		};
+		const auto tableAddedMargins = gift->releasedBy
+			? QMargins(0, st::chatUniqueAuthorSkip, 0, 0)
+			: QMargins();
+		push(std::make_unique<AttributeTable>(
+			std::move(attributes),
+			st::chatUniqueTextPadding + tableAddedMargins,
+			[c = gift->backdrop.textColor](const auto&) { return c; },
+			[](const auto&) { return QColor(255, 255, 255); }));
+
+		auto link = OpenStarGiftLink(parent->data());
+		push(std::make_unique<ButtonPart>(
+			tr::lng_sticker_premium_view(tr::now),
+			st::chatUniqueButtonPadding,
+			[=] { parent->repaint(); },
+			std::move(link),
+			anim::with_alpha(gift->backdrop.patternColor, 0.75)));
+	};
+}
+
+auto UniqueGiftBg(
+	not_null<Element*> view,
+	std::shared_ptr<Data::UniqueGift> gift)
+-> Fn<void(
+		Painter&,
+		const Ui::ChatPaintContext&,
+		not_null<const MediaGeneric*>)> {
+	struct State {
+		QImage bg;
+		base::flat_map<float64, QImage> cache;
+		std::unique_ptr<Ui::Text::CustomEmoji> pattern;
+		QImage badgeCache;
+		Info::PeerGifts::GiftBadge badgeKey;
+	};
+	const auto state = std::make_shared<State>();
+	state->pattern = view->history()->owner().customEmojiManager().create(
+		gift->pattern.document,
+		[=] { view->repaint(); },
+		Data::CustomEmojiSizeTag::Large);
+	[[maybe_unused]] const auto preload = state->pattern->ready();
+
+	return [=](
+			Painter &p,
+			const Ui::ChatPaintContext &context,
+			not_null<const MediaGeneric*> media) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		const auto webpreview = (media.get() != view->media());
+		const auto sub = webpreview ? 0 : (st::chatUniqueGiftBorder / 2);
+		const auto thickness = webpreview ? 0 : st::chatUniqueGiftBorder * 2;
+		const auto removed = thickness + sub;
+		const auto radius = webpreview
+			? st::roundRadiusLarge
+			: (st::msgServiceGiftBoxRadius - thickness + sub);
+		const auto full = QRect(0, 0, media->width(), media->height());
+		const auto inner = full.marginsRemoved(
+			{ removed, removed, removed, removed });
+		if (!webpreview) {
+			auto pen = context.st->msgServiceBg()->p;
+			pen.setWidthF(thickness);
+			p.setPen(pen);
+			p.setBrush(Qt::transparent);
+			p.drawRoundedRect(inner, radius, radius);
+		}
+		auto gradient = QRadialGradient(inner.center(), inner.height() / 2);
+		gradient.setStops({
+			{ 0., gift->backdrop.centerColor },
+			{ 1., gift->backdrop.edgeColor },
+		});
+		p.setBrush(gradient);
+		p.setPen(Qt::NoPen);
+		p.drawRoundedRect(inner, radius, radius);
+
+		const auto width = media->width();
+		const auto shift = width / 12;
+		const auto doubled = width + 2 * shift;
+		const auto top = (webpreview ? 2 : 1) * (-shift);
+		const auto outer = QRect(-shift, top, doubled, doubled);
+		p.setClipRect(inner);
+		Ui::PaintBgPoints(
+			p,
+			Ui::PatternBgPoints(),
+			state->cache,
+			state->pattern.get(),
+			*gift,
+			outer);
+		p.setClipping(false);
+
+		const auto padding = webpreview
+			? QMargins()
+			: st::chatUniqueGiftBadgePadding;
+		p.setClipRect(inner.marginsAdded(padding));
+
+		const auto burned = gift->burned;
+		const auto burnedBg = Info::PeerGifts::BurnedBadgeBg();
+		auto badge = Info::PeerGifts::GiftBadge{
+			.text = (burned
+				? tr::lng_gift_burned_tag(tr::now)
+				: tr::lng_gift_collectible_tag(tr::now)),
+			.bg1 = (burned ? burnedBg : gift->backdrop.edgeColor),
+			.bg2 = (burned ? burnedBg : gift->backdrop.patternColor),
+			.fg = (burned ? st::white->c : gift->backdrop.textColor),
+		};
+		if (state->badgeCache.isNull() || state->badgeKey != badge) {
+			state->badgeKey = badge;
+			state->badgeCache = ValidateRotatedBadge(badge, padding);
+		}
+		const auto badgeRatio = state->badgeCache.devicePixelRatio();
+		const auto badgeWidth = state->badgeCache.width() / badgeRatio;
+		p.drawImage(
+			inner.x() + inner.width() - badgeWidth,
+			inner.y(),
+			state->badgeCache);
+		p.setClipping(false);
+	};
+}
+
+auto GenerateUniqueGiftPreview(
+	not_null<Element*> parent,
+	Element *replacing,
+	std::shared_ptr<Data::UniqueGift> gift)
+-> Fn<void(
+		not_null<MediaGeneric*>,
+		Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](
+			not_null<MediaGeneric*> media,
+			Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
+		const auto sticker = [=] {
+			using Tag = ChatHelpers::StickerLottieSize;
+			return StickerInBubblePart::Data{
+				.sticker = gift->model.document,
+				.size = st::chatIntroStickerSize,
+				.cacheTag = Tag::ChatIntroHelloSticker,
+			};
+		};
+		push(std::make_unique<StickerInBubblePart>(
+			parent,
+			replacing,
+			sticker,
+			st::chatUniquePreviewPadding));
+	};
+}
+
+auto GenerateAuctionPreview(
+	not_null<Element*> parent,
+	Element *replacing,
+	std::shared_ptr<Data::StarGift> gift,
+	Data::UniqueGiftBackdrop backdrop)
+-> Fn<void(
+		not_null<MediaGeneric*>,
+		Fn<void(std::unique_ptr<MediaGenericPart>)>)> {
+	return [=](
+			not_null<MediaGeneric*> media,
+			Fn<void(std::unique_ptr<MediaGenericPart>)> push) {
+		const auto sticker = [=] {
+			using Tag = ChatHelpers::StickerLottieSize;
+			return StickerInBubblePart::Data{
+				.sticker = gift->document,
+				.size = st::chatIntroStickerSize,
+				.cacheTag = Tag::ChatIntroHelloSticker,
+			};
+		};
+		push(std::make_unique<StickerInBubblePart>(
+			parent,
+			replacing,
+			sticker,
+			st::webPageAuctionPreviewPadding));
+		const auto name = gift->unique
+			? Data::UniqueGiftName(*gift->unique)
+			: gift->resellTitle;
+		if (!name.isEmpty()) {
+			push(std::make_unique<TextPartColored>(
+				tr::bold(name),
+				QMargins(0, 0, 0, st::defaultVerticalListSkip),
+				[c = backdrop.textColor](const auto&) { return c; },
+				st::chatUniqueTitle));
+		}
+		if (const auto all = gift->limitedCount) {
+			push(std::make_unique<TextPartColored>(
+				tr::lng_boosts_list_tab_gifts(
+					tr::now,
+					lt_count_decimal,
+					all,
+					tr::marked),
+				QMargins(0, 0, 0, st::webPageAuctionPreviewPadding.top()),
+				[c = backdrop.textColor](const auto&) { return c; },
+				st::chatUniqueTextStyle));
+		}
+	};
+}
+
+auto AuctionBg(
+	not_null<Element*> view,
+	Data::UniqueGiftBackdrop backdrop,
+	std::shared_ptr<Data::StarGift> gift,
+	TimeId startDate,
+	TimeId endDate)
+-> Fn<void(
+		Painter&,
+		const Ui::ChatPaintContext&,
+		not_null<const MediaGeneric*>)> {
+	struct State {
+		std::unique_ptr<Ui::Text::CustomEmoji> pattern;
+		base::flat_map<float64, QImage> cache;
+		std::optional<Ui::StarParticles> particles;
+		std::unique_ptr<base::Timer> timer;
+		crl::time pausedAt = 0;
+		crl::time pauseOffset = 0;
+	};
+	const auto state = std::make_shared<State>();
+	if (gift->unique && gift->unique->pattern.document) {
+		state->pattern = view->history()->owner().customEmojiManager().create(
+			gift->unique->pattern.document,
+			[=] { view->repaint(); },
+			Data::CustomEmojiSizeTag::Large);
+	}
+	state->particles.emplace(
+		Ui::StarParticles::Type::RadialInside,
+		25,
+		st::lineWidth * 8);
+	state->particles->setSpeed(0.05);
+	state->particles->setColor(backdrop.textColor);
+
+	return [=](
+			Painter &p,
+			const Ui::ChatPaintContext &context,
+			not_null<const MediaGeneric*> media) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		const auto webpreview = (media.get() != view->media());
+		const auto radius = webpreview
+			? st::roundRadiusLarge
+			: st::msgServiceGiftBoxRadius;
+		const auto full = QRect(0, 0, media->width(), media->height());
+		auto gradient = QRadialGradient(full.center(), full.height() / 2);
+		gradient.setStops({
+			{ 0., backdrop.centerColor },
+			{ 1., backdrop.edgeColor },
+		});
+		p.setBrush(gradient);
+		p.drawRoundedRect(full, radius, radius);
+
+		/*if (state->pattern) {
+			const auto width = media->width();
+			const auto shift = width / 12;
+			const auto doubled = width + 2 * shift;
+			const auto top = (webpreview ? 2 : 1) * (-shift);
+			const auto outer = QRect(-shift, top, doubled, doubled);
+			p.setClipRect(full);
+			if (gift->unique) {
+				Ui::PaintBgPoints(
+					p,
+					Ui::PatternBgPoints(),
+					state->cache,
+					state->pattern.get(),
+					*gift->unique,
+					outer);
+			}
+			p.setClipping(false);
+		}*/
+
+		if (state->particles) {
+			p.setClipRect(full);
+			state->particles->paint(p, full, context.now, context.paused);
+			p.setClipping(false);
+		}
+
+		const auto now = base::unixtime::now();
+		const auto startsIn = std::max(startDate - now, 0);
+		const auto left = std::max(endDate - now, 0);
+		if (startsIn > 0 || left > 0) {
+			if (!state->timer) {
+				state->timer = std::make_unique<base::Timer>([=] {
+					view->repaint();
+				});
+			}
+			state->timer->callOnce(1000);
+		} else if (state->timer) {
+			state->timer = nullptr;
+		}
+		const auto still = (startsIn > 0) ? startsIn : left;
+		const auto time = (still >= 3600)
+			? u"%1:%2:%3"_q
+			.arg(still / 3600)
+			.arg((still % 3600) / 60, 2, 10, QChar('0'))
+			.arg(still % 60, 2, 10, QChar('0'))
+			: u"%1:%2"_q
+			.arg(still / 60)
+			.arg(still % 60, 2, 10, QChar('0'));
+		const auto text = (startsIn > 0)
+			? tr::lng_auction_join_starts_in(tr::now, lt_time, time)
+			: (left > 0)
+			? time
+			: tr::lng_auctino_preview_finished(tr::now);
+
+		const auto &font = st::webPageAuctionTimeFont;
+		const auto textWidth = font->width(text);
+		const auto padding = st::webPageAuctionTimerPadding;
+		const auto timerWidth = textWidth + rect::m::sum::h(padding);
+		const auto timerHeight = font->height + rect::m::sum::v(padding);
+		const auto timerRadius = timerHeight / 2.;
+		const auto timerRect = QRectF(
+			padding.top(),
+			padding.top(),
+			timerWidth,
+			timerHeight);
+
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::slideFadeOutBg);
+		p.drawRoundedRect(timerRect, timerRadius, timerRadius);
+
+		p.setPen(backdrop.textColor);
+		p.setFont(font);
+		p.drawText(
+			timerRect.x() + padding.left(),
+			timerRect.y() + padding.top() + font->ascent,
+			text);
+	};
+}
+
+std::unique_ptr<MediaGenericPart> MakeGenericButtonPart(
+		const QString &text,
+		QMargins margins,
+		Fn<void()> repaint,
+		ClickHandlerPtr link,
+		QColor bg) {
+	return std::make_unique<ButtonPart>(text, margins, repaint, link, bg);
+}
+
+TextPartColored::TextPartColored(
+	TextWithEntities text,
+	QMargins margins,
+	Fn<QColor(const PaintContext &)> color,
+	const style::TextStyle &st,
+	const base::flat_map<uint16, ClickHandlerPtr> &links,
+	const Ui::Text::MarkedContext &context)
+: MediaGenericTextPart(text, margins, st, links, context)
+, _color(std::move(color)) {
+}
+
+void TextPartColored::setupPen(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context) const {
+	p.setPen(_color(context));
+}
+
+AttributeTable::AttributeTable(
+	std::vector<Entry> entries,
+	QMargins margins,
+	Fn<QColor(const PaintContext &)> labelColor,
+	Fn<QColor(const PaintContext &)> valueColor,
+	const Ui::Text::MarkedContext &context)
+: _margins(margins)
+, _labelColor(std::move(labelColor))
+, _valueColor(std::move(valueColor)) {
+	for (const auto &entry : entries) {
+		_parts.emplace_back();
+		auto &part = _parts.back();
+		part.label.setText(st::chatUniqueTextStyle, entry.label);
+		part.value.setMarkedText(
+			st::chatUniqueTextStyle,
+			entry.value,
+			kMarkupTextOptions,
+			context);
+	}
+}
+
+void AttributeTable::draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const {
+	const auto labelRight = _valueLeft - st::chatUniqueTableSkip;
+	const auto palette = &context.st->serviceTextPalette();
+	auto top = _margins.top();
+	const auto paint = [&](
+			const Ui::Text::String &text,
+			int left,
+			int availableWidth,
+			style::align align) {
+		text.draw(p, {
+			.position = { left, top },
+			.outerWidth = outerWidth,
+			.availableWidth = availableWidth,
+			.align = align,
+			.palette = palette,
+			.spoiler = Ui::Text::DefaultSpoilerCache(),
+			.now = context.now,
+			.pausedEmoji = context.paused || On(PowerSaving::kEmojiChat),
+			.pausedSpoiler = context.paused || On(PowerSaving::kChatSpoiler),
+			.elisionLines = 1,
+		});
+	};
+	const auto forLabel = labelRight - _margins.left();
+	const auto forValue = width() - _valueLeft - _margins.right();
+	for (const auto &part : _parts) {
+		p.setPen(_labelColor(context));
+		paint(part.label, _margins.left(), forLabel, style::al_topright);
+		p.setPen(_valueColor(context));
+		paint(part.value, _valueLeft, forValue, style::al_topleft);
+		top += st::normalFont->height + st::chatUniqueRowSkip;
+	}
+}
+
+TextState AttributeTable::textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const {
+	auto top = _margins.top();
+	for (const auto &part : _parts) {
+		const auto height = st::normalFont->height + st::chatUniqueRowSkip;
+		if (point.y() >= top && point.y() < top + height) {
+			point -= QPoint((outerWidth - width()) / 2 + _valueLeft, top);
+			auto result = TextState();
+			auto forText = request.forText();
+			forText.align = style::al_topleft;
+			result.link = part.value.getState(point, width(), forText).link;
+			return result;
+		}
+		top += height;
+	}
+	return {};
+}
+
+QSize AttributeTable::countOptimalSize() {
+	auto maxLabel = 0;
+	auto maxValue = 0;
+	for (const auto &part : _parts) {
+		maxLabel = std::max(maxLabel, part.label.maxWidth());
+		maxValue = std::max(maxValue, part.value.maxWidth());
+	}
+	const auto skip = st::chatUniqueTableSkip;
+	const auto row = st::normalFont->height + st::chatUniqueRowSkip;
+	const auto height = int(_parts.size()) * row - st::chatUniqueRowSkip;
+	return {
+		_margins.left() + maxLabel + skip + maxValue + _margins.right(),
+		_margins.top() + height + _margins.bottom(),
+	};
+}
+
+QSize AttributeTable::countCurrentSize(int newWidth) {
+	const auto skip = st::chatUniqueTableSkip;
+	const auto width = newWidth - _margins.left() - _margins.right() - skip;
+	auto maxLabel = 0;
+	auto maxValue = 0;
+	for (const auto &part : _parts) {
+		maxLabel = std::max(maxLabel, part.label.maxWidth());
+		maxValue = std::max(maxValue, part.value.maxWidth());
+	}
+	if (width <= 0 || !maxLabel) {
+		_valueLeft = _margins.left();
+	} else if (!maxValue) {
+		_valueLeft = newWidth - _margins.right();
+	} else {
+		_valueLeft = _margins.left()
+			+ int((int64(maxLabel) * width) / (maxLabel + maxValue))
+			+ skip;
+	}
+	return { newWidth, minHeight() };
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_unique_gift.h b/Telegram/SourceFiles/history/view/media/history_view_unique_gift.h
new file mode 100644
index 00000000000000..62b428b4415181
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_unique_gift.h
@@ -0,0 +1,144 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "history/view/media/history_view_media_generic.h"
+
+class Painter;
+
+namespace Data {
+class MediaGiftBox;
+struct UniqueGift;
+struct UniqueGiftBackdrop;
+struct StarGift;
+class Birthday;
+} // namespace Data
+
+namespace Ui {
+struct ChatPaintContext;
+} // namespace Ui
+
+namespace HistoryView {
+
+class Element;
+class MediaGeneric;
+class MediaGenericPart;
+
+[[nodiscard]] auto GenerateUniqueGiftMedia(
+	not_null<Element*> parent,
+	Element *replacing,
+	std::shared_ptr<Data::UniqueGift> gift)
+-> Fn<void(
+	not_null<MediaGeneric*>,
+	Fn<void(std::unique_ptr<MediaGenericPart>)>)>;
+
+[[nodiscard]] auto UniqueGiftBg(
+	not_null<Element*> view,
+	std::shared_ptr<Data::UniqueGift> gift)
+-> Fn<void(
+	Painter&,
+	const Ui::ChatPaintContext&,
+	not_null<const MediaGeneric*>)>;
+
+[[nodiscard]] auto GenerateUniqueGiftPreview(
+	not_null<Element*> parent,
+	Element *replacing,
+	std::shared_ptr<Data::UniqueGift> gift)
+-> Fn<void(
+	not_null<MediaGeneric*>,
+	Fn<void(std::unique_ptr<MediaGenericPart>)>)>;
+
+[[nodiscard]] auto GenerateAuctionPreview(
+	not_null<Element*> parent,
+	Element *replacing,
+	std::shared_ptr<Data::StarGift> gift,
+	Data::UniqueGiftBackdrop backdrop)
+-> Fn<void(
+	not_null<MediaGeneric*>,
+	Fn<void(std::unique_ptr<MediaGenericPart>)>)>;
+
+[[nodiscard]] auto AuctionBg(
+	not_null<Element*> view,
+	Data::UniqueGiftBackdrop backdrop,
+	std::shared_ptr<Data::StarGift> gift,
+	TimeId startDate,
+	TimeId endDate)
+-> Fn<void(
+	Painter&,
+	const Ui::ChatPaintContext&,
+	not_null<const MediaGeneric*>)>;
+
+[[nodiscard]] std::unique_ptr<MediaGenericPart> MakeGenericButtonPart(
+	const QString &text,
+	QMargins margins,
+	Fn<void()> repaint,
+	ClickHandlerPtr link,
+	QColor bg = QColor(0, 0, 0, 0));
+
+class TextPartColored : public MediaGenericTextPart {
+public:
+	TextPartColored(
+		TextWithEntities text,
+		QMargins margins,
+		Fn<QColor(const PaintContext &)> color,
+		const style::TextStyle &st = st::defaultTextStyle,
+		const base::flat_map<uint16, ClickHandlerPtr> &links = {},
+		const Ui::Text::MarkedContext &context = {});
+
+private:
+	void setupPen(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context) const override;
+
+	Fn<QColor(const PaintContext &)> _color;
+
+};
+
+class AttributeTable final : public MediaGenericPart {
+public:
+	struct Entry {
+		QString label;
+		TextWithEntities value;
+	};
+
+	AttributeTable(
+		std::vector<Entry> entries,
+		QMargins margins,
+		Fn<QColor(const PaintContext &)> labelColor,
+		Fn<QColor(const PaintContext &)> valueColor,
+		const Ui::Text::MarkedContext &context = {});
+
+	void draw(
+		Painter &p,
+		not_null<const MediaGeneric*> owner,
+		const PaintContext &context,
+		int outerWidth) const override;
+	TextState textState(
+		QPoint point,
+		StateRequest request,
+		int outerWidth) const override;
+
+	QSize countOptimalSize() override;
+	QSize countCurrentSize(int newWidth) override;
+
+private:
+	struct Part {
+		Ui::Text::String label;
+		Ui::Text::String value;
+	};
+
+	std::vector<Part> _parts;
+	QMargins _margins;
+	Fn<QColor(const PaintContext &)> _labelColor;
+	Fn<QColor(const PaintContext &)> _valueColor;
+	int _valueLeft = 0;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp
index 22cdd47ac791e6..7eb6dd055ccdd5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.cpp
@@ -30,7 +30,7 @@ For license and copyright information please follow this link:
 #include "mainwidget.h"
 #include "apiwrap.h"
 #include "api/api_peer_photo.h"
-#include "settings/settings_information.h" // UpdatePhotoLocally
+#include "settings/sections/settings_information.h" // UpdatePhotoLocally
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -120,16 +120,16 @@ void ShowUserpicSuggestion(
 void ShowSetToast(
 		not_null<Window::SessionController*> controller,
 		const QImage &frame) {
-	const auto text = Ui::Text::Bold(
+	const auto text = tr::bold(
 		tr::lng_profile_changed_photo_title(tr::now)
 	).append('\n').append(
 		tr::lng_profile_changed_photo_about(
 			tr::now,
 			lt_link,
-			Ui::Text::Link(
+			tr::link(
 				tr::lng_profile_changed_photo_link(tr::now),
 				u"tg://settings/edit_profile"_q),
-			Ui::Text::WithEntities)
+			tr::marked)
 	);
 	auto st = std::make_shared<style::Toast>(st::historyPremiumToast);
 	const auto skip = st->padding.top();
@@ -159,7 +159,7 @@ void ShowSetToast(
 		preview->show();
 		preview->setAttribute(Qt::WA_TransparentForMouseEvents);
 		preview->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			QPainter(preview).drawImage(0, 0, copy);
 		}, preview->lifetime());
 	}
@@ -197,8 +197,8 @@ QSize UserpicSuggestion::size() {
 	return { _photo.maxWidth(), _photo.minHeight() };
 }
 
-QString UserpicSuggestion::title() {
-	return QString();
+TextWithEntities UserpicSuggestion::title() {
+	return {};
 }
 
 rpl::producer<QString> UserpicSuggestion::button() {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.h b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.h
index 93aaca380904dd..f9a19581f9913b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_userpic_suggestion.h
@@ -29,7 +29,7 @@ class UserpicSuggestion final : public ServiceBoxContent {
 
 	int top() override;
 	QSize size() override;
-	QString title() override;
+	TextWithEntities title() override;
 	TextWithEntities subtitle() override;
 	rpl::producer<QString> button() override;
 	void draw(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
index 65f9a8cb0df9c8..5acbea74801260 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "history/view/media/history_view_web_page.h"
 
+#include "base/unixtime.h"
 #include "core/application.h"
 #include "countries/countries_instance.h"
 #include "base/qt/qt_key_modifiers.h"
@@ -15,19 +16,20 @@ For license and copyright information please follow this link:
 #include "core/click_handler_types.h"
 #include "core/ui_integration.h"
 #include "data/components/sponsored_messages.h"
-#include "data/stickers/data_custom_emoji.h"
 #include "data/data_file_click_handler.h"
 #include "data/data_photo_media.h"
 #include "data/data_session.h"
 #include "data/data_web_page.h"
 #include "history/view/media/history_view_media_common.h"
-#include "history/view/media/history_view_sticker.h"
+#include "history/view/media/history_view_media_generic.h"
+#include "history/view/media/history_view_unique_gift.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/history_view_message.h"
 #include "history/view/history_view_reply.h"
 #include "history/view/history_view_sponsored_click_handler.h"
 #include "history/history.h"
 #include "history/history_item_components.h"
+#include "history/history_item_helpers.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "menu/menu_sponsored.h"
@@ -48,6 +50,8 @@ constexpr auto kMaxOriginalEntryLines = 8192;
 constexpr auto kFactcheckCollapsedLines = 3;
 constexpr auto kStickerSetLines = 3;
 constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
+constexpr auto kSponsoredUserpicLines = 2;
+constexpr auto kLogEntryPreviewLines = 2;
 
 [[nodiscard]] int ArticleThumbWidth(not_null<PhotoData*> thumb, int height) {
 	const auto size = thumb->location(Data::PhotoSize::Thumbnail);
@@ -73,13 +77,11 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 	const auto spoiler = false;
 	for (const auto &item : data.items) {
 		if (const auto document = std::get_if<DocumentData*>(&item)) {
-			const auto skipPremiumEffect = false;
-			result.push_back(std::make_unique<Data::MediaFile>(
-				parent,
-				*document,
-				skipPremiumEffect,
-				spoiler,
-				/*ttlSeconds = */0));
+			using MediaFile = Data::MediaFile;
+			using Args = MediaFile::Args;
+			const auto data = *document;
+			result.push_back(
+				std::make_unique<Data::MediaFile>(parent, data, Args{}));
 		} else if (const auto photo = std::get_if<PhotoData*>(&item)) {
 			result.push_back(std::make_unique<Data::MediaPhoto>(
 				parent,
@@ -95,38 +97,6 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 	return result;
 }
 
-[[nodiscard]] QString ExtractHash(
-		not_null<WebPageData*> webpage,
-		const TextWithEntities &text) {
-	const auto simplify = [](const QString &url) {
-		auto result = url.split('#')[0].toLower();
-		if (result.endsWith('/')) {
-			result.chop(1);
-		}
-		const auto prefixes = { u"http://"_q, u"https://"_q };
-		for (const auto &prefix : prefixes) {
-			if (result.startsWith(prefix)) {
-				result = result.mid(prefix.size());
-				break;
-			}
-		}
-		return result;
-	};
-	const auto simplified = simplify(webpage->url);
-	for (const auto &entity : text.entities) {
-		const auto link = (entity.type() == EntityType::Url)
-			? text.text.mid(entity.offset(), entity.length())
-			: (entity.type() == EntityType::CustomUrl)
-			? entity.data()
-			: QString();
-		if (simplify(link) == simplified) {
-			const auto i = link.indexOf('#');
-			return (i > 0) ? link.mid(i + 1) : QString();
-		}
-	}
-	return QString();
-}
-
 [[nodiscard]] ClickHandlerPtr IvClickHandler(
 		not_null<WebPageData*> webpage,
 		const TextWithEntities &text) {
@@ -144,15 +114,6 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 	});
 }
 
-[[nodiscard]] ClickHandlerPtr AboutSponsoredClickHandler() {
-	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
-		const auto my = context.other.value<ClickHandlerContext>();
-		if (const auto controller = my.sessionWindow.get()) {
-			Menu::ShowSponsoredAbout(controller->uiShow());
-		}
-	});
-}
-
 [[nodiscard]] QString LookupFactcheckCountryIso2(
 		not_null<HistoryItem*> item) {
 	const auto info = item->Get<HistoryMessageFactcheck>();
@@ -200,8 +161,10 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 
 [[nodiscard]] TextWithEntities PageToPhrase(not_null<WebPageData*> page) {
 	const auto type = page->type;
-	const auto text = Ui::Text::Upper(page->iv
+	const auto text = tr::upper(page->iv
 		? tr::lng_view_button_iv(tr::now)
+		: page->uniqueGift
+		? tr::lng_view_button_collectible(tr::now)
 		: (type == WebPageType::Theme)
 		? tr::lng_view_button_theme(tr::now)
 		: (type == WebPageType::Story)
@@ -226,6 +189,8 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 		? tr::lng_view_button_voice_chat(tr::now)
 		: (type == WebPageType::Livestream)
 		? tr::lng_view_button_voice_chat_channel(tr::now)
+		: (type == WebPageType::ConferenceCall)
+		? tr::lng_view_button_call(tr::now)
 		: (type == WebPageType::Bot)
 		? tr::lng_view_button_bot(tr::now)
 		: (type == WebPageType::User)
@@ -236,14 +201,28 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 		? tr::lng_view_button_emojipack(tr::now)
 		: (type == WebPageType::StickerSet)
 		? tr::lng_view_button_stickerset(tr::now)
+		: (type == WebPageType::ComposeAiTone)
+		? tr::lng_view_button_style(tr::now)
+		: (type == WebPageType::StoryAlbum)
+		? tr::lng_view_button_storyalbum(tr::now)
+		: (type == WebPageType::GiftCollection)
+		? tr::lng_view_button_collection(tr::now)
+		: (type == WebPageType::NewBot)
+		? tr::lng_view_button_newbot(tr::now)
+		: (type == WebPageType::Auction)
+		? ((page->auction
+			&& page->auction->endDate
+			&& page->auction->endDate <= base::unixtime::now())
+			? tr::lng_auction_preview_view_results(tr::now)
+			: (page->auction
+				&& page->auction->auctionGift->auctionStartDate
+				&& (page->auction->auctionGift->auctionStartDate
+				> base::unixtime::now()))
+			? tr::lng_auction_bar_view(tr::now)
+			: tr::lng_auction_preview_join(tr::now))
 		: QString());
 	if (page->iv) {
-		const auto manager = &page->owner().customEmojiManager();
-		const auto &icon = st::historyIvIcon;
-		const auto padding = st::historyIvIconPadding;
-		return Ui::Text::SingleCustomEmoji(
-			manager->registerInternalEmoji(icon, padding)
-		).append(text);
+		return Ui::Text::IconEmoji(&st::historyIvIcon).append(text);
 	}
 	return { text };
 }
@@ -251,6 +230,7 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 [[nodiscard]] bool HasButton(not_null<WebPageData*> webpage) {
 	const auto type = webpage->type;
 	return webpage->iv
+		|| webpage->uniqueGift
 		|| (type == WebPageType::Message)
 		|| (type == WebPageType::Group)
 		|| (type == WebPageType::GroupWithRequest)
@@ -263,6 +243,7 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 		|| (type == WebPageType::User)
 		|| (type == WebPageType::VoiceChat)
 		|| (type == WebPageType::Livestream)
+		|| (type == WebPageType::ConferenceCall)
 		|| (type == WebPageType::BotApp)
 		|| ((type == WebPageType::Theme)
 			&& webpage->document
@@ -272,7 +253,12 @@ constexpr auto kFactcheckAboutDuration = 5 * crl::time(1000);
 		|| ((type == WebPageType::WallPaper)
 			&& webpage->document
 			&& webpage->document->isWallPaper())
-		|| (type == WebPageType::StickerSet);
+		|| (type == WebPageType::StickerSet)
+		|| (type == WebPageType::StoryAlbum)
+		|| (type == WebPageType::GiftCollection)
+		|| (type == WebPageType::ComposeAiTone)
+		|| (type == WebPageType::Auction)
+		|| (type == WebPageType::NewBot);
 }
 
 } // namespace
@@ -287,9 +273,9 @@ WebPage::WebPage(
 	: st::historyPagePreview)
 , _data(data)
 , _flags(flags)
-, _siteName(st::msgMinWidth - _st.padding.left() - _st.padding.right())
-, _title(st::msgMinWidth - _st.padding.left() - _st.padding.right())
-, _description(st::msgMinWidth - _st.padding.left() - _st.padding.right()) {
+, _siteName(st::minPhotoSize - rect::m::sum::h(_st.padding))
+, _title(st::minPhotoSize - rect::m::sum::h(_st.padding))
+, _description(st::minPhotoSize - rect::m::sum::h(_st.padding)) {
 	history()->owner().registerWebPageView(_data, _parent);
 }
 
@@ -314,13 +300,13 @@ void WebPage::setupAdditionalData() {
 			UrlClickHandler::Open(link);
 		});
 		if (!_attach) {
-			const auto maybePhoto = details.mediaPhotoId
-				? session->data().photo(details.mediaPhotoId).get()
-				: nullptr;
 			const auto maybeDocument = details.mediaDocumentId
 				? session->data().document(
 					details.mediaDocumentId).get()
 				: nullptr;
+			const auto maybePhoto = (!maybeDocument && details.mediaPhotoId)
+				? session->data().photo(details.mediaPhotoId).get()
+				: nullptr;
 			_attach = CreateAttach(
 				_parent,
 				maybeDocument,
@@ -364,28 +350,77 @@ void WebPage::setupAdditionalData() {
 			view->setWebpagePart();
 			view->initSize(single);
 		}
+	} else if (_data->type == WebPageType::ComposeAiTone
+			&& _data->composeToneEmojiId) {
+		if (const auto existing = stickerSetData()
+			; existing && !existing->views.empty()) {
+		} else {
+			_additionalData = std::make_unique<AdditionalData>(
+				StickerSetData());
+			const auto raw = stickerSetData();
+			const auto session = &_data->session();
+			const auto box = UnitedLineHeight() * kStickerSetLines;
+			const auto id = _data->composeToneEmojiId;
+			auto &manager = session->data().customEmojiManager();
+			const auto document = session->data().document(id).get();
+			if (document->sticker()) {
+				auto view = std::make_unique<Sticker>(
+					_parent,
+					document,
+					true);
+				view->setWebpagePart();
+				view->initSize(box);
+				raw->views.push_back(std::move(view));
+			} else {
+				manager.resolve(id, this);
+				_composeToneListening = 1;
+			}
+		}
 	} else if (_data->type == WebPageType::Factcheck) {
 		_additionalData = std::make_unique<AdditionalData>(FactcheckData());
 	}
 }
 
+void WebPage::customEmojiResolveDone(not_null<DocumentData*> document) {
+	if (!document->sticker()) {
+		return;
+	}
+	if (_data->composeToneEmojiId != document->id) {
+		return;
+	}
+	const auto raw = stickerSetData();
+	if (!raw) {
+		return;
+	}
+	const auto box = UnitedLineHeight() * kStickerSetLines;
+	auto view = std::make_unique<Sticker>(_parent, document, true);
+	view->setWebpagePart();
+	view->initSize(box);
+	raw->views.clear();
+	raw->views.push_back(std::move(view));
+	history()->owner().requestViewResize(_parent);
+}
+
 QSize WebPage::countOptimalSize() {
 	if (_data->pendingTill || _data->failed) {
 		return { 0, 0 };
 	}
 	setupAdditionalData();
+	_hasLogEntryPreview = hasLogEntryPreview() ? 1 : 0;
 
 	const auto sponsored = sponsoredData();
 	const auto factcheck = factcheckData();
+	const auto stickerSet = stickerSetData();
+	const auto specialRightPix = (stickerSet
+		|| (sponsored && !sponsored->hasMedia && _data->photo));
 
 	// Detect _openButtonWidth before counting paddings.
 	_openButton = Ui::Text::String();
 	if (HasButton(_data)) {
-		const auto context = Core::MarkedTextContext{
+		const auto context = Core::TextContext({
 			.session = &_data->session(),
-			.customEmojiRepaint = [] {},
 			.customEmojiLoopLimit = 1,
-		};
+		});
 		_openButton.setMarkedText(
 			st::semiboldTextStyle,
 			PageToPhrase(_data),
@@ -394,7 +429,7 @@ QSize WebPage::countOptimalSize() {
 	} else if (sponsored && !sponsored->buttonText.isEmpty()) {
 		_openButton.setText(
 			st::semiboldTextStyle,
-			Ui::Text::Upper(sponsored->buttonText));
+			tr::upper(sponsored->buttonText));
 	}
 
 	const auto padding = inBubblePadding() + innerMargin();
@@ -402,10 +437,11 @@ QSize WebPage::countOptimalSize() {
 	if (versionChanged) {
 		_dataVersion = _data->version;
 		_openl = nullptr;
+		_previewLink = nullptr;
 		_attach = nullptr;
 		const auto item = _parent->data();
 		_collage = PrepareCollageMedia(item, _data->collage);
-		const auto min = st::msgMinWidth - rect::m::sum::h(_st.padding);
+		const auto min = st::minPhotoSize - rect::m::sum::h(_st.padding);
 		_siteName = Ui::Text::String(min);
 		_title = Ui::Text::String(min);
 		_description = Ui::Text::String(min);
@@ -490,6 +526,26 @@ QSize WebPage::countOptimalSize() {
 		}
 	}
 
+	if (_hasLogEntryPreview && !_previewLink) {
+		const auto contextId = _parent->data()->fullId();
+		if (_data->photo) {
+			_previewLink = std::make_shared<PhotoOpenClickHandler>(
+				_data->photo,
+				crl::guard(this, [=](FullMsgId id) {
+					_parent->delegate()->elementOpenPhoto(_data->photo, id);
+				}),
+				contextId);
+		} else if (_data->document) {
+			_previewLink = std::make_shared<LambdaClickHandler>(
+				crl::guard(this, [=] {
+					_parent->delegate()->elementOpenDocument(
+						_data->document,
+						contextId,
+						/* showInMediaView */ true);
+				}));
+		}
+	}
+
 	// init layout
 	const auto title = TextUtilities::SingleLine(_data->title.isEmpty()
 		? _data->author
@@ -505,37 +561,81 @@ QSize WebPage::countOptimalSize() {
 	if (sponsored && sponsored->hasMedia) {
 		_asArticle = 0;
 	}
+	if (isLogEntryOriginal()) {
+		_asArticle = 0;
+	}
 
 	// init attach
-	if (!_attach && !_asArticle) {
+	if (!_attach && _data->uniqueGift) {
+		_attach = std::make_unique<MediaGeneric>(
+			_parent,
+			GenerateUniqueGiftPreview(
+				_parent,
+				nullptr,
+				_data->uniqueGift),
+				MediaGenericDescriptor{
+					.maxWidth = st::msgServiceGiftPreview,
+					.paintBgFactory = [=] {
+						return UniqueGiftBg(_parent, _data->uniqueGift);
+					},
+					.expandCurrentWidth = true,
+				});
+	} else if (!_attach && _data->auction) {
+		const auto &gift = _data->auction->auctionGift;
+		const auto backdrop = gift->background
+			? gift->background->backdrop()
+			: Data::UniqueGiftBackdrop();
+		_attach = std::make_unique<MediaGeneric>(
+			_parent,
+			GenerateAuctionPreview(
+				_parent,
+				nullptr,
+				gift,
+				backdrop),
+			MediaGenericDescriptor{
+				.maxWidth = st::msgServiceGiftPreview,
+				.paintBgFactory = [=] {
+					return AuctionBg(
+						_parent,
+						backdrop,
+						gift,
+						_data->auction->auctionGift->auctionStartDate,
+						_data->auction->endDate);
+				},
+				.expandCurrentWidth = true,
+			});
+	} else if (!_attach
+		&& !_asArticle
+		&& (!isLogEntryOriginal()
+			|| (_data->document && !_hasLogEntryPreview))) {
 		_attach = CreateAttach(
 			_parent,
 			_data->document,
-			_data->photo,
+			((!_data->document || _data->photoIsVideoCover)
+				? _data->photo
+				: nullptr),
 			_collage,
 			_data->url);
 	}
 
 	// init strings
-	if (_description.isEmpty() && !_data->description.text.isEmpty()) {
+	if (_description.isEmpty()
+		&& !_data->description.text.isEmpty()
+		&& !_data->uniqueGift
+		&& !_data->auction) {
 		const auto &text = _data->description;
-
-		if (isLogEntryOriginal()) {
-			// Fix layout for small bubbles
-			// (narrow media caption edit log entries).
-			_description = Ui::Text::String(st::minPhotoSize
-				- rect::m::sum::h(padding));
-		}
-		using MarkedTextContext = Core::MarkedTextContext;
-		auto context = MarkedTextContext{
+		using Type = Core::TextContextDetails::HashtagMentionType;
+		auto context = Core::TextContext({
 			.session = &history()->session(),
-			.customEmojiRepaint = [=] { _parent->customEmojiRepaint(); },
-		};
-		if (_data->siteName == u"Twitter"_q) {
-			context.type = MarkedTextContext::HashtagMentionType::Twitter;
-		} else if (_data->siteName == u"Instagram"_q) {
-			context.type = MarkedTextContext::HashtagMentionType::Instagram;
-		}
+			.details = {
+				.type = ((_data->siteName == u"Twitter"_q)
+					? Type::Twitter
+					: (_data->siteName == u"Instagram"_q)
+					? Type::Instagram
+					: Type::Telegram),
+			},
+			.repaint = [=] { _parent->customEmojiRepaint(); },
+		});
 		_description.setMarkedText(
 			st::webPageDescriptionStyle,
 			text,
@@ -547,14 +647,14 @@ QSize WebPage::countOptimalSize() {
 		_siteNameLines = 1;
 		_siteName.setMarkedText(
 			st::webPageTitleStyle,
-			Ui::Text::Link(siteName, _data->url),
+			tr::link(siteName, _data->url),
 			Ui::WebpageTextTitleOptions());
 	}
 	if (_title.isEmpty() && !title.isEmpty()) {
 		if (!_siteNameLines && !_data->url.isEmpty()) {
 			_title.setMarkedText(
 				st::webPageTitleStyle,
-				Ui::Text::Link(title, _data->url),
+				tr::link(title, _data->url),
 				Ui::WebpageTextTitleOptions());
 
 		} else {
@@ -566,7 +666,9 @@ QSize WebPage::countOptimalSize() {
 	}
 
 	// init dimensions
-	const auto skipBlockWidth = _parent->skipBlockWidth();
+	const auto skipBlockWidth = (sponsored && sponsored->hasMedia)
+		? 0
+		: _parent->skipBlockWidth();
 	auto maxWidth = skipBlockWidth;
 	auto minHeight = 0;
 
@@ -587,10 +689,18 @@ QSize WebPage::countOptimalSize() {
 		+ titleMinHeight
 		+ descriptionMinHeight;
 	const auto articlePhotoMaxWidth = _asArticle
-		? st::webPagePhotoDelta
+		? (st::webPagePhotoDelta
 			+ std::max(
 				ArticleThumbWidth(_data->photo, articleMinHeight),
-				lineHeight)
+				lineHeight))
+		: specialRightPix
+		? (st::webPagePhotoDelta
+			+ (lineHeight
+				* (stickerSet
+					? kStickerSetLines
+					: kSponsoredUserpicLines)))
+		: _hasLogEntryPreview
+		? (st::webPagePhotoDelta + lineHeight * kLogEntryPreviewLines)
 		: 0;
 
 	if (!_siteName.isEmpty()) {
@@ -622,10 +732,8 @@ QSize WebPage::countOptimalSize() {
 
 		_attach->initDimensions();
 		const auto bubble = _attach->bubbleMargins();
-		auto maxMediaWidth = _attach->maxWidth() - rect::m::sum::h(bubble);
-		if (isBubbleBottom() && _attach->customInfoLayout()) {
-			maxMediaWidth += skipBlockWidth;
-		}
+		const auto maxMediaWidth = _attach->maxWidth()
+			- rect::m::sum::h(bubble);
 		accumulate_max(maxWidth, maxMediaWidth);
 		minHeight += _attach->minHeight() - rect::m::sum::v(bubble);
 	}
@@ -634,8 +742,9 @@ QSize WebPage::countOptimalSize() {
 		_durationWidth = st::msgDateFont->width(_duration);
 	}
 	if (!_openButton.isEmpty()) {
-		maxWidth += rect::m::sum::h(st::historyPageButtonPadding)
+		const auto w = rect::m::sum::h(st::historyPageButtonPadding)
 			+ _openButton.maxWidth();
+		accumulate_max(maxWidth, w);
 	}
 	maxWidth += rect::m::sum::h(padding);
 	minHeight += rect::m::sum::v(padding);
@@ -669,8 +778,8 @@ QSize WebPage::countCurrentSize(int newWidth) {
 	const auto stickerSet = stickerSetData();
 	const auto factcheck = factcheckData();
 	const auto sponsored = sponsoredData();
-	const auto specialRightPix = ((sponsored && !sponsored->hasMedia)
-		|| stickerSet);
+	const auto specialRightPix = (stickerSet
+		|| (sponsored && !sponsored->hasMedia && _data->photo));
 	const auto lineHeight = UnitedLineHeight();
 	const auto factcheckMetrics = factcheck
 		? computeFactcheckMetrics(_description.countHeight(innerWidth))
@@ -684,14 +793,25 @@ QSize WebPage::countCurrentSize(int newWidth) {
 	}
 	const auto linesMax = factcheck
 		? (factcheckMetrics.lines + 1)
-		: (specialRightPix || isLogEntryOriginal())
+		: (sponsored || isLogEntryOriginal())
 		? kMaxOriginalEntryLines
 		: 5;
 	const auto siteNameHeight = _siteNameLines ? lineHeight : 0;
 	const auto twoTitleLines = 2 * st::webPageTitleFont->height;
 	const auto descriptionLineHeight = st::webPageDescriptionFont->height;
+	if (_hasLogEntryPreview) {
+		_pixw = _pixh = lineHeight * kLogEntryPreviewLines;
+		_titleLines = 0;
+		_descriptionLines = -1;
+		_logPreviewDescHeight = _description.isEmpty()
+			? 0
+			: _description.countDimensions(
+				logEntryGeometry(innerWidth)).height;
+		newHeight = std::max(siteNameHeight + _logPreviewDescHeight, _pixh)
+			+ rect::m::sum::v(padding);
+		return { newWidth, newHeight };
+	}
 	if (asArticle() || specialRightPix) {
-		constexpr auto kSponsoredUserpicLines = 2;
 		_pixh = lineHeight
 			* (stickerSet
 				? kStickerSetLines
@@ -717,7 +837,9 @@ QSize WebPage::countCurrentSize(int newWidth) {
 				newHeight += _titleLines * lineHeight;
 			}
 
-			const auto descriptionHeight = _description.countHeight(wleft);
+			const auto descriptionHeight = _description.countHeight(sponsored
+				? innerWidth
+				: wleft);
 			const auto restLines = (linesMax - _siteNameLines - _titleLines);
 			if (descriptionHeight < restLines * descriptionLineHeight) {
 				// We have height for all the lines.
@@ -874,45 +996,60 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 
 	const auto selected = context.selected();
 	const auto view = parent();
-	const auto from = view->data()->contentColorsFrom();
 	const auto colorIndex = factcheck
 		? 0 // red
 		: (sponsored && sponsored->colorIndex)
 		? sponsored->colorIndex
-		: from
-		? from->colorIndex()
-		: view->colorIndex();
-	const auto cache = context.outbg
-		? stm->replyCache[st->colorPatternIndex(colorIndex)].get()
-		: st->coloredReplyCache(selected, colorIndex).get();
+		: view->contentColorIndex();
+	const auto &colorCollectible = factcheck
+		? nullptr
+		: (sponsored && sponsored->colorIndex)
+		? nullptr
+		: view->contentColorCollectible();
+	const auto colorPattern = colorCollectible
+		? st->collectiblePatternIndex(colorCollectible)
+		: st->colorPatternIndex(colorIndex);
+	const auto useColorCollectible = colorCollectible && !context.outbg;
+	const auto useColorIndex = !context.outbg;
+	const auto cache = useColorCollectible
+		? st->collectibleReplyCache(selected, colorCollectible).get()
+		: useColorIndex
+		? st->coloredReplyCache(selected, colorIndex).get()
+		: stm->replyCache[colorPattern].get();
 	const auto backgroundEmojiId = factcheck
 		? DocumentId()
 		: (sponsored && sponsored->backgroundEmojiId)
 		? sponsored->backgroundEmojiId
-		: from
-		? from->backgroundEmojiId()
-		: DocumentId();
-	const auto backgroundEmoji = backgroundEmojiId
-		? st->backgroundEmojiData(backgroundEmojiId).get()
+		: view->contentBackgroundEmojiId();
+	const auto backgroundEmojiData = backgroundEmojiId
+		? st->backgroundEmojiData(backgroundEmojiId, colorCollectible).get()
 		: nullptr;
-	const auto backgroundEmojiCache = backgroundEmoji
-		? &backgroundEmoji->caches[Ui::BackgroundEmojiData::CacheIndex(
+	const auto backgroundEmojiCache = !backgroundEmojiData
+		? nullptr
+		: useColorCollectible
+		? &backgroundEmojiData->collectibleCaches[colorCollectible]
+		: &backgroundEmojiData->caches[Ui::BackgroundEmojiData::CacheIndex(
 			selected,
 			context.outbg,
 			true,
-			colorIndex + 1)]
-		: nullptr;
+			useColorIndex ? (colorIndex + 1) : 0)];
 	Ui::Text::ValidateQuotePaintCache(*cache, _st);
 	Ui::Text::FillQuotePaint(p, outer, *cache, _st);
-	if (backgroundEmoji) {
+	if (backgroundEmojiData) {
 		ValidateBackgroundEmoji(
 			backgroundEmojiId,
-			backgroundEmoji,
+			colorCollectible,
+			backgroundEmojiData,
 			backgroundEmojiCache,
 			cache,
 			view);
 		if (!backgroundEmojiCache->frames[0].isNull()) {
-			FillBackgroundEmoji(p, outer, false, *backgroundEmojiCache);
+			FillBackgroundEmoji(
+				p,
+				outer,
+				false,
+				*backgroundEmojiCache,
+				backgroundEmojiData->firstGiftFrame);
 		}
 	} else if (factcheck && factcheck->expandable) {
 		const auto &icon = factcheck->expanded ? _st.collapse : _st.expand;
@@ -938,8 +1075,8 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 		const auto viewsCount = stickerSet->views.size();
 		const auto box = _pixh;
 		const auto topLeft = QPoint(inner.left() + paintw - box, tshift);
-		const auto side = std::ceil(std::sqrt(viewsCount));
-		const auto single = box / side;
+		const auto side = int(std::ceil(std::sqrt(viewsCount)));
+		const auto single = side ? (box / side) : box;
 		for (auto i = 0; i < side; i++) {
 			for (auto j = 0; j < side; j++) {
 				const auto index = i * side + j;
@@ -1006,12 +1143,39 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			// as its width only affects the title.
 			paintw -= pw + st::webPagePhotoDelta;
 		}
+	} else if (_hasLogEntryPreview) {
+		const auto pw = _pixw;
+		const auto ph = _pixh;
+		const auto item = _parent->data();
+		const auto image = _data->photo
+			? _data->photo->getReplyPreview(item)
+			: _data->document->getReplyPreview(item);
+		if (image) {
+			const auto to = style::rtlrect(
+				inner.left() + paintw - pw,
+				tshift,
+				pw,
+				ph,
+				width());
+			p.drawPixmap(to.topLeft(), image->pixSingle(
+				to.size(),
+				{
+					.colored = (context.selected()
+						? &st->msgStickerOverlay()
+						: nullptr),
+					.options = Images::Option::RoundSmall,
+					.outer = to.size(),
+				}));
+		}
+		paintw -= pw + st::webPagePhotoDelta;
 	}
 	if (_siteNameLines) {
 		p.setPen(cache->icon);
-		p.setTextPalette(context.outbg
-			? stm->semiboldPalette
-			: st->coloredTextPalette(selected, colorIndex));
+		p.setTextPalette(useColorCollectible
+			? st->collectibleTextPalette(selected, colorCollectible)
+			: useColorIndex
+			? st->coloredTextPalette(selected, colorIndex)
+			: stm->semiboldPalette);
 
 		const auto endskip = _siteName.hasSkipBlock()
 			? _parent->skipBlockWidth()
@@ -1074,7 +1238,7 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			? _parent->skipBlockWidth()
 			: 0;
 		const auto titleWidth = sponsored
-			? (paintw - _pixh - st::webPagePhotoDelta)
+			? (paintw - (_pixh ? (_pixh + st::webPagePhotoDelta) : 0))
 			: paintw;
 		_title.drawLeftElided(
 			p,
@@ -1095,11 +1259,18 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 		const auto endskip = _description.hasSkipBlock()
 			? _parent->skipBlockWidth()
 			: 0;
+		const auto previewGeometry = _hasLogEntryPreview;
+		const auto descriptionWidth = previewGeometry
+			? inner.width()
+			: paintw;
 		_parent->prepareCustomEmojiPaint(p, context, _description);
 		_description.draw(p, {
 			.position = { inner.left(), tshift },
 			.outerWidth = width(),
-			.availableWidth = paintw,
+			.availableWidth = descriptionWidth,
+			.geometry = previewGeometry
+				? logEntryGeometry(descriptionWidth)
+				: Ui::Text::GeometryDescriptor(),
 			.spoiler = Ui::Text::DefaultSpoilerCache(),
 			.now = context.now,
 			.pausedEmoji = context.paused || On(PowerSaving::kEmojiChat),
@@ -1111,7 +1282,9 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			.elisionRemoveFromEnd = (_descriptionLines > 0) ? endskip : 0,
 			.useFullWidth = true,
 		});
-		tshift += (_descriptionLines > 0)
+		tshift += previewGeometry
+			? _logPreviewDescHeight
+			: (_descriptionLines > 0)
 			? (_descriptionLines * lineHeight)
 			: _description.countHeight(paintw);
 	}
@@ -1232,8 +1405,9 @@ void WebPage::draw(Painter &p, const PaintContext &context) const {
 			.position = QPoint(
 				inner.x() + (inner.width() - _openButton.maxWidth()) / 2,
 				end + st::historyPageButtonPadding.top()),
-			.availableWidth = paintw,
+			.availableWidth = inner.width(),
 			.now = context.now,
+			.elisionLines = 1,
 		});
 	}
 }
@@ -1297,6 +1471,17 @@ TextState WebPage::textState(QPoint point, StateRequest request) const {
 			width()).contains(point);
 		paintw -= pw + st::webPagePhotoDelta;
 	}
+	auto inPreview = false;
+	if (_hasLogEntryPreview) {
+		const auto pw = _pixw;
+		inPreview = style::rtlrect(
+			inner.left() + paintw - pw,
+			tshift,
+			pw,
+			_pixh,
+			width()).contains(point);
+		paintw -= pw + st::webPagePhotoDelta;
+	}
 	auto symbolAdd = int(0);
 	if (_siteNameLines) {
 		if (point.y() >= tshift && point.y() < tshift + lineHeight) {
@@ -1334,11 +1519,20 @@ TextState WebPage::textState(QPoint point, StateRequest request) const {
 		tshift += _titleLines * lineHeight;
 	}
 	if (_descriptionLines) {
-		const auto descriptionHeight = (_descriptionLines > 0)
+		const auto descriptionHeight = _hasLogEntryPreview
+			? _logPreviewDescHeight
+			: (_descriptionLines > 0)
 			? _descriptionLines * lineHeight
 			: _description.countHeight(paintw);
 		if (point.y() >= tshift && point.y() < tshift + descriptionHeight) {
-			if (_descriptionLines > 0) {
+			if (_hasLogEntryPreview) {
+				result = TextState(
+					_parent,
+					_description.getState(
+						point - QPoint(inner.left(), tshift),
+						logEntryGeometry(inner.width()),
+						request.forText()));
+			} else if (_descriptionLines > 0) {
 				auto descriptionRequest = Ui::Text::StateRequestElided(
 					request.forText());
 				descriptionRequest.lines = _descriptionLines;
@@ -1364,7 +1558,9 @@ TextState WebPage::textState(QPoint point, StateRequest request) const {
 		tshift += descriptionHeight;
 	}
 	auto isWithinSponsoredMedia = false;
-	if (inThumb) {
+	if (inPreview) {
+		result.link = _previewLink;
+	} else if (inThumb) {
 		result.link = _openl;
 	} else if (_attach) {
 		const auto attachAtTop = hasSponsoredMedia
@@ -1516,7 +1712,7 @@ void WebPage::clickHandlerPressedChanged(
 		}
 		return;
 	}
-	if (p == _openl) {
+	if ((p == _openl) || (sponsoredData() && sponsoredData()->link == p)) {
 		if (pressed) {
 			if (!_ripple) {
 				const auto full = Rect(currentSize());
@@ -1545,6 +1741,15 @@ bool WebPage::enforceBubbleWidth() const {
 		&& (_data->document->isWallPaper() || _data->document->isTheme());
 }
 
+bool WebPage::allowsNarrowBubble() const {
+	return (_attach != nullptr)
+		&& (_data->uniqueGift != nullptr || _data->auction != nullptr);
+}
+
+int WebPage::minBubbleWidthForNarrowBubble() const {
+	return allowsNarrowBubble() ? maxWidth() : 0;
+}
+
 void WebPage::playAnimation(bool autoplay) {
 	if (_attach) {
 		if (autoplay) {
@@ -1625,6 +1830,33 @@ bool WebPage::isLogEntryOriginal() const {
 	return _parent->data()->isAdminLogEntry() && _parent->media() != this;
 }
 
+bool WebPage::hasLogEntryPreview() const {
+	if (!isLogEntryOriginal()) {
+		return false;
+	} else if (_data->photo) {
+		return true;
+	} else if (const auto document = _data->document) {
+		return document->isVideoFile()
+			|| document->isAnimation()
+			|| document->isImage();
+	}
+	return false;
+}
+
+Ui::Text::GeometryDescriptor WebPage::logEntryGeometry(int width) const {
+	const auto narrow = std::max(
+		width - _pixw - st::webPagePhotoDelta,
+		1);
+	const auto narrowLines = kLogEntryPreviewLines - _siteNameLines;
+	return Ui::Text::GeometryDescriptor{
+		.layout = [=](int line) {
+			return Ui::Text::LineGeometry{
+				.width = (line < narrowLines) ? narrow : width,
+			};
+		},
+	};
+}
+
 WebPage::FactcheckMetrics WebPage::computeFactcheckMetrics(
 		int fullHeight) const {
 	const auto possible = fullHeight / st::normalFont->height;
@@ -1659,6 +1891,10 @@ int WebPage::bottomInfoPadding() const {
 
 WebPage::~WebPage() {
 	history()->owner().unregisterWebPageView(_data, _parent);
+	if (_composeToneListening) {
+		_data->session().data().customEmojiManager().unregisterListener(
+			this);
+	}
 	if (_photoMedia) {
 		history()->owner().keepAlive(base::take(_photoMedia));
 		_parent->checkHeavyPart();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.h b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
index e96a534cc462a4..0d828a5fd9d041 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "data/stickers/data_custom_emoji.h"
 #include "history/view/media/history_view_media.h"
 #include "ui/userpic_view.h"
 
@@ -24,7 +25,9 @@ namespace HistoryView {
 
 class Sticker;
 
-class WebPage : public Media {
+class WebPage final
+	: public Media
+	, private Data::CustomEmojiManager::Listener {
 public:
 	WebPage(
 		not_null<Element*> parent,
@@ -94,6 +97,8 @@ class WebPage : public Media {
 		return true;
 	}
 	bool enforceBubbleWidth() const override;
+	bool allowsNarrowBubble() const override;
+	int minBubbleWidthForNarrowBubble() const override;
 
 	Media *attach() const {
 		return _attach.get();
@@ -164,6 +169,9 @@ class WebPage : public Media {
 	[[nodiscard]] QMargins innerMargin() const;
 	[[nodiscard]] int bottomInfoPadding() const;
 	[[nodiscard]] bool isLogEntryOriginal() const;
+	[[nodiscard]] bool hasLogEntryPreview() const;
+	[[nodiscard]] Ui::Text::GeometryDescriptor logEntryGeometry(
+		int width) const;
 
 	[[nodiscard]] ClickHandlerPtr replaceAttachLink(
 		const ClickHandlerPtr &link) const;
@@ -179,12 +187,16 @@ class WebPage : public Media {
 
 	void setupAdditionalData();
 
+	void customEmojiResolveDone(
+		not_null<DocumentData*> document) override;
+
 	const style::QuoteStyle &_st;
 	const not_null<WebPageData*> _data;
 	const MediaWebPageFlags _flags;
 
 	std::vector<std::unique_ptr<Data::Media>> _collage;
 	ClickHandlerPtr _openl;
+	ClickHandlerPtr _previewLink;
 	std::unique_ptr<Media> _attach;
 	mutable std::shared_ptr<Data::PhotoMedia> _photoMedia;
 	mutable std::unique_ptr<Ui::RippleAnimation> _ripple;
@@ -192,8 +204,10 @@ class WebPage : public Media {
 	int _dataVersion = -1;
 	int _siteNameLines = 0;
 	int _descriptionLines = 0;
-	uint32 _titleLines : 31 = 0;
+	uint32 _titleLines : 29 = 0;
 	uint32 _asArticle : 1 = 0;
+	uint32 _composeToneListening : 1 = 0;
+	uint32 _hasLogEntryPreview : 1 = 0;
 
 	Ui::Text::String _siteName;
 	Ui::Text::String _title;
@@ -206,6 +220,7 @@ class WebPage : public Media {
 	mutable QPoint _lastPoint;
 	int _pixw = 0;
 	int _pixh = 0;
+	int _logPreviewDescHeight = 0;
 
 	std::unique_ptr<AdditionalData> _additionalData;
 
diff --git a/Telegram/SourceFiles/history/view/media/menu/history_view_poll_menu.cpp b/Telegram/SourceFiles/history/view/media/menu/history_view_poll_menu.cpp
new file mode 100644
index 00000000000000..111a67d3bed791
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/menu/history_view_poll_menu.cpp
@@ -0,0 +1,802 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/media/menu/history_view_poll_menu.h"
+
+#include "api/api_polls.h"
+#include "api/api_toggling_media.h"
+#include "apiwrap.h"
+#include "boxes/sticker_set_box.h"
+#include "data/data_cloud_file.h"
+#include "data/data_document.h"
+#include "data/data_document_media.h"
+#include "data/data_file_origin.h"
+#include "data/data_location.h"
+#include "data/data_photo.h"
+#include "data/data_photo_media.h"
+#include "data/data_poll.h"
+#include "data/data_session.h"
+#include "data/data_statistics_chart.h"
+#include "data/stickers/data_stickers.h"
+#include "editor/editor_layer_widget.h"
+#include "editor/photo_editor.h"
+#include "history/history_location_manager.h"
+#include "history/view/history_view_group_call_bar.h"
+#include "history/view/history_view_reaction_preview.h"
+#include "history/view/media/history_view_document.h"
+#include "lang/lang_keys.h"
+#include "layout/layout_document_generic_preview.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_session.h"
+#include "poll/poll_media_upload.h"
+#include "statistics/chart_widget.h"
+#include "mainwidget.h"
+#include "settings/settings_common.h"
+#include "storage/localimageloader.h"
+#include "storage/storage_media_prepare.h"
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "ui/chat/attach/attach_prepare.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/vertical_list.h"
+#include "ui/text/format_song_name.h"
+#include "ui/text/format_values.h"
+#include "ui/widgets/dropdown_menu.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/menu/menu_action.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/slide_wrap.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_layers.h"
+#include "styles/style_media_view.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+#include "styles/style_statistics.h"
+#include "styles/style_widgets.h"
+
+namespace HistoryView {
+namespace {
+
+class VotersItem final : public Ui::Menu::ItemBase {
+public:
+	VotersItem(
+		not_null<Ui::Menu::Menu*> parent,
+		const style::Menu &st,
+		int votes,
+		const std::vector<not_null<PeerData*>> &recentVoters);
+
+	not_null<QAction*> action() const override;
+	bool isEnabled() const override;
+
+protected:
+	int contentHeight() const override;
+
+private:
+	void paint(Painter &p);
+
+	const not_null<QAction*> _dummyAction;
+	const style::Menu &_st;
+	const int _votes = 0;
+	const int _height = 0;
+	QImage _userpics;
+	int _userpicsWidth = 0;
+};
+
+VotersItem::VotersItem(
+	not_null<Ui::Menu::Menu*> parent,
+	const style::Menu &st,
+	int votes,
+	const std::vector<not_null<PeerData*>> &recentVoters)
+: ItemBase(parent, st)
+, _dummyAction(Ui::CreateChild<QAction>(parent.get()))
+, _st(st)
+, _votes(votes)
+, _height(st.itemPadding.top()
+	+ st.itemStyle.font->height
+	+ st.itemPadding.bottom()) {
+	auto prepared = PrepareUserpicsInRow(
+		recentVoters,
+		st::historyCommentsUserpics);
+	_userpics = std::move(prepared.image);
+	_userpicsWidth = prepared.width;
+
+	const auto votesText = tr::lng_polls_votes_count(
+		tr::now,
+		lt_count,
+		_votes);
+	const auto spacing = _userpicsWidth > 0
+		? st::normalFont->spacew * 2
+		: 0;
+	const auto textWidth = st.itemStyle.font->width(votesText);
+	const auto &textPadding = st::defaultMenu.itemPadding;
+	const auto minWidth = textPadding.left()
+		+ textWidth
+		+ spacing
+		+ _userpicsWidth
+		+ st.itemPadding.right();
+	setMinWidth(minWidth);
+
+	paintRequest() | rpl::on_next([=] {
+		Painter p(this);
+		paint(p);
+	}, lifetime());
+
+	fitToMenuWidth();
+}
+
+not_null<QAction*> VotersItem::action() const {
+	return _dummyAction;
+}
+
+bool VotersItem::isEnabled() const {
+	return false;
+}
+
+int VotersItem::contentHeight() const {
+	return _height;
+}
+
+void VotersItem::paint(Painter &p) {
+	p.fillRect(0, 0, width(), _height, _st.itemBg);
+
+	const auto votesText = tr::lng_polls_votes_count(
+		tr::now,
+		lt_count,
+		_votes);
+
+	p.setPen(_st.itemFg);
+	p.setFont(_st.itemStyle.font);
+	const auto &textPadding = st::defaultMenu.itemPadding;
+	const auto textY = _st.itemPadding.top()
+		+ _st.itemStyle.font->ascent;
+	p.drawText(textPadding.left(), textY, votesText);
+
+	if (!_userpics.isNull()) {
+		const auto userpicsHeight
+			= _userpics.height() / style::DevicePixelRatio();
+		const auto x = width() - _st.itemPadding.right() - _userpicsWidth;
+		const auto y = (_height - userpicsHeight) / 2;
+		p.drawImage(x, y, _userpics);
+	}
+}
+
+} // namespace
+
+void FillPollAnswerMenu(
+		not_null<Ui::DropdownMenu*> menu,
+		not_null<PollData*> poll,
+		const QByteArray &option,
+		not_null<DocumentData*> document,
+		FullMsgId itemId,
+		not_null<Window::SessionController*> controller) {
+	const auto session = &controller->session();
+	auto addedVotersItem = false;
+	if (const auto answer = poll->answerByOption(option)) {
+		const auto canVote = !option.isEmpty()
+			&& !poll->closed()
+			&& !poll->quiz()
+			&& !poll->voted();
+		if (!canVote && answer->votes > 0) {
+			menu->addAction(
+				base::make_unique_q<VotersItem>(
+					menu->menu(),
+					menu->menu()->st(),
+					answer->votes,
+					answer->recentVoters));
+			menu->addSeparator(&st::expandedMenuSeparator);
+			addedVotersItem = true;
+		}
+	}
+	if (!option.isEmpty()
+		&& !poll->closed()
+		&& !poll->quiz()) {
+		if (poll->voted()
+			&& !poll->revotingDisabled()) {
+			menu->addAction(
+				tr::lng_polls_retract(tr::now),
+				[=] {
+					session->api().polls().sendVotes(
+						itemId,
+						{});
+				},
+				&st::menuIconRetractVote);
+		} else if (!poll->voted()
+			&& poll->sendingVotes.empty()) {
+			menu->addAction(
+				tr::lng_polls_submit_votes(tr::now),
+				[=] {
+					session->api().polls().sendVotes(
+						itemId,
+						{ option });
+				},
+				&st::menuIconSelect);
+			if (!addedVotersItem) {
+				menu->addSeparator(
+					&st::expandedMenuSeparator);
+			}
+		}
+	}
+	const auto show = controller->uiShow();
+	const auto isFaved
+		= document->owner().stickers().isFaved(document);
+	menu->addAction(
+		(isFaved
+			? tr::lng_faved_stickers_remove
+			: tr::lng_faved_stickers_add)(tr::now),
+		[=] {
+			Api::ToggleFavedSticker(
+				show,
+				document,
+				Data::FileOriginStickerSet(
+					Data::Stickers::FavedSetId,
+					0));
+		},
+		isFaved
+			? &st::menuIconUnfave
+			: &st::menuIconFave);
+	if (const auto sticker = document->sticker()) {
+		const auto setId = sticker->set;
+		if (setId.id) {
+			menu->addAction(
+				tr::lng_view_button_stickerset(tr::now),
+				[=] {
+					show->show(Box<StickerSetBox>(
+						show,
+						setId,
+						Data::StickersType::Stickers));
+				},
+				&st::menuIconStickers);
+		}
+	}
+}
+
+void ShowPollStatsBox(
+		not_null<Window::SessionController*> controller,
+		FullMsgId itemId) {
+	controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(tr::lng_polls_stats_title());
+		box->setWidth(st::boxWideWidth);
+
+		const auto content = box->addRow(
+			object_ptr<Ui::VerticalLayout>(box),
+			Margins(0));
+		const auto loadingWrap = content->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				content,
+				object_ptr<Ui::VerticalLayout>(content)));
+		loadingWrap->toggle(true, anim::type::instant);
+		const auto loading = loadingWrap->entity();
+		const auto resultWrap = content->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				content,
+				object_ptr<Ui::VerticalLayout>(content)));
+		resultWrap->toggle(false, anim::type::instant);
+		const auto result = resultWrap->entity();
+
+		auto icon = ::Settings::CreateLottieIcon(
+			loading,
+			{ .name = u"stats"_q, .sizeOverride = st::normalBoxLottieSize },
+			st::settingsBlockedListIconPadding);
+		loading->add(std::move(icon.widget));
+		auto startAnimation = std::move(icon.animate);
+		box->showFinishes(
+		) | rpl::take(1) | rpl::on_next([=]() mutable {
+			startAnimation(anim::repeat::loop);
+		}, loading->lifetime());
+		loading->add(
+			object_ptr<Ui::FlatLabel>(
+				loading,
+				tr::lng_stats_loading(),
+				st::changePhoneTitle),
+			st::changePhoneTitlePadding + st::boxRowPadding,
+			style::al_top);
+		loading->add(
+			object_ptr<Ui::FlatLabel>(
+				loading,
+				tr::lng_stats_loading_subtext(),
+				st::statisticsLoadingSubtext),
+			st::changePhoneDescriptionPadding + st::boxRowPadding,
+			style::al_top
+		)->setTryMakeSimilarLines(true);
+		Ui::AddSkip(loading, st::settingsBlockedListIconPadding.top());
+		const auto finishLoading = [=] {
+			loading->clear();
+			loadingWrap->toggle(false, anim::type::instant);
+			resultWrap->toggle(true, anim::type::instant);
+		};
+		const auto showError = [=](QString error) {
+			finishLoading();
+			result->clear();
+			result->add(
+				object_ptr<Ui::FlatLabel>(
+					result,
+					error.isEmpty()
+						? tr::lng_polls_votes_none(tr::now)
+						: std::move(error),
+					st::defaultFlatLabel),
+				st::boxRowPadding + st::statisticsLayerMargins,
+				style::al_center);
+		};
+
+		controller->session().api().polls().requestStats(
+			itemId,
+			crl::guard(box, [=](Data::StatisticalGraph graph) {
+				if (graph.chart) {
+					finishLoading();
+					result->clear();
+					const auto chart = result->add(
+						object_ptr<Statistic::ChartWidget>(result),
+						st::statisticsLayerMargins);
+					chart->setChartData(
+						std::move(graph.chart),
+						Statistic::ChartViewType::Linear);
+					chart->setTitle(tr::lng_notification_reactions_poll_votes());
+					Statistic::FixCacheForHighDPIChartWidget(result);
+				} else {
+					showError(!graph.error.isEmpty()
+						? graph.error
+						: tr::lng_polls_votes_none(tr::now));
+				}
+			}),
+			crl::guard(box, [=](QString error) {
+				showError(std::move(error));
+			}));
+
+		box->addButton(tr::lng_box_ok(), [=] {
+			box->closeBox();
+		});
+	}));
+}
+
+namespace {
+
+void AddRemoveAction(
+		not_null<Ui::DropdownMenu*> menu,
+		Fn<void()> remove) {
+	menu->addAction(
+		base::make_unique_q<Ui::Menu::Action>(
+			menu->menu(),
+			st::menuWithIconsAttention,
+			Ui::Menu::CreateAction(
+				menu->menu().get(),
+				tr::lng_box_remove(tr::now),
+				std::move(remove)),
+			&st::menuIconDeleteAttention,
+			&st::menuIconDeleteAttention));
+}
+
+} // namespace
+
+void ShowPollStickerPreview(
+		not_null<Window::SessionController*> controller,
+		not_null<DocumentData*> document,
+		Fn<void()> replace,
+		Fn<void()> remove) {
+	ShowStickerPreview(controller, FullMsgId(), document, [=](
+			not_null<Ui::DropdownMenu*> menu) {
+		menu->addAction(
+			tr::lng_attach_replace(tr::now),
+			replace,
+			&st::menuIconReplace);
+		AddRemoveAction(menu, remove);
+	});
+}
+
+void ShowPollPhotoPreview(
+		not_null<Window::SessionController*> controller,
+		not_null<PhotoData*> photo,
+		Fn<void()> replace,
+		Fn<void()> edit,
+		Fn<void()> remove) {
+	ShowPhotoPreview(controller, FullMsgId(), photo, [=](
+			not_null<Ui::DropdownMenu*> menu) {
+		menu->addAction(
+			tr::lng_attach_replace(tr::now),
+			replace,
+			&st::menuIconReplace);
+		menu->addAction(
+			tr::lng_context_draw(tr::now),
+			edit,
+			&st::menuIconDraw);
+		AddRemoveAction(menu, remove);
+	});
+}
+
+void ShowPollDocumentPreview(
+		not_null<Window::SessionController*> controller,
+		not_null<DocumentData*> document,
+		Fn<void()> replace,
+		Fn<void()> remove) {
+	const auto isSong = document->isSong();
+	const auto songData = isSong ? document->song() : nullptr;
+	const auto media = isSong
+		? document->createMediaView()
+		: nullptr;
+	if (media) {
+		media->thumbnailWanted(Data::FileOrigin());
+	}
+
+	const auto docGeneric = Layout::DocumentGenericPreview::Create(
+		document);
+	const auto docIcon = docGeneric.icon();
+	const auto docIconColor = docGeneric.color;
+	const auto docExt = [&] {
+		auto ext = docGeneric.ext;
+		const auto maxW = st::mediaviewFileIconSize
+			- st::mediaviewFileExtPadding * 2;
+		if (st::mediaviewFileExtFont->width(ext) > maxW) {
+			ext = st::mediaviewFileExtFont->elided(ext, maxW, Qt::ElideMiddle);
+		}
+		return ext;
+	}();
+
+	const auto maxTextW = st::mediaviewFileSize.width()
+		- st::mediaviewFileIconSize
+		- st::mediaviewFilePadding * 3;
+	const auto docName = [&] {
+		auto name = (isSong && songData)
+			? Ui::Text::FormatSongName(
+				document->filename(),
+				songData->title,
+				songData->performer).string()
+			: document->filename().isEmpty()
+			? tr::lng_mediaview_doc_image(tr::now)
+			: document->filename();
+		if (st::mediaviewFileNameFont->width(name) > maxTextW) {
+			name = st::mediaviewFileNameFont->elided(
+				name,
+				maxTextW,
+				Qt::ElideMiddle);
+		}
+		return name;
+	}();
+	const auto docSize = [&] {
+		auto text = Ui::FormatSizeText(document->size);
+		if (st::mediaviewFont->width(text) > maxTextW) {
+			text = st::mediaviewFont->elided(text, maxTextW);
+		}
+		return text;
+	}();
+
+	ShowWidgetPreview(controller, [=](not_null<Ui::RpWidget*> preview) {
+		const auto shadowExtend = st::boxRoundShadow.extend;
+		const auto fullW = st::mediaviewFileSize.width()
+			+ rect::m::sum::h(shadowExtend);
+		const auto fullH = st::mediaviewFileSize.height()
+			+ rect::m::sum::v(shadowExtend);
+		preview->resize(fullW, fullH);
+
+		if (media) {
+			document->session().downloaderTaskFinished(
+			) | rpl::on_next([=] {
+				preview->update();
+			}, preview->lifetime());
+		}
+
+		preview->paintRequest() | rpl::on_next([=] {
+			auto p = Painter(preview);
+			const auto outer = preview->rect() - shadowExtend;
+
+			Ui::Shadow::paint(
+				p,
+				outer,
+				preview->width(),
+				st::boxRoundShadow);
+			{
+				auto hq = PainterHighQualityEnabler(p);
+				p.setPen(Qt::NoPen);
+				p.setBrush(st::windowBg);
+				p.drawRoundedRect(outer, st::boxRadius, st::boxRadius);
+			}
+
+			const auto padding = st::mediaviewFilePadding;
+			const auto iconSize = st::mediaviewFileIconSize;
+			const auto iconRect = QRect(
+				outer.x() + padding,
+				outer.y() + padding,
+				iconSize,
+				iconSize);
+
+			const auto coverDrawn = isSong
+				&& DrawThumbnailAsSongCover(
+					p,
+					st::songCoverOverlayFg,
+					media,
+					iconRect);
+			if (!coverDrawn) {
+				p.setPen(Qt::NoPen);
+				p.fillRect(iconRect, docIconColor);
+				if (docIcon) {
+					docIcon->paint(
+						p,
+						iconRect.x()
+							+ (iconRect.width() - docIcon->width()),
+						iconRect.y(),
+						preview->width());
+				}
+				if (!docExt.isEmpty()) {
+					p.setPen(st::activeButtonFg);
+					p.setFont(st::mediaviewFileExtFont);
+					const auto extW
+						= st::mediaviewFileExtFont->width(docExt);
+					p.drawText(
+						iconRect.x()
+							+ (iconRect.width() - extW) / 2,
+						iconRect.y()
+							+ st::mediaviewFileExtTop
+							+ st::mediaviewFileExtFont->ascent,
+						docExt);
+				}
+			}
+			if (isSong && !coverDrawn) {
+				auto hq = PainterHighQualityEnabler(p);
+				p.setPen(Qt::NoPen);
+				p.setBrush(st::msgFileInBg);
+				p.drawEllipse(iconRect);
+				st::historyFileInPlay.paintInCenter(p, iconRect);
+			}
+
+			const auto textX = outer.x() + 2 * padding + iconSize;
+			p.setPen(st::windowFg);
+			p.setFont(st::mediaviewFileNameFont);
+			p.drawText(
+				textX,
+				outer.y() + padding
+					+ st::mediaviewFileNameTop
+					+ st::mediaviewFileNameFont->ascent,
+				docName);
+
+			p.setPen(st::windowSubTextFg);
+			p.setFont(st::mediaviewFont);
+			p.drawText(
+				textX,
+				outer.y() + padding
+					+ st::mediaviewFileSizeTop
+					+ st::mediaviewFont->ascent,
+				docSize);
+		}, preview->lifetime());
+	}, [=](not_null<Ui::DropdownMenu*> menu) {
+		menu->addAction(
+			tr::lng_attach_replace(tr::now),
+			replace,
+			&st::menuIconReplace);
+		AddRemoveAction(menu, remove);
+	});
+}
+
+void ShowPollGeoPreview(
+		not_null<Window::SessionController*> controller,
+		Data::LocationPoint point,
+		Fn<void()> replace,
+		Fn<void()> remove) {
+	const auto session = &controller->session();
+	const auto cloudImage = session->data().location(point);
+	const auto view = cloudImage->createView();
+	cloudImage->load(session, Data::FileOrigin());
+
+	ShowWidgetPreview(controller, [=](
+			not_null<Ui::RpWidget*> preview) {
+		const auto body = preview->parentWidget()->size();
+		const auto skip = st::mediaPreviewPhotoSkip;
+		const auto maxSide = std::min(
+			body.width() - 2 * skip,
+			body.height() - 2 * skip);
+		const auto side = std::min(maxSide, st::locationSize.width());
+		const auto scaled = QSize(
+			side,
+			(side * st::locationSize.height()
+				/ st::locationSize.width()));
+		const auto shadowExtend = st::boxRoundShadow.extend;
+		const auto fullW = scaled.width()
+			+ rect::m::sum::h(shadowExtend);
+		const auto fullH = scaled.height()
+			+ rect::m::sum::v(shadowExtend);
+		preview->resize(fullW, fullH);
+
+		session->downloaderTaskFinished(
+		) | rpl::on_next([=] {
+			preview->update();
+		}, preview->lifetime());
+
+		preview->paintRequest() | rpl::on_next([=] {
+			auto p = Painter(preview);
+			const auto outer = preview->rect() - shadowExtend;
+
+			Ui::Shadow::paint(
+				p,
+				outer,
+				preview->width(),
+				st::boxRoundShadow);
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::windowBg);
+			const auto radius = st::boxRadius;
+			p.drawRoundedRect(outer, radius, radius);
+
+			if (!view->isNull()) {
+				auto path = QPainterPath();
+				path.addRoundedRect(outer, radius, radius);
+				p.setClipPath(path);
+				p.drawImage(outer, view->scaled(
+					outer.size() * style::DevicePixelRatio(),
+					Qt::KeepAspectRatioByExpanding,
+					Qt::SmoothTransformation));
+				p.setClipping(false);
+				const auto paintMarker = [&](const style::icon &icon) {
+					icon.paint(
+						p,
+						outer.x()
+							+ (outer.width() - icon.width()) / 2,
+						outer.y()
+							+ (outer.height() / 2) - icon.height(),
+						preview->width());
+				};
+				paintMarker(st::historyMapPoint);
+				paintMarker(st::historyMapPointInner);
+			}
+		}, preview->lifetime());
+	}, [=](not_null<Ui::DropdownMenu*> menu) {
+		menu->addAction(
+			tr::lng_open_link(tr::now),
+			[=] { LocationClickHandler(point).onClick({}); },
+			&st::menuIconAddress);
+		if (replace) {
+			menu->addAction(
+				tr::lng_attach_replace(tr::now),
+				replace,
+				&st::menuIconReplace);
+		}
+		if (remove) {
+			AddRemoveAction(menu, remove);
+		}
+	});
+}
+
+void EditPollPhoto(
+		not_null<Window::SessionController*> controller,
+		not_null<PhotoData*> photo,
+		Fn<void(Ui::PreparedList)> done) {
+	const auto photoMedia = photo->createMediaView();
+	const auto large = photoMedia->image(Data::PhotoSize::Large);
+	if (!large) {
+		return;
+	}
+	const auto previewWidth = st::sendMediaPreviewSize;
+	const auto fileImage = std::make_shared<Image>(*large);
+	auto callback = [=](const Editor::PhotoModifications &mods) {
+		if (!mods) {
+			return;
+		}
+		const auto large = photoMedia->image(Data::PhotoSize::Large);
+		if (!large) {
+			return;
+		}
+		auto copy = large->original();
+		auto list = Storage::PrepareMediaFromImage(
+			std::move(copy),
+			QByteArray(),
+			previewWidth);
+
+		using ImageInfo = Ui::PreparedFileInformation::Image;
+		auto &file = list.files.front();
+		const auto image = std::get_if<ImageInfo>(
+			&file.information->media);
+		image->modifications = mods;
+		Storage::UpdateImageDetails(
+			file,
+			previewWidth,
+			PhotoSideLimit(true));
+		Storage::ApplyModifications(list);
+		done(std::move(list));
+	};
+	const auto parent = controller->content().get();
+	auto editor = base::make_unique_q<Editor::PhotoEditor>(
+		parent,
+		&controller->window(),
+		fileImage,
+		Editor::PhotoModifications());
+	const auto raw = editor.get();
+	auto layer = std::make_unique<Editor::LayerWidget>(
+		parent,
+		std::move(editor));
+	Editor::InitEditorLayer(layer.get(), raw, std::move(callback));
+	controller->showLayer(
+		std::move(layer),
+		Ui::LayerOption::KeepOther);
+}
+
+bool ShowPollMediaPreview(
+		not_null<Window::SessionController*> controller,
+		const std::shared_ptr<PollMediaUpload::PollMediaState> &media,
+		PollMediaActions actions) {
+	if (media->uploading) {
+		actions.remove();
+		return true;
+	}
+	const auto document = media->media.document;
+	const auto photo = media->media.photo;
+	if (document && document->sticker()) {
+		ShowPollStickerPreview(
+			controller,
+			document,
+			std::move(actions.chooseSticker),
+			std::move(actions.remove));
+		return true;
+	} else if (photo) {
+		ShowPollPhotoPreview(
+			controller,
+			photo,
+			std::move(actions.choosePhotoOrVideo),
+			[controller, photo, editPhoto = std::move(actions.editPhoto)] {
+				EditPollPhoto(
+					controller,
+					photo,
+					std::move(editPhoto));
+			},
+			std::move(actions.remove));
+		return true;
+	} else if (document && document->isVideoFile()) {
+		ShowPollDocumentPreview(
+			controller,
+			document,
+			std::move(actions.choosePhotoOrVideo),
+			std::move(actions.remove));
+		return true;
+	} else if (document) {
+		ShowPollDocumentPreview(
+			controller,
+			document,
+			std::move(actions.chooseDocument),
+			std::move(actions.remove));
+		return true;
+	} else if (media->media.geo) {
+		ShowPollGeoPreview(
+			controller,
+			*media->media.geo,
+			nullptr,
+			std::move(actions.remove));
+		return true;
+	}
+	return false;
+}
+
+base::unique_qptr<ChatHelpers::TabbedPanel> CreatePollStickerPanel(
+		not_null<QWidget*> parent,
+		not_null<Window::SessionController*> controller) {
+	using Selector = ChatHelpers::TabbedSelector;
+	using Descriptor = ChatHelpers::TabbedSelectorDescriptor;
+
+	auto panel = base::make_unique_q<ChatHelpers::TabbedPanel>(
+		parent,
+		controller,
+		object_ptr<Selector>(
+			nullptr,
+			Descriptor{
+				.show = controller->uiShow(),
+				.st = st::backgroundEmojiPan,
+				.level = Window::GifPauseReason::Layer,
+				.mode = Selector::Mode::StickersOnly,
+				.features = {
+					.megagroupSet = false,
+					.stickersSettings = false,
+					.openStickerSets = false,
+				},
+			}));
+	panel->setDesiredHeightValues(
+		0.,
+		st::emojiPanMinHeight,
+		st::emojiPanMinHeight);
+	panel->hide();
+	return panel;
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/menu/history_view_poll_menu.h b/Telegram/SourceFiles/history/view/media/menu/history_view_poll_menu.h
new file mode 100644
index 00000000000000..32709bb61f6462
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/menu/history_view_poll_menu.h
@@ -0,0 +1,99 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/unique_qptr.h"
+
+namespace Data {
+class LocationPoint;
+} // namespace Data
+
+namespace PollMediaUpload {
+struct PollMediaState;
+} // namespace PollMediaUpload
+
+struct PollData;
+class DocumentData;
+class PhotoData;
+
+namespace ChatHelpers {
+class TabbedPanel;
+} // namespace ChatHelpers
+
+namespace Ui {
+class DropdownMenu;
+struct PreparedList;
+} // namespace Ui
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace HistoryView {
+
+struct PollMediaActions {
+	Fn<void()> choosePhotoOrVideo;
+	Fn<void()> chooseDocument;
+	Fn<void()> chooseSticker;
+	Fn<void(Ui::PreparedList)> editPhoto;
+	Fn<void()> remove;
+};
+
+void FillPollAnswerMenu(
+	not_null<Ui::DropdownMenu*> menu,
+	not_null<PollData*> poll,
+	const QByteArray &option,
+	not_null<DocumentData*> document,
+	FullMsgId itemId,
+	not_null<Window::SessionController*> controller);
+
+void ShowPollStatsBox(
+	not_null<Window::SessionController*> controller,
+	FullMsgId itemId);
+
+void ShowPollStickerPreview(
+	not_null<Window::SessionController*> controller,
+	not_null<DocumentData*> document,
+	Fn<void()> replace,
+	Fn<void()> remove);
+
+void ShowPollPhotoPreview(
+	not_null<Window::SessionController*> controller,
+	not_null<PhotoData*> photo,
+	Fn<void()> replace,
+	Fn<void()> edit,
+	Fn<void()> remove);
+
+void ShowPollDocumentPreview(
+	not_null<Window::SessionController*> controller,
+	not_null<DocumentData*> document,
+	Fn<void()> replace,
+	Fn<void()> remove);
+
+void ShowPollGeoPreview(
+	not_null<Window::SessionController*> controller,
+	Data::LocationPoint point,
+	Fn<void()> replace = nullptr,
+	Fn<void()> remove = nullptr);
+
+void EditPollPhoto(
+	not_null<Window::SessionController*> controller,
+	not_null<PhotoData*> photo,
+	Fn<void(Ui::PreparedList)> done);
+
+[[nodiscard]] bool ShowPollMediaPreview(
+	not_null<Window::SessionController*> controller,
+	const std::shared_ptr<PollMediaUpload::PollMediaState> &media,
+	PollMediaActions actions);
+
+[[nodiscard]] base::unique_qptr<ChatHelpers::TabbedPanel>
+CreatePollStickerPanel(
+	not_null<QWidget*> parent,
+	not_null<Window::SessionController*> controller);
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
index c1be784a2b3803..130b8eb778eb61 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.cpp
@@ -14,6 +14,8 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_group_call_bar.h"
 #include "core/click_handler_types.h"
 #include "data/stickers/data_custom_emoji.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_message_reactions.h"
 #include "data/data_peer.h"
 #include "data/data_user.h"
@@ -23,7 +25,9 @@ For license and copyright information please follow this link:
 #include "ui/text/text_custom_emoji.h"
 #include "ui/chat/chat_style.h"
 #include "ui/effects/reaction_fly_animation.h"
+#include "ui/effects/ripple_animation.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/power_saving.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
@@ -41,6 +45,37 @@ constexpr auto kMaxNicePerRow = 5;
 	return serviceBg;
 }
 
+void PaintTagShape(QPainter &p, QSizeF size, const QColor &color) {
+	const auto arrow = st::reactionInlineTagArrow;
+	const auto rradius = st::reactionInlineTagRightRadius * 1.;
+	const auto radius = st::reactionInlineTagLeftRadius - rradius;
+	auto pen = QPen(color);
+	pen.setWidthF(rradius * 2.);
+	pen.setJoinStyle(Qt::RoundJoin);
+	const auto rect = QRectF(QPointF(), size).marginsRemoved(
+		{ rradius, rradius, rradius, rradius });
+	const auto right = rect.x() + rect.width();
+	const auto bottom = rect.y() + rect.height();
+	auto path = QPainterPath();
+	path.moveTo(rect.x() + radius, rect.y());
+	path.lineTo(right - arrow, rect.y());
+	path.lineTo(right, rect.y() + rect.height() / 2);
+	path.lineTo(right - arrow, bottom);
+	path.lineTo(rect.x() + radius, bottom);
+	path.arcTo(
+		QRectF(rect.x(), bottom - radius * 2, radius * 2, radius * 2),
+		270,
+		-90);
+	path.lineTo(rect.x(), rect.y() + radius);
+	path.arcTo(
+		QRectF(rect.x(), rect.y(), radius * 2, radius * 2),
+		180,
+		-90);
+	path.closeSubpath();
+	p.setPen(pen);
+	p.drawPath(path);
+}
+
 } // namespace
 
 struct InlineList::Button {
@@ -59,6 +94,22 @@ struct InlineList::Button {
 	bool tag = false;
 };
 
+struct InlineList::RippleEffect : Ui::RippleAnimation {
+	RippleEffect(
+		const style::RippleAnimation &st,
+		QImage mask,
+		Fn<void()> update,
+		ReactionId buttonId,
+		int width)
+	: RippleAnimation(st, std::move(mask), std::move(update))
+	, buttonId(std::move(buttonId))
+	, width(width) {
+	}
+
+	ReactionId buttonId;
+	int width = 0;
+};
+
 InlineList::InlineList(
 	not_null<::Data::Reactions*> owner,
 	Fn<ClickHandlerPtr(ReactionId)> handlerFactory,
@@ -180,6 +231,21 @@ void InlineList::layoutButtons() {
 	_buttons = std::move(buttons);
 }
 
+InlineList::Dimension InlineList::countDimension(int width) const {
+	using Flag = InlineListData::Flag;
+	const auto inBubble = (_data.flags & Flag::InBubble);
+	const auto centered = (_data.flags & Flag::Centered);
+	const auto useWidth = centered
+		? std::min(width, st::chatGiveawayWidth)
+		: width;
+	const auto left = inBubble
+		? st::reactionInlineInBubbleLeft
+		: centered
+		? ((width - useWidth) / 2)
+		: 0;
+	return { .left = left, .width = useWidth };
+}
+
 InlineList::Button InlineList::prepareButtonWithId(const ReactionId &id) {
 	auto result = Button{ .id = id, .paid = id.paid()};
 	if (const auto customId = id.custom()) {
@@ -210,8 +276,13 @@ void InlineList::setButtonCount(Button &button, int count) {
 	button.userpics = nullptr;
 	button.count = count;
 	button.tag = false;
-	button.text = Lang::FormatCountToShort(count).string;
-	button.textWidth = st::semiboldFont->width(button.text);
+	if (count == 0) {
+		button.text = QString();
+		button.textWidth = 0;
+	} else {
+		button.text = Lang::FormatCountToShort(count).string;
+		button.textWidth = st::semiboldFont->width(button.text);
+	}
 }
 
 void InlineList::setButtonUserpics(
@@ -258,9 +329,7 @@ QSize InlineList::countOptimalSize() {
 	if (_buttons.empty()) {
 		return _skipBlock;
 	}
-	const auto left = (_data.flags & InlineListData::Flag::InBubble)
-		? st::reactionInlineInBubbleLeft
-		: 0;
+	const auto left = countDimension(width()).left;
 	auto x = left;
 	const auto between = st::reactionInlineBetween;
 	const auto padding = st::reactionInlinePadding;
@@ -292,6 +361,8 @@ QSize InlineList::countOptimalSize() {
 				+ (button.textWidth ? st::reactionInlineSkip : 0))
 			: button.userpics
 			? (widthBaseUserpics + userpicsWidth(button))
+			: button.count == 0
+			? (rect::m::sum::h(padding) + size - st::reactionInlineEmptySkip)
 			: (widthBaseCount + button.textWidth);
 		button.geometry.setSize({ width, height });
 		x += width + between;
@@ -308,23 +379,42 @@ QSize InlineList::countCurrentSize(int newWidth) {
 	}
 	using Flag = InlineListData::Flag;
 	const auto between = st::reactionInlineBetween;
-	const auto inBubble = (_data.flags & Flag::InBubble);
-	const auto left = inBubble ? st::reactionInlineInBubbleLeft : 0;
+	const auto dimension = countDimension(newWidth);
+	const auto left = dimension.left;
+	const auto width = dimension.width;
+	const auto centered = (_data.flags & Flag::Centered);
 	auto x = left;
 	auto y = 0;
-	for (auto &button : _buttons) {
+	const auto recenter = [&](int beforeIndex) {
+		const auto added = centered ? (left + width + between - x) : 0;
+		if (added <= 0) {
+			return;
+		}
+		const auto shift = added / 2;
+		for (auto j = beforeIndex; j != 0;) {
+			auto &button = _buttons[--j];
+			if (button.geometry.y() != y) {
+				break;
+			}
+			button.geometry.translate(shift, 0);
+		}
+	};
+	for (auto i = 0, count = int(_buttons.size()); i != count; ++i) {
+		auto &button = _buttons[i];
 		const auto size = button.geometry.size();
-		if (x > left && x + size.width() > newWidth) {
+		if (x > left && x + size.width() > left + width) {
+			recenter(i);
 			x = left;
 			y += size.height() + between;
 		}
 		button.geometry = QRect(QPoint(x, y), size);
 		x += size.width() + between;
 	}
+	recenter(_buttons.size());
 	const auto &last = _buttons.back().geometry;
 	const auto height = y + last.height();
 	const auto right = last.x() + last.width() + _skipBlock.width();
-	const auto add = (right > newWidth) ? _skipBlock.height() : 0;
+	const auto add = (right > width) ? _skipBlock.height() : 0;
 	return { newWidth, height + add };
 }
 
@@ -464,6 +554,26 @@ void InlineList::paint(
 			: (context.selected()
 				? st->historyFileInIconFgSelected()
 				: st->historyFileInIconFg());
+		if (_ripple && _ripple->buttonId == button.id) {
+			if (!bubbleReady || _ripple->width != geometry.width()) {
+				_ripple.reset();
+			} else {
+				const auto savedOpacity = p.opacity();
+				p.setOpacity(1.);
+				auto rippleColor = textFg.color();
+				rippleColor.setAlpha(25);
+				_ripple->paint(
+					p,
+					geometry.x(),
+					geometry.y(),
+					outerWidth,
+					&rippleColor);
+				if (_ripple->empty()) {
+					_ripple.reset();
+				}
+				p.setOpacity(savedOpacity);
+			}
+		}
 		const auto image = QRect(
 			inner.topLeft() + QPoint(skip, skip),
 			QSize(st::reactionInlineImage, st::reactionInlineImage));
@@ -561,48 +671,21 @@ QImage InlineList::PrepareTagBg(QColor tagBg, QColor dotBg) {
 	result.fill(Qt::transparent);
 	auto p = QPainter(&result);
 
-	auto path = QPainterPath();
-	const auto arrow = st::reactionInlineTagArrow;
-	const auto rradius = st::reactionInlineTagRightRadius * 1.;
-	const auto radius = st::reactionInlineTagLeftRadius - rradius;
-	auto pen = QPen(tagBg);
-	pen.setWidthF(rradius * 2.);
-	pen.setJoinStyle(Qt::RoundJoin);
-	const auto rect = QRectF(0, 0, width, height).marginsRemoved(
-		{ rradius, rradius, rradius, rradius });
-
-	const auto right = rect.x() + rect.width();
-	const auto bottom = rect.y() + rect.height();
-	path.moveTo(rect.x() + radius, rect.y());
-	path.lineTo(right - arrow, rect.y());
-	path.lineTo(right, rect.y() + rect.height() / 2);
-	path.lineTo(right - arrow, bottom);
-	path.lineTo(rect.x() + radius, bottom);
-	path.arcTo(
-		QRectF(rect.x(), bottom - radius * 2, radius * 2, radius * 2),
-		270,
-		-90);
-	path.lineTo(rect.x(), rect.y() + radius);
-	path.arcTo(
-		QRectF(rect.x(), rect.y(), radius * 2, radius * 2),
-		180,
-		-90);
-	path.closeSubpath();
-
-	const auto dsize = st::reactionInlineTagDot;
-	const auto dot = QRectF(
-		right - st::reactionInlineTagDotSkip - dsize,
-		rect.y() + (rect.height() - dsize) / 2.,
-		dsize,
-		dsize);
-
 	auto hq = PainterHighQualityEnabler(p);
 	p.setCompositionMode(QPainter::CompositionMode_Source);
-	p.setPen(pen);
 	p.setBrush(tagBg);
-	p.drawPath(path);
+	PaintTagShape(p, QSizeF(width, height), tagBg);
 
 	if (dotBg.alpha() > 0) {
+		const auto rradius = st::reactionInlineTagRightRadius * 1.;
+		const auto rect = QRectF(0, 0, width, height).marginsRemoved(
+			{ rradius, rradius, rradius, rradius });
+		const auto dsize = st::reactionInlineTagDot;
+		const auto dot = QRectF(
+			rect.x() + rect.width() - st::reactionInlineTagDotSkip - dsize,
+			rect.y() + (rect.height() - dsize) / 2.,
+			dsize,
+			dsize);
 		p.setPen(Qt::NoPen);
 		p.setBrush(dotBg);
 		p.drawEllipse(dot);
@@ -667,10 +750,9 @@ void InlineList::paintSingleBg(
 bool InlineList::getState(
 		QPoint point,
 		not_null<TextState*> outResult) const {
-	const auto left = (_data.flags & InlineListData::Flag::InBubble)
-		? st::reactionInlineInBubbleLeft
-		: 0;
-	if (!QRect(left, 0, width() - left, height()).contains(point)) {
+	const auto dimension = countDimension(width());
+	const auto left = dimension.left;
+	if (!QRect(left, 0, dimension.width, height()).contains(point)) {
 		return false;
 	}
 	for (const auto &button : _buttons) {
@@ -682,6 +764,8 @@ bool InlineList::getState(
 					QVariant::fromValue(button.id));
 				_owner->preloadAnimationsFor(button.id);
 			}
+			_lastPoint = point - button.geometry.topLeft();
+			_lastPointButton = button.id;
 			outResult->link = button.link;
 			return true;
 		}
@@ -689,6 +773,56 @@ bool InlineList::getState(
 	return false;
 }
 
+void InlineList::clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed,
+		Fn<void()> repaint) {
+	if (pressed) {
+		const auto id = ReactionIdOfLink(handler);
+		if (id.empty()) {
+			return;
+		}
+		const auto i = ranges::find(_buttons, id, &Button::id);
+		if (i == end(_buttons)) {
+			return;
+		}
+		const auto &geometry = i->geometry;
+		if (!_ripple
+			|| _ripple->buttonId != id
+			|| _ripple->width != geometry.width()) {
+			const auto mask = [&] {
+				if (areTags()) {
+					const auto s = geometry.size();
+					return Ui::RippleAnimation::MaskByDrawer(
+						s,
+						false,
+						[&](QPainter &p) {
+							PaintTagShape(
+								p,
+								QSizeF(s.width(), s.height()),
+								QColor(255, 255, 255));
+						});
+				}
+				return Ui::RippleAnimation::RoundRectMask(
+					geometry.size(),
+					geometry.height() / 2);
+			}();
+			_ripple = std::make_unique<RippleEffect>(
+				st::defaultRippleAnimation,
+				std::move(mask),
+				std::move(repaint),
+				id,
+				geometry.width());
+		}
+		const auto point = (_lastPointButton == id)
+			? _lastPoint
+			: QPoint(geometry.width() / 2, geometry.height() / 2);
+		_ripple->add(point);
+	} else if (_ripple) {
+		_ripple->lastStop();
+	}
+}
+
 void InlineList::animate(
 		Ui::ReactionFlyAnimationArgs &&args,
 		Fn<void()> repaint) {
@@ -705,24 +839,8 @@ void InlineList::animate(
 
 void InlineList::resolveUserpicsImage(const Button &button) const {
 	const auto userpics = button.userpics.get();
-	const auto regenerate = [&] {
-		if (!userpics) {
-			return false;
-		} else if (userpics->image.isNull()) {
-			return true;
-		}
-		for (auto &entry : userpics->list) {
-			const auto peer = entry.peer;
-			auto &view = entry.view;
-			const auto wasView = view.cloud.get();
-			if (peer->userpicUniqueKey(view) != entry.uniqueKey
-				|| view.cloud.get() != wasView) {
-				return true;
-			}
-		}
-		return false;
-	}();
-	if (!regenerate) {
+	if (!userpics
+		|| !NeedRegenerateUserpics(userpics->image, userpics->list)) {
 		return;
 	}
 	GenerateUserpicsInRow(
@@ -792,11 +910,38 @@ void InlineList::continueAnimations(base::flat_map<
 	}
 }
 
-InlineListData InlineListDataFromMessage(not_null<Message*> message) {
+InlineListData InlineListDataFromMessage(not_null<Element*> view) {
 	using Flag = InlineListData::Flag;
-	const auto item = message->data();
+	const auto item = view->data();
 	auto result = InlineListData();
 	result.reactions = item->reactionsWithLocal();
+
+	const auto shouldAddEmptyPaidButton = [&] {
+		if (view->context() == Context::ChatPreview) {
+			return false;
+		}
+		if (result.reactions.empty()) {
+			return false;
+		}
+		const auto hasPaidReaction = ranges::any_of(
+			result.reactions,
+			[](const MessageReaction &r) { return r.id.paid(); });
+		if (hasPaidReaction) {
+			return false;
+		}
+		if (const auto channel = item->history()->peer->asChannel()) {
+			return channel->allowedReactions().paidEnabled;
+		} else if (const auto chat = item->history()->peer->asChat()) {
+			return chat->allowedReactions().paidEnabled;
+		}
+		return false;
+	}();
+
+	if (shouldAddEmptyPaidButton) {
+		result.reactions.insert(
+			result.reactions.begin(),
+			MessageReaction{ .id = ReactionId::Paid(), .count = 0 });
+	}
 	if (const auto user = item->history()->peer->asUser()) {
 		// Always show userpics, we have all information.
 		result.recent.reserve(result.reactions.size());
@@ -838,10 +983,37 @@ InlineListData InlineListDataFromMessage(not_null<Message*> message) {
 			}
 		}
 	}
-	result.flags = (message->hasOutLayout() ? Flag::OutLayout : Flag())
-		| (message->embedReactionsInBubble() ? Flag::InBubble : Flag())
-		| (item->reactionsAreTags() ? Flag::Tags : Flag());
+	result.flags = (view->hasOutLayout() ? Flag::OutLayout : Flag())
+		| (view->embedReactionsInBubble() ? Flag::InBubble : Flag())
+		| (item->reactionsAreTags() ? Flag::Tags : Flag())
+		| (item->isService() ? Flag::Centered : Flag());
 	return result;
 }
 
-} // namespace HistoryView
+ReactionId ReactionIdOfLink(const ClickHandlerPtr &link) {
+	return link
+		? link->property(kReactionsCountEmojiProperty).value<ReactionId>()
+		: ReactionId();
+}
+
+ReactionCount ReactionCountOfLink(
+		HistoryItem *item,
+		const ClickHandlerPtr &link) {
+	const auto id = ReactionIdOfLink(link);
+	if (!item || !id) {
+		return {};
+	}
+	const auto groups = &item->history()->owner().groups();
+	if (const auto group = groups->find(item)) {
+		item = group->items.front();
+	}
+	const auto &list = item->reactions();
+	const auto i = ranges::find(list, id, &Data::MessageReaction::id);
+	if (i == end(list) || !i->count) {
+		return {};
+	}
+	const auto formatted = Lang::FormatCountToShort(i->count);
+	return { .count = i->count, .shortened = formatted.shortened };
+}
+
+} // namespace HistoryView::Reactions
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.h
index be7aa4e6473abe..44625784116898 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions.h
@@ -26,7 +26,7 @@ class CustomEmoji;
 
 namespace HistoryView {
 using PaintContext = Ui::ChatPaintContext;
-class Message;
+class Element;
 struct TextState;
 struct UserpicInRow;
 } // namespace HistoryView
@@ -42,6 +42,7 @@ struct InlineListData {
 		OutLayout = 0x02,
 		Flipped   = 0x04,
 		Tags      = 0x08,
+		Centered  = 0x10,
 	};
 	friend inline constexpr bool is_flag_type(Flag) { return true; };
 	using Flags = base::flags<Flag>;
@@ -83,6 +84,10 @@ class InlineList final : public Object {
 	[[nodiscard]] bool getState(
 		QPoint point,
 		not_null<TextState*> outResult) const;
+	void clickHandlerPressedChanged(
+		const ClickHandlerPtr &handler,
+		bool pressed,
+		Fn<void()> repaint);
 
 	void animate(
 		Ui::ReactionFlyAnimationArgs &&args,
@@ -99,12 +104,17 @@ class InlineList final : public Object {
 	[[nodiscard]] static QImage PrepareTagBg(QColor tagBg, QColor dotBg);
 
 private:
+	struct Dimension {
+		int left = 0;
+		int width = 0;
+	};
 	struct Userpics {
 		QImage image;
 		std::vector<UserpicInRow> list;
 		bool someNotLoaded = false;
 	};
 	struct Button;
+	struct RippleEffect;
 
 	void layout();
 	void layoutButtons();
@@ -131,6 +141,7 @@ class InlineList final : public Object {
 	void validateTagBg(const QColor &color) const;
 
 	QSize countOptimalSize() override;
+	[[nodiscard]] Dimension countDimension(int width) const;
 
 	const not_null<::Data::Reactions*> _owner;
 	const Fn<ClickHandlerPtr(ReactionId)> _handlerFactory;
@@ -143,10 +154,23 @@ class InlineList final : public Object {
 	mutable QImage _customCache;
 	mutable int _customSkip = 0;
 	bool _hasCustomEmoji = false;
+	mutable std::unique_ptr<RippleEffect> _ripple;
+	mutable QPoint _lastPoint;
+	mutable ReactionId _lastPointButton;
 
 };
 
 [[nodiscard]] InlineListData InlineListDataFromMessage(
-	not_null<Message*> message);
+	not_null<Element*> view);
 
-} // namespace HistoryView
+[[nodiscard]] ReactionId ReactionIdOfLink(const ClickHandlerPtr &link);
+
+struct ReactionCount {
+	int count = 0;
+	bool shortened = false;
+};
+[[nodiscard]] ReactionCount ReactionCountOfLink(
+	HistoryItem *item,
+	const ClickHandlerPtr &link);
+
+} // namespace HistoryView::Reactions
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp
index 9f2759f36ba952..eb2bd2c58e01a9 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp
@@ -848,7 +848,7 @@ void SetupManagerList(
 		items
 	) | rpl::filter([=](HistoryItem *item) {
 		return (item != state->item);
-	}) | rpl::start_with_next([=](HistoryItem *item) {
+	}) | rpl::on_next([=](HistoryItem *item) {
 		state->item = item;
 		if (!item) {
 			return;
@@ -871,11 +871,11 @@ void SetupManagerList(
 				session
 			) | rpl::skip(
 				1
-			) | rpl::start_with_next(push, state->sessionLifetime);
+			) | rpl::on_next(push, state->sessionLifetime);
 
 			session->changes().messageUpdates(
 				Data::MessageUpdate::Flag::Destroyed
-			) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+			) | rpl::on_next([=](const Data::MessageUpdate &update) {
 				if (update.item == state->item) {
 					state->item = nullptr;
 					state->timer.cancel();
@@ -885,7 +885,7 @@ void SetupManagerList(
 			session->data().itemDataChanges(
 			) | rpl::filter([=](not_null<HistoryItem*> item) {
 				return (item == state->item);
-			}) | rpl::start_with_next(push, state->sessionLifetime);
+			}) | rpl::on_next(push, state->sessionLifetime);
 
 			const auto &reactions = session->data().reactions();
 			rpl::merge(
@@ -895,7 +895,7 @@ void SetupManagerList(
 				reactions.favoriteUpdates(),
 				reactions.myTagsUpdates(),
 				reactions.tagsUpdates()
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				if (!state->timer.isActive()) {
 					state->timer.callOnce(kRefreshListDelay);
 				}
@@ -906,7 +906,7 @@ void SetupManagerList(
 			state->peerLifetime = rpl::combine(
 				Data::PeerAllowedReactionsValue(peer),
 				Data::UniqueReactionsLimitValue(peer)
-			) | rpl::start_with_next(push);
+			) | rpl::on_next(push);
 		} else {
 			push();
 		}
@@ -915,7 +915,7 @@ void SetupManagerList(
 	manager->faveRequests(
 	) | rpl::filter([=] {
 		return (state->session != nullptr);
-	}) | rpl::start_with_next([=](const Data::ReactionId &id) {
+	}) | rpl::on_next([=](const Data::ReactionId &id) {
 		state->session->data().reactions().setFavorite(id);
 		manager->updateButton({});
 	}, manager->lifetime());
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.h
index 4a1842d995f63b..75e6d45384b07b 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.h
@@ -55,6 +55,7 @@ struct ButtonParameters {
 	QPoint center;
 	QPoint pointer;
 	QPoint globalPointer;
+	int reactionsHeight = 0;
 	int reactionsCount = 1;
 	int visibleTop = 0;
 	int visibleBottom = 0;
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp
index f925dcb90a3ea1..73c16d55cd7b49 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.cpp
@@ -8,21 +8,32 @@ For license and copyright information please follow this link:
 #include "history/view/reactions/history_view_reactions_list.h"
 
 #include "history/view/reactions/history_view_reactions_tabs.h"
+#include "boxes/moderate_messages_box.h"
 #include "boxes/peer_list_box.h"
 #include "boxes/peers/prepare_short_info_box.h"
+#include "info/info_memento.h"
+#include "info/profile/info_profile_widget.h"
 #include "window/window_session_controller.h"
 #include "history/history_item.h"
 #include "history/history.h"
 #include "api/api_who_reacted.h"
 #include "ui/controls/who_reacted_context_action.h"
+#include "ui/layers/generic_box.h"
 #include "ui/text/text_custom_emoji.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/painter.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_message_reaction_id.h"
 #include "main/main_session.h"
 #include "data/data_session.h"
 #include "data/data_peer.h"
+#include "data/data_chat.h"
+#include "data/data_channel.h"
 #include "lang/lang_keys.h"
+#include "styles/style_boxes.h"
+#include "styles/style_menu_icons.h"
 
 namespace HistoryView::Reactions {
 namespace {
@@ -38,10 +49,14 @@ class Row final : public PeerListRow {
 		uint64 id,
 		not_null<PeerData*> peer,
 		const Ui::Text::CustomEmojiFactory &factory,
+		ReactionId reaction,
 		QStringView reactionEntityData,
 		Fn<void(Row*)> repaint,
 		Fn<bool()> paused);
 
+	[[nodiscard]] const ReactionId &reaction() const;
+	[[nodiscard]] bool isReactionRow() const;
+
 	QSize rightActionSize() const override;
 	QMargins rightActionMargins() const override;
 	bool rightActionDisabled() const override;
@@ -54,6 +69,7 @@ class Row final : public PeerListRow {
 		bool actionSelected) override;
 
 private:
+	ReactionId _reaction;
 	std::unique_ptr<Ui::Text::CustomEmoji> _custom;
 	Fn<bool()> _paused;
 
@@ -62,8 +78,8 @@ class Row final : public PeerListRow {
 class Controller final : public PeerListController {
 public:
 	Controller(
-		not_null<Window::SessionController*> window,
-		not_null<HistoryItem*> item,
+		not_null<Window::SessionNavigation*> window,
+		FullMsgId itemId,
 		const ReactionId &selected,
 		rpl::producer<ReactionId> switches,
 		std::shared_ptr<Api::WhoReadList> whoReadIds);
@@ -71,11 +87,31 @@ class Controller final : public PeerListController {
 	Main::Session &session() const override;
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override;
 	void loadMoreRows() override;
 
+	std::unique_ptr<PeerListRow> createRestoredRow(
+		not_null<PeerData*> peer) override;
+
+	std::unique_ptr<PeerListState> saveState() const override;
+	void restoreState(std::unique_ptr<PeerListState> state) override;
+
 private:
 	using AllEntry = std::pair<not_null<PeerData*>, Data::ReactionId>;
 
+	struct SavedState : SavedStateBase {
+		ReactionId shownReaction;
+		base::flat_map<std::pair<PeerId, ReactionId>, uint64> idsMap;
+		uint64 idsCounter = 0;
+		std::vector<AllEntry> all;
+		QString allOffset;
+		std::vector<not_null<PeerData*>> filtered;
+		QString filteredOffset;
+		bool wasLoading = false;
+	};
+
 	void fillWhoRead();
 	void loadMore(const ReactionId &reaction);
 	bool appendRow(not_null<PeerData*> peer, ReactionId reaction);
@@ -83,19 +119,21 @@ class Controller final : public PeerListController {
 		not_null<PeerData*> peer,
 		ReactionId reaction) const;
 	void showReaction(const ReactionId &reaction);
+	void applyReactionsRemoved(const Data::ReactionsRemoved &update);
 
 	[[nodiscard]] uint64 id(
 		not_null<PeerData*> peer,
 		const ReactionId &reaction) const;
 
-	const not_null<Window::SessionController*> _window;
-	const not_null<HistoryItem*> _item;
+	const not_null<Window::SessionNavigation*> _window;
+	const not_null<PeerData*> _peer;
+	const FullMsgId _itemId;
 	const Ui::Text::CustomEmojiFactory _factory;
+	const std::shared_ptr<Api::WhoReadList> _whoReadIds;
+	const std::vector<not_null<PeerData*>> _whoRead;
 	MTP::Sender _api;
 
 	ReactionId _shownReaction;
-	std::shared_ptr<Api::WhoReadList> _whoReadIds;
-	std::vector<not_null<PeerData*>> _whoRead;
 
 	mutable base::flat_map<std::pair<PeerId, ReactionId>, uint64> _idsMap;
 	mutable uint64 _idsCounter = 0;
@@ -110,20 +148,46 @@ class Controller final : public PeerListController {
 
 };
 
+[[nodiscard]] std::vector<not_null<PeerData*>> ResolveWhoRead(
+		not_null<Window::SessionNavigation*> window,
+		const std::shared_ptr<Api::WhoReadList> &whoReadIds) {
+	if (!whoReadIds || whoReadIds->list.empty()) {
+		return {};
+	}
+	auto result = std::vector<not_null<PeerData*>>();
+	auto &owner = window->session().data();
+	for (const auto &peerWithDate : whoReadIds->list) {
+		if (const auto peer = owner.peerLoaded(peerWithDate.peer)) {
+			result.push_back(peer);
+		}
+	}
+	return result;
+}
+
 Row::Row(
 	uint64 id,
 	not_null<PeerData*> peer,
 	const Ui::Text::CustomEmojiFactory &factory,
+	ReactionId reaction,
 	QStringView reactionEntityData,
 	Fn<void(Row*)> repaint,
 	Fn<bool()> paused)
 : PeerListRow(peer, id)
+, _reaction(std::move(reaction))
 , _custom(reactionEntityData.isEmpty()
 	? nullptr
-	: factory(reactionEntityData, [=] { repaint(this); }))
+	: factory(reactionEntityData, { .repaint = [=] { repaint(this); } }))
 , _paused(std::move(paused)) {
 }
 
+const ReactionId &Row::reaction() const {
+	return _reaction;
+}
+
+bool Row::isReactionRow() const {
+	return !_reaction.empty();
+}
+
 QSize Row::rightActionSize() const {
 	const auto size = Ui::Emoji::GetSizeNormal() / style::DevicePixelRatio();
 	return _custom ? QSize(size, size) : QSize();
@@ -166,24 +230,33 @@ void Row::rightActionPaint(
 }
 
 Controller::Controller(
-	not_null<Window::SessionController*> window,
-	not_null<HistoryItem*> item,
+	not_null<Window::SessionNavigation*> window,
+	FullMsgId itemId,
 	const ReactionId &selected,
 	rpl::producer<ReactionId> switches,
 	std::shared_ptr<Api::WhoReadList> whoReadIds)
 : _window(window)
-, _item(item)
+, _peer(window->session().data().peer(itemId.peer))
+, _itemId(itemId)
 , _factory(Data::ReactedMenuFactory(&window->session()))
+, _whoReadIds(whoReadIds)
+, _whoRead(ResolveWhoRead(window, _whoReadIds))
 , _api(&window->session().mtp())
-, _shownReaction(selected)
-, _whoReadIds(whoReadIds) {
+, _shownReaction(selected) {
 	std::move(
 		switches
 	) | rpl::filter([=](const ReactionId &reaction) {
 		return (_shownReaction != reaction);
-	}) | rpl::start_with_next([=](const ReactionId &reaction) {
+	}) | rpl::on_next([=](const ReactionId &reaction) {
 		showReaction(reaction);
 	}, lifetime());
+	session().data().reactionsRemoved(
+	) | rpl::filter([=](const Data::ReactionsRemoved &update) {
+		return ((update.peer == _peer) || (update.peer->id == _peer->id))
+			&& (!update.msgId || update.msgId == _itemId.msg);
+	}) | rpl::on_next([=](const Data::ReactionsRemoved &update) {
+		applyReactionsRemoved(update);
+	}, lifetime());
 }
 
 Main::Session &Controller::session() const {
@@ -225,7 +298,7 @@ void Controller::showReaction(const ReactionId &reaction) {
 		}) | ranges::views::transform(
 			&AllEntry::first
 		) | ranges::to_vector;
-		for (const auto peer : _filtered) {
+		for (const auto &peer : _filtered) {
 			appendRow(peer, _shownReaction);
 		}
 		_filteredOffset = QString();
@@ -237,6 +310,40 @@ void Controller::showReaction(const ReactionId &reaction) {
 	delegate()->peerListRefreshRows();
 }
 
+void Controller::applyReactionsRemoved(
+		const Data::ReactionsRemoved &update) {
+	const auto participantId = update.participant->id;
+
+	const auto allWas = _all.size();
+	_all.erase(
+		ranges::remove_if(_all, [&](const AllEntry &entry) {
+			return entry.first->id == participantId;
+		}),
+		end(_all));
+
+	const auto filteredWas = _filtered.size();
+	_filtered.erase(
+		ranges::remove_if(_filtered, [&](not_null<PeerData*> peer) {
+			return peer->id == participantId;
+		}),
+		end(_filtered));
+
+	auto removed = (allWas != _all.size())
+		|| (filteredWas != _filtered.size());
+	for (auto i = delegate()->peerListFullRowsCount(); i != 0;) {
+		const auto row = delegate()->peerListRowAt(--i);
+		if (row->peer()->id == participantId
+			&& static_cast<Row*>(row.get())->isReactionRow()) {
+			delegate()->peerListRemoveRow(row);
+			removed = true;
+		}
+	}
+	if (removed) {
+		setDescriptionText(QString());
+		delegate()->peerListRefreshRows();
+	}
+}
+
 uint64 Controller::id(
 		not_null<PeerData*> peer,
 		const ReactionId &reaction) const {
@@ -248,14 +355,6 @@ uint64 Controller::id(
 }
 
 void Controller::fillWhoRead() {
-	if (_whoReadIds && !_whoReadIds->list.empty() && _whoRead.empty()) {
-		auto &owner = _window->session().data();
-		for (const auto &peerWithDate : _whoReadIds->list) {
-			if (const auto peer = owner.peerLoaded(peerWithDate.peer)) {
-				_whoRead.push_back(peer);
-			}
-		}
-	}
 	for (const auto &peer : _whoRead) {
 		appendRow(peer, ReactionId());
 	}
@@ -271,6 +370,60 @@ void Controller::loadMoreRows() {
 	loadMore(_shownReaction);
 }
 
+std::unique_ptr<PeerListRow> Controller::createRestoredRow(
+		not_null<PeerData*> peer) {
+	if (_shownReaction.emoji() == u"read"_q) {
+		return createRow(peer, Data::ReactionId());
+	} else if (_shownReaction.empty()) {
+		const auto i = ranges::find(_all, peer, &AllEntry::first);
+		const auto reaction = (i != end(_all)) ? i->second : _shownReaction;
+		return createRow(peer, reaction);
+	}
+	return createRow(peer, _shownReaction);
+}
+
+std::unique_ptr<PeerListState> Controller::saveState() const {
+	auto result = PeerListController::saveState();
+
+	auto my = std::make_unique<SavedState>();
+	my->shownReaction = _shownReaction;
+	my->idsMap = _idsMap;
+	my->idsCounter = _idsCounter;
+	my->all = _all;
+	my->allOffset = _allOffset;
+	my->filtered = _filtered;
+	my->filteredOffset = _filteredOffset;
+	my->wasLoading = (_loadRequestId != 0);
+	result->controllerState = std::move(my);
+	return result;
+}
+
+void Controller::restoreState(std::unique_ptr<PeerListState> state) {
+	auto typeErasedState = state
+		? state->controllerState.get()
+		: nullptr;
+	if (const auto my = dynamic_cast<SavedState*>(typeErasedState)) {
+		if (const auto requestId = base::take(_loadRequestId)) {
+			_api.request(requestId).cancel();
+		}
+		_shownReaction = my->shownReaction;
+		_idsMap = std::move(my->idsMap);
+		_idsCounter = my->idsCounter;
+		_all = std::move(my->all);
+		_allOffset = std::move(my->allOffset);
+		_filtered = std::move(my->filtered);
+		_filteredOffset = std::move(my->filteredOffset);
+		if (my->wasLoading) {
+			loadMoreRows();
+		}
+		PeerListController::restoreState(std::move(state));
+		if (delegate()->peerListFullRowsCount()) {
+			setDescriptionText(QString());
+			delegate()->peerListRefreshRows();
+		}
+	}
+}
+
 void Controller::loadMore(const ReactionId &reaction) {
 	if (reaction.emoji() == u"read"_q) {
 		loadMore(ReactionId());
@@ -290,8 +443,8 @@ void Controller::loadMore(const ReactionId &reaction) {
 		| (reaction.empty() ? Flag(0) : Flag::f_reaction);
 	_loadRequestId = _api.request(MTPmessages_GetMessageReactionsList(
 		MTP_flags(flags),
-		_item->history()->peer->input,
-		MTP_int(_item->id),
+		_peer->input(),
+		MTP_int(_itemId.msg),
 		Data::ReactionToMTP(reaction),
 		MTP_string(offset),
 		MTP_int(offset.isEmpty() ? kPerPageFirst : kPerPage)
@@ -309,9 +462,12 @@ void Controller::loadMore(const ReactionId &reaction) {
 				reaction.match([&](const MTPDmessagePeerReaction &data) {
 					const auto peer = sessionData->peerLoaded(
 						peerFromMTP(data.vpeer_id()));
+					if (!peer) {
+						return;
+					}
 					const auto reaction = Data::ReactionFromMTP(
 						data.vreaction());
-					if (peer && (!shown || appendRow(peer, reaction))) {
+					if (!shown || appendRow(peer, reaction)) {
 						if (filtered) {
 							_filtered.emplace_back(peer);
 						} else {
@@ -331,9 +487,48 @@ void Controller::loadMore(const ReactionId &reaction) {
 void Controller::rowClicked(not_null<PeerListRow*> row) {
 	const auto window = _window;
 	const auto peer = row->peer();
+	const auto originPeer = _peer;
+	const auto originMsgId = _itemId.msg;
+	const auto reactionRow = static_cast<Row*>(row.get())->isReactionRow();
 	crl::on_main(window, [=] {
-		window->show(PrepareShortInfoBox(peer, window));
+		ShowReactionParticipantInfo(
+			window,
+			peer,
+			originPeer,
+			originMsgId,
+			reactionRow);
+	});
+}
+
+base::unique_qptr<Ui::PopupMenu> Controller::rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	const auto reactionRow = static_cast<Row*>(row.get());
+	const auto participant = row->peer();
+	if (!reactionRow->isReactionRow()
+		|| participant->isSelf()
+		|| !CanModerateReactionByDeleteMessages(_peer)) {
+		return nullptr;
+	}
+	const auto reaction = reactionRow->reaction();
+
+	auto result = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	Ui::Menu::CreateAddActionCallback(result.get())({
+		.text = tr::lng_context_delete_this_reaction(tr::now),
+		.handler = [=] {
+			ShowModerateReactionBox(
+				_window->parentController(),
+				_peer,
+				_itemId.msg,
+				participant,
+				reaction);
+		},
+		.icon = &st::menuIconDeleteAttention,
+		.isAttention = true,
 	});
+	return result;
 }
 
 bool Controller::appendRow(not_null<PeerData*> peer, ReactionId reaction) {
@@ -351,74 +546,143 @@ std::unique_ptr<PeerListRow> Controller::createRow(
 		id(peer, reaction),
 		peer,
 		_factory,
+		reaction,
 		Data::ReactionEntityData(reaction),
 		[=](Row *row) { delegate()->peerListUpdateRow(row); },
-		[=] { return _window->isGifPausedAtLeastFor(
+		[=] { return _window->parentController()->isGifPausedAtLeastFor(
 			Window::GifPauseReason::Layer); });
 }
 
 } // namespace
 
-object_ptr<Ui::BoxContent> FullListBox(
-		not_null<Window::SessionController*> window,
+bool CanModerateReactionByDeleteMessages(not_null<PeerData*> originPeer) {
+	if (const auto chat = originPeer->asChat()) {
+		return chat->canDeleteMessages();
+	} else if (const auto channel = originPeer->asChannel()) {
+		return channel->canDeleteMessages();
+	}
+	return false;
+}
+
+void ShowModerateReactionBox(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> originPeer,
+		MsgId originMsgId,
+		not_null<PeerData*> participant) {
+	ShowModerateReactionBox(
+		controller,
+		originPeer,
+		originMsgId,
+		participant,
+		Data::ReactionId());
+}
+
+void ShowModerateReactionBox(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> originPeer,
+		MsgId originMsgId,
+		not_null<PeerData*> participant,
+		Data::ReactionId reaction) {
+	controller->show(Box(
+		CreateModerateMessagesBox,
+		ModerateMessagesBoxEntry{
+			.reaction = ModerateReactionEntry{
+				.peer = originPeer,
+				.msgId = originMsgId,
+				.participant = participant,
+				.reaction = std::move(reaction),
+			},
+		},
+		nullptr,
+		DefaultModerateMessagesBoxOptions()));
+}
+
+void ShowReactionParticipantInfo(
+		not_null<Window::SessionNavigation*> window,
+		not_null<PeerData*> participant,
+		not_null<PeerData*> originPeer,
+		MsgId originMsgId,
+		bool reactionRow) {
+	if (!reactionRow) {
+		window->showPeerInfo(participant);
+		return;
+	}
+	const auto migrated = participant->migrateFrom();
+	auto memento = std::make_shared<Info::Memento>(
+		std::vector<std::shared_ptr<Info::ContentMemento>>{
+		std::make_shared<Info::Profile::Memento>(
+			participant,
+			migrated ? migrated->id : PeerId(),
+			Info::Profile::Origin{
+				Info::Profile::GroupReactionOrigin{ originPeer, originMsgId },
+			}),
+	});
+	window->showSection(std::move(memento));
+}
+
+Data::ReactionId DefaultSelectedTab(
 		not_null<HistoryItem*> item,
-		Data::ReactionId selected,
 		std::shared_ptr<Api::WhoReadList> whoReadIds) {
-	Expects(IsServerMsgId(item->id));
+	return DefaultSelectedTab(item, {}, std::move(whoReadIds));
+}
 
-	if (!ranges::contains(
-			item->reactions(),
-			selected,
-			&Data::MessageReaction::id)) {
+Data::ReactionId DefaultSelectedTab(
+		not_null<HistoryItem*> item,
+		Data::ReactionId selected,
+		std::shared_ptr<Api::WhoReadList> whoReadIds) {
+	const auto proj = &Data::MessageReaction::id;
+	if (!ranges::contains(item->reactions(), selected, proj)) {
 		selected = {};
 	}
-	if (selected.empty() && whoReadIds && !whoReadIds->list.empty()) {
-		selected = Data::ReactionId{ u"read"_q };
+	return (selected.empty() && whoReadIds && !whoReadIds->list.empty())
+		? Data::ReactionId{ u"read"_q }
+		: selected;
+}
+
+not_null<Tabs*> CreateReactionsTabs(
+		not_null<QWidget*> parent,
+		not_null<Window::SessionNavigation*> window,
+		FullMsgId itemId,
+		Data::ReactionId selected,
+		std::shared_ptr<Api::WhoReadList> whoReadIds) {
+	const auto item = window->session().data().message(itemId);
+	auto map = item
+		? item->reactions()
+		: std::vector<Data::MessageReaction>();
+	if (whoReadIds && !whoReadIds->list.empty()) {
+		map.push_back({
+			.id = Data::ReactionId{ u"read"_q },
+			.count = int(whoReadIds->list.size()),
+		});
 	}
-	const auto tabRequests = std::make_shared<
+	return CreateTabs(
+		parent,
+		Data::ReactedMenuFactory(&window->session()),
+		[=] { return window->parentController()->isGifPausedAtLeastFor(
+			Window::GifPauseReason::Layer); },
+		map,
+		selected,
+		whoReadIds ? whoReadIds->type : Ui::WhoReadType::Reacted);
+}
+
+PreparedFullList FullListController(
+		not_null<Window::SessionNavigation*> window,
+		FullMsgId itemId,
+		Data::ReactionId selected,
+		std::shared_ptr<Api::WhoReadList> whoReadIds) {
+	Expects(IsServerMsgId(itemId.msg));
+
+	const auto tab = std::make_shared<
 		rpl::event_stream<Data::ReactionId>>();
-	const auto initBox = [=](not_null<PeerListBox*> box) {
-		box->setNoContentMargin(true);
-
-		auto map = item->reactions();
-		if (whoReadIds && !whoReadIds->list.empty()) {
-			map.push_back({
-				.id = Data::ReactionId{ u"read"_q },
-				.count = int(whoReadIds->list.size()),
-			});
-		}
-		const auto tabs = CreateTabs(
-			box,
-			Data::ReactedMenuFactory(&item->history()->session()),
-			[=] { return window->isGifPausedAtLeastFor(
-				Window::GifPauseReason::Layer); },
-			map,
-			selected,
-			whoReadIds ? whoReadIds->type : Ui::WhoReadType::Reacted);
-		tabs->changes(
-		) | rpl::start_to_stream(*tabRequests, box->lifetime());
-
-		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
-			tabs->resizeToWidth(width);
-			tabs->move(0, 0);
-		}, box->lifetime());
-		tabs->heightValue(
-		) | rpl::start_with_next([=](int height) {
-			box->setAddedTopScrollSkip(height);
-		}, box->lifetime());
-		box->addButton(tr::lng_close(), [=] {
-			box->closeBox();
-		});
-	};
-	return Box<PeerListBox>(
-		std::make_unique<Controller>(
+	return {
+		.controller = std::make_unique<Controller>(
 			window,
-			item,
+			itemId,
 			selected,
-			tabRequests->events(),
+			tab->events(),
 			whoReadIds),
-		initBox);
+		.switchTab = [=](Data::ReactionId id) { tab->fire_copy(id); },
+	};
 }
 
 } // namespace HistoryView::Reactions
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.h
index b65c21065663a9..b1cbd347d3b80d 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_list.h
@@ -10,6 +10,8 @@ For license and copyright information please follow this link:
 #include "base/object_ptr.h"
 
 class HistoryItem;
+class PeerData;
+class PeerListController;
 
 namespace Data {
 struct ReactionId;
@@ -21,6 +23,7 @@ struct WhoReadList;
 
 namespace Window {
 class SessionController;
+class SessionNavigation;
 } // namespace Window
 
 namespace Ui {
@@ -29,9 +32,54 @@ class BoxContent;
 
 namespace HistoryView::Reactions {
 
-object_ptr<Ui::BoxContent> FullListBox(
-	not_null<Window::SessionController*> window,
+[[nodiscard]] Data::ReactionId DefaultSelectedTab(
 	not_null<HistoryItem*> item,
+	std::shared_ptr<Api::WhoReadList> whoReadIds);
+
+[[nodiscard]] Data::ReactionId DefaultSelectedTab(
+	not_null<HistoryItem*> item,
+	Data::ReactionId selected,
+	std::shared_ptr<Api::WhoReadList> whoReadIds = nullptr);
+
+struct Tabs;
+[[nodiscard]] not_null<Tabs*> CreateReactionsTabs(
+	not_null<QWidget*> parent,
+	not_null<Window::SessionNavigation*> window,
+	FullMsgId itemId,
+	Data::ReactionId selected,
+	std::shared_ptr<Api::WhoReadList> whoReadIds);
+
+struct PreparedFullList {
+	std::unique_ptr<PeerListController> controller;
+	Fn<void(Data::ReactionId)> switchTab;
+};
+
+[[nodiscard]] bool CanModerateReactionByDeleteMessages(
+	not_null<PeerData*> originPeer);
+
+void ShowModerateReactionBox(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> originPeer,
+	MsgId originMsgId,
+	not_null<PeerData*> participant);
+
+void ShowModerateReactionBox(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> originPeer,
+	MsgId originMsgId,
+	not_null<PeerData*> participant,
+	Data::ReactionId reaction);
+
+void ShowReactionParticipantInfo(
+	not_null<Window::SessionNavigation*> window,
+	not_null<PeerData*> participant,
+	not_null<PeerData*> originPeer,
+	MsgId originMsgId,
+	bool reactionRow);
+
+[[nodiscard]] PreparedFullList FullListController(
+	not_null<Window::SessionNavigation*> window,
+	FullMsgId itemId,
 	Data::ReactionId selected,
 	std::shared_ptr<Api::WhoReadList> whoReadIds = nullptr);
 
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
index 32eb1a1f4157dc..78a38470436fd2 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
@@ -17,6 +17,7 @@ For license and copyright information please follow this link:
 #include "ui/platform/ui_platform_utility.h"
 #include "ui/integration.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/ui_utility.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/history.h"
@@ -181,14 +182,14 @@ UnifiedFactoryOwner::RecentFactory UnifiedFactoryOwner::factory() {
 			&& !i->second.custom();
 		const auto manager = &_session->data().customEmojiManager();
 		auto result = isDefaultReaction
-			? std::make_unique<Ui::Text::ShiftedEmoji>(
+			? MakeWrappedEmoji<Ui::Text::ShiftedEmoji>(
 				manager->create(id, std::move(repaint), tag, sizeOverride),
 				_defaultReactionShift)
 			: manager->create(id, std::move(repaint), tag);
 		const auto j = _defaultReactionInStripMap.find(id);
 		if (j != end(_defaultReactionInStripMap)) {
 			Assert(_strip != nullptr);
-			return std::make_unique<StripEmoji>(
+			return MakeWrappedEmoji<StripEmoji>(
 				std::move(result),
 				_strip,
 				-_stripPaintOneShift,
@@ -207,7 +208,8 @@ Selector::Selector(
 	Fn<void(bool fast)> close,
 	IconFactory iconFactory,
 	Fn<bool()> paused,
-	bool child)
+	bool child,
+	QWidget *mediaPreviewParent)
 : Selector(
 	parent,
 	st,
@@ -223,7 +225,8 @@ Selector::Selector(
 	std::move(iconFactory),
 	std::move(paused),
 	std::move(close),
-	child) {
+	child,
+	mediaPreviewParent) {
 }
 
 #if 0 // not ready
@@ -260,7 +263,8 @@ Selector::Selector(
 	IconFactory iconFactory,
 	Fn<bool()> paused,
 	Fn<void(bool fast)> close,
-	bool child)
+	bool child,
+	QWidget *mediaPreviewParent)
 : RpWidget(parent)
 , _st(st)
 , _show(std::move(show))
@@ -268,6 +272,7 @@ Selector::Selector(
 , _recent(std::move(recent))
 , _listMode(mode)
 , _paused(std::move(paused))
+, _mediaPreviewParent(mediaPreviewParent)
 , _jumpedToPremium([=] { close(false); })
 , _cachedRound(
 	QSize(2 * st::reactStripSkip + st::reactStripSize, st::reactStripHeight),
@@ -358,10 +363,11 @@ int Selector::effectPreviewHeight() const {
 	if (_listMode != ChatHelpers::EmojiListMode::MessageEffects) {
 		return 0;
 	}
-	return st::previewMenu.shadow.extend.top()
+	const auto extend = Ui::BoxShadow::ExtendFor(st::previewMenu.shadow);
+	return extend.top()
 		+ HistoryView::Sticker::MessageEffectSize().height()
 		+ st::effectPreviewSend.height
-		+ st::previewMenu.shadow.extend.bottom();
+		+ extend.bottom();
 }
 
 QMargins Selector::marginsForShadow() const {
@@ -457,6 +463,17 @@ void Selector::setSpecialExpandTopSkip(int skip) {
 	_specialExpandTopSkip = skip;
 }
 
+void Selector::setBubbleUp(bool bubbleUp) {
+	if (_bubbleUp == bubbleUp) {
+		return;
+	}
+	_bubbleUp = bubbleUp;
+}
+
+void Selector::setExpandDown(bool expandDown) {
+	_expandDown = expandDown;
+}
+
 void Selector::initGeometry(int innerTop) {
 	const auto margins = marginsForShadow();
 	const auto parent = parentWidget()->rect();
@@ -466,10 +483,11 @@ void Selector::initGeometry(int innerTop) {
 		? (innerWidth + margins.left() + margins.right())
 		: parent.width();
 	const auto forAbout = width - margins.left() - margins.right();
-	_collapsedTopSkip = _useTransparency
+	const auto categoriesAndAboutTop = _useTransparency
 		? (extendTopForCategoriesAndAbout(forAbout) + _specialExpandTopSkip)
 		: opaqueExtendTopAbout(forAbout);
-	_topAddOnExpand = _collapsedTopSkip - _aboutExtend;
+	_collapsedTopSkip = _expandDown ? _aboutExtend : categoriesAndAboutTop;
+	_topAddOnExpand = categoriesAndAboutTop - _aboutExtend;
 	const auto height = margins.top()
 		+ _aboutExtend
 		+ innerHeight
@@ -491,7 +509,10 @@ void Selector::initGeometry(int innerTop) {
 	if (_about) {
 		_about->move(
 			_inner.x() + (_inner.width() - _about->width()) / 2,
-			_outer.y() + margins.top() + _st.aboutPadding.top());
+			_outer.y()
+				+ margins.top()
+				+ _st.aboutPadding.top()
+				- skipYBubbleUpShift());
 		_aboutCache = Ui::GrabWidgetToImage(_about.get());
 	}
 
@@ -568,7 +589,7 @@ void Selector::paintAppearing(QPainter &p) {
 	q.translate(_inner.topLeft() - QPoint(0, _outer.y()));
 	_strip->paint(
 		q,
-		{ _skipx, _skipy },
+		{ _skipx, _skipy - skipYBubbleUpShift() },
 		{ _size, 0 },
 		{ 0, 0, appearedWidth, _inner.height() },
 		1.,
@@ -622,6 +643,12 @@ void Selector::paintBackgroundToBuffer() {
 	_cachedRound.setShadowColor(st::shadowFg->c);
 
 	auto p = QPainter(&_paintBuffer);
+	if (_bubbleUp) {
+		const auto centerY = _paintBuffer.height() / (2. * factor);
+		p.translate(0, centerY);
+		p.scale(1., -1.);
+		p.translate(0, -centerY);
+	}
 	const auto radius = _inner.height() / 2.;
 	const auto frame = _cachedRound.validateFrame(0, 1., radius);
 	const auto outer = _outer.translated(0, -_outer.y());
@@ -632,6 +659,13 @@ void Selector::paintBackgroundToBuffer() {
 	paintBubble(p, _inner.width());
 }
 
+int Selector::skipYBubbleUpShift() const {
+	if (!_bubbleUp) {
+		return 0;
+	}
+	return -_st.icons.stripBubble.height() + marginsForShadow().bottom();
+}
+
 void Selector::paintCollapsed(QPainter &p) {
 	Expects(_strip != nullptr);
 
@@ -645,7 +679,7 @@ void Selector::paintCollapsed(QPainter &p) {
 	}
 	_strip->paint(
 		p,
-		_inner.topLeft() + QPoint(_skipx, _skipy),
+		_inner.topLeft() + QPoint(_skipx, _skipy - skipYBubbleUpShift()),
 		{ _size, 0 },
 		_inner,
 		1.,
@@ -764,7 +798,7 @@ void Selector::paintFadingExpandIcon(QPainter &p, float64 progress) {
 	const auto expandIconRect = QRect(
 		expandIconPosition,
 		QSize(_size, _size)
-	).marginsRemoved({ sub, sub, sub, sub });
+	).marginsRemoved(Margins(sub)).translated(0, -skipYBubbleUpShift());
 	p.drawImage(expandIconRect, _expandIconCache);
 	p.setOpacity(1.);
 }
@@ -778,7 +812,7 @@ void Selector::paintNonTransparentExpandRect(
 		inner.y() + inner.height(),
 		inner.width(),
 		st::lineWidth,
-		st::defaultPopupMenu.shadow.fallback);
+		st::defaultPopupMenu.shadowFallback);
 }
 
 void Selector::paintExpanded(QPainter &p) {
@@ -894,9 +928,18 @@ void Selector::mousePressEvent(QMouseEvent *e) {
 }
 
 void Selector::mouseReleaseEvent(QMouseEvent *e) {
-	if (!_strip || _pressed != lookupSelectedIndex(e->pos())) {
+	if (!_strip) {
 		return;
 	}
+	if (_pressed != lookupSelectedIndex(e->pos())) {
+#ifdef Q_OS_UNIX
+		if (!_over || e->button() != Qt::RightButton) {
+			return;
+		}
+#else
+		return;
+#endif // !Q_OS_UNIX
+	}
 	_pressed = -1;
 	const auto selected = _strip->selected();
 	if (selected == Strip::AddedButton::Expand) {
@@ -963,11 +1006,24 @@ void Selector::expand() {
 		margins.top() + heightLimit + margins.bottom());
 	const auto additionalBottom = willBeHeight - height();
 	const auto additional = _specialExpandTopSkip + additionalBottom;
+	const auto additionalTop = _expandDown ? _topAddOnExpand : 0;
 	if (additionalBottom < 0 || additional <= 0) {
 		return;
-	} else if (additionalBottom > 0) {
-		resize(width(), height() + additionalBottom);
+	} else if (additionalBottom > 0 || additionalTop > 0) {
+		setGeometry(
+			x(),
+			y() - additionalTop,
+			width(),
+			height() + additionalTop + additionalBottom);
 		raise();
+		if (additionalTop > 0) {
+			_outer.translate(0, additionalTop);
+			_outerWithBubble.translate(0, additionalTop);
+			_inner.translate(0, additionalTop);
+			if (_about) {
+				_about->move(_about->x(), _about->y() + additionalTop);
+			}
+		}
 	}
 
 	createList();
@@ -1047,10 +1103,15 @@ void Selector::createList() {
 			.show = _show,
 			.mode = _listMode,
 			.paused = _paused ? _paused : [] { return false; },
-			.customRecentList = std::move(recentList),
+			.customRecentList = DocumentListToRecent(recentList),
 			.customRecentFactory = _unifiedFactoryOwner->factory(),
 			.freeEffects = std::move(freeEffects),
 			.st = st,
+			.mediaPreviewParent = _mediaPreviewParent
+				? _mediaPreviewParent
+				: this,
+			.mediaPreviewMargins = marginsForShadow(),
+			.mediaPreviewPanelStyle = (_mediaPreviewParent == nullptr),
 		}));
 	if (!_reactions.stickers.empty()) {
 		auto descriptors = ranges::views::all(
@@ -1080,7 +1141,7 @@ void Selector::createList() {
 		(_stickers
 			? _stickers->chosen()
 			: rpl::never<ChatHelpers::FileChosen>())
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		_chosen.fire({
 			.id = _unifiedFactoryOwner->lookupReactionId(data.document->id),
 			.icon = data.messageSendingFrom.frame,
@@ -1089,7 +1150,7 @@ void Selector::createList() {
 	}, _list->lifetime());
 
 	_list->jumpedToPremium(
-	) | rpl::start_with_next(_jumpedToPremium, _list->lifetime());
+	) | rpl::on_next(_jumpedToPremium, _list->lifetime());
 
 	const auto inner = rect().marginsRemoved(marginsForShadow());
 	const auto footer = _reactions.customAllowed
@@ -1109,7 +1170,7 @@ void Selector::createList() {
 		rpl::combine(
 			_shadowTop.value(),
 			_shadowSkip.value()
-		) | rpl::start_with_next([=](int top, int skip) {
+		) | rpl::on_next([=](int top, int skip) {
 			_shadow->setGeometry(
 				inner.x() + skip,
 				top,
@@ -1130,10 +1191,10 @@ void Selector::createList() {
 		lists->setVisibleTopBottom(scrollTop, scrollBottom);
 	};
 	_scroll->scrollTopChanges(
-	) | rpl::start_with_next(updateVisibleTopBottom, lists->lifetime());
+	) | rpl::on_next(updateVisibleTopBottom, lists->lifetime());
 
 	_list->scrollToRequests(
-	) | rpl::start_with_next([=](int y) {
+	) | rpl::on_next([=](int y) {
 		_scroll->scrollToY(y);
 		if (_shadow) {
 			_shadow->update();
@@ -1151,28 +1212,28 @@ void Selector::createList() {
 		_stickers->setMinimalHeight(geometry.width(), 0);
 
 		_list->searchQueries(
-		) | rpl::start_with_next([=](std::vector<QString> &&query) {
+		) | rpl::on_next([=](std::vector<QString> &&query) {
 			_stickers->applySearchQuery(std::move(query));
 		}, _stickers->lifetime());
 
 		rpl::combine(
 			_list->heightValue(),
 			_stickers->heightValue()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			InvokeQueued(lists, updateVisibleTopBottom);
 		}, _stickers->lifetime());
 
 		rpl::combine(
 			_list->recentShownCount(),
 			_stickers->recentShownCount()
-		) | rpl::start_with_next([=](int emoji, int stickers) {
+		) | rpl::on_next([=](int emoji, int stickers) {
 			_showEmptySearch = !emoji && !stickers;
 			_scroll->update();
 		}, _scroll->lifetime());
 
 		_scroll->paintRequest() | rpl::filter([=] {
 			return _showEmptySearch;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			auto p = QPainter(_scroll);
 			p.setPen(st::windowSubTextFg);
 			p.setFont(st::normalFont);
@@ -1212,7 +1273,7 @@ bool AdjustMenuGeometryForSelector(
 		selector->effectPreviewHeight());
 	const auto willBeHeightWithoutBottomPadding = fullTop
 		+ height
-		- menu->st().shadow.extend.top();
+		- Ui::BoxShadow::ExtendFor(menu->st().shadow).top();
 	const auto additionalPaddingBottom
 		= (willBeHeightWithoutBottomPadding >= minimalHeight
 			? 0
@@ -1300,7 +1361,7 @@ AttachSelectorResult MakeJustSelectorMenu(
 	const auto selectorInnerTop = menu->preparedPadding().top()
 		- st::reactStripExtend.top();
 	menu->animatePhaseValue(
-	) | rpl::start_with_next([=](Ui::PopupMenu::AnimatePhase phase) {
+	) | rpl::on_next([=](Ui::PopupMenu::AnimatePhase phase) {
 		if (phase == Ui::PopupMenu::AnimatePhase::StartHide) {
 			selector->beforeDestroy();
 		}
@@ -1308,14 +1369,14 @@ AttachSelectorResult MakeJustSelectorMenu(
 	selector->initGeometry(selectorInnerTop);
 	selector->show();
 
-	selector->chosen() | rpl::start_with_next([=](ChosenReaction reaction) {
+	selector->chosen() | rpl::on_next([=](ChosenReaction reaction) {
 		menu->hideMenu();
 		chosen(std::move(reaction));
 	}, selector->lifetime());
 
 	const auto correctTop = selector->y();
 	menu->showStateValue(
-	) | rpl::start_with_next([=](Ui::PopupMenu::ShowState state) {
+	) | rpl::on_next([=](Ui::PopupMenu::ShowState state) {
 		const auto origin = menu->preparedOrigin();
 		using Origin = Ui::PanelAnimation::Origin;
 		if (origin == Origin::BottomLeft || origin == Origin::BottomRight) {
@@ -1369,13 +1430,13 @@ AttachSelectorResult AttachSelectorToMenu(
 	const auto selector = *result;
 	const auto itemId = item->fullId();
 
-	selector->chosen() | rpl::start_with_next([=](ChosenReaction reaction) {
+	selector->chosen() | rpl::on_next([=](ChosenReaction reaction) {
 		menu->hideMenu();
 		reaction.context = itemId;
 		chosen(std::move(reaction));
 	}, selector->lifetime());
 
-	selector->escapes() | rpl::start_with_next([=] {
+	selector->escapes() | rpl::on_next([=] {
 		menu->hideMenu();
 	}, selector->lifetime());
 
@@ -1426,7 +1487,7 @@ auto AttachSelectorToMenu(
 		? (menu->preparedPadding().top() - st::reactStripExtend.top())
 		: st::lineWidth;
 	menu->animatePhaseValue(
-	) | rpl::start_with_next([=](Ui::PopupMenu::AnimatePhase phase) {
+	) | rpl::on_next([=](Ui::PopupMenu::AnimatePhase phase) {
 		if (phase == Ui::PopupMenu::AnimatePhase::StartHide) {
 			selector->beforeDestroy();
 		}
@@ -1436,7 +1497,7 @@ auto AttachSelectorToMenu(
 
 	const auto correctTop = selector->y();
 	menu->showStateValue(
-	) | rpl::start_with_next([=](Ui::PopupMenu::ShowState state) {
+	) | rpl::on_next([=](Ui::PopupMenu::ShowState state) {
 		const auto origin = menu->preparedOrigin();
 		using Origin = Ui::PanelAnimation::Origin;
 		if (origin == Origin::BottomLeft || origin == Origin::BottomRight) {
@@ -1465,10 +1526,10 @@ TextWithEntities ItemReactionsAbout(not_null<HistoryItem*> item) {
 		: tr::lng_subscribe_tag_about(
 			tr::now,
 			lt_link,
-			Ui::Text::Link(
+			tr::link(
 				tr::lng_subscribe_tag_link(tr::now),
 				u"internal:about_tags"_q),
-			Ui::Text::WithEntities);
+			tr::marked);
 }
 
 } // namespace HistoryView::Reactions
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
index 107dbfdc77641b..15daa306414058 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.h
@@ -86,7 +86,8 @@ class Selector final : public Ui::RpWidget {
 		Fn<void(bool fast)> close,
 		IconFactory iconFactory = nullptr,
 		Fn<bool()> paused = nullptr,
-		bool child = false);
+		bool child = false,
+		QWidget *mediaPreviewParent = nullptr);
 #if 0 // not ready
 	Selector(
 		not_null<QWidget*> parent,
@@ -110,6 +111,8 @@ class Selector final : public Ui::RpWidget {
 	[[nodiscard]] int minimalHeight(int fullWidth) const;
 	[[nodiscard]] int countAppearedWidth(float64 progress) const;
 	void setSpecialExpandTopSkip(int skip);
+	void setBubbleUp(bool bubbleUp);
+	void setExpandDown(bool expandDown);
 	void initGeometry(int innerTop);
 	void beforeDestroy();
 
@@ -153,7 +156,8 @@ class Selector final : public Ui::RpWidget {
 		IconFactory iconFactory,
 		Fn<bool()> paused,
 		Fn<void(bool fast)> close,
-		bool child);
+		bool child,
+		QWidget *mediaPreviewParent);
 
 	void paintEvent(QPaintEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
@@ -185,12 +189,15 @@ class Selector final : public Ui::RpWidget {
 	ChosenReaction lookupChosen(const Data::ReactionId &id) const;
 	void preloadAllRecentsAnimations();
 
+	[[nodiscard]] int skipYBubbleUpShift() const;
+
 	const style::EmojiPan &_st;
 	const std::shared_ptr<ChatHelpers::Show> _show;
 	const Data::PossibleItemReactions _reactions;
 	const std::vector<DocumentId> _recent;
 	const ChatHelpers::EmojiListMode _listMode;
 	const Fn<bool()> _paused;
+	QWidget *_mediaPreviewParent = nullptr;
 	Fn<void()> _jumpedToPremium;
 	Ui::RoundAreaWithShadow _cachedRound;
 	std::unique_ptr<Strip> _strip;
@@ -243,6 +250,8 @@ class Selector final : public Ui::RpWidget {
 	bool _small = false;
 	bool _over = false;
 	bool _low = false;
+	bool _bubbleUp = false;
+	bool _expandDown = false;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp
index 08524c18015325..e691cc38ef9b4c 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_strip.cpp
@@ -58,7 +58,7 @@ Strip::Strip(
 , _finalSize(size)
 , _update(std::move(update)) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		invalidateMainReactionImage();
 	}, _lifetime);
 }
@@ -394,7 +394,7 @@ void Strip::loadIcons() {
 		entry.media->checkStickerLarge();
 		if (!checkIconLoaded(entry) && !_loadCacheLifetime) {
 			document->session().downloaderTaskFinished(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				checkIcons();
 			}, _loadCacheLifetime);
 		}
@@ -454,22 +454,26 @@ void Strip::resolveMainReactionIcon() {
 	_mainReactionMedia = main->createMediaView();
 	_mainReactionMedia->checkStickerLarge();
 	if (_mainReactionMedia->loaded()) {
-		_mainReactionLifetime.destroy();
 		setMainReactionIcon();
 	} else if (!_mainReactionLifetime) {
 		main->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return _mainReactionMedia->loaded();
-		}) | rpl::take(1) | rpl::start_with_next([=] {
+		}) | rpl::take(1) | rpl::on_next([=] {
 			setMainReactionIcon();
 		}, _mainReactionLifetime);
 	}
 }
 
 void Strip::setMainReactionIcon() {
+	Expects(_mainReactionMedia->loaded());
+
 	_mainReactionLifetime.destroy();
 	ranges::fill(_validEmoji, false);
 	loadIcons();
+
+	Assert(_mainReactionMedia->loaded());
+
 	const auto i = _loadCache.find(_mainReactionMedia->owner());
 	if (i != end(_loadCache) && i->second.icon) {
 		const auto &icon = i->second.icon;
@@ -479,6 +483,8 @@ void Strip::setMainReactionIcon() {
 		}
 	}
 	_mainReactionImage = QImage();
+
+	Assert(_mainReactionMedia->loaded());
 	_mainReactionIcon = DefaultIconFactory(
 		_mainReactionMedia.get(),
 		MainReactionSize());
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.cpp b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.cpp
index f3b23804fce178..acaad5ba4b92c8 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.cpp
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.cpp
@@ -48,7 +48,7 @@ not_null<Ui::AbstractButton*> CreateTab(
 	const auto state = result->lifetime().make_state<State>();
 	std::move(
 		selected
-	) | rpl::start_with_next([=](bool selected) {
+	) | rpl::on_next([=](bool selected) {
 		state->selected = selected;
 		state->cache = QImage();
 		result->update();
@@ -58,10 +58,10 @@ not_null<Ui::AbstractButton*> CreateTab(
 		? nullptr
 		: factory(
 			Data::ReactionEntityData(reaction),
-			[=] { result->update(); });
+			{ .repaint = [=] { result->update(); } });
 
 	result->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto factor = style::DevicePixelRatio();
 		const auto height = stm->height;
 		const auto skip = st::reactionsTabIconSkip;
diff --git a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.h b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.h
index 51d776004a5e63..8e356655226346 100644
--- a/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.h
+++ b/Telegram/SourceFiles/history/view/reactions/history_view_reactions_tabs.h
@@ -27,7 +27,7 @@ struct Tabs {
 	Fn<rpl::producer<int>()> heightValue;
 };
 
-not_null<Tabs*> CreateTabs(
+[[nodiscard]] not_null<Tabs*> CreateTabs(
 	not_null<QWidget*> parent,
 	Ui::Text::CustomEmojiFactory factory,
 	Fn<bool()> paused,
diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
index 84910f9abbaad2..d231e478c9d1cf 100644
--- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
+++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
@@ -16,8 +16,11 @@ For license and copyright information please follow this link:
 #include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "info/bot/earn/info_bot_earn_widget.h"
+#include "info/bot/starref/info_bot_starref_common.h"
+#include "info/bot/starref/info_bot_starref_join_widget.h"
 #include "info/channel_statistics/earn/earn_format.h"
 #include "info/info_controller.h"
+#include "info/info_memento.h"
 #include "info/statistics/info_statistics_inner_widget.h" // FillLoading.
 #include "info/statistics/info_statistics_list_controllers.h"
 #include "lang/lang_keys.h"
@@ -32,7 +35,6 @@ For license and copyright information please follow this link:
 #include "ui/toast/toast.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
-#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/slider_natural_width.h"
 #include "ui/wrap/slide_wrap.h"
@@ -60,13 +62,9 @@ void AddHeader(
 
 } // namespace
 
-InnerWidget::InnerWidget(
-	QWidget *parent,
-	not_null<Controller*> controller,
-	not_null<PeerData*> peer)
+InnerWidget::InnerWidget(QWidget *parent, not_null<Controller*> controller)
 : VerticalLayout(parent)
 , _controller(controller)
-, _peer(peer)
 , _show(controller->uiShow()) {
 }
 
@@ -75,9 +73,9 @@ void InnerWidget::load() {
 
 	const auto request = [=](Fn<void(Data::CreditsEarnStatistics)> done) {
 		const auto api = apiLifetime->make_state<Api::CreditsEarnStatistics>(
-			_peer->asUser());
+			peer()->asUser());
 		api->request(
-		) | rpl::start_with_error_done([show = _show](const QString &error) {
+		) | rpl::on_error_done([show = _show](const QString &error) {
 			show->showToast(error);
 		}, [=] {
 			done(api->data());
@@ -92,18 +90,18 @@ void InnerWidget::load() {
 		_showFinished.events());
 
 	_showFinished.events(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=, this, peer = peer()] {
 		request([=](Data::CreditsEarnStatistics state) {
 			_state = state;
 			_loaded.fire(true);
 			fill();
 
-			_peer->session().account().mtpUpdates(
-			) | rpl::start_with_next([=](const MTPUpdates &updates) {
+			peer->session().account().mtpUpdates(
+			) | rpl::on_next([=](const MTPUpdates &updates) {
 				using TL = MTPDupdateStarsRevenueStatus;
 				Api::PerformForUpdate<TL>(updates, [&](const TL &d) {
 					const auto peerId = peerFromMTP(d.vpeer());
-					if (peerId == _peer->id) {
+					if (peerId == peer->id) {
 						request([=](Data::CreditsEarnStatistics state) {
 							_state = state;
 							_stateUpdated.fire({});
@@ -119,7 +117,8 @@ void InnerWidget::fill() {
 	using namespace Info::ChannelEarn;
 	const auto container = this;
 	const auto &data = _state;
-	const auto multiplier = data.usdRate * Data::kEarnMultiplier;
+	const auto multiplier = data.usdRate;
+	constexpr auto kMinorLength = 3;
 
 	auto availableBalanceValue = rpl::single(
 		data.availableBalance
@@ -128,7 +127,16 @@ void InnerWidget::fill() {
 			return _state.availableBalance;
 		})
 	);
-	auto valueToString = [](uint64 v) { return QString::number(v); };
+	auto overallBalanceValue = rpl::single(
+		data.overallRevenue
+	) | rpl::then(
+		_stateUpdated.events() | rpl::map([=] {
+			return _state.overallRevenue;
+		})
+	);
+	auto valueToString = [](CreditsAmount v) {
+		return Lang::FormatCreditsAmountDecimal(v);
+	};
 
 	if (data.revenueGraph.chart) {
 		Ui::AddSkip(container);
@@ -146,14 +154,14 @@ void InnerWidget::fill() {
 		Ui::AddSkip(container);
 		Ui::AddDivider(container);
 		Ui::AddSkip(container);
-		Ui::AddSkip(container);
+		Statistic::FixCacheForHighDPIChartWidget(container);
 	}
 	{
 		AddHeader(container, tr::lng_bot_earn_overview_title);
 		Ui::AddSkip(container, st::channelEarnOverviewTitleSkip);
 
 		const auto addOverview = [&](
-				rpl::producer<uint64> value,
+				rpl::producer<CreditsAmount> value,
 				const tr::phrase<> &text) {
 			const auto line = container->add(
 				Ui::CreateSkipWidget(container, 0),
@@ -169,14 +177,16 @@ void InnerWidget::fill() {
 				line,
 				std::move(
 					value
-				) | rpl::map([=](uint64 v) {
-					return v ? ToUsd(v, multiplier) : QString();
+				) | rpl::map([=](CreditsAmount v) {
+					return v
+						? ToUsd(v, multiplier, kMinorLength)
+						: QString();
 				}),
 				st::channelEarnOverviewSubMinorLabel);
 			rpl::combine(
 				line->widthValue(),
 				majorLabel->sizeValue()
-			) | rpl::start_with_next([=](int available, const QSize &size) {
+			) | rpl::on_next([=](int available, const QSize &size) {
 				line->resize(line->width(), size.height());
 				majorLabel->moveToLeft(
 					icon->width() + st::channelEarnOverviewMinorLabelSkip,
@@ -204,17 +214,13 @@ void InnerWidget::fill() {
 			tr::lng_bot_earn_available);
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
-		// addOverview(data.currentBalance, tr::lng_bot_earn_reward);
-		// Ui::AddSkip(container);
-		// Ui::AddSkip(container);
 		addOverview(
-			rpl::single(
-				data.overallRevenue
-			) | rpl::then(
-				_stateUpdated.events() | rpl::map([=] {
-					return _state.overallRevenue;
-				})
-			),
+			rpl::single(data.currentBalance),
+			tr::lng_bot_earn_reward);
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		addOverview(
+			rpl::duplicate(overallBalanceValue),
 			tr::lng_bot_earn_total);
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
@@ -223,6 +229,7 @@ void InnerWidget::fill() {
 	}
 	{
 		AddHeader(container, tr::lng_bot_earn_balance_title);
+		Ui::AddSkip(container);
 		auto dateValue = rpl::single(
 			data.nextWithdrawalAt
 		) | rpl::then(
@@ -233,7 +240,7 @@ void InnerWidget::fill() {
 		::Settings::AddWithdrawalWidget(
 			container,
 			_controller->parentController(),
-			_peer,
+			peer(),
 			rpl::single(
 				data.buyAdsUrl
 			) | rpl::then(
@@ -243,15 +250,28 @@ void InnerWidget::fill() {
 			),
 			rpl::duplicate(availableBalanceValue),
 			rpl::duplicate(dateValue),
-			std::move(dateValue) | rpl::map([=](const QDateTime &dt) {
-				return !dt.isNull() || (!_state.isWithdrawalEnabled);
-			}),
-			rpl::duplicate(availableBalanceValue) | rpl::map([=](uint64 v) {
-				return v ? ToUsd(v, multiplier) : QString();
+			_state.isWithdrawalEnabled,
+			rpl::duplicate(
+				availableBalanceValue
+			) | rpl::map([=](CreditsAmount v) {
+				return v ? ToUsd(v, multiplier, kMinorLength) : QString();
 			}));
+		container->resizeToWidth(container->width());
+	}
+	if (BotStarRef::Join::Allowed(peer()) && !peer()->isSelf()) {
+		const auto button = BotStarRef::AddViewListButton(
+			container,
+			tr::lng_credits_summary_earn_title(),
+			tr::lng_credits_summary_earn_about());
+		button->setClickedCallback([=] {
+			_controller->showSection(BotStarRef::Join::Make(peer()));
+		});
+		Ui::AddSkip(container);
+		Ui::AddDivider(container);
+	}
+	if (!peer()->isSelf()) {
+		fillHistory();
 	}
-
-	fillHistory();
 }
 
 void InnerWidget::fillHistory() {
@@ -262,7 +282,7 @@ void InnerWidget::fillHistory() {
 
 	const auto sectionIndex = history->lifetime().make_state<int>(0);
 
-	const auto fill = [=, peer = _peer](
+	const auto fill = [=, peer = peer()](
 			not_null<PeerData*> premiumBot,
 			const Data::CreditsStatusSlice &fullSlice,
 			const Data::CreditsStatusSlice &inSlice,
@@ -282,7 +302,6 @@ void InnerWidget::fillHistory() {
 		const auto outTabText = tr::lng_credits_summary_history_tab_out(
 			tr::now);
 		if (hasOneTab) {
-			Ui::AddSkip(inner);
 			const auto header = inner->add(
 				object_ptr<Statistic::Header>(inner),
 				st::statisticsLayerMargins
@@ -335,7 +354,7 @@ void InnerWidget::fillHistory() {
 
 		rpl::single(slider->entity()->activeSection()) | rpl::then(
 			slider->entity()->sectionActivated()
-		) | rpl::start_with_next([=](int index) {
+		) | rpl::on_next([=](int index) {
 			if (index == 0) {
 				fullWrap->toggle(true, anim::type::instant);
 				inWrap->toggle(false, anim::type::instant);
@@ -395,7 +414,7 @@ void InnerWidget::fillHistory() {
 	const auto apiLifetime = history->lifetime().make_state<rpl::lifetime>();
 	rpl::single(rpl::empty) | rpl::then(
 		_stateUpdated.events()
-	) | rpl::start_with_next([=, peer = _peer] {
+	) | rpl::on_next([=, peer = peer()] {
 		using Api = Api::CreditsHistory;
 		const auto apiFull = apiLifetime->make_state<Api>(peer, true, true);
 		const auto apiIn = apiLifetime->make_state<Api>(peer, true, false);
@@ -405,7 +424,7 @@ void InnerWidget::fillHistory() {
 				apiOut->request({}, [=](Data::CreditsStatusSlice outSlice) {
 					::Api::PremiumPeerBot(
 						&_controller->session()
-					) | rpl::start_with_next([=](not_null<PeerData*> bot) {
+					) | rpl::on_next([=](not_null<PeerData*> bot) {
 						fill(bot, fullSlice, inSlice, outSlice);
 						container->resizeToWidth(container->width());
 						while (history->count() > 1) {
@@ -450,7 +469,7 @@ void InnerWidget::setInnerFocus() {
 }
 
 not_null<PeerData*> InnerWidget::peer() const {
-	return _peer;
+	return _controller->statisticsTag().peer;
 }
 
 } // namespace Info::BotEarn
diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.h b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.h
index 7157c4f0277d51..1d89d4aa98e0f1 100644
--- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.h
+++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.h
@@ -32,10 +32,7 @@ class InnerWidget final : public Ui::VerticalLayout {
 	struct ShowRequest final {
 	};
 
-	InnerWidget(
-		QWidget *parent,
-		not_null<Controller*> controller,
-		not_null<PeerData*> peer);
+	InnerWidget(QWidget *parent, not_null<Controller*> controller);
 
 	[[nodiscard]] not_null<PeerData*> peer() const;
 
@@ -54,7 +51,6 @@ class InnerWidget final : public Ui::VerticalLayout {
 	void fillHistory();
 
 	not_null<Controller*> _controller;
-	not_null<PeerData*> _peer;
 	std::shared_ptr<Ui::Show> _show;
 
 	Data::CreditsEarnStatistics _state;
diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp
index 7eab7cf7b38c38..ed4ef00f83f5d8 100644
--- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp
+++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_widget.cpp
@@ -16,11 +16,7 @@ For license and copyright information please follow this link:
 namespace Info::BotEarn {
 
 Memento::Memento(not_null<Controller*> controller)
-: ContentMemento(Info::Statistics::Tag{
-	controller->statisticsPeer(),
-	{},
-	{},
-}) {
+: ContentMemento(controller->statisticsTag()) {
 }
 
 Memento::Memento(not_null<PeerData*> peer)
@@ -54,16 +50,12 @@ Widget::Widget(
 	QWidget *parent,
 	not_null<Controller*> controller)
 : ContentWidget(parent, controller)
-, _inner(setInnerWidget(
-	object_ptr<InnerWidget>(
-		this,
-		controller,
-		controller->statisticsPeer()))) {
+, _inner(setInnerWidget(object_ptr<InnerWidget>(this, controller))) {
 	_inner->showRequests(
-	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
+	) | rpl::on_next([=](InnerWidget::ShowRequest request) {
 	}, _inner->lifetime());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &request) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
@@ -73,7 +65,7 @@ not_null<PeerData*> Widget::peer() const {
 }
 
 bool Widget::showInternal(not_null<ContentMemento*> memento) {
-	return (memento->statisticsPeer() == peer());
+	return (memento->statisticsTag().peer == peer());
 }
 
 rpl::producer<QString> Widget::title() {
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
new file mode 100644
index 00000000000000..7210b937d28d0f
--- /dev/null
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
@@ -0,0 +1,1041 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/bot/starref/info_bot_starref_common.h"
+
+#include "apiwrap.h"
+#include "boxes/peers/replace_boost_box.h" // CreateUserpicsTransfer.
+#include "boxes/send_credits_box.h" // Ui::CreditsEmoji.
+#include "chat_helpers/stickers_lottie.h"
+#include "core/ui_integration.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_channel.h"
+#include "data/data_document.h"
+#include "data/data_session.h"
+#include "history/view/media/history_view_sticker.h"
+#include "history/view/media/history_view_sticker_player.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/settings_common.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/controls/who_reacted_context_action.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
+#include "ui/layers/generic_box.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/table_layout.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/new_badges.h"
+#include "ui/painter.h"
+#include "ui/vertical_list.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_giveaway.h"
+#include "styles/style_layers.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
+
+#include <QtWidgets/QApplication>
+
+namespace Info::BotStarRef {
+namespace {
+
+void ConnectStarRef(
+		not_null<UserData*> bot,
+		not_null<PeerData*> peer,
+		Fn<void(ConnectedBot)> done,
+		Fn<void(const QString &)> fail) {
+	bot->session().api().request(MTPpayments_ConnectStarRefBot(
+		peer->input(),
+		bot->inputUser()
+	)).done([=](const MTPpayments_ConnectedStarRefBots &result) {
+		const auto parsed = Parse(&bot->session(), result);
+		if (parsed.empty()) {
+			fail(u"EMPTY"_q);
+		} else {
+			done(parsed.front());
+		}
+	}).fail([=](const MTP::Error &error) {
+		fail(error.type());
+	}).send();
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> CreateLinkIcon(
+		not_null<QWidget*> parent,
+		not_null<Main::Session*> session,
+		int users) {
+	auto result = object_ptr<Ui::RpWidget>(parent);
+	const auto raw = result.data();
+
+	struct State {
+		not_null<DocumentData*> icon;
+		std::shared_ptr<Data::DocumentMedia> media;
+		std::shared_ptr<HistoryView::StickerPlayer> player;
+		int counterWidth = 0;
+	};
+	const auto outerSide = st::starrefLinkThumbOuter;
+	const auto outerSkip = (outerSide - st::starrefLinkThumbInner) / 2;
+	const auto innerSide = (outerSide - 2 * outerSkip);
+	const auto add = st::starrefLinkCountAdd;
+	const auto outer = QSize(outerSide, outerSide + add);
+	const auto inner = QSize(innerSide, innerSide);
+	const auto state = raw->lifetime().make_state<State>(State{
+		.icon = ChatHelpers::GenerateLocalTgsSticker(
+			session,
+			u"starref_link"_q,
+			true),
+	});
+	state->media = state->icon->createMediaView();
+	state->player = std::make_unique<HistoryView::LottiePlayer>(
+		ChatHelpers::LottiePlayerFromDocument(
+			state->media.get(),
+			ChatHelpers::StickerLottieSize::MessageHistory,
+			inner,
+			Lottie::Quality::High));
+	const auto player = state->player.get();
+	player->setRepaintCallback([=] { raw->update(); });
+
+	const auto text = users
+		? Lang::FormatCountToShort(users).string
+		: QString();
+	const auto length = st::starrefLinkCountFont->width(text);
+	const auto contents = length + st::starrefLinkCountIcon.width();
+	const auto delta = (outer.width() - contents) / 2;
+	const auto badge = QRect(
+		delta,
+		outer.height() - st::starrefLinkCountFont->height - st::lineWidth,
+		outer.width() - 2 * delta,
+		st::starrefLinkCountFont->height);
+	const auto badgeRect = badge.marginsAdded(st::starrefLinkCountPadding);
+
+	raw->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(raw);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::windowBgActive);
+
+		auto hq = PainterHighQualityEnabler(p);
+
+		const auto left = (raw->width() - outer.width()) / 2;
+		p.drawEllipse(left, 0, outerSide, outerSide);
+
+		if (!text.isEmpty()) {
+			const auto rect = badgeRect.translated(left, 0);
+			const auto textRect = badge.translated(left, 0);
+			const auto radius = st::starrefLinkCountFont->height / 2.;
+			p.setPen(st::historyPeerUserpicFg);
+			p.setBrush(st::historyPeer2UserpicBg2);
+			p.drawRoundedRect(rect, radius, radius);
+
+			p.setFont(st::starrefLinkCountFont);
+			const auto shift = QPoint(
+				st::starrefLinkCountIcon.width(),
+				st::starrefLinkCountFont->ascent);
+			st::starrefLinkCountIcon.paint(
+				p,
+				textRect.topLeft() + st::starrefLinkCountIconPosition,
+				raw->width());
+			p.drawText(textRect.topLeft() + shift, text);
+		}
+		if (player->ready()) {
+			const auto now = crl::now();
+			const auto color = st::windowFgActive->c;
+			auto info = player->frame(inner, color, false, now, false);
+			p.drawImage(
+				QRect(QPoint(left + outerSkip, outerSkip), inner),
+				info.image);
+			if (info.index + 1 < player->framesCount()) {
+				player->markFrameShown();
+			}
+		}
+	}, raw->lifetime());
+
+	raw->resize(outer);
+
+	return result;
+}
+
+void ChooseRecipient(
+		not_null<Ui::RpWidget*> button,
+		const std::vector<not_null<PeerData*>> &list,
+		not_null<PeerData*> now,
+		Fn<void(not_null<PeerData*>)> done) {
+	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+		button,
+		st::starrefPopupMenu);
+
+	struct Entry {
+		not_null<Ui::WhoReactedEntryAction*> action;
+		std::shared_ptr<Ui::DynamicImage> userpic;
+	};
+	auto actions = std::make_shared<std::vector<Entry>>();
+	actions->reserve(list.size());
+	for (const auto &peer : list) {
+		auto view = peer->createUserpicView();
+		auto action = base::make_unique_q<Ui::WhoReactedEntryAction>(
+			menu->menu(),
+			Data::ReactedMenuFactory(&list.front()->session()),
+			menu->menu()->st(),
+			Ui::WhoReactedEntryData());
+		const auto index = int(actions->size());
+		actions->push_back({ action.get(), Ui::MakeUserpicThumbnail(peer) });
+
+		const auto updateUserpic = [=] {
+			const auto size = st::defaultWhoRead.photoSize;
+			actions->at(index).action->setData({
+				.text = peer->name(),
+				.date = (peer->isSelf()
+					? tr::lng_group_call_join_as_personal(tr::now)
+					: peer->isUser()
+					? tr::lng_status_bot(tr::now)
+					: peer->isBroadcast()
+					? tr::lng_channel_status(tr::now)
+					: tr::lng_group_status(tr::now)),
+				.type = (peer == now
+					? Ui::WhoReactedType::RefRecipientNow
+					: Ui::WhoReactedType::RefRecipient),
+				.userpic = actions->at(index).userpic->image(size),
+				.callback = [=] { done(peer); },
+			});
+		};
+		actions->back().userpic->subscribeToUpdates(updateUserpic);
+
+		menu->addAction(std::move(action));
+		updateUserpic();
+	}
+
+	menu->popup(button->mapToGlobal(QPoint(button->width() / 2, 0)));
+}
+
+} // namespace
+
+QString FormatCommission(ushort commission) {
+	return QString::number(commission / 10.) + '%';
+}
+
+QString FormatProgramDuration(int durationMonths) {
+	return !durationMonths
+		? tr::lng_star_ref_duration_forever(tr::now)
+		: (durationMonths < 12)
+		? tr::lng_months(tr::now, lt_count, durationMonths)
+		: tr::lng_years(tr::now, lt_count, durationMonths / 12);
+}
+
+rpl::producer<TextWithEntities> FormatForProgramDuration(
+		int durationMonths) {
+	return !durationMonths
+		? tr::lng_star_ref_one_about_for_forever(tr::rich)
+		: (durationMonths < 12)
+		? tr::lng_star_ref_one_about_for_months(
+			lt_count,
+			rpl::single(durationMonths * 1.),
+			tr::rich)
+		: tr::lng_star_ref_one_about_for_years(
+			lt_count,
+			rpl::single((durationMonths / 12) * 1.),
+			tr::rich);
+}
+
+not_null<Ui::AbstractButton*> AddViewListButton(
+		not_null<Ui::VerticalLayout*> parent,
+		rpl::producer<QString> title,
+		rpl::producer<QString> subtitle,
+		bool newBadge) {
+	const auto &stLabel = st::defaultFlatLabel;
+	const auto iconSize = st::settingsPremiumIconDouble.size();
+	const auto &titlePadding = st::settingsPremiumRowTitlePadding;
+	const auto &descriptionPadding = st::settingsPremiumRowAboutPadding;
+
+	const auto button = Ui::CreateChild<Ui::SettingsButton>(
+		parent,
+		rpl::single(QString()));
+	button->show();
+
+	const auto label = parent->add(
+		object_ptr<Ui::FlatLabel>(
+			parent,
+			std::move(title) | rpl::map(tr::bold),
+			stLabel),
+		titlePadding);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	const auto description = parent->add(
+		object_ptr<Ui::FlatLabel>(
+			parent,
+			std::move(subtitle),
+			st::boxDividerLabel),
+		descriptionPadding);
+	description->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	if (newBadge) {
+		Ui::NewBadge::AddAfterLabel(parent, label);
+	}
+
+	const auto dummy = Ui::CreateChild<Ui::AbstractButton>(parent);
+	dummy->setAttribute(Qt::WA_TransparentForMouseEvents);
+	dummy->show();
+
+	parent->sizeValue(
+	) | rpl::on_next([=](const QSize &s) {
+		dummy->resize(s.width(), iconSize.height());
+	}, dummy->lifetime());
+
+	button->geometryValue(
+	) | rpl::on_next([=](const QRect &r) {
+		dummy->moveToLeft(0, r.y() + (r.height() - iconSize.height()) / 2);
+	}, dummy->lifetime());
+
+	::Settings::AddButtonIcon(dummy, st::settingsButton, {
+		.icon = &st::settingsStarRefEarnStars,
+		.backgroundBrush = st::premiumIconBg3,
+	});
+
+	rpl::combine(
+		parent->widthValue(),
+		label->heightValue(),
+		description->heightValue()
+	) | rpl::on_next([=,
+		topPadding = titlePadding,
+		bottomPadding = descriptionPadding](
+			int width,
+			int topHeight,
+			int bottomHeight) {
+		button->resize(
+			width,
+			topPadding.top()
+			+ topHeight
+			+ topPadding.bottom()
+			+ bottomPadding.top()
+			+ bottomHeight
+			+ bottomPadding.bottom());
+	}, button->lifetime());
+	label->topValue(
+	) | rpl::on_next([=, padding = titlePadding.top()](int top) {
+		button->moveToLeft(0, top - padding);
+	}, button->lifetime());
+	const auto arrow = Ui::CreateChild<Ui::IconButton>(
+		button,
+		st::backButton);
+	arrow->setIconOverride(
+		&st::settingsPremiumArrow,
+		&st::settingsPremiumArrowOver);
+	arrow->setAttribute(Qt::WA_TransparentForMouseEvents);
+	button->sizeValue(
+	) | rpl::on_next([=](const QSize &s) {
+		const auto &point = st::settingsPremiumArrowShift;
+		arrow->moveToRight(
+			-point.x(),
+			point.y() + (s.height() - arrow->height()) / 2);
+	}, arrow->lifetime());
+
+	return button;
+}
+
+void AddFullWidthButtonFooter(
+		not_null<Ui::BoxContent*> box,
+		not_null<Ui::RpWidget*> button,
+		rpl::producer<TextWithEntities> text) {
+	const auto footer = Ui::CreateChild<Ui::FlatLabel>(
+		button->parentWidget(),
+		std::move(text),
+		st::starrefJoinFooter);
+	footer->setTryMakeSimilarLines(true);
+	button->geometryValue() | rpl::on_next([=](QRect geometry) {
+		footer->resizeToWidth(geometry.width());
+		const auto &st = box->getDelegate()->style();
+		const auto top = geometry.y() + geometry.height();
+		const auto available = st.buttonPadding.bottom();
+		footer->moveToLeft(
+			geometry.left(),
+			top + (available - footer->height()) / 2);
+	}, footer->lifetime());
+}
+
+object_ptr<Ui::AbstractButton> MakeLinkLabel(
+		not_null<QWidget*> parent,
+		const QString &link,
+		const style::InputField *stOverride) {
+	const auto &st = stOverride ? *stOverride : st::dialogsFilter;
+	const auto text = Ui::Text::StripUrlProtocol(link);
+	const auto margins = st.textMargins;
+	const auto height = st.heightMin;
+	const auto skip = margins.left();
+
+	auto result = object_ptr<Ui::AbstractButton>(parent);
+	const auto raw = result.data();
+
+	raw->resize(height, height);
+	raw->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(raw);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st.textBg);
+		const auto radius = st::roundRadiusLarge;
+		p.drawRoundedRect(0, 0, raw->width(), height, radius, radius);
+
+		const auto font = st.style.font;
+		p.setPen(st.textFg);
+		p.setFont(font);
+		const auto available = raw->width() - skip * 2;
+		p.drawText(
+			QRect(skip, margins.top(), available, font->height),
+			style::al_top,
+			font->elided(text, available));
+	}, raw->lifetime());
+
+	return result;
+}
+
+object_ptr<Ui::BoxContent> StarRefLinkBox(
+		ConnectedBot row,
+		not_null<PeerData*> peer) {
+	return Box([=](not_null<Ui::GenericBox*> box) {
+		const auto show = box->uiShow();
+
+		const auto bot = row.bot;
+		const auto program = row.state.program;
+
+		box->setStyle(st::starrefFooterBox);
+		box->setNoContentMargin(true);
+		box->addTopButton(st::boxTitleClose, [=] {
+			box->closeBox();
+		});
+
+		box->addRow(
+			CreateLinkIcon(box, &bot->session(), row.state.users),
+			st::boxRowPadding + st::starrefJoinUserpicsPadding);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_star_ref_link_title(),
+				st::boxTitle),
+			st::boxRowPadding + st::starrefJoinTitlePadding,
+			style::al_top);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				(peer->isSelf()
+					? tr::lng_star_ref_link_about_user
+					: peer->isUser()
+					? tr::lng_star_ref_link_about_user
+					: tr::lng_star_ref_link_about_channel)(
+						lt_amount,
+						rpl::single(tr::bold(
+							FormatCommission(program.commission))),
+						lt_app,
+						rpl::single(tr::bold(bot->name())),
+						lt_duration,
+						FormatForProgramDuration(program.durationMonths),
+						tr::marked),
+				st::starrefCenteredText),
+			style::al_top);
+
+		Ui::AddSkip(box->verticalLayout(), st::defaultVerticalListSkip * 3);
+
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_star_ref_link_recipient(),
+				st::starrefCenteredText),
+			style::al_top);
+		Ui::AddSkip(box->verticalLayout());
+		box->addRow(object_ptr<Ui::AbstractButton>::fromRaw(
+			MakePeerBubbleButton(box, peer).release()
+		))->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+		Ui::AddSkip(box->verticalLayout(), st::defaultVerticalListSkip * 2);
+		const auto preview = box->addRow(MakeLinkLabel(box, row.state.link));
+		Ui::AddSkip(box->verticalLayout());
+
+		const auto copy = [=](bool close) {
+			return [=] {
+				QApplication::clipboard()->setText(row.state.link);
+				box->uiShow()->showToast({
+					.text = { tr::lng_username_copied(tr::now) },
+					.iconLottie = u"toast/voip_invite"_q,
+					.iconLottieSize = st::toastLottieIconSize,
+				});
+				if (close) {
+					box->closeBox();
+				}
+			};
+		};
+		preview->setClickedCallback(copy(false));
+		const auto button = box->addButton(
+			tr::lng_star_ref_link_copy(),
+			copy(true),
+			st::starrefCopyButton);
+
+		const auto name = TextWithEntities{ bot->name() };
+		AddFullWidthButtonFooter(
+			box,
+			button,
+			(row.state.users > 0
+				? tr::lng_star_ref_link_copy_users(
+					lt_count,
+					rpl::single(row.state.users * 1.),
+					lt_app,
+					rpl::single(name),
+					tr::marked)
+				: tr::lng_star_ref_link_copy_none(
+					lt_app,
+					rpl::single(name),
+					tr::marked)));
+	});
+}
+
+object_ptr<Ui::BoxContent> JoinStarRefBox(
+		ConnectedBot row,
+		not_null<PeerData*> initialRecipient,
+		std::vector<not_null<PeerData*>> recipients,
+		Fn<void(ConnectedBotState)> done) {
+	Expects(row.bot->isUser());
+
+	return Box([=](not_null<Ui::GenericBox*> box) {
+		const auto show = box->uiShow();
+
+		const auto bot = row.bot;
+		const auto program = row.state.program;
+		auto list = recipients;
+		if (!list.empty()) {
+			list.erase(ranges::remove(list, bot), end(list));
+			if (!ranges::contains(list, initialRecipient)) {
+				list.insert(begin(list), initialRecipient);
+			}
+		}
+
+		box->setStyle(st::starrefFooterBox);
+		box->setNoContentMargin(true);
+		box->addTopButton(st::boxTitleClose, [=] {
+			box->closeBox();
+		});
+
+		struct State {
+			rpl::variable<not_null<PeerData*>> recipient;
+			base::weak_qptr<Ui::GenericBox> weak;
+			bool sent = false;
+		};
+		const auto state = std::make_shared<State>(State{
+			.recipient = initialRecipient,
+			.weak = box.get(),
+		});
+		const auto userpicsWrap = box->addRow(
+			object_ptr<Ui::VerticalLayout>(box),
+			QMargins());
+
+		state->recipient.value(
+		) | rpl::on_next([=](not_null<PeerData*> recipient) {
+			while (userpicsWrap->count()) {
+				delete userpicsWrap->widgetAt(0);
+			}
+			userpicsWrap->add(
+				CreateUserpicsTransfer(
+					box,
+					rpl::single(std::vector{ not_null<PeerData*>(bot) }),
+					recipient,
+					UserpicsTransferType::StarRefJoin),
+				st::boxRowPadding + st::starrefJoinUserpicsPadding);
+			userpicsWrap->resizeToWidth(box->width());
+		}, box->lifetime());
+
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_star_ref_title(),
+				st::boxTitle),
+			st::boxRowPadding + st::starrefJoinTitlePadding,
+			style::al_top);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_star_ref_one_about(
+					lt_app,
+					rpl::single(tr::bold(bot->name())),
+					lt_amount,
+					rpl::single(tr::bold(
+						FormatCommission(program.commission))),
+					lt_duration,
+					FormatForProgramDuration(program.durationMonths),
+					tr::marked),
+				st::starrefCenteredText),
+			style::al_top);
+
+		Ui::AddSkip(box->verticalLayout(), st::defaultVerticalListSkip * 3);
+		if (const auto average = program.revenuePerUser) {
+			const auto layout = box->verticalLayout();
+			auto text = Ui::Text::Colorized(Ui::CreditsEmoji());
+			text.append(Lang::FormatCreditsAmountRounded(average));
+			layout->add(
+				object_ptr<Ui::FlatLabel>(
+					box,
+					tr::lng_star_ref_one_daily_revenue(
+						lt_amount,
+						rpl::single(
+							Ui::Text::Wrapped(text, EntityType::Bold)),
+						tr::marked),
+					st::starrefRevenueText,
+					st::defaultPopupMenu),
+				st::boxRowPadding,
+				style::al_top);
+			Ui::AddSkip(layout, st::defaultVerticalListSkip);
+		}
+
+		if (!list.empty()) {
+			struct Name {
+				not_null<PeerData*> peer;
+				QString name;
+			};
+			auto names = ranges::views::transform(list, [](auto peer) {
+				const auto name = TextUtilities::NameSortKey(peer->name());
+				return Name{ peer, name };
+			}) | ranges::to_vector;
+			ranges::sort(names, ranges::less(), &Name::name);
+
+			list = ranges::views::transform(names, &Name::peer)
+				| ranges::to_vector;
+
+			box->addRow(
+				object_ptr<Ui::FlatLabel>(
+					box,
+					tr::lng_star_ref_link_recipient(),
+					st::starrefCenteredText),
+				style::al_top);
+			Ui::AddSkip(box->verticalLayout());
+			const auto recipientWrap = box->addRow(
+				object_ptr<Ui::VerticalLayout>(box),
+				QMargins());
+			state->recipient.value(
+			) | rpl::on_next([=](not_null<PeerData*> recipient) {
+				while (recipientWrap->count()) {
+					delete recipientWrap->widgetAt(0);
+				}
+
+				const auto selectable = (list.size() > 1);
+				const auto bgOverride = selectable
+					? &st::lightButtonBgOver
+					: nullptr;
+				const auto right = selectable
+					? Ui::CreateChild<Ui::RpWidget>(recipientWrap)
+					: nullptr;
+				if (right) {
+					const auto skip = st::chatGiveawayPeerPadding.right();
+					const auto icon = &st::starrefRecipientArrow;
+					const auto height = st::chatGiveawayPeerSize
+						- st::chatGiveawayPeerPadding.top() * 2;
+					right->resize(skip + icon->width(), height);
+					right->paintRequest() | rpl::on_next([=] {
+						auto p = QPainter(right);
+						icon->paint(
+							p,
+							skip,
+							(height - icon->height()) / 2,
+							right->width());
+					}, right->lifetime());
+				}
+				const auto button = recipientWrap->add(
+					object_ptr<Ui::AbstractButton>::fromRaw(
+						MakePeerBubbleButton(
+							box,
+							recipient,
+							right,
+							bgOverride).release()),
+					st::boxRowPadding);
+				recipientWrap->resizeToWidth(box->width());
+				if (!selectable) {
+					button->setAttribute(Qt::WA_TransparentForMouseEvents);
+					return;
+				}
+				button->setClickedCallback([=] {
+					const auto callback = [=](not_null<PeerData*> peer) {
+						state->recipient = peer;
+					};
+					ChooseRecipient(
+						button,
+						list,
+						state->recipient.current(),
+						crl::guard(button, callback));
+				});
+			}, box->lifetime());
+		}
+
+		const auto send = [=] {
+			if (state->sent) {
+				return;
+			}
+			state->sent = true;
+			const auto recipient = state->recipient.current();
+			ConnectStarRef(bot->asUser(), recipient, [=](ConnectedBot info) {
+				if (recipient == initialRecipient) {
+					if (const auto onstack = done) {
+						onstack(info.state);
+					}
+				}
+				show->show(StarRefLinkBox(info, recipient));
+				if (const auto strong = state->weak.get()) {
+					strong->closeBox();
+				}
+			}, [=](const QString &error) {
+				state->sent = false;
+				show->showToast(u"Failed: "_q + error);
+			});
+		};
+		const auto button = box->addButton(
+			tr::lng_star_ref_one_join(),
+			send);
+		AddFullWidthButtonFooter(
+			box,
+			button,
+			tr::lng_star_ref_one_join_text(
+				lt_terms,
+				tr::lng_star_ref_button_link(
+					tr::url(tr::lng_star_ref_tos_url(tr::now))),
+				tr::marked));
+	});
+}
+
+object_ptr<Ui::BoxContent> ConfirmEndBox(Fn<void()> finish) {
+	return Box([=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(tr::lng_star_ref_warning_title());
+		const auto skip = st::defaultVerticalListSkip;
+		const auto margins = st::boxRowPadding + QMargins(0, 0, 0, skip);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_star_ref_warning_if_end(tr::rich),
+				st::boxLabel),
+			margins);
+		const auto addPoint = [&](tr::phrase<> text) {
+			const auto padded = box->addRow(
+				object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
+					box,
+					object_ptr<Ui::FlatLabel>(
+						box,
+						text(tr::rich),
+						st::blockUserConfirmation),
+					QMargins(st::boxTextFont->height, 0, 0, 0)),
+				margins);
+			padded->paintRequest() | rpl::on_next([=] {
+				auto p = QPainter(padded);
+				auto hq = PainterHighQualityEnabler(p);
+				const auto size = st::starrefEndBulletSize;
+				const auto top = st::starrefEndBulletTop;
+				p.setBrush(st::windowFg);
+				p.setPen(Qt::NoPen);
+				p.drawEllipse(0, top, size, size);
+			}, padded->lifetime());
+		};
+		addPoint(tr::lng_star_ref_warning_if_end1);
+		addPoint(tr::lng_star_ref_warning_if_end2);
+		addPoint(tr::lng_star_ref_warning_if_end3);
+		const auto done = [=] {
+			box->closeBox();
+			finish();
+		};
+		box->addButton(
+			tr::lng_star_ref_warning_end(),
+			done,
+			st::attentionBoxButton);
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	});
+}
+
+void ResolveRecipients(
+		not_null<Main::Session*> session,
+		Fn<void(std::vector<not_null<PeerData*>>)> done) {
+	struct State {
+		not_null<Main::Session*> session;
+		std::vector<not_null<PeerData*>> list;
+		Fn<void(std::vector<not_null<PeerData*>>)> done;
+	};
+	const auto state = std::make_shared<State>(State{
+		.session = session,
+		.done = std::move(done),
+	});
+	const auto finish1 = [state](const MTPmessages_Chats &result) {
+		const auto already = int(state->list.size());
+		const auto session = state->session;
+		result.match([&](const auto &data) {
+			const auto &list = data.vchats().v;
+			state->list.reserve(list.size() + (already ? already : 1));
+			if (!already) {
+				state->list.push_back(session->user());
+			}
+			for (const auto &chat : list) {
+				const auto peer = session->data().processChat(chat);
+				if (const auto channel = peer->asBroadcast()) {
+					if (channel->canPostMessages()) {
+						state->list.push_back(channel);
+					}
+				}
+			}
+			if (already) {
+				base::take(state->done)(base::take(state->list));
+			}
+		});
+	};
+	const auto finish2 = [state](const MTPVector<MTPUser> &result) {
+		const auto already = int(state->list.size());
+		const auto session = state->session;
+		const auto &list = result.v;
+		state->list.reserve(list.size() + (already ? already : 1));
+		if (!already) {
+			state->list.push_back(session->user());
+		}
+		for (const auto &user : list) {
+			state->list.push_back(session->data().processUser(user));
+		}
+		if (already) {
+			base::take(state->done)(base::take(state->list));
+		}
+	};
+
+	session->api().request(MTPchannels_GetAdminedPublicChannels(
+		MTP_flags(0)
+	)).done(finish1).fail([=] {
+		finish1(MTP_messages_chats(MTP_vector<MTPChat>(0)));
+	}).send();
+
+	state->session->api().request(MTPbots_GetAdminedBots(
+	)).done(finish2).fail([=] {
+		finish2(MTP_vector<MTPUser>(0));
+	}).send();
+}
+
+std::unique_ptr<Ui::AbstractButton> MakePeerBubbleButton(
+		not_null<QWidget*> parent,
+		not_null<PeerData*> peer,
+		Ui::RpWidget *right,
+		const style::color *bgOverride) {
+	class Button final : public Ui::AbstractButton {
+	public:
+		Button(QWidget *parent, not_null<int*> innerWidth)
+		: AbstractButton(parent)
+		, _innerWidth(innerWidth) {
+		}
+
+		void mouseMoveEvent(QMouseEvent *e) override {
+			const auto inner = *_innerWidth;
+			const auto skip = (width() - inner) / 2;
+			const auto p = e->pos();
+			const auto over = QRect(skip, 0, inner, height()).contains(p);
+			setOver(over, StateChangeSource::ByHover);
+		}
+
+	private:
+		const not_null<int*> _innerWidth;
+
+	};
+
+	auto ownedWidth = std::make_unique<int>();
+	const auto width = ownedWidth.get();
+	auto result = std::make_unique<Button>(parent, width);
+	result->lifetime().add([moved = std::move(ownedWidth)] {});
+
+	const auto size = st::chatGiveawayPeerSize;
+	const auto padding = st::chatGiveawayPeerPadding;
+
+	const auto raw = result.get();
+
+	const auto name = raw->lifetime().make_state<Ui::FlatLabel>(
+		raw,
+		rpl::single(peer->name()),
+		st::botEmojiStatusName);
+	const auto userpic = raw->lifetime().make_state<Ui::UserpicButton>(
+		raw,
+		peer,
+		st::botEmojiStatusUserpic);
+	name->setAttribute(Qt::WA_TransparentForMouseEvents);
+	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	if (right) {
+		right->setParent(result.get());
+		right->show();
+		right->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
+
+	auto rightWidth = right ? right->widthValue() : rpl::single(0);
+
+	raw->resize(size, size);
+	rpl::combine(
+		raw->sizeValue(),
+		std::move(rightWidth)
+	) | rpl::on_next([=](QSize outer, int rwidth) {
+		const auto full = outer.width();
+		const auto decorations = size
+			+ padding.left()
+			+ padding.right()
+			+ rwidth;
+		const auto inner = full - decorations;
+		const auto use = std::min(inner, name->textMaxWidth());
+		*width = use + decorations;
+		const auto left = (full - *width) / 2;
+		if (inner > 0) {
+			userpic->moveToLeft(left, 0, outer.width());
+			if (right) {
+				right->moveToLeft(
+					left + *width - padding.right() - rwidth,
+					padding.top(),
+					outer.width());
+			}
+			name->resizeToWidth(use);
+			name->moveToLeft(
+				left + size + padding.left(),
+				padding.top(),
+				outer.width());
+		}
+	}, raw->lifetime());
+	raw->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(raw);
+		const auto left = (raw->width() - *width) / 2;
+		const auto skip = size / 2;
+		p.setClipRect(left + skip, 0, *width - skip, size);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(bgOverride ? *bgOverride : st::windowBgOver);
+		p.drawRoundedRect(left, 0, *width, size, skip, skip);
+	}, raw->lifetime());
+
+	return result;
+}
+
+void ConfirmUpdate(
+		std::shared_ptr<Ui::Show> show,
+		not_null<UserData*> bot,
+		const StarRefProgram &program,
+		bool exists,
+		Fn<void(Fn<void(bool)>)> update) {
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		const auto sent = std::make_shared<bool>();
+		Ui::ConfirmBox(box, {
+			.text = (exists
+				? tr::lng_star_ref_warning_change
+				: tr::lng_star_ref_warning_text)(tr::rich),
+			.confirmed = [=](Fn<void()> close) {
+				if (*sent) {
+					return;
+				}
+				*sent = true;
+				update([=](bool success) {
+					*sent = false;
+					if (success) {
+						close();
+					}
+				});
+			},
+			.confirmText = (exists
+				? tr::lng_star_ref_warning_update
+				: tr::lng_star_ref_warning_start)(),
+			.title = tr::lng_star_ref_warning_title(),
+		});
+
+		auto table = box->addRow(
+			object_ptr<Ui::TableLayout>(
+				box,
+				st::giveawayGiftCodeTable),
+			st::giveawayGiftCodeTableMargin);
+		const auto addRow = [&](
+				rpl::producer<QString> label,
+				const QString &value) {
+			table->addRow(
+				object_ptr<Ui::FlatLabel>(
+					table,
+					std::move(label),
+					table->st().defaultLabel),
+				object_ptr<Ui::FlatLabel>(
+					table,
+					value,
+					table->st().defaultValue,
+					st::defaultPopupMenu),
+				st::giveawayGiftCodeLabelMargin,
+				st::giveawayGiftCodeValueMargin);
+		};
+		addRow(
+			tr::lng_star_ref_commission_title(),
+			FormatCommission(program.commission));
+		addRow(
+			tr::lng_star_ref_duration_title(),
+			FormatProgramDuration(program.durationMonths));
+	}));
+}
+
+void UpdateProgram(
+		std::shared_ptr<Ui::Show> show,
+		not_null<UserData*> bot,
+		const StarRefProgram &program,
+		Fn<void(bool)> done) {
+	using Flag = MTPbots_UpdateStarRefProgram::Flag;
+	bot->session().api().request(MTPbots_UpdateStarRefProgram(
+		MTP_flags((program.commission > 0 && program.durationMonths > 0)
+			? Flag::f_duration_months
+			: Flag()),
+		bot->inputUser(),
+		MTP_int(program.commission),
+		MTP_int(program.durationMonths)
+	)).done([=](const MTPStarRefProgram &result) {
+		bot->setStarRefProgram(Data::ParseStarRefProgram(&result));
+		done(true);
+	}).fail([=](const MTP::Error &error) {
+		show->showToast(u"Failed: "_q + error.type());
+		done(false);
+	}).send();
+}
+
+void FinishProgram(
+		std::shared_ptr<Ui::Show> show,
+		not_null<UserData*> bot,
+		Fn<void(bool)> done) {
+	UpdateProgram(std::move(show), bot, {}, std::move(done));
+}
+
+ConnectedBots Parse(
+		not_null<Main::Session*> session,
+		const MTPpayments_ConnectedStarRefBots &bots) {
+	const auto &data = bots.data();
+	session->data().processUsers(data.vusers());
+	const auto &list = data.vconnected_bots().v;
+	auto result = ConnectedBots();
+	for (const auto &bot : list) {
+		const auto &data = bot.data();
+		const auto botId = UserId(data.vbot_id());
+		const auto link = qs(data.vurl());
+		const auto date = data.vdate().v;
+		const auto commission = data.vcommission_permille().v;
+		const auto durationMonths
+			= data.vduration_months().value_or_empty();
+		const auto users = int(data.vparticipants().v);
+		const auto revoked = data.is_revoked();
+		result.push_back({
+			.bot = session->data().user(botId),
+			.state = {
+				.program = {
+					.commission = ushort(commission),
+					.durationMonths = uchar(durationMonths),
+				},
+				.link = link,
+				.date = date,
+				.users = users,
+				.revoked = revoked,
+			},
+		});
+	}
+	return result;
+}
+
+object_ptr<Ui::RpWidget> CreateLinkHeaderIcon(
+		not_null<QWidget*> parent,
+		not_null<Main::Session*> session,
+		int usersCount) {
+	return CreateLinkIcon(parent, session, usersCount);
+}
+
+} // namespace Info::BotStarRef
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.h b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.h
new file mode 100644
index 00000000000000..e38bdd1c5a1250
--- /dev/null
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.h
@@ -0,0 +1,112 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+#include "data/data_user.h"
+
+namespace Ui {
+class AbstractButton;
+class RoundButton;
+class VerticalLayout;
+class BoxContent;
+class RpWidget;
+class Show;
+} // namespace Ui
+
+namespace style {
+struct RoundButton;
+struct InputField;
+} // namespace style
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Info::BotStarRef {
+
+struct ConnectedBotState {
+	StarRefProgram program;
+	QString link;
+	TimeId date = 0;
+	int users = 0;
+	bool unresolved = false;
+	bool revoked = false;
+};
+struct ConnectedBot {
+	not_null<UserData*> bot;
+	ConnectedBotState state;
+};
+using ConnectedBots = std::vector<ConnectedBot>;
+
+[[nodiscard]] QString FormatCommission(ushort commission);
+[[nodiscard]] QString FormatProgramDuration(int durationMonths);
+[[nodiscard]] rpl::producer<TextWithEntities> FormatForProgramDuration(
+	int durationMonths);
+
+[[nodiscard]] not_null<Ui::AbstractButton*> AddViewListButton(
+	not_null<Ui::VerticalLayout*> parent,
+	rpl::producer<QString> title,
+	rpl::producer<QString> subtitle,
+	bool newBadge = false);
+
+void AddFullWidthButtonFooter(
+	not_null<Ui::BoxContent*> box,
+	not_null<Ui::RpWidget*> button,
+	rpl::producer<TextWithEntities> text);
+
+[[nodiscard]] object_ptr<Ui::BoxContent> StarRefLinkBox(
+	ConnectedBot row,
+	not_null<PeerData*> peer);
+[[nodiscard]] object_ptr<Ui::BoxContent> JoinStarRefBox(
+	ConnectedBot row,
+	not_null<PeerData*> initialRecipient,
+	std::vector<not_null<PeerData*>> recipients,
+	Fn<void(ConnectedBotState)> done = nullptr);
+[[nodiscard]] object_ptr<Ui::BoxContent> ConfirmEndBox(Fn<void()> finish);
+
+void ResolveRecipients(
+	not_null<Main::Session*> session,
+	Fn<void(std::vector<not_null<PeerData*>>)> done);
+
+std::unique_ptr<Ui::AbstractButton> MakePeerBubbleButton(
+	not_null<QWidget*> parent,
+	not_null<PeerData*> peer,
+	Ui::RpWidget *right = nullptr,
+	const style::color *bgOverride = nullptr);
+
+void ConfirmUpdate(
+	std::shared_ptr<Ui::Show> show,
+	not_null<UserData*> bot,
+	const StarRefProgram &program,
+	bool exists,
+	Fn<void(Fn<void(bool)> done)> update);
+void UpdateProgram(
+	std::shared_ptr<Ui::Show> show,
+	not_null<UserData*> bot,
+	const StarRefProgram &program,
+	Fn<void(bool)> done);
+void FinishProgram(
+	std::shared_ptr<Ui::Show> show,
+	not_null<UserData*> bot,
+	Fn<void(bool)> done);
+
+[[nodiscard]] ConnectedBots Parse(
+	not_null<Main::Session*> session,
+	const MTPpayments_ConnectedStarRefBots &bots);
+
+[[nodiscard]] object_ptr<Ui::AbstractButton> MakeLinkLabel(
+	not_null<QWidget*> parent,
+	const QString &link,
+	const style::InputField *stOverride = nullptr);
+[[nodiscard]] object_ptr<Ui::RpWidget> CreateLinkHeaderIcon(
+	not_null<QWidget*> parent,
+	not_null<Main::Session*> session,
+	int usersCount = 0);
+
+} // namespace Info::BotStarRef
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.cpp b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.cpp
new file mode 100644
index 00000000000000..a1cecf2c2444a6
--- /dev/null
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.cpp
@@ -0,0 +1,1146 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/bot/starref/info_bot_starref_join_widget.h"
+
+#include "apiwrap.h"
+#include "base/timer_rpl.h"
+#include "base/unixtime.h"
+#include "base/weak_ptr.h"
+#include "boxes/peer_list_box.h"
+#include "core/click_handler_types.h"
+#include "data/data_channel.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "info/bot/starref/info_bot_starref_common.h"
+#include "info/profile/info_profile_icon.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "settings/settings_common.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/effects/premium_top_bar.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_media_player.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
+
+#include <QApplication>
+
+namespace Info::BotStarRef::Join {
+namespace {
+
+constexpr auto kPerPage = 50;
+
+enum class JoinType {
+	Joined,
+	Suggested,
+	Existing,
+};
+
+enum class SuggestedSort {
+	Profitability,
+	Revenue,
+	Date
+};
+
+class ListController final
+	: public PeerListController
+	, public base::has_weak_ptr {
+public:
+	ListController(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		JoinType type);
+	~ListController();
+
+	Main::Session &session() const override;
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override;
+	void loadMoreRows() override;
+
+	[[nodiscard]] rpl::producer<int> rowCountValue() const;
+	[[nodiscard]] rpl::producer<ConnectedBot> connected() const;
+	[[nodiscard]] rpl::producer<ConnectedBot> revoked() const;
+	[[nodiscard]] rpl::producer<> addForBotRequests() const;
+
+	void setSort(SuggestedSort sort);
+
+	void process(ConnectedBot row);
+
+private:
+	[[nodiscard]] std::unique_ptr<PeerListRow> createRow(ConnectedBot bot);
+	void open(not_null<UserData*> bot, ConnectedBotState state);
+	void requestRecipients();
+	void setupAddForBot();
+	void setupLinkBadge();
+	void refreshRows();
+
+	const not_null<Window::SessionController*> _controller;
+	const not_null<PeerData*> _peer;
+	const JoinType _type = {};
+
+	base::flat_map<not_null<PeerData*>, ConnectedBotState> _states;
+	base::flat_set<not_null<PeerData*>> _resolving;
+	UserData *_openOnResolve = nullptr;
+
+	Fn<void()> _recipientsReady;
+	std::vector<not_null<PeerData*>> _recipients;
+	rpl::event_stream<ConnectedBot> _connected;
+	rpl::event_stream<ConnectedBot> _revoked;
+	rpl::event_stream<> _addForBot;
+
+	mtpRequestId _requestId = 0;
+	TimeId _offsetDate = 0;
+	QString _offsetThing;
+	bool _allLoaded = false;
+	bool _recipientsRequested = false;
+	SuggestedSort _sort = SuggestedSort::Profitability;
+	QImage _linkBadge;
+
+	rpl::variable<int> _rowCount = 0;
+
+};
+
+class Row final : public PeerListRow {
+public:
+	Row(
+		not_null<PeerData*> peer,
+		StarRefProgram program,
+		QImage *link = nullptr);
+
+	void paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int availableWidth,
+		int outerWidth,
+		bool selected) override;
+	PaintRoundImageCallback generatePaintUserpicCallback(
+		bool forceRound) override;
+
+private:
+	void refreshStatus() override;
+
+	StarRefProgram _program;
+	QImage *_link = nullptr;
+	QImage _userpic;
+	QImage _badge;
+
+};
+
+Row::Row(
+	not_null<PeerData*> peer,
+	StarRefProgram program,
+	QImage *link)
+: PeerListRow(peer)
+, _program(program)
+, _link(link) {
+}
+
+void Row::paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int availableWidth,
+		int outerWidth,
+		bool selected) {
+	const auto top = y
+		+ st::contactsStatusFont->ascent
+		- st::starrefCommissionFont->ascent
+		- st::lineWidth;
+	p.drawImage(x, top, _badge);
+
+	const auto space = st::normalFont->spacew;
+	auto shift = (_badge.width() / _badge.devicePixelRatio()) + space;
+	x += shift;
+	availableWidth -= shift;
+
+	PeerListRow::paintStatusText(
+		p,
+		st,
+		x,
+		y,
+		availableWidth,
+		outerWidth,
+		selected);
+}
+
+PaintRoundImageCallback Row::generatePaintUserpicCallback(
+		bool forceRound) {
+	if (!_link) {
+		return PeerListRow::generatePaintUserpicCallback(forceRound);
+	}
+	return [=](
+			Painter &p,
+			int x,
+			int y,
+			int outerWidth,
+			int size) {
+		const auto ratio = style::DevicePixelRatio();
+		const auto dimensions = QSize(size, size);
+		if (_userpic.size() != dimensions * ratio) {
+			_userpic = QImage(
+				dimensions * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			_userpic.setDevicePixelRatio(ratio);
+		}
+		_userpic.fill(Qt::transparent);
+
+		auto q = Painter(&_userpic);
+		auto hq = PainterHighQualityEnabler(q);
+		auto paint = PeerListRow::generatePaintUserpicCallback(forceRound);
+		paint(q, 0, 0, size, size);
+		const auto corner = _link->size() / _link->devicePixelRatio();
+		auto pen = QPen(Qt::transparent, st::lineWidth * 1.5);
+		q.setCompositionMode(QPainter::CompositionMode_Source);
+		q.setPen(pen);
+		q.setBrush(st::historyPeer2UserpicBg2);
+		const auto left = size - corner.width();
+		const auto top = size - corner.height();
+		q.drawEllipse(left, top, corner.width(), corner.height());
+		q.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		q.drawImage(left, top, *_link);
+		q.end();
+
+		p.drawImage(x, y, _userpic);
+	};
+}
+
+void Row::refreshStatus() {
+	const auto text = FormatCommission(_program.commission);
+	const auto padding = st::starrefCommissionPadding;
+	const auto font = st::starrefCommissionFont;
+	const auto width = font->width(text);
+	const auto inner = QRect(0, 0, width, font->height);
+	const auto outer = inner.marginsAdded(padding);
+	const auto ratio = style::DevicePixelRatio();
+	_badge = QImage(
+		outer.size() * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	_badge.setDevicePixelRatio(ratio);
+	_badge.fill(Qt::transparent);
+
+	auto p = QPainter(&_badge);
+	p.setBrush(st::historyPeer2UserpicBg2);
+	p.setPen(Qt::NoPen);
+	const auto radius = st::roundRadiusSmall;
+	p.drawRoundedRect(outer.translated(-outer.topLeft()), radius, radius);
+	p.setFont(font);
+	p.setBrush(Qt::NoBrush);
+	p.setPen(st::historyPeerUserpicFg);
+	p.drawText(padding.left(), padding.top() + font->ascent, text);
+	p.end();
+
+	setCustomStatus(FormatProgramDuration(_program.durationMonths));
+}
+
+void Resolve(
+		not_null<PeerData*> peer,
+		not_null<UserData*> bot,
+		Fn<void(std::optional<ConnectedBotState>)> done) {
+	peer->session().api().request(MTPpayments_GetConnectedStarRefBot(
+		peer->input(),
+		bot->inputUser()
+	)).done([=](const MTPpayments_ConnectedStarRefBots &result) {
+		const auto parsed = Parse(&peer->session(), result);
+		if (parsed.empty()) {
+			done(std::nullopt);
+		} else {
+			done(parsed.front().state);
+		}
+	}).fail([=] {
+		done(std::nullopt);
+	}).send();
+}
+
+ListController::ListController(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> peer,
+	JoinType type)
+: PeerListController()
+, _controller(controller)
+, _peer(peer)
+, _type(type) {
+	setStyleOverrides(&st::peerListSingleRow);
+
+	if (_type == JoinType::Joined) {
+		setupLinkBadge();
+		style::PaletteChanged() | rpl::on_next([=] {
+			setupLinkBadge();
+		}, lifetime());
+	}
+}
+
+ListController::~ListController() {
+	if (_requestId) {
+		session().api().request(_requestId).cancel();
+	}
+}
+
+Main::Session &ListController::session() const {
+	return _peer->session();
+}
+
+std::unique_ptr<PeerListRow> ListController::createRow(ConnectedBot bot) {
+	_states.emplace(bot.bot, bot.state);
+	const auto link = _linkBadge.isNull() ? nullptr : &_linkBadge;
+	return std::make_unique<Row>(bot.bot, bot.state.program, link);
+}
+
+void ListController::setupLinkBadge() {
+	const auto side = st::starrefLinkBadge;
+	const auto size = QSize(side, side);
+	const auto ratio = style::DevicePixelRatio();
+
+	_linkBadge = QImage(size * ratio, QImage::Format_ARGB32_Premultiplied);
+	_linkBadge.setDevicePixelRatio(ratio);
+	_linkBadge.fill(Qt::transparent);
+
+	const auto skip = st::starrefLinkBadgeSkip;
+	const auto inner = QSize(side - 2 * skip, side - 2 * skip);
+
+	auto p = QPainter(&_linkBadge);
+	auto hq = PainterHighQualityEnabler(p);
+
+	auto owned = Lottie::MakeIcon({
+		.name = u"starref_link"_q,
+		.color = &st::historyPeerUserpicFg,
+		.sizeOverride = inner,
+	});
+	p.drawImage(QRect(QPoint(skip, skip), inner), owned->frame());
+}
+
+void ListController::prepare() {
+	delegate()->peerListSetTitle((_type == JoinType::Joined)
+		? tr::lng_star_ref_list_my()
+		: tr::lng_star_ref_list_title());
+	loadMoreRows();
+}
+
+void ListController::loadMoreRows() {
+	if (_requestId || _allLoaded) {
+		return;
+	} else if (_type == JoinType::Joined) {
+		using Flag = MTPpayments_GetConnectedStarRefBots::Flag;
+		_requestId = session().api().request(
+			MTPpayments_GetConnectedStarRefBots(
+				MTP_flags(Flag()
+					| (_offsetDate ? Flag::f_offset_date : Flag())
+					| (_offsetThing.isEmpty() ? Flag() : Flag::f_offset_link)),
+				_peer->input(),
+				MTP_int(_offsetDate),
+				MTP_string(_offsetThing),
+				MTP_int(kPerPage))
+		).done([=](const MTPpayments_ConnectedStarRefBots &result) {
+			const auto parsed = Parse(&session(), result);
+			if (parsed.empty()) {
+				_allLoaded = true;
+			} else {
+				for (const auto &bot : parsed) {
+					if (!delegate()->peerListFindRow(bot.bot->id.value)) {
+						delegate()->peerListAppendRow(createRow(bot));
+					}
+				}
+				refreshRows();
+			}
+			_requestId = 0;
+		}).fail([=](const MTP::Error &error) {
+			_requestId = 0;
+		}).send();
+	} else {
+		if (_type == JoinType::Existing) {
+			setDescriptionText(tr::lng_contacts_loading(tr::now));
+		}
+		using Flag = MTPpayments_GetSuggestedStarRefBots::Flag;
+		_requestId = session().api().request(
+			MTPpayments_GetSuggestedStarRefBots(
+				MTP_flags((_sort == SuggestedSort::Revenue)
+					? Flag::f_order_by_revenue
+					: (_sort == SuggestedSort::Date)
+					? Flag::f_order_by_date
+					: Flag()),
+				_peer->input(),
+				MTP_string(_offsetThing),
+				MTP_int(kPerPage))
+		).done([=](const MTPpayments_SuggestedStarRefBots &result) {
+			setDescriptionText(QString());
+			setupAddForBot();
+
+			if (_offsetThing.isEmpty()) {
+				while (delegate()->peerListFullRowsCount() > 0) {
+					delegate()->peerListRemoveRow(
+						delegate()->peerListRowAt(0));
+				}
+			}
+
+			const auto &data = result.data();
+			if (data.vnext_offset()) {
+				_offsetThing = qs(*data.vnext_offset());
+			} else {
+				_allLoaded = true;
+			}
+			session().data().processUsers(data.vusers());
+			for (const auto &program : data.vsuggested_bots().v) {
+				const auto botId = UserId(program.data().vbot_id());
+				const auto user = session().data().user(botId);
+				if (!delegate()->peerListFindRow(user->id.value)) {
+					delegate()->peerListAppendRow(createRow({
+						.bot = user,
+						.state = {
+							.program = Data::ParseStarRefProgram(&program),
+							.unresolved = true,
+						},
+					}));
+				}
+			}
+			refreshRows();
+			_requestId = 0;
+		}).fail([=](const MTP::Error &error) {
+			_allLoaded = true;
+			_requestId = 0;
+		}).send();
+	}
+}
+
+void ListController::setupAddForBot() {
+	const auto user = _peer->asUser();
+	if (_type != JoinType::Existing
+		|| !user
+		|| !user->isBot()
+		|| user->botInfo->starRefProgram.commission > 0) {
+		return;
+	}
+	auto button = object_ptr<Ui::PaddingWrap<Ui::SettingsButton>>(
+		nullptr,
+		object_ptr<Ui::SettingsButton>(
+			nullptr,
+			tr::lng_star_ref_add_bot(lt_bot, rpl::single(user->name())),
+			st::inviteViaLinkButton),
+		style::margins(0, st::membersMarginTop, 0, 0));
+
+	const auto icon = Ui::CreateChild<Info::Profile::FloatingIcon>(
+		button->entity(),
+		st::starrefAddForBotIcon,
+		QPoint());
+	button->entity()->heightValue(
+	) | rpl::on_next([=](int height) {
+		icon->moveToLeft(
+			st::starrefAddForBotIconPosition.x(),
+			(height - st::starrefAddForBotIcon.height()) / 2);
+	}, icon->lifetime());
+
+	button->entity()->setClickedCallback([=] {
+		_addForBot.fire({});
+	});
+	button->entity()->events(
+	) | rpl::filter([=](not_null<QEvent*> e) {
+		return (e->type() == QEvent::Enter);
+	}) | rpl::on_next([=] {
+		delegate()->peerListMouseLeftGeometry();
+	}, button->lifetime());
+	delegate()->peerListSetAboveWidget(std::move(button));
+}
+
+rpl::producer<int> ListController::rowCountValue() const {
+	return _rowCount.value();
+}
+
+rpl::producer<ConnectedBot> ListController::connected() const {
+	return _connected.events();
+}
+
+rpl::producer<ConnectedBot> ListController::revoked() const {
+	return _revoked.events();
+}
+
+rpl::producer<> ListController::addForBotRequests() const {
+	return _addForBot.events();
+}
+
+void ListController::setSort(SuggestedSort sort) {
+	if (_sort == sort) {
+		return;
+	}
+	_sort = sort;
+	if (const auto requestId = base::take(_requestId)) {
+		session().api().request(requestId).cancel();
+	}
+	_allLoaded = false;
+	_offsetThing = QString();
+	loadMoreRows();
+}
+
+void ListController::process(ConnectedBot row) {
+	if (_type != JoinType::Joined) {
+		_states[row.bot] = { .program = row.state.program };
+	}
+	if (!delegate()->peerListFindRow(PeerListRowId(row.bot->id.value))) {
+		delegate()->peerListPrependRow(createRow(row));
+		refreshRows();
+	}
+}
+
+void ListController::refreshRows() {
+	delegate()->peerListRefreshRows();
+	_rowCount = delegate()->peerListFullRowsCount();
+}
+
+void ListController::rowClicked(not_null<PeerListRow*> row) {
+	const auto bot = row->peer()->asUser();
+	const auto i = _states.find(bot);
+	Assert(i != end(_states));
+	if (i->second.unresolved) {
+		if (!_resolving.emplace(bot).second) {
+			return;
+		}
+		_openOnResolve = bot;
+		const auto resolved = [=](std::optional<ConnectedBotState> state) {
+			_resolving.remove(bot);
+			auto &now = _states[bot];
+			if (state) {
+				now = *state;
+			}
+			if (_openOnResolve == bot) {
+				open(bot, now);
+			}
+		};
+		Resolve(_peer, bot, crl::guard(this, resolved));
+	} else {
+		_openOnResolve = nullptr;
+		open(bot, i->second);
+	}
+}
+
+void ListController::open(not_null<UserData*> bot, ConnectedBotState state) {
+	const auto show = _controller->uiShow();
+	if (_type == JoinType::Joined
+		|| (!state.link.isEmpty() && !state.revoked)) {
+		_recipientsReady = nullptr;
+		show->show(StarRefLinkBox({ bot, state }, _peer));
+	} else {
+		const auto requireOthers = (_type == JoinType::Existing)
+			|| _peer->isSelf();
+		const auto requestOthers = requireOthers && _recipients.empty();
+		if (requestOthers) {
+			_recipientsReady = [=] {
+				Expects(!_recipients.empty());
+
+				open(bot, state);
+			};
+			requestRecipients();
+			return;
+		}
+		const auto connected = crl::guard(this, [=](ConnectedBotState now) {
+			_states[bot] = now;
+			_connected.fire({ bot, now });
+		});
+		show->show(JoinStarRefBox(
+			{ bot, state },
+			_peer,
+			requireOthers ? _recipients : std::vector<not_null<PeerData*>>(),
+			connected));
+	}
+}
+
+void ListController::requestRecipients() {
+	if (_recipientsRequested) {
+		return;
+	}
+	_recipientsRequested = true;
+	const auto session = &this->session();
+	ResolveRecipients(session, crl::guard(this, [=](
+			std::vector<not_null<PeerData*>> list) {
+		_recipients = std::move(list);
+		if (const auto callback = base::take(_recipientsReady)) {
+			callback();
+		}
+	}));
+}
+
+void RevokeLink(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		const QString &link,
+		Fn<void()> revoked) {
+	peer->session().api().request(MTPpayments_EditConnectedStarRefBot(
+		MTP_flags(MTPpayments_EditConnectedStarRefBot::Flag::f_revoked),
+		peer->input(),
+		MTP_string(link)
+	)).done([=] {
+		controller->showToast({
+			.title = tr::lng_star_ref_revoked_title(tr::now),
+			.text = { tr::lng_star_ref_revoked_text(tr::now) },
+		});
+		revoked();
+	}).fail([=](const MTP::Error &error) {
+		controller->showToast(u"Failed: "_q + error.type());
+	}).send();
+}
+
+base::unique_qptr<Ui::PopupMenu> ListController::rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	const auto bot = row->peer()->asUser();
+	const auto i = _states.find(bot);
+	Assert(i != end(_states));
+	const auto state = i->second;
+	auto result = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	const auto addAction = Ui::Menu::CreateAddActionCallback(result.get());
+
+	const auto revoked = crl::guard(this, [=] {
+		if (const auto row = delegate()->peerListFindRow(bot->id.value)) {
+			delegate()->peerListRemoveRow(row);
+			refreshRows();
+		}
+		_revoked.fire({ bot, state });
+	});
+
+	addAction(tr::lng_star_ref_list_my_open(tr::now), [=] {
+		_controller->showPeerHistory(bot);
+	}, &st::menuIconBot);
+	if (!state.link.isEmpty()) {
+		addAction(tr::lng_star_ref_list_my_copy(tr::now), [=] {
+			QApplication::clipboard()->setText(state.link);
+			_controller->showToast({
+				.text = { tr::lng_username_copied(tr::now) },
+				.iconLottie = u"toast/voip_invite"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		}, &st::menuIconLinks);
+		const auto revoke = [=] {
+			const auto link = state.link;
+			const auto sure = [=](Fn<void()> close) {
+				RevokeLink(_controller, _peer, link, revoked);
+				close();
+			};
+			_controller->show(Ui::MakeConfirmBox({
+				.text = tr::lng_star_ref_revoke_text(
+					lt_bot,
+					rpl::single(tr::bold(bot->name())),
+					tr::rich),
+				.confirmed = sure,
+				.title = tr::lng_star_ref_revoke_title(),
+			}));
+		};
+		addAction({
+			.text = tr::lng_star_ref_list_my_leave(tr::now),
+			.handler = revoke,
+			.icon = &st::menuIconLeaveAttention,
+			.isAttention = true,
+		});
+	}
+	return result;
+}
+
+} // namespace
+
+class InnerWidget final : public Ui::RpWidget {
+public:
+	InnerWidget(QWidget *parent, not_null<Controller*> controller);
+
+	[[nodiscard]] not_null<PeerData*> peer() const;
+
+	void showFinished();
+	void setInnerFocus();
+
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+private:
+	void prepare();
+	void setupInfo();
+	not_null<ListController*> setupMy();
+	not_null<ListController*> setupSuggested();
+	void setupSort(not_null<Ui::RpWidget*> label);
+
+	[[nodiscard]] object_ptr<Ui::RpWidget> infoRow(
+		rpl::producer<QString> title,
+		rpl::producer<QString> text,
+		not_null<const style::icon*> icon);
+
+	const not_null<Controller*> _controller;
+	const not_null<Ui::VerticalLayout*> _container;
+	rpl::variable<SuggestedSort> _sort = SuggestedSort::Profitability;
+	ListController *_my = nullptr;
+	ListController *_suggested = nullptr;
+
+};
+
+InnerWidget::InnerWidget(QWidget *parent, not_null<Controller*> controller)
+: RpWidget(parent)
+, _controller(controller)
+, _container(Ui::CreateChild<Ui::VerticalLayout>(this)) {
+	prepare();
+}
+
+void InnerWidget::prepare() {
+	Ui::ResizeFitChild(this, _container);
+
+	setupInfo();
+	Ui::AddSkip(_container);
+	Ui::AddDivider(_container);
+	_my = setupMy();
+	_suggested = setupSuggested();
+}
+
+void InnerWidget::setupInfo() {
+	AddSkip(_container, st::defaultVerticalListSkip * 2);
+
+	_container->add(infoRow(
+		tr::lng_star_ref_reliable_title(),
+		tr::lng_star_ref_reliable_about(),
+		&st::menuIconAntispam));
+
+	_container->add(infoRow(
+		tr::lng_star_ref_transparent_title(),
+		tr::lng_star_ref_transparent_about(),
+		&st::menuIconTransparent));
+
+	_container->add(infoRow(
+		tr::lng_star_ref_simple_title(),
+		tr::lng_star_ref_simple_about(),
+		&st::menuIconLike));
+}
+
+not_null<ListController*> InnerWidget::setupMy() {
+	const auto wrap = _container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			_container,
+			object_ptr<Ui::VerticalLayout>(_container)));
+	const auto inner = wrap->entity();
+
+	Ui::AddSkip(inner);
+	Ui::AddSubsectionTitle(inner, tr::lng_star_ref_list_my());
+
+	const auto delegate = lifetime().make_state<
+		PeerListContentDelegateSimple
+	>();
+	const auto controller = lifetime().make_state<ListController>(
+		_controller->parentController(),
+		peer(),
+		JoinType::Joined);
+	const auto content = inner->add(
+		object_ptr<PeerListContent>(
+			inner,
+			controller));
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
+
+	Ui::AddSkip(inner);
+	Ui::AddDivider(inner);
+
+	wrap->toggleOn(controller->rowCountValue(
+	) | rpl::map(rpl::mappers::_1 > 0));
+
+	controller->revoked(
+	) | rpl::on_next([=](ConnectedBot row) {
+		_suggested->process(row);
+	}, content->lifetime());
+
+	return controller;
+}
+
+void InnerWidget::setupSort(not_null<Ui::RpWidget*> label) {
+	constexpr auto phrase = [](SuggestedSort sort) {
+		return ((sort == SuggestedSort::Profitability)
+			? tr::lng_star_ref_sort_profitability
+			: (sort == SuggestedSort::Revenue)
+			? tr::lng_star_ref_sort_revenue
+			: tr::lng_star_ref_sort_date)(tr::now, tr::link);
+	};
+	const auto sort = Ui::CreateChild<Ui::FlatLabel>(
+		label->parentWidget(),
+		tr::lng_star_ref_sort_text(lt_sort, _sort.value() | rpl::map(phrase),
+		tr::marked),
+		st::defaultFlatLabel);
+	rpl::combine(
+		label->geometryValue(),
+		widthValue(),
+		sort->widthValue()
+	) | rpl::on_next([=](QRect geometry, int outer, int sortWidth) {
+		const auto skip = st::boxRowPadding.right();
+		const auto top = geometry.y()
+			+ st::defaultSubsectionTitle.style.font->ascent
+			- st::defaultFlatLabel.style.font->ascent;
+		sort->moveToLeft(outer - sortWidth - skip, top, outer);
+	}, sort->lifetime());
+	sort->setClickHandlerFilter([=](const auto &...) {
+		const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+			sort,
+			st::popupMenuWithIcons);
+		const auto orders = {
+			SuggestedSort::Profitability,
+			SuggestedSort::Revenue,
+			SuggestedSort::Date
+		};
+		for (const auto order : orders) {
+			const auto chosen = (order == _sort.current());
+			menu->addAction(phrase(order).text, crl::guard(this, [=] {
+				_sort = order;
+			}), chosen ? &st::mediaPlayerMenuCheck : nullptr);
+		}
+		menu->popup(sort->mapToGlobal(QPoint(0, 0)));
+		return false;
+	});
+}
+
+not_null<ListController*> InnerWidget::setupSuggested() {
+	const auto wrap = _container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			_container,
+			object_ptr<Ui::VerticalLayout>(_container)));
+	const auto inner = wrap->entity();
+
+	Ui::AddSkip(inner);
+	const auto subtitle = Ui::AddSubsectionTitle(
+		inner,
+		tr::lng_star_ref_list_subtitle());
+	setupSort(subtitle);
+
+	const auto delegate = lifetime().make_state<
+		PeerListContentDelegateSimple
+	>();
+	auto controller = lifetime().make_state<ListController>(
+		_controller->parentController(),
+		peer(),
+		JoinType::Suggested);
+	const auto content = inner->add(
+		object_ptr<PeerListContent>(
+			inner,
+			controller));
+	delegate->setContent(content);
+	controller->setDelegate(delegate);
+
+	wrap->toggleOn(controller->rowCountValue(
+	) | rpl::map(rpl::mappers::_1 > 0));
+
+	controller->connected(
+	) | rpl::on_next([=](ConnectedBot row) {
+		_my->process(row);
+	}, content->lifetime());
+
+	_sort.value() | rpl::on_next([=](SuggestedSort sort) {
+		controller->setSort(sort);
+	}, content->lifetime());
+
+	return controller;
+}
+
+object_ptr<Ui::RpWidget> InnerWidget::infoRow(
+		rpl::producer<QString> title,
+		rpl::producer<QString> text,
+		not_null<const style::icon*> icon) {
+	auto result = object_ptr<Ui::VerticalLayout>(_container);
+	const auto raw = result.data();
+
+	raw->add(
+		object_ptr<Ui::FlatLabel>(
+			raw,
+			std::move(title) | rpl::map(tr::bold),
+			st::defaultFlatLabel),
+		st::settingsPremiumRowTitlePadding);
+	raw->add(
+		object_ptr<Ui::FlatLabel>(
+			raw,
+			std::move(text),
+			st::boxDividerLabel),
+		st::settingsPremiumRowAboutPadding);
+	object_ptr<Info::Profile::FloatingIcon>(
+		raw,
+		*icon,
+		st::starrefInfoIconPosition);
+
+	return result;
+}
+
+not_null<PeerData*> InnerWidget::peer() const {
+	return _controller->key().starrefPeer();
+}
+
+void InnerWidget::showFinished() {
+
+}
+
+void InnerWidget::setInnerFocus() {
+	setFocus();
+}
+
+void InnerWidget::saveState(not_null<Memento*> memento) {
+
+}
+
+void InnerWidget::restoreState(not_null<Memento*> memento) {
+
+}
+
+Memento::Memento(not_null<Controller*> controller)
+: ContentMemento(Tag(controller->starrefPeer(), controller->starrefType())) {
+}
+
+Memento::Memento(not_null<PeerData*> peer)
+: ContentMemento(Tag(peer, Type::Join)) {
+}
+
+Memento::~Memento() = default;
+
+Section Memento::section() const {
+	return Section(Section::Type::BotStarRef);
+}
+
+object_ptr<ContentWidget> Memento::createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) {
+	auto result = object_ptr<Widget>(parent, controller);
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+Widget::Widget(
+	QWidget *parent,
+	not_null<Controller*> controller)
+: ContentWidget(parent, controller)
+, _inner(setInnerWidget(object_ptr<InnerWidget>(this, controller))) {
+	_top = setupTop();
+}
+
+not_null<PeerData*> Widget::peer() const {
+	return _inner->peer();
+}
+
+bool Widget::showInternal(not_null<ContentMemento*> memento) {
+	return (memento->starrefPeer() == peer());
+}
+
+rpl::producer<QString> Widget::title() {
+	return tr::lng_star_ref_list_title();
+}
+
+void Widget::setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento) {
+	setGeometry(geometry);
+	Ui::SendPendingMoveResizeEvents(this);
+	restoreState(memento);
+}
+
+rpl::producer<bool> Widget::desiredShadowVisibility() const {
+	return rpl::single<bool>(true);
+}
+
+void Widget::showFinished() {
+	_inner->showFinished();
+}
+
+void Widget::setInnerFocus() {
+	_inner->setInnerFocus();
+}
+
+void Widget::enableBackButton() {
+	_backEnabled = true;
+}
+
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(controller());
+	saveState(result.get());
+	return result;
+}
+
+void Widget::saveState(not_null<Memento*> memento) {
+	memento->setScrollTop(scrollTopSave());
+	_inner->saveState(memento);
+}
+
+void Widget::restoreState(not_null<Memento*> memento) {
+	_inner->restoreState(memento);
+	scrollTopRestore(memento->scrollTop());
+}
+
+std::unique_ptr<Ui::Premium::TopBarAbstract> Widget::setupTop() {
+	auto title = tr::lng_star_ref_list_title();
+	auto about = tr::lng_star_ref_list_about_channel(tr::marked);
+
+	const auto controller = this->controller();
+	const auto weak = base::make_weak(controller->parentController());
+	const auto clickContextOther = [=] {
+		return QVariant::fromValue(ClickHandlerContext{
+			.sessionWindow = weak,
+			.botStartAutoSubmit = true,
+		});
+	};
+	auto result = std::make_unique<Ui::Premium::TopBar>(
+		this,
+		st::starrefCover,
+		Ui::Premium::TopBarDescriptor{
+			.clickContextOther = clickContextOther,
+			.logo = u"affiliate"_q,
+			.title = std::move(title),
+			.about = std::move(about),
+			.light = true,
+		});
+	const auto raw = result.get();
+
+	controller->wrapValue(
+	) | rpl::on_next([=](Info::Wrap wrap) {
+		raw->setRoundEdges(wrap == Info::Wrap::Layer);
+	}, raw->lifetime());
+
+	const auto baseHeight = st::starrefCoverHeight;
+	raw->resize(width(), baseHeight);
+	const auto updateTopSkip = [=] {
+		const auto height = raw->height();
+		setPaintPadding({ 0, height, 0, 0 });
+		setScrollTopSkip(height);
+	};
+	const auto setTopHeight = [=](int height) {
+		if (height > raw->maximumHeight()) {
+			raw->setMaximumHeight(height);
+			raw->setMinimumHeight(height);
+		} else {
+			raw->setMinimumHeight(height);
+			raw->setMaximumHeight(height);
+		}
+		raw->resize(raw->width(), height);
+		updateTopSkip();
+	};
+
+	raw->additionalHeight(
+	) | rpl::on_next([=](int additionalHeight) {
+		setTopHeight(baseHeight + additionalHeight);
+	}, raw->lifetime());
+
+	controller->wrapValue(
+	) | rpl::on_next([=](Info::Wrap wrap) {
+		const auto isLayer = (wrap == Info::Wrap::Layer);
+		_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
+			raw,
+			object_ptr<Ui::IconButton>(
+				raw,
+				(isLayer
+					? st::infoLayerTopBar.back
+					: st::infoTopBar.back)),
+			st::infoTopBarScale);
+		_back->setDuration(0);
+		_back->toggleOn(isLayer
+			? _backEnabled.value() | rpl::type_erased
+			: rpl::single(true));
+		_back->entity()->addClickHandler([=] {
+			controller->showBackFromStack();
+		});
+		_back->entity()->setRippleColorOverride(
+			&st::universalRippleAnimation.color);
+		_back->toggledValue(
+		) | rpl::on_next([=](bool toggled) {
+			const auto &st = isLayer ? st::infoLayerTopBar : st::infoTopBar;
+			raw->setTextPosition(
+				toggled ? st.back.width : st.titlePosition.x(),
+				st.titlePosition.y());
+		}, _back->lifetime());
+
+		if (!isLayer) {
+			_close = nullptr;
+		} else {
+			_close = base::make_unique_q<Ui::IconButton>(
+				raw,
+				st::infoTopBarClose);
+			_close->addClickHandler([=] {
+				controller->parentController()->hideLayer();
+				controller->parentController()->hideSpecialLayer();
+			});
+			_close->setRippleColorOverride(
+				&st::universalRippleAnimation.color);
+			raw->widthValue(
+			) | rpl::on_next([=] {
+				_close->moveToRight(0, 0);
+			}, _close->lifetime());
+		}
+	}, raw->lifetime());
+
+	raw->move(0, 0);
+	widthValue() | rpl::on_next([=](int width) {
+		raw->resizeToWidth(width);
+		updateTopSkip();
+	}, raw->lifetime());
+
+	return result;
+}
+
+bool Allowed(not_null<PeerData*> peer) {
+	if (!peer->session().appConfig().starrefJoinAllowed()) {
+		return false;
+	} else if (const auto user = peer->asUser()) {
+		return user->isSelf()
+			|| (user->isBot() && user->botInfo->canEditInformation);
+	} else if (const auto channel = peer->asChannel()) {
+		return channel->isBroadcast() && channel->canPostMessages();
+	}
+	return false;
+}
+
+std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer) {
+	return std::make_shared<Info::Memento>(
+		std::vector<std::shared_ptr<ContentMemento>>(
+			1,
+			std::make_shared<Memento>(peer)));
+}
+
+object_ptr<Ui::BoxContent> ProgramsListBox(
+		not_null<Window::SessionController*> window,
+		not_null<PeerData*> peer) {
+	const auto weak = std::make_shared<base::weak_qptr<PeerListBox>>();
+	const auto initBox = [=](not_null<PeerListBox*> box) {
+		*weak = box;
+		box->addButton(tr::lng_close(), [=] {
+			box->closeBox();
+		});
+	};
+
+	auto controller = std::make_unique<ListController>(
+		window,
+		peer,
+		JoinType::Existing);
+	controller->addForBotRequests() | rpl::on_next([=] {
+		if (const auto strong = weak->get()) {
+			strong->closeBox();
+		}
+	}, controller->lifetime());
+
+	return Box<PeerListBox>(std::move(controller), initBox);
+}
+
+} // namespace Info::BotStarRef::Join
+
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.h b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.h
new file mode 100644
index 00000000000000..ef9afee14f534a
--- /dev/null
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.h
@@ -0,0 +1,89 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "info/info_content_widget.h"
+
+namespace Ui::Premium {
+class TopBarAbstract;
+} // namespace Ui::Premium
+
+namespace Ui {
+template <typename Widget>
+class FadeWrap;
+class IconButton;
+class AbstractButton;
+class VerticalLayout;
+class BoxContent;
+} // namespace Ui
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Info::BotStarRef::Join {
+
+class InnerWidget;
+
+class Memento final : public ContentMemento {
+public:
+	Memento(not_null<Controller*> controller);
+	Memento(not_null<PeerData*> peer);
+	~Memento();
+
+	object_ptr<ContentWidget> createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) override;
+
+	Section section() const override;
+
+};
+
+class Widget final : public ContentWidget {
+public:
+	Widget(QWidget *parent, not_null<Controller*> controller);
+
+	bool showInternal(not_null<ContentMemento*> memento) override;
+	rpl::producer<QString> title() override;
+	rpl::producer<bool> desiredShadowVisibility() const override;
+	void showFinished() override;
+	void setInnerFocus() override;
+	void enableBackButton() override;
+
+	[[nodiscard]] not_null<PeerData*> peer() const;
+
+	void setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento);
+
+private:
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+	[[nodiscard]] std::unique_ptr<Ui::Premium::TopBarAbstract> setupTop();
+
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
+
+	const not_null<InnerWidget*> _inner;
+
+	std::unique_ptr<Ui::Premium::TopBarAbstract> _top;
+	base::unique_qptr<Ui::FadeWrap<Ui::IconButton>> _back;
+	base::unique_qptr<Ui::IconButton> _close;
+	rpl::variable<bool> _backEnabled;
+
+};
+
+[[nodiscard]] bool Allowed(not_null<PeerData*> peer);
+[[nodiscard]] std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer);
+
+[[nodiscard]] object_ptr<Ui::BoxContent> ProgramsListBox(
+	not_null<Window::SessionController*> window,
+	not_null<PeerData*> peer);
+
+} // namespace Info::BotStarRef::Join
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.cpp b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.cpp
new file mode 100644
index 00000000000000..f75c08f5f2928e
--- /dev/null
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.cpp
@@ -0,0 +1,1086 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/bot/starref/info_bot_starref_setup_widget.h"
+
+#include "apiwrap.h"
+#include "base/timer_rpl.h"
+#include "base/unixtime.h"
+#include "core/click_handler_types.h"
+#include "data/data_user.h"
+#include "info/bot/starref/info_bot_starref_common.h"
+#include "info/bot/starref/info_bot_starref_join_widget.h"
+#include "info/profile/info_profile_icon.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "settings/settings_common.h"
+#include "ui/effects/premium_top_bar.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
+
+namespace Info::BotStarRef::Setup {
+namespace {
+
+constexpr auto kDurationForeverValue = 999;
+constexpr auto kCommissionDefault = 200;
+constexpr auto kDurationDefault = 12;
+constexpr auto kDisabledFade = 0.3;
+
+} // namespace
+
+struct State {
+	not_null<UserData*> user;
+	StarRefProgram program;
+	bool exists = false;
+};
+
+class InnerWidget final : public Ui::RpWidget {
+public:
+	InnerWidget(QWidget *parent, not_null<Controller*> controller);
+
+	[[nodiscard]] not_null<PeerData*> peer() const;
+	[[nodiscard]] not_null<State*> state();
+
+	void showFinished();
+	void setInnerFocus();
+
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+private:
+	void prepare();
+	void setupInfo();
+	void setupCommission();
+	void setupDuration();
+	void setupViewExisting();
+	void setupEnd();
+
+	[[nodiscard]] object_ptr<Ui::RpWidget> infoRow(
+		rpl::producer<QString> title,
+		rpl::producer<QString> text,
+		not_null<const style::icon*> icon);
+
+	const not_null<Controller*> _controller;
+	State _state;
+	const not_null<Ui::VerticalLayout*> _container;
+
+};
+
+[[nodiscard]] int ValueForCommission(const State &state) {
+	return state.program.commission
+		? state.program.commission
+		: kCommissionDefault;
+}
+
+[[nodiscard]] int ValueForDurationMonths(const State &state) {
+	return state.program.durationMonths
+		? state.program.durationMonths
+		: state.exists
+		? kDurationForeverValue
+		: kDurationDefault;
+}
+
+[[nodiscard]] State StateForPeer(not_null<PeerData*> peer) {
+	const auto user = peer->asUser();
+	const auto program = user->botInfo->starRefProgram;
+	return State{
+		.user = user,
+		.program = program,
+		.exists = (program.commission > 0) && !program.endDate,
+	};
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeSliderWithTopTag(
+		QWidget *parent,
+		not_null<const style::MediaSlider*> sliderStyle,
+		not_null<const style::FlatLabel*> labelStyle,
+		int valuesCount,
+		Fn<int(int)> valueByIndex,
+		int value,
+		Fn<void(int)> valueProgress,
+		Fn<void(int)> valueFinished,
+		Fn<QString(int)> textByValue,
+		bool forbidLessThanValue) {
+	auto result = object_ptr<Ui::VerticalLayout>(parent);
+	const auto raw = result.data();
+
+	const auto labels = raw->add(object_ptr<Ui::RpWidget>(raw));
+	const auto min = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		textByValue(valueByIndex(0)),
+		*labelStyle);
+	const auto max = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		textByValue(valueByIndex(valuesCount - 1)),
+		*labelStyle);
+	const auto current = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		textByValue(value),
+		*labelStyle);
+	const auto slider = raw->add(object_ptr<Ui::MediaSliderWheelless>(
+		raw,
+		*sliderStyle));
+	labels->resize(
+		labels->width(),
+		current->height() + st::defaultVerticalListSkip);
+	struct State {
+		int indexMin = 0;
+		int index = 0;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+	const auto updatePalette = [=] {
+		const auto disabled = anim::color(
+			st::windowSubTextFg,
+			st::windowBg,
+			kDisabledFade);
+		min->setTextColorOverride(!state->index
+			? st::windowActiveTextFg->c
+			: (state->indexMin > 0)
+			? disabled
+			: st::windowSubTextFg->c);
+		max->setTextColorOverride((state->index == valuesCount - 1)
+			? st::windowActiveTextFg->c
+			: st::windowSubTextFg->c);
+		current->setTextColorOverride(st::windowActiveTextFg->c);
+	};
+	const auto updateByIndex = [=] {
+		updatePalette();
+
+		current->setVisible(state->index > 0
+			&& state->index < valuesCount - 1);
+		const auto outer = labels->width();
+		const auto minWidth = min->width();
+		const auto maxWidth = max->width();
+		const auto currentWidth = current->width();
+		if (minWidth + maxWidth + currentWidth > outer) {
+			return;
+		}
+
+		min->moveToLeft(0, 0, outer);
+		max->moveToRight(0, 0, outer);
+
+		const auto sliderSkip = sliderStyle->seekSize.width();
+		const auto availableForCurrent = outer - sliderSkip;
+		const auto ratio = state->index / float64(valuesCount - 1);
+		const auto desiredLeft = (sliderSkip / 2)
+			+ availableForCurrent * ratio
+			- (currentWidth / 2);
+		const auto minLeft = minWidth;
+		const auto maxLeft = outer - maxWidth - currentWidth;
+		current->moveToLeft(
+			std::clamp(int(base::SafeRound(desiredLeft)), minLeft, maxLeft),
+			0,
+			outer);
+	};
+	const auto updateByValue = [=](int value) {
+		current->setText(textByValue(value));
+
+		state->index = 0;
+		auto maxIndex = valuesCount - 1;
+		while (state->index < maxIndex) {
+			const auto mid = (state->index + maxIndex) / 2;
+			const auto midValue = valueByIndex(mid);
+			if (midValue == value) {
+				state->index = mid;
+				break;
+			} else if (midValue < value) {
+				state->index = mid + 1;
+			} else {
+				maxIndex = mid - 1;
+			}
+		}
+		updateByIndex();
+	};
+	const auto progress = [=](int value) {
+		updateByValue(value);
+		valueProgress(value);
+	};
+	const auto finished = [=](int value) {
+		updateByValue(value);
+		valueFinished(value);
+	};
+	style::PaletteChanged() | rpl::on_next([=] {
+		updatePalette();
+	}, raw->lifetime());
+	updateByValue(value);
+	state->indexMin = forbidLessThanValue ? state->index : 0;
+
+	slider->setPseudoDiscrete(
+		valuesCount,
+		valueByIndex,
+		value,
+		progress,
+		finished,
+		state->indexMin);
+	slider->resize(slider->width(), sliderStyle->seekSize.height());
+
+	if (state->indexMin > 0) {
+		const auto overlay = Ui::CreateChild<Ui::RpWidget>(slider);
+		overlay->setAttribute(Qt::WA_TransparentForMouseEvents);
+		slider->sizeValue() | rpl::on_next([=](QSize size) {
+			overlay->setGeometry(0, 0, size.width(), size.height());
+		}, slider->lifetime());
+		overlay->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(overlay);
+			const auto sections = valuesCount - 1;
+			const auto shift = sliderStyle->seekSize.width();
+			const auto skip = shift / 2.;
+			const auto available = overlay->width() - shift;
+			const auto till = state->indexMin / float64(sections);
+			const auto now = state->index / float64(sections);
+			const auto edge = available * now;
+			const auto right = int(base::SafeRound(
+				std::min(skip + available * till, edge)));
+			if (right > 0) {
+				p.setOpacity(kDisabledFade);
+				p.fillRect(0, 0, right, overlay->height(), st::windowBg);
+			}
+		}, overlay->lifetime());
+	}
+
+	raw->widthValue() | rpl::on_next([=](int width) {
+		labels->resizeToWidth(width);
+		updateByIndex();
+	}, slider->lifetime());
+
+	return result;
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeSliderWithTopLabels(
+		QWidget *parent,
+		not_null<const style::MediaSlider*> sliderStyle,
+		not_null<const style::FlatLabel*> labelStyle,
+		int valuesCount,
+		Fn<int(int)> valueByIndex,
+		int value,
+		Fn<void(int)> valueProgress,
+		Fn<void(int)> valueFinished,
+		Fn<QString(int)> textByValue,
+		bool forbidLessThanValue) {
+	auto result = object_ptr<Ui::VerticalLayout>(parent);
+	const auto raw = result.data();
+
+	const auto labels = raw->add(object_ptr<Ui::RpWidget>(raw));
+	const auto slider = raw->add(object_ptr<Ui::MediaSliderWheelless>(
+		raw,
+		*sliderStyle));
+
+	struct State {
+		std::vector<not_null<Ui::FlatLabel*>> labels;
+		int indexMin = 0;
+		int index = 0;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+
+	for (auto i = 0; i != valuesCount; ++i) {
+		state->labels.push_back(Ui::CreateChild<Ui::FlatLabel>(
+			labels,
+			textByValue(valueByIndex(i)),
+			*labelStyle));
+	}
+	labels->widthValue() | rpl::on_next([=](int outer) {
+		const auto shift = sliderStyle->seekSize.width() / 2;
+		const auto available = outer - sliderStyle->seekSize.width();
+		for (auto i = 0; i != state->labels.size(); ++i) {
+			const auto label = state->labels[i];
+			const auto width = label->width();
+			const auto half = width / 2;
+			const auto progress = (i / float64(valuesCount - 1));
+			const auto left = int(base::SafeRound(progress * available));
+			label->moveToLeft(
+				std::max(std::min(shift + left - half, outer - width), 0),
+				0,
+				outer);
+		}
+	}, slider->lifetime());
+	labels->resize(
+		labels->width(),
+		state->labels.back()->height() + st::defaultVerticalListSkip);
+
+	const auto updatePalette = [=] {
+		const auto disabled = anim::color(
+			st::windowSubTextFg,
+			st::windowBg,
+			kDisabledFade);
+		for (auto i = 0; i != state->labels.size(); ++i) {
+			state->labels[i]->setTextColorOverride((state->index == i)
+				? st::windowActiveTextFg->c
+				: (state->index < state->indexMin)
+				? disabled
+				: st::windowSubTextFg->c);
+		}
+	};
+	const auto updateByIndex = [=] {
+		updatePalette();
+	};
+	const auto updateByValue = [=](int value) {
+		state->index = 0;
+		auto maxIndex = valuesCount - 1;
+		while (state->index < maxIndex) {
+			const auto mid = (state->index + maxIndex) / 2;
+			const auto midValue = valueByIndex(mid);
+			if (midValue == value) {
+				state->index = mid;
+				break;
+			} else if (midValue < value) {
+				state->index = mid + 1;
+			} else {
+				maxIndex = mid - 1;
+			}
+		}
+		updateByIndex();
+	};
+	const auto progress = [=](int value) {
+		updateByValue(value);
+		valueProgress(value);
+	};
+	const auto finished = [=](int value) {
+		updateByValue(value);
+		valueFinished(value);
+	};
+	style::PaletteChanged() | rpl::on_next([=] {
+		updatePalette();
+	}, raw->lifetime());
+	updateByValue(value);
+	state->indexMin = forbidLessThanValue ? state->index : 0;
+
+	slider->setPseudoDiscrete(
+		valuesCount,
+		valueByIndex,
+		value,
+		progress,
+		finished,
+		state->indexMin);
+	slider->resize(slider->width(), sliderStyle->seekSize.height());
+
+	if (state->indexMin > 0) {
+		const auto overlay = Ui::CreateChild<Ui::RpWidget>(slider);
+		overlay->setAttribute(Qt::WA_TransparentForMouseEvents);
+		slider->sizeValue() | rpl::on_next([=](QSize size) {
+			overlay->setGeometry(0, 0, size.width(), size.height());
+		}, slider->lifetime());
+		overlay->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(overlay);
+
+			const auto sections = valuesCount - 1;
+			const auto shift = sliderStyle->seekSize.width();
+			const auto skip = shift / 2.;
+			const auto available = overlay->width() - shift;
+			auto hq = PainterHighQualityEnabler(p);
+			const auto stroke = style::ConvertScale(3);
+			p.setPen(QPen(st::windowBg, stroke));
+			const auto diameter = shift - stroke;
+			const auto radius = diameter / 2.;
+			const auto top = (sliderStyle->seekSize.height() / 2.) - radius;
+			for (auto i = 0; i != valuesCount; ++i) {
+				if (i < state->index) {
+					p.setBrush(st::sliderBgActive);
+				} else if (i > state->index) {
+					p.setBrush(st::sliderBgInactive);
+				} else {
+					continue;
+				}
+				const auto progress = i / float64(sections);
+				const auto position = skip + available * progress;
+				p.drawEllipse(position - radius, top, diameter, diameter);
+			}
+
+			const auto till = state->indexMin / float64(sections);
+			const auto now = state->index / float64(sections);
+			const auto edge = available * now;
+			const auto right = int(base::SafeRound(
+				std::min(skip + available * till + radius, edge)));
+			if (right > 0) {
+				p.setOpacity(kDisabledFade);
+				p.fillRect(0, 0, right, overlay->height(), st::windowBg);
+			}
+		}, overlay->lifetime());
+	}
+
+	raw->widthValue() | rpl::on_next([=](int width) {
+		labels->resizeToWidth(width);
+		updateByIndex();
+	}, slider->lifetime());
+
+	return result;
+}
+
+[[nodiscard]] QString FormatTimeLeft(int seconds) {
+	const auto hours = seconds / 3600;
+	const auto minutes = (seconds % 3600) / 60;
+	seconds %= 60;
+	if (hours > 0) {
+		return u"%1:%2:%3"_q
+			.arg(hours)
+			.arg(minutes, 2, 10, QChar('0'))
+			.arg(seconds, 2, 10, QChar('0'));
+	}
+	return u"%1:%2"_q
+		.arg(minutes)
+		.arg(seconds, 2, 10, QChar('0'));
+}
+
+[[nodiscard]] object_ptr<Ui::RoundButton> MakeStartButton(
+		not_null<Ui::RpWidget*> parent,
+		Fn<TimeId()> endDate,
+		bool exists) {
+	auto result = object_ptr<Ui::RoundButton>(
+		parent,
+		rpl::single(QString()),
+		st::starrefBottomButton);
+	const auto raw = result.data();
+	raw->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
+	rpl::combine(
+		parent->widthValue(),
+		raw->widthValue()
+	) | rpl::on_next([=](int outer, int inner) {
+		const auto padding = st::starrefButtonMargin;
+		const auto added = padding.left() + padding.right();
+		if (outer > added && outer - added != inner) {
+			raw->resizeToWidth(outer - added);
+			raw->moveToLeft(padding.left(), padding.top(), outer);
+		}
+	}, raw->lifetime());
+	struct State {
+		Ui::FlatLabel *label = nullptr;
+		Ui::FlatLabel *sublabel = nullptr;
+		QString labelText;
+		QString sublabelText;
+		Fn<void()> update;
+		rpl::lifetime lockedLifetime;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+
+	state->label = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		QString(),
+		st::starrefBottomButtonLabel);
+	state->label->show();
+	state->label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	state->sublabel = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		QString(),
+		st::starrefBottomButtonSublabel);
+	state->sublabel->show();
+	state->sublabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	rpl::combine(
+		raw->widthValue(),
+		state->label->widthValue(),
+		state->sublabel->widthValue()
+	) | rpl::on_next([=](int outer, int label, int sublabel) {
+		if (sublabel > 0) {
+			state->label->moveToLeft(
+				(outer - label) / 2,
+				st::starrefBottomButtonLabelTop);
+			state->sublabel->moveToLeft(
+				(outer - sublabel) / 2,
+				st::starrefBottomButtonSublabelTop);
+		} else {
+			state->label->moveToLeft(
+				(outer - label) / 2,
+				(raw->height() - state->label->height()) / 2);
+			state->sublabel->move(0, raw->height() * 2);
+		}
+	}, raw->lifetime());
+
+	const auto updatePalette = [=] {
+		auto color = st::windowFgActive->c;
+		if (state->lockedLifetime) {
+			color.setAlphaF((1. - kDisabledFade) * color.alphaF());
+		}
+		state->label->setTextColorOverride(color);
+		state->sublabel->setTextColorOverride(color);
+	};
+	updatePalette();
+	style::PaletteChanged(
+	) | rpl::on_next(updatePalette, raw->lifetime());
+
+	state->update = [=] {
+		const auto set = [&](
+				Ui::FlatLabel *label,
+				QString &was,
+				QString now) {
+			if (was != now) {
+				label->setText(now);
+				was = now;
+			}
+		};
+		const auto till = endDate();
+		const auto now = base::unixtime::now();
+		const auto left = (till > now) ? (till - now) : 0;
+		if (left) {
+			if (!state->lockedLifetime) {
+				state->lockedLifetime = base::timer_each(
+					100
+				) | rpl::on_next([=] {
+					state->update();
+				});
+				set(
+					state->label,
+					state->labelText,
+					tr::lng_star_ref_start(tr::now));
+				raw->clearState();
+				raw->setAttribute(Qt::WA_TransparentForMouseEvents);
+				updatePalette();
+			}
+			set(
+				state->sublabel,
+				state->sublabelText,
+				tr::lng_star_ref_start_disabled(
+					tr::now,
+					lt_time,
+					FormatTimeLeft(left)));
+		} else {
+			if (state->lockedLifetime) {
+				state->lockedLifetime.destroy();
+				raw->setAttribute(Qt::WA_TransparentForMouseEvents, false);
+				updatePalette();
+			}
+			set(
+				state->sublabel,
+				state->sublabelText,
+				QString());
+			set(
+				state->label,
+				state->labelText,
+				(exists ? tr::lng_star_ref_update : tr::lng_star_ref_start)(
+					tr::now));
+		}
+	};
+	state->update();
+
+	return result;
+}
+
+InnerWidget::InnerWidget(QWidget *parent, not_null<Controller*> controller)
+: RpWidget(parent)
+, _controller(controller)
+, _state(StateForPeer(_controller->key().starrefPeer()))
+, _container(Ui::CreateChild<Ui::VerticalLayout>(this)) {
+	prepare();
+}
+
+not_null<State*> InnerWidget::state() {
+	return &_state;
+}
+
+void InnerWidget::prepare() {
+	Ui::ResizeFitChild(this, _container);
+
+	setupInfo();
+	Ui::AddSkip(_container);
+	Ui::AddDivider(_container);
+	setupCommission();
+	setupDuration();
+	Ui::AddSkip(_container);
+	setupViewExisting();
+	setupEnd();
+}
+
+void InnerWidget::setupInfo() {
+	AddSkip(_container, st::defaultVerticalListSkip * 2);
+
+	_container->add(infoRow(
+		tr::lng_star_ref_share_title(),
+		tr::lng_star_ref_share_about(),
+		&st::menuIconStarRefShare));
+
+	_container->add(infoRow(
+		tr::lng_star_ref_launch_title(),
+		tr::lng_star_ref_launch_about(),
+		&st::menuIconChannel));
+
+	_container->add(infoRow(
+		tr::lng_star_ref_let_title(),
+		tr::lng_star_ref_let_about(),
+		&st::menuIconStarRefLink));
+}
+
+void InnerWidget::setupCommission() {
+	Ui::AddSkip(_container);
+	Ui::AddSubsectionTitle(_container, tr::lng_star_ref_commission_title());
+
+	const auto appConfig = &_controller->session().appConfig();
+	const auto commissionMin = std::clamp(
+		appConfig->starrefCommissionMin(),
+		1,
+		998);
+	const auto commissionMax = std::clamp(
+		appConfig->starrefCommissionMax(),
+		commissionMin + 1,
+		999);
+	const auto commission = std::clamp(
+		ValueForCommission(_state),
+		commissionMin,
+		commissionMax);
+
+	auto valueMin = (commissionMin + 9) / 10;
+	auto valueMax = commissionMax / 10;
+
+	auto values = std::vector<int>();
+	if (commission < valueMin * 10) {
+		values.push_back(commission);
+	}
+	for (auto i = valueMin; i != valueMax + 1; ++i) {
+		values.push_back(i * 10);
+		if (i * 10 < commission
+			&& (i == valueMax || (i + 1) * 10 > commission)) {
+			values.push_back(commission);
+		}
+	}
+	const auto valuesCount = int(values.size());
+	const auto setCommission = [=](int value) {
+		_state.program.commission = value;
+	};
+	_container->add(
+		MakeSliderWithTopTag(
+			_container,
+			&st::settingsScale,
+			&st::settingsScaleLabel,
+			valuesCount,
+			[=](int index) { return values[index]; },
+			commission,
+			setCommission,
+			setCommission,
+			[=](int value) { return FormatCommission(value); },
+			_state.exists),
+		st::boxRowPadding);
+	_state.program.commission = commission;
+
+	Ui::AddSkip(_container, st::defaultVerticalListSkip * 2);
+	Ui::AddDividerText(_container, tr::lng_star_ref_commission_about());
+}
+
+void InnerWidget::setupDuration() {
+	Ui::AddSkip(_container);
+	Ui::AddSubsectionTitle(_container, tr::lng_star_ref_duration_title());
+
+	const auto durationMonths = ValueForDurationMonths(_state);
+
+	auto values = std::vector<int>{ 1, 3, 6, 12, 24, 36, 999 };
+	if (!ranges::contains(values, durationMonths)) {
+		values.push_back(durationMonths);
+		ranges::sort(values);
+	}
+	const auto valuesCount = int(values.size());
+	const auto setDurationMonths = [=](int value) {
+		_state.program.durationMonths = (value == kDurationForeverValue)
+			? 0
+			: value;
+	};
+	const auto label = [=](int value) {
+		return (value < 12)
+			? tr::lng_months_tiny(tr::now, lt_count, value)
+			: (value < 999)
+			? tr::lng_years_tiny(tr::now, lt_count, value / 12)
+			: QString::fromUtf8("\xE2\x88\x9E"); // utf-8 infinity
+	};
+	_container->add(
+		MakeSliderWithTopLabels(
+			_container,
+			&st::settingsScale,
+			&st::settingsScaleLabel,
+			valuesCount,
+			[=](int index) { return values[index]; },
+			durationMonths,
+			setDurationMonths,
+			setDurationMonths,
+			label,
+			_state.exists),
+		st::boxRowPadding);
+	_state.program.durationMonths = durationMonths;
+
+	Ui::AddSkip(_container, st::defaultVerticalListSkip * 2);
+	Ui::AddDividerText(_container, tr::lng_star_ref_duration_about());
+}
+
+void InnerWidget::setupViewExisting() {
+	const auto button = AddViewListButton(
+		_container,
+		tr::lng_star_ref_existing_title(),
+		tr::lng_star_ref_existing_about());
+	button->setClickedCallback([=] {
+		const auto window = _controller->parentController();
+		window->show(Join::ProgramsListBox(window, peer()));
+	});
+
+	Ui::AddSkip(_container);
+	Ui::AddDivider(_container);
+	Ui::AddSkip(_container);
+}
+
+void InnerWidget::setupEnd() {
+	if (!_state.exists) {
+		return;
+	}
+	const auto end = _container->add(object_ptr<Ui::SettingsButton>(
+		_container,
+		tr::lng_star_ref_end(),
+		st::settingsAttentionButton));
+	end->setClickedCallback([=] {
+		const auto weak = base::make_weak(this);
+		const auto window = _controller->parentController();
+		const auto sent = std::make_shared<bool>();
+		window->show(ConfirmEndBox([=] {
+			if (*sent) {
+				return;
+			}
+			*sent = true;
+			const auto show = _controller->uiShow();
+			FinishProgram(show, _state.user, [=](bool success) {
+				*sent = false;
+				if (!success) {
+					return;
+				} else if ([[maybe_unused]] const auto strong = weak.get()) {
+					_controller->showBackFromStack();
+					window->showToast({
+						.title = tr::lng_star_ref_ended_title(tr::now),
+						.text = tr::lng_star_ref_ended_text(
+							tr::now,
+							tr::rich),
+						.duration = Ui::Toast::kDefaultDuration * 3,
+					});
+				}
+			});
+		}));
+	});
+	Ui::AddSkip(_container);
+	Ui::AddDivider(_container);
+}
+
+object_ptr<Ui::RpWidget> InnerWidget::infoRow(
+		rpl::producer<QString> title,
+		rpl::producer<QString> text,
+		not_null<const style::icon*> icon) {
+	auto result = object_ptr<Ui::VerticalLayout>(_container);
+	const auto raw = result.data();
+
+	raw->add(
+		object_ptr<Ui::FlatLabel>(
+			raw,
+			std::move(title) | rpl::map(tr::bold),
+			st::defaultFlatLabel),
+		st::settingsPremiumRowTitlePadding);
+	raw->add(
+		object_ptr<Ui::FlatLabel>(
+			raw,
+			std::move(text),
+			st::boxDividerLabel),
+		st::settingsPremiumRowAboutPadding);
+	object_ptr<Info::Profile::FloatingIcon>(
+		raw,
+		*icon,
+		st::starrefInfoIconPosition);
+
+	return result;
+}
+
+not_null<PeerData*> InnerWidget::peer() const {
+	return _controller->key().starrefPeer();
+}
+
+void InnerWidget::showFinished() {
+
+}
+
+void InnerWidget::setInnerFocus() {
+	setFocus();
+}
+
+void InnerWidget::saveState(not_null<Memento*> memento) {
+
+}
+
+void InnerWidget::restoreState(not_null<Memento*> memento) {
+
+}
+
+Memento::Memento(not_null<Controller*> controller)
+: ContentMemento(Tag(controller->starrefPeer(), controller->starrefType())) {
+}
+
+Memento::Memento(not_null<PeerData*> peer)
+: ContentMemento(Tag(peer, Type::Setup)) {
+}
+
+Memento::~Memento() = default;
+
+Section Memento::section() const {
+	return Section(Section::Type::BotStarRef);
+}
+
+object_ptr<ContentWidget> Memento::createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) {
+	auto result = object_ptr<Widget>(parent, controller);
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+Widget::Widget(
+	QWidget *parent,
+	not_null<Controller*> controller)
+: ContentWidget(parent, controller)
+, _inner(setInnerWidget(object_ptr<InnerWidget>(this, controller)))
+, _state(_inner->state()) {
+	_top = setupTop();
+	_bottom = setupBottom();
+}
+
+not_null<PeerData*> Widget::peer() const {
+	return _inner->peer();
+}
+
+bool Widget::showInternal(not_null<ContentMemento*> memento) {
+	return (memento->starrefPeer() == peer());
+}
+
+rpl::producer<QString> Widget::title() {
+	return tr::lng_star_ref_title();
+}
+
+void Widget::setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento) {
+	setGeometry(geometry);
+	Ui::SendPendingMoveResizeEvents(this);
+	restoreState(memento);
+}
+
+rpl::producer<bool> Widget::desiredShadowVisibility() const {
+	return rpl::single<bool>(true);
+}
+
+void Widget::showFinished() {
+	_inner->showFinished();
+}
+
+void Widget::setInnerFocus() {
+	_inner->setInnerFocus();
+}
+
+void Widget::enableBackButton() {
+	_backEnabled = true;
+}
+
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(controller());
+	saveState(result.get());
+	return result;
+}
+
+void Widget::saveState(not_null<Memento*> memento) {
+	memento->setScrollTop(scrollTopSave());
+	_inner->saveState(memento);
+}
+
+void Widget::restoreState(not_null<Memento*> memento) {
+	_inner->restoreState(memento);
+	scrollTopRestore(memento->scrollTop());
+}
+
+std::unique_ptr<Ui::Premium::TopBarAbstract> Widget::setupTop() {
+	auto title = tr::lng_star_ref_title();
+	auto about = tr::lng_star_ref_about(tr::marked);
+
+	const auto controller = this->controller();
+	const auto weak = base::make_weak(controller->parentController());
+	const auto clickContextOther = [=] {
+		return QVariant::fromValue(ClickHandlerContext{
+			.sessionWindow = weak,
+			.botStartAutoSubmit = true,
+		});
+	};
+	auto result = std::make_unique<Ui::Premium::TopBar>(
+		this,
+		st::starrefCover,
+		Ui::Premium::TopBarDescriptor{
+			.clickContextOther = clickContextOther,
+			.logo = u"affiliate"_q,
+			.title = std::move(title),
+			.about = std::move(about),
+			.light = true,
+		});
+	const auto raw = result.get();
+
+	controller->wrapValue(
+	) | rpl::on_next([=](Info::Wrap wrap) {
+		raw->setRoundEdges(wrap == Info::Wrap::Layer);
+	}, raw->lifetime());
+
+	const auto baseHeight = st::starrefCoverHeight;
+	raw->resize(width(), baseHeight);
+	const auto updateTopSkip = [=] {
+		const auto height = raw->height();
+		setPaintPadding({ 0, height, 0, 0 });
+		setScrollTopSkip(height);
+	};
+	const auto setTopHeight = [=](int height) {
+		if (height > raw->maximumHeight()) {
+			raw->setMaximumHeight(height);
+			raw->setMinimumHeight(height);
+		} else {
+			raw->setMinimumHeight(height);
+			raw->setMaximumHeight(height);
+		}
+		raw->resize(raw->width(), height);
+		updateTopSkip();
+	};
+
+	raw->additionalHeight(
+	) | rpl::on_next([=](int additionalHeight) {
+		setTopHeight(baseHeight + additionalHeight);
+	}, raw->lifetime());
+
+	controller->wrapValue(
+	) | rpl::on_next([=](Info::Wrap wrap) {
+		const auto isLayer = (wrap == Info::Wrap::Layer);
+		_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
+			raw,
+			object_ptr<Ui::IconButton>(
+				raw,
+				(isLayer
+					? st::infoLayerTopBar.back
+					: st::infoTopBar.back)),
+			st::infoTopBarScale);
+		_back->setDuration(0);
+		_back->toggleOn(isLayer
+			? _backEnabled.value() | rpl::type_erased
+			: rpl::single(true));
+		_back->entity()->addClickHandler([=] {
+			controller->showBackFromStack();
+		});
+		_back->toggledValue(
+		) | rpl::on_next([=](bool toggled) {
+			const auto &st = isLayer ? st::infoLayerTopBar : st::infoTopBar;
+			raw->setTextPosition(
+				toggled ? st.back.width : st.titlePosition.x(),
+				st.titlePosition.y());
+		}, _back->lifetime());
+
+		if (!isLayer) {
+			_close = nullptr;
+		} else {
+			_close = base::make_unique_q<Ui::IconButton>(
+				raw,
+				st::infoTopBarClose);
+			_close->addClickHandler([=] {
+				controller->parentController()->hideLayer();
+				controller->parentController()->hideSpecialLayer();
+			});
+			raw->widthValue(
+			) | rpl::on_next([=] {
+				_close->moveToRight(0, 0);
+			}, _close->lifetime());
+		}
+	}, raw->lifetime());
+
+	raw->move(0, 0);
+	widthValue() | rpl::on_next([=](int width) {
+		raw->resizeToWidth(width);
+		updateTopSkip();
+	}, raw->lifetime());
+
+	return result;
+}
+
+std::unique_ptr<Ui::RpWidget> Widget::setupBottom() {
+	auto result = std::make_unique<Ui::VerticalLayout>(this);
+	const auto raw = result.get();
+
+	const auto save = raw->add(MakeStartButton(raw, [=] {
+		return _state->user->botInfo->starRefProgram.endDate;
+	}, _state->exists), st::starrefButtonMargin);
+
+	const auto &margins = st::defaultBoxDividerLabelPadding;
+	raw->add(
+		object_ptr<Ui::FlatLabel>(
+			raw,
+			(_state->exists
+				? tr::lng_star_ref_update_info
+				: tr::lng_star_ref_start_info)(
+					lt_terms,
+					tr::lng_star_ref_button_link(
+						tr::url(tr::lng_star_ref_tos_url(tr::now))),
+					tr::marked),
+			st::boxDividerLabel),
+		QMargins(margins.left(), 0, margins.right(), 0));
+	save->setClickedCallback([=] {
+		const auto weak = base::make_weak(this);
+		const auto user = _state->user;
+		const auto program = _state->program;
+		const auto show = controller()->uiShow();
+		const auto exists = _state->exists;
+		ConfirmUpdate(show, user, program, exists, [=](Fn<void(bool)> done) {
+			UpdateProgram(show, user, program, [=](bool success) {
+				done(success);
+				if (weak) {
+					controller()->showBackFromStack();
+				}
+				show->showToast({
+					.title = (exists
+						? tr::lng_star_ref_updated_title
+						: tr::lng_star_ref_created_title)(tr::now),
+					.text = (exists
+						? tr::lng_star_ref_updated_text
+						: tr::lng_star_ref_created_text)(
+							tr::now,
+							tr::rich),
+					.duration = Ui::Toast::kDefaultDuration * 3,
+				});
+			});
+		});
+	});
+
+	widthValue() | rpl::on_next([=](int width) {
+		raw->resizeToWidth(width);
+	}, raw->lifetime());
+
+	rpl::combine(
+		raw->heightValue(),
+		heightValue()
+	) | rpl::on_next([=](int height, int fullHeight) {
+		setScrollBottomSkip(height);
+		raw->move(0, fullHeight - height);
+	}, raw->lifetime());
+
+	return result;
+}
+
+bool Allowed(not_null<PeerData*> peer) {
+	return peer->isUser()
+		&& peer->asUser()->isBot()
+		&& peer->session().appConfig().starrefSetupAllowed();
+}
+
+std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer) {
+	return std::make_shared<Info::Memento>(
+		std::vector<std::shared_ptr<ContentMemento>>(
+			1,
+			std::make_shared<Memento>(peer)));
+}
+
+} // namespace Info::BotStarRef::Setup
+
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.h b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.h
new file mode 100644
index 00000000000000..6fd66c8cafc069
--- /dev/null
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.h
@@ -0,0 +1,86 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "info/info_content_widget.h"
+#include "info/bot/starref/info_bot_starref_common.h"
+
+namespace Ui::Premium {
+class TopBarAbstract;
+} // namespace Ui::Premium
+
+namespace Ui {
+template <typename Widget>
+class FadeWrap;
+class IconButton;
+class AbstractButton;
+class VerticalLayout;
+} // namespace Ui
+
+namespace Info::BotStarRef::Setup {
+
+struct State;
+class InnerWidget;
+
+class Memento final : public ContentMemento {
+public:
+	Memento(not_null<Controller*> controller);
+	Memento(not_null<PeerData*> peer);
+	~Memento();
+
+	object_ptr<ContentWidget> createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) override;
+
+	Section section() const override;
+
+};
+
+class Widget final : public ContentWidget {
+public:
+	Widget(QWidget *parent, not_null<Controller*> controller);
+
+	bool showInternal(not_null<ContentMemento*> memento) override;
+	rpl::producer<QString> title() override;
+	rpl::producer<bool> desiredShadowVisibility() const override;
+	void showFinished() override;
+	void setInnerFocus() override;
+	void enableBackButton() override;
+
+	[[nodiscard]] not_null<PeerData*> peer() const;
+
+	void setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento);
+
+private:
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+	[[nodiscard]] std::unique_ptr<Ui::Premium::TopBarAbstract> setupTop();
+	[[nodiscard]] std::unique_ptr<Ui::RpWidget> setupBottom();
+
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
+
+	const not_null<InnerWidget*> _inner;
+	const not_null<State*> _state;
+
+	std::unique_ptr<Ui::Premium::TopBarAbstract> _top;
+	base::unique_qptr<Ui::FadeWrap<Ui::IconButton>> _back;
+	base::unique_qptr<Ui::IconButton> _close;
+	rpl::variable<bool> _backEnabled;
+
+	std::unique_ptr<Ui::RpWidget> _bottom;
+
+};
+
+[[nodiscard]] bool Allowed(not_null<PeerData*> peer);
+[[nodiscard]] std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer);
+
+} // namespace Info::BotStarRef::Setup
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
index b78da5c1792579..f30e484515776a 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
@@ -26,7 +26,7 @@ For license and copyright information please follow this link:
 #include "payments/payments_checkout_process.h" // Payments::CheckoutProcess
 #include "payments/payments_form.h" // Payments::InvoicePremiumGiftCode
 #include "settings/settings_common.h"
-#include "settings/settings_premium.h" // Settings::ShowPremium
+#include "settings/sections/settings_premium.h" // Settings::ShowPremium
 #include "ui/boxes/choose_date_time.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/effects/credits_graphics.h"
@@ -45,6 +45,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/labels.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/ui_utility.h"
+#include "styles/style_color_indices.h"
 #include "styles/style_credits.h"
 #include "styles/style_giveaway.h"
 #include "styles/style_info.h"
@@ -59,7 +60,6 @@ namespace {
 
 constexpr auto kDoneTooltipDuration = 5 * crl::time(1000);
 constexpr auto kAdditionalPrizeLengthMax = 128;
-constexpr auto kColorIndexCredits = int(1);
 
 [[nodiscard]] QDateTime ThreeDaysAfterToday() {
 	auto dateNow = QDateTime::currentDateTime();
@@ -125,7 +125,7 @@ void AddPremiumTopBarWithDefaultTitleBar(
 
 	std::move(
 		titleText
-	) | rpl::start_with_next([=](const QString &s) {
+	) | rpl::on_next([=](const QString &s) {
 		state->title.setText(st::startGiveawayBox.title.style, s);
 	}, box->lifetime());
 
@@ -142,7 +142,7 @@ void AddPremiumTopBarWithDefaultTitleBar(
 		object_ptr<Ui::RpWidget>(box));
 	closeTopBar->resize(box->width(), st::boxTitleHeight);
 	closeTopBar->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(closeTopBar);
 		const auto r = closeTopBar->rect();
 		const auto radius = st::boxRadius;
@@ -187,7 +187,7 @@ void AddPremiumTopBarWithDefaultTitleBar(
 			st::startGiveawayBoxTitleClose);
 		close->setClickedCallback([=] { box->closeBox(); });
 		closeTopBar->widthValue(
-		) | rpl::start_with_next([=](int w) {
+		) | rpl::on_next([=](int w) {
 			const auto &pos = st::giveawayGiftCodeCoverClosePosition;
 			close->moveToRight(pos.x(), pos.y());
 		}, box->lifetime());
@@ -213,23 +213,23 @@ void AddPremiumTopBarWithDefaultTitleBar(
 				- st::boxTitleHeight
 				+ st::boxDividerHeight
 				+ st::defaultVerticalListSkip,
-			st::boxDividerBg,
+			st::defaultDividerBar,
 			RectPart::Bottom),
-		{});
+		style::margins());
 	bar->setPaused(true);
 	bar->setRoundEdges(false);
 	bar->setMaximumHeight(st::giveawayGiftCodeTopHeight);
 	bar->setMinimumHeight(st::infoLayerTopBarHeight);
 	bar->resize(bar->width(), bar->maximumHeight());
 	box->widthValue(
-	) | rpl::start_with_next([=](int w) {
+	) | rpl::on_next([=](int w) {
 		bar->resizeToWidth(w - hPadding);
 		bar->moveToLeft(st::boxRowPadding.left(), bar->y());
 	}, box->lifetime());
 
 	std::move(
 		showFinished
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		closeTopBar->raise();
 		if (const auto shadow = FindFirstShadowInBox(box)) {
 			bar->stackUnder(shadow);
@@ -237,7 +237,7 @@ void AddPremiumTopBarWithDefaultTitleBar(
 		bar->setPaused(false);
 		box->scrolls(
 		) | rpl::map(isCloseBarShown) | rpl::distinct_until_changed(
-		) | rpl::start_with_next([=](bool showBar) {
+		) | rpl::on_next([=](bool showBar) {
 			state->animation.stop();
 			state->animation.start(
 				[=] { closeTopBar->update(); },
@@ -246,7 +246,7 @@ void AddPremiumTopBarWithDefaultTitleBar(
 				st::slideWrapDuration);
 		}, box->lifetime());
 		box->scrolls(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			bar->moveToLeft(bar->x(), -box->scrollTop());
 		}, box->lifetime());
 	}, box->lifetime());
@@ -307,7 +307,7 @@ void CreateGiveawayBox(
 		return rpl::combine(
 			state->typeValue.value(),
 			state->toAwardAmountChanged.events_starting_with(
-				rpl::empty_value()) | rpl::type_erased()
+				rpl::empty_value()) | rpl::type_erased
 		) | rpl::map([=](GiveawayType type, auto) {
 			return (type == GiveawayType::Credits) || !isSpecificUsers();
 		});
@@ -323,7 +323,7 @@ void CreateGiveawayBox(
 			tr::lng_giveaway_award()),
 		rpl::conditional(
 			isPrepaidCredits
-				? rpl::single(true) | rpl::type_erased()
+				? rpl::single(true) | rpl::type_erased
 				: state->typeValue.value() | rpl::map(
 					rpl::mappers::_1 == GiveawayType::Credits),
 			(peer->isMegagroup()
@@ -332,7 +332,7 @@ void CreateGiveawayBox(
 			(peer->isMegagroup()
 				? tr::lng_giveaway_new_about_group()
 				: tr::lng_giveaway_new_about())
-		) | rpl::map(Ui::Text::RichLangValue));
+		) | rpl::map(tr::rich));
 	{
 		const auto &padding = st::giveawayGiftCodeCoverDividerPadding;
 		Ui::AddSkip(box->verticalLayout(), padding.bottom());
@@ -348,12 +348,11 @@ void CreateGiveawayBox(
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
 		container->add(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				box,
-				object_ptr<Ui::FlatLabel>(
-					box,
-					tr::lng_contacts_loading(),
-					st::giveawayLoadingLabel)));
+				tr::lng_contacts_loading(),
+				st::giveawayLoadingLabel),
+			style::al_top);
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
 	}
@@ -370,7 +369,7 @@ void CreateGiveawayBox(
 				prepaid->credits
 					? GiveawayType::PrepaidCredits
 					: GiveawayType::Prepaid,
-				prepaid->credits ? kColorIndexCredits : prepaid->id,
+				prepaid->credits ? st::colorIndexOrange : prepaid->id,
 				tr::lng_boosts_prepaid_giveaway_single(),
 				prepaid->credits
 					? tr::lng_boosts_prepaid_giveaway_credits_status(
@@ -476,42 +475,15 @@ void CreateGiveawayBox(
 		if (state->apiCreditsOptions.options().empty()) {
 			return;
 		}
-		static constexpr auto kOutdated = 1735689600;
-
-		auto badge = [&] {
-			if (base::unixtime::now() > kOutdated) {
-				return QImage();
-			}
-			const auto badge = Ui::CreateChild<Ui::PaddingWrap<>>(
-				creditsTypeWrap,
-				object_ptr<Ui::FlatLabel>(
-					creditsTypeWrap,
-					tr::lng_premium_summary_new_badge(tr::now),
-					st::settingsPremiumNewBadge),
-				st::settingsPremiumNewBadgePadding);
-			badge->setAttribute(Qt::WA_TransparentForMouseEvents);
-			badge->paintRequest() | rpl::start_with_next([=] {
-				auto p = QPainter(badge);
-				auto hq = PainterHighQualityEnabler(p);
-				p.setPen(Qt::NoPen);
-				p.setBrush(st::windowBgActive);
-				const auto r = st::settingsPremiumNewBadgePadding.left();
-				p.drawRoundedRect(badge->rect(), r, r);
-			}, badge->lifetime());
-			badge->show();
-			auto result = Ui::GrabWidget(badge).toImage();
-			badge->hide();
-			return result;
-		}();
 
 		const auto row = creditsTypeWrap->add(
 			object_ptr<Giveaway::GiveawayTypeRow>(
 				box,
 				GiveawayType::Credits,
-				kColorIndexCredits,
+				st::colorIndexOrange,
 				tr::lng_credits_summary_title(),
 				tr::lng_giveaway_create_subtitle(),
-				std::move(badge)));
+				QImage()));
 		row->addRadio(typeGroup);
 		row->setClickedCallback([=] {
 			state->typeValue.force_assign(GiveawayType::Credits);
@@ -530,7 +502,7 @@ void CreateGiveawayBox(
 			contentWrap,
 			object_ptr<Ui::VerticalLayout>(box)));
 	state->typeValue.value(
-	) | rpl::start_with_next([=](GiveawayType type) {
+	) | rpl::on_next([=](GiveawayType type) {
 		randomWrap->toggle(!isSpecificUsers(), anim::type::instant);
 	}, randomWrap->lifetime());
 
@@ -570,7 +542,7 @@ void CreateGiveawayBox(
 				})),
 			title->positionValue(),
 			content->geometryValue()
-		) | rpl::start_with_next([=](QString s, const QPoint &p, QRect) {
+		) | rpl::on_next([=](QString s, const QPoint &p, QRect) {
 			rightLabel->setText(std::move(s));
 			rightLabel->moveToRight(st::boxRowPadding.right(), p.y());
 		}, rightLabel->lifetime());
@@ -625,7 +597,7 @@ void CreateGiveawayBox(
 				+ (st.nameStyle.font->spacew * 2)
 				+ (stars.width() / style::DevicePixelRatio());
 			state->sliderValue.value(
-			) | rpl::start_with_next([=](int users) {
+			) | rpl::on_next([=](int users) {
 				const auto option = creditsOption(i);
 				buttonState->hasStatus = false;
 				for (const auto &winner : option.winners) {
@@ -643,7 +615,7 @@ void CreateGiveawayBox(
 				inner->update();
 			}, button->lifetime());
 			inner->paintRequest(
-			) | rpl::start_with_next([=](const QRect &rect) {
+			) | rpl::on_next([=](const QRect &rect) {
 				auto p = QPainter(inner);
 				const auto namey = buttonState->hasStatus
 					? st.namePosition.y()
@@ -666,7 +638,7 @@ void CreateGiveawayBox(
 				}
 			}, inner->lifetime());
 			button->widthValue(
-			) | rpl::start_with_next([=](int width) {
+			) | rpl::on_next([=](int width) {
 				price->moveToRight(
 					st::boxRowPadding.right(),
 					(buttonHeight - price->height()) / 2);
@@ -761,7 +733,7 @@ void CreateGiveawayBox(
 		rightLabel->show();
 		rpl::duplicate(
 			creditsValueType
-		) | rpl::start_with_next([=](bool isCredits) {
+		) | rpl::on_next([=](bool isCredits) {
 			rightLabel->setVisible(!isCredits);
 		}, rightLabel->lifetime());
 
@@ -779,7 +751,7 @@ void CreateGiveawayBox(
 				})),
 			title->positionValue(),
 			sliderContainer->geometryValue()
-		) | rpl::start_with_next([=](QString s, const QPoint &p, QRect) {
+		) | rpl::on_next([=](QString s, const QPoint &p, QRect) {
 			rightLabel->setText(std::move(s));
 			rightLabel->moveToRight(st::boxRowPadding.right(), p.y());
 		}, rightLabel->lifetime());
@@ -798,7 +770,7 @@ void CreateGiveawayBox(
 		rpl::combine(
 			rpl::duplicate(creditsValueType),
 			creditsGroup->value()
-		) | rpl::start_with_next([=](bool isCredits, int value) {
+		) | rpl::on_next([=](bool isCredits, int value) {
 			while (sliderParent->count()) {
 				delete sliderParent->widgetAt(0);
 			}
@@ -837,7 +809,7 @@ void CreateGiveawayBox(
 			rpl::duplicate(creditsValueType),
 			creditsGroup->value(),
 			state->sliderValue.value()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				bool isCredits,
 				int credits,
 				int boosts) {
@@ -909,7 +881,7 @@ void CreateGiveawayBox(
 				&listState->controller)));
 		listState->controller.setDelegate(&listState->delegate);
 		listState->controller.channelRemoved(
-		) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		) | rpl::on_next([=](not_null<PeerData*> peer) {
 			auto &list = state->selectedToSubscribe;
 			list.erase(ranges::remove(list, peer), end(list));
 		}, box->lifetime());
@@ -999,7 +971,8 @@ void CreateGiveawayBox(
 				Ui::SelectCountriesBox,
 				state->countriesValue.current(),
 				std::move(done),
-				std::move(error)));
+				std::move(error),
+				Countries::Naming::Default));
 		};
 
 		const auto createCallback = [=](GiveawayType type) {
@@ -1051,9 +1024,9 @@ void CreateGiveawayBox(
 				lt_link,
 				tr::lng_premium_gift_terms_link(
 				) | rpl::map([](const QString &t) {
-					return Ui::Text::Link(t, 1);
+					return tr::link(t, 1);
 				}),
-				Ui::Text::WithEntities),
+				tr::marked),
 			st::boxDividerLabel);
 		terms->setLink(1, std::make_shared<LambdaClickHandler>([=] {
 			box->closeBox();
@@ -1093,7 +1066,7 @@ void CreateGiveawayBox(
 			Ui::Premium::AddGiftOptions(
 				listOptions,
 				durationGroup,
-				state->apiOptions.options(usersCount),
+				state->apiOptions.optionsForGiveaway(usersCount),
 				st::giveawayGiftCodeGiftOption,
 				true);
 
@@ -1115,7 +1088,7 @@ void CreateGiveawayBox(
 		rpl::combine(
 			state->sliderValue.value(),
 			state->typeValue.value()
-		) | rpl::start_with_next([=](int users, GiveawayType type) {
+		) | rpl::on_next([=](int users, GiveawayType type) {
 			typeGroup->setValue(type);
 			rebuildListOptions(
 				type,
@@ -1150,7 +1123,7 @@ void CreateGiveawayBox(
 			state->additionalPrize = additional->getLastText().trimmed();
 		};
 		additionalToggle->toggleOn(rpl::single(false))->toggledChanges(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			if (!toggled && Ui::InFocusChain(additional)) {
 				additionalWrap->setFocus();
 				state->additionalPrize = QString();
@@ -1165,27 +1138,27 @@ void CreateGiveawayBox(
 
 		additional->changes() | rpl::filter([=] {
 			return additionalInner->toggled();
-		}) | rpl::start_with_next(
+		}) | rpl::on_next(
 			fillAdditionalPrizeValue,
 			additional->lifetime());
 
 		Ui::AddSkip(additionalWrap);
 
 		auto monthsValue = prepaid
-			? (rpl::single(prepaid->months) | rpl::type_erased())
+			? (rpl::single(prepaid->months) | rpl::type_erased)
 			: state->chosenMonths.value();
 		const auto usersCountByType = [=](GiveawayType type) {
 			if (!isSpecificUsers()) {
-				return state->sliderValue.value() | rpl::type_erased();
+				return state->sliderValue.value() | rpl::type_erased;
 			}
 			return state->toAwardAmountChanged.events_starting_with_copy(
 				rpl::empty
 			) | rpl::map([=] {
 				return int(state->selectedToAward.size());
-			}) | rpl::type_erased();
+			}) | rpl::type_erased;
 		};
 		auto usersCountValue = prepaid
-			? (rpl::single(prepaid->quantity) | rpl::type_erased())
+			? (rpl::single(prepaid->quantity) | rpl::type_erased)
 			: state->typeValue.value(
 			) | rpl::map(usersCountByType) | rpl::flatten_latest();
 
@@ -1195,7 +1168,7 @@ void CreateGiveawayBox(
 				return QString::number(count);
 			}),
 			st::giveawayGiftCodeAdditionalLabel);
-		additionalLabel->widthValue() | rpl::start_with_next([=](int width) {
+		additionalLabel->widthValue() | rpl::on_next([=](int width) {
 			const auto min = st::giveawayGiftCodeAdditionalPaddingMin;
 			const auto skip = st::giveawayGiftCodeAdditionalLabelSkip;
 			const auto added = std::max(width + skip - min.left(), 0);
@@ -1223,7 +1196,7 @@ void CreateGiveawayBox(
 					users,
 					lt_duration,
 					TextWithEntities{ duration },
-					Ui::Text::RichLangValue);
+					tr::rich);
 			}
 			return tr::lng_giveaway_prizes_additional(
 				tr::now,
@@ -1233,7 +1206,7 @@ void CreateGiveawayBox(
 				TextWithEntities{ prize },
 				lt_duration,
 				TextWithEntities{ duration },
-				Ui::Text::RichLangValue);
+				tr::rich);
 		});
 		auto creditsAdditionalAbout = rpl::combine(
 			state->additionalPrize.value(),
@@ -1246,7 +1219,7 @@ void CreateGiveawayBox(
 					tr::now,
 					lt_count,
 					credits,
-					Ui::Text::RichLangValue)
+					tr::rich)
 				: tr::lng_giveaway_prizes_additional_credits(
 					tr::now,
 					lt_count,
@@ -1258,8 +1231,8 @@ void CreateGiveawayBox(
 						tr::now,
 						lt_count,
 						credits,
-						Ui::Text::RichLangValue),
-					Ui::Text::RichLangValue);
+						tr::rich),
+					tr::rich);
 		});
 
 		auto creditsValueType = typeGroup->value(
@@ -1275,9 +1248,8 @@ void CreateGiveawayBox(
 					std::move(additionalAbout)),
 				rpl::conditional(
 					rpl::duplicate(creditsValueType),
-					tr::lng_giveaway_additional_credits_about(),
-					tr::lng_giveaway_additional_about()
-				) | rpl::map(Ui::Text::WithEntities)));
+					tr::lng_giveaway_additional_credits_about(tr::marked),
+					tr::lng_giveaway_additional_about(tr::marked))));
 		Ui::AddSkip(additionalWrap);
 	}
 
@@ -1382,7 +1354,7 @@ void CreateGiveawayBox(
 				tr::lng_giveaway_start(),
 				tr::lng_giveaway_award()),
 			(prepaid && prepaid->boosts)
-				? rpl::single(prepaid->boosts) | rpl::type_erased()
+				? rpl::single(prepaid->boosts) | rpl::type_erased
 				: rpl::conditional(
 					state->typeValue.value(
 					) | rpl::map(rpl::mappers::_1 == GiveawayType::Credits),
@@ -1408,9 +1380,8 @@ void CreateGiveawayBox(
 			loadingAnimation->showOn(state->confirmButtonBusy.value());
 		}
 
-		button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 		state->typeValue.value(
-		) | rpl::start_with_next([=, raw = button.data()] {
+		) | rpl::on_next([=, raw = button.data()] {
 			raw->resizeToWidth(box->width()
 				- stButton.buttonPadding.left()
 				- stButton.buttonPadding.right());
@@ -1429,7 +1400,7 @@ void CreateGiveawayBox(
 			auto invoice = [&] {
 				if (isPrepaidCredits) {
 					return Payments::InvoicePremiumGiftCode{
-						.creditsAmount = prepaid->credits,
+						.giveawayCredits = prepaid->credits,
 						.randomId = prepaid->id,
 						.users = prepaid->quantity,
 					};
@@ -1439,7 +1410,7 @@ void CreateGiveawayBox(
 					return Payments::InvoicePremiumGiftCode{
 						.currency = option.currency,
 						.storeProduct = option.storeProduct,
-						.creditsAmount = option.credits,
+						.giveawayCredits = option.credits,
 						.randomId = UniqueIdFromCreditsOption(option, peer),
 						.amount = option.amount,
 						.users = state->sliderValue.current(),
@@ -1486,11 +1457,11 @@ void CreateGiveawayBox(
 			}
 			state->confirmButtonBusy = true;
 			const auto show = box->uiShow();
-			const auto weak = Ui::MakeWeak(box.get());
+			const auto weak = base::make_weak(box.get());
 			const auto done = [=](Payments::CheckoutResult result) {
 				const auto isPaid = result == Payments::CheckoutResult::Paid;
 				if (result == Payments::CheckoutResult::Pending || isPaid) {
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->window()->setFocus();
 						strong->closeBox();
 					}
@@ -1515,15 +1486,15 @@ void CreateGiveawayBox(
 							? tr::lng_giveaway_created_body_group
 							: tr::lng_giveaway_created_body);
 					show->showToast({
-						.text = Ui::Text::Bold(
+						.text = tr::bold(
 							title(tr::now)).append('\n').append(
 								body(
 									tr::now,
 									lt_link,
-									Ui::Text::Link(
+									tr::link(
 										tr::lng_giveaway_created_link(
 											tr::now)),
-									Ui::Text::WithEntities)),
+									tr::marked)),
 						.filter = filter,
 						.adaptive = true,
 						.duration = kDoneTooltipDuration,
@@ -1540,7 +1511,7 @@ void CreateGiveawayBox(
 				state->apiOptions.applyPrepaid(
 					invoice,
 					prepaid->id
-				) | rpl::start_with_error_done([=](const QString &error) {
+				) | rpl::on_error_done([=](const QString &error) {
 					if (const auto window = weakWindow.get()) {
 						window->uiShow()->showToast(error);
 						close();
@@ -1573,7 +1544,7 @@ void CreateGiveawayBox(
 
 	std::move(
 		showFinished
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		if (!loading->toggled()) {
 			return;
 		}
@@ -1594,7 +1565,7 @@ void CreateGiveawayBox(
 		const auto receivedOptions = [=] {
 			state->lifetimeApi.destroy();
 			state->lifetimeApi = state->apiCreditsOptions.request(
-			) | rpl::start_with_error_done([=](const QString &error) {
+			) | rpl::on_error_done([=](const QString &error) {
 				box->uiShow()->showToast(error);
 				box->closeBox();
 			}, done);
@@ -1603,7 +1574,7 @@ void CreateGiveawayBox(
 			return done();
 		}
 		state->lifetimeApi = state->apiOptions.request(
-		) | rpl::start_with_error_done([=](const QString &error) {
+		) | rpl::on_error_done([=](const QString &error) {
 			box->uiShow()->showToast(error);
 			box->closeBox();
 		}, receivedOptions);
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.cpp
index aea01c5924cd4b..625fe22142e0a9 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/boost_badge.cpp
@@ -32,7 +32,7 @@ not_null<Ui::RpWidget*> InfiniteRadialAnimationWidget(
 		, _st(st ? st : &st::startGiveawayButtonLoading)
 		, _animation([=] { update(); }, *_st) {
 			resize(size, size);
-			shownValue() | rpl::start_with_next([=](bool v) {
+			shownValue() | rpl::on_next([=](bool v) {
 				return v
 					? _animation.start()
 					: _animation.stop(anim::type::instant);
@@ -61,7 +61,7 @@ void AddChildToWidgetCenter(
 		not_null<Ui::RpWidget*> parent,
 		not_null<Ui::RpWidget*> child) {
 	parent->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto size = child->size();
 		child->moveToLeft(
 			(s.width() - size.width()) / 2,
@@ -135,18 +135,18 @@ void AddLabelWithBadgeToButton(
 		st::startGiveawayButtonLabelSimple);
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &s) {
+	) | rpl::on_next([=](const QString &s) {
 		label->setText(s);
 	}, label->lifetime());
 	const auto count = Ui::CreateChild<Ui::RpWidget>(parent.get());
 	count->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(count);
 		p.drawImage(0, 0, state->badge);
 	}, count->lifetime());
 	std::move(
 		number
-	) | rpl::start_with_next([=](int c) {
+	) | rpl::on_next([=](int c) {
 		state->badge = Info::Statistics::CreateBadge(
 			st::startGiveawayButtonTextStyle,
 			QString::number(c),
@@ -163,7 +163,7 @@ void AddLabelWithBadgeToButton(
 
 	std::move(
 		shown
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		count->setVisible(shown);
 		label->setVisible(shown);
 	}, count->lifetime());
@@ -172,7 +172,7 @@ void AddLabelWithBadgeToButton(
 		parent->sizeValue(),
 		label->sizeValue(),
 		count->sizeValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const QSize &s,
 			const QSize &s1,
 			const QSize &s2) {
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
index d3fb04e8de5955..ba4e32f69ac2f9 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
@@ -78,29 +78,30 @@ giveawayGiftCodeTable: Table(defaultTable) {
 	labelMinWidth: 91px;
 }
 giveawayGiftCodeTableMargin: margins(24px, 4px, 24px, 4px);
-giveawayGiftCodeLabel: FlatLabel(defaultFlatLabel) {
-	textFg: menuIconColor;
-	maxHeight: 24px;
-	style: TextStyle(semiboldTextStyle) {
-		font: font(12px semibold);
-	}
-}
 giveawayGiftCodeLabelMargin: margins(13px, 10px, 13px, 10px);
-giveawayGiftCodeValue: FlatLabel(defaultFlatLabel) {
-	maxHeight: 24px;
+giveawayGiftCodeValueMultiline: FlatLabel(defaultTableValue) {
+	minWidth: 128px;
+	maxHeight: 100px;
 	style: TextStyle(defaultTextStyle) {
-		font: font(12px);
+		font: font(10px);
 		linkUnderline: kLinkUnderlineNever;
 	}
 }
-giveawayGiftCodeValueMultiline: FlatLabel(giveawayGiftCodeValue) {
-	minWidth: 128px;
-	maxHeight: 100px;
-}
-giveawayGiftMessage: FlatLabel(giveawayGiftCodeValue) {
+giveawayGiftMessage: FlatLabel(defaultTableValue) {
 	minWidth: 128px;
 	maxHeight: 0px;
 }
+giveawayGiftMessageRemove: IconButton(defaultIconButton) {
+	width: 32px;
+	height: 32px;
+	icon: icon{{ "menu/delete", windowActiveTextFg }};
+	iconOver: icon{{ "menu/delete", windowActiveTextFg }};
+	rippleAreaPosition: point(0px, 0px);
+	rippleAreaSize: 32px;
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: lightButtonBgRipple;
+	}
+}
 giveawayGiftCodeValueMargin: margins(13px, 9px, 13px, 9px);
 giveawayGiftCodePeerMargin: margins(11px, 6px, 11px, 4px);
 giveawayGiftCodeUserpic: UserpicButton(defaultUserpicButton) {
@@ -160,16 +161,20 @@ giveawayGiftCodeFooter: FlatLabel(defaultFlatLabel) {
 	textFg: windowBoldFg;
 }
 giveawayGiftCodeFooterMargin: margins(0px, 9px, 0px, 4px);
+giveawayGiftCodeBoxButton: RoundButton(defaultActiveButton) {
+	height: 42px;
+	textTop: 12px;
+	style: semiboldTextStyle;
+}
 giveawayGiftCodeBox: Box(defaultBox) {
 	buttonPadding: margins(22px, 11px, 22px, 22px);
 	buttonHeight: 42px;
-	button: RoundButton(defaultActiveButton) {
-		height: 42px;
-		textTop: 12px;
-		style: semiboldTextStyle;
-	}
+	buttonWide: true;
+	button: giveawayGiftCodeBoxButton;
 	shadowIgnoreTopSkip: true;
 }
+giveawayGiftCodeBoxUpgradeNext: RoundButton(defaultLightButton, giveawayGiftCodeBoxButton) {
+}
 giveawayRefundedLabel: FlatLabel(boxLabel) {
 	align: align(top);
 	style: semiboldTextStyle;
@@ -180,10 +185,6 @@ giveawayRefundedPadding: margins(8px, 10px, 8px, 10px);
 startGiveawayBox: Box(premiumGiftBox) {
 	shadowIgnoreTopSkip: true;
 }
-startGiveawayScrollArea: ScrollArea(boxScroll) {
-	deltax: 3px;
-	deltat: 50px;
-}
 startGiveawayBoxTitleClose: IconButton(boxTitleClose) {
 	ripple: universalRippleAnimation;
 }
@@ -208,10 +209,65 @@ startGiveawayButtonLoading: InfiniteRadialAnimation(defaultInfiniteRadialAnimati
 	thickness: 2px;
 }
 
-starGiftBox: Box(giveawayGiftCodeBox) {
-	buttonPadding: margins(22px, 11px, 22px, 52px);
+darkGiftCodeBox: Box(giveawayGiftCodeBox) {
+	bg: groupCallMembersBg;
+	title: FlatLabel(boxTitle) {
+		textFg: groupCallMembersFg;
+	}
+	titleAdditionalFg: groupCallMemberNotJoinedStatus;
+}
+darkGiftLink: icon {{ "menu/copy", groupCallMembersFg }};
+darkGiftShare: icon {{ "menu/share", groupCallMembersFg }};
+darkGiftTheme: icon {{ "menu/colors", groupCallMembersFg }};
+darkGiftTransfer: icon {{ "chat/input_replace", groupCallMembersFg }};
+darkGiftCraft: icon {{ "menu/craft_start-24x24", groupCallMembersFg }};
+darkGiftNftWear: icon {{ "menu/nft_wear", groupCallMembersFg }};
+darkGiftNftTakeOff: icon {{ "menu/nft_takeoff", groupCallMembersFg }};
+darkGiftNftResell: icon {{ "menu/tag_sell", groupCallMembersFg }};
+darkGiftNftUnlist: icon {{ "menu/tag_remove", groupCallMembersFg }};
+darkGiftHide: icon {{ "menu/stealth", groupCallMembersFg }};
+darkGiftShow: icon {{ "menu/show_in_chat", groupCallMembersFg }};
+darkGiftPin: icon {{ "menu/pin", groupCallMembersFg }};
+darkGiftUnpin: icon {{ "menu/unpin", groupCallMembersFg }};
+darkGiftOffer: icon {{ "menu/earn", groupCallMembersFg }};
+darkGiftPalette: TextPalette(defaultTextPalette) {
+	linkFg: mediaviewTextLinkFg;
+	monoFg: groupCallMembersFg;
+	spoilerFg: groupCallMembersFg;
+}
+darkGiftTable: Table(giveawayGiftCodeTable) {
+	headerBg: groupCallMembersBgOver;
+	borderFg: mediaviewMenuBgOver;
+	smallButton: RoundButton(defaultTableSmallButton) {
+		textFg: groupCallMembersFg;
+		textFgOver: groupCallMembersFg;
+		textBg: groupCallMenuBgRipple;
+		textBgOver: groupCallMenuBgRipple;
+		ripple: RippleAnimation(defaultRippleAnimation) {
+			color: mediaviewMenuBgOver;
+		}
+	}
+	defaultLabel: FlatLabel(defaultTableLabel) {
+		textFg: groupCallMembersFg;
+		palette: darkGiftPalette;
+	}
+	defaultValue: FlatLabel(defaultTableValue) {
+		textFg: groupCallMembersFg;
+		palette: darkGiftPalette;
+	}
 }
-starConvertButtonLoading: InfiniteRadialAnimation(startGiveawayButtonLoading) {
-	color: windowActiveTextFg;
-	thickness: 2px;
+darkGiftTableValueMultiline: FlatLabel(giveawayGiftCodeValueMultiline) {
+	textFg: groupCallMembersFg;
+	palette: darkGiftPalette;
+}
+darkGiftTableMessage: FlatLabel(giveawayGiftMessage) {
+	textFg: groupCallMembersFg;
+	palette: darkGiftPalette;
+}
+darkGiftBoxClose: IconButton(boxTitleClose) {
+	icon: icon {{ "box_button_close", groupCallMemberInactiveIcon }};
+	iconOver: icon {{ "box_button_close", groupCallMemberInactiveIcon }};
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: groupCallMembersBgOver;
+	}
 }
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp
index 22c3680bd55f72..15aa552e02c6d1 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_list_controllers.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "info/channel_statistics/boosts/giveaway/giveaway_list_controllers.h"
 
 #include "apiwrap.h"
+#include "boxes/peer_list_controllers.h"
 #include "data/data_channel.h"
 #include "data/data_folder.h"
 #include "data/data_peer.h"
@@ -138,7 +139,11 @@ std::unique_ptr<PeerListRow> AwardMembersListController::createRow(
 	if (!user || user->isInaccessible() || user->isBot() || user->isSelf()) {
 		return nullptr;
 	}
-	return std::make_unique<PeerListRow>(participant);
+	auto type = Type{
+		.chatStyle = _chatStyle.get(),
+		.circleCache = &_pillCircleCache,
+	};
+	return std::make_unique<Row>(participant, type);
 }
 
 base::unique_qptr<Ui::PopupMenu> AwardMembersListController::rowContextMenu(
@@ -313,7 +318,7 @@ SelectedChannelsListController::SelectedChannelsListController(
 void SelectedChannelsListController::setTopStatus(rpl::producer<QString> s) {
 	_statusLifetime = std::move(
 		s
-	) | rpl::start_with_next([=](const QString &t) {
+	) | rpl::on_next([=](const QString &t) {
 		if (delegate()->peerListFullRowsCount() > 0) {
 			delegate()->peerListRowAt(0)->setCustomStatus(t);
 		}
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp
index b97184dba12523..7aa3ade27aa3a7 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway_type_row.cpp
@@ -16,14 +16,12 @@ For license and copyright information please follow this link:
 #include "ui/widgets/checkbox.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
+#include "styles/style_color_indices.h"
 #include "styles/style_giveaway.h"
 #include "styles/style_statistics.h"
 
 namespace Giveaway {
 
-constexpr auto kColorIndexSpecific = int(4);
-constexpr auto kColorIndexRandom = int(2);
-
 GiveawayTypeRow::GiveawayTypeRow(
 	not_null<Ui::RpWidget*> parent,
 	Type type,
@@ -32,7 +30,7 @@ GiveawayTypeRow::GiveawayTypeRow(
 : GiveawayTypeRow(
 	parent,
 	type,
-	(type == Type::SpecificUsers) ? kColorIndexSpecific : kColorIndexRandom,
+	(type == Type::SpecificUsers) ? st::colorIndexBlue : st::colorIndexGreen,
 	(type == Type::SpecificUsers)
 		? tr::lng_giveaway_award_option()
 		: (type == Type::Random)
@@ -74,7 +72,7 @@ GiveawayTypeRow::GiveawayTypeRow(
 	}
 	std::move(
 		subtitle
-	) | rpl::start_with_next([=] (QString s) {
+	) | rpl::on_next([=] (QString s) {
 		_status.setText(
 			st::defaultTextStyle,
 			s.replace(QChar('>'), QString()),
@@ -82,7 +80,7 @@ GiveawayTypeRow::GiveawayTypeRow(
 	}, lifetime());
 	std::move(
 		title
-	) | rpl::start_with_next([=] (const QString &s) {
+	) | rpl::on_next([=] (const QString &s) {
 		_name.setText(_st.nameStyle, s, Ui::NameTextOptions());
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp
index 1faa9289d731ea..dd8f50ed40b627 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp
@@ -58,7 +58,8 @@ void SelectCountriesBox(
 		not_null<Ui::GenericBox*> box,
 		const std::vector<QString> &selected,
 		Fn<void(std::vector<QString>)> doneCallback,
-		Fn<bool(int)> checkErrorCallback) {
+		Fn<bool(int)> checkErrorCallback,
+		Countries::Naming naming) {
 	struct State final {
 		std::vector<QString> resultList;
 	};
@@ -79,22 +80,28 @@ void SelectCountriesBox(
 	};
 
 	auto countries = Countries::Instance().list();
-	ranges::sort(countries, [](
+	const auto &instance = Countries::Instance();
+	ranges::sort(countries, [&](
 			const Countries::Info &a,
 			const Countries::Info &b) {
-		return (a.name.compare(b.name, Qt::CaseInsensitive) < 0);
+		const auto nameA = instance.countryNameByISO2(a.iso2, naming);
+		const auto nameB = instance.countryNameByISO2(b.iso2, naming);
+		return (nameA.compare(nameB, Qt::CaseInsensitive) < 0);
 	});
 	auto buttons = std::vector<Entry>();
 	buttons.reserve(countries.size());
 	for (const auto &country : countries) {
-		const auto flag = Countries::Instance().flagEmojiByISO2(country.iso2);
+		const auto flag = instance.flagEmojiByISO2(country.iso2);
 		if (!Ui::Emoji::Find(flag)) {
 			continue;
 		}
+		const auto displayName = instance.countryNameByISO2(
+			country.iso2,
+			naming);
 		const auto itemId = buttons.size();
 		auto button = object_ptr<SettingsButton>(
 			box->verticalLayout(),
-			rpl::single(flag + ' ' + country.name),
+			rpl::single(flag + ' ' + displayName),
 			buttonSt);
 		const auto radio = Ui::CreateChild<Ui::RpWidget>(button.data());
 		const auto radioView = std::make_shared<Ui::RadioView>(
@@ -106,7 +113,7 @@ void SelectCountriesBox(
 			const auto radioSize = radioView->getSize();
 			radio->resize(radioSize);
 			radio->paintRequest(
-			) | rpl::start_with_next([=](const QRect &r) {
+			) | rpl::on_next([=](const QRect &r) {
 				auto p = QPainter(radio);
 				radioView->paint(p, 0, 0, radioSize.width());
 			}, radio->lifetime());
@@ -132,7 +139,7 @@ void SelectCountriesBox(
 				state->resultList.push_back(country.iso2);
 				multiSelect->addItem(
 					itemId,
-					country.name,
+					displayName,
 					st::activeButtonBg,
 					paintCallback,
 					clicked
@@ -160,9 +167,12 @@ void SelectCountriesBox(
 		{
 			auto list = QStringList{
 				flag,
-				country.name,
+				displayName,
 				country.alternativeName,
 			};
+			if (displayName != country.name) {
+				list.push_back(country.name);
+			}
 			buttons.push_back({ wrap, std::move(list), country.iso2 });
 		}
 	}
@@ -177,12 +187,11 @@ void SelectCountriesBox(
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
 		container->add(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				container,
-				object_ptr<Ui::FlatLabel>(
-					container,
-					tr::lng_search_messages_none(),
-					st::membersAbout)));
+				tr::lng_search_messages_none(),
+				st::membersAbout),
+			style::al_top);
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
 	}
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.h b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.h
index 0d0fb91a0315f2..a1714f8fb76cdc 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.h
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.h
@@ -7,6 +7,10 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+namespace Countries {
+enum class Naming : uchar;
+} // namespace Countries
+
 namespace Ui {
 
 class GenericBox;
@@ -15,6 +19,7 @@ void SelectCountriesBox(
 	not_null<Ui::GenericBox*> box,
 	const std::vector<QString> &selected,
 	Fn<void(std::vector<QString>)> doneCallback,
-	Fn<bool(int)> checkErrorCallback);
+	Fn<bool(int)> checkErrorCallback,
+	Countries::Naming naming);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
index 09ca0420908d14..45206c7456b647 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
@@ -32,12 +32,17 @@ For license and copyright information please follow this link:
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/toast/toast.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
 #include "ui/widgets/slider_natural_width.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/ui_utility.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_color_indices.h"
+#include "styles/style_dialogs.h" // dialogsSearchTabs
 #include "styles/style_giveaway.h"
 #include "styles/style_info.h"
 #include "styles/style_premium.h"
@@ -103,7 +108,7 @@ void FillOverview(
 		sub->setTextColorOverride(st::windowSubTextFg->c);
 
 		primary->geometryValue(
-		) | rpl::start_with_next([=](const QRect &g) {
+		) | rpl::on_next([=](const QRect &g) {
 			const auto &padding = st::statisticsOverviewSecondValuePadding;
 			second->moveToLeft(
 				rect::right(g) + padding.left(),
@@ -147,7 +152,7 @@ void FillOverview(
 	container->showChildren();
 	container->resize(container->width(), topLeftLabel->height() * 5);
 	container->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto halfWidth = s.width() / 2;
 		{
 			const auto &p = st::boostsOverviewValuePadding;
@@ -171,10 +176,14 @@ void FillShareLink(
 		std::shared_ptr<Ui::Show> show,
 		const QString &link,
 		not_null<PeerData*> peer) {
-	const auto weak = Ui::MakeWeak(content);
+	const auto weak = base::make_weak(content);
 	const auto copyLink = crl::guard(weak, [=] {
 		QGuiApplication::clipboard()->setText(link);
-		show->showToast(tr::lng_channel_public_link_copied(tr::now));
+		show->showToast({
+			.text = { tr::lng_channel_public_link_copied(tr::now) },
+			.iconLottie = u"toast/voip_invite"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	});
 	const auto shareLink = crl::guard(weak, [=] {
 		show->showBox(ShareInviteLinkBox(peer, link));
@@ -182,14 +191,14 @@ void FillShareLink(
 
 	const auto label = content->lifetime().make_state<Ui::InviteLinkLabel>(
 		content,
-		rpl::single(link),
+		rpl::single(base::duplicate(link).replace(u"https://"_q, QString())),
 		nullptr);
 	content->add(
 		label->take(),
 		st::boostsLinkFieldPadding);
 
 	label->clicks(
-	) | rpl::start_with_next(copyLink, label->lifetime());
+	) | rpl::on_next(copyLink, label->lifetime());
 	{
 		const auto wrap = content->add(
 			object_ptr<Ui::FixedHeightWidget>(
@@ -200,17 +209,15 @@ void FillShareLink(
 			wrap,
 			tr::lng_group_invite_context_copy(),
 			st::inviteLinkCopy);
-		copy->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 		copy->setClickedCallback(copyLink);
 		const auto share = CreateChild<Ui::RoundButton>(
 			wrap,
 			tr::lng_group_invite_context_share(),
 			st::inviteLinkShare);
-		share->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 		share->setClickedCallback(shareLink);
 
 		wrap->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto buttonWidth = (width - st::inviteLinkButtonsSkip) / 2;
 			copy->setFullWidth(buttonWidth);
 			share->setFullWidth(buttonWidth);
@@ -283,9 +290,9 @@ void InnerWidget::load() {
 		_showFinished.events());
 
 	_showFinished.events(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		api->request(
-		) | rpl::start_with_error_done([](const QString &error) {
+		) | rpl::on_error_done([](const QString &error) {
 		}, [=] {
 			_state = api->boostStatus();
 			_loaded.fire(true);
@@ -304,6 +311,7 @@ void InnerWidget::fill() {
 			delete Ui::VerticalLayout::widgetAt(0);
 		}
 		load();
+		_showFinished.fire({});
 	});
 
 	{
@@ -337,7 +345,6 @@ void InnerWidget::fill() {
 	Ui::AddSkip(inner);
 
 	if (!status.prepaidGiveaway.empty()) {
-		constexpr auto kColorIndexCredits = int(1);
 		const auto multiplier = Api::PremiumGiftCodeOptions(_peer)
 			.giveawayBoostsPerPremium();
 		Ui::AddSkip(inner);
@@ -350,7 +357,7 @@ void InnerWidget::fill() {
 				g.credits
 					? GiveawayTypeRow::Type::PrepaidCredits
 					: GiveawayTypeRow::Type::Prepaid,
-				g.credits ? kColorIndexCredits : g.id,
+				g.credits ? st::colorIndexOrange : g.id,
 				g.credits
 					? tr::lng_boosts_prepaid_giveaway_single()
 					: tr::lng_boosts_prepaid_giveaway_quantity(
@@ -389,7 +396,9 @@ void InnerWidget::fill() {
 		}
 
 		Ui::AddSkip(inner);
-		Ui::AddDivider(inner);
+		Ui::AddDividerText(
+			inner,
+			tr::lng_boosts_prepaid_giveaway_title_subtext());
 		Ui::AddSkip(inner);
 	}
 
@@ -406,7 +415,7 @@ void InnerWidget::fill() {
 						.from = _peer->id,
 						.to = user->id,
 						.date = TimeId(boost.date.toSecsSinceEpoch()),
-						.months = boost.expiresAfterMonths,
+						.days = boost.expiresAfterMonths * 30,
 					};
 					_show->showBox(Box(GiftCodePendingBox, _controller, d));
 				} else {
@@ -430,7 +439,7 @@ void InnerWidget::fill() {
 #else
 		const auto hasOneTab = (hasBoosts != hasGifts);
 #endif
-		const auto boostsTabText = tr::lng_boosts_list_title(
+		const auto boostsTabText = tr::lng_giveaway_quantity(
 			tr::now,
 			lt_count,
 			status.firstSliceBoosts.multipliedTotal);
@@ -454,8 +463,19 @@ void InnerWidget::fill() {
 				inner,
 				object_ptr<Ui::CustomWidthSlider>(
 					inner,
-					st::defaultTabsSlider)),
-			st::boxRowPadding);
+					st::dialogsSearchTabs)));
+		if (!hasOneTab) {
+			const auto shadow = Ui::CreateChild<Ui::PlainShadow>(inner);
+			shadow->show();
+			slider->geometryValue(
+			) | rpl::on_next([=](const QRect &r) {
+				shadow->setGeometry(
+					inner->x(),
+					rect::bottom(r) - shadow->height(),
+					inner->width(),
+					shadow->height());
+			}, shadow->lifetime());
+		}
 		slider->toggle(!hasOneTab, anim::type::instant);
 
 		slider->entity()->addSection(boostsTabText);
@@ -480,7 +500,7 @@ void InnerWidget::fill() {
 
 		rpl::single(hasOneTab ? (hasGifts ? 1 : 0) : 0) | rpl::then(
 			slider->entity()->sectionActivated()
-		) | rpl::start_with_next([=](int index) {
+		) | rpl::on_next([=](int index) {
 			boostsWrap->toggle(!index, anim::type::instant);
 			giftsWrap->toggle(index, anim::type::instant);
 		}, inner->lifetime());
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp
index 60b37cb86b58d8..89d517bf2144c3 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_widget.cpp
@@ -16,11 +16,7 @@ For license and copyright information please follow this link:
 namespace Info::Boosts {
 
 Memento::Memento(not_null<Controller*> controller)
-: ContentMemento(Info::Statistics::Tag{
-	controller->statisticsPeer(),
-	{},
-	{},
-}) {
+: ContentMemento(controller->statisticsTag()) {
 }
 
 Memento::Memento(not_null<PeerData*> peer)
@@ -58,12 +54,12 @@ Widget::Widget(
 	object_ptr<InnerWidget>(
 		this,
 		controller,
-		controller->statisticsPeer()))) {
+		controller->statisticsTag().peer))) {
 	_inner->showRequests(
-	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
+	) | rpl::on_next([=](InnerWidget::ShowRequest request) {
 	}, _inner->lifetime());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &request) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
@@ -73,7 +69,7 @@ not_null<PeerData*> Widget::peer() const {
 }
 
 bool Widget::showInternal(not_null<ContentMemento*> memento) {
-	return (memento->statisticsPeer() == peer());
+	return (memento->statisticsTag().peer == peer());
 }
 
 rpl::producer<QString> Widget::title() {
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index 15df2c282f3fc4..393f0661beb32b 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -9,8 +9,6 @@ using "ui/basic.style";
 using "boxes/boxes.style";
 using "statistics/statistics.style";
 
-channelEarnLearnArrowMargins: margins(-2px, 5px, 0px, 0px);
-
 channelEarnOverviewTitleSkip: 11px;
 channelEarnOverviewMajorLabel: FlatLabel(defaultFlatLabel) {
 	maxHeight: 30px;
@@ -37,6 +35,7 @@ channelEarnSemiboldLabel: FlatLabel(channelEarnOverviewMajorLabel) {
 channelEarnHeaderLabel: FlatLabel(channelEarnOverviewMajorLabel) {
 	style: TextStyle(statisticsHeaderTitleTextStyle) {
 	}
+	textFg: windowActiveTextFg;
 }
 channelEarnHistorySubLabel: FlatLabel(channelEarnOverviewSubMinorLabel) {
 	style: TextStyle(defaultTextStyle) {
@@ -111,11 +110,10 @@ channelEarnBalanceMinorLabel: FlatLabel(channelEarnOverviewMinorLabel) {
 	}
 }
 channelEarnBalanceMinorLabelSkip: 6px;
-channelEarnFadeDuration: 60;
 
 channelEarnLearnDescription: FlatLabel(defaultFlatLabel) {
 	maxHeight: 0px;
-	minWidth: 280px;
+	minWidth: 264px;
 	align: align(top);
 }
 
@@ -147,4 +145,7 @@ botEarnLockedButtonLabel: FlatLabel(channelEarnOverviewMajorLabel) {
 		font: font(10px semibold);
 	}
 }
-botEarnButtonLockMargins: margins(-2px, 4px, 0px, 0px);
+botEarnButtonLock: IconEmoji {
+	icon: icon{{ "chat/mini_lock", premiumButtonFg }};
+	padding: margins(-2px, 4px, 0px, 0px);
+}
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
index 4f87fa505e224e..69ece36f327de4 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
@@ -7,14 +7,19 @@ For license and copyright information please follow this link:
 */
 #include "info/channel_statistics/earn/earn_format.h"
 
-namespace Info::ChannelEarn {
+#include <QtCore/QLocale>
 
-using EarnInt = Data::EarnInt;
+namespace Info::ChannelEarn {
+namespace {
 
 constexpr auto kMinorPartLength = 9;
 constexpr auto kMaxChoppedZero = kMinorPartLength - 2;
 constexpr auto kZero = QChar('0');
-constexpr auto kDot = QChar('.');
+const auto DecimalPoint = QString() + QLocale().decimalPoint();
+
+using EarnInt = Data::EarnInt;
+
+} // namespace
 
 QString MajorPart(EarnInt value) {
 	const auto string = QString::number(value);
@@ -22,15 +27,19 @@ QString MajorPart(EarnInt value) {
 	return (diff <= 0) ? QString(kZero) : string.mid(0, diff);
 }
 
+QString MajorPart(CreditsAmount value) {
+	return QString::number(int64(value.value()));
+}
+
 QString MinorPart(EarnInt value) {
 	if (!value) {
-		return QString(kDot) + kZero + kZero;
+		return DecimalPoint + kZero + kZero;
 	}
 	const auto string = QString::number(value);
 	const auto diff = int(string.size()) - kMinorPartLength;
 	const auto result = (diff < 0)
-		? kDot + u"%1"_q.arg(0, std::abs(diff), 10, kZero) + string
-		: kDot + string.mid(diff);
+		? DecimalPoint + u"%1"_q.arg(0, std::abs(diff), 10, kZero) + string
+		: DecimalPoint + string.mid(diff);
 	const auto begin = (result.constData());
 	const auto end = (begin + result.size());
 	auto ch = end - 1;
@@ -46,17 +55,41 @@ QString MinorPart(EarnInt value) {
 	return result.chopped(zeroCount);
 }
 
-QString ToUsd(EarnInt value, float64 rate) {
+QString MinorPart(CreditsAmount value) {
+	static const int DecimalPointLength = DecimalPoint.length();
+
+	const auto fractional = std::abs(int(value.value() * 100)) % 100;
+	auto result = QString(DecimalPointLength + 2, Qt::Uninitialized);
+
+	for (int i = 0; i < DecimalPointLength; ++i) {
+		result[i] = DecimalPoint[i];
+	}
+
+	result[DecimalPointLength] = QChar('0' + fractional / 10);
+	result[DecimalPointLength + 1] = QChar('0' + fractional % 10);
+
+	return result;
+}
+
+QString ToUsd(
+		Data::EarnInt value,
+		float64 rate,
+		int afterFloat) {
+	return ToUsd(CreditsAmount(value), rate, afterFloat);
+}
+
+QString ToUsd(
+		CreditsAmount value,
+		float64 rate,
+		int afterFloat) {
 	constexpr auto kApproximately = QChar(0x2248);
 
-	const auto result = value
-		/ float64(Data::kEarnMultiplier)
-		* rate
-		* Data::kEarnMultiplier;
 	return QString(kApproximately)
 		+ QChar('$')
-		+ MajorPart(result)
-		+ MinorPart(result);
+		+ QLocale().toString(
+			value.value() * rate,
+			'f',
+			afterFloat ? afterFloat : 2);
 }
 
 } // namespace Info::ChannelEarn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.h b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.h
index 4a7b401ab92910..02ac4cee32f7e3 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.h
@@ -12,7 +12,16 @@ For license and copyright information please follow this link:
 namespace Info::ChannelEarn {
 
 [[nodiscard]] QString MajorPart(Data::EarnInt value);
+[[nodiscard]] QString MajorPart(CreditsAmount value);
 [[nodiscard]] QString MinorPart(Data::EarnInt value);
-[[nodiscard]] QString ToUsd(Data::EarnInt value, float64 rate);
+[[nodiscard]] QString MinorPart(CreditsAmount value);
+[[nodiscard]] QString ToUsd(
+	Data::EarnInt value,
+	float64 rate,
+	int afterFloat);
+[[nodiscard]] QString ToUsd(
+	CreditsAmount value,
+	float64 rate,
+	int afterFloat);
 
 } // namespace Info::ChannelEarn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
new file mode 100644
index 00000000000000..00920df0dbe306
--- /dev/null
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
@@ -0,0 +1,199 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/channel_statistics/earn/earn_icons.h"
+
+#include "ui/effects/credits_graphics.h"
+#include "ui/effects/premium_graphics.h"
+#include "ui/text/custom_emoji_instance.h"
+#include "ui/rect.h"
+#include "styles/style_credits.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_widgets.h"
+#include "styles/style_info.h" // infoIconReport.
+
+#include <QFile>
+#include <QtSvg/QSvgRenderer>
+
+namespace Ui::Earn {
+namespace {
+
+[[nodiscard]] QByteArray CurrencySvg(const QColor &c) {
+	const auto color = u"rgb(%1,%2,%3)"_q
+		.arg(c.red())
+		.arg(c.green())
+		.arg(c.blue())
+		.toUtf8();
+	return R"(
+<svg width="72px" height="72px" viewBox="0 0 72 72">
+    <g stroke="none" fill="none" fill-rule="evenodd">
+        <path fill=")" + color + R"(" d="M26.0148187,12.0018928 L45.6469002,12.0007985
+ C48.1777253,12.0066542 49.5893649,12.0554519 50.8804395,12.462099
+ C52.179101,12.873841 53.3833619,13.5432922 54.423511,14.4349062
+ C55.5981446,15.4450073 56.4762152,16.8342664 58.2300327,19.6157469
+ L62.7287285,26.754584 C64.0735736,28.8873486 64.7445438,29.956693
+ 64.9272453,31.0793566 C65.0878715,32.0687224 64.9815619,33.0847478
+ 64.6179018,34.0178323 C64.2054439,35.0753281 63.3244687,35.9728665
+ 61.5657134,37.7649812 L40.9297474,58.8112207 C39.2046857,60.5707515
+ 38.3420097,61.4505169 37.3471729,61.7822803 C36.4722974,62.0725732
+ 35.5277107,62.0725732 34.6525447,61.7822803 C33.6579983,61.4505169
+ 32.7950318,60.5707515 31.0699702,58.8112207 L10.4340042,37.7649812
+ C8.67524887,35.9728665 7.79427365,35.0753281 7.38181574,34.0178323
+ C7.01844614,33.0847478 6.91213657,32.0687224 7.07276278,31.0793566
+ C7.2554642,29.9537309 7.92875816,28.8873486 9.27389376,26.754584
+ L13.7699754,19.6157469 C15.5237928,16.8342664 16.4018634,15.4450073
+ 17.5764971,14.4349062 C18.6163557,13.5432922 19.8209071,12.873841
+ 21.1192781,12.462099 C22.3516674,12.0739358 23.6941154,12.0118297
+ 26.0148187,12.0018928 L26.0148187,12.0018928 Z M39.7838696,26.8434492
+ L31.9493683,29.8016705 C31.4490624,29.9905805 31.4492603,30.6983702
+ 31.9496718,30.8870004 L39.7838696,33.8401019 L42.6683153,41.7951143
+ C42.8531134,42.3047691 43.5738691,42.3048571 43.7587917,41.7952475
+ L46.6454844,33.8401019 L54.4772842,30.8869792 C54.9776209,30.6983182
+ 54.9778188,29.9906327 54.4775878,29.8016918 L46.6454844,26.8434492
+ L43.7587718,18.8907402 C43.5738178,18.3812036 42.8531647,18.3812916
+ 42.6683351,18.8908734 L39.7838696,26.8434492 Z"></path>
+    </g>
+</svg>)";
+}
+
+} // namespace
+
+QImage IconCurrencyColored(int size, const QColor &c) {
+	const auto s = Size(size);
+	auto svg = QSvgRenderer(CurrencySvg(c));
+	auto image = QImage(
+		s * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(style::DevicePixelRatio());
+	image.fill(Qt::transparent);
+	{
+		auto p = QPainter(&image);
+		svg.render(&p, Rect(s));
+	}
+	return image;
+}
+
+QImage IconCurrencyColored(
+		const style::font &font,
+		const QColor &c) {
+	return IconCurrencyColored(font->ascent, c);
+}
+
+QByteArray CurrencySvgColored(const QColor &c) {
+	return CurrencySvg(c);
+}
+
+QImage MenuIconCurrency(const QSize &size) {
+	auto image = QImage(
+		size * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(style::DevicePixelRatio());
+	image.fill(Qt::transparent);
+	auto p = QPainter(&image);
+	st::infoIconReport.paintInCenter(
+		p,
+		Rect(size),
+		st::infoIconFg->c);
+	p.setCompositionMode(QPainter::CompositionMode_Clear);
+	const auto w = st::lineWidth * 6;
+	p.fillRect(
+		QRect(
+			rect::center(Rect(size)).x() - w / 2,
+			rect::center(Rect(size)).y() - w,
+			w,
+			w * 2),
+		Qt::white);
+	p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+
+	const auto s = Size(st::inviteLinkSubscribeBoxTerms.style.font->ascent);
+	auto svg = QSvgRenderer(CurrencySvg(st::infoIconFg->c));
+	svg.render(
+		&p,
+		QRectF(
+			(size.width() - s.width()) / 2.,
+			(size.height() - s.height()) / 2.,
+			s.width(),
+			s.height()));
+	return image;
+}
+
+QImage MenuIconCredits() {
+	constexpr auto kStrokeWidth = 5;
+	const auto sizeShift = st::lineWidth * 1.5;
+
+	auto colorized = [&] {
+		auto f = QFile(Ui::Premium::Svg());
+		if (!f.open(QIODevice::ReadOnly)) {
+			return QString();
+		}
+		return QString::fromUtf8(f.readAll()).replace(
+			u"#fff"_q,
+			u"#ffffff00"_q);
+	}();
+	colorized.replace(
+		u"stroke=\"none\""_q,
+		u"stroke=\"%1\""_q.arg(st::menuIconColor->c.name()));
+	colorized.replace(
+		u"stroke-width=\"1\""_q,
+		u"stroke-width=\"%1\""_q.arg(kStrokeWidth));
+	auto svg = QSvgRenderer(colorized.toUtf8());
+	svg.setViewBox(svg.viewBox()
+		+ Margins(style::ConvertScale(kStrokeWidth)));
+
+	auto image = QImage(
+		st::menuIconLinks.size() * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(style::DevicePixelRatio());
+	image.fill(Qt::transparent);
+	{
+		auto p = QPainter(&image);
+		svg.render(&p, Rect(st::menuIconLinks.size()) - Margins(sizeShift));
+	}
+	return image;
+}
+
+std::unique_ptr<Ui::Text::CustomEmoji> MakeCurrencyIconEmoji(
+		const style::font &font,
+		const QColor &c) {
+	return std::make_unique<Ui::CustomEmoji::Internal>(
+		u"currency_icon:%1:%2"_q.arg(font->height).arg(c.name()),
+		IconCurrencyColored(font, c));
+}
+
+Ui::Text::PaletteDependentEmoji IconCreditsEmoji(
+		IconDescriptor descriptor) {
+	return { .factory = [=] {
+		return Ui::GenerateStars(
+			(descriptor.size
+				? descriptor.size
+				: st::defaultTableLabel.style.font->height),
+			1);
+	}, .margin = descriptor.margin.value_or(
+		QMargins{ 0, st::giftBoxByStarsSkip, 0, 0 }) };
+}
+
+Ui::Text::PaletteDependentEmoji IconCurrencyEmoji(
+		IconDescriptor descriptor) {
+	return { .factory = [=] {
+		return IconCurrencyColored(
+			descriptor.size ? descriptor.size : st::earnTonIconSize,
+			st::currencyFg->c);
+	}, .margin = descriptor.margin.value_or(st::earnTonIconMargin) };
+}
+
+Ui::Text::PaletteDependentEmoji IconCreditsEmojiSmall() {
+	return IconCreditsEmoji({
+		.size = st::giftBoxByStarsStyle.font->height,
+		.margin = QMargins{ 0, st::giftBoxByStarsStarTop, 0, 0 },
+	});
+}
+
+Ui::Text::PaletteDependentEmoji IconCurrencyEmojiSmall() {
+	return IconCreditsEmoji({});
+}
+
+} // namespace Ui::Earn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h
new file mode 100644
index 00000000000000..efbedd7ee2519b
--- /dev/null
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h
@@ -0,0 +1,43 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/text/custom_emoji_helper.h"
+
+namespace Ui::Text {
+class CustomEmoji;
+} // namespace Ui::Text
+
+namespace Ui::Earn {
+
+[[nodiscard]] QImage IconCurrencyColored(int size, const QColor &c);
+[[nodiscard]] QImage IconCurrencyColored(
+	const style::font &font,
+	const QColor &c);
+[[nodiscard]] QByteArray CurrencySvgColored(const QColor &c);
+
+[[nodiscard]] QImage MenuIconCurrency(const QSize &size);
+[[nodiscard]] QImage MenuIconCredits();
+
+std::unique_ptr<Ui::Text::CustomEmoji> MakeCurrencyIconEmoji(
+	const style::font &font,
+	const QColor &c);
+
+struct IconDescriptor {
+	int size = 0;
+	std::optional<QMargins> margin;
+};
+[[nodiscard]] Ui::Text::PaletteDependentEmoji IconCreditsEmoji(
+	IconDescriptor descriptor = {});
+[[nodiscard]] Ui::Text::PaletteDependentEmoji IconCurrencyEmoji(
+	IconDescriptor descriptor = {});
+
+[[nodiscard]] Ui::Text::PaletteDependentEmoji IconCreditsEmojiSmall();
+[[nodiscard]] Ui::Text::PaletteDependentEmoji IconCurrencyEmojiSmall();
+
+} // namespace Ui::Earn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 51cf9506a2e377..eae0d93cf37436 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -14,18 +14,27 @@ For license and copyright information please follow this link:
 #include "api/api_text_entities.h"
 #include "api/api_updates.h"
 #include "base/unixtime.h"
+#include "boxes/gift_premium_box.h"
 #include "boxes/peers/edit_peer_color_box.h" // AddLevelBadge.
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "core/application.h"
+#include "core/ui_integration.h" // TextContext.
+#include "data/components/credits.h"
 #include "data/data_channel.h"
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
 #include "data/data_web_page.h"
+#include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
+#include "dialogs/ui/chat_search_empty.h"
 #include "history/view/controls/history_view_webpage_processor.h"
+#include "info/bot/starref/info_bot_starref_join_widget.h"
+#include "info/bot/starref/info_bot_starref_setup_widget.h"
 #include "info/channel_statistics/earn/earn_format.h"
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "info/channel_statistics/earn/info_channel_earn_widget.h"
 #include "info/info_controller.h"
+#include "info/info_memento.h"
 #include "info/profile/info_profile_values.h" // Info::Profile::NameValue.
 #include "info/statistics/info_statistics_inner_widget.h" // FillLoading.
 #include "info/statistics/info_statistics_list_controllers.h"
@@ -47,9 +56,10 @@ For license and copyright information please follow this link:
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/fields/input_field.h"
-#include "ui/widgets/label_with_custom_emoji.h"
+#include "ui/widgets/peer_bubble.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/slider_natural_width.h"
 #include "ui/wrap/slide_wrap.h"
@@ -63,7 +73,6 @@ For license and copyright information please follow this link:
 #include "styles/style_credits.h"
 #include "styles/style_window.h" // mainMenuToggleFourStrokes.
 
-#include <QtSvg/QSvgRenderer>
 #include <QtWidgets/QApplication>
 
 namespace Info::ChannelEarn {
@@ -80,7 +89,11 @@ void ShowMenu(not_null<Ui::GenericBox*> box, const QString &text) {
 	const auto menu = Ui::CreateChild<Ui::PopupMenu>(box.get());
 	menu->addAction(tr::lng_context_copy_link(tr::now), [=] {
 		TextUtilities::SetClipboardText(TextForMimeData::Simple(text));
-		box->uiShow()->showToast(tr::lng_background_link_copied(tr::now));
+		box->uiShow()->showToast({
+			.text = { tr::lng_background_link_copied(tr::now) },
+			.iconLottie = u"toast/voip_invite"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	});
 	menu->popup(QCursor::pos());
 }
@@ -104,7 +117,7 @@ void ShowMenu(not_null<Ui::GenericBox*> box, const QString &text) {
 			Core::App().iv().show(controller, iv, QString());
 		} else {
 			resolver->resolved(
-			) | rpl::start_with_next([=](const QString &s) {
+			) | rpl::on_next([=](const QString &s) {
 				if (s == url) {
 					if (const auto d = resolver->lookup(url)) {
 						if (const auto iv = (*d)->iv.get()) {
@@ -118,52 +131,6 @@ void ShowMenu(not_null<Ui::GenericBox*> box, const QString &text) {
 	});
 }
 
-[[nodiscard]] QByteArray CurrencySvg(const QColor &c) {
-	const auto color = u"rgb(%1,%2,%3)"_q
-		.arg(c.red())
-		.arg(c.green())
-		.arg(c.blue())
-		.toUtf8();
-	return R"(
-<svg width="72px" height="72px" viewBox="0 0 72 72">
-    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g transform="translate(9.000000, 14.000000)
-        " stroke-width="7.2" stroke=")" + color + R"(">
-            <path d="M2.96014341,0 L50.9898193,0 C51.9732032,-7.06402744e-15
- 52.7703933,0.797190129 52.7703933,1.78057399 C52.7703933,2.08038611
- 52.6946886,2.3753442 52.5502994,2.63809702 L29.699977,44.2200383
- C28.7527832,45.9436969 26.5876295,46.5731461 24.8639708,45.6259523
- C24.2556953,45.2916896 23.7583564,44.7869606 23.4331014,44.1738213
- L1.38718565,2.61498853 C0.926351231,1.74626794 1.25700829,0.668450654
- 2.12572888,0.20761623 C2.38272962,0.0712838007 2.6692209,4.97530809e-16
- 2.96014341,0 Z"></path>
-            <line x1="27" y1="44.4532875" x2="27" y2="0"></line>
-        </g>
-    </g>
-</svg>)";
-}
-
-void AddArrow(not_null<Ui::RpWidget*> parent) {
-	const auto arrow = Ui::CreateChild<Ui::RpWidget>(parent.get());
-	arrow->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
-		auto p = QPainter(arrow);
-
-		const auto path = Ui::ToggleUpDownArrowPath(
-			st::statisticsShowMoreButtonArrowSize,
-			st::statisticsShowMoreButtonArrowSize,
-			st::statisticsShowMoreButtonArrowSize,
-			st::mainMenuToggleFourStrokes,
-			0.);
-
-		auto hq = PainterHighQualityEnabler(p);
-		p.fillPath(path, st::lightButtonFg);
-	}, arrow->lifetime());
-	arrow->resize(Size(st::statisticsShowMoreButtonArrowSize * 2));
-	arrow->move(st::statisticsShowMoreButtonArrowPosition);
-	arrow->show();
-}
-
 void AddHeader(
 		not_null<Ui::VerticalLayout*> content,
 		tr::phrase<> text) {
@@ -178,14 +145,13 @@ void AddHeader(
 }
 
 void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
-	const auto wrap = box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+	const auto container = box->addRow(
+		object_ptr<Ui::RoundButton>(
 			box,
-			object_ptr<Ui::RoundButton>(
-				box,
-				rpl::single(QString()),
-				st::channelEarnHistoryRecipientButton)));
-	const auto container = wrap->entity();
+			rpl::single(QString()),
+			st::channelEarnHistoryRecipientButton),
+		style::al_top);
+	container->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
 		container,
 		rpl::single(t),
@@ -195,7 +161,7 @@ void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
 	label->setTryMakeSimilarLines(true);
 	label->resizeToWidth(container->width());
 	label->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto padding = QMargins(
 			st::chatGiveawayPeerPadding.right(),
 			st::chatGiveawayPeerPadding.top(),
@@ -208,7 +174,11 @@ void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
 	}, container->lifetime());
 	container->setClickedCallback([=] {
 		QGuiApplication::clipboard()->setText(t.text);
-		box->showToast(tr::lng_text_copied(tr::now));
+		box->showToast({
+			.text = { tr::lng_text_copied(tr::now) },
+			.iconLottie = u"toast/copy"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	});
 }
 
@@ -237,24 +207,9 @@ void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
 		QLocale().toString(date.time(), QLocale::ShortFormat));
 }
 
-} // namespace
+constexpr auto kMinus = QChar(0x2212);
 
-QImage IconCurrency(
-		const style::FlatLabel &label,
-		const QColor &c) {
-	const auto s = Size(label.style.font->ascent);
-	auto svg = QSvgRenderer(CurrencySvg(c));
-	auto image = QImage(
-		s * style::DevicePixelRatio(),
-		QImage::Format_ARGB32_Premultiplied);
-	image.setDevicePixelRatio(style::DevicePixelRatio());
-	image.fill(Qt::transparent);
-	{
-		auto p = QPainter(&image);
-		svg.render(&p, Rect(s));
-	}
-	return image;
-}
+} // namespace
 
 InnerWidget::InnerWidget(
 	QWidget *parent,
@@ -269,11 +224,11 @@ InnerWidget::InnerWidget(
 void InnerWidget::load() {
 	struct State final {
 		State(not_null<PeerData*> peer)
-		: api(peer->asChannel())
+		: api(peer)
 		, apiCredits(peer)
 		, apiCreditsHistory(peer, true, true) {
 		}
-		Api::ChannelEarnStatistics api;
+		Api::EarnStatistics api;
 		Api::CreditsEarnStatistics apiCredits;
 		Api::CreditsHistory apiCreditsHistory;
 		rpl::lifetime apiLifetime;
@@ -301,10 +256,9 @@ void InnerWidget::load() {
 		state->apiCreditsLifetime.destroy();
 
 		_peer->session().account().mtpUpdates(
-		) | rpl::start_with_next([=, peerId = _peer->id](
+		) | rpl::on_next([=, peerId = _peer->id](
 				const MTPUpdates &updates) {
 			using TLCreditsUpdate = MTPDupdateStarsRevenueStatus;
-			using TLCurrencyUpdate = MTPDupdateBroadcastRevenueTransactions;
 			using TLNotificationUpdate = MTPDupdateServiceNotification;
 			Api::PerformForUpdate<TLCreditsUpdate>(updates, [&](
 					const TLCreditsUpdate &d) {
@@ -312,30 +266,39 @@ void InnerWidget::load() {
 					return;
 				}
 				const auto &data = d.vstatus().data();
-				auto &e = _state.creditsEarn;
-				e.currentBalance = data.vcurrent_balance().v;
-				e.availableBalance = data.vavailable_balance().v;
-				e.overallRevenue = data.voverall_revenue().v;
-				e.overallRevenue = data.voverall_revenue().v;
-				e.isWithdrawalEnabled = data.is_withdrawal_enabled();
-				e.nextWithdrawalAt = data.vnext_withdrawal_at()
-					? base::unixtime::parse(
-						data.vnext_withdrawal_at()->v)
-					: QDateTime();
-				state->apiCreditsHistory.request({}, [=](
-						const Data::CreditsStatusSlice &data) {
-					_state.creditsStatusSlice = data;
-					_stateUpdated.fire({});
+				const auto isCredits = data.vcurrent_balance().match([](
+						const MTPDstarsAmount &) {
+					return true;
+				}, [](const MTPDstarsTonAmount &) {
+					return false;
 				});
-			});
-			Api::PerformForUpdate<TLCurrencyUpdate>(updates, [&](
-					const TLCurrencyUpdate &d) {
-				if (peerId == peerFromMTP(d.vpeer())) {
-					const auto &data = d.vbalances().data();
-					auto &e = _state.currencyEarn;
-					e.currentBalance = data.vcurrent_balance().v;
-					e.availableBalance = data.vavailable_balance().v;
-					e.overallRevenue = data.voverall_revenue().v;
+				if (isCredits) {
+					auto &credits = _state.creditsEarn;
+					credits.currentBalance = CreditsAmountFromTL(
+						data.vcurrent_balance());
+					credits.availableBalance = CreditsAmountFromTL(
+						data.vavailable_balance());
+					credits.overallRevenue = CreditsAmountFromTL(
+						data.voverall_revenue());
+					credits.isWithdrawalEnabled
+						= data.is_withdrawal_enabled();
+					credits.nextWithdrawalAt = data.vnext_withdrawal_at()
+						? base::unixtime::parse(
+							data.vnext_withdrawal_at()->v)
+						: QDateTime();
+					state->apiCreditsHistory.request({}, [=](
+							const Data::CreditsStatusSlice &data) {
+						_state.creditsStatusSlice = data;
+						_stateUpdated.fire({});
+					});
+				} else {
+					auto &currency = _state.currencyEarn;
+					currency.currentBalance = CreditsAmountFromTL(
+						data.vcurrent_balance());
+					currency.availableBalance = CreditsAmountFromTL(
+						data.vavailable_balance());
+					currency.overallRevenue = CreditsAmountFromTL(
+						data.voverall_revenue());
 					_stateUpdated.fire({});
 				}
 			});
@@ -354,19 +317,17 @@ void InnerWidget::load() {
 	};
 
 	_showFinished.events(
-	) | rpl::take(1) | rpl::start_with_next([=] {
-		state->api.request(
-		) | rpl::start_with_error_done(fail, [=] {
-			_state.currencyEarn = state->api.data();
+	) | rpl::take(1) | rpl::on_next([=] {
+		const auto nextRequests = [=] {
 			state->apiCreditsHistory.request({}, [=](
 					const Data::CreditsStatusSlice &data) {
 				_state.creditsStatusSlice = data;
 				::Api::PremiumPeerBot(
 					&_peer->session()
-				) | rpl::start_with_next([=](not_null<PeerData*> bot) {
+				) | rpl::on_next([=](not_null<PeerData*> bot) {
 					_state.premiumBotId = bot->id;
 					state->apiCredits.request(
-					) | rpl::start_with_error_done([=](const QString &error) {
+					) | rpl::on_error_done([=](const QString &error) {
 						if (canViewCredits) {
 							fail(error);
 						} else {
@@ -380,20 +341,58 @@ void InnerWidget::load() {
 					state->apiPremiumBotLifetime.destroy();
 				}, state->apiPremiumBotLifetime);
 			});
+		};
+		const auto isMegagroup = _peer->isMegagroup();
+		state->api.request(
+		) | rpl::on_error_done([=](const QString &error) {
+			if (isMegagroup) {
+				_state.currencyEarn = {};
+				if (error == u"BROADCAST_REQUIRED"_q) {
+					_state.canViewCurrencyMegagroupEarn = false;
+				}
+				nextRequests();
+			} else {
+				show->showToast(error);
+			}
+		}, [=] {
+			_state.currencyEarn = state->api.data();
+			nextRequests();
 		}, state->apiLifetime);
 	}, lifetime());
 }
 
 void InnerWidget::fill() {
 	const auto container = this;
+	if (!_state.currencyEarn && !_state.creditsEarn) {
+		const auto empty = container->add(object_ptr<Dialogs::SearchEmpty>(
+			container,
+			Dialogs::SearchEmptyIcon::NoResults,
+			tr::lng_search_tab_no_results(tr::bold)));
+		empty->setMinimalHeight(st::normalBoxLottieSize.height());
+		empty->animate();
+		return;
+	}
+	const auto bot = (peerIsUser(_peer->id) && _peer->asUser()->botInfo)
+		? _peer->asUser()
+		: nullptr;
 	const auto channel = _peer->asChannel();
-	const auto canViewCurrencyEarn = channel
-		? (channel->flags() & ChannelDataFlag::CanViewRevenue)
-		: true;
+	const auto canViewCurrencyEarn = [&] {
+		if (!channel) {
+			return true;
+		} else if (!(channel->flags() & ChannelDataFlag::CanViewRevenue)) {
+			return false;
+		} else if (channel->isMegagroup()) {
+			return _state.canViewCurrencyMegagroupEarn;
+		} else {
+			return true;
+		}
+	}();
 	const auto &data = canViewCurrencyEarn
 		? _state.currencyEarn
 		: Data::EarnStatistics();
-	const auto &creditsData = _state.creditsEarn;
+	const auto &creditsData = bot
+		? Data::CreditsEarnStatistics()
+		: _state.creditsEarn;
 
 	auto currencyStateValue = rpl::single(
 		data
@@ -403,93 +402,51 @@ void InnerWidget::fill() {
 		})
 	);
 
-	auto creditsStateValue = rpl::single(
-		creditsData
-	) | rpl::then(
-		_stateUpdated.events() | rpl::map([=] { return _state.creditsEarn; })
-	);
+	auto creditsStateValue = bot
+		? rpl::single(Data::CreditsEarnStatistics()) | rpl::type_erased
+		: rpl::single(creditsData) | rpl::then(
+			_stateUpdated.events(
+			) | rpl::map([this] { return _state.creditsEarn; })
+		);
 
-	constexpr auto kMinus = QChar(0x2212);
+	constexpr auto kMinorLength = 3;
 	//constexpr auto kApproximately = QChar(0x2248);
 	const auto multiplier = data.usdRate;
 
-	const auto creditsToUsdMap = [=](EarnInt c) {
-		const auto creditsMultiplier = _state.creditsEarn.usdRate
-			* Data::kEarnMultiplier;
-		return c ? ToUsd(c, creditsMultiplier) : QString();
+	const auto creditsToUsdMap = [=](CreditsAmount c) {
+		const auto creditsMultiplier = _state.creditsEarn.usdRate;
+		return c ? ToUsd(c, creditsMultiplier, 0) : QString();
 	};
 
-	constexpr auto kNonInteractivePeriod = 1717200000;
-	const auto nonInteractive = base::unixtime::now() < kNonInteractivePeriod;
-
 	const auto session = &_peer->session();
-	const auto withdrawalEnabled = WithdrawalEnabled(session)
-		&& !nonInteractive;
-	const auto makeContext = [=](not_null<Ui::FlatLabel*> l) {
-		return Core::MarkedTextContext{
-			.session = session,
-			.customEmojiRepaint = [=] { l->update(); },
-		};
-	};
-	const auto addEmojiToMajor = [=](
-			not_null<Ui::FlatLabel*> label,
-			rpl::producer<EarnInt> value,
-			std::optional<bool> isIn,
-			std::optional<QMargins> margins) {
-		const auto &st = label->st();
-		auto icon = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				IconCurrency(
-					st,
-					!isIn
-						? st::activeButtonBg->c
-						: (*isIn)
-						? st::boxTextFgGood->c
-						: st::menuIconAttentionColor->c),
-				margins ? *margins : st::channelEarnCurrencyCommonMargins,
-				false));
-		const auto prepended = !isIn
-			? TextWithEntities()
-			: TextWithEntities::Simple((*isIn) ? QChar('+') : kMinus);
-		std::move(
-			value
-		) | rpl::start_with_next([=](EarnInt v) {
-			label->setMarkedText(
-				base::duplicate(prepended).append(icon).append(MajorPart(v)),
-				makeContext(label));
-		}, label->lifetime());
-	};
+	const auto withdrawalEnabled = WithdrawalEnabled(session);
 
-	const auto bigCurrencyIcon = Ui::Text::SingleCustomEmoji(
-		session->data().customEmojiManager().registerInternalEmoji(
-			IconCurrency(st::boxTitle, st::activeButtonBg->c),
-			st::channelEarnCurrencyLearnMargins,
-			false));
-
-	const auto arrow = Ui::Text::SingleCustomEmoji(
-		session->data().customEmojiManager().registerInternalEmoji(
-			st::topicButtonArrow,
-			st::channelEarnLearnArrowMargins,
-			false));
 	const auto addAboutWithLearn = [&](const tr::phrase<lngtag_link> &text) {
-		auto label = Ui::CreateLabelWithCustomEmoji(
+		auto label = object_ptr<Ui::FlatLabel>(
 			container,
 			text(
 				lt_link,
 				tr::lng_channel_earn_about_link(
 					lt_emoji,
-					rpl::single(arrow),
-					Ui::Text::RichLangValue
+					rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+					tr::rich
 				) | rpl::map([](TextWithEntities text) {
-					return Ui::Text::Link(std::move(text), 1);
+					return tr::link(std::move(text), 1);
 				}),
-				Ui::Text::RichLangValue),
-			{ .session = session },
+				tr::rich),
 			st::boxDividerLabel);
 		label->setLink(1, std::make_shared<LambdaClickHandler>([=] {
 			_show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
 				box->setNoContentMargin(true);
 
+				auto emojiHelper = Ui::Text::CustomEmojiHelper();
+				const auto bigCurrencyIcon = emojiHelper.paletteDependent({
+					.factory = [=] {
+						return Ui::Earn::IconCurrencyColored(
+							st::boxTitle.style.font,
+							st::currencyFg->c);
+					}, .margin = st::channelEarnCurrencyLearnMargins });
+
 				const auto content = box->verticalLayout().get();
 
 				Ui::AddSkip(content);
@@ -500,12 +457,12 @@ void InnerWidget::fill() {
 					const auto rect = Rect(icon.size() * 1.4);
 					auto owned = object_ptr<Ui::RpWidget>(content);
 					owned->resize(rect.size());
+					owned->setNaturalWidth(rect.width());
 					const auto widget = box->addRow(
-						object_ptr<Ui::CenterWrap<>>(
-							content,
-							std::move(owned)))->entity();
+						std::move(owned),
+						style::al_top);
 					widget->paintRequest(
-					) | rpl::start_with_next([=] {
+					) | rpl::on_next([=] {
 						auto p = Painter(widget);
 						auto hq = PainterHighQualityEnabler(p);
 						p.setPen(Qt::NoPen);
@@ -516,12 +473,13 @@ void InnerWidget::fill() {
 				}
 				Ui::AddSkip(content);
 				Ui::AddSkip(content);
-				box->addRow(object_ptr<Ui::CenterWrap<>>(
+				box->addRow(object_ptr<Ui::FlatLabel>(
 					content,
-					object_ptr<Ui::FlatLabel>(
-						content,
-						tr::lng_channel_earn_learn_title(),
-						st::boxTitle)));
+					bot
+						? tr::lng_channel_earn_bot_learn_title()
+						: tr::lng_channel_earn_learn_title(),
+					st::boxTitle),
+					style::al_top);
 				Ui::AddSkip(content);
 				Ui::AddSkip(content);
 				Ui::AddSkip(content);
@@ -552,13 +510,13 @@ void InnerWidget::fill() {
 						const auto left = Ui::CreateChild<Ui::RpWidget>(
 							box->verticalLayout().get());
 						left->paintRequest(
-						) | rpl::start_with_next([=] {
+						) | rpl::on_next([=] {
 							auto p = Painter(left);
 							icon.paint(p, 0, 0, left->width());
 						}, left->lifetime());
 						left->resize(icon.size());
 						top->geometryValue(
-						) | rpl::start_with_next([=](const QRect &g) {
+						) | rpl::on_next([=](const QRect &g) {
 							left->moveToLeft(
 								(g.left() - left->width()) / 2,
 								g.top() + st::channelEarnHistoryThreeSkip);
@@ -566,7 +524,9 @@ void InnerWidget::fill() {
 					};
 					addEntry(
 						tr::lng_channel_earn_learn_in_subtitle(),
-						tr::lng_channel_earn_learn_in_about(),
+						bot
+							? tr::lng_channel_earn_learn_bot_in_about()
+							: tr::lng_channel_earn_learn_in_about(),
 						st::channelEarnLearnChannelIcon);
 					Ui::AddSkip(content);
 					Ui::AddSkip(content);
@@ -587,18 +547,17 @@ void InnerWidget::fill() {
 				Ui::AddSkip(content);
 				{
 					const auto l = box->addRow(
-						object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+						object_ptr<Ui::FlatLabel>(
 							content,
-							Ui::CreateLabelWithCustomEmoji(
-								content,
-								tr::lng_channel_earn_learn_coin_title(
-									lt_emoji,
-									rpl::single(
-										Ui::Text::Link(bigCurrencyIcon, 1)),
-									Ui::Text::RichLangValue
-								),
-								{ .session = session },
-								st::boxTitle)))->entity();
+							tr::lng_channel_earn_learn_coin_title(
+								lt_emoji,
+								rpl::single(
+									tr::link(bigCurrencyIcon, 1)),
+								tr::rich),
+							st::boxTitle,
+							st::defaultPopupMenu,
+							emojiHelper.context()),
+						style::al_top);
 					const auto diamonds = l->lifetime().make_state<int>(0);
 					l->setLink(1, std::make_shared<LambdaClickHandler>([=] {
 						const auto count = (*diamonds);
@@ -614,20 +573,19 @@ void InnerWidget::fill() {
 				Ui::AddSkip(content);
 				{
 					const auto label = box->addRow(
-						Ui::CreateLabelWithCustomEmoji(
+						object_ptr<Ui::FlatLabel>(
 							content,
 							tr::lng_channel_earn_learn_coin_about(
 								lt_link,
 								tr::lng_channel_earn_about_link(
 									lt_emoji,
-									rpl::single(arrow),
-									Ui::Text::RichLangValue
+									rpl::single(Ui::Text::IconEmoji(
+										&st::textMoreIconEmoji)),
+									tr::rich
 								) | rpl::map([](TextWithEntities text) {
-									return Ui::Text::Link(std::move(text), 1);
+									return tr::link(std::move(text), 1);
 								}),
-								Ui::Text::RichLangValue
-							),
-							{ .session = session },
+								tr::rich),
 							st::channelEarnLearnDescription));
 					label->resizeToWidth(box->width()
 						- rect::m::sum::h(st::boxRowPadding));
@@ -646,8 +604,6 @@ void InnerWidget::fill() {
 						container,
 						tr::lng_channel_earn_learn_close(),
 						st::defaultActiveButton);
-					button->setTextTransform(
-						Ui::RoundButton::TextTransform::NoTransform);
 					button->resizeToWidth(box->width()
 						- st.buttonPadding.left()
 						- st.buttonPadding.left());
@@ -659,10 +615,13 @@ void InnerWidget::fill() {
 		container->add(object_ptr<Ui::DividerLabel>(
 			container,
 			std::move(label),
-			st::defaultBoxDividerLabelPadding,
-			RectPart::Top | RectPart::Bottom));
+			st::defaultBoxDividerLabelPadding));
 	};
-	addAboutWithLearn(tr::lng_channel_earn_about);
+	if (canViewCurrencyEarn) {
+		addAboutWithLearn(bot
+			? tr::lng_channel_earn_about_bot
+			: tr::lng_channel_earn_about);
+	}
 	{
 		using Type = Statistic::ChartViewType;
 		Ui::AddSkip(container);
@@ -714,6 +673,7 @@ void InnerWidget::fill() {
 			}(), Type::StackBar);
 			widget->setTitle(tr::lng_bot_earn_chart_revenue());
 		}
+		Statistic::FixCacheForHighDPIChartWidget(container);
 	}
 	if (data.topHoursGraph.chart
 		|| data.revenueGraph.chart
@@ -728,8 +688,8 @@ void InnerWidget::fill() {
 		Ui::AddSkip(container, st::channelEarnOverviewTitleSkip);
 
 		const auto addOverview = [&](
-				rpl::producer<EarnInt> currencyValue,
-				rpl::producer<EarnInt> creditsValue,
+				rpl::producer<CreditsAmount> currencyValue,
+				rpl::producer<CreditsAmount> creditsValue,
 				const tr::phrase<> &text,
 				bool showCurrency,
 				bool showCredits) {
@@ -739,28 +699,36 @@ void InnerWidget::fill() {
 			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
 				st::channelEarnOverviewMajorLabel);
-			addEmojiToMajor(
+			AddEmojiToMajor(
 				majorLabel,
 				rpl::duplicate(currencyValue),
 				{},
 				{});
 			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
-				rpl::duplicate(currencyValue) | rpl::map(MinorPart),
+				rpl::duplicate(
+					currencyValue
+				) | rpl::map([](CreditsAmount v) {
+					return MinorPart(v);
+				}),
 				st::channelEarnOverviewMinorLabel);
 			const auto secondMinorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
 				std::move(
 					currencyValue
-				) | rpl::map([=](EarnInt value) {
-					return value ? ToUsd(value, multiplier) : QString();
+				) | rpl::map([=](CreditsAmount value) {
+					return value
+						? ToUsd(value, multiplier, kMinorLength)
+						: QString();
 				}),
 				st::channelEarnOverviewSubMinorLabel);
 
 			const auto creditsLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
-				rpl::duplicate(creditsValue) | rpl::map([](EarnInt value) {
-					return QString::number(value);
+				rpl::duplicate(
+					creditsValue
+				) | rpl::map([](CreditsAmount value) {
+					return Lang::FormatCreditsAmountDecimal(value);
 				}),
 				st::channelEarnOverviewMajorLabel);
 			const auto icon = Ui::CreateSingleStarWidget(
@@ -775,11 +743,11 @@ void InnerWidget::fill() {
 				majorLabel->sizeValue(),
 				creditsLabel->sizeValue(),
 				std::move(creditsValue)
-			) | rpl::start_with_next([=](
+			) | rpl::on_next([=](
 					int available,
 					const QSize &size,
 					const QSize &creditsSize,
-					EarnInt credits) {
+					CreditsAmount credits) {
 				const auto skip = st::channelEarnOverviewSubMinorLabelPos.x();
 				line->resize(line->width(), size.height());
 				minorLabel->moveToLeft(
@@ -805,13 +773,13 @@ void InnerWidget::fill() {
 				creditsSecondLabel->resizeToWidth(
 					available - creditsSecondLabel->pos().x());
 				if (!showCredits) {
-					const auto x = std::numeric_limits<int>::max();
+					const auto x = std::numeric_limits<int>::max() / 2;
 					icon->moveToLeft(x, 0);
 					creditsLabel->moveToLeft(x, 0);
 					creditsSecondLabel->moveToLeft(x, 0);
 				}
 				if (!showCurrency) {
-					const auto x = std::numeric_limits<int>::max();
+					const auto x = std::numeric_limits<int>::max() / 2;
 					majorLabel->moveToLeft(x, 0);
 					minorLabel->moveToLeft(x, 0);
 					secondMinorLabel->moveToLeft(x, 0);
@@ -859,7 +827,7 @@ void InnerWidget::fill() {
 		Ui::AddSkip(container);
 	}
 #ifndef _DEBUG
-	if (!channel->amCreator()) {
+	if (channel && !channel->amCreator()) {
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
 		return;
@@ -868,15 +836,14 @@ void InnerWidget::fill() {
 	Ui::AddSkip(container);
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
-	if (channel && data.availableBalance) {
+	if (data.availableBalance) {
 		const auto value = data.availableBalance;
 		AddHeader(container, tr::lng_channel_earn_balance_title);
 		Ui::AddSkip(container);
 
 		const auto labels = container->add(
-			object_ptr<Ui::CenterWrap<Ui::RpWidget>>(
-				container,
-				object_ptr<Ui::RpWidget>(container)))->entity();
+			object_ptr<Ui::RpWidget>(container),
+			style::al_top);
 
 		const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 			labels,
@@ -884,7 +851,7 @@ void InnerWidget::fill() {
 		{
 			const auto &m = st::channelEarnCurrencyCommonMargins;
 			const auto p = QMargins(m.left(), 0, m.right(), m.bottom());
-			addEmojiToMajor(majorLabel, rpl::single(value), {}, p);
+			AddEmojiToMajor(majorLabel, rpl::single(value), {}, p);
 		}
 		majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 		const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
@@ -895,12 +862,14 @@ void InnerWidget::fill() {
 		rpl::combine(
 			majorLabel->sizeValue(),
 			minorLabel->sizeValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QSize &majorSize,
 				const QSize &minorSize) {
 			labels->resize(
 				majorSize.width() + minorSize.width(),
 				majorSize.height());
+			labels->setNaturalWidth(
+				majorSize.width() + minorSize.width());
 			majorLabel->moveToLeft(0, 0);
 			minorLabel->moveToRight(
 				0,
@@ -910,12 +879,11 @@ void InnerWidget::fill() {
 
 		Ui::AddSkip(container);
 		container->add(
-			object_ptr<Ui::CenterWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				container,
-				object_ptr<Ui::FlatLabel>(
-					container,
-					ToUsd(value, multiplier),
-					st::channelEarnOverviewSubMinorLabel)));
+				ToUsd(value, multiplier, 0),
+				st::channelEarnOverviewSubMinorLabel),
+			style::al_top);
 
 		Ui::AddSkip(container);
 
@@ -925,7 +893,9 @@ void InnerWidget::fill() {
 				container,
 				rpl::never<QString>(),
 				stButton),
-			st::boxRowPadding);
+			st::boxRowPadding,
+			style::al_justify);
+		button->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 
 		const auto label = Ui::CreateChild<Ui::FlatLabel>(
 			button,
@@ -936,7 +906,7 @@ void InnerWidget::fill() {
 		rpl::combine(
 			button->sizeValue(),
 			label->sizeValue()
-		) | rpl::start_with_next([=](const QSize &b, const QSize &l) {
+		) | rpl::on_next([=](const QSize &b, const QSize &l) {
 			label->moveToLeft(
 				(b.width() - l.width()) / 2,
 				(b.height() - l.height()) / 2);
@@ -949,14 +919,12 @@ void InnerWidget::fill() {
 					anim::interpolateF(.5, 1., value)));
 		};
 		colorText(withdrawalEnabled ? 1. : 0.);
-#ifndef _DEBUG
 		button->setAttribute(
 			Qt::WA_TransparentForMouseEvents,
-			!withdrawalEnabled);
-#endif
+			!withdrawalEnabled && (value.value() > 0.01));
 
 		Api::HandleWithdrawalButton(
-			{ .currencyReceiver = channel },
+			{ .currencyReceiver = _peer },
 			button,
 			_controller->uiShow());
 		Ui::ToggleChildrenVisibility(button, true);
@@ -968,7 +936,7 @@ void InnerWidget::fill() {
 			: tr::lng_channel_earn_balance_about_temp);
 		Ui::AddSkip(container);
 	}
-	if (creditsData.availableBalance > 0) {
+	if (creditsData.availableBalance.value() > 0) {
 		AddHeader(container, tr::lng_bot_earn_balance_title);
 		auto availableBalanceValue = rpl::single(
 			creditsData.availableBalance
@@ -997,22 +965,35 @@ void InnerWidget::fill() {
 			),
 			rpl::duplicate(availableBalanceValue),
 			rpl::duplicate(dateValue),
-			std::move(dateValue) | rpl::map([=](const QDateTime &dt) {
-				return !dt.isNull()
-					|| (!_state.creditsEarn.isWithdrawalEnabled);
-			}),
+			_state.creditsEarn.isWithdrawalEnabled,
 			rpl::duplicate(
 				availableBalanceValue
 			) | rpl::map(creditsToUsdMap));
 	}
 
+	if (Info::BotStarRef::Join::Allowed(_peer)) {
+		const auto button = Info::BotStarRef::AddViewListButton(
+			container,
+			tr::lng_credits_summary_earn_title(),
+			tr::lng_credits_summary_earn_about());
+		button->setClickedCallback([=] {
+			_controller->showSection(Info::BotStarRef::Join::Make(_peer));
+		});
+		Ui::AddSkip(container);
+		Ui::AddDivider(container);
+	}
+	Ui::AddSkip(container);
+
 	const auto sectionIndex = container->lifetime().make_state<int>(0);
 	const auto rebuildLists = [=](
 			const Memento::SavedState &data,
-			not_null<Ui::VerticalLayout*> listsContainer) {
+			not_null<Ui::VerticalLayout*> listsContainer,
+			not_null<Ui::VerticalLayout*> historyDividerContainer) {
 		const auto hasCurrencyTab
 			= !data.currencyEarn.firstHistorySlice.list.empty();
-		const auto hasCreditsTab = !data.creditsStatusSlice.list.empty();
+		// Credits stats for bots are available in info_bot_earn_list.
+		const auto hasCreditsTab = !bot
+			&& !data.creditsStatusSlice.list.empty();
 		const auto hasOneTab = (hasCurrencyTab || hasCreditsTab)
 			&& (hasCurrencyTab != hasCreditsTab);
 
@@ -1060,7 +1041,6 @@ void InnerWidget::fill() {
 					listsContainer,
 					tr::lng_channel_earn_credits_history);
 				slider->entity()->setActiveSectionFast(1);
-				AddSkip(listsContainer);
 			}
 		} else {
 			slider->entity()->setActiveSectionFast(*sectionIndex);
@@ -1077,7 +1057,7 @@ void InnerWidget::fill() {
 
 		rpl::single(slider->entity()->activeSection()) | rpl::then(
 			slider->entity()->sectionActivated()
-		) | rpl::start_with_next([=](int index) {
+		) | rpl::on_next([=](int index) {
 			if (index == 0) {
 				tabCurrencyList->toggle(true, anim::type::instant);
 				tabCreditsList->toggle(false, anim::type::instant);
@@ -1091,9 +1071,10 @@ void InnerWidget::fill() {
 		if (hasCurrencyTab) {
 			Ui::AddSkip(listsContainer);
 
-			const auto historyList = tabCurrencyList->entity();
+			const auto historyList = tabCurrencyList->entity()->add(
+				object_ptr<Ui::VerticalLayout>(tabCurrencyList->entity()));
 			const auto addHistoryEntry = [=](
-					const Data::EarnHistoryEntry &entry,
+					const Data::CreditsHistoryEntry &entry,
 					const tr::phrase<> &text) {
 				const auto wrap = historyList->add(
 					object_ptr<Ui::PaddingWrap<Ui::VerticalLayout>>(
@@ -1107,8 +1088,7 @@ void InnerWidget::fill() {
 					text(),
 					st::channelEarnSemiboldLabel));
 
-				const auto isIn
-					= (entry.type == Data::EarnHistoryEntry::Type::In);
+				const auto isIn = entry.in;
 				const auto recipient = Ui::Text::Wrapped(
 					{ entry.provider },
 					EntityType::Code);
@@ -1125,18 +1105,17 @@ void InnerWidget::fill() {
 					Ui::AddSkip(inner, st::channelEarnHistoryTwoSkip);
 				}
 
-				const auto isFailed = entry.status
-					== Data::EarnHistoryEntry::Status::Failed;
-				const auto isPending = entry.status
-					== Data::EarnHistoryEntry::Status::Pending;
-				const auto dateText = (!entry.dateTo.isNull() || isFailed)
+				const auto isFailed = entry.failed;
+				const auto isPending = entry.pending;
+				const auto dateText = (!entry.adsProceedsToDate.isNull()
+						|| isFailed)
 					? (FormatDate(entry.date)
 						+ ' '
 						+ QChar(8212)
 						+ ' '
 						+ (isFailed
 							? tr::lng_channel_earn_history_out_failed(tr::now)
-							: FormatDate(entry.dateTo)))
+							: FormatDate(entry.adsProceedsToDate)))
 					: isPending
 					? tr::lng_channel_earn_history_pending(tr::now)
 					: FormatDate(entry.date);
@@ -1155,14 +1134,14 @@ void InnerWidget::fill() {
 				const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 					wrap,
 					st::channelEarnHistoryMajorLabel);
-				addEmojiToMajor(
+				AddEmojiToMajor(
 					majorLabel,
-					rpl::single(entry.amount),
+					rpl::single(entry.credits),
 					isIn,
 					{});
 				majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 				majorLabel->setTextColorOverride(color);
-				const auto minorText = MinorPart(entry.amount);
+				const auto minorText = MinorPart(entry.credits);
 				const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
 					wrap,
 					rpl::single(minorText),
@@ -1182,16 +1161,15 @@ void InnerWidget::fill() {
 					Ui::AddSkip(box->verticalLayout());
 					Ui::AddSkip(box->verticalLayout());
 					const auto labels = box->addRow(
-						object_ptr<Ui::CenterWrap<Ui::RpWidget>>(
-							box,
-							object_ptr<Ui::RpWidget>(box)))->entity();
+						object_ptr<Ui::RpWidget>(box),
+						style::al_top);
 
 					const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 						labels,
 						st::channelEarnOverviewMajorLabel);
-					addEmojiToMajor(
+					AddEmojiToMajor(
 						majorLabel,
-						rpl::single(entry.amount),
+						rpl::single(entry.credits),
 						isIn,
 						{});
 					majorLabel->setAttribute(
@@ -1207,12 +1185,14 @@ void InnerWidget::fill() {
 					rpl::combine(
 						majorLabel->sizeValue(),
 						minorLabel->sizeValue()
-					) | rpl::start_with_next([=](
+					) | rpl::on_next([=](
 							const QSize &majorSize,
 							const QSize &minorSize) {
 						labels->resize(
 							majorSize.width() + minorSize.width(),
 							majorSize.height());
+						labels->setNaturalWidth(
+							majorSize.width() + minorSize.width());
 						majorLabel->moveToLeft(0, 0);
 						minorLabel->moveToRight(
 							0,
@@ -1220,23 +1200,28 @@ void InnerWidget::fill() {
 					}, box->lifetime());
 
 					Ui::AddSkip(box->verticalLayout());
-					box->addRow(object_ptr<Ui::CenterWrap<>>(
-						box,
+					box->addRow(
 						object_ptr<Ui::FlatLabel>(
 							box,
 							dateText,
-							st::channelEarnHistorySubLabel)));
+							st::channelEarnHistorySubLabel),
+						style::al_top);
 					Ui::AddSkip(box->verticalLayout());
 					Ui::AddSkip(box->verticalLayout());
+					AddChannelEarnTable(
+						box->uiShow(),
+						box->verticalLayout(),
+						entry);
 					Ui::AddSkip(box->verticalLayout());
-					box->addRow(object_ptr<Ui::CenterWrap<>>(
-						box,
+					Ui::AddSkip(box->verticalLayout());
+					box->addRow(
 						object_ptr<Ui::FlatLabel>(
 							box,
 							isIn
 								? tr::lng_channel_earn_history_in_about()
 								: tr::lng_channel_earn_history_out(),
-							st::channelEarnHistoryDescriptionLabel)));
+							st::channelEarnHistoryDescriptionLabel),
+						style::al_top);
 					Ui::AddSkip(box->verticalLayout());
 					if (isIn) {
 						Ui::AddSkip(box->verticalLayout());
@@ -1246,58 +1231,9 @@ void InnerWidget::fill() {
 						AddRecipient(box, recipient);
 					}
 					if (isIn) {
-						const auto peerBubble = box->addRow(
-							object_ptr<Ui::CenterWrap<>>(
-								box,
-								object_ptr<Ui::RpWidget>(box)))->entity();
-						peerBubble->setAttribute(
-							Qt::WA_TransparentForMouseEvents);
-						const auto left = Ui::CreateChild<Ui::UserpicButton>(
-							peerBubble,
-							peer,
-							st::uploadUserpicButton);
-						const auto right = Ui::CreateChild<Ui::FlatLabel>(
-							peerBubble,
-							Info::Profile::NameValue(peer),
-							st::channelEarnSemiboldLabel);
-						rpl::combine(
-							left->sizeValue(),
-							right->sizeValue()
-						) | rpl::start_with_next([=](
-								const QSize &leftSize,
-								const QSize &rightSize) {
-							const auto padding = QMargins(
-								st::chatGiveawayPeerPadding.left() * 2,
-								st::chatGiveawayPeerPadding.top(),
-								st::chatGiveawayPeerPadding.right(),
-								st::chatGiveawayPeerPadding.bottom());
-							peerBubble->resize(
-								leftSize.width()
-									+ rightSize.width()
-									+ rect::m::sum::h(padding),
-								leftSize.height());
-							left->moveToLeft(0, 0);
-							right->moveToRight(
-								padding.right(),
-								padding.top());
-							const auto maxRightSize = box->width()
-								- rect::m::sum::h(st::boxRowPadding)
-								- rect::m::sum::h(padding)
-								- leftSize.width();
-							if (rightSize.width() > maxRightSize) {
-								right->resizeToWidth(maxRightSize);
-							}
-						}, peerBubble->lifetime());
-						peerBubble->paintRequest(
-						) | rpl::start_with_next([=] {
-							auto p = QPainter(peerBubble);
-							auto hq = PainterHighQualityEnabler(p);
-							p.setPen(Qt::NoPen);
-							p.setBrush(st::windowBgOver);
-							const auto rect = peerBubble->rect();
-							const auto radius = rect.height() / 2;
-							p.drawRoundedRect(rect, radius, radius);
-						}, peerBubble->lifetime());
+						box->addRow(
+							Ui::CreatePeerBubble(box, peer),
+							style::al_top);
 					}
 					const auto closeBox = [=] { box->closeBox(); };
 					{
@@ -1309,6 +1245,7 @@ void InnerWidget::fill() {
 								? tr::lng_channel_earn_history_out_button()
 								: tr::lng_box_ok(),
 							st::defaultActiveButton);
+						button->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 						button->resizeToWidth(box->width()
 							- st.buttonPadding.left()
 							- st.buttonPadding.left());
@@ -1336,7 +1273,7 @@ void InnerWidget::fill() {
 					_show->showBox(Box(detailsBox));
 				});
 				wrap->geometryValue(
-				) | rpl::start_with_next([=](const QRect &g) {
+				) | rpl::on_next([=](const QRect &g) {
 					const auto &padding = st::boxRowPadding;
 					const auto majorTop = (g.height() - majorLabel->height())
 						/ 2;
@@ -1349,22 +1286,22 @@ void InnerWidget::fill() {
 					const auto rightWrapPadding = rect::m::sum::h(padding)
 						+ minorLabel->width()
 						+ majorLabel->width();
-					wrap->setPadding(st::channelEarnHistoryOuter
-						+ QMargins(padding.left(), 0, rightWrapPadding, 0));
-					button->resize(g.size());
+					const auto additional = st::channelEarnHistoryOuter
+						+ QMargins(padding.left(), 0, rightWrapPadding, 0);
+					wrap->setPadding(additional);
+					button->resize((g + additional).size());
 					button->lower();
 				}, wrap->lifetime());
 			};
 			const auto handleSlice = [=](const Data::EarnHistorySlice &s) {
-				using Type = Data::EarnHistoryEntry::Type;
 				for (const auto &entry : s.list) {
 					addHistoryEntry(
 						entry,
-						(entry.type == Type::In)
-							? tr::lng_channel_earn_history_in
-							: (entry.type == Type::Return)
+						(entry.refunded
 							? tr::lng_channel_earn_history_return
-							: tr::lng_channel_earn_history_out);
+							: entry.in
+							? tr::lng_channel_earn_history_in
+							: tr::lng_channel_earn_history_out));
 				}
 				historyList->resizeToWidth(listsContainer->width());
 			};
@@ -1372,35 +1309,29 @@ void InnerWidget::fill() {
 			handleSlice(firstSlice);
 			if (!firstSlice.allLoaded) {
 				struct ShowMoreState final {
-					ShowMoreState(not_null<ChannelData*> channel)
-					: api(channel) {
+					ShowMoreState(not_null<PeerData*> peer)
+					: api(peer) {
 					}
-					Api::ChannelEarnStatistics api;
+					Api::EarnStatistics api;
 					bool loading = false;
 					Data::EarnHistorySlice::OffsetToken token;
 					rpl::variable<int> showed = 0;
 				};
 				const auto state
-					= lifetime().make_state<ShowMoreState>(channel);
+					= lifetime().make_state<ShowMoreState>(_peer);
 				state->token = firstSlice.token;
 				state->showed = firstSlice.list.size();
-				const auto max = firstSlice.total;
-				const auto wrap = listsContainer->add(
+				const auto wrap = tabCurrencyList->entity()->add(
 					object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
-						listsContainer,
+						tabCurrencyList->entity(),
 						object_ptr<Ui::SettingsButton>(
-							listsContainer,
-							tr::lng_channel_earn_history_show_more(
-								lt_count,
-								state->showed.value(
-								) | rpl::map(
-									max - rpl::mappers::_1
-								) | tr::to_count()),
+							tabCurrencyList->entity(),
+							tr::lng_channels_your_more(),
 							st::statisticsShowMoreButton)));
 				const auto button = wrap->entity();
-				AddArrow(button);
+				Ui::AddToggleUpDownArrowToMoreButton(button);
 
-				wrap->toggle(true, anim::type::instant);
+				wrap->toggle(!firstSlice.allLoaded, anim::type::instant);
 				const auto handleReceived = [=](
 						Data::EarnHistorySlice slice) {
 					state->loading = false;
@@ -1442,9 +1373,9 @@ void InnerWidget::fill() {
 				true);
 		}
 		if (hasCurrencyTab || hasCreditsTab) {
-			Ui::AddSkip(listsContainer);
-			Ui::AddDivider(listsContainer);
-			Ui::AddSkip(listsContainer);
+			Ui::AddSkip(historyDividerContainer);
+			Ui::AddDivider(historyDividerContainer);
+			Ui::AddSkip(historyDividerContainer);
 		}
 
 		listsContainer->resizeToWidth(width());
@@ -1452,18 +1383,20 @@ void InnerWidget::fill() {
 
 	const auto historyContainer = container->add(
 		object_ptr<Ui::VerticalLayout>(container));
+	const auto historyDividerContainer = container->add(
+		object_ptr<Ui::VerticalLayout>(container));
 	rpl::single(rpl::empty) | rpl::then(
 		_stateUpdated.events()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto listsContainer = historyContainer->add(
 			object_ptr<Ui::VerticalLayout>(container));
-		rebuildLists(_state, listsContainer);
+		rebuildLists(_state, listsContainer, historyDividerContainer);
 		while (historyContainer->count() > 1) {
 			delete historyContainer->widgetAt(0);
 		}
 	}, historyContainer->lifetime());
 
-	if (channel) {
+	if (channel && !channel->isMegagroup()) {
 		//constexpr auto kMaxCPM = 50; // Debug.
 		const auto requiredLevel = Data::LevelLimits(session)
 			.channelRestrictSponsoredLevelMin();
@@ -1487,12 +1420,12 @@ void InnerWidget::fill() {
 			phrase());
 
 		button->toggleOn(rpl::single(
-			data.switchedOff
+			_state.currencyEarn.switchedOff
 		) | rpl::then(toggled->events()));
 		button->setToggleLocked(isLocked);
 
 		button->toggledChanges(
-		) | rpl::start_with_next([=](bool value) {
+		) | rpl::on_next([=](bool value) {
 			if (isLocked && value) {
 				toggled->fire(false);
 				CheckBoostLevel(
@@ -1506,10 +1439,10 @@ void InnerWidget::fill() {
 					[] {});
 			}
 			if (!isLocked) {
-				const auto weak = Ui::MakeWeak(this);
+				const auto weak = base::make_weak(this);
 				const auto show = _controller->uiShow();
 				const auto failed = [=](const QString &e) {
-					if (weak.data()) {
+					if (weak.get()) {
 						toggled->fire(false);
 						show->showToast(e);
 					}
@@ -1520,6 +1453,10 @@ void InnerWidget::fill() {
 
 		Ui::AddSkip(container);
 		Ui::AddDividerText(container, tr::lng_channel_earn_off_about());
+	} else {
+		while (historyDividerContainer->count() > 1) {
+			delete historyDividerContainer->widgetAt(0);
+		}
 	}
 	Ui::AddSkip(container);
 
@@ -1561,5 +1498,38 @@ not_null<PeerData*> InnerWidget::peer() const {
 	return _peer;
 }
 
-} // namespace Info::ChannelEarn
+void AddEmojiToMajor(
+		not_null<Ui::FlatLabel*> label,
+		rpl::producer<CreditsAmount> value,
+		std::optional<bool> isIn,
+		std::optional<QMargins> margins) {
+	const auto &st = label->st();
+	const auto prepended = !isIn
+		? TextWithEntities()
+		: TextWithEntities::Simple((*isIn) ? QChar('+') : kMinus);
+	std::move(
+		value
+	) | rpl::on_next([=](CreditsAmount v) {
+		auto helper = Ui::Text::CustomEmojiHelper();
+		auto icon = helper.paletteDependent({
+			.factory = [=] {
+				return Ui::Earn::IconCurrencyColored(
+					st.style.font,
+					!isIn
+					? st::currencyFg->c
+					: (*isIn)
+					? st::boxTextFgGood->c
+					: st::menuIconAttentionColor->c);
+				},
+			.margin = margins
+				? *margins
+				: st::channelEarnCurrencyCommonMargins
+		});
+		auto value = MajorPart(v.abs());
+		label->setMarkedText(
+			base::duplicate(prepended).append(icon).append(value),
+			helper.context());
+	}, label->lifetime());
+}
 
+} // namespace Info::ChannelEarn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.h b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.h
index 061d69b7ed1848..0fa417ec724eaf 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.h
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 
 namespace Ui {
 class Show;
+class FlatLabel;
 } // namespace Ui
 
 namespace Info {
@@ -23,10 +24,6 @@ namespace Info::ChannelEarn {
 
 class Memento;
 
-[[nodiscard]] QImage IconCurrency(
-	const style::FlatLabel &label,
-	const QColor &c);
-
 class InnerWidget final : public Ui::VerticalLayout {
 public:
 	struct ShowRequest final {
@@ -67,4 +64,10 @@ class InnerWidget final : public Ui::VerticalLayout {
 
 };
 
+void AddEmojiToMajor(
+	not_null<Ui::FlatLabel*> label,
+	rpl::producer<CreditsAmount> value,
+	std::optional<bool> isIn,
+	std::optional<QMargins> margins);
+
 } // namespace Info::ChannelEarn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.cpp
index 3074468b66901c..20bf8b01812007 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.cpp
@@ -16,11 +16,7 @@ For license and copyright information please follow this link:
 namespace Info::ChannelEarn {
 
 Memento::Memento(not_null<Controller*> controller)
-: ContentMemento(Info::Statistics::Tag{
-	controller->statisticsPeer(),
-	{},
-	{},
-}) {
+: ContentMemento(controller->statisticsTag()) {
 }
 
 Memento::Memento(not_null<PeerData*> peer)
@@ -58,12 +54,12 @@ Widget::Widget(
 	object_ptr<InnerWidget>(
 		this,
 		controller,
-		controller->statisticsPeer()))) {
+		controller->statisticsTag().peer))) {
 	_inner->showRequests(
-	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
+	) | rpl::on_next([=](InnerWidget::ShowRequest request) {
 	}, _inner->lifetime());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &request) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
@@ -73,7 +69,7 @@ not_null<PeerData*> Widget::peer() const {
 }
 
 bool Widget::showInternal(not_null<ContentMemento*> memento) {
-	return (memento->statisticsPeer() == peer());
+	return (memento->statisticsTag().peer == peer());
 }
 
 rpl::producer<QString> Widget::title() {
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.h b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.h
index becd834c6a3f8c..031b404d9146fb 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_widget.h
@@ -34,6 +34,7 @@ class Memento final : public ContentMemento {
 		Data::CreditsEarnStatistics creditsEarn;
 		Data::CreditsStatusSlice creditsStatusSlice;
 		PeerId premiumBotId = PeerId(0);
+		bool canViewCurrencyMegagroupEarn = true;
 	};
 
 	void setState(SavedState states);
diff --git a/Telegram/SourceFiles/info/channels/info_channels_widget.cpp b/Telegram/SourceFiles/info/channels/info_channels_widget.cpp
deleted file mode 100644
index 3b6c115a1c8b4f..00000000000000
--- a/Telegram/SourceFiles/info/channels/info_channels_widget.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "info/channels/info_channels_widget.h"
-
-#include "info/feed/info_feed_channels.h"
-#include "info/info_controller.h"
-#include "ui/widgets/scroll_area.h"
-#include "styles/style_info.h"
-
-namespace Info {
-namespace Channels {
-
-Memento::Memento(not_null<Controller*> controller)
-: Memento(controller->feed()) {
-}
-
-Memento::Memento(not_null<Data::Feed*> feed)
-: ContentMemento(feed) {
-}
-
-Section Memento::section() const {
-	return Section(Section::Type::Channels);
-}
-
-object_ptr<ContentWidget> Memento::createWidget(
-		QWidget *parent,
-		not_null<Controller*> controller,
-		const QRect &geometry) {
-	auto result = object_ptr<Widget>(
-		parent,
-		controller);
-	result->setInternalState(geometry, this);
-	return result;
-}
-
-void Memento::setState(std::unique_ptr<SavedState> state) {
-	_state = std::move(state);
-}
-
-std::unique_ptr<SavedState> Memento::state() {
-	return std::move(_state);
-}
-
-Memento::~Memento() = default;
-
-Widget::Widget(
-	QWidget *parent,
-	not_null<Controller*> controller)
-: ContentWidget(parent, controller) {
-	_inner = setInnerWidget(object_ptr<FeedProfile::Channels>(
-		this,
-		controller));
-}
-
-bool Widget::showInternal(not_null<ContentMemento*> memento) {
-	if (!controller()->validateMementoPeer(memento)) {
-		return false;
-	}
-	if (auto membersMemento = dynamic_cast<Memento*>(memento.get())) {
-		restoreState(membersMemento);
-		return true;
-	}
-	return false;
-}
-
-void Widget::setInternalState(
-		const QRect &geometry,
-		not_null<Memento*> memento) {
-	setGeometry(geometry);
-	Ui::SendPendingMoveResizeEvents(this);
-	restoreState(memento);
-}
-
-std::unique_ptr<ContentMemento> Widget::doCreateMemento() {
-	auto result = std::make_unique<Memento>(controller());
-	saveState(result.get());
-	return result;
-}
-
-void Widget::saveState(not_null<Memento*> memento) {
-	memento->setScrollTop(scrollTopSave());
-	memento->setState(_inner->saveState());
-}
-
-void Widget::restoreState(not_null<Memento*> memento) {
-	_inner->restoreState(memento->state());
-	auto scrollTop = memento->scrollTop();
-	scrollTopRestore(memento->scrollTop());
-}
-
-} // namespace Channels
-} // namespace Info
diff --git a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
index 37defed0d9a4d2..90e1ddd01cb9f4 100644
--- a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
@@ -98,7 +98,7 @@ void ListController::loadMoreRows() {
 		return;
 	}
 	_preloadRequestId = _api.request(MTPmessages_GetCommonChats(
-		_user->inputUser,
+		_user->inputUser(),
 		MTP_long(peerIsChat(_preloadGroupId)
 			? peerToChat(_preloadGroupId).bare
 			: peerToChannel(_preloadGroupId).bare),
@@ -177,9 +177,15 @@ void ListController::restoreState(
 }
 
 void ListController::rowClicked(not_null<PeerListRow*> row) {
-	_controller->parentController()->showPeerHistory(
-		row->peer(),
-		Window::SectionShow::Way::Forward);
+	const auto peer = row->peer();
+	const auto controller = _controller->parentController();
+	if (const auto forum = peer->forum()) {
+		controller->showForum(forum);
+	} else {
+		controller->showPeerHistory(
+			peer,
+			Window::SectionShow::Way::Forward);
+	}
 }
 
 } // namespace
@@ -198,7 +204,7 @@ InnerWidget::InnerWidget(
 	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
 
 	_controller->searchFieldController()->queryValue(
-	) | rpl::start_with_next([this](QString &&query) {
+	) | rpl::on_next([this](QString &&query) {
 		peerListScrollToTop();
 		content()->searchQueryChanged(std::move(query));
 	}, lifetime());
@@ -238,7 +244,7 @@ object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 		parent,
 		controller);
 	result->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		auto addmin = (request.ymin < 0)
 			? 0
 			: st::infoCommonGroupsMargin.top();
@@ -251,11 +257,11 @@ object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 	}, result->lifetime());
 	result->moveToLeft(0, st::infoCommonGroupsMargin.top());
 	parent->widthValue(
-	) | rpl::start_with_next([list = result.data()](int newWidth) {
+	) | rpl::on_next([list = result.data()](int newWidth) {
 		list->resizeToWidth(newWidth);
 	}, result->lifetime());
 	result->heightValue(
-	) | rpl::start_with_next([parent](int listHeight) {
+	) | rpl::on_next([parent](int listHeight) {
 		auto newHeight = st::infoCommonGroupsMargin.top()
 			+ listHeight
 			+ st::infoCommonGroupsMargin.bottom();
diff --git a/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp b/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp
index 392bee43cb796b..46ad5a394a81ee 100644
--- a/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp
@@ -9,7 +9,6 @@ For license and copyright information please follow this link:
 
 #include "info/common_groups/info_common_groups_inner_widget.h"
 #include "info/info_controller.h"
-#include "ui/search_field_controller.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/ui_utility.h"
 #include "lang/lang_keys.h"
@@ -22,7 +21,7 @@ namespace Info {
 namespace CommonGroups {
 
 Memento::Memento(not_null<UserData*> user)
-: ContentMemento(user, nullptr, PeerId()) {
+: ContentMemento(user, nullptr, nullptr, PeerId()) {
 }
 
 Section Memento::section() const {
diff --git a/Telegram/SourceFiles/info/downloads/info_downloads_inner_widget.cpp b/Telegram/SourceFiles/info/downloads/info_downloads_inner_widget.cpp
index f2c116fdfb8e14..6320be4c788b5c 100644
--- a/Telegram/SourceFiles/info/downloads/info_downloads_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/downloads/info_downloads_inner_widget.cpp
@@ -43,7 +43,7 @@ EmptyWidget::EmptyWidget(QWidget *parent)
 void EmptyWidget::setFullHeight(rpl::producer<int> fullHeightValue) {
 	std::move(
 		fullHeightValue
-	) | rpl::start_with_next([this](int fullHeight) {
+	) | rpl::on_next([this](int fullHeight) {
 		// Make icon center be on 1/3 height.
 		auto iconCenter = fullHeight / 3;
 		auto iconHeight = st::infoEmptyFile.height();
@@ -87,7 +87,7 @@ InnerWidget::InnerWidget(
 , _controller(controller)
 , _empty(this) {
 	_empty->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { refreshHeight(); },
 		_empty->lifetime());
 	_list = setupList();
@@ -108,11 +108,9 @@ bool InnerWidget::showInternal(not_null<Memento*> memento) {
 }
 
 object_ptr<Media::ListWidget> InnerWidget::setupList() {
-	auto result = object_ptr<Media::ListWidget>(
-		this,
-		_controller);
+	auto result = object_ptr<Media::ListWidget>(this, _controller);
 	result->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { refreshHeight(); },
 		result->lifetime());
 	using namespace rpl::mappers;
@@ -128,7 +126,7 @@ object_ptr<Media::ListWidget> InnerWidget::setupList() {
 	_selectedLists.fire(result->selectedListValue());
 	_listTops.fire(result->topValue());
 	_controller->searchQueryValue(
-	) | rpl::start_with_next([this](const QString &query) {
+	) | rpl::on_next([this](const QString &query) {
 		_empty->setSearchQuery(query);
 	}, result->lifetime());
 	return result;
diff --git a/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp b/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp
index ae781cc3498b94..8d5817a8171454 100644
--- a/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp
+++ b/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp
@@ -16,8 +16,9 @@ For license and copyright information please follow this link:
 #include "data/data_document.h"
 #include "data/data_media_types.h"
 #include "data/data_session.h"
-#include "main/main_session.h"
 #include "main/main_account.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
 #include "history/history_item.h"
 #include "history/history_item_helpers.h"
 #include "history/history.h"
@@ -34,9 +35,10 @@ using namespace Media;
 } // namespace
 
 Provider::Provider(not_null<AbstractController*> controller)
-: _controller(controller) {
+: _controller(controller)
+, _storiesAddToAlbumId(_controller->storiesAddToAlbumId()) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &layout : _layouts) {
 			layout.second.item->invalidateCache();
 		}
@@ -113,6 +115,9 @@ void Provider::setSearchQuery(QString query) {
 	_refreshed.fire({});
 }
 
+void Provider::jumpToMessage(MsgId messageId, Fn<void(FullMsgId)>) {
+}
+
 void Provider::refreshViewer() {
 	if (_started) {
 		return;
@@ -121,7 +126,7 @@ void Provider::refreshViewer() {
 	auto &manager = Core::App().downloadManager();
 	rpl::single(rpl::empty) | rpl::then(
 		manager.loadingListChanges() | rpl::to_empty
-	) | rpl::start_with_next([=, &manager] {
+	) | rpl::on_next([=, &manager] {
 		auto copy = _downloading;
 		for (const auto id : manager.loadingList()) {
 			if (!id->done) {
@@ -152,12 +157,12 @@ void Provider::refreshViewer() {
 	}
 
 	manager.loadedAdded(
-	) | rpl::start_with_next([=](not_null<const Data::DownloadedId*> entry) {
+	) | rpl::on_next([=](not_null<const Data::DownloadedId*> entry) {
 		addPostponed(entry);
 	}, _lifetime);
 
 	manager.loadedRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		if (!_downloading.contains(item)) {
 			remove(item);
 		} else {
@@ -169,7 +174,7 @@ void Provider::refreshViewer() {
 	}, _lifetime);
 
 	manager.loadedResolveDone(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_fullCount.has_value()) {
 			_fullCount = 0;
 		}
@@ -281,12 +286,12 @@ void Provider::trackItemSession(not_null<const HistoryItem*> item) {
 	auto &lifetime = _trackedSessions.emplace(session).first->second;
 
 	session->data().itemRemoved(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		itemRemoved(item);
 	}, lifetime);
 
 	session->account().sessionChanges(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		_trackedSessions.remove(session);
 	}, lifetime);
 }
@@ -485,6 +490,9 @@ void Provider::applyDragSelection(
 		return;
 	}
 	const auto search = !_queryWords.isEmpty();
+	const auto selectLimit = _storiesAddToAlbumId
+		? _controller->session().appConfig().storiesAlbumLimit()
+		: MaxSelectedItems;
 	auto chosen = base::flat_set<not_null<const HistoryItem*>>();
 	chosen.reserve(till - from);
 	for (auto i = from; i != till; ++i) {
@@ -496,7 +504,8 @@ void Provider::applyDragSelection(
 		ChangeItemSelection(
 			selected,
 			item,
-			computeSelectionData(item, FullSelection));
+			computeSelectionData(item, FullSelection),
+			selectLimit);
 	}
 	if (selected.size() != chosen.size()) {
 		for (auto i = begin(selected); i != end(selected);) {
diff --git a/Telegram/SourceFiles/info/downloads/info_downloads_provider.h b/Telegram/SourceFiles/info/downloads/info_downloads_provider.h
index cf7bca91d8da3d..1a7840b10dba68 100644
--- a/Telegram/SourceFiles/info/downloads/info_downloads_provider.h
+++ b/Telegram/SourceFiles/info/downloads/info_downloads_provider.h
@@ -45,6 +45,7 @@ class Provider final
 	rpl::producer<> refreshed() override;
 
 	void setSearchQuery(QString query) override;
+	void jumpToMessage(MsgId messageId, Fn<void(FullMsgId)> callback) override;
 
 	std::vector<Media::ListSection> fillSections(
 		not_null<Overview::Layout::Delegate*> delegate) override;
@@ -129,6 +130,7 @@ class Provider final
 	std::optional<int> _fullCount;
 	base::flat_set<not_null<const HistoryItem*>> _downloading;
 	base::flat_set<not_null<const HistoryItem*>> _downloaded;
+	int _storiesAddToAlbumId = 0;
 
 	std::vector<Element> _addPostponed;
 
diff --git a/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp b/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp
index 7a68a81abbde5a..553a2953b6160b 100644
--- a/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp
+++ b/Telegram/SourceFiles/info/downloads/info_downloads_widget.cpp
@@ -59,15 +59,12 @@ Widget::Widget(
 		controller));
 	_inner->setScrollHeightValue(scrollHeightValue());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
 
 bool Widget::showInternal(not_null<ContentMemento*> memento) {
-	if (!controller()->validateMementoPeer(memento)) {
-		return false;
-	}
 	if (auto downloadsMemento = dynamic_cast<Memento*>(memento.get())) {
 		restoreState(downloadsMemento);
 		return true;
diff --git a/Telegram/SourceFiles/info/global_media/info_global_media_inner_widget.cpp b/Telegram/SourceFiles/info/global_media/info_global_media_inner_widget.cpp
new file mode 100644
index 00000000000000..eac6b76d6597fe
--- /dev/null
+++ b/Telegram/SourceFiles/info/global_media/info_global_media_inner_widget.cpp
@@ -0,0 +1,151 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/global_media/info_global_media_inner_widget.h"
+
+#include "info/global_media/info_global_media_provider.h"
+#include "info/global_media/info_global_media_widget.h"
+#include "info/media/info_media_empty_widget.h"
+#include "info/media/info_media_list_widget.h"
+#include "info/info_controller.h"
+#include "ui/widgets/labels.h"
+#include "ui/search_field_controller.h"
+#include "lang/lang_keys.h"
+#include "styles/style_info.h"
+
+namespace Info::GlobalMedia {
+
+InnerWidget::InnerWidget(
+	QWidget *parent,
+	not_null<Controller*> controller)
+: RpWidget(parent)
+, _controller(controller)
+, _empty(this) {
+	_empty->setType(type());
+	_empty->heightValue(
+	) | rpl::on_next(
+		[this] { refreshHeight(); },
+		_empty->lifetime());
+	_list = setupList();
+}
+
+object_ptr<Media::ListWidget> InnerWidget::setupList() {
+	auto result = object_ptr<Media::ListWidget>(this, _controller);
+
+	// Setup list widget connections
+	result->heightValue(
+	) | rpl::on_next([this] {
+		refreshHeight();
+	}, result->lifetime());
+
+	using namespace rpl::mappers;
+	result->scrollToRequests(
+	) | rpl::map([widget = result.data()](int to) {
+		return Ui::ScrollToRequest{
+			widget->y() + to,
+			-1
+		};
+	}) | rpl::start_to_stream(
+		_scrollToRequests,
+		result->lifetime());
+
+	_controller->searchQueryValue(
+	) | rpl::on_next([this](const QString &query) {
+		_empty->setSearchQuery(query);
+	}, result->lifetime());
+
+	return result;
+}
+
+Storage::SharedMediaType InnerWidget::type() const {
+	return _controller->section().mediaType();
+}
+
+void InnerWidget::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	setChildVisibleTopBottom(_list, visibleTop, visibleBottom);
+}
+
+bool InnerWidget::showInternal(not_null<Memento*> memento) {
+	if (memento->section().type() == Section::Type::GlobalMedia
+		&& memento->section().mediaType() == type()) {
+		restoreState(memento);
+		return true;
+	}
+	return false;
+}
+
+void InnerWidget::saveState(not_null<Memento*> memento) {
+	_list->saveState(&memento->media());
+}
+
+void InnerWidget::restoreState(not_null<Memento*> memento) {
+	_list->restoreState(&memento->media());
+}
+
+rpl::producer<SelectedItems> InnerWidget::selectedListValue() const {
+	return _selectedLists.events_starting_with(
+		_list->selectedListValue()
+	) | rpl::flatten_latest();
+}
+
+void InnerWidget::selectionAction(SelectionAction action) {
+	_list->selectionAction(action);
+}
+
+InnerWidget::~InnerWidget() = default;
+
+int InnerWidget::resizeGetHeight(int newWidth) {
+	_inResize = true;
+	auto guard = gsl::finally([this] { _inResize = false; });
+
+	_list->resizeToWidth(newWidth);
+	_empty->resizeToWidth(newWidth);
+	return recountHeight();
+}
+
+void InnerWidget::refreshHeight() {
+	if (_inResize) {
+		return;
+	}
+	resize(width(), recountHeight());
+}
+
+int InnerWidget::recountHeight() {
+	auto top = 0;
+	auto listHeight = 0;
+	if (_list) {
+		_list->moveToLeft(0, top);
+		listHeight = _list->heightNoMargins();
+		top += listHeight;
+	}
+	if (listHeight > 0) {
+		_empty->hide();
+	} else {
+		_empty->show();
+		_empty->moveToLeft(0, top);
+		top += _empty->heightNoMargins();
+	}
+	return top;
+}
+
+void InnerWidget::setScrollHeightValue(rpl::producer<int> value) {
+	using namespace rpl::mappers;
+	_empty->setFullHeight(rpl::combine(
+		std::move(value),
+		_listTops.events_starting_with(
+			_list->topValue()
+		) | rpl::flatten_latest(),
+		_1 - _2));
+}
+
+rpl::producer<Ui::ScrollToRequest> InnerWidget::scrollToRequests() const {
+	return _scrollToRequests.events();
+}
+
+} // namespace Info::GlobalMedia
\ No newline at end of file
diff --git a/Telegram/SourceFiles/info/global_media/info_global_media_inner_widget.h b/Telegram/SourceFiles/info/global_media/info_global_media_inner_widget.h
new file mode 100644
index 00000000000000..004647cb1a121d
--- /dev/null
+++ b/Telegram/SourceFiles/info/global_media/info_global_media_inner_widget.h
@@ -0,0 +1,85 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/widgets/scroll_area.h"
+#include "base/unique_qptr.h"
+
+namespace Ui {
+class VerticalLayout;
+class SearchFieldController;
+} // namespace Ui
+
+namespace Storage {
+enum class SharedMediaType : signed char;
+} // namespace Storage
+
+namespace Info {
+class Controller;
+struct SelectedItems;
+enum class SelectionAction;
+} // namespace Info
+
+namespace Info::Media {
+class ListWidget;
+class EmptyWidget;
+} // namespace Info::Media
+
+namespace Info::GlobalMedia {
+
+class Memento;
+class EmptyWidget;
+
+class InnerWidget final : public Ui::RpWidget {
+public:
+	InnerWidget(
+		QWidget *parent,
+		not_null<Controller*> controller);
+
+	bool showInternal(not_null<Memento*> memento);
+
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+	void setScrollHeightValue(rpl::producer<int> value);
+
+	rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
+	rpl::producer<SelectedItems> selectedListValue() const;
+	void selectionAction(SelectionAction action);
+
+	~InnerWidget();
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+	void visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) override;
+
+private:
+	int recountHeight();
+	void refreshHeight();
+
+	Storage::SharedMediaType type() const;
+
+	object_ptr<Media::ListWidget> setupList();
+
+	const not_null<Controller*> _controller;
+
+	object_ptr<Media::ListWidget> _list = { nullptr };
+	object_ptr<Media::EmptyWidget> _empty;
+
+	bool _inResize = false;
+
+	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
+	rpl::event_stream<rpl::producer<SelectedItems>> _selectedLists;
+	rpl::event_stream<rpl::producer<int>> _listTops;
+
+};
+
+} // namespace Info::GlobalMedia
diff --git a/Telegram/SourceFiles/info/global_media/info_global_media_provider.cpp b/Telegram/SourceFiles/info/global_media/info_global_media_provider.cpp
new file mode 100644
index 00000000000000..08778591312ac5
--- /dev/null
+++ b/Telegram/SourceFiles/info/global_media/info_global_media_provider.cpp
@@ -0,0 +1,634 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/global_media/info_global_media_provider.h"
+
+#include "apiwrap.h"
+#include "info/media/info_media_widget.h"
+#include "info/media/info_media_list_section.h"
+#include "info/info_controller.h"
+#include "lang/lang_keys.h"
+#include "ui/text/format_song_document_name.h"
+#include "ui/ui_utility.h"
+#include "data/data_document.h"
+#include "data/data_media_types.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+#include "main/main_account.h"
+#include "history/history_item.h"
+#include "history/history_item_helpers.h"
+#include "history/history.h"
+#include "core/application.h"
+#include "storage/storage_shared_media.h"
+#include "layout/layout_selection.h"
+#include "styles/style_overview.h"
+
+namespace Info::GlobalMedia {
+namespace {
+
+constexpr auto kPreloadedScreensCount = 4;
+constexpr auto kPreloadedScreensCountFull
+	= kPreloadedScreensCount + 1 + kPreloadedScreensCount;
+
+} // namespace
+
+GlobalMediaSlice::GlobalMediaSlice(
+	Key key,
+	std::vector<Data::MessagePosition> items,
+	std::optional<int> fullCount,
+	int skippedAfter)
+: _key(key)
+, _items(std::move(items))
+, _fullCount(fullCount)
+, _skippedAfter(skippedAfter) {
+}
+
+std::optional<int> GlobalMediaSlice::fullCount() const {
+	return _fullCount;
+}
+
+std::optional<int> GlobalMediaSlice::skippedBefore() const {
+	return _fullCount
+		? int(*_fullCount - _skippedAfter - _items.size())
+		: std::optional<int>();
+}
+
+std::optional<int> GlobalMediaSlice::skippedAfter() const {
+	return _skippedAfter;
+}
+
+std::optional<int> GlobalMediaSlice::indexOf(Value position) const {
+	const auto it = ranges::find(_items, position);
+	return (it != end(_items))
+		? std::make_optional(int(it - begin(_items)))
+		: std::nullopt;
+}
+
+int GlobalMediaSlice::size() const {
+	return _items.size();
+}
+
+GlobalMediaSlice::Value GlobalMediaSlice::operator[](int index) const {
+	Expects(index >= 0 && index < size());
+
+	return _items[index];
+}
+
+std::optional<int> GlobalMediaSlice::distance(
+		const Key &a,
+		const Key &b) const {
+	const auto i = indexOf(a.aroundId);
+	const auto j = indexOf(b.aroundId);
+	return (i && j) ? std::make_optional(*j - *i) : std::nullopt;
+}
+
+std::optional<GlobalMediaSlice::Value> GlobalMediaSlice::nearest(
+		Value position) const {
+	if (_items.empty()) {
+		return std::nullopt;
+	}
+
+	const auto it = ranges::lower_bound(
+		_items,
+		position,
+		std::greater<>{});
+
+	if (it == end(_items)) {
+		return _items.back();
+	} else if (it == begin(_items)) {
+		return _items.front();
+	}
+	return *it;
+}
+
+Provider::Provider(not_null<AbstractController*> controller)
+: _controller(controller)
+, _type(_controller->section().mediaType())
+, _slice(sliceKey(_aroundId)) {
+	_controller->session().data().itemRemoved(
+	) | rpl::on_next([this](auto item) {
+		itemRemoved(item);
+	}, _lifetime);
+
+	style::PaletteChanged(
+	) | rpl::on_next([=] {
+		for (auto &layout : _layouts) {
+			layout.second.item->invalidateCache();
+		}
+	}, _lifetime);
+}
+
+Provider::Type Provider::type() {
+	return _type;
+}
+
+bool Provider::hasSelectRestriction() {
+	return true;
+}
+
+rpl::producer<bool> Provider::hasSelectRestrictionChanges() {
+	return rpl::never<bool>();
+}
+
+bool Provider::sectionHasFloatingHeader() {
+	switch (_type) {
+	case Type::Photo:
+	case Type::GIF:
+	case Type::Video:
+	case Type::RoundFile:
+	case Type::RoundVoiceFile:
+	case Type::MusicFile:
+		return false;
+	case Type::File:
+	case Type::Link:
+		return true;
+	}
+	Unexpected("Type in HasFloatingHeader()");
+}
+
+QString Provider::sectionTitle(not_null<const BaseLayout*> item) {
+	return QString();
+}
+
+bool Provider::sectionItemBelongsHere(
+		not_null<const BaseLayout*> item,
+		not_null<const BaseLayout*> previous) {
+	return true;
+}
+
+bool Provider::isPossiblyMyItem(not_null<const HistoryItem*> item) {
+	return item->media() != nullptr;
+}
+
+std::optional<int> Provider::fullCount() {
+	return _slice.fullCount();
+}
+
+void Provider::restart() {
+	_layouts.clear();
+	_aroundId = Data::MaxMessagePosition;
+	_idsLimit = kMinimalIdsLimit;
+	_slice = GlobalMediaSlice(sliceKey(_aroundId));
+	refreshViewer();
+}
+
+void Provider::checkPreload(
+		QSize viewport,
+		not_null<BaseLayout*> topLayout,
+		not_null<BaseLayout*> bottomLayout,
+		bool preloadTop,
+		bool preloadBottom) {
+	const auto visibleWidth = viewport.width();
+	const auto visibleHeight = viewport.height();
+	const auto preloadedHeight = kPreloadedScreensCountFull * visibleHeight;
+	const auto minItemHeight = Media::MinItemHeight(_type, visibleWidth);
+	const auto preloadedCount = preloadedHeight / minItemHeight;
+	const auto preloadIdsLimitMin = (preloadedCount / 2) + 1;
+	const auto preloadIdsLimit = preloadIdsLimitMin
+		+ (visibleHeight / minItemHeight);
+	const auto after = _slice.skippedAfter();
+	const auto topLoaded = after && (*after == 0);
+	const auto before = _slice.skippedBefore();
+	const auto bottomLoaded = before && (*before == 0);
+
+	const auto minScreenDelta = kPreloadedScreensCount
+		- Media::kPreloadIfLessThanScreens;
+	const auto minUniversalIdDelta = (minScreenDelta * visibleHeight)
+		/ minItemHeight;
+	const auto preloadAroundItem = [&](not_null<BaseLayout*> layout) {
+		auto preloadRequired = false;
+		auto aroundId = layout->getItem()->position();
+		if (!preloadRequired) {
+			preloadRequired = (_idsLimit < preloadIdsLimitMin);
+		}
+		if (!preloadRequired) {
+			auto delta = _slice.distance(
+				sliceKey(_aroundId),
+				sliceKey(aroundId));
+			Assert(delta != std::nullopt);
+			preloadRequired = (qAbs(*delta) >= minUniversalIdDelta);
+		}
+		if (preloadRequired) {
+			_idsLimit = preloadIdsLimit;
+			_aroundId = aroundId;
+			refreshViewer();
+		}
+	};
+
+	if (preloadTop && !topLoaded) {
+		preloadAroundItem(topLayout);
+	} else if (preloadBottom && !bottomLoaded) {
+		preloadAroundItem(bottomLayout);
+	}
+}
+
+rpl::producer<GlobalMediaSlice> Provider::source(
+		Type type,
+		Data::MessagePosition aroundId,
+		QString query,
+		int limitBefore,
+		int limitAfter) {
+	Expects(_type == type);
+
+	_totalListQuery = query;
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+		const auto session = &_controller->session();
+
+		struct State : base::has_weak_ptr {
+			State(not_null<Main::Session*> session) : session(session) {
+			}
+			~State() {
+				session->api().request(requestId).cancel();
+			}
+
+			const not_null<Main::Session*> session;
+			Fn<void()> pushAndLoadMore;
+			mtpRequestId requestId = 0;
+		};
+		const auto state = lifetime.make_state<State>(session);
+		const auto guard = base::make_weak(state);
+
+		state->pushAndLoadMore = [=] {
+			auto result = fillRequest(aroundId, limitBefore, limitAfter);
+
+			// May destroy 'state' by calling source() with different args.
+			consumer.put_next(std::move(result.slice));
+
+			if (guard && !currentList()->loaded && result.notEnough) {
+				state->requestId = requestMore(state->pushAndLoadMore);
+			}
+		};
+		state->pushAndLoadMore();
+
+		return lifetime;
+	};
+}
+
+mtpRequestId Provider::requestMore(Fn<void()> loaded) {
+	const auto done = [=](const Api::GlobalMediaResult &result) {
+		const auto list = currentList();
+		if (result.messageIds.empty()) {
+			list->loaded = true;
+			list->fullCount = list->list.size();
+		} else {
+			list->list.reserve(list->list.size() + result.messageIds.size());
+			list->fullCount = result.fullCount;
+			for (const auto &position : result.messageIds) {
+				_seenIds.emplace(position.fullId);
+				list->offsetPosition = position;
+				list->list.push_back(position);
+			}
+		}
+		if (!result.offsetRate) {
+			list->loaded = true;
+		} else {
+			list->offsetRate = result.offsetRate;
+		}
+		loaded();
+	};
+	const auto list = currentList();
+	return _controller->session().api().requestGlobalMedia(
+		_type,
+		_totalListQuery,
+		list->offsetRate,
+		list->offsetPosition,
+		done);
+}
+
+Provider::FillResult Provider::fillRequest(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) {
+	const auto list = currentList();
+	const auto i = ranges::lower_bound(
+		list->list,
+		aroundId,
+		std::greater<>());
+	const auto hasAfter = int(i - begin(list->list));
+	const auto hasBefore = int(end(list->list) - i);
+	const auto takeAfter = std::min(limitAfter, hasAfter);
+	const auto takeBefore = std::min(limitBefore, hasBefore);
+	auto messages = std::vector<Data::MessagePosition>{
+		i - takeAfter,
+		i + takeBefore,
+	};
+	return FillResult{
+		.slice = GlobalMediaSlice(
+			GlobalMediaKey{ aroundId },
+			std::move(messages),
+			((!list->list.empty() || list->loaded)
+				? list->fullCount
+				: std::optional<int>()),
+			hasAfter - takeAfter),
+		.notEnough = (takeBefore < limitBefore),
+	};
+}
+
+void Provider::refreshViewer() {
+	_viewerLifetime.destroy();
+	_controller->searchQueryValue(
+	) | rpl::map([=](QString query) {
+		return source(
+			_type,
+			sliceKey(_aroundId).aroundId,
+			query,
+			_idsLimit,
+			_idsLimit);
+	}) | rpl::flatten_latest(
+	) | rpl::on_next([=](GlobalMediaSlice &&slice) {
+		if (!slice.fullCount()) {
+			// Don't display anything while full count is unknown.
+			return;
+		}
+		_slice = std::move(slice);
+		if (auto nearest = _slice.nearest(_aroundId)) {
+			_aroundId = *nearest;
+		}
+		_refreshed.fire({});
+	}, _viewerLifetime);
+}
+
+rpl::producer<> Provider::refreshed() {
+	return _refreshed.events();
+}
+
+std::vector<Media::ListSection> Provider::fillSections(
+		not_null<Overview::Layout::Delegate*> delegate) {
+	markLayoutsStale();
+	const auto guard = gsl::finally([&] { clearStaleLayouts(); });
+
+	auto result = std::vector<Media::ListSection>();
+	result.emplace_back(_type, sectionDelegate());
+	auto &section = result.back();
+	for (auto i = 0, count = int(_slice.size()); i != count; ++i) {
+		auto position = _slice[i];
+		if (auto layout = getLayout(position.fullId, delegate)) {
+			section.addItem(layout);
+		}
+	}
+	if (section.empty()) {
+		result.pop_back();
+	}
+	return result;
+}
+
+void Provider::markLayoutsStale() {
+	for (auto &layout : _layouts) {
+		layout.second.stale = true;
+	}
+}
+
+void Provider::clearStaleLayouts() {
+	for (auto i = _layouts.begin(); i != _layouts.end();) {
+		if (i->second.stale) {
+			_layoutRemoved.fire(i->second.item.get());
+			i = _layouts.erase(i);
+		} else {
+			++i;
+		}
+	}
+}
+
+Provider::List *Provider::currentList() {
+	return &_totalLists[_totalListQuery];
+}
+
+rpl::producer<not_null<Media::BaseLayout*>> Provider::layoutRemoved() {
+	return _layoutRemoved.events();
+}
+
+Media::BaseLayout *Provider::lookupLayout(
+		const HistoryItem *item) {
+	const auto i = _layouts.find(item ? item->fullId() : FullMsgId());
+	return (i != _layouts.end()) ? i->second.item.get() : nullptr;
+}
+
+bool Provider::isMyItem(not_null<const HistoryItem*> item) {
+	return _seenIds.contains(item->fullId());
+}
+
+bool Provider::isAfter(
+		not_null<const HistoryItem*> a,
+		not_null<const HistoryItem*> b) {
+	return (a->fullId() < b->fullId());
+}
+
+void Provider::setSearchQuery(QString query) {
+	Unexpected("Media::Provider::setSearchQuery.");
+}
+
+void Provider::jumpToMessage(MsgId messageId, Fn<void(FullMsgId)>) {
+	Unexpected("GlobalMedia::Provider::jumpToMessage.");
+}
+
+GlobalMediaKey Provider::sliceKey(Data::MessagePosition aroundId) const {
+	return GlobalMediaKey{ aroundId };
+}
+
+void Provider::itemRemoved(not_null<const HistoryItem*> item) {
+	const auto id = item->fullId();
+	if (const auto i = _layouts.find(id); i != end(_layouts)) {
+		_layoutRemoved.fire(i->second.item.get());
+		_layouts.erase(i);
+	}
+}
+
+Media::BaseLayout *Provider::getLayout(
+		FullMsgId itemId,
+		not_null<Overview::Layout::Delegate*> delegate) {
+	auto it = _layouts.find(itemId);
+	if (it == _layouts.end()) {
+		if (auto layout = createLayout(itemId, delegate, _type)) {
+			layout->initDimensions();
+			it = _layouts.emplace(
+				itemId,
+				std::move(layout)).first;
+		} else {
+			return nullptr;
+		}
+	}
+	it->second.stale = false;
+	return it->second.item.get();
+}
+
+std::unique_ptr<Media::BaseLayout> Provider::createLayout(
+		FullMsgId itemId,
+		not_null<Overview::Layout::Delegate*> delegate,
+		Type type) {
+	const auto item = _controller->session().data().message(itemId);
+	if (!item) {
+		return nullptr;
+	}
+	const auto getPhoto = [&]() -> PhotoData* {
+		if (const auto media = item->media()) {
+			return media->photo();
+		}
+		return nullptr;
+	};
+	const auto getFile = [&]() -> DocumentData* {
+		if (const auto media = item->media()) {
+			return media->document();
+		}
+		return nullptr;
+	};
+
+	const auto &songSt = st::overviewFileLayout;
+	using namespace Overview::Layout;
+	const auto options = [&] {
+		const auto media = item->media();
+		return MediaOptions{ .spoiler = media && media->hasSpoiler() };
+	};
+	switch (type) {
+	case Type::Photo:
+		if (const auto photo = getPhoto()) {
+			return std::make_unique<Photo>(
+				delegate,
+				item,
+				photo,
+				options());
+		}
+		return nullptr;
+	case Type::GIF:
+		if (const auto file = getFile()) {
+			return std::make_unique<Gif>(delegate, item, file);
+		}
+		return nullptr;
+	case Type::Video:
+		if (const auto file = getFile()) {
+			return std::make_unique<Video>(delegate, item, file, options());
+		}
+		return nullptr;
+	case Type::File:
+		if (const auto file = getFile()) {
+			return std::make_unique<Document>(
+				delegate,
+				item,
+				DocumentFields{ .document = file },
+				songSt);
+		}
+		return nullptr;
+	case Type::MusicFile:
+		if (const auto file = getFile()) {
+			return std::make_unique<Document>(
+				delegate,
+				item,
+				DocumentFields{ .document = file },
+				songSt);
+		}
+		return nullptr;
+	case Type::RoundVoiceFile:
+		if (const auto file = getFile()) {
+			return std::make_unique<Voice>(delegate, item, file, songSt);
+		}
+		return nullptr;
+	case Type::Link:
+		return std::make_unique<Link>(delegate, item, item->media());
+	case Type::RoundFile:
+		return nullptr;
+	}
+	Unexpected("Type in ListWidget::createLayout()");
+}
+
+Media::ListItemSelectionData Provider::computeSelectionData(
+		not_null<const HistoryItem*> item,
+		TextSelection selection) {
+	auto result = Media::ListItemSelectionData(selection);
+	result.canDelete = item->canDelete();
+	result.canForward = item->allowsForward();
+	return result;
+}
+
+bool Provider::allowSaveFileAs(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) {
+	return item->allowsForward();
+}
+
+QString Provider::showInFolderPath(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) {
+	return document->filepath(true);
+}
+
+void Provider::applyDragSelection(
+		Media::ListSelectedMap &selected,
+		not_null<const HistoryItem*> fromItem,
+		bool skipFrom,
+		not_null<const HistoryItem*> tillItem,
+		bool skipTill) {
+#if 0 // not used for now
+	const auto fromId = GetUniversalId(fromItem) - (skipFrom ? 1 : 0);
+	const auto tillId = GetUniversalId(tillItem) - (skipTill ? 0 : 1);
+	for (auto i = selected.begin(); i != selected.end();) {
+		const auto itemId = GetUniversalId(i->first);
+		if (itemId > fromId || itemId <= tillId) {
+			i = selected.erase(i);
+		} else {
+			++i;
+		}
+	}
+	for (auto &layoutItem : _layouts) {
+		auto &&universalId = layoutItem.first;
+		if (universalId <= fromId && universalId > tillId) {
+			const auto item = layoutItem.second.item->getItem();
+			ChangeItemSelection(
+				selected,
+				item,
+				computeSelectionData(item, FullSelection));
+		}
+	}
+#endif // todo global media
+}
+
+int64 Provider::scrollTopStatePosition(not_null<HistoryItem*> item) {
+	return item->position().date;
+}
+
+HistoryItem *Provider::scrollTopStateItem(Media::ListScrollTopState state) {
+	const auto maybe = Data::MessagePosition{
+		.date = TimeId(state.position),
+	};
+	if (state.item && _slice.indexOf(state.item->position())) {
+		return state.item;
+	} else if (const auto position = _slice.nearest(maybe)) {
+		const auto id = position->fullId;
+		if (const auto item = _controller->session().data().message(id)) {
+			return item;
+		}
+	}
+	return state.item;
+}
+
+void Provider::saveState(
+		not_null<Media::Memento*> memento,
+		Media::ListScrollTopState scrollState) {
+	if (_aroundId != Data::MaxMessagePosition && scrollState.item) {
+		memento->setAroundId(_aroundId.fullId);
+		memento->setIdsLimit(_idsLimit);
+		memento->setScrollTopItem(scrollState.item->globalId());
+		memento->setScrollTopItemPosition(scrollState.position);
+		memento->setScrollTopShift(scrollState.shift);
+	}
+}
+
+void Provider::restoreState(
+		not_null<Media::Memento*> memento,
+		Fn<void(Media::ListScrollTopState)> restoreScrollState) {
+	if (const auto limit = memento->idsLimit()) {
+		_idsLimit = limit;
+		_aroundId = { memento->aroundId() };
+		restoreScrollState({
+			.position = memento->scrollTopItemPosition(),
+			.item = MessageByGlobalId(memento->scrollTopItem()),
+			.shift = memento->scrollTopShift(),
+		});
+		refreshViewer();
+	}
+}
+
+} // namespace Info::GlobalMedia
diff --git a/Telegram/SourceFiles/info/global_media/info_global_media_provider.h b/Telegram/SourceFiles/info/global_media/info_global_media_provider.h
new file mode 100644
index 00000000000000..7db2f02ca8d060
--- /dev/null
+++ b/Telegram/SourceFiles/info/global_media/info_global_media_provider.h
@@ -0,0 +1,192 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "data/data_messages.h"
+#include "info/media/info_media_common.h"
+#include "base/weak_ptr.h"
+
+namespace Info {
+class AbstractController;
+} // namespace Info
+
+namespace Info::GlobalMedia {
+
+struct GlobalMediaKey {
+	Data::MessagePosition aroundId;
+
+	friend inline constexpr bool operator==(
+		const GlobalMediaKey &,
+		const GlobalMediaKey &) = default;
+};
+
+class GlobalMediaSlice final {
+public:
+	using Key = GlobalMediaKey;
+	using Value = Data::MessagePosition;
+
+	explicit GlobalMediaSlice(
+		Key key,
+		std::vector<Data::MessagePosition> items = {},
+		std::optional<int> fullCount = std::nullopt,
+		int skippedAfter = 0);
+
+	[[nodiscard]] std::optional<int> fullCount() const;
+	[[nodiscard]] std::optional<int> skippedBefore() const;
+	[[nodiscard]] std::optional<int> skippedAfter() const;
+	[[nodiscard]] std::optional<int> indexOf(Value fullId) const;
+	[[nodiscard]] int size() const;
+	[[nodiscard]] Value operator[](int index) const;
+	[[nodiscard]] std::optional<int> distance(
+		const Key &a,
+		const Key &b) const;
+	[[nodiscard]] std::optional<Value> nearest(Value id) const;
+
+private:
+	GlobalMediaKey _key;
+	std::vector<Data::MessagePosition> _items;
+	std::optional<int> _fullCount;
+	int _skippedAfter = 0;
+
+};
+
+class Provider final
+	: public Media::ListProvider
+	, private Media::ListSectionDelegate {
+public:
+	using Type = Media::Type;
+	using BaseLayout = Media::BaseLayout;
+
+	explicit Provider(not_null<AbstractController*> controller);
+
+	Type type() override;
+	bool hasSelectRestriction() override;
+	rpl::producer<bool> hasSelectRestrictionChanges() override;
+	bool isPossiblyMyItem(not_null<const HistoryItem*> item) override;
+
+	std::optional<int> fullCount() override;
+
+	void restart() override;
+	void checkPreload(
+		QSize viewport,
+		not_null<BaseLayout*> topLayout,
+		not_null<BaseLayout*> bottomLayout,
+		bool preloadTop,
+		bool preloadBottom) override;
+	void refreshViewer() override;
+	rpl::producer<> refreshed() override;
+
+	std::vector<Media::ListSection> fillSections(
+		not_null<Overview::Layout::Delegate*> delegate) override;
+	rpl::producer<not_null<BaseLayout*>> layoutRemoved() override;
+	BaseLayout *lookupLayout(const HistoryItem *item) override;
+	bool isMyItem(not_null<const HistoryItem*> item) override;
+	bool isAfter(
+		not_null<const HistoryItem*> a,
+		not_null<const HistoryItem*> b) override;
+
+	void setSearchQuery(QString query) override;
+	void jumpToMessage(MsgId messageId, Fn<void(FullMsgId)> callback) override;
+
+	Media::ListItemSelectionData computeSelectionData(
+		not_null<const HistoryItem*> item,
+		TextSelection selection) override;
+	void applyDragSelection(
+		Media::ListSelectedMap &selected,
+		not_null<const HistoryItem*> fromItem,
+		bool skipFrom,
+		not_null<const HistoryItem*> tillItem,
+		bool skipTill) override;
+
+	bool allowSaveFileAs(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) override;
+	QString showInFolderPath(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) override;
+
+	int64 scrollTopStatePosition(not_null<HistoryItem*> item) override;
+	HistoryItem *scrollTopStateItem(
+		Media::ListScrollTopState state) override;
+	void saveState(
+		not_null<Media::Memento*> memento,
+		Media::ListScrollTopState scrollState) override;
+	void restoreState(
+		not_null<Media::Memento*> memento,
+		Fn<void(Media::ListScrollTopState)> restoreScrollState) override;
+
+private:
+	static constexpr auto kMinimalIdsLimit = 16;
+
+	struct FillResult {
+		GlobalMediaSlice slice;
+		bool notEnough = false;
+	};
+	struct List {
+		std::vector<Data::MessagePosition> list;
+		Data::MessagePosition offsetPosition;
+		int32 offsetRate = 0;
+		int fullCount = 0;
+		bool loaded = false;
+	};
+
+	bool sectionHasFloatingHeader() override;
+	QString sectionTitle(not_null<const BaseLayout*> item) override;
+	bool sectionItemBelongsHere(
+		not_null<const BaseLayout*> item,
+		not_null<const BaseLayout*> previous) override;
+
+	[[nodiscard]] rpl::producer<GlobalMediaSlice> source(
+		Type type,
+		Data::MessagePosition aroundId,
+		QString query,
+		int limitBefore,
+		int limitAfter);
+
+	[[nodiscard]] BaseLayout *getLayout(
+		FullMsgId itemId,
+		not_null<Overview::Layout::Delegate*> delegate);
+	[[nodiscard]] std::unique_ptr<BaseLayout> createLayout(
+		FullMsgId itemId,
+		not_null<Overview::Layout::Delegate*> delegate,
+		Type type);
+
+	[[nodiscard]] GlobalMediaKey sliceKey(
+		Data::MessagePosition aroundId) const;
+
+	void itemRemoved(not_null<const HistoryItem*> item);
+	void markLayoutsStale();
+	void clearStaleLayouts();
+	[[nodiscard]] List *currentList();
+	[[nodiscard]] FillResult fillRequest(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter);
+	mtpRequestId requestMore(Fn<void()> loaded);
+
+	const not_null<AbstractController*> _controller;
+	const Type _type = {};
+
+	Data::MessagePosition _aroundId = Data::MaxMessagePosition;
+	int _idsLimit = kMinimalIdsLimit;
+	GlobalMediaSlice _slice;
+
+	base::flat_set<FullMsgId> _seenIds;
+	std::unordered_map<FullMsgId, Media::CachedItem> _layouts;
+	rpl::event_stream<not_null<BaseLayout*>> _layoutRemoved;
+	rpl::event_stream<> _refreshed;
+
+	QString _totalListQuery;
+	base::flat_map<QString, List> _totalLists;
+
+	rpl::lifetime _lifetime;
+	rpl::lifetime _viewerLifetime;
+
+};
+
+} // namespace Info::GlobalMedia
diff --git a/Telegram/SourceFiles/info/global_media/info_global_media_widget.cpp b/Telegram/SourceFiles/info/global_media/info_global_media_widget.cpp
new file mode 100644
index 00000000000000..4e75d0fb47c1a0
--- /dev/null
+++ b/Telegram/SourceFiles/info/global_media/info_global_media_widget.cpp
@@ -0,0 +1,144 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/global_media/info_global_media_widget.h"
+
+#include "info/global_media/info_global_media_inner_widget.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/search_field_controller.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/ui_utility.h"
+#include "data/data_download_manager.h"
+#include "data/data_user.h"
+#include "core/application.h"
+#include "lang/lang_keys.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+
+namespace Info::GlobalMedia {
+
+Memento::Memento(not_null<Controller*> controller)
+: ContentMemento(Tag{ controller->session().user() })
+, _media(controller) {
+}
+
+Memento::Memento(not_null<UserData*> self, Storage::SharedMediaType type)
+: ContentMemento(Tag{ self })
+, _media(self, 0, type) {
+}
+
+Memento::~Memento() = default;
+
+Section Memento::section() const {
+	return Section(_media.type(), Section::Type::GlobalMedia);
+}
+
+object_ptr<ContentWidget> Memento::createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) {
+	auto result = object_ptr<Widget>(parent, controller);
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+Widget::Widget(QWidget *parent, not_null<Controller*> controller)
+: ContentWidget(parent, controller) {
+	_inner = setInnerWidget(object_ptr<InnerWidget>(
+		this,
+		controller));
+	_inner->setScrollHeightValue(scrollHeightValue());
+	_inner->scrollToRequests(
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
+		scrollTo(request);
+	}, _inner->lifetime());
+}
+
+bool Widget::showInternal(not_null<ContentMemento*> memento) {
+	if (auto globalMediaMemento = dynamic_cast<Memento*>(memento.get())) {
+		restoreState(globalMediaMemento);
+		return true;
+	}
+	return false;
+}
+
+void Widget::setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento) {
+	setGeometry(geometry);
+	Ui::SendPendingMoveResizeEvents(this);
+	restoreState(memento);
+}
+
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(controller());
+	saveState(result.get());
+	return result;
+}
+
+void Widget::saveState(not_null<Memento*> memento) {
+	memento->setScrollTop(scrollTopSave());
+	_inner->saveState(memento);
+}
+
+void Widget::restoreState(not_null<Memento*> memento) {
+	_inner->restoreState(memento);
+	scrollTopRestore(memento->scrollTop());
+}
+
+rpl::producer<SelectedItems> Widget::selectedListValue() const {
+	return _inner->selectedListValue();
+}
+
+void Widget::selectionAction(SelectionAction action) {
+	_inner->selectionAction(action);
+}
+
+void Widget::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
+	const auto window = controller()->parentController();
+	const auto deleteAll = [=] {
+		auto &manager = Core::App().downloadManager();
+		const auto phrase = tr::lng_downloads_delete_sure_all(tr::now);
+		const auto added = manager.loadedHasNonCloudFile()
+			? QString()
+			: tr::lng_downloads_delete_in_cloud(tr::now);
+		const auto deleteSure = [=, &manager](Fn<void()> close) {
+			Ui::PostponeCall(this, close);
+			manager.deleteAll();
+		};
+		window->show(Ui::MakeConfirmBox({
+			.text = phrase + (added.isEmpty() ? QString() : "\n\n" + added),
+			.confirmed = deleteSure,
+			.confirmText = tr::lng_box_delete(tr::now),
+			.confirmStyle = &st::attentionBoxButton,
+		}));
+	};
+	addAction(
+		tr::lng_context_delete_all_files(tr::now),
+		deleteAll,
+		&st::menuIconDelete);
+}
+
+rpl::producer<QString> Widget::title() {
+	return tr::lng_profile_shared_media();
+}
+
+std::shared_ptr<Info::Memento> Make(
+		not_null<UserData*> self,
+		Storage::SharedMediaType type) {
+	return std::make_shared<Info::Memento>(
+		std::vector<std::shared_ptr<ContentMemento>>(
+			1,
+			std::make_shared<Memento>(self, type)));
+}
+
+} // namespace Info::GlobalMedia
\ No newline at end of file
diff --git a/Telegram/SourceFiles/info/global_media/info_global_media_widget.h b/Telegram/SourceFiles/info/global_media/info_global_media_widget.h
new file mode 100644
index 00000000000000..9a47cbe9c206f3
--- /dev/null
+++ b/Telegram/SourceFiles/info/global_media/info_global_media_widget.h
@@ -0,0 +1,78 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "info/info_content_widget.h"
+#include "info/media/info_media_widget.h"
+
+namespace Storage {
+enum class SharedMediaType : signed char;
+} // namespace Storage
+
+namespace Info::GlobalMedia {
+
+class InnerWidget;
+
+class Memento final : public ContentMemento {
+public:
+	Memento(not_null<Controller*> controller);
+	Memento(not_null<UserData*> self, Storage::SharedMediaType type);
+	~Memento();
+
+	object_ptr<ContentWidget> createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) override;
+
+	Section section() const override;
+
+	[[nodiscard]] Media::Memento &media() {
+		return _media;
+	}
+	[[nodiscard]] const Media::Memento &media() const {
+		return _media;
+	}
+
+private:
+	Media::Memento _media;
+
+};
+
+class Widget final : public ContentWidget {
+public:
+	Widget(QWidget *parent, not_null<Controller*> controller);
+
+	bool showInternal(
+		not_null<ContentMemento*> memento) override;
+
+	void setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento);
+
+	rpl::producer<SelectedItems> selectedListValue() const override;
+	void selectionAction(SelectionAction action) override;
+
+	void fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) override;
+
+	rpl::producer<QString> title() override;
+
+private:
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
+
+	InnerWidget *_inner = nullptr;
+
+};
+
+[[nodiscard]] std::shared_ptr<Info::Memento> Make(
+	not_null<UserData*> self,
+	Storage::SharedMediaType type);
+
+} // namespace Info::GlobalMedia
\ No newline at end of file
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 0c66b41a75708a..35da2772b34739 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -23,6 +23,7 @@ InfoToggle {
 
 InfoPeerBadge {
 	verified: icon;
+	verifiedCheck: icon;
 	premium: icon;
 	premiumFg: color;
 	position: point;
@@ -54,17 +55,16 @@ InfoTopBar {
 	radius: pixels;
 }
 
-infoMediaHeaderFg: windowFg;
+SubTabs {
+	bg: color;
+}
 
-infoToggle: InfoToggle {
-	color: menuIconFg;
-	duration: slideWrapDuration;
-	size: 24px;
-	skip: 5px;
-	stroke: 2px;
-	rippleAreaPadding: 8px;
+defaultSubTabs: SubTabs {
+	bg: windowBg;
 }
 
+infoMediaHeaderFg: windowFg;
+
 infoMediaSearch: SearchFieldRow {
 	height: 44px;
 	padding: margins(8px, 6px, 8px, 6px);
@@ -129,9 +129,7 @@ infoTopBarBack: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(6px, 6px);
 	rippleAreaSize: 42px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 infoTopBarTitle: FlatLabel(defaultFlatLabel) {
 	textFg: windowBoldFg;
@@ -162,6 +160,7 @@ infoTopBarMenu: IconButton(infoTopBarBack) {
 	iconPosition: point(18px, -1px);
 	rippleAreaPosition: point(1px, 6px);
 }
+infoTopBarMenuActive: icon {{ "title_menu_dots", windowActiveTextFg, point(0px, 0px) }};
 infoTopBarCall: IconButton(infoTopBarMenu) {
 	width: 42px;
 	icon: icon {{ "top_bar_call", boxTitleCloseFg }};
@@ -170,10 +169,17 @@ infoTopBarCall: IconButton(infoTopBarMenu) {
 	rippleAreaPosition: point(0px, 6px);
 }
 infoTopBarQr: IconButton(infoTopBarMenu) {
-	width: 52px;
+	width: 48px;
 	icon: icon {{ "menu/qr_code", boxTitleCloseFg }};
 	iconOver: icon {{ "menu/qr_code", boxTitleCloseFgOver }};
-	iconPosition: point(9px, -1px);
+	iconPosition: point(8px, -1px);
+	rippleAreaPosition: point(0px, 6px);
+}
+infoTopBarEdit: IconButton(infoTopBarMenu) {
+	width: 48px;
+	icon: icon {{ "menu/edit", boxTitleCloseFg }};
+	iconOver: icon {{ "menu/edit", boxTitleCloseFgOver }};
+	iconPosition: point(8px, -1px);
 	rippleAreaPosition: point(0px, 6px);
 }
 infoTopBarForward: IconButton(infoTopBarBack) {
@@ -275,6 +281,22 @@ infoLayerTopBarQr: IconButton(infoLayerTopBarClose) {
 	iconOver: icon {{ "menu/qr_code", boxTitleCloseFgOver }};
 	iconPosition: point(8px, -1px);
 }
+infoLayerTopBarSearch: IconButton(infoLayerTopBarClose) {
+	width: 48px;
+	icon: icon {{ "top_bar_search", boxTitleCloseFg }};
+	iconOver: icon {{ "top_bar_search", boxTitleCloseFgOver }};
+	iconPosition: point(7px, -1px);
+}
+infoLayerTopBarEdit: IconButton(infoLayerTopBarClose) {
+	width: 44px;
+	height: infoLayerTopBarHeight - 2px;
+	icon: icon {{ "menu/edit", boxTitleCloseFg }};
+	iconOver: icon {{ "menu/edit", boxTitleCloseFgOver }};
+	iconPosition: point(10px, -1px);
+
+	rippleAreaSize: 42px;
+	rippleAreaPosition: point(1px, 6px);
+}
 infoLayerTopBarForward: IconButton(infoLayerTopBarBack) {
 	width: 45px;
 	icon: icon {{ "info/info_media_forward", boxTitleCloseFg }};
@@ -323,7 +345,152 @@ infoLayerTopBar: InfoTopBar(infoTopBar) {
 	radius: boxRadius;
 }
 
-infoLayerTopBarMenuPosition: point(40px, 37px);
+infoLayerTopBarMenuPosition: point(48px, 37px);
+
+infoTopBarColoredBack: IconButton(infoTopBarBack) {
+	icon: icon {{ "info/info_back", groupCallMembersFg }};
+	iconOver: icon {{ "info/info_back", groupCallMembersFg }};
+	ripple: universalRippleAnimation;
+}
+infoLayerTopBarColoredBack: IconButton(infoLayerTopBarBack) {
+	icon: icon {{ "info/info_back", groupCallMembersFg }};
+	iconOver: icon {{ "info/info_back", groupCallMembersFg }};
+	ripple: universalRippleAnimation;
+}
+infoTopBarColoredClose: IconButton(infoTopBarClose) {
+	icon: icon {{ "info/info_close", groupCallMembersFg }};
+	iconOver: icon {{ "info/info_close", groupCallMembersFg }};
+	ripple: universalRippleAnimation;
+}
+infoTopBarColoredEdit: IconButton(infoTopBarEdit) {
+	icon: icon {{ "menu/edit", groupCallMembersFg }};
+	iconOver: icon {{ "menu/edit", groupCallMembersFg }};
+	ripple: universalRippleAnimation;
+}
+infoLayerTopBarColoredEdit: IconButton(infoLayerTopBarEdit) {
+	icon: icon {{ "menu/edit", groupCallMembersFg }};
+	iconOver: icon {{ "menu/edit", groupCallMembersFg }};
+	ripple: universalRippleAnimation;
+}
+infoTopBarBlackBack: IconButton(infoTopBarBack) {
+	icon: icon {{ "info/info_back", windowBoldFg }};
+	iconOver: icon {{ "info/info_back", windowBoldFg }};
+	ripple: universalRippleAnimation;
+}
+infoLayerTopBarBlackBack: IconButton(infoLayerTopBarBack) {
+	icon: icon {{ "info/info_back", windowBoldFg }};
+	iconOver: icon {{ "info/info_back", windowBoldFg }};
+	ripple: universalRippleAnimation;
+}
+infoTopBarBlackClose: IconButton(infoTopBarClose) {
+	icon: icon {{ "info/info_close", windowBoldFg }};
+	iconOver: icon {{ "info/info_close", windowBoldFg }};
+	ripple: universalRippleAnimation;
+}
+infoTopBarBlackEdit: IconButton(infoTopBarEdit) {
+	icon: icon {{ "menu/edit", windowBoldFg }};
+	iconOver: icon {{ "menu/edit", windowBoldFg }};
+	ripple: universalRippleAnimation;
+}
+infoLayerTopBarBlackEdit: IconButton(infoLayerTopBarEdit) {
+	icon: icon {{ "menu/edit", windowBoldFg }};
+	iconOver: icon {{ "menu/edit", windowBoldFg }};
+	ripple: universalRippleAnimation;
+}
+
+infoProfileTopBarHeightMax: 180px + infoLayerTopBarHeight;
+infoProfileTopBarTitleTop: 113px;
+infoProfileTopBarStatusTop: 134px;
+infoProfileTopBarPhotoTop: 24px;
+infoProfileTopBarPhotoBgShift: 55px;
+infoProfileTopBarPhotoBgNoActionsShift: 30px;
+infoProfileTopBarPhotoSize: 80px;
+infoProfileTopBarLastSeenSkip: point(8px, 1px);
+
+infoProfileBirthdayConfettiSize: 360px;
+infoProfileBirthdayDigitSize: 64px;
+
+infoProfileTopBarGiftSize: 20px;
+
+infoProfileTopBarGiftLeft: point(15px, 13px);
+infoProfileTopBarGiftTopLeft: point(4px, 4px);
+infoProfileTopBarGiftBottomLeft: point(9px, 16px);
+infoProfileTopBarGiftRight: point(50px, 13px);
+infoProfileTopBarGiftTopRight: point(30px, 4px);
+infoProfileTopBarGiftBottomRight: point(40px, 13px);
+
+infoProfileTopBarActionButtonBgOpacity: 0.16;
+infoProfileTopBarActionButtonSize: 52px;
+infoProfileTopBarActionButtonIconSize: 23px;
+infoProfileTopBarActionButtonLottieSize: infoProfileTopBarActionButtonIconSize - 0px;
+infoProfileTopBarActionButtonIconTop: 6px;
+infoProfileTopBarActionButtonTextTop: infoProfileTopBarActionButtonIconSize + infoProfileTopBarActionButtonIconTop + 1px;
+infoProfileTopBarActionButtonTextSkip: 4px;
+infoProfileTopBarActionButtonFont: font(11px);
+infoProfileTopBarActionButtonShadow: BoxShadow {
+	blurRadius: 1px;
+	offset: point(0px, 0px);
+	opacity: 0.25;
+}
+
+infoProfileTopBarActionButtonsPadding: margins(18px, 0px, 18px, 16px);
+infoProfileTopBarActionButtonsHeight: infoProfileTopBarActionButtonSize + infoProfileTopBarActionButtonsPadding.topBottom;
+infoProfileTopBarActionButtonsSpace: 10px;
+
+infoProfileTopBarStep2: infoProfileTopBarHeightMax - infoLayerTopBarHeight;
+infoProfileTopBarStep1: infoProfileTopBarStep2 - infoProfileTopBarActionButtonsHeight;
+
+infoProfileTopBarNoActionsHeightMax: infoProfileTopBarHeightMax - infoProfileTopBarActionButtonSize;
+
+infoProfileTopBarActionMenuSkip: 10px;
+
+infoProfileTopBarActionMessage: icon{{ "profile/message-23x23", windowBoldFg }};
+infoProfileTopBarActionMute: icon{{ "profile/mute-23x23", windowBoldFg }};
+infoProfileTopBarActionUnmute: icon{{ "profile/unmute-23x23", windowBoldFg }};
+infoProfileTopBarActionCall: icon{{ "profile/call-23x23", windowBoldFg }};
+infoProfileTopBarActionGift: icon{{ "profile/gift-23x23", windowBoldFg }};
+infoProfileTopBarActionJoin: icon{{ "profile/join-23x23", windowBoldFg }};
+infoProfileTopBarActionReport: icon{{ "profile/report-23x23", windowBoldFg }};
+infoProfileTopBarActionLeave: icon{{ "profile/leave-23x23", windowBoldFg }};
+infoProfileTopBarActionMore: icon{{ "profile/profile_more", windowBoldFg }};
+infoProfileTopBarActionManage: icon{{ "profile/profile_manage", windowBoldFg }};
+infoProfileTopBarActionLiveStream: icon{{ "profile/live_stream-23x23", windowBoldFg }};
+
+infoProfileTopBarTopicStatusButton: RoundButton(defaultTableSmallButton) {
+	radius: 4px;
+}
+
+infoProfileTopBarBoostFooter: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	style: TextStyle(defaultTextStyle) {
+		font: font(11px);
+	}
+	palette: TextPalette(defaultTextPalette) {
+		linkFg: windowBoldFg;
+		selectLinkFg: windowBoldFg;
+	}
+}
+infoProfileTopBarBoostFooterColored: FlatLabel(infoProfileTopBarBoostFooter) {
+	textFg: groupCallVideoSubTextFg;
+	palette: TextPalette(defaultTextPalette) {
+		linkFg: groupCallIconFg;
+		selectLinkFg: groupCallIconFg;
+	}
+}
+
+infoProfileTopBarShowLastSeen: RoundButton(defaultActiveButton) {
+	textFg: windowBoldFg;
+	textFgOver: windowBoldFg;
+	textBg: windowBg;
+	textBgOver: windowBgOver;
+	width: -12px;
+	height: 18px;
+	textTop: 0px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+	ripple: universalRippleAnimation;
+}
 
 infoMinimalWidth: 324px;
 infoDesiredWidth: 392px;
@@ -340,6 +507,8 @@ InfoProfileCover {
 	status: FlatLabel;
 	statusLeft: pixels;
 	statusTop: pixels;
+	starsRatingLeft: pixels;
+	starsRatingTop: pixels;
 	showLastSeen: RoundButton;
 	showLastSeenPosition: point;
 	showLastSeenVisible: bool;
@@ -373,6 +542,8 @@ infoProfileCover: InfoProfileCover {
 	status: infoProfileStatus;
 	statusLeft: 109px;
 	statusTop: 58px;
+	starsRatingLeft: 107px;
+	starsRatingTop: 57px;
 	showLastSeen: RoundButton(defaultActiveButton) {
 		textFg: windowSubTextFg;
 		textFgOver: windowSubTextFg;
@@ -413,54 +584,60 @@ infoEditContactCover: InfoProfileCover(infoProfileCover) {
 	nameTop: 33px;
 	statusTop: 57px;
 }
-infoEditContactPersonalLeft: 6px;
+
+infoRatingDeductedBadge: RoundButton(customEmojiTextBadge) {
+	textBg: windowSubTextFg;
+}
 
 infoProfileInaccessibleUserpic: icon {{ "info/inaccessible_userpic", historyPeerUserpicFg }};
 
-infoVerifiedCheckPosition: point(4px, 2px);
-infoVerifiedCheck: icon {
-	{ "profile_verified_star", profileVerifiedCheckBg },
-	{ "profile_verified_check", profileVerifiedCheckFg }
-};
+infoVerifiedCheck: icon {{ "profile_verified_check", profileVerifiedCheckFg }};
+infoVerifiedCheckPosition: point(4px, 0px);
+infoVerifiedStar: icon {{ "profile_verified_star", profileVerifiedCheckBg }};
 infoPremiumStar: icon {{ "profile_premium", profileVerifiedCheckBg }};
 
 infoPeerBadge: InfoPeerBadge {
-	verified: infoVerifiedCheck;
+	verified: infoVerifiedStar;
+	verifiedCheck: infoVerifiedCheck;
 	premium: infoPremiumStar;
 	premiumFg: profileVerifiedCheckBg;
 	position: infoVerifiedCheckPosition;
-	sizeTag: 1; // Large
+	sizeTag: 0; // Normal
+}
+infoBotVerifyBadge: InfoPeerBadge(infoPeerBadge) {
+	position: point(-2px, 2px);
+}
+infoColoredPeerBadge: InfoPeerBadge(infoPeerBadge) {
+	verified: icon {{ "profile_verified_star", groupCallMembersFg }}; // Will be colorized.
+	verifiedCheck: icon {{ "profile_verified_check", groupCallMembersFg }};
+	premium: icon {{ "profile_premium", groupCallMembersFg }};
+	premiumFg: groupCallVideoSubTextFg;
+}
+infoColoredBotVerifyBadge: InfoPeerBadge(infoColoredPeerBadge) {
+	position: point(-2px, 2px);
 }
 
 infoIconFg: windowBoldFg;
 
 infoProfileSkip: 7px;
 
-infoProfileLabeledPadding: margins(79px, 9px, 30px, 7px);
-infoProfileLabeledUsernamePadding: margins(79px, 9px, 20px, 7px);
-infoProfileSeparatorPadding: margins(
-	77px,
-	infoProfileSkip,
-	0px,
-	infoProfileSkip);
-infoProfileLabeledButtonCopy: IconButton(defaultIconButton) {
+infoProfileLabeledPadding: margins(23px, 9px, 20px, 7px);
+infoProfileLabeledUsernamePadding: margins(23px, 9px, 20px, 7px);
+infoProfilePersonalChannelPadding: margins(79px, 9px, 20px, 7px);
+infoProfileLabeledButtonQr: IconButton(defaultIconButton) {
 	width: 34px;
 	height: 34px;
-	icon: icon {{ "menu/copy", windowBgActive }};
-	iconOver: icon {{ "menu/copy", windowBgActive }};
+	icon: icon {{ "menu/qr_code", windowActiveTextFg }};
+	iconOver: icon {{ "menu/qr_code", windowActiveTextFg }};
 	rippleAreaPosition: point(0px, 0px);
 	rippleAreaSize: 34px;
 	ripple: defaultRippleAnimation;
 }
-infoProfileLabeledButtonQr: IconButton(infoProfileLabeledButtonCopy) {
-	icon: icon {{ "menu/qr_code", windowBgActive }};
-	iconOver: icon {{ "menu/qr_code", windowBgActive }};
-}
+infoProfileLabeledButtonQrRightSkip: 0px;
+infoProfileLabeledButtonQrInset: 5px;
 
 infoIconInformation: icon {{ "info/info_information", infoIconFg }};
 infoIconAddMember: icon {{ "info/info_add_member", infoIconFg }};
-infoIconBotBalance: icon {{ "menu/earn", infoIconFg, point(5px, 5px) }};
-infoIconNotifications: icon {{ "info/info_notifications", infoIconFg }};
 infoIconMediaPhoto: icon {{ "info/info_media_photo", infoIconFg }};
 infoIconMediaVideo: icon {{ "info/info_media_video", infoIconFg }};
 infoIconMediaGif: icon {{ "info/info_media_gif", infoIconFg }};
@@ -469,12 +646,15 @@ infoIconMediaAudio: icon {{ "info/info_media_audio", infoIconFg }};
 infoIconMediaLink: icon {{ "info/info_media_link", infoIconFg }};
 infoIconMediaGroup: icon {{ "info/info_common_groups", infoIconFg }};
 infoIconMediaChannel: icon {{ "menu/channel", infoIconFg, point(4px, 4px) }};
+infoIconMediaBot: icon {{ "menu/bot", infoIconFg, point(4px, 4px) }};
 infoIconMediaVoice: icon {{ "info/info_media_voice", infoIconFg }};
+infoIconMediaPoll: icon {{ "menu/create_poll", infoIconFg, point(4px, 4px) }};
 infoIconMediaStories: icon {{ "info/info_media_stories", infoIconFg }};
 infoIconMediaSaved: icon {{ "info/info_media_saved", infoIconFg }};
 infoIconMediaStoriesArchive: icon {{ "info/info_stories_archive", infoIconFg }};
 infoIconMediaStoriesRecent: icon {{ "info/info_stories_recent", infoIconFg }};
 infoIconMediaGifts: icon {{ "menu/gift_premium", infoIconFg, point(4px, 4px) }};
+infoIconEmojiStatusAccess: icon {{ "menu/read_reactions", infoIconFg, point(4px, 4px) }};
 
 infoIconShare: icon {{ "info/info_share", infoIconFg }};
 infoIconEdit: icon {{ "info/info_edit", infoIconFg }};
@@ -484,12 +664,14 @@ infoIconReport: icon {{ "info/info_report", attentionButtonFg }};
 infoIconLeave: icon {{ "info/info_leave", infoIconFg }};
 infoIconBlock: icon {{ "info/info_block", attentionButtonFg }};
 infoIconMembers: icon {{ "info/info_members", infoIconFg }};
-infoInformationIconPosition: point(25px, 12px);
-infoNotificationsIconPosition: point(20px, 5px);
+infoIconPrivacyPolicy: icon {{ "menu/2sv_off", infoIconFg, point(4px, 4px) }};
+infoIconSettings: icon {{ "menu/manage", infoIconFg, point(4px, 4px) }};
 infoSharedMediaButtonIconPosition: point(20px, 3px);
 infoGroupMembersIconPosition: point(20px, 10px);
 infoChannelMembersIconPosition: point(20px, 4px);
 infoChannelAdminsIconPosition: point(24px, 7px);
+infoEarnCreditsIconPosition: point(24px, 7px);
+infoEarnCurrencyIconPosition: point(20px, 3px);
 
 infoOpenApp: RoundButton(defaultActiveButton) {
 	textTop: 11px;
@@ -497,13 +679,13 @@ infoOpenApp: RoundButton(defaultActiveButton) {
 }
 infoOpenAppMargin: margins(16px, 12px, 16px, 12px);
 
-infoPersonalChannelIconPosition: point(25px, 20px);
+infoPersonalChannelIconPosition: point(25px, 12px);
 infoPersonalChannelNameLabel: FlatLabel(infoProfileStatus) {
 	textFg: windowBoldFg;
 	style: semiboldTextStyle;
 	maxHeight: 20px;
 }
-infoPersonalChannelDateSkip: 22px;
+infoPersonalChannelDateSkip: 20px;
 infoPersonalChannelDateLabel: FlatLabel(infoProfileStatus) {
 	textFg: dialogsDateFg;
 	style: TextStyle(semiboldTextStyle) {
@@ -511,7 +693,7 @@ infoPersonalChannelDateLabel: FlatLabel(infoProfileStatus) {
 	}
 	maxHeight: 20px;
 }
-infoPersonalChannelUserpicSkip: 3px;
+infoPersonalChannelUserpicSkip: -5px;
 infoPersonalChannelUserpic: UserpicButton(defaultUserpicButton) {
 	size: size(42px, 42px);
 	photoSize: 42px;
@@ -541,31 +723,28 @@ infoProfileButton: SettingsButton(defaultSettingsButton) {
 	toggleOver: infoProfileToggleOver;
 	toggleSkip: 20px;
 }
-infoNotificationsButton: SettingsButton(infoProfileButton) {
-	padding: margins(79px, 13px, 8px, 9px);
-}
 infoMainButton: SettingsButton(infoProfileButton) {
 	textFg: lightButtonFg;
 	textFgOver: lightButtonFgOver;
 	style: semiboldTextStyle;
+	padding: margins(23px, 10px, 8px, 8px);
 }
 infoMainButtonAttention: SettingsButton(infoMainButton) {
 	textFg: attentionButtonFg;
 	textFgOver: attentionButtonFgOver;
 }
 infoSharedMediaButton: infoProfileButton;
-infoSharedMediaBottomSkip: 12px;
 
 infoBlockButton: SettingsButton(infoProfileButton) {
 	textFg: attentionButtonFg;
 	textFgOver: attentionButtonFgOver;
 }
-infoCreateLinkedChatButton: SettingsButton(infoProfileButton) {
+infoCreateDiscussionLinkButton: SettingsButton(infoProfileButton) {
 	padding: margins(74px, 10px, 8px, 8px);
 	textFg: lightButtonFg;
 	textFgOver: lightButtonFgOver;
 }
-infoUnlinkChatButton: SettingsButton(infoCreateLinkedChatButton) {
+infoUnlinkDiscussionLinkButton: SettingsButton(infoCreateDiscussionLinkButton) {
 	textFg: attentionButtonFg;
 	textFgOver: attentionButtonFgOver;
 }
@@ -623,9 +802,7 @@ infoMembersCancelSearch: CrossButton {
 
 	duration: 150;
 	loadingPeriod: 1000;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 infoMembersSearchTop: 15px;
 
@@ -635,7 +812,8 @@ infoMediaHeaderPosition: point(14px, 6px);
 infoMediaSkip: 2px;
 infoMediaLeft: 3px;
 infoMediaMargin: margins(0px, 6px, 0px, 2px);
-infoMediaMinGridSize: 90px;
+infoMediaMinGridSize: 82px;
+infoMediaGridSizeStep: 16px;
 
 infoCommonGroupsMargin: margins(0px, 2px, 0px, 2px);
 infoCommonGroupsListItem: PeerListItem(defaultPeerListItem) {
@@ -678,6 +856,12 @@ manageGroupButton: SettingsCountButton(managePeerButton) {
 	labelPosition: point(22px, 10px);
 	iconPosition: point(20px, 4px);
 }
+infoSharedMediaCountButton: SettingsCountButton(managePeerButton) {
+	button: infoSharedMediaButton;
+	iconPosition: point(20px, 4px);
+	label: defaultSettingsRightLabel;
+	labelPosition: point(24px, 10px);
+}
 
 manageGroupTopButtonWithText: SettingsCountButton(manageGroupButton) {
 	iconPosition: point(0px, 0px);
@@ -715,8 +899,8 @@ manageDeleteGroupButton: SettingsCountButton(manageGroupNoIconButton) {
 manageGroupReactions: IconButton(defaultIconButton) {
 	width: 24px;
 	height: 36px;
-	icon: icon{{ "info/edit/stickers_add", historyComposeIconFg }};
-	iconOver: icon{{ "info/edit/stickers_add", historyComposeIconFgOver }};
+	icon: icon{{ "menu/add", historyComposeIconFg }};
+	iconOver: icon{{ "menu/add", historyComposeIconFgOver }};
 }
 manageGroupReactionsField: InputField(defaultInputField) {
 	textMargins: margins(1px, 12px, 24px, 8px);
@@ -743,7 +927,6 @@ infoEmptyAudio: icon {{ "info/info_media_audio_empty", infoEmptyFg }};
 infoEmptyFile: icon {{ "info/info_media_file_empty", infoEmptyFg }};
 infoEmptyVoice: icon {{ "info/info_media_voice_empty", infoEmptyFg }};
 infoEmptyLink: icon {{ "info/info_media_link_empty", infoEmptyFg }};
-infoEmptyStories: icon {{ "info/info_media_story_empty", infoEmptyFg }};
 infoEmptyIconTop: 120px;
 infoEmptyLabelTop: 40px;
 infoEmptyLabelSkip: 20px;
@@ -770,7 +953,6 @@ editPeerTopButtonsLayoutSkipCustomBottom: 5px;
 editPeerHistoryVisibilityTopSkip: 8px;
 
 editPeerPhotoMargins: margins(22px, 8px, 22px, 8px);
-editPeerTitle: defaultInputField;
 editPeerTitleMargins: margins(27px, 13px, 22px, 8px);
 editPeerTitleEmojiPosition: point(0px, 23px);
 editPeerTitleField: InputField(defaultInputField) {
@@ -806,14 +988,6 @@ editPeerPrivacyBoxCheckbox: Checkbox(defaultBoxCheckbox) {
 editPeerPrivacyLabelMargins: margins(42px, 0px, 34px, 0px);
 editPeerPreHistoryLabelMargins: margins(34px, 0px, 34px, 0px);
 editPeerUsernameFieldMargins: margins(22px, 0px, 22px, 0px);
-editPeerUsername: setupChannelLink;
-editPeerUsernameGood: FlatLabel(defaultFlatLabel) {
-	textFg: boxTextFgGood;
-	style: boxTextStyle;
-}
-
-editPeerReactionsPreview: 24px;
-editPeerReactionsIconLeft: 21px;
 
 historyTopBarBack: IconButton(infoTopBarBack) {
 	width: 52px;
@@ -824,10 +998,6 @@ topBarMenuGroupCallSkip: 20px;
 topBarBack: icon {{ "title_back", lightButtonFg }};
 topBarArrowPadding: margins(39px, 8px, 17px, 8px);
 topBarNameRightPadding: 3px;
-topBarButton: RoundButton(defaultLightButton) {
-	width: -18px;
-	padding: margins(0px, 10px, 12px, 10px);
-}
 topBarClearButton: RoundButton(defaultLightButton) {
 	width: -18px;
 }
@@ -841,9 +1011,7 @@ topBarSearch: IconButton {
 
 	rippleAreaPosition: point(0px, 7px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 topBarCloseChoose: IconButton(topBarSearch) {
 	width: 56px;
@@ -878,6 +1046,7 @@ topBarInfo: IconButton(topBarSearch) {
 }
 topBarInfoActive: icon {{ "top_bar_profile", windowActiveTextFg }};
 topBarActionSkip: 10px;
+topBarActionButtonLargeRadius: 8px;
 
 topBarInfoButtonSize: size(52px, topBarHeight);
 topBarInfoButtonInnerSize: 42px;
@@ -1123,10 +1292,6 @@ similarChannelsLock: RoundButton(defaultActiveButton) {
 	textTop: 12px;
 	style: semiboldTextStyle;
 }
-similarChannelsLockLabel: FlatLabel(defaultFlatLabel) {
-	textFg: premiumButtonFg;
-	style: semiboldTextStyle;
-}
 similarChannelsLockPadding: margins(12px, 12px, 12px, 12px);
 similarChannelsLockAbout: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
@@ -1146,9 +1311,126 @@ infoHoursDayLabel: infoHoursState;
 infoHoursOuter: RoundButton(defaultActiveButton) {
 	textBg: transparent;
 	textBgOver: transparent;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 infoHoursOuterMargin: margins(8px, 4px, 8px, 4px);
 infoHoursDaySkip: 6px;
+infoHoursArrowSize: 4px;
+
+infoSharedMediaScroll: ScrollArea(defaultScrollArea) {
+	round: 1px;
+	width: 5px;
+	deltax: 2px;
+}
+
+infoGiftTooltip: ImportantTooltip(defaultImportantTooltip) {
+	margin: margins(4px, 4px, 4px, 4px);
+	padding: margins(8px, 2px, 8px, 3px);
+}
+infoGiftTooltipFont: font(11px semibold);
+
+topicsLayoutButtonLabel: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+	margin: margins(10px, 4px, 10px, 4px);
+	textFg: windowSubTextFg;
+}
+topicsLayoutButtonIconPadding: margins(4px, 0px, 4px, 0px);
+topicsLayoutButtonIconSize: 140px;
+topicsLayoutButtonPadding: margins(4px, 0px, 4px, 12px);
+topicsLayoutButtonSkip: 0px;
+
+infoStarsTitle: FlatLabel(defaultFlatLabel) {
+	minWidth: 40px;
+	textFg: windowBoldFg;
+	maxHeight: 24px;
+	style: TextStyle(boxTextStyle) {
+		font: font(17px semibold);
+	}
+	align: align(top);
+}
+infoStarsFeatureTitle: FlatLabel(defaultFlatLabel) {
+	textFg: windowBoldFg;
+	style: semiboldTextStyle;
+	minWidth: 10px;
+	maxHeight: 20px;
+}
+infoStarsFeatureAbout: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	minWidth: 20px;
+}
+infoStarsFeatureIconPosition: point(3px, 7px);
+infoStarsFeatureMargin: margins(0px, 8px, 0px, 6px);
+infoStarsFeatureLabelLeft: 46px;
+infoStarsFeatureSkip: 2px;
+infoStarsCrown: icon {{ "limits/filled_rating_crown-24x24", windowFgActive }};
+infoStarsUnderstood: IconEmoji{
+	icon: icon {{ "limits/filled_understood-20x20", windowFgActive }};
+	padding: margins(0px, -1px, 0px, 0px);
+}
+
+collectionAbout: FlatLabel(defaultFlatLabel) {
+	minWidth: 256px;
+}
+collectionNameField: InputField(defaultInputField) {
+	textBg: transparent;
+	textMargins: margins(2px, 10px, 32px, 2px);
+
+	placeholderFg: placeholderFg;
+	placeholderFgActive: placeholderFgActive;
+	placeholderFgError: placeholderFgActive;
+	placeholderMargins: margins(2px, 0px, 2px, 0px);
+	placeholderScale: 0.;
+
+	heightMin: 36px;
+}
+collectionEmptyTitle: FlatLabel(boxTitle) {
+}
+collectionEmptyText: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+}
+collectionEmptyButton: RoundButton(defaultActiveButton) {
+	width: -96px;
+}
+collectionEmptyTitleMargin: margins(10px, 24px, 10px, 4px);
+collectionEmptyTextMargin: margins(10px, 4px, 10px, 12px);
+collectionEmptyAddMargin: margins(10px, 12px, 10px, 24px);
+collectionAddIcon: IconEmoji {
+	icon: icon {{ "settings/plus", windowFgActive }};
+	padding: margins(1px, -2px, 1px, 0px);
+}
+collectionEditBox: Box(defaultBox) {
+	buttonPadding: margins(16px, 12px, 16px, 12px);
+	buttonHeight: 42px;
+	buttonWide: true;
+	button: RoundButton(defaultActiveButton) {
+		height: 42px;
+		textTop: 12px;
+		style: semiboldTextStyle;
+	}
+}
+collectionEditMenuToggle: IconButton(infoTopBarMenu) {
+	width: boxTitleHeight;
+	height: boxTitleHeight;
+
+	icon: icon {{ "title_menu_dots", boxTitleCloseFg }};
+	iconOver: icon {{ "title_menu_dots", boxTitleCloseFgOver }};
+	iconPosition: point(-1px, -1px);
+
+	rippleAreaPosition: point(4px, 4px);
+	rippleAreaSize: 40px;
+	ripple: defaultRippleAnimationBgOver;
+}
+collectionSubTabs: SubTabs(defaultSubTabs) {
+	bg: boxDividerBg;
+}
+
+earnTonIconSize: 16px;
+earnTonIconMargin: margins(0px, 2px, 0px, 0px);
+
+infoMusicButtonRipple: universalRippleAnimation;
+infoMusicButtonPadding: margins(16px, 6px, 13px, 6px);
+
+memberTagPillPadding: margins(5px, -1px, 5px, 0px);
+
+infoSecurityRiskIconSize: 16px;
+infoSecurityRiskIconMargin: margins(0px, 2px, 0px, 0px);
diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp
index 507ce0f1584eb4..4336baa47fbac4 100644
--- a/Telegram/SourceFiles/info/info_content_widget.cpp
+++ b/Telegram/SourceFiles/info/info_content_widget.cpp
@@ -7,27 +7,33 @@ For license and copyright information please follow this link:
 */
 #include "info/info_content_widget.h"
 
-#include "window/window_session_controller.h"
-#include "ui/widgets/scroll_area.h"
-#include "ui/widgets/fields/input_field.h"
-#include "ui/wrap/padding_wrap.h"
-#include "ui/search_field_controller.h"
-#include "ui/ui_utility.h"
-#include "lang/lang_keys.h"
-#include "info/profile/info_profile_widget.h"
-#include "info/media/info_media_widget.h"
-#include "info/common_groups/info_common_groups_widget.h"
-#include "info/info_layer_widget.h"
-#include "info/info_section_widget.h"
-#include "info/info_controller.h"
+#include "api/api_who_reacted.h"
 #include "boxes/peer_list_box.h"
 #include "data/data_chat.h"
 #include "data/data_channel.h"
 #include "data/data_session.h"
 #include "data/data_forum_topic.h"
 #include "data/data_forum.h"
+#include "info/profile/info_profile_widget.h"
+#include "info/media/info_media_widget.h"
+#include "info/common_groups/info_common_groups_widget.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
+#include "info/saved/info_saved_music_common.h"
+#include "info/stories/info_stories_common.h"
+#include "info/info_layer_widget.h"
+#include "info/info_section_widget.h"
+#include "info/info_controller.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "menu/menu_send.h"
+#include "ui/controls/swipe_handler.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/search_field_controller.h"
+#include "ui/ui_utility.h"
 #include "window/window_peer_menu.h"
+#include "window/window_session_controller.h"
 #include "styles/style_info.h"
 #include "styles/style_profile.h"
 #include "styles/style_layers.h"
@@ -35,18 +41,52 @@ For license and copyright information please follow this link:
 #include <QtCore/QCoreApplication>
 
 namespace Info {
+namespace {
+
+class FlexibleFiller final : public Ui::RpWidget {
+public:
+	using RpWidget::RpWidget;
+
+	void setTargetWidget(base::unique_qptr<RpWidget> widget);
+
+private:
+	void visibleTopBottomUpdated(int visibleTop, int visibleBottom) override;
+
+	base::unique_qptr<RpWidget> _target;
+
+};
+
+void FlexibleFiller::setTargetWidget(base::unique_qptr<RpWidget> widget) {
+	Expects(!_target);
+
+	_target = std::move(widget);
+}
+
+void FlexibleFiller::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	if (const auto raw = _target.get()) {
+		raw->setVisibleTopBottom(visibleTop, visibleBottom);
+	}
+}
+
+} // namespace
 
 ContentWidget::ContentWidget(
 	QWidget *parent,
 	not_null<Controller*> controller)
 : RpWidget(parent)
 , _controller(controller)
-, _scroll(this) {
+, _scroll(
+	this,
+	(_controller->wrap() == Wrap::Search
+		? st::infoSharedMediaScroll
+		: st::defaultScrollArea)) {
 	using namespace rpl::mappers;
 
 	setAttribute(Qt::WA_OpaquePaintEvent);
 	_controller->wrapValue(
-	) | rpl::start_with_next([this](Wrap value) {
+	) | rpl::on_next([this](Wrap value) {
 		if (value != Wrap::Layer) {
 			applyAdditionalScroll(0);
 		}
@@ -61,14 +101,14 @@ ContentWidget::ContentWidget(
 			_controller->searchEnabledByContent(),
 			(_1 == Wrap::Layer) && _2
 		) | rpl::distinct_until_changed(
-		) | rpl::start_with_next([this](bool shown) {
+		) | rpl::on_next([this](bool shown) {
 			refreshSearchField(shown);
 		}, lifetime());
 	}
 	rpl::merge(
 		_scrollTopSkip.changes(),
 		_scrollBottomSkip.changes()
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		updateControlsGeometry();
 	}, lifetime());
 }
@@ -156,12 +196,14 @@ Ui::RpWidget *ContentWidget::doSetInnerWidget(
 			_innerWrap ? _innerWrap->padding() : style::margins()));
 	_innerWrap->move(0, 0);
 
+	setupSwipeHandler(_innerWrap);
+
 	// MSVC BUG + REGRESSION rpl::mappers::tuple :(
 	rpl::combine(
 		_scroll->scrollTopValue(),
 		_scroll->heightValue(),
 		_innerWrap->entity()->desiredHeightValue()
-	) | rpl::start_with_next([this](
+	) | rpl::on_next([this](
 			int top,
 			int height,
 			int desired) {
@@ -171,9 +213,57 @@ Ui::RpWidget *ContentWidget::doSetInnerWidget(
 		_scrollTillBottomChanges.fire_copy(std::max(desired - bottom, 0));
 	}, _innerWrap->lifetime());
 
+	rpl::combine(
+		_scroll->heightValue(),
+		_innerWrap->entity()->heightValue(),
+		_controller->wrapValue()
+	) | rpl::on_next([=](
+			int scrollHeight,
+			int innerHeight,
+			Wrap wrap) {
+		const auto added = (wrap == Wrap::Layer)
+			? 0
+			: std::max(scrollHeight - innerHeight - _innerTopReserve, 0);
+		if (_addedHeight != added) {
+			_addedHeight = added;
+			updateInnerPadding();
+		}
+	}, _innerWrap->lifetime());
+	updateInnerPadding();
+
 	return _innerWrap->entity();
 }
 
+Ui::RpWidget *ContentWidget::doSetupFlexibleInnerWidget(
+		object_ptr<Ui::RpWidget> inner,
+		FlexibleScrollData &flexibleScroll,
+		Fn<void(Ui::RpWidget*)> customSetup) {
+	const auto filler = setInnerWidget(object_ptr<FlexibleFiller>(this));
+	filler->resize(1, 1);
+
+	flexibleScroll.contentHeightValue.events(
+	) | rpl::on_next([=](int h) {
+		filler->resize(filler->width(), h);
+	}, filler->lifetime());
+
+	filler->widthValue(
+	) | rpl::start_to_stream(
+		flexibleScroll.fillerWidthValue,
+		filler->lifetime());
+
+	if (customSetup) {
+		customSetup(filler);
+	}
+
+	// ScrollArea -> PaddingWrap -> RpWidget.
+	const auto result = inner.release();
+	result->setParent(filler->parentWidget()->parentWidget());
+	result->raise();
+	filler->setTargetWidget(base::unique_qptr<Ui::RpWidget>(result));
+
+	return result;
+}
+
 int ContentWidget::scrollTillBottom(int forHeight) const {
 	const auto scrollHeight = forHeight
 		- _scrollTopSkip.current()
@@ -200,11 +290,43 @@ rpl::producer<int> ContentWidget::scrollHeightValue() const {
 }
 
 void ContentWidget::applyAdditionalScroll(int additionalScroll) {
-	if (_innerWrap) {
-		_innerWrap->setPadding({ 0, 0, 0, additionalScroll });
+	if (_additionalScroll != additionalScroll) {
+		_additionalScroll = additionalScroll;
+		if (_innerWrap) {
+			updateInnerPadding();
+		}
 	}
 }
 
+void ContentWidget::updateInnerPadding() {
+	const auto addedToBottom = std::max(_additionalScroll, _addedHeight);
+	_innerWrap->setPadding({ 0, _innerTopReserve, 0, addedToBottom });
+}
+
+void ContentWidget::setInnerTopReserve(int reserve) {
+	if (_innerTopReserve != reserve) {
+		_innerTopReserve = reserve;
+		if (_innerWrap) {
+			updateInnerPadding();
+		}
+	}
+}
+
+void ContentWidget::setupFlexibleRegularScroll(
+		not_null<Ui::RpWidget*> inner,
+		not_null<Ui::RpWidget*> pinnedToTop) {
+	SetupFlexibleRegularScroll(
+		_scroll.data(),
+		inner,
+		pinnedToTop,
+		[=](int skip) { setScrollTopSkip(skip); },
+		[=](int reserve) { setInnerTopReserve(reserve); },
+		[=](QMargins padding) { setPaintPadding(padding); },
+		[=](rpl::producer<not_null<QEvent*>> events) {
+			setViewport(std::move(events));
+		});
+}
+
 void ContentWidget::applyMaxVisibleHeight(int maxVisibleHeight) {
 	if (_maxVisibleHeight != maxVisibleHeight) {
 		_maxVisibleHeight = maxVisibleHeight;
@@ -221,6 +343,7 @@ rpl::producer<int> ContentWidget::desiredHeightValue() const {
 	//) | rpl::map(_1 + _2 + _3);
 	) | rpl::map([=](int desired, int, int) {
 		return desired
+			+ _innerTopReserve
 			+ _scrollTopSkip.current()
 			+ _scrollBottomSkip.current();
 	});
@@ -273,6 +396,7 @@ QRect ContentWidget::floatPlayerAvailableRect() const {
 void ContentWidget::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
 	const auto peer = _controller->key().peer();
 	const auto topic = _controller->key().topic();
+	const auto sublist = _controller->key().sublist();
 	if (!peer && !topic) {
 		return;
 	}
@@ -282,12 +406,26 @@ void ContentWidget::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
 		Dialogs::EntryState{
 			.key = (topic
 				? Dialogs::Key{ topic }
+				: sublist
+				? Dialogs::Key{ sublist }
 				: Dialogs::Key{ peer->owner().history(peer) }),
 			.section = Dialogs::EntryState::Section::Profile,
 		},
 		addAction);
 }
 
+void ContentWidget::checkBeforeCloseByEscape(Fn<void()> close) {
+	if (_searchField) {
+		if (!_searchField->empty()) {
+			_searchField->setText({});
+		} else {
+			close();
+		}
+	} else {
+		close();
+	}
+}
+
 rpl::producer<SelectedItems> ContentWidget::selectedListValue() const {
 	return rpl::single(SelectedItems(Storage::SharedMediaType::Photo));
 }
@@ -300,7 +438,7 @@ void ContentWidget::setViewport(
 		rpl::producer<not_null<QEvent*>> &&events) const {
 	std::move(
 		events
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		_scroll->viewportEvent(e);
 	}, _scroll->lifetime());
 }
@@ -314,6 +452,14 @@ void ContentWidget::saveChanges(FnMut<void()> done) {
 	done();
 }
 
+SendMenu::Details ContentWidget::sendMenuDetails() const {
+	return {};
+}
+
+bool ContentWidget::processChosenSticker(ChatHelpers::FileChosen &&) {
+	return false;
+}
+
 void ContentWidget::refreshSearchField(bool shown) {
 	auto search = _controller->searchFieldController();
 	if (search && shown) {
@@ -325,14 +471,14 @@ void ContentWidget::refreshSearchField(bool shown) {
 
 		const auto view = _searchWrap.get();
 		widthValue(
-		) | rpl::start_with_next([=](int newWidth) {
+		) | rpl::on_next([=](int newWidth) {
 			view->resizeToWidth(newWidth);
 			view->moveToLeft(0, 0);
 		}, view->lifetime());
 		view->show();
 		_searchField->setFocus();
 		setScrollTopSkip(view->heightNoMargins() - st::lineWidth);
-	} else {
+	} else if (_searchWrap) {
 		if (Ui::InFocusChain(this)) {
 			setFocus();
 		}
@@ -349,7 +495,7 @@ rpl::producer<int> ContentWidget::scrollBottomSkipValue() const {
 	return _scrollBottomSkip.value();
 }
 
-rpl::producer<bool> ContentWidget::desiredBottomShadowVisibility() const {
+rpl::producer<bool> ContentWidget::desiredBottomShadowVisibility() {
 	using namespace rpl::mappers;
 	return rpl::combine(
 		_scroll->scrollTopValue(),
@@ -364,23 +510,107 @@ not_null<Ui::ScrollArea*> ContentWidget::scroll() const {
 	return _scroll.data();
 }
 
+void ContentWidget::replaceSwipeHandler(
+		Ui::Controls::SwipeHandlerArgs *incompleteArgs) {
+	_swipeHandlerLifetime.destroy();
+	auto args = std::move(*incompleteArgs);
+	args.widget = _innerWrap;
+	args.scroll = _scroll.data();
+	args.onLifetime = &_swipeHandlerLifetime;
+	Ui::Controls::SetupSwipeHandler(std::move(args));
+}
+
+void ContentWidget::setupSwipeHandler(not_null<Ui::RpWidget*> widget) {
+	_swipeHandlerLifetime.destroy();
+
+	auto update = [=](Ui::Controls::SwipeContextData data) {
+		if (data.translation > 0) {
+			if (!_swipeBackData.callback) {
+				_swipeBackData = Ui::Controls::SetupSwipeBack(
+					this,
+					[]() -> std::pair<QColor, QColor> {
+						return {
+							st::historyForwardChooseBg->c,
+							st::historyForwardChooseFg->c,
+						};
+					});
+			}
+			_swipeBackData.callback(data);
+			return;
+		} else if (_swipeBackData.lifetime) {
+			_swipeBackData = {};
+		}
+	};
+
+	auto init = [=](Ui::Controls::SwipeHandlerInitData data) {
+		if (data.direction != Qt::RightToLeft) {
+			return Ui::Controls::SwipeHandlerFinishData();
+		}
+		const auto parent = _controller->parentController();
+		auto action = Fn<void()>();
+		if (_controller->hasBackButton()) {
+			action = [=] {
+				parent->hideLayer();
+				_controller->showBackFromStack();
+			};
+		} else if (_controller->wrap() == Wrap::Side) {
+			action = [=] {
+				parent->closeThirdSection();
+			};
+		} else if (_controller->wrap() == Wrap::Layer) {
+			action = [=] {
+				parent->hideLayer();
+				parent->hideSpecialLayer();
+			};
+		}
+		return action
+			? Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
+				checkBeforeClose(crl::guard(this, action));
+			})
+			: Ui::Controls::SwipeHandlerFinishData();
+	};
+
+	Ui::Controls::SetupSwipeHandler({
+		.widget = widget,
+		.scroll = _scroll.data(),
+		.update = std::move(update),
+		.init = std::move(init),
+		.onLifetime = &_swipeHandlerLifetime,
+	});
+}
+
 Key ContentMemento::key() const {
 	if (const auto topic = this->topic()) {
 		return Key(topic);
+	} else if (const auto sublist = this->sublist()) {
+		return Key(sublist);
 	} else if (const auto peer = this->peer()) {
 		return Key(peer);
 	} else if (const auto poll = this->poll()) {
 		return Key(poll, pollContextId());
 	} else if (const auto self = settingsSelf()) {
 		return Settings::Tag{ self };
-	} else if (const auto peer = storiesPeer()) {
-		return Stories::Tag{ peer, storiesTab() };
-	} else if (const auto peer = statisticsPeer()) {
-		return Statistics::Tag{
-			peer,
-			statisticsContextId(),
-			statisticsStoryId(),
+	} else if (const auto gifts = giftsPeer()) {
+		return PeerGifts::Tag{
+			gifts,
+			giftsCollectionId(),
+		};
+	} else if (const auto stories = storiesPeer()) {
+		return Stories::Tag{
+			stories,
+			storiesAlbumId(),
+			storiesAddToAlbumId(),
 		};
+	} else if (const auto music = musicPeer()) {
+		return Saved::MusicTag{ music };
+	} else if (statisticsTag().peer) {
+		return statisticsTag();
+	} else if (const auto starref = starrefPeer()) {
+		return BotStarRef::Tag(starref, starrefType());
+	} else if (const auto who = reactionsWhoReadIds()) {
+		return Key(who, _reactionsSelected, _pollReactionsContextId);
+	} else if (const auto another = globalMediaSelf()) {
+		return GlobalMedia::Tag{ another };
 	} else {
 		return Downloads::Tag();
 	}
@@ -389,15 +619,17 @@ Key ContentMemento::key() const {
 ContentMemento::ContentMemento(
 	not_null<PeerData*> peer,
 	Data::ForumTopic *topic,
+	Data::SavedSublist *sublist,
 	PeerId migratedPeerId)
 : _peer(peer)
-, _migratedPeerId((!topic && peer->migrateFrom())
+, _migratedPeerId((!topic && !sublist && peer->migrateFrom())
 	? peer->migrateFrom()->id
 	: 0)
-, _topic(topic) {
+, _topic(topic)
+, _sublist(sublist) {
 	if (_topic) {
 		_peer->owner().itemIdChanged(
-		) | rpl::start_with_next([=](const Data::Session::IdChange &change) {
+		) | rpl::on_next([=](const Data::Session::IdChange &change) {
 			if (_topic->rootId() == change.oldId) {
 				_topic = _topic->forum()->topicFor(change.newId.msg);
 			}
@@ -414,13 +646,41 @@ ContentMemento::ContentMemento(Downloads::Tag downloads) {
 
 ContentMemento::ContentMemento(Stories::Tag stories)
 : _storiesPeer(stories.peer)
-, _storiesTab(stories.tab) {
+, _storiesAlbumId(stories.albumId)
+, _storiesAddToAlbumId(stories.addingToAlbumId) {
+}
+
+ContentMemento::ContentMemento(Saved::MusicTag music)
+: _musicPeer(music.peer) {
+}
+
+ContentMemento::ContentMemento(PeerGifts::Tag gifts)
+: _giftsPeer(gifts.peer)
+, _giftsCollectionId(gifts.collectionId) {
 }
 
 ContentMemento::ContentMemento(Statistics::Tag statistics)
-: _statisticsPeer(statistics.peer)
-, _statisticsContextId(statistics.contextId)
-, _statisticsStoryId(statistics.storyId) {
+: _statisticsTag(statistics) {
+}
+
+ContentMemento::ContentMemento(BotStarRef::Tag starref)
+: _starrefPeer(starref.peer)
+, _starrefType(starref.type) {
+}
+
+ContentMemento::ContentMemento(GlobalMedia::Tag global)
+: _globalMediaSelf(global.self) {
+}
+
+ContentMemento::ContentMemento(
+	std::shared_ptr<Api::WhoReadList> whoReadIds,
+	FullMsgId contextId,
+	Data::ReactionId selected)
+: _reactionsWhoReadIds(whoReadIds
+	? whoReadIds
+	: std::make_shared<Api::WhoReadList>())
+, _reactionsSelected(selected)
+, _pollReactionsContextId(contextId) {
 }
 
 } // namespace Info
diff --git a/Telegram/SourceFiles/info/info_content_widget.h b/Telegram/SourceFiles/info/info_content_widget.h
index 7f7cd0f2f8b2ae..592e178a2f2768 100644
--- a/Telegram/SourceFiles/info/info_content_widget.h
+++ b/Telegram/SourceFiles/info/info_content_widget.h
@@ -7,9 +7,14 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include <rpl/variable.h>
-#include "ui/rp_widget.h"
+#include "info/info_flexible_scroll.h"
 #include "info/info_wrap_widget.h"
+#include "info/statistics/info_statistics_tag.h"
+#include "ui/controls/swipe_handler_data.h"
+
+namespace Api {
+struct WhoReadList;
+} // namespace Api
 
 namespace Dialogs::Stories {
 struct Content;
@@ -20,6 +25,9 @@ enum class SharedMediaType : signed char;
 } // namespace Storage
 
 namespace Ui {
+namespace Controls {
+struct SwipeHandlerArgs;
+} // namespace Controls
 class RoundRect;
 class ScrollArea;
 class InputField;
@@ -32,6 +40,14 @@ namespace Ui::Menu {
 struct MenuCallback;
 } // namespace Ui::Menu
 
+namespace ChatHelpers {
+struct FileChosen;
+} // namespace ChatHelpers
+
+namespace SendMenu {
+struct Details;
+} // namespace SendMenu
+
 namespace Info::Settings {
 struct Tag;
 } // namespace Info::Settings
@@ -40,19 +56,36 @@ namespace Info::Downloads {
 struct Tag;
 } // namespace Info::Downloads
 
+namespace Info::Statistics {
+struct Tag;
+} // namespace Info::Statistics
+
+namespace Info::BotStarRef {
+enum class Type : uchar;
+struct Tag;
+} // namespace Info::BotStarRef
+
+namespace Info::GlobalMedia {
+struct Tag;
+} // namespace Info::GlobalMedia
+
+namespace Info::PeerGifts {
+struct Tag;
+} // namespace Info::PeerGifts
+
 namespace Info::Stories {
 struct Tag;
-enum class Tab;
 } // namespace Info::Stories
 
-namespace Info::Statistics {
-struct Tag;
-} // namespace Info::Statistics
+namespace Info::Saved {
+struct MusicTag;
+} // namespace Info::Saved
 
 namespace Info {
 
 class ContentMemento;
 class Controller;
+struct FlexibleScrollData;
 
 class ContentWidget : public Ui::RpWidget {
 public:
@@ -107,6 +140,7 @@ class ContentWidget : public Ui::RpWidget {
 	virtual void checkBeforeClose(Fn<void()> close) {
 		close();
 	}
+	virtual void checkBeforeCloseByEscape(Fn<void()> close);
 	[[nodiscard]] virtual rpl::producer<QString> title() = 0;
 	[[nodiscard]] virtual rpl::producer<QString> subtitle() {
 		return nullptr;
@@ -115,10 +149,18 @@ class ContentWidget : public Ui::RpWidget {
 		-> rpl::producer<Dialogs::Stories::Content>;
 
 	virtual void saveChanges(FnMut<void()> done);
+	[[nodiscard]] virtual SendMenu::Details sendMenuDetails() const;
+	virtual bool processChosenSticker(ChatHelpers::FileChosen &&chosen);
+	virtual bool processZoomKey(not_null<QKeyEvent*> e) {
+		return false;
+	}
 
 	[[nodiscard]] int scrollBottomSkip() const;
 	[[nodiscard]] rpl::producer<int> scrollBottomSkipValue() const;
-	[[nodiscard]] rpl::producer<bool> desiredBottomShadowVisibility() const;
+	[[nodiscard]] virtual auto desiredBottomShadowVisibility()
+		-> rpl::producer<bool>;
+
+	void replaceSwipeHandler(Ui::Controls::SwipeHandlerArgs *incompleteArgs);
 
 protected:
 	template <typename Widget>
@@ -127,6 +169,20 @@ class ContentWidget : public Ui::RpWidget {
 			doSetInnerWidget(std::move(inner)));
 	}
 
+	template <typename Widget>
+	Widget *setupFlexibleInnerWidget(
+			object_ptr<Widget> inner,
+			FlexibleScrollData &flexibleScroll,
+			Fn<void(Ui::RpWidget*)> customSetup = nullptr) {
+		if (!inner->hasFlexibleTopBar()) {
+			return setInnerWidget(std::move(inner));
+		}
+		return static_cast<Widget*>(doSetupFlexibleInnerWidget(
+			std::move(inner),
+			flexibleScroll,
+			std::move(customSetup)));
+	}
+
 	[[nodiscard]] not_null<Controller*> controller() const {
 		return _controller;
 	}
@@ -140,6 +196,10 @@ class ContentWidget : public Ui::RpWidget {
 
 	void setScrollTopSkip(int scrollTopSkip);
 	void setScrollBottomSkip(int scrollBottomSkip);
+	void setInnerTopReserve(int reserve);
+	void setupFlexibleRegularScroll(
+		not_null<Ui::RpWidget*> inner,
+		not_null<Ui::RpWidget*> pinnedToTop);
 	int scrollTopSave() const;
 	void scrollTopRestore(int scrollTop);
 	void scrollTo(const Ui::ScrollToRequest &request);
@@ -150,9 +210,16 @@ class ContentWidget : public Ui::RpWidget {
 	void setViewport(rpl::producer<not_null<QEvent*>> &&events) const;
 
 private:
-	RpWidget *doSetInnerWidget(object_ptr<RpWidget> inner);
+	Ui::RpWidget *doSetInnerWidget(object_ptr<Ui::RpWidget> inner);
+	Ui::RpWidget *doSetupFlexibleInnerWidget(
+		object_ptr<Ui::RpWidget> inner,
+		FlexibleScrollData &flexibleScroll,
+		Fn<void(Ui::RpWidget*)> customSetup);
+
 	void updateControlsGeometry();
 	void refreshSearchField(bool shown);
+	void setupSwipeHandler(not_null<Ui::RpWidget*> widget);
+	void updateInnerPadding();
 
 	virtual std::shared_ptr<ContentMemento> doCreateMemento() = 0;
 
@@ -167,6 +234,9 @@ class ContentWidget : public Ui::RpWidget {
 	base::unique_qptr<Ui::RpWidget> _searchWrap = nullptr;
 	QPointer<Ui::InputField> _searchField;
 	int _innerDesiredHeight = 0;
+	int _innerTopReserve = 0;
+	int _additionalScroll = 0;
+	int _addedHeight = 0;
 	int _maxVisibleHeight = 0;
 	bool _isStackBottom = false;
 
@@ -176,6 +246,9 @@ class ContentWidget : public Ui::RpWidget {
 	// To paint round edges from content.
 	style::margins _paintPadding;
 
+	Ui::Controls::SwipeBackResult _swipeBackData;
+	rpl::lifetime _swipeHandlerLifetime;
+
 };
 
 class ContentMemento {
@@ -183,59 +256,95 @@ class ContentMemento {
 	ContentMemento(
 		not_null<PeerData*> peer,
 		Data::ForumTopic *topic,
+		Data::SavedSublist *sublist,
 		PeerId migratedPeerId);
+	explicit ContentMemento(PeerGifts::Tag gifts);
 	explicit ContentMemento(Settings::Tag settings);
 	explicit ContentMemento(Downloads::Tag downloads);
 	explicit ContentMemento(Stories::Tag stories);
+	explicit ContentMemento(Saved::MusicTag music);
 	explicit ContentMemento(Statistics::Tag statistics);
+	explicit ContentMemento(BotStarRef::Tag starref);
+	explicit ContentMemento(GlobalMedia::Tag global);
 	ContentMemento(not_null<PollData*> poll, FullMsgId contextId)
 	: _poll(poll)
-	, _pollContextId(contextId) {
+	, _pollReactionsContextId(contextId) {
 	}
+	ContentMemento(
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected);
+	virtual ~ContentMemento() = default;
 
-	virtual object_ptr<ContentWidget> createWidget(
+	[[nodiscard]] virtual object_ptr<ContentWidget> createWidget(
 		QWidget *parent,
 		not_null<Controller*> controller,
 		const QRect &geometry) = 0;
 
-	PeerData *peer() const {
+	[[nodiscard]] PeerData *peer() const {
 		return _peer;
 	}
-	PeerId migratedPeerId() const {
+	[[nodiscard]] PeerId migratedPeerId() const {
 		return _migratedPeerId;
 	}
-	Data::ForumTopic *topic() const {
+	[[nodiscard]] Data::ForumTopic *topic() const {
 		return _topic;
 	}
-	UserData *settingsSelf() const {
+	[[nodiscard]] Data::SavedSublist *sublist() const {
+		return _sublist;
+	}
+	[[nodiscard]] UserData *settingsSelf() const {
 		return _settingsSelf;
 	}
-	PeerData *storiesPeer() const {
+	[[nodiscard]] PeerData *storiesPeer() const {
 		return _storiesPeer;
 	}
-	Stories::Tab storiesTab() const {
-		return _storiesTab;
+	[[nodiscard]] int storiesAlbumId() const {
+		return _storiesAlbumId;
+	}
+	[[nodiscard]] int storiesAddToAlbumId() const {
+		return _storiesAddToAlbumId;
 	}
-	PeerData *statisticsPeer() const {
-		return _statisticsPeer;
+	[[nodiscard]] PeerData *musicPeer() const {
+		return _musicPeer;
 	}
-	FullMsgId statisticsContextId() const {
-		return _statisticsContextId;
+	[[nodiscard]] PeerData *giftsPeer() const {
+		return _giftsPeer;
 	}
-	FullStoryId statisticsStoryId() const {
-		return _statisticsStoryId;
+	[[nodiscard]] int giftsCollectionId() const {
+		return _giftsCollectionId;
 	}
-	PollData *poll() const {
+	[[nodiscard]] Statistics::Tag statisticsTag() const {
+		return _statisticsTag;
+	}
+	[[nodiscard]] PeerData *starrefPeer() const {
+		return _starrefPeer;
+	}
+	[[nodiscard]] BotStarRef::Type starrefType() const {
+		return _starrefType;
+	}
+	[[nodiscard]] PollData *poll() const {
 		return _poll;
 	}
-	FullMsgId pollContextId() const {
-		return _pollContextId;
+	[[nodiscard]] FullMsgId pollContextId() const {
+		return _poll ? _pollReactionsContextId : FullMsgId();
 	}
-	Key key() const;
-
-	virtual Section section() const = 0;
+	[[nodiscard]] auto reactionsWhoReadIds() const
+	-> std::shared_ptr<Api::WhoReadList> {
+		return _reactionsWhoReadIds;
+	}
+	[[nodiscard]] Data::ReactionId reactionsSelected() const {
+		return _reactionsSelected;
+	}
+	[[nodiscard]] FullMsgId reactionsContextId() const {
+		return _reactionsWhoReadIds ? _pollReactionsContextId : FullMsgId();
+	}
+	[[nodiscard]] UserData *globalMediaSelf() const {
+		return _globalMediaSelf;
+	}
+	[[nodiscard]] Key key() const;
 
-	virtual ~ContentMemento() = default;
+	[[nodiscard]] virtual Section section() const = 0;
 
 	void setScrollTop(int scrollTop) {
 		_scrollTop = scrollTop;
@@ -246,19 +355,19 @@ class ContentMemento {
 	void setSearchFieldQuery(const QString &query) {
 		_searchFieldQuery = query;
 	}
-	QString searchFieldQuery() const {
+	[[nodiscard]] QString searchFieldQuery() const {
 		return _searchFieldQuery;
 	}
 	void setSearchEnabledByContent(bool enabled) {
 		_searchEnabledByContent = enabled;
 	}
-	bool searchEnabledByContent() const {
+	[[nodiscard]] bool searchEnabledByContent() const {
 		return _searchEnabledByContent;
 	}
 	void setSearchStartsFocused(bool focused) {
 		_searchStartsFocused = focused;
 	}
-	bool searchStartsFocused() const {
+	[[nodiscard]] bool searchStartsFocused() const {
 		return _searchStartsFocused;
 	}
 
@@ -266,14 +375,22 @@ class ContentMemento {
 	PeerData * const _peer = nullptr;
 	const PeerId _migratedPeerId = 0;
 	Data::ForumTopic *_topic = nullptr;
+	Data::SavedSublist *_sublist = nullptr;
 	UserData * const _settingsSelf = nullptr;
 	PeerData * const _storiesPeer = nullptr;
-	Stories::Tab _storiesTab = {};
-	PeerData * const _statisticsPeer = nullptr;
-	const FullMsgId _statisticsContextId;
-	const FullStoryId _statisticsStoryId;
+	int _storiesAlbumId = 0;
+	int _storiesAddToAlbumId = 0;
+	PeerData * const _musicPeer = nullptr;
+	PeerData * const _giftsPeer = nullptr;
+	int _giftsCollectionId = 0;
+	Statistics::Tag _statisticsTag;
+	PeerData * const _starrefPeer = nullptr;
+	BotStarRef::Type _starrefType = {};
 	PollData * const _poll = nullptr;
-	const FullMsgId _pollContextId;
+	std::shared_ptr<Api::WhoReadList> _reactionsWhoReadIds;
+	Data::ReactionId _reactionsSelected;
+	const FullMsgId _pollReactionsContextId;
+	UserData * const _globalMediaSelf = nullptr;
 
 	int _scrollTop = 0;
 	QString _searchFieldQuery;
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index 0cdd4bd610180f..8cd29e80494ed0 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -8,10 +8,12 @@ For license and copyright information please follow this link:
 #include "info/info_controller.h"
 
 #include "ui/search_field_controller.h"
-#include "data/data_shared_media.h"
+#include "history/history.h"
 #include "info/info_content_widget.h"
 #include "info/info_memento.h"
+#include "info/global_media/info_global_media_widget.h"
 #include "info/media/info_media_widget.h"
+#include "info/polls/info_polls_list_widget.h"
 #include "core/application.h"
 #include "data/data_changes.h"
 #include "data/data_peer.h"
@@ -19,7 +21,9 @@ For license and copyright information please follow this link:
 #include "data/data_chat.h"
 #include "data/data_forum_topic.h"
 #include "data/data_forum.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
+#include "data/data_shared_media.h"
 #include "data/data_media_types.h"
 #include "data/data_download_manager.h"
 #include "history/history_item.h"
@@ -34,6 +38,9 @@ Key::Key(not_null<PeerData*> peer) : _value(peer) {
 Key::Key(not_null<Data::ForumTopic*> topic) : _value(topic) {
 }
 
+Key::Key(not_null<Data::SavedSublist*> sublist) : _value(sublist) {
+}
+
 Key::Key(Settings::Tag settings) : _value(settings) {
 }
 
@@ -43,18 +50,39 @@ Key::Key(Downloads::Tag downloads) : _value(downloads) {
 Key::Key(Stories::Tag stories) : _value(stories) {
 }
 
+Key::Key(Saved::MusicTag music) : _value(music) {
+}
+
 Key::Key(Statistics::Tag statistics) : _value(statistics) {
 }
 
+Key::Key(PeerGifts::Tag gifts) : _value(gifts) {
+}
+
+Key::Key(BotStarRef::Tag starref) : _value(starref) {
+}
+
+Key::Key(GlobalMedia::Tag global) : _value(global) {
+}
+
 Key::Key(not_null<PollData*> poll, FullMsgId contextId)
 : _value(PollKey{ poll, contextId }) {
 }
 
+Key::Key(
+	std::shared_ptr<Api::WhoReadList> whoReadIds,
+	Data::ReactionId selected,
+	FullMsgId contextId)
+: _value(ReactionsKey{ whoReadIds, selected, contextId }) {
+}
+
 PeerData *Key::peer() const {
 	if (const auto peer = std::get_if<not_null<PeerData*>>(&_value)) {
 		return *peer;
 	} else if (const auto topic = this->topic()) {
-		return topic->channel();
+		return topic->peer();
+	} else if (const auto sublist = this->sublist()) {
+		return sublist->owningHistory()->peer;
 	}
 	return nullptr;
 }
@@ -67,6 +95,14 @@ Data::ForumTopic *Key::topic() const {
 	return nullptr;
 }
 
+Data::SavedSublist *Key::sublist() const {
+	if (const auto sublist = std::get_if<not_null<Data::SavedSublist*>>(
+			&_value)) {
+		return *sublist;
+	}
+	return nullptr;
+}
+
 UserData *Key::settingsSelf() const {
 	if (const auto tag = std::get_if<Settings::Tag>(&_value)) {
 		return tag->self;
@@ -78,6 +114,10 @@ bool Key::isDownloads() const {
 	return v::is<Downloads::Tag>(_value);
 }
 
+bool Key::isGlobalMedia() const {
+	return v::is<GlobalMedia::Tag>(_value);
+}
+
 PeerData *Key::storiesPeer() const {
 	if (const auto tag = std::get_if<Stories::Tag>(&_value)) {
 		return tag->peer;
@@ -85,32 +125,60 @@ PeerData *Key::storiesPeer() const {
 	return nullptr;
 }
 
-Stories::Tab Key::storiesTab() const {
+int Key::storiesAlbumId() const {
 	if (const auto tag = std::get_if<Stories::Tag>(&_value)) {
-		return tag->tab;
+		return tag->albumId;
 	}
-	return Stories::Tab();
+	return 0;
 }
 
-PeerData *Key::statisticsPeer() const {
-	if (const auto tag = std::get_if<Statistics::Tag>(&_value)) {
+int Key::storiesAddToAlbumId() const {
+	if (const auto tag = std::get_if<Stories::Tag>(&_value)) {
+		return tag->addingToAlbumId;
+	}
+	return 0;
+}
+
+PeerData *Key::musicPeer() const {
+	if (const auto tag = std::get_if<Saved::MusicTag>(&_value)) {
 		return tag->peer;
 	}
 	return nullptr;
 }
 
-FullMsgId Key::statisticsContextId() const {
-	if (const auto tag = std::get_if<Statistics::Tag>(&_value)) {
-		return tag->contextId;
+PeerData *Key::giftsPeer() const {
+	if (const auto tag = std::get_if<PeerGifts::Tag>(&_value)) {
+		return tag->peer;
+	}
+	return nullptr;
+}
+
+int Key::giftsCollectionId() const {
+	if (const auto tag = std::get_if<PeerGifts::Tag>(&_value)) {
+		return tag->collectionId;
 	}
-	return {};
+	return 0;
 }
 
-FullStoryId Key::statisticsStoryId() const {
+Statistics::Tag Key::statisticsTag() const {
 	if (const auto tag = std::get_if<Statistics::Tag>(&_value)) {
-		return tag->storyId;
+		return *tag;
+	}
+	return Statistics::Tag();
+}
+
+PeerData *Key::starrefPeer() const {
+	if (const auto tag = std::get_if<BotStarRef::Tag>(&_value)) {
+		return tag->peer;
 	}
-	return {};
+	return nullptr;
+}
+
+BotStarRef::Type Key::starrefType() const {
+	if (const auto tag = std::get_if<BotStarRef::Tag>(&_value)) {
+		return tag->type;
+	}
+	return BotStarRef::Type();
 }
 
 PollData *Key::poll() const {
@@ -127,6 +195,27 @@ FullMsgId Key::pollContextId() const {
 	return FullMsgId();
 }
 
+std::shared_ptr<Api::WhoReadList> Key::reactionsWhoReadIds() const {
+	if (const auto data = std::get_if<ReactionsKey>(&_value)) {
+		return data->whoReadIds;
+	}
+	return nullptr;
+}
+
+Data::ReactionId Key::reactionsSelected() const {
+	if (const auto data = std::get_if<ReactionsKey>(&_value)) {
+		return data->selected;
+	}
+	return Data::ReactionId();
+}
+
+FullMsgId Key::reactionsContextId() const {
+	if (const auto data = std::get_if<ReactionsKey>(&_value)) {
+		return data->contextId;
+	}
+	return FullMsgId();
+}
+
 rpl::producer<SparseIdsMergedSlice> AbstractController::mediaSource(
 		SparseIdsMergedSlice::UniversalMsgId aroundId,
 		int limitBefore,
@@ -156,6 +245,7 @@ rpl::producer<SparseIdsMergedSlice> AbstractController::mediaSource(
 			SparseIdsMergedSlice::Key(
 				peer()->id,
 				topicId,
+				sublist() ? sublist()->sublistPeer()->id : PeerId(),
 				migratedPeerId(),
 				aroundId),
 			section().mediaType()),
@@ -197,6 +287,19 @@ PollData *AbstractController::poll() const {
 	return nullptr;
 }
 
+auto AbstractController::reactionsWhoReadIds() const
+-> std::shared_ptr<Api::WhoReadList> {
+	return key().reactionsWhoReadIds();
+}
+
+Data::ReactionId AbstractController::reactionsSelected() const {
+	return key().reactionsSelected();
+}
+
+FullMsgId AbstractController::reactionsContextId() const {
+	return key().reactionsContextId();
+}
+
 void AbstractController::showSection(
 		std::shared_ptr<Window::SectionMemento> memento,
 		const Window::SectionShow &params) {
@@ -231,6 +334,10 @@ Controller::Controller(
 	setupTopicViewer();
 }
 
+void Controller::replaceKey(Key key) {
+	_key = key;
+}
+
 void Controller::setupMigrationViewer() {
 	const auto peer = _key.peer();
 	if (_key.topic()
@@ -244,7 +351,7 @@ void Controller::setupMigrationViewer() {
 		Data::PeerUpdate::Flag::Migration
 	) | rpl::filter([=] {
 		return peer->migrateTo() || (peer->migrateFrom() != _migrated);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		replaceWith(std::make_shared<Memento>(peer, _section));
 	}, lifetime());
 }
@@ -265,7 +372,7 @@ void Controller::replaceWith(std::shared_ptr<Memento> memento) {
 
 void Controller::setupTopicViewer() {
 	session().data().itemIdChanged(
-	) | rpl::start_with_next([=](const Data::Session::IdChange &change) {
+	) | rpl::on_next([=](const Data::Session::IdChange &change) {
 		if (const auto topic = _key.topic()) {
 			if (topic->rootId() == change.oldId
 				|| (topic->peer()->id == change.newId.peer
@@ -286,13 +393,20 @@ rpl::producer<Wrap> Controller::wrapValue() const {
 	return _widget->wrapValue();
 }
 
+not_null<Ui::RpWidget*> Controller::wrapWidget() const {
+	return _widget;
+}
+
 bool Controller::validateMementoPeer(
 		not_null<ContentMemento*> memento) const {
 	return memento->peer() == peer()
 		&& memento->migratedPeerId() == migratedPeerId()
 		&& memento->settingsSelf() == settingsSelf()
 		&& memento->storiesPeer() == storiesPeer()
-		&& memento->statisticsPeer() == statisticsPeer();
+		&& memento->musicPeer() == musicPeer()
+		&& memento->statisticsTag().peer == statisticsTag().peer
+		&& memento->starrefPeer() == starrefPeer()
+		&& memento->starrefType() == starrefType();
 }
 
 void Controller::setSection(not_null<ContentMemento*> memento) {
@@ -300,32 +414,43 @@ void Controller::setSection(not_null<ContentMemento*> memento) {
 	updateSearchControllers(memento);
 }
 
+bool Controller::hasBackButton() const {
+	return _widget->hasBackButton();
+}
+
 void Controller::updateSearchControllers(
 		not_null<ContentMemento*> memento) {
 	using Type = Section::Type;
 	const auto type = _section.type();
-	const auto isMedia = (type == Type::Media);
+	const auto isMedia = (type == Type::Media)
+		|| (type == Type::GlobalMedia);
 	const auto mediaType = isMedia
 		? _section.mediaType()
 		: Section::MediaType::kCount;
 	const auto hasMediaSearch = isMedia
 		&& SharedMediaAllowSearch(mediaType);
+	const auto hasRequestsListSearch = (type == Type::RequestsList);
 	const auto hasCommonGroupsSearch = (type == Type::CommonGroups);
 	const auto hasDownloadsSearch = (type == Type::Downloads);
 	const auto hasMembersSearch = (type == Type::Members)
 		|| (type == Type::Profile);
 	const auto searchQuery = memento->searchFieldQuery();
-	if (isMedia) {
+	if (type == Type::Media) {
 		_searchController
 			= std::make_unique<Api::DelayedSearchController>(&session());
-		auto mediaMemento = dynamic_cast<Media::Memento*>(memento.get());
-		Assert(mediaMemento != nullptr);
-		_searchController->restoreState(
-			mediaMemento->searchState());
+		if (auto mediaMemento = dynamic_cast<Media::Memento*>(
+				memento.get())) {
+			_searchController->restoreState(mediaMemento->searchState());
+		} else if (dynamic_cast<Polls::ListMemento*>(memento.get())) {
+			auto state = Api::SearchController::SavedState();
+			state.query = produceSearchQuery(searchQuery);
+			_searchController->restoreState(std::move(state));
+		}
 	} else {
 		_searchController = nullptr;
 	}
 	if (hasMediaSearch
+		|| hasRequestsListSearch
 		|| hasCommonGroupsSearch
 		|| hasDownloadsSearch
 		|| hasMembersSearch) {
@@ -334,7 +459,7 @@ void Controller::updateSearchControllers(
 				searchQuery);
 		if (_searchController) {
 			_searchFieldController->queryValue(
-			) | rpl::start_with_next([=](QString &&query) {
+			) | rpl::on_next([=](QString &&query) {
 				_searchController->setQuery(
 					produceSearchQuery(std::move(query)));
 			}, _searchFieldController->lifetime());
@@ -354,10 +479,10 @@ void Controller::saveSearchState(not_null<ContentMemento*> memento) {
 			_seachEnabledByContent.current());
 	}
 	if (_searchController) {
-		auto mediaMemento = dynamic_cast<Media::Memento*>(
-			memento.get());
-		Assert(mediaMemento != nullptr);
-		mediaMemento->setSearchState(_searchController->saveState());
+		if (auto mediaMemento = dynamic_cast<Media::Memento*>(
+				memento.get())) {
+			mediaMemento->setSearchState(_searchController->saveState());
+		}
 	}
 }
 
@@ -401,7 +526,8 @@ rpl::producer<QString> Controller::mediaSourceQueryValue() const {
 }
 
 rpl::producer<QString> Controller::searchQueryValue() const {
-	return searchFieldController()->queryValue();
+	const auto controller = searchFieldController();
+	return controller ? controller->queryValue() : rpl::single(QString());
 }
 
 rpl::producer<SparseIdsMergedSlice> Controller::mediaSource(
@@ -422,6 +548,7 @@ rpl::producer<SparseIdsMergedSlice> Controller::mediaSource(
 			SparseIdsMergedSlice::Key(
 				query.peerId,
 				query.topicRootId,
+				query.monoforumPeerId,
 				query.migratedPeerId,
 				aroundId),
 			query.type),
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index ee4a7fc3353d4e..14ad24d686a35e 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -7,11 +7,21 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "data/data_message_reaction_id.h"
 #include "data/data_search_controller.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
+#include "info/saved/info_saved_music_common.h"
+#include "info/statistics/info_statistics_tag.h"
+#include "info/stories/info_stories_common.h"
 #include "window/window_session_controller.h"
 
+namespace Api {
+struct WhoReadList;
+} // namespace Api
+
 namespace Data {
 class ForumTopic;
+class SavedSublist;
 } // namespace Data
 
 namespace Ui {
@@ -36,43 +46,32 @@ struct Tag {
 
 } // namespace Info::Downloads
 
-namespace Info::Stories {
-
-enum class Tab {
-	Saved,
-	Archive,
-};
+namespace Info::GlobalMedia {
 
 struct Tag {
-	explicit Tag(not_null<PeerData*> peer, Tab tab = {})
-	: peer(peer)
-	, tab(tab) {
+	explicit Tag(not_null<UserData*> self) : self(self) {
 	}
 
-	not_null<PeerData*> peer;
-	Tab tab = {};
+	not_null<UserData*> self;
 };
 
-} // namespace Info::Stories
+} // namespace Info::GlobalMedia
 
-namespace Info::Statistics {
+namespace Info::BotStarRef {
 
+enum class Type : uchar {
+	Setup,
+	Join,
+};
 struct Tag {
-	explicit Tag(
-		not_null<PeerData*> peer,
-		FullMsgId contextId,
-		FullStoryId storyId)
-	: peer(peer)
-	, contextId(contextId)
-	, storyId(storyId) {
+	Tag(not_null<PeerData*> peer, Type type) : peer(peer), type(type) {
 	}
 
 	not_null<PeerData*> peer;
-	FullMsgId contextId;
-	FullStoryId storyId;
+	Type type = {};
 };
 
-} // namespace Info::Statistics
+} // namespace Info::BotStarRef
 
 namespace Info {
 
@@ -80,37 +79,67 @@ class Key {
 public:
 	explicit Key(not_null<PeerData*> peer);
 	explicit Key(not_null<Data::ForumTopic*> topic);
+	explicit Key(not_null<Data::SavedSublist*> sublist);
 	Key(Settings::Tag settings);
 	Key(Downloads::Tag downloads);
 	Key(Stories::Tag stories);
+	Key(Saved::MusicTag music);
 	Key(Statistics::Tag statistics);
+	Key(PeerGifts::Tag gifts);
+	Key(BotStarRef::Tag starref);
+	Key(GlobalMedia::Tag global);
 	Key(not_null<PollData*> poll, FullMsgId contextId);
+	Key(
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		Data::ReactionId selected,
+		FullMsgId contextId);
 
-	PeerData *peer() const;
-	Data::ForumTopic *topic() const;
-	UserData *settingsSelf() const;
-	bool isDownloads() const;
-	PeerData *storiesPeer() const;
-	Stories::Tab storiesTab() const;
-	PeerData *statisticsPeer() const;
-	FullMsgId statisticsContextId() const;
-	FullStoryId statisticsStoryId() const;
-	PollData *poll() const;
-	FullMsgId pollContextId() const;
+	[[nodiscard]] PeerData *peer() const;
+	[[nodiscard]] Data::ForumTopic *topic() const;
+	[[nodiscard]] Data::SavedSublist *sublist() const;
+	[[nodiscard]] UserData *settingsSelf() const;
+	[[nodiscard]] bool isDownloads() const;
+	[[nodiscard]] bool isGlobalMedia() const;
+	[[nodiscard]] PeerData *storiesPeer() const;
+	[[nodiscard]] int storiesAlbumId() const;
+	[[nodiscard]] int storiesAddToAlbumId() const;
+	[[nodiscard]] PeerData *musicPeer() const;
+	[[nodiscard]] PeerData *giftsPeer() const;
+	[[nodiscard]] int giftsCollectionId() const;
+	[[nodiscard]] Statistics::Tag statisticsTag() const;
+	[[nodiscard]] PeerData *starrefPeer() const;
+	[[nodiscard]] BotStarRef::Type starrefType() const;
+	[[nodiscard]] PollData *poll() const;
+	[[nodiscard]] FullMsgId pollContextId() const;
+	[[nodiscard]] auto reactionsWhoReadIds() const
+		-> std::shared_ptr<Api::WhoReadList>;
+	[[nodiscard]] Data::ReactionId reactionsSelected() const;
+	[[nodiscard]] FullMsgId reactionsContextId() const;
 
 private:
 	struct PollKey {
 		not_null<PollData*> poll;
 		FullMsgId contextId;
 	};
+	struct ReactionsKey {
+		std::shared_ptr<Api::WhoReadList> whoReadIds;
+		Data::ReactionId selected;
+		FullMsgId contextId;
+	};
 	std::variant<
 		not_null<PeerData*>,
 		not_null<Data::ForumTopic*>,
+		not_null<Data::SavedSublist*>,
 		Settings::Tag,
 		Downloads::Tag,
 		Stories::Tag,
+		Saved::MusicTag,
 		Statistics::Tag,
-		PollKey> _value;
+		PeerGifts::Tag,
+		BotStarRef::Tag,
+		GlobalMedia::Tag,
+		PollKey,
+		ReactionsKey> _value;
 
 };
 
@@ -124,16 +153,21 @@ class Section final {
 	enum class Type {
 		Profile,
 		Media,
+		GlobalMedia,
 		CommonGroups,
-		SimilarChannels,
+		SimilarPeers,
+		RequestsList,
+		ReactionsList,
 		SavedSublists,
 		PeerGifts,
 		Members,
 		Settings,
 		Downloads,
 		Stories,
+		SavedMusic,
 		PollResults,
 		Statistics,
+		BotStarRef,
 		Boosts,
 		ChannelEarn,
 		BotEarn,
@@ -142,10 +176,12 @@ class Section final {
 	using MediaType = Storage::SharedMediaType;
 
 	Section(Type type) : _type(type) {
-		Expects(type != Type::Media && type != Type::Settings);
+		Expects(type != Type::Media
+			&& type != Type::GlobalMedia
+			&& type != Type::Settings);
 	}
-	Section(MediaType mediaType)
-	: _type(Type::Media)
+	Section(MediaType mediaType, Type type = Type::Media)
+	: _type(type)
 	, _mediaType(mediaType) {
 	}
 	Section(SettingsType settingsType)
@@ -153,15 +189,15 @@ class Section final {
 	, _settingsType(settingsType) {
 	}
 
-	Type type() const {
+	[[nodiscard]] Type type() const {
 		return _type;
 	}
-	MediaType mediaType() const {
-		Expects(_type == Type::Media);
+	[[nodiscard]] MediaType mediaType() const {
+		Expects(_type == Type::Media || _type == Type::GlobalMedia);
 
 		return _mediaType;
 	}
-	SettingsType settingsType() const {
+	[[nodiscard]] SettingsType settingsType() const {
 		Expects(_type == Type::Settings);
 
 		return _settingsType;
@@ -187,31 +223,53 @@ class AbstractController : public Window::SessionNavigation {
 	[[nodiscard]] Data::ForumTopic *topic() const {
 		return key().topic();
 	}
+	[[nodiscard]] Data::SavedSublist *sublist() const {
+		return key().sublist();
+	}
 	[[nodiscard]] UserData *settingsSelf() const {
 		return key().settingsSelf();
 	}
 	[[nodiscard]] bool isDownloads() const {
 		return key().isDownloads();
 	}
+	[[nodiscard]] bool isGlobalMedia() const {
+		return key().isGlobalMedia();
+	}
 	[[nodiscard]] PeerData *storiesPeer() const {
 		return key().storiesPeer();
 	}
-	[[nodiscard]] Stories::Tab storiesTab() const {
-		return key().storiesTab();
+	[[nodiscard]] int storiesAlbumId() const {
+		return key().storiesAlbumId();
+	}
+	[[nodiscard]] int storiesAddToAlbumId() const {
+		return key().storiesAddToAlbumId();
+	}
+	[[nodiscard]] PeerData *musicPeer() const {
+		return key().musicPeer();
+	}
+	[[nodiscard]] PeerData *giftsPeer() const {
+		return key().giftsPeer();
+	}
+	[[nodiscard]] int giftsCollectionId() const {
+		return key().giftsCollectionId();
 	}
-	[[nodiscard]] PeerData *statisticsPeer() const {
-		return key().statisticsPeer();
+	[[nodiscard]] Statistics::Tag statisticsTag() const {
+		return key().statisticsTag();
 	}
-	[[nodiscard]] FullMsgId statisticsContextId() const {
-		return key().statisticsContextId();
+	[[nodiscard]] PeerData *starrefPeer() const {
+		return key().starrefPeer();
 	}
-	[[nodiscard]] FullStoryId statisticsStoryId() const {
-		return key().statisticsStoryId();
+	[[nodiscard]] BotStarRef::Type starrefType() const {
+		return key().starrefType();
 	}
 	[[nodiscard]] PollData *poll() const;
 	[[nodiscard]] FullMsgId pollContextId() const {
 		return key().pollContextId();
 	}
+	[[nodiscard]] auto reactionsWhoReadIds() const
+		-> std::shared_ptr<Api::WhoReadList>;
+	[[nodiscard]] Data::ReactionId reactionsSelected() const;
+	[[nodiscard]] FullMsgId reactionsContextId() const;
 
 	virtual void setSearchEnabledByContent(bool enabled) {
 	}
@@ -259,12 +317,15 @@ class Controller : public AbstractController {
 		return _section;
 	}
 
-	bool validateMementoPeer(
+	void replaceKey(Key key);
+	[[nodiscard]] bool validateMementoPeer(
 		not_null<ContentMemento*> memento) const;
 
-	Wrap wrap() const;
-	rpl::producer<Wrap> wrapValue() const;
+	[[nodiscard]] Wrap wrap() const;
+	[[nodiscard]] rpl::producer<Wrap> wrapValue() const;
+	[[nodiscard]] not_null<Ui::RpWidget*> wrapWidget() const;
 	void setSection(not_null<ContentMemento*> memento);
+	[[nodiscard]] bool hasBackButton() const;
 
 	Ui::SearchFieldController *searchFieldController() const {
 		return _searchFieldController.get();
diff --git a/Telegram/SourceFiles/info/info_flexible_scroll.cpp b/Telegram/SourceFiles/info/info_flexible_scroll.cpp
new file mode 100644
index 00000000000000..8952095da7e41c
--- /dev/null
+++ b/Telegram/SourceFiles/info/info_flexible_scroll.cpp
@@ -0,0 +1,334 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/info_flexible_scroll.h"
+
+#include "ui/effects/animation_value.h"
+#include "ui/widgets/scroll_area.h"
+#include "base/event_filter.h"
+#include "base/options.h"
+#include "styles/style_info.h"
+
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QScrollBar>
+
+namespace Info {
+namespace {
+
+base::options::toggle ClassicProfileScroll({
+	.id = kClassicProfileScroll,
+	.name = "Use classic profile scroll processing.",
+	.description = "Reverts the profile cover scroll to the previous "
+		"(filler-based) implementation.",
+	.restartRequired = true,
+});
+
+constexpr auto kScrollStepTime = crl::time(260);
+
+} // namespace
+
+const char kClassicProfileScroll[] = "classic-profile-scroll";
+
+bool UseClassicProfileScroll() {
+	return ClassicProfileScroll.value();
+}
+
+void SetupFlexibleRegularScroll(
+		not_null<Ui::ScrollArea*> scroll,
+		not_null<Ui::RpWidget*> inner,
+		not_null<Ui::RpWidget*> pinnedToTop,
+		Fn<void(int)> setScrollTopSkip,
+		Fn<void(int)> setInnerTopReserve,
+		Fn<void(QMargins)> setPaintPadding,
+		Fn<void(rpl::producer<not_null<QEvent*>>)> setViewport) {
+	const auto min = pinnedToTop->minimumHeight();
+	const auto max = pinnedToTop->maximumHeight();
+
+	setScrollTopSkip(min);
+	setInnerTopReserve(max - min);
+	setPaintPadding({ 0, min, 0, 0 });
+	setViewport(pinnedToTop->events(
+	) | rpl::filter([](not_null<QEvent*> e) {
+		return e->type() == QEvent::Wheel;
+	}));
+
+	inner->widthValue(
+	) | rpl::on_next([=](int w) {
+		pinnedToTop->resize(w, pinnedToTop->height());
+	}, pinnedToTop->lifetime());
+
+	const auto applyTop = [=](int top) {
+		const auto height = std::clamp(max - top, min, max);
+		if (pinnedToTop->height() != height) {
+			pinnedToTop->resize(pinnedToTop->width(), height);
+		}
+	};
+	scroll->scrollTopValue(
+	) | rpl::on_next(applyTop, pinnedToTop->lifetime());
+	applyTop(scroll->scrollTop());
+
+	struct State {
+		Ui::Animations::Basic animation;
+		int fromTop = 0;
+		int targetTop = 0;
+		crl::time startTime = 0;
+	};
+	const auto state = scroll->lifetime().make_state<State>();
+	const auto single = scroll->verticalScrollBar()->singleStep()
+		* QApplication::wheelScrollLines();
+	const auto step2 = st::infoProfileTopBarStep2;
+	const auto step1 = (max < st::infoProfileTopBarHeightMax)
+		? (step2 + st::lineWidth)
+		: st::infoProfileTopBarStep1;
+
+	state->animation.init([=](crl::time now) {
+		const auto progress = std::clamp(
+			(now - state->startTime) / float64(kScrollStepTime),
+			0.,
+			1.);
+		scroll->scrollToY(anim::interpolate(
+			state->fromTop,
+			state->targetTop,
+			anim::easeOutQuint(1., progress)));
+		if (progress >= 1.) {
+			state->animation.stop();
+		}
+	});
+	scroll->setCustomWheelProcess([=](not_null<QWheelEvent*> e) {
+		const auto delta = e->angleDelta().y();
+		if (std::abs(delta) != 120 || e->phase() != Qt::NoScrollPhase) {
+			state->animation.stop();
+			return false;
+		}
+		const auto base = state->animation.animating()
+			? state->targetTop
+			: scroll->scrollTop();
+		const auto diff = (delta > 0) ? -single : single;
+		const auto plain = base + diff;
+		const auto anchor = (diff > 0)
+			? ((base == 0)
+				? step1
+				: (base == step1)
+				? step2
+				: plain)
+			: ((plain < step1)
+				? 0
+				: (plain < step2)
+				? step1
+				: plain);
+		state->targetTop = std::clamp(anchor, 0, scroll->scrollTopMax());
+		state->fromTop = scroll->scrollTop();
+		state->startTime = crl::now();
+		if (!state->animation.animating()) {
+			state->animation.start();
+		}
+		return true;
+	});
+}
+
+FlexibleScrollHelper::FlexibleScrollHelper(
+	not_null<Ui::ScrollArea*> scroll,
+	not_null<Ui::RpWidget*> inner,
+	not_null<Ui::RpWidget*> pinnedToTop,
+	Fn<void(QMargins)> setPaintPadding,
+	Fn<void(rpl::producer<not_null<QEvent*>>&&)> setViewport,
+	FlexibleScrollData &data)
+: _scroll(scroll)
+, _inner(inner)
+, _pinnedToTop(pinnedToTop)
+, _setPaintPadding(setPaintPadding)
+, _setViewport(setViewport)
+, _data(data) {
+	setupScrollAnimation();
+	setupScrollHandling();
+}
+
+void FlexibleScrollHelper::setupScrollAnimation() {
+	const auto clearScrollState = [=] {
+		_scrollAnimation.stop();
+		_scrollTopFrom = 0;
+		_scrollTopTo = 0;
+		_timeOffset = 0;
+		_lastScrollApplied = 0;
+	};
+
+	_scrollAnimation.init([=](crl::time now) {
+		const auto progress = float64(now
+			- _scrollAnimation.started()
+			- _timeOffset) / kScrollStepTime;
+		const auto eased = anim::easeOutQuint(1.0, progress);
+		const auto scrollCurrent = anim::interpolate(
+			_scrollTopFrom,
+			_scrollTopTo,
+			std::clamp(eased, 0., 1.));
+		scrollToY(scrollCurrent);
+		_lastScrollApplied = scrollCurrent;
+		if (progress >= 1) {
+			clearScrollState();
+		}
+	});
+}
+
+void FlexibleScrollHelper::setupScrollHandling() {
+	rpl::combine(
+		_pinnedToTop->heightValue(),
+		_inner->heightValue()
+	) | rpl::on_next([=](int, int h) {
+		const auto max = _pinnedToTop->maximumHeight();
+		const auto min = _pinnedToTop->minimumHeight();
+		const auto diff = max - min;
+		const auto progress = (diff > 0)
+			? std::clamp(
+				(_pinnedToTop->height() - min) / float64(diff),
+				0.,
+				1.)
+			: 1.;
+		_data.contentHeightValue.fire(h
+			+ anim::interpolate(diff, 0, progress));
+	}, _pinnedToTop->lifetime());
+
+	const auto singleStep = _scroll->verticalScrollBar()->singleStep()
+		* QApplication::wheelScrollLines();
+	const auto step1 = (_pinnedToTop->maximumHeight()
+			< st::infoProfileTopBarHeightMax)
+		? (st::infoProfileTopBarStep2 + st::lineWidth)
+		: st::infoProfileTopBarStep1;
+	const auto step2 = st::infoProfileTopBarStep2;
+
+	base::install_event_filter(_scroll->verticalScrollBar(), [=](
+			not_null<QEvent*> e) {
+		if (e->type() != QEvent::Wheel) {
+			return base::EventFilterResult::Continue;
+		}
+		const auto wheel = static_cast<QWheelEvent*>(e.get());
+		const auto delta = wheel->angleDelta().y();
+		if (std::abs(delta) != 120 || (wheel->phase() != Qt::NoScrollPhase)) {
+			if (_scrollAnimation.animating()) {
+				_scrollAnimation.stop();
+				_scrollTopFrom = 0;
+				_scrollTopTo = 0;
+				_timeOffset = 0;
+				_lastScrollApplied = 0;
+			}
+			const auto pixels = wheel->pixelDelta().y();
+			_scroll->scrollToY(_scroll->scrollTop()
+				- (pixels ? pixels : delta));
+			return base::EventFilterResult::Cancel;
+		}
+		const auto actualTop = _scroll->scrollTop();
+		const auto animationActive = _scrollAnimation.animating()
+			&& (_lastScrollApplied != _scrollTopTo);
+		const auto top = animationActive
+			? (_lastScrollApplied ? _lastScrollApplied : actualTop)
+			: actualTop;
+		const auto diff = (delta > 0) ? -singleStep : singleStep;
+		const auto previousValue = top;
+		const auto targetTop = top + diff;
+		const auto nextStep = (diff > 0)
+			? ((previousValue == 0)
+				? step1
+				: (previousValue == step1)
+				? step2
+				: -1)
+			: ((targetTop < step1)
+				? 0
+				: (targetTop < step2)
+				? step1
+				: -1);
+		if (animationActive
+			&& ((_scrollTopTo > _scrollTopFrom) != (diff > 0))) {
+			auto overriddenDirection = true;
+			if (_scrollTopTo > _scrollTopFrom) {
+				if (_scrollTopTo == step1) {
+					_scrollTopTo = 0;
+				} else if (_scrollTopTo == step2) {
+					_scrollTopTo = step1;
+				} else {
+					overriddenDirection = false;
+				}
+			} else {
+				if (_scrollTopTo == 0) {
+					_scrollTopTo = step1;
+				} else if (_scrollTopTo == step1) {
+					_scrollTopTo = step2;
+				} else {
+					overriddenDirection = false;
+				}
+			}
+			if (overriddenDirection) {
+				_timeOffset = crl::now() - _scrollAnimation.started();
+				_scrollTopFrom = _lastScrollApplied
+					? _lastScrollApplied
+					: top;
+				return base::EventFilterResult::Cancel;
+			} else {
+				_scrollAnimation.stop();
+				_scrollTopFrom = 0;
+				_scrollTopTo = 0;
+				_timeOffset = 0;
+				_lastScrollApplied = 0;
+			}
+		}
+		_scrollTopFrom = top;
+		if (!animationActive) {
+			_scrollTopTo = (nextStep != -1) ? nextStep : targetTop;
+			_scrollAnimation.start();
+		} else {
+			if (_scrollTopTo > _scrollTopFrom) {
+				if (_scrollTopTo == step1) {
+					_scrollTopTo = step2;
+				} else {
+					_scrollTopTo += diff;
+				}
+			} else {
+				if (_scrollTopTo == step2) {
+					_scrollTopTo = step1;
+				} else if (_scrollTopTo == step1) {
+					_scrollTopTo = 0;
+				} else {
+					_scrollTopTo += diff;
+				}
+			}
+			_timeOffset = crl::now() - _scrollAnimation.started();
+		}
+		return base::EventFilterResult::Cancel;
+	}, _filterLifetime);
+
+	_scroll->scrollTopValue() | rpl::on_next([=](int top) {
+		applyScrollToPinnedLayout(top);
+	}, _inner->lifetime());
+
+	_data.fillerWidthValue.events(
+	) | rpl::on_next([=](int w) {
+		_inner->resizeToWidth(w);
+	}, _inner->lifetime());
+
+	_setPaintPadding({ 0, _pinnedToTop->minimumHeight(), 0, 0 });
+	_setViewport(_pinnedToTop->events(
+	) | rpl::filter([](not_null<QEvent*> e) {
+		return e->type() == QEvent::Wheel;
+	}));
+}
+
+void FlexibleScrollHelper::scrollToY(int scrollCurrent) {
+	applyScrollToPinnedLayout(scrollCurrent);
+	_scroll->scrollToY(scrollCurrent);
+}
+
+void FlexibleScrollHelper::applyScrollToPinnedLayout(int scrollCurrent) {
+	const auto top = std::min(scrollCurrent, _scroll->scrollTopMax());
+	const auto minimumHeight = _pinnedToTop->minimumHeight();
+	const auto current = _pinnedToTop->maximumHeight()
+		- minimumHeight
+		- top;
+	_inner->moveToLeft(0, std::min(0, current));
+	_pinnedToTop->resize(
+		_pinnedToTop->width(),
+		std::max(current + minimumHeight, 0));
+}
+
+} // namespace Info
diff --git a/Telegram/SourceFiles/info/info_flexible_scroll.h b/Telegram/SourceFiles/info/info_flexible_scroll.h
new file mode 100644
index 00000000000000..a9f014f5208cd7
--- /dev/null
+++ b/Telegram/SourceFiles/info/info_flexible_scroll.h
@@ -0,0 +1,66 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/scroll_area.h"
+#include "ui/effects/animations.h"
+#include "ui/rp_widget.h"
+
+namespace Info {
+
+extern const char kClassicProfileScroll[];
+
+[[nodiscard]] bool UseClassicProfileScroll();
+
+void SetupFlexibleRegularScroll(
+	not_null<Ui::ScrollArea*> scroll,
+	not_null<Ui::RpWidget*> inner,
+	not_null<Ui::RpWidget*> pinnedToTop,
+	Fn<void(int)> setScrollTopSkip,
+	Fn<void(int)> setInnerTopReserve,
+	Fn<void(QMargins)> setPaintPadding,
+	Fn<void(rpl::producer<not_null<QEvent*>>)> setViewport);
+
+struct FlexibleScrollData {
+	rpl::event_stream<int> contentHeightValue;
+	rpl::event_stream<int> fillerWidthValue;
+	rpl::event_stream<> backButtonEnables;
+};
+
+class FlexibleScrollHelper final {
+public:
+	FlexibleScrollHelper(
+		not_null<Ui::ScrollArea*> scroll,
+		not_null<Ui::RpWidget*> inner,
+		not_null<Ui::RpWidget*> pinnedToTop,
+		Fn<void(QMargins)> setPaintPadding,
+		Fn<void(rpl::producer<not_null<QEvent*>>&&)> setViewport,
+		FlexibleScrollData &data);
+
+private:
+	void setupScrollAnimation();
+	void setupScrollHandling();
+	void scrollToY(int value);
+	void applyScrollToPinnedLayout(int scrollCurrent);
+
+	const not_null<Ui::ScrollArea*> _scroll;
+	const not_null<Ui::RpWidget*> _inner;
+	const not_null<Ui::RpWidget*> _pinnedToTop;
+	const Fn<void(QMargins)> _setPaintPadding;
+	const Fn<void(rpl::producer<not_null<QEvent*>>&&)> _setViewport;
+	FlexibleScrollData &_data;
+
+	Ui::Animations::Basic _scrollAnimation;
+	int _scrollTopFrom = 0;
+	int _scrollTopTo = 0;
+	crl::time _timeOffset = 0;
+	int _lastScrollApplied = 0;
+	rpl::lifetime _filterLifetime;
+};
+
+} // namespace Info
diff --git a/Telegram/SourceFiles/info/info_layer_widget.cpp b/Telegram/SourceFiles/info/info_layer_widget.cpp
index 3404cf932c183c..361c41e22f00ae 100644
--- a/Telegram/SourceFiles/info/info_layer_widget.cpp
+++ b/Telegram/SourceFiles/info/info_layer_widget.cpp
@@ -31,6 +31,7 @@ LayerWidget::LayerWidget(
 	not_null<Memento*> memento)
 : _controller(controller)
 , _contentWrap(this, controller, Wrap::Layer, memento) {
+	controller->registerActiveLayerSection(_contentWrap.data());
 	setupHeightConsumers();
 	controller->window().replaceFloatPlayerDelegate(floatPlayerDelegate());
 }
@@ -40,6 +41,7 @@ LayerWidget::LayerWidget(
 	not_null<MoveMemento*> memento)
 : _controller(controller)
 , _contentWrap(memento->takeContent(this, Wrap::Layer)) {
+	controller->registerActiveLayerSection(_contentWrap.data());
 	setupHeightConsumers();
 	controller->window().replaceFloatPlayerDelegate(floatPlayerDelegate());
 }
@@ -96,12 +98,12 @@ void LayerWidget::setupHeightConsumers() {
 		}
 		_pendingResize = true;
 		return false;
-	}) | rpl::start_with_next([this] {
+	}) | rpl::on_next([this] {
 		resizeToWidth(width());
 	}, lifetime());
 
 	_contentWrap->grabbingForExpanding(
-	) | rpl::start_with_next([=](bool grabbing) {
+	) | rpl::on_next([=](bool grabbing) {
 		if (grabbing) {
 			_savedHeight = _contentWrapHeight;
 			_savedHeightAnimation = base::take(_heightAnimation);
@@ -113,7 +115,7 @@ void LayerWidget::setupHeightConsumers() {
 	}, lifetime());
 
 	_contentWrap->desiredHeightValue(
-	) | rpl::start_with_next([this](int height) {
+	) | rpl::on_next([this](int height) {
 		if (!height) {
 			// New content arrived.
 			_heightAnimated = _heightAnimation.animating();
@@ -161,6 +163,7 @@ void LayerWidget::parentResized() {
 	if (parentWidth < MinimalSupportedWidth()) {
 		Ui::FocusPersister persister(this);
 		restoreFloatPlayerDelegate();
+		unregisterActiveLayerSection();
 
 		auto memento = std::make_shared<MoveMemento>(std::move(_contentWrap));
 
@@ -247,6 +250,12 @@ bool LayerWidget::closeByOutsideClick() const {
 	return _contentWrap ? _contentWrap->closeByOutsideClick() : true;
 }
 
+bool LayerWidget::closeByBackButton() {
+	return _contentWrap
+		? _contentWrap->closeByBackButton()
+		: Ui::LayerWidget::closeByBackButton();
+}
+
 int LayerWidget::MinimalSupportedWidth() {
 	const auto minimalMargins = 2 * st::infoMinimalLayerMargin;
 	return st::infoMinimalWidth + minimalMargins;
@@ -374,11 +383,19 @@ void LayerWidget::restoreFloatPlayerDelegate() {
 	}
 }
 
+void LayerWidget::unregisterActiveLayerSection() {
+	if (_contentWrap) {
+		_controller->unregisterActiveLayerSection(_contentWrap.data());
+	}
+}
+
 void LayerWidget::closeHook() {
+	unregisterActiveLayerSection();
 	restoreFloatPlayerDelegate();
 }
 
 LayerWidget::~LayerWidget() {
+	unregisterActiveLayerSection();
 	if (!Core::Quitting()) {
 		restoreFloatPlayerDelegate();
 	}
diff --git a/Telegram/SourceFiles/info/info_layer_widget.h b/Telegram/SourceFiles/info/info_layer_widget.h
index df8bc2726dcd2f..07c3cab8e489b5 100644
--- a/Telegram/SourceFiles/info/info_layer_widget.h
+++ b/Telegram/SourceFiles/info/info_layer_widget.h
@@ -41,6 +41,7 @@ class LayerWidget
 		const Window::SectionShow &params) override;
 
 	bool closeByOutsideClick() const override;
+	bool closeByBackButton() override;
 
 	static int MinimalSupportedWidth();
 
@@ -70,6 +71,7 @@ class LayerWidget
 
 	void setupHeightConsumers();
 	void setContentHeight(int height);
+	void unregisterActiveLayerSection();
 	[[nodiscard]] QRect countGeometry(int newWidth);
 
 	not_null<Window::SessionController*> _controller;
diff --git a/Telegram/SourceFiles/info/info_memento.cpp b/Telegram/SourceFiles/info/info_memento.cpp
index a8018f21c99deb..86ec371fe4a909 100644
--- a/Telegram/SourceFiles/info/info_memento.cpp
+++ b/Telegram/SourceFiles/info/info_memento.cpp
@@ -7,14 +7,18 @@ For license and copyright information please follow this link:
 */
 #include "info/info_memento.h"
 
+#include "info/global_media/info_global_media_widget.h"
 #include "info/profile/info_profile_widget.h"
 #include "info/media/info_media_widget.h"
 #include "info/members/info_members_widget.h"
 #include "info/common_groups/info_common_groups_widget.h"
 #include "info/saved/info_saved_sublists_widget.h"
 #include "info/settings/info_settings_widget.h"
-#include "info/similar_channels/info_similar_channels_widget.h"
+#include "info/similar_peers/info_similar_peers_widget.h"
+#include "info/reactions_list/info_reactions_list_widget.h"
+#include "info/requests_list/info_requests_list_widget.h"
 #include "info/peer_gifts/info_peer_gifts_widget.h"
+#include "info/polls/info_polls_list_widget.h"
 #include "info/polls/info_polls_results_widget.h"
 #include "info/info_section_widget.h"
 #include "info/info_layer_widget.h"
@@ -24,6 +28,7 @@ For license and copyright information please follow this link:
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_forum_topic.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "main/main_session.h"
 
@@ -45,6 +50,14 @@ Memento::Memento(not_null<Data::ForumTopic*> topic, Section section)
 : Memento(DefaultStack(topic, section)) {
 }
 
+Memento::Memento(not_null<Data::SavedSublist*> sublist)
+: Memento(sublist, Section::Type::Profile) {
+}
+
+Memento::Memento(not_null<Data::SavedSublist*> sublist, Section section)
+: Memento(DefaultStack(sublist, section)) {
+}
+
 Memento::Memento(Settings::Tag settings, Section section)
 : Memento(DefaultStack(settings, section)) {
 }
@@ -53,17 +66,27 @@ Memento::Memento(not_null<PollData*> poll, FullMsgId contextId)
 : Memento(DefaultStack(poll, contextId)) {
 }
 
+Memento::Memento(
+	std::shared_ptr<Api::WhoReadList> whoReadIds,
+	FullMsgId contextId,
+	Data::ReactionId selected)
+: Memento(DefaultStack(std::move(whoReadIds), contextId, selected)) {
+}
+
 Memento::Memento(std::vector<std::shared_ptr<ContentMemento>> stack)
 : _stack(std::move(stack)) {
 	auto topics = base::flat_set<not_null<Data::ForumTopic*>>();
+	auto sublists = base::flat_set<not_null<Data::SavedSublist*>>();
 	for (auto &entry : _stack) {
 		if (const auto topic = entry->topic()) {
 			topics.emplace(topic);
+		} else if (const auto sublist = entry->sublist()) {
+			sublists.emplace(sublist);
 		}
 	}
 	for (const auto &topic : topics) {
 		topic->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			for (auto i = begin(_stack); i != end(_stack);) {
 				if (i->get()->topic() == topic) {
 					i = _stack.erase(i);
@@ -76,6 +99,21 @@ Memento::Memento(std::vector<std::shared_ptr<ContentMemento>> stack)
 			}
 		}, _lifetime);
 	}
+	for (const auto &sublist : sublists) {
+		sublist->destroyed(
+		) | rpl::on_next([=] {
+			for (auto i = begin(_stack); i != end(_stack);) {
+				if (i->get()->sublist() == sublist) {
+					i = _stack.erase(i);
+				} else {
+					++i;
+				}
+			}
+			if (_stack.empty()) {
+				_removeRequests.fire({});
+			}
+		}, _lifetime);
+	}
 }
 
 std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
@@ -94,6 +132,14 @@ std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
 	return result;
 }
 
+std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
+		not_null<Data::SavedSublist*> sublist,
+		Section section) {
+	auto result = std::vector<std::shared_ptr<ContentMemento>>();
+	result.push_back(DefaultContent(sublist, section));
+	return result;
+}
+
 std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
 		Settings::Tag settings,
 		Section section) {
@@ -112,6 +158,18 @@ std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
 	return result;
 }
 
+std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected) {
+	auto result = std::vector<std::shared_ptr<ContentMemento>>();
+	result.push_back(std::make_shared<ReactionsList::Memento>(
+		std::move(whoReadIds),
+		contextId,
+		selected));
+	return result;
+}
+
 Section Memento::DefaultSection(not_null<PeerData*> peer) {
 	if (peer->savedSublistsInfo()) {
 		return Section(Section::Type::SavedSublists);
@@ -140,17 +198,25 @@ std::shared_ptr<ContentMemento> Memento::DefaultContent(
 			peer,
 			migratedPeerId);
 	case Section::Type::Media:
+		if (section.mediaType() == Storage::SharedMediaType::Poll) {
+			return std::make_shared<Polls::ListMemento>(
+				peer,
+				migratedPeerId);
+		}
 		return std::make_shared<Media::Memento>(
 			peer,
 			migratedPeerId,
 			section.mediaType());
+	case Section::Type::GlobalMedia:
+		return std::make_shared<GlobalMedia::Memento>(
+			peer->asUser(),
+			section.mediaType());
 	case Section::Type::CommonGroups:
 		return std::make_shared<CommonGroups::Memento>(peer->asUser());
-	case Section::Type::SimilarChannels:
-		return std::make_shared<SimilarChannels::Memento>(
-			peer->asChannel());
-	case Section::Type::PeerGifts:
-		return std::make_shared<PeerGifts::Memento>(peer->asUser());
+	case Section::Type::SimilarPeers:
+		return std::make_shared<SimilarPeers::Memento>(peer);
+	case Section::Type::RequestsList:
+		return std::make_shared<RequestsList::Memento>(peer);
 	case Section::Type::SavedSublists:
 		return std::make_shared<Saved::SublistsMemento>(&peer->session());
 	case Section::Type::Members:
@@ -171,6 +237,9 @@ std::shared_ptr<ContentMemento> Memento::DefaultContent(
 	case Section::Type::Profile:
 		return std::make_shared<Profile::Memento>(topic);
 	case Section::Type::Media:
+		if (section.mediaType() == Storage::SharedMediaType::Poll) {
+			return std::make_shared<Polls::ListMemento>(topic);
+		}
 		return std::make_shared<Media::Memento>(topic, section.mediaType());
 	case Section::Type::Members:
 		return std::make_shared<Members::Memento>(peer, migratedPeerId);
@@ -178,6 +247,23 @@ std::shared_ptr<ContentMemento> Memento::DefaultContent(
 	Unexpected("Wrong section type in Info::Memento::DefaultContent()");
 }
 
+std::shared_ptr<ContentMemento> Memento::DefaultContent(
+		not_null<Data::SavedSublist*> sublist,
+		Section section) {
+	switch (section.type()) {
+	case Section::Type::Profile:
+		return std::make_shared<Profile::Memento>(sublist);
+	case Section::Type::Media:
+		if (section.mediaType() == Storage::SharedMediaType::Poll) {
+			return std::make_shared<Polls::ListMemento>(sublist);
+		}
+		return std::make_shared<Media::Memento>(
+			sublist,
+			section.mediaType());
+	}
+	Unexpected("Wrong section type in Info::Memento::DefaultContent()");
+}
+
 object_ptr<Window::SectionWidget> Memento::createWidget(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
diff --git a/Telegram/SourceFiles/info/info_memento.h b/Telegram/SourceFiles/info/info_memento.h
index 3d18296cbb2751..fd0e5946aa91a5 100644
--- a/Telegram/SourceFiles/info/info_memento.h
+++ b/Telegram/SourceFiles/info/info_memento.h
@@ -13,12 +13,18 @@ For license and copyright information please follow this link:
 #include "window/section_memento.h"
 #include "base/object_ptr.h"
 
+namespace Api {
+struct WhoReadList;
+} // namespace Api
+
 namespace Storage {
 enum class SharedMediaType : signed char;
 } // namespace Storage
 
 namespace Data {
 class ForumTopic;
+class SavedSublist;
+struct ReactionId;
 } // namespace Data
 
 namespace Ui {
@@ -44,8 +50,14 @@ class Memento final : public Window::SectionMemento {
 	Memento(not_null<PeerData*> peer, Section section);
 	explicit Memento(not_null<Data::ForumTopic*> topic);
 	Memento(not_null<Data::ForumTopic*> topic, Section section);
+	explicit Memento(not_null<Data::SavedSublist*> sublist);
+	Memento(not_null<Data::SavedSublist*> sublist, Section section);
 	Memento(Settings::Tag settings, Section section);
 	Memento(not_null<PollData*> poll, FullMsgId contextId);
+	Memento(
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected);
 	explicit Memento(std::vector<std::shared_ptr<ContentMemento>> stack);
 
 	object_ptr<Window::SectionWidget> createWidget(
@@ -85,12 +97,19 @@ class Memento final : public Window::SectionMemento {
 	static std::vector<std::shared_ptr<ContentMemento>> DefaultStack(
 		not_null<Data::ForumTopic*> topic,
 		Section section);
+	static std::vector<std::shared_ptr<ContentMemento>> DefaultStack(
+		not_null<Data::SavedSublist*> sublist,
+		Section section);
 	static std::vector<std::shared_ptr<ContentMemento>> DefaultStack(
 		Settings::Tag settings,
 		Section section);
 	static std::vector<std::shared_ptr<ContentMemento>> DefaultStack(
 		not_null<PollData*> poll,
 		FullMsgId contextId);
+	static std::vector<std::shared_ptr<ContentMemento>> DefaultStack(
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected);
 
 	static std::shared_ptr<ContentMemento> DefaultContent(
 		not_null<PeerData*> peer,
@@ -98,6 +117,9 @@ class Memento final : public Window::SectionMemento {
 	static std::shared_ptr<ContentMemento> DefaultContent(
 		not_null<Data::ForumTopic*> topic,
 		Section section);
+	static std::shared_ptr<ContentMemento> DefaultContent(
+		not_null<Data::SavedSublist*> sublist,
+		Section section);
 
 	std::vector<std::shared_ptr<ContentMemento>> _stack;
 	rpl::event_stream<> _removeRequests;
diff --git a/Telegram/SourceFiles/info/info_section_widget.cpp b/Telegram/SourceFiles/info/info_section_widget.cpp
index 0a7b7da6781028..3dc737b486084b 100644
--- a/Telegram/SourceFiles/info/info_section_widget.cpp
+++ b/Telegram/SourceFiles/info/info_section_widget.cpp
@@ -48,7 +48,7 @@ void SectionWidget::init() {
 		_content->desiredHeightValue()
 	) | rpl::filter([=] {
 		return (_content != nullptr);
-	}) | rpl::start_with_next([=](QSize size, int) {
+	}) | rpl::on_next([=](QSize size, int) {
 		const auto expanding = false;
 		const auto full = !_content->scrollBottomSkip();
 		const auto additionalScroll = (full ? st::boxRadius : 0);
@@ -67,7 +67,7 @@ void SectionWidget::init() {
 		controller()->adaptive().oneColumnValue());
 
 	_content->contentChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_connecting->raise();
 	}, _connecting->lifetime());
 }
@@ -112,6 +112,10 @@ bool SectionWidget::showInternal(
 	return _content->showInternal(memento, params);
 }
 
+bool SectionWidget::showBackInternal() {
+	return _content->closeByBackButton();
+}
+
 std::shared_ptr<Window::SectionMemento> SectionWidget::createMemento() {
 	return _content->createMemento();
 }
diff --git a/Telegram/SourceFiles/info/info_section_widget.h b/Telegram/SourceFiles/info/info_section_widget.h
index f53ed505f61365..40b6f7189f17a7 100644
--- a/Telegram/SourceFiles/info/info_section_widget.h
+++ b/Telegram/SourceFiles/info/info_section_widget.h
@@ -44,6 +44,7 @@ class SectionWidget final : public Window::SectionWidget {
 	bool showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
+	bool showBackInternal() override;
 	std::shared_ptr<Window::SectionMemento> createMemento() override;
 
 	object_ptr<Ui::LayerWidget> moveContentToLayer(
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index 0a59d52f2378ec..7f8d4024430a24 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -15,7 +15,6 @@ For license and copyright information please follow this link:
 #include "storage/storage_shared_media.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/peer_list_controllers.h"
-#include "mainwidget.h"
 #include "main/main_session.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
@@ -24,7 +23,6 @@ For license and copyright information please follow this link:
 #include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/search_field_controller.h"
-#include "window/window_peer_menu.h"
 #include "data/data_session.h"
 #include "data/data_channel.h"
 #include "data/data_user.h"
@@ -55,7 +53,7 @@ void TopBar::registerUpdateControlCallback(
 		QObject *guard,
 		Callback &&callback) {
 	_updateControlCallbacks[guard] =[
-		weak = Ui::MakeWeak(guard),
+		weak = base::make_weak(guard),
 		callback = std::forward<Callback>(callback)
 	](anim::type animated) {
 		if (!weak) {
@@ -136,6 +134,7 @@ void TopBar::enableBackButton() {
 		st::infoTopBarScale);
 	_back->setDuration(st::infoTopBarDuration);
 	_back->toggle(!selectionMode(), anim::type::instant);
+	_back->entity()->setAccessibleName(tr::lng_go_back(tr::now));
 	_back->entity()->clicks(
 	) | rpl::to_empty
 	| rpl::start_to_stream(_backClicks, _back->lifetime());
@@ -190,7 +189,7 @@ Ui::FadeWrap<Ui::RpWidget> *TopBar::pushButton(
 		!selectionMode() && !_searchModeEnabled,
 		anim::type::instant);
 	weak->widthValue(
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		updateControlsGeometry(width());
 	}, lifetime());
 	return weak;
@@ -208,6 +207,7 @@ void TopBar::setSearchField(
 		rpl::producer<bool> &&shown,
 		bool startsFocused) {
 	Expects(field != nullptr);
+
 	createSearchView(field.release(), std::move(shown), startsFocused);
 }
 
@@ -215,6 +215,19 @@ void TopBar::clearSearchField() {
 	_searchView = nullptr;
 }
 
+void TopBar::checkBeforeCloseByEscape(Fn<void()> close) {
+	if (_searchModeEnabled) {
+		if (_searchField && !_searchField->empty()) {
+			_searchField->setText({});
+		} else {
+			_searchModeEnabled = false;
+			updateControlsVisibility(anim::type::normal);
+		}
+	} else {
+		close();
+	}
+}
+
 void TopBar::createSearchView(
 		not_null<Ui::InputField*> field,
 		rpl::producer<bool> &&shown,
@@ -245,7 +258,7 @@ void TopBar::createSearchView(
 			*focusLifetime = field->shownValue()
 				| rpl::filter([](bool shown) { return shown; })
 				| rpl::take(1)
-				| rpl::start_with_next([=] { field->setFocus(); });
+				| rpl::on_next([=] { field->setFocus(); });
 		} else {
 			focusLifetime->destroy();
 		}
@@ -253,6 +266,7 @@ void TopBar::createSearchView(
 
 	auto button = base::make_unique_q<Ui::IconButton>(this, _st.search);
 	auto search = button.get();
+	search->setAccessibleName(tr::lng_dlg_filter(tr::now));
 	search->addClickHandler([=] { showSearch(); });
 	auto searchWrap = pushButton(std::move(button));
 	registerToggleControlCallback(searchWrap, [=] {
@@ -264,25 +278,32 @@ void TopBar::createSearchView(
 	auto cancel = Ui::CreateChild<Ui::CrossButton>(
 		wrap,
 		_st.searchRow.fieldCancel);
+	cancel->setAccessibleName(tr::lng_sr_cancel_search(tr::now));
 	registerToggleControlCallback(cancel, [=] {
 		return !selectionMode() && searchMode();
 	});
 
-	auto cancelSearch = [=] {
+	const auto updateCancelName = [=] {
+		const auto hasText = !field->getLastText().isEmpty();
+		cancel->setAccessibleName(hasText
+			? tr::lng_sr_clear_search(tr::now)
+			: tr::lng_sr_cancel_search(tr::now));
+	};
+	field->changes(
+	) | rpl::on_next(updateCancelName, cancel->lifetime());
+	updateCancelName();
+
+	cancel->addClickHandler([=] {
 		if (!field->getLastText().isEmpty()) {
 			field->setText(QString());
 		} else {
 			_searchModeEnabled = false;
 			updateControlsVisibility(anim::type::normal);
 		}
-	};
-
-	cancel->addClickHandler(cancelSearch);
-	field->cancelled(
-	) | rpl::start_with_next(cancelSearch, field->lifetime());
+	});
 
 	wrap->widthValue(
-	) | rpl::start_with_next([=](int newWidth) {
+	) | rpl::on_next([=](int newWidth) {
 		auto availableWidth = newWidth
 			- _st.searchRow.fieldCancelSkip;
 		fieldWrap->resizeToWidth(availableWidth);
@@ -293,7 +314,7 @@ void TopBar::createSearchView(
 	}, wrap->lifetime());
 
 	widthValue(
-	) | rpl::start_with_next([=](int newWidth) {
+	) | rpl::on_next([=](int newWidth) {
 		auto left = _back
 			? _st.back.width
 			: _st.titlePosition.x();
@@ -306,7 +327,7 @@ void TopBar::createSearchView(
 	}, wrap->lifetime());
 
 	field->alive(
-	) | rpl::start_with_done([=] {
+	) | rpl::on_done([=] {
 		field->setParent(nullptr);
 		removeButton(search);
 		clearSearchField();
@@ -317,7 +338,7 @@ void TopBar::createSearchView(
 
 	std::move(
 		shown
-	) | rpl::start_with_next([=](bool visible) {
+	) | rpl::on_next([=](bool visible) {
 		auto alreadyInSearch = !field->getLastText().isEmpty();
 		_searchModeAvailable = visible || alreadyInSearch;
 		updateControlsVisibility(anim::type::instant);
@@ -372,10 +393,17 @@ void TopBar::updateDefaultControlsGeometry(int newWidth) {
 		const auto y = _subtitle
 			? _st.titleWithSubtitlePosition.y()
 			: _st.titlePosition.y();
+		const auto available = std::max(newWidth - right - x, 0);
+		_title->entity()->resizeToWidth(available);
 		_title->moveToLeft(x, y, newWidth);
 		if (_subtitle) {
+			const auto subtitleX = _back
+				? _st.back.width
+				: _st.subtitlePosition.x();
+			_subtitle->entity()->resizeToWidth(
+				std::max(newWidth - right - subtitleX, 0));
 			_subtitle->moveToLeft(
-				_back ? _st.back.width : _st.subtitlePosition.x(),
+				subtitleX,
 				_st.subtitlePosition.y(),
 				newWidth);
 		}
@@ -526,7 +554,7 @@ void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 		stories->setAttribute(Qt::WA_TransparentForMouseEvents);
 		label->setAttribute(Qt::WA_TransparentForMouseEvents);
 		stories->geometryValue(
-		) | rpl::start_with_next([=](QRect geometry) {
+		) | rpl::on_next([=](QRect geometry) {
 			const auto skip = _st.title.style.font->spacew;
 			label->move(
 				geometry.x() + geometry.width() + skip,
@@ -535,7 +563,7 @@ void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 		rpl::combine(
 			_storiesWrap->positionValue(),
 			label->geometryValue()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			button->resize(
 				label->x() + label->width() + _st.titlePosition.x(),
 				_st.height);
@@ -551,7 +579,7 @@ void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 
 		rpl::duplicate(
 			last
-		) | rpl::start_with_next([=](const Content &content) {
+		) | rpl::on_next([=](const Content &content) {
 			const auto count = content.total;
 			if (_storiesCount != count) {
 				const auto was = (_storiesCount > 0);
@@ -571,8 +599,8 @@ void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 			}
 		}, _storiesLifetime);
 
-		_storiesLifetime.add([weak = QPointer<QWidget>(label)] {
-			delete weak.data();
+		_storiesLifetime.add([weak = base::make_weak(label)] {
+			delete weak.get();
 		});
 	} else {
 		_storiesCount = 0;
@@ -580,10 +608,6 @@ void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 	updateControlsVisibility(anim::type::instant);
 }
 
-void TopBar::setStoriesArchive(bool archive) {
-	_storiesArchive = archive;
-}
-
 void TopBar::setSelectedItems(SelectedItems &&items) {
 	auto wasSelectionMode = selectionMode();
 	_selectedItems = std::move(items);
@@ -620,10 +644,25 @@ void TopBar::updateSelectionState() {
 	_canDelete = computeCanDelete();
 	_canForward = computeCanForward();
 	_canUnpinStories = computeCanUnpinStories();
+	_canToggleStoryPin = computeCanToggleStoryPin();
+	_allStoriesInProfile = computeAllStoriesInProfile();
 	_selectionText->entity()->setValue(generateSelectedText());
 	_delete->toggle(_canDelete, anim::type::instant);
 	_forward->toggle(_canForward, anim::type::instant);
 	_toggleStoryInProfile->toggle(_canToggleStoryPin, anim::type::instant);
+	_toggleStoryInProfile->entity()->setIconOverride(
+		(_allStoriesInProfile
+			? &_st.storiesArchive.icon
+			: &_st.storiesSave.icon),
+		(_allStoriesInProfile
+			? &_st.storiesArchive.iconOver
+			: &_st.storiesSave.iconOver));
+	_toggleStoryInProfile->entity()->setAccessibleName(_allStoriesInProfile
+		? tr::lng_mediaview_archive_story(tr::now)
+		: tr::lng_mediaview_save_to_profile(tr::now));
+	_toggleStoryPin->entity()->setAccessibleName(_canUnpinStories
+		? tr::lng_context_unpin_from_top(tr::now)
+		: tr::lng_context_pin_to_top(tr::now));
 	_toggleStoryPin->toggle(_canToggleStoryPin, anim::type::instant);
 	_toggleStoryPin->entity()->setIconOverride(
 		_canUnpinStories ? &_st.storiesUnpin.icon : nullptr,
@@ -644,17 +683,21 @@ void TopBar::createSelectionControls() {
 	_canForward = computeCanForward();
 	_canUnpinStories = computeCanUnpinStories();
 	_canToggleStoryPin = computeCanToggleStoryPin();
+	_allStoriesInProfile = computeAllStoriesInProfile();
 	_cancelSelection = wrap(Ui::CreateChild<Ui::FadeWrap<Ui::IconButton>>(
 		this,
 		object_ptr<Ui::IconButton>(this, _st.mediaCancel),
 		st::infoTopBarScale));
 	_cancelSelection->setDuration(st::infoTopBarDuration);
+	_cancelSelection->entity()->setAccessibleName(
+		tr::lng_context_clear_selection(tr::now));
 	_cancelSelection->entity()->clicks(
 	) | rpl::map_to(
 		SelectionAction::Clear
 	) | rpl::start_to_stream(
 		_selectionActionRequests,
 		_cancelSelection->lifetime());
+
 	_selectionText = wrap(Ui::CreateChild<Ui::FadeWrap<Ui::LabelWithNumbers>>(
 		this,
 		object_ptr<Ui::LabelWithNumbers>(
@@ -665,6 +708,11 @@ void TopBar::createSelectionControls() {
 		st::infoTopBarScale));
 	_selectionText->setDuration(st::infoTopBarDuration);
 	_selectionText->entity()->resize(0, _st.height);
+	_selectionText->naturalWidthValue(
+	) | rpl::skip(1) | rpl::on_next([=] {
+		updateSelectionControlsGeometry(width());
+	}, _selectionText->lifetime());
+
 	_forward = wrap(Ui::CreateChild<Ui::FadeWrap<Ui::IconButton>>(
 		this,
 		object_ptr<Ui::IconButton>(this, _st.mediaForward),
@@ -673,6 +721,8 @@ void TopBar::createSelectionControls() {
 		_forward.data(),
 		[this] { return selectionMode() && _canForward; });
 	_forward->setDuration(st::infoTopBarDuration);
+	_forward->entity()->setAccessibleName(
+		tr::lng_context_forward_selected(tr::now));
 	_forward->entity()->clicks(
 	) | rpl::map_to(
 		SelectionAction::Forward
@@ -689,6 +739,8 @@ void TopBar::createSelectionControls() {
 		_delete.data(),
 		[this] { return selectionMode() && _canDelete; });
 	_delete->setDuration(st::infoTopBarDuration);
+	_delete->entity()->setAccessibleName(
+		tr::lng_context_delete_selected(tr::now));
 	_delete->entity()->clicks(
 	) | rpl::map_to(
 		SelectionAction::Delete
@@ -702,16 +754,21 @@ void TopBar::createSelectionControls() {
 			this,
 			object_ptr<Ui::IconButton>(
 				this,
-				_storiesArchive ? _st.storiesSave : _st.storiesArchive),
+				_allStoriesInProfile ? _st.storiesArchive : _st.storiesSave),
 			st::infoTopBarScale));
 	registerToggleControlCallback(
 		_toggleStoryInProfile.data(),
 		[this] { return selectionMode() && _canToggleStoryPin; });
 	_toggleStoryInProfile->setDuration(st::infoTopBarDuration);
+	_toggleStoryInProfile->entity()->setAccessibleName(_allStoriesInProfile
+		? tr::lng_mediaview_archive_story(tr::now)
+		: tr::lng_mediaview_save_to_profile(tr::now));
 	_toggleStoryInProfile->entity()->clicks(
-	) | rpl::map_to(
-		SelectionAction::ToggleStoryInProfile
-	) | rpl::start_to_stream(
+	) | rpl::map([=] {
+		return _allStoriesInProfile
+			? SelectionAction::ToggleStoryToArchive
+			: SelectionAction::ToggleStoryToProfile;
+	}) | rpl::start_to_stream(
 		_selectionActionRequests,
 		_cancelSelection->lifetime());
 	_toggleStoryInProfile->entity()->setVisible(_canToggleStoryPin);
@@ -732,6 +789,9 @@ void TopBar::createSelectionControls() {
 		_toggleStoryPin.data(),
 		[this] { return selectionMode() && _canToggleStoryPin; });
 	_toggleStoryPin->setDuration(st::infoTopBarDuration);
+	_toggleStoryPin->entity()->setAccessibleName(_canUnpinStories
+		? tr::lng_context_unpin_from_top(tr::now)
+		: tr::lng_context_pin_to_top(tr::now));
 	_toggleStoryPin->entity()->clicks(
 	) | rpl::map_to(
 		SelectionAction::ToggleStoryPin
@@ -761,6 +821,12 @@ bool TopBar::computeCanToggleStoryPin() const {
 		&SelectedItem::canToggleStoryPin);
 }
 
+bool TopBar::computeAllStoriesInProfile() const {
+	return ranges::all_of(
+		_selectedItems.list,
+		&SelectedItem::storyInProfile);
+}
+
 Ui::StringWithNumbers TopBar::generateSelectedText() const {
 	return _selectedItems.title(_selectedItems.list.size());
 }
diff --git a/Telegram/SourceFiles/info/info_top_bar.h b/Telegram/SourceFiles/info/info_top_bar.h
index 2aa1093deb0365..6bd2e7ebbf8c9f 100644
--- a/Telegram/SourceFiles/info/info_top_bar.h
+++ b/Telegram/SourceFiles/info/info_top_bar.h
@@ -63,7 +63,6 @@ class TopBar : public Ui::RpWidget {
 
 	void setTitle(TitleDescriptor descriptor);
 	void setStories(rpl::producer<Dialogs::Stories::Content> content);
-	void setStoriesArchive(bool archive);
 	void enableBackButton();
 	void highlight();
 
@@ -103,6 +102,8 @@ class TopBar : public Ui::RpWidget {
 
 	void showSearch();
 
+	void checkBeforeCloseByEscape(Fn<void()> close);
+
 protected:
 	int resizeGetHeight(int newWidth) override;
 	void paintEvent(QPaintEvent *e) override;
@@ -129,6 +130,7 @@ class TopBar : public Ui::RpWidget {
 	[[nodiscard]] bool computeCanForward() const;
 	[[nodiscard]] bool computeCanUnpinStories() const;
 	[[nodiscard]] bool computeCanToggleStoryPin() const;
+	[[nodiscard]] bool computeAllStoriesInProfile() const;
 	void updateSelectionState();
 	void createSelectionControls();
 
@@ -176,7 +178,7 @@ class TopBar : public Ui::RpWidget {
 	bool _canForward = false;
 	bool _canToggleStoryPin = false;
 	bool _canUnpinStories = false;
-	bool _storiesArchive = false;
+	bool _allStoriesInProfile = false;
 	QPointer<Ui::FadeWrap<Ui::IconButton>> _cancelSelection;
 	QPointer<Ui::FadeWrap<Ui::LabelWithNumbers>> _selectionText;
 	QPointer<Ui::FadeWrap<Ui::IconButton>> _forward;
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 992f9f4950c320..fa907c21158c27 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -10,22 +10,25 @@ For license and copyright information please follow this link:
 #include "info/profile/info_profile_widget.h"
 #include "info/profile/info_profile_values.h"
 #include "info/media/info_media_widget.h"
+#include "info/stories/info_stories_widget.h"
 #include "info/info_content_widget.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "info/info_top_bar.h"
 #include "settings/cloud_password/settings_cloud_password_email_confirm.h"
-#include "settings/settings_chat.h"
-#include "settings/settings_information.h"
-#include "settings/settings_main.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_chat.h"
+#include "settings/sections/settings_information.h"
+#include "settings/sections/settings_main.h"
+#include "settings/sections/settings_premium.h"
+#include "settings/settings_search.h"
 #include "ui/effects/ripple_animation.h" // MaskByDrawer.
 #include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/menu/menu_item_base.h"
 #include "ui/widgets/discrete_sliders.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/popup_menu.h"
-#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/search_field_controller.h"
 #include "ui/ui_utility.h"
@@ -47,6 +50,7 @@ For license and copyright information please follow this link:
 #include "mainwidget.h"
 #include "lang/lang_keys.h"
 #include "lang/lang_numbers_animation.h"
+#include "menu/menu_send.h"
 #include "styles/style_chat.h" // popupMenuExpandedSeparator
 #include "styles/style_info.h"
 #include "styles/style_profile.h"
@@ -64,8 +68,14 @@ const style::InfoTopBar &TopBarStyle(Wrap wrap) {
 
 [[nodiscard]] bool HasCustomTopBar(not_null<const Controller*> controller) {
 	const auto section = controller->section();
-	return (section.type() == Section::Type::Settings)
-		&& section.settingsType()->hasCustomTopBar();
+	return (section.type() == Section::Type::BotStarRef)
+		|| (section.type() == Section::Type::Profile)
+		|| ((section.type() == Section::Type::Settings)
+			&& section.settingsType()->hasCustomTopBar())
+		|| (section.type() == Section::Type::Stories
+			&& controller->key().storiesAlbumId() != Stories::ArchiveId()
+			&& controller->key().storiesPeer()
+			&& controller->key().storiesPeer()->isSelf());
 }
 
 [[nodiscard]] Fn<Ui::StringWithNumbers(int)> SelectedTitleForMedia(
@@ -82,6 +92,7 @@ const style::InfoTopBar &TopBarStyle(Wrap wrap) {
 			case Type::Link: return tr::lng_media_selected_link;
 			case Type::RoundVoiceFile: return tr::lng_media_selected_audio;
 			case Type::PhotoVideo: return tr::lng_stories_row_count;
+			case Type::Poll: return tr::lng_media_selected_poll;
 			}
 			Unexpected("Type in TopBar::generateSelectedText()");
 		}()(tr::now, lt_count, count, Ui::StringWithNumbers::FromString);
@@ -105,6 +116,8 @@ WrapWidget::WrapWidget(
 	Wrap wrap,
 	not_null<Memento*> memento)
 : SectionWidget(parent, window, rpl::producer<PeerData*>())
+, _isSeparatedWindow(
+	window->windowId().type == Window::SeparateType::SharedMedia)
 , _wrap(wrap)
 , _controller(createController(window, memento->content()))
 , _topShadow(this)
@@ -120,12 +133,12 @@ WrapWidget::WrapWidget(
 		) | rpl::flatten_latest() | rpl::distinct_until_changed());
 
 	_wrap.changes(
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		setupTop();
 		finishShowContent();
 	}, lifetime());
 	selectedListValue(
-	) | rpl::start_with_next([this](SelectedItems &&items) {
+	) | rpl::on_next([this](SelectedItems &&items) {
 		InvokeQueued(this, [this, items = std::move(items)]() mutable {
 			if (_topBar) {
 				_topBar->setSelectedItems(std::move(items));
@@ -136,7 +149,7 @@ WrapWidget::WrapWidget(
 
 	if (const auto topic = _controller->topic()) {
 		topic->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (_wrap.current() == Wrap::Layer) {
 				_controller->parentController()->hideSpecialLayer();
 			} else if (_wrap.current() == Wrap::Narrow) {
@@ -152,15 +165,30 @@ WrapWidget::WrapWidget(
 }
 
 void WrapWidget::setupShortcuts() {
+	const auto isSettings = [=] {
+		return _controller->section().type() == Section::Type::Settings;
+	};
+	const auto isSearchSettings = [=] {
+		return isSettings()
+			&& (_controller->section().settingsType()
+				== ::Settings::Search::Id());
+	};
+
 	Shortcuts::Requests(
 	) | rpl::filter([=] {
-		return requireTopBarSearch()
-			&& (Core::App().activeWindow()
-				== &_controller->parentController()->window());
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+		return (Core::App().activeWindow()
+				== &_controller->parentController()->window())
+			&& (requireTopBarSearch() || isSettings());
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(Command::Search) && request->handle([=] {
-			_topBar->showSearch();
+			if (requireTopBarSearch()) {
+				_topBar->showSearch();
+			} else if (isSearchSettings()) {
+				_content->setInnerFocus();
+			} else if (isSettings()) {
+				_controller->showSettings(::Settings::Search::Id());
+			}
 			return true;
 		});
 	}, lifetime());
@@ -196,7 +224,7 @@ void WrapWidget::startInjectingActivePeerProfiles() {
 		(_1 == Wrap::Side) && _2
 	) | rpl::map(
 		_2
-	) | rpl::start_with_next([this](Dialogs::Key key) {
+	) | rpl::on_next([this](Dialogs::Key key) {
 		injectActiveProfile(key);
 	}, lifetime());
 
@@ -217,7 +245,8 @@ void WrapWidget::injectActivePeerProfile(not_null<PeerData*> peer) {
 		: _controller->section().type();
 	const auto firstSectionMediaType = [&] {
 		if (firstSectionType == Section::Type::Profile
-			|| firstSectionType == Section::Type::SavedSublists) {
+			|| firstSectionType == Section::Type::SavedSublists
+			|| firstSectionType == Section::Type::Downloads) {
 			return Section::MediaType::kCount;
 		}
 		return hasStackHistory()
@@ -282,15 +311,25 @@ Dialogs::RowDescriptor WrapWidget::activeChat() const {
 			peer->owner().history(peer),
 			FullMsgId());
 	} else if (const auto storiesPeer = key().storiesPeer()) {
-		return (key().storiesTab() == Stories::Tab::Saved)
-			? Dialogs::RowDescriptor(
+		return (key().storiesAlbumId() == Stories::ArchiveId())
+			? Dialogs::RowDescriptor()
+			: Dialogs::RowDescriptor(
 				storiesPeer->owner().history(storiesPeer),
-				FullMsgId())
-			: Dialogs::RowDescriptor();
+				FullMsgId());
+	} else if (const auto giftsPeer = key().giftsPeer()) {
+		return Dialogs::RowDescriptor(
+			giftsPeer->owner().history(giftsPeer),
+			FullMsgId());
+	} else if (const auto musicPeer = key().musicPeer()) {
+		return Dialogs::RowDescriptor(
+			musicPeer->owner().history(musicPeer),
+			FullMsgId());
 	} else if (key().settingsSelf()
 			|| key().isDownloads()
+			|| key().reactionsContextId()
 			|| key().poll()
-			|| key().statisticsPeer()) {
+			|| key().starrefPeer()
+			|| key().statisticsTag().peer) {
 		return Dialogs::RowDescriptor();
 	}
 	Unexpected("Owner in WrapWidget::activeChat().");
@@ -306,7 +345,9 @@ void WrapWidget::forceContentRepaint() {
 }
 
 void WrapWidget::setupTop() {
-	if (HasCustomTopBar(_controller.get())) {
+	if (HasCustomTopBar(_controller.get())
+		|| wrap() == Wrap::Search
+		|| wrap() == Wrap::StoryAlbumEdit) {
 		_topBar.destroy();
 		return;
 	}
@@ -324,14 +365,14 @@ void WrapWidget::createTopBar() {
 		TopBarStyle(wrapValue),
 		std::move(selectedItems));
 	_topBar->selectionActionRequests(
-	) | rpl::start_with_next([=](SelectionAction action) {
+	) | rpl::on_next([=](SelectionAction action) {
 		_content->selectionAction(action);
 	}, _topBar->lifetime());
 
 	if (hasBackButton()) {
 		_topBar->enableBackButton();
 		_topBar->backRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			checkBeforeClose([=] { _controller->showBackFromStack(); });
 		}, _topBar->lifetime());
 	} else if (wrapValue == Wrap::Side) {
@@ -339,11 +380,12 @@ void WrapWidget::createTopBar() {
 			base::make_unique_q<Ui::IconButton>(
 				_topBar,
 				st::infoTopBarClose));
+		close->setAccessibleName(tr::lng_sr_close_panel(tr::now));
 		close->addClickHandler([this] {
 			_controller->parentController()->closeThirdSection();
 		});
 	}
-	_topBar->storyClicks() | rpl::start_with_next([=] {
+	_topBar->storyClicks() | rpl::on_next([=] {
 		if (const auto peer = _controller->key().peer()) {
 			_controller->parentController()->openPeerStories(peer->id);
 		}
@@ -353,6 +395,7 @@ void WrapWidget::createTopBar() {
 			base::make_unique_q<Ui::IconButton>(
 				_topBar,
 				st::infoLayerTopBarClose));
+		close->setAccessibleName(tr::lng_sr_close_panel(tr::now));
 		close->addClickHandler([this] {
 			checkBeforeClose([=] {
 				_controller->parentController()->hideSpecialLayer();
@@ -379,6 +422,7 @@ void WrapWidget::setupTopBarMenuToggle() {
 	if (!_topBar) {
 		return;
 	}
+	const auto key = _controller->key();
 	const auto section = _controller->section();
 	if (section.type() == Section::Type::Profile
 		&& (wrap() != Wrap::Side || hasStackHistory())) {
@@ -386,8 +430,17 @@ void WrapWidget::setupTopBarMenuToggle() {
 		addProfileCallsButton();
 	} else if (section.type() == Section::Type::Settings) {
 		addTopBarMenuButton();
-		if (section.settingsType() == ::Settings::Information::Id()
-			|| section.settingsType() == ::Settings::Main::Id()) {
+		if (section.settingsType() == ::Settings::MainId()) {
+			const auto &st = (wrap() == Wrap::Layer)
+				? st::infoLayerTopBarSearch
+				: st::infoTopBarSearch;
+			const auto button = _topBar->addButton(
+				base::make_unique_q<Ui::IconButton>(_topBar, st));
+			button->setAccessibleName(tr::lng_dlg_filter(tr::now));
+			button->addClickHandler([=] {
+				_controller->showSettings(::Settings::Search::Id());
+			});
+		} else if (section.settingsType() == ::Settings::InformationId()) {
 			const auto controller = _controller->parentController();
 			const auto self = controller->session().user();
 			if (!self->username().isEmpty()) {
@@ -397,12 +450,26 @@ void WrapWidget::setupTopBarMenuToggle() {
 					: st::infoTopBarQr;
 				const auto button = _topBar->addButton(
 					base::make_unique_q<Ui::IconButton>(_topBar, st));
+				button->setAccessibleName(tr::lng_group_invite_context_qr(tr::now));
 				button->addClickHandler([show, self] {
-					show->show(
-						Box(Ui::FillPeerQrBox, self, std::nullopt, nullptr));
+					Ui::DefaultShowFillPeerQrBoxCallback(show, self);
 				});
 			}
 		}
+		setupShortcuts();
+	} else if (key.storiesPeer()
+		&& key.storiesPeer()->isSelf()
+		&& key.storiesAlbumId() != Stories::ArchiveId()) {
+		const auto &st = (wrap() == Wrap::Layer)
+			? st::infoLayerTopBarEdit
+			: st::infoTopBarEdit;
+		const auto button = _topBar->addButton(
+			base::make_unique_q<Ui::IconButton>(_topBar, st));
+		button->addClickHandler([=] {
+			_controller->showSettings(::Settings::InformationId());
+		});
+	} else if (section.type() == Section::Type::Media) {
+		addTopBarMenuButton();
 	} else if (section.type() == Section::Type::Downloads) {
 		auto &manager = Core::App().downloadManager();
 		rpl::merge(
@@ -410,7 +477,7 @@ void WrapWidget::setupTopBarMenuToggle() {
 			manager.loadingListChanges() | rpl::map_to(false),
 			manager.loadedAdded() | rpl::map_to(true),
 			manager.loadedRemoved() | rpl::map_to(false)
-		) | rpl::start_with_next([=, &manager](bool definitelyHas) {
+		) | rpl::on_next([=, &manager](bool definitelyHas) {
 			const auto has = [&] {
 				for ([[maybe_unused]] const auto id : manager.loadingList()) {
 					return true;
@@ -426,6 +493,8 @@ void WrapWidget::setupTopBarMenuToggle() {
 				addTopBarMenuButton();
 			}
 		}, _topBar->lifetime());
+	} else if (key.giftsPeer()) {
+		addTopBarMenuButton();
 	}
 }
 
@@ -436,6 +505,20 @@ void WrapWidget::checkBeforeClose(Fn<void()> close) {
 	}));
 }
 
+void WrapWidget::checkBeforeCloseByEscape(Fn<void()> close) {
+	if (_topBar) {
+		_topBar->checkBeforeCloseByEscape([&] {
+			_content->checkBeforeCloseByEscape(crl::guard(this, [=] {
+				WrapWidget::checkBeforeClose(close);
+			}));
+		});
+	} else {
+		_content->checkBeforeCloseByEscape(crl::guard(this, [=] {
+			WrapWidget::checkBeforeClose(close);
+		}));
+	}
+}
+
 void WrapWidget::addTopBarMenuButton() {
 	Expects(_topBar != nullptr);
 	Expects(_content != nullptr);
@@ -454,9 +537,23 @@ void WrapWidget::addTopBarMenuButton() {
 			(wrap() == Wrap::Layer
 				? st::infoLayerTopBarMenu
 				: st::infoTopBarMenu))));
+	_topBarMenuToggle->setAccessibleName(tr::lng_sr_profile_menu(tr::now));
 	_topBarMenuToggle->addClickHandler([this] {
 		showTopBarMenu(false);
 	});
+
+	Shortcuts::Requests(
+	) | rpl::filter([=] {
+		return (_controller->section().type() == Section::Type::Profile);
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
+		using Command = Shortcuts::Command;
+
+		request->check(Command::ShowChatMenu, 1) && request->handle([=] {
+			Window::ActivateWindow(_controller->parentController());
+			showTopBarMenu(false);
+			return true;
+		});
+	}, _topBarMenuToggle->lifetime());
 }
 
 bool WrapWidget::closeByOutsideClick() const {
@@ -468,7 +565,7 @@ void WrapWidget::addProfileCallsButton() {
 
 	const auto peer = key().peer();
 	const auto user = peer ? peer->asUser() : nullptr;
-	if (!user || user->sharedMediaInfo()) {
+	if (!user || user->sharedMediaInfo() || user->isInaccessible()) {
 		return;
 	}
 
@@ -479,7 +576,7 @@ void WrapWidget::addProfileCallsButton() {
 		return user->hasCalls();
 	}) | rpl::take(
 		1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_topBar->addButton(
 			base::make_unique_q<Ui::IconButton>(
 				_topBar,
@@ -487,7 +584,7 @@ void WrapWidget::addProfileCallsButton() {
 					? st::infoLayerTopBarCall
 					: st::infoTopBarCall))
 		)->addClickHandler([=] {
-			Core::App().calls().startOutgoingCall(user, false);
+			Core::App().calls().startOutgoingCall(user, {});
 		});
 	}, _topBar->lifetime());
 
@@ -502,7 +599,7 @@ void WrapWidget::showTopBarMenu(bool check) {
 		return;
 	}
 	_topBarMenu = base::make_unique_q<Ui::PopupMenu>(
-		this,
+		QWidget::window(),
 		st::popupMenuExpandedSeparator);
 
 	_topBarMenu->setDestroyedCallback([this] {
@@ -521,19 +618,20 @@ void WrapWidget::showTopBarMenu(bool check) {
 	}
 	_topBarMenu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
 	_topBarMenuToggle->setForceRippled(true);
-	_topBarMenu->popup(_topBarMenuToggle->mapToGlobal(
-		st::infoLayerTopBarMenuPosition));
+	_topBarMenu->popup(Ui::PopupMenu::ConstrainToParentScreen(
+		_topBarMenu,
+		_topBarMenuToggle->mapToGlobal(st::infoLayerTopBarMenuPosition)));
 }
 
 bool WrapWidget::requireTopBarSearch() const {
-	if (!_topBar || !_controller->searchFieldController()) {
+	if (!_topBar
+		|| !_controller->searchFieldController()
+		|| (_controller->wrap() == Wrap::Layer)
+		|| (_controller->section().type() == Section::Type::Profile)
+		|| key().isDownloads()) {
 		return false;
-	} else if (_controller->wrap() == Wrap::Layer
-		|| _controller->section().type() == Section::Type::Profile) {
-		return false;
-	} else if (key().isDownloads()) {
-		return false;
-	} else if (hasStackHistory()) {
+	} else if (hasStackHistory()
+		|| _controller->section().type() == Section::Type::RequestsList) {
 		return true;
 	}
 	return false;
@@ -608,8 +706,6 @@ void WrapWidget::finishShowContent() {
 			.subtitle = _content->subtitle(),
 		});
 		_topBar->setStories(_content->titleStories());
-		_topBar->setStoriesArchive(
-			_controller->key().storiesTab() == Stories::Tab::Archive);
 	}
 	_desiredHeights.fire(desiredHeightForContent());
 	_desiredShadowVisibilities.fire(_content->desiredShadowVisibility());
@@ -629,7 +725,7 @@ void WrapWidget::finishShowContent() {
 	_contentChanges.fire({});
 
 	_content->scrollBottomSkipValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateContentGeometry();
 	}, _content->lifetime());
 }
@@ -649,7 +745,13 @@ rpl::producer<int> WrapWidget::desiredHeightForContent() const {
 }
 
 rpl::producer<SelectedItems> WrapWidget::selectedListValue() const {
-	return _selectedLists.events() | rpl::flatten_latest();
+	auto current = _content
+		? _content->selectedListValue()
+		: nullptr;
+	return _selectedLists.events_starting_with(current
+		? std::move(current)
+		: rpl::single(SelectedItems(Storage::SharedMediaType::Photo))
+	) | rpl::flatten_latest();
 }
 
 object_ptr<ContentWidget> WrapWidget::createContent(
@@ -718,6 +820,36 @@ void WrapWidget::showFinishedHook() {
 	_bottomShadow->toggle(_bottomShadow->toggled(), anim::type::instant);
 	_topBarSurrogate.destroy();
 	_content->showFinished();
+
+	if (_topBarMenuToggle
+		&& _controller->section().type() == Section::Type::Settings) {
+		const auto controller = _controller->parentController();
+		const auto settingsType = _controller->section().settingsType();
+		const auto highlightId = [&]() -> QString {
+			if (settingsType == ::Settings::MainId()) {
+				return u"settings/log-out"_q;
+			} else if (settingsType == ::Settings::ChatId()) {
+				return u"chat/themes-create"_q;
+			}
+			return QString();
+		}();
+		if (!highlightId.isEmpty()
+			&& controller->takeHighlightControlId(highlightId)) {
+			showTopBarMenu(false);
+			if (_topBarMenu) {
+				const auto menu = _topBarMenu->menu();
+				for (const auto &action : menu->actions()) {
+					const auto controlId = "highlight-control-id";
+					if (action->property(controlId).toString() == highlightId) {
+						if (const auto item = menu->itemForAction(action)) {
+							::Settings::HighlightWidget(item);
+						}
+						break;
+					}
+				}
+			}
+		}
+	}
 }
 
 bool WrapWidget::showInternal(
@@ -732,7 +864,6 @@ bool WrapWidget::showInternal(
 			&& (params.way == Window::SectionShow::Way::ClearStack);
 		if (_controller->validateMementoPeer(content)) {
 			if (!skipInternal && _content->showInternal(content)) {
-				highlightTopBar();
 				return true;
 			}
 		}
@@ -770,6 +901,16 @@ std::shared_ptr<Window::SectionMemento> WrapWidget::createMemento() {
 	return std::make_shared<Memento>(std::move(stack));
 }
 
+SendMenu::Details WrapWidget::sendMenuDetails() const {
+	return _content ? _content->sendMenuDetails() : SendMenu::Details();
+}
+
+bool WrapWidget::processChosenSticker(ChatHelpers::FileChosen &&chosen) {
+	return _content
+		? _content->processChosenSticker(std::move(chosen))
+		: false;
+}
+
 rpl::producer<int> WrapWidget::desiredHeightValue() const {
 	return _desiredHeights.events_starting_with(desiredHeightForContent())
 		| rpl::flatten_latest();
@@ -777,7 +918,7 @@ rpl::producer<int> WrapWidget::desiredHeightValue() const {
 
 QRect WrapWidget::contentGeometry() const {
 	const auto top = _topBar ? _topBar->height() : 0;
-	return rect().marginsRemoved({ 0, top, 0, 0 });
+	return rect().marginsRemoved({ 0, std::min(top, height()), 0, 0});
 }
 
 bool WrapWidget::returnToFirstStackFrame(
@@ -880,7 +1021,11 @@ void WrapWidget::showNewContent(
 void WrapWidget::showNewContent(not_null<ContentMemento*> memento) {
 	// Validates contentGeometry().
 	setupTop();
-	showContent(createContent(memento, _controller.get()));
+	auto newContent = createContent(memento, _controller.get());
+	if (!_topBar && hasBackButton()) {
+		newContent->enableBackButton();
+	}
+	showContent(std::move(newContent));
 }
 
 void WrapWidget::resizeEvent(QResizeEvent *e) {
@@ -891,19 +1036,31 @@ void WrapWidget::resizeEvent(QResizeEvent *e) {
 }
 
 void WrapWidget::keyPressEvent(QKeyEvent *e) {
+	if (_content && _content->processZoomKey(e)) {
+		return;
+	}
 	if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Back) {
-		if (hasStackHistory() || wrap() != Wrap::Layer) {
-			checkBeforeClose([=] { _controller->showBackFromStack(); });
-		} else {
-			checkBeforeClose([=] {
-				_controller->parentController()->hideSpecialLayer();
-			});
+		if (!closeByBackButton()) {
+			checkBeforeCloseByEscape(
+				[=] { _controller->showBackFromStack(); });
 		}
 		return;
 	}
 	SectionWidget::keyPressEvent(e);
 }
 
+bool WrapWidget::closeByBackButton() {
+	if (!hasStackHistory() && wrap() != Wrap::Layer) {
+		return false;
+	}
+	checkBeforeCloseByEscape(hasStackHistory()
+		? Fn<void()>([=] { _controller->showBackFromStack(); })
+		: Fn<void()>([=] {
+			_controller->parentController()->hideSpecialLayer();
+		}));
+	return true;
+}
+
 void WrapWidget::updateContentGeometry() {
 	if (_content) {
 		if (_topBar) {
@@ -934,7 +1091,7 @@ object_ptr<Ui::RpWidget> WrapWidget::createTopBarSurrogate(
 		Assert(_topBar != nullptr);
 
 		auto result = object_ptr<Ui::AbstractButton>(parent);
-		result->addClickHandler([weak = Ui::MakeWeak(this)]{
+		result->addClickHandler([weak = base::make_weak(this)]{
 			if (weak) {
 				weak->_controller->showBackFromStack();
 			}
@@ -999,7 +1156,8 @@ const Ui::RoundRect *WrapWidget::bottomSkipRounding() const {
 }
 
 bool WrapWidget::hasBackButton() const {
-	return (wrap() == Wrap::Narrow || hasStackHistory());
+	return !_isSeparatedWindow
+		&& (wrap() == Wrap::Narrow || hasStackHistory());
 }
 
 bool WrapWidget::willHaveBackButton(
@@ -1013,6 +1171,11 @@ bool WrapWidget::willHaveBackButton(
 	return (wrap() == Wrap::Narrow) || willHaveStack;
 }
 
+void WrapWidget::replaceSwipeHandler(
+		Ui::Controls::SwipeHandlerArgs *incompleteArgs) {
+	_content->replaceSwipeHandler(std::move(incompleteArgs));
+}
+
 WrapWidget::~WrapWidget() = default;
 
 } // namespace Info
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h
index 5feb502f7c1eac..02a55092eb0d86 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.h
+++ b/Telegram/SourceFiles/info/info_wrap_widget.h
@@ -15,6 +15,9 @@ enum class SharedMediaType : signed char;
 } // namespace Storage
 
 namespace Ui {
+namespace Controls {
+struct SwipeHandlerArgs;
+} // namespace Controls
 class FadeShadow;
 class PlainShadow;
 class PopupMenu;
@@ -49,6 +52,8 @@ enum class Wrap {
 	Layer,
 	Narrow,
 	Side,
+	Search,
+	StoryAlbumEdit,
 };
 
 struct SelectedItem {
@@ -60,6 +65,7 @@ struct SelectedItem {
 	bool canForward = false;
 	bool canToggleStoryPin = false;
 	bool canUnpinStory = false;
+	bool storyInProfile = false;
 };
 
 struct SelectedItems {
@@ -75,7 +81,8 @@ enum class SelectionAction {
 	Forward,
 	Delete,
 	ToggleStoryPin,
-	ToggleStoryInProfile,
+	ToggleStoryToProfile,
+	ToggleStoryToArchive,
 };
 
 class WrapWidget final : public Window::SectionWidget {
@@ -110,8 +117,11 @@ class WrapWidget final : public Window::SectionWidget {
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
 	bool showBackFromStackInternal(const Window::SectionShow &params);
+	bool closeByBackButton();
 	void removeFromStack(const std::vector<Section> &sections);
 	std::shared_ptr<Window::SectionMemento> createMemento() override;
+	[[nodiscard]] SendMenu::Details sendMenuDetails() const override;
+	bool processChosenSticker(ChatHelpers::FileChosen &&chosen) override;
 
 	rpl::producer<int> desiredHeightValue() const override;
 
@@ -121,6 +131,7 @@ class WrapWidget final : public Window::SectionWidget {
 
 	object_ptr<Ui::RpWidget> createTopBarSurrogate(QWidget *parent);
 
+	[[nodiscard]] bool hasBackButton() const;
 	[[nodiscard]] bool closeByOutsideClick() const;
 
 	void updateGeometry(
@@ -138,6 +149,10 @@ class WrapWidget final : public Window::SectionWidget {
 		return _removeRequests.events();
 	}
 
+	[[nodiscard]] rpl::producer<SelectedItems> selectedListValue() const;
+
+	void replaceSwipeHandler(Ui::Controls::SwipeHandlerArgs *incompleteArgs);
+
 	~WrapWidget();
 
 protected:
@@ -161,6 +176,7 @@ class WrapWidget final : public Window::SectionWidget {
 	void injectActiveProfileMemento(
 		std::shared_ptr<ContentMemento> memento);
 	void checkBeforeClose(Fn<void()> close);
+	void checkBeforeCloseByEscape(Fn<void()> close);
 	void restoreHistoryStack(
 		std::vector<std::shared_ptr<ContentMemento>> stack);
 	bool hasStackHistory() const {
@@ -179,7 +195,6 @@ class WrapWidget final : public Window::SectionWidget {
 	void highlightTopBar();
 	void setupShortcuts();
 
-	[[nodiscard]] bool hasBackButton() const;
 	[[nodiscard]] bool willHaveBackButton(
 		const Window::SectionShow &params) const;
 
@@ -199,13 +214,14 @@ class WrapWidget final : public Window::SectionWidget {
 		not_null<Window::SessionController*> window,
 		not_null<ContentMemento*> memento);
 
-	rpl::producer<SelectedItems> selectedListValue() const;
 	bool requireTopBarSearch() const;
 
 	void addTopBarMenuButton();
 	void addProfileCallsButton();
 	void showTopBarMenu(bool check);
 
+	const bool _isSeparatedWindow = false;
+
 	rpl::variable<Wrap> _wrap;
 	std::unique_ptr<Controller> _controller;
 	object_ptr<ContentWidget> _content = { nullptr };
@@ -216,7 +232,6 @@ class WrapWidget final : public Window::SectionWidget {
 	object_ptr<TopBar> _topBar = { nullptr };
 	object_ptr<Ui::RpWidget> _topBarSurrogate = { nullptr };
 	Ui::Animations::Simple _topBarOverrideAnimation;
-	bool _topBarOverrideShown = false;
 
 	object_ptr<Ui::FadeShadow> _topShadow;
 	object_ptr<Ui::FadeShadow> _bottomShadow;
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.cpp b/Telegram/SourceFiles/info/media/info_media_buttons.cpp
new file mode 100644
index 00000000000000..c45a4716ccb2ac
--- /dev/null
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.cpp
@@ -0,0 +1,415 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/media/info_media_buttons.h"
+
+#include "base/call_delayed.h"
+#include "base/platform/base_platform_info.h"
+#include "base/qt/qt_key_modifiers.h"
+#include "core/application.h"
+#include "core/ui_integration.h"
+#include "data/components/recent_shared_media_gifts.h"
+#include "data/data_channel.h"
+#include "data/data_document.h"
+#include "data/data_saved_messages.h"
+#include "data/data_saved_sublist.h"
+#include "data/data_session.h"
+#include "data/data_stories_ids.h"
+#include "data/data_user.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "history/history.h"
+#include "history/view/history_view_chat_section.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "info/peer_gifts/info_peer_gifts_widget.h"
+#include "info/profile/info_profile_values.h"
+#include "info/saved/info_saved_music_widget.h"
+#include "info/stories/info_stories_widget.h"
+#include "main/main_session.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_separate_id.h"
+#include "window/window_session_controller.h"
+#include "styles/style_info.h"
+#include "styles/style_menu_icons.h"
+
+namespace Info::Media {
+namespace {
+
+[[nodiscard]] bool SeparateSupported(Storage::SharedMediaType type) {
+	using Type = Storage::SharedMediaType;
+	return (type == Type::Photo)
+		|| (type == Type::Video)
+		|| (type == Type::File)
+		|| (type == Type::MusicFile)
+		|| (type == Type::Link)
+		|| (type == Type::RoundVoiceFile)
+		|| (type == Type::GIF)
+		|| (type == Type::Poll);
+}
+
+[[nodiscard]] Window::SeparateId SeparateId(
+		not_null<PeerData*> peer,
+		MsgId topicRootId,
+		Storage::SharedMediaType type) {
+	if (peer->isSelf() || !SeparateSupported(type)) {
+		return { nullptr };
+	}
+	const auto topic = topicRootId
+		? peer->forumTopicFor(topicRootId)
+		: nullptr;
+	if (topicRootId && !topic) {
+		return { nullptr };
+	}
+	const auto thread = topic
+			? (Data::Thread*)topic
+		: peer->owner().history(peer);
+	return { thread, type };
+}
+
+void AddContextMenuToButton(
+		not_null<Ui::AbstractButton*> button,
+		Fn<void()> openInWindow) {
+	if (!openInWindow) {
+		return;
+	}
+	button->setAcceptBoth();
+	struct State final {
+		base::unique_qptr<Ui::PopupMenu> menu;
+	};
+	const auto state = button->lifetime().make_state<State>();
+	button->addClickHandler([=](Qt::MouseButton mouse) {
+		if (mouse != Qt::RightButton) {
+			return;
+		}
+		state->menu = base::make_unique_q<Ui::PopupMenu>(
+			button.get(),
+			st::popupMenuWithIcons);
+		state->menu->addAction(tr::lng_context_new_window(tr::now), [=] {
+			base::call_delayed(
+				st::popupMenuWithIcons.showDuration,
+				crl::guard(button, openInWindow));
+			}, &st::menuIconNewWindow);
+		state->menu->popup(QCursor::pos());
+	});
+}
+
+} // namespace
+
+tr::phrase<lngtag_count> MediaTextPhrase(Type type) {
+	switch (type) {
+	case Type::Photo: return tr::lng_profile_photos;
+	case Type::GIF: return tr::lng_profile_gifs;
+	case Type::Video: return tr::lng_profile_videos;
+	case Type::File: return tr::lng_profile_files;
+	case Type::MusicFile: return tr::lng_profile_songs;
+	case Type::Link: return tr::lng_profile_shared_links;
+	case Type::RoundVoiceFile: return tr::lng_profile_audios;
+	case Type::Poll: return tr::lng_profile_polls;
+	}
+	Unexpected("Type in MediaTextPhrase()");
+};
+
+Fn<QString(int)> MediaText(Type type) {
+	return [phrase = MediaTextPhrase(type)](int count) {
+		return phrase(tr::now, lt_count, count);
+	};
+}
+
+not_null<Ui::SlideWrap<Ui::SettingsButton>*> AddCountedButton(
+		Ui::VerticalLayout *parent,
+		rpl::producer<int> &&count,
+		Fn<QString(int)> &&textFromCount,
+		Ui::MultiSlideTracker &tracker) {
+	using namespace ::Settings;
+	auto forked = std::move(count)
+		| start_spawning(parent->lifetime());
+	auto text = rpl::duplicate(
+		forked
+	) | rpl::map([textFromCount](int count) {
+		return (count > 0)
+			? textFromCount(count)
+			: QString();
+	});
+	auto button = parent->add(object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+		parent,
+		object_ptr<Ui::SettingsButton>(
+			parent,
+			std::move(text),
+			st::infoSharedMediaButton))
+	)->setDuration(
+		st::infoSlideDuration
+	)->toggleOn(
+		rpl::duplicate(forked) | rpl::map(rpl::mappers::_1 > 0)
+	);
+	tracker.track(button);
+	return button;
+};
+
+not_null<Ui::SettingsButton*> AddButton(
+		Ui::VerticalLayout *parent,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		MsgId topicRootId,
+		PeerId monoforumPeerId,
+		PeerData *migrated,
+		Type type,
+		Ui::MultiSlideTracker &tracker) {
+	auto result = AddCountedButton(
+		parent,
+		Profile::SharedMediaCountValue(
+			peer,
+			topicRootId,
+			monoforumPeerId,
+			migrated,
+			type),
+		MediaText(type),
+		tracker)->entity();
+	const auto separateId = SeparateId(peer, topicRootId, type);
+	const auto openInWindow = separateId
+		? [=] { navigation->parentController()->showInNewWindow(separateId); }
+		: Fn<void()>(nullptr);
+	Ui::InstallTooltip(result, [=] {
+		return Platform::IsMac()
+			? tr::lng_new_window_tooltip_cmd(tr::now)
+			: tr::lng_new_window_tooltip_ctrl(tr::now);
+	});
+	AddContextMenuToButton(result, openInWindow);
+	result->addClickHandler([=](Qt::MouseButton mouse) {
+		if (mouse == Qt::RightButton) {
+			return;
+		}
+		if (openInWindow
+			&& (base::IsCtrlPressed() || mouse == Qt::MiddleButton)) {
+			return openInWindow();
+		}
+		const auto topic = topicRootId
+			? peer->forumTopicFor(topicRootId)
+			: nullptr;
+		if (topicRootId && !topic) {
+			return;
+		}
+		const auto separateId = SeparateId(peer, topicRootId, type);
+		if (Core::App().separateWindowFor(separateId) && openInWindow) {
+			openInWindow();
+		} else {
+			navigation->showSection(topicRootId
+				? std::make_shared<Info::Memento>(topic, Section(type))
+				: std::make_shared<Info::Memento>(peer, Section(type)));
+		}
+	});
+	return result;
+};
+
+not_null<Ui::SettingsButton*> AddCommonGroupsButton(
+		Ui::VerticalLayout *parent,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<UserData*> user,
+		Ui::MultiSlideTracker &tracker) {
+	auto result = AddCountedButton(
+		parent,
+		Profile::CommonGroupsCountValue(user),
+		[](int count) {
+			return tr::lng_profile_common_groups(tr::now, lt_count, count);
+		},
+		tracker)->entity();
+	result->addClickHandler([=] {
+		navigation->showSection(
+			std::make_shared<Info::Memento>(
+				user,
+				Section::Type::CommonGroups));
+	});
+	return result;
+}
+
+not_null<Ui::SettingsButton*> AddSimilarPeersButton(
+		Ui::VerticalLayout *parent,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		Ui::MultiSlideTracker &tracker) {
+	auto result = AddCountedButton(
+		parent,
+		Profile::SimilarPeersCountValue(peer),
+		[=](int count) {
+			return peer->isBroadcast()
+				? tr::lng_profile_similar_channels(tr::now, lt_count, count)
+				: tr::lng_profile_similar_bots(tr::now, lt_count, count);
+		},
+		tracker)->entity();
+	result->addClickHandler([=] {
+		navigation->showSection(
+			std::make_shared<Info::Memento>(
+				peer,
+				Section::Type::SimilarPeers));
+	});
+	return result;
+}
+
+not_null<Ui::SettingsButton*> AddStoriesButton(
+		Ui::VerticalLayout *parent,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		Ui::MultiSlideTracker &tracker) {
+	auto count = rpl::single(0) | rpl::then(Data::AlbumStoriesIds(
+		peer,
+		0, // = Data::kStoriesAlbumIdSaved
+		ServerMaxStoryId - 1,
+		0
+	) | rpl::map([](const Data::StoriesIdsSlice &slice) {
+		return slice.fullCount().value_or(0);
+	}));
+	const auto phrase = peer->isChannel() ? (+[](int count) {
+		return tr::lng_profile_posts(tr::now, lt_count, count);
+	}) : (+[](int count) {
+		return tr::lng_profile_saved_stories(tr::now, lt_count, count);
+	});
+	auto result = AddCountedButton(
+		parent,
+		std::move(count),
+		phrase,
+		tracker)->entity();
+	result->addClickHandler([=] {
+		navigation->showSection(Info::Stories::Make(peer));
+	});
+	return result;
+}
+
+not_null<Ui::SettingsButton*> AddSavedSublistButton(
+		Ui::VerticalLayout *parent,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		Ui::MultiSlideTracker &tracker) {
+	auto result = AddCountedButton(
+		parent,
+		Profile::SavedSublistCountValue(peer),
+		[](int count) {
+			return tr::lng_profile_saved_messages(tr::now, lt_count, count);
+		},
+		tracker)->entity();
+	result->addClickHandler([=] {
+		using namespace HistoryView;
+		const auto sublist = peer->owner().savedMessages().sublist(peer);
+		navigation->showSection(
+			std::make_shared<ChatMemento>(ChatViewId{
+				.history = sublist->owningHistory(),
+				.sublist = sublist,
+			}));
+	});
+	return result;
+}
+
+not_null<Ui::SettingsButton*> AddPeerGiftsButton(
+		Ui::VerticalLayout *parent,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		Ui::MultiSlideTracker &tracker) {
+
+	auto count = Profile::PeerGiftsCountValue(peer);
+	auto textFromCount = [](int count) {
+		return tr::lng_profile_peer_gifts(tr::now, lt_count, count);
+	};
+
+	using namespace ::Settings;
+	auto forked = std::move(count)
+		| start_spawning(parent->lifetime());
+	auto text = rpl::duplicate(
+		forked
+	) | rpl::map([textFromCount](int count) {
+		return (count > 0)
+			? textFromCount(count)
+			: QString();
+	});
+
+	struct State final {
+		std::vector<std::unique_ptr<Ui::Text::CustomEmoji>> emojiList;
+		rpl::event_stream<> textRefreshed;
+		QPointer<Ui::SettingsButton> button;
+		rpl::lifetime appearedLifetime;
+		bool giftsLoaded = false;
+	};
+	const auto state = parent->lifetime().make_state<State>();
+
+	const auto refresh = [=] {
+		if (state->button) {
+			state->button->update();
+		}
+	};
+
+	auto customs = state->textRefreshed.events(
+	) | rpl::map([=]() -> TextWithEntities {
+		auto result = TextWithEntities();
+		for (const auto &custom : state->emojiList) {
+			result.append(Ui::Text::SingleCustomEmoji(custom->entityData()));
+		}
+		return result;
+	});
+
+	const auto wrap = parent->add(
+		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+			parent,
+			object_ptr<Ui::SettingsButton>(
+				parent,
+				rpl::combine(
+					std::move(text),
+					std::move(customs)
+				) | rpl::map([=](QString text, TextWithEntities customs) {
+					return TextWithEntities()
+						.append(std::move(text))
+						.append(QChar(' '))
+						.append(std::move(customs));
+				}),
+				st::infoSharedMediaButton,
+				Core::TextContext({
+					.session = &navigation->session(),
+					.details = { .session = &navigation->session() },
+					.repaint = refresh,
+					.customEmojiLoopLimit = 1,
+				}))));
+	wrap->setDuration(st::infoSlideDuration);
+	wrap->toggleOn(
+		rpl::combine(
+			rpl::duplicate(forked),
+			state->textRefreshed.events_starting_with({})
+		) | rpl::map([=](int count, auto) {
+			return count > 0 && state->giftsLoaded;
+		}));
+	tracker.track(wrap);
+
+	rpl::duplicate(forked) | rpl::filter(
+		rpl::mappers::_1 > 0
+	) | rpl::on_next([=] {
+		state->appearedLifetime.destroy();
+		const auto requestDone = crl::guard(wrap, [=](
+				std::vector<Data::SavedStarGift> gifts) {
+			state->emojiList.clear();
+			for (const auto &gift : gifts) {
+				state->emojiList.push_back(
+					peer->owner().customEmojiManager().create(
+						gift.info.document->id,
+						refresh));
+			}
+			state->giftsLoaded = true;
+			state->textRefreshed.fire({});
+		});
+		navigation->session().recentSharedGifts().request(peer, requestDone);
+	}, state->appearedLifetime);
+
+	state->button = wrap->entity();
+
+	wrap->entity()->addClickHandler([=] {
+		if (navigation->showFrozenError()) {
+			return;
+		}
+		navigation->showSection(Info::PeerGifts::Make(peer));
+	});
+	return wrap->entity();
+}
+
+} // namespace Info::Media
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h
index af97c6d2701251..a8a24feb471860 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.h
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.h
@@ -7,221 +7,74 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include <rpl/mappers.h>
-#include <rpl/map.h>
 #include "lang/lang_keys.h"
-#include "data/data_saved_messages.h"
-#include "data/data_session.h"
-#include "data/data_stories_ids.h"
 #include "storage/storage_shared_media.h"
-#include "history/view/history_view_sublist_section.h"
-#include "info/info_memento.h"
-#include "info/info_controller.h"
-#include "info/profile/info_profile_values.h"
-#include "info/stories/info_stories_widget.h"
-#include "ui/wrap/slide_wrap.h"
-#include "ui/wrap/vertical_layout.h"
-#include "ui/widgets/buttons.h"
-#include "window/window_session_controller.h"
-#include "data/data_channel.h"
-#include "data/data_user.h"
-#include "styles/style_info.h"
+
+namespace Ui {
+class AbstractButton;
+class MultiSlideTracker;
+class SettingsButton;
+class VerticalLayout;
+template <typename Widget>
+class SlideWrap;
+} // namespace Ui
+
+namespace Window {
+class SessionNavigation;
+} // namespace Window
 
 namespace Info::Media {
 
 using Type = Storage::SharedMediaType;
 
-inline tr::phrase<lngtag_count> MediaTextPhrase(Type type) {
-	switch (type) {
-	case Type::Photo: return tr::lng_profile_photos;
-	case Type::GIF: return tr::lng_profile_gifs;
-	case Type::Video: return tr::lng_profile_videos;
-	case Type::File: return tr::lng_profile_files;
-	case Type::MusicFile: return tr::lng_profile_songs;
-	case Type::Link: return tr::lng_profile_shared_links;
-	case Type::RoundVoiceFile: return tr::lng_profile_audios;
-	}
-	Unexpected("Type in MediaTextPhrase()");
-};
-
-inline auto MediaText(Type type) {
-	return [phrase = MediaTextPhrase(type)](int count) {
-		return phrase(tr::now, lt_count, count);
-	};
-}
-
-template <typename Count, typename Text>
-inline auto AddCountedButton(
-		Ui::VerticalLayout *parent,
-		Count &&count,
-		Text &&textFromCount,
-		Ui::MultiSlideTracker &tracker) {
-	using namespace rpl::mappers;
-
-	using namespace ::Settings;
-	auto forked = std::move(count)
-		| start_spawning(parent->lifetime());
-	auto text = rpl::duplicate(
-		forked
-	) | rpl::map([textFromCount](int count) {
-		return (count > 0)
-			? textFromCount(count)
-			: QString();
-	});
-	auto button = parent->add(object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
-		parent,
-		object_ptr<Ui::SettingsButton>(
-			parent,
-			std::move(text),
-			st::infoSharedMediaButton))
-	)->setDuration(
-		st::infoSlideDuration
-	)->toggleOn(
-		rpl::duplicate(forked) | rpl::map(_1 > 0)
-	);
-	tracker.track(button);
-	return button;
-};
-
-inline auto AddButton(
-		Ui::VerticalLayout *parent,
-		not_null<Window::SessionNavigation*> navigation,
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		PeerData *migrated,
-		Type type,
-		Ui::MultiSlideTracker &tracker) {
-	auto result = AddCountedButton(
-		parent,
-		Profile::SharedMediaCountValue(peer, topicRootId, migrated, type),
-		MediaText(type),
-		tracker)->entity();
-	result->addClickHandler([=] {
-		const auto topic = topicRootId
-			? peer->forumTopicFor(topicRootId)
-			: nullptr;
-		if (topicRootId && !topic) {
-			return;
-		}
-		navigation->showSection(topicRootId
-			? std::make_shared<Info::Memento>(topic, Section(type))
-			: std::make_shared<Info::Memento>(peer, Section(type)));
-	});
-	return result;
-};
-
-inline auto AddCommonGroupsButton(
-		Ui::VerticalLayout *parent,
-		not_null<Window::SessionNavigation*> navigation,
-		not_null<UserData*> user,
-		Ui::MultiSlideTracker &tracker) {
-	auto result = AddCountedButton(
-		parent,
-		Profile::CommonGroupsCountValue(user),
-		[](int count) {
-			return tr::lng_profile_common_groups(tr::now, lt_count, count);
-		},
-		tracker)->entity();
-	result->addClickHandler([=] {
-		navigation->showSection(
-			std::make_shared<Info::Memento>(
-				user,
-				Section::Type::CommonGroups));
-	});
-	return result;
-}
-
-inline auto AddSimilarChannelsButton(
-		Ui::VerticalLayout *parent,
-		not_null<Window::SessionNavigation*> navigation,
-		not_null<ChannelData*> channel,
-		Ui::MultiSlideTracker &tracker) {
-	auto result = AddCountedButton(
-		parent,
-		Profile::SimilarChannelsCountValue(channel),
-		[](int count) {
-			return tr::lng_profile_similar_channels(
-				tr::now,
-				lt_count,
-				count);
-		},
-		tracker)->entity();
-	result->addClickHandler([=] {
-		navigation->showSection(
-			std::make_shared<Info::Memento>(
-				channel,
-				Section::Type::SimilarChannels));
-	});
-	return result;
-}
-
-inline auto AddStoriesButton(
-		Ui::VerticalLayout *parent,
-		not_null<Window::SessionNavigation*> navigation,
-		not_null<PeerData*> peer,
-		Ui::MultiSlideTracker &tracker) {
-	auto count = rpl::single(0) | rpl::then(Data::SavedStoriesIds(
-		peer,
-		ServerMaxStoryId - 1,
-		0
-	) | rpl::map([](const Data::StoriesIdsSlice &slice) {
-		return slice.fullCount().value_or(0);
-	}));
-	const auto phrase = peer->isChannel() ? (+[](int count) {
-		return tr::lng_profile_posts(tr::now, lt_count, count);
-	}) : (+[](int count) {
-		return tr::lng_profile_saved_stories(tr::now, lt_count, count);
-	});
-	auto result = AddCountedButton(
-		parent,
-		std::move(count),
-		phrase,
-		tracker)->entity();
-	result->addClickHandler([=] {
-		navigation->showSection(Info::Stories::Make(peer));
-	});
-	return result;
-}
-
-inline auto AddSavedSublistButton(
-		Ui::VerticalLayout *parent,
-		not_null<Window::SessionNavigation*> navigation,
-		not_null<PeerData*> peer,
-		Ui::MultiSlideTracker &tracker) {
-	auto result = AddCountedButton(
-		parent,
-		Profile::SavedSublistCountValue(peer),
-		[](int count) {
-			return tr::lng_profile_saved_messages(tr::now, lt_count, count);
-		},
-		tracker)->entity();
-	result->addClickHandler([=] {
-		navigation->showSection(
-			std::make_shared<HistoryView::SublistMemento>(
-				peer->owner().savedMessages().sublist(peer)));
-	});
-	return result;
-}
-
-inline auto AddPeerGiftsButton(
-		Ui::VerticalLayout *parent,
-		not_null<Window::SessionNavigation*> navigation,
-		not_null<UserData*> user,
-		Ui::MultiSlideTracker &tracker) {
-	auto result = AddCountedButton(
-		parent,
-		Profile::PeerGiftsCountValue(user),
-		[](int count) {
-			return tr::lng_profile_peer_gifts(tr::now, lt_count, count);
-		},
-		tracker)->entity();
-	result->addClickHandler([=] {
-		navigation->showSection(
-			std::make_shared<Info::Memento>(
-				user,
-				Section::Type::PeerGifts));
-	});
-	return result;
-}
+[[nodiscard]] tr::phrase<lngtag_count> MediaTextPhrase(Type type);
+
+[[nodiscard]] Fn<QString(int)> MediaText(Type type);
+
+[[nodiscard]] not_null<Ui::SlideWrap<Ui::SettingsButton>*> AddCountedButton(
+	Ui::VerticalLayout *parent,
+	rpl::producer<int> &&count,
+	Fn<QString(int)> &&textFromCount,
+	Ui::MultiSlideTracker &tracker);
+
+[[nodiscard]] not_null<Ui::SettingsButton*> AddButton(
+	Ui::VerticalLayout *parent,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	MsgId topicRootId,
+	PeerId monoforumPeerId,
+	PeerData *migrated,
+	Type type,
+	Ui::MultiSlideTracker &tracker);
+
+[[nodiscard]] not_null<Ui::SettingsButton*> AddCommonGroupsButton(
+	Ui::VerticalLayout *parent,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<UserData*> user,
+	Ui::MultiSlideTracker &tracker);
+
+[[nodiscard]] not_null<Ui::SettingsButton*> AddSimilarPeersButton(
+	Ui::VerticalLayout *parent,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	Ui::MultiSlideTracker &tracker);
+
+[[nodiscard]] not_null<Ui::SettingsButton*> AddStoriesButton(
+	Ui::VerticalLayout *parent,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	Ui::MultiSlideTracker &tracker);
+
+[[nodiscard]] not_null<Ui::SettingsButton*> AddSavedSublistButton(
+	Ui::VerticalLayout *parent,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	Ui::MultiSlideTracker &tracker);
+
+[[nodiscard]] not_null<Ui::SettingsButton*> AddPeerGiftsButton(
+	Ui::VerticalLayout *parent,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	Ui::MultiSlideTracker &tracker);
 
 } // namespace Info::Media
diff --git a/Telegram/SourceFiles/info/media/info_media_common.cpp b/Telegram/SourceFiles/info/media/info_media_common.cpp
index 23fba5eece603f..47f3e80185706e 100644
--- a/Telegram/SourceFiles/info/media/info_media_common.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_common.cpp
@@ -8,6 +8,9 @@ For license and copyright information please follow this link:
 #include "info/media/info_media_common.h"
 
 #include "history/history_item.h"
+#include "storage/storage_shared_media.h"
+#include "styles/style_info.h"
+#include "styles/style_overview.h"
 
 namespace Info::Media {
 
@@ -28,7 +31,11 @@ UniversalMsgId GetUniversalId(not_null<const BaseLayout*> layout) {
 bool ChangeItemSelection(
 		ListSelectedMap &selected,
 		not_null<const HistoryItem*> item,
-		ListItemSelectionData selectionData) {
+		ListItemSelectionData selectionData,
+		int limit) {
+	if (!limit) {
+		limit = MaxSelectedItems;
+	}
 	const auto changeExisting = [&](auto it) {
 		if (it == selected.cend()) {
 			return false;
@@ -38,7 +45,7 @@ bool ChangeItemSelection(
 		}
 		return false;
 	};
-	if (selected.size() < MaxSelectedItems) {
+	if (selected.size() < limit) {
 		const auto &[i, ok] = selected.try_emplace(item, selectionData);
 		if (ok) {
 			return true;
@@ -48,4 +55,40 @@ bool ChangeItemSelection(
 	return changeExisting(selected.find(item));
 }
 
+int MinItemHeight(Type type, int width) {
+	auto &songSt = st::overviewFileLayout;
+
+	switch (type) {
+	case Type::Photo:
+	case Type::GIF:
+	case Type::Video:
+	case Type::RoundFile: {
+		auto itemsLeft = st::infoMediaSkip;
+		auto itemsInRow = (width - itemsLeft)
+			/ (st::infoMediaMinGridSize + st::infoMediaSkip);
+		return (st::infoMediaMinGridSize + st::infoMediaSkip) / itemsInRow;
+	} break;
+
+	case Type::RoundVoiceFile:
+		return songSt.songPadding.top()
+			+ songSt.songThumbSize
+			+ songSt.songPadding.bottom()
+			+ st::lineWidth;
+	case Type::File:
+		return songSt.filePadding.top()
+			+ songSt.fileThumbSize
+			+ songSt.filePadding.bottom()
+			+ st::lineWidth;
+	case Type::MusicFile:
+		return songSt.songPadding.top()
+			+ songSt.songThumbSize
+			+ songSt.songPadding.bottom();
+	case Type::Link:
+		return st::linksPhotoSize
+			+ st::linksMargin.top()
+			+ st::linksMargin.bottom()
+			+ st::linksBorder;
+	}
+	Unexpected("Type in MinItemHeight()");
+}
 } // namespace Info::Media
diff --git a/Telegram/SourceFiles/info/media/info_media_common.h b/Telegram/SourceFiles/info/media/info_media_common.h
index e25c860d87f9f6..d96c1c473437e7 100644
--- a/Telegram/SourceFiles/info/media/info_media_common.h
+++ b/Telegram/SourceFiles/info/media/info_media_common.h
@@ -32,6 +32,7 @@ struct ListItemSelectionData {
 	bool canForward = false;
 	bool canToggleStoryPin = false;
 	bool canUnpinStory = false;
+	bool storyInProfile = false;
 
 	friend inline bool operator==(
 		ListItemSelectionData,
@@ -54,6 +55,7 @@ struct ListContext {
 	not_null<ListSelectedMap*> selected;
 	not_null<ListSelectedMap*> dragSelected;
 	ListDragSelectAction dragSelectAction = ListDragSelectAction::None;
+	BaseLayout *draggedItem = nullptr;
 };
 
 struct ListScrollTopState {
@@ -68,6 +70,11 @@ struct ListFoundItem {
 	bool exact = false;
 };
 
+struct ListFoundItemWithSection {
+	ListFoundItem item;
+	not_null<const ListSection*> section;
+};
+
 struct CachedItem {
 	CachedItem(std::unique_ptr<BaseLayout> item) : item(std::move(item)) {
 	};
@@ -90,7 +97,8 @@ using UniversalMsgId = MsgId;
 bool ChangeItemSelection(
 	ListSelectedMap &selected,
 	not_null<const HistoryItem*> item,
-	ListItemSelectionData selectionData);
+	ListItemSelectionData selectionData,
+	int limit = 0);
 
 class ListSectionDelegate {
 public:
@@ -157,6 +165,7 @@ class ListProvider {
 		not_null<DocumentData*> document) = 0;
 
 	virtual void setSearchQuery(QString query) = 0;
+	virtual void jumpToMessage(MsgId messageId, Fn<void(FullMsgId)>) = 0;
 
 	[[nodiscard]] virtual int64 scrollTopStatePosition(
 		not_null<HistoryItem*> item) = 0;
@@ -172,4 +181,6 @@ class ListProvider {
 	virtual ~ListProvider() = default;
 };
 
+[[nodiscard]] int MinItemHeight(Type type, int width);
+
 } // namespace Info::Media
diff --git a/Telegram/SourceFiles/info/media/info_media_empty_widget.cpp b/Telegram/SourceFiles/info/media/info_media_empty_widget.cpp
index 07f07af8528aa7..0186086178e652 100644
--- a/Telegram/SourceFiles/info/media/info_media_empty_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_empty_widget.cpp
@@ -22,7 +22,7 @@ EmptyWidget::EmptyWidget(QWidget *parent)
 void EmptyWidget::setFullHeight(rpl::producer<int> fullHeightValue) {
 	std::move(
 		fullHeightValue
-	) | rpl::start_with_next([this](int fullHeight) {
+	) | rpl::on_next([this](int fullHeight) {
 		// Make icon center be on 1/3 height.
 		auto iconCenter = fullHeight / 3;
 		auto iconHeight = st::infoEmptyFile.height();
@@ -78,25 +78,48 @@ void EmptyWidget::setSearchQuery(const QString &query) {
 	resizeToWidth(width());
 }
 
-void EmptyWidget::paintEvent(QPaintEvent *e) {
-	if (!_icon) {
+void EmptyWidget::setLoading(bool loading) {
+	if (_loading == loading) {
 		return;
 	}
+	_loading = loading;
+	resizeToWidth(width());
+	update();
+}
+
+bool EmptyWidget::loading() const {
+	return _loading;
+}
 
+void EmptyWidget::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
+	if (_loading) {
+		p.setFont(st::normalFont);
+		p.setPen(st::windowSubTextFg);
+		p.drawText(rect(), tr::lng_contacts_loading(tr::now),
+			QTextOption(Qt::AlignCenter));
+		return;
+	}
+
+	if (!_icon) {
+		return;
+	}
+
 	auto iconLeft = (width() - _icon->width()) / 2;
 	auto iconTop = height() - st::infoEmptyIconTop;
 	_icon->paint(p, iconLeft, iconTop, width());
 }
 
 int EmptyWidget::resizeGetHeight(int newWidth) {
-	auto labelTop = _height - st::infoEmptyLabelTop;
-	auto labelWidth = newWidth - 2 * st::infoEmptyLabelSkip;
-	_text->resizeToNaturalWidth(labelWidth);
+	if (!_loading) {
+		auto labelTop = _height - st::infoEmptyLabelTop;
+		auto labelWidth = newWidth - 2 * st::infoEmptyLabelSkip;
+		_text->resizeToNaturalWidth(labelWidth);
 
-	auto labelLeft = (newWidth - _text->width()) / 2;
-	_text->moveToLeft(labelLeft, labelTop, newWidth);
+		auto labelLeft = (newWidth - _text->width()) / 2;
+		_text->moveToLeft(labelLeft, labelTop, newWidth);
+	}
 
 	update();
 	return _height;
diff --git a/Telegram/SourceFiles/info/media/info_media_empty_widget.h b/Telegram/SourceFiles/info/media/info_media_empty_widget.h
index c9984646648475..9b60a38ef723ff 100644
--- a/Telegram/SourceFiles/info/media/info_media_empty_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_empty_widget.h
@@ -24,6 +24,8 @@ class EmptyWidget : public Ui::RpWidget {
 	void setFullHeight(rpl::producer<int> fullHeightValue);
 	void setType(Type type);
 	void setSearchQuery(const QString &query);
+	void setLoading(bool loading);
+	[[nodiscard]] bool loading() const;
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
@@ -35,6 +37,7 @@ class EmptyWidget : public Ui::RpWidget {
 	Type _type = Type::kCount;
 	const style::icon *_icon = nullptr;
 	int _height = 0;
+	bool _loading = false;
 
 };
 
diff --git a/Telegram/SourceFiles/info/media/info_media_grid_zoom.cpp b/Telegram/SourceFiles/info/media/info_media_grid_zoom.cpp
new file mode 100644
index 00000000000000..473f55b8a51277
--- /dev/null
+++ b/Telegram/SourceFiles/info/media/info_media_grid_zoom.cpp
@@ -0,0 +1,253 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/media/info_media_grid_zoom.h"
+
+#include "info/media/info_media_list_widget.h"
+#include "info/media/info_media_list_section.h"
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "ui/ui_utility.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_overview.h"
+
+namespace Info::Media {
+namespace {
+
+constexpr auto kStepMin = -2;
+constexpr auto kStepMax = 3;
+constexpr auto kPinchStep = 0.5;
+constexpr auto kFadeDuration = crl::time(200);
+
+} // namespace
+
+ListZoom::ListZoom(not_null<ListWidget*> list)
+: _list(list)
+, _step(std::clamp(
+	Core::App().settings().mediaGridZoomStep(),
+	kStepMin,
+	kStepMax)) {
+}
+
+bool ListZoom::isZoomable() const {
+	switch (_list->_provider->type()) {
+	case Type::Photo:
+	case Type::Video:
+	case Type::PhotoVideo:
+	case Type::RoundFile:
+		return true;
+	default:
+		return false;
+	}
+}
+
+int ListZoom::minVideoGridSize() const {
+	return 2 * st::overviewVideoStatusMargin
+		+ 3 * st::overviewVideoStatusPadding.x()
+		+ st::overviewVideoPlay.width()
+		+ st::normalFont->width(u"00:00"_q);
+}
+
+int ListZoom::minGridSizeForStep(int step) const {
+	const auto base = st::infoMediaMinGridSize
+		+ step * st::infoMediaGridSizeStep;
+	switch (_list->_provider->type()) {
+	case Type::Video:
+	case Type::PhotoVideo:
+	case Type::RoundFile:
+		return std::max(base, minVideoGridSize());
+	default:
+		return base;
+	}
+}
+
+int ListZoom::minGridSize() const {
+	return minGridSizeForStep(_step);
+}
+
+int ListZoom::columnsForGridSize(int gridSize) const {
+	const auto outer = _list->width();
+	if (outer <= 0) {
+		return 1;
+	}
+	const auto skip = st::infoMediaSkip;
+	const auto left = st::infoMediaLeft;
+	return std::max(1, (outer - left * 2 + skip) / (gridSize + skip));
+}
+
+std::optional<int> ListZoom::nextZoomStep(int direction) const {
+	if (_list->_sections.empty() || !isZoomable()) {
+		return std::nullopt;
+	}
+	const auto currentColumns = columnsForGridSize(minGridSize());
+	for (auto step = _step + direction
+		; step >= kStepMin && step <= kStepMax
+		; step += direction) {
+		const auto columns = columnsForGridSize(minGridSizeForStep(step));
+		if ((direction > 0)
+			? (columns < currentColumns)
+			: (columns > currentColumns)) {
+			return step;
+		}
+	}
+	return std::nullopt;
+}
+
+QPoint ListZoom::defaultAnchor() const {
+	return QPoint(
+		_list->width() / 2,
+		(_list->_visibleTop + _list->_visibleBottom) / 2);
+}
+
+void ListZoom::zoomBy(int direction, QPoint anchor) {
+	if (const auto step = nextZoomStep(direction)) {
+		apply(*step, anchor);
+	}
+}
+
+void ListZoom::zoomIn() {
+	zoomBy(1, defaultAnchor());
+}
+
+void ListZoom::zoomOut() {
+	zoomBy(-1, defaultAnchor());
+}
+
+bool ListZoom::canZoomIn() const {
+	return nextZoomStep(1).has_value();
+}
+
+bool ListZoom::canZoomOut() const {
+	return nextZoomStep(-1).has_value();
+}
+
+QPixmap ListZoom::grabViewport(int height) {
+	const auto width = _list->width();
+	if (width <= 0 || height <= 0) {
+		return QPixmap();
+	}
+	return Ui::GrabWidget(
+		_list.get(),
+		QRect(0, _list->_visibleTop, width, height),
+		st::boxBg->c);
+}
+
+void ListZoom::apply(int step, QPoint anchor) {
+	step = std::clamp(step, kStepMin, kStepMax);
+	if (step == _step || _list->_sections.empty()) {
+		return;
+	}
+	const auto oldColumns = columnsForGridSize(minGridSize());
+	const auto newColumns = columnsForGridSize(minGridSizeForStep(step));
+	_step = step;
+	Core::App().settings().setMediaGridZoomStep(step);
+	Core::App().saveSettingsDelayed();
+	if (newColumns == oldColumns) {
+		return;
+	}
+	const auto fadeHeight = _list->_visibleBottom - _list->_visibleTop;
+	const auto anchorScreen = QPoint(
+		anchor.x(),
+		anchor.y() - _list->_visibleTop);
+	_fade.stop();
+	auto oldPix = grabViewport(fadeHeight);
+
+	_list->_scrollTopState = _list->countScrollState(anchor);
+	_list->resizeToWidth(_list->width());
+	_list->restoreScrollState();
+
+	auto newPix = grabViewport(fadeHeight);
+	if (!oldPix.isNull() && !newPix.isNull() && fadeHeight > 0) {
+		_oldPix = std::move(oldPix);
+		_newPix = std::move(newPix);
+		_anchorScreen = anchorScreen;
+		_fadeHeight = fadeHeight;
+		_scaleRatio = float64(oldColumns) / newColumns;
+		_fade.start([=] {
+			_list->update(
+				QRect(0, _list->_visibleTop, _list->width(), _fadeHeight));
+		}, 0., 1., kFadeDuration, anim::easeOutCirc);
+	}
+	_list->update();
+}
+
+bool ListZoom::handleNativeGesture(not_null<QNativeGestureEvent*> e) {
+	if (e->gestureType() == Qt::BeginNativeGesture) {
+		_pinchAccumulated = 0.;
+		return false;
+	} else if (e->gestureType() != Qt::ZoomNativeGesture) {
+		return false;
+	} else if (!isZoomable()) {
+		return false;
+	}
+	const auto anchor = e->position().toPoint();
+	_pinchAccumulated += e->value();
+	while (_pinchAccumulated >= kPinchStep) {
+		_pinchAccumulated -= kPinchStep;
+		zoomBy(1, anchor);
+	}
+	while (_pinchAccumulated <= -kPinchStep) {
+		_pinchAccumulated += kPinchStep;
+		zoomBy(-1, anchor);
+	}
+	return true;
+}
+
+bool ListZoom::processWheel(not_null<QWheelEvent*> e) {
+	if (!isZoomable()) {
+		return false;
+	}
+	const auto delta = e->angleDelta().y();
+	if (!delta) {
+		return false;
+	}
+	const auto position = e->position();
+	const auto anchor = QPoint(
+		qRound(position.x()),
+		_list->_visibleTop + qRound(position.y()));
+	zoomBy((delta > 0) ? 1 : -1, anchor);
+	return true;
+}
+
+bool ListZoom::paint(QPainter &p) {
+	if (_fade.animating() && !_oldPix.isNull() && !_newPix.isNull()) {
+		const auto progress = _fade.value(1.);
+		const auto top = _list->_visibleTop;
+		const auto width = _list->width();
+		const auto target = QRect(0, top, width, _fadeHeight);
+		const auto pivot = QPointF(
+			_anchorScreen.x(),
+			top + _anchorScreen.y());
+		p.setRenderHint(QPainter::SmoothPixmapTransform);
+		const auto layer = [&](
+				const QPixmap &pix,
+				float64 scale,
+				float64 opacity) {
+			if (opacity <= 0.) {
+				return;
+			}
+			p.save();
+			p.setOpacity(opacity);
+			p.translate(pivot);
+			p.scale(scale, scale);
+			p.translate(-pivot);
+			p.drawPixmap(target, pix);
+			p.restore();
+		};
+		const auto inv = 1. / _scaleRatio;
+		layer(_newPix, inv + (1. - inv) * progress, progress);
+		layer(_oldPix, 1. + (_scaleRatio - 1.) * progress, 1. - progress);
+		return true;
+	} else if (!_oldPix.isNull() || !_newPix.isNull()) {
+		_oldPix = QPixmap();
+		_newPix = QPixmap();
+	}
+	return false;
+}
+
+} // namespace Info::Media
diff --git a/Telegram/SourceFiles/info/media/info_media_grid_zoom.h b/Telegram/SourceFiles/info/media/info_media_grid_zoom.h
new file mode 100644
index 00000000000000..227f2c24100c1c
--- /dev/null
+++ b/Telegram/SourceFiles/info/media/info_media_grid_zoom.h
@@ -0,0 +1,55 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/animations.h"
+
+namespace Info::Media {
+
+class ListWidget;
+
+class ListZoom final {
+public:
+	explicit ListZoom(not_null<ListWidget*> list);
+
+	[[nodiscard]] bool isZoomable() const;
+	[[nodiscard]] int minGridSize() const;
+
+	void zoomIn();
+	void zoomOut();
+	[[nodiscard]] bool canZoomIn() const;
+	[[nodiscard]] bool canZoomOut() const;
+
+	bool handleNativeGesture(not_null<QNativeGestureEvent*> e);
+	bool processWheel(not_null<QWheelEvent*> e);
+
+	[[nodiscard]] bool paint(QPainter &p);
+
+private:
+	[[nodiscard]] int minGridSizeForStep(int step) const;
+	[[nodiscard]] int minVideoGridSize() const;
+	[[nodiscard]] int columnsForGridSize(int gridSize) const;
+	[[nodiscard]] std::optional<int> nextZoomStep(int direction) const;
+	[[nodiscard]] QPoint defaultAnchor() const;
+	[[nodiscard]] QPixmap grabViewport(int height);
+	void zoomBy(int direction, QPoint anchor);
+	void apply(int step, QPoint anchor);
+
+	const not_null<ListWidget*> _list;
+	int _step = 0;
+	float64 _pinchAccumulated = 0.;
+	Ui::Animations::Simple _fade;
+	QPixmap _oldPix;
+	QPixmap _newPix;
+	QPoint _anchorScreen;
+	float64 _scaleRatio = 1.;
+	int _fadeHeight = 0;
+
+};
+
+} // namespace Info::Media
diff --git a/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp b/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp
index ee9eb4dfd2223d..69a56d602b1c98 100644
--- a/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp
@@ -15,10 +15,13 @@ For license and copyright information please follow this link:
 #include "info/profile/info_profile_icon.h"
 #include "info/info_controller.h"
 #include "data/data_forum_topic.h"
+#include "data/data_peer.h"
+#include "data/data_saved_sublist.h"
 #include "ui/widgets/discrete_sliders.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/box_content_divider.h"
+#include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/search_field_controller.h"
 #include "styles/style_info.h"
@@ -34,7 +37,7 @@ InnerWidget::InnerWidget(
 , _controller(controller)
 , _empty(this) {
 	_empty->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { refreshHeight(); },
 		_empty->lifetime());
 	_list = setupList();
@@ -60,7 +63,7 @@ void InnerWidget::createOtherTypes() {
 
 	_otherTypes->resizeToWidth(width());
 	_otherTypes->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { refreshHeight(); },
 		_otherTypes->lifetime());
 }
@@ -77,7 +80,11 @@ void InnerWidget::createTypeButtons() {
 	auto tracker = Ui::MultiSlideTracker();
 	const auto peer = _controller->key().peer();
 	const auto topic = _controller->key().topic();
+	const auto sublist = _controller->key().sublist();
 	const auto topicRootId = topic ? topic->rootId() : MsgId();
+	const auto monoforumPeerId = sublist
+		? sublist->sublistPeer()->id
+		: PeerId();
 	const auto migrated = _controller->migrated();
 	const auto addMediaButton = [&](
 			Type buttonType,
@@ -90,6 +97,7 @@ void InnerWidget::createTypeButtons() {
 			_controller,
 			peer,
 			topicRootId,
+			monoforumPeerId,
 			migrated,
 			buttonType,
 			tracker);
@@ -137,11 +145,9 @@ bool InnerWidget::showInternal(not_null<Memento*> memento) {
 }
 
 object_ptr<ListWidget> InnerWidget::setupList() {
-	auto result = object_ptr<ListWidget>(
-		this,
-		_controller);
+	auto result = object_ptr<ListWidget>(this, _controller);
 	result->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { refreshHeight(); },
 		result->lifetime());
 	using namespace rpl::mappers;
@@ -158,7 +164,7 @@ object_ptr<ListWidget> InnerWidget::setupList() {
 	_listTops.fire(result->topValue());
 	_empty->setType(_controller->section().mediaType());
 	_controller->mediaSourceQueryValue(
-	) | rpl::start_with_next([this](const QString &query) {
+	) | rpl::on_next([this](const QString &query) {
 		_empty->setSearchQuery(query);
 	}, result->lifetime());
 	return result;
@@ -215,7 +221,7 @@ int InnerWidget::recountHeight() {
 		listHeight = _list->heightNoMargins();
 		top += listHeight;
 	}
-	if (listHeight > 0) {
+	if (listHeight > _emptyHeightThreshold && !_empty->loading()) {
 		_empty->hide();
 	} else {
 		_empty->show();
@@ -239,5 +245,39 @@ rpl::producer<Ui::ScrollToRequest> InnerWidget::scrollToRequests() const {
 	return _scrollToRequests.events();
 }
 
+bool InnerWidget::processZoomWheel(not_null<QWheelEvent*> e) {
+	return _list->processZoomWheel(e);
+}
+
+void InnerWidget::zoomIn() {
+	_list->zoomIn();
+}
+
+void InnerWidget::zoomOut() {
+	_list->zoomOut();
+}
+
+bool InnerWidget::canZoomIn() const {
+	return _list->canZoomIn();
+}
+
+bool InnerWidget::canZoomOut() const {
+	return _list->canZoomOut();
+}
+
+void InnerWidget::jumpToMessage(MsgId msgId) {
+	_empty->setLoading(true);
+	_emptyHeightThreshold = st::semiboldFont->height;
+	_list->jumpToMessage(msgId);
+	_emptyLoadingLifetime = _list->heightValue(
+	) | rpl::skip(1) | rpl::filter(
+		rpl::mappers::_1 > _emptyHeightThreshold
+	) | rpl::take(1) | rpl::on_next([=](int height) {
+		_empty->setLoading(false);
+		_emptyHeightThreshold = 0;
+		recountHeight();
+	});
+}
+
 } // namespace Media
 } // namespace Info
diff --git a/Telegram/SourceFiles/info/media/info_media_inner_widget.h b/Telegram/SourceFiles/info/media/info_media_inner_widget.h
index a3e48596036cb4..e1c4ca28e9d2c3 100644
--- a/Telegram/SourceFiles/info/media/info_media_inner_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_inner_widget.h
@@ -49,6 +49,14 @@ class InnerWidget final : public Ui::RpWidget {
 	rpl::producer<SelectedItems> selectedListValue() const;
 	void selectionAction(SelectionAction action);
 
+	void jumpToMessage(MsgId msgId);
+
+	bool processZoomWheel(not_null<QWheelEvent*> e);
+	void zoomIn();
+	void zoomOut();
+	[[nodiscard]] bool canZoomIn() const;
+	[[nodiscard]] bool canZoomOut() const;
+
 	~InnerWidget();
 
 protected:
@@ -83,6 +91,9 @@ class InnerWidget final : public Ui::RpWidget {
 	rpl::event_stream<rpl::producer<SelectedItems>> _selectedLists;
 	rpl::event_stream<rpl::producer<int>> _listTops;
 
+	int _emptyHeightThreshold = 0;
+	rpl::lifetime _emptyLoadingLifetime;
+
 };
 
 } // namespace Info::Media
diff --git a/Telegram/SourceFiles/info/media/info_media_list_section.cpp b/Telegram/SourceFiles/info/media/info_media_list_section.cpp
index ba207ff28c2484..13064b2433e490 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_section.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_section.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "storage/storage_shared_media.h"
 #include "layout/layout_selection.h"
+#include "ui/rect.h"
 #include "ui/painter.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_info.h"
@@ -45,6 +46,14 @@ int ListSection::top() const {
 	return _top;
 }
 
+void ListSection::setCanReorder(bool value) {
+	_canReorder = value;
+}
+
+void ListSection::setMinGridSize(int value) {
+	_minGridSize = value;
+}
+
 int ListSection::height() const {
 	return _height;
 }
@@ -53,6 +62,10 @@ int ListSection::bottom() const {
 	return top() + height();
 }
 
+bool ListSection::isOneColumn() const {
+	return _itemsInRow == 1;
+}
+
 bool ListSection::addItem(not_null<BaseLayout*> item) {
 	if (_items.empty() || belongsHere(item)) {
 		if (_items.empty()) {
@@ -103,15 +116,20 @@ bool ListSection::removeItem(not_null<const HistoryItem*> item) {
 	return false;
 }
 
+void ListSection::reorderItems(int oldPosition, int newPosition) {
+	base::reorder(_items, oldPosition, newPosition);
+	refreshHeight();
+}
+
 QRect ListSection::findItemRect(
 		not_null<const BaseLayout*> item) const {
-	auto position = item->position();
+	const auto position = item->position();
 	if (!_mosaic.empty()) {
 		return _mosaic.findRect(position);
 	}
-	auto top = position / _itemsInRow;
-	auto indexInRow = position % _itemsInRow;
-	auto left = _itemsLeft
+	const auto top = position / _itemsInRow;
+	const auto indexInRow = position % _itemsInRow;
+	const auto left = _itemsLeft
 		+ indexInRow * (_itemWidth + st::infoMediaSkip);
 	return QRect(left, top, _itemWidth, item->height());
 }
@@ -222,7 +240,7 @@ void ListSection::paint(
 		const ListContext &context,
 		QRect clip,
 		int outerWidth) const {
-	auto header = headerHeight();
+	const auto header = headerHeight();
 	if (QRect(0, 0, outerWidth, header).intersects(clip)) {
 		p.setPen(st::infoMediaHeaderFg);
 		_header.drawLeftElided(
@@ -234,7 +252,7 @@ void ListSection::paint(
 	}
 	auto localContext = context.layoutContext;
 	if (!_mosaic.empty()) {
-		auto paintItem = [&](not_null<BaseLayout*> item, QPoint point) {
+		const auto paintItem = [&](not_null<BaseLayout*> item, QPoint point) {
 			p.translate(point.x(), point.y());
 			item->paint(
 				p,
@@ -247,13 +265,17 @@ void ListSection::paint(
 		return;
 	}
 
-	auto fromIt = findItemAfterTop(clip.y());
-	auto tillIt = findItemAfterBottom(
+	const auto fromIt = findItemAfterTop(clip.y());
+	const auto tillIt = findItemAfterBottom(
 		fromIt,
 		clip.y() + clip.height());
 	for (auto it = fromIt; it != tillIt; ++it) {
-		auto item = *it;
+		const auto item = *it;
+		if (item == context.draggedItem) {
+			continue;
+		}
 		auto rect = findItemRect(item);
+		rect.translate(item->shift());
 		localContext.skipBorder = (rect.y() <= header + _itemsTop);
 		if (rect.intersects(clip)) {
 			p.translate(rect.topLeft());
@@ -263,6 +285,15 @@ void ListSection::paint(
 				itemSelection(item, context),
 				&localContext);
 			p.translate(-rect.topLeft());
+
+			if (_canReorder && isOneColumn()) {
+				st::stickersReorderIcon.paint(
+					p,
+					rect::right(rect) - oneColumnRightPadding(),
+					(rect.height() - st::stickersReorderIcon.height()) / 2
+						+ rect.y(),
+					outerWidth);
+			}
 		}
 	}
 }
@@ -302,16 +333,16 @@ TextSelection ListSection::itemSelection(
 		not_null<const BaseLayout*> item,
 		const ListContext &context) const {
 	const auto parent = item->getItem();
-	auto dragSelectAction = context.dragSelectAction;
+	const auto dragSelectAction = context.dragSelectAction;
 	if (dragSelectAction != ListDragSelectAction::None) {
-		auto i = context.dragSelected->find(parent);
+		const auto i = context.dragSelected->find(parent);
 		if (i != context.dragSelected->end()) {
 			return (dragSelectAction == ListDragSelectAction::Selecting)
 				? FullSelection
 				: TextSelection();
 		}
 	}
-	auto i = context.selected->find(parent);
+	const auto i = context.selected->find(parent);
 	return (i == context.selected->cend())
 		? TextSelection()
 		: i->second.text;
@@ -321,19 +352,31 @@ int ListSection::headerHeight() const {
 	return _header.isEmpty() ? 0 : st::infoMediaHeaderHeight;
 }
 
+int ListSection::oneColumnRightPadding() const {
+	return !isOneColumn()
+		? 0
+		: _canReorder
+		? st::stickersReorderIcon.width() + st::infoMediaLeft
+		: 0;
+}
+
 void ListSection::resizeToWidth(int newWidth) {
-	auto minWidth = st::infoMediaMinGridSize + st::infoMediaSkip * 2;
+	const auto gridSize = _minGridSize
+		? _minGridSize
+		: st::infoMediaMinGridSize;
+	const auto minWidth = gridSize + st::infoMediaSkip * 2;
 	if (newWidth < minWidth) {
 		return;
 	}
 
-	auto resizeOneColumn = [&](int itemsLeft, int itemWidth) {
+	const auto resizeOneColumn = [&](int itemsLeft, int itemWidth) {
+		const auto rightPadding = oneColumnRightPadding();
 		_itemsLeft = itemsLeft;
 		_itemsTop = 0;
 		_itemsInRow = 1;
-		_itemWidth = itemWidth;
+		_itemWidth = itemWidth - rightPadding;
 		for (auto &item : _items) {
-			item->resizeGetHeight(_itemWidth);
+			item->resizeGetHeight(_itemWidth - rightPadding);
 		}
 	};
 	switch (_type) {
@@ -345,7 +388,7 @@ void ListSection::resizeToWidth(int newWidth) {
 		_itemsLeft = st::infoMediaLeft;
 		_itemsTop = st::infoMediaSkip;
 		_itemsInRow = (newWidth - _itemsLeft * 2 + skip)
-			/ (st::infoMediaMinGridSize + skip);
+			/ (gridSize + skip);
 		_itemWidth = ((newWidth - _itemsLeft * 2 + skip) / _itemsInRow)
 			- st::infoMediaSkip;
 		_itemsLeft = (newWidth - (_itemWidth + skip) * _itemsInRow + skip)
@@ -365,8 +408,8 @@ void ListSection::resizeToWidth(int newWidth) {
 		break;
 	case Type::File:
 	case Type::Link: {
-		auto itemsLeft = st::infoMediaHeaderPosition.x();
-		auto itemWidth = newWidth - 2 * itemsLeft;
+		const auto itemsLeft = st::infoMediaHeaderPosition.x();
+		const auto itemWidth = newWidth - 2 * itemsLeft;
 		resizeOneColumn(itemsLeft, itemWidth);
 	} break;
 	}
@@ -382,7 +425,7 @@ int ListSection::recountHeight() {
 	case Type::Video:
 	case Type::PhotoVideo:
 	case Type::RoundFile: {
-		auto itemHeight = _itemHeight + st::infoMediaSkip;
+		const auto itemHeight = _itemHeight + st::infoMediaSkip;
 		auto index = 0;
 		result += _itemsTop;
 		for (auto &item : _items) {
diff --git a/Telegram/SourceFiles/info/media/info_media_list_section.h b/Telegram/SourceFiles/info/media/info_media_list_section.h
index 358712a75e3609..cebedafd89f72f 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_section.h
+++ b/Telegram/SourceFiles/info/media/info_media_list_section.h
@@ -26,12 +26,17 @@ class ListSection {
 
 	void setTop(int top);
 	[[nodiscard]] int top() const;
+	void setCanReorder(bool);
+	void setMinGridSize(int value);
 	void resizeToWidth(int newWidth);
 	[[nodiscard]] int height() const;
 
 	[[nodiscard]] int bottom() const;
+	[[nodiscard]] bool isOneColumn() const;
+	[[nodiscard]] int oneColumnRightPadding() const;
 
 	bool removeItem(not_null<const HistoryItem*> item);
+	void reorderItems(int oldPosition, int newPosition);
 	[[nodiscard]] std::optional<ListFoundItem> findItemByItem(
 		not_null<const HistoryItem*> item) const;
 	[[nodiscard]] ListFoundItem findItemDetails(
@@ -87,6 +92,8 @@ class ListSection {
 	mutable int _rowsCount = 0;
 	int _top = 0;
 	int _height = 0;
+	int _minGridSize = 0;
+	bool _canReorder = false;
 
 	Mosaic::Layout::MosaicLayout<BaseLayout> _mosaic;
 
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 280b35589ebb09..be3e74dc673c65 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -7,10 +7,13 @@ For license and copyright information please follow this link:
 */
 #include "info/media/info_media_list_widget.h"
 
+#include "info/global_media/info_global_media_provider.h"
 #include "info/media/info_media_common.h"
 #include "info/media/info_media_provider.h"
 #include "info/media/info_media_list_section.h"
+#include "info/media/info_media_grid_zoom.h"
 #include "info/downloads/info_downloads_provider.h"
+#include "info/saved/info_saved_music_provider.h"
 #include "info/stories/info_stories_provider.h"
 #include "info/info_controller.h"
 #include "layout/layout_mosaic.h"
@@ -19,6 +22,7 @@ For license and copyright information please follow this link:
 #include "data/data_photo.h"
 #include "data/data_chat.h"
 #include "data/data_channel.h"
+#include "data/data_chat_participant_status.h"
 #include "data/data_peer_values.h"
 #include "data/data_document.h"
 #include "data/data_session.h"
@@ -27,26 +31,33 @@ For license and copyright information please follow this link:
 #include "data/data_file_origin.h"
 #include "data/data_download_manager.h"
 #include "data/data_forum_topic.h"
-#include "history/history_item.h"
-#include "history/history_item_helpers.h"
-#include "history/history.h"
+#include "data/data_saved_sublist.h"
+#include "history/view/media/history_view_save_document_action.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/history_view_service_message.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_helpers.h"
 #include "media/stories/media_stories_controller.h" // ...TogglePinnedToast.
 #include "media/stories/media_stories_share.h" // PrepareShareBox.
+#include "media/stories/media_stories_stealth.h"
 #include "window/window_session_controller.h"
 #include "window/window_peer_menu.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/delete_message_context_action.h"
 #include "ui/chat/chat_style.h"
 #include "ui/cached_round_corners.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/ui_utility.h"
 #include "ui/inactive_press.h"
 #include "lang/lang_keys.h"
-#include "main/main_session.h"
 #include "main/main_account.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "base/platform/base_platform_info.h"
@@ -55,6 +66,8 @@ For license and copyright information please follow this link:
 #include "media/player/media_player_instance.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/peer_list_controllers.h"
+#include "boxes/sticker_set_box.h" // StickerPremiumMark
+#include "core/click_handler_types.h"
 #include "core/file_utilities.h"
 #include "core/application.h"
 #include "ui/toast/toast.h"
@@ -63,7 +76,11 @@ For license and copyright information please follow this link:
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
 #include "styles/style_chat.h"
+#include "styles/style_credits.h" // giftBoxHiddenMark
+#include "styles/style_chat_helpers.h"
+#include "styles/style_media_stories.h"
 
+#include <QtCore/QMimeData>
 #include <QtWidgets/QApplication>
 #include <QtGui/QClipboard>
 
@@ -93,8 +110,12 @@ struct ListWidget::DateBadge {
 		not_null<AbstractController*> controller) {
 	if (controller->isDownloads()) {
 		return std::make_unique<Downloads::Provider>(controller);
+	} else if (controller->musicPeer()) {
+		return std::make_unique<Saved::MusicProvider>(controller);
 	} else if (controller->storiesPeer()) {
 		return std::make_unique<Stories::Provider>(controller);
+	} else if (controller->section().type() == Section::Type::GlobalMedia) {
+		return std::make_unique<GlobalMedia::Provider>(controller);
 	}
 	return std::make_unique<Provider>(controller);
 }
@@ -144,9 +165,16 @@ ListWidget::ListWidget(
 , _controller(controller)
 , _provider(MakeProvider(_controller))
 , _dateBadge(std::make_unique<DateBadge>(
-		_provider->type(),
-		[=] { scrollDateCheck(); },
-		[=] { scrollDateHide(); })) {
+	_provider->type(),
+	[=] { scrollDateCheck(); },
+	[=] { scrollDateHide(); }))
+, _selectedLimit(MaxSelectedItems)
+, _storiesAddToAlbumId(controller->storiesAddToAlbumId())
+, _hiddenMark(std::make_unique<StickerPremiumMark>(
+		&_controller->session(),
+		st::giftBoxHiddenMark,
+		RectPart::Center)) {
+	_zoom = std::make_unique<ListZoom>(this);
 	start();
 }
 
@@ -160,7 +188,7 @@ void ListWidget::start() {
 	_controller->setSearchEnabledByContent(false);
 
 	_provider->layoutRemoved(
-	) | rpl::start_with_next([=](not_null<BaseLayout*> layout) {
+	) | rpl::on_next([=](not_null<BaseLayout*> layout) {
 		if (_overLayout == layout) {
 			_overLayout = nullptr;
 		}
@@ -168,7 +196,7 @@ void ListWidget::start() {
 	}, lifetime());
 
 	_provider->refreshed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshRows();
 	}, lifetime());
 
@@ -176,17 +204,23 @@ void ListWidget::start() {
 		_provider->refreshViewer();
 
 		_controller->searchQueryValue(
-		) | rpl::start_with_next([this](QString &&query) {
+		) | rpl::on_next([this](QString &&query) {
 			_provider->setSearchQuery(std::move(query));
 		}, lifetime());
 	} else if (_controller->storiesPeer()) {
+		setupStoriesTrackIds();
+		trackSession(&session());
+		restart();
+	} else if (_controller->musicPeer()) {
 		trackSession(&session());
 		restart();
 	} else {
 		trackSession(&session());
 
-		_controller->mediaSourceQueryValue(
-		) | rpl::start_with_next([this] {
+		(_controller->key().isGlobalMedia()
+			? _controller->searchQueryValue()
+			: _controller->mediaSourceQueryValue()
+		) | rpl::on_next([this] {
 			restart();
 		}, lifetime());
 
@@ -197,7 +231,7 @@ void ListWidget::start() {
 					const Data::Session::ItemVisibilityQuery &query) {
 				return _provider->isPossiblyMyItem(query.item)
 					&& isVisible();
-			}) | rpl::start_with_next([=](
+			}) | rpl::on_next([=](
 					const Data::Session::ItemVisibilityQuery &query) {
 				if (const auto found = findItemByItem(query.item)) {
 					if (itemVisible(found->layout)) {
@@ -215,27 +249,27 @@ void ListWidget::subscribeToSession(
 		not_null<Main::Session*> session,
 		rpl::lifetime &lifetime) {
 	session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime);
 
 	session->data().itemLayoutChanged(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		itemLayoutChanged(item);
 	}, lifetime);
 
 	session->data().itemRemoved(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		itemRemoved(item);
 	}, lifetime);
 
 	session->data().itemRepaintRequest(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		repaintItem(item);
 	}, lifetime);
 
 	session->data().itemDataChanges(
-	) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<HistoryItem*> item) {
 		if (const auto found = findItemByItem(item)) {
 			found->layout->itemDataChanged();
 		}
@@ -246,7 +280,7 @@ void ListWidget::setupSelectRestriction() {
 	_provider->hasSelectRestrictionChanges(
 	) | rpl::filter([=] {
 		return _provider->hasSelectRestriction() && hasSelectedItems();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		clearSelected();
 		if (_mouseAction == MouseAction::PrepareSelect) {
 			mouseActionCancel();
@@ -254,6 +288,69 @@ void ListWidget::setupSelectRestriction() {
 	}, lifetime());
 }
 
+void ListWidget::setupStoriesTrackIds() {
+	if (!_storiesAddToAlbumId) {
+		return;
+	}
+	const auto peerId = _controller->storiesPeer()->id;
+	const auto stories = &session().data().stories();
+
+	constexpr auto kArchive = Data::kStoriesAlbumIdArchive;
+	const auto key = Data::StoryAlbumIdsKey{ peerId, kArchive };
+	rpl::single(rpl::empty) | rpl::then(
+		stories->albumIdsChanged() | rpl::filter(
+			rpl::mappers::_1 == key
+		) | rpl::to_empty
+	) | rpl::on_next([=] {
+		const auto albumId = _storiesAddToAlbumId;
+		const auto &ids = stories->albumKnownInArchive(peerId, albumId);
+		if (_storiesInAlbum != ids) {
+			for (const auto id : ids) {
+				if (_storiesInAlbum.emplace(id).second) {
+					_storyMsgsToMarkSelected.emplace(StoryIdToMsgId(id));
+				}
+			}
+			if (_storiesInAlbum.size() > ids.size()) {
+				const auto endIt = end(_storiesInAlbum);
+				for (auto i = begin(_storiesInAlbum); i != endIt;) {
+					if (ids.contains(*i)) {
+						++i;
+					} else {
+						_storyMsgsToMarkSelected.remove(StoryIdToMsgId(*i));
+						i = _storiesInAlbum.erase(i);
+					}
+				}
+			}
+		}
+	}, lifetime());
+
+	if (!stories->albumIdsCountKnown(peerId, _storiesAddToAlbumId)) {
+		stories->albumIdsLoadMore(peerId, _storiesAddToAlbumId);
+	}
+
+	const auto akey = Data::StoryAlbumIdsKey{ peerId, _storiesAddToAlbumId };
+	rpl::single(rpl::empty) | rpl::then(
+		stories->albumIdsChanged() | rpl::filter(
+			rpl::mappers::_1 == akey
+		) | rpl::to_empty
+	) | rpl::on_next([=] {
+		_storiesAddToAlbumTotal = stories->albumIdsCount(
+			peerId,
+			_storiesAddToAlbumId);
+
+		const auto albumId = _storiesAddToAlbumId;
+		const auto &ids = stories->albumKnownInArchive(peerId, albumId);
+		const auto loadedCount = int(ids.size());
+		const auto total = std::max(_storiesAddToAlbumTotal, loadedCount);
+		const auto nonLoadedInAlbum = total - loadedCount;
+
+		const auto appConfig = &_controller->session().appConfig();
+		const auto totalLimit = appConfig->storiesAlbumLimit();
+
+		_selectedLimit = std::max(totalLimit - nonLoadedInAlbum, 0);
+	}, lifetime());
+}
+
 rpl::producer<int> ListWidget::scrollToRequests() const {
 	return _scrollToRequests.events();
 }
@@ -268,13 +365,23 @@ void ListWidget::selectionAction(SelectionAction action) {
 	case SelectionAction::Clear: clearSelected(); return;
 	case SelectionAction::Forward: forwardSelected(); return;
 	case SelectionAction::Delete: deleteSelected(); return;
-	case SelectionAction::ToggleStoryInProfile:
-		toggleStoryInProfileSelected();
+	case SelectionAction::ToggleStoryToProfile:
+		toggleStoryInProfileSelected(true);
+		return;
+	case SelectionAction::ToggleStoryToArchive:
+		toggleStoryInProfileSelected(false);
 		return;
 	case SelectionAction::ToggleStoryPin: toggleStoryPinSelected(); return;
 	}
 }
 
+void ListWidget::setReorderDescriptor(ReorderDescriptor descriptor) {
+	_reorderDescriptor = std::move(descriptor);
+	if (!_reorderDescriptor.save) {
+		cancelReorder();
+	}
+}
+
 QRect ListWidget::getCurrentSongGeometry() {
 	const auto type = AudioMsgId::Type::Song;
 	const auto current = ::Media::Player::instance()->current(type);
@@ -297,6 +404,8 @@ void ListWidget::restart() {
 	_heavyLayouts.clear();
 
 	_provider->restart();
+
+	_reorderState = {};
 }
 
 void ListWidget::itemRemoved(not_null<const HistoryItem*> item) {
@@ -308,8 +417,12 @@ void ListWidget::itemRemoved(not_null<const HistoryItem*> item) {
 		_contextItem = nullptr;
 	}
 
+	if (_reorderState.item && _reorderState.item->getItem() == item) {
+		_reorderState = {};
+	}
+
 	auto needHeightRefresh = false;
-	auto sectionIt = findSectionByItem(item);
+	const auto sectionIt = findSectionByItem(item);
 	if (sectionIt != _sections.end()) {
 		if (sectionIt->removeItem(item)) {
 			if (sectionIt->empty()) {
@@ -343,7 +456,7 @@ void ListWidget::itemRemoved(not_null<const HistoryItem*> item) {
 }
 
 auto ListWidget::collectSelectedItems() const -> SelectedItems {
-	auto convert = [&](
+	const auto convert = [&](
 			not_null<const HistoryItem*> item,
 			const SelectionData &selection) {
 		auto result = SelectedItem(item->globalId());
@@ -351,9 +464,10 @@ auto ListWidget::collectSelectedItems() const -> SelectedItems {
 		result.canForward = selection.canForward;
 		result.canToggleStoryPin = selection.canToggleStoryPin;
 		result.canUnpinStory = selection.canUnpinStory;
+		result.storyInProfile = selection.storyInProfile;
 		return result;
 	};
-	auto transformation = [&](const auto &item) {
+	const auto transformation = [&](const auto &item) {
 		return convert(item.first, item.second);
 	};
 	auto items = SelectedItems(_provider->type());
@@ -483,6 +597,10 @@ bool ListWidget::itemVisible(not_null<const BaseLayout*> item) {
 	return true;
 }
 
+not_null<StickerPremiumMark*> ListWidget::hiddenMark() {
+	return _hiddenMark.get();
+}
+
 QString ListWidget::tooltipText() const {
 	if (const auto link = ClickHandler::getActive()) {
 		return link->tooltip();
@@ -501,13 +619,13 @@ bool ListWidget::tooltipWindowActive() const {
 void ListWidget::openPhoto(not_null<PhotoData*> photo, FullMsgId id) {
 	using namespace Data;
 
-	const auto tab = _controller->storiesTab();
-	const auto context = (tab == Stories::Tab::Archive)
-		? Data::StoriesContext{ Data::StoriesContextArchive() }
-		: Data::StoriesContext{ Data::StoriesContextSaved() };
+	const auto albumId = _controller->storiesAlbumId();
+	const auto context = Data::StoriesContext{
+		Data::StoriesContextAlbum{ albumId }
+	};
 	_controller->parentController()->openPhoto(
 		photo,
-		{ id, topicRootId() },
+		{ id, topicRootId(), monoforumPeerId(), showDrawButton() },
 		_controller->storiesPeer() ? &context : nullptr);
 }
 
@@ -515,17 +633,28 @@ void ListWidget::openDocument(
 		not_null<DocumentData*> document,
 		FullMsgId id,
 		bool showInMediaView) {
-	const auto tab = _controller->storiesTab();
-	const auto context = (tab == Stories::Tab::Archive)
-		? Data::StoriesContext{ Data::StoriesContextArchive() }
-		: Data::StoriesContext{ Data::StoriesContextSaved() };
+	const auto albumId = _controller->storiesAlbumId();
+	const auto context = Data::StoriesContext{
+		Data::StoriesContextAlbum{ albumId }
+	};
 	_controller->parentController()->openDocument(
 		document,
 		showInMediaView,
-		{ id, topicRootId() },
+		{ id, topicRootId(), monoforumPeerId(), showDrawButton() },
 		_controller->storiesPeer() ? &context : nullptr);
 }
 
+bool ListWidget::showDrawButton() const {
+	if (const auto topic = _controller->key().topic()) {
+		return Data::CanSendAnyOf(topic, Data::FilesSendRestrictions());
+	} else if (const auto sublist = _controller->key().sublist()) {
+		return Data::CanSendAnyOf(sublist, Data::FilesSendRestrictions());
+	} else if (const auto peer = _controller->key().peer()) {
+		return Data::CanSendAnyOf(peer, Data::FilesSendRestrictions());
+	}
+	return false;
+}
+
 void ListWidget::trackSession(not_null<Main::Session*> session) {
 	if (_trackedSessions.contains(session)) {
 		return;
@@ -533,14 +662,44 @@ void ListWidget::trackSession(not_null<Main::Session*> session) {
 	auto &lifetime = _trackedSessions.emplace(session).first->second;
 	subscribeToSession(session, lifetime);
 	session->account().sessionChanges(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		_trackedSessions.remove(session);
 	}, lifetime);
 }
 
+void ListWidget::markStoryMsgsSelected() {
+	const auto now = int(_storyMsgsToMarkSelected.size());
+	const auto guard = gsl::finally([&] {
+		if (now != int(_storyMsgsToMarkSelected.size())) {
+			pushSelectedItems();
+		}
+	});
+	const auto selection = FullSelection;
+	for (const auto &section : _sections) {
+		for (const auto &entry : section.items()) {
+			const auto item = entry->getItem();
+			const auto id = item->id;
+			const auto i = _storyMsgsToMarkSelected.find(id);
+			if (i != end(_storyMsgsToMarkSelected)) {
+				ChangeItemSelection(
+					_selected,
+					item,
+					_provider->computeSelectionData(item, selection),
+					_selectedLimit);
+				repaintItem(item);
+				_storyMsgsToMarkSelected.erase(i);
+				if (_storyMsgsToMarkSelected.empty()) {
+					return;
+				}
+			}
+		}
+	}
+}
+
 void ListWidget::refreshRows() {
 	saveScrollState();
 
+	_reorderState = {};
 	_sections.clear();
 	_sections = _provider->fillSections(this);
 
@@ -548,6 +707,8 @@ void ListWidget::refreshRows() {
 		for (const auto &item : _sections.back().items()) {
 			trackSession(&item->getItem()->history()->session());
 		}
+	} else if (!_storyMsgsToMarkSelected.empty()) {
+		markStoryMsgsSelected();
 	}
 
 	if (const auto count = _provider->fullCount()) {
@@ -579,24 +740,41 @@ void ListWidget::restoreState(not_null<Memento*> memento) {
 
 int ListWidget::resizeGetHeight(int newWidth) {
 	if (newWidth > 0) {
+		const auto gridSize = _zoom->minGridSize();
 		for (auto &section : _sections) {
+			section.setCanReorder(canReorder());
+			section.setMinGridSize(gridSize);
 			section.resizeToWidth(newWidth);
 		}
 	}
 	return recountHeight();
 }
 
-auto ListWidget::findItemByPoint(QPoint point) const -> FoundItem {
+auto ListWidget::findSectionAndItem(QPoint point) const
+		-> std::pair<std::vector<Section>::const_iterator, FoundItem> {
 	Expects(!_sections.empty());
 
 	auto sectionIt = findSectionAfterTop(point.y());
 	if (sectionIt == _sections.end()) {
 		--sectionIt;
 	}
-	auto shift = QPoint(0, sectionIt->top());
-	return foundItemInSection(
-		sectionIt->findItemByPoint(point - shift),
-		*sectionIt);
+	const auto shift = QPoint(0, sectionIt->top());
+	return {
+		sectionIt,
+		foundItemInSection(
+			sectionIt->findItemByPoint(point - shift),
+			*sectionIt)
+	};
+}
+
+auto ListWidget::findItemByPoint(QPoint point) const -> FoundItem {
+	return findSectionAndItem(point).second;
+}
+
+auto ListWidget::findItemByPointWithSection(QPoint point) const
+		-> ListFoundItemWithSection {
+	const auto [sectionIt, item] = findSectionAndItem(point);
+	return { item, &(*sectionIt) };
 }
 
 auto ListWidget::findItemByItem(const HistoryItem *item)
@@ -604,7 +782,7 @@ auto ListWidget::findItemByItem(const HistoryItem *item)
 	if (!item || !_provider->isPossiblyMyItem(item)) {
 		return std::nullopt;
 	}
-	auto sectionIt = findSectionByItem(item);
+	const auto sectionIt = findSectionByItem(item);
 	if (sectionIt != _sections.end()) {
 		if (const auto found = sectionIt->findItemByItem(item)) {
 			return foundItemInSection(*found, *sectionIt);
@@ -614,7 +792,7 @@ auto ListWidget::findItemByItem(const HistoryItem *item)
 }
 
 auto ListWidget::findItemDetails(not_null<BaseLayout*> item)
--> FoundItem {
+ -> FoundItem {
 	const auto sectionIt = findSectionByItem(item->getItem());
 	Assert(sectionIt != _sections.end());
 	return foundItemInSection(sectionIt->findItemDetails(item), *sectionIt);
@@ -694,7 +872,7 @@ void ListWidget::toggleScrollDateShown() {
 }
 
 void ListWidget::checkMoveToOtherViewer() {
-	auto visibleHeight = (_visibleBottom - _visibleTop);
+	const auto visibleHeight = (_visibleBottom - _visibleTop);
 	if (width() <= 0
 		|| visibleHeight <= 0
 		|| _sections.empty()
@@ -702,12 +880,12 @@ void ListWidget::checkMoveToOtherViewer() {
 		return;
 	}
 
-	auto topItem = findItemByPoint({ st::infoMediaSkip, _visibleTop });
-	auto bottomItem = findItemByPoint({ st::infoMediaSkip, _visibleBottom });
+	const auto topItem = findItemByPoint({ st::infoMediaSkip, _visibleTop });
+	const auto bottomItem = findItemByPoint({ st::infoMediaSkip, _visibleBottom });
 
-	auto preloadBefore = kPreloadIfLessThanScreens * visibleHeight;
-	auto preloadTop = (_visibleTop < preloadBefore);
-	auto preloadBottom = (height() - _visibleBottom < preloadBefore);
+	const auto preloadBefore = kPreloadIfLessThanScreens * visibleHeight;
+	const auto preloadTop = (_visibleTop < preloadBefore);
+	const auto preloadBottom = (height() - _visibleBottom < preloadBefore);
 
 	_provider->checkPreload(
 		{ width(), visibleHeight },
@@ -744,15 +922,19 @@ void ListWidget::clearHeavyItems() {
 }
 
 ListScrollTopState ListWidget::countScrollState() const {
+	return countScrollState({ st::infoMediaSkip, _visibleTop });
+}
+
+ListScrollTopState ListWidget::countScrollState(QPoint anchor) const {
 	if (_sections.empty() || _visibleTop <= 0) {
 		return {};
 	}
-	const auto topItem = findItemByPoint({ st::infoMediaSkip, _visibleTop });
-	const auto item = topItem.layout->getItem();
+	const auto anchorItem = findItemByPoint(anchor);
+	const auto item = anchorItem.layout->getItem();
 	return {
 		.position = _provider->scrollTopStatePosition(item),
 		.item = item,
-		.shift = _visibleTop - topItem.geometry.y(),
+		.shift = _visibleTop - anchorItem.geometry.y(),
 	};
 }
 
@@ -778,44 +960,92 @@ void ListWidget::restoreScrollState() {
 	if (!found) {
 		return;
 	}
-	auto item = foundItemInSection(*found, *sectionIt);
-	auto newVisibleTop = item.geometry.y() + _scrollTopState.shift;
+	const auto item = foundItemInSection(*found, *sectionIt);
+	const auto newVisibleTop = item.geometry.y() + _scrollTopState.shift;
 	if (_visibleTop != newVisibleTop) {
 		_scrollToRequests.fire_copy(newVisibleTop);
 	}
 	_scrollTopState = ListScrollTopState();
 }
 
+bool ListWidget::keepPhotoMediaLoaded() {
+	return _zoom->isZoomable();
+}
+
+void ListWidget::zoomIn() {
+	_zoom->zoomIn();
+}
+
+void ListWidget::zoomOut() {
+	_zoom->zoomOut();
+}
+
+bool ListWidget::canZoomIn() const {
+	return _zoom->canZoomIn();
+}
+
+bool ListWidget::canZoomOut() const {
+	return _zoom->canZoomOut();
+}
+
+bool ListWidget::processZoomWheel(not_null<QWheelEvent*> e) {
+	return _zoom->processWheel(e);
+}
+
 MsgId ListWidget::topicRootId() const {
 	const auto topic = _controller->key().topic();
 	return topic ? topic->rootId() : MsgId(0);
 }
 
+PeerId ListWidget::monoforumPeerId() const {
+	const auto sublist = _controller->key().sublist();
+	return sublist ? sublist->sublistPeer()->id : PeerId(0);
+}
+
 QMargins ListWidget::padding() const {
 	return st::infoMediaMargin;
 }
 
+bool ListWidget::eventHook(QEvent *e) {
+	if (e->type() == QEvent::NativeGesture) {
+		const auto gesture = static_cast<QNativeGestureEvent*>(e);
+		if (_zoom->handleNativeGesture(gesture)) {
+			return true;
+		}
+	}
+	return RpWidget::eventHook(e);
+}
+
 void ListWidget::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
-	auto outerWidth = width();
-	auto clip = e->rect();
-	auto ms = crl::now();
-	auto fromSectionIt = findSectionAfterTop(clip.y());
-	auto tillSectionIt = findSectionAfterBottom(
+	if (_zoom->paint(p)) {
+		return;
+	}
+
+	const auto outerWidth = width();
+	const auto clip = e->rect();
+	const auto ms = crl::now();
+	const auto fromSectionIt = findSectionAfterTop(clip.y());
+	const auto tillSectionIt = findSectionAfterBottom(
 		fromSectionIt,
 		clip.y() + clip.height());
 	const auto window = _controller->parentController();
 	const auto paused = window->isGifPausedAtLeastFor(
 		Window::GifPauseReason::Layer);
+	const auto selecting = hasSelectedItems() || _storiesAddToAlbumId;
+	const auto paintContext = Overview::Layout::PaintContext(ms, selecting, paused);
 	auto context = ListContext{
-		Overview::Layout::PaintContext(ms, hasSelectedItems(), paused),
+		paintContext,
 		&_selected,
 		&_dragSelected,
 		_dragSelectAction
 	};
+	if (_mouseAction == MouseAction::Reordering && _reorderState.item) {
+		context.draggedItem = _reorderState.item;
+	}
 	for (auto it = fromSectionIt; it != tillSectionIt; ++it) {
-		auto top = it->top();
+		const auto top = it->top();
 		p.translate(0, top);
 		it->paint(p, context, clip.translated(0, -top), outerWidth);
 		p.translate(0, -top);
@@ -824,6 +1054,33 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 		fromSectionIt->paintFloatingHeader(p, _visibleTop, outerWidth);
 	}
 
+	if (_mouseAction == MouseAction::Reordering && _reorderState.item) {
+		const auto o = ScopedPainterOpacity(p, 0.8);
+		p.translate(_reorderState.currentPos);
+		const auto isOneColumn = _reorderState.section
+			&& _reorderState.section->isOneColumn();
+		_reorderState.item->paint(
+			p,
+			QRect(
+				0,
+				0,
+				_reorderState.item->maxWidth(),
+				_reorderState.item->minHeight()),
+			isOneColumn ? TextSelection{} : FullSelection,
+			&context.layoutContext);
+
+		if (isOneColumn) {
+			st::stickersReorderIcon.paint(
+				p,
+				width()
+					- _reorderState.section->oneColumnRightPadding() * 2,
+				(_reorderState.item->minHeight()
+					- st::stickersReorderIcon.height()) / 2,
+				outerWidth);
+		}
+		p.translate(-_reorderState.currentPos);
+	}
+
 	if (_dateBadge->goodType && clip.intersects(_dateBadge->rect)) {
 		const auto scrollDateOpacity
 			= _dateBadge->opacity.value(_dateBadge->shown ? 1. : 0.);
@@ -857,7 +1114,7 @@ void ListWidget::mousePressEvent(QMouseEvent *e) {
 }
 
 void ListWidget::mouseMoveEvent(QMouseEvent *e) {
-	auto buttonsPressed = (e->buttons() & (Qt::LeftButton | Qt::MiddleButton));
+	const auto buttonsPressed = (e->buttons() & (Qt::LeftButton | Qt::MiddleButton));
 	if (!buttonsPressed && _mouseAction != MouseAction::None) {
 		mouseReleaseEvent(e);
 	}
@@ -879,6 +1136,9 @@ void ListWidget::mouseDoubleClickEvent(QMouseEvent *e) {
 void ListWidget::showContextMenu(
 		QContextMenuEvent *e,
 		ContextMenuSource source) {
+	if (_storiesAddToAlbumId) {
+		return;
+	}
 	if (_contextMenu) {
 		_contextMenu = nullptr;
 		repaintItem(_contextItem);
@@ -934,13 +1194,18 @@ void ListWidget::showContextMenu(
 			return !item.second.canToggleStoryPin;
 		});
 	};
+	const auto allInProfile = [&] {
+		return ranges::all_of(_selected, [](auto &&item) {
+			return item.second.storyInProfile;
+		});
+	};
 	const auto canUnpinStoryAll = [&] {
 		return ranges::any_of(_selected, [](auto &&item) {
 			return item.second.canUnpinStory;
 		});
 	};
 
-	auto link = ClickHandler::getActive();
+	const auto link = ClickHandler::getActive();
 
 	_contextMenu = base::make_unique_q<Ui::PopupMenu>(
 		this,
@@ -965,17 +1230,6 @@ void ListWidget::showContextMenu(
 			link->property(kDocumentLinkMediaProperty).toULongLong())
 		: nullptr;
 	if (lnkPhoto || lnkDocument) {
-		auto [isVideo, isVoice, isAudio] = [&] {
-			if (lnkDocument) {
-				return std::make_tuple(
-					lnkDocument->isVideoFile(),
-					lnkDocument->isVoiceMessage(),
-					lnkDocument->isAudioFile()
-				);
-			}
-			return std::make_tuple(false, false, false);
-		}();
-
 		if (lnkPhoto) {
 		} else {
 			if (lnkDocument->loading()) {
@@ -990,7 +1244,7 @@ void ListWidget::showContextMenu(
 					item,
 					lnkDocument);
 				if (!filepath.isEmpty()) {
-					auto handler = base::fn_delayed(
+					const auto handler = base::fn_delayed(
 						st::defaultDropdownMenu.menu.ripple.hideDuration,
 						this,
 						[filepath] {
@@ -1003,7 +1257,7 @@ void ListWidget::showContextMenu(
 						std::move(handler),
 						&st::menuIconShowInFolder);
 				}
-				auto handler = base::fn_delayed(
+				const auto handler = base::fn_delayed(
 					st::defaultDropdownMenu.menu.ripple.hideDuration,
 					this,
 					[=] {
@@ -1013,16 +1267,11 @@ void ListWidget::showContextMenu(
 							DocumentSaveClickHandler::Mode::ToNewFile);
 					});
 				if (_provider->allowSaveFileAs(item, lnkDocument)) {
-					_contextMenu->addAction(
-						(isVideo
-							? tr::lng_context_save_video(tr::now)
-							: isVoice
-							? tr::lng_context_save_audio(tr::now)
-							: isAudio
-							? tr::lng_context_save_audio_file(tr::now)
-							: tr::lng_context_save_file(tr::now)),
-						std::move(handler),
-						&st::menuIconDownload);
+					HistoryView::AddSaveDocumentAction(
+						Ui::Menu::CreateAddActionCallback(_contextMenu),
+						item,
+						lnkDocument,
+						_controller->parentController());
 				}
 			}
 		}
@@ -1039,13 +1288,14 @@ void ListWidget::showContextMenu(
 	}
 	if (overSelected == SelectionState::OverSelectedItems) {
 		if (canToggleStoryPinAll()) {
-			const auto tab = _controller->key().storiesTab();
-			const auto toProfile = (tab == Stories::Tab::Archive);
+			const auto toProfile = !allInProfile();
 			_contextMenu->addAction(
 				(toProfile
 					? tr::lng_mediaview_save_to_profile
 					: tr::lng_archived_add)(tr::now),
-				crl::guard(this, [this] { toggleStoryInProfileSelected(); }),
+				crl::guard(this, [=] {
+					toggleStoryInProfileSelected(toProfile);
+				}),
 				(toProfile
 					? &st::menuIconStoriesSave
 					: &st::menuIconStoriesArchive));
@@ -1091,14 +1341,15 @@ void ListWidget::showContextMenu(
 				item,
 				FullSelection);
 			if (selectionData.canToggleStoryPin) {
-				const auto tab = _controller->key().storiesTab();
-				const auto toProfile = (tab == Stories::Tab::Archive);
+				const auto toProfile = !selectionData.storyInProfile;
 				_contextMenu->addAction(
 					(toProfile
 						? tr::lng_mediaview_save_to_profile
 						: tr::lng_mediaview_archive_story)(tr::now),
 					crl::guard(this, [=] {
-						toggleStoryInProfile({ 1, globalId.itemId });
+						toggleStoryInProfile(
+							{ 1, globalId.itemId },
+							toProfile);
 					}),
 					(toProfile
 						? &st::menuIconStoriesSave
@@ -1138,6 +1389,10 @@ void ListWidget::showContextMenu(
 		}
 		if (const auto peer = _controller->key().storiesPeer()) {
 			if (!peer->isSelf() && IsStoryMsgId(globalId.itemId.msg)) {
+				::Media::Stories::AddStealthModeMenu(
+					Ui::Menu::CreateAddActionCallback(_contextMenu),
+					peer,
+					_controller->parentController());
 				const auto storyId = FullStoryId{
 					globalId.itemId.peer,
 					StoryIdFromMsgId(globalId.itemId.msg),
@@ -1156,7 +1411,7 @@ void ListWidget::showContextMenu(
 				crl::guard(this, [=] {
 					if (hasSelectedText()) {
 						clearSelected();
-					} else if (_selected.size() == MaxSelectedItems) {
+					} else if (_selected.size() == _selectedLimit) {
 						return;
 					} else if (_selected.empty()) {
 						update();
@@ -1169,6 +1424,10 @@ void ListWidget::showContextMenu(
 		}
 	}
 
+	if (_contextMenu->empty()) {
+		_contextMenu = nullptr;
+		return;
+	}
 	_contextMenu->setDestroyedCallback(crl::guard(
 		this,
 		[=] {
@@ -1213,8 +1472,8 @@ void ListWidget::forwardItems(MessageIdsList &&items) {
 					{ id.peer, StoryIdFromMsgId(id.msg) }));
 		}
 	} else {
-		auto callback = [weak = Ui::MakeWeak(this)] {
-			if (const auto strong = weak.data()) {
+		const auto callback = [weak = base::make_weak(this)] {
+			if (const auto strong = weak.get()) {
 				strong->clearSelected();
 			}
 		};
@@ -1231,10 +1490,11 @@ void ListWidget::deleteSelected() {
 	}));
 }
 
-void ListWidget::toggleStoryInProfileSelected() {
-	toggleStoryInProfile(collectSelectedIds(), crl::guard(this, [=] {
-		clearSelected();
-	}));
+void ListWidget::toggleStoryInProfileSelected(bool toProfile) {
+	toggleStoryInProfile(
+		collectSelectedIds(),
+		toProfile,
+		crl::guard(this, [=] { clearSelected(); }));
 }
 
 void ListWidget::toggleStoryPinSelected() {
@@ -1249,6 +1509,7 @@ void ListWidget::toggleStoryPinSelected() {
 
 void ListWidget::toggleStoryInProfile(
 		MessageIdsList &&items,
+		bool toProfile,
 		Fn<void()> confirmed) {
 	auto list = std::vector<FullStoryId>();
 	for (const auto &id : items) {
@@ -1261,7 +1522,6 @@ void ListWidget::toggleStoryInProfile(
 	}
 	const auto channel = peerIsChannel(list.front().peer);
 	const auto count = int(list.size());
-	const auto toProfile = (_controller->storiesTab() == Stories::Tab::Archive);
 	const auto controller = _controller;
 	const auto sure = [=](Fn<void()> close) {
 		using namespace ::Media::Stories;
@@ -1362,7 +1622,7 @@ void ListWidget::deleteItems(SelectedItems &&items, Fn<void()> confirmed) {
 				: tr::lng_downloads_delete_in_cloud(tr::now));
 		const auto deleteSure = [=] {
 			Ui::PostponeCall(this, [=] {
-				if (const auto box = _actionBoxWeak.data()) {
+				if (const auto box = _actionBoxWeak.get()) {
 					box->closeBox();
 				}
 			});
@@ -1422,10 +1682,10 @@ void ListWidget::deleteItems(SelectedItems &&items, Fn<void()> confirmed) {
 	}
 }
 
-void ListWidget::setActionBoxWeak(QPointer<Ui::BoxContent> box) {
+void ListWidget::setActionBoxWeak(base::weak_qptr<Ui::BoxContent> box) {
 	if ((_actionBoxWeak = box)) {
 		_actionBoxWeakLifetime = _actionBoxWeak->alive(
-		) | rpl::start_with_done([weak = Ui::MakeWeak(this)]{
+		) | rpl::on_done([weak = base::make_weak(this)]{
 			if (weak) {
 				weak->_checkForHide.fire({});
 			}
@@ -1434,11 +1694,11 @@ void ListWidget::setActionBoxWeak(QPointer<Ui::BoxContent> box) {
 }
 
 void ListWidget::trySwitchToWordSelection() {
-	auto selectingSome = (_mouseAction == MouseAction::Selecting)
+	const auto selectingSome = (_mouseAction == MouseAction::Selecting)
 		&& hasSelectedText();
-	auto willSelectSome = (_mouseAction == MouseAction::None)
+	const auto willSelectSome = (_mouseAction == MouseAction::None)
 		&& !hasSelectedItems();
-	auto checkSwitchToWordSelection = _overLayout
+	const auto checkSwitchToWordSelection = _overLayout
 		&& (_mouseSelectType == TextSelectType::Letters)
 		&& (selectingSome || willSelectSome);
 	if (checkSwitchToWordSelection) {
@@ -1460,7 +1720,7 @@ void ListWidget::switchToWordSelection() {
 	if (_mouseAction == MouseAction::None) {
 		_mouseAction = MouseAction::Selecting;
 		clearSelected();
-		auto selStatus = TextSelection {
+		const auto selStatus = TextSelection {
 			dragState.symbol,
 			dragState.symbol
 		};
@@ -1479,14 +1739,15 @@ void ListWidget::applyItemSelection(
 		&& ChangeItemSelection(
 			_selected,
 			item,
-			_provider->computeSelectionData(item, selection))) {
+			_provider->computeSelectionData(item, selection),
+			_selectedLimit)) {
 		repaintItem(item);
 		pushSelectedItems();
 	}
 }
 
 void ListWidget::toggleItemSelection(not_null<HistoryItem*> item) {
-	auto it = _selected.find(item);
+	const auto it = _selected.find(item);
 	if (it == _selected.cend()) {
 		applyItemSelection(item, FullSelection);
 	} else {
@@ -1528,9 +1789,9 @@ bool ListWidget::isPressInSelectedText(TextState state) const {
 		|| !isItemUnderPressSelected()) {
 		return false;
 	}
-	auto pressedSelection = itemUnderPressSelection();
-	auto from = pressedSelection->second.text.from;
-	auto to = pressedSelection->second.text.to;
+	const auto pressedSelection = itemUnderPressSelection();
+	const auto from = pressedSelection->second.text.from;
+	const auto to = pressedSelection->second.text.to;
 	return (state.symbol >= from && state.symbol < to);
 }
 
@@ -1550,7 +1811,7 @@ void ListWidget::clearSelected() {
 
 void ListWidget::validateTrippleClickStartTime() {
 	if (_trippleClickStartTime) {
-		auto elapsed = (crl::now() - _trippleClickStartTime);
+		const auto elapsed = (crl::now() - _trippleClickStartTime);
 		if (elapsed >= QApplication::doubleClickInterval()) {
 			_trippleClickStartTime = 0;
 		}
@@ -1586,16 +1847,22 @@ QPoint ListWidget::clampMousePosition(QPoint position) const {
 }
 
 void ListWidget::mouseActionUpdate(const QPoint &globalPosition) {
-	if (_sections.empty() || _visibleBottom <= _visibleTop) {
+	if (_sections.empty()
+		|| _visibleBottom <= _visibleTop
+		|| _returnAnimation.animating()) {
 		return;
 	}
 
 	_mousePosition = globalPosition;
 
-	auto local = mapFromGlobal(_mousePosition);
-	auto point = clampMousePosition(local);
-	auto [layout, geometry, inside] = findItemByPoint(point);
-	auto state = MouseState{
+	const auto local = mapFromGlobal(_mousePosition);
+	const auto point = clampMousePosition(local);
+	const auto [foundItem, section] = findItemByPointWithSection(point);
+	const auto [layout, geometry, inside] = std::tie(
+		foundItem.layout,
+		foundItem.geometry,
+		foundItem.exact);
+	const auto state = MouseState{
 		layout->getItem(),
 		geometry.size(),
 		point - geometry.topLeft(),
@@ -1608,17 +1875,30 @@ void ListWidget::mouseActionUpdate(const QPoint &globalPosition) {
 	}
 	_overState = state;
 
-	TextState dragState;
-	ClickHandlerHost *lnkhost = nullptr;
+	const auto inDragArea = canReorder()
+		&& section
+		&& section->isOneColumn()
+		&& point.y() >= geometry.y()
+		&& point.y() < geometry.bottom()
+		&& ((point.x() - geometry.x())
+			>= (geometry.width()
+				- section->oneColumnRightPadding()
+				- st::stickersReorderSkip));
+	if (_inDragArea != inDragArea) {
+		_inDragArea = inDragArea;
+	}
+
+	auto dragState = TextState();
+	auto lnkhost = (ClickHandlerHost*)(nullptr);
 	auto inTextSelection = _overState.inside
 		&& (_overState.item == _pressState.item)
 		&& hasSelectedText();
 	if (_overLayout) {
-		auto cursorDeltaLength = [&] {
-			auto cursorDelta = (_overState.cursor - _pressState.cursor);
+		const auto cursorDeltaLength = [&] {
+			const auto cursorDelta = (_overState.cursor - _pressState.cursor);
 			return cursorDelta.manhattanLength();
 		};
-		auto dragStartLength = [] {
+		const auto dragStartLength = [] {
 			return QApplication::startDragDistance();
 		};
 		if (_overState.item != _pressState.item
@@ -1628,8 +1908,13 @@ void ListWidget::mouseActionUpdate(const QPoint &globalPosition) {
 				InvokeQueued(this, [this] { performDrag(); });
 			} else if (_mouseAction == MouseAction::PrepareSelect) {
 				_mouseAction = MouseAction::Selecting;
+			} else if (_mouseAction == MouseAction::PrepareReorder) {
+				updateReorder(_mousePosition);
 			}
 		}
+		if (_mouseAction == MouseAction::Reordering) {
+			updateReorder(_mousePosition);
+		}
 		StateRequest request;
 		if (_mouseAction == MouseAction::Selecting) {
 			request.flags |= Ui::Text::StateRequest::Flag::LookupSymbol;
@@ -1649,7 +1934,7 @@ void ListWidget::mouseActionUpdate(const QPoint &globalPosition) {
 
 	if (_mouseAction == MouseAction::None) {
 		_mouseCursorState = dragState.cursor;
-		auto cursor = computeMouseCursor();
+		const auto cursor = computeMouseCursor();
 		if (_cursor != cursor) {
 			setCursor(_cursor = cursor);
 		}
@@ -1667,7 +1952,7 @@ void ListWidget::mouseActionUpdate(const QPoint &globalPosition) {
 				selState = _overLayout->adjustSelection(selState, _mouseSelectType);
 			}
 			applyItemSelection(_overState.item, selState);
-			auto hasSelection = (selState == FullSelection)
+			const auto hasSelection = (selState == FullSelection)
 				|| (selState.from != selState.to);
 			if (!_wasSelectedText && hasSelection) {
 				_wasSelectedText = true;
@@ -1690,7 +1975,9 @@ void ListWidget::mouseActionUpdate(const QPoint &globalPosition) {
 }
 
 style::cursor ListWidget::computeMouseCursor() const {
-	if (ClickHandler::getPressed() || ClickHandler::getActive()) {
+	if (_inDragArea && canReorder()) {
+		return style::cur_sizeall;
+	} else if (ClickHandler::getPressed() || ClickHandler::getActive()) {
 		return style::cur_pointer;
 	} else if (!hasSelectedItems()
 		&& (_mouseCursorState == CursorState::Text)) {
@@ -1702,7 +1989,7 @@ style::cursor ListWidget::computeMouseCursor() const {
 void ListWidget::updateDragSelection() {
 	auto fromState = _pressState;
 	auto tillState = _overState;
-	auto swapStates = isAfter(fromState, tillState);
+	const auto swapStates = isAfter(fromState, tillState);
 	if (swapStates) {
 		std::swap(fromState, tillState);
 	}
@@ -1722,7 +2009,7 @@ void ListWidget::updateDragSelection() {
 		if (_dragSelected.empty()) {
 			return DragSelectAction::None;
 		}
-		auto &[firstDragItem, data] = swapStates
+		const auto &[firstDragItem, data] = swapStates
 			? _dragSelected.front()
 			: _dragSelected.back();
 		if (isSelectedItem(_selected.find(firstDragItem))) {
@@ -1764,7 +2051,7 @@ void ListWidget::mouseActionStart(
 		_pressState = _overState;
 		repaintItem(_overLayout);
 	}
-	auto pressLayout = _overLayout;
+	const auto pressLayout = _overLayout;
 
 	_mouseAction = MouseAction::None;
 	_pressWasInactive = Ui::WasInactivePress(
@@ -1775,8 +2062,18 @@ void ListWidget::mouseActionStart(
 			false);
 	}
 
+	if (_inDragArea && canReorder() && !hasSelected()) {
+		startReorder(globalPosition);
+		if (_mouseAction == MouseAction::PrepareReorder) {
+			return;
+		}
+	}
+
 	if (ClickHandler::getPressed() && !hasSelected()) {
 		_mouseAction = MouseAction::PrepareDrag;
+		if (canReorder()) {
+			startReorder(globalPosition);
+		}
 	} else if (hasSelectedItems()) {
 		if (isItemUnderPressSelected() && ClickHandler::getPressed()) {
 			// In shared media overview drag only by click handlers.
@@ -1788,17 +2085,25 @@ void ListWidget::mouseActionStart(
 	if (_mouseAction == MouseAction::None && pressLayout) {
 		validateTrippleClickStartTime();
 		TextState dragState;
-		auto startDistance = (globalPosition - _trippleClickPoint).manhattanLength();
-		auto validStartPoint = startDistance < QApplication::startDragDistance();
+		const auto startDistance = (globalPosition
+			- _trippleClickPoint).manhattanLength();
+		const auto validStartPoint = startDistance
+			< QApplication::startDragDistance();
 		if (_trippleClickStartTime != 0 && validStartPoint) {
 			StateRequest request;
 			request.flags = Ui::Text::StateRequest::Flag::LookupSymbol;
 			dragState = pressLayout->getState(_pressState.cursor, request);
 			if (dragState.cursor == CursorState::Text) {
-				TextSelection selStatus = { dragState.symbol, dragState.symbol };
-				if (selStatus != FullSelection && !hasSelectedItems()) {
+				const auto selStatus = TextSelection{
+					dragState.symbol,
+					dragState.symbol,
+				};
+				if (selStatus != FullSelection
+					&& !hasSelectedItems()) {
 					clearSelected();
-					applyItemSelection(_pressState.item, selStatus);
+					applyItemSelection(
+						_pressState.item,
+						selStatus);
 					_mouseTextSymbol = dragState.symbol;
 					_mouseAction = MouseAction::Selecting;
 					_mouseSelectType = TextSelectType::Paragraphs;
@@ -1809,7 +2114,9 @@ void ListWidget::mouseActionStart(
 		} else {
 			StateRequest request;
 			request.flags = Ui::Text::StateRequest::Flag::LookupSymbol;
-			dragState = pressLayout->getState(_pressState.cursor, request);
+			dragState = pressLayout->getState(
+				_pressState.cursor,
+				request);
 		}
 		if (_mouseSelectType != TextSelectType::Paragraphs) {
 			if (_pressState.inside) {
@@ -1820,14 +2127,19 @@ void ListWidget::mouseActionStart(
 					if (requiredToStartDragging(pressLayout)) {
 						_mouseAction = MouseAction::PrepareDrag;
 					} else {
-						if (dragState.afterSymbol) ++_mouseTextSymbol;
-						TextSelection selStatus = {
+						if (dragState.afterSymbol) {
+							++_mouseTextSymbol;
+						}
+						const auto selStatus = TextSelection{
 							_mouseTextSymbol,
 							_mouseTextSymbol,
 						};
-						if (selStatus != FullSelection && !hasSelectedItems()) {
+						if (selStatus != FullSelection
+							&& !hasSelectedItems()) {
 							clearSelected();
-							applyItemSelection(_pressState.item, selStatus);
+							applyItemSelection(
+								_pressState.item,
+								selStatus);
 							_mouseAction = MouseAction::Selecting;
 							repaintItem(pressLayout);
 						} else if (!_provider->hasSelectRestriction()) {
@@ -1854,91 +2166,47 @@ void ListWidget::mouseActionCancel() {
 	_mouseAction = MouseAction::None;
 	clearDragSelection();
 	_wasSelectedText = false;
+	cancelReorder();
 //	_widget->noSelectingScroll(); // #TODO scroll by drag
 }
 
 void ListWidget::performDrag() {
-	if (_mouseAction != MouseAction::Dragging) return;
-
-	auto uponSelected = false;
-	if (_pressState.item && _pressState.inside) {
-		if (hasSelectedItems()) {
-			uponSelected = isItemUnderPressSelected();
-		} else if (const auto pressLayout = _provider->lookupLayout(
-				_pressState.item)) {
-			StateRequest request;
-			request.flags |= Ui::Text::StateRequest::Flag::LookupSymbol;
-			const auto dragState = pressLayout->getState(
-				_pressState.cursor,
-				request);
-			uponSelected = isPressInSelectedText(dragState);
-		}
+	if (_mouseAction != MouseAction::Dragging) {
+		return;
+	} else if (_provider->hasSelectRestriction()) {
+		return;
 	}
-	auto pressedHandler = ClickHandler::getPressed();
-
-	if (dynamic_cast<VoiceSeekClickHandler*>(pressedHandler.get())) {
+	const auto pressedHandler = ClickHandler::getPressed();
+	if (!pressedHandler
+		|| dynamic_cast<VoiceSeekClickHandler*>(pressedHandler.get())) {
+		return;
+	}
+	const auto document = reinterpret_cast<DocumentData*>(
+		pressedHandler->property(
+			kDocumentLinkMediaProperty).toULongLong());
+	if (!document) {
 		return;
 	}
+	const auto filepath = document->filepath(true);
+	if (filepath.isEmpty()) {
+		return;
+	}
+	auto mimeData = std::make_unique<QMimeData>();
+	mimeData->setUrls({ QUrl::fromLocalFile(filepath) });
 
-	TextWithEntities sel;
-	//QList<QUrl> urls;
-	if (uponSelected) {
-//		sel = getSelectedText();
-	} else if (pressedHandler) {
-		sel = { pressedHandler->dragText(), EntitiesInText() };
-		//if (!sel.isEmpty() && sel.at(0) != '/' && sel.at(0) != '@' && sel.at(0) != '#') {
-		//	urls.push_back(QUrl::fromEncoded(sel.toUtf8())); // Google Chrome crashes in Mac OS X O_o
-		//}
+	auto pixmap = QPixmap();
+	if (const auto layout = _provider->lookupLayout(_pressState.item)) {
+		if (const auto file = dynamic_cast<Overview::Layout::Document*>(
+				layout)) {
+			pixmap = Ui::PixmapFromImage(file->dragPreviewImage());
+		}
 	}
-	//if (auto mimeData = MimeDataFromText(sel)) {
-	//	clearDragSelection();
-	//	_widget->noSelectingScroll();
 
-	//	if (!urls.isEmpty()) mimeData->setUrls(urls);
-	//	if (uponSelected && !Adaptive::OneColumn()) {
-	//		auto selectedState = getSelectionState();
-	//		if (selectedState.count > 0 && selectedState.count == selectedState.canForwardCount) {
-	//			session().data().setMimeForwardIds(collectSelectedIds());
-	//			mimeData->setData(u"application/x-td-forward"_q, "1");
-	//		}
-	//	}
-	//	_controller->parentController()->window()->launchDrag(std::move(mimeData));
-	//	return;
-	//} else {
-	//	auto forwardMimeType = QString();
-	//	auto pressedMedia = static_cast<HistoryView::Media*>(nullptr);
-	//	if (auto pressedItem = _pressState.layout) {
-	//		pressedMedia = pressedItem->getMedia();
-	//		if (_mouseCursorState == CursorState::Date) {
-	//			session().data().setMimeForwardIds(session().data().itemOrItsGroup(pressedItem));
-	//			forwardMimeType = u"application/x-td-forward"_q;
-	//		}
-	//	}
-	//	if (auto pressedLnkItem = App::pressedLinkItem()) {
-	//		if ((pressedMedia = pressedLnkItem->getMedia())) {
-	//			if (forwardMimeType.isEmpty() && pressedMedia->dragItemByHandler(pressedHandler)) {
-	//				session().data().setMimeForwardIds({ 1, pressedLnkItem->fullId() });
-	//				forwardMimeType = u"application/x-td-forward"_q;
-	//			}
-	//		}
-	//	}
-	//	if (!forwardMimeType.isEmpty()) {
-	//		auto mimeData = std::make_unique<QMimeData>();
-	//		mimeData->setData(forwardMimeType, "1");
-	//		if (auto document = (pressedMedia ? pressedMedia->getDocument() : nullptr)) {
-	//			auto filepath = document->filepath(true);
-	//			if (!filepath.isEmpty()) {
-	//				QList<QUrl> urls;
-	//				urls.push_back(QUrl::fromLocalFile(filepath));
-	//				mimeData->setUrls(urls);
-	//			}
-	//		}
-
-	//		// This call enters event loop and can destroy any QObject.
-	//		_controller->parentController()->window()->launchDrag(std::move(mimeData));
-	//		return;
-	//	}
-	//}
+	// This call enters event loop and can destroy any QObject.
+	_controller->parentController()->widget()->launchDrag(
+		std::move(mimeData),
+		crl::guard(this, [=] { mouseActionUpdate(QCursor::pos()); }),
+		std::move(pixmap));
 }
 
 void ListWidget::mouseActionFinish(
@@ -1946,25 +2214,33 @@ void ListWidget::mouseActionFinish(
 		Qt::MouseButton button) {
 	mouseActionUpdate(globalPosition);
 
-	auto pressState = base::take(_pressState);
+	const auto pressState = base::take(_pressState);
 	repaintItem(pressState.item);
 
-	auto simpleSelectionChange = pressState.item
+	const auto selectionMode = hasSelectedItems() || _storiesAddToAlbumId;
+	const auto simpleSelectionChange = pressState.item
 		&& pressState.inside
 		&& !_pressWasInactive
 		&& (button != Qt::RightButton)
 		&& (_mouseAction == MouseAction::PrepareDrag
 			|| _mouseAction == MouseAction::PrepareSelect);
-	auto needSelectionToggle = simpleSelectionChange
-		&& hasSelectedItems();
-	auto needSelectionClear = simpleSelectionChange
+	if (_mouseAction == MouseAction::Reordering) {
+		finishReorder();
+		return;
+	}
+	if (_mouseAction == MouseAction::PrepareReorder) {
+		_reorderState = {};
+		_mouseAction = MouseAction::PrepareDrag;
+	}
+	const auto needSelectionToggle = simpleSelectionChange && selectionMode;
+	const auto needSelectionClear = simpleSelectionChange
 		&& hasSelectedText();
 
 	auto activated = ClickHandler::unpressed();
 	if (_mouseAction == MouseAction::Dragging
 		|| _mouseAction == MouseAction::Selecting) {
 		activated = nullptr;
-	} else if (needSelectionToggle) {
+	} else if (needSelectionToggle || _storiesAddToAlbumId) {
 		activated = nullptr;
 	}
 
@@ -1994,7 +2270,7 @@ void ListWidget::mouseActionFinish(
 		if (!_dragSelected.empty()) {
 			applyDragSelection();
 		} else if (!_selected.empty() && !_pressWasInactive) {
-			auto selection = _selected.cbegin()->second;
+			const auto selection = _selected.cbegin()->second;
 			if (selection.text != FullSelection
 				&& selection.text.from == selection.text.to) {
 				clearSelected();
@@ -2026,7 +2302,8 @@ void ListWidget::applyDragSelection(SelectedMap &applyTo) const {
 			ChangeItemSelection(
 				applyTo,
 				item,
-				_provider->computeSelectionData(item, FullSelection));
+				_provider->computeSelectionData(item, FullSelection),
+				_selectedLimit);
 		}
 	} else if (_dragSelectAction == DragSelectAction::Deselecting) {
 		for (auto &[item, data] : _dragSelected) {
@@ -2048,7 +2325,7 @@ int ListWidget::recountHeight() {
 			}
 		}
 	}
-	auto cachedPadding = padding();
+	const auto cachedPadding = padding();
 	auto result = cachedPadding.top();
 	for (auto &section : _sections) {
 		section.setTop(result);
@@ -2066,7 +2343,7 @@ std::vector<ListSection>::iterator ListWidget::findSectionByItem(
 	if (_sections.size() < 2) {
 		return _sections.begin();
 	}
-	Assert(!_controller->isDownloads());
+	Assert(!_controller->isDownloads() && !_controller->isGlobalMedia());
 	return ranges::lower_bound(
 		_sections,
 		GetUniversalId(item),
@@ -2103,6 +2380,350 @@ auto ListWidget::findSectionAfterBottom(
 		[](const Section &section) { return section.top(); });
 }
 
+void ListWidget::startReorder(const QPoint &globalPos) {
+	if (!canReorder() || _mouseAction == MouseAction::Selecting) {
+		return;
+	}
+	const auto mapped = mapFromGlobal(globalPos);
+	const auto foundWithSection = findItemByPointWithSection(mapped);
+	if (!foundWithSection.section) {
+		return;
+	}
+	if (foundWithSection.section->isOneColumn()
+		? !_inDragArea
+		: !foundWithSection.item.exact) {
+		return;
+	}
+	const auto index = itemIndexFromPoint(mapped
+		- QPoint(foundWithSection.section->oneColumnRightPadding(), 0));
+	if (index < 0) {
+		return;
+	}
+
+	if (_reorderDescriptor.filter) {
+		const auto item = foundWithSection.item.layout->getItem();
+		if (!_reorderDescriptor.filter(item)) {
+			return;
+		}
+	}
+	_reorderState.enabled = true;
+	_reorderState.index = index;
+	_reorderState.targetIndex = index;
+	_reorderState.startPos = globalPos;
+	_reorderState.dragPoint = mapped
+		- foundWithSection.item.geometry.topLeft();
+	_reorderState.item = foundWithSection.item.layout;
+	_reorderState.section = foundWithSection.section;
+	_mouseAction = MouseAction::PrepareReorder;
+}
+
+void ListWidget::updateReorder(const QPoint &globalPos) {
+	if (!_reorderState.enabled || _returnAnimation.animating()) {
+		return;
+	}
+	const auto distance
+		= (globalPos - _reorderState.startPos).manhattanLength();
+	if (_mouseAction == MouseAction::PrepareReorder
+		&& distance > QApplication::startDragDistance()) {
+		_mouseAction = MouseAction::Reordering;
+	}
+	if (_mouseAction == MouseAction::Reordering) {
+		const auto mapped = mapFromGlobal(globalPos);
+		auto localPos = mapped - _reorderState.dragPoint;
+
+		auto currentIndex = 0;
+		for (const auto &section : _sections) {
+			const auto sectionSize = int(section.items().size());
+			if (_reorderState.index >= currentIndex
+				&& _reorderState.index < currentIndex + sectionSize) {
+				if (section.isOneColumn()) {
+					localPos.setX(_reorderState.item
+						? itemGeometryByIndex(_reorderState.index).x()
+						: localPos.x());
+				}
+				break;
+			}
+			currentIndex += sectionSize;
+		}
+
+		_reorderState.currentPos = localPos;
+		const auto newIndex = itemIndexFromPoint(mapped);
+		if (newIndex >= 0 && newIndex != _reorderState.targetIndex) {
+			_reorderState.targetIndex = newIndex;
+			updateShiftAnimations();
+		}
+		update();
+	}
+}
+
+void ListWidget::finishReorder() {
+	if (_returnAnimation.animating()) {
+		return;
+	}
+	if (!_reorderState.enabled || _mouseAction != MouseAction::Reordering) {
+		cancelReorder();
+		return;
+	}
+	finishShiftAnimations();
+	if (_reorderState.index != _reorderState.targetIndex) {
+		reorderItemsInSections(
+			_reorderState.index,
+			_reorderState.targetIndex);
+		if (_reorderDescriptor.save) {
+			_reorderDescriptor.save(
+				_reorderState.index,
+				_reorderState.targetIndex,
+				[=] { /* done */ },
+				[=] { /* fail */ }
+			);
+		}
+	}
+
+	const auto targetIndex = _reorderState.targetIndex;
+	const auto draggedItem = _reorderState.item;
+	if (draggedItem) {
+		const auto targetGeometry = itemGeometryByIndex(targetIndex);
+		if (!targetGeometry.isEmpty()) {
+			const auto startPos = _reorderState.currentPos;
+			const auto endPos = targetGeometry.topLeft()
+				+ rect::m::pos::tl(padding());
+			const auto callback = [=](float64 progress) {
+				const auto currentPos = QPoint(
+					startPos.x() + (endPos.x() - startPos.x()) * progress,
+					startPos.y() + (endPos.y() - startPos.y()) * progress);
+				_reorderState.currentPos = currentPos;
+				update();
+				if (progress == 1.) {
+					cancelReorder();
+				}
+			};
+			_returnAnimation.start(
+				std::move(callback),
+				0.,
+				1.,
+				st::slideWrapDuration);
+			return;
+		}
+	}
+	cancelReorder();
+}
+
+void ListWidget::cancelReorder() {
+	_reorderState = {};
+	finishShiftAnimations();
+	_mouseAction = MouseAction::None;
+	update();
+}
+
+void ListWidget::updateShiftAnimations() {
+	if (_reorderState.index < 0 || _reorderState.targetIndex < 0) {
+		return;
+	}
+	const auto fromIndex = _reorderState.index;
+	const auto toIndex = _reorderState.targetIndex;
+	auto itemIndex = 0;
+	for (const auto &section : _sections) {
+		for (const auto &item : section.items()) {
+			if (itemIndex == fromIndex) {
+				++itemIndex;
+				continue;
+			}
+			auto targetShift = 0;
+			if (fromIndex < toIndex
+				&& itemIndex > fromIndex
+				&& itemIndex <= toIndex) {
+				targetShift = -1;
+			} else if (fromIndex > toIndex
+				&& itemIndex >= toIndex
+				&& itemIndex < fromIndex) {
+				targetShift = 1;
+			}
+			auto &animation = _shiftAnimations[itemIndex];
+			if (animation.targetShift != targetShift) {
+				animation.targetShift = targetShift;
+				const auto fromGeometry = itemGeometryByIndex(itemIndex);
+				const auto toGeometry = itemGeometryByIndex(itemIndex
+					+ targetShift);
+				if (!fromGeometry.isEmpty() && !toGeometry.isEmpty()) {
+					const auto deltaX = toGeometry.x() - fromGeometry.x();
+					const auto deltaY = toGeometry.y() - fromGeometry.y();
+					animation.xAnimation.start(
+						[=](float64 progress) {
+							item->setShiftX(progress);
+							update();
+						},
+						0,
+						deltaX,
+						st::slideWrapDuration);
+					animation.yAnimation.start(
+						[=](float64 progress) {
+							item->setShiftY(progress);
+							update();
+						},
+						0,
+						deltaY,
+						st::slideWrapDuration);
+				}
+				animation.shift = targetShift;
+			}
+			++itemIndex;
+		}
+	}
+}
+
+int ListWidget::itemIndexFromPoint(QPoint point) const {
+	if (_sections.empty()) {
+		return -1;
+	}
+	const auto found = findItemByPoint(point);
+	if (!found.exact) {
+		return -1;
+	}
+	auto index = 0;
+	for (const auto &section : _sections) {
+		for (const auto &item : section.items()) {
+			if (item == found.layout) {
+				return index;
+			}
+			++index;
+		}
+	}
+	return -1;
+}
+
+QRect ListWidget::itemGeometryByIndex(int index) {
+	if (index < 0) {
+		return QRect();
+	}
+	auto currentIndex = 0;
+	for (const auto &section : _sections) {
+		for (const auto &item : section.items()) {
+			if (currentIndex == index) {
+				return section.findItemDetails(item).geometry;
+			}
+			++currentIndex;
+		}
+	}
+	return QRect();
+}
+
+BaseLayout* ListWidget::itemByIndex(int index) {
+	if (index < 0) {
+		return nullptr;
+	}
+	auto currentIndex = 0;
+	for (const auto &section : _sections) {
+		for (const auto &item : section.items()) {
+			if (currentIndex == index) {
+				return item;
+			}
+			++currentIndex;
+		}
+	}
+	return nullptr;
+}
+
+bool ListWidget::canReorder() const {
+	return !!_reorderDescriptor.save;
+}
+
+void ListWidget::reorderItemsInSections(int oldIndex, int newIndex) {
+	if (oldIndex == newIndex || _sections.empty()) {
+		return;
+	}
+
+	auto currentIndex = 0;
+	auto oldSection = (Section*)(nullptr);
+	auto newSection = (Section*)(nullptr);
+	auto oldSectionIndex = -1;
+	auto newSectionIndex = -1;
+
+	for (auto &section : _sections) {
+		const auto sectionSize = int(section.items().size());
+		if (oldIndex >= currentIndex
+			&& oldIndex < currentIndex + sectionSize) {
+			oldSection = &section;
+			oldSectionIndex = oldIndex - currentIndex;
+		}
+		if (newIndex >= currentIndex
+			&& newIndex < currentIndex + sectionSize) {
+			newSection = &section;
+			newSectionIndex = newIndex - currentIndex;
+		}
+		currentIndex += sectionSize;
+	}
+
+	if (!oldSection || !newSection) {
+		return;
+	}
+
+	if (oldSection == newSection) {
+		oldSection->reorderItems(oldSectionIndex, newSectionIndex);
+		refreshHeight();
+	}
+}
+
+void ListWidget::resetAllItemShifts() {
+	for (auto &section : _sections) {
+		for (const auto &item : section.items()) {
+			item->setShiftX(0);
+			item->setShiftY(0);
+		}
+	}
+}
+
+void ListWidget::finishShiftAnimations() {
+	for (auto &[index, animation] : _shiftAnimations) {
+		const auto item = itemByIndex(index);
+		if (!item) {
+			continue;
+		}
+		const auto animating = animation.xAnimation.animating()
+			|| animation.yAnimation.animating();
+		const auto geometry = itemGeometryByIndex(index);
+		animation.xAnimation.stop();
+		animation.yAnimation.stop();
+		if (animating) {
+			++_activeShiftAnimations;
+			animation.xAnimation.start(
+				[=](float64 progress) {
+					if (item) item->setShiftX(progress);
+					update();
+					if (progress == 1.) {
+						--_activeShiftAnimations;
+						if (_activeShiftAnimations == 0) {
+							_shiftAnimations.clear();
+						}
+					}
+				},
+				animation.xAnimation.value(0),
+				0,
+				st::slideWrapDuration);
+			++_activeShiftAnimations;
+			animation.yAnimation.start(
+				[=](float64 progress) {
+					if (item) item->setShiftY(progress);
+					update();
+					if (progress == 1.) {
+						--_activeShiftAnimations;
+						if (_activeShiftAnimations == 0) {
+							_shiftAnimations.clear();
+						}
+					}
+				},
+				(animation.targetShift < 0)
+					? (item->shift().y() + geometry.height())
+					: (item->shift().y() - geometry.height()),
+				0,
+				st::slideWrapDuration);
+		}
+	}
+	if (_activeShiftAnimations == 0) {
+		_shiftAnimations.clear();
+	}
+	resetAllItemShifts();
+}
+
 ListWidget::~ListWidget() {
 	if (_contextMenu) {
 		// We don't want it to be called after ListWidget is destroyed.
@@ -2110,5 +2731,14 @@ ListWidget::~ListWidget() {
 	}
 }
 
+void ListWidget::jumpToMessage(MsgId msgId) {
+	_provider->jumpToMessage(msgId, [=](FullMsgId fullId) {
+		if (const auto i = session().data().message(fullId)) {
+			_scrollTopState.position = _provider->scrollTopStatePosition(i);
+			_scrollTopState.item = i;
+		}
+	});
+}
+
 } // namespace Media
 } // namespace Info
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.h b/Telegram/SourceFiles/info/media/info_media_list_widget.h
index 5b486c1de798f6..221c5d19e199df 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.h
@@ -48,9 +48,11 @@ class AbstractController;
 namespace Media {
 
 struct ListFoundItem;
+struct ListFoundItemWithSection;
 struct ListContext;
 class ListSection;
 class ListProvider;
+class ListZoom;
 
 class ListWidget final
 	: public Ui::RpWidget
@@ -70,6 +72,13 @@ class ListWidget final
 	rpl::producer<SelectedItems> selectedListValue() const;
 	void selectionAction(SelectionAction action);
 
+	struct ReorderDescriptor {
+		Fn<void(int old, int pos, Fn<void()> done, Fn<void()> fail)> save;
+		Fn<bool(HistoryItem*)> filter;
+	};
+
+	void setReorderDescriptor(ReorderDescriptor descriptor);
+
 	QRect getCurrentSongGeometry();
 	rpl::producer<> checkForHide() const {
 		return _checkForHide.events();
@@ -79,11 +88,21 @@ class ListWidget final
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
+	void jumpToMessage(MsgId msgId);
+
+	bool processZoomWheel(not_null<QWheelEvent*> e);
+	void zoomIn();
+	void zoomOut();
+	[[nodiscard]] bool canZoomIn() const;
+	[[nodiscard]] bool canZoomOut() const;
+
 	// Overview::Layout::Delegate
 	void registerHeavyItem(not_null<const BaseLayout*> item) override;
 	void unregisterHeavyItem(not_null<const BaseLayout*> item) override;
 	void repaintItem(not_null<const BaseLayout*> item) override;
 	bool itemVisible(not_null<const BaseLayout*> item) override;
+	bool keepPhotoMediaLoaded() override;
+	not_null<StickerPremiumMark*> hiddenMark() override;
 
 	// AbstractTooltipShower interface
 	QString tooltipText() const override;
@@ -97,6 +116,8 @@ class ListWidget final
 		bool showInMediaView = false) override;
 
 private:
+	friend class ListZoom;
+
 	struct DateBadge;
 	using Section = ListSection;
 	using FoundItem = ListFoundItem;
@@ -112,6 +133,24 @@ class ListWidget final
 		Dragging,
 		PrepareSelect,
 		Selecting,
+		PrepareReorder,
+		Reordering,
+	};
+	struct ReorderState {
+		bool enabled = false;
+		int index = -1;
+		int targetIndex = -1;
+		QPoint startPos;
+		QPoint dragPoint;
+		QPoint currentPos;
+		BaseLayout *item = nullptr;
+		const Section *section = nullptr;
+	};
+	struct ShiftAnimation {
+		Ui::Animations::Simple xAnimation;
+		Ui::Animations::Simple yAnimation;
+		int shift = 0;
+		int targetShift = 0;
 	};
 	struct MouseState {
 		HistoryItem *item = nullptr;
@@ -139,6 +178,7 @@ class ListWidget final
 		int visibleTop,
 		int visibleBottom) override;
 
+	bool eventHook(QEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
@@ -156,8 +196,10 @@ class ListWidget final
 		rpl::lifetime &lifetime);
 
 	void setupSelectRestriction();
+	[[nodiscard]] bool showDrawButton() const;
 
 	[[nodiscard]] MsgId topicRootId() const;
+	[[nodiscard]] PeerId monoforumPeerId() const;
 
 	QMargins padding() const;
 	bool isItemLayout(
@@ -170,6 +212,7 @@ class ListWidget final
 	void itemLayoutChanged(not_null<const HistoryItem*> item);
 
 	void refreshRows();
+	void markStoryMsgsSelected();
 	void trackSession(not_null<Main::Session*> session);
 
 	[[nodiscard]] SelectedItems collectSelectedItems() const;
@@ -190,11 +233,12 @@ class ListWidget final
 	void forwardItems(MessageIdsList &&items);
 	void deleteSelected();
 	void toggleStoryPinSelected();
-	void toggleStoryInProfileSelected();
+	void toggleStoryInProfileSelected(bool toProfile);
 	void deleteItem(GlobalMsgId globalId);
 	void deleteItems(SelectedItems &&items, Fn<void()> confirmed = nullptr);
 	void toggleStoryInProfile(
 		MessageIdsList &&items,
+		bool toProfile,
 		Fn<void()> confirmed = nullptr);
 	void toggleStoryPin(
 		MessageIdsList &&items,
@@ -229,7 +273,10 @@ class ListWidget final
 	[[nodiscard]] auto findSectionAfterBottom(
 		std::vector<Section>::const_iterator from,
 		int bottom) const -> std::vector<Section>::const_iterator;
+	[[nodiscard]] auto findSectionAndItem(QPoint point) const
+		-> std::pair<std::vector<Section>::const_iterator, FoundItem>;
 	[[nodiscard]] FoundItem findItemByPoint(QPoint point) const;
+	[[nodiscard]] ListFoundItemWithSection findItemByPointWithSection(QPoint point) const;
 	[[nodiscard]] std::optional<FoundItem> findItemByItem(
 		const HistoryItem *item);
 	[[nodiscard]] FoundItem findItemDetails(not_null<BaseLayout*> item);
@@ -238,6 +285,7 @@ class ListWidget final
 		const Section &section) const;
 
 	[[nodiscard]] ListScrollTopState countScrollState() const;
+	[[nodiscard]] ListScrollTopState countScrollState(QPoint anchor) const;
 	void saveScrollState();
 	void restoreScrollState();
 
@@ -271,7 +319,22 @@ class ListWidget final
 	void checkMoveToOtherViewer();
 	void clearHeavyItems();
 
-	void setActionBoxWeak(QPointer<Ui::BoxContent> box);
+	void setActionBoxWeak(base::weak_qptr<Ui::BoxContent> box);
+
+	void setupStoriesTrackIds();
+
+	void startReorder(const QPoint &globalPos);
+	void updateReorder(const QPoint &globalPos);
+	void finishReorder();
+	void cancelReorder();
+	void updateShiftAnimations();
+	[[nodiscard]] int itemIndexFromPoint(QPoint point) const;
+	[[nodiscard]] QRect itemGeometryByIndex(int index);
+	[[nodiscard]] BaseLayout *itemByIndex(int index);
+	[[nodiscard]] bool canReorder() const;
+	void reorderItemsInSections(int oldIndex, int newIndex);
+	void resetAllItemShifts();
+	void finishShiftAnimations();
 
 	const not_null<AbstractController*> _controller;
 	const std::unique_ptr<ListProvider> _provider;
@@ -285,6 +348,8 @@ class ListWidget final
 	ListScrollTopState _scrollTopState;
 	rpl::event_stream<int> _scrollToRequests;
 
+	std::unique_ptr<ListZoom> _zoom;
+
 	MouseAction _mouseAction = MouseAction::None;
 	TextSelectType _mouseSelectType = TextSelectType::Letters;
 	QPoint _mousePosition;
@@ -304,9 +369,16 @@ class ListWidget final
 
 	const std::unique_ptr<DateBadge> _dateBadge;
 
+	int _selectedLimit = 0;
+	int _storiesAddToAlbumId = 0;
+	int _storiesAddToAlbumTotal = 0;
+	base::flat_set<StoryId> _storiesInAlbum;
+	base::flat_set<MsgId> _storyMsgsToMarkSelected;
+	std::unique_ptr<StickerPremiumMark> _hiddenMark;
+
 	base::unique_qptr<Ui::PopupMenu> _contextMenu;
 	rpl::event_stream<> _checkForHide;
-	QPointer<Ui::BoxContent> _actionBoxWeak;
+	base::weak_qptr<Ui::BoxContent> _actionBoxWeak;
 	rpl::lifetime _actionBoxWeakLifetime;
 
 	QPoint _trippleClickPoint;
@@ -314,6 +386,13 @@ class ListWidget final
 
 	base::flat_map<not_null<Main::Session*>, rpl::lifetime> _trackedSessions;
 
+	ReorderState _reorderState;
+	base::flat_map<int, ShiftAnimation> _shiftAnimations;
+	int _activeShiftAnimations = 0;
+	Ui::Animations::Simple _returnAnimation;
+	ReorderDescriptor _reorderDescriptor;
+	bool _inDragArea = false;
+
 };
 
 } // namespace Media
diff --git a/Telegram/SourceFiles/info/media/info_media_provider.cpp b/Telegram/SourceFiles/info/media/info_media_provider.cpp
index 2fc69733e261c2..ab60934df77c92 100644
--- a/Telegram/SourceFiles/info/media/info_media_provider.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_provider.cpp
@@ -7,10 +7,12 @@ For license and copyright information please follow this link:
 */
 #include "info/media/info_media_provider.h"
 
+#include "apiwrap.h"
 #include "info/media/info_media_widget.h"
 #include "info/media/info_media_list_section.h"
 #include "info/info_controller.h"
 #include "layout/layout_selection.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "lang/lang_keys.h"
 #include "history/history.h"
@@ -23,6 +25,9 @@ For license and copyright information please follow this link:
 #include "data/data_user.h"
 #include "data/data_peer_values.h"
 #include "data/data_document.h"
+#include "data/data_saved_sublist.h"
+#include "storage/storage_facade.h"
+#include "storage/storage_shared_media.h"
 #include "styles/style_info.h"
 #include "styles/style_overview.h"
 
@@ -33,32 +38,6 @@ constexpr auto kPreloadedScreensCount = 4;
 constexpr auto kPreloadedScreensCountFull
 	= kPreloadedScreensCount + 1 + kPreloadedScreensCount;
 
-[[nodiscard]] int MinItemHeight(Type type, int width) {
-	auto &songSt = st::overviewFileLayout;
-
-	switch (type) {
-	case Type::Photo:
-	case Type::GIF:
-	case Type::Video:
-	case Type::RoundFile: {
-		auto itemsLeft = st::infoMediaSkip;
-		auto itemsInRow = (width - itemsLeft)
-			/ (st::infoMediaMinGridSize + st::infoMediaSkip);
-		return (st::infoMediaMinGridSize + st::infoMediaSkip) / itemsInRow;
-	} break;
-
-	case Type::RoundVoiceFile:
-		return songSt.songPadding.top() + songSt.songThumbSize + songSt.songPadding.bottom() + st::lineWidth;
-	case Type::File:
-		return songSt.filePadding.top() + songSt.fileThumbSize + songSt.filePadding.bottom() + st::lineWidth;
-	case Type::MusicFile:
-		return songSt.songPadding.top() + songSt.songThumbSize + songSt.songPadding.bottom();
-	case Type::Link:
-		return st::linksPhotoSize + st::linksMargin.top() + st::linksMargin.bottom() + st::linksBorder;
-	}
-	Unexpected("Type in MinItemHeight()");
-}
-
 } // namespace
 
 Provider::Provider(not_null<AbstractController*> controller)
@@ -66,21 +45,34 @@ Provider::Provider(not_null<AbstractController*> controller)
 , _peer(_controller->key().peer())
 , _topicRootId(_controller->key().topic()
 	? _controller->key().topic()->rootId()
-	: 0)
+	: MsgId())
+, _monoforumPeerId(_controller->key().sublist()
+	? _controller->key().sublist()->sublistPeer()->id
+	: PeerId())
 , _migrated(_controller->migrated())
 , _type(_controller->section().mediaType())
 , _slice(sliceKey(_universalAroundId)) {
 	_controller->session().data().itemRemoved(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		itemRemoved(item);
 	}, _lifetime);
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &layout : _layouts) {
 			layout.second.item->invalidateCache();
 		}
 	}, _lifetime);
+
+	_controller->session().appConfig().ignoredRestrictionReasonsChanges(
+	) | rpl::on_next([=](std::vector<QString> &&changed) {
+		const auto sensitive = Data::UnavailableReason::Sensitive();
+		if (ranges::contains(changed, sensitive.reason)) {
+			for (auto &[id, layout] : _layouts) {
+				layout.item->maybeClearSensitiveSpoiler();
+			}
+		}
+	}, _lifetime);
 }
 
 Type Provider::type() {
@@ -88,7 +80,9 @@ Type Provider::type() {
 }
 
 bool Provider::hasSelectRestriction() {
-	if (_peer->allowsForwarding()) {
+	if (_peer->session().frozen()) {
+		return true;
+	} else if (_peer->allowsForwarding()) {
 		return false;
 	} else if (const auto chat = _peer->asChat()) {
 		return !chat->canDeleteMessages();
@@ -99,8 +93,13 @@ bool Provider::hasSelectRestriction() {
 }
 
 rpl::producer<bool> Provider::hasSelectRestrictionChanges() {
-	if (_peer->isUser()) {
-		return rpl::never<bool>();
+	if (const auto user = _peer->asUser()) {
+		return rpl::combine(
+			Data::PeerFlagValue(user, UserDataFlag::NoForwardsMyEnabled),
+			Data::PeerFlagValue(user, UserDataFlag::NoForwardsPeerEnabled)
+		) | rpl::map([=] {
+			return hasSelectRestriction();
+		}) | rpl::distinct_until_changed() | rpl::skip(1);
 	}
 	const auto chat = _peer->asChat();
 	const auto channel = _peer->asChannel();
@@ -109,7 +108,7 @@ rpl::producer<bool> Provider::hasSelectRestrictionChanges() {
 		: Data::PeerFlagValue(
 			channel,
 			ChannelDataFlag::NoForwards
-		) | rpl::type_erased();
+		) | rpl::type_erased;
 
 	auto rights = chat
 		? chat->adminRightsValue()
@@ -266,7 +265,7 @@ void Provider::refreshViewer() {
 		idForViewer,
 		_idsLimit,
 		_idsLimit
-	) | rpl::start_with_next([=](SparseIdsMergedSlice &&slice) {
+	) | rpl::on_next([=](SparseIdsMergedSlice &&slice) {
 		if (!slice.fullCount()) {
 			// Don't display anything while full count is unknown.
 			return;
@@ -351,17 +350,82 @@ void Provider::setSearchQuery(QString query) {
 	Unexpected("Media::Provider::setSearchQuery.");
 }
 
+void Provider::jumpToMessage(
+		MsgId messageId,
+		Fn<void(FullMsgId)> callback) {
+	_viewerLifetime.destroy();
+
+	const auto peer = _controller->session().data().peer(_peer->id);
+	const auto request = Api::PrepareSearchRequest(
+		peer,
+		_topicRootId,
+		_monoforumPeerId,
+		_type,
+		QString(),
+		messageId,
+		Data::LoadDirection::Around);
+
+	if (!request) {
+		return;
+	}
+
+	const auto finish = [=] {
+		const auto fullId = FullMsgId(_peer->id, messageId);
+		_universalAroundId = GetUniversalId(fullId);
+		if (callback) {
+			callback(fullId);
+		}
+		_idsLimit = kMinimalIdsLimit * 2;
+		refreshViewer();
+	};
+
+	_controller->session().api().request(
+		std::move(*request)
+	).done([=](const Api::SearchRequestResult &result) {
+		auto parsed = Api::ParseSearchResult(
+			peer,
+			_type,
+			messageId,
+			Data::LoadDirection::Around,
+			result);
+
+		if (!parsed.messageIds.empty()) {
+			peer->session().storage().add(Storage::SharedMediaAddSlice(
+				peer->id,
+				_topicRootId,
+				_monoforumPeerId,
+				_type,
+				std::move(parsed.messageIds),
+				parsed.noSkipRange,
+				parsed.fullCount));
+		}
+		finish();
+	}).fail([=] {
+		finish();
+	}).send();
+}
+
 SparseIdsMergedSlice::Key Provider::sliceKey(
 		UniversalMsgId universalId) const {
 	using Key = SparseIdsMergedSlice::Key;
 	if (!_topicRootId && _migrated) {
-		return Key(_peer->id, _topicRootId, _migrated->id, universalId);
+		return Key(
+			_peer->id,
+			_topicRootId,
+			_monoforumPeerId,
+			_migrated->id,
+			universalId);
 	}
 	if (universalId < 0) {
 		// Convert back to plain id for non-migrated histories.
 		universalId = universalId + ServerMaxMsgId;
 	}
-	return Key(_peer->id, _topicRootId, 0, universalId);
+	return Key(
+		_peer->id,
+		_topicRootId,
+		_monoforumPeerId,
+		PeerId(),
+		universalId);
 }
 
 void Provider::itemRemoved(not_null<const HistoryItem*> item) {
diff --git a/Telegram/SourceFiles/info/media/info_media_provider.h b/Telegram/SourceFiles/info/media/info_media_provider.h
index b544e2b8d7a31c..223792163819fe 100644
--- a/Telegram/SourceFiles/info/media/info_media_provider.h
+++ b/Telegram/SourceFiles/info/media/info_media_provider.h
@@ -48,6 +48,8 @@ class Provider final : public ListProvider, private ListSectionDelegate {
 
 	void setSearchQuery(QString query) override;
 
+	void jumpToMessage(MsgId, Fn<void(FullMsgId)> done) override;
+
 	ListItemSelectionData computeSelectionData(
 		not_null<const HistoryItem*> item,
 		TextSelection selection) override;
@@ -105,6 +107,7 @@ class Provider final : public ListProvider, private ListSectionDelegate {
 
 	const not_null<PeerData*> _peer;
 	const MsgId _topicRootId = 0;
+	const PeerId _monoforumPeerId = 0;
 	PeerData * const _migrated = nullptr;
 	const Type _type = Type::Photo;
 
diff --git a/Telegram/SourceFiles/info/media/info_media_widget.cpp b/Telegram/SourceFiles/info/media/info_media_widget.cpp
index 6a480a6d29208f..c9777d753a48cf 100644
--- a/Telegram/SourceFiles/info/media/info_media_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_widget.cpp
@@ -7,9 +7,12 @@ For license and copyright information please follow this link:
 */
 #include "info/media/info_media_widget.h"
 
+#include "history/history.h"
 #include "info/media/info_media_inner_widget.h"
 #include "info/info_controller.h"
+#include "data/data_session.h"
 #include "main/main_session.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/search_field_controller.h"
 #include "ui/ui_utility.h"
@@ -17,8 +20,11 @@ For license and copyright information please follow this link:
 #include "data/data_user.h"
 #include "data/data_channel.h"
 #include "data/data_forum_topic.h"
+#include "data/data_saved_sublist.h"
 #include "lang/lang_keys.h"
+#include "window/window_session_controller.h"
 #include "styles/style_info.h"
+#include "styles/style_menu_icons.h"
 
 namespace Info::Media {
 
@@ -40,40 +46,77 @@ Type TabIndexToType(int index) {
 	Unexpected("Index in Info::Media::TabIndexToType()");
 }
 
+tr::phrase<> SharedMediaTitle(Type type) {
+	switch (type) {
+	case Type::Photo:
+		return tr::lng_media_type_photos;
+	case Type::GIF:
+		return tr::lng_media_type_gifs;
+	case Type::Video:
+		return tr::lng_media_type_videos;
+	case Type::MusicFile:
+		return tr::lng_media_type_songs;
+	case Type::File:
+		return tr::lng_media_type_files;
+	case Type::RoundVoiceFile:
+		return tr::lng_media_type_audios;
+	case Type::Link:
+		return tr::lng_media_type_links;
+	case Type::RoundFile:
+		return tr::lng_media_type_rounds;
+	case Type::Poll:
+		return tr::lng_media_type_polls;
+	}
+	Unexpected("Bad media type in Info::TitleValue()");
+}
+
 Memento::Memento(not_null<Controller*> controller)
 : Memento(
 	(controller->peer()
 		? controller->peer()
 		: controller->storiesPeer()
 		? controller->storiesPeer()
+		: controller->musicPeer()
+		? controller->musicPeer()
 		: controller->parentController()->session().user()),
 	controller->topic(),
+	controller->sublist(),
 	controller->migratedPeerId(),
 	(controller->section().type() == Section::Type::Downloads
 		? Type::File
 		: controller->section().type() == Section::Type::Stories
 		? Type::PhotoVideo
+		: controller->section().type() == Section::Type::SavedMusic
+		? Type::MusicFile
 		: controller->section().mediaType())) {
 }
 
 Memento::Memento(not_null<PeerData*> peer, PeerId migratedPeerId, Type type)
-: Memento(peer, nullptr, migratedPeerId, type) {
+: Memento(peer, nullptr, nullptr, migratedPeerId, type) {
 }
 
 Memento::Memento(not_null<Data::ForumTopic*> topic, Type type)
-: Memento(topic->channel(), topic, PeerId(), type) {
+: Memento(topic->peer(), topic, nullptr, PeerId(), type) {
+}
+
+Memento::Memento(not_null<Data::SavedSublist*> sublist, Type type)
+: Memento(sublist->owningHistory()->peer, nullptr, sublist, PeerId(), type) {
 }
 
 Memento::Memento(
 	not_null<PeerData*> peer,
 	Data::ForumTopic *topic,
+	Data::SavedSublist *sublist,
 	PeerId migratedPeerId,
 	Type type)
-: ContentMemento(peer, topic, migratedPeerId)
+: ContentMemento(peer, topic, sublist, migratedPeerId)
 , _type(type) {
 	_searchState.query.type = type;
 	_searchState.query.peerId = peer->id;
-	_searchState.query.topicRootId = topic ? topic->rootId() : 0;
+	_searchState.query.topicRootId = topic ? topic->rootId() : MsgId();
+	_searchState.query.monoforumPeerId = sublist
+		? sublist->sublistPeer()->id
+		: PeerId();
 	_searchState.query.migratedPeerId = migratedPeerId;
 	if (migratedPeerId) {
 		_searchState.migratedList = Storage::SparseIdsList();
@@ -95,18 +138,21 @@ object_ptr<ContentWidget> Memento::createWidget(
 	return result;
 }
 
-Widget::Widget(
-	QWidget *parent,
-	not_null<Controller*> controller)
+Widget::Widget(QWidget *parent, not_null<Controller*> controller)
 : ContentWidget(parent, controller) {
 	_inner = setInnerWidget(object_ptr<InnerWidget>(
 		this,
 		controller));
 	_inner->setScrollHeightValue(scrollHeightValue());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		scrollTo(request);
 	}, _inner->lifetime());
+
+	scroll()->setCustomWheelProcess([this](not_null<QWheelEvent*> e) {
+		return (e->modifiers() & Qt::ControlModifier)
+			&& _inner->processZoomWheel(e);
+	});
 }
 
 rpl::producer<SelectedItems> Widget::selectedListValue() const {
@@ -117,29 +163,57 @@ void Widget::selectionAction(SelectionAction action) {
 	_inner->selectionAction(action);
 }
 
+void Widget::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
+	const auto type = controller()->section().mediaType();
+	if (type != Type::Photo && type != Type::Video) {
+		return;
+	}
+	if (_inner->canZoomIn()) {
+		addAction(tr::lng_media_zoom_in(tr::now), [=] {
+			_inner->zoomIn();
+		}, &st::menuIconZoomIn);
+	}
+	if (_inner->canZoomOut()) {
+		addAction(tr::lng_media_zoom_out(tr::now), [=] {
+			_inner->zoomOut();
+		}, &st::menuIconZoomOut);
+	}
+	addAction(tr::lng_calendar(tr::now), [=] {
+		controller()->parentController()->showCalendar({
+			.chat = Dialogs::Key(
+				controller()->session().data().history(
+					controller()->key().peer())),
+			.date = QDate::currentDate(),
+			.mediaPhoto = (type == Type::Photo),
+			.mediaVideo = (type == Type::Video),
+			.customJump = [=](FullMsgId id, Fn<void()> close) {
+				_inner->jumpToMessage(id.msg);
+				close();
+			},
+		});
+	}, &st::menuIconSchedule);
+}
+
+bool Widget::processZoomKey(not_null<QKeyEvent*> e) {
+	if (!(e->modifiers() & Qt::ControlModifier)) {
+		return false;
+	}
+	const auto key = e->key();
+	if (key == Qt::Key_Plus || key == Qt::Key_Equal) {
+		_inner->zoomIn();
+		return true;
+	} else if (key == Qt::Key_Minus || key == Qt::Key_Underscore) {
+		_inner->zoomOut();
+		return true;
+	}
+	return false;
+}
+
 rpl::producer<QString> Widget::title() {
 	if (controller()->key().peer()->sharedMediaInfo() && isStackBottom()) {
 		return tr::lng_profile_shared_media();
 	}
-	switch (controller()->section().mediaType()) {
-	case Section::MediaType::Photo:
-		return tr::lng_media_type_photos();
-	case Section::MediaType::GIF:
-		return tr::lng_media_type_gifs();
-	case Section::MediaType::Video:
-		return tr::lng_media_type_videos();
-	case Section::MediaType::MusicFile:
-		return tr::lng_media_type_songs();
-	case Section::MediaType::File:
-		return tr::lng_media_type_files();
-	case Section::MediaType::RoundVoiceFile:
-		return tr::lng_media_type_audios();
-	case Section::MediaType::Link:
-		return tr::lng_media_type_links();
-	case Section::MediaType::RoundFile:
-		return tr::lng_media_type_rounds();
-	}
-	Unexpected("Bad media type in Info::TitleValue()");
+	return SharedMediaTitle(controller()->section().mediaType())();
 }
 
 void Widget::setIsStackBottom(bool isStackBottom) {
diff --git a/Telegram/SourceFiles/info/media/info_media_widget.h b/Telegram/SourceFiles/info/media/info_media_widget.h
index 693d01aeed8401..490539d1ef175d 100644
--- a/Telegram/SourceFiles/info/media/info_media_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_widget.h
@@ -11,6 +11,11 @@ For license and copyright information please follow this link:
 #include "storage/storage_shared_media.h"
 #include "data/data_search_controller.h"
 
+namespace tr {
+template <typename ...Tags>
+struct phrase;
+} // namespace tr
+
 namespace Data {
 class ForumTopic;
 } // namespace Data
@@ -19,8 +24,9 @@ namespace Info::Media {
 
 using Type = Storage::SharedMediaType;
 
-std::optional<int> TypeToTabIndex(Type type);
-Type TabIndexToType(int index);
+[[nodiscard]] std::optional<int> TypeToTabIndex(Type type);
+[[nodiscard]] Type TabIndexToType(int index);
+[[nodiscard]] tr::phrase<> SharedMediaTitle(Type type);
 
 class InnerWidget;
 
@@ -29,6 +35,7 @@ class Memento final : public ContentMemento {
 	explicit Memento(not_null<Controller*> controller);
 	Memento(not_null<PeerData*> peer, PeerId migratedPeerId, Type type);
 	Memento(not_null<Data::ForumTopic*> topic, Type type);
+	Memento(not_null<Data::SavedSublist*> sublist, Type type);
 
 	using SearchState = Api::DelayedSearchController::SavedState;
 
@@ -86,6 +93,7 @@ class Memento final : public ContentMemento {
 	Memento(
 		not_null<PeerData*> peer,
 		Data::ForumTopic *topic,
+		Data::SavedSublist *sublist,
 		PeerId migratedPeerId,
 		Type type);
 
@@ -117,6 +125,9 @@ class Widget final : public ContentWidget {
 	rpl::producer<SelectedItems> selectedListValue() const override;
 	void selectionAction(SelectionAction action) override;
 
+	void fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) override;
+	bool processZoomKey(not_null<QKeyEvent*> e) override;
+
 	rpl::producer<QString> title() override;
 
 private:
diff --git a/Telegram/SourceFiles/info/members/info_members_widget.cpp b/Telegram/SourceFiles/info/members/info_members_widget.cpp
index 0a00a7344da5b0..07609a430eabda 100644
--- a/Telegram/SourceFiles/info/members/info_members_widget.cpp
+++ b/Telegram/SourceFiles/info/members/info_members_widget.cpp
@@ -26,7 +26,7 @@ Memento::Memento(not_null<Controller*> controller)
 }
 
 Memento::Memento(not_null<PeerData*> peer, PeerId migratedPeerId)
-: ContentMemento(peer, nullptr, migratedPeerId) {
+: ContentMemento(peer, nullptr, nullptr, migratedPeerId) {
 }
 
 Section Memento::section() const {
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
new file mode 100644
index 00000000000000..dce44856d84979
--- /dev/null
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
@@ -0,0 +1,159 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/peer_gifts/info_peer_gifts_collections.h"
+
+#include "api/api_credits.h"
+#include "apiwrap.h"
+#include "data/data_peer.h"
+#include "data/data_star_gift.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/layers/generic_box.h"
+#include "ui/widgets/fields/input_field.h"
+#include "window/window_session_controller.h"
+#include "styles/style_layers.h"
+#include "styles/style_info.h"
+
+namespace Info::PeerGifts {
+namespace {
+
+constexpr auto kCollectionNameLimit = 12;
+
+void EditCollectionBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		int id,
+		Data::SavedStarGiftId addId,
+		QString currentName,
+		Fn<void(MTPStarGiftCollection)> finished) {
+	box->setTitle(id
+		? tr::lng_gift_collection_edit()
+		: tr::lng_gift_collection_new_title());
+
+	if (!id) {
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_gift_collection_new_text(),
+				st::collectionAbout));
+	}
+	const auto title = box->addRow(
+		object_ptr<Ui::InputField>(
+			box,
+			st::collectionNameField,
+			tr::lng_gift_collection_new_ph(),
+			currentName));
+	title->setMaxLength(kCollectionNameLimit * 2);
+	box->setFocusCallback([=] {
+		title->setFocusFast();
+	});
+
+	Ui::AddLengthLimitLabel(title, kCollectionNameLimit);
+
+	const auto show = navigation->uiShow();
+	const auto session = &peer->session();
+
+	const auto creating = std::make_shared<bool>(false);
+	const auto submit = [=] {
+		if (*creating) {
+			return;
+		}
+		const auto text = title->getLastText().trimmed();
+		if (text.isEmpty() || text.size() > kCollectionNameLimit) {
+			title->showError();
+			return;
+		}
+
+		*creating = true;
+		auto ids = QVector<MTPInputSavedStarGift>();
+		if (addId) {
+			ids.push_back(Api::InputSavedStarGiftId(addId));
+		}
+		const auto weak = base::make_weak(box);
+		const auto done = [=](const MTPStarGiftCollection &result) {
+			*creating = false;
+			if (const auto onstack = finished) {
+				onstack(result);
+			}
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		};
+		const auto fail = [=](const MTP::Error &error) {
+			*creating = false;
+			const auto &type = error.type();
+			if (type == u"COLLECTIONS_TOO_MANY"_q) {
+				show->show(Ui::MakeInformBox({
+					.text = tr::lng_gift_collection_limit_text(),
+					.confirmText = tr::lng_box_ok(),
+					.title = tr::lng_gift_collection_limit_title(),
+				}));
+				if (const auto strong = weak.get()) {
+					strong->closeBox();
+				}
+			} else {
+				show->showToast(error.type());
+			}
+		};
+		if (id) {
+			using Flag = MTPpayments_UpdateStarGiftCollection::Flag;
+			session->api().request(MTPpayments_UpdateStarGiftCollection(
+				MTP_flags(Flag::f_title),
+				peer->input(),
+				MTP_int(id),
+				MTP_string(text),
+				MTPVector<MTPInputSavedStarGift>(),
+				MTPVector<MTPInputSavedStarGift>(),
+				MTPVector<MTPInputSavedStarGift>()
+			)).done(done).fail(fail).send();
+		} else {
+			session->api().request(MTPpayments_CreateStarGiftCollection(
+				peer->input(),
+				MTP_string(text),
+				MTP_vector<MTPInputSavedStarGift>(ids)
+			)).done(done).fail(fail).send();
+		}
+	};
+	title->submits() | rpl::on_next(submit, title->lifetime());
+	auto text = id
+		? tr::lng_settings_save()
+		: tr::lng_gift_collection_new_create();
+	box->addButton(std::move(text), submit);
+
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+}
+
+} // namespace
+
+void NewCollectionBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		Data::SavedStarGiftId addId,
+		Fn<void(MTPStarGiftCollection)> added) {
+	EditCollectionBox(box, navigation, peer, 0, addId, QString(), added);
+}
+
+void EditCollectionNameBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		int id,
+		QString current,
+		Fn<void(QString)> done) {
+	EditCollectionBox(box, navigation, peer, id, {}, current, [=](
+			const MTPStarGiftCollection &result) {
+		done(qs(result.data().vtitle()));
+	});
+}
+
+} // namespace Info::PeerGifts
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h
new file mode 100644
index 00000000000000..c60c32e312dece
--- /dev/null
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h
@@ -0,0 +1,39 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+class SavedStarGiftId;
+} // namespace Data
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+namespace Window {
+class SessionNavigation;
+} // namespace Window
+
+namespace Info::PeerGifts {
+
+void NewCollectionBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	Data::SavedStarGiftId addId,
+	Fn<void(MTPStarGiftCollection)> added);
+
+void EditCollectionNameBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	int id,
+	QString current,
+	Fn<void(QString)> done);
+
+} // namespace Info::PeerGifts
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index dd12b664681edd..711abe465705a0 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -7,68 +7,231 @@ For license and copyright information please follow this link:
 */
 #include "info/peer_gifts/info_peer_gifts_common.h"
 
+#include "api/api_global_privacy.h"
+#include "api/api_premium.h"
+#include "base/unixtime.h"
+#include "boxes/send_credits_box.h" // SetButtonMarkedLabel
 #include "boxes/sticker_set_box.h"
 #include "chat_helpers/stickers_gift_box_pack.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "core/ui_integration.h"
 #include "data/stickers/data_custom_emoji.h"
+#include "data/data_credits.h" // CreditsHistoryEntry
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_session.h"
+#include "data/data_user.h"
 #include "history/view/media/history_view_sticker_player.h"
 #include "lang/lang_keys.h"
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "main/main_session.h"
+#include "overview/overview_checkbox.h"
+#include "settings/settings_credits_graphics.h"
+#include "ui/layers/generic_box.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
 #include "ui/dynamic_image.h"
 #include "ui/dynamic_thumbnails.h"
+#include "ui/effects/premium_graphics.h"
 #include "ui/painter.h"
+#include "ui/top_background_gradient.h"
 #include "window/window_session_controller.h"
+#include "styles/style_chat.h"
 #include "styles/style_credits.h"
 #include "styles/style_layers.h"
+#include "styles/style_overview.h"
 #include "styles/style_premium.h"
 
 namespace Info::PeerGifts {
 namespace {
 
 constexpr auto kGiftsPerRow = 3;
+constexpr auto kCraftUnavailableOpacity = 0.5;
+
+[[nodiscard]] bool AllowedToSend(
+		const GiftTypeStars &gift,
+		not_null<PeerData*> peer) {
+	using Type = Api::DisallowedGiftType;
+	const auto user = peer->asUser();
+	if (!user) {
+		return gift.resale
+			|| (!gift.info.requirePremium
+				&& !gift.info.auction()
+				&& !gift.info.limitedCount);
+	} else if (user->isSelf()) {
+		return true;
+	}
+	const auto disallowedTypes = user ? user->disallowedGiftTypes() : Type();
+	const auto allowLimited = !(disallowedTypes & Type::Limited);
+	const auto allowUnlimited = !(disallowedTypes & Type::Unlimited);
+	const auto allowUnique = !(disallowedTypes & Type::Unique);
+	if (gift.resale) {
+		return allowUnique;
+	} else if (!gift.info.limitedCount) {
+		return allowUnlimited;
+	}
+	return allowLimited || (gift.info.starsToUpgrade && allowUnique);
+}
 
 } // namespace
 
+std::strong_ordering operator<=>(const GiftBadge &a, const GiftBadge &b) {
+	const auto result1 = (a.text <=> b.text);
+	if (result1 != std::strong_ordering::equal) {
+		return result1;
+	}
+	const auto result2 = (a.bg1.rgb() <=> b.bg1.rgb());
+	if (result2 != std::strong_ordering::equal) {
+		return result2;
+	}
+	const auto result3 = (a.bg2.rgb() <=> b.bg2.rgb());
+	if (result3 != std::strong_ordering::equal) {
+		return result3;
+	}
+	const auto result4 = (a.border.rgb() <=> b.border.rgb());
+	if (result4 != std::strong_ordering::equal) {
+		return result4;
+	}
+	const auto result5 = (a.fg.rgb() <=> b.fg.rgb());
+	if (result5 != std::strong_ordering::equal) {
+		return result5;
+	}
+	return a.gradient <=> b.gradient;
+}
+
+rpl::producer<std::vector<GiftTypeStars>> GiftsStars(
+		not_null<Main::Session*> session,
+		not_null<PeerData*> peer) {
+	struct Session {
+		std::vector<GiftTypeStars> last;
+	};
+	static auto Map = base::flat_map<not_null<Main::Session*>, Session>();
+
+	const auto filtered = [=](std::vector<GiftTypeStars> list) {
+		list.erase(ranges::remove_if(list, [&](const GiftTypeStars &gift) {
+			return !AllowedToSend(gift, peer);
+		}), end(list));
+		return list;
+	};
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		auto i = Map.find(session);
+		if (i == end(Map)) {
+			i = Map.emplace(session, Session()).first;
+			session->lifetime().add([=] { Map.remove(session); });
+		}
+		if (!i->second.last.empty()) {
+			consumer.put_next(filtered(i->second.last));
+		}
+
+		using namespace Api;
+		const auto api = lifetime.make_state<PremiumGiftCodeOptions>(peer);
+		api->requestStarGifts(
+		) | rpl::on_error_done([=](QString error) {
+			consumer.put_next({});
+		}, [=] {
+			auto list = std::vector<GiftTypeStars>();
+			const auto &gifts = api->starGifts();
+			list.reserve(gifts.size());
+			for (auto &gift : gifts) {
+				list.push_back({ .info = gift });
+				if (gift.resellCount > 0) {
+					list.push_back({ .info = gift, .resale = true });
+				}
+			}
+			ranges::stable_sort(list, [](const auto &a, const auto &b) {
+				const auto soldOut = [](const auto &gift) {
+					return gift.info.soldOut && !gift.resale;
+				};
+				return soldOut(a) < soldOut(b);
+			});
+
+			auto &map = Map[session];
+			if (map.last != list || list.empty()) {
+				map.last = list;
+				consumer.put_next(filtered(std::move(list)));
+			}
+		}, lifetime);
+
+		return lifetime;
+	};
+}
+
 GiftButton::GiftButton(
 	QWidget *parent,
 	not_null<GiftButtonDelegate*> delegate)
 : AbstractButton(parent)
-, _delegate(delegate) {
+, _delegate(delegate)
+, _lockedTimer([=] { refreshLocked(); }) {
+	style::PaletteChanged() | rpl::on_next([=] {
+		_delegate->invalidateCache();
+		update();
+	}, lifetime());
 }
 
 GiftButton::~GiftButton() {
 	unsubscribe();
 }
 
+void GiftButton::onStateChanged(State was, StateChangeSource source) {
+	if (_check) {
+		const auto diff = state() ^ was;
+		if (diff & State::Enum::Over) {
+			_check->setActive(state() & State::Enum::Over);
+		}
+		if (diff & State::Enum::Down) {
+			_check->setPressed(state() & State::Enum::Down);
+		}
+	}
+}
+
 void GiftButton::unsubscribe() {
-	if (base::take(_subscribed)) {
+	if (_subscribed) {
+		_subscribed = false;
 		_userpic->subscribeToUpdates(nullptr);
 	}
 }
 
-void GiftButton::setDescriptor(const GiftDescriptor &descriptor) {
-	if (_descriptor == descriptor) {
+void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
+	_mode = mode;
+
+	const auto unique = v::is<GiftTypeStars>(descriptor)
+		? v::get<GiftTypeStars>(descriptor).info.unique.get()
+		: nullptr;
+	const auto resalePrice = (unique && _mode != Mode::CraftPreview)
+		? unique->starsForResale
+		: 0;
+	if (_descriptor == descriptor && _resalePrice == resalePrice) {
 		return;
 	}
-	auto player = base::take(_player);
-	_mediaLifetime.destroy();
-	_descriptor = descriptor;
+	const auto starsType = Ui::Premium::MiniStarsType::SlowStars;
 	unsubscribe();
+	update();
+
+	const auto format = [=](int64 number) {
+		const auto onlyK = (number < 100'000'000);
+		return (number >= 1'000'000)
+			? Lang::FormatCountToShort(number, onlyK).string
+			: Lang::FormatCountDecimal(number);
+	};
+
+	const auto auctionStartDate = v::is<GiftTypeStars>(descriptor)
+		? v::get<GiftTypeStars>(descriptor).info.auctionStartDate
+		: TimeId();
+	const auto upcomingAuction = (auctionStartDate > base::unixtime::now());
+
+	_descriptor = descriptor;
+	_resalePrice = resalePrice;
+	const auto resale = (_resalePrice > 0);
 	v::match(descriptor, [&](const GiftTypePremium &data) {
 		const auto months = data.months;
-		const auto years = (months % 12) ? 0 : months / 12;
 		_text = Ui::Text::String(st::giftBoxGiftHeight / 4);
 		_text.setMarkedText(
 			st::defaultTextStyle,
-			Ui::Text::Bold(years
-				? tr::lng_years(tr::now, lt_count, years)
-				: tr::lng_months(tr::now, lt_count, months)
+			tr::bold(
+				tr::lng_months(tr::now, lt_count, months)
 			).append('\n').append(
 				tr::lng_gift_premium_label(tr::now)
 			));
@@ -78,23 +241,107 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor) {
 				data.cost,
 				data.currency,
 				true));
+		if (const auto stars = data.stars) {
+			const auto starsText = Lang::FormatCountDecimal(stars);
+			_byStars.setMarkedText(
+				st::giftBoxByStarsStyle,
+				tr::lng_gift_premium_by_stars(
+					tr::now,
+					lt_amount,
+					_delegate->ministar().append(' ' + starsText),
+					tr::marked),
+				kMarkupTextOptions,
+				_delegate->textContext());
+		}
 		_userpic = nullptr;
+		if (!_stars) {
+			_stars.emplace(this, true, starsType);
+		}
+		_stars->setColorOverride(QGradientStops{
+			{ 0., anim::with_alpha(st::windowActiveTextFg->c, .3) },
+			{ 1., st::windowActiveTextFg->c },
+		});
+		_lockedUntilDate = 0;
 	}, [&](const GiftTypeStars &data) {
-		_price.setMarkedText(
-			st::semiboldTextStyle,
-			_delegate->star().append(' ' + QString::number(data.stars)),
-			kMarkupTextOptions,
-			_delegate->textContext());
-		_userpic = !data.userpic
+		const auto soldOut = data.info.limitedCount
+			&& !data.userpic
+			&& !data.info.limitedLeft;
+		_userpic = (!data.userpic || (_mode == Mode::Selection))
 			? nullptr
 			: data.from
 			? Ui::MakeUserpicThumbnail(data.from)
 			: Ui::MakeHiddenAuthorThumbnail();
+		if ((small() && !resale) || (_mode == Mode::Craft)) {
+			_price = {};
+			_stars.reset();
+			return;
+		}
+		_price.setMarkedText(
+			st::semiboldTextStyle,
+			(data.resale
+				? ((unique && data.forceTon)
+					? Data::FormatGiftResaleTon(*unique)
+					: (unique
+					? _delegate->monostar()
+						: _delegate->star()).append(' ').append(
+							format(unique
+								? unique->starsForResale
+								: data.info.starsResellMin)
+						).append(data.info.resellCount > 1 ? "+" : ""))
+				: (small() && unique && unique->starsForResale)
+				? Data::FormatGiftResaleAsked(*unique)
+				: unique
+				? tr::lng_gift_transfer_button(tr::now, tr::marked)
+				: data.info.auction()
+				? ((data.info.soldOut || upcomingAuction)
+					? tr::lng_gift_stars_auction_view
+					: tr::lng_gift_stars_auction_join)(tr::now, tr::marked)
+				: _delegate->star().append(' ' + format(data.info.stars))),
+			kMarkupTextOptions,
+			_delegate->textContext());
+		if (!_stars) {
+			_stars.emplace(this, true, starsType);
+		}
+		if (unique) {
+			const auto white = QColor(255, 255, 255);
+			_stars->setColorOverride(QGradientStops{
+				{ 0., anim::with_alpha(white, .3) },
+				{ 1., white },
+			});
+		} else if (data.resale) {
+			_stars->setColorOverride(
+				Ui::Premium::CreditsIconGradientStops());
+		} else if (soldOut) {
+			_stars.reset();
+		} else {
+			_stars->setColorOverride(
+				Ui::Premium::CreditsIconGradientStops());
+		}
+		_lockedUntilDate = data.resale ? 0 : data.info.lockedUntilDate;
 	});
-	if (const auto document = _delegate->lookupSticker(descriptor)) {
+
+	refreshLocked();
+
+	_resolvedDocument = nullptr;
+	_documentLifetime = _delegate->sticker(
+		descriptor
+	) | rpl::on_next([=](not_null<DocumentData*> document) {
+		_documentLifetime.destroy();
 		setDocument(document);
+	});
+	if (_resolvedDocument) {
+		_documentLifetime.destroy();
 	}
 
+	_patterned = false;
+	_uniqueBackgroundCache = QImage();
+	_uniquePatternEmoji = nullptr;
+	_uniquePatternCache.clear();
+
+	if (_price.isEmpty()) {
+		_button = QRect();
+		return;
+	}
 	const auto buttonw = _price.maxWidth();
 	const auto buttonh = st::semiboldFont->height;
 	const auto inner = QRect(
@@ -102,27 +349,54 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor) {
 		QSize(buttonw, buttonh)
 	).marginsAdded(st::giftBoxButtonPadding);
 	const auto skipy = _delegate->buttonSize().height()
-		- st::giftBoxButtonBottom
+		- (small()
+			? st::giftBoxButtonBottomSmall
+			: _byStars.isEmpty()
+			? st::giftBoxButtonBottom
+			: st::giftBoxButtonBottomByStars)
 		- inner.height();
 	const auto skipx = (width() - inner.width()) / 2;
 	const auto outer = (width() - 2 * skipx);
 	_button = QRect(skipx, skipy, outer, inner.height());
+	if (_stars) {
+		const auto padding = _button.height() / 2;
+		_stars->setCenter(_button - QMargins(padding, 0, padding, 0));
+	}
 }
 
-bool GiftButton::documentResolved() const {
-	return _player || _mediaLifetime;
+void GiftButton::refreshLocked() {
+	_lockedTimer.cancel();
+
+	const auto lockedFor = _lockedUntilDate
+		? std::max(_lockedUntilDate - base::unixtime::now(), TimeId())
+		: TimeId();
+	const auto locked = (lockedFor > 0);
+	if (locked) {
+		_lockedTimer.callOnce(std::min(lockedFor, 86'400) * crl::time(1000));
+	}
+	if (_locked != locked) {
+		_locked = locked;
+		update();
+	}
 }
 
 void GiftButton::setDocument(not_null<DocumentData*> document) {
+	_resolvedDocument = document;
+	if (_playerDocument == document) {
+		return;
+	}
+
 	const auto media = document->createMediaView();
 	media->checkStickerLarge();
 	media->goodThumbnailWanted();
 
-	rpl::single() | rpl::then(
-		document->owner().session().downloaderTaskFinished()
+	const auto destroyed = base::take(_player);
+	_playerDocument = nullptr;
+	_mediaLifetime = rpl::single() | rpl::then(
+		document->session().downloaderTaskFinished()
 	) | rpl::filter([=] {
 		return media->loaded();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_mediaLifetime.destroy();
 
 		auto result = std::unique_ptr<HistoryView::StickerPlayer>();
@@ -132,23 +406,27 @@ void GiftButton::setDocument(not_null<DocumentData*> document) {
 				ChatHelpers::LottiePlayerFromDocument(
 					media.get(),
 					ChatHelpers::StickerLottieSize::InlineResults,
-					st::giftBoxStickerSize,
+					stickerSize(),
 					Lottie::Quality::High));
 		} else if (sticker->isWebm()) {
 			result = std::make_unique<HistoryView::WebmPlayer>(
 				media->owner()->location(),
 				media->bytes(),
-				st::giftBoxStickerSize);
+				stickerSize());
 		} else {
 			result = std::make_unique<HistoryView::StaticStickerPlayer>(
 				media->owner()->location(),
 				media->bytes(),
-				st::giftBoxStickerSize);
+				stickerSize());
 		}
 		result->setRepaintCallback([=] { update(); });
+		_playerDocument = media->owner();
 		_player = std::move(result);
 		update();
-	}, _mediaLifetime);
+	});
+	if (_playerDocument) {
+		_mediaLifetime.destroy();
+	}
 }
 
 void GiftButton::setGeometry(QRect inner, QMargins extend) {
@@ -156,44 +434,383 @@ void GiftButton::setGeometry(QRect inner, QMargins extend) {
 	AbstractButton::setGeometry(inner.marginsAdded(extend));
 }
 
+QMargins GiftButton::currentExtend() const {
+	const auto progress = (_selectionMode == GiftSelectionMode::Border)
+		? _selectedAnimation.value(_selected ? 1. : 0.)
+		: 0.;
+	const auto added = anim::interpolate(0, st::giftBoxSelectSkip, progress);
+	return _extend + QMargins(added, added, added, added);
+}
+
+bool GiftButton::small() const {
+	return (_mode != Mode::Full) && (_mode != Mode::CraftResale);
+}
+
+void GiftButton::toggleSelected(
+		bool selected,
+		GiftSelectionMode selectionMode,
+		anim::type animated) {
+	_selectionMode = selectionMode;
+	if (_selectionMode != GiftSelectionMode::Check) {
+		_check = nullptr;
+	} else if (!_check) {
+		_check = std::make_unique<Overview::Layout::Checkbox>(
+			[=] { update(); },
+			st::overviewSmallCheck);
+	}
+	if (_selected == selected) {
+		if (animated == anim::type::instant) {
+			_selectedAnimation.stop();
+		}
+		return;
+	}
+
+	const auto duration = st::defaultRoundCheckbox.duration;
+	_selected = selected;
+	if (animated == anim::type::instant) {
+		if (_check) {
+			_check->finishAnimating();
+		}
+		_selectedAnimation.stop();
+		return;
+	} else if (_check) {
+		_check->setChecked(selected, animated);
+		return;
+	}
+	_selectedAnimation.start([=] {
+		update();
+	}, selected ? 0. : 1., selected ? 1. : 0., duration, anim::easeOutCirc);
+}
+
+void GiftButton::paintBackground(QPainter &p, const QImage &background) {
+	const auto removed = currentExtend() - _extend;
+	const auto x = removed.left();
+	const auto y = removed.top();
+	const auto width = this->width() - x - removed.right();
+	const auto height = this->height() - y - removed.bottom();
+	const auto dpr = int(background.devicePixelRatio());
+	const auto bwidth = background.width() / dpr;
+	const auto bheight = background.height() / dpr;
+	const auto fillRow = [&](int yfrom, int ytill, int bfrom) {
+		const auto fill = [&](int xto, int wto, int xfrom, int wfrom = 0) {
+			const auto fheight = ytill - yfrom;
+			p.drawImage(
+				QRect(x + xto, y + yfrom, wto, fheight),
+				background,
+				QRect(
+					QPoint(xfrom, bfrom) * dpr,
+					QSize((wfrom ? wfrom : wto), fheight) * dpr));
+		};
+		if (width < bwidth) {
+			const auto xhalf = width / 2;
+			fill(0, xhalf, 0);
+			fill(xhalf, width - xhalf, bwidth - (width - xhalf));
+		} else if (width == bwidth) {
+			fill(0, width, 0);
+		} else {
+			const auto half = bwidth / (2 * dpr);
+			fill(0, half, 0);
+			fill(width - half, half, bwidth - half);
+			fill(half, width - 2 * half, half, 1);
+		}
+	};
+	if (height < bheight) {
+		fillRow(0, height / 2, 0);
+		fillRow(height / 2, height, bheight - (height - (height / 2)));
+	} else {
+		fillRow(0, height, 0);
+	}
+
+	auto hq = PainterHighQualityEnabler(p);
+	const auto progress = (_selectionMode == GiftSelectionMode::Border)
+		? _selectedAnimation.value(_selected ? 1. : 0.)
+		: 0.;
+	if (progress < 0.01) {
+		return;
+	}
+	const auto pwidth = progress * st::defaultRoundCheckbox.width;
+	p.setPen(QPen(st::defaultRoundCheckbox.bgActive->c, pwidth));
+	p.setBrush(Qt::NoBrush);
+	const auto rounded = rect().marginsRemoved(_extend);
+	const auto phalf = pwidth / 2.;
+	const auto extended = QRectF(rounded).marginsRemoved(
+		{ phalf, phalf, phalf, phalf });
+	const auto xradius = removed.left() + st::giftBoxGiftRadius - phalf;
+	const auto yradius = removed.top() + st::giftBoxGiftRadius - phalf;
+	p.drawRoundedRect(extended, xradius, yradius);
+}
+
 void GiftButton::resizeEvent(QResizeEvent *e) {
 	if (!_button.isEmpty()) {
 		_button.moveLeft((width() - _button.width()) / 2);
+		if (_stars) {
+			const auto padding = _button.height() / 2;
+			_stars->setCenter(_button - QMargins(padding, 0, padding, 0));
+		}
 	}
 }
 
-void GiftButton::paintEvent(QPaintEvent *e) {
-	if (!documentResolved()) {
-		if (const auto document = _delegate->lookupSticker(_descriptor)) {
-			setDocument(document);
+void GiftButton::contextMenuEvent(QContextMenuEvent *e) {
+	_contextMenuRequests.fire_copy((e->reason() == QContextMenuEvent::Mouse)
+		? e->globalPos()
+		: QCursor::pos());
+}
+
+void GiftButton::mousePressEvent(QMouseEvent *e) {
+	if (_mouseEventsAreListening) {
+		if (e->button() != Qt::LeftButton) {
+			return;
 		}
+		_mouseEvents.fire_copy(e);
+	} else {
+		AbstractButton::mousePressEvent(e);
 	}
+}
+
+void GiftButton::mouseMoveEvent(QMouseEvent *e) {
+	if (_mouseEventsAreListening) {
+		if (e->button() != Qt::LeftButton) {
+			return;
+		}
+		_mouseEvents.fire_copy(e);
+	} else {
+		AbstractButton::mouseMoveEvent(e);
+	}
+}
+
+void GiftButton::mouseReleaseEvent(QMouseEvent *e) {
+	if (_mouseEventsAreListening) {
+		if (e->button() != Qt::LeftButton) {
+			return;
+		}
+		_mouseEvents.fire_copy(e);
+	} else {
+		AbstractButton::mouseReleaseEvent(e);
+	}
+}
+
+rpl::producer<QPoint> GiftButton::contextMenuRequests() const {
+	return _contextMenuRequests.events();
+}
+
+rpl::producer<QMouseEvent*> GiftButton::mouseEvents() {
+	_mouseEventsAreListening = true;
+	return _mouseEvents.events();
+}
+
+bool GiftButton::makeCraftFrameIsFinal(
+		QImage &frame,
+		float64 progress) {
+	const auto ratio = style::DevicePixelRatio();
+	if (frame.size() != size() * ratio) {
+		frame = QImage(size() * ratio, QImage::Format_ARGB32_Premultiplied);
+		frame.setDevicePixelRatio(ratio);
+	}
+	if (progress < 1.) {
+		frame.fill(Qt::transparent);
+	}
+	auto p = QPainter(&frame);
+	paint(p, progress);
+	return (progress == 1.)
+		&& (!_uniquePatternEmoji || _uniquePatternEmoji->ready())
+		&& (!_player || (_player->ready() && _playerFinished));
+}
+
+void GiftButton::cacheUniqueBackground(
+		not_null<Data::UniqueGift*> unique,
+		int width,
+		int height) {
+	if (!_uniquePatternEmoji) {
+		_uniquePatternEmoji = _delegate->buttonPatternEmoji(unique, [=] {
+			update();
+		});
+		[[maybe_unused]] const auto preload = _uniquePatternEmoji->ready();
+	}
+	const auto outer = QRect(0, 0, width, height);
+	const auto extend = currentExtend();
+	const auto inner = outer.marginsRemoved(
+		extend
+	).translated(-extend.left(), -extend.top());
+	const auto ratio = style::DevicePixelRatio();
+	if (_uniqueBackgroundCache.size() != inner.size() * ratio) {
+		_uniqueBackgroundCache = QImage(
+			inner.size() * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		_uniqueBackgroundCache.fill(Qt::transparent);
+		_uniqueBackgroundCache.setDevicePixelRatio(ratio);
+
+		const auto radius = st::giftBoxGiftRadius;
+		auto p = QPainter(&_uniqueBackgroundCache);
+		paintUniqueBackgroundGradient(p, unique, inner, radius);
+		_patterned = false;
+	}
+	if (!_patterned && _uniquePatternEmoji->ready()) {
+		_patterned = true;
+		auto p = QPainter(&_uniqueBackgroundCache);
+		paintUniqueBackgroundPattern(p, unique, inner);
+	}
+}
+
+void GiftButton::paintUniqueBackgroundGradient(
+		QPainter &p,
+		not_null<Data::UniqueGift*> unique,
+		QRect inner,
+		float64 radius) {
+	auto hq = PainterHighQualityEnabler(p);
+	auto gradient = QRadialGradient(inner.center(), inner.width() / 2);
+	gradient.setStops({
+		{ 0., unique->backdrop.centerColor },
+		{ 1., unique->backdrop.edgeColor },
+	});
+	p.setBrush(gradient);
+	p.setPen(Qt::NoPen);
+	p.drawRoundedRect(inner, radius, radius);
+}
+
+void GiftButton::paintUniqueBackgroundPattern(
+		QPainter &p,
+		not_null<Data::UniqueGift*> unique,
+		QRect inner) {
+	p.setClipRect(inner);
+	const auto skip = inner.width() / 3;
+	Ui::PaintBgPoints(
+		p,
+		Ui::PatternBgPointsSmall(),
+		_uniquePatternCache,
+		_uniquePatternEmoji.get(),
+		*unique,
+		QRect(
+			inner.x() - skip,
+			inner.y(),
+			inner.width() + 2 * skip,
+			inner.height()));
+}
+
+void GiftButton::paintEvent(QPaintEvent *e) {
+	const auto canCraftAt = [&] {
+		if (_mode != Mode::Craft) {
+			return 0;
+		}
+		const auto stargift = std::get_if<GiftTypeStars>(&_descriptor);
+		const auto unique = stargift ? stargift->info.unique.get() : nullptr;
+		return unique ? unique->canCraftAt : TimeId();
+	}();
 
 	auto p = QPainter(this);
-	const auto hidden = v::is<GiftTypeStars>(_descriptor)
-		&& v::get<GiftTypeStars>(_descriptor).hidden;;
-	const auto position = QPoint(_extend.left(), _extend.top());
+	if (!canCraftAt || base::unixtime::now() >= canCraftAt) {
+		paint(p);
+		return;
+	}
+	const auto ratio = style::DevicePixelRatio();
+	const auto w = width() * ratio;
+	const auto h = height() * ratio;
+	auto cache = _delegate->craftUnavailableFrameCache(this, canCraftAt);
+	if (cache.width() < w || cache.height() < h) {
+		cache = QImage(
+			std::max(w, cache.width()),
+			std::max(h, cache.height()),
+			QImage::Format_ARGB32_Premultiplied);
+		cache.setDevicePixelRatio(ratio);
+	}
+	cache.fill(Qt::transparent);
+	auto q = QPainter(&cache);
+	paint(q);
+	q.end();
+
+	p.setOpacity(kCraftUnavailableOpacity);
+	p.drawImage(rect(), cache, QRect(0, 0, w, h));
+}
+
+void GiftButton::paint(QPainter &p, float64 craftProgress) {
+	const auto stargift = std::get_if<GiftTypeStars>(&_descriptor);
+	const auto unique = stargift ? stargift->info.unique.get() : nullptr;
+	const auto onsale = unique && unique->starsForResale && small();
+	const auto requirePremium = stargift
+		&& !stargift->userpic
+		&& !stargift->resale
+		&& !stargift->info.unique
+		&& stargift->info.requirePremium;
+	const auto auction = stargift
+		&& !stargift->userpic
+		&& !stargift->resale
+		&& !stargift->info.unique
+		&& stargift->info.auction();
+	const auto hidden = stargift && stargift->hidden;
+	const auto soldOut = stargift
+		&& !(stargift->pinned || stargift->pinnedSelection)
+		&& !unique
+		&& !stargift->userpic
+		&& stargift->info.limitedCount
+		&& !stargift->info.limitedLeft;
+	const auto extend = currentExtend();
+	const auto position = QPoint(extend.left(), extend.top());
 	const auto background = _delegate->background();
 	const auto dpr = int(background.devicePixelRatio());
 	const auto width = this->width();
-	if (width * dpr <= background.width()) {
-		p.drawImage(0, 0, background);
-	} else {
-		const auto full = background.width();
-		const auto half = ((full / 2) / dpr) * dpr;
-		const auto height = background.height();
-		p.drawImage(
-			QRect(0, 0, half / dpr, height / dpr),
-			background,
-			QRect(0, 0, half, height));
-		p.drawImage(
-			QRect(width - (half / dpr), 0, half / dpr, height / dpr),
-			background,
-			QRect(full - half, 0, half, height));
-		p.drawImage(
-			QRect(half / dpr, 0, width - 2 * (half / dpr), height / dpr),
-			background,
-			QRect(half, 0, 1, height));
+	const auto height = background.height() / dpr;
+	const auto roundedRatio = (1. - craftProgress);
+	if (craftProgress == 0.) {
+		paintBackground(p, background);
+	} else if (craftProgress < 1.) {
+		p.setOpacity(roundedRatio);
+		paintBackground(p, background);
+		p.setOpacity(1.);
+	}
+
+	if (unique) {
+		if (craftProgress > 0.) {
+			const auto outer = QRect(0, 0, width, height);
+			const auto inner = outer.marginsRemoved(extend * roundedRatio);
+			paintUniqueBackgroundGradient(
+				p,
+				unique,
+				inner,
+				int(base::SafeRound(st::giftBoxGiftRadius * roundedRatio)));
+
+			if (_uniquePatternEmoji->ready()) {
+				paintUniqueBackgroundPattern(p, unique, inner);
+				p.setClipping(false);
+			}
+		} else {
+			cacheUniqueBackground(unique, width, height);
+			p.drawImage(extend.left(), extend.top(), _uniqueBackgroundCache);
+		}
+	} else if (requirePremium || auction) {
+		auto hq = PainterHighQualityEnabler(p);
+		auto pen = st::creditsFg->p;
+		pen.setWidth(style::ConvertScaleExact(2.));
+		p.setPen(pen);
+		p.setBrush(Qt::NoBrush);
+		const auto outer = QRect(0, 0, width, background.height() / dpr);
+		const auto extend = currentExtend();
+		const auto radius = st::giftBoxGiftRadius;
+		p.drawRoundedRect(outer.marginsRemoved(extend), radius, radius);
+	}
+	auto inset = 0;
+	if (_selectionMode == GiftSelectionMode::Inset) {
+		const auto progress = _selectedAnimation.value(_selected ? 1. : 0.);
+		if (progress > 0) {
+			auto hq = PainterHighQualityEnabler(p);
+			auto pen = st::boxBg->p;
+			const auto thickness = style::ConvertScaleExact(2.);
+			pen.setWidthF(progress * thickness);
+			p.setPen(pen);
+			p.setBrush(Qt::NoBrush);
+			const auto outer = QRectF(0, 0, width, height);
+			const auto shift = progress * thickness * 2;
+			const auto extend = QMarginsF(currentExtend())
+				+ QMarginsF(shift, shift, shift, shift);
+			const auto radius = st::giftBoxGiftRadius - shift;
+			p.drawRoundedRect(outer.marginsRemoved(extend), radius, radius);
+			inset = int(std::ceil(
+				progress * (thickness * 2 + st::giftBoxUserpicSkip)));
+		}
+	}
+	if (_locked && !soldOut) {
+		st::giftBoxLockIcon.paint(
+			p,
+			position + st::giftBoxLockIconPosition,
+			width);
 	}
 
 	if (_userpic) {
@@ -203,136 +820,341 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 		}
 		const auto image = _userpic->image(st::giftBoxUserpicSize);
 		const auto skip = st::giftBoxUserpicSkip;
-		p.drawImage(_extend.left() + skip, _extend.top() + skip, image);
+		p.drawImage(extend.left() + skip, extend.top() + skip, image);
+	} else if (_check) {
+		const auto skip = st::giftBoxUserpicSkip;
+		_check->paint(
+			p,
+			QPoint(extend.left() + skip, extend.top() + skip),
+			width,
+			_selected,
+			true);
 	}
 
 	auto frame = QImage();
 	if (_player && _player->ready()) {
-		const auto paused = !isOver();
+		const auto paused = !isOver() || isHidden();
 		auto info = _player->frame(
-			st::giftBoxStickerSize,
+			stickerSize(),
 			QColor(0, 0, 0, 0),
 			false,
 			crl::now(),
 			paused);
 		frame = info.image;
-		const auto finished = (info.index + 1 == _player->framesCount());
-		if (!finished || !paused) {
+		_playerFinished = (info.index + 1 == _player->framesCount());
+		if (!_playerFinished || !paused) {
 			_player->markFrameShown();
 		}
 		const auto size = frame.size() / style::DevicePixelRatio();
 		p.drawImage(
 			QRect(
 				(width - size.width()) / 2,
-				(_text.isEmpty()
-					? st::giftBoxStickerStarTop
-					: st::giftBoxStickerTop),
+				((_mode == Mode::CraftPreview
+					|| _mode == Mode::Minimal
+					|| _mode == Mode::Craft)
+					? (extend.top()
+						+ ((height
+							- extend.top()
+							- extend.bottom()
+							- size.height()) / 2))
+					: small()
+					? st::giftBoxSmallStickerTop
+					: _text.isEmpty()
+					? (unique
+						? st::giftBoxStickerUniqueTop
+						: st::giftBoxStickerStarTop)
+					: _byStars.isEmpty()
+					? st::giftBoxStickerTop
+					: st::giftBoxStickerTopByStars),
 				size.width(),
 				size.height()),
 			frame);
 	}
 	if (hidden) {
 		const auto topleft = QPoint(
-			(width - st::giftBoxStickerSize.width()) / 2,
-			(_text.isEmpty()
-				? st::giftBoxStickerStarTop
-				: st::giftBoxStickerTop));
+			(width - stickerSize().width()) / 2,
+			(small()
+				? st::giftBoxSmallStickerTop
+				: _text.isEmpty()
+				? (unique
+					? st::giftBoxStickerUniqueTop
+					: st::giftBoxStickerStarTop)
+				: _byStars.isEmpty()
+				? st::giftBoxStickerTop
+				: st::giftBoxStickerTopByStars));
 		_delegate->hiddenMark()->paint(
 			p,
 			frame,
 			_hiddenBgCache,
 			topleft,
-			st::giftBoxStickerSize,
+			stickerSize(),
 			width);
 	}
 
 	auto hq = PainterHighQualityEnabler(p);
 	const auto premium = v::is<GiftTypePremium>(_descriptor);
-	const auto singlew = width - _extend.left() - _extend.right();
+	const auto singlew = width - extend.left() - extend.right();
 	const auto font = st::semiboldFont;
 	p.setFont(font);
-	const auto text = v::match(_descriptor, [&](GiftTypePremium data) {
+
+	const auto badge = v::match(_descriptor, [&](GiftTypePremium data) {
 		if (data.discountPercent > 0) {
 			p.setBrush(st::attentionButtonFg);
 			const auto kMinus = QChar(0x2212);
-			return kMinus + QString::number(data.discountPercent) + '%';
+			return GiftBadge{
+				.text = kMinus + QString::number(data.discountPercent) + '%',
+				.bg1 = st::premiumButtonBg3->c,
+				.bg2 = st::premiumButtonBg2->c,
+				.fg = st::windowBg->c,
+				.gradient = true,
+				.small = true,
+			};
 		}
-		return QString();
+		return GiftBadge();
 	}, [&](const GiftTypeStars &data) {
-		if (const auto count = data.limitedCount) {
-			const auto soldOut = !data.userpic && !data.limitedLeft;
-			p.setBrush(soldOut
-				? st::attentionButtonFg
-				: st::windowActiveTextFg);
-			return soldOut
-				? tr::lng_gift_stars_sold_out(tr::now)
-				: !data.userpic
-				? tr::lng_gift_stars_limited(tr::now)
-				: (count == 1)
-				? tr::lng_gift_limited_of_one(tr::now)
-				: tr::lng_gift_limited_of_count(
-					tr::now,
-					lt_amount,
-					((count % 1000)
-						? Lang::FormatCountDecimal(count)
-						: Lang::FormatCountToShort(count).string));
+		const auto count = data.info.limitedCount;
+		const auto pinned = data.pinned || data.pinnedSelection;
+		const auto now = base::unixtime::now();
+		const auto upcomingAuction = (data.info.auctionStartDate > 0)
+			&& (data.info.auctionStartDate > now);
+		if (count || pinned) {
+			const auto yourLeft = data.info.perUserTotal
+				? (data.info.perUserRemains
+					? tr::lng_gift_stars_your_left(
+						tr::now,
+						lt_count,
+						data.info.perUserRemains)
+					: tr::lng_gift_stars_your_finished(tr::now))
+				: QString();
+			return GiftBadge{
+				.text = (onsale
+					? tr::lng_gift_stars_on_sale(tr::now)
+					: (unique && (data.resale || pinned || data.mine))
+					? ('#' + Lang::FormatCountDecimal(unique->number))
+					: data.resale
+					? tr::lng_gift_stars_resale(tr::now)
+					: soldOut
+					? tr::lng_gift_stars_sold_out(tr::now)
+					: (!unique && data.info.auction())
+					? (upcomingAuction
+						? tr::lng_gift_stars_auction_soon
+						: tr::lng_gift_stars_auction)(tr::now)
+					: (!data.userpic
+						&& !data.info.unique
+						&& data.info.requirePremium)
+					? ((yourLeft.isEmpty() || !_delegate->amPremium())
+						? tr::lng_gift_stars_premium(tr::now)
+						: yourLeft)
+					: (!data.userpic && !data.info.unique)
+					? (yourLeft.isEmpty()
+						? tr::lng_gift_stars_limited(tr::now)
+						: yourLeft)
+					: (count == 1)
+					? tr::lng_gift_limited_of_one(tr::now)
+					: tr::lng_gift_limited_of_count(
+						tr::now,
+						lt_amount,
+						(((count % 1000) && (count < 10'000))
+							? Lang::FormatCountDecimal(count)
+							: Lang::FormatCountToShort(count).string))),
+				.bg1 = (onsale
+					? st::boxTextFgGood->c
+					: unique
+					? unique->backdrop.edgeColor
+					: data.resale
+					? st::boxTextFgGood->c
+					: soldOut
+					? st::attentionButtonFg->c
+					: (!data.userpic
+						&& (data.info.auction() || data.info.requirePremium))
+					? st::creditsFg->c
+					: st::windowActiveTextFg->c),
+				.bg2 = (onsale
+					? QColor(0, 0, 0, 0)
+					: unique
+					? unique->backdrop.patternColor
+					: QColor(0, 0, 0, 0)),
+				.border = (onsale
+					? QColor(255, 255, 255)
+					: QColor(0, 0, 0, 0)),
+				.fg = (onsale
+					? st::windowBg->c
+					: unique
+					? QColor(255, 255, 255)
+					: st::windowBg->c),
+				.small = true,
+			};
 		}
-		return QString();
+		return GiftBadge();
 	});
-	if (!text.isEmpty()) {
-		p.setPen(Qt::NoPen);
-		const auto twidth = font->width(text);
-		const auto pos = position + QPoint(singlew - twidth, font->height);
-		p.save();
-		const auto rubberOut = _extend.top();
-		const auto inner = rect().marginsRemoved(_extend);
+
+	if (badge) {
+		const auto rubberOut = st::lineWidth;
+		const auto inner = rect().marginsRemoved(extend);
 		p.setClipRect(inner.marginsAdded(
 			{ rubberOut, rubberOut, rubberOut, rubberOut }));
-		p.translate(pos);
-		p.rotate(45.);
-		p.translate(-pos);
-		p.drawRect(-5 * twidth, position.y(), twidth * 12, font->height);
-		p.setPen(st::windowBg);
-		p.drawText(pos - QPoint(0, font->descent), text);
-		p.restore();
+
+		const auto cached = _delegate->cachedBadge(badge);
+		const auto width = cached.width() / cached.devicePixelRatio();
+		p.drawImage(
+			position.x() + singlew + rubberOut - width,
+			position.y() - rubberOut,
+			cached);
 	}
-	p.setBrush(premium ? st::lightButtonBgOver : st::creditsBg3);
-	p.setPen(Qt::NoPen);
-	if (!premium) {
-		p.setOpacity(0.12);
+
+	auto percentSkip = 0;
+	v::match(_descriptor, [](const GiftTypePremium &) {
+	}, [&](const GiftTypeStars &data) {
+		if (!unique || _mode == Mode::Craft || _mode == Mode::CraftPreview) {
+		} else if (data.pinned && _mode != Mode::Selection) {
+			auto hq = PainterHighQualityEnabler(p);
+			const auto &icon = st::giftBoxPinIcon;
+			const auto skip = st::giftBoxUserpicSkip;
+			const auto add = (st::giftBoxUserpicSize - icon.width()) / 2;
+			p.setPen(Qt::NoPen);
+			p.setBrush(unique->backdrop.patternColor);
+			const auto rect = QRect(
+				QPoint(extend.left() + skip, extend.top() + skip),
+				QSize(icon.width() + 2 * add, icon.height() + 2 * add));
+			p.drawEllipse(rect);
+			icon.paintInCenter(p, rect);
+		} else if (!data.forceTon
+			&& unique->nanoTonForResale
+			&& unique->onlyAcceptTon) {
+			auto hq = PainterHighQualityEnabler(p);
+			if (_tonIcon.isNull()) {
+				_tonIcon = st::tonIconEmojiLarge.icon.instance(
+					QColor(255, 255, 255));
+			}
+			const auto size = _tonIcon.size() / _tonIcon.devicePixelRatio();
+			const auto skip = st::giftBoxUserpicSkip + inset;
+			const auto add = (st::giftBoxUserpicSize - size.width()) / 2;
+			p.setPen(Qt::NoPen);
+			p.setBrush(unique->backdrop.patternColor);
+			const auto rect = QRect(
+				QPoint(extend.left() + skip, extend.top() + skip),
+				QSize(size.width() + 2 * add, size.height() + 2 * add));
+			p.drawEllipse(rect);
+			p.drawImage(
+				extend.left() + skip + add,
+				extend.top() + skip + add,
+				_tonIcon);
+			percentSkip += st::giftBoxUserpicSize;
+		}
+	});
+
+	if (unique
+		&& unique->craftChancePermille > 0
+		&& (_mode == Mode::Craft || _mode == Mode::CraftResale)) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(unique->backdrop.patternColor);
+
+		const auto rounded = (unique->craftChancePermille + 5) / 10;
+		const auto percent = QString::number(rounded) + '%';
+		const auto &font = st::giftBoxGiftBadgeFont;
+		const auto height = font->height + st::lineWidth;
+		const auto radius = height / 2.;
+		const auto skip = st::giftBoxUserpicSkip
+			+ (_selected ? inset : st::giftBoxUserpicSkip);
+		const auto space = font->spacew;
+		const auto x = extend.left() + skip + percentSkip;
+		const auto y = extend.top() + skip;
+		const auto width = font->width(percent) + 2 * space;
+		p.drawRoundedRect(x, y, width, height, radius, radius);
+
+		p.setPen(st::white);
+		p.setFont(font);
+		p.drawText(x + space, y + font->ascent, percent);
 	}
-	const auto geometry = _button;
-	const auto radius = geometry.height() / 2.;
-	p.drawRoundedRect(geometry, radius, radius);
-	if (!premium) {
-		p.setOpacity(1.);
+
+	if (!_button.isEmpty()) {
+		p.setBrush(onsale
+			? QBrush(unique->backdrop.patternColor)
+			: unique
+			? QBrush(QColor(255, 255, 255, .2 * 255))
+			: premium
+			? st::lightButtonBgOver
+			: st::creditsBg3);
+		p.setPen(Qt::NoPen);
+		if (!unique && !premium) {
+			p.setOpacity(0.12);
+		} else if (onsale) {
+			p.setOpacity(0.8);
+		}
+		const auto geometry = _button;
+		const auto radius = geometry.height() / 2.;
+		p.drawRoundedRect(geometry, radius, radius);
+		if (!premium || onsale) {
+			p.setOpacity(1.);
+		}
+		if (_stars) {
+			if (unique) {
+				_stars->paint(p);
+			} else {
+				auto clipPath = QPainterPath();
+				clipPath.addRoundedRect(geometry, radius, radius);
+				p.setClipPath(clipPath);
+				_stars->paint(p);
+				p.setClipping(false);
+			}
+		}
 	}
 
 	if (!_text.isEmpty()) {
 		p.setPen(st::windowFg);
 		_text.draw(p, {
-			.position = (position
-				+ QPoint(0, st::giftBoxPremiumTextTop)),
+			.position = (position + QPoint(0, _byStars.isEmpty()
+				? st::giftBoxPremiumTextTop
+				: st::giftBoxPremiumTextTopByStars)),
 			.availableWidth = singlew,
 			.align = style::al_top,
 		});
 	}
 
-	const auto padding = st::giftBoxButtonPadding;
-	p.setPen(premium ? st::windowActiveTextFg : st::creditsFg);
-	_price.draw(p, {
-		.position = (geometry.topLeft()
-			+ QPoint(padding.left(), padding.top())),
-		.availableWidth = _price.maxWidth(),
-	});
+	if (!_button.isEmpty()) {
+		const auto padding = st::giftBoxButtonPadding;
+		p.setPen(unique
+			? QPen(QColor(255, 255, 255))
+			: premium
+			? st::windowActiveTextFg
+			: st::creditsFg);
+		_price.draw(p, {
+			.position = (_button.topLeft()
+				+ QPoint(padding.left(), padding.top())),
+			.availableWidth = _price.maxWidth(),
+		});
+
+		if (!_byStars.isEmpty()) {
+			p.setPen(st::creditsFg);
+			_byStars.draw(p, {
+				.position = QPoint(
+					position.x(),
+					_button.y() + _button.height() + st::giftBoxByStarsSkip),
+				.availableWidth = singlew,
+				.align = style::al_top,
+			});
+		}
+	}
 }
 
-Delegate::Delegate(not_null<Window::SessionController*> window)
-: _window(window)
+QSize GiftButton::stickerSize() const {
+	return (_mode == Mode::CraftPreview)
+		? st::giftBoxStickerTiny
+		: st::giftBoxStickerSize;
+}
+
+Delegate::Delegate(not_null<Main::Session*> session, GiftButtonMode mode)
+: _session(session)
 , _hiddenMark(std::make_unique<StickerPremiumMark>(
-	&window->session(),
+	_session,
 	st::giftBoxHiddenMark,
-	RectPart::Center)) {
+	RectPart::Center))
+, _mode(mode) {
+	_ministarEmoji = _emojiHelper.paletteDependent(
+		Ui::Earn::IconCreditsEmojiSmall());
+	_starEmoji = _emojiHelper.paletteDependent(
+		Ui::Earn::IconCreditsEmoji());
 }
 
 Delegate::Delegate(Delegate &&other) = default;
@@ -340,15 +1162,23 @@ Delegate::Delegate(Delegate &&other) = default;
 Delegate::~Delegate() = default;
 
 TextWithEntities Delegate::star() {
-	const auto owner = &_window->session().data();
-	return owner->customEmojiManager().creditsEmoji();
+	return _starEmoji;
 }
 
-std::any Delegate::textContext() {
-	return Core::MarkedTextContext{
-		.session = &_window->session(),
-		.customEmojiRepaint = [] {},
-	};
+TextWithEntities Delegate::monostar() {
+	return Ui::Text::IconEmoji(&st::starIconEmoji);
+}
+
+TextWithEntities Delegate::monoton() {
+	return Ui::Text::IconEmoji(&st::tonIconEmoji);
+}
+
+TextWithEntities Delegate::ministar() {
+	return _ministarEmoji;
+}
+
+Ui::Text::MarkedContext Delegate::textContext() {
+	return _emojiHelper.context();
 }
 
 QSize Delegate::buttonSize() {
@@ -360,14 +1190,33 @@ QSize Delegate::buttonSize() {
 	const auto available = width - padding.left() - padding.right();
 	const auto singlew = (available - 2 * st::giftBoxGiftSkip.x())
 		/ kGiftsPerRow;
-	_single = QSize(singlew, st::giftBoxGiftHeight);
+	const auto minimal = (_mode != GiftButtonMode::Full)
+		&& (_mode != GiftButtonMode::CraftResale);
+	const auto tiny = (_mode == GiftButtonMode::CraftPreview);
+	_single = QSize(
+		tiny ? st::giftBoxGiftTiny : singlew,
+		(tiny
+			? st::giftBoxGiftTiny
+			: minimal
+			? st::giftBoxGiftSmall
+			: st::giftBoxGiftHeight));
 	return _single;
 }
 
-QMargins Delegate::buttonExtend() {
+QMargins Delegate::buttonExtend() const {
 	return st::defaultDropdownMenu.wrap.shadow.extend;
 }
 
+auto Delegate::buttonPatternEmoji(
+	not_null<Data::UniqueGift*> unique,
+	Fn<void()> repaint)
+-> std::unique_ptr<Ui::Text::CustomEmoji> {
+	return _session->data().customEmojiManager().create(
+		unique->pattern.document,
+		repaint,
+		Data::CustomEmojiSizeTag::Large);
+}
+
 QImage Delegate::background() {
 	if (!_bg.isNull()) {
 		return _bg;
@@ -417,26 +1266,337 @@ QImage Delegate::background() {
 	return _bg;
 }
 
-DocumentData *Delegate::lookupSticker(const GiftDescriptor &descriptor) {
-	return LookupGiftSticker(&_window->session(), descriptor);
+rpl::producer<not_null<DocumentData*>> Delegate::sticker(
+		const GiftDescriptor &descriptor) {
+	return GiftStickerValue(_session, descriptor);
 }
 
 not_null<StickerPremiumMark*> Delegate::hiddenMark() {
 	return _hiddenMark.get();
 }
 
+QImage Delegate::cachedBadge(const GiftBadge &badge) {
+	auto &image = _badges[badge];
+	if (image.isNull()) {
+		image = ValidateRotatedBadge(badge, QMargins());
+	}
+	return image;
+}
+
+bool Delegate::amPremium() {
+	return _session->premium();
+}
+
+void Delegate::invalidateCache() {
+	_bg = QImage();
+	_badges.clear();
+}
+
+QImage &Delegate::craftUnavailableFrameCache(
+		not_null<GiftButton*> button,
+		TimeId until) {
+	const auto weak = QPointer<QWidget>(button.get());
+	if (!ranges::contains(_craftUnavailables, weak)) {
+		_craftUnavailables.push_back(weak);
+	}
+	if (!_craftUnavailableTimer) {
+		_craftUnavailableTimer = std::make_unique<base::Timer>(
+			[=] { updateCraftUnavailables(); });
+	}
+	if (!_craftUnavailableTimer->isActive()
+		|| _craftUnavailableUntil > until) {
+		_craftUnavailableUntil = until;
+		const auto left = until - base::unixtime::now();
+		_craftUnavailableTimer->callOnce(
+			std::clamp(left, 1, 86400) * crl::time(1000));
+	}
+	return _craftUnavailableFrameCache;
+}
+
+void Delegate::updateCraftUnavailables() {
+	Expects(_craftUnavailableTimer != nullptr);
+
+	_craftUnavailableTimer->cancel();
+	_craftUnavailableUntil = 0;
+
+	for (auto i = begin(_craftUnavailables); i != end(_craftUnavailables);) {
+		if (const auto raw = i->data()) {
+			raw->update();
+			++i;
+		} else {
+			i = _craftUnavailables.erase(i);
+		}
+	}
+}
+
 DocumentData *LookupGiftSticker(
 		not_null<Main::Session*> session,
 		const GiftDescriptor &descriptor) {
-	auto &packs = session->giftBoxStickersPacks();
-	packs.load();
 	return v::match(descriptor, [&](GiftTypePremium data) {
+		auto &packs = session->giftBoxStickersPacks();
+		packs.load();
 		return packs.lookup(data.months);
 	}, [&](GiftTypeStars data) {
-		return data.document
-			? data.document
-			: packs.lookup(packs.monthsForStars(data.stars));
+		return data.info.document.get();
 	});
 }
 
+rpl::producer<not_null<DocumentData*>> GiftStickerValue(
+		not_null<Main::Session*> session,
+		const GiftDescriptor &descriptor) {
+	return v::match(descriptor, [&](GiftTypePremium data) {
+		const auto months = data.months;
+		auto &packs = session->giftBoxStickersPacks();
+		packs.load();
+		if (const auto result = packs.lookup(months)) {
+			return result->sticker()
+				? (rpl::single(not_null(result)) | rpl::type_erased)
+				: rpl::never<not_null<DocumentData*>>();
+		}
+		return packs.updated(
+		) | rpl::map([=] {
+			return session->giftBoxStickersPacks().lookup(data.months);
+		}) | rpl::filter([](DocumentData *document) {
+			return document && document->sticker();
+		}) | rpl::take(1) | rpl::map([=](DocumentData *document) {
+			return not_null(document);
+		}) | rpl::type_erased;
+	}, [&](GiftTypeStars data) {
+		return rpl::single(data.info.document) | rpl::type_erased;
+	});
+}
+
+QImage ValidateRotatedBadge(
+		const GiftBadge &badge,
+		QMargins padding,
+		bool left) {
+	const auto &font = badge.small
+		? st::giftBoxGiftBadgeFont
+		: st::msgServiceGiftBoxBadgeFont;
+	const auto twidth = font->width(badge.text)
+		+ padding.left()
+		+ padding.right();
+	const auto skip = int(std::ceil(twidth / M_SQRT2));
+	const auto ratio = style::DevicePixelRatio();
+	const auto multiplier = ratio * 3;
+	const auto size = (twidth + font->height * 2);
+	const auto height = padding.top() + font->height + padding.bottom();
+	const auto angle = left ? -45. : 45.;
+	const auto textpos = left
+		? QPoint(padding.top(), size - skip)
+		: QPoint(size - skip, padding.top());
+	auto image = QImage(
+		QSize(size, size) * multiplier,
+		QImage::Format_ARGB32_Premultiplied);
+	image.fill(Qt::transparent);
+	image.setDevicePixelRatio(multiplier);
+	{
+		auto p = QPainter(&image);
+		auto hq = PainterHighQualityEnabler(p);
+		p.translate(textpos);
+		p.rotate(angle);
+		p.setFont(font);
+		p.setPen(badge.fg);
+		p.drawText(
+			QPoint(padding.left(), padding.top() + font->ascent),
+			badge.text);
+	}
+
+	auto scaled = image.scaled(
+		QSize(size, size) * ratio,
+		Qt::IgnoreAspectRatio,
+		Qt::SmoothTransformation);
+	scaled.setDevicePixelRatio(ratio);
+
+	auto result = QImage(
+		QSize(size, size) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(ratio);
+	result.fill(Qt::transparent);
+	{
+		auto p = QPainter(&result);
+		auto hq = PainterHighQualityEnabler(p);
+
+		p.save();
+		p.translate(textpos);
+		p.rotate(angle);
+		const auto rect = QRect(-5 * twidth, 0, twidth * 12, height);
+		if (badge.border.alpha() > 0) {
+			p.setPen(badge.border);
+		} else {
+			p.setPen(Qt::NoPen);
+		}
+		if (badge.gradient) {
+			const auto skip = font->height / M_SQRT2;
+			auto gradient = QLinearGradient(
+				QPointF(-twidth - skip, 0),
+				QPointF(twidth + skip, 0));
+			gradient.setStops({
+				{ 0., badge.bg1 },
+				{ 1., badge.bg2 },
+			});
+			p.setBrush(gradient);
+			p.drawRect(rect);
+		} else {
+			p.setBrush(badge.bg1);
+			p.drawRect(rect);
+			if (badge.bg2.alpha() > 0) {
+				p.setOpacity(0.5);
+				p.setBrush(badge.bg2);
+				p.drawRect(rect);
+				p.setOpacity(1.);
+			}
+		}
+		p.restore();
+
+		p.drawImage(0, 0, scaled);
+	}
+	return result;
+}
+
+void SelectGiftToUnpin(
+		std::shared_ptr<ChatHelpers::Show> show,
+		const std::vector<Data::CreditsHistoryEntry> &pinned,
+		Fn<void(Data::SavedStarGiftId)> chosen) {
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		struct State {
+			explicit State(not_null<Main::Session*> session)
+			: delegate(session, GiftButtonMode::Minimal) {
+			}
+
+			Delegate delegate;
+			rpl::variable<int> selected = -1;
+			std::vector<not_null<GiftButton*>> buttons;
+		};
+		const auto session = &show->session();
+		const auto state = box->lifetime().make_state<State>(session);
+
+		box->setStyle(st::giftTooManyPinnedBox);
+		box->setWidth(st::boxWideWidth);
+
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_gift_many_pinned_title(),
+				st::giftBoxSubtitle),
+			st::giftBoxSubtitleMargin,
+			style::al_top);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_gift_many_pinned_choose(),
+				st::giftTooManyPinnedChoose),
+			st::giftBoxAboutMargin,
+			style::al_top);
+
+		const auto gifts = box->addRow(
+			object_ptr<Ui::RpWidget>(box),
+			QMargins(
+				st::giftBoxPadding.left(),
+				st::giftTooManyPinnedBox.buttonPadding.top(),
+				st::giftBoxPadding.right(),
+				0));
+		for (const auto &entry : pinned) {
+			const auto index = int(state->buttons.size());
+			state->buttons.push_back(
+				Ui::CreateChild<GiftButton>(gifts, &state->delegate));
+			const auto button = state->buttons.back();
+			button->setDescriptor(GiftTypeStars{
+				.info = {
+					.id = entry.stargiftId,
+					.unique = entry.uniqueGift,
+					.document = entry.uniqueGift->model.document,
+				},
+				.pinnedSelection = true,
+			}, GiftButton::Mode::Minimal);
+			button->setClickedCallback([=] {
+				const auto now = state->selected.current();
+				state->selected = (now == index) ? -1 : index;
+			});
+		}
+
+		state->selected.value(
+		) | rpl::combine_previous(
+		) | rpl::on_next([=](int old, int now) {
+			if (old >= 0) state->buttons[old]->toggleSelected(false);
+			if (now >= 0) state->buttons[now]->toggleSelected(true);
+		}, gifts->lifetime());
+
+		gifts->widthValue() | rpl::on_next([=](int width) {
+			const auto singleMin = state->delegate.buttonSize();
+			if (width < singleMin.width()) {
+				return;
+			}
+			const auto count = int(state->buttons.size());
+			const auto skipw = st::giftBoxGiftSkip.x();
+			const auto skiph = st::giftBoxGiftSkip.y();
+			const auto perRow = std::min(
+				(width + skipw) / (singleMin.width() + skipw),
+				std::max(count, 1));
+			if (perRow <= 0) {
+				return;
+			}
+			const auto single = (width - (perRow - 1) * skipw) / perRow;
+			const auto height = singleMin.height();
+			const auto rows = (count + perRow - 1) / perRow;
+			for (auto row = 0; row != rows; ++row) {
+				const auto y = row * (height + skiph);
+				for (auto column = 0; column != perRow; ++column) {
+					const auto index = row * perRow + column;
+					if (index >= count) {
+						break;
+					}
+					const auto &button = state->buttons[index];
+					const auto x = column * (single + skipw);
+					button->setGeometry(
+						QRect(x, y, single, height),
+						state->delegate.buttonExtend());
+				}
+			}
+			gifts->resize(width, rows * (height + skiph) - skiph);
+		}, gifts->lifetime());
+
+		const auto button = box->addButton(rpl::single(QString()), [=] {
+			const auto index = state->selected.current();
+			if (index < 0) {
+				return;
+			}
+			Assert(index < int(pinned.size()));
+			const auto &entry = pinned[index];
+			const auto weak = base::make_weak(box);
+			chosen(::Settings::EntryToSavedStarGiftId(session, entry));
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		});
+		const auto label = Ui::SetButtonMarkedLabel(
+			button,
+			tr::lng_context_unpin_from_top(tr::marked),
+			&show->session(),
+			st::creditsBoxButtonLabel,
+			&st::giftTooManyPinnedBox.button.textFg);
+
+		state->selected.value() | rpl::on_next([=](int value) {
+			const auto has = (value >= 0);
+			label->setOpacity(has ? 1. : 0.5);
+			button->setAttribute(Qt::WA_TransparentForMouseEvents, !has);
+		}, box->lifetime());
+
+		const auto buttonPadding = st::giftTooManyPinnedBox.buttonPadding;
+		const auto buttonWidth = st::boxWideWidth
+			- buttonPadding.left()
+			- buttonPadding.right();
+		button->resizeToWidth(buttonWidth);
+		button->widthValue() | rpl::on_next([=](int width) {
+			if (width != buttonWidth) {
+				button->resizeToWidth(buttonWidth);
+			}
+		}, button->lifetime());
+	}));
+}
+
+QColor BurnedBadgeBg() {
+	return QColor(0xd0, 0x3a, 0x3b);
+}
+
 } // namespace Info::PeerGifts
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
index 6fd2b74138d885..0b31fd321e67a9 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
@@ -7,11 +7,26 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/qt/qt_compare.h"
+#include "base/timer.h"
+#include "data/data_star_gift.h"
 #include "ui/abstract_button.h"
+#include "ui/effects/premium_stars_colored.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/text.h"
 
 class StickerPremiumMark;
 
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Data {
+struct UniqueGift;
+struct CreditsHistoryEntry;
+class SavedStarGiftId;
+} // namespace Data
+
 namespace HistoryView {
 class StickerPlayer;
 } // namespace HistoryView
@@ -20,19 +35,38 @@ namespace Main {
 class Session;
 } // namespace Main
 
+namespace Overview::Layout {
+class Checkbox;
+} // namespace Overview::Layout
+
 namespace Ui {
 class DynamicImage;
 } // namespace Ui
 
+namespace Ui::Text {
+class CustomEmoji;
+} // namespace Ui::Text
+
 namespace Window {
 class SessionController;
 } // namespace Window
 
 namespace Info::PeerGifts {
 
+struct Tag {
+	explicit Tag(not_null<PeerData*> peer, int collectionId = 0)
+	: peer(peer)
+	, collectionId(collectionId) {
+	}
+
+	not_null<PeerData*> peer;
+	int collectionId = 0;
+};
+
 struct GiftTypePremium {
 	int64 cost = 0;
 	QString currency;
+	int stars = 0;
 	int months = 0;
 	int discountPercent = 0;
 
@@ -42,22 +76,27 @@ struct GiftTypePremium {
 };
 
 struct GiftTypeStars {
-	uint64 id = 0;
-	int64 stars = 0;
-	int64 convertStars = 0;
-	DocumentData *document = nullptr;
+	Data::SavedStarGiftId transferId;
+	Data::StarGift info;
 	PeerData *from = nullptr;
-	int limitedCount = 0;
-	int limitedLeft = 0;
-	bool userpic = false;
-	bool hidden = false;
-	bool mine = false;
+	TimeId date = 0;
+	bool pinnedSelection : 1 = false;
+	bool forceTon : 1 = false;
+	bool userpic : 1 = false;
+	bool pinned : 1 = false;
+	bool hidden : 1 = false;
+	bool resale : 1 = false;
+	bool mine : 1 = false;
 
 	[[nodiscard]] friend inline bool operator==(
 		const GiftTypeStars&,
 		const GiftTypeStars&) = default;
 };
 
+[[nodiscard]] rpl::producer<std::vector<GiftTypeStars>> GiftsStars(
+	not_null<Main::Session*> session,
+	not_null<PeerData*> peer);
+
 struct GiftDescriptor : std::variant<GiftTypePremium, GiftTypeStars> {
 	using variant::variant;
 
@@ -66,16 +105,78 @@ struct GiftDescriptor : std::variant<GiftTypePremium, GiftTypeStars> {
 		const GiftDescriptor&) = default;
 };
 
+struct GiftSendDetails {
+	GiftDescriptor descriptor;
+	TextWithEntities text;
+	uint64 randomId = 0;
+	bool anonymous = false;
+	bool upgraded = false;
+	bool byStars = false;
+};
+
+struct GiftBadge {
+	QString text;
+	QColor bg1;
+	QColor bg2 = QColor(0, 0, 0, 0);
+	QColor border = QColor(0, 0, 0, 0);
+	QColor fg;
+	bool gradient = false;
+	bool small = false;
+
+	explicit operator bool() const {
+		return !text.isEmpty();
+	}
+
+	friend std::strong_ordering operator<=>(
+		const GiftBadge &a,
+		const GiftBadge &b);
+
+	friend inline bool operator==(
+		const GiftBadge &,
+		const GiftBadge &) = default;
+};
+
+enum class GiftButtonMode : uint8 {
+	Full,
+	Craft,
+	CraftResale,
+	Minimal,
+	Selection,
+	CraftPreview,
+};
+
+enum class GiftSelectionMode : uint8 {
+	Border,
+	Inset,
+	Check,
+};
+
+class GiftButton;
+
 class GiftButtonDelegate {
 public:
 	[[nodiscard]] virtual TextWithEntities star() = 0;
-	[[nodiscard]] virtual std::any textContext() = 0;
+	[[nodiscard]] virtual TextWithEntities monostar() = 0;
+	[[nodiscard]] virtual TextWithEntities monoton() = 0;
+	[[nodiscard]] virtual TextWithEntities ministar() = 0;
+	[[nodiscard]] virtual Ui::Text::MarkedContext textContext() = 0;
 	[[nodiscard]] virtual QSize buttonSize() = 0;
-	[[nodiscard]] virtual QMargins buttonExtend() = 0;
+	[[nodiscard]] virtual QMargins buttonExtend() const = 0;
+	[[nodiscard]] virtual auto buttonPatternEmoji(
+		not_null<Data::UniqueGift*> unique,
+		Fn<void()> repaint)
+	-> std::unique_ptr<Ui::Text::CustomEmoji> = 0;
 	[[nodiscard]] virtual QImage background() = 0;
-	[[nodiscard]] virtual DocumentData *lookupSticker(
+	[[nodiscard]] virtual rpl::producer<not_null<DocumentData*>> sticker(
 		const GiftDescriptor &descriptor) = 0;
 	[[nodiscard]] virtual not_null<StickerPremiumMark*> hiddenMark() = 0;
+	[[nodiscard]] virtual QImage cachedBadge(const GiftBadge &badge) = 0;
+	[[nodiscard]] virtual bool amPremium() = 0;
+	virtual void invalidateCache() = 0;
+	[[nodiscard]] virtual QImage &craftUnavailableFrameCache(
+		not_null<GiftButton*> button,
+		TimeId until) = 0;
+
 };
 
 class GiftButton final : public Ui::AbstractButton {
@@ -83,53 +184,142 @@ class GiftButton final : public Ui::AbstractButton {
 	GiftButton(QWidget *parent, not_null<GiftButtonDelegate*> delegate);
 	~GiftButton();
 
-	void setDescriptor(const GiftDescriptor &descriptor);
+	using Mode = GiftButtonMode;
+	void setDescriptor(const GiftDescriptor &descriptor, Mode mode);
 	void setGeometry(QRect inner, QMargins extend);
 
+	void toggleSelected(
+		bool selected,
+		GiftSelectionMode selectionMode = GiftSelectionMode::Border,
+		anim::type animated = anim::type::normal);
+
+	[[nodiscard]] rpl::producer<QPoint> contextMenuRequests() const;
+	[[nodiscard]] rpl::producer<QMouseEvent*> mouseEvents();
+
+	[[nodiscard]] bool makeCraftFrameIsFinal(
+		QImage &frame,
+		float64 progress);
+
 private:
 	void paintEvent(QPaintEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
+	void contextMenuEvent(QContextMenuEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+
+	void paint(QPainter &p, float64 craftProgress = 0.);
+	void paintBackground(QPainter &p, const QImage &background);
+	void cacheUniqueBackground(
+		not_null<Data::UniqueGift*> unique,
+		int width,
+		int height);
+	void paintUniqueBackgroundGradient(
+		QPainter &p,
+		not_null<Data::UniqueGift*> unique,
+		QRect inner,
+		float64 radius);
+	void paintUniqueBackgroundPattern(
+		QPainter &p,
+		not_null<Data::UniqueGift*> unique,
+		QRect inner);
 
+	void refreshLocked();
 	void setDocument(not_null<DocumentData*> document);
-	[[nodiscard]] bool documentResolved() const;
+	[[nodiscard]] QSize stickerSize() const;
+	[[nodiscard]] QMargins currentExtend() const;
+	[[nodiscard]] bool small() const;
 
+	void onStateChanged(State was, StateChangeSource source) override;
 	void unsubscribe();
 
 	const not_null<GiftButtonDelegate*> _delegate;
+	rpl::event_stream<QPoint> _contextMenuRequests;
+	rpl::event_stream<QMouseEvent*> _mouseEvents;
 	QImage _hiddenBgCache;
 	GiftDescriptor _descriptor;
 	Ui::Text::String _text;
 	Ui::Text::String _price;
+	Ui::Text::String _byStars;
 	std::shared_ptr<Ui::DynamicImage> _userpic;
-	bool _subscribed = false;
+	QImage _uniqueBackgroundCache;
+	QImage _tonIcon;
+	std::unique_ptr<Ui::Text::CustomEmoji> _uniquePatternEmoji;
+	base::flat_map<float64, QImage> _uniquePatternCache;
+	std::optional<Ui::Premium::ColoredMiniStars> _stars;
+	Ui::Animations::Simple _selectedAnimation;
+	std::unique_ptr<Overview::Layout::Checkbox> _check;
+	int _resalePrice = 0;
+	GiftButtonMode _mode = GiftButtonMode::Full;
+	GiftSelectionMode _selectionMode = GiftSelectionMode::Border;
+	bool _subscribed : 1 = false;
+	bool _patterned : 1 = false;
+	bool _selected : 1 = false;
+	bool _locked : 1 = false;
+	bool _playerFinished : 1 = false;
+
+	bool _mouseEventsAreListening = false;
+
+	base::Timer _lockedTimer;
+	TimeId _lockedUntilDate = 0;
 
 	QRect _button;
 	QMargins _extend;
 
+	DocumentData *_resolvedDocument = nullptr;
+
 	std::unique_ptr<HistoryView::StickerPlayer> _player;
+	DocumentData *_playerDocument = nullptr;
 	rpl::lifetime _mediaLifetime;
+	rpl::lifetime _documentLifetime;
 
 };
 
 class Delegate final : public GiftButtonDelegate {
 public:
-	explicit Delegate(not_null<Window::SessionController*> window);
+	Delegate(not_null<Main::Session*> session, GiftButtonMode mode);
 	Delegate(Delegate &&other);
 	~Delegate();
 
 	TextWithEntities star() override;
-	std::any textContext() override;
+	TextWithEntities monostar() override;
+	TextWithEntities monoton() override;
+	TextWithEntities ministar() override;
+	Ui::Text::MarkedContext textContext() override;
 	QSize buttonSize() override;
-	QMargins buttonExtend() override;
+	QMargins buttonExtend() const override;
+	auto buttonPatternEmoji(
+		not_null<Data::UniqueGift*> unique,
+		Fn<void()> repaint)
+	-> std::unique_ptr<Ui::Text::CustomEmoji> override;
 	QImage background() override;
-	DocumentData *lookupSticker(const GiftDescriptor &descriptor) override;
+	rpl::producer<not_null<DocumentData*>> sticker(
+		const GiftDescriptor &descriptor) override;
 	not_null<StickerPremiumMark*> hiddenMark() override;
+	QImage cachedBadge(const GiftBadge &badge) override;
+	bool amPremium() override;
+	void invalidateCache() override;
+	QImage &craftUnavailableFrameCache(
+		not_null<GiftButton*> button,
+		TimeId until) override;
 
 private:
-	const not_null<Window::SessionController*> _window;
+	void updateCraftUnavailables();
+
+	const not_null<Main::Session*> _session;
 	std::unique_ptr<StickerPremiumMark> _hiddenMark;
+	base::flat_map<GiftBadge, QImage> _badges;
 	QSize _single;
 	QImage _bg;
+	GiftButtonMode _mode = GiftButtonMode::Full;
+	Ui::Text::CustomEmojiHelper	_emojiHelper;
+	TextWithEntities _ministarEmoji;
+	TextWithEntities _starEmoji;
+
+	QImage _craftUnavailableFrameCache;
+	std::vector<QPointer<QWidget>> _craftUnavailables;
+	std::unique_ptr<base::Timer> _craftUnavailableTimer;
+	TimeId _craftUnavailableUntil = 0;
 
 };
 
@@ -137,4 +327,20 @@ class Delegate final : public GiftButtonDelegate {
 	not_null<Main::Session*> session,
 	const GiftDescriptor &descriptor);
 
+[[nodiscard]] rpl::producer<not_null<DocumentData*>> GiftStickerValue(
+	not_null<Main::Session*> session,
+	const GiftDescriptor &descriptor);
+
+[[nodiscard]] QImage ValidateRotatedBadge(
+	const GiftBadge &badge,
+	QMargins padding,
+	bool left = false);
+
+void SelectGiftToUnpin(
+	std::shared_ptr<ChatHelpers::Show> show,
+	const std::vector<Data::CreditsHistoryEntry> &pinned,
+	Fn<void(Data::SavedStarGiftId)> chosen);
+
+[[nodiscard]] QColor BurnedBadgeBg();
+
 } // namespace Info::PeerGifts
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 46ec0f1d783f5a..a66e3d0c105371 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -7,100 +7,272 @@ For license and copyright information please follow this link:
 */
 #include "info/peer_gifts/info_peer_gifts_widget.h"
 
+#include "api/api_credits.h"
+#include "api/api_hash.h"
+#include "api/api_premium.h"
+#include "apiwrap.h"
+#include "boxes/share_box.h"
+#include "boxes/star_gift_box.h"
+#include "core/ui_integration.h"
+#include "data/components/recent_shared_media_gifts.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_channel.h"
+#include "data/data_credits.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "info/peer_gifts/info_peer_gifts_collections.h"
 #include "info/peer_gifts/info_peer_gifts_common.h"
 #include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/controls/sub_tabs.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/box_content_divider.h"
+#include "ui/widgets/checkbox.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/wrap/slide_wrap.h"
 #include "ui/ui_utility.h"
+#include "ui/effects/animations.h"
 #include "lang/lang_keys.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "mtproto/sender.h"
 #include "window/window_session_controller.h"
 #include "settings/settings_credits_graphics.h"
 #include "styles/style_info.h"
+#include "styles/style_layers.h" // boxRadius
+#include "styles/style_media_player.h" // mediaPlayerMenuCheck
+#include "styles/style_menu_icons.h"
 #include "styles/style_credits.h" // giftBoxPadding
 
+#include <QtWidgets/QApplication>
+
 namespace Info::PeerGifts {
 namespace {
 
 constexpr auto kPreloadPages = 2;
 constexpr auto kPerPage = 50;
+constexpr auto kScrollFactor = 0.05;
 
 [[nodiscard]] GiftDescriptor DescriptorForGift(
-		not_null<UserData*> to,
-		const Api::UserStarGift &gift) {
+		not_null<PeerData*> to,
+		const Data::SavedStarGift &gift) {
 	return GiftTypeStars{
-		.id = gift.gift.id,
-		.stars = gift.gift.stars,
-		.convertStars = gift.gift.convertStars,
-		.document = gift.gift.document,
+		.info = gift.info,
 		.from = ((gift.anonymous || !gift.fromId)
 			? nullptr
 			: to->owner().peer(gift.fromId).get()),
-		.limitedCount = gift.gift.limitedCount,
-		.userpic = true,
+		.date = gift.date,
+		.userpic = !gift.info.unique,
+		.pinned = gift.pinned,
 		.hidden = gift.hidden,
 		.mine = to->isSelf(),
 	};
 }
 
+[[nodiscard]] Data::GiftCollection FromTL(
+		not_null<Main::Session*> session,
+		const MTPStarGiftCollection &collection) {
+	const auto &data = collection.data();
+	return {
+		.id = data.vcollection_id().v,
+		.count = data.vgifts_count().v,
+		.title = qs(data.vtitle()),
+		.icon = (data.vicon()
+			? session->data().processDocument(*data.vicon()).get()
+			: nullptr),
+		.hash = data.vhash().v,
+	};
+}
+
+[[nodiscard]] std::vector<Data::GiftCollection> FromTL(
+		not_null<Main::Session*> session,
+		const MTPDpayments_starGiftCollections &data) {
+	auto result = std::vector<Data::GiftCollection>();
+
+	const auto &list = data.vcollections().v;
+	result.reserve(list.size());
+	for (const auto &collection : list) {
+		result.push_back(FromTL(session, collection));
+	}
+	return result;
+}
+
 } // namespace
 
 class InnerWidget final : public Ui::BoxContentDivider {
 public:
 	InnerWidget(
 		QWidget *parent,
-		not_null<Controller*> controller,
-		not_null<UserData*> user);
+		not_null<Window::SessionController*> window,
+		not_null<PeerData*> peer,
+		rpl::producer<Descriptor> descriptor,
+		Ui::ScrollArea *scroll = nullptr);
+
+	[[nodiscard]] not_null<PeerData*> peer() const {
+		return _peer;
+	}
+	[[nodiscard]] rpl::producer<bool> notifyEnabled() const {
+		return _notifyEnabled.events();
+	}
+	[[nodiscard]] rpl::producer<Descriptor> descriptorChanges() const {
+		return _descriptorChanges.events();
+	}
+	[[nodiscard]] rpl::producer<> scrollToTop() const {
+		return _scrollToTop.events();
+	}
+
+	[[nodiscard]] rpl::producer<Data::GiftsUpdate> changes() const {
+		return _collectionChanges.value();
+	}
 
-	[[nodiscard]] not_null<UserData*> user() const {
-		return _user;
+	[[nodiscard]] rpl::producer<bool> collectionEmptyValue() const {
+		return _collectionEmpty.value();
 	}
 
+	void reloadCollection(int id);
+	void editCollectionGifts(int id);
+	void shareCollectionLink(const QString &username, int id);
+	void editCollectionName(int id);
+	void confirmDeleteCollection(int id);
+	void collectionAdded(MTPStarGiftCollection result);
+	void fillMenu(const Ui::Menu::MenuCallback &addAction);
+	void reorderCollections(const Ui::SubTabs::ReorderUpdate &update);
+	void reorderCollectionsLocally(const Ui::SubTabs::ReorderUpdate &update);
+	void flushCollectionReorder();
+
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
 private:
 	struct Entry {
-		Api::UserStarGift gift;
+		Data::SavedStarGift gift;
 		GiftDescriptor descriptor;
 	};
+	struct Entries {
+		std::vector<Entry> list;
+		std::optional<Filter> filter;
+		int total = 0;
+		bool allLoaded = false;
+	};
 	struct View {
 		std::unique_ptr<GiftButton> button;
-		int entry = 0;
+		Data::SavedStarGiftId manageId;
+		uint64 giftId = 0;
+		int index = 0;
+	};
+	struct DragState {
+		bool enabled = false;
+		int index = -1;
+		int lastSelected = -1;
+		QPoint point;
+		QPoint startPos;
 	};
+	struct ShiftAnimation {
+		Ui::Animations::Simple xAnimation;
+		Ui::Animations::Simple yAnimation;
+		int shift = 0;
+	};
+
+public:
+	InnerWidget(
+		QWidget *parent,
+		not_null<Window::SessionController*> window,
+		not_null<PeerData*> peer,
+		rpl::producer<Descriptor> descriptor,
+		Ui::ScrollArea *scroll,
+		int addingToCollectionId,
+		Entries all);
 
+private:
 	void visibleTopBottomUpdated(
 		int visibleTop,
 		int visibleBottom) override;
 	void paintEvent(QPaintEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
 
 	void subscribeToUpdates();
+	void applyUpdateTo(Entries &entries, const Data::GiftUpdate &update);
+	void switchTo(int collectionId);
+	void loadCollections();
 	void loadMore();
+	void loaded(const MTPpayments_SavedStarGifts &result);
+	void markInCollection(const Data::SavedStarGift &gift);
 	void refreshButtons();
 	void validateButtons();
+	[[nodiscard]] std::unique_ptr<GiftButton> createGiftButton();
 	void showGift(int index);
+	void showMenuFor(not_null<GiftButton*> button, QPoint point);
+	void showMenuForCollection(int id);
+	void refreshAbout();
+	void refreshCollectionsTabs();
+
+	void updateSelected();
+	int giftFromGlobalPos(const QPoint &p) const;
+	[[nodiscard]] QPoint posFromIndex(int index) const;
+	[[nodiscard]] bool isDraggedAnimating() const;
+	void requestReorder(int fromIndex, int toIndex);
+
+	void collectionRenamed(int id, QString name);
+	void collectionRemoved(int id);
+	void removeGiftFromCollection(
+		Data::SavedStarGiftId giftId,
+		int collectionId);
+	void addGiftToCollection(
+		Data::SavedStarGiftId giftId,
+		int collectionId);
+	void fillCollectionsMenu(
+		not_null<Ui::PopupMenu*> menu,
+		const Data::SavedStarGift &gift);
+
+	void markPinned(std::vector<Entry>::iterator i);
+	void markUnpinned(std::vector<Entry>::iterator i);
 
 	int resizeGetHeight(int width) override;
 
+	[[nodiscard]] auto pinnedSavedGifts()
+		-> Fn<std::vector<Data::CreditsHistoryEntry>()>;
+
 	const not_null<Window::SessionController*> _window;
+	const not_null<PeerData*> _peer;
+	Ui::ScrollArea * const _scroll;
+	const int _addingToCollectionId = 0;
+	const GiftButtonMode _mode;
+
+	rpl::variable<Descriptor> _descriptor;
 	Delegate _delegate;
-	not_null<Controller*> _controller;
-	std::unique_ptr<Ui::FlatLabel> _about;
-	const not_null<UserData*> _user;
-	std::vector<Entry> _entries;
-	int _totalCount = 0;
+	std::unique_ptr<Ui::SubTabs> _collectionsTabs;
+	std::unique_ptr<Ui::RpWidget> _about;
+	rpl::event_stream<> _scrollToTop;
+	rpl::variable<bool> _collectionEmpty;
+	bool _pendingCollectionReorder = false;
+
+	std::vector<Data::GiftCollection> _collections;
+
+	Entries _all;
+	std::map<int, Entries> _perCollection;
+	not_null<Entries*> _entries;
+	not_null<std::vector<Entry>*> _list;
+	rpl::variable<Data::GiftsUpdate> _collectionChanges;
+	base::flat_set<Data::SavedStarGiftId> _inCollection;
 
 	MTP::Sender _api;
 	mtpRequestId _loadMoreRequestId = 0;
+	Fn<void()> _collectionsLoadedCallback;
 	QString _offset;
-	bool _allLoaded = false;
+	bool _collectionsLoaded = false;
 
+	rpl::event_stream<Descriptor> _descriptorChanges;
+	rpl::event_stream<bool> _notifyEnabled;
 	std::vector<View> _views;
+	std::unique_ptr<View> _draggedView;
 	int _viewsForWidth = 0;
 	int _viewsFromRow = 0;
 	int _viewsTillRow = 0;
@@ -111,75 +283,314 @@ class InnerWidget final : public Ui::BoxContentDivider {
 	int _visibleFrom = 0;
 	int _visibleTill = 0;
 
+	DragState _dragging;
+	base::flat_map<int, ShiftAnimation> _shiftAnimations;
+	int _selected = -1;
+	int _pressedIndex = -1;
+
+	Ui::Animations::Basic _scrollAnimation;
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
+protected:
+	void focusOutEvent(QFocusEvent *e) override;
+
+private:
+	void cancelDragging();
+	void updateScrollCallback();
+	void checkForScrollAnimation();
+	[[nodiscard]] int deltaFromEdge();
+
 };
 
 InnerWidget::InnerWidget(
 	QWidget *parent,
-	not_null<Controller*> controller,
-	not_null<UserData*> user)
+	not_null<Window::SessionController*> window,
+	not_null<PeerData*> peer,
+	rpl::producer<Descriptor> descriptor,
+	Ui::ScrollArea *scroll)
+: InnerWidget(
+	parent,
+	window,
+	peer,
+	std::move(descriptor),
+	scroll,
+	0,
+	{ .total = peer->peerGiftsCount() }) {
+}
+
+InnerWidget::InnerWidget(
+	QWidget *parent,
+	not_null<Window::SessionController*> window,
+	not_null<PeerData*> peer,
+	rpl::producer<Descriptor> descriptor,
+	Ui::ScrollArea *scroll,
+	int addingToCollectionId,
+	Entries all)
 : BoxContentDivider(parent)
-, _window(controller->parentController())
-, _delegate(_window)
-, _controller(controller)
-, _about(std::make_unique<Ui::FlatLabel>(
-	this,
-	(user->isSelf()
-		? tr::lng_peer_gifts_about_mine(Ui::Text::RichLangValue)
-		: tr::lng_peer_gifts_about(
-			lt_user,
-			rpl::single(Ui::Text::Bold(user->shortName())),
-			Ui::Text::RichLangValue)),
-	st::giftListAbout))
-, _user(user)
-, _totalCount(_user->peerGiftsCount())
-, _api(&_user->session().mtp()) {
+, _window(window)
+, _peer(peer)
+, _scroll(scroll)
+, _addingToCollectionId(addingToCollectionId)
+, _mode(_addingToCollectionId
+	? GiftButtonMode::Selection
+	: GiftButtonMode::Minimal)
+, _descriptor(std::move(descriptor))
+, _delegate(&_window->session(), _mode)
+, _all(std::move(all))
+, _entries(&_all)
+, _list(&_entries->list)
+, _collectionChanges(Data::GiftsUpdate{
+	.peer = _peer,
+	.collectionId = addingToCollectionId,
+})
+, _api(&_peer->session().mtp())
+, _scrollAnimation([=] { updateScrollCallback(); }) {
 	_singleMin = _delegate.buttonSize();
 
-	if (user->isSelf()) {
+	if (peer->canManageGifts()) {
 		subscribeToUpdates();
 	}
-}
 
-void InnerWidget::subscribeToUpdates() {
-	_user->owner().giftUpdates(
-	) | rpl::start_with_next([=](const Data::GiftUpdate &update) {
-		const auto itemId = [](const Entry &entry) {
-			return FullMsgId(entry.gift.fromId, entry.gift.messageId);
-		};
-		const auto i = ranges::find(_entries, update.itemId, itemId);
-		if (i == end(_entries)) {
+	for (const auto &entry : _all.list) {
+		markInCollection(entry.gift);
+	}
+
+	loadCollections();
+
+	_window->session().data().giftsUpdates(
+	) | rpl::on_next([=](const Data::GiftsUpdate &update) {
+		if (update.peer != _peer) {
 			return;
 		}
-		const auto index = int(i - begin(_entries));
+		const auto added = base::flat_set<Data::SavedStarGiftId>{
+			begin(update.added),
+			end(update.added)
+		};
+		const auto removed = base::flat_set<Data::SavedStarGiftId>{
+			begin(update.removed),
+			end(update.removed)
+		};
+		const auto id = update.collectionId;
+		const auto process = [&](Entries &entries) {
+			for (auto &entry : entries.list) {
+				if (added.contains(entry.gift.manageId)) {
+					entry.gift.collectionIds.push_back(id);
+				} else if (removed.contains(entry.gift.manageId)) {
+					entry.gift.collectionIds.erase(
+						ranges::remove(entry.gift.collectionIds, id),
+						end(entry.gift.collectionIds));
+				}
+			}
+		};
+		for (auto &[_, entries] : _perCollection) {
+			process(entries);
+		}
+		process(_all);
+	}, lifetime());
+
+	_descriptor.value(
+	) | rpl::on_next([=](Descriptor now) {
+		switchTo(now.collectionId);
+	}, lifetime());
+}
+
+void InnerWidget::switchTo(int collectionId) {
+	_collectionsLoadedCallback = nullptr;
+	_api.request(base::take(_loadMoreRequestId)).cancel();
+	_entries = collectionId ? &_perCollection[collectionId] : &_all;
+	_list = &_entries->list;
+	refreshButtons();
+	refreshAbout();
+	loadMore();
+}
+
+void InnerWidget::loadCollections() {
+	if (_addingToCollectionId) {
+		return;
+	}
+	_api.request(MTPpayments_GetStarGiftCollections(
+		_peer->input(),
+		MTP_long(Api::CountHash(_collections
+			| ranges::views::transform(&Data::GiftCollection::hash)))
+	)).done([=](const MTPpayments_StarGiftCollections &result) {
+		result.match([&](const MTPDpayments_starGiftCollections &data) {
+			_collections = FromTL(&_window->session(), data);
+
+			refreshCollectionsTabs();
+		}, [&](const MTPDpayments_starGiftCollectionsNotModified &) {
+		});
+		_collectionsLoaded = true;
+		if (const auto onstack = base::take(_collectionsLoadedCallback)) {
+			onstack();
+		}
+	}).fail([=] {
+		_collectionsLoaded = true;
+		if (const auto onstack = base::take(_collectionsLoadedCallback)) {
+			onstack();
+		}
+	}).send();
+}
+
+void InnerWidget::subscribeToUpdates() {
+	_peer->owner().giftUpdates(
+	) | rpl::on_next([=](const Data::GiftUpdate &update) {
+		applyUpdateTo(_all, update);
 		using Action = Data::GiftUpdate::Action;
-		if (update.action == Action::Convert
+		if (update.action == Action::Pin
+			|| update.action == Action::Unpin
 			|| update.action == Action::Delete) {
-			_entries.erase(i);
-			if (_totalCount > 0) {
-				--_totalCount;
+			for (auto &[_, entries] : _perCollection) {
+				applyUpdateTo(entries, update);
 			}
-			for (auto &view : _views) {
-				if (view.entry >= index) {
-					--view.entry;
-				}
+		};
+	}, lifetime());
+}
+
+void InnerWidget::applyUpdateTo(
+		Entries &entries,
+		const Data::GiftUpdate &update) {
+	using Action = Data::GiftUpdate::Action;
+	const auto savedId = [](const Entry &entry) {
+		return entry.gift.manageId;
+	};
+	const auto bySlug = [](const Entry &entry) {
+		return entry.gift.info.unique
+			? entry.gift.info.unique->slug
+			: QString();
+	};
+	const auto i = update.id
+		? ranges::find(*_list, update.id, savedId)
+		: ranges::find(*_list, update.slug, bySlug);
+	if (i == end(*_list)) {
+		return;
+	}
+	const auto index = int(i - begin(*_list));
+	if (update.action == Action::Convert
+		|| update.action == Action::Transfer
+		|| update.action == Action::Delete) {
+		_list->erase(i);
+		if (entries.total > 0) {
+			--entries.total;
+		}
+		for (auto &view : _views) {
+			if (view.index >= index) {
+				--view.index;
 			}
-		} else if (update.action == Action::Save
-			|| update.action == Action::Unsave) {
-			i->gift.hidden = (update.action == Action::Unsave);
-			v::match(i->descriptor, [](GiftTypePremium &) {
-			}, [&](GiftTypeStars &data) {
-				data.hidden = i->gift.hidden;
-			});
-			for (auto &view : _views) {
-				if (view.entry == index) {
-					view.entry = -1;
-				}
+		}
+	} else if (update.action == Action::Save
+		|| update.action == Action::Unsave) {
+		i->gift.hidden = (update.action == Action::Unsave);
+
+		const auto unpin = i->gift.hidden && i->gift.pinned;
+		v::match(i->descriptor, [](GiftTypePremium &) {
+		}, [&](GiftTypeStars &data) {
+			data.hidden = i->gift.hidden;
+		});
+		for (auto &view : _views) {
+			if (view.index == index) {
+				view.index = -1;
+				view.manageId = {};
 			}
+		}
+		if (unpin) {
+			markUnpinned(i);
+		}
+	} else if (update.action == Action::Pin
+		|| update.action == Action::Unpin) {
+		if (update.action == Action::Pin) {
+			markPinned(i);
 		} else {
-			return;
+			markUnpinned(i);
 		}
-		refreshButtons();
-	}, lifetime());
+	} else if (update.action == Action::ResaleChange) {
+		for (auto &view : _views) {
+			if (view.index == index) {
+				view.index = -1;
+				view.manageId = {};
+			}
+		}
+	} else if (update.action == Action::Upgraded) {
+		_scrollToTop.fire({});
+		reloadCollection(_descriptor.current().collectionId);
+	} else {
+		return;
+	}
+	refreshButtons();
+	if (update.action == Action::Pin) {
+		_scrollToTop.fire({});
+	}
+}
+
+void InnerWidget::markPinned(std::vector<Entry>::iterator i) {
+	const auto index = int(i - begin(*_list));
+
+	i->gift.pinned = true;
+	v::match(i->descriptor, [](const GiftTypePremium &) {
+	}, [&](GiftTypeStars &data) {
+		data.pinned = true;
+	});
+
+	auto lastPinnedIndex = 0;
+	for (auto j = begin(*_list); j != end(*_list); ++j) {
+		if (j->gift.pinned) {
+			lastPinnedIndex = int(j - begin(*_list));
+		} else {
+			break;
+		}
+	}
+
+	if (index != lastPinnedIndex) {
+		base::reorder(*_list, index, lastPinnedIndex);
+	}
+	auto unpin = end(*_list);
+	const auto session = &_window->session();
+	const auto limit = session->appConfig().pinnedGiftsLimit();
+	if (limit < _list->size()) {
+		const auto j = begin(*_list) + limit;
+		if (j->gift.pinned) {
+			unpin = j;
+		}
+	}
+	for (auto &view : _views) {
+		if (view.index <= index) {
+			view.index = -1;
+			view.manageId = {};
+		}
+	}
+	if (unpin != end(_entries->list)) {
+		markUnpinned(unpin);
+	}
+}
+
+void InnerWidget::markUnpinned(std::vector<Entry>::iterator i) {
+	const auto index = int(i - begin(*_list));
+
+	i->gift.pinned = false;
+	v::match(i->descriptor, [](const GiftTypePremium &) {
+	}, [&](GiftTypeStars &data) {
+		data.pinned = false;
+	});
+	auto after = index + 1;
+	for (auto j = i + 1; j != end(*_list); ++j) {
+		if (!j->gift.pinned && j->gift.date <= i->gift.date) {
+			break;
+		}
+		++after;
+	}
+	if (after == _list->size() && !_entries->allLoaded) {
+		// We don't know if the correct position is exactly in the end
+		// of the loaded part or later, so we hide it for now, let it
+		// be loaded later while scrolling.
+		_list->erase(i);
+	} else if (after > index + 1) {
+		std::rotate(i, i + 1, begin(*_list) + after);
+	}
+	for (auto &view : _views) {
+		if (view.index >= index) {
+			view.index = -1;
+			view.manageId = {};
+		}
+	}
 }
 
 void InnerWidget::visibleTopBottomUpdated(
@@ -197,51 +608,143 @@ void InnerWidget::visibleTopBottomUpdated(
 void InnerWidget::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
-	const auto aboutSize = _about->size().grownBy(st::giftListAboutMargin);
+	const auto aboutSize = _about
+		? _about->size().grownBy(st::giftListAboutMargin)
+		: QSize();
 	const auto skips = QMargins(0, 0, 0, aboutSize.height());
 	p.fillRect(rect().marginsRemoved(skips), st::boxDividerBg->c);
 	paintTop(p);
-	paintBottom(p, skips.bottom());
+	if (const auto bottom = skips.bottom()) {
+		paintBottom(p, bottom);
+	}
+}
+
+void InnerWidget::collectionAdded(MTPStarGiftCollection result) {
+	_collections.push_back(FromTL(&_window->session(), result));
+	const auto id = _collections.back().id;
+	refreshCollectionsTabs();
+
+	_collectionsTabs->setActiveTab(QString::number(id));
+
+	auto now = _descriptor.current();
+	now.collectionId = id;
+	_descriptorChanges.fire(std::move(now));
 }
 
 void InnerWidget::loadMore() {
-	if (_allLoaded || _loadMoreRequestId) {
+	const auto descriptor = _descriptor.current();
+	const auto filter = descriptor.filter;
+	const auto filterChanged = (_entries->filter != filter);
+	const auto allLoaded = !filterChanged && _entries->allLoaded;
+	if (allLoaded || _loadMoreRequestId) {
 		return;
 	}
-	_loadMoreRequestId = _api.request(MTPpayments_GetUserStarGifts(
-		_user->inputUser,
-		MTP_string(_offset),
+	using Flag = MTPpayments_GetSavedStarGifts::Flag;
+	const auto collectionId = descriptor.collectionId;
+	_loadMoreRequestId = _api.request(MTPpayments_GetSavedStarGifts(
+		MTP_flags((filter.sortByValue ? Flag::f_sort_by_value : Flag())
+			| (filter.skipLimited ? Flag::f_exclude_unupgradable : Flag())
+			| (filter.skipUpgradable ? Flag::f_exclude_upgradable : Flag())
+			| (filter.skipUnlimited ? Flag::f_exclude_unlimited : Flag())
+			| (filter.skipUnique ? Flag::f_exclude_unique : Flag())
+			| (filter.skipSaved ? Flag::f_exclude_saved : Flag())
+			| (filter.skipUnsaved ? Flag::f_exclude_unsaved : Flag())
+			| (collectionId ? Flag::f_collection_id : Flag())),
+		_peer->input(),
+		MTP_int(collectionId),
+		MTP_string(filterChanged ? QString() : _offset),
 		MTP_int(kPerPage)
-	)).done([=](const MTPpayments_UserStarGifts &result) {
-		_loadMoreRequestId = 0;
+	)).done([=](const MTPpayments_SavedStarGifts &result) {
 		const auto &data = result.data();
-		if (const auto next = data.vnext_offset()) {
-			_offset = qs(*next);
-		} else {
-			_allLoaded = true;
-		}
-		_totalCount = data.vcount().v;
 
-		const auto owner = &_user->owner();
+		const auto owner = &_peer->owner();
 		owner->processUsers(data.vusers());
+		owner->processChats(data.vchats());
 
-		_entries.reserve(_entries.size() + data.vgifts().v.size());
-		for (const auto &gift : data.vgifts().v) {
-			if (auto parsed = Api::FromTL(_user, gift)) {
-				auto descriptor = DescriptorForGift(_user, *parsed);
-				_entries.push_back({
-					.gift = std::move(*parsed),
-					.descriptor = std::move(descriptor),
-				});
-			}
+		if (_addingToCollectionId || _collectionsLoaded) {
+			loaded(result);
+		} else {
+			_collectionsLoadedCallback = [=] {
+				loaded(result);
+			};
 		}
-		refreshButtons();
 	}).fail([=] {
 		_loadMoreRequestId = 0;
-		_allLoaded = true;
+		_collectionsLoadedCallback = nullptr;
+		_entries->filter = _descriptor.current().filter;
+		_entries->allLoaded = true;
 	}).send();
 }
 
+void InnerWidget::loaded(const MTPpayments_SavedStarGifts &result) {
+	const auto &data = result.data();
+
+	_loadMoreRequestId = 0;
+	_collectionsLoadedCallback = nullptr;
+	if (const auto enabled = data.vchat_notifications_enabled()) {
+		_notifyEnabled.fire(mtpIsTrue(*enabled));
+	}
+	if (const auto next = data.vnext_offset()) {
+		_offset = qs(*next);
+	} else {
+		_entries->allLoaded = true;
+	}
+	const auto descriptor = _descriptor.current();
+	const auto filter = descriptor.filter;
+	if (!filter.skipsSomething()) {
+		_entries->total = data.vcount().v;
+	}
+	if (_entries->filter != filter) {
+		_entries->filter = filter;
+		_list->clear();
+	}
+	_list->reserve(_list->size() + data.vgifts().v.size());
+
+	const auto i = ranges::find(
+		_collections,
+		descriptor.collectionId,
+		&Data::GiftCollection::id);
+	const auto collection = (i != end(_collections)) ? &*i : nullptr;
+
+	auto hasUnique = false;
+	for (const auto &gift : data.vgifts().v) {
+		if (auto parsed = Api::FromTL(_peer, gift)) {
+			if (collection && !collection->icon) {
+				collection->icon = parsed->info.document;
+				refreshCollectionsTabs();
+			}
+			markInCollection(*parsed);
+			auto descriptor = DescriptorForGift(_peer, *parsed);
+			_list->push_back({
+				.gift = std::move(*parsed),
+				.descriptor = std::move(descriptor),
+			});
+			hasUnique = (parsed->info.unique != nullptr);
+		}
+	}
+	if (_entries->allLoaded) {
+		_entries->total = _entries->list.size();
+	}
+	refreshButtons();
+	refreshAbout();
+
+	if (hasUnique) {
+		Ui::PreloadUniqueGiftResellPrices(&_peer->session());
+	}
+}
+
+void InnerWidget::markInCollection(const Data::SavedStarGift &gift) {
+	if (const auto collectionId = _addingToCollectionId) {
+		const auto id = gift.manageId;
+		if (ranges::contains(gift.collectionIds, collectionId)) {
+			const auto &changes = _collectionChanges.current();
+			if (!ranges::contains(changes.removed, id)) {
+				_inCollection.emplace(id);
+			}
+		}
+	}
+}
+
 void InnerWidget::refreshButtons() {
 	_viewsForWidth = 0;
 	_viewsFromRow = 0;
@@ -250,12 +753,44 @@ void InnerWidget::refreshButtons() {
 	validateButtons();
 }
 
+std::unique_ptr<GiftButton> InnerWidget::createGiftButton() {
+	auto button = std::make_unique<GiftButton>(this, &_delegate);
+	const auto raw = button.get();
+	raw->contextMenuRequests(
+	) | rpl::on_next([=](QPoint point) {
+		showMenuFor(raw, point);
+	}, raw->lifetime());
+
+	raw->mouseEvents(
+	) | rpl::on_next([=](QMouseEvent *e) {
+		switch (e->type()) {
+		case QEvent::MouseButtonPress:
+			raw->raise();
+			mousePressEvent(e);
+			break;
+		case QEvent::MouseMove:
+			mouseMoveEvent(e);
+			break;
+		case QEvent::MouseButtonRelease:
+			mouseReleaseEvent(e);
+			break;
+		default:
+			break;
+		}
+	}, raw->lifetime());
+
+	raw->show();
+	return button;
+}
+
 void InnerWidget::validateButtons() {
 	if (!_perRow) {
 		return;
 	}
 	const auto padding = st::giftBoxPadding;
-	const auto vskip = padding.bottom();
+	const auto vskip = (_collectionsTabs && !_collectionsTabs->isHidden())
+		? (padding.top() + _collectionsTabs->height() + padding.top())
+		: padding.bottom();
 	const auto row = _single.height() + st::giftBoxGiftSkip.y();
 	const auto fromRow = std::max(_visibleFrom - vskip, 0) / row;
 	const auto tillRow = (_visibleTill - vskip + row - 1) / row;
@@ -278,150 +813,1826 @@ void InnerWidget::validateButtons() {
 	auto y = vskip + fromRow * oneh;
 	auto views = std::vector<View>();
 	views.reserve((tillRow - fromRow) * _perRow);
-	const auto add = [&](int index) {
-		const auto already = ranges::find(_views, index, &View::entry);
+	const auto idUsed = [&](uint64 giftId, int column, int row) {
+		for (auto j = row; j != tillRow; ++j) {
+			for (auto i = column; i != _perRow; ++i) {
+				const auto index = j * _perRow + i;
+				if (index >= _list->size()) {
+					return false;
+				} else if ((*_list)[index].gift.info.id == giftId) {
+					return true;
+				}
+			}
+			column = 0;
+		}
+		return false;
+	};
+	const auto add = [&](int column, int row) {
+		const auto index = row * _perRow + column;
+		if (index >= _list->size()) {
+			return false;
+		}
+		const auto &entry = (*_list)[index];
+		const auto &gift = entry.gift;
+		const auto giftId = gift.info.id;
+		const auto manageId = gift.manageId;
+		const auto &descriptor = entry.descriptor;
+		const auto already = ranges::find(_views, giftId, &View::giftId);
 		if (already != end(_views)) {
 			views.push_back(base::take(*already));
-			return;
-		}
-		const auto &descriptor = _entries[index].descriptor;
-		const auto callback = [=] {
-			showGift(index);
-		};
-		const auto unused = ranges::find_if(_views, [&](const View &v) {
-			return v.button
-				&& ((v.entry < fromRow * _perRow)
-					|| (v.entry >= tillRow * _perRow));
-		});
-		if (unused != end(_views)) {
-			views.push_back(base::take(*unused));
-			views.back().entry = index;
 		} else {
-			auto button = std::make_unique<GiftButton>(this, &_delegate);
-			button->show();
-			views.push_back({
-				.button = std::move(button),
-				.entry = index,
+			const auto unused = ranges::find_if(_views, [&](const View &v) {
+				return v.button && !idUsed(v.giftId, column, row);
 			});
+			if (unused != end(_views)) {
+				views.push_back(base::take(*unused));
+			} else {
+				views.push_back({ .button = createGiftButton() });
+			}
 		}
-		views.back().button->setDescriptor(descriptor);
-		views.back().button->setClickedCallback(callback);
- 	};
+		auto &view = views.back();
+		view.index = index;
+		view.manageId = manageId;
+		view.giftId = giftId;
+		if (_addingToCollectionId) {
+			view.button->toggleSelected(
+				_inCollection.contains(manageId),
+				GiftSelectionMode::Check,
+				anim::type::instant);
+		}
+		view.button->setDescriptor(descriptor, _mode);
+		return true;
+	};
 	for (auto j = fromRow; j != tillRow; ++j) {
 		for (auto i = 0; i != _perRow; ++i) {
-			const auto index = j * _perRow + i;
-			if (index >= _entries.size()) {
+			if (!add(i, j)) {
 				break;
 			}
-			add(index);
-			views.back().button->setGeometry(
-				QRect(QPoint(x, y), _single),
+			const auto &view = views.back();
+			const auto viewIndex = view.index;
+			auto pos = QPoint(x, y);
+
+			if (_dragging.enabled && viewIndex >= 0) {
+				if (viewIndex == _dragging.index && !isDraggedAnimating()) {
+					pos = mapFromGlobal(QCursor::pos()) - _dragging.point;
+				} else if (viewIndex == _dragging.index && isDraggedAnimating()) {
+					const auto it = _shiftAnimations.find(viewIndex);
+					if (it != _shiftAnimations.end()) {
+						pos = QPoint(
+							it->second.xAnimation.value(pos.x()),
+							it->second.yAnimation.value(pos.y()));
+					}
+				} else {
+					const auto it = _shiftAnimations.find(viewIndex);
+					if (it != _shiftAnimations.end()) {
+						const auto &entry = it->second;
+						const auto toPos = posFromIndex(viewIndex + entry.shift);
+						pos = QPoint(
+							entry.xAnimation.value(toPos.x()),
+							entry.yAnimation.value(toPos.y()));
+					}
+				}
+			} else if (_dragging.enabled && viewIndex == _dragging.index) {
+				pos = mapFromGlobal(QCursor::pos()) - _dragging.point;
+			}
+
+			view.button->setGeometry(
+				QRect(pos, _single),
 				_delegate.buttonExtend());
 			x += _single.width() + skipw;
 		}
 		x = left;
 		y += oneh;
 	}
+
+	if (_dragging.enabled
+		&& _dragging.index >= 0
+		&& _dragging.index < _list->size()) {
+		const auto alreadyInViews = ranges::find(
+			views,
+			_dragging.index,
+			&View::index);
+		if (alreadyInViews == end(views)) {
+			if (!_draggedView) {
+				const auto &entry = (*_list)[_dragging.index];
+				_draggedView = std::make_unique<View>();
+				_draggedView->button = createGiftButton();
+				_draggedView->index = _dragging.index;
+				_draggedView->manageId = entry.gift.manageId;
+				_draggedView->giftId = entry.gift.info.id;
+				_draggedView->button->setDescriptor(entry.descriptor, _mode);
+				if (_addingToCollectionId) {
+					_draggedView->button->toggleSelected(
+						_inCollection.contains(entry.gift.manageId),
+						GiftSelectionMode::Check,
+						anim::type::instant);
+				}
+				_draggedView->button->show();
+			} else {
+				_draggedView->index = _dragging.index;
+			}
+			auto pos = mapFromGlobal(QCursor::pos()) - _dragging.point;
+			_draggedView->button->setGeometry(
+				QRect(pos, _single),
+				_delegate.buttonExtend());
+			_draggedView->button->raise();
+		}
+	} else if (!_dragging.enabled || _dragging.index < 0) {
+		_draggedView = nullptr;
+	}
+
 	std::swap(_views, views);
 }
 
-void InnerWidget::showGift(int index) {
-	_window->show(Box(
-		::Settings::UserStarGiftBox,
-		_window,
-		_entries[index].gift));
+auto InnerWidget::pinnedSavedGifts()
+-> Fn<std::vector<Data::CreditsHistoryEntry>()> {
+	struct Entry {
+		Data::SavedStarGiftId id;
+		std::shared_ptr<Data::UniqueGift> unique;
+	};
+	auto entries = std::vector<Entry>();
+	for (const auto &entry : *_list) {
+		if (entry.gift.pinned) {
+			Assert(entry.gift.info.unique != nullptr);
+			entries.push_back({
+				entry.gift.manageId,
+				entry.gift.info.unique,
+			});
+		} else {
+			break;
+		}
+	}
+	return [entries] {
+		auto result = std::vector<Data::CreditsHistoryEntry>();
+		result.reserve(entries.size());
+		for (const auto &entry : entries) {
+			const auto &id = entry.id;
+			result.push_back({
+				.bareMsgId = uint64(id.userMessageId().bare),
+				.bareEntryOwnerId = id.chat() ? id.chat()->id.value : 0,
+				.giftChannelSavedId = id.chatSavedId(),
+				.uniqueGift = entry.unique,
+				.stargift = true,
+			});
+		}
+		return result;
+	};
 }
 
-int InnerWidget::resizeGetHeight(int width) {
-	const auto count = int(_entries.size());
-	const auto padding = st::giftBoxPadding;
-	const auto available = width - padding.left() - padding.right();
-	const auto skipw = st::giftBoxGiftSkip.x();
-	_perRow = std::min(
-		(available + skipw) / (_singleMin.width() + skipw),
-		count);
-	if (!_perRow) {
-		return 0;
+void InnerWidget::showMenuForCollection(int id) {
+	if (_menu || _addingToCollectionId) {
+		return;
 	}
-	const auto singlew = std::min(
-		((available + skipw) / _perRow) - skipw,
-		2 * _singleMin.width());
-	Assert(singlew >= _singleMin.width());
-	const auto singleh = _singleMin.height();
+	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
+	const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
 
-	_single = QSize(singlew, singleh);
-	const auto rows = (count + _perRow - 1) / _perRow;
-	const auto skiph = st::giftBoxGiftSkip.y();
-
-	auto result = padding.bottom() * 2 + rows * (singleh + skiph) - skiph;
-
-	const auto margin = st::giftListAboutMargin;
-	_about->resizeToWidth(width - margin.left() - margin.right());
-	_about->moveToLeft(margin.left(), result + margin.top());
-	result += margin.top() + _about->height() + margin.bottom();
+	if (_collectionsTabs && _collectionsTabs->reorderEnabled()) {
+		addAction(
+			tr::lng_gift_collection_reorder_exit(tr::now),
+			[=] {
+				flushCollectionReorder();
+				_collectionsTabs->setReorderEnabled(false);
+			},
+			&st::menuIconReorder);
+		_menu->popup(QCursor::pos());
+		return;
+	}
 
-	return result;
+	addAction(tr::lng_gift_collection_add_button(tr::now), [=] {
+		editCollectionGifts(id);
+	}, &st::menuIconGiftPremium);
+	if (const auto username = _peer->username(); !username.isEmpty()) {
+		addAction(tr::lng_gift_collection_share(tr::now), [=] {
+			shareCollectionLink(username, id);
+		}, &st::menuIconShare);
+	}
+	addAction(tr::lng_gift_collection_edit(tr::now), [=] {
+		editCollectionName(id);
+	}, &st::menuIconEdit);
+	if (_collectionsTabs) {
+		addAction(
+			tr::lng_gift_collection_reorder(tr::now),
+			[=] { _collectionsTabs->setReorderEnabled(true); },
+			&st::menuIconReorder);
+	}
+	addAction({
+		.text = tr::lng_gift_collection_delete(tr::now),
+		.handler = [=] { confirmDeleteCollection(id); },
+		.icon = &st::menuIconDeleteAttention,
+		.isAttention = true,
+	});
+	_menu->popup(QCursor::pos());
 }
 
-void InnerWidget::saveState(not_null<Memento*> memento) {
-	auto state = std::make_unique<ListState>();
-	memento->setListState(std::move(state));
+void InnerWidget::shareCollectionLink(const QString &username, int id) {
+	const auto url = _window->session().createInternalLinkFull(
+		username + u"/c/"_q + QString::number(id));
+	FastShareLink(_window, url);
 }
 
-void InnerWidget::restoreState(not_null<Memento*> memento) {
-	if (const auto state = memento->listState()) {
-
+void InnerWidget::editCollectionName(int id) {
+	const auto done = [=](QString name) {
+		collectionRenamed(id, name);
+	};
+	const auto i = ranges::find(_collections, id, &Data::GiftCollection::id);
+	if (i == end(_collections)) {
+		return;
 	}
+	_window->uiShow()->show(Box(
+		EditCollectionNameBox,
+		_window,
+		peer(),
+		id,
+		i->title,
+		done));
 }
 
-Memento::Memento(not_null<UserData*> user)
-: ContentMemento(user, nullptr, PeerId()) {
+void InnerWidget::confirmDeleteCollection(int id) {
+	const auto done = [=](Fn<void()> close) {
+		_window->session().api().request(
+			MTPpayments_DeleteStarGiftCollection(_peer->input(), MTP_int(id))
+		).send();
+		collectionRemoved(id);
+		close();
+	};
+	_window->uiShow()->show(Ui::MakeConfirmBox({
+		.text = tr::lng_gift_collection_delete_sure(),
+		.confirmed = crl::guard(this, done),
+		.confirmText = tr::lng_gift_collection_delete_button(),
+		.confirmStyle = &st::attentionBoxButton,
+	}));
 }
 
-Section Memento::section() const {
-	return Section(Section::Type::PeerGifts);
-}
+void InnerWidget::fillCollectionsMenu(
+		not_null<Ui::PopupMenu*> menu,
+		const Data::SavedStarGift &gift) {
+	if (!_peer->canManageGifts() || _collections.empty()) {
+		return;
+	}
 
-not_null<UserData*> Memento::user() const {
-	return peer()->asUser();
-}
+	const auto addAction = Ui::Menu::CreateAddActionCallback(menu);
+	for (const auto &collection : _collections) {
+		const auto id = collection.id;
+		const auto contains = ranges::contains(gift.collectionIds, id);
+		const auto title = collection.title;
 
-object_ptr<ContentWidget> Memento::createWidget(
-		QWidget *parent,
-		not_null<Controller*> controller,
-		const QRect &geometry) {
-	auto result = object_ptr<Widget>(parent, controller, user());
-	result->setInternalState(geometry, this);
-	return result;
-}
+		auto callback = [=] {
+			if (contains) {
+				removeGiftFromCollection(gift.manageId, id);
+			} else {
+				addGiftToCollection(gift.manageId, id);
+			}
+		};
 
-void Memento::setListState(std::unique_ptr<ListState> state) {
-	_listState = std::move(state);
+		addAction(
+			title,
+			std::move(callback),
+			contains ? &st::mediaPlayerMenuCheck : nullptr);
+	}
 }
 
-std::unique_ptr<ListState> Memento::listState() {
-	return std::move(_listState);
-}
+void InnerWidget::addGiftToCollection(
+		Data::SavedStarGiftId giftId,
+		int collectionId) {
+	auto changes = Data::GiftsUpdate{
+		.peer = _peer,
+		.collectionId = collectionId,
+		.added = { giftId },
+	};
+	using Flag = MTPpayments_UpdateStarGiftCollection::Flag;
+	_window->session().api().request(
+		MTPpayments_UpdateStarGiftCollection(
+			MTP_flags(Flag::f_add_stargift),
+			_peer->input(),
+			MTP_int(collectionId),
+			MTPstring(),
+			MTPVector<MTPInputSavedStarGift>(),
+			MTP_vector<MTPInputSavedStarGift>({
+				Api::InputSavedStarGiftId(giftId)
+			}),
+			MTPVector<MTPInputSavedStarGift>())
+	).done([=](const MTPStarGiftCollection &result) {
+		_window->session().data().notifyGiftsUpdate(base::duplicate(changes));
 
-Memento::~Memento() = default;
+		const auto i = ranges::find(
+			_collections,
+			collectionId,
+			&Data::GiftCollection::id);
+		if (i != end(_collections)) {
+			const auto updated = FromTL(&_window->session(), result);
+			*i = updated;
 
-Widget::Widget(
-	QWidget *parent,
-	not_null<Controller*> controller,
-	not_null<UserData*> user)
-: ContentWidget(parent, controller) {
-	_inner = setInnerWidget(object_ptr<InnerWidget>(
-		this,
-		controller,
-		user));
-}
+			auto &per = _perCollection[collectionId];
+			per.total = updated.count;
 
-rpl::producer<QString> Widget::title() {
-	return tr::lng_peer_gifts_title();
+			const auto giftIt = ranges::find(
+				_all.list,
+				giftId,
+				[](const Entry &entry) { return entry.gift.manageId; });
+			if (giftIt != end(_all.list)) {
+				per.list.insert(per.list.begin(), *giftIt);
+			}
+
+			if (_addingToCollectionId == collectionId) {
+				auto currentChanges = _collectionChanges.current();
+				currentChanges.added.push_back(giftId);
+				_collectionChanges = std::move(currentChanges);
+			}
+
+			refreshCollectionsTabs();
+		}
+	}).fail([=, show = _window->uiShow()](const MTP::Error &error) {
+		if (!Ui::ShowGiftErrorToast(show, error)) {
+			show->showToast(error.type());
+		}
+	}).send();
+}
+
+void InnerWidget::showMenuFor(not_null<GiftButton*> button, QPoint point) {
+	if (_menu || _addingToCollectionId) {
+		return;
+	}
+	const auto index = [&] {
+		for (const auto &view : _views) {
+			if (view.button.get() == button) {
+				return view.index;
+			}
+		}
+		return -1;
+	}();
+	if (index < 0) {
+		return;
+	}
+
+	auto entry = ::Settings::SavedStarGiftEntry(
+		_peer,
+		(*_list)[index].gift);
+	const auto collectionId = _descriptor.current().collectionId;
+	entry.pinnedSavedGifts = collectionId > 0 ? nullptr : pinnedSavedGifts();
+	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
+	if (_peer->canManageGifts() && !_collections.empty()) {
+		const auto &gift = (*_list)[index].gift;
+		const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
+		addAction(Ui::Menu::MenuCallback::Args{
+			.text = tr::lng_gift_collection_add_to(tr::now),
+			.handler = nullptr,
+			.icon = &st::menuIconAddToFolder,
+			.fillSubmenu = [&](not_null<Ui::PopupMenu*> menu) {
+				fillCollectionsMenu(menu, gift);
+			},
+		});
+	}
+	::Settings::FillSavedStarGiftMenu(
+		_window->uiShow(),
+		_menu.get(),
+		entry,
+		::Settings::SavedStarGiftMenuType::List);
+
+	if (collectionId > 0 && _peer->canManageGifts()) {
+		const auto &gift = (*_list)[index].gift;
+		if (ranges::contains(gift.collectionIds, collectionId)) {
+			const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
+			addAction({
+				.text = tr::lng_gift_collection_remove_from(tr::now),
+				.handler = [=] {
+					removeGiftFromCollection(gift.manageId, collectionId);
+				},
+				.icon = &st::menuIconDeleteAttention,
+				.isAttention = true,
+			});
+		}
+	}
+
+	if (_menu->empty()) {
+		return;
+	}
+	_menu->popup(point);
+}
+
+void InnerWidget::showGift(int index) {
+	Expects(index >= 0 && index < _list->size());
+
+	if (const auto id = _addingToCollectionId) {
+		auto &gift = (*_list)[index].gift;
+		auto changes = _collectionChanges.current();
+		const auto selected = _inCollection.contains(gift.manageId);
+		if (selected) {
+			_inCollection.remove(gift.manageId);
+			if (ranges::contains(gift.collectionIds, id)) {
+				changes.removed.push_back(gift.manageId);
+			} else {
+				changes.added.erase(
+					ranges::remove(changes.added, gift.manageId),
+					end(changes.added));
+			}
+		} else {
+			_inCollection.emplace(gift.manageId);
+			if (ranges::contains(gift.collectionIds, id)) {
+				changes.removed.erase(
+					ranges::remove(changes.removed, gift.manageId),
+					end(changes.removed));
+			} else {
+				changes.added.push_back(gift.manageId);
+			}
+		}
+		_collectionChanges = std::move(changes);
+
+		const auto view = ranges::find(_views, index, &View::index);
+		if (view != end(_views)) {
+			view->button->toggleSelected(
+				!selected,
+				GiftSelectionMode::Check);
+		}
+		return;
+	}
+	::Settings::ShowSavedStarGiftBox(
+		_window,
+		_peer,
+		(*_list)[index].gift,
+		pinnedSavedGifts());
+}
+
+void InnerWidget::refreshAbout() {
+	const auto descriptor = _descriptor.current();
+	const auto filter = descriptor.filter;
+	const auto collectionId = descriptor.collectionId;
+	const auto maybeEmpty = _list->empty();
+	const auto knownEmpty = maybeEmpty
+		&& (_entries->allLoaded || !_entries->total);
+	const auto filteredEmpty = knownEmpty && filter.skipsSomething();
+	const auto collectionCanAdd = knownEmpty
+		&& descriptor.collectionId != 0
+		&& _peer->canManageGifts();
+	_collectionEmpty = !filteredEmpty && collectionCanAdd;
+	if (filteredEmpty) {
+		auto text = tr::lng_peer_gifts_empty_search(
+			tr::now,
+			tr::rich);
+		text.append("\n\n").append(tr::link(
+			tr::lng_peer_gifts_view_all(tr::now)));
+		auto about = std::make_unique<Ui::FlatLabel>(
+			this,
+			rpl::single(text),
+			st::giftListAbout);
+		about->setClickHandlerFilter([=](const auto &...) {
+			auto now = _descriptor.current();
+			now.filter = Filter();
+			_descriptorChanges.fire(std::move(now));
+			return false;
+		});
+		about->show();
+		_about = std::move(about);
+		resizeToWidth(width());
+	} else if (collectionCanAdd) {
+		auto about = std::make_unique<Ui::VerticalLayout>(this);
+		about->add(
+			object_ptr<Ui::FlatLabel>(
+				about.get(),
+				tr::lng_gift_collection_empty_title(),
+				st::collectionEmptyTitle),
+			st::collectionEmptyTitleMargin,
+			style::al_top);
+		about->add(
+			object_ptr<Ui::FlatLabel>(
+				about.get(),
+				tr::lng_gift_collection_empty_text(),
+				st::collectionEmptyText),
+			st::collectionEmptyTextMargin,
+			style::al_top);
+
+		const auto button = about->add(
+			object_ptr<Ui::RoundButton>(
+				about.get(),
+				rpl::single(QString()),
+				st::collectionEmptyButton),
+			st::collectionEmptyAddMargin,
+			style::al_top);
+		button->setText(tr::lng_gift_collection_add_button(
+		) | rpl::map([](const QString &text) {
+			return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
+		}));
+		button->setClickedCallback([=] {
+			editCollectionGifts(collectionId);
+		});
+
+		about->show();
+		_about = std::move(about);
+		resizeToWidth(width());
+	} else if ((!collectionId && _peer->isSelf())
+		|| (!collectionId && !_peer->canManageGifts())
+		|| maybeEmpty) {
+		_about = std::make_unique<Ui::FlatLabel>(
+			this,
+			((maybeEmpty && !knownEmpty)
+				? tr::lng_contacts_loading(tr::marked)
+				: _peer->isSelf()
+				? tr::lng_peer_gifts_about_mine(tr::rich)
+				: tr::lng_peer_gifts_about(
+					lt_user,
+					rpl::single(tr::bold(_peer->shortName())),
+					tr::rich)),
+			st::giftListAbout);
+		_about->show();
+		resizeToWidth(width());
+	} else if (_about) {
+		_about = nullptr;
+		resizeToWidth(width());
+	}
+}
+
+void InnerWidget::reloadCollection(int id) {
+	_perCollection[id].filter = std::optional<Filter>();
+	_perCollection[id].allLoaded = false;
+
+	auto now = _descriptor.current();
+	now.filter = Filter();
+	now.collectionId = id;
+	_descriptorChanges.fire(std::move(now));
+
+	_api.request(base::take(_loadMoreRequestId)).cancel();
+	_collectionsLoadedCallback = nullptr;
+	refreshButtons();
+	refreshAbout();
+	loadMore();
+}
+
+void InnerWidget::editCollectionGifts(int id) {
+	const auto weak = base::make_weak(this);
+	_window->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(tr::lng_gift_collection_add_title());
+		box->setWidth(st::boxWideWidth);
+		box->setStyle(st::collectionEditBox);
+
+		struct State {
+			rpl::variable<Descriptor> descriptor;
+			rpl::variable<Data::GiftsUpdate> changes;
+			base::unique_qptr<Ui::PopupMenu> menu;
+			bool saving = false;
+		};
+		const auto state = box->lifetime().make_state<State>(State{
+			.changes = Data::GiftsUpdate{
+				.peer = _peer,
+				.collectionId = id,
+			},
+		});
+		const auto content = box->addRow(
+			object_ptr<InnerWidget>(
+				box,
+				_window,
+				_peer,
+				state->descriptor.value(),
+				nullptr,
+				id,
+				(_all.filter == Filter()) ? _all : Entries()),
+			style::margins());
+		state->changes = content->changes();
+
+		content->descriptorChanges(
+		) | rpl::on_next([=](Descriptor now) {
+			state->descriptor = now;
+		}, content->lifetime());
+
+		content->scrollToTop() | rpl::on_next([=] {
+			box->scrollToY(0);
+		}, content->lifetime());
+
+		box->addTopButton(st::boxTitleClose, [=] {
+			box->closeBox();
+		});
+		box->addTopButton(st::collectionEditMenuToggle, [=] {
+			state->menu = base::make_unique_q<Ui::PopupMenu>(
+				box,
+				st::popupMenuWithIcons);
+			content->fillMenu(
+				Ui::Menu::CreateAddActionCallback(state->menu));
+			state->menu->popup(QCursor::pos());
+		});
+		const auto weakBox = base::make_weak(box);
+		auto text = state->changes.value(
+		) | rpl::map([=](const Data::GiftsUpdate &update) {
+			return (!update.added.empty() && update.removed.empty())
+				? tr::lng_gift_collection_add_button()
+				: tr::lng_settings_save();
+		}) | rpl::flatten_latest();
+		box->addButton(std::move(text), [=] {
+			if (state->saving) {
+				return;
+			}
+			auto add = QVector<MTPInputSavedStarGift>();
+			auto remove = QVector<MTPInputSavedStarGift>();
+			const auto &changes = state->changes.current();
+			for (const auto &id : changes.added) {
+				add.push_back(Api::InputSavedStarGiftId(id));
+			}
+			for (const auto &id : changes.removed) {
+				remove.push_back(Api::InputSavedStarGiftId(id));
+			}
+			if (add.empty() && remove.empty()) {
+				box->closeBox();
+				return;
+			}
+			state->saving = true;
+			const auto session = &_window->session();
+			using Flag = MTPpayments_UpdateStarGiftCollection::Flag;
+			session->api().request(
+				MTPpayments_UpdateStarGiftCollection(
+					MTP_flags(Flag()
+						| (add.isEmpty() ? Flag() : Flag::f_add_stargift)
+						| (remove.isEmpty()
+							? Flag()
+							: Flag::f_delete_stargift)),
+					_peer->input(),
+					MTP_int(id),
+					MTPstring(),
+					MTP_vector<MTPInputSavedStarGift>(remove),
+					MTP_vector<MTPInputSavedStarGift>(add),
+					MTPVector<MTPInputSavedStarGift>())
+			).done([=] {
+				if (const auto strong = weakBox.get()) {
+					state->saving = false;
+					strong->closeBox();
+				}
+				session->data().notifyGiftsUpdate(base::duplicate(changes));
+				if (const auto strong = weak.get()) {
+					strong->reloadCollection(id);
+				}
+			}).fail([=](const MTP::Error &error) {
+				if (const auto strong = weakBox.get()) {
+					state->saving = false;
+					if (!Ui::ShowGiftErrorToast(strong->uiShow(), error)) {
+						strong->uiShow()->showToast(error.type());
+					}
+				}
+			}).send();
+		});
+	}));
+}
+
+void InnerWidget::refreshCollectionsTabs() {
+	if (_collections.empty() || _addingToCollectionId) {
+		if (base::take(_collectionsTabs)) {
+			resizeToWidth(width());
+		}
+		return;
+	}
+
+	auto tabs = std::vector<Ui::SubTabs::Tab>();
+	tabs.push_back({
+		.id = u"all"_q,
+		.text = tr::lng_gift_collection_all(tr::now, tr::marked),
+	});
+	for (const auto &collection : _collections) {
+		auto &per = _perCollection[collection.id];
+		if (!per.allLoaded) {
+			per.total = collection.count;
+		}
+
+		auto title = TextWithEntities();
+		if (collection.icon) {
+			title.append(
+				Data::SingleCustomEmoji(collection.icon)
+			).append(' ');
+		}
+		title.append(collection.title);
+		tabs.push_back({
+			.id = QString::number(collection.id),
+			.text = std::move(title),
+		});
+	}
+	if (_peer->canManageGifts()) {
+		tabs.push_back({
+			.id = u"add"_q,
+			.text = { '+' + tr::lng_gift_collection_add(tr::now) },
+		});
+	}
+	const auto context = Core::TextContext({
+		.session = &_window->session(),
+	});
+	if (!_collectionsTabs) {
+		const auto selectedId = _descriptor.current().collectionId;
+		const auto selected = (selectedId > 0
+			&& ranges::contains(
+				_collections,
+				selectedId,
+				&Data::GiftCollection::id))
+			? QString::number(selectedId)
+			: u"all"_q;
+		const auto tabsCount = tabs.size();
+		_collectionsTabs = std::make_unique<Ui::SubTabs>(
+			this,
+			st::collectionSubTabs,
+			Ui::SubTabs::Options{ .selected = selected, .centered = true },
+			std::move(tabs),
+			context);
+		_collectionsTabs->setPinnedInterval(0, 1);
+		_collectionsTabs->setPinnedInterval(tabsCount - 1, tabsCount);
+		_collectionsTabs->show();
+
+		_collectionsTabs->activated(
+		) | rpl::on_next([=](const QString &id) {
+			if (id == u"add"_q) {
+				const auto added = [=](MTPStarGiftCollection result) {
+					collectionAdded(result);
+				};
+				_window->uiShow()->show(Box(
+					NewCollectionBox,
+					_window,
+					peer(),
+					Data::SavedStarGiftId(),
+					added));
+			} else {
+				_collectionsTabs->setActiveTab(id);
+
+				auto now = _descriptor.current();
+				now.collectionId = (id == u"all"_q) ? 0 : id.toInt();
+				_descriptorChanges.fire(std::move(now));
+			}
+		}, _collectionsTabs->lifetime());
+
+		_collectionsTabs->contextMenuRequests(
+		) | rpl::on_next([=](const QString &id) {
+			if (id == u"add"_q
+				|| id == u"all"_q
+				|| !_peer->canManageGifts()) {
+				return;
+			}
+			showMenuForCollection(id.toInt());
+		}, _collectionsTabs->lifetime());
+
+		using ReorderUpdate = Ui::SubTabs::ReorderUpdate;
+		_collectionsTabs->reorderUpdates(
+		) | rpl::on_next([=](const ReorderUpdate &update) {
+			if (update.state == ReorderUpdate::State::Applied) {
+				reorderCollectionsLocally(update);
+			}
+		}, _collectionsTabs->lifetime());
+	} else {
+		const auto tabsCount = tabs.size();
+		_collectionsTabs->setTabs(std::move(tabs), context);
+		_collectionsTabs->clearPinnedIntervals();
+		_collectionsTabs->setPinnedInterval(0, 1);
+		if (_peer->canManageGifts()) {
+			_collectionsTabs->setPinnedInterval(tabsCount - 1, tabsCount);
+		}
+	}
+	resizeToWidth(width());
 }
 
-not_null<UserData*> Widget::user() const {
-	return _inner->user();
+void InnerWidget::collectionRenamed(int id, QString name) {
+	const auto i = ranges::find(_collections, id, &Data::GiftCollection::id);
+	if (i != end(_collections)) {
+		i->title = name;
+		refreshCollectionsTabs();
+	}
+}
+
+void InnerWidget::removeGiftFromCollection(
+		Data::SavedStarGiftId giftId,
+		int collectionId) {
+	auto changes = Data::GiftsUpdate{
+		.peer = _peer,
+		.collectionId = collectionId,
+		.removed = { giftId },
+	};
+	using Flag = MTPpayments_UpdateStarGiftCollection::Flag;
+	_window->session().api().request(
+		MTPpayments_UpdateStarGiftCollection(
+			MTP_flags(Flag::f_delete_stargift),
+			_peer->input(),
+			MTP_int(collectionId),
+			MTPstring(),
+			MTP_vector<MTPInputSavedStarGift>({
+				Api::InputSavedStarGiftId(giftId)
+			}),
+			MTPVector<MTPInputSavedStarGift>(),
+			MTPVector<MTPInputSavedStarGift>())
+	).done([=](const MTPStarGiftCollection &result) {
+		_window->session().data().notifyGiftsUpdate(base::duplicate(changes));
+
+		const auto i = ranges::find(
+			_collections,
+			collectionId,
+			&Data::GiftCollection::id);
+		if (i != end(_collections)) {
+			const auto updated = FromTL(&_window->session(), result);
+			*i = updated;
+
+			auto &per = _perCollection[collectionId];
+			per.total = updated.count;
+
+			if (_descriptor.current().collectionId == collectionId) {
+				const auto it = ranges::find(
+					*_list,
+					giftId,
+					[](const Entry &entry) { return entry.gift.manageId; });
+				if (it != end(*_list)) {
+					_list->erase(it);
+					if (_entries->total > 0) {
+						--_entries->total;
+					}
+					refreshButtons();
+				}
+			}
+
+			const auto giftIt = ranges::find(
+				per.list,
+				giftId,
+				[](const Entry &entry) { return entry.gift.manageId; });
+			if (giftIt != end(per.list)) {
+				per.list.erase(giftIt);
+			}
+
+			if (_addingToCollectionId == collectionId) {
+				auto currentChanges = _collectionChanges.current();
+				currentChanges.removed.push_back(giftId);
+				_collectionChanges = std::move(currentChanges);
+			}
+
+			refreshCollectionsTabs();
+		}
+	}).fail([=, show = _window->uiShow()](const MTP::Error &error) {
+		if (!Ui::ShowGiftErrorToast(show, error)) {
+			show->showToast(error.type());
+		}
+	}).send();
+}
+
+void InnerWidget::collectionRemoved(int id) {
+	auto now = _descriptor.current();
+	if (now.collectionId == id) {
+		now.collectionId = 0;
+		_descriptorChanges.fire(std::move(now));
+	}
+	Assert(_entries != &_perCollection[id]);
+	_perCollection.erase(id);
+	const auto removeFrom = [&](Entries &entries) {
+		for (auto &entry : entries.list) {
+			entry.gift.collectionIds.erase(
+				ranges::remove(entry.gift.collectionIds, id),
+				end(entry.gift.collectionIds));
+		}
+	};
+	removeFrom(_all);
+	for (auto &[_, entries] : _perCollection) {
+		removeFrom(entries);
+	}
+
+	const auto i = ranges::find(_collections, id, &Data::GiftCollection::id);
+	if (i != end(_collections)) {
+		_collections.erase(i);
+		refreshCollectionsTabs();
+	}
+}
+
+int InnerWidget::resizeGetHeight(int width) {
+	const auto padding = st::giftBoxPadding;
+	const auto count = int(_list->size());
+	const auto available = width - padding.left() - padding.right();
+	const auto skipw = st::giftBoxGiftSkip.x();
+	_perRow = std::min(
+		(available + skipw) / (_singleMin.width() + skipw),
+		std::max(count, 1));
+	if (!_perRow) {
+		return 0;
+	}
+	auto result = 0;
+	if (_collectionsTabs && !_collectionsTabs->isHidden()) {
+		result += padding.top();
+		_collectionsTabs->resizeToWidth(width);
+		_collectionsTabs->move(0, result);
+		result += _collectionsTabs->height();
+	} else {
+		result += padding.bottom();
+	}
+
+	const auto singlew = std::min(
+		((available + skipw) / _perRow) - skipw,
+		2 * _singleMin.width());
+	Assert(singlew >= _singleMin.width());
+	const auto singleh = _singleMin.height();
+
+	_single = QSize(singlew, singleh);
+	const auto rows = (count + _perRow - 1) / _perRow;
+	const auto rowsPerCount = rows
+		? rows
+		: ((std::min(_entries->total, kPerPage) + _perRow - 1) / _perRow);
+	const auto skiph = st::giftBoxGiftSkip.y();
+
+	const auto resultPerCount = result
+		+ (rowsPerCount
+			? (padding.bottom() + rowsPerCount * (singleh + skiph) - skiph)
+			: 0);
+	result += rows
+		? (padding.bottom() + rows * (singleh + skiph) - skiph)
+		: 0;
+
+	if (const auto about = _about.get()) {
+		const auto margin = st::giftListAboutMargin;
+		about->resizeToWidth(width - margin.left() - margin.right());
+		about->moveToLeft(margin.left(), result + margin.top());
+		result += margin.top() + about->height() + margin.bottom();
+	}
+
+	return std::max(result, resultPerCount);
+}
+
+void InnerWidget::saveState(not_null<Memento*> memento) {
+	auto state = std::make_unique<ListState>();
+	memento->setListState(std::move(state));
+}
+
+void InnerWidget::restoreState(not_null<Memento*> memento) {
+	if (const auto state = memento->listState()) {
+
+	}
+}
+
+void InnerWidget::fillMenu(const Ui::Menu::MenuCallback &addAction) {
+	const auto canManage = _peer->canManageGifts();
+	const auto descriptor = _descriptor.current();
+	const auto filter = descriptor.filter;
+	const auto change = [=](Fn<void(Filter&)> update) {
+		auto now = _descriptor.current();
+		update(now.filter);
+		_descriptorChanges.fire(std::move(now));
+	};
+
+	const auto collectionId = descriptor.collectionId;
+	if (!collectionId) {
+		if (filter.sortByValue) {
+			addAction(tr::lng_peer_gifts_filter_by_date(tr::now), [=] {
+				change([](Filter &filter) { filter.sortByValue = false; });
+			}, &st::menuIconSchedule);
+		} else {
+			addAction(tr::lng_peer_gifts_filter_by_value(tr::now), [=] {
+				change([](Filter &filter) { filter.sortByValue = true; });
+			}, &st::menuIconEarn);
+		}
+		if (canManage && !_addingToCollectionId) {
+			const auto peer = _peer;
+			const auto weak = base::make_weak(_window);
+			addAction(tr::lng_gift_collection_add(tr::now), [=] {
+				if (const auto strong = weak.get()) {
+					const auto added = [=](MTPStarGiftCollection result) {
+						collectionAdded(result);
+					};
+					strong->uiShow()->show(Box(
+						NewCollectionBox,
+						strong,
+						peer,
+						Data::SavedStarGiftId(),
+						crl::guard(this, added)));
+				}
+			}, &st::menuIconAddToFolder);
+		}
+	} else if (canManage) {
+		addAction(tr::lng_gift_collection_add_button(tr::now), [=] {
+			editCollectionGifts(collectionId);
+		}, &st::menuIconGiftPremium);
+
+		addAction({
+			.text = tr::lng_gift_collection_delete(tr::now),
+			.handler = [=] { confirmDeleteCollection(collectionId); },
+			.icon = &st::menuIconDeleteAttention,
+			.isAttention = true,
+		});
+	}
+
+	if (canManage || !collectionId) {
+		addAction({ .isSeparator = true });
+	}
+
+	addAction(tr::lng_peer_gifts_filter_unlimited(tr::now), [=] {
+		change([](Filter &filter) {
+			filter.skipUnlimited = !filter.skipUnlimited;
+			if (filter.skipUnlimited
+				&& filter.skipLimited
+				&& filter.skipUnique) {
+				filter.skipLimited = false;
+			}
+		});
+	}, filter.skipUnlimited ? nullptr : &st::mediaPlayerMenuCheck);
+	addAction(tr::lng_peer_gifts_filter_limited(tr::now), [=] {
+		change([](Filter &filter) {
+			filter.skipLimited = !filter.skipLimited;
+			if (filter.skipUpgradable
+				&& filter.skipUnlimited
+				&& filter.skipLimited
+				&& filter.skipUnique) {
+				filter.skipUnlimited = false;
+			}
+		});
+	}, filter.skipLimited ? nullptr : &st::mediaPlayerMenuCheck);
+	addAction(tr::lng_peer_gifts_filter_upgradable(tr::now), [=] {
+		change([](Filter &filter) {
+			filter.skipUpgradable = !filter.skipUpgradable;
+			if (filter.skipUpgradable
+				&& filter.skipUnlimited
+				&& filter.skipLimited
+				&& filter.skipUnique) {
+				filter.skipUnlimited = false;
+			}
+		});
+	}, filter.skipUpgradable ? nullptr: &st::mediaPlayerMenuCheck);
+	addAction(tr::lng_peer_gifts_filter_unique(tr::now), [=] {
+		change([](Filter &filter) {
+			filter.skipUnique = !filter.skipUnique;
+			if (filter.skipUpgradable
+				&& filter.skipUnlimited
+				&& filter.skipLimited
+				&& filter.skipUnique) {
+				filter.skipUnlimited = false;
+			}
+		});
+	}, filter.skipUnique ? nullptr : &st::mediaPlayerMenuCheck);
+
+	if (canManage) {
+		addAction({ .isSeparator = true });
+
+		addAction(tr::lng_peer_gifts_filter_saved(tr::now), [=] {
+			change([](Filter &filter) {
+				filter.skipSaved = !filter.skipSaved;
+				if (filter.skipSaved && filter.skipUnsaved) {
+					filter.skipUnsaved = false;
+				}
+			});
+		}, filter.skipSaved ? nullptr : &st::mediaPlayerMenuCheck);
+		addAction(tr::lng_peer_gifts_filter_unsaved(tr::now), [=] {
+			change([](Filter &filter) {
+				filter.skipUnsaved = !filter.skipUnsaved;
+				if (filter.skipSaved && filter.skipUnsaved) {
+					filter.skipSaved = false;
+				}
+			});
+		}, filter.skipUnsaved ? nullptr : &st::mediaPlayerMenuCheck);
+	}
+}
+
+void InnerWidget::reorderCollectionsLocally(
+		const Ui::SubTabs::ReorderUpdate &update) {
+	if (!_collectionsTabs || !_peer->canManageGifts()) {
+		return;
+	}
+
+	const auto collectionId = update.id.toInt();
+	if (collectionId <= 0) {
+		return;
+	}
+
+	const auto it = ranges::find(
+		_collections,
+		collectionId,
+		&Data::GiftCollection::id);
+	if (it == _collections.end()) {
+		return;
+	}
+
+	const auto collection = *it;
+	_collections.erase(it);
+
+	const auto newPos = std::max(
+		0,
+		std::min(update.newPosition - 1, int(_collections.size())));
+	_collections.insert(_collections.begin() + newPos, collection);
+
+	_pendingCollectionReorder = true;
+}
+
+void InnerWidget::flushCollectionReorder() {
+	if (!_pendingCollectionReorder || !_peer->canManageGifts()) {
+		return;
+	}
+
+	auto order = QVector<MTPint>();
+	for (const auto &c : _collections) {
+		order.push_back(MTP_int(c.id));
+	}
+
+	_api.request(MTPpayments_ReorderStarGiftCollections(
+		_peer->input(),
+		MTP_vector<MTPint>(order)
+	)).fail([show = _window->uiShow()](const MTP::Error &error) {
+		show->showToast(error.type());
+	}).send();
+
+	_pendingCollectionReorder = false;
+}
+
+void InnerWidget::mousePressEvent(QMouseEvent *e) {
+	if (e->button() != Qt::LeftButton) {
+		return;
+	}
+	const auto index = giftFromGlobalPos(e->globalPos());
+	if (index < 0 || index >= _list->size()) {
+		return;
+	}
+	_pressedIndex = index;
+	const auto collectionId = _descriptor.current().collectionId;
+	const auto canDrag = !_addingToCollectionId
+		&& _peer->canManageGifts()
+		&& _list->size() > 1
+		&& (collectionId
+			|| (!collectionId
+				&& index < _list->size()
+				&& (*_list)[index].gift.pinned));
+	if (canDrag) {
+		if (isDraggedAnimating()) {
+			return;
+		}
+		_dragging.enabled = false;
+		_dragging.index = index;
+		_dragging.point = mapFromGlobal(e->globalPos()) - posFromIndex(index);
+		_dragging.startPos = e->globalPos();
+		grabMouse();
+		e->accept();
+		return;
+	}
+}
+
+void InnerWidget::mouseMoveEvent(QMouseEvent *e) {
+	if (_dragging.index < 0) {
+		updateSelected();
+		return;
+	}
+
+	const auto draggedAnimating = isDraggedAnimating();
+
+	if (!_dragging.enabled) {
+		const auto distance
+			= (e->globalPos() - _dragging.startPos).manhattanLength();
+		if (distance > QApplication::startDragDistance()) {
+			_dragging.enabled = true;
+		}
+	}
+
+	if (!_dragging.enabled) {
+		return;
+	}
+
+	e->accept();
+
+	const auto currentPos = e->globalPos();
+	auto selected = giftFromGlobalPos(currentPos);
+	const auto collectionId = _descriptor.current().collectionId;
+	if (!collectionId && selected >= 0) {
+		auto pinnedCount = 0;
+		for (const auto &entry : *_list) {
+			if (entry.gift.pinned) {
+				++pinnedCount;
+			} else {
+				break;
+			}
+		}
+		if (selected >= pinnedCount) {
+			selected = pinnedCount - 1;
+		}
+	}
+	if (selected >= 0 && !draggedAnimating) {
+		_dragging.lastSelected = selected;
+	}
+
+	if (_dragging.index >= 0
+		&& _dragging.index < _list->size()
+		&& _dragging.lastSelected >= 0
+		&& !draggedAnimating) {
+		for (auto i = 0; i < _list->size(); i++) {
+			if (i == _dragging.index) {
+				continue;
+			}
+			auto &entry = _shiftAnimations[i];
+			const auto wasShift = entry.shift;
+			const auto dragIndex = _dragging.index;
+			const auto targetIndex = _dragging.lastSelected;
+
+			if (dragIndex < targetIndex) {
+				if (i > dragIndex && i <= targetIndex) {
+					entry.shift = -1;
+				} else {
+					entry.shift = 0;
+				}
+			} else if (dragIndex > targetIndex) {
+				if (i >= targetIndex && i < dragIndex) {
+					entry.shift = 1;
+				} else {
+					entry.shift = 0;
+				}
+			} else {
+				entry.shift = 0;
+			}
+			if (wasShift != entry.shift) {
+				const auto fromPoint = posFromIndex(i + wasShift);
+				const auto toPoint = posFromIndex(i + entry.shift);
+				const auto toX = float64(toPoint.x());
+				const auto toY = float64(toPoint.y());
+				const auto ratio = [&] {
+					const auto fromX = entry.xAnimation.value(toX);
+					const auto ratioX = std::min(toX, fromX)
+						/ std::max(toX, fromX);
+					const auto fromY = entry.yAnimation.value(toY);
+					const auto ratioY = std::min(toY, fromY)
+						/ std::max(toY, fromY);
+					return (ratioX == 1.)
+						? ratioY
+						: (ratioY == 1.)
+						? ratioX
+						: std::max(ratioX, ratioY);
+				}();
+				if (!entry.xAnimation.animating()) {
+					entry.xAnimation.stop();
+					entry.xAnimation.start(
+						[this, i](float64 value) {
+							for (auto &view : _views) {
+								if (view.index == i && view.button) {
+									view.button->moveToLeft(
+										value,
+										view.button->y());
+								}
+							}
+						},
+						fromPoint.x(),
+						toX,
+						st::fadeWrapDuration);
+				} else {
+					entry.xAnimation.change(
+						toX,
+						st::fadeWrapDuration * (1. - ratio),
+						anim::linear);
+				}
+				if (!entry.yAnimation.animating()) {
+					entry.yAnimation.stop();
+					entry.yAnimation.start(
+						[this, i](float64 value) {
+							for (auto &view : _views) {
+								if (view.index == i && view.button) {
+									view.button->moveToLeft(
+										view.button->x(),
+										value);
+								}
+							}
+						},
+						fromPoint.y(),
+						toY,
+						st::fadeWrapDuration);
+				} else {
+					entry.yAnimation.change(
+						toY,
+						st::fadeWrapDuration * (1. - ratio),
+						anim::linear);
+				}
+			}
+		}
+
+		for (auto &view : _views) {
+			if (view.index >= 0 && view.button) {
+				auto pos = posFromIndex(view.index);
+
+				if (view.index == _dragging.index) {
+					pos = mapFromGlobal(currentPos) - _dragging.point;
+				} else {
+					const auto it = _shiftAnimations.find(view.index);
+					if (it != _shiftAnimations.end()) {
+						const auto &entry = it->second;
+						const auto toPos = posFromIndex(view.index + entry.shift);
+						pos = QPoint(
+							entry.xAnimation.value(toPos.x()),
+							entry.yAnimation.value(toPos.y()));
+					}
+				}
+				view.button->moveToLeft(pos.x(), pos.y());
+			}
+		}
+
+		if (_draggedView && _draggedView->button) {
+			auto pos = mapFromGlobal(currentPos) - _dragging.point;
+			_draggedView->button->moveToLeft(pos.x(), pos.y());
+			_draggedView->button->raise();
+		}
+
+		update();
+	}
+
+	checkForScrollAnimation();
+}
+
+void InnerWidget::mouseReleaseEvent(QMouseEvent *e) {
+	const auto pressedIndex = base::take(_pressedIndex);
+	if (mouseGrabber() == this) {
+		releaseMouse();
+	}
+
+	if (_dragging.enabled && _dragging.index >= 0 && !isDraggedAnimating()) {
+		const auto fromPos = mapFromGlobal(e->globalPos()) - _dragging.point;
+		const auto toPos = posFromIndex(_dragging.lastSelected);
+		const auto wasPosition = _dragging.index;
+		const auto nowPosition = _dragging.lastSelected;
+		const auto finish = [=, this] {
+			base::reorder(*_list, wasPosition, nowPosition);
+			for (auto &view : _views) {
+				view.index = base::reorder_index(
+					view.index,
+					wasPosition,
+					nowPosition);
+			}
+			if (_draggedView) {
+				_draggedView->index = nowPosition;
+			}
+			requestReorder(wasPosition, nowPosition);
+			_dragging = {};
+			_shiftAnimations.clear();
+			refreshButtons();
+		};
+		auto &entry = _shiftAnimations[_dragging.index];
+		entry.xAnimation.stop();
+		entry.yAnimation.stop();
+		entry.xAnimation.start(
+			[finish, toPos, this](float64 value) {
+				const auto index = _dragging.index;
+				if (std::abs(value - toPos.x()) < 1.0
+					&& index >= 0
+					&& !_shiftAnimations[index].yAnimation.animating()) {
+					finish();
+					return;
+				}
+				for (auto &view : _views) {
+					if (view.index == index && view.button) {
+						view.button->moveToLeft(value, view.button->y());
+					}
+				}
+				if (_draggedView
+					&& _draggedView->index == index
+					&& _draggedView->button) {
+					_draggedView->button->moveToLeft(
+						value,
+						_draggedView->button->y());
+				}
+			},
+			fromPos.x(),
+			toPos.x(),
+			st::fadeWrapDuration);
+		entry.yAnimation.start(
+			[finish, toPos, this](float64 value) {
+				const auto index = _dragging.index;
+				if (std::abs(value - toPos.y()) < 1.0
+					&& index >= 0
+					&& !_shiftAnimations[index].xAnimation.animating()) {
+					finish();
+					return;
+				}
+				for (auto &view : _views) {
+					if (view.index == index && view.button) {
+						view.button->moveToLeft(view.button->x(), value);
+					}
+				}
+				if (_draggedView
+					&& _draggedView->index == index
+					&& _draggedView->button) {
+					_draggedView->button->moveToLeft(
+						_draggedView->button->x(),
+						value);
+				}
+			},
+			fromPos.y(),
+			toPos.y(),
+			st::fadeWrapDuration);
+	} else {
+		const auto index = giftFromGlobalPos(e->globalPos());
+		_dragging = {};
+		_shiftAnimations.clear();
+		_draggedView = nullptr;
+		if (pressedIndex >= 0 && index == pressedIndex) {
+			showGift(index);
+		}
+		refreshButtons();
+	}
+}
+
+void InnerWidget::updateSelected() {
+	if (_dragging.enabled) {
+		return;
+	}
+	const auto selected = giftFromGlobalPos(QCursor::pos());
+	if (_selected != selected) {
+		_selected = selected;
+	}
+}
+
+int InnerWidget::giftFromGlobalPos(const QPoint &p) const {
+	const auto l = mapFromGlobal(p);
+	if (!_perRow) {
+		return -1;
+	}
+	const auto padding = st::giftBoxPadding;
+	const auto vskip = (_collectionsTabs && !_collectionsTabs->isHidden())
+		? (padding.top() + _collectionsTabs->height() + padding.top())
+		: padding.bottom();
+	const auto row = (l.y() >= vskip)
+		? ((l.y() - vskip) / (_single.height() + st::giftBoxGiftSkip.y()))
+		: -1;
+	const auto available = width() - padding.left() - padding.right();
+	const auto skipw = st::giftBoxGiftSkip.x();
+	const auto fullw = _perRow * (_single.width() + skipw) - skipw;
+	const auto left = padding.left() + (available - fullw) / 2;
+	const auto col = (l.x() >= left)
+		? ((l.x() - left) / (_single.width() + skipw))
+		: -1;
+	if (row >= 0 && col >= 0 && col < _perRow) {
+		const auto result = row * _perRow + col;
+		return (result < _list->size()) ? result : -1;
+	}
+	return -1;
+}
+
+QPoint InnerWidget::posFromIndex(int index) const {
+	if (!_perRow) {
+		return {};
+	}
+	const auto padding = st::giftBoxPadding;
+	const auto vskip = (_collectionsTabs && !_collectionsTabs->isHidden())
+		? (padding.top() + _collectionsTabs->height() + padding.top())
+		: padding.bottom();
+	const auto available = width() - padding.left() - padding.right();
+	const auto skipw = st::giftBoxGiftSkip.x();
+	const auto skiph = st::giftBoxGiftSkip.y();
+	const auto fullw = _perRow * (_single.width() + skipw) - skipw;
+	const auto left = padding.left() + (available - fullw) / 2;
+	const auto extend = _delegate.buttonExtend();
+	return {
+		left + (index % _perRow) * (_single.width() + skipw) - extend.left(),
+		vskip + (index / _perRow) * (_single.height() + skiph) - extend.top(),
+	};
+}
+
+bool InnerWidget::isDraggedAnimating() const {
+	if (_dragging.index < 0) {
+		return false;
+	}
+	const auto it = _shiftAnimations.find(_dragging.index);
+	return (it == _shiftAnimations.end())
+		? false
+		: (it->second.xAnimation.animating()
+			|| it->second.yAnimation.animating());
+}
+
+void InnerWidget::requestReorder(int fromIndex, int toIndex) {
+	if (fromIndex == toIndex || !_peer->canManageGifts()) {
+		return;
+	}
+	const auto collectionId = _descriptor.current().collectionId;
+	if (collectionId) {
+		auto order = QVector<MTPInputSavedStarGift>();
+		order.reserve(_list->size());
+		for (const auto &entry : *_list) {
+			order.push_back(Api::InputSavedStarGiftId(entry.gift.manageId));
+		}
+
+		_api.request(
+			MTPpayments_UpdateStarGiftCollection(
+				MTP_flags(MTPpayments_UpdateStarGiftCollection::Flag::f_order),
+				_peer->input(),
+				MTP_int(collectionId),
+				MTPstring(),
+				MTPVector<MTPInputSavedStarGift>(),
+				MTPVector<MTPInputSavedStarGift>(),
+				MTP_vector<MTPInputSavedStarGift>(order))
+		).done([=] {
+			const auto i = ranges::find(
+				_collections,
+				collectionId,
+				&Data::GiftCollection::id);
+			if (i != end(_collections) && !_list->empty()) {
+				i->icon = (*_list)[0].gift.info.document;
+				refreshCollectionsTabs();
+			}
+		}).fail([show = _window->uiShow()](const MTP::Error &error) {
+			if (!Ui::ShowGiftErrorToast(show, error)) {
+				show->showToast(error.type());
+			}
+		}).send();
+	} else {
+		_window->session().recentSharedGifts().reorderPinned(
+			_window->uiShow(),
+			_peer,
+			fromIndex,
+			toIndex);
+	}
+}
+
+void InnerWidget::reorderCollections(
+		const Ui::SubTabs::ReorderUpdate &update) {
+	reorderCollectionsLocally(update);
+	flushCollectionReorder();
+}
+
+void InnerWidget::focusOutEvent(QFocusEvent *e) {
+	if (_dragging.enabled) {
+		cancelDragging();
+	}
+	BoxContentDivider::focusOutEvent(e);
+}
+
+void InnerWidget::cancelDragging() {
+	if (mouseGrabber() == this) {
+		releaseMouse();
+	}
+	_scrollAnimation.stop();
+	_dragging = {};
+	_pressedIndex = -1;
+	_shiftAnimations.clear();
+	if (_draggedView) {
+		_draggedView = nullptr;
+	}
+	refreshButtons();
+}
+
+void InnerWidget::updateScrollCallback() {
+	if (!_scroll) {
+		return;
+	}
+	const auto delta = deltaFromEdge();
+	const auto oldTop = _scroll->scrollTop();
+	_scroll->scrollToY(oldTop + delta);
+	const auto newTop = _scroll->scrollTop();
+
+	if (newTop == 0 || newTop == _scroll->scrollTopMax()) {
+		_scrollAnimation.stop();
+	}
+}
+
+void InnerWidget::checkForScrollAnimation() {
+	const auto delta = deltaFromEdge();
+	if (!_scroll || !delta || _scrollAnimation.animating()) {
+		return;
+	}
+	_scrollAnimation.start();
+}
+
+int InnerWidget::deltaFromEdge() {
+	if (!_dragging.enabled || _dragging.index < 0 || !_scroll) {
+		return 0;
+	}
+
+	const auto mousePos = QCursor::pos();
+	const auto scrollGlobalRect = QRect(
+		_scroll->mapToGlobal(QPoint(0, 0)),
+		_scroll->size());
+
+	const auto scrollTop = scrollGlobalRect.top();
+	const auto scrollBottom = scrollGlobalRect.bottom();
+
+	const auto scrollZone = 50;
+	const auto topDistance = mousePos.y() - scrollTop;
+	const auto bottomDistance = scrollBottom - mousePos.y();
+
+	if (topDistance < scrollZone) {
+		const auto effectiveDistance = std::max(1, scrollZone - topDistance);
+		return -int(effectiveDistance * kScrollFactor);
+	} else if (bottomDistance < scrollZone) {
+		const auto effectiveDistance
+			= std::max(1, scrollZone - bottomDistance);
+		return int(effectiveDistance * kScrollFactor);
+	}
+	return 0;
+}
+
+Memento::Memento(not_null<Controller*> controller)
+: ContentMemento(Tag{
+	controller->giftsPeer(),
+	controller->giftsCollectionId() }) {
+}
+
+Memento::Memento(not_null<PeerData*> peer, int collectionId)
+: ContentMemento(Tag{ peer, collectionId }) {
+}
+
+Section Memento::section() const {
+	return Section(Section::Type::PeerGifts);
+}
+
+object_ptr<ContentWidget> Memento::createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) {
+	auto result = object_ptr<Widget>(parent, controller);
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+void Memento::setListState(std::unique_ptr<ListState> state) {
+	_listState = std::move(state);
+}
+
+std::unique_ptr<ListState> Memento::listState() {
+	return std::move(_listState);
+}
+
+Memento::~Memento() = default;
+
+Widget::Widget(QWidget *parent, not_null<Controller*> controller)
+: ContentWidget(parent, controller)
+, _descriptor(Descriptor{
+	.collectionId = controller->giftsCollectionId(),
+}) {
+	_inner = setInnerWidget(
+		object_ptr<InnerWidget>(
+			this,
+			controller->parentController(),
+			controller->giftsPeer(),
+			_descriptor.value(),
+			scroll()));
+	_emptyCollectionShown = _inner->collectionEmptyValue();
+	_inner->notifyEnabled(
+	) | rpl::take(1) | rpl::on_next([=](bool enabled) {
+		_notifyEnabled = enabled;
+		refreshBottom();
+	}, _inner->lifetime());
+	_inner->descriptorChanges(
+	) | rpl::on_next([=](Descriptor descriptor) {
+		_descriptor = descriptor;
+	}, _inner->lifetime());
+	_inner->scrollToTop() | rpl::on_next([=] {
+		scrollTo({ 0, 0 });
+	}, _inner->lifetime());
+
+	rpl::combine(
+		_descriptor.value(),
+		_emptyCollectionShown.value()
+	) | rpl::on_next([=] {
+		refreshBottom();
+	}, _inner->lifetime());
+}
+
+void Widget::refreshBottom() {
+	const auto notify = _notifyEnabled.has_value();
+	const auto descriptor = _descriptor.current();
+	const auto shownId = descriptor.collectionId;
+	const auto withButton = shownId
+		&& peer()->canManageGifts()
+		&& !_emptyCollectionShown.current();
+	const auto wasBottom = _pinnedToBottom ? _pinnedToBottom->height() : 0;
+	delete _pinnedToBottom.data();
+	if (!notify && !withButton) {
+		setScrollBottomSkip(0);
+		_hasPinnedToBottom = false;
+	} else if (withButton) {
+		setupBottomButton(wasBottom);
+	} else {
+		setupNotifyCheckbox(wasBottom, *_notifyEnabled);
+	}
+}
+
+void Widget::setupBottomButton(int wasBottomHeight) {
+	_pinnedToBottom = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
+		this,
+		object_ptr<Ui::RpWidget>(this));
+	const auto wrap = _pinnedToBottom.data();
+	wrap->toggle(false, anim::type::instant);
+
+	const auto bottom = wrap->entity();
+	bottom->show();
+
+	const auto button = Ui::CreateChild<Ui::RoundButton>(
+		bottom,
+		rpl::single(QString()),
+		st::collectionEditBox.button);
+	button->setText(tr::lng_gift_collection_add_button(
+	) | rpl::map([](const QString &text) {
+		return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
+	}));
+	button->show();
+	_hasPinnedToBottom = true;
+
+	button->setClickedCallback([=] {
+		if (const auto id = _descriptor.current().collectionId) {
+			_inner->editCollectionGifts(id);
+		} else {
+			refreshBottom();
+		}
+	});
+
+	const auto buttonTop = st::boxRadius;
+	bottom->widthValue() | rpl::on_next([=](int width) {
+		const auto normal = width - 2 * buttonTop;
+		button->resizeToWidth(normal);
+		const auto buttonLeft = (width - normal) / 2;
+		button->moveToLeft(buttonLeft, buttonTop);
+	}, button->lifetime());
+
+	button->heightValue() | rpl::on_next([=](int height) {
+		bottom->resize(bottom->width(), st::boxRadius + height);
+	}, button->lifetime());
+
+	const auto processHeight = [=] {
+		setScrollBottomSkip(wrap->height());
+		wrap->moveToLeft(wrap->x(), height() - wrap->height());
+	};
+
+	_inner->sizeValue(
+	) | rpl::on_next([=](const QSize &s) {
+		wrap->resizeToWidth(s.width());
+		crl::on_main(wrap, processHeight);
+	}, wrap->lifetime());
+
+	rpl::combine(
+		wrap->heightValue(),
+		heightValue()
+	) | rpl::on_next(processHeight, wrap->lifetime());
+
+	if (_shown) {
+		wrap->toggle(
+			true,
+			wasBottomHeight ? anim::type::instant : anim::type::normal);
+	}
+}
+
+void Widget::showFinished() {
+	_shown = true;
+	if (const auto bottom = _pinnedToBottom.data()) {
+		bottom->toggle(true, anim::type::normal);
+	}
+}
+
+void Widget::setupNotifyCheckbox(int wasBottomHeight, bool enabled) {
+	_pinnedToBottom = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
+		this,
+		object_ptr<Ui::RpWidget>(this));
+	const auto wrap = _pinnedToBottom.data();
+	wrap->toggle(false, anim::type::instant);
+
+	const auto bottom = wrap->entity();
+	bottom->show();
+
+	const auto notify = Ui::CreateChild<Ui::Checkbox>(
+		bottom,
+		tr::lng_peer_gifts_notify(),
+		enabled);
+	notify->show();
+
+	notify->checkedChanges() | rpl::on_next([=](bool checked) {
+		const auto api = &controller()->session().api();
+		const auto show = controller()->uiShow();
+		using Flag = MTPpayments_ToggleChatStarGiftNotifications::Flag;
+		api->request(MTPpayments_ToggleChatStarGiftNotifications(
+			MTP_flags(checked ? Flag::f_enabled : Flag()),
+			_inner->peer()->input()
+		)).send();
+		if (checked) {
+			show->showToast(tr::lng_peer_gifts_notify_enabled(tr::now));
+		}
+	}, notify->lifetime());
+
+	const auto &checkSt = st::defaultCheckbox;
+	const auto checkTop = st::boxRadius + checkSt.margin.top();
+	bottom->widthValue() | rpl::on_next([=](int width) {
+		const auto normal = notify->naturalWidth()
+			- checkSt.margin.left()
+			- checkSt.margin.right();
+		notify->resizeToWidth(normal);
+		const auto checkLeft = (width - normal) / 2;
+		notify->moveToLeft(checkLeft, checkTop);
+	}, notify->lifetime());
+
+	notify->heightValue() | rpl::on_next([=](int height) {
+		bottom->resize(bottom->width(), st::boxRadius + height);
+	}, notify->lifetime());
+
+	const auto processHeight = [=] {
+		setScrollBottomSkip(wrap->height());
+		wrap->moveToLeft(wrap->x(), height() - wrap->height());
+	};
+
+	_inner->sizeValue(
+	) | rpl::on_next([=](const QSize &s) {
+		wrap->resizeToWidth(s.width());
+		crl::on_main(wrap, processHeight);
+	}, wrap->lifetime());
+
+	rpl::combine(
+		wrap->heightValue(),
+		heightValue()
+	) | rpl::on_next(processHeight, wrap->lifetime());
+
+	if (_shown) {
+		wrap->toggle(
+			true,
+			wasBottomHeight ? anim::type::instant : anim::type::normal);
+	}
+	_hasPinnedToBottom = true;
+}
+
+void Widget::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
+	_inner->fillMenu(addAction);
+}
+
+rpl::producer<QString> Widget::title() {
+	return tr::lng_peer_gifts_title();
+}
+
+rpl::producer<bool> Widget::desiredBottomShadowVisibility() {
+	return _hasPinnedToBottom.value();
+}
+
+not_null<PeerData*> Widget::peer() const {
+	return _inner->peer();
 }
 
 bool Widget::showInternal(not_null<ContentMemento*> memento) {
@@ -429,7 +2640,7 @@ bool Widget::showInternal(not_null<ContentMemento*> memento) {
 		return false;
 	}
 	if (auto similarMemento = dynamic_cast<Memento*>(memento.get())) {
-		if (similarMemento->user() == user()) {
+		if (similarMemento->peer() == peer()) {
 			restoreState(similarMemento);
 			return true;
 		}
@@ -446,7 +2657,7 @@ void Widget::setInternalState(
 }
 
 std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
-	auto result = std::make_shared<Memento>(user());
+	auto result = std::make_shared<Memento>(controller());
 	saveState(result.get());
 	return result;
 }
@@ -461,4 +2672,11 @@ void Widget::restoreState(not_null<Memento*> memento) {
 	scrollTopRestore(memento->scrollTop());
 }
 
+std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer, int albumId) {
+	return std::make_shared<Info::Memento>(
+		std::vector<std::shared_ptr<ContentMemento>>(
+			1,
+			std::make_shared<Memento>(peer, albumId)));
+}
+
 } // namespace Info::PeerGifts
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
index 3882fa5cb65e4c..754069ebb3ab44 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
@@ -7,24 +7,62 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "api/api_premium.h"
+#include "data/data_star_gift.h"
 #include "info/info_content_widget.h"
 
 class UserData;
 struct PeerListState;
 
+namespace Ui {
+class RpWidget;
+template <typename Widget>
+class SlideWrap;
+} // namespace Ui
+
 namespace Info::PeerGifts {
 
 struct ListState {
-	std::vector<Api::UserStarGift> list;
+	std::vector<Data::SavedStarGift> list;
 	QString offset;
 };
 
+struct Filter {
+	bool sortByValue : 1 = false;
+	bool skipUnlimited : 1 = false;
+	bool skipLimited : 1 = false;
+	bool skipUpgradable : 1 = false;
+	bool skipUnique : 1 = false;
+	bool skipSaved : 1 = false;
+	bool skipUnsaved : 1 = false;
+
+	[[nodiscard]] bool skipsSomething() const {
+		return skipLimited
+			|| skipUnlimited
+			|| skipSaved
+			|| skipUnsaved
+			|| skipUpgradable
+			|| skipUnique;
+	}
+
+	friend inline bool operator==(Filter, Filter) = default;
+};
+
+struct Descriptor {
+	Filter filter;
+	int collectionId = 0;
+
+	friend inline bool operator==(
+		const Descriptor &,
+		const Descriptor &) = default;
+};
+
 class InnerWidget;
 
 class Memento final : public ContentMemento {
 public:
-	explicit Memento(not_null<UserData*> user);
+	Memento(not_null<Controller*> controller);
+	Memento(not_null<PeerData*> peer, int collectionId);
+	~Memento();
 
 	object_ptr<ContentWidget> createWidget(
 		QWidget *parent,
@@ -33,13 +71,9 @@ class Memento final : public ContentMemento {
 
 	Section section() const override;
 
-	[[nodiscard]] not_null<UserData*> user() const;
-
 	void setListState(std::unique_ptr<ListState> state);
 	std::unique_ptr<ListState> listState();
 
-	~Memento();
-
 private:
 	std::unique_ptr<ListState> _listState;
 
@@ -47,12 +81,9 @@ class Memento final : public ContentMemento {
 
 class Widget final : public ContentWidget {
 public:
-	Widget(
-		QWidget *parent,
-		not_null<Controller*> controller,
-		not_null<UserData*> user);
+	Widget(QWidget *parent, not_null<Controller*> controller);
 
-	[[nodiscard]] not_null<UserData*> user() const;
+	[[nodiscard]] not_null<PeerData*> peer() const;
 
 	bool showInternal(
 		not_null<ContentMemento*> memento) override;
@@ -61,16 +92,36 @@ class Widget final : public ContentWidget {
 		const QRect &geometry,
 		not_null<Memento*> memento);
 
+	void fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) override;
+
 	rpl::producer<QString> title() override;
 
+	rpl::producer<bool> desiredBottomShadowVisibility() override;
+
+	void showFinished() override;
+
 private:
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
 	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
+	void setupNotifyCheckbox(int wasBottomHeight, bool enabled);
+	void setupBottomButton(int wasBottomHeight);
+	void refreshBottom();
+
 	InnerWidget *_inner = nullptr;
+	QPointer<Ui::SlideWrap<Ui::RpWidget>> _pinnedToBottom;
+	rpl::variable<bool> _hasPinnedToBottom;
+	rpl::variable<bool> _emptyCollectionShown;
+	rpl::variable<Descriptor> _descriptor;
+	std::optional<bool> _notifyEnabled;
+	bool _shown = false;
 
 };
 
+[[nodiscard]] std::shared_ptr<Info::Memento> Make(
+	not_null<PeerData*> peer,
+	int collectionId = 0);
+
 } // namespace Info::PeerGifts
diff --git a/Telegram/SourceFiles/info/polls/info_polls_list_widget.cpp b/Telegram/SourceFiles/info/polls/info_polls_list_widget.cpp
new file mode 100644
index 00000000000000..f5938605f83b3d
--- /dev/null
+++ b/Telegram/SourceFiles/info/polls/info_polls_list_widget.cpp
@@ -0,0 +1,971 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/polls/info_polls_list_widget.h"
+
+#include "data/data_poll_messages.h"
+#include "data/data_shared_media.h"
+#include "data/data_chat_participant_status.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_forum_topic.h"
+#include "data/data_peer_values.h"
+#include "data/data_saved_sublist.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/view/history_view_list_widget.h"
+#include "history/view/history_view_corner_buttons.h"
+#include "history/view/history_view_element.h"
+#include "history/view/history_view_service_message.h"
+#include "history/view/reactions/history_view_reactions_button.h"
+#include "lottie/lottie_icon.h"
+#include "ui/painter.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/chat/chat_style.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/widgets/elastic_scroll.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/ui_utility.h"
+#include "window/section_widget.h"
+#include "window/themes/window_theme.h"
+#include "window/main_window.h"
+#include "window/window_session_controller.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "info/info_wrap_widget.h"
+#include "window/window_peer_menu.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_polls.h"
+#include "styles/style_widgets.h"
+
+namespace Info::Polls {
+
+class ListWidget::Inner final
+	: private HistoryView::ListDelegate
+	, private HistoryView::CornerButtonsDelegate {
+public:
+	Inner(
+		not_null<QWidget*> parent,
+		not_null<Controller*> controller);
+
+	[[nodiscard]] not_null<Ui::ElasticScroll*> scroll() const {
+		return _scroll.get();
+	}
+	[[nodiscard]] HistoryView::ListWidget *list() const {
+		return _list;
+	}
+
+	void updateGeometry(QRect rect);
+
+	[[nodiscard]] int scrollTop() const;
+	void setScrollTop(int top);
+	void setSearchQuery(const QString &query);
+
+	[[nodiscard]] rpl::producer<SelectedItems> selectedItems() const;
+	void selectionAction(SelectionAction action);
+
+	void paintBackground(QPainter &p, QRect clip);
+
+private:
+	[[nodiscard]] SparseIdsMergedSlice::UniversalMsgId computeUniversalId(
+		Data::MessagePosition aroundId) const;
+	[[nodiscard]] Data::MessagesSlice sliceFromSparseIds(
+		SparseIdsMergedSlice &&slice,
+		SparseIdsMergedSlice::UniversalMsgId aroundId) const;
+	void setupHistory();
+	void updateInnerVisibleArea();
+	void updateNewPollButtonPosition();
+	void updateNewPollButtonVisibility();
+
+	HistoryView::Context listContext() override;
+	bool listScrollTo(int top, bool syntetic = true) override;
+	void listCancelRequest() override;
+	void listDeleteRequest() override;
+	void listTryProcessKeyInput(not_null<QKeyEvent*> e) override;
+	rpl::producer<Data::MessagesSlice> listSource(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) override;
+	bool listAllowsMultiSelect() override;
+	bool listIsItemGoodForSelection(
+		not_null<HistoryItem*> item) override;
+	bool listIsLessInOrder(
+		not_null<HistoryItem*> first,
+		not_null<HistoryItem*> second) override;
+	void listSelectionChanged(
+		HistoryView::SelectedItems &&items) override;
+	void listMarkReadTill(not_null<HistoryItem*> item) override;
+	void listMarkContentsRead(
+		const base::flat_set<not_null<HistoryItem*>> &items) override;
+	HistoryView::MessagesBarData listMessagesBar(
+		const std::vector<not_null<HistoryView::Element*>> &elements,
+		bool markLastAsRead) override;
+	void listContentRefreshed() override;
+	void listUpdateDateLink(
+		ClickHandlerPtr &link,
+		not_null<HistoryView::Element*> view) override;
+	bool listElementHideReply(
+		not_null<const HistoryView::Element*> view) override;
+	bool listElementShownUnread(
+		not_null<const HistoryView::Element*> view) override;
+	bool listIsGoodForAroundPosition(
+		not_null<const HistoryView::Element*> view) override;
+	void listSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) override;
+	void listSearch(
+		const QString &query,
+		const FullMsgId &context) override;
+	void listHandleViaClick(not_null<UserData*> bot) override;
+	not_null<Ui::ChatTheme*> listChatTheme() override;
+	HistoryView::CopyRestrictionType listCopyRestrictionType(
+		HistoryItem *item) override;
+	HistoryView::CopyRestrictionType listCopyMediaRestrictionType(
+		not_null<HistoryItem*> item) override;
+	HistoryView::CopyRestrictionType listSelectRestrictionType() override;
+	auto listAllowedReactionsValue()
+		-> rpl::producer<Data::AllowedReactions> override;
+	void listShowPremiumToast(
+		not_null<DocumentData*> document) override;
+	void listOpenPhoto(
+		not_null<PhotoData*> photo,
+		FullMsgId context) override;
+	void listOpenDocument(
+		not_null<DocumentData*> document,
+		FullMsgId context,
+		bool showInMediaView) override;
+	void listPaintEmpty(
+		Painter &p,
+		const Ui::ChatPaintContext &context) override;
+	QString listElementAuthorRank(
+		not_null<const HistoryView::Element*> view) override;
+	bool listElementHideTopicButton(
+		not_null<const HistoryView::Element*> view) override;
+	History *listTranslateHistory() override;
+	void listAddTranslatedItems(
+		not_null<HistoryView::TranslateTracker*> tracker) override;
+	not_null<Window::SessionController*> listWindow() override;
+	not_null<QWidget*> listEmojiInteractionsParent() override;
+	not_null<const Ui::ChatStyle*> listChatStyle() override;
+	rpl::producer<bool> listChatWideValue() override;
+	std::unique_ptr<HistoryView::Reactions::Manager>
+		listMakeReactionsManager(
+			QWidget *wheelEventsTarget,
+			Fn<void(QRect)> update) override;
+	void listVisibleAreaUpdated() override;
+	std::shared_ptr<Ui::Show> listUiShow() override;
+	void listShowPollResults(
+		not_null<PollData*> poll,
+		FullMsgId context) override;
+	void listCancelUploadLayer(not_null<HistoryItem*> item) override;
+	bool listAnimationsPaused() override;
+	auto listSendingAnimation()
+		-> Ui::MessageSendingAnimationController* override;
+	Ui::ChatPaintContext listPreparePaintContext(
+		Ui::ChatPaintContextArgs &&args) override;
+	bool listMarkingContentRead() override;
+	bool listIgnorePaintEvent(QWidget *w, QPaintEvent *e) override;
+	bool listShowReactPremiumError(
+		not_null<HistoryItem*> item,
+		const Data::ReactionId &id) override;
+	base::unique_qptr<Ui::PopupMenu> listFillSenderUserpicMenu(
+		PeerId userpicPeerId) override;
+	void listWindowSetInnerFocus() override;
+	bool listAllowsDragForward() override;
+	void listLaunchDrag(
+		std::unique_ptr<QMimeData> data,
+		Fn<void()> finished) override;
+
+	void cornerButtonsShowAtPosition(
+		Data::MessagePosition position) override;
+	Data::Thread *cornerButtonsThread() override;
+	FullMsgId cornerButtonsCurrentId() override;
+	bool cornerButtonsIgnoreVisibility() override;
+	std::optional<bool> cornerButtonsDownShown() override;
+	bool cornerButtonsUnreadMayBeShown() override;
+	bool cornerButtonsHas(HistoryView::CornerButtonType type) override;
+
+	const not_null<Controller*> _controller;
+	const not_null<Main::Session*> _session;
+	const not_null<History*> _history;
+	const MsgId _topicRootId = 0;
+	const PeerId _monoforumPeerId = 0;
+	const std::shared_ptr<Ui::ChatTheme> _theme;
+	const std::unique_ptr<Ui::ChatStyle> _chatStyle;
+	const std::unique_ptr<Ui::ElasticScroll> _scroll;
+
+	QPointer<HistoryView::ListWidget> _list;
+	std::unique_ptr<HistoryView::CornerButtons> _cornerButtons;
+	bool _viewerRefreshed = false;
+	QString _searchQuery;
+
+	object_ptr<Ui::RoundButton> _newPollButton = { nullptr };
+	Ui::Animations::Simple _newPollButtonAnimation;
+	bool _newPollButtonShown = true;
+
+	std::unique_ptr<Lottie::Icon> _emptyIcon;
+	Ui::Text::String _emptyText;
+	bool _emptyAnimated = false;
+
+	QImage _bg;
+
+	rpl::event_stream<SelectedItems> _selectedItems;
+
+};
+
+ListWidget::Inner::Inner(
+	not_null<QWidget*> parent,
+	not_null<Controller*> controller)
+: _controller(controller)
+, _session(&controller->session())
+, _history(_session->data().history(controller->key().peer()))
+, _topicRootId(controller->topic()
+	? controller->topic()->rootId()
+	: MsgId())
+, _monoforumPeerId(controller->sublist()
+	? controller->sublist()->sublistPeer()->id
+	: PeerId())
+, _theme(Window::Theme::DefaultChatThemeOn(
+	_controller->parentController()->lifetime()))
+, _chatStyle(
+	std::make_unique<Ui::ChatStyle>(_session->colorIndicesValue()))
+, _scroll(std::make_unique<Ui::ElasticScroll>(parent)) {
+	_chatStyle->apply(_theme.get());
+	setupHistory();
+}
+
+void ListWidget::Inner::setupHistory() {
+	_list = _scroll->setOwnedWidget(
+		object_ptr<HistoryView::ListWidget>(
+			_scroll.get(),
+			_session,
+			static_cast<HistoryView::ListDelegate*>(this)));
+	_cornerButtons = std::make_unique<HistoryView::CornerButtons>(
+		_scroll.get(),
+		_chatStyle.get(),
+		static_cast<HistoryView::CornerButtonsDelegate*>(this));
+
+	_scroll->scrolls(
+	) | rpl::on_next([=] {
+		updateInnerVisibleArea();
+	}, _scroll->lifetime());
+	_scroll->setOverscrollBg(QColor(0, 0, 0, 0));
+	using Type = Ui::ElasticScroll::OverscrollType;
+	_scroll->setOverscrollTypes(Type::Real, Type::Real);
+
+	_list->scrollKeyEvents(
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
+		_scroll->keyPressEvent(e);
+	}, _scroll->lifetime());
+
+	const auto topic = _controller->topic();
+	const auto canCreate = topic
+		? Data::CanSend(topic, ChatRestriction::SendPolls)
+		: _history->peer->canCreatePolls();
+	if (!canCreate) {
+		return;
+	}
+	_newPollButton.create(
+		_scroll.get(),
+		tr::lng_polls_create_title(),
+		st::defaultActiveButton);
+	_newPollButton->setFullRadius(true);
+	_newPollButton->setClickedCallback([=] {
+		Window::PeerMenuCreatePoll(
+			_controller->parentController(),
+			_history->peer);
+	});
+	_newPollButton->show();
+}
+
+void ListWidget::Inner::updateNewPollButtonPosition() {
+	if (!_newPollButton) {
+		return;
+	}
+	const auto progress = _newPollButtonAnimation.value(
+		_newPollButtonShown ? 1. : 0.);
+	const auto buttonWidth = _newPollButton->width();
+	const auto buttonHeight = _newPollButton->height();
+	const auto x = (_scroll->width() - buttonWidth) / 2;
+	const auto bottom = st::infoPollsNewButtonBottom;
+	const auto top = anim::interpolate(
+		_scroll->height(),
+		_scroll->height() - buttonHeight - bottom,
+		progress);
+	_newPollButton->moveToLeft(x, top);
+	const auto shouldBeHidden = !_newPollButtonShown
+		&& !_newPollButtonAnimation.animating();
+	if (shouldBeHidden != _newPollButton->isHidden()) {
+		_newPollButton->setVisible(!shouldBeHidden);
+	}
+}
+
+void ListWidget::Inner::updateNewPollButtonVisibility() {
+	const auto scrollTop = _scroll->scrollTop();
+	const auto scrollTopMax = _scroll->scrollTopMax();
+	const auto nearBottom = (scrollTop + st::historyToDownShownAfter / 2)
+		>= scrollTopMax;
+	const auto shown = !nearBottom;
+	if (_newPollButtonShown != shown) {
+		_newPollButtonShown = shown;
+		_newPollButtonAnimation.start(
+			[=] { updateNewPollButtonPosition(); },
+			shown ? 0. : 1.,
+			shown ? 1. : 0.,
+			st::historyToDownDuration);
+	}
+}
+
+void ListWidget::Inner::updateGeometry(QRect rect) {
+	_scroll->setGeometry(rect);
+	_cornerButtons->updatePositions();
+	updateNewPollButtonPosition();
+
+	if (rect.isEmpty()) {
+		return;
+	}
+	_list->resizeToWidth(_scroll->width(), _scroll->height());
+	if (!_viewerRefreshed) {
+		_viewerRefreshed = true;
+		_list->refreshViewer();
+	}
+	const auto ratio = style::DevicePixelRatio();
+	_bg = QImage(
+		rect.size() * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	auto p = QPainter(&_bg);
+	Window::SectionWidget::PaintBackground(
+		p,
+		_theme.get(),
+		QSize(rect.width(), rect.height() * 2),
+		QRect(QPoint(), rect.size()));
+}
+
+void ListWidget::Inner::paintBackground(QPainter &p, QRect clip) {
+	if (!_bg.isNull()) {
+		const auto scrollGeometry = _scroll->geometry();
+		p.drawImage(scrollGeometry.topLeft(), _bg);
+	}
+}
+
+void ListWidget::Inner::updateInnerVisibleArea() {
+	const auto scrollTop = _scroll->scrollTop();
+	_list->setVisibleTopBottom(scrollTop, scrollTop + _scroll->height());
+	_cornerButtons->updateJumpDownVisibility();
+	updateNewPollButtonVisibility();
+}
+
+int ListWidget::Inner::scrollTop() const {
+	return _scroll->scrollTop();
+}
+
+void ListWidget::Inner::setScrollTop(int top) {
+	_scroll->scrollToY(top);
+}
+
+void ListWidget::Inner::setSearchQuery(const QString &query) {
+	if (_searchQuery == query) {
+		return;
+	}
+	_emptyAnimated = false;
+	if (_emptyIcon) {
+		_emptyIcon->jumpTo(0, nullptr);
+	}
+	_searchQuery = query;
+	if (_viewerRefreshed) {
+		_list->refreshViewer();
+	}
+}
+
+rpl::producer<SelectedItems> ListWidget::Inner::selectedItems() const {
+	return _selectedItems.events();
+}
+
+void ListWidget::Inner::selectionAction(SelectionAction action) {
+	switch (action) {
+	case SelectionAction::Clear: _list->cancelSelection(); return;
+	case SelectionAction::Forward:
+		HistoryView::ConfirmForwardSelectedItems(_list);
+		return;
+	case SelectionAction::Delete:
+		HistoryView::ConfirmDeleteSelectedItems(_list);
+		return;
+	default: return;
+	}
+}
+
+SparseIdsMergedSlice::UniversalMsgId
+ListWidget::Inner::computeUniversalId(
+		Data::MessagePosition aroundId) const {
+	const auto peerId = _history->peer->id;
+	return ((aroundId.fullId.msg == ShowAtTheEndMsgId)
+			|| (aroundId == Data::MaxMessagePosition))
+		? (ServerMaxMsgId - 1)
+		: (aroundId.fullId.peer == peerId)
+		? aroundId.fullId.msg
+		: (aroundId.fullId.msg
+			? (aroundId.fullId.msg - ServerMaxMsgId)
+			: (ServerMaxMsgId - 1));
+}
+
+Data::MessagesSlice ListWidget::Inner::sliceFromSparseIds(
+		SparseIdsMergedSlice &&slice,
+		SparseIdsMergedSlice::UniversalMsgId aroundId) const {
+	auto result = Data::MessagesSlice();
+	result.fullCount = slice.fullCount();
+	result.skippedAfter = slice.skippedAfter();
+	result.skippedBefore = slice.skippedBefore();
+	const auto count = slice.size();
+	result.ids.reserve(count);
+	if (const auto msgId = slice.nearest(aroundId)) {
+		result.nearestToAround = *msgId;
+	}
+	for (auto i = 0; i != count; ++i) {
+		result.ids.push_back(slice[i]);
+	}
+	return result;
+}
+
+HistoryView::Context ListWidget::Inner::listContext() {
+	return HistoryView::Context::ChatPreview;
+}
+
+bool ListWidget::Inner::listScrollTo(int top, bool syntetic) {
+	top = std::clamp(top, 0, _scroll->scrollTopMax());
+	if (_scroll->scrollTop() == top) {
+		updateInnerVisibleArea();
+		return false;
+	}
+	_scroll->scrollToY(top);
+	return true;
+}
+
+void ListWidget::Inner::listCancelRequest() {
+	_list->cancelSelection();
+}
+
+void ListWidget::Inner::listDeleteRequest() {
+	HistoryView::ConfirmDeleteSelectedItems(_list);
+}
+
+void ListWidget::Inner::listTryProcessKeyInput(not_null<QKeyEvent*> e) {
+}
+
+rpl::producer<Data::MessagesSlice> ListWidget::Inner::listSource(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) {
+	if (!_searchQuery.isEmpty()) {
+		const auto universalId = computeUniversalId(aroundId);
+		return _controller->mediaSource(
+			universalId,
+			limitBefore,
+			limitAfter
+		) | rpl::map([=](SparseIdsMergedSlice &&slice) {
+			return sliceFromSparseIds(
+				std::move(slice),
+				universalId);
+		});
+	}
+	return Data::PollMessagesViewer(
+		_session,
+		_history,
+		_topicRootId,
+		_monoforumPeerId,
+		aroundId,
+		limitBefore,
+		limitAfter);
+}
+
+bool ListWidget::Inner::listAllowsMultiSelect() {
+	return true;
+}
+
+bool ListWidget::Inner::listIsItemGoodForSelection(
+		not_null<HistoryItem*> item) {
+	return item->isRegular() && !item->isService();
+}
+
+bool ListWidget::Inner::listIsLessInOrder(
+		not_null<HistoryItem*> first,
+		not_null<HistoryItem*> second) {
+	if (first->isRegular() && second->isRegular()) {
+		return first->id < second->id;
+	} else if (first->isRegular()) {
+		return true;
+	} else if (second->isRegular()) {
+		return false;
+	}
+	return first->id < second->id;
+}
+
+void ListWidget::Inner::listSelectionChanged(
+		HistoryView::SelectedItems &&items) {
+	auto result = SelectedItems(Storage::SharedMediaType::Poll);
+	result.list.reserve(items.size());
+	const auto sessionId = _session->uniqueId();
+	for (const auto &item : items) {
+		auto entry = SelectedItem(GlobalMsgId{ item.msgId, sessionId });
+		entry.canDelete = item.canDelete;
+		entry.canForward = item.canForward;
+		result.list.push_back(std::move(entry));
+	}
+	_selectedItems.fire(std::move(result));
+}
+
+void ListWidget::Inner::listMarkReadTill(not_null<HistoryItem*> item) {
+}
+
+void ListWidget::Inner::listMarkContentsRead(
+		const base::flat_set<not_null<HistoryItem*>> &items) {
+}
+
+HistoryView::MessagesBarData ListWidget::Inner::listMessagesBar(
+		const std::vector<not_null<HistoryView::Element*>> &elements,
+		bool markLastAsRead) {
+	return {};
+}
+
+void ListWidget::Inner::listContentRefreshed() {
+}
+
+void ListWidget::Inner::listUpdateDateLink(
+		ClickHandlerPtr &link,
+		not_null<HistoryView::Element*> view) {
+}
+
+bool ListWidget::Inner::listElementHideReply(
+		not_null<const HistoryView::Element*> view) {
+	return false;
+}
+
+bool ListWidget::Inner::listElementShownUnread(
+		not_null<const HistoryView::Element*> view) {
+	return false;
+}
+
+bool ListWidget::Inner::listIsGoodForAroundPosition(
+		not_null<const HistoryView::Element*> view) {
+	return view->data()->isRegular();
+}
+
+void ListWidget::Inner::listSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) {
+}
+
+void ListWidget::Inner::listSearch(
+		const QString &query,
+		const FullMsgId &context) {
+}
+
+void ListWidget::Inner::listHandleViaClick(not_null<UserData*> bot) {
+}
+
+not_null<Ui::ChatTheme*> ListWidget::Inner::listChatTheme() {
+	return _theme.get();
+}
+
+HistoryView::CopyRestrictionType
+ListWidget::Inner::listCopyRestrictionType(HistoryItem *item) {
+	return HistoryView::CopyRestrictionType::None;
+}
+
+HistoryView::CopyRestrictionType
+ListWidget::Inner::listCopyMediaRestrictionType(
+		not_null<HistoryItem*> item) {
+	return HistoryView::CopyRestrictionType::None;
+}
+
+HistoryView::CopyRestrictionType
+ListWidget::Inner::listSelectRestrictionType() {
+	return HistoryView::CopyRestrictionType::None;
+}
+
+auto ListWidget::Inner::listAllowedReactionsValue()
+-> rpl::producer<Data::AllowedReactions> {
+	return Data::PeerAllowedReactionsValue(_history->peer);
+}
+
+void ListWidget::Inner::listShowPremiumToast(
+		not_null<DocumentData*> document) {
+}
+
+void ListWidget::Inner::listOpenPhoto(
+		not_null<PhotoData*> photo,
+		FullMsgId context) {
+}
+
+void ListWidget::Inner::listOpenDocument(
+		not_null<DocumentData*> document,
+		FullMsgId context,
+		bool showInMediaView) {
+}
+
+void ListWidget::Inner::listPaintEmpty(
+		Painter &p,
+		const Ui::ChatPaintContext &context) {
+	if (!_emptyIcon) {
+		const auto size = st::recentPeersEmptySize;
+		_emptyIcon = Lottie::MakeIcon({
+			.name = u"noresults"_q,
+			.sizeOverride = { size, size },
+		});
+		_emptyText.setText(
+			st::serviceTextStyle,
+			tr::lng_polls_search_none(tr::now));
+	}
+	if (!_emptyAnimated) {
+		_emptyAnimated = true;
+		_emptyIcon->animate(
+			[=] { _scroll->update(); },
+			0,
+			_emptyIcon->framesCount() - 1);
+	}
+	const auto iconSize = _emptyIcon->size();
+	const auto width = st::repliesEmptyWidth;
+	const auto padding = st::repliesEmptyPadding;
+	const auto textWidth = width - padding.left() - padding.right();
+	const auto textHeight = _emptyText.countHeight(textWidth);
+	const auto height = padding.top()
+		+ iconSize.height()
+		+ st::repliesEmptySkip
+		+ textHeight
+		+ padding.bottom();
+	const auto r = QRect(
+		(_scroll->width() - width) / 2,
+		(_scroll->height() - height) / 3,
+		width,
+		height);
+	HistoryView::ServiceMessagePainter::PaintBubble(
+		p,
+		context.st,
+		r);
+
+	_emptyIcon->paintInCenter(
+		p,
+		QRect(r.x(), r.y() + padding.top(), r.width(), iconSize.height()),
+		st::msgServiceFg->c);
+	p.setPen(st::msgServiceFg);
+	_emptyText.draw(
+		p,
+		r.x() + (r.width() - textWidth) / 2,
+		r.y() + padding.top() + iconSize.height() + st::repliesEmptySkip,
+		textWidth,
+		style::al_top);
+}
+
+QString ListWidget::Inner::listElementAuthorRank(
+		not_null<const HistoryView::Element*> view) {
+	return {};
+}
+
+bool ListWidget::Inner::listElementHideTopicButton(
+		not_null<const HistoryView::Element*> view) {
+	return true;
+}
+
+History *ListWidget::Inner::listTranslateHistory() {
+	return nullptr;
+}
+
+void ListWidget::Inner::listAddTranslatedItems(
+		not_null<HistoryView::TranslateTracker*> tracker) {
+}
+
+not_null<Window::SessionController*> ListWidget::Inner::listWindow() {
+	return _controller->parentController();
+}
+
+not_null<QWidget*> ListWidget::Inner::listEmojiInteractionsParent() {
+	return _scroll.get();
+}
+
+not_null<const Ui::ChatStyle*> ListWidget::Inner::listChatStyle() {
+	return _chatStyle.get();
+}
+
+rpl::producer<bool> ListWidget::Inner::listChatWideValue() {
+	return rpl::single(false);
+}
+
+std::unique_ptr<HistoryView::Reactions::Manager>
+ListWidget::Inner::listMakeReactionsManager(
+		QWidget *wheelEventsTarget,
+		Fn<void(QRect)> update) {
+	return std::make_unique<HistoryView::Reactions::Manager>(
+		wheelEventsTarget,
+		std::move(update));
+}
+
+void ListWidget::Inner::listVisibleAreaUpdated() {
+}
+
+std::shared_ptr<Ui::Show> ListWidget::Inner::listUiShow() {
+	return _controller->parentController()->uiShow();
+}
+
+void ListWidget::Inner::listShowPollResults(
+		not_null<PollData*> poll,
+		FullMsgId context) {
+	_controller->parentController()->showSection(
+		std::make_shared<Info::Memento>(poll, context));
+}
+
+void ListWidget::Inner::listCancelUploadLayer(
+		not_null<HistoryItem*> item) {
+}
+
+bool ListWidget::Inner::listAnimationsPaused() {
+	return false;
+}
+
+auto ListWidget::Inner::listSendingAnimation()
+-> Ui::MessageSendingAnimationController* {
+	return nullptr;
+}
+
+Ui::ChatPaintContext ListWidget::Inner::listPreparePaintContext(
+		Ui::ChatPaintContextArgs &&args) {
+	const auto visibleAreaTopLocal = _scroll->mapFromGlobal(
+		args.visibleAreaPositionGlobal).y();
+	const auto area = QRect(
+		0,
+		args.visibleAreaTop,
+		args.visibleAreaWidth,
+		args.visibleAreaHeight);
+	const auto viewport = QRect(
+		0,
+		args.visibleAreaTop - visibleAreaTopLocal,
+		args.visibleAreaWidth,
+		_scroll->height());
+	return args.theme->preparePaintContext(
+		_chatStyle.get(),
+		viewport,
+		area,
+		args.clip,
+		false);
+}
+
+bool ListWidget::Inner::listMarkingContentRead() {
+	return false;
+}
+
+bool ListWidget::Inner::listIgnorePaintEvent(QWidget *w, QPaintEvent *e) {
+	return false;
+}
+
+bool ListWidget::Inner::listShowReactPremiumError(
+		not_null<HistoryItem*> item,
+		const Data::ReactionId &id) {
+	return Window::ShowReactPremiumError(
+		_controller->parentController(),
+		item,
+		id);
+}
+
+base::unique_qptr<Ui::PopupMenu>
+ListWidget::Inner::listFillSenderUserpicMenu(PeerId userpicPeerId) {
+	return nullptr;
+}
+
+void ListWidget::Inner::listWindowSetInnerFocus() {
+}
+
+bool ListWidget::Inner::listAllowsDragForward() {
+	return _controller->parentController()->adaptive().isOneColumn();
+}
+
+void ListWidget::Inner::listLaunchDrag(
+		std::unique_ptr<QMimeData> data,
+		Fn<void()> finished) {
+}
+
+void ListWidget::Inner::cornerButtonsShowAtPosition(
+		Data::MessagePosition position) {
+	if (position == Data::UnreadMessagePosition) {
+		position = Data::MaxMessagePosition;
+	}
+	_list->showAtPosition(
+		position,
+		{},
+		_cornerButtons->doneJumpFrom(position.fullId, {}, true));
+}
+
+Data::Thread *ListWidget::Inner::cornerButtonsThread() {
+	return _history;
+}
+
+FullMsgId ListWidget::Inner::cornerButtonsCurrentId() {
+	return {};
+}
+
+bool ListWidget::Inner::cornerButtonsIgnoreVisibility() {
+	return false;
+}
+
+std::optional<bool> ListWidget::Inner::cornerButtonsDownShown() {
+	const auto top = _scroll->scrollTop() + st::historyToDownShownAfter;
+	if (top < _scroll->scrollTopMax()) {
+		return true;
+	} else if (_list->loadedAtBottomKnown()) {
+		return !_list->loadedAtBottom();
+	}
+	return std::nullopt;
+}
+
+bool ListWidget::Inner::cornerButtonsUnreadMayBeShown() {
+	return false;
+}
+
+bool ListWidget::Inner::cornerButtonsHas(
+		HistoryView::CornerButtonType type) {
+	return (type == HistoryView::CornerButtonType::Down)
+		|| (type == HistoryView::CornerButtonType::PollVotes);
+}
+
+// --- ListMemento ---
+
+ListMemento::ListMemento(
+	not_null<PeerData*> peer,
+	PeerId migratedPeerId)
+: ContentMemento(peer, nullptr, nullptr, migratedPeerId) {
+}
+
+ListMemento::ListMemento(not_null<Data::ForumTopic*> topic)
+: ContentMemento(topic->peer(), topic, nullptr, PeerId()) {
+}
+
+ListMemento::ListMemento(not_null<Data::SavedSublist*> sublist)
+: ContentMemento(
+	sublist->owningHistory()->peer,
+	nullptr,
+	sublist,
+	PeerId()) {
+}
+
+Section ListMemento::section() const {
+	return Section(Storage::SharedMediaType::Poll);
+}
+
+object_ptr<ContentWidget> ListMemento::createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) {
+	auto result = object_ptr<ListWidget>(parent, controller);
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+// --- ListWidget ---
+
+ListWidget::ListWidget(
+	QWidget *parent,
+	not_null<Controller*> controller)
+: ContentWidget(parent, controller)
+, _inner(std::make_unique<Inner>(this, controller)) {
+	setInnerWidget(object_ptr<Ui::RpWidget>(this));
+	scroll()->hide();
+
+	scroll()->geometryValue(
+	) | rpl::on_next([=](QRect rect) {
+		_inner->updateGeometry(rect);
+	}, lifetime());
+
+	setupSearch();
+}
+
+ListWidget::~ListWidget() = default;
+
+void ListWidget::fillTopBarMenu(
+		const Ui::Menu::MenuCallback &addAction) {
+}
+
+void ListWidget::setupSearch() {
+	auto search = controller()->searchFieldController();
+	if (!search) {
+		return;
+	}
+	controller()->setSearchEnabledByContent(true);
+
+	controller()->mediaSourceQueryValue(
+	) | rpl::on_next([=](const QString &query) {
+		_inner->setSearchQuery(query);
+	}, lifetime());
+}
+
+rpl::producer<SelectedItems> ListWidget::selectedListValue() const {
+	return _inner->selectedItems();
+}
+
+void ListWidget::selectionAction(SelectionAction action) {
+	_inner->selectionAction(action);
+}
+
+rpl::producer<QString> ListWidget::title() {
+	return tr::lng_media_type_polls();
+}
+
+rpl::producer<int> ListWidget::desiredHeightValue() const {
+	return sizeValue(
+	) | rpl::map([=](QSize) {
+		return maxVisibleHeight();
+	}) | rpl::distinct_until_changed();
+}
+
+bool ListWidget::showInternal(not_null<ContentMemento*> memento) {
+	if (!controller()->validateMementoPeer(memento)) {
+		return false;
+	}
+	if (auto my = dynamic_cast<ListMemento*>(memento.get())) {
+		restoreState(my);
+		return true;
+	}
+	return false;
+}
+
+void ListWidget::setInternalState(
+		const QRect &geometry,
+		not_null<ListMemento*> memento) {
+	setGeometry(geometry);
+	Ui::SendPendingMoveResizeEvents(this);
+	restoreState(memento);
+}
+
+std::shared_ptr<ContentMemento> ListWidget::doCreateMemento() {
+	auto result = std::make_shared<ListMemento>(
+		controller()->key().peer(),
+		controller()->migratedPeerId());
+	saveState(result.get());
+	return result;
+}
+
+void ListWidget::saveState(not_null<ListMemento*> memento) {
+	memento->setScrollTop(_inner->scrollTop());
+}
+
+void ListWidget::restoreState(not_null<ListMemento*> memento) {
+	_inner->setScrollTop(memento->scrollTop());
+}
+
+void ListWidget::resizeEvent(QResizeEvent *e) {
+	ContentWidget::resizeEvent(e);
+	_inner->updateGeometry(scroll()->geometry());
+}
+
+void ListWidget::paintEvent(QPaintEvent *e) {
+	ContentWidget::paintEvent(e);
+	auto p = QPainter(this);
+	_inner->paintBackground(p, e->rect());
+}
+
+} // namespace Info::Polls
diff --git a/Telegram/SourceFiles/info/polls/info_polls_list_widget.h b/Telegram/SourceFiles/info/polls/info_polls_list_widget.h
new file mode 100644
index 00000000000000..945f5add8b5bb8
--- /dev/null
+++ b/Telegram/SourceFiles/info/polls/info_polls_list_widget.h
@@ -0,0 +1,95 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "info/info_content_widget.h"
+#include "storage/storage_shared_media.h"
+
+namespace Ui {
+class ElasticScroll;
+class ChatStyle;
+class ChatTheme;
+} // namespace Ui
+
+namespace HistoryView {
+class ListWidget;
+} // namespace HistoryView
+
+namespace Data {
+class ForumTopic;
+class SavedSublist;
+} // namespace Data
+
+namespace Info::Polls {
+
+class ListMemento final : public ContentMemento {
+public:
+	ListMemento(
+		not_null<PeerData*> peer,
+		PeerId migratedPeerId);
+	ListMemento(not_null<Data::ForumTopic*> topic);
+	ListMemento(not_null<Data::SavedSublist*> sublist);
+
+	object_ptr<ContentWidget> createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) override;
+
+	[[nodiscard]] Section section() const override;
+
+	void setScrollTop(int scrollTop) {
+		_scrollTop = scrollTop;
+	}
+	[[nodiscard]] int scrollTop() const {
+		return _scrollTop;
+	}
+
+private:
+	int _scrollTop = 0;
+
+};
+
+class ListWidget final : public ContentWidget {
+public:
+	ListWidget(
+		QWidget *parent,
+		not_null<Controller*> controller);
+	~ListWidget();
+
+	bool showInternal(
+		not_null<ContentMemento*> memento) override;
+
+	void setInternalState(
+		const QRect &geometry,
+		not_null<ListMemento*> memento);
+
+	void fillTopBarMenu(
+		const Ui::Menu::MenuCallback &addAction) override;
+
+	rpl::producer<QString> title() override;
+	rpl::producer<int> desiredHeightValue() const override;
+
+	rpl::producer<SelectedItems> selectedListValue() const override;
+	void selectionAction(SelectionAction action) override;
+
+private:
+	void setupSearch();
+	void saveState(not_null<ListMemento*> memento);
+	void restoreState(not_null<ListMemento*> memento);
+
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
+
+	void resizeEvent(QResizeEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+
+	class Inner;
+	const std::unique_ptr<Inner> _inner;
+
+};
+
+} // namespace Info::Polls
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
index f54e09ea5d783f..580b190077c856 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "info/polls/info_polls_results_widget.h"
 #include "lang/lang_keys.h"
+#include "core/ui_integration.h"
 #include "data/data_peer.h"
 #include "data/data_poll.h"
 #include "data/data_session.h"
@@ -17,15 +18,19 @@ For license and copyright information please follow this link:
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/text/text_utilities.h"
+#include "ui/vertical_list.h"
+#include "ui/painter.h"
+#include "base/unixtime.h"
 #include "boxes/peer_list_box.h"
 #include "main/main_session.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "styles/style_boxes.h"
 #include "styles/style_layers.h"
 #include "styles/style_info.h"
+#include "styles/style_polls.h"
 
-namespace Info {
-namespace Polls {
+namespace Info::Polls {
 namespace {
 
 constexpr auto kFirstPage = 15;
@@ -87,6 +92,128 @@ std::shared_ptr<Main::SessionShow> ListDelegate::peerListUiShow() {
 	Unexpected("...ListDelegate::peerListUiShow");
 }
 
+class VoterRow final : public PeerListRow {
+public:
+	VoterRow(not_null<PeerData*> peer, TimeId date);
+
+	QSize rightActionSize() const override;
+	QMargins rightActionMargins() const override;
+	bool rightActionDisabled() const override;
+	void rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) override;
+
+private:
+	void computeTexts();
+
+	TimeId _date = 0;
+	QString _timeText;
+	QString _dateText;
+	int _timeWidth = 0;
+	int _dateWidth = 0;
+
+};
+
+VoterRow::VoterRow(not_null<PeerData*> peer, TimeId date)
+: PeerListRow(peer)
+, _date(date) {
+	computeTexts();
+}
+
+void VoterRow::computeTexts() {
+	if (!_date) {
+		return;
+	}
+	const auto parsed = base::unixtime::parse(_date);
+	const auto nowDate = base::unixtime::parse(
+		base::unixtime::now()).date();
+	const auto voteDate = parsed.date();
+	_timeText = QLocale().toString(
+		parsed.time(),
+		QLocale::ShortFormat);
+	_timeWidth = st::pollResultsVoteTimeFont->width(_timeText);
+	if (voteDate == nowDate) {
+		return;
+	} else if (voteDate.addDays(1) == nowDate) {
+		_dateText = tr::lng_polls_vote_yesterday(tr::now);
+	} else {
+		_dateText = langDayOfMonthShort(voteDate);
+	}
+	_dateWidth = st::pollResultsVoteTimeDateFont->width(_dateText);
+}
+
+QSize VoterRow::rightActionSize() const {
+	if (!_date) {
+		return QSize();
+	}
+	const auto &timeFont = st::pollResultsVoteTimeFont;
+	if (_dateText.isEmpty()) {
+		return QSize(_timeWidth, timeFont->height);
+	}
+	const auto &dateFont = st::pollResultsVoteTimeDateFont;
+	return QSize(
+		std::max(_timeWidth, _dateWidth),
+		dateFont->height + st::pollResultsVoteTimeGap + timeFont->height);
+}
+
+QMargins VoterRow::rightActionMargins() const {
+	if (!_date) {
+		return QMargins();
+	}
+	const auto size = rightActionSize();
+	return QMargins(
+		st::pollResultsVoteTimeLeftSkip,
+		(st::infoCommonGroupsListItem.height - size.height()) / 2,
+		st::pollResultsVoteTimeRightSkip,
+		0);
+}
+
+bool VoterRow::rightActionDisabled() const {
+	return true;
+}
+
+void VoterRow::rightActionPaint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) {
+	if (!_date) {
+		return;
+	}
+	const auto &timeFont = st::pollResultsVoteTimeFont;
+	const auto size = rightActionSize();
+	if (_dateText.isEmpty()) {
+		p.setFont(timeFont);
+		p.setPen(st::windowFg);
+		p.drawText(
+			x + size.width() - _timeWidth,
+			y + timeFont->ascent,
+			_timeText);
+	} else {
+		const auto &dateFont = st::pollResultsVoteTimeDateFont;
+		p.setFont(dateFont);
+		p.setPen(st::windowSubTextFg);
+		p.drawText(
+			x + size.width() - _dateWidth,
+			y + dateFont->ascent,
+			_dateText);
+		p.setFont(timeFont);
+		p.setPen(st::windowFg);
+		p.drawText(
+			x + size.width() - _timeWidth,
+			y + dateFont->height
+				+ st::pollResultsVoteTimeGap
+				+ timeFont->ascent,
+			_timeText);
+	}
+}
+
 } // namespace
 
 class ListController final : public PeerListController {
@@ -126,12 +253,15 @@ class ListController final : public PeerListController {
 		QString loadForOffset;
 		int leftToLoad = 0;
 		int fullCount = 0;
-		std::vector<not_null<PeerData*>> preloaded;
+		std::vector<std::pair<not_null<PeerData*>, TimeId>> preloaded;
 		bool wasLoading = false;
+		base::flat_map<PeerId, TimeId> dates;
 	};
 
-	bool appendRow(not_null<PeerData*> peer);
-	std::unique_ptr<PeerListRow> createRow(not_null<PeerData*> peer) const;
+	bool appendRow(not_null<PeerData*> peer, TimeId date);
+	std::unique_ptr<PeerListRow> createRow(
+		not_null<PeerData*> peer,
+		TimeId date) const;
 	void addPreloaded();
 	bool addPreloadedPage();
 	void preloadedAdded();
@@ -146,7 +276,8 @@ class ListController final : public PeerListController {
 	QString _offset;
 	mtpRequestId _loadRequestId = 0;
 	QString _loadForOffset;
-	std::vector<not_null<PeerData*>> _preloaded;
+	std::vector<std::pair<not_null<PeerData*>, TimeId>> _preloaded;
+	base::flat_map<PeerId, TimeId> _dates;
 	rpl::variable<int> _count = 0;
 	rpl::variable<int> _fullCount;
 	rpl::variable<int> _leftToLoad;
@@ -199,7 +330,7 @@ void ListController::loadMoreRows() {
 	const auto limit = _offset.isEmpty() ? kFirstPage : kPerPage;
 	_loadRequestId = _api.request(MTPmessages_GetPollVotes(
 		MTP_flags(flags),
-		item->history()->peer->input,
+		item->history()->peer->input(),
 		MTP_int(item->id),
 		MTP_bytes(_option),
 		MTP_string(_offset),
@@ -215,12 +346,14 @@ void ListController::loadMoreRows() {
 			for (const auto &vote : data.vvotes().v) {
 				vote.match([&](const auto &data) {
 					const auto peer = owner.peer(peerFromMTP(data.vpeer()));
+					const auto date = data.vdate().v;
 					if (peer->isMinimalLoaded()) {
+						_dates[peer->id] = date;
 						if (add) {
-							appendRow(peer);
+							appendRow(peer, date);
 							--add;
 						} else {
-							_preloaded.push_back(peer);
+							_preloaded.emplace_back(peer, date);
 						}
 					}
 				});
@@ -261,7 +394,10 @@ void ListController::collapse() {
 	_preloaded.reserve(_preloaded.size() + remove);
 	for (auto i = 0; i != remove; ++i) {
 		const auto row = delegate()->peerListRowAt(count - i - 1);
-		_preloaded.push_back(row->peer());
+		const auto peerId = row->peer()->id;
+		const auto it = _dates.find(peerId);
+		const auto date = (it != end(_dates)) ? it->second : TimeId(0);
+		_preloaded.emplace_back(row->peer(), date);
 		delegate()->peerListRemoveRow(row);
 	}
 	ranges::actions::reverse(_preloaded);
@@ -273,8 +409,8 @@ void ListController::collapse() {
 }
 
 void ListController::addPreloaded() {
-	for (const auto peer : base::take(_preloaded)) {
-		appendRow(peer);
+	for (const auto &[peer, date] : base::take(_preloaded)) {
+		appendRow(peer, date);
 	}
 	preloadedAdded();
 }
@@ -286,7 +422,7 @@ bool ListController::addPreloadedPage() {
 	const auto from = begin(_preloaded);
 	const auto till = from + kPerPage;
 	for (auto i = from; i != till; ++i) {
-		appendRow(*i);
+		appendRow(i->first, i->second);
 	}
 	_preloaded.erase(from, till);
 	preloadedAdded();
@@ -338,6 +474,7 @@ auto ListController::saveState() const -> std::unique_ptr<PeerListState> {
 	my->preloaded = _preloaded;
 	my->wasLoading = (_loadRequestId != 0);
 	my->loadForOffset = _loadForOffset;
+	my->dates = _dates;
 	result->controllerState = std::move(my);
 
 	return result;
@@ -358,6 +495,7 @@ void ListController::restoreState(std::unique_ptr<PeerListState> state) {
 		_count = int(state->list.size());
 		_fullCount = my->fullCount;
 		_leftToLoad = my->leftToLoad;
+		_dates = std::move(my->dates);
 		if (my->wasLoading) {
 			loadMoreRows();
 		}
@@ -367,24 +505,27 @@ void ListController::restoreState(std::unique_ptr<PeerListState> state) {
 
 std::unique_ptr<PeerListRow> ListController::createRestoredRow(
 		not_null<PeerData*> peer) {
-	return createRow(peer);
+	const auto it = _dates.find(peer->id);
+	const auto date = (it != end(_dates)) ? it->second : TimeId(0);
+	return createRow(peer, date);
 }
 
 void ListController::rowClicked(not_null<PeerListRow*> row) {
 	_showPeerInfoRequests.fire(row->peer());
 }
 
-bool ListController::appendRow(not_null<PeerData*> peer) {
+bool ListController::appendRow(not_null<PeerData*> peer, TimeId date) {
 	if (delegate()->peerListFindRow(peer->id.value)) {
 		return false;
 	}
-	delegate()->peerListAppendRow(createRow(peer));
+	delegate()->peerListAppendRow(createRow(peer, date));
 	return true;
 }
 
 std::unique_ptr<PeerListRow> ListController::createRow(
-		not_null<PeerData*> peer) const {
-	auto row = std::make_unique<PeerListRow>(peer);
+		not_null<PeerData*> peer,
+		TimeId date) const {
+	auto row = std::make_unique<VoterRow>(peer, date);
 	row->setCustomStatus(QString());
 	return row;
 }
@@ -448,7 +589,7 @@ ListController *CreateAnswerRows(
 		st::infoCommonGroupsList));
 
 	controller->count(
-	) | rpl::filter(_1 > 0) | rpl::start_with_next([=] {
+	) | rpl::filter(_1 > 0) | rpl::on_next([=] {
 		delete placeholder;
 	}, placeholder->lifetime());
 
@@ -461,7 +602,9 @@ ListController *CreateAnswerRows(
 					.append(QString::fromUtf8(" \xe2\x80\x94 "))
 					.append(QString::number(percent))
 					.append('%')),
-			st::boxDividerLabel),
+			st::boxDividerLabel,
+			st::defaultPopupMenu,
+			Core::TextContext({ .session = session })),
 		style::margins(
 			st::pollResultsHeaderPadding.left(),
 			st::pollResultsHeaderPadding.top(),
@@ -485,7 +628,7 @@ ListController *CreateAnswerRows(
 	rpl::combine(
 		controller->fullCount(),
 		controller->count()
-	) | rpl::start_with_next([=](int fullCount, int count) {
+	) | rpl::on_next([=](int fullCount, int count) {
 		const auto many = (fullCount > kFirstPage)
 			&& (count > kFirstPage - kLeavePreloaded);
 		collapse->setVisible(many);
@@ -493,7 +636,7 @@ ListController *CreateAnswerRows(
 	}, collapse->lifetime());
 
 	headerWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		header->resizeToWidth(width);
 		votes->moveToRight(
 			st::pollResultsHeaderPadding.right(),
@@ -506,7 +649,7 @@ ListController *CreateAnswerRows(
 	}, header->lifetime());
 
 	header->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		headerWrap->resize(headerWrap->width(), height);
 	}, header->lifetime());
 
@@ -521,13 +664,13 @@ ListController *CreateAnswerRows(
 				tr::lng_polls_show_more(
 					lt_count_decimal,
 					controller->loadMoreCount() | rpl::map(_1 + 0.),
-					Ui::Text::Upper),
+					tr::upper),
 				st::pollResultsShowMore)));
 	more->entity()->setClickedCallback([=] {
 		controller->allowLoadMore();
 	});
 	controller->loadMoreCount(
-	) | rpl::map(_1 > 0) | rpl::start_with_next([=](bool visible) {
+	) | rpl::map(_1 > 0) | rpl::on_next([=](bool visible) {
 		more->toggle(visible, anim::type::instant);
 	}, more->lifetime());
 
@@ -541,7 +684,7 @@ ListController *CreateAnswerRows(
 		moreTop->topValue()
 	) | rpl::filter([=](int, QRect headerRect, int moreTop) {
 		return moreTop >= headerRect.y() + headerRect.height();
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			int visibleTop,
 			QRect headerRect,
 			int moreTop) {
@@ -610,12 +753,20 @@ void InnerWidget::setupContent() {
 		object_ptr<Ui::FlatLabel>(
 			_content,
 			rpl::single(_poll->question),
-			st::pollResultsQuestion),
-		style::margins{
-			st::boxRowPadding.left(),
-			0,
-			st::boxRowPadding.right(),
-			st::boxMediumSkip });
+			st::pollResultsQuestion,
+			st::defaultPopupMenu,
+			Core::TextContext({ .session = &_controller->session() })),
+		st::boxRowPadding);
+	Ui::AddSkip(_content, st::boxLittleSkip / 2);
+	_content->add(
+		object_ptr<Ui::FlatLabel>(
+			_content,
+			tr::lng_polls_votes_count(
+				lt_count_decimal,
+				rpl::single(float64(_poll->totalVoters))),
+			st::boxDividerLabel),
+		st::boxRowPadding);
+	Ui::AddSkip(_content, st::boxLittleSkip);
 	for (const auto &answer : _poll->answers) {
 		const auto session = &_controller->session();
 		const auto controller = CreateAnswerRows(
@@ -633,19 +784,19 @@ void InnerWidget::setupContent() {
 			_showPeerInfoRequests,
 			lifetime());
 		controller->scrollToRequests(
-		) | rpl::start_with_next([=](int y) {
+		) | rpl::on_next([=](int y) {
 			_scrollToRequests.fire({ y, -1 });
 		}, lifetime());
 		_sections.emplace(answer.option, controller);
 	}
 
 	widthValue(
-	) | rpl::start_with_next([=](int newWidth) {
+	) | rpl::on_next([=](int newWidth) {
 		_content->resizeToWidth(newWidth);
 	}, _content->lifetime());
 
 	_content->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		resize(width(), height);
 	}, _content->lifetime());
 }
@@ -659,6 +810,4 @@ auto InnerWidget::showPeerInfoRequests() const
 	return _showPeerInfoRequests.events();
 }
 
-} // namespace Polls
-} // namespace Info
-
+} // namespace Info::Polls
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.h b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.h
index f2fbf05afda927..c84e10ef97c8da 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.h
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.h
@@ -16,10 +16,10 @@ class VerticalLayout;
 } // namespace Ui
 
 namespace Info {
-
 class Controller;
+} // namespace Info
 
-namespace Polls {
+namespace Info::Polls {
 
 class Memento;
 class ListController;
@@ -70,5 +70,4 @@ class InnerWidget final : public Ui::RpWidget {
 
 };
 
-} // namespace Polls
-} // namespace Info
+} // namespace Info::Polls
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp b/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp
index 02d3fe0a2c80c7..2dbc18025b49bc 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp
@@ -13,8 +13,7 @@ For license and copyright information please follow this link:
 #include "data/data_poll.h"
 #include "ui/ui_utility.h"
 
-namespace Info {
-namespace Polls {
+namespace Info::Polls {
 
 Memento::Memento(not_null<PollData*> poll, FullMsgId contextId)
 : ContentMemento(poll, contextId) {
@@ -55,11 +54,11 @@ Widget::Widget(QWidget *parent, not_null<Controller*> controller)
 		controller->poll(),
 		controller->pollContextId()))) {
 	_inner->showPeerInfoRequests(
-	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+	) | rpl::on_next([=](not_null<PeerData*> peer) {
 		controller->showPeerInfo(peer);
 	}, _inner->lifetime());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &request) {
+	) | rpl::on_next([=](const Ui::ScrollToRequest &request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
@@ -113,5 +112,4 @@ void Widget::restoreState(not_null<Memento*> memento) {
 	scrollTopRestore(memento->scrollTop());
 }
 
-} // namespace Polls
-} // namespace Info
+} // namespace Info::Polls
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_widget.h b/Telegram/SourceFiles/info/polls/info_polls_results_widget.h
index 6766da4f5948ea..a3c4ac752c1aec 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_widget.h
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_widget.h
@@ -12,8 +12,7 @@ For license and copyright information please follow this link:
 
 struct PeerListState;
 
-namespace Info {
-namespace Polls {
+namespace Info::Polls {
 
 class InnerWidget;
 
@@ -68,5 +67,4 @@ class Widget final : public ContentWidget {
 
 };
 
-} // namespace Polls
-} // namespace Info
+} // namespace Info::Polls
diff --git a/Telegram/SourceFiles/info/profile/info_levels.style b/Telegram/SourceFiles/info/profile/info_levels.style
new file mode 100644
index 00000000000000..861b31e7fd9196
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_levels.style
@@ -0,0 +1,81 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+using "ui/basic.style";
+
+LevelShape {
+	icon: icon;
+	position: point;
+}
+levelStyle: TextStyle(defaultTextStyle) {
+	font: font(9px semibold);
+}
+levelTextFg: windowFgActive;
+levelMargin: margins(4px, 3px, 2px, 2px);
+
+levelBase: LevelShape {
+	position: point(0px, 6px);
+}
+level1: LevelShape(levelBase) {
+	position: point(-1px, 6px);
+	icon: icon {{ "levels/level1_inner-26x26", windowBgActive }};
+}
+level2: LevelShape(level1) {
+	icon: icon {{ "levels/level2_inner-26x26", windowBgActive }};
+}
+level3: LevelShape(level1) {
+	icon: icon {{ "levels/level3_inner-26x26", windowBgActive }};
+}
+level4: LevelShape(level1) {
+	icon: icon {{ "levels/level4_inner-26x26", windowBgActive }};
+}
+level5: LevelShape(level1) {
+	icon: icon {{ "levels/level5_inner-26x26", windowBgActive }};
+}
+level6: LevelShape(level1) {
+	icon: icon {{ "levels/level6_inner-26x26", windowBgActive }};
+}
+level7: LevelShape(level1) {
+	icon: icon {{ "levels/level7_inner-26x26", windowBgActive }};
+}
+level8: LevelShape(level1) {
+	icon: icon {{ "levels/level8_inner-26x26", windowBgActive }};
+}
+level9: LevelShape(level1) {
+	icon: icon {{ "levels/level9_inner-26x26", windowBgActive }};
+}
+level10: LevelShape(levelBase) {
+	icon: icon {{ "levels/level10_inner-26x26", windowBgActive }};
+}
+level20: LevelShape(levelBase) {
+	icon: icon {{ "levels/level20_inner-26x26", windowBgActive }};
+}
+level30: LevelShape(levelBase) {
+	icon: icon {{ "levels/level30_inner-26x26", windowBgActive }};
+}
+level40: LevelShape(levelBase) {
+	icon: icon {{ "levels/level40_inner-26x26", windowBgActive }};
+}
+level50: LevelShape(levelBase) {
+	icon: icon {{ "levels/level50_inner-26x26", windowBgActive }};
+}
+level60: LevelShape(levelBase) {
+	icon: icon {{ "levels/level60_inner-26x26", windowBgActive }};
+}
+level70: LevelShape(levelBase) {
+	icon: icon {{ "levels/level70_inner-26x26", windowBgActive }};
+}
+level80: LevelShape(levelBase) {
+	icon: icon {{ "levels/level80_inner-26x26", windowBgActive }};
+}
+level90: LevelShape(levelBase) {
+	icon: icon {{ "levels/level90_inner-26x26", windowBgActive }};
+}
+levelNegative: LevelShape(levelBase) {
+	icon: icon {{ "levels/level_warning-18x18", attentionButtonFg, point(6px, 5px) }};
+}
+levelNegativeBubble: icon {{ "levels/level_warning-28x28", windowFgActive }};
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 4fc4d060d3916a..92fb5f0bd8d691 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -10,14 +10,20 @@ For license and copyright information please follow this link:
 #include "api/api_blocked_peers.h"
 #include "api/api_chat_participants.h"
 #include "api/api_credits.h"
+#include "api/api_report.h"
+#include "api/api_statistics.h"
 #include "apiwrap.h"
+#include "base/call_delayed.h"
+#include "base/event_filter.h"
 #include "base/options.h"
+#include "base/qt/qt_key_modifiers.h"
 #include "base/timer_rpl.h"
 #include "base/unixtime.h"
 #include "boxes/peers/add_bot_to_chat_box.h"
 #include "boxes/peers/edit_contact_box.h"
 #include "boxes/peers/edit_participants_box.h"
 #include "boxes/peers/edit_peer_info_box.h"
+#include "boxes/peers/verify_peers_box.h"
 #include "boxes/report_messages_box.h"
 #include "boxes/share_box.h"
 #include "boxes/star_gift_box.h"
@@ -32,8 +38,10 @@ For license and copyright information please follow this link:
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_folder.h"
+#include "data/data_forum.h"
 #include "data/data_forum_topic.h"
 #include "data/data_peer_values.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/notify/data_notify_settings.h"
@@ -42,35 +50,48 @@ For license and copyright information please follow this link:
 #include "dialogs/ui/dialogs_message_view.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/history_item_components.h"
 #include "history/history_item_helpers.h"
 #include "history/view/history_view_item_preview.h"
+#include "history/view/reactions/history_view_reactions_list.h"
 #include "info/bot/earn/info_bot_earn_widget.h"
-#include "info/info_controller.h"
-#include "info/info_memento.h"
+#include "info/bot/starref/info_bot_starref_common.h"
+#include "info/channel_statistics/earn/earn_format.h"
+#include "info/channel_statistics/earn/earn_icons.h"
+#include "info/channel_statistics/earn/info_channel_earn_list.h"
 #include "info/profile/info_profile_icon.h"
 #include "info/profile/info_profile_phone_menu.h"
 #include "info/profile/info_profile_text.h"
 #include "info/profile/info_profile_values.h"
 #include "info/profile/info_profile_widget.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
 #include "inline_bots/bot_attach_web_view.h"
 #include "iv/iv_instance.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "menu/menu_mute.h"
+#include "settings/settings_common.h"
 #include "support/support_helper.h"
 #include "ui/boxes/peer_qr_box.h"
 #include "ui/boxes/report_box_graphics.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/effects/credits_graphics.h"
+#include "ui/effects/toggle_arrow.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/ui_utility.h"
 #include "ui/text/format_values.h"
-#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
+#include "ui/text/text_custom_emoji.h"
+#include "ui/text/text_utilities.h"
 #include "ui/text/text_variant.h"
 #include "ui/toast/toast.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/shadow.h"
 #include "ui/wrap/padding_wrap.h"
@@ -78,11 +99,16 @@ For license and copyright information please follow this link:
 #include "ui/wrap/vertical_layout.h"
 #include "window/window_controller.h" // Window::Controller::show.
 #include "window/window_peer_menu.h"
+#include "window/window_separate_id.h"
 #include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_channel_earn.h" // st::channelEarnCurrencyCommonMargins
+#include "styles/style_chat_helpers.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
 #include "styles/style_settings.h" // settingsButtonRightSkip.
+#include "styles/style_window.h" // mainMenuToggleFourStrokes.
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
@@ -92,6 +118,22 @@ namespace Profile {
 namespace {
 
 constexpr auto kDay = Data::WorkingInterval::kDay;
+constexpr auto kPeerIdLinkIndex = uint16(1);
+
+class DraggableUrlClickHandler final : public UrlClickHandler {
+public:
+	DraggableUrlClickHandler(const QString &url, QString drag)
+	: UrlClickHandler(url, false)
+	, _drag(std::move(drag)) {
+	}
+	QString dragText() const override {
+		return _drag;
+	}
+
+private:
+	const QString _drag;
+
+};
 
 base::options::toggle ShowPeerIdBelowAbout({
 	.id = kOptionShowPeerIdBelowAbout,
@@ -100,6 +142,12 @@ base::options::toggle ShowPeerIdBelowAbout({
 		" Add contact IDs to exported data.",
 });
 
+base::options::toggle ShowChannelJoinedBelowAbout({
+	.id = kOptionShowChannelJoinedBelowAbout,
+	.name = "Show Channel Joined Date in Profile",
+	.description = "Show when you join Channel under its Description.",
+});
+
 [[nodiscard]] rpl::producer<TextWithEntities> UsernamesSubtext(
 		not_null<PeerData*> peer,
 		rpl::producer<QString> fallback) {
@@ -118,7 +166,7 @@ base::options::toggle ShowPeerIdBelowAbout({
 				end(usernames));
 			for (auto &username : std::move(subrange)) {
 				const auto isLast = (usernames.back() == username);
-				result.append(Ui::Text::Link(
+				result.append(tr::link(
 					'@' + base::take(username.text),
 					username.entities.front().data()));
 				if (!isLast) {
@@ -130,6 +178,16 @@ base::options::toggle ShowPeerIdBelowAbout({
 	});
 }
 
+[[nodiscard]] rpl::producer<TextWithEntities> TopicSubtext(
+		not_null<PeerData*> peer) {
+	return rpl::conditional(
+		UsernamesValue(peer) | rpl::map([](std::vector<TextWithEntities> v) {
+			return !v.empty();
+		}),
+		tr::lng_filters_link_subtitle(tr::marked),
+		tr::lng_info_link_topic_label(tr::marked));
+}
+
 [[nodiscard]] Fn<void(QString)> UsernamesLinkCallback(
 		not_null<PeerData*> peer,
 		not_null<Window::SessionController*> controller,
@@ -149,8 +207,13 @@ base::options::toggle ShowPeerIdBelowAbout({
 		if (!link.isEmpty()) {
 			TextUtilities::SetClipboardText({ link });
 			if (const auto strong = weak.get()) {
-				strong->showToast(
-					tr::lng_channel_public_link_copied(tr::now));
+				strong->showToast({
+					.text = {
+						tr::lng_channel_public_link_copied(tr::now),
+					},
+					.iconLottie = u"toast/voip_invite"_q,
+					.iconLottieSize = st::toastLottieIconSize,
+				});
 			}
 		}
 	};
@@ -161,37 +224,69 @@ base::options::toggle ShowPeerIdBelowAbout({
 	return Ui::CreateSkipWidget(parent, st::infoProfileSkip);
 }
 
-[[nodiscard]] object_ptr<Ui::SlideWrap<>> CreateSlideSkipWidget(
-		not_null<Ui::RpWidget*> parent) {
-	auto result = Ui::CreateSlideSkipWidget(
-		parent,
-		st::infoProfileSkip);
-	result->setDuration(st::infoSlideDuration);
-	return result;
-}
-
-[[nodiscard]] rpl::producer<TextWithEntities> AboutWithIdValue(
+[[nodiscard]] rpl::producer<TextWithEntities> AboutWithAdvancedValue(
 		not_null<PeerData*> peer) {
 
 	return AboutValue(
 		peer
 	) | rpl::map([=](TextWithEntities &&value) {
-		if (!ShowPeerIdBelowAbout.value()) {
-			return std::move(value);
+		if (ShowPeerIdBelowAbout.value()) {
+			using namespace Ui::Text;
+			if (!value.empty()) {
+				value.append("\n\n");
+			}
+			value.append(Italic(u"id: "_q));
+			const auto raw = peer->id.value & PeerId::kChatTypeMask;
+			value.append(Link(
+				Italic(Lang::FormatCountDecimal(raw)),
+				kPeerIdLinkIndex));
 		}
-		using namespace Ui::Text;
-		if (!value.empty()) {
-			value.append("\n\n");
+		if (ShowChannelJoinedBelowAbout.value()) {
+			if (const auto channel = peer->asChannel()) {
+				if (!channel->amCreator() && channel->inviteDate) {
+					if (!value.empty()) {
+						if (ShowPeerIdBelowAbout.value()) {
+							value.append("\n");
+						} else {
+							value.append("\n\n");
+						}
+					}
+					using namespace Ui::Text;
+					value.append((channel->isMegagroup()
+						? tr::lng_you_joined_group
+						: tr::lng_action_you_joined)(
+							tr::now,
+							tr::italic));
+					value.append(Italic(": "));
+					const auto raw = channel->inviteDate;
+					value.append(Link(
+						Italic(langDateTimeFull(base::unixtime::parse(raw))),
+						"internal:~join_date~:show:" + QString::number(raw)));
+				}
+			}
 		}
-		value.append(Italic(u"id: "_q));
-		const auto raw = peer->id.value & PeerId::kChatTypeMask;
-		value.append(Link(
-			Italic(Lang::FormatCountDecimal(raw)),
-			"internal:~peer_id~:copy:" + QString::number(raw)));
 		return std::move(value);
 	});
 }
 
+void SetupAboutPeerIdDrag(
+		not_null<Ui::FlatLabel*> label,
+		not_null<PeerData*> peer) {
+	if (!ShowPeerIdBelowAbout.value()) {
+		return;
+	}
+	const auto id = QString::number(peer->id.value & PeerId::kChatTypeMask);
+	AboutValue(
+		peer
+	) | rpl::on_next([=] {
+		label->setLink(
+			kPeerIdLinkIndex,
+			std::make_shared<DraggableUrlClickHandler>(
+				u"internal:~peer_id~:copy:"_q + id,
+				id));
+	}, label->lifetime());
+}
+
 [[nodiscard]] bool AreNonTrivialHours(const Data::WorkingHours &hours) {
 	if (!hours) {
 		return false;
@@ -338,13 +433,14 @@ base::options::toggle ShowPeerIdBelowAbout({
 			st::infoHoursOuter),
 		st::infoProfileLabeledPadding - st::infoHoursOuterMargin);
 	const auto button = result->entity();
+	button->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 	const auto inner = Ui::CreateChild<Ui::VerticalLayout>(button);
-	button->widthValue() | rpl::start_with_next([=](int width) {
+	button->widthValue() | rpl::on_next([=](int width) {
 		const auto margin = st::infoHoursOuterMargin;
 		inner->resizeToWidth(width - margin.left() - margin.right());
 		inner->move(margin.left(), margin.top());
 	}, inner->lifetime());
-	inner->heightValue() | rpl::start_with_next([=](int height) {
+	inner->heightValue() | rpl::on_next([=](int height) {
 		const auto margin = st::infoHoursOuterMargin;
 		height += margin.top() + margin.bottom();
 		button->resize(button->width(), height);
@@ -498,8 +594,10 @@ base::options::toggle ShowPeerIdBelowAbout({
 			dayHoursTextValue(state->day.value())
 		) | rpl::after_next(recount),
 		st::infoHoursValue);
+	const auto timingArrow = Ui::CreateChild<Ui::RpWidget>(openedWrap);
+	timingArrow->resize(Size(timing->st().style.font->height));
 	timing->setAttribute(Qt::WA_TransparentForMouseEvents);
-	state->opened.value() | rpl::start_with_next([=](bool value) {
+	state->opened.value() | rpl::on_next([=](bool value) {
 		opened->setTextColorOverride(value
 			? st::boxTextFgGood->c
 			: st::boxTextFgError->c);
@@ -509,25 +607,50 @@ base::options::toggle ShowPeerIdBelowAbout({
 		openedWrap->widthValue(),
 		opened->heightValue(),
 		timing->sizeValue()
-	) | rpl::start_with_next([=](int width, int h1, QSize size) {
+	) | rpl::on_next([=](int width, int h1, QSize size) {
 		opened->moveToLeft(0, 0, width);
-		timing->moveToRight(0, 0, width);
+		timingArrow->moveToRight(0, 0, width);
+		timing->moveToRight(timingArrow->width(), 0, width);
 
 		const auto margins = opened->getMargins();
 		const auto added = margins.top() + margins.bottom();
 		openedWrap->resize(width, std::max(h1, size.height()) - added);
 	}, openedWrap->lifetime());
 
+	rpl::combine(
+		state->opened.value(),
+		state->opensIn.value(),
+		state->expanded.value(),
+		dayHoursTextValue(state->day.value())
+	) | rpl::on_next([=](
+			bool opened,
+			TimeId opensIn,
+			bool expanded,
+			const QString &timing) {
+		const auto status = (opened
+			? tr::lng_info_work_open
+			: tr::lng_info_work_closed)(tr::now);
+		const auto when = (!opensIn || expanded)
+			? timing
+			: (opensIn >= 86400)
+			? tr::lng_info_hours_opens_in_days(tr::now, lt_count, opensIn / 86400)
+			: (opensIn >= 3600)
+			? tr::lng_info_hours_opens_in_hours(tr::now, lt_count, opensIn / 3600)
+			: tr::lng_info_hours_opens_in_minutes(
+				tr::now,
+				lt_count,
+				std::max(opensIn / 60, 1));
+		button->setAccessibleName(
+			tr::lng_info_hours_label(tr::now) + ": " + status + ", " + when);
+	}, inner->lifetime());
+
 	const auto labelWrap = inner->add(object_ptr<Ui::RpWidget>(inner));
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
 		labelWrap,
 		tr::lng_info_hours_label(),
 		st::infoLabel);
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
-	const auto link = Ui::CreateChild<Ui::LinkButton>(
-		labelWrap,
-		QString());
-	rpl::combine(
+	auto linkText = rpl::combine(
 		state->nonTrivial.value(),
 		state->hours.value(),
 		state->mine.value(),
@@ -542,10 +665,11 @@ base::options::toggle ShowPeerIdBelowAbout({
 			: my
 			? tr::lng_info_hours_my_time()
 			: tr::lng_info_hours_local_time();
-	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](const QString &text) {
-		link->setText(text);
-	}, link->lifetime());
+	}) | rpl::flatten_latest();
+	const auto link = Ui::CreateChild<Ui::RoundButton>(
+		labelWrap,
+		std::move(linkText),
+		st::defaultTableSmallButton);
 	link->setClickedCallback([=] {
 		state->myTimezone = !state->myTimezone.current();
 		state->expanded = true;
@@ -555,7 +679,7 @@ base::options::toggle ShowPeerIdBelowAbout({
 		labelWrap->widthValue(),
 		label->heightValue(),
 		link->sizeValue()
-	) | rpl::start_with_next([=](int width, int h1, QSize size) {
+	) | rpl::on_next([=](int width, int h1, QSize size) {
 		label->moveToLeft(0, 0, width);
 		link->moveToRight(0, 0, width);
 
@@ -569,6 +693,38 @@ base::options::toggle ShowPeerIdBelowAbout({
 			inner,
 			object_ptr<Ui::VerticalLayout>(inner)));
 	other->toggleOn(state->expanded.value(), anim::type::normal);
+	constexpr auto kSlideDuration = float64(st::slideWrapDuration);
+	other->setDuration(kSlideDuration);
+	{
+		const auto arrowAnimation
+			= other->lifetime().make_state<Ui::Animations::Basic>();
+		arrowAnimation->init([=] {
+			timingArrow->update();
+			if (!other->animating()) {
+				arrowAnimation->stop();
+			}
+		});
+		timingArrow->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(timingArrow);
+			const auto progress = other->animating()
+				? (crl::now() - arrowAnimation->started()) / kSlideDuration
+				: 1.;
+
+			const auto path = Ui::ToggleUpDownArrowPath(
+				timingArrow->width() / 2,
+				timingArrow->height() / 2,
+				st::infoHoursArrowSize,
+				st::mainMenuToggleFourStrokes,
+				other->toggled() ? progress : 1 - progress);
+
+			auto hq = PainterHighQualityEnabler(p);
+			p.fillPath(path, timing->st().textFg);
+		}, timingArrow->lifetime());
+		state->expanded.value() | rpl::on_next([=] {
+			arrowAnimation->start();
+		}, other->lifetime());
+	}
+
 	other->finishAnimating();
 	const auto days = other->entity();
 
@@ -603,7 +759,7 @@ base::options::toggle ShowPeerIdBelowAbout({
 			dayWrap->widthValue(),
 			dayLabel->heightValue(),
 			dayHours->sizeValue()
-		) | rpl::start_with_next([=](int width, int h1, QSize size) {
+		) | rpl::on_next([=](int width, int h1, QSize size) {
 			dayLabel->moveToLeft(0, 0, width);
 			dayHours->moveToRight(0, 0, width);
 
@@ -625,6 +781,132 @@ base::options::toggle ShowPeerIdBelowAbout({
 	return result;
 }
 
+void DeleteContactNote(
+		not_null<UserData*> user,
+		Fn<void(const QString &)> showError = nullptr) {
+	user->session().api().request(MTPcontacts_UpdateContactNote(
+		user->inputUser(),
+		MTP_textWithEntities(MTP_string(), MTP_vector<MTPMessageEntity>())
+	)).done([=] {
+		user->setNote(TextWithEntities());
+	}).fail([=](const MTP::Error &error) {
+		if (showError) {
+			showError(error.description());
+		}
+	}).send();
+}
+
+[[nodiscard]] object_ptr<Ui::SlideWrap<>> CreateNotes(
+		not_null<QWidget*> parent,
+		not_null<Window::SessionController*> controller,
+		not_null<UserData*> user) {
+	auto allNotesText = user->session().changes().peerFlagsValue(
+		user,
+		Data::PeerUpdate::Flag::FullInfo
+	) | rpl::map([=] {
+		return user->note();
+	});
+
+	auto notesText = rpl::duplicate(
+		allNotesText
+	) | rpl::filter([](const TextWithEntities &note) {
+		return !note.text.isEmpty();
+	});
+
+	auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		parent,
+		object_ptr<Ui::VerticalLayout>(parent));
+	result->toggleOn(rpl::duplicate(
+		allNotesText
+	) | rpl::map([](const TextWithEntities &note) {
+		return !note.text.isEmpty();
+	}));
+	result->finishAnimating();
+
+	const auto notesContainer = result->entity();
+
+	const auto context = Ui::Text::MarkedContext{
+		.customEmojiFactory = user->owner().customEmojiManager().factory(
+			Data::CustomEmojiManager::SizeTag::Normal)
+	};
+
+	auto notesLine = CreateTextWithLabel(
+		notesContainer,
+		tr::lng_info_notes_label(TextWithEntities::Simple),
+		rpl::duplicate(notesText),
+		st::infoLabel,
+		st::infoLabeled,
+		st::infoProfileLabeledPadding);
+
+	std::move(
+		notesText
+	) | rpl::on_next([=, raw = notesLine.text](
+			TextWithEntities note) {
+		TextUtilities::ParseEntities(note, TextParseLinks);
+		raw->setMarkedText(note, context);
+	}, notesLine.text->lifetime());
+
+	notesLine.text->setContextMenuHook([=, raw = notesLine.text](
+			Ui::FlatLabel::ContextMenuRequest request) {
+		raw->fillContextMenu(request);
+		const auto addAction = Ui::Menu::CreateAddActionCallback(
+			request.menu);
+		addAction({
+			.text = tr::lng_edit_note(tr::now),
+			.handler = [=] {
+				controller->window().show(
+					Box(EditContactNoteBox, controller, user));
+			},
+		});
+		addAction({
+			.text = tr::lng_delete_note(tr::now),
+			.handler = [=] {
+				DeleteContactNote(user, [=](const QString &error) {
+					controller->showToast(error);
+				});
+			},
+			.isAttention = true,
+		});
+	});
+
+	rpl::merge(
+		notesLine.wrap->events(),
+		notesLine.subtext->events()
+	) | rpl::on_next([=, raw = notesLine.text](not_null<QEvent*> e) {
+		if (e->type() == QEvent::ContextMenu) {
+			const auto ce = static_cast<QContextMenuEvent*>(e.get());
+			QCoreApplication::postEvent(
+				raw,
+				new QContextMenuEvent(
+					ce->reason(),
+					ce->pos(),
+					ce->globalPos()));
+		}
+	}, notesLine.wrap->lifetime());
+
+	const auto subtextLabel = Ui::CreateChild<Ui::FlatLabel>(
+		notesLine.wrap->entity(),
+		tr::lng_info_notes_private(tr::now),
+		st::infoLabel);
+	subtextLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	rpl::combine(
+		notesLine.wrap->entity()->widthValue(),
+		notesLine.subtext->geometryValue()
+	) | rpl::on_next([=, skip = st::lineWidth * 5](
+			int width,
+			const QRect &subtextGeometry) {
+		subtextLabel->moveToRight(
+			0,
+			subtextGeometry.y() + skip,
+			width);
+	}, subtextLabel->lifetime());
+
+	notesContainer->add(std::move(notesLine.wrap));
+
+	return result;
+}
+
 [[nodiscard]] object_ptr<Ui::SlideWrap<>> CreateBirthday(
 		not_null<QWidget*> parent,
 		not_null<Window::SessionController*> controller,
@@ -640,6 +922,7 @@ base::options::toggle ShowPeerIdBelowAbout({
 		st::infoProfileLabeledPadding - st::infoHoursOuterMargin);
 	result->setDuration(st::infoSlideDuration);
 	const auto button = result->entity();
+	button->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 
 	auto outer = Ui::CreateChild<Ui::SlideWrap<Ui::VerticalLayout>>(
 		button,
@@ -655,17 +938,17 @@ base::options::toggle ShowPeerIdBelowAbout({
 	auto label = BirthdayLabelText(rpl::duplicate(birthday));
 	auto text = BirthdayValueText(
 		rpl::duplicate(birthday)
-	) | Ui::Text::ToWithEntities();
+	) | rpl::map(tr::marked);
 
 	const auto giftIcon = Ui::CreateChild<Ui::RpWidget>(layout);
 	giftIcon->resize(st::birthdayTodayIcon.size());
-	layout->sizeValue() | rpl::start_with_next([=](QSize size) {
+	layout->sizeValue() | rpl::on_next([=](QSize size) {
 		giftIcon->moveToRight(
 			0,
 			(size.height() - giftIcon->height()) / 2,
 			size.width());
 	}, giftIcon->lifetime());
-	giftIcon->paintRequest() | rpl::start_with_next([=] {
+	giftIcon->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(giftIcon);
 		st::birthdayTodayIcon.paint(p, 0, 0, giftIcon->width());
 	}, giftIcon->lifetime());
@@ -676,7 +959,7 @@ base::options::toggle ShowPeerIdBelowAbout({
 		return Data::IsBirthdayTodayValue(value);
 	}) | rpl::flatten_latest(
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool today) {
+	) | rpl::on_next([=](bool today) {
 		const auto disable = !today && user->session().premiumCanBuy();
 		button->setDisabled(disable);
 		button->setAttribute(Qt::WA_TransparentForMouseEvents, disable);
@@ -684,6 +967,14 @@ base::options::toggle ShowPeerIdBelowAbout({
 		giftIcon->setVisible(!disable);
 	}, result->lifetime());
 
+	BirthdayValueText(
+		rpl::duplicate(birthday),
+		true
+	) | rpl::on_next([=](const QString &accessibleText) {
+		button->setAccessibleName(
+			tr::lng_info_birthday_label(tr::now) + ": " + accessibleText);
+	}, button->lifetime());
+
 	auto nonEmptyText = std::move(
 		text
 	) | rpl::before_next([slide = result.data()](
@@ -730,8 +1021,7 @@ auto AddActionButton(
 		ToggleOn &&toggleOn,
 		Callback &&callback,
 		const style::icon *icon,
-		const style::SettingsButton &st
-			= st::infoSharedMediaButton) {
+		const style::SettingsButton &st = st::infoSharedMediaButton) {
 	auto result = parent->add(object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
 		parent,
 		object_ptr<Ui::SettingsButton>(
@@ -755,72 +1045,235 @@ auto AddActionButton(
 };
 
 template <typename Text, typename ToggleOn, typename Callback>
-[[nodiscard]] auto AddMainButton(
+auto AddMainButton(
 		not_null<Ui::VerticalLayout*> parent,
 		Text &&text,
 		ToggleOn &&toggleOn,
 		Callback &&callback,
-		Ui::MultiSlideTracker &tracker,
+		Ui::MultiSlideTracker *tracker = nullptr,
+		Ui::MultiSlideTracker *buttonTracker = nullptr,
 		const style::SettingsButton &st = st::infoMainButton) {
-	tracker.track(AddActionButton(
+	const auto button = AddActionButton(
 		parent,
-		std::move(text) | Ui::Text::ToUpper(),
+		std::move(text) | rpl::map(tr::upper),
 		std::move(toggleOn),
 		std::move(callback),
 		nullptr,
-		st));
+		st);
+	if (tracker) {
+		tracker->track(button);
+	}
+	if (buttonTracker) {
+		buttonTracker->track(button);
+	}
+	return button->entity();
+}
+
+rpl::producer<CreditsAmount> AddCurrencyAction(
+		not_null<UserData*> user,
+		not_null<Ui::VerticalLayout*> wrap,
+		not_null<Controller*> controller) {
+	struct State final {
+		rpl::variable<CreditsAmount> balance;
+		Ui::Text::CustomEmojiHelper helper;
+	};
+	const auto state = wrap->lifetime().make_state<State>();
+	const auto parentController = controller->parentController();
+	const auto wrapButton = AddActionButton(
+		wrap,
+		tr::lng_manage_peer_bot_balance_currency(),
+		state->balance.value(
+		) | rpl::map(rpl::mappers::_1 > CreditsAmount(0)),
+		[=] { parentController->showSection(Info::ChannelEarn::Make(user)); },
+		nullptr);
+	{
+		const auto button = wrapButton->entity();
+		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
+		icon->resize(st::infoIconReport.size());
+		const auto image = Ui::Earn::MenuIconCurrency(icon->size());
+		icon->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(icon);
+			p.drawImage(0, 0, image);
+		}, icon->lifetime());
+
+		button->sizeValue(
+		) | rpl::on_next([=](const QSize &size) {
+			icon->move(st::infoEarnCurrencyIconPosition);
+		}, icon->lifetime());
+	}
+	const auto balance = user->session().credits().balanceCurrency(user->id);
+	if (balance) {
+		state->balance = balance;
+	}
+	{
+		const auto weak = base::make_weak(wrap);
+		const auto currencyLoadLifetime
+			= std::make_shared<rpl::lifetime>();
+		const auto currencyLoad
+			= currencyLoadLifetime->make_state<Api::EarnStatistics>(user);
+		const auto done = [=](CreditsAmount balance) {
+			if ([[maybe_unused]] const auto strong = weak.get()) {
+				state->balance = balance;
+				currencyLoadLifetime->destroy();
+			}
+		};
+		currencyLoad->request() | rpl::on_error_done(
+			[=](const QString &error) {
+				done(CreditsAmount(0, CreditsType::Ton));
+			},
+			[=] { done(currencyLoad->data().currentBalance); },
+			*currencyLoadLifetime);
+	}
+	const auto &st = st::infoSharedMediaButton;
+	const auto button = wrapButton->entity();
+	const auto name = Ui::CreateChild<Ui::FlatLabel>(button, st.rightLabel);
+	const auto icon = state->helper.paletteDependent({ .factory = [=] {
+		return Ui::Earn::IconCurrencyColored(
+			st.rightLabel.style.font,
+			st.rightLabel.textFg->c);
+	}, .margin = st::channelEarnCurrencyCommonMargins });
+	name->show();
+	rpl::combine(
+		button->widthValue(),
+		tr::lng_manage_peer_bot_balance_currency(),
+		state->balance.value()
+	) | rpl::on_next([=, &st](
+			int width,
+			const QString &button,
+			CreditsAmount balance) {
+		const auto available = width
+			- rect::m::sum::h(st.padding)
+			- st.style.font->width(button)
+			- st::settingsButtonRightSkip;
+		name->setMarkedText(
+			base::duplicate(icon)
+				.append(QChar(' '))
+				.append(Info::ChannelEarn::MajorPart(balance))
+				.append(Info::ChannelEarn::MinorPart(balance)),
+			state->helper.context());
+		name->resizeToNaturalWidth(available);
+		name->moveToRight(st::settingsButtonRightSkip, st.padding.top());
+	}, name->lifetime());
+	name->setAttribute(Qt::WA_TransparentForMouseEvents);
+	wrapButton->finishAnimating();
+	return state->balance.value();
+}
+
+rpl::producer<CreditsAmount> AddCreditsAction(
+		not_null<UserData*> user,
+		not_null<Ui::VerticalLayout*> wrap,
+		not_null<Controller*> controller) {
+	struct State final {
+		rpl::variable<CreditsAmount> balance;
+	};
+	const auto state = wrap->lifetime().make_state<State>();
+	const auto parentController = controller->parentController();
+	const auto wrapButton = AddActionButton(
+		wrap,
+		tr::lng_manage_peer_bot_balance_credits(),
+		state->balance.value(
+		) | rpl::map(rpl::mappers::_1 > CreditsAmount(0)),
+		[=] { parentController->showSection(Info::BotEarn::Make(user)); },
+		nullptr);
+	{
+		const auto button = wrapButton->entity();
+		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
+		const auto image = Ui::Earn::MenuIconCredits();
+		icon->resize(image.size() / style::DevicePixelRatio());
+		icon->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(icon);
+			p.drawImage(0, 0, image);
+		}, icon->lifetime());
+
+		button->sizeValue(
+		) | rpl::on_next([=](const QSize &size) {
+			icon->move(st::infoEarnCreditsIconPosition);
+		}, icon->lifetime());
+	}
+	if (const auto balance = user->session().credits().balance(user->id)) {
+		state->balance = balance;
+	}
+	{
+		const auto api = wrap->lifetime().make_state<Api::CreditsStatus>(
+			user);
+		api->request({}, [=](Data::CreditsStatusSlice data) {
+			state->balance = data.balance;
+		});
+	}
+	const auto &st = st::infoSharedMediaButton;
+	const auto button = wrapButton->entity();
+	const auto name = Ui::CreateChild<Ui::FlatLabel>(button, st.rightLabel);
+
+	auto helper = Ui::Text::CustomEmojiHelper();
+	const auto icon = helper.paletteDependent(Ui::Earn::IconCreditsEmoji());
+	const auto context = helper.context([=] { name->update(); });
+	name->show();
+	rpl::combine(
+		button->widthValue(),
+		tr::lng_manage_peer_bot_balance_credits(),
+		state->balance.value()
+	) | rpl::on_next([=, &st](
+			int width,
+			const QString &button,
+			CreditsAmount balance) {
+		const auto available = width
+			- rect::m::sum::h(st.padding)
+			- st.style.font->width(button)
+			- st::settingsButtonRightSkip;
+		name->setMarkedText(
+			base::duplicate(icon)
+				.append(QChar(' '))
+				.append(Lang::FormatCreditsAmountDecimal(balance)),
+			context);
+		name->resizeToNaturalWidth(available);
+		name->moveToRight(st::settingsButtonRightSkip, st.padding.top());
+	}, name->lifetime());
+	name->setAttribute(Qt::WA_TransparentForMouseEvents);
+	wrapButton->finishAnimating();
+	return state->balance.value();
 }
 
 class DetailsFiller {
 public:
 	DetailsFiller(
 		not_null<Controller*> controller,
-		not_null<Ui::RpWidget*> parent,
+		not_null<SectionStack*> stack,
 		not_null<PeerData*> peer,
 		Origin origin);
 	DetailsFiller(
 		not_null<Controller*> controller,
-		not_null<Ui::RpWidget*> parent,
+		not_null<SectionStack*> stack,
+		not_null<Data::SavedSublist*> sublist);
+	DetailsFiller(
+		not_null<Controller*> controller,
+		not_null<SectionStack*> stack,
 		not_null<Data::ForumTopic*> topic);
 
-	object_ptr<Ui::RpWidget> fill();
+	void buildSections();
 
 private:
-	object_ptr<Ui::RpWidget> setupPersonalChannel(not_null<UserData*> user);
-	object_ptr<Ui::RpWidget> setupInfo();
-	object_ptr<Ui::RpWidget> setupMuteToggle();
-	void setupMainApp();
-	void setupMainButtons();
-	Ui::MultiSlideTracker fillTopicButtons();
-	Ui::MultiSlideTracker fillUserButtons(
-		not_null<UserData*> user);
-	Ui::MultiSlideTracker fillChannelButtons(
-		not_null<ChannelData*> channel);
-
-	void addReportReaction(Ui::MultiSlideTracker &tracker);
-	void addReportReaction(
+	[[nodiscard]] Section makePersonalChannel(not_null<UserData*> user);
+	[[nodiscard]] Section makeInfo();
+	[[nodiscard]] Section makeAddAsContact(not_null<UserData*> user);
+	void addBotVerify();
+	void addMainApp(not_null<UserData*> user);
+	[[nodiscard]] Section makeBotPermissions(not_null<UserData*> user);
+	void addManagedBotFooter(not_null<UserData*> managerUser);
+	[[nodiscard]] Section makeReportOrDeleteReaction();
+	[[nodiscard]] Section makeViewChannel(not_null<ChannelData*> channel);
+	[[nodiscard]] Section makeTopicsList(not_null<Data::Forum*> forum);
+
+	[[nodiscard]] Section makeDeleteReactionSection(GroupReactionOrigin data);
+	[[nodiscard]] Section makeReportReactionSection(
 		GroupReactionOrigin data,
-		bool ban,
-		Ui::MultiSlideTracker &tracker);
-
-	template <
-		typename Widget,
-		typename = std::enable_if_t<
-		std::is_base_of_v<Ui::RpWidget, Widget>>>
-	Widget *add(
-			object_ptr<Widget> &&child,
-			const style::margins &margin = style::margins()) {
-		return _wrap->add(
-			std::move(child),
-			margin);
-	}
+		bool ban);
 
 	not_null<Controller*> _controller;
-	not_null<Ui::RpWidget*> _parent;
+	not_null<SectionStack*> _stack;
 	not_null<PeerData*> _peer;
 	Data::ForumTopic *_topic = nullptr;
+	Data::SavedSublist *_sublist = nullptr;
 	Origin _origin;
-	object_ptr<Ui::VerticalLayout> _wrap;
 
 };
 
@@ -834,12 +1287,14 @@ class ActionsFiller {
 	object_ptr<Ui::RpWidget> fill();
 
 private:
+	void addAffiliateProgram(not_null<UserData*> user);
+	void addBalanceActions(not_null<UserData*> user);
 	void addInviteToGroupAction(not_null<UserData*> user);
-	void addCreditsAction(not_null<UserData*> user);
 	void addShareContactAction(not_null<UserData*> user);
 	void addEditContactAction(not_null<UserData*> user);
 	void addDeleteContactAction(not_null<UserData*> user);
 	void addBotCommandActions(not_null<UserData*> user);
+	void addFastButtonsMode(not_null<UserData*> user);
 	void addReportAction();
 	void addBlockAction(not_null<UserData*> user);
 	void addLeaveChannelAction(not_null<ChannelData*> channel);
@@ -889,13 +1344,11 @@ void ReportReactionBox(
 					ChatRestrictionsInfo());
 			}
 		}
-		data.group->session().api().request(MTPmessages_ReportReaction(
-			data.group->input,
-			MTP_int(data.messageId.bare),
-			participant->input
-		)).done(crl::guard(controller, [=] {
-			controller->showToast(tr::lng_report_thanks(tr::now));
-		})).send();
+		Api::ReportReaction(
+			controller->uiShow(),
+			data.group,
+			data.messageId,
+			participant);
 		sent();
 		box->closeBox();
 	}, st::attentionBoxButton);
@@ -906,25 +1359,33 @@ void ReportReactionBox(
 
 DetailsFiller::DetailsFiller(
 	not_null<Controller*> controller,
-	not_null<Ui::RpWidget*> parent,
+	not_null<SectionStack*> stack,
 	not_null<PeerData*> peer,
 	Origin origin)
 : _controller(controller)
-, _parent(parent)
+, _stack(stack)
 , _peer(peer)
-, _origin(origin)
-, _wrap(_parent) {
+, _origin(origin) {
 }
 
 DetailsFiller::DetailsFiller(
 	not_null<Controller*> controller,
-	not_null<Ui::RpWidget*> parent,
+	not_null<SectionStack*> stack,
+	not_null<Data::SavedSublist*> sublist)
+: _controller(controller)
+, _stack(stack)
+, _peer(sublist->sublistPeer())
+, _sublist(sublist) {
+}
+
+DetailsFiller::DetailsFiller(
+	not_null<Controller*> controller,
+	not_null<SectionStack*> stack,
 	not_null<Data::ForumTopic*> topic)
 : _controller(controller)
-, _parent(parent)
+, _stack(stack)
 , _peer(topic->peer())
-, _topic(topic)
-, _wrap(_parent) {
+, _topic(topic) {
 }
 
 template <typename T>
@@ -938,8 +1399,13 @@ bool SetClickContext(
 	return false;
 }
 
-object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
-	auto result = object_ptr<Ui::VerticalLayout>(_wrap);
+Section DetailsFiller::makeInfo() {
+	const auto parent = _stack->layout();
+	auto wrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		parent,
+		object_ptr<Ui::VerticalLayout>(parent));
+	const auto raw = wrap.data();
+	const auto result = raw->entity();
 	auto tracker = Ui::MultiSlideTracker();
 
 	// Fill context for a mention / hashtag / bot command link.
@@ -963,6 +1429,23 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			return false;
 		} else if (SetClickContext<CashtagClickHandler>(handler, context)) {
 			return false;
+		} else if (handler->url().startsWith(u"internal:~join_date~:"_q)) {
+			const auto joinDate = handler->url().split(
+				u"show:"_q,
+				Qt::SkipEmptyParts).last();
+			if (!joinDate.isEmpty()) {
+				const auto weak = base::make_weak(window);
+				window->session().api().resolveJumpToDate(
+					Dialogs::Key(peer->owner().history(peer)),
+					base::unixtime::parse(joinDate.toULongLong()).date(),
+					[=](not_null<PeerData*> p, MsgId m) {
+						const auto f = Window::SectionShow::Way::Forward;
+						if (const auto strong = weak.get()) {
+							strong->showPeerHistory(p, f, m);
+						}
+					});
+				return false;
+			}
 		} else if (SetClickContext<UrlClickHandler>(handler, context)) {
 			return false;
 		}
@@ -1022,14 +1505,16 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			v::text::data &&label,
 			rpl::producer<TextWithEntities> &&text,
 			const style::FlatLabel &textSt = st::infoLabeled,
-			const style::margins &padding = st::infoProfileLabeledPadding) {
+			const style::margins &padding = st::infoProfileLabeledPadding,
+			const style::PopupMenu &stMenu = st::defaultPopupMenu) {
 		auto line = CreateTextWithLabel(
 			result,
 			v::text::take_marked(std::move(label)),
 			std::move(text),
 			st::infoLabel,
 			textSt,
-			padding);
+			padding,
+			stMenu);
 		tracker.track(result->add(std::move(line.wrap)));
 
 		line.text->setClickHandlerFilter(infoClickFilter);
@@ -1039,44 +1524,55 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			v::text::data &&label,
 			rpl::producer<TextWithEntities> &&text,
 			const style::FlatLabel &textSt = st::infoLabeled,
-			const style::margins &padding = st::infoProfileLabeledPadding) {
+			const style::margins &padding = st::infoProfileLabeledPadding,
+			const style::PopupMenu &stMenu = st::defaultPopupMenu) {
 		return addInfoLineGeneric(
 			std::move(label),
 			std::move(text),
 			textSt,
-			padding);
+			padding,
+			stMenu);
 	};
 	const auto addInfoOneLine = [&](
 			v::text::data &&label,
 			rpl::producer<TextWithEntities> &&text,
 			const QString &contextCopyText,
-			const style::margins &padding = st::infoProfileLabeledPadding) {
+			const style::margins &padding = st::infoProfileLabeledPadding,
+			const style::PopupMenu &stMenu = st::defaultPopupMenu) {
 		auto result = addInfoLine(
 			std::move(label),
 			std::move(text),
 			st::infoLabeledOneLine,
-			padding);
+			padding,
+			stMenu);
 		result.text->setDoubleClickSelectsParagraph(true);
 		result.text->setContextCopyText(contextCopyText);
 		return result;
 	};
 	const auto fitLabelToButton = [&](
 			not_null<Ui::RpWidget*> button,
-			not_null<Ui::FlatLabel*> label) {
+			not_null<Ui::FlatLabel*> label,
+			int rightSkip) {
 		const auto parent = label->parentWidget();
+		const auto container = result;
 		rpl::combine(
+			container->widthValue(),
 			label->geometryValue(),
-			button->sizeValue()
-		) | rpl::start_with_next([=](const QRect &, const QSize &buttonSize) {
-			const auto s = parent->size();
+			button->sizeValue(),
+			button->shownValue()
+		) | rpl::on_next([=](
+				int width,
+				QRect,
+				QSize buttonSize,
+				bool buttonShown) {
 			button->moveToRight(
-				0,
-				(s.height() - buttonSize.height()) / 2);
-			label->resizeToWidth(
-				s.width()
-					- label->geometry().left()
-					- st::lineWidth * 2
-					- buttonSize.width());
+				rightSkip,
+				(parent->height() - buttonSize.height()) / 2);
+			const auto x = Ui::MapFrom(container, label, QPoint(0, 0)).x();
+			const auto s = buttonShown
+				? Ui::MapFrom(container, button, QPoint(0, 0)).x()
+				: width;
+			label->resizeToWidth(s - x);
 		}, button->lifetime());
 	};
 	const auto controller = _controller->parentController();
@@ -1094,8 +1590,13 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 				[=] {
 					TextUtilities::SetClipboardText({ url });
 					if (const auto strong = weak.get()) {
-						strong->showToast(
-							tr::lng_channel_public_link_copied(tr::now));
+						strong->showToast({
+							.text = {
+								tr::lng_channel_public_link_copied(tr::now),
+							},
+							.iconLottie = u"toast/voip_invite"_q,
+							.iconLottieSize = st::toastLottieIconSize,
+						});
 					}
 				});
 			request.menu->addAction(
@@ -1147,27 +1648,42 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 		{
 			const auto phoneLabel = addInfoOneLine(
 				tr::lng_info_mobile_label(),
-				PhoneOrHiddenValue(user),
-				tr::lng_profile_copy_phone(tr::now)).text;
+				PhoneWithSpoilerValue(user, PhoneOrHiddenValue(user)),
+				tr::lng_profile_copy_phone(tr::now),
+				st::infoProfileLabeledPadding,
+				st::popupMenuWithIcons).text;
 			const auto hook = [=](Ui::FlatLabel::ContextMenuRequest request) {
-				phoneLabel->fillContextMenu(request);
+				if (request.selection.empty()) {
+					const auto callback = [=] {
+						CopyPhoneToClipboard(PhoneOrHiddenValue(user));
+					};
+					request.menu->addAction(
+						tr::lng_profile_copy_phone(tr::now),
+						callback,
+						&st::menuIconCopy);
+				} else {
+					phoneLabel->fillContextMenu(request);
+				}
 				AddPhoneMenu(request.menu, user);
+				AddPhoneSpoilerMenu(request.menu, user);
 			};
 			phoneLabel->setContextMenuHook(hook);
 		}
 		auto label = user->isBot()
 			? tr::lng_info_about_label()
 			: tr::lng_info_bio_label();
-		addTranslateToMenu(
-			addInfoLine(std::move(label), AboutWithIdValue(user)).text,
-			AboutWithIdValue(user));
+		const auto about = addInfoLine(
+			std::move(label),
+			AboutWithAdvancedValue(user));
+		addTranslateToMenu(about.text, AboutWithAdvancedValue(user));
+		SetupAboutPeerIdDrag(about.text, user);
 
 		const auto usernameLine = addInfoOneLine(
 			UsernamesSubtext(_peer, tr::lng_info_username_label()),
 			UsernameValue(user, true) | rpl::map([=](TextWithEntities u) {
 				return u.text.isEmpty()
 					? TextWithEntities()
-					: Ui::Text::Link(u, UsernameUrl(user, u.text.mid(1)));
+					: tr::link(u, UsernameUrl(user, u.text.mid(1)));
 			}),
 			QString(),
 			st::infoProfileLabeledUsernamePadding);
@@ -1179,22 +1695,45 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 		usernameLine.subtext->overrideLinkClickHandler(callback);
 		usernameLine.text->setContextMenuHook(lnkHook);
 		usernameLine.subtext->setContextMenuHook(lnkHook);
+		UsernameValue(
+			user,
+			true
+		) | rpl::on_next([=, label = usernameLine.text](
+				const TextWithEntities &u) {
+			if (u.text.isEmpty()) {
+				return;
+			}
+			const auto username = u.text.mid(1);
+			label->setLink(1, std::make_shared<DraggableUrlClickHandler>(
+				UsernameUrl(user, username),
+				user->session().createInternalLinkFull(username)));
+		}, usernameLine.text->lifetime());
 
 		const auto qrButton = Ui::CreateChild<Ui::IconButton>(
 			usernameLine.text->parentWidget(),
 			st::infoProfileLabeledButtonQr);
-		fitLabelToButton(qrButton, usernameLine.text);
-		fitLabelToButton(qrButton, usernameLine.subtext);
-		qrButton->setClickedCallback([=] {
-			controller->show(
-				Box(Ui::FillPeerQrBox, user, std::nullopt, nullptr));
+		qrButton->setAccessibleName(tr::lng_group_invite_context_qr(tr::now));
+		UsernamesValue(_peer) | rpl::on_next([=](const auto &u) {
+			qrButton->setVisible(!u.empty());
+		}, qrButton->lifetime());
+		const auto rightSkip = st::infoProfileLabeledButtonQrRightSkip;
+		fitLabelToButton(qrButton, usernameLine.text, rightSkip);
+		fitLabelToButton(qrButton, usernameLine.subtext, rightSkip);
+		qrButton->setClickedCallback([=, show = controller->uiShow()] {
+			Ui::DefaultShowFillPeerQrBoxCallback(show, user);
 			return false;
 		});
 
 		if (!user->isBot()) {
 			tracker.track(result->add(
-				CreateBirthday(result, controller, user)));
-			tracker.track(result->add(CreateWorkingHours(result, user)));
+				CreateBirthday(result, controller, user),
+				{},
+				style::al_justify));
+			tracker.track(result->add(
+				CreateWorkingHours(result, user), {}, style::al_justify));
+
+			tracker.track(result->add(
+				CreateNotes(result, controller, user), {}, style::al_justify));
 
 			auto locationText = user->session().changes().peerFlagsValue(
 				user,
@@ -1206,7 +1745,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 				} else if (!details.location.point) {
 					return TextWithEntities{ details.location.address };
 				}
-				return Ui::Text::Link(
+				return tr::link(
 					TextUtilities::SingleLine(details.location.address),
 					LocationClickHandler::Url(*details.location.point));
 			});
@@ -1216,13 +1755,6 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 				QString()
 			).text->setLinksTrusted();
 		}
-
-		AddMainButton(
-			result,
-			tr::lng_info_add_as_contact(),
-			CanAddContactValue(user),
-			[=] { controller->window().show(Box(EditContactBox, controller, user)); },
-			tracker);
 	} else {
 		const auto topicRootId = _topic ? _topic->rootId() : 0;
 		const auto addToLink = topicRootId
@@ -1230,12 +1762,13 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			: QString();
 		auto linkText = LinkValue(
 			_peer,
-			true
+			true,
+			topicRootId
 		) | rpl::map([=](const LinkWithUrl &link) {
 			const auto text = link.text;
 			return text.isEmpty()
 				? TextWithEntities()
-				: Ui::Text::Link(
+				: tr::link(
 					(text.startsWith(u"https://"_q)
 						? text.mid(u"https://"_q.size())
 						: text) + addToLink,
@@ -1243,7 +1776,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 		});
 		const auto linkLine = addInfoOneLine(
 			(topicRootId
-				? tr::lng_info_link_label(Ui::Text::WithEntities)
+				? TopicSubtext(_peer)
 				: UsernamesSubtext(_peer, tr::lng_info_link_label())),
 			std::move(linkText),
 			QString());
@@ -1256,15 +1789,32 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 		linkLine.subtext->overrideLinkClickHandler(linkCallback);
 		linkLine.text->setContextMenuHook(lnkHook);
 		linkLine.subtext->setContextMenuHook(lnkHook);
-		{
+		LinkValue(
+			_peer,
+			true,
+			topicRootId
+		) | rpl::on_next([=, label = linkLine.text](const LinkWithUrl &link) {
+			if (link.text.isEmpty()) {
+				return;
+			}
+			label->setLink(1, std::make_shared<DraggableUrlClickHandler>(
+				addToLink.isEmpty() ? link.url : (link.text + addToLink),
+				link.text + addToLink));
+		}, linkLine.text->lifetime());
+		if (!topicRootId || !_peer->username().isEmpty()) {
 			const auto qr = Ui::CreateChild<Ui::IconButton>(
 				linkLine.text->parentWidget(),
 				st::infoProfileLabeledButtonQr);
-			fitLabelToButton(qr, linkLine.text);
-			fitLabelToButton(qr, linkLine.subtext);
-			qr->setClickedCallback([=, peer = _peer] {
-				controller->show(
-					Box(Ui::FillPeerQrBox, peer, std::nullopt, nullptr));
+			qr->setAccessibleName(tr::lng_group_invite_context_qr(tr::now));
+			UsernamesValue(_peer) | rpl::on_next([=](const auto &u) {
+				qr->setVisible(!u.empty());
+			}, qr->lifetime());
+			const auto rightSkip = st::infoProfileLabeledButtonQrRightSkip;
+			fitLabelToButton(qr, linkLine.text, rightSkip);
+			fitLabelToButton(qr, linkLine.subtext, rightSkip);
+			const auto peer = _peer;
+			qr->setClickedCallback([=, show = controller->uiShow()] {
+				Ui::DefaultShowFillPeerQrBoxCallback(show, peer);
 				return false;
 			});
 		}
@@ -1274,7 +1824,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 				channel
 			) | rpl::map([](const ChannelLocation *location) {
 				return location
-					? Ui::Text::Link(
+					? tr::link(
 						TextUtilities::SingleLine(location->address),
 						LocationClickHandler::Url(location->point))
 					: TextWithEntities();
@@ -1288,49 +1838,29 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 
 		const auto about = addInfoLine(tr::lng_info_about_label(), _topic
 			? rpl::single(TextWithEntities())
-			: AboutWithIdValue(_peer));
+			: AboutWithAdvancedValue(_peer));
 		if (!_topic) {
-			addTranslateToMenu(about.text, AboutWithIdValue(_peer));
+			addTranslateToMenu(about.text, AboutWithAdvancedValue(_peer));
+			SetupAboutPeerIdDrag(about.text, _peer);
 		}
 	}
-	if (!_peer->isSelf()) {
-		// No notifications toggle for Self => no separator.
-
-		const auto user = _peer->asUser();
-		const auto app = user && user->botInfo && user->botInfo->hasMainApp;
-		const auto padding = app
-			? QMargins(
-				st::infoOpenAppMargin.left(),
-				st::infoProfileSeparatorPadding.top(),
-				st::infoOpenAppMargin.right(),
-				0)
-			: st::infoProfileSeparatorPadding;
-
-		result->add(object_ptr<Ui::SlideWrap<>>(
-			result,
-			object_ptr<Ui::PlainShadow>(result),
-			padding)
-		)->setDuration(
-			st::infoSlideDuration
-		)->toggleOn(
-			std::move(tracker).atLeastOneShownValue()
-		);
-	}
-	object_ptr<FloatingIcon>(
-		result,
-		st::infoIconInformation,
-		st::infoInformationIconPosition);
+	raw->toggleOn(tracker.atLeastOneShownValue());
+	raw->finishAnimating();
 
-	return result;
+	return Section{
+		.widget = std::move(wrap),
+		.shown = raw->toggledValue(),
+	};
 }
 
-object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
-		not_null<UserData*> user) {
+Section DetailsFiller::makePersonalChannel(not_null<UserData*> user) {
+	const auto parent = _stack->layout();
 	auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-		_wrap,
-		object_ptr<Ui::VerticalLayout>(_wrap));
+		parent,
+		object_ptr<Ui::VerticalLayout>(parent));
 	const auto container = result->entity();
 	const auto window = _controller->parentController();
+	const auto duration = st::slideWrapDuration;
 
 	result->toggleOn(PersonalChannelValue(
 		user
@@ -1343,41 +1873,65 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 
 	const auto channelLabelFactory = [=](rpl::producer<ChannelData*> c) {
 		return rpl::combine(
-			tr::lng_info_personal_channel_label(Ui::Text::WithEntities),
+			tr::lng_info_personal_channel_label(tr::marked),
 			std::move(c)
 		) | rpl::map([](TextWithEntities &&text, ChannelData *channel) {
 			const auto count = channel ? channel->membersCount() : 0;
 			if (count > 1) {
-				text.append(
-					QString::fromUtf8(" \xE2\x80\xA2 ")
-				).append(tr::lng_chat_status_subscribers(
-					tr::now,
-					lt_count_decimal,
-					count));
+				text.append(' ')
+				.append(Ui::kQBullet)
+				.append(' ')
+				.append(
+					tr::lng_chat_status_subscribers(
+						tr::now,
+						lt_count_decimal,
+						count));
 			}
 			return text;
 		});
 	};
+	if (user->isSelf()) {
+		struct State {
+			base::unique_qptr<Ui::PopupMenu> menu;
+		};
+		const auto state = container->lifetime().make_state<State>();
+		base::install_event_filter(container, [=](
+				not_null<QEvent*> e) {
+			if (e->type() == QEvent::ContextMenu) {
+				const auto ce = static_cast<QContextMenuEvent*>(e.get());
+				state->menu = base::make_unique_q<Ui::PopupMenu>(
+					container,
+					st::defaultPopupMenu);
+				state->menu->addAction(
+					tr::lng_settings_channel_menu_remove(tr::now),
+					[] {
+						UrlClickHandler::Open(
+							u"internal:edit_personal_channel:remove"_q);
+					});
+				state->menu->popup(ce->globalPos());
+				return base::EventFilterResult::Cancel;
+			}
+			return base::EventFilterResult::Continue;
+		}, container->lifetime());
+	}
 
 	{
 		const auto onlyChannelWrap = container->add(
 			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 				container,
 				object_ptr<Ui::VerticalLayout>(container)));
-		onlyChannelWrap->toggleOn(PersonalChannelValue(user) | rpl::map([=] {
+		onlyChannelWrap->toggleOn(rpl::duplicate(channel) | rpl::map([=] {
 			return user->personalChannelId()
 				&& !user->personalChannelMessageId();
 		}));
 		onlyChannelWrap->finishAnimating();
 
-		Ui::AddDivider(onlyChannelWrap->entity());
-
 		auto text = rpl::duplicate(
 			channel
 		) | rpl::map([=](ChannelData *channel) {
 			return channel ? NameValue(channel) : rpl::single(QString());
 		}) | rpl::flatten_latest() | rpl::map([](const QString &name) {
-			return name.isEmpty() ? TextWithEntities() : Ui::Text::Link(name);
+			return name.isEmpty() ? TextWithEntities() : tr::link(name);
 		});
 		auto line = CreateTextWithLabel(
 			result,
@@ -1385,7 +1939,7 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 			std::move(text),
 			st::infoLabel,
 			st::infoLabeled,
-			st::infoProfileLabeledPadding);
+			st::infoProfilePersonalChannelPadding);
 		onlyChannelWrap->entity()->add(std::move(line.wrap));
 
 		line.text->setClickHandlerFilter([=](
@@ -1408,13 +1962,16 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 				container,
 				object_ptr<Ui::VerticalLayout>(container)));
-		messageChannelWrap->toggleOn(PersonalChannelValue(
-			user
-		) | rpl::map([=] {
+		messageChannelWrap->setDuration(duration);
+		messageChannelWrap->toggleOn(rpl::duplicate(channel) | rpl::map([=] {
 			return user->personalChannelId()
 				&& user->personalChannelMessageId();
 		}));
 		messageChannelWrap->finishAnimating();
+		messageChannelWrap->toggledValue(
+		) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
+			messageChannelWrap->resizeToWidth(messageChannelWrap->width());
+		}, messageChannelWrap->lifetime());
 
 		const auto clear = [=] {
 			while (messageChannelWrap->entity()->count()) {
@@ -1426,12 +1983,10 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 				not_null<HistoryItem*> item,
 				anim::type animated) {
 			const auto &stUserpic = st::infoPersonalChannelUserpic;
-			const auto &stLabeled = st::infoProfileLabeledPadding;
+			const auto &stLabeled = st::infoProfilePersonalChannelPadding;
 
 			messageChannelWrap->toggle(false, anim::type::instant);
 			clear();
-			Ui::AddDivider(messageChannelWrap->entity());
-			Ui::AddSkip(messageChannelWrap->entity());
 
 			const auto inner = messageChannelWrap->entity()->add(
 				object_ptr<Ui::VerticalLayout>(messageChannelWrap->entity()));
@@ -1464,17 +2019,28 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 			const auto preview = Ui::CreateChild<Ui::RpWidget>(line);
 			auto &lifetime = preview->lifetime();
 			using namespace Dialogs::Ui;
-			const auto previewView = lifetime.make_state<MessageView>();
-			const auto previewUpdate = [=] { preview->update(); };
+			struct State {
+				MessageView view;
+				HistoryItem *item = nullptr;
+				rpl::lifetime lifetime;
+			};
+			const auto state = lifetime.make_state<State>();
+			state->item = item;
+			item->history()->session().changes().realtimeMessageUpdates(
+				Data::MessageUpdate::Flag::Destroyed
+			) | rpl::on_next([=](const Data::MessageUpdate &update) {
+				if (update.item == state->item) {
+					state->lifetime.destroy();
+					state->item = nullptr;
+					preview->update();
+				}
+			}, state->lifetime);
+
 			preview->resize(0, st::infoLabeled.style.font->height);
-			if (!previewView->dependsOn(item)) {
-				previewView->prepare(item, nullptr, previewUpdate, {});
-			}
 			preview->paintRequest(
-			) | rpl::start_with_next([=, fullId = item->fullId()](
-					const QRect &rect) {
+			) | rpl::on_next([=] {
 				auto p = Painter(preview);
-				const auto item = user->session().data().message(fullId);
+				const auto item = state->item;
 				if (!item) {
 					p.setPen(st::infoPersonalChannelDateLabel.textFg);
 					p.setBrush(Qt::NoBrush);
@@ -1485,30 +2051,27 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 						style::al_left);
 					return;
 				}
-				if (previewView->prepared(item, nullptr)) {
-					previewView->paint(p, preview->rect(), {
-						.st = &st::defaultDialogRow,
-						.currentBg = st::boxBg->b,
-					});
-				} else if (!previewView->dependsOn(item)) {
-					p.setPen(st::infoPersonalChannelDateLabel.textFg);
-					p.setBrush(Qt::NoBrush);
-					p.setFont(st::infoPersonalChannelDateLabel.style.font);
-					p.drawText(
-						preview->rect(),
-						tr::lng_contacts_loading(tr::now),
-						style::al_left);
-					previewView->prepare(item, nullptr, previewUpdate, {});
-					preview->update();
+				if (!state->view.prepared(item, nullptr, nullptr)) {
+					const auto repaint = [=] { preview->update(); };
+					state->view.prepare(
+						item,
+						nullptr,
+						nullptr,
+						repaint,
+						{});
 				}
+				state->view.paint(p, preview->rect(), {
+					.st = &st::defaultDialogRow,
+					.currentBg = st::boxBg->b,
+				});
 			}, preview->lifetime());
 
-			line->sizeValue(
-			) | rpl::start_with_next([=](const QSize &size) {
+			line->sizeValue() | rpl::filter_size(
+			) | rpl::on_next([=](const QSize &size) {
 				const auto left = stLabeled.left();
 				const auto right = st::infoPersonalChannelDateSkip;
 				const auto top = stLabeled.top();
-				date->moveToRight(right, top);
+				date->moveToRight(right, top, size.width());
 
 				name->resizeToWidth(size.width()
 					- left
@@ -1533,34 +2096,67 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 							rpl::single(item->history()->peer->asChannel())),
 						st::infoLabel),
 					QMargins(
-						st::infoProfileLabeledPadding.left(),
+						st::infoProfilePersonalChannelPadding.left(),
 						0,
-						st::infoProfileLabeledPadding.right(),
-						st::infoProfileLabeledPadding.bottom()));
+						st::infoProfilePersonalChannelPadding.right(),
+						st::infoProfilePersonalChannelPadding.bottom()));
 			}
 			{
-				const auto button = Ui::CreateChild<Ui::RippleButton>(
+				const auto button = Ui::CreateSimpleRectButton(
 					messageChannelWrap->entity(),
 					st::defaultRippleAnimation);
-				button->paintRequest(
-				) | rpl::start_with_next([=](const QRect &rect) {
-					auto p = QPainter(button);
-					button->paintRipple(p, 0, 0);
-				}, button->lifetime());
 				inner->geometryValue(
-				) | rpl::start_with_next([=](const QRect &rect) {
+				) | rpl::on_next([=](const QRect &rect) {
 					button->setGeometry(rect);
 				}, button->lifetime());
-				button->setClickedCallback([=, msg = item->fullId().msg] {
+				const auto channelPeer = item->history()->peer;
+				const auto msg = item->fullId().msg;
+				const auto openInWindow = [=] {
+					window->showInNewWindow(
+						Window::SeparateId(channelPeer),
+						msg);
+				};
+				const auto openInCurrent = [=] {
 					window->showPeerHistory(
-						item->history()->peer,
+						channelPeer,
 						Window::SectionShow::Way::Forward,
 						msg);
+				};
+				button->setAcceptBoth();
+				struct State {
+					base::unique_qptr<Ui::PopupMenu> menu;
+				};
+				const auto state
+					= button->lifetime().make_state<State>();
+				button->addClickHandler([=](Qt::MouseButton mouse) {
+					if (mouse == Qt::RightButton) {
+						state->menu = base::make_unique_q<Ui::PopupMenu>(
+							button,
+							st::popupMenuWithIcons);
+						state->menu->addAction(
+							tr::lng_context_new_window(tr::now),
+							[=] {
+								base::call_delayed(
+									st::popupMenuWithIcons.showDuration,
+									crl::guard(button, openInWindow));
+							},
+							&st::menuIconNewWindow);
+						state->menu->popup(QCursor::pos());
+						return;
+					}
+					if (base::IsCtrlPressed()
+						|| mouse == Qt::MiddleButton) {
+						openInWindow();
+					} else {
+						openInCurrent();
+					}
 				});
 				button->lower();
+				inner->lifetime().make_state<base::unique_qptr<Ui::RpWidget>>(
+					button);
+				button->setAccessibleName(tr::lng_profile_view_channel(tr::now));
 			}
 			inner->setAttribute(Qt::WA_TransparentForMouseEvents);
-			Ui::AddSkip(messageChannelWrap->entity());
 
 			Ui::ToggleChildrenVisibility(messageChannelWrap->entity(), true);
 			Ui::ToggleChildrenVisibility(line, true);
@@ -1569,8 +2165,12 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 
 		rpl::duplicate(
 			channel
-		) | rpl::start_with_next([=](ChannelData *channel) {
-			clear();
+		) | rpl::on_next([=](ChannelData *channel) {
+			if (!channel && messageChannelWrap->animating()) {
+				base::call_delayed(duration, messageChannelWrap, clear);
+			} else {
+				clear();
+			}
 			if (!channel) {
 				return;
 			}
@@ -1591,70 +2191,29 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupPersonalChannel(
 		}, messageChannelWrap->lifetime());
 	}
 
-	return result;
-}
-
-object_ptr<Ui::RpWidget> DetailsFiller::setupMuteToggle() {
-	const auto peer = _peer;
-	const auto topicRootId = _topic ? _topic->rootId() : MsgId();
-	const auto makeThread = [=] {
-		return topicRootId
-			? static_cast<Data::Thread*>(peer->forumTopicFor(topicRootId))
-			: peer->owner().history(peer).get();
+	const auto raw = result.data();
+	return Section{
+		.widget = std::move(result),
+		.shown = raw->toggledValue(),
 	};
-	auto result = object_ptr<Ui::SettingsButton>(
-		_wrap,
-		tr::lng_profile_enable_notifications(),
-		st::infoNotificationsButton);
-	result->toggleOn(_topic
-		? NotificationsEnabledValue(_topic)
-		: NotificationsEnabledValue(peer), true);
-	result->setAcceptBoth();
-	const auto notifySettings = &peer->owner().notifySettings();
-	MuteMenu::SetupMuteMenu(
-		result.data(),
-		result->clicks(
-		) | rpl::filter([=](Qt::MouseButton button) {
-			if (button == Qt::RightButton) {
-				return true;
-			}
-			const auto topic = topicRootId
-				? peer->forumTopicFor(topicRootId)
-				: nullptr;
-			Assert(!topicRootId || topic != nullptr);
-			const auto is = topic
-				? notifySettings->isMuted(topic)
-				: notifySettings->isMuted(peer);
-			if (is) {
-				if (topic) {
-					notifySettings->update(topic, { .unmute = true });
-				} else {
-					notifySettings->update(peer, { .unmute = true });
-				}
-				return false;
-			} else {
-				return true;
-			}
-		}) | rpl::to_empty,
-		makeThread,
-		_controller->uiShow());
-	object_ptr<FloatingIcon>(
-		result,
-		st::infoIconNotifications,
-		st::infoNotificationsIconPosition);
-	return result;
 }
 
-void DetailsFiller::setupMainApp() {
-	const auto button = _wrap->add(
+void DetailsFiller::addMainApp(not_null<UserData*> user) {
+	const auto parent = _stack->layout();
+	auto wrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		parent,
+		object_ptr<Ui::VerticalLayout>(parent));
+	const auto raw = wrap.data();
+	const auto inner = raw->entity();
+	const auto button = inner->add(
 		object_ptr<Ui::RoundButton>(
-			_wrap,
+			inner,
 			tr::lng_profile_open_app(),
 			st::infoOpenApp),
-		st::infoOpenAppMargin);
-	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+		st::infoOpenAppMargin,
+		style::al_justify);
+	button->setFullRadius(true);
 
-	const auto user = _peer->asUser();
 	const auto controller = _controller->parentController();
 	button->setClickedCallback([=] {
 		user->session().attachWebView().open({
@@ -1668,176 +2227,255 @@ void DetailsFiller::setupMainApp() {
 	});
 
 	const auto url = tr::lng_mini_apps_tos_url(tr::now);
-	Ui::AddDividerText(
-		_wrap,
+	auto textProducer = rpl::combine(
 		tr::lng_profile_open_app_about(
 			lt_terms,
-			tr::lng_profile_open_app_terms() | Ui::Text::ToLink(url),
-			Ui::Text::WithEntities)
-	)->setClickHandlerFilter([=](const auto &...) {
-		UrlClickHandler::Open(url);
-		return false;
+			tr::lng_profile_open_app_terms(tr::url(url)),
+			tr::marked),
+		user->session().changes().peerFlagsValue(
+			user,
+			Data::PeerUpdate::Flag::VerifyInfo)
+	) | rpl::map([=](TextWithEntities text, auto) {
+		if (const auto verify = user->botVerifyDetails()) {
+			text = text.append(u"\n\n"_q).append(verify->description);
+		}
+		return text;
+	});
+	auto setup = [url](not_null<Ui::FlatLabel*> label) {
+		label->setClickHandlerFilter([=](const auto &...) {
+			UrlClickHandler::Open(url);
+			return false;
+		});
+	};
+
+	_stack->add(Section{
+		.widget = std::move(wrap),
+		.shown = rpl::single(true),
 	});
-	Ui::AddSkip(_wrap);
+	_stack->addTextSeparator(
+		std::move(textProducer),
+		rpl::single(true),
+		std::move(setup));
 }
 
-void DetailsFiller::setupMainButtons() {
-	auto wrapButtons = [=](auto &&callback) {
-		auto topSkip = _wrap->add(CreateSlideSkipWidget(_wrap));
-		auto tracker = callback();
-		topSkip->toggleOn(std::move(tracker).atLeastOneShownValue());
+Section DetailsFiller::makeBotPermissions(not_null<UserData*> user) {
+	const auto parent = _stack->layout();
+	auto wrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		parent,
+		object_ptr<Ui::VerticalLayout>(parent));
+	const auto raw = wrap.data();
+	const auto inner = raw->entity();
+	AddSkip(inner);
+	AddSubsectionTitle(inner, tr::lng_profile_bot_permissions_title());
+	const auto emoji = inner->add(
+		object_ptr<Ui::SettingsButton>(
+			inner,
+			tr::lng_profile_bot_emoji_status_access(),
+			st::infoSharedMediaButton));
+	object_ptr<Profile::FloatingIcon>(
+		emoji,
+		st::infoIconEmojiStatusAccess,
+		st::infoSharedMediaButtonIconPosition);
+
+	emoji->toggleOn(
+		rpl::single(bool(user->botInfo->canManageEmojiStatus))
+	)->toggledValue() | rpl::filter([=](bool allowed) {
+		return allowed != user->botInfo->canManageEmojiStatus;
+	}) | rpl::on_next([=](bool allowed) {
+		user->botInfo->canManageEmojiStatus = allowed;
+		const auto session = &user->session();
+		session->api().request(MTPbots_ToggleUserEmojiStatusPermission(
+			user->inputUser(),
+			MTP_bool(allowed)
+		)).send();
+	}, emoji->lifetime());
+	AddSkip(inner);
+	return Section{
+		.widget = std::move(wrap),
+		.shown = rpl::single(true),
 	};
-	if (_topic) {
-		wrapButtons([=] {
-			return fillTopicButtons();
-		});
-	} else if (const auto user = _peer->asUser()) {
-		wrapButtons([=] {
-			return fillUserButtons(user);
-		});
-	} else if (const auto channel = _peer->asChannel()) {
-		if (!channel->isMegagroup()) {
-			wrapButtons([=] {
-				return fillChannelButtons(channel);
-			});
+}
+
+Section DetailsFiller::makeAddAsContact(not_null<UserData*> user) {
+	const auto parent = _stack->layout();
+	auto wrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		parent,
+		object_ptr<Ui::VerticalLayout>(parent));
+	const auto raw = wrap.data();
+	AddMainButton(
+		raw->entity(),
+		tr::lng_info_add_as_contact(),
+		CanAddContactValue(user),
+		[=, controller = _controller->parentController()] {
+			controller->uiShow()->show(
+				Box(EditContactBox, controller, user));
+		},
+		nullptr,
+		nullptr);
+	raw->toggleOn(CanAddContactValue(user));
+	return Section{
+		.widget = std::move(wrap),
+		.shown = raw->toggledValue(),
+	};
+}
+
+void DetailsFiller::addBotVerify() {
+	const auto peer = _peer.get();
+	auto shown = peer->session().changes().peerFlagsValue(
+		peer,
+		Data::PeerUpdate::Flag::VerifyInfo
+			| Data::PeerUpdate::Flag::FullInfo
+	) | rpl::map([=] {
+		const auto info = peer->botVerifyDetails();
+		if (!info || info->description.empty()) {
+			return false;
 		}
-	}
+		if (const auto user = peer->asUser()) {
+			if (user->botInfo && user->botInfo->hasMainApp) {
+				return false;
+			}
+		}
+		return true;
+	}) | rpl::distinct_until_changed();
+
+	auto description = peer->session().changes().peerFlagsValue(
+		peer,
+		Data::PeerUpdate::Flag::VerifyInfo
+	) | rpl::map([=] {
+		const auto info = peer->botVerifyDetails();
+		return info ? info->description : TextWithEntities();
+	});
+
+	_stack->addTextSeparator(std::move(description), std::move(shown));
 }
 
-void DetailsFiller::addReportReaction(Ui::MultiSlideTracker &tracker) {
+void DetailsFiller::addManagedBotFooter(not_null<UserData*> managerUser) {
+	const auto botUsername = managerUser->username();
+	const auto linkText = botUsername.isEmpty()
+		? managerUser->name()
+		: (u"@"_q + botUsername);
+	auto text = tr::lng_managed_bot_label(
+		lt_icon,
+		rpl::single(Ui::Text::IconEmoji(&st::managedBotIconEmoji)),
+		lt_bot,
+		rpl::single(tr::link(linkText)),
+		tr::marked);
+	const auto weak = base::make_weak(_controller);
+	auto setup = [=](not_null<Ui::FlatLabel*> label) {
+		label->setClickHandlerFilter([=](const auto &...) {
+			if (const auto strong = weak.get()) {
+				strong->showPeerInfo(managerUser);
+			}
+			return false;
+		});
+	};
+	_stack->addTextSeparator(
+		std::move(text),
+		rpl::single(true),
+		std::move(setup));
+}
+
+Section DetailsFiller::makeReportOrDeleteReaction() {
+	if (_peer->isSelf()) {
+		return Section{ .widget = nullptr };
+	}
+	auto result = Section{ .widget = nullptr };
 	v::match(_origin.data, [&](GroupReactionOrigin data) {
-		const auto user = _peer->asUser();
-		if (_peer->isSelf()) {
+		if (HistoryView::Reactions::CanModerateReactionByDeleteMessages(
+				data.group)) {
+			result = makeDeleteReactionSection(data);
 			return;
-#if 0 // Only public groups allow reaction reports for now.
-		} else if (const auto chat = data.group->asChat()) {
-			const auto ban = chat->canBanMembers()
-				&& (!user || !chat->admins.contains(_peer))
-				&& (!user || chat->creator != user->id);
-			addReportReaction(data, ban, tracker);
-#endif
-		} else if (const auto channel = data.group->asMegagroup()) {
-			if (channel->isPublic()) {
-				const auto ban = channel->canBanMembers()
-					&& (!user || !channel->mgInfo->admins.contains(user->id))
-					&& (!user || channel->mgInfo->creator != user);
-				addReportReaction(data, ban, tracker);
-			}
+		}
+		const auto capabilities = Api::GetReactionReportCapabilities(
+			data.group,
+			_peer);
+		if (capabilities.canReport) {
+			result = makeReportReactionSection(data, capabilities.canBan);
 		}
 	}, [](const auto &) {});
+	return result;
 }
 
-void DetailsFiller::addReportReaction(
+Section DetailsFiller::makeDeleteReactionSection(GroupReactionOrigin data) {
+	const auto parent = _stack->layout();
+	const auto peer = _peer;
+	const auto controller = _controller->parentController();
+	auto wrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		parent,
+		object_ptr<Ui::VerticalLayout>(parent));
+	const auto raw = wrap.data();
+	auto shown = rpl::single(true);
+	raw->toggleOn(rpl::duplicate(shown));
+	AddMainButton(
+		raw->entity(),
+		tr::lng_context_delete_this_reaction(),
+		std::move(shown),
+		[=] {
+			HistoryView::Reactions::ShowModerateReactionBox(
+				controller,
+				data.group,
+				data.messageId,
+				peer);
+		},
+		nullptr,
+		nullptr,
+		st::infoMainButtonAttention);
+	return Section{
+		.widget = std::move(wrap),
+		.shown = raw->toggledValue(),
+	};
+}
+
+Section DetailsFiller::makeReportReactionSection(
 		GroupReactionOrigin data,
-		bool ban,
-		Ui::MultiSlideTracker &tracker) {
+		bool ban) {
+	const auto parent = _stack->layout();
 	const auto peer = _peer;
-	if (!peer) {
-		return;
-	}
 	const auto controller = _controller->parentController();
 	const auto forceHidden = std::make_shared<rpl::variable<bool>>(false);
 	const auto user = peer->asUser();
+	auto wrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		parent,
+		object_ptr<Ui::VerticalLayout>(parent));
+	const auto raw = wrap.data();
 	auto shown = user
 		? rpl::combine(
 			Info::Profile::IsContactValue(user),
 			forceHidden->value(),
 			!rpl::mappers::_1 && !rpl::mappers::_2
-		) | rpl::type_erased()
+		) | rpl::type_erased
 		: (forceHidden->value() | rpl::map(!rpl::mappers::_1));
 	const auto sent = [=] {
 		*forceHidden = true;
 	};
+	raw->toggleOn(rpl::duplicate(shown));
 	AddMainButton(
-		_wrap,
+		raw->entity(),
 		(ban
 			? tr::lng_report_and_ban()
 			: tr::lng_report_reaction()),
 		std::move(shown),
 		[=] { controller->show(
 			Box(ReportReactionBox, controller, peer, data, ban, sent)); },
-		tracker,
+		nullptr,
+		nullptr,
 		st::infoMainButtonAttention);
-}
-
-Ui::MultiSlideTracker DetailsFiller::fillTopicButtons() {
-	using namespace rpl::mappers;
-
-	Ui::MultiSlideTracker tracker;
-	const auto window = _controller->parentController();
-
-	const auto forum = _topic->forum();
-	auto showTopicsVisible = rpl::combine(
-		window->adaptive().oneColumnValue(),
-		window->shownForum().value(),
-		_1 || (_2 != forum));
-	AddMainButton(
-		_wrap,
-		tr::lng_forum_show_topics_list(),
-		std::move(showTopicsVisible),
-		[=] { window->showForum(forum); },
-		tracker);
-	return tracker;
-}
-
-Ui::MultiSlideTracker DetailsFiller::fillUserButtons(
-		not_null<UserData*> user) {
-	using namespace rpl::mappers;
-
-	Ui::MultiSlideTracker tracker;
-	auto window = _controller->parentController();
-
-	auto addSendMessageButton = [&] {
-		auto activePeerValue = window->activeChatValue(
-		) | rpl::map([](Dialogs::Key key) {
-			return key.peer();
-		});
-		auto sendMessageVisible = rpl::combine(
-			_controller->wrapValue(),
-			std::move(activePeerValue),
-			(_1 != Wrap::Side) || (_2 != user));
-		auto sendMessage = [window, user] {
-			window->showPeerHistory(
-				user,
-				Window::SectionShow::Way::Forward);
-		};
-		AddMainButton(
-			_wrap,
-			tr::lng_profile_send_message(),
-			std::move(sendMessageVisible),
-			std::move(sendMessage),
-			tracker);
+	return Section{
+		.widget = std::move(wrap),
+		.shown = raw->toggledValue(),
 	};
-
-	if (user->isSelf()) {
-		auto separator = _wrap->add(object_ptr<Ui::SlideWrap<>>(
-			_wrap,
-			object_ptr<Ui::PlainShadow>(_wrap),
-			st::infoProfileSeparatorPadding)
-		)->setDuration(
-			st::infoSlideDuration
-		);
-
-		addSendMessageButton();
-
-		separator->toggleOn(
-			std::move(tracker).atLeastOneShownValue()
-		);
-	} else {
-		addSendMessageButton();
-	}
-
-	addReportReaction(tracker);
-
-	return tracker;
 }
 
-Ui::MultiSlideTracker DetailsFiller::fillChannelButtons(
-		not_null<ChannelData*> channel) {
+Section DetailsFiller::makeViewChannel(not_null<ChannelData*> channel) {
 	using namespace rpl::mappers;
 
-	Ui::MultiSlideTracker tracker;
-	auto window = _controller->parentController();
+	const auto parent = _stack->layout();
+	auto wrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		parent,
+		object_ptr<Ui::VerticalLayout>(parent));
+	const auto raw = wrap.data();
+
+	const auto window = _controller->parentController();
 	auto activePeerValue = window->activeChatValue(
 	) | rpl::map([](Dialogs::Key key) {
 		return key.peer();
@@ -1846,44 +2484,138 @@ Ui::MultiSlideTracker DetailsFiller::fillChannelButtons(
 		_controller->wrapValue(),
 		std::move(activePeerValue),
 		(_1 != Wrap::Side) || (_2 != channel));
-	auto viewChannel = [=] {
+	const auto openInWindow = [=] {
+		window->showInNewWindow(Window::SeparateId(channel));
+	};
+	const auto openInCurrent = [=] {
 		window->showPeerHistory(
 			channel,
 			Window::SectionShow::Way::Forward);
 	};
-	AddMainButton(
-		_wrap,
+	struct State {
+		base::unique_qptr<Ui::PopupMenu> menu;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+	auto viewChannel = [=](Qt::MouseButton mouse) {
+		if (mouse == Qt::RightButton) {
+			return;
+		}
+		if (base::IsCtrlPressed() || mouse == Qt::MiddleButton) {
+			openInWindow();
+		} else {
+			openInCurrent();
+		}
+	};
+	raw->toggleOn(rpl::duplicate(viewChannelVisible));
+	const auto button = AddMainButton(
+		raw->entity(),
 		tr::lng_profile_view_channel(),
 		std::move(viewChannelVisible),
 		std::move(viewChannel),
-		tracker);
+		nullptr,
+		nullptr);
+	button->setAcceptBoth();
+	button->addClickHandler([=](Qt::MouseButton mouse) {
+		if (mouse != Qt::RightButton) {
+			return;
+		}
+		state->menu = base::make_unique_q<Ui::PopupMenu>(
+			button,
+			st::popupMenuWithIcons);
+		state->menu->addAction(
+			tr::lng_context_new_window(tr::now),
+			[=] {
+				base::call_delayed(
+					st::popupMenuWithIcons.showDuration,
+					crl::guard(button, openInWindow));
+			},
+			&st::menuIconNewWindow);
+		state->menu->popup(QCursor::pos());
+	});
+	return Section{
+		.widget = std::move(wrap),
+		.shown = raw->toggledValue(),
+	};
+}
+
+Section DetailsFiller::makeTopicsList(not_null<Data::Forum*> forum) {
+	using namespace rpl::mappers;
 
-	return tracker;
+	const auto parent = _stack->layout();
+	auto wrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		parent,
+		object_ptr<Ui::VerticalLayout>(parent));
+	const auto raw = wrap.data();
+	const auto window = _controller->parentController();
+	const auto peer = forum->peer();
+	auto showTopicsVisible = rpl::combine(
+		window->adaptive().oneColumnValue(),
+		window->shownForum().value(),
+		_1 || (_2 != forum));
+	const auto callback = [=] {
+		if (const auto forum = peer->forum()) {
+			if (peer->useSubsectionTabs()) {
+				window->searchInChat(forum->history());
+			} else {
+				window->showForum(forum);
+			}
+		}
+	};
+	raw->toggleOn(rpl::duplicate(showTopicsVisible));
+	AddMainButton(
+		raw->entity(),
+		(forum->peer()->isBot()
+			? tr::lng_bot_show_threads_list()
+			: tr::lng_forum_show_topics_list()),
+		std::move(showTopicsVisible),
+		callback,
+		nullptr,
+		nullptr);
+	return Section{
+		.widget = std::move(wrap),
+		.shown = raw->toggledValue(),
+	};
 }
 
-object_ptr<Ui::RpWidget> DetailsFiller::fill() {
+void DetailsFiller::buildSections() {
 	Expects(!_topic || !_topic->creating());
 
-	if (const auto user = _peer->asUser()) {
-		add(setupPersonalChannel(user));
+	if (const auto user = _sublist ? nullptr : _peer->asUser()) {
+		_stack->add(makePersonalChannel(user));
+		_stack->addPlainSeparator();
 	}
-	add(object_ptr<Ui::BoxContentDivider>(_wrap));
-	add(CreateSkipWidget(_wrap));
-	add(setupInfo());
+	_stack->add(makeInfo());
 	if (const auto user = _peer->asUser()) {
+		_stack->add(makeAddAsContact(user));
+		addBotVerify();
 		if (const auto info = user->botInfo.get()) {
 			if (info->hasMainApp) {
-				setupMainApp();
+				addMainApp(user);
+			}
+			if (info->canManageEmojiStatus) {
+				_stack->add(makeBotPermissions(user));
+			}
+			if (const auto id = user->botManagerId()) {
+				if (const auto mgr = user->owner().userLoaded(id)) {
+					addManagedBotFooter(mgr);
+				}
 			}
 		}
+		if (!_sublist) {
+			auto reactionSection = makeReportOrDeleteReaction();
+			if (reactionSection.widget) {
+				_stack->add(std::move(reactionSection));
+			}
+		}
+	} else if (const auto channel = _peer->asChannel()) {
+		addBotVerify();
+		if (!channel->isMegagroup()) {
+			_stack->add(makeViewChannel(channel));
+		}
+		if (const auto forum = channel->forum()) {
+			_stack->add(makeTopicsList(forum));
+		}
 	}
-	if (!_peer->isSelf()) {
-		add(setupMuteToggle());
-	}
-	setupMainButtons();
-	add(CreateSkipWidget(_wrap));
-
-	return std::move(_wrap);
 }
 
 ActionsFiller::ActionsFiller(
@@ -1895,6 +2627,100 @@ ActionsFiller::ActionsFiller(
 , _peer(peer) {
 }
 
+void ActionsFiller::addAffiliateProgram(not_null<UserData*> user) {
+	if (!user->isBot()) {
+		return;
+	}
+
+	const auto wrap = _wrap->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			_wrap.data(),
+			object_ptr<Ui::VerticalLayout>(_wrap.data())));
+	const auto inner = wrap->entity();
+	auto program = user->session().changes().peerFlagsValue(
+		user,
+		Data::PeerUpdate::Flag::StarRefProgram
+	) | rpl::map([=] {
+		return user->botInfo->starRefProgram;
+	}) | rpl::start_spawning(inner->lifetime());
+	auto commission = rpl::duplicate(
+		program
+	) | rpl::filter([=](StarRefProgram program) {
+		return program.commission > 0;
+	}) | rpl::map([=](StarRefProgram program) {
+		return Info::BotStarRef::FormatCommission(program.commission);
+	});
+	const auto show = _controller->uiShow();
+
+	struct StarRefRecipients {
+		std::vector<not_null<PeerData*>> list;
+		bool requested = false;
+		Fn<void()> open;
+	};
+	const auto recipients = std::make_shared<StarRefRecipients>();
+	recipients->open = [=] {
+		if (!recipients->list.empty()) {
+			const auto program = user->botInfo->starRefProgram;
+			show->show(Info::BotStarRef::JoinStarRefBox(
+				{ user, { program } },
+				user->session().user(),
+				recipients->list));
+		} else if (!recipients->requested) {
+			recipients->requested = true;
+			const auto done = [=](std::vector<not_null<PeerData*>> list) {
+				recipients->list = std::move(list);
+				recipients->open();
+			};
+			Info::BotStarRef::ResolveRecipients(&user->session(), done);
+		}
+	};
+
+	inner->add(EditPeerInfoBox::CreateButton(
+		inner,
+		tr::lng_manage_peer_bot_star_ref(),
+		rpl::duplicate(commission),
+		recipients->open,
+		st::infoSharedMediaCountButton,
+		{ .icon = &st::menuIconSharing }));
+	Ui::AddSkip(inner);
+	Ui::AddDividerText(
+		inner,
+		tr::lng_manage_peer_bot_star_ref_about(
+			lt_bot,
+			rpl::single(TextWithEntities{ user->name() }),
+			lt_amount,
+			rpl::duplicate(commission) | rpl::map(tr::marked),
+			tr::rich));
+	Ui::AddSkip(inner);
+
+	wrap->toggleOn(std::move(
+		program
+	) | rpl::map([](StarRefProgram program) {
+		return program.commission > 0;
+	}));
+	wrap->finishAnimating();
+}
+
+void ActionsFiller::addBalanceActions(not_null<UserData*> user) {
+	const auto wrap = _wrap->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			_wrap.data(),
+			object_ptr<Ui::VerticalLayout>(_wrap.data())));
+	const auto inner = wrap->entity();
+	Ui::AddSubsectionTitle(inner, tr::lng_manage_peer_bot_balance());
+	auto currencyBalance = AddCurrencyAction(user, inner, _controller);
+	auto creditsBalance = AddCreditsAction(user, inner, _controller);
+	Ui::AddSkip(inner);
+	Ui::AddDivider(inner);
+	Ui::AddSkip(inner);
+	wrap->toggleOn(
+		rpl::combine(
+			std::move(currencyBalance),
+			std::move(creditsBalance)
+		) | rpl::map((rpl::mappers::_1 > CreditsAmount(0))
+			|| (rpl::mappers::_2 > CreditsAmount(0))));
+}
+
 void ActionsFiller::addInviteToGroupAction(not_null<UserData*> user) {
 	const auto notEmpty = [](const QString &value) {
 		return !value.isEmpty();
@@ -1919,59 +2745,6 @@ void ActionsFiller::addInviteToGroupAction(not_null<UserData*> user) {
 	about->finishAnimating();
 }
 
-void ActionsFiller::addCreditsAction(not_null<UserData*> user) {
-	struct State final {
-		rpl::variable<uint64> balance;
-	};
-	const auto state = _wrap->lifetime().make_state<State>();
-	const auto controller = _controller->parentController();
-	const auto wrap = AddActionButton(
-		_wrap,
-		tr::lng_manage_peer_bot_balance(),
-		state->balance.value() | rpl::map(rpl::mappers::_1 > 0),
-		[=] { controller->showSection(Info::BotEarn::Make(user)); },
-		&st::infoIconBotBalance);
-	if (const auto balance = user->session().credits().balance(user->id)) {
-		state->balance = balance;
-	}
-	{
-		const auto api = _wrap->lifetime().make_state<Api::CreditsStatus>(
-			user);
-		api->request({}, [=](Data::CreditsStatusSlice data) {
-			state->balance = data.balance;
-		});
-	}
-	const auto &st = st::infoSharedMediaButton;
-	const auto button = wrap->entity();
-	const auto name = Ui::CreateChild<Ui::FlatLabel>(button, st.rightLabel);
-	name->show();
-	rpl::combine(
-		button->widthValue(),
-		tr::lng_manage_peer_bot_balance(),
-		state->balance.value()
-	) | rpl::start_with_next([=, &st](
-			int width,
-			const QString &button,
-			uint64 balance) {
-		const auto available = width
-			- rect::m::sum::h(st.padding)
-			- st.style.font->width(button)
-			- st::settingsButtonRightSkip;
-		name->setMarkedText(
-			user->owner().customEmojiManager().creditsEmoji()
-				.append(QChar(' '))
-				.append(QString::number(balance)),
-			Core::MarkedTextContext{
-				.session = &user->session(),
-				.customEmojiRepaint = [=] { name->update(); },
-			});
-		name->resizeToNaturalWidth(available);
-		name->moveToRight(st::settingsButtonRightSkip, st.padding.top());
-	}, name->lifetime());
-	name->setAttribute(Qt::WA_TransparentForMouseEvents);
-	wrap->finishAnimating();
-}
-
 void ActionsFiller::addShareContactAction(not_null<UserData*> user) {
 	const auto controller = _controller->parentController();
 	AddActionButton(
@@ -1984,11 +2757,17 @@ void ActionsFiller::addShareContactAction(not_null<UserData*> user) {
 
 void ActionsFiller::addEditContactAction(not_null<UserData*> user) {
 	const auto controller = _controller->parentController();
+	const auto edit = [=] {
+		if (controller->showFrozenError()) {
+			return;
+		}
+		controller->window().show(Box(EditContactBox, controller, user));
+	};
 	AddActionButton(
 		_wrap,
 		tr::lng_info_edit_contact(),
 		IsContactValue(user),
-		[=] { controller->window().show(Box(EditContactBox, controller, user)); },
+		edit,
 		&st::infoIconEdit);
 }
 
@@ -2002,7 +2781,36 @@ void ActionsFiller::addDeleteContactAction(not_null<UserData*> user) {
 		&st::infoIconDelete);
 }
 
+void ActionsFiller::addFastButtonsMode(not_null<UserData*> user) {
+	Expects(user->isBot());
+
+	const auto bots = &user->session().fastButtonsBots();
+	const auto button = _wrap->add(object_ptr<Ui::SettingsButton>(
+		_wrap,
+		rpl::single(u"Fast buttons mode"_q),
+		st::infoSharedMediaButton));
+	object_ptr<Info::Profile::FloatingIcon>(
+		button,
+		st::infoIconMediaBot,
+		st::infoSharedMediaButtonIconPosition);
+
+	AddSkip(_wrap);
+	AddDivider(_wrap);
+	AddSkip(_wrap);
+
+	button->toggleOn(bots->enabledValue(user));
+	button->toggledValue(
+	) | rpl::filter([=](bool value) {
+		return value != bots->enabled(user);
+	}) | rpl::on_next([=](bool value) {
+		bots->setEnabled(user, value);
+	}, button->lifetime());
+}
+
 void ActionsFiller::addBotCommandActions(not_null<UserData*> user) {
+	if (FastButtonsMode()) {
+		addFastButtonsMode(user);
+	}
 	const auto window = _controller->parentController();
 	const auto findBotCommand = [user](const QString &command) {
 		if (!user->isBot()) {
@@ -2058,7 +2866,10 @@ void ActionsFiller::addBotCommandActions(not_null<UserData*> user) {
 		tr::lng_profile_bot_help(),
 		u"help"_q,
 		&st::infoIconInformation);
-	addBotCommand(tr::lng_profile_bot_settings(), u"settings"_q);
+	addBotCommand(
+		tr::lng_profile_bot_settings(),
+		u"settings"_q,
+		&st::infoIconSettings);
 	//addBotCommand(tr::lng_profile_bot_privacy(), u"privacy"_q);
 	const auto openUrl = [=](const QString &url) {
 		Core::App().iv().openWithIvPreferred(
@@ -2082,8 +2893,7 @@ void ActionsFiller::addBotCommandActions(not_null<UserData*> user) {
 		tr::lng_profile_bot_privacy(),
 		rpl::single(true),
 		openPrivacyPolicy,
-		nullptr);
-
+		&st::infoIconPrivacyPolicy);
 }
 
 void ActionsFiller::addReportAction() {
@@ -2194,7 +3004,8 @@ void ActionsFiller::addJoinChannelAction(
 
 void ActionsFiller::fillUserActions(not_null<UserData*> user) {
 	if (user->isBot()) {
-		addCreditsAction(user);
+		addAffiliateProgram(user);
+		addBalanceActions(user);
 		addInviteToGroupAction(user);
 	}
 	addShareContactAction(user);
@@ -2205,11 +3016,7 @@ void ActionsFiller::fillUserActions(not_null<UserData*> user) {
 	if (!user->isSelf() && !user->isSupport() && !user->isVerifyCodes()) {
 		if (user->isBot()) {
 			addBotCommandActions(user);
-		}
-		_wrap->add(CreateSkipWidget(
-			_wrap,
-			st::infoBlockButtonSkip));
-		if (user->isBot()) {
+			_wrap->add(CreateSkipWidget(_wrap, st::infoBlockButtonSkip));
 			addReportAction();
 		}
 		addBlockAction(user);
@@ -2230,9 +3037,7 @@ void ActionsFiller::fillChannelActions(
 object_ptr<Ui::RpWidget> ActionsFiller::fill() {
 	auto wrapResult = [=](auto &&callback) {
 		_wrap = object_ptr<Ui::VerticalLayout>(_parent);
-		_wrap->add(CreateSkipWidget(_wrap));
 		callback();
-		_wrap->add(CreateSkipWidget(_wrap));
 		return std::move(_wrap);
 	};
 	if (auto user = _peer->asUser()) {
@@ -2253,23 +3058,7 @@ object_ptr<Ui::RpWidget> ActionsFiller::fill() {
 } // namespace
 
 const char kOptionShowPeerIdBelowAbout[] = "show-peer-id-below-about";
-
-object_ptr<Ui::RpWidget> SetupDetails(
-		not_null<Controller*> controller,
-		not_null<Ui::RpWidget*> parent,
-		not_null<PeerData*> peer,
-		Origin origin) {
-	DetailsFiller filler(controller, parent, peer, origin);
-	return filler.fill();
-}
-
-object_ptr<Ui::RpWidget> SetupDetails(
-		not_null<Controller*> controller,
-		not_null<Ui::RpWidget*> parent,
-		not_null<Data::ForumTopic*> topic) {
-	DetailsFiller filler(controller, parent, topic);
-	return filler.fill();
-}
+const char kOptionShowChannelJoinedBelowAbout[] = "show-channel-joined-below-about";
 
 object_ptr<Ui::RpWidget> SetupActions(
 		not_null<Controller*> controller,
@@ -2286,12 +3075,13 @@ void SetupAddChannelMember(
 	auto add = Ui::CreateChild<Ui::IconButton>(
 		parent.get(),
 		st::infoMembersAddMember);
+	add->setAccessibleName(tr::lng_channel_add_members(tr::now));
 	add->showOn(CanAddMemberValue(channel));
 	add->addClickHandler([=] {
 		Window::PeerMenuAddChannelMembers(navigation, channel);
 	});
 	parent->widthValue(
-	) | rpl::start_with_next([add](int newWidth) {
+	) | rpl::on_next([add](int newWidth) {
 		auto availableWidth = newWidth
 			- st::infoMembersButtonPosition.x();
 		add->moveToLeft(
@@ -2315,7 +3105,6 @@ object_ptr<Ui::RpWidget> SetupChannelMembersAndManage(
 	auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 		parent,
 		object_ptr<Ui::VerticalLayout>(parent));
-	result->entity()->add(object_ptr<Ui::BoxContentDivider>(result));
 	result->entity()->add(CreateSkipWidget(result));
 
 	auto membersShown = rpl::combine(
@@ -2330,7 +3119,7 @@ object_ptr<Ui::RpWidget> SetupChannelMembersAndManage(
 	auto membersCallback = [=] {
 		controller->showSection(std::make_shared<Info::Memento>(
 			channel,
-			Section::Type::Members));
+			Info::Section::Type::Members));
 	};
 
 	const auto membersWrap = result->entity()->add(
@@ -2397,17 +3186,94 @@ object_ptr<Ui::RpWidget> SetupChannelMembersAndManage(
 		st::menuIconAdmin,
 		st::infoChannelAdminsIconPosition);
 
-	if (EditPeerInfoBox::Available(channel)) {
-		const auto sessionController = controller->parentController();
+	const auto canViewBalance = false
+		|| (channel->flags() & ChannelDataFlag::CanViewRevenue)
+		|| (channel->flags() & ChannelDataFlag::CanViewCreditsRevenue)
+		|| (channel->loadedStatus() != ChannelData::LoadedStatus::Full);
+	if (canViewBalance) {
+		const auto balanceWrap = result->entity()->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				result->entity(),
+				object_ptr<Ui::VerticalLayout>(result->entity())));
+		auto refreshed = channel->session().credits().refreshedByPeerId(
+			channel->id);
+		auto creditsValue = rpl::single(
+			rpl::empty_value()
+		) | rpl::then(rpl::duplicate(refreshed)) | rpl::map([=] {
+			return channel->session().credits().balance(channel->id);
+		});
+		auto currencyValue = rpl::single(
+			rpl::empty_value()
+		) | rpl::then(rpl::duplicate(refreshed)) | rpl::map([=] {
+			return channel->session().credits().balanceCurrency(channel->id);
+		});
+		const auto emptyAmount = CreditsAmount(0);
+		balanceWrap->toggleOn(
+			rpl::combine(
+				rpl::duplicate(creditsValue),
+				rpl::duplicate(currencyValue)
+			) | rpl::map(rpl::mappers::_1 > emptyAmount
+				|| rpl::mappers::_2 > emptyAmount),
+			anim::type::normal);
+		balanceWrap->finishAnimating();
+
+		const auto &st = st::infoSharedMediaButton;
+
+		auto customEmojiFactory = [height = st.style.font->height,
+				font = st.rightLabel.style.font,
+				color = st.rightLabel.textFg->c](
+			QStringView data,
+			const Ui::Text::MarkedContext &context
+		) -> std::unique_ptr<Ui::Text::CustomEmoji> {
+			return (data == Ui::kCreditsCurrency)
+				? Ui::MakeCreditsIconEmoji(height, 1)
+				: MakeWrappedEmoji<Ui::Text::ShiftedEmoji>(
+					Ui::Earn::MakeCurrencyIconEmoji(font, color),
+					QPoint(0, st::channelEarnCurrencyCommonMargins.top()));
+		};
+		const auto context = Ui::Text::MarkedContext{
+			.customEmojiFactory = std::move(customEmojiFactory),
+		};
+
+		const auto balance = balanceWrap->entity();
 		const auto button = AddActionButton(
-			result->entity(),
-			tr::lng_profile_manage(),
+			balance,
+			tr::lng_manage_peer_bot_balance(),
 			rpl::single(true),
-			[=] { sessionController->showEditPeerBox(channel); },
+			[=] { controller->showSection(Info::ChannelEarn::Make(peer)); },
 			nullptr);
+
+		::Settings::CreateRightLabel(
+			button->entity(),
+			rpl::combine(
+				std::move(creditsValue),
+				std::move(currencyValue)
+			) | rpl::map([](CreditsAmount credits, CreditsAmount currency) {
+				auto creditsText = (credits > CreditsAmount(0))
+					? Ui::MakeCreditsIconEntity()
+						.append(QChar(' '))
+						.append(Info::ChannelEarn::MajorPart(credits))
+						.append(credits.nano()
+							? Info::ChannelEarn::MinorPart(credits)
+							: QString())
+					: TextWithEntities();
+				auto currencyText = (currency > CreditsAmount(0))
+					? Ui::Text::SingleCustomEmoji("_")
+						.append(QChar(' '))
+						.append(Info::ChannelEarn::MajorPart(currency))
+						.append(Info::ChannelEarn::MinorPart(currency))
+					: TextWithEntities();
+				return currencyText
+					.append(QChar(' '))
+					.append(std::move(creditsText));
+			}),
+			st,
+			tr::lng_manage_peer_bot_balance(),
+			context);
+
 		object_ptr<FloatingIcon>(
-			button,
-			st::menuIconManage,
+			balance,
+			st::menuIconEarn,
 			st::infoChannelAdminsIconPosition);
 	}
 
@@ -2422,5 +3288,44 @@ object_ptr<Ui::RpWidget> SetupChannelMembersAndManage(
 	return result;
 }
 
+void BuildProfileDetailsSections(
+		SectionStack &stack,
+		not_null<Controller*> controller,
+		not_null<PeerData*> peer,
+		Data::ForumTopic *topic,
+		Data::SavedSublist *sublist,
+		Origin origin) {
+	if (topic) {
+		DetailsFiller filler(controller, &stack, topic);
+		filler.buildSections();
+	} else if (sublist) {
+		DetailsFiller filler(controller, &stack, sublist);
+		filler.buildSections();
+	} else {
+		DetailsFiller filler(controller, &stack, peer, origin);
+		filler.buildSections();
+	}
+}
+
+void AddDetails(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Controller*> controller,
+		not_null<PeerData*> peer,
+		Data::ForumTopic *topic,
+		Data::SavedSublist *sublist,
+		Origin origin) {
+	auto layout = object_ptr<Ui::VerticalLayout>(container);
+	auto stack = SectionStack(layout.data());
+	BuildProfileDetailsSections(
+		stack,
+		controller,
+		peer,
+		topic,
+		sublist,
+		origin);
+	stack.finalize();
+	container->add(std::move(layout));
+}
+
 } // namespace Profile
 } // namespace Info
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.h b/Telegram/SourceFiles/info/profile/info_profile_actions.h
index c6b070a852c7c2..e94e90b172ba81 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.h
@@ -8,13 +8,16 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "base/object_ptr.h"
+#include "info/profile/info_profile_section_stack.h"
 
 namespace Ui {
 class RpWidget;
+class VerticalLayout;
 } // namespace Ui
 
 namespace Data {
 class ForumTopic;
+class SavedSublist;
 } // namespace Data
 
 namespace Info {
@@ -24,20 +27,10 @@ class Controller;
 namespace Info::Profile {
 
 extern const char kOptionShowPeerIdBelowAbout[];
+extern const char kOptionShowChannelJoinedBelowAbout[];
 
 struct Origin;
 
-object_ptr<Ui::RpWidget> SetupDetails(
-	not_null<Controller*> controller,
-	not_null<Ui::RpWidget*> parent,
-	not_null<PeerData*> peer,
-	Origin origin);
-
-object_ptr<Ui::RpWidget> SetupDetails(
-	not_null<Controller*> controller,
-	not_null<Ui::RpWidget*> parent,
-	not_null<Data::ForumTopic*> topic);
-
 object_ptr<Ui::RpWidget> SetupActions(
 	not_null<Controller*> controller,
 	not_null<Ui::RpWidget*> parent,
@@ -48,4 +41,21 @@ object_ptr<Ui::RpWidget> SetupChannelMembersAndManage(
 	not_null<Ui::RpWidget*> parent,
 	not_null<PeerData*> peer);
 
+void AddDetails(
+	not_null<Ui::VerticalLayout*> container,
+	not_null<Controller*> controller,
+	not_null<PeerData*> peer,
+	Data::ForumTopic *topic,
+	Data::SavedSublist *sublist,
+	Origin origin);
+
+void BuildProfileDetailsSections(
+	SectionStack &stack,
+	not_null<Controller*> controller,
+	not_null<PeerData*> peer,
+	Data::ForumTopic *topic,
+	Data::SavedSublist *sublist,
+	Origin origin);
+
 } // namespace Info::Profile
+
diff --git a/Telegram/SourceFiles/info/profile/info_profile_badge.cpp b/Telegram/SourceFiles/info/profile/info_profile_badge.cpp
index 214c6e1cc86096..1b058ae69f4a95 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_badge.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_badge.cpp
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #include "info/profile/info_profile_badge.h"
 
+#include "data/data_changes.h"
+#include "data/data_emoji_statuses.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -17,49 +19,20 @@ For license and copyright information please follow this link:
 #include "ui/widgets/buttons.h"
 #include "ui/painter.h"
 #include "ui/power_saving.h"
+#include "ui/text/text_custom_emoji.h"
 #include "main/main_session.h"
 #include "styles/style_info.h"
 
 namespace Info::Profile {
 namespace {
 
-[[nodiscard]] rpl::producer<Badge::Content> ContentForPeer(
-		not_null<PeerData*> peer) {
-	const auto statusOnlyForPremium = peer->isUser();
-	return rpl::combine(
-		BadgeValue(peer),
-		EmojiStatusIdValue(peer)
-	) | rpl::map([=](BadgeType badge, DocumentId emojiStatusId) {
-		if (statusOnlyForPremium && badge != BadgeType::Premium) {
-			emojiStatusId = 0;
-		} else if (emojiStatusId && badge == BadgeType::None) {
-			badge = BadgeType::Premium;
-		}
-		return Badge::Content{ badge, emojiStatusId };
-	});
+[[nodiscard]] bool HasPremiumClick(const Badge::Content &content) {
+	return content.badge == BadgeType::Premium
+		|| (content.badge == BadgeType::Verified && content.emojiStatusId);
 }
 
 } // namespace
 
-Badge::Badge(
-	not_null<QWidget*> parent,
-	const style::InfoPeerBadge &st,
-	not_null<PeerData*> peer,
-	EmojiStatusPanel *emojiStatusPanel,
-	Fn<bool()> animationPaused,
-	int customStatusLoopsLimit,
-	base::flags<BadgeType> allowed)
-: Badge(
-	parent,
-	st,
-	&peer->session(),
-	ContentForPeer(peer),
-	emojiStatusPanel,
-	std::move(animationPaused),
-	customStatusLoopsLimit,
-	allowed) {
-}
-
 Badge::Badge(
 	not_null<QWidget*> parent,
 	const style::InfoPeerBadge &st,
@@ -78,7 +51,7 @@ Badge::Badge(
 , _animationPaused(std::move(animationPaused)) {
 	std::move(
 		content
-	) | rpl::start_with_next([=](Content content) {
+	) | rpl::on_next([=](Content content) {
 		setContent(content);
 	}, _lifetime);
 }
@@ -109,27 +82,67 @@ void Badge::setContent(Content content) {
 		return;
 	}
 	_view.create(_parent);
+	_view->setAccessibleName([&] {
+		switch (_content.badge) {
+		case BadgeType::Verified:
+			return tr::lng_sr_verified_badge(tr::now);
+		case BadgeType::BotVerified:
+			return tr::lng_sr_bot_verified_badge(tr::now);
+		case BadgeType::Premium:
+			if (_content.emojiStatusId) {
+				return tr::lng_profile_bot_emoji_status_access(tr::now);
+			}
+			return tr::lng_premium_summary_title(tr::now);
+		case BadgeType::Scam:
+			return tr::lng_scam_badge(tr::now);
+		case BadgeType::Fake:
+			return tr::lng_fake_badge(tr::now);
+		case BadgeType::Direct:
+			return tr::lng_direct_badge(tr::now);
+		}
+		Unexpected("badge type");
+	}());
 	_view->show();
 	switch (_content.badge) {
 	case BadgeType::Verified:
+	case BadgeType::BotVerified:
 	case BadgeType::Premium: {
-		if (const auto id = _content.emojiStatusId) {
+		const auto id = _content.emojiStatusId;
+		const auto emoji = id
+			? (Data::FrameSizeFromTag(sizeTag())
+				/ style::DevicePixelRatio())
+			: 0;
+		const auto &style = st();
+		const auto icon = (_content.badge == BadgeType::Verified)
+			? &style.verified
+			: id
+			? nullptr
+			: &style.premium;
+		const auto iconForeground = (_content.badge == BadgeType::Verified)
+			? &style.verifiedCheck
+			: nullptr;
+		if (id) {
 			_emojiStatus = _session->data().customEmojiManager().create(
-				id,
+				Data::EmojiStatusCustomId(id),
 				[raw = _view.data()] { raw->update(); },
 				sizeTag());
-			if (_customStatusLoopsLimit > 0) {
-				_emojiStatus = std::make_unique<Ui::Text::LimitedLoopsEmoji>(
+			if (_content.badge == BadgeType::BotVerified) {
+				_emojiStatus = MakeWrappedEmoji<Ui::Text::FirstFrameEmoji>(
+					std::move(_emojiStatus));
+			} else if (_customStatusLoopsLimit > 0) {
+				_emojiStatus = MakeWrappedEmoji<Ui::Text::LimitedLoopsEmoji>(
 					std::move(_emojiStatus),
 					_customStatusLoopsLimit);
 			}
-			const auto emoji = Data::FrameSizeFromTag(sizeTag())
-				/ style::DevicePixelRatio();
-			_view->resize(emoji, emoji);
-			_view->paintRequest(
-			) | rpl::start_with_next([=, check = _view.data()]{
+		}
+		const auto width = emoji + (icon ? icon->width() : 0);
+		const auto height = std::max(emoji, icon ? icon->height() : 0);
+		_view->resize(width, height);
+		_view->paintRequest(
+		) | rpl::on_next([=, check = _view.data()]{
+			if (_emojiStatus) {
 				auto args = Ui::Text::CustomEmoji::Context{
-					.textColor = _st.premiumFg->c,
+					.textColor = style.premiumFg->c,
 					.now = crl::now(),
 					.paused = ((_animationPaused && _animationPaused())
 						|| On(PowerSaving::kEmojiStatus)),
@@ -139,41 +152,65 @@ void Badge::setContent(Content content) {
 					Painter p(check);
 					_emojiStatus->paint(p, args);
 				}
-			}, _view->lifetime());
-		} else {
-			const auto icon = (_content.badge == BadgeType::Verified)
-				? &_st.verified
-				: &_st.premium;
-			_view->resize(icon->size());
-			_view->paintRequest(
-			) | rpl::start_with_next([=, check = _view.data()]{
-				Painter p(check);
-				icon->paint(p, 0, 0, check->width());
-			}, _view->lifetime());
-		}
+			}
+			if (icon) {
+				auto p = Painter(check);
+				if (_overrideSt && !iconForeground) {
+					icon->paint(
+						p,
+						emoji,
+						0,
+						check->width(),
+						_overrideSt->premiumFg->c);
+				} else {
+					icon->paint(p, emoji, 0, check->width());
+				}
+				if (iconForeground) {
+					if (_overrideSt) {
+						iconForeground->paint(
+							p,
+							emoji,
+							0,
+							check->width(),
+							_overrideSt->premiumFg->c);
+					} else {
+						iconForeground->paint(p, emoji, 0, check->width());
+					}
+				}
+			}
+		}, _view->lifetime());
 	} break;
 	case BadgeType::Scam:
-	case BadgeType::Fake: {
-		const auto fake = (_content.badge == BadgeType::Fake);
-		const auto size = Ui::ScamBadgeSize(fake);
+	case BadgeType::Fake:
+	case BadgeType::Direct: {
+		const auto type = (_content.badge == BadgeType::Direct)
+			? Ui::TextBadgeType::Direct
+			: (_content.badge == BadgeType::Fake)
+			? Ui::TextBadgeType::Fake
+			: Ui::TextBadgeType::Scam;
+		const auto size = Ui::TextBadgeSize(type);
 		const auto skip = st::infoVerifiedCheckPosition.x();
 		_view->resize(
 			size.width() + 2 * skip,
 			size.height() + 2 * skip);
 		_view->paintRequest(
-		) | rpl::start_with_next([=, badge = _view.data()]{
+		) | rpl::on_next([=, badge = _view.data()]{
 			Painter p(badge);
-			Ui::DrawScamBadge(
-				fake,
+			Ui::DrawTextBadge(
+				type,
 				p,
 				badge->rect().marginsRemoved({ skip, skip, skip, skip }),
 				badge->width(),
-				st::attentionButtonFg);
+				_overrideSt
+					? _overrideSt->premiumFg
+					: (type == Ui::TextBadgeType::Direct
+						? st::windowSubTextFg
+						: st::attentionButtonFg));
 			}, _view->lifetime());
 	} break;
 	}
 
-	if (_content.badge != BadgeType::Premium || !_premiumClickCallback) {
+	if (!HasPremiumClick(_content) || !_premiumClickCallback) {
 		_view->setAttribute(Qt::WA_TransparentForMouseEvents);
 	} else {
 		_view->setClickedCallback(_premiumClickCallback);
@@ -184,7 +221,7 @@ void Badge::setContent(Content content) {
 
 void Badge::setPremiumClickCallback(Fn<void()> callback) {
 	_premiumClickCallback = std::move(callback);
-	if (_view && _content.badge == BadgeType::Premium) {
+	if (_view && HasPremiumClick(_content)) {
 		if (!_premiumClickCallback) {
 			_view->setAttribute(Qt::WA_TransparentForMouseEvents);
 		} else {
@@ -194,6 +231,13 @@ void Badge::setPremiumClickCallback(Fn<void()> callback) {
 	}
 }
 
+void Badge::setOverrideStyle(const style::InfoPeerBadge *st) {
+	const auto was = _content;
+	_overrideSt = st;
+	_content = {};
+	setContent(was);
+}
+
 rpl::producer<> Badge::updated() const {
 	return _updated.events();
 }
@@ -202,26 +246,77 @@ void Badge::move(int left, int top, int bottom) {
 	if (!_view) {
 		return;
 	}
+	const auto &style = st();
 	const auto star = !_emojiStatus
 		&& (_content.badge == BadgeType::Premium
 			|| _content.badge == BadgeType::Verified);
 	const auto fake = !_emojiStatus && !star;
-	const auto skip = fake ? 0 : _st.position.x();
+	const auto skip = fake ? 0 : style.position.x();
 	const auto badgeLeft = left + skip;
 	const auto badgeTop = top
 		+ (star
-			? _st.position.y()
+			? style.position.y()
 			: (bottom - top - _view->height()) / 2);
 	_view->moveToLeft(badgeLeft, badgeTop);
 }
 
+const style::InfoPeerBadge &Badge::st() const {
+	return _overrideSt ? *_overrideSt : _st;
+}
+
 Data::CustomEmojiSizeTag Badge::sizeTag() const {
 	using SizeTag = Data::CustomEmojiSizeTag;
-	return (_st.sizeTag == 2)
+	const auto &style = st();
+	return (style.sizeTag == 2)
 		? SizeTag::Isolated
-		: (_st.sizeTag == 1)
+		: (style.sizeTag == 1)
 		? SizeTag::Large
 		: SizeTag::Normal;
 }
 
+rpl::producer<Badge::Content> BadgeContentForPeer(not_null<PeerData*> peer) {
+	const auto statusOnlyForPremium = peer->isUser();
+	return rpl::combine(
+		BadgeValue(peer),
+		EmojiStatusIdValue(peer)
+	) | rpl::map([=](BadgeType badge, EmojiStatusId emojiStatusId) {
+		if (emojiStatusId.collectible && (badge == BadgeType::Verified)) {
+			return Badge::Content{ BadgeType::Premium, emojiStatusId };
+		}
+		if (badge == BadgeType::Verified) {
+			badge = BadgeType::None;
+		}
+		if (statusOnlyForPremium && badge != BadgeType::Premium) {
+			emojiStatusId = EmojiStatusId();
+		} else if (emojiStatusId && badge == BadgeType::None) {
+			badge = BadgeType::Premium;
+		}
+		return Badge::Content{ badge, emojiStatusId };
+	});
+}
+
+rpl::producer<Badge::Content> VerifiedContentForPeer(
+		not_null<PeerData*> peer) {
+	return BadgeValue(peer) | rpl::map([=](BadgeType badge) {
+		if (badge != BadgeType::Verified) {
+			badge = BadgeType::None;
+		}
+		return Badge::Content{ badge };
+	});
+}
+
+rpl::producer<Badge::Content> BotVerifyBadgeForPeer(
+		not_null<PeerData*> peer) {
+	return peer->session().changes().peerFlagsValue(
+		peer,
+		Data::PeerUpdate::Flag::VerifyInfo
+	) | rpl::map([=] {
+		const auto info = peer->botVerifyDetails();
+		return Badge::Content{
+			.badge = info ? BadgeType::BotVerified : BadgeType::None,
+			.emojiStatusId = { info ? info->iconId : DocumentId() },
+		};
+	});
+}
+
 } // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_badge.h b/Telegram/SourceFiles/info/profile/info_profile_badge.h
index f0e770d3f468d2..20771e06b27497 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_badge.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_badge.h
@@ -35,32 +35,24 @@ namespace Info::Profile {
 
 class EmojiStatusPanel;
 
-enum class BadgeType {
+enum class BadgeType : uchar {
 	None = 0x00,
 	Verified = 0x01,
-	Premium = 0x02,
-	Scam = 0x04,
-	Fake = 0x08,
+	BotVerified = 0x02,
+	Premium = 0x04,
+	Scam = 0x08,
+	Fake = 0x10,
+	Direct = 0x20,
 };
 inline constexpr bool is_flag_type(BadgeType) { return true; }
 
 class Badge final {
 public:
-	Badge(
-		not_null<QWidget*> parent,
-		const style::InfoPeerBadge &st,
-		not_null<PeerData*> peer,
-		EmojiStatusPanel *emojiStatusPanel,
-		Fn<bool()> animationPaused,
-		int customStatusLoopsLimit = 0,
-		base::flags<BadgeType> allowed
-			= base::flags<BadgeType>::from_raw(-1));
-
 	struct Content {
 		BadgeType badge = BadgeType::None;
-		DocumentId emojiStatusId = 0;
+		EmojiStatusId emojiStatusId;
 
-		friend inline constexpr bool operator==(Content, Content) = default;
+		friend inline bool operator==(Content, Content) = default;
 	};
 	Badge(
 		not_null<QWidget*> parent,
@@ -78,6 +70,7 @@ class Badge final {
 	[[nodiscard]] Ui::RpWidget *widget() const;
 
 	void setPremiumClickCallback(Fn<void()> callback);
+	void setOverrideStyle(const style::InfoPeerBadge *st);
 	[[nodiscard]] rpl::producer<> updated() const;
 	void move(int left, int top, int bottom);
 
@@ -85,9 +78,11 @@ class Badge final {
 
 private:
 	void setContent(Content content);
+	[[nodiscard]] const style::InfoPeerBadge &st() const;
 
 	const not_null<QWidget*> _parent;
 	const style::InfoPeerBadge &_st;
+	const style::InfoPeerBadge *_overrideSt = nullptr;
 	const not_null<Main::Session*> _session;
 	EmojiStatusPanel *_emojiStatusPanel = nullptr;
 	const int _customStatusLoopsLimit = 0;
@@ -102,4 +97,11 @@ class Badge final {
 
 };
 
+[[nodiscard]] rpl::producer<Badge::Content> BadgeContentForPeer(
+	not_null<PeerData*> peer);
+[[nodiscard]] rpl::producer<Badge::Content> VerifiedContentForPeer(
+	not_null<PeerData*> peer);
+[[nodiscard]] rpl::producer<Badge::Content> BotVerifyBadgeForPeer(
+	not_null<PeerData*> peer);
+
 } // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_badge_tooltip.cpp b/Telegram/SourceFiles/info/profile/info_profile_badge_tooltip.cpp
new file mode 100644
index 00000000000000..1bbefb6240dff0
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_badge_tooltip.cpp
@@ -0,0 +1,224 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/profile/info_profile_badge_tooltip.h"
+
+#include "data/data_emoji_statuses.h"
+#include "base/event_filter.h"
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "styles/style_info.h"
+
+namespace Info::Profile {
+namespace {
+
+constexpr auto kGlareDurationStep = crl::time(320);
+constexpr auto kGlareTimeout = crl::time(1000);
+
+} // namespace
+
+BadgeTooltip::BadgeTooltip(
+	not_null<QWidget*> parent,
+	std::shared_ptr<Data::EmojiStatusCollectible> collectible,
+	not_null<QWidget*> pointTo)
+: Ui::RpWidget(parent)
+, _st(st::infoGiftTooltip)
+, _collectible(std::move(collectible))
+, _text(_collectible->title)
+, _font(st::infoGiftTooltipFont)
+, _inner(_font->width(_text), _font->height)
+, _outer(_inner.grownBy(_st.padding))
+, _stroke(st::lineWidth)
+, _skip(2 * _stroke)
+, _full(_outer + QSize(2 * _skip, _st.arrow + 2 * _skip))
+, _glareSize(_outer.height() * 3)
+, _glareRange(_outer.width() + _glareSize)
+, _glareDuration(_glareRange * kGlareDurationStep / _glareSize)
+, _glareTimer([=] { showGlare(); }) {
+	resize(_full + QSize(0, _st.shift));
+	setupGeometry(pointTo);
+}
+
+void BadgeTooltip::fade(bool shown) {
+	if (_shown == shown) {
+		return;
+	}
+	show();
+	_shown = shown;
+	_showAnimation.start([=] {
+		update();
+		if (!_showAnimation.animating()) {
+			if (!_shown) {
+				hide();
+			} else {
+				showGlare();
+			}
+		}
+	}, _shown ? 0. : 1., _shown ? 1. : 0., _st.duration, anim::easeInCirc);
+}
+
+void BadgeTooltip::showGlare() {
+	_glareAnimation.start([=] {
+		update();
+		if (!_glareAnimation.animating()) {
+			_glareTimer.callOnce(kGlareTimeout);
+		}
+	}, 0., 1., _glareDuration);
+}
+
+void BadgeTooltip::finishAnimating() {
+	_showAnimation.stop();
+	if (!_shown) {
+		hide();
+	}
+}
+
+void BadgeTooltip::setOpacity(float64 opacity) {
+	_opacity = opacity;
+	update();
+}
+
+crl::time BadgeTooltip::glarePeriod() const {
+	return _glareDuration + kGlareTimeout;
+}
+
+void BadgeTooltip::paintEvent(QPaintEvent *e) {
+	const auto glare = _glareAnimation.value(0.);
+	_glareRight = anim::interpolate(0, _glareRange, glare);
+	prepareImage();
+
+	auto p = QPainter(this);
+	const auto shown = _showAnimation.value(_shown ? 1. : 0.);
+	p.setOpacity(shown * _opacity);
+	const auto imageHeight = _image.height() / _image.devicePixelRatio();
+	const auto top = anim::interpolate(0, height() - imageHeight, shown);
+	p.drawImage(0, top, _image);
+}
+
+void BadgeTooltip::setupGeometry(not_null<QWidget*> pointTo) {
+	auto widget = pointTo.get();
+	const auto parent = parentWidget();
+
+	const auto refresh = [=, weak = base::make_weak(pointTo)] {
+		const auto strong = weak.get();
+		if (!strong) {
+			hide();
+			return setGeometry({});
+		}
+		const auto rect = Ui::MapFrom(parent, pointTo, pointTo->rect());
+		const auto point = QPoint(rect.center().x(), rect.y());
+		const auto left = point.x() - (width() / 2);
+		const auto skip = _st.padding.left();
+		setGeometry(
+			std::min(std::max(left, skip), parent->width() - width() - skip),
+			std::max(point.y() - height() - _st.margin.bottom(), skip),
+			width(),
+			height());
+		const auto arrowMiddle = point.x() - x();
+		if (_arrowMiddle != arrowMiddle) {
+			_arrowMiddle = arrowMiddle;
+			update();
+		}
+	};
+	refresh();
+	while (widget && widget != parent) {
+		base::install_event_filter(this, widget, [=](not_null<QEvent*> e) {
+			if (e->type() == QEvent::Resize
+				|| e->type() == QEvent::Move
+				|| e->type() == QEvent::ZOrderChange) {
+				refresh();
+				raise();
+			}
+			return base::EventFilterResult::Continue;
+		});
+		widget = widget->parentWidget();
+	}
+}
+
+void BadgeTooltip::prepareImage() {
+	const auto ratio = style::DevicePixelRatio();
+	const auto arrow = _st.arrow;
+	const auto size = _full * ratio;
+	if (_image.size() != size) {
+		_image = QImage(size, QImage::Format_ARGB32_Premultiplied);
+		_image.setDevicePixelRatio(ratio);
+	} else if (_imageGlareRight == _glareRight
+		&& _imageArrowMiddle == _arrowMiddle) {
+		return;
+	}
+	_imageGlareRight = _glareRight;
+	_imageArrowMiddle = _arrowMiddle;
+	_image.fill(Qt::transparent);
+
+	const auto gfrom = _imageGlareRight - _glareSize;
+	const auto gtill = _imageGlareRight;
+
+	auto path = QPainterPath();
+	const auto width = _outer.width();
+	const auto height = _outer.height();
+	const auto radius = (height + 1) / 2;
+	const auto diameter = height;
+	path.moveTo(radius, 0);
+	path.lineTo(width - radius, 0);
+	path.arcTo(
+		QRect(QPoint(width - diameter, 0), QSize(diameter, diameter)),
+		90,
+		-180);
+	const auto xarrow = _arrowMiddle - _skip;
+	if (xarrow - arrow <= radius || xarrow + arrow >= width - radius) {
+		path.lineTo(radius, height);
+	} else {
+		path.lineTo(xarrow + arrow, height);
+		path.lineTo(xarrow, height + arrow);
+		path.lineTo(xarrow - arrow, height);
+		path.lineTo(radius, height);
+	}
+	path.arcTo(
+		QRect(QPoint(0, 0), QSize(diameter, diameter)),
+		-90,
+		-180);
+	path.closeSubpath();
+
+	auto p = QPainter(&_image);
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	if (gtill > 0) {
+		auto gradient = QLinearGradient(gfrom, 0, gtill, 0);
+		gradient.setStops({
+			{ 0., _collectible->edgeColor },
+			{ 0.5, _collectible->centerColor },
+			{ 1., _collectible->edgeColor },
+		});
+		p.setBrush(gradient);
+	} else {
+		p.setBrush(_collectible->edgeColor);
+	}
+	p.translate(_skip, _skip);
+	p.drawPath(path);
+	p.setCompositionMode(QPainter::CompositionMode_Source);
+	p.setBrush(Qt::NoBrush);
+	auto copy = _collectible->textColor;
+	copy.setAlpha(0);
+	if (gtill > 0) {
+		auto gradient = QLinearGradient(gfrom, 0, gtill, 0);
+		gradient.setStops({
+			{ 0., copy },
+			{ 0.5, _collectible->textColor },
+			{ 1., copy },
+		});
+		p.setPen(QPen(gradient, _stroke));
+	} else {
+		p.setPen(QPen(copy, _stroke));
+	}
+	p.drawPath(path);
+	p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+	p.setFont(_font);
+	p.setPen(QColor(255, 255, 255));
+	p.drawText(_st.padding.left(), _st.padding.top() + _font->ascent, _text);
+}
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_badge_tooltip.h b/Telegram/SourceFiles/info/profile/info_profile_badge_tooltip.h
new file mode 100644
index 00000000000000..86f30562b49650
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_badge_tooltip.h
@@ -0,0 +1,70 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/effects/animations.h"
+#include "base/timer.h"
+
+namespace style {
+struct ImportantTooltip;
+} // namespace style
+
+namespace Data {
+struct EmojiStatusCollectible;
+} // namespace Data
+
+namespace Info::Profile {
+
+class BadgeTooltip final : public Ui::RpWidget {
+public:
+	BadgeTooltip(
+		not_null<QWidget*> parent,
+		std::shared_ptr<Data::EmojiStatusCollectible> collectible,
+		not_null<QWidget*> pointTo);
+
+	void fade(bool shown);
+	void finishAnimating();
+	void setOpacity(float64 opacity);
+
+	[[nodiscard]] crl::time glarePeriod() const;
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	void setupGeometry(not_null<QWidget*> pointTo);
+	void prepareImage();
+	void showGlare();
+
+	const style::ImportantTooltip &_st;
+	std::shared_ptr<Data::EmojiStatusCollectible> _collectible;
+	QString _text;
+	const style::font &_font;
+	QSize _inner;
+	QSize _outer;
+	int _stroke = 0;
+	int _skip = 0;
+	QSize _full;
+	int _glareSize = 0;
+	int _glareRange = 0;
+	crl::time _glareDuration = 0;
+	base::Timer _glareTimer;
+
+	Ui::Animations::Simple _showAnimation;
+	Ui::Animations::Simple _glareAnimation;
+
+	QImage _image;
+	int _glareRight = 0;
+	int _imageGlareRight = 0;
+	int _arrowMiddle = 0;
+	int _imageArrowMiddle = 0;
+
+	bool _shown = false;
+	float64 _opacity = 1.;
+};
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_birthday_effect.cpp b/Telegram/SourceFiles/info/profile/info_profile_birthday_effect.cpp
new file mode 100644
index 00000000000000..852d4ecae9675d
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_birthday_effect.cpp
@@ -0,0 +1,496 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/profile/info_profile_birthday_effect.h"
+
+#include "apiwrap.h"
+#include "base/random.h"
+#include "base/weak_qptr.h"
+#include "chat_helpers/stickers_lottie.h"
+#include "data/data_birthday.h"
+#include "data/data_document.h"
+#include "data/data_document_media.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "data/stickers/data_stickers.h"
+#include "data/stickers/data_stickers_set.h"
+#include "history/view/media/history_view_sticker_player.h"
+#include "lottie/lottie_common.h"
+#include "main/main_session.h"
+#include "ui/effects/animation_value.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/fireworks_animation.h"
+#include "ui/emoji_config.h"
+#include "ui/power_saving.h"
+#include "ui/qt_object_factory.h"
+#include "ui/rect.h"
+#include "ui/rp_widget.h"
+#include "styles/style_info.h"
+
+namespace Info::Profile {
+namespace {
+
+constexpr auto kDuration = crl::time(4200);
+constexpr auto kMaxFrameStep = crl::time(20);
+constexpr auto kFadeOutFrom = 0.9;
+constexpr auto kCascadeWaveLength = 1.8;
+constexpr auto kCascadeScalePart = 0.4;
+constexpr auto kDigitPitchFactor = 0.88;
+constexpr auto kDigitSourceBelowFactor = 2;
+
+const auto kConfettiSetShortName = u"EmojiAnimations"_q;
+const auto kDigitsSetShortName = u"FestiveFontEmoji"_q;
+
+const auto kConfettiEmoji = {
+	QString::fromUtf8("\xf0\x9f\x8e\x89"),
+	QString::fromUtf8("\xf0\x9f\x8e\x86"),
+	QString::fromUtf8("\xf0\x9f\x8e\x88"),
+};
+
+[[nodiscard]] float64 Cascade(
+		float64 fullProgress,
+		float64 position,
+		float64 count,
+		float64 waveLength) {
+	if (count <= 0) {
+		return fullProgress;
+	}
+	const auto waveDuration = (1. / count) * std::min(waveLength, count);
+	const auto waveOffset = (position / count) * (1. - waveDuration);
+	return std::clamp(
+		(fullProgress - waveOffset) / waveDuration,
+		0.,
+		1.);
+}
+
+[[nodiscard]] std::vector<QString> DigitEmojiVariants(QChar digit) {
+	const auto keycap = QChar(0x20E3);
+	const auto selector = QChar(0xFE0F);
+	return {
+		QString() + digit + selector + keycap,
+		QString() + digit + keycap,
+	};
+}
+
+[[nodiscard]] bool AdvanceFrame(
+		not_null<HistoryView::StickerPlayer*> player,
+		int index,
+		bool frozen) {
+	if (frozen) {
+		return false;
+	}
+	const auto frames = player->framesCount();
+	return (frames <= 0) || (index + 1 < frames);
+}
+
+} // namespace
+
+class BirthdayEffect final : public Ui::RpWidget {
+public:
+	BirthdayEffect(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Main::Session*> session,
+		int age,
+		Fn<QRect()> userpicGeometry,
+		Fn<bool()> paused);
+
+	void start();
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	using StickerPlayer = HistoryView::StickerPlayer;
+	using EmojiDocuments = base::flat_map<EmojiPtr, DocumentData*>;
+	struct Sticker {
+		std::shared_ptr<Data::DocumentMedia> media;
+		std::unique_ptr<StickerPlayer> player;
+		bool usesTextColor = false;
+	};
+
+	void resolveSet(const QString &shortName, Fn<void(EmojiDocuments)> done);
+
+	void loadConfetti();
+	void useFireworksFallback();
+
+	void loadDigits();
+	void startDigits(const EmojiDocuments &byEmoji);
+
+	void loadInto(
+		not_null<Sticker*> slot,
+		not_null<DocumentData*> document,
+		ChatHelpers::StickerLottieSize sizeTag,
+		QSize box,
+		Fn<void()> ready);
+
+	void startAnimation();
+	void tick(crl::time now);
+	void paintConfetti(QPainter &p);
+	void paintDigits(QPainter &p);
+	void destroy();
+
+	[[nodiscard]] bool paused() const {
+		return _paused && _paused();
+	}
+
+	const not_null<Main::Session*> _session;
+	const int _age = 0;
+	const Fn<QRect()> _userpicGeometry;
+	const Fn<bool()> _paused;
+
+	Ui::Animations::Basic _animation;
+	crl::time _lastTickTime = 0;
+	float64 _progress = 0.;
+	bool _started = false;
+	bool _destroying = false;
+
+	Sticker _confetti;
+	int _confettiSide = 0;
+	std::optional<Ui::FireworksAnimation> _fireworks;
+
+	std::vector<Sticker> _digits;
+	int _digitSide = 0;
+
+};
+
+BirthdayEffect::BirthdayEffect(
+	not_null<Ui::RpWidget*> parent,
+	not_null<Main::Session*> session,
+	int age,
+	Fn<QRect()> userpicGeometry,
+	Fn<bool()> paused)
+: RpWidget(parent)
+, _session(session)
+, _age(age)
+, _userpicGeometry(std::move(userpicGeometry))
+, _paused(std::move(paused))
+, _animation([=](crl::time now) { tick(now); }) {
+}
+
+void BirthdayEffect::start() {
+	_confettiSide = std::min(width(), st::infoProfileBirthdayConfettiSize);
+	_digitSide = st::infoProfileBirthdayDigitSize;
+	loadConfetti();
+	if (_age > 0) {
+		loadDigits();
+	}
+}
+
+void BirthdayEffect::resolveSet(
+		const QString &shortName,
+		Fn<void(EmojiDocuments)> done) {
+	const auto build = [](not_null<Data::StickersSet*> set) {
+		auto byEmoji = EmojiDocuments();
+		for (const auto &[emoji, pack] : set->emoji) {
+			if (!pack.isEmpty()) {
+				byEmoji.emplace(emoji, pack.front());
+			}
+		}
+		return byEmoji;
+	};
+	auto &stickers = _session->data().stickers();
+	for (const auto &[id, set] : stickers.sets()) {
+		if (!set->emoji.empty()
+			&& !set->shortName.compare(shortName, Qt::CaseInsensitive)) {
+			done(build(set.get()));
+			return;
+		}
+	}
+	auto identifier = StickerSetIdentifier();
+	identifier.shortName = shortName;
+	_session->api().request(MTPmessages_GetStickerSet(
+		Data::InputStickerSet(identifier),
+		MTP_int(0) // hash
+	)).done(crl::guard(this, [=](const MTPmessages_StickerSet &result) {
+		auto byEmoji = EmojiDocuments();
+		result.match([&](const MTPDmessages_stickerSet &data) {
+			byEmoji = build(_session->data().stickers().feedSetFull(data));
+		}, [](const MTPDmessages_stickerSetNotModified &) {
+		});
+		done(std::move(byEmoji));
+	})).fail(crl::guard(this, [=] {
+		done(EmojiDocuments());
+	})).send();
+}
+
+void BirthdayEffect::loadConfetti() {
+	resolveSet(kConfettiSetShortName, [=](EmojiDocuments byEmoji) {
+		const auto count = int(kConfettiEmoji.size());
+		const auto from = count ? base::RandomIndex(count) : 0;
+		auto document = (DocumentData*)nullptr;
+		for (auto k = 0; k != count; ++k) {
+			const auto &emoticon = *(kConfettiEmoji.begin() + ((from + k) % count));
+			if (const auto emoji = Ui::Emoji::Find(emoticon)) {
+				const auto i = byEmoji.find(emoji->original());
+				if (i != byEmoji.end()) {
+					document = i->second;
+					break;
+				}
+			}
+		}
+		if (!document) {
+			useFireworksFallback();
+			return;
+		}
+		loadInto(
+			&_confetti,
+			document,
+			ChatHelpers::StickerLottieSize::EmojiInteraction,
+			Size(_confettiSide),
+			[=] { startAnimation(); });
+	});
+}
+
+void BirthdayEffect::useFireworksFallback() {
+	if (_started || _fireworks) {
+		return;
+	}
+	_started = true;
+	_fireworks.emplace([=] { update(); });
+	update();
+}
+
+void BirthdayEffect::loadDigits() {
+	resolveSet(kDigitsSetShortName, [=](EmojiDocuments byEmoji) {
+		startDigits(byEmoji);
+	});
+}
+
+void BirthdayEffect::startDigits(const EmojiDocuments &byEmoji) {
+	const auto text = QString::number(_age);
+	_digits.clear();
+	_digits.resize(text.size());
+	for (auto i = 0; i != int(text.size()); ++i) {
+		auto found = (DocumentData*)nullptr;
+		for (const auto &variant : DigitEmojiVariants(text[i])) {
+			const auto emoji = Ui::Emoji::Find(variant);
+			if (!emoji) {
+				continue;
+			}
+			const auto j = byEmoji.find(emoji->original());
+			if (j != byEmoji.end()) {
+				found = j->second;
+				break;
+			}
+		}
+		if (found) {
+			loadInto(
+				&_digits[i],
+				found,
+				ChatHelpers::StickerLottieSize::StickerSet,
+				Size(_digitSide),
+				[=] { update(); });
+		}
+	}
+}
+
+void BirthdayEffect::loadInto(
+		not_null<Sticker*> slot,
+		not_null<DocumentData*> document,
+		ChatHelpers::StickerLottieSize sizeTag,
+		QSize box,
+		Fn<void()> ready) {
+	slot->media = document->createMediaView();
+	slot->media->checkStickerLarge();
+	slot->media->goodThumbnailWanted();
+	const auto media = slot->media;
+	rpl::single() | rpl::then(
+		document->session().downloaderTaskFinished()
+	) | rpl::filter([=] {
+		return media->loaded();
+	}) | rpl::take(1) | rpl::on_next([=] {
+		const auto sticker = document->sticker();
+		if (!sticker) {
+			return;
+		}
+		auto player = std::unique_ptr<StickerPlayer>();
+		if (sticker->isLottie()) {
+			player = std::make_unique<HistoryView::LottiePlayer>(
+				ChatHelpers::LottiePlayerFromDocument(
+					media.get(),
+					sizeTag,
+					box,
+					Lottie::Quality::High));
+		} else if (sticker->isWebm()) {
+			player = std::make_unique<HistoryView::WebmPlayer>(
+				media->owner()->location(),
+				media->bytes(),
+				box);
+		} else {
+			player = std::make_unique<HistoryView::StaticStickerPlayer>(
+				media->owner()->location(),
+				media->bytes(),
+				box);
+		}
+		player->setRepaintCallback([=] { update(); });
+		slot->usesTextColor = media->owner()->emojiUsesTextColor();
+		slot->player = std::move(player);
+		ready();
+	}, lifetime());
+}
+
+void BirthdayEffect::startAnimation() {
+	if (_started) {
+		return;
+	}
+	_started = true;
+	_lastTickTime = 0;
+	_progress = 0.;
+	_animation.start();
+	update();
+}
+
+void BirthdayEffect::tick(crl::time now) {
+	const auto delta = _lastTickTime
+		? std::min(now - _lastTickTime, kMaxFrameStep)
+		: crl::time(0);
+	_lastTickTime = now;
+	if (!paused()) {
+		_progress = std::clamp(
+			_progress + (delta / float64(kDuration)),
+			0.,
+			1.);
+	}
+	update();
+	if (_progress >= 1.) {
+		_animation.stop();
+		destroy();
+	}
+}
+
+void BirthdayEffect::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	if (_fireworks) {
+		if (!_fireworks->paint(p, rect())) {
+			destroy();
+		}
+		return;
+	} else if (!_started) {
+		return;
+	}
+	paintConfetti(p);
+	if (_age > 0) {
+		paintDigits(p);
+	}
+}
+
+void BirthdayEffect::paintConfetti(QPainter &p) {
+	if (!_confetti.player || !_confetti.player->ready()) {
+		return;
+	}
+	const auto frozen = paused();
+	const auto colored = _confetti.usesTextColor
+		? st::windowFgActive->c
+		: QColor(0, 0, 0, 0);
+	const auto info = _confetti.player->frame(
+		Size(_confettiSide),
+		colored,
+		true,
+		crl::now(),
+		frozen);
+	const auto image = info.image;
+	const auto size = image.size() / style::DevicePixelRatio();
+	const auto center = rect::center(_userpicGeometry());
+	const auto x = center.x() - (size.width() / 2);
+	const auto y = std::max(0, center.y() - (size.height() / 2));
+	const auto opacity = (_progress < kFadeOutFrom)
+		? 1.
+		: std::max(0., 1. - (_progress - kFadeOutFrom) / (1. - kFadeOutFrom));
+
+	p.setOpacity(opacity);
+	p.drawImage(Rect(x, y, size), image);
+	p.setOpacity(1.);
+
+	if (AdvanceFrame(_confetti.player.get(), info.index, frozen)) {
+		_confetti.player->markFrameShown();
+	}
+}
+
+void BirthdayEffect::paintDigits(QPainter &p) {
+	const auto count = int(_digits.size());
+	if (!count) {
+		return;
+	}
+	const auto frozen = paused();
+	const auto sz = float64(_digitSide);
+	const auto pitch = sz * kDigitPitchFactor;
+	const auto userpic = _userpicGeometry();
+	const auto sourceX = float64(rect::center(userpic).x());
+	const auto sourceY = float64(
+		userpic.y() + userpic.height() * kDigitSourceBelowFactor);
+	const auto rowLeft = (width() - pitch * (count - 1)) / 2.;
+	const auto travelX = rowLeft - sourceX;
+	const auto travelY = sourceY + sz;
+	const auto t = _progress;
+
+	for (auto i = count - 1; i >= 0; --i) {
+		auto &digit = _digits[i];
+		if (!digit.player || !digit.player->ready()) {
+			continue;
+		}
+		const auto local = Cascade(t, i, count, kCascadeWaveLength);
+		const auto scale = anim::easeOutQuint(
+			1.,
+			std::clamp(local / kCascadeScalePart, 0., 1.));
+		const auto centerX = sourceX + (pitch * i) + (local * travelX);
+		const auto centerY = sourceY - (travelY * t * t);
+		const auto drawSide = sz * scale;
+		const auto colored = digit.usesTextColor
+			? st::windowFgActive->c
+			: QColor(0, 0, 0, 0);
+		const auto info = digit.player->frame(
+			Size(_digitSide),
+			colored,
+			false,
+			crl::now(),
+			frozen);
+		p.drawImage(
+			Rect(
+				centerX - (drawSide / 2.),
+				centerY - (drawSide / 2.),
+				Size(drawSide)),
+			info.image);
+		if (AdvanceFrame(digit.player.get(), info.index, frozen)) {
+			digit.player->markFrameShown();
+		}
+	}
+}
+
+void BirthdayEffect::destroy() {
+	if (_destroying) {
+		return;
+	}
+	_destroying = true;
+	crl::on_main(this, [=] { delete this; });
+}
+
+void StartProfileBirthdayEffect(
+		not_null<Ui::RpWidget*> cover,
+		not_null<UserData*> user,
+		Fn<QRect()> userpicGeometry,
+		Fn<bool()> paused) {
+	if (PowerSaving::On(PowerSaving::kChatEffects)) {
+		return;
+	}
+	const auto effect = Ui::CreateChild<BirthdayEffect>(
+		cover.get(),
+		&user->session(),
+		Data::BirthdayAge(user->birthday()),
+		std::move(userpicGeometry),
+		std::move(paused));
+	effect->setAttribute(Qt::WA_TransparentForMouseEvents);
+	effect->setGeometry(cover->rect());
+	cover->sizeValue(
+	) | rpl::on_next([=](QSize size) {
+		effect->setGeometry(Rect(size));
+	}, effect->lifetime());
+	effect->show();
+	effect->raise();
+	effect->start();
+}
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_birthday_effect.h b/Telegram/SourceFiles/info/profile/info_profile_birthday_effect.h
new file mode 100644
index 00000000000000..46f67902cf5b67
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_birthday_effect.h
@@ -0,0 +1,24 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class UserData;
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Info::Profile {
+
+void StartProfileBirthdayEffect(
+	not_null<Ui::RpWidget*> cover,
+	not_null<UserData*> user,
+	Fn<QRect()> userpicGeometry,
+	Fn<bool()> paused);
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index a35609c38f03a0..d4450ce93c16db 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -7,95 +7,32 @@ For license and copyright information please follow this link:
 */
 #include "info/profile/info_profile_cover.h"
 
-#include "api/api_user_privacy.h"
-#include "data/data_peer_values.h"
-#include "data/data_channel.h"
-#include "data/data_chat.h"
-#include "data/data_peer.h"
-#include "data/data_user.h"
+#include "main/main_session.h"
+#include "data/data_forum_topic.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
-#include "data/data_changes.h"
 #include "data/data_session.h"
-#include "data/data_forum_topic.h"
 #include "data/stickers/data_custom_emoji.h"
-#include "info/profile/info_profile_values.h"
-#include "info/profile/info_profile_badge.h"
-#include "info/profile/info_profile_emoji_status_panel.h"
-#include "info/info_controller.h"
-#include "boxes/peers/edit_forum_topic_box.h"
-#include "boxes/report_messages_box.h"
 #include "history/view/media/history_view_sticker_player.h"
-#include "lang/lang_keys.h"
-#include "ui/boxes/show_or_premium_box.h"
-#include "ui/controls/userpic_button.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/popup_menu.h"
-#include "ui/text/text_utilities.h"
-#include "base/event_filter.h"
-#include "base/unixtime.h"
-#include "window/window_session_controller.h"
-#include "main/main_session.h"
-#include "settings/settings_premium.h"
+#include "info/profile/info_profile_values.h"
 #include "chat_helpers/stickers_lottie.h"
-#include "apiwrap.h"
-#include "api/api_peer_photo.h"
-#include "styles/style_boxes.h"
+#include "window/window_session_controller.h"
+#include "ui/painter.h"
 #include "styles/style_info.h"
 #include "styles/style_dialogs.h"
-#include "styles/style_menu_icons.h"
 
 namespace Info::Profile {
-namespace {
-
-auto MembersStatusText(int count) {
-	return tr::lng_chat_status_members(tr::now, lt_count_decimal, count);
-};
 
-auto OnlineStatusText(int count) {
-	return tr::lng_chat_status_online(tr::now, lt_count_decimal, count);
-};
-
-auto ChatStatusText(int fullCount, int onlineCount, bool isGroup) {
-	if (onlineCount > 1 && onlineCount <= fullCount) {
-		return tr::lng_chat_status_members_online(
-			tr::now,
-			lt_members_count,
-			MembersStatusText(fullCount),
-			lt_online_count,
-			OnlineStatusText(onlineCount));
-	} else if (fullCount > 0) {
-		return isGroup
-			? tr::lng_chat_status_members(
-				tr::now,
-				lt_count_decimal,
-				fullCount)
-			: tr::lng_chat_status_subscribers(
-				tr::now,
-				lt_count_decimal,
-				fullCount);
-	}
-	return isGroup
-		? tr::lng_group_status(tr::now)
-		: tr::lng_channel_status(tr::now);
-};
-
-[[nodiscard]] const style::InfoProfileCover &CoverStyle(
-		not_null<PeerData*> peer,
-		Data::ForumTopic *topic,
-		Cover::Role role) {
-	return (role == Cover::Role::EditContact)
-		? st::infoEditContactCover
-		: topic
-		? st::infoTopicCover
-		: peer->isMegagroup()
-		? st::infoProfileMegagroupCover
-		: st::infoProfileCover;
+QMargins LargeCustomEmojiMargins() {
+	const auto ratio = style::DevicePixelRatio();
+	const auto emoji = Ui::Emoji::GetSizeLarge() / ratio;
+	const auto size = Data::FrameSizeFromTag(Data::CustomEmojiSizeTag::Large)
+		/ ratio;
+	const auto left = (size - emoji) / 2;
+	const auto right = size - emoji - left;
+	return { left, left, right, right };
 }
 
-} // namespace
-
 TopicIconView::TopicIconView(
 	not_null<Data::ForumTopic*> topic,
 	Fn<bool()> paused,
@@ -119,7 +56,7 @@ TopicIconView::TopicIconView(
 	setup(topic);
 }
 
-void TopicIconView::paintInRect(QPainter &p, QRect rect) {
+void TopicIconView::paintInRect(QPainter &p, QRect rect, QColor textColor) {
 	const auto paint = [&](const QImage &image) {
 		const auto size = image.size() / style::DevicePixelRatio();
 		p.drawImage(
@@ -132,7 +69,9 @@ void TopicIconView::paintInRect(QPainter &p, QRect rect) {
 	};
 	if (_player && _player->ready()) {
 		const auto colored = _playerUsesTextColor
-			? st::windowFg->c
+			? (textColor.alpha() > 0)
+				? textColor
+				: st::windowFg->c
 			: QColor(0, 0, 0, 0);
 		paint(_player->frame(
 			st::infoTopicCover.photo.size,
@@ -162,7 +101,7 @@ void TopicIconView::setupPlayer(not_null<Data::ForumTopic*> topic) {
 			id
 		) | rpl::map([=](not_null<DocumentData*> document) {
 			return document.get();
-		});
+		}) | rpl::map_error_to_done();
 	}) | rpl::flatten_latest(
 	) | rpl::map([=](DocumentData *document)
 	-> rpl::producer<std::shared_ptr<StickerPlayer>> {
@@ -174,7 +113,7 @@ void TopicIconView::setupPlayer(not_null<Data::ForumTopic*> topic) {
 		media->goodThumbnailWanted();
 
 		return rpl::single() | rpl::then(
-			document->owner().session().downloaderTaskFinished()
+			document->session().downloaderTaskFinished()
 		) | rpl::filter([=] {
 			return media->loaded();
 		}) | rpl::take(1) | rpl::map([=] {
@@ -203,7 +142,7 @@ void TopicIconView::setupPlayer(not_null<Data::ForumTopic*> topic) {
 			return result;
 		});
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](std::shared_ptr<StickerPlayer> player) {
+	) | rpl::on_next([=](std::shared_ptr<StickerPlayer> player) {
 		_player = std::move(player);
 		if (!_player) {
 			_update();
@@ -216,7 +155,7 @@ void TopicIconView::setupImage(not_null<Data::ForumTopic*> topic) {
 	if (topic->isGeneral()) {
 		rpl::single(rpl::empty) | rpl::then(
 			style::PaletteChanged()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_image = ForumTopicGeneralIconFrame(
 				st::infoForumTopicIcon.size,
 				_generalIconFg->c);
@@ -229,7 +168,7 @@ void TopicIconView::setupImage(not_null<Data::ForumTopic*> topic) {
 		ColorIdValue(topic)
 	) | rpl::map([=](const QString &title, int32 colorId) {
 		return ForumTopicIconFrame(colorId, title, st::infoForumTopicIcon);
-	}) | rpl::start_with_next([=](QImage &&image) {
+	}) | rpl::on_next([=](QImage &&image) {
 		_image = std::move(image);
 		_update();
 	}, _lifetime);
@@ -252,470 +191,10 @@ TopicIconButton::TopicIconButton(
 , _view(topic, paused, [=] { update(); }) {
 	resize(st::infoTopicCover.photo.size);
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(this);
 		_view.paintInRect(p, rect());
 	}, lifetime());
 }
 
-Cover::Cover(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller,
-	not_null<PeerData*> peer)
-: Cover(parent, controller, peer, Role::Info, NameValue(peer)) {
-}
-
-Cover::Cover(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller,
-	not_null<Data::ForumTopic*> topic)
-: Cover(
-	parent,
-	controller,
-	topic->channel(),
-	topic,
-	Role::Info,
-	TitleValue(topic)) {
-}
-
-Cover::Cover(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller,
-	not_null<PeerData*> peer,
-	Role role,
-	rpl::producer<QString> title)
-: Cover(
-	parent,
-	controller,
-	peer,
-	nullptr,
-	role,
-	std::move(title)) {
-}
-
-Cover::Cover(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller,
-	not_null<PeerData*> peer,
-	Data::ForumTopic *topic,
-	Role role,
-	rpl::producer<QString> title)
-: FixedHeightWidget(parent, CoverStyle(peer, topic, role).height)
-, _st(CoverStyle(peer, topic, role))
-, _role(role)
-, _controller(controller)
-, _peer(peer)
-, _emojiStatusPanel(peer->isSelf()
-	? std::make_unique<EmojiStatusPanel>()
-	: nullptr)
-, _badge(
-	std::make_unique<Badge>(
-		this,
-		st::infoPeerBadge,
-		peer,
-		_emojiStatusPanel.get(),
-		[=] {
-			return controller->isGifPausedAtLeastFor(
-				Window::GifPauseReason::Layer);
-		}))
-, _userpic(topic
-	? nullptr
-	: object_ptr<Ui::UserpicButton>(
-		this,
-		controller,
-		_peer,
-		Ui::UserpicButton::Role::OpenPhoto,
-		Ui::UserpicButton::Source::PeerPhoto,
-		_st.photo))
-, _changePersonal((role == Role::Info
-	|| topic
-	|| !_peer->isUser()
-	|| _peer->isSelf()
-	|| _peer->asUser()->isBot())
-	? nullptr
-	: CreateUploadSubButton(this, _peer->asUser(), controller).get())
-, _iconButton(topic
-	? object_ptr<TopicIconButton>(this, controller, topic)
-	: nullptr)
-, _name(this, _st.name)
-, _status(this, _st.status)
-, _showLastSeen(this, tr::lng_status_lastseen_when(), _st.showLastSeen)
-, _refreshStatusTimer([this] { refreshStatusText(); }) {
-	_peer->updateFull();
-
-	_name->setSelectable(true);
-	_name->setContextCopyText(tr::lng_profile_copy_fullname(tr::now));
-
-	if (!_peer->isMegagroup()) {
-		_status->setAttribute(Qt::WA_TransparentForMouseEvents);
-	}
-
-	setupShowLastSeen();
-
-	_badge->setPremiumClickCallback([=] {
-		if (const auto panel = _emojiStatusPanel.get()) {
-			panel->show(_controller, _badge->widget(), _badge->sizeTag());
-		} else {
-			::Settings::ShowEmojiStatusPremium(_controller, _peer);
-		}
-	});
-	_badge->updated() | rpl::start_with_next([=] {
-		refreshNameGeometry(width());
-	}, _name->lifetime());
-
-	initViewers(std::move(title));
-	setupChildGeometry();
-
-	if (_userpic) {
-	} else if (topic->canEdit()) {
-		_iconButton->setClickedCallback([=] {
-			_controller->show(Box(
-				EditForumTopicBox,
-				_controller,
-				topic->history(),
-				topic->rootId()));
-		});
-	} else {
-		_iconButton->setAttribute(Qt::WA_TransparentForMouseEvents);
-	}
-}
-
-void Cover::setupShowLastSeen() {
-	const auto user = _peer->asUser();
-	if (_st.showLastSeenVisible
-		&& user
-		&& !user->isSelf()
-		&& !user->isBot()
-		&& !user->isServiceUser()
-		&& user->session().premiumPossible()) {
-		if (user->session().premium()) {
-			if (user->lastseen().isHiddenByMe()) {
-				user->updateFullForced();
-			}
-			_showLastSeen->hide();
-			return;
-		}
-
-		rpl::combine(
-			user->session().changes().peerFlagsValue(
-				user,
-				Data::PeerUpdate::Flag::OnlineStatus),
-			Data::AmPremiumValue(&user->session())
-		) | rpl::start_with_next([=](auto, bool premium) {
-			const auto wasShown = !_showLastSeen->isHidden();
-			const auto hiddenByMe = user->lastseen().isHiddenByMe();
-			const auto shown = hiddenByMe
-				&& !user->lastseen().isOnline(base::unixtime::now())
-				&& !premium
-				&& user->session().premiumPossible();
-			_showLastSeen->setVisible(shown);
-			if (wasShown && premium && hiddenByMe) {
-				user->updateFullForced();
-			}
-		}, _showLastSeen->lifetime());
-
-		_controller->session().api().userPrivacy().value(
-			Api::UserPrivacy::Key::LastSeen
-		) | rpl::filter([=](Api::UserPrivacy::Rule rule) {
-			return (rule.option == Api::UserPrivacy::Option::Everyone);
-		}) | rpl::start_with_next([=] {
-			if (user->lastseen().isHiddenByMe()) {
-				user->updateFullForced();
-			}
-		}, _showLastSeen->lifetime());
-	} else {
-		_showLastSeen->hide();
-	}
-
-	using TextTransform = Ui::RoundButton::TextTransform;
-	_showLastSeen->setTextTransform(TextTransform::NoTransform);
-	_showLastSeen->setFullRadius(true);
-
-	_showLastSeen->setClickedCallback([=] {
-		const auto type = Ui::ShowOrPremium::LastSeen;
-		auto box = Box(Ui::ShowOrPremiumBox, type, user->shortName(), [=] {
-			_controller->session().api().userPrivacy().save(
-				::Api::UserPrivacy::Key::LastSeen,
-				{});
-		}, [=] {
-			::Settings::ShowPremium(_controller, u"lastseen_hidden"_q);
-		});
-		_controller->show(std::move(box));
-	});
-}
-
-void Cover::setupChildGeometry() {
-	widthValue(
-	) | rpl::start_with_next([this](int newWidth) {
-		if (_userpic) {
-			_userpic->moveToLeft(_st.photoLeft, _st.photoTop, newWidth);
-		} else {
-			_iconButton->moveToLeft(_st.photoLeft, _st.photoTop, newWidth);
-		}
-		if (_changePersonal) {
-			_changePersonal->moveToLeft(
-				(_st.photoLeft
-					+ _st.photo.photoSize
-					- _changePersonal->width()
-					+ st::infoEditContactPersonalLeft),
-				(_userpic->y()
-					+ _userpic->height()
-					- _changePersonal->height()));
-		}
-		refreshNameGeometry(newWidth);
-		refreshStatusGeometry(newWidth);
-	}, lifetime());
-}
-
-Cover *Cover::setOnlineCount(rpl::producer<int> &&count) {
-	_onlineCount = std::move(count);
-	return this;
-}
-
-std::optional<QImage> Cover::updatedPersonalPhoto() const {
-	return _personalChosen;
-}
-
-void Cover::initViewers(rpl::producer<QString> title) {
-	using Flag = Data::PeerUpdate::Flag;
-	std::move(
-		title
-	) | rpl::start_with_next([=](const QString &title) {
-		_name->setText(title);
-		refreshNameGeometry(width());
-	}, lifetime());
-
-	rpl::combine(
-		_peer->session().changes().peerFlagsValue(
-			_peer,
-			Flag::OnlineStatus | Flag::Members),
-		_onlineCount.value()
-	) | rpl::start_with_next([=] {
-		refreshStatusText();
-	}, lifetime());
-
-	_peer->session().changes().peerFlagsValue(
-		_peer,
-		(_peer->isUser() ? Flag::IsContact : Flag::Rights)
-	) | rpl::start_with_next([=] {
-		refreshUploadPhotoOverlay();
-	}, lifetime());
-
-	setupChangePersonal();
-}
-
-void Cover::refreshUploadPhotoOverlay() {
-	if (!_userpic) {
-		return;
-	} else if (_role == Role::EditContact) {
-		_userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
-		return;
-	}
-
-	const auto canChange = [&] {
-		if (const auto chat = _peer->asChat()) {
-			return chat->canEditInformation();
-		} else if (const auto channel = _peer->asChannel()) {
-			return channel->canEditInformation();
-		} else if (const auto user = _peer->asUser()) {
-			return user->isSelf()
-				|| (user->isContact()
-					&& !user->isInaccessible()
-					&& !user->isServiceUser());
-		}
-		Unexpected("Peer type in Info::Profile::Cover.");
-	}();
-
-	_userpic->switchChangePhotoOverlay(canChange, [=](
-			Ui::UserpicButton::ChosenImage chosen) {
-		using ChosenType = Ui::UserpicButton::ChosenType;
-		auto result = Api::PeerPhoto::UserPhoto{
-			base::take<QImage>(chosen.image), // Strange MSVC bug with take.
-			chosen.markup.documentId,
-			chosen.markup.colors,
-		};
-		switch (chosen.type) {
-		case ChosenType::Set:
-			_userpic->showCustom(base::duplicate(result.image));
-			_peer->session().api().peerPhoto().upload(
-				_peer,
-				std::move(result));
-			break;
-		case ChosenType::Suggest:
-			_peer->session().api().peerPhoto().suggest(
-				_peer,
-				std::move(result));
-			break;
-		}
-	});
-
-	const auto canReport = [=, peer = _peer] {
-		if (!peer->hasUserpic()) {
-			return false;
-		}
-		const auto user = peer->asUser();
-		if (!user) {
-			if (canChange) {
-				return false;
-			}
-		} else if (user->hasPersonalPhoto()
-				|| user->isSelf()
-				|| user->isInaccessible()
-				|| user->isRepliesChat()
-				|| user->isVerifyCodes()
-				|| (user->botInfo && user->botInfo->canEditInformation)
-				|| user->isServiceUser()) {
-			return false;
-		}
-		return true;
-	};
-
-	const auto contextMenu = _userpic->lifetime()
-		.make_state<base::unique_qptr<Ui::PopupMenu>>();
-	const auto showMenu = [=, peer = _peer, controller = _controller](
-			not_null<Ui::RpWidget*> parent) {
-		if (!canReport()) {
-			return false;
-		}
-		*contextMenu = base::make_unique_q<Ui::PopupMenu>(
-			parent,
-			st::popupMenuWithIcons);
-		contextMenu->get()->addAction(tr::lng_profile_report(tr::now), [=] {
-			controller->show(
-				ReportProfilePhotoBox(
-					peer,
-					peer->owner().photo(peer->userpicPhotoId())),
-				Ui::LayerOption::CloseOther);
-		}, &st::menuIconReport);
-		contextMenu->get()->popup(QCursor::pos());
-		return true;
-	};
-	base::install_event_filter(_userpic, [showMenu, raw = _userpic.data()](
-			not_null<QEvent*> e) {
-		return (e->type() == QEvent::ContextMenu && showMenu(raw))
-			? base::EventFilterResult::Cancel
-			: base::EventFilterResult::Continue;
-	});
-
-	if (const auto user = _peer->asUser()) {
-		_userpic->resetPersonalRequests(
-		) | rpl::start_with_next([=] {
-			user->session().api().peerPhoto().clearPersonal(user);
-			_userpic->showSource(Ui::UserpicButton::Source::PeerPhoto);
-		}, lifetime());
-	}
-}
-
-void Cover::setupChangePersonal() {
-	if (!_changePersonal) {
-		return;
-	}
-
-	_changePersonal->chosenImages(
-	) | rpl::start_with_next([=](Ui::UserpicButton::ChosenImage &&chosen) {
-		if (chosen.type == Ui::UserpicButton::ChosenType::Suggest) {
-			_peer->session().api().peerPhoto().suggest(
-				_peer,
-				{
-					std::move(chosen.image),
-					chosen.markup.documentId,
-					chosen.markup.colors,
-				});
-		} else {
-			_personalChosen = std::move(chosen.image);
-			_userpic->showCustom(base::duplicate(*_personalChosen));
-			_changePersonal->overrideHasPersonalPhoto(true);
-			_changePersonal->showSource(
-				Ui::UserpicButton::Source::NonPersonalIfHasPersonal);
-		}
-	}, _changePersonal->lifetime());
-
-	_changePersonal->resetPersonalRequests(
-	) | rpl::start_with_next([=] {
-		_personalChosen = QImage();
-		_userpic->showSource(
-			Ui::UserpicButton::Source::NonPersonalPhoto);
-		_changePersonal->overrideHasPersonalPhoto(false);
-		_changePersonal->showCustom(QImage());
-	}, _changePersonal->lifetime());
-}
-
-void Cover::refreshStatusText() {
-	auto hasMembersLink = [&] {
-		if (auto megagroup = _peer->asMegagroup()) {
-			return megagroup->canViewMembers();
-		}
-		return false;
-	}();
-	auto statusText = [&]() -> TextWithEntities {
-		using namespace Ui::Text;
-		auto currentTime = base::unixtime::now();
-		if (auto user = _peer->asUser()) {
-			const auto result = Data::OnlineTextFull(user, currentTime);
-			const auto showOnline = Data::OnlineTextActive(user, currentTime);
-			const auto updateIn = Data::OnlineChangeTimeout(user, currentTime);
-			if (showOnline) {
-				_refreshStatusTimer.callOnce(updateIn);
-			}
-			return showOnline
-				? Ui::Text::Colorized(result)
-				: TextWithEntities{ .text = result };
-		} else if (auto chat = _peer->asChat()) {
-			if (!chat->amIn()) {
-				return tr::lng_chat_status_unaccessible({}, WithEntities);
-			}
-			const auto onlineCount = _onlineCount.current();
-			const auto fullCount = std::max(
-				chat->count,
-				int(chat->participants.size()));
-			return { .text = ChatStatusText(fullCount, onlineCount, true) };
-		} else if (auto channel = _peer->asChannel()) {
-			const auto onlineCount = _onlineCount.current();
-			const auto fullCount = qMax(channel->membersCount(), 1);
-			auto result = ChatStatusText(
-				fullCount,
-				onlineCount,
-				channel->isMegagroup());
-			return hasMembersLink
-				? Ui::Text::Link(result)
-				: TextWithEntities{ .text = result };
-		}
-		return tr::lng_chat_status_unaccessible(tr::now, WithEntities);
-	}();
-	_status->setMarkedText(statusText);
-	if (hasMembersLink) {
-		_status->setLink(1, std::make_shared<LambdaClickHandler>([=] {
-			_showSection.fire(Section::Type::Members);
-		}));
-	}
-	refreshStatusGeometry(width());
-}
-
-Cover::~Cover() {
-}
-
-void Cover::refreshNameGeometry(int newWidth) {
-	auto nameWidth = newWidth - _st.nameLeft - _st.rightSkip;
-	if (const auto widget = _badge->widget()) {
-		nameWidth -= st::infoVerifiedCheckPosition.x() + widget->width();
-	}
-	_name->resizeToNaturalWidth(nameWidth);
-	_name->moveToLeft(_st.nameLeft, _st.nameTop, newWidth);
-	const auto badgeLeft = _st.nameLeft + _name->width();
-	const auto badgeTop = _st.nameTop;
-	const auto badgeBottom = _st.nameTop + _name->height();
-	_badge->move(badgeLeft, badgeTop, badgeBottom);
-}
-
-void Cover::refreshStatusGeometry(int newWidth) {
-	auto statusWidth = newWidth - _st.statusLeft - _st.rightSkip;
-	_status->resizeToWidth(statusWidth);
-	_status->moveToLeft(_st.statusLeft, _st.statusTop, newWidth);
-	const auto left = _st.statusLeft + _status->textMaxWidth();
-	_showLastSeen->moveToLeft(
-		left + _st.showLastSeenPosition.x(),
-		_st.showLastSeenPosition.y(),
-		newWidth);
-}
-
 } // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.h b/Telegram/SourceFiles/info/profile/info_profile_cover.h
index c4f5a73aef1ffd..3499809b041b57 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.h
@@ -7,22 +7,12 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "ui/wrap/padding_wrap.h"
 #include "ui/abstract_button.h"
-#include "base/timer.h"
 
 namespace Window {
 class SessionController;
 } // namespace Window
 
-namespace Ui {
-class UserpicButton;
-class FlatLabel;
-template <typename Widget>
-class SlideWrap;
-class RoundButton;
-} // namespace Ui
-
 namespace HistoryView {
 class StickerPlayer;
 } // namespace HistoryView
@@ -31,19 +21,9 @@ namespace Data {
 class ForumTopic;
 } // namespace Data
 
-namespace Info {
-class Controller;
-class Section;
-} // namespace Info
-
-namespace style {
-struct InfoProfileCover;
-} // namespace style
-
 namespace Info::Profile {
 
-class EmojiStatusPanel;
-class Badge;
+[[nodiscard]] QMargins LargeCustomEmojiMargins();
 
 class TopicIconView final {
 public:
@@ -57,7 +37,10 @@ class TopicIconView final {
 		Fn<void()> update,
 		const style::color &generalIconFg);
 
-	void paintInRect(QPainter &p, QRect rect);
+	void paintInRect(
+		QPainter &p,
+		QRect rect,
+		QColor textColor = QColor(0, 0, 0, 0));
 
 private:
 	using StickerPlayer = HistoryView::StickerPlayer;
@@ -93,75 +76,4 @@ class TopicIconButton final : public Ui::AbstractButton {
 
 };
 
-class Cover final : public Ui::FixedHeightWidget {
-public:
-	enum class Role {
-		Info,
-		EditContact,
-	};
-
-	Cover(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		not_null<PeerData*> peer);
-	Cover(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		not_null<Data::ForumTopic*> topic);
-	Cover(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		not_null<PeerData*> peer,
-		Role role,
-		rpl::producer<QString> title);
-	~Cover();
-
-	Cover *setOnlineCount(rpl::producer<int> &&count);
-
-	[[nodiscard]] rpl::producer<Section> showSection() const {
-		return _showSection.events();
-	}
-	[[nodiscard]] std::optional<QImage> updatedPersonalPhoto() const;
-
-private:
-	Cover(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		not_null<PeerData*> peer,
-		Data::ForumTopic *topic,
-		Role role,
-		rpl::producer<QString> title);
-
-	void setupShowLastSeen();
-	void setupChildGeometry();
-	void initViewers(rpl::producer<QString> title);
-	void refreshStatusText();
-	void refreshNameGeometry(int newWidth);
-	void refreshStatusGeometry(int newWidth);
-	void refreshUploadPhotoOverlay();
-	void setupChangePersonal();
-
-	const style::InfoProfileCover &_st;
-
-	const Role _role = Role::Info;
-	const not_null<Window::SessionController*> _controller;
-	const not_null<PeerData*> _peer;
-	const std::unique_ptr<EmojiStatusPanel> _emojiStatusPanel;
-	const std::unique_ptr<Badge> _badge;
-	rpl::variable<int> _onlineCount;
-
-	const object_ptr<Ui::UserpicButton> _userpic;
-	Ui::UserpicButton *_changePersonal = nullptr;
-	std::optional<QImage> _personalChosen;
-	object_ptr<TopicIconButton> _iconButton;
-	object_ptr<Ui::FlatLabel> _name = { nullptr };
-	object_ptr<Ui::FlatLabel> _status = { nullptr };
-	object_ptr<Ui::RoundButton> _showLastSeen = { nullptr };
-	//object_ptr<CoverDropArea> _dropArea = { nullptr };
-	base::Timer _refreshStatusTimer;
-
-	rpl::event_stream<Section> _showSection;
-
-};
-
 } // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
index 949890606551b4..e85f1866ee0706 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
@@ -70,7 +70,7 @@ EmojiStatusPanel::~EmojiStatusPanel() {
 	}
 }
 
-void EmojiStatusPanel::setChooseFilter(Fn<bool(DocumentId)> filter) {
+void EmojiStatusPanel::setChooseFilter(Fn<bool(EmojiStatusId)> filter) {
 	_chooseFilter = std::move(filter);
 }
 
@@ -83,6 +83,7 @@ void EmojiStatusPanel::show(
 		.button = button,
 		.animationSizeTag = animationSizeTag,
 		.ensureAddedEmojiId = controller->session().user()->emojiStatusId(),
+		.withCollectibles = true,
 	});
 }
 
@@ -94,7 +95,7 @@ void EmojiStatusPanel::show(Descriptor &&descriptor) {
 		_panel->shownValue(
 		) | rpl::filter([=] {
 			return (_panelButton != nullptr);
-		}) | rpl::start_with_next([=](bool shown) {
+		}) | rpl::on_next([=](bool shown) {
 			if (shown) {
 				_panelButton->installEventFilter(_panel.get());
 			} else {
@@ -111,8 +112,8 @@ void EmojiStatusPanel::show(Descriptor &&descriptor) {
 	_panelButton = button;
 	_animationSizeTag = descriptor.animationSizeTag;
 	const auto feed = [=, now = descriptor.ensureAddedEmojiId](
-			std::vector<DocumentId> list) {
-		list.insert(begin(list), 0);
+			std::vector<EmojiStatusId> list) {
+		list.insert(begin(list), EmojiStatusId());
 		if (now && !ranges::contains(list, now)) {
 			list.push_back(now);
 		}
@@ -121,8 +122,12 @@ void EmojiStatusPanel::show(Descriptor &&descriptor) {
 	if (descriptor.backgroundEmojiMode) {
 		controller->session().api().peerPhoto().emojiListValue(
 			Api::PeerPhoto::EmojiListType::Background
-		) | rpl::start_with_next([=](std::vector<DocumentId> &&list) {
-			feed(std::move(list));
+		) | rpl::on_next([=](std::vector<DocumentId> &&list) {
+			auto tmp = std::vector<EmojiStatusId>();
+			for (const auto &id : list) {
+				tmp.push_back(EmojiStatusId{ .documentId = id });
+			}
+			feed(std::move(tmp));
 		}, _panel->lifetime());
 	} else if (descriptor.channelStatusMode) {
 		const auto &statuses = controller->session().data().emojiStatuses();
@@ -193,6 +198,8 @@ void EmojiStatusPanel::create(const Descriptor &descriptor) {
 	using Mode = ChatHelpers::TabbedSelector::Mode;
 	const auto controller = descriptor.controller;
 	const auto body = controller->window().widget()->bodyWidget();
+	auto features = ChatHelpers::ComposeFeatures();
+	features.collectibleStatus = descriptor.withCollectibles;
 	_panel = base::make_unique_q<ChatHelpers::TabbedPanel>(
 		body,
 		controller,
@@ -211,6 +218,7 @@ void EmojiStatusPanel::create(const Descriptor &descriptor) {
 					? Mode::ChannelStatus
 					: Mode::EmojiStatus),
 				.customTextColor = descriptor.customTextColor,
+				.features = features,
 			}));
 	_customTextColor = descriptor.customTextColor;
 	_backgroundEmojiMode = descriptor.backgroundEmojiMode;
@@ -223,20 +231,23 @@ void EmojiStatusPanel::create(const Descriptor &descriptor) {
 	_panel->hide();
 
 	struct Chosen {
-		DocumentId id = 0;
+		EmojiStatusId id;
 		TimeId until = 0;
 		Ui::MessageSendingAnimationFrom animation;
 	};
 
 	_panel->selector()->contextMenuRequested(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_panel->selector()->showMenuWithDetails({});
 	}, _panel->lifetime());
 
 	auto statusChosen = _panel->selector()->customEmojiChosen(
 	) | rpl::map([=](ChatHelpers::FileChosen data) {
 		return Chosen{
-			.id = data.document->id,
+			.id = {
+				data.collectible ? DocumentId() : data.document->id,
+				data.collectible,
+			},
 			.until = data.options.scheduled,
 			.animation = data.messageSendingFrom,
 		};
@@ -251,14 +262,14 @@ void EmojiStatusPanel::create(const Descriptor &descriptor) {
 		rpl::merge(
 			std::move(statusChosen),
 			std::move(emojiChosen)
-		) | rpl::start_with_next([=](const Chosen &chosen) {
+		) | rpl::on_next([=](const Chosen &chosen) {
 			const auto owner = &controller->session().data();
 			startAnimation(owner, body, chosen.id, chosen.animation);
 			_someCustomChosen.fire({ chosen.id, chosen.until });
 			_panel->hideAnimated();
 		}, _panel->lifetime());
 	} else {
-		const auto weak = Ui::MakeWeak(_panel.get());
+		const auto weak = base::make_weak(_panel.get());
 		const auto accept = [=](Chosen chosen) {
 			Expects(chosen.until != Selector::kPickCustomTimeId);
 
@@ -275,7 +286,7 @@ void EmojiStatusPanel::create(const Descriptor &descriptor) {
 			std::move(emojiChosen)
 		) | rpl::filter([=](const Chosen &chosen) {
 			return filter(controller, chosen.id);
-		}) | rpl::start_with_next([=](const Chosen &chosen) {
+		}) | rpl::on_next([=](const Chosen &chosen) {
 			if (chosen.until == Selector::kPickCustomTimeId) {
 				_panel->hideAnimated();
 				controller->show(Box(PickUntilBox, [=](TimeId seconds) {
@@ -291,7 +302,7 @@ void EmojiStatusPanel::create(const Descriptor &descriptor) {
 
 bool EmojiStatusPanel::filter(
 		not_null<Window::SessionController*> controller,
-		DocumentId chosenId) const {
+		EmojiStatusId chosenId) const {
 	if (_chooseFilter) {
 		return _chooseFilter(chosenId);
 	} else if (chosenId && !controller->session().premium()) {
@@ -304,13 +315,16 @@ bool EmojiStatusPanel::filter(
 void EmojiStatusPanel::startAnimation(
 		not_null<Data::Session*> owner,
 		not_null<Ui::RpWidget*> body,
-		DocumentId statusId,
+		EmojiStatusId statusId,
 		Ui::MessageSendingAnimationFrom from) {
 	if (!_panelButton || !statusId) {
 		return;
 	}
+	const auto documentId = statusId.collectible
+		? statusId.collectible->documentId
+		: statusId.documentId;
 	auto args = Ui::ReactionFlyAnimationArgs{
-		.id = { { statusId } },
+		.id = { { documentId } },
 		.flyIcon = from.frame,
 		.flyFrom = body->mapFromGlobal(from.globalStartGeometry),
 		.forceFirstFrame = _backgroundEmojiMode,
diff --git a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.h b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.h
index 9777cfcfabdc94..16040e0258fa45 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.h
@@ -40,7 +40,7 @@ class EmojiStatusPanel final {
 	EmojiStatusPanel();
 	~EmojiStatusPanel();
 
-	void setChooseFilter(Fn<bool(DocumentId)> filter);
+	void setChooseFilter(Fn<bool(EmojiStatusId)> filter);
 
 	void show(
 		not_null<Window::SessionController*> controller,
@@ -52,16 +52,17 @@ class EmojiStatusPanel final {
 		not_null<Window::SessionController*> controller;
 		not_null<QWidget*> button;
 		Data::CustomEmojiSizeTag animationSizeTag = {};
-		DocumentId ensureAddedEmojiId = 0;
+		EmojiStatusId ensureAddedEmojiId;
 		Fn<QColor()> customTextColor;
 		bool backgroundEmojiMode = false;
 		bool channelStatusMode = false;
+		bool withCollectibles = false;
 	};
 	void show(Descriptor &&descriptor);
 	void repaint();
 
 	struct CustomChosen {
-		DocumentId id = 0;
+		EmojiStatusId id;
 		TimeId until = 0;
 	};
 	[[nodiscard]] rpl::producer<CustomChosen> someCustomChosen() const {
@@ -74,17 +75,17 @@ class EmojiStatusPanel final {
 	void create(const Descriptor &descriptor);
 	[[nodiscard]] bool filter(
 		not_null<Window::SessionController*> controller,
-		DocumentId chosenId) const;
+		EmojiStatusId chosenId) const;
 
 	void startAnimation(
 		not_null<Data::Session*> owner,
 		not_null<Ui::RpWidget*> body,
-		DocumentId statusId,
+		EmojiStatusId statusId,
 		Ui::MessageSendingAnimationFrom from);
 
 	base::unique_qptr<ChatHelpers::TabbedPanel> _panel;
 	Fn<QColor()> _customTextColor;
-	Fn<bool(DocumentId)> _chooseFilter;
+	Fn<bool(EmojiStatusId)> _chooseFilter;
 	QPointer<QWidget> _panelButton;
 	std::unique_ptr<Ui::EmojiFlyAnimation> _animation;
 	rpl::event_stream<CustomChosen> _someCustomChosen;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_icon.cpp b/Telegram/SourceFiles/info/profile/info_profile_icon.cpp
index 9f8dee91095d59..174b144cf85466 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_icon.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_icon.cpp
@@ -25,14 +25,10 @@ FloatingIcon::FloatingIcon(
 : RpWidget(parent)
 , _icon(&icon)
 , _point(position) {
-	resize(
-		_point.x() + _icon->width(),
-		_point.y() + _icon->height());
+	setGeometry(QRect(
+		QPoint(0, 0),
+		QSize(_point.x() + _icon->width(), _point.y() + _icon->height())));
 	setAttribute(Qt::WA_TransparentForMouseEvents);
-	parent->widthValue(
-	) | rpl::start_with_next(
-		[this] { moveToLeft(0, 0); },
-		lifetime());
 }
 
 void FloatingIcon::paintEvent(QPaintEvent *e) {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
index 5a9a819420c7e2..ddc7286163e43f 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
@@ -7,47 +7,143 @@ For license and copyright information please follow this link:
 */
 #include "info/profile/info_profile_inner_widget.h"
 
-#include "info/info_memento.h"
 #include "info/info_controller.h"
+#include "info/info_memento.h"
 #include "info/profile/info_profile_widget.h"
-#include "info/profile/info_profile_text.h"
-#include "info/profile/info_profile_values.h"
-#include "info/profile/info_profile_cover.h"
 #include "info/profile/info_profile_icon.h"
 #include "info/profile/info_profile_members.h"
+#include "info/profile/info_profile_music_button.h"
+#include "info/profile/info_profile_top_bar.h"
 #include "info/profile/info_profile_actions.h"
 #include "info/media/info_media_buttons.h"
-#include "boxes/abstract_box.h"
-#include "boxes/add_contact_box.h"
+#include "info/saved/info_saved_music_widget.h"
 #include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_document.h"
 #include "data/data_forum_topic.h"
+#include "data/data_peer.h"
 #include "data/data_photo.h"
 #include "data/data_file_origin.h"
-#include "ui/boxes/confirm_box.h"
-#include "mainwidget.h"
+#include "data/data_user.h"
+#include "data/data_saved_music.h"
+#include "data/data_saved_sublist.h"
+#include "info/saved/info_saved_music_common.h"
+#include "info_profile_actions.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
 #include "api/api_peer_photo.h"
-#include "window/main_window.h"
-#include "window/window_session_controller.h"
-#include "storage/storage_shared_media.h"
 #include "lang/lang_keys.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "ui/text/format_song_document_name.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
+#include "ui/widgets/labels.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
-#include "ui/widgets/box_content_divider.h"
-#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/vertical_layout.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/painter.h"
+#include "ui/vertical_list.h"
 #include "ui/ui_utility.h"
-#include "data/data_channel.h"
-#include "data/data_shared_media.h"
 #include "styles/style_info.h"
-#include "styles/style_boxes.h"
 
 namespace Info {
 namespace Profile {
 
+namespace {
+
+void AddSavedMusic(
+		not_null<Ui::VerticalLayout*> layout,
+		not_null<Controller*> controller,
+		not_null<PeerData*> peer,
+		rpl::producer<std::optional<QColor>> topBarColor) {
+	const auto wrap = layout->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			layout,
+			object_ptr<Ui::VerticalLayout>(layout)));
+	Info::Saved::SetupSavedMusic(
+		wrap->entity(),
+		controller,
+		peer,
+		std::move(topBarColor));
+	using namespace rpl::mappers;
+	wrap->toggleOn(
+		wrap->entity()->heightValue() | rpl::map(_1 > 0),
+		anim::type::instant);
+}
+
+void AddUnofficialSecurityRiskWarning(
+		not_null<Ui::VerticalLayout*> layout,
+		not_null<UserData*> user) {
+	const auto wrap = layout->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			layout,
+			object_ptr<Ui::VerticalLayout>(layout)));
+	const auto content = wrap->entity();
+	user->session().changes().peerFlagsValue(
+		user,
+		Data::PeerUpdate::Flag::FullInfo
+	) | rpl::on_next([=] {
+		while (content->count()) {
+			delete content->widgetAt(0);
+		}
+		if (user->unofficialSecurityRisk()) {
+			auto helper = Ui::Text::CustomEmojiHelper();
+			auto icon = helper.paletteDependent({
+				.factory = [] {
+					const auto s = st::infoSecurityRiskIconSize;
+					const auto ratio = style::DevicePixelRatio();
+					const auto rect = QRect(0, 0, s, s);
+					auto result = QImage(
+						rect.size() * ratio,
+						QImage::Format_ARGB32_Premultiplied);
+					result.setDevicePixelRatio(ratio);
+					result.fill(Qt::transparent);
+
+					auto p = QPainter(&result);
+					auto hq = PainterHighQualityEnabler(p);
+					p.setPen(Qt::NoPen);
+					p.setBrush(st::attentionButtonFg);
+					p.drawEllipse(rect);
+
+					p.setPen(st::windowFgActive);
+					p.setFont(st::semiboldFont);
+					p.drawText(rect, u"!"_q, style::al_center);
+
+					p.end();
+					return result;
+				},
+				.margin = st::infoSecurityRiskIconMargin,
+			});
+			auto label = object_ptr<Ui::FlatLabel>(
+				content,
+				tr::lng_profile_unofficial_warning(
+					lt_icon,
+					rpl::single(std::move(icon)),
+					lt_name,
+					rpl::single(TextWithEntities{ user->firstName }),
+					tr::marked),
+				st::defaultDividerLabel.label,
+				st::defaultPopupMenu,
+				helper.context([=] { content->update(); }));
+			content->add(object_ptr<Ui::DividerLabel>(
+				content,
+				std::move(label),
+				st::defaultBoxDividerLabelPadding,
+				st::defaultDividerLabel.bar,
+				RectParts()));
+		}
+		content->resizeToWidth(content->width());
+	}, content->lifetime());
+	using namespace rpl::mappers;
+	wrap->toggleOn(
+		content->heightValue() | rpl::map(_1 > 0),
+		anim::type::instant);
+}
+
+} // namespace
+
 InnerWidget::InnerWidget(
 	QWidget *parent,
 	not_null<Controller*> controller,
@@ -57,9 +153,10 @@ InnerWidget::InnerWidget(
 , _peer(_controller->key().peer())
 , _migrated(_controller->migrated())
 , _topic(_controller->key().topic())
+, _sublist(_controller->key().sublist())
 , _content(setupContent(this, origin)) {
 	_content->heightValue(
-	) | rpl::start_with_next([this](int height) {
+	) | rpl::on_next([this](int height) {
 		if (!_inResize) {
 			resizeToWidth(width());
 			updateDesiredHeight();
@@ -67,15 +164,18 @@ InnerWidget::InnerWidget(
 	}, lifetime());
 }
 
+rpl::producer<> InnerWidget::backRequest() const {
+	return _backClicks.events();
+}
+
 object_ptr<Ui::RpWidget> InnerWidget::setupContent(
 		not_null<RpWidget*> parent,
 		Origin origin) {
-	auto result = object_ptr<Ui::VerticalLayout>(parent);
 	if (const auto user = _peer->asUser()) {
 		user->session().changes().peerFlagsValue(
 			user,
 			Data::PeerUpdate::Flag::FullInfo
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto &photos = user->session().api().peerPhoto();
 			if (const auto original = photos.nonPersonalPhoto(user)) {
 				// Preload it for the edit contact box.
@@ -85,62 +185,89 @@ object_ptr<Ui::RpWidget> InnerWidget::setupContent(
 			}
 		}, lifetime());
 	}
-	_cover = _topic
-		? result->add(object_ptr<Cover>(
-			result,
-			_controller->parentController(),
-			_topic))
-		: result->add(object_ptr<Cover>(
-			result,
-			_controller->parentController(),
-			_peer));
-	_cover->showSection(
-	) | rpl::start_with_next([=](Section section) {
-		_controller->showSection(_topic
-			? std::make_shared<Info::Memento>(_topic, section)
-			: std::make_shared<Info::Memento>(_peer, section));
-	}, _cover->lifetime());
-	_cover->setOnlineCount(rpl::single(0));
-	if (_topic) {
-		if (_topic->creating()) {
-			return result;
-		}
-		result->add(SetupDetails(_controller, parent, _topic));
-	} else {
-		result->add(SetupDetails(_controller, parent, _peer, origin));
+
+	auto result = object_ptr<Ui::VerticalLayout>(parent);
+
+	const auto musicPeer = _sublist
+		? _sublist->sublistPeer().get()
+		: _peer.get();
+	AddSavedMusic(
+		result.data(),
+		_controller,
+		musicPeer,
+		_topBarColor.value());
+	if (const auto user = _peer->asUser()) {
+		AddUnofficialSecurityRiskWarning(result.data(), user);
 	}
-	result->add(setupSharedMedia(result.data()));
-	if (_topic) {
+
+	auto stack = SectionStack(result.data());
+	if (_topic && _topic->creating()) {
+		stack.finalize();
 		return result;
 	}
+
+	BuildProfileDetailsSections(
+		stack,
+		_controller,
+		_peer,
+		_topic,
+		_sublist,
+		origin);
+
+	auto sharedTracker = Ui::MultiSlideTracker();
 	{
-		auto buttons = SetupChannelMembersAndManage(
+		auto sharedMediaWidget = setupSharedMedia(
+			result.data(),
+			sharedTracker);
+		const auto raw = sharedMediaWidget.data();
+		_sharedMediaWrap = raw;
+		stack.addPlainSeparator();
+		stack.add(Section{
+			.widget = std::move(sharedMediaWidget),
+			.shown = raw->toggledValue(),
+		});
+	}
+	if (_topic || _sublist) {
+		stack.finalize();
+		return result;
+	}
+	if (auto manage = SetupChannelMembersAndManage(
 			_controller,
 			result.data(),
-			_peer);
-		if (buttons) {
-			result->add(std::move(buttons));
-		}
+			_peer)) {
+		const auto raw = static_cast<Ui::SlideWrap<Ui::RpWidget>*>(
+			manage.data());
+		stack.addPlainSeparator();
+		stack.add(Section{
+			.widget = std::move(manage),
+			.shown = raw->toggledValue(),
+		});
 	}
 	if (auto actions = SetupActions(_controller, result.data(), _peer)) {
-		result->add(object_ptr<Ui::BoxContentDivider>(result));
-		result->add(std::move(actions));
+		stack.addPlainSeparator();
+		stack.add(Section{
+			.widget = std::move(actions),
+			.shown = rpl::single(true),
+		});
 	}
-	if (_peer->isChat() || _peer->isMegagroup()) {
-		setupMembers(result.data());
+	if ((_peer->isChat() || _peer->isMegagroup())
+		&& !_peer->isMonoforum()) {
+		stack.addPlainSeparator();
+		stack.add(makeMembersSection(result.data()));
 	}
+	stack.finalize();
 	return result;
 }
 
-void InnerWidget::setupMembers(not_null<Ui::VerticalLayout*> container) {
-	auto wrap = container->add(object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-		container,
-		object_ptr<Ui::VerticalLayout>(container)));
-	const auto inner = wrap->entity();
-	inner->add(object_ptr<Ui::BoxContentDivider>(inner));
+Section InnerWidget::makeMembersSection(not_null<QWidget*> parent) {
+	auto wrap = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		parent,
+		object_ptr<Ui::VerticalLayout>(parent));
+	const auto raw = wrap.data();
+	const auto inner = raw->entity();
 	_members = inner->add(object_ptr<Members>(inner, _controller));
 	_members->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		auto min = (request.ymin < 0)
 			? request.ymin
 			: MapFrom(this, _members, QPoint(0, request.ymin)).y();
@@ -151,29 +278,39 @@ void InnerWidget::setupMembers(not_null<Ui::VerticalLayout*> container) {
 			: MapFrom(this, _members, QPoint(0, request.ymax)).y();
 		_scrollToRequests.fire({ min, max });
 	}, _members->lifetime());
-	_cover->setOnlineCount(_members->onlineCountValue());
+	_members->onlineCountValue(
+	) | rpl::on_next([=](int count) {
+		_onlineCount.fire_copy(count);
+	}, _members->lifetime());
 
 	using namespace rpl::mappers;
-	wrap->toggleOn(
+	raw->toggleOn(
 		_members->fullCountValue() | rpl::map(_1 > 0),
 		anim::type::instant);
+	return Section{
+		.widget = std::move(wrap),
+		.shown = raw->toggledValue(),
+	};
 }
 
-object_ptr<Ui::RpWidget> InnerWidget::setupSharedMedia(
-		not_null<RpWidget*> parent) {
+object_ptr<Ui::SlideWrap<Ui::RpWidget>> InnerWidget::setupSharedMedia(
+		not_null<RpWidget*> parent,
+		Ui::MultiSlideTracker &sharedTracker) {
 	using namespace rpl::mappers;
 	using MediaType = Media::Type;
 
+	const auto peer = _sublist ? _sublist->sublistPeer() : _peer;
 	auto content = object_ptr<Ui::VerticalLayout>(parent);
-	auto tracker = Ui::MultiSlideTracker();
+	auto &tracker = sharedTracker;
 	auto addMediaButton = [&](
 			MediaType type,
 			const style::icon &icon) {
 		auto result = Media::AddButton(
 			content,
 			_controller,
-			_peer,
-			_topic ? _topic->rootId() : 0,
+			peer,
+			_topic ? _topic->rootId() : MsgId(),
+			_sublist ? _sublist->sublistPeer()->id : PeerId(),
 			_migrated,
 			type,
 			tracker);
@@ -195,13 +332,13 @@ object_ptr<Ui::RpWidget> InnerWidget::setupSharedMedia(
 			icon,
 			st::infoSharedMediaButtonIconPosition);
 	};
-	const auto addSimilarChannelsButton = [&](
-			not_null<ChannelData*> channel,
+	const auto addSimilarPeersButton = [&](
+			not_null<PeerData*> peer,
 			const style::icon &icon) {
-		auto result = Media::AddSimilarChannelsButton(
+		auto result = Media::AddSimilarPeersButton(
 			content,
 			_controller,
-			channel,
+			peer,
 			tracker);
 		object_ptr<Profile::FloatingIcon>(
 			result,
@@ -238,12 +375,12 @@ object_ptr<Ui::RpWidget> InnerWidget::setupSharedMedia(
 			st::infoSharedMediaButtonIconPosition);
 	};
 	auto addPeerGiftsButton = [&](
-			not_null<UserData*> user,
+			not_null<PeerData*> peer,
 			const style::icon &icon) {
 		auto result = Media::AddPeerGiftsButton(
 			content,
 			_controller,
-			user,
+			peer,
 			tracker);
 		object_ptr<Profile::FloatingIcon>(
 			result,
@@ -252,23 +389,25 @@ object_ptr<Ui::RpWidget> InnerWidget::setupSharedMedia(
 	};
 
 	if (!_topic) {
-		addStoriesButton(_peer, st::infoIconMediaStories);
-		if (const auto user = _peer->asUser()) {
-			addPeerGiftsButton(user, st::infoIconMediaGifts);
-		}
-		addSavedSublistButton(_peer, st::infoIconMediaSaved);
+		addStoriesButton(peer, st::infoIconMediaStories);
+		addPeerGiftsButton(peer, st::infoIconMediaGifts);
+		addSavedSublistButton(peer, st::infoIconMediaSaved);
 	}
 	addMediaButton(MediaType::Photo, st::infoIconMediaPhoto);
 	addMediaButton(MediaType::Video, st::infoIconMediaVideo);
 	addMediaButton(MediaType::File, st::infoIconMediaFile);
 	addMediaButton(MediaType::MusicFile, st::infoIconMediaAudio);
 	addMediaButton(MediaType::Link, st::infoIconMediaLink);
+	addMediaButton(MediaType::Poll, st::infoIconMediaPoll);
 	addMediaButton(MediaType::RoundVoiceFile, st::infoIconMediaVoice);
 	addMediaButton(MediaType::GIF, st::infoIconMediaGif);
-	if (const auto user = _peer->asUser()) {
+	if (const auto bot = peer->asBot()) {
+		addCommonGroupsButton(bot, st::infoIconMediaGroup);
+		addSimilarPeersButton(bot, st::infoIconMediaBot);
+	} else if (const auto channel = peer->asBroadcast()) {
+		addSimilarPeersButton(channel, st::infoIconMediaChannel);
+	} else if (const auto user = peer->asUser()) {
 		addCommonGroupsButton(user, st::infoIconMediaGroup);
-	} else if (const auto channel = _peer->asChannel()) {
-		addSimilarChannelsButton(channel, st::infoIconMediaChannel);
 	}
 
 	auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
@@ -284,18 +423,8 @@ object_ptr<Ui::RpWidget> InnerWidget::setupSharedMedia(
 
 	auto layout = result->entity();
 
-	layout->add(object_ptr<Ui::BoxContentDivider>(layout));
-	layout->add(object_ptr<Ui::FixedHeightWidget>(
-		layout,
-		st::infoSharedMediaBottomSkip)
-	)->setAttribute(Qt::WA_TransparentForMouseEvents);
 	layout->add(std::move(content));
-	layout->add(object_ptr<Ui::FixedHeightWidget>(
-		layout,
-		st::infoSharedMediaBottomSkip)
-	)->setAttribute(Qt::WA_TransparentForMouseEvents);
 
-	_sharedMediaWrap = result;
 	return result;
 }
 
@@ -344,5 +473,41 @@ int InnerWidget::resizeGetHeight(int newWidth) {
 	return _content->heightNoMargins();
 }
 
+void InnerWidget::enableBackButton() {
+	_backToggles.force_assign(true);
+}
+
+void InnerWidget::showFinished() {
+	_showFinished.fire({});
+}
+
+bool InnerWidget::hasFlexibleTopBar() const {
+	return true;
+}
+
+base::weak_qptr<Ui::RpWidget> InnerWidget::createPinnedToTop(
+		not_null<Ui::RpWidget*> parent) {
+	const auto content = Ui::CreateChild<TopBar>(
+		parent,
+		TopBar::Descriptor{
+			.controller = _controller->parentController(),
+			.key = _controller->key(),
+			.wrap = _controller->wrapValue(),
+			.peer = _sublist ? _sublist->sublistPeer().get() : nullptr,
+			.backToggles = _backToggles.value(),
+			.showFinished = _showFinished.events(),
+		});
+	content->backRequest(
+	) | rpl::start_to_stream(_backClicks, content->lifetime());
+	content->setOnlineCount(_onlineCount.events());
+	_topBarColor = content->edgeColor();
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
+}
+
+base::weak_qptr<Ui::RpWidget> InnerWidget::createPinnedToBottom(
+		not_null<Ui::RpWidget*> parent) {
+	return nullptr;
+}
+
 } // namespace Profile
 } // namespace Info
diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.h b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.h
index a1b257801bcf7e..6ec177e268de01 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.h
@@ -7,11 +7,13 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "ui/rp_widget.h"
 #include "base/object_ptr.h"
+#include "info/profile/info_profile_section_stack.h"
+#include "ui/rp_widget.h"
 
 namespace Data {
 class ForumTopic;
+class SavedSublist;
 class PhotoMedia;
 } // namespace Data
 
@@ -36,7 +38,6 @@ namespace Profile {
 
 class Memento;
 class Members;
-class Cover;
 struct Origin;
 
 class InnerWidget final : public Ui::RpWidget {
@@ -46,12 +47,23 @@ class InnerWidget final : public Ui::RpWidget {
 		not_null<Controller*> controller,
 		Origin origin);
 
+	[[nodiscard]] rpl::producer<> backRequest() const;
+
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
 	rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
 	rpl::producer<int> desiredHeightValue() const override;
 
+	bool hasFlexibleTopBar() const;
+	base::weak_qptr<Ui::RpWidget> createPinnedToTop(
+		not_null<Ui::RpWidget*> parent);
+	base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
+		not_null<Ui::RpWidget*> parent);
+
+	void enableBackButton();
+	void showFinished();
+
 protected:
 	int resizeGetHeight(int newWidth) override;
 	void visibleTopBottomUpdated(
@@ -62,8 +74,10 @@ class InnerWidget final : public Ui::RpWidget {
 	object_ptr<RpWidget> setupContent(
 		not_null<RpWidget*> parent,
 		Origin origin);
-	object_ptr<RpWidget> setupSharedMedia(not_null<RpWidget*> parent);
-	void setupMembers(not_null<Ui::VerticalLayout*> container);
+	object_ptr<Ui::SlideWrap<Ui::RpWidget>> setupSharedMedia(
+		not_null<RpWidget*> parent,
+		Ui::MultiSlideTracker &sharedTracker);
+	[[nodiscard]] Section makeMembersSection(not_null<QWidget*> parent);
 
 	int countDesiredHeight() const;
 	void updateDesiredHeight() {
@@ -74,20 +88,25 @@ class InnerWidget final : public Ui::RpWidget {
 	const not_null<PeerData*> _peer;
 	PeerData * const _migrated = nullptr;
 	Data::ForumTopic * const _topic = nullptr;
+	Data::SavedSublist * const _sublist = nullptr;
 
-	PeerData *_reactionGroup = nullptr;
+	bool _inResize = false;
+	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
+	rpl::event_stream<int> _desiredHeight;
+
+	rpl::variable<bool> _backToggles;
+	rpl::event_stream<> _backClicks;
+	rpl::event_stream<int> _onlineCount;
+	rpl::event_stream<> _showFinished;
 
 	std::shared_ptr<Data::PhotoMedia> _nonPersonalView;
 
+	rpl::variable<std::optional<QColor>> _topBarColor;
+
 	Members *_members = nullptr;
-	Cover *_cover = nullptr;
 	Ui::SlideWrap<RpWidget> *_sharedMediaWrap = nullptr;
 	object_ptr<RpWidget> _content;
 
-	bool _inResize = false;
-	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
-	rpl::event_stream<int> _desiredHeight;
-
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.cpp b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
index 0574dd6da7419b..1f3cc86cc7fc9f 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_members.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
@@ -22,7 +22,6 @@ For license and copyright information please follow this link:
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/wrap/padding_wrap.h"
-#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "ui/search_field_controller.h"
 #include "lang/lang_keys.h"
 #include "ui/boxes/confirm_box.h"
@@ -57,13 +56,13 @@ Members::Members(
 	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
 
 	_controller->searchFieldController()->queryValue(
-	) | rpl::start_with_next([this](QString &&query) {
+	) | rpl::on_next([this](QString &&query) {
 		peerListScrollToTop();
 		content()->searchQueryChanged(std::move(query));
 	}, lifetime());
 	MembersCountValue(
 		_peer
-	) | rpl::start_with_next([this](int count) {
+	) | rpl::on_next([this](int count) {
 		const auto enabled = (count >= kEnableSearchMembersAfterCount);
 		_controller->setSearchEnabledByContent(enabled);
 	}, lifetime());
@@ -132,6 +131,7 @@ void Members::setupHeader() {
 	_openMembers = Ui::CreateChild<Ui::SettingsButton>(
 		parent,
 		rpl::single(QString()));
+	// _openMembers->setAccessibleName(tr::lng_manage_peer_members(tr::now));
 
 	object_ptr<FloatingIcon>(
 		parent,
@@ -143,12 +143,14 @@ void Members::setupHeader() {
 	_addMember = Ui::CreateChild<Ui::IconButton>(
 		_openMembers,
 		st::infoMembersAddMember);
+	_addMember->setAccessibleName(tr::lng_channel_add_members(tr::now));
 	//_searchField = _controller->searchFieldController()->createField(
 	//	parent,
 	//	st::infoMembersSearchField);
 	_search = Ui::CreateChild<Ui::IconButton>(
 		_openMembers,
 		st::infoMembersSearch);
+	_search->setAccessibleName(tr::lng_participant_filter(tr::now));
 	//_cancelSearch = Ui::CreateChild<Ui::CrossButton>(
 	//	parent,
 	//	st::infoMembersCancelSearch);
@@ -156,12 +158,12 @@ void Members::setupHeader() {
 	setupButtons();
 
 	//_controller->wrapValue(
-	//) | rpl::start_with_next([this](Wrap wrap) {
+	//) | rpl::on_next([this](Wrap wrap) {
 	//	_wrap = wrap;
 	//	updateSearchOverrides();
 	//}, lifetime());
 	widthValue(
-	) | rpl::start_with_next([this](int width) {
+	) | rpl::on_next([this](int width) {
 		_header->resizeToWidth(width);
 	}, _header->lifetime());
 }
@@ -170,15 +172,19 @@ object_ptr<Ui::FlatLabel> Members::setupTitle() {
 	auto visible = _peer->isMegagroup()
 		? CanViewParticipantsValue(_peer->asMegagroup())
 		: rpl::single(true);
+	auto text = rpl::conditional(
+		std::move(visible),
+		tr::lng_chat_status_members(
+			lt_count_decimal,
+			MembersCountValue(_peer) | tr::to_count(),
+			tr::upper),
+		tr::lng_channel_admins(tr::upper));
+	rpl::duplicate(text) | rpl::on_next([=](const QString &v) {
+		_openMembers->setAccessibleName(v);
+	}, _openMembers->lifetime());
 	auto result = object_ptr<Ui::FlatLabel>(
 		_titleWrap,
-		rpl::conditional(
-			std::move(visible),
-			tr::lng_chat_status_members(
-				lt_count_decimal,
-				MembersCountValue(_peer) | tr::to_count(),
-				Ui::Text::Upper),
-			tr::lng_channel_admins(Ui::Text::Upper)),
+		std::move(text),
 		st::infoBlockHeaderLabel);
 	result->setAttribute(Qt::WA_TransparentForMouseEvents);
 	return result;
@@ -197,7 +203,7 @@ void Members::setupButtons() {
 	auto visible = _peer->isMegagroup()
 		? CanViewParticipantsValue(_peer->asMegagroup())
 		: rpl::single(true);
-	rpl::duplicate(visible) | rpl::start_with_next([=](bool visible) {
+	rpl::duplicate(visible) | rpl::on_next([=](bool visible) {
 		_openMembers->setVisible(visible);
 	}, lifetime());
 
@@ -225,7 +231,7 @@ void Members::setupButtons() {
 		std::move(addMemberShown),
 		std::move(searchShown),
 		std::move(visible)
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		updateHeaderControlsGeometry(width());
 	}, lifetime());
 }
@@ -238,7 +244,7 @@ void Members::setupList() {
 		this,
 		_listController.get());
 	_list->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		auto addmin = (request.ymin < 0 || !_header)
 			? 0
 			: _header->height();
@@ -250,11 +256,11 @@ void Members::setupList() {
 			request.ymax + addmax });
 	}, _list->lifetime());
 	widthValue(
-	) | rpl::start_with_next([this](int newWidth) {
+	) | rpl::on_next([this](int newWidth) {
 		_list->resizeToWidth(newWidth);
 	}, _list->lifetime());
 	_list->heightValue(
-	) | rpl::start_with_next([=](int listHeight) {
+	) | rpl::on_next([=](int listHeight) {
 		auto newHeight = (listHeight > st::membersMarginBottom)
 			? (topSkip
 				+ listHeight
diff --git a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp
index 1987be5d49cfa7..08fc0df47af869 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp
@@ -13,52 +13,230 @@ For license and copyright information please follow this link:
 #include "data/data_user.h"
 #include "ui/unread_badge.h"
 #include "lang/lang_keys.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/painter.h"
 #include "styles/style_info.h"
 #include "styles/style_boxes.h"
+#include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
+#include "styles/style_widgets.h"
 
 namespace Info {
 namespace Profile {
 
 MemberListRow::MemberListRow(
-	not_null<UserData*> user,
+	not_null<PeerData*> peer,
 	Type type)
-: PeerListRowWithLink(user)
+: PeerListRow(peer)
 , _type(type) {
 	setType(type);
 }
 
+MemberListRow::~MemberListRow() = default;
+
 void MemberListRow::setType(Type type) {
 	_type = type;
-	PeerListRowWithLink::setActionLink(!_type.adminRank.isEmpty()
-		? _type.adminRank
-		: (_type.rights == Rights::Creator)
-		? tr::lng_owner_badge(tr::now)
-		: (_type.rights == Rights::Admin)
-		? tr::lng_admin_badge(tr::now)
-		: QString());
+	_tagRipple = nullptr;
+	_removeRipple = nullptr;
+	if (_type.canAddTag) {
+		_tagMode = TagMode::AddTag;
+		_tagText = tr::lng_context_add_my_tag(tr::now);
+	} else if (!_type.rank.isEmpty()) {
+		_tagMode = (_type.rights == Rights::Admin
+			|| _type.rights == Rights::Creator)
+			? TagMode::AdminPill
+			: TagMode::NormalText;
+		_tagText = _type.rank;
+	} else if (_type.rights == Rights::Creator) {
+		_tagMode = TagMode::AdminPill;
+		_tagText = tr::lng_owner_badge(tr::now);
+	} else if (_type.rights == Rights::Admin) {
+		_tagMode = TagMode::AdminPill;
+		_tagText = tr::lng_admin_badge(tr::now);
+	} else {
+		_tagMode = TagMode::None;
+		_tagText = QString();
+	}
+	_tagTextWidth = _tagText.isEmpty()
+		? 0
+		: st::normalFont->width(_tagText);
+	if (_type.canRemove) {
+		_removeText = _type.removeText.isEmpty()
+			? tr::lng_profile_kick(tr::now)
+			: _type.removeText;
+		_removeTextWidth = st::normalFont->width(_removeText);
+	} else {
+		_removeText = QString();
+		_removeTextWidth = 0;
+	}
+}
+
+MemberListRow::Type MemberListRow::type() const {
+	return _type;
+}
+
+UserData *MemberListRow::user() const {
+	return peer()->asUser();
 }
 
-bool MemberListRow::rightActionDisabled() const {
-	return true;
+void MemberListRow::setRefreshCallback(Fn<void()> callback) {
+	_refreshCallback = std::move(callback);
+}
+
+bool MemberListRow::tagInteractive() const {
+	return _type.canEditTag || _type.canAddTag;
+}
+
+QSize MemberListRow::tagSize() const {
+	if (_tagTextWidth == 0) {
+		return QSize();
+	}
+	const auto usePill = (_tagMode == TagMode::AdminPill)
+		|| (_tagMode == TagMode::AddTag)
+		|| ((_tagMode == TagMode::NormalText) && tagInteractive());
+	if (usePill) {
+		const auto &p = st::memberTagPillPadding;
+		const auto h = p.top() + st::normalFont->height + p.bottom();
+		const auto w = p.left() + _tagTextWidth + p.right();
+		return QSize(std::max(w, h), h);
+	}
+	return QSize(_tagTextWidth, st::normalFont->height);
+}
+
+QSize MemberListRow::rightActionSize() const {
+	const auto tag = tagSize();
+	const auto remove = removeSize();
+	const auto w = std::max(tag.width(), remove.width());
+	return (w > 0)
+		? QSize(w, st::defaultPeerListItem.height)
+		: QSize();
 }
 
 QMargins MemberListRow::rightActionMargins() const {
 	const auto skip = st::contactsCheckPosition.x();
 	return QMargins(
 		skip,
-		st::defaultPeerListItem.namePosition.y(),
+		0,
 		st::defaultPeerListItem.photoPosition.x() + skip,
 		0);
 }
 
-not_null<UserData*> MemberListRow::user() const {
-	return peer()->asUser();
+QSize MemberListRow::removeSize() const {
+	if (_removeTextWidth == 0) {
+		return QSize();
+	}
+	const auto &p = st::memberTagPillPadding;
+	const auto h = p.top() + st::normalFont->height + p.bottom();
+	const auto w = p.left() + _removeTextWidth + p.right();
+	return QSize(std::max(w, h), h);
+}
+
+int MemberListRow::elementsCount() const {
+	return _type.canRemove ? 2 : 1;
+}
+
+QRect MemberListRow::elementGeometry(int element, int outerWidth) const {
+	const auto skip = st::contactsCheckPosition.x();
+	const auto &st = st::defaultPeerListItem;
+	const auto right = st.photoPosition.x() + skip;
+
+	if (element == kTagElement) {
+		const auto size = tagSize();
+		if (size.isEmpty()) {
+			return QRect();
+		}
+		const auto left = outerWidth - right - size.width();
+		if (!_type.canRemove) {
+			const auto top = (st.height - size.height()) / 2;
+			return QRect(QPoint(left, top), size);
+		}
+		const auto progress = _hoverAnimation.value(
+			_wasHovered ? 1. : 0.);
+		const auto centeredTop = (st.height - size.height()) / 2;
+		const auto statusAlignedTop = st.statusPosition.y()
+			+ (st::contactsStatusFont->height - size.height()) / 2;
+		const auto top = anim::interpolate(
+			centeredTop, statusAlignedTop, progress);
+		return QRect(QPoint(left, top), size);
+	} else if (element == kRemoveElement) {
+		const auto size = removeSize();
+		if (size.isEmpty()) {
+			return QRect();
+		}
+		const auto left = outerWidth - right - size.width();
+		const auto nameAlignedTop = st.namePosition.y()
+			+ (st.nameStyle.font->height - size.height()) / 2;
+		return QRect(QPoint(left, nameAlignedTop), size);
+	}
+	return QRect();
+}
+
+bool MemberListRow::elementDisabled(int element) const {
+	if (element == kTagElement) {
+		return !tagInteractive();
+	}
+	if (element == kRemoveElement) {
+		const auto progress = _hoverAnimation.value(
+			_wasHovered ? 1. : 0.);
+		return (progress == 0.);
+	}
+	return false;
+}
+
+bool MemberListRow::elementOnlySelect(int element) const {
+	return false;
+}
+
+void MemberListRow::elementAddRipple(
+		int element,
+		QPoint point,
+		Fn<void()> updateCallback) {
+	if (!_refreshCallback) {
+		_refreshCallback = updateCallback;
+	}
+	if (element == kTagElement) {
+		if (!tagInteractive()) {
+			return;
+		}
+		if (!_tagRipple) {
+			const auto size = tagSize();
+			const auto radius = size.height() / 2;
+			auto mask = Ui::RippleAnimation::RoundRectMask(
+				size, radius);
+			_tagRipple = std::make_unique<Ui::RippleAnimation>(
+				st::defaultLightButton.ripple,
+				std::move(mask),
+				updateCallback);
+		}
+		_tagRipple->add(point);
+	} else if (element == kRemoveElement) {
+		if (!_removeRipple) {
+			const auto size = removeSize();
+			const auto radius = size.height() / 2;
+			auto mask = Ui::RippleAnimation::RoundRectMask(
+				size, radius);
+			_removeRipple = std::make_unique<Ui::RippleAnimation>(
+				st::defaultLightButton.ripple,
+				std::move(mask),
+				updateCallback);
+		}
+		_removeRipple->add(point);
+	}
+}
+
+void MemberListRow::elementsStopLastRipple() {
+	if (_tagRipple) {
+		_tagRipple->lastStop();
+	}
+	if (_removeRipple) {
+		_removeRipple->lastStop();
+	}
 }
 
 void MemberListRow::refreshStatus() {
-	if (user()->isBot()) {
-		const auto seesAllMessages = (user()->botInfo->readsAllHistory
+	const auto u = user();
+	if (u && u->isBot()) {
+		const auto seesAllMessages = (u->botInfo->readsAllHistory
 			|| _type.rights != Rights::Normal);
 		setCustomStatus(seesAllMessages
 			? tr::lng_status_bot_reads_all(tr::now)
@@ -68,6 +246,277 @@ void MemberListRow::refreshStatus() {
 	}
 }
 
+void MemberListRow::checkHoverChanged(bool hovered) {
+	if (!_type.canRemove || _wasHovered == hovered) {
+		return;
+	}
+	_wasHovered = hovered;
+	_hoverAnimation.start(
+		_refreshCallback ? _refreshCallback : Fn<void()>([] {}),
+		hovered ? 0. : 1.,
+		hovered ? 1. : 0.,
+		st::universalDuration);
+}
+
+int MemberListRow::pillHeight() const {
+	const auto &p = st::memberTagPillPadding;
+	return p.top() + st::normalFont->height + p.bottom();
+}
+
+const QImage &MemberListRow::ensurePillCircle(const QColor &color) const {
+	auto &cache = *_type.circleCache;
+	const auto rgba = color.rgba();
+	const auto it = cache.find(rgba);
+	if (it != end(cache)) {
+		return it->second;
+	}
+	const auto h = pillHeight();
+	const auto ratio = style::DevicePixelRatio();
+	auto image = QImage(
+		QSize(h, h) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(ratio);
+	image.fill(Qt::transparent);
+	{
+		auto p = QPainter(&image);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(color);
+		p.drawEllipse(0, 0, h, h);
+	}
+	return cache.emplace(rgba, std::move(image)).first->second;
+}
+
+void MemberListRow::paintPill(
+		Painter &p,
+		int x,
+		int y,
+		int width,
+		const QColor &bgColor) const {
+	const auto h = pillHeight();
+	const auto &circle = ensurePillCircle(bgColor);
+	const auto ratio = style::DevicePixelRatio();
+	const auto half = h / 2;
+	const auto otherHalf = h - half;
+	p.drawImage(
+		QRect(x, y, half, h),
+		circle,
+		QRect(0, 0, half * ratio, h * ratio));
+	if (width > h) {
+		p.fillRect(
+			x + half,
+			y,
+			width - h,
+			h,
+			bgColor);
+	}
+	p.drawImage(
+		QRect(x + width - otherHalf, y, otherHalf, h),
+		circle,
+		QRect(half * ratio, 0, otherHalf * ratio, h * ratio));
+}
+
+void MemberListRow::paintColoredPill(
+		Painter &p,
+		int x,
+		int y,
+		int w,
+		int textWidth,
+		const QString &text,
+		const QColor &color,
+		bool over,
+		std::unique_ptr<Ui::RippleAnimation> &ripple,
+		int outerWidth) {
+	const auto &pad = st::memberTagPillPadding;
+	auto bgColor = color;
+	bgColor.setAlphaF(over ? 0.16 : 0.12);
+	paintPill(p, x, y, w, bgColor);
+	if (ripple) {
+		auto rippleColor = color;
+		rippleColor.setAlphaF(0.12);
+		ripple->paint(p, x, y, outerWidth, &rippleColor);
+		if (ripple->empty()) {
+			ripple.reset();
+		}
+	}
+	p.setFont(st::normalFont);
+	p.setPen(color);
+	p.drawTextLeft(
+		x + (w - textWidth) / 2,
+		y + pad.top(),
+		outerWidth,
+		text,
+		textWidth);
+}
+
+void MemberListRow::paintTag(
+		Painter &p,
+		QRect geometry,
+		int outerWidth,
+		bool over) {
+	if (_tagTextWidth == 0) {
+		return;
+	}
+	const auto x = geometry.x();
+	const auto y = geometry.y();
+	const auto &pad = st::memberTagPillPadding;
+	switch (_tagMode) {
+	case TagMode::AdminPill: {
+		const auto nameColor = (_type.rights == Rights::Creator)
+			? st::rankOwnerFg->c
+			: st::rankAdminFg->c;
+		const auto h = pillHeight();
+		const auto cw = pad.left() + _tagTextWidth + pad.right();
+		const auto w = std::max(cw, h);
+		paintColoredPill(
+			p,
+			x,
+			y,
+			w,
+			_tagTextWidth,
+			_tagText,
+			nameColor,
+			over,
+			_tagRipple,
+			outerWidth);
+	} break;
+	case TagMode::NormalText: {
+		if (tagInteractive()) {
+			const auto h = pillHeight();
+			const auto cw = pad.left() + _tagTextWidth + pad.right();
+			const auto w = std::max(cw, h);
+			if (over) {
+				auto bgColor = st::rankUserFg->c;
+				bgColor.setAlphaF(0.12);
+				paintPill(p, x, y, w, bgColor);
+			}
+			if (_tagRipple) {
+				auto rippleColor = st::rankUserFg->c;
+				rippleColor.setAlphaF(0.12);
+				_tagRipple->paint(
+					p, x, y, outerWidth, &rippleColor);
+				if (_tagRipple->empty()) {
+					_tagRipple.reset();
+				}
+			}
+			p.setFont(st::normalFont);
+			p.setPen(st::rankUserFg);
+			p.drawTextLeft(
+				x + (w - _tagTextWidth) / 2,
+				y + pad.top(),
+				outerWidth,
+				_tagText,
+				_tagTextWidth);
+		} else {
+			p.setFont(st::normalFont);
+			p.setPen(st::rankUserFg);
+			p.drawTextLeft(
+				x, y, outerWidth, _tagText, _tagTextWidth);
+		}
+	} break;
+	case TagMode::AddTag: {
+		const auto h = pillHeight();
+		const auto cw = pad.left() + _tagTextWidth + pad.right();
+		const auto w = std::max(cw, h);
+		if (over) {
+			paintPill(p, x, y, w, st::lightButtonBgOver->c);
+		}
+		if (_tagRipple) {
+			const auto color = st::lightButtonBgRipple->c;
+			_tagRipple->paint(p, x, y, outerWidth, &color);
+			if (_tagRipple->empty()) {
+				_tagRipple.reset();
+			}
+		}
+		p.setFont(st::normalFont);
+		p.setPen(over
+			? st::lightButtonFgOver
+			: st::lightButtonFg);
+		p.drawTextLeft(
+			x + (w - _tagTextWidth) / 2,
+			y + pad.top(),
+			outerWidth,
+			_tagText,
+			_tagTextWidth);
+	} break;
+	case TagMode::None:
+		break;
+	}
+}
+
+void MemberListRow::paintRemove(
+		Painter &p,
+		QRect geometry,
+		int outerWidth,
+		bool over) {
+	if (_removeTextWidth == 0) {
+		return;
+	}
+	const auto progress = _hoverAnimation.value(
+		_wasHovered ? 1. : 0.);
+	if (progress == 0.) {
+		return;
+	}
+	const auto x = geometry.x();
+	const auto y = geometry.y();
+	const auto &pad = st::memberTagPillPadding;
+	const auto h = pillHeight();
+	const auto cw = pad.left() + _removeTextWidth + pad.right();
+	const auto w = std::max(cw, h);
+
+	auto o = p.opacity();
+	p.setOpacity(o * progress);
+
+	if (over) {
+		paintPill(p, x, y, w, st::lightButtonBgOver->c);
+	}
+	if (_removeRipple) {
+		const auto color = st::lightButtonBgRipple->c;
+		_removeRipple->paint(p, x, y, outerWidth, &color);
+		if (_removeRipple->empty()) {
+			_removeRipple.reset();
+		}
+	}
+	p.setFont(st::normalFont);
+	p.setPen(over ? st::lightButtonFgOver : st::lightButtonFg);
+	p.drawTextLeft(
+		x + (w - _removeTextWidth) / 2,
+		y + pad.top(),
+		outerWidth,
+		_removeText,
+		_removeTextWidth);
+
+	p.setOpacity(o);
+}
+
+void MemberListRow::elementsPaint(
+		Painter &p,
+		int outerWidth,
+		bool selected,
+		int selectedElement) {
+	checkHoverChanged(selected || (selectedElement > 0));
+	if (_type.canRemove) {
+		const auto removeGeometry = elementGeometry(
+			kRemoveElement, outerWidth);
+		if (!removeGeometry.isEmpty()) {
+			paintRemove(
+				p,
+				removeGeometry,
+				outerWidth,
+				(selectedElement == kRemoveElement));
+		}
+	}
+	const auto tagGeometry = elementGeometry(
+		kTagElement, outerWidth);
+	if (!tagGeometry.isEmpty()) {
+		paintTag(
+			p,
+			tagGeometry,
+			outerWidth,
+			(selectedElement == kTagElement));
+	}
+}
+
 std::unique_ptr<ParticipantsBoxController> CreateMembersController(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<PeerData*> peer) {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h
index 37d04cb7c61096..6be97a170f6a69 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h
@@ -7,9 +7,15 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "boxes/peer_list_controllers.h"
+#include "boxes/peer_list_box.h"
+#include "base/flat_map.h"
+#include "ui/effects/animations.h"
 #include "ui/unread_badge.h"
 
+namespace Ui {
+class ChatStyle;
+} // namespace Ui
+
 class ParticipantsBoxController;
 
 namespace Window {
@@ -19,7 +25,7 @@ class SessionNavigation;
 namespace Info {
 namespace Profile {
 
-class MemberListRow final : public PeerListRowWithLink {
+class MemberListRow final : public PeerListRow {
 public:
 	enum class Rights {
 		Normal,
@@ -28,20 +34,99 @@ class MemberListRow final : public PeerListRowWithLink {
 	};
 	struct Type {
 		Rights rights;
-		QString adminRank;
+		QString rank;
+		QString removeText;
+		not_null<const Ui::ChatStyle*> chatStyle;
+		not_null<base::flat_map<QRgb, QImage>*> circleCache;
+		bool canAddTag = false;
+		bool canEditTag = false;
+		bool canRemove = false;
 	};
 
-	MemberListRow(not_null<UserData*> user, Type type);
+	static constexpr auto kTagElement = 1;
+	static constexpr auto kRemoveElement = 2;
+
+	MemberListRow(not_null<PeerData*> peer, Type type);
+	~MemberListRow();
 
 	void setType(Type type);
-	bool rightActionDisabled() const override;
-	QMargins rightActionMargins() const override;
+	[[nodiscard]] Type type() const;
+	void setRefreshCallback(Fn<void()> callback);
 	void refreshStatus() override;
 
-	not_null<UserData*> user() const;
+	[[nodiscard]] UserData *user() const;
+
+	int elementsCount() const override;
+	QRect elementGeometry(int element, int outerWidth) const override;
+	bool elementDisabled(int element) const override;
+	bool elementOnlySelect(int element) const override;
+	void elementAddRipple(
+		int element,
+		QPoint point,
+		Fn<void()> updateCallback) override;
+	void elementsStopLastRipple() override;
+	void elementsPaint(
+		Painter &p,
+		int outerWidth,
+		bool selected,
+		int selectedElement) override;
+
+	QSize rightActionSize() const override;
+	QMargins rightActionMargins() const override;
 
 private:
+	enum class TagMode {
+		None,
+		AdminPill,
+		NormalText,
+		AddTag,
+	};
+
+	[[nodiscard]] bool tagInteractive() const;
+	[[nodiscard]] int pillHeight() const;
+	[[nodiscard]] const QImage &ensurePillCircle(const QColor &color) const;
+	void paintPill(
+		Painter &p,
+		int x,
+		int y,
+		int width,
+		const QColor &bgColor) const;
+	void paintColoredPill(
+		Painter &p,
+		int x,
+		int y,
+		int w,
+		int textWidth,
+		const QString &text,
+		const QColor &color,
+		bool over,
+		std::unique_ptr<Ui::RippleAnimation> &ripple,
+		int outerWidth);
+	void paintTag(
+		Painter &p,
+		QRect geometry,
+		int outerWidth,
+		bool over);
+	void paintRemove(
+		Painter &p,
+		QRect geometry,
+		int outerWidth,
+		bool over);
+	[[nodiscard]] QSize tagSize() const;
+	[[nodiscard]] QSize removeSize() const;
+	void checkHoverChanged(bool hovered);
+
 	Type _type;
+	TagMode _tagMode = TagMode::None;
+	QString _tagText;
+	int _tagTextWidth = 0;
+	QString _removeText;
+	int _removeTextWidth = 0;
+	Ui::Animations::Simple _hoverAnimation;
+	std::unique_ptr<Ui::RippleAnimation> _tagRipple;
+	std::unique_ptr<Ui::RippleAnimation> _removeRipple;
+	Fn<void()> _refreshCallback;
+	bool _wasHovered = false;
 
 };
 
diff --git a/Telegram/SourceFiles/info/profile/info_profile_music_button.cpp b/Telegram/SourceFiles/info/profile/info_profile_music_button.cpp
new file mode 100644
index 00000000000000..ff6d94f5df6375
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_music_button.cpp
@@ -0,0 +1,143 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/profile/info_profile_music_button.h"
+
+#include "ui/effects/animation_value.h"
+#include "ui/text/text_utilities.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/ui_utility.h"
+#include "styles/style_chat.h"
+#include "styles/style_info.h"
+
+namespace Info::Profile {
+
+MusicButton::MusicButton(
+	QWidget *parent,
+	MusicButtonData data,
+	Fn<void()> handler)
+: RippleButton(parent, st::infoMusicButtonRipple)
+, _noteSymbol(u"\u266B"_q + QChar(' '))
+, _noteWidth(st::normalFont->width(_noteSymbol)) {
+	updateData(std::move(data));
+	setClickedCallback(std::move(handler));
+}
+
+MusicButton::~MusicButton() = default;
+
+void MusicButton::updateData(MusicButtonData data) {
+	const auto result = data.name.textWithEntities();
+	const auto performerLength = result.entities.empty()
+		? 0
+		: int(result.entities.front().length());
+	_performer.setText(
+		st::semiboldTextStyle,
+		result.text.mid(0, performerLength));
+	_title.setText(
+		st::defaultTextStyle,
+		result.text.mid(performerLength, result.text.size()));
+	setAccessibleName(result.text);
+	update();
+}
+
+void MusicButton::setOverrideBg(std::optional<QColor> color) {
+	_overrideBg = color;
+	update();
+}
+
+void MusicButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	if (_overrideBg) {
+		p.fillRect(e->rect(), Ui::BlendColors(
+			*_overrideBg,
+			Qt::black,
+			st::infoProfileTopBarActionButtonBgOpacity));
+	} else {
+		p.fillRect(e->rect(), st::shadowFg);
+	}
+	paintRipple(p, QPoint());
+
+	const auto &icon = st::topicButtonArrow;
+	const auto iconWidth = icon.width();
+	const auto iconHeight = icon.height();
+
+	const auto padding = st::infoMusicButtonPadding;
+	const auto skip = st::normalFont->spacew;
+
+	const auto titleWidth = _title.maxWidth();
+	const auto performerWidth = _performer.maxWidth();
+	const auto totalNeeded = titleWidth + performerWidth + skip;
+	const auto availableWidth = width()
+		- rect::m::sum::h(padding)
+		- iconWidth
+		- skip
+		- _noteWidth;
+
+	auto actualTitleWidth = 0;
+	auto actualPerformerWidth = 0;
+	if (totalNeeded <= availableWidth) {
+		actualTitleWidth = titleWidth;
+		actualPerformerWidth = performerWidth;
+	} else {
+		const auto ratio = float64(titleWidth) / totalNeeded;
+		actualPerformerWidth = int(availableWidth * (1.0 - ratio));
+		actualTitleWidth = availableWidth - actualPerformerWidth;
+	}
+
+	const auto totalContentWidth = _noteWidth
+		+ actualPerformerWidth
+		+ skip
+		+ actualTitleWidth
+		+ skip
+		+ iconWidth;
+	const auto centerX = width() / 2;
+	const auto contentStartX = centerX - totalContentWidth / 2;
+	const auto textTop = (height() - st::normalFont->height) / 2;
+
+	p.setPen(_overrideBg ? st::groupCallMembersFg : st::windowBoldFg);
+	p.setFont(st::normalFont);
+	p.drawText(contentStartX, textTop + st::normalFont->ascent, _noteSymbol);
+
+	_performer.draw(p, {
+		.position = { contentStartX + _noteWidth, textTop },
+		.availableWidth = actualPerformerWidth,
+		.now = crl::now(),
+		.elisionLines = 1,
+		.elisionMiddle = true,
+	});
+
+	p.setPen(_overrideBg ? st::groupCallVideoSubTextFg : st::windowSubTextFg);
+	_title.draw(p, {
+		.position = QPoint(
+			contentStartX + _noteWidth + actualPerformerWidth + skip,
+			textTop),
+		.availableWidth = actualTitleWidth,
+		.now = crl::now(),
+		.elisionLines = 1,
+		.elisionMiddle = true,
+	});
+
+	const auto iconLeft = contentStartX
+		+ _noteWidth
+		+ actualPerformerWidth
+		+ actualTitleWidth
+		+ skip
+		+ skip;
+	const auto iconTop = (height() - iconHeight) / 2;
+	icon.paint(p, iconLeft, iconTop, iconWidth, p.pen().color());
+}
+
+int MusicButton::resizeGetHeight(int newWidth) {
+	const auto padding = st::infoMusicButtonPadding;
+	const auto &font = st::defaultTextStyle.font;
+
+	return padding.top() + font->height + padding.bottom();
+}
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_music_button.h b/Telegram/SourceFiles/info/profile/info_profile_music_button.h
new file mode 100644
index 00000000000000..21999605ce7f0e
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_music_button.h
@@ -0,0 +1,41 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/buttons.h"
+#include "ui/text/format_song_name.h"
+#include "ui/text/text.h"
+
+namespace Info::Profile {
+
+struct MusicButtonData {
+	Ui::Text::FormatSongName name;
+};
+
+class MusicButton final : public Ui::RippleButton {
+public:
+	MusicButton(QWidget *parent, MusicButtonData data, Fn<void()> handler);
+	~MusicButton();
+
+	void updateData(MusicButtonData data);
+	void setOverrideBg(std::optional<QColor> color);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	int resizeGetHeight(int newWidth) override;
+
+	Ui::Text::String _performer;
+	Ui::Text::String _title;
+	std::optional<QColor> _overrideBg;
+
+	const QString _noteSymbol;
+	const int _noteWidth;
+
+};
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
index 85fde827f357d5..0e0599b25abe21 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.cpp
@@ -12,12 +12,15 @@ For license and copyright information please follow this link:
 #include "main/main_app_config.h"
 #include "main/main_app_config_values.h"
 #include "main/main_session.h"
+#include "main/main_session_settings.h"
+#include "menu/menu_checked_action.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/menu/menu_action.h"
 #include "ui/widgets/popup_menu.h"
 #include "styles/style_chat.h" // expandedMenuSeparator.
 #include "styles/style_chat_helpers.h"
+#include "styles/style_menu_icons.h"
 
 namespace Info {
 namespace Profile {
@@ -26,7 +29,7 @@ namespace {
 class TextItem final : public Ui::Menu::ItemBase {
 public:
 	TextItem(
-		not_null<Ui::RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &st,
 		rpl::producer<TextWithEntities> &&text);
 
@@ -67,7 +70,7 @@ class TextItem final : public Ui::Menu::ItemBase {
 }
 
 TextItem::TextItem(
-	not_null<Ui::RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &st,
 	rpl::producer<TextWithEntities> &&text)
 : ItemBase(parent, st)
@@ -84,7 +87,7 @@ TextItem::TextItem(
 	setMinWidth(std::max(min1, min2) + added);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		if (s.width() <= added) {
 			return;
 		}
@@ -95,7 +98,7 @@ TextItem::TextItem(
 	}, lifetime());
 
 	_label->resizeToWidth(parent->width() - added);
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 }
 
 not_null<QAction*> TextItem::action() const {
@@ -129,7 +132,7 @@ void AddPhoneMenu(not_null<Ui::PopupMenu*> menu, not_null<UserData*> user) {
 		return;
 	} else if (const auto url = AppConfig::FragmentLink(&user->session())) {
 		menu->addSeparator(&st::expandedMenuSeparator);
-		const auto link = Ui::Text::Link(
+		const auto link = tr::link(
 			tr::lng_info_mobile_context_menu_fragment_about_link(tr::now),
 			*url);
 		menu->addAction(base::make_unique_q<TextItem>(
@@ -138,9 +141,29 @@ void AddPhoneMenu(not_null<Ui::PopupMenu*> menu, not_null<UserData*> user) {
 			tr::lng_info_mobile_context_menu_fragment_about(
 				lt_link,
 				rpl::single(link),
-				Ui::Text::RichLangValue)));
+				tr::rich)));
 	}
 }
 
+void AddPhoneSpoilerMenu(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<UserData*> user) {
+	if (!user->isSelf()) {
+		return;
+	}
+	const auto session = &user->session();
+	const auto toggle = [=] {
+		auto &settings = session->settings();
+		settings.setPhoneNumberHidden(!settings.phoneNumberHidden());
+		session->saveSettingsDelayed();
+	};
+	Menu::AddCheckedAction(
+		menu,
+		tr::lng_context_spoiler_effect(tr::now),
+		toggle,
+		&st::menuIconSpoiler,
+		session->settings().phoneNumberHidden());
+}
+
 } // namespace Profile
 } // namespace Info
diff --git a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.h b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.h
index 25e6c8b5cdf635..c6ce038fe68576 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_phone_menu.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_phone_menu.h
@@ -19,6 +19,9 @@ namespace Profile {
 [[nodiscard]] bool IsCollectiblePhone(not_null<UserData*> user);
 
 void AddPhoneMenu(not_null<Ui::PopupMenu*> menu, not_null<UserData*> user);
+void AddPhoneSpoilerMenu(
+	not_null<Ui::PopupMenu*> menu,
+	not_null<UserData*> user);
 
 } // namespace Profile
 } // namespace Info
diff --git a/Telegram/SourceFiles/info/profile/info_profile_section_stack.cpp b/Telegram/SourceFiles/info/profile/info_profile_section_stack.cpp
new file mode 100644
index 00000000000000..05fcd80e7f59ae
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_section_stack.cpp
@@ -0,0 +1,241 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/profile/info_profile_section_stack.h"
+
+#include "ui/widgets/box_content_divider.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/vertical_list.h"
+#include "ui/rect_part.h"
+
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+
+namespace Info::Profile {
+namespace {
+
+[[nodiscard]] not_null<Ui::SlideWrap<>*> CreatePlainSeparator(
+		not_null<Ui::VerticalLayout*> layout) {
+	auto inner = object_ptr<Ui::VerticalLayout>(layout);
+	Ui::AddSkip(inner.data(), st::infoProfileSkip);
+	inner->add(object_ptr<Ui::BoxContentDivider>(
+		inner.data(),
+		st::boxDividerHeight,
+		st::defaultDividerBar));
+	Ui::AddSkip(inner.data(), st::infoProfileSkip);
+	return layout->add(object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		layout,
+		std::move(inner)));
+}
+
+[[nodiscard]] not_null<Ui::SlideWrap<>*> CreateTextSeparator(
+		not_null<Ui::VerticalLayout*> layout,
+		rpl::producer<TextWithEntities> text,
+		Fn<void(not_null<Ui::FlatLabel*>)> setup) {
+	auto inner = object_ptr<Ui::VerticalLayout>(layout);
+	Ui::AddSkip(inner.data(), st::infoProfileSkip);
+	auto label = object_ptr<Ui::FlatLabel>(
+		inner.data(),
+		std::move(text),
+		st::defaultDividerLabel.label);
+	const auto rawLabel = label.data();
+	inner->add(object_ptr<Ui::DividerLabel>(
+		inner.data(),
+		std::move(label),
+		st::defaultBoxDividerLabelPadding,
+		st::defaultDividerLabel.bar,
+		RectPart::Top | RectPart::Bottom));
+	Ui::AddSkip(inner.data(), st::infoProfileSkip);
+	const auto wrap = layout->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			layout,
+			std::move(inner)));
+	if (setup) {
+		setup(rawLabel);
+	}
+	return wrap;
+}
+
+} // namespace
+
+SectionStack::SectionStack(not_null<Ui::VerticalLayout*> layout)
+: _layout(layout) {
+}
+
+void SectionStack::add(Section section) {
+	Expects(!_finalized);
+	Expects(section.widget != nullptr);
+
+	_rows.push_back({
+		.type = RowType::Block,
+		.widget = std::move(section.widget),
+		.shown = std::move(section.shown),
+	});
+}
+
+void SectionStack::addPlainSeparator() {
+	Expects(!_finalized);
+
+	if (_rows.empty() || _rows.back().type == RowType::PlainSeparator) {
+		return;
+	}
+	_rows.push_back({ .type = RowType::PlainSeparator });
+}
+
+void SectionStack::addTextSeparator(
+		rpl::producer<TextWithEntities> text,
+		rpl::producer<bool> shown,
+		Fn<void(not_null<Ui::FlatLabel*>)> setup) {
+	Expects(!_finalized);
+
+	_rows.push_back({
+		.type = RowType::TextSeparator,
+		.shown = std::move(shown),
+		.text = std::move(text),
+		.textSetup = std::move(setup),
+	});
+}
+
+not_null<Ui::VerticalLayout*> SectionStack::layout() const {
+	return _layout;
+}
+
+// Decides which separators are visible given the intrinsic visibility of
+// every row. Blocks and text separators are shown by their own data; the
+// computation only resolves plain separators, which exist purely to delimit
+// content. A plain separator stays visible only when there is a visible block
+// in the run immediately above and the run immediately below it, where each
+// run is bounded by the nearest visible divider on that side. Scanning down a
+// plain separator treats every later plain separator as a boundary so that, in
+// a single gap, the lowest plain separator wins; scanning up it sees through
+// plain separators that turned out hidden. Visible text separators bound runs
+// on both sides, which keeps a plain separator from doubling a text divider.
+std::vector<bool> SectionStack::ComputeVisibility(
+		const std::vector<RowType> &kinds,
+		const std::vector<bool> &intrinsic) {
+	const auto count = int(kinds.size());
+	auto result = std::vector<bool>(count, false);
+	for (auto i = 0; i != count; ++i) {
+		if (kinds[i] != RowType::PlainSeparator) {
+			result[i] = intrinsic[i];
+		}
+	}
+	const auto blockVisibleAbove = [&](int separator) {
+		for (auto j = separator - 1; j >= 0; --j) {
+			switch (kinds[j]) {
+			case RowType::Block:
+				if (intrinsic[j]) {
+					return true;
+				}
+				break;
+			case RowType::TextSeparator:
+				if (intrinsic[j]) {
+					return false;
+				}
+				break;
+			case RowType::PlainSeparator:
+				if (result[j]) {
+					return false;
+				}
+				break;
+			}
+		}
+		return false;
+	};
+	const auto blockVisibleBelow = [&](int separator) {
+		for (auto j = separator + 1; j != count; ++j) {
+			switch (kinds[j]) {
+			case RowType::Block:
+				if (intrinsic[j]) {
+					return true;
+				}
+				break;
+			case RowType::TextSeparator:
+				if (intrinsic[j]) {
+					return false;
+				}
+				break;
+			case RowType::PlainSeparator:
+				return false;
+			}
+		}
+		return false;
+	};
+	for (auto i = 0; i != count; ++i) {
+		if (kinds[i] == RowType::PlainSeparator) {
+			result[i] = blockVisibleAbove(i) && blockVisibleBelow(i);
+		}
+	}
+	return result;
+}
+
+void SectionStack::finalize() {
+	Expects(!_finalized);
+
+	_finalized = true;
+
+	Ui::AddSkip(_layout, st::infoProfileSkip);
+
+	const auto count = int(_rows.size());
+	auto kinds = std::vector<RowType>();
+	auto intrinsic = std::vector<rpl::producer<bool>>();
+	auto separators = std::vector<Ui::SlideWrap<>*>(count, nullptr);
+	kinds.reserve(count);
+	intrinsic.reserve(count);
+	const auto shownOrTrue = [](rpl::producer<bool> shown) {
+		return shown
+			? std::move(shown)
+			: rpl::producer<bool>(rpl::single(true));
+	};
+	for (auto i = 0; i != count; ++i) {
+		auto &row = _rows[i];
+		kinds.push_back(row.type);
+		switch (row.type) {
+		case RowType::Block:
+			_layout->add(std::move(row.widget));
+			intrinsic.push_back(shownOrTrue(std::move(row.shown)));
+			break;
+		case RowType::PlainSeparator:
+			separators[i] = CreatePlainSeparator(_layout);
+			intrinsic.push_back(rpl::single(true));
+			break;
+		case RowType::TextSeparator:
+			separators[i] = CreateTextSeparator(
+				_layout,
+				std::move(row.text),
+				std::move(row.textSetup));
+			intrinsic.push_back(shownOrTrue(std::move(row.shown)));
+			break;
+		}
+	}
+
+	Ui::AddSkip(_layout, st::infoProfileSkip);
+
+	if (intrinsic.empty()) {
+		return;
+	}
+	const auto visible = _layout->lifetime().make_state<
+		rpl::variable<std::vector<bool>>>(rpl::combine(
+			std::move(intrinsic),
+			[kinds = std::move(kinds)](const std::vector<bool> &values) {
+				return SectionStack::ComputeVisibility(kinds, values);
+			}));
+	for (auto i = 0; i != count; ++i) {
+		const auto wrap = separators[i];
+		if (!wrap) {
+			continue;
+		}
+		wrap->setDuration(st::infoSlideDuration)->toggleOn(
+			visible->value() | rpl::map([=](const std::vector<bool> &v) {
+				return (i < int(v.size())) && v[i];
+			}) | rpl::distinct_until_changed());
+	}
+}
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_section_stack.h b/Telegram/SourceFiles/info/profile/info_profile_section_stack.h
new file mode 100644
index 00000000000000..dbfc4e93725b5d
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_section_stack.h
@@ -0,0 +1,63 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+
+namespace Ui {
+class VerticalLayout;
+class FlatLabel;
+class RpWidget;
+} // namespace Ui
+
+namespace Info::Profile {
+
+struct Section {
+	object_ptr<Ui::RpWidget> widget = { nullptr };
+	rpl::producer<bool> shown;
+};
+
+class SectionStack final {
+public:
+	explicit SectionStack(not_null<Ui::VerticalLayout*> layout);
+
+	void add(Section section);
+	void addPlainSeparator();
+	void addTextSeparator(
+		rpl::producer<TextWithEntities> text,
+		rpl::producer<bool> shown,
+		Fn<void(not_null<Ui::FlatLabel*>)> setup = nullptr);
+	void finalize();
+
+	[[nodiscard]] not_null<Ui::VerticalLayout*> layout() const;
+
+private:
+	enum class RowType {
+		Block,
+		PlainSeparator,
+		TextSeparator,
+	};
+	struct Row {
+		RowType type = RowType::Block;
+		object_ptr<Ui::RpWidget> widget = { nullptr };
+		rpl::producer<bool> shown;
+		rpl::producer<TextWithEntities> text;
+		Fn<void(not_null<Ui::FlatLabel*>)> textSetup;
+	};
+
+	[[nodiscard]] static std::vector<bool> ComputeVisibility(
+		const std::vector<RowType> &kinds,
+		const std::vector<bool> &intrinsic);
+
+	const not_null<Ui::VerticalLayout*> _layout;
+	std::vector<Row> _rows;
+	bool _finalized = false;
+
+};
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_status_label.cpp b/Telegram/SourceFiles/info/profile/info_profile_status_label.cpp
new file mode 100644
index 00000000000000..a44fb98fed6417
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_status_label.cpp
@@ -0,0 +1,173 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/profile/info_profile_status_label.h"
+
+#include "data/data_peer_values.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_peer.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "ui/widgets/labels.h"
+#include "ui/text/text_utilities.h"
+#include "ui/basic_click_handlers.h"
+#include "base/unixtime.h"
+
+namespace Info::Profile {
+namespace {
+
+[[nodiscard]] auto MembersStatusText(int count) {
+	return tr::lng_chat_status_members(tr::now, lt_count_decimal, count);
+};
+
+[[nodiscard]] auto OnlineStatusText(int count) {
+	return tr::lng_chat_status_online(tr::now, lt_count_decimal, count);
+};
+
+[[nodiscard]] auto ChatStatusText(
+		int fullCount,
+		int onlineCount,
+		bool isGroup) {
+	if (onlineCount > 1 && onlineCount <= fullCount) {
+		return tr::lng_chat_status_members_online(
+			tr::now,
+			lt_members_count,
+			MembersStatusText(fullCount),
+			lt_online_count,
+			OnlineStatusText(onlineCount));
+	} else if (fullCount > 0) {
+		return isGroup
+			? tr::lng_chat_status_members(
+				tr::now,
+				lt_count_decimal,
+				fullCount)
+			: tr::lng_chat_status_subscribers(
+				tr::now,
+				lt_count_decimal,
+				fullCount);
+	}
+	return isGroup
+		? tr::lng_group_status(tr::now)
+		: tr::lng_channel_status(tr::now);
+};
+
+[[nodiscard]] auto ChannelTypeText(not_null<ChannelData*> channel) {
+	const auto isPublic = channel->isPublic();
+	const auto isMegagroup = channel->isMegagroup();
+	return (isPublic
+		? (isMegagroup
+			? tr::lng_create_public_group_title(tr::now)
+			: tr::lng_create_public_channel_title(tr::now))
+		: (isMegagroup
+			? tr::lng_create_private_group_title(tr::now)
+			: tr::lng_create_private_channel_title(tr::now))).toLower();
+};
+
+} // namespace
+
+StatusLabel::StatusLabel(
+	not_null<Ui::FlatLabel*> label,
+	not_null<PeerData*> peer)
+: _label(label)
+, _peer(peer)
+, _refreshTimer([=] { refresh(); }) {
+}
+
+void StatusLabel::setOnlineCount(int count) {
+	_onlineCount = count;
+	refresh();
+}
+
+void StatusLabel::refresh() {
+	auto hasMembersLink = [&] {
+		if (auto megagroup = _peer->asMegagroup()) {
+			return megagroup->canViewMembers();
+		}
+		return false;
+	}();
+	auto statusText = [&]() -> TextWithEntities {
+		using namespace Ui::Text;
+		auto currentTime = base::unixtime::now();
+		if (auto user = _peer->asUser()) {
+			const auto result = Data::OnlineTextFull(user, currentTime);
+			const auto showOnline = Data::OnlineTextActive(
+				user,
+				currentTime);
+			const auto updateIn = Data::OnlineChangeTimeout(
+				user,
+				currentTime);
+			if (showOnline) {
+				_refreshTimer.callOnce(updateIn);
+			}
+			return (showOnline && _colorized)
+				? Ui::Text::Colorized(result)
+				: TextWithEntities{ .text = result };
+		} else if (auto chat = _peer->asChat()) {
+			if (!chat->amIn()) {
+				return tr::lng_chat_status_unaccessible(
+					{},
+					WithEntities);
+			}
+			const auto onlineCount = _onlineCount;
+			const auto fullCount = std::max(
+				chat->count,
+				int(chat->participants.size()));
+			return { .text = ChatStatusText(
+				fullCount,
+				onlineCount,
+				true) };
+		} else if (auto broadcast = _peer->monoforumBroadcast()) {
+			if (!broadcast->membersCountKnown()) {
+				return TextWithEntities{ .text = ChannelTypeText(broadcast) };
+			}
+			auto result = ChatStatusText(
+				broadcast->membersCount(),
+				0,
+				false);
+			return TextWithEntities{ .text = result };
+		} else if (auto channel = _peer->asChannel()) {
+			if (!channel->membersCountKnown()) {
+				auto result = ChannelTypeText(channel);
+				return hasMembersLink
+					? tr::link(result)
+					: TextWithEntities{ .text = result };
+			}
+			const auto onlineCount = _onlineCount;
+			const auto fullCount = channel->membersCount();
+			auto result = ChatStatusText(
+				fullCount,
+				onlineCount,
+				channel->isMegagroup());
+			return hasMembersLink
+				? tr::link(result)
+				: TextWithEntities{ .text = result };
+		}
+		return tr::lng_chat_status_unaccessible(tr::now, WithEntities);
+	}();
+	_label->setMarkedText(statusText);
+	if (hasMembersLink && _membersLinkCallback) {
+		_label->setLink(
+			1,
+			std::make_shared<LambdaClickHandler>(_membersLinkCallback));
+	}
+}
+
+void StatusLabel::setMembersLinkCallback(Fn<void()> callback) {
+	_membersLinkCallback = std::move(callback);
+}
+
+Fn<void()> StatusLabel::membersLinkCallback() const {
+	return _membersLinkCallback;
+}
+
+void StatusLabel::setColorized(bool enabled) {
+	_colorized = enabled;
+	refresh();
+}
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_status_label.h b/Telegram/SourceFiles/info/profile/info_profile_status_label.h
new file mode 100644
index 00000000000000..90741424dce11b
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_status_label.h
@@ -0,0 +1,40 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+
+namespace Ui {
+class FlatLabel;
+} // namespace Ui
+
+namespace Info::Profile {
+
+class StatusLabel final {
+public:
+	StatusLabel(
+		not_null<Ui::FlatLabel*> label,
+		not_null<PeerData*> peer);
+
+	void refresh();
+	void setMembersLinkCallback(Fn<void()> callback);
+	[[nodiscard]] Fn<void()> membersLinkCallback() const;
+	void setOnlineCount(int count);
+	void setColorized(bool enabled);
+
+private:
+	const not_null<Ui::FlatLabel*> _label;
+	const not_null<PeerData*> _peer;
+	int _onlineCount = 0;
+	bool _colorized = true;
+	Fn<void()> _membersLinkCallback;
+	base::Timer _refreshTimer;
+
+};
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_text.cpp b/Telegram/SourceFiles/info/profile/info_profile_text.cpp
index bfca3d053f67b0..fe1c49b9ba4a9b 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_text.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_text.cpp
@@ -24,7 +24,8 @@ TextWithLabel CreateTextWithLabel(
 		rpl::producer<TextWithEntities> &&text,
 		const style::FlatLabel &labelSt,
 		const style::FlatLabel &textSt,
-		const style::margins &padding) {
+		const style::margins &padding,
+		const style::PopupMenu &stMenu) {
 	auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 		parent,
 		object_ptr<Ui::VerticalLayout>(parent),
@@ -47,8 +48,9 @@ TextWithLabel CreateTextWithLabel(
 	const auto labeled = layout->add(object_ptr<Ui::FlatLabel>(
 		layout,
 		std::move(nonEmptyText),
-		textSt));
-	std::move(text) | rpl::start_with_next([=] {
+		textSt,
+		stMenu));
+	std::move(text) | rpl::on_next([=] {
 		labeled->resizeToWidth(layout->width());
 	}, labeled->lifetime());
 	labeled->setSelectable(true);
diff --git a/Telegram/SourceFiles/info/profile/info_profile_text.h b/Telegram/SourceFiles/info/profile/info_profile_text.h
index 50c97681ab21cf..ed73d3db5eedc3 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_text.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_text.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "base/object_ptr.h"
+#include "styles/style_widgets.h"
 
 #include <rpl/producer.h>
 
@@ -37,7 +38,8 @@ TextWithLabel CreateTextWithLabel(
 	rpl::producer<TextWithEntities> &&text,
 	const style::FlatLabel &labelSt,
 	const style::FlatLabel &textSt,
-	const style::margins &padding);
+	const style::margins &padding,
+	const style::PopupMenu &stMenu = st::defaultPopupMenu);
 
 } // namespace Profile
 } // namespace Info
diff --git a/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp b/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp
new file mode 100644
index 00000000000000..4c9364face5e8f
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp
@@ -0,0 +1,2980 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/profile/info_profile_top_bar.h"
+
+#include "api/api_peer_colors.h"
+#include "api/api_peer_photo.h"
+#include "api/api_user_privacy.h"
+#include "apiwrap.h"
+#include "base/call_delayed.h"
+#include "base/timer_rpl.h"
+#include "base/timer.h"
+#include "base/unixtime.h"
+#include "boxes/peers/edit_peer_info_box.h" // EditPeerInfoBox::Available.
+#include "boxes/peers/edit_forum_topic_box.h"
+#include "boxes/moderate_messages_box.h"
+#include "boxes/report_messages_box.h"
+#include "boxes/star_gift_box.h"
+#include "calls/calls_instance.h"
+#include "chat_helpers/stickers_lottie.h"
+#include "core/application.h"
+#include "core/shortcuts.h"
+#include "data/components/recent_shared_media_gifts.h"
+#include "data/data_birthday.h"
+#include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_document_media.h"
+#include "data/data_document.h"
+#include "data/data_emoji_statuses.h"
+#include "data/data_forum_topic.h"
+#include "data/data_forum.h"
+#include "data/data_peer_values.h"
+#include "data/data_peer.h"
+#include "data/data_photo.h"
+#include "data/data_saved_sublist.h"
+#include "data/data_session.h"
+#include "data/data_star_gift.h"
+#include "data/data_stories.h"
+#include "data/data_user.h"
+#include "data/notify/data_notify_settings.h"
+#include "data/notify/data_peer_notify_settings.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "editor/photo_editor_common.h"
+#include "editor/photo_editor_layer_widget.h"
+#include "history/history.h"
+#include "info/info_memento.h"
+#include "info/profile/info_profile_badge_tooltip.h"
+#include "info/profile/info_profile_badge.h"
+#include "info/profile/info_profile_birthday_effect.h"
+#include "info/profile/info_profile_cover.h" // LargeCustomEmojiMargins
+#include "info/profile/info_profile_status_label.h"
+#include "info/profile/info_profile_top_bar_action_button.h"
+#include "info/profile/info_profile_values.h"
+#include "info/userpic/info_userpic_emoji_builder_common.h"
+#include "info/userpic/info_userpic_emoji_builder_common.h"
+#include "info/userpic/info_userpic_emoji_builder_menu_item.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_animation.h"
+#include "lottie/lottie_multi_player.h"
+#include "main/main_session.h"
+#include "menu/menu_mute.h"
+#include "settings/settings_credits_graphics.h"
+#include "settings/sections/settings_information.h"
+#include "settings/sections/settings_premium.h"
+#include "ui/boxes/show_or_premium_box.h"
+#include "ui/color_contrast.h"
+#include "ui/controls/stars_rating.h"
+#include "ui/controls/swipe_handler.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/upload_progress_overlay.h"
+#include "ui/effects/outline_segments.h"
+#include "ui/effects/round_checkbox.h"
+#include "ui/empty_userpic.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/peer/video_userpic_player.h"
+#include "ui/rect.h"
+#include "ui/text/text_utilities.h"
+#include "ui/top_background_gradient.h"
+#include "ui/ui_utility.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/horizontal_fit_container.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/wrap/fade_wrap.h"
+#include "window/themes/window_theme.h"
+#include "window/window_peer_menu.h"
+#include "window/window_session_controller.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "boxes/sticker_set_box.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_chat.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+
+#include <QtGui/QClipboard>
+#include <QtGui/QGuiApplication>
+
+namespace Info::Profile {
+namespace {
+
+class Userpic final
+	: public Ui::AbstractButton
+	, public Ui::AbstractTooltipShower {
+public:
+	Userpic(QWidget *parent, Fn<bool()> hasStories)
+	: Ui::AbstractButton(parent)
+	, _hasStories(std::move(hasStories)) {
+		installEventFilter(this);
+		setAccessibleName(tr::lng_mediaview_profile_photo(tr::now));
+	}
+
+	QString tooltipText() const override {
+		return _hasStories() ? tr::lng_view_button_story(tr::now) : QString();
+	}
+
+	QPoint tooltipPos() const override {
+		return QCursor::pos();
+	}
+
+	bool tooltipWindowActive() const override {
+		return Ui::AppInFocus() && Ui::InFocusChain(window());
+	}
+
+protected:
+	bool eventFilter(QObject *obj, QEvent *e) override {
+		if (obj == this && e->type() == QEvent::Enter && _hasStories()) {
+			Ui::Tooltip::Show(1000, this);
+		}
+		return Ui::AbstractButton::eventFilter(obj, e);
+	}
+
+private:
+	Fn<bool()> _hasStories;
+
+};
+
+constexpr auto kWaitBeforeGiftBadge = crl::time(1000);
+constexpr auto kGiftBadgeGlares = 3;
+constexpr auto kMinPatternRadius = 8;
+constexpr auto kMinContrast = 5.5;
+constexpr auto kStoryOutlineFadeEnd = 0.4;
+constexpr auto kStoryOutlineFadeRange = 1. - kStoryOutlineFadeEnd;
+
+using AnimatedPatternPoint = TopBar::AnimatedPatternPoint;
+
+struct PatternColors {
+	QColor patternColor;
+	bool useOverlayBlend = false;
+};
+
+[[nodiscard]] PatternColors CalculatePatternColors(
+		const std::optional<Data::ColorProfileSet> &colorProfile,
+		const std::shared_ptr<Data::EmojiStatusCollectible> &collectible,
+		const std::optional<QColor> &edgeColor,
+		bool isDark) {
+	if (collectible && collectible->patternColor.isValid()) {
+		auto blended = Ui::BlendColors(
+			collectible->patternColor,
+			Qt::black,
+			isDark ? (140. / 255) : (160. / 255));
+		auto result = !edgeColor
+			? std::move(blended)
+			: (Ui::CountContrast(blended, *edgeColor)
+				> Ui::CountContrast(collectible->patternColor, *edgeColor))
+			? std::move(blended)
+			: collectible->patternColor;
+		return {
+			.patternColor = std::move(result),
+			// .patternColor = collectible->patternColor.lighter(isDark
+			// 	? 140
+			// 	: 160),
+			.useOverlayBlend = false
+		};
+	}
+	if (colorProfile && !colorProfile->bg.empty()) {
+		return {
+			.patternColor = QColor(0, 0, 0, int(0.6 * 255)),
+			.useOverlayBlend = true
+		};
+	}
+	const auto baseWhite = isDark ? 0.5 : 0.3;
+	return {
+		.patternColor = QColor::fromRgbF(
+			baseWhite,
+			baseWhite,
+			baseWhite,
+			0.6),
+		.useOverlayBlend = false
+	};
+}
+
+[[nodiscard]] std::vector<AnimatedPatternPoint> GenerateAnimatedPattern(
+		const QRect &userpicRect) {
+	auto points = std::vector<TopBar::AnimatedPatternPoint>();
+	points.reserve(18); // 6 + 6 + 4 + 2.
+	const auto ax = float64(userpicRect.x());
+	const auto ay = float64(userpicRect.y());
+	const auto aw = float64(userpicRect.width());
+	const auto ah = float64(userpicRect.height());
+	const auto acx = ax + aw / 2.;
+	const auto acy = ay + ah / 2.;
+
+	constexpr auto kPaddingScale = 0.8;
+
+	const auto padding24 = style::ConvertFloatScale(24. * kPaddingScale);
+	const auto padding16 = style::ConvertFloatScale(16. * kPaddingScale);
+	const auto padding8 = style::ConvertFloatScale(8. * kPaddingScale);
+	const auto padding12 = style::ConvertFloatScale(12. * kPaddingScale);
+	const auto padding48 = style::ConvertFloatScale(48. * kPaddingScale);
+	const auto padding96 = style::ConvertFloatScale(96. * kPaddingScale);
+	static const auto kCos120 = std::cos(M_PI * 120. / 180.);
+	static const auto kCos160 = std::cos(M_PI * 160. / 180.);
+	const auto r48Cos120 = (padding48 + aw / 2.) * kCos120;
+	const auto r16Cos160 = (padding16 + ah / 2.) * kCos160;
+
+	// First ring.
+	points.push_back({ { acx, ay - padding24 }, 20, 0.02, 0.42 });
+	points.push_back({ { acx, ay + ah + padding24 }, 20, 0.00, 0.32 });
+	points.push_back({ { ax - padding16, acy - ah / 4 - padding8 }, 23, 0.00, 0.40 });
+	points.push_back({ { ax + aw + padding16, acy - ah / 4 - padding8 }, 18, 0.00, 0.40 });
+	points.push_back({ { ax - padding16, acy + ah / 4 + padding8 }, 24, 0.00, 0.40 });
+	points.push_back({ { ax + aw + padding16 - 4, acy + ah / 4 + padding8 }, 24, 0.00, 0.40 });
+
+	// Second ring.
+	points.push_back({ { ax - padding48, acy }, 19, 0.14, 0.60 });
+	points.push_back({ { ax + aw + padding48, acy }, 19, 0.16, 0.64 });
+	points.push_back({ { acx + r48Cos120, ay - padding48 + padding12 }, 17, 0.14, 0.70 });
+	points.push_back({ { acx - r48Cos120, ay - padding48 + padding12 }, 17, 0.14, 0.90 });
+	points.push_back({ { acx + r48Cos120, ay + ah + padding48 - padding12 }, 20, 0.20, 0.75 });
+	points.push_back({ { acx - r48Cos120, ay + ah + padding48 - padding12 }, 20, 0.20, 0.85 });
+
+	// Third ring.
+	points.push_back({ { ax - padding48 - padding8, acy + r16Cos160 }, 20, 0.09, 0.45 });
+	points.push_back({ { ax + aw + padding48 + padding8, acy + r16Cos160 }, 19, 0.09, 0.45 });
+	points.push_back({ { ax - padding48 - padding8, acy - r16Cos160 }, 21, 0.09, 0.45 });
+	points.push_back({ { ax + aw + padding48 + padding8, acy - r16Cos160 }, 18, 0.11, 0.45 });
+
+	// Fourth ring.
+	points.push_back({ { ax - padding96, acy }, 19, 0.14, 0.75 });
+	points.push_back({ { ax + aw + padding96, acy }, 19, 0.20, 0.80 });
+
+	return points;
+}
+
+} // namespace
+
+TopBar::TopBar(
+	not_null<Ui::RpWidget*> parent,
+	Descriptor descriptor)
+: RpWidget(parent)
+, _peer(descriptor.peer
+	? descriptor.peer
+	: descriptor.key.peer())
+, _topic(descriptor.key.topic())
+, _key(descriptor.key)
+, _wrap(std::move(descriptor.wrap))
+, _st(st::infoTopBar)
+, _source(descriptor.source)
+, _badgeTooltipHide(
+	std::make_unique<base::Timer>([=] { hideBadgeTooltip(); }))
+, _botVerify(std::make_unique<Badge>(
+	this,
+	st::infoBotVerifyBadge,
+	&_peer->session(),
+	BotVerifyBadgeForPeer(_peer),
+	nullptr,
+	Fn<bool()>([=, controller = descriptor.controller] {
+		return controller->isGifPausedAtLeastFor(
+			Window::GifPauseReason::Layer);
+	})))
+, _badgeContent(BadgeContentForPeer(_peer))
+, _gifPausedChecker([=, controller = descriptor.controller] {
+	return controller->isGifPausedAtLeastFor(Window::GifPauseReason::Layer);
+})
+, _badge(std::make_unique<Badge>(
+	this,
+	st::infoPeerBadge,
+	&_peer->session(),
+	_badgeContent.value(),
+	nullptr,
+	_gifPausedChecker))
+, _verified(std::make_unique<Badge>(
+	this,
+	st::infoPeerBadge,
+	&_peer->session(),
+	VerifiedContentForPeer(_peer),
+	nullptr,
+	_gifPausedChecker))
+, _hasActions(descriptor.source != Source::Stories
+	&& descriptor.source != Source::Preview
+	&& (_wrap.current() != Wrap::Side || !_peer->isNotificationsUser()))
+, _minForProgress([&] {
+	QWidget::setMinimumHeight(st::infoLayerTopBarHeight);
+	QWidget::setMaximumHeight(_hasActions
+		? st::infoProfileTopBarHeightMax
+		: st::infoProfileTopBarNoActionsHeightMax);
+	return QWidget::minimumHeight()
+		+ (!_hasActions
+			? 0
+			: st::infoProfileTopBarActionButtonsHeight);
+}())
+, _title(this, nameValue(), _st.title)
+, _starsRating(_peer->isUser()
+	? std::make_unique<Ui::StarsRating>(
+		this,
+		descriptor.controller->uiShow(),
+		_peer->isSelf() ? QString() : _peer->shortName(),
+		Data::StarsRatingValue(_peer),
+		(_peer->isSelf()
+			? [=] { return _peer->owner().pendingStarsRating(); }
+			: Fn<Data::StarsRatingPending()>()))
+	: nullptr)
+, _status(this, QString(), statusStyle())
+, _statusLabel(std::make_unique<StatusLabel>(_status.data(), _peer))
+, _showLastSeen(
+	this,
+	object_ptr<Ui::RoundButton>(
+		this,
+		tr::lng_status_lastseen_when(),
+		st::infoProfileTopBarShowLastSeen))
+, _forumButton([&, controller = descriptor.controller] {
+	const auto topic = _key.topic();
+	if (!topic) {
+		return object_ptr<Ui::RoundButton>{ nullptr };
+	}
+	auto owned = object_ptr<Ui::RoundButton>(
+		this,
+		rpl::single(QString()),
+		st::infoProfileTopBarTopicStatusButton);
+	owned->setText(Info::Profile::NameValue(
+		_peer
+	) | rpl::map([=](const QString &name) {
+		return TextWithEntities(name)
+			.append(' ')
+			.append(Ui::Text::IconEmoji(&st::textMoreIconEmoji, QString()));
+	}));
+	owned->setClickedCallback([=, peer = _peer] {
+		if (const auto forum = peer->forum()) {
+			if (peer->useSubsectionTabs()) {
+				controller->searchInChat(forum->history());
+			} else if (controller->adaptive().isOneColumn()) {
+				controller->showForum(forum);
+			} else {
+				controller->showPeerHistory(peer->id);
+			}
+		} else {
+			controller->showPeerHistory(peer->id);
+		}
+	});
+	return owned;
+}())
+, _backToggles(std::move(descriptor.backToggles)) {
+	_peer->updateFull();
+	if (const auto broadcast = _peer->monoforumBroadcast()) {
+		broadcast->updateFull();
+	}
+	const auto controller = descriptor.controller;
+
+	if (_peer->isMegagroup() || _peer->isChat()) {
+		_statusLabel->setMembersLinkCallback([=, peer = _peer] {
+			const auto topic = _key.topic();
+			const auto sublist = _key.sublist();
+			const auto shown = sublist
+				? sublist->sublistPeer().get()
+				: peer.get();
+			const auto section = Section::Type::Members;
+			controller->showSection(topic
+				? std::make_shared<Info::Memento>(topic, section)
+				: std::make_shared<Info::Memento>(shown, section));
+		});
+	}
+	if (!_peer->isMegagroup() && !_topic) {
+		setupStatusWithRating();
+	}
+
+	if (!_topic) {
+		setupShowLastSeen(controller);
+	}
+
+	_peer->session().changes().peerFlagsValue(
+		_peer,
+		Data::PeerUpdate::Flag::OnlineStatus | Data::PeerUpdate::Flag::Members
+	) | rpl::on_next([=] {
+		_statusLabel->refresh();
+	}, lifetime());
+
+	_title->setSelectable(true);
+	_title->setContextCopyText(tr::lng_profile_copy_fullname(tr::now));
+
+	auto badgeUpdates = rpl::producer<rpl::empty_value>();
+	if (_badge) {
+		badgeUpdates = rpl::merge(
+			std::move(badgeUpdates),
+			_badge->updated());
+
+		_badge->setPremiumClickCallback([controller, peer = _peer] {
+			::Settings::ShowEmojiStatusPremium(controller, peer);
+		});
+	}
+	if (_verified) {
+		badgeUpdates = rpl::merge(
+			std::move(badgeUpdates),
+			_verified->updated());
+	}
+	if (_botVerify) {
+		badgeUpdates = rpl::merge(
+			std::move(badgeUpdates),
+			_botVerify->updated());
+	}
+	_title->naturalWidthValue() | rpl::on_next([=](int w) {
+		_title->resizeToWidth(w);
+	}, _title->lifetime());
+	badgeUpdates = rpl::merge(
+		std::move(badgeUpdates),
+		nameValue() | rpl::to_empty,
+		_backToggles.value() | rpl::to_empty);
+	std::move(badgeUpdates) | rpl::on_next([=] {
+		updateLabelsPosition();
+	}, _title->lifetime());
+
+	setupUniqueBadgeTooltip();
+	setupButtons(controller, descriptor.source);
+	setupSwipeBack(controller);
+	setupUserpicButton(controller);
+	if (_hasActions) {
+		_peer->session().changes().peerFlagsValue(
+			_peer,
+			Data::PeerUpdate::Flag::FullInfo
+				| Data::PeerUpdate::Flag::ChannelAmIn
+		) | rpl::on_next([=] {
+			setupActions(controller);
+		}, lifetime());
+	}
+	setupStoryOutline();
+	if (_topic) {
+		_topicIconView = std::make_unique<TopicIconView>(
+			_topic,
+			_gifPausedChecker,
+			[=] { update(); });
+	} else {
+		updateVideoUserpic();
+	}
+
+	rpl::merge(
+		style::PaletteChanged(),
+		_peer->session().data().giftUpdates() | rpl::filter([=](
+				const Data::GiftUpdate &update) {
+			if (update.action == Data::GiftUpdate::Action::Pin) {
+				if (_peer->isSelf() && update.id.isUser()) {
+					return true;
+				}
+				if (_peer == update.id.chat()) {
+					return true;
+				}
+			}
+			if (update.action == Data::GiftUpdate::Action::Unpin) {
+				for (const auto &gift : _pinnedToTopGifts) {
+					if (gift.manageId == update.id) {
+						return true;
+					}
+				}
+			}
+			return false;
+		}) | rpl::to_empty,
+		_peer->session().changes().peerFlagsValue(
+			_peer,
+			Data::PeerUpdate::Flag::EmojiStatus
+				| Data::PeerUpdate::Flag::ColorProfile) | rpl::to_empty
+	) | rpl::on_next([=] {
+		if (_pinnedToTopGiftsFirstTimeShowed) {
+			_peer->session().recentSharedGifts().clearLastRequestTime(_peer);
+			setupPinnedToTopGifts(controller);
+		} else {
+			updateCollectibleStatus();
+		}
+	}, lifetime());
+
+	std::move(
+		descriptor.showFinished
+	) | rpl::take(1) | rpl::on_next([=] {
+		setupPinnedToTopGifts(controller);
+		setupBirthdayEffect();
+	}, lifetime());
+
+	if (_forumButton) {
+		_forumButton->show();
+	}
+}
+
+void TopBar::setupBirthdayEffect() {
+	const auto user = _peer->asUser();
+	if (!user || !Data::IsBirthdayToday(user->birthday())) {
+		return;
+	} else if (_wrap.current() == Wrap::Side) {
+		return;
+	}
+	const auto container = static_cast<Ui::RpWidget*>(parentWidget());
+	if (!container) {
+		return;
+	}
+	StartProfileBirthdayEffect(
+		container,
+		user,
+		[weak = base::make_weak(this)] {
+			const auto strong = weak.get();
+			if (!strong) {
+				return QRect();
+			}
+			const auto geometry = strong->userpicGeometry();
+			return QRect(
+				strong->mapToParent(geometry.topLeft()),
+				geometry.size());
+		},
+		_gifPausedChecker);
+}
+
+void TopBar::adjustColors(const std::optional<QColor> &edgeColor) {
+	constexpr auto kMinContrast = 5.5;
+	const auto shouldOverride = [&](const style::color &color) {
+		return edgeColor
+			&& (kMinContrast > Ui::CountContrast(color->c, *edgeColor));
+	};
+	const auto collectible = effectiveCollectible();
+	const auto shouldOverrideTitle = shouldOverride(_title->st().textFg);
+	const auto shouldOverrideStatus = shouldOverrideTitle
+		|| shouldOverride(_status->st().textFg);
+	_title->setTextColorOverride(collectible
+		? collectible->textColor
+		: shouldOverrideTitle
+		? std::optional<QColor>(st::groupCallMembersFg->c)
+		: std::nullopt);
+	if (_showLastSeen->toggled()) {
+		if (shouldOverrideTitle) {
+			const auto st = mapActionStyle(edgeColor);
+			_showLastSeen->entity()->setBrushOverride(st.bgColor);
+			_showLastSeen->entity()->setTextFgOverride(st.fgColor);
+		} else {
+			_showLastSeen->entity()->setBrushOverride(std::nullopt);
+			_showLastSeen->entity()->setTextFgOverride(std::nullopt);
+		}
+	}
+	{
+		const auto membersLinkCallback = _statusLabel->membersLinkCallback();
+		{
+			_statusLabel = nullptr;
+			delete _status.release();
+		}
+		if (shouldOverrideStatus) {
+			const auto copySt = [&](const style::FlatLabel &st) {
+				auto result = std::make_unique<style::FlatLabel>(
+					base::duplicate(st));
+				result->palette.linkFg = st::groupCallVideoSubTextFg;
+				return result;
+			};
+			_statusSt = copySt(statusStyle());
+			_status.create(this, QString(), *(_statusSt.get()));
+		} else {
+			_status.create(this, QString(), statusStyle());
+		}
+		_status->show();
+		if (!_peer->isMegagroup() && !_topic) {
+			setupStatusWithRating();
+		}
+		_status->widthValue() | rpl::on_next([=] {
+			updateStatusPosition(_progress.current());
+		}, _status->lifetime());
+		_statusLabel = std::make_unique<StatusLabel>(_status.data(), _peer);
+		_statusLabel->setMembersLinkCallback(membersLinkCallback);
+		_status->setTextColorOverride(collectible
+			? collectible->textColor
+			: shouldOverrideStatus
+			? std::optional<QColor>(st::groupCallVideoSubTextFg->c)
+			: std::nullopt);
+		_statusLabel->setColorized(!shouldOverrideStatus);
+	}
+
+	const auto shouldOverrideBadges = shouldOverride(
+		st::infoBotVerifyBadge.premiumFg);
+	_botVerify->setOverrideStyle(shouldOverrideBadges
+		? _botVerifySt
+		? _botVerifySt.get()
+		: &st::infoColoredBotVerifyBadge
+		: nullptr);
+	_badge->setOverrideStyle(shouldOverrideBadges
+		? _badgeSt
+		? _badgeSt.get()
+		: &st::infoColoredPeerBadge
+		: nullptr);
+	_verified->setOverrideStyle(shouldOverrideBadges
+		? _verifiedSt
+		? _verifiedSt.get()
+		: &st::infoColoredPeerBadge
+		: nullptr);
+
+	if (_starsRating) {
+		const auto shouldOverrideRating = shouldOverride(st::windowBgActive);
+		_starsRating->setCustomColors(
+			shouldOverrideRating
+				? edgeColor
+				: std::nullopt,
+			shouldOverrideRating
+				? std::make_optional<QColor>(st::windowFgActive->c)
+				: std::nullopt);
+	}
+
+	_edgeColor = edgeColor;
+}
+
+void TopBar::updateCollectibleStatus() {
+	const auto collectible = effectiveCollectible();
+	const auto colorProfile = effectiveColorProfile();
+	_hasGradientBg = (collectible != nullptr)
+		|| (colorProfile && colorProfile->bg.size() > 1);
+	_solidBg = (colorProfile && colorProfile->bg.size() == 1)
+		? std::make_optional(colorProfile->bg.front())
+		: std::nullopt;
+	_cachedClipPath = QPainterPath();
+	_cachedGradient = QImage();
+	_basePatternImage = QImage();
+	_lastUserpicRect = QRect();
+	const auto patternEmojiId = _localPatternEmojiId
+		? *_localPatternEmojiId
+		: collectible && collectible->patternDocumentId
+		? collectible->patternDocumentId
+		: _peer->profileBackgroundEmojiId();
+	if (patternEmojiId) {
+		const auto document = _peer->owner().document(patternEmojiId);
+		if (!_patternEmoji
+			|| _patternEmoji->entityData()
+				!= Data::SerializeCustomEmojiId(document)) {
+			_patternEmoji = document->owner().customEmojiManager().create(
+				document,
+				[=] { update(); },
+				Data::CustomEmojiSizeTag::Normal);
+		}
+	} else {
+		_patternEmoji = nullptr;
+	}
+	if (collectible || _localPatternEmojiId) {
+		setupAnimatedPattern();
+	} else {
+		_animatedPoints.clear();
+		_pinnedToTopGifts.clear();
+	}
+	const auto verifiedFg = [&]() -> std::optional<QColor> {
+		if (collectible) {
+			return Ui::BlendColors(
+				collectible->edgeColor,
+				collectible->centerColor,
+				0.2);
+		}
+		if (colorProfile && !colorProfile->palette.empty()) {
+			return Ui::BlendColors(
+				colorProfile->palette.back(),
+				colorProfile->palette.size() == 1 ? Qt::white : Qt::black,
+				0.2);
+		}
+		return std::nullopt;
+	}();
+	if (verifiedFg) {
+		const auto copyStVerified = [&](const style::InfoPeerBadge &st) {
+			auto result = std::make_unique<style::InfoPeerBadge>(
+				base::duplicate(st));
+			auto fg = std::make_shared<style::owned_color>(*verifiedFg);
+			result->premiumFg = fg->color();
+			return std::shared_ptr<style::InfoPeerBadge>(
+				result.release(),
+				[fg](style::InfoPeerBadge *ptr) { delete ptr; });
+			return std::shared_ptr<style::InfoPeerBadge>(result.release());
+		};
+		const auto copySt = [&](const style::InfoPeerBadge &st) {
+			auto result = std::make_unique<style::InfoPeerBadge>(
+				base::duplicate(st));
+			result->premiumFg = st::groupCallVideoSubTextFg;
+			return std::shared_ptr<style::InfoPeerBadge>(result.release());
+		};
+		_botVerifySt = copySt(st::infoColoredBotVerifyBadge);
+		_badgeSt = copySt(st::infoColoredPeerBadge);
+		_verifiedSt = copyStVerified(st::infoColoredPeerBadge);
+	} else {
+		_botVerifySt = nullptr;
+		_badgeSt = nullptr;
+		_verifiedSt = nullptr;
+	}
+	update();
+	adjustColors(collectible
+		? std::optional<QColor>(collectible->edgeColor)
+		: (colorProfile && !colorProfile->bg.empty())
+		? std::optional<QColor>(colorProfile->bg.front())
+		: std::nullopt);
+}
+
+void TopBar::setupActions(not_null<Window::SessionController*> controller) {
+	const auto peer = _peer;
+	const auto user = peer->asUser();
+	const auto channel = peer->asChannel();
+	const auto chat = peer->asChat();
+	const auto topic = _key.topic();
+	const auto sublist = _key.sublist();
+	const auto isSide = (_wrap.current() == Wrap::Side);
+
+	auto buttons = std::vector<not_null<TopBarActionButton*>>();
+	_actions = base::make_unique_q<Ui::HorizontalFitContainer>(
+		this,
+		st::infoProfileTopBarActionButtonsSpace);
+	const auto chechMax = [&, max = 3] {
+		return buttons.size() >= max;
+	};
+	const auto addMore = [&] {
+		if ([&]() -> bool {
+			if (isSide) {
+				return false;
+			}
+			const auto guard = gsl::finally([&] { _peerMenu = nullptr; });
+			showTopBarMenu(controller, true);
+			return _peerMenu;
+		}()) {
+			const auto moreButton = Ui::CreateChild<TopBarActionButton>(
+				this,
+				tr::lng_profile_action_short_more(tr::now),
+				st::infoProfileTopBarActionMore);
+			moreButton->setClickedCallback([=] {
+				showTopBarMenu(controller, false);
+			});
+			moreButton->setAccessibleName(tr::lng_profile_action_short_more(tr::now));
+			_actionMore = moreButton;
+			_actions->add(moreButton);
+			buttons.push_back(moreButton);
+		}
+	};
+	const auto guard = gsl::finally([&] {
+		addMore();
+
+		_actionsShadow = base::make_unique_q<Ui::RpWidget>(this);
+		const auto shadowRaw = _actionsShadow.get();
+		shadowRaw->setAttribute(Qt::WA_TransparentForMouseEvents);
+		const auto shadow = shadowRaw->lifetime().make_state<Ui::BoxShadow>(
+			st::infoProfileTopBarActionButtonShadow);
+		const auto shadowShown = shadowRaw->lifetime().make_state<bool>(
+			false);
+		const auto extend = Ui::BoxShadow::ExtendFor(
+			st::infoProfileTopBarActionButtonShadow);
+		shadowRaw->paintRequest() | rpl::on_next([=] {
+			if (!*shadowShown) {
+				return;
+			}
+			const auto full = st::infoProfileTopBarActionButtonSize;
+			const auto progress = std::clamp(
+				float64(_actions->height()) / full,
+				0.,
+				1.);
+			if (progress <= 0.) {
+				return;
+			}
+			auto p = QPainter(shadowRaw);
+			const auto opacity = shadow->opacity() * progress;
+			for (const auto &button : buttons) {
+				const auto buttonRect = button->geometry().translated(
+					extend.left(),
+					extend.top());
+				shadow->paint(p, buttonRect, st::boxRadius, opacity);
+			}
+		}, shadowRaw->lifetime());
+
+		style::PaletteChanged(
+		) | rpl::on_next([=] {
+			const auto current = _edgeColor.current();
+			_edgeColor.force_assign(current);
+		}, _actions->lifetime());
+		_edgeColor.value() | rpl::map([=](std::optional<QColor> c) {
+			return mapActionStyle(c);
+		}) | rpl::on_next([=](
+				TopBarActionButtonStyle st) {
+			for (const auto &button : buttons) {
+				button->setStyle(st);
+			}
+			*shadowShown = st.shadowColor.has_value();
+			shadowRaw->update();
+		}, _actions->lifetime());
+		const auto padding = st::infoProfileTopBarActionButtonsPadding;
+		sizeValue() | rpl::on_next([=](const QSize &size) {
+			const auto ratio = float64(size.height())
+				/ (st::infoProfileTopBarActionButtonsHeight
+					+ st::infoLayerTopBarHeight);
+			const auto h = st::infoProfileTopBarActionButtonSize;
+			const auto resultHeight = (ratio >= 1.)
+				? h
+				: (ratio <= 0.5)
+				? 0
+				: int(h * (ratio - 0.5) / 0.5);
+			_actions->setGeometry(
+				padding.left(),
+				size.height() - resultHeight - padding.bottom(),
+				size.width() - rect::m::sum::h(padding),
+				resultHeight);
+		}, _actions->lifetime());
+		_actions->geometryValue() | rpl::on_next([=](QRect geometry) {
+			shadowRaw->setGeometry(geometry.marginsAdded(extend));
+			shadowRaw->update();
+		}, shadowRaw->lifetime());
+		shadowRaw->show();
+		_actions->show();
+		_actions->raise();
+		shadowRaw->stackUnder(_actions.get());
+	});
+	if (user) {
+		const auto message = Ui::CreateChild<TopBarActionButton>(
+			this,
+			tr::lng_profile_action_short_message(tr::now),
+			st::infoProfileTopBarActionMessage);
+		message->setClickedCallback([=, window = controller] {
+			window->showPeerHistory(
+				peer->id,
+				Window::SectionShow::Way::Forward);
+		});
+		message->setAccessibleName(tr::lng_profile_action_short_message(tr::now));
+		buttons.push_back(message);
+		_actions->add(message);
+	}
+	const auto canJoin = (!sublist && !topic && channel && !channel->amIn());
+	if (canJoin) {
+		const auto join = Ui::CreateChild<TopBarActionButton>(
+			this,
+			tr::lng_profile_action_short_join(tr::now),
+			st::infoProfileTopBarActionJoin);
+		join->setClickedCallback([=] {
+			channel->session().api().joinChannel(channel);
+		});
+		join->setAccessibleName(tr::lng_profile_action_short_join(tr::now));
+		buttons.push_back(join);
+		_actions->add(join);
+	} else if (const auto channel = peer->monoforumBroadcast()) {
+		const auto message = Ui::CreateChild<TopBarActionButton>(
+			this,
+			tr::lng_profile_action_short_channel(tr::now),
+			st::infoProfileTopBarActionMessage);
+		message->setClickedCallback([=, window = controller] {
+			window->showPeerHistory(
+				channel,
+				Window::SectionShow::Way::Forward);
+		});
+		message->setAccessibleName(tr::lng_profile_action_short_channel(tr::now));
+		buttons.push_back(message);
+		_actions->add(message);
+	}
+	if (!peer->isSelf()) {
+		const auto notifications = Ui::CreateChild<TopBarActionButton>(
+			this,
+			tr::lng_profile_action_short_mute(tr::now),
+			st::infoProfileTopBarActionMessage);
+		notifications->setAccessibleName(tr::lng_profile_action_short_mute(tr::now));
+		notifications->convertToToggle(
+			st::infoProfileTopBarActionUnmute,
+			st::infoProfileTopBarActionMute,
+			u"profile_muting"_q,
+			u"profile_unmuting"_q);
+
+		const auto topicRootId = topic ? topic->rootId() : MsgId();
+		const auto makeThread = [=] {
+			return topicRootId
+				? static_cast<Data::Thread*>(peer->forumTopicFor(topicRootId))
+				: peer->owner().history(peer).get();
+		};
+		(topic
+			? NotificationsEnabledValue(topic)
+			: NotificationsEnabledValue(peer)
+		) | rpl::on_next([=](bool enabled) {
+			notifications->toggle(enabled);
+			const auto text = enabled
+				? tr::lng_profile_action_short_mute(tr::now)
+				: tr::lng_profile_action_short_unmute(tr::now);
+			notifications->setText(text);
+			notifications->setAccessibleName(text);
+		}, notifications->lifetime());
+		notifications->finishAnimating();
+
+		notifications->setAcceptBoth();
+		const auto notifySettings = &peer->owner().notifySettings();
+			MuteMenu::SetupMuteMenu(
+				notifications,
+				notifications->clicks(
+				) | rpl::filter([=](Qt::MouseButton button) {
+					if (button == Qt::RightButton) {
+						return true;
+					}
+					const auto topic = topicRootId
+						? peer->forumTopicFor(topicRootId)
+						: nullptr;
+					Assert(!topicRootId || topic != nullptr);
+					const auto is = topic
+						? notifySettings->isMuted(topic)
+						: notifySettings->isMuted(peer);
+					if (is) {
+						if (topic) {
+							notifySettings->update(topic, { .unmute = true });
+						} else {
+							notifySettings->update(peer, { .unmute = true });
+						}
+						return false;
+					} else {
+						return true;
+					}
+				}) | rpl::to_empty,
+				makeThread,
+				controller->uiShow(),
+				[=, skip = st::infoProfileTopBarActionMenuSkip] {
+					return notifications->mapToGlobal(
+						QPoint(0, notifications->height() + skip));
+				});
+		buttons.push_back(notifications);
+		_actions->add(notifications);
+		_edgeColor.value() | rpl::on_next([=](
+				std::optional<QColor> c) {
+			notifications->setLottieColor(c
+				? (const style::color*)(nullptr)
+				: &st::windowBoldFg);
+		}, notifications->lifetime());
+	}
+	if (chechMax()) {
+		return;
+	}
+	if (!isSide
+		&& user
+		&& !user->sharedMediaInfo()
+		&& !user->isInaccessible()
+		&& user->callsStatus() != UserData::CallsStatus::Disabled) {
+		const auto call = Ui::CreateChild<TopBarActionButton>(
+			this,
+			tr::lng_profile_action_short_call(tr::now),
+			st::infoProfileTopBarActionCall);
+		call->setClickedCallback([=] {
+			Core::App().calls().startOutgoingCall(user, {});
+		});
+		call->setAccessibleName(tr::lng_profile_action_short_call(tr::now));
+		buttons.push_back(call);
+		_actions->add(call);
+	}
+	if (chechMax()) {
+		return;
+	}
+	if (const auto chat = channel ? channel->discussionLink() : nullptr;
+			chat && chat->isMegagroup()) {
+		const auto discuss = Ui::CreateChild<TopBarActionButton>(
+			this,
+			tr::lng_profile_action_short_discuss(tr::now),
+			st::infoProfileTopBarActionMessage);
+		discuss->setClickedCallback([=] {
+			if (channel->invitePeekExpires()) {
+				controller->showToast(
+					tr::lng_channel_invite_private(tr::now));
+				return;
+			}
+			auto params = Window::SectionShow(
+				Window::SectionShow::Way::Forward);
+			params.preferCurrentWindow = true;
+			controller->showPeerHistory(chat, params);
+		});
+		discuss->setAccessibleName(tr::lng_profile_action_short_discuss(tr::now));
+		_actions->add(discuss);
+		buttons.push_back(discuss);
+	}
+	if (chechMax()) {
+		return;
+	}
+	if (topic ? topic->canEdit() : EditPeerInfoBox::Available(peer)) {
+		const auto manage = Ui::CreateChild<TopBarActionButton>(
+			this,
+			tr::lng_profile_action_short_manage(tr::now),
+			st::infoProfileTopBarActionManage);
+		manage->setClickedCallback([=, window = controller] {
+			if (topic) {
+				window->show(Box(
+					EditForumTopicBox,
+					window,
+					peer->owner().history(peer),
+					topic->rootId()));
+			} else {
+				window->showEditPeerBox(peer);
+			}
+		});
+		manage->setAccessibleName(tr::lng_profile_action_short_manage(tr::now));
+		buttons.push_back(manage);
+		_actions->add(manage);
+	}
+	if (chechMax()) {
+		return;
+	}
+	if (peer->groupCall() || peer->canManageGroupCall()) {
+		const auto broadcast = peer->isBroadcast();
+		const auto text = broadcast
+			? tr::lng_profile_action_short_live_stream(tr::now)
+			: tr::lng_profile_action_short_video_chat(tr::now);
+		const auto liveStream = Ui::CreateChild<TopBarActionButton>(
+			this,
+			text,
+			st::infoProfileTopBarActionLiveStream);
+		liveStream->setClickedCallback([=] {
+			controller->startOrJoinGroupCall(peer);
+		});
+		liveStream->setAccessibleName(text);
+		buttons.push_back(liveStream);
+		_actions->add(liveStream);
+	}
+	if (chechMax()) {
+		return;
+	}
+	{
+		const auto channel = peer->asBroadcast();
+		if (!user && !channel) {
+		} else if (user
+			&& (user->isInaccessible()
+				|| user->isSelf()
+				|| user->isBot()
+				|| user->isServiceUser()
+				|| user->isNotificationsUser()
+				|| user->isRepliesChat()
+				|| user->isVerifyCodes()
+				|| !user->session().premiumCanBuy())) {
+		} else if (channel
+			&& (channel->isForbidden()
+				|| !channel->stargiftsAvailable()
+				|| channel->amCreator())) {
+		} else {
+			const auto giftButton = Ui::CreateChild<TopBarActionButton>(
+				this,
+				tr::lng_profile_action_short_gift(tr::now),
+				st::infoProfileTopBarActionGift);
+			giftButton->setClickedCallback([=] {
+				Ui::ShowStarGiftBox(controller, peer);
+			});
+			giftButton->setAccessibleName(tr::lng_profile_action_short_gift(tr::now));
+			_actions->add(giftButton);
+			buttons.push_back(giftButton);
+		}
+	}
+	if (chechMax()) {
+		return;
+	}
+	if (!topic
+		&& canJoin
+		&& ((chat && !chat->amCreator() && !chat->hasAdminRights())
+			|| (channel
+				&& !channel->amCreator()
+				&& !channel->hasAdminRights()))) {
+		const auto show = controller->uiShow();
+		const auto reportButton = Ui::CreateChild<TopBarActionButton>(
+			this,
+			tr::lng_profile_action_short_report(tr::now),
+			st::infoProfileTopBarActionReport);
+		reportButton->setClickedCallback([=] {
+			ShowReportMessageBox(show, peer, {}, {});
+		});
+		reportButton->setAccessibleName(tr::lng_profile_action_short_report(tr::now));
+		_actions->add(reportButton);
+		buttons.push_back(reportButton);
+	}
+	if (chechMax()) {
+		return;
+	}
+	if (!canJoin && !topic && !sublist && (chat || channel)) {
+		const auto leaveButton = Ui::CreateChild<TopBarActionButton>(
+			this,
+			tr::lng_profile_action_short_leave(tr::now),
+			st::infoProfileTopBarActionLeave);
+		leaveButton->setClickedCallback(
+			Window::DeleteAndLeaveHandler(controller, peer));
+		leaveButton->setAccessibleName(tr::lng_profile_action_short_leave(tr::now));
+		_actions->add(leaveButton);
+		buttons.push_back(leaveButton);
+	}
+}
+
+void TopBar::setupUserpicButton(
+		not_null<Window::SessionController*> controller) {
+	_userpicButton = base::make_unique_q<Userpic>(
+		this,
+		[=] { return _hasStories; });
+
+	const auto openPhoto = [=, peer = _peer] {
+		if (const auto id = peer->userpicPhotoId()) {
+			if (const auto photo = peer->owner().photo(id); photo->date()) {
+				controller->openPhoto(photo, peer);
+			}
+		}
+	};
+
+	_userpicButton->setAcceptBoth(true);
+
+	const auto menu = _userpicButton->lifetime().make_state<
+		base::unique_qptr<Ui::PopupMenu>
+	>();
+	const auto canReport = [=, peer = _peer] {
+		if (!peer->hasUserpic()) {
+			return false;
+		}
+		const auto user = peer->asUser();
+		if (!user) {
+			return false;
+		} else if (user->hasPersonalPhoto()
+				|| user->isSelf()
+				|| user->isInaccessible()
+				|| user->isRepliesChat()
+				|| user->isVerifyCodes()
+				|| (user->botInfo && user->botInfo->canEditInformation)
+				|| user->isServiceUser()) {
+			return false;
+		}
+		return true;
+	};
+
+	const auto canChangePhoto = [=, peer = _peer] {
+		if (_topicIconView) {
+			return false;
+		}
+		if (const auto user = peer->asUser()) {
+			return user->isContact()
+				&& !user->isSelf()
+				&& !user->isInaccessible()
+				&& !user->isServiceUser();
+		}
+		if (const auto chat = peer->asChat()) {
+			return chat->canEditInformation();
+		}
+		if (const auto channel = peer->asChannel()) {
+			return channel->canEditInformation();
+		}
+		return false;
+	};
+
+	const auto canSuggestPhoto = [=, peer = _peer] {
+		if (const auto user = peer->asUser()) {
+			return !user->isSelf()
+				&& !user->isBot()
+				&& !user->starsPerMessageChecked()
+				&& user->owner().history(user)->lastServerMessage();
+		}
+		return false;
+	};
+
+	const auto hasMenu = [=] {
+		if (canChangePhoto()) {
+			return true;
+		}
+		if (canSuggestPhoto()) {
+			return true;
+		}
+		if (_hasStories || canReport()) {
+			return !!_peer->userpicPhotoId();
+		}
+		return false;
+	};
+
+	const auto invalidate = [=] {
+		_userpicUniqueKey = InMemoryKey();
+		const auto hasLeftButton = _peer->userpicPhotoId() || _hasStories;
+		_userpicButton->setAttribute(
+			Qt::WA_TransparentForMouseEvents,
+			!hasLeftButton && !hasMenu());
+		_userpicButton->setPointerCursor(hasLeftButton);
+		updateVideoUserpic();
+		_peer->session().downloaderTaskFinished(
+		) | rpl::filter([=] {
+			return !Ui::PeerUserpicLoading(_userpicView);
+		}) | rpl::on_next([=] {
+			update();
+			_userpicLoadingLifetime.destroy();
+		}, _userpicLoadingLifetime);
+		Ui::PostponeCall(this, [=] {
+			update();
+		});
+	};
+
+	rpl::single(
+		rpl::empty_value()
+	) | rpl::then(
+		_peer->session().changes().peerFlagsValue(
+			_peer,
+			Data::PeerUpdate::Flag::Photo
+				| Data::PeerUpdate::Flag::FullInfo) | rpl::to_empty
+	) | rpl::on_next(invalidate, lifetime());
+
+	if (const auto broadcast = _peer->monoforumBroadcast()) {
+		_peer->session().changes().peerFlagsValue(
+			broadcast,
+			Data::PeerUpdate::Flag::Photo
+				| Data::PeerUpdate::Flag::FullInfo
+		) | rpl::to_empty | rpl::on_next(invalidate, lifetime());
+	}
+
+	using ChosenType = Ui::UserpicButton::ChosenType;
+
+	const auto choosePhotoCallback = [=](ChosenType type) {
+		return [=](QImage &&image) {
+			auto result = Api::PeerPhoto::UserPhoto{
+				std::move(image),
+				0,
+				std::vector<QColor>(),
+			};
+			switch (type) {
+			case ChosenType::Set:
+				_peer->session().api().peerPhoto().upload(
+					_peer,
+					std::move(result));
+				startUploadOverlay();
+				break;
+			case ChosenType::Suggest:
+				_peer->session().api().peerPhoto().suggest(
+					_peer,
+					std::move(result));
+				break;
+			}
+		};
+	};
+
+	const auto editorData = [=](ChosenType type) {
+		const auto user = _peer->asUser();
+		const auto name = (user && !user->firstName.isEmpty())
+			? user->firstName
+			: _peer->name();
+		const auto phrase = (type == ChosenType::Suggest)
+			? &tr::lng_profile_suggest_sure
+			: (user && !user->isSelf() && !_peer->isBot())
+			? &tr::lng_profile_set_personal_sure
+			: nullptr;
+		const auto useForumShape = _peer->isForum() && !_peer->isBot();
+		return Editor::EditorData{
+			.about = (phrase
+				? (*phrase)(
+					tr::now,
+					lt_user,
+					tr::bold(name),
+					tr::marked)
+				: TextWithEntities()),
+			.confirm = ((type == ChosenType::Suggest)
+				? tr::lng_profile_suggest_button(tr::now)
+				: tr::lng_profile_set_photo_button(tr::now)),
+			.cropType = (useForumShape
+				? Editor::EditorData::CropType::RoundedRect
+				: Editor::EditorData::CropType::Ellipse),
+			.keepAspectRatio = true,
+		};
+	};
+
+	const auto chooseFile = [=](ChosenType type) {
+		base::call_delayed(
+			st::defaultRippleAnimation.hideDuration,
+			crl::guard(this, [=] {
+				Editor::PrepareProfilePhotoFromFile(
+					this,
+					&controller->window(),
+					editorData(type),
+					choosePhotoCallback(type));
+			}));
+	};
+
+	const auto addFromClipboard = [=](
+			Ui::PopupMenu *menu,
+			ChosenType type,
+			tr::phrase<> text) {
+		if (const auto data = QGuiApplication::clipboard()->mimeData()) {
+			if (data->hasImage()) {
+				auto openEditor = crl::guard(this, [=] {
+					Editor::PrepareProfilePhoto(
+						this,
+						&controller->window(),
+						editorData(type),
+						choosePhotoCallback(type),
+						qvariant_cast<QImage>(data->imageData()));
+				});
+				menu->addAction(
+					std::move(text)(tr::now),
+					std::move(openEditor),
+					&st::menuIconPhoto);
+			}
+		}
+	};
+
+	_userpicButton->clicks() | rpl::on_next([=](
+			Qt::MouseButton button) {
+		if (button == Qt::RightButton && hasMenu()) {
+			*menu = base::make_unique_q<Ui::PopupMenu>(
+				this,
+				st::popupMenuWithIcons);
+
+			(*menu)->addAction(
+				tr::lng_profile_open_photo(tr::now),
+				openPhoto,
+				&st::menuIconPhoto);
+
+			if (canReport()) {
+				(*menu)->addAction(
+					tr::lng_profile_report(tr::now),
+					[=] {
+						controller->show(
+							ReportProfilePhotoBox(
+								_peer,
+								_peer->owner().photo(
+									_peer->userpicPhotoId())));
+					},
+					&st::menuIconReport);
+			}
+
+			if (canChangePhoto()) {
+				if (!(*menu)->empty()) {
+					(*menu)->addSeparator(&st::expandedMenuSeparator);
+				}
+				const auto isUser = _peer->asUser();
+				if (isUser) {
+					(*menu)->addAction(
+						tr::lng_profile_set_photo_for(tr::now),
+						[=] { chooseFile(ChosenType::Set); },
+						&st::menuIconPhotoSet);
+					addFromClipboard(
+						menu->get(),
+						ChosenType::Set,
+						tr::lng_profile_set_photo_for_from_clipboard);
+					if (canSuggestPhoto()) {
+						(*menu)->addAction(
+							tr::lng_profile_suggest_photo(tr::now),
+							[=] {
+								chooseFile(
+									ChosenType::Suggest);
+							},
+							&st::menuIconPhotoSuggest);
+						addFromClipboard(
+								menu->get(),
+								ChosenType::Suggest,
+								tr::lng_profile_suggest_photo_from_clipboard);
+					}
+				} else {
+					const auto channel = _peer->asChannel();
+					const auto isChannel = channel && !channel->isMegagroup();
+					(*menu)->addAction(
+						isChannel
+							? tr::lng_profile_set_photo_for_channel(tr::now)
+							: tr::lng_profile_set_photo_for_group(tr::now),
+						[=] { chooseFile(ChosenType::Set); },
+						&st::menuIconPhotoSet);
+					addFromClipboard(
+						menu->get(),
+						ChosenType::Set,
+						tr::lng_profile_set_photo_for_from_clipboard);
+				}
+				if (controller && isUser) {
+					const auto done = [=](UserpicBuilder::Result data) {
+						auto result = Api::PeerPhoto::UserPhoto{
+							base::take(data.image),
+							data.id,
+							std::move(data.colors),
+						};
+						_peer->session().api().peerPhoto().upload(
+							_peer,
+							std::move(result));
+					};
+					UserpicBuilder::AddEmojiBuilderAction(
+						controller,
+						menu->get(),
+						_peer->session().api().peerPhoto().emojiListValue(
+							Api::PeerPhoto::EmojiListType::Profile),
+						done,
+						false);
+				}
+			}
+			if (!(*menu)->empty()) {
+				(*menu)->popup(QCursor::pos());
+			}
+		} else if (button == Qt::LeftButton) {
+			if (_uploadOverlay && _uploadOverlay->uploading()) {
+				_peer->session().api().peerPhoto().cancelUpload(_peer);
+			} else if (_topicIconView && _topic && _topic->iconId()) {
+				const auto document = _peer->owner().document(
+					_topic->iconId());
+				if (const auto sticker = document->sticker()) {
+					const auto packName
+						= _peer->owner().customEmojiManager().lookupSetName(
+							sticker->set.id);
+					if (!packName.isEmpty()) {
+						const auto text = tr::lng_profile_topic_toast(
+							tr::now,
+							lt_name,
+							tr::link(packName, u"internal:"_q),
+							tr::marked);
+						const auto weak = base::make_weak(controller);
+						controller->showToast(Ui::Toast::Config{
+							.text = text,
+							.filter = [=, set = sticker->set](
+									const ClickHandlerPtr &handler,
+									Qt::MouseButton) {
+								if (const auto strong = weak.get()) {
+									strong->show(
+										Box<StickerSetBox>(
+											strong->uiShow(),
+											set,
+											Data::StickersType::Emoji));
+								}
+								return false;
+							},
+							.duration = crl::time(3000),
+						});
+					}
+				}
+			} else if (_hasStories) {
+				controller->openPeerStories(_peer->id);
+			} else {
+				openPhoto();
+			}
+		}
+	}, _userpicButton->lifetime());
+}
+
+void TopBar::startUploadOverlay() {
+	if (_uploadOverlay && _uploadOverlay->uploading()) {
+		return;
+	}
+	_waitingUserpicCloudLoad = true;
+	_uploadOverlay = std::make_unique<Ui::UploadProgressOverlay>(
+		this,
+		[=] { update(); });
+	_uploadOverlay->start();
+
+	_userpicButton->events(
+	) | rpl::filter([](not_null<QEvent*> e) {
+		return e->type() == QEvent::Enter
+			|| e->type() == QEvent::Leave;
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
+		if (_uploadOverlay) {
+			_uploadOverlay->setOver(e->type() == QEvent::Enter);
+		}
+	}, _uploadLifetime);
+
+	const auto cleanup = [=] {
+		_uploadLifetime.destroy();
+		_uploadOverlay = nullptr;
+	};
+	_peer->session().api().peerPhoto().subscribeToUpload(
+		_peer,
+		_uploadLifetime,
+		{
+			.progress = [=](float64 value) {
+				_uploadOverlay->setProgress(value);
+			},
+			.done = [=] {
+				_uploadOverlay->stop(cleanup);
+			},
+			.failed = [=] {
+				_uploadOverlay->fail(cleanup);
+			},
+		});
+}
+
+void TopBar::setupUniqueBadgeTooltip() {
+	if (!_badge || _source == Source::Preview) {
+		return;
+	}
+	base::timer_once(kWaitBeforeGiftBadge) | rpl::then(
+		_badge->updated()
+	) | rpl::on_next([=] {
+		const auto widget = _badge->widget();
+		const auto &content = _badgeContent.current();
+		const auto &collectible = content.emojiStatusId.collectible;
+		const auto premium = (content.badge == BadgeType::Premium);
+		const auto id = (collectible && widget && premium)
+			? collectible->id
+			: uint64();
+		if (_badgeCollectibleId == id) {
+			return;
+		}
+		hideBadgeTooltip();
+		if (!collectible || _localCollectible) {
+			return;
+		}
+		_badgeTooltip = std::make_unique<BadgeTooltip>(
+			this,
+			collectible,
+			widget);
+		const auto raw = _badgeTooltip.get();
+		raw->fade(true);
+		_badgeTooltipHide->callOnce(kGiftBadgeGlares * raw->glarePeriod()
+			- st::infoGiftTooltip.duration * 1.5);
+		raw->setOpacity(_progress.current());
+	}, lifetime());
+
+	if (const auto raw = _badgeTooltip.get()) {
+		raw->finishAnimating();
+	}
+}
+
+void TopBar::hideBadgeTooltip() {
+	_badgeTooltipHide->cancel();
+	if (auto old = base::take(_badgeTooltip)) {
+		const auto raw = old.get();
+		_badgeOldTooltips.push_back(std::move(old));
+
+		raw->fade(false);
+		raw->shownValue(
+		) | rpl::filter(
+			!rpl::mappers::_1
+		) | rpl::on_next([=] {
+			const auto i = ranges::find(
+				_badgeOldTooltips,
+				raw,
+				&std::unique_ptr<BadgeTooltip>::get);
+			if (i != end(_badgeOldTooltips)) {
+				_badgeOldTooltips.erase(i);
+			}
+		}, raw->lifetime());
+	}
+}
+
+TopBar::~TopBar() {
+	base::take(_badgeTooltip);
+	base::take(_badgeOldTooltips);
+}
+
+rpl::producer<> TopBar::backRequest() const {
+	return _backClicks.events();
+}
+
+void TopBar::setupSwipeBack(
+		not_null<Window::SessionController*> controller) {
+	auto update = [=](Ui::Controls::SwipeContextData data) {
+		if (data.translation > 0) {
+			if (!_swipeBackData.callback) {
+				const auto container = static_cast<Ui::RpWidget*>(
+					parentWidget());
+				_swipeBackData = Ui::Controls::SetupSwipeBack(
+					container ? container : static_cast<Ui::RpWidget*>(this),
+					[]() -> std::pair<QColor, QColor> {
+						return {
+							st::historyForwardChooseBg->c,
+							st::historyForwardChooseFg->c,
+						};
+					});
+			}
+			_swipeBackData.callback(data);
+			return;
+		} else if (_swipeBackData.lifetime) {
+			_swipeBackData = {};
+		}
+	};
+
+	auto init = [=](Ui::Controls::SwipeHandlerInitData data) {
+		if (data.direction != Qt::RightToLeft) {
+			return Ui::Controls::SwipeHandlerFinishData();
+		}
+		auto dismiss = Fn<void()>();
+		if (_back && _back->toggled()) {
+			dismiss = [=] { _backClicks.fire({}); };
+		} else if (_close) {
+			dismiss = (_wrap.current() == Wrap::Side)
+				? Fn<void()>([=] {
+					controller->closeThirdSection();
+				})
+				: Fn<void()>([=] {
+					controller->hideLayer();
+					controller->hideSpecialLayer();
+				});
+		}
+		return dismiss
+			? Ui::Controls::DefaultSwipeBackHandlerFinishData(
+				std::move(dismiss))
+			: Ui::Controls::SwipeHandlerFinishData();
+	};
+
+	Ui::Controls::SetupSwipeHandler({
+		.widget = this,
+		.update = std::move(update),
+		.init = std::move(init),
+	});
+}
+
+void TopBar::setOnlineCount(rpl::producer<int> &&count) {
+	std::move(count) | rpl::on_next([=](int v) {
+		if (_statusLabel) {
+			_statusLabel->setOnlineCount(v);
+		}
+	}, lifetime());
+}
+
+void TopBar::setRoundEdges(bool value) {
+	_roundEdges = value;
+	update();
+}
+
+void TopBar::setLottieSingleLoop(bool value) {
+	_lottieSingleLoop = value;
+}
+
+void TopBar::setColorProfileIndex(std::optional<uint8> index) {
+	_localColorProfileIndex = index;
+	updateCollectibleStatus();
+}
+
+void TopBar::setPatternEmojiId(std::optional<DocumentId> patternEmojiId) {
+	_localPatternEmojiId = patternEmojiId;
+	updateCollectibleStatus();
+}
+
+void TopBar::setLocalEmojiStatusId(EmojiStatusId emojiStatusId) {
+	_localCollectible = emojiStatusId.collectible;
+	_badgeContent = Badge::Content{ BadgeType::Premium, emojiStatusId };
+	updateCollectibleStatus();
+}
+
+std::optional<Data::ColorProfileSet> TopBar::effectiveColorProfile() const {
+	return _localColorProfileIndex
+		? _peer->session().api().peerColors().colorProfileFor(
+			*_localColorProfileIndex)
+		: _source == Source::Preview
+		? std::nullopt
+		: _peer->session().api().peerColors().colorProfileFor(_peer);
+}
+
+auto TopBar::effectiveCollectible() const
+-> std::shared_ptr<Data::EmojiStatusCollectible> {
+	return _localCollectible
+		? _localCollectible
+		: _localColorProfileIndex
+		? nullptr
+		: _peer->emojiStatusId().collectible;
+}
+
+void TopBar::paintEdges(QPainter &p, const QBrush &brush) const {
+	const auto r = rect();
+	if (_roundEdges) {
+		auto hq = PainterHighQualityEnabler(p);
+		const auto radius = st::boxRadius;
+		p.setPen(Qt::NoPen);
+		p.setBrush(brush);
+		p.drawRoundedRect(
+			r + QMargins{ 0, 0, 0, radius + 1 },
+			radius,
+			radius);
+	} else {
+		p.fillRect(r, brush);
+	}
+}
+
+void TopBar::paintEdges(QPainter &p) const {
+	if (!_solidBg) {
+		paintEdges(p, st::boxDividerBg);
+	} else {
+		paintEdges(p, *_solidBg);
+	}
+}
+
+int TopBar::titleMostLeft() const {
+	return (_back && _back->toggled())
+		? _back->width()
+		: _st.titleWithSubtitlePosition.x();
+}
+
+int TopBar::statusMostLeft() const {
+	return (_back && _back->toggled())
+		? _back->width()
+		: _st.subtitlePosition.x();
+}
+
+int TopBar::calculateRightButtonsWidth() const {
+	auto width = 0;
+	if (_close) {
+		width += _close->width();
+	}
+	if (_topBarButton) {
+		width += _topBarButton->width();
+	}
+	return width;
+}
+
+void TopBar::updateLabelsPosition() {
+	if (width() <= 0) {
+		return;
+	}
+	_progress = [&] {
+		const auto max = QWidget::maximumHeight();
+		const auto min = _minForProgress;
+		const auto p = (max > min)
+			? ((height() - min) / float64(max - min))
+			: 1.;
+		return std::clamp(p, 0., 1.);
+	}();
+	const auto progressCurrent = _progress.current();
+
+	const auto rightButtonsWidth = calculateRightButtonsWidth();
+
+	const auto reservedRight = anim::interpolate(
+		0,
+		rightButtonsWidth,
+		1. - progressCurrent);
+	const auto titleMostLeft = TopBar::titleMostLeft();
+	const auto interpolatedPadding = anim::interpolate(
+		titleMostLeft,
+		rect::m::sum::h(st::boxRowPadding),
+		progressCurrent);
+	const auto verifiedWidget = _verified ? _verified->widget() : nullptr;
+	const auto badgeWidget = _badge ? _badge->widget() : nullptr;
+	const auto botVerifyWidget = _botVerify ? _botVerify->widget() : nullptr;
+	auto badgesWidth = 0;
+	if (verifiedWidget) {
+		badgesWidth += verifiedWidget->width();
+	}
+	if (badgeWidget) {
+		badgesWidth += badgeWidget->width();
+	}
+	if (botVerifyWidget) {
+		badgesWidth += botVerifyWidget->width();
+	}
+	if (verifiedWidget || badgeWidget) {
+		badgesWidth += st::infoVerifiedCheckPosition.x();
+	}
+	const auto titleWidth = width()
+		- interpolatedPadding
+		- reservedRight
+		- badgesWidth;
+
+	if (titleWidth > 0 && _title->textMaxWidth() > titleWidth) {
+		_title->resizeToWidth(titleWidth);
+	}
+
+	const auto titleTop = anim::interpolate(
+		_st.titleWithSubtitlePosition.y(),
+		st::infoProfileTopBarTitleTop,
+		progressCurrent);
+
+	const auto badgeTop = titleTop;
+	const auto badgeBottom = titleTop + _title->height();
+	const auto margins = LargeCustomEmojiMargins();
+
+	auto totalElementsWidth = _title->width();
+	const auto botVerifySkip = botVerifyWidget
+		? botVerifyWidget->width() + st::infoVerifiedCheckPosition.x()
+		: 0;
+	if (verifiedWidget) {
+		totalElementsWidth += verifiedWidget->width();
+	}
+	if (badgeWidget) {
+		totalElementsWidth += badgeWidget->width();
+	}
+	if (verifiedWidget || badgeWidget) {
+		totalElementsWidth += st::infoVerifiedCheckPosition.x();
+	}
+	totalElementsWidth += botVerifySkip;
+
+	auto titleLeft = anim::interpolate(
+		titleMostLeft,
+		(width() - totalElementsWidth) / 2,
+		progressCurrent);
+
+	if (_botVerify) {
+		_botVerify->move(
+			titleLeft,
+			badgeTop,
+			badgeBottom);
+		titleLeft += margins.left() + botVerifySkip;
+	}
+
+	_title->moveToLeft(titleLeft, titleTop);
+	const auto badgeLeft = titleLeft + _title->width();
+	if (_badge) {
+		_badge->move(badgeLeft, badgeTop, badgeBottom);
+	}
+	if (_verified) {
+		_verified->move(
+			badgeLeft + (badgeWidget ? badgeWidget->width() : 0),
+			badgeTop,
+			badgeBottom);
+	}
+
+	updateStatusPosition(progressCurrent);
+
+	if (_badgeTooltip) {
+		_badgeTooltip->setOpacity(progressCurrent);
+	}
+
+	{
+		const auto userpicRect = userpicGeometry();
+		if (_userpicButton) {
+			_userpicButton->setGeometry(userpicGeometry());
+		}
+
+		updateGiftButtonsGeometry(progressCurrent, userpicRect);
+	}
+}
+
+void TopBar::updateStatusPosition(float64 progressCurrent) {
+	if (width() <= 0) {
+		return;
+	}
+	if (_forumButton) {
+		const auto buttonTop = anim::interpolate(
+			_st.subtitlePosition.y(),
+			st::infoProfileTopBarStatusTop,
+			progressCurrent);
+		const auto mostLeft = statusMostLeft();
+		const auto buttonMostLeft = anim::interpolate(
+			mostLeft,
+			st::infoProfileTopBarActionButtonsPadding.left(),
+			progressCurrent);
+		const auto buttonMostRight = anim::interpolate(
+			calculateRightButtonsWidth(),
+			st::infoProfileTopBarActionButtonsPadding.right(),
+			progressCurrent);
+		const auto maxWidth = width() - buttonMostLeft - buttonMostRight;
+		if (_forumButton->contentWidth() > maxWidth) {
+			_forumButton->setFullWidth(maxWidth);
+		}
+		const auto buttonLeft = anim::interpolate(
+			mostLeft,
+			(width() - _forumButton->width()) / 2,
+			progressCurrent);
+		_forumButton->moveToLeft(buttonLeft, buttonTop);
+		_forumButton->setVisible(true);
+
+		_status->hide();
+		// _starsRating->hide();
+		_showLastSeen->hide(anim::type::instant);
+		return;
+	}
+
+	const auto statusTop = anim::interpolate(
+		_st.subtitlePosition.y(),
+		st::infoProfileTopBarStatusTop,
+		progressCurrent);
+	const auto totalElementsWidth = _status->width()
+		+ (_starsRating ? _starsRating->width() : 0)
+		+ (_showLastSeen->toggled() ? _showLastSeen->width() : 0);
+	const auto statusLeft = anim::interpolate(
+		statusMostLeft(),
+		(width() - totalElementsWidth) / 2,
+		progressCurrent);
+
+	if (const auto rating = _starsRating.get()) {
+		rating->moveTo(statusLeft, statusTop - st::lineWidth);
+		rating->setOpacity(progressCurrent);
+	}
+	const auto statusShift = _statusShift.current()
+		* std::clamp((progressCurrent) / 0.15, 0., 1.);
+
+	_status->moveToLeft(statusLeft + statusShift, statusTop);
+
+	if (_showLastSeen->toggled()) {
+		_showLastSeen->moveToLeft(
+			statusLeft
+				+ statusShift
+				+ _status->textMaxWidth()
+				+ st::infoProfileTopBarLastSeenSkip.x(),
+			statusTop + st::infoProfileTopBarLastSeenSkip.y());
+		_showLastSeen->setOpacity(progressCurrent);
+		_showLastSeen->entity()->setAttribute(
+			Qt::WA_TransparentForMouseEvents,
+			!progressCurrent);
+	}
+}
+
+void TopBar::resizeEvent(QResizeEvent *e) {
+	_cachedClipPath = QPainterPath();
+	const auto collectible = effectiveCollectible();
+	if (collectible && !_animatedPoints.empty()) {
+		setupAnimatedPattern();
+	}
+	if (_hasGradientBg && e->oldSize().width() != e->size().width()) {
+		_cachedClipPath = QPainterPath();
+		_cachedGradient = QImage();
+	}
+	updateLabelsPosition();
+	RpWidget::resizeEvent(e);
+}
+
+QRect TopBar::userpicGeometry() const {
+	constexpr auto kMinScale = 0.25;
+	const auto progressCurrent = _progress.current();
+	const auto fullSize = st::infoProfileTopBarPhotoSize;
+	const auto minSize = fullSize * kMinScale;
+	const auto size = anim::interpolate(minSize, fullSize, progressCurrent);
+	const auto x = (width() - size) / 2;
+	const auto minY = -minSize;
+	const auto maxY = st::infoProfileTopBarPhotoTop;
+	const auto y = anim::interpolate(minY, maxY, progressCurrent);
+	return QRect(x, y, size, size);
+}
+
+void TopBar::updateGiftButtonsGeometry(
+		float64 progressCurrent,
+		const QRect &userpicRect) {
+	if (width() <= 0) {
+		return;
+	}
+	const auto sz = st::infoProfileTopBarGiftSize;
+	const auto halfSz = sz / 2.;
+	for (const auto &gift : _pinnedToTopGifts) {
+		if (gift.button) {
+			const auto giftPos = calculateGiftPosition(
+				gift.position,
+				progressCurrent,
+				userpicRect);
+			const auto buttonRect = QRect(
+				QPoint(giftPos.x() - halfSz, giftPos.y() - halfSz),
+				Size(sz));
+			gift.button->setGeometry(buttonRect);
+		}
+	}
+}
+
+void TopBar::paintUserpic(QPainter &p, const QRect &geometry) {
+	if (_topicIconView) {
+		_topicIconView->paintInRect(p, geometry);
+		return;
+	}
+	if (_videoUserpicPlayer && _videoUserpicPlayer->ready()) {
+		const auto size = st::infoProfileTopBarPhotoSize;
+		const auto frame = _videoUserpicPlayer->frame(Size(size), _peer);
+		if (!frame.isNull()) {
+			auto hq = PainterHighQualityEnabler(p);
+			p.drawImage(geometry, frame);
+			update();
+			return;
+		}
+	}
+	const auto key = _peer->userpicUniqueKey(_userpicView);
+	const auto overlayActive = _uploadOverlay && _uploadOverlay->shown();
+	const auto awaitingCloud = _waitingUserpicCloudLoad
+		&& !_peer->userpicCloudImage(_userpicView);
+	if (!overlayActive && !awaitingCloud && _userpicUniqueKey != key) {
+		_waitingUserpicCloudLoad = false;
+		_userpicUniqueKey = key;
+		const auto fullSize = st::infoProfileTopBarPhotoSize;
+		const auto scaled = fullSize * style::DevicePixelRatio();
+		auto image = QImage();
+		if (const auto broadcast = _peer->monoforumBroadcast()) {
+			image = PeerData::GenerateUserpicImage(
+				broadcast,
+				_userpicView,
+				scaled,
+				0);
+			if (_monoforumMask.isNull()) {
+				_monoforumMask = Ui::MonoforumShapeMask(Size(scaled));
+			}
+			constexpr auto kFormat = QImage::Format_ARGB32_Premultiplied;
+			if (image.format() != kFormat) {
+				image = std::move(image).convertToFormat(kFormat);
+			}
+			auto q = QPainter(&image);
+			q.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+			q.drawImage(
+				Rect(image.size() / image.devicePixelRatio()),
+				_monoforumMask);
+			q.end();
+		} else {
+			image = PeerData::GenerateUserpicImage(
+				_peer,
+				_userpicView,
+				scaled,
+				std::nullopt);
+		}
+		_cachedUserpic = std::move(image);
+		_cachedUserpic.setDevicePixelRatio(style::DevicePixelRatio());
+	}
+	{
+		auto hq = PainterHighQualityEnabler(p);
+		p.drawImage(geometry, _cachedUserpic);
+	}
+	if (_uploadOverlay && _uploadOverlay->shown()) {
+		_uploadOverlay->paint(p, geometry, {
+			.lineWidth = st::defaultUserpicButton.uploadProgressLine,
+			.margin = st::defaultUserpicButton.uploadProgressMargin,
+			.progressFg = st::historyFileThumbRadialFg,
+			.overlayFg = st::songCoverOverlayFg,
+			.cancelIcon = &st::userpicUploadCancel,
+		});
+	}
+}
+
+void TopBar::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	const auto geometry = userpicGeometry();
+
+	if (_hasGradientBg && _cachedGradient.isNull()) {
+		const auto collectible = effectiveCollectible();
+		const auto colorProfile = effectiveColorProfile();
+		const auto offset = QPoint(
+			0,
+			_hasActions
+				? -st::infoProfileTopBarPhotoBgShift
+				: -st::infoProfileTopBarPhotoBgNoActionsShift);
+		if (collectible) {
+			_cachedGradient = Ui::CreateTopBgGradient(
+				QSize(width(), maximumHeight()),
+				collectible->centerColor,
+				collectible->edgeColor,
+				false,
+				offset);
+		} else if (colorProfile && colorProfile->bg.size() > 1) {
+			_cachedGradient = Ui::CreateTopBgGradient(
+				QSize(width(), maximumHeight()),
+				colorProfile->bg[1],
+				colorProfile->bg[0],
+				false,
+				offset);
+		}
+	}
+	if (!_hasGradientBg) {
+		paintEdges(p);
+	} else {
+		const auto x = (width()
+			- _cachedGradient.width() / style::DevicePixelRatio())
+				/ 2;
+		const auto y = (height()
+			- _cachedGradient.height() / style::DevicePixelRatio())
+				/ 2;
+		if (_roundEdges) {
+			if (_cachedClipPath.isEmpty()) {
+				const auto radius = st::boxRadius;
+				_cachedClipPath.addRoundedRect(
+					rect() + QMargins{ 0, 0, 0, radius + 1 },
+					radius,
+					radius);
+			}
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			p.setClipPath(_cachedClipPath);
+			p.drawImage(x, y, _cachedGradient);
+		} else {
+			p.drawImage(x, y, _cachedGradient);
+		}
+	}
+	if (_patternEmoji && _patternEmoji->ready()) {
+		paintAnimatedPattern(p, rect(), geometry);
+	}
+
+	const auto clipBounds = e->region().boundingRect();
+	if (clipBounds.bottom() >= geometry.top()
+		&& clipBounds.top() <= geometry.bottom()) {
+		paintPinnedToTopGifts(p, rect(), geometry);
+	}
+
+	if (clipBounds.intersects(geometry)) {
+		paintUserpic(p, geometry);
+		paintStoryOutline(p, geometry);
+	}
+}
+
+void TopBar::setupButtons(
+		not_null<Window::SessionController*> controller,
+		Source source) {
+	if (source == Source::Preview) {
+		setRoundEdges(false);
+		return;
+	}
+	rpl::combine(
+		_wrap.value(),
+		_edgeColor.value()
+	) | rpl::on_next([=](
+			Wrap wrap,
+			std::optional<QColor> edgeColor) mutable {
+		const auto isLayer = (wrap == Wrap::Layer);
+		const auto isSide = (wrap == Wrap::Side);
+		setRoundEdges(isLayer);
+		setLottieSingleLoop(wrap == Wrap::Side);
+
+		const auto shouldUseColored = edgeColor
+			&& (kMinContrast > Ui::CountContrast(
+				st::boxTitleCloseFg->c,
+				*edgeColor));
+		_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
+			this,
+			object_ptr<Ui::IconButton>(
+				this,
+				(isLayer
+					? (shouldUseColored
+						? st::infoTopBarColoredBack
+						: st::infoTopBarBlackBack)
+					: (shouldUseColored
+						? st::infoLayerTopBarColoredBack
+						: st::infoLayerTopBarBlackBack))),
+			st::infoTopBarScale);
+		_back->QWidget::show();
+		_back->setDuration(0);
+		_back->entity()->setAccessibleName(tr::lng_go_back(tr::now));
+		_back->toggleOn(isLayer || isSide
+			? (_backToggles.value() | rpl::type_erased)
+			: rpl::single(wrap == Wrap::Narrow));
+		_back->entity()->clicks() | rpl::to_empty | rpl::start_to_stream(
+			_backClicks,
+			_back->lifetime());
+
+		if (!isLayer && !isSide) {
+			_close = nullptr;
+		} else {
+			_close = base::make_unique_q<Ui::IconButton>(
+				this,
+				shouldUseColored
+					? st::infoTopBarColoredClose
+					: st::infoTopBarBlackClose);
+			_close->setAccessibleName(tr::lng_sr_close_panel(tr::now));
+			_close->show();
+			_close->addClickHandler(isSide
+				? Fn<void()> ([=] { controller->closeThirdSection(); })
+				: Fn<void()> ([=] {
+					controller->hideLayer();
+					controller->hideSpecialLayer();
+				}));
+			widthValue() | rpl::on_next([=] {
+				_close->moveToRight(0, 0);
+			}, _close->lifetime());
+		}
+
+		if (wrap != Wrap::Side) {
+			if (source == Source::Stories) {
+				addTopBarEditButton(controller, wrap, shouldUseColored);
+			}
+		}
+	}, lifetime());
+}
+
+void TopBar::addTopBarEditButton(
+		not_null<Window::SessionController*> controller,
+		Wrap wrap,
+		bool shouldUseColored) {
+	_topBarButton = base::make_unique_q<Ui::IconButton>(
+		this,
+		((wrap == Wrap::Layer)
+			? (shouldUseColored
+				? st::infoLayerTopBarColoredEdit
+				: st::infoLayerTopBarBlackEdit)
+			: (shouldUseColored
+				? st::infoTopBarColoredEdit
+				: st::infoTopBarBlackEdit)));
+	_topBarButton->show();
+	_topBarButton->addClickHandler([=] {
+		controller->showSettings(::Settings::InformationId());
+	});
+	_topBarButton->setAccessibleName(tr::lng_settings_information(tr::now));
+
+	widthValue() | rpl::on_next([=] {
+		if (_close) {
+			_topBarButton->moveToRight(_close->width(), 0);
+		} else {
+			_topBarButton->moveToRight(0, 0);
+		}
+	}, _topBarButton->lifetime());
+}
+
+void TopBar::showTopBarMenu(
+		not_null<Window::SessionController*> controller,
+		bool check) {
+	if (_peerMenu) {
+		_peerMenu->hideMenu(true);
+		return;
+	}
+	_peerMenu = base::make_unique_q<Ui::PopupMenu>(
+		QWidget::window(),
+		st::popupMenuExpandedSeparator);
+
+	_peerMenu->setDestroyedCallback([this] {
+		InvokeQueued(this, [this] { _peerMenu = nullptr; });
+		// if (auto toggle = _topBarMenuToggle.get()) {
+		// 	toggle->setForceRippled(false);
+		// }
+	});
+
+	fillTopBarMenu(
+		controller,
+		Ui::Menu::CreateAddActionCallback(_peerMenu));
+	if (_peerMenu->empty()) {
+		_peerMenu = nullptr;
+		return;
+	} else if (check) {
+		return;
+	}
+	_peerMenu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
+	_peerMenu->popup(_actionMore
+		? Ui::PopupMenu::ConstrainToParentScreen(
+			_peerMenu,
+			_actionMore->mapToGlobal(QPoint(
+				_actionMore->width()
+					+ Ui::BoxShadow::ExtendFor(
+						_peerMenu->st().shadow).right(),
+				_actionMore->height() + st::infoProfileTopBarActionMenuSkip)))
+		: QCursor::pos());
+}
+
+void TopBar::fillTopBarMenu(
+		not_null<Window::SessionController*> controller,
+		const Ui::Menu::MenuCallback &addAction) {
+	const auto peer = _peer;
+	const auto topic = _key.topic();
+	const auto sublist = _key.sublist();
+	if (!peer && !topic) {
+		return;
+	}
+
+	Window::FillDialogsEntryMenu(
+		controller,
+		Dialogs::EntryState{
+			.key = (topic
+				? Dialogs::Key{ topic }
+				: sublist
+				? Dialogs::Key{ sublist }
+				: Dialogs::Key{ peer->owner().history(peer) }),
+			.section = Dialogs::EntryState::Section::Profile,
+		},
+		addAction);
+}
+
+void TopBar::updateVideoUserpic() {
+	if (width() <= 0) {
+		return;
+	}
+	const auto id = _peer->userpicPhotoId();
+	if (!id) {
+		_videoUserpicPlayer = nullptr;
+		return;
+	}
+	const auto photo = _peer->owner().photo(id);
+	if (!photo->date() || !photo->videoCanBePlayed()) {
+		_videoUserpicPlayer = nullptr;
+		return;
+	}
+	if (!_videoUserpicPlayer) {
+		_videoUserpicPlayer = std::make_unique<Ui::VideoUserpicPlayer>();
+	}
+	_videoUserpicPlayer->setup(_peer, photo);
+}
+
+void TopBar::setupShowLastSeen(
+		not_null<Window::SessionController*> controller) {
+	const auto user = _peer->asUser();
+	if (!user
+		|| user->isSelf()
+		|| user->isBot()
+		|| user->isServiceUser()
+		|| !user->session().premiumPossible()) {
+		_showLastSeen->hide(anim::type::instant);
+		return;
+	}
+
+	if (user->session().premium()) {
+		if (user->lastseen().isHiddenByMe()) {
+			user->updateFullForced();
+		}
+		_showLastSeen->hide(anim::type::instant);
+		return;
+	}
+
+	rpl::combine(
+		user->session().changes().peerFlagsValue(
+			user,
+			Data::PeerUpdate::Flag::OnlineStatus),
+		Data::AmPremiumValue(&user->session())
+	) | rpl::on_next([=](auto, bool premium) {
+		const auto wasShown = _showLastSeen->toggled();
+		const auto hiddenByMe = user->lastseen().isHiddenByMe();
+		const auto shown = hiddenByMe
+			&& !user->lastseen().isOnline(base::unixtime::now())
+			&& !premium
+			&& user->session().premiumPossible();
+		_showLastSeen->toggle(shown, anim::type::instant);
+		if (wasShown && premium && hiddenByMe) {
+			user->updateFullForced();
+		}
+	}, _showLastSeen->lifetime());
+
+	controller->session().api().userPrivacy().value(
+		Api::UserPrivacy::Key::LastSeen
+	) | rpl::filter([=](Api::UserPrivacy::Rule rule) {
+		return (rule.option == Api::UserPrivacy::Option::Everyone);
+	}) | rpl::on_next([=] {
+		if (user->lastseen().isHiddenByMe()) {
+			user->updateFullForced();
+		}
+	}, _showLastSeen->lifetime());
+
+	_showLastSeen->setOpacity(0.);
+
+	_showLastSeen->entity()->setFullRadius(true);
+
+	_showLastSeen->entity()->setClickedCallback([=] {
+		const auto type = Ui::ShowOrPremium::LastSeen;
+		controller->show(Box(
+			Ui::ShowOrPremiumBox,
+			type,
+			user->shortName(),
+			[=] {
+				controller->session().api().userPrivacy().save(
+					::Api::UserPrivacy::Key::LastSeen,
+					{});
+			},
+			[=] {
+				::Settings::ShowPremium(controller, u"lastseen_hidden"_q);
+			}));
+	});
+}
+
+void TopBar::setupAnimatedPattern(const QRect &userpicGeometry) {
+	_animatedPoints = GenerateAnimatedPattern(userpicGeometry.isNull()
+		? TopBar::userpicGeometry()
+		: userpicGeometry);
+}
+
+void TopBar::paintAnimatedPattern(
+		QPainter &p,
+		const QRect &rect,
+		const QRect &userpicGeometry) {
+	if (!_patternEmoji || !_patternEmoji->ready()) {
+		return;
+	}
+
+	{
+		// TODO make it better.
+		if (_lastUserpicRect != userpicGeometry) {
+			_lastUserpicRect = userpicGeometry;
+			setupAnimatedPattern(userpicGeometry);
+		}
+	}
+
+	if (_basePatternImage.isNull()) {
+		auto patternColors = CalculatePatternColors(
+			effectiveColorProfile(),
+			effectiveCollectible(),
+			_edgeColor.current(),
+			Window::Theme::IsNightMode());
+		const auto ratio = style::DevicePixelRatio();
+		const auto scale = 0.910;
+		const auto size = st::emojiSize;
+		_basePatternImage = QImage(
+			QSize(size, size) * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		_basePatternImage.setDevicePixelRatio(ratio);
+		_basePatternImage.fill(Qt::transparent);
+		auto painter = QPainter(&_basePatternImage);
+		auto hq = PainterHighQualityEnabler(painter);
+		// const auto contentSize = size * scale;
+		// const auto offset = (size - contentSize) / 2.;
+		// painter.translate(offset, offset);
+		painter.scale(scale, scale);
+		_patternEmoji->paint(painter, { .textColor = Qt::white });
+		painter.resetTransform();
+
+		if (patternColors.useOverlayBlend) {
+			painter.setCompositionMode(QPainter::CompositionMode_SourceIn);
+			painter.fillRect(
+				Rect(Size(size)),
+				QColor(0, 0, 0, int(0.8 * 255)));
+		} else {
+			painter.setCompositionMode(QPainter::CompositionMode_SourceIn);
+			painter.fillRect(Rect(Size(size)), patternColors.patternColor);
+		}
+	}
+
+	const auto progress = _progress.current();
+	// const auto collapseDiff = progress >= 0.85 ? 1. : (progress / 0.85);
+	// const auto collapse = std::clamp((collapseDiff - 0.2) / 0.8, 0., 1.);
+	const auto collapse = progress;
+
+	const auto userpicCenter = rect::center(userpicGeometry);
+	const auto yOffset = 12 * (1. - progress);
+	const auto imageSize = _basePatternImage.size()
+		/ style::DevicePixelRatio();
+	const auto halfImageWidth = imageSize.width() * 0.5;
+	const auto halfImageHeight = imageSize.height() * 0.5;
+
+	for (const auto &point : _animatedPoints) {
+		const auto timeRange = point.endTime - point.startTime;
+		const auto collapseProgress = (1. - collapse <= point.startTime)
+			? 1.
+			: 1.
+				- std::clamp(
+					(1. - collapse - point.startTime) / timeRange,
+					0.,
+					1.);
+
+		if (collapseProgress <= 0.) {
+			continue;
+		}
+
+		auto x = point.basePosition.x();
+		auto y = point.basePosition.y() - yOffset;
+		auto r = point.size * 0.5;
+
+		if (collapseProgress < 1.) {
+			const auto dx = x - userpicCenter.x();
+			const auto dy = y - userpicCenter.y();
+			x = userpicCenter.x() + dx * collapseProgress;
+			y = userpicCenter.y() + dy * collapseProgress;
+			r = kMinPatternRadius
+				+ (r - kMinPatternRadius) * collapseProgress;
+		}
+
+		const auto scale = r / (point.size * 0.5);
+		const auto scaledHalfWidth = halfImageWidth * scale;
+		const auto scaledHalfHeight = halfImageHeight * scale;
+
+		// Distance-based alpha calculation.
+		const auto userpicRect = _lastUserpicRect;
+		const auto acx = userpicRect.x() + userpicRect.width() / 2.;
+		const auto acy = userpicRect.y() + userpicRect.height() / 2.;
+		const auto aw = userpicRect.width();
+		const auto ah = userpicRect.height();
+		const auto distance = std::sqrt((x - acx) * (x - acx)
+			+ (y - acy) * (y - acy));
+		const auto normalizedDistance = std::clamp(
+			distance / (aw * 2.),
+			0.,
+			1.);
+		const auto distanceAlpha = 1. - normalizedDistance;
+
+		// Bottom alpha calculation.
+		const auto bottomThreshold = userpicRect.y() + ah + kMinPatternRadius;
+		const auto bottomAlpha = (y > bottomThreshold)
+			? 1. - std::clamp((y - bottomThreshold) / 56., 0., 1.)
+			: 1.;
+
+		auto alpha = progress * distanceAlpha * 0.5 * bottomAlpha;
+		if (collapseProgress < 1.) {
+			alpha = alpha * collapseProgress;
+		}
+
+		p.setOpacity(alpha);
+		p.drawImage(
+			QRectF(
+				x - scaledHalfWidth,
+				y - scaledHalfHeight,
+				scaledHalfWidth * 2,
+				scaledHalfHeight * 2),
+			_basePatternImage);
+	}
+	p.setOpacity(1.);
+}
+
+void TopBar::setupPinnedToTopGifts(
+		not_null<Window::SessionController*> controller) {
+	const auto requestDone = crl::guard(this, [=](
+			std::vector<Data::SavedStarGift> gifts) {
+		const auto shouldHideFirst = _pinnedToTopGiftsFirstTimeShowed
+			&& !_pinnedToTopGifts.empty();
+
+		if (shouldHideFirst) {
+			_giftsHiding = std::make_unique<Ui::Animations::Simple>();
+			_giftsHiding->start([=](float64 value) {
+				update();
+				if (value <= 0.) {
+					_giftsHiding = nullptr;
+					_pinnedToTopGifts.clear();
+					_giftsLoadingLifetime.destroy();
+					updateCollectibleStatus();
+					setupNewGifts(controller, gifts);
+				}
+			}, 1., 0., 300, anim::linear);
+			return;
+		}
+
+		_pinnedToTopGifts.clear();
+		_giftsLoadingLifetime.destroy();
+
+		updateCollectibleStatus();
+		setupNewGifts(controller, gifts);
+	});
+	_peer->session().recentSharedGifts().request(_peer, requestDone, true);
+}
+
+void TopBar::setupNewGifts(
+		not_null<Window::SessionController*> controller,
+		const std::vector<Data::SavedStarGift> &gifts) {
+	const auto emojiStatusId = _peer->emojiStatusId().collectible
+		? _peer->emojiStatusId().collectible->id
+		: CollectibleId(0);
+	auto filteredGifts = std::vector<Data::SavedStarGift>();
+	const auto subtract = emojiStatusId ? 1 : 0;
+	filteredGifts.reserve((gifts.size() > subtract)
+		? (gifts.size() - subtract)
+		: 0);
+	for (const auto &gift : gifts) {
+		if (const auto &unique = gift.info.unique) {
+			if (unique->id != emojiStatusId) {
+				filteredGifts.push_back(gift);
+			}
+		}
+	}
+
+	_pinnedToTopGifts.reserve(filteredGifts.size());
+	if (filteredGifts.empty()) {
+		_giftsAppearing = nullptr;
+		_lottiePlayer = nullptr;
+		_pinnedToTopGiftsFirstTimeShowed = true;
+	} else if (!_lottiePlayer) {
+		_lottiePlayer = std::make_unique<Lottie::MultiPlayer>(
+			Lottie::Quality::Default);
+		_lottiePlayer->updates() | rpl::on_next([=] {
+			update();
+		}, lifetime());
+	}
+
+	_giftsAppearing = std::make_unique<Ui::Animations::Simple>();
+
+	constexpr auto kMaxPinnedToTopGifts = 6;
+
+	auto positions = ranges::views::iota(
+		0,
+		kMaxPinnedToTopGifts) | ranges::to_vector;
+	ranges::shuffle(positions);
+
+	for (auto i = 0;
+		i < filteredGifts.size() && i < kMaxPinnedToTopGifts;
+		++i) {
+		const auto &gift = filteredGifts[i];
+		const auto document = _peer->owner().document(
+			gift.info.document->id);
+		auto entry = PinnedToTopGiftEntry();
+		entry.manageId = gift.manageId;
+		entry.media = document->createMediaView();
+		entry.media->checkStickerSmall();
+		if (const auto &unique = gift.info.unique) {
+			if (unique->backdrop.centerColor.isValid()
+				&& unique->backdrop.edgeColor.isValid()) {
+				entry.bg = Ui::CreateTopBgGradient(
+					Size(st::infoProfileTopBarGiftSize * 2),
+					unique->backdrop.centerColor,
+					anim::with_alpha(unique->backdrop.edgeColor, 0.0),
+					false);
+			}
+		}
+		entry.position = positions[i];
+		entry.button = base::make_unique_q<Ui::AbstractButton>(this);
+		entry.button->setAccessibleName([&] {
+			const auto base = tr::lng_profile_action_short_gift(tr::now);
+
+			if (const auto &unique = gift.info.unique) {
+				const auto name = Data::UniqueGiftName(*unique);
+				if (!name.isEmpty()) {
+					return base + ": " + name;
+				}
+			}
+
+			return base;
+		}());
+		entry.button->show();
+
+		entry.button->setClickedCallback([=, giftData = gift, peer = _peer] {
+			::Settings::ShowSavedStarGiftBox(controller, peer, giftData);
+		});
+
+		_pinnedToTopGifts.push_back(std::move(entry));
+	}
+	updateGiftButtonsGeometry(_progress.current(), userpicGeometry());
+
+	using namespace ChatHelpers;
+
+	rpl::single(
+		rpl::empty_value()
+	) | rpl::then(
+		_peer->session().downloaderTaskFinished()
+	) | rpl::on_next([=] {
+		auto allLoaded = true;
+		for (auto &entry : _pinnedToTopGifts) {
+			if (!entry.animation && !entry.lastFrame.isNull()) {
+				continue;
+			}
+			if (!entry.animation && entry.media->loaded()) {
+				entry.animation = LottieAnimationFromDocument(
+					_lottiePlayer.get(),
+					entry.media.get(),
+					StickerLottieSize::PinnedProfileUniqueGiftSize,
+					Size(st::infoProfileTopBarGiftSize)
+						* style::DevicePixelRatio());
+			} else if (!entry.media->loaded()) {
+				allLoaded = false;
+			}
+		}
+		if (allLoaded) {
+			_giftsLoadingLifetime.destroy();
+			_giftsAppearing->stop();
+			_giftsAppearing->start([=](float64 value) {
+				update();
+				if (value >= 1.) {
+					_giftsAppearing = nullptr;
+					_pinnedToTopGiftsFirstTimeShowed = true;
+					if (_lottieSingleLoop) {
+						auto allFramesCaptured = true;
+						for (const auto &entry : _pinnedToTopGifts) {
+							if (entry.animation || entry.lastFrame.isNull()) {
+								allFramesCaptured = false;
+								break;
+							}
+						}
+						if (allFramesCaptured) {
+							_lottiePlayer = nullptr;
+						}
+					}
+				}
+			}, 0., 1., 400, anim::easeOutQuint);
+		}
+	}, _giftsLoadingLifetime);
+}
+
+QPointF TopBar::calculateGiftPosition(
+		int position,
+		float64 progress,
+		const QRect &userpicRect) const {
+	const auto acx = userpicRect.x() + userpicRect.width() / 2.;
+	const auto acy = userpicRect.y() + userpicRect.height() / 2.;
+	const auto aw = userpicRect.width();
+	const auto ah = userpicRect.height();
+
+	auto giftPos = QPointF();
+	auto delayValue = 0.;
+	switch (position) {
+	case 0: // Left.
+		giftPos = QPointF(
+			acx / 2. - st::infoProfileTopBarGiftLeft.x(),
+			acy - st::infoProfileTopBarGiftLeft.y());
+		delayValue = 1.6;
+		break;
+	case 1: // Top left.
+		giftPos = QPointF(
+			acx * 2. / 3. - st::infoProfileTopBarGiftTopLeft.x(),
+			userpicRect.y() - st::infoProfileTopBarGiftTopLeft.y());
+		delayValue = 0.;
+		break;
+	case 2: // Bottom left.
+		giftPos = QPointF(
+			acx * 2. / 3. - st::infoProfileTopBarGiftBottomLeft.x(),
+			userpicRect.y() + ah - st::infoProfileTopBarGiftBottomLeft.y());
+		delayValue = 0.9;
+		break;
+	case 3: // Right.
+		giftPos = QPointF(
+			acx + aw / 2. + st::infoProfileTopBarGiftRight.x(),
+			acy - st::infoProfileTopBarGiftRight.y());
+		delayValue = 1.6;
+		break;
+	case 4: // Top right.
+		giftPos = QPointF(
+			acx + aw / 3. + st::infoProfileTopBarGiftTopRight.x(),
+			userpicRect.y() - st::infoProfileTopBarGiftTopRight.y());
+		delayValue = 0.9;
+		break;
+	default: // Bottom right.
+		giftPos = QPointF(
+			acx + aw / 3. + st::infoProfileTopBarGiftBottomRight.x(),
+			userpicRect.y() + ah - st::infoProfileTopBarGiftBottomRight.y());
+		delayValue = 0.;
+		break;
+	}
+
+	const auto delayFraction = 0.2;
+	const auto maxDelayFraction = 1.6 * delayFraction;
+	const auto intervalFraction = 1. - maxDelayFraction;
+	const auto delay = delayValue * delayFraction;
+	const auto collapse = (progress >= 1. - delay)
+		? 1.
+		: std::clamp((progress - maxDelayFraction + delay)
+			/ intervalFraction, 0., 1.);
+
+	if (collapse < 1.) {
+		const auto collapseX = 1. - std::pow(1. - collapse, 2.);
+		giftPos = QPointF(
+			acx + (giftPos.x() - acx) * collapseX,
+			acy + (giftPos.y() - acy) * collapse);
+	}
+
+	return giftPos;
+}
+
+void TopBar::paintPinnedToTopGifts(
+		QPainter &p,
+		const QRect &rect,
+		const QRect &userpicRect) {
+	if (_pinnedToTopGifts.empty() || _source == Source::Preview) {
+		return;
+	}
+
+	const auto progress = _giftsHiding
+		? _progress.current() * _giftsHiding->value(1.)
+		: (_giftsAppearing
+			? _progress.current() * _giftsAppearing->value(0.)
+			: _progress.current());
+
+	for (auto &gift : _pinnedToTopGifts) {
+		if (!gift.animation
+			&& (_lottieSingleLoop ? gift.lastFrame.isNull() : true)) {
+			continue;
+		}
+
+		const auto giftPos = calculateGiftPosition(
+			gift.position,
+			progress,
+			userpicRect);
+
+		const auto alpha = progress;
+		if (alpha <= 0.) {
+			continue;
+		}
+
+		p.setOpacity(alpha);
+		auto frameToRender = QImage();
+		if (_lottieSingleLoop && !gift.lastFrame.isNull()) {
+			frameToRender = gift.lastFrame;
+		} else if (gift.animation && gift.animation->ready()) {
+			frameToRender = gift.animation->frame();
+			frameToRender.setDevicePixelRatio(style::DevicePixelRatio());
+			if (_lottiePlayer) {
+				_lottiePlayer->markFrameShown();
+			}
+			if (_lottieSingleLoop && gift.animation->framesCount() > 0) {
+				const auto currentFrame = gift.animation->frameIndex();
+				const auto totalFrames = gift.animation->framesCount();
+				if (currentFrame >= totalFrames - 1) {
+					gift.lastFrame = frameToRender;
+					gift.animation = nullptr;
+
+					auto allDone = true;
+					for (const auto &entry : _pinnedToTopGifts) {
+						if (entry.animation) {
+							allDone = false;
+							break;
+						}
+					}
+					if (allDone) {
+						_lottiePlayer = nullptr;
+					}
+				}
+			}
+		}
+		if (!frameToRender.isNull()) {
+			const auto frameSize = frameToRender.width()
+				/ style::DevicePixelRatio();
+			const auto halfFrameSize = frameSize / 2.;
+			const auto resultPos = QPointF(
+				giftPos.x() - halfFrameSize,
+				giftPos.y() - halfFrameSize);
+			if (!gift.bg.isNull()) {
+				const auto bgSize = gift.bg.width()
+					/ style::DevicePixelRatio();
+				const auto bgPos = QPointF(
+					resultPos.x() + (frameSize - bgSize) / 2.,
+					resultPos.y() + (frameSize - bgSize) / 2.);
+				p.drawImage(bgPos, gift.bg);
+			}
+			p.drawImage(resultPos, frameToRender);
+		}
+	}
+	p.setOpacity(1.);
+}
+
+void TopBar::setupStoryOutline(const QRect &geometry) {
+	const auto user = _peer->asUser();
+	const auto channel = _peer->asChannel();
+	if (!user && !channel) {
+		return;
+	}
+
+	rpl::combine(
+		_edgeColor.value(),
+		rpl::merge(
+			rpl::single(rpl::empty_value()),
+			style::PaletteChanged(),
+			_peer->session().changes().peerUpdates(
+				Data::PeerUpdate::Flag::StoriesState
+					| Data::PeerUpdate::Flag::ColorProfile
+			) | rpl::filter([=](const Data::PeerUpdate &update) {
+				return update.peer == _peer;
+			}) | rpl::to_empty,
+			_peer->owner().stories().sourceChanged(
+			) | rpl::filter([=](PeerId peerId) {
+				return peerId == _peer->id;
+			}) | rpl::to_empty)
+	) | rpl::on_next([=](
+			std::optional<QColor> edgeColor,
+			rpl::empty_value) {
+		const auto geometry = QRectF(userpicGeometry());
+		const auto colorProfile
+			= _peer->session().api().peerColors().colorProfileFor(_peer);
+		const auto hasProfileColor = colorProfile
+			&& colorProfile->story.size() > 1;
+		if (hasProfileColor) {
+			edgeColor = std::nullopt;
+		}
+		_storyOutlineBrush = hasProfileColor
+			? Ui::UnreadStoryOutlineGradient(
+				geometry,
+				colorProfile->story[0],
+				colorProfile->story[1])
+			: Ui::UnreadStoryOutlineGradient(geometry);
+		updateStoryOutline(edgeColor);
+	}, lifetime());
+}
+
+void TopBar::updateStoryOutline(std::optional<QColor> edgeColor) {
+	const auto user = _peer->asUser();
+	const auto channel = _peer->asChannel();
+	if (!user && !channel) {
+		return;
+	}
+
+	const auto hasActiveStories = (_source == Source::Preview)
+		? true
+		: (user ? user->hasActiveStories() : channel->hasActiveStories());
+	const auto hasLiveStories = (_source == Source::Preview)
+		? false
+		: (user ? user->hasActiveVideoStream() : false);
+
+	if (_hasStories != hasActiveStories
+		|| _hasLiveStories != hasLiveStories) {
+		_hasStories = hasActiveStories;
+		_hasLiveStories = hasLiveStories;
+		update();
+	}
+
+	if (!hasActiveStories) {
+		_storySegments.clear();
+		return;
+	}
+	const auto widthBig = style::ConvertFloatScale(3.0);
+
+	_storySegments.clear();
+
+	if (_source == Source::Preview) {
+		const auto colorProfile = effectiveColorProfile();
+		const auto hasProfileColor = colorProfile
+			&& colorProfile->story.size() > 1;
+		const auto previewBrush = hasProfileColor
+			? Ui::UnreadStoryOutlineGradient(
+				QRectF(userpicGeometry()),
+				colorProfile->story[0],
+				colorProfile->story[1])
+			: _localCollectible
+			? Ui::UnreadStoryOutlineGradient(
+				QRectF(userpicGeometry()),
+				Ui::BlendColors(_localCollectible->edgeColor, Qt::white, .5),
+				Ui::BlendColors(_localCollectible->edgeColor, Qt::white, .5))
+			: Ui::UnreadStoryOutlineGradient(QRectF(userpicGeometry()));
+		_storySegments.push_back({
+			.brush = QBrush(previewBrush),
+			.width = widthBig,
+		});
+		return;
+	}
+
+	auto &stories = _peer->owner().stories();
+	const auto source = stories.source(_peer->id);
+	if (!source) {
+		stories.requestPeerStories(_peer);
+		return;
+	}
+
+	const auto baseColor = edgeColor
+		? Ui::BlendColors(*edgeColor, Qt::white, .5)
+		: _storyOutlineBrush.color();
+	const auto unreadBrush = _hasLiveStories
+		? st::attentionButtonFg->b
+		: edgeColor
+		? QBrush(baseColor)
+		: _storyOutlineBrush;
+	const auto readBrush = edgeColor
+		? QBrush(anim::with_alpha(baseColor, 0.5))
+		: QBrush(st::dialogsUnreadBgMuted->b);
+
+	if (_hasLiveStories) {
+		_storySegments.push_back({
+			.brush = unreadBrush,
+			.width = widthBig,
+		});
+	} else {
+		const auto readTill = source->readTill;
+		const auto widthSmall = widthBig / 2.;
+		for (const auto &storyIdDates : source->ids) {
+			const auto isUnread = (storyIdDates.id > readTill);
+			_storySegments.push_back({
+				.brush = isUnread ? unreadBrush : readBrush,
+				.width = !isUnread ? widthSmall : widthBig,
+			});
+		}
+	}
+}
+
+void TopBar::paintStoryOutline(QPainter &p, const QRect &geometry) {
+	if (!_hasStories || _storySegments.empty()) {
+		return;
+	}
+	auto hq = PainterHighQualityEnabler(p);
+
+	const auto progress = _progress.current();
+	const auto alpha = std::clamp(
+		(progress - kStoryOutlineFadeEnd) / kStoryOutlineFadeRange,
+		0.,
+		1.);
+	if (alpha <= 0.) {
+		return;
+	}
+
+	p.setOpacity(alpha);
+	const auto outlineWidth = style::ConvertFloatScale(4.0);
+	const auto padding = style::ConvertFloatScale(3.0);
+	const auto outlineRect = QRectF(geometry).adjusted(
+		-padding - outlineWidth / 2,
+		-padding - outlineWidth / 2,
+		padding + outlineWidth / 2,
+		padding + outlineWidth / 2);
+
+	Ui::PaintOutlineSegments(p, outlineRect, _storySegments);
+
+	if (_hasLiveStories) {
+		const auto outline = _edgeColor.current().value_or(
+			_solidBg.value_or(st::boxDividerBg->c));
+		Ui::PaintLiveBadge(
+			p,
+			geometry.x(),
+			geometry.y() + outlineWidth + padding,
+			geometry.width(),
+			outline);
+	}
+}
+
+void TopBar::setupStatusWithRating() {
+	_status->setAttribute(Qt::WA_TransparentForMouseEvents);
+	if (const auto rating = _starsRating.get()) {
+		_statusShift = rating->widthValue();
+		_statusShift.changes() | rpl::on_next([=] {
+			updateLabelsPosition();
+		}, _status->lifetime());
+		rating->raise();
+	}
+}
+
+rpl::producer<std::optional<QColor>> TopBar::edgeColor() const {
+	return _edgeColor.value();
+}
+
+const style::FlatLabel &TopBar::statusStyle() const {
+	return _peer->isMegagroup()
+		? st::infoProfileMegagroupCover.status
+		: st::infoProfileCover.status;
+}
+
+rpl::producer<QString> TopBar::nameValue() const {
+	if (const auto topic = _key.topic()) {
+		return Info::Profile::TitleValue(topic);
+	}
+	return Info::Profile::NameValue(_peer);
+}
+
+TopBarActionButtonStyle TopBar::mapActionStyle(
+		std::optional<QColor> c) const {
+	if (c) {
+		return TopBarActionButtonStyle{
+			.bgColor = Ui::BlendColors(
+				*c,
+				Qt::black,
+				st::infoProfileTopBarActionButtonBgOpacity),
+			.fgColor = std::make_optional(st::premiumButtonFg->c),
+			.shadowColor = std::nullopt,
+		};
+	} else {
+		return TopBarActionButtonStyle{
+			.bgColor = anim::with_alpha(
+				st::boxBg->c,
+				1. - st::infoProfileTopBarActionButtonBgOpacity),
+			.fgColor = std::nullopt,
+			.shadowColor = Window::Theme::IsNightMode()
+				? std::nullopt
+				: std::make_optional(st::windowShadowFgFallback->c),
+		};
+	}
+}
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_top_bar.h b/Telegram/SourceFiles/info/profile/info_profile_top_bar.h
new file mode 100644
index 00000000000000..c9cfc284758927
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_top_bar.h
@@ -0,0 +1,306 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+#include "info/info_controller.h" // Key
+#include "info/profile/info_profile_badge.h"
+#include "ui/controls/swipe_handler_data.h"
+#include "ui/rp_widget.h"
+#include "ui/userpic_view.h"
+
+namespace Data {
+class ForumTopic;
+class DocumentMedia;
+struct SavedStarGift;
+struct ColorProfileSet;
+class SavedStarGiftId;
+} // namespace Data
+
+namespace Info::Profile {
+class BadgeTooltip;
+class TopicIconView;
+} // namespace Info::Profile
+
+namespace Lottie {
+class Animation;
+class MultiPlayer;
+} // namespace Lottie
+
+namespace Ui {
+class UploadProgressOverlay;
+class VideoUserpicPlayer;
+struct OutlineSegment;
+namespace Text {
+class CustomEmoji;
+} // namespace Text
+} // namespace Ui
+
+class PeerData;
+
+namespace base {
+class Timer;
+} // namespace base
+
+namespace style {
+struct InfoTopBar;
+struct InfoPeerBadge;
+struct FlatLabel;
+} //namespace style
+
+namespace Ui {
+class FlatLabel;
+class IconButton;
+class PopupMenu;
+class RoundButton;
+class StarsRating;
+template <typename Widget>
+class FadeWrap;
+class HorizontalFitContainer;
+namespace Animations {
+class Simple;
+} // namespace Animations
+} //namespace Ui
+
+namespace Info {
+class Controller;
+class Key;
+enum class Wrap;
+} //namespace Info
+
+namespace Ui::Menu {
+struct MenuCallback;
+} //namespace Ui::Menu
+
+namespace Info::Profile {
+
+class Badge;
+class StatusLabel;
+
+struct TopBarActionButtonStyle;
+
+class TopBar final : public Ui::RpWidget {
+public:
+	enum class Source {
+		Profile,
+		Stories,
+		Preview,
+	};
+
+	struct Descriptor {
+		not_null<Window::SessionController*> controller;
+		Key key;
+		rpl::producer<Wrap> wrap;
+		Source source = Source::Profile;
+		PeerData *peer = nullptr;
+		rpl::producer<bool> backToggles;
+		rpl::producer<> showFinished;
+	};
+
+	struct AnimatedPatternPoint {
+		QPointF basePosition;
+		float64 size;
+		float64 startTime;
+		float64 endTime;
+	};
+
+	TopBar(not_null<Ui::RpWidget*> parent, Descriptor descriptor);
+	~TopBar();
+
+	[[nodiscard]] rpl::producer<> backRequest() const;
+
+	void setOnlineCount(rpl::producer<int> &&count);
+
+	void setRoundEdges(bool value);
+	void setLottieSingleLoop(bool value);
+	void setColorProfileIndex(std::optional<uint8> index);
+	void setPatternEmojiId(std::optional<DocumentId> patternEmojiId);
+	void setLocalEmojiStatusId(EmojiStatusId emojiStatusId);
+	void addTopBarEditButton(
+		not_null<Window::SessionController*> controller,
+		Wrap wrap,
+		bool shouldUseColored);
+
+	rpl::producer<std::optional<QColor>> edgeColor() const;
+
+protected:
+	void resizeEvent(QResizeEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	void paintEdges(QPainter &p, const QBrush &brush) const;
+	void paintEdges(QPainter &p) const;
+	void updateLabelsPosition();
+	[[nodiscard]] int titleMostLeft() const;
+	[[nodiscard]] int statusMostLeft() const;
+	[[nodiscard]] QRect userpicGeometry() const;
+	void updateGiftButtonsGeometry(
+		float64 progressCurrent,
+		const QRect &userpicRect);
+	void paintUserpic(QPainter &p, const QRect &geometry);
+	void updateVideoUserpic();
+	void showTopBarMenu(
+		not_null<Window::SessionController*> controller,
+		bool check);
+	void fillTopBarMenu(
+		not_null<Window::SessionController*> controller,
+		const Ui::Menu::MenuCallback &addAction);
+	void setupUserpicButton(not_null<Window::SessionController*> controller);
+	void setupBirthdayEffect();
+	void startUploadOverlay();
+	void setupActions(not_null<Window::SessionController*> controller);
+	void setupButtons(
+		not_null<Window::SessionController*> controller,
+		Source source);
+	void setupSwipeBack(not_null<Window::SessionController*> controller);
+	void setupShowLastSeen(not_null<Window::SessionController*> controller);
+	void setupUniqueBadgeTooltip();
+	void hideBadgeTooltip();
+	void setupAnimatedPattern(const QRect &userpicGeometry = QRect());
+	void paintAnimatedPattern(
+		QPainter &p,
+		const QRect &rect,
+		const QRect &userpicGeometry);
+	void setupPinnedToTopGifts(
+		not_null<Window::SessionController*> controller);
+	void setupNewGifts(
+		not_null<Window::SessionController*> controller,
+		const std::vector<Data::SavedStarGift> &gifts);
+	void paintPinnedToTopGifts(
+		QPainter &p,
+		const QRect &rect,
+		const QRect &userpicGeometry);
+	[[nodiscard]] QPointF calculateGiftPosition(
+		int position,
+		float64 progress,
+		const QRect &userpicRect) const;
+	void adjustColors(const std::optional<QColor> &edgeColor);
+	void updateCollectibleStatus();
+	void setupStoryOutline(const QRect &geometry = QRect());
+	void updateStoryOutline(std::optional<QColor> edgeColor);
+	void paintStoryOutline(QPainter &p, const QRect &geometry);
+	void updateStatusPosition(float64 progressCurrent);
+	[[nodiscard]] int calculateRightButtonsWidth() const;
+	[[nodiscard]] const style::FlatLabel &statusStyle() const;
+	void setupStatusWithRating();
+	[[nodiscard]] TopBarActionButtonStyle mapActionStyle(
+		std::optional<QColor> c) const;
+
+	[[nodiscard]] rpl::producer<QString> nameValue() const;
+
+	[[nodiscard]] auto effectiveColorProfile()
+	const -> std::optional<Data::ColorProfileSet>;
+	[[nodiscard]] auto effectiveCollectible()
+	const -> std::shared_ptr<Data::EmojiStatusCollectible>;
+
+	const not_null<PeerData*> _peer;
+	Data::ForumTopic *_topic = nullptr;
+	const Key _key;
+	rpl::variable<Wrap> _wrap;
+	const style::InfoTopBar &_st;
+	const Source _source;
+
+	std::unique_ptr<base::Timer> _badgeTooltipHide;
+	const std::unique_ptr<Badge> _botVerify;
+	rpl::variable<Badge::Content> _badgeContent;
+	const Fn<bool()> _gifPausedChecker;
+	const std::unique_ptr<Badge> _badge;
+	const std::unique_ptr<Badge> _verified;
+
+	const bool _hasActions;
+	const int _minForProgress;
+
+	std::unique_ptr<BadgeTooltip> _badgeTooltip;
+	std::vector<std::unique_ptr<BadgeTooltip>> _badgeOldTooltips;
+	uint64 _badgeCollectibleId = 0;
+
+	object_ptr<Ui::FlatLabel> _title;
+	std::unique_ptr<Ui::StarsRating> _starsRating;
+	object_ptr<Ui::FlatLabel> _status;
+	std::unique_ptr<StatusLabel> _statusLabel;
+	rpl::variable<int> _statusShift = 0;
+	object_ptr<Ui::FadeWrap<Ui::RoundButton>> _showLastSeen = { nullptr };
+	object_ptr<Ui::RoundButton> _forumButton = { nullptr };
+
+	std::shared_ptr<style::FlatLabel> _statusSt;
+	std::shared_ptr<style::InfoPeerBadge> _botVerifySt;
+	std::shared_ptr<style::InfoPeerBadge> _badgeSt;
+	std::shared_ptr<style::InfoPeerBadge> _verifiedSt;
+
+	rpl::variable<float64> _progress = 0.;
+	bool _roundEdges = true;
+
+	rpl::variable<std::optional<QColor>> _edgeColor;
+	bool _hasGradientBg = false;
+	std::optional<QColor> _solidBg;
+	QImage _cachedGradient;
+	QPainterPath _cachedClipPath;
+	std::unique_ptr<Ui::Text::CustomEmoji> _patternEmoji;
+	QImage _basePatternImage;
+
+	std::vector<AnimatedPatternPoint> _animatedPoints;
+	QRect _lastUserpicRect;
+
+	base::unique_qptr<Ui::AbstractButton> _userpicButton;
+
+	Ui::PeerUserpicView _userpicView;
+	InMemoryKey _userpicUniqueKey;
+	QImage _cachedUserpic;
+	QImage _monoforumMask;
+	std::unique_ptr<Ui::VideoUserpicPlayer> _videoUserpicPlayer;
+	std::unique_ptr<TopicIconView> _topicIconView;
+	std::unique_ptr<Ui::UploadProgressOverlay> _uploadOverlay;
+	rpl::lifetime _uploadLifetime;
+	bool _waitingUserpicCloudLoad = false;
+	rpl::lifetime _userpicLoadingLifetime;
+
+	base::unique_qptr<Ui::IconButton> _close;
+	base::unique_qptr<Ui::FadeWrap<Ui::IconButton>> _back;
+	rpl::variable<bool> _backToggles;
+
+	rpl::event_stream<> _backClicks;
+	Ui::Controls::SwipeBackResult _swipeBackData;
+
+	base::unique_qptr<Ui::IconButton> _topBarButton;
+	base::unique_qptr<Ui::PopupMenu> _peerMenu;
+
+	Ui::RpWidget *_actionMore = nullptr;
+
+	base::unique_qptr<Ui::HorizontalFitContainer> _actions;
+	base::unique_qptr<Ui::RpWidget> _actionsShadow;
+
+	std::unique_ptr<Lottie::MultiPlayer> _lottiePlayer;
+	bool _lottieSingleLoop = false;
+	struct PinnedToTopGiftEntry {
+		Data::SavedStarGiftId manageId;
+		// QString slug;
+		Lottie::Animation *animation = nullptr;
+		std::shared_ptr<Data::DocumentMedia> media;
+		QImage bg;
+		QImage lastFrame;
+		int position = 0;
+		base::unique_qptr<Ui::AbstractButton> button;
+	};
+	bool _pinnedToTopGiftsFirstTimeShowed = false;
+	std::vector<PinnedToTopGiftEntry> _pinnedToTopGifts;
+	std::unique_ptr<Ui::Animations::Simple> _giftsAppearing;
+	std::unique_ptr<Ui::Animations::Simple> _giftsHiding;
+	rpl::lifetime _giftsLoadingLifetime;
+
+	QBrush _storyOutlineBrush;
+	std::vector<Ui::OutlineSegment> _storySegments;
+	bool _hasStories = false;
+	bool _hasLiveStories = false;
+
+	std::optional<uint8> _localColorProfileIndex;
+	std::optional<DocumentId> _localPatternEmojiId;
+	std::shared_ptr<Data::EmojiStatusCollectible> _localCollectible;
+
+};
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_top_bar_action_button.cpp b/Telegram/SourceFiles/info/profile/info_profile_top_bar_action_button.cpp
new file mode 100644
index 00000000000000..e96a4328548ba5
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_top_bar_action_button.cpp
@@ -0,0 +1,189 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/profile/info_profile_top_bar_action_button.h"
+
+#include "ui/effects/ripple_animation.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "lottie/lottie_icon.h"
+#include "styles/style_layers.h"
+#include "styles/style_info.h"
+
+namespace Info::Profile {
+namespace {
+
+constexpr auto kIconFadeStart = 0.4;
+constexpr auto kIconFadeRange = 1.0 - kIconFadeStart;
+
+} // namespace
+
+TopBarActionButton::TopBarActionButton(
+	not_null<QWidget*> parent,
+	const QString &text,
+	const QString &lottieName)
+: RippleButton(parent, st::universalRippleAnimation)
+, _text(text) {
+	setupLottie(lottieName);
+}
+
+TopBarActionButton::TopBarActionButton(
+	not_null<QWidget*> parent,
+	const QString &text,
+	const style::icon &icon)
+: RippleButton(parent, st::universalRippleAnimation)
+, _text(text)
+, _icon(&icon) {
+}
+
+TopBarActionButton::~TopBarActionButton() = default;
+
+void TopBarActionButton::setupLottie(const QString &lottieName) {
+	_lottie = std::make_unique<Lottie::Icon>(Lottie::IconDescriptor{
+		.name = lottieName,
+		.color = _lottieColor,
+		.sizeOverride = Size(st::infoProfileTopBarActionButtonLottieSize),
+	});
+	_lottie->animate([=] { update(); }, 0, _lottie->framesCount() - 1);
+}
+
+void TopBarActionButton::convertToToggle(
+		const style::icon &offIcon,
+		const style::icon &onIcon,
+		const QString &offLottie,
+		const QString &onLottie) {
+	_isToggle = true;
+	_offIcon = &offIcon;
+	_onIcon = &onIcon;
+	_offLottie = offLottie;
+	_onLottie = onLottie;
+	_icon = _offIcon;
+	_lottie.reset();
+}
+
+void TopBarActionButton::toggle(bool state) {
+	if (!_isToggle || _toggleState == state) {
+		return;
+	}
+	_toggleState = state;
+	const auto &lottie = _toggleState ? _onLottie : _offLottie;
+	setupLottie(lottie);
+	_lottie->animate([=] {
+		update();
+		if (_lottie->frameIndex() == _lottie->framesCount() - 1) {
+			_icon = _toggleState ? _onIcon : _offIcon;
+			_lottie.reset();
+		}
+	}, 0, _lottie->framesCount() - 1);
+}
+
+void TopBarActionButton::finishAnimating() {
+	if (_lottie) {
+		_icon = _toggleState ? _onIcon : _offIcon;
+		_lottie.reset();
+		update();
+	}
+}
+
+void TopBarActionButton::setText(const QString &text) {
+	_text = text;
+	update();
+}
+
+void TopBarActionButton::setLottieColor(const style::color *color) {
+	_lottieColor = color;
+	_lottie.reset();
+	update();
+}
+
+void TopBarActionButton::setStyle(const TopBarActionButtonStyle &style) {
+	_bgColor = style.bgColor;
+	_fgColor = style.fgColor;
+	update();
+}
+
+void TopBarActionButton::paintEvent(QPaintEvent *e) {
+	auto p = Painter(this);
+
+	const auto progress = float64(height())
+		/ st::infoProfileTopBarActionButtonSize;
+	p.setOpacity(progress);
+
+	p.setPen(Qt::NoPen);
+	p.setBrush(_bgColor);
+	{
+		auto hq = PainterHighQualityEnabler(p);
+		p.drawRoundedRect(rect(), st::boxRadius, st::boxRadius);
+	}
+
+	paintRipple(p, 0, 0);
+
+	const auto iconSize = st::infoProfileTopBarActionButtonIconSize;
+	const auto iconTop = st::infoProfileTopBarActionButtonIconTop;
+
+	if (_lottie || _icon) {
+		const auto iconScale = (progress > kIconFadeStart)
+			? (progress - kIconFadeStart) / kIconFadeRange
+			: 0.0;
+		p.setOpacity(iconScale);
+		p.save();
+		const auto iconLeft = (width() - iconSize) / 2.;
+		const auto half = iconSize / 2.;
+		const auto iconCenter = QPointF(iconLeft + half, iconTop + half);
+		p.translate(iconCenter);
+		p.scale(iconScale, iconScale);
+		p.translate(-iconCenter);
+		p.translate(iconLeft, iconTop);
+		if (_lottie) {
+			_lottie->paint(p, 0, 0, _fgColor);
+		} else if (_icon) {
+			if (_fgColor) {
+				_icon->paint(p, 0, 0, width(), *_fgColor);
+			} else {
+				_icon->paint(p, 0, 0, width());
+			}
+		}
+		p.restore();
+		p.setOpacity(progress);
+	}
+
+	const auto skip = st::infoProfileTopBarActionButtonTextSkip;
+
+	p.setClipRect(0, 0, width(), height() - skip);
+
+	if (_fgColor.has_value()) {
+		p.setPen(*_fgColor);
+	} else {
+		p.setPen(st::windowBoldFg);
+	}
+
+	p.setFont(st::infoProfileTopBarActionButtonFont);
+
+	const auto textScale = std::max(kIconFadeStart, progress);
+	const auto textRect = rect()
+		- QMargins(0, st::infoProfileTopBarActionButtonTextTop, 0, 0);
+	const auto textCenter = rect::center(textRect);
+	p.translate(textCenter);
+	p.scale(textScale, textScale);
+	p.translate(-textCenter);
+
+	const auto elidedText = st::infoProfileTopBarActionButtonFont->elided(
+		_text,
+		textRect.width(),
+		Qt::ElideMiddle);
+	p.drawText(textRect, elidedText, style::al_top);
+}
+
+QImage TopBarActionButton::prepareRippleMask() const {
+	return Ui::RippleAnimation::RoundRectMask(size(), st::boxRadius);
+}
+
+QPoint TopBarActionButton::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos());
+}
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_top_bar_action_button.h b/Telegram/SourceFiles/info/profile/info_profile_top_bar_action_button.h
new file mode 100644
index 00000000000000..73d108cb9931a7
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_top_bar_action_button.h
@@ -0,0 +1,74 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/buttons.h"
+
+namespace Lottie {
+class Icon;
+} // namespace Lottie
+
+namespace Info::Profile {
+
+struct TopBarActionButtonStyle {
+	QColor bgColor;
+	std::optional<QColor> fgColor;
+	std::optional<QColor> shadowColor;
+};
+
+class TopBarActionButton final : public Ui::RippleButton {
+public:
+	TopBarActionButton(
+		not_null<QWidget*> parent,
+		const QString &text,
+		const QString &lottieName);
+	TopBarActionButton(
+		not_null<QWidget*> parent,
+		const QString &text,
+		const style::icon &icon);
+
+	void convertToToggle(
+		const style::icon &offIcon,
+		const style::icon &onIcon,
+		const QString &offLottie,
+		const QString &onLottie);
+	void setLottieColor(const style::color *color);
+	void toggle(bool state);
+	void finishAnimating();
+	void setText(const QString &text);
+	void setStyle(const TopBarActionButtonStyle &style);
+
+	~TopBarActionButton();
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+private:
+	void setupLottie(const QString &lottieName);
+
+	QString _text;
+	std::unique_ptr<Lottie::Icon> _lottie;
+	const style::icon *_icon = nullptr;
+
+	bool _isToggle = false;
+	bool _toggleState = false;
+	const style::icon *_offIcon = nullptr;
+	const style::icon *_onIcon = nullptr;
+	QString _offLottie;
+	QString _onLottie;
+	const style::color *_lottieColor = nullptr;
+
+	QColor _bgColor;
+	std::optional<QColor> _fgColor;
+
+};
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
index fba586e0d57767..e2ad5c3316013b 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
@@ -15,6 +15,7 @@ For license and copyright information please follow this link:
 #include "core/click_handler_types.h"
 #include "countries/countries_instance.h"
 #include "main/main_session.h"
+#include "main/main_session_settings.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/text/format_values.h" // Ui::FormatPhone
 #include "ui/text/text_utilities.h"
@@ -65,9 +66,9 @@ auto PlainPrimaryUsernameValue(not_null<PeerData*> peer) {
 		peer
 	) | rpl::map([=](std::vector<TextWithEntities> usernames) {
 		if (!usernames.empty()) {
-			return rpl::single(usernames.front().text) | rpl::type_erased();
+			return rpl::single(usernames.front().text) | rpl::type_erased;
 		} else {
-			return PlainUsernameValue(peer) | rpl::type_erased();
+			return PlainUsernameValue(peer) | rpl::type_erased;
 		}
 	}) | rpl::flatten_latest();
 }
@@ -93,6 +94,9 @@ void StripExternalLinks(TextWithEntities &text) {
 } // namespace
 
 rpl::producer<QString> NameValue(not_null<PeerData*> peer) {
+	if (const auto broadcast = peer->monoforumBroadcast()) {
+		return NameValue(broadcast);
+	}
 	return peer->session().changes().peerFlagsValue(
 		peer,
 		UpdateFlag::Name
@@ -127,8 +131,8 @@ rpl::producer<TextWithEntities> PhoneValue(not_null<UserData*> user) {
 			user,
 			UpdateFlag::PhoneNumber) | rpl::to_empty
 	) | rpl::map([=] {
-		return Ui::FormatPhone(user->phone());
-	}) | Ui::Text::ToWithEntities();
+		return tr::marked(Ui::FormatPhone(user->phone()));
+	});
 }
 
 rpl::producer<TextWithEntities> PhoneOrHiddenValue(not_null<UserData*> user) {
@@ -143,9 +147,9 @@ rpl::producer<TextWithEntities> PhoneOrHiddenValue(not_null<UserData*> user) {
 			const QString &about,
 			const QString &hidden) {
 		if (phone.text.isEmpty() && username.isEmpty() && about.isEmpty()) {
-			return Ui::Text::WithEntities(hidden);
+			return tr::marked(hidden);
 		} else if (IsCollectiblePhone(user)) {
-			return Ui::Text::Link(phone, u"internal:collectible_phone/"_q
+			return tr::link(phone, u"internal:collectible_phone/"_q
 				+ user->phone() + '@' + QString::number(user->id.value));
 		} else {
 			return phone;
@@ -153,17 +157,40 @@ rpl::producer<TextWithEntities> PhoneOrHiddenValue(not_null<UserData*> user) {
 	});
 }
 
+rpl::producer<TextWithEntities> PhoneWithSpoilerValue(
+		not_null<UserData*> user,
+		rpl::producer<TextWithEntities> phone) {
+	if (!user->isSelf()) {
+		return phone;
+	}
+	return rpl::combine(
+		std::move(phone),
+		user->session().settings().phoneNumberHiddenValue()
+	) | rpl::map([](const TextWithEntities &phone, bool hidden) {
+		return hidden
+			? Ui::Text::Wrapped(phone, EntityType::Spoiler)
+			: phone;
+	});
+}
+
+void CopyPhoneToClipboard(rpl::producer<TextWithEntities> phone) {
+	auto text = rpl::variable<TextWithEntities>(
+		std::move(phone)).current().text;
+	text.replace(' ', QString()).replace('-', QString());
+	TextUtilities::SetClipboardText({ text });
+}
+
 rpl::producer<TextWithEntities> UsernameValue(
 		not_null<PeerData*> peer,
 		bool primary) {
 	return (primary
 		? PlainPrimaryUsernameValue(peer)
-		: (PlainUsernameValue(peer) | rpl::type_erased())
+		: (PlainUsernameValue(peer) | rpl::type_erased)
 	) | rpl::map([](QString &&username) {
 		return username.isEmpty()
-			? QString()
-			: ('@' + username);
-	}) | Ui::Text::ToWithEntities();
+			? tr::marked()
+			: tr::marked('@' + username);
+	});
 }
 
 QString UsernameUrl(
@@ -189,7 +216,7 @@ rpl::producer<std::vector<TextWithEntities>> UsernamesValue(
 		return ranges::views::all(
 			usernames
 		) | ranges::views::transform([&](const QString &u) {
-			return Ui::Text::Link(u, UsernameUrl(peer, u));
+			return tr::link(u, UsernameUrl(peer, u));
 		}) | ranges::to_vector;
 	};
 	auto value = rpl::merge(
@@ -240,11 +267,42 @@ rpl::producer<TextWithEntities> AboutValue(not_null<PeerData*> peer) {
 	});
 }
 
-rpl::producer<LinkWithUrl> LinkValue(not_null<PeerData*> peer, bool primary) {
+QString TopicLink(not_null<Data::ForumTopic*> topic, bool full) {
+	const auto channel = topic->channel();
+	const auto id = topic->rootId();
+	const auto base = channel->hasUsername()
+		? channel->username()
+		: "c/" + QString::number(peerToChannel(channel->id).bare);
+	return channel->session().createInternalLinkFull(full
+		? base + '/' + QString::number(id.bare)
+		: base);
+}
+
+rpl::producer<LinkWithUrl> LinkValue(
+		not_null<PeerData*> peer,
+		bool primary,
+		MsgId rootId) {
 	return (primary
 		? PlainPrimaryUsernameValue(peer)
-		: PlainUsernameValue(peer) | rpl::type_erased()
+		: PlainUsernameValue(peer) | rpl::type_erased
 	) | rpl::map([=](QString &&username) {
+		if (username.isEmpty()) {
+			if (const auto topic
+				= rootId ? peer->forumTopicFor(rootId) : nullptr) {
+				const auto link = TopicLink(topic, false);
+				return LinkWithUrl{
+					.text = link,
+					.url = link,
+				};
+			} else {
+				return LinkWithUrl{};
+			}
+		} else {
+			return LinkWithUrl{
+				.text = peer->session().createInternalLinkFull(username),
+				.url = UsernameUrl(peer, username, true),
+			};
+		}
 		return LinkWithUrl{
 			.text = (username.isEmpty()
 				? QString()
@@ -278,10 +336,10 @@ rpl::producer<bool> NotificationsEnabledValue(
 			Data::TopicUpdate::Flag::Notifications
 		) | rpl::to_empty,
 		topic->session().changes().peerUpdates(
-			topic->channel(),
+			topic->peer(),
 			UpdateFlag::Notifications
 		) | rpl::to_empty,
-		topic->owner().notifySettings().defaultUpdates(topic->channel())
+		topic->owner().notifySettings().defaultUpdates(topic->peer())
 	) | rpl::map([=] {
 		return !topic->owner().notifySettings().isMuted(topic);
 	}) | rpl::distinct_until_changed();
@@ -540,6 +598,7 @@ rpl::producer<int> KickedCountValue(not_null<ChannelData*> channel) {
 rpl::producer<int> SharedMediaCountValue(
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		PeerData *migrated,
 		Storage::SharedMediaType type) {
 	auto aroundId = 0;
@@ -550,6 +609,7 @@ rpl::producer<int> SharedMediaCountValue(
 			SparseIdsMergedSlice::Key(
 				peer->id,
 				topicRootId,
+				monoforumPeerId,
 				migrated ? migrated->id : 0,
 				aroundId),
 			type),
@@ -570,16 +630,16 @@ rpl::producer<int> CommonGroupsCountValue(not_null<UserData*> user) {
 	});
 }
 
-rpl::producer<int> SimilarChannelsCountValue(
-		not_null<ChannelData*> channel) {
-	const auto participants = &channel->session().api().chatParticipants();
-	participants->loadSimilarChannels(channel);
-	return rpl::single(channel) | rpl::then(
+rpl::producer<int> SimilarPeersCountValue(
+		not_null<PeerData*> peer) {
+	const auto participants = &peer->session().api().chatParticipants();
+	participants->loadSimilarPeers(peer);
+	return rpl::single(peer) | rpl::then(
 		participants->similarLoaded()
 	) | rpl::filter(
-		rpl::mappers::_1 == channel
+		rpl::mappers::_1 == peer
 	) | rpl::map([=] {
-		const auto &similar = participants->similar(channel);
+		const auto &similar = participants->similar(peer);
 		return int(similar.list.size()) + similar.more;
 	});
 }
@@ -588,19 +648,19 @@ rpl::producer<int> SavedSublistCountValue(
 		not_null<PeerData*> peer) {
 	const auto saved = &peer->owner().savedMessages();
 	const auto sublist = saved->sublist(peer);
-	if (!sublist->fullCount()) {
-		saved->loadMore(sublist);
+	if (!sublist->fullCount().has_value()) {
+		sublist->loadFullCount();
 		return rpl::single(0) | rpl::then(sublist->fullCountValue());
 	}
 	return sublist->fullCountValue();
 }
 
-rpl::producer<int> PeerGiftsCountValue(not_null<UserData*> user) {
-	return user->session().changes().peerFlagsValue(
-		user,
+rpl::producer<int> PeerGiftsCountValue(not_null<PeerData*> peer) {
+	return peer->session().changes().peerFlagsValue(
+		peer,
 		UpdateFlag::PeerGifts
 	) | rpl::map([=] {
-		return user->peerGiftsCount();
+		return peer->peerGiftsCount();
 	});
 }
 
@@ -659,6 +719,8 @@ rpl::producer<BadgeType> BadgeValueFromFlags(Peer peer) {
 			? BadgeType::Scam
 			: (value & Flag::Fake)
 			? BadgeType::Fake
+			: peer->isMonoforum()
+			? BadgeType::Direct
 			: (value & Flag::Verified)
 			? BadgeType::Verified
 			: premium
@@ -676,9 +738,9 @@ rpl::producer<BadgeType> BadgeValue(not_null<PeerData*> peer) {
 	return rpl::single(BadgeType::None);
 }
 
-rpl::producer<DocumentId> EmojiStatusIdValue(not_null<PeerData*> peer) {
+rpl::producer<EmojiStatusId> EmojiStatusIdValue(not_null<PeerData*> peer) {
 	if (peer->isChat()) {
-		return rpl::single(DocumentId(0));
+		return rpl::single(EmojiStatusId());
 	}
 	return peer->session().changes().peerFlagsValue(
 		peer,
@@ -697,17 +759,18 @@ rpl::producer<QString> BirthdayLabelText(
 }
 
 rpl::producer<QString> BirthdayValueText(
-		rpl::producer<Data::Birthday> birthday) {
+		rpl::producer<Data::Birthday> birthday,
+		bool fullMonth) {
 	return std::move(
 		birthday
-	) | rpl::map([](Data::Birthday value) -> rpl::producer<QString> {
+	) | rpl::map([=](Data::Birthday value) -> rpl::producer<QString> {
 		if (!value) {
 			return rpl::single(QString());
 		}
 		return Data::IsBirthdayTodayValue(
 			value
 		) | rpl::map([=](bool today) {
-			auto text = Data::BirthdayText(value);
+			auto text = Data::BirthdayText(value, fullMonth);
 			if (const auto age = Data::BirthdayAge(value)) {
 				text = (today
 					? tr::lng_info_birthday_today_years
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.h b/Telegram/SourceFiles/info/profile/info_profile_values.h
index 6001bd98005a25..14ba1d48b4ea93 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.h
@@ -56,6 +56,10 @@ rpl::producer<not_null<PeerData*>> MigratedOrMeValue(
 	not_null<UserData*> user);
 [[nodiscard]] rpl::producer<TextWithEntities> PhoneOrHiddenValue(
 	not_null<UserData*> user);
+[[nodiscard]] rpl::producer<TextWithEntities> PhoneWithSpoilerValue(
+	not_null<UserData*> user,
+	rpl::producer<TextWithEntities> phone);
+void CopyPhoneToClipboard(rpl::producer<TextWithEntities> phone);
 [[nodiscard]] rpl::producer<TextWithEntities> UsernameValue(
 	not_null<PeerData*> peer,
 	bool primary = false);
@@ -75,9 +79,13 @@ struct LinkWithUrl {
 	QString text;
 	QString url;
 };
+[[nodiscard]] QString TopicLink(
+	not_null<Data::ForumTopic*> topic,
+	bool full);
 [[nodiscard]] rpl::producer<LinkWithUrl> LinkValue(
 	not_null<PeerData*> peer,
-	bool primary = false);
+	bool primary = false,
+	MsgId topicRootId = 0);
 
 [[nodiscard]] rpl::producer<const ChannelLocation*> LocationValue(
 	not_null<ChannelData*> channel);
@@ -113,16 +121,17 @@ struct LinkWithUrl {
 [[nodiscard]] rpl::producer<int> SharedMediaCountValue(
 	not_null<PeerData*> peer,
 	MsgId topicRootId,
+	PeerId monoforumPeerId,
 	PeerData *migrated,
 	Storage::SharedMediaType type);
 [[nodiscard]] rpl::producer<int> CommonGroupsCountValue(
 	not_null<UserData*> user);
-[[nodiscard]] rpl::producer<int> SimilarChannelsCountValue(
-	not_null<ChannelData*> channel);
+[[nodiscard]] rpl::producer<int> SimilarPeersCountValue(
+	not_null<PeerData*> peer);
 [[nodiscard]] rpl::producer<int> SavedSublistCountValue(
 	not_null<PeerData*> peer);
 [[nodiscard]] rpl::producer<int> PeerGiftsCountValue(
-	not_null<UserData*> user);
+	not_null<PeerData*> peer);
 [[nodiscard]] rpl::producer<bool> CanAddMemberValue(
 	not_null<PeerData*> peer);
 [[nodiscard]] rpl::producer<int> FullReactionsCountValue(
@@ -130,14 +139,15 @@ struct LinkWithUrl {
 [[nodiscard]] rpl::producer<bool> CanViewParticipantsValue(
 	not_null<ChannelData*> megagroup);
 
-enum class BadgeType;
+enum class BadgeType : uchar;
 [[nodiscard]] rpl::producer<BadgeType> BadgeValue(not_null<PeerData*> peer);
-[[nodiscard]] rpl::producer<DocumentId> EmojiStatusIdValue(
+[[nodiscard]] rpl::producer<EmojiStatusId> EmojiStatusIdValue(
 	not_null<PeerData*> peer);
 
 [[nodiscard]] rpl::producer<QString> BirthdayLabelText(
 	rpl::producer<Data::Birthday> birthday);
 [[nodiscard]] rpl::producer<QString> BirthdayValueText(
-	rpl::producer<Data::Birthday> birthday);
+	rpl::producer<Data::Birthday> birthday,
+	bool fullMonth = false);
 
 } // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_widget.cpp
index 48b0107edfb839..bff8b4fffda012 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_widget.cpp
@@ -8,23 +8,37 @@ For license and copyright information please follow this link:
 #include "info/profile/info_profile_widget.h"
 
 #include "dialogs/ui/dialogs_stories_content.h"
+#include "history/history.h"
 #include "info/profile/info_profile_inner_widget.h"
 #include "info/profile/info_profile_members.h"
+#include "info/settings/info_settings_widget.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/ui_utility.h"
 #include "data/data_peer.h"
 #include "data/data_channel.h"
 #include "data/data_forum_topic.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_user.h"
 #include "lang/lang_keys.h"
 #include "info/info_controller.h"
+#include "styles/style_info.h"
+
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QScrollBar>
+
+namespace Info::Settings {
+struct SectionCustomTopBarData;
+} // namespace Info::Settings
 
 namespace Info::Profile {
 
+using Info::Settings::SectionCustomTopBarData;
+
 Memento::Memento(not_null<Controller*> controller)
 : Memento(
 	controller->peer(),
 	controller->topic(),
+	controller->sublist(),
 	controller->migratedPeerId(),
 	{ v::null }) {
 }
@@ -33,24 +47,29 @@ Memento::Memento(
 	not_null<PeerData*> peer,
 	PeerId migratedPeerId,
 	Origin origin)
-: Memento(peer, nullptr, migratedPeerId, origin) {
+: Memento(peer, nullptr, nullptr, migratedPeerId, origin) {
 }
 
 Memento::Memento(
 	not_null<PeerData*> peer,
 	Data::ForumTopic *topic,
+	Data::SavedSublist *sublist,
 	PeerId migratedPeerId,
 	Origin origin)
-: ContentMemento(peer, topic, migratedPeerId)
+: ContentMemento(peer, topic, sublist, migratedPeerId)
 , _origin(origin) {
 }
 
 Memento::Memento(not_null<Data::ForumTopic*> topic)
-: ContentMemento(topic->channel(), topic, 0) {
+: ContentMemento(topic->peer(), topic, nullptr, 0) {
 }
 
-Section Memento::section() const {
-	return Section(Section::Type::Profile);
+Memento::Memento(not_null<Data::SavedSublist*> sublist)
+: ContentMemento(sublist->owningHistory()->peer, nullptr, sublist, 0) {
+}
+
+Info::Section Memento::section() const {
+	return Info::Section(Info::Section::Type::Profile);
 }
 
 object_ptr<ContentWidget> Memento::createWidget(
@@ -76,16 +95,27 @@ Widget::Widget(
 	QWidget *parent,
 	not_null<Controller*> controller,
 	Origin origin)
-: ContentWidget(parent, controller) {
+: ContentWidget(parent, controller)
+, _inner(UseClassicProfileScroll()
+	? setupFlexibleInnerWidget(
+		object_ptr<InnerWidget>(this, controller, origin),
+		_flexibleScroll)
+	: setInnerWidget(
+		object_ptr<InnerWidget>(this, controller, origin)))
+, _pinnedToTop(_inner->createPinnedToTop(this))
+, _pinnedToBottom(_inner->createPinnedToBottom(this)) {
 	controller->setSearchEnabledByContent(false);
 
-	_inner = setInnerWidget(object_ptr<InnerWidget>(
-		this,
-		controller,
-		origin));
-	_inner->move(0, 0);
+	const auto classic = UseClassicProfileScroll();
+	const auto flexible = _pinnedToTop
+		&& _pinnedToTop->minimumHeight()
+		&& _inner->hasFlexibleTopBar();
+	if (classic) {
+		_inner->move(0, 0);
+	}
+
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		if (request.ymin < 0) {
 			scrollTopRestore(
 				qMin(scrollTopSave(), request.ymax));
@@ -93,15 +123,80 @@ Widget::Widget(
 			scrollTo(request);
 		}
 	}, lifetime());
+
+	_inner->backRequest() | rpl::on_next([=] {
+		checkBeforeClose([=] { controller->showBackFromStack(); });
+	}, _inner->lifetime());
+
+	if (!classic && flexible) {
+		setupFlexibleRegularScroll(_inner, _pinnedToTop.get());
+	} else if (_pinnedToTop) {
+		_inner->widthValue(
+		) | rpl::on_next([=](int w) {
+			_pinnedToTop->resizeToWidth(w);
+			setScrollTopSkip(_pinnedToTop->height());
+		}, _pinnedToTop->lifetime());
+
+		_pinnedToTop->heightValue(
+		) | rpl::on_next([=](int h) {
+			setScrollTopSkip(h);
+		}, _pinnedToTop->lifetime());
+	}
+
+	if (classic && flexible) {
+		_flexibleScrollHelper = std::make_unique<FlexibleScrollHelper>(
+			scroll(),
+			_inner,
+			_pinnedToTop.get(),
+			[=](QMargins margins) {
+				ContentWidget::setPaintPadding(std::move(margins));
+			},
+			[=](rpl::producer<not_null<QEvent*>> &&events) {
+				ContentWidget::setViewport(std::move(events));
+			},
+			_flexibleScroll);
+	}
+
+	if (_pinnedToBottom) {
+		const auto processHeight = [=] {
+			setScrollBottomSkip(_pinnedToBottom->height());
+			_pinnedToBottom->moveToLeft(
+				_pinnedToBottom->x(),
+				height() - _pinnedToBottom->height());
+		};
+
+		_inner->sizeValue(
+		) | rpl::on_next([=](const QSize &s) {
+			_pinnedToBottom->resizeToWidth(s.width());
+		}, _pinnedToBottom->lifetime());
+
+		rpl::combine(
+			_pinnedToBottom->heightValue(),
+			heightValue()
+		) | rpl::on_next(processHeight, _pinnedToBottom->lifetime());
+	}
 }
 
 void Widget::setInnerFocus() {
 	_inner->setFocus();
 }
 
+void Widget::enableBackButton() {
+	_inner->enableBackButton();
+}
+
+void Widget::showFinished() {
+	_inner->showFinished();
+}
+
 rpl::producer<QString> Widget::title() {
 	if (const auto topic = controller()->key().topic()) {
-		return tr::lng_info_topic_title();
+		return topic->peer()->isBot()
+			? tr::lng_info_thread_title()
+			: tr::lng_info_topic_title();
+	} else if (controller()->key().sublist()
+		&& controller()->key().sublist()->parentChat()) {
+		return tr::lng_profile_direct_messages();
 	}
 	const auto peer = controller()->key().peer();
 	if (const auto user = peer->asUser()) {
@@ -109,7 +204,9 @@ rpl::producer<QString> Widget::title() {
 			? tr::lng_info_bot_title()
 			: tr::lng_info_user_title();
 	} else if (const auto channel = peer->asChannel()) {
-		return channel->isMegagroup()
+		return channel->isMonoforum()
+			? tr::lng_profile_direct_messages()
+			: channel->isMegagroup()
 			? tr::lng_info_group_title()
 			: tr::lng_info_channel_title();
 	} else if (peer->isChat()) {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_widget.h b/Telegram/SourceFiles/info/profile/info_profile_widget.h
index b6e4da66a9ab78..0665c5d625e23f 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_widget.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_widget.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "info/info_content_widget.h"
+#include "ui/effects/animations.h"
 
 namespace Data {
 class ForumTopic;
@@ -35,13 +36,14 @@ class Memento final : public ContentMemento {
 		PeerId migratedPeerId,
 		Origin origin = { v::null });
 	explicit Memento(not_null<Data::ForumTopic*> topic);
+	explicit Memento(not_null<Data::SavedSublist*> sublist);
 
 	object_ptr<ContentWidget> createWidget(
 		QWidget *parent,
 		not_null<Controller*> controller,
 		const QRect &geometry) override;
 
-	Section section() const override;
+	Info::Section section() const override;
 
 	[[nodiscard]] Origin origin() const {
 		return _origin;
@@ -56,6 +58,7 @@ class Memento final : public ContentMemento {
 	Memento(
 		not_null<PeerData*> peer,
 		Data::ForumTopic *topic,
+		Data::SavedSublist *sublist,
 		PeerId migratedPeerId,
 		Origin origin);
 
@@ -76,6 +79,8 @@ class Widget final : public ContentWidget {
 		not_null<Memento*> memento);
 
 	void setInnerFocus() override;
+	void enableBackButton() override;
+	void showFinished() override;
 
 	rpl::producer<QString> title() override;
 	rpl::producer<Dialogs::Stories::Content> titleStories() override;
@@ -86,7 +91,11 @@ class Widget final : public ContentWidget {
 
 	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
+	FlexibleScrollData _flexibleScroll;
 	InnerWidget *_inner = nullptr;
+	base::weak_qptr<Ui::RpWidget> _pinnedToTop;
+	base::weak_qptr<Ui::RpWidget> _pinnedToBottom;
+	std::unique_ptr<FlexibleScrollHelper> _flexibleScrollHelper;
 
 };
 
diff --git a/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp b/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp
new file mode 100644
index 00000000000000..7448c4492b91af
--- /dev/null
+++ b/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.cpp
@@ -0,0 +1,351 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/reactions_list/info_reactions_list_widget.h"
+
+#include "api/api_who_reacted.h"
+#include "boxes/peer_list_box.h"
+#include "data/data_channel.h"
+#include "history/view/reactions/history_view_reactions_list.h"
+#include "history/view/reactions/history_view_reactions_tabs.h"
+#include "info/info_controller.h"
+#include "ui/controls/who_reacted_context_action.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/ui_utility.h"
+#include "lang/lang_keys.h"
+#include "styles/style_info.h"
+
+namespace Info::ReactionsList {
+namespace {
+
+} // namespace
+
+class InnerWidget final
+	: public Ui::RpWidget
+	, private PeerListContentDelegate {
+public:
+	InnerWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected);
+
+	[[nodiscard]] std::shared_ptr<Api::WhoReadList> whoReadIds() const;
+	[[nodiscard]] FullMsgId contextId() const;
+	[[nodiscard]] Data::ReactionId selected() const;
+
+	rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
+
+	int desiredHeight() const;
+
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+protected:
+	void visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) override;
+
+private:
+	using ListWidget = PeerListContent;
+
+	// PeerListContentDelegate interface
+	void peerListSetTitle(rpl::producer<QString> title) override;
+	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
+	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
+	int peerListSelectedRowsCount() override;
+	void peerListScrollToTop() override;
+	void peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) override;
+	void peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) override;
+	void peerListFinishSelectedRowsBunch() override;
+	void peerListSetDescription(object_ptr<Ui::FlatLabel> description) override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
+
+	object_ptr<ListWidget> setupList(
+		RpWidget *parent,
+		not_null<PeerListController*> controller);
+
+	const std::shared_ptr<Main::SessionShow> _show;
+	not_null<Controller*> _controller;
+	Data::ReactionId _selected;
+	not_null<HistoryView::Reactions::Tabs*> _tabs;
+	rpl::variable<int> _tabsHeight;
+	HistoryView::Reactions::PreparedFullList _full;
+	object_ptr<ListWidget> _list;
+
+	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
+};
+
+InnerWidget::InnerWidget(
+	QWidget *parent,
+	not_null<Controller*> controller,
+	std::shared_ptr<Api::WhoReadList> whoReadIds,
+	FullMsgId contextId,
+	Data::ReactionId selected)
+: RpWidget(parent)
+, _show(controller->uiShow())
+, _controller(controller)
+, _selected(selected)
+, _tabs(HistoryView::Reactions::CreateReactionsTabs(
+	this,
+	controller,
+	controller->reactionsContextId(),
+	_selected,
+	controller->reactionsWhoReadIds()))
+, _tabsHeight(_tabs->heightValue())
+, _full(HistoryView::Reactions::FullListController(
+	controller,
+	controller->reactionsContextId(),
+	_selected,
+	controller->reactionsWhoReadIds()))
+, _list(setupList(this, _full.controller.get())) {
+	setContent(_list.data());
+	_full.controller->setDelegate(static_cast<PeerListDelegate*>(this));
+	_tabs->changes(
+	) | rpl::on_next([=](Data::ReactionId reaction) {
+		_selected = reaction;
+		_full.switchTab(reaction);
+	}, _list->lifetime());
+}
+
+std::shared_ptr<Api::WhoReadList> InnerWidget::whoReadIds() const {
+	return _controller->reactionsWhoReadIds();
+}
+
+FullMsgId InnerWidget::contextId() const {
+	return _controller->reactionsContextId();
+}
+
+Data::ReactionId InnerWidget::selected() const {
+	return _selected;
+}
+
+void InnerWidget::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	setChildVisibleTopBottom(_list, visibleTop, visibleBottom);
+}
+
+void InnerWidget::saveState(not_null<Memento*> memento) {
+	memento->setListState(_full.controller->saveState());
+}
+
+void InnerWidget::restoreState(not_null<Memento*> memento) {
+	_full.controller->restoreState(memento->listState());
+}
+
+rpl::producer<Ui::ScrollToRequest> InnerWidget::scrollToRequests() const {
+	return _scrollToRequests.events();
+}
+
+int InnerWidget::desiredHeight() const {
+	auto desired = 0;
+	desired += _list->fullRowsCount() * st::infoMembersList.item.height;
+	return qMax(height(), desired);
+}
+
+object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
+		RpWidget *parent,
+		not_null<PeerListController*> controller) {
+	auto result = object_ptr<ListWidget>(parent, controller);
+	const auto raw = result.data();
+
+	raw->scrollToRequests(
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
+		const auto skip = _tabsHeight.current()
+			+ st::infoCommonGroupsMargin.top();
+		auto addmin = (request.ymin < 0) ? 0 : skip;
+		auto addmax = (request.ymax < 0) ? 0 : skip;
+		_scrollToRequests.fire({
+			request.ymin + addmin,
+			request.ymax + addmax });
+	}, raw->lifetime());
+
+	_tabs->move(0, 0);
+	_tabsHeight.value() | rpl::on_next([=](int tabs) {
+		raw->moveToLeft(0, tabs + st::infoCommonGroupsMargin.top());
+	}, raw->lifetime());
+
+	parent->widthValue(
+	) | rpl::on_next([=](int newWidth) {
+		_tabs->resizeToWidth(newWidth);
+		raw->resizeToWidth(newWidth);
+	}, raw->lifetime());
+
+	rpl::combine(
+		_tabsHeight.value(),
+		raw->heightValue()
+	) | rpl::on_next([parent](int tabsHeight, int listHeight) {
+		const auto newHeight = tabsHeight
+			+ st::infoCommonGroupsMargin.top()
+			+ listHeight
+			+ st::infoCommonGroupsMargin.bottom();
+		parent->resize(parent->width(), newHeight);
+	}, result->lifetime());
+
+	return result;
+}
+
+void InnerWidget::peerListSetTitle(rpl::producer<QString> title) {
+}
+
+void InnerWidget::peerListSetAdditionalTitle(rpl::producer<QString> title) {
+}
+
+bool InnerWidget::peerListIsRowChecked(not_null<PeerListRow*> row) {
+	return false;
+}
+
+int InnerWidget::peerListSelectedRowsCount() {
+	return 0;
+}
+
+void InnerWidget::peerListScrollToTop() {
+	_scrollToRequests.fire({ -1, -1 });
+}
+
+void InnerWidget::peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void InnerWidget::peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void InnerWidget::peerListFinishSelectedRowsBunch() {
+}
+
+void InnerWidget::peerListSetDescription(
+		object_ptr<Ui::FlatLabel> description) {
+	description.destroy();
+}
+
+std::shared_ptr<Main::SessionShow> InnerWidget::peerListUiShow() {
+	return _show;
+}
+
+Memento::Memento(
+	std::shared_ptr<Api::WhoReadList> whoReadIds,
+	FullMsgId contextId,
+	Data::ReactionId selected)
+: ContentMemento(std::move(whoReadIds), contextId, selected) {
+}
+
+Section Memento::section() const {
+	return Section(Section::Type::ReactionsList);
+}
+
+std::shared_ptr<Api::WhoReadList> Memento::whoReadIds() const {
+	return reactionsWhoReadIds();
+}
+
+FullMsgId Memento::contextId() const {
+	return reactionsContextId();
+}
+
+Data::ReactionId Memento::selected() const {
+	return reactionsSelected();
+}
+
+object_ptr<ContentWidget> Memento::createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) {
+	auto result = object_ptr<Widget>(
+		parent,
+		controller,
+		whoReadIds(),
+		contextId(),
+		selected());
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+void Memento::setListState(std::unique_ptr<PeerListState> state) {
+	_listState = std::move(state);
+}
+
+std::unique_ptr<PeerListState> Memento::listState() {
+	return std::move(_listState);
+}
+
+Memento::~Memento() = default;
+
+Widget::Widget(
+	QWidget *parent,
+	not_null<Controller*> controller,
+	std::shared_ptr<Api::WhoReadList> whoReadIds,
+	FullMsgId contextId,
+	Data::ReactionId selected)
+: ContentWidget(parent, controller) {
+	_inner = setInnerWidget(object_ptr<InnerWidget>(
+		this,
+		controller,
+		std::move(whoReadIds),
+		contextId,
+		selected));
+}
+
+rpl::producer<QString> Widget::title() {
+	const auto ids = whoReadIds();
+	const auto count = ids ? int(ids->list.size()) : 0;
+	return !count
+		? tr::lng_manage_peer_reactions()
+		: (ids->type == Ui::WhoReadType::Seen)
+		? tr::lng_context_seen_text(lt_count, rpl::single(1. * count))
+		: (ids->type == Ui::WhoReadType::Listened)
+		? tr::lng_context_seen_listened(lt_count, rpl::single(1. * count))
+		: (ids->type == Ui::WhoReadType::Watched)
+		? tr::lng_context_seen_watched(lt_count, rpl::single(1. * count))
+		: tr::lng_manage_peer_reactions();
+}
+
+std::shared_ptr<Api::WhoReadList> Widget::whoReadIds() const {
+	return _inner->whoReadIds();
+}
+
+FullMsgId Widget::contextId() const {
+	return _inner->contextId();
+}
+
+Data::ReactionId Widget::selected() const {
+	return _inner->selected();
+}
+
+bool Widget::showInternal(not_null<ContentMemento*> memento) {
+	return false;
+}
+
+void Widget::setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento) {
+	setGeometry(geometry);
+	Ui::SendPendingMoveResizeEvents(this);
+	restoreState(memento);
+}
+
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(
+		whoReadIds(),
+		contextId(),
+		selected());
+	saveState(result.get());
+	return result;
+}
+
+void Widget::saveState(not_null<Memento*> memento) {
+	memento->setScrollTop(scrollTopSave());
+	_inner->saveState(memento);
+}
+
+void Widget::restoreState(not_null<Memento*> memento) {
+	_inner->restoreState(memento);
+	scrollTopRestore(memento->scrollTop());
+}
+
+} // namespace Info::ReactionsList
diff --git a/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.h b/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.h
new file mode 100644
index 00000000000000..a713c6e2b67717
--- /dev/null
+++ b/Telegram/SourceFiles/info/reactions_list/info_reactions_list_widget.h
@@ -0,0 +1,82 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "info/info_content_widget.h"
+
+class ChannelData;
+struct PeerListState;
+
+namespace Api {
+struct WhoReadList;
+} // namespace Api
+
+namespace Info::ReactionsList {
+
+class InnerWidget;
+
+class Memento final : public ContentMemento {
+public:
+	Memento(
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected);
+
+	object_ptr<ContentWidget> createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) override;
+
+	Section section() const override;
+
+	[[nodiscard]] std::shared_ptr<Api::WhoReadList> whoReadIds() const;
+	[[nodiscard]] FullMsgId contextId() const;
+	[[nodiscard]] Data::ReactionId selected() const;
+
+	void setListState(std::unique_ptr<PeerListState> state);
+	std::unique_ptr<PeerListState> listState();
+
+	~Memento();
+
+private:
+	std::unique_ptr<PeerListState> _listState;
+
+};
+
+class Widget final : public ContentWidget {
+public:
+	Widget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		std::shared_ptr<Api::WhoReadList> whoReadIds,
+		FullMsgId contextId,
+		Data::ReactionId selected);
+
+	[[nodiscard]] std::shared_ptr<Api::WhoReadList> whoReadIds() const;
+	[[nodiscard]] FullMsgId contextId() const;
+	[[nodiscard]] Data::ReactionId selected() const;
+
+	bool showInternal(
+		not_null<ContentMemento*> memento) override;
+
+	void setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento);
+
+	rpl::producer<QString> title() override;
+
+private:
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
+
+	InnerWidget *_inner = nullptr;
+};
+
+} // namespace Info::ReactionsList
diff --git a/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp
new file mode 100644
index 00000000000000..ded41619b33aa6
--- /dev/null
+++ b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.cpp
@@ -0,0 +1,271 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/requests_list/info_requests_list_widget.h"
+
+#include "boxes/peers/edit_peer_requests_box.h"
+#include "info/info_controller.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/search_field_controller.h"
+#include "ui/ui_utility.h"
+#include "lang/lang_keys.h"
+#include "styles/style_info.h"
+
+namespace Info::RequestsList {
+namespace {
+
+} // namespace
+
+class InnerWidget final
+	: public Ui::RpWidget
+	, private PeerListContentDelegate {
+public:
+	InnerWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		not_null<PeerData*> peer);
+
+	[[nodiscard]] not_null<PeerData*> peer() const {
+		return _peer;
+	}
+
+	rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
+
+	int desiredHeight() const;
+
+	void saveState(not_null<Memento*> memento);
+	void restoreState(not_null<Memento*> memento);
+
+protected:
+	void visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) override;
+
+private:
+	using ListWidget = PeerListContent;
+
+	// PeerListContentDelegate interface
+	void peerListSetTitle(rpl::producer<QString> title) override;
+	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
+	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
+	int peerListSelectedRowsCount() override;
+	void peerListScrollToTop() override;
+	void peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) override;
+	void peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) override;
+	void peerListFinishSelectedRowsBunch() override;
+	void peerListSetDescription(object_ptr<Ui::FlatLabel> description) override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
+
+	object_ptr<ListWidget> setupList(
+		RpWidget *parent,
+		not_null<RequestsBoxController*> controller);
+
+	const std::shared_ptr<Main::SessionShow> _show;
+	not_null<Controller*> _controller;
+	const not_null<PeerData*> _peer;
+	std::unique_ptr<RequestsBoxController> _listController;
+	object_ptr<ListWidget> _list;
+
+	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
+};
+
+InnerWidget::InnerWidget(
+	QWidget *parent,
+	not_null<Controller*> controller,
+	not_null<PeerData*> peer)
+: RpWidget(parent)
+, _show(controller->uiShow())
+, _controller(controller)
+, _peer(peer)
+, _listController(std::make_unique<RequestsBoxController>(
+	controller,
+	_peer))
+, _list(setupList(this, _listController.get())) {
+	setContent(_list.data());
+	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
+
+	controller->searchFieldController()->queryValue(
+	) | rpl::on_next([this](QString &&query) {
+		peerListScrollToTop();
+		content()->searchQueryChanged(std::move(query));
+	}, lifetime());
+}
+
+void InnerWidget::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	setChildVisibleTopBottom(_list, visibleTop, visibleBottom);
+}
+
+void InnerWidget::saveState(not_null<Memento*> memento) {
+	memento->setListState(_listController->saveState());
+}
+
+void InnerWidget::restoreState(not_null<Memento*> memento) {
+	_listController->restoreState(memento->listState());
+}
+
+rpl::producer<Ui::ScrollToRequest> InnerWidget::scrollToRequests() const {
+	return _scrollToRequests.events();
+}
+
+int InnerWidget::desiredHeight() const {
+	auto desired = 0;
+	desired += _list->fullRowsCount() * st::infoMembersList.item.height;
+	return qMax(height(), desired);
+}
+
+object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
+		RpWidget *parent,
+		not_null<RequestsBoxController*> controller) {
+	auto result = object_ptr<ListWidget>(parent, controller);
+	result->scrollToRequests(
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
+		auto addmin = (request.ymin < 0) ? 0 : st::infoCommonGroupsMargin.top();
+		auto addmax = (request.ymax < 0) ? 0 : st::infoCommonGroupsMargin.top();
+		_scrollToRequests.fire({
+			request.ymin + addmin,
+			request.ymax + addmax });
+	}, result->lifetime());
+	result->moveToLeft(0, st::infoCommonGroupsMargin.top());
+
+	parent->widthValue(
+	) | rpl::on_next([list = result.data()](int newWidth) {
+		list->resizeToWidth(newWidth);
+	}, result->lifetime());
+
+	result->heightValue(
+	) | rpl::on_next([parent](int listHeight) {
+		auto newHeight = st::infoCommonGroupsMargin.top()
+			+ listHeight
+			+ st::infoCommonGroupsMargin.bottom();
+		parent->resize(parent->width(), newHeight);
+	}, result->lifetime());
+
+	return result;
+}
+
+void InnerWidget::peerListSetTitle(rpl::producer<QString> title) {
+}
+
+void InnerWidget::peerListSetAdditionalTitle(rpl::producer<QString> title) {
+}
+
+bool InnerWidget::peerListIsRowChecked(not_null<PeerListRow*> row) {
+	return false;
+}
+
+int InnerWidget::peerListSelectedRowsCount() {
+	return 0;
+}
+
+void InnerWidget::peerListScrollToTop() {
+	_scrollToRequests.fire({ -1, -1 });
+}
+
+void InnerWidget::peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void InnerWidget::peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void InnerWidget::peerListFinishSelectedRowsBunch() {
+}
+
+void InnerWidget::peerListSetDescription(
+		object_ptr<Ui::FlatLabel> description) {
+	description.destroy();
+}
+
+std::shared_ptr<Main::SessionShow> InnerWidget::peerListUiShow() {
+	return _show;
+}
+
+Memento::Memento(not_null<PeerData*> peer)
+: ContentMemento(peer, nullptr, nullptr, PeerId()) {
+}
+
+Section Memento::section() const {
+	return Section(Section::Type::RequestsList);
+}
+
+object_ptr<ContentWidget> Memento::createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) {
+	auto result = object_ptr<Widget>(parent, controller, peer());
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+void Memento::setListState(std::unique_ptr<PeerListState> state) {
+	_listState = std::move(state);
+}
+
+std::unique_ptr<PeerListState> Memento::listState() {
+	return std::move(_listState);
+}
+
+Memento::~Memento() = default;
+
+Widget::Widget(
+	QWidget *parent,
+	not_null<Controller*> controller,
+	not_null<PeerData*> peer)
+: ContentWidget(parent, controller) {
+	controller->setSearchEnabledByContent(true);
+	_inner = setInnerWidget(object_ptr<InnerWidget>(this, controller, peer));
+}
+
+rpl::producer<QString> Widget::title() {
+	return tr::lng_manage_peer_requests();
+}
+
+not_null<PeerData*> Widget::peer() const {
+	return _inner->peer();
+}
+
+bool Widget::showInternal(not_null<ContentMemento*> memento) {
+	if (!controller()->validateMementoPeer(memento)) {
+		return false;
+	}
+	if (auto requestsMemento = dynamic_cast<Memento*>(memento.get())) {
+		if (requestsMemento->peer() == peer()) {
+			restoreState(requestsMemento);
+			return true;
+		}
+	}
+	return false;
+}
+
+void Widget::setInternalState(
+		const QRect &geometry,
+		not_null<Memento*> memento) {
+	setGeometry(geometry);
+	Ui::SendPendingMoveResizeEvents(this);
+	restoreState(memento);
+}
+
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(peer());
+	saveState(result.get());
+	return result;
+}
+
+void Widget::saveState(not_null<Memento*> memento) {
+	memento->setScrollTop(scrollTopSave());
+	_inner->saveState(memento);
+}
+
+void Widget::restoreState(not_null<Memento*> memento) {
+	_inner->restoreState(memento);
+	scrollTopRestore(memento->scrollTop());
+}
+
+} // namespace Info::RequestsList
diff --git a/Telegram/SourceFiles/info/channels/info_channels_widget.h b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.h
similarity index 58%
rename from Telegram/SourceFiles/info/channels/info_channels_widget.h
rename to Telegram/SourceFiles/info/requests_list/info_requests_list_widget.h
index 431f94ec10606b..a6bbb37d613dc3 100644
--- a/Telegram/SourceFiles/info/channels/info_channels_widget.h
+++ b/Telegram/SourceFiles/info/requests_list/info_requests_list_widget.h
@@ -9,26 +9,16 @@ For license and copyright information please follow this link:
 
 #include "info/info_content_widget.h"
 
+class PeerData;
 struct PeerListState;
 
-namespace Data {
-class Feed;
-} // namespace Data
+namespace Info::RequestsList {
 
-namespace Info {
-namespace FeedProfile {
-class Channels;
-struct ChannelsState;
-} // namespace FeedProfile
-
-namespace Channels {
-
-using SavedState = FeedProfile::ChannelsState;
+class InnerWidget;
 
 class Memento final : public ContentMemento {
 public:
-	explicit Memento(not_null<Controller*> controller);
-	explicit Memento(not_null<Data::Feed*> feed);
+	explicit Memento(not_null<PeerData*> peer);
 
 	object_ptr<ContentWidget> createWidget(
 		QWidget *parent,
@@ -37,13 +27,13 @@ class Memento final : public ContentMemento {
 
 	Section section() const override;
 
-	void setState(std::unique_ptr<SavedState> state);
-	std::unique_ptr<SavedState> state();
+	void setListState(std::unique_ptr<PeerListState> state);
+	std::unique_ptr<PeerListState> listState();
 
 	~Memento();
 
 private:
-	std::unique_ptr<SavedState> _state;
+	std::unique_ptr<PeerListState> _listState;
 
 };
 
@@ -51,7 +41,10 @@ class Widget final : public ContentWidget {
 public:
 	Widget(
 		QWidget *parent,
-		not_null<Controller*> controller);
+		not_null<Controller*> controller,
+		not_null<PeerData*> peer);
+
+	[[nodiscard]] not_null<PeerData*> peer() const;
 
 	bool showInternal(
 		not_null<ContentMemento*> memento) override;
@@ -60,15 +53,15 @@ class Widget final : public ContentWidget {
 		const QRect &geometry,
 		not_null<Memento*> memento);
 
+	rpl::producer<QString> title() override;
+
 private:
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
-	std::unique_ptr<ContentMemento> doCreateMemento() override;
-
-	FeedProfile::Channels *_inner = nullptr;
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
+	InnerWidget *_inner = nullptr;
 };
 
-} // namespace Channels
-} // namespace Info
+} // namespace Info::RequestsList
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_common.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_common.cpp
new file mode 100644
index 00000000000000..9a6c21b3b34fd0
--- /dev/null
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_common.cpp
@@ -0,0 +1,83 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/saved/info_saved_music_common.h"
+
+#include "data/data_peer.h"
+#include "data/data_saved_music.h"
+#include "data/data_saved_sublist.h"
+#include "history/history_item.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "info/profile/info_profile_music_button.h"
+#include "info/saved/info_saved_music_widget.h"
+#include "ui/text/format_song_document_name.h"
+#include "ui/widgets/buttons.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/vertical_list.h"
+
+namespace Info::Saved {
+
+namespace {
+
+[[nodiscard]] Profile::MusicButtonData DocumentMusicButtonData(
+		not_null<DocumentData*> document) {
+	return { Ui::Text::FormatSongNameFor(document) };
+}
+
+} // namespace
+
+void SetupSavedMusic(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Info::Controller*> controller,
+		not_null<PeerData*> peer,
+		rpl::producer<std::optional<QColor>> topBarColor) {
+	auto musicValue = Data::SavedMusic::Supported(peer->id)
+		? Data::SavedMusicList(
+			peer,
+			nullptr,
+			1
+		) | rpl::map([=](const Data::SavedMusicSlice &data) {
+			return data.size() ? data[0].get() : nullptr;
+		}) | rpl::type_erased
+		: rpl::single<HistoryItem*>((HistoryItem*)(nullptr));
+
+	const auto divider = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+
+	rpl::combine(
+		std::move(musicValue),
+		std::move(topBarColor)
+	) | rpl::on_next([=](
+			HistoryItem *item,
+			std::optional<QColor> color) {
+		while (divider->entity()->count()) {
+			delete divider->entity()->widgetAt(0);
+		}
+		if (item) {
+			if (const auto document = item->media()
+					? item->media()->document()
+					: nullptr) {
+				const auto music = divider->entity()->add(
+					object_ptr<Profile::MusicButton>(
+						divider->entity(),
+						DocumentMusicButtonData(document),
+						[window = controller, peer] {
+							window->showSection(Info::Saved::MakeMusic(peer));
+						}));
+				music->setOverrideBg(color);
+			}
+			divider->toggle(true, anim::type::normal);
+		}
+	}, container->lifetime());
+	divider->finishAnimating();
+}
+
+} // namespace Info::Saved
\ No newline at end of file
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_common.h b/Telegram/SourceFiles/info/saved/info_saved_music_common.h
new file mode 100644
index 00000000000000..39b264f737502a
--- /dev/null
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_common.h
@@ -0,0 +1,36 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class PeerData;
+
+namespace Ui {
+class VerticalLayout;
+} // namespace Ui
+
+namespace Info {
+class Controller;
+} // namespace Info
+
+namespace Info::Saved {
+
+struct MusicTag {
+	explicit MusicTag(not_null<PeerData*> peer)
+	: peer(peer) {
+	}
+
+	not_null<PeerData*> peer;
+};
+
+void SetupSavedMusic(
+	not_null<Ui::VerticalLayout*> container,
+	not_null<Info::Controller*> controller,
+	not_null<PeerData*> peer,
+	rpl::producer<std::optional<QColor>> topBarColor);
+
+} // namespace Info::Saved
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
new file mode 100644
index 00000000000000..e34ec4f393eaaf
--- /dev/null
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
@@ -0,0 +1,411 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/saved/info_saved_music_provider.h"
+
+#include "base/unixtime.h"
+#include "core/application.h"
+#include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_document.h"
+#include "data/data_media_types.h"
+#include "data/data_saved_music.h"
+#include "data/data_session.h"
+#include "history/history_item.h"
+#include "history/history_item_helpers.h"
+#include "history/history.h"
+#include "info/media/info_media_widget.h"
+#include "info/media/info_media_list_section.h"
+#include "info/info_controller.h"
+#include "main/main_account.h"
+#include "main/main_session.h"
+#include "layout/layout_selection.h"
+#include "storage/storage_shared_media.h"
+#include "styles/style_info.h"
+#include "styles/style_overview.h"
+
+namespace Info::Saved {
+namespace {
+
+using namespace Media;
+
+constexpr auto kPreloadedScreensCount = 4;
+constexpr auto kPreloadedScreensCountFull
+	= kPreloadedScreensCount + 1 + kPreloadedScreensCount;
+
+} // namespace
+
+MusicProvider::MusicProvider(not_null<AbstractController*> controller)
+: _controller(controller)
+, _peer(controller->key().musicPeer())
+, _history(_peer->owner().history(_peer)) {
+	_controller->session().data().itemRemoved(
+	) | rpl::on_next([this](auto item) {
+		itemRemoved(item);
+	}, _lifetime);
+
+	style::PaletteChanged(
+	) | rpl::on_next([=] {
+		for (auto &layout : _layouts) {
+			layout.second.item->invalidateCache();
+		}
+	}, _lifetime);
+}
+
+MusicProvider::~MusicProvider() {
+	clear();
+}
+
+Type MusicProvider::type() {
+	return Type::MusicFile;
+}
+
+bool MusicProvider::hasSelectRestriction() {
+	//if (_peer->session().frozen()) {
+	//	return true;
+	//}
+	return true;
+}
+
+rpl::producer<bool> MusicProvider::hasSelectRestrictionChanges() {
+	return rpl::never<bool>();
+}
+
+bool MusicProvider::sectionHasFloatingHeader() {
+	return false;
+}
+
+QString MusicProvider::sectionTitle(not_null<const BaseLayout*> item) {
+	return QString();
+}
+
+bool MusicProvider::sectionItemBelongsHere(
+		not_null<const BaseLayout*> item,
+		not_null<const BaseLayout*> previous) {
+	return true;
+}
+
+bool MusicProvider::isPossiblyMyItem(not_null<const HistoryItem*> item) {
+	return true;
+}
+
+std::optional<int> MusicProvider::fullCount() {
+	return _slice.fullCount();
+}
+
+void MusicProvider::clear() {
+	_layouts.clear();
+	_aroundId = nullptr;
+	_idsLimit = kMinimalIdsLimit;
+	_slice = Data::SavedMusicSlice();
+}
+
+void MusicProvider::restart() {
+	clear();
+	refreshViewer();
+}
+
+void MusicProvider::checkPreload(
+		QSize viewport,
+		not_null<BaseLayout*> topLayout,
+		not_null<BaseLayout*> bottomLayout,
+		bool preloadTop,
+		bool preloadBottom) {
+	const auto visibleWidth = viewport.width();
+	const auto visibleHeight = viewport.height();
+	const auto preloadedHeight = kPreloadedScreensCountFull * visibleHeight;
+	const auto minItemHeight = MinItemHeight(
+		Type::MusicFile,
+		visibleWidth);
+	const auto preloadedCount = preloadedHeight / minItemHeight;
+	const auto preloadIdsLimitMin = (preloadedCount / 2) + 1;
+	const auto preloadIdsLimit = preloadIdsLimitMin
+		+ (visibleHeight / minItemHeight);
+	const auto after = _slice.skippedAfter();
+	const auto topLoaded = after && (*after == 0);
+	const auto before = _slice.skippedBefore();
+	const auto bottomLoaded = before && (*before == 0);
+
+	const auto minScreenDelta = kPreloadedScreensCount
+		- kPreloadIfLessThanScreens;
+	const auto minIdDelta = (minScreenDelta * visibleHeight)
+		/ minItemHeight;
+	const auto preloadAroundItem = [&](not_null<BaseLayout*> layout) {
+		auto preloadRequired = false;
+		const auto item = layout->getItem();
+		if (!preloadRequired) {
+			preloadRequired = (_idsLimit < preloadIdsLimitMin);
+		}
+		if (!preloadRequired) {
+			auto delta = _slice.distance(_aroundId, item);
+			Assert(delta != std::nullopt);
+			preloadRequired = (qAbs(*delta) >= minIdDelta);
+		}
+		if (preloadRequired) {
+			_idsLimit = preloadIdsLimit;
+			_aroundId = item;
+			refreshViewer();
+		}
+	};
+
+	if (preloadTop && !topLoaded) {
+		preloadAroundItem(topLayout);
+	} else if (preloadBottom && !bottomLoaded) {
+		preloadAroundItem(bottomLayout);
+	}
+}
+
+void MusicProvider::setSearchQuery(QString query) {
+}
+
+void MusicProvider::jumpToMessage(MsgId messageId, Fn<void(FullMsgId)>) {
+}
+
+void MusicProvider::refreshViewer() {
+	_viewerLifetime.destroy();
+	const auto aroundId = _aroundId;
+ 	auto ids = Data::SavedMusicList(_peer, aroundId, _idsLimit);
+	std::move(
+		ids
+	) | rpl::on_next([=](Data::SavedMusicSlice &&slice) {
+		if (!slice.fullCount()) {
+			// Don't display anything while full count is unknown.
+			return;
+		}
+		_slice = std::move(slice);
+
+		auto nearestId = (HistoryItem*)nullptr;
+		for (auto i = 0; i != _slice.size(); ++i) {
+			if (_slice[i] == aroundId) {
+				nearestId = aroundId;
+				break;
+			}
+		}
+		if (!nearestId && _slice.size() > 0) {
+			_aroundId = _slice[_slice.size() / 2];
+		}
+		_refreshed.fire({});
+	}, _viewerLifetime);
+}
+
+rpl::producer<> MusicProvider::refreshed() {
+	return _refreshed.events();
+}
+
+std::vector<ListSection> MusicProvider::fillSections(
+		not_null<Overview::Layout::Delegate*> delegate) {
+	markLayoutsStale();
+	const auto guard = gsl::finally([&] { clearStaleLayouts(); });
+
+	auto result = std::vector<ListSection>();
+	auto section = ListSection(Type::MusicFile, sectionDelegate());
+	auto count = _slice.size();
+	for (auto i = 0; i != count; ++i) {
+		const auto item = _slice[i];
+		if (const auto layout = getLayout(item, delegate)) {
+			if (!section.addItem(layout)) {
+				section.finishSection();
+				result.push_back(std::move(section));
+				section = ListSection(Type::MusicFile, sectionDelegate());
+				section.addItem(layout);
+			}
+		}
+	}
+	if (!section.empty()) {
+		section.finishSection();
+		result.push_back(std::move(section));
+	}
+	return result;
+}
+
+void MusicProvider::itemRemoved(not_null<const HistoryItem*> item) {
+	if (const auto i = _layouts.find(item); i != end(_layouts)) {
+		_layoutRemoved.fire(i->second.item.get());
+		_layouts.erase(i);
+	}
+}
+
+void MusicProvider::markLayoutsStale() {
+	for (auto &layout : _layouts) {
+		layout.second.stale = true;
+	}
+}
+
+void MusicProvider::clearStaleLayouts() {
+	for (auto i = _layouts.begin(); i != _layouts.end();) {
+		if (i->second.stale) {
+			_layoutRemoved.fire(i->second.item.get());
+			i = _layouts.erase(i);
+		} else {
+			++i;
+		}
+	}
+}
+
+rpl::producer<not_null<BaseLayout*>> MusicProvider::layoutRemoved() {
+	return _layoutRemoved.events();
+}
+
+BaseLayout *MusicProvider::lookupLayout(const HistoryItem *item) {
+	return nullptr;
+}
+
+bool MusicProvider::isMyItem(not_null<const HistoryItem*> item) {
+	return item->isSavedMusicItem() && (item->history()->peer == _peer);
+}
+
+bool MusicProvider::isAfter(
+		not_null<const HistoryItem*> a,
+		not_null<const HistoryItem*> b) {
+	return (a->id < b->id);
+}
+
+BaseLayout *MusicProvider::getLayout(
+		not_null<HistoryItem*> item,
+		not_null<Overview::Layout::Delegate*> delegate) {
+	auto it = _layouts.find(item);
+	if (it == _layouts.end()) {
+		if (auto layout = createLayout(item, delegate)) {
+			layout->initDimensions();
+			it = _layouts.emplace(item, std::move(layout)).first;
+		} else {
+			return nullptr;
+		}
+	}
+	it->second.stale = false;
+	return it->second.item.get();
+}
+
+std::unique_ptr<BaseLayout> MusicProvider::createLayout(
+		not_null<HistoryItem*> item,
+		not_null<Overview::Layout::Delegate*> delegate) {
+	using namespace Overview::Layout;
+	if (const auto media = item->media()) {
+		if (const auto file = media->document()) {
+			return std::make_unique<Document>(
+				delegate,
+				item,
+				DocumentFields{ file },
+				st::overviewFileLayout);
+		}
+	}
+	return nullptr;
+}
+
+ListItemSelectionData MusicProvider::computeSelectionData(
+		not_null<const HistoryItem*> item,
+		TextSelection selection) {
+	auto result = ListItemSelectionData(selection);
+	result.canDelete = item->history()->peer->isSelf();
+	result.canForward = true;// item->allowsForward();
+	return result;
+}
+
+void MusicProvider::applyDragSelection(
+		ListSelectedMap &selected,
+		not_null<const HistoryItem*> fromItem,
+		bool skipFrom,
+		not_null<const HistoryItem*> tillItem,
+		bool skipTill) {
+	const auto fromId = fromItem->id - (skipFrom ? 1 : 0);
+	const auto tillId = tillItem->id - (skipTill ? 0 : 1);
+	for (auto i = selected.begin(); i != selected.end();) {
+		const auto itemId = i->first->id;
+		if (itemId > fromId || itemId <= tillId) {
+			i = selected.erase(i);
+		} else {
+			++i;
+		}
+	}
+	for (auto &layoutItem : _layouts) {
+		const auto item = layoutItem.first;
+		if (item->id <= fromId && item->id > tillId) {
+			ChangeItemSelection(
+				selected,
+				item,
+				computeSelectionData(item, FullSelection));
+		}
+	}
+}
+
+bool MusicProvider::allowSaveFileAs(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) {
+	return true;
+}
+
+QString MusicProvider::showInFolderPath(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) {
+	return document->filepath(true);
+}
+
+int64 MusicProvider::scrollTopStatePosition(not_null<HistoryItem*> item) {
+	return item->id.bare;
+}
+
+HistoryItem *MusicProvider::scrollTopStateItem(ListScrollTopState state) {
+	if (state.item && _slice.indexOf(state.item)) {
+		return state.item;
+	//} else if (const auto id = _slice.nearest(state.position)) {
+	//	const auto full = FullMsgId(_peer->id, StoryIdToMsgId(*id));
+	//	if (const auto item = _controller->session().data().message(full)) {
+	//		return item;
+	//	}
+	}
+
+	auto nearestId = (HistoryItem*)nullptr; //AssertIsDebug();
+	//for (auto i = 0; i != _slice.size(); ++i) {
+	//	if (!nearestId
+	//		|| std::abs(*nearestId - state.position)
+	//			> std::abs(_slice[i] - state.position)) {
+	//		nearestId = _slice[i];
+	//	}
+	//}
+	if (nearestId) {
+		const auto full = nearestId->fullId();
+		if (const auto item = _controller->session().data().message(full)) {
+			return item;
+		}
+	}
+
+	return state.item;
+}
+
+void MusicProvider::saveState(
+		not_null<Media::Memento*> memento,
+		ListScrollTopState scrollState) {
+	if (_aroundId != nullptr && scrollState.item) {
+		//AssertIsDebug();
+		//memento->setAroundId({ _peer->id, StoryIdToMsgId(_aroundId) });
+		//memento->setIdsLimit(_idsLimit);
+		//memento->setScrollTopItem(scrollState.item->globalId());
+		//memento->setScrollTopItemPosition(scrollState.position);
+		//memento->setScrollTopShift(scrollState.shift);
+	}
+}
+
+void MusicProvider::restoreState(
+		not_null<Media::Memento*> memento,
+		Fn<void(ListScrollTopState)> restoreScrollState) {
+	if (const auto limit = memento->idsLimit()) {
+		const auto wasAroundId = memento->aroundId();
+		if (wasAroundId.peer == _peer->id) {
+			_idsLimit = limit;
+			//AssertIsDebug();
+			//_aroundId = StoryIdFromMsgId(wasAroundId.msg);
+			restoreScrollState({
+				.position = memento->scrollTopItemPosition(),
+				.item = MessageByGlobalId(memento->scrollTopItem()),
+				.shift = memento->scrollTopShift(),
+			});
+			refreshViewer();
+		}
+	}
+}
+
+} // namespace Info::Saved
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_provider.h b/Telegram/SourceFiles/info/saved/info_saved_music_provider.h
new file mode 100644
index 00000000000000..630401bd24282b
--- /dev/null
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_provider.h
@@ -0,0 +1,131 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/weak_ptr.h"
+#include "data/data_saved_music.h"
+#include "info/media/info_media_common.h"
+#include "info/saved/info_saved_music_common.h"
+#include "history/history_item.h"
+
+class DocumentData;
+class HistoryItem;
+class PeerData;
+class History;
+
+namespace Info {
+class AbstractController;
+} // namespace Info
+
+namespace Info::Saved {
+
+class MusicProvider final
+	: public Media::ListProvider
+	, private Media::ListSectionDelegate
+	, public base::has_weak_ptr {
+public:
+	explicit MusicProvider(not_null<AbstractController*> controller);
+	~MusicProvider();
+
+	Media::Type type() override;
+	bool hasSelectRestriction() override;
+	rpl::producer<bool> hasSelectRestrictionChanges() override;
+	bool isPossiblyMyItem(not_null<const HistoryItem*> item) override;
+
+	std::optional<int> fullCount() override;
+
+	void restart() override;
+	void checkPreload(
+		QSize viewport,
+		not_null<Media::BaseLayout*> topLayout,
+		not_null<Media::BaseLayout*> bottomLayout,
+		bool preloadTop,
+		bool preloadBottom) override;
+	void refreshViewer() override;
+	rpl::producer<> refreshed() override;
+
+	void setSearchQuery(QString query) override;
+	void jumpToMessage(MsgId, Fn<void(FullMsgId)> done) override;
+
+	std::vector<Media::ListSection> fillSections(
+		not_null<Overview::Layout::Delegate*> delegate) override;
+	rpl::producer<not_null<Media::BaseLayout*>> layoutRemoved() override;
+	Media::BaseLayout *lookupLayout(const HistoryItem *item) override;
+	bool isMyItem(not_null<const HistoryItem*> item) override;
+	bool isAfter(
+		not_null<const HistoryItem*> a,
+		not_null<const HistoryItem*> b) override;
+
+	Media::ListItemSelectionData computeSelectionData(
+		not_null<const HistoryItem*> item,
+		TextSelection selection) override;
+	void applyDragSelection(
+		Media::ListSelectedMap &selected,
+		not_null<const HistoryItem*> fromItem,
+		bool skipFrom,
+		not_null<const HistoryItem*> tillItem,
+		bool skipTill) override;
+
+	bool allowSaveFileAs(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) override;
+	QString showInFolderPath(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) override;
+
+	int64 scrollTopStatePosition(not_null<HistoryItem*> item) override;
+	HistoryItem *scrollTopStateItem(
+		Media::ListScrollTopState state) override;
+	void saveState(
+		not_null<Media::Memento*> memento,
+		Media::ListScrollTopState scrollState) override;
+	void restoreState(
+		not_null<Media::Memento*> memento,
+		Fn<void(Media::ListScrollTopState)> restoreScrollState) override;
+
+private:
+	static constexpr auto kMinimalIdsLimit = 16;
+
+	bool sectionHasFloatingHeader() override;
+	QString sectionTitle(not_null<const Media::BaseLayout*> item) override;
+	bool sectionItemBelongsHere(
+		not_null<const Media::BaseLayout*> item,
+		not_null<const Media::BaseLayout*> previous) override;
+
+	void itemRemoved(not_null<const HistoryItem*> item);
+	void markLayoutsStale();
+	void clearStaleLayouts();
+	void clear();
+
+	[[nodiscard]] Media::BaseLayout *getLayout(
+		not_null<HistoryItem*> item,
+		not_null<Overview::Layout::Delegate*> delegate);
+	[[nodiscard]] std::unique_ptr<Media::BaseLayout> createLayout(
+		not_null<HistoryItem*> item,
+		not_null<Overview::Layout::Delegate*> delegate);
+
+	const not_null<AbstractController*> _controller;
+	const not_null<PeerData*> _peer;
+	const not_null<History*> _history;
+
+	HistoryItem *_aroundId = nullptr;
+	int _idsLimit = kMinimalIdsLimit;
+	Data::SavedMusicSlice _slice;
+
+	std::unordered_map<
+		not_null<const HistoryItem*>,
+		Media::CachedItem> _layouts;
+	rpl::event_stream<not_null<Media::BaseLayout*>> _layoutRemoved;
+	rpl::event_stream<> _refreshed;
+
+	rpl::lifetime _lifetime;
+	rpl::lifetime _viewerLifetime;
+
+};
+
+} // namespace Info::Saved
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
new file mode 100644
index 00000000000000..e1bc6d4a1ed43d
--- /dev/null
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
@@ -0,0 +1,354 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/saved/info_saved_music_widget.h"
+
+#include "data/data_document.h"
+#include "data/data_peer.h"
+#include "data/data_saved_music.h"
+#include "data/data_session.h"
+#include "info/media/info_media_list_widget.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "main/main_session.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "lang/lang_keys.h"
+#include "ui/ui_utility.h"
+#include "styles/style_credits.h" // giftListAbout
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+
+namespace Info::Saved {
+
+class MusicInner final : public Ui::RpWidget {
+public:
+	MusicInner(QWidget *parent, not_null<Controller*> controller);
+	~MusicInner();
+
+	bool showInternal(not_null<MusicMemento*> memento);
+	void setIsStackBottom(bool isStackBottom) {
+		_isStackBottom = isStackBottom;
+	}
+
+	void saveState(not_null<MusicMemento*> memento);
+	void restoreState(not_null<MusicMemento*> memento);
+
+	void setScrollHeightValue(rpl::producer<int> value);
+
+	rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
+	rpl::producer<SelectedItems> selectedListValue() const;
+	void selectionAction(SelectionAction action);
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+	void visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) override;
+
+private:
+	int recountHeight();
+	void refreshHeight();
+	void refreshEmpty();
+
+	void setupList();
+	void setupEmpty();
+
+	const not_null<Controller*> _controller;
+	const not_null<PeerData*> _peer;
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
+	object_ptr<Media::ListWidget> _list = { nullptr };
+	object_ptr<Ui::RpWidget> _empty = { nullptr };
+	int _lastNonLoadingHeight = 0;
+	bool _emptyLoading = false;
+
+	bool _inResize = false;
+	bool _isStackBottom = false;
+
+	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
+	rpl::event_stream<rpl::producer<SelectedItems>> _selectedLists;
+	rpl::event_stream<rpl::producer<int>> _listTops;
+	rpl::variable<int> _topHeight;
+	rpl::variable<bool> _albumEmpty;
+
+};
+
+MusicInner::MusicInner(QWidget *parent, not_null<Controller*> controller)
+: RpWidget(parent)
+, _controller(controller)
+, _peer(controller->key().musicPeer()) {
+	setupList();
+	setupEmpty();
+}
+
+MusicInner::~MusicInner() = default;
+
+void MusicInner::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	setChildVisibleTopBottom(_list, visibleTop, visibleBottom);
+}
+
+bool MusicInner::showInternal(not_null<MusicMemento*> memento) {
+	if (memento->section().type() == Section::Type::SavedMusic) {
+		restoreState(memento);
+		return true;
+	}
+	return false;
+}
+
+void MusicInner::setupList() {
+	Expects(!_list);
+
+	_list = object_ptr<Media::ListWidget>(this, _controller);
+	if (_peer->isSelf()) {
+		_list->setReorderDescriptor({
+			.save = [=](
+					int oldPosition,
+					int newPosition,
+					Fn<void()> done,
+					Fn<void()> fail) {
+				_controller->session().data().savedMusic().reorder(
+					oldPosition,
+					newPosition);
+				done();
+			}
+		});
+	}
+	const auto raw = _list.data();
+
+	using namespace rpl::mappers;
+	raw->scrollToRequests(
+	) | rpl::map([=](int to) {
+		return Ui::ScrollToRequest {
+			raw->y() + to,
+			-1
+		};
+	}) | rpl::start_to_stream(_scrollToRequests, raw->lifetime());
+	_selectedLists.fire(raw->selectedListValue());
+	_listTops.fire(raw->topValue());
+
+	raw->show();
+}
+
+void MusicInner::setupEmpty() {
+	_list->resizeToWidth(width());
+
+	const auto savedMusic = &_controller->session().data().savedMusic();
+	rpl::combine(
+		rpl::single(
+			rpl::empty
+		) | rpl::then(
+			savedMusic->changed() | rpl::filter(
+				rpl::mappers::_1 == _peer->id
+			) | rpl::to_empty
+		),
+		_list->heightValue()
+	) | rpl::on_next([=](auto, int listHeight) {
+		const auto padding = st::infoMediaMargin;
+		if (const auto raw = _empty.release()) {
+			raw->hide();
+			raw->deleteLater();
+		}
+		_emptyLoading = false;
+		if (listHeight <= padding.bottom() + padding.top()) {
+			refreshEmpty();
+		} else {
+			_albumEmpty = false;
+		}
+		refreshHeight();
+	}, _list->lifetime());
+}
+
+void MusicInner::refreshEmpty() {
+	const auto savedMusic = &_controller->session().data().savedMusic();
+	const auto knownEmpty = savedMusic->countKnown(_peer->id);
+	_empty = object_ptr<Ui::FlatLabel>(
+		this,
+		(!knownEmpty
+			? tr::lng_contacts_loading(tr::marked)
+			: rpl::single(
+				tr::lng_media_song_empty(tr::now, tr::marked))),
+		st::giftListAbout);
+	_empty->show();
+	_emptyLoading = !knownEmpty;
+	resizeToWidth(width());
+}
+
+void MusicInner::saveState(not_null<MusicMemento*> memento) {
+	_list->saveState(&memento->media());
+}
+
+void MusicInner::restoreState(not_null<MusicMemento*> memento) {
+	_list->restoreState(&memento->media());
+}
+
+rpl::producer<SelectedItems> MusicInner::selectedListValue() const {
+	return _selectedLists.events_starting_with(
+		_list->selectedListValue()
+	) | rpl::flatten_latest();
+}
+
+void MusicInner::selectionAction(SelectionAction action) {
+	_list->selectionAction(action);
+}
+
+int MusicInner::resizeGetHeight(int newWidth) {
+	if (!newWidth) {
+		return 0;
+	}
+	_inResize = true;
+	auto guard = gsl::finally([this] { _inResize = false; });
+
+	if (_list) {
+		_list->resizeToWidth(newWidth);
+	}
+	if (const auto empty = _empty.get()) {
+		const auto margin = st::giftListAboutMargin;
+		empty->resizeToWidth(newWidth - margin.left() - margin.right());
+	}
+
+	return recountHeight();
+}
+
+void MusicInner::refreshHeight() {
+	if (_inResize) {
+		return;
+	}
+	resize(width(), recountHeight());
+}
+
+int MusicInner::recountHeight() {
+	auto top = 0;
+	auto listHeight = 0;
+	if (_list) {
+		_list->moveToLeft(0, top);
+		listHeight = _list->heightNoMargins();
+		top += listHeight;
+	}
+	if (const auto empty = _empty.get()) {
+		const auto margin = st::giftListAboutMargin;
+		empty->moveToLeft(margin.left(), top + margin.top());
+		top += margin.top() + empty->height() + margin.bottom();
+	}
+	if (_emptyLoading) {
+		top = std::max(top, _lastNonLoadingHeight);
+	} else {
+		_lastNonLoadingHeight = top;
+	}
+	return top;
+}
+
+void MusicInner::setScrollHeightValue(rpl::producer<int> value) {
+}
+
+rpl::producer<Ui::ScrollToRequest> MusicInner::scrollToRequests() const {
+	return _scrollToRequests.events();
+}
+
+MusicMemento::MusicMemento(not_null<Controller*> controller)
+: ContentMemento(MusicTag{ controller->musicPeer() })
+, _media(controller) {
+}
+
+MusicMemento::MusicMemento(not_null<PeerData*> peer)
+: ContentMemento(MusicTag{ peer })
+, _media(peer, 0, Media::Type::MusicFile) {
+}
+
+MusicMemento::~MusicMemento() = default;
+
+Section MusicMemento::section() const {
+	return Section(Section::Type::SavedMusic);
+}
+
+object_ptr<ContentWidget> MusicMemento::createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) {
+	auto result = object_ptr<MusicWidget>(parent, controller);
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+MusicWidget::MusicWidget(
+	QWidget *parent,
+	not_null<Controller*> controller)
+: ContentWidget(parent, controller) {
+	_inner = setInnerWidget(object_ptr<MusicInner>(this, controller));
+	_inner->setScrollHeightValue(scrollHeightValue());
+	_inner->scrollToRequests(
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
+		scrollTo(request);
+	}, _inner->lifetime());
+}
+
+void MusicWidget::setIsStackBottom(bool isStackBottom) {
+	ContentWidget::setIsStackBottom(isStackBottom);
+	_inner->setIsStackBottom(isStackBottom);
+}
+
+bool MusicWidget::showInternal(not_null<ContentMemento*> memento) {
+	if (!controller()->validateMementoPeer(memento)) {
+		return false;
+	}
+	return true;
+}
+
+void MusicWidget::setInternalState(
+		const QRect &geometry,
+		not_null<MusicMemento*> memento) {
+		setGeometry(geometry);
+	Ui::SendPendingMoveResizeEvents(this);
+	restoreState(memento);
+}
+
+std::shared_ptr<ContentMemento> MusicWidget::doCreateMemento() {
+	auto result = std::make_shared<MusicMemento>(controller());
+	saveState(result.get());
+	return result;
+}
+
+void MusicWidget::saveState(not_null<MusicMemento*> memento) {
+	memento->setScrollTop(scrollTopSave());
+	_inner->saveState(memento);
+}
+
+void MusicWidget::restoreState(not_null<MusicMemento*> memento) {
+	_inner->restoreState(memento);
+	scrollTopRestore(memento->scrollTop());
+}
+
+rpl::producer<SelectedItems> MusicWidget::selectedListValue() const {
+	return _inner->selectedListValue();
+}
+
+void MusicWidget::selectionAction(SelectionAction action) {
+	_inner->selectionAction(action);
+}
+
+rpl::producer<QString> MusicWidget::title() {
+	return controller()->key().musicPeer()->isSelf()
+		? tr::lng_media_saved_music_your()
+		: tr::lng_media_saved_music_title();
+}
+
+std::shared_ptr<Info::Memento> MakeMusic(not_null<PeerData*> peer) {
+	return std::make_shared<Info::Memento>(
+		std::vector<std::shared_ptr<ContentMemento>>(
+			1,
+			std::make_shared<MusicMemento>(peer)));
+}
+
+} // namespace Info::Saved
+
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_widget.h b/Telegram/SourceFiles/info/saved/info_saved_music_widget.h
new file mode 100644
index 00000000000000..cc29577c46f32f
--- /dev/null
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_widget.h
@@ -0,0 +1,79 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "info/info_content_widget.h"
+#include "info/media/info_media_widget.h"
+#include "info/stories/info_stories_common.h"
+
+namespace Ui {
+template <typename Widget>
+class SlideWrap;
+} // namespace Ui
+
+namespace Info::Saved {
+
+class MusicInner;
+
+class MusicMemento final : public ContentMemento {
+public:
+	MusicMemento(not_null<Controller*> controller);
+	MusicMemento(not_null<PeerData*> peer);
+	~MusicMemento();
+
+	object_ptr<ContentWidget> createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) override;
+
+	Section section() const override;
+
+	[[nodiscard]] Media::Memento &media() {
+		return _media;
+	}
+	[[nodiscard]] const Media::Memento &media() const {
+		return _media;
+	}
+
+private:
+	Media::Memento _media;
+
+};
+
+class MusicWidget final : public ContentWidget {
+public:
+	MusicWidget(QWidget *parent, not_null<Controller*> controller);
+
+	void setIsStackBottom(bool isStackBottom) override;
+
+	bool showInternal(
+		not_null<ContentMemento*> memento) override;
+
+	void setInternalState(
+		const QRect &geometry,
+		not_null<MusicMemento*> memento);
+
+	rpl::producer<SelectedItems> selectedListValue() const override;
+	void selectionAction(SelectionAction action) override;
+
+	rpl::producer<QString> title() override;
+
+private:
+	void saveState(not_null<MusicMemento*> memento);
+	void restoreState(not_null<MusicMemento*> memento);
+
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
+
+	MusicInner *_inner = nullptr;
+
+};
+
+[[nodiscard]] std::shared_ptr<Info::Memento> MakeMusic(
+	not_null<PeerData*> peer);
+
+} // namespace Info::Saved
diff --git a/Telegram/SourceFiles/info/saved/info_saved_sublists_widget.cpp b/Telegram/SourceFiles/info/saved/info_saved_sublists_widget.cpp
index 3a3ff46ad8df93..46038bf06098e9 100644
--- a/Telegram/SourceFiles/info/saved/info_saved_sublists_widget.cpp
+++ b/Telegram/SourceFiles/info/saved/info_saved_sublists_widget.cpp
@@ -8,10 +8,11 @@ For license and copyright information please follow this link:
 #include "info/saved/info_saved_sublists_widget.h"
 //
 #include "data/data_saved_messages.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "dialogs/dialogs_inner_widget.h"
-#include "history/view/history_view_sublist_section.h"
+#include "history/view/history_view_chat_section.h"
 #include "info/media/info_media_buttons.h"
 #include "info/profile/info_profile_icon.h"
 #include "info/info_controller.h"
@@ -19,6 +20,7 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "lang/lang_keys.h"
 #include "ui/widgets/box_content_divider.h"
+#include "ui/widgets/buttons.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/ui_utility.h"
@@ -27,7 +29,7 @@ For license and copyright information please follow this link:
 namespace Info::Saved {
 
 SublistsMemento::SublistsMemento(not_null<Main::Session*> session)
-: ContentMemento(session->user(), nullptr, PeerId()) {
+: ContentMemento(session->user(), nullptr, nullptr, PeerId()) {
 }
 
 Section SublistsMemento::section() const {
@@ -59,19 +61,23 @@ SublistsWidget::SublistsWidget(
 	_list->showSavedSublists();
 	_list->setNarrowRatio(0.);
 
-	_list->chosenRow() | rpl::start_with_next([=](Dialogs::ChosenRow row) {
+	_list->chosenRow() | rpl::on_next([=](Dialogs::ChosenRow row) {
 		if (const auto sublist = row.key.sublist()) {
 			using namespace Window;
+			using namespace HistoryView;
 			auto params = SectionShow(SectionShow::Way::Forward);
 			params.dropSameFromStack = true;
 			controller->showSection(
-				std::make_shared<HistoryView::SublistMemento>(sublist),
+				std::make_shared<ChatMemento>(ChatViewId{
+					.history = sublist->owningHistory(),
+					.sublist = sublist,
+				}),
 				params);
 		}
 	}, _list->lifetime());
 
 	const auto saved = &controller->session().data().savedMessages();
-	_list->heightValue() | rpl::start_with_next([=] {
+	_list->heightValue() | rpl::on_next([=] {
 		if (!saved->supported()) {
 			crl::on_main(controller, [=] {
 				controller->showSection(
@@ -107,6 +113,7 @@ void SublistsWidget::setupOtherTypes() {
 			controller(),
 			peer,
 			MsgId(), // topicRootId
+			PeerId(), // monoforumPeerId
 			nullptr, // migrated
 			buttonType,
 			tracker);
@@ -121,6 +128,7 @@ void SublistsWidget::setupOtherTypes() {
 	addMediaButton(Type::File, st::infoIconMediaFile);
 	addMediaButton(Type::MusicFile, st::infoIconMediaAudio);
 	addMediaButton(Type::Link, st::infoIconMediaLink);
+	addMediaButton(Type::Poll, st::infoIconMediaPoll);
 	addMediaButton(Type::RoundVoiceFile, st::infoIconMediaVoice);
 	addMediaButton(Type::GIF, st::infoIconMediaGif);
 
diff --git a/Telegram/SourceFiles/info/settings/info_settings_widget.cpp b/Telegram/SourceFiles/info/settings/info_settings_widget.cpp
index bbc0ca7178596d..fc5689aede8a7f 100644
--- a/Telegram/SourceFiles/info/settings/info_settings_widget.cpp
+++ b/Telegram/SourceFiles/info/settings/info_settings_widget.cpp
@@ -8,8 +8,10 @@ For license and copyright information please follow this link:
 #include "info/settings/info_settings_widget.h"
 
 #include "info/info_memento.h"
-#include "settings/settings_main.h"
-#include "settings/settings_information.h"
+#include "settings/sections/settings_main.h"
+#include "settings/sections/settings_information.h"
+#include "settings/settings_common_session.h"
+#include "menu/menu_send.h"
 #include "ui/ui_utility.h"
 
 namespace Info {
@@ -43,62 +45,38 @@ Widget::Widget(
 : ContentWidget(parent, controller)
 , _self(controller->key().settingsSelf())
 , _type(controller->section().settingsType())
-, _inner([&] {
-	auto inner = _type->create(
-		this,
-		controller->parentController(),
-		scroll(),
-		controller->wrapValue(
-		) | rpl::map([](Wrap wrap) { return (wrap == Wrap::Layer)
-			? ::Settings::Container::Layer
-			: ::Settings::Container::Section; }));
-	if (inner->hasFlexibleTopBar()) {
-		auto filler = setInnerWidget(object_ptr<Ui::RpWidget>(this));
-		filler->resize(1, 1);
-
-		_flexibleScroll.contentHeightValue.events(
-		) | rpl::start_with_next([=](int h) {
-			filler->resize(filler->width(), h);
-		}, filler->lifetime());
-
-		filler->widthValue(
-		) | rpl::start_to_stream(
-			_flexibleScroll.fillerWidthValue,
-			lifetime());
-
-		controller->stepDataReference() = SectionCustomTopBarData{
-			.backButtonEnables = _flexibleScroll.backButtonEnables.events(),
-			.wrapValue = controller->wrapValue(),
-		};
-
-		// ScrollArea -> PaddingWrap -> RpWidget.
-		inner->setParent(filler->parentWidget()->parentWidget());
-		inner->raise();
-
-		using InnerPtr = base::unique_qptr<::Settings::AbstractSection>;
-		auto owner = filler->lifetime().make_state<InnerPtr>(
-			std::move(inner.release()));
-		return owner->get();
-	} else {
-		return setInnerWidget(std::move(inner));
-	}
-}())
+, _inner(setupFlexibleInnerWidget(
+		_type->create(
+			this,
+			controller->parentController(),
+			scroll(),
+			controller->wrapValue(
+			) | rpl::map([](Wrap wrap) { return (wrap == Wrap::Layer)
+				? ::Settings::Container::Layer
+				: ::Settings::Container::Section; })),
+		_flexibleScroll,
+		[=](Ui::RpWidget*) {
+			controller->stepDataReference() = SectionCustomTopBarData{
+				.backButtonEnables = _flexibleScroll.backButtonEnables.events(),
+				.wrapValue = controller->wrapValue(),
+			};
+		}))
 , _pinnedToTop(_inner->createPinnedToTop(this))
 , _pinnedToBottom(_inner->createPinnedToBottom(this)) {
 	_inner->sectionShowOther(
-	) | rpl::start_with_next([=](Type type) {
+	) | rpl::on_next([=](Type type) {
 		controller->showSettings(type);
 	}, _inner->lifetime());
 
 	_inner->sectionShowBack(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		controller->showBackFromStack();
 	}, _inner->lifetime());
 
 	_inner->setStepDataReference(controller->stepDataReference());
 
 	_removesFromStack.events(
-	) | rpl::start_with_next([=](const std::vector<Type> &types) {
+	) | rpl::on_next([=](const std::vector<Type> &types) {
 		const auto sections = ranges::views::all(
 			types
 		) | ranges::views::transform([](Type type) {
@@ -109,13 +87,13 @@ Widget::Widget(
 
 	if (_pinnedToTop) {
 		_inner->widthValue(
-		) | rpl::start_with_next([=](int w) {
+		) | rpl::on_next([=](int w) {
 			_pinnedToTop->resizeToWidth(w);
 			setScrollTopSkip(_pinnedToTop->height());
 		}, _pinnedToTop->lifetime());
 
 		_pinnedToTop->heightValue(
-		) | rpl::start_with_next([=](int h) {
+		) | rpl::on_next([=](int h) {
 			setScrollTopSkip(h);
 		}, _pinnedToTop->lifetime());
 	}
@@ -129,7 +107,7 @@ Widget::Widget(
 		};
 
 		_inner->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			_pinnedToBottom->resizeToWidth(s.width());
 			//processHeight();
 		}, _pinnedToBottom->lifetime());
@@ -137,7 +115,7 @@ Widget::Widget(
 		rpl::combine(
 			_pinnedToBottom->heightValue(),
 			heightValue()
-		) | rpl::start_with_next(processHeight, _pinnedToBottom->lifetime());
+		) | rpl::on_next(processHeight, _pinnedToBottom->lifetime());
 	}
 
 	if (_pinnedToTop
@@ -151,12 +129,12 @@ Widget::Widget(
 		rpl::combine(
 			_pinnedToTop->heightValue(),
 			_inner->heightValue()
-		) | rpl::start_with_next([=](int, int h) {
+		) | rpl::on_next([=](int, int h) {
 			_flexibleScroll.contentHeightValue.fire(h + heightDiff());
 		}, _pinnedToTop->lifetime());
 
 		scrollTopValue(
-		) | rpl::start_with_next([=](int top) {
+		) | rpl::on_next([=](int top) {
 			if (!_pinnedToTop) {
 				return;
 			}
@@ -168,7 +146,7 @@ Widget::Widget(
 		}, _inner->lifetime());
 
 		_flexibleScroll.fillerWidthValue.events(
-		) | rpl::start_with_next([=](int w) {
+		) | rpl::on_next([=](int w) {
 			_inner->resizeToWidth(w);
 		}, _inner->lifetime());
 
@@ -210,6 +188,14 @@ void Widget::saveChanges(FnMut<void()> done) {
 	_inner->sectionSaveChanges(std::move(done));
 }
 
+SendMenu::Details Widget::sendMenuDetails() const {
+	return _inner->sendMenuDetails();
+}
+
+bool Widget::processChosenSticker(ChatHelpers::FileChosen &&chosen) {
+	return _inner->processChosenSticker(std::move(chosen));
+}
+
 void Widget::showFinished() {
 	_inner->showFinished();
 
@@ -226,8 +212,8 @@ const Ui::RoundRect *Widget::bottomSkipRounding() const {
 }
 
 rpl::producer<bool> Widget::desiredShadowVisibility() const {
-	return (_type == ::Settings::Main::Id()
-		|| _type == ::Settings::Information::Id())
+	return (_type == ::Settings::MainId()
+		|| _type == ::Settings::InformationId())
 		? ContentWidget::desiredShadowVisibility()
 		: rpl::single(true);
 }
@@ -240,6 +226,12 @@ void Widget::checkBeforeClose(Fn<void()> close) {
 	_inner->checkBeforeClose(std::move(close));
 }
 
+void Widget::checkBeforeCloseByEscape(Fn<void()> close) {
+	ContentWidget::checkBeforeCloseByEscape([&] {
+		_inner->checkBeforeClose(std::move(close));
+	});
+}
+
 rpl::producer<QString> Widget::title() {
 	return _inner->title();
 }
@@ -274,9 +266,13 @@ void Widget::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
 
 void Widget::saveState(not_null<Memento*> memento) {
 	memento->setScrollTop(scrollTopSave());
+	auto sectionState = std::any();
+	_inner->sectionSaveState(sectionState);
+	memento->setSectionState(std::move(sectionState));
 }
 
 void Widget::restoreState(not_null<Memento*> memento) {
+	_inner->sectionRestoreState(memento->sectionState());
 	scrollTopRestore(memento->scrollTop());
 }
 
diff --git a/Telegram/SourceFiles/info/settings/info_settings_widget.h b/Telegram/SourceFiles/info/settings/info_settings_widget.h
index 23b4e7c930e912..0acbf6acd184d7 100644
--- a/Telegram/SourceFiles/info/settings/info_settings_widget.h
+++ b/Telegram/SourceFiles/info/settings/info_settings_widget.h
@@ -9,6 +9,9 @@ For license and copyright information please follow this link:
 
 #include "info/info_content_widget.h"
 #include "info/info_controller.h"
+#include "info/info_flexible_scroll.h"
+
+#include <any>
 
 namespace Settings {
 class AbstractSection;
@@ -47,8 +50,16 @@ class Memento final : public ContentMemento {
 
 	~Memento();
 
+	void setSectionState(std::any state) {
+		_sectionState = std::move(state);
+	}
+	[[nodiscard]] const std::any &sectionState() const {
+		return _sectionState;
+	}
+
 private:
 	Type _type = Type();
+	std::any _sectionState;
 
 };
 
@@ -69,6 +80,8 @@ class Widget final : public ContentWidget {
 		not_null<Memento*> memento);
 
 	void saveChanges(FnMut<void()> done) override;
+	[[nodiscard]] SendMenu::Details sendMenuDetails() const override;
+	bool processChosenSticker(ChatHelpers::FileChosen &&chosen) override;
 
 	void showFinished() override;
 	void setInnerFocus() override;
@@ -78,6 +91,7 @@ class Widget final : public ContentWidget {
 
 	bool closeByOutsideClick() const override;
 	void checkBeforeClose(Fn<void()> close) override;
+	void checkBeforeCloseByEscape(Fn<void()> close) override;
 	rpl::producer<QString> title() override;
 
 	void enableBackButton() override;
@@ -97,14 +111,10 @@ class Widget final : public ContentWidget {
 	not_null<UserData*> _self;
 	Type _type = Type();
 
-	struct {
-		rpl::event_stream<int> contentHeightValue;
-		rpl::event_stream<int> fillerWidthValue;
-		rpl::event_stream<> backButtonEnables;
-	} _flexibleScroll;
+	FlexibleScrollData _flexibleScroll;
 	not_null<::Settings::AbstractSection*> _inner;
-	QPointer<Ui::RpWidget> _pinnedToTop;
-	QPointer<Ui::RpWidget> _pinnedToBottom;
+	base::weak_qptr<Ui::RpWidget> _pinnedToTop;
+	base::weak_qptr<Ui::RpWidget> _pinnedToBottom;
 
 	rpl::event_stream<std::vector<Type>> _removesFromStack;
 
diff --git a/Telegram/SourceFiles/info/similar_channels/info_similar_channels_widget.cpp b/Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.cpp
similarity index 82%
rename from Telegram/SourceFiles/info/similar_channels/info_similar_channels_widget.cpp
rename to Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.cpp
index ae77ec2e295b2e..ad7d45248c9342 100644
--- a/Telegram/SourceFiles/info/similar_channels/info_similar_channels_widget.cpp
+++ b/Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.cpp
@@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "info/similar_channels/info_similar_channels_widget.h"
+#include "info/similar_peers/info_similar_peers_widget.h"
 
 #include "api/api_chat_participants.h"
 #include "apiwrap.h"
@@ -14,6 +14,7 @@ For license and copyright information please follow this link:
 #include "data/data_peer_values.h"
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
+#include "data/data_user.h"
 #include "info/info_controller.h"
 #include "main/main_session.h"
 #include "ui/text/text_utilities.h"
@@ -22,19 +23,19 @@ For license and copyright information please follow this link:
 #include "ui/widgets/tooltip.h"
 #include "ui/ui_utility.h"
 #include "lang/lang_keys.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "window/window_session_controller.h"
 #include "styles/style_info.h"
 #include "styles/style_widgets.h"
 
-namespace Info::SimilarChannels {
+namespace Info::SimilarPeers {
 namespace {
 
 class ListController final : public PeerListController {
 public:
 	ListController(
 		not_null<Controller*> controller,
-		not_null<ChannelData*> channel);
+		not_null<PeerData*> peer);
 
 	Main::Session &session() const override;
 	void prepare() override;
@@ -60,7 +61,7 @@ class ListController final : public PeerListController {
 	struct SavedState : SavedStateBase {
 	};
 	const not_null<Controller*> _controller;
-	const not_null<ChannelData*> _channel;
+	const not_null<PeerData*> _peer;
 	Ui::RpWidget *_content = nullptr;
 	Ui::RpWidget *_unlock = nullptr;
 	rpl::variable<int> _unlockHeight;
@@ -69,14 +70,14 @@ class ListController final : public PeerListController {
 
 ListController::ListController(
 	not_null<Controller*> controller,
-	not_null<ChannelData*> channel)
+	not_null<PeerData*> peer)
 : PeerListController()
 , _controller(controller)
-, _channel(channel) {
+, _peer(peer) {
 }
 
 Main::Session &ListController::session() const {
-	return _channel->session();
+	return _peer->session();
 }
 
 std::unique_ptr<PeerListRow> ListController::createRow(
@@ -95,21 +96,23 @@ std::unique_ptr<PeerListRow> ListController::createRow(
 }
 
 void ListController::prepare() {
-	delegate()->peerListSetTitle(tr::lng_similar_channels_title());
+	delegate()->peerListSetTitle(_peer->isBroadcast()
+		? tr::lng_similar_channels_title()
+		: tr::lng_similar_bots_title());
 
-	const auto participants = &_channel->session().api().chatParticipants();
+	const auto participants = &_peer->session().api().chatParticipants();
 
 	Data::AmPremiumValue(
-		&_channel->session()
-	) | rpl::start_with_next([=] {
-		participants->loadSimilarChannels(_channel);
+		&_peer->session()
+	) | rpl::on_next([=] {
+		participants->loadSimilarPeers(_peer);
 		rebuild();
 	}, lifetime());
 
 	participants->similarLoaded(
 	) | rpl::filter(
-		rpl::mappers::_1 == _channel
-	) | rpl::start_with_next([=] {
+		rpl::mappers::_1 == _peer
+	) | rpl::on_next([=] {
 		rebuild();
 	}, lifetime());
 }
@@ -123,16 +126,16 @@ rpl::producer<int> ListController::unlockHeightValue() const {
 }
 
 void ListController::rebuild() {
-	const auto participants = &_channel->session().api().chatParticipants();
-	const auto &list = participants->similar(_channel);
-	for (const auto channel : list.list) {
-		if (!delegate()->peerListFindRow(channel->id.value)) {
-			delegate()->peerListAppendRow(createRow(channel));
+	const auto participants = &_peer->session().api().chatParticipants();
+	const auto &list = participants->similar(_peer);
+	for (const auto &peer : list.list) {
+		if (!delegate()->peerListFindRow(peer->id.value)) {
+			delegate()->peerListAppendRow(createRow(peer));
 		}
 	}
 	if (!list.more
-		|| _channel->session().premium()
-		|| !_channel->session().premiumPossible()) {
+		|| _peer->session().premium()
+		|| !_peer->session().premiumPossible()) {
 		delete base::take(_unlock);
 		_unlockHeight = 0;
 	} else if (!_unlock) {
@@ -149,25 +152,31 @@ void ListController::setupUnlock() {
 
 	const auto button = ::Settings::CreateLockedButton(
 		_unlock,
-		tr::lng_similar_channels_show_more(),
+		(_peer->isBroadcast()
+			? tr::lng_similar_channels_show_more()
+			: tr::lng_similar_bots_show_more()),
 		st::similarChannelsLock,
 		rpl::single(true));
+	button->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 	button->setClickedCallback([=] {
 		const auto window = _controller->parentController();
 		::Settings::ShowPremium(window, u"similar_channels"_q);
 	});
 
 	const auto upto = Data::PremiumLimits(
-		&_channel->session()).similarChannelsPremium();
+		&_peer->session()).similarChannelsPremium();
 	const auto about = Ui::CreateChild<Ui::FlatLabel>(
 		_unlock,
-		tr::lng_similar_channels_premium_all(
-			lt_count,
-			rpl::single(upto * 1.),
-			lt_link,
-			tr::lng_similar_channels_premium_all_link(
-			) | Ui::Text::ToBold() | Ui::Text::ToLink(),
-			Ui::Text::RichLangValue),
+		(_peer->isBroadcast()
+			? tr::lng_similar_channels_premium_all
+			: tr::lng_similar_bots_premium_all)(
+				lt_count,
+				rpl::single(upto * 1.),
+				lt_link,
+				tr::lng_similar_channels_premium_all_link(
+					tr::bold
+				) | rpl::map(tr::link),
+				tr::rich),
 		st::similarChannelsLockAbout);
 	about->setClickHandlerFilter([=](const auto &...) {
 		const auto window = _controller->parentController();
@@ -177,8 +186,10 @@ void ListController::setupUnlock() {
 
 	rpl::combine(
 		_content->sizeValue(),
-		tr::lng_similar_channels_show_more()
-	) | rpl::start_with_next([=](QSize size, const auto &) {
+		(_peer->isBroadcast()
+			? tr::lng_similar_channels_show_more()
+			: tr::lng_similar_bots_show_more())
+	) | rpl::on_next([=](QSize size, const auto &) {
 		auto top = st::similarChannelsLockFade
 			+ st::similarChannelsLockPadding.top();
 		button->setGeometry(
@@ -214,7 +225,7 @@ void ListController::setupUnlock() {
 	_unlockHeight = _unlock->heightValue();
 
 	_unlock->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_unlock);
 		const auto width = _unlock->width();
 		const auto fade = st::similarChannelsLockFade;
@@ -263,10 +274,10 @@ class InnerWidget final
 	InnerWidget(
 		QWidget *parent,
 		not_null<Controller*> controller,
-		not_null<ChannelData*> channel);
+		not_null<PeerData*> peer);
 
-	[[nodiscard]] not_null<ChannelData*> channel() const {
-		return _channel;
+	[[nodiscard]] not_null<PeerData*> peer() const {
+		return _peer;
 	}
 
 	rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
@@ -305,7 +316,7 @@ class InnerWidget final
 
 	const std::shared_ptr<Main::SessionShow> _show;
 	not_null<Controller*> _controller;
-	const not_null<ChannelData*> _channel;
+	const not_null<PeerData*> _peer;
 	std::unique_ptr<ListController> _listController;
 	object_ptr<ListWidget> _list;
 
@@ -316,12 +327,12 @@ class InnerWidget final
 InnerWidget::InnerWidget(
 	QWidget *parent,
 	not_null<Controller*> controller,
-	not_null<ChannelData*> channel)
+	not_null<PeerData*> peer)
 : RpWidget(parent)
 , _show(controller->uiShow())
 , _controller(controller)
-, _channel(channel)
-, _listController(std::make_unique<ListController>(controller, _channel))
+, _peer(peer)
+, _listController(std::make_unique<ListController>(controller, _peer))
 , _list(setupList(this, _listController.get())) {
 	setContent(_list.data());
 	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
@@ -360,7 +371,7 @@ object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 		controller);
 	controller->setContentWidget(this);
 	result->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		auto addmin = (request.ymin < 0)
 			? 0
 			: st::infoCommonGroupsMargin.top();
@@ -373,13 +384,13 @@ object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 	}, result->lifetime());
 	result->moveToLeft(0, st::infoCommonGroupsMargin.top());
 	parent->widthValue(
-	) | rpl::start_with_next([list = result.data()](int newWidth) {
+	) | rpl::on_next([list = result.data()](int newWidth) {
 		list->resizeToWidth(newWidth);
 	}, result->lifetime());
 	rpl::combine(
 		result->heightValue(),
 		controller->unlockHeightValue()
-	) | rpl::start_with_next([=](int listHeight, int unlockHeight) {
+	) | rpl::on_next([=](int listHeight, int unlockHeight) {
 		auto newHeight = st::infoCommonGroupsMargin.top()
 			+ listHeight
 			+ (unlockHeight
@@ -428,23 +439,19 @@ std::shared_ptr<Main::SessionShow> InnerWidget::peerListUiShow() {
 	return _show;
 }
 
-Memento::Memento(not_null<ChannelData*> channel)
-: ContentMemento(channel, nullptr, PeerId()) {
+Memento::Memento(not_null<PeerData*> peer)
+: ContentMemento(peer, nullptr, nullptr, PeerId()) {
 }
 
 Section Memento::section() const {
-	return Section(Section::Type::SimilarChannels);
-}
-
-not_null<ChannelData*> Memento::channel() const {
-	return peer()->asChannel();
+	return Section(Section::Type::SimilarPeers);
 }
 
 object_ptr<ContentWidget> Memento::createWidget(
 		QWidget *parent,
 		not_null<Controller*> controller,
 		const QRect &geometry) {
-	auto result = object_ptr<Widget>(parent, controller, channel());
+	auto result = object_ptr<Widget>(parent, controller, peer());
 	result->setInternalState(geometry, this);
 	return result;
 }
@@ -462,20 +469,22 @@ Memento::~Memento() = default;
 Widget::Widget(
 	QWidget *parent,
 	not_null<Controller*> controller,
-	not_null<ChannelData*> channel)
+	not_null<PeerData*> peer)
 : ContentWidget(parent, controller) {
 	_inner = setInnerWidget(object_ptr<InnerWidget>(
 		this,
 		controller,
-		channel));
+		peer));
 }
 
 rpl::producer<QString> Widget::title() {
-	return tr::lng_similar_channels_title();
+	return peer()->isBroadcast()
+		? tr::lng_similar_channels_title()
+		: tr::lng_similar_bots_title();
 }
 
-not_null<ChannelData*> Widget::channel() const {
-	return _inner->channel();
+not_null<PeerData*> Widget::peer() const {
+	return _inner->peer();
 }
 
 bool Widget::showInternal(not_null<ContentMemento*> memento) {
@@ -483,7 +492,7 @@ bool Widget::showInternal(not_null<ContentMemento*> memento) {
 		return false;
 	}
 	if (auto similarMemento = dynamic_cast<Memento*>(memento.get())) {
-		if (similarMemento->channel() == channel()) {
+		if (similarMemento->peer() == peer()) {
 			restoreState(similarMemento);
 			return true;
 		}
@@ -500,7 +509,7 @@ void Widget::setInternalState(
 }
 
 std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
-	auto result = std::make_shared<Memento>(channel());
+	auto result = std::make_shared<Memento>(peer());
 	saveState(result.get());
 	return result;
 }
@@ -515,4 +524,4 @@ void Widget::restoreState(not_null<Memento*> memento) {
 	scrollTopRestore(memento->scrollTop());
 }
 
-} // namespace Info::SimilarChannels
+} // namespace Info::SimilarPeers
diff --git a/Telegram/SourceFiles/info/similar_channels/info_similar_channels_widget.h b/Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.h
similarity index 81%
rename from Telegram/SourceFiles/info/similar_channels/info_similar_channels_widget.h
rename to Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.h
index 74f15e64fbc711..0f002aa4c58603 100644
--- a/Telegram/SourceFiles/info/similar_channels/info_similar_channels_widget.h
+++ b/Telegram/SourceFiles/info/similar_peers/info_similar_peers_widget.h
@@ -9,16 +9,16 @@ For license and copyright information please follow this link:
 
 #include "info/info_content_widget.h"
 
-class ChannelData;
+class PeerData;
 struct PeerListState;
 
-namespace Info::SimilarChannels {
+namespace Info::SimilarPeers {
 
 class InnerWidget;
 
 class Memento final : public ContentMemento {
 public:
-	explicit Memento(not_null<ChannelData*> channel);
+	explicit Memento(not_null<PeerData*> peer);
 
 	object_ptr<ContentWidget> createWidget(
 		QWidget *parent,
@@ -27,8 +27,6 @@ class Memento final : public ContentMemento {
 
 	Section section() const override;
 
-	[[nodiscard]] not_null<ChannelData*> channel() const;
-
 	void setListState(std::unique_ptr<PeerListState> state);
 	std::unique_ptr<PeerListState> listState();
 
@@ -44,9 +42,9 @@ class Widget final : public ContentWidget {
 	Widget(
 		QWidget *parent,
 		not_null<Controller*> controller,
-		not_null<ChannelData*> channel);
+		not_null<PeerData*> peer);
 
-	[[nodiscard]] not_null<ChannelData*> channel() const;
+	[[nodiscard]] not_null<PeerData*> peer() const;
 
 	bool showInternal(
 		not_null<ContentMemento*> memento) override;
@@ -67,4 +65,4 @@ class Widget final : public ContentWidget {
 
 };
 
-} // namespace Info::SimilarChannels
+} // namespace Info::SimilarPeers
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
index 19362213582812..0445d12fd1a5cc 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
@@ -7,11 +7,13 @@ For license and copyright information please follow this link:
 */
 #include "info/statistics/info_statistics_inner_widget.h"
 
+#include "api/api_polls.h"
 #include "api/api_statistics.h"
 #include "apiwrap.h"
 #include "base/call_delayed.h"
 #include "base/event_filter.h"
 #include "data/data_peer.h"
+#include "data/data_poll.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_story.h"
@@ -93,11 +95,11 @@ void ProcessZoom(
 		return;
 	}
 	widget->zoomRequests(
-	) | rpl::start_with_next([=](float64 x) {
+	) | rpl::on_next([=](float64 x) {
 		d.api->requestZoom(
 			zoomToken,
 			x
-		) | rpl::start_with_next_error_done([=](
+		) | rpl::on_next_error_done([=](
 				const Data::StatisticalGraph &graph) {
 			if (graph.chart) {
 				widget->setZoomedChartData(graph.chart, x, type);
@@ -165,7 +167,7 @@ void FillStatistic(
 			descriptor.api->requestZoom(
 				graphData.zoomToken,
 				0
-			) | rpl::start_with_next_error_done([=, graphPtr = &graphData](
+			) | rpl::on_next_error_done([=, graphPtr = &graphData](
 					const Data::StatisticalGraph &graph) mutable {
 				{
 					// Save the loaded async data to cache.
@@ -287,6 +289,7 @@ void FillStatistic(
 				Type::Bar);
 		}
 	}
+	Statistic::FixCacheForHighDPIChartWidget(content);
 	if (!state->pendingCount) {
 		++state->pendingCount;
 		singlePendingDone();
@@ -393,7 +396,7 @@ void FillOverview(
 		sub->setTextColorOverride(st::windowSubTextFg->c);
 
 		primary->geometryValue(
-		) | rpl::start_with_next([=](const QRect &g) {
+		) | rpl::on_next([=](const QRect &g) {
 			const auto &padding = st::statisticsOverviewSecondValuePadding;
 			second->moveToLeft(
 				rect::right(g) + padding.left(),
@@ -404,6 +407,9 @@ void FillOverview(
 					- st::statisticsOverviewSubtext.style.font->height
 					+ g.y()
 					+ diffBetweenHeaders);
+			if (container->height() < rect::bottom(sub)) {
+				container->resize(container->width(), rect::bottom(sub));
+			}
 		}, primary->lifetime());
 	};
 
@@ -535,9 +541,8 @@ void FillOverview(
 		}
 	}
 	container->showChildren();
-	container->resize(container->width(), topLeftLabel->height() * 5);
-	container->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	container->sizeValue() | rpl::distinct_until_changed(
+	) | rpl::on_next([=](const QSize &s) {
 		const auto halfWidth = s.width() / 2;
 		{
 			const auto &p = st::statisticsOverviewValuePadding;
@@ -577,41 +582,40 @@ void FillLoading(
 		: u"stats"_q;
 	auto icon = ::Settings::CreateLottieIcon(
 		content,
-		{ .name = iconName, .sizeOverride = Size(st::changePhoneIconSize) },
+		{ .name = iconName, .sizeOverride = st::normalBoxLottieSize },
 		st::settingsBlockedListIconPadding);
 
 	(
 		std::move(showFinished) | rpl::take(1)
-	) | rpl::start_with_next([animate = std::move(icon.animate)] {
+	) | rpl::on_next([animate = std::move(icon.animate)] {
 		animate(anim::repeat::loop);
 	}, icon.widget->lifetime());
 	content->add(std::move(icon.widget));
 
 	content->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				(type == LoadingType::Boosts)
-					? tr::lng_stats_boosts_loading()
-					: (type == LoadingType::Earn)
-					? tr::lng_stats_earn_loading()
-					: tr::lng_stats_loading(),
-				st::changePhoneTitle)),
-		st::changePhoneTitlePadding + st::boxRowPadding);
+			(type == LoadingType::Boosts)
+				? tr::lng_stats_boosts_loading()
+				: (type == LoadingType::Earn)
+				? tr::lng_stats_earn_loading()
+				: tr::lng_stats_loading(),
+			st::changePhoneTitle),
+		st::changePhoneTitlePadding + st::boxRowPadding,
+		style::al_top);
 
 	content->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				(type == LoadingType::Boosts)
-					? tr::lng_stats_boosts_loading_subtext()
-					: (type == LoadingType::Earn)
-					? tr::lng_stats_earn_loading_subtext()
-					: tr::lng_stats_loading_subtext(),
-				st::statisticsLoadingSubtext)),
-		st::changePhoneDescriptionPadding + st::boxRowPadding);
+			(type == LoadingType::Boosts)
+				? tr::lng_stats_boosts_loading_subtext()
+				: (type == LoadingType::Earn)
+				? tr::lng_stats_earn_loading_subtext()
+				: tr::lng_stats_loading_subtext(),
+			st::statisticsLoadingSubtext),
+		st::changePhoneDescriptionPadding + st::boxRowPadding,
+		style::al_top
+	)->setTryMakeSimilarLines(true);
 
 	Ui::AddSkip(content, st::settingsBlockedListIconPadding.top());
 }
@@ -645,10 +649,10 @@ void InnerWidget::load() {
 		_showFinished.events());
 
 	_showFinished.events(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		if (!_contextId && !_storyId) {
 			descriptor.api->request(
-			) | rpl::start_with_done([=] {
+			) | rpl::on_done([=] {
 				_state.stats = Data::AnyStatistics{
 					descriptor.api->channelStats(),
 					descriptor.api->supergroupStats(),
@@ -724,6 +728,9 @@ void InnerWidget::fill() {
 		FillOverview(inner, _state.stats, true);
 	}
 	FillStatistic(inner, descriptor, _state.stats, finishLoading);
+	if (_state.stats.message) {
+		fillPollVotesGraph(inner);
+	}
 	const auto &channel = _state.stats.channel;
 	const auto &supergroup = _state.stats.supergroup;
 	if (channel) {
@@ -784,6 +791,38 @@ void InnerWidget::fill() {
 	}
 }
 
+void InnerWidget::fillPollVotesGraph(
+		not_null<Ui::VerticalLayout*> container) {
+	const auto item = _peer->owner().message(_contextId);
+	const auto media = item ? item->media() : nullptr;
+	const auto poll = media ? media->poll() : nullptr;
+	if (!poll || !poll->canViewStats()) {
+		return;
+	}
+	const auto wrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	wrap->toggle(false, anim::type::instant);
+	const auto widget = wrap->entity()->add(
+		object_ptr<Statistic::ChartWidget>(wrap->entity()),
+		st::statisticsLayerMargins);
+	_peer->session().api().polls().requestStats(
+		_contextId,
+		crl::guard(this, [=](Data::StatisticalGraph graph) {
+			if (!graph.chart) {
+				return;
+			}
+			widget->setChartData(
+				std::move(graph.chart),
+				Statistic::ChartViewType::Linear);
+			widget->setTitle(tr::lng_notification_reactions_poll_votes());
+			Statistic::FixCacheForHighDPIChartWidget(wrap->entity());
+			wrap->toggle(true, anim::type::normal);
+		}),
+		[](QString) {});
+}
+
 void InnerWidget::fillRecentPosts(not_null<Ui::VerticalLayout*> container) {
 	const auto &stats = _state.stats.channel;
 	if (!stats || stats.recentMessageInteractions.empty()) {
@@ -838,7 +877,7 @@ void InnerWidget::fillRecentPosts(not_null<Ui::VerticalLayout*> container) {
 		_messagePreviews.push_back(raw);
 		raw->show();
 		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			if (!s.isNull()) {
 				raw->setGeometry(Rect(s)
 					- st::statisticsRecentPostButton.padding);
@@ -955,4 +994,3 @@ void InnerWidget::showFinished() {
 }
 
 } // namespace Info::Statistics
-
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.h b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.h
index 8da4fd00738952..8f1302a62ff636 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.h
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.h
@@ -62,6 +62,7 @@ class InnerWidget final : public Ui::VerticalLayout {
 	void load();
 	void fill();
 	void fillRecentPosts(not_null<Ui::VerticalLayout*> container);
+	void fillPollVotesGraph(not_null<Ui::VerticalLayout*> container);
 
 	not_null<Controller*> _controller;
 	not_null<PeerData*> _peer;
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 0dc51cb076eccb..67f63b8e818aa4 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -9,9 +9,13 @@ For license and copyright information please follow this link:
 
 #include "api/api_credits.h"
 #include "api/api_statistics.h"
+#include "boxes/peers/replace_boost_box.h" // GenerateGiftUniqueUserpicCallback
 #include "boxes/peer_list_controllers.h"
+#include "boxes/peer_list_widgets.h"
+#include "info/channel_statistics/earn/earn_icons.h"
+#include "info/channel_statistics/earn/earn_format.h"
 #include "chat_helpers/stickers_gift_box_pack.h"
-#include "core/ui_integration.h" // Core::MarkedTextContext.
+#include "core/ui_integration.h" // TextContext
 #include "data/data_channel.h"
 #include "data/data_credits.h"
 #include "data/data_session.h"
@@ -24,17 +28,24 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "main/session/session_show.h"
 #include "settings/settings_credits_graphics.h" // PaintSubscriptionRightLabelCallback
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
 #include "ui/effects/credits_graphics.h"
 #include "ui/effects/outline_segments.h" // Ui::UnreadStoryOutlineGradient.
 #include "ui/effects/toggle_arrow.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_custom_emoji.h"
+#include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "styles/style_boxes.h"
+#include "styles/style_color_indices.h"
+#include "styles/style_channel_earn.h"
 #include "styles/style_credits.h"
 #include "styles/style_dialogs.h" // dialogsStoriesFull.
 #include "styles/style_layers.h" // boxRowPadding.
@@ -42,14 +53,12 @@ For license and copyright information please follow this link:
 #include "styles/style_settings.h"
 #include "styles/style_statistics.h"
 #include "styles/style_window.h"
+#include "styles/style_chat.h"
 
 namespace Info::Statistics {
 namespace {
 
 using BoostCallback = Fn<void(const Data::Boost &)>;
-constexpr auto kColorIndexCredits = int(1);
-constexpr auto kColorIndexUnclaimed = int(3);
-constexpr auto kColorIndexPending = int(4);
 
 [[nodiscard]] PeerListRowId UniqueRowIdFromEntry(
 		const Data::CreditsHistoryEntry &entry) {
@@ -57,28 +66,8 @@ constexpr auto kColorIndexPending = int(4);
 		+ (entry.refunded ? '1' : '0')
 		+ (entry.pending ? '1' : '0')
 		+ (entry.failed ? '1' : '0')
-		+ (entry.in ? '1' : '0'));
-}
-
-void AddArrow(not_null<Ui::RpWidget*> parent) {
-	const auto arrow = Ui::CreateChild<Ui::RpWidget>(parent.get());
-	arrow->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
-		auto p = QPainter(arrow);
-
-		const auto path = Ui::ToggleUpDownArrowPath(
-			st::statisticsShowMoreButtonArrowSize,
-			st::statisticsShowMoreButtonArrowSize,
-			st::statisticsShowMoreButtonArrowSize,
-			st::mainMenuToggleFourStrokes,
-			0.);
-
-		auto hq = PainterHighQualityEnabler(p);
-		p.fillPath(path, st::lightButtonFg);
-	}, arrow->lifetime());
-	arrow->resize(Size(st::statisticsShowMoreButtonArrowSize * 2));
-	arrow->move(st::statisticsShowMoreButtonArrowPosition);
-	arrow->show();
+		+ (entry.in ? '1' : '0')
+		+ (entry.giftOffer ? '1' : '0'));
 }
 
 void AddSubtitle(
@@ -91,6 +80,17 @@ void AddSubtitle(
 		{ 0, -subtitlePadding.top(), 0, -subtitlePadding.bottom() });
 }
 
+[[nodiscard]] object_ptr<Ui::SettingsButton> CreateShowMoreButton(
+		not_null<Ui::RpWidget*> parent,
+		rpl::producer<QString> title) {
+	auto owned = object_ptr<Ui::SettingsButton>(
+		parent,
+		std::move(title),
+		st::statisticsShowMoreButton);
+	Ui::AddToggleUpDownArrowToMoreButton(owned.data());
+	return owned;
+}
+
 [[nodiscard]] QString FormatText(
 		int value1, tr::phrase<lngtag_count> phrase1,
 		int value2, tr::phrase<lngtag_count> phrase2,
@@ -412,7 +412,7 @@ void PublicForwardsController::appendRow(
 	const auto views = [&] {
 		if (contextId.messageId) {
 			const auto message = peer->owner().message(contextId.messageId);
-			return message ? message->viewsCount() : 0;
+			return message ? std::max(message->viewsCount(), 0) : 0;
 		} else if (const auto &id = contextId.storyId) {
 			const auto story = peer->owner().stories().lookup(id);
 			return story ? (*story)->views() : 0;
@@ -461,6 +461,17 @@ class BoostRow final : public PeerListRow {
 		int outerWidth,
 		bool selected) override;
 
+	int paintNameIconGetLeadingWidth(
+		Painter &p,
+		Fn<void()> repaint,
+		crl::time now,
+		int nameLeft,
+		int nameTop,
+		int outerWidth,
+		bool selected) override {
+		return 0;
+	}
+
 	QSize rightActionSize() const override;
 	QMargins rightActionMargins() const override;
 	bool rightActionDisabled() const override;
@@ -487,7 +498,7 @@ class BoostRow final : public PeerListRow {
 BoostRow::BoostRow(not_null<PeerData*> peer, const Data::Boost &boost)
 : PeerListRow(peer, UniqueRowIdFromString(boost.id))
 , _boost(boost)
-, _userpic(Ui::EmptyUserpic::UserpicColor(0), QString()) {
+, _userpic(Ui::EmptyUserpic::UserpicColor(st::colorIndexRed), QString()) {
 	init();
 }
 
@@ -496,10 +507,10 @@ BoostRow::BoostRow(const Data::Boost &boost)
 , _boost(boost)
 , _userpic(
 	Ui::EmptyUserpic::UserpicColor(boost.credits
-		? kColorIndexCredits
+		? st::colorIndexOrange
 		: boost.isUnclaimed
-		? kColorIndexUnclaimed
-		: kColorIndexPending),
+		? st::colorIndexSea
+		: st::colorIndexBlue),
 	QString()) {
 	init();
 }
@@ -753,12 +764,36 @@ rpl::producer<int> BoostsController::totalBoostsValue() const {
 	return _totalBoosts.value();
 }
 
+struct CreditsRowDescriptionData {
+	uint64 rowId = 0;
+	uint64 bareGiftStickerId = 0;
+};
+
+[[nodiscard]] QString SerializeCreditsRowDescriptionData(
+		const CreditsRowDescriptionData &data) {
+	return QString("%1;%2").arg(data.rowId).arg(data.bareGiftStickerId);
+}
+
+[[nodiscard]] CreditsRowDescriptionData DeserializeCreditsRowDescriptionData(
+		const QString &str) {
+	auto data = CreditsRowDescriptionData();
+	const auto parts = str.split(';');
+	if (parts.size() >= 1) {
+		data.rowId = parts[0].toULongLong();
+	}
+	if (parts.size() >= 2) {
+		data.bareGiftStickerId = parts[1].toULongLong();
+	}
+	return data;
+}
+
 class CreditsRow final : public PeerListRow {
 public:
 	struct Descriptor final {
+		not_null<Main::Session*> session;
 		Data::CreditsHistoryEntry entry;
 		Data::SubscriptionEntry subscription;
-		Core::MarkedTextContext context;
+		Ui::Text::MarkedContext context;
 		int rowHeight = 0;
 		Fn<void(not_null<PeerListRow*>)> updateCallback;
 	};
@@ -766,6 +801,8 @@ class CreditsRow final : public PeerListRow {
 	CreditsRow(not_null<PeerData*> peer, const Descriptor &descriptor);
 	CreditsRow(const Descriptor &descriptor);
 
+	void init();
+
 	[[nodiscard]] const Data::CreditsHistoryEntry &entry() const;
 	[[nodiscard]] const Data::SubscriptionEntry &subscription() const;
 	[[nodiscard]] QString generateName() override;
@@ -784,20 +821,36 @@ class CreditsRow final : public PeerListRow {
 		bool selected,
 		bool actionSelected) override;
 
-private:
-	void init();
+	void paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int available,
+		int outer,
+		bool selected) override;
 
+	const style::PeerListItem &computeSt(
+		const style::PeerListItem &st) const override;
+
+private:
+	const not_null<Main::Session*> _session;
 	const Data::CreditsHistoryEntry _entry;
 	const Data::SubscriptionEntry _subscription;
-	const Core::MarkedTextContext _context;
+	const Ui::Text::MarkedContext _context;
+
 	const int _rowHeight;
 
 	PaintRoundImageCallback _paintUserpicCallback;
 	std::optional<Settings::SubscriptionRightLabel> _rightLabel;
-	QString _title;
 	QString _name;
 
+	Ui::Text::String _description;
 	Ui::Text::String _rightText;
+	Ui::Text::String _rightMinorText;
+
+	std::shared_ptr<Ui::DynamicImage> _descriptionThumbnail;
+	QImage _descriptionThumbnailCache;
 
 	base::has_weak_ptr _guard;
 };
@@ -806,6 +859,7 @@ CreditsRow::CreditsRow(
 	not_null<PeerData*> peer,
 	const Descriptor &descriptor)
 : PeerListRow(peer, UniqueRowIdFromEntry(descriptor.entry))
+, _session(descriptor.session)
 , _entry(descriptor.entry)
 , _subscription(descriptor.subscription)
 , _context(descriptor.context)
@@ -826,16 +880,15 @@ CreditsRow::CreditsRow(
 			st::boostsListBox.item,
 			_subscription.subscription.credits);
 	}
-	init();
 }
 
 CreditsRow::CreditsRow(const Descriptor &descriptor)
 : PeerListRow(UniqueRowIdFromEntry(descriptor.entry))
+, _session(descriptor.session)
 , _entry(descriptor.entry)
 , _subscription(descriptor.subscription)
 , _context(descriptor.context)
 , _rowHeight(descriptor.rowHeight) {
-	init();
 }
 
 void CreditsRow::init() {
@@ -843,30 +896,55 @@ void CreditsRow::init() {
 	const auto name = !isSpecial
 		? PeerListRow::generateName()
 		: Ui::GenerateEntryName(_entry).text;
-	_name = (_entry.reaction
-		|| _entry.bareGiveawayMsgId
-		|| _entry.convertStars)
-		? Ui::GenerateEntryName(_entry).text
-		: _entry.title.isEmpty()
+	_name = (_entry.isLiveStoryReaction() || _entry.paidMessagesCount)
+		? name
+		: _entry.postsSearch
+		? tr::lng_credits_box_history_entry_posts_search(tr::now)
+		: (_entry.giftUpgraded && _entry.uniqueGift && !isSpecial)
+		? u"%1 #%2"_q.arg(_entry.uniqueGift->title).arg(Lang::FormatCountDecimal(_entry.uniqueGift->number))
+		: ((!_entry.subscriptionUntil.isNull() && !isSpecial)
+			|| (_entry.giftResale && !isSpecial)
+			|| (_entry.giftOffer && !isSpecial)
+			|| _entry.title.isEmpty())
 		? name
 		: _entry.title;
-	const auto joiner = QString(QChar(' ')) + QChar(8212) + QChar(' ');
 	setSkipPeerBadge(true);
-	PeerListRow::setCustomStatus(
-		langDateTime(_entry.date)
-		+ (_entry.refunded
-			? (joiner + tr::lng_channel_earn_history_return(tr::now))
-			: _entry.pending
-			? (joiner + tr::lng_channel_earn_history_pending(tr::now))
-			: _entry.failed
-			? (joiner + tr::lng_channel_earn_history_failed(tr::now))
-			: !_entry.subscriptionUntil.isNull()
-			? (joiner
-				+ tr::lng_credits_box_history_entry_subscription(tr::now))
-			: QString())
-		+ ((_entry.gift && isSpecial)
-			? (joiner + tr::lng_credits_box_history_entry_anonymous(tr::now))
-			: ((_name == name) ? QString() : (joiner + name))));
+	const auto description = _entry.floodSkip
+		? tr::lng_credits_box_history_entry_floodskip_about(
+			tr::now,
+			lt_count_decimal,
+			_entry.floodSkip)
+		: _entry.isLiveStoryReaction()
+		? tr::lng_credits_paid_messages_fee_live_reaction(tr::now)
+		: _entry.paidMessagesCount
+		? tr::lng_credits_paid_messages_fee(
+			tr::now,
+			lt_count,
+			_entry.paidMessagesCount)
+		: (!_entry.subscriptionUntil.isNull() && !_entry.title.isEmpty())
+		? _entry.title
+		: _entry.refunded
+		? tr::lng_channel_earn_history_return(tr::now)
+		: _entry.pending
+		? tr::lng_channel_earn_history_pending(tr::now)
+		: _entry.failed
+		? tr::lng_channel_earn_history_failed(tr::now)
+		: !_entry.subscriptionUntil.isNull()
+		? tr::lng_credits_box_history_entry_subscription(tr::now)
+		: (_entry.peerType
+			== Data::CreditsHistoryEntry::PeerType::PremiumBot)
+		? tr::lng_credits_box_history_entry_via_premium_bot(tr::now)
+		: (_entry.peerType == Data::CreditsHistoryEntry::PeerType::Fragment)
+		? tr::lng_credits_box_history_entry_fragment(tr::now)
+		: (_entry.gift && isSpecial)
+		? tr::lng_credits_box_history_entry_anonymous(tr::now)
+		: _entry.giftUpgraded
+		? tr::lng_credits_box_history_entry_gift_upgrade(tr::now)
+		: (_name == name)
+		? Ui::GenerateEntryName(_entry).text
+		: name;
+	_description.setText(st::defaultTextStyle, description);
+	PeerListRow::setCustomStatus(langDateTime(_entry.date));
 	if (_subscription) {
 		PeerListRow::setCustomStatus((_subscription.expired
 			? tr::lng_credits_subscription_status_none
@@ -876,30 +954,79 @@ void CreditsRow::init() {
 				tr::now,
 				lt_date,
 				langDayOfMonthFull(_subscription.until.date())));
+		_description.setText(st::defaultTextStyle, _subscription.title);
+	}
+	if (_entry.bareGiftStickerId && !_entry.giftUpgraded) {
+		_description.setMarkedText(
+			st::defaultTextStyle,
+			Ui::Text::SingleCustomEmoji(
+				SerializeCreditsRowDescriptionData({
+					PeerListRow::id(),
+					_entry.bareGiftStickerId,
+				}))
+			.append(' ')
+			.append(description),
+			kMarkupTextOptions,
+			_context);
+	}
+	const auto descriptionPhotoId = (!_entry.subscriptionUntil.isNull())
+		? _entry.photoId
+		: _subscription.photoId;
+	if (descriptionPhotoId) {
+		_descriptionThumbnail = Ui::MakePhotoThumbnail(
+			_session->data().photo(descriptionPhotoId),
+			{});
+		_descriptionThumbnail->subscribeToUpdates([this] {
+			const auto thumbnailSide = st::defaultTextStyle.font->height;
+			_descriptionThumbnailCache = Images::Round(
+				_descriptionThumbnail->image(thumbnailSide),
+				ImageRoundRadius::Large);
+			if (_context.repaint) {
+				_context.repaint();
+			}
+		});
 	}
-	auto &manager = _context.session->data().customEmojiManager();
 	if (_entry) {
 		constexpr auto kMinus = QChar(0x2212);
+		const auto isCurrency = _entry.credits.ton();
 		_rightText.setMarkedText(
-			st::semiboldTextStyle,
+			isCurrency
+				? st::channelEarnHistoryMajorLabel.style
+				: st::creditsHistoryRowRightStyle,
 			TextWithEntities()
 				.append(_entry.in ? QChar('+') : kMinus)
-				.append(
-					Lang::FormatCountDecimal(std::abs(int64(_entry.credits))))
+				.append(isCurrency
+					? Info::ChannelEarn::MajorPart(_entry.credits.abs())
+					: Lang::FormatCreditsAmountDecimal(_entry.credits.abs()))
 				.append(QChar(' '))
-				.append(manager.creditsEmoji()),
+				.append(isCurrency
+					? TextWithEntities()
+					: Ui::MakeCreditsIconEntity()),
 			kMarkupTextOptions,
 			_context);
+		if (isCurrency) {
+			_rightMinorText.setMarkedText(
+				st::channelEarnHistoryMinorLabel.style,
+				TextWithEntities()
+					.append(Info::ChannelEarn::MinorPart(_entry.credits))
+					.append(QChar(' '))
+					.append(
+						Ui::Text::SingleCustomEmoji(_entry.in
+							? u"ton:in"_q
+							: u"ton:out"_q)),
+				kMarkupTextOptions,
+				_context);
+		}
 	}
 	if (!_paintUserpicCallback) {
-		_paintUserpicCallback = _entry.convertStars
-			? Ui::GenerateGiftStickerUserpicCallback(
-				_context.session,
-				_entry.bareGiftStickerId,
-				_context.customEmojiRepaint)
-			: !isSpecial
-			? PeerListRow::generatePaintUserpicCallback(false)
-			: Ui::GenerateCreditsPaintUserpicCallback(_entry);
+		_paintUserpicCallback = _entry.giftUpgraded
+			? GenerateGiftUniqueUserpicCallback(
+				_session,
+				_entry.uniqueGift,
+				_context.repaint)
+			: (isSpecial || _entry.postsSearch)
+			? Ui::GenerateCreditsPaintUserpicCallback(_entry)
+			: PeerListRow::generatePaintUserpicCallback(false);
 	}
 }
 
@@ -912,26 +1039,41 @@ const Data::SubscriptionEntry &CreditsRow::subscription() const {
 }
 
 QString CreditsRow::generateName() {
-	return _entry.title.isEmpty() ? _name : _entry.title;
+	return _name;
 }
 
 PaintRoundImageCallback CreditsRow::generatePaintUserpicCallback(bool force) {
 	return _paintUserpicCallback;
 }
 
+[[nodiscard]] QString RightActionText(const Data::SubscriptionEntry &s) {
+	return s.cancelledByBot
+		? tr::lng_credits_subscription_status_off_by_bot_right(tr::now)
+		: s.cancelled
+		? tr::lng_credits_subscription_status_off_right(tr::now)
+		: s.expired
+		? tr::lng_credits_subscription_status_none_right(tr::now)
+		: QString();
+}
+
 QSize CreditsRow::rightActionSize() const {
 	if (_rightLabel) {
 		return _rightLabel->size;
-	} else if (_subscription.cancelled || _subscription.expired) {
-		const auto text = _subscription.cancelled
-			? tr::lng_credits_subscription_status_off_right(tr::now)
-			: tr::lng_credits_subscription_status_none_right(tr::now);
-		return QSize(
-			st::contactsStatusFont->width(text) + st::boxRowPadding.right(),
-			_rowHeight);
+	} else if (const auto t = RightActionText(_subscription); !t.isEmpty()) {
+		const auto lines = t.split('\n');
+		auto maxWidth = 0;
+		for (const auto &line : lines) {
+			const auto width = st::contactsStatusFont->width(line);
+			if (width > maxWidth) {
+				maxWidth = width;
+			}
+		}
+		return QSize(maxWidth + st::boxRowPadding.right(), _rowHeight);
 	} else if (_subscription || _entry) {
 		return QSize(
-			_rightText.maxWidth() + st::boxRowPadding.right(),
+			_rightText.maxWidth()
+				+ _rightMinorText.maxWidth()
+				+ st::boxRowPadding.right() / 2,
 			_rowHeight);
 	} else if (!_entry && !_subscription) {
 		return QSize();
@@ -954,39 +1096,96 @@ void CreditsRow::rightActionPaint(
 		int outerWidth,
 		bool selected,
 		bool actionSelected) {
-	const auto &font = _rightText.style()->font;
 	const auto rightSkip = st::boxRowPadding.right();
 	if (_rightLabel) {
 		return _rightLabel->draw(p, x, y, _rowHeight);
-	} else if (_subscription.cancelled || _subscription.expired) {
+	} else if (const auto t = RightActionText(_subscription); !t.isEmpty()) {
 		const auto &statusFont = st::contactsStatusFont;
 		y += _rowHeight / 2;
 		p.setFont(statusFont);
 		p.setPen(st::attentionButtonFg);
-		p.drawTextRight(
-			rightSkip,
-			y - statusFont->height / 2,
-			outerWidth,
-			_subscription.expired
-				? tr::lng_credits_subscription_status_none_right(tr::now)
-				: tr::lng_credits_subscription_status_off_right(tr::now));
+
+		const auto lines = t.split('\n');
+		if (lines.size() > 1) {
+			const auto rect = QRect(x, 0, outerWidth - x, _rowHeight);
+			const auto lineHeight = statusFont->height;
+			const auto totalHeight = lines.size() * lineHeight;
+			auto startY = rect.top()
+				+ (rect.height() - totalHeight) / 2
+				+ statusFont->ascent;
+
+			for (const auto &line : lines) {
+				const auto lineWidth = statusFont->width(line);
+				const auto startX = rect.left()
+					+ (rect.width() - lineWidth) / 2;
+				p.drawText(startX, startY, line);
+				startY += lineHeight;
+			}
+			return;
+		}
+		p.drawTextRight(rightSkip, y - statusFont->height / 2, outerWidth, t);
 		return;
 	}
-	y += _rowHeight / 2;
 	p.setPen(_entry.pending
 		? st::creditsStroke
 		: _entry.in
 		? st::boxTextFgGood
 		: st::menuIconAttentionColor);
+	const auto xMinor = outerWidth - _rightMinorText.maxWidth() - rightSkip;
+	_rightMinorText.draw(p, Ui::Text::PaintContext{
+		.position = QPoint(xMinor, y + st::creditsHistoryRowRightMinorTop),
+		.outerWidth = outerWidth,
+		.availableWidth = outerWidth,
+	});
 	_rightText.draw(p, Ui::Text::PaintContext{
 		.position = QPoint(
-			outerWidth - _rightText.maxWidth() - rightSkip,
-			y - font->height / 2),
+			xMinor - _rightText.maxWidth(),
+			y + st::creditsHistoryRowRightTop),
 		.outerWidth = outerWidth,
 		.availableWidth = outerWidth,
 	});
 }
 
+void CreditsRow::paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int available,
+		int outer,
+		bool selected) {
+	PeerListRow::paintStatusText(p, st, x, y, available, outer, selected);
+	p.setPen(st.nameFg);
+	if (!_descriptionThumbnailCache.isNull()) {
+		const auto thumbnailSide = _descriptionThumbnailCache.width()
+			/ style::DevicePixelRatio();
+		const auto thumbnailSpace = st::lineWidth * 4 + thumbnailSide;
+		p.drawImage(
+			x,
+			y - thumbnailSide,
+			_descriptionThumbnailCache);
+		x += thumbnailSpace;
+		outer -= thumbnailSpace;
+		available -= thumbnailSpace;
+	}
+	_description.draw(p, {
+		.position = QPoint(x, y - st::creditsHistoryRowDescriptionSkip),
+		.outerWidth = outer,
+		.availableWidth = available,
+		.elisionLines = 1,
+	});
+}
+
+const style::PeerListItem &CreditsRow::computeSt(
+		const style::PeerListItem &st) const {
+	return (!_subscription || !_subscription.title.isEmpty())
+		? st
+		: st::boostsListBox.item;
+}
+
+constexpr auto kCreditsAutoLoadThreshold = 100;
+constexpr auto kCreditsAutoLoadBatchSize = 20;
+
 class CreditsController final : public PeerListController {
 public:
 	explicit CreditsController(CreditsDescriptor d);
@@ -997,11 +1196,17 @@ class CreditsController final : public PeerListController {
 	void loadMoreRows() override;
 
 	[[nodiscard]] bool skipRequest() const;
-	void requestNext();
+	void requestNext(int limit = 0);
 
-	[[nodiscard]] rpl::producer<bool> allLoadedValue() const;
+	[[nodiscard]] rpl::producer<bool> showMoreShownValue() const;
 
 private:
+	struct IconCache {
+		QImage credits;
+		QImage tonIn;
+		QImage tonOut;
+	};
+
 	void applySlice(const Data::CreditsStatusSlice &slice);
 
 	const not_null<Main::Session*> _session;
@@ -1011,9 +1216,13 @@ class CreditsController final : public PeerListController {
 	Api::CreditsHistory _api;
 	Data::CreditsStatusSlice _firstSlice;
 	Data::CreditsStatusSlice::OffsetToken _apiToken;
-	Core::MarkedTextContext _context;
+	IconCache _iconCache;
+	Ui::Text::MarkedContext _context;
+
+	base::flat_map<PeerListRowId, not_null<PeerListRow*>> _rowsById;
 
 	rpl::variable<bool> _allLoaded = false;
+	rpl::variable<int> _loadedCount = 0;
 	bool _requesting = false;
 
 };
@@ -1024,11 +1233,56 @@ CreditsController::CreditsController(CreditsDescriptor d)
 , _entryClickedCallback(std::move(d.entryClickedCallback))
 , _api(d.peer, d.in, d.out)
 , _firstSlice(std::move(d.firstSlice))
-, _context(Core::MarkedTextContext{
-	.session = _session,
-	.customEmojiRepaint = [] {},
-}) {
-	PeerListController::setStyleOverrides(&st::boostsListBox);
+, _context([&]() -> Ui::Text::MarkedContext {
+	const auto height = st::creditsHistoryRowRightStyle.font->height
+		- st::lineWidth;
+	auto customEmojiFactory = [=](
+			QStringView data,
+			const Ui::Text::MarkedContext &context
+		) -> std::unique_ptr<Ui::Text::CustomEmoji> {
+		if (data == Ui::kCreditsCurrency) {
+			if (_iconCache.credits.isNull()) {
+				_iconCache.credits = Ui::GenerateStars(height, 1);
+			}
+			return MakeWrappedEmoji<Ui::Text::ShiftedEmoji>(
+				std::make_unique<Ui::CustomEmoji::Internal>(
+					u"credits_icon:%1:1"_q.arg(height),
+					_iconCache.credits),
+				QPoint(-st::lineWidth, st::lineWidth));
+		}
+		if (data.startsWith(u"ton"_q)) {
+			const auto in = data.split(u":"_q)[1].startsWith(u"in"_q);
+			auto &slot = in ? _iconCache.tonIn : _iconCache.tonOut;
+			if (slot.isNull()) {
+				slot = Ui::Earn::IconCurrencyColored(
+					st::tonFieldIconSize,
+					(in
+						? st::boxTextFgGood->c
+						: st::menuIconAttentionColor->c));
+			}
+			return MakeWrappedEmoji<Ui::Text::ShiftedEmoji>(
+				std::make_unique<Ui::CustomEmoji::Internal>(
+					data.toString(),
+					slot),
+				QPoint(0, st::lineWidth));
+		}
+		const auto desc = DeserializeCreditsRowDescriptionData(
+			data.toString());
+		if (!desc.rowId || !desc.bareGiftStickerId) {
+			return nullptr;
+		}
+		const auto it = _rowsById.find(desc.rowId);
+		if (it != _rowsById.end()) {
+			const auto row = it->second;
+			return _session->data().customEmojiManager().create(
+				desc.bareGiftStickerId,
+				[=]{ delegate()->peerListUpdateRow(row); });
+		}
+		return nullptr;
+	};
+	return { .customEmojiFactory = std::move(customEmojiFactory) };
+}()) {
+	PeerListController::setStyleOverrides(&st::creditsHistoryEntriesList);
 }
 
 Main::Session &CreditsController::session() const {
@@ -1039,16 +1293,16 @@ bool CreditsController::skipRequest() const {
 	return _requesting || _allLoaded.current();
 }
 
-void CreditsController::requestNext() {
+void CreditsController::requestNext(int limit) {
 	_requesting = true;
 	const auto done = [=](const Data::CreditsStatusSlice &s) {
 		_requesting = false;
 		applySlice(s);
 	};
-	if (!_firstSlice.subscriptions.empty()) {
+	if (_subscription) {
 		return _api.requestSubscriptions(_apiToken, done);
 	}
-	_api.request(_apiToken, done);
+	_api.request(_apiToken, done, limit);
 }
 
 void CreditsController::prepare() {
@@ -1057,30 +1311,49 @@ void CreditsController::prepare() {
 }
 
 void CreditsController::loadMoreRows() {
+	if (_subscription
+		|| skipRequest()
+		|| _loadedCount.current() >= kCreditsAutoLoadThreshold) {
+		return;
+	}
+	requestNext(kCreditsAutoLoadBatchSize);
 }
 
 void CreditsController::applySlice(const Data::CreditsStatusSlice &slice) {
 	_allLoaded = slice.allLoaded;
 	_apiToken = _subscription ? slice.tokenSubscriptions : slice.token;
+	_loadedCount = _loadedCount.current()
+		+ int(slice.list.size())
+		+ int(slice.subscriptions.size());
 
 	auto create = [&](
 			const Data::CreditsHistoryEntry &i,
 			const Data::SubscriptionEntry &s) {
 		const auto descriptor = CreditsRow::Descriptor{
+			.session = &session(),
 			.entry = i,
 			.subscription = s,
 			.context = _context,
-			.rowHeight = computeListSt().item.height,
+			.rowHeight = ((!s || !s.title.isEmpty())
+				? computeListSt().item
+				: st::boostsListBox.item).height,
 			.updateCallback = [=](not_null<PeerListRow*> row) {
 				delegate()->peerListUpdateRow(row);
 			},
 		};
-		if (const auto peerId = PeerId(i.barePeerId + s.barePeerId)) {
+		auto owned = std::unique_ptr<CreditsRow>(nullptr);
+		if (i.bareActorId) {
+			const auto peer = session().data().peer(PeerId(i.bareActorId));
+			owned = std::make_unique<CreditsRow>(peer, descriptor);
+		} else if (const auto peerId = PeerId(i.barePeerId + s.barePeerId)) {
 			const auto peer = session().data().peer(peerId);
-			return std::make_unique<CreditsRow>(peer, descriptor);
+			owned = std::make_unique<CreditsRow>(peer, descriptor);
 		} else {
-			return std::make_unique<CreditsRow>(descriptor);
+			owned = std::make_unique<CreditsRow>(descriptor);
 		}
+		_rowsById.emplace(owned->id(), owned.get());
+		owned->init();
+		return owned;
 	};
 
 	auto giftPacksRequested = false;
@@ -1104,8 +1377,16 @@ void CreditsController::rowClicked(not_null<PeerListRow*> row) {
 	}
 }
 
-rpl::producer<bool> CreditsController::allLoadedValue() const {
-	return _allLoaded.value();
+rpl::producer<bool> CreditsController::showMoreShownValue() const {
+	if (_subscription) {
+		return _allLoaded.value() | rpl::map(!rpl::mappers::_1);
+	}
+	return rpl::combine(
+		_allLoaded.value(),
+		_loadedCount.value()
+	) | rpl::map([](bool allLoaded, int count) {
+		return !allLoaded && (count >= kCreditsAutoLoadThreshold);
+	});
 }
 
 } // namespace
@@ -1254,28 +1535,36 @@ void AddCreditsHistoryList(
 		not_null<PeerData*> bot,
 		bool in,
 		bool out,
-		bool subscription) {
+		bool subs) {
 	struct State final {
-		State(
-			CreditsDescriptor d,
-			std::shared_ptr<Main::SessionShow> show)
-		: delegate(std::move(show))
-		, controller(std::move(d)) {
+		State(CreditsDescriptor d) : controller(std::move(d)) {
 		}
-		PeerListContentDelegateShow delegate;
+		std::optional<PeerListContentDelegateShow> creditsDelegate;
+		std::optional<PeerListWidgetsDelegate> subscriptionDelegate;
 		CreditsController controller;
 	};
 	const auto state = container->lifetime().make_state<State>(
-		CreditsDescriptor{ firstSlice, callback, bot, in, out, subscription },
-		show);
-
-	state->delegate.setContent(container->add(
-		object_ptr<PeerListContent>(container, &state->controller)));
-	state->controller.setDelegate(&state->delegate);
+		CreditsDescriptor{ firstSlice, callback, bot, in, out, subs });
+	if (subs) {
+		state->subscriptionDelegate.emplace();
+		state->subscriptionDelegate->setUiShow(show);
+		state->subscriptionDelegate->setContent(container->add(
+			object_ptr<PeerListWidgets>(container, &state->controller)));
+		state->controller.setDelegate(&(*state->subscriptionDelegate));
+	} else {
+		state->creditsDelegate.emplace(show);
+		state->creditsDelegate->setContent(container->add(
+			object_ptr<PeerListContent>(container, &state->controller)));
+		state->controller.setDelegate(&(*state->creditsDelegate));
+	}
 
-	const auto wrap = AddShowMoreButton(
-		container,
-		tr::lng_stories_show_more());
+	const auto wrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+			container,
+			CreateShowMoreButton(container, tr::lng_stories_show_more())),
+		subs
+			? QMargins()
+			: QMargins(0, -st::settingsButton.padding.top(), 0, 0));
 
 	const auto showMore = [=] {
 		if (!state->controller.skipRequest()) {
@@ -1284,7 +1573,7 @@ void AddCreditsHistoryList(
 		}
 	};
 	wrap->toggleOn(
-		state->controller.allLoadedValue() | rpl::map(!rpl::mappers::_1),
+		state->controller.showMoreShownValue(),
 		anim::type::instant);
 	wrap->entity()->setClickedCallback(showMore);
 }
@@ -1292,16 +1581,11 @@ void AddCreditsHistoryList(
 not_null<Ui::SlideWrap<Ui::SettingsButton>*> AddShowMoreButton(
 		not_null<Ui::VerticalLayout*> container,
 		rpl::producer<QString> title) {
-	const auto wrap = container->add(
+	return container->add(
 		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
 			container,
-			object_ptr<Ui::SettingsButton>(
-				container,
-				std::move(title),
-				st::statisticsShowMoreButton)),
+			CreateShowMoreButton(container, std::move(title))),
 		{ 0, -st::settingsButton.padding.top(), 0, 0 });
-	AddArrow(wrap->entity());
-	return wrap;
 }
 
 } // namespace Info::Statistics
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_recent_message.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_recent_message.cpp
index c09038bee6e877..e79502e4b8d35c 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_recent_message.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_recent_message.cpp
@@ -87,10 +87,10 @@ MessagePreview::MessagePreview(
 		st::defaultPeerListItem.nameStyle,
 		item->toPreview({ .generateImages = false }).text,
 		Ui::DialogTextOptions(),
-		Core::MarkedTextContext{
+		Core::TextContext({
 			.session = &item->history()->session(),
-			.customEmojiRepaint = [=] { update(); },
-		});
+			.repaint = [=] { update(); },
+		}));
 	if (item->media() && item->media()->hasSpoiler()) {
 		_spoiler = std::make_unique<Ui::SpoilerAnimation>([=] { update(); });
 	}
@@ -131,10 +131,10 @@ MessagePreview::MessagePreview(
 		st::defaultPeerListItem.nameStyle,
 		{ tr::lng_in_dlg_story(tr::now) },
 		Ui::DialogTextOptions(),
-		Core::MarkedTextContext{
+		Core::TextContext({
 			.session = &story->peer()->session(),
-			.customEmojiRepaint = [=] { update(); },
-		});
+			.repaint = [=] { update(); },
+		}));
 	if (_preview.isNull()) {
 		if (const auto photo = story->photo()) {
 			_photoMedia = photo->createMediaView();
@@ -199,7 +199,7 @@ void MessagePreview::processPreview() {
 
 	rpl::single(rpl::empty) | rpl::then(
 		session->downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto computed = computeThumbInfo();
 		const auto guard = gsl::finally([&] { update(); });
 		if (!computed.image) {
@@ -224,6 +224,7 @@ void MessagePreview::processPreview() {
 			auto image = QImage(
 				rect.size() * style::DevicePixelRatio(),
 				QImage::Format_ARGB32_Premultiplied);
+			image.setDevicePixelRatio(style::DevicePixelRatio());
 			image.fill(Qt::transparent);
 			{
 				auto p = QPainter(&image);
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_tag.h b/Telegram/SourceFiles/info/statistics/info_statistics_tag.h
new file mode 100644
index 00000000000000..e2bc2760fcf1bf
--- /dev/null
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_tag.h
@@ -0,0 +1,31 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class PeerData;
+
+namespace Info::Statistics {
+
+struct Tag final {
+	explicit Tag() = default;
+	explicit Tag(
+		PeerData *peer,
+		FullMsgId contextId,
+		FullStoryId storyId)
+	: peer(peer)
+	, contextId(contextId)
+	, storyId(storyId) {
+	}
+
+	PeerData *peer = nullptr;
+	FullMsgId contextId;
+	FullStoryId storyId;
+
+};
+
+} // namespace Info::Statistics
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_widget.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_widget.cpp
index fc40d9e09fa071..ca88853300a87a 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_widget.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_widget.cpp
@@ -19,11 +19,7 @@ For license and copyright information please follow this link:
 namespace Info::Statistics {
 
 Memento::Memento(not_null<Controller*> controller)
-: ContentMemento(Tag{
-	controller->statisticsPeer(),
-	controller->statisticsContextId(),
-	controller->statisticsStoryId(),
-}) {
+: ContentMemento(controller->statisticsTag()) {
 }
 
 Memento::Memento(not_null<PeerData*> peer, FullMsgId contextId)
@@ -65,11 +61,11 @@ Widget::Widget(
 	object_ptr<InnerWidget>(
 		this,
 		controller,
-		controller->statisticsPeer(),
-		controller->statisticsContextId(),
-		controller->statisticsStoryId()))) {
+		controller->statisticsTag().peer,
+		controller->statisticsTag().contextId,
+		controller->statisticsTag().storyId))) {
 	_inner->showRequests(
-	) | rpl::start_with_next([=](InnerWidget::ShowRequest request) {
+	) | rpl::on_next([=](InnerWidget::ShowRequest request) {
 		if (request.history) {
 			controller->showPeerHistory(
 				request.history.peer,
@@ -79,7 +75,7 @@ Widget::Widget(
 			controller->showPeerInfo(request.info);
 		} else if (request.messageStatistic || request.storyStatistic) {
 			controller->showSection(Make(
-				controller->statisticsPeer(),
+				controller->statisticsTag().peer,
 				request.messageStatistic,
 				request.storyStatistic));
 		} else if (const auto &s = request.story) {
@@ -92,7 +88,7 @@ Widget::Widget(
 		}
 	}, _inner->lifetime());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([=](const Ui::ScrollToRequest &request) {
+	) | rpl::on_next([this](const Ui::ScrollToRequest &request) {
 		scrollTo(request);
 	}, _inner->lifetime());
 }
@@ -102,9 +98,9 @@ bool Widget::showInternal(not_null<ContentMemento*> memento) {
 }
 
 rpl::producer<QString> Widget::title() {
-	return controller()->statisticsContextId()
+	return controller()->statisticsTag().contextId
 		? tr::lng_stats_message_title()
-		: controller()->statisticsStoryId()
+		: controller()->statisticsTag().storyId
 		? tr::lng_stats_story_title()
 		: tr::lng_stats_title();
 }
diff --git a/Telegram/SourceFiles/info/stories/info_stories_albums.cpp b/Telegram/SourceFiles/info/stories/info_stories_albums.cpp
new file mode 100644
index 00000000000000..9ac995aa23443b
--- /dev/null
+++ b/Telegram/SourceFiles/info/stories/info_stories_albums.cpp
@@ -0,0 +1,151 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/stories/info_stories_albums.h"
+#include "apiwrap.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_stories.h"
+#include "data/data_story.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/layers/generic_box.h"
+#include "ui/widgets/fields/input_field.h"
+#include "window/window_session_controller.h"
+#include "styles/style_layers.h"
+#include "styles/style_info.h"
+
+namespace Info::Stories {
+namespace {
+
+constexpr auto kAlbumNameLimit = 12;
+
+void EditAlbumBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		int id,
+		StoryId addId,
+		QString currentName,
+		Fn<void(Data::StoryAlbum)> finished) {
+	box->setTitle(id
+		? tr::lng_stories_album_edit()
+		: tr::lng_stories_album_new_title());
+
+	if (!id) {
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_stories_album_new_text(),
+				st::collectionAbout));
+	}
+	const auto title = box->addRow(
+		object_ptr<Ui::InputField>(
+			box,
+			st::collectionNameField,
+			tr::lng_stories_album_new_ph(),
+			currentName));
+	title->setMaxLength(kAlbumNameLimit * 2);
+	box->setFocusCallback([=] {
+		title->setFocusFast();
+	});
+
+	Ui::AddLengthLimitLabel(title, kAlbumNameLimit);
+
+	const auto show = navigation->uiShow();
+	const auto session = &peer->session();
+
+	const auto creating = std::make_shared<bool>(false);
+	const auto submit = [=] {
+		if (*creating) {
+			return;
+		}
+		const auto text = title->getLastText().trimmed();
+		if (text.isEmpty() || text.size() > kAlbumNameLimit) {
+			title->showError();
+			return;
+		}
+
+		*creating = true;
+		const auto weak = base::make_weak(box);
+		const auto done = [=](Data::StoryAlbum result) {
+			*creating = false;
+			if (const auto onstack = finished) {
+				onstack(result);
+			}
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		};
+		const auto fail = [=](QString type) {
+			*creating = false;
+			if (type == u"ALBUMS_TOO_MANY"_q) {
+				show->show(Ui::MakeInformBox({
+					.text = tr::lng_stories_album_limit_text(),
+					.confirmText = tr::lng_box_ok(),
+					.title = tr::lng_stories_album_limit_title(),
+				}));
+				if (const auto strong = weak.get()) {
+					strong->closeBox();
+				}
+			} else {
+				show->showToast(type);
+			}
+		};
+		if (id) {
+			session->data().stories().albumRename(
+				peer,
+				id,
+				text,
+				done,
+				fail);
+		} else {
+			session->data().stories().albumCreate(
+				peer,
+				text,
+				addId,
+				done,
+				fail);
+		}
+	};
+	title->submits() | rpl::on_next(submit, title->lifetime());
+	auto text = id
+		? tr::lng_settings_save()
+		: tr::lng_stories_album_new_create();
+	box->addButton(std::move(text), submit);
+
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+}
+
+} // namespace
+
+void NewAlbumBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		StoryId addId,
+		Fn<void(Data::StoryAlbum)> added) {
+	EditAlbumBox(box, navigation, peer, 0, addId, QString(), added);
+}
+
+void EditAlbumNameBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		int id,
+		QString current,
+		Fn<void(QString)> done) {
+	EditAlbumBox(box, navigation, peer, id, {}, current, [=](
+			Data::StoryAlbum result) {
+		done(result.title);
+	});
+}
+
+} // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_albums.h b/Telegram/SourceFiles/info/stories/info_stories_albums.h
new file mode 100644
index 00000000000000..d1ef52fc2aca63
--- /dev/null
+++ b/Telegram/SourceFiles/info/stories/info_stories_albums.h
@@ -0,0 +1,39 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+struct StoryAlbum;
+} // namespace Data
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+namespace Window {
+class SessionNavigation;
+} // namespace Window
+
+namespace Info::Stories {
+
+void NewAlbumBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	StoryId addId,
+	Fn<void(Data::StoryAlbum)> added);
+
+void EditAlbumNameBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	int id,
+	QString current,
+	Fn<void(QString)> done);
+
+} // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_common.h b/Telegram/SourceFiles/info/stories/info_stories_common.h
new file mode 100644
index 00000000000000..afa0f13eff942e
--- /dev/null
+++ b/Telegram/SourceFiles/info/stories/info_stories_common.h
@@ -0,0 +1,29 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Info::Stories {
+
+[[nodiscard]] int ArchiveId();
+
+struct Tag {
+	explicit Tag(
+		not_null<PeerData*> peer,
+		int albumId = 0,
+		int addingToAlbumId = 0)
+	: peer(peer)
+	, albumId(albumId)
+	, addingToAlbumId(addingToAlbumId) {
+	}
+
+	not_null<PeerData*> peer;
+	int albumId = 0;
+	int addingToAlbumId = 0;
+};
+
+} // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index bfabe89c20eead..2e5771dda444cc 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -7,151 +7,398 @@ For license and copyright information please follow this link:
 */
 #include "info/stories/info_stories_inner_widget.h"
 
+#include "apiwrap.h"
+#include "boxes/share_box.h"
 #include "data/data_peer.h"
+#include "data/data_saved_music.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_user.h"
 #include "dialogs/ui/dialogs_stories_content.h"
 #include "dialogs/ui/dialogs_stories_list.h"
+#include "info/media/info_media_buttons.h"
 #include "info/media/info_media_list_widget.h"
+#include "info/peer_gifts/info_peer_gifts_widget.h"
+#include "info/profile/info_profile_actions.h"
 #include "info/profile/info_profile_icon.h"
+#include "info/profile/info_profile_top_bar.h"
+#include "info/profile/info_profile_values.h"
+#include "info/profile/info_profile_widget.h"
+#include "info/saved/info_saved_music_common.h"
+#include "info/stories/info_stories_albums.h"
 #include "info/stories/info_stories_widget.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "mtproto/sender.h"
 #include "settings/settings_common.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/controls/sub_tabs.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
+#include "ui/vertical_list.h"
+#include "ui/ui_utility.h"
+#include "styles/style_credits.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_settings.h"
 
 namespace Info::Stories {
+namespace {
 
-class EmptyWidget : public Ui::RpWidget {
+class EditAlbumBox final : public Ui::BoxContent {
 public:
-	EmptyWidget(QWidget *parent);
+	EditAlbumBox(
+		QWidget*,
+		not_null<Controller*> controller,
+		not_null<PeerData*> peer,
+		Fn<void()> reload,
+		int albumId);
 
-	void setFullHeight(rpl::producer<int> fullHeightValue);
-
-protected:
-	int resizeGetHeight(int newWidth) override;
+private:
+	void prepare() override;
 
-	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
 
-private:
-	object_ptr<Ui::FlatLabel> _text;
-	int _height = 0;
+	const not_null<Window::SessionController*> _window;
+	const not_null<WrapWidget*> _content;
+	rpl::variable<Data::StoryAlbumUpdate> _changes;
+	Fn<void()> _reload;
+	bool _saving = false;
 
 };
 
-EmptyWidget::EmptyWidget(QWidget *parent)
-: RpWidget(parent)
-, _text(this, st::infoEmptyLabel) {
-}
-
-void EmptyWidget::setFullHeight(rpl::producer<int> fullHeightValue) {
-	std::move(
-		fullHeightValue
-	) | rpl::start_with_next([this](int fullHeight) {
-		// Make icon center be on 1/3 height.
-		auto iconCenter = fullHeight / 3;
-		auto iconHeight = st::infoEmptyStories.height();
-		auto iconTop = iconCenter - iconHeight / 2;
-		_height = iconTop + st::infoEmptyIconTop;
-		resizeToWidth(width());
+EditAlbumBox::EditAlbumBox(
+	QWidget*,
+	not_null<Controller*> controller,
+	not_null<PeerData*> peer,
+	Fn<void()> reload,
+	int albumId)
+: _window(controller->parentController())
+, _content(Ui::CreateChild<WrapWidget>(
+	this,
+	_window,
+	Wrap::StoryAlbumEdit,
+	std::make_shared<Info::Memento>(
+		std::vector<std::shared_ptr<ContentMemento>>(
+			1,
+			std::make_shared<Memento>(
+				peer,
+				Data::kStoriesAlbumIdArchive,
+				albumId))).get()))
+, _changes(Data::StoryAlbumUpdate{ .peer = peer, .albumId = albumId })
+, _reload(std::move(reload)) {
+	_content->selectedListValue(
+	) | rpl::on_next([=](const SelectedItems &selection) {
+		const auto stories = &_window->session().data().stories();
+		auto ids = stories->albumKnownInArchive(peer->id, albumId);
+		auto now = _changes.current();
+		now.added.clear();
+		now.added.reserve(selection.list.size());
+		now.removed.clear();
+		now.removed.reserve(ids.size());
+		for (const auto &entry : selection.list) {
+			const auto id = StoryIdFromMsgId(entry.globalId.itemId.msg);
+			if (!ids.remove(id)) {
+				now.added.push_back(id);
+			}
+		}
+		for (const auto id : ids) {
+			now.removed.push_back(id);
+		}
+		_changes = std::move(now);
 	}, lifetime());
 }
 
-int EmptyWidget::resizeGetHeight(int newWidth) {
-	auto labelTop = _height - st::infoEmptyLabelTop;
-	auto labelWidth = newWidth - 2 * st::infoEmptyLabelSkip;
-	_text->resizeToNaturalWidth(labelWidth);
+void EditAlbumBox::prepare() {
+	setTitle(tr::lng_stories_album_add_title());
+	setStyle(st::collectionEditBox);
 
-	auto labelLeft = (newWidth - _text->width()) / 2;
-	_text->moveToLeft(labelLeft, labelTop, newWidth);
+	_content->desiredHeightValue(
+	) | rpl::on_next([=](int height) {
+		setDimensions(st::boxWideWidth, height);
+	}, _content->lifetime());
 
-	update();
-	return _height;
-}
+	addTopButton(st::boxTitleClose, [=] {
+		closeBox();
+	});
 
-void EmptyWidget::paintEvent(QPaintEvent *e) {
-	auto p = QPainter(this);
+	const auto weakBox = base::make_weak(this);
+	auto text = _changes.value(
+	) | rpl::map([=](const Data::StoryAlbumUpdate &update) {
+		return (!update.added.empty() && update.removed.empty())
+			? tr::lng_stories_album_add_button()
+			: tr::lng_settings_save();
+	}) | rpl::flatten_latest();
+	addButton(std::move(text), [=] {
+		if (_saving) {
+			return;
+		}
+		auto add = QVector<MTPint>();
+		auto remove = QVector<MTPint>();
+		const auto &changes = _changes.current();
+		for (const auto &id : changes.added) {
+			add.push_back(MTP_int(id));
+		}
+		for (const auto &id : changes.removed) {
+			remove.push_back(MTP_int(id));
+		}
+		if (add.empty() && remove.empty()) {
+			closeBox();
+			return;
+		}
+		_saving = true;
+		const auto session = &_window->session();
+		const auto reload = _reload;
+		using Flag = MTPstories_UpdateAlbum::Flag;
+		session->api().request(
+			MTPstories_UpdateAlbum(
+				MTP_flags(Flag()
+					| (add.isEmpty() ? Flag() : Flag::f_add_stories)
+					| (remove.isEmpty()
+						? Flag()
+						: Flag::f_delete_stories)),
+				changes.peer->input(),
+				MTP_int(changes.albumId),
+				MTPstring(),
+				MTP_vector<MTPint>(remove),
+				MTP_vector<MTPint>(add),
+				MTPVector<MTPint>())
+		).done([=] {
+			if (const auto strong = weakBox.get()) {
+				strong->_saving = false;
+				strong->closeBox();
+			}
+			session->data().stories().notifyAlbumUpdate(
+				base::duplicate(changes));
+			if (const auto onstack = reload) {
+				onstack();
+			}
+		}).fail([=](const MTP::Error &error) {
+			if (const auto strong = weakBox.get()) {
+				strong->_saving = false;
+				strong->uiShow()->showToast(error.type());
+			}
+		}).send();
+	});
+}
 
-	const auto iconLeft = (width() - st::infoEmptyStories.width()) / 2;
-	const auto iconTop = height() - st::infoEmptyIconTop;
-	st::infoEmptyStories.paint(p, iconLeft, iconTop, width());
+void EditAlbumBox::resizeEvent(QResizeEvent *e) {
+	_content->setGeometry(rect());
 }
 
+} // namespace
+
 InnerWidget::InnerWidget(
 	QWidget *parent,
-	not_null<Controller*> controller)
+	not_null<Controller*> controller,
+	rpl::producer<int> albumId,
+	int addingToAlbumId)
 : RpWidget(parent)
 , _controller(controller)
-, _empty(this) {
-	_empty->heightValue(
-	) | rpl::start_with_next(
-		[this] { refreshHeight(); },
-		_empty->lifetime());
-	_list = setupList();
+, _peer(controller->key().storiesPeer())
+, _addingToAlbumId(addingToAlbumId)
+, _albumId(std::move(albumId))
+, _albumChanges(Data::StoryAlbumUpdate{
+	.peer = _peer,
+	.albumId = _addingToAlbumId,
+})
+, _api(std::make_unique<MTP::Sender>(&_peer->session().mtp())) {
+	preloadArchiveCount();
+
+	_albumId.value(
+	) | rpl::on_next([=](int albumId) {
+		if (_albumsTabs
+			&& (albumId == Data::kStoriesAlbumIdSaved
+				|| ranges::contains(
+					_albums,
+					albumId,
+					&Data::StoryAlbum::id))) {
+			_albumsTabs->setActiveTab((albumId == Data::kStoriesAlbumIdSaved)
+				? u"all"_q
+				: QString::number(albumId));
+		}
+		_controller->replaceKey(Key(Tag(_peer, albumId, _addingToAlbumId)));
+		reload();
+	}, lifetime());
+}
+
+void InnerWidget::preloadArchiveCount() {
+	constexpr auto kArchive = Data::kStoriesAlbumIdArchive;
+	const auto stories = &_peer->owner().stories();
+	if (!_peer->canEditStories()
+		|| stories->albumIdsCountKnown(_peer->id, kArchive)) {
+		return;
+	}
+	const auto key = Data::StoryAlbumIdsKey{ _peer->id, kArchive };
+	stories->albumIdsLoadMore(_peer->id, kArchive);
+	stories->albumIdsChanged() | rpl::filter(
+		rpl::mappers::_1 == key
+	) | rpl::take_while([=] {
+		return !stories->albumIdsCountKnown(_peer->id, kArchive);
+	}) | rpl::on_next([=] {
+		refreshAlbumsTabs();
+	}, lifetime());
+}
+
+void InnerWidget::setupAlbums() {
+	Ui::AddSkip(_top);
+	_albumsWrap = _top->add(object_ptr<Ui::BoxContentDivider>(_top));
+
+	_peer->owner().stories().albumsListValue(
+		_peer->id
+	) | rpl::on_next([=](std::vector<Data::StoryAlbum> &&albums) {
+		_albums = std::move(albums);
+		refreshAlbumsTabs();
+	}, lifetime());
+}
+
+InnerWidget::~InnerWidget() = default;
+
+rpl::producer<> InnerWidget::backRequest() const {
+	return _backClicks.events();
 }
 
 void InnerWidget::setupTop() {
-	const auto key = _controller->key();
-	const auto peer = key.storiesPeer();
-	if (peer
-		&& key.storiesTab() == Stories::Tab::Saved
-		&& peer->owner().stories().hasArchive(peer)
-		&& _isStackBottom) {
-		createButtons();
-	} else if (peer && key.storiesTab() == Stories::Tab::Archive) {
+	const auto albumId = _albumId.current();
+	if (_addingToAlbumId) {
+		return;
+	} else if (albumId == Data::kStoriesAlbumIdArchive) {
 		createAboutArchive();
+	} else if (_isStackBottom) {
+		if (_peer->isSelf()) {
+			createProfileTop();
+		} else if (_peer->owner().stories().hasArchive(_peer)) {
+			createButtons();
+		} else {
+			startTop();
+			finalizeTop();
+		}
 	} else {
-		_top.destroy();
-		refreshHeight();
+		startTop();
+		finalizeTop();
 	}
 }
 
-void InnerWidget::createButtons() {
+void InnerWidget::startTop() {
+	_albumsTabs = nullptr;
+	_albumsWrap = nullptr;
 	_top.create(this);
 	_top->show();
 	_topHeight = _top->heightValue();
+}
 
-	const auto key = _controller->key();
-	const auto peer = key.storiesPeer();
-	const auto stories = &peer->owner().stories();
-	const auto archive = _top->add(object_ptr<Ui::SettingsButton>(
+void InnerWidget::createProfileTop() {
+	startTop();
+
+	Info::Saved::SetupSavedMusic(
 		_top,
-		tr::lng_stories_archive_button(),
-		st::infoSharedMediaButton));
-	archive->addClickHandler([=] {
-		_controller->showSection(Info::Stories::Make(
-			_controller->key().storiesPeer(),
-			Stories::Tab::Archive));
-	});
+		_controller,
+		_peer,
+		_topBarColor.value());
+
+	using namespace Profile;
+	AddDetails(
+		_top,
+		_controller,
+		_peer,
+		nullptr,
+		nullptr,
+		{ v::null });
+
+	auto tracker = Ui::MultiSlideTracker();
+	const auto dividerWrap = _top->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			_top,
+			object_ptr<Ui::VerticalLayout>(_top)));
+	const auto divider = dividerWrap->entity();
+	Ui::AddDivider(divider);
+	Ui::AddSkip(divider);
+
+	addGiftsButton(tracker);
+	addArchiveButton(tracker);
+	addRecentButton(tracker);
+
+	dividerWrap->toggleOn(tracker.atLeastOneShownValue());
+
+	finalizeTop();
+}
+
+void InnerWidget::createButtons() {
+	startTop();
+	auto tracker = Ui::MultiSlideTracker();
+	addArchiveButton(tracker);
+	addRecentButton(tracker);
+	finalizeTop();
+}
+
+void InnerWidget::addArchiveButton(Ui::MultiSlideTracker &tracker) {
+	Expects(_top != nullptr);
+
+	const auto stories = &_peer->owner().stories();
+
+	constexpr auto kArchive = Data::kStoriesAlbumIdArchive;
+	if (!stories->albumIdsCountKnown(_peer->id, kArchive)) {
+		stories->albumIdsLoadMore(_peer->id, kArchive);
+	}
+
 	auto count = rpl::single(
 		rpl::empty
 	) | rpl::then(
-		stories->archiveChanged(
+		stories->albumIdsChanged(
 		) | rpl::filter(
-			rpl::mappers::_1 == peer->id
+			rpl::mappers::_1 == Data::StoryAlbumIdsKey{ _peer->id, kArchive }
 		) | rpl::to_empty
 	) | rpl::map([=] {
-		const auto value = stories->archiveCount(peer->id);
-		return (value > 0) ? QString::number(value) : QString();
+		return stories->albumIdsCount(_peer->id, kArchive);
+	}) | rpl::start_spawning(_top->lifetime());
+
+	const auto archiveWrap = _top->add(
+		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+			_top,
+			object_ptr<Ui::SettingsButton>(
+				_top,
+				tr::lng_stories_archive_button(),
+				st::infoSharedMediaButton))
+	)->setDuration(
+		st::infoSlideDuration
+	)->toggleOn(rpl::duplicate(count) | rpl::map(rpl::mappers::_1 > 0));
+
+	const auto archive = archiveWrap->entity();
+	archive->addClickHandler([=] {
+		_controller->showSection(Make(_peer, kArchive));
+	});
+	auto label = rpl::duplicate(
+		count
+	) | rpl::filter(
+		rpl::mappers::_1 > 0
+	) | rpl::map([=](int count) {
+		return (count > 0) ? QString::number(count) : QString();
 	});
 	::Settings::CreateRightLabel(
 		archive,
-		std::move(count),
+		std::move(label),
 		st::infoSharedMediaButton,
 		tr::lng_stories_archive_button());
 	object_ptr<Profile::FloatingIcon>(
 		archive,
 		st::infoIconMediaStoriesArchive,
 		st::infoSharedMediaButtonIconPosition)->show();
+	tracker.track(archiveWrap);
+}
+
+void InnerWidget::addRecentButton(Ui::MultiSlideTracker &tracker) {
+	Expects(_top != nullptr);
 
 	const auto recentWrap = _top->add(
 		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
@@ -163,7 +410,7 @@ void InnerWidget::createButtons() {
 
 	using namespace Dialogs::Stories;
 	auto last = LastForPeer(
-		peer
+		_peer
 	) | rpl::map([=](Content &&content) {
 		for (auto &element : content.elements) {
 			element.unreadCount = 0;
@@ -181,7 +428,7 @@ void InnerWidget::createButtons() {
 	rpl::combine(
 		recent->sizeValue(),
 		rpl::duplicate(last)
-	) | rpl::start_with_next([=](QSize size, const Content &content) {
+	) | rpl::on_next([=](QSize size, const Content &content) {
 		if (content.elements.empty()) {
 			return;
 		}
@@ -196,7 +443,7 @@ void InnerWidget::createButtons() {
 	}, thumbs->lifetime());
 	thumbs->setAttribute(Qt::WA_TransparentForMouseEvents);
 	recent->addClickHandler([=] {
-		_controller->parentController()->openPeerStories(peer->id);
+		_controller->parentController()->openPeerStories(_peer->id);
 	});
 	object_ptr<Profile::FloatingIcon>(
 		recent,
@@ -207,45 +454,144 @@ void InnerWidget::createButtons() {
 	) | rpl::map([](const Content &content) {
 		return !content.elements.empty();
 	}));
+	tracker.track(recentWrap);
+}
 
-	_top->add(object_ptr<Ui::FixedHeightWidget>(
-		_top,
-		st::infoProfileSkip));
-	_top->add(object_ptr<Ui::BoxContentDivider>(_top));
+void InnerWidget::addGiftsButton(Ui::MultiSlideTracker &tracker) {
+	Expects(_top != nullptr);
 
+	const auto user = _peer->asUser();
+	Assert(user != nullptr);
+
+	auto count = Profile::PeerGiftsCountValue(
+		user
+	) | rpl::start_spawning(_top->lifetime());
+
+	const auto giftsWrap = _top->add(
+		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+			_top,
+			object_ptr<Ui::SettingsButton>(
+				_top,
+				tr::lng_peer_gifts_title(),
+				st::infoSharedMediaButton))
+	)->setDuration(
+		st::infoSlideDuration
+	)->toggleOn(rpl::duplicate(count) | rpl::map(rpl::mappers::_1 > 0));
+
+	const auto gifts = giftsWrap->entity();
+	gifts->addClickHandler([=] {
+		_controller->showSection(PeerGifts::Make(_peer));
+	});
+	auto label = rpl::duplicate(
+		count
+	) | rpl::filter(
+		rpl::mappers::_1 > 0
+	) | rpl::map([=](int count) {
+		return (count > 0) ? QString::number(count) : QString();
+	});
+	::Settings::CreateRightLabel(
+		gifts,
+		std::move(label),
+		st::infoSharedMediaButton,
+		tr::lng_stories_archive_button());
+	object_ptr<Profile::FloatingIcon>(
+		gifts,
+		st::infoIconMediaGifts,
+		st::infoSharedMediaButtonIconPosition)->show();
+	tracker.track(giftsWrap);
+}
+
+bool InnerWidget::hasFlexibleTopBar() const {
+	return (_controller->key().storiesAlbumId() != Stories::ArchiveId()
+		&& _controller->key().storiesPeer()
+		&& _controller->key().storiesPeer()->isSelf());
+}
+
+base::weak_qptr<Ui::RpWidget> InnerWidget::createPinnedToTop(
+		not_null<Ui::RpWidget*> parent) {
+	if (!hasFlexibleTopBar()) {
+		return nullptr;
+	}
+
+	const auto content = Ui::CreateChild<Profile::TopBar>(
+		parent,
+		Profile::TopBar::Descriptor{
+			.controller = _controller->parentController(),
+			.key = _controller->key(),
+			.wrap = _controller->wrapValue(),
+			.source = Profile::TopBar::Source::Stories,
+			.peer = _peer,
+			.backToggles = _backToggles.value(),
+			.showFinished = _showFinished.events(),
+		});
+	content->backRequest(
+	) | rpl::start_to_stream(_backClicks, content->lifetime());
+	_topBarColor = content->edgeColor();
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
+}
+
+base::weak_qptr<Ui::RpWidget> InnerWidget::createPinnedToBottom(
+		not_null<Ui::RpWidget*> parent) {
+	return nullptr;
+}
+
+void InnerWidget::enableBackButton() {
+	_backToggles.force_assign(true);
+}
+
+void InnerWidget::showFinished() {
+	_showFinished.fire({});
+
+	const auto window = _controller->parentController();
+	window->checkHighlightControl(u"my-profile/posts"_q, _albumsWrap);
+	if (window->highlightControlId() == u"my-profile/posts/add-album"_q) {
+		window->setHighlightControlId(QString());
+		if (_albumsWrap) {
+			::Settings::HighlightWidget(_albumsWrap);
+		}
+		_controller->uiShow()->show(Box(
+			NewAlbumBox,
+			_controller,
+			_peer,
+			StoryId(),
+			[=](Data::StoryAlbum album) { albumAdded(album); }));
+	}
+}
+
+void InnerWidget::finalizeTop() {
+	const auto addPossibleAlbums = !_addingToAlbumId
+		&& (_albumId.current() != Data::kStoriesAlbumIdArchive);
+	if (addPossibleAlbums) {
+		setupAlbums();
+	}
 	_top->resizeToWidth(width());
+
 	_top->heightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshHeight();
 	}, _top->lifetime());
 }
 
 void InnerWidget::createAboutArchive() {
-	_top.create(this);
-	_top->show();
-	_topHeight = _top->heightValue();
+	startTop();
 
-	const auto peer = _controller->key().storiesPeer();
 	_top->add(object_ptr<Ui::DividerLabel>(
 		_top,
 		object_ptr<Ui::FlatLabel>(
 			_top,
-			(peer->isChannel()
+			(_peer->isChannel()
 				? tr::lng_stories_channel_archive_about
 				: tr::lng_stories_archive_about)(),
 			st::infoStoriesAboutArchive),
 		st::infoStoriesAboutArchivePadding));
 
-	_top->resizeToWidth(width());
-	_top->heightValue(
-	) | rpl::start_with_next([=] {
-		refreshHeight();
-	}, _top->lifetime());
+	finalizeTop();
 }
 
 void InnerWidget::visibleTopBottomUpdated(
 		int visibleTop,
 		int visibleBottom) {
+	_visibleRange = { visibleTop, visibleBottom };
 	setChildVisibleTopBottom(_list, visibleTop, visibleBottom);
 }
 
@@ -257,27 +603,406 @@ bool InnerWidget::showInternal(not_null<Memento*> memento) {
 	return false;
 }
 
-object_ptr<Media::ListWidget> InnerWidget::setupList() {
-	auto result = object_ptr<Media::ListWidget>(
+void InnerWidget::setupList() {
+	Expects(!_list);
+
+	_list = object_ptr<Media::ListWidget>(
 		this,
 		_controller);
-	result->heightValue(
-	) | rpl::start_with_next(
-		[this] { refreshHeight(); },
-		result->lifetime());
+	const auto raw = _list.data();
+	const auto albumId = _albumId.current();
+	if (albumId && albumId != Data::kStoriesAlbumIdArchive) {
+		raw->setReorderDescriptor({
+			// .filter = [=](HistoryItem *item) {
+			// 	const auto stories = &_peer->owner().stories();
+			// 	const auto &albumIds = stories->albumIds(_peer->id, albumId);
+			// 	const auto storyId = StoryIdFromMsgId(item->id);
+			// 	return !ranges::contains(albumIds.pinnedToTop, storyId);
+			// },
+			.save = [=](
+					int oldPosition,
+					int newPosition,
+					Fn<void()> done,
+					Fn<void()> fail) {
+				_peer->owner().stories().albumReorderStories(
+					_peer,
+					albumId,
+					oldPosition,
+					newPosition,
+					done,
+					fail);
+			}
+		});
+	}
+
 	using namespace rpl::mappers;
-	result->scrollToRequests(
-	) | rpl::map([widget = result.data()](int to) {
+	raw->scrollToRequests(
+	) | rpl::map([=](int to) {
 		return Ui::ScrollToRequest {
-			widget->y() + to,
+			raw->y() + to,
 			-1
 		};
-	}) | rpl::start_to_stream(
-		_scrollToRequests,
-		result->lifetime());
-	_selectedLists.fire(result->selectedListValue());
-	_listTops.fire(result->topValue());
-	return result;
+	}) | rpl::start_to_stream(_scrollToRequests, raw->lifetime());
+	_selectedLists.fire(raw->selectedListValue());
+	_listTops.fire(raw->topValue());
+
+	raw->show();
+
+	Ui::PostponeCall(crl::guard(this, [=] {
+		visibleTopBottomUpdated(_visibleRange.top, _visibleRange.bottom);
+	}));
+}
+
+void InnerWidget::setupEmpty() {
+	_list->resizeToWidth(width());
+
+	const auto stories = &_controller->session().data().stories();
+	const auto key = Data::StoryAlbumIdsKey{ _peer->id, _albumId.current() };
+	rpl::combine(
+		rpl::single(
+			rpl::empty
+		) | rpl::then(
+			stories->albumIdsChanged() | rpl::filter(
+				rpl::mappers::_1 == key
+			) | rpl::to_empty
+		),
+		_list->heightValue()
+	) | rpl::on_next([=](auto, int listHeight) {
+		const auto padding = st::infoMediaMargin;
+		if (const auto raw = _empty.release()) {
+			raw->hide();
+			raw->deleteLater();
+		}
+		_emptyLoading = false;
+		if (listHeight <= padding.bottom() + padding.top()) {
+			refreshEmpty();
+		} else {
+			_albumEmpty = false;
+		}
+		refreshHeight();
+	}, _list->lifetime());
+}
+
+void InnerWidget::refreshEmpty() {
+	const auto albumId = _albumId.current();
+	const auto stories = &_controller->session().data().stories();
+	const auto knownEmpty = stories->albumIdsCountKnown(_peer->id, albumId);
+	const auto albumCanAdd = knownEmpty
+		&& albumId
+		&& (albumId != Data::kStoriesAlbumIdArchive)
+		&& _peer->canEditStories();
+	_albumEmpty = albumCanAdd;
+	if (albumCanAdd) {
+		auto empty = object_ptr<Ui::VerticalLayout>(this);
+		empty->add(
+			object_ptr<Ui::FlatLabel>(
+				empty.get(),
+				tr::lng_stories_album_empty_title(),
+				st::collectionEmptyTitle),
+			st::collectionEmptyTitleMargin,
+			style::al_top);
+		empty->add(
+			object_ptr<Ui::FlatLabel>(
+				empty.get(),
+				tr::lng_stories_album_empty_text(),
+				st::collectionEmptyText),
+			st::collectionEmptyTextMargin,
+			style::al_top);
+
+		const auto button = empty->add(
+			object_ptr<Ui::RoundButton>(
+				empty.get(),
+				rpl::single(QString()),
+				st::collectionEmptyButton),
+			st::collectionEmptyAddMargin,
+			style::al_top);
+		button->setText(tr::lng_stories_album_add_button(
+		) | rpl::map([](const QString &text) {
+			return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
+		}));
+		button->setClickedCallback([=] {
+			editAlbumStories(albumId);
+		});
+		empty->show();
+		_empty = std::move(empty);
+	} else {
+		_empty = object_ptr<Ui::FlatLabel>(
+			this,
+			(!knownEmpty
+				? tr::lng_contacts_loading(tr::marked)
+				: _peer->isSelf()
+				? tr::lng_stories_empty(tr::rich)
+				: tr::lng_stories_empty_channel(tr::rich)),
+			st::giftListAbout);
+		_empty->show();
+	}
+	_emptyLoading = !albumCanAdd && !knownEmpty;
+	resizeToWidth(width());
+}
+
+void InnerWidget::refreshAlbumsTabs() {
+	Expects(!_addingToAlbumId);
+	Expects(_albumsWrap != nullptr);
+
+	const auto has = _peer->canEditStories()
+		&& _peer->owner().stories().albumIdsCount(
+			_peer->id,
+			Data::kStoriesAlbumIdArchive);
+	if (_albums.empty() && !has) {
+		if (base::take(_albumsTabs)) {
+			resizeToWidth(width());
+		}
+		return;
+	}
+	auto tabs = std::vector<Ui::SubTabs::Tab>();
+	auto selected = QString();
+	if (!_albums.empty()) {
+		tabs.push_back({
+			.id = u"all"_q,
+			.text = tr::lng_stories_album_all(
+				tr::now,
+				tr::marked),
+		});
+		for (const auto &album : _albums) {
+			auto title = TextWithEntities();
+			title.append(album.title);
+			tabs.push_back({
+				.id = QString::number(album.id),
+				.text = std::move(title),
+			});
+			if (_albumId.current() == album.id) {
+				selected = tabs.back().id;
+			}
+		}
+		if (selected.isEmpty()) {
+			selected = tabs.front().id;
+		}
+	}
+	if (has) {
+		tabs.push_back({
+			.id = u"add"_q,
+			.text = { '+' + tr::lng_stories_album_add(tr::now) },
+		});
+	}
+	if (!_albumsTabs) {
+		const auto tabsCount = tabs.size();
+		_albumsTabs = std::make_unique<Ui::SubTabs>(
+			_albumsWrap,
+			st::collectionSubTabs,
+			Ui::SubTabs::Options{
+				.selected = selected,
+				.centered = true,
+			},
+			std::move(tabs));
+		_albumsTabs->setPinnedInterval(0, 1);
+		if (has) {
+			_albumsTabs->setPinnedInterval(tabsCount - 1, tabsCount);
+		}
+		_albumsTabs->show();
+
+		const auto padding = st::giftBoxPadding;
+		_albumsWrap->resize(
+			_albumsWrap->width(),
+			padding.top() + _albumsTabs->height() + padding.top());
+		_albumsWrap->widthValue() | rpl::on_next([=](int width) {
+			_albumsTabs->resizeToWidth(width);
+		}, _albumsTabs->lifetime());
+		_albumsTabs->move(0, padding.top());
+
+		_albumsTabs->activated(
+		) | rpl::on_next([=](const QString &id) {
+			if (id == u"add"_q) {
+				const auto added = [=](Data::StoryAlbum album) {
+					albumAdded(album);
+				};
+				_controller->uiShow()->show(Box(
+					NewAlbumBox,
+					_controller,
+					_peer,
+					StoryId(),
+					added));
+			} else {
+				_albumIdChanges.fire((id == u"all"_q) ? 0 : id.toInt());
+			}
+		}, _albumsTabs->lifetime());
+
+		_albumsTabs->contextMenuRequests(
+		) | rpl::on_next([=](const QString &id) {
+			if (id == u"add"_q || id == u"all"_q) {
+				return;
+			}
+			showMenuForAlbum(id.toInt());
+		}, _albumsTabs->lifetime());
+
+		using ReorderUpdate = Ui::SubTabsReorderUpdate;
+		_albumsTabs->reorderUpdates(
+		) | rpl::on_next([=](const ReorderUpdate &update) {
+			if (update.state == ReorderUpdate::State::Applied) {
+				reorderAlbumsLocally(update);
+			}
+		}, _albumsTabs->lifetime());
+	} else {
+		const auto tabsCount = tabs.size();
+		_albumsTabs->setTabs(std::move(tabs));
+		_albumsTabs->clearPinnedIntervals();
+		_albumsTabs->setPinnedInterval(0, 1);
+		if (has) {
+			_albumsTabs->setPinnedInterval(tabsCount - 1, tabsCount);
+		}
+		if (!selected.isEmpty()) {
+			_albumsTabs->setActiveTab(selected);
+		}
+	}
+	resizeToWidth(width());
+}
+
+void InnerWidget::showMenuForAlbum(int id) {
+	Expects(id > 0);
+
+	if (_menu || _addingToAlbumId) {
+		return;
+	}
+	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
+	const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
+
+	if (_albumsTabs && _albumsTabs->reorderEnabled()) {
+		addAction(
+			tr::lng_gift_collection_reorder_exit(tr::now),
+			[=] {
+				flushAlbumReorder();
+				_albumsTabs->setReorderEnabled(false);
+			},
+			&st::menuIconReorder);
+		_menu->popup(QCursor::pos());
+		return;
+	}
+
+	if (_peer->canEditStories()) {
+		addAction(tr::lng_stories_album_add_button(tr::now), [=] {
+			editAlbumStories(id);
+		}, &st::menuIconStoriesSave);
+	}
+	if (const auto username = _peer->username(); !username.isEmpty()) {
+		addAction(tr::lng_stories_album_share(tr::now), [=] {
+			shareAlbumLink(username, id);
+		}, &st::menuIconShare);
+	}
+	if (_peer->canEditStories()) {
+		addAction(tr::lng_stories_album_edit(tr::now), [=] {
+			editAlbumName(id);
+		}, &st::menuIconEdit);
+		if (_albumsTabs) {
+			addAction(
+				tr::lng_gift_collection_reorder(tr::now),
+				[=] { _albumsTabs->setReorderEnabled(true); },
+				&st::menuIconReorder);
+		}
+		addAction({
+			.text = tr::lng_stories_album_delete(tr::now),
+			.handler = [=] { confirmDeleteAlbum(id); },
+			.icon = &st::menuIconDeleteAttention,
+			.isAttention = true,
+		});
+	}
+	if (_menu->empty()) {
+		_menu = nullptr;
+	} else {
+		_menu->popup(QCursor::pos());
+	}
+}
+
+rpl::producer<int> InnerWidget::albumIdChanges() const {
+	return _albumIdChanges.events();
+}
+
+rpl::producer<Data::StoryAlbumUpdate> InnerWidget::changes() const {
+	return _albumChanges.value();
+}
+
+void InnerWidget::reload() {
+	auto old = std::exchange(_list, object_ptr<Media::ListWidget>(nullptr));
+	setupList();
+	setupEmpty();
+	old.destroy();
+
+	resizeToWidth(width());
+}
+
+void InnerWidget::editAlbumStories(int id) {
+	const auto weak = base::make_weak(this);
+	auto box = Box<EditAlbumBox>(_controller, _peer, crl::guard(this, [=] {
+		if (_albumId.current() == id) {
+			reload();
+		}
+	}), id);
+
+	_controller->uiShow()->show(std::move(box));
+}
+
+void InnerWidget::shareAlbumLink(const QString &username, int id) {
+	const auto url = _controller->session().createInternalLinkFull(
+		username + u"/a/"_q + QString::number(id));
+	FastShareLink(_controller->parentController(), url);
+}
+
+void InnerWidget::editAlbumName(int id) {
+	const auto done = [=](QString name) {
+		albumRenamed(id, name);
+	};
+	const auto i = ranges::find(_albums, id, &Data::StoryAlbum::id);
+	if (i == end(_albums)) {
+		return;
+	}
+	_controller->uiShow()->show(Box(
+		EditAlbumNameBox,
+		_controller->parentController(),
+		_peer,
+		id,
+		i->title,
+		done));
+}
+
+void InnerWidget::confirmDeleteAlbum(int id) {
+	const auto done = [=](Fn<void()> close) {
+		albumRemoved(id);
+
+		const auto stories = &_controller->session().data().stories();
+		stories->albumDelete(_peer, id);
+
+		close();
+	};
+	_controller->uiShow()->show(Ui::MakeConfirmBox({
+		.text = tr::lng_stories_album_delete_sure(),
+		.confirmed = crl::guard(this, done),
+		.confirmText = tr::lng_stories_album_delete_button(),
+		.confirmStyle = &st::attentionBoxButton,
+	}));
+}
+
+void InnerWidget::albumAdded(Data::StoryAlbum result) {
+	Expects(ranges::contains(_albums, result.id, &Data::StoryAlbum::id));
+
+	_albumIdChanges.fire_copy(result.id);
+}
+
+void InnerWidget::albumRenamed(int id, QString name) {
+	const auto i = ranges::find(_albums, id, &Data::StoryAlbum::id);
+	if (i != end(_albums)) {
+		i->title = name;
+		refreshAlbumsTabs();
+	}
+}
+
+void InnerWidget::albumRemoved(int id) {
+	auto now = _albumId.current();
+	if (now == id) {
+		_albumIdChanges.fire_copy(0);
+	}
+	const auto i = ranges::find(_albums, id, &Data::StoryAlbum::id);
+	if (i != end(_albums)) {
+		_albums.erase(i);
+		refreshAlbumsTabs();
+	}
 }
 
 void InnerWidget::saveState(not_null<Memento*> memento) {
@@ -298,17 +1023,24 @@ void InnerWidget::selectionAction(SelectionAction action) {
 	_list->selectionAction(action);
 }
 
-InnerWidget::~InnerWidget() = default;
-
 int InnerWidget::resizeGetHeight(int newWidth) {
+	if (!newWidth) {
+		return 0;
+	}
 	_inResize = true;
 	auto guard = gsl::finally([this] { _inResize = false; });
 
 	if (_top) {
 		_top->resizeToWidth(newWidth);
 	}
-	_list->resizeToWidth(newWidth);
-	_empty->resizeToWidth(newWidth);
+	if (_list) {
+		_list->resizeToWidth(newWidth);
+	}
+	if (const auto empty = _empty.get()) {
+		const auto margin = st::giftListAboutMargin;
+		empty->resizeToWidth(newWidth - margin.left() - margin.right());
+	}
+
 	return recountHeight();
 }
 
@@ -331,29 +1063,81 @@ int InnerWidget::recountHeight() {
 		listHeight = _list->heightNoMargins();
 		top += listHeight;
 	}
-	if (listHeight > 0) {
-		_empty->hide();
+	if (const auto empty = _empty.get()) {
+		const auto margin = st::giftListAboutMargin;
+		empty->moveToLeft(margin.left(), top + margin.top());
+		top += margin.top() + empty->height() + margin.bottom();
+	}
+	if (_emptyLoading) {
+		top = std::max(top, _lastNonLoadingHeight);
 	} else {
-		_empty->show();
-		_empty->moveToLeft(0, top);
-		top += _empty->heightNoMargins();
+		_lastNonLoadingHeight = top;
 	}
 	return top;
 }
 
 void InnerWidget::setScrollHeightValue(rpl::producer<int> value) {
-	using namespace rpl::mappers;
-	_empty->setFullHeight(rpl::combine(
-		std::move(value),
-		_listTops.events_starting_with(
-			_list->topValue()
-		) | rpl::flatten_latest(),
-		_topHeight.value(),
-		_1 - _2 + _3));
 }
 
 rpl::producer<Ui::ScrollToRequest> InnerWidget::scrollToRequests() const {
 	return _scrollToRequests.events();
 }
 
+void InnerWidget::reorderAlbumsLocally(
+		const Ui::SubTabsReorderUpdate &update) {
+	if (!_albumsTabs || !_peer->canEditStories()) {
+		return;
+	}
+
+	const auto albumId = update.id.toInt();
+	if (albumId <= 0) {
+		return;
+	}
+
+	const auto it = ranges::find(
+		_albums,
+		albumId,
+		&Data::StoryAlbum::id);
+	if (it == _albums.end()) {
+		return;
+	}
+
+	const auto album = *it;
+	_albums.erase(it);
+
+	const auto newPos = std::max(
+		0,
+		std::min(update.newPosition - 1, int(_albums.size())));
+	_albums.insert(_albums.begin() + newPos, album);
+
+	_pendingAlbumReorder = true;
+}
+
+void InnerWidget::flushAlbumReorder() {
+	if (!_pendingAlbumReorder || !_peer->canEditStories()) {
+		return;
+	}
+
+	if (_reorderRequestId) {
+		_api->request(_reorderRequestId).cancel();
+		_reorderRequestId = 0;
+	}
+
+	auto order = QVector<MTPint>();
+	for (const auto &album : _albums) {
+		order.push_back(MTP_int(album.id));
+	}
+
+	_reorderRequestId = _api->request(MTPstories_ReorderAlbums(
+		_peer->input(),
+		MTP_vector<MTPint>(order)
+	)).done([=] {
+		_reorderRequestId = 0;
+	}).fail([=, show = _controller->uiShow()](const MTP::Error &error) {
+		_reorderRequestId = 0;
+	}).send();
+
+	_pendingAlbumReorder = false;
+}
+
 } // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
index 0aaeed54dc458a..4c9dde56ac57c5 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
@@ -7,12 +7,22 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/unique_qptr.h"
+#include "data/data_stories.h"
+#include "info/stories/info_stories_common.h"
 #include "ui/rp_widget.h"
 #include "ui/widgets/scroll_area.h"
-#include "base/unique_qptr.h"
+
+namespace Data {
+struct StoryAlbum;
+} // namespace Data
 
 namespace Ui {
+class SubTabs;
+class PopupMenu;
 class VerticalLayout;
+class MultiSlideTracker;
+struct SubTabsReorderUpdate;
 } // namespace Ui
 
 namespace Info {
@@ -25,6 +35,14 @@ namespace Info::Media {
 class ListWidget;
 } // namespace Info::Media
 
+namespace Window {
+class SessionNavigation;
+} // namespace Window
+
+namespace MTP {
+class Sender;
+} // namespace MTP
+
 namespace Info::Stories {
 
 class Memento;
@@ -34,7 +52,12 @@ class InnerWidget final : public Ui::RpWidget {
 public:
 	InnerWidget(
 		QWidget *parent,
-		not_null<Controller*> controller);
+		not_null<Controller*> controller,
+		rpl::producer<int> albumId,
+		int addingToAlbumId = 0);
+	~InnerWidget();
+
+	[[nodiscard]] rpl::producer<> backRequest() const;
 
 	bool showInternal(not_null<Memento*> memento);
 	void setIsStackBottom(bool isStackBottom) {
@@ -51,7 +74,28 @@ class InnerWidget final : public Ui::RpWidget {
 	rpl::producer<SelectedItems> selectedListValue() const;
 	void selectionAction(SelectionAction action);
 
-	~InnerWidget();
+	void reload();
+	void editAlbumStories(int id);
+	void shareAlbumLink(const QString &username, int id);
+	void editAlbumName(int id);
+	void confirmDeleteAlbum(int id);
+	void albumAdded(Data::StoryAlbum result);
+
+	[[nodiscard]] rpl::producer<bool> albumEmptyValue() const {
+		return _albumEmpty.value();
+	}
+
+	[[nodiscard]] rpl::producer<int> albumIdChanges() const;
+	[[nodiscard]] rpl::producer<Data::StoryAlbumUpdate> changes() const;
+
+	bool hasFlexibleTopBar() const;
+	base::weak_qptr<Ui::RpWidget> createPinnedToTop(
+		not_null<Ui::RpWidget*> parent);
+	base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
+		not_null<Ui::RpWidget*> parent);
+
+	void enableBackButton();
+	void showFinished();
 
 protected:
 	int resizeGetHeight(int newWidth) override;
@@ -62,18 +106,53 @@ class InnerWidget final : public Ui::RpWidget {
 private:
 	int recountHeight();
 	void refreshHeight();
+	void refreshEmpty();
+	void preloadArchiveCount();
 
 	void setupTop();
+	void setupList();
+	void setupEmpty();
+	void setupAlbums();
 	void createButtons();
+	void createProfileTop();
 	void createAboutArchive();
 
-	object_ptr<Media::ListWidget> setupList();
+	void startTop();
+	void addArchiveButton(Ui::MultiSlideTracker &tracker);
+	void addRecentButton(Ui::MultiSlideTracker &tracker);
+	void addGiftsButton(Ui::MultiSlideTracker &tracker);
+	void finalizeTop();
+
+	void refreshAlbumsTabs();
+	void showMenuForAlbum(int id);
+
+	void albumRenamed(int id, QString name);
+	void albumRemoved(int id);
+
+	void reorderAlbumsLocally(const Ui::SubTabsReorderUpdate &update);
+	void flushAlbumReorder();
 
 	const not_null<Controller*> _controller;
+	const not_null<PeerData*> _peer;
+	const int _addingToAlbumId = 0;
+
+	std::vector<Data::StoryAlbum> _albums;
+	rpl::variable<int> _albumId;
+	rpl::event_stream<int> _albumIdChanges;
+	Ui::RpWidget *_albumsWrap = nullptr;
+	std::unique_ptr<Ui::SubTabs> _albumsTabs;
+	rpl::variable<Data::StoryAlbumUpdate> _albumChanges;
+	bool _pendingAlbumReorder = false;
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
+	std::unique_ptr<MTP::Sender> _api;
+	mtpRequestId _reorderRequestId = 0;
 
 	object_ptr<Ui::VerticalLayout> _top = { nullptr };
 	object_ptr<Media::ListWidget> _list = { nullptr };
-	object_ptr<EmptyWidget> _empty;
+	object_ptr<Ui::RpWidget> _empty = { nullptr };
+	int _lastNonLoadingHeight = 0;
+	bool _emptyLoading = false;
 
 	bool _inResize = false;
 	bool _isStackBottom = false;
@@ -82,6 +161,14 @@ class InnerWidget final : public Ui::RpWidget {
 	rpl::event_stream<rpl::producer<SelectedItems>> _selectedLists;
 	rpl::event_stream<rpl::producer<int>> _listTops;
 	rpl::variable<int> _topHeight;
+	rpl::variable<bool> _albumEmpty;
+
+	rpl::variable<bool> _backToggles;
+	rpl::event_stream<> _backClicks;
+	rpl::event_stream<> _showFinished;
+	rpl::variable<std::optional<QColor>> _topBarColor;
+
+	Ui::VisibleRange _visibleRange;
 
 };
 
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index 6c9a7dabb3b91b..aea06d76b2eafb 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -23,7 +23,6 @@ For license and copyright information please follow this link:
 #include "history/history_item_helpers.h"
 #include "history/history.h"
 #include "core/application.h"
-#include "storage/storage_shared_media.h"
 #include "layout/layout_selection.h"
 #include "styles/style_info.h"
 
@@ -49,9 +48,10 @@ Provider::Provider(not_null<AbstractController*> controller)
 : _controller(controller)
 , _peer(controller->key().storiesPeer())
 , _history(_peer->owner().history(_peer))
-, _tab(controller->key().storiesTab()) {
+, _albumId(controller->key().storiesAlbumId())
+, _addingToAlbumId(controller->key().storiesAddToAlbumId()) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &layout : _layouts) {
 			layout.second.item->invalidateCache();
 		}
@@ -61,7 +61,7 @@ Provider::Provider(not_null<AbstractController*> controller)
 		Data::StoryUpdate::Flag::Destroyed
 	) | rpl::filter([=](const Data::StoryUpdate &update) {
 		return update.story->peer() == _peer;
-	}) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
+	}) | rpl::on_next([=](const Data::StoryUpdate &update) {
 		storyRemoved(update.story);
 	}, _lifetime);
 }
@@ -75,7 +75,9 @@ Type Provider::type() {
 }
 
 bool Provider::hasSelectRestriction() {
-	if (const auto channel = _peer->asChannel()) {
+	if (_peer->session().frozen()) {
+		return true;
+	} else if (const auto channel = _peer->asChannel()) {
 		return !channel->canEditStories() && !channel->canDeleteStories();
 	}
 	return !_peer->isSelf();
@@ -175,15 +177,16 @@ void Provider::checkPreload(
 void Provider::setSearchQuery(QString query) {
 }
 
+void Provider::jumpToMessage(MsgId messageId, Fn<void(FullMsgId)>) {
+}
+
 void Provider::refreshViewer() {
 	_viewerLifetime.destroy();
-	const auto idForViewer = _aroundId;
-	auto ids = (_tab == Tab::Saved)
-		? Data::SavedStoriesIds(_peer, idForViewer, _idsLimit)
-		: Data::ArchiveStoriesIds(_peer, idForViewer, _idsLimit);
+	const auto aroundId = _aroundId;
+	auto ids = Data::AlbumStoriesIds(_peer, _albumId, aroundId, _idsLimit);
 	std::move(
 		ids
-	) | rpl::start_with_next([=](Data::StoriesIdsSlice &&slice) {
+	) | rpl::on_next([=](Data::StoriesIdsSlice &&slice) {
 		if (!slice.fullCount()) {
 			// Don't display anything while full count is unknown.
 			return;
@@ -193,8 +196,8 @@ void Provider::refreshViewer() {
 		auto nearestId = std::optional<StoryId>();
 		for (auto i = 0; i != _slice.size(); ++i) {
 			if (!nearestId
-				|| std::abs(*nearestId - idForViewer)
-					> std::abs(_slice[i] - idForViewer)) {
+				|| std::abs(*nearestId - aroundId)
+					> std::abs(_slice[i] - aroundId)) {
 				nearestId = _slice[i];
 			}
 		}
@@ -342,10 +345,20 @@ std::unique_ptr<BaseLayout> Provider::createLayout(
 		}
 		return nullptr;
 	};
+
+	const auto peer = item->history()->peer;
+	const auto channel = peer->asChannel();
+	const auto showPinned = (_albumId == Data::kStoriesAlbumIdSaved);
+	const auto showHidden = peer->isSelf()
+		|| (channel && channel->canEditStories());
+
 	using namespace Overview::Layout;
 	const auto options = MediaOptions{
-		.pinned = item->isPinned(),
 		.story = true,
+		.storyPinned = showPinned && item->isPinned(),
+		.storyShowPinned = showPinned,
+		.storyHidden = showHidden && !item->storyInProfile(),
+		.storyShowHidden = showHidden,
 	};
 	if (const auto photo = getPhoto()) {
 		return std::make_unique<Photo>(delegate, item, photo, options);
@@ -366,7 +379,7 @@ ListItemSelectionData Provider::computeSelectionData(
 		TextSelection selection) {
 	auto result = ListItemSelectionData(selection);
 	const auto id = item->id;
-	if (!IsStoryMsgId(id)) {
+	if (_addingToAlbumId || !IsStoryMsgId(id)) {
 		return result;
 	}
 	const auto peer = item->history()->peer;
@@ -378,6 +391,7 @@ ListItemSelectionData Provider::computeSelectionData(
 		result.canForward = peer->isSelf() && story->canShare();
 		result.canDelete = story->canDelete();
 		result.canUnpinStory = story->pinnedToTop();
+		result.storyInProfile = story->inProfile();
 	}
 	result.canToggleStoryPin = peer->isSelf()
 		|| (channel && channel->canEditStories());
@@ -463,7 +477,7 @@ void Provider::saveState(
 		not_null<Media::Memento*> memento,
 		ListScrollTopState scrollState) {
 	if (_aroundId != kDefaultAroundId && scrollState.item) {
-		memento->setAroundId({ _peer->id, _aroundId });
+		memento->setAroundId({ _peer->id, StoryIdToMsgId(_aroundId) });
 		memento->setIdsLimit(_idsLimit);
 		memento->setScrollTopItem(scrollState.item->globalId());
 		memento->setScrollTopItemPosition(scrollState.position);
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.h b/Telegram/SourceFiles/info/stories/info_stories_provider.h
index b43350d971e4f1..1f8baf0205aae9 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.h
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "base/weak_ptr.h"
 #include "data/data_stories_ids.h"
 #include "info/media/info_media_common.h"
+#include "info/stories/info_stories_common.h"
 
 class DocumentData;
 class HistoryItem;
@@ -26,8 +27,6 @@ class AbstractController;
 
 namespace Info::Stories {
 
-enum class Tab;
-
 class Provider final
 	: public Media::ListProvider
 	, private Media::ListSectionDelegate
@@ -54,6 +53,7 @@ class Provider final
 	rpl::producer<> refreshed() override;
 
 	void setSearchQuery(QString query) override;
+	void jumpToMessage(MsgId, Fn<void(FullMsgId)> done) override;
 
 	std::vector<Media::ListSection> fillSections(
 		not_null<Overview::Layout::Delegate*> delegate) override;
@@ -117,7 +117,8 @@ class Provider final
 	const not_null<AbstractController*> _controller;
 	const not_null<PeerData*> _peer;
 	const not_null<History*> _history;
-	const Tab _tab;
+	const int _albumId = 0;
+	const int _addingToAlbumId = 0;
 
 	StoryId _aroundId = kDefaultAroundId;
 	int _idsLimit = kMinimalIdsLimit;
@@ -128,8 +129,6 @@ class Provider final
 	rpl::event_stream<not_null<Media::BaseLayout*>> _layoutRemoved;
 	rpl::event_stream<> _refreshed;
 
-	bool _started = false;
-
 	rpl::lifetime _lifetime;
 	rpl::lifetime _viewerLifetime;
 
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
index 2abf102d556b59..4f6a7a39973f74 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
@@ -7,22 +7,39 @@ For license and copyright information please follow this link:
 */
 #include "info/stories/info_stories_widget.h"
 
+#include "data/data_peer.h"
+#include "data/data_stories.h"
 #include "info/stories/info_stories_inner_widget.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
+#include "ui/wrap/slide_wrap.h"
 #include "lang/lang_keys.h"
 #include "ui/ui_utility.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QScrollBar>
 
 namespace Info::Stories {
 
+int ArchiveId() {
+	return Data::kStoriesAlbumIdArchive;
+}
+
 Memento::Memento(not_null<Controller*> controller)
-: ContentMemento(Tag{ controller->storiesPeer(), controller->storiesTab() })
+: ContentMemento(Tag{
+	controller->storiesPeer(),
+	controller->storiesAlbumId(),
+	controller->storiesAddToAlbumId() })
 , _media(controller) {
 }
 
-Memento::Memento(not_null<PeerData*> peer, Tab tab)
-: ContentMemento(Tag{ peer, tab })
+Memento::Memento(not_null<PeerData*> peer, int albumId, int addingToAlbumId)
+: ContentMemento(Tag{ peer, albumId, addingToAlbumId })
 , _media(peer, 0, Media::Type::PhotoVideo) {
 }
 
@@ -44,17 +61,93 @@ object_ptr<ContentWidget> Memento::createWidget(
 Widget::Widget(
 	QWidget *parent,
 	not_null<Controller*> controller)
-: ContentWidget(parent, controller) {
-	_inner = setInnerWidget(object_ptr<InnerWidget>(
-		this,
-		controller));
+: ContentWidget(parent, controller)
+, _albumId(controller->key().storiesAlbumId())
+, _inner(UseClassicProfileScroll()
+	? setupFlexibleInnerWidget(
+		object_ptr<InnerWidget>(
+			this,
+			controller,
+			_albumId.value(),
+			controller->key().storiesAddToAlbumId()),
+		_flexibleScroll)
+	: setInnerWidget(
+		object_ptr<InnerWidget>(
+			this,
+			controller,
+			_albumId.value(),
+			controller->key().storiesAddToAlbumId())))
+, _pinnedToTop(_inner->createPinnedToTop(this)) {
+	const auto classic = UseClassicProfileScroll();
+	const auto flexible = _pinnedToTop
+		&& _pinnedToTop->minimumHeight()
+		&& _inner->hasFlexibleTopBar();
+	if (classic) {
+		_inner->move(0, 0);
+	}
+
+	_emptyAlbumShown = _inner->albumEmptyValue();
+	_inner->albumIdChanges() | rpl::on_next([=](int id) {
+		controller->showSection(
+			Make(controller->storiesPeer(), id),
+			Window::SectionShow::Way::Backward);
+	}, _inner->lifetime());
 	_inner->setScrollHeightValue(scrollHeightValue());
 	_inner->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
-		scrollTo(request);
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
+		if (request.ymin < 0) {
+			scrollTopRestore(
+				qMin(scrollTopSave(), request.ymax));
+		} else {
+			scrollTo(request);
+		}
+	}, lifetime());
+
+	if (!classic && flexible) {
+		setupFlexibleRegularScroll(_inner, _pinnedToTop.get());
+	} else if (_pinnedToTop) {
+		_inner->widthValue(
+		) | rpl::on_next([=](int w) {
+			_pinnedToTop->resizeToWidth(w);
+			setScrollTopSkip(_pinnedToTop->height());
+		}, _pinnedToTop->lifetime());
+
+		_pinnedToTop->heightValue(
+		) | rpl::on_next([=](int h) {
+			setScrollTopSkip(h);
+		}, _pinnedToTop->lifetime());
+	}
+
+	if (classic && flexible) {
+		_flexibleScrollHelper = std::make_unique<FlexibleScrollHelper>(
+			scroll(),
+			_inner,
+			_pinnedToTop.get(),
+			[=](QMargins margins) {
+				ContentWidget::setPaintPadding(std::move(margins));
+			},
+			[=](rpl::producer<not_null<QEvent*>> &&events) {
+				ContentWidget::setViewport(std::move(events));
+			},
+			_flexibleScroll);
+	}
+
+	rpl::combine(
+		_albumId.value(),
+		_emptyAlbumShown.value()
+	) | rpl::on_next([=] {
+		refreshBottom();
+	}, _inner->lifetime());
+
+	_inner->backRequest() | rpl::on_next([=] {
+		checkBeforeClose([=] { controller->showBackFromStack(); });
 	}, _inner->lifetime());
 }
 
+void Widget::setInnerFocus() {
+	_inner->setFocus();
+}
+
 void Widget::setIsStackBottom(bool isStackBottom) {
 	ContentWidget::setIsStackBottom(isStackBottom);
 	_inner->setIsStackBottom(isStackBottom);
@@ -65,10 +158,15 @@ bool Widget::showInternal(not_null<ContentMemento*> memento) {
 		return false;
 	}
 	if (auto storiesMemento = dynamic_cast<Memento*>(memento.get())) {
-		const auto tab = controller()->key().storiesTab();
-		if (storiesMemento->storiesTab() == tab) {
+		const auto myId = controller()->key().storiesAlbumId();
+		const auto hisId = storiesMemento->storiesAlbumId();
+		constexpr auto kArchive = Data::kStoriesAlbumIdArchive;
+		if (myId == hisId) {
 			restoreState(storiesMemento);
 			return true;
+		} else if (myId != kArchive && hisId != kArchive) {
+			_albumId = hisId;
+			return true;
 		}
 	}
 	return false;
@@ -98,6 +196,97 @@ void Widget::restoreState(not_null<Memento*> memento) {
 	scrollTopRestore(memento->scrollTop());
 }
 
+void Widget::refreshBottom() {
+	const auto albumId = _albumId.current();
+	const auto withButton = (albumId != Data::kStoriesAlbumIdSaved)
+		&& (albumId != Data::kStoriesAlbumIdArchive)
+		&& controller()->storiesPeer()->canEditStories()
+		&& !_emptyAlbumShown.current();
+	const auto wasBottom = _pinnedToBottom ? _pinnedToBottom->height() : 0;
+	delete _pinnedToBottom.data();
+	if (!withButton) {
+		setScrollBottomSkip(0);
+		_hasPinnedToBottom = false;
+	} else {
+		setupBottomButton(wasBottom);
+	}
+
+	if (_pinnedToBottom) {
+		const auto processHeight = [=] {
+			setScrollBottomSkip(_pinnedToBottom->height());
+			_pinnedToBottom->moveToLeft(
+				_pinnedToBottom->x(),
+				height() - _pinnedToBottom->height());
+		};
+
+		_inner->sizeValue(
+		) | rpl::on_next([=](const QSize &s) {
+			_pinnedToBottom->resizeToWidth(s.width());
+		}, _pinnedToBottom->lifetime());
+
+		rpl::combine(
+			_pinnedToBottom->heightValue(),
+			heightValue()
+		) | rpl::on_next(processHeight, _pinnedToBottom->lifetime());
+	}
+}
+
+void Widget::setupBottomButton(int wasBottomHeight) {
+	_pinnedToBottom = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
+		this,
+		object_ptr<Ui::RpWidget>(this));
+	const auto wrap = _pinnedToBottom.data();
+	wrap->toggle(false, anim::type::instant);
+
+	const auto bottom = wrap->entity();
+	bottom->show();
+
+	const auto button = Ui::CreateChild<Ui::RoundButton>(
+		bottom,
+		rpl::single(QString()),
+		st::collectionEditBox.button);
+	button->setText(tr::lng_stories_album_add_button(
+	) | rpl::map([](const QString &text) {
+		return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
+	}));
+	button->show();
+	_hasPinnedToBottom = true;
+
+	button->setClickedCallback([=] {
+		if (const auto id = _albumId.current()) {
+			_inner->editAlbumStories(id);
+		} else {
+			refreshBottom();
+		}
+	});
+
+	const auto buttonTop = st::boxRadius;
+	bottom->widthValue() | rpl::on_next([=](int width) {
+		const auto normal = width - 2 * buttonTop;
+		button->resizeToWidth(normal);
+		const auto buttonLeft = (width - normal) / 2;
+		button->moveToLeft(buttonLeft, buttonTop);
+	}, button->lifetime());
+
+	button->heightValue() | rpl::on_next([=](int height) {
+		bottom->resize(bottom->width(), st::boxRadius + height);
+	}, button->lifetime());
+
+	if (_shown) {
+		wrap->toggle(
+			true,
+			wasBottomHeight ? anim::type::instant : anim::type::normal);
+	}
+}
+
+void Widget::showFinished() {
+	_shown = true;
+	if (const auto bottom = _pinnedToBottom.data()) {
+		bottom->toggle(true, anim::type::normal);
+	}
+	_inner->showFinished();
+}
+
 rpl::producer<SelectedItems> Widget::selectedListValue() const {
 	return _inner->selectedListValue();
 }
@@ -107,16 +296,23 @@ void Widget::selectionAction(SelectionAction action) {
 }
 
 rpl::producer<QString> Widget::title() {
-	return (controller()->key().storiesTab() == Tab::Archive)
+	const auto peer = controller()->key().storiesPeer();
+	return (controller()->key().storiesAlbumId() == ArchiveId())
 		? tr::lng_stories_archive_title()
+		: (peer && peer->isSelf())
+		? tr::lng_menu_my_profile()
 		: tr::lng_stories_my_title();
 }
 
-std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer, Tab tab) {
+rpl::producer<bool> Widget::desiredBottomShadowVisibility() {
+	return _hasPinnedToBottom.value();
+}
+
+std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer, int albumId) {
 	return std::make_shared<Info::Memento>(
 		std::vector<std::shared_ptr<ContentMemento>>(
 			1,
-			std::make_shared<Memento>(peer, tab)));
+			std::make_shared<Memento>(peer, albumId, 0)));
 }
 
 } // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.h b/Telegram/SourceFiles/info/stories/info_stories_widget.h
index 45df73f2ba075e..ff891992bbbcab 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.h
@@ -9,16 +9,22 @@ For license and copyright information please follow this link:
 
 #include "info/info_content_widget.h"
 #include "info/media/info_media_widget.h"
+#include "info/stories/info_stories_common.h"
+#include "ui/effects/animations.h"
+
+namespace Ui {
+template <typename Widget>
+class SlideWrap;
+} // namespace Ui
 
 namespace Info::Stories {
 
 class InnerWidget;
-enum class Tab;
 
 class Memento final : public ContentMemento {
 public:
 	Memento(not_null<Controller*> controller);
-	Memento(not_null<PeerData*> peer, Tab tab);
+	Memento(not_null<PeerData*> peer, int albumId, int addingToAlbumId);
 	~Memento();
 
 	object_ptr<ContentWidget> createWidget(
@@ -44,6 +50,7 @@ class Widget final : public ContentWidget {
 public:
 	Widget(QWidget *parent, not_null<Controller*> controller);
 
+	void setInnerFocus() override;
 	void setIsStackBottom(bool isStackBottom) override;
 
 	bool showInternal(
@@ -58,18 +65,33 @@ class Widget final : public ContentWidget {
 
 	rpl::producer<QString> title() override;
 
+	rpl::producer<bool> desiredBottomShadowVisibility() override;
+
+	void showFinished() override;
+
 private:
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
+	void setupBottomButton(int wasBottomHeight);
+	void refreshBottom();
+
 	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
+	FlexibleScrollData _flexibleScroll;
+	rpl::variable<int> _albumId;
 	InnerWidget *_inner = nullptr;
+	base::weak_qptr<Ui::RpWidget> _pinnedToTop;
+	QPointer<Ui::SlideWrap<Ui::RpWidget>> _pinnedToBottom;
+	rpl::variable<bool> _hasPinnedToBottom;
+	rpl::variable<bool> _emptyAlbumShown;
+	bool _shown = false;
+	std::unique_ptr<FlexibleScrollHelper> _flexibleScrollHelper;
 
 };
 
 [[nodiscard]] std::shared_ptr<Info::Memento> Make(
 	not_null<PeerData*> peer,
-	Tab tab = {});
+	int albumId = 0);
 
 } // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_bubble_wrap.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_bubble_wrap.cpp
index ffb0204fce08fc..00065e91861e6f 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_bubble_wrap.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_bubble_wrap.cpp
@@ -52,32 +52,47 @@ QRect BubbleWrapInnerRect(const QRect &r) {
 not_null<Ui::RpWidget*> AddBubbleWrap(
 		not_null<Ui::VerticalLayout*> container,
 		const QSize &size) {
-	const auto bubble = container->add(object_ptr<Ui::CenterWrap<RpWidget>>(
-		container,
-		object_ptr<Ui::RpWidget>(container)))->entity();
+	const auto bubble = container->add(
+		object_ptr<Ui::RpWidget>(container),
+		style::al_top);
 	bubble->resize(size);
+	bubble->setNaturalWidth(size.width());
 
-	auto cached = QImage(
-		size * style::DevicePixelRatio(),
-		QImage::Format_ARGB32_Premultiplied);
-	cached.setDevicePixelRatio(style::DevicePixelRatio());
-	cached.fill(Qt::transparent);
-	{
-		auto p = QPainter(&cached);
-		const auto innerRect = BubbleWrapInnerRect(bubble->rect());
-		auto hq = PainterHighQualityEnabler(p);
-		const auto radius = st::bubbleRadiusSmall;
-		p.setPen(Qt::NoPen);
-		p.setBrush(st::shadowFg);
-		PaintExcludeTopShadow(p, radius, innerRect);
-		p.setBrush(st::boxBg);
-		p.drawRoundedRect(innerRect, radius, radius);
-	}
+	struct State {
+		QImage cached;
+	};
+	const auto state = bubble->lifetime().make_state<State>();
+	const auto generate = [=] {
+		auto cached = QImage(
+			size * style::DevicePixelRatio(),
+			QImage::Format_ARGB32_Premultiplied);
+		cached.setDevicePixelRatio(style::DevicePixelRatio());
+		cached.fill(Qt::transparent);
+		{
+			auto p = QPainter(&cached);
+			const auto innerRect = BubbleWrapInnerRect(bubble->rect());
+			auto hq = PainterHighQualityEnabler(p);
+			const auto radius = st::bubbleRadiusSmall;
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::shadowFg);
+			PaintExcludeTopShadow(p, radius, innerRect);
+			p.setBrush(st::boxBg);
+			p.drawRoundedRect(innerRect, radius, radius);
+		}
+		state->cached = std::move(cached);
+	};
+	generate();
+
+	style::PaletteChanged(
+	) | rpl::on_next([=] {
+		generate();
+		bubble->update();
+	}, bubble->lifetime());
 
 	bubble->paintRequest(
-	) | rpl::start_with_next([bubble, cached = std::move(cached)] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(bubble);
-		p.drawImage(0, 0, cached);
+		p.drawImage(0, 0, state->cached);
 	}, bubble->lifetime());
 
 	return bubble;
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_color_circle_button.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_color_circle_button.cpp
index 97ce58af6bb76a..58bc3f8e248c9a 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_color_circle_button.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_color_circle_button.cpp
@@ -7,7 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "info/userpic/info_userpic_color_circle_button.h"
 
-#include "settings/settings_chat.h" // Settings::PaintRoundColorButton.
+#include "settings/sections/settings_chat.h" // Settings::PaintRoundColorButton.
 #include "ui/painter.h"
 
 namespace UserpicBuilder {
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
index fbfa8fb7f38eea..5a23e1789570fe 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
@@ -94,7 +94,7 @@ void ColorsLine::fillButtons() {
 	_container = base::make_unique_q<Ui::RpWidget>(this);
 	const auto container = _container.get();
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		container->setGeometry(Rect(s));
 	}, container->lifetime());
 
@@ -245,12 +245,11 @@ object_ptr<Ui::RpWidget> CreateGradientEditor(
 		std::vector<QColor> colors;
 	};
 	const auto preview = container->add(
-		object_ptr<Ui::CenterWrap<EmojiUserpic>>(
+		object_ptr<EmojiUserpic>(
 			container,
-			object_ptr<EmojiUserpic>(
-				container,
-				Size(st::defaultUserpicButton.photoSize),
-				false)))->entity();
+			Size(st::defaultUserpicButton.photoSize),
+			false),
+		style::al_top);
 	preview->setDuration(0);
 	if (document) {
 		preview->setDocument(document);
@@ -271,13 +270,15 @@ object_ptr<Ui::RpWidget> CreateGradientEditor(
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
 
-	const auto editor = container->add(object_ptr<ColorEditor>(
+	auto ownedEditor = object_ptr<ColorEditor>(
 		container,
 		ColorEditor::Mode::HSL,
-		state->colors.back()));
+		state->colors.back());
+	container->resizeToWidth(ownedEditor->width());
+	const auto editor = container->add(std::move(ownedEditor));
 
 	buttonsContainer->chosenChanges(
-	) | rpl::start_with_next([=](ColorsLine::Chosen *chosen) {
+	) | rpl::on_next([=](ColorsLine::Chosen *chosen) {
 		if (chosen) {
 			const auto color = state->colors[chosen->index()];
 			editor->showColor(color);
@@ -289,10 +290,10 @@ object_ptr<Ui::RpWidget> CreateGradientEditor(
 		communication.result(state->colors);
 	});
 	// editor->submitRequests(
-	// ) | rpl::start_with_next([=] {
+	// ) | rpl::on_next([=] {
 	// }, editor->lifetime());
 	editor->colorValue(
-	) | rpl::start_with_next([=](QColor c) {
+	) | rpl::on_next([=](QColor c) {
 		if (const auto chosen = buttonsContainer->chosen()) {
 			chosen->setBrush(c);
 			state->colors[chosen->index()] = c;
@@ -302,11 +303,10 @@ object_ptr<Ui::RpWidget> CreateGradientEditor(
 
 	base::take(
 		communication.triggers
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		save();
 	}, container->lifetime());
 
-	container->resizeToWidth(editor->width());
 	buttonsContainer->init();
 
 	return container;
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder.cpp
index 24fc13e4b096ee..83a30ef868ab3e 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder.cpp
@@ -45,9 +45,8 @@ void ShowLayer(
 			content.get(),
 			tr::lng_connection_save(),
 			st::userpicBuilderEmojiButton);
-		save->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 		content->sizeValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto &p = st::userpicBuilderEmojiSavePosiiton;
 			save->moveToRight(p.x(), p.y());
 		}, save->lifetime());
@@ -63,7 +62,7 @@ void ShowLayer(
 			layerRaw->closeLayer();
 		});
 		content->sizeValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto &p = st::userpicBuilderEmojiBackPosiiton;
 			back->moveToLeft(p.x(), p.y());
 		}, back->lifetime());
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_layer.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_layer.cpp
index c251c7b66fbe3f..526fca10db9805 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_layer.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_layer.cpp
@@ -15,6 +15,11 @@ namespace UserpicBuilder {
 
 LayerWidget::LayerWidget()
 : _corners(Ui::PrepareCornerPixmaps(st::boxRadius, st::boxDividerBg)) {
+	style::PaletteChanged(
+	) | rpl::on_next([=] {
+		_corners = Ui::PrepareCornerPixmaps(st::boxRadius, st::boxDividerBg);
+		update();
+	}, lifetime());
 }
 
 void LayerWidget::setContent(not_null<Ui::RpWidget*> content) {
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_layer.h b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_layer.h
index 8889982517d9fb..d07dc52ce7b97a 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_layer.h
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_layer.h
@@ -31,7 +31,7 @@ class LayerWidget : public Ui::LayerWidget {
 	void paintEvent(QPaintEvent *e) override;
 
 private:
-	const Ui::CornersPixmaps _corners;
+	Ui::CornersPixmaps _corners;
 	Ui::RpWidget *_content;
 
 };
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_menu_item.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_menu_item.cpp
index 64be5312a0bf23..7630dd34126d9e 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_menu_item.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_menu_item.cpp
@@ -97,7 +97,7 @@ void StickerProvider::processDocumentIndex(int documentIndex) {
 		_resolvingLifetime.destroy();
 		_owner->customEmojiManager().resolve(
 			document->id
-		) | rpl::start_with_next([=](not_null<DocumentData*> d) {
+		) | rpl::on_next([=](not_null<DocumentData*> d) {
 			_resolvingLifetime.destroy();
 			_downloadFinishedLifetime.destroy();
 
@@ -111,7 +111,7 @@ void StickerProvider::processDocumentIndex(int documentIndex) {
 				rpl::empty_value()
 			) | rpl::then(
 				_owner->session().downloaderTaskFinished()
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				if (mediaView->loaded()) {
 					_timer.callOnce(kTimeout);
 					_documentChanged.fire_copy(mediaView->owner());
@@ -175,7 +175,7 @@ void AddEmojiBuilderAction(
 	};
 	const auto state = menu->lifetime().make_state<State>(controller);
 	auto item = base::make_unique_q<Ui::Menu::Action>(
-		menu.get(),
+		menu->menu(),
 		menu->st().menu,
 		Ui::Menu::CreateAction(
 			menu.get(),
@@ -203,11 +203,14 @@ void AddEmojiBuilderAction(
 
 	rpl::duplicate(
 		documents
-	) | rpl::start_with_next([=](std::vector<DocumentId> documents) {
+	) | rpl::on_next([=](std::vector<DocumentId> documents) {
 		state->manager.setDocuments(std::move(documents));
 	}, item->lifetime());
 
-	menu->addAction(std::move(item));
+	const auto action = menu->addAction(std::move(item));
+	action->setProperty(
+		"highlight-control-id",
+		u"profile-photo/use-emoji"_q);
 }
 
 } // namespace UserpicBuilder
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp
index 280b5c1b65076d..b78c7c89f78587 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp
@@ -76,8 +76,8 @@ void PreviewPainter::setDocument(
 	}
 
 	rpl::single() | rpl::then(
-		document->owner().session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+		document->session().downloaderTaskFinished()
+	) | rpl::on_next([=] {
 		if (!_media->loaded()) {
 			return;
 		}
@@ -104,7 +104,7 @@ void PreviewPainter::setDocument(
 		}
 		if (_player) {
 			_player->setRepaintCallback(updateCallback);
-		} else {
+		} else if (updateCallback) {
 			updateCallback();
 		}
 	}, _lifetime);
@@ -166,11 +166,12 @@ EmojiUserpic::EmojiUserpic(
 , _painter(size.width())
 , _duration(st::slideWrapDuration) {
 	resize(size);
+	setNaturalWidth(size.width());
 }
 
 void EmojiUserpic::setDocument(not_null<DocumentData*> document) {
 	if (!_playOnce.has_value()) {
-		const auto &c = document->owner().session().appConfig();
+		const auto &c = document->session().appConfig();
 		_playOnce = !c.get<bool>(u"upload_markup_video"_q, false);
 	}
 	_painter.setDocument(document, [=] { update(); });
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
index 7d4f075cc81167..40f19bd7f030d3 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
@@ -178,7 +178,7 @@ void ShowGradientEditor(
 				},
 			});
 		box->setWidth(content->width());
-		box->addRow(std::move(content), {});
+		box->addRow(std::move(content), style::margins());
 	}));
 }
 
@@ -223,7 +223,7 @@ EmojiSelector::EmojiSelector(
 , _controller(controller) {
 	std::move(
 		recent
-	) | rpl::start_with_next([=](std::vector<DocumentId> ids) {
+	) | rpl::on_next([=](std::vector<DocumentId> ids) {
 		_lastRecent = std::move(ids);
 		_recentChanges.fire({});
 	}, lifetime());
@@ -243,7 +243,7 @@ EmojiSelector::Selector EmojiSelector::createEmojiList(
 		.show = _controller->uiShow(),
 		.mode = ChatHelpers::EmojiListMode::UserpicBuilder,
 		.paused = [=] { return true; },
-		.customRecentList = _lastRecent,
+		.customRecentList = ChatHelpers::DocumentListToRecent(_lastRecent),
 		.customRecentFactory = [=](DocumentId id, Fn<void()> repaint) {
 			return manager->create(id, std::move(repaint), tag);
 		},
@@ -254,11 +254,11 @@ EmojiSelector::Selector EmojiSelector::createEmojiList(
 	const auto footer = list->createFooter().data();
 	list->refreshEmoji();
 	list->customChosen(
-	) | rpl::start_with_next([=](const ChatHelpers::FileChosen &chosen) {
+	) | rpl::on_next([=](const ChatHelpers::FileChosen &chosen) {
 		_chosen.fire_copy(chosen.document);
 	}, list->lifetime());
 	_recentChanges.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		createSelector(Type::Emoji);
 	}, list->lifetime());
 	list->setAllowWithoutPremium(true);
@@ -276,7 +276,7 @@ EmojiSelector::Selector EmojiSelector::createStickersList(
 	const auto footer = list->createFooter().data();
 	list->refreshRecent();
 	list->chosen(
-	) | rpl::start_with_next([=](const ChatHelpers::FileChosen &chosen) {
+	) | rpl::on_next([=](const ChatHelpers::FileChosen &chosen) {
 		_chosen.fire_copy(chosen.document);
 	}, list->lifetime());
 	return { list, footer };
@@ -292,7 +292,7 @@ void EmojiSelector::createSelector(Type type) {
 	const auto container = _container.get();
 	container->show();
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		container->setGeometry(Rect(s));
 	}, container->lifetime());
 
@@ -312,7 +312,7 @@ void EmojiSelector::createSelector(Type type) {
 			+ QSize(pos.x() * 2, pos.y() * 2));
 		toggleButton->show();
 		toggleButton->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(toggleButton);
 			const auto r = toggleButton->rect()
 				- QMargins(pos.x(), pos.y(), pos.x(), pos.y());
@@ -332,20 +332,20 @@ void EmojiSelector::createSelector(Type type) {
 	rpl::combine(
 		scroll->scrollTopValue(),
 		scroll->heightValue()
-	) | rpl::start_with_next([=](int scrollTop, int scrollHeight) {
+	) | rpl::on_next([=](int scrollTop, int scrollHeight) {
 		const auto scrollBottom = scrollTop + scrollHeight;
 		selector.list->setVisibleTopBottom(scrollTop, scrollBottom);
 	}, selector.list->lifetime());
 
 	selector.list->scrollToRequests(
-	) | rpl::start_with_next([=](int y) {
+	) | rpl::on_next([=](int y) {
 		scroll->scrollToY(y);
 		// _shadow->update();
 	}, selector.list->lifetime());
 
 	const auto separator = Ui::CreateChild<Ui::RpWidget>(container);
 	separator->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(separator);
 		p.fillRect(r, st::shadowFg);
 	}, separator->lifetime());
@@ -356,7 +356,7 @@ void EmojiSelector::createSelector(Type type) {
 
 	const auto scrollWidth = stScroll.width;
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto left = st::userpicBuilderEmojiSelectorLeft;
 		const auto mostTop = st::userpicBuilderEmojiSelectorLeft;
 
@@ -408,13 +408,12 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
 	const auto state = container->lifetime().make_state<State>();
 
 	const auto preview = container->add(
-		object_ptr<Ui::CenterWrap<EmojiUserpic>>(
+		object_ptr<EmojiUserpic>(
 			container,
-			object_ptr<EmojiUserpic>(
-				container,
-				Size(st::settingsInfoPhotoSize),
-				data.isForum)),
-		st::userpicBuilderEmojiPreviewPadding)->entity();
+			Size(st::settingsInfoPhotoSize),
+			data.isForum),
+		st::userpicBuilderEmojiPreviewPadding,
+		style::al_top);
 	if (const auto id = data.documentId) {
 		const auto document = controller->session().data().document(id);
 		if (document && document->sticker()) {
@@ -423,13 +422,12 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
 	}
 
 	container->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			container,
-			object_ptr<Ui::FlatLabel>(
-				container,
-				tr::lng_userpic_builder_color_subtitle(),
-				st::userpicBuilderEmojiSubtitle)),
-		st::userpicBuilderEmojiSubtitlePadding);
+			tr::lng_userpic_builder_color_subtitle(),
+			st::userpicBuilderEmojiSubtitle),
+		st::userpicBuilderEmojiSubtitlePadding,
+		style::al_top);
 
 	const auto paletteBg = Ui::AddBubbleWrap(
 		container,
@@ -508,20 +506,19 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
 		state->circleButtons[current]->clicked({}, Qt::LeftButton);
 	}
 	paletteBg->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		palette->setGeometry(Ui::BubbleWrapInnerRect(Rect(s))
 			- st::userpicBuilderEmojiBubblePalettePadding);
 		AlignChildren(palette, palette->width());
 	}, palette->lifetime());
 
 	container->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			container,
-			object_ptr<Ui::FlatLabel>(
-				container,
-				tr::lng_userpic_builder_emoji_subtitle(),
-				st::userpicBuilderEmojiSubtitle)),
-		st::userpicBuilderEmojiSubtitlePadding);
+			tr::lng_userpic_builder_emoji_subtitle(),
+			st::userpicBuilderEmojiSubtitle),
+		st::userpicBuilderEmojiSubtitlePadding,
+		style::al_top);
 
 	const auto selectorBg = Ui::AddBubbleWrap(
 		container,
@@ -533,18 +530,18 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
 		controller,
 		base::take(data.documents));
 	selector->chosen(
-	) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+	) | rpl::on_next([=](not_null<DocumentData*> document) {
 		state->gradientEditorStartData.documentId = document->id;
 		preview->setDocument(document);
 	}, preview->lifetime());
 	selectorBg->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		selector->setGeometry(Ui::BubbleWrapInnerRect(Rect(s)));
 	}, selector->lifetime());
 
 	base::take(
 		communication.triggers
-	) | rpl::start_with_next([=, done = base::take(communication.result)] {
+	) | rpl::on_next([=, done = base::take(communication.result)] {
 		preview->result(Editor::kProfilePhotoSize, [=](Result result) {
 			done(std::move(result));
 		});
@@ -566,12 +563,12 @@ not_null<Ui::RpWidget*> CreateEmojiUserpic(
 		isForum);
 	std::move(
 		document
-	) | rpl::start_with_next([=](not_null<DocumentData*> d) {
+	) | rpl::on_next([=](not_null<DocumentData*> d) {
 		widget->setDocument(d);
 	}, widget->lifetime());
 	std::move(
 		colorIndex
-	) | rpl::start_with_next([=](int index) {
+	) | rpl::on_next([=](int index) {
 		widget->setGradientColors(
 			paletteGradients[index % paletteGradients.size()]);
 	}, widget->lifetime());
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index be215bc5079173..4a8f686750224e 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -11,29 +11,50 @@ For license and copyright information please follow this link:
 #include "api/api_common.h"
 #include "api/api_sending.h"
 #include "apiwrap.h"
+#include "base/call_delayed.h"
+#include "base/base_file_utilities.h"
 #include "base/qthelp_url.h"
 #include "base/random.h"
 #include "base/timer_rpl.h"
+#include "base/unixtime.h"
+#include "boxes/peers/choose_peer_box.h"
+#include "boxes/peers/create_managed_bot_box.h"
 #include "boxes/peer_list_controllers.h"
+#include "boxes/premium_preview_box.h"
 #include "boxes/share_box.h"
+#include "chat_helpers/stickers_lottie.h"
+#include "chat_helpers/tabbed_panel.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
 #include "core/local_url_handlers.h"
 #include "core/shortcuts.h"
+#include "core/ui_integration.h" // TextContext
 #include "data/components/location_pickers.h"
 #include "data/data_bot_app.h"
 #include "data/data_changes.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
+#include "data/data_emoji_statuses.h"
 #include "data/data_file_origin.h"
 #include "data/data_peer_bot_command.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_web_page.h"
 #include "data/stickers/data_custom_emoji.h"
+#include "data/stickers/data_stickers.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/history_item_helpers.h"
+#include "history/history_item_reply_markup.h"
+#include "info/bot/starref/info_bot_starref_common.h" // MakePeerBubbleButton
 #include "info/profile/info_profile_values.h"
+#include "inline_bots/inline_bot_result.h"
+#include "inline_bots/inline_bot_confirm_prepared.h"
+#include "inline_bots/inline_bot_downloads.h"
+#include "inline_bots/inline_bot_storage.h"
+#ifdef TDESKTOP_IV_EDITOR
+#include "iv/editor/iv_editor_session.h"
+#endif // TDESKTOP_IV_EDITOR
 #include "iv/iv_instance.h"
 #include "lang/lang_keys.h"
 #include "main/main_app_config.h"
@@ -42,6 +63,7 @@ For license and copyright information please follow this link:
 #include "mainwidget.h"
 #include "payments/payments_checkout_process.h"
 #include "payments/payments_non_panel_process.h"
+#include "settings/sections/settings_premium.h"
 #include "storage/storage_account.h"
 #include "storage/storage_domain.h"
 #include "ui/basic_click_handlers.h"
@@ -51,11 +73,12 @@ For license and copyright information please follow this link:
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/painter.h"
+#include "ui/text/text_custom_emoji.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/dropdown_menu.h"
-#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/widgets/menu/menu_item_base.h"
 #include "ui/widgets/popup_menu.h"
 #include "webview/webview_interface.h"
@@ -66,7 +89,7 @@ For license and copyright information please follow this link:
 #include "styles/style_boxes.h"
 #include "styles/style_channel_earn.h"
 #include "styles/style_chat.h"
-#include "styles/style_info.h" // infoVerifiedCheck.
+#include "styles/style_info.h" // infoVerifiedStar.
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
 #include "styles/style_window.h"
@@ -80,6 +103,26 @@ constexpr auto kProlongTimeout = 60 * crl::time(1000);
 constexpr auto kRefreshBotsTimeout = 60 * 60 * crl::time(1000);
 constexpr auto kPopularAppBotsLimit = 100;
 
+[[nodiscard]] QImage PaintButtonEmojiFrame(
+		Ui::Text::CustomEmoji &emoji,
+		const QColor &textColor,
+		int size) {
+	const auto ratio = style::DevicePixelRatio();
+	auto image = QImage(
+		QSize(size, size) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(ratio);
+	image.fill(Qt::transparent);
+	auto painter = Painter(&image);
+	emoji.paint(painter, Ui::Text::CustomEmoji::Context{
+		.textColor = textColor,
+		.size = QSize(size, size),
+		.now = crl::now(),
+		.position = QPoint(0, 0),
+	});
+	return image;
+}
+
 [[nodiscard]] DocumentData *ResolveIcon(
 		not_null<Main::Session*> session,
 		const MTPDattachMenuBot &data) {
@@ -141,10 +184,9 @@ constexpr auto kPopularAppBotsLimit = 100;
 				.requestWriteAccess = data.is_request_write_access(),
 			} : std::optional<AttachWebViewBot>();
 	});
-	if (result && result->icon) {
-		result->icon->forceToCache(true);
-	}
-	if (const auto icon = result->icon) {
+	if (const auto icon = result ? result->icon : nullptr) {
+		icon->forceToCache(true);
+
 		result->media = icon->createMediaView();
 		icon->save(Data::FileOrigin(), {});
 	}
@@ -169,6 +211,33 @@ constexpr auto kPopularAppBotsLimit = 100;
 	return result;
 }
 
+[[nodiscard]] QString JoinChatDecisionToast(
+		not_null<Main::Session*> session,
+		PeerId peerId,
+		const MTPJoinChatBotResult &result) {
+	const auto isChannel = [&] {
+		if (const auto peer = session->data().peerLoaded(peerId)) {
+			return peer->isBroadcast();
+		}
+		return false;
+	}();
+	return result.match([&](const MTPDjoinChatBotResultApproved &) {
+		return isChannel
+			? tr::lng_action_you_joined_by_request_channel(tr::now)
+			: tr::lng_action_you_joined_by_request(tr::now);
+	}, [&](const MTPDjoinChatBotResultDeclined &) {
+		return isChannel
+			? tr::lng_group_request_declined_channel(tr::now)
+			: tr::lng_group_request_declined(tr::now);
+	}, [&](const MTPDjoinChatBotResultQueued &) {
+		return isChannel
+			? tr::lng_group_request_sent_channel(tr::now)
+			: tr::lng_group_request_sent(tr::now);
+	}, [&](const MTPDjoinChatBotResultWebView &) {
+		return QString();
+	});
+}
+
 [[nodiscard]] Ui::LocationPickerConfig ResolveMapsConfig(
 		not_null<Main::Session*> session) {
 	const auto &appConfig = session->appConfig();
@@ -202,7 +271,7 @@ void ShowChooseBox(
 		PeerTypes types,
 		Fn<void(not_null<Data::Thread*>)> callback,
 		rpl::producer<QString> titleOverride = nullptr) {
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto done = [=](not_null<Data::Thread*> thread) mutable {
 		if (const auto strong = *weak) {
 			strong->closeBox();
@@ -271,7 +340,7 @@ void FillDisclaimerBox(
 	Ui::ConfirmBox(box, {
 		.text = tr::lng_mini_apps_disclaimer_text(
 			tr::now,
-			Ui::Text::RichLangValue),
+			tr::rich),
 		.confirmed = callback,
 		.cancelled = [=](Fn<void()> close) { done(false); close(); },
 		.confirmText = tr::lng_box_ok(),
@@ -289,10 +358,10 @@ void FillDisclaimerBox(
 			box.get(),
 			tr::lng_mini_apps_disclaimer_button(
 				lt_link,
-				rpl::single(Ui::Text::Link(
+				rpl::single(tr::link(
 					tr::lng_mini_apps_disclaimer_link(tr::now),
 					tr::lng_mini_apps_tos_url(tr::now))),
-				Ui::Text::WithEntities),
+				tr::marked),
 			st::urlAuthCheckbox,
 			std::move(checkView)),
 		{
@@ -334,7 +403,7 @@ WebViewContext ResolveContext(
 		WebViewContext context) {
 	if (!context.dialogsEntryState.key) {
 		if (const auto strong = context.controller.get()) {
-			context.dialogsEntryState = strong->currentDialogsEntryState();
+			context.dialogsEntryState = strong->dialogsEntryStateCurrent();
 		}
 	}
 	if (!context.action) {
@@ -342,6 +411,7 @@ WebViewContext ResolveContext(
 		if (const auto thread = state.key.thread()) {
 			context.action = Api::SendAction(thread);
 			context.action->replyTo = state.currentReplyTo;
+			context.action->options.suggest = state.currentSuggest;
 		} else {
 			context.action = Api::SendAction(bot->owner().history(bot));
 		}
@@ -356,6 +426,7 @@ WebViewContext ResolveContext(
 			.key = (topic ? Key{ topic } : Key{ history }),
 			.section = (topic ? Section::Replies : Section::History),
 			.currentReplyTo = context.action->replyTo,
+			.currentSuggest = context.action->options.suggest,
 		};
 	}
 	return context;
@@ -365,21 +436,15 @@ void FillBotUsepic(
 		not_null<Ui::GenericBox*> box,
 		not_null<PeerData*> bot,
 		base::weak_ptr<Window::SessionController> weak) {
-	auto arrow = Ui::Text::SingleCustomEmoji(
-		bot->owner().customEmojiManager().registerInternalEmoji(
-			st::topicButtonArrow,
-			st::channelEarnLearnArrowMargins,
-			false));
-	auto aboutLabel = Ui::CreateLabelWithCustomEmoji(
+	auto aboutLabel = object_ptr<Ui::FlatLabel>(
 		box->verticalLayout(),
 		tr::lng_allow_bot_webview_details(
 			lt_emoji,
-			rpl::single(std::move(arrow)),
-			Ui::Text::RichLangValue
+			rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+			tr::rich
 		) | rpl::map([](TextWithEntities text) {
-			return Ui::Text::Link(std::move(text), u"internal:"_q);
+			return tr::link(std::move(text), u"internal:"_q);
 		}),
-		{ .session = &bot->session() },
 		st::defaultFlatLabel);
 	const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
 		box->verticalLayout(),
@@ -400,37 +465,205 @@ void FillBotUsepic(
 		title,
 		rpl::single(bot->name()),
 		box->getDelegate()->style().title);
-	const auto icon = bot->isVerified() ? &st::infoVerifiedCheck : nullptr;
+	const auto icon = bot->isVerified() ? &st::infoVerifiedStar : nullptr;
+	const auto iconCheck = icon
+		? &st::infoPeerBadge.verifiedCheck
+		: nullptr;
 	title->resize(
 		titleLabel->width() + (icon ? icon->width() : 0),
 		titleLabel->height());
 	title->widthValue(
-	) | rpl::distinct_until_changed() | rpl::start_with_next([=](int w) {
+	) | rpl::distinct_until_changed() | rpl::on_next([=](int w) {
 		titleLabel->resizeToWidth(w
 			- (icon ? icon->width() + st::lineWidth : 0));
 	}, title->lifetime());
 	if (icon) {
-		title->paintRequest(
-		) | rpl::start_with_next([=] {
+		title->paintRequest() | rpl::on_next([=] {
 			auto p = Painter(title);
 			p.fillRect(title->rect(), Qt::transparent);
-			icon->paint(
-				p,
-				std::min(
-					titleLabel->textMaxWidth() + st::lineWidth,
-					title->width() - st::lineWidth - icon->width()),
-				(title->height() - icon->height()) / 2,
-				title->width());
+			const auto x = std::min(
+				titleLabel->textMaxWidth() + st::lineWidth,
+				title->width() - st::lineWidth - icon->width());
+			const auto y = (title->height() - icon->height()) / 2;
+			const auto w = title->width();
+			icon->paint(p, x, y, w);
+			iconCheck->paint(p, x, y, w);
 		}, title->lifetime());
 	}
 
 	Ui::IconWithTitle(box->verticalLayout(), userpic, title, aboutLabel);
 }
 
+std::unique_ptr<Ui::RpWidget> MakeEmojiSetStatusPreview(
+		not_null<QWidget*> parent,
+		not_null<PeerData*> peer,
+		not_null<DocumentData*> document) {
+	const auto emoji = Ui::CreateChild<Ui::PaddingWrap<Ui::FlatLabel>>(
+		parent,
+		object_ptr<Ui::FlatLabel>(
+			parent,
+			rpl::single(
+				Ui::Text::SingleCustomEmoji(
+					Data::SerializeCustomEmojiId(document->id),
+					(document->sticker()
+						? document->sticker()->alt
+						: QString()))),
+			st::botEmojiStatusEmoji,
+			st::defaultPopupMenu,
+			Core::TextContext({ .session = &peer->session() })),
+		style::margins(st::normalFont->spacew, 0, 0, 0));
+	emoji->entity()->resizeToWidth(emoji->entity()->textMaxWidth());
+
+	auto result = Info::BotStarRef::MakePeerBubbleButton(
+		parent,
+		peer,
+		emoji);
+	result->setAttribute(Qt::WA_TransparentForMouseEvents);
+	return result;
+}
+
+bool CheckEmojiStatusPremium(not_null<UserData*> bot) {
+	if (bot->session().premium()) {
+		return true;
+	}
+	const auto window = ChatHelpers::ResolveWindowDefault()(
+		&bot->session());
+	if (window) {
+		ShowPremiumPreviewBox(window, PremiumFeature::EmojiStatus);
+		window->window().activate();
+	}
+	return false;
+}
+
+void ConfirmEmojiStatusAccessBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<UserData*> bot,
+		Fn<void(bool)> done) {
+	box->setNoContentMargin(true);
+
+	const auto set = box->lifetime().make_state<bool>();
+
+	box->addTopButton(st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+
+	AddSkip(box->verticalLayout(), 4 * st::defaultVerticalListSkip);
+
+	const auto statusIcon = ChatHelpers::GenerateLocalTgsSticker(
+		&bot->session(),
+		u"hello_status"_q,
+		true);
+
+	auto ownedSet = MakeEmojiSetStatusPreview(
+		box,
+		bot->session().user(),
+		statusIcon);
+	box->addRow(
+		object_ptr<Ui::RpWidget>::fromRaw(ownedSet.release()));
+
+	AddSkip(box->verticalLayout(), 2 * st::defaultVerticalListSkip);
+
+	auto name = tr::bold(bot->name());
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_bot_emoji_status_access_text(
+				lt_bot,
+				rpl::single(name),
+				lt_name,
+				rpl::single(name),
+				tr::rich),
+			st::botEmojiStatusText),
+		style::al_top);
+
+	box->addButton(tr::lng_bot_emoji_status_access_allow(), [=] {
+		if (!CheckEmojiStatusPremium(bot)) {
+			return;
+		}
+		*set = true;
+		box->closeBox();
+		done(true);
+	});
+	box->addButton(tr::lng_cancel(), [=] {
+		const auto was = *set;
+		box->closeBox();
+		if (!was) {
+			done(false);
+		}
+	});
+}
+
+void ConfirmEmojiStatusBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<UserData*> bot,
+		not_null<DocumentData*> document,
+		TimeId duration,
+		Fn<void(bool)> done) {
+	box->setNoContentMargin(true);
+
+	auto owned = Settings::MakeEmojiStatusPreview(box, document);
+	const auto preview = box->addRow(
+		object_ptr<Ui::RpWidget>::fromRaw(owned.release()));
+	preview->resize(preview->width(), st::botEmojiStatusPreviewHeight);
+
+	const auto set = box->lifetime().make_state<bool>();
+
+	box->addTopButton(st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_bot_emoji_status_title(),
+			st::botEmojiStatusTitle),
+		style::al_top);
+	AddSkip(box->verticalLayout());
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_bot_emoji_status_text(
+				lt_bot,
+				rpl::single(tr::bold(bot->name())),
+				tr::rich),
+			st::botEmojiStatusText),
+		style::al_top);
+
+	AddSkip(box->verticalLayout(), 2 * st::defaultVerticalListSkip);
+
+	auto ownedSet = MakeEmojiSetStatusPreview(
+		box,
+		document->session().user(),
+		document);
+	box->addRow(
+		object_ptr<Ui::RpWidget>::fromRaw(ownedSet.release()));
+
+	box->addButton(tr::lng_bot_emoji_status_confirm(), [=] {
+		if (!CheckEmojiStatusPremium(bot)) {
+			return;
+		}
+		document->owner().emojiStatuses().set(
+			{ document->id },
+			duration ? (base::unixtime::now() + duration) : 0);
+		*set = true;
+		box->closeBox();
+		done(true);
+	});
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+	box->boxClosing() | rpl::on_next([=] {
+		if (!*set) {
+			done(false);
+		}
+	}, box->lifetime());
+}
+
 class BotAction final : public Ui::Menu::ItemBase {
 public:
 	BotAction(
-		not_null<Ui::RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		std::shared_ptr<Ui::Show> show,
 		const style::Menu &st,
 		const AttachWebViewBot &bot,
@@ -471,14 +704,14 @@ class BotAction final : public Ui::Menu::ItemBase {
 };
 
 BotAction::BotAction(
-	not_null<Ui::RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	std::shared_ptr<Ui::Show> show,
 	const style::Menu &st,
 	const AttachWebViewBot &bot,
 	Fn<void()> callback)
 : ItemBase(parent, st)
 , _show(std::move(show))
-, _dummyAction(new QAction(parent))
+, _dummyAction(Ui::CreateChild<QAction>(parent))
 , _st(st)
 , _bot(bot)
 , _icon(this, _bot.media)
@@ -486,13 +719,13 @@ BotAction::BotAction(
 		+ _st.itemStyle.font->height
 		+ _st.itemPadding.bottom()) {
 	setAcceptBoth(false);
-	initResizeHook(parent->sizeValue());
-	setClickedCallback(std::move(callback));
+	fitToMenuWidth();
+	setActionTriggered(std::move(callback));
 
 	_icon.move(_st.itemIconPosition);
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
@@ -590,6 +823,17 @@ void BotAction::handleKeyPress(not_null<QKeyEvent*> e) {
 
 } // namespace
 
+WebViewResultData ParseWebViewResult(const MTPWebViewResult &result) {
+	const auto &data = result.data();
+	return {
+		.url = qs(data.vurl()),
+		.queryId = data.vquery_id().value_or_empty(),
+		.fullscreen = data.is_fullscreen(),
+		.fullsize = data.is_fullsize(),
+		.sameOrigin = data.is_same_origin(),
+	};
+}
+
 base::weak_ptr<WebViewInstance> WebViewInstance::PendingActivation;
 
 MenuBotIcon::MenuBotIcon(
@@ -598,7 +842,7 @@ MenuBotIcon::MenuBotIcon(
 : RpWidget(parent)
 , _media(std::move(media)) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_image = QImage();
 		update();
 	}, lifetime());
@@ -682,6 +926,8 @@ WebViewInstance::WebViewInstance(WebViewDescriptor &&descriptor)
 , _context(ResolveContext(_bot, std::move(descriptor.context)))
 , _button(std::move(descriptor.button))
 , _source(std::move(descriptor.source)) {
+	Expects(_parentShow != nullptr);
+
 	resolve();
 }
 
@@ -711,7 +957,28 @@ void WebViewInstance::activate() {
 	}
 }
 
+void WebViewInstance::requestFullBot() {
+	if (_bot->isFullLoaded()) {
+		return;
+	}
+	_bot->updateFull();
+	_bot->session().changes().peerUpdates(
+		_bot,
+		Data::PeerUpdate::Flag::FullInfo
+	) | rpl::on_next([=] {
+		if (_botFullWaitingArgs.has_value()) {
+			auto args = *base::take(_botFullWaitingArgs);
+			if (args.result.url.isEmpty()) {
+				showGame();
+			} else {
+				show(std::move(args));
+			}
+		}
+	}, _lifetime);
+}
+
 void WebViewInstance::resolve() {
+	requestFullBot();
 	v::match(_source, [&](WebViewSourceButton data) {
 		confirmOpen([=] {
 			if (data.simple) {
@@ -725,11 +992,16 @@ void WebViewInstance::resolve() {
 			requestSimple();
 		});
 	}, [&](WebViewSourceLinkApp data) {
-		resolveApp(data.appname, data.token, !_context.maySkipConfirmation);
+		resolveApp(
+			data.appname,
+			data.token,
+			(_context.maySkipConfirmation
+				? ConfirmType::None
+				: ConfirmType::Always));
 	}, [&](WebViewSourceLinkBotProfile) {
 		confirmOpen([=] {
 			requestMain();
-		});
+		}, !_context.maySkipConfirmation);
 	}, [&](WebViewSourceLinkAttachMenu data) {
 		requestWithMenuAdd();
 	}, [&](WebViewSourceMainMenu) {
@@ -752,6 +1024,14 @@ void WebViewInstance::resolve() {
 				requestMain();
 			});
 		}
+	}, [&](WebViewSourceAgeVerification) {
+		requestMain();
+	}, [&](WebViewSourceJoinChat data) {
+		confirmOpen([=] {
+			show({
+				.result = data.result,
+			});
+		}, true);
 	});
 }
 
@@ -773,18 +1053,18 @@ bool WebViewInstance::openAppFromBotMenuLink() {
 	if (appname.isEmpty()) {
 		return false;
 	}
-	resolveApp(appname, params.value(u"startapp"_q), true);
+	resolveApp(appname, params.value(u"startapp"_q), ConfirmType::Once);
 	return true;
 }
 
 void WebViewInstance::resolveApp(
 		const QString &appname,
 		const QString &startparam,
-		bool forceConfirmation) {
+		ConfirmType confirmType) {
 	const auto already = _session->data().findBotApp(_bot->id, appname);
 	_requestId = _session->api().request(MTPmessages_GetBotApp(
 		MTP_inputBotAppShortName(
-			_bot->inputUser,
+			_bot->inputUser(),
 			MTP_string(appname)),
 		MTP_long(already ? already->hash : 0)
 	)).done([=](const MTPmessages_BotApp &result) {
@@ -800,8 +1080,11 @@ void WebViewInstance::resolveApp(
 			close();
 			return;
 		}
-		const auto confirm = data.is_inactive() || forceConfirmation;
+		const auto confirm = data.is_inactive()
+			|| (confirmType != ConfirmType::None);
 		const auto writeAccess = result.data().is_request_write_access();
+		const auto forceConfirmation = data.is_inactive()
+			|| (confirmType == ConfirmType::Always);
 
 		// Check if this app can be added to main menu.
 		// On fail it'll still be opened.
@@ -814,7 +1097,7 @@ void WebViewInstance::resolveApp(
 			} else if (confirm) {
 				confirmAppOpen(writeAccess, [=](bool allowWrite) {
 					requestApp(allowWrite);
-				});
+				}, forceConfirmation);
 			} else {
 				requestApp(false);
 			}
@@ -826,14 +1109,15 @@ void WebViewInstance::resolveApp(
 	}).send();
 }
 
-void WebViewInstance::confirmOpen(Fn<void()> done) {
-	if (_bot->isVerified()
-		|| _session->local().isBotTrustedOpenWebView(_bot->id)) {
+void WebViewInstance::confirmOpen(Fn<void()> done, bool forceConfirmation) {
+	if (!forceConfirmation
+		&& (_bot->isVerified()
+			|| _session->local().isPeerTrustedOpenWebView(_bot->id))) {
 		done();
 		return;
 	}
 	const auto callback = [=](Fn<void()> close) {
-		_session->local().markBotTrustedOpenWebView(_bot->id);
+		_session->local().markPeerTrustedOpenWebView(_bot->id);
 		close();
 		done();
 	};
@@ -848,10 +1132,10 @@ void WebViewInstance::confirmOpen(Fn<void()> done) {
 			.text = tr::lng_profile_open_app_about(
 				tr::now,
 				lt_terms,
-				Ui::Text::Link(
+				tr::link(
 					tr::lng_profile_open_app_terms(tr::now),
 					tr::lng_mini_apps_tos_url(tr::now)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			.confirmed = crl::guard(this, callback),
 			.cancelled = crl::guard(this, cancel),
 			.confirmText = tr::lng_view_button_bot_app(),
@@ -861,10 +1145,18 @@ void WebViewInstance::confirmOpen(Fn<void()> done) {
 
 void WebViewInstance::confirmAppOpen(
 		bool writeAccess,
-		Fn<void(bool allowWrite)> done) {
+		Fn<void(bool allowWrite)> done,
+		bool forceConfirmation) {
+	if (!forceConfirmation
+		&& (_bot->isVerified()
+			|| _session->local().isPeerTrustedOpenWebView(_bot->id))) {
+		done(writeAccess);
+		return;
+	}
 	_parentShow->show(Box([=](not_null<Ui::GenericBox*> box) {
 		const auto allowed = std::make_shared<Ui::Checkbox*>();
 		const auto callback = [=](Fn<void()> close) {
+			_session->local().markPeerTrustedOpenWebView(_bot->id);
 			done((*allowed) && (*allowed)->checked());
 			close();
 		};
@@ -877,10 +1169,10 @@ void WebViewInstance::confirmAppOpen(
 			tr::lng_profile_open_app_about(
 				tr::now,
 				lt_terms,
-				Ui::Text::Link(
+				tr::link(
 					tr::lng_profile_open_app_terms(tr::now),
 					tr::lng_mini_apps_tos_url(tr::now)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			crl::guard(this, callback),
 			crl::guard(this, cancelled),
 			tr::lng_view_button_bot_app(),
@@ -892,8 +1184,8 @@ void WebViewInstance::confirmAppOpen(
 					tr::lng_url_auth_allow_messages(
 						tr::now,
 						lt_bot,
-						Ui::Text::Bold(_bot->name()),
-						Ui::Text::WithEntities),
+						tr::bold(_bot->name()),
+						tr::marked),
 					true,
 					st::urlAuthCheckbox),
 				style::margins(
@@ -913,6 +1205,7 @@ void WebViewInstance::requestButton() {
 	using Flag = MTPmessages_RequestWebView::Flag;
 	_requestId = _session->api().request(MTPmessages_RequestWebView(
 		MTP_flags(Flag::f_theme_params
+			| (_context.fullscreen ? Flag::f_fullscreen : Flag(0))
 			| (_button.url.isEmpty() ? Flag(0) : Flag::f_url)
 			| (_button.startCommand.isEmpty()
 				? Flag(0)
@@ -923,19 +1216,20 @@ void WebViewInstance::requestButton() {
 			| (action.replyTo ? Flag::f_reply_to : Flag(0))
 			| (action.options.sendAs ? Flag::f_send_as : Flag(0))
 			| (action.options.silent ? Flag::f_silent : Flag(0))),
-		action.history->peer->input,
-		_bot->inputUser,
+		action.history->peer->input(),
+		_bot->inputUser(),
 		MTP_bytes(_button.url),
 		MTP_string(_button.startCommand),
 		MTP_dataJSON(MTP_bytes(botThemeParams().json)),
 		MTP_string("tdesktop"),
 		action.mtpReplyTo(),
 		(action.options.sendAs
-			? action.options.sendAs->input
+			? action.options.sendAs->input()
 			: MTP_inputPeerEmpty())
 	)).done([=](const MTPWebViewResult &result) {
-		const auto &data = result.data();
-		show(qs(data.vurl()), data.vquery_id().value_or_empty());
+		show({
+			.result = ParseWebViewResult(result),
+		});
 	}).fail([=](const MTP::Error &error) {
 		_parentShow->showToast(error.type());
 		if (error.type() == u"BOT_INVALID"_q) {
@@ -949,6 +1243,7 @@ void WebViewInstance::requestSimple() {
 	using Flag = MTPmessages_RequestSimpleWebView::Flag;
 	_requestId = _session->api().request(MTPmessages_RequestSimpleWebView(
 		MTP_flags(Flag::f_theme_params
+			| (_context.fullscreen ? Flag::f_fullscreen : Flag(0))
 			| (v::is<WebViewSourceSwitch>(_source)
 				? (Flag::f_url | Flag::f_from_switch_webview)
 				: v::is<WebViewSourceMainMenu>(_source)
@@ -957,13 +1252,15 @@ void WebViewInstance::requestSimple() {
 						? Flag()
 						: Flag::f_start_param))
 				: Flag::f_url)),
-		_bot->inputUser,
+		_bot->inputUser(),
 		MTP_bytes(_button.url),
 		MTP_string(_button.startCommand),
 		MTP_dataJSON(MTP_bytes(botThemeParams().json)),
 		MTP_string("tdesktop")
 	)).done([=](const MTPWebViewResult &result) {
-		show(qs(result.data().vurl()));
+		show({
+			.result = ParseWebViewResult(result),
+		});
 	}).fail([=](const MTP::Error &error) {
 		_parentShow->showToast(error.type());
 		close();
@@ -974,6 +1271,7 @@ void WebViewInstance::requestMain() {
 	using Flag = MTPmessages_RequestMainWebView::Flag;
 	_requestId = _session->api().request(MTPmessages_RequestMainWebView(
 		MTP_flags(Flag::f_theme_params
+			| (_context.fullscreen ? Flag::f_fullscreen : Flag(0))
 			| (_button.startCommand.isEmpty()
 						? Flag()
 						: Flag::f_start_param)
@@ -982,13 +1280,15 @@ void WebViewInstance::requestMain() {
 					? Flag::f_compact
 					: Flag(0))
 				: Flag(0))),
-		_context.action->history->peer->input,
-		_bot->inputUser,
+		_context.action->history->peer->input(),
+		_bot->inputUser(),
 		MTP_string(_button.startCommand),
 		MTP_dataJSON(MTP_bytes(botThemeParams().json)),
 		MTP_string("tdesktop")
 	)).done([=](const MTPWebViewResult &result) {
-		show(qs(result.data().vurl()));
+		show({
+			.result = ParseWebViewResult(result),
+		});
 	}).fail([=](const MTP::Error &error) {
 		_parentShow->showToast(error.type());
 		close();
@@ -1001,19 +1301,24 @@ void WebViewInstance::requestApp(bool allowWrite) {
 
 	using Flag = MTPmessages_RequestAppWebView::Flag;
 	const auto app = _app;
+	const auto title = app->title;
 	const auto flags = Flag::f_theme_params
+		| (_context.fullscreen ? Flag::f_fullscreen : Flag(0))
 		| (_appStartParam.isEmpty() ? Flag(0) : Flag::f_start_param)
 		| (allowWrite ? Flag::f_write_allowed : Flag(0));
 	_requestId = _session->api().request(MTPmessages_RequestAppWebView(
 		MTP_flags(flags),
-		_context.action->history->peer->input,
+		_context.action->history->peer->input(),
 		MTP_inputBotAppID(MTP_long(app->id), MTP_long(app->accessHash)),
 		MTP_string(_appStartParam),
 		MTP_dataJSON(MTP_bytes(botThemeParams().json)),
 		MTP_string("tdesktop")
 	)).done([=](const MTPWebViewResult &result) {
 		_requestId = 0;
-		show(qs(result.data().vurl()));
+		show({
+			.result = ParseWebViewResult(result),
+			.title = title,
+		});
 	}).fail([=](const MTP::Error &error) {
 		_requestId = 0;
 		if (error.type() == u"BOT_INVALID"_q) {
@@ -1092,18 +1397,23 @@ void WebViewInstance::maybeChooseAndRequestButton(PeerTypes supported) {
 	close();
 }
 
-void WebViewInstance::show(const QString &url, uint64 queryId) {
-	auto title = Info::Profile::NameValue(_bot);
-	auto titleBadge = _bot->isVerified()
-		? object_ptr<Ui::RpWidget>(_parentShow->toastParent())
-		: nullptr;
-	if (titleBadge) {
-		const auto raw = titleBadge.data();
-		raw->paintRequest() | rpl::start_with_next([=] {
-			auto p = Painter(raw);
-			st::infoVerifiedCheck.paint(p, st::lineWidth, 0, raw->width());
-		}, raw->lifetime());
-		raw->resize(st::infoVerifiedCheck.size() + QSize(0, st::lineWidth));
+void WebViewInstance::show(ShowArgs &&args) {
+	if (!_bot->isFullLoaded()) {
+		_botFullWaitingArgs.emplace(std::move(args));
+		return;
+	}
+	auto title = args.title.isEmpty()
+		? Info::Profile::NameValue(_bot)
+		: rpl::single(args.title);
+	auto titleBadge = Ui::TitleBadgeDescriptor();
+	if (_bot->isVerified()) {
+		titleBadge.size = st::infoVerifiedStar.size()
+			+ QSize(0, st::lineWidth);
+		titleBadge.paint = [](QPainter &p, QSize size) {
+			const auto w = size.width();
+			st::infoVerifiedStar.paint(p, st::lineWidth, 0, w);
+			st::infoPeerBadge.verifiedCheck.paint(p, st::lineWidth, 0, w);
+		};
 	}
 
 	const auto &bots = _session->attachWebView().attachBots();
@@ -1114,7 +1424,7 @@ void WebViewInstance::show(const QString &url, uint64 queryId) {
 		not_null{ _bot },
 		&AttachWebViewBot::user);
 	const auto hasOpenBot = v::is<WebViewSourceMainMenu>(_source)
-		|| (_context.action->history->peer != _bot);
+		|| (_context.action && _context.action->history->peer != _bot);
 	const auto hasRemoveFromMenu = (attached != end(bots))
 		&& (!attached->inactive || attached->inMainMenu)
 		&& (v::is<WebViewSourceMainMenu>(_source)
@@ -1126,22 +1436,26 @@ void WebViewInstance::show(const QString &url, uint64 queryId) {
 			: attached->inMainMenu
 			? Button::RemoveFromMainMenu
 			: Button::RemoveFromMenu);
-	const auto allowClipboardRead = v::is<WebViewSourceAttachMenu>(_source)
+	const auto allowClipboardRead = v::is<WebViewSourceMainMenu>(_source)
 		|| v::is<WebViewSourceAttachMenu>(_source)
 		|| (attached != end(bots)
 			&& (attached->inAttachMenu || attached->inMainMenu));
-	_panelUrl = url;
+	const auto downloads = &_session->attachWebView().downloads();
+	_panelUrl = args.result.url;
 	_panel = Ui::BotWebView::Show({
-		.url = url,
+		.url = args.result.url,
 		.storageId = _session->local().resolveStorageIdBots(),
 		.title = std::move(title),
 		.titleBadge = std::move(titleBadge),
 		.bottom = rpl::single('@' + _bot->username()),
 		.delegate = static_cast<Ui::BotWebView::Delegate*>(this),
 		.menuButtons = buttons,
+		.fullscreen = args.result.fullscreen,
+		.sameOrigin = args.result.sameOrigin,
 		.allowClipboardRead = allowClipboardRead,
+		.downloadsProgress = downloads->progress(_bot),
 	});
-	started(queryId);
+	started(args.result.queryId);
 
 	if (const auto strong = PendingActivation.get()) {
 		if (strong == this) {
@@ -1154,6 +1468,10 @@ void WebViewInstance::show(const QString &url, uint64 queryId) {
 void WebViewInstance::showGame() {
 	Expects(v::is<WebViewSourceGame>(_source));
 
+	if (!_bot->isFullLoaded()) {
+		_botFullWaitingArgs = ShowArgs{};
+		return;
+	}
 	const auto game = v::get<WebViewSourceGame>(_source);
 	_panelUrl = QString::fromUtf8(_button.url);
 	_panel = Ui::BotWebView::Show({
@@ -1171,6 +1489,18 @@ void WebViewInstance::close() {
 }
 
 void WebViewInstance::started(uint64 queryId) {
+	if (v::is<WebViewSourceJoinChat>(_source)) {
+		if (!queryId) {
+			return;
+		}
+		_session->attachWebView().watchJoinChatWebView(
+			queryId,
+			_parentShow,
+			_context.controller,
+			this);
+		return;
+	}
+
 	Expects(_context.action.has_value());
 
 	if (!queryId) {
@@ -1180,14 +1510,14 @@ void WebViewInstance::started(uint64 queryId) {
 	_session->data().webViewResultSent(
 	) | rpl::filter([=](const Data::Session::WebViewResultSent &sent) {
 		return (sent.queryId == queryId);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		close();
 	}, _panel->lifetime());
 
 	const auto action = *_context.action;
 	base::timer_each(
 		kProlongTimeout
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		using Flag = MTPmessages_ProlongWebView::Flag;
 		_session->api().request(base::take(_prolongId)).cancel();
 		_prolongId = _session->api().request(MTPmessages_ProlongWebView(
@@ -1195,12 +1525,12 @@ void WebViewInstance::started(uint64 queryId) {
 				| (action.replyTo ? Flag::f_reply_to : Flag(0))
 				| (action.options.sendAs ? Flag::f_send_as : Flag(0))
 				| (action.options.silent ? Flag::f_silent : Flag(0))),
-			action.history->peer->input,
-			_bot->inputUser,
+			action.history->peer->input(),
+			_bot->inputUser(),
 			MTP_long(queryId),
 			action.mtpReplyTo(),
 			(action.options.sendAs
-				? action.options.sendAs->input
+				? action.options.sendAs->input()
 				: MTP_inputPeerEmpty())
 		)).done([=] {
 			_prolongId = 0;
@@ -1209,15 +1539,47 @@ void WebViewInstance::started(uint64 queryId) {
 }
 
 Webview::ThemeParams WebViewInstance::botThemeParams() {
-	return Window::Theme::WebViewParams();
+	auto result = Window::Theme::WebViewParams();
+	if (const auto info = _bot->botInfo.get()) {
+		const auto night = Window::Theme::IsNightMode();
+		const auto &title = night
+			? info->botAppColorTitleNight
+			: info->botAppColorTitleDay;
+		const auto &body = night
+			? info->botAppColorBodyNight
+			: info->botAppColorBodyDay;
+		if (title.alpha() == 255) {
+			result.titleBg = title;
+		}
+		if (body.alpha() == 255) {
+			result.bodyBg = body;
+		}
+	}
+	return result;
+}
+
+Ui::Text::MarkedContext WebViewInstance::botTextContext() {
+	return Core::TextContext({ .session = _session });
+}
+
+auto WebViewInstance::botDownloads(bool forceCheck)
+-> const std::vector<Ui::BotWebView::DownloadsEntry> & {
+	return _session->attachWebView().downloads().list(_bot, forceCheck);
+}
+
+void WebViewInstance::botDownloadsAction(
+		uint32 id,
+		Ui::BotWebView::DownloadsAction type) {
+	_session->attachWebView().downloads().action(_bot, id, type);
 }
 
 bool WebViewInstance::botHandleLocalUri(QString uri, bool keepOpen) {
 	const auto local = Core::TryConvertUrlToLocal(uri);
-	if (Core::InternalPassportLink(local)) {
+	if (Core::InternalPassportOrOAuthLink(local)) {
 		return true;
 	} else if (!local.startsWith(u"tg://"_q, Qt::CaseInsensitive)
-		&& !local.startsWith(u"tonsite://"_q, Qt::CaseInsensitive)) {
+		&& !local.startsWith(u"tonsite://"_q, Qt::CaseInsensitive)
+		&& !local.startsWith(u"ton://"_q, Qt::CaseInsensitive)) {
 		return false;
 	}
 	const auto bot = _bot;
@@ -1261,7 +1623,7 @@ void WebViewInstance::botHandleInvoice(QString slug) {
 		}
 	};
 	Payments::CheckoutProcess::Start(
-		&_bot->session(),
+		_session,
 		slug,
 		reactivate,
 		nonPanelPaymentFormFactory(reactivate));
@@ -1341,8 +1703,8 @@ void WebViewInstance::botHandleMenuButton(
 				: tr::lng_bot_remove_from_menu_sure)(
 					tr::now,
 					lt_bot,
-					Ui::Text::Bold(name),
-					Ui::Text::WithEntities),
+					tr::bold(name),
+					tr::marked),
 			done,
 		}));
 	} break;
@@ -1395,7 +1757,7 @@ void WebViewInstance::botSendData(QByteArray data) {
 	}
 	_dataSent = true;
 	_session->api().request(MTPmessages_SendWebViewData(
-		_bot->inputUser,
+		_bot->inputUser(),
 		MTP_long(base::RandomValue<uint64>()),
 		MTP_string(_button.text),
 		MTP_bytes(data)
@@ -1438,7 +1800,7 @@ void WebViewInstance::botSwitchInlineQuery(
 
 void WebViewInstance::botCheckWriteAccess(Fn<void(bool allowed)> callback) {
 	_session->api().request(MTPbots_CanSendMessage(
-		_bot->inputUser
+		_bot->inputUser()
 	)).done([=](const MTPBool &result) {
 		callback(mtpIsTrue(result));
 	}).fail([=] {
@@ -1448,7 +1810,7 @@ void WebViewInstance::botCheckWriteAccess(Fn<void(bool allowed)> callback) {
 
 void WebViewInstance::botAllowWriteAccess(Fn<void(bool allowed)> callback) {
 	_session->api().request(MTPbots_AllowSendMessage(
-		_bot->inputUser
+		_bot->inputUser()
 	)).done([session = _session, callback](const MTPUpdates &result) {
 		session->api().applyUpdates(result);
 		callback(true);
@@ -1457,6 +1819,47 @@ void WebViewInstance::botAllowWriteAccess(Fn<void(bool allowed)> callback) {
 	}).send();
 }
 
+bool WebViewInstance::botStorageWrite(
+		QString key,
+		std::optional<QString> value) {
+	return _session->attachWebView().storage().write(_bot->id, key, value);
+}
+
+std::optional<QString> WebViewInstance::botStorageRead(QString key) {
+	return _session->attachWebView().storage().read(_bot->id, key);
+}
+
+void WebViewInstance::botStorageClear() {
+	_session->attachWebView().storage().clear(_bot->id);
+}
+
+void WebViewInstance::botRequestEmojiStatusAccess(
+		Fn<void(bool allowed)> callback) {
+	if (_bot->botInfo->canManageEmojiStatus) {
+		callback(true);
+	} else if (const auto panel = _panel.get()) {
+		const auto bot = _bot;
+		panel->showBox(Box(ConfirmEmojiStatusAccessBox, bot, [=](bool ok) {
+			if (!ok) {
+				callback(false);
+				return;
+			}
+			const auto session = &bot->session();
+			bot->botInfo->canManageEmojiStatus = true;
+			session->api().request(MTPbots_ToggleUserEmojiStatusPermission(
+				bot->inputUser(),
+				MTP_bool(true)
+			)).done([=] {
+				callback(true);
+			}).fail([=] {
+				callback(false);
+			}).send();
+		}));
+	} else {
+		callback(false);
+	}
+}
+
 void WebViewInstance::botSharePhone(Fn<void(bool shared)> callback) {
 	const auto history = _bot->owner().history(_bot);
 	if (_bot->isBlocked()) {
@@ -1482,7 +1885,7 @@ void WebViewInstance::botInvokeCustomMethod(
 		Ui::BotWebView::CustomMethodRequest request) {
 	const auto callback = request.callback;
 	_session->api().request(MTPbots_InvokeWebViewCustomMethod(
-		_bot->inputUser,
+		_bot->inputUser(),
 		MTP_string(request.method),
 		MTP_dataJSON(MTP_bytes(request.params))
 	)).done([=](const MTPDataJSON &result) {
@@ -1492,6 +1895,379 @@ void WebViewInstance::botInvokeCustomMethod(
 	}).send();
 }
 
+void WebViewInstance::botSendPreparedMessage(
+		Ui::BotWebView::SendPreparedMessageRequest request) {
+	const auto bot = _bot;
+	const auto id = request.id;
+	const auto panel = _panel.get();
+	const auto weak = base::make_weak(panel);
+	const auto callback = request.callback;
+	if (!panel) {
+		callback(u"UNKNOWN_ERROR"_q);
+		return;
+	}
+	_session->api().request(MTPmessages_GetPreparedInlineMessage(
+		bot->inputUser(),
+		MTP_string(request.id)
+	)).done([=](const MTPmessages_PreparedInlineMessage &result) {
+		const auto panel = weak.get();
+		const auto &data = result.data();
+		bot->owner().processUsers(data.vusers());
+		const auto parsed = std::shared_ptr<Result>(Result::Create(
+			&bot->session(),
+			data.vquery_id().v,
+			data.vresult()));
+		if (!parsed || !panel) {
+			callback(u"UNKNOWN_ERROR"_q);
+			return;
+		}
+		const auto types = PeerTypesFromMTP(data.vpeer_types());
+		const auto history = bot->owner().history(bot->session().user());
+		const auto item = parsed->makeMessage(history, {
+			.id = bot->owner().nextNonHistoryEntryId(),
+			.flags = MessageFlag::FakeHistoryItem,
+			.from = bot->session().userPeerId(),
+			.date = base::unixtime::now(),
+			.viaBotId = peerToUser(bot->id),
+		});
+		struct State {
+			base::weak_qptr<Ui::BoxContent> preview;
+			base::weak_qptr<Ui::BoxContent> choose;
+			rpl::event_stream<not_null<Data::Thread*>> recipient;
+			Fn<void(Api::SendOptions)> send;
+			SendPaymentHelper sendPayment;
+			bool sent = false;
+		};
+		const auto state = std::make_shared<State>();
+		auto recipient = state->recipient.events();
+		const auto send = [=](
+				std::vector<not_null<Data::Thread*>> list,
+				Api::SendOptions options) {
+			if (state->sent) {
+				return;
+			}
+			state->sent = true;
+			const auto failed = std::make_shared<int>();
+			const auto count = int(list.size());
+			const auto weak1 = state->preview;
+			const auto weak2 = state->choose;
+			const auto close = [=] {
+				if (const auto strong = weak1.get()) {
+					strong->closeBox();
+				}
+				if (const auto strong = weak2.get()) {
+					strong->closeBox();
+				}
+			};
+			const auto done = [=](bool success) {
+				if (*failed < 0) {
+					return;
+				}
+				if (success) {
+					*failed = -1;
+					if (const auto strong2 = weak2.get()) {
+						strong2->showToast({ tr::lng_share_done(tr::now) });
+					} else if (const auto strong1 = weak1.get()) {
+						strong1->showToast({ tr::lng_share_done(tr::now) });
+					}
+					base::call_delayed(Ui::Toast::kDefaultDuration, close);
+					callback(QString());
+				} else if (++*failed == count) {
+					close();
+					callback(u"MESSAGE_SEND_FAILED"_q);
+				}
+			};
+			for (const auto &thread : list) {
+				bot->session().api().sendInlineResult(
+					bot,
+					parsed.get(),
+					Api::SendAction(thread, options),
+					std::nullopt,
+					done);
+			}
+		};
+		auto box = Box(PreparedPreviewBox, item, std::move(recipient), [=] {
+			if (state->sent) {
+				return;
+			}
+			const auto chosen = [=](not_null<Data::Thread*> thread) {
+				if (!Data::CanSend(thread, ChatRestriction::SendInline)) {
+					panel->showToast({
+						tr::lng_restricted_send_inline_all(tr::now),
+					});
+					return false;
+				}
+				state->recipient.fire_copy(thread);
+				return true;
+			};
+			auto box = Window::PrepareChooseRecipientBox(
+				&bot->session(),
+				chosen,
+				tr::lng_inline_switch_choose(),
+				nullptr,
+				types,
+				send);
+			state->choose = box.data();
+			panel->showBox(std::move(box));
+		}, [=](not_null<Data::Thread*> thread) {
+			const auto weak = base::make_weak(thread);
+			state->send = [=](Api::SendOptions options) {
+				const auto strong = weak.get();
+				if (!strong) {
+					state->send = nullptr;
+					return;
+				}
+				const auto withPaymentApproved = [=](int stars) {
+					if (const auto onstack = state->send) {
+						auto copy = options;
+						copy.starsApproved = stars;
+						onstack(copy);
+					}
+				};
+				const auto checked = state->sendPayment.check(
+					uiShow(),
+					strong->peer(),
+					options,
+					1,
+					withPaymentApproved);
+				if (!checked) {
+					return;
+				}
+				[[maybe_unused]] const auto ongoing = base::take(state->send);
+				send({ strong }, options);
+			};
+			state->send({});
+		});
+		box->boxClosing() | rpl::on_next([=] {
+			if (!state->sent) {
+				callback("USER_DECLINED");
+			}
+		}, box->lifetime());
+		state->preview = box.data();
+		panel->showBox(std::move(box));
+	}).fail([=] {
+		callback(u"MESSAGE_EXPIRED"_q);
+	}).send();
+}
+
+void WebViewInstance::botRequestChat(
+		Ui::BotWebView::RequestChatRequest request) {
+	const auto bot = _bot;
+	const auto callback = request.callback;
+	const auto requestId = request.requestId;
+	if (!_panel) {
+		callback(u"UNKNOWN_ERROR"_q);
+		return;
+	}
+	const auto show = uiShow();
+	bot->session().api().request(MTPbots_GetRequestedWebViewButton(
+		bot->inputUser(),
+		MTP_string(requestId)
+	)).done([show, bot, callback, requestId](
+			const MTPKeyboardButton &result) {
+		result.match([&](const MTPDkeyboardButtonRequestPeer &data) {
+			if (!*show) {
+				callback(u"UNKNOWN_ERROR"_q);
+				return;
+			}
+			const auto buttonId = data.vbutton_id();
+			const auto sendPeers = [=](
+					std::vector<not_null<PeerData*>> peers) {
+				using Flag = MTPmessages_SendBotRequestedPeer::Flag;
+				bot->session().api().request(
+					MTPmessages_SendBotRequestedPeer(
+						MTP_flags(Flag::f_webapp_req_id),
+						bot->input(),
+						MTPint(),
+						MTP_string(requestId),
+						buttonId,
+						MTP_vector_from_range(
+							peers | ranges::views::transform([](
+									not_null<PeerData*> peer) {
+								return MTPInputPeer(peer->input());
+							})))
+				).done([=](const MTPUpdates &result) {
+					bot->session().api().applyUpdates(result);
+					callback(QString());
+				}).fail([callback](const MTP::Error &error) {
+					callback(error.type());
+				}).send();
+			};
+			data.vpeer_type().match([&](
+					const MTPDrequestPeerTypeCreateBot &createData) {
+				ShowCreateManagedBotBox({
+					.show = show,
+					.manager = bot,
+					.suggestedName = qs(
+						createData.vsuggested_name().value_or_empty()),
+					.suggestedUsername = qs(
+						createData.vsuggested_username()
+							.value_or_empty()),
+					.done = [=](not_null<UserData*> createdBot) {
+						sendPeers({ createdBot });
+						show->showBox(Ui::MakeInformBox({
+							.text = tr::lng_managed_bot_created_text(
+								tr::now,
+								lt_parent_name,
+								bot->name()),
+							.title = tr::lng_managed_bot_created_title(
+								tr::now,
+								lt_name,
+								createdBot->name()),
+						}));
+					},
+					.cancelled = [=] {
+						callback(u"USER_DECLINED"_q);
+					},
+				});
+			}, [&](const auto &) {
+				const auto query = RequestPeerQueryFromTL(data);
+				ShowChoosePeerBox(show, bot, query, sendPeers, [=] {
+					callback(u"USER_DECLINED"_q);
+				});
+			});
+		}, [&](const auto &) {
+			callback(u"UNSUPPORTED_BUTTON_TYPE"_q);
+		});
+	}).fail([callback](const MTP::Error &error) {
+		callback(error.type());
+	}).send();
+}
+
+void WebViewInstance::botSetEmojiStatus(
+		Ui::BotWebView::SetEmojiStatusRequest request) {
+	const auto bot = _bot;
+	const auto panel = _panel.get();
+	const auto callback = request.callback;
+	const auto duration = request.duration;
+	if (!panel) {
+		callback(u"UNKNOWN_ERROR"_q);
+		return;
+	}
+	_session->data().customEmojiManager().resolve(
+		request.customEmojiId
+	) | rpl::on_next_error([=](not_null<DocumentData*> document) {
+		const auto sticker = document->sticker();
+		if (!sticker || sticker->setType != Data::StickersType::Emoji) {
+			callback(u"SUGGESTED_EMOJI_INVALID"_q);
+			return;
+		}
+		const auto done = [=](bool success) {
+			callback(success ? QString() : u"USER_DECLINED"_q);
+		};
+		panel->showBox(
+			Box(ConfirmEmojiStatusBox, bot, document, duration, done));
+	}, [=] { callback(u"SUGGESTED_EMOJI_INVALID"_q); }, panel->lifetime());
+}
+
+void WebViewInstance::botDownloadFile(
+		Ui::BotWebView::DownloadFileRequest request) {
+	const auto callback = request.callback;
+	if (_confirmingDownload || !_panel) {
+		callback(false);
+		return;
+	}
+	_confirmingDownload = true;
+	const auto done = [=](QString path) {
+		_confirmingDownload = false;
+		if (path.isEmpty()) {
+			callback(false);
+			return;
+		}
+		_session->attachWebView().downloads().start({
+			.bot = _bot,
+			.url = request.url,
+			.path = path,
+		});
+		callback(true);
+	};
+	_session->api().request(MTPbots_CheckDownloadFileParams(
+		_bot->inputUser(),
+		MTP_string(request.name),
+		MTP_string(request.url)
+	)).done([=] {
+		_panel->showBox(Box(DownloadFileBox, DownloadBoxArgs{
+			.session = _session,
+			.bot = _bot->name(),
+			.name = base::FileNameFromUserString(request.name),
+			.url = request.url,
+			.done = done,
+		}));
+	}).fail([=] {
+		done(QString());
+	}).send();
+}
+
+void WebViewInstance::botResolveButtonEmoji(
+		Ui::BotWebView::ResolveButtonEmojiRequest request) {
+	const auto panel = _panel.get();
+	if (!panel || !request.customEmojiId || request.size <= 0) {
+		request.callback(QImage());
+		return;
+	}
+	struct State {
+		Fn<void(QImage)> callback;
+		std::unique_ptr<Ui::Text::CustomEmoji> emoji;
+		QColor textColor;
+		int size = 0;
+		bool sent = false;
+	};
+	const auto state = std::make_shared<State>();
+	state->callback = std::move(request.callback);
+	state->textColor = request.textColor.isValid()
+		? request.textColor
+		: QColor(255, 255, 255);
+	state->size = request.size;
+	const auto weak = base::make_weak(panel);
+	const auto attempt = std::make_shared<Fn<void()>>();
+	const auto weakAttempt = std::weak_ptr<Fn<void()>>(attempt);
+	const auto weakState = std::weak_ptr<State>(state);
+	*attempt = [weak, weakState] {
+		const auto state = weakState.lock();
+		const auto panel = weak.get();
+		if (!state
+			|| state->sent
+			|| !panel
+			|| !state->emoji
+			|| !state->emoji->ready()) {
+			return;
+		}
+		state->sent = true;
+		state->callback(PaintButtonEmojiFrame(
+			*state->emoji,
+			state->textColor,
+			state->size));
+	};
+	const auto fail = [state] {
+		if (state->sent) {
+			return;
+		}
+		state->sent = true;
+		state->callback(QImage());
+	};
+	_session->data().customEmojiManager().resolve(
+		request.customEmojiId
+	) | rpl::on_next_error([=](not_null<DocumentData*> document) {
+		state->emoji = MakeWrappedEmoji<Ui::Text::FirstFrameEmoji>(
+			_session->data().customEmojiManager().create(
+				document,
+				[weakAttempt] {
+					if (const auto attempt = weakAttempt.lock()) {
+						(*attempt)();
+					}
+				},
+				Data::CustomEmojiManager::SizeTag::Normal,
+				state->size));
+		(*attempt)();
+	}, fail, panel->lifetime());
+}
+
+void WebViewInstance::botVerifyAge(int age) {
+	if (v::is<WebViewSourceAgeVerification>(_source)) {
+		v::get<WebViewSourceAgeVerification>(_source).done(age);
+	}
+}
+
 void WebViewInstance::botOpenPrivacyPolicy() {
 	const auto bot = _bot;
 	const auto weak = _context.controller;
@@ -1531,7 +2307,7 @@ void WebViewInstance::botOpenPrivacyPolicy() {
 	};
 	const auto openUrl = [=](const QString &url) {
 		Core::App().iv().openWithIvPreferred(
-			&_bot->session(),
+			_session,
 			url,
 			makeOtherContext(false));
 	};
@@ -1604,8 +2380,46 @@ std::shared_ptr<Main::SessionShow> WebViewInstance::uiShow() {
 
 AttachWebView::AttachWebView(not_null<Main::Session*> session)
 : _session(session)
+, _downloads(std::make_unique<Downloads>(session))
+, _storage(std::make_unique<Storage>(session))
 , _refreshTimer([=] { requestBots(); }) {
 	_refreshTimer.callEach(kRefreshBotsTimeout);
+	_session->data().joinChatWebViewDecision(
+	) | rpl::on_next([=](
+			const Data::Session::JoinChatWebViewDecision &decision) {
+		const auto i = _joinChatWebViews.find(decision.queryId);
+		if (i == end(_joinChatWebViews)) {
+			return;
+		}
+		auto data = std::move(i->second);
+		_joinChatWebViews.erase(i);
+
+		const auto text = JoinChatDecisionToast(
+			_session,
+			decision.peerId,
+			decision.result);
+		const auto approved = (decision.result.type()
+			== mtpc_joinChatBotResultApproved);
+		const auto instance = data.instance.get();
+		if (instance) {
+			close(instance);
+			if (approved) {
+				if (const auto peer = _session->data().peerLoaded(
+						decision.peerId)) {
+					if (const auto window = WindowForThread(
+							data.controller,
+							peer->owner().history(peer))) {
+						window->showPeerHistory(
+							peer,
+							Window::SectionShow::Way::Forward);
+					}
+				}
+			}
+		}
+		if (data.show && !text.isEmpty()) {
+			data.show->showToast(text);
+		}
+	}, _lifetime);
 }
 
 AttachWebView::~AttachWebView() {
@@ -1617,20 +2431,25 @@ void AttachWebView::openByUsername(
 		not_null<Window::SessionController*> controller,
 		const Api::SendAction &action,
 		const QString &botUsername,
-		const QString &startCommand) {
+		const QString &startCommand,
+		bool fullscreen) {
 	if (botUsername.isEmpty()
-		|| (_botUsername == botUsername && _startCommand == startCommand)) {
+		|| (_botUsername == botUsername
+			&& _startCommand == startCommand
+			&& _fullScreenRequested == fullscreen)) {
 		return;
 	}
 	cancel();
 
 	_botUsername = botUsername;
 	_startCommand = startCommand;
+	_fullScreenRequested = fullscreen;
 	const auto weak = base::make_weak(controller);
 	const auto show = controller->uiShow();
 	resolveUsername(show, crl::guard(weak, [=](not_null<PeerData*> peer) {
 		_botUsername = QString();
 		const auto token = base::take(_startCommand);
+		const auto fullscreen = base::take(_fullScreenRequested);
 
 		const auto bot = peer->asUser();
 		if (!bot || !bot->isBot()) {
@@ -1645,6 +2464,7 @@ void AttachWebView::openByUsername(
 			.context = {
 				.controller = controller,
 				.action = action,
+				.fullscreen = fullscreen,
 			},
 			.button = { .startCommand = token },
 			.source = InlineBots::WebViewSourceLinkAttachMenu{},
@@ -1652,6 +2472,18 @@ void AttachWebView::openByUsername(
 	}));
 }
 
+void AttachWebView::watchJoinChatWebView(
+		uint64 queryId,
+		std::shared_ptr<Ui::Show> show,
+		base::weak_ptr<Window::SessionController> controller,
+		base::weak_ptr<WebViewInstance> instance) {
+	_joinChatWebViews[queryId] = {
+		.show = std::move(show),
+		.controller = controller,
+		.instance = instance,
+	};
+}
+
 void AttachWebView::close(not_null<WebViewInstance*> instance) {
 	const auto i = ranges::find(
 		_instances,
@@ -1778,7 +2610,7 @@ void AttachWebView::requestAddToMenu(
 	}
 
 	process.requestId = _session->api().request(
-		MTPmessages_GetAttachMenuBot(bot->inputUser)
+		MTPmessages_GetAttachMenuBot(bot->inputUser())
 	).done([=](const MTPAttachMenuBotsBot &result) {
 		_addToMenu[bot].requestId = 0;
 		const auto &data = result.data();
@@ -1832,7 +2664,9 @@ void AttachWebView::resolveUsername(
 	}
 	_session->api().request(base::take(_requestId)).cancel();
 	_requestId = _session->api().request(MTPcontacts_ResolveUsername(
-		MTP_string(_botUsername)
+		MTP_flags(0),
+		MTP_string(_botUsername),
+		MTP_string()
 	)).done([=](const MTPcontacts_ResolvedPeer &result) {
 		_requestId = 0;
 		result.match([&](const MTPDcontacts_resolvedPeer &data) {
@@ -1939,8 +2773,8 @@ void AttachWebView::confirmAddToMenu(
 				box,
 				tr::lng_bot_will_be_added(
 					lt_bot,
-					rpl::single(Ui::Text::Bold(bot.name)),
-					Ui::Text::WithEntities),
+					rpl::single(tr::bold(bot.name)),
+					tr::marked),
 				st::boxLabel));
 		} else {
 			Ui::ConfirmBox(box, {
@@ -1949,8 +2783,8 @@ void AttachWebView::confirmAddToMenu(
 					: tr::lng_bot_add_to_menu)(
 						tr::now,
 						lt_bot,
-						Ui::Text::Bold(bot.name),
-						Ui::Text::WithEntities),
+						tr::bold(bot.name),
+						tr::marked),
 				done,
 				(callback
 					? [=](Fn<void()> close) { callback(false); close(); }
@@ -1963,8 +2797,8 @@ void AttachWebView::confirmAddToMenu(
 						tr::lng_url_auth_allow_messages(
 							tr::now,
 							lt_bot,
-							Ui::Text::Bold(bot.name),
-							Ui::Text::WithEntities),
+							tr::bold(bot.name),
+							tr::marked),
 						true,
 						st::urlAuthCheckbox),
 					style::margins(
@@ -1989,7 +2823,7 @@ void AttachWebView::toggleInMenu(
 		MTP_flags((state == ToggledState::AllowedToWrite)
 			? Flag::f_write_allowed
 			: Flag()),
-		bot->inputUser,
+		bot->inputUser(),
 		MTP_bool(state != ToggledState::Removed)
 	)).done([=] {
 		_requestId = 0;
@@ -2007,18 +2841,46 @@ void ChooseAndSendLocation(
 		not_null<Window::SessionController*> controller,
 		const Ui::LocationPickerConfig &config,
 		Api::SendAction action) {
+	const auto weak = base::make_weak(controller);
 	const auto session = &controller->session();
 	if (const auto picker = session->locationPickers().lookup(action)) {
 		picker->activate();
 		return;
 	}
-	const auto callback = [=](Data::InputVenue venue) {
+	struct State {
+		SendPaymentHelper sendPayment;
+		Fn<void(Data::InputVenue, Api::SendAction)> send;
+	};
+	const auto state = std::make_shared<State>();
+	state->send = [=](Data::InputVenue venue, Api::SendAction action) {
+		if (const auto strong = weak.get()) {
+			const auto withPaymentApproved = [=](int stars) {
+				if (const auto onstack = state->send) {
+					auto copy = action;
+					copy.options.starsApproved = stars;
+					onstack(venue, copy);
+				}
+			};
+			const auto checked = state->sendPayment.check(
+				strong,
+				action.history->peer,
+				action.options,
+				1,
+				withPaymentApproved);
+			if (!checked) {
+				return;
+			}
+		}
+		state->send = nullptr;
 		if (venue.justLocation()) {
 			Api::SendLocation(action, venue.lat, venue.lon);
 		} else {
 			Api::SendVenue(action, venue);
 		}
 	};
+	const auto callback = [=](Data::InputVenue venue) {
+		state->send(venue, action);
+	};
 	const auto picker = Ui::LocationPicker::Show({
 		.parent = controller->widget(),
 		.config = config,
@@ -2038,10 +2900,8 @@ std::unique_ptr<Ui::DropdownMenu> MakeAttachBotsMenu(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer,
 		Fn<Api::SendAction()> actionFactory,
+		Fn<SendMenu::Details()> sendMenuDetails,
 		Fn<void(bool)> attach) {
-	if (!Data::CanSend(peer, ChatRestriction::SendInline)) {
-		return nullptr;
-	}
 	auto result = std::make_unique<Ui::DropdownMenu>(
 		parent,
 		st::dropdownMenuWithIcons);
@@ -2059,45 +2919,72 @@ std::unique_ptr<Ui::DropdownMenu> MakeAttachBotsMenu(
 		| ChatRestriction::SendStickers
 		| ChatRestriction::SendMusic
 		| ChatRestriction::SendFiles;
-	if (Data::CanSendAnyOf(peer, fileTypes)) {
+	if (Data::CanSendAnyOf(peer, fileTypes, false)) {
 		++minimal;
 		raw->addAction(tr::lng_attach_document(tr::now), [=] {
 			attach(false);
 		}, &st::menuIconFile);
 	}
-	if (peer->canCreatePolls()) {
+	if (peer->canCreatePolls(false)) {
 		++minimal;
-		raw->addAction(tr::lng_polls_create(tr::now), [=] {
+		raw->addAction(tr::lng_polls_menu_item(tr::now), [=] {
 			const auto action = actionFactory();
 			const auto source = action.options.scheduled
 				? Api::SendType::Scheduled
 				: Api::SendType::Normal;
-			const auto sendMenuType = action.replyTo.topicRootId
-				? SendMenu::Type::SilentOnly
-				: SendMenu::Type::Scheduled;
-			const auto flag = PollData::Flags();
-			const auto replyTo = action.replyTo;
+			const auto chosen = kDefaultPollCreateFlags;
 			Window::PeerMenuCreatePoll(
 				controller,
 				peer,
-				replyTo,
-				flag,
-				flag,
+				action.replyTo,
+				action.options.suggest,
+				chosen,
+				PollData::Flags(),
 				source,
-				{ sendMenuType });
+				sendMenuDetails());
 		}, &st::menuIconCreatePoll);
 	}
+	if (peer->canCreateTodoLists(false)) {
+		++minimal;
+		raw->addAction(tr::lng_todo_menu_item(tr::now), [=] {
+			const auto action = actionFactory();
+			const auto source = action.options.scheduled
+				? Api::SendType::Scheduled
+				: Api::SendType::Normal;
+			Window::PeerMenuCreateTodoList(
+				controller,
+				peer,
+				action.replyTo,
+				action.options.suggest,
+				source,
+				sendMenuDetails());
+		}, &st::menuIconCreateTodoList);
+	}
+#ifdef TDESKTOP_IV_EDITOR
+	if (Data::CanSendAnyOf(peer, ChatRestriction::SendOther, false)) {
+		raw->addAction(tr::lng_article_menu_item(tr::now), [=] {
+			Iv::Editor::ShowComposeBox(
+				controller,
+				peer,
+				actionFactory(),
+				sendMenuDetails);
+		}, &st::menuIconArticle);
+	}
+#endif // TDESKTOP_IV_EDITOR
 	const auto session = &controller->session();
 	const auto locationType = ChatRestriction::SendOther;
 	const auto config = ResolveMapsConfig(session);
-	if (Data::CanSendAnyOf(peer, locationType)
+	if (Data::CanSendAnyOf(peer, locationType, false)
 		&& Ui::LocationPicker::Available(config)) {
 		raw->addAction(tr::lng_maps_point(tr::now), [=] {
 			ChooseAndSendLocation(controller, config, actionFactory());
 		}, &st::menuIconAddress);
 	}
+	const auto addBots = Data::CanSend(peer, ChatRestriction::SendInline, false)
+		&& !peer->starsPerMessageChecked();
 	for (const auto &bot : bots->attachBots()) {
-		if (!bot.inAttachMenu
+		if (!addBots
+			|| !bot.inAttachMenu
 			|| !PeerMatchesTypes(peer, bot.user, bot.types)) {
 			continue;
 		}
@@ -2112,13 +2999,13 @@ std::unique_ptr<Ui::DropdownMenu> MakeAttachBotsMenu(
 			});
 		};
 		auto action = base::make_unique_q<BotAction>(
-			raw,
+			raw->menu(),
 			controller->uiShow(),
 			raw->menu()->st(),
 			bot,
 			callback);
 		action->forceShown(
-		) | rpl::start_with_next([=](bool shown) {
+		) | rpl::on_next([=](bool shown) {
 			if (shown) {
 				raw->setAutoHiding(false);
 			} else {
@@ -2128,7 +3015,11 @@ std::unique_ptr<Ui::DropdownMenu> MakeAttachBotsMenu(
 		}, action->lifetime());
 		raw->addAction(std::move(action));
 	}
-	if (raw->actions().size() <= minimal) {
+	const auto actions = raw->actions().size();
+	const auto onclick = ChatHelpers::ShowPanelOnClick();
+	if (!actions) {
+		return nullptr;
+	} else if (actions <= minimal && !onclick) {
 		return nullptr;
 	}
 	return result;
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
index 4958ba19de15d3..6b922469a34c34 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
@@ -7,11 +7,12 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "api/api_common.h"
 #include "base/flags.h"
 #include "base/timer.h"
 #include "base/weak_ptr.h"
 #include "dialogs/dialogs_key.h"
-#include "api/api_common.h"
+#include "menu/menu_send_details.h"
 #include "mtproto/sender.h"
 #include "ui/chat/attach/attach_bot_webview.h"
 #include "ui/rp_widget.h"
@@ -28,6 +29,7 @@ class DropdownMenu;
 
 namespace Ui::BotWebView {
 class Panel;
+struct DownloadsEntry;
 } // namespace Ui::BotWebView
 
 namespace Main {
@@ -51,6 +53,8 @@ enum class CheckoutResult;
 namespace InlineBots {
 
 class WebViewInstance;
+class Downloads;
+class Storage;
 
 enum class PeerType : uint8 {
 	SameBot   = 0x01,
@@ -160,6 +164,39 @@ struct WebViewSourceBotProfile {
 		WebViewSourceBotProfile) = default;
 };
 
+struct WebViewSourceAgeVerification {
+	Fn<void(int)> done;
+
+	friend inline bool operator==(
+			WebViewSourceAgeVerification,
+			WebViewSourceAgeVerification) {
+		return true;
+	}
+};
+
+struct WebViewResultData {
+	QString url;
+	uint64 queryId = 0;
+	bool fullscreen = false;
+	bool fullsize = false;
+	bool sameOrigin = false;
+
+	friend inline bool operator==(
+		const WebViewResultData &,
+		const WebViewResultData &) = default;
+};
+
+[[nodiscard]] WebViewResultData ParseWebViewResult(
+	const MTPWebViewResult &result);
+
+struct WebViewSourceJoinChat {
+	WebViewResultData result;
+
+	friend inline bool operator==(
+		const WebViewSourceJoinChat &,
+		const WebViewSourceJoinChat &) = default;
+};
+
 struct WebViewSource : std::variant<
 	WebViewSourceButton,
 	WebViewSourceSwitch,
@@ -170,7 +207,9 @@ struct WebViewSource : std::variant<
 	WebViewSourceAttachMenu,
 	WebViewSourceBotMenu,
 	WebViewSourceGame,
-	WebViewSourceBotProfile> {
+	WebViewSourceBotProfile,
+	WebViewSourceAgeVerification,
+	WebViewSourceJoinChat> {
 	using variant::variant;
 };
 
@@ -187,6 +226,7 @@ struct WebViewContext {
 	base::weak_ptr<Window::SessionController> controller;
 	Dialogs::EntryState dialogsEntryState;
 	std::optional<Api::SendAction> action;
+	bool fullscreen = false;
 	bool maySkipConfirmation = false;
 };
 
@@ -216,6 +256,7 @@ class WebViewInstance final
 
 private:
 	void resolve();
+	void requestFullBot();
 
 	bool openAppFromBotMenuLink();
 
@@ -227,14 +268,26 @@ class WebViewInstance final
 	void requestWithMenuAdd();
 	void maybeChooseAndRequestButton(PeerTypes supported);
 
+	enum class ConfirmType : uchar {
+		Always,
+		Once,
+		None,
+	};
 	void resolveApp(
 		const QString &appname,
 		const QString &startparam,
+		ConfirmType confirmType);
+	void confirmOpen(Fn<void()> done, bool forceConfirmation = false);
+	void confirmAppOpen(
+		bool writeAccess,
+		Fn<void(bool allowWrite)> done,
 		bool forceConfirmation);
-	void confirmOpen(Fn<void()> done);
-	void confirmAppOpen(bool writeAccess, Fn<void(bool allowWrite)> done);
 
-	void show(const QString &url, uint64 queryId = 0);
+	struct ShowArgs {
+		WebViewResultData result;
+		QString title;
+	};
+	void show(ShowArgs &&args);
 	void showGame();
 	void started(uint64 queryId);
 
@@ -243,6 +296,12 @@ class WebViewInstance final
 	-> Fn<void(Payments::NonPanelPaymentForm)>;
 
 	Webview::ThemeParams botThemeParams() override;
+	Ui::Text::MarkedContext botTextContext() override;
+	auto botDownloads(bool forceCheck = false)
+		-> const std::vector<Ui::BotWebView::DownloadsEntry> & override;
+	void botDownloadsAction(
+		uint32 id,
+		Ui::BotWebView::DownloadsAction type) override;
 	bool botHandleLocalUri(QString uri, bool keepOpen) override;
 	void botHandleInvoice(QString slug) override;
 	void botHandleMenuButton(Ui::BotWebView::MenuButton button) override;
@@ -254,9 +313,25 @@ class WebViewInstance final
 		QString query) override;
 	void botCheckWriteAccess(Fn<void(bool allowed)> callback) override;
 	void botAllowWriteAccess(Fn<void(bool allowed)> callback) override;
+	bool botStorageWrite(QString key, std::optional<QString> value) override;
+	std::optional<QString> botStorageRead(QString key) override;
+	void botStorageClear() override;
+	void botRequestEmojiStatusAccess(
+		Fn<void(bool allowed)> callback) override;
 	void botSharePhone(Fn<void(bool shared)> callback) override;
 	void botInvokeCustomMethod(
 		Ui::BotWebView::CustomMethodRequest request) override;
+	void botSendPreparedMessage(
+		Ui::BotWebView::SendPreparedMessageRequest request) override;
+	void botRequestChat(
+		Ui::BotWebView::RequestChatRequest request) override;
+	void botSetEmojiStatus(
+		Ui::BotWebView::SetEmojiStatusRequest request) override;
+	void botDownloadFile(
+		Ui::BotWebView::DownloadFileRequest request) override;
+	void botResolveButtonEmoji(
+		Ui::BotWebView::ResolveButtonEmojiRequest request) override;
+	void botVerifyAge(int age) override;
 	void botOpenPrivacyPolicy() override;
 	void botClose() override;
 
@@ -267,9 +342,12 @@ class WebViewInstance final
 	const WebViewButton _button;
 	const WebViewSource _source;
 
+	std::optional<ShowArgs> _botFullWaitingArgs;
+
 	BotAppData *_app = nullptr;
 	QString _appStartParam;
 	bool _dataSent = false;
+	bool _confirmingDownload = false;
 
 	mtpRequestId _requestId = 0;
 	mtpRequestId _prolongId = 0;
@@ -277,6 +355,8 @@ class WebViewInstance final
 	QString _panelUrl;
 	std::unique_ptr<Ui::BotWebView::Panel> _panel;
 
+	rpl::lifetime _lifetime;
+
 	static base::weak_ptr<WebViewInstance> PendingActivation;
 
 };
@@ -286,12 +366,25 @@ class AttachWebView final : public base::has_weak_ptr {
 	explicit AttachWebView(not_null<Main::Session*> session);
 	~AttachWebView();
 
+	[[nodiscard]] Downloads &downloads() const {
+		return *_downloads;
+	}
+	[[nodiscard]] Storage &storage() const {
+		return *_storage;
+	}
+
 	void open(WebViewDescriptor &&descriptor);
 	void openByUsername(
 		not_null<Window::SessionController*> controller,
 		const Api::SendAction &action,
 		const QString &botUsername,
-		const QString &startCommand);
+		const QString &startCommand,
+		bool fullscreen);
+	void watchJoinChatWebView(
+		uint64 queryId,
+		std::shared_ptr<Ui::Show> show,
+		base::weak_ptr<Window::SessionController> controller,
+		base::weak_ptr<WebViewInstance> instance);
 
 	void cancel();
 
@@ -355,11 +448,14 @@ class AttachWebView final : public base::has_weak_ptr {
 		Fn<void(bool added)> callback = nullptr);
 
 	const not_null<Main::Session*> _session;
+	const std::unique_ptr<Downloads> _downloads;
+	const std::unique_ptr<Storage> _storage;
 
 	base::Timer _refreshTimer;
 
 	QString _botUsername;
 	QString _startCommand;
+	bool _fullScreenRequested = false;
 
 	mtpRequestId _requestId = 0;
 
@@ -377,11 +473,18 @@ class AttachWebView final : public base::has_weak_ptr {
 	rpl::event_stream<> _attachBotsUpdates;
 	base::flat_set<not_null<UserData*>> _disclaimerAccepted;
 
+	struct JoinChatWebView {
+		std::shared_ptr<Ui::Show> show;
+		base::weak_ptr<Window::SessionController> controller;
+		base::weak_ptr<WebViewInstance> instance;
+	};
+	base::flat_map<uint64, JoinChatWebView> _joinChatWebViews;
 	std::vector<std::unique_ptr<WebViewInstance>> _instances;
 
 	std::vector<not_null<UserData*>> _popularAppBots;
 	mtpRequestId _popularAppBotsRequestId = 0;
 	rpl::variable<bool> _popularAppBotsLoaded = false;
+	rpl::lifetime _lifetime;
 
 };
 
@@ -390,6 +493,7 @@ class AttachWebView final : public base::has_weak_ptr {
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer,
 	Fn<Api::SendAction()> actionFactory,
+	Fn<SendMenu::Details()> sendMenuDetails,
 	Fn<void(bool)> attach);
 
 class MenuBotIcon final : public Ui::RpWidget {
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp
new file mode 100644
index 00000000000000..8fe81931976153
--- /dev/null
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.cpp
@@ -0,0 +1,241 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "inline_bots/inline_bot_confirm_prepared.h"
+
+#include "boxes/peers/edit_peer_invite_link.h"
+#include "data/data_forum_topic.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "history/admin_log/history_admin_log_item.h"
+#include "history/view/history_view_element.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/chat/chat_style.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/effects/path_shift_gradient.h"
+#include "ui/layers/generic_box.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/painter.h"
+#include "ui/vertical_list.h"
+#include "window/themes/window_theme.h"
+#include "window/section_widget.h"
+#include "styles/style_chat.h"
+#include "styles/style_layers.h"
+
+namespace InlineBots {
+namespace {
+
+using namespace HistoryView;
+
+class PreviewDelegate final : public DefaultElementDelegate {
+public:
+	PreviewDelegate(
+		not_null<QWidget*> parent,
+		not_null<Ui::ChatStyle*> st,
+		Fn<void()> update);
+
+	bool elementAnimationsPaused() override;
+	not_null<Ui::PathShiftGradient*> elementPathShiftGradient() override;
+	Context elementContext() override;
+
+private:
+	const not_null<QWidget*> _parent;
+	const std::unique_ptr<Ui::PathShiftGradient> _pathGradient;
+
+};
+
+class PreviewWrap final : public Ui::RpWidget {
+public:
+	PreviewWrap(not_null<QWidget*> parent, not_null<HistoryItem*> item);
+	~PreviewWrap();
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	void resizeTo(int width);
+	void prepare(not_null<HistoryItem*> item);
+
+	const not_null<History*> _history;
+	const std::unique_ptr<Ui::ChatTheme> _theme;
+	const std::unique_ptr<Ui::ChatStyle> _style;
+	const std::unique_ptr<PreviewDelegate> _delegate;
+	AdminLog::OwnedItem _item;
+	QPoint _position;
+
+};
+
+PreviewDelegate::PreviewDelegate(
+	not_null<QWidget*> parent,
+	not_null<Ui::ChatStyle*> st,
+	Fn<void()> update)
+: _parent(parent)
+, _pathGradient(MakePathShiftGradient(st, update)) {
+}
+
+bool PreviewDelegate::elementAnimationsPaused() {
+	return _parent->window()->isActiveWindow();
+}
+
+auto PreviewDelegate::elementPathShiftGradient()
+-> not_null<Ui::PathShiftGradient*> {
+	return _pathGradient.get();
+}
+
+Context PreviewDelegate::elementContext() {
+	return Context::History;
+}
+
+PreviewWrap::PreviewWrap(
+	not_null<QWidget*> parent,
+	not_null<HistoryItem*> item)
+: RpWidget(parent)
+, _history(item->history())
+, _theme(Window::Theme::DefaultChatThemeOn(lifetime()))
+, _style(std::make_unique<Ui::ChatStyle>(
+	_history->session().colorIndicesValue()))
+, _delegate(std::make_unique<PreviewDelegate>(
+	parent,
+	_style.get(),
+	[=] { update(); }))
+, _position(0, st::msgMargin.bottom()) {
+	_style->apply(_theme.get());
+
+	using namespace HistoryView;
+	_history->owner().viewRepaintRequest(
+	) | rpl::on_next([=](Data::RequestViewRepaint data) {
+		if (data.view == _item.get()) {
+			update();
+		}
+	}, lifetime());
+
+	_history->session().downloaderTaskFinished() | rpl::on_next([=] {
+		update();
+	}, lifetime());
+
+	prepare(item);
+}
+
+PreviewWrap::~PreviewWrap() {
+	_item = {};
+}
+
+void PreviewWrap::prepare(not_null<HistoryItem*> item) {
+	_item = AdminLog::OwnedItem(_delegate.get(), item);
+	if (width() >= st::msgMinWidth) {
+		resizeTo(width());
+	}
+
+	widthValue(
+	) | rpl::filter([=](int width) {
+		return width >= st::msgMinWidth;
+	}) | rpl::on_next([=](int width) {
+		resizeTo(width);
+	}, lifetime());
+}
+
+void PreviewWrap::resizeTo(int width) {
+	const auto height = _position.y()
+		+ _item->resizeGetHeight(width)
+		+ _position.y()
+		+ st::msgServiceMargin.top()
+		+ st::msgServiceGiftBoxTopSkip
+		- st::msgServiceMargin.bottom();
+	resize(width, height);
+}
+
+void PreviewWrap::paintEvent(QPaintEvent *e) {
+	auto p = Painter(this);
+
+	const auto clip = e->rect();
+	if (!clip.isEmpty()) {
+		p.setClipRect(clip);
+		Window::SectionWidget::PaintBackground(
+			p,
+			_theme.get(),
+			QSize(width(), window()->height()),
+			clip);
+	}
+
+	auto context = _theme->preparePaintContext(
+		_style.get(),
+		rect(),
+		rect(),
+		e->rect(),
+		!window()->isActiveWindow());
+	p.translate(_position);
+	_item->draw(p, context);
+}
+
+} // namespace
+
+void PreparedPreviewBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<HistoryItem*> item,
+		rpl::producer<not_null<Data::Thread*>> recipient,
+		Fn<void()> choose,
+		Fn<void(not_null<Data::Thread*>)> send) {
+	box->setTitle(tr::lng_bot_share_prepared_title());
+	const auto container = box->verticalLayout();
+	container->add(object_ptr<PreviewWrap>(container, item));
+	const auto bot = item->viaBot();
+	const auto name = bot ? bot->name() : u"Bot"_q;
+	const auto info = container->add(
+		object_ptr<Ui::SlideWrap<Ui::DividerLabel>>(
+			container,
+			object_ptr<Ui::DividerLabel>(
+				container,
+				object_ptr<Ui::FlatLabel>(
+					container,
+					tr::lng_bot_share_prepared_about(lt_bot, rpl::single(name)),
+					st::boxDividerLabel),
+				st::defaultBoxDividerLabelPadding)));
+	const auto row = container->add(object_ptr<Ui::VerticalLayout>(
+		container));
+
+	const auto reset = [=] {
+		info->show(anim::type::instant);
+		while (row->count()) {
+			delete row->widgetAt(0);
+		}
+		box->addButton(tr::lng_bot_share_prepared_button(), choose);
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	};
+	reset();
+
+	const auto lifetime = box->lifetime().make_state<rpl::lifetime>();
+	std::move(
+		recipient
+	) | rpl::on_next([=](not_null<Data::Thread*> thread) {
+		info->hide(anim::type::instant);
+		while (row->count()) {
+			delete row->widgetAt(0);
+		}
+		AddSkip(row);
+		AddSinglePeerRow(row, thread, nullptr, choose);
+		if (const auto topic = thread->asTopic()) {
+			*lifetime = topic->destroyed() | rpl::on_next(reset);
+		} else {
+			*lifetime = rpl::lifetime();
+		}
+		row->resizeToWidth(container->width());
+		box->clearButtons();
+		box->addButton(tr::lng_send_button(), [=] { send(thread); });
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	}, info->lifetime());
+
+	item->history()->owner().itemRemoved(
+	) | rpl::on_next([=](not_null<const HistoryItem*> removed) {
+		if (removed == item) {
+			box->closeBox();
+		}
+	}, box->lifetime());
+}
+
+} // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h
new file mode 100644
index 00000000000000..c2169a7cc4bd47
--- /dev/null
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_confirm_prepared.h
@@ -0,0 +1,31 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+class Thread;
+} // namespace Data
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+namespace InlineBots {
+
+void PreparedPreviewBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<HistoryItem*> item,
+	rpl::producer<not_null<Data::Thread*>> recipient,
+	Fn<void()> choose,
+	Fn<void(not_null<Data::Thread*>)> sent);
+
+} // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
new file mode 100644
index 00000000000000..25bce297f43a31
--- /dev/null
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.cpp
@@ -0,0 +1,421 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "inline_bots/inline_bot_downloads.h"
+
+#include "core/file_utilities.h"
+#include "data/data_document.h"
+#include "data/data_peer_id.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "storage/file_download_web.h"
+#include "storage/serialize_common.h"
+#include "storage/storage_account.h"
+#include "ui/chat/attach/attach_bot_downloads.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_chat.h"
+
+#include <QtCore/QBuffer>
+#include <QtCore/QDataStream>
+
+#include "base/call_delayed.h"
+
+namespace InlineBots {
+namespace {
+
+constexpr auto kDownloadsVersion = 1;
+constexpr auto kMaxDownloadsBots = 4096;
+constexpr auto kMaxDownloadsPerBot = 16384;
+
+} // namespace
+
+Downloads::Downloads(not_null<Main::Session*> session)
+: _session(session) {
+}
+
+Downloads::~Downloads() {
+	base::take(_loaders);
+	base::take(_lists);
+}
+
+DownloadId Downloads::start(StartArgs &&args) {
+	read();
+
+	const auto botId = args.bot->id;
+	const auto id = ++_autoIncrementId;
+	auto &list = _lists[botId].list;
+	list.push_back({
+		.id = id,
+		.url = std::move(args.url),
+		.path = std::move(args.path),
+	});
+	load(botId, id, list.back());
+	return id;
+}
+
+void Downloads::load(
+		PeerId botId,
+		DownloadId id,
+		DownloadsEntry &entry) {
+	entry.loading = 1;
+	entry.failed = 0;
+
+	auto &loader = _loaders[id];
+	Assert(!loader.loader);
+	loader.botId = botId;
+	loader.loader = std::make_unique<webFileLoader>(
+		_session,
+		entry.url,
+		entry.path,
+		WebRequestType::FullLoad);
+
+	applyProgress(botId, id, 0, 0);
+
+	loader.loader->updates(
+	) | rpl::on_next_error_done([=] {
+		progress(botId, id);
+	}, [=](FileLoader::Error) {
+		fail(botId, id);
+	}, [=] {
+		done(botId, id);
+	}, loader.loader->lifetime());
+
+	loader.loader->start();
+}
+
+void Downloads::progress(PeerId botId, DownloadId id) {
+	const auto i = _loaders.find(id);
+	if (i == end(_loaders)) {
+		return;
+	}
+	const auto &loader = i->second.loader;
+	const auto total = loader->fullSize();
+	const auto ready = loader->currentOffset();
+
+	auto &list = _lists[botId].list;
+	const auto j = ranges::find(
+		list,
+		id,
+		&DownloadsEntry::id);
+	Assert(j != end(list));
+
+	if (total < 0 || ready > total) {
+		fail(botId, id);
+		return;
+	} else if (ready == total) {
+		// Wait for 'done' signal.
+		return;
+	}
+
+	applyProgress(botId, id, total, ready);
+}
+
+void Downloads::fail(PeerId botId, DownloadId id, bool cancel) {
+	const auto i = _loaders.find(id);
+	if (i == end(_loaders)) {
+		return;
+	}
+	auto loader = std::move(i->second.loader);
+	_loaders.erase(i);
+	loader = nullptr;
+
+	auto &list = _lists[botId].list;
+	const auto k = ranges::find(
+		list,
+		id,
+		&DownloadsEntry::id);
+	Assert(k != end(list));
+	k->loading = 0;
+	k->failed = 1;
+
+	if (cancel) {
+		auto copy = *k;
+		list.erase(k);
+		applyProgress(botId, copy, 0, 0);
+	} else {
+		applyProgress(botId, *k, 0, 0);
+	}
+}
+
+void Downloads::done(PeerId botId, DownloadId id) {
+	const auto i = _loaders.find(id);
+	if (i == end(_loaders)) {
+		return;
+	}
+	const auto total = i->second.loader->fullSize();
+	if (total <= 0) {
+		fail(botId, id);
+		return;
+	}
+	_loaders.erase(i);
+
+	auto &list = _lists[botId].list;
+	const auto j = ranges::find(
+		list,
+		id,
+		&DownloadsEntry::id);
+	Assert(j != end(list));
+	j->loading = 0;
+
+	applyProgress(botId, id, total, total);
+}
+
+void Downloads::applyProgress(
+		PeerId botId,
+		DownloadId id,
+		int64 total,
+		int64 ready) {
+	Expects(total >= 0);
+	Expects(ready >= 0 && ready <= total);
+
+	auto &list = _lists[botId].list;
+	const auto j = ranges::find(
+		list,
+		id,
+		&DownloadsEntry::id);
+	Assert(j != end(list));
+
+	applyProgress(botId, *j, total, ready);
+}
+
+void Downloads::applyProgress(
+		PeerId botId,
+		DownloadsEntry &entry,
+		int64 total,
+		int64 ready) {
+	auto &progress = _progressView[botId];
+	auto current = progress.current();
+	auto subtract = int64(0);
+	if (current.ready == current.total) {
+		subtract = current.ready;
+	}
+	if (entry.total != total) {
+		const auto delta = total - entry.total;
+		entry.total = total;
+		current.total += delta;
+	}
+	if (entry.ready != ready) {
+		const auto delta = ready - entry.ready;
+		entry.ready = ready;
+		current.ready += delta;
+	}
+	if (subtract > 0
+		&& current.ready >= subtract
+		&& current.total >= subtract) {
+		current.ready -= subtract;
+		current.total -= subtract;
+	}
+	if (entry.loading || current.ready < current.total) {
+		current.loading = 1;
+	} else {
+		current.loading = 0;
+	}
+
+	if (total > 0 && total == ready) {
+		write();
+	}
+
+	progress = current;
+}
+
+void Downloads::action(
+		not_null<UserData*> bot,
+		DownloadId id,
+		DownloadsAction type) {
+	switch (type) {
+	case DownloadsAction::Open: {
+		const auto i = ranges::find(
+			_lists[bot->id].list,
+			id,
+			&DownloadsEntry::id);
+		if (i == end(_lists[bot->id].list)) {
+			return;
+		}
+		File::ShowInFolder(i->path);
+	} break;
+	case DownloadsAction::Cancel: {
+		const auto i = _loaders.find(id);
+		if (i == end(_loaders)) {
+			return;
+		}
+		const auto botId = i->second.botId;
+		fail(botId, id, true);
+	} break;
+	case DownloadsAction::Retry: {
+		const auto i = ranges::find(
+			_lists[bot->id].list,
+			id,
+			&DownloadsEntry::id);
+		if (i == end(_lists[bot->id].list)) {
+			return;
+		}
+		load(bot->id, id, *i);
+	} break;
+	}
+}
+
+[[nodiscard]] auto Downloads::progress(not_null<UserData*> bot)
+->rpl::producer<DownloadsProgress> {
+	read();
+
+	return _progressView[bot->id].value();
+}
+
+const std::vector<DownloadsEntry> &Downloads::list(
+		not_null<UserData*> bot,
+		bool forceCheck) {
+	read();
+
+	auto &entry = _lists[bot->id];
+	if (forceCheck) {
+		const auto was = int(entry.list.size());
+		for (auto i = begin(entry.list); i != end(entry.list);) {
+			if (i->loading || i->failed) {
+				++i;
+			} else if (auto info = QFileInfo(i->path)
+				; !info.exists() || info.size() != i->total) {
+				i = entry.list.erase(i);
+			} else {
+				++i;
+			}
+		}
+		if (int(entry.list.size()) != was) {
+			write();
+		}
+	}
+	return entry.list;
+}
+
+void Downloads::read() {
+	auto bytes = _session->local().readInlineBotsDownloads();
+	if (bytes.isEmpty()) {
+		return;
+	}
+
+	Assert(_lists.empty());
+
+	auto stream = QDataStream(&bytes, QIODevice::ReadOnly);
+	stream.setVersion(QDataStream::Qt_5_1);
+
+	quint32 version = 0, count = 0;
+	stream >> version;
+	if (version != kDownloadsVersion) {
+		return;
+	}
+	stream >> count;
+	if (!count || count > kMaxDownloadsBots) {
+		return;
+	}
+	auto lists = base::flat_map<PeerId, List>();
+	for (auto i = 0; i != count; ++i) {
+		quint64 rawBotId = 0;
+		quint32 count = 0;
+		stream >> rawBotId >> count;
+		const auto botId = DeserializePeerId(rawBotId);
+		if (!botId
+			|| !peerIsUser(botId)
+			|| count > kMaxDownloadsPerBot
+			|| lists.contains(botId)) {
+			return;
+		}
+		auto &list = lists[botId];
+		list.list.reserve(count);
+		for (auto j = 0; j != count; ++j) {
+			auto entry = DownloadsEntry();
+			auto size = int64();
+			stream >> entry.url >> entry.path >> size;
+			entry.total = entry.ready = size;
+			entry.id = ++_autoIncrementId;
+			list.list.push_back(std::move(entry));
+		}
+	}
+	_lists = std::move(lists);
+}
+
+void Downloads::write() {
+	auto size = sizeof(quint32) // version
+		+ sizeof(quint32); // lists count
+
+	for (const auto &[botId, list] : _lists) {
+		size += sizeof(quint64) // botId
+			+ sizeof(quint32); // list count
+		for (const auto &entry : list.list) {
+			if (entry.total > 0 && entry.ready == entry.total) {
+				size += Serialize::stringSize(entry.url)
+					+ Serialize::stringSize(entry.path)
+					+ sizeof(quint64); // size
+			}
+		}
+	}
+
+	auto bytes = QByteArray();
+	bytes.reserve(size);
+	auto buffer = QBuffer(&bytes);
+	buffer.open(QIODevice::WriteOnly);
+	auto stream = QDataStream(&buffer);
+	stream.setVersion(QDataStream::Qt_5_1);
+
+	stream << quint32(kDownloadsVersion) << quint32(_lists.size());
+
+	for (const auto &[botId, list] : _lists) {
+		stream << SerializePeerId(botId) << quint32(list.list.size());
+		for (const auto &entry : list.list) {
+			if (entry.total > 0 && entry.ready == entry.total) {
+				stream << entry.url << entry.path << entry.total;
+			}
+		}
+	}
+	buffer.close();
+
+	_session->local().writeInlineBotsDownloads(bytes);
+}
+
+void DownloadFileBox(not_null<Ui::GenericBox*> box, DownloadBoxArgs args) {
+	Expects(!args.name.isEmpty());
+
+	box->setTitle(tr::lng_bot_download_file());
+	box->addRow(object_ptr<Ui::FlatLabel>(
+		box,
+		tr::lng_bot_download_file_sure(
+			lt_bot,
+			rpl::single(tr::bold(args.bot)),
+			tr::rich),
+		st::botDownloadLabel));
+	//box->addRow(MakeFilePreview(box, args));
+	const auto done = std::move(args.done);
+	const auto name = args.name;
+	const auto session = args.session;
+	const auto chosen = std::make_shared<bool>();
+	box->addButton(tr::lng_bot_download_file_button(), [=] {
+		const auto path = FileNameForSave(
+			session,
+			tr::lng_save_file(tr::now),
+			QString(),
+			u"file"_q,
+			name,
+			false,
+			QDir());
+		if (!path.isEmpty()) {
+			*chosen = true;
+			box->closeBox();
+			done(path);
+		}
+	});
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+	box->boxClosing() | rpl::on_next([=] {
+		if (!*chosen) {
+			done(QString());
+		}
+	}, box->lifetime());
+}
+
+} // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_downloads.h b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.h
new file mode 100644
index 00000000000000..1d66e6c8db9b36
--- /dev/null
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_downloads.h
@@ -0,0 +1,105 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/chat/attach/attach_bot_webview.h"
+
+class webFileLoader;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+namespace InlineBots {
+
+using DownloadId = uint32;
+
+using ::Ui::BotWebView::DownloadsProgress;
+using ::Ui::BotWebView::DownloadsEntry;
+using ::Ui::BotWebView::DownloadsAction;
+
+class Downloads final {
+public:
+	explicit Downloads(not_null<Main::Session*> session);
+	~Downloads();
+
+	struct StartArgs {
+		not_null<UserData*> bot;
+		QString url;
+		QString path;
+	};
+	uint32 start(StartArgs &&args); // Returns download id.
+
+	void action(
+		not_null<UserData*> bot,
+		DownloadId id,
+		DownloadsAction type);
+
+	[[nodiscard]] rpl::producer<DownloadsProgress> progress(
+		not_null<UserData*> bot);
+	[[nodiscard]] const std::vector<DownloadsEntry> &list(
+		not_null<UserData*> bot,
+		bool check = false);
+
+private:
+	struct List {
+		std::vector<DownloadsEntry> list;
+	};
+	struct Loader {
+		std::unique_ptr<webFileLoader> loader;
+		PeerId botId = 0;
+	};
+
+	void read();
+	void write();
+
+	void load(
+		PeerId botId,
+		DownloadId id,
+		DownloadsEntry &entry);
+	void progress(PeerId botId, DownloadId id);
+	void fail(PeerId botId, DownloadId id, bool cancel = false);
+	void done(PeerId botId, DownloadId id);
+	void applyProgress(
+		PeerId botId,
+		DownloadId id,
+		int64 total,
+		int64 ready);
+	void applyProgress(
+		PeerId botId,
+		DownloadsEntry &entry,
+		int64 total,
+		int64 ready);
+
+	const not_null<Main::Session*> _session;
+
+	base::flat_map<PeerId, List> _lists;
+	base::flat_map<DownloadId, Loader> _loaders;
+
+	base::flat_map<
+		PeerId,
+		rpl::variable<DownloadsProgress>> _progressView;
+
+	DownloadId _autoIncrementId = 0;
+
+};
+
+struct DownloadBoxArgs {
+	not_null<Main::Session*> session;
+	QString bot;
+	QString name;
+	QString url;
+	Fn<void(QString)> done;
+};
+void DownloadFileBox(not_null<Ui::GenericBox*> box, DownloadBoxArgs args);
+
+} // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
index 616280a7e3a40c..04b48211c4e4fd 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@@ -20,6 +20,7 @@ For license and copyright information please follow this link:
 #include "lottie/lottie_single_player.h"
 #include "media/audio/media_audio.h"
 #include "media/clip/media_clip_reader.h"
+#include "media/media_common.h"
 #include "media/player/media_player_instance.h"
 #include "history/history_location_manager.h"
 #include "history/view/history_view_cursor_state.h"
@@ -39,18 +40,37 @@ For license and copyright information please follow this link:
 namespace InlineBots {
 namespace Layout {
 namespace internal {
+namespace {
 
 using TextState = HistoryView::TextState;
 
 constexpr auto kMaxInlineArea = 1280 * 720;
 
+using ::Media::ValidFrameSize;
+
+[[nodiscard]] QSize ScaleDown(int w, int h, int maxW, int maxH) {
+	if (w * maxH > h * maxW) {
+		if (maxH < h) {
+			w = w * maxH / h;
+			h = maxH;
+		}
+	} else {
+		if (maxW < w) {
+			h = h * maxW / w;
+			w = maxW;
+		}
+	}
+	return { w, h };
+}
+
 [[nodiscard]] bool CanPlayInline(not_null<DocumentData*> document) {
-	const auto dimensions = document->dimensions;
-	return dimensions.width() * dimensions.height() <= kMaxInlineArea;
+	return ValidFrameSize(document->dimensions, kMaxInlineArea);
 }
 
-FileBase::FileBase(not_null<Context*> context, not_null<Result*> result)
-: ItemBase(context, result) {
+} // namespace
+
+FileBase::FileBase(not_null<Context*> context, std::shared_ptr<Result> result)
+: ItemBase(context, std::move(result)) {
 }
 
 FileBase::FileBase(
@@ -95,8 +115,8 @@ int FileBase::content_duration() const {
 	return getResultDuration();
 }
 
-Gif::Gif(not_null<Context*> context, not_null<Result*> result)
-: FileBase(context, result) {
+Gif::Gif(not_null<Context*> context, std::shared_ptr<Result> result)
+: FileBase(context, std::move(result)) {
 	Expects(getResultDocument() != nullptr);
 }
 
@@ -415,10 +435,11 @@ void Gif::clipCallback(Media::Clip::Notification notification) {
 			if (_gif->state() == State::Error) {
 				_gif.setBad();
 			} else if (_gif->ready() && !_gif->started()) {
-				if (_gif->width() * _gif->height() > kMaxInlineArea) {
-					getShownDocument()->dimensions = QSize(
-						_gif->width(),
-						_gif->height());
+				const auto size = QSize(_gif->width(), _gif->height());
+				if (!ValidFrameSize(size, kMaxInlineArea)) {
+					if (!size.isEmpty()) {
+						getShownDocument()->dimensions = size;
+					}
 					_gif.reset();
 				} else {
 					_gif->start({
@@ -442,8 +463,8 @@ void Gif::clipCallback(Media::Clip::Notification notification) {
 	}
 }
 
-Sticker::Sticker(not_null<Context*> context, not_null<Result*> result)
-: FileBase(context, result) {
+Sticker::Sticker(not_null<Context*> context, std::shared_ptr<Result> result)
+: FileBase(context, std::move(result)) {
 	Expects(getResultDocument() != nullptr);
 }
 
@@ -589,7 +610,7 @@ void Sticker::setupLottie() const {
 		boundingBox() * style::DevicePixelRatio());
 
 	_lottie->updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, _lifetime);
 }
@@ -654,8 +675,8 @@ void Sticker::clipCallback(Media::Clip::Notification notification) {
 	update();
 }
 
-Photo::Photo(not_null<Context*> context, not_null<Result*> result)
-: ItemBase(context, result) {
+Photo::Photo(not_null<Context*> context, std::shared_ptr<Result> result)
+: ItemBase(context, std::move(result)) {
 	Expects(getShownPhoto() != nullptr);
 }
 
@@ -663,11 +684,10 @@ void Photo::initDimensions() {
 	const auto photo = getShownPhoto();
 	int32 w = photo->width(), h = photo->height();
 	if (w <= 0 || h <= 0) {
-		_maxw = 0;
-	} else {
-		w = w * st::inlineMediaHeight / h;
-		_maxw = qMax(w, int32(st::inlineResultsMinWidth));
+		w = h = 1;
 	}
+	w = w * st::inlineMediaHeight / h;
+	_maxw = qMax(w, int32(st::inlineResultsMinWidth));
 	_minh = st::inlineMediaHeight + st::inlineResultsSkip;
 }
 
@@ -708,6 +728,22 @@ PhotoData *Photo::getShownPhoto() const {
 QSize Photo::countFrameSize() const {
 	const auto photo = getShownPhoto();
 	int32 framew = photo->width(), frameh = photo->height(), height = st::inlineMediaHeight;
+	if ((framew <= 0 || frameh <= 0) && _photoMedia) {
+		using PhotoSize = Data::PhotoSize;
+		if (const auto image = _photoMedia->image(PhotoSize::Thumbnail)) {
+			framew = image->width();
+			frameh = image->height();
+		} else if (const auto image = _photoMedia->image(PhotoSize::Small)) {
+			framew = image->width();
+			frameh = image->height();
+		} else if (const auto image = _photoMedia->thumbnailInline()) {
+			framew = image->width();
+			frameh = image->height();
+		}
+	}
+	if (framew <= 0 || frameh <= 0) {
+		return { _width, height };
+	}
 	if (framew * height > frameh * _width) {
 		if (framew < st::maxStickerSize || frameh > height) {
 			if (frameh > height || (framew * height / frameh) <= st::maxStickerSize) {
@@ -769,8 +805,8 @@ void Photo::prepareThumbnail(QSize size, QSize frame) const {
 	validateThumbnail(_photoMedia->thumbnailInline(), size, frame, false);
 }
 
-Video::Video(not_null<Context*> context, not_null<Result*> result)
-: FileBase(context, result)
+Video::Video(not_null<Context*> context, std::shared_ptr<Result> result)
+: FileBase(context, std::move(result))
 , _link(getResultPreviewHandler())
 , _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip)
 , _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip) {
@@ -925,11 +961,11 @@ void CancelFileClickHandler::onClickImpl() const {
 	_result->cancelFile();
 }
 
-File::File(not_null<Context*> context, not_null<Result*> result)
-: FileBase(context, result)
+File::File(not_null<Context*> context, std::shared_ptr<Result> result)
+: FileBase(context, std::move(result))
 , _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineFileSize - st::inlineThumbSkip)
 , _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineFileSize - st::inlineThumbSkip)
-, _cancel(std::make_shared<CancelFileClickHandler>(result))
+, _cancel(std::make_shared<CancelFileClickHandler>(_result.get()))
 , _document(getShownDocument()) {
 	Expects(getResultDocument() != nullptr);
 
@@ -1173,8 +1209,8 @@ void File::setStatusSize(
 	}
 }
 
-Contact::Contact(not_null<Context*> context, not_null<Result*> result)
-: ItemBase(context, result)
+Contact::Contact(not_null<Context*> context, std::shared_ptr<Result> result)
+: ItemBase(context, std::move(result))
 , _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip)
 , _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip) {
 }
@@ -1242,39 +1278,184 @@ void Contact::prepareThumbnail(int width, int height) const {
 			&& (_thumb.height() == height * style::DevicePixelRatio()))) {
 		return;
 	}
-	auto w = qMax(style::ConvertScale(thumb->width()), 1);
-	auto h = qMax(style::ConvertScale(thumb->height()), 1);
-	if (w * height > h * width) {
-		if (height < h) {
-			w = w * height / h;
-			h = height;
-		}
-	} else {
-		if (width < w) {
-			h = h * width / w;
-			w = width;
-		}
-	}
+	const auto scaled = ScaleDown(
+		qMax(style::ConvertScale(thumb->width()), 1),
+		qMax(style::ConvertScale(thumb->height()), 1),
+		width,
+		height);
 	_thumb = Image(base::duplicate(*thumb)).pixNoCache(
-		QSize(w, h) * style::DevicePixelRatio(),
+		scaled * style::DevicePixelRatio(),
 		{
 			.options = Images::Option::TransparentBackground,
 			.outer = { width, height },
 		});
 }
 
+Thumbnail::Thumbnail(
+	not_null<Context*> context,
+	std::shared_ptr<Result> result)
+: ItemBase(context, std::move(result)) {
+}
+
+void Thumbnail::initDimensions() {
+	int w = 0, h = 0;
+	if (const auto photo = getResultPhoto()) {
+		w = photo->width();
+		h = photo->height();
+	} else if (const auto document = getResultDocument()) {
+		w = document->dimensions.width();
+		h = document->dimensions.height();
+	}
+	if (w <= 0 || h <= 0) {
+		w = h = 1;
+	}
+	w = w * st::inlineMediaHeight / h;
+	_maxw = qMax(w, int32(st::inlineResultsMinWidth));
+	_minh = st::inlineMediaHeight + st::inlineResultsSkip;
+}
+
+QSize Thumbnail::countFrameSize() const {
+	int w = 0, h = 0;
+	if (const auto photo = getResultPhoto()) {
+		w = photo->width();
+		h = photo->height();
+	} else if (const auto document = getResultDocument()) {
+		w = document->dimensions.width();
+		h = document->dimensions.height();
+	}
+	if (w <= 0 || h <= 0) {
+		return { _width, st::inlineMediaHeight };
+	}
+	// Aspect-fill: scale so the smaller dimension covers the cell.
+	const auto targetHeight = st::inlineMediaHeight;
+	if (w * targetHeight > h * _width) {
+		w = w * targetHeight / h;
+		h = targetHeight;
+	} else {
+		h = h * _width / w;
+		w = _width;
+	}
+	return { qMax(w, 1), qMax(h, 1) };
+}
+
+void Thumbnail::validateThumbnail(
+		Image *image,
+		QSize size,
+		QSize frame,
+		bool good) const {
+	if (!image || (_thumbGood && !good)) {
+		return;
+	} else if ((_thumb.size() == size * style::DevicePixelRatio())
+		&& (_thumbGood || !good)) {
+		return;
+	}
+	_thumb = image->pixNoCache(
+		frame * style::DevicePixelRatio(),
+		{
+			.options = (Images::Option::TransparentBackground
+				| (good ? Images::Option() : Images::Option::Blur)),
+			.outer = size,
+		});
+	_thumbGood = good;
+}
+
+void Thumbnail::prepareThumbnail(QSize size, QSize frame) const {
+	if (const auto photo = getResultPhoto()) {
+		if (!_photoMedia) {
+			_photoMedia = photo->createMediaView();
+			_photoMedia->wanted(Data::PhotoSize::Thumbnail, fileOrigin());
+		}
+		using PhotoSize = Data::PhotoSize;
+		validateThumbnail(
+			_photoMedia->image(PhotoSize::Thumbnail),
+			size,
+			frame,
+			true);
+		validateThumbnail(
+			_photoMedia->image(PhotoSize::Small),
+			size,
+			frame,
+			false);
+		validateThumbnail(
+			_photoMedia->thumbnailInline(),
+			size,
+			frame,
+			false);
+	} else if (const auto document = getResultDocument()) {
+		if (!_documentMedia) {
+			_documentMedia = document->createMediaView();
+			document->loadThumbnail(fileOrigin());
+		}
+		validateThumbnail(
+			_documentMedia->thumbnail(),
+			size,
+			frame,
+			true);
+		validateThumbnail(
+			_documentMedia->thumbnailInline(),
+			size,
+			frame,
+			false);
+	} else if (const auto thumb = getResultThumb(fileOrigin())) {
+		if (_thumb.isNull()) {
+			const auto scaled = ScaleDown(
+				qMax(style::ConvertScale(thumb->width()), 1),
+				qMax(style::ConvertScale(thumb->height()), 1),
+				frame.width(),
+				frame.height());
+			_thumb = Image(base::duplicate(*thumb)).pixNoCache(
+				scaled * style::DevicePixelRatio(),
+				{
+					.options = Images::Option::TransparentBackground,
+					.outer = size,
+				});
+		}
+	}
+}
+
+void Thumbnail::paint(
+		Painter &p,
+		const QRect &clip,
+		const PaintContext *context) const {
+	const auto height = st::inlineMediaHeight;
+	const auto frame = countFrameSize();
+
+	QRect r(0, 0, _width, height);
+	prepareThumbnail({ _width, height }, frame);
+	if (_thumb.isNull()) {
+		p.fillRect(r, st::overviewPhotoBg);
+	} else {
+		p.drawPixmap(r.topLeft(), _thumb);
+	}
+}
+
+TextState Thumbnail::getState(
+		QPoint point,
+		StateRequest request) const {
+	if (QRect(0, 0, _width, st::inlineMediaHeight).contains(point)) {
+		return { nullptr, _send };
+	}
+	return {};
+}
+
+void Thumbnail::unloadHeavyPart() {
+	_photoMedia = nullptr;
+	_documentMedia = nullptr;
+	ItemBase::unloadHeavyPart();
+}
+
 Article::Article(
 	not_null<Context*> context,
-	not_null<Result*> result,
+	std::shared_ptr<Result> result,
 	bool withThumb)
-: ItemBase(context, result)
+: ItemBase(context, std::move(result))
 , _url(getResultUrlHandler())
 , _link(getResultPreviewHandler())
 , _withThumb(withThumb)
 , _title(st::emojiPanWidth / 2)
 , _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip) {
 	if (!_link) {
-		if (const auto point = result->getLocationPoint()) {
+		if (const auto point = _result->getLocationPoint()) {
 			_link = std::make_shared<LocationClickHandler>(*point);
 		}
 	}
@@ -1300,7 +1481,7 @@ void Article::initDimensions() {
 	_minh += st::inlineRowMargin * 2 + st::inlineRowBorder;
 }
 
-int32 Article::resizeGetHeight(int32 width) {
+int Article::resizeGetHeight(int width) {
 	_width = qMin(width, _maxw);
 	if (_url) {
 		_urlText = getResultUrl();
@@ -1387,6 +1568,10 @@ TextState Article::getState(
 
 void Article::prepareThumbnail(int width, int height) const {
 	if (!hasResultThumb()) {
+		prepareMediaThumbnail(width, height);
+		if (!_thumb.isNull()) {
+			return;
+		}
 		if ((_thumb.width() != width * style::DevicePixelRatio())
 			|| (_thumb.height() != height * style::DevicePixelRatio())) {
 			_thumb = getResultContactAvatar(width, height);
@@ -1401,29 +1586,75 @@ void Article::prepareThumbnail(int width, int height) const {
 			&& (_thumb.height() == height * style::DevicePixelRatio()))) {
 		return;
 	}
-	auto w = qMax(style::ConvertScale(thumb->width()), 1);
-	auto h = qMax(style::ConvertScale(thumb->height()), 1);
-	if (w * height > h * width) {
-		if (height < h) {
-			w = w * height / h;
-			h = height;
-		}
-	} else {
-		if (width < w) {
-			h = h * width / w;
-			w = width;
-		}
-	}
+	const auto scaled = ScaleDown(
+		qMax(style::ConvertScale(thumb->width()), 1),
+		qMax(style::ConvertScale(thumb->height()), 1),
+		width,
+		height);
 	_thumb = Image(base::duplicate(*thumb)).pixNoCache(
-		QSize(w, h) * style::DevicePixelRatio(),
+		scaled * style::DevicePixelRatio(),
 		{
 			.options = Images::Option::TransparentBackground,
 			.outer = { width, height },
 		});
 }
 
-Game::Game(not_null<Context*> context, not_null<Result*> result)
-: ItemBase(context, result)
+void Article::prepareMediaThumbnail(int width, int height) const {
+	auto thumbGood = false;
+	const auto make = [&](Image *image, bool good) {
+		if (!image || (thumbGood && !good)) {
+			return;
+		}
+		if (!_thumb.isNull() && !good) {
+			return;
+		}
+		const auto scaled = ScaleDown(
+			qMax(style::ConvertScale(image->width()), 1),
+			qMax(style::ConvertScale(image->height()), 1),
+			width,
+			height);
+		_thumb = image->pixNoCache(
+			scaled * style::DevicePixelRatio(),
+			{
+				.options = (Images::Option::TransparentBackground
+					| (good
+						? Images::Option()
+						: Images::Option::Blur)),
+				.outer = { width, height },
+			});
+		if (good) {
+			thumbGood = true;
+		}
+	};
+	if (const auto photo = getResultPhoto()) {
+		if (!_photoMedia) {
+			_photoMedia = photo->createMediaView();
+			_photoMedia->wanted(Data::PhotoSize::Thumbnail, fileOrigin());
+		}
+		using PhotoSize = Data::PhotoSize;
+		make(_photoMedia->image(PhotoSize::Thumbnail), true);
+		make(_photoMedia->image(PhotoSize::Small), false);
+		make(_photoMedia->thumbnailInline(), false);
+	} else if (const auto document = getResultDocument()) {
+		if (document->hasThumbnail()) {
+			if (!_documentMedia) {
+				_documentMedia = document->createMediaView();
+				document->loadThumbnail(fileOrigin());
+			}
+			make(_documentMedia->thumbnail(), true);
+			make(_documentMedia->thumbnailInline(), false);
+		}
+	}
+}
+
+void Article::unloadHeavyPart() {
+	_photoMedia = nullptr;
+	_documentMedia = nullptr;
+	ItemBase::unloadHeavyPart();
+}
+
+Game::Game(not_null<Context*> context, std::shared_ptr<Result> result)
+: ItemBase(context, std::move(result))
 , _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip)
 , _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip) {
 	countFrameSize();
@@ -1582,11 +1813,11 @@ TextState Game::getState(
 }
 
 void Game::prepareThumbnail(QSize size) const {
-	if (const auto document = getResultDocument()) {
+	if ([[maybe_unused]] const auto document = getResultDocument()) {
 		Assert(_documentMedia != nullptr);
 		validateThumbnail(_documentMedia->thumbnail(), size, true);
 		validateThumbnail(_documentMedia->thumbnailInline(), size, false);
-	} else if (const auto photo = getResultPhoto()) {
+	} else if ([[maybe_unused]] const auto photo = getResultPhoto()) {
 		using Data::PhotoSize;
 		Assert(_photoMedia != nullptr);
 		validateThumbnail(_photoMedia->image(PhotoSize::Thumbnail), size, true);
@@ -1690,10 +1921,11 @@ void Game::clipCallback(Media::Clip::Notification notification) {
 			if (_gif->state() == State::Error) {
 				_gif.setBad();
 			} else if (_gif->ready() && !_gif->started()) {
-				if (_gif->width() * _gif->height() > kMaxInlineArea) {
-					getResultDocument()->dimensions = QSize(
-						_gif->width(),
-						_gif->height());
+				const auto size = QSize(_gif->width(), _gif->height());
+				if (!ValidFrameSize(size, kMaxInlineArea)) {
+					if (!size.isEmpty()) {
+						getResultDocument()->dimensions = size;
+					}
 					_gif.reset();
 				} else {
 					_gif->start({
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.h b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.h
index 83794b1b6eab9e..25ecd5f62b636b 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.h
@@ -29,7 +29,7 @@ namespace internal {
 
 class FileBase : public ItemBase {
 public:
-	FileBase(not_null<Context*> context, not_null<Result*> result);
+	FileBase(not_null<Context*> context, std::shared_ptr<Result> result);
 
 	// For saved gif layouts.
 	FileBase(not_null<Context*> context, not_null<DocumentData*> document);
@@ -58,7 +58,7 @@ class DeleteSavedGifClickHandler : public LeftButtonClickHandler {
 
 class Gif final : public FileBase {
 public:
-	Gif(not_null<Context*> context, not_null<Result*> result);
+	Gif(not_null<Context*> context, std::shared_ptr<Result> result);
 	Gif(
 		not_null<Context*> context,
 		not_null<DocumentData*> document,
@@ -138,7 +138,7 @@ class Gif final : public FileBase {
 
 class Photo : public ItemBase {
 public:
-	Photo(not_null<Context*> context, not_null<Result*> result);
+	Photo(not_null<Context*> context, std::shared_ptr<Result> result);
 	// Not used anywhere currently.
 	//Photo(not_null<Context*> context, not_null<PhotoData*> photo);
 
@@ -178,7 +178,7 @@ class Photo : public ItemBase {
 
 class Sticker : public FileBase {
 public:
-	Sticker(not_null<Context*> context, not_null<Result*> result);
+	Sticker(not_null<Context*> context, std::shared_ptr<Result> result);
 	~Sticker();
 	// Not used anywhere currently.
 	//Sticker(not_null<Context*> context, not_null<DocumentData*> document);
@@ -229,7 +229,7 @@ class Sticker : public FileBase {
 
 class Video : public FileBase {
 public:
-	Video(not_null<Context*> context, not_null<Result*> result);
+	Video(not_null<Context*> context, std::shared_ptr<Result> result);
 
 	void initDimensions() override;
 
@@ -269,7 +269,7 @@ class CancelFileClickHandler : public LeftButtonClickHandler {
 
 class File : public FileBase {
 public:
-	File(not_null<Context*> context, not_null<Result*> result);
+	File(not_null<Context*> context, std::shared_ptr<Result> result);
 	~File();
 
 	void initDimensions() override;
@@ -347,7 +347,7 @@ class File : public FileBase {
 
 class Contact : public ItemBase {
 public:
-	Contact(not_null<Context*> context, not_null<Result*> result);
+	Contact(not_null<Context*> context, std::shared_ptr<Result> result);
 
 	void initDimensions() override;
 
@@ -364,9 +364,51 @@ class Contact : public ItemBase {
 
 };
 
+class Thumbnail : public ItemBase {
+public:
+	Thumbnail(not_null<Context*> context, std::shared_ptr<Result> result);
+
+	void initDimensions() override;
+
+	bool isFullLine() const override {
+		return false;
+	}
+	bool hasRightSkip() const override {
+		return true;
+	}
+
+	void paint(
+		Painter &p,
+		const QRect &clip,
+		const PaintContext *context) const override;
+	TextState getState(
+		QPoint point,
+		StateRequest request) const override;
+
+	void unloadHeavyPart() override;
+
+private:
+	QSize countFrameSize() const;
+	void prepareThumbnail(QSize size, QSize frame) const;
+	void validateThumbnail(
+		Image *image,
+		QSize size,
+		QSize frame,
+		bool good) const;
+
+	mutable QPixmap _thumb;
+	mutable bool _thumbGood = false;
+	mutable std::shared_ptr<Data::PhotoMedia> _photoMedia;
+	mutable std::shared_ptr<Data::DocumentMedia> _documentMedia;
+
+};
+
 class Article : public ItemBase {
 public:
-	Article(not_null<Context*> context, not_null<Result*> result, bool withThumb);
+	Article(
+		not_null<Context*> context,
+		std::shared_ptr<Result> result,
+		bool withThumb);
 
 	void initDimensions() override;
 	int resizeGetHeight(int width) override;
@@ -376,6 +418,8 @@ class Article : public ItemBase {
 		QPoint point,
 		StateRequest request) const override;
 
+	void unloadHeavyPart() override;
+
 private:
 	ClickHandlerPtr _url, _link;
 
@@ -386,12 +430,16 @@ class Article : public ItemBase {
 	int32 _urlWidth;
 
 	void prepareThumbnail(int width, int height) const;
+	void prepareMediaThumbnail(int width, int height) const;
+
+	mutable std::shared_ptr<Data::PhotoMedia> _photoMedia;
+	mutable std::shared_ptr<Data::DocumentMedia> _documentMedia;
 
 };
 
 class Game : public ItemBase {
 public:
-	Game(not_null<Context*> context, not_null<Result*> result);
+	Game(not_null<Context*> context, std::shared_ptr<Result> result);
 
 	void setPosition(int32 position) override;
 	void initDimensions() override;
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp
index 34acc4093a4f80..fa0d231089608a 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp
@@ -29,7 +29,7 @@ base::NeverFreedPointer<DocumentItems> documentItemsMap;
 
 } // namespace
 
-Result *ItemBase::getResult() const {
+std::shared_ptr<Result> ItemBase::getResult() const {
 	return _result;
 }
 
@@ -92,33 +92,72 @@ void ItemBase::layoutChanged() {
 
 std::unique_ptr<ItemBase> ItemBase::createLayout(
 		not_null<Context*> context,
-		not_null<Result*> result,
-		bool forceThumb) {
+		std::shared_ptr<Result> result,
+		bool forceThumb,
+		std::optional<bool> gallery) {
 	using Type = Result::Type;
 
+	if (gallery.has_value()) {
+		if (!*gallery) {
+			// Force list mode: render gallery types as Article.
+			switch (result->_type) {
+			case Type::Photo:
+			case Type::Sticker:
+			case Type::Gif:
+				return std::make_unique<internal::Article>(
+					context,
+					std::move(result),
+					forceThumb);
+			default:
+				break;
+			}
+		} else {
+			// Force gallery mode: render list types as Thumbnail.
+			switch (result->_type) {
+			case Type::Article:
+			case Type::Geo:
+			case Type::Venue:
+			case Type::Video:
+			case Type::Audio:
+			case Type::File:
+			case Type::Contact:
+			case Type::Game:
+				return std::make_unique<internal::Thumbnail>(
+					context,
+					std::move(result));
+			default:
+				break;
+			}
+		}
+	}
+
 	switch (result->_type) {
 	case Type::Photo:
-		return std::make_unique<internal::Photo>(context, result);
+		return std::make_unique<internal::Photo>(context, std::move(result));
 	case Type::Audio:
 	case Type::File:
-		return std::make_unique<internal::File>(context, result);
+		return std::make_unique<internal::File>(context, std::move(result));
 	case Type::Video:
-		return std::make_unique<internal::Video>(context, result);
+		return std::make_unique<internal::Video>(context, std::move(result));
 	case Type::Sticker:
-		return std::make_unique<internal::Sticker>(context, result);
+		return std::make_unique<internal::Sticker>(
+			context,
+			std::move(result));
 	case Type::Gif:
-		return std::make_unique<internal::Gif>(context, result);
+		return std::make_unique<internal::Gif>(context, std::move(result));
 	case Type::Article:
 	case Type::Geo:
 	case Type::Venue:
 		return std::make_unique<internal::Article>(
 			context,
-			result,
+			std::move(result),
 			forceThumb);
 	case Type::Game:
-		return std::make_unique<internal::Game>(context, result);
+		return std::make_unique<internal::Game>(context, std::move(result));
 	case Type::Contact:
-		return std::make_unique<internal::Contact>(context, result);
+		return std::make_unique<internal::Contact>(
+			context,
+			std::move(result));
 	}
 	return nullptr;
 }
@@ -197,7 +236,7 @@ ClickHandlerPtr ItemBase::getResultPreviewHandler() const {
 			_result->_content_url,
 			false);
 	} else if (const auto document = _result->_document
-		; document && document->createMediaView()->canBePlayed(nullptr)) {
+		; document && document->createMediaView()->canBePlayed()) {
 		return std::make_shared<OpenFileClickHandler>();
 	} else if (_result->_photo) {
 		return std::make_shared<OpenFileClickHandler>();
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h
index 67574f7e0840ed..11d72e8a927b8b 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h
@@ -59,7 +59,7 @@ class Context {
 
 class ItemBase : public LayoutItemBase {
 public:
-	ItemBase(not_null<Context*> context, not_null<Result*> result)
+	ItemBase(not_null<Context*> context, std::shared_ptr<Result> result)
 	: _result(result)
 	, _context(context) {
 	}
@@ -80,7 +80,7 @@ class ItemBase : public LayoutItemBase {
 		return false;
 	}
 
-	Result *getResult() const;
+	std::shared_ptr<Result> getResult() const;
 	DocumentData *getDocument() const;
 	PhotoData *getPhoto() const;
 
@@ -112,8 +112,9 @@ class ItemBase : public LayoutItemBase {
 
 	static std::unique_ptr<ItemBase> createLayout(
 		not_null<Context*> context,
-		not_null<Result*> result,
-		bool forceThumb);
+		std::shared_ptr<Result> result,
+		bool forceThumb,
+		std::optional<bool> gallery = std::nullopt);
 	static std::unique_ptr<ItemBase> createLayoutGif(
 		not_null<Context*> context,
 		not_null<DocumentData*> document);
@@ -135,7 +136,7 @@ class ItemBase : public LayoutItemBase {
 	}
 	Data::FileOrigin fileOrigin() const;
 
-	Result *_result = nullptr;
+	std::shared_ptr<Result> _result;
 	DocumentData *_document = nullptr;
 	PhotoData *_photo = nullptr;
 
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
index 612d3576966dae..5823071279e5cc 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
@@ -53,7 +53,7 @@ Result::Result(not_null<Main::Session*> session, const Creator &creator)
 , _type(creator.type) {
 }
 
-std::unique_ptr<Result> Result::Create(
+std::shared_ptr<Result> Result::Create(
 		not_null<Main::Session*> session,
 		uint64 queryId,
 		const MTPBotInlineResult &data) {
@@ -84,7 +84,7 @@ std::unique_ptr<Result> Result::Create(
 		return nullptr;
 	}
 
-	auto result = std::make_unique<Result>(
+	auto result = std::make_shared<Result>(
 		session,
 		Creator{ queryId, type });
 	const auto message = data.match([&](const MTPDbotInlineResult &data) {
@@ -205,6 +205,10 @@ std::unique_ptr<Result> Result::Create(
 			qs(data.vmessage()),
 			Api::EntitiesFromMTP(session, data.ventities().value_or_empty()),
 			data.is_no_webpage());
+	}, [&](const MTPDbotInlineMessageRichMessage &data) {
+		result->sendData = std::make_unique<internal::SendRichMessage>(
+			session,
+			data.vrich_message());
 	}, [&](const MTPDbotInlineMessageMediaGeo &data) {
 		data.vgeo().match([&](const MTPDgeoPoint &geo) {
 			if (const auto period = data.vperiod()) {
@@ -347,9 +351,9 @@ bool Result::onChoose(Layout::ItemBase *layout) {
 Media::View::OpenRequest Result::openRequest() {
 	using namespace Media::View;
 	if (_document) {
-		return OpenRequest(nullptr, _document, nullptr, MsgId());
+		return OpenRequest(nullptr, _document, nullptr, MsgId(), PeerId());
 	} else if (_photo) {
-		return OpenRequest(nullptr, _photo, nullptr, MsgId());
+		return OpenRequest(nullptr, _photo, nullptr, MsgId(), PeerId());
 	}
 	return {};
 }
@@ -378,23 +382,25 @@ bool Result::hasThumbDisplay() const {
 void Result::addToHistory(
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const {
-	fields.flags |= MessageFlag::FromInlineBot;
+	history->addNewLocalMessage(makeMessage(history, std::move(fields)));
+}
+
+not_null<HistoryItem*> Result::makeMessage(
+		not_null<History*> history,
+		HistoryItemCommonFields &&fields) const {
+	fields.flags |= MessageFlag::FromInlineBot | MessageFlag::Local;
 	if (_replyMarkup) {
 		fields.markup = *_replyMarkup;
 		if (!fields.markup.isNull()) {
 			fields.flags |= MessageFlag::HasReplyMarkup;
 		}
 	}
-	sendData->addToHistory(this, history, std::move(fields));
+	return sendData->makeMessage(this, history, std::move(fields));
 }
 
-QString Result::getErrorOnSend(not_null<History*> history) const {
-	const auto specific = sendData->getErrorOnSend(this, history);
-	return !specific.isEmpty()
-		? specific
-		: Data::RestrictionError(
-			history->peer,
-			ChatRestriction::SendInline).value_or(QString());
+Data::SendError Result::getErrorOnSend(not_null<History*> history) const {
+	return sendData->getErrorOnSend(this, history).value_or(
+		Data::RestrictionError(history->peer, ChatRestriction::SendInline));
 }
 
 std::optional<Data::LocationPoint> Result::getLocationPoint() const {
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.h b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
index cc7e090ee7348f..bf40bc2ee097b9 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
@@ -20,6 +20,7 @@ struct HistoryItemCommonFields;
 
 namespace Data {
 class LocationPoint;
+struct SendError;
 } // namespace Data
 
 namespace InlineBots {
@@ -42,7 +43,7 @@ class Result {
 	// You should use create() static method instead.
 	Result(not_null<Main::Session*> session, const Creator &creator);
 
-	static std::unique_ptr<Result> Create(
+	static std::shared_ptr<Result> Create(
 		not_null<Main::Session*> session,
 		uint64 queryId,
 		const MTPBotInlineResult &mtpData);
@@ -66,7 +67,11 @@ class Result {
 	void addToHistory(
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const;
-	QString getErrorOnSend(not_null<History*> history) const;
+	[[nodiscard]] not_null<HistoryItem*> makeMessage(
+		not_null<History*> history,
+		HistoryItemCommonFields &&fields) const;
+	[[nodiscard]] Data::SendError getErrorOnSend(
+		not_null<History*> history) const;
 
 	// interface for Layout:: usage
 	std::optional<Data::LocationPoint> getLocationPoint() const;
@@ -125,7 +130,7 @@ class Result {
 };
 
 struct ResultSelected {
-	not_null<Result*> result;
+	std::shared_ptr<Result> result;
 	not_null<UserData*> bot;
 	PeerData *recipientOverride = nullptr;
 	Api::SendOptions options;
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
index 0b8e9d8b790aa9..e4120c97e03c99 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "api/api_text_entities.h"
 #include "data/data_document.h"
 #include "inline_bots/inline_bot_result.h"
+#include "iv/iv_rich_page.h"
 #include "storage/localstorage.h"
 #include "lang/lang_keys.h"
 #include "history/history.h"
@@ -28,7 +29,7 @@ QString SendData::getLayoutDescription(const Result *owner) const {
 	return owner->_description;
 }
 
-void SendDataCommon::addToHistory(
+not_null<HistoryItem*> SendDataCommon::makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const {
@@ -36,23 +37,63 @@ void SendDataCommon::addToHistory(
 	if (fields.replyTo) {
 		fields.flags |= MessageFlag::HasReplyInfo;
 	}
-	history->addNewLocalMessage(
+	return history->makeMessage(
 		std::move(fields),
 		std::move(distinct.text),
 		std::move(distinct.media));
 }
 
-QString SendDataCommon::getErrorOnSend(
+Data::SendError SendDataCommon::getErrorOnSend(
 		const Result *owner,
 		not_null<History*> history) const {
 	const auto type = ChatRestriction::SendOther;
-	return Data::RestrictionError(history->peer, type).value_or(QString());
+	return Data::RestrictionError(history->peer, type);
 }
 
 SendDataCommon::SentMessageFields SendText::getSentMessageFields() const {
 	return { .text = { _message, _entities } };
 }
 
+SendRichMessage::SendRichMessage(
+	not_null<Main::Session*> session,
+	const MTPRichMessage &message)
+: SendData(session)
+, _page(Iv::ParseRichPage(session, message))
+, _summary(Iv::FlattenRichPageSummary(_page)) {
+}
+
+bool SendRichMessage::isValid() const {
+	return _page && !_page->blocks.empty();
+}
+
+not_null<HistoryItem*> SendRichMessage::makeMessage(
+		const Result *owner,
+		not_null<History*> history,
+		HistoryItemCommonFields &&fields) const {
+	if (fields.replyTo) {
+		fields.flags |= MessageFlag::HasReplyInfo;
+	}
+	const auto item = history->makeMessage(
+		std::move(fields),
+		_summary,
+		MTP_messageMediaEmpty());
+	item->setRichPage(_page);
+	return item;
+}
+
+Data::SendError SendRichMessage::getErrorOnSend(
+		const Result *owner,
+		not_null<History*> history) const {
+	const auto type = ChatRestriction::SendOther;
+	return Data::RestrictionError(history->peer, type);
+}
+
+QString SendRichMessage::getLayoutDescription(const Result *owner) const {
+	return _summary.text.isEmpty()
+		? SendData::getLayoutDescription(owner)
+		: _summary.text;
+}
+
 SendDataCommon::SentMessageFields SendGeo::getSentMessageFields() const {
 	if (_period) {
 		using Flag = MTPDmessageMediaGeoLive::Flag;
@@ -96,52 +137,52 @@ QString SendContact::getLayoutDescription(const Result *owner) const {
 	return result;
 }
 
-void SendPhoto::addToHistory(
+not_null<HistoryItem*> SendPhoto::makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const {
-	history->addNewLocalMessage(
+	return history->makeMessage(
 		std::move(fields),
 		_photo,
-		{ _message, _entities });
+		TextWithEntities{ _message, _entities });
 }
 
-QString SendPhoto::getErrorOnSend(
+Data::SendError SendPhoto::getErrorOnSend(
 		const Result *owner,
 		not_null<History*> history) const {
 	const auto type = ChatRestriction::SendPhotos;
-	return Data::RestrictionError(history->peer, type).value_or(QString());
+	return Data::RestrictionError(history->peer, type);
 }
 
-void SendFile::addToHistory(
+not_null<HistoryItem*> SendFile::makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const {
-	history->addNewLocalMessage(
+	return history->makeMessage(
 		std::move(fields),
 		_document,
-		{ _message, _entities });
+		TextWithEntities{ _message, _entities });
 }
 
-QString SendFile::getErrorOnSend(
+Data::SendError SendFile::getErrorOnSend(
 		const Result *owner,
 		not_null<History*> history) const {
 	const auto type = _document->requiredSendRight();
-	return Data::RestrictionError(history->peer, type).value_or(QString());
+	return Data::RestrictionError(history->peer, type);
 }
 
-void SendGame::addToHistory(
+not_null<HistoryItem*> SendGame::makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const {
-	history->addNewLocalMessage(std::move(fields), _game);
+	return history->makeMessage(std::move(fields), _game);
 }
 
-QString SendGame::getErrorOnSend(
+Data::SendError SendGame::getErrorOnSend(
 		const Result *owner,
 		not_null<History*> history) const {
 	const auto type = ChatRestriction::SendGames;
-	return Data::RestrictionError(history->peer, type).value_or(QString());
+	return Data::RestrictionError(history->peer, type);
 }
 
 SendDataCommon::SentMessageFields SendInvoice::getSentMessageFields() const {
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
index 502cc006ebed16..de21fd1defadf5 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
@@ -9,14 +9,24 @@ For license and copyright information please follow this link:
 
 #include "history/history_location_manager.h"
 
+#include <memory>
+
 struct HistoryItemCommonFields;
 
+namespace Data {
+struct SendError;
+} // namespace Data
+
 namespace Main {
 class Session;
 } // namespace Main
 
 class History;
 
+namespace Iv {
+struct RichPage;
+} // namespace Iv
+
 namespace InlineBots {
 
 class Result;
@@ -40,11 +50,11 @@ class SendData {
 
 	virtual bool isValid() const = 0;
 
-	virtual void addToHistory(
+	virtual not_null<HistoryItem*> makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const = 0;
-	virtual QString getErrorOnSend(
+	virtual Data::SendError getErrorOnSend(
 		const Result *owner,
 		not_null<History*> history) const = 0;
 
@@ -75,12 +85,12 @@ class SendDataCommon : public SendData {
 	};
 	virtual SentMessageFields getSentMessageFields() const = 0;
 
-	void addToHistory(
+	not_null<HistoryItem*> makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const override;
 
-	QString getErrorOnSend(
+	Data::SendError getErrorOnSend(
 		const Result *owner,
 		not_null<History*> history) const override;
 
@@ -111,6 +121,31 @@ class SendText : public SendDataCommon {
 
 };
 
+class SendRichMessage final : public SendData {
+public:
+	SendRichMessage(
+		not_null<Main::Session*> session,
+		const MTPRichMessage &message);
+
+	bool isValid() const override;
+
+	not_null<HistoryItem*> makeMessage(
+		const Result *owner,
+		not_null<History*> history,
+		HistoryItemCommonFields &&fields) const override;
+
+	Data::SendError getErrorOnSend(
+		const Result *owner,
+		not_null<History*> history) const override;
+
+	QString getLayoutDescription(const Result *owner) const override;
+
+private:
+	std::shared_ptr<const Iv::RichPage> _page;
+	TextWithEntities _summary;
+
+};
+
 // Message with geo location point media.
 class SendGeo : public SendDataCommon {
 public:
@@ -236,12 +271,12 @@ class SendPhoto : public SendData {
 		return _photo != nullptr;
 	}
 
-	void addToHistory(
+	not_null<HistoryItem*> makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const override;
 
-	QString getErrorOnSend(
+	Data::SendError getErrorOnSend(
 		const Result *owner,
 		not_null<History*> history) const override;
 
@@ -270,12 +305,12 @@ class SendFile : public SendData {
 		return _document != nullptr;
 	}
 
-	void addToHistory(
+	not_null<HistoryItem*> makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const override;
 
-	QString getErrorOnSend(
+	Data::SendError getErrorOnSend(
 		const Result *owner,
 		not_null<History*> history) const override;
 
@@ -298,12 +333,12 @@ class SendGame : public SendData {
 		return _game != nullptr;
 	}
 
-	void addToHistory(
+	not_null<HistoryItem*> makeMessage(
 		const Result *owner,
 		not_null<History*> history,
 		HistoryItemCommonFields &&fields) const override;
 
-	QString getErrorOnSend(
+	Data::SendError getErrorOnSend(
 		const Result *owner,
 		not_null<History*> history) const override;
 
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_storage.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_storage.cpp
new file mode 100644
index 00000000000000..2e6a858f133784
--- /dev/null
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_storage.cpp
@@ -0,0 +1,181 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "inline_bots/inline_bot_storage.h"
+
+#include "main/main_session.h"
+#include "storage/storage_account.h"
+
+#include <xxhash.h>
+
+namespace InlineBots {
+namespace {
+
+constexpr auto kMaxStorageSize = (5 << 20);
+
+[[nodiscard]] uint64 KeyHash(const QString &key) {
+	return XXH64(key.data(), key.size(), 0);
+}
+
+} // namespace
+
+Storage::Storage(not_null<Main::Session*> session)
+: _session(session) {
+}
+
+bool Storage::write(
+		PeerId botId,
+		const QString &key,
+		const std::optional<QString> &value) {
+	if (value && value->size() > kMaxStorageSize) {
+		return false;
+	}
+	readFromDisk(botId);
+	auto i = _lists.find(botId);
+	if (i == end(_lists)) {
+		if (!value) {
+			return true;
+		}
+		i = _lists.emplace(botId).first;
+	}
+	auto &list = i->second;
+	const auto hash = KeyHash(key);
+	auto j = list.data.find(hash);
+	if (j == end(list.data)) {
+		if (!value) {
+			return true;
+		}
+		j = list.data.emplace(hash).first;
+	}
+	auto &bykey = j->second;
+	const auto k = ranges::find(bykey, key, &Entry::key);
+	if (k == end(bykey) && !value) {
+		return true;
+	}
+	const auto size = list.totalSize
+		- (k != end(bykey) ? (key.size() + k->value.size()) : 0)
+		+ (value ? (key.size() + value->size()) : 0);
+	if (size > kMaxStorageSize) {
+		return false;
+	}
+	if (k == end(bykey)) {
+		bykey.emplace_back(Entry{ key, *value });
+		++list.keysCount;
+	} else if (value) {
+		k->value = *value;
+	} else {
+		bykey.erase(k);
+		--list.keysCount;
+	}
+	if (bykey.empty()) {
+		list.data.erase(j);
+		if (list.data.empty()) {
+			Assert(size == 0);
+			_lists.erase(i);
+		} else {
+			list.totalSize = size;
+		}
+	} else {
+		list.totalSize = size;
+	}
+	saveToDisk(botId);
+	return true;
+}
+
+std::optional<QString> Storage::read(PeerId botId, const QString &key) {
+	readFromDisk(botId);
+	const auto i = _lists.find(botId);
+	if (i == end(_lists)) {
+		return std::nullopt;
+	}
+	const auto &list = i->second;
+	const auto j = list.data.find(KeyHash(key));
+	if (j == end(list.data)) {
+		return std::nullopt;
+	}
+	const auto &bykey = j->second;
+	const auto k = ranges::find(bykey, key, &Entry::key);
+	if (k == end(bykey)) {
+		return std::nullopt;
+	}
+	return k->value;
+}
+
+void Storage::clear(PeerId botId) {
+	if (_lists.remove(botId)) {
+		saveToDisk(botId);
+	}
+}
+
+void Storage::saveToDisk(PeerId botId) {
+	const auto i = _lists.find(botId);
+	if (i != end(_lists)) {
+		_session->local().writeBotStorage(botId, Serialize(i->second));
+	} else {
+		_session->local().writeBotStorage(botId, QByteArray());
+	}
+}
+
+void Storage::readFromDisk(PeerId botId) {
+	const auto serialized = _session->local().readBotStorage(botId);
+	if (!serialized.isEmpty()) {
+		_lists[botId] = Deserialize(serialized);
+	}
+}
+
+QByteArray Storage::Serialize(const List &list) {
+	auto result = QByteArray();
+	const auto size = sizeof(quint32)
+		+ (list.keysCount * sizeof(quint32))
+		+ (list.totalSize * sizeof(ushort));
+	result.reserve(size);
+	{
+		QDataStream stream(&result, QIODevice::WriteOnly);
+		auto count = 0;
+		stream.setVersion(QDataStream::Qt_5_1);
+		stream << quint32(list.keysCount);
+		for (const auto &[hash, bykey] : list.data) {
+			for (const auto &entry : bykey) {
+				stream << entry.key << entry.value;
+				++count;
+			}
+		}
+		Assert(count == list.keysCount);
+	}
+	return result;
+}
+
+Storage::List Storage::Deserialize(const QByteArray &serialized) {
+	QDataStream stream(serialized);
+	stream.setVersion(QDataStream::Qt_5_1);
+
+	auto count = quint32();
+	auto result = List();
+	stream >> count;
+	if (count > kMaxStorageSize) {
+		return {};
+	}
+	for (auto i = 0; i != count; ++i) {
+		auto entry = Entry();
+		stream >> entry.key >> entry.value;
+		const auto hash = KeyHash(entry.key);
+		auto j = result.data.find(hash);
+		if (j == end(result.data)) {
+			j = result.data.emplace(hash).first;
+		}
+		auto &bykey = j->second;
+		const auto k = ranges::find(bykey, entry.key, &Entry::key);
+		if (k == end(bykey)) {
+			bykey.push_back(entry);
+			result.totalSize += entry.key.size() + entry.value.size();
+			++result.keysCount;
+		}
+	}
+	return result;
+}
+
+} // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_storage.h b/Telegram/SourceFiles/inline_bots/inline_bot_storage.h
new file mode 100644
index 00000000000000..975fa576b5543f
--- /dev/null
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_storage.h
@@ -0,0 +1,52 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/chat/attach/attach_bot_webview.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace InlineBots {
+
+class Storage final {
+public:
+	explicit Storage(not_null<Main::Session*> session);
+
+	bool write(
+		PeerId botId,
+		const QString &key,
+		const std::optional<QString> &value);
+	std::optional<QString> read(PeerId botId, const QString &key);
+	void clear(PeerId botId);
+
+private:
+	struct Entry {
+		QString key;
+		QString value;
+	};
+	struct List {
+		base::flat_map<uint64, std::vector<Entry>> data;
+		int keysCount = 0;
+		int totalSize = 0;
+	};
+
+	void saveToDisk(PeerId botId);
+	void readFromDisk(PeerId botId);
+
+	[[nodiscard]] static QByteArray Serialize(const List &list);
+	[[nodiscard]] static List Deserialize(const QByteArray &serialized);
+
+	const not_null<Main::Session*> _session;
+
+	base::flat_map<PeerId, List> _lists;
+
+};
+
+} // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
index 6f1ae7916f9fe1..48a6cb1e375845 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
@@ -25,6 +25,7 @@ For license and copyright information please follow this link:
 #include "mainwindow.h"
 #include "main/main_session.h"
 #include "window/window_session_controller.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
@@ -65,12 +66,12 @@ Inner::Inner(
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateInlineItems();
 	}, lifetime());
 
 	controller->gifPauseLevelChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_controller->isGifPausedAtLeastFor(
 				Window::GifPauseReason::InlineResults)) {
 			updateInlineItems();
@@ -81,7 +82,7 @@ Inner::Inner(
 		Data::PeerUpdate::Flag::Rights
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer.get() == _inlineQueryPeer);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		auto isRestricted = (_restrictedLabel != nullptr);
 		if (isRestricted != isRestrictedView()) {
 			auto h = countHeight();
@@ -90,7 +91,7 @@ Inner::Inner(
 	}, lifetime());
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		_mosaic.setFullWidth(s.width());
 	}, lifetime());
 
@@ -113,19 +114,35 @@ void Inner::checkRestrictedPeer() {
 		const auto error = Data::RestrictionError(
 			_inlineQueryPeer,
 			ChatRestriction::SendInline);
+		const auto changed = (_restrictedLabelKey != error.text);
+		if (!changed) {
+			return;
+		}
+		_restrictedLabelKey = error.text;
 		if (error) {
-			if (!_restrictedLabel) {
-				_restrictedLabel.create(this, *error, st::stickersRestrictedLabel);
-				_restrictedLabel->show();
-				_restrictedLabel->move(st::inlineResultsLeft - st::roundRadiusSmall, st::stickerPanPadding);
-				_restrictedLabel->resizeToNaturalWidth(width() - (st::inlineResultsLeft - st::roundRadiusSmall) * 2);
-				if (_switchPmButton) {
-					_switchPmButton->hide();
-				}
-				repaintItems();
+			const auto window = _controller;
+			const auto peer = _inlineQueryPeer;
+			_restrictedLabel.create(
+				this,
+				rpl::single(error.boostsToLift
+					? tr::link(error.text)
+					: TextWithEntities{ error.text }),
+				st::stickersRestrictedLabel);
+			const auto lifting = error.boostsToLift;
+			_restrictedLabel->setClickHandlerFilter([=](auto...) {
+				window->resolveBoostState(peer->asChannel(), lifting);
+				return false;
+			});
+			_restrictedLabel->show();
+			updateRestrictedLabelGeometry();
+			if (_switchPmButton) {
+				_switchPmButton->hide();
 			}
+			repaintItems();
 			return;
 		}
+	} else {
+		_restrictedLabelKey = QString();
 	}
 	if (_restrictedLabel) {
 		_restrictedLabel.destroy();
@@ -136,6 +153,18 @@ void Inner::checkRestrictedPeer() {
 	}
 }
 
+void Inner::updateRestrictedLabelGeometry() {
+	if (!_restrictedLabel) {
+		return;
+	}
+
+	auto labelWidth = width() - st::stickerPanPadding * 2;
+	_restrictedLabel->resizeToWidth(labelWidth);
+	_restrictedLabel->moveToLeft(
+		(width() - _restrictedLabel->width()) / 2,
+		st::stickerPanPadding);
+}
+
 bool Inner::isRestrictedView() {
 	checkRestrictedPeer();
 	return (_restrictedLabel != nullptr);
@@ -178,6 +207,10 @@ rpl::producer<> Inner::inlineRowsCleared() const {
 
 Inner::~Inner() = default;
 
+void Inner::resizeEvent(QResizeEvent *e) {
+	updateRestrictedLabelGeometry();
+}
+
 void Inner::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 	QRect r = e ? e->rect() : rect();
@@ -298,7 +331,7 @@ void Inner::selectInlineResult(
 	if (const auto inlineResult = item->getResult()) {
 		if (inlineResult->onChoose(item)) {
 			_resultSelectedCallback({
-				.result = inlineResult,
+				.result = std::move(inlineResult),
 				.bot = _inlineBot,
 				.options = std::move(options),
 				.messageSendingFrom = messageSendingFrom(),
@@ -415,11 +448,16 @@ void Inner::clearInlineRows(bool resultsDeleted) {
 	_mosaic.clearRows(resultsDeleted);
 }
 
-ItemBase *Inner::layoutPrepareInlineResult(Result *result) {
-	auto it = _inlineLayouts.find(result);
+ItemBase *Inner::layoutPrepareInlineResult(std::shared_ptr<Result> result) {
+	const auto raw = result.get();
+	auto it = _inlineLayouts.find(raw);
 	if (it == _inlineLayouts.cend()) {
-		if (auto layout = ItemBase::createLayout(this, result, _inlineWithThumb)) {
-			it = _inlineLayouts.emplace(result, std::move(layout)).first;
+		if (auto layout = ItemBase::createLayout(
+				this,
+				std::move(result),
+				_inlineWithThumb,
+				_gallery)) {
+			it = _inlineLayouts.emplace(raw, std::move(layout)).first;
 			it->second->initDimensions();
 		} else {
 			return nullptr;
@@ -476,7 +514,6 @@ void Inner::refreshSwitchPmButton(const CacheEntry *entry) {
 		if (!_switchPmButton) {
 			_switchPmButton.create(this, nullptr, st::switchPmButton);
 			_switchPmButton->show();
-			_switchPmButton->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 			_switchPmButton->addClickHandler([=] { switchPm(); });
 		}
 		_switchPmButton->setText(rpl::single(entry->switchPmText));
@@ -519,6 +556,8 @@ int Inner::refreshInlineRows(PeerData *queryPeer, UserData *bot, const CacheEntr
 
 	Assert(_inlineBot != 0);
 
+	_gallery = entry->gallery;
+
 	const auto count = int(entry->results.size());
 	const auto from = validateExistingInlineRows(entry->results);
 	auto added = 0;
@@ -527,8 +566,8 @@ int Inner::refreshInlineRows(PeerData *queryPeer, UserData *bot, const CacheEntr
 		const auto resultItems = entry->results | ranges::views::slice(
 			from,
 			count
-		) | ranges::views::transform([&](const std::unique_ptr<Result> &r) {
-			return layoutPrepareInlineResult(r.get());
+		) | ranges::views::transform([&](const std::shared_ptr<Result> &r) {
+			return layoutPrepareInlineResult(r);
 		}) | ranges::views::filter([](const ItemBase *item) {
 			return item != nullptr;
 		}) | ranges::to<std::vector<not_null<ItemBase*>>>;
@@ -552,7 +591,7 @@ int Inner::validateExistingInlineRows(const Results &results) {
 	const auto until = _mosaic.validateExistingRows([&](
 			not_null<const ItemBase*> item,
 			int untilIndex) {
-		return item->getResult() != results[untilIndex].get();
+		return item->getResult().get() != results[untilIndex].get();
 	}, results.size());
 
 	if (_mosaic.empty()) {
@@ -700,7 +739,7 @@ void Inner::switchPm() {
 	} else {
 		_inlineBot->botInfo->startToken = _switchPmStartToken;
 		_inlineBot->botInfo->inlineReturnTo
-			= _controller->currentDialogsEntryState();
+			= _controller->dialogsEntryStateCurrent();
 		_controller->showPeerHistory(
 			_inlineBot,
 			Window::SectionShow::Way::ClearStack,
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.h b/Telegram/SourceFiles/inline_bots/inline_results_inner.h
index 4e6195e19749a9..fd3dab2df3f4bd 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_inner.h
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.h
@@ -50,7 +50,7 @@ namespace InlineBots {
 namespace Layout {
 
 class ItemBase;
-using Results = std::vector<std::unique_ptr<Result>>;
+using Results = std::vector<std::shared_ptr<Result>>;
 
 struct CacheEntry {
 	QString nextOffset;
@@ -58,6 +58,7 @@ struct CacheEntry {
 	QString switchPmStartToken;
 	QByteArray switchPmUrl;
 	Results results;
+	bool gallery = false;
 };
 
 class Inner
@@ -108,6 +109,7 @@ class Inner
 	void mousePressEvent(QMouseEvent *e) override;
 	void mouseReleaseEvent(QMouseEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
 	void leaveEventHook(QEvent *e) override;
 	void leaveToChildEvent(QEvent *e, QWidget *child) override;
@@ -134,8 +136,9 @@ class Inner
 	void updateInlineItems();
 	void repaintItems(crl::time now = 0);
 	void clearInlineRows(bool resultsDeleted);
-	ItemBase *layoutPrepareInlineResult(Result *result);
+	ItemBase *layoutPrepareInlineResult(std::shared_ptr<Result> result);
 
+	void updateRestrictedLabelGeometry();
 	void deleteUnusedInlineLayouts();
 
 	int validateExistingInlineRows(const Results &results);
@@ -156,12 +159,14 @@ class Inner
 	crl::time _lastUpdatedAt = 0;
 	base::Timer _updateInlineItems;
 	bool _inlineWithThumb = false;
+	bool _gallery = false;
 
 	object_ptr<Ui::RoundButton> _switchPmButton = { nullptr };
 	QString _switchPmStartToken;
 	QByteArray _switchPmUrl;
 
 	object_ptr<Ui::FlatLabel> _restrictedLabel = { nullptr };
+	QString _restrictedLabelKey;
 
 	base::unique_qptr<Ui::PopupMenu> _menu;
 
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
index b0dd0e5b72b6cd..62372aad0c55cc 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
@@ -36,6 +36,7 @@ Widget::Widget(
 , _api(&_controller->session().mtp())
 , _contentMaxHeight(st::emojiPanMaxHeight)
 , _contentHeight(_contentMaxHeight)
+, _shadow(st::emojiPanAnimation.shadow)
 , _scroll(this, st::inlineBotsScroll)
 , _innerRounding(Ui::PrepareCornerPixmaps(
 	ImageRoundRadius::Small,
@@ -53,18 +54,18 @@ Widget::Widget(
 	_inner->moveToLeft(0, 0, _scroll->width());
 
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		onScroll();
 	}, lifetime());
 
 	_inner->inlineRowsCleared(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideAnimated();
 		_inner->clearInlineRowsPanel();
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_innerRounding = Ui::PrepareCornerPixmaps(
 			ImageRoundRadius::Small,
 			st::emojiPanBg);
@@ -73,14 +74,14 @@ Widget::Widget(
 	macWindowDeactivateEvents(
 	) | rpl::filter([=] {
 		return !isHidden();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		leaveEvent(nullptr);
 	}, lifetime());
 
 	// Inner widget has OpaquePaintEvent attribute so it doesn't repaint on scroll.
 	// But we should force it to repaint so that GIFs will continue to animate without update() calls.
 	// We do that by creating a transparent widget above our _inner.
-	auto forceRepaintOnScroll = object_ptr<TWidget>(this);
+	auto forceRepaintOnScroll = object_ptr<RpWidget>(this);
 	forceRepaintOnScroll->setGeometry(innerRect().x() + st::roundRadiusSmall, innerRect().y() + st::roundRadiusSmall, st::roundRadiusSmall, st::roundRadiusSmall);
 	forceRepaintOnScroll->setAttribute(Qt::WA_TransparentForMouseEvents);
 	forceRepaintOnScroll->show();
@@ -154,7 +155,7 @@ void Widget::paintEvent(QPaintEvent *e) {
 		hideFinished();
 	} else {
 		if (!_cache.isNull()) _cache = QPixmap();
-		if (!_inPanelGrab) Ui::Shadow::paint(p, innerRect(), width(), st::emojiPanAnimation.shadow);
+		if (!_inPanelGrab) _shadow.paint(p, innerRect(), st::roundRadiusSmall);
 		paintContent(p);
 	}
 }
@@ -241,7 +242,8 @@ void Widget::startShowAnimation() {
 			std::move(image),
 			QRect(
 				inner.topLeft() * style::DevicePixelRatio(),
-				inner.size() * style::DevicePixelRatio()));
+				inner.size() * style::DevicePixelRatio()),
+			st::emojiPanRadius);
 		_showAnimation->setCornerMasks(Images::CornersMask(ImageRoundRadius::Small));
 		_showAnimation->start();
 	}
@@ -395,6 +397,7 @@ void Widget::inlineResultsDone(const MTPmessages_BotResults &result) {
 			entry->switchPmStartToken = QString();
 			entry->switchPmUrl = switchWebView->data().vurl().v;
 		}
+		entry->gallery = d.is_gallery();
 
 		if (const auto count = v.size()) {
 			entry->results.reserve(entry->results.size() + count);
@@ -465,8 +468,8 @@ void Widget::onInlineRequest() {
 	_requesting.fire(true);
 	_inlineRequestId = _api.request(MTPmessages_GetInlineBotResults(
 		MTP_flags(0),
-		_inlineBot->inputUser,
-		_inlineQueryPeer->input,
+		_inlineBot->inputUser(),
+		_inlineQueryPeer->input(),
 		MTPInputGeoPoint(),
 		MTP_string(_inlineQuery),
 		MTP_string(nextOffset)
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.h b/Telegram/SourceFiles/inline_bots/inline_results_widget.h
index 166287c583be76..eb191a5361675f 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.h
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.h
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/tooltip.h"
 #include "ui/effects/animations.h"
 #include "ui/effects/panel_animation.h"
+#include "ui/widgets/shadow.h"
 #include "base/timer.h"
 #include "mtproto/sender.h"
 #include "inline_bots/inline_bot_layout_item.h"
@@ -140,6 +141,7 @@ class Widget : public Ui::RpWidget {
 	QPixmap _cache;
 	Ui::Animations::Simple _a_opacity;
 	bool _inPanelGrab = false;
+	Ui::BoxShadow _shadow;
 
 	object_ptr<Ui::ScrollArea> _scroll;
 	QPointer<Inner> _inner;
diff --git a/Telegram/SourceFiles/intro/intro.style b/Telegram/SourceFiles/intro/intro.style
index a6b8a7a4cabd2e..959f453dd67ee6 100644
--- a/Telegram/SourceFiles/intro/intro.style
+++ b/Telegram/SourceFiles/intro/intro.style
@@ -113,7 +113,6 @@ introPhone: InputField(introCountry) {
 	width: 225px;
 }
 introQrLoginLinkTop: 368px;
-introCode: introCountry;
 introName: introCountry;
 introPassword: introCountry;
 introPasswordTop: 74px;
@@ -165,9 +164,7 @@ introBackButton: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(8px, 8px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 
 introQrTop: -18px;
diff --git a/Telegram/SourceFiles/intro/intro_code.cpp b/Telegram/SourceFiles/intro/intro_code.cpp
index e48e8bb59e698a..cae53b1ed254ba 100644
--- a/Telegram/SourceFiles/intro/intro_code.cpp
+++ b/Telegram/SourceFiles/intro/intro_code.cpp
@@ -40,7 +40,7 @@ CodeWidget::CodeWidget(
 , _callLabel(this, st::introDescription)
 , _checkRequestTimer([=] { checkRequest(); }) {
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
@@ -62,7 +62,7 @@ CodeWidget::CodeWidget(
 	});
 
 	_code->codeCollected(
-	) | rpl::start_with_next([=](const QString &code) {
+	) | rpl::on_next([=](const QString &code) {
 		hideError();
 		submitCode(code);
 	}, lifetime());
@@ -84,16 +84,22 @@ void CodeWidget::updateDescText() {
 	const auto byTelegram = getData()->codeByTelegram;
 	const auto isFragment = !getData()->codeByFragmentUrl.isEmpty();
 	_isFragment = isFragment;
-	setDescriptionText(
-		isFragment
-			? tr::lng_intro_fragment_about(
-				lt_phone_number,
-				rpl::single(TextWithEntities{
-					.text = Ui::FormatPhone(getData()->phone)
-				}),
-				Ui::Text::RichLangValue)
-			: (byTelegram ? tr::lng_code_from_telegram : tr::lng_code_desc)(
-				Ui::Text::RichLangValue));
+	const auto emailPattern = !getData()->emailPatternSetup.isEmpty()
+		? getData()->emailPatternSetup
+		: getData()->emailPatternLogin;
+	setDescriptionText(!emailPattern.isEmpty()
+		? tr::lng_intro_email_confirm_subtitle(
+			lt_email,
+			rpl::single(Ui::Text::WrapEmailPattern(emailPattern)),
+			tr::marked)
+		: isFragment
+		? tr::lng_intro_fragment_about(
+			lt_phone_number,
+			rpl::single(
+				TextWithEntities::Simple(Ui::FormatPhone(getData()->phone))),
+			tr::rich)
+		: (byTelegram ? tr::lng_code_from_telegram : tr::lng_code_desc)(
+			tr::rich));
 	if (getData()->codeByTelegram) {
 		_noTelegramCode->show();
 		_callTimer.cancel();
@@ -150,7 +156,9 @@ void CodeWidget::resizeEvent(QResizeEvent *e) {
 }
 
 void CodeWidget::updateControlsGeometry() {
-	_code->moveToLeft(contentLeft(), contentTop() + st::introStepFieldTop);
+	_code->moveToLeft(
+		contentLeft() - st::shakeShift - st::lineWidth,
+		contentTop() + st::introStepFieldTop + st::introPhoneTop * 3);
 	auto linkTop = _code->y() + _code->height() + st::introLinkTop;
 	_noTelegramCode->moveToLeft(contentLeft() + st::buttonRadius, linkTop);
 	_callLabel->moveToLeft(contentLeft() + st::buttonRadius, linkTop);
@@ -224,6 +232,37 @@ void CodeWidget::codeSubmitDone(const MTPauth_Authorization &result) {
 	finish(result);
 }
 
+void CodeWidget::emailVerifyDone(const MTPaccount_EmailVerified &result) {
+	stopCheck();
+	_sentRequest = 0;
+
+	result.match([&](const MTPDaccount_emailVerified &data) {
+		_code->setEnabled(true);
+		showCodeError(rpl::single(
+			u"Unexpected type of response: emailVerifiedLogin"_q));
+	}, [&](const MTPDaccount_emailVerifiedLogin &data) {
+		getData()->emailPatternSetup.clear();
+		data.vsent_code().match([&](const MTPDauth_sentCode &sentData) {
+			fillSentCodeData(sentData);
+			getData()->phoneHash = qba(sentData.vphone_code_hash());
+			const auto next = sentData.vnext_type();
+			if (next && next->type() == mtpc_auth_codeTypeCall) {
+				getData()->callStatus = CallStatus::Waiting;
+				getData()->callTimeout = sentData.vtimeout().value_or(60);
+			} else {
+				getData()->callStatus = CallStatus::Disabled;
+				getData()->callTimeout = 0;
+			}
+			goReplace<CodeWidget>(Animate::Forward);
+		}, [&](const MTPDauth_sentCodeSuccess &sentData) {
+			finish(sentData.vauthorization());
+		}, [](const MTPDauth_sentCodePaymentRequired &) {
+			LOG(("API Error: Unexpected auth.sentCodePaymentRequired "
+				"(CodeWidget::emailVerifyDone)."));
+		});
+	});
+}
+
 void CodeWidget::codeSubmitFail(const MTP::Error &error) {
 	if (MTP::IsFloodError(error)) {
 		stopCheck();
@@ -253,10 +292,8 @@ void CodeWidget::codeSubmitFail(const MTP::Error &error) {
 		}).fail([=](const MTP::Error &error) {
 			codeSubmitFail(error);
 		}).handleFloodErrors().send();
-	} else if (Logs::DebugEnabled()) { // internal server error
-		showCodeError(rpl::single(err + ": " + error.description()));
-	} else {
-		showCodeError(rpl::single(Lang::Hard::ServerError()));
+	} else if (!MTP::IgnoreError(error)) {
+	    showCodeError(rpl::single(err));
 	}
 }
 
@@ -293,6 +330,9 @@ void CodeWidget::callDone(const MTPauth_SentCode &result) {
 		}
 	}, [&](const MTPDauth_sentCodeSuccess &data) {
 		finish(data.vauthorization());
+	}, [](const MTPDauth_sentCodePaymentRequired &) {
+		LOG(("API Error: Unexpected auth.sentCodePaymentRequired "
+			"(CodeWidget::callDone)."));
 	});
 }
 
@@ -344,17 +384,39 @@ void CodeWidget::submitCode(const QString &text) {
 	_sentCode = text;
 	_code->setEnabled(false);
 	getData()->pwdState = Core::CloudPasswordState();
-	_sentRequest = api().request(MTPauth_SignIn(
-		MTP_flags(MTPauth_SignIn::Flag::f_phone_code),
-		MTP_string(getData()->phone),
-		MTP_bytes(getData()->phoneHash),
-		MTP_string(_sentCode),
-		MTPEmailVerification()
-	)).done([=](const MTPauth_Authorization &result) {
-		codeSubmitDone(result);
-	}).fail([=](const MTP::Error &error) {
-		codeSubmitFail(error);
-	}).handleFloodErrors().send();
+
+	if (isEmailVerification()) {
+		_sentRequest = api().request(MTPaccount_VerifyEmail(
+			MTP_emailVerifyPurposeLoginSetup(
+				MTP_string(getData()->phone),
+				MTP_bytes(getData()->phoneHash)),
+			MTP_emailVerificationCode(MTP_string(_sentCode))
+		)).done([=](const MTPaccount_EmailVerified &result) {
+			emailVerifyDone(result);
+		}).fail([=](const MTP::Error &error) {
+			codeSubmitFail(error);
+		}).handleFloodErrors().send();
+	} else {
+		const auto isEmailLogin = !getData()->emailPatternLogin.isEmpty();
+		_sentRequest = api().request(MTPauth_SignIn(
+			MTP_flags(isEmailLogin
+				? MTPauth_SignIn::Flag::f_email_verification
+				: MTPauth_SignIn::Flag::f_phone_code),
+			MTP_string(getData()->phone),
+			MTP_bytes(getData()->phoneHash),
+			MTP_string(_sentCode),
+			MTP_emailVerificationCode(
+				MTP_string(isEmailLogin ? _sentCode : QString()))
+		)).done([=](const MTPauth_Authorization &result) {
+			codeSubmitDone(result);
+		}).fail([=](const MTP::Error &error) {
+			codeSubmitFail(error);
+		}).handleFloodErrors().send();
+	}
+}
+
+bool CodeWidget::isEmailVerification() const {
+	return !getData()->emailPatternSetup.isEmpty();
 }
 
 rpl::producer<QString> CodeWidget::nextButtonText() const {
@@ -408,24 +470,19 @@ void CodeWidget::noTelegramCodeDone(const MTPauth_SentCode &result) {
 		updateDescText();
 	}, [&](const MTPDauth_sentCodeSuccess &data) {
 		finish(data.vauthorization());
+	}, [](const MTPDauth_sentCodePaymentRequired &) {
+		LOG(("API Error: Unexpected auth.sentCodePaymentRequired "
+			"(CodeWidget::noTelegramCodeDone)."));
 	});
 }
 
 void CodeWidget::noTelegramCodeFail(const MTP::Error &error) {
+	_noTelegramCodeRequestId = 0;
 	if (MTP::IsFloodError(error)) {
-		_noTelegramCodeRequestId = 0;
 		showCodeError(tr::lng_flood_error());
-		return;
-	} else if (error.type() == u"SEND_CODE_UNAVAILABLE"_q) {
-		_noTelegramCodeRequestId = 0;
-		return;
-	}
-
-	_noTelegramCodeRequestId = 0;
-	if (Logs::DebugEnabled()) { // internal server error
-		showCodeError(rpl::single(error.type() + ": " + error.description()));
-	} else {
-		showCodeError(rpl::single(Lang::Hard::ServerError()));
+	} else if (error.type() != u"SEND_CODE_UNAVAILABLE"_q
+	    && !MTP::IgnoreError(error)) {
+		showCodeError(rpl::single(error.type()));
 	}
 }
 
diff --git a/Telegram/SourceFiles/intro/intro_code.h b/Telegram/SourceFiles/intro/intro_code.h
index 53a94b50dcaaf2..1c41da90089145 100644
--- a/Telegram/SourceFiles/intro/intro_code.h
+++ b/Telegram/SourceFiles/intro/intro_code.h
@@ -54,12 +54,15 @@ class CodeWidget final : public Step {
 
 	int errorTop() const override;
 
+	[[nodiscard]] bool isEmailVerification() const;
+
 	void updateCallText();
 	void refreshLang();
 	void updateControlsGeometry();
 
 	void codeSubmitDone(const MTPauth_Authorization &result);
 	void codeSubmitFail(const MTP::Error &error);
+	void emailVerifyDone(const MTPaccount_EmailVerified &result);
 
 	void showCodeError(rpl::producer<QString> text);
 	void callDone(const MTPauth_SentCode &result);
diff --git a/Telegram/SourceFiles/intro/intro_code_input.cpp b/Telegram/SourceFiles/intro/intro_code_input.cpp
index a3964d3cf7bae8..97186f35047400 100644
--- a/Telegram/SourceFiles/intro/intro_code_input.cpp
+++ b/Telegram/SourceFiles/intro/intro_code_input.cpp
@@ -69,6 +69,7 @@ class CodeDigit final : public Ui::AbstractButton {
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
 
 private:
 	Shaker _shaker;
@@ -157,9 +158,23 @@ void CodeDigit::paintEvent(QPaintEvent *e) {
 	p.drawText(rect(), QString::number(_viewDigit), style::al_center);
 }
 
+void CodeDigit::mouseReleaseEvent(QMouseEvent *e) {
+	QGuiApplication::inputMethod()->show();
+	Ui::AbstractButton::mouseReleaseEvent(e);
+}
+
 CodeInput::CodeInput(QWidget *parent)
 : Ui::RpWidget(parent) {
 	setFocusPolicy(Qt::StrongFocus);
+	setAttribute(Qt::WA_InputMethodEnabled);
+}
+
+QString CodeInput::accessibilityName() {
+	return tr::lng_code_ph(tr::now);
+}
+
+QString CodeInput::accessibilityValue() const {
+	return collectDigits();
 }
 
 void CodeInput::setDigitsCountMax(int digitsCount) {
@@ -177,6 +192,7 @@ void CodeInput::setDigitsCountMax(int digitsCount) {
 			+ st::introCodeDigitSkip * (digitsCount - 1)
 			+ padding.right(),
 		st::introCodeDigitHeight);
+	setNaturalWidth(width());
 
 	for (auto i = 0; i < digitsCount; i++) {
 		const auto widget = Ui::CreateChild<CodeDigit>(this);
@@ -251,19 +267,7 @@ void CodeInput::keyPressEvent(QKeyEvent *e) {
 		_currentIndex = Circular(_currentIndex - 1, _digits.size());
 		unfocusAll(_currentIndex);
 	} else if (key >= Qt::Key_0 && key <= Qt::Key_9) {
-		const auto index = int(key - Qt::Key_0);
-		_digits[_currentIndex]->setDigit(index);
-		_currentIndex = Circular(_currentIndex + 1, _digits.size());
-		if (!_currentIndex) {
-			const auto result = collectDigits();
-			if (result.size() == _digitsCountMax) {
-				_codeCollected.fire_copy(result);
-				_currentIndex = _digits.size() - 1;
-			} else {
-				findEmptyAndPerform([&](int i) { _currentIndex = i; });
-			}
-		}
-		unfocusAll(_currentIndex);
+		processDigit(int(key - Qt::Key_0));
 	} else if (key == Qt::Key_Delete) {
 		_digits[_currentIndex]->setDigit(kDigitNone);
 	} else if (key == Qt::Key_Backspace) {
@@ -287,6 +291,10 @@ void CodeInput::keyPressEvent(QKeyEvent *e) {
 	}
 }
 
+void CodeInput::keyReleaseEvent(QKeyEvent *e) {
+	QGuiApplication::inputMethod()->show();
+}
+
 void CodeInput::contextMenuEvent(QContextMenuEvent *e) {
 	if (_menu) {
 		return;
@@ -310,6 +318,7 @@ void CodeInput::insertCodeAndSubmit(const QString &code) {
 		&& _digits[_currentIndex]->digit() != kDigitNone) {
 		requestCode();
 	}
+	accessibilityValueChanged();
 }
 
 QString CodeInput::collectDigits() const {
@@ -340,4 +349,40 @@ void CodeInput::findEmptyAndPerform(const Fn<void(int)> &callback) {
 	}
 }
 
+QVariant CodeInput::inputMethodQuery(Qt::InputMethodQuery query) const {
+	switch (query) {
+	case Qt::ImEnabled:
+		return true;
+	case Qt::ImHints:
+		return int(Qt::ImhDigitsOnly | Qt::ImhNoPredictiveText);
+	default:
+		return RpWidget::inputMethodQuery(query);
+	}
+}
+
+void CodeInput::inputMethodEvent(QInputMethodEvent *e) {
+	const auto text = e->commitString();
+	for (const auto &ch : text) {
+		if (ch.isDigit()) {
+			processDigit(ch.digitValue());
+		}
+	}
+	e->accept();
+}
+
+void CodeInput::processDigit(int digit) {
+	_digits[_currentIndex]->setDigit(digit);
+	_currentIndex = Circular(_currentIndex + 1, _digits.size());
+	if (!_currentIndex) {
+		const auto result = collectDigits();
+		if (result.size() == _digitsCountMax) {
+			_codeCollected.fire_copy(result);
+			_currentIndex = _digits.size() - 1;
+		} else {
+			findEmptyAndPerform([&](int i) { _currentIndex = i; });
+		}
+	}
+	unfocusAll(_currentIndex);
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/intro/intro_code_input.h b/Telegram/SourceFiles/intro/intro_code_input.h
index 9b5094aa8f091a..31fa74348cb019 100644
--- a/Telegram/SourceFiles/intro/intro_code_input.h
+++ b/Telegram/SourceFiles/intro/intro_code_input.h
@@ -18,6 +18,12 @@ class CodeInput final : public Ui::RpWidget {
 public:
 	CodeInput(QWidget *parent);
 
+	QAccessible::Role accessibilityRole() override {
+		return QAccessible::EditableText;
+	}
+	QString accessibilityName() override;
+	QString accessibilityValue() const override;
+
 	void setDigitsCountMax(int digitsCount);
 
 	void setCode(QString code);
@@ -33,7 +39,10 @@ class CodeInput final : public Ui::RpWidget {
 	void focusOutEvent(QFocusEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
 	void keyPressEvent(QKeyEvent *e) override;
+	void keyReleaseEvent(QKeyEvent *e) override;
 	void contextMenuEvent(QContextMenuEvent *e) override;
+	QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;
+	void inputMethodEvent(QInputMethodEvent *e) override;
 
 private:
 	[[nodiscard]] QString collectDigits() const;
@@ -41,6 +50,7 @@ class CodeInput final : public Ui::RpWidget {
 	void insertCodeAndSubmit(const QString &code);
 	void unfocusAll(int except);
 	void findEmptyAndPerform(const Fn<void(int)> &callback);
+	void processDigit(int digit);
 
 	int _digitsCountMax = 0;
 	std::vector<not_null<CodeDigit*>> _digits;
diff --git a/Telegram/SourceFiles/intro/intro_email.cpp b/Telegram/SourceFiles/intro/intro_email.cpp
new file mode 100644
index 00000000000000..6f0c88a8e99139
--- /dev/null
+++ b/Telegram/SourceFiles/intro/intro_email.cpp
@@ -0,0 +1,175 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "intro/intro_email.h"
+
+#include "intro/intro_code.h"
+#include "intro/intro_code_input.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "settings/cloud_password/settings_cloud_password_common.h"
+#include "settings/settings_common.h" // CreateLottieIcon.
+#include "ui/rect.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_intro.h"
+#include "styles/style_settings.h"
+
+namespace Intro {
+namespace details {
+
+EmailWidget::EmailWidget(
+	QWidget *parent,
+	not_null<Main::Account*> account,
+	not_null<Data*> data)
+: Step(parent, account, data)
+, _inner(this) {
+	const auto content = _inner.get();
+	widthValue() | rpl::on_next([=](int w) {
+		content->resizeToWidth(st::introNextButton.width);
+		content->moveToLeft((w - content->width()) / 2, contentTop());
+	}, content->lifetime());
+
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_intro_email_setup_title(),
+			st::introTitle),
+		style::margins(),
+		style::al_left);
+	Ui::AddSkip(content, st::lineWidth * 2);
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_settings_cloud_login_email_about(),
+			st::introDescription),
+		style::margins(),
+		style::al_left);
+
+	{
+		const auto lottie = u"cloud_password/email"_q;
+		const auto size = st::settingsCloudPasswordIconSize / 3 * 2;
+		auto icon = Settings::CreateLottieIcon(
+			content,
+			{ .name = lottie, .sizeOverride = Size(size) },
+			style::margins());
+		content->add(std::move(icon.widget));
+		_showFinished.events(
+		) | rpl::on_next([animate = std::move(icon.animate)] {
+			animate(anim::repeat::once);
+		}, lifetime());
+	}
+
+	const auto newInput = Settings::CloudPassword::AddWrappedField(
+		content,
+		tr::lng_settings_cloud_login_email_placeholder(),
+		QString());
+	Ui::AddSkip(content);
+	const auto error = Settings::CloudPassword::AddError(content, nullptr);
+	newInput->changes() | rpl::on_next([=] {
+		error->hide();
+	}, newInput->lifetime());
+	newInput->submits() | rpl::on_next([=] {
+		submit();
+	}, newInput->lifetime());
+	newInput->setText(getData()->email);
+	if (newInput->hasText()) {
+		newInput->selectAll();
+	}
+	_setFocus.events() | rpl::on_next([=] {
+		newInput->setFocus();
+	}, newInput->lifetime());
+
+	_submitCallback = [=] {
+		const auto send = [=](const QString &email) {
+			getData()->email = email;
+
+			const auto done = [=](int length, const QString &pattern) {
+				_sentRequest = 0;
+				getData()->codeLength = length;
+				getData()->emailPatternSetup = pattern;
+				goNext<CodeWidget>();
+			};
+			const auto fail = [=](const QString &type) {
+				_sentRequest = 0;
+
+				newInput->setFocus();
+				newInput->showError();
+				newInput->selectAll();
+				error->show();
+
+				if (MTP::IsFloodError(type)) {
+					error->setText(tr::lng_flood_error(tr::now));
+				} else if (type == u"EMAIL_NOT_ALLOWED"_q) {
+					error->setText(
+						tr::lng_settings_error_email_not_alowed(tr::now));
+				} else if (type == u"EMAIL_INVALID"_q) {
+					error->setText(tr::lng_cloud_password_bad_email(tr::now));
+				} else if (type == u"EMAIL_HASH_EXPIRED"_q) {
+					// Show box?
+					error->setText(Lang::Hard::EmailConfirmationExpired());
+				} else {
+					error->setText(type);
+				}
+			};
+
+			_sentRequest = api().request(MTPaccount_SendVerifyEmailCode(
+				MTP_emailVerifyPurposeLoginSetup(
+					MTP_string(getData()->phone),
+					MTP_bytes(getData()->phoneHash)),
+				MTP_string(email)
+			)).done([=](const MTPaccount_SentEmailCode &result) {
+				done(
+					result.data().vlength().v,
+					qs(result.data().vemail_pattern()));
+			}).fail([=](const MTP::Error &error) {
+				fail(error.type());
+			}).send();
+		};
+		const auto newText = newInput->getLastText();
+		if (newText.isEmpty()) {
+			newInput->setFocus();
+			newInput->showError();
+		} else {
+			send(newText);
+		}
+	};
+}
+
+void EmailWidget::submit() {
+	if (_submitCallback) {
+		_submitCallback();
+	}
+}
+
+void EmailWidget::setInnerFocus() {
+	_setFocus.fire({});
+}
+
+void EmailWidget::activate() {
+	Step::activate();
+	showChildren();
+	setInnerFocus();
+	_showFinished.fire({});
+}
+
+void EmailWidget::finished() {
+	Step::finished();
+	cancelled();
+}
+
+void EmailWidget::cancelled() {
+	api().request(base::take(_sentRequest)).cancel();
+}
+
+} // namespace details
+} // namespace Intro
diff --git a/Telegram/SourceFiles/intro/intro_email.h b/Telegram/SourceFiles/intro/intro_email.h
new file mode 100644
index 00000000000000..aa21da3ab6cec0
--- /dev/null
+++ b/Telegram/SourceFiles/intro/intro_email.h
@@ -0,0 +1,50 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "intro/intro_step.h"
+
+namespace Ui {
+class VerticalLayout;
+} // namespace Ui
+
+namespace MTP {
+class Sender;
+} // namespace MTP
+
+namespace Intro {
+namespace details {
+
+class EmailWidget final : public Step {
+public:
+	EmailWidget(
+		QWidget *parent,
+		not_null<Main::Account*> account,
+		not_null<Data*> data);
+
+	void setInnerFocus() override;
+	void activate() override;
+	void finished() override;
+	void cancelled() override;
+	void submit() override;
+
+	bool hasBack() const override {
+		return true;
+	}
+
+private:
+	object_ptr<Ui::VerticalLayout> _inner;
+	Fn<void()> _submitCallback = nullptr;
+	rpl::event_stream<> _showFinished;
+	rpl::event_stream<> _setFocus;
+	mtpRequestId _sentRequest = 0;
+
+};
+
+} // namespace details
+} // namespace Intro
diff --git a/Telegram/SourceFiles/intro/intro_password_check.cpp b/Telegram/SourceFiles/intro/intro_password_check.cpp
index cd73d9867facc3..2b98ad896148fd 100644
--- a/Telegram/SourceFiles/intro/intro_password_check.cpp
+++ b/Telegram/SourceFiles/intro/intro_password_check.cpp
@@ -14,6 +14,7 @@ For license and copyright information please follow this link:
 #include "boxes/passcode_box.h"
 #include "lang/lang_keys.h"
 #include "intro/intro_signup.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/fields/password_input.h"
@@ -39,7 +40,7 @@ PasswordCheckWidget::PasswordCheckWidget(
 	Expects(_passwordState.hasPassword);
 
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
@@ -47,7 +48,7 @@ PasswordCheckWidget::PasswordCheckWidget(
 	_toPassword->addClickHandler([=] { toPassword(); });
 	connect(_pwdField, &Ui::PasswordInput::changed, [=] { hideError(); });
 	_codeField->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideError();
 	}, _codeField->lifetime());
 
@@ -155,12 +156,8 @@ void PasswordCheckWidget::pwdSubmitFail(const MTP::Error &error) {
 		goBack();
 	} else if (type == u"SRP_ID_INVALID"_q) {
 		handleSrpIdInvalid();
-	} else {
-		if (Logs::DebugEnabled()) { // internal server error
-			showError(rpl::single(type + ": " + error.description()));
-		} else {
-			showError(rpl::single(Lang::Hard::ServerError()));
-		}
+	} else if (!MTP::IgnoreError(error)) {
+		showError(rpl::single(type));
 		_pwdField->setFocus();
 	}
 }
@@ -229,10 +226,10 @@ void PasswordCheckWidget::codeSubmitDone(
 	fields.mtp.curRequest = {};
 	fields.hasPassword = false;
 	auto box = Box<PasscodeBox>(&api().instance(), nullptr, fields);
-	const auto boxShared = std::make_shared<QPointer<PasscodeBox>>();
+	const auto boxShared = std::make_shared<base::weak_qptr<PasscodeBox>>();
 
 	box->newAuthorization(
-	) | rpl::start_with_next([=](const MTPauth_Authorization &result) {
+	) | rpl::on_next([=](const MTPauth_Authorization &result) {
 		if (boxShared) {
 			(*boxShared)->closeBox();
 		}
@@ -263,12 +260,8 @@ void PasswordCheckWidget::codeSubmitFail(const MTP::Error &error) {
 		showError(tr::lng_signin_wrong_code());
 		_codeField->selectAll();
 		_codeField->showError();
-	} else {
-		if (Logs::DebugEnabled()) { // internal server error
-			showError(rpl::single(type + ": " + error.description()));
-		} else {
-			showError(rpl::single(Lang::Hard::ServerError()));
-		}
+	} else if (!MTP::IgnoreError(error)) {
+		showError(rpl::single(type));
 		_codeField->setFocus();
 	}
 }
@@ -315,7 +308,7 @@ void PasswordCheckWidget::toRecover() {
 		const auto box = Ui::show(
 			Ui::MakeInformBox(tr::lng_signin_no_email_forgot()));
 		box->boxClosing(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			showReset();
 		}, box->lifetime());
 	}
@@ -325,7 +318,7 @@ void PasswordCheckWidget::toPassword() {
 	const auto box = Ui::show(
 		Ui::MakeInformBox(tr::lng_signin_cant_email_forgot()));
 	box->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showReset();
 	}, box->lifetime());
 }
@@ -350,8 +343,11 @@ void PasswordCheckWidget::updateDescriptionText() {
 	auto pwdHidden = _pwdField->isHidden();
 	auto emailPattern = _emailPattern;
 	setDescriptionText(pwdHidden
-		? tr::lng_signin_recover_desc(lt_email, rpl::single(emailPattern))
-		: tr::lng_signin_desc());
+		? tr::lng_signin_recover_desc(
+			lt_email,
+			rpl::single(Ui::Text::WrapEmailPattern(emailPattern)),
+			tr::marked)
+		: tr::lng_signin_desc(tr::marked));
 }
 
 void PasswordCheckWidget::submit() {
diff --git a/Telegram/SourceFiles/intro/intro_phone.cpp b/Telegram/SourceFiles/intro/intro_phone.cpp
index 5e826167426056..ace6c87b83e99d 100644
--- a/Telegram/SourceFiles/intro/intro_phone.cpp
+++ b/Telegram/SourceFiles/intro/intro_phone.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "lang/lang_keys.h"
 #include "intro/intro_code.h"
+#include "intro/intro_email.h"
 #include "intro/intro_qr.h"
 #include "styles/style_intro.h"
 #include "ui/widgets/buttons.h"
@@ -61,32 +62,37 @@ PhoneWidget::PhoneWidget(
 	st::introPhone,
 	[](const QString &s) { return Countries::Groups(s); })
 , _checkRequestTimer([=] { checkRequest(); }) {
+	_code->setAccessibleName(tr::lng_country_code(tr::now));
+	_phone->setAccessibleName(tr::lng_phone_number(tr::now));
 	_phone->frontBackspaceEvent(
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		_code->startErasing(e);
 	}, _code->lifetime());
 
 	_country->codeChanged(
-	) | rpl::start_with_next([=](const QString &code) {
+	) | rpl::on_next([=](const QString &code) {
 		_code->codeSelected(code);
 		_phone->chooseCode(code);
 	}, _country->lifetime());
 	_code->codeChanged(
-	) | rpl::start_with_next([=](const QString &code) {
+	) | rpl::on_next([=](const QString &code) {
 		_country->onChooseCode(code);
 		_phone->chooseCode(code);
 	}, _code->lifetime());
 	_code->addedToNumber(
-	) | rpl::start_with_next([=](const QString &added) {
+	) | rpl::on_next([=](const QString &added) {
 		_phone->addedToNumber(added);
 	}, _phone->lifetime());
+	_code->spacePressed() | rpl::on_next([=] {
+		submit();
+	}, _code->lifetime());
 	connect(_phone, &Ui::PhonePartInput::changed, [=] { phoneChanged(); });
 	connect(_code, &Ui::CountryCodeInput::changed, [=] { phoneChanged(); });
 
 	setTitleText(tr::lng_phone_title());
 	setDescriptionText(tr::lng_phone_desc());
 	getData()->updated.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		countryChanged();
 	}, lifetime());
 	setErrorCentered(true);
@@ -98,6 +104,10 @@ PhoneWidget::PhoneWidget(
 	_changed = false;
 }
 
+QString PhoneWidget::accessibilityName() {
+	return tr::lng_phone_title(tr::now);
+}
+
 void PhoneWidget::setupQrLogin() {
 	const auto qrLogin = Ui::CreateChild<Ui::LinkButton>(
 		this,
@@ -109,7 +119,7 @@ void PhoneWidget::setupQrLogin() {
 	rpl::combine(
 		sizeValue(),
 		qrLogin->widthValue()
-	) | rpl::start_with_next([=](QSize size, int qrLoginWidth) {
+	) | rpl::on_next([=](QSize size, int qrLoginWidth) {
 		qrLogin->moveToLeft(
 			(size.width() - qrLoginWidth) / 2,
 			contentTop() + st::introQrLoginLinkTop);
@@ -234,6 +244,9 @@ void PhoneWidget::phoneSubmitDone(const MTPauth_SentCode &result) {
 		fillSentCodeData(data);
 		getData()->phone = DigitsOnly(_sentPhone);
 		getData()->phoneHash = qba(data.vphone_code_hash());
+		if (getData()->emailStatus == EmailStatus::SetupRequired) {
+			return goNext<EmailWidget>();
+		}
 		const auto next = data.vnext_type();
 		if (next && next->type() == mtpc_auth_codeTypeCall) {
 			getData()->callStatus = CallStatus::Waiting;
@@ -245,6 +258,9 @@ void PhoneWidget::phoneSubmitDone(const MTPauth_SentCode &result) {
 		goNext<CodeWidget>();
 	}, [&](const MTPDauth_sentCodeSuccess &data) {
 		finish(data.vauthorization());
+	}, [](const MTPDauth_sentCodePaymentRequired &) {
+		LOG(("API Error: Unexpected auth.sentCodePaymentRequired "
+			"(PhoneWidget::phoneSubmitDone)."));
 	});
 }
 
@@ -265,10 +281,8 @@ void PhoneWidget::phoneSubmitFail(const MTP::Error &error) {
 		showPhoneError(tr::lng_bad_phone());
 	} else if (err == u"PHONE_NUMBER_BANNED"_q) {
 		Ui::ShowPhoneBannedError(getData()->controller, _sentPhone);
-	} else if (Logs::DebugEnabled()) { // internal server error
-		showPhoneError(rpl::single(err + ": " + error.description()));
-	} else {
-		showPhoneError(rpl::single(Lang::Hard::ServerError()));
+	} else if (!MTP::IgnoreError(error)) {
+		showPhoneError(rpl::single(err));
 	}
 }
 
diff --git a/Telegram/SourceFiles/intro/intro_phone.h b/Telegram/SourceFiles/intro/intro_phone.h
index 3770df59cfda1f..2dc7c37c17d22a 100644
--- a/Telegram/SourceFiles/intro/intro_phone.h
+++ b/Telegram/SourceFiles/intro/intro_phone.h
@@ -28,6 +28,8 @@ class PhoneWidget final : public Step {
 		not_null<Main::Account*> account,
 		not_null<Data*> data);
 
+	QString accessibilityName() override;
+
 	void selectCountry(const QString &country);
 
 	void setInnerFocus() override;
diff --git a/Telegram/SourceFiles/intro/intro_qr.cpp b/Telegram/SourceFiles/intro/intro_qr.cpp
index a76f7539dcb70e..fa5aacf2542877 100644
--- a/Telegram/SourceFiles/intro/intro_qr.cpp
+++ b/Telegram/SourceFiles/intro/intro_qr.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "intro/intro_qr.h"
 
 #include "boxes/abstract_box.h"
+#include "data/components/passkeys.h"
 #include "intro/intro_phone.h"
 #include "intro/intro_widget.h"
 #include "intro/intro_password_check.h"
@@ -20,6 +21,7 @@ For license and copyright information please follow this link:
 #include "ui/text/text_utilities.h"
 #include "ui/image/image_prepare.h"
 #include "ui/painter.h"
+#include "main/main_app_config.h"
 #include "main/main_account.h"
 #include "ui/boxes/confirm_box.h"
 #include "core/application.h"
@@ -27,6 +29,7 @@ For license and copyright information please follow this link:
 #include "core/update_checker.h"
 #include "base/unixtime.h"
 #include "qr/qr_generate.h"
+#include "platform/platform_webauthn.h"
 #include "styles/style_intro.h"
 
 namespace Intro {
@@ -79,7 +82,19 @@ namespace {
 	auto palettes = rpl::single(rpl::empty) | rpl::then(
 		style::PaletteChanged()
 	);
-	auto result = Ui::CreateChild<Ui::RpWidget>(parent.get());
+	class QrWidget final : public Ui::RpWidget {
+	public:
+		using RpWidget::RpWidget;
+
+		QAccessible::Role accessibilityRole() override {
+			return QAccessible::Role::Graphic;
+		}
+		QString accessibilityName() override {
+			return tr::lng_intro_qr_title(tr::now);
+		}
+
+	};
+	auto result = Ui::CreateChild<QrWidget>(parent.get());
 	const auto state = result->lifetime().make_state<State>(
 		[=] { result->update(); });
 	state->waiting.start();
@@ -90,7 +105,7 @@ namespace {
 		rpl::duplicate(palettes)
 	) | rpl::map([](const Qr::Data &code, const auto &) {
 		return TelegramQr(code, st::introQrPixel, st::introQrMaxSize);
-	}) | rpl::start_with_next([=](QImage &&image) {
+	}) | rpl::on_next([=](QImage &&image) {
 		state->previous = std::move(state->qr);
 		state->qr = std::move(image);
 		state->waiting.stop();
@@ -105,11 +120,11 @@ namespace {
 		palettes
 	) | rpl::map([] {
 		return TelegramLogoImage();
-	}) | rpl::start_with_next([=](QImage &&image) {
+	}) | rpl::on_next([=](QImage &&image) {
 		state->center = std::move(image);
 	}, result->lifetime());
 	result->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(result);
 		const auto has = !state->qr.isNull();
 		const auto shown = has ? state->shown.value(1.) : 0.;
@@ -185,16 +200,41 @@ QrWidget::QrWidget(
 	cancelNearestDcRequest();
 
 	account->mtpUpdates(
-	) | rpl::start_with_next([=](const MTPUpdates &updates) {
+	) | rpl::on_next([=](const MTPUpdates &updates) {
 		checkForTokenUpdate(updates);
 	}, lifetime());
 
 	setupControls();
 	account->mtp().mainDcIdValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		api().request(base::take(_requestId)).cancel();
 		refreshCode();
 	}, lifetime());
+
+	account->appConfig().value(
+	) | rpl::filter([=] {
+		return !_passkey;
+	}) | rpl::on_next([=] {
+		setupPasskeyLink();
+	}, lifetime());
+}
+
+QString QrWidget::accessibilityName() {
+	return tr::lng_intro_qr_title(tr::now);
+}
+
+QString QrWidget::accessibilityDescription() {
+	const auto phrases = {
+		tr::lng_intro_qr_step1,
+		tr::lng_intro_qr_step2,
+		tr::lng_intro_qr_step3,
+	};
+	auto result = QString();
+	auto index = 0;
+	for (const auto &phrase : phrases) {
+		result.append(QString::number(++index)).append(". ").append(phrase(tr::now)).append('\n');
+	}
+	return result;
 }
 
 int QrWidget::errorTop() const {
@@ -239,7 +279,7 @@ void QrWidget::setupControls() {
 	rpl::combine(
 		sizeValue(),
 		code->widthValue()
-	) | rpl::start_with_next([=](QSize size, int codeWidth) {
+	) | rpl::on_next([=](QSize size, int codeWidth) {
 		code->moveToLeft(
 			(size.width() - codeWidth) / 2,
 			contentTop() + st::introQrTop);
@@ -252,7 +292,7 @@ void QrWidget::setupControls() {
 	rpl::combine(
 		sizeValue(),
 		title->widthValue()
-	) | rpl::start_with_next([=](QSize size, int titleWidth) {
+	) | rpl::on_next([=](QSize size, int titleWidth) {
 		title->resizeToWidth(st::introQrTitleWidth);
 		const auto oneLine = st::introQrTitle.style.font->height;
 		const auto topDelta = (title->height() - oneLine);
@@ -272,17 +312,17 @@ void QrWidget::setupControls() {
 		const auto label = steps->add(
 			object_ptr<Ui::FlatLabel>(
 				steps,
-				text(Ui::Text::RichLangValue),
+				text(tr::rich),
 				st::introQrStep),
 			st::introQrStepMargins);
 		const auto number = Ui::CreateChild<Ui::FlatLabel>(
 			steps,
-			rpl::single(Ui::Text::Semibold(QString::number(++index) + ".")),
+			rpl::single(tr::semibold(QString::number(++index) + ".")),
 			st::defaultFlatLabel);
 		rpl::combine(
 			number->widthValue(),
 			label->positionValue()
-		) | rpl::start_with_next([=](int width, QPoint position) {
+		) | rpl::on_next([=](int width, QPoint position) {
 			number->moveToLeft(
 				position.x() - width - st::normalFont->spacew,
 				position.y());
@@ -292,25 +332,78 @@ void QrWidget::setupControls() {
 	rpl::combine(
 		sizeValue(),
 		steps->widthValue()
-	) | rpl::start_with_next([=](QSize size, int stepsWidth) {
+	) | rpl::on_next([=](QSize size, int stepsWidth) {
 		steps->moveToLeft(
 			(size.width() - stepsWidth) / 2,
 			contentTop() + st::introQrStepsTop);
 	}, steps->lifetime());
 
-	const auto skip = Ui::CreateChild<Ui::LinkButton>(
+	_skip = Ui::CreateChild<Ui::LinkButton>(
 		this,
-		tr::lng_intro_qr_skip(tr::now));
+		tr::lng_intro_qr_phone(tr::now));
 	rpl::combine(
 		sizeValue(),
-		skip->widthValue()
-	) | rpl::start_with_next([=](QSize size, int skipWidth) {
-		skip->moveToLeft(
+		_skip->widthValue()
+	) | rpl::on_next([=](QSize size, int skipWidth) {
+		_skip->moveToLeft(
 			(size.width() - skipWidth) / 2,
 			contentTop() + st::introQrSkipTop);
-	}, skip->lifetime());
+	}, _skip->lifetime());
 
-	skip->setClickedCallback([=] { submit(); });
+	_skip->setClickedCallback([=] { submit(); });
+}
+
+void QrWidget::setupPasskeyLink() {
+	Expects(!_passkey);
+
+	if (!account().appConfig().settingsDisplayPasskeys()
+		|| !Platform::WebAuthn::IsSupported()) {
+		return;
+	}
+	_passkey = Ui::CreateChild<Ui::LinkButton>(
+		this,
+		tr::lng_intro_qr_passkey(tr::now));
+	_passkey->show();
+	rpl::combine(
+		sizeValue(),
+		_passkey->widthValue()
+	) | rpl::on_next([=](QSize size, int passkeyWidth) {
+		_passkey->moveToLeft(
+			(size.width() - passkeyWidth) / 2,
+			(contentTop()
+				+ st::introQrSkipTop
+				+ 1.5 * st::normalFont->height));
+	}, _passkey->lifetime());
+
+	_passkey->setClickedCallback([=] {
+		const auto initialDc = api().instance().mainDcId();
+		::Data::InitPasskeyLogin(api(), [=](
+			const ::Data::Passkey::LoginData &loginData) {
+			Platform::WebAuthn::Login(loginData, [=](
+					Platform::WebAuthn::LoginResult result) {
+				if (result.userHandle.isEmpty()) {
+					using Error = Platform::WebAuthn::Error;
+					if (result.error == Error::UnsignedBuild) {
+						showError(
+							tr::lng_settings_passkeys_unsigned_error());
+					}
+					return;
+				}
+				::Data::FinishPasskeyLogin(
+					api(),
+					initialDc,
+					result,
+					[=](const MTPauth_Authorization &auth) { done(auth); },
+					[=](QString error) {
+						if (error == u"SESSION_PASSWORD_NEEDED"_q) {
+							sendCheckPasswordRequest();
+						} else {
+							showError(rpl::single(error));
+						}
+					});
+			});
+		});
+	});
 }
 
 void QrWidget::refreshCode() {
@@ -410,6 +503,10 @@ void QrWidget::sendCheckPasswordRequest() {
 void QrWidget::activate() {
 	Step::activate();
 	showChildren();
+
+	if (_skip) {
+		_skip->setFocus(Qt::OtherFocusReason);
+	}
 }
 
 void QrWidget::finished() {
diff --git a/Telegram/SourceFiles/intro/intro_qr.h b/Telegram/SourceFiles/intro/intro_qr.h
index 7cc166a4bc18a6..ec9ea3e9f6f796 100644
--- a/Telegram/SourceFiles/intro/intro_qr.h
+++ b/Telegram/SourceFiles/intro/intro_qr.h
@@ -11,6 +11,10 @@ For license and copyright information please follow this link:
 #include "intro/intro_step.h"
 #include "base/timer.h"
 
+namespace Ui {
+class LinkButton;
+} // namespace Ui
+
 namespace Intro {
 namespace details {
 
@@ -21,6 +25,9 @@ class QrWidget final : public Step {
 		not_null<Main::Account*> account,
 		not_null<Data*> data);
 
+	QString accessibilityName() override;
+	QString accessibilityDescription() override;
+
 	void activate() override;
 	void finished() override;
 	void cancelled() override;
@@ -36,6 +43,7 @@ class QrWidget final : public Step {
 
 	void sendCheckPasswordRequest();
 	void setupControls();
+	void setupPasskeyLink();
 	void refreshCode();
 	void checkForTokenUpdate(const MTPUpdates &updates);
 	void checkForTokenUpdate(const MTPUpdate &update);
@@ -46,6 +54,8 @@ class QrWidget final : public Step {
 	void done(const MTPauth_Authorization &authorization);
 
 	rpl::event_stream<QByteArray> _qrCodes;
+	Ui::LinkButton *_skip = nullptr;
+	Ui::LinkButton *_passkey = nullptr;
 	base::Timer _refreshTimer;
 	mtpRequestId _requestId = 0;
 	bool _forceRefresh = false;
diff --git a/Telegram/SourceFiles/intro/intro_signup.cpp b/Telegram/SourceFiles/intro/intro_signup.cpp
index 32831ea47efe9e..96335c963f3278 100644
--- a/Telegram/SourceFiles/intro/intro_signup.cpp
+++ b/Telegram/SourceFiles/intro/intro_signup.cpp
@@ -38,7 +38,7 @@ SignupWidget::SignupWidget(
 	_photo->showCustomOnChosen();
 
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
@@ -141,12 +141,8 @@ void SignupWidget::nameSubmitFail(const MTP::Error &error) {
 	} else if (err == "LASTNAME_INVALID") {
 		showError(tr::lng_bad_name());
 		_last->setFocus();
-	} else {
-		if (Logs::DebugEnabled()) { // internal server error
-			showError(rpl::single(err + ": " + error.description()));
-		} else {
-			showError(rpl::single(Lang::Hard::ServerError()));
-		}
+	} else if (!MTP::IgnoreError(error)) {
+		showError(rpl::single(err));
 		if (_invertOrder) {
 			_last->setFocus();
 		} else {
diff --git a/Telegram/SourceFiles/intro/intro_start.cpp b/Telegram/SourceFiles/intro/intro_start.cpp
index d4ebdec0b77aa8..d1b835a09a28ed 100644
--- a/Telegram/SourceFiles/intro/intro_start.cpp
+++ b/Telegram/SourceFiles/intro/intro_start.cpp
@@ -38,5 +38,18 @@ rpl::producer<QString> StartWidget::nextButtonText() const {
 	return tr::lng_start_msgs();
 }
 
+rpl::producer<> StartWidget::nextButtonFocusRequests() const {
+	return _nextButtonFocusRequests.events();
+}
+
+void StartWidget::activate() {
+	Step::activate();
+	setInnerFocus();
+}
+
+void StartWidget::setInnerFocus() {
+	_nextButtonFocusRequests.fire({});
+}
+
 } // namespace details
 } // namespace Intro
diff --git a/Telegram/SourceFiles/intro/intro_start.h b/Telegram/SourceFiles/intro/intro_start.h
index 4b3f072cd1137c..7a3fa1efeec313 100644
--- a/Telegram/SourceFiles/intro/intro_start.h
+++ b/Telegram/SourceFiles/intro/intro_start.h
@@ -27,6 +27,12 @@ class StartWidget : public Step {
 
 	void submit() override;
 	rpl::producer<QString> nextButtonText() const override;
+	rpl::producer<> nextButtonFocusRequests() const override;
+	void activate() override;
+	void setInnerFocus() override;
+
+private:
+	rpl::event_stream<> _nextButtonFocusRequests;
 
 };
 
diff --git a/Telegram/SourceFiles/intro/intro_step.cpp b/Telegram/SourceFiles/intro/intro_step.cpp
index 9e9a266f695961..3f4d8936b873d3 100644
--- a/Telegram/SourceFiles/intro/intro_step.cpp
+++ b/Telegram/SourceFiles/intro/intro_step.cpp
@@ -79,7 +79,7 @@ Step::Step(
 			: st::introDescription)) {
 	hide();
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_coverMask.isNull()) {
 			_coverMask = QPixmap();
 			prepareCoverMask();
@@ -87,19 +87,27 @@ Step::Step(
 	}, lifetime());
 
 	_errorText.value(
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		refreshError(text);
 	}, lifetime());
 
 	_titleText.value(
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		_title->setText(text);
+		accessibilityNameChanged();
 		updateLabelsPosition();
 	}, lifetime());
 
 	_descriptionText.value(
-	) | rpl::start_with_next([=](const TextWithEntities &text) {
-		_description->entity()->setMarkedText(text);
+	) | rpl::on_next([=](const TextWithEntities &text) {
+		const auto label = _description->entity();
+		const auto hasSpoiler = ranges::contains(
+			text.entities,
+			EntityType::Spoiler,
+			&EntityInText::type);
+		label->setMarkedText(text);
+		label->setAttribute(Qt::WA_TransparentForMouseEvents, hasSpoiler);
+		accessibilityDescriptionChanged();
 		updateLabelsPosition();
 	}, lifetime());
 }
@@ -125,6 +133,10 @@ rpl::producer<const style::RoundButton*> Step::nextButtonStyle() const {
 	return rpl::single((const style::RoundButton*)(nullptr));
 }
 
+rpl::producer<> Step::nextButtonFocusRequests() const {
+	return rpl::never();
+}
+
 void Step::goBack() {
 	if (_goCallback) {
 		_goCallback(nullptr, StackAction::Back, Animate::Back);
@@ -194,16 +206,18 @@ void Step::finish(const MTPUser &user, QImage &&photo) {
 
 	api().request(MTPmessages_GetDialogFilters(
 	)).done([=](const MTPmessages_DialogFilters &result) {
-		createSession(user, photo, result.data().vfilters().v);
+		const auto &d = result.data();
+		createSession(user, photo, d.vfilters().v, d.is_tags_enabled());
 	}).fail([=] {
-		createSession(user, photo, QVector<MTPDialogFilter>());
+		createSession(user, photo, QVector<MTPDialogFilter>(), false);
 	}).send();
 }
 
 void Step::createSession(
 		const MTPUser &user,
 		QImage photo,
-		const QVector<MTPDialogFilter> &filters) {
+		const QVector<MTPDialogFilter> &filters,
+		bool tagsEnabled) {
 	// Save the default language if we've suggested some other and user ignored it.
 	const auto currentId = Lang::Id();
 	const auto defaultId = Lang::DefaultLanguageId();
@@ -227,7 +241,7 @@ void Step::createSession(
 	account->local().enforceModernStorageIdBots();
 	account->local().writeMtpData();
 	auto &session = account->session();
-	session.data().chatsFilters().setPreloaded(filters);
+	session.data().chatsFilters().setPreloaded(filters, tagsEnabled);
 	if (hasFilters) {
 		session.saveSettingsDelayed();
 	}
@@ -280,15 +294,8 @@ void Step::setTitleText(rpl::producer<QString> titleText) {
 	_titleText = std::move(titleText);
 }
 
-void Step::setDescriptionText(
-		rpl::producer<QString> descriptionText) {
-	setDescriptionText(
-		std::move(descriptionText) | Ui::Text::ToWithEntities());
-}
-
-void Step::setDescriptionText(
-		rpl::producer<TextWithEntities> richDescriptionText) {
-	_descriptionText = std::move(richDescriptionText);
+void Step::setDescriptionText(v::text::data &&descriptionText) {
+	_descriptionText = v::text::take_marked(std::move(descriptionText));
 }
 
 void Step::showFinished() {
@@ -367,14 +374,15 @@ void Step::fillSentCodeData(const MTPDauth_sentCode &data) {
 		bad("MissedCall");
 	}, [&](const MTPDauth_sentCodeTypeFirebaseSms &) {
 		bad("FirebaseSms");
-	}, [&](const MTPDauth_sentCodeTypeEmailCode &) {
-		bad("EmailCode");
+	}, [&](const MTPDauth_sentCodeTypeEmailCode &data) {
+		getData()->emailPatternLogin = qs(data.vemail_pattern());
+		getData()->codeLength = data.vlength().v;
 	}, [&](const MTPDauth_sentCodeTypeSmsWord &) {
 		bad("SmsWord");
 	}, [&](const MTPDauth_sentCodeTypeSmsPhrase &) {
 		bad("SmsPhrase");
 	}, [&](const MTPDauth_sentCodeTypeSetUpEmailRequired &) {
-		bad("SetUpEmailRequired");
+		getData()->emailStatus = EmailStatus::SetupRequired;
 	});
 }
 
diff --git a/Telegram/SourceFiles/intro/intro_step.h b/Telegram/SourceFiles/intro/intro_step.h
index 660e2c367e899d..e71f570a716bfb 100644
--- a/Telegram/SourceFiles/intro/intro_step.h
+++ b/Telegram/SourceFiles/intro/intro_step.h
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "base/object_ptr.h"
 #include "mtproto/sender.h"
+#include "ui/text/text_variant.h"
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
 
@@ -44,6 +45,16 @@ class Step : public Ui::RpWidget {
 		bool hasCover = false);
 	~Step();
 
+	QAccessible::Role accessibilityRole() override {
+		return QAccessible::Role::Dialog;
+	}
+	QString accessibilityName() override {
+		return _titleText.current();
+	}
+	QString accessibilityDescription() override {
+		return _descriptionText.current().text;
+	}
+
 	[[nodiscard]] Main::Account &account() const {
 		return *_account;
 	}
@@ -83,6 +94,7 @@ class Step : public Ui::RpWidget {
 	[[nodiscard]] virtual rpl::producer<QString> nextButtonText() const;
 	[[nodiscard]] virtual auto nextButtonStyle() const
 		-> rpl::producer<const style::RoundButton*>;
+	[[nodiscard]] virtual rpl::producer<> nextButtonFocusRequests() const;
 
 	[[nodiscard]] int contentLeft() const;
 	[[nodiscard]] int contentTop() const;
@@ -98,9 +110,7 @@ class Step : public Ui::RpWidget {
 	void resizeEvent(QResizeEvent *e) override;
 
 	void setTitleText(rpl::producer<QString> titleText);
-	void setDescriptionText(rpl::producer<QString> descriptionText);
-	void setDescriptionText(
-		rpl::producer<TextWithEntities> richDescriptionText);
+	void setDescriptionText(v::text::data &&descriptionText);
 	bool paintAnimated(QPainter &p, QRect clip);
 
 	void fillSentCodeData(const MTPDauth_sentCode &type);
@@ -116,7 +126,8 @@ class Step : public Ui::RpWidget {
 	void createSession(
 		const MTPUser &user,
 		QImage photo,
-		const QVector<MTPDialogFilter> &filters);
+		const QVector<MTPDialogFilter> &filters,
+		bool tagsEnabled);
 
 	void goBack();
 
diff --git a/Telegram/SourceFiles/intro/intro_widget.cpp b/Telegram/SourceFiles/intro/intro_widget.cpp
index 831641d8e2f15f..4295af373df22d 100644
--- a/Telegram/SourceFiles/intro/intro_widget.cpp
+++ b/Telegram/SourceFiles/intro/intro_widget.cpp
@@ -24,6 +24,7 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item.h"
 #include "data/data_user.h"
+#include "data/components/promo_suggestions.h"
 #include "countries/countries_instance.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/text/format_values.h" // Ui::FormatPhone
@@ -72,10 +73,14 @@ Widget::Widget(
 	QWidget *parent,
 	not_null<Window::Controller*> controller,
 	not_null<Main::Account*> account,
-	EnterPoint point)
+	EnterPoint point,
+	Main::Account *accountBeforeIntro)
 : RpWidget(parent)
 , _account(account)
-, _data(details::Data{ .controller = controller })
+, _data(details::Data{
+	.controller = controller,
+	.accountBeforeIntro = base::make_weak(accountBeforeIntro),
+})
 , _nextStyle(&st::introNextButton)
 , _back(this, object_ptr<Ui::IconButton>(this, st::introBackButton))
 , _settings(
@@ -91,12 +96,13 @@ Widget::Widget(
 		this,
 		account,
 		rpl::single(true))) {
+	_settings->entity()->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 	controller->setDefaultFloatPlayerDelegate(floatPlayerDelegate());
 
 	getData()->country = ComputeNewAccountCountry();
 
 	_account->mtpValue(
-	) | rpl::start_with_next([=](not_null<MTP::Instance*> instance) {
+	) | rpl::on_next([=](not_null<MTP::Instance*> instance) {
 		_api.emplace(instance);
 		crl::on_main(this, [=] { createLanguageLink(); });
 	}, lifetime());
@@ -115,19 +121,33 @@ Widget::Widget(
 	default: Unexpected("Enter point in Intro::Widget::Widget.");
 	}
 
+	setupStep();
 	fixOrder();
 
+	if (_account->mtp().isTestMode()) {
+		_testModeLabel.create(
+			this,
+			object_ptr<Ui::FlatLabel>(
+				this,
+				u"Test Mode"_q,
+				st::defaultFlatLabel));
+		_testModeLabel->entity()->setTextColorOverride(
+			st::windowSubTextFg->c);
+		_testModeLabel->show(anim::type::instant);
+	}
+
 	Lang::CurrentCloudManager().firstLanguageSuggestion(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		createLanguageLink();
 	}, lifetime());
 
 	_account->mtpUpdates(
-	) | rpl::start_with_next([=](const MTPUpdates &updates) {
+	) | rpl::on_next([=](const MTPUpdates &updates) {
 		handleUpdates(updates);
 	}, lifetime());
 
 	_back->entity()->setClickedCallback([=] { backRequested(); });
+	_back->entity()->setAccessibleName(tr::lng_go_back(tr::now));
 	_back->hide(anim::type::instant);
 
 	if (_changeLanguage) {
@@ -135,7 +155,7 @@ Widget::Widget(
 	}
 
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
@@ -154,7 +174,7 @@ Widget::Widget(
 			checker.isLatest(),
 			checker.failed(),
 			checker.ready()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			checkUpdateStatus();
 		}, lifetime());
 	}
@@ -237,6 +257,9 @@ void Widget::handleUpdate(const MTPUpdate &update) {
 		_account->mtp().dcOptions().addFromList(data.vdc_options());
 	}, [&](const MTPDupdateConfig &data) {
 		_account->mtp().requestConfig();
+		if (_account->sessionExists()) {
+			_account->session().promoSuggestions().invalidate();
+		}
 	}, [&](const MTPDupdateServiceNotification &data) {
 		const auto text = TextWithEntities{
 			qs(data.vmessage()),
@@ -301,6 +324,7 @@ void Widget::checkUpdateStatus() {
 				this,
 				tr::lng_menu_update(),
 				st::defaultBoxButton));
+		_update->entity()->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 		if (!_showAnimation) {
 			_update->setVisible(true);
 		}
@@ -325,6 +349,32 @@ void Widget::setInnerFocus() {
 	}
 }
 
+void Widget::setupStep() {
+	getStep()->nextButtonStyle(
+	) | rpl::on_next([=](const style::RoundButton *st) {
+		const auto nextStyle = st ? st : &st::introNextButton;
+		if (_nextStyle != nextStyle) {
+			_nextStyle = nextStyle;
+			const auto wasShown = _next->toggled();
+			_next.destroy();
+			_next.create(
+				this,
+				object_ptr<Ui::RoundButton>(this, nullptr, *nextStyle));
+			showControls();
+			updateControlsGeometry();
+			_next->toggle(wasShown, anim::type::instant);
+		}
+	}, getStep()->lifetime());
+
+	getStep()->nextButtonFocusRequests() | rpl::on_next([=] {
+		if (_next && !_next->isHidden()) {
+			_next->entity()->setFocus(Qt::OtherFocusReason);
+		}
+	}, getStep()->lifetime());
+
+	getStep()->finishInit();
+}
+
 void Widget::historyMove(StackAction action, Animate animate) {
 	Expects(_stepHistory.size() > 1);
 
@@ -346,25 +396,8 @@ void Widget::historyMove(StackAction action, Animate animate) {
 	if (_terms) {
 		hideAndDestroy(std::exchange(_terms, { nullptr }));
 	}
-	{
-		getStep()->nextButtonStyle(
-		) | rpl::start_with_next([=](const style::RoundButton *st) {
-			const auto nextStyle = st ? st : &st::introNextButton;
-			if (_nextStyle != nextStyle) {
-				_nextStyle = nextStyle;
-				const auto wasShown = _next->toggled();
-				_next.destroy();
-				_next.create(
-					this,
-					object_ptr<Ui::RoundButton>(this, nullptr, *nextStyle));
-				showControls();
-				updateControlsGeometry();
-				_next->toggle(wasShown, anim::type::instant);
-			}
-		}, _next->lifetime());
-	}
+	setupStep();
 
-	getStep()->finishInit();
 	getStep()->prepareShowAnimated(wasStep);
 	if (wasStep->hasCover() != getStep()->hasCover()) {
 		_nextTopFrom = wasStep->contentTop() + st::introNextTop;
@@ -388,6 +421,9 @@ void Widget::historyMove(StackAction action, Animate animate) {
 
 	auto stepHasCover = getStep()->hasCover();
 	_settings->toggle(!stepHasCover, anim::type::normal);
+	if (_testModeLabel) {
+		_testModeLabel->toggle(!stepHasCover, anim::type::normal);
+	}
 	if (_update) {
 		_update->toggle(!stepHasCover, anim::type::normal);
 	}
@@ -399,10 +435,10 @@ void Widget::historyMove(StackAction action, Animate animate) {
 }
 
 void Widget::hideAndDestroy(object_ptr<Ui::FadeWrap<Ui::RpWidget>> widget) {
-	const auto weak = Ui::MakeWeak(widget.data());
+	const auto weak = base::make_weak(widget.data());
 	widget->hide(anim::type::normal);
 	widget->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		if (!shown && weak) {
 			weak->deleteLater();
 		}
@@ -463,6 +499,7 @@ void Widget::showResetButton() {
 			this,
 			tr::lng_signin_reset_account(),
 			st::introResetButton);
+		entity->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 		_resetAccount.create(this, std::move(entity));
 		_resetAccount->hide(anim::type::instant);
 		_resetAccount->entity()->setClickedCallback([this] { resetAccount(); });
@@ -482,8 +519,8 @@ void Widget::showTerms() {
 			this,
 			tr::lng_terms_signup(
 				lt_link,
-				tr::lng_terms_signup_link() | Ui::Text::ToLink(),
-				Ui::Text::WithEntities),
+				tr::lng_terms_signup_link(tr::link),
+				tr::marked),
 			st::introTermsLabel);
 		_terms.create(this, std::move(entity));
 		_terms->entity()->overrideLinkClickHandler([=] {
@@ -581,9 +618,9 @@ void Widget::resetAccount() {
 			} else if (type == u"2FA_RECENT_CONFIRM"_q) {
 				Ui::show(Ui::MakeInformBox(
 					tr::lng_signin_reset_cancelled()));
-			} else {
+			} else if (!MTP::IgnoreError(error)) {
 				getData()->controller->hideLayer();
-				getStep()->showError(rpl::single(Lang::Hard::ServerError()));
+				getStep()->showError(rpl::single(type));
 			}
 		}).send();
 	});
@@ -621,7 +658,7 @@ void Widget::showTerms(Fn<void()> callback) {
 	if (getData()->termsLock.text.text.isEmpty()) {
 		return;
 	}
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto box = Ui::show(callback
 		? Box<Window::TermsBox>(
 			getData()->termsLock,
@@ -636,7 +673,7 @@ void Widget::showTerms(Fn<void()> callback) {
 	box->setCloseByOutsideClick(false);
 
 	box->agreeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (callback) {
 			callback();
 		}
@@ -646,19 +683,19 @@ void Widget::showTerms(Fn<void()> callback) {
 	}, box->lifetime());
 
 	box->cancelClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto box = Ui::show(Box<Window::TermsBox>(
 			TextWithEntities{ tr::lng_terms_signup_sorry(tr::now) },
 			tr::lng_intro_finish(),
 			tr::lng_terms_decline()));
 		box->agreeClicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (weak) {
 				showTerms(callback);
 			}
 		}, box->lifetime());
 		box->cancelClicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (box) {
 				box->closeBox();
 			}
@@ -674,6 +711,9 @@ void Widget::showControls() {
 	_connecting->setForceHidden(false);
 	auto hasCover = getStep()->hasCover();
 	_settings->toggle(!hasCover, anim::type::instant);
+	if (_testModeLabel) {
+		_testModeLabel->toggle(!hasCover, anim::type::instant);
+	}
 	if (_update) {
 		_update->toggle(!hasCover, anim::type::instant);
 	}
@@ -690,8 +730,6 @@ void Widget::showControls() {
 
 void Widget::setupNextButton() {
 	_next->entity()->setClickedCallback([=] { getStep()->submit(); });
-	_next->entity()->setTextTransform(
-		Ui::RoundButton::TextTransform::NoTransform);
 
 	_next->entity()->setText(getStep()->nextButtonText(
 	) | rpl::filter([](const QString &text) {
@@ -702,7 +740,7 @@ void Widget::setupNextButton() {
 		return !text.isEmpty();
 	}) | rpl::filter([=](bool visible) {
 		return visible != _nextShown;
-	}) | rpl::start_with_next([=](bool visible) {
+	}) | rpl::on_next([=](bool visible) {
 		_next->toggle(visible, anim::type::normal);
 		_nextShown = visible;
 		if (_changeLanguage) {
@@ -723,6 +761,7 @@ void Widget::hideControls() {
 	_next->hide(anim::type::instant);
 	_connecting->setForceHidden(true);
 	_settings->hide(anim::type::instant);
+	if (_testModeLabel) _testModeLabel->hide(anim::type::instant);
 	if (_update) _update->hide(anim::type::instant);
 	if (_changeLanguage) _changeLanguage->hide(anim::type::instant);
 	if (_terms) _terms->hide(anim::type::instant);
@@ -793,6 +832,13 @@ void Widget::updateControlsGeometry() {
 		getStep()->hasCover() ? st::introCoverHeight : 0,
 		shown);
 	_settings->moveToRight(skip, controlsTop + skip);
+	if (_testModeLabel) {
+		_testModeLabel->moveToRight(
+			skip + _settings->width() + skip,
+			_settings->y()
+				+ (_settings->height()
+				- _testModeLabel->height()) / 2);
+	}
 	if (_update) {
 		_update->moveToRight(
 			skip + _settings->width() + skip,
@@ -843,8 +889,12 @@ void Widget::keyPressEvent(QKeyEvent *e) {
 }
 
 void Widget::backRequested() {
+	const auto back = getData()->accountBeforeIntro.get();
 	if (_stepHistory.size() > 1) {
 		historyMove(StackAction::Back, Animate::Back);
+	} else if (back && back->sessionExists()) {
+		Core::App().setActivePrimaryWindow(getData()->controller);
+		back->domain().activate(back);
 	} else if (const auto parent
 		= Core::App().domain().maybeLastOrSomeAuthedAccount()) {
 		Core::App().domain().activate(parent);
diff --git a/Telegram/SourceFiles/intro/intro_widget.h b/Telegram/SourceFiles/intro/intro_widget.h
index 8b804c623c24b0..511f7549f6fb57 100644
--- a/Telegram/SourceFiles/intro/intro_widget.h
+++ b/Telegram/SourceFiles/intro/intro_widget.h
@@ -43,10 +43,17 @@ enum class CallStatus {
 	Disabled,
 };
 
+enum class EmailStatus {
+	None,
+	SetupRequired,
+};
+
 struct Data {
 	// Required for the UserpicButton.
 	const not_null<Window::Controller*> controller;
 
+	base::weak_ptr<Main::Account> accountBeforeIntro;
+
 	QString country;
 	QString phone;
 	QByteArray phoneHash;
@@ -58,6 +65,11 @@ struct Data {
 	bool codeByTelegram = false;
 	QString codeByFragmentUrl;
 
+	EmailStatus emailStatus = EmailStatus::None;
+	QString email;
+	QString emailPatternSetup;
+	QString emailPatternLogin;
+
 	Core::CloudPasswordState pwdState;
 
 	Window::TermsLock termsLock;
@@ -96,7 +108,8 @@ class Widget
 		QWidget *parent,
 		not_null<Window::Controller*> controller,
 		not_null<Main::Account*> account,
-		EnterPoint point);
+		EnterPoint point,
+		Main::Account *accountBeforeIntro);
 	~Widget();
 
 	void showAnimated(QPixmap oldContentCache, bool back = false);
@@ -111,6 +124,7 @@ class Widget
 	void keyPressEvent(QKeyEvent *e) override;
 
 private:
+	void setupStep();
 	void refreshLang();
 	void showFinished();
 	void createLanguageLink();
@@ -192,6 +206,7 @@ class Widget
 	object_ptr<Ui::FadeWrap<Ui::IconButton>> _back;
 	object_ptr<Ui::FadeWrap<Ui::RoundButton>> _update = { nullptr };
 	object_ptr<Ui::FadeWrap<Ui::RoundButton>> _settings;
+	object_ptr<Ui::FadeWrap<Ui::FlatLabel>> _testModeLabel = { nullptr };
 
 	object_ptr<Ui::FadeWrap<Ui::RoundButton>> _next;
 	object_ptr<Ui::FadeWrap<Ui::LinkButton>> _changeLanguage = { nullptr };
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_box.cpp b/Telegram/SourceFiles/iv/editor/iv_editor_box.cpp
new file mode 100644
index 00000000000000..3f6a0a9c34ae21
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_box.cpp
@@ -0,0 +1,771 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/editor/iv_editor_box.h"
+
+#include <QtCore/QDir>
+
+#include "base/algorithm.h"
+#include "base/event_filter.h"
+#include "base/unique_qptr.h"
+#include "boxes/premium_preview_box.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "data/data_msg_id.h"
+#include "data/data_types.h"
+#include "data/data_emoji_statuses.h"
+#include "history/history_item.h"
+#include "main/main_session.h"
+#include "ui/emoji_config.h"
+#include "ui/painter.h"
+#include "data/data_document.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/stickers/data_stickers.h"
+#include "chat_helpers/tabbed_panel.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "iv/editor/iv_editor_state.h"
+#include "iv/editor/iv_editor_widget.h"
+#include "iv/editor/iv_editor_window.h"
+#include "lang/lang_keys.h"
+#include "ui/rect_part.h"
+#include "ui/rp_widget.h"
+#include "ui/ui_utility.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/widgets/tooltip.h"
+
+#include <crl/crl_on_main.h>
+#include <rpl/never.h>
+
+#include <QtCore/QEvent>
+#include <QtCore/QPointer>
+#include <QtGui/QCloseEvent>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QScreen>
+
+#include <algorithm>
+#include <array>
+#include <memory>
+#include <vector>
+
+#include "styles/style_chat_helpers.h"
+#include "styles/style_iv.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_widgets.h"
+
+namespace Iv::Editor {
+namespace {
+
+struct ToolbarButton {
+	object_ptr<Ui::IconButton> widget;
+	Fn<rpl::producer<TextWithEntities>()> tooltipFactory;
+};
+
+class Toolbar final : public Ui::RpWidget {
+public:
+	Toolbar(
+		QWidget *parent,
+		not_null<Widget*> editor,
+		QPointer<QWidget> tooltipParent,
+		Fn<void(not_null<Widget*>, QPointer<QWidget>)> requestMedia,
+		Fn<void(not_null<Widget*>, QPointer<QWidget>, rpl::producer<>)> requestMap,
+		Fn<void(not_null<Ui::IconButton*>)> toggleEmoji);
+
+	int resizeGetHeight(int width) override;
+	[[nodiscard]] Ui::IconButton *emojiButton() const;
+	void hideShownTooltip();
+
+protected:
+	bool eventFilter(QObject *object, QEvent *event) override;
+
+private:
+	not_null<Ui::IconButton*> addButton(
+		QString label,
+		Fn<rpl::producer<TextWithEntities>()> tooltipFactory,
+		const style::icon *icon,
+		Fn<void()> callback);
+	void addInsertButtons();
+	void showHeadingMenu(not_null<Ui::IconButton*> button);
+	void showTooltip(not_null<Ui::IconButton*> button);
+	void hideTooltip();
+	void updateTooltipGeometry();
+	[[nodiscard]] ToolbarButton *buttonData(not_null<Ui::IconButton*> button);
+
+	const QPointer<Widget> _editor;
+	const QPointer<QWidget> _tooltipParent;
+	const Fn<void(not_null<Widget*>, QPointer<QWidget>)> _requestMedia;
+	const Fn<void(not_null<Widget*>, QPointer<QWidget>, rpl::producer<>)> _requestMap;
+	const Fn<void(not_null<Ui::IconButton*>)> _toggleEmoji;
+	std::vector<ToolbarButton> _buttons;
+	base::unique_qptr<Ui::ImportantTooltip> _tooltip;
+	base::unique_qptr<Ui::PopupMenu> _menu;
+	Ui::IconButton *_emojiButton = nullptr;
+	Ui::IconButton *_hovered = nullptr;
+
+};
+
+[[nodiscard]] QRect DefaultWindowGeometry() {
+	const auto size = st::ivEditorWindowDefaultSize;
+	auto result = QRect(QPoint(), size);
+	if (const auto screen = QGuiApplication::primaryScreen()) {
+		result.moveCenter(screen->availableGeometry().center());
+	}
+	return result;
+}
+
+[[nodiscard]] QString HeadingLabel(int level) {
+	switch (level) {
+	case 1: return tr::lng_article_insert_heading1(tr::now);
+	case 2: return tr::lng_article_insert_heading2(tr::now);
+	case 3: return tr::lng_article_insert_heading3(tr::now);
+	case 4: return tr::lng_article_insert_heading4(tr::now);
+	case 5: return tr::lng_article_insert_heading5(tr::now);
+	case 6: return tr::lng_article_insert_heading6(tr::now);
+	}
+	return tr::lng_article_insert_heading1(tr::now);
+}
+
+[[nodiscard]] QString SubmitText(const ShowWindowDescriptor &descriptor) {
+	if (!descriptor.submitLabel.isEmpty()) {
+		return descriptor.submitLabel;
+	}
+	switch (descriptor.submitType) {
+	case ShowWindowDescriptor::SubmitType::Send:
+		return tr::lng_send_button(tr::now);
+	case ShowWindowDescriptor::SubmitType::Save:
+		return tr::lng_settings_save(tr::now);
+	}
+	return tr::lng_send_button(tr::now);
+}
+
+[[nodiscard]] bool IsEmojiDocument(not_null<DocumentData*> document) {
+	const auto info = document->sticker();
+	return info && (info->setType == Data::StickersType::Emoji);
+}
+
+Toolbar::Toolbar(
+	QWidget *parent,
+	not_null<Widget*> editor,
+	QPointer<QWidget> tooltipParent,
+	Fn<void(not_null<Widget*>, QPointer<QWidget>)> requestMedia,
+	Fn<void(not_null<Widget*>, QPointer<QWidget>, rpl::producer<>)> requestMap,
+	Fn<void(not_null<Ui::IconButton*>)> toggleEmoji)
+: Ui::RpWidget(parent)
+, _editor(editor.get())
+, _tooltipParent(std::move(tooltipParent))
+, _requestMedia(std::move(requestMedia))
+, _requestMap(std::move(requestMap))
+, _toggleEmoji(std::move(toggleEmoji)) {
+	setMouseTracking(true);
+	addInsertButtons();
+}
+
+not_null<Ui::IconButton*> Toolbar::addButton(
+		QString label,
+		Fn<rpl::producer<TextWithEntities>()> tooltipFactory,
+		const style::icon *icon,
+		Fn<void()> callback) {
+	auto button = object_ptr<Ui::IconButton>(this, st::ivEditorToolbarButton);
+	const auto raw = button.data();
+	raw->setAccessibleName(label);
+	raw->setIconOverride(icon, icon);
+	raw->setClickedCallback([=, callback = std::move(callback)] {
+		hideTooltip();
+		callback();
+	});
+	raw->installEventFilter(this);
+	_buttons.push_back({
+		std::move(button),
+		std::move(tooltipFactory),
+	});
+	return raw;
+}
+
+void Toolbar::addInsertButtons() {
+	const auto insert = [=](State::InsertAction action) {
+		if (_editor) {
+			_editor->insertBlock(action);
+		}
+	};
+	const auto insertType = [=](State::InsertBlockType type) {
+		insert({ .type = type });
+	};
+
+	const auto heading = addButton(
+		tr::lng_article_insert_heading(tr::now),
+		[] { return tr::lng_article_insert_heading(tr::marked); },
+		&st::ivEditorToolbarHeadingIcon,
+		[] {});
+	heading->setClickedCallback([=] {
+		hideTooltip();
+		showHeadingMenu(heading);
+	});
+	_emojiButton = addButton(
+		tr::lng_article_insert_emoji(tr::now),
+		[] { return tr::lng_article_insert_emoji(tr::marked); },
+		&st::ivEditorToolbarEmojiIcon,
+		[=] {
+			if (_toggleEmoji && _emojiButton) {
+				_toggleEmoji(not_null<Ui::IconButton*>(_emojiButton));
+			}
+		});
+	addButton(
+		tr::lng_article_insert_blockquote(tr::now),
+		[] { return tr::lng_article_insert_blockquote(tr::marked); },
+		&st::ivEditorToolbarBlockquoteIcon,
+		[=] { insertType(State::InsertBlockType::Blockquote); });
+	addButton(
+		tr::lng_article_insert_code(tr::now),
+		[] { return tr::lng_article_insert_code(tr::marked); },
+		&st::ivEditorToolbarCodeIcon,
+		[=] { insertType(State::InsertBlockType::Code); });
+	addButton(
+		tr::lng_article_insert_math(tr::now),
+		[] { return tr::lng_article_insert_math(tr::marked); },
+		&st::ivEditorToolbarMathIcon,
+		[=] { insertType(State::InsertBlockType::Math); });
+	addButton(
+		tr::lng_article_insert_divider(tr::now),
+		[] { return tr::lng_article_insert_divider(tr::marked); },
+		&st::ivEditorToolbarDividerIcon,
+		[=] { insertType(State::InsertBlockType::Divider); });
+	addButton(
+		tr::lng_article_insert_ordered_list(tr::now),
+		[] { return tr::lng_article_insert_ordered_list(tr::marked); },
+		&st::ivEditorToolbarOrderedListIcon,
+		[=] { insertType(State::InsertBlockType::OrderedList); });
+	addButton(
+		tr::lng_article_insert_bullet_list(tr::now),
+		[] { return tr::lng_article_insert_bullet_list(tr::marked); },
+		&st::ivEditorToolbarBulletListIcon,
+		[=] { insertType(State::InsertBlockType::BulletList); });
+	addButton(
+		tr::lng_article_insert_task_list(tr::now),
+		[] { return tr::lng_article_insert_task_list(tr::marked); },
+		&st::ivEditorToolbarTaskListIcon,
+		[=] { insertType(State::InsertBlockType::TaskList); });
+	addButton(
+		tr::lng_article_insert_pullquote(tr::now),
+		[] { return tr::lng_article_insert_pullquote(tr::marked); },
+		&st::ivEditorToolbarPullquoteIcon,
+		[=] { insertType(State::InsertBlockType::Pullquote); });
+	if (_requestMedia) {
+		addButton(
+			tr::lng_article_insert_media(tr::now),
+			[] { return tr::lng_article_insert_media(tr::marked); },
+			&st::ivEditorToolbarAttachIcon,
+			[=] {
+				if (_editor) {
+					_requestMedia(
+						not_null<Widget*>(_editor.data()),
+						_tooltipParent);
+				}
+			});
+	}
+	addButton(
+		tr::lng_article_insert_details(tr::now),
+		[] { return tr::lng_article_insert_details(tr::marked); },
+		&st::ivEditorToolbarDetailsIcon,
+		[=] { insertType(State::InsertBlockType::Details); });
+	addButton(
+		tr::lng_article_insert_table(tr::now),
+		[] { return tr::lng_article_insert_table(tr::marked); },
+		&st::ivEditorToolbarTableIcon,
+		[=] { insertType(State::InsertBlockType::Table); });
+
+	if (_requestMap) {
+		addButton(
+			tr::lng_article_insert_map(tr::now),
+			[] { return tr::lng_article_insert_map(tr::marked); },
+			&st::menuIconAddress,
+			[=] {
+				if (_editor) {
+					const auto parent = _tooltipParent;
+					auto closeRequests = parent
+						? static_cast<Ui::RpWidget*>(parent.data())->death()
+						: rpl::never<>();
+					_requestMap(
+						not_null<Widget*>(_editor.data()),
+						parent,
+						std::move(closeRequests));
+				}
+			});
+	}
+}
+
+void Toolbar::showHeadingMenu(not_null<Ui::IconButton*> button) {
+	_menu = base::make_unique_q<Ui::PopupMenu>(this);
+	for (const auto level : std::array{ 1, 2, 3, 4, 5, 6 }) {
+		_menu->addAction(
+			HeadingLabel(level),
+			[=] {
+				if (_editor) {
+					_editor->insertBlock({
+						.type = State::InsertBlockType::Heading,
+						.headingLevel = level,
+					});
+				}
+			});
+	}
+	_menu->popup(button->mapToGlobal(QPoint(0, button->height())));
+}
+
+int Toolbar::resizeGetHeight(int width) {
+	const auto padding = st::ivEditorToolbarPadding;
+	const auto buttonWidth = st::ivEditorToolbarButton.width;
+	const auto buttonHeight = st::ivEditorToolbarButton.height;
+	const auto right = width - padding.right();
+	auto left = padding.left();
+	auto top = padding.top();
+	for (const auto &button : _buttons) {
+		if (left > padding.left() && left + buttonWidth > right) {
+			left = padding.left();
+			top += buttonHeight + st::ivEditorToolbarRowSkip;
+		}
+		button.widget->moveToLeft(left, top, width);
+		left += buttonWidth + st::ivEditorToolbarButtonSkip;
+	}
+	updateTooltipGeometry();
+	return top + buttonHeight + padding.bottom();
+}
+
+Ui::IconButton *Toolbar::emojiButton() const {
+	return _emojiButton;
+}
+
+void Toolbar::hideShownTooltip() {
+	hideTooltip();
+}
+
+bool Toolbar::eventFilter(QObject *object, QEvent *event) {
+	for (const auto &data : _buttons) {
+		if (data.widget.data() != object) {
+			continue;
+		}
+		const auto button = data.widget.data();
+		if (event->type() == QEvent::Enter) {
+			showTooltip(not_null<Ui::IconButton*>(button));
+		} else if (event->type() == QEvent::Leave && _hovered == button) {
+			hideTooltip();
+		}
+		break;
+	}
+	return Ui::RpWidget::eventFilter(object, event);
+}
+
+void Toolbar::showTooltip(not_null<Ui::IconButton*> button) {
+	hideTooltip();
+	const auto data = buttonData(button);
+	if (!data) {
+		return;
+	}
+	_hovered = button;
+	const auto tooltipParent = _tooltipParent
+		? _tooltipParent.data()
+		: (parentWidget() ? parentWidget() : this);
+	_tooltip.reset(Ui::CreateChild<Ui::ImportantTooltip>(
+		tooltipParent,
+		Ui::MakeNiceTooltipLabel(
+			tooltipParent,
+			data->tooltipFactory(),
+			st::boxWideWidth,
+			st::defaultImportantTooltipLabel),
+		st::defaultImportantTooltip));
+	_tooltip->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_tooltip->toggleFast(false);
+	updateTooltipGeometry();
+	_tooltip->raise();
+	_tooltip->toggleAnimated(true);
+}
+
+void Toolbar::hideTooltip() {
+	_hovered = nullptr;
+	if (_tooltip) {
+		_tooltip->toggleFast(false);
+		_tooltip = nullptr;
+	}
+}
+
+void Toolbar::updateTooltipGeometry() {
+	if (!_tooltip || !_hovered) {
+		return;
+	}
+	const auto tooltipParent = _tooltip->parentWidget();
+	const auto geometry = Ui::MapFrom(
+		tooltipParent,
+		_hovered,
+		_hovered->rect());
+	_tooltip->pointAt(geometry, RectPart::Top | RectPart::Center);
+}
+
+ToolbarButton *Toolbar::buttonData(not_null<Ui::IconButton*> button) {
+	for (auto &data : _buttons) {
+		if (data.widget.data() == button.get()) {
+			return &data;
+		}
+	}
+	return nullptr;
+}
+
+} // namespace
+
+struct WindowHost::Impl final {
+public:
+	explicit Impl(ShowWindowDescriptor descriptor);
+	~Impl();
+
+private:
+	void setupWindow(ShowWindowDescriptor &&descriptor);
+	void setupEmojiPanel(const ShowWindowDescriptor &descriptor);
+	void layout();
+	void updateEmojiPanelGeometry();
+	void updateEditorVisibleTopBottom();
+	void setEmojiPanelInteractionActive(bool active);
+	void finishCloseFromAcceptedEvent();
+	void finishClose();
+	[[nodiscard]] bool confirmCancel();
+	void submit();
+
+	std::unique_ptr<Window> _window;
+	object_ptr<Ui::RpWidget> _top = { nullptr };
+	object_ptr<Ui::ScrollArea> _scroll = { nullptr };
+	QPointer<Widget> _editor;
+	object_ptr<Toolbar> _toolbar = { nullptr };
+	object_ptr<Ui::RoundButton> _cancel = { nullptr };
+	object_ptr<Ui::RoundButton> _submit = { nullptr };
+	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
+	Fn<bool()> _cancelled;
+	Fn<bool()> _confirmed;
+	Fn<void()> _closed;
+	rpl::lifetime _lifetime;
+	bool _emojiPanelInteractionActive = false;
+	bool _closingApproved = false;
+	bool _closedNotified = false;
+
+};
+
+WindowHost::Impl::Impl(ShowWindowDescriptor descriptor) {
+	setupWindow(std::move(descriptor));
+}
+
+WindowHost::Impl::~Impl() {
+	setEmojiPanelInteractionActive(false);
+}
+
+void WindowHost::Impl::setupWindow(ShowWindowDescriptor &&descriptor) {
+	const auto title = tr::lng_article_editor_title(tr::now);
+
+	_window = std::make_unique<Window>();
+	const auto window = _window.get();
+	window->setTitle(title);
+	window->setWindowTitle(title);
+	window->setMinimumSize(st::ivEditorWindowMinSize);
+	window->setGeometry(DefaultWindowGeometry());
+
+	window->body()->paintRequest() | rpl::on_next([=](QRect clip) {
+		QPainter(window->body().get()).fillRect(clip, st::windowBg);
+	}, window->body()->lifetime());
+
+	_top = object_ptr<Ui::RpWidget>(window->body().get());
+	_top->paintRequest() | rpl::on_next([=](QRect clip) {
+		QPainter(_top.data()).fillRect(clip, st::windowBg);
+	}, _top->lifetime());
+
+	_scroll = object_ptr<Ui::ScrollArea>(window->body().get(), st::boxScroll);
+	_editor = _scroll->setOwnedWidget(object_ptr<Widget>(
+		_scroll.data(),
+		WidgetServices{
+			.session = descriptor.session,
+			.show = descriptor.show,
+			.outer = window->body(),
+			.customEmojiPaused = std::move(descriptor.customEmojiPaused),
+			.imeCompositionStarts = window->imeCompositionStarts(),
+		},
+		descriptor.peer,
+		descriptor.state,
+		std::move(descriptor.showLimitToast)));
+	const auto editor = not_null<Widget*>(_editor.data());
+	const auto body = QPointer<QWidget>(window->body().get());
+
+	_toolbar = object_ptr<Toolbar>(
+		_top.data(),
+		editor,
+		body,
+		std::move(descriptor.requestMedia),
+		std::move(descriptor.requestMap),
+		[=](not_null<Ui::IconButton*>) {
+			_toolbar->hideShownTooltip();
+			setEmojiPanelInteractionActive(true);
+			updateEmojiPanelGeometry();
+			_emojiPanel->toggleAnimated();
+		});
+	_cancel = object_ptr<Ui::RoundButton>(
+		_top.data(),
+		tr::lng_cancel(),
+		st::ivEditorCancelButton);
+	_cancel->setClickedCallback([=] {
+		if (confirmCancel()) {
+			finishClose();
+		}
+	});
+	_submit = object_ptr<Ui::RoundButton>(
+		_top.data(),
+		rpl::single(SubmitText(descriptor)),
+		st::ivEditorSubmitButton);
+	_submit->setClickedCallback([=] { submit(); });
+	if (descriptor.setupSubmitButton) {
+		descriptor.setupSubmitButton(not_null<Ui::RpWidget*>(_submit.data()));
+	}
+
+	_cancelled = std::move(descriptor.cancelled);
+	_confirmed = std::move(descriptor.confirmed);
+	_closed = std::move(descriptor.closed);
+
+	setupEmojiPanel(descriptor);
+
+	window->body()->sizeValue() | rpl::on_next([=](QSize) {
+		layout();
+	}, _lifetime);
+	rpl::combine(
+		_scroll->scrollTopValue(),
+		_scroll->heightValue()
+	) | rpl::on_next([=](int, int) {
+		updateEditorVisibleTopBottom();
+	}, _lifetime);
+	window->events() | rpl::on_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::Close) {
+			const auto event = static_cast<QCloseEvent*>(e.get());
+			if (_closingApproved) {
+				event->accept();
+				return;
+			}
+			if (confirmCancel()) {
+				event->accept();
+				finishCloseFromAcceptedEvent();
+			} else {
+				event->ignore();
+			}
+		} else if (e->type() == QEvent::KeyPress) {
+			const auto event = static_cast<QKeyEvent*>(e.get());
+			if (event->key() == Qt::Key_Escape) {
+				event->accept();
+				if (confirmCancel()) {
+					finishClose();
+				}
+			}
+		}
+	}, _lifetime);
+
+	layout();
+	_top->show();
+	_scroll->show();
+	window->show();
+	editor->activateInitialNode();
+}
+
+void WindowHost::Impl::setupEmojiPanel(const ShowWindowDescriptor &descriptor) {
+	using Selector = ChatHelpers::TabbedSelector;
+	_emojiPanel = base::make_unique_q<ChatHelpers::TabbedPanel>(
+		_window->body().get(),
+		ChatHelpers::TabbedPanelDescriptor{
+			.ownedSelector = object_ptr<Selector>(
+				nullptr,
+				ChatHelpers::TabbedSelectorDescriptor{
+					.show = descriptor.show,
+					.st = st::defaultEmojiPan,
+					.level = ChatHelpers::PauseReason::Layer,
+					.mode = Selector::Mode::EmojiOnly,
+					.features = {
+						.stickersSettings = false,
+						.openStickerSets = false,
+					},
+				}),
+		});
+	const auto panel = _emojiPanel.get();
+	panel->setDesiredHeightValues(
+		1.,
+		st::emojiPanMinHeight / 2,
+		st::emojiPanMinHeight);
+	panel->setDropDown(true);
+	panel->hide();
+	panel->selector()->setCurrentPeer(descriptor.peer);
+	panel->selector()->emojiChosen(
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
+		setEmojiPanelInteractionActive(true);
+		if (_editor) {
+			_editor->insertEmoji(data.emoji);
+		}
+	}, _lifetime);
+	panel->selector()->customEmojiChosen(
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
+		const auto document = data.document;
+		if (!IsEmojiDocument(document)) {
+			return;
+		}
+		if (document->isPremiumEmoji()
+			&& !descriptor.session->premium()
+			&& !Data::AllowEmojiWithoutPremium(descriptor.peer, document)) {
+			ShowPremiumPreviewBox(
+				descriptor.show,
+				PremiumFeature::AnimatedEmoji);
+		} else if (_editor) {
+			setEmojiPanelInteractionActive(true);
+			_editor->insertCustomEmoji(document);
+		}
+	}, _lifetime);
+
+	if (const auto button = _toolbar->emojiButton()) {
+		button->installEventFilter(panel);
+		base::install_event_filter(panel, button, [=](not_null<QEvent*> event) {
+			const auto type = event->type();
+			if (type == QEvent::Enter || type == QEvent::MouseButtonPress) {
+				setEmojiPanelInteractionActive(true);
+				updateEmojiPanelGeometry();
+			} else if (type == QEvent::Leave && panel->isHidden()) {
+				setEmojiPanelInteractionActive(false);
+			}
+			return base::EventFilterResult::Continue;
+		});
+	}
+	base::install_event_filter(panel, [=](not_null<QEvent*> event) {
+		const auto type = event->type();
+		if (type == QEvent::Hide || type == QEvent::Close) {
+			setEmojiPanelInteractionActive(false);
+		} else if (type == QEvent::Show) {
+			setEmojiPanelInteractionActive(true);
+		}
+		return base::EventFilterResult::Continue;
+	});
+}
+
+void WindowHost::Impl::layout() {
+	if (!_window || !_top || !_toolbar || !_editor) {
+		return;
+	}
+	const auto width = _window->body()->width();
+	const auto height = _window->body()->height();
+	const auto padding = st::ivEditorTopControlsPadding;
+	const auto buttonsWidth = _cancel->width()
+		+ st::ivEditorTopControlsButtonSkip
+		+ _submit->width();
+	const auto toolbarWidth = std::max(
+		width
+			- padding.right()
+			- buttonsWidth
+			- st::ivEditorTopControlsContentSkip,
+		0);
+	const auto toolbarHeight = _toolbar->resizeGetHeight(toolbarWidth);
+	const auto buttonsHeight = std::max(_cancel->height(), _submit->height());
+	const auto topHeight = std::max(
+		toolbarHeight,
+		padding.top() + buttonsHeight + padding.bottom());
+	const auto buttonsTop = padding.top()
+		+ (topHeight - padding.top() - padding.bottom() - buttonsHeight) / 2;
+	_top->setGeometry(0, 0, width, topHeight);
+	_toolbar->setGeometry(0, 0, toolbarWidth, toolbarHeight);
+	_submit->moveToRight(padding.right(), buttonsTop, width);
+	_cancel->moveToRight(
+		padding.right()
+			+ _submit->width()
+			+ st::ivEditorTopControlsButtonSkip,
+		buttonsTop,
+		width);
+	_scroll->setGeometry(0, topHeight, width, std::max(height - topHeight, 0));
+	_editor->resizeToWidth(std::max(_scroll->width(), 1));
+	updateEditorVisibleTopBottom();
+	updateEmojiPanelGeometry();
+}
+
+void WindowHost::Impl::updateEmojiPanelGeometry() {
+	if (!_emojiPanel || !_toolbar) {
+		return;
+	}
+	const auto button = _toolbar->emojiButton();
+	if (!button) {
+		return;
+	}
+	const auto local = _emojiPanel->parentWidget()->mapFromGlobal(
+		button->mapToGlobal(QPoint()));
+	_emojiPanel->setDropDown(true);
+	_emojiPanel->moveTopRight(
+		local.y() + button->height(),
+		local.x() + button->width());
+}
+
+void WindowHost::Impl::updateEditorVisibleTopBottom() {
+	if (!_scroll || !_editor) {
+		return;
+	}
+	const auto scrollTop = _scroll->scrollTop();
+	_editor->setVisibleTopBottom(scrollTop, scrollTop + _scroll->height());
+}
+
+void WindowHost::Impl::setEmojiPanelInteractionActive(bool active) {
+	if (_emojiPanelInteractionActive == active || !_editor) {
+		_emojiPanelInteractionActive = active;
+		return;
+	}
+	_emojiPanelInteractionActive = active;
+	_editor->setInlineFieldExternalInteractionActive(active);
+}
+
+void WindowHost::Impl::finishCloseFromAcceptedEvent() {
+	_closingApproved = true;
+	if (_closedNotified) {
+		return;
+	}
+	_closedNotified = true;
+	setEmojiPanelInteractionActive(false);
+	if (_emojiPanel) {
+		_emojiPanel->hideFast();
+	}
+	if (const auto closed = base::take(_closed)) {
+		crl::on_main(closed);
+	}
+}
+
+void WindowHost::Impl::finishClose() {
+	finishCloseFromAcceptedEvent();
+	if (_window) {
+		_window->close();
+	}
+}
+
+bool WindowHost::Impl::confirmCancel() {
+	return !_cancelled || _cancelled();
+}
+
+void WindowHost::Impl::submit() {
+	if (!_editor) {
+		return;
+	}
+	if (_editor->commitInlineField() == State::ApplyResult::Failed) {
+		return;
+	}
+	if (!_confirmed || _confirmed()) {
+		finishClose();
+	}
+}
+
+WindowHost::WindowHost(ShowWindowDescriptor descriptor)
+: _impl(std::make_unique<Impl>(std::move(descriptor))) {
+}
+
+WindowHost::~WindowHost() = default;
+
+std::unique_ptr<WindowHost> ShowWindow(ShowWindowDescriptor descriptor) {
+	if (!descriptor.state) {
+		descriptor.state = std::make_shared<State>();
+	}
+	return std::unique_ptr<WindowHost>(new WindowHost(std::move(descriptor)));
+}
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_box.h b/Telegram/SourceFiles/iv/editor/iv_editor_box.h
new file mode 100644
index 00000000000000..a6ff4dfb687316
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_box.h
@@ -0,0 +1,82 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/basic_types.h"
+
+#include <rpl/producer.h>
+
+#include <QtCore/QPointer>
+#include <QtCore/QString>
+
+#include <memory>
+
+class PeerData;
+class QWidget;
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Iv {
+enum class RichMessageLimitError : unsigned char;
+} // namespace Iv
+
+namespace Iv::Editor {
+
+class State;
+class Widget;
+
+struct ShowWindowDescriptor {
+	enum class SubmitType {
+		Send,
+		Save,
+	};
+
+	not_null<Main::Session*> session;
+	std::shared_ptr<ChatHelpers::Show> show;
+	not_null<PeerData*> peer;
+	std::shared_ptr<State> state;
+	QString submitLabel;
+	SubmitType submitType = SubmitType::Send;
+	Fn<bool()> customEmojiPaused;
+	Fn<bool()> cancelled;
+	Fn<bool()> confirmed;
+	Fn<void(not_null<Ui::RpWidget*>)> setupSubmitButton;
+	Fn<void(not_null<Widget*>, QPointer<QWidget>)> requestMedia;
+	Fn<void(not_null<Widget*>, QPointer<QWidget>, rpl::producer<>)> requestMap;
+	Fn<void()> closed;
+	Fn<void(RichMessageLimitError)> showLimitToast;
+};
+
+class WindowHost final {
+public:
+	~WindowHost();
+
+private:
+	friend std::unique_ptr<WindowHost> ShowWindow(
+		ShowWindowDescriptor descriptor);
+
+	explicit WindowHost(ShowWindowDescriptor descriptor);
+
+	struct Impl;
+	std::unique_ptr<Impl> _impl;
+
+};
+
+std::unique_ptr<WindowHost> ShowWindow(ShowWindowDescriptor descriptor);
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_clipboard.cpp b/Telegram/SourceFiles/iv/editor/iv_editor_clipboard.cpp
new file mode 100644
index 00000000000000..1e67ec520f246b
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_clipboard.cpp
@@ -0,0 +1,90 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/editor/iv_editor_clipboard.h"
+
+#include "base/random.h"
+
+#include <QtCore/QMimeData>
+#include <QtCore/QPointer>
+
+namespace Iv::Editor {
+namespace {
+
+struct ClipboardStorage {
+	uint64 sessionId = base::RandomValue<uint64>();
+	uint64 serial = 0;
+	QPointer<QMimeData> mimeData;
+	std::optional<ClipboardData> data;
+};
+
+[[nodiscard]] ClipboardStorage &Storage() {
+	static auto storage = ClipboardStorage();
+	return storage;
+}
+
+[[nodiscard]] bool MarkerMatches(const QMimeData *mimeData) {
+	return mimeData
+		&& mimeData->hasFormat(ClipboardMimeType())
+		&& (mimeData->data(ClipboardMimeType()) == "1");
+}
+
+[[nodiscard]] bool OriginMatches(
+		const ClipboardOrigin &origin,
+		const ClipboardStorage &storage) {
+	return (origin.sessionId == storage.sessionId)
+		&& (origin.serial == storage.serial)
+		&& (origin.serial != 0);
+}
+
+[[nodiscard]] bool StoredDataMatches(
+		const ClipboardData &data,
+		const ClipboardStorage &storage) {
+	return std::visit([&](const auto &payload) {
+		return OriginMatches(payload.origin, storage);
+	}, data);
+}
+
+[[nodiscard]] ClipboardData StampClipboardData(ClipboardData data) {
+	auto &storage = Storage();
+	const auto serial = ++storage.serial;
+	return std::visit([&](auto payload) -> ClipboardData {
+		payload.origin.sessionId = storage.sessionId;
+		payload.origin.serial = serial;
+		return ClipboardData(std::move(payload));
+	}, std::move(data));
+}
+
+} // namespace
+
+QString ClipboardMimeType() {
+	return u"application/x-td-iv-editor"_q;
+}
+
+std::unique_ptr<QMimeData> MimeDataFromClipboardData(ClipboardData data) {
+	auto &storage = Storage();
+	storage.data = StampClipboardData(std::move(data));
+	auto result = std::make_unique<QMimeData>();
+	result->setData(ClipboardMimeType(), "1");
+	storage.mimeData = result.get();
+	return result;
+}
+
+std::optional<ClipboardData> ClipboardDataFromMimeData(
+		const QMimeData *mimeData) {
+	const auto &storage = Storage();
+	if (!MarkerMatches(mimeData)
+		|| !storage.data
+		|| !storage.mimeData
+		|| (storage.mimeData.data() != mimeData)
+		|| !StoredDataMatches(*storage.data, storage)) {
+		return std::nullopt;
+	}
+	return storage.data;
+}
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_clipboard.h b/Telegram/SourceFiles/iv/editor/iv_editor_clipboard.h
new file mode 100644
index 00000000000000..20956167dcb1c9
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_clipboard.h
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/iv_rich_page.h"
+
+#include <memory>
+#include <optional>
+#include <variant>
+#include <vector>
+
+class QMimeData;
+
+namespace Iv::Editor {
+
+struct ClipboardOrigin {
+	uint64 sessionId = 0;
+	uint64 serial = 0;
+};
+
+struct ClipboardBlockData {
+	ClipboardOrigin origin;
+	std::vector<RichPage::Block> blocks;
+};
+
+struct ClipboardListItemsData {
+	ClipboardOrigin origin;
+	RichPage::ListKind listKind = RichPage::ListKind::Bullet;
+	bool taskList = false;
+	std::vector<RichPage::ListItem> items;
+};
+
+using ClipboardData = std::variant<ClipboardBlockData, ClipboardListItemsData>;
+
+[[nodiscard]] QString ClipboardMimeType();
+[[nodiscard]] std::unique_ptr<QMimeData> MimeDataFromClipboardData(
+	ClipboardData data);
+[[nodiscard]] std::optional<ClipboardData> ClipboardDataFromMimeData(
+	const QMimeData *mimeData);
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_session.cpp b/Telegram/SourceFiles/iv/editor/iv_editor_session.cpp
new file mode 100644
index 00000000000000..962961e67fa854
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_session.cpp
@@ -0,0 +1,1911 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/editor/iv_editor_session.h"
+
+#include <QtCore/QFileInfo>
+#include <QtCore/QPointer>
+#include <QtGui/QMouseEvent>
+#include <QtWidgets/QApplication>
+#include <crl/crl_async.h>
+#include <crl/crl_on_main.h>
+
+#include "api/api_sending.h"
+#include "api/api_editing.h"
+#include "apiwrap.h"
+#include "base/weak_ptr.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "core/application.h"
+#include "core/shortcuts.h"
+#include "data/data_document.h"
+#include "data/data_location.h"
+#include "data/data_photo.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_helpers.h"
+#include "iv/iv_cached_media.h"
+#include "iv/editor/iv_editor_box.h"
+#include "iv/editor/iv_editor_state.h"
+#include "iv/editor/iv_editor_widget.h"
+#include "iv/iv_instance.h"
+#include "iv/iv_rich_message_serializer.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "mainwidget.h"
+#include "menu/menu_send.h"
+#include "settings/sections/settings_premium.h"
+#include "storage/file_upload.h"
+#include "storage/localimageloader.h"
+#include "storage/storage_account.h"
+#include "storage/storage_media_prepare.h"
+#include "ui/chat/attach/attach_prepare.h"
+#include "ui/controls/location_picker.h"
+#include "ui/rp_widget.h"
+#include "ui/widgets/separate_panel.h"
+#include "window/window_session_controller.h"
+
+#include <algorithm>
+#include <deque>
+#include <memory>
+#include <optional>
+#include <utility>
+#include <vector>
+
+#include "styles/style_boxes.h"
+
+namespace Iv::Editor {
+namespace {
+
+using PreparedFile = Ui::PreparedFile;
+using PreparedFileType = Ui::PreparedFile::Type;
+using PreparedList = Ui::PreparedList;
+
+enum class AttachmentState : uchar {
+	Uploading,
+	Finalizing,
+	Ready,
+	Failed,
+};
+
+struct PreparedDocumentInfo {
+	QSize dimensions;
+	QString title;
+	QString performer;
+	QString fileName;
+	int duration = 0;
+	bool audio = false;
+	bool animation = false;
+	bool video = false;
+};
+
+struct AttachmentMeta {
+	PreparedFileType type = PreparedFileType::None;
+	RichPage::BlockKind blockKind = RichPage::BlockKind::Unsupported;
+	QString caption;
+	QString displayName;
+	QSize dimensions;
+	QString audioTitle;
+	QString audioPerformer;
+	QString audioFileName;
+	int audioDuration = 0;
+	bool spoiler = false;
+	bool autoplay = false;
+	bool loop = false;
+};
+
+class PrepareAttachmentTask final : public Task {
+public:
+	PrepareAttachmentTask(
+		FileLoadTask::Args &&args,
+		Fn<void(std::shared_ptr<FilePrepareResult>)> done)
+	: _task(std::move(args))
+	, _done(std::move(done)) {
+	}
+
+	void process() override {
+		_task.process({ .generateGoodThumbnail = false });
+	}
+
+	void finish() override {
+		_done(_task.peekResult());
+	}
+
+private:
+	FileLoadTask _task;
+	Fn<void(std::shared_ptr<FilePrepareResult>)> _done;
+
+};
+
+[[nodiscard]] Ui::LocationPickerConfig ResolveMapsConfig(
+		not_null<Main::Session*> session) {
+	const auto &appConfig = session->appConfig();
+	auto map = appConfig.get<base::flat_map<QString, QString>>(
+		u"tdesktop_config_map"_q,
+		base::flat_map<QString, QString>());
+	return {
+		.mapsToken = map[u"maps"_q],
+		.geoToken = map[u"geo"_q],
+	};
+}
+
+[[nodiscard]] QString PreparedFileName(const PreparedFile &file) {
+	return file.displayName.isEmpty()
+		? QFileInfo(file.path).fileName()
+		: file.displayName;
+}
+
+[[nodiscard]] bool AcceptedPreparedFileType(PreparedFileType type) {
+	return (type == PreparedFileType::Photo)
+		|| (type == PreparedFileType::Video)
+		|| (type == PreparedFileType::Music);
+}
+
+[[nodiscard]] bool CanUseRichMessages(not_null<Main::Session*> session) {
+	return session->premium();
+}
+
+void ShowRichMessagesPremiumToast(
+		not_null<Window::SessionController*> controller) {
+	Settings::ShowPremiumPromoToast(
+		controller->uiShow(),
+		tr::lng_article_premium_required(
+			tr::now,
+			lt_link,
+			tr::link(tr::bold(
+				tr::lng_article_premium_required_link(tr::now))),
+			tr::marked),
+		u"rich_message"_q);
+}
+
+[[nodiscard]] bool IsRichMessageMediaKind(RichPage::BlockKind kind) {
+	switch (kind) {
+	case RichPage::BlockKind::Photo:
+	case RichPage::BlockKind::Video:
+	case RichPage::BlockKind::Audio:
+		return true;
+	default:
+		return false;
+	}
+}
+
+void CountRichPageMedia(
+		const std::vector<RichPage::Block> &blocks,
+		int *result) {
+	for (const auto &block : blocks) {
+		if (IsRichMessageMediaKind(block.kind)) {
+			++(*result);
+		}
+		CountRichPageMedia(block.blocks, result);
+		for (const auto &item : block.listItems) {
+			CountRichPageMedia(item.blocks, result);
+		}
+		for (const auto &item : block.mediaItems) {
+			if (IsRichMessageMediaKind(item.kind)) {
+				++(*result);
+			}
+		}
+	}
+}
+
+[[nodiscard]] int CountRichPageMedia(const RichPage &page) {
+	auto result = 0;
+	CountRichPageMedia(page.blocks, &result);
+	return result;
+}
+
+template <typename Container>
+[[nodiscard]] int CountAcceptedPreparedFiles(const Container &files) {
+	auto result = 0;
+	for (const auto &file : files) {
+		if (AcceptedPreparedFileType(file.type)) {
+			++result;
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] int CountAcceptedPreparedFiles(const PreparedList &list) {
+	return CountAcceptedPreparedFiles(list.files)
+		+ CountAcceptedPreparedFiles(list.filesToProcess);
+}
+
+[[nodiscard]] RichPage::RichText ToRichText(QString text) {
+	auto result = RichPage::RichText();
+	result.text.text = std::move(text);
+	return result;
+}
+
+[[nodiscard]] RichPage::BlockKind BlockKindForPreparedType(
+		PreparedFileType type) {
+	switch (type) {
+	case PreparedFileType::Photo:
+		return RichPage::BlockKind::Photo;
+	case PreparedFileType::Video:
+		return RichPage::BlockKind::Video;
+	case PreparedFileType::Music:
+		return RichPage::BlockKind::Audio;
+	default:
+		return RichPage::BlockKind::Unsupported;
+	}
+}
+
+[[nodiscard]] PreparedDocumentInfo DocumentInfoFromPrepared(
+		const MTPDocument &document);
+
+[[nodiscard]] RichPage::BlockKind BlockKindForPreparedResult(
+		const FilePrepareResult &prepared) {
+	if (prepared.type == SendMediaType::Photo) {
+		return RichPage::BlockKind::Photo;
+	}
+	if (prepared.type != SendMediaType::File) {
+		return RichPage::BlockKind::Unsupported;
+	}
+	const auto info = DocumentInfoFromPrepared(prepared.document);
+	if (info.video) {
+		return RichPage::BlockKind::Video;
+	}
+	if (info.audio) {
+		return RichPage::BlockKind::Audio;
+	}
+	return RichPage::BlockKind::Unsupported;
+}
+
+[[nodiscard]] QSize PhotoSizeFromPrepared(const MTPPhoto &photo) {
+	auto result = QSize();
+	photo.match([](const MTPDphotoEmpty &) {
+	}, [&](const MTPDphoto &data) {
+		const auto assign = [&](const QString &type, int width, int height) {
+			if (result.isEmpty() && (type == u"x"_q || type == u"w"_q)) {
+				result = QSize(width, height);
+			}
+			if (type == u"y"_q) {
+				result = QSize(width, height);
+			}
+		};
+		for (const auto &size : data.vsizes().v) {
+			size.match([](const MTPDphotoSizeEmpty &) {
+			}, [&](const MTPDphotoSize &row) {
+				assign(qs(row.vtype()), row.vw().v, row.vh().v);
+			}, [&](const MTPDphotoCachedSize &row) {
+				assign(qs(row.vtype()), row.vw().v, row.vh().v);
+			}, [&](const MTPDphotoStrippedSize &) {
+			}, [&](const MTPDphotoSizeProgressive &row) {
+				assign(qs(row.vtype()), row.vw().v, row.vh().v);
+			}, [&](const MTPDphotoPathSize &) {
+			});
+		}
+	});
+	return result;
+}
+
+[[nodiscard]] PreparedDocumentInfo DocumentInfoFromPrepared(
+		const MTPDocument &document) {
+	auto result = PreparedDocumentInfo();
+	document.match([](const MTPDdocumentEmpty &) {
+	}, [&](const MTPDdocument &data) {
+		const auto assign = [&](int width, int height, bool force) {
+			if (width <= 0 || height <= 0) {
+				return;
+			}
+			if (force || result.dimensions.isEmpty()) {
+				result.dimensions = QSize(width, height);
+			}
+		};
+		for (const auto &attribute : data.vattributes().v) {
+			attribute.match([&](const MTPDdocumentAttributeAudio &row) {
+				result.audio = true;
+				result.duration = row.vduration().v;
+				result.title = qs(row.vtitle().value_or_empty());
+				result.performer = qs(row.vperformer().value_or_empty());
+			}, [&](const MTPDdocumentAttributeFilename &row) {
+				result.fileName = qs(row.vfile_name());
+			}, [&](const MTPDdocumentAttributeImageSize &row) {
+				assign(row.vw().v, row.vh().v, false);
+			}, [&](const MTPDdocumentAttributeAnimated &) {
+				result.animation = true;
+			}, [&](const MTPDdocumentAttributeVideo &row) {
+				result.video = true;
+				assign(row.vw().v, row.vh().v, true);
+			}, [&](const auto &) {
+			});
+		}
+	});
+	return result;
+}
+
+[[nodiscard]] QVector<MTPDocumentAttribute> DocumentAttributesFromPrepared(
+		const FilePrepareResult &prepared) {
+	auto result = QVector<MTPDocumentAttribute>();
+	prepared.document.match([&](const MTPDdocument &data) {
+		result = data.vattributes().v;
+	}, [](const auto &) {
+	});
+	return result;
+}
+
+[[nodiscard]] QVector<MTPInputDocument> ToInputDocumentVector(
+		const std::vector<MTPInputDocument> &stickers) {
+	auto result = QVector<MTPInputDocument>();
+	result.reserve(int(stickers.size()));
+	for (const auto &sticker : stickers) {
+		result.push_back(sticker);
+	}
+	return result;
+}
+
+[[nodiscard]] AttachmentMeta BuildAttachmentMeta(const PreparedFile &file) {
+	auto result = AttachmentMeta{
+		.type = file.type,
+		.blockKind = BlockKindForPreparedType(file.type),
+		.caption = file.caption.text,
+		.displayName = PreparedFileName(file),
+		.dimensions = !file.shownDimensions.isEmpty()
+			? file.shownDimensions
+			: file.originalDimensions,
+		.spoiler = file.spoiler,
+	};
+	if (!file.information) {
+		result.audioFileName = result.displayName;
+		return result;
+	}
+	if (const auto song = std::get_if<Ui::PreparedFileInformation::Song>(
+			&file.information->media)) {
+		result.audioTitle = song->title;
+		result.audioPerformer = song->performer;
+		result.audioDuration = int(song->duration / 1000);
+		result.audioFileName = result.displayName;
+	} else if (const auto video = std::get_if<Ui::PreparedFileInformation::Video>(
+			&file.information->media)) {
+		result.autoplay = video->isGifv;
+		result.loop = video->isGifv;
+	}
+	return result;
+}
+
+[[nodiscard]] std::unique_ptr<FileLoadTask> BuildVideoCoverTask(
+		not_null<Main::Session*> session,
+		PeerId peer,
+		std::unique_ptr<PreparedFile> file) {
+	if (!file) {
+		return nullptr;
+	}
+	return std::make_unique<FileLoadTask>(FileLoadTask::Args{
+		.session = session,
+		.filepath = file->path,
+		.content = std::move(file->content),
+		.information = std::move(file->information),
+		.videoCover = nullptr,
+		.type = SendMediaType::Photo,
+		.to = FileLoadTo(
+			peer,
+			Api::SendOptions(),
+			FullReplyTo(),
+			MsgId()),
+		.caption = TextWithTags(),
+		.spoiler = false,
+		.album = nullptr,
+		.forceFile = false,
+		.sendLargePhotos = false,
+		.idOverride = 0,
+		.displayName = file->displayName,
+	});
+}
+
+[[nodiscard]] FileLoadTask::Args BuildPrepareTaskArgs(
+		not_null<Main::Session*> session,
+		PeerId peer,
+		PreparedFile file) {
+	const auto sendType = (file.type == PreparedFileType::Photo)
+		? SendMediaType::Photo
+		: SendMediaType::File;
+	return {
+		.session = session,
+		.filepath = file.path,
+		.content = std::move(file.content),
+		.information = std::move(file.information),
+		.videoCover = BuildVideoCoverTask(
+			session,
+			peer,
+			std::move(file.videoCover)),
+		.type = sendType,
+		.to = FileLoadTo(
+			peer,
+			Api::SendOptions(),
+			FullReplyTo(),
+			MsgId()),
+		.caption = TextWithTags(),
+		.spoiler = file.spoiler,
+		.album = nullptr,
+		.forceFile = false,
+		.sendLargePhotos = file.sendLargePhotos,
+		.idOverride = 0,
+		.displayName = file.displayName,
+	};
+}
+
+class ArticleSession final
+	: public std::enable_shared_from_this<ArticleSession>
+	, public base::has_weak_ptr {
+public:
+	static void ShowCompose(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		Api::SendAction action,
+		Fn<SendMenu::Details()> sendMenuDetails) {
+		auto session = std::shared_ptr<ArticleSession>(new ArticleSession(
+			controller,
+			peer,
+			Mode::Compose,
+			FullMsgId(peer->id, controller->session().data().nextLocalMessageId()),
+			std::make_shared<RichPage>(),
+			std::move(action),
+			std::move(sendMenuDetails),
+			std::nullopt));
+		session->showWindow();
+	}
+
+	static void ShowEdit(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item,
+		std::shared_ptr<const RichPage> richPage) {
+		if (!richPage || !CanEditRichPage(richPage)) {
+			controller->showToast(tr::lng_edit_error(tr::now));
+			return;
+		}
+		auto session = std::shared_ptr<ArticleSession>(new ArticleSession(
+			controller,
+			item->history()->peer,
+			Mode::Edit,
+			item->fullId(),
+			std::make_shared<RichPage>(*richPage),
+			std::nullopt,
+			nullptr,
+			EditedItemSnapshot{
+				.item = item,
+				.inlinePage = item->richPage(),
+				.summary = item->originalText(),
+				.fullPage = item->fullRichPage(),
+			}));
+		session->showWindow();
+	}
+
+	~ArticleSession() {
+		_submitDeferred = false;
+		for (const auto &attachment : _attachments) {
+			_session->uploader().cancel(attachment.uploadId);
+		}
+	}
+
+private:
+	enum class Mode {
+		Compose,
+		Edit,
+	};
+
+	struct AttachmentRecord {
+		FullMsgId uploadId;
+		PreparedFileType type = PreparedFileType::None;
+		RichPage::BlockKind blockKind = RichPage::BlockKind::Unsupported;
+		uint64 localMediaId = 0;
+		AttachmentState state = AttachmentState::Uploading;
+		float64 progress = 0.;
+		QString caption;
+		QString filename;
+		QString filemime;
+		QVector<MTPDocumentAttribute> attributes;
+		bool forceFile = false;
+		QString audioTitle;
+		QString audioPerformer;
+		QString audioFileName;
+		int audioDuration = 0;
+		QSize dimensions;
+		bool spoiler = false;
+		bool autoplay = false;
+		bool loop = false;
+		std::vector<State::BlockPath> blockLocators;
+		MTPInputPhoto inputPhoto;
+		MTPInputDocument inputDocument;
+		uint64 serverMediaId = 0;
+		uint64 accessHash = 0;
+		QByteArray fileReference;
+		PhotoData *serverPhoto = nullptr;
+		DocumentData *serverDocument = nullptr;
+	};
+
+	struct QueuedPrepare {
+		QPointer<Widget> editor;
+		PreparedFile file;
+		uint64 batchId = 0;
+	};
+
+	struct EditedItemSnapshot {
+		not_null<HistoryItem*> item;
+		std::shared_ptr<const RichPage> inlinePage;
+		TextWithEntities summary;
+		std::shared_ptr<const RichPage> fullPage;
+	};
+
+	ArticleSession(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		Mode mode,
+		FullMsgId articleId,
+		std::shared_ptr<RichPage> page,
+		std::optional<Api::SendAction> action,
+		Fn<SendMenu::Details()> sendMenuDetails,
+		std::optional<EditedItemSnapshot> edited)
+	: _controller(controller)
+	, _session(&controller->session())
+	, _show(controller->uiShow())
+	, _peer(peer)
+	, _mode(mode)
+	, _articleId(articleId)
+	, _composeAction(std::move(action))
+	, _sendMenuDetails(std::move(sendMenuDetails))
+	, _edited(std::move(edited))
+	, _page(page ? std::move(page) : std::make_shared<RichPage>())
+	, _runtime(CreateMessageMediaRuntime(
+		_session,
+		_articleId,
+		[](QString) {
+		},
+		[](QString) {
+		}))
+	, _showLimitToast([controller](RichMessageLimitError error) {
+		switch (error) {
+		case RichMessageLimitError::Length:
+			controller->showToast(tr::lng_article_limit_length(tr::now));
+			return;
+		case RichMessageLimitError::Blocks:
+			controller->showToast(tr::lng_article_limit_blocks(tr::now));
+			return;
+		case RichMessageLimitError::Depth:
+			controller->showToast(tr::lng_article_limit_depth(tr::now));
+			return;
+		case RichMessageLimitError::Media:
+			controller->showToast(tr::lng_article_limit_media(tr::now));
+			return;
+		case RichMessageLimitError::TableColumns:
+			controller->showToast(tr::lng_article_limit_columns(tr::now));
+			return;
+		}
+		controller->showToast(tr::lng_edit_error(tr::now));
+	})
+	, _limits(ResolveRichMessageLimits(_session))
+	, _state(std::make_shared<State>(_page, _runtime, _limits))
+	, _submitOptions(_composeAction ? _composeAction->options : Api::SendOptions()) {
+		subscribeToUploader();
+	}
+
+	[[nodiscard]] bool submitRequested() {
+		if (_submittedPage || _submitApiRequested) {
+			return false;
+		}
+		if (!CanUseRichMessages(_session)) {
+			ShowRichMessagesPremiumToast(_controller);
+			return false;
+		}
+		if (hasPendingPreparation()) {
+			_submitDeferred = true;
+			return false;
+		}
+		if (hasVisibleFailedAttachments()) {
+			showAttachmentFailedToast();
+			return false;
+		}
+		auto page = std::shared_ptr<const RichPage>(
+			std::make_shared<RichPage>(_state->richPage()));
+		if (const auto error = ValidateRichMessage(*page, _limits)) {
+			showRichMessageLimitToast(*error);
+			return false;
+		}
+		if (!applySubmittedLocalState(page)) {
+			_controller->showToast(tr::lng_edit_error(tr::now));
+			return false;
+		}
+		_submitDeferred = false;
+		_submittedPage = std::move(page);
+		_backgroundHold = shared_from_this();
+		maybeContinueSubmittedRequest();
+		return true;
+	}
+
+	[[nodiscard]] bool cancelRequested() {
+		_submitDeferred = false;
+		return true;
+	}
+
+	[[nodiscard]] HistoryItem *currentSubmittedItem() const {
+		return _session->data().message(_articleId);
+	}
+
+	[[nodiscard]] HistoryItem *ensureComposeLocalItem() {
+		if (const auto item = currentSubmittedItem()) {
+			return item;
+		}
+		if (!_composeAction) {
+			return nullptr;
+		}
+		auto action = *_composeAction;
+		const auto history = action.history;
+		const auto peer = history->peer;
+		auto flags = NewMessageFlags(peer);
+		if (action.replyTo) {
+			flags |= MessageFlag::HasReplyInfo;
+		}
+		Api::FillMessagePostFlags(action, peer, flags);
+		if (action.options.scheduled) {
+			flags |= MessageFlag::IsOrWasScheduled;
+		}
+		if (action.options.shortcutId) {
+			flags |= MessageFlag::ShortcutMessage;
+		}
+		const auto starsPaid = std::min(
+			peer->starsPerMessageChecked(),
+			action.options.starsApproved);
+		return history->addNewLocalMessage({
+			.id = _articleId.msg,
+			.flags = flags,
+			.from = NewMessageFromId(action),
+			.replyTo = action.replyTo,
+			.date = NewMessageDate(action.options),
+			.scheduleRepeatPeriod = action.options.scheduleRepeatPeriod,
+			.shortcutId = action.options.shortcutId,
+			.starsPaid = starsPaid,
+			.postAuthor = NewMessagePostAuthor(action),
+			.effectId = action.options.effectId,
+			.suggest = HistoryMessageSuggestInfo(action.options),
+		}, TextWithEntities(), MTP_messageMediaEmpty());
+	}
+
+	[[nodiscard]] bool keepsInlineRichPage() const {
+		return (_mode == Mode::Edit)
+			&& _edited
+			&& _edited->inlinePage
+			&& _edited->inlinePage->part;
+	}
+
+	[[nodiscard]] bool applySubmittedLocalState(
+			const std::shared_ptr<const RichPage> &page) {
+		const auto item = (_mode == Mode::Compose)
+			? ensureComposeLocalItem()
+			: currentSubmittedItem();
+		if (!item) {
+			return false;
+		}
+		if (keepsInlineRichPage()) {
+			item->setFullRichPage(page);
+			return true;
+		}
+		item->applyLocalRichPage(page);
+		return true;
+	}
+
+	void restoreEditedItem() {
+		if (!_edited) {
+			return;
+		}
+		if (const auto item = currentSubmittedItem()) {
+			if (keepsInlineRichPage()) {
+				if (_edited->fullPage) {
+					item->setFullRichPage(_edited->fullPage);
+				} else {
+					item->clearFullRichPage();
+				}
+				return;
+			}
+			item->applyLocalRichPage(_edited->inlinePage, _edited->summary);
+			if (_edited->fullPage) {
+				item->setFullRichPage(_edited->fullPage);
+			}
+		}
+	}
+
+	void finishSubmittedWork() {
+		_submitApiRequested = false;
+		_submittedPage = nullptr;
+		_backgroundHold = nullptr;
+	}
+
+	void failSubmittedWork(bool showToast) {
+		if (showToast) {
+			showAttachmentFailedToast();
+		}
+		if (_mode == Mode::Edit) {
+			restoreEditedItem();
+		} else if (const auto item = currentSubmittedItem()) {
+			item->sendFailed();
+		}
+		finishSubmittedWork();
+	}
+
+	[[nodiscard]] bool pageContainsAttachment(
+			const std::vector<RichPage::Block> &blocks,
+			const AttachmentRecord &attachment) const {
+		for (const auto &block : blocks) {
+			if (blockMatchesAttachment(block, attachment)
+				|| pageContainsAttachment(block.blocks, attachment)) {
+				return true;
+			}
+			for (const auto &item : block.listItems) {
+				if (pageContainsAttachment(item.blocks, attachment)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	[[nodiscard]] bool submittedPageContainsAttachment(
+			const AttachmentRecord &attachment) const {
+		return _submittedPage
+			&& pageContainsAttachment(_submittedPage->blocks, attachment);
+	}
+
+	[[nodiscard]] bool hasFailedSubmittedAttachments() const {
+		for (const auto &attachment : _attachments) {
+			if (attachment.state == AttachmentState::Failed
+				&& submittedPageContainsAttachment(attachment)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	[[nodiscard]] bool submittedAttachmentsReady() const {
+		for (const auto &attachment : _attachments) {
+			if (submittedPageContainsAttachment(attachment)
+				&& attachment.state != AttachmentState::Ready) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	[[nodiscard]] const AttachmentRecord *attachmentForBlock(
+			const RichPage::Block &block) const {
+		for (const auto &attachment : _attachments) {
+			if (blockMatchesAttachment(block, attachment)) {
+				return &attachment;
+			}
+		}
+		return nullptr;
+	}
+
+	[[nodiscard]] bool patchReadyAttachmentBlock(
+			RichPage::Block &block,
+			const AttachmentRecord &attachment) const {
+		if (attachment.state != AttachmentState::Ready) {
+			return false;
+		}
+		if (attachment.blockKind == RichPage::BlockKind::Photo) {
+			if (!attachment.serverPhoto || !attachment.serverMediaId) {
+				return false;
+			}
+			block.photoId = attachment.serverMediaId;
+			block.photo = attachment.serverPhoto;
+		} else {
+			if (!attachment.serverDocument || !attachment.serverMediaId) {
+				return false;
+			}
+			block.documentId = attachment.serverMediaId;
+			block.document = attachment.serverDocument;
+		}
+		return true;
+	}
+
+	[[nodiscard]] bool patchSubmittedBlocks(
+			std::vector<RichPage::Block> &blocks) const {
+		for (auto &block : blocks) {
+			if (const auto attachment = attachmentForBlock(block)) {
+				if (!patchReadyAttachmentBlock(block, *attachment)) {
+					return false;
+				}
+			}
+			if (!patchSubmittedBlocks(block.blocks)) {
+				return false;
+			}
+			for (auto &item : block.listItems) {
+				if (!patchSubmittedBlocks(item.blocks)) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	[[nodiscard]] std::optional<MTPInputRichMessage> serializeSubmittedPage() const {
+		if (!_submittedPage) {
+			return std::nullopt;
+		}
+		auto page = RichPage(*_submittedPage);
+		return patchSubmittedBlocks(page.blocks)
+			? SerializeInputRichMessage(_session, page)
+			: std::optional<MTPInputRichMessage>();
+	}
+
+	void maybeContinueSubmittedRequest() {
+		if (!_submittedPage || _submitApiRequested) {
+			return;
+		}
+		if (hasFailedSubmittedAttachments()) {
+			failSubmittedWork(false);
+			return;
+		}
+		if (!submittedAttachmentsReady()) {
+			return;
+		}
+		const auto richMessage = serializeSubmittedPage();
+		if (!richMessage) {
+			failSubmittedWork(true);
+			return;
+		}
+		const auto item = currentSubmittedItem();
+		if (!item) {
+			finishSubmittedWork();
+			return;
+		}
+		_submitApiRequested = true;
+		if (_mode == Mode::Compose) {
+			auto action = *_composeAction;
+			action.options = _submitOptions;
+			_session->api().sendRichMessage(item, *richMessage, std::move(action));
+			finishSubmittedWork();
+			return;
+		}
+		Api::EditRichMessage(
+			not_null{ item },
+			[weak = base::make_weak(this)] {
+				if (const auto session = weak.get()) {
+					return session->serializeSubmittedPage();
+				}
+				return std::optional<MTPInputRichMessage>();
+			},
+			_submitOptions,
+			[weak = base::make_weak(this)](mtpRequestId) {
+				if (const auto session = weak.get()) {
+					session->finishSubmittedWork();
+				}
+			},
+			[weak = base::make_weak(this)](const QString &error, mtpRequestId) {
+				if (const auto session = weak.get()) {
+					session->restoreEditedItem();
+					session->_controller->showToast(error.isEmpty()
+						? tr::lng_edit_error(tr::now)
+						: error);
+					session->finishSubmittedWork();
+				}
+			});
+	}
+
+	void requestSubmit(Api::SendOptions options) {
+		_submitOptions = std::move(options);
+		if (_composeAction) {
+			_composeAction->options = _submitOptions;
+		}
+		if (hasPendingPreparation()) {
+			_submitDeferred = true;
+			return;
+		}
+		if (hasVisibleFailedAttachments()) {
+			showAttachmentFailedToast();
+			return;
+		}
+		simulateSubmitClick();
+	}
+
+	void setupSubmitButton(not_null<Ui::RpWidget*> button) {
+		_submitButton = button;
+		if (_mode != Mode::Compose || !_sendMenuDetails) {
+			return;
+		}
+		const auto weak = base::make_weak(this);
+		const auto submit = [weak](Api::SendOptions options) {
+			if (const auto session = weak.get()) {
+				session->requestSubmit(std::move(options));
+			}
+		};
+		SendMenu::SetupMenuAndShortcuts(
+			button,
+			_controller->uiShow(),
+			[weak] {
+				if (const auto session = weak.get()) {
+					return session->_sendMenuDetails
+						? session->_sendMenuDetails()
+						: SendMenu::Details();
+				}
+				return SendMenu::Details();
+			},
+			SendMenu::DefaultCallback(_controller->uiShow(), submit));
+	}
+
+	void requestMedia(not_null<Widget*> editor, QPointer<QWidget> parent) {
+		if (!parent) {
+			return;
+		}
+		_editor = editor;
+		const auto weak = base::make_weak(this);
+		const auto editorPointer = QPointer<Widget>(editor.get());
+		FileDialog::GetOpenPath(
+			std::move(parent),
+			tr::lng_choose_file(tr::now),
+			FileDialog::PhotoVideoAudioFilesFilter(),
+			[weak, editorPointer](FileDialog::OpenResult &&result) mutable {
+				if (const auto session = weak.get()) {
+					session->handleMediaDialogResult(
+						editorPointer,
+						std::move(result));
+				}
+			});
+	}
+
+	void requestMap(
+			not_null<Widget*> editor,
+			QPointer<QWidget> parent,
+			rpl::producer<> closeRequests) {
+		if (!parent) {
+			return;
+		}
+		_editor = editor;
+		const auto config = ResolveMapsConfig(_session);
+		if (!Ui::LocationPicker::Available(config)) {
+			return;
+		}
+		const auto weak = base::make_weak(this);
+		const auto editorPointer = QPointer<Widget>(editor.get());
+		Ui::LocationPicker::Show({
+			.parent = static_cast<Ui::RpWidget*>(parent.data()),
+			.config = config,
+			.chooseLabel = tr::lng_maps_point_send(),
+			.session = _session,
+			.callback = [weak, editorPointer](::Data::InputVenue venue) {
+				if (const auto session = weak.get()) {
+					session->applyMapSelection(editorPointer, std::move(venue));
+				}
+			},
+			.quit = [] { Shortcuts::Launch(Shortcuts::Command::Quit); },
+			.storageId = _session->local().resolveStorageIdBots(),
+			.closeRequests = std::move(closeRequests),
+		});
+	}
+
+	void showWindow() {
+		_backgroundHold = shared_from_this();
+		auto descriptor = ShowWindowDescriptor{
+			.session = _session,
+			.show = _show,
+			.peer = _peer,
+			.state = _state,
+			.submitType = (_mode == Mode::Compose)
+				? ShowWindowDescriptor::SubmitType::Send
+				: ShowWindowDescriptor::SubmitType::Save,
+			.customEmojiPaused = [show = _show] {
+				return show->paused(ChatHelpers::PauseReason::Layer);
+			},
+			.cancelled = [session = shared_from_this()] {
+				return session->cancelRequested();
+			},
+			.confirmed = [session = shared_from_this()] {
+				return session->submitRequested();
+			},
+			.setupSubmitButton = [session = shared_from_this()](
+					not_null<Ui::RpWidget*> button) {
+				session->setupSubmitButton(button);
+			},
+			.requestMedia = [session = shared_from_this()](
+					not_null<Widget*> editor,
+					QPointer<QWidget> parent) {
+				session->requestMedia(editor, std::move(parent));
+			},
+			.requestMap = [session = shared_from_this()](
+					not_null<Widget*> editor,
+					QPointer<QWidget> parent,
+					rpl::producer<> closeRequests) {
+				session->requestMap(
+					editor,
+					std::move(parent),
+					std::move(closeRequests));
+			},
+			.closed = [session = shared_from_this()] {
+				session->windowClosed();
+			},
+			.showLimitToast = _showLimitToast,
+		};
+		_windowHost = ShowWindow(std::move(descriptor));
+	}
+
+	void windowClosed() {
+		_editor = nullptr;
+		_submitButton = nullptr;
+		_windowHost = nullptr;
+		if (!_submittedPage && !_submitApiRequested) {
+			_backgroundHold = nullptr;
+		}
+	}
+
+	void handleMediaDialogResult(
+		QPointer<Widget> editor,
+		FileDialog::OpenResult &&result) {
+		auto showError = [=](tr::phrase<> phrase) {
+			_controller->showToast(phrase(tr::now));
+		};
+		auto list = Storage::PreparedFileFromFilesDialog(
+			std::move(result),
+			[](const PreparedList &) {
+				return true;
+			},
+			showError,
+			st::sendMediaPreviewSize,
+			_session->premium());
+		if (!list) {
+			return;
+		}
+		applyPreparedList(editor, std::move(*list), ++_prepareBatchId);
+	}
+
+	void applyPreparedList(
+		QPointer<Widget> editor,
+		PreparedList list,
+		uint64 batchId) {
+		if (const auto accepted = CountAcceptedPreparedFiles(list);
+			accepted && exceedsMediaLimitWith(accepted)) {
+			showRichMessageLimitToast(RichMessageLimitError::Media);
+			return;
+		}
+		for (auto &file : list.files) {
+			applyPreparedFile(editor, std::move(file), batchId);
+		}
+		for (auto &file : list.filesToProcess) {
+			_prepareQueue.push_back({
+				.editor = editor,
+				.file = std::move(file),
+				.batchId = batchId,
+			});
+		}
+		enqueueNextPrepare();
+	}
+
+	void enqueueNextPrepare() {
+		if (_preparing) {
+			return;
+		}
+		while (!_prepareQueue.empty()
+			&& _prepareQueue.front().file.information) {
+			auto queued = std::move(_prepareQueue.front());
+			_prepareQueue.pop_front();
+			applyPreparedFile(
+				queued.editor,
+				std::move(queued.file),
+				queued.batchId);
+		}
+		if (_prepareQueue.empty()) {
+			maybeContinueDeferredSubmit();
+			return;
+		}
+		auto queued = std::move(_prepareQueue.front());
+		_prepareQueue.pop_front();
+		const auto weak = base::make_weak(this);
+		_preparing = true;
+		_preparingFileType = queued.file.type;
+		const auto sideLimit = PhotoSideLimit();
+		crl::async([weak, queued = std::move(queued), sideLimit]() mutable {
+			Storage::PrepareDetails(
+				queued.file,
+				st::sendMediaPreviewSize,
+				sideLimit);
+			crl::on_main([weak, queued = std::move(queued)]() mutable {
+				if (const auto session = weak.get()) {
+					session->preparedAsyncFile(std::move(queued));
+				}
+			});
+		});
+	}
+
+	void preparedAsyncFile(QueuedPrepare queued) {
+		_preparing = false;
+		_preparingFileType = PreparedFileType::None;
+		applyPreparedFile(
+			queued.editor,
+			std::move(queued.file),
+			queued.batchId);
+		enqueueNextPrepare();
+	}
+
+	void applyPreparedFile(
+		QPointer<Widget> editor,
+		PreparedFile file,
+		uint64 batchId) {
+		if (!AcceptedPreparedFileType(file.type)) {
+			showUnsupportedMediaToast(batchId);
+			return;
+		}
+		if (exceedsMediaLimitWith(1)) {
+			showRichMessageLimitToast(RichMessageLimitError::Media);
+			return;
+		}
+		prepareAttachment(editor, std::move(file), batchId);
+	}
+
+	void prepareAttachment(
+		QPointer<Widget> editor,
+		PreparedFile file,
+		uint64 batchId) {
+		const auto meta = BuildAttachmentMeta(file);
+		const auto weak = base::make_weak(this);
+		++_pendingAttachmentPrepareCount;
+		_attachmentPrepareQueue.addTask(
+			std::make_unique<PrepareAttachmentTask>(
+				BuildPrepareTaskArgs(_session, _peer->id, std::move(file)),
+				[weak, editor, meta, batchId](
+						std::shared_ptr<FilePrepareResult> prepared) mutable {
+					if (const auto session = weak.get()) {
+						session->attachmentPrepared(
+							editor,
+							std::move(meta),
+							std::move(prepared),
+							batchId);
+					}
+				}));
+	}
+
+	void attachmentPrepared(
+		QPointer<Widget> editor,
+		AttachmentMeta meta,
+		std::shared_ptr<FilePrepareResult> prepared,
+		uint64 batchId) {
+		_pendingAttachmentPrepareCount = std::max(
+			_pendingAttachmentPrepareCount - 1,
+			0);
+		if (!prepared) {
+			showAttachmentFailedToast();
+			maybeContinueDeferredSubmit();
+			return;
+		}
+		if (!editor) {
+			maybeContinueDeferredSubmit();
+			return;
+		}
+		if (meta.blockKind != BlockKindForPreparedResult(*prepared)) {
+			showUnsupportedMediaToast(batchId);
+			maybeContinueDeferredSubmit();
+			return;
+		}
+		startAttachmentUpload(editor, std::move(meta), std::move(prepared));
+		maybeContinueDeferredSubmit();
+	}
+
+	void startAttachmentUpload(
+		QPointer<Widget> editor,
+		AttachmentMeta meta,
+		std::shared_ptr<FilePrepareResult> prepared) {
+		if (!editor || !prepared) {
+			return;
+		}
+		if (exceedsMediaLimitWith(1)) {
+			showRichMessageLimitToast(RichMessageLimitError::Media);
+			return;
+		}
+		_editor = editor;
+		const auto uploadId = FullMsgId(
+			_peer->id,
+			_session->data().nextLocalMessageId());
+		auto record = AttachmentRecord{
+			.uploadId = uploadId,
+			.type = meta.type,
+			.blockKind = meta.blockKind,
+			.localMediaId = prepared->id,
+			.state = AttachmentState::Uploading,
+			.caption = meta.caption,
+			.filename = prepared->filename,
+			.filemime = prepared->filemime,
+			.attributes = DocumentAttributesFromPrepared(*prepared),
+			.forceFile = prepared->forceFile,
+			.audioTitle = meta.audioTitle,
+			.audioPerformer = meta.audioPerformer,
+			.audioFileName = meta.audioFileName.isEmpty()
+				? meta.displayName
+				: meta.audioFileName,
+			.audioDuration = meta.audioDuration,
+			.dimensions = meta.dimensions,
+			.spoiler = meta.spoiler,
+			.autoplay = meta.autoplay,
+			.loop = meta.loop,
+		};
+		if (record.blockKind == RichPage::BlockKind::Photo) {
+			const auto size = PhotoSizeFromPrepared(prepared->photo);
+			if (!size.isEmpty()) {
+				record.dimensions = size;
+			}
+		} else {
+			const auto info = DocumentInfoFromPrepared(prepared->document);
+			if (!info.dimensions.isEmpty()) {
+				record.dimensions = info.dimensions;
+			}
+			if (record.blockKind == RichPage::BlockKind::Audio) {
+				if (record.audioTitle.isEmpty()) {
+					record.audioTitle = info.title;
+				}
+				if (record.audioPerformer.isEmpty()) {
+					record.audioPerformer = info.performer;
+				}
+				if (record.audioFileName.isEmpty()) {
+					record.audioFileName = !info.fileName.isEmpty()
+						? info.fileName
+						: prepared->filename;
+				}
+				if (!record.audioDuration) {
+					record.audioDuration = info.duration;
+				}
+			} else {
+				record.autoplay = record.autoplay || info.animation;
+				record.loop = record.loop || info.animation;
+			}
+		}
+
+		_attachments.push_back(std::move(record));
+		auto &stored = _attachments.back();
+		editor->insertPreparedBlock(makeAttachmentBlock(stored));
+		refreshAttachmentLocators(_state->richPage(), stored);
+		if (stored.blockLocators.empty()) {
+			_attachments.pop_back();
+			return;
+		}
+		_session->uploader().upload(uploadId, prepared);
+		updateAttachmentProgress(stored);
+		requestEditorUpdate();
+	}
+
+	void applyMapSelection(
+		QPointer<Widget> editor,
+		::Data::InputVenue venue) {
+		if (!editor) {
+			return;
+		}
+		_editor = editor;
+		editor->insertPreparedBlock(makeMapBlock(std::move(venue)));
+	}
+
+	[[nodiscard]] RichPage::Block makeAttachmentBlock(
+			const AttachmentRecord &attachment) const {
+		auto block = RichPage::Block();
+		block.kind = attachment.blockKind;
+		block.caption = ToRichText(attachment.caption);
+		if (attachment.blockKind == RichPage::BlockKind::Photo) {
+			block.photoId = attachment.localMediaId;
+			block.width = attachment.dimensions.width();
+			block.height = attachment.dimensions.height();
+			block.spoiler = attachment.spoiler;
+		} else if (attachment.blockKind == RichPage::BlockKind::Video) {
+			block.documentId = attachment.localMediaId;
+			block.width = attachment.dimensions.width();
+			block.height = attachment.dimensions.height();
+			block.spoiler = attachment.spoiler;
+			block.autoplay = attachment.autoplay;
+			block.loop = attachment.loop;
+		} else if (attachment.blockKind == RichPage::BlockKind::Audio) {
+			block.documentId = attachment.localMediaId;
+			block.audioTitle = attachment.audioTitle;
+			block.audioPerformer = attachment.audioPerformer;
+			block.audioFileName = attachment.audioFileName;
+			block.audioDuration = attachment.audioDuration;
+		}
+		return block;
+	}
+
+	[[nodiscard]] RichPage::Block makeMapBlock(::Data::InputVenue venue) const {
+		const auto point = ::Data::LocationPoint(
+			venue.lat,
+			venue.lon,
+			::Data::LocationPoint::NoAccessHash);
+		const auto preview = ::Data::ComputeLocation(point);
+		auto caption = QString();
+		if (!venue.title.isEmpty() && !venue.address.isEmpty()) {
+			caption = venue.title + u"\n"_q + venue.address;
+		} else {
+			caption = !venue.title.isEmpty() ? venue.title : venue.address;
+		}
+		auto block = RichPage::Block();
+		block.kind = RichPage::BlockKind::Map;
+		block.latitude = venue.lat;
+		block.longitude = venue.lon;
+		block.accessHash = point.accessHash();
+		block.width = preview.width;
+		block.height = preview.height;
+		block.zoom = preview.zoom;
+		block.caption = ToRichText(std::move(caption));
+		return block;
+	}
+
+	void subscribeToUploader() {
+		_session->uploader().photoReady(
+		) | rpl::on_next([=](const Storage::UploadedMedia &data) {
+			if (const auto attachment = findAttachment(data.fullId)) {
+				finalizeUploadedPhoto(*attachment, data);
+			}
+		}, _lifetime);
+		_session->uploader().documentReady(
+		) | rpl::on_next([=](const Storage::UploadedMedia &data) {
+			if (const auto attachment = findAttachment(data.fullId)) {
+				finalizeUploadedDocument(*attachment, data);
+			}
+		}, _lifetime);
+		_session->uploader().photoProgress(
+		) | rpl::on_next([=](const FullMsgId &id) {
+			if (const auto attachment = findAttachment(id)) {
+				updateAttachmentProgress(*attachment);
+			}
+		}, _lifetime);
+		_session->uploader().documentProgress(
+		) | rpl::on_next([=](const FullMsgId &id) {
+			if (const auto attachment = findAttachment(id)) {
+				updateAttachmentProgress(*attachment);
+			}
+		}, _lifetime);
+		_session->uploader().photoFailed(
+		) | rpl::on_next([=](const FullMsgId &id) {
+			markAttachmentFailed(id);
+		}, _lifetime);
+		_session->uploader().documentFailed(
+		) | rpl::on_next([=](const FullMsgId &id) {
+			markAttachmentFailed(id);
+		}, _lifetime);
+	}
+
+	void finalizeUploadedPhoto(
+		AttachmentRecord &attachment,
+		const Storage::UploadedMedia &data) {
+		using Flag = MTPDinputMediaUploadedPhoto::Flag;
+		attachment.state = AttachmentState::Finalizing;
+		auto flags = MTPDinputMediaUploadedPhoto::Flags();
+		const auto stickers = ToInputDocumentVector(data.info.attachedStickers);
+		if (attachment.spoiler) {
+			flags |= Flag::f_spoiler;
+		}
+		if (!stickers.isEmpty()) {
+			flags |= Flag::f_stickers;
+		}
+		_session->api().request(MTPmessages_UploadMedia(
+			MTP_flags(0),
+			MTPstring(),
+			_peer->input(),
+			MTP_inputMediaUploadedPhoto(
+				MTP_flags(flags),
+				data.info.file,
+				MTP_vector<MTPInputDocument>(std::move(stickers)),
+				MTP_int(0),
+				MTPInputDocument())
+		)).done([weak = base::make_weak(this), uploadId = attachment.uploadId](
+				const MTPMessageMedia &result) {
+			if (const auto session = weak.get()) {
+				session->applyUploadedPhotoResult(uploadId, result);
+			}
+		}).fail([weak = base::make_weak(this), uploadId = attachment.uploadId](
+				const MTP::Error &) {
+			if (const auto session = weak.get()) {
+				session->markAttachmentFailed(uploadId);
+			}
+		}).send();
+	}
+
+	void finalizeUploadedDocument(
+		AttachmentRecord &attachment,
+		const Storage::UploadedMedia &data) {
+		using Flag = MTPDinputMediaUploadedDocument::Flag;
+		attachment.state = AttachmentState::Finalizing;
+		auto flags = MTPDinputMediaUploadedDocument::Flags();
+		if (attachment.forceFile) {
+			flags |= Flag::f_force_file;
+		}
+		const auto stickers = ToInputDocumentVector(data.info.attachedStickers);
+		if (data.info.thumb) {
+			flags |= Flag::f_thumb;
+		}
+		if (attachment.spoiler) {
+			flags |= Flag::f_spoiler;
+		}
+		if (!stickers.isEmpty()) {
+			flags |= Flag::f_stickers;
+		}
+		if (data.info.videoCover) {
+			flags |= Flag::f_video_cover;
+		}
+		auto attributes = !attachment.attributes.isEmpty()
+			? attachment.attributes
+			: QVector<MTPDocumentAttribute>(
+				1,
+				MTP_documentAttributeFilename(MTP_string(attachment.filename)));
+		_session->api().request(MTPmessages_UploadMedia(
+			MTP_flags(0),
+			MTPstring(),
+			_peer->input(),
+			MTP_inputMediaUploadedDocument(
+				MTP_flags(flags),
+				data.info.file,
+				data.info.thumb.value_or(MTPInputFile()),
+				MTP_string(attachment.filemime),
+				MTP_vector<MTPDocumentAttribute>(std::move(attributes)),
+				MTP_vector<MTPInputDocument>(std::move(stickers)),
+				data.info.videoCover.value_or(MTPInputPhoto()),
+				MTP_int(0),
+				MTP_int(0))
+		)).done([weak = base::make_weak(this), uploadId = attachment.uploadId](
+				const MTPMessageMedia &result) {
+			if (const auto session = weak.get()) {
+				session->applyUploadedDocumentResult(uploadId, result);
+			}
+		}).fail([weak = base::make_weak(this), uploadId = attachment.uploadId](
+				const MTP::Error &) {
+			if (const auto session = weak.get()) {
+				session->markAttachmentFailed(uploadId);
+			}
+		}).send();
+	}
+
+	void applyUploadedPhotoResult(
+		FullMsgId uploadId,
+		const MTPMessageMedia &result) {
+		const auto attachment = findAttachment(uploadId);
+		if (!attachment) {
+			return;
+		}
+		auto ok = false;
+		result.match([&](const MTPDmessageMediaPhoto &media) {
+			const auto photo = media.vphoto();
+			if (!photo || photo->type() != mtpc_photo) {
+				return;
+			}
+			const auto &fields = photo->c_photo();
+			attachment->state = AttachmentState::Ready;
+			attachment->serverMediaId = fields.vid().v;
+			attachment->accessHash = fields.vaccess_hash().v;
+			attachment->fileReference = fields.vfile_reference().v;
+			attachment->serverPhoto = _session->data().processPhoto(*photo);
+			attachment->inputPhoto = MTP_inputPhoto(
+				fields.vid(),
+				fields.vaccess_hash(),
+				fields.vfile_reference());
+			ok = true;
+		}, [&](const auto &) {
+		});
+		if (!ok) {
+			markAttachmentFailed(uploadId);
+			return;
+		}
+		attachment->progress = 1.;
+		if (_editor) {
+			auto patched = true;
+			_editor->applyExternalRichPageMutation([&](RichPage &page) {
+				const auto result = patchVisibleAttachmentBlocks(
+					page,
+					*attachment);
+				patched = patched && result;
+				return result;
+			});
+			if (!patched) {
+				requestEditorUpdate();
+			}
+		} else if (!patchVisibleAttachmentBlocks(
+			*visibleRichPage(),
+			*attachment)) {
+			requestEditorUpdate();
+		} else {
+			_state->resyncAfterExternalRichPageMutation();
+			requestEditorUpdate();
+		}
+		maybeContinueSubmittedRequest();
+	}
+
+	void applyUploadedDocumentResult(
+		FullMsgId uploadId,
+		const MTPMessageMedia &result) {
+		const auto attachment = findAttachment(uploadId);
+		if (!attachment) {
+			return;
+		}
+		auto ok = false;
+		result.match([&](const MTPDmessageMediaDocument &media) {
+			const auto document = media.vdocument();
+			if (!document || document->type() != mtpc_document) {
+				return;
+			}
+			const auto &fields = document->c_document();
+			attachment->state = AttachmentState::Ready;
+			attachment->serverMediaId = fields.vid().v;
+			attachment->accessHash = fields.vaccess_hash().v;
+			attachment->fileReference = fields.vfile_reference().v;
+			attachment->serverDocument = _session->data().processDocument(*document);
+			attachment->inputDocument = MTP_inputDocument(
+				fields.vid(),
+				fields.vaccess_hash(),
+				fields.vfile_reference());
+			ok = true;
+		}, [&](const auto &) {
+		});
+		if (!ok) {
+			markAttachmentFailed(uploadId);
+			return;
+		}
+		attachment->progress = 1.;
+		if (_editor) {
+			auto patched = true;
+			_editor->applyExternalRichPageMutation([&](RichPage &page) {
+				const auto result = patchVisibleAttachmentBlocks(
+					page,
+					*attachment);
+				patched = patched && result;
+				return result;
+			});
+			if (!patched) {
+				requestEditorUpdate();
+			}
+		} else if (!patchVisibleAttachmentBlocks(
+			*visibleRichPage(),
+			*attachment)) {
+			requestEditorUpdate();
+		} else {
+			_state->resyncAfterExternalRichPageMutation();
+			requestEditorUpdate();
+		}
+		maybeContinueSubmittedRequest();
+	}
+
+	void markAttachmentFailed(FullMsgId uploadId) {
+		if (const auto attachment = findAttachment(uploadId)) {
+			attachment->state = AttachmentState::Failed;
+			updateAttachmentProgress(*attachment);
+			showAttachmentFailedToast();
+			requestEditorUpdate();
+			maybeContinueSubmittedRequest();
+		}
+	}
+
+	void updateAttachmentProgress(AttachmentRecord &attachment) {
+		if (attachment.state == AttachmentState::Ready) {
+			attachment.progress = 1.;
+		} else if ((attachment.state == AttachmentState::Uploading)
+			|| (attachment.state == AttachmentState::Finalizing)) {
+			if (attachment.blockKind == RichPage::BlockKind::Photo) {
+				attachment.progress = _session->data().photo(
+					attachment.localMediaId)->progress();
+			} else {
+				attachment.progress = _session->data().document(
+					attachment.localMediaId)->progress();
+			}
+		}
+		requestEditorUpdate();
+	}
+
+	void requestEditorUpdate() {
+		if (_editor) {
+			_editor->update();
+		}
+	}
+
+	[[nodiscard]] AttachmentRecord *findAttachment(FullMsgId uploadId) {
+		for (auto &attachment : _attachments) {
+			if (attachment.uploadId == uploadId) {
+				return &attachment;
+			}
+		}
+		return nullptr;
+	}
+
+	[[nodiscard]] bool blockMatchesAttachment(
+		const RichPage::Block &block,
+		const AttachmentRecord &attachment) const {
+		const auto mediaIdMatches = [&](uint64 id) {
+			return id
+				&& ((id == attachment.localMediaId)
+					|| (attachment.serverMediaId
+						&& (id == attachment.serverMediaId)));
+		};
+		switch (attachment.blockKind) {
+		case RichPage::BlockKind::Photo:
+			return (block.kind == RichPage::BlockKind::Photo)
+				&& mediaIdMatches(block.photoId);
+		case RichPage::BlockKind::Video:
+			return (block.kind == RichPage::BlockKind::Video)
+				&& mediaIdMatches(block.documentId);
+		case RichPage::BlockKind::Audio:
+			return (block.kind == RichPage::BlockKind::Audio)
+				&& mediaIdMatches(block.documentId);
+		default:
+			return false;
+		}
+	}
+
+	void collectBlockLocators(
+		const std::vector<RichPage::Block> &blocks,
+		const State::BlockContainerPath &container,
+		const AttachmentRecord &attachment,
+		std::vector<State::BlockPath> &result) const {
+		for (auto i = 0, count = int(blocks.size()); i != count; ++i) {
+			const auto path = State::BlockPath{
+				.container = container,
+				.index = i,
+			};
+			const auto &block = blocks[i];
+			if (blockMatchesAttachment(block, attachment)) {
+				result.push_back(path);
+			}
+			if (!block.blocks.empty()) {
+				auto child = container;
+				child.steps.push_back({
+					.kind = State::BlockContainerKind::BlockChildren,
+					.blockIndex = i,
+				});
+				collectBlockLocators(
+					block.blocks,
+					child,
+					attachment,
+					result);
+			}
+			for (auto itemIndex = 0, items = int(block.listItems.size());
+				itemIndex != items;
+				++itemIndex) {
+				const auto &itemBlocks = block.listItems[itemIndex].blocks;
+				if (itemBlocks.empty()) {
+					continue;
+				}
+				auto child = container;
+				child.steps.push_back({
+					.kind = State::BlockContainerKind::ListItemChildren,
+					.blockIndex = i,
+					.listItemIndex = itemIndex,
+				});
+				collectBlockLocators(
+					itemBlocks,
+					child,
+					attachment,
+					result);
+			}
+		}
+	}
+
+	void refreshAttachmentLocators(
+		const RichPage &page,
+		AttachmentRecord &attachment) {
+		auto locators = std::vector<State::BlockPath>();
+		collectBlockLocators(
+			page.blocks,
+			State::BlockContainerPath(),
+			attachment,
+			locators);
+		attachment.blockLocators = std::move(locators);
+	}
+
+	[[nodiscard]] RichPage *visibleRichPage() const {
+		return &const_cast<RichPage&>(_state->richPage());
+	}
+
+	[[nodiscard]] std::vector<RichPage::Block> *visibleBlockContainer(
+		RichPage &page,
+		const State::BlockContainerPath &path) const {
+		auto result = &page.blocks;
+		for (const auto &step : path.steps) {
+			switch (step.kind) {
+			case State::BlockContainerKind::Root:
+				break;
+			case State::BlockContainerKind::BlockChildren:
+				if (step.blockIndex < 0 || step.blockIndex >= int(result->size())) {
+					return nullptr;
+				}
+				result = &(*result)[step.blockIndex].blocks;
+				break;
+			case State::BlockContainerKind::ListItemChildren: {
+				if (step.blockIndex < 0 || step.blockIndex >= int(result->size())) {
+					return nullptr;
+				}
+				auto &block = (*result)[step.blockIndex];
+				if (step.listItemIndex < 0
+					|| step.listItemIndex >= int(block.listItems.size())) {
+					return nullptr;
+				}
+				result = &block.listItems[step.listItemIndex].blocks;
+			} break;
+			}
+		}
+		return result;
+	}
+
+	[[nodiscard]] RichPage::Block *visibleBlock(
+		RichPage &page,
+		const State::BlockPath &path) const {
+		const auto blocks = visibleBlockContainer(page, path.container);
+		if (!blocks || path.index < 0 || path.index >= int(blocks->size())) {
+			return nullptr;
+		}
+		return &(*blocks)[path.index];
+	}
+
+	[[nodiscard]] bool patchVisibleAttachmentBlocks(
+		RichPage &page,
+		AttachmentRecord &attachment) {
+		refreshAttachmentLocators(page, attachment);
+		for (const auto &locator : attachment.blockLocators) {
+			const auto block = visibleBlock(page, locator);
+			if (!block || !blockMatchesAttachment(*block, attachment)) {
+				continue;
+			}
+			if (!patchReadyAttachmentBlock(*block, attachment)) {
+				return false;
+			}
+		}
+		refreshAttachmentLocators(page, attachment);
+		return true;
+	}
+
+	[[nodiscard]] int pendingAttachmentPlaceholders() const {
+		auto result = _pendingAttachmentPrepareCount;
+		if (AcceptedPreparedFileType(_preparingFileType)) {
+			++result;
+		}
+		for (const auto &queued : _prepareQueue) {
+			if (AcceptedPreparedFileType(queued.file.type)) {
+				++result;
+			}
+		}
+		return result;
+	}
+
+	[[nodiscard]] bool exceedsMediaLimitWith(int additionalMedia) const {
+		return (CountRichPageMedia(_state->richPage())
+			+ pendingAttachmentPlaceholders()
+			+ additionalMedia) > _limits.maxMedia;
+	}
+
+	[[nodiscard]] bool hasVisibleAttachmentBlock(AttachmentRecord &attachment) {
+		refreshAttachmentLocators(_state->richPage(), attachment);
+		return !attachment.blockLocators.empty();
+	}
+
+	[[nodiscard]] bool hasVisibleFailedAttachments() {
+		for (auto &attachment : _attachments) {
+			if (attachment.state == AttachmentState::Failed
+				&& hasVisibleAttachmentBlock(attachment)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	void showAttachmentFailedToast() {
+		_controller->showToast(tr::lng_attach_failed(tr::now));
+	}
+
+	void showRichMessageLimitToast(RichMessageLimitError error) const {
+		_showLimitToast(error);
+	}
+
+	void showUnsupportedMediaToast(uint64 batchId) {
+		if (_rejectedToastBatchId == batchId) {
+			return;
+		}
+		_rejectedToastBatchId = batchId;
+		_controller->showToast(tr::lng_iv_editor_media_invalid_file(tr::now));
+	}
+
+	[[nodiscard]] bool hasPendingPreparation() const {
+		return _preparing
+			|| !_prepareQueue.empty()
+			|| (_pendingAttachmentPrepareCount > 0);
+	}
+
+	void maybeContinueDeferredSubmit() {
+		if (!_submitDeferred || hasPendingPreparation()) {
+			return;
+		}
+		_submitDeferred = false;
+		simulateSubmitClick();
+	}
+
+	void simulateSubmitClick() {
+		if (!_submitButton) {
+			return;
+		}
+		const auto post = [button = _submitButton](QEvent::Type type) {
+			if (!button) {
+				return;
+			}
+			QApplication::postEvent(
+				button,
+				new QMouseEvent(
+					type,
+					QPointF(0, 0),
+					Qt::LeftButton,
+					Qt::LeftButton,
+					Qt::NoModifier));
+		};
+		post(QEvent::MouseButtonPress);
+		post(QEvent::MouseButtonRelease);
+	}
+
+	const not_null<Window::SessionController*> _controller;
+	const not_null<Main::Session*> _session;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const not_null<PeerData*> _peer;
+	const Mode _mode;
+	const FullMsgId _articleId;
+	std::optional<Api::SendAction> _composeAction;
+	const Fn<SendMenu::Details()> _sendMenuDetails;
+	const std::optional<EditedItemSnapshot> _edited;
+	const std::shared_ptr<RichPage> _page;
+	const std::shared_ptr<Markdown::MediaRuntime> _runtime;
+	const Fn<void(RichMessageLimitError)> _showLimitToast;
+	const RichMessageLimits _limits;
+	const std::shared_ptr<State> _state;
+	Api::SendOptions _submitOptions;
+	QPointer<Ui::RpWidget> _submitButton;
+	QPointer<Widget> _editor;
+	std::unique_ptr<WindowHost> _windowHost;
+	std::shared_ptr<ArticleSession> _backgroundHold;
+	std::shared_ptr<const RichPage> _submittedPage;
+	std::vector<AttachmentRecord> _attachments;
+	std::deque<QueuedPrepare> _prepareQueue;
+	TaskQueue _attachmentPrepareQueue;
+	rpl::lifetime _lifetime;
+	uint64 _prepareBatchId = 0;
+	uint64 _rejectedToastBatchId = 0;
+	int _pendingAttachmentPrepareCount = 0;
+	bool _preparing = false;
+	PreparedFileType _preparingFileType = PreparedFileType::None;
+	bool _submitDeferred = false;
+	bool _submitApiRequested = false;
+
+};
+
+} // namespace
+
+void ShowComposeBox(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		Api::SendAction action,
+		Fn<SendMenu::Details()> sendMenuDetails) {
+	if (!CanUseRichMessages(&controller->session())) {
+		ShowRichMessagesPremiumToast(controller);
+		return;
+	}
+	ArticleSession::ShowCompose(
+		controller,
+		peer,
+		std::move(action),
+		std::move(sendMenuDetails));
+}
+
+void ShowEditBox(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item) {
+	if (!CanUseRichMessages(&controller->session())) {
+		ShowRichMessagesPremiumToast(controller);
+		return;
+	}
+	const auto weak = base::make_weak(controller);
+	const auto itemId = item->fullId();
+	Core::App().iv().resolveRichMessage(controller, item, [=](
+			std::shared_ptr<const RichPage> page) {
+		const auto strong = weak.get();
+		const auto current = strong
+			? strong->session().data().message(itemId)
+			: nullptr;
+		if (!strong || !current) {
+			return;
+		}
+		if (!page || !CanEditRichPage(page)) {
+			strong->showToast(tr::lng_edit_error(tr::now));
+			return;
+		}
+		ArticleSession::ShowEdit(
+			not_null{ strong },
+			not_null{ current },
+			std::move(page));
+	});
+}
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_session.h b/Telegram/SourceFiles/iv/editor/iv_editor_session.h
new file mode 100644
index 00000000000000..42b5c36bc4c5c5
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_session.h
@@ -0,0 +1,32 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "api/api_common.h"
+#include "base/basic_types.h"
+#include "menu/menu_send_details.h"
+
+class HistoryItem;
+class PeerData;
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Iv::Editor {
+
+void ShowComposeBox(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> peer,
+	Api::SendAction action,
+	Fn<SendMenu::Details()> sendMenuDetails);
+void ShowEditBox(
+	not_null<Window::SessionController*> controller,
+	not_null<HistoryItem*> item);
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_state.cpp b/Telegram/SourceFiles/iv/editor/iv_editor_state.cpp
new file mode 100644
index 00000000000000..18462c7d8f6345
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_state.cpp
@@ -0,0 +1,5616 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/editor/iv_editor_state.h"
+
+#include <algorithm>
+#include <limits>
+#include <utility>
+
+namespace Iv::Editor {
+namespace {
+
+using Block = RichPage::Block;
+using BlockContainerKind = State::BlockContainerKind;
+using BlockContainerPath = State::BlockContainerPath;
+using ApplyResult = State::ApplyResult;
+using BlockKind = RichPage::BlockKind;
+using BoundaryAction = State::BoundaryTarget::Action;
+using BlockPath = State::BlockPath;
+using FieldMode = State::FieldMode;
+using InsertBlockType = State::InsertBlockType;
+using InsertionAnchor = State::InsertionAnchor;
+using LeafKind = State::LeafKind;
+using LeafPath = State::LeafPath;
+using ListItem = RichPage::ListItem;
+using ListKind = RichPage::ListKind;
+using NativeInstantViewLeafUpdateResult
+	= Markdown::NativeInstantViewLeafUpdateResult;
+using PreparedBlockContainerKind = Markdown::PreparedEditBlockContainerKind;
+using PreparedEditLeafKind = Markdown::PreparedEditLeafKind;
+using PreparedEditLeafSource = Markdown::PreparedEditLeafSource;
+using PreparedEditSelectionKind = Markdown::PreparedEditSelectionKind;
+using PreparedBlockContainerPath = Markdown::PreparedEditBlockContainerPath;
+using PreparedBlockPath = Markdown::PreparedEditBlockPath;
+using PreparedBlockContainerStep = Markdown::PreparedEditBlockContainerStep;
+using PreparedEditSelection = Markdown::PreparedEditSelection;
+using PreparedMutationKind = State::PreparedMutationKind;
+using RemovalKind = State::RemovalKind;
+using RemovalTarget = State::RemovalTarget;
+using RichText = RichPage::RichText;
+using TableCell = RichPage::TableCell;
+using TableRow = RichPage::TableRow;
+using TaskState = RichPage::TaskState;
+using TextNodeDescriptor = State::TextNodeDescriptor;
+
+constexpr auto kMaxRichTextNodeLength = 16000;
+constexpr auto kMaxCommittedFieldLength = 256 * 1024;
+
+[[nodiscard]] TextWithEntities MakeText(QString text) {
+	auto result = TextWithEntities();
+	result.text = std::move(text);
+	return result;
+}
+
+[[nodiscard]] std::vector<TextWithEntities> SplitFieldText(
+		TextWithEntities text) {
+	auto result = std::vector<TextWithEntities>();
+	auto left = std::move(text);
+	auto consumed = 0;
+	while (!left.text.isEmpty() && consumed < kMaxCommittedFieldLength) {
+		auto part = TextWithEntities();
+		const auto limit = std::min(
+			kMaxRichTextNodeLength,
+			kMaxCommittedFieldLength - consumed);
+		if (!TextUtilities::CutPart(part, left, limit)
+			|| part.text.isEmpty()) {
+			break;
+		}
+		consumed += part.text.size();
+		result.push_back(std::move(part));
+	}
+	return result;
+}
+
+[[nodiscard]] TextWithEntities JoinText(
+		TextWithEntities before,
+		TextWithEntities selected,
+		TextWithEntities after) {
+	before.append(std::move(selected));
+	before.append(std::move(after));
+	return before;
+}
+
+[[nodiscard]] BlockContainerPath BlockChildrenContainer(BlockPath path) {
+	auto result = std::move(path.container);
+	result.steps.push_back({
+		.kind = BlockContainerKind::BlockChildren,
+		.blockIndex = path.index,
+	});
+	return result;
+}
+
+[[nodiscard]] BlockContainerPath ListItemChildrenContainer(
+		BlockPath path,
+		int itemIndex) {
+	auto result = std::move(path.container);
+	result.steps.push_back({
+		.kind = BlockContainerKind::ListItemChildren,
+		.blockIndex = path.index,
+		.listItemIndex = itemIndex,
+	});
+	return result;
+}
+
+[[nodiscard]] PreparedBlockContainerPath ToPreparedBlockContainerPath(
+		const BlockContainerPath &path) {
+	auto result = PreparedBlockContainerPath();
+	result.steps.reserve(path.steps.size());
+	for (const auto &step : path.steps) {
+		auto converted = PreparedBlockContainerStep();
+		converted.blockIndex = step.blockIndex;
+		converted.listItemIndex = step.listItemIndex;
+		switch (step.kind) {
+		case BlockContainerKind::Root:
+			continue;
+		case BlockContainerKind::BlockChildren:
+			converted.kind = PreparedBlockContainerKind::BlockChildren;
+			break;
+		case BlockContainerKind::ListItemChildren:
+			converted.kind = PreparedBlockContainerKind::ListItemChildren;
+			break;
+		}
+		result.steps.push_back(converted);
+	}
+	return result;
+}
+
+[[nodiscard]] bool ContainerHasPrefix(
+		const BlockContainerPath &path,
+		const BlockContainerPath &prefix) {
+	if (path.steps.size() < prefix.steps.size()) {
+		return false;
+	}
+	return std::equal(
+		prefix.steps.begin(),
+		prefix.steps.end(),
+		path.steps.begin());
+}
+
+[[nodiscard]] bool IndexInRange(int index, int from, int till) {
+	return (index >= from) && (index < till);
+}
+
+[[nodiscard]] bool ShiftBlockContainerPathAfterRemovedBlock(
+		BlockContainerPath &path,
+		const BlockPath &removed) {
+	if (!ContainerHasPrefix(path, removed.container)) {
+		return true;
+	}
+	const auto size = removed.container.steps.size();
+	if (path.steps.size() == size) {
+		return true;
+	}
+	auto &step = path.steps[size];
+	if (step.blockIndex == removed.index) {
+		return false;
+	} else if (step.blockIndex > removed.index) {
+		--step.blockIndex;
+	}
+	return true;
+}
+
+[[nodiscard]] bool ShiftBlockPathAfterRemovedBlock(
+		BlockPath &path,
+		const BlockPath &removed) {
+	if (path.container == removed.container) {
+		if (path.index == removed.index) {
+			return false;
+		} else if (path.index > removed.index) {
+			--path.index;
+		}
+		return true;
+	}
+	return ShiftBlockContainerPathAfterRemovedBlock(path.container, removed);
+}
+
+[[nodiscard]] std::optional<int> BlockIndexInContainer(
+		const LeafPath &leaf,
+		const BlockContainerPath &container) {
+	if (leaf.block.container == container) {
+		return leaf.block.index;
+	}
+	if (!ContainerHasPrefix(leaf.block.container, container)
+		|| leaf.block.container.steps.size() <= container.steps.size()) {
+		return std::nullopt;
+	}
+	const auto &step = leaf.block.container.steps[container.steps.size()];
+	return (step.kind == BlockContainerKind::BlockChildren
+			|| step.kind == BlockContainerKind::ListItemChildren)
+		? std::make_optional(step.blockIndex)
+		: std::nullopt;
+}
+
+[[nodiscard]] std::optional<int> ListItemIndexForLeaf(
+		const LeafPath &leaf,
+		const BlockPath &block) {
+	if (leaf.block == block && leaf.kind == LeafKind::ListItemText) {
+		return leaf.listItemIndex;
+	}
+	if (!ContainerHasPrefix(leaf.block.container, block.container)
+		|| leaf.block.container.steps.size() <= block.container.steps.size()) {
+		return std::nullopt;
+	}
+	const auto &step = leaf.block.container.steps[block.container.steps.size()];
+	return (step.kind == BlockContainerKind::ListItemChildren
+			&& step.blockIndex == block.index)
+		? std::make_optional(step.listItemIndex)
+		: std::nullopt;
+}
+
+[[nodiscard]] std::optional<int> TableRowIndexForLeaf(
+		const LeafPath &leaf,
+		const BlockPath &block) {
+	if (!(leaf.block == block)) {
+		return std::nullopt;
+	}
+	if (leaf.kind == LeafKind::BlockText) {
+		return -1;
+	}
+	return (leaf.kind == LeafKind::TableCellText)
+		? std::make_optional(leaf.tableRowIndex)
+		: std::nullopt;
+}
+
+[[nodiscard]] std::optional<int> TableCellIndexForLeaf(
+		const LeafPath &leaf,
+		const BlockPath &block,
+		int rowIndex) {
+	return (leaf.block == block
+			&& leaf.kind == LeafKind::TableCellText
+			&& leaf.tableRowIndex == rowIndex)
+		? std::make_optional(leaf.tableCellIndex)
+		: std::nullopt;
+}
+
+using TableGridOccupancyRow = std::vector<char>;
+using TableGridOccupancy = std::vector<TableGridOccupancyRow>;
+
+struct TableGridCellReference {
+	int rowIndex = -1;
+	int cellIndex = -1;
+	int rowFrom = -1;
+	int rowTill = -1;
+	int columnFrom = -1;
+	int columnTill = -1;
+};
+
+struct TableGrid {
+	std::vector<TableGridCellReference> cells;
+	TableGridOccupancy occupancy;
+	int rowCount = 0;
+	int columnCount = 0;
+};
+
+[[nodiscard]] int NormalizeTableSpan(int span) {
+	return std::max(span, 1);
+}
+
+[[nodiscard]] int ClampTableRowspan(
+		int rawRowspan,
+		int row,
+		int rowCount) {
+	if ((row < 0) || (row >= rowCount) || (rowCount <= 0)) {
+		return 0;
+	}
+	const auto remainingRows = int64(rowCount) - row;
+	return int(std::min<int64>(NormalizeTableSpan(rawRowspan), remainingRows));
+}
+
+[[nodiscard]] int ClampTableColspan(
+		int rawColspan,
+		int column,
+		int maxColumns) {
+	if ((column < 0) || (column >= maxColumns) || (maxColumns <= 0)) {
+		return 0;
+	}
+	const auto remainingColumns = int64(maxColumns) - column;
+	return int(std::min<int64>(
+		NormalizeTableSpan(rawColspan),
+		remainingColumns));
+}
+
+[[nodiscard]] bool CanOccupyTableSlots(
+		const TableGridOccupancy &occupancy,
+		int row,
+		int column,
+		int rowspan,
+		int colspan) {
+	if ((row < 0)
+		|| (column < 0)
+		|| (rowspan <= 0)
+		|| (colspan <= 0)
+		|| (row >= int(occupancy.size()))) {
+		return false;
+	}
+	const auto rowLimit = int(std::min<int64>(
+		int64(row) + rowspan,
+		occupancy.size()));
+	const auto columnLimit64 = int64(column) + colspan;
+	if (columnLimit64 <= column) {
+		return false;
+	}
+	const auto columnLimit = int(std::min<int64>(
+		columnLimit64,
+		std::numeric_limits<int>::max()));
+	for (auto currentRow = row; currentRow < rowLimit; ++currentRow) {
+		const auto &occupied = occupancy[currentRow];
+		const auto occupiedLimit = std::min(columnLimit, int(occupied.size()));
+		for (auto currentColumn = column;
+			currentColumn < occupiedLimit;
+			++currentColumn) {
+			if (occupied[currentColumn]) {
+				return false;
+			}
+		}
+	}
+	return true;
+}
+
+[[nodiscard]] int FirstAvailableTableColumn(
+		const TableGridOccupancy &occupancy,
+		int row,
+		int rowspan,
+		int colspan,
+		int maxColumns) {
+	if ((row < 0)
+		|| (row >= int(occupancy.size()))
+		|| (rowspan <= 0)
+		|| (colspan <= 0)
+		|| (maxColumns <= 0)) {
+		return -1;
+	}
+	for (auto column = 0; column < maxColumns; ++column) {
+		const auto effectiveColspan = ClampTableColspan(
+			colspan,
+			column,
+			maxColumns);
+		if (effectiveColspan <= 0) {
+			continue;
+		}
+		if (CanOccupyTableSlots(
+				occupancy,
+				row,
+				column,
+				rowspan,
+				effectiveColspan)) {
+			return column;
+		}
+	}
+	return -1;
+}
+
+void MarkTableSlots(
+		TableGridOccupancy *occupancy,
+		int row,
+		int column,
+		int rowspan,
+		int colspan) {
+	if ((row < 0)
+		|| (column < 0)
+		|| (rowspan <= 0)
+		|| (colspan <= 0)
+		|| (row >= int(occupancy->size()))) {
+		return;
+	}
+	const auto rowLimit = int(std::min<int64>(
+		int64(row) + rowspan,
+		occupancy->size()));
+	const auto columnLimit64 = int64(column) + colspan;
+	if (columnLimit64 <= column) {
+		return;
+	}
+	const auto columnLimit = int(std::min<int64>(
+		columnLimit64,
+		std::numeric_limits<int>::max()));
+	for (auto currentRow = row; currentRow < rowLimit; ++currentRow) {
+		auto &occupied = (*occupancy)[currentRow];
+		if (columnLimit > int(occupied.size())) {
+			occupied.resize(columnLimit, false);
+		}
+		for (auto currentColumn = column;
+			currentColumn < columnLimit;
+			++currentColumn) {
+			occupied[currentColumn] = true;
+		}
+	}
+}
+
+[[nodiscard]] int TableGridColumnCount(
+		const TableGridOccupancy &occupancy) {
+	auto result = 0;
+	for (const auto &row : occupancy) {
+		result = std::max(result, int(row.size()));
+	}
+	return result;
+}
+
+[[nodiscard]] TableGrid BuildTableGrid(
+		const Block &table,
+		const Markdown::MarkdownPrepareTableRenderLimits &limits) {
+	auto result = TableGrid();
+	result.rowCount = std::min(int(table.tableRows.size()), limits.maxRows);
+	if (result.rowCount < 0) {
+		result.rowCount = 0;
+	}
+	result.occupancy = TableGridOccupancy(result.rowCount);
+	auto occupiedSlotCountSoFar = int64(0);
+
+	for (auto rowIndex = 0; rowIndex != result.rowCount; ++rowIndex) {
+		const auto &row = table.tableRows[rowIndex];
+		for (auto cellIndex = 0, cellCount = int(row.cells.size());
+				cellIndex != cellCount;
+				++cellIndex) {
+			const auto &cell = row.cells[cellIndex];
+			const auto normalizedColspan = NormalizeTableSpan(cell.colspan);
+			const auto rowspan = ClampTableRowspan(
+				cell.rowspan,
+				rowIndex,
+				result.rowCount);
+			if (rowspan <= 0) {
+				continue;
+			}
+			const auto column = FirstAvailableTableColumn(
+				result.occupancy,
+				rowIndex,
+				rowspan,
+				normalizedColspan,
+				limits.maxColumns);
+			if (column < 0) {
+				continue;
+			}
+			const auto colspan = ClampTableColspan(
+				normalizedColspan,
+				column,
+				limits.maxColumns);
+			if (colspan <= 0) {
+				continue;
+			}
+			const auto occupiedSlotGrowth = int64(rowspan) * colspan;
+			if (occupiedSlotGrowth > limits.maxCells
+				|| (occupiedSlotCountSoFar + occupiedSlotGrowth)
+					> limits.maxCells) {
+				continue;
+			}
+			result.cells.push_back({
+				.rowIndex = rowIndex,
+				.cellIndex = cellIndex,
+				.rowFrom = rowIndex,
+				.rowTill = rowIndex + rowspan,
+				.columnFrom = column,
+				.columnTill = column + colspan,
+			});
+			MarkTableSlots(
+				&result.occupancy,
+				rowIndex,
+				column,
+				rowspan,
+				colspan);
+			occupiedSlotCountSoFar += occupiedSlotGrowth;
+		}
+	}
+	result.columnCount = TableGridColumnCount(result.occupancy);
+	return result;
+}
+
+template <typename Range>
+[[nodiscard]] bool TableGridCellIntersectsRange(
+		const TableGridCellReference &cell,
+		const Range &range) {
+	return (cell.rowFrom < range.rowTill)
+		&& (cell.rowTill > range.rowFrom)
+		&& (cell.columnFrom < range.columnTill)
+		&& (cell.columnTill > range.columnFrom);
+}
+
+template <typename Range>
+[[nodiscard]] bool TableGridCellContainedInRange(
+		const TableGridCellReference &cell,
+		const Range &range) {
+	return (cell.rowFrom >= range.rowFrom)
+		&& (cell.rowTill <= range.rowTill)
+		&& (cell.columnFrom >= range.columnFrom)
+		&& (cell.columnTill <= range.columnTill);
+}
+
+template <typename Range>
+[[nodiscard]] std::vector<TableGridCellReference> SelectedTableGridCells(
+		const TableGrid &grid,
+		const Range &range) {
+	auto result = std::vector<TableGridCellReference>();
+	result.reserve(grid.cells.size());
+	for (const auto &cell : grid.cells) {
+		if (TableGridCellIntersectsRange(cell, range)) {
+			result.push_back(cell);
+		}
+	}
+	return result;
+}
+
+template <typename Range>
+[[nodiscard]] bool TableGridRangeCovered(
+		const TableGrid &grid,
+		const Range &range) {
+	if ((range.rowFrom < 0)
+		|| (range.rowTill <= range.rowFrom)
+		|| (range.columnFrom < 0)
+		|| (range.columnTill <= range.columnFrom)
+		|| (range.rowTill > grid.rowCount)
+		|| (range.columnTill > grid.columnCount)) {
+		return false;
+	}
+	for (auto row = range.rowFrom; row != range.rowTill; ++row) {
+		if (row >= int(grid.occupancy.size())) {
+			return false;
+		}
+		const auto &occupied = grid.occupancy[row];
+		for (auto column = range.columnFrom;
+				column != range.columnTill;
+				++column) {
+			if (column >= int(occupied.size()) || !occupied[column]) {
+				return false;
+			}
+		}
+	}
+	return true;
+}
+
+template <typename Range>
+[[maybe_unused]] [[nodiscard]] bool CleanTableGridUniteRange(
+		const TableGrid &grid,
+		const Range &range) {
+	const auto selected = SelectedTableGridCells(grid, range);
+	if (selected.empty()) {
+		return false;
+	}
+	for (const auto &cell : selected) {
+		if (!TableGridCellContainedInRange(cell, range)) {
+			return false;
+		}
+	}
+	return TableGridRangeCovered(grid, range);
+}
+
+template <typename Range>
+[[nodiscard]] bool TableGridRangeSpansAllRows(
+		const TableGrid &grid,
+		const Range &range) {
+	return (range.rowFrom == 0)
+		&& (range.rowTill == grid.rowCount)
+		&& (range.columnFrom >= 0)
+		&& (range.columnTill > range.columnFrom)
+		&& (range.columnTill <= grid.columnCount);
+}
+
+template <typename Range>
+[[nodiscard]] bool TableGridRangeSpansAllColumns(
+		const TableGrid &grid,
+		const Range &range) {
+	return (range.rowFrom >= 0)
+		&& (range.rowTill > range.rowFrom)
+		&& (range.rowTill <= grid.rowCount)
+		&& (range.columnFrom == 0)
+		&& (range.columnTill == grid.columnCount);
+}
+
+template <typename Range>
+[[nodiscard]] bool TableGridRangeCoversFullTable(
+		const TableGrid &grid,
+		const Range &range) {
+	return TableGridRangeSpansAllRows(grid, range)
+		&& TableGridRangeSpansAllColumns(grid, range);
+}
+
+template <typename Range>
+[[nodiscard]] int TableGridCellColumnIntersection(
+		const TableGridCellReference &cell,
+		const Range &range) {
+	const auto from = std::max(cell.columnFrom, range.columnFrom);
+	const auto till = std::min(cell.columnTill, range.columnTill);
+	return std::max(till - from, 0);
+}
+
+[[nodiscard]] bool TableGridCellMatchesLeaf(
+		const TableGridCellReference &cell,
+		const LeafPath &leaf,
+		const BlockPath &block) {
+	const auto index = TableCellIndexForLeaf(leaf, block, cell.rowIndex);
+	return index && *index == cell.cellIndex;
+}
+
+[[nodiscard]] TableCell MakeDefaultTableCell() {
+	return TableCell();
+}
+
+[[nodiscard]] TableCell MakeDefaultTableCell(bool header) {
+	auto result = MakeDefaultTableCell();
+	result.header = header;
+	return result;
+}
+
+[[nodiscard]] const TableCell *TableGridCellAt(
+		const Block &table,
+		const TableGrid &grid,
+		int row,
+		int column) {
+	if (row < 0 || row >= grid.rowCount || column < 0) {
+		return nullptr;
+	}
+	for (const auto &reference : grid.cells) {
+		if (reference.rowFrom <= row
+			&& reference.rowTill > row
+			&& reference.columnFrom <= column
+			&& reference.columnTill > column) {
+			return &table.tableRows[reference.rowIndex].cells[
+				reference.cellIndex];
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] int IncrementTableSpan(int span) {
+	const auto normalized = NormalizeTableSpan(span);
+	return (normalized == std::numeric_limits<int>::max())
+		? normalized
+		: normalized + 1;
+}
+
+void InsertTableCellBeforeVisualColumn(
+		TableRow *row,
+		const TableGrid &grid,
+		int rowIndex,
+		int column,
+		TableCell insertedCell) {
+	auto insertAt = int(row->cells.size());
+	for (const auto &reference : grid.cells) {
+		if (reference.rowIndex == rowIndex
+			&& reference.columnFrom >= column) {
+			insertAt = std::min(reference.cellIndex, int(row->cells.size()));
+			break;
+		}
+	}
+	row->cells.insert(
+		row->cells.begin() + insertAt,
+		std::move(insertedCell));
+}
+
+void InsertTableCellBeforeVisualColumn(
+		TableRow *row,
+		const TableGrid &grid,
+		int rowIndex,
+		int column) {
+	InsertTableCellBeforeVisualColumn(
+		row,
+		grid,
+		rowIndex,
+		column,
+		MakeDefaultTableCell());
+}
+
+[[nodiscard]] bool BlockCanOwnChildContainer(const Block &block) {
+	return (block.kind == BlockKind::Quote)
+		|| (block.kind == BlockKind::Details);
+}
+
+[[nodiscard]] bool BlockSupportsBlockText(const Block &block) {
+	switch (block.kind) {
+	case BlockKind::Heading:
+	case BlockKind::Paragraph:
+	case BlockKind::Footer:
+	case BlockKind::Code:
+	case BlockKind::Quote:
+	case BlockKind::Table:
+	case BlockKind::Details:
+		return true;
+	default:
+		return false;
+	}
+}
+
+[[nodiscard]] bool BlockSupportsBlockCaption(const Block &block) {
+	switch (block.kind) {
+	case BlockKind::Quote:
+	case BlockKind::Photo:
+	case BlockKind::Video:
+	case BlockKind::Audio:
+	case BlockKind::Map:
+		return true;
+	default:
+		return false;
+	}
+}
+
+[[nodiscard]] bool StringIsEmpty(const QString &text) {
+	return text.trimmed().isEmpty();
+}
+
+[[nodiscard]] bool CanEditBlocks(const std::vector<Block> &blocks);
+
+[[nodiscard]] bool CanEditBlock(const Block &block) {
+	switch (block.kind) {
+	case BlockKind::Heading:
+	case BlockKind::Paragraph:
+	case BlockKind::Footer:
+	case BlockKind::Code:
+	case BlockKind::Divider:
+	case BlockKind::Anchor:
+	case BlockKind::GroupedMedia:
+	case BlockKind::Photo:
+	case BlockKind::Video:
+	case BlockKind::Audio:
+	case BlockKind::Math:
+	case BlockKind::Table:
+	case BlockKind::Map:
+		return true;
+	case BlockKind::Quote:
+	case BlockKind::Details:
+		return CanEditBlocks(block.blocks);
+	case BlockKind::List:
+		return ranges::all_of(block.listItems, [](const ListItem &item) {
+			return CanEditBlocks(item.blocks);
+		});
+	case BlockKind::Unsupported:
+	case BlockKind::Thinking:
+	case BlockKind::AuthorDate:
+	case BlockKind::Embed:
+	case BlockKind::EmbedPost:
+	case BlockKind::Channel:
+	case BlockKind::RelatedArticles:
+		return false;
+	}
+	return false;
+}
+
+[[nodiscard]] bool CanEditBlocks(const std::vector<Block> &blocks) {
+	return ranges::all_of(blocks, &CanEditBlock);
+}
+
+} // namespace
+
+State::State()
+: State(std::make_shared<RichPage>(), nullptr, RichMessageLimits()) {
+}
+
+State::State(
+	std::shared_ptr<RichPage> richPage,
+	std::shared_ptr<Markdown::MediaRuntime> mediaRuntime,
+	RichMessageLimits limits)
+: _richPage(richPage ? std::move(richPage) : std::make_shared<RichPage>())
+, _mediaRuntime(std::move(mediaRuntime))
+, _limits(std::move(limits)) {
+	if (_richPage->blocks.empty()) {
+		_richPage->blocks.push_back(MakeParagraphBlock());
+	}
+	rebuild();
+}
+
+const RichPage &State::richPage() const {
+	return *_richPage;
+}
+
+const Markdown::MarkdownArticleContent &State::prepared() const {
+	return _prepared;
+}
+
+auto State::tableRenderLimits() const
+-> Markdown::MarkdownPrepareTableRenderLimits {
+	return Markdown::PrepareTableRenderLimitsForRichMessage(_limits);
+}
+
+template <typename Result, typename Callback>
+Result State::applyCheckedMutation(Result failure, Callback &&callback) {
+	_lastLimitError = std::nullopt;
+	auto candidate = State(
+		std::make_shared<RichPage>(*_richPage),
+		_mediaRuntime,
+		_limits);
+	candidate._activeTextOrdinal = _activeTextOrdinal;
+	candidate._lastLimitError = std::nullopt;
+	candidate._temporaryDownParagraph = _temporaryDownParagraph;
+	const auto outcome = callback(candidate);
+	if (!outcome.apply) {
+		return outcome.result;
+	}
+	if (const auto error = ValidateRichMessage(*candidate._richPage, _limits)) {
+		_lastLimitError = error;
+		return failure;
+	}
+	commitCheckedMutation(std::move(candidate));
+	return outcome.result;
+}
+
+void State::commitCheckedMutation(State state) {
+	_richPage = std::move(state._richPage);
+	_prepared = std::move(state._prepared);
+	_textNodes = std::move(state._textNodes);
+	_activeTextOrdinal = state._activeTextOrdinal;
+	_lastPreparedMutationKind = (
+		state._lastPreparedMutationKind == PreparedMutationKind::FullRebuild)
+		? state._lastPreparedMutationKind
+		: PreparedMutationKind::FullRebuild;
+	_lastLimitError = std::nullopt;
+	_temporaryDownParagraph = std::move(state._temporaryDownParagraph);
+}
+
+const std::vector<TextNodeDescriptor> &State::textNodes() const {
+	return _textNodes;
+}
+
+State::Snapshot State::snapshot() const {
+	return {
+		.richPage = *_richPage,
+		.activeLeaf = activeLeafPath(),
+		.temporaryDownParagraph = _temporaryDownParagraph,
+	};
+}
+
+void State::restoreSnapshot(Snapshot snapshot) {
+	_richPage = std::make_shared<RichPage>(std::move(snapshot.richPage));
+	_activeTextOrdinal = -1;
+	_lastLimitError = std::nullopt;
+	_temporaryDownParagraph = std::move(snapshot.temporaryDownParagraph);
+	rebuild();
+	if (snapshot.activeLeaf && (textNodeOrdinal(*snapshot.activeLeaf) >= 0)) {
+		const auto activated = activateRebuiltLeaf(*snapshot.activeLeaf);
+		Assert(activated);
+	} else {
+		ensureActiveTextOrdinal();
+	}
+}
+
+std::optional<LeafPath> State::activeLeafPath() const {
+	if (const auto descriptor = textNode(_activeTextOrdinal)) {
+		return descriptor->leaf;
+	}
+	return std::nullopt;
+}
+
+int State::textOrdinalForLeafPath(const LeafPath &path) const {
+	return textNodeOrdinal(path);
+}
+
+void State::clearTemporaryDownParagraph() {
+	_temporaryDownParagraph = std::nullopt;
+}
+
+void State::clearTemporaryDownParagraphIfInvalid() {
+	if (!_temporaryDownParagraph
+		|| _temporaryDownParagraph->kind != LeafKind::BlockText
+		|| (textNodeOrdinal(*_temporaryDownParagraph) < 0)) {
+		clearTemporaryDownParagraph();
+		return;
+	}
+	const auto owner = block(_temporaryDownParagraph->block);
+	if (!owner
+		|| owner->kind != BlockKind::Paragraph
+		|| !BlockIsEmpty(*owner)) {
+		clearTemporaryDownParagraph();
+	}
+}
+
+int State::textOrdinalForLeaf(
+		const Markdown::PreparedEditLeafSource &source) const {
+	const auto leaf = convertLeafPath(source);
+	return leaf ? textOrdinalForLeafPath(*leaf) : -1;
+}
+
+PreparedMutationKind State::lastPreparedMutationKind() const {
+	return _lastPreparedMutationKind;
+}
+
+std::optional<PreparedEditLeafSource> State::activePreparedLeafSource() const {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	return descriptor ? convertPreparedLeafSource(*descriptor) : std::nullopt;
+}
+
+int State::textNodeCount() const {
+	return int(_textNodes.size());
+}
+
+int State::activeTextOrdinal() const {
+	return _activeTextOrdinal;
+}
+
+bool State::setActiveTextByOrdinal(int ordinal) {
+	if (ordinal < 0 || ordinal >= textNodeCount()) {
+		return false;
+	}
+	if (_temporaryDownParagraph
+		&& !(_textNodes[ordinal].leaf == *_temporaryDownParagraph)) {
+		clearTemporaryDownParagraph();
+	}
+	_activeTextOrdinal = ordinal;
+	return true;
+}
+
+TextWithEntities State::activeText() const {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor) {
+		return TextWithEntities();
+	}
+	if (const auto current = richText(descriptor->leaf)) {
+		return StripEditModeWrapperEntities(current->text);
+	}
+	if (const auto current = rawText(descriptor->leaf)) {
+		return MakeText(*current);
+	}
+	return TextWithEntities();
+}
+
+ApplyResult State::applyActiveText(TextWithEntities text) {
+	_lastLimitError = std::nullopt;
+	_lastPreparedMutationKind = PreparedMutationKind::None;
+	return applyActiveTextWithLocalLimit(std::move(text));
+}
+
+ApplyResult State::applyActiveTextUnchecked(TextWithEntities text) {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor) {
+		return ApplyResult::Failed;
+	}
+	if (auto current = richText(descriptor->leaf)) {
+		if (current->text == text) {
+			return ApplyResult::Unchanged;
+		}
+		current->text = std::move(text);
+		if (leafMutationKeepsTextNodes(*descriptor)) {
+			if (_temporaryDownParagraph
+				&& (descriptor->leaf == *_temporaryDownParagraph)
+				&& !RichTextIsEmpty(*current)) {
+				clearTemporaryDownParagraph();
+			}
+			if (updatePreparedActiveLeaf(*descriptor)) {
+				_lastPreparedMutationKind = PreparedMutationKind::LeafOnly;
+			} else {
+				rebuildPrepared();
+			}
+		} else {
+			rebuild();
+		}
+		return ApplyResult::Changed;
+	}
+	if (auto current = rawText(descriptor->leaf)) {
+		if (*current == text.text) {
+			return ApplyResult::Unchanged;
+		}
+		*current = std::move(text.text);
+		if (leafMutationKeepsTextNodes(*descriptor)) {
+			if (updatePreparedActiveLeaf(*descriptor)) {
+				_lastPreparedMutationKind = PreparedMutationKind::LeafOnly;
+			} else {
+				rebuildPrepared();
+			}
+		} else {
+			rebuild();
+		}
+		return ApplyResult::Changed;
+	}
+	return ApplyResult::Failed;
+}
+
+ApplyResult State::applyActiveTextWithLocalLimit(TextWithEntities text) {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor) {
+		return ApplyResult::Failed;
+	}
+	auto chunks = SplitFieldText(std::move(text));
+	if (chunks.size() <= 1) {
+		return applyActiveTextUnchecked(chunks.empty()
+			? TextWithEntities()
+			: std::move(chunks.front()));
+	}
+	auto first = chunks.front();
+	if (const auto result = applySplitParagraphText(
+			*descriptor,
+			std::move(chunks)); result != ApplyResult::Failed) {
+		return result;
+	}
+	return applyActiveTextUnchecked(std::move(first));
+}
+
+FieldMode State::activeFieldMode() const {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	return descriptor ? descriptor->mode : FieldMode::Rich;
+}
+
+QString State::activeRawText() const {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor) {
+		return QString();
+	}
+	if (const auto current = rawText(descriptor->leaf)) {
+		return *current;
+	}
+	if (const auto current = richText(descriptor->leaf)) {
+		return StripEditModeWrapperEntities(current->text).text;
+	}
+	return QString();
+}
+
+QString State::activePlaceholderText() const {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor) {
+		return QString();
+	}
+	const auto owner = block(descriptor->leaf.block);
+	if (!owner) {
+		return QString();
+	}
+	switch (descriptor->leaf.kind) {
+	case LeafKind::BlockText:
+		switch (owner->kind) {
+		case BlockKind::Paragraph:
+		case BlockKind::Footer:
+		case BlockKind::Code:
+		case BlockKind::Quote:
+			return u"Text"_q;
+		case BlockKind::Heading:
+		case BlockKind::Details:
+			return u"Header"_q;
+		default:
+			return QString();
+		}
+	case LeafKind::BlockCaption:
+		switch (owner->kind) {
+		case BlockKind::Quote:
+		case BlockKind::Photo:
+		case BlockKind::Video:
+		case BlockKind::Audio:
+		case BlockKind::Map:
+			return u"Caption"_q;
+		default:
+			return QString();
+		}
+	case LeafKind::ListItemText:
+		return u"Text"_q;
+	case LeafKind::TableCellText:
+		return u"Cell"_q;
+	case LeafKind::MathFormula:
+		return u"x^2 + y^2"_q;
+	}
+	return QString();
+}
+
+ApplyResult State::applyActiveRawText(QString text) {
+	_lastLimitError = std::nullopt;
+	_lastPreparedMutationKind = PreparedMutationKind::None;
+	return applyActiveRawTextWithLocalLimit(std::move(text));
+}
+
+ApplyResult State::applyActiveRawTextUnchecked(QString text) {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor) {
+		return ApplyResult::Failed;
+	}
+	if (auto current = rawText(descriptor->leaf)) {
+		if (*current == text) {
+			return ApplyResult::Unchanged;
+		}
+		*current = std::move(text);
+		if (leafMutationKeepsTextNodes(*descriptor)) {
+			if (updatePreparedActiveLeaf(*descriptor)) {
+				_lastPreparedMutationKind = PreparedMutationKind::LeafOnly;
+			} else {
+				rebuildPrepared();
+			}
+		} else {
+			rebuild();
+		}
+		return ApplyResult::Changed;
+	}
+	if (auto current = richText(descriptor->leaf)) {
+		auto updated = MakeText(std::move(text));
+		if (current->text == updated) {
+			return ApplyResult::Unchanged;
+		}
+		current->text = std::move(updated);
+		if (leafMutationKeepsTextNodes(*descriptor)) {
+			if (_temporaryDownParagraph
+				&& (descriptor->leaf == *_temporaryDownParagraph)
+				&& !RichTextIsEmpty(*current)) {
+				clearTemporaryDownParagraph();
+			}
+			if (updatePreparedActiveLeaf(*descriptor)) {
+				_lastPreparedMutationKind = PreparedMutationKind::LeafOnly;
+			} else {
+				rebuildPrepared();
+			}
+		} else {
+			rebuild();
+		}
+		return ApplyResult::Changed;
+	}
+	return ApplyResult::Failed;
+}
+
+ApplyResult State::applyActiveRawTextWithLocalLimit(QString text) {
+	auto chunks = SplitFieldText(MakeText(std::move(text)));
+	return applyActiveRawTextUnchecked(chunks.empty()
+		? QString()
+		: std::move(chunks.front().text));
+}
+
+ApplyResult State::applySplitParagraphText(
+		const TextNodeDescriptor &descriptor,
+		std::vector<TextWithEntities> chunks) {
+	if (chunks.empty()) {
+		return applyActiveTextUnchecked(TextWithEntities());
+	}
+	const auto makeParagraph = [&](TextWithEntities text) {
+		auto paragraph = MakeParagraphBlock();
+		paragraph.text.text = std::move(text);
+		return paragraph;
+	};
+	const auto focus = [&](LeafPath leaf) {
+		rebuild();
+		if (!activateRebuiltLeaf(leaf)) {
+			ensureActiveTextOrdinal();
+		}
+	};
+	if (descriptor.leaf.kind == LeafKind::BlockText) {
+		const auto path = descriptor.leaf.block;
+		if (auto owner = block(path)) {
+			if (owner->kind == BlockKind::Paragraph) {
+				auto container = blockContainer(path.container);
+				if (!container
+					|| path.index < 0
+					|| path.index >= int(container->size())) {
+					return ApplyResult::Failed;
+				}
+				clearTemporaryDownParagraph();
+				owner->text.text = std::move(chunks.front());
+				auto blocks = std::vector<Block>();
+				blocks.reserve(chunks.size() - 1);
+				for (auto i = 1; i != int(chunks.size()); ++i) {
+					blocks.push_back(makeParagraph(std::move(chunks[i])));
+				}
+				container->insert(
+					container->begin() + path.index + 1,
+					std::make_move_iterator(blocks.begin()),
+					std::make_move_iterator(blocks.end()));
+				focus(descriptor.leaf);
+				return ApplyResult::Changed;
+			} else if (owner->kind == BlockKind::Quote && !owner->pullquote) {
+				clearTemporaryDownParagraph();
+				auto firstText = std::move(owner->text);
+				firstText.text = std::move(chunks.front());
+				auto blocks = std::vector<Block>();
+				blocks.reserve(chunks.size());
+				auto first = MakeParagraphBlock();
+				first.text = std::move(firstText);
+				blocks.push_back(std::move(first));
+				for (auto i = 1; i != int(chunks.size()); ++i) {
+					blocks.push_back(makeParagraph(std::move(chunks[i])));
+				}
+				owner->text = RichText();
+				owner->blocks.insert(
+					owner->blocks.begin(),
+					std::make_move_iterator(blocks.begin()),
+					std::make_move_iterator(blocks.end()));
+				focus({
+					.kind = LeafKind::BlockText,
+					.block = {
+						.container = BlockChildrenContainer(path),
+						.index = 0,
+					},
+				});
+				return ApplyResult::Changed;
+			}
+		}
+	} else if (descriptor.leaf.kind == LeafKind::ListItemText) {
+		const auto path = descriptor.leaf.block;
+		if (auto item = listItem(path, descriptor.leaf.listItemIndex)) {
+			clearTemporaryDownParagraph();
+			auto firstText = std::move(item->text);
+			firstText.text = std::move(chunks.front());
+			auto blocks = std::vector<Block>();
+			blocks.reserve(chunks.size());
+			auto first = MakeParagraphBlock();
+			first.anchorId = std::move(item->anchorId);
+			first.text = std::move(firstText);
+			blocks.push_back(std::move(first));
+			for (auto i = 1; i != int(chunks.size()); ++i) {
+				blocks.push_back(makeParagraph(std::move(chunks[i])));
+			}
+			item->anchorId.clear();
+			item->text = RichText();
+			item->blocks.insert(
+				item->blocks.begin(),
+				std::make_move_iterator(blocks.begin()),
+				std::make_move_iterator(blocks.end()));
+			focus({
+				.kind = LeafKind::BlockText,
+				.block = {
+					.container = ListItemChildrenContainer(
+						path,
+						descriptor.leaf.listItemIndex),
+					.index = 0,
+				},
+			});
+			return ApplyResult::Changed;
+		}
+	}
+	return ApplyResult::Failed;
+}
+
+std::optional<RichMessageLimitError> State::lastLimitError() const {
+	return _lastLimitError;
+}
+
+std::optional<QString> State::codeBlockLanguage(int ordinal) const {
+	const auto descriptor = textNode(ordinal);
+	if (!descriptor || descriptor->leaf.kind != LeafKind::BlockText) {
+		return std::nullopt;
+	}
+	const auto owner = block(descriptor->leaf.block);
+	return (owner && owner->kind == BlockKind::Code)
+		? std::make_optional(owner->language)
+		: std::nullopt;
+}
+
+bool State::setCodeBlockLanguage(int ordinal, QString language) {
+	const auto descriptor = textNode(ordinal);
+	if (!descriptor || descriptor->leaf.kind != LeafKind::BlockText) {
+		return false;
+	}
+	auto owner = block(descriptor->leaf.block);
+	if (!owner || owner->kind != BlockKind::Code) {
+		return false;
+	}
+	owner->language = std::move(language).trimmed();
+	rebuild();
+	return true;
+}
+
+bool State::toggleTaskState(
+		const Markdown::PreparedEditListItemSource &source) {
+	const auto blockPath = convertBlockPath(source.block);
+	if (!blockPath) {
+		return false;
+	}
+	auto item = listItem(*blockPath, source.listItemIndex);
+	if (!item || item->taskState == TaskState::None) {
+		return false;
+	}
+	item->taskState = (item->taskState == TaskState::Unchecked)
+		? TaskState::Checked
+		: TaskState::Unchecked;
+	rebuild();
+	return true;
+}
+
+bool State::toggleDetailsOpen(
+		const Markdown::PreparedEditBlockSource &source) {
+	const auto path = convertBlockPath(source);
+	if (!path) {
+		return false;
+	}
+	auto owner = block(*path);
+	if (!owner || owner->kind != BlockKind::Details) {
+		return false;
+	}
+	owner->open = !owner->open;
+	rebuild();
+	return true;
+}
+
+State::TableSelectionInfo State::tableSelectionInfo(
+		const Markdown::PreparedEditTableCellRange &range) const {
+	const auto validated = validateTableCellRange(range);
+	if (!validated) {
+		return {};
+	}
+	const auto owner = block(validated->block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return {};
+	}
+	const auto grid = BuildTableGrid(*owner, tableRenderLimits());
+	const auto selected = SelectedTableGridCells(grid, *validated);
+	if (selected.empty()) {
+		return {};
+	}
+	auto result = TableSelectionInfo{
+		.valid = true,
+		.allHeader = true,
+		.allAlignCenter = true,
+		.allAlignRight = true,
+		.allAlignMiddle = true,
+		.allAlignBottom = true,
+		.singleCell = (selected.size() == 1),
+		.canDeleteRows = TableGridRangeSpansAllColumns(grid, *validated),
+		.canDeleteColumns = TableGridRangeSpansAllRows(grid, *validated),
+		.canDeleteTable = TableGridRangeCoversFullTable(grid, *validated),
+		.selectedRows = validated->rowTill - validated->rowFrom,
+		.selectedColumns = validated->columnTill - validated->columnFrom,
+		.bordered = owner->bordered,
+		.striped = owner->striped,
+	};
+	for (const auto &reference : selected) {
+		const auto &cell = owner->tableRows[reference.rowIndex].cells[
+			reference.cellIndex];
+		if (!cell.header) {
+			result.allHeader = false;
+		}
+		if (cell.alignment != RichPage::TableAlignment::Center) {
+			result.allAlignCenter = false;
+		}
+		if (cell.alignment != RichPage::TableAlignment::Right) {
+			result.allAlignRight = false;
+		}
+		if (cell.verticalAlignment
+			!= RichPage::TableVerticalAlignment::Middle) {
+			result.allAlignMiddle = false;
+		}
+		if (cell.verticalAlignment
+			!= RichPage::TableVerticalAlignment::Bottom) {
+			result.allAlignBottom = false;
+		}
+		if (result.singleCell) {
+			result.canSplitCell = (NormalizeTableSpan(cell.colspan) > 1)
+				|| (NormalizeTableSpan(cell.rowspan) > 1);
+		}
+	}
+	result.canUniteCells = !result.singleCell
+		&& CleanTableGridUniteRange(grid, *validated);
+	return result;
+}
+
+std::optional<Markdown::PreparedEditTableCellRange>
+State::tableContextRangeForSelection(
+		const Markdown::PreparedEditSelection &selection,
+		const Markdown::PreparedEditTableCellSource &source) const {
+	if (source.tableRowIndex < 0
+		|| source.column < 0
+		|| source.rowspan <= 0
+		|| source.colspan <= 0) {
+		return std::nullopt;
+	}
+	const auto sourceBlock = convertBlockPath(source.block);
+	if (!sourceBlock) {
+		return std::nullopt;
+	}
+	const auto owner = block(*sourceBlock);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return std::nullopt;
+	}
+	const auto grid = BuildTableGrid(*owner, tableRenderLimits());
+	if (grid.rowCount <= 0 || grid.columnCount <= 0) {
+		return std::nullopt;
+	}
+	const auto fullTableRange = [&] {
+		return Markdown::PreparedEditTableCellRange{
+			.block = source.block,
+			.rowFrom = 0,
+			.rowTill = grid.rowCount,
+			.columnFrom = 0,
+			.columnTill = grid.columnCount,
+		};
+	};
+	const auto sourceIntersects = [&](const auto &range) {
+		return (source.tableRowIndex < range.rowTill)
+			&& (source.tableRowIndex + source.rowspan > range.rowFrom)
+			&& (source.column < range.columnTill)
+			&& (source.column + source.colspan > range.columnFrom);
+	};
+	switch (selection.kind) {
+	case PreparedEditSelectionKind::TableCells: {
+		const auto range = validateTableCellRange(selection.tableCells);
+		if (!range || range->block != *sourceBlock) {
+			return std::nullopt;
+		}
+		return sourceIntersects(*range)
+			? std::make_optional(selection.tableCells)
+			: std::nullopt;
+	}
+	case PreparedEditSelectionKind::TableRows: {
+		const auto range = validateTableRowRange(selection.tableRows);
+		if (!range || range->block != *sourceBlock) {
+			return std::nullopt;
+		}
+		if (source.tableRowIndex >= range->till
+			|| source.tableRowIndex + source.rowspan <= range->from) {
+			return std::nullopt;
+		}
+		return Markdown::PreparedEditTableCellRange{
+			.block = source.block,
+			.rowFrom = range->from,
+			.rowTill = range->till,
+			.columnFrom = 0,
+			.columnTill = grid.columnCount,
+		};
+	}
+	case PreparedEditSelectionKind::Blocks: {
+		const auto range = validateBlockRange(selection.blocks);
+		if (!range
+			|| sourceBlock->container != range->container
+			|| sourceBlock->index < range->from
+			|| sourceBlock->index >= range->till) {
+			return std::nullopt;
+		}
+		return fullTableRange();
+	}
+	case PreparedEditSelectionKind::ListItems:
+	case PreparedEditSelectionKind::None:
+		return std::nullopt;
+	}
+	return std::nullopt;
+}
+
+bool State::canRemoveStructuralSelection(
+		const Markdown::PreparedEditSelection &selection) const {
+	switch (selection.kind) {
+	case PreparedEditSelectionKind::Blocks:
+		return validateBlockRange(selection.blocks).has_value();
+	case PreparedEditSelectionKind::ListItems:
+		return validateListItemRange(selection.listItems).has_value();
+	case PreparedEditSelectionKind::TableRows:
+		return validateTableRowRange(selection.tableRows).has_value();
+	case PreparedEditSelectionKind::TableCells: {
+		const auto range = validateTableCellRange(selection.tableCells);
+		if (!range) {
+			return false;
+		}
+		const auto owner = block(range->block);
+		if (!owner || owner->kind != BlockKind::Table) {
+			return false;
+		}
+		return TableGridRangeSpansAllRows(
+			BuildTableGrid(*owner, tableRenderLimits()),
+			*range);
+	}
+	case PreparedEditSelectionKind::None:
+		return false;
+	}
+	return false;
+}
+
+auto State::structuredClipboardDataForSelection(
+		const Markdown::PreparedEditSelection &selection) const
+-> std::optional<ClipboardData> {
+	switch (selection.kind) {
+	case PreparedEditSelectionKind::Blocks: {
+		const auto range = validateBlockRange(selection.blocks);
+		const auto blocks = range ? blockContainer(range->container) : nullptr;
+		if (!range || !blocks) {
+			return std::nullopt;
+		}
+		auto data = ClipboardBlockData();
+		data.blocks = std::vector<Block>(
+			blocks->begin() + range->from,
+			blocks->begin() + range->till);
+		return ClipboardData(std::move(data));
+	}
+	case PreparedEditSelectionKind::ListItems: {
+		const auto range = validateListItemRange(selection.listItems);
+		const auto owner = range ? block(range->block) : nullptr;
+		if (!range || !owner || owner->kind != BlockKind::List) {
+			return std::nullopt;
+		}
+		auto data = ClipboardListItemsData();
+		data.listKind = owner->listKind;
+		data.items = std::vector<ListItem>(
+			owner->listItems.begin() + range->from,
+			owner->listItems.begin() + range->till);
+		data.taskList = std::any_of(
+			data.items.begin(),
+			data.items.end(),
+			[](const ListItem &item) {
+				return item.taskState != TaskState::None;
+			});
+		return ClipboardData(std::move(data));
+	}
+	case PreparedEditSelectionKind::TableRows:
+	case PreparedEditSelectionKind::TableCells:
+	case PreparedEditSelectionKind::None:
+		return std::nullopt;
+	}
+	return std::nullopt;
+}
+
+bool State::addTableRow(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool after) {
+	return applyCheckedMutation(false, [range, after](State &candidate) {
+		const auto applied = candidate.addTableRowUnchecked(range, after);
+		return CheckedMutationResult<bool>{
+			.apply = applied,
+			.result = applied,
+		};
+	});
+}
+
+bool State::addTableRowUnchecked(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool after) {
+	const auto validated = validateTableCellRange(range);
+	if (!validated) {
+		return false;
+	}
+	auto owner = block(validated->block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return false;
+	}
+	const auto insertAt = after ? validated->rowTill : validated->rowFrom;
+	const auto grid = BuildTableGrid(*owner, tableRenderLimits());
+	if (insertAt < 0 || insertAt > int(owner->tableRows.size())) {
+		return false;
+	}
+	const auto sourceRow = after
+		? validated->rowTill - 1
+		: validated->rowFrom;
+
+	auto coveredColumns = std::vector<char>(grid.columnCount, false);
+	for (const auto &reference : grid.cells) {
+		if (reference.rowFrom >= insertAt || reference.rowTill <= insertAt) {
+			continue;
+		}
+		auto &cell = owner->tableRows[reference.rowIndex].cells[
+			reference.cellIndex];
+		cell.rowspan = IncrementTableSpan(cell.rowspan);
+		for (auto column = reference.columnFrom;
+				column != reference.columnTill;
+				++column) {
+			coveredColumns[column] = true;
+		}
+	}
+
+	auto row = TableRow();
+	if (grid.columnCount <= 0) {
+		row.cells.push_back(MakeDefaultTableCell());
+	} else {
+		row.cells.reserve(grid.columnCount);
+		for (auto column = 0; column != grid.columnCount; ++column) {
+			if (!coveredColumns[column]) {
+				const auto source = TableGridCellAt(
+					*owner,
+					grid,
+					sourceRow,
+					column);
+				row.cells.push_back(MakeDefaultTableCell(
+					source ? source->header : false));
+			}
+		}
+	}
+	owner->tableRows.insert(
+		owner->tableRows.begin() + insertAt,
+		std::move(row));
+	rebuild();
+	return true;
+}
+
+bool State::addTableColumn(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool after) {
+	return applyCheckedMutation(false, [range, after](State &candidate) {
+		const auto applied = candidate.addTableColumnUnchecked(range, after);
+		return CheckedMutationResult<bool>{
+			.apply = applied,
+			.result = applied,
+		};
+	});
+}
+
+bool State::addTableColumnUnchecked(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool after) {
+	const auto validated = validateTableCellRange(range);
+	if (!validated) {
+		return false;
+	}
+	auto owner = block(validated->block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return false;
+	}
+	const auto insertAt = after
+		? validated->columnTill
+		: validated->columnFrom;
+	const auto grid = BuildTableGrid(*owner, tableRenderLimits());
+	const auto sourceColumn = after
+		? validated->columnTill - 1
+		: validated->columnFrom;
+
+	auto coveredRows = std::vector<char>(owner->tableRows.size(), false);
+	for (const auto &reference : grid.cells) {
+		if (reference.columnFrom >= insertAt
+			|| reference.columnTill <= insertAt) {
+			continue;
+		}
+		auto &cell = owner->tableRows[reference.rowIndex].cells[
+			reference.cellIndex];
+		cell.colspan = IncrementTableSpan(cell.colspan);
+		for (auto row = reference.rowFrom; row != reference.rowTill; ++row) {
+			coveredRows[row] = true;
+		}
+	}
+
+	for (auto rowIndex = 0;
+			rowIndex != int(owner->tableRows.size());
+			++rowIndex) {
+		if (coveredRows[rowIndex]) {
+			continue;
+		}
+		const auto source = TableGridCellAt(
+			*owner,
+			grid,
+			rowIndex,
+			sourceColumn);
+		InsertTableCellBeforeVisualColumn(
+			&owner->tableRows[rowIndex],
+			grid,
+			rowIndex,
+			insertAt,
+			MakeDefaultTableCell(source ? source->header : false));
+	}
+	rebuild();
+	return true;
+}
+
+bool State::setTableHeader(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool header) {
+	const auto validated = validateTableCellRange(range);
+	if (!validated) {
+		return false;
+	}
+	auto owner = block(validated->block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return false;
+	}
+	const auto selected = SelectedTableGridCells(
+		BuildTableGrid(*owner, tableRenderLimits()),
+		*validated);
+	if (selected.empty()) {
+		return false;
+	}
+	auto changed = false;
+	for (const auto &reference : selected) {
+		auto &cell = owner->tableRows[reference.rowIndex].cells[
+			reference.cellIndex];
+		if (cell.header != header) {
+			cell.header = header;
+			changed = true;
+		}
+	}
+	if (changed) {
+		rebuild();
+	}
+	return true;
+}
+
+bool State::setTableAlignment(
+		const Markdown::PreparedEditTableCellRange &range,
+		RichPage::TableAlignment alignment) {
+	const auto validated = validateTableCellRange(range);
+	if (!validated) {
+		return false;
+	}
+	auto owner = block(validated->block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return false;
+	}
+	const auto selected = SelectedTableGridCells(
+		BuildTableGrid(*owner, tableRenderLimits()),
+		*validated);
+	if (selected.empty()) {
+		return false;
+	}
+	auto changed = false;
+	for (const auto &reference : selected) {
+		auto &cell = owner->tableRows[reference.rowIndex].cells[
+			reference.cellIndex];
+		if (cell.alignment != alignment) {
+			cell.alignment = alignment;
+			changed = true;
+		}
+	}
+	if (changed) {
+		rebuild();
+	}
+	return true;
+}
+
+bool State::setTableVerticalAlignment(
+		const Markdown::PreparedEditTableCellRange &range,
+		RichPage::TableVerticalAlignment alignment) {
+	const auto validated = validateTableCellRange(range);
+	if (!validated) {
+		return false;
+	}
+	auto owner = block(validated->block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return false;
+	}
+	const auto selected = SelectedTableGridCells(
+		BuildTableGrid(*owner, tableRenderLimits()),
+		*validated);
+	if (selected.empty()) {
+		return false;
+	}
+	auto changed = false;
+	for (const auto &reference : selected) {
+		auto &cell = owner->tableRows[reference.rowIndex].cells[
+			reference.cellIndex];
+		if (cell.verticalAlignment != alignment) {
+			cell.verticalAlignment = alignment;
+			changed = true;
+		}
+	}
+	if (changed) {
+		rebuild();
+	}
+	return true;
+}
+
+bool State::splitTableCell(
+		const Markdown::PreparedEditTableCellRange &range) {
+	const auto validated = validateTableCellRange(range);
+	if (!validated) {
+		return false;
+	}
+	auto owner = block(validated->block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return false;
+	}
+	const auto grid = BuildTableGrid(*owner, tableRenderLimits());
+	const auto selected = SelectedTableGridCells(grid, *validated);
+	if (selected.size() != 1) {
+		return false;
+	}
+	const auto reference = selected.front();
+	auto &cell = owner->tableRows[reference.rowIndex].cells[
+		reference.cellIndex];
+	if (cell.rowspan <= 1 && cell.colspan <= 1) {
+		return false;
+	}
+	const auto header = cell.header;
+
+	cell.rowspan = 1;
+	cell.colspan = 1;
+	for (auto rowIndex = reference.rowFrom;
+			rowIndex != reference.rowTill;
+			++rowIndex) {
+		auto &row = owner->tableRows[rowIndex];
+		for (auto column = reference.columnTill;
+				column != reference.columnFrom;
+				--column) {
+			const auto currentColumn = column - 1;
+			if (rowIndex == reference.rowFrom
+				&& currentColumn == reference.columnFrom) {
+				continue;
+			}
+			InsertTableCellBeforeVisualColumn(
+				&row,
+				grid,
+				rowIndex,
+				currentColumn,
+				MakeDefaultTableCell(header));
+		}
+	}
+	rebuild();
+	return true;
+}
+
+bool State::uniteTableCells(
+		const Markdown::PreparedEditTableCellRange &range) {
+	const auto validated = validateTableCellRange(range);
+	if (!validated) {
+		return false;
+	}
+	auto owner = block(validated->block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return false;
+	}
+	const auto grid = BuildTableGrid(*owner, tableRenderLimits());
+	const auto selected = SelectedTableGridCells(grid, *validated);
+	if (selected.size() <= 1
+		|| !CleanTableGridUniteRange(grid, *validated)) {
+		return false;
+	}
+	const auto keeper = *std::min_element(
+		selected.begin(),
+		selected.end(),
+		[](const auto &a, const auto &b) {
+			if (a.rowFrom != b.rowFrom) {
+				return a.rowFrom < b.rowFrom;
+			} else if (a.columnFrom != b.columnFrom) {
+				return a.columnFrom < b.columnFrom;
+			} else if (a.rowIndex != b.rowIndex) {
+				return a.rowIndex < b.rowIndex;
+			}
+			return a.cellIndex < b.cellIndex;
+		});
+
+	auto &keeperCell = owner->tableRows[keeper.rowIndex].cells[
+		keeper.cellIndex];
+	keeperCell.rowspan = validated->rowTill - validated->rowFrom;
+	keeperCell.colspan = validated->columnTill - validated->columnFrom;
+
+	auto toErase = selected;
+	toErase.erase(
+		std::remove_if(
+			toErase.begin(),
+			toErase.end(),
+			[&](const TableGridCellReference &cell) {
+				return cell.rowIndex == keeper.rowIndex
+					&& cell.cellIndex == keeper.cellIndex;
+			}),
+		toErase.end());
+	std::sort(
+		toErase.begin(),
+		toErase.end(),
+		[](const auto &a, const auto &b) {
+			if (a.rowIndex != b.rowIndex) {
+				return a.rowIndex > b.rowIndex;
+			}
+			return a.cellIndex > b.cellIndex;
+		});
+	for (const auto &reference : toErase) {
+		auto &row = owner->tableRows[reference.rowIndex];
+		row.cells.erase(row.cells.begin() + reference.cellIndex);
+	}
+	rebuild();
+	return true;
+}
+
+bool State::removeTableRows(
+		const Markdown::PreparedEditTableCellRange &range) {
+	const auto validated = validateTableCellRange(range);
+	if (!validated) {
+		return false;
+	}
+	const auto owner = block(validated->block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return false;
+	}
+	if (!TableGridRangeSpansAllColumns(
+			BuildTableGrid(*owner, tableRenderLimits()),
+			*validated)) {
+		return false;
+	}
+	return removeStructuralSelection({
+		.kind = PreparedEditSelectionKind::TableRows,
+		.tableRows = {
+			.block = range.block,
+			.from = validated->rowFrom,
+			.till = validated->rowTill,
+		},
+	}, true).has_value();
+}
+
+bool State::removeTableColumns(
+		const Markdown::PreparedEditTableCellRange &range) {
+	const auto validated = validateTableCellRange(range);
+	if (!validated) {
+		return false;
+	}
+	const auto owner = block(validated->block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return false;
+	}
+	if (!TableGridRangeSpansAllRows(
+			BuildTableGrid(*owner, tableRenderLimits()),
+			*validated)) {
+		return false;
+	}
+	return removeStructuralSelection({
+		.kind = PreparedEditSelectionKind::TableCells,
+		.tableCells = range,
+	}, true).has_value();
+}
+
+bool State::removeTable(
+		const Markdown::PreparedEditTableCellRange &range) {
+	const auto validated = validateTableCellRange(range);
+	if (!validated) {
+		return false;
+	}
+	const auto owner = block(validated->block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return false;
+	}
+	if (!TableGridRangeCoversFullTable(
+			BuildTableGrid(*owner, tableRenderLimits()),
+			*validated)) {
+		return false;
+	}
+	return removeStructuralSelection({
+		.kind = PreparedEditSelectionKind::Blocks,
+		.blocks = {
+			.container = range.block.container,
+			.from = range.block.index,
+			.till = range.block.index + 1,
+		},
+	}, true).has_value();
+}
+
+bool State::setTableBordered(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool bordered) {
+	const auto validated = validateTableCellRange(range);
+	if (!validated) {
+		return false;
+	}
+	auto owner = block(validated->block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return false;
+	}
+	if (owner->bordered != bordered) {
+		owner->bordered = bordered;
+		rebuild();
+	}
+	return true;
+}
+
+bool State::setTableStriped(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool striped) {
+	const auto validated = validateTableCellRange(range);
+	if (!validated) {
+		return false;
+	}
+	auto owner = block(validated->block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return false;
+	}
+	if (owner->striped != striped) {
+		owner->striped = striped;
+		rebuild();
+	}
+	return true;
+}
+
+int State::activeTextLength() const {
+	return activeRawText().size();
+}
+
+std::optional<int> State::previousEditableOrdinal() const {
+	return adjacentEditableOrdinal(false);
+}
+
+std::optional<int> State::nextEditableOrdinal() const {
+	return adjacentEditableOrdinal(true);
+}
+
+State::BoundaryTarget State::activeBoundaryTarget(bool forward) const {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor) {
+		return {};
+	}
+	return boundaryTargetForLeaf(
+		descriptor->leaf,
+		descriptor,
+		forward,
+		true);
+}
+
+State::BoundaryTarget State::boundaryTargetForLeaf(
+		const LeafPath &leaf,
+		const TextNodeDescriptor *descriptor,
+		bool forward,
+		bool allowRemoveDirectly) const {
+	const auto ordinal = textNodeOrdinal(leaf);
+	if (ordinal < 0) {
+		return {};
+	}
+	const auto prioritizeStructuralStep = [&](const BoundaryTarget &target) {
+		if (target.action != BoundaryAction::StructuralSelection) {
+			return false;
+		}
+		switch (target.structuralSelection.kind) {
+		case PreparedEditSelectionKind::Blocks:
+			if (const auto range = validateBlockRange(
+					target.structuralSelection.blocks)) {
+				return leafWillBeRemoved(leaf, *range);
+			}
+			break;
+		case PreparedEditSelectionKind::ListItems:
+			if (const auto range = validateListItemRange(
+					target.structuralSelection.listItems)) {
+				return leafWillBeRemoved(leaf, *range);
+			}
+			break;
+		default:
+			break;
+		}
+		return false;
+	};
+	const auto removeDirectly = allowRemoveDirectly
+		&& descriptor
+		&& removalTargetIsEmpty(descriptor->removalTarget)
+		&& shouldRemoveActiveOwnerDirectly(*descriptor);
+	auto steps = std::vector<BoundaryTarget>();
+	collectBoundarySteps(
+		_richPage->blocks,
+		BlockContainerPath(),
+		forward,
+		&steps);
+	for (auto i = 0, count = int(steps.size()); i != count; ++i) {
+		const auto &step = steps[i];
+		if (step.action == BoundaryAction::Text
+			&& step.textOrdinal == ordinal) {
+			const auto next = (i + 1 < count)
+				? steps[i + 1]
+				: BoundaryTarget();
+			if (prioritizeStructuralStep(next)) {
+				return next;
+			}
+			if (removeDirectly) {
+				return {
+					.action = BoundaryAction::RemoveActiveOwner,
+				};
+			}
+			return next;
+		}
+	}
+	return removeDirectly
+		? BoundaryTarget{
+			.action = BoundaryAction::RemoveActiveOwner,
+		}
+		: BoundaryTarget();
+}
+
+bool State::isActiveTopLevelParagraph() const {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor || !descriptor->leaf.block.container.steps.empty()) {
+		return false;
+	}
+	const auto owner = block(descriptor->leaf.block);
+	return owner && owner->kind == BlockKind::Paragraph;
+}
+
+bool State::activeLeafUsesQuoteCaptionColor() const {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor || descriptor->leaf.kind != LeafKind::BlockCaption) {
+		return false;
+	}
+	const auto owner = block(descriptor->leaf.block);
+	return owner && owner->kind == BlockKind::Quote && !owner->pullquote;
+}
+
+bool State::activeLeafUsesQuotePlaceholderColor() const {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor) {
+		return false;
+	}
+	const auto &leaf = descriptor->leaf;
+	const auto owner = block(leaf.block);
+	if (owner
+		&& owner->kind == BlockKind::Quote
+		&& !owner->pullquote
+		&& (leaf.kind == LeafKind::BlockText
+			|| leaf.kind == LeafKind::BlockCaption)) {
+		return true;
+	}
+	auto container = leaf.block.container;
+	while (!container.steps.empty()) {
+		const auto step = container.steps.back();
+		container.steps.pop_back();
+		if (step.kind != BlockContainerKind::BlockChildren) {
+			continue;
+		}
+		const auto ancestor = block({
+			.container = container,
+			.index = step.blockIndex,
+		});
+		if (ancestor
+			&& ancestor->kind == BlockKind::Quote
+			&& !ancestor->pullquote) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool State::shouldRemoveActiveOwnerDirectly(
+		const TextNodeDescriptor &descriptor) const {
+	switch (descriptor.removalTarget.kind) {
+	case RemovalKind::Block: {
+		const auto owner = block(descriptor.removalTarget.block);
+		if (!owner) {
+			return false;
+		}
+		switch (owner->kind) {
+		case BlockKind::Heading:
+		case BlockKind::Paragraph:
+		case BlockKind::Footer:
+		case BlockKind::Code:
+		case BlockKind::Math:
+			return true;
+		default:
+			return false;
+		}
+	}
+	case RemovalKind::ListItem:
+		if (const auto owner = listItem(
+				descriptor.removalTarget.block,
+				descriptor.removalTarget.listItemIndex)) {
+			return owner->blocks.empty();
+		}
+		return false;
+	case RemovalKind::TableCell:
+		return false;
+	}
+	return false;
+}
+
+std::optional<int> State::removeActiveOwnerAndSelectAdjacent(bool forward) {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor || !removalTargetIsEmpty(descriptor->removalTarget)) {
+		return std::nullopt;
+	}
+	const auto target = descriptor->removalTarget;
+	auto first = _activeTextOrdinal;
+	auto last = _activeTextOrdinal;
+	while (first > 0 && _textNodes[first - 1].removalTarget == target) {
+		--first;
+	}
+	while (last + 1 < textNodeCount()
+		&& _textNodes[last + 1].removalTarget == target) {
+		++last;
+	}
+	auto adjacent = std::optional<LeafPath>();
+	if (forward) {
+		for (auto i = last + 1, count = textNodeCount(); i != count; ++i) {
+			if (!(_textNodes[i].removalTarget == target)) {
+				adjacent = _textNodes[i].leaf;
+				break;
+			}
+		}
+	} else {
+		for (auto i = first; i != 0; --i) {
+			if (!(_textNodes[i - 1].removalTarget == target)) {
+				adjacent = _textNodes[i - 1].leaf;
+				break;
+			}
+		}
+	}
+	if (!removeTarget(target)) {
+		return std::nullopt;
+	}
+	rebuild();
+	if (adjacent && (!forward || target.kind == RemovalKind::TableCell)) {
+		const auto ordinal = textNodeOrdinal(*adjacent);
+		if (setActiveTextByOrdinal(ordinal)) {
+			return _activeTextOrdinal;
+		}
+	}
+	if (!textNodeCount()) {
+		return std::nullopt;
+	}
+	const auto fallback = forward
+		? std::min(first, textNodeCount() - 1)
+		: std::max(std::min(first - 1, textNodeCount() - 1), 0);
+	if (!setActiveTextByOrdinal(fallback)) {
+		ensureActiveTextOrdinal();
+	}
+	return _activeTextOrdinal;
+}
+
+std::optional<int> State::removeStructuralSelection(
+		const Markdown::PreparedEditSelection &selection,
+		bool forward) {
+	clearTemporaryDownParagraph();
+	const auto activate = [&](const LeafPath &leaf) -> std::optional<int> {
+		const auto ordinal = textNodeOrdinal(leaf);
+		if (setActiveTextByOrdinal(ordinal)) {
+			return _activeTextOrdinal;
+		}
+		return std::nullopt;
+	};
+	const auto finish = [&](
+			auto postMutationFocus,
+			std::optional<LeafPath> plannedFocus) -> std::optional<int> {
+		rebuild();
+		if (const auto focus = postMutationFocus()) {
+			if (const auto ordinal = activate(*focus)) {
+				return ordinal;
+			}
+		}
+		if (plannedFocus) {
+			if (const auto ordinal = activate(*plannedFocus)) {
+				return ordinal;
+			}
+		}
+		ensureActiveTextOrdinal();
+		return (_activeTextOrdinal >= 0)
+			? std::make_optional(_activeTextOrdinal)
+			: std::nullopt;
+	};
+	const auto leafForContainerOwner = [&](
+			const BlockContainerPath &container) -> std::optional<LeafPath> {
+		if (container.steps.empty()) {
+			return std::nullopt;
+		}
+		auto parent = container;
+		const auto step = parent.steps.back();
+		parent.steps.pop_back();
+		const auto owner = BlockPath{
+			.container = parent,
+			.index = step.blockIndex,
+		};
+		if (step.kind == BlockContainerKind::BlockChildren) {
+			for (const auto &descriptor : _textNodes) {
+				if (leafBelongsToBlock(descriptor.leaf, owner)) {
+					return descriptor.leaf;
+				}
+			}
+		} else if (step.kind == BlockContainerKind::ListItemChildren) {
+			for (const auto &descriptor : _textNodes) {
+				const auto index = ListItemIndexForLeaf(
+					descriptor.leaf,
+					owner);
+				if (index && *index == step.listItemIndex) {
+					return descriptor.leaf;
+				}
+			}
+		}
+		return std::nullopt;
+	};
+	const auto leafNearBlockRange = [&](
+			const StructuralBlockRange &range,
+			bool forward) -> std::optional<LeafPath> {
+		if (forward) {
+			for (const auto &descriptor : _textNodes) {
+				const auto index = BlockIndexInContainer(
+					descriptor.leaf,
+					range.container);
+				if (index && *index >= range.from) {
+					return descriptor.leaf;
+				}
+			}
+		} else {
+			for (auto i = textNodeCount(); i != 0; --i) {
+				const auto &leaf = _textNodes[i - 1].leaf;
+				const auto index = BlockIndexInContainer(leaf, range.container);
+				if (index && *index < range.from) {
+					return leaf;
+				}
+			}
+		}
+		return leafForContainerOwner(range.container);
+	};
+	const auto leafOutsideBlock = [&](
+			const BlockPath &path,
+			bool forward) -> std::optional<LeafPath> {
+		if (forward) {
+			for (const auto &descriptor : _textNodes) {
+				const auto index = BlockIndexInContainer(
+					descriptor.leaf,
+					path.container);
+				if (index && *index > path.index) {
+					return descriptor.leaf;
+				}
+			}
+		} else {
+			for (auto i = textNodeCount(); i != 0; --i) {
+				const auto &leaf = _textNodes[i - 1].leaf;
+				const auto index = BlockIndexInContainer(leaf, path.container);
+				if (index && *index < path.index) {
+					return leaf;
+				}
+			}
+		}
+		return std::nullopt;
+	};
+	const auto leafNearListItemRange = [&](
+			const StructuralListItemRange &range,
+			bool forward) -> std::optional<LeafPath> {
+		if (forward) {
+			for (const auto &descriptor : _textNodes) {
+				const auto index = ListItemIndexForLeaf(
+					descriptor.leaf,
+					range.block);
+				if (index && *index >= range.from) {
+					return descriptor.leaf;
+				}
+			}
+		} else {
+			for (auto i = textNodeCount(); i != 0; --i) {
+				const auto &leaf = _textNodes[i - 1].leaf;
+				const auto index = ListItemIndexForLeaf(leaf, range.block);
+				if (index && *index < range.from) {
+					return leaf;
+				}
+			}
+		}
+		return leafOutsideBlock(range.block, forward);
+	};
+	const auto tableTitleLeaf = [&](
+			const BlockPath &path) -> std::optional<LeafPath> {
+		auto leaf = LeafPath{
+			.kind = LeafKind::BlockText,
+			.block = path,
+		};
+		return (textNodeOrdinal(leaf) >= 0)
+			? std::make_optional(leaf)
+			: std::nullopt;
+	};
+	const auto leafNearTableRows = [&](
+			const StructuralTableRowRange &range,
+			bool forward) -> std::optional<LeafPath> {
+		const auto cellInDirection = [&](
+				bool direction) -> std::optional<LeafPath> {
+			if (direction) {
+				for (const auto &descriptor : _textNodes) {
+					const auto &leaf = descriptor.leaf;
+					if (leaf.block == range.block
+						&& leaf.kind == LeafKind::TableCellText
+						&& leaf.tableRowIndex >= range.from) {
+						return leaf;
+					}
+				}
+			} else {
+				for (auto i = textNodeCount(); i != 0; --i) {
+					const auto &leaf = _textNodes[i - 1].leaf;
+					if (leaf.block == range.block
+						&& leaf.kind == LeafKind::TableCellText
+						&& leaf.tableRowIndex < range.from) {
+						return leaf;
+					}
+				}
+			}
+			return std::nullopt;
+		};
+		if (const auto leaf = cellInDirection(forward)) {
+			return leaf;
+		}
+		if (const auto leaf = cellInDirection(!forward)) {
+			return leaf;
+		}
+		if (const auto leaf = tableTitleLeaf(range.block)) {
+			return leaf;
+		}
+		return leafOutsideBlock(range.block, forward);
+	};
+	const auto leafNearTableCells = [&](
+			const StructuralTableCellRange &range,
+			bool forward) -> std::optional<LeafPath> {
+		if (const auto leaf = firstSelectedLeaf(range)) {
+			return leaf;
+		}
+		return adjacentLeafOutsideRange(range, forward);
+	};
+	const auto focusForRemovedBlock = [&](
+			const BlockPath &path,
+			bool forward) {
+		return leafNearBlockRange(StructuralBlockRange{
+			.container = path.container,
+			.from = path.index,
+			.till = path.index + 1,
+		}, forward);
+	};
+	switch (selection.kind) {
+	case PreparedEditSelectionKind::Blocks: {
+		const auto range = validateBlockRange(selection.blocks);
+		if (!range) {
+			return std::nullopt;
+		}
+		const auto plannedFocus = plannedFocusForRange(*range, forward);
+		const auto blocks = blockContainer(range->container);
+		if (!blocks) {
+			return std::nullopt;
+		}
+		blocks->erase(
+			blocks->begin() + range->from,
+			blocks->begin() + range->till);
+		return finish([&] {
+			return leafNearBlockRange(*range, forward);
+		}, plannedFocus);
+	}
+	case PreparedEditSelectionKind::ListItems: {
+		const auto range = validateListItemRange(selection.listItems);
+		if (!range) {
+			return std::nullopt;
+		}
+		const auto plannedFocus = plannedFocusForRange(*range, forward);
+		const auto owner = block(range->block);
+		if (!owner || owner->kind != BlockKind::List) {
+			return std::nullopt;
+		}
+		owner->listItems.erase(
+			owner->listItems.begin() + range->from,
+			owner->listItems.begin() + range->till);
+		if (owner->listItems.empty()) {
+			const auto removed = range->block;
+			if (!removeTarget({
+					.kind = RemovalKind::Block,
+					.block = removed,
+				})) {
+				return std::nullopt;
+			}
+			return finish([&] {
+				return focusForRemovedBlock(removed, forward);
+			}, plannedFocus);
+		}
+		return finish([&] {
+			return leafNearListItemRange(*range, forward);
+		}, plannedFocus);
+	}
+	case PreparedEditSelectionKind::TableRows: {
+		const auto range = validateTableRowRange(selection.tableRows);
+		if (!range) {
+			return std::nullopt;
+		}
+		const auto plannedFocus = plannedFocusForRange(*range, forward);
+		const auto owner = block(range->block);
+		if (!owner || owner->kind != BlockKind::Table) {
+			return std::nullopt;
+		}
+		owner->tableRows.erase(
+			owner->tableRows.begin() + range->from,
+			owner->tableRows.begin() + range->till);
+		if (owner->tableRows.empty() && RichTextIsEmpty(owner->text)) {
+			const auto removed = range->block;
+			if (!removeTarget({
+					.kind = RemovalKind::Block,
+					.block = removed,
+				})) {
+				return std::nullopt;
+			}
+			return finish([&] {
+				return focusForRemovedBlock(removed, forward);
+			}, plannedFocus);
+		}
+		return finish([&] {
+			return leafNearTableRows(*range, forward);
+		}, plannedFocus);
+	}
+	case PreparedEditSelectionKind::TableCells: {
+		const auto range = validateTableCellRange(selection.tableCells);
+		if (!range) {
+			return std::nullopt;
+		}
+		const auto owner = block(range->block);
+		if (!owner || owner->kind != BlockKind::Table) {
+			return std::nullopt;
+		}
+		const auto grid = BuildTableGrid(*owner, tableRenderLimits());
+		if (!TableGridRangeSpansAllRows(grid, *range)) {
+			return std::nullopt;
+		}
+		const auto plannedFocus = plannedFocusForRange(*range, forward);
+		const auto selected = SelectedTableGridCells(grid, *range);
+		if (selected.empty()) {
+			return std::nullopt;
+		}
+		auto toErase = std::vector<TableGridCellReference>();
+		for (const auto &reference : selected) {
+			if (TableGridCellContainedInRange(reference, *range)) {
+				toErase.push_back(reference);
+				continue;
+			}
+			const auto intersection = TableGridCellColumnIntersection(
+				reference,
+				*range);
+			if (intersection <= 0) {
+				continue;
+			}
+			auto &cell = owner->tableRows[reference.rowIndex].cells[
+				reference.cellIndex];
+			cell.colspan = std::max(
+				(reference.columnTill - reference.columnFrom) - intersection,
+				1);
+		}
+		std::sort(
+			toErase.begin(),
+			toErase.end(),
+			[](const auto &a, const auto &b) {
+				if (a.rowIndex != b.rowIndex) {
+					return a.rowIndex > b.rowIndex;
+				}
+				return a.cellIndex > b.cellIndex;
+			});
+		for (const auto &reference : toErase) {
+			auto &row = owner->tableRows[reference.rowIndex];
+			row.cells.erase(row.cells.begin() + reference.cellIndex);
+		}
+		if (std::all_of(
+				owner->tableRows.begin(),
+				owner->tableRows.end(),
+				[](const TableRow &row) {
+					return row.cells.empty();
+				})) {
+			if (RichTextIsEmpty(owner->text)) {
+				const auto removed = range->block;
+				if (!removeTarget({
+						.kind = RemovalKind::Block,
+						.block = removed,
+					})) {
+					return std::nullopt;
+				}
+				return finish([&] {
+					return focusForRemovedBlock(removed, forward);
+				}, plannedFocus);
+			}
+			auto row = TableRow();
+			row.cells.push_back(MakeDefaultTableCell());
+			owner->tableRows.clear();
+			owner->tableRows.push_back(std::move(row));
+		}
+		return finish([&] {
+			return leafNearTableCells(*range, forward);
+		}, plannedFocus);
+	}
+	case PreparedEditSelectionKind::None:
+		return std::nullopt;
+	}
+	return std::nullopt;
+}
+
+std::optional<State::BlockContainerPath> State::convertBlockContainerPath(
+		const Markdown::PreparedEditBlockContainerPath &path) const {
+	auto result = BlockContainerPath();
+	result.steps.reserve(path.steps.size());
+	const auto *blocks = &_richPage->blocks;
+	for (const auto &step : path.steps) {
+		if (step.blockIndex < 0 || step.blockIndex >= int(blocks->size())) {
+			return std::nullopt;
+		}
+		const auto &parent = (*blocks)[step.blockIndex];
+		auto converted = BlockContainerStep();
+		converted.blockIndex = step.blockIndex;
+		converted.listItemIndex = step.listItemIndex;
+		switch (step.kind) {
+		case PreparedBlockContainerKind::Root:
+			return std::nullopt;
+		case PreparedBlockContainerKind::BlockChildren:
+			if (!BlockCanOwnChildContainer(parent)) {
+				return std::nullopt;
+			}
+			converted.kind = BlockContainerKind::BlockChildren;
+			blocks = &parent.blocks;
+			break;
+		case PreparedBlockContainerKind::ListItemChildren:
+			if (parent.kind != BlockKind::List
+				|| step.listItemIndex < 0
+				|| step.listItemIndex >= int(parent.listItems.size())) {
+				return std::nullopt;
+			}
+			converted.kind = BlockContainerKind::ListItemChildren;
+			blocks = &parent.listItems[step.listItemIndex].blocks;
+			break;
+		}
+		result.steps.push_back(converted);
+	}
+	return result;
+}
+
+std::optional<State::BlockPath> State::convertBlockPath(
+		const Markdown::PreparedEditBlockPath &path) const {
+	if (path.index < 0) {
+		return std::nullopt;
+	}
+	const auto container = convertBlockContainerPath(path.container);
+	if (!container) {
+		return std::nullopt;
+	}
+	const auto blocks = blockContainer(*container);
+	if (!blocks || path.index >= int(blocks->size())) {
+		return std::nullopt;
+	}
+	return BlockPath{
+		.container = *container,
+		.index = path.index,
+	};
+}
+
+std::optional<State::BlockPath> State::convertBlockPath(
+		const Markdown::PreparedEditBlockSource &source) const {
+	return convertBlockPath(source.path);
+}
+
+std::optional<State::LeafPath> State::convertLeafPath(
+		const Markdown::PreparedEditLeafSource &source) const {
+	const auto blockPath = convertBlockPath(source.block);
+	if (!blockPath) {
+		return std::nullopt;
+	}
+	auto result = LeafPath();
+	result.block = *blockPath;
+	switch (source.kind) {
+	case PreparedEditLeafKind::BlockText:
+		result.kind = LeafKind::BlockText;
+		break;
+	case PreparedEditLeafKind::BlockCaption:
+		result.kind = LeafKind::BlockCaption;
+		break;
+	case PreparedEditLeafKind::ListItemText:
+		if (source.listItemIndex < 0) {
+			return std::nullopt;
+		}
+		result.kind = LeafKind::ListItemText;
+		result.listItemIndex = source.listItemIndex;
+		break;
+	case PreparedEditLeafKind::TableCellText:
+		if (source.tableRowIndex < 0 || source.tableCellIndex < 0) {
+			return std::nullopt;
+		}
+		result.kind = LeafKind::TableCellText;
+		result.tableRowIndex = source.tableRowIndex;
+		result.tableCellIndex = source.tableCellIndex;
+		break;
+	case PreparedEditLeafKind::MathFormula:
+		result.kind = LeafKind::MathFormula;
+		break;
+	}
+	const auto owner = block(result.block);
+	if (!owner) {
+		return std::nullopt;
+	}
+	switch (result.kind) {
+	case LeafKind::BlockText:
+		if (!BlockSupportsBlockText(*owner)) {
+			return std::nullopt;
+		}
+		break;
+	case LeafKind::BlockCaption:
+		if (!BlockSupportsBlockCaption(*owner)) {
+			return std::nullopt;
+		}
+		break;
+	case LeafKind::ListItemText:
+		if (owner->kind != BlockKind::List
+			|| !listItem(result.block, result.listItemIndex)) {
+			return std::nullopt;
+		}
+		break;
+	case LeafKind::TableCellText:
+		if (owner->kind != BlockKind::Table
+			|| !tableCell(
+				result.block,
+				result.tableRowIndex,
+				result.tableCellIndex)) {
+			return std::nullopt;
+		}
+		break;
+	case LeafKind::MathFormula:
+		if (owner->kind != BlockKind::Math) {
+			return std::nullopt;
+		}
+		break;
+	}
+	return result;
+}
+
+std::optional<PreparedEditLeafSource> State::convertPreparedLeafSource(
+		const LeafPath &path) const {
+	const auto owner = block(path.block);
+	if (!owner) {
+		return std::nullopt;
+	}
+	auto result = PreparedEditLeafSource();
+	result.block = {
+		.container = ToPreparedBlockContainerPath(path.block.container),
+		.index = path.block.index,
+	};
+	switch (path.kind) {
+	case LeafKind::BlockText:
+		if (!BlockSupportsBlockText(*owner)) {
+			return std::nullopt;
+		}
+		result.kind = PreparedEditLeafKind::BlockText;
+		break;
+	case LeafKind::BlockCaption:
+		if (!BlockSupportsBlockCaption(*owner)) {
+			return std::nullopt;
+		}
+		result.kind = PreparedEditLeafKind::BlockCaption;
+		break;
+	case LeafKind::ListItemText:
+		if (owner->kind != BlockKind::List
+			|| !listItem(path.block, path.listItemIndex)) {
+			return std::nullopt;
+		}
+		result.kind = PreparedEditLeafKind::ListItemText;
+		result.listItemIndex = path.listItemIndex;
+		break;
+	case LeafKind::TableCellText:
+		if (owner->kind != BlockKind::Table
+			|| !tableCell(
+				path.block,
+				path.tableRowIndex,
+				path.tableCellIndex)) {
+			return std::nullopt;
+		}
+		result.kind = PreparedEditLeafKind::TableCellText;
+		result.tableRowIndex = path.tableRowIndex;
+		result.tableCellIndex = path.tableCellIndex;
+		break;
+	case LeafKind::MathFormula:
+		if (owner->kind != BlockKind::Math) {
+			return std::nullopt;
+		}
+		result.kind = PreparedEditLeafKind::MathFormula;
+		break;
+	}
+	return result;
+}
+
+std::optional<PreparedEditLeafSource> State::convertPreparedLeafSource(
+		const TextNodeDescriptor &descriptor) const {
+	return convertPreparedLeafSource(descriptor.leaf);
+}
+
+std::optional<State::StructuralBlockRange> State::validateBlockRange(
+		const Markdown::PreparedEditBlockRange &range) const {
+	if (range.empty()) {
+		return std::nullopt;
+	}
+	const auto container = convertBlockContainerPath(range.container);
+	if (!container) {
+		return std::nullopt;
+	}
+	const auto blocks = blockContainer(*container);
+	if (!blocks
+		|| range.from < 0
+		|| range.till > int(blocks->size())) {
+		return std::nullopt;
+	}
+	for (auto i = range.from; i != range.till; ++i) {
+		if (!CanEditBlock((*blocks)[i])) {
+			return std::nullopt;
+		}
+	}
+	return StructuralBlockRange{
+		.container = *container,
+		.from = range.from,
+		.till = range.till,
+	};
+}
+
+std::optional<State::StructuralListItemRange> State::validateListItemRange(
+		const Markdown::PreparedEditListItemRange &range) const {
+	if (range.empty()) {
+		return std::nullopt;
+	}
+	const auto path = convertBlockPath(range.block);
+	if (!path) {
+		return std::nullopt;
+	}
+	const auto owner = block(*path);
+	if (!owner
+		|| owner->kind != BlockKind::List
+		|| range.from < 0
+		|| range.till > int(owner->listItems.size())) {
+		return std::nullopt;
+	}
+	for (auto i = range.from; i != range.till; ++i) {
+		if (!CanEditBlocks(owner->listItems[i].blocks)) {
+			return std::nullopt;
+		}
+	}
+	return StructuralListItemRange{
+		.block = *path,
+		.from = range.from,
+		.till = range.till,
+	};
+}
+
+std::optional<State::StructuralTableRowRange> State::validateTableRowRange(
+		const Markdown::PreparedEditTableRowRange &range) const {
+	if (range.empty()) {
+		return std::nullopt;
+	}
+	const auto path = convertBlockPath(range.block);
+	if (!path) {
+		return std::nullopt;
+	}
+	const auto owner = block(*path);
+	if (!owner
+		|| owner->kind != BlockKind::Table
+		|| range.from < 0
+		|| range.till > int(owner->tableRows.size())) {
+		return std::nullopt;
+	}
+	return StructuralTableRowRange{
+		.block = *path,
+		.from = range.from,
+		.till = range.till,
+	};
+}
+
+std::optional<State::StructuralTableCellRange> State::validateTableCellRange(
+		const Markdown::PreparedEditTableCellRange &range) const {
+	if (range.empty()) {
+		return std::nullopt;
+	}
+	const auto path = convertBlockPath(range.block);
+	if (!path) {
+		return std::nullopt;
+	}
+	const auto owner = block(*path);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return std::nullopt;
+	}
+	const auto grid = BuildTableGrid(*owner, tableRenderLimits());
+	if (range.rowFrom < 0
+		|| range.rowTill > grid.rowCount
+		|| range.columnFrom < 0
+		|| range.columnTill > grid.columnCount) {
+		return std::nullopt;
+	}
+	auto result = StructuralTableCellRange{
+		.block = *path,
+		.rowFrom = range.rowFrom,
+		.rowTill = range.rowTill,
+		.columnFrom = range.columnFrom,
+		.columnTill = range.columnTill,
+	};
+	if (SelectedTableGridCells(grid, result).empty()) {
+		return std::nullopt;
+	}
+	return result;
+}
+
+bool State::leafWillBeRemoved(
+		const LeafPath &path,
+		const StructuralBlockRange &range) const {
+	const auto index = BlockIndexInContainer(path, range.container);
+	return index && IndexInRange(*index, range.from, range.till);
+}
+
+bool State::leafWillBeRemoved(
+		const LeafPath &path,
+		const StructuralListItemRange &range) const {
+	const auto index = ListItemIndexForLeaf(path, range.block);
+	return index && IndexInRange(*index, range.from, range.till);
+}
+
+bool State::leafWillBeRemoved(
+		const LeafPath &path,
+		const StructuralTableRowRange &range) const {
+	const auto index = TableRowIndexForLeaf(path, range.block);
+	return index && IndexInRange(*index, range.from, range.till);
+}
+
+bool State::leafWillBeRemoved(
+		const LeafPath &,
+		const StructuralTableCellRange &) const {
+	return false;
+}
+
+bool State::leafBelongsToBlock(
+		const LeafPath &leaf,
+		const BlockPath &path) const {
+	const auto &owner = leaf.block;
+	if (owner == path) {
+		return true;
+	}
+	if (!ContainerHasPrefix(owner.container, path.container)) {
+		return false;
+	}
+	if (owner.container.steps.size() <= path.container.steps.size()) {
+		return false;
+	}
+	const auto &step = owner.container.steps[path.container.steps.size()];
+	return step.blockIndex == path.index
+		&& (step.kind == BlockContainerKind::BlockChildren
+			|| step.kind == BlockContainerKind::ListItemChildren);
+}
+
+std::optional<State::LeafPath> State::firstSelectedLeaf(
+		const StructuralTableCellRange &range) const {
+	const auto owner = block(range.block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return std::nullopt;
+	}
+	const auto selected = SelectedTableGridCells(
+		BuildTableGrid(*owner, tableRenderLimits()),
+		range);
+	for (const auto &descriptor : _textNodes) {
+		const auto &leaf = descriptor.leaf;
+		if (leaf.block != range.block
+			|| leaf.kind != LeafKind::TableCellText) {
+			continue;
+		}
+		for (const auto &reference : selected) {
+			if (TableGridCellMatchesLeaf(reference, leaf, range.block)) {
+				return leaf;
+			}
+		}
+	}
+	return std::nullopt;
+}
+
+std::optional<State::LeafPath> State::adjacentLeafOutsideRange(
+		const StructuralBlockRange &range,
+		bool forward) const {
+	if (forward) {
+		for (const auto &descriptor : _textNodes) {
+			const auto index = BlockIndexInContainer(
+				descriptor.leaf,
+				range.container);
+			if (index && *index >= range.till) {
+				return descriptor.leaf;
+			}
+		}
+	} else {
+		for (auto i = textNodeCount(); i != 0; --i) {
+			const auto &leaf = _textNodes[i - 1].leaf;
+			const auto index = BlockIndexInContainer(leaf, range.container);
+			if (index && *index < range.from) {
+				return leaf;
+			}
+		}
+	}
+	return std::nullopt;
+}
+
+std::optional<State::LeafPath> State::adjacentLeafOutsideRange(
+		const StructuralListItemRange &range,
+		bool forward) const {
+	if (forward) {
+		for (const auto &descriptor : _textNodes) {
+			const auto index = ListItemIndexForLeaf(
+				descriptor.leaf,
+				range.block);
+			if (index && *index >= range.till) {
+				return descriptor.leaf;
+			}
+		}
+	} else {
+		for (auto i = textNodeCount(); i != 0; --i) {
+			const auto &leaf = _textNodes[i - 1].leaf;
+			const auto index = ListItemIndexForLeaf(leaf, range.block);
+			if (index && *index < range.from) {
+				return leaf;
+			}
+		}
+	}
+	return std::nullopt;
+}
+
+std::optional<State::LeafPath> State::adjacentLeafOutsideRange(
+		const StructuralTableRowRange &range,
+		bool forward) const {
+	if (forward) {
+		for (const auto &descriptor : _textNodes) {
+			const auto index = TableRowIndexForLeaf(
+				descriptor.leaf,
+				range.block);
+			if (index && *index >= range.till) {
+				return descriptor.leaf;
+			}
+		}
+	} else {
+		for (auto i = textNodeCount(); i != 0; --i) {
+			const auto &leaf = _textNodes[i - 1].leaf;
+			const auto index = TableRowIndexForLeaf(leaf, range.block);
+			if (index && *index < range.from) {
+				return leaf;
+			}
+		}
+	}
+	return std::nullopt;
+}
+
+std::optional<State::LeafPath> State::adjacentLeafOutsideRange(
+		const StructuralTableCellRange &range,
+		bool forward) const {
+	const auto owner = block(range.block);
+	if (!owner || owner->kind != BlockKind::Table) {
+		return std::nullopt;
+	}
+	const auto grid = BuildTableGrid(*owner, tableRenderLimits());
+	const auto leafIntersectsRange = [&](const LeafPath &leaf) {
+		if (leaf.block != range.block
+			|| leaf.kind != LeafKind::TableCellText) {
+			return false;
+		}
+		for (const auto &reference : grid.cells) {
+			if (TableGridCellMatchesLeaf(reference, leaf, range.block)) {
+				return TableGridCellIntersectsRange(reference, range);
+			}
+		}
+		return false;
+	};
+	auto fallback = std::optional<LeafPath>();
+	auto foundIntersecting = false;
+	if (forward) {
+		for (const auto &descriptor : _textNodes) {
+			if (descriptor.leaf.block == range.block
+				&& descriptor.leaf.kind == LeafKind::TableCellText) {
+				if (leafIntersectsRange(descriptor.leaf)) {
+					foundIntersecting = true;
+				} else if (foundIntersecting) {
+					return descriptor.leaf;
+				} else if (!fallback) {
+					fallback = descriptor.leaf;
+				}
+			}
+		}
+	} else {
+		for (auto i = textNodeCount(); i != 0; --i) {
+			const auto &leaf = _textNodes[i - 1].leaf;
+			if (leaf.block == range.block
+				&& leaf.kind == LeafKind::TableCellText) {
+				if (leafIntersectsRange(leaf)) {
+					foundIntersecting = true;
+				} else if (foundIntersecting) {
+					return leaf;
+				} else if (!fallback) {
+					fallback = leaf;
+				}
+			}
+		}
+	}
+	return foundIntersecting ? std::nullopt : fallback;
+}
+
+std::optional<State::LeafPath> State::fallbackFocusLeaf() const {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (descriptor) {
+		return descriptor->leaf;
+	}
+	return !_textNodes.empty()
+		? std::make_optional(_textNodes.front().leaf)
+		: std::nullopt;
+}
+
+std::optional<State::LeafPath> State::plannedFocusForRange(
+		const StructuralBlockRange &range,
+		bool forward) const {
+	if (const auto adjacent = adjacentLeafOutsideRange(range, forward)) {
+		return adjacent;
+	}
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (descriptor && !leafWillBeRemoved(descriptor->leaf, range)) {
+		return descriptor->leaf;
+	}
+	for (const auto &fallback : _textNodes) {
+		if (!leafWillBeRemoved(fallback.leaf, range)) {
+			return fallback.leaf;
+		}
+	}
+	return fallbackFocusLeaf();
+}
+
+std::optional<State::LeafPath> State::plannedFocusForRange(
+		const StructuralListItemRange &range,
+		bool forward) const {
+	if (const auto adjacent = adjacentLeafOutsideRange(range, forward)) {
+		return adjacent;
+	}
+	const auto ownerRange = StructuralBlockRange{
+		.container = range.block.container,
+		.from = range.block.index,
+		.till = range.block.index + 1,
+	};
+	if (const auto adjacent = adjacentLeafOutsideRange(ownerRange, forward)) {
+		return adjacent;
+	}
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (descriptor && !leafWillBeRemoved(descriptor->leaf, range)) {
+		return descriptor->leaf;
+	}
+	for (const auto &fallback : _textNodes) {
+		if (!leafWillBeRemoved(fallback.leaf, range)) {
+			return fallback.leaf;
+		}
+	}
+	return fallbackFocusLeaf();
+}
+
+std::optional<State::LeafPath> State::plannedFocusForRange(
+		const StructuralTableRowRange &range,
+		bool forward) const {
+	if (const auto adjacent = adjacentLeafOutsideRange(range, forward)) {
+		return adjacent;
+	}
+	const auto ownerRange = StructuralBlockRange{
+		.container = range.block.container,
+		.from = range.block.index,
+		.till = range.block.index + 1,
+	};
+	if (const auto adjacent = adjacentLeafOutsideRange(ownerRange, forward)) {
+		return adjacent;
+	}
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (descriptor && !leafWillBeRemoved(descriptor->leaf, range)) {
+		return descriptor->leaf;
+	}
+	for (const auto &fallback : _textNodes) {
+		if (!leafWillBeRemoved(fallback.leaf, range)) {
+			return fallback.leaf;
+		}
+	}
+	return fallbackFocusLeaf();
+}
+
+std::optional<State::LeafPath> State::plannedFocusForRange(
+		const StructuralTableCellRange &range,
+		bool forward) const {
+	if (const auto selected = firstSelectedLeaf(range)) {
+		return selected;
+	}
+	if (const auto adjacent = adjacentLeafOutsideRange(range, forward)) {
+		return adjacent;
+	}
+	return fallbackFocusLeaf();
+}
+
+State::InsertionAnchor State::resolveActiveInsertionTarget() const {
+	auto result = InsertionAnchor{
+		.container = BlockContainerPath(),
+		.blockIndex = int(_richPage->blocks.size()) - 1,
+	};
+	if (const auto descriptor = textNode(_activeTextOrdinal)) {
+		result = descriptor->insertionAnchor;
+	}
+	return blockContainer(result.container)
+		? result
+		: InsertionAnchor{
+			.container = BlockContainerPath(),
+			.blockIndex = int(_richPage->blocks.size()) - 1,
+		};
+}
+
+std::optional<int> State::normalizeTextOnlyListItemForInsertion(
+		const BlockContainerPath &container) {
+	if (container.steps.empty()) {
+		return std::nullopt;
+	}
+	const auto &step = container.steps.back();
+	if (step.kind != BlockContainerKind::ListItemChildren) {
+		return std::nullopt;
+	}
+	auto parent = container;
+	parent.steps.pop_back();
+	auto itemPath = BlockPath{
+		.container = parent,
+		.index = step.blockIndex,
+	};
+	auto item = listItem(itemPath, step.listItemIndex);
+	if (!item || (item->anchorId.isEmpty() && RichTextIsEmpty(item->text))) {
+		return std::nullopt;
+	}
+	auto paragraph = MakeParagraphBlock();
+	paragraph.anchorId = std::move(item->anchorId);
+	paragraph.text = std::move(item->text);
+	item->anchorId.clear();
+	item->text = RichText();
+	if (!BlockIsEmpty(paragraph)) {
+		clearTemporaryDownParagraph();
+		item->blocks.insert(item->blocks.begin(), std::move(paragraph));
+		return 0;
+	}
+	return -1;
+}
+
+std::optional<int> State::normalizeTextOnlyQuoteSurface(
+		const BlockContainerPath &container,
+		bool keepEmptyParagraph) {
+	if (container.steps.empty()) {
+		return std::nullopt;
+	}
+	const auto &step = container.steps.back();
+	if (step.kind != BlockContainerKind::BlockChildren) {
+		return std::nullopt;
+	}
+	auto parent = container;
+	parent.steps.pop_back();
+	auto owner = block({
+		.container = parent,
+		.index = step.blockIndex,
+	});
+	if (!owner
+		|| owner->kind != BlockKind::Quote
+		|| owner->pullquote
+		|| !owner->blocks.empty()) {
+		return std::nullopt;
+	}
+	auto paragraph = MakeParagraphBlock();
+	paragraph.text = std::move(owner->text);
+	owner->text = RichText();
+	clearTemporaryDownParagraph();
+	if (keepEmptyParagraph || !BlockIsEmpty(paragraph)) {
+		owner->blocks.insert(owner->blocks.begin(), std::move(paragraph));
+		return 0;
+	}
+	return -1;
+}
+
+std::optional<int> State::normalizeTextOnlyQuoteForInsertion(
+		const BlockContainerPath &container) {
+	return normalizeTextOnlyQuoteSurface(container, false);
+}
+
+bool State::shouldReplaceActiveTextOnlyBlock(
+		const TextNodeDescriptor &descriptor,
+		const std::vector<Block> &blocks) const {
+	if (descriptor.leaf.kind != LeafKind::BlockText
+		|| descriptor.removalTarget.kind != RemovalKind::Block) {
+		return false;
+	}
+	const auto owner = block(descriptor.removalTarget.block);
+	if (!owner || !BlockIsEmpty(*owner)) {
+		return false;
+	}
+	if (owner->kind == BlockKind::Paragraph) {
+		return true;
+	}
+	return owner->kind == BlockKind::Heading
+		&& blocks.size() == 1
+		&& blocks.front().kind == BlockKind::Heading;
+}
+
+std::optional<int> State::activateRebuiltLeaf(const LeafPath &path) {
+	const auto ordinal = textNodeOrdinal(path);
+	if (setActiveTextByOrdinal(ordinal)) {
+		return _activeTextOrdinal;
+	}
+	ensureActiveTextOrdinal();
+	return (_activeTextOrdinal >= 0)
+		? std::make_optional(_activeTextOrdinal)
+		: std::nullopt;
+}
+
+std::optional<State::ParagraphTarget> State::reuseOrInsertParagraph(
+		const BlockContainerPath &containerPath,
+		int index) {
+	const auto blocks = blockContainer(containerPath);
+	if (!blocks) {
+		return std::nullopt;
+	}
+	const auto insertAt = std::clamp(index, 0, int(blocks->size()));
+	if (insertAt < int(blocks->size())
+		&& (*blocks)[insertAt].kind == BlockKind::Paragraph) {
+		return ParagraphTarget{
+			.leaf = {
+				.kind = LeafKind::BlockText,
+				.block = {
+					.container = containerPath,
+					.index = insertAt,
+				},
+			},
+		};
+	}
+	clearTemporaryDownParagraph();
+	blocks->insert(blocks->begin() + insertAt, MakeParagraphBlock());
+	return ParagraphTarget{
+		.leaf = {
+			.kind = LeafKind::BlockText,
+			.block = {
+				.container = containerPath,
+				.index = insertAt,
+			},
+		},
+		.inserted = true,
+	};
+}
+
+auto State::resolveActiveTextInsertTarget()
+-> std::optional<State::ActiveTextInsertTarget> {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor) {
+		return std::nullopt;
+	}
+	if (descriptor->leaf.kind == LeafKind::ListItemText) {
+		const auto surface = normalizeActiveListItemSurface();
+		if (!surface) {
+			return std::nullopt;
+		}
+		const auto container = ListItemChildrenContainer(
+			surface->path,
+			surface->itemIndex);
+		return ActiveTextInsertTarget{
+			.leaf = {
+				.kind = LeafKind::BlockText,
+				.block = {
+					.container = container,
+					.index = 0,
+				},
+			},
+			.anchor = {
+				.container = container,
+				.blockIndex = 0,
+			},
+		};
+	}
+	if (descriptor->leaf.kind == LeafKind::BlockText) {
+		if (const auto owner = block(descriptor->leaf.block);
+			owner
+			&& owner->kind == BlockKind::Quote
+			&& !owner->pullquote
+			&& owner->blocks.empty()) {
+			const auto container = BlockChildrenContainer(
+				descriptor->leaf.block);
+			if (!normalizeTextOnlyQuoteSurface(container, true)) {
+				return std::nullopt;
+			}
+			return ActiveTextInsertTarget{
+				.leaf = {
+					.kind = LeafKind::BlockText,
+					.block = {
+						.container = container,
+						.index = 0,
+					},
+				},
+				.anchor = {
+					.container = container,
+					.blockIndex = 0,
+				},
+			};
+		}
+	}
+	return ActiveTextInsertTarget{
+		.leaf = descriptor->leaf,
+		.anchor = descriptor->insertionAnchor,
+	};
+}
+
+auto State::activeNonPullquoteQuote() const
+-> std::optional<State::ActiveNonPullquoteQuote> {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor) {
+		return std::nullopt;
+	}
+	const auto direct = block(descriptor->leaf.block);
+	if (direct && direct->kind == BlockKind::Quote) {
+		return direct->pullquote
+			? std::nullopt
+			: std::make_optional(ActiveNonPullquoteQuote{
+				.path = descriptor->leaf.block,
+			});
+	}
+	auto container = descriptor->leaf.block.container;
+	while (!container.steps.empty()) {
+		const auto step = container.steps.back();
+		container.steps.pop_back();
+		if (step.kind != BlockContainerKind::BlockChildren) {
+			continue;
+		}
+		const auto path = BlockPath{
+			.container = container,
+			.index = step.blockIndex,
+		};
+		const auto owner = block(path);
+		if (!owner || owner->kind != BlockKind::Quote) {
+			continue;
+		}
+		if (owner->pullquote) {
+			return std::nullopt;
+		}
+		const auto body = BlockChildrenContainer(path);
+		auto lastBodyLeaf = false;
+		for (auto i = textNodeCount(); i != 0; --i) {
+			const auto &candidate = _textNodes[i - 1].leaf;
+			if (ContainerHasPrefix(candidate.block.container, body)) {
+				lastBodyLeaf = (candidate == descriptor->leaf);
+				break;
+			}
+		}
+		return ActiveNonPullquoteQuote{
+			.path = path,
+			.activeLeafIsLastEditableBodyLeaf = lastBodyLeaf,
+		};
+	}
+	return std::nullopt;
+}
+
+auto State::activeListItemSurface() const
+-> std::optional<State::ActiveListItemSurface> {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor) {
+		return std::nullopt;
+	}
+	auto path = std::optional<BlockPath>();
+	if (descriptor->leaf.kind == LeafKind::ListItemText) {
+		path = descriptor->leaf.block;
+	} else if (descriptor->leaf.kind == LeafKind::BlockText) {
+		const auto owner = block(descriptor->leaf.block);
+		if (!owner || owner->kind != BlockKind::Paragraph) {
+			return std::nullopt;
+		}
+		const auto &container = descriptor->leaf.block.container;
+		if (container.steps.empty()) {
+			return std::nullopt;
+		}
+		const auto &step = container.steps.back();
+		if (step.kind != BlockContainerKind::ListItemChildren) {
+			return std::nullopt;
+		}
+		auto parent = container;
+		parent.steps.pop_back();
+		path = BlockPath{
+			.container = parent,
+			.index = step.blockIndex,
+		};
+	} else {
+		return std::nullopt;
+	}
+	const auto owner = block(*path);
+	if (!owner || owner->kind != BlockKind::List) {
+		return std::nullopt;
+	}
+	const auto itemIndex = ListItemIndexForLeaf(descriptor->leaf, *path);
+	if (!itemIndex) {
+		return std::nullopt;
+	}
+	if (descriptor->leaf.kind == LeafKind::BlockText
+		&& descriptor->leaf.block.container
+			!= ListItemChildrenContainer(*path, *itemIndex)) {
+		return std::nullopt;
+	}
+	return ActiveListItemSurface{
+		.path = *path,
+		.itemIndex = *itemIndex,
+	};
+}
+
+auto State::normalizeActiveListItemSurface()
+-> std::optional<State::ActiveListItemSurface> {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	const auto surface = activeListItemSurface();
+	if (!descriptor
+		|| !surface
+		|| descriptor->leaf.kind != LeafKind::ListItemText) {
+		return surface;
+	}
+	const auto item = listItem(surface->path, surface->itemIndex);
+	if (!item) {
+		return std::nullopt;
+	}
+	auto paragraph = MakeParagraphBlock();
+	paragraph.anchorId = std::move(item->anchorId);
+	paragraph.text = std::move(item->text);
+	item->anchorId.clear();
+	item->text = RichText();
+	clearTemporaryDownParagraph();
+	item->blocks.insert(item->blocks.begin(), std::move(paragraph));
+	return surface;
+}
+
+RichText *State::seedInsertedBlocks(
+		std::vector<Block> &blocks,
+		TextWithEntities text) {
+	for (auto &block : blocks) {
+		if (auto target = seedInsertedBlock(block)) {
+			if (!text.text.isEmpty()) {
+				auto combined = std::move(text);
+				combined.append(target->text);
+				target->text = std::move(combined);
+			}
+			return target;
+		}
+	}
+	return nullptr;
+}
+
+RichText *State::seedInsertedBlock(Block &block) {
+	switch (block.kind) {
+	case BlockKind::Heading:
+	case BlockKind::Paragraph:
+	case BlockKind::Footer:
+	case BlockKind::Code:
+	case BlockKind::Table:
+	case BlockKind::Details:
+		return &block.text;
+	case BlockKind::Quote:
+		if (block.blocks.empty()) {
+			return &block.text;
+		}
+		for (auto &child : block.blocks) {
+			if (const auto result = seedInsertedBlock(child)) {
+				return result;
+			}
+		}
+		return &block.caption;
+	case BlockKind::List:
+		for (auto &item : block.listItems) {
+			if (!RichTextIsEmpty(item.text) || item.blocks.empty()) {
+				return &item.text;
+			}
+			for (auto &child : item.blocks) {
+				if (const auto result = seedInsertedBlock(child)) {
+					return result;
+				}
+			}
+		}
+		return nullptr;
+	case BlockKind::Photo:
+	case BlockKind::Video:
+	case BlockKind::Audio:
+	case BlockKind::Map:
+		return &block.caption;
+	default:
+		return nullptr;
+	}
+}
+
+bool State::appendInsertedTrailingText(
+		const BlockContainerPath &container,
+		int insertAt,
+		int count,
+		TextWithEntities text) {
+	if (text.text.isEmpty()) {
+		return true;
+	}
+	const auto blocks = blockContainer(container);
+	if (!blocks
+		|| insertAt < 0
+		|| count < 0
+		|| insertAt + count > int(blocks->size())) {
+		return false;
+	}
+	auto &last = (*blocks)[insertAt + count - 1];
+	if (last.kind == BlockKind::List) {
+		const auto taskState = last.listItems.empty()
+			? TaskState::None
+			: last.listItems.back().taskState;
+		auto item = MakeParagraphListItem(taskState);
+		Assert(!item.blocks.empty());
+		item.blocks.front().text.text = std::move(text);
+		last.listItems.push_back(std::move(item));
+		return true;
+	}
+	const auto paragraph = reuseOrInsertParagraph(container, insertAt + count);
+	if (!paragraph) {
+		return false;
+	}
+	const auto target = richText(paragraph->leaf);
+	if (!target) {
+		return false;
+	}
+	target->text = std::move(text);
+	return true;
+}
+
+std::optional<int> State::ensureTrailingParagraphActive() {
+	return applyCheckedMutation(std::optional<int>(), [](State &candidate) {
+		const auto result = candidate.ensureTrailingParagraphActiveUnchecked();
+		return CheckedMutationResult<std::optional<int>>{
+			.apply = result.has_value(),
+			.result = result,
+		};
+	});
+}
+
+std::optional<int> State::ensureTrailingParagraphActiveUnchecked() {
+	if (_richPage->blocks.empty()
+		|| _richPage->blocks.back().kind != BlockKind::Paragraph) {
+		clearTemporaryDownParagraph();
+		_richPage->blocks.push_back(MakeParagraphBlock());
+	}
+	const auto path = BlockPath{
+		.container = BlockContainerPath(),
+		.index = int(_richPage->blocks.size()) - 1,
+	};
+	rebuild();
+	const auto ordinal = textNodeOrdinal({
+			.kind = LeafKind::BlockText,
+			.block = path,
+		});
+	if (!setActiveTextByOrdinal(ordinal)) {
+		ensureActiveTextOrdinal();
+	}
+	return (_activeTextOrdinal >= 0)
+		? std::make_optional(_activeTextOrdinal)
+		: std::nullopt;
+}
+
+void State::resyncAfterExternalRichPageMutation() {
+	clearTemporaryDownParagraph();
+	const auto activeLeaf = [&]() -> std::optional<LeafPath> {
+		if (const auto descriptor = textNode(_activeTextOrdinal)) {
+			return descriptor->leaf;
+		}
+		return std::nullopt;
+	}();
+	rebuild();
+	if (activeLeaf && (textNodeOrdinal(*activeLeaf) >= 0)) {
+		const auto activated = activateRebuiltLeaf(*activeLeaf);
+		Assert(activated);
+	} else {
+		ensureActiveTextOrdinal();
+	}
+}
+
+std::optional<int> State::moveActiveSpecialBlockDown() {
+	return applyCheckedMutation(std::optional<int>(), [](State &candidate) {
+		const auto result = candidate.moveActiveSpecialBlockDownUnchecked();
+		return CheckedMutationResult<std::optional<int>>{
+			.apply = result.has_value(),
+			.result = result,
+		};
+	});
+}
+
+State::BoundaryTarget State::removeTemporaryDownParagraphAndMove() {
+	return applyCheckedMutation(BoundaryTarget(), [](State &candidate) {
+		const auto result
+			= candidate.removeTemporaryDownParagraphAndMoveUnchecked();
+		return CheckedMutationResult<BoundaryTarget>{
+			.apply = (result.action != BoundaryAction::None),
+			.result = result,
+		};
+	});
+}
+
+std::optional<int> State::moveActiveSpecialBlockDownUnchecked() {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor) {
+		return std::nullopt;
+	}
+	auto target = std::optional<LeafPath>();
+	auto trackTemporary = false;
+	if (const auto quote = activeNonPullquoteQuote()) {
+		if (descriptor->leaf.kind == LeafKind::BlockCaption
+			&& descriptor->leaf.block == quote->path) {
+			if (const auto paragraph = reuseOrInsertParagraph(
+					quote->path.container,
+					quote->path.index + 1)) {
+				target = paragraph->leaf;
+				trackTemporary = paragraph->inserted;
+			}
+		} else if (descriptor->leaf.kind == LeafKind::BlockText
+			&& descriptor->leaf.block == quote->path) {
+			const auto owner = block(quote->path);
+			if (owner
+				&& owner->kind == BlockKind::Quote
+				&& owner->blocks.empty()) {
+				target = LeafPath{
+					.kind = LeafKind::BlockCaption,
+					.block = quote->path,
+				};
+			}
+		} else if (quote->activeLeafIsLastEditableBodyLeaf) {
+			target = LeafPath{
+				.kind = LeafKind::BlockCaption,
+				.block = quote->path,
+			};
+		}
+	} else if (descriptor->leaf.kind == LeafKind::BlockText) {
+		const auto owner = block(descriptor->leaf.block);
+		if (owner && owner->kind == BlockKind::Code) {
+			if (const auto paragraph = reuseOrInsertParagraph(
+					descriptor->leaf.block.container,
+					descriptor->leaf.block.index + 1)) {
+				target = paragraph->leaf;
+				trackTemporary = paragraph->inserted;
+			}
+		}
+	}
+	if (!target) {
+		return std::nullopt;
+	}
+	_temporaryDownParagraph = trackTemporary
+		? std::make_optional(*target)
+		: std::nullopt;
+	rebuild();
+	return activateRebuiltLeaf(*target);
+}
+
+auto State::captureRebuiltBoundaryTarget(
+		const BoundaryTarget &target) const
+-> std::optional<RebuiltBoundaryTarget> {
+	switch (target.action) {
+	case BoundaryAction::Text:
+		if (const auto descriptor = textNode(target.textOrdinal)) {
+			return RebuiltBoundaryTarget{
+				.action = BoundaryAction::Text,
+				.leaf = descriptor->leaf,
+			};
+		}
+		break;
+	case BoundaryAction::StructuralSelection:
+		switch (target.structuralSelection.kind) {
+		case PreparedEditSelectionKind::Blocks:
+			if (const auto range = validateBlockRange(
+					target.structuralSelection.blocks);
+				range
+				&& (range->till == range->from + 1)) {
+				return RebuiltBoundaryTarget{
+					.action = BoundaryAction::StructuralSelection,
+					.block = {
+						.container = range->container,
+						.index = range->from,
+					},
+				};
+			}
+			break;
+		case PreparedEditSelectionKind::ListItems:
+			if (const auto range = validateListItemRange(
+					target.structuralSelection.listItems);
+				range
+				&& (range->till == range->from + 1)) {
+				return RebuiltBoundaryTarget{
+					.action = BoundaryAction::StructuralSelection,
+					.block = range->block,
+					.listItemIndex = range->from,
+				};
+			}
+			break;
+		default:
+			break;
+		}
+		break;
+	default:
+		break;
+	}
+	return std::nullopt;
+}
+
+void State::shiftRebuiltBoundaryTargetAfterRemovedBlock(
+		RebuiltBoundaryTarget &target,
+		const BlockPath &removed) const {
+	switch (target.action) {
+	case BoundaryAction::Text:
+		if (!ShiftBlockPathAfterRemovedBlock(target.leaf.block, removed)) {
+			target = RebuiltBoundaryTarget();
+		}
+		break;
+	case BoundaryAction::StructuralSelection:
+		if (!ShiftBlockPathAfterRemovedBlock(target.block, removed)) {
+			target = RebuiltBoundaryTarget();
+		}
+		break;
+	default:
+		target = RebuiltBoundaryTarget();
+		break;
+	}
+}
+
+State::BoundaryTarget State::materializeBoundaryTarget(
+		const RebuiltBoundaryTarget &target) const {
+	switch (target.action) {
+	case BoundaryAction::Text:
+		if (const auto ordinal = textNodeOrdinal(target.leaf); ordinal >= 0) {
+			return {
+				.action = BoundaryAction::Text,
+				.textOrdinal = ordinal,
+			};
+		}
+		break;
+	case BoundaryAction::StructuralSelection:
+		if (target.listItemIndex >= 0) {
+			const auto owner = block(target.block);
+			if (owner
+				&& owner->kind == BlockKind::List
+				&& target.listItemIndex < int(owner->listItems.size())
+				&& CanEditBlocks(owner->listItems[target.listItemIndex].blocks)) {
+				return {
+					.action = BoundaryAction::StructuralSelection,
+					.structuralSelection = preparedSelectionForListItem(
+						target.block,
+						target.listItemIndex),
+				};
+			}
+		} else if (const auto owner = block(target.block);
+			owner && CanEditBlock(*owner)) {
+			return {
+				.action = BoundaryAction::StructuralSelection,
+				.structuralSelection = preparedSelectionForBlock(target.block),
+			};
+		}
+		break;
+	default:
+		break;
+	}
+	return {};
+}
+
+State::BoundaryTarget State::removeTemporaryDownParagraphAndMoveUnchecked() {
+	const auto tracked = _temporaryDownParagraph;
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!tracked
+		|| !descriptor
+		|| !(descriptor->leaf == *tracked)) {
+		return {};
+	}
+	const auto owner = block(tracked->block);
+	if (!owner || owner->kind != BlockKind::Paragraph) {
+		clearTemporaryDownParagraph();
+		return {};
+	}
+	if (!BlockIsEmpty(*owner)) {
+		clearTemporaryDownParagraph();
+		return {};
+	}
+	const auto next = boundaryTargetForLeaf(
+		*tracked,
+		descriptor,
+		true,
+		false);
+	if (next.action == BoundaryAction::None) {
+		return {};
+	}
+	auto rebuiltTarget = captureRebuiltBoundaryTarget(next);
+	if (!rebuiltTarget) {
+		return {};
+	}
+	const auto removed = tracked->block;
+	if (!removeTarget({
+			.kind = RemovalKind::Block,
+			.block = removed,
+		})) {
+		return {};
+	}
+	shiftRebuiltBoundaryTargetAfterRemovedBlock(*rebuiltTarget, removed);
+	if (rebuiltTarget->action == BoundaryAction::None) {
+		return {};
+	}
+	rebuild();
+	const auto materialized = materializeBoundaryTarget(*rebuiltTarget);
+	if (materialized.action == BoundaryAction::Text) {
+		if (!setActiveTextByOrdinal(materialized.textOrdinal)) {
+			ensureActiveTextOrdinal();
+		}
+	}
+	return materialized;
+}
+
+std::optional<int> State::handleActiveHeadingEnter() {
+	return applyCheckedMutation(std::optional<int>(), [](State &candidate) {
+		const auto result = candidate.handleActiveHeadingEnterUnchecked();
+		return CheckedMutationResult<std::optional<int>>{
+			.apply = result.has_value(),
+			.result = result,
+		};
+	});
+}
+
+std::optional<int> State::handleActiveHeadingEnterUnchecked() {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor || descriptor->leaf.kind != LeafKind::BlockText) {
+		return std::nullopt;
+	}
+	const auto path = descriptor->leaf.block;
+	const auto blocks = blockContainer(path.container);
+	if (!blocks
+		|| path.index < 0
+		|| path.index >= int(blocks->size())
+		|| (*blocks)[path.index].kind != BlockKind::Heading) {
+		return std::nullopt;
+	}
+	const auto insertAt = path.index + 1;
+	if (insertAt < 0 || insertAt > int(blocks->size())) {
+		return std::nullopt;
+	}
+	clearTemporaryDownParagraph();
+	blocks->insert(blocks->begin() + insertAt, MakeParagraphBlock());
+	const auto target = LeafPath{
+		.kind = LeafKind::BlockText,
+		.block = {
+			.container = path.container,
+			.index = insertAt,
+		},
+	};
+	rebuild();
+	return activateRebuiltLeaf(target);
+}
+
+std::optional<int> State::handleActiveListEnter() {
+	return applyCheckedMutation(std::optional<int>(), [](State &candidate) {
+		const auto result = candidate.handleActiveListEnterUnchecked();
+		return CheckedMutationResult<std::optional<int>>{
+			.apply = result.has_value(),
+			.result = result,
+		};
+	});
+}
+
+std::optional<int> State::handleActiveListEnterUnchecked() {
+	const auto surface = normalizeActiveListItemSurface();
+	if (!surface) {
+		return std::nullopt;
+	}
+	const auto owner = block(surface->path);
+	const auto item = listItem(surface->path, surface->itemIndex);
+	if (!owner || owner->kind != BlockKind::List || !item) {
+		return std::nullopt;
+	}
+	auto target = std::optional<LeafPath>();
+	const auto trailingEmpty = (surface->itemIndex + 1
+			== int(owner->listItems.size()))
+		&& (item->blocks.size() == 1)
+		&& (item->blocks.front().kind == BlockKind::Paragraph)
+		&& ListItemIsEmpty(*item);
+	if (trailingEmpty) {
+		clearTemporaryDownParagraph();
+		owner->listItems.erase(owner->listItems.begin() + surface->itemIndex);
+		if (owner->listItems.empty()) {
+			const auto blocks = blockContainer(surface->path.container);
+			if (!blocks
+				|| surface->path.index < 0
+					|| surface->path.index >= int(blocks->size())) {
+				return std::nullopt;
+			}
+			clearTemporaryDownParagraph();
+			blocks->erase(blocks->begin() + surface->path.index);
+			if (const auto paragraph = reuseOrInsertParagraph(
+					surface->path.container,
+					surface->path.index)) {
+				target = paragraph->leaf;
+			}
+		} else {
+			if (const auto paragraph = reuseOrInsertParagraph(
+					surface->path.container,
+					surface->path.index + 1)) {
+				target = paragraph->leaf;
+			}
+		}
+	} else {
+		clearTemporaryDownParagraph();
+		owner->listItems.insert(
+			owner->listItems.begin() + surface->itemIndex + 1,
+			MakeParagraphListItem(item->taskState));
+		target = LeafPath{
+			.kind = LeafKind::BlockText,
+			.block = {
+				.container = ListItemChildrenContainer(
+					surface->path,
+					surface->itemIndex + 1),
+				.index = 0,
+			},
+		};
+	}
+	if (!target) {
+		return std::nullopt;
+	}
+	rebuild();
+	return activateRebuiltLeaf(*target);
+}
+
+bool State::pasteClipboardListItemsAfterActive(
+		const ClipboardListItemsData &data,
+		std::optional<ActiveTextInsertContext> context) {
+	if (data.items.empty()) {
+		return false;
+	}
+	return applyCheckedMutation(false, [
+			data,
+			context = std::move(context)](State &candidate) mutable {
+		auto block = Block();
+		block.kind = BlockKind::List;
+		block.listKind = data.listKind;
+		block.listItems = data.items;
+		auto blocks = std::vector<Block>();
+		blocks.push_back(std::move(block));
+		candidate.normalizeInsertedBlockAnchors(blocks);
+
+		const auto sameList = [&] {
+			const auto descriptor = candidate.textNode(
+				candidate._activeTextOrdinal);
+			const auto surface = candidate.activeListItemSurface();
+			auto owner = surface ? candidate.block(surface->path) : nullptr;
+			if (!descriptor
+				|| !surface
+				|| !owner
+				|| owner->kind != BlockKind::List) {
+				return false;
+			}
+			const auto taskList = std::any_of(
+				owner->listItems.begin(),
+				owner->listItems.end(),
+				[](const ListItem &item) {
+					return item.taskState != TaskState::None;
+				});
+			if (owner->listKind != data.listKind || (taskList != data.taskList)) {
+				return false;
+			}
+			auto insertContext = context
+				? *context
+				: ActiveTextInsertContext{
+					.before = candidate.activeText(),
+				};
+			const auto itemContainer = ListItemChildrenContainer(
+				surface->path,
+				surface->itemIndex);
+			auto activeBlockIndex = -1;
+			switch (descriptor->leaf.kind) {
+			case LeafKind::ListItemText:
+				break;
+			case LeafKind::BlockText:
+				if (descriptor->leaf.block.container != itemContainer) {
+					return false;
+				}
+				activeBlockIndex = descriptor->leaf.block.index;
+				break;
+			default:
+				return false;
+			}
+			if (const auto normalized
+				= candidate.normalizeTextOnlyListItemForInsertion(
+					itemContainer)) {
+				if (descriptor->leaf.kind == LeafKind::ListItemText) {
+					activeBlockIndex = *normalized;
+				} else if (*normalized >= 0) {
+					++activeBlockIndex;
+				}
+			} else if (descriptor->leaf.kind == LeafKind::ListItemText) {
+				activeBlockIndex = -1;
+			}
+			owner = candidate.block(surface->path);
+			if (!owner
+				|| owner->kind != BlockKind::List
+				|| surface->itemIndex < 0
+				|| surface->itemIndex >= int(owner->listItems.size())) {
+				return false;
+			}
+			const auto item = &owner->listItems[surface->itemIndex];
+			if (activeBlockIndex >= 0) {
+				if (activeBlockIndex >= int(item->blocks.size())
+					|| item->blocks[activeBlockIndex].kind
+						!= BlockKind::Paragraph) {
+					return false;
+				}
+			} else if (!item->blocks.empty()) {
+				return false;
+			}
+
+			enum class OriginalParagraphSide {
+				None,
+				Leading,
+				Trailing,
+			};
+
+			enum class OriginalItemSide {
+				None,
+				Leading,
+				Trailing,
+			};
+
+			const auto makeParagraph = [](TextWithEntities text) {
+				auto paragraph = State::MakeParagraphBlock();
+				paragraph.text.text = std::move(text);
+				return paragraph;
+			};
+
+			candidate.clearTemporaryDownParagraph();
+			auto current = std::move(owner->listItems[surface->itemIndex]);
+			auto insertedItems = std::move(blocks.front().listItems);
+			const auto insertedCount = int(insertedItems.size());
+			auto leading = ListItem();
+			leading.taskState = current.taskState;
+			auto trailing = ListItem();
+			trailing.taskState = current.taskState;
+			auto activeParagraph = Block();
+			if (activeBlockIndex >= 0) {
+				activeParagraph = std::move(current.blocks[activeBlockIndex]);
+			}
+			for (auto i = 0; i < std::max(activeBlockIndex, 0); ++i) {
+				leading.blocks.push_back(std::move(current.blocks[i]));
+			}
+			auto originalParagraphSide = OriginalParagraphSide::None;
+			if (activeBlockIndex >= 0 && !insertContext.before.text.isEmpty()) {
+				activeParagraph.text.text = std::move(insertContext.before);
+				leading.blocks.push_back(std::move(activeParagraph));
+				originalParagraphSide = OriginalParagraphSide::Leading;
+			}
+			if (activeBlockIndex >= 0 && !insertContext.after.text.isEmpty()) {
+				if (originalParagraphSide == OriginalParagraphSide::None) {
+					activeParagraph.text.text = std::move(insertContext.after);
+					trailing.blocks.push_back(std::move(activeParagraph));
+					originalParagraphSide = OriginalParagraphSide::Trailing;
+				} else {
+					trailing.blocks.push_back(makeParagraph(
+						std::move(insertContext.after)));
+				}
+			}
+			if (activeBlockIndex >= 0) {
+				for (auto i = activeBlockIndex + 1;
+					i < int(current.blocks.size());
+					++i) {
+					trailing.blocks.push_back(std::move(current.blocks[i]));
+				}
+			}
+			auto originalItemSide = OriginalItemSide::None;
+			switch (originalParagraphSide) {
+			case OriginalParagraphSide::Leading:
+				originalItemSide = OriginalItemSide::Leading;
+				break;
+			case OriginalParagraphSide::Trailing:
+				originalItemSide = OriginalItemSide::Trailing;
+				break;
+			case OriginalParagraphSide::None:
+				break;
+			}
+			const auto keepLeading = !State::ListItemIsEmpty(leading);
+			const auto keepTrailing = !State::ListItemIsEmpty(trailing);
+			if (originalItemSide == OriginalItemSide::None) {
+				if (keepLeading) {
+					originalItemSide = OriginalItemSide::Leading;
+				} else if (keepTrailing) {
+					originalItemSide = OriginalItemSide::Trailing;
+				}
+			}
+			if (originalItemSide == OriginalItemSide::Leading) {
+				leading.number = std::move(current.number);
+				leading.anchorId = std::move(current.anchorId);
+				leading.text = std::move(current.text);
+			} else if (originalItemSide == OriginalItemSide::Trailing) {
+				trailing.number = std::move(current.number);
+				trailing.anchorId = std::move(current.anchorId);
+				trailing.text = std::move(current.text);
+			}
+
+			auto replacement = std::vector<ListItem>();
+			replacement.reserve(
+				insertedCount
+				+ (keepLeading ? 1 : 0)
+				+ (keepTrailing ? 1 : 0));
+			if (keepLeading) {
+				replacement.push_back(std::move(leading));
+			}
+			const auto insertedFrom = surface->itemIndex + int(keepLeading);
+			replacement.insert(
+				replacement.end(),
+				std::make_move_iterator(insertedItems.begin()),
+				std::make_move_iterator(insertedItems.end()));
+			if (keepTrailing) {
+				replacement.push_back(std::move(trailing));
+			}
+			owner->listItems.erase(owner->listItems.begin() + surface->itemIndex);
+			owner->listItems.insert(
+				owner->listItems.begin() + surface->itemIndex,
+				std::make_move_iterator(replacement.begin()),
+				std::make_move_iterator(replacement.end()));
+			candidate.rebuild();
+			for (auto i = 0, count = candidate.textNodeCount(); i != count; ++i) {
+				const auto itemIndex = ListItemIndexForLeaf(
+					candidate._textNodes[i].leaf,
+					surface->path);
+				if (itemIndex
+					&& (*itemIndex >= insertedFrom)
+					&& (*itemIndex < insertedFrom + insertedCount)
+					&& candidate.setActiveTextByOrdinal(i)) {
+					return true;
+				}
+			}
+			candidate.ensureActiveTextOrdinal();
+			return true;
+		}();
+		const auto applied = sameList
+			? true
+			: candidate.insertBlocksAfterActiveUnchecked(
+				std::move(blocks),
+				std::move(context));
+		return CheckedMutationResult<bool>{
+			.apply = applied,
+			.result = applied,
+		};
+	});
+}
+
+bool State::replaceStructuralSelectionWithBlock(
+		const Markdown::PreparedEditSelection &selection,
+		InsertAction action,
+		std::optional<ActiveTextInsertContext> context) {
+	_lastLimitError = std::nullopt;
+	auto candidate = State(
+		std::make_shared<RichPage>(*_richPage),
+		_mediaRuntime,
+		_limits);
+	candidate._activeTextOrdinal = _activeTextOrdinal;
+	candidate._lastLimitError = std::nullopt;
+	candidate._temporaryDownParagraph = _temporaryDownParagraph;
+	if (!candidate.removeStructuralSelection(selection, true)) {
+		_lastLimitError = candidate._lastLimitError;
+		return false;
+	}
+	if (!candidate.insertBlockAfterActive(action, std::move(context))) {
+		_lastLimitError = candidate._lastLimitError;
+		return false;
+	}
+	commitCheckedMutation(std::move(candidate));
+	return true;
+}
+
+bool State::replaceStructuralSelectionWithPreparedBlocks(
+		const Markdown::PreparedEditSelection &selection,
+		std::vector<Block> blocks,
+		std::optional<ActiveTextInsertContext> context) {
+	_lastLimitError = std::nullopt;
+	auto candidate = State(
+		std::make_shared<RichPage>(*_richPage),
+		_mediaRuntime,
+		_limits);
+	candidate._activeTextOrdinal = _activeTextOrdinal;
+	candidate._lastLimitError = std::nullopt;
+	candidate._temporaryDownParagraph = _temporaryDownParagraph;
+	if (!candidate.removeStructuralSelection(selection, true)) {
+		_lastLimitError = candidate._lastLimitError;
+		return false;
+	}
+	if (!candidate.insertPreparedBlocksAfterActive(
+			std::move(blocks),
+			std::move(context))) {
+		_lastLimitError = candidate._lastLimitError;
+		return false;
+	}
+	commitCheckedMutation(std::move(candidate));
+	return true;
+}
+
+bool State::replaceStructuralSelectionWithClipboardListItems(
+		const Markdown::PreparedEditSelection &selection,
+		const ClipboardListItemsData &data,
+		std::optional<ActiveTextInsertContext> context) {
+	_lastLimitError = std::nullopt;
+	auto candidate = State(
+		std::make_shared<RichPage>(*_richPage),
+		_mediaRuntime,
+		_limits);
+	candidate._activeTextOrdinal = _activeTextOrdinal;
+	candidate._lastLimitError = std::nullopt;
+	candidate._temporaryDownParagraph = _temporaryDownParagraph;
+	if (!candidate.removeStructuralSelection(selection, true)) {
+		_lastLimitError = candidate._lastLimitError;
+		return false;
+	}
+	if (!candidate.pasteClipboardListItemsAfterActive(
+			data,
+			std::move(context))) {
+		_lastLimitError = candidate._lastLimitError;
+		return false;
+	}
+	commitCheckedMutation(std::move(candidate));
+	return true;
+}
+
+void State::insertHeading1AfterActive() {
+	(void)insertBlockAfterActive({
+		.type = InsertBlockType::Heading,
+		.headingLevel = 1,
+	});
+}
+
+void State::insertBlockquoteAfterActive() {
+	(void)insertBlockAfterActive({
+		.type = InsertBlockType::Blockquote,
+	});
+}
+
+bool State::insertBlocksAfterActiveWithContextUnchecked(
+		std::vector<Block> &blocks,
+		const ActiveTextInsertContext &context) {
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (!descriptor || descriptor->leaf.kind == LeafKind::TableCellText) {
+		return false;
+	}
+	const auto target = resolveActiveTextInsertTarget();
+	if (!target) {
+		return false;
+	}
+	auto container = target->anchor.container;
+	auto insertAt = target->anchor.blockIndex + 1;
+	auto removeSource = false;
+	if (target->leaf.kind == LeafKind::BlockText) {
+		if (const auto owner = block(target->leaf.block);
+			owner
+			&& context.before.text.isEmpty()
+			&& ((owner->kind == BlockKind::Paragraph)
+				|| (owner->kind == BlockKind::Heading))) {
+			removeSource = true;
+			container = target->leaf.block.container;
+			insertAt = target->leaf.block.index;
+		}
+	}
+	auto *destination = blockContainer(container);
+	if (!destination) {
+		return false;
+	}
+	if (removeSource) {
+		if (insertAt < 0 || insertAt >= int(destination->size())) {
+			return false;
+		}
+	} else {
+		const auto current = richText(target->leaf);
+		if (!current) {
+			return false;
+		}
+		current->text = context.before;
+	}
+	(void)seedInsertedBlocks(blocks, context.selected);
+	if (removeSource) {
+		destination->erase(destination->begin() + insertAt);
+	}
+	const auto count = int(blocks.size());
+	if (insertAt < 0 || insertAt > int(destination->size())) {
+		return false;
+	}
+	destination->insert(
+		destination->begin() + insertAt,
+		std::make_move_iterator(blocks.begin()),
+		std::make_move_iterator(blocks.end()));
+	if (!appendInsertedTrailingText(
+			container,
+			insertAt,
+			count,
+			context.after)) {
+		return false;
+	}
+	rebuild();
+	focusInsertedBlocks(container, insertAt, count);
+	return true;
+}
+
+bool State::insertBlockAfterActive(
+		InsertAction action,
+		std::optional<ActiveTextInsertContext> context) {
+	return applyCheckedMutation(false, [action, context = std::move(context)](
+			State &candidate) mutable {
+		auto blocks = std::vector<Block>();
+		blocks.push_back(candidate.makeBlock(action));
+		const auto applied = candidate.insertBlocksAfterActiveUnchecked(
+			std::move(blocks),
+			std::move(context));
+		return CheckedMutationResult<bool>{
+			.apply = applied,
+			.result = applied,
+		};
+	});
+}
+
+bool State::insertPreparedBlockAfterActive(Block block) {
+	auto blocks = std::vector<Block>();
+	blocks.push_back(std::move(block));
+	return insertPreparedBlocksAfterActive(std::move(blocks));
+}
+
+bool State::insertPreparedBlocksAfterActive(
+		std::vector<Block> blocks,
+		std::optional<ActiveTextInsertContext> context) {
+	return applyCheckedMutation(false, [
+			blocks = std::move(blocks),
+			context = std::move(context)](State &candidate) mutable {
+		const auto applied = candidate.insertBlocksAfterActiveUnchecked(
+			std::move(blocks),
+			std::move(context));
+		return CheckedMutationResult<bool>{
+			.apply = applied,
+			.result = applied,
+		};
+	});
+}
+
+bool State::insertBlocksAfterActiveUnchecked(
+		std::vector<Block> blocks,
+		std::optional<ActiveTextInsertContext> context) {
+	if (blocks.empty()) {
+		return false;
+	}
+	clearTemporaryDownParagraph();
+	normalizeInsertedBlockAnchors(blocks);
+	if (context) {
+		if (insertBlocksAfterActiveWithContextUnchecked(blocks, *context)) {
+			return true;
+		}
+		if (applyActiveTextUnchecked(JoinText(
+				context->before,
+				context->selected,
+				context->after)) == ApplyResult::Failed) {
+			return false;
+		}
+	}
+	const auto descriptor = textNode(_activeTextOrdinal);
+	if (descriptor && shouldReplaceActiveTextOnlyBlock(*descriptor, blocks)) {
+		const auto path = descriptor->removalTarget.block;
+		const auto container = blockContainer(path.container);
+		if (container
+			&& path.index >= 0
+			&& path.index < int(container->size())) {
+			const auto insertAt = path.index;
+			const auto count = int(blocks.size());
+			container->erase(container->begin() + insertAt);
+			container->insert(
+				container->begin() + insertAt,
+				std::make_move_iterator(blocks.begin()),
+				std::make_move_iterator(blocks.end()));
+			rebuild();
+			focusInsertedBlocks(path.container, insertAt, count);
+			return true;
+		}
+	}
+	auto anchor = resolveActiveInsertionTarget();
+	if (const auto normalized = normalizeTextOnlyListItemForInsertion(
+			anchor.container)) {
+		anchor.blockIndex = *normalized;
+	} else if (const auto normalized = normalizeTextOnlyQuoteForInsertion(
+			anchor.container)) {
+		anchor.blockIndex = *normalized;
+	}
+	auto *container = blockContainer(anchor.container);
+	if (!container) {
+		anchor = InsertionAnchor{
+			.container = BlockContainerPath(),
+			.blockIndex = int(_richPage->blocks.size()) - 1,
+		};
+		container = &_richPage->blocks;
+	}
+	const auto insertAt = std::clamp(
+		anchor.blockIndex + 1,
+		0,
+		int(container->size()));
+	const auto count = int(blocks.size());
+	container->insert(
+		container->begin() + insertAt,
+		std::make_move_iterator(blocks.begin()),
+		std::make_move_iterator(blocks.end()));
+	rebuild();
+	focusInsertedBlocks(anchor.container, insertAt, count);
+	return true;
+}
+
+std::vector<Block> *State::blockContainer(const BlockContainerPath &path) {
+	auto *blocks = &_richPage->blocks;
+	for (const auto &step : path.steps) {
+		if (step.blockIndex < 0 || step.blockIndex >= int(blocks->size())) {
+			return nullptr;
+		}
+		auto &parent = (*blocks)[step.blockIndex];
+		if (step.kind == BlockContainerKind::BlockChildren) {
+			blocks = &parent.blocks;
+		} else if (step.kind == BlockContainerKind::ListItemChildren) {
+			if (step.listItemIndex < 0
+				|| step.listItemIndex >= int(parent.listItems.size())) {
+				return nullptr;
+			}
+			blocks = &parent.listItems[step.listItemIndex].blocks;
+		} else {
+			return nullptr;
+		}
+	}
+	return blocks;
+}
+
+const std::vector<Block> *State::blockContainer(
+		const BlockContainerPath &path) const {
+	const auto *blocks = &_richPage->blocks;
+	for (const auto &step : path.steps) {
+		if (step.blockIndex < 0 || step.blockIndex >= int(blocks->size())) {
+			return nullptr;
+		}
+		const auto &parent = (*blocks)[step.blockIndex];
+		if (step.kind == BlockContainerKind::BlockChildren) {
+			blocks = &parent.blocks;
+		} else if (step.kind == BlockContainerKind::ListItemChildren) {
+			if (step.listItemIndex < 0
+				|| step.listItemIndex >= int(parent.listItems.size())) {
+				return nullptr;
+			}
+			blocks = &parent.listItems[step.listItemIndex].blocks;
+		} else {
+			return nullptr;
+		}
+	}
+	return blocks;
+}
+
+Block *State::block(const BlockPath &path) {
+	const auto blocks = blockContainer(path.container);
+	if (!blocks || path.index < 0 || path.index >= int(blocks->size())) {
+		return nullptr;
+	}
+	return &(*blocks)[path.index];
+}
+
+const Block *State::block(const BlockPath &path) const {
+	const auto blocks = blockContainer(path.container);
+	if (!blocks || path.index < 0 || path.index >= int(blocks->size())) {
+		return nullptr;
+	}
+	return &(*blocks)[path.index];
+}
+
+ListItem *State::listItem(const BlockPath &blockPath, int itemIndex) {
+	const auto list = block(blockPath);
+	if (!list
+		|| itemIndex < 0
+		|| itemIndex >= int(list->listItems.size())) {
+		return nullptr;
+	}
+	return &list->listItems[itemIndex];
+}
+
+const ListItem *State::listItem(
+		const BlockPath &blockPath,
+		int itemIndex) const {
+	const auto list = block(blockPath);
+	if (!list
+		|| itemIndex < 0
+		|| itemIndex >= int(list->listItems.size())) {
+		return nullptr;
+	}
+	return &list->listItems[itemIndex];
+}
+
+TableCell *State::tableCell(
+		const BlockPath &blockPath,
+		int rowIndex,
+		int cellIndex) {
+	const auto table = block(blockPath);
+	if (!table
+		|| rowIndex < 0
+		|| rowIndex >= int(table->tableRows.size())) {
+		return nullptr;
+	}
+	auto &row = table->tableRows[rowIndex];
+	if (cellIndex < 0 || cellIndex >= int(row.cells.size())) {
+		return nullptr;
+	}
+	return &row.cells[cellIndex];
+}
+
+const TableCell *State::tableCell(
+		const BlockPath &blockPath,
+		int rowIndex,
+		int cellIndex) const {
+	const auto table = block(blockPath);
+	if (!table
+		|| rowIndex < 0
+		|| rowIndex >= int(table->tableRows.size())) {
+		return nullptr;
+	}
+	const auto &row = table->tableRows[rowIndex];
+	if (cellIndex < 0 || cellIndex >= int(row.cells.size())) {
+		return nullptr;
+	}
+	return &row.cells[cellIndex];
+}
+
+RichText *State::richText(const LeafPath &path) {
+	switch (path.kind) {
+	case LeafKind::BlockText:
+		if (const auto owner = block(path.block)) {
+			return &owner->text;
+		}
+		return nullptr;
+	case LeafKind::BlockCaption:
+		if (const auto owner = block(path.block)) {
+			return &owner->caption;
+		}
+		return nullptr;
+	case LeafKind::ListItemText:
+		if (const auto item = listItem(path.block, path.listItemIndex)) {
+			return &item->text;
+		}
+		return nullptr;
+	case LeafKind::TableCellText:
+		if (const auto cell = tableCell(
+				path.block,
+				path.tableRowIndex,
+				path.tableCellIndex)) {
+			return &cell->text;
+		}
+		return nullptr;
+	case LeafKind::MathFormula:
+		return nullptr;
+	}
+	return nullptr;
+}
+
+const RichText *State::richText(const LeafPath &path) const {
+	switch (path.kind) {
+	case LeafKind::BlockText:
+		if (const auto owner = block(path.block)) {
+			return &owner->text;
+		}
+		return nullptr;
+	case LeafKind::BlockCaption:
+		if (const auto owner = block(path.block)) {
+			return &owner->caption;
+		}
+		return nullptr;
+	case LeafKind::ListItemText:
+		if (const auto item = listItem(path.block, path.listItemIndex)) {
+			return &item->text;
+		}
+		return nullptr;
+	case LeafKind::TableCellText:
+		if (const auto cell = tableCell(
+				path.block,
+				path.tableRowIndex,
+				path.tableCellIndex)) {
+			return &cell->text;
+		}
+		return nullptr;
+	case LeafKind::MathFormula:
+		return nullptr;
+	}
+	return nullptr;
+}
+
+QString *State::rawText(const LeafPath &path) {
+	if (path.kind != LeafKind::MathFormula) {
+		return nullptr;
+	}
+	const auto owner = block(path.block);
+	return owner ? &owner->formula : nullptr;
+}
+
+const QString *State::rawText(const LeafPath &path) const {
+	if (path.kind != LeafKind::MathFormula) {
+		return nullptr;
+	}
+	const auto owner = block(path.block);
+	return owner ? &owner->formula : nullptr;
+}
+
+const TextNodeDescriptor *State::textNode(int ordinal) const {
+	return (ordinal >= 0 && ordinal < textNodeCount())
+		? &_textNodes[ordinal]
+		: nullptr;
+}
+
+int State::textNodeOrdinal(const LeafPath &path) const {
+	for (auto i = 0, count = textNodeCount(); i != count; ++i) {
+		if (_textNodes[i].leaf == path) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+bool State::leafMutationKeepsTextNodes(
+		const TextNodeDescriptor &descriptor) const {
+	switch (descriptor.leaf.kind) {
+	case LeafKind::BlockText:
+		if (const auto owner = block(descriptor.leaf.block)) {
+			switch (owner->kind) {
+			case BlockKind::Heading:
+			case BlockKind::Paragraph:
+			case BlockKind::Footer:
+			case BlockKind::Code:
+			case BlockKind::Details:
+				return true;
+			case BlockKind::Quote:
+				return owner->blocks.empty();
+			case BlockKind::Table:
+				return !owner->text.text.text.isEmpty();
+			default:
+				return false;
+			}
+		}
+		return false;
+	case LeafKind::BlockCaption:
+	case LeafKind::TableCellText:
+	case LeafKind::MathFormula:
+		return true;
+	case LeafKind::ListItemText:
+		if (const auto item = listItem(
+				descriptor.leaf.block,
+				descriptor.leaf.listItemIndex)) {
+			return !RichTextIsEmpty(item->text) || item->blocks.empty();
+		}
+		return false;
+	}
+	return false;
+}
+
+bool State::updatePreparedActiveLeaf(
+		const TextNodeDescriptor &descriptor) {
+	const auto source = convertPreparedLeafSource(descriptor);
+	if (!source) {
+		return false;
+	}
+	return (Markdown::UpdatePreparedNativeInstantViewLeaf(
+		&_prepared,
+		*_richPage,
+		*source,
+		tableRenderLimits()) == NativeInstantViewLeafUpdateResult::Updated);
+}
+
+void State::rebuild() {
+	_lastPreparedMutationKind = PreparedMutationKind::FullRebuild;
+	rebuildTextNodes();
+	ensureEditableNodes();
+	ensureActiveTextOrdinal();
+	clearTemporaryDownParagraphIfInvalid();
+	rebuildPrepared();
+}
+
+void State::rebuildPrepared() {
+	_lastPreparedMutationKind = PreparedMutationKind::FullRebuild;
+	_prepared = Markdown::TryPrepareNativeInstantView({
+		.richPage = _richPage,
+		.mediaRuntime = _mediaRuntime,
+		.tableRenderLimits = tableRenderLimits(),
+		.editMode = true,
+	}).content;
+}
+
+void State::rebuildTextNodes() {
+	_textNodes.clear();
+	_textNodes.reserve(_richPage->blocks.size() * 3);
+	rebuildTextNodes(_richPage->blocks, BlockContainerPath());
+}
+
+void State::rebuildTextNodes(
+		const std::vector<Block> &blocks,
+		const BlockContainerPath &container) {
+	for (auto i = 0, count = int(blocks.size()); i != count; ++i) {
+		const auto path = BlockPath{
+			.container = container,
+			.index = i,
+		};
+		const auto &block = blocks[i];
+		switch (block.kind) {
+		case BlockKind::Heading:
+		case BlockKind::Paragraph:
+		case BlockKind::Footer:
+		case BlockKind::Code:
+			appendBlockTextNode(path, LeafKind::BlockText);
+			break;
+		case BlockKind::Quote:
+			if (block.blocks.empty()) {
+				appendBlockTextNode(
+					path,
+					LeafKind::BlockText,
+					FieldMode::Rich,
+					!block.pullquote
+						? std::make_optional(InsertionAnchor{
+							.container = BlockChildrenContainer(path),
+							.blockIndex = -1,
+						})
+						: std::nullopt);
+			}
+			rebuildTextNodes(block.blocks, BlockChildrenContainer(path));
+			appendBlockTextNode(path, LeafKind::BlockCaption);
+			break;
+		case BlockKind::List:
+			for (auto j = 0, itemCount = int(block.listItems.size());
+					j != itemCount;
+					++j) {
+				const auto &item = block.listItems[j];
+				if (!RichTextIsEmpty(item.text) || item.blocks.empty()) {
+					appendListItemTextNode(path, j);
+				}
+				if (!item.blocks.empty()) {
+					rebuildTextNodes(
+						item.blocks,
+						ListItemChildrenContainer(path, j));
+				}
+			}
+			break;
+		case BlockKind::Photo:
+		case BlockKind::Video:
+		case BlockKind::Audio:
+		case BlockKind::Map:
+			appendBlockTextNode(path, LeafKind::BlockCaption);
+			break;
+		case BlockKind::Math:
+			appendBlockTextNode(path, LeafKind::MathFormula, FieldMode::Raw);
+			break;
+		case BlockKind::Table:
+			appendBlockTextNode(path, LeafKind::BlockText);
+			for (auto j = 0, rowCount = int(block.tableRows.size());
+					j != rowCount;
+					++j) {
+				const auto &row = block.tableRows[j];
+				for (auto k = 0, cellCount = int(row.cells.size());
+						k != cellCount;
+						++k) {
+					appendTableCellTextNode(path, j, k);
+				}
+			}
+			break;
+		case BlockKind::Details:
+			appendBlockTextNode(
+				path,
+				LeafKind::BlockText,
+				FieldMode::Rich,
+				InsertionAnchor{
+					.container = BlockChildrenContainer(path),
+					.blockIndex = -1,
+				});
+			rebuildTextNodes(block.blocks, BlockChildrenContainer(path));
+			break;
+		default:
+			rebuildTextNodes(block.blocks, BlockChildrenContainer(path));
+			break;
+		}
+	}
+}
+
+void State::appendBlockTextNode(
+		const BlockPath &path,
+		LeafKind kind,
+		FieldMode mode,
+		std::optional<InsertionAnchor> insertionAnchor) {
+	_textNodes.push_back({
+		.leaf = {
+			.kind = kind,
+			.block = path,
+		},
+		.insertionAnchor = insertionAnchor.value_or(InsertionAnchor{
+			.container = path.container,
+			.blockIndex = path.index,
+		}),
+		.removalTarget = {
+			.kind = RemovalKind::Block,
+			.block = path,
+		},
+		.mode = mode,
+	});
+}
+
+void State::appendListItemTextNode(const BlockPath &path, int itemIndex) {
+	_textNodes.push_back({
+		.leaf = {
+			.kind = LeafKind::ListItemText,
+			.block = path,
+			.listItemIndex = itemIndex,
+		},
+		.insertionAnchor = {
+			.container = ListItemChildrenContainer(path, itemIndex),
+			.blockIndex = -1,
+		},
+		.removalTarget = {
+			.kind = RemovalKind::ListItem,
+			.block = path,
+			.listItemIndex = itemIndex,
+		},
+		.mode = FieldMode::Rich,
+	});
+}
+
+void State::appendTableCellTextNode(
+		const BlockPath &path,
+		int rowIndex,
+		int cellIndex) {
+	_textNodes.push_back({
+		.leaf = {
+			.kind = LeafKind::TableCellText,
+			.block = path,
+			.tableRowIndex = rowIndex,
+			.tableCellIndex = cellIndex,
+		},
+		.insertionAnchor = {
+			.container = path.container,
+			.blockIndex = path.index,
+		},
+		.removalTarget = {
+			.kind = RemovalKind::TableCell,
+			.block = path,
+			.tableRowIndex = rowIndex,
+			.tableCellIndex = cellIndex,
+		},
+		.mode = FieldMode::Rich,
+	});
+}
+
+void State::ensureActiveTextOrdinal() {
+	if (_textNodes.empty()) {
+		_activeTextOrdinal = -1;
+	} else if (_activeTextOrdinal < 0 || _activeTextOrdinal >= textNodeCount()) {
+		_activeTextOrdinal = 0;
+	}
+}
+
+void State::ensureEditableNodes() {
+	if (!_textNodes.empty()) {
+		return;
+	}
+	_richPage->blocks.push_back(MakeParagraphBlock());
+	rebuildTextNodes();
+}
+
+void State::focusInsertedBlocks(
+		const BlockContainerPath &container,
+		int from,
+		int count) {
+	for (auto blockIndex = from; blockIndex != from + count; ++blockIndex) {
+		const auto path = BlockPath{
+			.container = container,
+			.index = blockIndex,
+		};
+		for (auto i = 0, textCount = textNodeCount(); i != textCount; ++i) {
+			if (descriptorBelongsToBlock(_textNodes[i], path)
+				&& setActiveTextByOrdinal(i)) {
+				return;
+			}
+		}
+	}
+	ensureActiveTextOrdinal();
+}
+
+std::optional<int> State::adjacentEditableOrdinal(bool forward) const {
+	if (_activeTextOrdinal < 0) {
+		return std::nullopt;
+	}
+	const auto ordinal = _activeTextOrdinal + (forward ? 1 : -1);
+	return (ordinal >= 0 && ordinal < textNodeCount())
+		? std::make_optional(ordinal)
+		: std::nullopt;
+}
+
+void State::collectBoundarySteps(
+		const std::vector<Block> &blocks,
+		const BlockContainerPath &container,
+		bool forward,
+		std::vector<BoundaryTarget> *steps) const {
+	const auto collectBlock = [&](int index) {
+		const auto path = BlockPath{
+			.container = container,
+			.index = index,
+		};
+		const auto &block = blocks[index];
+		switch (block.kind) {
+		case BlockKind::Heading:
+		case BlockKind::Paragraph:
+		case BlockKind::Footer:
+		case BlockKind::Code:
+			appendBoundaryTextStep({
+				.kind = LeafKind::BlockText,
+				.block = path,
+			}, steps);
+			break;
+		case BlockKind::Quote:
+			if (forward) {
+				if (block.blocks.empty()) {
+					appendBoundaryTextStep({
+						.kind = LeafKind::BlockText,
+						.block = path,
+					}, steps);
+				}
+				appendBoundaryTextStep({
+					.kind = LeafKind::BlockCaption,
+					.block = path,
+				}, steps);
+				collectBoundarySteps(
+					block.blocks,
+					BlockChildrenContainer(path),
+					forward,
+					steps);
+			} else {
+				collectBoundarySteps(
+					block.blocks,
+					BlockChildrenContainer(path),
+					forward,
+					steps);
+				appendBoundaryTextStep({
+					.kind = LeafKind::BlockCaption,
+					.block = path,
+				}, steps);
+				if (block.blocks.empty()) {
+					appendBoundaryTextStep({
+						.kind = LeafKind::BlockText,
+						.block = path,
+					}, steps);
+				}
+			}
+			appendBoundaryBlockStep(path, steps);
+			break;
+		case BlockKind::List:
+			if (forward) {
+				for (auto j = 0, itemCount = int(block.listItems.size());
+						j != itemCount;
+						++j) {
+					const auto &item = block.listItems[j];
+					if (!RichTextIsEmpty(item.text) || item.blocks.empty()) {
+						appendBoundaryTextStep({
+							.kind = LeafKind::ListItemText,
+							.block = path,
+							.listItemIndex = j,
+						}, steps);
+					}
+					if (!item.blocks.empty()) {
+						collectBoundarySteps(
+							item.blocks,
+							ListItemChildrenContainer(path, j),
+							forward,
+							steps);
+						appendBoundaryListItemStep(path, j, steps);
+					}
+				}
+			} else {
+				for (auto j = int(block.listItems.size()); j != 0; --j) {
+					const auto itemIndex = j - 1;
+					const auto &item = block.listItems[itemIndex];
+					if (!item.blocks.empty()) {
+						collectBoundarySteps(
+							item.blocks,
+							ListItemChildrenContainer(path, itemIndex),
+							forward,
+							steps);
+					}
+					if (!RichTextIsEmpty(item.text) || item.blocks.empty()) {
+						appendBoundaryTextStep({
+							.kind = LeafKind::ListItemText,
+							.block = path,
+							.listItemIndex = itemIndex,
+						}, steps);
+					}
+					if (!item.blocks.empty()) {
+						appendBoundaryListItemStep(path, itemIndex, steps);
+					}
+				}
+			}
+			break;
+		case BlockKind::Photo:
+		case BlockKind::Video:
+		case BlockKind::Audio:
+		case BlockKind::Map:
+			appendBoundaryTextStep({
+				.kind = LeafKind::BlockCaption,
+				.block = path,
+			}, steps);
+			appendBoundaryBlockStep(path, steps);
+			break;
+		case BlockKind::Math:
+			appendBoundaryTextStep({
+				.kind = LeafKind::MathFormula,
+				.block = path,
+			}, steps);
+			break;
+		case BlockKind::Table:
+			if (forward) {
+				if (!block.text.text.text.isEmpty()) {
+					appendBoundaryTextStep({
+						.kind = LeafKind::BlockText,
+						.block = path,
+					}, steps);
+				}
+				for (auto j = 0, rowCount = int(block.tableRows.size());
+						j != rowCount;
+						++j) {
+					const auto &row = block.tableRows[j];
+					for (auto k = 0, cellCount = int(row.cells.size());
+							k != cellCount;
+							++k) {
+						appendBoundaryTextStep({
+							.kind = LeafKind::TableCellText,
+							.block = path,
+							.tableRowIndex = j,
+							.tableCellIndex = k,
+						}, steps);
+					}
+				}
+			} else {
+				for (auto j = int(block.tableRows.size()); j != 0; --j) {
+					const auto rowIndex = j - 1;
+					const auto &row = block.tableRows[rowIndex];
+					for (auto k = int(row.cells.size()); k != 0; --k) {
+						appendBoundaryTextStep({
+							.kind = LeafKind::TableCellText,
+							.block = path,
+							.tableRowIndex = rowIndex,
+							.tableCellIndex = k - 1,
+						}, steps);
+					}
+				}
+				if (!block.text.text.text.isEmpty()) {
+					appendBoundaryTextStep({
+						.kind = LeafKind::BlockText,
+						.block = path,
+					}, steps);
+				}
+			}
+			appendBoundaryBlockStep(path, steps);
+			break;
+		case BlockKind::Details:
+			if (forward) {
+				appendBoundaryTextStep({
+					.kind = LeafKind::BlockText,
+					.block = path,
+				}, steps);
+				collectBoundarySteps(
+					block.blocks,
+					BlockChildrenContainer(path),
+					forward,
+					steps);
+			} else {
+				collectBoundarySteps(
+					block.blocks,
+					BlockChildrenContainer(path),
+					forward,
+					steps);
+				appendBoundaryTextStep({
+					.kind = LeafKind::BlockText,
+					.block = path,
+				}, steps);
+			}
+			appendBoundaryBlockStep(path, steps);
+			break;
+		default: {
+			const auto before = steps->size();
+			if (!block.blocks.empty()) {
+				collectBoundarySteps(
+					block.blocks,
+					BlockChildrenContainer(path),
+					forward,
+					steps);
+			}
+			if (steps->size() == before) {
+				appendBoundaryBlockStep(path, steps);
+			}
+		} break;
+		}
+	};
+	if (forward) {
+		for (auto i = 0, count = int(blocks.size()); i != count; ++i) {
+			collectBlock(i);
+		}
+	} else {
+		for (auto i = int(blocks.size()); i != 0; --i) {
+			collectBlock(i - 1);
+		}
+	}
+}
+
+void State::appendBoundaryTextStep(
+		LeafPath leaf,
+		std::vector<BoundaryTarget> *steps) const {
+	const auto ordinal = textNodeOrdinal(leaf);
+	if (ordinal >= 0) {
+		steps->push_back({
+			.action = BoundaryAction::Text,
+			.textOrdinal = ordinal,
+		});
+	}
+}
+
+void State::appendBoundaryBlockStep(
+		const BlockPath &path,
+		std::vector<BoundaryTarget> *steps) const {
+	const auto owner = block(path);
+	if (owner && CanEditBlock(*owner)) {
+		steps->push_back({
+			.action = BoundaryAction::StructuralSelection,
+			.structuralSelection = preparedSelectionForBlock(path),
+		});
+	}
+}
+
+void State::appendBoundaryListItemStep(
+		const BlockPath &path,
+		int itemIndex,
+		std::vector<BoundaryTarget> *steps) const {
+	const auto owner = block(path);
+	if (!owner
+		|| owner->kind != BlockKind::List
+		|| itemIndex < 0
+		|| itemIndex >= int(owner->listItems.size())
+		|| !CanEditBlocks(owner->listItems[itemIndex].blocks)) {
+		return;
+	}
+	steps->push_back({
+		.action = BoundaryAction::StructuralSelection,
+		.structuralSelection = preparedSelectionForListItem(path, itemIndex),
+	});
+}
+
+PreparedEditSelection State::preparedSelectionForBlock(
+		const BlockPath &path) const {
+	return {
+		.kind = PreparedEditSelectionKind::Blocks,
+		.blocks = {
+			.container = ToPreparedBlockContainerPath(path.container),
+			.from = path.index,
+			.till = path.index + 1,
+		},
+	};
+}
+
+PreparedEditSelection State::preparedSelectionForListItem(
+		const BlockPath &path,
+		int itemIndex) const {
+	return {
+		.kind = PreparedEditSelectionKind::ListItems,
+		.listItems = {
+			.block = PreparedBlockPath{
+				.container = ToPreparedBlockContainerPath(path.container),
+				.index = path.index,
+			},
+			.from = itemIndex,
+			.till = itemIndex + 1,
+		},
+	};
+}
+
+bool State::descriptorBelongsToBlock(
+		const TextNodeDescriptor &descriptor,
+		const BlockPath &path) const {
+	return leafBelongsToBlock(descriptor.leaf, path);
+}
+
+bool State::removalTargetIsEmpty(const RemovalTarget &target) const {
+	switch (target.kind) {
+	case RemovalKind::Block:
+		if (const auto owner = block(target.block)) {
+			return BlockIsEmpty(*owner);
+		}
+		return false;
+	case RemovalKind::ListItem:
+		if (const auto item = listItem(target.block, target.listItemIndex)) {
+			return ListItemIsEmpty(*item);
+		}
+		return false;
+	case RemovalKind::TableCell:
+		if (const auto cell = tableCell(
+				target.block,
+				target.tableRowIndex,
+				target.tableCellIndex)) {
+			return RichTextIsEmpty(cell->text);
+		}
+		return false;
+	}
+	return false;
+}
+
+bool State::removeTarget(const RemovalTarget &target) {
+	clearTemporaryDownParagraph();
+	switch (target.kind) {
+	case RemovalKind::Block: {
+		const auto blocks = blockContainer(target.block.container);
+		if (!blocks
+			|| target.block.index < 0
+			|| target.block.index >= int(blocks->size())) {
+			return false;
+		}
+		blocks->erase(blocks->begin() + target.block.index);
+		return true;
+	}
+	case RemovalKind::ListItem: {
+		const auto owner = block(target.block);
+		if (!owner
+			|| target.listItemIndex < 0
+			|| target.listItemIndex >= int(owner->listItems.size())) {
+			return false;
+		}
+		owner->listItems.erase(owner->listItems.begin() + target.listItemIndex);
+		return true;
+	}
+	case RemovalKind::TableCell: {
+		const auto cell = tableCell(
+			target.block,
+			target.tableRowIndex,
+			target.tableCellIndex);
+		if (!cell) {
+			return false;
+		}
+		cell->text = RichText();
+		return true;
+	}
+	}
+	return false;
+}
+
+void State::normalizeInsertedBlockAnchors(std::vector<Block> &blocks) {
+	for (auto &block : blocks) {
+		normalizeInsertedBlockAnchors(blocks, block);
+	}
+}
+
+void State::normalizeInsertedBlockAnchors(
+		std::vector<Block> &root,
+		Block &block) {
+	const auto normalize = [&](QString &id) {
+		if (id.isEmpty()) {
+			return;
+		}
+		const auto base = id;
+		id.clear();
+		auto candidate = base;
+		for (auto suffix = 2;
+			anchorIdExists(candidate) || anchorIdExists(root, candidate);
+			++suffix) {
+			candidate = base + u"-%1"_q.arg(suffix);
+		}
+		id = std::move(candidate);
+	};
+	normalize(block.anchorId);
+	normalizeInsertedRichTextAnchors(root, block.text);
+	normalizeInsertedRichTextAnchors(root, block.caption);
+	for (auto &child : block.blocks) {
+		normalizeInsertedBlockAnchors(root, child);
+	}
+	for (auto &item : block.listItems) {
+		normalize(item.anchorId);
+		normalizeInsertedRichTextAnchors(root, item.text);
+		for (auto &child : item.blocks) {
+			normalizeInsertedBlockAnchors(root, child);
+		}
+	}
+	for (auto &row : block.tableRows) {
+		for (auto &cell : row.cells) {
+			normalizeInsertedRichTextAnchors(root, cell.text);
+		}
+	}
+}
+
+void State::normalizeInsertedRichTextAnchors(
+		std::vector<Block> &root,
+		RichText &text) {
+	const auto normalize = [&](QString &id) {
+		if (id.isEmpty()) {
+			return;
+		}
+		const auto base = id;
+		id.clear();
+		auto candidate = base;
+		for (auto suffix = 2;
+			anchorIdExists(candidate) || anchorIdExists(root, candidate);
+			++suffix) {
+			candidate = base + u"-%1"_q.arg(suffix);
+		}
+		id = std::move(candidate);
+	};
+	normalize(text.anchorId);
+	for (auto &id : text.anchorIds) {
+		normalize(id);
+	}
+}
+
+bool State::anchorIdExists(const QString &id) const {
+	return anchorIdExists(_richPage->blocks, id);
+}
+
+bool State::anchorIdExists(
+		const std::vector<Block> &blocks,
+		const QString &id) const {
+	for (const auto &block : blocks) {
+		if (block.anchorId == id
+			|| block.text.anchorId == id
+			|| block.caption.anchorId == id
+			|| ranges::contains(block.text.anchorIds, id)
+			|| ranges::contains(block.caption.anchorIds, id)) {
+			return true;
+		}
+		if (anchorIdExists(block.blocks, id)) {
+			return true;
+		}
+		for (const auto &item : block.listItems) {
+			if (item.anchorId == id
+				|| item.text.anchorId == id
+				|| ranges::contains(item.text.anchorIds, id)) {
+				return true;
+			}
+			if (anchorIdExists(item.blocks, id)) {
+				return true;
+			}
+		}
+		for (const auto &row : block.tableRows) {
+			for (const auto &cell : row.cells) {
+				if (cell.text.anchorId == id
+					|| ranges::contains(cell.text.anchorIds, id)) {
+					return true;
+				}
+			}
+		}
+	}
+	return false;
+}
+
+QString State::nextAnchorId() const {
+	for (auto i = 1;; ++i) {
+		auto result = u"anchor-%1"_q.arg(i);
+		if (!anchorIdExists(result)) {
+			return result;
+		}
+	}
+}
+
+Block State::makeBlock(InsertAction action) const {
+	switch (action.type) {
+	case InsertBlockType::Heading:
+		return MakeHeadingBlock(action.headingLevel);
+	case InsertBlockType::Blockquote:
+		return MakeQuoteBlock(false);
+	case InsertBlockType::Code:
+		return MakeCodeBlock();
+	case InsertBlockType::Math:
+		return MakeMathBlock();
+	case InsertBlockType::Footer:
+		return MakeFooterBlock();
+	case InsertBlockType::Divider:
+		return MakeDividerBlock();
+	case InsertBlockType::Anchor:
+		return MakeAnchorBlock(nextAnchorId());
+	case InsertBlockType::OrderedList:
+		return MakeListBlock(ListKind::Ordered);
+	case InsertBlockType::BulletList:
+		return MakeListBlock(ListKind::Bullet);
+	case InsertBlockType::TaskList:
+		return MakeListBlock(ListKind::Bullet, TaskState::Unchecked);
+	case InsertBlockType::Pullquote:
+		return MakeQuoteBlock(true);
+	case InsertBlockType::Photo:
+		return MakeMediaBlock(BlockKind::Photo);
+	case InsertBlockType::Video:
+		return MakeMediaBlock(BlockKind::Video);
+	case InsertBlockType::Audio:
+		return MakeMediaBlock(BlockKind::Audio);
+	case InsertBlockType::Details:
+		return MakeDetailsBlock();
+	case InsertBlockType::Table:
+		return MakeTableBlock();
+	case InsertBlockType::Map:
+		return MakeMapBlock(action.latitude, action.longitude);
+	}
+	return MakeParagraphBlock();
+}
+
+TextWithEntities State::MakeText(QString text) {
+	auto result = TextWithEntities();
+	result.text = std::move(text);
+	return result;
+}
+
+Block State::MakeParagraphBlock() {
+	auto block = Block();
+	block.kind = BlockKind::Paragraph;
+	return block;
+}
+
+Block State::MakeFooterBlock() {
+	auto block = Block();
+	block.kind = BlockKind::Footer;
+	return block;
+}
+
+Block State::MakeHeadingBlock(int level) {
+	auto block = Block();
+	block.kind = BlockKind::Heading;
+	block.headingLevel = std::clamp(level, 1, 6);
+	return block;
+}
+
+Block State::MakeQuoteBlock(bool pullquote) {
+	auto block = Block();
+	block.kind = BlockKind::Quote;
+	block.pullquote = pullquote;
+	return block;
+}
+
+Block State::MakeCodeBlock() {
+	auto block = Block();
+	block.kind = BlockKind::Code;
+	return block;
+}
+
+Block State::MakeMathBlock() {
+	auto block = Block();
+	block.kind = BlockKind::Math;
+	return block;
+}
+
+Block State::MakeDividerBlock() {
+	auto block = Block();
+	block.kind = BlockKind::Divider;
+	return block;
+}
+
+Block State::MakeAnchorBlock(QString anchorId) {
+	auto block = Block();
+	block.kind = BlockKind::Anchor;
+	block.anchorId = std::move(anchorId);
+	return block;
+}
+
+Block State::MakeListBlock(ListKind kind, TaskState taskState) {
+	auto block = Block();
+	block.kind = BlockKind::List;
+	block.listKind = kind;
+	block.listItems.reserve(3);
+	for (auto i = 0; i != 3; ++i) {
+		auto item = ListItem();
+		item.taskState = taskState;
+		block.listItems.push_back(std::move(item));
+	}
+	return block;
+}
+
+ListItem State::MakeParagraphListItem(TaskState taskState) {
+	auto item = ListItem();
+	item.taskState = taskState;
+	item.blocks.push_back(MakeParagraphBlock());
+	return item;
+}
+
+Block State::MakeDetailsBlock() {
+	auto block = Block();
+	block.kind = BlockKind::Details;
+	block.blocks.push_back(MakeParagraphBlock());
+	return block;
+}
+
+Block State::MakeTableBlock() {
+	auto block = Block();
+	block.kind = BlockKind::Table;
+	block.bordered = true;
+	block.tableRows.reserve(3);
+	for (auto rowIndex = 0; rowIndex != 3; ++rowIndex) {
+		auto row = RichPage::TableRow();
+		row.cells.reserve(3);
+		for (auto cellIndex = 0; cellIndex != 3; ++cellIndex) {
+			auto cell = TableCell();
+			cell.header = (rowIndex == 0);
+			row.cells.push_back(std::move(cell));
+		}
+		block.tableRows.push_back(std::move(row));
+	}
+	return block;
+}
+
+Block State::MakeMediaBlock(BlockKind kind) {
+	auto block = Block();
+	block.kind = kind;
+	return block;
+}
+
+Block State::MakeMapBlock(double latitude, double longitude) {
+	auto block = Block();
+	block.kind = BlockKind::Map;
+	block.latitude = latitude;
+	block.longitude = longitude;
+	return block;
+}
+
+bool State::RichTextIsEmpty(const RichText &text) {
+	return StringIsEmpty(text.text.text)
+		&& text.anchorId.isEmpty()
+		&& text.anchorIds.empty();
+}
+
+bool State::ListItemIsEmpty(const ListItem &item) {
+	if (!RichTextIsEmpty(item.text) || !item.anchorId.isEmpty()) {
+		return false;
+	}
+	for (const auto &block : item.blocks) {
+		if (!BlockIsEmpty(block)) {
+			return false;
+		}
+	}
+	return true;
+}
+
+bool State::BlockIsEmpty(const Block &block) {
+	if (!RichTextIsEmpty(block.text)
+		|| !RichTextIsEmpty(block.caption)
+		|| !StringIsEmpty(block.formula)
+		|| !block.language.isEmpty()
+		|| !block.anchorId.isEmpty()
+		|| !block.url.isEmpty()
+		|| !block.html.isEmpty()
+		|| !block.author.isEmpty()
+		|| !block.username.isEmpty()
+		|| !block.channelTitle.isEmpty()
+		|| !block.audioTitle.isEmpty()
+		|| !block.audioPerformer.isEmpty()
+		|| !block.audioFileName.isEmpty()
+		|| block.photo
+		|| block.document
+		|| block.peer
+		|| block.photoId
+		|| block.documentId
+		|| block.channelId
+		|| block.accessHash
+		|| block.latitude != 0.
+		|| block.longitude != 0.
+		|| !block.mediaItems.empty()) {
+		return false;
+	}
+	for (const auto &child : block.blocks) {
+		if (!BlockIsEmpty(child)) {
+			return false;
+		}
+	}
+	for (const auto &item : block.listItems) {
+		if (!ListItemIsEmpty(item)) {
+			return false;
+		}
+	}
+	for (const auto &row : block.tableRows) {
+		for (const auto &cell : row.cells) {
+			if (!RichTextIsEmpty(cell.text)) {
+				return false;
+			}
+		}
+	}
+	return true;
+}
+
+bool State::StripWrapperEntityInEditMode(EntityType type) {
+	switch (type) {
+	case EntityType::Url:
+	case EntityType::Email:
+	case EntityType::Hashtag:
+	case EntityType::Cashtag:
+	case EntityType::Mention:
+	case EntityType::BotCommand:
+	case EntityType::Phone:
+	case EntityType::BankCard:
+		return true;
+	default:
+		return false;
+	}
+}
+
+TextWithEntities State::StripEditModeWrapperEntities(TextWithEntities text) {
+	auto filtered = EntitiesInText();
+	filtered.reserve(text.entities.size());
+	for (const auto &entity : text.entities) {
+		if (!StripWrapperEntityInEditMode(entity.type())) {
+			filtered.push_back(entity);
+		}
+	}
+	text.entities = std::move(filtered);
+	return text;
+}
+
+bool CanEditRichPage(const RichPage &page) {
+	return CanEditBlocks(page.blocks);
+}
+
+bool CanEditRichPage(const std::shared_ptr<const RichPage> &page) {
+	return page && CanEditRichPage(*page);
+}
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_state.h b/Telegram/SourceFiles/iv/editor/iv_editor_state.h
new file mode 100644
index 00000000000000..f219a6ed632b39
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_state.h
@@ -0,0 +1,681 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/editor/iv_editor_clipboard.h"
+#include "iv/iv_rich_page.h"
+#include "iv/markdown/iv_markdown_prepare.h"
+
+#include <memory>
+#include <optional>
+#include <vector>
+
+namespace Iv::Editor {
+
+class State final {
+public:
+	enum class FieldMode : uchar {
+		Rich,
+		Raw,
+	};
+
+	enum class ApplyResult {
+		Failed,
+		Unchanged,
+		Changed,
+	};
+
+	enum class PreparedMutationKind {
+		None,
+		LeafOnly,
+		FullRebuild,
+	};
+
+	enum class InsertBlockType : uchar {
+		Heading,
+		Blockquote,
+		Code,
+		Math,
+		Footer,
+		Divider,
+		Anchor,
+		OrderedList,
+		BulletList,
+		TaskList,
+		Pullquote,
+		Photo,
+		Video,
+		Audio,
+		Details,
+		Table,
+		Map,
+	};
+
+	struct InsertAction {
+		InsertBlockType type;
+		int headingLevel = 1;
+		double latitude = 0.;
+		double longitude = 0.;
+	};
+
+	enum class BlockContainerKind : uchar {
+		Root,
+		BlockChildren,
+		ListItemChildren,
+	};
+
+	struct BlockContainerStep {
+		BlockContainerKind kind = BlockContainerKind::BlockChildren;
+		int blockIndex = -1;
+		int listItemIndex = -1;
+
+		friend inline bool operator==(
+				const BlockContainerStep &a,
+				const BlockContainerStep &b) {
+			return (a.kind == b.kind)
+				&& (a.blockIndex == b.blockIndex)
+				&& (a.listItemIndex == b.listItemIndex);
+		}
+	};
+
+	struct BlockContainerPath {
+		std::vector<BlockContainerStep> steps;
+
+		friend inline bool operator==(
+				const BlockContainerPath &a,
+				const BlockContainerPath &b) {
+			return (a.steps == b.steps);
+		}
+	};
+
+	struct BlockPath {
+		BlockContainerPath container;
+		int index = -1;
+
+		friend inline bool operator==(
+				const BlockPath &a,
+				const BlockPath &b) {
+			return (a.container == b.container)
+				&& (a.index == b.index);
+		}
+	};
+
+	enum class LeafKind : uchar {
+		BlockText,
+		BlockCaption,
+		ListItemText,
+		TableCellText,
+		MathFormula,
+	};
+
+	struct LeafPath {
+		LeafKind kind = LeafKind::BlockText;
+		BlockPath block;
+		int listItemIndex = -1;
+		int tableRowIndex = -1;
+		int tableCellIndex = -1;
+
+		friend inline bool operator==(
+				const LeafPath &a,
+				const LeafPath &b) {
+			return (a.kind == b.kind)
+				&& (a.block == b.block)
+				&& (a.listItemIndex == b.listItemIndex)
+				&& (a.tableRowIndex == b.tableRowIndex)
+				&& (a.tableCellIndex == b.tableCellIndex);
+		}
+	};
+
+	struct Snapshot {
+		RichPage richPage;
+		std::optional<LeafPath> activeLeaf;
+		std::optional<LeafPath> temporaryDownParagraph;
+	};
+
+	struct InsertionAnchor {
+		BlockContainerPath container;
+		int blockIndex = -1;
+	};
+
+	enum class RemovalKind : uchar {
+		Block,
+		ListItem,
+		TableCell,
+	};
+
+	struct RemovalTarget {
+		RemovalKind kind = RemovalKind::Block;
+		BlockPath block;
+		int listItemIndex = -1;
+		int tableRowIndex = -1;
+		int tableCellIndex = -1;
+
+		friend inline bool operator==(
+				const RemovalTarget &a,
+				const RemovalTarget &b) {
+			return (a.kind == b.kind)
+				&& (a.block == b.block)
+				&& (a.listItemIndex == b.listItemIndex)
+				&& (a.tableRowIndex == b.tableRowIndex)
+				&& (a.tableCellIndex == b.tableCellIndex);
+		}
+	};
+
+	struct TextNodeDescriptor {
+		LeafPath leaf;
+		InsertionAnchor insertionAnchor;
+		RemovalTarget removalTarget;
+		FieldMode mode = FieldMode::Rich;
+	};
+
+	struct BoundaryTarget {
+		enum class Action : uchar {
+			None,
+			Text,
+			StructuralSelection,
+			RemoveActiveOwner,
+		};
+
+		Action action = Action::None;
+		int textOrdinal = -1;
+		Markdown::PreparedEditSelection structuralSelection;
+	};
+
+	struct TableSelectionInfo {
+		bool valid = false;
+		bool allHeader = false;
+		bool allAlignCenter = false;
+		bool allAlignRight = false;
+		bool allAlignMiddle = false;
+		bool allAlignBottom = false;
+		bool singleCell = false;
+		bool canSplitCell = false;
+		bool canUniteCells = false;
+		bool canDeleteRows = false;
+		bool canDeleteColumns = false;
+		bool canDeleteTable = false;
+		int selectedRows = 0;
+		int selectedColumns = 0;
+		bool bordered = false;
+		bool striped = false;
+	};
+
+	State();
+	State(
+		std::shared_ptr<RichPage> richPage,
+		std::shared_ptr<Markdown::MediaRuntime> mediaRuntime,
+		RichMessageLimits limits = {});
+
+	[[nodiscard]] const RichPage &richPage() const;
+	[[nodiscard]] const Markdown::MarkdownArticleContent &prepared() const;
+	[[nodiscard]] const std::vector<TextNodeDescriptor> &textNodes() const;
+	[[nodiscard]] Snapshot snapshot() const;
+	void restoreSnapshot(Snapshot snapshot);
+	[[nodiscard]] std::optional<LeafPath> activeLeafPath() const;
+	[[nodiscard]] int textOrdinalForLeafPath(const LeafPath &path) const;
+	[[nodiscard]] int textOrdinalForLeaf(
+		const Markdown::PreparedEditLeafSource &source) const;
+	[[nodiscard]] PreparedMutationKind lastPreparedMutationKind() const;
+	[[nodiscard]] auto activePreparedLeafSource() const
+	-> std::optional<Markdown::PreparedEditLeafSource>;
+	[[nodiscard]] int textNodeCount() const;
+	[[nodiscard]] int activeTextOrdinal() const;
+	[[nodiscard]] bool setActiveTextByOrdinal(int ordinal);
+	[[nodiscard]] TextWithEntities activeText() const;
+	[[nodiscard]] ApplyResult applyActiveText(TextWithEntities text);
+	[[nodiscard]] FieldMode activeFieldMode() const;
+	[[nodiscard]] QString activeRawText() const;
+	[[nodiscard]] QString activePlaceholderText() const;
+	[[nodiscard]] ApplyResult applyActiveRawText(QString text);
+	[[nodiscard]] std::optional<RichMessageLimitError> lastLimitError() const;
+	[[nodiscard]] std::optional<QString> codeBlockLanguage(int ordinal) const;
+	[[nodiscard]] bool setCodeBlockLanguage(int ordinal, QString language);
+	[[nodiscard]] int activeTextLength() const;
+	[[nodiscard]] std::optional<int> previousEditableOrdinal() const;
+	[[nodiscard]] std::optional<int> nextEditableOrdinal() const;
+	[[nodiscard]] BoundaryTarget activeBoundaryTarget(bool forward) const;
+	[[nodiscard]] bool isActiveTopLevelParagraph() const;
+	[[nodiscard]] bool activeLeafUsesQuoteCaptionColor() const;
+	[[nodiscard]] bool activeLeafUsesQuotePlaceholderColor() const;
+	[[nodiscard]] std::optional<int> moveActiveSpecialBlockDown();
+	[[nodiscard]] BoundaryTarget removeTemporaryDownParagraphAndMove();
+	[[nodiscard]] std::optional<int> handleActiveHeadingEnter();
+	[[nodiscard]] std::optional<int> handleActiveListEnter();
+	[[nodiscard]] std::optional<int> removeActiveOwnerAndSelectAdjacent(
+		bool forward);
+	[[nodiscard]] std::optional<int> removeStructuralSelection(
+		const Markdown::PreparedEditSelection &selection,
+		bool forward);
+	[[nodiscard]] bool toggleTaskState(
+		const Markdown::PreparedEditListItemSource &source);
+	[[nodiscard]] bool toggleDetailsOpen(
+		const Markdown::PreparedEditBlockSource &source);
+	[[nodiscard]] TableSelectionInfo tableSelectionInfo(
+		const Markdown::PreparedEditTableCellRange &range) const;
+	[[nodiscard]] std::optional<Markdown::PreparedEditTableCellRange>
+	tableContextRangeForSelection(
+		const Markdown::PreparedEditSelection &selection,
+		const Markdown::PreparedEditTableCellSource &source) const;
+	[[nodiscard]] bool canRemoveStructuralSelection(
+		const Markdown::PreparedEditSelection &selection) const;
+	[[nodiscard]] auto structuredClipboardDataForSelection(
+		const Markdown::PreparedEditSelection &selection) const
+	-> std::optional<ClipboardData>;
+	[[nodiscard]] bool addTableRow(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool after);
+	[[nodiscard]] bool addTableColumn(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool after);
+	[[nodiscard]] bool setTableHeader(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool header);
+	[[nodiscard]] bool setTableAlignment(
+		const Markdown::PreparedEditTableCellRange &range,
+		RichPage::TableAlignment alignment);
+	[[nodiscard]] bool setTableVerticalAlignment(
+		const Markdown::PreparedEditTableCellRange &range,
+		RichPage::TableVerticalAlignment alignment);
+	[[nodiscard]] bool splitTableCell(
+		const Markdown::PreparedEditTableCellRange &range);
+	[[nodiscard]] bool uniteTableCells(
+		const Markdown::PreparedEditTableCellRange &range);
+	[[nodiscard]] bool removeTableRows(
+		const Markdown::PreparedEditTableCellRange &range);
+	[[nodiscard]] bool removeTableColumns(
+		const Markdown::PreparedEditTableCellRange &range);
+	[[nodiscard]] bool removeTable(
+		const Markdown::PreparedEditTableCellRange &range);
+	[[nodiscard]] bool setTableBordered(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool bordered);
+	[[nodiscard]] bool setTableStriped(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool striped);
+	[[nodiscard]] std::optional<int> ensureTrailingParagraphActive();
+	void resyncAfterExternalRichPageMutation();
+	void insertHeading1AfterActive();
+	void insertBlockquoteAfterActive();
+	struct ActiveTextInsertContext {
+		TextWithEntities before;
+		TextWithEntities selected;
+		TextWithEntities after;
+	};
+	[[nodiscard]] bool insertBlockAfterActive(
+		InsertAction action,
+		std::optional<ActiveTextInsertContext> context = std::nullopt);
+	[[nodiscard]] bool insertPreparedBlockAfterActive(RichPage::Block block);
+	[[nodiscard]] bool insertPreparedBlocksAfterActive(
+		std::vector<RichPage::Block> blocks,
+		std::optional<ActiveTextInsertContext> context = std::nullopt);
+	[[nodiscard]] bool pasteClipboardListItemsAfterActive(
+		const ClipboardListItemsData &data,
+		std::optional<ActiveTextInsertContext> context = std::nullopt);
+	[[nodiscard]] bool replaceStructuralSelectionWithBlock(
+		const Markdown::PreparedEditSelection &selection,
+		InsertAction action,
+		std::optional<ActiveTextInsertContext> context = std::nullopt);
+	[[nodiscard]] bool replaceStructuralSelectionWithPreparedBlocks(
+		const Markdown::PreparedEditSelection &selection,
+		std::vector<RichPage::Block> blocks,
+		std::optional<ActiveTextInsertContext> context = std::nullopt);
+	[[nodiscard]] bool replaceStructuralSelectionWithClipboardListItems(
+		const Markdown::PreparedEditSelection &selection,
+		const ClipboardListItemsData &data,
+		std::optional<ActiveTextInsertContext> context = std::nullopt);
+
+private:
+	struct StructuralBlockRange {
+		BlockContainerPath container;
+		int from = -1;
+		int till = -1;
+	};
+
+	struct StructuralListItemRange {
+		BlockPath block;
+		int from = -1;
+		int till = -1;
+	};
+
+	struct StructuralTableRowRange {
+		BlockPath block;
+		int from = -1;
+		int till = -1;
+	};
+
+	struct StructuralTableCellRange {
+		BlockPath block;
+		int rowFrom = -1;
+		int rowTill = -1;
+		int columnFrom = -1;
+		int columnTill = -1;
+	};
+
+	struct ActiveNonPullquoteQuote {
+		BlockPath path;
+		bool activeLeafIsLastEditableBodyLeaf = false;
+	};
+
+	struct ActiveListItemSurface {
+		BlockPath path;
+		int itemIndex = -1;
+	};
+
+	struct ParagraphTarget {
+		LeafPath leaf;
+		bool inserted = false;
+	};
+
+	struct ActiveTextInsertTarget {
+		LeafPath leaf;
+		InsertionAnchor anchor;
+	};
+
+	struct RebuiltBoundaryTarget {
+		BoundaryTarget::Action action = BoundaryTarget::Action::None;
+		LeafPath leaf;
+		BlockPath block;
+		int listItemIndex = -1;
+	};
+
+	template <typename Result>
+	struct CheckedMutationResult {
+		bool apply = false;
+		Result result;
+	};
+
+	[[nodiscard]] std::optional<BlockContainerPath> convertBlockContainerPath(
+		const Markdown::PreparedEditBlockContainerPath &path) const;
+	[[nodiscard]] std::optional<BlockPath> convertBlockPath(
+		const Markdown::PreparedEditBlockPath &path) const;
+	[[nodiscard]] std::optional<BlockPath> convertBlockPath(
+		const Markdown::PreparedEditBlockSource &source) const;
+	[[nodiscard]] std::optional<LeafPath> convertLeafPath(
+		const Markdown::PreparedEditLeafSource &source) const;
+	[[nodiscard]] std::optional<StructuralBlockRange> validateBlockRange(
+		const Markdown::PreparedEditBlockRange &range) const;
+	[[nodiscard]] std::optional<StructuralListItemRange> validateListItemRange(
+		const Markdown::PreparedEditListItemRange &range) const;
+	[[nodiscard]] std::optional<StructuralTableRowRange> validateTableRowRange(
+		const Markdown::PreparedEditTableRowRange &range) const;
+	[[nodiscard]] auto validateTableCellRange(
+		const Markdown::PreparedEditTableCellRange &range) const
+	-> std::optional<StructuralTableCellRange>;
+	[[nodiscard]] bool leafWillBeRemoved(
+		const LeafPath &path,
+		const StructuralBlockRange &range) const;
+	[[nodiscard]] bool leafWillBeRemoved(
+		const LeafPath &path,
+		const StructuralListItemRange &range) const;
+	[[nodiscard]] bool leafWillBeRemoved(
+		const LeafPath &path,
+		const StructuralTableRowRange &range) const;
+	[[nodiscard]] bool leafWillBeRemoved(
+		const LeafPath &path,
+		const StructuralTableCellRange &range) const;
+	[[nodiscard]] bool leafBelongsToBlock(
+		const LeafPath &leaf,
+		const BlockPath &path) const;
+	[[nodiscard]] std::optional<LeafPath> firstSelectedLeaf(
+		const StructuralTableCellRange &range) const;
+	[[nodiscard]] std::optional<LeafPath> adjacentLeafOutsideRange(
+		const StructuralBlockRange &range,
+		bool forward) const;
+	[[nodiscard]] std::optional<LeafPath> adjacentLeafOutsideRange(
+		const StructuralListItemRange &range,
+		bool forward) const;
+	[[nodiscard]] std::optional<LeafPath> adjacentLeafOutsideRange(
+		const StructuralTableRowRange &range,
+		bool forward) const;
+	[[nodiscard]] std::optional<LeafPath> adjacentLeafOutsideRange(
+		const StructuralTableCellRange &range,
+		bool forward) const;
+	[[nodiscard]] std::optional<LeafPath> fallbackFocusLeaf() const;
+	[[nodiscard]] std::optional<LeafPath> plannedFocusForRange(
+		const StructuralBlockRange &range,
+		bool forward) const;
+	[[nodiscard]] std::optional<LeafPath> plannedFocusForRange(
+		const StructuralListItemRange &range,
+		bool forward) const;
+	[[nodiscard]] std::optional<LeafPath> plannedFocusForRange(
+		const StructuralTableRowRange &range,
+		bool forward) const;
+	[[nodiscard]] std::optional<LeafPath> plannedFocusForRange(
+		const StructuralTableCellRange &range,
+		bool forward) const;
+	[[nodiscard]] std::vector<RichPage::Block> *blockContainer(
+		const BlockContainerPath &path);
+	[[nodiscard]] const std::vector<RichPage::Block> *blockContainer(
+		const BlockContainerPath &path) const;
+	[[nodiscard]] RichPage::Block *block(const BlockPath &path);
+	[[nodiscard]] const RichPage::Block *block(const BlockPath &path) const;
+	[[nodiscard]] RichPage::ListItem *listItem(
+		const BlockPath &blockPath,
+		int itemIndex);
+	[[nodiscard]] const RichPage::ListItem *listItem(
+		const BlockPath &blockPath,
+		int itemIndex) const;
+	[[nodiscard]] RichPage::TableCell *tableCell(
+		const BlockPath &blockPath,
+		int rowIndex,
+		int cellIndex);
+	[[nodiscard]] const RichPage::TableCell *tableCell(
+		const BlockPath &blockPath,
+		int rowIndex,
+		int cellIndex) const;
+	[[nodiscard]] RichPage::RichText *richText(const LeafPath &path);
+	[[nodiscard]] const RichPage::RichText *richText(
+		const LeafPath &path) const;
+	[[nodiscard]] QString *rawText(const LeafPath &path);
+	[[nodiscard]] const QString *rawText(const LeafPath &path) const;
+	[[nodiscard]] const TextNodeDescriptor *textNode(int ordinal) const;
+	[[nodiscard]] int textNodeOrdinal(const LeafPath &path) const;
+	[[nodiscard]] auto convertPreparedLeafSource(const LeafPath &path) const
+	-> std::optional<Markdown::PreparedEditLeafSource>;
+	[[nodiscard]] auto convertPreparedLeafSource(
+		const TextNodeDescriptor &descriptor) const
+	-> std::optional<Markdown::PreparedEditLeafSource>;
+	[[nodiscard]] auto tableRenderLimits() const
+	-> Markdown::MarkdownPrepareTableRenderLimits;
+
+	void rebuild();
+	void rebuildPrepared();
+	void rebuildTextNodes();
+	void rebuildTextNodes(
+		const std::vector<RichPage::Block> &blocks,
+		const BlockContainerPath &container);
+	void clearTemporaryDownParagraph();
+	void clearTemporaryDownParagraphIfInvalid();
+	void commitCheckedMutation(State state);
+	template <typename Result, typename Callback>
+	[[nodiscard]] Result applyCheckedMutation(
+		Result failure,
+		Callback &&callback);
+	[[nodiscard]] std::optional<int> activateRebuiltLeaf(
+		const LeafPath &path);
+	[[nodiscard]] InsertionAnchor resolveActiveInsertionTarget() const;
+	[[nodiscard]] std::optional<int> normalizeTextOnlyListItemForInsertion(
+		const BlockContainerPath &container);
+	[[nodiscard]] std::optional<int> normalizeTextOnlyQuoteSurface(
+		const BlockContainerPath &container,
+		bool keepEmptyParagraph);
+	[[nodiscard]] std::optional<int> normalizeTextOnlyQuoteForInsertion(
+		const BlockContainerPath &container);
+	[[nodiscard]] bool shouldReplaceActiveTextOnlyBlock(
+		const TextNodeDescriptor &descriptor,
+		const std::vector<RichPage::Block> &blocks) const;
+	[[nodiscard]] std::optional<ParagraphTarget> reuseOrInsertParagraph(
+		const BlockContainerPath &container,
+		int index);
+	[[nodiscard]] auto resolveActiveTextInsertTarget()
+	-> std::optional<ActiveTextInsertTarget>;
+	[[nodiscard]] auto activeNonPullquoteQuote() const
+	-> std::optional<ActiveNonPullquoteQuote>;
+	[[nodiscard]] auto activeListItemSurface() const
+	-> std::optional<ActiveListItemSurface>;
+	[[nodiscard]] auto normalizeActiveListItemSurface()
+	-> std::optional<ActiveListItemSurface>;
+	[[nodiscard]] ApplyResult applyActiveTextUnchecked(TextWithEntities text);
+	[[nodiscard]] ApplyResult applyActiveRawTextUnchecked(QString text);
+	[[nodiscard]] ApplyResult applyActiveTextWithLocalLimit(
+		TextWithEntities text);
+	[[nodiscard]] ApplyResult applyActiveRawTextWithLocalLimit(QString text);
+	[[nodiscard]] ApplyResult applySplitParagraphText(
+		const TextNodeDescriptor &descriptor,
+		std::vector<TextWithEntities> chunks);
+	[[nodiscard]] bool leafMutationKeepsTextNodes(
+		const TextNodeDescriptor &descriptor) const;
+	[[nodiscard]] bool updatePreparedActiveLeaf(
+		const TextNodeDescriptor &descriptor);
+	[[nodiscard]] bool addTableRowUnchecked(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool after);
+	[[nodiscard]] bool addTableColumnUnchecked(
+		const Markdown::PreparedEditTableCellRange &range,
+		bool after);
+	[[nodiscard]] std::optional<int> ensureTrailingParagraphActiveUnchecked();
+	[[nodiscard]] std::optional<int> moveActiveSpecialBlockDownUnchecked();
+	[[nodiscard]] BoundaryTarget boundaryTargetForLeaf(
+		const LeafPath &leaf,
+		const TextNodeDescriptor *descriptor,
+		bool forward,
+		bool allowRemoveDirectly) const;
+	[[nodiscard]] auto captureRebuiltBoundaryTarget(
+		const BoundaryTarget &target) const
+	-> std::optional<RebuiltBoundaryTarget>;
+	void shiftRebuiltBoundaryTargetAfterRemovedBlock(
+		RebuiltBoundaryTarget &target,
+		const BlockPath &removed) const;
+	[[nodiscard]] BoundaryTarget materializeBoundaryTarget(
+		const RebuiltBoundaryTarget &target) const;
+	[[nodiscard]] BoundaryTarget removeTemporaryDownParagraphAndMoveUnchecked();
+	[[nodiscard]] std::optional<int> handleActiveHeadingEnterUnchecked();
+	[[nodiscard]] std::optional<int> handleActiveListEnterUnchecked();
+	[[nodiscard]] bool insertBlocksAfterActiveUnchecked(
+		std::vector<RichPage::Block> blocks,
+		std::optional<ActiveTextInsertContext> context = std::nullopt);
+	[[nodiscard]] bool insertBlocksAfterActiveWithContextUnchecked(
+		std::vector<RichPage::Block> &blocks,
+		const ActiveTextInsertContext &context);
+	[[nodiscard]] RichPage::RichText *seedInsertedBlocks(
+		std::vector<RichPage::Block> &blocks,
+		TextWithEntities text);
+	[[nodiscard]] RichPage::RichText *seedInsertedBlock(
+		RichPage::Block &block);
+	[[nodiscard]] bool appendInsertedTrailingText(
+		const BlockContainerPath &container,
+		int insertAt,
+		int count,
+		TextWithEntities text);
+	void normalizeInsertedBlockAnchors(std::vector<RichPage::Block> &blocks);
+	void normalizeInsertedBlockAnchors(
+		std::vector<RichPage::Block> &root,
+		RichPage::Block &block);
+	void normalizeInsertedRichTextAnchors(
+		std::vector<RichPage::Block> &root,
+		RichPage::RichText &text);
+	void appendBlockTextNode(
+		const BlockPath &path,
+		LeafKind kind,
+		FieldMode mode = FieldMode::Rich,
+		std::optional<InsertionAnchor> insertionAnchor = std::nullopt);
+	void appendListItemTextNode(const BlockPath &path, int itemIndex);
+	void appendTableCellTextNode(
+		const BlockPath &path,
+		int rowIndex,
+		int cellIndex);
+	void ensureActiveTextOrdinal();
+	void ensureEditableNodes();
+	void focusInsertedBlocks(
+		const BlockContainerPath &container,
+		int from,
+		int count);
+	[[nodiscard]] std::optional<int> adjacentEditableOrdinal(
+		bool forward) const;
+	void collectBoundarySteps(
+		const std::vector<RichPage::Block> &blocks,
+		const BlockContainerPath &container,
+		bool forward,
+		std::vector<BoundaryTarget> *steps) const;
+	void appendBoundaryTextStep(
+		LeafPath leaf,
+		std::vector<BoundaryTarget> *steps) const;
+	void appendBoundaryBlockStep(
+		const BlockPath &path,
+		std::vector<BoundaryTarget> *steps) const;
+	void appendBoundaryListItemStep(
+		const BlockPath &path,
+		int itemIndex,
+		std::vector<BoundaryTarget> *steps) const;
+	[[nodiscard]] Markdown::PreparedEditSelection preparedSelectionForBlock(
+		const BlockPath &path) const;
+	[[nodiscard]] Markdown::PreparedEditSelection preparedSelectionForListItem(
+		const BlockPath &path,
+		int itemIndex) const;
+	[[nodiscard]] bool shouldRemoveActiveOwnerDirectly(
+		const TextNodeDescriptor &descriptor) const;
+	[[nodiscard]] bool descriptorBelongsToBlock(
+		const TextNodeDescriptor &descriptor,
+		const BlockPath &path) const;
+	[[nodiscard]] bool removalTargetIsEmpty(
+		const RemovalTarget &target) const;
+	[[nodiscard]] bool removeTarget(const RemovalTarget &target);
+	[[nodiscard]] bool anchorIdExists(const QString &id) const;
+	[[nodiscard]] bool anchorIdExists(
+		const std::vector<RichPage::Block> &blocks,
+		const QString &id) const;
+	[[nodiscard]] QString nextAnchorId() const;
+	[[nodiscard]] RichPage::Block makeBlock(InsertAction action) const;
+
+	[[nodiscard]] static TextWithEntities MakeText(QString text);
+	[[nodiscard]] static RichPage::Block MakeParagraphBlock();
+	[[nodiscard]] static RichPage::Block MakeFooterBlock();
+	[[nodiscard]] static RichPage::Block MakeHeadingBlock(int level);
+	[[nodiscard]] static RichPage::Block MakeQuoteBlock(bool pullquote);
+	[[nodiscard]] static RichPage::Block MakeCodeBlock();
+	[[nodiscard]] static RichPage::Block MakeMathBlock();
+	[[nodiscard]] static RichPage::Block MakeDividerBlock();
+	[[nodiscard]] static RichPage::Block MakeAnchorBlock(QString anchorId);
+	[[nodiscard]] static RichPage::Block MakeListBlock(
+		RichPage::ListKind kind,
+		RichPage::TaskState taskState = RichPage::TaskState::None);
+	[[nodiscard]] static RichPage::ListItem MakeParagraphListItem(
+		RichPage::TaskState taskState);
+	[[nodiscard]] static RichPage::Block MakeDetailsBlock();
+	[[nodiscard]] static RichPage::Block MakeTableBlock();
+	[[nodiscard]] static RichPage::Block MakeMediaBlock(
+		RichPage::BlockKind kind);
+	[[nodiscard]] static RichPage::Block MakeMapBlock(
+		double latitude,
+		double longitude);
+	[[nodiscard]] static bool RichTextIsEmpty(const RichPage::RichText &text);
+	[[nodiscard]] static bool ListItemIsEmpty(
+		const RichPage::ListItem &item);
+	[[nodiscard]] static bool BlockIsEmpty(const RichPage::Block &block);
+	[[nodiscard]] static bool StripWrapperEntityInEditMode(EntityType type);
+	[[nodiscard]] static TextWithEntities StripEditModeWrapperEntities(
+		TextWithEntities text);
+
+	std::shared_ptr<RichPage> _richPage;
+	std::shared_ptr<Markdown::MediaRuntime> _mediaRuntime;
+	RichMessageLimits _limits;
+	Markdown::MarkdownArticleContent _prepared;
+	std::vector<TextNodeDescriptor> _textNodes;
+	int _activeTextOrdinal = -1;
+	PreparedMutationKind _lastPreparedMutationKind
+		= PreparedMutationKind::None;
+	std::optional<RichMessageLimitError> _lastLimitError;
+	std::optional<LeafPath> _temporaryDownParagraph;
+
+};
+
+[[nodiscard]] bool CanEditRichPage(const RichPage &page);
+[[nodiscard]] bool CanEditRichPage(
+	const std::shared_ptr<const RichPage> &page);
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_text_entities.cpp b/Telegram/SourceFiles/iv/editor/iv_editor_text_entities.cpp
new file mode 100644
index 00000000000000..907f1abc349ed2
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_text_entities.cpp
@@ -0,0 +1,722 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/editor/iv_editor_text_entities.h"
+
+#include "iv/markdown/iv_markdown_prepare_serialize.h"
+#include "iv/markdown/iv_markdown_prepare_links.h"
+#include "ui/widgets/fields/input_field.h"
+
+#include <algorithm>
+#include <optional>
+#include <vector>
+
+namespace Iv::Editor {
+namespace {
+
+struct FormulaReplacement {
+	int offset = 0;
+	int length = 0;
+	QString source;
+};
+
+struct TextRange {
+	int offset = 0;
+	int length = 0;
+};
+
+[[nodiscard]] bool RangeInsideText(
+		const QString &text,
+		int offset,
+		int length) {
+	return (offset >= 0)
+		&& (length >= 0)
+		&& (offset <= text.size())
+		&& (length <= text.size() - offset);
+}
+
+[[nodiscard]] bool IsFormulaObjectSpan(
+		const QString &text,
+		const EntityInText &entity) {
+	return (entity.length() == 1)
+		&& RangeInsideText(text, entity.offset(), entity.length())
+		&& (text[entity.offset()] == QChar::ObjectReplacementCharacter);
+}
+
+[[nodiscard]] std::optional<Markdown::InlineTextObjectFormulaData>
+FormulaDataFromEntity(const EntityInText &entity) {
+	if (entity.type() != EntityType::CustomEmoji) {
+		return std::nullopt;
+	}
+	const auto parsed = Markdown::ParseInlineTextObjectEntity(entity.data());
+	if (!parsed || parsed->kind != Markdown::InlineTextObjectKind::Formula) {
+		return std::nullopt;
+	}
+	const auto formula = std::get_if<Markdown::InlineTextObjectFormulaData>(
+		&parsed->data);
+	return formula ? std::make_optional(*formula) : std::nullopt;
+}
+
+[[nodiscard]] QString EditorSourceForFormula(
+		const Markdown::InlineTextObjectFormulaData &formula) {
+	const auto stripDelimiters = [](QString result) {
+		result = result.trimmed();
+		if (result.size() >= 2
+			&& result.front() == QChar('$')
+			&& result.back() == QChar('$')) {
+			result = result.mid(1, result.size() - 2).trimmed();
+		}
+		return result;
+	};
+	if (!formula.trimmedTex.isEmpty()) {
+		return Markdown::InlineFormulaCopySource(
+			stripDelimiters(formula.trimmedTex));
+	}
+	return Markdown::InlineFormulaCopySource(
+		stripDelimiters(formula.copySource));
+}
+
+[[nodiscard]] std::optional<EntityInText> AdjustEntityForReplacement(
+		const EntityInText &entity,
+		int from,
+		int oldLength,
+		int newLength) {
+	const auto till = from + oldLength;
+	const auto delta = newLength - oldLength;
+	const auto begin = entity.offset();
+	const auto end = begin + entity.length();
+
+	if (end <= from) {
+		return entity;
+	} else if (begin >= till) {
+		return EntityInText(
+			entity.type(),
+			begin + delta,
+			entity.length(),
+			entity.data());
+	} else if (begin <= from && end >= till) {
+		const auto length = entity.length() + delta;
+		if (length <= 0) {
+			return std::nullopt;
+		}
+		return EntityInText(entity.type(), begin, length, entity.data());
+	}
+	return std::nullopt;
+}
+
+[[nodiscard]] std::optional<TextWithTags::Tag> AdjustTagForReplacement(
+		const TextWithTags::Tag &tag,
+		int from,
+		int oldLength,
+		int newLength) {
+	const auto till = from + oldLength;
+	const auto delta = newLength - oldLength;
+	const auto begin = tag.offset;
+	const auto end = begin + tag.length;
+
+	if (end <= from) {
+		return tag;
+	} else if (begin >= till) {
+		return TextWithTags::Tag{
+			.offset = begin + delta,
+			.length = tag.length,
+			.id = tag.id,
+		};
+	} else if (begin <= from && end >= till) {
+		const auto length = tag.length + delta;
+		if (length <= 0) {
+			return std::nullopt;
+		}
+		return TextWithTags::Tag{
+			.offset = begin,
+			.length = length,
+			.id = tag.id,
+		};
+	}
+	return std::nullopt;
+}
+
+[[nodiscard]] QString TagsWithoutIvEditorTags(QStringView tags) {
+	auto result = QList<QStringView>();
+	for (const auto &tag : TextUtilities::SplitTags(tags)) {
+		if (!Ui::InputField::IsInstantViewEditorTag(tag)
+			&& !tag.startsWith(QChar('#'))) {
+			result.push_back(tag);
+		}
+	}
+	return TextUtilities::JoinTag(result);
+}
+
+[[nodiscard]] TextWithTags::Tags GenericTagsWithoutIvEditorTags(
+		const TextWithTags::Tags &tags) {
+	auto result = TextWithTags::Tags();
+	result.reserve(tags.size());
+	for (const auto &tag : tags) {
+		auto filtered = TagsWithoutIvEditorTags(tag.id);
+		if (!filtered.isEmpty()) {
+			result.push_back({
+				.offset = tag.offset,
+				.length = tag.length,
+				.id = filtered,
+			});
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] bool IsValidAnchorEntity(const EntityInText &entity) {
+	if (entity.type() != EntityType::CustomUrl
+		|| !Ui::InputField::IsInstantViewAnchorLink(entity.data())) {
+		return false;
+	}
+	return !Markdown::NormalizeFragmentId(entity.data().mid(1)).isEmpty();
+}
+
+void SortTags(TextWithTags::Tags *tags);
+
+void AppendIvEntityTags(
+		TextWithTags::Tags *tags,
+		const EntitiesInText &entities) {
+	for (const auto &entity : entities) {
+		if (entity.length() <= 0) {
+			continue;
+		}
+		switch (entity.type()) {
+		case EntityType::Subscript:
+			tags->push_back({
+				.offset = entity.offset(),
+				.length = entity.length(),
+				.id = Ui::InputField::kTagIvSubscript,
+			});
+			break;
+		case EntityType::Superscript:
+			tags->push_back({
+				.offset = entity.offset(),
+				.length = entity.length(),
+				.id = Ui::InputField::kTagIvSuperscript,
+			});
+			break;
+		case EntityType::Marked:
+			tags->push_back({
+				.offset = entity.offset(),
+				.length = entity.length(),
+				.id = Ui::InputField::kTagIvMarked,
+			});
+			break;
+		case EntityType::CustomUrl:
+			if (IsValidAnchorEntity(entity)) {
+				tags->push_back({
+					.offset = entity.offset(),
+					.length = entity.length(),
+					.id = entity.data(),
+				});
+			}
+			break;
+		default:
+			break;
+		}
+	}
+}
+
+void OverlayTag(
+		TextWithTags::Tags *tags,
+		const TextWithTags::Tag &overlay,
+		const QString &text) {
+	if (overlay.id.isEmpty()
+		|| overlay.length <= 0
+		|| !RangeInsideText(text, overlay.offset, overlay.length)) {
+		return;
+	}
+	const auto from = overlay.offset;
+	const auto till = from + overlay.length;
+	auto coveredTill = from;
+	auto result = TextWithTags::Tags();
+	result.reserve(tags->size() + 3);
+
+	for (const auto &tag : *tags) {
+		const auto tagFrom = tag.offset;
+		const auto tagTill = tag.offset + tag.length;
+		if (tagTill <= from) {
+			result.push_back(tag);
+			continue;
+		} else if (tagFrom >= till) {
+			if (coveredTill < till) {
+				result.push_back({
+					.offset = coveredTill,
+					.length = till - coveredTill,
+					.id = overlay.id,
+				});
+				coveredTill = till;
+			}
+			result.push_back(tag);
+			continue;
+		}
+		if (tagFrom > coveredTill) {
+			result.push_back({
+				.offset = coveredTill,
+				.length = tagFrom - coveredTill,
+				.id = overlay.id,
+			});
+			coveredTill = tagFrom;
+		}
+		if (tagFrom < from) {
+			result.push_back({
+				.offset = tagFrom,
+				.length = from - tagFrom,
+				.id = tag.id,
+			});
+		}
+		const auto middleFrom = std::max(tagFrom, from);
+		const auto middleTill = std::min(tagTill, till);
+		if (middleFrom < middleTill) {
+			result.push_back({
+				.offset = middleFrom,
+				.length = middleTill - middleFrom,
+				.id = TextUtilities::TagWithAdded(tag.id, overlay.id),
+			});
+			coveredTill = middleTill;
+		}
+		if (tagTill > till) {
+			result.push_back({
+				.offset = till,
+				.length = tagTill - till,
+				.id = tag.id,
+			});
+		}
+	}
+	if (coveredTill < till) {
+		result.push_back({
+			.offset = coveredTill,
+			.length = till - coveredTill,
+			.id = overlay.id,
+		});
+	}
+	SortTags(&result);
+	*tags = TextUtilities::SimplifyTags(std::move(result));
+}
+
+void OverlayTags(
+		TextWithTags::Tags *tags,
+		const TextWithTags::Tags &overlays,
+		const QString &text) {
+	for (const auto &overlay : overlays) {
+		OverlayTag(tags, overlay, text);
+	}
+}
+
+void SubtractRange(
+		std::vector<TextRange> *ranges,
+		int from,
+		int till) {
+	auto result = std::vector<TextRange>();
+	for (const auto &range : *ranges) {
+		const auto rangeFrom = range.offset;
+		const auto rangeTill = range.offset + range.length;
+		if (rangeTill <= from || rangeFrom >= till) {
+			result.push_back(range);
+			continue;
+		}
+		if (rangeFrom < from) {
+			result.push_back({
+				.offset = rangeFrom,
+				.length = from - rangeFrom,
+			});
+		}
+		if (rangeTill > till) {
+			result.push_back({
+				.offset = till,
+				.length = rangeTill - till,
+			});
+		}
+	}
+	*ranges = std::move(result);
+}
+
+void RemoveRangesFromTags(
+		TextWithTags::Tags *tags,
+		const TextWithTags::Tags &removed) {
+	auto result = TextWithTags::Tags();
+	for (const auto &tag : *tags) {
+		auto ranges = std::vector<TextRange>{ {
+			.offset = tag.offset,
+			.length = tag.length,
+		} };
+		for (const auto &remove : removed) {
+			SubtractRange(
+				&ranges,
+				remove.offset,
+				remove.offset + remove.length);
+		}
+		for (const auto &range : ranges) {
+			if (range.length > 0) {
+				result.push_back({
+					.offset = range.offset,
+					.length = range.length,
+					.id = tag.id,
+				});
+			}
+		}
+	}
+	SortTags(&result);
+	*tags = TextUtilities::SimplifyTags(std::move(result));
+}
+
+void SortTags(TextWithTags::Tags *tags) {
+	std::sort(tags->begin(), tags->end(), [](const auto &a, const auto &b) {
+		if (a.offset != b.offset) {
+			return a.offset < b.offset;
+		} else if (a.length != b.length) {
+			return a.length < b.length;
+		}
+		return a.id < b.id;
+	});
+}
+
+[[nodiscard]] bool TagContains(QStringView tags, QStringView tagId) {
+	return TextUtilities::SplitTags(tags).contains(tagId);
+}
+
+[[nodiscard]] bool TagContainsOtherThan(QStringView tags, QStringView tagId) {
+	for (const auto &tag : TextUtilities::SplitTags(tags)) {
+		if (tag != tagId) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void MergeRanges(std::vector<TextRange> *ranges);
+
+[[nodiscard]] std::vector<TextRange> RangesContainingTagId(
+		const TextWithTags::Tags &tags,
+		QStringView tagId,
+		const QString &text) {
+	auto result = std::vector<TextRange>();
+	result.reserve(tags.size());
+	for (const auto &tag : tags) {
+		if (tag.length <= 0
+			|| !RangeInsideText(text, tag.offset, tag.length)
+			|| !TagContains(tag.id, tagId)) {
+			continue;
+		}
+		result.push_back({
+			.offset = tag.offset,
+			.length = tag.length,
+		});
+	}
+	return result;
+}
+
+[[nodiscard]] EntitiesInText ValidAnchorEntitiesFromTags(
+		const TextWithTags::Tags &tags,
+		const QString &text) {
+	auto result = EntitiesInText();
+	result.reserve(tags.size());
+	for (const auto &tag : tags) {
+		if (tag.length <= 0 || !RangeInsideText(text, tag.offset, tag.length)) {
+			continue;
+		}
+		for (const auto &single : TextUtilities::SplitTags(tag.id)) {
+			if (!Ui::InputField::IsInstantViewAnchorLink(single)) {
+				continue;
+			}
+			auto link = single.toString();
+			if (Markdown::NormalizeFragmentId(link).isEmpty()) {
+				continue;
+			}
+			result.push_back(EntityInText(
+				EntityType::CustomUrl,
+				tag.offset,
+				tag.length,
+				link));
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] std::vector<TextRange> MathRangesWithoutIntersections(
+		const TextWithTags::Tags &tags,
+		const QString &text) {
+	auto result = std::vector<TextRange>();
+	for (const auto &math : tags) {
+		if (math.length <= 0
+			|| !RangeInsideText(text, math.offset, math.length)
+			|| !TagContains(math.id, Ui::InputField::kTagIvMath)) {
+			continue;
+		}
+		auto ranges = std::vector<TextRange>{ {
+			.offset = math.offset,
+			.length = math.length,
+		} };
+		for (const auto &other : tags) {
+			if (other.length <= 0
+				|| !RangeInsideText(text, other.offset, other.length)
+				|| !TagContainsOtherThan(
+					other.id,
+					Ui::InputField::kTagIvMath)) {
+				continue;
+			}
+			SubtractRange(
+				&ranges,
+				other.offset,
+				other.offset + other.length);
+		}
+		result.insert(result.end(), ranges.begin(), ranges.end());
+	}
+	MergeRanges(&result);
+	return result;
+}
+
+void AppendEntitiesForTagId(
+		EntitiesInText *entities,
+		const TextWithTags::Tags &tags,
+		QStringView tagId,
+		EntityType type,
+		const QString &text) {
+	for (const auto &range : RangesContainingTagId(tags, tagId, text)) {
+		entities->push_back(EntityInText(type, range.offset, range.length));
+	}
+}
+
+void MergeRanges(std::vector<TextRange> *ranges) {
+	std::sort(ranges->begin(), ranges->end(), [](const auto &a, const auto &b) {
+		if (a.offset != b.offset) {
+			return a.offset < b.offset;
+		}
+		return a.length < b.length;
+	});
+
+	auto result = std::vector<TextRange>();
+	result.reserve(ranges->size());
+	for (const auto &range : *ranges) {
+		if (result.empty()) {
+			result.push_back(range);
+			continue;
+		}
+		auto &last = result.back();
+		const auto lastEnd = last.offset + last.length;
+		const auto rangeEnd = range.offset + range.length;
+		if (range.offset > lastEnd) {
+			result.push_back(range);
+		} else if (rangeEnd > lastEnd) {
+			last.length = rangeEnd - last.offset;
+		}
+	}
+	*ranges = std::move(result);
+}
+
+void SortEntities(EntitiesInText *entities) {
+	std::sort(
+		entities->begin(),
+		entities->end(),
+		[](const auto &a, const auto &b) {
+			if (a.offset() != b.offset()) {
+				return a.offset() < b.offset();
+			} else if (a.length() != b.length()) {
+				return a.length() < b.length();
+			} else if (a.type() != b.type()) {
+				return int(a.type()) < int(b.type());
+			}
+			return a.data() < b.data();
+		});
+}
+
+} // namespace
+
+RichTextEditorConversion ConvertRichTextToEditorTags(TextWithEntities text) {
+	auto formulas = std::vector<FormulaReplacement>();
+	auto entities = EntitiesInText();
+	entities.reserve(text.entities.size());
+
+	for (const auto &entity : text.entities) {
+		const auto formula = FormulaDataFromEntity(entity);
+		if (formula && IsFormulaObjectSpan(text.text, entity)) {
+			formulas.push_back({
+				.offset = entity.offset(),
+				.length = entity.length(),
+				.source = EditorSourceForFormula(*formula),
+			});
+		} else {
+			entities.push_back(entity);
+		}
+	}
+
+	std::sort(
+		formulas.begin(),
+		formulas.end(),
+		[](const auto &a, const auto &b) {
+			return a.offset > b.offset;
+		});
+
+	auto mathTags = TextWithTags::Tags();
+	auto replacements = std::vector<RichTextEditorOffsetReplacement>();
+	replacements.reserve(formulas.size());
+
+	for (const auto &formula : formulas) {
+		const auto newLength = formula.source.size();
+
+		for (auto i = entities.begin(); i != entities.end();) {
+			if (const auto adjusted = AdjustEntityForReplacement(
+					*i,
+					formula.offset,
+					formula.length,
+					newLength)) {
+				*i++ = *adjusted;
+			} else {
+				i = entities.erase(i);
+			}
+		}
+		for (auto i = mathTags.begin(); i != mathTags.end();) {
+			if (const auto adjusted = AdjustTagForReplacement(
+					*i,
+					formula.offset,
+					formula.length,
+					newLength)) {
+				*i++ = *adjusted;
+			} else {
+				i = mathTags.erase(i);
+			}
+		}
+
+		text.text.replace(formula.offset, formula.length, formula.source);
+		if (newLength > 0) {
+			mathTags.push_back({
+				.offset = formula.offset,
+				.length = int(newLength),
+				.id = Ui::InputField::kTagIvMath,
+			});
+		}
+		replacements.push_back({
+			.richOffset = formula.offset,
+			.richLength = formula.length,
+			.editorLength = int(newLength),
+		});
+	}
+
+	auto tags = TextUtilities::ConvertEntitiesToTextTags(entities);
+	auto ivTags = TextWithTags::Tags();
+	AppendIvEntityTags(&ivTags, entities);
+	RemoveRangesFromTags(&tags, mathTags);
+	RemoveRangesFromTags(&ivTags, mathTags);
+	OverlayTags(&tags, ivTags, text.text);
+	OverlayTags(&tags, mathTags, text.text);
+	SortTags(&tags);
+	tags = TextUtilities::SimplifyTags(tags);
+
+	std::sort(
+		replacements.begin(),
+		replacements.end(),
+		[](const auto &a, const auto &b) {
+			return a.richOffset < b.richOffset;
+		});
+
+	return {
+		.text = { text.text, tags },
+		.replacements = replacements,
+	};
+}
+
+int MapRichTextOffsetToEditorOffset(
+		const std::vector<RichTextEditorOffsetReplacement> &replacements,
+		int offset) {
+	auto delta = 0;
+	for (const auto &replacement : replacements) {
+		if (replacement.richLength <= 0) {
+			continue;
+		}
+		const auto richStart = replacement.richOffset;
+		const auto richEnd = richStart + replacement.richLength;
+		const auto editorStart = richStart + delta;
+		if (offset < richStart) {
+			break;
+		} else if (offset <= richEnd) {
+			return editorStart
+				+ ((offset == richEnd) ? replacement.editorLength : 0);
+		}
+		delta += replacement.editorLength - replacement.richLength;
+	}
+	return offset + delta;
+}
+
+TextWithEntities ConvertEditorTagsToRichText(TextWithTags text) {
+	auto entities = TextUtilities::ConvertTextTagsToEntities(
+		GenericTagsWithoutIvEditorTags(text.tags));
+	AppendEntitiesForTagId(
+		&entities,
+		text.tags,
+		Ui::InputField::kTagIvMarked,
+		EntityType::Marked,
+		text.text);
+	AppendEntitiesForTagId(
+		&entities,
+		text.tags,
+		Ui::InputField::kTagIvSubscript,
+		EntityType::Subscript,
+		text.text);
+	AppendEntitiesForTagId(
+		&entities,
+		text.tags,
+		Ui::InputField::kTagIvSuperscript,
+		EntityType::Superscript,
+		text.text);
+	for (const auto &entity : ValidAnchorEntitiesFromTags(
+			text.tags,
+			text.text)) {
+		entities.push_back(entity);
+	}
+
+	auto mathRanges = MathRangesWithoutIntersections(text.tags, text.text);
+	for (auto i = mathRanges.rbegin(); i != mathRanges.rend(); ++i) {
+		const auto source = text.text.mid(i->offset, i->length);
+		auto trimmedSource = source.trimmed();
+		if (trimmedSource.size() >= 2
+			&& trimmedSource.front() == QChar('$')
+			&& trimmedSource.back() == QChar('$')) {
+			trimmedSource = trimmedSource
+				.mid(1, trimmedSource.size() - 2)
+				.trimmed();
+		}
+		if (trimmedSource.isEmpty()) {
+			continue;
+		}
+		const auto entityData = Markdown::SerializeInlineTextObjectEntity({
+			.kind = Markdown::InlineTextObjectKind::Formula,
+			.data = Markdown::InlineTextObjectFormulaData{
+				.copySource = Markdown::InlineFormulaCopySource(trimmedSource),
+				.trimmedTex = trimmedSource,
+			},
+		});
+		for (auto j = entities.begin(); j != entities.end();) {
+			if (const auto adjusted = AdjustEntityForReplacement(
+					*j,
+					i->offset,
+					i->length,
+					1)) {
+				*j++ = *adjusted;
+			} else {
+				j = entities.erase(j);
+			}
+		}
+		text.text.replace(
+			i->offset,
+			i->length,
+			QString(QChar::ObjectReplacementCharacter));
+		entities.push_back(EntityInText(
+			EntityType::CustomEmoji,
+			i->offset,
+			1,
+			entityData));
+	}
+
+	SortEntities(&entities);
+	return {
+		.text = text.text,
+		.entities = entities,
+	};
+}
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_text_entities.h b/Telegram/SourceFiles/iv/editor/iv_editor_text_entities.h
new file mode 100644
index 00000000000000..ef9039afed17f3
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_text_entities.h
@@ -0,0 +1,34 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/text/text_entity.h"
+
+#include <vector>
+
+namespace Iv::Editor {
+
+struct RichTextEditorOffsetReplacement {
+	int richOffset = 0;
+	int richLength = 0;
+	int editorLength = 0;
+};
+
+struct RichTextEditorConversion {
+	TextWithTags text;
+	std::vector<RichTextEditorOffsetReplacement> replacements;
+};
+
+[[nodiscard]] RichTextEditorConversion ConvertRichTextToEditorTags(
+	TextWithEntities text);
+[[nodiscard]] int MapRichTextOffsetToEditorOffset(
+	const std::vector<RichTextEditorOffsetReplacement> &replacements,
+	int offset);
+[[nodiscard]] TextWithEntities ConvertEditorTagsToRichText(TextWithTags text);
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_widget.cpp b/Telegram/SourceFiles/iv/editor/iv_editor_widget.cpp
new file mode 100644
index 00000000000000..3022cb527cac7d
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_widget.cpp
@@ -0,0 +1,4943 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/editor/iv_editor_widget.h"
+
+#include "base/qthelp_url.h"
+#include "base/qt/qt_common_adapters.h"
+#include "chat_helpers/emoji_suggestions_widget.h"
+#include "chat_helpers/message_field.h"
+#include "data/data_msg_id.h"
+#include "data/data_types.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "iv/editor/iv_editor_text_entities.h"
+#include "iv/markdown/iv_markdown_article_paint.h"
+#include "iv/markdown/iv_markdown_prepare_links.h"
+#include "iv/markdown/iv_markdown_prepare_native_richtext.h"
+#include "lang/lang_keys.h"
+#include "main/session/session_show.h"
+#include "menu/menu_checked_action.h"
+#include "spellcheck/spellcheck_highlight_syntax.h"
+#include "ui/chat/chat_style.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/image/image_location.h"
+#include "ui/painter.h"
+#include "ui/text/text_entity.h"
+#include "ui/ui_utility.h"
+#include "ui/widgets/elastic_scroll.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/menu/menu_action.h"
+#include "ui/widgets/menu/menu_separator.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/scroll_area.h"
+
+#include "styles/palette.h"
+#include "styles/style_chat.h"
+#include "styles/style_iv.h"
+#include "styles/style_menu_icons.h"
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDate>
+#include <QtCore/QEvent>
+#include <QtCore/QMimeData>
+#include <QtCore/QPointer>
+#include <QtGui/QClipboard>
+#include <QtGui/QContextMenuEvent>
+#include <QtGui/QFocusEvent>
+#include <QtGui/QInputMethodEvent>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QResizeEvent>
+#include <QtGui/QTextBlock>
+#include <QtGui/QTouchEvent>
+#include <QtGui/QWheelEvent>
+#include <QtGui/QTextCursor>
+#include <QtGui/QTextDocument>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QTextEdit>
+#include <QAction>
+
+#include <algorithm>
+#include <cmath>
+#include <limits>
+
+namespace Iv::Editor {
+namespace {
+
+[[nodiscard]] std::vector<Ui::Text::SpecialColor> HighlightColors(
+		not_null<const Ui::ChatStyle*> style) {
+	auto result = Ui::SyntaxHighlightColors(style);
+
+	const auto &fg = style->lightButtonFg();
+	const auto &bg = style->lightButtonBgOver();
+	result.push_back({ &fg->p, &fg->p, &bg->b, &bg->b });
+
+	Ensures(result.size() == Markdown::kNativeIvLinkSpecialColorIndex);
+	return result;
+}
+
+[[nodiscard]] std::unique_ptr<Ui::ChatTheme> CreateStandaloneChatTheme() {
+	const auto palette = style::main_palette::get();
+	return std::make_unique<Ui::ChatTheme>(Ui::ChatThemeDescriptor{
+		.preparePalette = [=](style::palette &copy) {
+			copy = *palette;
+		},
+		.backgroundData = {
+			.colors = { palette->windowBg()->c },
+		},
+	});
+}
+
+[[nodiscard]] const style::margins &EditorBodyPadding() {
+	return st::ivEditorBodyPadding;
+}
+
+constexpr auto kRetainedLeafFieldLimit = 50;
+thread_local Widget *PreservingExternalFieldRestore = nullptr;
+
+void EnableQTextEditLineMetrics(style::TextStyle &style) {
+	style.qtextEditLineMetrics = true;
+}
+
+void EnableQTextEditLineMetrics(style::Markdown &style) {
+	EnableQTextEditLineMetrics(style.body);
+	EnableQTextEditLineMetrics(style.heading1);
+	EnableQTextEditLineMetrics(style.heading2);
+	EnableQTextEditLineMetrics(style.heading3);
+	EnableQTextEditLineMetrics(style.heading4);
+	EnableQTextEditLineMetrics(style.heading5);
+	EnableQTextEditLineMetrics(style.heading6);
+	EnableQTextEditLineMetrics(style.code);
+	EnableQTextEditLineMetrics(style.displayMath.fallbackStyle);
+	EnableQTextEditLineMetrics(style.table.headerStyle);
+	EnableQTextEditLineMetrics(style.table.bodyStyle);
+	EnableQTextEditLineMetrics(style.details.summaryStyle);
+	EnableQTextEditLineMetrics(style.embedPost.authorStyle);
+	EnableQTextEditLineMetrics(style.embedPost.dateStyle);
+	EnableQTextEditLineMetrics(style.placeholder.labelStyle);
+	EnableQTextEditLineMetrics(style.audio.titleStyle);
+	EnableQTextEditLineMetrics(style.audio.subtitleStyle);
+	EnableQTextEditLineMetrics(style.channel.titleStyle);
+	EnableQTextEditLineMetrics(style.channel.subtitleStyle);
+	EnableQTextEditLineMetrics(style.channel.button.textStyle);
+	EnableQTextEditLineMetrics(style.relatedArticle.titleStyle);
+	EnableQTextEditLineMetrics(style.relatedArticle.subtitleStyle);
+	EnableQTextEditLineMetrics(style.relatedArticle.footerStyle);
+}
+
+[[nodiscard]] style::Markdown CreateEditorMarkdownStyle() {
+	auto result = st::messageMarkdown;
+	EnableQTextEditLineMetrics(result);
+	return result;
+}
+
+[[nodiscard]] int CompareSelectionPositions(
+		Markdown::MarkdownArticleSelectionPosition a,
+		Markdown::MarkdownArticleSelectionPosition b) {
+	if (a.segment != b.segment) {
+		return (a.segment < b.segment) ? -1 : 1;
+	}
+	if (a.offset != b.offset) {
+		return (a.offset < b.offset) ? -1 : 1;
+	}
+	return 0;
+}
+
+[[nodiscard]] Markdown::MarkdownArticleSelection NormalizeSelection(
+		Markdown::MarkdownArticleSelection selection) {
+	if (selection.empty()) {
+		return {};
+	}
+	if (CompareSelectionPositions(selection.from, selection.to) > 0) {
+		std::swap(selection.from, selection.to);
+	}
+	return selection;
+}
+
+[[nodiscard]] Markdown::MarkdownArticleSelectionEndpoint MakeSelectionEndpoint(
+		const Markdown::MarkdownArticleHitTestResult &hit) {
+	return {
+		.segment = hit.segmentIndex,
+		.direct = hit.direct,
+	};
+}
+
+[[nodiscard]] bool RedirectTextToField(const QString &text) {
+	for (const auto &ch : text) {
+		if (ch.unicode() >= 32) {
+			return true;
+		}
+	}
+	return false;
+}
+
+struct InlineFieldTrimResult {
+	TextWithTags text;
+	int left = 0;
+};
+
+[[nodiscard]] InlineFieldTrimResult TrimInlineFieldText(
+		TextWithTags text,
+		bool trimLeft) {
+	auto from = 0;
+	auto till = int(text.text.size());
+	if (trimLeft) {
+		while (from < till && text.text[from].isSpace()) {
+			++from;
+		}
+	}
+	while (till > from && text.text[till - 1].isSpace()) {
+		--till;
+	}
+	if (from == 0 && till == text.text.size()) {
+		return { std::move(text), 0 };
+	}
+	text.text = text.text.mid(from, till - from);
+	for (auto i = text.tags.begin(); i != text.tags.end();) {
+		const auto tagFrom = i->offset;
+		const auto tagTill = i->offset + i->length;
+		const auto clippedFrom = std::max(tagFrom, from);
+		const auto clippedTill = std::min(tagTill, till);
+		if (clippedTill <= clippedFrom || i->length <= 0) {
+			i = text.tags.erase(i);
+		} else {
+			i->offset = clippedFrom - from;
+			i->length = clippedTill - clippedFrom;
+			++i;
+		}
+	}
+	return { std::move(text), from };
+}
+
+[[nodiscard]] int MapEditorOffsetToRichOffset(
+		const std::vector<RichTextEditorOffsetReplacement> &replacements,
+		int offset) {
+	auto delta = 0;
+	for (const auto &replacement : replacements) {
+		if (replacement.richLength <= 0) {
+			continue;
+		}
+		const auto richStart = replacement.richOffset;
+		const auto editorStart = richStart + delta;
+		const auto editorEnd = editorStart + replacement.editorLength;
+		if (offset < editorStart) {
+			break;
+		} else if (offset <= editorEnd) {
+			return richStart
+				+ ((offset == editorEnd) ? replacement.richLength : 0);
+		}
+		delta += replacement.editorLength - replacement.richLength;
+	}
+	return offset - delta;
+}
+
+[[nodiscard]] auto ClipboardPasteInsertContext(
+		std::optional<State::ActiveTextInsertContext> context)
+-> std::optional<State::ActiveTextInsertContext> {
+	if (context) {
+		context->selected = TextWithEntities();
+	}
+	return context;
+}
+
+[[nodiscard]] QString ValidateInstantViewEditorLink(QString link) {
+	const auto normal = qthelp::validate_url(link);
+	if (!normal.isEmpty()) {
+		return normal;
+	}
+	link = link.trimmed();
+	const auto hasPayload = [&](const QString &prefix) {
+		return link.startsWith(prefix)
+			&& !link.mid(prefix.size()).trimmed().isEmpty();
+	};
+	if (hasPayload(u"mailto:"_q)
+		|| hasPayload(u"tel:"_q)
+		|| (link.startsWith(u"#"_q)
+			&& !Markdown::NormalizeFragmentId(link).isEmpty())) {
+		return link;
+	}
+	return QString();
+}
+
+[[nodiscard]] bool ImeEventProducesInput(
+		const QInputMethodEvent &e,
+		const QTextCursor &cursor) {
+	return !e.commitString().isEmpty()
+		|| e.preeditString() != cursor.block().layout()->preeditAreaText()
+		|| e.replacementLength() > 0;
+}
+
+using PreparedEditBlockContainerPath
+	= Markdown::PreparedEditBlockContainerPath;
+using PreparedEditBlockContainerStep
+	= Markdown::PreparedEditBlockContainerStep;
+using PreparedEditBlockContainerKind
+	= Markdown::PreparedEditBlockContainerKind;
+using PreparedEditBlockPath = Markdown::PreparedEditBlockPath;
+using PreparedEditBlockSource = Markdown::PreparedEditBlockSource;
+using PreparedEditHit = Markdown::PreparedEditHit;
+using PreparedEditHitKind = Markdown::PreparedEditHitKind;
+using PreparedEditLeafKind = Markdown::PreparedEditLeafKind;
+using PreparedEditLeafSource = Markdown::PreparedEditLeafSource;
+using PreparedEditListItemSource = Markdown::PreparedEditListItemSource;
+using PreparedEditSelection = Markdown::PreparedEditSelection;
+using PreparedEditSelectionKind = Markdown::PreparedEditSelectionKind;
+using PreparedEditTableCellRange = Markdown::PreparedEditTableCellRange;
+using PreparedEditTableCellSource = Markdown::PreparedEditTableCellSource;
+using PreparedEditTableRowSource = Markdown::PreparedEditTableRowSource;
+using ApplyResult = State::ApplyResult;
+using PreparedMutationKind = State::PreparedMutationKind;
+using GroupedMediaItem = RichPage::GroupedMediaItem;
+using ListItem = RichPage::ListItem;
+using RelatedArticle = RichPage::RelatedArticle;
+using RichText = RichPage::RichText;
+using TableCell = RichPage::TableCell;
+using TableRow = RichPage::TableRow;
+using Block = RichPage::Block;
+
+template <typename Range, typename Equals>
+[[nodiscard]] bool RangesEqual(
+		const Range &a,
+		const Range &b,
+		Equals equals) {
+	return (a.size() == b.size())
+		&& std::equal(a.begin(), a.end(), b.begin(), equals);
+}
+
+[[nodiscard]] bool RichTextEquals(const RichText &a, const RichText &b) {
+	return (a.text == b.text)
+		&& (a.anchorId == b.anchorId)
+		&& (a.anchorIds == b.anchorIds);
+}
+
+[[nodiscard]] bool GroupedMediaItemEquals(
+		const GroupedMediaItem &a,
+		const GroupedMediaItem &b) {
+	return (a.kind == b.kind)
+		&& (a.photo == b.photo)
+		&& (a.document == b.document)
+		&& (a.photoId == b.photoId)
+		&& (a.documentId == b.documentId)
+		&& (a.width == b.width)
+		&& (a.height == b.height)
+		&& (a.autoplay == b.autoplay)
+		&& (a.loop == b.loop)
+		&& (a.spoiler == b.spoiler);
+}
+
+[[nodiscard]] bool TableCellEquals(const TableCell &a, const TableCell &b) {
+	return RichTextEquals(a.text, b.text)
+		&& (a.colspan == b.colspan)
+		&& (a.rowspan == b.rowspan)
+		&& (a.header == b.header)
+		&& (a.alignment == b.alignment)
+		&& (a.verticalAlignment == b.verticalAlignment);
+}
+
+[[nodiscard]] bool TableRowEquals(const TableRow &a, const TableRow &b) {
+	return RangesEqual(a.cells, b.cells, TableCellEquals);
+}
+
+[[nodiscard]] bool RelatedArticleEquals(
+		const RelatedArticle &a,
+		const RelatedArticle &b) {
+	return (a.url == b.url)
+		&& (a.webpageId == b.webpageId)
+		&& (a.photo == b.photo)
+		&& (a.photoId == b.photoId)
+		&& (a.title == b.title)
+		&& (a.description == b.description)
+		&& (a.author == b.author)
+		&& (a.publishedDate == b.publishedDate);
+}
+
+[[nodiscard]] bool BlockEquals(const Block &a, const Block &b);
+
+[[nodiscard]] bool ListItemEquals(const ListItem &a, const ListItem &b) {
+	return (a.taskState == b.taskState)
+		&& (a.number == b.number)
+		&& (a.anchorId == b.anchorId)
+		&& RichTextEquals(a.text, b.text)
+		&& RangesEqual(a.blocks, b.blocks, BlockEquals);
+}
+
+[[nodiscard]] bool BlockEquals(const Block &a, const Block &b) {
+	return (a.kind == b.kind)
+		&& (a.anchorId == b.anchorId)
+		&& RichTextEquals(a.text, b.text)
+		&& RichTextEquals(a.caption, b.caption)
+		&& (a.language == b.language)
+		&& (a.formula == b.formula)
+		&& (a.url == b.url)
+		&& (a.html == b.html)
+		&& (a.author == b.author)
+		&& (a.username == b.username)
+		&& (a.channelTitle == b.channelTitle)
+		&& (a.audioTitle == b.audioTitle)
+		&& (a.audioPerformer == b.audioPerformer)
+		&& (a.audioFileName == b.audioFileName)
+		&& (a.date == b.date)
+		&& (a.audioDuration == b.audioDuration)
+		&& (a.headingLevel == b.headingLevel)
+		&& (a.width == b.width)
+		&& (a.height == b.height)
+		&& (a.zoom == b.zoom)
+		&& (a.photoId == b.photoId)
+		&& (a.documentId == b.documentId)
+		&& (a.channelId == b.channelId)
+		&& (a.fullWidth == b.fullWidth)
+		&& (a.fixedHeight == b.fixedHeight)
+		&& (a.allowScrolling == b.allowScrolling)
+		&& (a.autoplay == b.autoplay)
+		&& (a.loop == b.loop)
+		&& (a.spoiler == b.spoiler)
+		&& (a.open == b.open)
+		&& (a.bordered == b.bordered)
+		&& (a.striped == b.striped)
+		&& (a.pullquote == b.pullquote)
+		&& (a.listKind == b.listKind)
+		&& (a.mediaIntent == b.mediaIntent)
+		&& (a.photo == b.photo)
+		&& (a.document == b.document)
+		&& (a.peer == b.peer)
+		&& (a.latitude == b.latitude)
+		&& (a.longitude == b.longitude)
+		&& (a.accessHash == b.accessHash)
+		&& RangesEqual(a.blocks, b.blocks, BlockEquals)
+		&& RangesEqual(a.listItems, b.listItems, ListItemEquals)
+		&& RangesEqual(a.mediaItems, b.mediaItems, GroupedMediaItemEquals)
+		&& RangesEqual(a.tableRows, b.tableRows, TableRowEquals)
+		&& RangesEqual(
+			a.relatedArticles,
+			b.relatedArticles,
+			RelatedArticleEquals);
+}
+
+[[nodiscard]] bool RichPageEquals(const RichPage &a, const RichPage &b) {
+	return (a.url == b.url)
+		&& (a.rtl == b.rtl)
+		&& (a.part == b.part)
+		&& (a.views == b.views)
+		&& RangesEqual(a.blocks, b.blocks, BlockEquals);
+}
+
+[[nodiscard]] bool SnapshotEquals(
+		const State::Snapshot &a,
+		const State::Snapshot &b) {
+	return RichPageEquals(a.richPage, b.richPage)
+		&& (a.activeLeaf == b.activeLeaf)
+		&& (a.temporaryDownParagraph == b.temporaryDownParagraph);
+}
+
+struct NormalizedIntegerRange {
+	int from = -1;
+	int till = -1;
+
+	[[nodiscard]] bool empty() const {
+		return (from < 0) || (till <= from);
+	}
+};
+
+[[nodiscard]] NormalizedIntegerRange NormalizeIntegerRange(int a, int b) {
+	if (a < 0 || b < 0) {
+		return {};
+	}
+	return {
+		.from = std::min(a, b),
+		.till = std::max(a, b) + 1,
+	};
+}
+
+[[nodiscard]] PreparedEditSelection BlockSelectionFromIndexes(
+		PreparedEditBlockContainerPath container,
+		int first,
+		int second) {
+	const auto range = NormalizeIntegerRange(first, second);
+	if (range.empty()) {
+		return {};
+	}
+	return {
+		.kind = PreparedEditSelectionKind::Blocks,
+		.blocks = {
+			.container = std::move(container),
+			.from = range.from,
+			.till = range.till,
+		},
+	};
+}
+
+[[nodiscard]] int CompareIntegers(int a, int b) {
+	return (a < b) ? -1 : (a > b) ? 1 : 0;
+}
+
+[[nodiscard]] int ComparePreparedEditBlockContainerSteps(
+		const PreparedEditBlockContainerStep &a,
+		const PreparedEditBlockContainerStep &b) {
+	if (const auto result = CompareIntegers(
+			static_cast<int>(a.kind),
+			static_cast<int>(b.kind))) {
+		return result;
+	} else if (const auto result = CompareIntegers(
+			a.blockIndex,
+			b.blockIndex)) {
+		return result;
+	}
+	return CompareIntegers(a.listItemIndex, b.listItemIndex);
+}
+
+[[nodiscard]] int ComparePreparedEditBlockContainerPaths(
+		const PreparedEditBlockContainerPath &a,
+		const PreparedEditBlockContainerPath &b) {
+	const auto common = std::min(a.steps.size(), b.steps.size());
+	for (auto i = size_t(); i != common; ++i) {
+		if (const auto result = ComparePreparedEditBlockContainerSteps(
+				a.steps[i],
+				b.steps[i])) {
+			return result;
+		}
+	}
+	return CompareIntegers(int(a.steps.size()), int(b.steps.size()));
+}
+
+[[nodiscard]] int ComparePreparedEditBlockPaths(
+		const PreparedEditBlockPath &a,
+		const PreparedEditBlockPath &b) {
+	if (const auto result = ComparePreparedEditBlockContainerPaths(
+			a.container,
+			b.container)) {
+		return result;
+	}
+	return CompareIntegers(a.index, b.index);
+}
+
+[[nodiscard]] bool SamePreparedEditBlockPath(
+		const PreparedEditBlockPath &a,
+		const PreparedEditBlockPath &b) {
+	return (ComparePreparedEditBlockPaths(a, b) == 0);
+}
+
+[[nodiscard]] bool ValidPreparedEditBlockPath(
+		const PreparedEditBlockPath &path) {
+	return (path.index >= 0);
+}
+
+[[nodiscard]] PreparedEditBlockSource PreparedEditBlockSourceFromPath(
+		PreparedEditBlockPath path) {
+	return { .path = std::move(path) };
+}
+
+enum class StructuralOwnerKind {
+	None,
+	Block,
+	ListItem,
+	TableRow,
+	TableCell,
+};
+
+struct StructuralOwner {
+	StructuralOwnerKind kind = StructuralOwnerKind::None;
+	std::optional<PreparedEditBlockSource> block;
+	std::optional<PreparedEditListItemSource> listItem;
+	std::optional<PreparedEditTableRowSource> tableRow;
+	std::optional<PreparedEditTableCellSource> tableCell;
+
+	[[nodiscard]] bool valid() const {
+		return (kind != StructuralOwnerKind::None);
+	}
+};
+
+[[nodiscard]] StructuralOwner StructuralOwnerFromBlock(
+		const PreparedEditBlockSource &source) {
+	if (!ValidPreparedEditBlockPath(source.path)) {
+		return {};
+	}
+	return {
+		.kind = StructuralOwnerKind::Block,
+		.block = source,
+	};
+}
+
+[[nodiscard]] StructuralOwner StructuralOwnerFromListItem(
+		const PreparedEditListItemSource &source) {
+	if (!ValidPreparedEditBlockPath(source.block)
+		|| source.listItemIndex < 0) {
+		return {};
+	}
+	return {
+		.kind = StructuralOwnerKind::ListItem,
+		.block = PreparedEditBlockSourceFromPath(source.block),
+		.listItem = source,
+	};
+}
+
+[[nodiscard]] StructuralOwner StructuralOwnerFromTableRow(
+		const PreparedEditTableRowSource &source) {
+	if (!ValidPreparedEditBlockPath(source.block)
+		|| source.tableRowIndex < 0) {
+		return {};
+	}
+	return {
+		.kind = StructuralOwnerKind::TableRow,
+		.block = PreparedEditBlockSourceFromPath(source.block),
+		.tableRow = source,
+	};
+}
+
+[[nodiscard]] PreparedEditTableRowSource PreparedEditTableRowFromCell(
+		const PreparedEditTableCellSource &source) {
+	return {
+		.block = source.block,
+		.tableRowIndex = source.tableRowIndex,
+	};
+}
+
+[[nodiscard]] StructuralOwner StructuralOwnerFromTableCell(
+		const PreparedEditTableCellSource &source) {
+	if (!ValidPreparedEditBlockPath(source.block)
+		|| source.tableRowIndex < 0
+		|| source.tableCellIndex < 0
+		|| source.column < 0
+		|| source.colspan <= 0
+		|| source.rowspan <= 0) {
+		return {};
+	}
+	return {
+		.kind = StructuralOwnerKind::TableCell,
+		.block = PreparedEditBlockSourceFromPath(source.block),
+		.tableRow = PreparedEditTableRowFromCell(source),
+		.tableCell = source,
+	};
+}
+
+[[nodiscard]] StructuralOwner StructuralOwnerFromLeaf(
+		const PreparedEditLeafSource &source) {
+	if (!ValidPreparedEditBlockPath(source.block)) {
+		return {};
+	}
+	switch (source.kind) {
+	case PreparedEditLeafKind::ListItemText:
+		return StructuralOwnerFromListItem({
+			.block = source.block,
+			.listItemIndex = source.listItemIndex,
+		});
+	case PreparedEditLeafKind::TableCellText:
+		return {};
+	case PreparedEditLeafKind::BlockText:
+	case PreparedEditLeafKind::BlockCaption:
+	case PreparedEditLeafKind::MathFormula:
+		return StructuralOwnerFromBlock(
+			PreparedEditBlockSourceFromPath(source.block));
+	}
+	return {};
+}
+
+[[nodiscard]] StructuralOwner StructuralOwnerFromHit(
+		const PreparedEditHit &hit) {
+	if (!hit.valid()) {
+		return {};
+	}
+	switch (hit.kind) {
+	case PreparedEditHitKind::Block:
+		if (hit.block) {
+			return StructuralOwnerFromBlock(*hit.block);
+		}
+		break;
+	case PreparedEditHitKind::ListItem:
+		if (hit.listItem) {
+			return StructuralOwnerFromListItem(*hit.listItem);
+		}
+		break;
+	case PreparedEditHitKind::TableRow:
+		if (hit.tableRow) {
+			return StructuralOwnerFromTableRow(*hit.tableRow);
+		}
+		break;
+	case PreparedEditHitKind::TableCell:
+		if (hit.tableCell) {
+			return StructuralOwnerFromTableCell(*hit.tableCell);
+		}
+		break;
+	case PreparedEditHitKind::Leaf:
+		if (hit.leaf) {
+			return StructuralOwnerFromLeaf(*hit.leaf);
+		}
+		break;
+	case PreparedEditHitKind::None:
+		break;
+	}
+	return hit.leaf ? StructuralOwnerFromLeaf(*hit.leaf) : StructuralOwner();
+}
+
+[[nodiscard]] std::optional<PreparedEditTableCellSource> TableCellFromOwner(
+		const StructuralOwner &owner) {
+	return owner.tableCell;
+}
+
+[[nodiscard]] PreparedEditTableCellRange TableRangeFromCell(
+		const PreparedEditTableCellSource &source) {
+	if (source.tableRowIndex < 0
+		|| source.column < 0
+		|| source.rowspan <= 0
+		|| source.colspan <= 0) {
+		return {};
+	}
+	return {
+		.block = source.block,
+		.rowFrom = source.tableRowIndex,
+		.rowTill = source.tableRowIndex + source.rowspan,
+		.columnFrom = source.column,
+		.columnTill = source.column + source.colspan,
+	};
+}
+
+[[nodiscard]] bool SameTableRangeBlock(
+		const PreparedEditTableCellRange &a,
+		const PreparedEditTableCellRange &b) {
+	return !a.empty()
+		&& !b.empty()
+		&& SamePreparedEditBlockPath(a.block, b.block);
+}
+
+[[nodiscard]] bool TableRangeContainsCell(
+		const PreparedEditTableCellRange &range,
+		const PreparedEditTableCellSource &source) {
+	const auto cell = TableRangeFromCell(source);
+	return SameTableRangeBlock(range, cell)
+		&& (range.rowFrom <= cell.rowFrom)
+		&& (range.rowTill >= cell.rowTill)
+		&& (range.columnFrom <= cell.columnFrom)
+		&& (range.columnTill >= cell.columnTill);
+}
+
+[[nodiscard]] PreparedEditTableCellRange TableRangesUnion(
+		const PreparedEditTableCellRange &a,
+		const PreparedEditTableCellRange &b) {
+	if (!SameTableRangeBlock(a, b)) {
+		return {};
+	}
+	return {
+		.block = a.block,
+		.rowFrom = std::min(a.rowFrom, b.rowFrom),
+		.rowTill = std::max(a.rowTill, b.rowTill),
+		.columnFrom = std::min(a.columnFrom, b.columnFrom),
+		.columnTill = std::max(a.columnTill, b.columnTill),
+	};
+}
+
+[[nodiscard]] std::optional<PreparedEditTableRowSource> TableRowFromOwner(
+		const StructuralOwner &owner) {
+	return owner.tableRow;
+}
+
+[[nodiscard]] std::optional<PreparedEditListItemSource> ListItemFromOwner(
+		const StructuralOwner &owner) {
+	return owner.listItem;
+}
+
+[[nodiscard]] bool IsBlockOwner(const StructuralOwner &owner) {
+	return (owner.kind == StructuralOwnerKind::Block);
+}
+
+[[nodiscard]] std::optional<PreparedEditBlockPath> BlockPathFromOwner(
+		const StructuralOwner &owner) {
+	if (owner.kind == StructuralOwnerKind::Block && owner.block) {
+		return owner.block->path;
+	} else if (owner.kind == StructuralOwnerKind::ListItem
+		&& owner.listItem) {
+		return owner.listItem->block;
+	} else if (owner.kind == StructuralOwnerKind::TableRow
+		&& owner.tableRow) {
+		return owner.tableRow->block;
+	} else if (owner.kind == StructuralOwnerKind::TableCell
+		&& owner.tableCell) {
+		return owner.tableCell->block;
+	}
+	return std::nullopt;
+}
+
+struct LiftedPreparedEditBlocks {
+	PreparedEditBlockContainerPath container;
+	int first = -1;
+	int second = -1;
+};
+
+[[nodiscard]] PreparedEditBlockContainerPath PreparedEditBlockContainerPrefix(
+		const PreparedEditBlockContainerPath &path,
+		int count) {
+	auto result = PreparedEditBlockContainerPath();
+	const auto till = std::clamp(count, 0, int(path.steps.size()));
+	result.steps.insert(
+		result.steps.end(),
+		path.steps.begin(),
+		path.steps.begin() + till);
+	return result;
+}
+
+[[nodiscard]] int CommonPreparedEditBlockContainerSize(
+		const PreparedEditBlockContainerPath &a,
+		const PreparedEditBlockContainerPath &b) {
+	const auto common = std::min(a.steps.size(), b.steps.size());
+	for (auto i = size_t(); i != common; ++i) {
+		if (ComparePreparedEditBlockContainerSteps(
+				a.steps[i],
+				b.steps[i]) != 0) {
+			return int(i);
+		}
+	}
+	return int(common);
+}
+
+[[nodiscard]] int LiftedPreparedEditBlockIndex(
+		const PreparedEditBlockPath &path,
+		int commonContainerSize) {
+	if (commonContainerSize == int(path.container.steps.size())) {
+		return path.index;
+	} else if (commonContainerSize >= 0
+		&& commonContainerSize < int(path.container.steps.size())) {
+		return path.container.steps[commonContainerSize].blockIndex;
+	}
+	return -1;
+}
+
+[[nodiscard]] std::optional<LiftedPreparedEditBlocks>
+LiftPreparedEditBlocksToCommonContainer(
+		const PreparedEditBlockPath &a,
+		const PreparedEditBlockPath &b) {
+	if (!ValidPreparedEditBlockPath(a) || !ValidPreparedEditBlockPath(b)) {
+		return std::nullopt;
+	}
+	const auto common = CommonPreparedEditBlockContainerSize(
+		a.container,
+		b.container);
+	auto result = LiftedPreparedEditBlocks{
+		.container = PreparedEditBlockContainerPrefix(a.container, common),
+		.first = LiftedPreparedEditBlockIndex(a, common),
+		.second = LiftedPreparedEditBlockIndex(b, common),
+	};
+	if (result.first < 0 || result.second < 0) {
+		return std::nullopt;
+	}
+	return result;
+}
+
+[[nodiscard]] PreparedEditSelection LiftedBlockSelection(
+		const PreparedEditBlockPath &anchor,
+		const PreparedEditBlockPath &focus) {
+	const auto lifted = LiftPreparedEditBlocksToCommonContainer(anchor, focus);
+	if (!lifted) {
+		return {};
+	}
+	return BlockSelectionFromIndexes(
+		lifted->container,
+		lifted->first,
+		lifted->second);
+}
+
+[[nodiscard]] auto ListItemSourcesFromBlockPath(
+		const PreparedEditBlockPath &path)
+-> std::vector<PreparedEditListItemSource> {
+	auto result = std::vector<PreparedEditListItemSource>();
+	for (auto i = int(path.container.steps.size()); i != 0; --i) {
+		const auto stepIndex = i - 1;
+		const auto &step = path.container.steps[stepIndex];
+		if (step.kind != PreparedEditBlockContainerKind::ListItemChildren
+			|| step.blockIndex < 0
+			|| step.listItemIndex < 0) {
+			continue;
+		}
+		result.push_back({
+			.block = {
+				.container = PreparedEditBlockContainerPrefix(
+					path.container,
+					stepIndex),
+				.index = step.blockIndex,
+			},
+			.listItemIndex = step.listItemIndex,
+		});
+	}
+	return result;
+}
+
+[[nodiscard]] auto ListItemSourcesFromOwner(
+		const StructuralOwner &owner,
+		const std::optional<PreparedEditBlockPath> &block)
+-> std::vector<PreparedEditListItemSource> {
+	auto result = std::vector<PreparedEditListItemSource>();
+	if (const auto listItem = ListItemFromOwner(owner)) {
+		result.push_back(*listItem);
+	}
+	if (!block) {
+		return result;
+	}
+	for (const auto &source : ListItemSourcesFromBlockPath(*block)) {
+		if (std::find(result.begin(), result.end(), source) == result.end()) {
+			result.push_back(source);
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] PreparedEditSelection ListItemSelectionFromSources(
+		const std::vector<PreparedEditListItemSource> &anchorSources,
+		const std::vector<PreparedEditListItemSource> &focusSources) {
+	for (const auto &anchorListItem : anchorSources) {
+		for (const auto &focusListItem : focusSources) {
+			if (!SamePreparedEditBlockPath(
+					anchorListItem.block,
+					focusListItem.block)) {
+				continue;
+			}
+			const auto range = NormalizeIntegerRange(
+				anchorListItem.listItemIndex,
+				focusListItem.listItemIndex);
+			if (!range.empty()) {
+				return {
+					.kind = PreparedEditSelectionKind::ListItems,
+					.listItems = {
+						.block = anchorListItem.block,
+						.from = range.from,
+						.till = range.till,
+					},
+				};
+			}
+		}
+	}
+	return {};
+}
+
+[[nodiscard]] bool IsMultiListItemSelection(
+		const PreparedEditSelection &selection) {
+	return !selection.empty()
+		&& (selection.kind == PreparedEditSelectionKind::ListItems)
+		&& (selection.listItems.till > selection.listItems.from + 1);
+}
+
+[[nodiscard]] int FieldNaturalHeight(not_null<Ui::InputField*> field) {
+	const auto margins = field->fullTextMargins();
+	return std::max(
+		int(std::ceil(field->document()->size().height()))
+			+ margins.top()
+			+ margins.bottom(),
+		1);
+}
+
+[[nodiscard]] QPoint LocalPosition(QWheelEvent *e) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	return e->position().toPoint();
+#else // Qt >= 6.0
+	return e->pos();
+#endif // Qt >= 6.0
+}
+
+[[nodiscard]] QPoint GlobalPosition(QWheelEvent *e) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	return e->globalPosition().toPoint();
+#else // Qt >= 6.0
+	return e->globalPos();
+#endif // Qt >= 6.0
+}
+
+} // namespace
+
+Widget::Widget(
+	QWidget *parent,
+	WidgetServices services,
+	not_null<PeerData*> peer,
+	std::shared_ptr<State> state,
+	Fn<void(RichMessageLimitError)> showLimitToast)
+: Ui::RpWidget(parent)
+, _session(services.session)
+, _show(std::move(services.show))
+, _outer(services.outer)
+, _customEmojiPaused(std::move(services.customEmojiPaused))
+, _peer(peer)
+, _state(std::move(state))
+, _showLimitToast(std::move(showLimitToast))
+, _articleStyle(std::make_shared<style::Markdown>(
+	CreateEditorMarkdownStyle()))
+, _article(std::make_shared<Markdown::MarkdownArticle>(*_articleStyle))
+, _theme(CreateStandaloneChatTheme())
+, _style(std::make_unique<Ui::ChatStyle>(style::main_palette::get())) {
+	_style->apply(_theme.get());
+	_highlightColors = HighlightColors(_style.get());
+
+	setMouseTracking(true);
+	setAttribute(Qt::WA_AcceptTouchEvents);
+	setFocusPolicy(Qt::StrongFocus);
+	setAttribute(Qt::WA_InputMethodEnabled);
+
+	std::move(services.imeCompositionStarts) | rpl::filter([=] {
+		return redirectImeToField();
+	}) | rpl::on_next([=] {
+		if (prepareFieldForInput()) {
+			_field->setFocusFast();
+		}
+	}, lifetime());
+
+	Spellchecker::HighlightReady(
+	) | rpl::on_next([=](Spellchecker::HighlightProcessId processId) {
+		if (_article && _article->highlightProcessDone(processId)) {
+			update();
+		}
+	}, _highlightReadyLifetime);
+
+	const auto weak = QPointer<Widget>(this);
+	_article->setTextRepaintCallbacks(
+		[=] {
+			if (weak) {
+				weak->update();
+			}
+		},
+		[=](QRect rect) {
+			if (!weak) {
+				return;
+			} else if (rect.isEmpty()) {
+				weak->update();
+			} else {
+				weak->update(rect.translated(weak->articleTopLeft()));
+			}
+		});
+
+	const auto &fieldStyle = inlineFieldStyleFor(
+		Markdown::MarkdownArticleTextLeafStyle());
+	_activeFieldStyleKey = fieldStyle.key;
+	_field = base::make_unique_q<Ui::InputField>(
+		this,
+		*fieldStyle.style,
+		Ui::InputField::Mode::MultiLine,
+		rpl::single(QString()));
+	setupInlineField();
+	refreshPreparedContent();
+	_history.push_back(captureHistoryEntry());
+	_historyIndex = 0;
+}
+
+void Widget::activateInitialNode() {
+	const auto ordinal = (_activeOrdinal >= 0)
+		? _activeOrdinal
+		: _state->activeTextOrdinal();
+	if (ordinal < 0) {
+		const auto first = _article->firstEditableSegmentIndex();
+		const auto fallback = editableOrdinalForSegment(first);
+		if (fallback < 0) {
+			return;
+		}
+		activateTextOrdinal(fallback, 0);
+		return;
+	}
+	activateTextOrdinal(ordinal, 0);
+}
+
+void Widget::activateSegment(int segmentIndex, int cursorOffset) {
+	const auto ordinal = editableOrdinalForSegment(segmentIndex);
+	if (ordinal < 0) {
+		return;
+	}
+	activateTextOrdinal(ordinal, cursorOffset);
+}
+
+bool Widget::prepareFieldForInput() {
+	if (hasStructuralSelection()) {
+		if (const auto target = removeCurrentStructuralSelection(true)) {
+			activateTextOrdinal(*target, 0);
+		} else {
+			activateInitialNode();
+		}
+	} else if (_field->isHidden()) {
+		activateInitialNode();
+	}
+	return !_field->isHidden();
+}
+
+bool Widget::replayKeyIntoField(QKeyEvent *e) {
+	if (!RedirectTextToField(e->text()) || !prepareFieldForInput()) {
+		return false;
+	}
+	_field->setFocusFast();
+	QCoreApplication::sendEvent(_field->rawTextEdit(), e);
+	return true;
+}
+
+bool Widget::replayImeIntoField(QInputMethodEvent *e) {
+	const auto cursor = _field->rawTextEdit()->textCursor();
+	if (!ImeEventProducesInput(*e, cursor) || !prepareFieldForInput()) {
+		return false;
+	}
+	_field->setFocusFast();
+	QCoreApplication::sendEvent(_field->rawTextEdit(), e);
+	return true;
+}
+
+ApplyResult Widget::commitInlineField() {
+	const auto result = applyFieldTextToState();
+	if (result != ApplyResult::Failed) {
+		return result;
+	}
+	revertInlineFieldToState();
+	showLastLimitToast();
+	return result;
+}
+
+void Widget::hideInlineFieldAndRefresh() {
+	if (_field->isHidden()) {
+		return;
+	}
+	const auto committed = recordMutationTransaction([&] {
+		const auto committed = commitInlineField();
+		_pendingOrdinal = -1;
+		_pendingCursorOffset = 0;
+		hideInlineField();
+		clearInlineFieldEditSession();
+		return committed;
+	});
+	refreshAfterInlineFieldCommit(committed);
+}
+
+void Widget::acceptInlineField() {
+	hideInlineFieldAndRefresh();
+}
+
+void Widget::refreshPreparedContent() {
+	setDocument(_state->prepared());
+	relayoutCurrentContent();
+}
+
+void Widget::refreshPreparedLeafAtActiveSource() {
+	if (const auto source = _state->activePreparedLeafSource()) {
+		_article->updatePreparedLeaf(*source, _state->prepared());
+		relayoutCurrentContent();
+	} else {
+		refreshPreparedContent();
+	}
+}
+
+void Widget::applyExternalRichPageMutation(Fn<bool(RichPage&)> mutation) {
+	if (!mutation) {
+		return;
+	}
+	auto live = captureHistoryEntry();
+	for (auto &entry : _history) {
+		if (!mutation(entry.snapshot.richPage)) {
+			return;
+		}
+	}
+	if (!mutation(live.snapshot.richPage)) {
+		return;
+	}
+	const auto wasPreservingExternalFieldRestore
+		= PreservingExternalFieldRestore;
+	PreservingExternalFieldRestore = this;
+	const auto preserveExternalFieldRestore = gsl::finally([&] {
+		PreservingExternalFieldRestore = wasPreservingExternalFieldRestore;
+	});
+	restoreHistoryEntry(live);
+	_fieldUndoAvailable = !_field->isHidden()
+		? _field->isUndoAvailable()
+		: false;
+	_fieldRedoAvailable = !_field->isHidden()
+		? _field->isRedoAvailable()
+		: false;
+}
+
+void Widget::relayoutCurrentContent() {
+	const auto width = std::max(
+		widthNoMargins(),
+		parentWidget() ? parentWidget()->width() : 0);
+	if (width > 0) {
+		resizeToWidth(width);
+	} else {
+		update();
+	}
+}
+
+void Widget::syncInlineFieldGeometry() {
+	syncInlineFieldGeometry(widthNoMargins());
+}
+
+void Widget::insertBlock(State::InsertAction action) {
+	recordMutationTransaction([&] {
+		const auto context = activeTextInsertContext();
+		auto committed = ApplyResult::Unchanged;
+		if (!context && !_field->isHidden()) {
+			committed = commitInlineField();
+			if (committed == ApplyResult::Failed) {
+				return MutationTransactionResult{
+					.committed = committed,
+					.failed = true,
+				};
+			}
+		}
+		const auto hadStructuralSelection = hasStructuralSelection();
+		const auto restoreField = context.has_value();
+		if (hadStructuralSelection || restoreField) {
+			_pendingOrdinal = -1;
+			_pendingCursorOffset = 0;
+			hideInlineField();
+			clearInlineFieldEditSession();
+		}
+		auto restore = restoreField;
+		const auto restoreInlineField = gsl::finally([&] {
+			if (!restore) {
+				return;
+			}
+			_field->show();
+			syncInlineFieldGeometry();
+			updateInlineFieldHeightOverride();
+			syncArticleVisibleTopBottom();
+			revealActiveInlineField();
+			_field->raise();
+			_field->setFocusFast();
+		});
+		const auto applied = hadStructuralSelection
+			? _state->replaceStructuralSelectionWithBlock(
+				_structuralSelection,
+				action,
+				context)
+			: _state->insertBlockAfterActive(action, context);
+		if (!applied) {
+			showLastLimitToast();
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = (committed == ApplyResult::Changed),
+			};
+		}
+		restore = false;
+		if (hadStructuralSelection) {
+			clearSelection();
+		}
+		refreshPreparedContent();
+		activateTextOrdinal(_state->activeTextOrdinal(), 0);
+		return MutationTransactionResult{
+			.committed = committed,
+			.changed = true,
+		};
+	});
+}
+
+void Widget::insertPreparedBlock(RichPage::Block block) {
+	auto blocks = std::vector<RichPage::Block>();
+	blocks.push_back(std::move(block));
+	insertPreparedBlocks(std::move(blocks));
+}
+
+void Widget::insertPreparedBlocks(std::vector<RichPage::Block> blocks) {
+	if (blocks.empty()) {
+		return;
+	}
+	recordMutationTransaction([&] {
+		const auto context = activeTextInsertContext();
+		auto committed = ApplyResult::Unchanged;
+		if (!context && !_field->isHidden()) {
+			committed = commitInlineField();
+			if (committed == ApplyResult::Failed) {
+				return MutationTransactionResult{
+					.committed = committed,
+					.failed = true,
+				};
+			}
+		}
+		const auto hadStructuralSelection = hasStructuralSelection();
+		const auto restoreField = context.has_value();
+		if (hadStructuralSelection || restoreField) {
+			_pendingOrdinal = -1;
+			_pendingCursorOffset = 0;
+			hideInlineField();
+			clearInlineFieldEditSession();
+		}
+		auto restore = restoreField;
+		const auto restoreInlineField = gsl::finally([&] {
+			if (!restore) {
+				return;
+			}
+			_field->show();
+			syncInlineFieldGeometry();
+			updateInlineFieldHeightOverride();
+			syncArticleVisibleTopBottom();
+			revealActiveInlineField();
+			_field->raise();
+			_field->setFocusFast();
+		});
+		const auto applied = hadStructuralSelection
+			? _state->replaceStructuralSelectionWithPreparedBlocks(
+				_structuralSelection,
+				std::move(blocks),
+				context)
+			: _state->insertPreparedBlocksAfterActive(
+				std::move(blocks),
+				context);
+		if (!applied) {
+			showLastLimitToast();
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = (committed == ApplyResult::Changed),
+			};
+		}
+		restore = false;
+		if (hadStructuralSelection) {
+			clearSelection();
+		}
+		refreshPreparedContent();
+		activateTextOrdinal(_state->activeTextOrdinal(), 0);
+		return MutationTransactionResult{
+			.committed = committed,
+			.changed = true,
+		};
+	});
+}
+
+TextForMimeData Widget::currentSelectionTextForClipboard() const {
+	return _article
+		? _article->textForSelection(
+			_selection,
+			&_selectionEndpoints,
+			hasStructuralSelection() ? &_structuralSelection : nullptr)
+		: TextForMimeData();
+}
+
+void Widget::copyCurrentSelectionToClipboard() {
+	auto structured = std::optional<ClipboardData>();
+	if (hasStructuralSelection()) {
+		structured = _state->structuredClipboardDataForSelection(
+			_structuralSelection);
+	}
+	const auto text = currentSelectionTextForClipboard();
+	auto mimeData = structured
+		? MimeDataFromClipboardData(*structured)
+		: TextUtilities::MimeDataFromText(text);
+	if (!mimeData) {
+		return;
+	}
+	if (structured) {
+		if (const auto textMimeData = TextUtilities::MimeDataFromText(text)) {
+			for (const auto &format : textMimeData->formats()) {
+				mimeData->setData(format, textMimeData->data(format));
+			}
+		}
+	}
+	QApplication::clipboard()->setMimeData(mimeData.release());
+}
+
+void Widget::pasteStructuredClipboardData(const ClipboardData &data) {
+	const auto blocks = std::get_if<ClipboardBlockData>(&data);
+	const auto items = std::get_if<ClipboardListItemsData>(&data);
+	if (blocks) {
+		if (blocks->blocks.empty()) {
+			return;
+		}
+	} else if (!items || items->items.empty()) {
+		return;
+	}
+	recordMutationTransaction([&] {
+		const auto context = ClipboardPasteInsertContext(
+			activeTextInsertContext());
+		auto committed = ApplyResult::Unchanged;
+		if (!context && !_field->isHidden()) {
+			committed = commitInlineField();
+			if (committed == ApplyResult::Failed) {
+				return MutationTransactionResult{
+					.committed = committed,
+					.failed = true,
+				};
+			}
+		}
+		const auto hadStructuralSelection = hasStructuralSelection();
+		const auto restoreField = context.has_value();
+		if (hadStructuralSelection || restoreField) {
+			_pendingOrdinal = -1;
+			_pendingCursorOffset = 0;
+			hideInlineField();
+			clearInlineFieldEditSession();
+		}
+		auto restore = restoreField;
+		const auto restoreInlineField = gsl::finally([&] {
+			if (!restore) {
+				return;
+			}
+			_field->show();
+			syncInlineFieldGeometry();
+			updateInlineFieldHeightOverride();
+			syncArticleVisibleTopBottom();
+			revealActiveInlineField();
+			_field->raise();
+			_field->setFocusFast();
+		});
+		const auto applied = hadStructuralSelection
+			? (blocks
+				? _state->replaceStructuralSelectionWithPreparedBlocks(
+					_structuralSelection,
+					blocks->blocks,
+					context)
+				: _state->replaceStructuralSelectionWithClipboardListItems(
+					_structuralSelection,
+					*items,
+					context))
+			: (blocks
+				? _state->insertPreparedBlocksAfterActive(
+					blocks->blocks,
+					context)
+				: _state->pasteClipboardListItemsAfterActive(
+					*items,
+					context));
+		if (!applied) {
+			showLastLimitToast();
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = (committed == ApplyResult::Changed),
+			};
+		}
+		restore = false;
+		if (hadStructuralSelection) {
+			clearSelection();
+		}
+		refreshPreparedContent();
+		activateTextOrdinal(_state->activeTextOrdinal(), 0);
+		return MutationTransactionResult{
+			.committed = committed,
+			.changed = true,
+		};
+	});
+}
+
+bool Widget::handleClipboardKey(QKeyEvent *e) {
+	if (e == QKeySequence::Copy) {
+		if (_selection.empty() && !hasStructuralSelection()) {
+			return false;
+		}
+		copyCurrentSelectionToClipboard();
+		e->accept();
+		return true;
+	} else if ((e == QKeySequence::Paste) && _field->isHidden()) {
+		if (const auto data = ClipboardDataFromMimeData(
+				QApplication::clipboard()->mimeData())) {
+			pasteStructuredClipboardData(*data);
+			e->accept();
+			return true;
+		} else if (prepareFieldForInput()) {
+			_field->setFocusFast();
+			QCoreApplication::sendEvent(_field->rawTextEdit(), e);
+			e->accept();
+			return true;
+		}
+	}
+	return false;
+}
+
+void Widget::truncateHistoryRedo() {
+	if ((_historyIndex < 0) || (_historyIndex >= int(_history.size()))) {
+		return;
+	}
+	const auto next = _history.begin() + _historyIndex + 1;
+	if (next != _history.end()) {
+		_history.erase(next, _history.end());
+		removeRetainedLeafFieldsAfter(_historyIndex);
+	}
+}
+
+bool Widget::canPerformFieldUndoRedo(bool redo) const {
+	if (_field->isHidden()) {
+		return false;
+	}
+	const auto document = _field->rawTextEdit()->document();
+	const auto steps = redo
+		? document->availableRedoSteps()
+		: document->availableUndoSteps();
+	const auto localRedoAvailable = (document->availableRedoSteps() > 0)
+		|| _fieldRedoAvailable
+		|| _field->isRedoAvailable();
+	if (!redo
+		&& localRedoAvailable
+		&& activeInlineFieldTextMatchesState()) {
+		return false;
+	}
+	const auto available = (steps > 0)
+		|| (redo
+			? (_fieldRedoAvailable || _field->isRedoAvailable())
+			: (_fieldUndoAvailable || _field->isUndoAvailable()));
+	if (!available) {
+		return false;
+	}
+	const auto &noopState = redo
+		? _fieldRedoNoopState
+		: _fieldUndoNoopState;
+	return !noopState || (_field->getTextWithTags() != *noopState);
+}
+
+bool Widget::activeInlineFieldTextMatchesState() const {
+	if (_field->isHidden() || !_fieldLeaf) {
+		return false;
+	}
+	const auto activeLeaf = _state->activeLeafPath();
+	if (!activeLeaf || (*activeLeaf != *_fieldLeaf)) {
+		return false;
+	}
+	const auto trimLeft = !_state->codeBlockLanguage(
+		_state->activeTextOrdinal()).has_value();
+	if (_state->activeFieldMode() == State::FieldMode::Raw) {
+		return _field->getTextWithTags() == TrimInlineFieldText(
+			{ _state->activeRawText(), {} },
+			trimLeft).text;
+	}
+	const auto activeText = ConvertRichTextToEditorTags(_state->activeText());
+	return _field->getTextWithTags() == TrimInlineFieldText(
+		activeText.text,
+		trimLeft).text;
+}
+
+bool Widget::canPerformHistoryUndoRedo(bool redo) const {
+	if ((_historyIndex < 0) || (_historyIndex >= int(_history.size()))) {
+		return false;
+	}
+	return redo
+		? (_historyIndex + 1 < int(_history.size()))
+		: (_historyIndex > 0);
+}
+
+bool Widget::canPerformUndoRedo(bool redo) const {
+	return canPerformFieldUndoRedo(redo) || canPerformHistoryUndoRedo(redo);
+}
+
+bool Widget::handleUndoRedoShortcut(QKeyEvent *e) {
+	auto redo = std::optional<bool>();
+	if (e == QKeySequence::Undo) {
+		redo = false;
+	} else if (e == QKeySequence::Redo) {
+		redo = true;
+	}
+	if (!redo) {
+		return false;
+	}
+	const auto redoValue = *redo;
+	if (canPerformFieldUndoRedo(redoValue)) {
+		if (performFieldUndoRedo(redoValue)) {
+			e->accept();
+			return true;
+		}
+	}
+	if (canPerformHistoryUndoRedo(redoValue)) {
+		crl::on_main(this, [=] {
+			performUndoRedo(redoValue, false);
+		});
+	}
+	e->accept();
+	return true;
+}
+
+bool Widget::handleSelectAllShortcut(QKeyEvent *e) {
+	if (e != QKeySequence::SelectAll) {
+		return false;
+	}
+	if (!_field->isHidden()) {
+		const auto committed = recordMutationTransaction([&] {
+			const auto committed = commitInlineField();
+			if (committed != ApplyResult::Failed) {
+				_pendingOrdinal = -1;
+				_pendingCursorOffset = 0;
+				hideInlineField();
+				clearInlineFieldEditSession();
+			}
+			return committed;
+		});
+		if (committed == ApplyResult::Failed) {
+			e->accept();
+			return true;
+		}
+		refreshAfterInlineFieldCommit(committed);
+	}
+	const auto blockCount = int(_state->richPage().blocks.size());
+	_selection = {};
+	_selectionEndpoints = {};
+	_articleSelectionDrag = {};
+	setStructuralSelection(blockCount > 0
+		? BlockSelectionFromIndexes(
+			PreparedEditBlockContainerPath(),
+			0,
+			blockCount - 1)
+		: PreparedEditSelection());
+	setFocus();
+	update();
+	e->accept();
+	return true;
+}
+
+bool Widget::performFieldUndoRedo(bool redo) {
+	if (!canPerformFieldUndoRedo(redo)) {
+		return false;
+	}
+	const auto before = _field->getTextWithTags();
+	const auto wasPerformingUndoRedo = _performingUndoRedo;
+	_performingUndoRedo = true;
+	const auto guard = gsl::finally([&] {
+		_performingUndoRedo = wasPerformingUndoRedo;
+	});
+	if (redo) {
+		_field->redo();
+	} else {
+		_field->undo();
+	}
+	if (_field->isHidden()) {
+		return false;
+	}
+	const auto document = _field->rawTextEdit()->document();
+	_fieldUndoAvailable = (document->availableUndoSteps() > 0)
+		|| _field->isUndoAvailable();
+	_fieldRedoAvailable = (document->availableRedoSteps() > 0)
+		|| _field->isRedoAvailable();
+	const auto after = _field->getTextWithTags();
+	if (after != before) {
+		clearFieldUndoRedoNoopState();
+		return true;
+	}
+	if (redo) {
+		_fieldRedoNoopState = after;
+	} else {
+		_fieldUndoNoopState = after;
+	}
+	return false;
+}
+
+void Widget::performUndoRedo(bool redo, bool allowFieldLocal) {
+	if (allowFieldLocal && performFieldUndoRedo(redo)) {
+		return;
+	}
+	if (!canPerformHistoryUndoRedo(redo)) {
+		return;
+	}
+	const auto nextIndex = _historyIndex + (redo ? 1 : -1);
+	if ((nextIndex < 0) || (nextIndex >= int(_history.size()))) {
+		return;
+	}
+	const auto previousIndex = _historyIndex;
+	const auto wasPerformingUndoRedo = _performingUndoRedo;
+	_performingUndoRedo = true;
+	const auto guard = gsl::finally([&] {
+		_performingUndoRedo = wasPerformingUndoRedo;
+	});
+	const auto wasRetainingFieldHistoryIndexOverride
+		= _retainingFieldHistoryIndexOverride;
+	_retainingFieldHistoryIndexOverride = previousIndex;
+	const auto retainingFieldHistoryIndexOverride = gsl::finally([&] {
+		_retainingFieldHistoryIndexOverride
+			= wasRetainingFieldHistoryIndexOverride;
+	});
+	retainActiveLeafField();
+	_historyIndex = nextIndex;
+	const auto wasRestoringHistoryRedo = _restoringHistoryRedo;
+	_restoringHistoryRedo = redo;
+	const auto restoringHistoryRedo = gsl::finally([&] {
+		_restoringHistoryRedo = wasRestoringHistoryRedo;
+	});
+	restoreHistoryEntry(_history[_historyIndex]);
+	_fieldUndoAvailable = !_field->isHidden()
+		? _field->isUndoAvailable()
+		: false;
+	_fieldRedoAvailable = !_field->isHidden()
+		? _field->isRedoAvailable()
+		: false;
+	clearFieldUndoRedoNoopState();
+}
+
+void Widget::clearFieldUndoRedoNoopState() {
+	_fieldUndoNoopState = std::nullopt;
+	_fieldRedoNoopState = std::nullopt;
+}
+
+void Widget::insertHeading1() {
+	insertBlock({
+		.type = State::InsertBlockType::Heading,
+		.headingLevel = 1,
+	});
+}
+
+void Widget::insertBlockquote() {
+	insertBlock({ .type = State::InsertBlockType::Blockquote });
+}
+
+void Widget::insertEmoji(EmojiPtr emoji) {
+	if (!emoji || !prepareFieldForInput()) {
+		return;
+	}
+	_field->setFocusFast();
+	Ui::InsertEmojiAtCursor(_field->textCursor(), emoji);
+}
+
+void Widget::insertCustomEmoji(not_null<DocumentData*> document) {
+	if (!prepareFieldForInput()) {
+		return;
+	}
+	_field->setFocusFast();
+	Data::InsertCustomEmoji(_field.get(), document);
+}
+
+void Widget::setInlineFieldExternalInteractionActive(bool active) {
+	_inlineFieldExternalInteractionActive = active;
+}
+
+int Widget::resizeGetHeight(int newWidth) {
+	if (!_article) {
+		return 1;
+	}
+	const auto width = std::max(newWidth, 1);
+	const auto padding = EditorBodyPadding();
+	_articleHeight = _article->resizeGetHeight(articleWidth(width));
+	syncArticleVisibleTopBottom();
+	ensurePendingActivation();
+	syncInlineFieldGeometry(width);
+	const auto fieldBottom = !_field->isHidden()
+		? (_field->y() + _field->height())
+		: 0;
+	return std::max(
+		std::max(
+			_articleHeight + padding.top() + padding.bottom(),
+			fieldBottom),
+		st::ivEditorMinHeight);
+}
+
+void Widget::visibleTopBottomUpdated(int visibleTop, int visibleBottom) {
+	_visibleRange = Ui::VisibleRange{
+		.top = visibleTop,
+		.bottom = visibleBottom,
+	};
+	syncArticleVisibleTopBottom();
+}
+
+bool Widget::eventFilter(QObject *object, QEvent *event) {
+	if (_field) {
+		const auto raw = _field->rawTextEdit();
+		if (object == raw.get() || object == raw->viewport()) {
+			const auto type = event->type();
+			if (type == QEvent::Wheel) {
+				if (_article && _activeSegmentIndex >= 0) {
+					const auto wheel = static_cast<QWheelEvent*>(event);
+					auto articlePoint = std::optional<QPoint>();
+					if (const auto widget = qobject_cast<QWidget*>(object)) {
+						articlePoint = widget->mapTo(this, LocalPosition(wheel))
+							- articleTopLeft();
+					} else {
+						articlePoint = mapFromGlobal(GlobalPosition(wheel))
+							- articleTopLeft();
+					}
+					if (!articlePoint) {
+						const auto segmentRect = _article->segmentRect(
+							_activeSegmentIndex);
+						if (!segmentRect.isEmpty()) {
+							articlePoint = segmentRect.center();
+						}
+					}
+					if (articlePoint
+						&& handleHorizontalScrollWheel(wheel, *articlePoint)) {
+						return true;
+					}
+				}
+			} else if (type == QEvent::KeyPress) {
+				const auto keyEvent = static_cast<QKeyEvent*>(event);
+				if (handleUndoRedoShortcut(keyEvent)
+					|| handleSelectAllShortcut(keyEvent)
+					|| handleTabNavigation(keyEvent)
+					|| handleStructuralSelectionKey(keyEvent)
+					|| handleFieldKey(keyEvent)) {
+					return true;
+				}
+			} else if ((type == QEvent::MouseButtonPress
+				|| type == QEvent::MouseMove
+				|| type == QEvent::MouseButtonRelease)
+				&& handleFieldMouseEvent(event)) {
+				return true;
+			}
+		}
+	}
+	return Ui::RpWidget::eventFilter(object, event);
+}
+
+bool Widget::eventHook(QEvent *e) {
+	if (e->type() == QEvent::TouchBegin
+		|| e->type() == QEvent::TouchUpdate
+		|| e->type() == QEvent::TouchEnd
+		|| e->type() == QEvent::TouchCancel) {
+		auto *ev = static_cast<QTouchEvent*>(e);
+		if (ev->device()->type() == base::TouchDevice::TouchScreen) {
+			const auto active = (_horizontalScrollDrag
+				== HorizontalScrollDrag::Touch);
+			touchEvent(ev);
+			if (active
+				|| (_horizontalScrollDrag == HorizontalScrollDrag::Touch)) {
+				return true;
+			}
+		}
+	}
+	return Ui::RpWidget::eventHook(e);
+}
+
+void Widget::contextMenuEvent(QContextMenuEvent *e) {
+	if (!_article) {
+		Ui::RpWidget::contextMenuEvent(e);
+		return;
+	}
+	const auto articlePoint = e->pos() - articleTopLeft();
+	const auto editHit = _article->editHitTest(articlePoint);
+	const auto owner = StructuralOwnerFromHit(editHit);
+	const auto cell = TableCellFromOwner(owner);
+	if (!cell) {
+		Ui::RpWidget::contextMenuEvent(e);
+		return;
+	}
+	const auto range = effectiveTableRangeForCell(*cell);
+	if (range.empty()) {
+		Ui::RpWidget::contextMenuEvent(e);
+		return;
+	}
+	showTableContextMenu(range, e->globalPos());
+	e->accept();
+}
+
+void Widget::focusInEvent(QFocusEvent *e) {
+	Ui::RpWidget::focusInEvent(e);
+	if (!_settingField && !_field->isHidden()) {
+		_field->setFocusFast();
+	}
+}
+
+bool Widget::focusNextPrevChild(bool next) {
+	if (hasFocus() && _field->isHidden() && moveTabBoundary(next)) {
+		return true;
+	}
+	return Ui::RpWidget::focusNextPrevChild(next);
+}
+
+void Widget::keyPressEvent(QKeyEvent *e) {
+	if (handleUndoRedoShortcut(e)) {
+		return;
+	} else if (handleSelectAllShortcut(e)) {
+		return;
+	} else if (handleClipboardKey(e)) {
+		return;
+	} else if (handleStructuralSelectionKey(e)) {
+		return;
+	} else if (_field->isHidden() && handleTabNavigation(e)) {
+		return;
+	} else if (redirectKeyToField(e) && replayKeyIntoField(e)) {
+		e->accept();
+		return;
+	}
+	Ui::RpWidget::keyPressEvent(e);
+}
+
+bool Widget::handleHorizontalScrollWheel(
+		QWheelEvent *e,
+		QPoint articlePoint) {
+	const auto phase = e->phase();
+	if (phase == Qt::NoScrollPhase) {
+		_horizontalScrollLock = std::nullopt;
+	} else if (phase == Qt::ScrollBegin) {
+		_horizontalScrollLock = std::nullopt;
+	}
+	if (!_article) {
+		return false;
+	}
+	const auto delta = Ui::ScrollDeltaF(e);
+	const auto horizontal = (std::abs(delta.x()) > std::abs(delta.y()));
+	if (phase != Qt::NoScrollPhase
+		&& phase != Qt::ScrollBegin
+		&& !_horizontalScrollLock) {
+		_horizontalScrollLock = horizontal ? Qt::Horizontal : Qt::Vertical;
+	}
+	if (!_article->horizontalScrollHit(articlePoint).scrollable) {
+		return false;
+	}
+	if (horizontal) {
+		if (_horizontalScrollLock == Qt::Vertical) {
+			return false;
+		}
+		if (_article->consumeHorizontalScroll(
+				articlePoint,
+				int(std::round(delta.x())))) {
+			syncInlineFieldGeometry();
+		}
+		e->accept();
+		return true;
+	}
+	if (_horizontalScrollLock == Qt::Horizontal) {
+		e->accept();
+		return true;
+	}
+	return false;
+}
+
+std::optional<PreparedEditTableCellSource> Widget::activeTableCellSourceAt(
+		QObject *object,
+		const QContextMenuEvent &e) const {
+	if (!_article || _activeSegmentIndex < 0) {
+		return std::nullopt;
+	}
+	const auto cellAt = [&](QPoint articlePoint) {
+		const auto owner = StructuralOwnerFromHit(
+			_article->editHitTest(articlePoint));
+		return TableCellFromOwner(owner);
+	};
+	if (const auto widget = qobject_cast<QWidget*>(object)) {
+		if (const auto cell = cellAt(
+				widget->mapTo(this, e.pos()) - articleTopLeft())) {
+			return cell;
+		}
+	}
+	const auto segmentRect = _article->segmentRect(_activeSegmentIndex);
+	return !segmentRect.isEmpty()
+		? cellAt(segmentRect.center())
+		: std::optional<PreparedEditTableCellSource>();
+}
+
+void Widget::handleFieldContextMenuRequest(
+		Ui::InputField::ContextMenuRequest request) {
+	const auto cell = activeTableCellSourceAt(
+		_field->rawTextEdit().get(),
+		*request.event);
+	if (!cell) {
+		return;
+	}
+	const auto range = effectiveTableRangeForCell(*cell);
+	if (range.empty() || !_state->tableSelectionInfo(range).valid) {
+		return;
+	}
+	request.customizePopupMenu([=](not_null<Ui::PopupMenu*> popup) {
+		const auto popupMenu = popup->menu();
+		const auto action = new QAction(
+			tr::lng_article_table_change(tr::now),
+			popupMenu.get());
+		action->setMenu(new QMenu(popupMenu.get()));
+		popup->insertAction(
+			0,
+			base::make_unique_q<Ui::Menu::Action>(
+				popupMenu,
+				popupMenu->st(),
+				action,
+				nullptr,
+				nullptr));
+		const auto separator = new QAction(popupMenu.get());
+		separator->setSeparator(true);
+		popup->insertAction(
+			1,
+			base::make_unique_q<Ui::Menu::Separator>(
+				popupMenu,
+				popupMenu->st(),
+				popupMenu->st().separator,
+				separator));
+		const auto submenu = popup->ensureSubmenu(
+			action,
+			st::popupMenuWithIcons);
+		fillTableChangeMenu(submenu, range);
+	});
+}
+
+PreparedEditTableCellRange Widget::effectiveTableRangeForCell(
+		const PreparedEditTableCellSource &source) {
+	const auto single = TableRangeFromCell(source);
+	if (single.empty()) {
+		return {};
+	}
+	if (const auto selected = _state->tableContextRangeForSelection(
+			_structuralSelection,
+			source)) {
+		return *selected;
+	}
+	clearSelection();
+	return single;
+}
+
+void Widget::showTableContextMenu(
+		const PreparedEditTableCellRange &range,
+		QPoint globalPos) {
+	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+		this,
+		st::popupMenuWithIcons);
+	fillTableChangeMenu(menu, range);
+	if (menu->empty()) {
+		menu->deleteLater();
+		return;
+	}
+	menu->popup(globalPos);
+}
+
+void Widget::fillTableChangeMenu(
+		not_null<Ui::PopupMenu*> menu,
+		const PreparedEditTableCellRange &range) {
+	const auto info = _state->tableSelectionInfo(range);
+	if (!info.valid) {
+		return;
+	}
+	menu->addAction(
+		tr::lng_article_table_add_row(tr::now),
+		[=] {
+			applyTableChange([=] {
+				return _state->addTableRow(range, false);
+			});
+		},
+		&st::menuIconTableSubmenuRowAbove);
+	menu->addAction(
+		tr::lng_article_table_add_row(tr::now),
+		[=] {
+			applyTableChange([=] {
+				return _state->addTableRow(range, true);
+			});
+		},
+		&st::menuIconTableSubmenuRowBelow);
+	menu->addAction(
+		tr::lng_article_table_add_column(tr::now),
+		[=] {
+			applyTableChange([=] {
+				return _state->addTableColumn(range, false);
+			});
+		},
+		&st::menuIconTableSubmenuColumnLeft);
+	menu->addAction(
+		tr::lng_article_table_add_column(tr::now),
+		[=] {
+			applyTableChange([=] {
+				return _state->addTableColumn(range, true);
+			});
+		},
+		&st::menuIconTableSubmenuColumnRight);
+	menu->addSeparator();
+	Menu::AddCheckedAction(
+		menu,
+		tr::lng_article_table_header(tr::now),
+		[=] {
+			applyTableChange([=] {
+				return _state->setTableHeader(range, !info.allHeader);
+			});
+		},
+		nullptr,
+		info.allHeader);
+	menu->addSeparator();
+	Menu::AddCheckedAction(
+		menu,
+		tr::lng_article_table_align_center(tr::now),
+		[=] {
+			applyTableChange([=] {
+				return _state->setTableAlignment(
+					range,
+					info.allAlignCenter
+						? RichPage::TableAlignment::Left
+						: RichPage::TableAlignment::Center);
+			});
+		},
+		nullptr,
+		info.allAlignCenter);
+	Menu::AddCheckedAction(
+		menu,
+		tr::lng_article_table_align_right(tr::now),
+		[=] {
+			applyTableChange([=] {
+				return _state->setTableAlignment(
+					range,
+					info.allAlignRight
+						? RichPage::TableAlignment::Left
+						: RichPage::TableAlignment::Right);
+			});
+		},
+		nullptr,
+		info.allAlignRight);
+	menu->addSeparator();
+	Menu::AddCheckedAction(
+		menu,
+		tr::lng_article_table_align_middle(tr::now),
+		[=] {
+			applyTableChange([=] {
+				return _state->setTableVerticalAlignment(
+					range,
+					info.allAlignMiddle
+						? RichPage::TableVerticalAlignment::Top
+						: RichPage::TableVerticalAlignment::Middle);
+			});
+		},
+		nullptr,
+		info.allAlignMiddle);
+	Menu::AddCheckedAction(
+		menu,
+		tr::lng_article_table_align_bottom(tr::now),
+		[=] {
+			applyTableChange([=] {
+				return _state->setTableVerticalAlignment(
+					range,
+					info.allAlignBottom
+						? RichPage::TableVerticalAlignment::Top
+						: RichPage::TableVerticalAlignment::Bottom);
+			});
+		},
+		nullptr,
+		info.allAlignBottom);
+	if (info.canSplitCell) {
+		menu->addSeparator();
+		menu->addAction(
+			tr::lng_article_table_split_cell(tr::now),
+			[=] {
+				applyTableChange([=] {
+					return _state->splitTableCell(range);
+				});
+			});
+	} else if (info.canUniteCells) {
+		menu->addSeparator();
+		menu->addAction(
+			tr::lng_article_table_unite_cells(tr::now),
+			[=] {
+				applyTableChange([=] {
+					return _state->uniteTableCells(range);
+				});
+			});
+	}
+	const auto hasDeleteAction = info.canDeleteTable
+		|| info.canDeleteRows
+		|| info.canDeleteColumns;
+	if (hasDeleteAction) {
+		menu->addSeparator();
+		if (info.canDeleteTable) {
+			menu->addAction(
+				tr::lng_article_table_delete_table(tr::now),
+				[=] {
+					applyTableChange([=] {
+						return _state->removeTable(range);
+					});
+				},
+				&st::menuIconTableSubmenuDelete);
+		} else {
+			if (info.canDeleteRows) {
+				menu->addAction(
+					(info.selectedRows == 1)
+						? tr::lng_article_table_delete_row(tr::now)
+						: tr::lng_article_table_delete_rows(tr::now),
+					[=] {
+						applyTableChange([=] {
+							return _state->removeTableRows(range);
+						});
+					},
+					&st::menuIconTableSubmenuDelete);
+			}
+			if (info.canDeleteColumns) {
+				menu->addAction(
+					(info.selectedColumns == 1)
+						? tr::lng_article_table_delete_column(tr::now)
+						: tr::lng_article_table_delete_columns(tr::now),
+					[=] {
+						applyTableChange([=] {
+							return _state->removeTableColumns(range);
+						});
+					},
+					&st::menuIconTableSubmenuDelete);
+			}
+		}
+	}
+	menu->addSeparator();
+	Menu::AddCheckedAction(
+		menu,
+		tr::lng_article_table_bordered(tr::now),
+		[=] {
+			applyTableChange([=] {
+				return _state->setTableBordered(range, !info.bordered);
+			});
+		},
+		nullptr,
+		info.bordered);
+	Menu::AddCheckedAction(
+		menu,
+		tr::lng_article_table_striped(tr::now),
+		[=] {
+			applyTableChange([=] {
+				return _state->setTableStriped(range, !info.striped);
+			});
+		},
+		nullptr,
+		info.striped);
+}
+
+void Widget::applyTableChange(Fn<bool()> change) {
+	recordMutationTransaction([&] {
+		const auto committed = commitInlineField();
+		if (committed == ApplyResult::Failed) {
+			return MutationTransactionResult{
+				.committed = committed,
+				.failed = true,
+			};
+		}
+		_pendingOrdinal = -1;
+		_pendingCursorOffset = 0;
+		hideInlineField();
+		if (_article) {
+			_article->clearTextLeafHeightOverride();
+		}
+		clearSelection();
+		setFocus();
+		if (!change()) {
+			refreshAfterInlineFieldCommit(committed);
+			showLastLimitToast();
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = (committed == ApplyResult::Changed),
+			};
+		}
+		refreshPreparedContent();
+		return MutationTransactionResult{
+			.committed = committed,
+			.changed = true,
+		};
+	});
+}
+
+void Widget::touchEvent(QTouchEvent *e) {
+	if (e->type() == QEvent::TouchCancel) {
+		_pendingTouchHorizontalScrollPoint = std::nullopt;
+		if (_horizontalScrollDrag != HorizontalScrollDrag::Touch) {
+			return;
+		}
+		_horizontalScrollDrag = HorizontalScrollDrag::None;
+		if (_article) {
+			_article->endHorizontalScroll();
+		}
+		e->accept();
+		return;
+	}
+	if (!_article || e->touchPoints().isEmpty()) {
+		return;
+	}
+	const auto articlePoint = mapFromGlobal(
+		e->touchPoints().cbegin()->screenPos().toPoint()) - articleTopLeft();
+	switch (e->type()) {
+	case QEvent::TouchBegin: {
+		_pendingTouchHorizontalScrollPoint = std::nullopt;
+		const auto hit = _article->horizontalScrollHit(articlePoint);
+		if (hit.overScrollbar
+			&& _article->beginHorizontalScroll(articlePoint, false)) {
+			_horizontalScrollDrag = HorizontalScrollDrag::Touch;
+			syncInlineFieldGeometry();
+			e->accept();
+		} else if (hit.overViewport) {
+			_pendingTouchHorizontalScrollPoint = articlePoint;
+		}
+	} break;
+	case QEvent::TouchUpdate:
+		if (_horizontalScrollDrag == HorizontalScrollDrag::Touch) {
+			if (_article->updateHorizontalScroll(articlePoint)) {
+				syncInlineFieldGeometry();
+			}
+			e->accept();
+		} else if (_pendingTouchHorizontalScrollPoint) {
+			const auto delta = articlePoint - *_pendingTouchHorizontalScrollPoint;
+			if (delta.manhattanLength() < QApplication::startDragDistance()) {
+				break;
+			}
+			const auto horizontal = (std::abs(delta.x()) > std::abs(delta.y()));
+			if (!horizontal) {
+				_pendingTouchHorizontalScrollPoint = std::nullopt;
+				break;
+			}
+			if (_article->beginHorizontalScroll(
+					*_pendingTouchHorizontalScrollPoint,
+					true)) {
+				_horizontalScrollDrag = HorizontalScrollDrag::Touch;
+				if (_article->updateHorizontalScroll(articlePoint)) {
+					syncInlineFieldGeometry();
+				}
+				e->accept();
+			}
+			_pendingTouchHorizontalScrollPoint = std::nullopt;
+		}
+		break;
+	case QEvent::TouchEnd:
+		_pendingTouchHorizontalScrollPoint = std::nullopt;
+		if (_horizontalScrollDrag == HorizontalScrollDrag::Touch) {
+			_horizontalScrollDrag = HorizontalScrollDrag::None;
+			_article->endHorizontalScroll();
+			e->accept();
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+void Widget::wheelEvent(QWheelEvent *e) {
+	if (handleHorizontalScrollWheel(
+			e,
+			LocalPosition(e) - articleTopLeft())) {
+		return;
+	}
+	e->ignore();
+}
+
+bool Widget::redirectKeyToField(QKeyEvent *e) const {
+	if (!hasFocus()) {
+		return false;
+	}
+	const auto modifiers = e->modifiers()
+		& ~(Qt::KeypadModifier | Qt::GroupSwitchModifier);
+	return (modifiers == Qt::NoModifier || modifiers == Qt::ShiftModifier)
+		&& (e->key() != Qt::Key_Shift)
+		&& RedirectTextToField(e->text());
+}
+
+void Widget::inputMethodEvent(QInputMethodEvent *e) {
+	if (!_field) {
+		Ui::RpWidget::inputMethodEvent(e);
+		return;
+	}
+	const auto cursor = _field->rawTextEdit()->textCursor();
+	if (!ImeEventProducesInput(*e, cursor) || !redirectImeToField()) {
+		Ui::RpWidget::inputMethodEvent(e);
+		return;
+	}
+	if (!replayImeIntoField(e)) {
+		Ui::RpWidget::inputMethodEvent(e);
+		return;
+	}
+	e->accept();
+	return;
+}
+
+QVariant Widget::inputMethodQuery(Qt::InputMethodQuery query) const {
+	if (!_field) {
+		return Ui::RpWidget::inputMethodQuery(query);
+	}
+	return _field->rawTextEdit()->inputMethodQuery(query);
+}
+
+bool Widget::redirectImeToField() const {
+	return hasFocus()
+		&& (hasStructuralSelection() || _field->isHidden());
+}
+
+void Widget::mouseMoveEvent(QMouseEvent *e) {
+	const auto articlePoint = e->pos() - articleTopLeft();
+	if (_horizontalScrollDrag == HorizontalScrollDrag::Mouse) {
+		if (_article->updateHorizontalScroll(articlePoint)) {
+			syncInlineFieldGeometry();
+		}
+		e->accept();
+		return;
+	}
+	if (!_articleSelectionDrag.active) {
+		auto cursor = style::cur_default;
+		const auto controlHit = _article->editControlHitTest(articlePoint);
+		if (controlHit.valid()) {
+			cursor = style::cur_pointer;
+		} else {
+			const auto hit = _article->hitTest(
+				articlePoint,
+				Ui::Text::StateRequest::Flag::LookupSymbol);
+			if (hit.valid() && hit.codeHeaderCopy) {
+				cursor = style::cur_pointer;
+			} else if (hit.valid()
+				&& hit.direct
+				&& _article->segmentIsText(hit.segmentIndex)) {
+				cursor = style::cur_text;
+			}
+		}
+		setCursor(cursor);
+		Ui::RpWidget::mouseMoveEvent(e);
+		return;
+	}
+	const auto hit = _article->hitTest(
+		articlePoint,
+		Ui::Text::StateRequest::Flag::LookupSymbol);
+	const auto editHit = _article->editHitTest(articlePoint);
+	updateArticleSelection(articlePoint, hit, editHit);
+	e->accept();
+}
+
+void Widget::mousePressEvent(QMouseEvent *e) {
+	if (e->button() != Qt::LeftButton) {
+		Ui::RpWidget::mousePressEvent(e);
+		return;
+	}
+	_trackingPointerPress = true;
+	_pressedControl = {};
+	_pressedControlPoint = std::nullopt;
+	auto articlePoint = e->pos() - articleTopLeft();
+	const auto horizontalScrollHit = _article->horizontalScrollHit(
+		articlePoint);
+	if (horizontalScrollHit.overScrollbar
+		&& _article->beginHorizontalScroll(articlePoint, false)) {
+		_horizontalScrollDrag = HorizontalScrollDrag::Mouse;
+		syncInlineFieldGeometry();
+		e->accept();
+		return;
+	}
+	const auto controlHit = _article->editControlHitTest(articlePoint);
+	if (controlHit.valid()) {
+		_pressedControl = controlHit;
+		_pressedControlPoint = articlePoint;
+		e->accept();
+		return;
+	}
+	auto hit = _article->hitTest(
+		articlePoint,
+		Ui::Text::StateRequest::Flag::LookupSymbol);
+	const auto editHit = _article->editHitTest(articlePoint);
+	const auto startedBelow = (articlePoint.y() >= _articleHeight);
+	if (hit.codeHeaderCopy) {
+		startArticleSelection(articlePoint, hit, editHit);
+		e->accept();
+		return;
+	}
+	if (hit.valid() && hit.direct && _article->segmentIsText(hit.segmentIndex)) {
+		startArticleSelection(articlePoint, hit, editHit);
+		e->accept();
+		return;
+	}
+	if (startedBelow) {
+		if (editHit.valid()) {
+			startArticleSelection(
+				articlePoint,
+				hit,
+				editHit,
+				false,
+				true);
+		} else {
+			clearSelection();
+		}
+		e->accept();
+		return;
+	}
+	if (editHit.valid()) {
+		startArticleSelection(articlePoint, hit, editHit);
+		e->accept();
+		return;
+	}
+	clearSelection();
+	e->accept();
+}
+
+void Widget::mouseReleaseEvent(QMouseEvent *e) {
+	if (e->button() != Qt::LeftButton) {
+		Ui::RpWidget::mouseReleaseEvent(e);
+		return;
+	}
+	const auto guard = gsl::finally([&] {
+		_trackingPointerPress = false;
+	});
+	const auto finishDrag = gsl::finally([&] {
+		finishArticleSelection();
+	});
+	const auto articlePoint = e->pos() - articleTopLeft();
+	if (_horizontalScrollDrag == HorizontalScrollDrag::Mouse) {
+		const auto changed = _article->updateHorizontalScroll(articlePoint);
+		_article->endHorizontalScroll();
+		_horizontalScrollDrag = HorizontalScrollDrag::None;
+		if (changed) {
+			syncInlineFieldGeometry();
+		}
+		e->accept();
+		return;
+	}
+	const auto controlHit = _article->editControlHitTest(articlePoint);
+	const auto applyControlToggle = [&](auto &&toggle, auto &&afterRefresh) {
+		const auto hadVisibleField = !_field->isHidden();
+		auto toggled = false;
+		const auto result = recordMutationTransaction([&] {
+			const auto committed = commitInlineField();
+			if (committed == ApplyResult::Failed) {
+				return MutationTransactionResult{
+					.committed = committed,
+					.failed = true,
+				};
+			}
+			_pendingOrdinal = -1;
+			_pendingCursorOffset = 0;
+			hideInlineField();
+			clearInlineFieldEditSession();
+			toggled = toggle();
+			if (toggled) {
+				refreshPreparedContent();
+			} else if (hadVisibleField) {
+				refreshAfterInlineFieldCommit(committed);
+			}
+			clearTextSelection();
+			clearStructuralSelection();
+			setFocus();
+			if (toggled) {
+				afterRefresh();
+			}
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = (committed == ApplyResult::Changed) || toggled,
+			};
+		});
+		return !result.failed && toggled;
+	};
+	if (_pressedControl.valid()) {
+		const auto pressedControl = _pressedControl;
+		const auto pressedControlPoint = _pressedControlPoint;
+		_pressedControl = {};
+		_pressedControlPoint = std::nullopt;
+		const auto matchedControl = pressedControlPoint
+			&& ((articlePoint - *pressedControlPoint).manhattanLength()
+				< QApplication::startDragDistance())
+			&& (controlHit == pressedControl);
+		if (matchedControl) {
+			switch (pressedControl.kind) {
+			case Markdown::MarkdownArticleEditControlHitKind::TaskMarker:
+				if (pressedControl.listItem) {
+					applyControlToggle([&] {
+						return _state->toggleTaskState(*pressedControl.listItem);
+					}, [&] {
+						_article->addTaskMarkerRipple(
+							*pressedControl.listItem,
+							articlePoint);
+					});
+				}
+				break;
+			case Markdown::MarkdownArticleEditControlHitKind::DetailsToggle:
+				if (pressedControl.block) {
+					applyControlToggle([&] {
+						return _state->toggleDetailsOpen(*pressedControl.block);
+					}, [] {
+					});
+				}
+				break;
+			case Markdown::MarkdownArticleEditControlHitKind::None:
+				break;
+			}
+		}
+		e->accept();
+		return;
+	}
+	const auto hit = _article->hitTest(
+		articlePoint,
+		Ui::Text::StateRequest::Flag::LookupSymbol);
+	const auto editHit = _article->editHitTest(articlePoint);
+	const auto formulaOrdinalFromEditHit = [&] {
+		return editHit.leaf
+			&& (editHit.leaf->kind
+				== Markdown::PreparedEditLeafKind::MathFormula)
+			? _state->textOrdinalForLeaf(*editHit.leaf)
+			: -1;
+	};
+	const auto directEditableHit = [&] {
+		return (hit.valid()
+			&& hit.direct
+			&& _article->segmentIsEditable(hit.segmentIndex))
+			|| (formulaOrdinalFromEditHit() >= 0);
+	};
+	const auto commitVisibleInlineField = [&] {
+		if (_field->isHidden()) {
+			return false;
+		}
+		const auto committed = recordMutationTransaction([&] {
+			const auto committed = commitInlineField();
+			if (committed != ApplyResult::Failed) {
+				_pendingOrdinal = -1;
+				_pendingCursorOffset = 0;
+				hideInlineField();
+				clearInlineFieldEditSession();
+			}
+			return committed;
+		});
+		if (committed == ApplyResult::Failed) {
+			return false;
+		}
+		refreshAfterInlineFieldCommit(committed);
+		return true;
+	};
+	const auto focusOrActivateInitial = [&] {
+		if (_field->isHidden()) {
+			activateInitialNode();
+		} else {
+			_field->setFocusFast();
+		}
+	};
+	const auto editCodeBlockLanguage = [&] {
+		if (!hit.codeHeaderCopy) {
+			return false;
+		}
+		auto languageHit = hit;
+		if (!_field->isHidden()) {
+			if (!commitVisibleInlineField()) {
+				return true;
+			}
+			languageHit = _article->hitTest(
+				articlePoint,
+				Ui::Text::StateRequest::Flag::LookupSymbol);
+		}
+		const auto ordinal = languageHit.codeHeaderCopy
+			? editableOrdinalForSegment(languageHit.segmentIndex)
+			: -1;
+		if (const auto now = _state->codeBlockLanguage(ordinal)) {
+			const auto weak = QPointer<Widget>(this);
+			DefaultEditLanguageCallback(_show)(
+				*now,
+				[=](QString language) {
+					if (!weak) {
+						return;
+					}
+					weak->recordMutationTransaction([&] {
+						const auto changed = weak->_state->setCodeBlockLanguage(
+							ordinal,
+							language);
+						if (changed) {
+							weak->refreshPreparedContent();
+							weak->update();
+						}
+						return changed;
+					});
+				});
+		}
+		return true;
+	};
+	if (_articleSelectionDrag.active) {
+		const auto fromField = _articleSelectionDrag.fromField;
+		const auto pendingCodeHeader = _articleSelectionDrag.codeHeader;
+		const auto startedBelow = _articleSelectionDrag.startedBelow;
+		const auto updateOnRelease
+			= (_articleSelectionDrag.mode != DragSelectionMode::None)
+			|| (!pendingCodeHeader
+				&& (!startedBelow || articlePoint.y() < _articleHeight));
+		if (updateOnRelease) {
+			updateArticleSelection(articlePoint, hit, editHit);
+		}
+		if (hasStructuralSelection()) {
+			commitVisibleInlineField();
+			e->accept();
+			return;
+		}
+		if (_articleSelectionDrag.mode == DragSelectionMode::Text) {
+			const auto selection = _selection;
+			const auto sameSegmentSelection = !selection.empty()
+				&& (selection.from.segment == selection.to.segment)
+				&& _article->segmentIsText(selection.from.segment);
+			const auto selectionOrdinal = sameSegmentSelection
+				? editableOrdinalForSegment(selection.from.segment)
+				: -1;
+			if (!fromField && selectionOrdinal >= 0) {
+				const auto selectionFrom = selection.from.offset;
+				const auto selectionTo = selection.to.offset;
+				clearTextSelection();
+				if (_field->isHidden() || commitVisibleInlineField()) {
+					activateTextOrdinal(
+						selectionOrdinal,
+						selectionFrom,
+						selectionTo);
+				}
+				e->accept();
+				return;
+			} else if (fromField) {
+				e->accept();
+				return;
+			}
+		}
+		if (pendingCodeHeader
+			&& _articleSelectionDrag.mode == DragSelectionMode::None
+			&& editCodeBlockLanguage()) {
+			e->accept();
+			return;
+		}
+		const auto changed = !_selection.empty()
+			|| _selectionEndpoints.from.valid()
+			|| _selectionEndpoints.to.valid()
+			|| hasStructuralSelection();
+		_selection = {};
+		_selectionEndpoints = {};
+		setStructuralSelection({});
+		if (changed) {
+			update();
+		}
+	} else if (hit.codeHeaderCopy && editCodeBlockLanguage()) {
+		e->accept();
+		return;
+	}
+	if (directEditableHit()) {
+		const auto formulaOrdinal = formulaOrdinalFromEditHit();
+		const auto segmentHit = hit.valid()
+			&& hit.direct
+			&& _article->segmentIsEditable(hit.segmentIndex);
+		const auto targetOrdinal = segmentHit
+			? editableOrdinalForSegment(hit.segmentIndex)
+			: formulaOrdinal;
+		const auto offset = segmentHit
+			? _article->selectionOffsetFromHit(
+				hit,
+				TextSelectType::Letters)
+			: 0;
+		if (targetOrdinal >= 0
+			&& !_field->isHidden()
+			&& hit.segmentIndex == _activeSegmentIndex) {
+			auto cursor = _field->textCursor();
+			cursor.setPosition(std::clamp(
+				offset,
+				0,
+				int(_field->getLastText().size())));
+			_field->setTextCursor(cursor);
+			_field->setFocusFast();
+		} else if (targetOrdinal >= 0) {
+			if (_field->isHidden() || commitVisibleInlineField()) {
+				activateTextOrdinal(targetOrdinal, offset);
+			}
+		}
+	} else if (articlePoint.y() >= _articleHeight) {
+		activateTrailingParagraph();
+	} else {
+		focusOrActivateInitial();
+	}
+	e->accept();
+}
+
+void Widget::paintEvent(QPaintEvent *e) {
+	if (!_article) {
+		return;
+	}
+	auto p = Painter(this);
+	p.setTextPalette(st::inTextPalette);
+	const auto topLeft = articleTopLeft();
+	p.translate(topLeft);
+	_article->paint(
+		p,
+		textPaintContext(e->rect().translated(-topLeft.x(), -topLeft.y())));
+}
+
+void Widget::resizeEvent(QResizeEvent *e) {
+	Ui::RpWidget::resizeEvent(e);
+	syncInlineFieldGeometry();
+}
+
+void Widget::setDocument(const Markdown::MarkdownArticleContent &prepared) {
+	_article->setContent(prepared);
+}
+
+Markdown::MarkdownArticleTextLeafStyle Widget::inlineFieldStyleForSegment(
+		int segmentIndex) const {
+	return _article
+		? _article->editableStyleForSegment(segmentIndex)
+		: Markdown::MarkdownArticleTextLeafStyle();
+}
+
+const Widget::CachedInlineFieldStyle &Widget::inlineFieldStyleFor(
+		const Markdown::MarkdownArticleTextLeafStyle &leafStyle) {
+	return inlineFieldStyleFor(normalizedInlineFieldStyle(leafStyle));
+}
+
+const Widget::CachedInlineFieldStyle &Widget::inlineFieldStyleFor(
+		const InlineFieldStyleData &data) {
+	auto key = inlineFieldStyleKey(data);
+	auto textFg = data.textFg;
+	auto ownedTextFg = std::shared_ptr<style::owned_color>();
+	auto ownedTextMarkBg = std::make_shared<style::owned_color>(
+		data.textMarkBg);
+	auto textMarkBg = ownedTextMarkBg->color();
+	if (_inlineFieldTextColorOverride
+		&& data.textFg.get() == _inlineFieldTextColorOverride->color().get()) {
+		ownedTextFg = std::make_shared<style::owned_color>(data.textFg->c);
+		textFg = ownedTextFg->color();
+		key.textFg = textFg;
+	}
+	for (const auto &cached : _fieldStyles) {
+		if (cached.key == key) {
+			cached.ownedTextMarkBg->update(data.textMarkBg);
+			return cached;
+		}
+	}
+	auto fieldStyle = std::make_shared<style::InputField>(
+		st::ivEditorInputField);
+	fieldStyle->style = *data.textStyle;
+	fieldStyle->style.font = data.italic
+		? data.textStyle->font->italic()
+		: data.textStyle->font;
+	fieldStyle->style.lineHeight = data.lineHeight;
+	fieldStyle->textFg = textFg;
+	fieldStyle->textMarkBg = textMarkBg;
+	fieldStyle->textAlign = data.align;
+	fieldStyle->placeholderFont = fieldStyle->style.font;
+	fieldStyle->placeholderAlign = data.align;
+	_fieldStyles.push_back({
+		.key = key,
+		.style = std::move(fieldStyle),
+		.ownedTextFg = std::move(ownedTextFg),
+		.ownedTextMarkBg = std::move(ownedTextMarkBg),
+	});
+	return _fieldStyles.back();
+}
+
+std::optional<QColor> Widget::activeQuoteCaptionColor() {
+	if (!_state->activeLeafUsesQuoteCaptionColor()) {
+		return std::nullopt;
+	}
+	return Markdown::NonPullquoteQuoteCaptionColor(
+		textPaintContext(QRect()),
+		*_articleStyle);
+}
+
+std::optional<QColor> Widget::activeQuotePlaceholderColor() {
+	if (!_state->activeLeafUsesQuotePlaceholderColor()) {
+		return std::nullopt;
+	}
+	return Markdown::NonPullquoteQuoteCaptionColor(
+		textPaintContext(QRect()),
+		*_articleStyle);
+}
+
+void Widget::refreshInlineFieldTextColorOverride() {
+	const auto color = activeQuoteCaptionColor();
+	if (!color) {
+		if (_inlineFieldTextColorOverride) {
+			_activeFieldStyleKey = std::nullopt;
+			_inlineFieldTextColorOverride.reset();
+		}
+		return;
+	}
+	if (_inlineFieldTextColorOverride) {
+		_inlineFieldTextColorOverride->update(*color);
+	} else {
+		_inlineFieldTextColorOverride.emplace(*color);
+	}
+}
+
+Widget::InlineFieldStyleData Widget::normalizedInlineFieldStyle(
+		const Markdown::MarkdownArticleTextLeafStyle &leafStyle) const {
+	const auto valid = leafStyle.valid();
+	const auto textStyle = valid
+		? leafStyle.textStyle
+		: &_articleStyle->body;
+	const auto lineHeight = (valid && leafStyle.lineHeight > 0)
+		? leafStyle.lineHeight
+		: std::max(textStyle->lineHeight, textStyle->font->height);
+	return {
+		.textStyle = textStyle,
+		.lineHeight = lineHeight,
+		.textFg = _inlineFieldTextColorOverride
+			? _inlineFieldTextColorOverride->color()
+			: (valid ? leafStyle.textColor : _articleStyle->textColor),
+		.textMarkBg = valid
+			? leafStyle.markBg
+			: _articleStyle->textPalette.markBg->c,
+		.align = valid ? leafStyle.align : style::al_left,
+		.italic = valid ? leafStyle.italic : false,
+	};
+}
+
+Widget::InlineFieldStyleKey Widget::inlineFieldStyleKey(
+		const InlineFieldStyleData &data) const {
+	const auto textStyle = data.textStyle
+		? data.textStyle
+		: &_articleStyle->body;
+	return {
+		.font = data.italic
+			? textStyle->font->italic()
+			: textStyle->font,
+		.lineHeight = data.lineHeight,
+		.textFg = data.textFg,
+		.align = data.align,
+	};
+}
+
+void Widget::ensureInlineFieldForSegment(int segmentIndex) {
+	_revivedRetainedField = false;
+	refreshInlineFieldTextColorOverride();
+	const auto data = normalizedInlineFieldStyle(
+		inlineFieldStyleForSegment(segmentIndex));
+	const auto key = inlineFieldStyleKey(data);
+	const auto mode = _state->activeFieldMode();
+	const auto leaf = _state->activeLeafPath();
+	const auto fieldLeafMismatch = leaf
+		&& _fieldLeaf
+		&& (*_fieldLeaf != *leaf);
+	if (_activeFieldStyleKey
+		&& leaf
+		&& _fieldLeaf
+		&& (*_fieldLeaf == *leaf)
+		&& *_activeFieldStyleKey == key
+		&& _fieldMode == mode) {
+		return;
+	}
+	if (leaf) {
+		if (auto revived = reviveRetainedLeafField(
+				_historyIndex,
+				*leaf,
+				mode,
+				key)) {
+			_field = std::move(revived);
+			_activeFieldStyleKey = key;
+			_fieldMode = mode;
+			_fieldLeaf = *leaf;
+			refreshInlineFieldPlaceholderColor();
+			_fieldUndoAvailable = _field->isUndoAvailable();
+			_fieldRedoAvailable = _field->isRedoAvailable();
+			_revivedRetainedField = true;
+			clearFieldUndoRedoNoopState();
+			return;
+		}
+	}
+	const auto needsRecreate = !_activeFieldStyleKey
+		|| (*_activeFieldStyleKey != key)
+		|| (_fieldMode != mode)
+		|| fieldLeafMismatch;
+	if (!needsRecreate) {
+		_activeFieldStyleKey = key;
+		_fieldMode = mode;
+		return;
+	}
+	const auto &cached = inlineFieldStyleFor(data);
+	_activeFieldStyleKey = cached.key;
+	_fieldMode = mode;
+	recreateInlineField(*cached.style);
+}
+
+void Widget::setupInlineField() {
+	if (_fieldMode == State::FieldMode::Rich) {
+		const auto allowPremiumEmoji = [peer = _peer](
+				not_null<DocumentData*> emoji) {
+			return Data::AllowEmojiWithoutPremium(peer, emoji);
+		};
+		_field->setInstantViewEditorTagsEnabled(true);
+		InitMessageFieldHandlers({
+			.session = _session,
+			.show = _show,
+			.field = _field.get(),
+			.customEmojiPaused = _customEmojiPaused,
+			.allowPremiumEmoji = allowPremiumEmoji,
+			.fieldStyle = &_field->st(),
+			.linkValidator = ValidateInstantViewEditorLink,
+		});
+		Ui::Emoji::SuggestionsController::Init(
+			_outer,
+			_field.get(),
+			_session,
+			{
+				.suggestCustomEmoji = true,
+				.allowCustomWithoutPremium = allowPremiumEmoji,
+			});
+		auto messageFieldMimeHook = WrappedMessageFieldMimeHook(
+			Ui::InputField::MimeDataHook(),
+			_field.get());
+		_field->setMimeDataHook([=,
+				messageFieldMimeHook = std::move(messageFieldMimeHook)](
+				not_null<const QMimeData*> data,
+				Ui::InputField::MimeAction action) {
+			return handleIvClipboardMime(data, action)
+				|| (messageFieldMimeHook
+					? messageFieldMimeHook(data, action)
+					: false);
+		});
+	} else {
+		_field->setInstantViewEditorTagsEnabled(false);
+		_field->setInstantReplacesEnabled(
+			rpl::single(false),
+			rpl::single(false));
+		_field->setMarkdownReplacesEnabled(
+			rpl::single(Ui::MarkdownEnabledState{
+				Ui::MarkdownDisabled()
+			}));
+	}
+	_field->setDocumentMargin(0.);
+	_field->setAdditionalMargins({});
+	_field->setSubmitSettings(Ui::InputField::SubmitSettings::None);
+	_field->setMaxHeight(std::numeric_limits<int>::max());
+	refreshInlineFieldPlaceholderColor();
+	const auto raw = _field->rawTextEdit();
+	raw->installEventFilter(this);
+	raw->viewport()->installEventFilter(this);
+	_field->addContextMenuHook([this](
+			Ui::InputField::ContextMenuRequest request) {
+		handleFieldContextMenuRequest(std::move(request));
+	});
+
+	_field->heightChanges(
+	) | rpl::on_next([=] {
+		updateInlineFieldHeightOverride();
+	}, _field->lifetime());
+	_field->focusedChanges(
+	) | rpl::on_next([=](bool focused) {
+		if (!focused
+			&& !_settingField
+			&& !_trackingPointerPress
+			&& !_inlineFieldExternalInteractionActive) {
+			const auto committed = recordMutationTransaction([=] {
+				return commitInlineField();
+			});
+			if (committed == ApplyResult::Changed) {
+				refreshAfterInlineFieldCommit(committed);
+			}
+		}
+	}, _field->lifetime());
+	const auto field = QPointer<Ui::InputField>(_field.get());
+	QObject::connect(
+		raw->document(),
+		&QTextDocument::contentsChange,
+		_field.get(),
+		[this, field](int, int, int) {
+			if (!field || (_field.get() != field.data())) {
+				return;
+			}
+			const auto hadRedo = _fieldRedoAvailable;
+			const auto hadHistoryRedo
+				= (_historyIndex + 1 < int(_history.size()));
+			if (!_restoringHistory
+				&& !_performingUndoRedo
+				&& !_settingField
+				&& !_suppressHistoryRedoInvalidation
+				&& (hadRedo || hadHistoryRedo)) {
+				truncateHistoryRedo();
+			}
+			if (!_restoringHistory && !_performingUndoRedo && !_settingField) {
+				clearFieldUndoRedoNoopState();
+			}
+			crl::on_main(this, [=] {
+				if (!field || (_field.get() != field.data())) {
+					return;
+				}
+				_fieldUndoAvailable = field->isUndoAvailable();
+				_fieldRedoAvailable = field->isRedoAvailable();
+			});
+		});
+	_fieldUndoAvailable = _field->isUndoAvailable();
+	_fieldRedoAvailable = _field->isRedoAvailable();
+
+	hideInlineField();
+}
+
+void Widget::recreateInlineField(const style::InputField &st) {
+	const auto text = _field->getTextWithTags();
+	const auto cursor = _field->textCursor();
+	const auto position = cursor.position();
+	const auto anchor = cursor.anchor();
+	const auto wasHidden = _field->isHidden();
+	const auto hadFocus = _field->hasFocus();
+
+	_settingField = true;
+	_field = base::make_unique_q<Ui::InputField>(
+		this,
+		st,
+		Ui::InputField::Mode::MultiLine,
+		rpl::single(QString()));
+	setupInlineField();
+	refreshInlineFieldPlaceholder();
+	const auto wasSuppressingHistoryRedoInvalidation
+		= _suppressHistoryRedoInvalidation;
+	_suppressHistoryRedoInvalidation = true;
+	const auto suppressRedoInvalidation = gsl::finally([&] {
+		_suppressHistoryRedoInvalidation
+			= wasSuppressingHistoryRedoInvalidation;
+	});
+	_field->setTextWithTags(text, Ui::InputField::HistoryAction::Clear);
+	auto restored = _field->textCursor();
+	const auto size = int(_field->getLastText().size());
+	const auto restoredAnchor = std::clamp(anchor, 0, size);
+	const auto restoredPosition = std::clamp(position, 0, size);
+	restored.setPosition(restoredAnchor);
+	if (restoredPosition != restoredAnchor) {
+		restored.setPosition(restoredPosition, QTextCursor::KeepAnchor);
+	}
+	_field->setTextCursor(restored);
+	if (!wasHidden) {
+		_field->show();
+		_field->raise();
+		if (hadFocus) {
+			_field->setFocusFast();
+		}
+	}
+	_fieldLeaf = std::nullopt;
+	_settingField = false;
+	_fieldUndoAvailable = _field->isUndoAvailable();
+	_fieldRedoAvailable = _field->isRedoAvailable();
+	clearFieldUndoRedoNoopState();
+}
+
+void Widget::ensureInlineFieldCreated() {
+	if (_field) {
+		return;
+	}
+	const auto &fieldStyle = inlineFieldStyleFor(
+		Markdown::MarkdownArticleTextLeafStyle());
+	_activeFieldStyleKey = fieldStyle.key;
+	_fieldMode = State::FieldMode::Rich;
+	_field = base::make_unique_q<Ui::InputField>(
+		this,
+		*fieldStyle.style,
+		Ui::InputField::Mode::MultiLine,
+		rpl::single(QString()));
+	setupInlineField();
+	clearFieldUndoRedoNoopState();
+}
+
+void Widget::refreshInlineFieldPlaceholder() {
+	_field->setPlaceholder(rpl::single(_state->activePlaceholderText()));
+	refreshInlineFieldPlaceholderColor();
+}
+
+void Widget::refreshInlineFieldPlaceholderColor() {
+	auto color = activeQuotePlaceholderColor().value_or(
+		_articleStyle->supplementaryTextColor->c);
+	color.setAlphaF(color.alphaF() * 0.5);
+	if (_inlineFieldPlaceholderColorOverride) {
+		_inlineFieldPlaceholderColorOverride->update(color);
+	} else {
+		_inlineFieldPlaceholderColorOverride.emplace(color);
+	}
+	_field->setPlaceholderColorOverride(
+		_inlineFieldPlaceholderColorOverride->color());
+}
+
+void Widget::setInlineFieldFromActiveState(int selectionFrom, int selectionTo) {
+	ensureInlineFieldForSegment(_activeSegmentIndex);
+	const auto revivedRetainedField = _revivedRetainedField;
+	_revivedRetainedField = false;
+	refreshInlineFieldPlaceholder();
+	_settingField = true;
+	const auto activeLeaf = _state->activeLeafPath();
+	const auto preserveRetainedFieldSession = _restoringHistory
+		&& (PreservingExternalFieldRestore == this)
+		&& activeLeaf
+		&& _fieldLeaf
+		&& (*_fieldLeaf == *activeLeaf);
+	auto cursorSelectionFrom = selectionFrom;
+	auto cursorSelectionTo = selectionTo;
+	auto trimmedLeft = 0;
+	const auto trimLeft = !_state->codeBlockLanguage(
+		_state->activeTextOrdinal()).has_value();
+	const auto wasSuppressingHistoryRedoInvalidation
+		= _suppressHistoryRedoInvalidation;
+	_suppressHistoryRedoInvalidation = true;
+	const auto suppressRedoInvalidation = gsl::finally([&] {
+		_suppressHistoryRedoInvalidation
+			= wasSuppressingHistoryRedoInvalidation;
+	});
+	if (preserveRetainedFieldSession) {
+		_fieldLeaf = activeLeaf;
+		_settingField = false;
+		_fieldUndoAvailable = _field->isUndoAvailable();
+		_fieldRedoAvailable = _field->isRedoAvailable();
+		return;
+	}
+	const auto preserveRestoredRetainedField = [&](const TextWithTags &text) {
+		const auto document = _field->rawTextEdit()->document();
+		const auto matchingHistoryDirection = _restoringHistoryRedo
+			&& (*_restoringHistoryRedo
+				? (document->availableRedoSteps() > 0
+					|| _field->isRedoAvailable())
+				: (document->availableUndoSteps() > 0
+					|| _field->isUndoAvailable()));
+		return revivedRetainedField
+			&& _restoringHistory
+			&& activeLeaf
+			&& _fieldLeaf
+			&& (*_fieldLeaf == *activeLeaf)
+			&& (matchingHistoryDirection || (_field->getTextWithTags() == text));
+	};
+	const auto finishWithRetainedField = [&] {
+		_fieldLeaf = activeLeaf;
+		_settingField = false;
+		_fieldUndoAvailable = _field->isUndoAvailable();
+		_fieldRedoAvailable = _field->isRedoAvailable();
+	};
+	const auto resetFieldHistory = !activeLeaf
+		|| !_fieldLeaf
+		|| (*_fieldLeaf != *activeLeaf);
+	if (_state->activeFieldMode() == State::FieldMode::Raw) {
+		const auto trimmed = TrimInlineFieldText(
+			{ _state->activeRawText(), {} },
+			trimLeft);
+		if (preserveRestoredRetainedField(trimmed.text)) {
+			_article->clearEditableHeightOverride();
+			finishWithRetainedField();
+			return;
+		}
+		if (resetFieldHistory || (_field->getTextWithTags() != trimmed.text)) {
+			_field->setTextWithTags(
+				trimmed.text,
+				Ui::InputField::HistoryAction::Clear);
+		}
+		trimmedLeft = trimmed.left;
+		_article->clearEditableHeightOverride();
+	} else {
+		const auto activeText = ConvertRichTextToEditorTags(
+			_state->activeText());
+		const auto trimmed = TrimInlineFieldText(activeText.text, trimLeft);
+		if (preserveRestoredRetainedField(trimmed.text)) {
+			finishWithRetainedField();
+			return;
+		}
+		if (resetFieldHistory || (_field->getTextWithTags() != trimmed.text)) {
+			_field->setTextWithTags(
+				trimmed.text,
+				Ui::InputField::HistoryAction::Clear);
+		}
+		cursorSelectionFrom = MapRichTextOffsetToEditorOffset(
+			activeText.replacements,
+			selectionFrom);
+		cursorSelectionTo = MapRichTextOffsetToEditorOffset(
+			activeText.replacements,
+			selectionTo);
+		trimmedLeft = trimmed.left;
+	}
+	cursorSelectionFrom -= trimmedLeft;
+	cursorSelectionTo -= trimmedLeft;
+	auto cursor = _field->textCursor();
+	const auto size = int(_field->getLastText().size());
+	const auto from = std::clamp(cursorSelectionFrom, 0, size);
+	const auto to = std::clamp(cursorSelectionTo, 0, size);
+	cursor.setPosition(from);
+	if (to != from) {
+		cursor.setPosition(to, QTextCursor::KeepAnchor);
+	}
+	_field->setTextCursor(cursor);
+	_fieldLeaf = _state->activeLeafPath();
+	_settingField = false;
+	_fieldUndoAvailable = _field->isUndoAvailable();
+	_fieldRedoAvailable = _field->isRedoAvailable();
+	clearFieldUndoRedoNoopState();
+}
+
+void Widget::activateTextOrdinal(int ordinal, int cursorOffset) {
+	activateTextOrdinal(ordinal, cursorOffset, cursorOffset);
+}
+
+void Widget::activateTextOrdinal(
+		int ordinal,
+		int selectionFrom,
+		int selectionTo) {
+	const auto targetLeaf = [&]() -> std::optional<State::LeafPath> {
+		const auto &nodes = _state->textNodes();
+		return (ordinal >= 0 && ordinal < int(nodes.size()))
+			? std::make_optional(nodes[ordinal].leaf)
+			: std::nullopt;
+	}();
+	if (targetLeaf
+		&& _fieldLeaf
+		&& (*_fieldLeaf != *targetLeaf)) {
+		retainActiveLeafField();
+	}
+	if (!_state->setActiveTextByOrdinal(ordinal)) {
+		return;
+	}
+	_boundarySelectionOrigin = std::nullopt;
+	_activeOrdinal = ordinal;
+	_pendingOrdinal = -1;
+	_pendingCursorOffset = 0;
+
+	const auto previousSegmentIndex = _activeSegmentIndex;
+	const auto segmentIndex = segmentIndexForEditableOrdinal(ordinal);
+	if (segmentIndex < 0) {
+		_activeSegmentIndex = -1;
+		_pendingOrdinal = ordinal;
+		_pendingCursorOffset = selectionTo;
+		hideInlineField();
+		return;
+	}
+
+	if (_article && previousSegmentIndex != segmentIndex) {
+		_article->clearEditableHeightOverride();
+	}
+	if (previousSegmentIndex != segmentIndex) {
+		clearDisplayMathEditSession();
+	}
+	_activeSegmentIndex = segmentIndex;
+	if (_article->segmentIsDisplayMath(_activeSegmentIndex)) {
+		if (!_activeSegmentIsDisplayMath) {
+			const auto blockRect = _article->displayMathBlockRect(
+				_activeSegmentIndex);
+			_activeSegmentIsDisplayMath = true;
+			_activeDisplayMathBaselineHeight = std::max(blockRect.height(), 1);
+		}
+	} else {
+		clearDisplayMathEditSession();
+	}
+	setInlineFieldFromActiveState(selectionFrom, selectionTo);
+	_field->show();
+	syncInlineFieldGeometry();
+	updateInlineFieldHeightOverride();
+	syncArticleVisibleTopBottom();
+	revealActiveInlineField();
+	_field->raise();
+	_field->setFocusFast();
+}
+
+QRect Widget::activeInlineFieldRevealRect() const {
+	const auto raw = _field->rawTextEdit();
+	const auto cursor = _field->textCursor();
+	auto positionCursor = cursor;
+	positionCursor.setPosition(cursor.position());
+	auto revealRect = raw->cursorRect(positionCursor);
+	if (cursor.hasSelection()) {
+		auto anchorCursor = cursor;
+		anchorCursor.setPosition(cursor.anchor());
+		revealRect = revealRect.united(raw->cursorRect(anchorCursor));
+	}
+	if (!revealRect.isValid() || revealRect.isEmpty()) {
+		return _field->rect();
+	}
+	revealRect.moveTopLeft(
+		raw->viewport()->mapTo(_field, revealRect.topLeft()));
+	return revealRect;
+}
+
+QRect Widget::mapFieldLocalRectToScrollContent(
+		QWidget *inner,
+		QRect rect) const {
+	rect.moveTopLeft(_field->mapTo(inner, rect.topLeft()));
+	return rect;
+}
+
+void Widget::revealActiveInlineField() {
+	if (_field->isHidden() || _activeSegmentIndex < 0) {
+		return;
+	}
+	if (_article->revealSegment(_activeSegmentIndex)) {
+		syncInlineFieldGeometry();
+		if (_field->isHidden()) {
+			return;
+		}
+	}
+	const auto scrollIn = [&](auto &&scroll) {
+		if (const auto inner = scroll->widget()) {
+			const auto localRect = mapFieldLocalRectToScrollContent(
+				inner,
+				activeInlineFieldRevealRect());
+			scroll->scrollToY(
+				localRect.y(),
+				localRect.y() + localRect.height());
+		}
+	};
+	for (auto parent = parentWidget(); parent; parent = parent->parentWidget()) {
+		if (const auto scroll = dynamic_cast<Ui::ScrollArea*>(parent)) {
+			scrollIn(scroll);
+			return;
+		}
+		if (const auto scroll = dynamic_cast<Ui::ElasticScroll*>(parent)) {
+			scrollIn(scroll);
+			return;
+		}
+	}
+}
+
+void Widget::activateTrailingParagraph() {
+	recordMutationTransaction([&] {
+		const auto committed = commitInlineField();
+		if (committed == ApplyResult::Failed) {
+			return MutationTransactionResult{
+				.committed = committed,
+				.failed = true,
+			};
+		}
+		const auto ordinal = _state->ensureTrailingParagraphActive();
+		if (!ordinal) {
+			showLastLimitToast();
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = (committed == ApplyResult::Changed),
+			};
+		}
+		refreshPreparedContent();
+		activateTextOrdinal(*ordinal, _state->activeText().text.size());
+		return MutationTransactionResult{
+			.committed = committed,
+			.changed = true,
+		};
+	});
+}
+
+void Widget::revertInlineFieldToState() {
+	if (_field->isHidden() || _activeSegmentIndex < 0) {
+		return;
+	}
+	const auto cursor = _field->textCursor();
+	setInlineFieldFromActiveState(cursor.anchor(), cursor.position());
+	syncInlineFieldGeometry();
+	updateInlineFieldHeightOverride();
+}
+
+std::optional<State::ActiveTextInsertContext>
+Widget::activeTextInsertContext() const {
+	if (_settingField
+		|| _field->isHidden()
+		|| (_activeSegmentIndex < 0)
+		|| (_state->activeFieldMode() == State::FieldMode::Raw)) {
+		return std::nullopt;
+	}
+	auto full = ConvertEditorTagsToRichText(_field->getTextWithAppliedMarkdown());
+	const auto cursor = _field->textCursor();
+	auto from = richOffsetForFieldOffset(full, cursor.selectionStart());
+	auto till = richOffsetForFieldOffset(full, cursor.selectionEnd());
+	from = std::clamp(from, 0, int(full.text.size()));
+	till = std::clamp(till, from, int(full.text.size()));
+	auto before = TextWithEntities();
+	auto selected = TextWithEntities();
+	auto after = std::move(full);
+	if (from > 0) {
+		[[maybe_unused]] const auto cut = TextUtilities::CutPart(
+			before,
+			after,
+			from);
+	}
+	if (till > from) {
+		[[maybe_unused]] const auto cut = TextUtilities::CutPart(
+			selected,
+			after,
+			till - from);
+	}
+	return State::ActiveTextInsertContext{
+		.before = std::move(before),
+		.selected = std::move(selected),
+		.after = std::move(after),
+	};
+}
+
+bool Widget::handleIvClipboardMime(
+		not_null<const QMimeData*> data,
+		Ui::InputField::MimeAction action) {
+	const auto modifiers = QApplication::keyboardModifiers();
+	if ((modifiers & Qt::ControlModifier)
+		&& (modifiers & Qt::ShiftModifier)) {
+		return false;
+	}
+	if (!ClipboardPasteInsertContext(activeTextInsertContext())) {
+		return false;
+	}
+	const auto clipboardData = ClipboardDataFromMimeData(data.get());
+	if (!clipboardData) {
+		return false;
+	} else if (action == Ui::InputField::MimeAction::Check) {
+		return true;
+	}
+	crl::on_main(this, [=, clipboardData = *clipboardData] {
+		pasteStructuredClipboardData(clipboardData);
+	});
+	return true;
+}
+
+int Widget::richOffsetForFieldOffset(
+		const TextWithEntities &text,
+		int offset) const {
+	const auto replacements = ConvertRichTextToEditorTags(text).replacements;
+	return std::clamp(
+		MapEditorOffsetToRichOffset(replacements, offset),
+		0,
+		int(text.text.size()));
+}
+
+ApplyResult Widget::applyFieldTextToState() {
+	if (_settingField || _field->isHidden()) {
+		return ApplyResult::Unchanged;
+	}
+	if (_state->activeFieldMode() == State::FieldMode::Raw) {
+		return _state->applyActiveRawText(_field->getLastText());
+	}
+	const auto text = _field->getTextWithAppliedMarkdown();
+	return _state->applyActiveText(ConvertEditorTagsToRichText(text));
+}
+
+bool Widget::showLastLimitToast() {
+	if (_showLimitToast) {
+		if (const auto error = _state->lastLimitError()) {
+			_showLimitToast(*error);
+			return true;
+		}
+	}
+	return false;
+}
+
+void Widget::hideInlineField() {
+	if (_field->isHidden()) {
+		return;
+	}
+	const auto wasSettingField = _settingField;
+	_settingField = true;
+	const auto guard = gsl::finally([&] {
+		_settingField = wasSettingField;
+	});
+	_field->hide();
+}
+
+void Widget::activateTextOrdinalAtEnd(int ordinal) {
+	if (!_state->setActiveTextByOrdinal(ordinal)) {
+		return;
+	}
+	activateTextOrdinal(ordinal, _state->activeTextLength());
+}
+
+bool Widget::handleFieldKey(QKeyEvent *e) {
+	if (_field->isHidden()) {
+		return false;
+	}
+	const auto key = e->key();
+	if (key == Qt::Key_Escape) {
+		hideInlineFieldAndRefresh();
+		e->accept();
+		return true;
+	}
+	const auto modifiers = e->modifiers()
+		& ~(Qt::KeypadModifier | Qt::GroupSwitchModifier);
+	if (modifiers != Qt::NoModifier) {
+		return false;
+	}
+	const auto cursor = _field->textCursor();
+	if (cursor.hasSelection()) {
+		return false;
+	}
+	const auto atStart = cursor.atStart();
+	const auto atEnd = cursor.atEnd();
+	auto handled = false;
+	if (atStart
+		&& (key == Qt::Key_Left
+			|| key == Qt::Key_Up
+			|| key == Qt::Key_PageUp)) {
+		handled = moveBoundary(false, false);
+	} else if (atEnd && key == Qt::Key_Down) {
+		recordMutationTransaction([&] {
+			const auto committed = commitInlineField();
+			if (committed == ApplyResult::Failed) {
+				handled = true;
+				return MutationTransactionResult{
+					.committed = committed,
+					.failed = true,
+				};
+			} else if (const auto target
+				= _state->removeTemporaryDownParagraphAndMove();
+				target.action != State::BoundaryTarget::Action::None) {
+				refreshPreparedContent();
+				switch (target.action) {
+				case State::BoundaryTarget::Action::Text:
+					activateTextOrdinal(target.textOrdinal, 0);
+					break;
+				case State::BoundaryTarget::Action::StructuralSelection:
+					_boundarySelectionOrigin = std::nullopt;
+					_selection = {};
+					_selectionEndpoints = {};
+					_articleSelectionDrag = {};
+					setStructuralSelection(target.structuralSelection);
+					_pendingOrdinal = -1;
+					_pendingCursorOffset = 0;
+					hideInlineField();
+					clearInlineFieldEditSession();
+					update();
+					break;
+				case State::BoundaryTarget::Action::None:
+				case State::BoundaryTarget::Action::RemoveActiveOwner:
+					break;
+				}
+				handled = true;
+				return MutationTransactionResult{
+					.committed = committed,
+					.changed = true,
+				};
+			} else if (const auto target = _state->moveActiveSpecialBlockDown()) {
+				refreshPreparedContent();
+				activateTextOrdinal(*target, 0);
+				handled = true;
+				return MutationTransactionResult{
+					.committed = committed,
+					.changed = true,
+				};
+			}
+			auto mutated = false;
+			if (_state->lastLimitError()) {
+				handled = moveBoundaryAfterCommit(
+					committed,
+					true,
+					false,
+					&mutated);
+				if (!handled) {
+					handled = true;
+				}
+			} else {
+				handled = moveBoundaryAfterCommit(
+					committed,
+					true,
+					true,
+					&mutated);
+			}
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = mutated || (committed == ApplyResult::Changed),
+			};
+		});
+	} else if (atEnd
+		&& (key == Qt::Key_Right
+			|| key == Qt::Key_PageDown)) {
+		handled = moveBoundary(true, true);
+	} else if (key == Qt::Key_Return || key == Qt::Key_Enter) {
+		recordMutationTransaction([&] {
+			const auto committed = commitInlineField();
+			if (committed == ApplyResult::Failed) {
+				handled = true;
+				return MutationTransactionResult{
+					.committed = committed,
+					.failed = true,
+				};
+			} else if (const auto target = _state->handleActiveListEnter()) {
+				refreshPreparedContent();
+				activateTextOrdinal(*target, 0);
+				handled = true;
+				return MutationTransactionResult{
+					.committed = committed,
+					.changed = true,
+				};
+			} else if (const auto target = _state->handleActiveHeadingEnter()) {
+				refreshPreparedContent();
+				activateTextOrdinal(*target, 0);
+				handled = true;
+				return MutationTransactionResult{
+					.committed = committed,
+					.changed = true,
+				};
+			} else if (_state->lastLimitError()) {
+				showLastLimitToast();
+				handled = true;
+			}
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = (committed == ApplyResult::Changed),
+			};
+		});
+	} else if (atStart && key == Qt::Key_Backspace) {
+		handled = removeBoundaryOwner(false);
+	} else if (atEnd && key == Qt::Key_Delete) {
+		handled = removeBoundaryOwner(true);
+	}
+	if (handled) {
+		e->accept();
+	}
+	return handled;
+}
+
+bool Widget::handleTabNavigation(QKeyEvent *e) {
+	const auto key = e->key();
+	if (key != Qt::Key_Tab && key != Qt::Key_Backtab) {
+		return false;
+	}
+	const auto modifiers = e->modifiers()
+		& ~(Qt::KeypadModifier | Qt::GroupSwitchModifier);
+	if (modifiers != Qt::NoModifier && modifiers != Qt::ShiftModifier) {
+		return false;
+	}
+	const auto forward = (key != Qt::Key_Backtab)
+		&& (modifiers != Qt::ShiftModifier);
+	if (!moveTabBoundary(forward)) {
+		return false;
+	}
+	e->accept();
+	return true;
+}
+
+bool Widget::moveBoundary(bool forward, bool allowTrailing) {
+	const auto target = forward
+		? _state->nextEditableOrdinal()
+		: _state->previousEditableOrdinal();
+	const auto addTrailing = forward
+		&& allowTrailing
+		&& !target
+		&& !_state->isActiveTopLevelParagraph();
+	if (!target && !addTrailing) {
+		return false;
+	}
+	auto handled = false;
+	recordMutationTransaction([&] {
+		const auto committed = commitInlineField();
+		if (committed == ApplyResult::Failed) {
+			handled = true;
+			return MutationTransactionResult{
+				.committed = committed,
+				.failed = true,
+			};
+		}
+		if (target) {
+			if (committed == ApplyResult::Changed) {
+				refreshAfterInlineFieldCommit(committed);
+			}
+			if (forward) {
+				activateTextOrdinal(*target, 0);
+			} else {
+				activateTextOrdinalAtEnd(*target);
+			}
+			handled = true;
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = (committed == ApplyResult::Changed),
+			};
+		}
+		const auto ordinal = _state->ensureTrailingParagraphActive();
+		if (!ordinal) {
+			handled = forward
+				&& allowTrailing
+				&& _state->lastLimitError().has_value();
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = (committed == ApplyResult::Changed),
+			};
+		}
+		refreshPreparedContent();
+		activateTextOrdinal(*ordinal, 0);
+		handled = true;
+		return MutationTransactionResult{
+			.committed = committed,
+			.changed = true,
+		};
+	});
+	return handled;
+}
+
+bool Widget::moveBoundaryAfterCommit(
+		ApplyResult committed,
+		bool forward,
+		bool allowTrailing,
+		bool *mutated) {
+	if (mutated) {
+		*mutated = false;
+	}
+	const auto target = forward
+		? _state->nextEditableOrdinal()
+		: _state->previousEditableOrdinal();
+	if (target) {
+		if (committed == ApplyResult::Changed) {
+			refreshAfterInlineFieldCommit(committed);
+		}
+		if (forward) {
+			activateTextOrdinal(*target, 0);
+		} else {
+			activateTextOrdinalAtEnd(*target);
+		}
+		return true;
+	}
+	if (forward && allowTrailing && !_state->isActiveTopLevelParagraph()) {
+		const auto ordinal = _state->ensureTrailingParagraphActive();
+		if (!ordinal) {
+			return _state->lastLimitError().has_value();
+		}
+		if (mutated) {
+			*mutated = true;
+		}
+		refreshPreparedContent();
+		activateTextOrdinal(*ordinal, 0);
+		return true;
+	}
+	return false;
+}
+
+bool Widget::moveTabBoundary(bool forward) {
+	auto handled = false;
+	const auto target = forward
+		? _state->nextEditableOrdinal()
+		: _state->previousEditableOrdinal();
+	if (!target && (!forward || _state->isActiveTopLevelParagraph())) {
+		return false;
+	}
+	recordMutationTransaction([&] {
+		auto committed = ApplyResult::Unchanged;
+		if (!_field->isHidden()) {
+			committed = commitInlineField();
+			if (committed == ApplyResult::Failed) {
+				handled = true;
+				return MutationTransactionResult{
+					.committed = committed,
+					.failed = true,
+				};
+			}
+		}
+		if (target) {
+			clearSelection();
+			if (committed == ApplyResult::Changed) {
+				refreshAfterInlineFieldCommit(committed);
+			}
+			activateTextOrdinalAtEnd(*target);
+			handled = true;
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = (committed == ApplyResult::Changed),
+			};
+		}
+		clearSelection();
+		const auto ordinal = _state->ensureTrailingParagraphActive();
+		if (!ordinal) {
+			handled = _state->lastLimitError().has_value();
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = (committed == ApplyResult::Changed),
+			};
+		}
+		refreshPreparedContent();
+		activateTextOrdinalAtEnd(*ordinal);
+		handled = true;
+		return MutationTransactionResult{
+			.committed = committed,
+			.changed = true,
+		};
+	});
+	return handled;
+}
+
+bool Widget::removeBoundaryOwner(bool forward) {
+	auto handled = false;
+	recordMutationTransaction([&] {
+		const auto committed = commitInlineField();
+		if (committed == ApplyResult::Failed) {
+			handled = true;
+			return MutationTransactionResult{
+				.committed = committed,
+				.failed = true,
+			};
+		}
+		const auto target = _state->activeBoundaryTarget(forward);
+		using BoundaryAction = State::BoundaryTarget::Action;
+		switch (target.action) {
+		case BoundaryAction::RemoveActiveOwner: {
+			_boundarySelectionOrigin = std::nullopt;
+			const auto adjacent = _state->removeActiveOwnerAndSelectAdjacent(
+				forward);
+			hideInlineField();
+			clearInlineFieldEditSession();
+			refreshPreparedContent();
+			if (adjacent) {
+				if (forward) {
+					activateTextOrdinal(*adjacent, 0);
+				} else {
+					activateTextOrdinalAtEnd(*adjacent);
+				}
+			} else {
+				activateInitialNode();
+			}
+			handled = true;
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = true,
+			};
+		}
+		case BoundaryAction::Text:
+			_boundarySelectionOrigin = std::nullopt;
+			if (committed == ApplyResult::Changed) {
+				refreshAfterInlineFieldCommit(committed);
+			}
+			if (forward) {
+				activateTextOrdinal(target.textOrdinal, 0);
+			} else {
+				activateTextOrdinalAtEnd(target.textOrdinal);
+			}
+			handled = true;
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = (committed == ApplyResult::Changed),
+			};
+		case BoundaryAction::StructuralSelection:
+			setStructuralSelection(
+				target.structuralSelection,
+				BoundarySelectionOrigin{
+					.ordinal = _activeOrdinal,
+					.forward = forward,
+				});
+			_selection = {};
+			_selectionEndpoints = {};
+			_articleSelectionDrag = {};
+			_pendingOrdinal = -1;
+			_pendingCursorOffset = 0;
+			hideInlineField();
+			clearInlineFieldEditSession();
+			refreshAfterInlineFieldCommit(committed);
+			update();
+			handled = true;
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = (committed == ApplyResult::Changed),
+			};
+		case BoundaryAction::None: {
+			auto mutated = false;
+			handled = moveBoundaryAfterCommit(
+				committed,
+				forward,
+				forward,
+				&mutated);
+			return MutationTransactionResult{
+				.committed = committed,
+				.changed = mutated || (committed == ApplyResult::Changed),
+			};
+		}
+		}
+		Unexpected("Boundary action.");
+	});
+	return handled;
+}
+
+void Widget::ensurePendingActivation() {
+	if (_pendingOrdinal < 0) {
+		_activeSegmentIndex = (_activeOrdinal >= 0)
+			? segmentIndexForEditableOrdinal(_activeOrdinal)
+			: _article->firstEditableSegmentIndex();
+		return;
+	}
+	const auto ordinal = _pendingOrdinal;
+	const auto cursorOffset = _pendingCursorOffset;
+	_pendingOrdinal = -1;
+	_pendingCursorOffset = 0;
+	activateTextOrdinal(ordinal, cursorOffset);
+}
+
+void Widget::updateInlineFieldHeightOverride() {
+	if (_settingField
+		|| _field->isHidden()
+		|| _activeOrdinal < 0
+		|| !_article) {
+		return;
+	} else if (_syncingInlineFieldGeometry) {
+		_pendingHeightOverrideUpdate = true;
+		return;
+	}
+	if (_article->editableIndexForSegment(_activeSegmentIndex) < 0) {
+		_article->clearEditableHeightOverride();
+		return;
+	}
+	const auto segmentRect = fieldOuterRectForSegment(_activeSegmentIndex);
+	auto height = segmentRect.isEmpty()
+		? _field->height()
+		: std::max(_field->geometry().bottom() + 1 - segmentRect.y(), 1);
+	if (_activeSegmentIsDisplayMath) {
+		const auto blockRect = _article->displayMathBlockRect(
+			_activeSegmentIndex).translated(articleTopLeft());
+		if (!blockRect.isEmpty()) {
+			height = std::max(
+				_field->geometry().bottom() + 1 - blockRect.y(),
+				1);
+		}
+		height = std::max(height, _activeDisplayMathBaselineHeight);
+	}
+	_article->setEditableHeightOverrideForSegment(_activeSegmentIndex, height);
+	resizeToWidth(std::max(widthNoMargins(), 1));
+	update();
+}
+
+void Widget::clearDisplayMathEditSession() {
+	_activeSegmentIsDisplayMath = false;
+	_activeDisplayMathBaselineHeight = 0;
+}
+
+void Widget::clearInlineFieldEditSession() {
+	clearDisplayMathEditSession();
+	if (_article) {
+		_article->clearEditableHeightOverride();
+	}
+	if (!_field->isHidden()
+		|| !_fieldLeaf) {
+		return;
+	}
+	const auto activeLeaf = _state->activeLeafPath();
+	if (!activeLeaf || (*activeLeaf != *_fieldLeaf)) {
+		const auto &fieldStyle = inlineFieldStyleFor(
+			Markdown::MarkdownArticleTextLeafStyle());
+		_activeFieldStyleKey = fieldStyle.key;
+		_fieldMode = State::FieldMode::Rich;
+		recreateInlineField(*fieldStyle.style);
+		return;
+	}
+	retainActiveLeafField();
+	const auto &fieldStyle = inlineFieldStyleFor(
+		Markdown::MarkdownArticleTextLeafStyle());
+	_activeFieldStyleKey = fieldStyle.key;
+	_fieldMode = State::FieldMode::Rich;
+	recreateInlineField(*fieldStyle.style);
+}
+
+Widget::HistoryViewState Widget::captureHistoryViewState() const {
+	auto result = HistoryViewState();
+	if (!_field->isHidden()) {
+		const auto leaf = _state->activeLeafPath();
+		if (!leaf) {
+			return result;
+		}
+		const auto cursor = _field->textCursor();
+		const auto trimLeft = !_state->codeBlockLanguage(
+			_state->activeTextOrdinal()).has_value();
+		auto anchorOffset = 0;
+		auto cursorOffset = 0;
+		if (_state->activeFieldMode() == State::FieldMode::Raw) {
+			const auto trimmed = TrimInlineFieldText(
+				{ _state->activeRawText(), {} },
+				trimLeft);
+			const auto size = int(_state->activeRawText().size());
+			anchorOffset = std::clamp(cursor.anchor() + trimmed.left, 0, size);
+			cursorOffset = std::clamp(
+				cursor.position() + trimmed.left,
+				0,
+				size);
+		} else {
+			const auto activeText = ConvertRichTextToEditorTags(
+				_state->activeText());
+			const auto trimmed = TrimInlineFieldText(activeText.text, trimLeft);
+			const auto size = int(_state->activeText().text.size());
+			anchorOffset = std::clamp(
+				MapEditorOffsetToRichOffset(
+					activeText.replacements,
+					cursor.anchor() + trimmed.left),
+				0,
+				size);
+			cursorOffset = std::clamp(
+				MapEditorOffsetToRichOffset(
+					activeText.replacements,
+					cursor.position() + trimmed.left),
+				0,
+				size);
+		}
+		result.leafSelection = HistoryLeafSelection{
+			.leaf = *leaf,
+			.anchorOffset = anchorOffset,
+			.cursorOffset = cursorOffset,
+		};
+	} else if (hasStructuralSelection()) {
+		result.structuralSelection = _structuralSelection;
+		result.boundarySelectionOrigin = _boundarySelectionOrigin;
+	}
+	return result;
+}
+
+Widget::HistoryEntry Widget::captureHistoryEntry() const {
+	return {
+		.snapshot = _state->snapshot(),
+		.viewState = captureHistoryViewState(),
+	};
+}
+
+void Widget::restoreHistoryEntry(const HistoryEntry &entry) {
+	hideInlineField();
+	clearInlineFieldEditSession();
+	if (_article && (_horizontalScrollDrag != HorizontalScrollDrag::None)) {
+		_article->endHorizontalScroll();
+	}
+	_selection = {};
+	_selectionEndpoints = {};
+	setStructuralSelection({});
+	_articleSelectionDrag = {};
+	_pendingOrdinal = -1;
+	_pendingCursorOffset = 0;
+	_trackingPointerPress = false;
+	_horizontalScrollLock = std::nullopt;
+	_pressedControl = {};
+	_pressedControlPoint = std::nullopt;
+	_horizontalScrollDrag = HorizontalScrollDrag::None;
+	_pendingTouchHorizontalScrollPoint = std::nullopt;
+
+	const auto wasRestoring = _restoringHistory;
+	_restoringHistory = true;
+	const auto guard = gsl::finally([&] {
+		_restoringHistory = wasRestoring;
+	});
+
+	_state->restoreSnapshot(entry.snapshot);
+	refreshPreparedContent();
+
+	if (const auto &selection = entry.viewState.structuralSelection) {
+		_activeOrdinal = _state->activeTextOrdinal();
+		_activeSegmentIndex = -1;
+		_fieldLeaf = std::nullopt;
+		clearDisplayMathEditSession();
+		setStructuralSelection(
+			*selection,
+			entry.viewState.boundarySelectionOrigin);
+		hideInlineField();
+		update();
+		return;
+	}
+	if (const auto &leafSelection = entry.viewState.leafSelection) {
+		const auto ordinal = _state->textOrdinalForLeafPath(leafSelection->leaf);
+		if (ordinal >= 0) {
+			activateTextOrdinal(
+				ordinal,
+				leafSelection->anchorOffset,
+				leafSelection->cursorOffset);
+			return;
+		}
+	}
+	_activeOrdinal = _state->activeTextOrdinal();
+	_activeSegmentIndex = -1;
+	_fieldLeaf = std::nullopt;
+	clearDisplayMathEditSession();
+	hideInlineField();
+	update();
+}
+
+bool Widget::mutationTransactionChanged(bool changed) {
+	return changed;
+}
+
+bool Widget::mutationTransactionChanged(ApplyResult result) {
+	return (result == ApplyResult::Changed);
+}
+
+bool Widget::mutationTransactionChanged(
+		const MutationTransactionResult &result) {
+	return result.changed;
+}
+
+void Widget::finishMutationTransaction(
+		const HistoryEntry &before,
+		bool changed,
+		int beforeHistoryIndex,
+		uint64 beforeRetainToken) {
+	if (!changed) {
+		return;
+	}
+	const auto after = captureHistoryEntry();
+	if (SnapshotEquals(before.snapshot, after.snapshot)
+		&& (before.viewState == after.viewState)) {
+		return;
+	}
+	truncateHistoryRedo();
+	_history.push_back(after);
+	_historyIndex = int(_history.size()) - 1;
+	moveRetainedLeafFields(
+		beforeHistoryIndex,
+		_historyIndex,
+		beforeRetainToken);
+}
+
+void Widget::retainActiveLeafField() {
+	if (!_field) {
+		ensureInlineFieldCreated();
+		return;
+	} else if (!_fieldLeaf
+		|| !_activeFieldStyleKey) {
+		return;
+	}
+	const auto leaf = *_fieldLeaf;
+	if (_state->textOrdinalForLeafPath(leaf) < 0) {
+		return;
+	}
+	const auto wasSettingField = _settingField;
+	_settingField = true;
+	_field->hide();
+	_settingField = wasSettingField;
+	const auto historyIndex = _retainingFieldHistoryIndexOverride.value_or(
+		_historyIndex);
+	const auto &fieldStyle = inlineFieldStyleFor(
+		Markdown::MarkdownArticleTextLeafStyle());
+	auto replacement = base::make_unique_q<Ui::InputField>(
+		this,
+		*fieldStyle.style,
+		Ui::InputField::Mode::MultiLine,
+		rpl::single(QString()));
+	auto retained = RetainedLeafField{
+		.historyIndex = historyIndex,
+		.retainToken = ++_retainedLeafFieldToken,
+		.leaf = leaf,
+		.mode = _fieldMode,
+		.styleKey = _activeFieldStyleKey,
+	};
+	retained.field = std::move(_field);
+	_field = std::move(replacement);
+	_activeFieldStyleKey = std::nullopt;
+	_fieldMode = State::FieldMode::Rich;
+	_fieldLeaf = std::nullopt;
+	setupInlineField();
+	clearFieldUndoRedoNoopState();
+	for (auto i = _retainedLeafFields.begin(); i != _retainedLeafFields.end();) {
+		if ((i->historyIndex == retained.historyIndex)
+			&& (i->leaf == retained.leaf)
+			&& (i->mode == retained.mode)
+			&& (i->styleKey == retained.styleKey)) {
+			i = _retainedLeafFields.erase(i);
+		} else {
+			++i;
+		}
+	}
+	_retainedLeafFields.push_back(std::move(retained));
+	pruneRetainedLeafFields();
+}
+
+base::unique_qptr<Ui::InputField> Widget::reviveRetainedLeafField(
+		int historyIndex,
+		const State::LeafPath &leaf,
+		State::FieldMode mode,
+		const InlineFieldStyleKey &styleKey) {
+	for (auto i = int(_retainedLeafFields.size()) - 1; i >= 0; --i) {
+		if ((_retainedLeafFields[i].historyIndex == historyIndex)
+			&& (_retainedLeafFields[i].leaf == leaf)
+			&& (_retainedLeafFields[i].mode == mode)
+			&& _retainedLeafFields[i].styleKey
+			&& (*_retainedLeafFields[i].styleKey == styleKey)) {
+			auto result = std::move(_retainedLeafFields[i].field);
+			_retainedLeafFields.erase(_retainedLeafFields.begin() + i);
+			return result;
+		}
+	}
+	return {};
+}
+
+void Widget::pruneRetainedLeafFields() {
+	for (auto i = _retainedLeafFields.begin(); i != _retainedLeafFields.end();) {
+		if (!i->field) {
+			i = _retainedLeafFields.erase(i);
+		} else {
+			++i;
+		}
+	}
+	while (int(_retainedLeafFields.size()) > kRetainedLeafFieldLimit) {
+		_retainedLeafFields.erase(_retainedLeafFields.begin());
+	}
+}
+
+void Widget::removeRetainedLeafFieldsAfter(int historyIndex) {
+	for (auto i = _retainedLeafFields.begin(); i != _retainedLeafFields.end();) {
+		if (i->historyIndex > historyIndex) {
+			i = _retainedLeafFields.erase(i);
+		} else {
+			++i;
+		}
+	}
+}
+
+void Widget::moveRetainedLeafFields(
+		int fromHistoryIndex,
+		int toHistoryIndex,
+		uint64 afterRetainToken) {
+	if (fromHistoryIndex == toHistoryIndex) {
+		return;
+	}
+	for (auto &retained : _retainedLeafFields) {
+		if ((retained.historyIndex == fromHistoryIndex)
+			&& (retained.retainToken > afterRetainToken)) {
+			retained.historyIndex = toHistoryIndex;
+		}
+	}
+}
+
+void Widget::refreshAfterInlineFieldCommit(ApplyResult committed) {
+	switch ((committed == ApplyResult::Changed)
+		? _state->lastPreparedMutationKind()
+		: PreparedMutationKind::None) {
+	case PreparedMutationKind::LeafOnly:
+		refreshPreparedLeafAtActiveSource();
+		break;
+	case PreparedMutationKind::FullRebuild:
+		refreshPreparedContent();
+		break;
+	case PreparedMutationKind::None:
+		relayoutCurrentContent();
+		break;
+	}
+}
+
+void Widget::ensureArticleLayoutForInlineField(int width) {
+	if (!_article || width <= 0) {
+		return;
+	}
+	_articleHeight = _article->resizeGetHeight(articleWidth(width));
+}
+
+void Widget::syncArticleVisibleTopBottom() {
+	if (!_article) {
+		return;
+	}
+	const auto articleTop = articleTopLeft().y();
+	_article->setVisibleTopBottom(
+		_visibleRange.top - articleTop,
+		_visibleRange.bottom - articleTop);
+}
+
+void Widget::syncInlineFieldGeometry(int width) {
+	if (_field->isHidden() || width <= 0) {
+		return;
+	}
+	ensureArticleLayoutForInlineField(width);
+	if (_activeSegmentIndex >= 0) {
+		ensureInlineFieldForSegment(_activeSegmentIndex);
+	}
+	const auto segmentRect = fieldOuterRectForSegment(_activeSegmentIndex);
+	if (segmentRect.isEmpty()) {
+		_pendingOrdinal = _activeOrdinal;
+		_pendingCursorOffset = _field->textCursor().position();
+		hideInlineField();
+		_article->clearEditableHeightOverride();
+		return;
+	}
+	const auto margins = _field->fullTextMargins();
+	const auto left = segmentRect.x() - margins.left();
+	const auto top = segmentRect.y() - margins.top();
+	const auto fieldWidth = std::max(
+		segmentRect.width() + margins.left() + margins.right(),
+		1);
+	_syncingInlineFieldGeometry = true;
+	_field->resizeToWidth(fieldWidth);
+	const auto fieldHeight = FieldNaturalHeight(_field.get());
+	_field->setGeometryToLeft(left, top, fieldWidth, fieldHeight, width);
+	_field->raise();
+	_syncingInlineFieldGeometry = false;
+	if (_pendingHeightOverrideUpdate) {
+		_pendingHeightOverrideUpdate = false;
+		updateInlineFieldHeightOverride();
+	}
+}
+
+void Widget::setStructuralSelection(
+		Markdown::PreparedEditSelection selection,
+		std::optional<BoundarySelectionOrigin> origin) {
+	_structuralSelection = std::move(selection);
+	_boundarySelectionOrigin = std::move(origin);
+}
+
+void Widget::clearSelection() {
+	const auto changed = !_selection.empty()
+		|| _selectionEndpoints.from.valid()
+		|| _selectionEndpoints.to.valid()
+		|| hasStructuralSelection()
+		|| _articleSelectionDrag.active;
+	_selection = {};
+	_selectionEndpoints = {};
+	setStructuralSelection({});
+	_articleSelectionDrag = {};
+	if (changed) {
+		update();
+	}
+}
+
+void Widget::clearTextSelection() {
+	const auto changed = !_selection.empty()
+		|| _selectionEndpoints.from.valid()
+		|| _selectionEndpoints.to.valid()
+		|| (_articleSelectionDrag.active
+			&& _articleSelectionDrag.mode == DragSelectionMode::Text);
+	_selection = {};
+	_selectionEndpoints = {};
+	if (_articleSelectionDrag.mode == DragSelectionMode::Text) {
+		finishArticleSelection();
+	} else {
+		_articleSelectionDrag.textSegment = -1;
+		_articleSelectionDrag.textOffset = 0;
+	}
+	if (changed) {
+		update();
+	}
+}
+
+void Widget::clearStructuralSelection() {
+	const auto changed = hasStructuralSelection()
+		|| (_articleSelectionDrag.active
+			&& _articleSelectionDrag.mode == DragSelectionMode::Structural);
+	setStructuralSelection({});
+	if (_articleSelectionDrag.mode == DragSelectionMode::Structural) {
+		finishArticleSelection();
+	}
+	if (changed) {
+		update();
+	}
+}
+
+bool Widget::hasStructuralSelection() const {
+	return !_structuralSelection.empty();
+}
+
+void Widget::startArticleSelection(
+		QPoint pressPoint,
+		const Markdown::MarkdownArticleHitTestResult &hit,
+		const PreparedEditHit &editHit,
+		bool fromField,
+		bool startedBelow) {
+	const auto isTextHit = hit.valid()
+		&& !hit.codeHeaderCopy
+		&& hit.direct
+		&& _article->segmentIsText(hit.segmentIndex);
+	const auto isDisplayMathHit = hit.valid()
+		&& !hit.codeHeaderCopy
+		&& hit.direct
+		&& _article->segmentIsDisplayMath(hit.segmentIndex);
+	const auto displayMathSegment = [&] {
+		if (isDisplayMathHit) {
+			return hit.segmentIndex;
+		}
+		if (editHit.leaf
+			&& (editHit.leaf->kind
+				== Markdown::PreparedEditLeafKind::MathFormula)) {
+			const auto ordinal = _state->textOrdinalForLeaf(*editHit.leaf);
+			return (ordinal >= 0)
+				? segmentIndexForEditableOrdinal(ordinal)
+				: -1;
+		}
+		return -1;
+	}();
+	if (isTextHit) {
+		clearStructuralSelection();
+	} else {
+		clearTextSelection();
+		clearStructuralSelection();
+	}
+	_articleSelectionDrag = {
+		.active = true,
+		.fromField = fromField,
+		.startedBelow = startedBelow,
+		.codeHeader = hit.codeHeaderCopy,
+		.pressPoint = pressPoint,
+		.anchorHit = editHit,
+		.textSegment = -1,
+		.textOffset = 0,
+		.mode = DragSelectionMode::None,
+	};
+	if (!isTextHit) {
+		if (displayMathSegment >= 0) {
+			_articleSelectionDrag.textSegment = displayMathSegment;
+			return;
+		}
+		if (editHit.valid() && !hit.codeHeaderCopy && !startedBelow) {
+			_articleSelectionDrag.mode = DragSelectionMode::Structural;
+		}
+		return;
+	}
+	const auto offset = _article->selectionOffsetFromHit(
+		hit,
+		TextSelectType::Letters);
+	_articleSelectionDrag.textSegment = hit.segmentIndex;
+	_articleSelectionDrag.textOffset = offset;
+	_articleSelectionDrag.mode = DragSelectionMode::Text;
+	_selection = {
+		{ hit.segmentIndex, offset },
+		{ hit.segmentIndex, offset },
+	};
+	_selectionEndpoints = {
+		.from = MakeSelectionEndpoint(hit),
+		.to = MakeSelectionEndpoint(hit),
+	};
+	update();
+}
+
+void Widget::updateArticleSelection(
+		QPoint articlePoint,
+		const Markdown::MarkdownArticleHitTestResult &hit,
+		const PreparedEditHit &editHit) {
+	if (!_articleSelectionDrag.active) {
+		return;
+	}
+	const auto dragSegment = _articleSelectionDrag.textSegment;
+	const auto originalMathFormulaHit = [&] {
+		return _articleSelectionDrag.anchorHit.leaf
+			&& (_articleSelectionDrag.anchorHit.leaf->kind
+				== Markdown::PreparedEditLeafKind::MathFormula)
+			&& editHit.leaf
+			&& (*editHit.leaf == *_articleSelectionDrag.anchorHit.leaf);
+	};
+	const auto directOriginalTextHit = [&] {
+		return (dragSegment >= 0)
+			&& hit.valid()
+			&& hit.direct
+			&& (hit.segmentIndex == dragSegment)
+			&& _article->segmentIsText(hit.segmentIndex);
+	};
+	const auto directOriginalEditableHit = [&] {
+		return ((dragSegment >= 0)
+			&& hit.valid()
+			&& hit.direct
+			&& (hit.segmentIndex == dragSegment)
+			&& _article->segmentIsEditable(hit.segmentIndex))
+			|| originalMathFormulaHit();
+	};
+	const auto updateTextSelection = [&](bool forceUpdate) {
+		const auto offset = _article->selectionOffsetFromHit(
+			hit,
+			TextSelectType::Letters);
+		const auto adjusted = _article->adjustSelection(
+			dragSegment,
+			TextSelection(
+				uint16(std::clamp(
+					std::min(_articleSelectionDrag.textOffset, offset),
+					0,
+					0xFFFF)),
+				uint16(std::clamp(
+					std::max(_articleSelectionDrag.textOffset, offset),
+					0,
+					0xFFFF))),
+			TextSelectType::Letters);
+		const auto selection = NormalizeSelection({
+			{ dragSegment, adjusted.from },
+			{ dragSegment, adjusted.to },
+		});
+		const auto endpoints = Markdown::MarkdownArticleSelectionEndpoints{
+			.from = _selectionEndpoints.from.valid()
+				? _selectionEndpoints.from
+				: Markdown::MarkdownArticleSelectionEndpoint{
+					dragSegment,
+					false },
+			.to = MakeSelectionEndpoint(hit),
+		};
+		const auto endpointsChanged
+			= (_selectionEndpoints.from.segment != endpoints.from.segment)
+			|| (_selectionEndpoints.from.direct != endpoints.from.direct)
+			|| (_selectionEndpoints.to.segment != endpoints.to.segment)
+			|| (_selectionEndpoints.to.direct != endpoints.to.direct);
+		if (_selection != selection || endpointsChanged || forceUpdate) {
+			_selection = selection;
+			_selectionEndpoints = endpoints;
+			update();
+		} else {
+			_selectionEndpoints = endpoints;
+		}
+	};
+	const auto clearFieldSelection = [&] {
+		if (!_articleSelectionDrag.fromField) {
+			return;
+		}
+		auto cursor = _field->textCursor();
+		if (!cursor.hasSelection()) {
+			return;
+		}
+		cursor.clearSelection();
+		_field->setTextCursor(cursor);
+	};
+	if (_articleSelectionDrag.mode == DragSelectionMode::Structural) {
+		if (directOriginalTextHit()) {
+			const auto forceUpdate = !_structuralSelection.empty();
+			setStructuralSelection({});
+			_articleSelectionDrag.mode = DragSelectionMode::Text;
+			updateTextSelection(forceUpdate);
+			return;
+		}
+		if (directOriginalEditableHit()) {
+			const auto changed = !_structuralSelection.empty();
+			setStructuralSelection({});
+			_articleSelectionDrag.mode = DragSelectionMode::None;
+			if (changed) {
+				update();
+			}
+			return;
+		}
+		const auto selection = structuralSelectionFromHits(
+			_articleSelectionDrag.anchorHit,
+			editHit);
+		if (_structuralSelection != selection) {
+			setStructuralSelection(selection);
+			update();
+		}
+		return;
+	} else if (_articleSelectionDrag.mode == DragSelectionMode::None) {
+		if (directOriginalEditableHit()) {
+			return;
+		}
+		if (!editHit.valid()
+			|| (_articleSelectionDrag.startedBelow
+				&& articlePoint.y() >= _articleHeight)) {
+			return;
+		}
+		_articleSelectionDrag.mode = DragSelectionMode::Structural;
+		const auto selection = structuralSelectionFromHits(
+			_articleSelectionDrag.anchorHit,
+			editHit);
+		if (_structuralSelection != selection) {
+			setStructuralSelection(selection);
+			update();
+		}
+		return;
+	}
+	if (_articleSelectionDrag.mode != DragSelectionMode::Text) {
+		return;
+	}
+	if (directOriginalTextHit()) {
+		updateTextSelection(false);
+		return;
+	}
+	const auto selection = structuralSelectionFromHits(
+		_articleSelectionDrag.anchorHit,
+		editHit);
+	const auto changed = !_selection.empty()
+		|| _selectionEndpoints.from.valid()
+		|| _selectionEndpoints.to.valid()
+		|| (_structuralSelection != selection);
+	_selection = {};
+	_selectionEndpoints = {};
+	setStructuralSelection(selection);
+	_articleSelectionDrag.mode = DragSelectionMode::Structural;
+	clearFieldSelection();
+	if (changed) {
+		update();
+	}
+}
+
+void Widget::finishArticleSelection() {
+	_articleSelectionDrag = {};
+}
+
+bool Widget::handleStructuralSelectionKey(QKeyEvent *e) {
+	if (!hasStructuralSelection()) {
+		return false;
+	}
+	const auto key = e->key();
+	if (key == Qt::Key_Escape) {
+		clearStructuralSelection();
+		e->accept();
+		return true;
+	}
+	const auto modifiers = e->modifiers()
+		& ~(Qt::KeypadModifier | Qt::GroupSwitchModifier);
+	if (modifiers != Qt::NoModifier) {
+		return false;
+	}
+	const auto forward = (key == Qt::Key_Delete);
+	if (!forward && key != Qt::Key_Backspace) {
+		return false;
+	}
+	if (!_state->canRemoveStructuralSelection(_structuralSelection)) {
+		e->accept();
+		return true;
+	}
+	const auto origin = [&]() -> std::optional<BoundarySelectionOrigin> {
+		if (_boundarySelectionOrigin
+			&& _boundarySelectionOrigin->forward == forward) {
+			return _boundarySelectionOrigin;
+		}
+		return std::nullopt;
+	}();
+	const auto target = removeCurrentStructuralSelection(forward);
+	if (hasStructuralSelection()) {
+		e->accept();
+		return true;
+	}
+	auto activatedOrigin = false;
+	if (origin && _state->setActiveTextByOrdinal(origin->ordinal)) {
+		const auto cursor = origin->forward ? _state->activeTextLength() : 0;
+		activateTextOrdinal(origin->ordinal, cursor);
+		activatedOrigin = true;
+	}
+	if (!activatedOrigin) {
+		if (target) {
+			if (forward) {
+				activateTextOrdinal(*target, 0);
+			} else {
+				activateTextOrdinalAtEnd(*target);
+			}
+		} else {
+			activateInitialNode();
+		}
+	}
+	e->accept();
+	return true;
+}
+
+std::optional<int> Widget::removeCurrentStructuralSelection(bool forward) {
+	if (!hasStructuralSelection()) {
+		return std::nullopt;
+	}
+	const auto selection = _structuralSelection;
+	auto target = std::optional<int>();
+	const auto result = recordMutationTransaction([&] {
+		const auto committed = commitInlineField();
+		if (committed == ApplyResult::Failed) {
+			return MutationTransactionResult{
+				.committed = committed,
+				.failed = true,
+			};
+		}
+		_pendingOrdinal = -1;
+		_pendingCursorOffset = 0;
+		hideInlineField();
+		clearInlineFieldEditSession();
+		target = _state->removeStructuralSelection(selection, forward);
+		clearSelection();
+		refreshPreparedContent();
+		return MutationTransactionResult{
+			.committed = committed,
+			.changed = true,
+		};
+	});
+	if (result.failed) {
+		return std::nullopt;
+	}
+	return target;
+}
+
+bool Widget::handleFieldMouseEvent(QEvent *event) {
+	if (!_article || _field->isHidden() || _activeSegmentIndex < 0) {
+		return false;
+	}
+	const auto type = event->type();
+	const auto mouse = static_cast<QMouseEvent*>(event);
+	if (type == QEvent::MouseButtonPress) {
+		if (mouse->button() != Qt::LeftButton) {
+			return false;
+		}
+		const auto segmentRect = _article->segmentRect(_activeSegmentIndex);
+		if (segmentRect.isEmpty()) {
+			return false;
+		}
+		auto anchorHit = _article->editHitTest(segmentRect.center());
+		if (!anchorHit.valid()) {
+			anchorHit = _article->editHitTest(segmentRect.topLeft());
+		}
+		if (!anchorHit.valid()) {
+			return false;
+		}
+		clearTextSelection();
+		clearStructuralSelection();
+		const auto globalPoint = mouse->globalPos();
+		const auto articlePoint = mapFromGlobal(globalPoint)
+			- articleTopLeft();
+		const auto cursor = _field->textCursor();
+		_trackingPointerPress = true;
+		_articleSelectionDrag = {
+			.active = true,
+			.fromField = true,
+			.startedBelow = false,
+			.codeHeader = false,
+			.pressPoint = articlePoint,
+			.anchorHit = anchorHit,
+			.textSegment = _activeSegmentIndex,
+			.textOffset = std::clamp(
+				cursor.position(),
+				0,
+				int(_field->getLastText().size())),
+			.mode = DragSelectionMode::Text,
+		};
+		return false;
+	} else if (!_articleSelectionDrag.active
+		|| !_articleSelectionDrag.fromField) {
+		return false;
+	} else if (type == QEvent::MouseButtonRelease
+		&& mouse->button() != Qt::LeftButton) {
+		return false;
+	} else if (type == QEvent::MouseMove
+		&& !(mouse->buttons() & Qt::LeftButton)) {
+		finishArticleSelection();
+		_trackingPointerPress = false;
+		return false;
+	}
+
+	const auto globalPoint = mouse->globalPos();
+	const auto articlePoint = mapFromGlobal(globalPoint) - articleTopLeft();
+	const auto hit = _article->hitTest(
+		articlePoint,
+		Ui::Text::StateRequest::Flag::LookupSymbol);
+	const auto editHit = _article->editHitTest(articlePoint);
+	const auto insideActiveField = _field->rect().contains(
+		_field->mapFromGlobal(globalPoint));
+	const auto originalSegmentHit = hit.valid()
+		&& hit.direct
+		&& (hit.segmentIndex == _articleSelectionDrag.textSegment)
+		&& _article->segmentIsEditable(hit.segmentIndex);
+	const auto originalMathFormulaHit = _articleSelectionDrag.anchorHit.leaf
+		&& (_articleSelectionDrag.anchorHit.leaf->kind
+			== Markdown::PreparedEditLeafKind::MathFormula)
+		&& editHit.leaf
+		&& (*editHit.leaf == *_articleSelectionDrag.anchorHit.leaf);
+	const auto clearArticleSelection = [&] {
+		const auto changed = !_selection.empty()
+			|| _selectionEndpoints.from.valid()
+			|| _selectionEndpoints.to.valid()
+			|| hasStructuralSelection();
+		_selection = {};
+		_selectionEndpoints = {};
+		setStructuralSelection({});
+		if (changed) {
+			update();
+		}
+	};
+	if (insideActiveField || originalSegmentHit || originalMathFormulaHit) {
+		if (_articleSelectionDrag.mode == DragSelectionMode::Structural) {
+			clearArticleSelection();
+			_articleSelectionDrag.mode = DragSelectionMode::Text;
+		}
+		if (type == QEvent::MouseButtonRelease) {
+			finishArticleSelection();
+			_trackingPointerPress = false;
+		}
+		return false;
+	}
+
+	updateArticleSelection(articlePoint, hit, editHit);
+	if (type == QEvent::MouseButtonRelease) {
+		if (hasStructuralSelection()) {
+			const auto committed = recordMutationTransaction([&] {
+				return commitInlineField();
+			});
+			if (committed == ApplyResult::Failed) {
+				mouse->accept();
+				return true;
+			}
+			_pendingOrdinal = -1;
+			_pendingCursorOffset = 0;
+			hideInlineField();
+			clearInlineFieldEditSession();
+			refreshAfterInlineFieldCommit(committed);
+			finishArticleSelection();
+			_trackingPointerPress = false;
+			mouse->accept();
+			return true;
+		}
+		finishArticleSelection();
+		_trackingPointerPress = false;
+		return false;
+	}
+	if (_articleSelectionDrag.mode == DragSelectionMode::Structural) {
+		mouse->accept();
+		return true;
+	}
+	return false;
+}
+
+PreparedEditSelection Widget::structuralSelectionFromHits(
+		const PreparedEditHit &anchor,
+		const PreparedEditHit &focus) const {
+	const auto anchorOwner = StructuralOwnerFromHit(anchor);
+	const auto focusOwner = StructuralOwnerFromHit(focus);
+	if (!anchorOwner.valid() || !focusOwner.valid()) {
+		return {};
+	}
+	const auto anchorCell = TableCellFromOwner(anchorOwner);
+	const auto focusCell = TableCellFromOwner(focusOwner);
+	if (anchorCell && focusCell) {
+		const auto range = TableRangesUnion(
+			TableRangeFromCell(*anchorCell),
+			TableRangeFromCell(*focusCell));
+		if (!range.empty()
+			&& TableRangeContainsCell(range, *anchorCell)
+			&& TableRangeContainsCell(range, *focusCell)) {
+			return {
+				.kind = PreparedEditSelectionKind::TableCells,
+				.tableCells = range,
+			};
+		}
+	}
+	const auto anchorRow = TableRowFromOwner(anchorOwner);
+	const auto focusRow = TableRowFromOwner(focusOwner);
+	if (anchorRow
+		&& focusRow
+		&& SamePreparedEditBlockPath(anchorRow->block, focusRow->block)) {
+		const auto range = NormalizeIntegerRange(
+			anchorRow->tableRowIndex,
+			focusRow->tableRowIndex);
+		if (!range.empty()) {
+			return {
+				.kind = PreparedEditSelectionKind::TableRows,
+				.tableRows = {
+					.block = anchorRow->block,
+					.from = range.from,
+					.till = range.till,
+				},
+			};
+		}
+	}
+	const auto anchorListItem = ListItemFromOwner(anchorOwner);
+	const auto focusListItem = ListItemFromOwner(focusOwner);
+	if (anchorListItem
+		&& focusListItem
+		&& SamePreparedEditBlockPath(
+			anchorListItem->block,
+			focusListItem->block)) {
+		const auto range = NormalizeIntegerRange(
+			anchorListItem->listItemIndex,
+			focusListItem->listItemIndex);
+		if (!range.empty()) {
+			return {
+				.kind = PreparedEditSelectionKind::ListItems,
+				.listItems = {
+					.block = anchorListItem->block,
+					.from = range.from,
+					.till = range.till,
+				},
+			};
+		}
+	}
+	const auto anchorBlock = BlockPathFromOwner(anchorOwner);
+	const auto focusBlock = BlockPathFromOwner(focusOwner);
+	if (!anchorBlock || !focusBlock) {
+		return {};
+	}
+	if (ComparePreparedEditBlockContainerPaths(
+			anchorBlock->container,
+			focusBlock->container) == 0) {
+		const auto blockSelection = BlockSelectionFromIndexes(
+			anchorBlock->container,
+			anchorBlock->index,
+			focusBlock->index);
+		if (!blockSelection.empty()) {
+			return blockSelection;
+		}
+	}
+	const auto listItemsFromChildren = ListItemSelectionFromSources(
+		ListItemSourcesFromOwner(anchorOwner, anchorBlock),
+		ListItemSourcesFromOwner(focusOwner, focusBlock));
+	const auto liftedBlockSelection = LiftedBlockSelection(
+		*anchorBlock,
+		*focusBlock);
+	if (IsBlockOwner(anchorOwner)
+		&& IsBlockOwner(focusOwner)
+		&& !liftedBlockSelection.empty()
+		&& !IsMultiListItemSelection(listItemsFromChildren)) {
+		return liftedBlockSelection;
+	}
+	if (!listItemsFromChildren.empty()) {
+		return listItemsFromChildren;
+	}
+	if (!liftedBlockSelection.empty()) {
+		return liftedBlockSelection;
+	}
+	return {};
+}
+
+int Widget::editableOrdinalForSegment(int segmentIndex) const {
+	return _article->editableIndexForSegment(segmentIndex);
+}
+
+int Widget::segmentIndexForEditableOrdinal(int ordinal) const {
+	return _article->segmentIndexForEditableIndex(ordinal);
+}
+
+QPoint Widget::articleTopLeft() const {
+	const auto padding = EditorBodyPadding();
+	return { padding.left(), padding.top() };
+}
+
+int Widget::articleWidth(int outerWidth) const {
+	const auto padding = EditorBodyPadding();
+	return std::max(
+		outerWidth - padding.left() - padding.right(),
+		1);
+}
+
+QRect Widget::outerEditableSegmentRect(int segmentIndex) const {
+	const auto rect = _article->logicalSegmentRect(segmentIndex);
+	return rect.isEmpty() ? rect : rect.translated(articleTopLeft());
+}
+
+QRect Widget::fieldOuterRectForSegment(int segmentIndex) const {
+	if (!_article || segmentIndex < 0) {
+		return QRect();
+	}
+	if (!_activeSegmentIsDisplayMath) {
+		return outerEditableSegmentRect(segmentIndex);
+	}
+	const auto rect = _article->displayMathEditRect(segmentIndex);
+	return rect.isEmpty() ? rect : rect.translated(articleTopLeft());
+}
+
+Markdown::MarkdownArticlePaintContext Widget::textPaintContext(QRect clip) {
+	const auto logicalRect = QRect(QPoint(), QSize(
+		articleWidth(std::max(widthNoMargins(), 1)),
+		std::max(_articleHeight, 1)));
+	auto context = Markdown::MarkdownArticlePaintContext(
+		_theme->preparePaintContext(
+			_style.get(),
+			logicalRect,
+			logicalRect,
+			clip,
+			window() ? !window()->isActiveWindow() : false));
+	const auto messageStyle = context.messageStyle();
+	context.caches = {
+		.pre = messageStyle->preCache.get(),
+		.blockquote = context.quoteCache({}, 0),
+		.colors = _highlightColors,
+		.st = &messageStyle->richPageStyle,
+		.repaint = [=] {
+			crl::on_main(this, [=] {
+				update();
+			});
+		},
+		.repaintRect = [=](QRect rect) {
+			crl::on_main(this, [=] {
+				if (rect.isEmpty()) {
+					update();
+				} else {
+					update(rect.translated(articleTopLeft()));
+				}
+			});
+		},
+	};
+	const auto hiddenSegmentIndex = _field->isHidden()
+		? -1
+		: _activeSegmentIndex;
+	context.hiddenTextSegmentIndex = hiddenSegmentIndex;
+	context.hiddenSegmentIndex = hiddenSegmentIndex;
+	context.selectionState.selection = _selection;
+	context.selectionState.endpoints = &_selectionEndpoints;
+	if (!_structuralSelection.empty()) {
+		context.selectionState.structuralSelection = &_structuralSelection;
+	}
+	return context;
+}
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_widget.h b/Telegram/SourceFiles/iv/editor/iv_editor_widget.h
new file mode 100644
index 00000000000000..a6d978fa3f553e
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_widget.h
@@ -0,0 +1,466 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/unique_qptr.h"
+#include "iv/editor/iv_editor_state.h"
+#include "iv/markdown/iv_markdown_article.h"
+#include "ui/style/style_core_types.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/rp_widget.h"
+#include "rpl/lifetime.h"
+
+#include <rpl/event_stream.h>
+
+#include <memory>
+#include <optional>
+#include <vector>
+
+class QEvent;
+class QContextMenuEvent;
+class QInputMethodEvent;
+class QKeyEvent;
+class QMimeData;
+class QMenu;
+class QObject;
+class QTouchEvent;
+class QWheelEvent;
+
+namespace Ui {
+class ChatStyle;
+class ChatTheme;
+class InputField;
+class PopupMenu;
+} // namespace Ui
+
+namespace style {
+struct InputField;
+struct Markdown;
+} // namespace style
+
+class PeerData;
+class DocumentData;
+
+namespace Main {
+class Session;
+class SessionShow;
+} // namespace Main
+
+namespace Iv::Editor {
+
+struct WidgetServices {
+	not_null<Main::Session*> session;
+	std::shared_ptr<Main::SessionShow> show;
+	not_null<QWidget*> outer;
+	Fn<bool()> customEmojiPaused;
+	rpl::producer<> imeCompositionStarts;
+};
+
+class Widget final : public Ui::RpWidget {
+public:
+	Widget(
+		QWidget *parent,
+		WidgetServices services,
+		not_null<PeerData*> peer,
+		std::shared_ptr<State> state,
+		Fn<void(RichMessageLimitError)> showLimitToast = {});
+
+	void activateInitialNode();
+	void activateSegment(int segmentIndex, int cursorOffset);
+	[[nodiscard]] State::ApplyResult commitInlineField();
+	void refreshPreparedContent();
+	void refreshPreparedLeafAtActiveSource();
+	void applyExternalRichPageMutation(Fn<bool(RichPage&)> mutation);
+	void syncInlineFieldGeometry();
+	void insertBlock(State::InsertAction action);
+	void insertPreparedBlock(RichPage::Block block);
+	void insertPreparedBlocks(std::vector<RichPage::Block> blocks);
+	void insertHeading1();
+	void insertBlockquote();
+	void insertEmoji(EmojiPtr emoji);
+	void insertCustomEmoji(not_null<DocumentData*> document);
+	void setInlineFieldExternalInteractionActive(bool active);
+
+	int resizeGetHeight(int newWidth) override;
+
+protected:
+	bool eventFilter(QObject *object, QEvent *event) override;
+	bool eventHook(QEvent *e) override;
+	void contextMenuEvent(QContextMenuEvent *e) override;
+	void focusInEvent(QFocusEvent *e) override;
+	bool focusNextPrevChild(bool next) override;
+	void keyPressEvent(QKeyEvent *e) override;
+	void inputMethodEvent(QInputMethodEvent *e) override;
+	QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+	void visibleTopBottomUpdated(int visibleTop, int visibleBottom) override;
+	void wheelEvent(QWheelEvent *e) override;
+
+private:
+	struct InlineFieldStyleData {
+		const style::TextStyle *textStyle = nullptr;
+		int lineHeight = 0;
+		style::color textFg;
+		QColor textMarkBg;
+		style::align align = style::al_left;
+		bool italic = false;
+	};
+
+	struct InlineFieldStyleKey {
+		style::font font;
+		int lineHeight = 0;
+		style::color textFg;
+		style::align align = style::al_left;
+
+		friend inline bool operator==(
+				const InlineFieldStyleKey &a,
+				const InlineFieldStyleKey &b) {
+			return (a.font == b.font)
+				&& (a.lineHeight == b.lineHeight)
+				&& (a.textFg == b.textFg)
+				&& (a.align == b.align);
+		}
+
+		friend inline bool operator!=(
+				const InlineFieldStyleKey &a,
+				const InlineFieldStyleKey &b) {
+			return !(a == b);
+		}
+	};
+
+	struct CachedInlineFieldStyle {
+		InlineFieldStyleKey key;
+		std::shared_ptr<style::InputField> style;
+		std::shared_ptr<style::owned_color> ownedTextFg;
+		std::shared_ptr<style::owned_color> ownedTextMarkBg;
+	};
+
+	enum class DragSelectionMode {
+		None,
+		Text,
+		Structural,
+	};
+
+	struct ArticleSelectionDrag {
+		bool active = false;
+		bool fromField = false;
+		bool startedBelow = false;
+		bool codeHeader = false;
+		QPoint pressPoint;
+		Markdown::PreparedEditHit anchorHit;
+		int textSegment = -1;
+		int textOffset = 0;
+		DragSelectionMode mode = DragSelectionMode::None;
+	};
+
+	enum class HorizontalScrollDrag {
+		None,
+		Mouse,
+		Touch,
+	};
+
+	struct BoundarySelectionOrigin {
+		int ordinal = -1;
+		bool forward = false;
+
+		friend inline bool operator==(
+				const BoundarySelectionOrigin &a,
+				const BoundarySelectionOrigin &b) {
+			return (a.ordinal == b.ordinal)
+				&& (a.forward == b.forward);
+		}
+	};
+
+	struct HistoryLeafSelection {
+		State::LeafPath leaf;
+		int anchorOffset = 0;
+		int cursorOffset = 0;
+
+		friend inline bool operator==(
+				const HistoryLeafSelection &a,
+				const HistoryLeafSelection &b) {
+			return (a.leaf == b.leaf)
+				&& (a.anchorOffset == b.anchorOffset)
+				&& (a.cursorOffset == b.cursorOffset);
+		}
+	};
+
+	struct HistoryViewState {
+		std::optional<HistoryLeafSelection> leafSelection;
+		std::optional<Markdown::PreparedEditSelection> structuralSelection;
+		std::optional<BoundarySelectionOrigin> boundarySelectionOrigin;
+
+		friend inline bool operator==(
+				const HistoryViewState &a,
+				const HistoryViewState &b) {
+			return (a.leafSelection == b.leafSelection)
+				&& (a.structuralSelection == b.structuralSelection)
+				&& (a.boundarySelectionOrigin
+					== b.boundarySelectionOrigin);
+		}
+	};
+
+	struct HistoryEntry {
+		State::Snapshot snapshot;
+		HistoryViewState viewState;
+	};
+
+	struct MutationTransactionResult {
+		State::ApplyResult committed = State::ApplyResult::Unchanged;
+		bool changed = false;
+		bool failed = false;
+	};
+
+	struct RetainedLeafField {
+		int historyIndex = -1;
+		uint64 retainToken = 0;
+		State::LeafPath leaf;
+		State::FieldMode mode = State::FieldMode::Rich;
+		std::optional<InlineFieldStyleKey> styleKey;
+		base::unique_qptr<Ui::InputField> field;
+	};
+
+	void setDocument(const Markdown::MarkdownArticleContent &prepared);
+	void activateTextOrdinal(int ordinal, int cursorOffset);
+	void activateTextOrdinal(int ordinal, int selectionFrom, int selectionTo);
+	[[nodiscard]] Markdown::MarkdownArticleTextLeafStyle
+	inlineFieldStyleForSegment(int segmentIndex) const;
+	[[nodiscard]] const CachedInlineFieldStyle &inlineFieldStyleFor(
+		const Markdown::MarkdownArticleTextLeafStyle &style);
+	[[nodiscard]] const CachedInlineFieldStyle &inlineFieldStyleFor(
+		const InlineFieldStyleData &data);
+	[[nodiscard]] InlineFieldStyleData normalizedInlineFieldStyle(
+		const Markdown::MarkdownArticleTextLeafStyle &style) const;
+	[[nodiscard]] InlineFieldStyleKey inlineFieldStyleKey(
+		const InlineFieldStyleData &data) const;
+	void refreshInlineFieldTextColorOverride();
+	[[nodiscard]] std::optional<QColor> activeQuoteCaptionColor();
+	[[nodiscard]] std::optional<QColor> activeQuotePlaceholderColor();
+	void ensureInlineFieldForSegment(int segmentIndex);
+	void setupInlineField();
+	void ensureInlineFieldCreated();
+	void recreateInlineField(const style::InputField &st);
+	void refreshInlineFieldPlaceholder();
+	void refreshInlineFieldPlaceholderColor();
+	void activateTrailingParagraph();
+	void setInlineFieldFromActiveState(int selectionFrom, int selectionTo);
+	void revertInlineFieldToState();
+	[[nodiscard]] std::optional<State::ActiveTextInsertContext>
+	activeTextInsertContext() const;
+	[[nodiscard]] int richOffsetForFieldOffset(
+		const TextWithEntities &text,
+		int offset) const;
+	[[nodiscard]] State::ApplyResult applyFieldTextToState();
+	bool showLastLimitToast();
+	void hideInlineField();
+	void acceptInlineField();
+	void hideInlineFieldAndRefresh();
+	void activateTextOrdinalAtEnd(int ordinal);
+	[[nodiscard]] bool redirectKeyToField(QKeyEvent *e) const;
+	[[nodiscard]] bool redirectImeToField() const;
+	[[nodiscard]] bool prepareFieldForInput();
+	[[nodiscard]] std::optional<int> removeCurrentStructuralSelection(
+		bool forward);
+	[[nodiscard]] bool replayKeyIntoField(QKeyEvent *e);
+	[[nodiscard]] bool replayImeIntoField(QInputMethodEvent *e);
+	[[nodiscard]] bool handleTabNavigation(QKeyEvent *e);
+	[[nodiscard]] bool handleClipboardKey(QKeyEvent *e);
+	[[nodiscard]] bool handleFieldKey(QKeyEvent *e);
+	void copyCurrentSelectionToClipboard();
+	[[nodiscard]] TextForMimeData currentSelectionTextForClipboard() const;
+	void pasteStructuredClipboardData(const ClipboardData &data);
+	[[nodiscard]] bool handleIvClipboardMime(
+		not_null<const QMimeData*> data,
+		Ui::InputField::MimeAction action);
+	[[nodiscard]] bool moveBoundary(bool forward, bool allowTrailing);
+	[[nodiscard]] bool moveBoundaryAfterCommit(
+		State::ApplyResult committed,
+		bool forward,
+		bool allowTrailing,
+		bool *mutated = nullptr);
+	[[nodiscard]] bool moveTabBoundary(bool forward);
+	[[nodiscard]] bool removeBoundaryOwner(bool forward);
+	void ensurePendingActivation();
+	void updateInlineFieldHeightOverride();
+	void clearDisplayMathEditSession();
+	void clearInlineFieldEditSession();
+	[[nodiscard]] HistoryViewState captureHistoryViewState() const;
+	[[nodiscard]] HistoryEntry captureHistoryEntry() const;
+	void restoreHistoryEntry(const HistoryEntry &entry);
+	[[nodiscard]] static bool mutationTransactionChanged(bool changed);
+	[[nodiscard]] static bool mutationTransactionChanged(
+		State::ApplyResult result);
+	[[nodiscard]] static bool mutationTransactionChanged(
+		const MutationTransactionResult &result);
+	void finishMutationTransaction(
+		const HistoryEntry &before,
+		bool changed,
+		int beforeHistoryIndex,
+		uint64 beforeRetainToken);
+	template <typename Callback>
+	auto recordMutationTransaction(Callback &&callback)
+	-> decltype(callback()) {
+		const auto before = captureHistoryEntry();
+		const auto beforeHistoryIndex = _historyIndex;
+		const auto beforeRetainToken = _retainedLeafFieldToken;
+		auto result = callback();
+		finishMutationTransaction(
+			before,
+			mutationTransactionChanged(result),
+			beforeHistoryIndex,
+			beforeRetainToken);
+		return result;
+	}
+	void truncateHistoryRedo();
+	[[nodiscard]] bool activeInlineFieldTextMatchesState() const;
+	[[nodiscard]] bool canPerformFieldUndoRedo(bool redo) const;
+	[[nodiscard]] bool canPerformHistoryUndoRedo(bool redo) const;
+	[[nodiscard]] bool canPerformUndoRedo(bool redo) const;
+	[[nodiscard]] bool handleUndoRedoShortcut(QKeyEvent *e);
+	[[nodiscard]] bool handleSelectAllShortcut(QKeyEvent *e);
+	[[nodiscard]] bool performFieldUndoRedo(bool redo);
+	void performUndoRedo(bool redo, bool allowFieldLocal = true);
+	void clearFieldUndoRedoNoopState();
+	void retainActiveLeafField();
+	[[nodiscard]] base::unique_qptr<Ui::InputField> reviveRetainedLeafField(
+		int historyIndex,
+		const State::LeafPath &leaf,
+		State::FieldMode mode,
+		const InlineFieldStyleKey &styleKey);
+	void pruneRetainedLeafFields();
+	void removeRetainedLeafFieldsAfter(int historyIndex);
+	void moveRetainedLeafFields(
+		int fromHistoryIndex,
+		int toHistoryIndex,
+		uint64 afterRetainToken);
+	void relayoutCurrentContent();
+	void refreshAfterInlineFieldCommit(State::ApplyResult committed);
+	void ensureArticleLayoutForInlineField(int width);
+	void syncArticleVisibleTopBottom();
+	void syncInlineFieldGeometry(int width);
+	[[nodiscard]] QRect activeInlineFieldRevealRect() const;
+	[[nodiscard]] QRect mapFieldLocalRectToScrollContent(
+		QWidget *inner,
+		QRect rect) const;
+	void revealActiveInlineField();
+	void clearSelection();
+	void clearTextSelection();
+	void clearStructuralSelection();
+	void setStructuralSelection(
+		Markdown::PreparedEditSelection selection,
+		std::optional<BoundarySelectionOrigin> origin = std::nullopt);
+	[[nodiscard]] bool hasStructuralSelection() const;
+	void startArticleSelection(
+		QPoint pressPoint,
+		const Markdown::MarkdownArticleHitTestResult &hit,
+		const Markdown::PreparedEditHit &editHit,
+		bool fromField = false,
+		bool startedBelow = false);
+	void updateArticleSelection(
+		QPoint articlePoint,
+		const Markdown::MarkdownArticleHitTestResult &hit,
+		const Markdown::PreparedEditHit &editHit);
+	void finishArticleSelection();
+	[[nodiscard]] bool handleStructuralSelectionKey(QKeyEvent *e);
+	void handleFieldContextMenuRequest(
+		Ui::InputField::ContextMenuRequest request);
+	[[nodiscard]] bool handleFieldMouseEvent(QEvent *event);
+	[[nodiscard]] bool handleHorizontalScrollWheel(
+		QWheelEvent *e,
+		QPoint articlePoint);
+	[[nodiscard]] std::optional<Markdown::PreparedEditTableCellSource>
+	activeTableCellSourceAt(
+		QObject *object,
+		const QContextMenuEvent &e) const;
+	[[nodiscard]] Markdown::PreparedEditTableCellRange
+	effectiveTableRangeForCell(
+		const Markdown::PreparedEditTableCellSource &source);
+	void showTableContextMenu(
+		const Markdown::PreparedEditTableCellRange &range,
+		QPoint globalPos);
+	void fillTableChangeMenu(
+		not_null<Ui::PopupMenu*> menu,
+		const Markdown::PreparedEditTableCellRange &range);
+	void applyTableChange(Fn<bool()> change);
+	[[nodiscard]] Markdown::PreparedEditSelection structuralSelectionFromHits(
+		const Markdown::PreparedEditHit &anchor,
+		const Markdown::PreparedEditHit &focus) const;
+	[[nodiscard]] int editableOrdinalForSegment(int segmentIndex) const;
+	[[nodiscard]] int segmentIndexForEditableOrdinal(int ordinal) const;
+	[[nodiscard]] QPoint articleTopLeft() const;
+	[[nodiscard]] int articleWidth(int outerWidth) const;
+	void touchEvent(QTouchEvent *e);
+	[[nodiscard]] QRect fieldOuterRectForSegment(int segmentIndex) const;
+	[[nodiscard]] QRect outerEditableSegmentRect(int segmentIndex) const;
+	[[nodiscard]] Markdown::MarkdownArticlePaintContext textPaintContext(
+		QRect clip);
+
+	const not_null<Main::Session*> _session;
+	const std::shared_ptr<Main::SessionShow> _show;
+	const not_null<QWidget*> _outer;
+	const Fn<bool()> _customEmojiPaused;
+	const not_null<PeerData*> _peer;
+	const std::shared_ptr<State> _state;
+	const Fn<void(RichMessageLimitError)> _showLimitToast;
+	std::shared_ptr<style::Markdown> _articleStyle;
+	std::shared_ptr<Markdown::MarkdownArticle> _article;
+	base::unique_qptr<Ui::InputField> _field;
+	std::unique_ptr<Ui::ChatTheme> _theme;
+	std::unique_ptr<Ui::ChatStyle> _style;
+	std::vector<Ui::Text::SpecialColor> _highlightColors;
+	rpl::lifetime _highlightReadyLifetime;
+	std::vector<CachedInlineFieldStyle> _fieldStyles;
+	std::optional<style::owned_color> _inlineFieldTextColorOverride;
+	std::optional<style::owned_color> _inlineFieldPlaceholderColorOverride;
+	std::optional<InlineFieldStyleKey> _activeFieldStyleKey;
+	std::optional<State::LeafPath> _fieldLeaf;
+	State::FieldMode _fieldMode = State::FieldMode::Rich;
+	int _articleHeight = 0;
+	int _activeOrdinal = -1;
+	int _activeSegmentIndex = -1;
+	bool _activeSegmentIsDisplayMath = false;
+	int _activeDisplayMathBaselineHeight = 0;
+	int _pendingOrdinal = -1;
+	int _pendingCursorOffset = 0;
+	std::vector<HistoryEntry> _history;
+	int _historyIndex = -1;
+	std::vector<RetainedLeafField> _retainedLeafFields;
+	uint64 _retainedLeafFieldToken = 0;
+	std::optional<int> _retainingFieldHistoryIndexOverride;
+	std::optional<bool> _restoringHistoryRedo;
+	bool _restoringHistory = false;
+	bool _performingUndoRedo = false;
+	bool _suppressHistoryRedoInvalidation = false;
+	bool _revivedRetainedField = false;
+	bool _fieldUndoAvailable = false;
+	bool _fieldRedoAvailable = false;
+	std::optional<TextWithTags> _fieldUndoNoopState;
+	std::optional<TextWithTags> _fieldRedoNoopState;
+	Markdown::MarkdownArticleSelection _selection;
+	Markdown::MarkdownArticleSelectionEndpoints _selectionEndpoints;
+	Markdown::PreparedEditSelection _structuralSelection;
+	std::optional<BoundarySelectionOrigin> _boundarySelectionOrigin;
+	Ui::VisibleRange _visibleRange;
+	ArticleSelectionDrag _articleSelectionDrag;
+	std::optional<Qt::Orientation> _horizontalScrollLock;
+	bool _settingField = false;
+	bool _trackingPointerPress = false;
+	bool _inlineFieldExternalInteractionActive = false;
+	Markdown::MarkdownArticleEditControlHit _pressedControl;
+	std::optional<QPoint> _pressedControlPoint;
+	HorizontalScrollDrag _horizontalScrollDrag = HorizontalScrollDrag::None;
+	std::optional<QPoint> _pendingTouchHorizontalScrollPoint;
+	bool _syncingInlineFieldGeometry = false;
+	bool _pendingHeightOverrideUpdate = false;
+};
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_window.cpp b/Telegram/SourceFiles/iv/editor/iv_editor_window.cpp
new file mode 100644
index 00000000000000..01c1664b7bd33a
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_window.cpp
@@ -0,0 +1,70 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/editor/iv_editor_window.h"
+
+#ifdef Q_OS_WIN
+#include <QtNetwork/QNetworkProxy>
+
+#include "core/sandbox.h"
+
+#include <windows.h>
+#elif defined Q_OS_MAC // Q_OS_WIN
+#include "core/sandbox.h"
+#include "platform/mac/native_event_mac.h"
+#endif // Q_OS_WIN || Q_OS_MAC
+
+namespace Iv::Editor {
+
+Window::Window(QWidget *parent)
+: Ui::RpWindow(parent) {
+}
+
+rpl::producer<> Window::imeCompositionStarts() const {
+	return _imeCompositionStartReceived.events();
+}
+
+void Window::imeCompositionStartReceived() {
+	_imeCompositionStartReceived.fire({});
+}
+
+#ifdef Q_OS_WIN
+
+bool Window::nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		native_event_filter_result *result) {
+	if (message) {
+		const auto msg = static_cast<MSG*>(message);
+		if (msg->message == WM_IME_STARTCOMPOSITION) {
+			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+				imeCompositionStartReceived();
+			});
+		}
+	}
+	return false;
+}
+
+#elif defined Q_OS_MAC // Q_OS_WIN
+
+bool Window::nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		qintptr *result) {
+	if (message && eventType == "NSEvent") {
+		if (Platform::PossiblyTextTypingEvent(message)) {
+			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+				imeCompositionStartReceived();
+			});
+		}
+	}
+	return false;
+}
+
+#endif // Q_OS_WIN || Q_OS_MAC
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/editor/iv_editor_window.h b/Telegram/SourceFiles/iv/editor/iv_editor_window.h
new file mode 100644
index 00000000000000..338af8908e58ac
--- /dev/null
+++ b/Telegram/SourceFiles/iv/editor/iv_editor_window.h
@@ -0,0 +1,42 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/basic_types.h"
+#include "ui/widgets/rp_window.h"
+
+#include <rpl/event_stream.h>
+
+namespace Iv::Editor {
+
+class Window final : public Ui::RpWindow {
+public:
+	explicit Window(QWidget *parent = nullptr);
+
+	[[nodiscard]] rpl::producer<> imeCompositionStarts() const;
+	void imeCompositionStartReceived();
+
+protected:
+#ifdef Q_OS_WIN
+	bool nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		native_event_filter_result *result) override;
+#elif defined Q_OS_MAC // Q_OS_WIN
+	bool nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		qintptr *result) override;
+#endif // Q_OS_WIN || Q_OS_MAC
+
+private:
+	rpl::event_stream<> _imeCompositionStartReceived;
+
+};
+
+} // namespace Iv::Editor
diff --git a/Telegram/SourceFiles/iv/iv.style b/Telegram/SourceFiles/iv/iv.style
index cea363566fb2e1..206a3e30ad8bd5 100644
--- a/Telegram/SourceFiles/iv/iv.style
+++ b/Telegram/SourceFiles/iv/iv.style
@@ -5,7 +5,10 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
+using "chat_helpers/chat_helpers.style";
+using "ui/chat/chat.style";
 using "ui/basic.style";
+using "ui/layers/layers.style";
 using "ui/widgets/widgets.style";
 
 ivMenuToggle: IconButton(defaultIconButton) {
@@ -17,9 +20,7 @@ ivMenuToggle: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(6px, 6px);
 	rippleAreaSize: 36px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 ivMenuPosition: point(-2px, 40px);
 ivBackIcon: icon {{ "box_button_back", menuIconColor }};
@@ -30,16 +31,6 @@ ivBack: IconButton(ivMenuToggle) {
 	rippleAreaPosition: point(12px, 6px);
 }
 ivZoomButtonsSize: 26px;
-ivPlusMinusZoom: IconButton(ivMenuToggle) {
-	width: ivZoomButtonsSize;
-	height: ivZoomButtonsSize;
-
-	rippleAreaPosition: point(0px, 0px);
-	rippleAreaSize: ivZoomButtonsSize;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
-}
 ivResetZoomStyle: TextStyle(defaultTextStyle) {
 	font: font(12px);
 }
@@ -63,11 +54,12 @@ ivResetZoomLabel: FlatLabel(defaultFlatLabel) {
 ivResetZoomInnerPadding: 20px;
 ivBackIconDisabled: icon {{ "box_button_back", menuIconFg }};
 ivForwardIcon: icon {{ "box_button_back-flip_horizontal", menuIconColor }};
+ivForwardIconDisabled: icon {{ "box_button_back-flip_horizontal", menuIconFg }};
 ivForward: IconButton(ivBack) {
 	width: 48px;
 	icon: ivForwardIcon;
 	iconOver: ivForwardIcon;
-	rippleAreaPosition: point(0px, 6px);
+	rippleAreaPosition: point(6px, 6px);
 }
 ivSubtitleFont: font(16px semibold);
 ivSubtitle: FlatLabel(defaultFlatLabel) {
@@ -81,3 +73,1124 @@ ivSubtitleHeight: 48px;
 ivSubtitleTop: 12px;
 ivSubtitleLeft: 22px;
 ivSubtitleSkip: 0px;
+ivWrongLayoutBarHeight: 32px;
+ivWrongLayoutLink: LinkButton(defaultLinkButton) {
+	color: windowSubTextFg;
+	overColor: windowSubTextFg;
+	padding: margins(5px, 5px, 5px, 5px);
+}
+/*
+ivEditorWindowMinSize: size(384px, 480px);
+ivEditorWindowDefaultSize: size(800px, 600px);
+ivEditorBodyPadding: margins(0px, 8px, 0px, 8px);
+ivEditorToolbarButtonSize: 36px;
+ivEditorTopControlsPadding: margins(8px, defaultVerticalListSkip, 8px, defaultVerticalListSkip);
+ivEditorTopControlsButtonSkip: 6px;
+ivEditorTopControlsContentSkip: 8px;
+ivEditorSubmitButton: RoundButton(defaultActiveButton) {
+	height: ivEditorToolbarButtonSize;
+}
+ivEditorCancelButton: RoundButton(defaultLightButton) {
+	height: ivEditorToolbarButtonSize;
+}
+ivEditorToolbarPadding: margins(8px, defaultVerticalListSkip, 8px, defaultVerticalListSkip);
+ivEditorToolbarButton: IconButton(defaultIconButton) {
+	width: ivEditorToolbarButtonSize;
+	height: ivEditorToolbarButtonSize;
+	iconPosition: point(-1px, -1px);
+	rippleAreaPosition: point(0px, 0px);
+	rippleAreaSize: ivEditorToolbarButtonSize;
+	ripple: defaultRippleAnimationBgOver;
+}
+ivEditorToolbarButtonSkip: 6px;
+ivEditorToolbarRowSkip: 0px;
+ivEditorToolbarHeadingIcon: icon {{ "menu/rich/heading-24x24", menuIconColor }};
+ivEditorToolbarEmojiIcon: icon {{ "chat/input_smile_face", menuIconColor }};
+ivEditorToolbarBlockquoteIcon: icon {{ "menu/rich/blockquote-24x24", menuIconColor }};
+ivEditorToolbarCodeIcon: icon {{ "chat/code_tags", menuIconColor }};
+ivEditorToolbarMathIcon: icon {{ "menu/rich/math-24x24", menuIconColor }};
+ivEditorToolbarDividerIcon: icon {{ "menu/rich/divider-24x24", menuIconColor }};
+ivEditorToolbarOrderedListIcon: icon {{ "menu/rich/ordered_list-24x24", menuIconColor }};
+ivEditorToolbarBulletListIcon: icon {{ "menu/rich/bullet_list-24x24", menuIconColor }};
+ivEditorToolbarTaskListIcon: icon {{ "menu/rich/task_list-24x24", menuIconColor }};
+ivEditorToolbarPullquoteIcon: icon {{ "menu/rich/pullquote-24x24", menuIconColor }};
+ivEditorToolbarAttachIcon: icon {{ "chat/input_attach", menuIconColor }};
+ivEditorToolbarDetailsIcon: icon {{ "menu/rich/details-24x24", menuIconColor }};
+ivEditorToolbarTableIcon: icon {{ "menu/rich/table-24x24", menuIconColor }};
+ivEditorInlineFieldMargins: margins(4px, 0px, 6px, 0px);
+ivEditorMinHeight: boxWidth;
+ivEditorInputField: InputField(defaultInputField) {
+	style: historyTextStyle;
+	textMargins: margins(0px, 0px, 0px, 0px);
+	textAlign: align(left);
+	textFg: historyComposeAreaFg;
+	textBg: transparent;
+	textBgActive: transparent;
+	heightMin: 1px;
+	heightMax: 72px;
+	placeholderFg: placeholderFg;
+	placeholderFgActive: placeholderFgActive;
+	placeholderFgError: placeholderFgActive;
+	placeholderMargins: margins(0px, 0px, 0px, 0px);
+	placeholderAlign: align(topleft);
+	placeholderScale: 0.;
+	placeholderFont: normalFont;
+	placeholderShift: -50px;
+	border: 0px;
+	borderActive: 0px;
+	duration: 100;
+}
+*/
+
+MarkdownBlockSkips {
+	paragraph: pixels;
+	heading: pixels;
+	code: pixels;
+	rule: pixels;
+	quote: pixels;
+	displayMath: pixels;
+	table: pixels;
+	photo: pixels;
+	video: pixels;
+	audio: pixels;
+	map: pixels;
+	channel: pixels;
+	groupedMedia: pixels;
+	relatedArticle: pixels;
+	embedPost: pixels;
+	placeholder: pixels;
+}
+MarkdownList {
+	indent: pixels;
+	continuationIndent: pixels;
+	markerWidth: pixels;
+	markerSkip: pixels;
+	bulletRadius: pixels;
+	bulletLeftShift: pixels;
+	bulletFg: color;
+	taskCheck: Check;
+}
+MarkdownQuotePaintColors {
+	blockquote: color;
+	pre: color;
+	preBg: color;
+}
+MarkdownPullquote {
+	padding: margins;
+	maxWidth: pixels;
+}
+MarkdownRule {
+	fg: color;
+	height: pixels;
+}
+MarkdownDisplayMath {
+	padding: margins;
+	align: align;
+	textSize: pixels;
+	maxRenderWidth: pixels;
+	maxRenderHeight: pixels;
+	fg: color;
+	fallbackStyle: TextStyle;
+	fallbackBg: color;
+	fallbackRadius: pixels;
+	fallbackPadding: margins;
+	overflowWidth: pixels;
+	overflowFg: color;
+}
+MarkdownTable {
+	cellPadding: margins;
+	border: pixels;
+	borderFg: color;
+	radius: pixels;
+	headerBg: color;
+	headerBgOpacity: double;
+	headerStyle: TextStyle;
+	bodyStyle: TextStyle;
+	captionSkip: pixels;
+	minColumnWidth: pixels;
+	overflowWidth: pixels;
+	overflowFg: color;
+	scrollbarSkip: pixels;
+	scrollbarHeight: pixels;
+	scrollbarMinThumbWidth: pixels;
+}
+MarkdownDetails {
+	headerPadding: margins;
+	bodyPadding: margins;
+	border: pixels;
+	borderFg: color;
+	headerBg: color;
+	bodyBg: color;
+	summaryFg: color;
+	radius: pixels;
+	summaryStyle: TextStyle;
+	icon: icon;
+	iconSkip: pixels;
+	stateSkip: pixels;
+}
+MarkdownEmbedPost {
+	padding: margins;
+	accentWidth: pixels;
+	accentFg: color;
+	accentSkip: pixels;
+	headerGap: pixels;
+	avatarSize: pixels;
+	avatarRadius: pixels;
+	authorStyle: TextStyle;
+	authorFg: color;
+	dateStyle: TextStyle;
+	dateFg: color;
+	bodySkip: pixels;
+	captionSkip: pixels;
+}
+MarkdownPlaceholder {
+	padding: margins;
+	minHeight: pixels;
+	border: pixels;
+	radius: pixels;
+	bg: color;
+	bgActive: color;
+	rippleBg: color;
+	borderFg: color;
+	spinnerWidth: pixels;
+	spinnerSize: pixels;
+	spinnerFg: color;
+	captionSkip: pixels;
+	labelStyle: TextStyle;
+	labelFg: color;
+	labelFgActive: color;
+}
+MarkdownPhoto {
+	padding: margins;
+	captionSkip: pixels;
+	progressSize: pixels;
+	progressWidth: pixels;
+	progressBg: color;
+	progressFg: color;
+	fallbackBg: color;
+	fallbackFg: color;
+}
+MarkdownAudio {
+	padding: margins;
+	captionSkip: pixels;
+	textSkip: pixels;
+	border: pixels;
+	borderFg: color;
+	bg: color;
+	radius: pixels;
+	titleStyle: TextStyle;
+	titleFg: color;
+	subtitleStyle: TextStyle;
+	subtitleFg: color;
+}
+MarkdownChannelButton {
+	padding: margins;
+	border: pixels;
+	borderFg: color;
+	bg: color;
+	radius: pixels;
+	textStyle: TextStyle;
+	textFg: color;
+}
+MarkdownChannel {
+	padding: margins;
+	border: pixels;
+	borderFg: color;
+	bg: color;
+	radius: pixels;
+	textSkip: pixels;
+	buttonSkip: pixels;
+	titleStyle: TextStyle;
+	titleFg: color;
+	subtitleStyle: TextStyle;
+	subtitleFg: color;
+	button: MarkdownChannelButton;
+}
+MarkdownRelatedArticle {
+	padding: margins;
+	border: pixels;
+	borderFg: color;
+	bg: color;
+	radius: pixels;
+	headerPadding: margins;
+	headerBg: color;
+	separator: pixels;
+	separatorFg: color;
+	textSkip: pixels;
+	footerSkip: pixels;
+	thumbnailSize: pixels;
+	thumbnailSkip: pixels;
+	thumbnailRadius: pixels;
+	titleLines: int;
+	subtitleLines: int;
+	footerLines: int;
+	titleStyle: TextStyle;
+	titleFg: color;
+	subtitleStyle: TextStyle;
+	subtitleFg: color;
+	footerStyle: TextStyle;
+	footerFg: color;
+}
+MarkdownGroupedMedia {
+	padding: margins;
+	captionSkip: pixels;
+	itemSkip: pixels;
+	radius: pixels;
+	slideshowMinHeight: pixels;
+	overlayOpacity: double;
+	fallbackBg: color;
+	fallbackFg: color;
+	navButtonSize: pixels;
+	navButtonSkip: pixels;
+	navButtonBg: color;
+	navButtonBgOver: color;
+	navPreviousIcon: icon;
+	navPreviousIconOver: icon;
+	navNextIcon: icon;
+	navNextIconOver: icon;
+}
+MarkdownFailure {
+	label: FlatLabel;
+	width: pixels;
+	skip: pixels;
+}
+MarkdownEmbedOverlay {
+	scrimBg: color;
+	bg: color;
+	loading: InfiniteRadialAnimation;
+	size: size;
+	margin: margins;
+	padding: margins;
+	errorLabel: FlatLabel;
+	errorPadding: margins;
+}
+Markdown {
+	textPalette: TextPalette;
+	markBgOpacity: double;
+	textColor: color;
+	supplementaryTextColor: color;
+	body: TextStyle;
+	heading1: TextStyle;
+	heading2: TextStyle;
+	heading3: TextStyle;
+	heading4: TextStyle;
+	heading5: TextStyle;
+	heading6: TextStyle;
+	code: TextStyle;
+	pagePadding: margins;
+	pageMaxWidth: pixels;
+	textPadding: margins;
+	mediaPadding: margins;
+	blockSkips: MarkdownBlockSkips;
+	list: MarkdownList;
+	quoteIndent: pixels;
+	quoteReadableMinWidth: pixels;
+	quotePaintColors: MarkdownQuotePaintColors;
+	pullquote: MarkdownPullquote;
+	rule: MarkdownRule;
+	displayMath: MarkdownDisplayMath;
+	table: MarkdownTable;
+	details: MarkdownDetails;
+	embedPost: MarkdownEmbedPost;
+	placeholder: MarkdownPlaceholder;
+	photo: MarkdownPhoto;
+	audio: MarkdownAudio;
+	channel: MarkdownChannel;
+	relatedArticle: MarkdownRelatedArticle;
+	groupedMedia: MarkdownGroupedMedia;
+	failure: MarkdownFailure;
+}
+
+defaultMarkdownTextPalette: TextPalette(defaultTextPalette) {
+	linkFg: windowActiveTextFg;
+}
+defaultMarkdownBodyStyle: TextStyle(historyTextStyle) {
+	lineHeight: 24px;
+}
+defaultMarkdownCodeStyle: TextStyle(defaultMarkdownBodyStyle) {
+	font: font(14px);
+	lineHeight: 22px;
+}
+defaultMarkdownDisplayMathFallbackStyle: TextStyle(defaultMarkdownCodeStyle) {
+}
+defaultMarkdownTableHeaderStyle: TextStyle(defaultMarkdownBodyStyle) {
+	font: font(16px semibold);
+	lineHeight: 24px;
+}
+defaultMarkdownBlockSkips: MarkdownBlockSkips {
+	paragraph: 12px;
+	heading: 16px;
+	code: 12px;
+	rule: 12px;
+	quote: 12px;
+	displayMath: 12px;
+	table: 12px;
+	photo: 12px;
+	video: 12px;
+	audio: 12px;
+	map: 12px;
+	channel: 8px;
+	groupedMedia: 12px;
+	relatedArticle: 0px;
+	embedPost: 12px;
+	placeholder: 12px;
+}
+defaultMarkdownList: MarkdownList {
+	indent: 28px;
+	continuationIndent: 22px;
+	markerWidth: 22px;
+	markerSkip: 8px;
+	bulletRadius: 2px;
+	bulletLeftShift: 0px;
+	bulletFg: windowFg;
+	taskCheck: defaultCheck;
+}
+defaultMarkdownQuotePaintColors: MarkdownQuotePaintColors {
+	blockquote: windowActiveTextFg;
+	pre: windowSubTextFg;
+	preBg: windowBgOver;
+}
+defaultMarkdownPullquote: MarkdownPullquote {
+	padding: margins(0px, 18px, 0px, 18px);
+	maxWidth: 420px;
+}
+defaultMarkdownRule: MarkdownRule {
+	fg: boxDividerBg;
+	height: 1px;
+}
+defaultMarkdownDisplayMath: MarkdownDisplayMath {
+	padding: margins(10px, 12px, 10px, 12px);
+	align: align(center);
+	textSize: 20px;
+	maxRenderWidth: 1600px;
+	maxRenderHeight: 1200px;
+	fg: windowFg;
+	fallbackStyle: defaultMarkdownDisplayMathFallbackStyle;
+	fallbackBg: windowBgOver;
+	fallbackRadius: 6px;
+	fallbackPadding: margins(10px, 12px, 10px, 12px);
+	overflowWidth: 4px;
+	overflowFg: windowSubTextFg;
+}
+defaultMarkdownTable: MarkdownTable {
+	cellPadding: margins(8px, 10px, 8px, 10px);
+	border: 1px;
+	borderFg: inputBorderFg;
+	radius: defaultTable.radius;
+	headerBg: windowBgOver;
+	headerBgOpacity: 1.0;
+	headerStyle: defaultMarkdownTableHeaderStyle;
+	bodyStyle: defaultMarkdownBodyStyle;
+	captionSkip: 7px;
+	minColumnWidth: 96px;
+	overflowWidth: 4px;
+	overflowFg: windowSubTextFg;
+	scrollbarSkip: 4px;
+	scrollbarHeight: 12px;
+	scrollbarMinThumbWidth: 24px;
+}
+defaultMarkdownDetailsSummaryStyle: TextStyle(defaultTextStyle) {
+	font: font(12px);
+	linkUnderline: kLinkUnderlineNever;
+	lineHeight: 18px;
+}
+defaultMarkdownDetails: MarkdownDetails {
+	headerPadding: margins(8px, 12px, 8px, 12px);
+	bodyPadding: margins(10px, 12px, 10px, 12px);
+	border: 1px;
+	borderFg: inputBorderFg;
+	headerBg: windowBgOver;
+	bodyBg: windowBg;
+	summaryFg: windowFg;
+	radius: 6px;
+	summaryStyle: defaultMarkdownDetailsSummaryStyle;
+	icon: icon {{ "history_down_arrow", windowSubTextFg }};
+	iconSkip: 8px;
+	stateSkip: 8px;
+}
+defaultMarkdownEmbedPostAuthorStyle: TextStyle(defaultMarkdownBodyStyle) {
+	font: font(16px semibold);
+}
+defaultMarkdownEmbedPostDateStyle: TextStyle(defaultMarkdownDetailsSummaryStyle) {
+}
+defaultMarkdownEmbedPostAccentWidth: 3px;
+defaultMarkdownEmbedPost: MarkdownEmbedPost {
+	padding: margins(8px, 0px, 8px, 0px);
+	accentWidth: defaultMarkdownEmbedPostAccentWidth;
+	accentFg: windowActiveTextFg;
+	accentSkip: 12px;
+	headerGap: 10px;
+	avatarSize: 40px;
+	avatarRadius: 20px;
+	authorStyle: defaultMarkdownEmbedPostAuthorStyle;
+	authorFg: windowFg;
+	dateStyle: defaultMarkdownEmbedPostDateStyle;
+	dateFg: windowSubTextFg;
+	bodySkip: 10px;
+	captionSkip: 12px;
+}
+defaultMarkdownPlaceholder: MarkdownPlaceholder {
+	padding: margins(16px, 24px, 16px, 24px);
+	minHeight: 48px;
+	border: defaultMarkdownEmbedPostAccentWidth;
+	radius: 16px;
+	bg: windowBgOver;
+	bgActive: windowBgOver;
+	rippleBg: windowBgRipple;
+	borderFg: windowActiveTextFg;
+	spinnerWidth: 4px;
+	spinnerSize: 24px;
+	spinnerFg: windowActiveTextFg;
+	captionSkip: 14px;
+	labelStyle: TextStyle(defaultMarkdownBodyStyle) {
+		font: font(16px semibold);
+	}
+	labelFg: windowSubTextFg;
+	labelFgActive: windowActiveTextFg;
+}
+defaultMarkdownPhoto: MarkdownPhoto {
+	padding: margins(0px, 0px, 0px, 0px);
+	captionSkip: 12px;
+	progressSize: 36px;
+	progressWidth: 3px;
+	progressBg: windowSubTextFg;
+	progressFg: windowFg;
+	fallbackBg: windowBgOver;
+	fallbackFg: windowSubTextFg;
+}
+defaultMarkdownAudioTitleStyle: TextStyle(defaultMarkdownBodyStyle) {
+	font: font(16px semibold);
+}
+defaultMarkdownAudioSubtitleStyle: TextStyle(defaultMarkdownDetailsSummaryStyle) {
+}
+defaultMarkdownAudio: MarkdownAudio {
+	padding: margins(8px, 12px, 8px, 12px);
+	captionSkip: 14px;
+	textSkip: 8px;
+	border: 1px;
+	borderFg: inputBorderFg;
+	bg: windowBgOver;
+	radius: 6px;
+	titleStyle: defaultMarkdownAudioTitleStyle;
+	titleFg: windowFg;
+	subtitleStyle: defaultMarkdownAudioSubtitleStyle;
+	subtitleFg: windowSubTextFg;
+}
+defaultMarkdownChannelTitleStyle: TextStyle(defaultMarkdownAudioTitleStyle) {
+}
+defaultMarkdownChannelSubtitleStyle: TextStyle(defaultMarkdownDetailsSummaryStyle) {
+}
+defaultMarkdownChannelButtonStyle: TextStyle(defaultMarkdownChannelTitleStyle) {
+}
+defaultMarkdownSidesMargin: margins(18px, 0px, 18px, 0px);
+defaultMarkdownChannelButton: MarkdownChannelButton {
+	padding: defaultMarkdownSidesMargin;
+	border: 0px;
+	borderFg: windowActiveTextFg;
+	bg: windowBgOver;
+	radius: 0px;
+	textStyle: defaultMarkdownChannelButtonStyle;
+	textFg: windowActiveTextFg;
+}
+defaultMarkdownChannel: MarkdownChannel {
+	padding: margins(18px, 8px, 18px, 8px);
+	border: 0px;
+	borderFg: inputBorderFg;
+	bg: windowBgOver;
+	radius: 0px;
+	textSkip: 8px;
+	buttonSkip: 18px;
+	titleStyle: defaultMarkdownChannelTitleStyle;
+	titleFg: windowFg;
+	subtitleStyle: defaultMarkdownChannelSubtitleStyle;
+	subtitleFg: windowSubTextFg;
+	button: defaultMarkdownChannelButton;
+}
+defaultMarkdownRelatedArticleTitleStyle: TextStyle(defaultMarkdownBodyStyle) {
+	font: font(16px semibold);
+	lineHeight: 22px;
+}
+defaultMarkdownRelatedArticleSubtitleStyle: TextStyle(defaultMarkdownBodyStyle) {
+	font: font(15px);
+	lineHeight: 21px;
+}
+defaultMarkdownRelatedArticleFooterStyle: TextStyle(defaultMarkdownDetailsSummaryStyle) {
+}
+defaultMarkdownRelatedArticle: MarkdownRelatedArticle {
+	padding: margins(18px, 8px, 18px, 8px);
+	border: 0px;
+	borderFg: boxDividerBg;
+	bg: windowBg;
+	radius: 0px;
+	headerPadding: margins(18px, 8px, 18px, 8px);
+	headerBg: windowBgOver;
+	separator: 1px;
+	separatorFg: boxDividerBg;
+	textSkip: 6px;
+	footerSkip: 8px;
+	thumbnailSize: 87px;
+	thumbnailSkip: 12px;
+	thumbnailRadius: 0px;
+	titleLines: 2;
+	subtitleLines: 3;
+	footerLines: 1;
+	titleStyle: defaultMarkdownRelatedArticleTitleStyle;
+	titleFg: windowFg;
+	subtitleStyle: defaultMarkdownRelatedArticleSubtitleStyle;
+	subtitleFg: windowSubTextFg;
+	footerStyle: defaultMarkdownRelatedArticleFooterStyle;
+	footerFg: windowSubTextFg;
+}
+defaultMarkdownGroupedMedia: MarkdownGroupedMedia {
+	padding: margins(0px, 0px, 0px, 0px);
+	captionSkip: 12px;
+	itemSkip: 3px;
+	radius: 0px;
+	slideshowMinHeight: 200px;
+	overlayOpacity: 0.2;
+	fallbackBg: windowBgOver;
+	fallbackFg: windowSubTextFg;
+	navButtonSize: 36px;
+	navButtonSkip: 12px;
+	navButtonBg: windowBg;
+	navButtonBgOver: windowBgOver;
+	navPreviousIcon: ivBackIcon;
+	navPreviousIconOver: ivBackIcon;
+	navNextIcon: ivForwardIcon;
+	navNextIconOver: ivForwardIcon;
+}
+defaultMarkdownFailureLabel: FlatLabel(defaultFlatLabel) {
+	minWidth: 280px;
+	textFg: windowSubTextFg;
+	align: align(center);
+	style: defaultMarkdownBodyStyle;
+}
+defaultMarkdownFailure: MarkdownFailure {
+	label: defaultMarkdownFailureLabel;
+	width: 360px;
+	skip: 12px;
+}
+markdownFootnoteBox: Box(defaultBox) {
+	buttonPadding: margins(0px, 0px, 0px, 0px);
+	buttonHeight: 0px;
+}
+markdownFootnoteLabel: FlatLabel(defaultFlatLabel) {
+	minWidth: 95px;
+	textFg: windowFg;
+	align: align(topleft);
+	style: defaultMarkdownBodyStyle;
+	palette: defaultMarkdownTextPalette;
+}
+markdownFootnotePadding: margins(24px, 12px, 24px, 12px);
+markdownEmbedOverlayError: FlatLabel(defaultFlatLabel) {
+	minWidth: 240px;
+	textFg: windowSubTextFg;
+	align: align(top);
+	style: defaultMarkdownBodyStyle;
+}
+markdownEmbedOverlay: MarkdownEmbedOverlay {
+	scrimBg: layerBg;
+	bg: windowBg;
+	loading: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) {
+		color: windowSubTextFg;
+	}
+	size: size(640px, 480px);
+	margin: margins(12px, 12px, 12px, 12px);
+	padding: margins(8px, 8px, 8px, 8px);
+	errorLabel: markdownEmbedOverlayError;
+	errorPadding: margins(24px, 36px, 24px, 36px);
+}
+markdownEmbedOverlayClose: IconButton(boxTitleClose) {
+	icon: icon {{ "box_button_close", mediaviewPlaybackActive }};
+	iconOver: icon {{ "box_button_close", mediaviewPlaybackActiveOver }};
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: shadowFg;
+	}
+}
+defaultMarkdown: Markdown {
+	textPalette: defaultMarkdownTextPalette;
+	markBgOpacity: 1.0;
+	textColor: windowFg;
+	supplementaryTextColor: windowSubTextFg;
+	body: defaultMarkdownBodyStyle;
+	heading1: TextStyle(defaultMarkdownBodyStyle) {
+		font: font(30px semibold);
+		lineHeight: 42px;
+	}
+	heading2: TextStyle(defaultMarkdownBodyStyle) {
+		font: font(26px semibold);
+		lineHeight: 36px;
+	}
+	heading3: TextStyle(defaultMarkdownBodyStyle) {
+		font: font(22px semibold);
+		lineHeight: 31px;
+	}
+	heading4: TextStyle(defaultMarkdownBodyStyle) {
+		font: font(19px semibold);
+		lineHeight: 27px;
+	}
+	heading5: TextStyle(defaultMarkdownBodyStyle) {
+		font: font(17px semibold);
+		lineHeight: 24px;
+	}
+	heading6: TextStyle(defaultMarkdownBodyStyle) {
+		font: font(15px semibold);
+		lineHeight: 22px;
+	}
+	code: defaultMarkdownCodeStyle;
+	pagePadding: margins(0px, 0px, 0px, 16px);
+	pageMaxWidth: 732px;
+	textPadding: defaultMarkdownSidesMargin;
+	mediaPadding: margins(0px, 0px, 0px, 0px);
+	blockSkips: defaultMarkdownBlockSkips;
+	list: defaultMarkdownList;
+	quoteIndent: 18px;
+	quoteReadableMinWidth: 160px;
+	quotePaintColors: defaultMarkdownQuotePaintColors;
+	pullquote: defaultMarkdownPullquote;
+	rule: defaultMarkdownRule;
+	displayMath: defaultMarkdownDisplayMath;
+	table: defaultMarkdownTable;
+	details: defaultMarkdownDetails;
+	embedPost: defaultMarkdownEmbedPost;
+	placeholder: defaultMarkdownPlaceholder;
+	photo: defaultMarkdownPhoto;
+	audio: defaultMarkdownAudio;
+	channel: defaultMarkdownChannel;
+	relatedArticle: defaultMarkdownRelatedArticle;
+	groupedMedia: defaultMarkdownGroupedMedia;
+	failure: defaultMarkdownFailure;
+}
+messageMarkdownBodyStyle: TextStyle(messageTextStyle) {
+	font: font(13px);
+	lineHeight: 20px;
+}
+messageMarkdownCodeStyle: TextStyle(defaultMarkdownCodeStyle) {
+	font: font(13px);
+	lineHeight: 20px;
+}
+messageMarkdownTableHeaderStyle: TextStyle(messageMarkdownBodyStyle) {
+	font: font(13px semibold);
+	lineHeight: 20px;
+}
+messageMarkdownDisplayMathFallbackStyle: TextStyle(messageMarkdownCodeStyle) {
+}
+messageMarkdownHeading1Style: TextStyle(messageMarkdownBodyStyle) {
+	font: font(19px semibold);
+	lineHeight: 27px;
+}
+messageMarkdownHeading2Style: TextStyle(messageMarkdownBodyStyle) {
+	font: font(18px semibold);
+	lineHeight: 26px;
+}
+messageMarkdownHeading3Style: TextStyle(messageMarkdownBodyStyle) {
+	font: font(17px semibold);
+	lineHeight: 24px;
+}
+messageMarkdownHeading4Style: TextStyle(messageMarkdownBodyStyle) {
+	font: font(16px semibold);
+	lineHeight: 23px;
+}
+messageMarkdownHeading5Style: TextStyle(messageMarkdownBodyStyle) {
+	font: font(15px semibold);
+	lineHeight: 22px;
+}
+messageMarkdownHeading6Style: TextStyle(messageMarkdownBodyStyle) {
+	font: font(14px semibold);
+	lineHeight: 21px;
+}
+messageMarkdownDetailsSummaryStyle: TextStyle(messageMarkdownBodyStyle) {
+	linkUnderline: kLinkUnderlineNever;
+}
+messageMarkdownAudioTitleStyle: TextStyle(messageMarkdownBodyStyle) {
+	font: font(14px semibold);
+	lineHeight: 18px;
+}
+messageMarkdownAudioSubtitleStyle: TextStyle(messageMarkdownDetailsSummaryStyle) {
+}
+messageMarkdownBlockSkips: MarkdownBlockSkips {
+	paragraph: 8px;
+	heading: 10px;
+	code: 8px;
+	rule: 8px;
+	quote: 8px;
+	displayMath: 8px;
+	table: 8px;
+	photo: 8px;
+	video: 8px;
+	audio: 8px;
+	map: 8px;
+	channel: 6px;
+	groupedMedia: 8px;
+	relatedArticle: 0px;
+	embedPost: 8px;
+	placeholder: 8px;
+}
+messageMarkdownQuoteBgOpacity: 0.12;
+messageMarkdownDetailsIcon: icon{{ "history_down_arrow", msgInDateFg }};
+messageMarkdownDetailsIconSelected: icon{{
+	"history_down_arrow",
+	msgInDateFgSelected
+}};
+messageMarkdownDetailsIconOut: icon{{ "history_down_arrow", msgOutDateFg }};
+messageMarkdownDetailsIconOutSelected: icon{{
+	"history_down_arrow",
+	msgOutDateFgSelected
+}};
+messageMarkdownNavPreviousIcon: icon{{ "box_button_back", windowSubTextFg }};
+messageMarkdownNavPreviousIconSelected: icon{{
+	"box_button_back",
+	windowFg
+}};
+messageMarkdownNavPreviousIconOut: icon{{ "box_button_back", windowSubTextFg }};
+messageMarkdownNavPreviousIconOutSelected: icon{{
+	"box_button_back",
+	windowFg
+}};
+messageMarkdownNavNextIcon: icon{{
+	"box_button_back-flip_horizontal",
+	windowSubTextFg
+}};
+messageMarkdownNavNextIconSelected: icon{{
+	"box_button_back-flip_horizontal",
+	windowFg
+}};
+messageMarkdownNavNextIconOut: icon{{
+	"box_button_back-flip_horizontal",
+	windowSubTextFg
+}};
+messageMarkdownNavNextIconOutSelected: icon{{
+	"box_button_back-flip_horizontal",
+	windowFg
+}};
+messageMarkdownList: MarkdownList(defaultMarkdownList) {
+	bulletFg: historyTextInFg;
+}
+messageMarkdownQuotePaintColors: MarkdownQuotePaintColors(
+	defaultMarkdownQuotePaintColors) {
+	blockquote: msgInReplyBarColor;
+	pre: msgInDateFg;
+	preBg: msgFileInBg;
+}
+messageMarkdownPullquote: MarkdownPullquote(defaultMarkdownPullquote) {
+	padding: margins(0px, 8px, 0px, 8px);
+	maxWidth: 280px;
+}
+messageMarkdownRule: MarkdownRule(defaultMarkdownRule) {
+	fg: msgInDateFg;
+}
+messageMarkdownTable: MarkdownTable(defaultMarkdownTable) {
+	cellPadding: margins(6px, 8px, 6px, 8px);
+	borderFg: msgInReplyBarColor;
+	headerBg: msgInReplyBarColor;
+	headerBgOpacity: messageMarkdownQuoteBgOpacity;
+	headerStyle: messageMarkdownTableHeaderStyle;
+	bodyStyle: messageMarkdownBodyStyle;
+	captionSkip: 6px;
+	overflowWidth: 3px;
+	overflowFg: msgInDateFg;
+	scrollbarSkip: 3px;
+	scrollbarHeight: 10px;
+	scrollbarMinThumbWidth: 20px;
+}
+messageMarkdownDisplayMath: MarkdownDisplayMath(defaultMarkdownDisplayMath) {
+	padding: margins(8px, 10px, 8px, 10px);
+	textSize: 16px;
+	fg: historyTextInFg;
+	fallbackStyle: messageMarkdownDisplayMathFallbackStyle;
+	fallbackBg: msgFileInBg;
+	fallbackRadius: 8px;
+	fallbackPadding: margins(8px, 10px, 8px, 10px);
+	overflowWidth: 3px;
+	overflowFg: msgInDateFg;
+}
+messageMarkdownDetails: MarkdownDetails(defaultMarkdownDetails) {
+	headerPadding: margins(4px, 11px, 4px, 11px);
+	bodyPadding: margins(4px, 11px, 6px, 11px);
+	bodyBg: msgInBg;
+	summaryFg: historyTextInFg;
+	radius: 8px;
+	summaryStyle: messageMarkdownDetailsSummaryStyle;
+	icon: messageMarkdownDetailsIcon;
+	iconSkip: 8px;
+}
+messageMarkdownPhoto: MarkdownPhoto(defaultMarkdownPhoto) {
+	captionSkip: 8px;
+	progressSize: 28px;
+	progressWidth: 2px;
+	progressBg: msgInDateFg;
+	progressFg: historyTextInFg;
+	fallbackBg: msgFileInBg;
+	fallbackFg: msgInDateFg;
+}
+messageMarkdownAudio: MarkdownAudio(defaultMarkdownAudio) {
+	padding: margins(6px, 8px, 6px, 8px);
+	captionSkip: 10px;
+	textSkip: 6px;
+	borderFg: msgInDateFg;
+	bg: msgFileInBg;
+	radius: 8px;
+	titleStyle: messageMarkdownAudioTitleStyle;
+	titleFg: historyTextInFg;
+	subtitleStyle: messageMarkdownAudioSubtitleStyle;
+	subtitleFg: msgInDateFg;
+}
+messageMarkdownGroupedMedia: MarkdownGroupedMedia(defaultMarkdownGroupedMedia) {
+	captionSkip: 8px;
+	itemSkip: 2px;
+	radius: 0px;
+	slideshowMinHeight: 160px;
+	fallbackBg: msgFileInBg;
+	fallbackFg: msgInDateFg;
+	navButtonSize: 28px;
+	navButtonSkip: 8px;
+	navButtonBg: windowBg;
+	navButtonBgOver: windowBgOver;
+	navPreviousIcon: messageMarkdownNavPreviousIcon;
+	navPreviousIconOver: messageMarkdownNavPreviousIconSelected;
+	navNextIcon: messageMarkdownNavNextIcon;
+	navNextIconOver: messageMarkdownNavNextIconSelected;
+}
+messageMarkdownFailureLabel: FlatLabel(defaultMarkdownFailureLabel) {
+	textFg: msgInDateFg;
+	style: messageMarkdownBodyStyle;
+	palette: inTextPalette;
+}
+messageMarkdownFailureLabelSelected: FlatLabel(messageMarkdownFailureLabel) {
+	textFg: msgInDateFgSelected;
+	palette: inTextPaletteSelected;
+}
+messageMarkdownFailureLabelOut: FlatLabel(messageMarkdownFailureLabel) {
+	textFg: msgOutDateFg;
+	palette: outTextPalette;
+}
+messageMarkdownFailureLabelOutSelected: FlatLabel(
+	messageMarkdownFailureLabelOut) {
+	textFg: msgOutDateFgSelected;
+	palette: outTextPaletteSelected;
+}
+messageMarkdownFailure: MarkdownFailure(defaultMarkdownFailure) {
+	label: messageMarkdownFailureLabel;
+	width: 280px;
+	skip: 8px;
+}
+messageMarkdown: Markdown(defaultMarkdown) {
+	textPalette: TextPalette(inTextPalette) {
+		markBg: msgInReplyBarColor;
+	}
+	markBgOpacity: messageMarkdownQuoteBgOpacity;
+	textColor: historyTextInFg;
+	supplementaryTextColor: msgInDateFg;
+	body: messageMarkdownBodyStyle;
+	heading1: messageMarkdownHeading1Style;
+	heading2: messageMarkdownHeading2Style;
+	heading3: messageMarkdownHeading3Style;
+	heading4: messageMarkdownHeading4Style;
+	heading5: messageMarkdownHeading5Style;
+	heading6: messageMarkdownHeading6Style;
+	code: messageMarkdownCodeStyle;
+	pagePadding: margins(0px, 0px, 0px, 0px);
+	pageMaxWidth: msgMaxWidth;
+	textPadding: msgPadding;
+	blockSkips: messageMarkdownBlockSkips;
+	list: MarkdownList(messageMarkdownList) {
+		taskCheck: Check(defaultCheck) {
+			toggledFg: msgFileInBg;
+		}
+	}
+	quoteIndent: 16px;
+	quoteReadableMinWidth: 160px;
+	quotePaintColors: messageMarkdownQuotePaintColors;
+	pullquote: messageMarkdownPullquote;
+	rule: messageMarkdownRule;
+	table: messageMarkdownTable;
+	displayMath: messageMarkdownDisplayMath;
+	details: messageMarkdownDetails;
+	photo: messageMarkdownPhoto;
+	audio: messageMarkdownAudio;
+	groupedMedia: messageMarkdownGroupedMedia;
+	failure: messageMarkdownFailure;
+}
+messageMarkdownOut: Markdown(messageMarkdown) {
+	textPalette: TextPalette(outTextPalette) {
+		markBg: msgOutReplyBarColor;
+	}
+	textColor: historyTextOutFg;
+	supplementaryTextColor: msgOutDateFg;
+	list: MarkdownList(messageMarkdownList) {
+		bulletFg: historyTextOutFg;
+		taskCheck: Check(defaultCheck) {
+			toggledFg: msgFileOutBg;
+		}
+	}
+	quotePaintColors: MarkdownQuotePaintColors(messageMarkdownQuotePaintColors) {
+		blockquote: msgOutReplyBarColor;
+		pre: msgOutDateFg;
+		preBg: msgFileOutBg;
+	}
+	rule: MarkdownRule(messageMarkdownRule) {
+		fg: msgOutDateFg;
+	}
+	table: MarkdownTable(messageMarkdownTable) {
+		borderFg: msgOutReplyBarColor;
+		headerBg: msgOutReplyBarColor;
+		overflowFg: msgOutDateFg;
+	}
+	displayMath: MarkdownDisplayMath(messageMarkdownDisplayMath) {
+		fg: historyTextOutFg;
+		fallbackBg: msgFileOutBg;
+		overflowFg: msgOutDateFg;
+	}
+	details: MarkdownDetails(messageMarkdownDetails) {
+		bodyBg: msgOutBg;
+		summaryFg: historyTextOutFg;
+		icon: messageMarkdownDetailsIconOut;
+	}
+	photo: MarkdownPhoto(messageMarkdownPhoto) {
+		progressBg: msgOutDateFg;
+		progressFg: historyTextOutFg;
+		fallbackBg: msgFileOutBg;
+		fallbackFg: msgOutDateFg;
+	}
+	audio: MarkdownAudio(messageMarkdownAudio) {
+		borderFg: msgOutDateFg;
+		bg: msgFileOutBg;
+		titleFg: historyTextOutFg;
+		subtitleFg: msgOutDateFg;
+	}
+	groupedMedia: MarkdownGroupedMedia(messageMarkdownGroupedMedia) {
+		fallbackBg: msgFileOutBg;
+		fallbackFg: msgOutDateFg;
+		navButtonBg: windowBg;
+		navButtonBgOver: windowBgOver;
+		navPreviousIcon: messageMarkdownNavPreviousIconOut;
+		navPreviousIconOver: messageMarkdownNavPreviousIconOutSelected;
+		navNextIcon: messageMarkdownNavNextIconOut;
+		navNextIconOver: messageMarkdownNavNextIconOutSelected;
+	}
+	failure: MarkdownFailure(messageMarkdownFailure) {
+		label: messageMarkdownFailureLabelOut;
+	}
+}
+messageMarkdownSelected: Markdown(messageMarkdown) {
+	textPalette: TextPalette(inTextPaletteSelected) {
+		markBg: msgInReplyBarSelColor;
+	}
+	textColor: historyTextInFgSelected;
+	supplementaryTextColor: msgInDateFgSelected;
+	list: MarkdownList(messageMarkdownList) {
+		bulletFg: historyTextInFgSelected;
+		taskCheck: Check(defaultCheck) {
+			toggledFg: msgFileInBgSelected;
+		}
+	}
+	quotePaintColors: MarkdownQuotePaintColors(messageMarkdownQuotePaintColors) {
+		blockquote: msgInReplyBarSelColor;
+		pre: msgInDateFgSelected;
+		preBg: msgFileInBgSelected;
+	}
+	rule: MarkdownRule(messageMarkdownRule) {
+		fg: msgInDateFgSelected;
+	}
+	table: MarkdownTable(messageMarkdownTable) {
+		borderFg: msgInReplyBarSelColor;
+		headerBg: msgInReplyBarSelColor;
+		overflowFg: msgInDateFgSelected;
+	}
+	displayMath: MarkdownDisplayMath(messageMarkdownDisplayMath) {
+		fg: historyTextInFgSelected;
+		fallbackBg: msgFileInBgSelected;
+		overflowFg: msgInDateFgSelected;
+	}
+	details: MarkdownDetails(messageMarkdownDetails) {
+		bodyBg: msgInBgSelected;
+		summaryFg: historyTextInFgSelected;
+		icon: messageMarkdownDetailsIconSelected;
+	}
+	photo: MarkdownPhoto(messageMarkdownPhoto) {
+		progressBg: msgInDateFgSelected;
+		progressFg: historyTextInFgSelected;
+		fallbackBg: msgFileInBgSelected;
+		fallbackFg: msgInDateFgSelected;
+	}
+	audio: MarkdownAudio(messageMarkdownAudio) {
+		borderFg: msgInDateFgSelected;
+		bg: msgFileInBgSelected;
+		titleFg: historyTextInFgSelected;
+		subtitleFg: msgInDateFgSelected;
+	}
+	groupedMedia: MarkdownGroupedMedia(messageMarkdownGroupedMedia) {
+		fallbackBg: msgFileInBgSelected;
+		fallbackFg: msgInDateFgSelected;
+		navButtonBg: windowBg;
+		navButtonBgOver: windowBgOver;
+		navPreviousIcon: messageMarkdownNavPreviousIconSelected;
+		navPreviousIconOver: messageMarkdownNavPreviousIconSelected;
+		navNextIcon: messageMarkdownNavNextIconSelected;
+		navNextIconOver: messageMarkdownNavNextIconSelected;
+	}
+	failure: MarkdownFailure(messageMarkdownFailure) {
+		label: messageMarkdownFailureLabelSelected;
+	}
+}
+messageMarkdownOutSelected: Markdown(messageMarkdown) {
+	textPalette: TextPalette(outTextPaletteSelected) {
+		markBg: msgOutReplyBarSelColor;
+	}
+	textColor: historyTextOutFgSelected;
+	supplementaryTextColor: msgOutDateFgSelected;
+	list: MarkdownList(messageMarkdownList) {
+		bulletFg: historyTextOutFgSelected;
+		taskCheck: Check(defaultCheck) {
+			toggledFg: msgFileOutBgSelected;
+		}
+	}
+	quotePaintColors: MarkdownQuotePaintColors(messageMarkdownQuotePaintColors) {
+		blockquote: msgOutReplyBarSelColor;
+		pre: msgOutDateFgSelected;
+		preBg: msgFileOutBgSelected;
+	}
+	rule: MarkdownRule(messageMarkdownRule) {
+		fg: msgOutDateFgSelected;
+	}
+	table: MarkdownTable(messageMarkdownTable) {
+		borderFg: msgOutReplyBarSelColor;
+		headerBg: msgOutReplyBarSelColor;
+		overflowFg: msgOutDateFgSelected;
+	}
+	displayMath: MarkdownDisplayMath(messageMarkdownDisplayMath) {
+		fg: historyTextOutFgSelected;
+		fallbackBg: msgFileOutBgSelected;
+		overflowFg: msgOutDateFgSelected;
+	}
+	details: MarkdownDetails(messageMarkdownDetails) {
+		bodyBg: msgOutBgSelected;
+		summaryFg: historyTextOutFgSelected;
+		icon: messageMarkdownDetailsIconOutSelected;
+	}
+	photo: MarkdownPhoto(messageMarkdownPhoto) {
+		progressBg: msgOutDateFgSelected;
+		progressFg: historyTextOutFgSelected;
+		fallbackBg: msgFileOutBgSelected;
+		fallbackFg: msgOutDateFgSelected;
+	}
+	audio: MarkdownAudio(messageMarkdownAudio) {
+		borderFg: msgOutDateFgSelected;
+		bg: msgFileOutBgSelected;
+		titleFg: historyTextOutFgSelected;
+		subtitleFg: msgOutDateFgSelected;
+	}
+	groupedMedia: MarkdownGroupedMedia(messageMarkdownGroupedMedia) {
+		fallbackBg: msgFileOutBgSelected;
+		fallbackFg: msgOutDateFgSelected;
+		navButtonBg: windowBg;
+		navButtonBgOver: windowBgOver;
+		navPreviousIcon: messageMarkdownNavPreviousIconOutSelected;
+		navPreviousIconOver: messageMarkdownNavPreviousIconOutSelected;
+		navNextIcon: messageMarkdownNavNextIconOutSelected;
+		navNextIconOver: messageMarkdownNavNextIconOutSelected;
+	}
+	failure: MarkdownFailure(messageMarkdownFailure) {
+		label: messageMarkdownFailureLabelOutSelected;
+	}
+}
diff --git a/Telegram/SourceFiles/iv/iv_cached_media.cpp b/Telegram/SourceFiles/iv/iv_cached_media.cpp
new file mode 100644
index 00000000000000..e6154df38af71b
--- /dev/null
+++ b/Telegram/SourceFiles/iv/iv_cached_media.cpp
@@ -0,0 +1,1663 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/iv_cached_media.h"
+
+#include "base/algorithm.h"
+#include "base/flat_map.h"
+#include "base/weak_ptr.h"
+#include "core/application.h"
+#include "core/ui_integration.h"
+#include "data/data_channel.h"
+#include "data/data_cloud_file.h"
+#include "data/data_document.h"
+#include "data/data_document_media.h"
+#include "data/data_file_origin.h"
+#include "data/data_location.h"
+#include "data/data_media_types.h"
+#include "data/data_peer.h"
+#include "data/data_photo_media.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "data/data_web_page.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/view/history_view_element.h"
+#include "history/view/media/history_view_location.h"
+#include "history/view/media/history_view_media_grouped.h"
+#include "history/view/media/history_view_photo.h"
+#include "info/profile/info_profile_values.h"
+#include "iv/markdown/iv_markdown_common.h"
+#include "iv/markdown/iv_markdown_history_view_media.h"
+#include "iv/markdown/iv_markdown_prepare.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "media/view/media_view_open_common.h"
+#include "storage/file_download.h"
+#include "ui/dynamic_image.h"
+#include "ui/image/image.h"
+#include "ui/painter.h"
+#include "ui/text/text_entity.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+
+#include "styles/palette.h"
+#include "styles/style_chat.h"
+
+#include <QtGui/QImage>
+
+#include <algorithm>
+#include <memory>
+
+namespace Iv {
+namespace {
+
+constexpr auto kGeoPointScale = 1;
+constexpr auto kGeoPointZoomMin = 13;
+
+enum class CachedPagePhotoImageKind {
+	Thumbnail,
+	Full,
+};
+
+[[nodiscard]] QString SerializeNativeIvChannelContext(
+		uint64 channelId,
+		QString username) {
+	auto result = QString::number(channelId);
+	if (!username.isEmpty()) {
+		result += u"\n"_q + username;
+	}
+	return result;
+}
+
+[[nodiscard]] Window::SessionController *CurrentSessionController(
+		not_null<Main::Session*> session) {
+	if (const auto window = Core::App().activeWindow()) {
+		if (const auto current = window->sessionController();
+			current && (&current->session() == session)) {
+			return current;
+		}
+	}
+	return nullptr;
+}
+
+class CachedPagePhotoDynamicImage final : public Ui::DynamicImage {
+public:
+	CachedPagePhotoDynamicImage(
+		std::shared_ptr<::Data::PhotoMedia> media,
+		not_null<PhotoData*> photo,
+		::Data::FileOrigin origin,
+		CachedPagePhotoImageKind kind,
+		QSize requestedSize);
+
+	[[nodiscard]] std::shared_ptr<Ui::DynamicImage> clone() override;
+
+	[[nodiscard]] QImage image(int size) override;
+
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	void ensureWanted();
+
+	[[nodiscard]] Image *resolvedImage() const;
+	[[nodiscard]] QImage prepareImage(QImage image, int size) const;
+	[[nodiscard]] QSize requestedSize(int size) const;
+
+	const std::shared_ptr<::Data::PhotoMedia> _media;
+	const not_null<PhotoData*> _photo;
+	const ::Data::FileOrigin _origin;
+	const CachedPagePhotoImageKind _kind;
+	const QSize _requestedSize;
+	mutable QImage _cached;
+	rpl::lifetime _subscription;
+
+};
+
+CachedPagePhotoDynamicImage::CachedPagePhotoDynamicImage(
+		std::shared_ptr<::Data::PhotoMedia> media,
+		not_null<PhotoData*> photo,
+		::Data::FileOrigin origin,
+		CachedPagePhotoImageKind kind,
+		QSize requestedSize)
+: _media(std::move(media))
+, _photo(photo)
+, _origin(std::move(origin))
+, _kind(kind)
+, _requestedSize(requestedSize) {
+}
+
+std::shared_ptr<Ui::DynamicImage> CachedPagePhotoDynamicImage::clone() {
+	return std::make_shared<CachedPagePhotoDynamicImage>(
+		_media,
+		_photo,
+		_origin,
+		_kind,
+		_requestedSize);
+}
+
+QImage CachedPagePhotoDynamicImage::image(int size) {
+	ensureWanted();
+	if (const auto image = resolvedImage()) {
+		return prepareImage(image->original(), size);
+	}
+	return QImage();
+}
+
+void CachedPagePhotoDynamicImage::subscribeToUpdates(Fn<void()> callback) {
+	if (!callback) {
+		_subscription = {};
+		return;
+	}
+	_subscription = _photo->owner().photoLoadProgress(
+	) | rpl::filter([photo = _photo](not_null<PhotoData*> updated) {
+		return (updated == photo);
+	}) | rpl::on_next([=, callback = std::move(callback)] {
+		_cached = QImage();
+		callback();
+	});
+}
+
+void CachedPagePhotoDynamicImage::ensureWanted() {
+	switch (_kind) {
+	case CachedPagePhotoImageKind::Thumbnail:
+		_media->wanted(::Data::PhotoSize::Small, _origin);
+		break;
+	case CachedPagePhotoImageKind::Full:
+		_media->wanted(::Data::PhotoSize::Large, _origin);
+		break;
+	}
+}
+
+Image *CachedPagePhotoDynamicImage::resolvedImage() const {
+	switch (_kind) {
+	case CachedPagePhotoImageKind::Full:
+		if (const auto large = _media->image(::Data::PhotoSize::Large)) {
+			return large;
+		}
+		[[fallthrough]];
+	case CachedPagePhotoImageKind::Thumbnail:
+		if (const auto small = _media->image(::Data::PhotoSize::Small)) {
+			return small;
+		} else if (const auto thumbnail = _media->image(::Data::PhotoSize::Thumbnail)) {
+			return thumbnail;
+		}
+		return _media->thumbnailInline();
+	}
+	return nullptr;
+}
+
+QImage CachedPagePhotoDynamicImage::prepareImage(
+		QImage image,
+		int size) const {
+	const auto requested = requestedSize(size);
+	if (requested.isEmpty() || image.isNull()) {
+		return image;
+	}
+	const auto ratio = style::DevicePixelRatio();
+	if (!_cached.isNull()) {
+		const auto cachedSize = _cached.size() / ratio;
+		if (cachedSize.width() == requested.width()
+			|| cachedSize.height() == requested.height()) {
+			return _cached;
+		}
+	}
+	const auto to = image.size().scaled(requested, Qt::KeepAspectRatio);
+	_cached = image.scaled(
+		QSize(std::max(to.width(), 1), std::max(to.height(), 1)) * ratio,
+		Qt::IgnoreAspectRatio,
+		Qt::SmoothTransformation);
+	_cached.setDevicePixelRatio(ratio);
+	return _cached;
+}
+
+QSize CachedPagePhotoDynamicImage::requestedSize(int size) const {
+	if (!_requestedSize.isEmpty()) {
+		return _requestedSize;
+	}
+	return (size > 0) ? QSize(size, size) : QSize();
+}
+
+class CachedPagePhotoRuntime final : public Markdown::PhotoRuntime {
+public:
+	CachedPagePhotoRuntime(
+		not_null<Main::Session*> session,
+		not_null<PhotoData*> photo,
+		::Data::FileOrigin origin,
+		FullMsgId itemId = FullMsgId(),
+		Fn<FullMsgId()> itemIdResolver = nullptr);
+
+	[[nodiscard]] std::shared_ptr<Ui::DynamicImage> thumbnail(
+			QSize size) const override;
+
+	[[nodiscard]] std::shared_ptr<Ui::DynamicImage> full(
+			QSize size) const override;
+
+	[[nodiscard]] bool loaded() const override;
+
+	[[nodiscard]] bool loading() const override;
+
+	[[nodiscard]] double progress() const override;
+
+	void open(Qt::MouseButton button) const override;
+
+private:
+	const not_null<Main::Session*> _session;
+	const not_null<PhotoData*> _photo;
+	const ::Data::FileOrigin _origin;
+	const FullMsgId _itemId;
+	const Fn<FullMsgId()> _itemIdResolver;
+	const std::shared_ptr<::Data::PhotoMedia> _media;
+
+};
+
+CachedPagePhotoRuntime::CachedPagePhotoRuntime(
+	not_null<Main::Session*> session,
+	not_null<PhotoData*> photo,
+	::Data::FileOrigin origin,
+	FullMsgId itemId,
+	Fn<FullMsgId()> itemIdResolver)
+: _session(session)
+, _photo(photo)
+, _origin(std::move(origin))
+, _itemId(itemId)
+, _itemIdResolver(std::move(itemIdResolver))
+, _media(photo->createMediaView()) {
+}
+
+std::shared_ptr<Ui::DynamicImage> CachedPagePhotoRuntime::thumbnail(
+		QSize size) const {
+	_media->wanted(::Data::PhotoSize::Small, _origin);
+	return std::make_shared<CachedPagePhotoDynamicImage>(
+		_media,
+		_photo,
+		_origin,
+		CachedPagePhotoImageKind::Thumbnail,
+		size);
+}
+
+std::shared_ptr<Ui::DynamicImage> CachedPagePhotoRuntime::full(
+		QSize size) const {
+	_media->wanted(::Data::PhotoSize::Large, _origin);
+	return std::make_shared<CachedPagePhotoDynamicImage>(
+		_media,
+		_photo,
+		_origin,
+		CachedPagePhotoImageKind::Full,
+		size);
+}
+
+bool CachedPagePhotoRuntime::loaded() const {
+	_media->wanted(::Data::PhotoSize::Large, _origin);
+	return _media->loaded();
+}
+
+bool CachedPagePhotoRuntime::loading() const {
+	_media->wanted(::Data::PhotoSize::Large, _origin);
+	return _photo->displayLoading();
+}
+
+double CachedPagePhotoRuntime::progress() const {
+	_media->wanted(::Data::PhotoSize::Large, _origin);
+	return _media->progress();
+}
+
+void CachedPagePhotoRuntime::open(Qt::MouseButton button) const {
+	if (button != Qt::LeftButton && button != Qt::MiddleButton) {
+		return;
+	}
+	if (const auto window = Core::App().activeWindow()) {
+		const auto itemId = _itemIdResolver ? _itemIdResolver() : _itemId;
+		const auto item = itemId ? _session->data().message(itemId) : nullptr;
+		window->openInMediaView({
+			CurrentSessionController(_session),
+			_photo,
+			item,
+			item ? item->topicRootId() : MsgId(),
+			item ? item->sublistPeerId() : PeerId(),
+		});
+	}
+}
+
+[[nodiscard]] ImageWithLocation CachedPageMapImageData(
+		double latitude,
+		double longitude,
+		uint64 accessHash,
+		QSize size,
+		int zoom) {
+	const auto location = GeoPointLocation{
+		.lat = latitude,
+		.lon = longitude,
+		.access = accessHash,
+		.width = std::max(size.width(), 1),
+		.height = std::max(size.height(), 1),
+		.zoom = std::max(zoom, kGeoPointZoomMin),
+		.scale = kGeoPointScale,
+	};
+	return {
+		.location = ImageLocation(
+			{ location },
+			location.width,
+			location.height),
+	};
+}
+
+[[nodiscard]] ::Data::LocationPoint CachedPageMapPoint(
+		double latitude,
+		double longitude,
+		uint64 accessHash) {
+	const auto point = MTP_geoPoint(
+		MTP_flags(0),
+		MTP_double(longitude),
+		MTP_double(latitude),
+		MTP_long(accessHash),
+		MTP_int(0));
+	return ::Data::LocationPoint(point.c_geoPoint());
+}
+
+[[nodiscard]] bool CanHostNativeIvVideoDocument(
+		not_null<DocumentData*> document) {
+	return !document->isVideoMessage()
+		&& (document->isVideoFile() || document->isAnimation());
+}
+
+[[nodiscard]] ::Data::MediaFile::Args CachedPageVideoMediaArgs(
+		not_null<Main::Session*> session,
+		not_null<DocumentData*> document,
+		bool spoiler) {
+	const auto video = document->video();
+	return {
+		.hasQualitiesList = video && !video->qualities.empty(),
+		.skipPremiumEffect = !session->premium(),
+		.spoiler = spoiler,
+	};
+}
+
+[[nodiscard]] bool CanHostNativeIvAudioDocument(
+		not_null<DocumentData*> document) {
+	return document->isAudioFile() || document->isVoiceMessage();
+}
+
+[[nodiscard]] QString CachedPageGroupedMediaCopyText(
+		const Markdown::PreparedGroupedMediaBlockData &prepared) {
+	auto photos = 0;
+	auto videos = 0;
+	for (const auto &item : prepared.items) {
+		if (item.media.kind == Markdown::PreparedMediaItemKind::Photo) {
+			++photos;
+		} else {
+			++videos;
+		}
+	}
+	if (photos && !videos) {
+		return tr::lng_media_selected_photo(tr::now, lt_count, photos);
+	} else if (videos && !photos) {
+		return tr::lng_media_selected_video(tr::now, lt_count, videos);
+	}
+	return QString();
+}
+
+[[nodiscard]] QString CachedPageAudioTitleText(
+		const Markdown::PreparedAudioBlockData &audio) {
+	if (!audio.title.isEmpty()) {
+		return audio.title;
+	}
+	if (!audio.fileName.isEmpty()) {
+		return audio.fileName;
+	}
+	return tr::lng_in_dlg_audio_file(tr::now);
+}
+
+[[nodiscard]] QString CachedPageAudioSubtitleText(
+		const Markdown::PreparedAudioBlockData &audio) {
+	if (!audio.performer.isEmpty()) {
+		return audio.performer;
+	}
+	if (!audio.fileName.isEmpty()
+		&& audio.fileName != CachedPageAudioTitleText(audio)) {
+		return audio.fileName;
+	}
+	return QString();
+}
+
+[[nodiscard]] QString CachedPageAudioCopyText(
+		const Markdown::PreparedAudioBlockData &audio) {
+	const auto title = CachedPageAudioTitleText(audio);
+	const auto subtitle = CachedPageAudioSubtitleText(audio);
+	return subtitle.isEmpty() ? title : (title + u"\n"_q + subtitle);
+}
+
+class CachedPageDocumentRuntime final : public Markdown::DocumentRuntime {
+public:
+	CachedPageDocumentRuntime(
+		not_null<Main::Session*> session,
+		not_null<DocumentData*> document,
+		::Data::FileOrigin origin,
+		FullMsgId itemId = FullMsgId(),
+		Fn<FullMsgId()> itemIdResolver = nullptr);
+
+	[[nodiscard]] std::shared_ptr<Ui::DynamicImage> thumbnail(
+			QSize size) const override;
+
+	[[nodiscard]] std::shared_ptr<Ui::DynamicImage> full(
+			QSize size) const override;
+
+	[[nodiscard]] bool loaded() const override;
+
+	[[nodiscard]] bool loading() const override;
+
+	[[nodiscard]] double progress() const override;
+
+	void open(Qt::MouseButton button) const override;
+
+private:
+	const not_null<Main::Session*> _session;
+	const not_null<DocumentData*> _document;
+	const ::Data::FileOrigin _origin;
+	const FullMsgId _itemId;
+	const Fn<FullMsgId()> _itemIdResolver;
+	const std::shared_ptr<::Data::DocumentMedia> _media;
+
+};
+
+CachedPageDocumentRuntime::CachedPageDocumentRuntime(
+	not_null<Main::Session*> session,
+	not_null<DocumentData*> document,
+	::Data::FileOrigin origin,
+	FullMsgId itemId,
+	Fn<FullMsgId()> itemIdResolver)
+: _session(session)
+, _document(document)
+, _origin(std::move(origin))
+, _itemId(itemId)
+, _itemIdResolver(std::move(itemIdResolver))
+, _media(document->createMediaView()) {
+}
+
+bool CachedPageDocumentRuntime::loaded() const {
+	return _media->loaded();
+}
+
+bool CachedPageDocumentRuntime::loading() const {
+	return _document->displayLoading();
+}
+
+double CachedPageDocumentRuntime::progress() const {
+	return _document->progress();
+}
+
+void CachedPageDocumentRuntime::open(Qt::MouseButton button) const {
+	if (button != Qt::LeftButton && button != Qt::MiddleButton) {
+		return;
+	}
+	if (const auto window = Core::App().activeWindow()) {
+		const auto itemId = _itemIdResolver ? _itemIdResolver() : _itemId;
+		const auto item = itemId ? _session->data().message(itemId) : nullptr;
+		window->openInMediaView({
+			CurrentSessionController(_session),
+			_document,
+			item,
+			item ? item->topicRootId() : MsgId(),
+			item ? item->sublistPeerId() : PeerId(),
+		});
+	}
+}
+
+class CachedPageInlineDocumentImage final : public Ui::DynamicImage {
+public:
+	CachedPageInlineDocumentImage(
+		not_null<DocumentData*> document,
+		::Data::FileOrigin origin,
+		QSize requestedSize);
+
+	[[nodiscard]] std::shared_ptr<Ui::DynamicImage> clone() override;
+
+	[[nodiscard]] QImage image(int size) override;
+
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	void ensureWanted();
+
+	[[nodiscard]] bool fullImageLoaded() const;
+	[[nodiscard]] Image *resolvedFullPhotoImage() const;
+	[[nodiscard]] Image *resolvedPhotoImage() const;
+	[[nodiscard]] Image *resolvedThumbnailImage() const;
+	[[nodiscard]] QImage resolvedDocumentImage();
+	[[nodiscard]] QImage prepareImage(
+		QImage image,
+		int size,
+		bool full = false) const;
+	[[nodiscard]] QSize requestedSize(int size) const;
+
+	const not_null<DocumentData*> _document;
+	const ::Data::FileOrigin _origin;
+	const QSize _requestedSize;
+	const std::shared_ptr<::Data::DocumentMedia> _media;
+	const std::shared_ptr<::Data::PhotoMedia> _photoMedia;
+	QImage _documentImage;
+	mutable QImage _cached;
+	bool _documentImageRead = false;
+	mutable bool _cachedFull = false;
+	rpl::lifetime _subscription;
+
+};
+
+[[nodiscard]] std::shared_ptr<::Data::PhotoMedia> CachedPageInlinePhotoMedia(
+		not_null<DocumentData*> document) {
+	const auto photo = document->goodThumbnailPhoto();
+	return photo ? photo->createMediaView() : nullptr;
+}
+
+CachedPageInlineDocumentImage::CachedPageInlineDocumentImage(
+	not_null<DocumentData*> document,
+	::Data::FileOrigin origin,
+	QSize requestedSize)
+: _document(document)
+, _origin(std::move(origin))
+, _requestedSize(requestedSize)
+, _media(document->createMediaView())
+, _photoMedia(CachedPageInlinePhotoMedia(document)) {
+}
+
+std::shared_ptr<Ui::DynamicImage> CachedPageInlineDocumentImage::clone() {
+	return std::make_shared<CachedPageInlineDocumentImage>(
+		_document,
+		_origin,
+		_requestedSize);
+}
+
+QImage CachedPageInlineDocumentImage::image(int size) {
+	ensureWanted();
+	if (const auto image = resolvedFullPhotoImage()) {
+		return prepareImage(image->original(), size, true);
+	} else if (auto image = resolvedDocumentImage(); !image.isNull()) {
+		return prepareImage(std::move(image), size, true);
+	} else if (const auto image = resolvedPhotoImage()) {
+		return prepareImage(image->original(), size);
+	} else if (const auto thumbnail = resolvedThumbnailImage()) {
+		return prepareImage(thumbnail->original(), size);
+	}
+	return QImage();
+}
+
+void CachedPageInlineDocumentImage::subscribeToUpdates(Fn<void()> callback) {
+	_subscription.destroy();
+	if (!callback
+		|| (!_photoMedia
+			&& !_document->isImage()
+			&& !_document->hasThumbnail())) {
+		return;
+	}
+	ensureWanted();
+	if (fullImageLoaded()) {
+		return;
+	}
+	_document->session().downloaderTaskFinished(
+	) | rpl::filter([=] {
+		return fullImageLoaded()
+			|| (!_photoMedia
+				&& !_document->isImage()
+				&& resolvedThumbnailImage());
+	}) | rpl::take(1) | rpl::on_next(std::move(callback), _subscription);
+}
+
+void CachedPageInlineDocumentImage::ensureWanted() {
+	if (_photoMedia) {
+		_photoMedia->wanted(::Data::PhotoSize::Large, _origin);
+	}
+	if (_document->isImage()) {
+		_document->forceToCache(true);
+		_document->save(_origin, QString(), LoadFromCloudOrLocal, true);
+	} else {
+		_media->thumbnailWanted(_origin);
+	}
+}
+
+bool CachedPageInlineDocumentImage::fullImageLoaded() const {
+	return resolvedFullPhotoImage()
+		|| (_document->isImage() && _media->loaded(true));
+}
+
+Image *CachedPageInlineDocumentImage::resolvedFullPhotoImage() const {
+	return _photoMedia
+		? _photoMedia->image(::Data::PhotoSize::Large)
+		: nullptr;
+}
+
+Image *CachedPageInlineDocumentImage::resolvedPhotoImage() const {
+	if (!_photoMedia) {
+		return nullptr;
+	} else if (const auto small = _photoMedia->image(::Data::PhotoSize::Small)) {
+		return small;
+	} else if (const auto thumbnail = _photoMedia->image(
+			::Data::PhotoSize::Thumbnail)) {
+		return thumbnail;
+	}
+	return _photoMedia->thumbnailInline();
+}
+
+Image *CachedPageInlineDocumentImage::resolvedThumbnailImage() const {
+	if (const auto image = _media->thumbnail()) {
+		return image;
+	}
+	return _media->thumbnailInline();
+}
+
+QImage CachedPageInlineDocumentImage::resolvedDocumentImage() {
+	if (!_document->isImage() || !_media->loaded(true)) {
+		return QImage();
+	} else if (_documentImageRead) {
+		return _documentImage;
+	}
+	_documentImageRead = true;
+	_document->saveFromDataSilent();
+	auto &location = _document->location(true);
+	if (location.accessEnable()) {
+		_documentImage = Images::Read({
+			.path = location.name(),
+			.maxSize = requestedSize(0) * style::DevicePixelRatio(),
+		}).image;
+		location.accessDisable();
+	} else {
+		_documentImage = Images::Read({
+			.content = _media->bytes(),
+			.maxSize = requestedSize(0) * style::DevicePixelRatio(),
+		}).image;
+	}
+	return _documentImage;
+}
+
+QImage CachedPageInlineDocumentImage::prepareImage(
+		QImage image,
+		int size,
+		bool full) const {
+	const auto requested = requestedSize(size);
+	if (requested.isEmpty() || image.isNull()) {
+		return image;
+	}
+	const auto ratio = style::DevicePixelRatio();
+	if (!_cached.isNull() && (_cachedFull || !full)) {
+		const auto cachedSize = _cached.size() / ratio;
+		if (cachedSize.width() == requested.width()
+			|| cachedSize.height() == requested.height()) {
+			return _cached;
+		}
+	}
+	const auto to = image.size().scaled(requested, Qt::KeepAspectRatio);
+	_cached = image.scaled(
+		QSize(std::max(to.width(), 1), std::max(to.height(), 1)) * ratio,
+		Qt::IgnoreAspectRatio,
+		Qt::SmoothTransformation);
+	_cached.setDevicePixelRatio(style::DevicePixelRatio());
+	return _cached;
+}
+
+QSize CachedPageInlineDocumentImage::requestedSize(int size) const {
+	if (!_requestedSize.isEmpty()) {
+		return _requestedSize;
+	}
+	return (size > 0) ? QSize(size, size) : QSize();
+}
+
+std::shared_ptr<Ui::DynamicImage> CachedPageDocumentRuntime::thumbnail(
+		QSize size) const {
+	return std::make_shared<CachedPageInlineDocumentImage>(
+		_document,
+		_origin,
+		size);
+}
+
+std::shared_ptr<Ui::DynamicImage> CachedPageDocumentRuntime::full(
+		QSize size) const {
+	return std::make_shared<CachedPageInlineDocumentImage>(
+		_document,
+		_origin,
+		size);
+}
+
+class CachedPageMapDynamicImage final : public Ui::DynamicImage {
+public:
+	CachedPageMapDynamicImage(
+		not_null<::Data::CloudImage*> data,
+		not_null<Main::Session*> session,
+		::Data::FileOrigin origin);
+
+	[[nodiscard]] std::shared_ptr<Ui::DynamicImage> clone() override;
+
+	[[nodiscard]] QImage image(int size) override;
+
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	const not_null<::Data::CloudImage*> _data;
+	const not_null<Main::Session*> _session;
+	const ::Data::FileOrigin _origin;
+	std::shared_ptr<QImage> _view;
+	QImage _prepared;
+	int _paletteVersion = 0;
+	rpl::lifetime _subscription;
+
+};
+
+CachedPageMapDynamicImage::CachedPageMapDynamicImage(
+	not_null<::Data::CloudImage*> data,
+	not_null<Main::Session*> session,
+	::Data::FileOrigin origin)
+: _data(data)
+, _session(session)
+, _origin(std::move(origin)) {
+}
+
+std::shared_ptr<Ui::DynamicImage> CachedPageMapDynamicImage::clone() {
+	return std::make_shared<CachedPageMapDynamicImage>(
+		_data,
+		_session,
+		_origin);
+}
+
+QImage CachedPageMapDynamicImage::image(int size) {
+	const auto loaded = _view ? *_view : QImage();
+	if (loaded.isNull()) {
+		return QImage();
+	}
+	const auto paletteVersion = style::PaletteVersion();
+	if (_prepared.size() == loaded.size()
+		&& _prepared.devicePixelRatio() == loaded.devicePixelRatio()
+		&& _paletteVersion == paletteVersion) {
+		return _prepared;
+	}
+	_paletteVersion = paletteVersion;
+	_prepared = loaded.copy();
+	_prepared.setDevicePixelRatio(loaded.devicePixelRatio());
+	const auto ratio = loaded.devicePixelRatio();
+	const auto width = int(loaded.width() / ratio);
+	const auto height = int(loaded.height() / ratio);
+	const auto markerSize = std::min(width, height);
+	auto p = Painter(&_prepared);
+	auto hq = PainterHighQualityEnabler(p);
+	const auto pinScale = std::min({
+		1.0,
+		width / (st::historyMapPoint.height() * 2.5),
+		height / (st::historyMapPoint.height() * 2.5),
+	});
+	const auto center = QPointF(width / 2.0, height / 2.0);
+	p.translate(center);
+	p.scale(pinScale, pinScale);
+	p.translate(-center);
+	const auto paintMarker = [&](const style::icon &icon) {
+		icon.paint(
+			p,
+			(width - icon.width()) / 2,
+			(height / 2) - icon.height(),
+			markerSize);
+	};
+	paintMarker(st::historyMapPoint);
+	paintMarker(st::historyMapPointInner);
+	return _prepared;
+}
+
+void CachedPageMapDynamicImage::subscribeToUpdates(Fn<void()> callback) {
+	_subscription.destroy();
+	if (!callback) {
+		_view = nullptr;
+		_prepared = QImage();
+		return;
+	}
+	_view = _data->createView();
+	_data->load(_session, _origin);
+	if (!_view->isNull()) {
+		return;
+	}
+	_subscription = _session->downloaderTaskFinished(
+	) | rpl::filter([=] {
+		return !_view->isNull();
+	}) | rpl::take(1) | rpl::on_next([=] {
+		_prepared = QImage();
+		callback();
+	});
+}
+
+class CachedPageMapRuntime final : public Markdown::MapRuntime {
+public:
+	CachedPageMapRuntime(
+		not_null<Main::Session*> session,
+		::Data::FileOrigin origin,
+		double latitude,
+		double longitude,
+		uint64 accessHash,
+		QSize size,
+		int zoom);
+
+	[[nodiscard]] std::shared_ptr<Ui::DynamicImage> thumbnail(
+			QSize size) const override;
+
+	[[nodiscard]] std::shared_ptr<Ui::DynamicImage> full(
+			QSize size) const override;
+
+	[[nodiscard]] bool loaded() const override;
+
+	[[nodiscard]] bool loading() const override;
+
+	[[nodiscard]] double progress() const override;
+
+private:
+	void ensureLoaded() const;
+
+	const not_null<Main::Session*> _session;
+	const ::Data::FileOrigin _origin;
+	mutable ::Data::CloudImage _image;
+
+};
+
+CachedPageMapRuntime::CachedPageMapRuntime(
+	not_null<Main::Session*> session,
+	::Data::FileOrigin origin,
+	double latitude,
+	double longitude,
+	uint64 accessHash,
+	QSize size,
+	int zoom)
+: _session(session)
+, _origin(std::move(origin))
+, _image(session, CachedPageMapImageData(
+	latitude,
+	longitude,
+	accessHash,
+	size,
+	zoom)) {
+}
+
+std::shared_ptr<Ui::DynamicImage> CachedPageMapRuntime::thumbnail(
+		QSize size) const {
+	ensureLoaded();
+	return std::make_shared<CachedPageMapDynamicImage>(
+		&_image,
+		_session,
+		_origin);
+}
+
+std::shared_ptr<Ui::DynamicImage> CachedPageMapRuntime::full(
+		QSize size) const {	ensureLoaded();
+	return std::make_shared<CachedPageMapDynamicImage>(
+		&_image,
+		_session,
+		_origin);
+}
+
+bool CachedPageMapRuntime::loaded() const {
+	ensureLoaded();
+	return _image.loadedOnce();
+}
+
+bool CachedPageMapRuntime::loading() const {
+	ensureLoaded();
+	return _image.loading();
+}
+
+double CachedPageMapRuntime::progress() const {
+	ensureLoaded();
+	return _image.loadedOnce() ? 1. : 0.;
+}
+
+void CachedPageMapRuntime::ensureLoaded() const {
+	_image.load(_session, _origin);
+}
+
+class CachedPageChannelRuntime final : public Markdown::ChannelRuntime {
+public:
+	CachedPageChannelRuntime(
+		not_null<ChannelData*> channel,
+		QString context,
+		Fn<void(QString)> openChannel,
+		Fn<void(QString)> joinChannel);
+
+	[[nodiscard]] bool joinVisible() const override;
+
+	void open(Qt::MouseButton button) const override;
+
+	void join(Qt::MouseButton button) const override;
+
+private:
+	const not_null<ChannelData*> _channel;
+	const QString _context;
+	const Fn<void(QString)> _openChannel;
+	const Fn<void(QString)> _joinChannel;
+
+};
+
+CachedPageChannelRuntime::CachedPageChannelRuntime(
+	not_null<ChannelData*> channel,
+	QString context,
+	Fn<void(QString)> openChannel,
+	Fn<void(QString)> joinChannel)
+: _channel(channel)
+, _context(std::move(context))
+, _openChannel(std::move(openChannel))
+, _joinChannel(std::move(joinChannel)) {
+}
+
+bool CachedPageChannelRuntime::joinVisible() const {
+	return !_channel->amIn();
+}
+
+void CachedPageChannelRuntime::open(Qt::MouseButton button) const {
+	if ((button == Qt::LeftButton || button == Qt::MiddleButton)
+		&& _openChannel) {
+		_openChannel(_context);
+	}
+}
+
+void CachedPageChannelRuntime::join(Qt::MouseButton button) const {
+	if ((button == Qt::LeftButton || button == Qt::MiddleButton)
+		&& _joinChannel) {
+		_joinChannel(_context);
+	}
+}
+
+struct PendingInstantViewMediaItem {
+	enum class Kind {
+		Photo,
+		Document,
+	};
+
+	Kind kind = Kind::Photo;
+	uint64 id = 0;
+	TextWithEntities caption;
+};
+
+class CachedPageMediaRuntime final
+	: public Markdown::MediaRuntime
+	, public std::enable_shared_from_this<CachedPageMediaRuntime> {
+public:
+	CachedPageMediaRuntime(
+		not_null<Main::Session*> session,
+		not_null<WebPageData*> page,
+		Fn<void(QString)> openChannel,
+		Fn<void(QString)> joinChannel);
+	CachedPageMediaRuntime(
+		not_null<Main::Session*> session,
+		FullMsgId itemId,
+		Fn<void(QString)> openChannel,
+		Fn<void(QString)> joinChannel);
+	CachedPageMediaRuntime(
+		not_null<Main::Session*> session,
+		not_null<HistoryView::Element*> view,
+		Fn<void(QString)> openChannel,
+		Fn<void(QString)> joinChannel);
+
+	[[nodiscard]] std::shared_ptr<Ui::DynamicImage> resolveInlineImage(
+			uint64 documentId,
+			QSize size) const override;
+
+	[[nodiscard]] std::shared_ptr<Markdown::PhotoRuntime> resolvePhoto(
+			uint64 photoId) const override;
+
+	[[nodiscard]] std::shared_ptr<Markdown::DocumentRuntime> resolveDocument(
+			uint64 documentId) const override;
+
+	void registerPhoto(
+		uint64 photoId,
+		TextWithEntities caption) const override;
+	void registerDocument(
+		uint64 documentId,
+		TextWithEntities caption) const override;
+
+	[[nodiscard]] std::shared_ptr<Markdown::MapRuntime> resolveMap(
+			double latitude,
+			double longitude,
+			uint64 accessHash,
+			QSize size,
+			int zoom) const override;
+
+	[[nodiscard]] std::shared_ptr<Markdown::ChannelRuntime> resolveChannel(
+			uint64 channelId,
+			const QString &username) const override;
+
+	[[nodiscard]] rpl::producer<uint64> channelJoinedChanges() const override;
+
+	[[nodiscard]] Ui::Text::MarkedContext textContext() const override;
+	[[nodiscard]] QString mentionNameEntityData(uint64 userId) const override;
+
+	[[nodiscard]] std::shared_ptr<Markdown::IvHistoryViewMediaHost>
+	hostedMediaHost(
+			not_null<Window::SessionController*> controller) const;
+
+	[[nodiscard]] std::shared_ptr<Markdown::HostedMediaBlockFactory>
+	hostedMediaBlockFactory() const override;
+
+private:
+	void subscribeToChannel(
+			uint64 channelId,
+			not_null<ChannelData*> channel) const;
+
+	[[nodiscard]] HistoryItem *directHostItem() const;
+	[[nodiscard]] HistoryItem *openContextItem() const;
+	void queuePendingInstantViewItem(
+		PendingInstantViewMediaItem::Kind kind,
+		uint64 id,
+		TextWithEntities caption) const;
+	void flushPendingInstantViewItems(not_null<HistoryItem*> item) const;
+	[[nodiscard]] FullMsgId openContextItemId() const;
+	[[nodiscard]] ::Data::FileOrigin fileOrigin() const;
+
+	const not_null<Main::Session*> _session;
+	const ::Data::FileOrigin _origin;
+	const FullMsgId _itemId;
+	const QString _pageUrl;
+	const bool _useExistingView = false;
+	const base::weak_ptr<HistoryView::Element> _view;
+	const Fn<void(QString)> _openChannel;
+	const Fn<void(QString)> _joinChannel;
+	mutable std::shared_ptr<Markdown::IvHistoryViewMediaHost> _hostedMediaHost;
+	mutable std::vector<PendingInstantViewMediaItem> _pendingInstantViewItems;
+	mutable base::flat_map<uint64, rpl::lifetime> _channelJoinedSubscriptions;
+	mutable rpl::event_stream<uint64> _channelJoinedChanges;
+
+};
+
+CachedPageMediaRuntime::CachedPageMediaRuntime(
+	not_null<Main::Session*> session,
+	not_null<WebPageData*> page,
+	Fn<void(QString)> openChannel,
+	Fn<void(QString)> joinChannel)
+: _session(session)
+, _origin(::Data::FileOriginWebPage{ page->url })
+, _itemId()
+, _pageUrl(page->url)
+, _openChannel(std::move(openChannel))
+, _joinChannel(std::move(joinChannel)) {
+}
+
+CachedPageMediaRuntime::CachedPageMediaRuntime(
+	not_null<Main::Session*> session,
+	FullMsgId itemId,
+	Fn<void(QString)> openChannel,
+	Fn<void(QString)> joinChannel)
+: _session(session)
+, _origin(itemId)
+, _itemId(itemId)
+, _pageUrl()
+, _openChannel(std::move(openChannel))
+, _joinChannel(std::move(joinChannel)) {
+}
+
+CachedPageMediaRuntime::CachedPageMediaRuntime(
+	not_null<Main::Session*> session,
+	not_null<HistoryView::Element*> view,
+	Fn<void(QString)> openChannel,
+	Fn<void(QString)> joinChannel)
+: _session(session)
+, _origin(view->data()->fullId())
+, _itemId(view->data()->fullId())
+, _useExistingView(true)
+, _view(base::make_weak(view.get()))
+, _openChannel(std::move(openChannel))
+, _joinChannel(std::move(joinChannel)) {
+}
+
+std::shared_ptr<Ui::DynamicImage> CachedPageMediaRuntime::resolveInlineImage(
+		uint64 documentId,
+		QSize size) const {
+	const auto document = _session->data().document(DocumentId(documentId));
+	if (document->isNull()) {
+		return nullptr;
+	}
+	return std::make_shared<CachedPageInlineDocumentImage>(
+		document,
+		fileOrigin(),
+		size);
+}
+
+std::shared_ptr<Markdown::PhotoRuntime> CachedPageMediaRuntime::resolvePhoto(
+		uint64 photoId) const {
+	const auto photo = _session->data().photo(PhotoId(photoId));
+	if (photo->isNull()) {
+		return nullptr;
+	}
+	const auto itemIdResolver = [runtime = shared_from_this()] {
+		return runtime->openContextItemId();
+	};
+	return std::make_shared<CachedPagePhotoRuntime>(
+		_session,
+		photo,
+		fileOrigin(),
+		FullMsgId(),
+		std::move(itemIdResolver));
+}
+
+std::shared_ptr<Markdown::DocumentRuntime> CachedPageMediaRuntime::resolveDocument(
+		uint64 documentId) const {
+	const auto document = _session->data().document(DocumentId(documentId));
+	if (document->isNull()) {
+		return nullptr;
+	}
+	const auto itemIdResolver = [runtime = shared_from_this()] {
+		return runtime->openContextItemId();
+	};
+	return std::make_shared<CachedPageDocumentRuntime>(
+		_session,
+		document,
+		fileOrigin(),
+		FullMsgId(),
+		std::move(itemIdResolver));
+}
+
+void CachedPageMediaRuntime::registerPhoto(
+		uint64 photoId,
+		TextWithEntities caption) const {
+	const auto photo = _session->data().photo(PhotoId(photoId));
+	if (photo->isNull()) {
+		return;
+	}
+	if (const auto item = openContextItem()) {
+		item->addPhotoForInstantView(photo, std::move(caption));
+		return;
+	}
+	queuePendingInstantViewItem(
+		PendingInstantViewMediaItem::Kind::Photo,
+		photoId,
+		std::move(caption));
+}
+
+void CachedPageMediaRuntime::registerDocument(
+		uint64 documentId,
+		TextWithEntities caption) const {
+	const auto document = _session->data().document(DocumentId(documentId));
+	if (document->isNull()) {
+		return;
+	}
+	if (const auto item = openContextItem()) {
+		item->addDocumentForInstantView(document, std::move(caption));
+		return;
+	}
+	queuePendingInstantViewItem(
+		PendingInstantViewMediaItem::Kind::Document,
+		documentId,
+		std::move(caption));
+}
+
+std::shared_ptr<Markdown::MapRuntime> CachedPageMediaRuntime::resolveMap(
+		double latitude,
+		double longitude,
+		uint64 accessHash,
+		QSize size,
+		int zoom) const {
+	return std::make_shared<CachedPageMapRuntime>(
+		_session,
+		fileOrigin(),
+		latitude,
+		longitude,
+		accessHash,
+		size,
+		zoom);
+}
+
+std::shared_ptr<Markdown::ChannelRuntime> CachedPageMediaRuntime::resolveChannel(
+		uint64 channelId,
+		const QString &username) const {
+	const auto channel = _session->data().channel(ChannelId(channelId));
+	subscribeToChannel(channelId, channel);
+	return std::make_shared<CachedPageChannelRuntime>(
+		channel,
+		SerializeNativeIvChannelContext(channelId, username),
+		_openChannel,
+		_joinChannel);
+}
+
+rpl::producer<uint64> CachedPageMediaRuntime::channelJoinedChanges() const {
+	return _channelJoinedChanges.events();
+}
+
+Ui::Text::MarkedContext CachedPageMediaRuntime::textContext() const {
+	return Core::TextContext({ .session = _session });
+}
+
+QString CachedPageMediaRuntime::mentionNameEntityData(uint64 userId) const {
+	if (userId == 0) {
+		return QString();
+	}
+	const auto loadedUser = _session->data().userLoaded(UserId(userId));
+	return TextUtilities::MentionNameDataFromFields({
+		.selfId = _session->userId().bare,
+		.userId = userId,
+		.accessHash = loadedUser ? loadedUser->accessHash() : 0,
+	});
+}
+
+auto CachedPageMediaRuntime::hostedMediaHost(
+		not_null<Window::SessionController*> controller) const
+-> std::shared_ptr<Markdown::IvHistoryViewMediaHost> {
+	if (_useExistingView) {
+		const auto view = _view.get();
+		if (!view) {
+			return nullptr;
+		}
+		if (!_hostedMediaHost) {
+			_hostedMediaHost
+				= std::make_shared<Markdown::IvHistoryViewMediaHost>(
+					not_null{ view });
+		}
+		return _hostedMediaHost;
+	}
+	if (_itemId) {
+		const auto item = _session->data().message(_itemId);
+		if (!item) {
+			return nullptr;
+		}
+		if (!_hostedMediaHost) {
+			_hostedMediaHost
+				= std::make_shared<Markdown::IvHistoryViewMediaHost>(
+					controller,
+					not_null{ item });
+		}
+		return _hostedMediaHost;
+	}
+	if (!_session->data().peerLoaded(PeerData::kServiceNotificationsId)) {
+		return nullptr;
+	}
+	const auto history = _session->data().history(
+		PeerData::kServiceNotificationsId);
+	if (!history->peer->isUser()) {
+		return nullptr;
+	}
+	if (!_hostedMediaHost) {
+		_hostedMediaHost
+			= std::make_shared<Markdown::IvHistoryViewMediaHost>(
+				controller,
+				history,
+				_pageUrl);
+	}
+	return _hostedMediaHost;
+}
+
+auto CachedPageMediaRuntime::hostedMediaBlockFactory() const
+-> std::shared_ptr<Markdown::HostedMediaBlockFactory> {
+	const auto controller = CurrentSessionController(_session);
+	if (!controller) {
+		return nullptr;
+	}
+	const auto host = hostedMediaHost(not_null{ controller });
+	if (!host) {
+		return nullptr;
+	}
+	return std::make_shared<Markdown::IvHistoryViewMediaBlockFactory>(
+		base::make_weak(controller),
+		[session = _session, host, origin = fileOrigin()](
+				Window::SessionController *controller,
+				const Markdown::PreparedPhotoBlockData &prepared) {
+			if (!controller
+				|| !prepared.viewerOpen
+				|| !prepared.urlOverride.isEmpty()) {
+				return std::shared_ptr<Markdown::MediaBlock>();
+			}
+			const auto photo = session->data().photo(PhotoId(prepared.photoId));
+			if (photo->isNull()) {
+				return std::shared_ptr<Markdown::MediaBlock>();
+			}
+			host->registerPhoto(photo);
+
+			auto descriptor = Markdown::IvHistoryViewMediaDescriptor();
+			descriptor.stableId = prepared.id.value;
+			descriptor.kind = Markdown::IvHistoryViewMediaKind::Photo;
+			descriptor.copyText = u"Photo"_q;
+			descriptor.layoutHint = QSize(prepared.width, prepared.height);
+			descriptor.host = host;
+			descriptor.mediaFactory = [photo, spoiler = prepared.spoiler](
+					not_null<HistoryView::Element*> view) {
+				return std::make_unique<HistoryView::Photo>(
+					view,
+					view->data(),
+					photo,
+					spoiler);
+			};
+			descriptor.photo = std::make_shared<CachedPagePhotoRuntime>(
+				session,
+				photo,
+				origin,
+				host->item()->fullId());
+			return Markdown::CreateIvHistoryViewMediaBlock(
+				std::move(descriptor));
+		},
+		[session = _session, host, origin = fileOrigin()](
+				Window::SessionController *controller,
+				const Markdown::PreparedVideoBlockData &prepared) {
+			if (!controller
+				|| prepared.media.kind
+					!= Markdown::PreparedMediaItemKind::Document) {
+				return std::shared_ptr<Markdown::MediaBlock>();
+			}
+			const auto document = session->data().document(
+				DocumentId(prepared.media.id));
+			if (document->isNull()
+				|| !CanHostNativeIvVideoDocument(document)) {
+				return std::shared_ptr<Markdown::MediaBlock>();
+			}
+			host->registerDocument(document);
+			auto media = std::make_shared<::Data::MediaFile>(
+				host->item(),
+				document,
+				CachedPageVideoMediaArgs(
+					session,
+					document,
+					prepared.media.spoiler));
+
+			auto descriptor = Markdown::IvHistoryViewMediaDescriptor();
+			descriptor.stableId = prepared.id.value;
+			descriptor.kind = Markdown::IvHistoryViewMediaKind::Document;
+			descriptor.copyText = tr::lng_in_dlg_video(tr::now);
+			descriptor.layoutHint = QSize(
+				prepared.media.width,
+				prepared.media.height);
+			descriptor.host = host;
+			descriptor.mediaFactory = [media](
+					not_null<HistoryView::Element*> view) {
+				return media->createView(
+					view,
+					view->data());
+			};
+			descriptor.keepAlive.push_back(base::take(media));
+			descriptor.document = std::make_shared<CachedPageDocumentRuntime>(
+				session,
+				document,
+				origin,
+				host->item()->fullId());
+			return Markdown::CreateIvHistoryViewMediaBlock(
+				std::move(descriptor));
+		},
+		[session = _session, host, origin = fileOrigin()](
+				Window::SessionController *controller,
+				const Markdown::PreparedAudioBlockData &prepared) {
+			if (!controller) {
+				return std::shared_ptr<Markdown::MediaBlock>();
+			}
+			const auto document = session->data().document(
+				DocumentId(prepared.documentId));
+			if (document->isNull()
+				|| !CanHostNativeIvAudioDocument(document)) {
+				return std::shared_ptr<Markdown::MediaBlock>();
+			}
+			host->registerDocument(document);
+			auto media = std::make_shared<::Data::MediaFile>(
+				host->item(),
+				document,
+				::Data::MediaFile::Args{});
+
+			auto descriptor = Markdown::IvHistoryViewMediaDescriptor();
+			descriptor.stableId = prepared.id.value;
+			descriptor.kind = Markdown::IvHistoryViewMediaKind::Audio;
+			descriptor.copyText = CachedPageAudioCopyText(prepared);
+			descriptor.host = host;
+			descriptor.mediaFactory = [media](
+					not_null<HistoryView::Element*> view) {
+				return media->createView(
+					view,
+					view->data());
+			};
+			descriptor.keepAlive.push_back(base::take(media));
+			descriptor.document = std::make_shared<CachedPageDocumentRuntime>(
+				session,
+				document,
+				origin,
+				host->item()->fullId());
+			return Markdown::CreateIvHistoryViewMediaBlock(
+				std::move(descriptor));
+		},
+		[session = _session, host](
+				Window::SessionController *controller,
+				const Markdown::PreparedMapBlockData &prepared) {
+			if (!controller) {
+				return std::shared_ptr<Markdown::MediaBlock>();
+			}
+			const auto mapSize = QSize(prepared.width, prepared.height);
+			const auto point = CachedPageMapPoint(
+				prepared.latitude,
+				prepared.longitude,
+				prepared.accessHash);
+			const auto mapImage = std::make_shared<::Data::CloudImage>(
+				session,
+				CachedPageMapImageData(
+					prepared.latitude,
+					prepared.longitude,
+					prepared.accessHash,
+					mapSize,
+					prepared.zoom));
+			const auto mapImagePtr = mapImage.get();
+
+			auto descriptor = Markdown::IvHistoryViewMediaDescriptor();
+			descriptor.stableId = prepared.id.value;
+			descriptor.kind = Markdown::IvHistoryViewMediaKind::Map;
+			descriptor.copyText = tr::lng_maps_point(tr::now);
+			descriptor.layoutHint = mapSize;
+			descriptor.host = host;
+			descriptor.mediaFactory = [mapImagePtr, point, mapSize](
+					not_null<HistoryView::Element*> view) {
+				return std::make_unique<HistoryView::Location>(
+					view,
+					not_null{ mapImagePtr },
+					point,
+					nullptr,
+					0,
+					mapSize);
+			};
+			descriptor.keepAlive.push_back(mapImage);
+			return Markdown::CreateIvHistoryViewMediaBlock(
+				std::move(descriptor));
+		},
+		[session = _session, host, origin = fileOrigin()](
+				Window::SessionController *controller,
+				const Markdown::PreparedGroupedMediaBlockData &prepared) {
+			if (!controller
+				|| (prepared.intent
+					!= Markdown::PreparedGroupedMediaIntent::Collage)
+				|| prepared.items.empty()
+				|| (int(prepared.items.size())
+					> HistoryView::GroupedMedia::kMaxSize)) {
+				return std::shared_ptr<Markdown::MediaBlock>();
+			}
+			auto descriptor = Markdown::IvHistoryViewMediaDescriptor();
+			const auto medias = std::make_shared<
+				std::vector<std::unique_ptr<::Data::Media>>>();
+			medias->reserve(prepared.items.size());
+			for (const auto &item : prepared.items) {
+				const auto kind = item.media.kind;
+				if (kind == Markdown::PreparedMediaItemKind::Photo) {
+					const auto photo = session->data().photo(
+						PhotoId(item.media.id));
+					if (photo->isNull()) {
+						return std::shared_ptr<Markdown::MediaBlock>();
+					}
+					host->registerPhoto(photo);
+					medias->push_back(std::make_unique<::Data::MediaPhoto>(
+						host->item(),
+						photo,
+						item.media.spoiler));
+					descriptor.groupedPhotos.emplace(
+						photo->id,
+						std::make_shared<CachedPagePhotoRuntime>(
+							session,
+							photo,
+							origin,
+							host->item()->fullId()));
+				} else {
+					const auto document = session->data().document(
+						DocumentId(item.media.id));
+					if (document->isNull()
+						|| !CanHostNativeIvVideoDocument(document)) {
+						return std::shared_ptr<Markdown::MediaBlock>();
+					}
+					host->registerDocument(document);
+					medias->push_back(std::make_unique<::Data::MediaFile>(
+						host->item(),
+						document,
+						CachedPageVideoMediaArgs(
+							session,
+							document,
+							item.media.spoiler)));
+					descriptor.groupedDocuments.emplace(
+						document->id,
+						std::make_shared<CachedPageDocumentRuntime>(
+							session,
+							document,
+							origin,
+							host->item()->fullId()));
+				}
+				if (!medias->back()->canBeGrouped()) {
+					return std::shared_ptr<Markdown::MediaBlock>();
+				}
+			}
+			descriptor.stableId = prepared.id.value;
+			descriptor.kind = Markdown::IvHistoryViewMediaKind::GroupedMedia;
+			descriptor.copyText = CachedPageGroupedMediaCopyText(prepared);
+			descriptor.layoutHint = QSize(st::historyGroupWidthMax, 0);
+			descriptor.host = host;
+			descriptor.mediaFactory = [medias](
+					not_null<HistoryView::Element*> view) {
+				return std::make_unique<HistoryView::GroupedMedia>(
+					view,
+					*medias);
+			};
+			descriptor.keepAlive.push_back(medias);
+			return Markdown::CreateIvHistoryViewMediaBlock(
+				std::move(descriptor));
+		});
+}
+
+void CachedPageMediaRuntime::subscribeToChannel(
+		uint64 channelId,
+		not_null<ChannelData*> channel) const {
+	if (_channelJoinedSubscriptions.find(channelId)
+		!= end(_channelJoinedSubscriptions)) {
+		return;
+	}
+	Info::Profile::AmInChannelValue(channel) | rpl::on_next([=](bool) {
+		_channelJoinedChanges.fire_copy(channelId);
+	}, _channelJoinedSubscriptions[channelId]);
+}
+
+HistoryItem *CachedPageMediaRuntime::directHostItem() const {
+	if (const auto view = _view.get()) {
+		return view->data().get();
+	}
+	return _itemId ? _session->data().message(_itemId) : nullptr;
+}
+
+HistoryItem *CachedPageMediaRuntime::openContextItem() const {
+	if (const auto item = directHostItem()) {
+		flushPendingInstantViewItems(not_null{ item });
+		return item;
+	}
+	if (const auto controller = CurrentSessionController(_session)) {
+		if (const auto host = hostedMediaHost(not_null{ controller })) {
+			const auto item = host->item().get();
+			flushPendingInstantViewItems(not_null{ item });
+			return item;
+		}
+	}
+	return nullptr;
+}
+
+void CachedPageMediaRuntime::queuePendingInstantViewItem(
+		PendingInstantViewMediaItem::Kind kind,
+		uint64 id,
+		TextWithEntities caption) const {
+	for (auto &pending : _pendingInstantViewItems) {
+		if (pending.kind == kind && pending.id == id) {
+			if (!caption.text.isEmpty() && pending.caption.text.isEmpty()) {
+				pending.caption = std::move(caption);
+			}
+			return;
+		}
+	}
+	_pendingInstantViewItems.push_back({
+		.kind = kind,
+		.id = id,
+		.caption = std::move(caption),
+	});
+}
+
+void CachedPageMediaRuntime::flushPendingInstantViewItems(
+		not_null<HistoryItem*> item) const {
+	if (_pendingInstantViewItems.empty()) {
+		return;
+	}
+	for (auto &pending : _pendingInstantViewItems) {
+		switch (pending.kind) {
+		case PendingInstantViewMediaItem::Kind::Photo: {
+			const auto photo = _session->data().photo(PhotoId(pending.id));
+			if (!photo->isNull()) {
+				item->addPhotoForInstantView(
+					photo,
+					std::move(pending.caption));
+			}
+		} break;
+		case PendingInstantViewMediaItem::Kind::Document: {
+			const auto document = _session->data().document(
+				DocumentId(pending.id));
+			if (!document->isNull()) {
+				item->addDocumentForInstantView(
+					document,
+					std::move(pending.caption));
+			}
+		} break;
+		}
+	}
+	_pendingInstantViewItems.clear();
+}
+
+FullMsgId CachedPageMediaRuntime::openContextItemId() const {
+	if (const auto item = openContextItem()) {
+		return item->fullId();
+	}
+	return FullMsgId();
+}
+
+::Data::FileOrigin CachedPageMediaRuntime::fileOrigin() const {
+	return _origin;
+}
+
+} // namespace
+
+auto CreateCachedPageMediaRuntime(
+	not_null<Main::Session*> session,
+	not_null<WebPageData*> page,
+	Fn<void(QString)> openChannel,
+	Fn<void(QString)> joinChannel)
+-> std::shared_ptr<Markdown::MediaRuntime> {
+	return std::make_shared<CachedPageMediaRuntime>(
+		session,
+		page,
+		std::move(openChannel),
+		std::move(joinChannel));
+}
+
+auto CreateMessageMediaRuntime(
+	not_null<Main::Session*> session,
+	FullMsgId itemId,
+	Fn<void(QString)> openChannel,
+	Fn<void(QString)> joinChannel)
+-> std::shared_ptr<Markdown::MediaRuntime> {
+	return std::make_shared<CachedPageMediaRuntime>(
+		session,
+		itemId,
+		std::move(openChannel),
+		std::move(joinChannel));
+}
+
+auto CreateMessageMediaRuntime(
+	not_null<Main::Session*> session,
+	not_null<HistoryView::Element*> view,
+	Fn<void(QString)> openChannel,
+	Fn<void(QString)> joinChannel)
+-> std::shared_ptr<Markdown::MediaRuntime> {
+	return std::make_shared<CachedPageMediaRuntime>(
+		session,
+		view,
+		std::move(openChannel),
+		std::move(joinChannel));
+}
+
+} // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_cached_media.h b/Telegram/SourceFiles/iv/iv_cached_media.h
new file mode 100644
index 00000000000000..97e5dacd87fce9
--- /dev/null
+++ b/Telegram/SourceFiles/iv/iv_cached_media.h
@@ -0,0 +1,54 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/basic_types.h"
+#include "data/data_msg_id.h"
+
+#include <QtCore/QString>
+
+#include <memory>
+
+struct WebPageData;
+
+namespace HistoryView {
+class Element;
+} // namespace HistoryView
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Iv::Markdown {
+class MediaRuntime;
+} // namespace Iv::Markdown
+
+namespace Iv {
+
+[[nodiscard]] auto CreateCachedPageMediaRuntime(
+	not_null<Main::Session*> session,
+	not_null<WebPageData*> page,
+	Fn<void(QString)> openChannel,
+	Fn<void(QString)> joinChannel)
+-> std::shared_ptr<Markdown::MediaRuntime>;
+
+[[nodiscard]] auto CreateMessageMediaRuntime(
+	not_null<Main::Session*> session,
+	FullMsgId itemId,
+	Fn<void(QString)> openChannel,
+	Fn<void(QString)> joinChannel)
+-> std::shared_ptr<Markdown::MediaRuntime>;
+
+[[nodiscard]] auto CreateMessageMediaRuntime(
+	not_null<Main::Session*> session,
+	not_null<HistoryView::Element*> view,
+	Fn<void(QString)> openChannel,
+	Fn<void(QString)> joinChannel)
+-> std::shared_ptr<Markdown::MediaRuntime>;
+
+} // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 486778ef7c7b07..ba6f2ef5cf1a39 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -7,44 +7,33 @@ For license and copyright information please follow this link:
 */
 #include "iv/iv_controller.h"
 
+#include "base/event_filter.h"
 #include "base/platform/base_platform_info.h"
-#include "base/invoke_queued.h"
+#include "base/qt/qt_key_modifiers.h"
 #include "base/qt_signal_producer.h"
-#include "base/qthelp_url.h"
 #include "core/file_utilities.h"
-#include "iv/iv_data.h"
 #include "lang/lang_keys.h"
 #include "ui/chat/attach/attach_bot_webview.h"
-#include "ui/platform/ui_platform_window_title.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
-#include "ui/widgets/menu/menu_action.h"
 #include "ui/widgets/rp_window.h"
-#include "ui/widgets/popup_menu.h"
-#include "ui/wrap/fade_wrap.h"
 #include "ui/basic_click_handlers.h"
 #include "ui/painter.h"
-#include "ui/webview_helpers.h"
-#include "ui/ui_utility.h"
-#include "webview/webview_data_stream_memory.h"
+#include "ui/rect.h"
 #include "webview/webview_embed.h"
 #include "webview/webview_interface.h"
 #include "styles/palette.h"
 #include "styles/style_iv.h"
-#include "styles/style_menu_icons.h"
-#include "styles/style_payments.h" // paymentsCriticalError
-#include "styles/style_widgets.h"
+#include "styles/style_payments.h"
 #include "styles/style_window.h"
 
-#include <QtCore/QRegularExpression>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
-#include <QtCore/QJsonValue>
-#include <QtCore/QFile>
+#include <QtCore/QUrl>
 #include <QtGui/QGuiApplication>
+#include <QtGui/QKeyEvent>
 #include <QtGui/QPainter>
 #include <QtGui/QWindow>
-#include <charconv>
+
+#include <string>
 
 #include <ada.h>
 
@@ -52,230 +41,6 @@ namespace Iv {
 namespace {
 
 constexpr auto kZoomStep = int(10);
-constexpr auto kDefaultZoom = int(100);
-
-class ItemZoom final : public Ui::Menu::Action {
-public:
-	ItemZoom(
-		not_null<RpWidget*> parent,
-		const not_null<Delegate*> delegate,
-		const style::Menu &st)
-	: Ui::Menu::Action(
-		parent,
-		st,
-		Ui::CreateChild<QAction>(parent),
-		nullptr,
-		nullptr)
-	, _delegate(delegate)
-	, _st(st) {
-		init();
-	}
-
-	void init() {
-		enableMouseSelecting();
-
-		AbstractButton::setDisabled(true);
-
-		class SmallButton final : public Ui::IconButton {
-		public:
-			SmallButton(
-				not_null<Ui::RpWidget*> parent,
-				QChar c,
-				float64 skip,
-				const style::color &color)
-			: Ui::IconButton(parent, st::ivPlusMinusZoom)
-			, _color(color)
-			, _skip(style::ConvertFloatScale(skip))
-			, _c(c) {
-			}
-
-			void paintEvent(QPaintEvent *event) override {
-				auto p = Painter(this);
-				Ui::RippleButton::paintRipple(
-					p,
-					st::ivPlusMinusZoom.rippleAreaPosition);
-				p.setPen(_color);
-				p.setFont(st::normalFont);
-				p.drawText(
-					QRectF(rect()).translated(0, _skip),
-					_c,
-					style::al_center);
-			}
-
-		private:
-			const style::color _color;
-			const float64 _skip;
-			const QChar _c;
-
-		};
-
-		const auto reset = Ui::CreateChild<Ui::RoundButton>(
-			this,
-			rpl::single<QString>(QString()),
-			st::ivResetZoom);
-		const auto resetLabel = Ui::CreateChild<Ui::FlatLabel>(
-			reset,
-			tr::lng_background_reset_default(),
-			st::ivResetZoomLabel);
-		resetLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
-		reset->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-		reset->setClickedCallback([this] {
-			_delegate->ivSetZoom(kDefaultZoom);
-		});
-		reset->show();
-		const auto plus = Ui::CreateChild<SmallButton>(
-			this,
-			'+',
-			0,
-			_st.itemFg);
-		plus->setClickedCallback([this] {
-			_delegate->ivSetZoom(_delegate->ivZoom() + kZoomStep);
-		});
-		plus->show();
-		const auto minus = Ui::CreateChild<SmallButton>(
-			this,
-			QChar(0x2013),
-			-1,
-			_st.itemFg);
-		minus->setClickedCallback([this] {
-			_delegate->ivSetZoom(_delegate->ivZoom() - kZoomStep);
-		});
-		minus->show();
-
-		_delegate->ivZoomValue(
-		) | rpl::start_with_next([this](int value) {
-			_text.setText(_st.itemStyle, QString::number(value) + '%');
-			update();
-		}, lifetime());
-
-		rpl::combine(
-			sizeValue(),
-			reset->sizeValue()
-		) | rpl::start_with_next([=, this](const QSize &size, const QSize &) {
-			reset->setFullWidth(0
-				+ resetLabel->width()
-				+ st::ivResetZoomInnerPadding);
-			resetLabel->moveToLeft(
-				(reset->width() - resetLabel->width()) / 2,
-				(reset->height() - resetLabel->height()) / 2);
-			reset->moveToRight(
-				_st.itemPadding.right(),
-				(size.height() - reset->height()) / 2);
-			plus->moveToRight(
-				_st.itemPadding.right() + reset->width(),
-				(size.height() - plus->height()) / 2);
-			minus->moveToRight(
-				_st.itemPadding.right() + plus->width() + reset->width(),
-				(size.height() - minus->height()) / 2);
-		}, lifetime());
-	}
-
-	void paintEvent(QPaintEvent *event) override {
-		auto p = QPainter(this);
-		p.setPen(_st.itemFg);
-		_text.draw(p, {
-			.position = QPoint(
-				_st.itemIconPosition.x(),
-				(height() - _text.minHeight()) / 2),
-			.outerWidth = width(),
-			.availableWidth = width(),
-		});
-	}
-
-private:
-	const not_null<Delegate*> _delegate;
-	const style::Menu &_st;
-	Ui::Text::String _text;
-
-};
-
-[[nodiscard]] QByteArray ComputeStyles(int zoom) {
-	static const auto map = base::flat_map<QByteArray, const style::color*>{
-		{ "shadow-fg", &st::shadowFg },
-		{ "scroll-bg", &st::scrollBg },
-		{ "scroll-bg-over", &st::scrollBgOver },
-		{ "scroll-bar-bg", &st::scrollBarBg },
-		{ "scroll-bar-bg-over", &st::scrollBarBgOver },
-		{ "window-bg", &st::windowBg },
-		{ "window-bg-over", &st::windowBgOver },
-		{ "window-bg-ripple", &st::windowBgRipple },
-		{ "window-bg-active", &st::windowBgActive },
-		{ "window-fg", &st::windowFg },
-		{ "window-sub-text-fg", &st::windowSubTextFg },
-		{ "window-active-text-fg", &st::windowActiveTextFg },
-		{ "window-shadow-fg", &st::windowShadowFg },
-		{ "box-divider-bg", &st::boxDividerBg },
-		{ "box-divider-fg", &st::boxDividerFg },
-		{ "light-button-fg", &st::lightButtonFg },
-		//{ "light-button-bg-over", &st::lightButtonBgOver },
-		{ "menu-icon-fg", &st::menuIconFg },
-		{ "menu-icon-fg-over", &st::menuIconFgOver },
-		{ "menu-bg", &st::menuBg },
-		{ "menu-bg-over", &st::menuBgOver },
-		{ "history-to-down-fg", &st::historyToDownFg },
-		{ "history-to-down-fg-over", &st::historyToDownFgOver },
-		{ "history-to-down-bg", &st::historyToDownBg },
-		{ "history-to-down-bg-over", &st::historyToDownBgOver },
-		{ "history-to-down-bg-ripple", &st::historyToDownBgRipple },
-		{ "history-to-down-shadow", &st::historyToDownShadow },
-		{ "toast-bg", &st::toastBg },
-		{ "toast-fg", &st::toastFg },
-	};
-	static const auto phrases = base::flat_map<QByteArray, tr::phrase<>>{
-		{ "iv-join-channel", tr::lng_iv_join_channel },
-	};
-	return Ui::ComputeStyles(map, phrases, zoom)
-		+ ';'
-		+ Ui::ComputeSemiTransparentOverStyle(
-			"light-button-bg-over",
-			st::lightButtonBgOver,
-			st::windowBg);
-}
-
-[[nodiscard]] QByteArray WrapPage(const Prepared &page, int zoom) {
-#ifdef Q_OS_MAC
-	const auto classAttribute = ""_q;
-#else // Q_OS_MAC
-	const auto classAttribute = " class=\"custom_scroll\""_q;
-#endif // Q_OS_MAC
-
-	const auto js = QByteArray()
-		+ (page.hasCode ? "IV.initPreBlocks();" : "")
-		+ (page.hasEmbeds ? "IV.initEmbedBlocks();" : "")
-		+ "IV.init();"
-		+ page.script;
-
-	return R"(<!DOCTYPE html>
-<html)"_q
-	+ classAttribute
-	+ R"( style=")"
-	+ Ui::EscapeForAttribute(ComputeStyles(zoom))
-	+ R"(">
-	<head>
-		<meta charset="utf-8">
-		<meta name="robots" content="noindex, nofollow">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<script src="/iv/page.js"></script>
-		<link rel="stylesheet" href="/iv/page.css" />
-	</head>
-	<body>
-		<div id="top_shadow"></div>
-		<button class="fixed_button hidden" id="bottom_up" onclick="IV.scrollTo(0);">
-			<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-				<path d="M14.9972363,18 L9.13865768,12.1414214 C9.06055283,12.0633165 9.06055283,11.9366835 9.13865768,11.8585786 L14.9972363,6 L14.9972363,6" transform="translate(11.997236, 12.000000) scale(-1, -1) rotate(-90.000000) translate(-11.997236, -12.000000) "></path>
-			</svg>
-		</button>
-		<div class="page-scroll" tabindex="-1">)"_q + page.content.trimmed() + R"(</div>
-		<script>)"_q + js + R"(</script>
-	</body>
-</html>
-)"_q;
-}
-
-[[nodiscard]] QByteArray ReadResource(const QString &name) {
-	auto file = QFile(u":/iv/"_q + name);
-	return file.open(QIODevice::ReadOnly) ? file.readAll() : QByteArray();
-}
 
 [[nodiscard]] QString TonsiteToHttps(QString value) {
 	const auto ChangeHost = [](QString tonsite) {
@@ -340,32 +105,18 @@ class ItemZoom final : public Ui::Menu::Action {
 
 } // namespace
 
-Controller::Controller(
-	not_null<Delegate*> delegate,
-	Fn<ShareBoxResult(ShareBoxDescriptor)> showShareBox)
-: _delegate(delegate)
-, _updateStyles([=] {
-	const auto zoom = _delegate->ivZoom();
-	const auto str = Ui::EscapeForScriptString(ComputeStyles(zoom));
-	if (_webview) {
-		_webview->eval("IV.updateStyles('" + str + "');");
-	}
-})
-, _showShareBox(std::move(showShareBox)) {
+Controller::Controller(not_null<Delegate*> delegate)
+: _delegate(delegate) {
 	createWindow();
 }
 
 Controller::~Controller() {
-	destroyShareMenu();
 	if (_window) {
 		_window->hide();
 	}
-	_ready = false;
 	base::take(_webview);
-	_back.destroy();
-	_forward.destroy();
-	_menu = nullptr;
-	_menuToggle.destroy();
+	_back = nullptr;
+	_forward = nullptr;
 	_subtitle = nullptr;
 	_subtitleWrap = nullptr;
 	_window = nullptr;
@@ -377,123 +128,22 @@ void Controller::updateTitleGeometry(int newWidth) const {
 		0,
 		newWidth,
 		st::ivSubtitleHeight);
-	_subtitleWrap->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_subtitleWrap->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(_subtitleWrap.get()).fillRect(clip, st::windowBg);
 	}, _subtitleWrap->lifetime());
 
-	const auto progressBack = _subtitleBackShift.value(
-		_back->toggled() ? 1. : 0.);
-	const auto progressForward = _subtitleForwardShift.value(
-		_forward->toggled() ? 1. : 0.);
-	const auto backAdded = _back->width()
-		+ st::ivSubtitleSkip
-		- st::ivSubtitleLeft;
-	const auto forwardAdded = _forward->width();
-	const auto left = st::ivSubtitleLeft
-		+ anim::interpolate(0, backAdded, progressBack)
-		+ anim::interpolate(0, forwardAdded, progressForward);
-	_subtitle->resizeToWidth(newWidth - left - _menuToggle->width());
+	const auto left = (_back ? _back->width() : 0)
+		+ (_forward ? _forward->width() : 0)
+		+ st::ivSubtitleSkip;
+	const auto right = st::ivSubtitleSkip;
+	_subtitle->resizeToWidth(std::max(newWidth - left - right, 0));
 	_subtitle->moveToLeft(left, st::ivSubtitleTop);
 
-	_back->moveToLeft(0, 0);
-	_forward->moveToLeft(_back->width() * progressBack, 0);
-	_menuToggle->moveToRight(0, 0);
-}
-
-void Controller::initControls() {
-	_subtitleWrap = std::make_unique<Ui::RpWidget>(_window->body().get());
-	_subtitleText = _index.value() | rpl::filter(
-		rpl::mappers::_1 >= 0
-	) | rpl::map([=](int index) {
-		return _pages[index].name;
-	});
-	_subtitle = std::make_unique<Ui::FlatLabel>(
-		_subtitleWrap.get(),
-		_subtitleText.value(),
-		st::ivSubtitle);
-	_subtitle->setSelectable(true);
-
-	_windowTitleText = _subtitleText.value(
-	) | rpl::map([=](const QString &subtitle) {
-		const auto prefix = tr::lng_iv_window_title(tr::now);
-		return prefix + ' ' + QChar(0x2014) + ' ' + subtitle;
-	});
-	_windowTitleText.value(
-	) | rpl::start_with_next([=](const QString &title) {
-		_window->setWindowTitle(title);
-	}, _subtitle->lifetime());
-
-	_menuToggle.create(_subtitleWrap.get(), st::ivMenuToggle);
-	_menuToggle->setClickedCallback([=] { showMenu(); });
-
-	_back.create(
-		_subtitleWrap.get(),
-		object_ptr<Ui::IconButton>(_subtitleWrap.get(), st::ivBack));
-	_back->entity()->setClickedCallback([=] {
-		if (_webview) {
-			_webview->eval("window.history.back();");
-		} else {
-			_back->hide(anim::type::normal);
-		}
-	});
-	_forward.create(
-		_subtitleWrap.get(),
-		object_ptr<Ui::IconButton>(_subtitleWrap.get(), st::ivForward));
-	_forward->entity()->setClickedCallback([=] {
-		if (_webview) {
-			_webview->eval("window.history.forward();");
-		} else {
-			_forward->hide(anim::type::normal);
-		}
-	});
-
-	_back->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
-		_subtitleBackShift.start(
-			[=] { updateTitleGeometry(_window->body()->width()); },
-			toggled ? 0. : 1.,
-			toggled ? 1. : 0.,
-			st::fadeWrapDuration);
-	}, _back->lifetime());
-	_back->hide(anim::type::instant);
-
-	_forward->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
-		_subtitleForwardShift.start(
-			[=] { updateTitleGeometry(_window->body()->width()); },
-			toggled ? 0. : 1.,
-			toggled ? 1. : 0.,
-			st::fadeWrapDuration);
-	}, _forward->lifetime());
-	_forward->hide(anim::type::instant);
-
-	_subtitleBackShift.stop();
-	_subtitleForwardShift.stop();
-}
-
-void Controller::show(
-		const Webview::StorageId &storageId,
-		Prepared page,
-		base::flat_map<QByteArray, rpl::producer<bool>> inChannelValues) {
-	page.script = fillInChannelValuesScript(std::move(inChannelValues));
-	InvokeQueued(_container, [=, page = std::move(page)]() mutable {
-		showInWindow(storageId, std::move(page));
-	});
-}
-
-void Controller::update(Prepared page) {
-	const auto url = page.url;
-	auto i = _indices.find(url);
-	if (i == end(_indices)) {
-		return;
+	if (_back) {
+		_back->moveToLeft(0, 0);
 	}
-	const auto index = i->second;
-	_pages[index] = std::move(page);
-
-	if (_ready) {
-		_webview->eval(reloadScript(index));
-	} else if (!index) {
-		_reloadInitialWhenReady = true;
+	if (_forward) {
+		_forward->moveToLeft(_back ? _back->width() : 0, 0);
 	}
 }
 
@@ -522,62 +172,101 @@ void Controller::showTonSite(
 		return HttpsToTonsite(value);
 	});
 	_windowTitleText = _subtitleText.value();
-	_menuToggle->hide();
-}
-
-QByteArray Controller::fillInChannelValuesScript(
-		base::flat_map<QByteArray, rpl::producer<bool>> inChannelValues) {
-	auto result = QByteArray();
-	for (auto &[id, in] : inChannelValues) {
-		if (_inChannelSubscribed.emplace(id).second) {
-			std::move(in) | rpl::start_with_next([=](bool in) {
-				if (_ready) {
-					_webview->eval(toggleInChannelScript(id, in));
-				} else {
-					_inChannelChanged[id] = in;
-				}
-			}, _lifetime);
-		}
-	}
-	for (const auto &[id, in] : base::take(_inChannelChanged)) {
-		result += toggleInChannelScript(id, in);
-	}
-	return result;
-}
-
-QByteArray Controller::toggleInChannelScript(
-		const QByteArray &id,
-		bool in) const {
-	const auto value = in ? "true" : "false";
-	return "IV.toggleChannelJoined('" + id + "', " + value + ");";
 }
 
 void Controller::createWindow() {
 	_window = std::make_unique<Ui::RpWindow>();
 	const auto window = _window.get();
 
+	_subtitleWrap = std::make_unique<Ui::RpWidget>(_window->body().get());
+	_subtitle = Ui::CreateChild<Ui::FlatLabel>(
+		_subtitleWrap.get(),
+		_subtitleText.value(),
+		st::ivSubtitle);
+	_subtitle->setSelectable(true);
+
+	_windowTitleText = _subtitleText.value(
+	) | rpl::map([=](const QString &subtitle) {
+		const auto prefix = tr::lng_iv_window_title(tr::now);
+		return prefix + ' ' + QChar(0x2014) + ' ' + subtitle;
+	});
+	_windowTitleText.value(
+	) | rpl::on_next([=](const QString &title) {
+		_window->setWindowTitle(title);
+	}, _subtitle->lifetime());
+
+	_back = Ui::CreateChild<Ui::IconButton>(_subtitleWrap.get(), st::ivBack);
+	_back->setClickedCallback([=] {
+		if (_webview) {
+			_webview->eval("window.history.back();");
+		}
+	});
+	_back->setDisabled(true);
+
+	_forward = Ui::CreateChild<Ui::IconButton>(
+		_subtitleWrap.get(),
+		st::ivForward);
+	_forward->setClickedCallback([=] {
+		if (_webview) {
+			_webview->eval("window.history.forward();");
+		}
+	});
+	_forward->setDisabled(true);
+
 	base::qt_signal_producer(
 		qApp,
 		&QGuiApplication::focusWindowChanged
 	) | rpl::filter([=](QWindow *focused) {
 		const auto handle = window->window()->windowHandle();
 		return _webview && handle && (focused == handle);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		setInnerFocus();
 	}, window->lifetime());
 
-	initControls();
-
-	window->body()->widthValue() | rpl::start_with_next([=](int width) {
+	window->body()->widthValue() | rpl::on_next([=](int width) {
 		updateTitleGeometry(width);
 	}, _subtitle->lifetime());
 
-	window->setGeometry(_delegate->ivGeometry());
+	window->events(
+	) | rpl::on_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::Close) {
+			close();
+		} else if (e->type() == QEvent::KeyPress) {
+			processKey(static_cast<QKeyEvent*>(e.get()));
+		}
+	}, window->lifetime());
+
+	base::install_event_filter(window, qApp, [=](not_null<QEvent*> e) {
+		if (e->type() != QEvent::ShortcutOverride
+			|| !window->isActiveWindow()) {
+			return base::EventFilterResult::Continue;
+		}
+		const auto event = static_cast<QKeyEvent*>(e.get());
+		const auto command = Platform::IsMac()
+			? Qt::MetaModifier
+			: Qt::ControlModifier;
+		if (!(event->modifiers() & command)) {
+			return base::EventFilterResult::Continue;
+		} else if (event->key() == Qt::Key_Plus
+			|| event->key() == Qt::Key_Equal) {
+			_delegate->ivSetZoom(_delegate->ivZoom() + kZoomStep);
+			return base::EventFilterResult::Cancel;
+		} else if (event->key() == Qt::Key_Minus) {
+			_delegate->ivSetZoom(_delegate->ivZoom() - kZoomStep);
+			return base::EventFilterResult::Cancel;
+		} else if (event->key() == Qt::Key_0) {
+			_delegate->ivSetZoom(0);
+			return base::EventFilterResult::Cancel;
+		}
+		return base::EventFilterResult::Continue;
+	});
+
+	window->setGeometry(_delegate->ivGeometry(window));
 	window->setMinimumSize({ st::windowMinWidth, st::windowMinHeight });
 
 	window->geometryValue(
 	) | rpl::distinct_until_changed(
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		_delegate->ivSaveGeometry(window);
 	}, window->lifetime());
 
@@ -585,12 +274,12 @@ void Controller::createWindow() {
 	rpl::combine(
 		window->body()->sizeValue(),
 		_subtitleWrap->heightValue()
-	) | rpl::start_with_next([=](QSize size, int title) {
+	) | rpl::on_next([=](QSize size, int title) {
 		_container->setGeometry(QRect(QPoint(), size).marginsRemoved(
 			{ 0, title, 0, 0 }));
 	}, _container->lifetime());
 
-	_container->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_container->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(_container).fillRect(clip, st::windowBg);
 	}, _container->lifetime());
 
@@ -607,36 +296,28 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 		Webview::WindowConfig{
 			.opaqueBg = st::windowBg->c,
 			.storageId = storageId,
+			.safe = true,
 		});
 	const auto raw = _webview.get();
 
+	if (const auto webviewZoomController = raw->zoomController()) {
+		webviewZoomController->zoomValue(
+		) | rpl::on_next([this](int value) {
+			if (value > 0) {
+				_delegate->ivSetZoom(value);
+			}
+		}, lifetime());
+		_delegate->ivZoomValue(
+		) | rpl::on_next([=](int value) {
+			webviewZoomController->setZoom(value);
+		}, lifetime());
+		webviewZoomController->setZoom(_delegate->ivZoom());
+	}
+
 	window->lifetime().add([=] {
-		_ready = false;
 		base::take(_webview);
 	});
 
-	window->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
-		if (e->type() == QEvent::Close) {
-			close();
-		} else if (e->type() == QEvent::KeyPress) {
-			const auto event = static_cast<QKeyEvent*>(e.get());
-			if (event->key() == Qt::Key_Escape) {
-				escape();
-			}
-			if (event->modifiers() & Qt::ControlModifier) {
-				if (event->key() == Qt::Key_Plus
-					|| event->key() == Qt::Key_Equal) {
-					_delegate->ivSetZoom(_delegate->ivZoom() + kZoomStep);
-				} else if (event->key() == Qt::Key_Minus) {
-					_delegate->ivSetZoom(_delegate->ivZoom() - kZoomStep);
-				} else if (event->key() == Qt::Key_0) {
-					_delegate->ivSetZoom(kDefaultZoom);
-				}
-			}
-		}
-	}, window->lifetime());
-
 	const auto widget = raw->widget();
 	if (!widget) {
 		base::take(_webview);
@@ -647,8 +328,6 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 
 	QObject::connect(widget, &QObject::destroyed, [=] {
 		if (!_webview) {
-			// If we destroyed _webview ourselves,
-			// we don't show any message, nothing crashed.
 			return;
 		}
 		crl::on_main(window, [=] {
@@ -658,14 +337,16 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 	});
 
 	_container->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		if (const auto widget = raw->widget()) {
 			widget->setGeometry(QRect(QPoint(), size));
 		}
 	}, _container->lifetime());
 
 	raw->setNavigationStartHandler([=](const QString &uri, bool newWindow) {
-		if (uri.startsWith(u"http://desktop-app-resource/"_q)
+		Q_UNUSED(newWindow);
+
+		if (uri == u"about:blank"_q
 			|| QUrl(uri).host().toLower().endsWith(u".magic.org"_q)) {
 			return true;
 		}
@@ -673,219 +354,34 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 		return false;
 	});
 	raw->setNavigationDoneHandler([=](bool success) {
+		Q_UNUSED(success);
 	});
-	raw->setMessageHandler([=](const QJsonDocument &message) {
-		crl::on_main(_window.get(), [=] {
-			const auto object = message.object();
-			const auto event = object.value("event").toString();
-			if (event == u"keydown"_q) {
-				const auto key = object.value("key").toString();
-				const auto modifier = object.value("modifier").toString();
-				processKey(key, modifier);
-			} else if (event == u"mouseenter"_q) {
-				window->overrideSystemButtonOver({});
-			} else if (event == u"mouseup"_q) {
-				window->overrideSystemButtonDown({});
-			} else if (event == u"link_click"_q) {
-				const auto url = object.value("url").toString();
-				const auto context = object.value("context").toString();
-				processLink(url, context);
-			} else if (event == "menu_page_blocker_click") {
-				if (_menu) {
-					_menu->hideMenu();
-				}
-			} else if (event == u"ready"_q) {
-				_ready = true;
-				auto script = QByteArray();
-				for (const auto &[id, in] : base::take(_inChannelChanged)) {
-					script += toggleInChannelScript(id, in);
-				}
-				if (_navigateToIndexWhenReady >= 0) {
-					script += navigateScript(
-						std::exchange(_navigateToIndexWhenReady, -1),
-						base::take(_navigateToHashWhenReady));
-				}
-				if (base::take(_reloadInitialWhenReady)) {
-					script += reloadScript(0);
-				}
-				if (_menu) {
-					script += "IV.menuShown(true);";
-				}
-				if (!script.isEmpty()) {
-					_webview->eval(script);
-				}
-			} else if (event == u"location_change"_q) {
-				_index = object.value("index").toInt();
-				_hash = object.value("hash").toString();
-				_webview->refreshNavigationHistoryState();
-			}
-		});
-	});
-	raw->setDataRequestHandler([=](Webview::DataRequest request) {
-		const auto pos = request.id.find('#');
-		if (pos != request.id.npos) {
-			request.id = request.id.substr(0, pos);
-		}
-		if (!request.id.starts_with("iv/")) {
-			_dataRequests.fire(std::move(request));
-			return Webview::DataResult::Pending;
-		}
-		const auto finishWith = [&](QByteArray data, std::string mime) {
-			request.done({
-				.stream = std::make_unique<Webview::DataStreamFromMemory>(
-					std::move(data),
-					std::move(mime)),
-				});
-			return Webview::DataResult::Done;
-		};
-		const auto id = std::string_view(request.id).substr(3);
-		if (id.starts_with("page") && id.ends_with(".html")) {
-			if (!_subscribedToColors) {
-				_subscribedToColors = true;
-
-				rpl::merge(
-					Lang::Updated(),
-					style::PaletteChanged(),
-					_delegate->ivZoomValue() | rpl::to_empty
-				) | rpl::start_with_next([=] {
-					_updateStyles.call();
-				}, _webview->lifetime());
-			}
-			auto index = 0;
-			const auto result = std::from_chars(
-				id.data() + 4,
-				id.data() + id.size() - 5,
-				index);
-			if (result.ec != std::errc()
-				|| index < 0
-				|| index >= _pages.size()) {
-				return Webview::DataResult::Failed;
-			}
-			return finishWith(
-				WrapPage(_pages[index], _delegate->ivZoom()),
-				"text/html; charset=utf-8");
-		} else if (id.starts_with("page") && id.ends_with(".json")) {
-			auto index = 0;
-			const auto result = std::from_chars(
-				id.data() + 4,
-				id.data() + id.size() - 5,
-				index);
-			if (result.ec != std::errc()
-				|| index < 0
-				|| index >= _pages.size()) {
-				return Webview::DataResult::Failed;
-			}
-			auto &page = _pages[index];
-			return finishWith(QJsonDocument(QJsonObject{
-				{ "html", QJsonValue(QString::fromUtf8(page.content)) },
-				{ "js", QJsonValue(QString::fromUtf8(page.script)) },
-			}).toJson(QJsonDocument::Compact), "application/json");
-		}
-		const auto css = id.ends_with(".css");
-		const auto js = !css && id.ends_with(".js");
-		if (!css && !js) {
-			return Webview::DataResult::Failed;
-		}
-		const auto qstring = QString::fromUtf8(id.data(), id.size());
-		const auto pattern = u"^[a-zA-Z\\.\\-_0-9]+$"_q;
-		if (QRegularExpression(pattern).match(qstring).hasMatch()) {
-			const auto bytes = ReadResource(qstring);
-			if (!bytes.isEmpty()) {
-				const auto mime = css ? "text/css" : "text/javascript";
-				const auto full = (qstring == u"page.js"_q)
-					? (ReadResource("morphdom.js") + bytes)
-					: bytes;
-				return finishWith(full, mime);
-			}
-		}
-		return Webview::DataResult::Failed;
-	});
-
 	raw->navigationHistoryState(
-	) | rpl::start_with_next([=](Webview::NavigationHistoryState state) {
-		_back->toggle(
-			state.canGoBack || state.canGoForward,
-			anim::type::normal);
-		_forward->toggle(state.canGoForward, anim::type::normal);
-		_back->entity()->setDisabled(!state.canGoBack);
-		_back->entity()->setIconOverride(
-			state.canGoBack ? nullptr : &st::ivBackIconDisabled,
-			state.canGoBack ? nullptr : &st::ivBackIconDisabled);
-		_back->setAttribute(
-			Qt::WA_TransparentForMouseEvents,
-			!state.canGoBack);
+	) | rpl::on_next([=](Webview::NavigationHistoryState state) {
+		_back->setDisabled(!state.canGoBack);
+		_forward->setDisabled(!state.canGoForward);
 		_url = QString::fromStdString(state.url);
 	}, _webview->lifetime());
 
 	raw->init(R"()");
 }
 
-void Controller::showWebviewError() {
-	const auto available = Webview::Availability();
-	if (available.error != Webview::Available::Error::None) {
-		showWebviewError(Ui::BotWebView::ErrorText(available));
-	} else {
-		showWebviewError({ "Error: Could not initialize WebView." });
-	}
-}
-
-void Controller::showWebviewError(TextWithEntities text) {
-	auto error = Ui::CreateChild<Ui::PaddingWrap<Ui::FlatLabel>>(
-		_container,
-		object_ptr<Ui::FlatLabel>(
-			_container,
-			rpl::single(text),
-			st::paymentsCriticalError),
-		st::paymentsCriticalErrorPadding);
-	error->entity()->setClickHandlerFilter([=](
-			const ClickHandlerPtr &handler,
-			Qt::MouseButton) {
-		const auto entity = handler->getTextEntity();
-		if (entity.type != EntityType::CustomUrl) {
-			return true;
-		}
-		File::OpenUrl(entity.data);
-		return false;
-	});
-	error->show();
-	_container->sizeValue() | rpl::start_with_next([=](QSize size) {
-		error->setGeometry(0, 0, size.width(), size.height() * 2 / 3);
-	}, error->lifetime());
-}
-
-void Controller::showInWindow(
-		const Webview::StorageId &storageId,
-		Prepared page) {
-	Expects(_container != nullptr);
-
-	const auto url = page.url;
-	_hash = page.hash;
-	auto i = _indices.find(url);
-	if (i == end(_indices)) {
-		_pages.push_back(std::move(page));
-		i = _indices.emplace(url, int(_pages.size() - 1)).first;
-	}
-	const auto index = i->second;
-	_index = index;
-	if (!_webview) {
-		createWebview(storageId);
-		if (_webview && _webview->widget()) {
-			auto id = u"iv/page%1.html"_q.arg(index);
-			if (!_hash.isEmpty()) {
-				id += '#' + _hash;
-			}
-			_webview->navigateToData(id);
-			activate();
-		} else {
-			_events.fire({ Event::Type::Close });
+void Controller::processKey(QKeyEvent *event) {
+	const auto command = Platform::IsMac()
+		? Qt::MetaModifier
+		: Qt::ControlModifier;
+	if (event->key() == Qt::Key_Escape) {
+		close();
+	} else if (event->modifiers() & command) {
+		if (event->key() == Qt::Key_W) {
+			close();
+		} else if (event->key() == Qt::Key_M) {
+			minimize();
+		} else if (event->key() == Qt::Key_Q) {
+			quit();
+		} else if (event->key() == Qt::Key_0) {
+			_delegate->ivSetZoom(0);
 		}
-	} else if (_ready) {
-		_webview->eval(navigateScript(index, _hash));
-		activate();
-	} else {
-		_navigateToIndexWhenReady = index;
-		_navigateToHashWhenReady = _hash;
-		activate();
 	}
 }
 
@@ -902,90 +398,15 @@ void Controller::activate() {
 }
 
 void Controller::setInnerFocus() {
-	if (const auto onstack = _shareFocus) {
-		onstack();
-	} else if (_webview) {
+	if (_webview) {
 		_webview->focus();
 	}
 }
 
-QByteArray Controller::navigateScript(int index, const QString &hash) {
-	return "IV.navigateTo("
-		+ QByteArray::number(index)
-		+ ", '"
-		+ Ui::EscapeForScriptString(qthelp::url_decode(hash).toUtf8())
-		+ "');";
-}
-
-QByteArray Controller::reloadScript(int index) {
-	return "IV.reloadPage("
-		+ QByteArray::number(index)
-		+ ");";
-}
-
-void Controller::processKey(const QString &key, const QString &modifier) {
-	const auto ctrl = Platform::IsMac() ? u"cmd"_q : u"ctrl"_q;
-	if (key == u"escape"_q) {
-		escape();
-	} else if (key == u"w"_q && modifier == ctrl) {
-		close();
-	} else if (key == u"m"_q && modifier == ctrl) {
-		minimize();
-	} else if (key == u"q"_q && modifier == ctrl) {
-		quit();
-	}
-}
-
-void Controller::processLink(const QString &url, const QString &context) {
-	const auto channelPrefix = u"channel"_q;
-	const auto joinPrefix = u"join_link"_q;
-	const auto webpagePrefix = u"webpage"_q;
-	const auto viewerPrefix = u"viewer"_q;
-	if (context == u"report-iv") {
-		_events.fire({
-			.type = Event::Type::Report,
-			.context = QString::number(compuseCurrentPageId()),
-		});
-	} else if (context.startsWith(channelPrefix)) {
-		_events.fire({
-			.type = Event::Type::OpenChannel,
-			.context = context.mid(channelPrefix.size()),
-		});
-	} else if (context.startsWith(joinPrefix)) {
-		_events.fire({
-			.type = Event::Type::JoinChannel,
-			.context = context.mid(joinPrefix.size()),
-		});
-	} else if (context.startsWith(webpagePrefix)) {
-		_events.fire({
-			.type = Event::Type::OpenPage,
-			.url = url,
-			.context = context.mid(webpagePrefix.size()),
-		});
-	} else if (context.startsWith(viewerPrefix)) {
-		_events.fire({
-			.type = Event::Type::OpenMedia,
-			.url = url,
-			.context = context.mid(viewerPrefix.size()),
-		});
-	} else if (context.isEmpty()) {
-		_events.fire({ .type = Event::Type::OpenLink, .url = url });
-	}
-}
-
 bool Controller::active() const {
 	return _window && _window->isActiveWindow();
 }
 
-void Controller::showJoinedTooltip() {
-	if (_webview && _ready) {
-		_webview->eval("IV.showTooltip('"
-			+ Ui::EscapeForScriptString(
-				tr::lng_action_you_joined(tr::now).toUtf8())
-			+ "');");
-	}
-}
-
 void Controller::minimize() {
 	if (_window) {
 		_window->setWindowState(_window->windowState()
@@ -993,79 +414,6 @@ void Controller::minimize() {
 	}
 }
 
-QString Controller::composeCurrentUrl() const {
-	const auto index = _index.current();
-	Assert(index >= 0 && index < _pages.size());
-
-	return _pages[index].url
-		+ (_hash.isEmpty() ? u""_q : ('#' + _hash));
-}
-
-uint64 Controller::compuseCurrentPageId() const {
-	const auto index = _index.current();
-	Assert(index >= 0 && index < _pages.size());
-
-	return _pages[index].pageId;
-}
-
-void Controller::showMenu() {
-	const auto index = _index.current();
-	if (_menu || index < 0 || index > _pages.size()) {
-		return;
-	}
-	_menu = base::make_unique_q<Ui::PopupMenu>(
-		_window.get(),
-		st::popupMenuWithIcons);
-	if (_webview && _ready) {
-		_webview->eval("IV.menuShown(true);");
-	}
-	_menu->setDestroyedCallback(crl::guard(_window.get(), [
-			this,
-			weakButton = Ui::MakeWeak(_menuToggle.data()),
-			menu = _menu.get()] {
-		if (_menu == menu && weakButton) {
-			weakButton->setForceRippled(false);
-		}
-		if (const auto widget = _webview ? _webview->widget() : nullptr) {
-			InvokeQueued(widget, crl::guard(_window.get(), [=] {
-				if (_webview && _ready) {
-					_webview->eval("IV.menuShown(false);");
-				}
-			}));
-		}
-	}));
-	_menuToggle->setForceRippled(true);
-
-	const auto url = composeCurrentUrl();
-	const auto openInBrowser = crl::guard(_window.get(), [=] {
-		_events.fire({ .type = Event::Type::OpenLinkExternal, .url = url });
-	});
-	_menu->addAction(
-		tr::lng_iv_open_in_browser(tr::now),
-		openInBrowser,
-		&st::menuIconIpAddress);
-
-	_menu->addAction(tr::lng_iv_share(tr::now), [=] {
-		showShareMenu();
-	}, &st::menuIconShare);
-
-	_menu->addSeparator();
-	_menu->addAction(
-		base::make_unique_q<ItemZoom>(_menu, _delegate, _menu->menu()->st()));
-
-	_menu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
-	_menu->popup(_window->body()->mapToGlobal(
-		QPoint(_window->body()->width(), 0) + st::ivMenuPosition));
-}
-
-void Controller::escape() {
-	if (const auto onstack = _shareHide) {
-		onstack();
-	} else {
-		close();
-	}
-}
-
 void Controller::close() {
 	_events.fire({ Event::Type::Close });
 }
@@ -1078,80 +426,45 @@ rpl::lifetime &Controller::lifetime() {
 	return _lifetime;
 }
 
-void Controller::destroyShareMenu() {
-	_shareHide = nullptr;
-	if (_shareFocus) {
-		_shareFocus = nullptr;
-		setInnerFocus();
-	}
-	if (_shareWrap) {
-		if (_shareContainer) {
-			_shareWrap->windowHandle()->setParent(nullptr);
-		}
-		_shareWrap = nullptr;
-		_shareContainer = nullptr;
-	}
-	if (_shareHidesContent) {
-		_shareHidesContent = false;
-		if (const auto content = _webview ? _webview->widget() : nullptr) {
-			content->show();
-		}
+void Controller::showWebviewError() {
+	const auto available = Webview::Availability();
+	if (available.error != Webview::Available::Error::None) {
+		showWebviewError(Ui::BotWebView::ErrorText(available));
+	} else {
+		showWebviewError({ "Error: Could not initialize WebView." });
 	}
 }
 
-void Controller::showShareMenu() {
-	const auto index = _index.current();
-	if (_shareWrap || index < 0 || index > _pages.size()) {
-		return;
-	}
-	_shareHidesContent = Platform::IsMac();
-	if (_shareHidesContent) {
-		if (const auto content = _webview ? _webview->widget() : nullptr) {
-			content->hide();
-		}
-	}
-
-	_shareWrap = std::make_unique<Ui::RpWidget>(_shareHidesContent
-		? _window->body().get()
-		: nullptr);
-	if (!_shareHidesContent) {
-		_shareWrap->setGeometry(_window->body()->rect());
-		_shareWrap->setWindowFlag(Qt::FramelessWindowHint);
-		_shareWrap->setAttribute(Qt::WA_TranslucentBackground);
-		_shareWrap->setAttribute(Qt::WA_NoSystemBackground);
-		_shareWrap->createWinId();
-
-		_shareContainer.reset(QWidget::createWindowContainer(
-			_shareWrap->windowHandle(),
-			_window->body().get(),
-			Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint));
-	}
-	_window->body()->sizeValue() | rpl::start_with_next([=](QSize size) {
-		const auto widget = _shareHidesContent
-			? _shareWrap.get()
-			: _shareContainer.get();
-		widget->setGeometry(QRect(QPoint(), size));
-	}, _shareWrap->lifetime());
+void Controller::showWebviewError(TextWithEntities text) {
+	const auto wrap = Ui::CreateChild<Ui::RpWidget>(_container);
 
-	auto result = _showShareBox({
-		.parent = _shareWrap.get(),
-		.url = composeCurrentUrl(),
+	const auto error = Ui::CreateChild<Ui::PaddingWrap<Ui::FlatLabel>>(
+		wrap,
+		object_ptr<Ui::FlatLabel>(
+			wrap,
+			rpl::single(text),
+			st::paymentsCriticalError),
+		st::paymentsCriticalErrorPadding);
+	error->entity()->setClickHandlerFilter([=](
+			const ClickHandlerPtr &handler,
+			Qt::MouseButton) {
+		const auto entity = handler->getTextEntity();
+		if (entity.type != EntityType::CustomUrl) {
+			return true;
+		}
+		File::OpenUrl(entity.data);
+		return false;
 	});
-	_shareFocus = result.focus;
-	_shareHide = result.hide;
-
-	std::move(result.destroyRequests) | rpl::start_with_next([=] {
-		destroyShareMenu();
-	}, _shareWrap->lifetime());
+	wrap->show();
 
-	Ui::ForceFullRepaintSync(_shareWrap.get());
+	wrap->widthValue() | rpl::on_next([=](int width) {
+		error->resizeToWidth(width);
+		wrap->resize(width, error->height());
+	}, wrap->lifetime());
 
-	if (_shareHidesContent) {
-		_shareWrap->show();
-	} else {
-		_shareContainer->show();
-	}
-	activate();
+	_container->sizeValue() | rpl::on_next([=](QSize size) {
+		wrap->setGeometry(0, 0, size.width(), size.height() * 2 / 3);
+	}, wrap->lifetime());
 }
 
 } // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_controller.h b/Telegram/SourceFiles/iv/iv_controller.h
index 9b5af4e6b6a15d..48e01f55e6394b 100644
--- a/Telegram/SourceFiles/iv/iv_controller.h
+++ b/Telegram/SourceFiles/iv/iv_controller.h
@@ -7,50 +7,28 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "base/invoke_queued.h"
-#include "base/object_ptr.h"
-#include "base/unique_qptr.h"
 #include "iv/iv_delegate.h"
-#include "ui/effects/animations.h"
 #include "ui/text/text.h"
 #include "webview/webview_common.h"
 
-class Painter;
+class QKeyEvent;
 
 namespace Webview {
-struct DataRequest;
 class Window;
 } // namespace Webview
 
 namespace Ui {
-class RpWidget;
-class RpWindow;
-class PopupMenu;
 class FlatLabel;
 class IconButton;
-template <typename Widget>
-class FadeWrapScaled;
+class RpWidget;
+class RpWindow;
 } // namespace Ui
 
 namespace Iv {
 
-struct Prepared;
-
-struct ShareBoxResult {
-	Fn<void()> focus;
-	Fn<void()> hide;
-	rpl::producer<> destroyRequests;
-};
-struct ShareBoxDescriptor {
-	not_null<Ui::RpWidget*> parent;
-	QString url;
-};
-
 class Controller final {
 public:
-	Controller(
-		not_null<Delegate*> delegate,
-		Fn<ShareBoxResult(ShareBoxDescriptor)> showShareBox);
+	explicit Controller(not_null<Delegate*> delegate);
 	~Controller();
 
 	struct Event {
@@ -68,25 +46,15 @@ class Controller final {
 		Type type = Type::Close;
 		QString url;
 		QString context;
+		uint64 webpageId = 0;
 	};
 
-	void show(
-		const Webview::StorageId &storageId,
-		Prepared page,
-		base::flat_map<QByteArray, rpl::producer<bool>> inChannelValues);
-	void update(Prepared page);
-
 	[[nodiscard]] static bool IsGoodTonSiteUrl(const QString &uri);
 	void showTonSite(const Webview::StorageId &storageId, QString uri);
 
 	[[nodiscard]] bool active() const;
-	void showJoinedTooltip();
 	void minimize();
 
-	[[nodiscard]] rpl::producer<Webview::DataRequest> dataRequests() const {
-		return _dataRequests.events();
-	}
-
 	[[nodiscard]] rpl::producer<Event> events() const {
 		return _events.events();
 	}
@@ -96,34 +64,15 @@ class Controller final {
 private:
 	void createWindow();
 	void createWebview(const Webview::StorageId &storageId);
-	[[nodiscard]] QByteArray navigateScript(int index, const QString &hash);
-	[[nodiscard]] QByteArray reloadScript(int index);
 
-	void showInWindow(const Webview::StorageId &storageId, Prepared page);
-	[[nodiscard]] QByteArray fillInChannelValuesScript(
-		base::flat_map<QByteArray, rpl::producer<bool>> inChannelValues);
-	[[nodiscard]] QByteArray toggleInChannelScript(
-		const QByteArray &id,
-		bool in) const;
-
-	void processKey(const QString &key, const QString &modifier);
-	void processLink(const QString &url, const QString &context);
-
-	void initControls();
+	void processKey(QKeyEvent *event);
 	void updateTitleGeometry(int newWidth) const;
 
 	void activate();
 	void setInnerFocus();
-	void showMenu();
-	void escape();
 	void close();
 	void quit();
 
-	[[nodiscard]] QString composeCurrentUrl() const;
-	[[nodiscard]] uint64 compuseCurrentPageId() const;
-	void showShareMenu();
-	void destroyShareMenu();
-
 	void showWebviewError();
 	void showWebviewError(TextWithEntities text);
 
@@ -134,38 +83,12 @@ class Controller final {
 	rpl::variable<QString> _url;
 	rpl::variable<QString> _subtitleText;
 	rpl::variable<QString> _windowTitleText;
-	std::unique_ptr<Ui::FlatLabel> _subtitle;
-	Ui::Animations::Simple _subtitleBackShift;
-	Ui::Animations::Simple _subtitleForwardShift;
-	object_ptr<Ui::IconButton> _menuToggle = { nullptr };
-	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _back = { nullptr };
-	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _forward = { nullptr };
-	base::unique_qptr<Ui::PopupMenu> _menu;
+	Ui::FlatLabel *_subtitle = nullptr;
+	Ui::IconButton *_back = nullptr;
+	Ui::IconButton *_forward = nullptr;
 	Ui::RpWidget *_container = nullptr;
 	std::unique_ptr<Webview::Window> _webview;
-	rpl::event_stream<Webview::DataRequest> _dataRequests;
 	rpl::event_stream<Event> _events;
-	base::flat_map<QByteArray, bool> _inChannelChanged;
-	base::flat_set<QByteArray> _inChannelSubscribed;
-	SingleQueuedInvokation _updateStyles;
-	bool _reloadInitialWhenReady = false;
-	bool _subscribedToColors = false;
-	bool _ready = false;
-
-	rpl::variable<int> _index = -1;
-	QString _hash;
-
-	Fn<ShareBoxResult(ShareBoxDescriptor)> _showShareBox;
-	std::unique_ptr<Ui::RpWidget> _shareWrap;
-	std::unique_ptr<QWidget> _shareContainer;
-	Fn<void()> _shareFocus;
-	Fn<void()> _shareHide;
-	bool _shareHidesContent = false;
-
-	std::vector<Prepared> _pages;
-	base::flat_map<QString, int> _indices;
-	QString _navigateToHashWhenReady;
-	int _navigateToIndexWhenReady = -1;
 
 	rpl::lifetime _lifetime;
 
diff --git a/Telegram/SourceFiles/iv/iv_data.cpp b/Telegram/SourceFiles/iv/iv_data.cpp
index 16f9c0d519d602..5aed5ad4a16850 100644
--- a/Telegram/SourceFiles/iv/iv_data.cpp
+++ b/Telegram/SourceFiles/iv/iv_data.cpp
@@ -7,80 +7,50 @@ For license and copyright information please follow this link:
 */
 #include "iv/iv_data.h"
 
-#include "iv/iv_prepare.h"
-#include "webview/webview_interface.h"
+#include "iv/iv_rich_page.h"
 
 #include <QtCore/QRegularExpression>
 #include <QtCore/QUrl>
 
 namespace Iv {
-namespace {
 
-bool FailureRecorded/* = false*/;
-
-} // namespace
+Data::Data(
+	const MTPDwebPage &webpage,
+	std::shared_ptr<const RichPage> richPage)
+: _pageId(webpage.vid().v)
+, _hash(webpage.vhash().v)
+, _url(qs(webpage.vurl()))
+, _name(webpage.vsite_name()
+	? qs(*webpage.vsite_name())
+	: SiteNameFromUrl(_url))
+, _partial(richPage ? richPage->part : false)
+, _richPage(std::move(richPage)) {
+}
 
-QByteArray GeoPointId(Geo point) {
-	const auto lat = int(point.lat * 1000000);
-	const auto lon = int(point.lon * 1000000);
-	const auto combined = (std::uint64_t(std::uint32_t(lat)) << 32)
-		| std::uint64_t(std::uint32_t(lon));
-	return QByteArray::number(quint64(combined))
-		+ ','
-		+ QByteArray::number(point.access);
+QString Data::id() const {
+	return _url;
 }
 
-Geo GeoPointFromId(QByteArray data) {
-	const auto parts = data.split(',');
-	if (parts.size() != 2) {
-		return {};
-	}
-	const auto combined = parts[0].toULongLong();
-	const auto lat = int(std::uint32_t(combined >> 32));
-	const auto lon = int(std::uint32_t(combined & 0xFFFFFFFFULL));
-	return {
-		.lat = lat / 1000000.,
-		.lon = lon / 1000000.,
-		.access = parts[1].toULongLong(),
-	};
+QString Data::name() const {
+	return _name;
 }
 
-Data::Data(const MTPDwebPage &webpage, const MTPPage &page)
-: _source(std::make_unique<Source>(Source{
-	.pageId = webpage.vid().v,
-	.page = page,
-	.webpagePhoto = (webpage.vphoto()
-		? *webpage.vphoto()
-		: std::optional<MTPPhoto>()),
-	.webpageDocument = (webpage.vdocument()
-		? *webpage.vdocument()
-		: std::optional<MTPDocument>()),
-	.name = (webpage.vsite_name()
-		? qs(*webpage.vsite_name())
-		: SiteNameFromUrl(qs(webpage.vurl())))
-})) {
+uint64 Data::pageId() const {
+	return _pageId;
 }
 
-QString Data::id() const {
-	return qs(_source->page.data().vurl());
+int32 Data::hash() const {
+	return _hash;
 }
 
 bool Data::partial() const {
-	return _source->page.data().is_part();
+	return _partial;
 }
 
 Data::~Data() = default;
 
-void Data::updateCachedViews(int cachedViews) {
-	_source->updatedCachedViews = std::max(
-		_source->updatedCachedViews,
-		cachedViews);
-}
-
-void Data::prepare(const Options &options, Fn<void(Prepared)> done) const {
-	crl::async([source = *_source, options, done = std::move(done)] {
-		done(Prepare(source, options));
-	});
+const std::shared_ptr<const RichPage> &Data::richPage() const {
+	return _richPage;
 }
 
 QString SiteNameFromUrl(const QString &url) {
@@ -101,17 +71,4 @@ QString SiteNameFromUrl(const QString &url) {
 	return QString();
 }
 
-bool ShowButton() {
-	static const auto Supported = Webview::NavigateToDataSupported();
-	return Supported;
-}
-
-void RecordShowFailure() {
-	FailureRecorded = true;
-}
-
-bool FailedToShow() {
-	return FailureRecorded;
-}
-
 } // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_data.h b/Telegram/SourceFiles/iv/iv_data.h
index cdb2d87089d53c..939f13d46f888a 100644
--- a/Telegram/SourceFiles/iv/iv_data.h
+++ b/Telegram/SourceFiles/iv/iv_data.h
@@ -7,58 +7,38 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-namespace Iv {
-
-struct Source;
-
-struct Options {
-};
-
-struct Prepared {
-	uint64 pageId = 0;
-	QString name;
-	QByteArray content;
-	QByteArray script;
-	QString url;
-	QString hash;
-	base::flat_map<QByteArray, QByteArray> embeds;
-	base::flat_set<QByteArray> channelIds;
-	bool rtl = false;
-	bool hasCode = false;
-	bool hasEmbeds = false;
-};
+#include <memory>
 
-struct Geo {
-	float64 lat = 0.;
-	float64 lon = 0.;
-	uint64 access = 0;
-};
+class DocumentData;
+class PhotoData;
 
-[[nodiscard]] QByteArray GeoPointId(Geo point);
-[[nodiscard]] Geo GeoPointFromId(QByteArray data);
+namespace Iv {
+struct RichPage;
 
 class Data final {
 public:
-	Data(const MTPDwebPage &webpage, const MTPPage &page);
+	Data(
+		const MTPDwebPage &webpage,
+		std::shared_ptr<const RichPage> richPage);
 	~Data();
 
 	[[nodiscard]] QString id() const;
+	[[nodiscard]] QString name() const;
+	[[nodiscard]] uint64 pageId() const;
+	[[nodiscard]] int32 hash() const;
 	[[nodiscard]] bool partial() const;
-
-	void updateCachedViews(int cachedViews);
-
-	void prepare(const Options &options, Fn<void(Prepared)> done) const;
+	[[nodiscard]] const std::shared_ptr<const RichPage> &richPage() const;
 
 private:
-	const std::unique_ptr<Source> _source;
+	const uint64 _pageId = 0;
+	const int32 _hash = 0;
+	const QString _url;
+	const QString _name;
+	const bool _partial = false;
+	const std::shared_ptr<const RichPage> _richPage;
 
 };
 
 [[nodiscard]] QString SiteNameFromUrl(const QString &url);
 
-[[nodiscard]] bool ShowButton();
-
-void RecordShowFailure();
-[[nodiscard]] bool FailedToShow();
-
 } // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_delegate.h b/Telegram/SourceFiles/iv/iv_delegate.h
index d722d19f0703a9..6e3a28cb8f680f 100644
--- a/Telegram/SourceFiles/iv/iv_delegate.h
+++ b/Telegram/SourceFiles/iv/iv_delegate.h
@@ -15,8 +15,7 @@ namespace Iv {
 
 class Delegate {
 public:
-	virtual void ivSetLastSourceWindow(not_null<QWidget*> window) = 0;
-	[[nodiscard]] virtual QRect ivGeometry() const = 0;
+	[[nodiscard]] virtual QRect ivGeometry(not_null<Ui::RpWindow*> window) const = 0;
 	virtual void ivSaveGeometry(not_null<Ui::RpWindow*> window) = 0;
 
 	[[nodiscard]] virtual int ivZoom() const = 0;
diff --git a/Telegram/SourceFiles/iv/iv_delegate_impl.cpp b/Telegram/SourceFiles/iv/iv_delegate_impl.cpp
index e97de87bf81335..f09418c836587c 100644
--- a/Telegram/SourceFiles/iv/iv_delegate_impl.cpp
+++ b/Telegram/SourceFiles/iv/iv_delegate_impl.cpp
@@ -45,26 +45,16 @@ namespace {
 
 } // namespace
 
-void DelegateImpl::ivSetLastSourceWindow(not_null<QWidget*> window) {
-	_lastSourceWindow = window;
-}
-
-QRect DelegateImpl::ivGeometry() const {
-	const auto found = _lastSourceWindow
-		? Core::App().findWindow(_lastSourceWindow)
-		: nullptr;
-
+QRect DelegateImpl::ivGeometry(not_null<Ui::RpWindow*> window) const {
 	const auto saved = Core::App().settings().ivPosition();
 	const auto adjusted = Core::AdjustToScale(saved, u"IV"_q);
 	const auto initial = DefaultPosition();
-	auto result = initial.rect();
-	if (const auto window = found ? found : Core::App().activeWindow()) {
-		result = window->widget()->countInitialGeometry(
-			adjusted,
-			initial,
-			{ st::ivWidthMin, st::ivHeightMin });
-	}
-	return result;
+	return Window::CountInitialGeometry(
+		window,
+		adjusted,
+		initial,
+		{ st::ivWidthMin, st::ivHeightMin },
+		u"IV"_q);
 }
 
 void DelegateImpl::ivSaveGeometry(not_null<Ui::RpWindow*> window) {
@@ -100,7 +90,8 @@ void DelegateImpl::ivSaveGeometry(not_null<Ui::RpWindow*> window) {
 	realPosition = Window::PositionWithScreen(
 		realPosition,
 		window,
-		{ st::ivWidthMin, st::ivHeightMin });
+		{ st::ivWidthMin, st::ivHeightMin },
+		u"IV"_q);
 	if (realPosition.w >= st::ivWidthMin
 		&& realPosition.h >= st::ivHeightMin
 		&& realPosition != savedPosition) {
diff --git a/Telegram/SourceFiles/iv/iv_delegate_impl.h b/Telegram/SourceFiles/iv/iv_delegate_impl.h
index 8217d943839685..e9767c5cfd291d 100644
--- a/Telegram/SourceFiles/iv/iv_delegate_impl.h
+++ b/Telegram/SourceFiles/iv/iv_delegate_impl.h
@@ -15,17 +15,13 @@ class DelegateImpl final : public Delegate {
 public:
 	DelegateImpl() = default;
 
-	void ivSetLastSourceWindow(not_null<QWidget*> window) override;
-	[[nodiscard]] QRect ivGeometry() const override;
+	[[nodiscard]] QRect ivGeometry(not_null<Ui::RpWindow*> window) const override;
 	void ivSaveGeometry(not_null<Ui::RpWindow*> window) override;
 
 	[[nodiscard]] int ivZoom() const override;
 	[[nodiscard]] rpl::producer<int> ivZoomValue() const override;
 	void ivSetZoom(int value) override;
 
-private:
-	QPointer<QWidget> _lastSourceWindow;
-
 };
 
 } // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index 8078828d6bd0ef..399be9aab041b6 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -9,7 +9,7 @@ For license and copyright information please follow this link:
 
 #include "apiwrap.h"
 #include "base/platform/base_platform_info.h"
-#include "base/qt_signal_producer.h"
+#include "base/unixtime.h"
 #include "boxes/share_box.h"
 #include "core/application.h"
 #include "core/file_utilities.h"
@@ -17,51 +17,294 @@ For license and copyright information please follow this link:
 #include "core/click_handler_types.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
-#include "data/data_cloud_file.h"
-#include "data/data_document.h"
-#include "data/data_document_media.h"
-#include "data/data_file_origin.h"
-#include "data/data_photo_media.h"
 #include "data/data_session.h"
-#include "data/data_thread.h"
 #include "data/data_web_page.h"
-#include "data/data_user.h"
-#include "history/history_item_helpers.h"
-#include "info/profile/info_profile_values.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "iv/markdown/iv_markdown_article.h"
+#include "iv/markdown/iv_markdown_controller.h"
+#include "iv/iv_cached_media.h"
 #include "iv/iv_controller.h"
 #include "iv/iv_data.h"
+#include "iv/iv_rich_page.h"
 #include "lang/lang_keys.h"
-#include "lottie/lottie_common.h" // Lottie::ReadContent.
-#include "main/main_account.h"
 #include "main/main_session.h"
 #include "main/session/session_show.h"
-#include "media/streaming/media_streaming_loader.h"
 #include "media/view/media_view_open_common.h"
-#include "storage/file_download.h"
 #include "storage/storage_account.h"
-#include "ui/boxes/confirm_box.h"
-#include "ui/layers/layer_widget.h"
-#include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/basic_click_handlers.h"
-#include "webview/webview_data_stream_memory.h"
-#include "webview/webview_interface.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "window/window_session_controller_link_info.h"
 
-#include <QtGui/QGuiApplication>
-#include <QtGui/QWindow>
+#include "styles/style_iv.h"
+
+#include <QtCore/QByteArray>
+#include <QtCore/QFileInfo>
+
+#include <optional>
 
 namespace Iv {
 namespace {
 
-constexpr auto kGeoPointScale = 1;
-constexpr auto kGeoPointZoomMin = 13;
-constexpr auto kMaxLoadParts = 5;
-constexpr auto kKeepLoadingParts = 8;
 constexpr auto kAllowPageReloadAfter = 3 * crl::time(1000);
 
+struct NativeIvChannelContext {
+	uint64 channelId = 0;
+	QString username;
+};
+
+[[nodiscard]] NativeIvChannelContext ParseNativeIvChannelContext(
+		const QString &context) {
+	const auto separator = context.indexOf(u'\n');
+	return {
+		.channelId = (separator >= 0)
+			? context.mid(0, separator).toULongLong()
+			: context.toULongLong(),
+		.username = (separator >= 0) ? context.mid(separator + 1) : QString(),
+	};
+}
+
+[[nodiscard]] QString ResolveNativeIvChannelUsername(
+		const QString &channelUsername,
+		const QString &contextUsername) {
+	return !channelUsername.isEmpty() ? channelUsername : contextUsername;
+}
+
+struct MarkdownMessageContext {
+	ClickHandlerContext clickHandlerContext;
+	base::weak_ptr<Window::SessionController> sessionWindow;
+};
+
+struct LocalMarkdownTarget {
+	QString key;
+	QString path;
+	QString sourceName;
+	QString fragment;
+};
+
+[[nodiscard]] QString NormalizeLocalMarkdownFragment(QString fragment) {
+	fragment = QString::fromUtf8(
+		QByteArray::fromPercentEncoding(fragment.toUtf8()));
+	fragment = fragment.trimmed().toLower();
+	while (fragment.startsWith(QChar('#'))) {
+		fragment.remove(0, 1);
+	}
+	return fragment;
+}
+
+[[nodiscard]] LocalMarkdownTarget ParseLocalMarkdownTarget(QString path) {
+	auto sourcePath = path;
+	auto fragment = QString();
+	if (!QFileInfo(sourcePath).exists()) {
+		const auto hash = sourcePath.lastIndexOf(QChar('#'));
+		const auto candidate = (hash > 0) ? sourcePath.mid(0, hash) : QString();
+		if (!candidate.isEmpty() && QFileInfo(candidate).exists()) {
+			fragment = NormalizeLocalMarkdownFragment(sourcePath.mid(hash + 1));
+			sourcePath = candidate;
+		}
+	}
+	const auto info = QFileInfo(sourcePath);
+	if (!info.exists()) {
+		return {
+			.key = path,
+			.path = std::move(path),
+		};
+	}
+	auto result = LocalMarkdownTarget{
+		.key = info.absoluteFilePath(),
+		.path = info.absoluteFilePath(),
+		.sourceName = info.fileName(),
+		.fragment = std::move(fragment),
+	};
+	if (!result.fragment.isEmpty()) {
+		result.path += u"#"_q + result.fragment;
+	}
+	return result;
+}
+
+[[nodiscard]] auto ExtractMarkdownMessageContext(const QVariant &context) {
+	if (!context.isValid() || !context.canConvert<ClickHandlerContext>()) {
+		return std::optional<MarkdownMessageContext>();
+	}
+	const auto clickHandlerContext = context.value<ClickHandlerContext>();
+	return std::make_optional(MarkdownMessageContext{
+		.clickHandlerContext = clickHandlerContext,
+		.sessionWindow = clickHandlerContext.sessionWindow,
+	});
+}
+
+[[nodiscard]] Main::Session *ResolveMarkdownSession(
+		const MarkdownMessageContext &context) {
+	if (const auto controller = context.sessionWindow.get()) {
+		return &controller->session();
+	}
+	return nullptr;
+}
+
+[[nodiscard]] HistoryItem *ResolveMarkdownItem(
+		const MarkdownMessageContext &context) {
+	const auto session = ResolveMarkdownSession(context);
+	const auto itemId = context.clickHandlerContext.itemId;
+	return (session && itemId) ? session->data().message(itemId) : nullptr;
+}
+
+[[nodiscard]] bool CanShareMarkdownItem(not_null<HistoryItem*> item) {
+	const auto peer = item->history()->peer;
+	return peer->allowsForwarding() && !item->forbidsForward();
+}
+
+[[nodiscard]] QString RichMessageKey(FullMsgId itemId) {
+	return u"rich-message:%1:%2"_q
+		.arg(itemId.peer.value)
+		.arg(itemId.msg.bare);
+}
+
+[[nodiscard]] uint64 RichMessagePageId(FullMsgId itemId) {
+	return uint64(itemId.peer.value) ^ (uint64(itemId.msg.bare) << 1);
+}
+
+[[nodiscard]] bool PreparedContentHasAnchor(
+		const Markdown::MarkdownArticleContent &content,
+		const QString &anchorId) {
+	if (anchorId.isEmpty()) {
+		return false;
+	}
+	auto article = Markdown::MarkdownArticle(st::defaultMarkdown);
+	article.setContent(content);
+	const auto width = article.maxWidth();
+	static_cast<void>(article.resizeGetHeight(width));
+	auto top = article.anchorTop(anchorId);
+	if (top < 0) {
+		const auto expansion = article.expandDetailsToAnchor(anchorId);
+		if (expansion.changed) {
+			static_cast<void>(article.resizeGetHeight(width));
+		}
+		top = article.anchorTop(anchorId);
+	}
+	return (top >= 0);
+}
+
+void OpenRichMessageChannel(
+		not_null<Main::Session*> session,
+		const QString &context) {
+	const auto parsed = ParseNativeIvChannelContext(context);
+	if (const auto channelId = ChannelId(parsed.channelId)) {
+		const auto channel = session->data().channel(channelId);
+		if (channel->isLoaded()) {
+			if (const auto controller = session->tryResolveWindow(channel)) {
+				controller->showPeerHistory(channel);
+			}
+		} else if (const auto username = ResolveNativeIvChannelUsername(
+				channel->username(),
+				parsed.username); !username.isEmpty()) {
+			if (const auto controller = session->tryResolveWindow(channel)) {
+				controller->showPeerByLink({
+					.usernameOrId = username,
+				});
+			}
+		}
+	}
+}
+
+void JoinRichMessageChannel(
+		not_null<Main::Session*> session,
+		const QString &context) {
+	const auto parsed = ParseNativeIvChannelContext(context);
+	if (const auto channelId = ChannelId(parsed.channelId)) {
+		const auto channel = session->data().channel(channelId);
+		if (channel->isLoaded()) {
+			session->api().joinChannel(channel);
+		} else if (const auto username = ResolveNativeIvChannelUsername(
+				channel->username(),
+				parsed.username); !username.isEmpty()) {
+			if (const auto controller = session->tryResolveWindow(channel)) {
+				controller->showPeerByLink({
+					.usernameOrId = username,
+					.joinChannel = true,
+				});
+			}
+		}
+	}
+}
+
+[[nodiscard]] bool ActivateRichMessageMedia(
+		const Markdown::MediaActivation &activation,
+		Qt::MouseButton button,
+		const QVariant &clickHandlerContext) {
+	if (button != Qt::LeftButton && button != Qt::MiddleButton) {
+		return false;
+	}
+	switch (activation.kind) {
+	case Markdown::MediaActivationKind::None:
+		return false;
+	case Markdown::MediaActivationKind::ExternalUrl:
+		if (activation.url.isEmpty()) {
+			return false;
+		}
+		HiddenUrlClickHandler::Open(activation.url, clickHandlerContext);
+		return true;
+	case Markdown::MediaActivationKind::Embed:
+		return false;
+	case Markdown::MediaActivationKind::Photo:
+		if (!activation.photo) {
+			return false;
+		}
+		activation.photo->open(button);
+		return true;
+	case Markdown::MediaActivationKind::Document:
+		if (!activation.document) {
+			return false;
+		}
+		activation.document->open(button);
+		return true;
+	case Markdown::MediaActivationKind::OpenChannel:
+		if (!activation.channel) {
+			return false;
+		}
+		activation.channel->open(button);
+		return true;
+	case Markdown::MediaActivationKind::JoinChannel:
+		if (!activation.channel) {
+			return false;
+		}
+		activation.channel->join(button);
+		return true;
+	}
+	return false;
+}
+
+[[nodiscard]] Markdown::OpenOptions PrepareLocalMarkdownOptions(
+		QVariant context) {
+	auto options = Markdown::OpenOptions{
+		.viewerKind = Markdown::ViewerKind::LocalFile,
+		.clickHandlerContext = std::move(context),
+	};
+	const auto messageContext = ExtractMarkdownMessageContext(
+		options.clickHandlerContext);
+	const auto item = messageContext
+		? ResolveMarkdownItem(*messageContext)
+		: nullptr;
+	if (item && CanShareMarkdownItem(not_null{ item })) {
+		options.share = [context = *messageContext](
+				std::shared_ptr<Ui::Show> show) {
+			const auto session = ResolveMarkdownSession(context);
+			const auto itemId = context.clickHandlerContext.itemId;
+			const auto current = (session && itemId)
+				? session->data().message(itemId)
+				: nullptr;
+			if (!show || !current || !CanShareMarkdownItem(not_null{ current })) {
+				return;
+			}
+			FastShareMessage(
+				Main::MakeSessionShow(show, not_null{ session }),
+				not_null{ current });
+		};
+	}
+	return options;
+}
+
 } // namespace
 
 class Shown final : public base::has_weak_ptr {
@@ -70,7 +313,9 @@ class Shown final : public base::has_weak_ptr {
 		not_null<Delegate*> delegate,
 		not_null<Main::Session*> session,
 		not_null<Data*> data,
-		QString hash);
+		QString hash,
+		Fn<void(QString)> openChannel,
+		Fn<void(QString)> joinChannel);
 
 	[[nodiscard]] bool showing(
 		not_null<Main::Session*> session,
@@ -94,80 +339,40 @@ class Shown final : public base::has_weak_ptr {
 	}
 
 private:
-	struct MapPreview {
-		std::unique_ptr<::Data::CloudFile> file;
-		QByteArray bytes;
-	};
-	struct PartRequest {
-		Webview::DataRequest request;
-		QByteArray data;
-		std::vector<bool> loaded;
-		int64 offset = 0;
-	};
-	struct FileStream {
-		not_null<DocumentData*> document;
-		std::unique_ptr<Media::Streaming::Loader> loader;
-		std::vector<PartRequest> requests;
-		std::string mime;
-		rpl::lifetime lifetime;
-	};
-	struct FileLoad {
-		std::shared_ptr<::Data::DocumentMedia> media;
-		std::vector<Webview::DataRequest> requests;
-	};
-
 	void prepare(not_null<Data*> data, const QString &hash);
-	void createController();
-
-	void showWindowed(Prepared result);
-	[[nodiscard]] ShareBoxResult shareBox(ShareBoxDescriptor &&descriptor);
-
-	[[nodiscard]] ::Data::FileOrigin fileOrigin(
-		not_null<WebPageData*> page) const;
-	void streamPhoto(QStringView idWithPageId, Webview::DataRequest request);
-	void streamFile(QStringView idWithPageId, Webview::DataRequest request);
-	void streamFile(FileStream &file, Webview::DataRequest request);
-	void processPartInFile(
-		FileStream &file,
-		Media::Streaming::LoadedPart &&part);
-	bool finishRequestWithPart(
-		PartRequest &request,
-		const Media::Streaming::LoadedPart &part);
-	void streamMap(QString params, Webview::DataRequest request);
-	void sendEmbed(QByteArray hash, Webview::DataRequest request);
-
-	void fillChannelJoinedValues(const Prepared &result);
-	void fillEmbeds(base::flat_map<QByteArray, QByteArray> added);
-	void subscribeToDocuments();
-	[[nodiscard]] QByteArray readFile(
-		const std::shared_ptr<::Data::DocumentMedia> &media);
-	void requestDone(
-		Webview::DataRequest request,
-		QByteArray bytes,
-		std::string mime,
-		int64 offset = 0,
-		int64 total = 0);
-	void requestFail(Webview::DataRequest request);
+	void createMarkdownController(
+		Markdown::MarkdownArticleContent content,
+		QString title,
+		QString initialFragment,
+		not_null<WebPageData*> page);
+	[[nodiscard]] Markdown::OpenOptions markdownOpenOptions(
+		QString initialFragment,
+		not_null<WebPageData*> page);
+
+	void showMarkdownWindowed(
+		Markdown::MarkdownArticleContent content,
+		QString title,
+		QString initialFragment,
+		not_null<WebPageData*> page,
+		bool refresh);
+	[[nodiscard]] std::shared_ptr<Markdown::MediaRuntime> createMediaRuntime(
+		not_null<WebPageData*> page);
+	[[nodiscard]] bool activateMarkdownMedia(
+		const Markdown::MediaActivation &activation,
+		Qt::MouseButton button,
+		const QVariant &clickHandlerContext) const;
 
 	const not_null<Delegate*> _delegate;
 	const not_null<Main::Session*> _session;
-	std::shared_ptr<Main::SessionShow> _show;
+	const Fn<void(QString)> _openChannel;
+	const Fn<void(QString)> _joinChannel;
 	QString _id;
-	std::unique_ptr<Controller> _controller;
-	base::flat_map<DocumentId, FileStream> _streams;
-	base::flat_map<DocumentId, FileLoad> _files;
-	base::flat_map<QByteArray, rpl::producer<bool>> _inChannelValues;
-
-	bool _preparing = false;
-
-	base::flat_map<QByteArray, QByteArray> _embeds;
-	base::flat_map<QString, MapPreview> _maps;
-	std::vector<QByteArray> _resources;
-	int _resource = -1;
+	std::unique_ptr<Markdown::Controller> _markdownController;
+	std::shared_ptr<Markdown::MediaRuntime> _markdownMediaRuntime;
+	QString _markdownRuntimeUrl;
 
 	rpl::event_stream<Controller::Event> _events;
 
-	rpl::lifetime _documentLifetime;
 	rpl::lifetime _lifetime;
 
 };
@@ -209,521 +414,200 @@ Shown::Shown(
 	not_null<Delegate*> delegate,
 	not_null<Main::Session*> session,
 	not_null<Data*> data,
-	QString hash)
+	QString hash,
+	Fn<void(QString)> openChannel,
+	Fn<void(QString)> joinChannel)
 : _delegate(delegate)
-, _session(session) {
+, _session(session)
+, _openChannel(std::move(openChannel))
+, _joinChannel(std::move(joinChannel)) {
 	prepare(data, hash);
 }
 
 void Shown::prepare(not_null<Data*> data, const QString &hash) {
-	const auto weak = base::make_weak(this);
-
-	_preparing = true;
-	const auto id = _id = data->id();
-	data->prepare({}, [=](Prepared result) {
-		result.hash = hash;
-		crl::on_main(weak, [=, result = std::move(result)]() mutable {
-			result.url = id;
-			if (_id != id || !_preparing) {
-				return;
-			}
-			_preparing = false;
-			fillChannelJoinedValues(result);
-			fillEmbeds(std::move(result.embeds));
-			showWindowed(std::move(result));
-		});
-	});
-}
+	const auto richPage = data->richPage();
+	const auto id = data->id();
+	const auto page = _session->data().webpage(data->pageId());
 
-void Shown::fillChannelJoinedValues(const Prepared &result) {
-	for (const auto &id : result.channelIds) {
-		const auto channelId = ChannelId(id.toLongLong());
-		const auto channel = _session->data().channel(channelId);
-		if (!channel->isLoaded() && !channel->username().isEmpty()) {
-			channel->session().api().request(MTPcontacts_ResolveUsername(
-				MTP_string(channel->username())
-			)).done([=](const MTPcontacts_ResolvedPeer &result) {
-				channel->owner().processUsers(result.data().vusers());
-				channel->owner().processChats(result.data().vchats());
-			}).send();
-		}
-		_inChannelValues[id] = Info::Profile::AmInChannelValue(channel);
+	if (_markdownRuntimeUrl != id) {
+		_markdownMediaRuntime = nullptr;
+		_markdownRuntimeUrl = QString();
 	}
-}
+	_id = id;
 
-void Shown::fillEmbeds(base::flat_map<QByteArray, QByteArray> added) {
-	if (_embeds.empty()) {
-		_embeds = std::move(added);
-	} else {
-		for (auto &[k, v] : added) {
-			_embeds[k] = std::move(v);
-		}
-	}
+	auto prepared = Markdown::TryPrepareNativeInstantView({
+		.richPage = richPage,
+		.mediaRuntime = createMediaRuntime(page),
+	});
+	showMarkdownWindowed(
+		std::move(prepared.content),
+		data->name(),
+		hash,
+		page,
+		false);
 }
 
-ShareBoxResult Shown::shareBox(ShareBoxDescriptor &&descriptor) {
-	class Show final : public Ui::Show {
-	public:
-		Show(QPointer<QWidget> parent, Fn<Ui::LayerStackWidget*()> lookup)
-		: _parent(parent)
-		, _lookup(lookup) {
-		}
-		void showOrHideBoxOrLayer(
-				std::variant<
-				v::null_t,
-				object_ptr<Ui::BoxContent>,
-				std::unique_ptr<Ui::LayerWidget>> &&layer,
-				Ui::LayerOptions options,
-				anim::type animated) const override {
-			using UniqueLayer = std::unique_ptr<Ui::LayerWidget>;
-			using ObjectBox = object_ptr<Ui::BoxContent>;
-			const auto stack = _lookup();
-			if (!stack) {
+Markdown::OpenOptions Shown::markdownOpenOptions(
+		QString initialFragment,
+		not_null<WebPageData*> page) {
+	const auto clickHandlerContext = std::make_shared<QVariant>();
+	auto options = Markdown::OpenOptions{
+		.sourceName = page->displayedSiteName(),
+		.sourceUrl = page->url,
+		.initialFragment = std::move(initialFragment),
+		.currentPageId = page->id,
+		.viewerKind = Markdown::ViewerKind::InstantView,
+		.clickHandlerContextRef = clickHandlerContext,
+		.ivWebviewStorageId = _session->local().resolveStorageIdOther(),
+		.activateMedia = [=](
+				const Markdown::MediaActivation &activation,
+				Qt::MouseButton button) {
+			return activateMarkdownMedia(activation, button, *clickHandlerContext);
+		},
+		.downloadTaskFinished = page->session().downloaderTaskFinished(),
+	};
+	if (!page->url.isEmpty()) {
+		options.share = [=, url = page->url](std::shared_ptr<Ui::Show> show) {
+			if (!show) {
 				return;
-			} else if (auto layerWidget = std::get_if<UniqueLayer>(&layer)) {
-				stack->showLayer(std::move(*layerWidget), options, animated);
-			} else if (auto box = std::get_if<ObjectBox>(&layer)) {
-				stack->showBox(std::move(*box), options, animated);
-			} else {
-				stack->hideAll(animated);
 			}
-		}
-		not_null<QWidget*> toastParent() const override {
-			return _parent.data();
-		}
-		bool valid() const override {
-			return _lookup() != nullptr;
-		}
-		operator bool() const override {
-			return valid();
-		}
-
-	private:
-		const QPointer<QWidget> _parent;
-		const Fn<Ui::LayerStackWidget*()> _lookup;
-
-	};
-
-	const auto url = descriptor.url;
-	const auto wrap = descriptor.parent;
-
-	struct State {
-		Ui::LayerStackWidget *stack = nullptr;
-		rpl::event_stream<> destroyRequests;
-	};
-	const auto state = wrap->lifetime().make_state<State>();
-
-	const auto weak = QPointer<Ui::RpWidget>(wrap);
-	const auto lookup = crl::guard(weak, [state] { return state->stack; });
-	const auto layer = Ui::CreateChild<Ui::LayerStackWidget>(
-		wrap.get(),
-		[=] { return std::make_shared<Show>(weak.data(), lookup); });
-	state->stack = layer;
-	const auto show = layer->showFactory()();
-
-	layer->setHideByBackgroundClick(false);
-	layer->move(0, 0);
-	wrap->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
-		layer->resize(size);
-	}, layer->lifetime());
-	layer->hideFinishEvents(
-	) | rpl::filter([=] {
-		return !!lookup(); // Last hide finish is sent from destructor.
-	}) | rpl::start_with_next([=] {
-		state->destroyRequests.fire({});
-	}, wrap->lifetime());
-
-	const auto waiting = layer->lifetime().make_state<rpl::lifetime>();
-	const auto focus = crl::guard(layer, [=] {
-		const auto set = [=] {
-			layer->window()->setFocus();
-			layer->setInnerFocus();
+			FastShareLink(Main::MakeSessionShow(show, _session), url);
 		};
-
-		const auto handle = layer->window()->windowHandle();
-		if (!handle) {
-			waiting->destroy();
-			return;
-		} else if (QGuiApplication::focusWindow() == handle) {
-			waiting->destroy();
-			set();
-		} else {
-			*waiting = base::qt_signal_producer(
-				qApp,
-				&QGuiApplication::focusWindowChanged
-			) | rpl::filter([=](QWindow *focused) {
-				const auto handle = layer->window()->windowHandle();
-				return handle && (focused == handle);
-			}) | rpl::start_with_next([=] {
-				waiting->destroy();
-				set();
-			});
-			layer->window()->activateWindow();
-		}
-	});
-	auto result = ShareBoxResult{
-		.focus = focus,
-		.hide = [=] { show->hideLayer(); },
-		.destroyRequests = state->destroyRequests.events(),
-	};
-
-	FastShareLink(Main::MakeSessionShow(show, _session), url);
-	return result;
+	}
+	return options;
 }
 
-void Shown::createController() {
-	Expects(!_controller);
+void Shown::createMarkdownController(
+		Markdown::MarkdownArticleContent content,
+		QString title,
+		QString initialFragment,
+		not_null<WebPageData*> page) {
+	Expects(!_markdownController);
 
-	const auto showShareBox = [=](ShareBoxDescriptor &&descriptor) {
-		return shareBox(std::move(descriptor));
-	};
-	_controller = std::make_unique<Controller>(
+	auto options = markdownOpenOptions(std::move(initialFragment), page);
+	_markdownController = std::make_unique<Markdown::Controller>(
 		_delegate,
-		std::move(showShareBox));
-
-	_controller->events(
-	) | rpl::start_to_stream(_events, _controller->lifetime());
-
-	_controller->dataRequests(
-	) | rpl::start_with_next([=](Webview::DataRequest request) {
-		const auto requested = QString::fromStdString(request.id);
-		const auto id = QStringView(requested);
-		if (id.startsWith(u"photo/")) {
-			streamPhoto(id.mid(6), std::move(request));
-		} else if (id.startsWith(u"document/"_q)) {
-			streamFile(id.mid(9), std::move(request));
-		} else if (id.startsWith(u"map/"_q)) {
-			streamMap(id.mid(4).toUtf8(), std::move(request));
-		} else if (id.startsWith(u"html/"_q)) {
-			sendEmbed(id.mid(5).toUtf8(), std::move(request));
+		std::move(content),
+		std::move(title),
+		nullptr,
+		std::move(options));
+	_markdownController->events() | rpl::on_next([=](Markdown::Event event) {
+		using FromType = Markdown::Event::Type;
+		using ToType = Controller::Event::Type;
+		switch (event.type) {
+		case FromType::Close:
+			_events.fire({ .type = ToType::Close });
+			break;
+		case FromType::Quit:
+			_events.fire({ .type = ToType::Quit });
+			break;
+		case FromType::OpenPage:
+			_events.fire({
+				.type = ToType::OpenPage,
+				.url = event.url,
+				.context = QString::number(event.webpageId),
+				.webpageId = event.webpageId,
+			});
+			break;
+		case FromType::OpenFile:
+			break;
+		case FromType::Report:
+			_events.fire({
+				.type = ToType::Report,
+				.context = QString::number(event.webpageId),
+			});
+			break;
 		}
-	}, _controller->lifetime());
+	}, _markdownController->lifetime());
 }
 
-void Shown::showWindowed(Prepared result) {
-	if (!_controller) {
-		createController();
+void Shown::showMarkdownWindowed(
+		Markdown::MarkdownArticleContent content,
+		QString title,
+		QString initialFragment,
+		not_null<WebPageData*> page,
+		bool refresh) {
+	if (!_markdownController) {
+		createMarkdownController(
+			std::move(content),
+			std::move(title),
+			std::move(initialFragment),
+			page);
+		_markdownController->activate();
+		return;
+	}
+	auto options = markdownOpenOptions(std::move(initialFragment), page);
+	if (refresh) {
+		_markdownController->update(
+			std::move(content),
+			std::move(title),
+			std::move(options));
+	} else {
+		_markdownController->show(
+			std::move(content),
+			std::move(title),
+			std::move(options));
 	}
-
-	_controller->show(
-		_session->local().resolveStorageIdOther(),
-		std::move(result),
-		base::duplicate(_inChannelValues));
 }
 
-::Data::FileOrigin Shown::fileOrigin(not_null<WebPageData*> page) const {
-	return ::Data::FileOriginWebPage{ page->url };
+std::shared_ptr<Markdown::MediaRuntime> Shown::createMediaRuntime(
+		not_null<WebPageData*> page) {
+	if (_markdownMediaRuntime && (page->url == _markdownRuntimeUrl)) {
+		return _markdownMediaRuntime;
+	}
+	_markdownRuntimeUrl = page->url;
+	_markdownMediaRuntime = CreateCachedPageMediaRuntime(
+		_session,
+		page,
+		_openChannel,
+		_joinChannel);
+	return _markdownMediaRuntime;
 }
 
-void Shown::streamPhoto(
-		QStringView idWithPageId,
-		Webview::DataRequest request) {
-	using namespace Data;
-
-	const auto parts = idWithPageId.split('/');
-	if (parts.size() != 2) {
-		requestFail(std::move(request));
-		return;
-	}
-	const auto photo = _session->data().photo(parts[0].toULongLong());
-	const auto page = _session->data().webpage(parts[1].toULongLong());
-	if (photo->isNull() || page->url.isEmpty()) {
-		requestFail(std::move(request));
-		return;
+bool Shown::activateMarkdownMedia(
+		const Markdown::MediaActivation &activation,
+		Qt::MouseButton button,
+		const QVariant &clickHandlerContext) const {
+	if (button != Qt::LeftButton && button != Qt::MiddleButton) {
+		return false;
 	}
-	const auto media = photo->createMediaView();
-	media->wanted(PhotoSize::Large, fileOrigin(page));
-	const auto check = [=] {
-		if (!media->loaded() && !media->owner()->failed(PhotoSize::Large)) {
+	switch (activation.kind) {
+	case Markdown::MediaActivationKind::None:
+		return false;
+	case Markdown::MediaActivationKind::ExternalUrl:
+		if (activation.url.isEmpty()) {
 			return false;
 		}
-		requestDone(
-			request,
-			media->imageBytes(PhotoSize::Large),
-			"image/jpeg");
+		HiddenUrlClickHandler::Open(activation.url, clickHandlerContext);
 		return true;
-	};
-	if (!check()) {
-		photo->session().downloaderTaskFinished(
-		) | rpl::filter(
-			check
-		) | rpl::take(1) | rpl::start(_controller->lifetime());
-	}
-}
-
-void Shown::streamFile(
-		QStringView idWithPageId,
-		Webview::DataRequest request) {
-	using namespace Data;
-
-	const auto parts = idWithPageId.split('/');
-	if (parts.size() != 2) {
-		requestFail(std::move(request));
-		return;
-	}
-	const auto documentId = DocumentId(parts[0].toULongLong());
-	const auto i = _streams.find(documentId);
-	if (i != end(_streams)) {
-		streamFile(i->second, std::move(request));
-		return;
-	}
-	const auto document = _session->data().document(documentId);
-	const auto page = _session->data().webpage(parts[1].toULongLong());
-	if (page->url.isEmpty()) {
-		requestFail(std::move(request));
-		return;
-	}
-	auto loader = document->createStreamingLoader(fileOrigin(page), false);
-	if (!loader) {
-		if (document->size >= Storage::kMaxFileInMemory) {
-			requestFail(std::move(request));
-		} else {
-			auto media = document->createMediaView();
-			if (const auto content = readFile(media); !content.isEmpty()) {
-				requestDone(
-					std::move(request),
-					content,
-					document->mimeString().toStdString());
-			} else {
-				subscribeToDocuments();
-				auto &file = _files[documentId];
-				file.media = std::move(media);
-				file.requests.push_back(std::move(request));
-				document->forceToCache(true);
-				document->save(fileOrigin(page), QString());
-			}
+	case Markdown::MediaActivationKind::Embed:
+		return false;
+	case Markdown::MediaActivationKind::Photo:
+		if (!activation.photo) {
+			return false;
 		}
-		return;
-	}
-	auto &file = _streams.emplace(
-		documentId,
-		FileStream{
-			.document = document,
-			.loader = std::move(loader),
-			.mime = document->mimeString().toStdString(),
-		}).first->second;
-
-	file.loader->parts(
-	) | rpl::start_with_next([=](Media::Streaming::LoadedPart &&part) {
-		const auto i = _streams.find(documentId);
-		Assert(i != end(_streams));
-		processPartInFile(i->second, std::move(part));
-	}, file.lifetime);
-
-	streamFile(file, std::move(request));
-}
-
-void Shown::streamFile(FileStream &file, Webview::DataRequest request) {
-	constexpr auto kPart = Media::Streaming::Loader::kPartSize;
-	const auto size = file.document->size;
-	const auto last = int((size + kPart - 1) / kPart);
-	const auto from = int(std::min(int64(request.offset), size) / kPart);
-	const auto till = (request.limit > 0)
-		? std::min(int64(request.offset + request.limit), size)
-		: size;
-	const auto parts = std::min(
-		int((till + kPart - 1) / kPart) - from,
-		kMaxLoadParts);
-	//auto base = IvBaseCacheKey(document);
-
-	const auto length = std::min((from + parts) * kPart, size)
-		- from * kPart;
-	file.requests.push_back(PartRequest{
-		.request = std::move(request),
-		.data = QByteArray(length, 0),
-		.loaded = std::vector<bool>(parts, false),
-		.offset = from * kPart,
-	});
-
-	file.loader->resetPriorities();
-	const auto load = std::min(from + kKeepLoadingParts, last) - from;
-	for (auto i = 0; i != load; ++i) {
-		file.loader->load((from + i) * kPart);
-	}
-}
-
-void Shown::subscribeToDocuments() {
-	if (_documentLifetime) {
-		return;
-	}
-	_documentLifetime = _session->data().documentLoadProgress(
-	) | rpl::filter([=](not_null<DocumentData*> document) {
-		return !document->loading();
-	}) | rpl::start_with_next([=](not_null<DocumentData*> document) {
-		const auto i = _files.find(document->id);
-		if (i == end(_files)) {
-			return;
+		activation.photo->open(button);
+		return true;
+	case Markdown::MediaActivationKind::Document:
+		if (!activation.document) {
+			return false;
 		}
-		auto requests = base::take(i->second.requests);
-		const auto content = readFile(i->second.media);
-		_files.erase(i);
-
-		if (!content.isEmpty()) {
-			for (auto &request : requests) {
-				requestDone(
-					std::move(request),
-					content,
-					document->mimeString().toStdString());
-			}
-		} else {
-			for (auto &request : requests) {
-				requestFail(std::move(request));
-			}
+		activation.document->open(button);
+		return true;
+	case Markdown::MediaActivationKind::OpenChannel:
+		if (!activation.channel) {
+			return false;
 		}
-	});
-}
-
-QByteArray Shown::readFile(
-		const std::shared_ptr<::Data::DocumentMedia> &media) {
-	return Lottie::ReadContent(media->bytes(), media->owner()->filepath());
-}
-
-void Shown::processPartInFile(
-		FileStream &file,
-		Media::Streaming::LoadedPart &&part) {
-	for (auto i = begin(file.requests); i != end(file.requests);) {
-		if (finishRequestWithPart(*i, part)) {
-			auto done = base::take(*i);
-			i = file.requests.erase(i);
-			requestDone(
-				std::move(done.request),
-				done.data,
-				file.mime,
-				done.offset,
-				file.document->size);
-		} else {
-			++i;
+		activation.channel->open(button);
+		return true;
+	case Markdown::MediaActivationKind::JoinChannel:
+		if (!activation.channel) {
+			return false;
 		}
-	}
-}
-
-bool Shown::finishRequestWithPart(
-		PartRequest &request,
-		const Media::Streaming::LoadedPart &part) {
-	const auto offset = part.offset;
-	if (offset == Media::Streaming::LoadedPart::kFailedOffset) {
-		request.data = QByteArray();
+		activation.channel->join(button);
 		return true;
-	} else if (offset < request.offset
-		|| offset >= request.offset + request.data.size()) {
-		return false;
-	}
-	constexpr auto kPart = Media::Streaming::Loader::kPartSize;
-	const auto copy = std::min(
-		int(part.bytes.size()),
-		int(request.data.size() - (offset - request.offset)));
-	const auto index = (offset - request.offset) / kPart;
-	Assert(index < request.loaded.size());
-	if (request.loaded[index]) {
-		return false;
 	}
-	request.loaded[index] = true;
-	memcpy(
-		request.data.data() + index * kPart,
-		part.bytes.constData(),
-		copy);
-	return !ranges::contains(request.loaded, false);
-}
-
-void Shown::streamMap(QString params, Webview::DataRequest request) {
-	using namespace ::Data;
-
-	const auto parts = params.split(u'&');
-	if (parts.size() != 3) {
-		requestFail(std::move(request));
-		return;
-	}
-	const auto point = GeoPointFromId(parts[0].toUtf8());
-	const auto size = parts[1].split(',');
-	const auto zoom = parts[2].toInt();
-	if (size.size() != 2) {
-		requestFail(std::move(request));
-		return;
-	}
-	const auto location = GeoPointLocation{
-		.lat = point.lat,
-		.lon = point.lon,
-		.access = point.access,
-		.width = size[0].toInt(),
-		.height = size[1].toInt(),
-		.zoom = std::max(zoom, kGeoPointZoomMin),
-		.scale = kGeoPointScale,
-	};
-	const auto prepared = ImageWithLocation{
-		.location = ImageLocation(
-			{ location },
-			location.width,
-			location.height)
-	};
-	auto &preview = _maps.emplace(params, MapPreview()).first->second;
-	preview.file = std::make_unique<CloudFile>();
-
-	UpdateCloudFile(
-		*preview.file,
-		prepared,
-		_session->data().cache(),
-		kImageCacheTag,
-		[=](FileOrigin origin) { /* restartLoader not used here */ });
-	const auto autoLoading = false;
-	const auto finalCheck = [=] { return true; };
-	const auto done = [=](QByteArray bytes) {
-		const auto i = _maps.find(params);
-		Assert(i != end(_maps));
-		i->second.bytes = std::move(bytes);
-		requestDone(request, i->second.bytes, "image/png");
-	};
-	LoadCloudFile(
-		_session,
-		*preview.file,
-		FileOrigin(),
-		LoadFromCloudOrLocal,
-		autoLoading,
-		kImageCacheTag,
-		finalCheck,
-		done,
-		[=](bool) { done("failed..."); });
-}
-
-void Shown::sendEmbed(QByteArray hash, Webview::DataRequest request) {
-	const auto i = _embeds.find(hash);
-	if (i != end(_embeds)) {
-		requestDone(std::move(request), i->second, "text/html; charset=utf-8");
-	} else {
-		requestFail(std::move(request));
-	}
-}
-
-void Shown::requestDone(
-		Webview::DataRequest request,
-		QByteArray bytes,
-		std::string mime,
-		int64 offset,
-		int64 total) {
-	if (bytes.isEmpty() && mime.empty()) {
-		requestFail(std::move(request));
-		return;
-	}
-	crl::on_main([
-		done = std::move(request.done),
-		data = std::move(bytes),
-		mime = std::move(mime),
-		offset,
-		total
-	] {
-		using namespace Webview;
-		done({
-			.stream = std::make_unique<DataStreamFromMemory>(data, mime),
-			.streamOffset = offset,
-			.totalSize = total,
-		});
-	});
-}
-
-void Shown::requestFail(Webview::DataRequest request) {
-	crl::on_main([done = std::move(request.done)] {
-		done({});
-	});
+	return false;
 }
 
 bool Shown::showing(
@@ -737,11 +621,11 @@ bool Shown::showingFrom(not_null<Main::Session*> session) const {
 }
 
 bool Shown::activeFor(not_null<Main::Session*> session) const {
-	return showingFrom(session) && _controller;
+	return showingFrom(session) && _markdownController;
 }
 
 bool Shown::active() const {
-	return _controller && _controller->active();
+	return _markdownController && _markdownController->active();
 }
 
 void Shown::moveTo(not_null<Data*> data, QString hash) {
@@ -749,30 +633,37 @@ void Shown::moveTo(not_null<Data*> data, QString hash) {
 }
 
 void Shown::update(not_null<Data*> data) {
-	const auto weak = base::make_weak(this);
-
+	const auto richPage = data->richPage();
 	const auto id = data->id();
-	data->prepare({}, [=](Prepared result) {
-		crl::on_main(weak, [=, result = std::move(result)]() mutable {
-			result.url = id;
-			fillChannelJoinedValues(result);
-			fillEmbeds(std::move(result.embeds));
-			if (_controller) {
-				_controller->update(std::move(result));
-			}
-		});
+
+	if (_markdownRuntimeUrl != id) {
+		_markdownMediaRuntime = nullptr;
+		_markdownRuntimeUrl = QString();
+	}
+	_id = id;
+
+	const auto page = _session->data().webpage(data->pageId());
+	auto prepared = Markdown::TryPrepareNativeInstantView({
+		.richPage = richPage,
+		.mediaRuntime = createMediaRuntime(page),
 	});
+	showMarkdownWindowed(
+		std::move(prepared.content),
+		data->name(),
+		QString(),
+		page,
+		true);
 }
 
 void Shown::showJoinedTooltip() {
-	if (_controller) {
-		_controller->showJoinedTooltip();
+	if (_markdownController) {
+		_markdownController->showJoinedTooltip();
 	}
 }
 
 void Shown::minimize() {
-	if (_controller) {
-		_controller->minimize();
+	if (_markdownController) {
+		_markdownController->minimize();
 	}
 }
 
@@ -785,12 +676,7 @@ TonSite::TonSite(not_null<Delegate*> delegate, QString uri)
 void TonSite::createController() {
 	Expects(!_controller);
 
-	const auto showShareBox = [=](ShareBoxDescriptor &&descriptor) {
-		return ShareBoxResult();
-	};
-	_controller = std::make_unique<Controller>(
-		_delegate,
-		std::move(showShareBox));
+	_controller = std::make_unique<Controller>(_delegate);
 
 	_controller->events(
 	) | rpl::start_to_stream(_events, _controller->lifetime());
@@ -827,36 +713,60 @@ void Instance::show(
 		not_null<Window::SessionController*> controller,
 		not_null<Data*> data,
 		QString hash) {
-	_delegate->ivSetLastSourceWindow(controller->widget());
-	show(controller->uiShow(), data, hash);
+	showOpenedPage(&controller->session(), data, std::move(hash), true);
 }
 
 void Instance::show(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<Data*> data,
 		QString hash) {
-	this->show(&show->session(), data, hash);
+	showOpenedPage(&show->session(), data, std::move(hash), true);
 }
 
 void Instance::show(
 		not_null<Main::Session*> session,
 		not_null<Data*> data,
 		QString hash) {
+	showOpenedPage(session, data, std::move(hash), true);
+}
+
+void Instance::showOpenedPage(
+		not_null<Main::Session*> session,
+		not_null<Data*> data,
+		QString hash,
+		bool requestFullOnOpen) {
 	if (Platform::IsMac()) {
 		// Otherwise IV is not visible under the media viewer.
 		Core::App().hideMediaView();
 	}
 
+	if (Core::App().settings().normalizeIvZoom()) {
+		Core::App().saveSettingsDelayed();
+	}
+
+	primeFullRequest(session, data);
 	const auto guard = gsl::finally([&] {
-		requestFull(session, data->id());
+		if (requestFullOnOpen) {
+			requestFull(session, data->id());
+		}
 	});
 	if (_shown && _shownSession == session) {
 		_shown->moveTo(data, hash);
 		return;
 	}
-	_shown = std::make_unique<Shown>(_delegate, session, data, hash);
+	_shown = std::make_unique<Shown>(
+		_delegate,
+		session,
+		data,
+		hash,
+		[=](QString context) {
+			processOpenChannel(context);
+		},
+		[=](QString context) {
+			processJoinChannel(context);
+		});
 	_shownSession = session;
-	_shown->events() | rpl::start_with_next([=](Controller::Event event) {
+	_shown->events() | rpl::on_next([=](Controller::Event event) {
 		using Type = Controller::Event::Type;
 		const auto lower = event.url.toLower();
 		const auto urlChecked = lower.startsWith("http://")
@@ -892,6 +802,7 @@ void Instance::show(
 					: nullptr;
 				const auto item = (HistoryItem*)nullptr;
 				const auto topicRootId = MsgId(0);
+				const auto monoforumPeerId = PeerId(0);
 				if (event.context.startsWith("-photo")) {
 					const auto id = event.context.mid(6).toULongLong();
 					const auto photo = _shownSession->data().photo(id);
@@ -900,7 +811,8 @@ void Instance::show(
 							controller,
 							photo,
 							item,
-							topicRootId
+							topicRootId,
+							monoforumPeerId
 						});
 					}
 				} else if (event.context.startsWith("-video")) {
@@ -911,7 +823,8 @@ void Instance::show(
 							controller,
 							video,
 							item,
-							topicRootId
+							topicRootId,
+							monoforumPeerId
 						});
 					}
 				}
@@ -927,17 +840,55 @@ void Instance::show(
 			}
 			const auto session = _shownSession;
 			const auto url = event.url;
-			auto &requested = _fullRequested[session][url];
+			const auto parts = event.url.split('#');
+			const auto hash = (parts.size() > 1) ? parts[1] : u""_q;
+			if (event.webpageId) {
+				const auto page = session->data().webpage(
+					WebPageId(event.webpageId)).get();
+				if (page->iv) {
+					this->showOpenedPage(session, page->iv.get(), hash, false);
+					break;
+				}
+			}
+			const auto requestKey = event.webpageId
+				? QString::number(event.webpageId)
+				: url;
+			auto &requested = _fullRequested[session][requestKey];
+			if (event.webpageId) {
+				const auto page = session->data().webpage(
+					WebPageId(event.webpageId)).get();
+				if (page->iv) {
+					requested.page = page;
+					requested.hash = page->iv->hash();
+				} else {
+					requested.hash = 0;
+				}
+			}
 			requested.lastRequestedAt = crl::now();
 			session->api().request(MTPmessages_GetWebPage(
 				MTP_string(url),
 				MTP_int(requested.hash)
 			)).done([=](const MTPmessages_WebPage &result) {
-				const auto page = processReceivedPage(session, url, result);
-				if (page && page->iv) {
-					const auto parts = event.url.split('#');
-					const auto hash = (parts.size() > 1) ? parts[1] : u""_q;
-					this->show(_shownSession, page->iv.get(), hash);
+				const auto processed = processReceivedPage(
+					session,
+					requestKey,
+					result);
+				if (const auto page = processed.page; page && page->iv) {
+					if (event.webpageId && page->id != event.webpageId) {
+						const auto expected = session->data().webpage(
+							WebPageId(event.webpageId)).get();
+						if (expected->iv) {
+							this->showOpenedPage(
+								session,
+								expected->iv.get(),
+								hash,
+								false);
+						} else {
+							UrlClickHandler::Open(event.url);
+						}
+						return;
+					}
+					this->showOpenedPage(session, page->iv.get(), hash, false);
 				} else {
 					UrlClickHandler::Open(event.url);
 				}
@@ -961,7 +912,7 @@ void Instance::show(
 
 	session->changes().peerUpdates(
 		::Data::PeerUpdate::Flag::ChannelAmIn
-	) | rpl::start_with_next([=](const ::Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const ::Data::PeerUpdate &update) {
 		if (const auto channel = update.peer->asChannel()) {
 			if (channel->amIn()) {
 				const auto i = _joining.find(session);
@@ -976,14 +927,46 @@ void Instance::show(
 	trackSession(session);
 }
 
+void Instance::primeFullRequest(
+		not_null<Main::Session*> session,
+		not_null<Data*> data) {
+	auto &requested = _fullRequested[session][data->id()];
+	requested.page = session->data().webpage(data->pageId()).get();
+	requested.hash = data->hash();
+}
+
 void Instance::trackSession(not_null<Main::Session*> session) {
 	if (!_tracking.emplace(session).second) {
 		return;
 	}
+	session->data().sessionDataAboutToBeCleared(
+	) | rpl::on_next([=] {
+		closeSessionDataViews(session);
+	}, session->lifetime());
+	session->data().itemRemoved(
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
+		closeMarkdownsForItem(session, item->fullId());
+	}, session->lifetime());
+	session->data().itemsAboutToBeDestroyed(
+	) | rpl::on_next([=](std::vector<not_null<HistoryItem*>> items) {
+		for (const auto &item : items) {
+			closeMarkdownsForItem(session, item->fullId());
+		}
+	}, session->lifetime());
 	session->lifetime().add([=] {
+		closeSessionDataViews(session);
 		_tracking.remove(session);
 		_joining.remove(session);
 		_fullRequested.remove(session);
+		if (const auto i = _richMessageRequested.find(session)
+			; i != end(_richMessageRequested)) {
+			for (const auto &[itemId, requested] : i->second) {
+				if (requested.requestId) {
+					session->api().request(requested.requestId).cancel();
+				}
+			}
+			_richMessageRequested.erase(i);
+		}
 		_ivCache.remove(session);
 		if (_ivRequestSession == session) {
 			session->api().request(_ivRequestId).cancel();
@@ -991,13 +974,59 @@ void Instance::trackSession(not_null<Main::Session*> session) {
 			_ivRequestUri = QString();
 			_ivRequestId = 0;
 		}
-		if (_shownSession == session) {
-			_shownSession = nullptr;
+	});
+}
+
+void Instance::bindMarkdown(
+		const QString &key,
+		not_null<Main::Session*> session,
+		FullMsgId itemId) {
+	_markdownBindings[key] = {
+		.session = session.get(),
+		.itemId = itemId,
+	};
+	trackSession(session);
+}
+
+void Instance::closeMarkdownsForItem(
+		not_null<Main::Session*> session,
+		FullMsgId itemId) {
+	if (!itemId) {
+		return;
+	}
+	auto keys = std::vector<QString>();
+	for (const auto &[key, binding] : _markdownBindings) {
+		if (binding.session == session.get() && binding.itemId == itemId) {
+			keys.push_back(key);
 		}
-		if (_shown && _shown->showingFrom(session)) {
-			_shown = nullptr;
+	}
+	for (const auto &key : keys) {
+		_markdownBindings.remove(key);
+		_markdowns.take(key);
+	}
+}
+
+void Instance::closeMarkdownsForSession(not_null<Main::Session*> session) {
+	auto keys = std::vector<QString>();
+	for (const auto &[key, binding] : _markdownBindings) {
+		if (binding.session == session.get()) {
+			keys.push_back(key);
 		}
-	});
+	}
+	for (const auto &key : keys) {
+		_markdownBindings.remove(key);
+		_markdowns.take(key);
+	}
+}
+
+void Instance::closeSessionDataViews(not_null<Main::Session*> session) {
+	closeMarkdownsForSession(session);
+	if (_shownSession == session) {
+		_shownSession = nullptr;
+	}
+	if (_shown && _shown->showingFrom(session)) {
+		_shown = nullptr;
+	}
 }
 
 void Instance::openWithIvPreferred(
@@ -1019,13 +1048,16 @@ void Instance::openWithIvPreferred(
 	const auto openExternal = [=] {
 		auto my = context.value<ClickHandlerContext>();
 		my.ignoreIv = true;
-		UrlClickHandler::Open(uri, QVariant::fromValue(my));
+		const auto updated = QVariant::fromValue(my);
+		if (my.forceExternalUrlConfirmation) {
+			HiddenUrlClickHandler::Open(uri, updated);
+		} else {
+			UrlClickHandler::Open(uri, updated);
+		}
 	};
 	const auto parts = uri.split('#');
 	if (parts.isEmpty() || parts[0].isEmpty()) {
 		return;
-	} else if (!ShowButton()) {
-		return openExternal();
 	}
 	trackSession(session);
 	const auto hash = (parts.size() > 1) ? parts[1] : u""_q;
@@ -1056,7 +1088,11 @@ void Instance::openWithIvPreferred(
 		_ivRequestUri = QString();
 		_ivRequestSession = nullptr;
 		_ivCache[session][url] = page;
-		openWithIvPreferred(session, uri, context);
+		if (page && page->iv) {
+			this->showOpenedPage(session, page->iv.get(), hash, false);
+		} else {
+			openExternal();
+		}
 	};
 	_ivRequestSession = session;
 	_ivRequestUri = uri;
@@ -1066,7 +1102,7 @@ void Instance::openWithIvPreferred(
 		MTP_string(url),
 		MTP_int(requested.hash)
 	)).done([=](const MTPmessages_WebPage &result) {
-		finish(processReceivedPage(session, url, result));
+		finish(processReceivedPage(session, url, result).page);
 	}).fail([=] {
 		finish(nullptr);
 	}).send();
@@ -1087,7 +1123,7 @@ void Instance::showTonSite(
 		return;
 	}
 	_tonSite = std::make_unique<TonSite>(_delegate, uri);
-	_tonSite->events() | rpl::start_with_next([=](Controller::Event event) {
+	_tonSite->events() | rpl::on_next([=](Controller::Event event) {
 		using Type = Controller::Event::Type;
 		const auto lower = event.url.toLower();
 		const auto urlChecked = lower.startsWith("http://")
@@ -1120,6 +1156,280 @@ void Instance::showTonSite(
 	}, _tonSite->lifetime());
 }
 
+Instance::RichMessageGeneration Instance::CaptureRichMessageGeneration(
+		not_null<HistoryItem*> item) {
+	auto generation = RichMessageGeneration();
+	generation.inlinePage = item->richPage();
+	generation.fullPage = item->fullRichPage();
+	generation.fullPageVersion = item->fullRichPageVersion();
+	return generation;
+}
+
+bool Instance::MatchesRichMessageGeneration(
+		not_null<HistoryItem*> item,
+		const RichMessageGeneration &generation) {
+	return (item->richPage() == generation.inlinePage)
+		&& (item->fullRichPage() == generation.fullPage)
+		&& (item->fullRichPageVersion() == generation.fullPageVersion);
+}
+
+void Instance::resolveRichMessage(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item,
+		RichMessageResolved done) {
+	if (const auto page = item->fullRichPage()) {
+		done(page);
+		return;
+	}
+	const auto richPage = item->richPage();
+	if (richPage && !richPage->part) {
+		done(richPage);
+		return;
+	}
+	const auto session = &controller->session();
+	const auto itemId = item->fullId();
+	const auto generation = CaptureRichMessageGeneration(item);
+	trackSession(session);
+	auto &requested = _richMessageRequested[session][itemId];
+	if (requested.requestId) {
+		if (MatchesRichMessageGeneration(item, requested.generation)) {
+			requested.callbacks.push_back(std::move(done));
+			return;
+		}
+		session->api().request(requested.requestId).cancel();
+		requested = RichMessageRequest();
+	}
+	requested.callbacks.push_back(std::move(done));
+	const auto now = crl::now();
+	if (requested.lastRequestedAt
+		&& MatchesRichMessageGeneration(item, requested.generation)
+		&& (now - requested.lastRequestedAt) < kAllowPageReloadAfter) {
+		finishRichMessageRequest(session, itemId, requested.token, nullptr);
+		return;
+	}
+	requested.lastRequestedAt = now;
+	requested.generation = generation;
+	requested.token = ++_nextRichMessageRequestToken;
+	const auto token = requested.token;
+	requested.requestId = session->api().request(MTPmessages_GetRichMessage(
+		item->history()->peer->input(),
+		MTP_int(item->id)
+	)).done([=](const MTPmessages_Messages &result) {
+		const auto processed = processReceivedRichMessage(
+			session,
+			itemId,
+			generation,
+			result);
+		finishRichMessageRequest(
+			session,
+			itemId,
+			token,
+			processed.page,
+			processed.notifyCallbacks);
+	}).fail([=] {
+		finishRichMessageRequest(
+			session,
+			itemId,
+			token,
+			nullptr);
+	}).send();
+}
+
+void Instance::showRichMessage(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item,
+		QString initialFragment) {
+	const auto weak = base::make_weak(controller);
+	const auto itemId = item->fullId();
+	resolveRichMessage(controller, item, [=](std::shared_ptr<const RichPage> page) {
+		const auto strong = weak.get();
+		const auto current = strong
+			? strong->session().data().message(itemId)
+			: nullptr;
+		if (!page || !current) {
+			if (strong && !page) {
+				Ui::Toast::Show(tr::lng_iv_not_supported(tr::now));
+			}
+			return;
+		}
+		showRichMessage(
+			not_null{ strong },
+			not_null{ current },
+			std::move(page),
+			initialFragment);
+	});
+}
+
+void Instance::showRichMessage(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item,
+		std::shared_ptr<const RichPage> richPage,
+		QString initialFragment) {
+	if (Platform::IsMac()) {
+		Core::App().hideMediaView();
+	}
+	const auto session = &controller->session();
+	const auto itemId = item->fullId();
+	const auto key = RichMessageKey(itemId);
+	const auto title = item->history()->peer->name();
+	auto clickHandlerContext = ClickHandlerContext();
+	clickHandlerContext.sessionWindow = controller;
+	clickHandlerContext.itemId = itemId;
+	auto context = QVariant::fromValue(clickHandlerContext);
+	auto mediaRuntime = CreateMessageMediaRuntime(
+		session,
+		itemId,
+		[=](QString context) {
+			OpenRichMessageChannel(session, context);
+		},
+		[=](QString context) {
+			JoinRichMessageChannel(session, context);
+		});
+	const auto richLimits = ResolveRichMessageLimits(session);
+	auto prepared = Markdown::TryPrepareNativeInstantView({
+		.richPage = richPage,
+		.mediaRuntime = std::move(mediaRuntime),
+		.tableRenderLimits = Markdown::PrepareTableRenderLimitsForRichMessage(
+			richLimits),
+	});
+	if (!prepared.supported()) {
+		Ui::Toast::Show(tr::lng_iv_not_supported(tr::now));
+		return;
+	}
+	if (!initialFragment.isEmpty()
+		&& !PreparedContentHasAnchor(prepared.content, initialFragment)) {
+		controller->showToast(tr::lng_iv_not_found_in_message(tr::now));
+		return;
+	}
+	auto options = Markdown::OpenOptions{
+		.sourceName = title,
+		.currentPageId = RichMessagePageId(itemId),
+		.viewerKind = Markdown::ViewerKind::InstantView,
+		.clickHandlerContext = context,
+		.activateMedia = [=](
+				const Markdown::MediaActivation &activation,
+				Qt::MouseButton button) {
+			return ActivateRichMessageMedia(activation, button, context);
+		},
+		.downloadTaskFinished = session->downloaderTaskFinished(),
+	};
+	options.initialFragment = std::move(initialFragment);
+	if (CanShareMarkdownItem(item)) {
+		options.share = [=](std::shared_ptr<Ui::Show> show) {
+			const auto current = session->data().message(itemId);
+			if (!show || !current || !CanShareMarkdownItem(not_null{ current })) {
+				return;
+			}
+			FastShareMessage(
+				Main::MakeSessionShow(show, not_null{ session }),
+				not_null{ current });
+		};
+	}
+
+	auto i = _markdowns.find(key);
+	if (i == end(_markdowns)) {
+		auto controller = std::make_unique<Markdown::Controller>(
+			_delegate,
+			std::move(prepared.content),
+			title,
+			nullptr,
+			std::move(options));
+		controller->events() | rpl::on_next([=](Markdown::Event event) {
+			using Type = Markdown::Event::Type;
+			switch (event.type) {
+			case Type::Close:
+				_markdownBindings.remove(key);
+				_markdowns.take(key);
+				break;
+			case Type::Quit:
+				Shortcuts::Launch(Shortcuts::Command::Quit);
+				break;
+			case Type::OpenPage:
+			case Type::OpenFile:
+				if (!event.url.isEmpty()) {
+					UrlClickHandler::Open(event.url, event.context);
+				}
+				break;
+			case Type::Report:
+				break;
+			}
+		}, controller->lifetime());
+		i = _markdowns.emplace(key, std::move(controller)).first;
+	} else {
+		i->second->show(
+			std::move(prepared.content),
+			title,
+			std::move(options));
+	}
+	bindMarkdown(key, session, itemId);
+	i->second->activate();
+}
+
+bool Instance::showMarkdown(
+		const QString &path,
+		QVariant context) {
+	const auto target = ParseLocalMarkdownTarget(path);
+	const auto messageContext = ExtractMarkdownMessageContext(context);
+	const auto session = messageContext
+		? ResolveMarkdownSession(*messageContext)
+		: nullptr;
+	const auto itemId = messageContext
+		? messageContext->clickHandlerContext.itemId
+		: FullMsgId();
+	auto options = PrepareLocalMarkdownOptions(context);
+	if (!target.sourceName.isEmpty()) {
+		options.sourceName = target.sourceName;
+		options.sourcePath = target.key;
+	}
+	options.initialFragment = target.fragment;
+	auto i = _markdowns.find(target.key);
+	if (i == end(_markdowns)) {
+		if (auto controller = Markdown::TryOpenLocalFile(
+				_delegate,
+				target.path,
+				std::move(options))) {
+			controller->events() | rpl::on_next([=](Markdown::Event event) {
+				using Type = Markdown::Event::Type;
+				switch (event.type) {
+				case Type::Close:
+					_markdownBindings.remove(target.key);
+					_markdowns.take(target.key);
+					break;
+				case Type::Quit:
+					Shortcuts::Launch(Shortcuts::Command::Quit);
+					break;
+				case Type::Report:
+					break;
+				// Don't try opening markdown links inside markdown viewer,
+				// messenger-provided markdown files should know nothing
+				// about other local files and their paths.
+				//
+				//case Type::OpenFile:
+				//	if (!showMarkdown(event.url, event.context)) {
+				//		DEBUG_LOG(("Native Markdown IV: "
+				//			"failed local markdown link: %1"
+				//			).arg(event.url));
+				//	}
+				//	break;
+				}
+			}, controller->lifetime());
+
+			i = _markdowns.emplace(target.key, std::move(controller)).first;
+		} else {
+			return false;
+		}
+	} else {
+		i->second->updateOptions(std::move(options));
+	}
+	if (session) {
+		bindMarkdown(target.key, not_null{ session }, itemId);
+	} else {
+		_markdownBindings.remove(target.key);
+	}
+	i->second->activate();
+	return true;
+}
+
 void Instance::requestFull(
 		not_null<Main::Session*> session,
 		const QString &id) {
@@ -1137,14 +1447,18 @@ void Instance::requestFull(
 		MTP_string(id),
 		MTP_int(requested.hash)
 	)).done([=](const MTPmessages_WebPage &result) {
-		const auto page = processReceivedPage(session, id, result);
-		if (page && page->iv && _shown && _shownSession == session) {
-			_shown->update(page->iv.get());
+		const auto processed = processReceivedPage(session, id, result);
+		if (processed.articleChanged
+			&& processed.page
+			&& processed.page->iv
+			&& _shown
+			&& _shownSession == session) {
+			_shown->update(processed.page->iv.get());
 		}
 	}).send();
 }
 
-WebPageData *Instance::processReceivedPage(
+Instance::ProcessReceivedPageResult Instance::processReceivedPage(
 		not_null<Main::Session*> session,
 		const QString &url,
 		const MTPmessages_WebPage &result) {
@@ -1153,37 +1467,130 @@ WebPageData *Instance::processReceivedPage(
 	owner->processUsers(data.vusers());
 	owner->processChats(data.vchats());
 	auto &requested = _fullRequested[session][url];
+	auto processed = ProcessReceivedPageResult();
 	const auto &mtp = data.vwebpage();
 	mtp.match([&](const MTPDwebPageNotModified &data) {
-		const auto page = requested.page;
-		if (const auto views = data.vcached_page_views()) {
-			if (page && page->iv) {
-				page->iv->updateCachedViews(views->v);
-			}
-		}
+		Q_UNUSED(data);
+
+		processed.page = requested.page;
 	}, [&](const MTPDwebPage &data) {
+		const auto oldPage = requested.page;
+		const auto oldVersion = oldPage ? oldPage->version : 0;
+		const auto oldIvHash = (oldPage && oldPage->iv)
+			? oldPage->iv->hash()
+			: 0;
 		requested.hash = data.vhash().v;
-		requested.page = owner->processWebpage(data).get();
+		processed.page = owner->processWebpage(data).get();
+		requested.page = processed.page;
+		processed.articleChanged = processed.page
+			&& processed.page->iv
+			&& (!oldPage
+				|| processed.page->version != oldVersion
+				|| processed.page->iv->hash() != oldIvHash);
 	}, [&](const auto &) {
-		requested.page = owner->processWebpage(mtp).get();
+		processed.page = owner->processWebpage(mtp).get();
+		requested.page = processed.page;
+	});
+	return processed;
+}
+
+auto Instance::processReceivedRichMessage(
+	not_null<Main::Session*> session,
+	FullMsgId itemId,
+	const RichMessageGeneration &generation,
+	const MTPmessages_Messages &result)
+-> ProcessReceivedRichMessageResult {
+	const auto owner = &session->data();
+	auto processed = ProcessReceivedRichMessageResult();
+	auto page = std::shared_ptr<const RichPage>();
+	result.match([&](const MTPDmessages_messagesNotModified &) {
+		LOG(("API Error: received messages.messagesNotModified!"));
+	}, [&](const auto &data) {
+		owner->processUsers(data.vusers());
+		owner->processChats(data.vchats());
+		for (const auto &message : data.vmessages().v) {
+			if (message.type() != mtpc_message) {
+				continue;
+			}
+			const auto &parsed = message.c_message();
+			if (MsgId(parsed.vid().v) != itemId.msg) {
+				continue;
+			}
+			const auto richMessage = parsed.vrich_message();
+			page = richMessage ? ParseRichPage(session, *richMessage) : nullptr;
+			break;
+		}
+	});
+	const auto peer = owner->peer(itemId.peer);
+	result.match([&](const MTPDmessages_channelMessages &data) {
+		if (const auto channel = peer->asChannel()) {
+			channel->ptsReceived(data.vpts().v);
+		} else {
+			LOG(("App Error: received messages.channelMessages!"));
+		}
+	}, [](const auto &) {});
+	result.match([&](const MTPDmessages_messagesNotModified &) {
+	}, [&](const auto &data) {
+		peer->processTopics(data.vtopics());
 	});
-	return requested.page;
+	const auto current = owner->message(itemId);
+	if (!current
+		|| !MatchesRichMessageGeneration(not_null{ current }, generation)) {
+		return processed;
+	}
+	if (page) {
+		current->setFullRichPage(page);
+	}
+	processed.page = std::move(page);
+	return processed;
+}
+
+void Instance::finishRichMessageRequest(
+		not_null<Main::Session*> session,
+		FullMsgId itemId,
+		uint64 token,
+		std::shared_ptr<const RichPage> page,
+		bool notifyCallbacks) {
+	const auto sessionIt = _richMessageRequested.find(session);
+	if (sessionIt == end(_richMessageRequested)) {
+		return;
+	}
+	const auto itemIt = sessionIt->second.find(itemId);
+	if (itemIt == end(sessionIt->second)) {
+		return;
+	}
+	if (itemIt->second.token != token) {
+		return;
+	}
+	auto callbacks = std::move(itemIt->second.callbacks);
+	itemIt->second.callbacks.clear();
+	itemIt->second.requestId = 0;
+	if (!notifyCallbacks) {
+		return;
+	}
+	for (auto &callback : callbacks) {
+		callback(page);
+	}
 }
 
 void Instance::processOpenChannel(const QString &context) {
 	if (!_shownSession) {
 		return;
-	} else if (const auto channelId = ChannelId(context.toLongLong())) {
+	}
+	const auto parsed = ParseNativeIvChannelContext(context);
+	if (const auto channelId = ChannelId(parsed.channelId)) {
 		const auto channel = _shownSession->data().channel(channelId);
 		if (channel->isLoaded()) {
 			if (const auto controller = _shownSession->tryResolveWindow(channel)) {
 				controller->showPeerHistory(channel);
 				_shown = nullptr;
 			}
-		} else if (!channel->username().isEmpty()) {
+		} else if (const auto username = ResolveNativeIvChannelUsername(
+				channel->username(),
+				parsed.username); !username.isEmpty()) {
 			if (const auto controller = _shownSession->tryResolveWindow(channel)) {
 				controller->showPeerByLink({
-					.usernameOrId = channel->username(),
+					.usernameOrId = username,
 				});
 				_shown = nullptr;
 			}
@@ -1194,15 +1601,19 @@ void Instance::processOpenChannel(const QString &context) {
 void Instance::processJoinChannel(const QString &context) {
 	if (!_shownSession) {
 		return;
-	} else if (const auto channelId = ChannelId(context.toLongLong())) {
+	}
+	const auto parsed = ParseNativeIvChannelContext(context);
+	if (const auto channelId = ChannelId(parsed.channelId)) {
 		const auto channel = _shownSession->data().channel(channelId);
 		_joining[_shownSession].emplace(channel);
 		if (channel->isLoaded()) {
 			_shownSession->api().joinChannel(channel);
-		} else if (!channel->username().isEmpty()) {
+		} else if (const auto username = ResolveNativeIvChannelUsername(
+				channel->username(),
+				parsed.username); !username.isEmpty()) {
 			if (const auto controller = _shownSession->tryResolveWindow(channel)) {
 				controller->showPeerByLink({
-					.usernameOrId = channel->username(),
+					.usernameOrId = username,
 					.joinChannel = true,
 				});
 			}
@@ -1222,6 +1633,12 @@ bool Instance::closeActive() {
 		_tonSite = nullptr;
 		return true;
 	}
+	for (auto &[key, controller] : _markdowns) {
+		if (controller->active()) {
+			_markdowns.take(key);
+			return true;
+		}
+	}
 	return false;
 }
 
diff --git a/Telegram/SourceFiles/iv/iv_instance.h b/Telegram/SourceFiles/iv/iv_instance.h
index c48cf569ee363d..44c22e61e2eec1 100644
--- a/Telegram/SourceFiles/iv/iv_instance.h
+++ b/Telegram/SourceFiles/iv/iv_instance.h
@@ -7,25 +7,37 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "data/data_msg_id.h"
 #include "iv/iv_delegate.h"
 
+#include <vector>
+
 namespace Main {
 class Session;
 class SessionShow;
 } // namespace Main
 
+class HistoryItem;
+
 namespace Window {
 class SessionController;
 } // namespace Window
 
+namespace Iv::Markdown {
+class Controller;
+} // namespace Iv::Markdown
+
 namespace Iv {
 
 class Data;
+struct RichPage;
 class Shown;
 class TonSite;
 
 class Instance final {
 public:
+	using RichMessageResolved = Fn<void(std::shared_ptr<const RichPage>)>;
+
 	explicit Instance(not_null<Delegate*> delegate);
 	~Instance();
 
@@ -55,6 +67,19 @@ class Instance final {
 		const QString &uri,
 		QVariant context = {});
 
+	void showRichMessage(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item,
+		QString initialFragment = QString());
+	void resolveRichMessage(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item,
+		RichMessageResolved done);
+
+	bool showMarkdown(
+		const QString &path,
+		QVariant context = {});
+
 	[[nodiscard]] bool hasActiveWindow(
 		not_null<Main::Session*> session) const;
 
@@ -71,17 +96,76 @@ class Instance final {
 		WebPageData *page = nullptr;
 		int32 hash = 0;
 	};
+	struct ProcessReceivedPageResult {
+		WebPageData *page = nullptr;
+		bool articleChanged = false;
+	};
+	struct RichMessageGeneration {
+		std::shared_ptr<const RichPage> inlinePage;
+		std::shared_ptr<const RichPage> fullPage;
+		uint64 fullPageVersion = 0;
+	};
+	struct RichMessageRequest {
+		crl::time lastRequestedAt = 0;
+		RichMessageGeneration generation;
+		uint64 token = 0;
+		mtpRequestId requestId = 0;
+		std::vector<RichMessageResolved> callbacks;
+	};
+	struct ProcessReceivedRichMessageResult {
+		std::shared_ptr<const RichPage> page;
+		bool notifyCallbacks = true;
+	};
+
+	[[nodiscard]] static RichMessageGeneration CaptureRichMessageGeneration(
+		not_null<HistoryItem*> item);
+	[[nodiscard]] static bool MatchesRichMessageGeneration(
+		not_null<HistoryItem*> item,
+		const RichMessageGeneration &generation);
 
 	void processOpenChannel(const QString &context);
 	void processJoinChannel(const QString &context);
+	void showOpenedPage(
+		not_null<Main::Session*> session,
+		not_null<Data*> data,
+		QString hash,
+		bool requestFullOnOpen);
+	void primeFullRequest(
+		not_null<Main::Session*> session,
+		not_null<Data*> data);
 	void requestFull(not_null<Main::Session*> session, const QString &id);
+	void showRichMessage(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item,
+		std::shared_ptr<const RichPage> page,
+		QString initialFragment = QString());
+	void finishRichMessageRequest(
+		not_null<Main::Session*> session,
+		FullMsgId itemId,
+		uint64 token,
+		std::shared_ptr<const RichPage> page,
+		bool notifyCallbacks = true);
 
 	void trackSession(not_null<Main::Session*> session);
+	void bindMarkdown(
+		const QString &key,
+		not_null<Main::Session*> session,
+		FullMsgId itemId);
+	void closeMarkdownsForItem(
+		not_null<Main::Session*> session,
+		FullMsgId itemId);
+	void closeMarkdownsForSession(not_null<Main::Session*> session);
+	void closeSessionDataViews(not_null<Main::Session*> session);
 
-	WebPageData *processReceivedPage(
+	ProcessReceivedPageResult processReceivedPage(
 		not_null<Main::Session*> session,
 		const QString &url,
 		const MTPmessages_WebPage &result);
+	ProcessReceivedRichMessageResult processReceivedRichMessage(
+		not_null<Main::Session*> session,
+		FullMsgId itemId,
+		const RichMessageGeneration &generation,
+		const MTPmessages_Messages &result);
 
 	const not_null<Delegate*> _delegate;
 
@@ -94,6 +178,10 @@ class Instance final {
 	base::flat_map<
 		not_null<Main::Session*>,
 		base::flat_map<QString, FullResult>> _fullRequested;
+	base::flat_map<
+		not_null<Main::Session*>,
+		base::flat_map<FullMsgId, RichMessageRequest>> _richMessageRequested;
+	uint64 _nextRichMessageRequestToken = 0;
 
 	base::flat_map<
 		not_null<Main::Session*>,
@@ -104,6 +192,16 @@ class Instance final {
 
 	std::unique_ptr<TonSite> _tonSite;
 
+	struct MarkdownBinding {
+		Main::Session *session = nullptr;
+		FullMsgId itemId;
+	};
+
+	base::flat_map<
+		QString,
+		std::unique_ptr<Markdown::Controller>> _markdowns;
+	base::flat_map<QString, MarkdownBinding> _markdownBindings;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/iv/iv_pch.h b/Telegram/SourceFiles/iv/iv_pch.h
index 4ad8da65a94a5f..15ad9d2fe7417a 100644
--- a/Telegram/SourceFiles/iv/iv_pch.h
+++ b/Telegram/SourceFiles/iv/iv_pch.h
@@ -22,9 +22,9 @@ For license and copyright information please follow this link:
 
 #include "base/flat_map.h"
 #include "base/flat_set.h"
+#include "base/weak_qptr.h"
 
 #include "ui/qt_object_factory.h"
-#include "ui/qt_weak_factory.h"
 
 #include "scheme.h"
 #include "logs.h"
diff --git a/Telegram/SourceFiles/iv/iv_prepare.cpp b/Telegram/SourceFiles/iv/iv_prepare.cpp
deleted file mode 100644
index 2f8a5398b03906..00000000000000
--- a/Telegram/SourceFiles/iv/iv_prepare.cpp
+++ /dev/null
@@ -1,1272 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "iv/iv_prepare.h"
-
-#include "base/openssl_help.h"
-#include "base/unixtime.h"
-#include "iv/iv_data.h"
-#include "lang/lang_keys.h"
-#include "ui/image/image_prepare.h"
-#include "ui/grouped_layout.h"
-#include "styles/palette.h"
-#include "styles/style_chat.h"
-
-#include <QtCore/QSize>
-
-namespace Iv {
-namespace {
-
-struct Attribute {
-	QByteArray name;
-	std::optional<QByteArray> value;
-};
-using Attributes = std::vector<Attribute>;
-
-struct Photo {
-	uint64 id = 0;
-	int width = 0;
-	int height = 0;
-	QByteArray minithumbnail;
-};
-
-struct Document {
-	uint64 id = 0;
-	int width = 0;
-	int height = 0;
-	QByteArray minithumbnail;
-};
-
-template <typename T, typename = std::enable_if_t<std::is_arithmetic_v<T>>>
-[[nodiscard]] QByteArray Number(T value) {
-	return QByteArray::number(value);
-}
-
-template <typename T, typename = std::enable_if_t<std::is_arithmetic_v<T>>>
-[[nodiscard]] QByteArray Percent(T value) {
-	return Number(base::SafeRound(value * 10000.) / 100.);
-};
-
-[[nodiscard]] QByteArray Escape(QByteArray value) {
-	auto result = QByteArray();
-	result.reserve(value.size());
-	for (const auto &ch : value) {
-		switch (ch) {
-		case '&': result.append("&amp;"); break;
-		case '<': result.append("&lt;"); break;
-		case '>': result.append("&gt;"); break;
-		case '"': result.append("&quot;"); break;
-		case '\'': result.append("&apos;"); break;
-		default: result.append(ch); break;
-		}
-	}
-	return result;
-}
-
-[[nodiscard]] QByteArray Date(TimeId date) {
-	return Escape(langDateTimeFull(base::unixtime::parse(date)).toUtf8());
-}
-
-class Parser final {
-public:
-	Parser(const Source &source, const Options &options);
-
-	[[nodiscard]] Prepared result();
-
-private:
-	void process(const Source &source);
-	void process(const MTPPhoto &photo);
-	void process(const MTPDocument &document);
-
-	template <typename Inner>
-	[[nodiscard]] QByteArray list(const MTPVector<Inner> &data);
-
-	[[nodiscard]] QByteArray collage(
-		const QVector<MTPPageBlock> &list,
-		const std::vector<QSize> &dimensions,
-		int offset = 0);
-	[[nodiscard]] QByteArray slideshow(
-		const QVector<MTPPageBlock> &list,
-		QSize dimensions);
-
-	[[nodiscard]] QByteArray block(const MTPDpageBlockUnsupported &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockTitle &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockSubtitle &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockAuthorDate &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockHeader &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockSubheader &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockParagraph &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockPreformatted &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockFooter &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockDivider &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockAnchor &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockList &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockBlockquote &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockPullquote &data);
-	[[nodiscard]] QByteArray block(
-		const MTPDpageBlockPhoto &data,
-		const Ui::GroupMediaLayout &layout = {},
-		QSize outer = {});
-	[[nodiscard]] QByteArray block(
-		const MTPDpageBlockVideo &data,
-		const Ui::GroupMediaLayout &layout = {},
-		QSize outer = {});
-	[[nodiscard]] QByteArray block(const MTPDpageBlockCover &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockEmbed &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockEmbedPost &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockCollage &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockSlideshow &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockChannel &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockAudio &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockKicker &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockTable &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockOrderedList &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockDetails &data);
-	[[nodiscard]] QByteArray block(
-		const MTPDpageBlockRelatedArticles &data);
-	[[nodiscard]] QByteArray block(const MTPDpageBlockMap &data);
-
-	[[nodiscard]] QByteArray block(const MTPDpageRelatedArticle &data);
-
-	[[nodiscard]] QByteArray block(const MTPDpageTableRow &data);
-	[[nodiscard]] QByteArray block(const MTPDpageTableCell &data);
-
-	[[nodiscard]] QByteArray block(const MTPDpageListItemText &data);
-	[[nodiscard]] QByteArray block(const MTPDpageListItemBlocks &data);
-
-	[[nodiscard]] QByteArray block(const MTPDpageListOrderedItemText &data);
-	[[nodiscard]] QByteArray block(
-		const MTPDpageListOrderedItemBlocks &data);
-
-	[[nodiscard]] QByteArray wrap(const QByteArray &content, int views);
-
-	[[nodiscard]] QByteArray tag(
-		const QByteArray &name,
-		const QByteArray &body = {});
-	[[nodiscard]] QByteArray tag(
-		const QByteArray &name,
-		const Attributes &attributes,
-		const QByteArray &body = {});
-	[[nodiscard]] QByteArray utf(const MTPstring &text);
-	[[nodiscard]] QByteArray utf(const tl::conditional<MTPstring> &text);
-	[[nodiscard]] QByteArray rich(const MTPRichText &text);
-	[[nodiscard]] QByteArray caption(const MTPPageCaption &caption);
-
-	[[nodiscard]] Photo parse(const MTPPhoto &photo);
-	[[nodiscard]] Document parse(const MTPDocument &document);
-	[[nodiscard]] Geo parse(const MTPGeoPoint &geo);
-
-	[[nodiscard]] Photo photoById(uint64 id);
-	[[nodiscard]] Document documentById(uint64 id);
-
-	[[nodiscard]] QByteArray photoFullUrl(const Photo &photo);
-	[[nodiscard]] QByteArray documentFullUrl(const Document &document);
-	[[nodiscard]] QByteArray embedUrl(const QByteArray &html);
-	[[nodiscard]] QByteArray mapUrl(
-		const Geo &geo,
-		int width,
-		int height,
-		int zoom);
-	[[nodiscard]] QByteArray resource(QByteArray id);
-
-	[[nodiscard]] std::vector<QSize> computeCollageDimensions(
-		const QVector<MTPPageBlock> &items);
-	[[nodiscard]] QSize computeSlideshowDimensions(
-		const QVector<MTPPageBlock> &items);
-
-	//const Options _options;
-	const QByteArray _fileOriginPostfix;
-
-	base::flat_set<QByteArray> _resources;
-
-	Prepared _result;
-
-	base::flat_map<uint64, Photo> _photosById;
-	base::flat_map<uint64, Document> _documentsById;
-
-};
-
-[[nodiscard]] bool IsVoidElement(const QByteArray &name) {
-	// Thanks https://developer.mozilla.org/en-US/docs/Glossary/Void_element
-	static const auto voids = base::flat_set<QByteArray>{
-		"area"_q,
-		"base"_q,
-		"br"_q,
-		"col"_q,
-		"embed"_q,
-		"hr"_q,
-		"img"_q,
-		"input"_q,
-		"link"_q,
-		"meta"_q,
-		"source"_q,
-		"track"_q,
-		"wbr"_q,
-	};
-	return voids.contains(name);
-}
-
-[[nodiscard]] QByteArray ArrowSvg(bool left) {
-	const auto rotate = QByteArray(left ? "180" : "0");
-	return R"(
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-	<path
-		d="M14.9972363,18 L9.13865768,12.1414214 C9.06055283,12.0633165 9.06055283,11.9366835 9.13865768,11.8585786 L14.9972363,6 L14.9972363,6"
-		transform="translate(11.997236, 12) scale(-1, -1) rotate()" + rotate + ") translate(-11.997236, -12)" + R"(">
-	</path>
-</svg>)";
-}
-
-Parser::Parser(const Source &source, const Options &options)
-: /*_options(options)
-, */_fileOriginPostfix('/' + Number(source.pageId)) {
-	process(source);
-	_result.pageId = source.pageId;
-	_result.name = source.name;
-	_result.rtl = source.page.data().is_rtl();
-
-	const auto views = std::max(
-		source.page.data().vviews().value_or_empty(),
-		source.updatedCachedViews);
-	const auto content = list(source.page.data().vblocks());
-	_result.content = wrap(content, views);
-}
-
-Prepared Parser::result() {
-	return _result;
-}
-
-void Parser::process(const Source &source) {
-	const auto &data = source.page.data();
-	for (const auto &photo : data.vphotos().v) {
-		process(photo);
-	}
-	for (const auto &document : data.vdocuments().v) {
-		process(document);
-	}
-	if (source.webpagePhoto) {
-		process(*source.webpagePhoto);
-	}
-	if (source.webpageDocument) {
-		process(*source.webpageDocument);
-	}
-}
-
-void Parser::process(const MTPPhoto &photo) {
-	_photosById.emplace(
-		photo.match([](const auto &data) { return data.vid().v; }),
-		parse(photo));
-}
-
-void Parser::process(const MTPDocument &document) {
-	_documentsById.emplace(
-		document.match([](const auto &data) { return data.vid().v; }),
-		parse(document));
-}
-
-template <typename Inner>
-QByteArray Parser::list(const MTPVector<Inner> &data) {
-	auto result = QByteArrayList();
-	result.reserve(data.v.size());
-	for (const auto &item : data.v) {
-		result.append(item.match([&](const auto &data) {
-			return block(data);
-		}));
-	}
-	return result.join(QByteArray());
-}
-
-QByteArray Parser::collage(
-		const QVector<MTPPageBlock> &list,
-		const std::vector<QSize> &dimensions,
-		int offset) {
-	Expects(list.size() == dimensions.size());
-
-	constexpr auto kPerCollage = 10;
-	const auto last = (offset + kPerCollage >= int(dimensions.size()));
-
-	auto result = QByteArray();
-	auto slice = ((offset > 0) || (dimensions.size() > kPerCollage))
-		? (dimensions
-			| ranges::views::drop(offset)
-			| ranges::views::take(kPerCollage)
-			| ranges::to_vector)
-		: dimensions;
-	const auto layout = Ui::LayoutMediaGroup(
-		slice,
-		st::historyGroupWidthMax,
-		st::historyGroupWidthMin,
-		st::historyGroupSkip);
-	auto size = QSize();
-	for (const auto &part : layout) {
-		const auto &rect = part.geometry;
-		size = QSize(
-			std::max(size.width(), rect.x() + rect.width()),
-			std::max(size.height(), rect.y() + rect.height()));
-	}
-	for (auto i = 0, count = int(layout.size()); i != count; ++i) {
-		const auto &part = layout[i];
-		list[offset + i].match([&](const MTPDpageBlockPhoto &data) {
-			result += block(data, part, size);
-		}, [&](const MTPDpageBlockVideo &data) {
-			result += block(data, part, size);
-		}, [](const auto &) {
-			Unexpected("Block type in collage layout.");
-		});
-	}
-	const auto aspectHeight = size.height() / float64(size.width());
-	const auto aspectSkip = st::historyGroupSkip / float64(size.width());
-	auto wrapped = tag("figure", {
-		{ "class", "collage" },
-		{
-			"style",
-			("padding-top: " + Percent(aspectHeight) + "%; "
-				+ "margin-bottom: " + Percent(last ? 0 : aspectSkip) + "%;")
-		},
-	}, result);
-	if (offset + kPerCollage < int(dimensions.size())) {
-		wrapped += collage(list, dimensions, offset + kPerCollage);
-	}
-	return wrapped;
-}
-
-QByteArray Parser::slideshow(
-		const QVector<MTPPageBlock> &list,
-		QSize dimensions) {
-	auto result = QByteArray();
-	for (auto i = 0, count = int(list.size()); i != count; ++i) {
-		list[i].match([&](const MTPDpageBlockPhoto &data) {
-			result += block(data, {}, dimensions);
-		}, [&](const MTPDpageBlockVideo &data) {
-			result += block(data, {}, dimensions);
-		}, [](const auto &) {
-			Unexpected("Block type in collage layout.");
-		});
-	}
-
-	auto inputs = QByteArrayList();
-	for (auto i = 0; i != int(list.size()); ++i) {
-		auto attributes = Attributes{
-			{ "type", "radio" },
-			{ "name", "s" },
-			{ "value", Number(i) },
-			{ "onchange", "return IV.slideshowSlide(this);" },
-		};
-		if (!i) {
-			attributes.push_back({ "checked", std::nullopt });
-		}
-		inputs.append(tag("label", tag("input", attributes, tag("i"))));
-	}
-	const auto form = tag(
-		"form",
-		{ { "class", "slideshow-buttons" } },
-		tag("fieldset", inputs.join(QByteArray())));
-	const auto navigation = tag("a", {
-		{ "class", "slideshow-prev" },
-		{ "onclick", "IV.slideshowSlide(this, -1);" },
-	}, ArrowSvg(true)) + tag("a", {
-		{ "class", "slideshow-next" },
-		{ "onclick", "IV.slideshowSlide(this, 1);" },
-	}, ArrowSvg(false));
-	auto wrapStyle = "padding-top: calc(min("
-		+ Percent(dimensions.height() / float64(dimensions.width()))
-		+ "%, 480px));";
-	result = form + tag("figure", {
-		{ "class", "slideshow" },
-	}, result) + navigation;
-	return tag("figure", {
-		{ "class", "slideshow-wrap" },
-		{ "style", wrapStyle },
-	}, result);
-}
-
-QByteArray Parser::block(const MTPDpageBlockUnsupported &data) {
-	return QByteArray();
-}
-
-QByteArray Parser::block(const MTPDpageBlockTitle &data) {
-	return tag("h1", { { "class", "title" } }, rich(data.vtext()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockSubtitle &data) {
-	return tag("h2", { { "class", "subtitle" } }, rich(data.vtext()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockAuthorDate &data) {
-	auto inner = rich(data.vauthor());
-	if (const auto date = data.vpublished_date().v) {
-		inner += " \xE2\x80\xA2 " + tag("time", Date(date));
-	}
-	return tag("address", inner);
-}
-
-QByteArray Parser::block(const MTPDpageBlockHeader &data) {
-	return tag("h3", { { "class", "header" } }, rich(data.vtext()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockSubheader &data) {
-	return tag("h4", { { "class", "subheader" } }, rich(data.vtext()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockParagraph &data) {
-	return tag("p", rich(data.vtext()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockPreformatted &data) {
-	auto list = Attributes();
-	const auto language = utf(data.vlanguage());
-	if (!language.isEmpty()) {
-		list.push_back({ "data-language", language });
-		list.push_back({ "class", "lang-" + language });
-		_result.hasCode = true;
-	}
-	return tag("pre", list, rich(data.vtext()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockFooter &data) {
-	return tag("footer", { { "class", "footer" } }, rich(data.vtext()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockDivider &data) {
-	return tag("hr", Attributes{ { "class", "divider" } });
-}
-
-QByteArray Parser::block(const MTPDpageBlockAnchor &data) {
-	return tag("a", { { "name", utf(data.vname()) } });
-}
-
-QByteArray Parser::block(const MTPDpageBlockList &data) {
-	return tag("ul", list(data.vitems()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockBlockquote &data) {
-	const auto caption = rich(data.vcaption());
-	const auto cite = caption.isEmpty()
-		? QByteArray()
-		: tag("cite", caption);
-	return tag("blockquote", rich(data.vtext()) + cite);
-}
-
-QByteArray Parser::block(const MTPDpageBlockPullquote &data) {
-	const auto caption = rich(data.vcaption());
-	const auto cite = caption.isEmpty()
-		? QByteArray()
-		: tag("cite", caption);
-	return tag(
-		"div",
-		{ { "class", "pullquote" } },
-		rich(data.vtext()) + cite);
-}
-
-QByteArray Parser::block(
-		const MTPDpageBlockPhoto &data,
-		const Ui::GroupMediaLayout &layout,
-		QSize outer) {
-	const auto collage = !layout.geometry.isEmpty();
-	const auto slideshow = !collage && !outer.isEmpty();
-	const auto photo = photoById(data.vphoto_id().v);
-	if (!photo.id) {
-		return "Photo not found.";
-	}
-	const auto src = photoFullUrl(photo);
-	auto wrapStyle = QByteArray();
-	if (collage) {
-		const auto wcoef = 1. / outer.width();
-		const auto hcoef = 1. / outer.height();
-		wrapStyle += "left: " + Percent(layout.geometry.x() * wcoef) + "%; "
-			+ "top: " + Percent(layout.geometry.y() * hcoef) + "%; "
-			+ "width: " + Percent(layout.geometry.width() * wcoef) + "%; "
-			+ "height: " + Percent(layout.geometry.height() * hcoef) + "%";
-	} else if (!slideshow && photo.width) {
-		wrapStyle += "max-width:" + Number(photo.width) + "px";
-	}
-	const auto dimension = collage
-		? (layout.geometry.height() / float64(layout.geometry.width()))
-		: (photo.width && photo.height)
-		? (photo.height / float64(photo.width))
-		: (3 / 4.);
-	const auto paddingTop = collage
-		? Percent(dimension) + "%"
-		: "calc(min(480px, " + Percent(dimension) + "%))";
-	const auto style = "background-image:url('" + src + "');"
-		"padding-top: " + paddingTop + ";";
-	auto inner = tag("div", {
-		{ "class", "photo" },
-		{ "style", style } });
-	const auto minithumb = Images::ExpandInlineBytes(photo.minithumbnail);
-	if (!minithumb.isEmpty()) {
-		const auto image = Images::Read({ .content = minithumb });
-		inner = tag("div", {
-			{ "class", "photo-bg" },
-			{ "style", "background-image:url('data:image/jpeg;base64,"
-				+ minithumb.toBase64()
-				+ "');" },
-		}) + inner;
-	}
-	auto attributes = Attributes{
-		{ "class", "photo-wrap" },
-		{ "style", wrapStyle }
-	};
-	auto result = tag("div", attributes, inner);
-
-	const auto href = data.vurl() ? utf(*data.vurl()) : photoFullUrl(photo);
-	const auto id = Number(photo.id);
-	result = tag("a", {
-		{ "href", href },
-		{ "oncontextmenu", data.vurl() ? QByteArray() : "return false;" },
-		{ "data-context", data.vurl() ? QByteArray() : "viewer-photo" + id },
-	}, result);
-	if (!slideshow) {
-		result += caption(data.vcaption());
-		if (!collage) {
-			result = tag("div", { { "class", "media-outer" } }, result);
-		}
-	}
-	return result;
-}
-
-QByteArray Parser::block(
-		const MTPDpageBlockVideo &data,
-		const Ui::GroupMediaLayout &layout,
-		QSize outer) {
-	const auto collage = !layout.geometry.isEmpty();
-	const auto slideshow = !collage && !outer.isEmpty();
-	const auto collageSmall = collage
-		&& (layout.geometry.width() < outer.width());
-	const auto video = documentById(data.vvideo_id().v);
-	if (!video.id) {
-		return "Video not found.";
-	}
-	auto inner = tag("div", {
-		{ "class", "video" },
-		{ "data-src", documentFullUrl(video) },
-		{ "data-autoplay", data.is_autoplay() ? "1" : "0" },
-		{ "data-loop", data.is_loop() ? "1" : "0" },
-		{ "data-small", collageSmall ? "1" : "0" },
-	});
-	const auto minithumb = Images::ExpandInlineBytes(video.minithumbnail);
-	if (!minithumb.isEmpty()) {
-		const auto image = Images::Read({ .content = minithumb });
-		inner = tag("div", {
-			{ "class", "video-bg" },
-			{ "style", "background-image:url('data:image/jpeg;base64,"
-				+ minithumb.toBase64()
-				+ "');" },
-		}) + inner;
-	}
-	auto wrapStyle = QByteArray();
-	if (collage) {
-		const auto wcoef = 1. / outer.width();
-		const auto hcoef = 1. / outer.height();
-		wrapStyle += "left: " + Percent(layout.geometry.x() * wcoef) + "%; "
-			+ "top: " + Percent(layout.geometry.y() * hcoef) + "%; "
-			+ "width: " + Percent(layout.geometry.width() * wcoef) + "%; "
-			+ "height: " + Percent(layout.geometry.height() * hcoef) + "%; ";
-	} else {
-		const auto dimension = (video.width && video.height)
-			? (video.height / float64(video.width))
-			: (3 / 4.);
-		wrapStyle += "padding-top: calc(min(480px, "
-			+ Percent(dimension)
-			+ "%));";
-	}
-	auto attributes = Attributes{
-		{ "class", "video-wrap" },
-		{ "style", wrapStyle },
-	};
-	auto result = tag("div", attributes, inner);
-	if (data.is_autoplay() || collageSmall) {
-		const auto id = Number(video.id);
-		const auto href = resource("video" + id);
-		result = tag("a", {
-			{ "href", href },
-			{ "oncontextmenu", "return false;" },
-			{ "data-context", "viewer-video" + id },
-		}, result);
-	}
-	if (!slideshow) {
-		result += caption(data.vcaption());
-		if (!collage) {
-			result = tag("div", { { "class", "media-outer" } }, result);
-		}
-	}
-	return result;
-}
-
-QByteArray Parser::block(const MTPDpageBlockCover &data) {
-	return tag("figure", data.vcover().match([&](const auto &data) {
-		return block(data);
-	}));
-}
-
-QByteArray Parser::block(const MTPDpageBlockEmbed &data) {
-	_result.hasEmbeds = true;
-	auto eclass = data.is_full_width() ? QByteArray() : "nowide";
-	auto width = QByteArray();
-	auto height = QByteArray();
-	auto iframeWidth = QByteArray();
-	auto iframeHeight = QByteArray();
-	const auto autosize = !data.vw();
-	if (autosize) {
-		iframeWidth = "100%";
-		eclass = "nowide";
-	} else if (data.is_full_width() || !data.vw()->v) {
-		width = "100%";
-		height = Number(data.vh()->v) + "px";
-		iframeWidth = "100%";
-		iframeHeight = height;
-	} else {
-		width = Number(data.vw()->v) + "px";
-		height = Percent(data.vh()->v / float64(data.vw()->v)) + "%";
-	}
-	auto attributes = Attributes();
-	if (autosize) {
-		attributes.push_back({ "class", "autosize" });
-	}
-	attributes.push_back({ "width", iframeWidth });
-	attributes.push_back({ "height", iframeHeight });
-	if (const auto url = data.vurl()) {
-		if (!autosize) {
-			attributes.push_back({ "src", utf(url) });
-		} else {
-			attributes.push_back({ "srcdoc", utf(url) });
-		}
-	} else if (const auto html = data.vhtml()) {
-		attributes.push_back({ "src", embedUrl(html->v) });
-	}
-	if (!data.is_allow_scrolling()) {
-		attributes.push_back({ "scrolling", "no" });
-	}
-	attributes.push_back({ "frameborder", "0" });
-	attributes.push_back({ "allowtransparency", "true" });
-	attributes.push_back({ "allowfullscreen", "true" });
-	auto result = tag("iframe", attributes);
-	if (!autosize) {
-		result = tag("div", {
-			{ "class", "iframe-wrap" },
-			{ "style", "width:" + width },
-		}, tag("div", {
-			{ "style", "padding-bottom: " + height },
-		}, result));
-	}
-	result += caption(data.vcaption());
-	return tag("figure", { { "class", eclass } }, result);
-}
-
-QByteArray Parser::block(const MTPDpageBlockEmbedPost &data) {
-	auto result = QByteArray();
-	if (!data.vblocks().v.isEmpty()) {
-		auto address = QByteArray();
-		const auto photo = photoById(data.vauthor_photo_id().v);
-		if (photo.id) {
-			const auto src = photoFullUrl(photo);
-			address += tag(
-				"figure",
-				{ { "style", "background-image:url('" + src + "')" } });
-		}
-		address += tag(
-			"a",
-			{ { "rel", "author" }, { "onclick", "return false;" } },
-			utf(data.vauthor()));
-		if (const auto date = data.vdate().v) {
-			const auto parsed = base::unixtime::parse(date);
-			address += tag("time", Date(date));
-		}
-		const auto inner = tag("address", address) + list(data.vblocks());
-		result = tag("blockquote", { { "class", "embed-post" } }, inner);
-	} else {
-		const auto url = utf(data.vurl());
-		const auto inner = tag("strong", utf(data.vauthor()))
-			+ tag(
-				"small",
-				tag("a", { { "href", url } }, url));
-		result = tag("section", { { "class", "embed-post" } }, inner);
-	}
-	result += caption(data.vcaption());
-	return tag("figure", result);
-}
-
-QByteArray Parser::block(const MTPDpageBlockCollage &data) {
-	const auto &items = data.vitems().v;
-	const auto dimensions = computeCollageDimensions(items);
-	if (dimensions.empty()) {
-		return tag(
-			"figure",
-			tag("figure", list(data.vitems())) + caption(data.vcaption()));
-	}
-
-	return tag(
-		"figure",
-		{ { "class", "collage-wrap" } },
-		collage(items, dimensions) + caption(data.vcaption()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockSlideshow &data) {
-	const auto &items = data.vitems().v;
-	const auto dimensions = computeSlideshowDimensions(items);
-	if (dimensions.isEmpty()) {
-		return list(data.vitems());
-	}
-	const auto result = slideshow(items, dimensions);
-	return tag("figure", result + caption(data.vcaption()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockChannel &data) {
-	auto name = QByteArray();
-	auto username = QByteArray();
-	auto id = data.vchannel().match([](const auto &data) {
-		return Number(data.vid().v);
-	});
-	data.vchannel().match([&](const MTPDchannel &data) {
-		if (const auto has = data.vusername()) {
-			username = utf(*has);
-		}
-		name = utf(data.vtitle());
-	}, [&](const MTPDchat &data) {
-		name = utf(data.vtitle());
-	}, [](const auto &) {
-	});
-	auto result = tag(
-		"div",
-		{ { "class", "join" }, { "data-context", "join_link" + id } },
-		tag("span")
-	) + tag("h4", name);
-	const auto link = username.isEmpty()
-		? "javascript:alert('Channel Link');"
-		: "https://t.me/" + username;
-	result = tag(
-		"a",
-		{ { "href", link }, { "data-context", "channel" + id } },
-		result);
-	_result.channelIds.emplace(id);
-	return tag("section", {
-		{ "class", "channel joined" },
-		{ "data-context", "channel" + id },
-	}, result);
-}
-
-QByteArray Parser::block(const MTPDpageBlockAudio &data) {
-	const auto audio = documentById(data.vaudio_id().v);
-	if (!audio.id) {
-		return "Audio not found.";
-	}
-	const auto src = documentFullUrl(audio);
-	return tag("figure", tag("audio", {
-		{ "src", src },
-		{ "oncontextmenu", "return false;" },
-		{ "controls", std::nullopt },
-	}) + caption(data.vcaption()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockKicker &data) {
-	return tag("h5", { { "class", "kicker" } }, rich(data.vtext()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockTable &data) {
-	auto classes = QByteArrayList();
-	if (data.is_bordered()) {
-		classes.push_back("bordered");
-	}
-	if (data.is_striped()) {
-		classes.push_back("striped");
-	}
-	auto attibutes = Attributes();
-	if (!classes.isEmpty()) {
-		attibutes.push_back({ "class", classes.join(" ") });
-	}
-	auto title = rich(data.vtitle());
-	if (!title.isEmpty()) {
-		title = tag("caption", title);
-	}
-	auto result = tag("table", attibutes, title + list(data.vrows()));
-	result = tag("figure", { { "class", "table" } }, result);
-	result = tag("figure", { { "class", "table-wrap" } }, result);
-	return tag("figure", result);
-}
-
-QByteArray Parser::block(const MTPDpageBlockOrderedList &data) {
-	return tag("ol", list(data.vitems()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockDetails &data) {
-	auto attributes = Attributes();
-	if (data.is_open()) {
-		attributes.push_back({ "open", std::nullopt });
-	}
-	return tag(
-		"details",
-		attributes,
-		tag("summary", rich(data.vtitle())) + list(data.vblocks()));
-}
-
-QByteArray Parser::block(const MTPDpageBlockRelatedArticles &data) {
-	const auto result = list(data.varticles());
-	if (result.isEmpty()) {
-		return QByteArray();
-	}
-	auto title = rich(data.vtitle());
-	if (!title.isEmpty()) {
-		title = tag("h4", { { "class", "related-title" } }, title);
-	}
-	return tag("section", { { "class", "related" } }, title + result);
-}
-
-QByteArray Parser::block(const MTPDpageBlockMap &data) {
-	const auto geo = parse(data.vgeo());
-	if (!geo.access) {
-		return "Map not found.";
-	}
-	const auto width = 650;
-	const auto height = std::min(450, (data.vh().v * width / data.vw().v));
-	return tag("figure", tag("img", {
-		{ "src", mapUrl(geo, width, height, data.vzoom().v) },
-	}) + caption(data.vcaption()));
-}
-
-QByteArray Parser::block(const MTPDpageRelatedArticle &data) {
-	auto result = QByteArray();
-	const auto photo = photoById(data.vphoto_id().value_or_empty());
-	if (photo.id) {
-		const auto src = photoFullUrl(photo);
-		result += tag("i", {
-			{ "class", "related-link-thumb" },
-			{ "style", "background-image:url('" + src + "')" },
-		});
-	}
-	const auto title = data.vtitle();
-	const auto description = data.vdescription();
-	const auto author = data.vauthor();
-	const auto published = data.vpublished_date();
-	if (title || description || author || published) {
-		auto inner = QByteArray();
-		if (title) {
-			inner += tag(
-				"span",
-				{ { "class", "related-link-title" } },
-				utf(*title));
-		}
-		if (description) {
-			inner += tag(
-				"span",
-				{ { "class", "related-link-desc" } },
-				utf(*description));
-		}
-		if (author || published) {
-			inner += tag(
-				"span",
-				{ { "class", "related-link-source" } },
-				((author ? utf(*author) : QByteArray())
-					+ ((author && published) ? ", " : QByteArray())
-					+ (published ? Date(published->v) : QByteArray())));
-		}
-		result += tag("span", {
-			{ "class", "related-link-content" },
-		}, inner);
-	}
-	const auto webpageId = data.vwebpage_id().v;
-	const auto context = webpageId
-		? ("webpage" + Number(webpageId))
-		: QByteArray();
-	return tag("a", {
-		{ "class", "related-link" },
-		{ "href", utf(data.vurl()) },
-		{ "data-context", context },
-	}, result);
-}
-
-QByteArray Parser::block(const MTPDpageTableRow &data) {
-	return tag("tr", list(data.vcells()));
-}
-
-QByteArray Parser::block(const MTPDpageTableCell &data) {
-	const auto text = data.vtext() ? rich(*data.vtext()) : QByteArray();
-	auto style = QByteArray();
-	if (data.is_align_right()) {
-		style += "text-align:right;";
-	} else if (data.is_align_center()) {
-		style += "text-align:center;";
-	} else {
-		style += "text-align:left;";
-	}
-	if (data.is_valign_bottom()) {
-		style += "vertical-align:bottom;";
-	} else if (data.is_valign_middle()) {
-		style += "vertical-align:middle;";
-	} else {
-		style += "vertical-align:top;";
-	}
-	auto attributes = Attributes{ { "style", style } };
-	if (const auto cs = data.vcolspan()) {
-		attributes.push_back({ "colspan", Number(cs->v) });
-	}
-	if (const auto rs = data.vrowspan()) {
-		attributes.push_back({ "rowspan", Number(rs->v) });
-	}
-	return tag(data.is_header() ? "th" : "td", attributes, text);
-}
-
-QByteArray Parser::block(const MTPDpageListItemText &data) {
-	return tag("li", rich(data.vtext()));
-}
-
-QByteArray Parser::block(const MTPDpageListItemBlocks &data) {
-	return tag("li", list(data.vblocks()));
-}
-
-QByteArray Parser::block(const MTPDpageListOrderedItemText &data) {
-	return tag(
-		"li",
-		{ { "value", utf(data.vnum()) } },
-		rich(data.vtext()));
-}
-
-QByteArray Parser::block(const MTPDpageListOrderedItemBlocks &data) {
-	return tag(
-		"li",
-		{ { "value", utf(data.vnum()) } },
-		list(data.vblocks()));
-}
-
-QByteArray Parser::utf(const MTPstring &text) {
-	return Escape(text.v);
-}
-
-QByteArray Parser::utf(const tl::conditional<MTPstring> &text) {
-	return text ? utf(*text) : QByteArray();
-}
-
-QByteArray Parser::wrap(const QByteArray &content, int views) {
-	const auto sep = " \xE2\x80\xA2 ";
-	const auto viewsText = views
-		? (tr::lng_stories_views(tr::now, lt_count_decimal, views) + sep)
-		: QString();
-	return R"(
-<div class="page-slide">
-	<article>)"_q + content + R"(</article>
-</div>
-<div class="page-footer">
-	<div class="content">
-		)"_q
-		+ viewsText.toUtf8()
-		+ R"(<a class="wrong" data-context="report-iv">)"_q
-		+ tr::lng_iv_wrong_layout(tr::now).toUtf8()
-		+ R"(</a>
-	</div>
-</div>)"_q;
-}
-
-QByteArray Parser::tag(
-		const QByteArray &name,
-		const QByteArray &body) {
-	return tag(name, {}, body);
-}
-
-QByteArray Parser::tag(
-		const QByteArray &name,
-		const Attributes &attributes,
-		const QByteArray &body) {
-	auto list = QByteArrayList();
-	list.reserve(attributes.size());
-	for (auto &[name, value] : attributes) {
-		list.push_back(' ' + name + (value ? "=\"" + *value + "\"" : ""));
-	}
-	const auto serialized = list.join(QByteArray());
-	return (IsVoidElement(name) && body.isEmpty())
-		? ('<' + name + serialized + " />")
-		: ('<' + name + serialized + '>' + body + "</" + name + '>');
-}
-
-QByteArray Parser::rich(const MTPRichText &text) {
-	return text.match([&](const MTPDtextEmpty &data) {
-		return QByteArray();
-	}, [&](const MTPDtextPlain &data) {
-		struct Replacement {
-			QByteArray from;
-			QByteArray to;
-		};
-		const auto replacements = std::vector<Replacement>{
-			{ "\xE2\x81\xA6", "<span dir=\"ltr\">" },
-			{ "\xE2\x81\xA7", "<span dir=\"rtl\">" },
-			{ "\xE2\x81\xA8", "<span dir=\"auto\">" },
-			{ "\xE2\x81\xA9", "</span>" },
-		};
-		auto text = utf(data.vtext());
-		for (const auto &[from, to] : replacements) {
-			text.replace(from, to);
-		}
-		return text;
-	}, [&](const MTPDtextConcat &data) {
-		const auto &list = data.vtexts().v;
-		auto result = QByteArrayList();
-		result.reserve(list.size());
-		for (const auto &item : list) {
-			result.append(rich(item));
-		}
-		return result.join(QByteArray());
-	}, [&](const MTPDtextImage &data) {
-		const auto image = documentById(data.vdocument_id().v);
-		if (!image.id) {
-			return "Image not found."_q;
-		}
-		auto attributes = Attributes{
-			{ "class", "pic" },
-			{ "src", documentFullUrl(image) },
-		};
-		if (const auto width = data.vw().v) {
-			attributes.push_back({ "width", Number(width) });
-		}
-		if (const auto height = data.vh().v) {
-			attributes.push_back({ "height", Number(height) });
-		}
-		return tag("img", attributes);
-	}, [&](const MTPDtextBold &data) {
-		return tag("b", rich(data.vtext()));
-	}, [&](const MTPDtextItalic &data) {
-		return tag("i", rich(data.vtext()));
-	}, [&](const MTPDtextUnderline &data) {
-		return tag("u", rich(data.vtext()));
-	}, [&](const MTPDtextStrike &data) {
-		return tag("s", rich(data.vtext()));
-	}, [&](const MTPDtextFixed &data) {
-		return tag("code", rich(data.vtext()));
-	}, [&](const MTPDtextUrl &data) {
-		const auto webpageId = data.vwebpage_id().v;
-		const auto context = webpageId
-			? ("webpage" + Number(webpageId))
-			: QByteArray();
-		return tag("a", {
-			{ "href", utf(data.vurl()) },
-			{ "class", webpageId ? "internal-iv-link" : "" },
-			{ "data-context", context },
-		}, rich(data.vtext()));
-	}, [&](const MTPDtextEmail &data) {
-		return tag("a", {
-			{ "href", "mailto:" + utf(data.vemail()) },
-		}, rich(data.vtext()));
-	}, [&](const MTPDtextSubscript &data) {
-		return tag("sub", rich(data.vtext()));
-	}, [&](const MTPDtextSuperscript &data) {
-		return tag("sup", rich(data.vtext()));
-	}, [&](const MTPDtextMarked &data) {
-		return tag("mark", rich(data.vtext()));
-	}, [&](const MTPDtextPhone &data) {
-		return tag("a", {
-			{ "href", "tel:" + utf(data.vphone()) },
-		}, rich(data.vtext()));
-	}, [&](const MTPDtextAnchor &data) {
-		const auto inner = rich(data.vtext());
-		const auto name = utf(data.vname());
-		return inner.isEmpty()
-			? tag("a", { { "name", name } })
-			: tag(
-				"span",
-				{ { "class", "reference" } },
-				tag("a", { { "name", name } }) + inner);
-	});
-}
-
-QByteArray Parser::caption(const MTPPageCaption &caption) {
-	auto text = rich(caption.data().vtext());
-	const auto credit = rich(caption.data().vcredit());
-	if (!credit.isEmpty()) {
-		text += tag("cite", credit);
-	} else if (text.isEmpty()) {
-		return QByteArray();
-	}
-	return tag("figcaption", text);
-}
-
-Photo Parser::parse(const MTPPhoto &photo) {
-	auto result = Photo{
-		.id = photo.match([&](const auto &d) { return d.vid().v; }),
-	};
-	auto sizes = base::flat_map<QByteArray, QSize>();
-	photo.match([](const MTPDphotoEmpty &) {
-	}, [&](const MTPDphoto &data) {
-		for (const auto &size : data.vsizes().v) {
-			size.match([&](const MTPDphotoSizeEmpty &data) {
-			}, [&](const MTPDphotoSize &data) {
-				sizes.emplace(
-					data.vtype().v,
-					QSize(data.vw().v, data.vh().v));
-			}, [&](const MTPDphotoCachedSize &data) {
-				sizes.emplace(
-					data.vtype().v,
-					QSize(data.vw().v, data.vh().v));
-			}, [&](const MTPDphotoStrippedSize &data) {
-				result.minithumbnail = data.vbytes().v;
-			}, [&](const MTPDphotoSizeProgressive &data) {
-				sizes.emplace(
-					data.vtype().v,
-					QSize(data.vw().v, data.vh().v));
-			}, [&](const MTPDphotoPathSize &data) {
-			});
-		}
-	});
-	for (const auto attempt : { "y", "x", "w" }) {
-		const auto i = sizes.find(QByteArray(attempt));
-		if (i != end(sizes)) {
-			result.width = i->second.width();
-			result.height = i->second.height();
-			break;
-		}
-	}
-	return result;
-}
-
-Document Parser::parse(const MTPDocument &document) {
-	auto result = Document{
-		.id = document.match([&](const auto &d) { return d.vid().v; }),
-	};
-	document.match([](const MTPDdocumentEmpty &) {
-	}, [&](const MTPDdocument &data) {
-		for (const auto &attribute : data.vattributes().v) {
-			attribute.match([&](const MTPDdocumentAttributeImageSize &data) {
-				result.width = data.vw().v;
-				result.height = data.vh().v;
-			}, [&](const MTPDdocumentAttributeVideo &data) {
-				result.width = data.vw().v;
-				result.height = data.vh().v;
-			}, [](const auto &) {});
-		}
-		if (const auto sizes = data.vthumbs()) {
-			for (const auto &size : sizes->v) {
-				size.match([&](const MTPDphotoStrippedSize &data) {
-					result.minithumbnail = data.vbytes().v;
-				}, [&](const auto &data) {
-				});
-			}
-
-		}
-	});
-	return result;
-}
-
-Geo Parser::parse(const MTPGeoPoint &geo) {
-	return geo.match([](const MTPDgeoPointEmpty &) {
-		return Geo();
-	}, [&](const MTPDgeoPoint &data) {
-		return Geo{
-			.lat = data.vlat().v,
-			.lon = data.vlong().v,
-			.access = data.vaccess_hash().v,
-		};
-	});
-}
-
-Photo Parser::photoById(uint64 id) {
-	const auto i = _photosById.find(id);
-	return (i != end(_photosById)) ? i->second : Photo();
-}
-
-Document Parser::documentById(uint64 id) {
-	const auto i = _documentsById.find(id);
-	return (i != end(_documentsById)) ? i->second : Document();
-}
-
-QByteArray Parser::photoFullUrl(const Photo &photo) {
-	return resource("photo/" + Number(photo.id) + _fileOriginPostfix);
-}
-
-QByteArray Parser::documentFullUrl(const Document &document) {
-	return resource("document/" + Number(document.id) + _fileOriginPostfix);
-}
-
-QByteArray Parser::embedUrl(const QByteArray &html) {
-	auto binary = std::array<uchar, SHA256_DIGEST_LENGTH>{};
-	SHA256(
-		reinterpret_cast<const unsigned char*>(html.data()),
-		html.size(),
-		binary.data());
-	const auto hex = [](uchar value) -> char {
-		return (value >= 10) ? ('a' + (value - 10)) : ('0' + value);
-	};
-	auto result = QByteArray();
-	result.reserve(binary.size() * 2);
-	for (const auto byte : binary) {
-		result.push_back(hex(byte / 16));
-		result.push_back(hex(byte % 16));
-	}
-	result += ".html";
-	_result.embeds.emplace(result, html);
-	return resource("html/" + result);
-}
-
-QByteArray Parser::mapUrl(const Geo &geo, int width, int height, int zoom) {
-	return resource("map/"
-		+ GeoPointId(geo) + "&"
-		+ Number(width) + ","
-		+ Number(height) + "&"
-		+ Number(zoom));
-}
-
-QByteArray Parser::resource(QByteArray id) {
-	return '/' + id;
-}
-
-std::vector<QSize> Parser::computeCollageDimensions(
-		const QVector<MTPPageBlock> &items) {
-	if (items.size() < 2) {
-		return {};
-	}
-	auto result = std::vector<QSize>(items.size());
-	for (auto i = 0, count = int(items.size()); i != count; ++i) {
-		items[i].match([&](const MTPDpageBlockPhoto &data) {
-			const auto photo = photoById(data.vphoto_id().v);
-			if (photo.id && photo.width > 0 && photo.height > 0) {
-				result[i] = QSize(photo.width, photo.height);
-			}
-		}, [&](const MTPDpageBlockVideo &data) {
-			const auto document = documentById(data.vvideo_id().v);
-			if (document.id && document.width > 0 && document.height > 0) {
-				result[i] = QSize(document.width, document.height);
-			}
-		}, [](const auto &) {});
-		if (result[i].isEmpty()) {
-			return {};
-		}
-	}
-	return result;
-}
-
-QSize Parser::computeSlideshowDimensions(
-		const QVector<MTPPageBlock> &items) {
-	if (items.size() < 2) {
-		return {};
-	}
-	auto result = QSize();
-	for (const auto &item : items) {
-		auto size = QSize();
-		item.match([&](const MTPDpageBlockPhoto &data) {
-			const auto photo = photoById(data.vphoto_id().v);
-			if (photo.id && photo.width > 0 && photo.height > 0) {
-				size = QSize(photo.width, photo.height);
-			}
-		}, [&](const MTPDpageBlockVideo &data) {
-			const auto document = documentById(data.vvideo_id().v);
-			if (document.id && document.width > 0 && document.height > 0) {
-				size = QSize(document.width, document.height);
-			}
-		}, [](const auto &) {});
-		if (size.isEmpty()) {
-			return {};
-		} else if (result.height() * size.width()
-			< result.width() * size.height()) {
-			result = size;
-		}
-	}
-	return result;
-}
-
-} // namespace
-
-Prepared Prepare(const Source &source, const Options &options) {
-	auto parser = Parser(source, options);
-	return parser.result();
-}
-
-} // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_prepare.h b/Telegram/SourceFiles/iv/iv_prepare.h
deleted file mode 100644
index ef919db2f75901..00000000000000
--- a/Telegram/SourceFiles/iv/iv_prepare.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-namespace Iv {
-
-struct Options;
-struct Prepared;
-
-struct Source {
-	uint64 pageId = 0;
-	MTPPage page;
-	std::optional<MTPPhoto> webpagePhoto;
-	std::optional<MTPDocument> webpageDocument;
-	QString name;
-	int updatedCachedViews = 0;
-};
-
-[[nodiscard]] Prepared Prepare(const Source &source, const Options &options);
-
-} // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_rich_message_serializer.cpp b/Telegram/SourceFiles/iv/iv_rich_message_serializer.cpp
new file mode 100644
index 00000000000000..d17bde0e1db37e
--- /dev/null
+++ b/Telegram/SourceFiles/iv/iv_rich_message_serializer.cpp
@@ -0,0 +1,1155 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/iv_rich_message_serializer.h"
+
+#include "base/flat_map.h"
+#include "data/data_document.h"
+#include "data/data_photo.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "iv/markdown/iv_markdown_prepare.h"
+#include "iv/markdown/iv_markdown_prepare_links.h"
+#include "iv/markdown/iv_markdown_prepare_serialize.h"
+#include "main/main_session.h"
+#include "ui/text/text_utilities.h"
+
+#include <algorithm>
+
+namespace Iv {
+namespace {
+
+using Block = RichPage::Block;
+using BlockKind = RichPage::BlockKind;
+using GroupedMediaItem = RichPage::GroupedMediaItem;
+using ListKind = RichPage::ListKind;
+using RichText = RichPage::RichText;
+using TableAlignment = RichPage::TableAlignment;
+using TableCell = RichPage::TableCell;
+using TableVerticalAlignment = RichPage::TableVerticalAlignment;
+using TaskState = RichPage::TaskState;
+
+constexpr auto kDefaultMapWidth = 400;
+constexpr auto kDefaultMapHeight = 200;
+constexpr auto kNoEntityIndex = -1;
+
+[[nodiscard]] QString FormulaTexFromSource(QString source) {
+	source = source.trimmed();
+	if (source.size() >= 2
+		&& source.front() == QChar('$')
+		&& source.back() == QChar('$')) {
+		source = source.mid(1, source.size() - 2).trimmed();
+	}
+	return source;
+}
+
+struct SerializeContext {
+	not_null<Main::Session*> session;
+	base::flat_map<uint64, MTPInputPhoto> photos;
+	base::flat_map<uint64, MTPInputDocument> documents;
+	base::flat_map<uint64, MTPInputUser> users;
+};
+
+[[nodiscard]] int EntitySerializationOrder(EntityType type) {
+	switch (type) {
+	case EntityType::CustomUrl: return 0;
+	case EntityType::MentionName: return 1;
+	case EntityType::Bold: return 2;
+	case EntityType::Italic: return 3;
+	case EntityType::Underline: return 4;
+	case EntityType::StrikeOut: return 5;
+	case EntityType::Code: return 6;
+	case EntityType::Subscript: return 7;
+	case EntityType::Superscript: return 8;
+	case EntityType::Marked: return 9;
+	case EntityType::Spoiler: return 10;
+	case EntityType::CustomEmoji: return 11;
+	case EntityType::FormattedDate: return 12;
+	case EntityType::Mention: return 13;
+	case EntityType::Hashtag: return 14;
+	case EntityType::BotCommand: return 15;
+	case EntityType::Cashtag: return 16;
+	case EntityType::Url: return 17;
+	case EntityType::Email: return 18;
+	case EntityType::Phone: return 19;
+	case EntityType::BankCard: return 20;
+	case EntityType::Invalid:
+	case EntityType::Semibold:
+	case EntityType::MediaTimestamp:
+	case EntityType::Colorized:
+	case EntityType::Pre:
+	case EntityType::Blockquote:
+		break;
+	}
+	return 100;
+}
+
+[[nodiscard]] MTPRichText MakePlainRichText(const QString &text) {
+	return text.isEmpty()
+		? MTP_textEmpty()
+		: MTP_textPlain(MTP_string(text));
+}
+
+[[nodiscard]] MTPRichText JoinRichTextParts(QVector<MTPRichText> &&parts) {
+	if (parts.isEmpty()) {
+		return MTP_textEmpty();
+	} else if (parts.size() == 1) {
+		return std::move(parts.front());
+	}
+	return MTP_textConcat(MTP_vector<MTPRichText>(std::move(parts)));
+}
+
+[[nodiscard]] MTPRichText WrapRichTextAnchor(
+		MTPRichText text,
+		const QString &anchorId) {
+	return anchorId.isEmpty()
+		? text
+		: MTP_textAnchor(std::move(text), MTP_string(anchorId));
+}
+
+[[nodiscard]] bool HasRichTextContent(const RichText &text) {
+	return !text.text.empty() || !text.anchorId.isEmpty();
+}
+
+[[nodiscard]] PhotoData *ResolvePhotoData(
+		SerializeContext *context,
+		uint64 id,
+		PhotoData *photo) {
+	return photo
+		? photo
+		: (id ? context->session->data().photo(id).get() : nullptr);
+}
+
+[[nodiscard]] DocumentData *ResolveDocumentData(
+		SerializeContext *context,
+		uint64 id,
+		DocumentData *document) {
+	return document
+		? document
+		: (id ? context->session->data().document(id).get() : nullptr);
+}
+
+[[nodiscard]] std::optional<MTPInputPhoto> ResolveInputPhoto(
+		SerializeContext *context,
+		uint64 id,
+		PhotoData *photo) {
+	const auto resolved = ResolvePhotoData(context, id, photo);
+	if (!resolved) {
+		return std::nullopt;
+	}
+	const auto input = resolved->mtpInput();
+	return (input.type() == mtpc_inputPhoto
+		&& input.c_inputPhoto().vid().v
+		&& input.c_inputPhoto().vaccess_hash().v
+		&& !resolved->fileReference().isEmpty())
+		? std::make_optional(input)
+		: std::nullopt;
+}
+
+[[nodiscard]] std::optional<MTPInputDocument> ResolveInputDocument(
+		SerializeContext *context,
+		uint64 id,
+		DocumentData *document) {
+	const auto resolved = ResolveDocumentData(context, id, document);
+	if (!resolved) {
+		return std::nullopt;
+	}
+	const auto input = resolved->mtpInput();
+	return (resolved->hasRemoteLocation()
+		&& input.type() == mtpc_inputDocument
+		&& input.c_inputDocument().vid().v
+		&& input.c_inputDocument().vaccess_hash().v
+		&& !resolved->fileReference().isEmpty())
+		? std::make_optional(input)
+		: std::nullopt;
+}
+
+[[nodiscard]] std::optional<uint64> CollectPhoto(
+		SerializeContext *context,
+		uint64 id,
+		PhotoData *photo) {
+	if (const auto input = ResolveInputPhoto(context, id, photo)) {
+		const auto serverId = uint64(input->c_inputPhoto().vid().v);
+		context->photos.emplace(serverId, *input);
+		return serverId;
+	}
+	return std::nullopt;
+}
+
+[[nodiscard]] std::optional<uint64> CollectDocument(
+		SerializeContext *context,
+		uint64 id,
+		DocumentData *document = nullptr) {
+	if (const auto input = ResolveInputDocument(context, id, document)) {
+		const auto serverId = uint64(input->c_inputDocument().vid().v);
+		context->documents.emplace(serverId, *input);
+		return serverId;
+	}
+	return std::nullopt;
+}
+
+[[nodiscard]] std::optional<uint64> CollectMentionUser(
+		SerializeContext *context,
+		const QString &data) {
+	const auto fields = TextUtilities::MentionNameDataToFields(data);
+	if (!fields.userId || fields.selfId != context->session->userId().bare) {
+		return std::nullopt;
+	}
+	if (context->users.find(fields.userId) != end(context->users)) {
+		return fields.userId;
+	}
+	if (fields.userId == fields.selfId) {
+		context->users.emplace(fields.userId, MTP_inputUserSelf());
+		return fields.userId;
+	}
+	const auto user = context->session->data().user(UserId(fields.userId));
+	if (user->isLoaded()) {
+		context->users.emplace(fields.userId, user->inputUser());
+		return fields.userId;
+	}
+	if (const auto item = user->owner().messageWithPeer(user->id)) {
+		context->users.emplace(
+			fields.userId,
+			MTP_inputUserFromMessage(
+				item->history()->peer->input(),
+				MTP_int(int(item->id.bare)),
+				MTP_long(fields.userId)));
+		return fields.userId;
+	}
+	if (!fields.accessHash) {
+		return std::nullopt;
+	}
+	context->users.emplace(
+		fields.userId,
+		MTP_inputUser(
+			MTP_long(fields.userId),
+			MTP_long(fields.accessHash)));
+	return fields.userId;
+}
+
+[[nodiscard]] std::vector<EntityInText> SortedRichTextEntities(
+		const TextWithEntities &text) {
+	auto result = std::vector<EntityInText>();
+	result.reserve(text.entities.size());
+	const auto textLength = text.text.size();
+	for (const auto &entity : text.entities) {
+		const auto till = entity.offset() + entity.length();
+		if (entity.offset() < 0
+			|| entity.length() <= 0
+			|| till > textLength) {
+			continue;
+		}
+		result.push_back(entity);
+	}
+	std::sort(result.begin(), result.end(), [](const EntityInText &a, const EntityInText &b) {
+		if (a.offset() != b.offset()) {
+			return a.offset() < b.offset();
+		}
+		if (a.length() != b.length()) {
+			return a.length() > b.length();
+		}
+		return EntitySerializationOrder(a.type())
+			< EntitySerializationOrder(b.type());
+	});
+	return result;
+}
+
+[[nodiscard]] bool SkipEntityForRange(
+		const std::vector<EntityInText> &entities,
+		int index,
+		int skipIndex) {
+	if (index == skipIndex) {
+		return true;
+	} else if (skipIndex == kNoEntityIndex) {
+		return false;
+	}
+	const auto &entity = entities[index];
+	const auto &skip = entities[skipIndex];
+	return (index < skipIndex)
+		&& (entity.offset() == skip.offset())
+		&& (entity.length() == skip.length());
+}
+
+[[nodiscard]] int FindOuterEntityAt(
+		const std::vector<EntityInText> &entities,
+		int position,
+		int till,
+		int skipIndex) {
+	const auto count = int(entities.size());
+	for (auto index = 0; index != count; ++index) {
+		const auto &entity = entities[index];
+		if (SkipEntityForRange(entities, index, skipIndex)) {
+			continue;
+		}
+		if (entity.offset() == position
+			&& entity.offset() + entity.length() <= till) {
+			return index;
+		}
+		if (entity.offset() > position) {
+			break;
+		}
+	}
+	return kNoEntityIndex;
+}
+
+[[nodiscard]] std::optional<MTPRichText> SerializeRichTextRange(
+		const QString &text,
+		const std::vector<EntityInText> &entities,
+		int from,
+		int till,
+		SerializeContext *context,
+		int skipIndex);
+
+[[nodiscard]] std::optional<MTPRichText> SerializeRichTextEntity(
+		const QString &text,
+		const std::vector<EntityInText> &entities,
+		int entityIndex,
+		SerializeContext *context) {
+	const auto &entity = entities[entityIndex];
+	const auto from = entity.offset();
+	const auto length = entity.length();
+	const auto segment = text.mid(from, length);
+	const auto inner = SerializeRichTextRange(
+		text,
+		entities,
+		from,
+		from + length,
+		context,
+		entityIndex);
+	if (!inner) {
+		return std::nullopt;
+	}
+	switch (entity.type()) {
+	case EntityType::Bold:
+		return MTP_textBold(*inner);
+	case EntityType::Italic:
+		return MTP_textItalic(*inner);
+	case EntityType::Underline:
+		return MTP_textUnderline(*inner);
+	case EntityType::StrikeOut:
+		return MTP_textStrike(*inner);
+	case EntityType::Code:
+		return MTP_textFixed(*inner);
+	case EntityType::Subscript:
+		return MTP_textSubscript(*inner);
+	case EntityType::Superscript:
+		return MTP_textSuperscript(*inner);
+	case EntityType::Marked:
+		return MTP_textMarked(*inner);
+	case EntityType::Spoiler:
+		return MTP_textSpoiler(*inner);
+	case EntityType::Mention:
+		return MTP_textMention(*inner);
+	case EntityType::Hashtag:
+		return MTP_textHashtag(*inner);
+	case EntityType::BotCommand:
+		return MTP_textBotCommand(*inner);
+	case EntityType::Cashtag:
+		return MTP_textCashtag(*inner);
+	case EntityType::Url:
+		return MTP_textAutoUrl(*inner);
+	case EntityType::Email:
+		return MTP_textAutoEmail(*inner);
+	case EntityType::Phone:
+		return MTP_textAutoPhone(*inner);
+	case EntityType::BankCard:
+		return MTP_textBankCard(*inner);
+	case EntityType::CustomUrl: {
+		const auto data = entity.data();
+		if (data.startsWith(u"mailto:"_q)) {
+			return MTP_textEmail(*inner, MTP_string(data.mid(7)));
+		} else if (data.startsWith(u"tel:"_q)) {
+			return MTP_textPhone(*inner, MTP_string(data.mid(4)));
+		}
+		const auto decoded = DecodeRichPageLinkUrl(data);
+		return MTP_textUrl(
+			*inner,
+			MTP_string(decoded ? decoded->url : data),
+			MTP_long(0));
+	}
+	case EntityType::MentionName: {
+		const auto userId = CollectMentionUser(context, entity.data());
+		return userId
+			? std::make_optional(MTP_textMentionName(
+				*inner,
+				MTP_long(*userId)))
+			: std::nullopt;
+	}
+	case EntityType::CustomEmoji: {
+		if (const auto parsed = Markdown::ParseInlineTextObjectEntity(
+				entity.data())) {
+			switch (parsed->kind) {
+			case Markdown::InlineTextObjectKind::Formula: {
+				const auto formula = std::get_if<
+					Markdown::InlineTextObjectFormulaData>(&parsed->data);
+				if (!formula) {
+					return std::nullopt;
+				}
+				const auto source = !formula->trimmedTex.isEmpty()
+					? formula->trimmedTex
+					: FormulaTexFromSource(formula->copySource);
+				return source.isEmpty()
+					? std::optional<MTPRichText>(
+						MakePlainRichText(segment))
+					: std::optional<MTPRichText>(
+						MTP_textMath(MTP_string(source)));
+			}
+			case Markdown::InlineTextObjectKind::IvImage: {
+				const auto image = std::get_if<
+					Markdown::InlineTextObjectIvImageData>(&parsed->data);
+				return std::optional<MTPRichText>(MakePlainRichText(
+					(image && !image->replacementText.isEmpty())
+						? image->replacementText
+						: u"[image]"_q));
+			}
+			}
+		}
+		const auto documentId = ::Data::ParseCustomEmojiData(entity.data());
+		const auto collected = documentId
+			? CollectDocument(context, documentId)
+			: std::nullopt;
+		return collected
+			? std::optional<MTPRichText>(MTP_textCustomEmoji(
+				MTP_long(*collected),
+				MTP_string(segment.isEmpty() ? u"@"_q : segment)))
+			: std::optional<MTPRichText>(MakePlainRichText(segment));
+	}
+	case EntityType::FormattedDate: {
+		const auto [date, flags] = DeserializeFormattedDateData(entity.data());
+		if (!date) {
+			return *inner;
+		}
+		using Flag = MTPDtextDate::Flag;
+		auto mtpFlags = MTPDtextDate::Flags();
+		if (flags & FormattedDateFlag::Relative) {
+			mtpFlags |= Flag::f_relative;
+		}
+		if (flags & FormattedDateFlag::ShortTime) {
+			mtpFlags |= Flag::f_short_time;
+		}
+		if (flags & FormattedDateFlag::LongTime) {
+			mtpFlags |= Flag::f_long_time;
+		}
+		if (flags & FormattedDateFlag::ShortDate) {
+			mtpFlags |= Flag::f_short_date;
+		}
+		if (flags & FormattedDateFlag::LongDate) {
+			mtpFlags |= Flag::f_long_date;
+		}
+		if (flags & FormattedDateFlag::DayOfWeek) {
+			mtpFlags |= Flag::f_day_of_week;
+		}
+		return MTP_textDate(
+			MTP_flags(mtpFlags),
+			*inner,
+			MTP_int(date));
+	}
+	case EntityType::Invalid:
+	case EntityType::Semibold:
+	case EntityType::MediaTimestamp:
+	case EntityType::Colorized:
+	case EntityType::Pre:
+	case EntityType::Blockquote:
+		break;
+	}
+	return *inner;
+}
+
+[[nodiscard]] std::optional<MTPRichText> SerializeRichTextRange(
+		const QString &text,
+		const std::vector<EntityInText> &entities,
+		int from,
+		int till,
+		SerializeContext *context,
+		int skipIndex) {
+	auto parts = QVector<MTPRichText>();
+	auto position = from;
+	while (position < till) {
+		auto nextEntityStart = till;
+		const auto count = int(entities.size());
+		for (auto index = 0; index != count; ++index) {
+			const auto &entity = entities[index];
+			if (SkipEntityForRange(entities, index, skipIndex)) {
+				continue;
+			}
+			if (entity.offset() >= position
+				&& entity.offset() + entity.length() <= till) {
+				nextEntityStart = entity.offset();
+				break;
+			}
+		}
+		if (nextEntityStart > position) {
+			parts.push_back(MakePlainRichText(
+				text.mid(position, nextEntityStart - position)));
+			position = nextEntityStart;
+			continue;
+		}
+		const auto entity = FindOuterEntityAt(
+			entities,
+			position,
+			till,
+			skipIndex);
+		if (entity == kNoEntityIndex) {
+			parts.push_back(MakePlainRichText(text.mid(position, 1)));
+			++position;
+			continue;
+		}
+		const auto wrapped = SerializeRichTextEntity(
+			text,
+			entities,
+			entity,
+			context);
+		if (!wrapped) {
+			return std::nullopt;
+		}
+		parts.push_back(*wrapped);
+		const auto &wrappedEntity = entities[entity];
+		position = wrappedEntity.offset() + wrappedEntity.length();
+	}
+	return JoinRichTextParts(std::move(parts));
+}
+
+[[nodiscard]] std::optional<MTPRichText> SerializeRichTextWithAnchor(
+		const RichText &text,
+		const QString &anchorId,
+		SerializeContext *context) {
+	const auto entities = SortedRichTextEntities(text.text);
+	auto result = SerializeRichTextRange(
+		text.text.text,
+		entities,
+		0,
+		text.text.text.size(),
+		context,
+		kNoEntityIndex);
+	if (!result) {
+		return std::nullopt;
+	}
+	*result = WrapRichTextAnchor(std::move(*result), text.anchorId);
+	*result = WrapRichTextAnchor(std::move(*result), anchorId);
+	return result;
+}
+
+[[nodiscard]] std::optional<MTPPageCaption> SerializeCaption(
+		const RichText &caption,
+		const QString &anchorId,
+		SerializeContext *context) {
+	const auto text = SerializeRichTextWithAnchor(caption, anchorId, context);
+	return text
+		? std::make_optional(MTP_pageCaption(*text, MTP_textEmpty()))
+		: std::nullopt;
+}
+
+[[nodiscard]] std::optional<MTPPageBlock> SerializeGroupedMediaItem(
+		const GroupedMediaItem &item,
+		SerializeContext *context) {
+	const auto caption = SerializeCaption(RichText(), QString(), context);
+	if (!caption) {
+		return std::nullopt;
+	}
+	switch (item.kind) {
+	case BlockKind::Photo: {
+		const auto photoId = CollectPhoto(context, item.photoId, item.photo);
+		if (!photoId) {
+			return std::nullopt;
+		}
+		using Flag = MTPDpageBlockPhoto::Flag;
+		auto flags = MTPDpageBlockPhoto::Flags();
+		if (item.spoiler) {
+			flags |= Flag::f_spoiler;
+		}
+		return MTP_pageBlockPhoto(
+			MTP_flags(flags),
+			MTP_long(*photoId),
+			*caption,
+			MTPstring(),
+			MTPlong());
+	}
+	case BlockKind::Video: {
+		const auto documentId = CollectDocument(
+			context,
+			item.documentId,
+			item.document);
+		if (!documentId) {
+			return std::nullopt;
+		}
+		using Flag = MTPDpageBlockVideo::Flag;
+		auto flags = MTPDpageBlockVideo::Flags();
+		if (item.autoplay) {
+			flags |= Flag::f_autoplay;
+		}
+		if (item.loop) {
+			flags |= Flag::f_loop;
+		}
+		if (item.spoiler) {
+			flags |= Flag::f_spoiler;
+		}
+		return MTP_pageBlockVideo(
+			MTP_flags(flags),
+			MTP_long(*documentId),
+			*caption);
+	}
+	default:
+		return std::nullopt;
+	}
+}
+
+[[nodiscard]] std::optional<QVector<MTPPageBlock>> SerializeGroupedMediaItems(
+		const std::vector<GroupedMediaItem> &items,
+		SerializeContext *context) {
+	auto result = QVector<MTPPageBlock>();
+	result.reserve(items.size());
+	for (const auto &item : items) {
+		const auto serialized = SerializeGroupedMediaItem(item, context);
+		if (!serialized) {
+			return std::nullopt;
+		}
+		result.push_back(*serialized);
+	}
+	return result;
+}
+
+[[nodiscard]] std::optional<QVector<MTPPageBlock>> SerializeBlocks(
+		const std::vector<Block> &blocks,
+		SerializeContext *context);
+
+[[nodiscard]] std::optional<MTPPageBlock> SerializeParagraphBlock(
+		const RichText &text,
+		const QString &anchorId,
+		SerializeContext *context) {
+	const auto serialized = SerializeRichTextWithAnchor(text, anchorId, context);
+	return serialized
+		? std::make_optional(MTP_pageBlockParagraph(*serialized))
+		: std::nullopt;
+}
+
+[[nodiscard]] bool AppendSerializedParagraphBlock(
+		QVector<MTPPageBlock> *blocks,
+		const RichText &text,
+		const QString &anchorId,
+		SerializeContext *context) {
+	const auto paragraph = SerializeParagraphBlock(text, anchorId, context);
+	if (!paragraph) {
+		return false;
+	}
+	blocks->push_back(*paragraph);
+	return true;
+}
+
+[[nodiscard]] std::optional<MTPPageTableCell> SerializeTableCell(
+		const TableCell &cell,
+		SerializeContext *context) {
+	using Flag = MTPDpageTableCell::Flag;
+	auto flags = MTPDpageTableCell::Flags();
+	if (cell.header) {
+		flags |= Flag::f_header;
+	}
+	switch (cell.alignment) {
+	case TableAlignment::Center:
+		flags |= Flag::f_align_center;
+		break;
+	case TableAlignment::Right:
+		flags |= Flag::f_align_right;
+		break;
+	case TableAlignment::Left:
+		break;
+	}
+	switch (cell.verticalAlignment) {
+	case TableVerticalAlignment::Middle:
+		flags |= Flag::f_valign_middle;
+		break;
+	case TableVerticalAlignment::Bottom:
+		flags |= Flag::f_valign_bottom;
+		break;
+	case TableVerticalAlignment::Top:
+		break;
+	}
+	const auto colspan = std::max(cell.colspan, 1);
+	const auto rowspan = std::max(cell.rowspan, 1);
+	if (colspan != 1) {
+		flags |= Flag::f_colspan;
+	}
+	if (rowspan != 1) {
+		flags |= Flag::f_rowspan;
+	}
+	const auto hasText = HasRichTextContent(cell.text);
+	auto text = MTPRichText(MTP_textEmpty());
+	if (hasText) {
+		flags |= Flag::f_text;
+		const auto serialized = SerializeRichTextWithAnchor(
+			cell.text,
+			QString(),
+			context);
+		if (!serialized) {
+			return std::nullopt;
+		}
+		text = *serialized;
+	}
+	return MTP_pageTableCell(
+		MTP_flags(flags),
+		std::move(text),
+		(colspan != 1 ? MTP_int(colspan) : MTPint()),
+		(rowspan != 1 ? MTP_int(rowspan) : MTPint()));
+}
+
+[[nodiscard]] std::optional<MTPPageBlock> SerializeBlock(
+		const Block &block,
+		SerializeContext *context) {
+	switch (block.kind) {
+	case BlockKind::Heading: {
+		const auto text = SerializeRichTextWithAnchor(
+			block.text,
+			block.anchorId,
+			context);
+		if (!text) {
+			return std::nullopt;
+		}
+		switch (std::clamp(block.headingLevel, 1, 6)) {
+		case 1: return MTP_pageBlockHeading1(*text);
+		case 2: return MTP_pageBlockHeading2(*text);
+		case 3: return MTP_pageBlockHeading3(*text);
+		case 4: return MTP_pageBlockHeading4(*text);
+		case 5: return MTP_pageBlockHeading5(*text);
+		case 6: return MTP_pageBlockHeading6(*text);
+		}
+		return std::nullopt;
+	}
+	case BlockKind::Paragraph: {
+		return SerializeParagraphBlock(block.text, block.anchorId, context);
+	}
+	case BlockKind::Footer: {
+		const auto text = SerializeRichTextWithAnchor(
+			block.text,
+			block.anchorId,
+			context);
+		return text
+			? std::make_optional(MTP_pageBlockFooter(*text))
+			: std::nullopt;
+	}
+	case BlockKind::Divider:
+		return MTP_pageBlockDivider();
+	case BlockKind::Anchor:
+		return block.anchorId.isEmpty()
+			? std::nullopt
+			: std::make_optional(MTP_pageBlockAnchor(
+				MTP_string(block.anchorId)));
+	case BlockKind::Quote: {
+		const auto caption = SerializeRichTextWithAnchor(
+			block.caption,
+			block.blocks.empty() ? QString() : block.anchorId,
+			context);
+		if (!caption) {
+			return std::nullopt;
+		}
+		if (block.pullquote) {
+			if (!block.blocks.empty()) {
+				return std::nullopt;
+			}
+			const auto text = SerializeRichTextWithAnchor(
+				block.text,
+				block.anchorId,
+				context);
+			return text
+				? std::make_optional(MTP_pageBlockPullquote(
+					*text,
+					*caption))
+				: std::nullopt;
+		}
+		if (block.blocks.empty()) {
+			const auto text = SerializeRichTextWithAnchor(
+				block.text,
+				block.anchorId,
+				context);
+			return text
+				? std::make_optional(MTP_pageBlockBlockquote(
+					*text,
+					*caption))
+				: std::nullopt;
+		}
+		auto blocks = QVector<MTPPageBlock>();
+		if (HasRichTextContent(block.text)
+			&& !AppendSerializedParagraphBlock(
+				&blocks,
+				block.text,
+				QString(),
+				context)) {
+			return std::nullopt;
+		}
+		const auto nested = SerializeBlocks(block.blocks, context);
+		if (!nested) {
+			return std::nullopt;
+		}
+		blocks += *nested;
+		return MTP_pageBlockBlockquoteBlocks(
+			MTP_vector<MTPPageBlock>(std::move(blocks)),
+			*caption);
+	}
+	case BlockKind::List: {
+		if (block.listKind == ListKind::Ordered) {
+			auto items = QVector<MTPPageListOrderedItem>();
+			items.reserve(block.listItems.size());
+			for (auto i = 0, count = int(block.listItems.size()); i != count; ++i) {
+				const auto &item = block.listItems[i];
+				const auto number = !item.number.isEmpty()
+					? item.number
+					: QString::number(i + 1);
+				if (!item.blocks.empty()) {
+					using Flag = MTPDpageListOrderedItemBlocks::Flag;
+					auto flags = MTPDpageListOrderedItemBlocks::Flags();
+					if (item.taskState != TaskState::None) {
+						flags |= Flag::f_checkbox;
+					}
+					if (item.taskState == TaskState::Checked) {
+						flags |= Flag::f_checked;
+					}
+					flags |= Flag::f_num;
+					auto blocks = QVector<MTPPageBlock>();
+					if (HasRichTextContent(item.text) || !item.anchorId.isEmpty()) {
+						if (!AppendSerializedParagraphBlock(
+								&blocks,
+								item.text,
+								item.anchorId,
+								context)) {
+							return std::nullopt;
+						}
+					}
+					const auto nested = SerializeBlocks(item.blocks, context);
+					if (!nested) {
+						return std::nullopt;
+					}
+					blocks += *nested;
+					items.push_back(MTP_pageListOrderedItemBlocks(
+						MTP_flags(flags),
+						MTP_string(number),
+						MTP_vector<MTPPageBlock>(std::move(blocks)),
+						MTPint(),
+						MTPstring()));
+				} else {
+					using Flag = MTPDpageListOrderedItemText::Flag;
+					auto flags = MTPDpageListOrderedItemText::Flags();
+					if (item.taskState != TaskState::None) {
+						flags |= Flag::f_checkbox;
+					}
+					if (item.taskState == TaskState::Checked) {
+						flags |= Flag::f_checked;
+					}
+					flags |= Flag::f_num;
+					const auto text = SerializeRichTextWithAnchor(
+						item.text,
+						item.anchorId,
+						context);
+					if (!text) {
+						return std::nullopt;
+					}
+					items.push_back(MTP_pageListOrderedItemText(
+						MTP_flags(flags),
+						MTP_string(number),
+						*text,
+						MTPint(),
+						MTPstring()));
+				}
+			}
+			return MTP_pageBlockOrderedList(
+				MTP_flags(0),
+				MTP_vector<MTPPageListOrderedItem>(std::move(items)),
+				MTPint(),
+				MTPstring());
+		}
+		auto items = QVector<MTPPageListItem>();
+		items.reserve(block.listItems.size());
+		for (const auto &item : block.listItems) {
+			if (!item.blocks.empty()) {
+				using Flag = MTPDpageListItemBlocks::Flag;
+				auto flags = MTPDpageListItemBlocks::Flags();
+				if (item.taskState != TaskState::None) {
+					flags |= Flag::f_checkbox;
+				}
+				if (item.taskState == TaskState::Checked) {
+					flags |= Flag::f_checked;
+				}
+				auto blocks = QVector<MTPPageBlock>();
+				if (HasRichTextContent(item.text) || !item.anchorId.isEmpty()) {
+					if (!AppendSerializedParagraphBlock(
+							&blocks,
+							item.text,
+							item.anchorId,
+							context)) {
+						return std::nullopt;
+					}
+				}
+				const auto nested = SerializeBlocks(item.blocks, context);
+				if (!nested) {
+					return std::nullopt;
+				}
+				blocks += *nested;
+				items.push_back(MTP_pageListItemBlocks(
+					MTP_flags(flags),
+					MTP_vector<MTPPageBlock>(std::move(blocks))));
+			} else {
+				using Flag = MTPDpageListItemText::Flag;
+				auto flags = MTPDpageListItemText::Flags();
+				if (item.taskState != TaskState::None) {
+					flags |= Flag::f_checkbox;
+				}
+				if (item.taskState == TaskState::Checked) {
+					flags |= Flag::f_checked;
+				}
+				const auto text = SerializeRichTextWithAnchor(
+					item.text,
+					item.anchorId,
+					context);
+				if (!text) {
+					return std::nullopt;
+				}
+				items.push_back(MTP_pageListItemText(MTP_flags(flags), *text));
+			}
+		}
+		return MTP_pageBlockList(MTP_vector<MTPPageListItem>(std::move(items)));
+	}
+	case BlockKind::Photo: {
+		const auto photoId = CollectPhoto(context, block.photoId, block.photo);
+		const auto caption = SerializeCaption(block.caption, block.anchorId, context);
+		if (!photoId || !caption) {
+			return std::nullopt;
+		}
+		using Flag = MTPDpageBlockPhoto::Flag;
+		auto flags = MTPDpageBlockPhoto::Flags();
+		if (block.spoiler) {
+			flags |= Flag::f_spoiler;
+		}
+		return MTP_pageBlockPhoto(
+			MTP_flags(flags),
+			MTP_long(*photoId),
+			*caption,
+			MTPstring(),
+			MTPlong());
+	}
+	case BlockKind::Video: {
+		const auto documentId = CollectDocument(
+			context,
+			block.documentId,
+			block.document);
+		const auto caption = SerializeCaption(block.caption, block.anchorId, context);
+		if (!documentId || !caption) {
+			return std::nullopt;
+		}
+		using Flag = MTPDpageBlockVideo::Flag;
+		auto flags = MTPDpageBlockVideo::Flags();
+		if (block.autoplay) {
+			flags |= Flag::f_autoplay;
+		}
+		if (block.loop) {
+			flags |= Flag::f_loop;
+		}
+		if (block.spoiler) {
+			flags |= Flag::f_spoiler;
+		}
+		return MTP_pageBlockVideo(
+			MTP_flags(flags),
+			MTP_long(*documentId),
+			*caption);
+	}
+	case BlockKind::Audio: {
+		const auto documentId = CollectDocument(
+			context,
+			block.documentId,
+			block.document);
+		const auto caption = SerializeCaption(block.caption, block.anchorId, context);
+		return (documentId && caption)
+			? std::make_optional(MTP_pageBlockAudio(
+				MTP_long(*documentId),
+				*caption))
+			: std::nullopt;
+	}
+	case BlockKind::Math:
+		return MTP_pageBlockMath(MTP_string(block.formula));
+	case BlockKind::Table: {
+		using Flag = MTPDpageBlockTable::Flag;
+		auto flags = MTPDpageBlockTable::Flags();
+		if (block.bordered) {
+			flags |= Flag::f_bordered;
+		}
+		if (block.striped) {
+			flags |= Flag::f_striped;
+		}
+		const auto title = SerializeRichTextWithAnchor(
+			block.text,
+			block.anchorId,
+			context);
+		if (!title) {
+			return std::nullopt;
+		}
+		auto rows = QVector<MTPPageTableRow>();
+		rows.reserve(block.tableRows.size());
+		for (const auto &row : block.tableRows) {
+			auto cells = QVector<MTPPageTableCell>();
+			cells.reserve(row.cells.size());
+			for (const auto &cell : row.cells) {
+				const auto serialized = SerializeTableCell(cell, context);
+				if (!serialized) {
+					return std::nullopt;
+				}
+				cells.push_back(*serialized);
+			}
+			rows.push_back(MTP_pageTableRow(
+				MTP_vector<MTPPageTableCell>(std::move(cells))));
+		}
+		return MTP_pageBlockTable(
+			MTP_flags(flags),
+			*title,
+			MTP_vector<MTPPageTableRow>(std::move(rows)));
+	}
+	case BlockKind::Details: {
+		using Flag = MTPDpageBlockDetails::Flag;
+		auto flags = block.open ? Flag::f_open : Flag();
+		const auto title = SerializeRichTextWithAnchor(
+			block.text,
+			block.anchorId,
+			context);
+		const auto blocks = SerializeBlocks(block.blocks, context);
+		return (title && blocks)
+			? std::make_optional(MTP_pageBlockDetails(
+				MTP_flags(flags),
+				MTP_vector<MTPPageBlock>(*blocks),
+				*title))
+			: std::nullopt;
+	}
+	case BlockKind::Map: {
+		const auto width = (block.width > 0)
+			? block.width
+			: kDefaultMapWidth;
+		const auto height = (block.height > 0)
+			? block.height
+			: kDefaultMapHeight;
+		if (block.zoom <= 0) {
+			return std::nullopt;
+		}
+		const auto caption = SerializeCaption(block.caption, block.anchorId, context);
+		return caption
+			? std::make_optional(MTP_inputPageBlockMap(
+				MTP_inputGeoPoint(
+					MTP_flags(0),
+					MTP_double(block.latitude),
+					MTP_double(block.longitude),
+					MTPint()),
+				MTP_int(block.zoom),
+				MTP_int(width),
+				MTP_int(height),
+				*caption))
+			: std::nullopt;
+	}
+	case BlockKind::Code: {
+		if (!block.blocks.empty()) {
+			return std::nullopt;
+		}
+		const auto text = SerializeRichTextWithAnchor(
+			block.text,
+			block.anchorId,
+			context);
+		return text
+			? std::make_optional(MTP_pageBlockPreformatted(
+				*text,
+				MTP_string(block.language)))
+			: std::nullopt;
+	}
+	case BlockKind::GroupedMedia: {
+		const auto items = SerializeGroupedMediaItems(
+			block.mediaItems,
+			context);
+		const auto caption = SerializeCaption(
+			block.caption,
+			block.anchorId,
+			context);
+		if (!items || items->isEmpty() || !caption) {
+			return std::nullopt;
+		}
+		if (block.mediaIntent == RichPage::GroupedMediaIntent::Slideshow) {
+			return MTP_pageBlockSlideshow(
+				MTP_vector<MTPPageBlock>(std::move(*items)),
+				*caption);
+		}
+		return MTP_pageBlockCollage(
+			MTP_vector<MTPPageBlock>(std::move(*items)),
+			*caption);
+	}
+	case BlockKind::Unsupported:
+	case BlockKind::Thinking:
+	case BlockKind::AuthorDate:
+	case BlockKind::Embed:
+	case BlockKind::EmbedPost:
+	case BlockKind::Channel:
+	case BlockKind::RelatedArticles:
+		break;
+	}
+	return std::nullopt;
+}
+
+[[nodiscard]] std::optional<QVector<MTPPageBlock>> SerializeBlocks(
+		const std::vector<Block> &blocks,
+		SerializeContext *context) {
+	auto result = QVector<MTPPageBlock>();
+	result.reserve(blocks.size());
+	for (const auto &block : blocks) {
+		const auto serialized = SerializeBlock(block, context);
+		if (!serialized) {
+			return std::nullopt;
+		}
+		result.push_back(*serialized);
+	}
+	return result;
+}
+
+} // namespace
+
+std::optional<MTPInputRichMessage> SerializeInputRichMessage(
+		not_null<Main::Session*> session,
+		const RichPage &page) {
+	auto context = SerializeContext{ session };
+	auto blocks = SerializeBlocks(page.blocks, &context);
+	if (!blocks) {
+		return std::nullopt;
+	}
+	auto photos = QVector<MTPInputPhoto>();
+	photos.reserve(context.photos.size());
+	for (const auto &[id, input] : context.photos) {
+		photos.push_back(input);
+	}
+	auto documents = QVector<MTPInputDocument>();
+	documents.reserve(context.documents.size());
+	for (const auto &[id, input] : context.documents) {
+		documents.push_back(input);
+	}
+	auto users = QVector<MTPInputUser>();
+	users.reserve(context.users.size());
+	for (const auto &[id, input] : context.users) {
+		users.push_back(input);
+	}
+	using Flag = MTPDinputRichMessage::Flag;
+	auto flags = MTPDinputRichMessage::Flags();
+	if (page.rtl) {
+		flags |= Flag::f_rtl;
+	}
+	if (!photos.isEmpty()) {
+		flags |= Flag::f_photos;
+	}
+	if (!documents.isEmpty()) {
+		flags |= Flag::f_documents;
+	}
+	if (!users.isEmpty()) {
+		flags |= Flag::f_users;
+	}
+	return MTP_inputRichMessage(
+		MTP_flags(flags),
+		MTP_vector<MTPPageBlock>(std::move(*blocks)),
+		MTP_vector<MTPInputPhoto>(std::move(photos)),
+		MTP_vector<MTPInputDocument>(std::move(documents)),
+		MTP_vector<MTPInputUser>(std::move(users)));
+}
+
+} // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_rich_message_serializer.h b/Telegram/SourceFiles/iv/iv_rich_message_serializer.h
new file mode 100644
index 00000000000000..298b84e4fa5193
--- /dev/null
+++ b/Telegram/SourceFiles/iv/iv_rich_message_serializer.h
@@ -0,0 +1,24 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/iv_rich_page.h"
+
+#include <optional>
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Iv {
+
+[[nodiscard]] std::optional<MTPInputRichMessage> SerializeInputRichMessage(
+	not_null<Main::Session*> session,
+	const RichPage &page);
+
+} // namespace Iv
\ No newline at end of file
diff --git a/Telegram/SourceFiles/iv/iv_rich_page.cpp b/Telegram/SourceFiles/iv/iv_rich_page.cpp
new file mode 100644
index 00000000000000..a8355d3c3e67ed
--- /dev/null
+++ b/Telegram/SourceFiles/iv/iv_rich_page.cpp
@@ -0,0 +1,1872 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/iv_rich_page.h"
+
+#include "base/algorithm.h"
+#include "base/flat_map.h"
+#include "base/qthelp_url.h"
+#include "base/unixtime.h"
+#include "base/variant.h"
+#include "data/data_document.h"
+#include "data/data_peer.h"
+#include "data/data_photo.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "iv/markdown/iv_markdown_prepare.h"
+#include "iv/markdown/iv_markdown_prepare_serialize.h"
+#include "iv/markdown/iv_markdown_prepare_links.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "ui/text/text_utilities.h"
+
+#include <algorithm>
+#include <limits>
+
+#include <QtCore/QSize>
+
+namespace Iv {
+namespace {
+
+using Block = RichPage::Block;
+using BlockKind = RichPage::BlockKind;
+using GroupedMediaIntent = RichPage::GroupedMediaIntent;
+using GroupedMediaItem = RichPage::GroupedMediaItem;
+using ListItem = RichPage::ListItem;
+using ListKind = RichPage::ListKind;
+using RelatedArticle = RichPage::RelatedArticle;
+using RichText = RichPage::RichText;
+using TableAlignment = RichPage::TableAlignment;
+using TableCell = RichPage::TableCell;
+using TableRow = RichPage::TableRow;
+using TableVerticalAlignment = RichPage::TableVerticalAlignment;
+using TaskState = RichPage::TaskState;
+
+[[nodiscard]] QString FormulaTexFromSource(QString source) {
+	source = source.trimmed();
+	if (source.size() >= 2
+		&& source.front() == QChar('$')
+		&& source.back() == QChar('$')) {
+		source = source.mid(1, source.size() - 2).trimmed();
+	}
+	return source;
+}
+
+const auto PhotoLargeLevels = u"ydxcwmbsa"_q;
+constexpr auto kDefaultMapWidth = 400;
+constexpr auto kDefaultMapHeight = 200;
+
+[[nodiscard]] int NonZeroMapWidth(int width) {
+	return (width > 0) ? width : kDefaultMapWidth;
+}
+
+[[nodiscard]] int NonZeroMapHeight(int height) {
+	return (height > 0) ? height : kDefaultMapHeight;
+}
+
+[[nodiscard]] Block MakeBlock(BlockKind kind) {
+	auto result = Block();
+	result.kind = kind;
+	return result;
+}
+
+[[nodiscard]] Block MakeHeadingBlock(int level) {
+	auto result = MakeBlock(BlockKind::Heading);
+	result.headingLevel = level;
+	return result;
+}
+
+enum class ParseSource {
+	InstantViewPage,
+	RichMessage,
+};
+
+struct ParseContext {
+	ParseContext(
+		not_null<Main::Session*> session,
+		ParseSource source = ParseSource::InstantViewPage)
+	: session(session)
+	, source(source) {
+	}
+
+	not_null<Main::Session*> session;
+	ParseSource source = ParseSource::InstantViewPage;
+	base::flat_map<uint64, PhotoData*> photos;
+	base::flat_map<uint64, DocumentData*> documents;
+	base::flat_map<uint64, QSize> photoSizes;
+	struct DocumentInfo {
+		int width = 0;
+		int height = 0;
+		QString fileName;
+		QString title;
+		QString performer;
+		int duration = 0;
+		bool isVideoFile = false;
+		bool isAnimation = false;
+	};
+	base::flat_map<uint64, DocumentInfo> documentInfos;
+	bool dropRichTextClickHandlers = false;
+};
+
+struct RichMessageMetrics {
+	int textLength = 0;
+	int blockCount = 0;
+	int maxDepth = 0;
+	int mediaCount = 0;
+	int maxTableColumns = 0;
+	int tableColumnMeasurementLimit = 0;
+};
+
+using TableOccupancyRow = std::vector<char>;
+using TableOccupancyGrid = std::vector<TableOccupancyRow>;
+
+enum class RichTextParseMode {
+	Normal,
+	DropClickHandlers,
+};
+
+void AccumulateTextLength(
+		RichMessageMetrics *metrics,
+		const RichText &text) {
+	metrics->textLength += int(text.text.text.size());
+}
+
+void AccumulateTextLength(
+		RichMessageMetrics *metrics,
+		const QString &text) {
+	metrics->textLength += int(text.size());
+}
+
+[[nodiscard]] bool IsMediaKind(BlockKind kind) {
+	switch (kind) {
+	case BlockKind::Photo:
+	case BlockKind::Video:
+	case BlockKind::Audio:
+		return true;
+	default:
+		return false;
+	}
+}
+
+[[nodiscard]] int NormalizeTableSpan(int span) {
+	return std::max(span, 1);
+}
+
+[[nodiscard]] int ClampTableRowspan(
+		int rawRowspan,
+		int row,
+		int rowCount) {
+	if ((row < 0) || (row >= rowCount) || (rowCount <= 0)) {
+		return 0;
+	}
+	return std::min(NormalizeTableSpan(rawRowspan), rowCount - row);
+}
+
+[[nodiscard]] int ClampTableColspan(
+		int rawColspan,
+		int column,
+		int maxColumns) {
+	if ((column < 0) || (column >= maxColumns) || (maxColumns <= 0)) {
+		return 0;
+	}
+	return std::min(NormalizeTableSpan(rawColspan), maxColumns - column);
+}
+
+[[nodiscard]] bool CanOccupyTableSlots(
+		const TableOccupancyGrid &occupancy,
+		int row,
+		int column,
+		int rowspan,
+		int colspan) {
+	if ((row < 0)
+		|| (column < 0)
+		|| (rowspan <= 0)
+		|| (colspan <= 0)
+		|| (row >= int(occupancy.size()))) {
+		return false;
+	}
+	const auto rowLimit = std::min(row + rowspan, int(occupancy.size()));
+	const auto columnLimit = column + colspan;
+	for (auto currentRow = row; currentRow != rowLimit; ++currentRow) {
+		const auto &occupied = occupancy[currentRow];
+		const auto occupiedLimit = std::min(columnLimit, int(occupied.size()));
+		for (auto currentColumn = column;
+				currentColumn != occupiedLimit;
+				++currentColumn) {
+			if (occupied[currentColumn]) {
+				return false;
+			}
+		}
+	}
+	return true;
+}
+
+[[nodiscard]] int FirstAvailableTableColumn(
+		const TableOccupancyGrid &occupancy,
+		int row,
+		int rowspan,
+		int colspan,
+		int maxColumns) {
+	if ((row < 0)
+		|| (row >= int(occupancy.size()))
+		|| (rowspan <= 0)
+		|| (colspan <= 0)
+		|| (maxColumns <= 0)) {
+		return -1;
+	}
+	for (auto column = 0; column != maxColumns; ++column) {
+		const auto effectiveColspan = ClampTableColspan(
+			colspan,
+			column,
+			maxColumns);
+		if (effectiveColspan <= 0) {
+			continue;
+		}
+		if (CanOccupyTableSlots(
+				occupancy,
+				row,
+				column,
+				rowspan,
+				effectiveColspan)) {
+			return column;
+		}
+	}
+	return -1;
+}
+
+void MarkTableSlots(
+		TableOccupancyGrid *occupancy,
+		int row,
+		int column,
+		int rowspan,
+		int colspan) {
+	if ((row < 0)
+		|| (column < 0)
+		|| (rowspan <= 0)
+		|| (colspan <= 0)
+		|| (row >= int(occupancy->size()))) {
+		return;
+	}
+	const auto rowLimit = std::min(row + rowspan, int(occupancy->size()));
+	const auto columnLimit = column + colspan;
+	for (auto currentRow = row; currentRow != rowLimit; ++currentRow) {
+		auto &occupied = (*occupancy)[currentRow];
+		if (columnLimit > int(occupied.size())) {
+			occupied.resize(columnLimit, false);
+		}
+		for (auto currentColumn = column;
+				currentColumn != columnLimit;
+				++currentColumn) {
+			occupied[currentColumn] = true;
+		}
+	}
+}
+
+[[nodiscard]] int TableColumnCount(const TableOccupancyGrid &occupancy) {
+	auto result = 0;
+	for (const auto &row : occupancy) {
+		result = std::max(result, int(row.size()));
+	}
+	return result;
+}
+
+[[nodiscard]] int TableColumnMeasurementLimit(int maxTableCols) {
+	if (maxTableCols <= 0) {
+		return 1;
+	}
+	return (maxTableCols == std::numeric_limits<int>::max())
+		? maxTableCols
+		: (maxTableCols + 1);
+}
+
+[[nodiscard]] int EffectiveTableColumns(
+		const std::vector<TableRow> &rows,
+		int maxColumns) {
+	if (rows.empty() || maxColumns <= 0) {
+		return 0;
+	}
+	auto occupancy = TableOccupancyGrid(rows.size());
+	for (auto rowIndex = 0; rowIndex != int(rows.size()); ++rowIndex) {
+		const auto &row = rows[rowIndex];
+		for (const auto &cell : row.cells) {
+			const auto normalizedColspan = NormalizeTableSpan(cell.colspan);
+			const auto rowspan = ClampTableRowspan(
+				cell.rowspan,
+				rowIndex,
+				int(rows.size()));
+			if (rowspan <= 0) {
+				continue;
+			}
+			const auto column = FirstAvailableTableColumn(
+				occupancy,
+				rowIndex,
+				rowspan,
+				normalizedColspan,
+				maxColumns);
+			if (column < 0) {
+				return maxColumns;
+			}
+			const auto colspan = ClampTableColspan(
+				normalizedColspan,
+				column,
+				maxColumns);
+			if (colspan != normalizedColspan) {
+				return maxColumns;
+			}
+			MarkTableSlots(
+				&occupancy,
+				rowIndex,
+				column,
+				rowspan,
+				colspan);
+		}
+	}
+	return TableColumnCount(occupancy);
+}
+
+void AccumulateBlockMetrics(
+		RichMessageMetrics *metrics,
+		const std::vector<Block> &blocks,
+		int depth);
+
+void AccumulateBlockMetrics(
+		RichMessageMetrics *metrics,
+		const Block &block,
+		int depth) {
+	++metrics->blockCount;
+	metrics->maxDepth = std::max(metrics->maxDepth, depth);
+	AccumulateTextLength(metrics, block.text);
+	AccumulateTextLength(metrics, block.caption);
+	AccumulateTextLength(metrics, block.formula);
+	if (IsMediaKind(block.kind)) {
+		++metrics->mediaCount;
+	}
+	for (const auto &child : block.blocks) {
+		AccumulateBlockMetrics(metrics, child, depth + 1);
+	}
+	for (const auto &item : block.listItems) {
+		++metrics->blockCount;
+		AccumulateTextLength(metrics, item.text);
+		AccumulateBlockMetrics(metrics, item.blocks, depth + 1);
+	}
+	for (const auto &item : block.mediaItems) {
+		if (IsMediaKind(item.kind)) {
+			++metrics->mediaCount;
+		}
+	}
+	for (const auto &row : block.tableRows) {
+		++metrics->blockCount;
+		for (const auto &cell : row.cells) {
+			AccumulateTextLength(metrics, cell.text);
+		}
+	}
+	metrics->maxTableColumns = std::max(
+		metrics->maxTableColumns,
+		EffectiveTableColumns(
+			block.tableRows,
+			metrics->tableColumnMeasurementLimit));
+}
+
+void AccumulateBlockMetrics(
+		RichMessageMetrics *metrics,
+		const std::vector<Block> &blocks,
+		int depth) {
+	for (const auto &block : blocks) {
+		AccumulateBlockMetrics(metrics, block, depth);
+	}
+}
+
+[[nodiscard]] RichMessageMetrics ComputeRichMessageMetrics(
+		const RichPage &page,
+		const RichMessageLimits &limits) {
+	auto result = RichMessageMetrics();
+	result.tableColumnMeasurementLimit = TableColumnMeasurementLimit(
+		limits.maxTableCols);
+	AccumulateBlockMetrics(&result, page.blocks, 1);
+	return result;
+}
+
+[[nodiscard]] QString DateText(TimeId date) {
+	return langDateTimeFull(base::unixtime::parse(date));
+}
+
+[[nodiscard]] bool AddEntity(
+		TextWithEntities *text,
+		int from,
+		EntityType type,
+		const QString &data = QString()) {
+	const auto length = text->text.size() - from;
+	if (length <= 0) {
+		return true;
+	}
+	text->entities.push_back(EntityInText(type, from, length, data));
+	return true;
+}
+
+void AddRichAnchor(
+		QString *primary,
+		std::vector<QString> *extra,
+		QString anchorId) {
+	if (anchorId.isEmpty()) {
+		return;
+	}
+	if (primary && primary->isEmpty()) {
+		*primary = std::move(anchorId);
+		return;
+	}
+	if (primary && *primary == anchorId) {
+		return;
+	}
+	if (extra && !ranges::contains(*extra, anchorId)) {
+		extra->push_back(std::move(anchorId));
+	}
+}
+
+void AppendRich(RichText *to, RichText &&from) {
+	to->text.append(std::move(from.text));
+	AddRichAnchor(&to->anchorId, &to->anchorIds, std::move(from.anchorId));
+	for (auto &anchorId : from.anchorIds) {
+		AddRichAnchor(&to->anchorId, &to->anchorIds, std::move(anchorId));
+	}
+}
+
+[[nodiscard]] QString RichPageLinkEntityData(
+		ParseSource source,
+		const QString &url,
+		uint64 webpageId) {
+	return (source == ParseSource::InstantViewPage
+		&& webpageId
+		&& !url.isEmpty())
+		? EncodeRichPageLinkUrl(url, webpageId)
+		: url;
+}
+
+[[nodiscard]] QString MentionNameEntityData(
+		not_null<Main::Session*> session,
+		uint64 userId) {
+	if (userId == 0) {
+		return QString();
+	}
+	const auto loaded = session->data().userLoaded(UserId(userId));
+	return TextUtilities::MentionNameDataFromFields({
+		.selfId = session->userId().bare,
+		.userId = userId,
+		.accessHash = loaded ? loaded->accessHash() : 0,
+	});
+}
+
+[[nodiscard]] TaskState TaskStateFromFlags(
+		bool checkbox,
+		bool checked) {
+	if (!checkbox) {
+		return TaskState::None;
+	}
+	return checked ? TaskState::Checked : TaskState::Unchecked;
+}
+
+[[nodiscard]] uint64 PhotoIdFromMtp(const MTPPhoto &photo) {
+	return photo.match([](const auto &data) {
+		return uint64(data.vid().v);
+	});
+}
+
+[[nodiscard]] uint64 DocumentIdFromMtp(const MTPDocument &document) {
+	return document.match([](const auto &data) {
+		return uint64(data.vid().v);
+	});
+}
+
+[[nodiscard]] QSize PhotoSizeFromMtp(const MTPPhoto &photo) {
+	auto result = QSize();
+	photo.match([](const MTPDphotoEmpty &) {
+	}, [&](const MTPDphoto &data) {
+		auto bestLevel = PhotoLargeLevels.size();
+		const auto assign = [&](const QString &type, int width, int height) {
+			const auto level = type.isEmpty()
+				? -1
+				: PhotoLargeLevels.indexOf(type.front());
+			if (level >= 0 && level < bestLevel) {
+				bestLevel = level;
+				result = QSize(width, height);
+			}
+		};
+		for (const auto &size : data.vsizes().v) {
+			size.match([](const MTPDphotoSizeEmpty &) {
+			}, [&](const MTPDphotoSize &row) {
+				assign(qs(row.vtype()), row.vw().v, row.vh().v);
+			}, [&](const MTPDphotoCachedSize &row) {
+				assign(qs(row.vtype()), row.vw().v, row.vh().v);
+			}, [&](const MTPDphotoStrippedSize &) {
+			}, [&](const MTPDphotoSizeProgressive &row) {
+				assign(qs(row.vtype()), row.vw().v, row.vh().v);
+			}, [&](const MTPDphotoPathSize &) {
+			});
+		}
+	});
+	return result;
+}
+
+[[nodiscard]] ParseContext::DocumentInfo DocumentInfoFromMtp(
+		const MTPDocument &document) {
+	auto result = ParseContext::DocumentInfo();
+	document.match([](const MTPDdocumentEmpty &) {
+	}, [&](const MTPDdocument &data) {
+		for (const auto &attribute : data.vattributes().v) {
+			attribute.match([&](const MTPDdocumentAttributeAudio &row) {
+				result.duration = row.vduration().v;
+				result.title = qs(row.vtitle().value_or_empty());
+				result.performer = qs(row.vperformer().value_or_empty());
+			}, [&](const MTPDdocumentAttributeFilename &row) {
+				result.fileName = qs(row.vfile_name());
+			}, [&](const MTPDdocumentAttributeImageSize &row) {
+				if (result.width <= 0 || result.height <= 0) {
+					result.width = row.vw().v;
+					result.height = row.vh().v;
+				}
+			}, [&](const MTPDdocumentAttributeAnimated &) {
+				result.isAnimation = true;
+			}, [&](const MTPDdocumentAttributeVideo &row) {
+				result.isVideoFile = true;
+				result.width = row.vw().v;
+				result.height = row.vh().v;
+			}, [&](const auto &) {
+			});
+		}
+	});
+	return result;
+}
+
+void MergeDocumentInfo(
+		ParseContext::DocumentInfo *existing,
+		ParseContext::DocumentInfo info) {
+	if (!existing) {
+		return;
+	}
+	if (existing->width <= 0 && info.width > 0) {
+		existing->width = info.width;
+	}
+	if (existing->height <= 0 && info.height > 0) {
+		existing->height = info.height;
+	}
+	if (existing->fileName.isEmpty() && !info.fileName.isEmpty()) {
+		existing->fileName = std::move(info.fileName);
+	}
+	if (existing->title.isEmpty() && !info.title.isEmpty()) {
+		existing->title = std::move(info.title);
+	}
+	if (existing->performer.isEmpty() && !info.performer.isEmpty()) {
+		existing->performer = std::move(info.performer);
+	}
+	if (existing->duration <= 0 && info.duration > 0) {
+		existing->duration = info.duration;
+	}
+	if (!existing->isVideoFile && info.isVideoFile) {
+		existing->isVideoFile = true;
+	}
+	if (!existing->isAnimation && info.isAnimation) {
+		existing->isAnimation = true;
+	}
+}
+
+void RememberPhoto(ParseContext *context, const MTPPhoto &photo) {
+	const auto id = PhotoIdFromMtp(photo);
+	if (!id) {
+		return;
+	}
+	context->photos[id] = context->session->data().processPhoto(photo).get();
+	const auto size = PhotoSizeFromMtp(photo);
+	const auto existing = context->photoSizes.find(id);
+	if (!size.isEmpty() || existing == end(context->photoSizes)) {
+		context->photoSizes[id] = size;
+	}
+}
+
+void RememberDocument(ParseContext *context, const MTPDocument &document) {
+	const auto id = DocumentIdFromMtp(document);
+	if (!id) {
+		return;
+	}
+	const auto processed = context->session->data().processDocument(document).get();
+	context->documents[id] = processed;
+	auto info = DocumentInfoFromMtp(document);
+	const auto existing = context->documentInfos.find(id);
+	if (existing != end(context->documentInfos)) {
+		MergeDocumentInfo(&existing->second, std::move(info));
+	} else {
+		context->documentInfos.emplace(id, std::move(info));
+	}
+}
+
+void RememberWebPageMedia(
+		ParseContext *context,
+		const MTPDwebPage &webpage) {
+	if (const auto photo = webpage.vphoto()) {
+		RememberPhoto(context, *photo);
+	}
+	if (const auto document = webpage.vdocument()) {
+		RememberDocument(context, *document);
+	}
+}
+
+[[nodiscard]] PhotoData *FindPhoto(
+		const ParseContext &context,
+		uint64 id) {
+	const auto i = context.photos.find(id);
+	return (i != end(context.photos)) ? i->second : nullptr;
+}
+
+[[nodiscard]] DocumentData *FindDocument(
+		const ParseContext &context,
+		uint64 id) {
+	const auto i = context.documents.find(id);
+	return (i != end(context.documents)) ? i->second : nullptr;
+}
+
+[[nodiscard]] QSize FindPhotoSize(
+		const ParseContext &context,
+		uint64 id) {
+	const auto i = context.photoSizes.find(id);
+	return (i != end(context.photoSizes)) ? i->second : QSize();
+}
+
+[[nodiscard]] ParseContext::DocumentInfo FindDocumentInfo(
+		const ParseContext &context,
+		uint64 id) {
+	const auto i = context.documentInfos.find(id);
+	return (i != end(context.documentInfos))
+		? i->second
+		: ParseContext::DocumentInfo();
+}
+
+[[nodiscard]] TableAlignment TableCellAlignment(
+		const MTPDpageTableCell &data) {
+	if (data.is_align_right()) {
+		return TableAlignment::Right;
+	} else if (data.is_align_center()) {
+		return TableAlignment::Center;
+	}
+	return TableAlignment::Left;
+}
+
+[[nodiscard]] TableVerticalAlignment TableCellVerticalAlignment(
+		const MTPDpageTableCell &data) {
+	if (data.is_valign_bottom()) {
+		return TableVerticalAlignment::Bottom;
+	} else if (data.is_valign_middle()) {
+		return TableVerticalAlignment::Middle;
+	}
+	return TableVerticalAlignment::Top;
+}
+
+[[nodiscard]] RichText ParseRichText(
+		const MTPRichText &text,
+		ParseContext *context,
+		RichTextParseMode mode = RichTextParseMode::Normal);
+
+[[nodiscard]] RichText ParseCaption(
+		const MTPPageCaption &caption,
+		ParseContext *context);
+
+[[nodiscard]] bool AppendRichText(
+		const MTPRichText &text,
+		RichText *result,
+		ParseContext *context,
+		QString *anchorId,
+		std::vector<QString> *anchorIds) {
+	return text.match([&](const MTPDtextEmpty &) {
+		return true;
+	}, [&](const MTPDtextPlain &data) {
+		result->text.append(qs(data.vtext()));
+		return true;
+	}, [&](const MTPDtextConcat &data) {
+		for (const auto &part : data.vtexts().v) {
+			if (!AppendRichText(part, result, context, anchorId, anchorIds)) {
+				return false;
+			}
+		}
+		return true;
+	}, [&](const MTPDtextImage &data) {
+		const auto replacementText = u"[image]"_q;
+		if (context->source == ParseSource::RichMessage
+			|| !data.vdocument_id().v
+			|| data.vw().v <= 0
+			|| data.vh().v <= 0) {
+			result->text.append(replacementText);
+			return true;
+		}
+		const auto entityData = Markdown::SerializeInlineTextObjectEntity({
+			.kind = Markdown::InlineTextObjectKind::IvImage,
+			.data = Markdown::InlineTextObjectIvImageData{
+				.documentId = uint64(data.vdocument_id().v),
+				.width = data.vw().v,
+				.height = data.vh().v,
+				.replacementText = replacementText,
+			},
+		});
+		if (entityData.isEmpty()) {
+			result->text.append(replacementText);
+			return true;
+		}
+		const auto from = result->text.text.size();
+		result->text.append(QChar::ObjectReplacementCharacter);
+		result->text.entities.push_back(EntityInText(
+			EntityType::CustomEmoji,
+			from,
+			1,
+			entityData));
+		return true;
+	}, [&](const MTPDtextMath &data) {
+		const auto source = FormulaTexFromSource(qs(data.vsource()));
+		const auto entityData = Markdown::SerializeInlineTextObjectEntity({
+			.kind = Markdown::InlineTextObjectKind::Formula,
+			.data = Markdown::InlineTextObjectFormulaData{
+				.copySource = Markdown::InlineFormulaCopySource(source),
+				.trimmedTex = source,
+			},
+		});
+		if (entityData.isEmpty()) {
+			result->text.append(source);
+			return true;
+		}
+		const auto from = result->text.text.size();
+		result->text.append(QChar::ObjectReplacementCharacter);
+		result->text.entities.push_back(EntityInText(
+			EntityType::CustomEmoji,
+			from,
+			1,
+			entityData));
+		return true;
+	}, [&](const MTPDtextCustomEmoji &data) {
+		result->text.append(Ui::Text::SingleCustomEmoji(
+			::Data::SerializeCustomEmojiId(uint64(data.vdocument_id().v)),
+			qs(data.valt())));
+		return true;
+	}, [&](const MTPDtextBold &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& AddEntity(&result->text, from, EntityType::Bold);
+	}, [&](const MTPDtextItalic &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& AddEntity(&result->text, from, EntityType::Italic);
+	}, [&](const MTPDtextUnderline &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& AddEntity(&result->text, from, EntityType::Underline);
+	}, [&](const MTPDtextStrike &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& AddEntity(&result->text, from, EntityType::StrikeOut);
+	}, [&](const MTPDtextFixed &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& AddEntity(&result->text, from, EntityType::Code);
+	}, [&](const MTPDtextUrl &data) {
+		const auto from = result->text.text.size();
+		if (!AppendRichText(data.vtext(), result, context, anchorId, anchorIds)) {
+			return false;
+		}
+		const auto target = qs(data.vurl());
+		if (result->text.text.size() == from) {
+			result->text.append(target);
+		}
+		if (context->dropRichTextClickHandlers) {
+			return true;
+		}
+		return AddEntity(
+			&result->text,
+			from,
+			EntityType::CustomUrl,
+			RichPageLinkEntityData(
+				context->source,
+				target,
+				uint64(data.vwebpage_id().v)));
+	}, [&](const MTPDtextEmail &data) {
+		const auto from = result->text.text.size();
+		if (!AppendRichText(data.vtext(), result, context, anchorId, anchorIds)) {
+			return false;
+		}
+		const auto email = qs(data.vemail());
+		if (result->text.text.size() == from) {
+			result->text.append(email);
+		}
+		if (context->dropRichTextClickHandlers) {
+			return true;
+		}
+		const auto target = u"mailto:"_q + email;
+		return AddEntity(&result->text, from, EntityType::CustomUrl, target);
+	}, [&](const MTPDtextSubscript &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& AddEntity(&result->text, from, EntityType::Subscript);
+	}, [&](const MTPDtextSuperscript &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& AddEntity(&result->text, from, EntityType::Superscript);
+	}, [&](const MTPDtextMarked &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& AddEntity(&result->text, from, EntityType::Marked);
+	}, [&](const MTPDtextSpoiler &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& AddEntity(&result->text, from, EntityType::Spoiler);
+	}, [&](const MTPDtextMention &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& (context->dropRichTextClickHandlers
+				|| AddEntity(&result->text, from, EntityType::Mention));
+	}, [&](const MTPDtextHashtag &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& (context->dropRichTextClickHandlers
+				|| AddEntity(&result->text, from, EntityType::Hashtag));
+	}, [&](const MTPDtextBotCommand &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& (context->dropRichTextClickHandlers
+				|| AddEntity(&result->text, from, EntityType::BotCommand));
+	}, [&](const MTPDtextCashtag &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& (context->dropRichTextClickHandlers
+				|| AddEntity(&result->text, from, EntityType::Cashtag));
+	}, [&](const MTPDtextAutoUrl &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& (context->dropRichTextClickHandlers
+				|| AddEntity(&result->text, from, EntityType::Url));
+	}, [&](const MTPDtextAutoEmail &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& (context->dropRichTextClickHandlers
+				|| AddEntity(&result->text, from, EntityType::Email));
+	}, [&](const MTPDtextAutoPhone &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& (context->dropRichTextClickHandlers
+				|| AddEntity(&result->text, from, EntityType::Phone));
+	}, [&](const MTPDtextBankCard &data) {
+		const auto from = result->text.text.size();
+		return AppendRichText(data.vtext(), result, context, anchorId, anchorIds)
+			&& (context->dropRichTextClickHandlers
+				|| AddEntity(&result->text, from, EntityType::BankCard));
+	}, [&](const MTPDtextMentionName &data) {
+		const auto from = result->text.text.size();
+		if (!AppendRichText(data.vtext(), result, context, anchorId, anchorIds)) {
+			return false;
+		}
+		if (context->dropRichTextClickHandlers) {
+			return true;
+		}
+		const auto entityData = MentionNameEntityData(
+			context->session,
+			uint64(data.vuser_id().v));
+		return entityData.isEmpty()
+			? true
+			: AddEntity(
+				&result->text,
+				from,
+				EntityType::MentionName,
+				entityData);
+	}, [&](const MTPDtextDate &data) {
+		const auto from = result->text.text.size();
+		if (!AppendRichText(data.vtext(), result, context, anchorId, anchorIds)) {
+			return false;
+		}
+		if (context->dropRichTextClickHandlers) {
+			return true;
+		}
+		auto flags = FormattedDateFlags();
+		if (data.is_relative()) {
+			flags |= FormattedDateFlag::Relative;
+		}
+		if (data.is_short_time()) {
+			flags |= FormattedDateFlag::ShortTime;
+		}
+		if (data.is_long_time()) {
+			flags |= FormattedDateFlag::LongTime;
+		}
+		if (data.is_short_date()) {
+			flags |= FormattedDateFlag::ShortDate;
+		}
+		if (data.is_long_date()) {
+			flags |= FormattedDateFlag::LongDate;
+		}
+		if (data.is_day_of_week()) {
+			flags |= FormattedDateFlag::DayOfWeek;
+		}
+		return AddEntity(
+			&result->text,
+			from,
+			EntityType::FormattedDate,
+			SerializeFormattedDateData(data.vdate().v, flags));
+	}, [&](const MTPDtextPhone &data) {
+		const auto from = result->text.text.size();
+		if (!AppendRichText(data.vtext(), result, context, anchorId, anchorIds)) {
+			return false;
+		}
+		const auto phone = qs(data.vphone());
+		if (result->text.text.size() == from) {
+			result->text.append(phone);
+		}
+		if (context->dropRichTextClickHandlers) {
+			return true;
+		}
+		const auto target = u"tel:"_q + phone;
+		return AddEntity(&result->text, from, EntityType::CustomUrl, target);
+	}, [&](const MTPDtextAnchor &data) {
+		AddRichAnchor(
+			anchorId,
+			anchorIds,
+			Markdown::NormalizeFragmentId(qs(data.vname())));
+		return AppendRichText(
+			data.vtext(),
+			result,
+			context,
+			anchorId,
+			anchorIds);
+	});
+}
+
+[[nodiscard]] RichText ParseRichText(
+		const MTPRichText &text,
+		ParseContext *context,
+		RichTextParseMode mode) {
+	auto result = RichText();
+	auto anchorId = QString();
+	auto anchorIds = std::vector<QString>();
+	const auto wasDropClickHandlers = context->dropRichTextClickHandlers;
+	context->dropRichTextClickHandlers
+		= (mode == RichTextParseMode::DropClickHandlers);
+	const auto parsed = AppendRichText(
+		text,
+		&result,
+		context,
+		&anchorId,
+		&anchorIds);
+	context->dropRichTextClickHandlers = wasDropClickHandlers;
+	(void)parsed;
+	result.anchorId = std::move(anchorId);
+	result.anchorIds = std::move(anchorIds);
+	return result;
+}
+
+[[nodiscard]] RichText ParseCaption(
+		const MTPPageCaption &caption,
+		ParseContext *context) {
+	auto result = RichText();
+	auto anchorId = QString();
+	auto anchorIds = std::vector<QString>();
+	(void)AppendRichText(
+		caption.data().vtext(),
+		&result,
+		context,
+		&anchorId,
+		&anchorIds);
+	auto credit = RichText();
+	(void)AppendRichText(
+		caption.data().vcredit(),
+		&credit,
+		context,
+		&anchorId,
+		&anchorIds);
+	if (!credit.text.empty()) {
+		if (!result.text.empty()) {
+			result.text.append(QChar('\n'));
+		}
+		AppendRich(&result, std::move(credit));
+	}
+	result.anchorId = std::move(anchorId);
+	result.anchorIds = std::move(anchorIds);
+	return result;
+}
+
+void AdoptAnchor(QString *anchorId, RichText *text) {
+	if (anchorId->isEmpty() && !text->anchorId.isEmpty()) {
+		*anchorId = std::move(text->anchorId);
+		text->anchorId.clear();
+	}
+}
+
+void AdoptLeadingParagraphListItemText(ListItem *item) {
+	if (item->blocks.empty()
+		|| item->blocks.front().kind != BlockKind::Paragraph) {
+		return;
+	}
+	item->text = std::move(item->blocks.front().text);
+	item->anchorId = std::move(item->blocks.front().anchorId);
+	item->blocks.erase(item->blocks.begin());
+}
+
+void AppendBlocks(
+		const QVector<MTPPageBlock> &blocks,
+		std::vector<Block> *result,
+		ParseContext *context);
+
+void AppendBlock(
+		const MTPPageBlock &block,
+		std::vector<Block> *result,
+	ParseContext *context) {
+	block.match([&](const MTPDpageBlockUnsupported &) {
+		result->push_back(MakeBlock(BlockKind::Unsupported));
+	}, [&](const MTPDpageBlockTitle &data) {
+		auto parsed = MakeHeadingBlock(1);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockSubtitle &data) {
+		auto parsed = MakeHeadingBlock(2);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockAuthorDate &data) {
+		auto parsed = MakeBlock(BlockKind::AuthorDate);
+		parsed.text = ParseRichText(data.vauthor(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		parsed.date = data.vpublished_date().v;
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockHeader &data) {
+		auto parsed = MakeHeadingBlock(3);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockSubheader &data) {
+		auto parsed = MakeHeadingBlock(4);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockParagraph &data) {
+		auto parsed = MakeBlock(BlockKind::Paragraph);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockThinking &data) {
+		auto parsed = MakeBlock(BlockKind::Thinking);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockPreformatted &data) {
+		auto parsed = MakeBlock(BlockKind::Code);
+		parsed.language = qs(data.vlanguage()).trimmed();
+		parsed.text = ParseRichText(
+			data.vtext(),
+			context,
+			RichTextParseMode::DropClickHandlers);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockFooter &data) {
+		auto parsed = MakeBlock(BlockKind::Footer);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockDivider &) {
+		result->push_back(MakeBlock(BlockKind::Divider));
+	}, [&](const MTPDpageBlockAnchor &data) {
+		const auto anchorId = Markdown::NormalizeFragmentId(qs(data.vname()));
+		if (!anchorId.isEmpty()) {
+			auto parsed = MakeBlock(BlockKind::Anchor);
+			parsed.anchorId = anchorId;
+			result->push_back(std::move(parsed));
+		}
+	}, [&](const MTPDpageBlockList &data) {
+		auto parsed = MakeBlock(BlockKind::List);
+		parsed.listKind = ListKind::Bullet;
+		parsed.listItems.reserve(data.vitems().v.size());
+		for (const auto &item : data.vitems().v) {
+			auto listItem = ListItem();
+			item.match([&](const MTPDpageListItemText &row) {
+				listItem.taskState = TaskStateFromFlags(
+					row.is_checkbox(),
+					row.is_checked());
+				listItem.text = ParseRichText(row.vtext(), context);
+				AdoptAnchor(&listItem.anchorId, &listItem.text);
+			}, [&](const MTPDpageListItemBlocks &row) {
+				listItem.taskState = TaskStateFromFlags(
+					row.is_checkbox(),
+					row.is_checked());
+				AppendBlocks(row.vblocks().v, &listItem.blocks, context);
+				AdoptLeadingParagraphListItemText(&listItem);
+			});
+			parsed.listItems.push_back(std::move(listItem));
+		}
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockBlockquote &data) {
+		auto parsed = MakeBlock(BlockKind::Quote);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		parsed.caption = ParseRichText(data.vcaption(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.caption);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockBlockquoteBlocks &data) {
+		auto parsed = MakeBlock(BlockKind::Quote);
+		AppendBlocks(data.vblocks().v, &parsed.blocks, context);
+		parsed.caption = ParseRichText(data.vcaption(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.caption);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockPullquote &data) {
+		auto parsed = MakeBlock(BlockKind::Quote);
+		parsed.pullquote = true;
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		parsed.caption = ParseRichText(data.vcaption(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.caption);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockPhoto &data) {
+		const auto photoId = uint64(data.vphoto_id().v);
+		const auto size = FindPhotoSize(*context, photoId);
+		auto parsed = MakeBlock(BlockKind::Photo);
+		if (context->source == ParseSource::InstantViewPage) {
+			parsed.url = qs(data.vurl().value_or_empty());
+		}
+		parsed.width = size.width();
+		parsed.height = size.height();
+		parsed.photoId = photoId;
+		parsed.spoiler = data.is_spoiler();
+		parsed.photo = FindPhoto(*context, photoId);
+		parsed.caption = ParseCaption(data.vcaption(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.caption);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockVideo &data) {
+		const auto documentId = uint64(data.vvideo_id().v);
+		const auto info = FindDocumentInfo(*context, documentId);
+		auto parsed = MakeBlock(BlockKind::Video);
+		parsed.width = info.width;
+		parsed.height = info.height;
+		parsed.documentId = documentId;
+		parsed.autoplay = data.is_autoplay();
+		parsed.loop = data.is_loop();
+		parsed.spoiler = data.is_spoiler();
+		parsed.document = FindDocument(*context, documentId);
+		parsed.caption = ParseCaption(data.vcaption(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.caption);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockCover &data) {
+		AppendBlock(data.vcover(), result, context);
+	}, [&](const MTPDpageBlockEmbed &data) {
+		auto parsed = MakeBlock(BlockKind::Embed);
+		parsed.url = qs(data.vurl().value_or_empty());
+		parsed.html = data.vhtml() ? qba(*data.vhtml()) : QByteArray();
+		parsed.width = data.vw().value_or_empty();
+		parsed.height = data.vh().value_or_empty();
+		parsed.fullWidth = data.is_full_width() || (data.vw() && !data.vw()->v);
+		parsed.fixedHeight = (data.vh() != nullptr);
+		parsed.allowScrolling = data.is_allow_scrolling();
+		parsed.caption = ParseCaption(data.vcaption(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.caption);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockEmbedPost &data) {
+		auto parsed = MakeBlock(BlockKind::EmbedPost);
+		parsed.url = qs(data.vurl());
+		parsed.author = qs(data.vauthor());
+		parsed.date = data.vdate().v;
+		parsed.photoId = uint64(data.vauthor_photo_id().v);
+		parsed.photo = FindPhoto(*context, parsed.photoId);
+		AppendBlocks(data.vblocks().v, &parsed.blocks, context);
+		parsed.caption = ParseCaption(data.vcaption(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.caption);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockCollage &data) {
+		auto parsed = MakeBlock(BlockKind::GroupedMedia);
+		parsed.mediaIntent = GroupedMediaIntent::Collage;
+		parsed.mediaItems.reserve(data.vitems().v.size());
+		for (const auto &item : data.vitems().v) {
+			item.match([&](const MTPDpageBlockPhoto &row) {
+				const auto photoId = uint64(row.vphoto_id().v);
+				const auto size = FindPhotoSize(*context, photoId);
+				parsed.mediaItems.push_back({
+					.kind = BlockKind::Photo,
+					.photo = FindPhoto(*context, photoId),
+					.photoId = photoId,
+					.width = size.width(),
+					.height = size.height(),
+					.spoiler = row.is_spoiler(),
+				});
+			}, [&](const MTPDpageBlockVideo &row) {
+				const auto documentId = uint64(row.vvideo_id().v);
+				const auto info = FindDocumentInfo(*context, documentId);
+				parsed.mediaItems.push_back({
+					.kind = BlockKind::Video,
+					.document = FindDocument(*context, documentId),
+					.documentId = documentId,
+					.width = info.width,
+					.height = info.height,
+					.autoplay = row.is_autoplay(),
+					.loop = row.is_loop(),
+					.spoiler = row.is_spoiler(),
+				});
+			}, [](const auto &) {
+			});
+		}
+		parsed.caption = ParseCaption(data.vcaption(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.caption);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockSlideshow &data) {
+		auto parsed = MakeBlock(BlockKind::GroupedMedia);
+		parsed.mediaIntent = GroupedMediaIntent::Slideshow;
+		parsed.mediaItems.reserve(data.vitems().v.size());
+		for (const auto &item : data.vitems().v) {
+			item.match([&](const MTPDpageBlockPhoto &row) {
+				const auto photoId = uint64(row.vphoto_id().v);
+				const auto size = FindPhotoSize(*context, photoId);
+				parsed.mediaItems.push_back({
+					.kind = BlockKind::Photo,
+					.photo = FindPhoto(*context, photoId),
+					.photoId = photoId,
+					.width = size.width(),
+					.height = size.height(),
+					.spoiler = row.is_spoiler(),
+				});
+			}, [&](const MTPDpageBlockVideo &row) {
+				const auto documentId = uint64(row.vvideo_id().v);
+				const auto info = FindDocumentInfo(*context, documentId);
+				parsed.mediaItems.push_back({
+					.kind = BlockKind::Video,
+					.document = FindDocument(*context, documentId),
+					.documentId = documentId,
+					.width = info.width,
+					.height = info.height,
+					.autoplay = row.is_autoplay(),
+					.loop = row.is_loop(),
+					.spoiler = row.is_spoiler(),
+				});
+			}, [](const auto &) {
+			});
+		}
+		parsed.caption = ParseCaption(data.vcaption(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.caption);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockChannel &data) {
+		auto parsed = MakeBlock(BlockKind::Channel);
+		parsed.peer = context->session->data().processChat(data.vchannel()).get();
+		data.vchannel().match([&](const MTPDchannel &row) {
+			parsed.channelId = row.vid().v;
+			parsed.channelTitle = qs(row.vtitle());
+			if (const auto username = row.vusername()) {
+				parsed.username = qs(*username);
+			}
+		}, [&](const MTPDchannelForbidden &row) {
+			parsed.channelId = row.vid().v;
+			parsed.channelTitle = qs(row.vtitle());
+		}, [&](const MTPDchat &row) {
+			parsed.channelId = row.vid().v;
+			parsed.channelTitle = qs(row.vtitle());
+		}, [&](const MTPDchatForbidden &row) {
+			parsed.channelId = row.vid().v;
+			parsed.channelTitle = qs(row.vtitle());
+		}, [](const auto &) {
+		});
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockAudio &data) {
+		const auto documentId = uint64(data.vaudio_id().v);
+		const auto info = FindDocumentInfo(*context, documentId);
+		auto parsed = MakeBlock(BlockKind::Audio);
+		parsed.audioTitle = info.title;
+		parsed.audioPerformer = info.performer;
+		parsed.audioFileName = info.fileName;
+		parsed.documentId = documentId;
+		parsed.document = FindDocument(*context, documentId);
+		parsed.audioDuration = info.duration;
+		parsed.caption = ParseCaption(data.vcaption(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.caption);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockKicker &data) {
+		auto parsed = MakeHeadingBlock(5);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockHeading1 &data) {
+		auto parsed = MakeHeadingBlock(1);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockHeading2 &data) {
+		auto parsed = MakeHeadingBlock(2);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockHeading3 &data) {
+		auto parsed = MakeHeadingBlock(3);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockHeading4 &data) {
+		auto parsed = MakeHeadingBlock(4);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockHeading5 &data) {
+		auto parsed = MakeHeadingBlock(5);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockHeading6 &data) {
+		auto parsed = MakeHeadingBlock(6);
+		parsed.text = ParseRichText(data.vtext(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockMath &data) {
+		auto parsed = MakeBlock(BlockKind::Math);
+		parsed.formula = qs(data.vsource());
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockTable &data) {
+		auto parsed = MakeBlock(BlockKind::Table);
+		parsed.bordered = data.is_bordered();
+		parsed.striped = data.is_striped();
+		parsed.text = ParseRichText(data.vtitle(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		parsed.tableRows.reserve(data.vrows().v.size());
+		for (const auto &row : data.vrows().v) {
+			row.match([&](const MTPDpageTableRow &rowData) {
+				auto parsedRow = TableRow();
+				parsedRow.cells.reserve(rowData.vcells().v.size());
+				for (const auto &cell : rowData.vcells().v) {
+					cell.match([&](const MTPDpageTableCell &cellData) {
+						auto parsedCell = TableCell{
+							.colspan = cellData.vcolspan().value_or(1),
+							.rowspan = cellData.vrowspan().value_or(1),
+							.header = cellData.is_header(),
+							.alignment = TableCellAlignment(cellData),
+							.verticalAlignment = TableCellVerticalAlignment(cellData),
+						};
+						if (const auto text = cellData.vtext()) {
+							parsedCell.text = ParseRichText(*text, context);
+							parsedCell.text.anchorId.clear();
+							parsedCell.text.anchorIds.clear();
+						}
+						parsedRow.cells.push_back(std::move(parsedCell));
+					});
+				}
+				parsed.tableRows.push_back(std::move(parsedRow));
+			});
+		}
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockOrderedList &data) {
+		auto parsed = MakeBlock(BlockKind::List);
+		parsed.listKind = ListKind::Ordered;
+		parsed.listItems.reserve(data.vitems().v.size());
+		const auto step = data.is_reversed() ? -1 : 1;
+		auto nextNumber = data.vstart().value_or(
+			data.is_reversed() ? int(data.vitems().v.size()) : 1);
+		for (const auto &item : data.vitems().v) {
+			auto listItem = ListItem();
+			const auto fillNumber = [&](const auto &row) {
+				if (const auto num = row.vnum()) {
+					listItem.number = qs(*num);
+				} else if (const auto value = row.vvalue()) {
+					listItem.number = QString::number(value->v);
+				} else {
+					listItem.number = QString::number(nextNumber);
+				}
+			};
+			item.match([&](const MTPDpageListOrderedItemText &row) {
+				listItem.taskState = TaskStateFromFlags(
+					row.is_checkbox(),
+					row.is_checked());
+				fillNumber(row);
+				listItem.text = ParseRichText(row.vtext(), context);
+				AdoptAnchor(&listItem.anchorId, &listItem.text);
+			}, [&](const MTPDpageListOrderedItemBlocks &row) {
+				listItem.taskState = TaskStateFromFlags(
+					row.is_checkbox(),
+					row.is_checked());
+				fillNumber(row);
+				AppendBlocks(row.vblocks().v, &listItem.blocks, context);
+				AdoptLeadingParagraphListItemText(&listItem);
+			});
+			parsed.listItems.push_back(std::move(listItem));
+			nextNumber += step;
+		}
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockDetails &data) {
+		auto parsed = MakeBlock(BlockKind::Details);
+		parsed.open = data.is_open();
+		parsed.text = ParseRichText(data.vtitle(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		AppendBlocks(data.vblocks().v, &parsed.blocks, context);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockRelatedArticles &data) {
+		auto parsed = MakeBlock(BlockKind::RelatedArticles);
+		parsed.text = ParseRichText(data.vtitle(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.text);
+		parsed.relatedArticles.reserve(data.varticles().v.size());
+		for (const auto &article : data.varticles().v) {
+			const auto &row = article.data();
+			parsed.relatedArticles.push_back({
+				.url = qs(row.vurl()),
+				.webpageId = uint64(row.vwebpage_id().v),
+				.photo = FindPhoto(
+					*context,
+					uint64(row.vphoto_id().value_or_empty())),
+				.photoId = uint64(row.vphoto_id().value_or_empty()),
+				.title = qs(row.vtitle().value_or_empty()).trimmed(),
+				.description = qs(row.vdescription().value_or_empty()).trimmed(),
+				.author = qs(row.vauthor().value_or_empty()).trimmed(),
+				.publishedDate = row.vpublished_date().value_or_empty(),
+			});
+		}
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDpageBlockMap &data) {
+		auto parsed = MakeBlock(BlockKind::Map);
+		parsed.width = NonZeroMapWidth(data.vw().v);
+		parsed.height = NonZeroMapHeight(data.vh().v);
+		parsed.zoom = data.vzoom().v;
+		data.vgeo().match([&](const MTPDgeoPoint &row) {
+			parsed.latitude = row.vlat().v;
+			parsed.longitude = row.vlong().v;
+			parsed.accessHash = row.vaccess_hash().v;
+		}, [](const auto &) {
+		});
+		parsed.caption = ParseCaption(data.vcaption(), context);
+		AdoptAnchor(&parsed.anchorId, &parsed.caption);
+		result->push_back(std::move(parsed));
+	}, [&](const MTPDinputPageBlockMap &) {
+		result->push_back(MakeBlock(BlockKind::Unsupported));
+	});
+}
+
+void AppendBlocks(
+		const QVector<MTPPageBlock> &blocks,
+		std::vector<Block> *result,
+		ParseContext *context) {
+	result->reserve(result->size() + blocks.size());
+	for (const auto &block : blocks) {
+		AppendBlock(block, result, context);
+	}
+}
+
+void ExpandInlineTextObjects(TextWithEntities *text) {
+	auto &entities = text->entities;
+	for (auto i = entities.begin(); i != entities.end();) {
+		if (i->type() != EntityType::CustomEmoji) {
+			++i;
+			continue;
+		}
+		const auto object = Markdown::ParseInlineTextObjectEntity(
+			i->data());
+		if (!object) {
+			++i;
+			continue;
+		}
+		const auto replacement = v::match(object->data, [](
+				const Markdown::InlineTextObjectFormulaData &data) {
+			return data.trimmedTex;
+		}, [](const Markdown::InlineTextObjectIvImageData &data) {
+			return data.replacementText;
+		});
+		const auto offset = i->offset();
+		const auto length = i->length();
+		const auto delta = int(replacement.size()) - length;
+		text->text.replace(offset, length, replacement);
+		i = entities.erase(i);
+		for (auto &entity : entities) {
+			if (entity.offset() > offset) {
+				entity.shiftRight(delta);
+			} else if (entity.offset() + entity.length() > offset) {
+				entity.shrinkFromRight(-delta);
+			}
+		}
+	}
+}
+
+void AppendSummaryLine(
+		TextWithEntities *result,
+		TextWithEntities &&line) {
+	ExpandInlineTextObjects(&line);
+	TextUtilities::Trim(line);
+	if (line.empty()) {
+		return;
+	}
+	if (!result->empty()) {
+		result->append(QChar('\n'));
+	}
+	result->append(std::move(line));
+}
+
+void AppendSummaryLine(
+		TextWithEntities *result,
+		const TextWithEntities &line,
+		const QString &prefix = QString()) {
+	auto prepared = TextWithEntities();
+	if (!prefix.isEmpty()) {
+		prepared.append(prefix);
+	}
+	prepared.append(line);
+	AppendSummaryLine(result, std::move(prepared));
+}
+
+void AppendSummaryLine(
+		TextWithEntities *result,
+		const RichText &line,
+		const QString &prefix = QString()) {
+	AppendSummaryLine(result, line.text, prefix);
+}
+
+[[nodiscard]] QString MediaSummaryFallback(const Block &block) {
+	if (block.kind == BlockKind::Photo) {
+		return tr::lng_in_dlg_photo(tr::now);
+	} else if (block.kind == BlockKind::Video) {
+		return tr::lng_in_dlg_video(tr::now);
+	} else if (block.kind == BlockKind::Audio) {
+		return tr::lng_in_dlg_audio_file(tr::now);
+	} else if (block.kind == BlockKind::Map) {
+		return tr::lng_maps_point(tr::now);
+	} else if (block.kind == BlockKind::GroupedMedia) {
+		auto photos = false;
+		auto videos = false;
+		for (const auto &item : block.mediaItems) {
+			if (item.kind == BlockKind::Video) {
+				videos = true;
+			} else {
+				photos = true;
+			}
+		}
+		if (videos && !photos) {
+			return tr::lng_in_dlg_video(tr::now);
+		} else if (photos && !videos) {
+			return tr::lng_in_dlg_photo(tr::now);
+		}
+		return tr::lng_in_dlg_album(tr::now);
+	}
+	return QString();
+}
+
+[[nodiscard]] QString FooterText(const RelatedArticle &article) {
+	if (article.publishedDate && !article.author.isEmpty()) {
+		return article.author + u", "_q + DateText(article.publishedDate);
+	} else if (article.publishedDate) {
+		return DateText(article.publishedDate);
+	}
+	return article.author;
+}
+
+void AppendSummaryBlock(TextWithEntities *result, const Block &block);
+
+void AppendSummaryBlocks(
+		TextWithEntities *result,
+		const std::vector<Block> &blocks) {
+	for (const auto &block : blocks) {
+		AppendSummaryBlock(result, block);
+	}
+}
+
+[[nodiscard]] TextWithEntities FlattenSummaryBlocks(
+		const std::vector<Block> &blocks) {
+	auto result = TextWithEntities();
+	AppendSummaryBlocks(&result, blocks);
+	TextUtilities::Trim(result);
+	return result;
+}
+
+void AppendSummaryBlock(TextWithEntities *result, const Block &block) {
+	switch (block.kind) {
+	case BlockKind::Unsupported:
+	case BlockKind::Divider:
+	case BlockKind::Anchor:
+	case BlockKind::Thinking:
+		return;
+	case BlockKind::Heading:
+	case BlockKind::Paragraph:
+	case BlockKind::Footer:
+	case BlockKind::Code:
+		AppendSummaryLine(result, block.text);
+		return;
+	case BlockKind::AuthorDate: {
+		auto line = block.text.text;
+		if (block.date) {
+			if (!line.empty()) {
+				line.append(u" - "_q);
+			}
+			line.append(DateText(block.date));
+		}
+		AppendSummaryLine(result, std::move(line));
+		return;
+	}
+	case BlockKind::List: {
+		auto ordered = 1;
+		for (const auto &item : block.listItems) {
+			auto prefix = QString();
+			if (item.taskState == TaskState::Unchecked) {
+				prefix = u"[ ] "_q;
+			} else if (item.taskState == TaskState::Checked) {
+				prefix = u"[x] "_q;
+			} else if (block.listKind == ListKind::Ordered) {
+				const auto number = item.number.isEmpty()
+					? QString::number(ordered)
+					: item.number;
+				prefix = number + u". "_q;
+			} else {
+				prefix = u"- "_q;
+			}
+			if (!item.text.text.empty()) {
+				AppendSummaryLine(result, item.text, prefix);
+			} else {
+				auto nested = FlattenSummaryBlocks(item.blocks);
+				AppendSummaryLine(result, std::move(nested), prefix);
+			}
+			++ordered;
+		}
+		return;
+	}
+	case BlockKind::Quote:
+		AppendSummaryLine(result, block.text);
+		AppendSummaryBlocks(result, block.blocks);
+		AppendSummaryLine(result, block.caption);
+		return;
+	case BlockKind::Photo:
+	case BlockKind::Video:
+	case BlockKind::Audio:
+	case BlockKind::GroupedMedia:
+	case BlockKind::Map:
+		if (!block.caption.text.empty()) {
+			AppendSummaryLine(result, block.caption);
+		} else {
+			AppendSummaryLine(
+				result,
+				TextWithEntities::Simple(MediaSummaryFallback(block)));
+		}
+		return;
+	case BlockKind::Embed:
+		if (!block.caption.text.empty()) {
+			AppendSummaryLine(result, block.caption);
+		} else if (!block.url.isEmpty()) {
+			AppendSummaryLine(result, TextWithEntities::Simple(block.url));
+		}
+		return;
+	case BlockKind::EmbedPost: {
+		auto line = QString();
+		if (!block.author.isEmpty()) {
+			line = block.author;
+		}
+		if (block.date) {
+			if (!line.isEmpty()) {
+				line += u", "_q;
+			}
+			line += DateText(block.date);
+		}
+		if (!line.isEmpty()) {
+			AppendSummaryLine(result, TextWithEntities::Simple(line));
+		}
+		AppendSummaryBlocks(result, block.blocks);
+		AppendSummaryLine(result, block.caption);
+		return;
+	}
+	case BlockKind::Channel:
+		if (block.peer) {
+			AppendSummaryLine(
+				result,
+				TextWithEntities::Simple(block.peer->name()));
+		}
+		return;
+	case BlockKind::Math:
+		AppendSummaryLine(result, TextWithEntities::Simple(block.formula));
+		return;
+	case BlockKind::Table: {
+		AppendSummaryLine(result, block.text);
+		for (const auto &row : block.tableRows) {
+			auto line = TextWithEntities();
+			auto first = true;
+			for (const auto &cell : row.cells) {
+				auto cellText = TextUtilities::SingleLine(cell.text.text);
+				TextUtilities::Trim(cellText);
+				if (cellText.empty()) {
+					continue;
+				}
+				if (!first) {
+					line.append(u" | "_q);
+				}
+				line.append(cellText);
+				first = false;
+			}
+			AppendSummaryLine(result, std::move(line));
+		}
+		return;
+	}
+	case BlockKind::Details:
+		AppendSummaryLine(result, block.text);
+		AppendSummaryBlocks(result, block.blocks);
+		return;
+	case BlockKind::RelatedArticles:
+		AppendSummaryLine(result, block.text);
+		for (const auto &article : block.relatedArticles) {
+			if (!article.title.isEmpty()) {
+				AppendSummaryLine(
+					result,
+					TextWithEntities::Simple(article.title));
+			}
+			if (!article.description.isEmpty()) {
+				AppendSummaryLine(
+					result,
+					TextWithEntities::Simple(article.description));
+			}
+			const auto footer = FooterText(article);
+			if (!footer.isEmpty()) {
+				AppendSummaryLine(
+					result,
+					TextWithEntities::Simple(footer));
+			}
+		}
+		return;
+	}
+}
+
+std::shared_ptr<const RichPage> ParsePage(
+		not_null<Main::Session*> session,
+		const MTPPage &page,
+		const MTPDwebPage *webpage) {
+	return page.match([&](const MTPDpage &data) {
+		auto result = std::make_shared<RichPage>();
+		auto context = ParseContext(session, ParseSource::InstantViewPage);
+		result->url = qs(data.vurl());
+		result->rtl = data.is_rtl();
+		result->part = data.is_part();
+		result->views = data.vviews().value_or_empty();
+		for (const auto &photo : data.vphotos().v) {
+			RememberPhoto(&context, photo);
+		}
+		for (const auto &document : data.vdocuments().v) {
+			RememberDocument(&context, document);
+		}
+		if (webpage) {
+			RememberWebPageMedia(&context, *webpage);
+		}
+		AppendBlocks(data.vblocks().v, &result->blocks, &context);
+		return std::shared_ptr<const RichPage>(std::move(result));
+	}, [](const auto &) {
+		return std::shared_ptr<const RichPage>();
+	});
+}
+
+} // namespace
+
+RichMessageLimits ResolveRichMessageLimits(not_null<Main::Session*> session) {
+	const auto &config = session->appConfig();
+	auto result = RichMessageLimits();
+	result.lengthLimit = config.get<int>(
+		u"rich_message_length_limit"_q,
+		result.lengthLimit);
+	result.maxBlocks = config.get<int>(
+		u"rich_message_max_blocks"_q,
+		result.maxBlocks);
+	result.maxDepth = config.get<int>(
+		u"rich_message_max_depth"_q,
+		result.maxDepth);
+	result.maxMedia = config.get<int>(
+		u"rich_message_max_media"_q,
+		result.maxMedia);
+	result.maxTableCols = config.get<int>(
+		u"rich_message_max_table_cols"_q,
+		result.maxTableCols);
+	return result;
+}
+
+std::optional<RichMessageLimitError> ValidateRichMessage(
+		const RichPage &page,
+		const RichMessageLimits &limits) {
+	const auto metrics = ComputeRichMessageMetrics(page, limits);
+	if (metrics.textLength > limits.lengthLimit) {
+		return RichMessageLimitError::Length;
+	} else if (metrics.blockCount > limits.maxBlocks) {
+		return RichMessageLimitError::Blocks;
+	} else if (metrics.maxDepth > limits.maxDepth) {
+		return RichMessageLimitError::Depth;
+	} else if (metrics.mediaCount > limits.maxMedia) {
+		return RichMessageLimitError::Media;
+	} else if (metrics.maxTableColumns > limits.maxTableCols) {
+		return RichMessageLimitError::TableColumns;
+	}
+	return std::nullopt;
+}
+
+QString EncodeRichPageLinkUrl(
+		const QString &url,
+		uint64 webpageId) {
+	return u"internal:wrapped?url="_q
+		+ qthelp::url_encode(url)
+		+ u"&context=iv&webpage_id="_q
+		+ QString::number(webpageId);
+}
+
+std::optional<RichPageLinkUrl> DecodeRichPageLinkUrl(const QString &data) {
+	const auto wrappedPrefix = u"internal:wrapped?"_q;
+	if (!data.startsWith(wrappedPrefix)) {
+		return std::nullopt;
+	}
+	const auto params = qthelp::url_parse_params(data.mid(wrappedPrefix.size()));
+	if (params.value(u"context"_q) != u"iv"_q) {
+		return std::nullopt;
+	}
+	const auto url = params.value(u"url"_q);
+	if (url.isEmpty()) {
+		return std::nullopt;
+	}
+	const auto webpageIdValue = params.value(u"webpage_id"_q);
+	auto webpageId = uint64();
+	if (!webpageIdValue.isEmpty()) {
+		auto ok = false;
+		webpageId = webpageIdValue.toULongLong(&ok);
+		if (!ok) {
+			return std::nullopt;
+		}
+	}
+	return RichPageLinkUrl{
+		.url = url,
+		.webpageId = webpageId,
+	};
+}
+
+std::shared_ptr<const RichPage> ParseRichPage(
+		not_null<Main::Session*> session,
+		const MTPRichMessage &message) {
+	auto result = std::make_shared<RichPage>();
+	auto context = ParseContext(session, ParseSource::RichMessage);
+	const auto &data = message.data();
+	result->rtl = data.is_rtl();
+	result->part = data.is_part();
+	for (const auto &photo : data.vphotos().v) {
+		RememberPhoto(&context, photo);
+	}
+	for (const auto &document : data.vdocuments().v) {
+		RememberDocument(&context, document);
+	}
+	AppendBlocks(data.vblocks().v, &result->blocks, &context);
+	return result;
+}
+
+std::shared_ptr<const RichPage> ParseRichPage(
+		not_null<Main::Session*> session,
+		const MTPPage &page) {
+	return ParsePage(session, page, nullptr);
+}
+
+std::shared_ptr<const RichPage> ParseRichPage(
+		not_null<Main::Session*> session,
+		const MTPDwebPage &webpage) {
+	const auto cachedPage = webpage.vcached_page();
+	if (!cachedPage) {
+		return std::shared_ptr<const RichPage>();
+	}
+	return ParsePage(session, *cachedPage, &webpage);
+}
+
+TextWithEntities FlattenRichPageSummary(const RichPage &page) {
+	auto result = FlattenSummaryBlocks(page.blocks);
+	TextUtilities::Trim(result);
+	if (result.empty()) {
+		result = TextWithEntities::Simple(tr::lng_message_empty(tr::now));
+	}
+	return result;
+}
+
+TextWithEntities FlattenRichPageSummary(
+		const std::shared_ptr<const RichPage> &page) {
+	return page ? FlattenRichPageSummary(*page) : TextWithEntities();
+}
+
+} // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_rich_page.h b/Telegram/SourceFiles/iv/iv_rich_page.h
new file mode 100644
index 00000000000000..08aa2eb2f6b4b8
--- /dev/null
+++ b/Telegram/SourceFiles/iv/iv_rich_page.h
@@ -0,0 +1,225 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/basic_types.h"
+#include "ui/text/text_entity.h"
+
+#include <QtCore/QByteArray>
+
+#include <memory>
+#include <optional>
+#include <vector>
+
+class DocumentData;
+class PhotoData;
+class PeerData;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Iv {
+
+struct RichPage {
+	struct RichText {
+		TextWithEntities text;
+		QString anchorId;
+		std::vector<QString> anchorIds;
+	};
+	enum class BlockKind : uchar {
+		Unsupported,
+		Heading,
+		Paragraph,
+		Footer,
+		Thinking,
+		AuthorDate,
+		Code,
+		Divider,
+		Anchor,
+		List,
+		Quote,
+		Photo,
+		Video,
+		Embed,
+		EmbedPost,
+		GroupedMedia,
+		Channel,
+		Audio,
+		Math,
+		Table,
+		Details,
+		RelatedArticles,
+		Map,
+	};
+	enum class ListKind : uchar {
+		Bullet,
+		Ordered,
+	};
+	enum class TaskState : uchar {
+		None,
+		Unchecked,
+		Checked,
+	};
+	enum class GroupedMediaIntent : uchar {
+		Collage,
+		Slideshow,
+	};
+	enum class TableAlignment : uchar {
+		Left,
+		Center,
+		Right,
+	};
+	enum class TableVerticalAlignment : uchar {
+		Top,
+		Middle,
+		Bottom,
+	};
+	struct Block;
+	struct ListItem {
+		TaskState taskState = TaskState::None;
+		QString number;
+		QString anchorId;
+		RichText text;
+		std::vector<Block> blocks;
+	};
+	struct GroupedMediaItem {
+		BlockKind kind = BlockKind::Unsupported;
+		PhotoData *photo = nullptr;
+		DocumentData *document = nullptr;
+		uint64 photoId = 0;
+		uint64 documentId = 0;
+		int width = 0;
+		int height = 0;
+		bool autoplay = false;
+		bool loop = false;
+		bool spoiler = false;
+	};
+	struct TableCell {
+		RichText text;
+		int colspan = 1;
+		int rowspan = 1;
+		bool header = false;
+		TableAlignment alignment = TableAlignment::Left;
+		TableVerticalAlignment verticalAlignment
+			= TableVerticalAlignment::Top;
+	};
+	struct TableRow {
+		std::vector<TableCell> cells;
+	};
+	struct RelatedArticle {
+		QString url;
+		uint64 webpageId = 0;
+		PhotoData *photo = nullptr;
+		uint64 photoId = 0;
+		QString title;
+		QString description;
+		QString author;
+		TimeId publishedDate = 0;
+	};
+	struct Block {
+		BlockKind kind = BlockKind::Unsupported;
+		QString anchorId;
+		RichText text;
+		RichText caption;
+		QString language;
+		QString formula;
+		QString url;
+		QByteArray html;
+		QString author;
+		QString username;
+		QString channelTitle;
+		QString audioTitle;
+		QString audioPerformer;
+		QString audioFileName;
+		TimeId date = 0;
+		int audioDuration = 0;
+		int headingLevel = 0;
+		int width = 0;
+		int height = 0;
+		int zoom = 0;
+		uint64 photoId = 0;
+		uint64 documentId = 0;
+		uint64 channelId = 0;
+		bool fullWidth = false;
+		bool fixedHeight = false;
+		bool allowScrolling = false;
+		bool autoplay = false;
+		bool loop = false;
+		bool spoiler = false;
+		bool open = false;
+		bool bordered = false;
+		bool striped = false;
+		bool pullquote = false;
+		ListKind listKind = ListKind::Bullet;
+		GroupedMediaIntent mediaIntent = GroupedMediaIntent::Collage;
+		PhotoData *photo = nullptr;
+		DocumentData *document = nullptr;
+		PeerData *peer = nullptr;
+		float64 latitude = 0.;
+		float64 longitude = 0.;
+		uint64 accessHash = 0;
+		std::vector<Block> blocks;
+		std::vector<ListItem> listItems;
+		std::vector<GroupedMediaItem> mediaItems;
+		std::vector<TableRow> tableRows;
+		std::vector<RelatedArticle> relatedArticles;
+	};
+	QString url;
+	bool rtl = false;
+	bool part = false;
+	int views = 0;
+	std::vector<Block> blocks;
+};
+
+struct RichMessageLimits {
+	int lengthLimit = 32768;
+	int maxBlocks = 500;
+	int maxDepth = 16;
+	int maxMedia = 50;
+	int maxTableCols = 20;
+};
+
+enum class RichMessageLimitError : unsigned char {
+	Length,
+	Blocks,
+	Depth,
+	Media,
+	TableColumns,
+};
+
+struct RichPageLinkUrl {
+	QString url;
+	uint64 webpageId = 0;
+};
+
+[[nodiscard]] RichMessageLimits ResolveRichMessageLimits(
+	not_null<Main::Session*> session);
+[[nodiscard]] std::optional<RichMessageLimitError> ValidateRichMessage(
+	const RichPage &page,
+	const RichMessageLimits &limits);
+[[nodiscard]] QString EncodeRichPageLinkUrl(
+	const QString &url,
+	uint64 webpageId);
+[[nodiscard]] std::optional<RichPageLinkUrl> DecodeRichPageLinkUrl(
+	const QString &data);
+[[nodiscard]] std::shared_ptr<const RichPage> ParseRichPage(
+	not_null<Main::Session*> session,
+	const MTPRichMessage &message);
+[[nodiscard]] std::shared_ptr<const RichPage> ParseRichPage(
+	not_null<Main::Session*> session,
+	const MTPPage &page);
+[[nodiscard]] std::shared_ptr<const RichPage> ParseRichPage(
+	not_null<Main::Session*> session,
+	const MTPDwebPage &webpage);
+[[nodiscard]] TextWithEntities FlattenRichPageSummary(
+	const RichPage &page);
+[[nodiscard]] TextWithEntities FlattenRichPageSummary(
+	const std::shared_ptr<const RichPage> &page);
+
+} // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_zoom_controls.cpp b/Telegram/SourceFiles/iv/iv_zoom_controls.cpp
new file mode 100644
index 00000000000000..a5de52d546629f
--- /dev/null
+++ b/Telegram/SourceFiles/iv/iv_zoom_controls.cpp
@@ -0,0 +1,225 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/iv_zoom_controls.h"
+
+#include "base/qt/qt_key_modifiers.h"
+#include "iv/iv_delegate.h"
+#include "lang/lang_keys.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/menu/menu_action.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/rect.h"
+#include "styles/style_iv.h"
+#include "styles/style_widgets.h"
+
+#include <QtCore/QEvent>
+#include <QtGui/QCursor>
+#include <QtGui/QPainter>
+#include <QAction>
+
+namespace Iv {
+namespace {
+
+constexpr auto kZoomStep = int(10);
+constexpr auto kZoomSmallStep = int(5);
+constexpr auto kZoomTinyStep = int(1);
+
+class ZoomMenuAction final
+	: public Ui::Menu::Action
+	, public Ui::AbstractTooltipShower {
+public:
+	ZoomMenuAction(
+		not_null<Ui::PopupMenu*> parent,
+		not_null<Delegate*> delegate,
+		const style::Menu &st);
+
+	void init();
+
+	void paintEvent(QPaintEvent *event) override;
+
+	QString tooltipText() const override;
+
+	QPoint tooltipPos() const override;
+
+	bool tooltipWindowActive() const override;
+
+private:
+	const not_null<Delegate*> _delegate;
+	const style::Menu &_st;
+	Ui::Text::String _text;
+
+};
+
+ZoomMenuAction::ZoomMenuAction(
+	not_null<Ui::PopupMenu*> parent,
+	not_null<Delegate*> delegate,
+	const style::Menu &st)
+: Ui::Menu::Action(
+	parent->menu(),
+	st,
+	Ui::CreateChild<QAction>(parent),
+	nullptr,
+	nullptr)
+, _delegate(delegate)
+, _st(st) {
+	init();
+}
+
+void ZoomMenuAction::init() {
+	enableMouseSelecting();
+
+	AbstractButton::setDisabled(true);
+
+	const auto processTooltip = [=](not_null<Ui::RpWidget*> w) {
+		w->events() | rpl::on_next([=](not_null<QEvent*> e) {
+			if (e->type() == QEvent::Enter) {
+				Ui::Tooltip::Show(1000, this);
+			} else if (e->type() == QEvent::Leave) {
+				Ui::Tooltip::Hide();
+			}
+		}, w->lifetime());
+	};
+
+	const auto reset = Ui::CreateChild<Ui::RoundButton>(
+		this,
+		rpl::single<QString>(QString()),
+		st::ivResetZoom);
+	processTooltip(reset);
+	const auto resetLabel = Ui::CreateChild<Ui::FlatLabel>(
+		reset,
+		tr::lng_background_reset_default(),
+		st::ivResetZoomLabel);
+	resetLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+	reset->setClickedCallback([this] {
+		_delegate->ivSetZoom(0);
+	});
+	reset->show();
+	const auto plus = Ui::CreateSimpleCircleButton(
+		this,
+		st::defaultRippleAnimationBgOver);
+	plus->resize(Size(st::ivZoomButtonsSize));
+	plus->paintRequest() | rpl::on_next([=, fg = _st.itemFg] {
+		auto p = QPainter(plus);
+		p.setPen(fg);
+		p.setFont(st::normalFont);
+		p.drawText(plus->rect(), QChar('+'), style::al_center);
+	}, plus->lifetime());
+	processTooltip(plus);
+	const auto step = [] {
+		return base::IsAltPressed()
+			? kZoomTinyStep
+			: base::IsCtrlPressed()
+			? kZoomSmallStep
+			: kZoomStep;
+	};
+	plus->setClickedCallback([this, step] {
+		_delegate->ivSetZoom(_delegate->ivZoom() + step());
+	});
+	plus->show();
+	const auto minus = Ui::CreateSimpleCircleButton(
+		this,
+		st::defaultRippleAnimationBgOver);
+	minus->resize(Size(st::ivZoomButtonsSize));
+	minus->paintRequest() | rpl::on_next([=, fg = _st.itemFg] {
+		auto p = QPainter(minus);
+		const auto r = minus->rect();
+		p.setPen(fg);
+		p.setFont(st::normalFont);
+		p.drawText(
+			QRectF(r).translated(0, style::ConvertFloatScale(-1)),
+			QChar(0x2013),
+			style::al_center);
+	}, minus->lifetime());
+	processTooltip(minus);
+	minus->setClickedCallback([this, step] {
+		_delegate->ivSetZoom(_delegate->ivZoom() - step());
+	});
+	minus->show();
+
+	{
+		const auto maxWidthText = u"000%"_q;
+		_text.setText(_st.itemStyle, maxWidthText);
+		Ui::Menu::ItemBase::setMinWidth(
+			_text.maxWidth()
+				+ st::ivResetZoomInnerPadding
+				+ resetLabel->width()
+				+ plus->width()
+				+ minus->width()
+				+ _st.itemPadding.right() * 2);
+	}
+
+	_delegate->ivZoomValue(
+	) | rpl::on_next([this](int value) {
+		_text.setText(_st.itemStyle, QString::number(value) + '%');
+		update();
+	}, lifetime());
+
+	rpl::combine(
+		sizeValue(),
+		reset->sizeValue()
+	) | rpl::on_next([=](const QSize &size, const QSize &) {
+		reset->setFullWidth(0
+			+ resetLabel->width()
+			+ st::ivResetZoomInnerPadding);
+		resetLabel->moveToLeft(
+			(reset->width() - resetLabel->width()) / 2,
+			(reset->height() - resetLabel->height()) / 2);
+		reset->moveToRight(
+			_st.itemPadding.right(),
+			(size.height() - reset->height()) / 2);
+		plus->moveToRight(
+			_st.itemPadding.right() + reset->width(),
+			(size.height() - plus->height()) / 2);
+		minus->moveToRight(
+			_st.itemPadding.right() + plus->width() + reset->width(),
+			(size.height() - minus->height()) / 2);
+	}, lifetime());
+}
+
+void ZoomMenuAction::paintEvent(QPaintEvent *event) {
+	auto p = QPainter(this);
+	p.setPen(_st.itemFg);
+	_text.draw(p, {
+		.position = QPoint(
+			_st.itemIconPosition.x(),
+			(height() - _text.minHeight()) / 2),
+		.outerWidth = width(),
+		.availableWidth = width(),
+	});
+}
+
+QString ZoomMenuAction::tooltipText() const {
+#ifdef Q_OS_MAC
+	return tr::lng_iv_zoom_tooltip_cmd(tr::now);
+#else
+	return tr::lng_iv_zoom_tooltip_ctrl(tr::now);
+#endif
+}
+
+QPoint ZoomMenuAction::tooltipPos() const {
+	return QCursor::pos();
+}
+
+bool ZoomMenuAction::tooltipWindowActive() const {
+	return true;
+}
+
+} // namespace
+
+base::unique_qptr<Ui::Menu::ItemBase> CreateZoomMenuAction(
+		not_null<Ui::PopupMenu*> parent,
+		not_null<Delegate*> delegate) {
+	return base::make_unique_q<ZoomMenuAction>(
+		parent,
+		delegate,
+		parent->menu()->st());
+}
+
+} // namespace Iv
diff --git a/Telegram/SourceFiles/iv/iv_zoom_controls.h b/Telegram/SourceFiles/iv/iv_zoom_controls.h
new file mode 100644
index 00000000000000..0d87346ebbfc03
--- /dev/null
+++ b/Telegram/SourceFiles/iv/iv_zoom_controls.h
@@ -0,0 +1,29 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/basic_types.h"
+#include "base/unique_qptr.h"
+
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
+namespace Ui::Menu {
+class ItemBase;
+} // namespace Ui::Menu
+
+namespace Iv {
+
+class Delegate;
+
+[[nodiscard]] base::unique_qptr<Ui::Menu::ItemBase> CreateZoomMenuAction(
+	not_null<Ui::PopupMenu*> parent,
+	not_null<Delegate*> delegate);
+
+} // namespace Iv
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_article.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_article.cpp
new file mode 100644
index 00000000000000..56479d1aff5d49
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_article.cpp
@@ -0,0 +1,5009 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_article.h"
+
+#include "base/algorithm.h"
+#include "iv/markdown/iv_markdown_article_layout_structure.h"
+#include "iv/markdown/iv_markdown_article_paint.h"
+#include "iv/markdown/iv_markdown_article_selection.h"
+#include "iv/markdown/iv_markdown_article_text.h"
+#include "iv/markdown/iv_markdown_media_reuse.h"
+#include "iv/markdown/iv_markdown_prepare_links.h"
+#include "iv/markdown/iv_markdown_prepare_serialize.h"
+#include "lang/lang_keys.h"
+#include "ui/style/style_core_color.h"
+#include "ui/style/style_core_scale.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/basic_click_handlers.h"
+#include "ui/dynamic_image.h"
+
+#include "styles/style_iv.h"
+#include "styles/style_widgets.h"
+
+#include <algorithm>
+#include <limits>
+#include <map>
+#include <set>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+struct PendingHighlightKey {
+	QString text;
+	QString language;
+};
+
+[[nodiscard]] bool operator==(
+		const PendingHighlightKey &a,
+		const PendingHighlightKey &b) {
+	return (a.text == b.text) && (a.language == b.language);
+}
+
+struct PendingHighlightKeyHasher {
+	[[nodiscard]] size_t operator()(
+			const PendingHighlightKey &key) const noexcept;
+};
+
+size_t PendingHighlightKeyHasher::operator()(
+		const PendingHighlightKey &key) const noexcept {
+	auto result = size_t(qHash(key.text));
+	result = (result * 1315423911U) ^ size_t(qHash(key.language));
+	return result;
+}
+
+struct PendingHighlightEntry {
+	PendingHighlightKey key;
+	std::vector<LaidOutBlock*> blocks;
+};
+
+struct RelatedArticleImageState {
+	std::shared_ptr<Ui::DynamicImage> thumbnailImage;
+	std::shared_ptr<Ui::DynamicImage> previousThumbnailImage;
+	std::shared_ptr<Ui::DynamicImage> fullImage;
+	std::shared_ptr<Ui::DynamicImage> previousFullImage;
+};
+
+[[nodiscard]] size_t CombineHash(size_t accumulator, size_t value) {
+	return (accumulator * 1315423911U) ^ value;
+}
+
+struct MarkdownArticleScrollOwnerIdentity {
+	std::optional<PreparedEditBlockPath> blockPath;
+	std::vector<int> preparedPath;
+
+	friend inline bool operator==(
+			const MarkdownArticleScrollOwnerIdentity &a,
+			const MarkdownArticleScrollOwnerIdentity &b) {
+		return (a.blockPath == b.blockPath)
+			&& (a.preparedPath == b.preparedPath);
+	}
+};
+
+struct MarkdownArticleScrollOwnerIdentityHasher {
+	[[nodiscard]] size_t operator()(
+			const MarkdownArticleScrollOwnerIdentity &value) const noexcept {
+		auto result = CombineHash(0, value.blockPath ? 1 : 0);
+		if (value.blockPath) {
+			for (const auto &step : value.blockPath->container.steps) {
+				result = CombineHash(
+					result,
+					static_cast<size_t>(step.kind));
+				result = CombineHash(
+					result,
+					size_t(step.blockIndex + 1));
+				result = CombineHash(
+					result,
+					size_t(step.listItemIndex + 1));
+			}
+			result = CombineHash(
+				result,
+				size_t(value.blockPath->index + 1));
+		}
+		result = CombineHash(result, size_t(value.preparedPath.size() + 1));
+		for (const auto step : value.preparedPath) {
+			result = CombineHash(result, size_t(step + 1));
+		}
+		return result;
+	}
+};
+
+struct MarkdownArticleHorizontalScrollLookup {
+	MarkdownArticleHorizontalScrollHit hit;
+	MarkdownArticleScrollOwnerIdentity identity;
+	const LaidOutBlock *block = nullptr;
+};
+
+[[nodiscard]] bool TextDependsOnMediaRuntime(
+		const TextWithEntities &text) {
+	for (const auto &entity : text.entities) {
+		if (entity.type() != EntityType::CustomEmoji) {
+			continue;
+		}
+		const auto parsed = ParseInlineTextObjectEntity(entity.data());
+		if (parsed && (parsed->kind == InlineTextObjectKind::IvImage)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] TextWithEntities DisplayMathFallbackText() {
+	auto result = TextWithEntities::Simple(u"Invalid formula"_q);
+	result.entities.push_back(EntityInText(
+		EntityType::Italic,
+		0,
+		result.text.size()));
+	return result;
+}
+
+[[nodiscard]] QString DetailsStateText(bool open) {
+	return open
+		? tr::lng_iv_details_state_expanded(tr::now)
+		: tr::lng_iv_details_state_collapsed(tr::now);
+}
+
+[[nodiscard]] size_t TextStyleKey(const style::TextStyle &style) {
+	return reinterpret_cast<size_t>(&style);
+}
+
+[[nodiscard]] CachedTextLeafSourceSignature MarkedTextLeafSourceSignature(
+		TextWithEntities text,
+		const style::TextStyle &textStyle,
+		int minResizeWidth) {
+	auto result = CachedTextLeafSourceSignature();
+	result.dependsOnMediaRuntime = TextDependsOnMediaRuntime(text);
+	result.text = std::move(text);
+	result.minResizeWidth = minResizeWidth;
+	result.styleKey = TextStyleKey(textStyle);
+	return result;
+}
+
+[[nodiscard]] CachedTextLeafSourceSignature PlainTextLeafSourceSignature(
+		const QString &text,
+		const style::TextStyle &textStyle,
+		int minResizeWidth) {
+	return MarkedTextLeafSourceSignature(
+		TextWithEntities::Simple(text),
+		textStyle,
+		minResizeWidth);
+}
+
+[[nodiscard]] CachedTextLeafSourceSignature CodeTextLeafSourceSignature(
+		const PreparedBlock &prepared,
+		const style::Markdown &st) {
+	auto result = MarkedTextLeafSourceSignature(
+		CodeBlockDisplayText(prepared.text),
+		st.code,
+		CodeTextMinResizeWidth(st));
+	result.codeLanguage = prepared.codeLanguage;
+	return result;
+}
+
+[[nodiscard]] CachedTextLeafKey BlockCachedTextLeafKey(
+		CachedTextLeafSlot slot,
+		const PreparedBlock &prepared,
+		const std::vector<int> &preparedPath) {
+	auto result = CachedTextLeafKey();
+	result.slot = slot;
+	if ((slot == CachedTextLeafSlot::Leaf
+			|| slot == CachedTextLeafSlot::Placeholder
+			|| slot == CachedTextLeafSlot::Fallback)
+		&& prepared.editLeaf) {
+		result.identityKind = CachedTextLeafIdentityKind::EditLeaf;
+		result.editLeaf = *prepared.editLeaf;
+		return result;
+	}
+	if ((slot == CachedTextLeafSlot::Marker) && prepared.editListItem) {
+		result.identityKind = CachedTextLeafIdentityKind::EditListItem;
+		result.editListItem = *prepared.editListItem;
+		return result;
+	}
+	if (prepared.editBlock) {
+		result.identityKind = CachedTextLeafIdentityKind::EditBlock;
+		result.editBlock = *prepared.editBlock;
+		return result;
+	}
+	if (prepared.editListItem) {
+		result.identityKind = CachedTextLeafIdentityKind::EditListItem;
+		result.editListItem = *prepared.editListItem;
+		return result;
+	}
+	if (prepared.editLeaf) {
+		result.identityKind = CachedTextLeafIdentityKind::EditLeaf;
+		result.editLeaf = *prepared.editLeaf;
+		return result;
+	}
+	result.preparedPath = preparedPath;
+	return result;
+}
+
+[[nodiscard]] CachedTextLeafKey TableCellCachedTextLeafKey(
+		CachedTextLeafSlot slot,
+		const PreparedTableCell &prepared,
+		const std::vector<int> &preparedPath,
+		int tableRowIndex,
+		int tableCellIndex) {
+	auto result = CachedTextLeafKey();
+	result.slot = slot;
+	result.tableRowIndex = tableRowIndex;
+	result.tableCellIndex = tableCellIndex;
+	if (prepared.editLeaf) {
+		result.identityKind = CachedTextLeafIdentityKind::EditLeaf;
+		result.editLeaf = *prepared.editLeaf;
+		return result;
+	}
+	if (prepared.editCell) {
+		result.identityKind = CachedTextLeafIdentityKind::EditTableCell;
+		result.editTableCell = *prepared.editCell;
+		return result;
+	}
+	result.preparedPath = preparedPath;
+	return result;
+}
+
+void StoreCachedTextLeaf(
+		CachedTextLeafPool *pool,
+		CachedTextLeafKey key,
+		CachedTextLeafSourceSignature source,
+		Ui::Text::String *leaf,
+		Spellchecker::HighlightProcessId syntaxHighlightProcessId = 0) {
+	if (!pool || !leaf || leaf->isEmpty()) {
+		return;
+	}
+	pool->entries.insert_or_assign(
+		std::move(key),
+		CachedTextLeafEntry{
+			.leaf = std::move(*leaf),
+			.source = std::move(source),
+			.syntaxHighlightProcessId = syntaxHighlightProcessId,
+		});
+	*leaf = Ui::Text::String();
+}
+
+void PruneMediaRuntimeBoundCachedTextLeafs(CachedTextLeafPool *pool) {
+	if (!pool) {
+		return;
+	}
+	for (auto i = pool->entries.begin(); i != pool->entries.end();) {
+		if (i->second.source.dependsOnMediaRuntime) {
+			i = pool->entries.erase(i);
+		} else {
+			++i;
+		}
+	}
+}
+
+void HarvestCachedTextLeafs(
+	const std::vector<PreparedBlock> &preparedBlocks,
+	std::vector<LaidOutBlock> *blocks,
+	const style::Markdown &st,
+	CachedTextLeafPool *pool,
+	std::vector<int> *preparedPath);
+
+void RebuildCachedTextLeafs(
+		const std::vector<PreparedBlock> &preparedBlocks,
+		std::vector<LaidOutBlock> *blocks,
+		const style::Markdown &st,
+		CachedTextLeafPool *pool) {
+	if (!pool) {
+		return;
+	}
+	pool->entries.clear();
+	auto preparedPath = std::vector<int>();
+	HarvestCachedTextLeafs(
+		preparedBlocks,
+		blocks,
+		st,
+		pool,
+		&preparedPath);
+}
+
+void HarvestCachedTextLeafs(
+		const PreparedBlock &prepared,
+		LaidOutBlock *block,
+		const style::Markdown &st,
+		CachedTextLeafPool *pool,
+		const std::vector<int> &preparedPath) {
+	const auto storeBlockLeaf = [&](CachedTextLeafSlot slot,
+			CachedTextLeafSourceSignature source,
+			Ui::Text::String *leaf) {
+		StoreCachedTextLeaf(
+			pool,
+			BlockCachedTextLeafKey(slot, prepared, preparedPath),
+			std::move(source),
+			leaf);
+	};
+	const auto storeTableCellLeaf = [&](
+			CachedTextLeafSlot slot,
+			const PreparedTableCell &preparedCell,
+			int tableRowIndex,
+			int tableCellIndex,
+			CachedTextLeafSourceSignature source,
+			Ui::Text::String *leaf) {
+		StoreCachedTextLeaf(
+			pool,
+			TableCellCachedTextLeafKey(
+				slot,
+				preparedCell,
+				preparedPath,
+				tableRowIndex,
+				tableCellIndex),
+			std::move(source),
+			leaf);
+	};
+
+	if (!block->marker.isEmpty()) {
+		storeBlockLeaf(
+			CachedTextLeafSlot::Marker,
+			PlainTextLeafSourceSignature(
+				ListMarkerText(prepared),
+				st.body,
+				PlainTextMinResizeWidth(st.body)),
+			&block->marker);
+	}
+
+	switch (prepared.kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+	{
+		const auto &textStyle = TextStyleFor(prepared, st);
+		storeBlockLeaf(
+			CachedTextLeafSlot::Leaf,
+			MarkedTextLeafSourceSignature(
+				prepared.text,
+				textStyle,
+				FlowBlockMinimumWidth(prepared, st)),
+			&block->leaf);
+		storeBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				textStyle,
+				PlainTextMinResizeWidth(textStyle)),
+			&block->placeholderLeaf);
+	} break;
+	case PreparedBlockKind::CodeBlock:
+		StoreCachedTextLeaf(
+			pool,
+			BlockCachedTextLeafKey(
+				CachedTextLeafSlot::Leaf,
+				prepared,
+				preparedPath),
+			CodeTextLeafSourceSignature(prepared, st),
+			&block->leaf,
+			block->syntaxHighlightProcessId);
+		block->syntaxHighlightProcessId = 0;
+		storeBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.code,
+				PlainTextMinResizeWidth(st.code)),
+			&block->placeholderLeaf);
+		break;
+	case PreparedBlockKind::DisplayMath:
+		storeBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.displayMath.fallbackStyle,
+				DisplayMathFallbackTextMinResizeWidth(st)),
+			&block->placeholderLeaf);
+		storeBlockLeaf(
+			CachedTextLeafSlot::Fallback,
+			MarkedTextLeafSourceSignature(
+				DisplayMathFallbackText(),
+				st.displayMath.fallbackStyle,
+				DisplayMathFallbackTextMinResizeWidth(st)),
+			&block->fallbackLeaf);
+		break;
+	case PreparedBlockKind::Table: {
+		storeBlockLeaf(
+			CachedTextLeafSlot::Leaf,
+			MarkedTextLeafSourceSignature(
+				prepared.text,
+				st.body,
+				FlowTextMinResizeWidth(st.body)),
+			&block->leaf);
+		storeBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.body,
+				PlainTextMinResizeWidth(st.body)),
+			&block->placeholderLeaf);
+		const auto rowCount = std::min(
+			int(prepared.tableRows.size()),
+			int(block->tableRows.size()));
+		for (auto rowIndex = 0; rowIndex != rowCount; ++rowIndex) {
+			const auto cellCount = std::min(
+				int(prepared.tableRows[rowIndex].cells.size()),
+				int(block->tableRows[rowIndex].cells.size()));
+			for (auto cellIndex = 0; cellIndex != cellCount; ++cellIndex) {
+				const auto &preparedCell
+					= prepared.tableRows[rowIndex].cells[cellIndex];
+				auto &cell = block->tableRows[rowIndex].cells[cellIndex];
+				const auto &textStyle = preparedCell.header
+					? st.table.headerStyle
+					: st.table.bodyStyle;
+				const auto minResizeWidth = TableCellTextMinResizeWidth(
+					textStyle,
+					st);
+				storeTableCellLeaf(
+					CachedTextLeafSlot::TableCellText,
+					preparedCell,
+					rowIndex,
+					cellIndex,
+					MarkedTextLeafSourceSignature(
+						preparedCell.text,
+						textStyle,
+						minResizeWidth),
+					&cell.leaf);
+				storeTableCellLeaf(
+					CachedTextLeafSlot::TableCellPlaceholder,
+					preparedCell,
+					rowIndex,
+					cellIndex,
+					PlainTextLeafSourceSignature(
+						preparedCell.editPlaceholderText,
+						textStyle,
+						minResizeWidth),
+					&cell.placeholderLeaf);
+			}
+		}
+	} break;
+	case PreparedBlockKind::Details:
+		storeBlockLeaf(
+			CachedTextLeafSlot::Leaf,
+			MarkedTextLeafSourceSignature(
+				prepared.text,
+				st.details.summaryStyle,
+				FlowTextMinResizeWidth(st.details.summaryStyle)),
+			&block->leaf);
+		storeBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.details.summaryStyle,
+				PlainTextMinResizeWidth(st.details.summaryStyle)),
+			&block->placeholderLeaf);
+		storeBlockLeaf(
+			CachedTextLeafSlot::Action,
+			PlainTextLeafSourceSignature(
+				DetailsStateText(prepared.detailsOpen),
+				st.details.summaryStyle,
+				PlainTextMinResizeWidth(st.details.summaryStyle)),
+			&block->actionLeaf);
+		break;
+	case PreparedBlockKind::Placeholder:
+		storeBlockLeaf(
+			CachedTextLeafSlot::Label,
+			PlainTextLeafSourceSignature(
+				prepared.placeholder.label,
+				st.placeholder.labelStyle,
+				PlainTextMinResizeWidth(st.placeholder.labelStyle)),
+			&block->labelLeaf);
+		storeBlockLeaf(
+			CachedTextLeafSlot::Leaf,
+			MarkedTextLeafSourceSignature(
+				prepared.text,
+				st.body,
+				FlowTextMinResizeWidth(st.body)),
+			&block->leaf);
+		storeBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.body,
+				PlainTextMinResizeWidth(st.body)),
+			&block->placeholderLeaf);
+		break;
+	case PreparedBlockKind::RelatedArticle:
+		storeBlockLeaf(
+			CachedTextLeafSlot::Label,
+			PlainTextLeafSourceSignature(
+				prepared.relatedArticle.title,
+				st.relatedArticle.titleStyle,
+				PlainTextMinResizeWidth(st.relatedArticle.titleStyle)),
+			&block->labelLeaf);
+		storeBlockLeaf(
+			CachedTextLeafSlot::Subtitle,
+			PlainTextLeafSourceSignature(
+				prepared.relatedArticle.description,
+				st.relatedArticle.subtitleStyle,
+				PlainTextMinResizeWidth(st.relatedArticle.subtitleStyle)),
+			&block->subtitleLeaf);
+		storeBlockLeaf(
+			CachedTextLeafSlot::Action,
+			PlainTextLeafSourceSignature(
+				prepared.relatedArticle.footer,
+				st.relatedArticle.footerStyle,
+				PlainTextMinResizeWidth(st.relatedArticle.footerStyle)),
+			&block->actionLeaf);
+		break;
+	case PreparedBlockKind::EmbedPost:
+		storeBlockLeaf(
+			CachedTextLeafSlot::Label,
+			PlainTextLeafSourceSignature(
+				prepared.embedPost.author,
+				st.embedPost.authorStyle,
+				PlainTextMinResizeWidth(st.embedPost.authorStyle)),
+			&block->labelLeaf);
+		storeBlockLeaf(
+			CachedTextLeafSlot::Subtitle,
+			PlainTextLeafSourceSignature(
+				prepared.embedPost.dateText,
+				st.embedPost.dateStyle,
+				PlainTextMinResizeWidth(st.embedPost.dateStyle)),
+			&block->subtitleLeaf);
+		break;
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+		storeBlockLeaf(
+			CachedTextLeafSlot::Leaf,
+			MarkedTextLeafSourceSignature(
+				prepared.text,
+				st.body,
+				FlowTextMinResizeWidth(st.body)),
+			&block->leaf);
+		storeBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.body,
+				PlainTextMinResizeWidth(st.body)),
+			&block->placeholderLeaf);
+		break;
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::Quote:
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+		break;
+	}
+
+	auto childPath = preparedPath;
+	HarvestCachedTextLeafs(prepared.children, &block->children, st, pool, &childPath);
+}
+
+void HarvestCachedTextLeafs(
+		const std::vector<PreparedBlock> &preparedBlocks,
+		std::vector<LaidOutBlock> *blocks,
+		const style::Markdown &st,
+		CachedTextLeafPool *pool,
+		std::vector<int> *preparedPath) {
+	if (!blocks || !pool || !preparedPath) {
+		return;
+	}
+	const auto count = std::min(int(preparedBlocks.size()), int(blocks->size()));
+	for (auto i = 0; i != count; ++i) {
+		preparedPath->push_back(i);
+		HarvestCachedTextLeafs(
+			preparedBlocks[i],
+			&(*blocks)[i],
+			st,
+			pool,
+			*preparedPath);
+		preparedPath->pop_back();
+	}
+}
+
+void StoreRelatedArticleImageState(
+		const LaidOutBlock &block,
+		std::unordered_map<uint64, RelatedArticleImageState> *states) {
+	if (block.thumbnailPhotoId) {
+		(*states)[block.thumbnailPhotoId] = {
+			.thumbnailImage = block.thumbnailImage,
+			.previousThumbnailImage = block.previousThumbnailImage,
+			.fullImage = block.fullImage,
+			.previousFullImage = block.previousFullImage,
+		};
+	}
+	for (const auto &child : block.children) {
+		StoreRelatedArticleImageState(child, states);
+	}
+}
+
+void StoreRelatedArticleImageStates(
+		const std::vector<LaidOutBlock> &blocks,
+		std::unordered_map<uint64, RelatedArticleImageState> *states) {
+	for (const auto &block : blocks) {
+		StoreRelatedArticleImageState(block, states);
+	}
+}
+
+void RestoreRelatedArticleImageState(
+		LaidOutBlock *block,
+		const std::unordered_map<uint64, RelatedArticleImageState> &states) {
+	if (block->thumbnailPhotoId) {
+		if (const auto i = states.find(block->thumbnailPhotoId);
+			i != end(states)) {
+			block->thumbnailImage = i->second.thumbnailImage;
+			block->previousThumbnailImage = i->second.previousThumbnailImage;
+			block->fullImage = i->second.fullImage;
+			block->previousFullImage = i->second.previousFullImage;
+			block->subscribedThumbnailImage.reset();
+			block->thumbnailRequestSize = QSize();
+			block->subscribedFullImage.reset();
+			block->fullRequestSize = QSize();
+		}
+	}
+	for (auto &child : block->children) {
+		RestoreRelatedArticleImageState(&child, states);
+	}
+}
+
+void RestoreRelatedArticleImageStates(
+		std::vector<LaidOutBlock> *blocks,
+		const std::unordered_map<uint64, RelatedArticleImageState> &states) {
+	for (auto &block : *blocks) {
+		RestoreRelatedArticleImageState(&block, states);
+	}
+}
+
+[[nodiscard]] bool IsDisplayMathSegment(const SelectableSegment &segment) {
+	return (segment.kind == SelectableSegmentKind::DisplayMath);
+}
+
+[[nodiscard]] bool IsEditableSegment(const SelectableSegment &segment) {
+	return segment.isTextLeaf() || IsDisplayMathSegment(segment);
+}
+
+[[nodiscard]] QColor MarkBgColorForStyle(const style::Markdown &st) {
+	auto result = st.textPalette.markBg->c;
+	result.setAlphaF(result.alphaF() * std::clamp(
+		st.markBgOpacity,
+		0.,
+		1.));
+	return result;
+}
+
+template <typename T>
+[[nodiscard]] int CompareValues(const T &a, const T &b) {
+	return (a < b) ? -1 : (b < a) ? 1 : 0;
+}
+
+[[nodiscard]] int ComparePreparedEditBlockContainerStep(
+		const PreparedEditBlockContainerStep &a,
+		const PreparedEditBlockContainerStep &b) {
+	if (const auto result = CompareValues(int(a.kind), int(b.kind));
+		result != 0) {
+		return result;
+	}
+	if (const auto result = CompareValues(a.blockIndex, b.blockIndex);
+		result != 0) {
+		return result;
+	}
+	return CompareValues(a.listItemIndex, b.listItemIndex);
+}
+
+[[nodiscard]] int ComparePreparedEditBlockContainerPath(
+		const PreparedEditBlockContainerPath &a,
+		const PreparedEditBlockContainerPath &b) {
+	const auto count = std::min(a.steps.size(), b.steps.size());
+	for (auto i = size_t(0); i != count; ++i) {
+		if (const auto result = ComparePreparedEditBlockContainerStep(
+				a.steps[i],
+				b.steps[i]);
+			result != 0) {
+			return result;
+		}
+	}
+	return CompareValues(a.steps.size(), b.steps.size());
+}
+
+[[nodiscard]] int ComparePreparedEditBlockPath(
+		const PreparedEditBlockPath &a,
+		const PreparedEditBlockPath &b) {
+	if (const auto result = ComparePreparedEditBlockContainerPath(
+			a.container,
+			b.container);
+		result != 0) {
+		return result;
+	}
+	return CompareValues(a.index, b.index);
+}
+
+[[nodiscard]] int ComparePreparedEditListItemSource(
+		const PreparedEditListItemSource &a,
+		const PreparedEditListItemSource &b) {
+	if (const auto result = ComparePreparedEditBlockPath(a.block, b.block);
+		result != 0) {
+		return result;
+	}
+	return CompareValues(a.listItemIndex, b.listItemIndex);
+}
+
+struct PreparedEditListItemSourceLess {
+	[[nodiscard]] bool operator()(
+			const PreparedEditListItemSource &a,
+			const PreparedEditListItemSource &b) const {
+		return ComparePreparedEditListItemSource(a, b) < 0;
+	}
+};
+
+using TaskMarkerRippleRuntimeMap = std::map<
+	PreparedEditListItemSource,
+	std::shared_ptr<TaskMarkerRippleRuntime>,
+	PreparedEditListItemSourceLess>;
+using TaskMarkerSourceSet = std::set<
+	PreparedEditListItemSource,
+	PreparedEditListItemSourceLess>;
+
+void CollectPlaceholderIds(
+		const std::vector<LaidOutBlock> &blocks,
+		std::unordered_set<uint64> *result) {
+	if (!result) {
+		return;
+	}
+	for (const auto &block : blocks) {
+		if (block.placeholderId) {
+			result->emplace(block.placeholderId.value);
+		}
+		CollectPlaceholderIds(block.children, result);
+	}
+}
+
+[[nodiscard]] LaidOutBlock *FindPlaceholderBlock(
+		std::vector<LaidOutBlock> *blocks,
+		PreparedPlaceholderBlockId id) {
+	if (!blocks || !id) {
+		return nullptr;
+	}
+	for (auto &block : *blocks) {
+		if (block.placeholderId.value == id.value) {
+			return &block;
+		}
+		if (const auto child = FindPlaceholderBlock(&block.children, id)) {
+			return child;
+		}
+	}
+	return nullptr;
+}
+
+void CollectTaskMarkerSources(
+		const std::vector<LaidOutBlock> &blocks,
+		TaskMarkerSourceSet *result) {
+	if (!result) {
+		return;
+	}
+	for (const auto &block : blocks) {
+		if (block.taskState != TaskState::None && block.editListItem) {
+			result->emplace(*block.editListItem);
+		}
+		CollectTaskMarkerSources(block.children, result);
+	}
+}
+
+[[nodiscard]] LaidOutBlock *FindListItemBlock(
+		std::vector<LaidOutBlock> *blocks,
+		const PreparedEditListItemSource &source) {
+	if (!blocks) {
+		return nullptr;
+	}
+	for (auto &block : *blocks) {
+		if (block.kind == PreparedBlockKind::ListItem
+			&& block.editListItem
+			&& (*block.editListItem == source)) {
+			return &block;
+		}
+		if (const auto child = FindListItemBlock(&block.children, source)) {
+			return child;
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] const LaidOutBlock *FindListItemBlock(
+		const std::vector<LaidOutBlock> &blocks,
+		const PreparedEditListItemSource &source) {
+	for (const auto &block : blocks) {
+		if (block.kind == PreparedBlockKind::ListItem
+			&& block.editListItem
+			&& (*block.editListItem == source)) {
+			return &block;
+		}
+		if (const auto child = FindListItemBlock(block.children, source)) {
+			return child;
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] QRect TaskMarkerRippleRect(
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	if (block.markerRect.isEmpty()) {
+		return {};
+	}
+	const auto size = (block.taskMarkerRippleRuntime
+			&& !block.taskMarkerRippleRuntime->rippleSize.isEmpty())
+		? block.taskMarkerRippleRuntime->rippleSize
+		: (block.markerRect.size() + QSize(
+			st.list.taskCheck.rippleAreaPadding * 2,
+			st.list.taskCheck.rippleAreaPadding * 2));
+	return QRect(
+		block.markerRect.topLeft() + st::defaultCheckbox.rippleAreaPosition,
+		size);
+}
+
+[[nodiscard]] const LaidOutBlock *FindPlaceholderBlock(
+		const std::vector<LaidOutBlock> &blocks,
+		PreparedPlaceholderBlockId id) {
+	if (!id) {
+		return nullptr;
+	}
+	for (const auto &block : blocks) {
+		if (block.placeholderId.value == id.value) {
+			return &block;
+		}
+		if (const auto child = FindPlaceholderBlock(block.children, id)) {
+			return child;
+		}
+	}
+	return nullptr;
+}
+
+void AppendRevealLine(
+		std::vector<MarkdownArticleRevealLine> *lines,
+		int left,
+		int width,
+		int bottom,
+		int baseline,
+		bool rtl) {
+	if (width < 0) {
+		return;
+	}
+	const auto previousBottom = lines->empty()
+		? std::numeric_limits<int>::lowest()
+		: lines->back().bottom;
+	if (bottom <= previousBottom) {
+		return;
+	}
+	lines->push_back({
+		.left = left,
+		.width = width,
+		.bottom = bottom,
+		.rtl = rtl,
+		.baseline = baseline,
+	});
+}
+
+void AppendGenericRevealBand(
+		std::vector<MarkdownArticleRevealLine> *lines,
+		QRect rect) {
+	if (rect.isEmpty()) {
+		return;
+	}
+	const auto bottom = rect.y() + rect.height();
+	AppendRevealLine(
+		lines,
+		rect.x(),
+		rect.width(),
+		bottom,
+		bottom,
+		false);
+}
+
+[[nodiscard]] QRect ClipRectToViewport(QRect rect, QRect viewport);
+
+void AppendTextRevealLines(
+		std::vector<MarkdownArticleRevealLine> *lines,
+		const Ui::Text::String &leaf,
+		QRect textRect,
+		QRect visibleRect,
+		int textWidth) {
+	if (textRect.isEmpty() || visibleRect.isEmpty() || (textWidth <= 0)) {
+		return;
+	}
+	const auto geometry = leaf.countLinesGeometry(textWidth, true);
+	const auto viewportLeft = visibleRect.x();
+	const auto viewportRight = visibleRect.x() + visibleRect.width();
+	for (const auto &line : geometry) {
+		const auto left = textRect.x() + line.left;
+		const auto right = left + line.width;
+		const auto visibleLeft = std::clamp(
+			left,
+			viewportLeft,
+			viewportRight);
+		const auto visibleRight = std::clamp(
+			right,
+			viewportLeft,
+			viewportRight);
+		AppendRevealLine(
+			lines,
+			visibleLeft,
+			visibleRight - visibleLeft,
+			textRect.y() + line.bottom,
+			textRect.y() + line.baseline,
+			line.rtl);
+	}
+}
+
+void AppendBlocksRevealLines(
+		const std::vector<LaidOutBlock> &blocks,
+		const style::Markdown &st,
+		std::vector<MarkdownArticleRevealLine> *lines);
+
+void AppendTableRowRevealLines(
+		std::vector<MarkdownArticleRevealLine> *lines,
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	if (block.visibleTableRect.isEmpty()) {
+		return;
+	}
+	const auto border = std::max(block.tableBordered ? st.table.border : 0, 0);
+	const auto tableBottom = block.visibleTableRect.y()
+		+ block.visibleTableRect.height();
+	for (const auto &row : block.tableRows) {
+		if (row.outer.height() <= 0) {
+			continue;
+		}
+		const auto bottom = std::min(
+			row.outer.y() + row.outer.height() + border,
+			tableBottom);
+		AppendRevealLine(
+			lines,
+			block.visibleTableRect.x(),
+			block.visibleTableRect.width(),
+			bottom,
+			bottom,
+			false);
+	}
+}
+
+void AppendTableRevealLines(
+		std::vector<MarkdownArticleRevealLine> *lines,
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	AppendTextRevealLines(
+		lines,
+		block.leaf,
+		block.textRect,
+		ClipRectToViewport(block.textRect, block.outer),
+		block.textWidth);
+	AppendTableRowRevealLines(lines, block, st);
+}
+
+void AppendMediaRevealLines(
+		std::vector<MarkdownArticleRevealLine> *lines,
+		const LaidOutBlock &block) {
+	AppendGenericRevealBand(lines, block.visibleMediaRect);
+	AppendTextRevealLines(
+		lines,
+		block.leaf,
+		block.textRect,
+		ClipRectToViewport(block.textRect, block.outer),
+		block.textWidth);
+}
+
+void AppendEmbedPostRevealLines(
+		std::vector<MarkdownArticleRevealLine> *lines,
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	if (!block.headerRect.isEmpty()) {
+		const auto bottom = block.headerRect.y() + block.headerRect.height();
+		AppendRevealLine(
+			lines,
+			block.mediaRect.x(),
+			block.mediaRect.width(),
+			bottom,
+			bottom,
+			false);
+	} else if (block.children.empty()) {
+		AppendGenericRevealBand(lines, block.mediaRect);
+	}
+	AppendBlocksRevealLines(block.children, st, lines);
+	AppendTextRevealLines(
+		lines,
+		block.leaf,
+		block.textRect,
+		ClipRectToViewport(block.textRect, block.outer),
+		block.textWidth);
+}
+
+void AppendDetailsRevealLines(
+		std::vector<MarkdownArticleRevealLine> *lines,
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	AppendTextRevealLines(
+		lines,
+		block.leaf,
+		block.textRect,
+		ClipRectToViewport(block.textRect, block.headerRect),
+		block.textWidth);
+	AppendBlocksRevealLines(block.children, st, lines);
+}
+
+void AppendBlockRevealLines(
+		std::vector<MarkdownArticleRevealLine> *lines,
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	switch (block.kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+	case PreparedBlockKind::CodeBlock:
+		AppendTextRevealLines(
+			lines,
+			block.leaf,
+			block.textRect,
+			(block.kind == PreparedBlockKind::CodeBlock)
+				? ClipRectToViewport(block.textRect, block.contentRect)
+				: ClipRectToViewport(block.textRect, block.outer),
+			block.textWidth);
+		break;
+	case PreparedBlockKind::Rule:
+		AppendGenericRevealBand(lines, block.outer);
+		break;
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+	case PreparedBlockKind::Quote:
+		AppendBlocksRevealLines(block.children, st, lines);
+		break;
+	case PreparedBlockKind::DisplayMath:
+		AppendGenericRevealBand(lines, block.visibleFormulaRect);
+		break;
+	case PreparedBlockKind::Table:
+		AppendTableRevealLines(lines, block, st);
+		break;
+	case PreparedBlockKind::Details:
+		AppendDetailsRevealLines(lines, block, st);
+		break;
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::Placeholder:
+		AppendMediaRevealLines(lines, block);
+		break;
+	case PreparedBlockKind::RelatedArticle:
+		AppendGenericRevealBand(lines, block.visibleMediaRect);
+		break;
+	case PreparedBlockKind::EmbedPost:
+		AppendEmbedPostRevealLines(lines, block, st);
+		break;
+	}
+}
+
+void AppendBlocksRevealLines(
+		const std::vector<LaidOutBlock> &blocks,
+		const style::Markdown &st,
+		std::vector<MarkdownArticleRevealLine> *lines) {
+	for (const auto &block : blocks) {
+		AppendBlockRevealLines(lines, block, st);
+	}
+}
+
+[[nodiscard]] std::vector<MarkdownArticleRevealLine> CollectRevealLines(
+		const std::vector<LaidOutBlock> &blocks,
+		const style::Markdown &st) {
+	auto result = std::vector<MarkdownArticleRevealLine>();
+	AppendBlocksRevealLines(blocks, st, &result);
+	return result;
+}
+
+[[nodiscard]] PendingHighlightKey PendingHighlightKeyForBlock(
+		const LaidOutBlock &block) {
+	return {
+		.text = CodeBlockDisplayText(block.copyText),
+		.language = block.codeLanguage,
+	};
+}
+
+[[nodiscard]] Ui::Text::StateResult TextStateAtLeaf(
+		const Ui::Text::String &leaf,
+		QRect rect,
+		int width,
+		QPoint point,
+		Ui::Text::StateRequest::Flags flags,
+		style::align align = style::al_left,
+		bool clampToRect = false) {
+	if (rect.isEmpty()) {
+		return {};
+	}
+	if (!rect.contains(point)) {
+		if (!clampToRect) {
+			return {};
+		}
+		point.setX(std::clamp(point.x(), rect.left(), rect.right()));
+		point.setY(std::clamp(point.y(), rect.top(), rect.bottom()));
+	}
+	auto request = Ui::Text::StateRequest();
+	request.align = align;
+	request.flags = flags | Ui::Text::StateRequest::Flag::BreakEverywhere;
+	const auto availableWidth = std::max(width, 1);
+	return leaf.getState(
+		point - rect.topLeft(),
+		TextGeometry(availableWidth),
+		request);
+}
+
+[[nodiscard]] SegmentSpan FullSegmentSpan(
+		const std::vector<SelectableSegment> &segments) {
+	return { 0, int(segments.size()) };
+}
+
+void RebuildVisibleSegmentLookup(
+		const std::vector<SelectableSegment> &segments,
+		std::vector<int> *tops,
+		std::vector<int> *bottoms) {
+	if (!tops || !bottoms) {
+		return;
+	}
+	tops->clear();
+	bottoms->clear();
+	tops->reserve(segments.size());
+	bottoms->reserve(segments.size());
+	auto runningBottom = std::numeric_limits<int>::lowest();
+	for (const auto &segment : segments) {
+		tops->push_back(segment.outerRect.top());
+		runningBottom = std::max(runningBottom, segment.outerRect.bottom());
+		bottoms->push_back(runningBottom);
+	}
+}
+
+[[nodiscard]] SegmentSpan LookupVisibleSegmentSpan(
+		const std::vector<int> &tops,
+		const std::vector<int> &bottoms,
+		LogicalVisibleRange range) {
+	if (tops.empty() || bottoms.empty() || (range.bottom <= range.top)) {
+		return {};
+	}
+	const auto from = int(std::lower_bound(
+		bottoms.begin(),
+		bottoms.end(),
+		range.top) - bottoms.begin());
+	if (from >= int(tops.size())) {
+		return {};
+	}
+	const auto till = int(std::upper_bound(
+		tops.begin() + from,
+		tops.end(),
+		range.bottom - 1) - tops.begin());
+	return (from < till) ? SegmentSpan{ from, till } : SegmentSpan();
+}
+
+[[nodiscard]] std::optional<PreparedLink> PreparedLinkForMediaActivation(
+		const MediaActivation &activation) {
+	if (activation.kind != MediaActivationKind::ExternalUrl
+		|| activation.url.isEmpty()) {
+		return std::nullopt;
+	}
+	if (const auto prepared = ClassifiedLink(0, activation.url, nullptr);
+		prepared.kind == PreparedLinkKind::External) {
+		return prepared;
+	}
+	return PreparedLink{
+		.kind = PreparedLinkKind::External,
+		.target = activation.url,
+		.copyText = UrlClickHandler::EncodeForOpening(activation.url),
+		.entityType = EntityType::Url,
+		.shown = EntityLinkShown::Full,
+	};
+}
+
+[[nodiscard]] std::optional<PreparedLink> PreparedLinkForDetailsBlock(
+		const SelectableSegment &segment) {
+	if (!segment.block
+		|| segment.block->kind != PreparedBlockKind::Details
+		|| segment.block->anchorId.isEmpty()) {
+		return std::nullopt;
+	}
+	return PreparedLink{
+		.kind = PreparedLinkKind::ToggleDetails,
+		.target = segment.block->anchorId,
+	};
+}
+
+[[nodiscard]] int ComputeScrollTo(
+		int toFrom,
+		int toTill,
+		int toMin,
+		int toMax,
+		int current,
+		int size) {
+	if (toFrom < toMin) {
+		toFrom = toMin;
+	} else if (toFrom > toMax) {
+		toFrom = toMax;
+	}
+	const auto exact = (toTill < 0);
+
+	const auto curBottom = current + size;
+	auto scToFrom = toFrom;
+	if (!exact && toFrom >= current) {
+		if (toTill < toFrom) {
+			toTill = toFrom;
+		}
+		if (toTill <= curBottom) {
+			return current;
+		}
+
+		scToFrom = toTill - size;
+		if (scToFrom > toFrom) {
+			scToFrom = toFrom;
+		}
+		if (scToFrom == current) {
+			return current;
+		}
+	} else {
+		scToFrom = toFrom;
+	}
+	return scToFrom;
+}
+
+[[nodiscard]] QRect LogicalTextRectForSegment(const SelectableSegment &segment) {
+	if (segment.cell) {
+		return segment.cell->textRect;
+	} else if (!segment.block) {
+		return segment.textRect;
+	} else if (segment.leaf == &segment.block->leaf) {
+		return segment.block->textRect;
+	} else if (segment.leaf == &segment.block->labelLeaf) {
+		return segment.block->labelRect;
+	} else if (segment.leaf == &segment.block->subtitleLeaf) {
+		return segment.block->subtitleRect;
+	} else if (segment.leaf == &segment.block->actionLeaf) {
+		return segment.block->actionRect;
+	}
+	return segment.textRect;
+}
+
+[[nodiscard]] MarkdownArticleHitTestResult HitSegmentBoundary(
+		const SelectableSegment &segment,
+		int offset) {
+	auto result = MarkdownArticleHitTestResult();
+	result.segmentIndex = segment.index;
+	result.forcedOffset = std::clamp(offset, 0, SegmentLength(segment));
+	result.state.uponSymbol = true;
+	result.state.afterSymbol = (result.forcedOffset > 0);
+	return result;
+}
+
+[[nodiscard]] MarkdownArticleHitTestResult HitTextSegment(
+		const SelectableSegment &segment,
+		QPoint point,
+		Ui::Text::StateRequest::Flags flags) {
+	if (!segment.isTextLeaf() || !segment.outerRect.contains(point)) {
+		return {};
+	}
+	const auto insideText = segment.textRect.contains(point);
+	if (!insideText
+		&& !(flags & Ui::Text::StateRequest::Flag::LookupSymbol)) {
+		return {};
+	}
+	auto result = MarkdownArticleHitTestResult();
+	result.segmentIndex = segment.index;
+	const auto logicalRect = LogicalTextRectForSegment(segment);
+	result.state = TextStateAtLeaf(
+		*segment.leaf,
+		logicalRect,
+		segment.textWidth,
+		point,
+		flags,
+		segment.align,
+		!insideText);
+	if (!insideText) {
+		result.state.link = nullptr;
+	}
+	result.preparedLink = ExtractPreparedLink(result.state.link);
+	if (!result.preparedLink
+		&& (flags & Ui::Text::StateRequest::Flag::LookupLink)) {
+		if (const auto prepared = PreparedLinkForDetailsBlock(segment)) {
+			result.preparedLink = prepared;
+			if (!insideText) {
+				result.state.link = CreatePreparedLinkHandler(*prepared);
+			}
+		}
+	}
+	result.direct = true;
+	return result;
+}
+
+[[nodiscard]] MarkdownArticleHitTestResult HitCodeBlockHeader(
+		const SelectableSegment &segment,
+		QPoint point,
+		Ui::Text::StateRequest::Flags flags) {
+	if (segment.kind != SelectableSegmentKind::CodeBlock
+		|| !segment.block
+		|| !(flags & Ui::Text::StateRequest::Flag::LookupSymbol)
+		|| !segment.block->headerRect.contains(point)) {
+		return {};
+	}
+	auto result = MarkdownArticleHitTestResult();
+	result.segmentIndex = segment.index;
+	result.forcedOffset = 0;
+	result.state.uponSymbol = true;
+	result.direct = true;
+	result.codeHeaderCopy = true;
+	return result;
+}
+
+[[nodiscard]] MarkdownArticleHitTestResult HitBlockSegment(
+		const SelectableSegment &segment,
+		QPoint point,
+		Ui::Text::StateRequest::Flags flags) {
+	if (segment.isTextLeaf()
+		|| !(flags & Ui::Text::StateRequest::Flag::LookupSymbol)
+		|| !segment.outerRect.contains(point)) {
+		return {};
+	}
+	const auto after = (point.y() > segment.outerRect.center().y())
+		|| ((point.y() == segment.outerRect.center().y())
+			&& (point.x() >= segment.outerRect.center().x()));
+	auto result = HitSegmentBoundary(
+		segment,
+		after ? SegmentLength(segment) : 0);
+	const auto applyActivation = [&](const MediaActivation &activation) {
+		result.mediaActivation = activation;
+		if (const auto prepared = PreparedLinkForMediaActivation(activation)) {
+			result.preparedLink = prepared;
+			result.state.link = CreatePreparedLinkHandler(*prepared);
+		}
+	};
+	if (segment.block) {
+		if (segment.block->kind == PreparedBlockKind::RelatedArticle
+			&& segment.block->preparedLink) {
+			result.preparedLink = segment.block->preparedLink;
+			result.state.link = segment.block->preparedLinkHandler;
+			result.mediaActivation = {};
+		} else if (segment.block->mediaBlock) {
+			if (const auto link = segment.block->mediaBlock->linkAt(point)) {
+				result.state.link = link;
+				result.preparedLink = std::nullopt;
+				result.mediaActivation = {};
+			} else {
+				applyActivation(segment.block->mediaBlock->activationAt(point));
+			}
+		} else {
+			applyActivation(segment.block->activation);
+			if (result.mediaActivation.kind == MediaActivationKind::Embed
+				&& segment.block->placeholderRuntime) {
+				result.state.link = segment.block->placeholderRuntime->clickHandler;
+				result.placeholderLocalPoint = point
+					- segment.block->mediaRect.topLeft();
+			}
+		}
+	}
+	result.direct = true;
+	return result;
+}
+
+[[nodiscard]] MarkdownArticleHitTestResult HitSegmentFallback(
+		const std::vector<SelectableSegment> &segments,
+		SegmentSpan span,
+		QPoint point) {
+	if (segments.empty() || span.empty()) {
+		return {};
+	}
+	for (auto i = span.from; i != span.till; ++i) {
+		const auto &segment = segments[i];
+		const auto &rect = segment.outerRect;
+		if (point.y() < rect.top()) {
+			return HitSegmentBoundary(segment, 0);
+		}
+		if (point.y() <= rect.bottom()) {
+			if (point.x() < rect.left()) {
+				return HitSegmentBoundary(segment, 0);
+			} else if (point.x() > rect.right()) {
+				return HitSegmentBoundary(
+					segment,
+					SegmentLength(segment));
+			}
+		}
+	}
+	return HitSegmentBoundary(
+		segments[span.till - 1],
+		SegmentLength(segments[span.till - 1]));
+}
+
+[[nodiscard]] bool ContainsPoint(QRect rect, QPoint point) {
+	return !rect.isEmpty() && rect.contains(point);
+}
+
+struct ActiveHorizontalScrollOwnerState {
+	QRect viewport;
+	int shift = 0;
+};
+
+[[nodiscard]] QRect TranslateRect(QRect rect, int shift) {
+	return rect.isEmpty() ? rect : rect.translated(shift, 0);
+}
+
+[[nodiscard]] QRect ClipRectToViewport(QRect rect, QRect viewport) {
+	if (rect.isEmpty() || viewport.isEmpty()) {
+		return QRect();
+	}
+	const auto left = std::max(rect.x(), viewport.x());
+	const auto right = std::min(
+		rect.x() + rect.width(),
+		viewport.x() + viewport.width());
+	return QRect(
+		left,
+		rect.y(),
+		std::max(right - left, 0),
+		rect.height());
+}
+
+[[nodiscard]] QPoint TranslatePoint(QPoint point, int shift) {
+	return point + QPoint(shift, 0);
+}
+
+[[nodiscard]] QPoint ClampPointToViewport(QPoint point, QRect viewport) {
+	if (viewport.isEmpty()) {
+		return point;
+	}
+	const auto right = viewport.x() + std::max(viewport.width() - 1, 0);
+	point.setX(std::clamp(point.x(), viewport.x(), right));
+	return point;
+}
+
+[[nodiscard]] QRect BaseVisibleTableRect(const LaidOutBlock &block) {
+	if (!block.scrollViewportRect.isEmpty()) {
+		return block.scrollViewportRect;
+	} else if (block.logicalGeometry.tableRect.isEmpty()) {
+		return QRect();
+	}
+	return QRect(
+		block.logicalGeometry.tableRect.x(),
+		block.logicalGeometry.tableRect.y(),
+		std::min(
+			block.logicalGeometry.tableRect.width(),
+			std::max(block.logicalGeometry.outer.width(), 1)),
+		block.logicalGeometry.tableRect.height());
+}
+
+void RestoreLogicalBlockGeometry(LaidOutBlock *block) {
+	block->outer = block->logicalGeometry.outer;
+	block->headerRect = block->logicalGeometry.headerRect;
+	block->bodyRect = block->logicalGeometry.bodyRect;
+	block->iconRect = block->logicalGeometry.iconRect;
+	block->textRect = block->logicalGeometry.textRect;
+	block->labelRect = block->logicalGeometry.labelRect;
+	block->subtitleRect = block->logicalGeometry.subtitleRect;
+	block->actionRect = block->logicalGeometry.actionRect;
+	block->markerRect = block->logicalGeometry.markerRect;
+	block->contentRect = block->logicalGeometry.contentRect;
+	block->formulaRect = block->logicalGeometry.formulaRect;
+	block->tableRect = block->logicalGeometry.tableRect;
+	block->mediaRect = block->logicalGeometry.mediaRect;
+	block->thumbnailRect = block->logicalGeometry.thumbnailRect;
+	block->markerCenter = block->logicalGeometry.markerCenter;
+	block->visibleFormulaRect = block->formulaRect.intersected(
+		block->contentRect);
+	block->visibleTableRect = BaseVisibleTableRect(*block);
+	block->tableScrollbarTrackRect = block->scrollScrollbarTrackRect;
+	block->tableScrollbarThumbRect = QRect();
+	block->scrollScrollbarThumbRect = QRect();
+	block->visibleMediaRect = block->mediaRect;
+	block->insideHorizontalScroll = false;
+	block->horizontalScrollAncestorShift = 0;
+	for (auto &row : block->tableRows) {
+		row.outer = row.logicalOuter;
+		for (auto &cell : row.cells) {
+			cell.outer = cell.logicalOuter;
+			cell.textRect = cell.logicalTextRect;
+		}
+	}
+}
+
+[[nodiscard]] bool ScrollOwnerMovesOwnContent(PreparedBlockKind kind) {
+	switch (kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+	case PreparedBlockKind::CodeBlock:
+	case PreparedBlockKind::DisplayMath:
+	case PreparedBlockKind::Table:
+		return true;
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+	case PreparedBlockKind::Quote:
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::RelatedArticle:
+	case PreparedBlockKind::EmbedPost:
+	case PreparedBlockKind::Placeholder:
+	case PreparedBlockKind::Details:
+		return false;
+	}
+	return false;
+}
+
+[[nodiscard]] bool ScrollOwnerMovesChildren(PreparedBlockKind kind) {
+	switch (kind) {
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+	case PreparedBlockKind::Quote:
+	case PreparedBlockKind::EmbedPost:
+	case PreparedBlockKind::Details:
+		return true;
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+	case PreparedBlockKind::CodeBlock:
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::DisplayMath:
+	case PreparedBlockKind::Table:
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::RelatedArticle:
+	case PreparedBlockKind::Placeholder:
+		return false;
+	}
+	return false;
+}
+
+void ApplyTranslatedDescendantGeometry(
+		LaidOutBlock *block,
+		const ActiveHorizontalScrollOwnerState &state) {
+	block->insideHorizontalScroll = true;
+	block->horizontalScrollAncestorShift = state.shift;
+	block->outer = ClipRectToViewport(
+		TranslateRect(block->outer, state.shift),
+		state.viewport);
+	block->headerRect = ClipRectToViewport(
+		TranslateRect(block->headerRect, state.shift),
+		state.viewport);
+	block->bodyRect = ClipRectToViewport(
+		TranslateRect(block->bodyRect, state.shift),
+		state.viewport);
+	block->iconRect = ClipRectToViewport(
+		TranslateRect(block->iconRect, state.shift),
+		state.viewport);
+	block->contentRect = ClipRectToViewport(
+		TranslateRect(block->contentRect, state.shift),
+		state.viewport);
+	block->textRect = TranslateRect(block->textRect, state.shift);
+	block->labelRect = TranslateRect(block->labelRect, state.shift);
+	block->subtitleRect = TranslateRect(block->subtitleRect, state.shift);
+	block->actionRect = TranslateRect(block->actionRect, state.shift);
+	block->markerRect = ClipRectToViewport(
+		TranslateRect(block->markerRect, state.shift),
+		state.viewport);
+	block->formulaRect = TranslateRect(block->formulaRect, state.shift);
+	block->tableRect = TranslateRect(block->tableRect, state.shift);
+	block->mediaRect = TranslateRect(block->mediaRect, state.shift);
+	block->thumbnailRect = TranslateRect(block->thumbnailRect, state.shift);
+	block->markerCenter = ClampPointToViewport(
+		TranslatePoint(block->markerCenter, state.shift),
+		state.viewport);
+	block->visibleFormulaRect = ClipRectToViewport(
+		block->formulaRect,
+		state.viewport);
+	block->visibleTableRect = ClipRectToViewport(
+		TranslateRect(BaseVisibleTableRect(*block), state.shift),
+		state.viewport);
+	block->visibleMediaRect = ClipRectToViewport(
+		block->mediaRect,
+		state.viewport);
+	for (auto &row : block->tableRows) {
+		row.outer = ClipRectToViewport(
+			TranslateRect(row.logicalOuter, state.shift),
+			state.viewport);
+		for (auto &cell : row.cells) {
+			cell.outer = ClipRectToViewport(
+				TranslateRect(cell.logicalOuter, state.shift),
+				state.viewport);
+			cell.textRect = TranslateRect(cell.logicalTextRect, state.shift);
+		}
+	}
+}
+
+void ApplyOwnerContentGeometry(
+		LaidOutBlock *block,
+		const ActiveHorizontalScrollOwnerState &state) {
+	switch (block->kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+	case PreparedBlockKind::CodeBlock:
+		block->textRect = TranslateRect(block->logicalGeometry.textRect, state.shift);
+		break;
+	case PreparedBlockKind::DisplayMath:
+		block->formulaRect = TranslateRect(
+			block->logicalGeometry.formulaRect,
+			state.shift);
+		block->textRect = TranslateRect(block->logicalGeometry.textRect, state.shift);
+		block->visibleFormulaRect = ClipRectToViewport(
+			block->formulaRect,
+			state.viewport);
+		break;
+	case PreparedBlockKind::Table:
+		block->visibleTableRect = block->scrollViewportRect;
+		block->tableScrollbarTrackRect = block->scrollScrollbarTrackRect;
+		for (auto &row : block->tableRows) {
+			row.outer = ClipRectToViewport(
+				TranslateRect(row.logicalOuter, state.shift),
+				block->visibleTableRect);
+			for (auto &cell : row.cells) {
+				cell.outer = ClipRectToViewport(
+					TranslateRect(cell.logicalOuter, state.shift),
+					block->visibleTableRect);
+				cell.textRect = TranslateRect(
+					cell.logicalTextRect,
+					state.shift);
+			}
+		}
+		break;
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+	case PreparedBlockKind::Quote:
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::RelatedArticle:
+	case PreparedBlockKind::EmbedPost:
+	case PreparedBlockKind::Placeholder:
+	case PreparedBlockKind::Details:
+		break;
+	}
+}
+
+[[nodiscard]] bool ValidBlockPath(const PreparedEditBlockPath &path) {
+	return (path.index >= 0);
+}
+
+[[nodiscard]] PreparedEditBlockSource EditBlockSourceFromPath(
+		PreparedEditBlockPath path) {
+	return { .path = std::move(path) };
+}
+
+[[nodiscard]] PreparedEditTableRowSource EditTableRowSourceFromCell(
+		const PreparedEditTableCellSource &source) {
+	return {
+		.block = source.block,
+		.tableRowIndex = source.tableRowIndex,
+	};
+}
+
+[[nodiscard]] PreparedEditHit WithLeaf(
+		PreparedEditHit hit,
+		const std::optional<PreparedEditLeafSource> &leaf) {
+	if (leaf) {
+		hit.leaf = *leaf;
+	}
+	return hit;
+}
+
+[[nodiscard]] PreparedEditHit EditHitFromBlockSource(
+		const PreparedEditBlockSource &source,
+		const std::optional<PreparedEditLeafSource> &leaf = std::nullopt) {
+	if (!ValidBlockPath(source.path)) {
+		return {};
+	}
+	auto result = PreparedEditHit();
+	result.kind = PreparedEditHitKind::Block;
+	result.block = source;
+	return WithLeaf(std::move(result), leaf);
+}
+
+[[nodiscard]] PreparedEditHit EditHitFromListItemSource(
+		const PreparedEditListItemSource &source,
+		const std::optional<PreparedEditLeafSource> &leaf = std::nullopt) {
+	if (!ValidBlockPath(source.block) || source.listItemIndex < 0) {
+		return {};
+	}
+	auto result = PreparedEditHit();
+	result.kind = PreparedEditHitKind::ListItem;
+	result.block = EditBlockSourceFromPath(source.block);
+	result.listItem = source;
+	return WithLeaf(std::move(result), leaf);
+}
+
+[[nodiscard]] PreparedEditHit EditHitFromTableRowSource(
+		const PreparedEditTableRowSource &source,
+		const std::optional<PreparedEditLeafSource> &leaf = std::nullopt) {
+	if (!ValidBlockPath(source.block) || source.tableRowIndex < 0) {
+		return {};
+	}
+	auto result = PreparedEditHit();
+	result.kind = PreparedEditHitKind::TableRow;
+	result.block = EditBlockSourceFromPath(source.block);
+	result.tableRow = source;
+	return WithLeaf(std::move(result), leaf);
+}
+
+[[nodiscard]] PreparedEditHit EditHitFromTableCellSource(
+		const PreparedEditTableCellSource &source,
+		const std::optional<PreparedEditLeafSource> &leaf = std::nullopt) {
+	if (!ValidBlockPath(source.block)
+		|| source.tableRowIndex < 0
+		|| source.tableCellIndex < 0) {
+		return {};
+	}
+	auto result = PreparedEditHit();
+	result.kind = PreparedEditHitKind::TableCell;
+	result.block = EditBlockSourceFromPath(source.block);
+	result.tableRow = EditTableRowSourceFromCell(source);
+	result.tableCell = source;
+	return WithLeaf(std::move(result), leaf);
+}
+
+[[nodiscard]] PreparedEditHit EditHitFromLeafSource(
+		const PreparedEditLeafSource &source,
+		bool preferLeaf) {
+	if (!ValidBlockPath(source.block)) {
+		return {};
+	}
+	switch (source.kind) {
+	case PreparedEditLeafKind::ListItemText:
+		return EditHitFromListItemSource(
+			PreparedEditListItemSource{
+				.block = source.block,
+				.listItemIndex = source.listItemIndex,
+			},
+			source);
+	case PreparedEditLeafKind::TableCellText:
+		return EditHitFromTableCellSource(
+			PreparedEditTableCellSource{
+				.block = source.block,
+				.tableRowIndex = source.tableRowIndex,
+				.tableCellIndex = source.tableCellIndex,
+			},
+			source);
+	case PreparedEditLeafKind::BlockText:
+	case PreparedEditLeafKind::BlockCaption:
+	case PreparedEditLeafKind::MathFormula: {
+		auto result = PreparedEditHit();
+		result.kind = preferLeaf
+			? PreparedEditHitKind::Leaf
+			: PreparedEditHitKind::Block;
+		result.block = EditBlockSourceFromPath(source.block);
+		result.leaf = source;
+		return result;
+	} break;
+	}
+	return {};
+}
+
+[[nodiscard]] PreparedEditHit EditFallbackHitForBlock(
+		const LaidOutBlock &block);
+
+[[nodiscard]] PreparedEditHit EditHitForBlock(
+		const LaidOutBlock &block,
+		QPoint point);
+
+[[nodiscard]] PreparedEditBlockContainerPath ListItemChildContainer(
+		const PreparedEditListItemSource &source) {
+	auto result = source.block.container;
+	result.steps.push_back({
+		.kind = PreparedEditBlockContainerKind::ListItemChildren,
+		.blockIndex = source.block.index,
+		.listItemIndex = source.listItemIndex,
+	});
+	return result;
+}
+
+[[nodiscard]] bool HitHasRealBlockInContainer(
+		const PreparedEditHit &hit,
+		const PreparedEditBlockContainerPath &container) {
+	return hit.block
+		&& (hit.block->path.container.steps.size() >= container.steps.size())
+		&& std::equal(
+			container.steps.begin(),
+			container.steps.end(),
+			hit.block->path.container.steps.begin());
+}
+
+[[nodiscard]] PreparedEditHit EditHitForBlocks(
+		const std::vector<LaidOutBlock> &blocks,
+		QPoint point) {
+	auto fallback = PreparedEditHit();
+	auto fallbackDistance = std::numeric_limits<int>::max();
+	for (const auto &block : blocks) {
+		if (ContainsPoint(block.outer, point)) {
+			return EditHitForBlock(block, point);
+		}
+		const auto candidate = EditFallbackHitForBlock(block);
+		if (!candidate.valid()) {
+			continue;
+		}
+		const auto distance = (point.y() < block.outer.top())
+			? (block.outer.top() - point.y())
+			: (point.y() > block.outer.bottom())
+			? (point.y() - block.outer.bottom())
+			: 0;
+		if (distance < fallbackDistance) {
+			fallback = candidate;
+			fallbackDistance = distance;
+		}
+	}
+	return fallback;
+}
+
+[[nodiscard]] PreparedEditHit EditFallbackHitForBlock(
+		const LaidOutBlock &block) {
+	if (block.editListItem) {
+		return EditHitFromListItemSource(*block.editListItem);
+	} else if (block.editBlock) {
+		return EditHitFromBlockSource(*block.editBlock);
+	} else if (block.editLeaf) {
+		return EditHitFromLeafSource(*block.editLeaf, false);
+	}
+	return {};
+}
+
+[[nodiscard]] MarkdownArticleEditControlHit EditControlHitForBlocks(
+		const std::vector<LaidOutBlock> &blocks,
+		QPoint point);
+
+[[nodiscard]] QRect VisibleTextRectForBlock(const LaidOutBlock &block) {
+	switch (block.kind) {
+	case PreparedBlockKind::CodeBlock:
+		return ClipRectToViewport(block.textRect, block.contentRect);
+	case PreparedBlockKind::Details:
+		return ClipRectToViewport(block.textRect, block.headerRect);
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::DisplayMath:
+	case PreparedBlockKind::Table:
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::RelatedArticle:
+	case PreparedBlockKind::EmbedPost:
+	case PreparedBlockKind::Placeholder:
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+	case PreparedBlockKind::Quote:
+		return ClipRectToViewport(block.textRect, block.outer);
+	}
+	return ClipRectToViewport(block.textRect, block.outer);
+}
+
+[[nodiscard]] PreparedEditHit EditHitForTableCell(
+		const LaidOutTableCell &cell,
+		QPoint point) {
+	auto leaf = ContainsPoint(ClipRectToViewport(cell.textRect, cell.outer), point)
+		? cell.editLeaf
+		: std::optional<PreparedEditLeafSource>();
+	if (cell.editCell) {
+		return EditHitFromTableCellSource(*cell.editCell, leaf);
+	} else if (leaf) {
+		return EditHitFromLeafSource(*leaf, false);
+	}
+	return {};
+}
+
+[[nodiscard]] PreparedEditHit EditHitForTableBlock(
+		const LaidOutBlock &block,
+		QPoint point) {
+	if (ContainsPoint(VisibleTextRectForBlock(block), point) && block.editLeaf) {
+		if (block.editBlock) {
+			return EditHitFromBlockSource(*block.editBlock, block.editLeaf);
+		}
+		return EditHitFromLeafSource(*block.editLeaf, false);
+	}
+	for (const auto &row : block.tableRows) {
+		for (const auto &cell : row.cells) {
+			if (ContainsPoint(cell.outer, point)) {
+				if (const auto result = EditHitForTableCell(cell, point);
+					result.valid()) {
+					return result;
+				}
+			}
+		}
+	}
+	for (const auto &row : block.tableRows) {
+		if (ContainsPoint(row.outer, point)) {
+			if (row.editRow) {
+				return EditHitFromTableRowSource(*row.editRow);
+			}
+		}
+	}
+	return EditFallbackHitForBlock(block);
+}
+
+[[nodiscard]] PreparedEditHit EditHitForListBlock(
+		const LaidOutBlock &block,
+		QPoint point) {
+	if (!block.children.empty()) {
+		if (const auto result = EditHitForBlocks(block.children, point);
+			result.valid()) {
+			return result;
+		}
+	}
+	return EditFallbackHitForBlock(block);
+}
+
+[[nodiscard]] PreparedEditHit EditHitForListItemBlock(
+		const LaidOutBlock &block,
+		QPoint point) {
+	const auto listItemHit = EditFallbackHitForBlock(block);
+	if (ContainsPoint(block.contentRect, point) && !block.children.empty()) {
+		if (const auto childHit = EditHitForBlocks(block.children, point);
+			childHit.valid()) {
+			if (block.editListItem
+				&& HitHasRealBlockInContainer(
+					childHit,
+					ListItemChildContainer(*block.editListItem))) {
+				return childHit;
+			}
+			return childHit.leaf
+				? WithLeaf(listItemHit, childHit.leaf)
+				: listItemHit;
+		}
+	}
+	return listItemHit;
+}
+
+[[nodiscard]] PreparedEditHit EditHitForQuoteBlock(
+		const LaidOutBlock &block,
+		QPoint point) {
+	if (ContainsPoint(block.contentRect, point) && !block.children.empty()) {
+		if (const auto childHit = EditHitForBlocks(block.children, point);
+			childHit.valid()) {
+			return childHit;
+		}
+	}
+	return EditFallbackHitForBlock(block);
+}
+
+[[nodiscard]] PreparedEditHit EditHitForDetailsBlock(
+		const LaidOutBlock &block,
+		QPoint point) {
+	if (ContainsPoint(block.headerRect, point)) {
+		if (ContainsPoint(VisibleTextRectForBlock(block), point) && block.editLeaf) {
+			if (block.editBlock) {
+				return EditHitFromBlockSource(*block.editBlock, block.editLeaf);
+			}
+			return EditHitFromLeafSource(*block.editLeaf, false);
+		}
+		return EditFallbackHitForBlock(block);
+	}
+	if (ContainsPoint(block.contentRect, point) && !block.children.empty()) {
+		if (const auto childHit = EditHitForBlocks(block.children, point);
+			childHit.valid()) {
+			return childHit;
+		}
+	}
+	return EditFallbackHitForBlock(block);
+}
+
+[[nodiscard]] MarkdownArticleEditControlHit EditControlHitForListItemBlock(
+		const LaidOutBlock &block,
+		QPoint point) {
+	if (block.taskState != TaskState::None
+		&& block.editListItem
+		&& ContainsPoint(block.markerRect, point)) {
+		return {
+			.kind = MarkdownArticleEditControlHitKind::TaskMarker,
+			.listItem = *block.editListItem,
+		};
+	}
+	if (!block.children.empty()) {
+		return EditControlHitForBlocks(block.children, point);
+	}
+	return {};
+}
+
+[[nodiscard]] MarkdownArticleEditControlHit EditControlHitForDetailsBlock(
+		const LaidOutBlock &block,
+		QPoint point) {
+	if (ContainsPoint(block.headerRect, point) && block.editBlock) {
+		const auto leftWidth = std::max(
+			block.textRect.left() - block.headerRect.left(),
+			0);
+		const auto leftToggleRect = QRect(
+			block.headerRect.left(),
+			block.headerRect.top(),
+			leftWidth,
+			block.headerRect.height());
+		if (ContainsPoint(leftToggleRect, point)
+			|| (!block.actionRect.isEmpty()
+				&& ContainsPoint(block.actionRect, point))) {
+			return {
+				.kind = MarkdownArticleEditControlHitKind::DetailsToggle,
+				.block = *block.editBlock,
+			};
+		}
+		return {};
+	}
+	if (!block.children.empty()) {
+		return EditControlHitForBlocks(block.children, point);
+	}
+	return {};
+}
+
+[[nodiscard]] MarkdownArticleEditControlHit EditControlHitForBlock(
+		const LaidOutBlock &block,
+		QPoint point) {
+	switch (block.kind) {
+	case PreparedBlockKind::ListItem:
+		return EditControlHitForListItemBlock(block, point);
+	case PreparedBlockKind::Details:
+		return EditControlHitForDetailsBlock(block, point);
+	default:
+		if (!block.children.empty()) {
+			return EditControlHitForBlocks(block.children, point);
+		}
+		return {};
+	}
+}
+
+[[nodiscard]] MarkdownArticleEditControlHit EditControlHitForBlocks(
+		const std::vector<LaidOutBlock> &blocks,
+		QPoint point) {
+	for (const auto &block : blocks) {
+		if (ContainsPoint(block.outer, point)) {
+			return EditControlHitForBlock(block, point);
+		}
+	}
+	return {};
+}
+
+[[nodiscard]] PreparedEditHit EditHitForBlock(
+		const LaidOutBlock &block,
+		QPoint point) {
+	switch (block.kind) {
+	case PreparedBlockKind::List:
+		return EditHitForListBlock(block, point);
+	case PreparedBlockKind::ListItem:
+		return EditHitForListItemBlock(block, point);
+	case PreparedBlockKind::Quote:
+		return EditHitForQuoteBlock(block, point);
+	case PreparedBlockKind::Table:
+		return EditHitForTableBlock(block, point);
+	case PreparedBlockKind::Details:
+		return EditHitForDetailsBlock(block, point);
+	case PreparedBlockKind::DisplayMath:
+		if (block.editLeaf) {
+			return EditHitFromLeafSource(*block.editLeaf, true);
+		}
+		break;
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+	case PreparedBlockKind::CodeBlock:
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::RelatedArticle:
+	case PreparedBlockKind::EmbedPost:
+	case PreparedBlockKind::Placeholder:
+		if (ContainsPoint(VisibleTextRectForBlock(block), point)
+			&& block.editLeaf) {
+			return EditHitFromLeafSource(*block.editLeaf, true);
+		}
+		break;
+	}
+	return EditFallbackHitForBlock(block);
+}
+
+[[nodiscard]] bool ToggleDetailsBlock(
+		std::vector<PreparedBlock> *blocks,
+		const QString &anchorId) {
+	if (!blocks) {
+		return false;
+	}
+	for (auto &block : *blocks) {
+		if (block.kind == PreparedBlockKind::Details
+			&& block.anchorId == anchorId) {
+			block.collapsed = !block.collapsed;
+			return true;
+		}
+		if (ToggleDetailsBlock(&block.children, anchorId)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] bool PreparedBlockHasAnchor(
+		const PreparedBlock &block,
+		const QString &anchorId) {
+	return block.anchorId == anchorId
+		|| ranges::contains(block.anchorIds, anchorId);
+}
+
+[[nodiscard]] MarkdownArticleAnchorExpansion ExpandDetailsToAnchor(
+		std::vector<PreparedBlock> *blocks,
+		const QString &anchorId) {
+	if (!blocks || anchorId.isEmpty()) {
+		return {};
+	}
+	for (auto &block : *blocks) {
+		if (PreparedBlockHasAnchor(block, anchorId)) {
+			return { true, false };
+		}
+		auto result = ExpandDetailsToAnchor(&block.children, anchorId);
+		if (result.found) {
+			if (block.kind == PreparedBlockKind::Details
+				&& block.collapsed) {
+				block.collapsed = false;
+				result.changed = true;
+			}
+			return result;
+		}
+	}
+	return {};
+}
+
+void ClearColorizedFormulaImages(std::vector<LaidOutBlock> *blocks) {
+	if (!blocks) {
+		return;
+	}
+	for (auto &block : *blocks) {
+		block.colorizedFormulaImage = QImage();
+		block.colorizedFormulaColor = QColor();
+		block.colorizedFormulaSize = QSize();
+		ClearColorizedFormulaImages(&block.children);
+	}
+}
+
+void HideLeafSpoilers(Ui::Text::String *leaf) {
+	if (leaf->hasSpoilers()) {
+		leaf->setSpoilerRevealed(false, anim::type::instant);
+	}
+}
+
+void HideTableCellSpoilers(LaidOutTableCell *cell) {
+	HideLeafSpoilers(&cell->leaf);
+	HideLeafSpoilers(&cell->placeholderLeaf);
+}
+
+void HideBlockSpoilers(LaidOutBlock *block) {
+	HideLeafSpoilers(&block->leaf);
+	HideLeafSpoilers(&block->placeholderLeaf);
+	HideLeafSpoilers(&block->labelLeaf);
+	HideLeafSpoilers(&block->subtitleLeaf);
+	HideLeafSpoilers(&block->actionLeaf);
+	HideLeafSpoilers(&block->marker);
+	HideLeafSpoilers(&block->fallbackLeaf);
+	for (auto &row : block->tableRows) {
+		for (auto &cell : row.cells) {
+			HideTableCellSpoilers(&cell);
+		}
+	}
+	for (auto &child : block->children) {
+		HideBlockSpoilers(&child);
+	}
+}
+
+void HideBlocksSpoilers(std::vector<LaidOutBlock> *blocks) {
+	for (auto &block : *blocks) {
+		HideBlockSpoilers(&block);
+	}
+}
+
+struct PreparedArticleLeafLookup {
+	PreparedBlock *block = nullptr;
+	PreparedTableCell *cell = nullptr;
+
+	[[nodiscard]] bool valid() const {
+		return block || cell;
+	}
+};
+
+struct ConstPreparedArticleLeafLookup {
+	const PreparedBlock *block = nullptr;
+	const PreparedTableCell *cell = nullptr;
+
+	[[nodiscard]] bool valid() const {
+		return block || cell;
+	}
+};
+
+struct LaidOutArticleLeafLookup {
+	LaidOutBlock *block = nullptr;
+	LaidOutTableCell *cell = nullptr;
+
+	[[nodiscard]] bool valid() const {
+		return block || cell;
+	}
+};
+
+[[nodiscard]] PreparedBlock *FindPreparedArticleBlockByPath(
+		std::vector<PreparedBlock> *blocks,
+		const PreparedEditBlockPath &path) {
+	for (auto &block : *blocks) {
+		if (block.editBlock && (block.editBlock->path == path)) {
+			return &block;
+		}
+		if (const auto nested = FindPreparedArticleBlockByPath(
+				&block.children,
+				path)) {
+			return nested;
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] const PreparedBlock *FindPreparedArticleBlockByPath(
+		const std::vector<PreparedBlock> &blocks,
+		const PreparedEditBlockPath &path) {
+	for (const auto &block : blocks) {
+		if (block.editBlock && (block.editBlock->path == path)) {
+			return &block;
+		}
+		if (const auto nested = FindPreparedArticleBlockByPath(
+				block.children,
+				path)) {
+			return nested;
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] PreparedBlock *FindPreparedArticleLeafBlock(
+		PreparedBlock *block,
+		const PreparedEditLeafSource &source) {
+	if (!block) {
+		return nullptr;
+	}
+	if (block->editLeaf && (*block->editLeaf == source)) {
+		return block;
+	}
+	for (auto &child : block->children) {
+		if (const auto nested = FindPreparedArticleLeafBlock(&child, source)) {
+			return nested;
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] const PreparedBlock *FindPreparedArticleLeafBlock(
+		const PreparedBlock *block,
+		const PreparedEditLeafSource &source) {
+	if (!block) {
+		return nullptr;
+	}
+	if (block->editLeaf && (*block->editLeaf == source)) {
+		return block;
+	}
+	for (const auto &child : block->children) {
+		if (const auto nested = FindPreparedArticleLeafBlock(&child, source)) {
+			return nested;
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] PreparedTableCell *FindPreparedArticleLeafCell(
+		PreparedBlock *block,
+		const PreparedEditLeafSource &source) {
+	if (!block) {
+		return nullptr;
+	}
+	for (auto &row : block->tableRows) {
+		for (auto &cell : row.cells) {
+			if (cell.editLeaf && (*cell.editLeaf == source)) {
+				return &cell;
+			}
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] const PreparedTableCell *FindPreparedArticleLeafCell(
+		const PreparedBlock *block,
+		const PreparedEditLeafSource &source) {
+	if (!block) {
+		return nullptr;
+	}
+	for (const auto &row : block->tableRows) {
+		for (const auto &cell : row.cells) {
+			if (cell.editLeaf && (*cell.editLeaf == source)) {
+				return &cell;
+			}
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] PreparedArticleLeafLookup FindPreparedArticleLeaf(
+		std::vector<PreparedBlock> *blocks,
+		const PreparedEditLeafSource &source) {
+	const auto owner = FindPreparedArticleBlockByPath(blocks, source.block);
+	if (!owner) {
+		return {};
+	}
+	switch (source.kind) {
+	case PreparedEditLeafKind::TableCellText:
+		return { .cell = FindPreparedArticleLeafCell(owner, source) };
+	case PreparedEditLeafKind::BlockText:
+	case PreparedEditLeafKind::BlockCaption:
+	case PreparedEditLeafKind::ListItemText:
+	case PreparedEditLeafKind::MathFormula:
+		return { .block = FindPreparedArticleLeafBlock(owner, source) };
+	}
+	return {};
+}
+
+[[nodiscard]] ConstPreparedArticleLeafLookup FindPreparedArticleLeaf(
+		const std::vector<PreparedBlock> &blocks,
+		const PreparedEditLeafSource &source) {
+	const auto owner = FindPreparedArticleBlockByPath(blocks, source.block);
+	if (!owner) {
+		return {};
+	}
+	switch (source.kind) {
+	case PreparedEditLeafKind::TableCellText:
+		return { .cell = FindPreparedArticleLeafCell(owner, source) };
+	case PreparedEditLeafKind::BlockText:
+	case PreparedEditLeafKind::BlockCaption:
+	case PreparedEditLeafKind::ListItemText:
+	case PreparedEditLeafKind::MathFormula:
+		return { .block = FindPreparedArticleLeafBlock(owner, source) };
+	}
+	return {};
+}
+
+[[nodiscard]] LaidOutBlock *FindLaidOutArticleBlockByPath(
+		std::vector<LaidOutBlock> *blocks,
+		const PreparedEditBlockPath &path) {
+	for (auto &block : *blocks) {
+		if (block.editBlock && (block.editBlock->path == path)) {
+			return &block;
+		}
+		if (const auto nested = FindLaidOutArticleBlockByPath(
+				&block.children,
+				path)) {
+			return nested;
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] LaidOutBlock *FindLaidOutArticleLeafBlock(
+		LaidOutBlock *block,
+		const PreparedEditLeafSource &source) {
+	if (!block) {
+		return nullptr;
+	}
+	if (block->editLeaf && (*block->editLeaf == source)) {
+		return block;
+	}
+	for (auto &child : block->children) {
+		if (const auto nested = FindLaidOutArticleLeafBlock(&child, source)) {
+			return nested;
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] LaidOutTableCell *FindLaidOutArticleLeafCell(
+		LaidOutBlock *block,
+		const PreparedEditLeafSource &source) {
+	if (!block) {
+		return nullptr;
+	}
+	for (auto &row : block->tableRows) {
+		for (auto &cell : row.cells) {
+			if (cell.editLeaf && (*cell.editLeaf == source)) {
+				return &cell;
+			}
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] LaidOutArticleLeafLookup FindLaidOutArticleLeaf(
+		std::vector<LaidOutBlock> *blocks,
+		const PreparedEditLeafSource &source) {
+	const auto owner = FindLaidOutArticleBlockByPath(blocks, source.block);
+	if (!owner) {
+		return {};
+	}
+	switch (source.kind) {
+	case PreparedEditLeafKind::TableCellText:
+		return { .cell = FindLaidOutArticleLeafCell(owner, source) };
+	case PreparedEditLeafKind::BlockText:
+	case PreparedEditLeafKind::BlockCaption:
+	case PreparedEditLeafKind::ListItemText:
+	case PreparedEditLeafKind::MathFormula:
+		return { .block = FindLaidOutArticleLeafBlock(owner, source) };
+	}
+	return {};
+}
+
+void PatchPreparedArticleLeaf(
+		PreparedBlock *block,
+		const PreparedBlock &prepared,
+		const PreparedEditLeafSource &source) {
+	block->text = prepared.text;
+	block->links = prepared.links;
+	block->editPlaceholderText = prepared.editPlaceholderText;
+	if (source.kind == PreparedEditLeafKind::MathFormula) {
+		block->formulaTex = prepared.formulaTex;
+		block->formulaIndex = prepared.formulaIndex;
+	}
+}
+
+void PatchPreparedArticleLeaf(
+		PreparedTableCell *cell,
+		const PreparedTableCell &prepared) {
+	cell->text = prepared.text;
+	cell->links = prepared.links;
+	cell->editPlaceholderText = prepared.editPlaceholderText;
+}
+
+void CollectCodeBlockHighlightKeys(
+		const std::vector<PreparedBlock> &blocks,
+		std::unordered_set<
+			PendingHighlightKey,
+			PendingHighlightKeyHasher> *keys) {
+	for (const auto &block : blocks) {
+		if (block.kind == PreparedBlockKind::CodeBlock
+			&& !block.codeLanguage.isEmpty()) {
+			keys->insert({
+				.text = CodeBlockDisplayText(block.text.text),
+				.language = block.codeLanguage,
+			});
+		}
+		CollectCodeBlockHighlightKeys(block.children, keys);
+	}
+}
+
+} // namespace
+
+PlaceholderBlockRuntime::PlaceholderBlockRuntime(Fn<void()> repaint)
+: clickHandler(std::make_shared<LambdaClickHandler>([] {
+}))
+, loadingAnimation(
+	[repaint = std::move(repaint)] {
+		if (repaint) {
+			repaint();
+		}
+	},
+	st::defaultInfiniteRadialAnimation) {
+}
+
+TaskMarkerRippleRuntime::TaskMarkerRippleRuntime(Fn<void()> repaint)
+: repaint(std::move(repaint)) {
+}
+
+class MarkdownArticle::Impl final : public CodeBlockSyntaxHighlightTracker {
+public:
+	Impl(
+		const style::Markdown &st,
+		std::shared_ptr<MathRenderer> renderer);
+
+	void setRenderer(std::shared_ptr<MathRenderer> renderer);
+
+	void setMediaBlockHost(MediaBlockHost *host);
+
+	void setTextRepaintCallbacks(
+		Fn<void()> repaint,
+		Fn<void(QRect)> repaintRect,
+		Fn<bool(const ClickContext&)> spoilerLinkFilter);
+
+	void setContent(MarkdownArticleContent content);
+	void updatePreparedLeaf(
+		const PreparedEditLeafSource &source,
+		const MarkdownArticleContent &prepared);
+
+	void setEditableHeightOverride(int editableIndex, int height);
+
+	void setEditableHeightOverrideForSegment(int segmentIndex, int height);
+
+	void clearEditableHeightOverride();
+
+	void setTextLeafHeightOverride(int textLeafIndex, int height);
+
+	void clearTextLeafHeightOverride();
+
+	[[nodiscard]] int maxWidth();
+	[[nodiscard]] int lastLayoutWidth() const;
+
+	[[nodiscard]] int resizeGetHeight(int width);
+
+	[[nodiscard]] auto countRevealLinesGeometry(int width)
+	-> std::vector<MarkdownArticleRevealLine>;
+
+	void setVisibleTopBottom(int visibleTop, int visibleBottom);
+
+	void paint(Painter &p, const MarkdownArticlePaintContext &context);
+
+	[[nodiscard]] MarkdownArticleHitTestResult hitTest(
+		QPoint point,
+		Ui::Text::StateRequest::Flags flags) const;
+
+	[[nodiscard]] PreparedEditHit editHitTest(QPoint point) const;
+	[[nodiscard]] MarkdownArticleEditControlHit editControlHitTest(
+		QPoint point) const;
+
+	[[nodiscard]] MarkdownArticleHorizontalScrollHit horizontalScrollHit(
+		QPoint point) const;
+	[[nodiscard]] bool canConsumeHorizontalScroll(
+		QPoint point,
+		int delta) const;
+	[[nodiscard]] bool consumeHorizontalScroll(QPoint point, int delta);
+	[[nodiscard]] bool beginHorizontalScroll(QPoint point, bool fromTouch);
+	[[nodiscard]] bool updateHorizontalScroll(QPoint point);
+	void endHorizontalScroll();
+
+	[[nodiscard]] int anchorTop(const QString &anchorId) const;
+
+	[[nodiscard]] MarkdownArticleAnchorExpansion expandDetailsToAnchor(
+		const QString &anchorId);
+
+	[[nodiscard]] bool toggleDetails(const QString &anchorId);
+
+	[[nodiscard]] bool segmentIsText(int index) const;
+
+	[[nodiscard]] bool segmentIsDisplayMath(int index) const;
+
+	[[nodiscard]] bool segmentIsEditable(int index) const;
+
+	[[nodiscard]] int segmentLength(int index) const;
+
+	[[nodiscard]] int firstTextSegmentIndex() const;
+
+	[[nodiscard]] int firstEditableSegmentIndex() const;
+
+	[[nodiscard]] int textLeafIndexForSegment(int segmentIndex) const;
+
+	[[nodiscard]] int segmentIndexForTextLeafIndex(int textLeafIndex) const;
+
+	[[nodiscard]] int editableIndexForSegment(int segmentIndex) const;
+
+	[[nodiscard]] int segmentIndexForEditableIndex(int editableIndex) const;
+
+	[[nodiscard]] QRect textSegmentRect(int segmentIndex) const;
+	[[nodiscard]] QRect logicalSegmentRect(int segmentIndex) const;
+
+	[[nodiscard]] QRect segmentRect(int segmentIndex) const;
+	[[nodiscard]] QRect displayMathEditRect(int segmentIndex) const;
+	[[nodiscard]] QRect displayMathBlockRect(int segmentIndex) const;
+	[[nodiscard]] bool revealSegment(int segmentIndex);
+
+	[[nodiscard]] MarkdownArticleTextLeafStyle textLeafStyleForSegment(
+		int segmentIndex) const;
+
+	[[nodiscard]] MarkdownArticleTextLeafStyle editableStyleForSegment(
+		int segmentIndex) const;
+
+	[[nodiscard]] int selectionOffsetFromHit(
+		const MarkdownArticleHitTestResult &result,
+		TextSelectType selectionType) const;
+
+	[[nodiscard]] TextSelection adjustSelection(
+		int segmentIndex,
+		TextSelection selection,
+		TextSelectType selectionType) const;
+
+	[[nodiscard]] bool selectionContains(
+		MarkdownArticleSelection selection,
+		const MarkdownArticleSelectionEndpoints *endpoints,
+		const MarkdownArticleHitTestResult &result) const;
+
+	[[nodiscard]] TextForMimeData textForContext(
+		const MarkdownArticleHitTestResult &result) const;
+
+	[[nodiscard]] TextForMimeData textForSelection(
+		MarkdownArticleSelection selection,
+		const MarkdownArticleSelectionEndpoints *endpoints,
+		const PreparedEditSelection *structuralSelection) const;
+
+	[[nodiscard]] bool highlightProcessDone(
+		Spellchecker::HighlightProcessId processId);
+
+	void invalidatePaletteCache();
+
+	void invalidateRasterCache();
+
+	[[nodiscard]] bool hasHeavyPart() const;
+
+	void unloadHeavyPart();
+
+	void hideSpoilers();
+
+	[[nodiscard]] MediaBlockHost *mediaBlockHost() const;
+
+	void setPlaceholderLoading(PreparedPlaceholderBlockId id);
+	void clearPlaceholderLoading(PreparedPlaceholderBlockId id);
+	void clearAllPlaceholderLoading();
+	void addTaskMarkerRipple(
+		const PreparedEditListItemSource &source,
+		QPoint point);
+	void addPlaceholderRipple(PreparedPlaceholderBlockId id, QPoint point);
+	void stopPlaceholderRipple(PreparedPlaceholderBlockId id);
+
+	void invalidateLayout();
+
+private:
+	struct ActiveHorizontalScrollDrag {
+		MarkdownArticleScrollOwnerIdentity owner;
+		QPoint pressPoint;
+		int startScrollLeft = 0;
+		int thumbGrabOffset = 0;
+		bool fromTouch = false;
+	};
+
+	[[nodiscard]] int currentDevicePixelRatio() const;
+
+	void rebuildVisibleSegmentLookup();
+
+	void refreshVisibleSegmentSpan();
+
+	void clearMediaBlocks();
+
+	void refreshMediaBlockHosts();
+
+	void clearPlaceholderRuntimes();
+
+	[[nodiscard]] std::shared_ptr<PlaceholderBlockRuntime>
+	getOrCreatePlaceholderRuntime(PreparedPlaceholderBlockId id);
+
+	void prunePlaceholderRuntimes();
+
+	void requestPlaceholderRepaint(PreparedPlaceholderBlockId id);
+
+	[[nodiscard]] auto getOrCreateTaskMarkerRippleRuntime(
+		const PreparedEditListItemSource &source)
+	-> std::shared_ptr<TaskMarkerRippleRuntime>;
+
+	void requestTaskMarkerRepaint(
+		const PreparedEditListItemSource &source);
+
+	void pruneTaskMarkerRuntimes();
+
+	[[nodiscard]] std::shared_ptr<MediaBlock> getOrCreateMediaBlock(
+		const PreparedBlock &prepared);
+
+	template <typename Factory>
+	[[nodiscard]] std::shared_ptr<MediaBlock> getOrCreateMediaBlock(
+		PreparedMediaBlockId id,
+		Factory &&factory);
+
+	[[nodiscard]] Spellchecker::HighlightProcessId tryHighlightSyntax(
+		const QString &displayText,
+		const QString &language,
+		TextWithEntities &marked) override;
+
+	[[nodiscard]] SegmentSpan candidateSegmentSpan(QPoint point) const;
+
+	void clearPendingHighlightBlockPointers();
+
+	void prunePendingHighlightProcessesForContent();
+
+	void registerPendingHighlightProcess(
+		const PendingHighlightKey &key,
+		Spellchecker::HighlightProcessId processId);
+
+	void registerPendingHighlightBlock(LaidOutBlock &block);
+
+	void registerPendingHighlightBlocks(std::vector<LaidOutBlock> &blocks);
+
+	void resetFormulaRasterCache();
+
+	void setPlaceholderLoadingValue(
+		PreparedPlaceholderBlockId id,
+		bool loading);
+
+	void invalidateLayout(bool harvestCurrentBlocks);
+	void invalidateGeometry();
+
+	[[nodiscard]] const style::Markdown &layoutStyle() const;
+	[[nodiscard]] MarkdownArticleScrollOwnerIdentity scrollOwnerIdentity(
+		const LaidOutBlock &block,
+		const std::vector<int> &preparedPath) const;
+	[[nodiscard]] MarkdownArticleHorizontalScrollLookup
+	findHorizontalScrollOwner(QPoint point) const;
+	[[nodiscard]] MarkdownArticleHorizontalScrollLookup
+	findHorizontalScrollOwner(
+		const std::vector<LaidOutBlock> &blocks,
+		const std::vector<PreparedBlock> *prepared,
+		QPoint point,
+		std::vector<int> *preparedPath) const;
+	[[nodiscard]] std::optional<MarkdownArticleHorizontalScrollLookup>
+	findHorizontalScrollOwner(int segmentIndex) const;
+	[[nodiscard]] std::optional<MarkdownArticleHorizontalScrollLookup>
+	findHorizontalScrollOwner(
+		const std::vector<LaidOutBlock> &blocks,
+		const std::vector<PreparedBlock> *prepared,
+		const SelectableSegment &segment,
+		std::optional<MarkdownArticleHorizontalScrollLookup> owner,
+		std::vector<int> *preparedPath) const;
+	[[nodiscard]] LaidOutBlock *findScrollOwnerByIdentity(
+		const MarkdownArticleScrollOwnerIdentity &identity);
+	[[nodiscard]] LaidOutBlock *findScrollOwnerByIdentity(
+		std::vector<LaidOutBlock> &blocks,
+		const std::vector<PreparedBlock> *prepared,
+		const MarkdownArticleScrollOwnerIdentity &identity,
+		std::vector<int> *preparedPath);
+	void captureScrollState();
+	void captureScrollState(
+		const std::vector<LaidOutBlock> &blocks,
+		const std::vector<PreparedBlock> *prepared,
+		std::vector<int> *preparedPath);
+	void restoreScrollState();
+	void restoreScrollState(
+		std::vector<LaidOutBlock> &blocks,
+		const std::vector<PreparedBlock> *prepared,
+		std::vector<int> *preparedPath);
+	void refreshScrolledGeometry(LaidOutBlock &block);
+	void refreshScrolledGeometry(
+		LaidOutBlock &block,
+		const ActiveHorizontalScrollOwnerState *activeOwner);
+	void refreshScrolledGeometry(std::vector<LaidOutBlock> &blocks);
+	void refreshScrolledGeometry(
+		std::vector<LaidOutBlock> &blocks,
+		const ActiveHorizontalScrollOwnerState *activeOwner);
+	void updateScrollbarThumb(LaidOutBlock &block);
+	[[nodiscard]] bool setScrollLeft(
+		LaidOutBlock &block,
+		const MarkdownArticleScrollOwnerIdentity &identity,
+		int left);
+
+	void finalizeRelayout(int heightBottom);
+	void relayout(int width);
+	void relayoutRetained(int width);
+	void retainBlocks();
+
+	mutable MarkdownArticleContent _content;
+	style::Markdown _style;
+	std::vector<RenderedFormula> _formulaRenders;
+	std::shared_ptr<MathRenderer> _renderer;
+	std::shared_ptr<InlineFormulaObjectCache> _inlineFormulaObjects;
+	MediaBlockHost *_mediaBlockHost = nullptr;
+	Fn<void()> _textRepaint;
+	Fn<void(QRect)> _textRepaintRect;
+	Fn<bool(const ClickContext&)> _textSpoilerLinkFilter;
+	int _width = -1;
+	int _laidOutWidth = 0;
+	int _height = 0;
+	int _layoutGeneration = 0;
+	MarkdownArticleRevealLineCountsCache _revealLineCounts;
+	CachedTextLeafPool _cachedTextLeafs;
+	std::vector<LaidOutBlock> _blocks;
+	std::vector<LaidOutBlock> _retainedBlocks;
+	MediaBlockStorage _mediaBlocks;
+	std::unordered_map<uint64, std::shared_ptr<PlaceholderBlockRuntime>>
+		_placeholderRuntimes;
+	TaskMarkerRippleRuntimeMap _taskMarkerRippleRuntimes;
+	std::unordered_map<
+		uint64,
+		RelatedArticleImageState> _relatedArticleImages;
+	std::unordered_map<
+		PendingHighlightKey,
+		Spellchecker::HighlightProcessId,
+		PendingHighlightKeyHasher> _pendingHighlightProcesses;
+	std::unordered_map<
+		Spellchecker::HighlightProcessId,
+		PendingHighlightEntry> _pendingHighlightEntries;
+	std::vector<std::pair<QString, int>> _anchors;
+	std::vector<SelectableSegment> _segments;
+	std::optional<LogicalVisibleRange> _visibleRange;
+	SegmentSpan _visibleSegmentSpan;
+	std::vector<int> _segmentTops;
+	std::vector<int> _segmentBottoms;
+	std::unordered_map<
+		MarkdownArticleScrollOwnerIdentity,
+		int,
+		MarkdownArticleScrollOwnerIdentityHasher> _capturedScrollLefts;
+	std::optional<ActiveHorizontalScrollDrag> _activeHorizontalScrollDrag;
+	int _editableHeightOverrideIndex = -1;
+	int _editableHeightOverride = 0;
+	bool _blocksPainted = false;
+
+};
+
+MarkdownArticle::Impl::Impl(
+	const style::Markdown &st,
+	std::shared_ptr<MathRenderer> renderer)
+: _style(st)
+, _renderer(std::move(renderer))
+, _inlineFormulaObjects(CreateInlineFormulaObjectCache(_renderer)) {
+	_style.code.font = _style.code.font->monospace();
+}
+
+void MarkdownArticle::Impl::setRenderer(std::shared_ptr<MathRenderer> renderer) {
+	_renderer = std::move(renderer);
+	SetInlineFormulaObjectCacheRenderer(_inlineFormulaObjects, _renderer);
+	invalidateRasterCache();
+	invalidateLayout();
+}
+
+void MarkdownArticle::Impl::setMediaBlockHost(MediaBlockHost *host) {
+	if (_mediaBlockHost == host) {
+		return;
+	}
+	_mediaBlockHost = host;
+	refreshMediaBlockHosts();
+}
+
+void MarkdownArticle::Impl::setTextRepaintCallbacks(
+		Fn<void()> repaint,
+		Fn<void(QRect)> repaintRect,
+		Fn<bool(const ClickContext&)> spoilerLinkFilter) {
+	_textRepaint = std::move(repaint);
+	_textRepaintRect = std::move(repaintRect);
+	_textSpoilerLinkFilter = std::move(spoilerLinkFilter);
+}
+
+void MarkdownArticle::Impl::setContent(MarkdownArticleContent content) {
+	if (hasHeavyPart()) {
+		unloadHeavyPart();
+	}
+	auto reusedMediaBlocks = MediaBlockStorage();
+	const auto reuseMediaBlocks = (_content.mediaRuntime == content.mediaRuntime);
+	RebuildCachedTextLeafs(
+		_content.blocks.blocks,
+		&_blocks,
+		layoutStyle(),
+		&_cachedTextLeafs);
+	if (!reuseMediaBlocks) {
+		PruneMediaRuntimeBoundCachedTextLeafs(&_cachedTextLeafs);
+	}
+	if (reuseMediaBlocks) {
+		auto oldMediaBlocks = MediaBlockStorage();
+		oldMediaBlocks.swap(_mediaBlocks);
+		reusedMediaBlocks = ReuseMediaBlocks(
+			_content.blocks.blocks,
+			&oldMediaBlocks,
+			content.blocks.blocks);
+	} else {
+		clearMediaBlocks();
+	}
+	clearPlaceholderRuntimes();
+	_relatedArticleImages.clear();
+	_content = std::move(content);
+	if (reuseMediaBlocks) {
+		_mediaBlocks = std::move(reusedMediaBlocks);
+	}
+	prunePendingHighlightProcessesForContent();
+	ClearInlineFormulaObjectCache(_inlineFormulaObjects);
+	resetFormulaRasterCache();
+	invalidateLayout(false);
+}
+
+void MarkdownArticle::Impl::updatePreparedLeaf(
+		const PreparedEditLeafSource &source,
+		const MarkdownArticleContent &prepared) {
+	if (!ValidBlockPath(source.block)
+		|| (_content.mediaRuntime != prepared.mediaRuntime)
+		|| (_content.editMode != prepared.editMode)) {
+		setContent(prepared);
+		return;
+	}
+	const auto current = FindPreparedArticleLeaf(&_content.blocks.blocks, source);
+	const auto incoming = FindPreparedArticleLeaf(prepared.blocks.blocks, source);
+	const auto live = FindLaidOutArticleLeaf(&_blocks, source);
+	if (!current.valid() || !incoming.valid() || !live.valid()) {
+		setContent(prepared);
+		return;
+	}
+
+	auto codeTextChanged = false;
+	auto displayMathOldIndex = -1;
+	auto displayMathNewIndex = -1;
+
+	switch (source.kind) {
+	case PreparedEditLeafKind::TableCellText:
+		if (!current.cell
+			|| !incoming.cell
+			|| !live.cell
+			|| (current.cell->header != incoming.cell->header)
+			|| (current.cell->alignment != incoming.cell->alignment)
+			|| (current.cell->verticalAlignment
+				!= incoming.cell->verticalAlignment)
+			|| (current.cell->column != incoming.cell->column)
+			|| (current.cell->colspan != incoming.cell->colspan)
+			|| (current.cell->rowspan != incoming.cell->rowspan)) {
+			setContent(prepared);
+			return;
+		}
+		PatchPreparedArticleLeaf(current.cell, *incoming.cell);
+		break;
+	case PreparedEditLeafKind::BlockText:
+	case PreparedEditLeafKind::BlockCaption:
+	case PreparedEditLeafKind::ListItemText:
+	case PreparedEditLeafKind::MathFormula:
+		if (!current.block
+			|| !incoming.block
+			|| !live.block
+			|| (current.block->kind != incoming.block->kind)
+			|| (current.block->codeLanguage != incoming.block->codeLanguage)
+			|| ((source.kind == PreparedEditLeafKind::MathFormula)
+				&& (current.block->kind != PreparedBlockKind::DisplayMath))) {
+			setContent(prepared);
+			return;
+		}
+		codeTextChanged = (current.block->kind == PreparedBlockKind::CodeBlock)
+			&& (CodeBlockDisplayText(current.block->text.text)
+				!= CodeBlockDisplayText(incoming.block->text.text));
+		displayMathOldIndex = current.block->formulaIndex;
+		displayMathNewIndex = incoming.block->formulaIndex;
+		PatchPreparedArticleLeaf(current.block, *incoming.block, source);
+		break;
+	}
+
+	_content.formulas = prepared.formulas;
+	_formulaRenders.resize(_content.formulas.size());
+	if (source.kind == PreparedEditLeafKind::MathFormula) {
+		if (displayMathOldIndex >= 0
+			&& displayMathOldIndex < int(_formulaRenders.size())) {
+			_formulaRenders[displayMathOldIndex] = RenderedFormula();
+		}
+		if (displayMathNewIndex >= 0
+			&& displayMathNewIndex < int(_formulaRenders.size())) {
+			_formulaRenders[displayMathNewIndex] = RenderedFormula();
+		}
+		if (live.block) {
+			live.block->colorizedFormulaImage = QImage();
+			live.block->colorizedFormulaColor = QColor();
+			live.block->colorizedFormulaSize = QSize();
+		}
+	}
+
+	auto context = LayoutContext();
+	context.syntaxHighlightTracker = this;
+	context.repaint = _textRepaint;
+	context.repaintRect = _textRepaintRect;
+	context.spoilerLinkFilter = _textSpoilerLinkFilter;
+	if (live.block && incoming.block) {
+		UpdateLaidOutLeafContent(
+			live.block,
+			*incoming.block,
+			&_content.formulas,
+			_inlineFormulaObjects.get(),
+			_content.mediaRuntime,
+			layoutStyle(),
+			context);
+	} else if (live.cell && incoming.cell) {
+		UpdateLaidOutLeafContent(
+			live.cell,
+			*incoming.cell,
+			&_content.formulas,
+			_inlineFormulaObjects.get(),
+			_content.mediaRuntime,
+			layoutStyle(),
+			source.tableRowIndex,
+			source.tableCellIndex,
+			context);
+	} else {
+		setContent(prepared);
+		return;
+	}
+
+	if (codeTextChanged) {
+		prunePendingHighlightProcessesForContent();
+	}
+	if (_width > 0) {
+		invalidateGeometry();
+	}
+}
+
+void MarkdownArticle::Impl::setEditableHeightOverride(
+		int editableIndex,
+		int height) {
+	editableIndex = std::max(editableIndex, -1);
+	height = std::max(height, 0);
+	if (_editableHeightOverrideIndex == editableIndex
+		&& _editableHeightOverride == height) {
+		return;
+	}
+	_editableHeightOverrideIndex = editableIndex;
+	_editableHeightOverride = height;
+	invalidateGeometry();
+}
+
+void MarkdownArticle::Impl::setEditableHeightOverrideForSegment(
+		int segmentIndex,
+		int height) {
+	setEditableHeightOverride(editableIndexForSegment(segmentIndex), height);
+}
+
+void MarkdownArticle::Impl::clearEditableHeightOverride() {
+	setEditableHeightOverride(-1, 0);
+}
+
+void MarkdownArticle::Impl::setTextLeafHeightOverride(
+		int textLeafIndex,
+		int height) {
+	setEditableHeightOverrideForSegment(
+		segmentIndexForTextLeafIndex(textLeafIndex),
+		height);
+}
+
+void MarkdownArticle::Impl::clearTextLeafHeightOverride() {
+	clearEditableHeightOverride();
+}
+
+int MarkdownArticle::Impl::maxWidth() {
+	const auto &st = layoutStyle();
+	return std::max(
+		st.pageMaxWidth,
+		st.pagePadding.left()
+			+ st.pagePadding.right()
+			+ 1);
+}
+
+int MarkdownArticle::Impl::lastLayoutWidth() const {
+	return _laidOutWidth;
+}
+
+int MarkdownArticle::Impl::resizeGetHeight(int width) {
+	width = std::max(width, 1);
+	if (_width != width) {
+		if (_blocks.empty()) {
+			relayout(width);
+		} else {
+			relayoutRetained(width);
+		}
+	}
+	return std::max(_height, 1);
+}
+
+auto MarkdownArticle::Impl::countRevealLinesGeometry(int width)
+-> std::vector<MarkdownArticleRevealLine> {
+	width = std::max(width, 1);
+	if (_width != width) {
+		if (_blocks.empty()) {
+			relayout(width);
+		} else {
+			relayoutRetained(width);
+		}
+	}
+	return CollectRevealLines(_blocks, layoutStyle());
+}
+
+void MarkdownArticle::Impl::setVisibleTopBottom(int visibleTop, int visibleBottom) {
+	if (visibleBottom <= visibleTop) {
+		_visibleRange = std::nullopt;
+		_visibleSegmentSpan = {};
+		return;
+	}
+	_visibleRange = LogicalVisibleRange{
+		.top = visibleTop,
+		.bottom = visibleBottom,
+	};
+	refreshVisibleSegmentSpan();
+}
+
+void MarkdownArticle::Impl::paint(
+		Painter &p,
+		const MarkdownArticlePaintContext &context) {
+	const auto &st = layoutStyle();
+	auto local = context;
+	local.selectionState.segments = &_segments;
+	const auto &paintSt = local.paintMarkdownStyle(st);
+	auto textPalette = paintSt.textPalette;
+	auto markBg = MarkBgColorForStyle(paintSt);
+	const auto ownedMarkBg = style::internal::OwnedColor(markBg);
+	textPalette.markBg = ownedMarkBg.color();
+	if (local.reveal) {
+		if (_revealLineCounts.layoutGeneration != _layoutGeneration) {
+			_revealLineCounts.layoutGeneration = _layoutGeneration;
+			_revealLineCounts.counts.clear();
+		}
+		local.reveal->lineCounts = &_revealLineCounts;
+	} else if (!_revealLineCounts.counts.empty()) {
+		_revealLineCounts = {};
+	}
+	const auto &previousTextPalette = p.textPalette();
+	p.setTextPalette(textPalette);
+	PaintBlocks(
+		p,
+		_blocks,
+		&_content.formulas,
+		&_formulaRenders,
+		_renderer.get(),
+		currentDevicePixelRatio(),
+		std::max(_width, 1),
+		st,
+		local);
+	p.setTextPalette(previousTextPalette);
+	_retainedBlocks.clear();
+	_blocksPainted = true;
+}
+
+MarkdownArticleHitTestResult MarkdownArticle::Impl::hitTest(
+		QPoint point,
+		Ui::Text::StateRequest::Flags flags) const {
+	const auto span = candidateSegmentSpan(point);
+	for (auto i = span.from; i != span.till; ++i) {
+		const auto &segment = _segments[i];
+		if (const auto result = HitCodeBlockHeader(segment, point, flags);
+			result.valid()) {
+			return result;
+		}
+	}
+	for (auto i = span.from; i != span.till; ++i) {
+		const auto &segment = _segments[i];
+		if (const auto result = HitTextSegment(segment, point, flags);
+			result.valid()) {
+			return result;
+		}
+	}
+	for (auto i = span.from; i != span.till; ++i) {
+		const auto &segment = _segments[i];
+		if (const auto result = HitBlockSegment(segment, point, flags);
+			result.valid()) {
+			return result;
+		}
+	}
+	if (flags & Ui::Text::StateRequest::Flag::LookupSymbol) {
+		return HitSegmentFallback(_segments, span, point);
+	}
+	return {};
+}
+
+PreparedEditHit MarkdownArticle::Impl::editHitTest(QPoint point) const {
+	return EditHitForBlocks(_blocks, point);
+}
+
+MarkdownArticleEditControlHit MarkdownArticle::Impl::editControlHitTest(
+		QPoint point) const {
+	return EditControlHitForBlocks(_blocks, point);
+}
+
+int MarkdownArticle::Impl::anchorTop(const QString &anchorId) const {
+	for (const auto &entry : _anchors) {
+		if (entry.first == anchorId) {
+			return entry.second;
+		}
+	}
+	return -1;
+}
+
+MarkdownArticleAnchorExpansion MarkdownArticle::Impl::expandDetailsToAnchor(
+		const QString &anchorId) {
+	const auto result = ExpandDetailsToAnchor(
+		&_content.blocks.blocks,
+		anchorId);
+	if (result.changed) {
+		invalidateLayout();
+	}
+	return result;
+}
+
+bool MarkdownArticle::Impl::toggleDetails(const QString &anchorId) {
+	if (!ToggleDetailsBlock(&_content.blocks.blocks, anchorId)) {
+		return false;
+	}
+	invalidateLayout();
+	return true;
+}
+
+bool MarkdownArticle::Impl::segmentIsText(int index) const {
+	const auto segment = FindSegment(&_segments, index);
+	return segment && segment->isTextLeaf();
+}
+
+bool MarkdownArticle::Impl::segmentIsDisplayMath(int index) const {
+	const auto segment = FindSegment(&_segments, index);
+	return segment && IsDisplayMathSegment(*segment);
+}
+
+bool MarkdownArticle::Impl::segmentIsEditable(int index) const {
+	const auto segment = FindSegment(&_segments, index);
+	return segment && IsEditableSegment(*segment);
+}
+
+int MarkdownArticle::Impl::segmentLength(int index) const {
+	const auto segment = FindSegment(&_segments, index);
+	return segment ? SegmentLength(*segment) : 0;
+}
+
+int MarkdownArticle::Impl::firstTextSegmentIndex() const {
+	for (const auto &segment : _segments) {
+		if (segment.isTextLeaf()) {
+			return segment.index;
+		}
+	}
+	return -1;
+}
+
+int MarkdownArticle::Impl::firstEditableSegmentIndex() const {
+	for (const auto &segment : _segments) {
+		if (IsEditableSegment(segment)) {
+			return segment.index;
+		}
+	}
+	return -1;
+}
+
+int MarkdownArticle::Impl::textLeafIndexForSegment(int segmentIndex) const {
+	auto textLeafIndex = 0;
+	for (const auto &segment : _segments) {
+		if (!segment.isTextLeaf()) {
+			continue;
+		} else if (segment.index == segmentIndex) {
+			return textLeafIndex;
+		}
+		++textLeafIndex;
+	}
+	return -1;
+}
+
+int MarkdownArticle::Impl::segmentIndexForTextLeafIndex(
+		int textLeafIndex) const {
+	if (textLeafIndex < 0) {
+		return -1;
+	}
+	auto current = 0;
+	for (const auto &segment : _segments) {
+		if (!segment.isTextLeaf()) {
+			continue;
+		} else if (current == textLeafIndex) {
+			return segment.index;
+		}
+		++current;
+	}
+	return -1;
+}
+
+int MarkdownArticle::Impl::editableIndexForSegment(int segmentIndex) const {
+	auto editableIndex = 0;
+	for (const auto &segment : _segments) {
+		if (!IsEditableSegment(segment)) {
+			continue;
+		} else if (segment.index == segmentIndex) {
+			return editableIndex;
+		}
+		++editableIndex;
+	}
+	return -1;
+}
+
+int MarkdownArticle::Impl::segmentIndexForEditableIndex(
+		int editableIndex) const {
+	if (editableIndex < 0) {
+		return -1;
+	}
+	auto current = 0;
+	for (const auto &segment : _segments) {
+		if (!IsEditableSegment(segment)) {
+			continue;
+		} else if (current == editableIndex) {
+			return segment.index;
+		}
+		++current;
+	}
+	return -1;
+}
+
+QRect MarkdownArticle::Impl::textSegmentRect(int segmentIndex) const {
+	const auto segment = FindSegment(&_segments, segmentIndex);
+	return (segment && segment->isTextLeaf()) ? segment->textRect : QRect();
+}
+
+QRect MarkdownArticle::Impl::logicalSegmentRect(int segmentIndex) const {
+	const auto segment = FindSegment(&_segments, segmentIndex);
+	if (!segment) {
+		return QRect();
+	} else if (segment->isTextLeaf()) {
+		return LogicalTextRectForSegment(*segment);
+	} else if (IsDisplayMathSegment(*segment)) {
+		return segment->block ? segment->block->formulaRect : QRect();
+	}
+	return QRect();
+}
+
+QRect MarkdownArticle::Impl::segmentRect(int segmentIndex) const {
+	const auto segment = FindSegment(&_segments, segmentIndex);
+	if (!segment) {
+		return QRect();
+	} else if (segment->isTextLeaf()) {
+		return segment->textRect;
+	} else if (IsDisplayMathSegment(*segment)) {
+		if (!segment->outerRect.isEmpty()) {
+			return segment->outerRect;
+		}
+		return segment->block ? segment->block->formulaRect : QRect();
+	}
+	return QRect();
+}
+
+QRect MarkdownArticle::Impl::displayMathEditRect(int segmentIndex) const {
+	const auto segment = FindSegment(&_segments, segmentIndex);
+	if (!segment || !IsDisplayMathSegment(*segment) || !segment->block) {
+		return QRect();
+	}
+	const auto &block = *segment->block;
+	if (!block.contentRect.isEmpty()) {
+		return block.contentRect;
+	} else if (!block.outer.isEmpty()) {
+		return block.outer;
+	}
+	return block.formulaRect;
+}
+
+QRect MarkdownArticle::Impl::displayMathBlockRect(int segmentIndex) const {
+	const auto segment = FindSegment(&_segments, segmentIndex);
+	if (!segment || !IsDisplayMathSegment(*segment) || !segment->block) {
+		return QRect();
+	}
+	const auto &block = *segment->block;
+	if (!block.outer.isEmpty()) {
+		return block.outer;
+	}
+	return displayMathEditRect(segmentIndex);
+}
+
+MarkdownArticleTextLeafStyle MarkdownArticle::Impl::textLeafStyleForSegment(
+		int segmentIndex) const {
+	const auto segment = FindSegment(&_segments, segmentIndex);
+	if (!segment || !segment->isTextLeaf()) {
+		return {};
+	}
+	const auto &st = layoutStyle();
+	const auto &textStyle = TextStyleForSegment(*segment, st);
+	return {
+		.textStyle = &textStyle,
+		.textColor = TextColorForSegment(*segment, st),
+		.markBg = MarkBgColorForStyle(st),
+		.lineHeight = TextLineHeight(textStyle),
+		.align = segment->align,
+		.italic = segment->block && segment->block->pullquote,
+	};
+}
+
+MarkdownArticleTextLeafStyle MarkdownArticle::Impl::editableStyleForSegment(
+		int segmentIndex) const {
+	const auto segment = FindSegment(&_segments, segmentIndex);
+	if (!segment) {
+		return {};
+	} else if (segment->isTextLeaf()) {
+		return textLeafStyleForSegment(segmentIndex);
+	} else if (!IsDisplayMathSegment(*segment)) {
+		return {};
+	}
+	const auto &st = layoutStyle();
+	return {
+		.textStyle = &st.displayMath.fallbackStyle,
+		.textColor = st.displayMath.fg,
+		.markBg = MarkBgColorForStyle(st),
+		.lineHeight = TextLineHeight(st.displayMath.fallbackStyle),
+		.align = ::style::al_center,
+	};
+}
+
+int MarkdownArticle::Impl::selectionOffsetFromHit(
+		const MarkdownArticleHitTestResult &result,
+		TextSelectType selectionType) const {
+	const auto segment = FindSegment(&_segments, result.segmentIndex);
+	if (!segment) {
+		return 0;
+	}
+	if (result.forcedOffset >= 0) {
+		return std::clamp(result.forcedOffset, 0, SegmentLength(*segment));
+	}
+	auto offset = int(result.state.symbol);
+	if (selectionType == TextSelectType::Letters
+		&& result.state.afterSymbol) {
+		++offset;
+	}
+	return std::clamp(offset, 0, SegmentLength(*segment));
+}
+
+TextSelection MarkdownArticle::Impl::adjustSelection(
+		int segmentIndex,
+		TextSelection selection,
+		TextSelectType selectionType) const {
+	const auto segment = FindSegment(&_segments, segmentIndex);
+	if (!segment || !segment->isTextLeaf()) {
+		return selection;
+	}
+	return segment->leaf->adjustSelection(selection, selectionType);
+}
+
+bool MarkdownArticle::Impl::selectionContains(
+		MarkdownArticleSelection selection,
+		const MarkdownArticleSelectionEndpoints *endpoints,
+		const MarkdownArticleHitTestResult &result) const {
+	if (result.codeHeaderCopy) {
+		return false;
+	}
+	const auto segment = FindSegment(&_segments, result.segmentIndex);
+	if (!segment || selection.empty() || !result.valid()) {
+		return false;
+	}
+	const auto selectionState = PaintSelectionState{
+		.segments = &_segments,
+		.selection = selection,
+		.endpoints = endpoints,
+	};
+	if (segment->tableSegmentIndex >= 0
+		&& TableSegmentSelected(selectionState, segment->tableSegmentIndex)) {
+		return true;
+	}
+	if (!segment->isTextLeaf()) {
+		return WholeSegmentSelected(*segment, selectionState);
+	}
+	const auto textSelection = TextSelectionForSegment(*segment, selectionState);
+	if (!textSelection || textSelection->empty()) {
+		return false;
+	}
+	const auto offset = selectionOffsetFromHit(result, TextSelectType::Letters);
+	return (offset >= textSelection->from) && (offset < textSelection->to);
+}
+
+TextForMimeData MarkdownArticle::Impl::textForContext(
+		const MarkdownArticleHitTestResult &result) const {
+	if (!result.valid() || !result.direct) {
+		return TextForMimeData();
+	}
+	const auto segment = FindSegment(&_segments, result.segmentIndex);
+	return segment ? TextForSegment(*segment) : TextForMimeData();
+}
+
+TextForMimeData MarkdownArticle::Impl::textForSelection(
+		MarkdownArticleSelection selection,
+		const MarkdownArticleSelectionEndpoints *endpoints,
+		const PreparedEditSelection *structuralSelection) const {
+	return TextForSelectedSegments(
+		_segments,
+		selection,
+		endpoints,
+		structuralSelection);
+}
+
+bool MarkdownArticle::Impl::highlightProcessDone(
+		Spellchecker::HighlightProcessId processId) {
+	const auto i = _pendingHighlightEntries.find(processId);
+	if (i == end(_pendingHighlightEntries)) {
+		return false;
+	}
+	auto entry = std::move(i->second);
+	_pendingHighlightEntries.erase(i);
+	_pendingHighlightProcesses.erase(entry.key);
+
+	auto rebuilt = false;
+	for (const auto block : entry.blocks) {
+		RepopulateCodeBlockLeaf(
+			*block,
+			&_content.formulas,
+			_inlineFormulaObjects.get(),
+			_content.mediaRuntime,
+			layoutStyle(),
+			true,
+			this,
+			_textRepaint,
+			_textRepaintRect,
+			_textSpoilerLinkFilter);
+		registerPendingHighlightBlock(*block);
+		rebuilt = true;
+	}
+	return rebuilt;
+}
+
+void MarkdownArticle::Impl::invalidatePaletteCache() {
+	InvalidateInlineFormulaPaletteCache(_inlineFormulaObjects);
+	ClearColorizedFormulaImages(&_blocks);
+}
+
+void MarkdownArticle::Impl::invalidateRasterCache() {
+	resetFormulaRasterCache();
+	InvalidateInlineFormulaRasterCache(_inlineFormulaObjects);
+	ClearColorizedFormulaImages(&_blocks);
+}
+
+bool MarkdownArticle::Impl::hasHeavyPart() const {
+	for (const auto &entry : _mediaBlocks) {
+		const auto &block = entry.second;
+		if (block && block->hasHeavyPart()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void MarkdownArticle::Impl::unloadHeavyPart() {
+	for (const auto &entry : _mediaBlocks) {
+		if (const auto &block = entry.second) {
+			block->unloadHeavyPart();
+		}
+	}
+}
+
+void MarkdownArticle::Impl::hideSpoilers() {
+	HideBlocksSpoilers(&_blocks);
+	HideBlocksSpoilers(&_retainedBlocks);
+	for (auto &entry : _cachedTextLeafs.entries) {
+		HideLeafSpoilers(&entry.second.leaf);
+	}
+	for (const auto &entry : _mediaBlocks) {
+		if (const auto &block = entry.second) {
+			block->hideSpoilers();
+		}
+	}
+}
+
+MediaBlockHost *MarkdownArticle::Impl::mediaBlockHost() const {
+	return _mediaBlockHost;
+}
+
+void MarkdownArticle::Impl::setPlaceholderLoading(
+		PreparedPlaceholderBlockId id) {
+	setPlaceholderLoadingValue(id, true);
+}
+
+void MarkdownArticle::Impl::clearPlaceholderLoading(
+		PreparedPlaceholderBlockId id) {
+	setPlaceholderLoadingValue(id, false);
+}
+
+void MarkdownArticle::Impl::clearAllPlaceholderLoading() {
+	auto repaintIds = std::vector<PreparedPlaceholderBlockId>();
+	repaintIds.reserve(_placeholderRuntimes.size());
+	for (const auto &[value, runtime] : _placeholderRuntimes) {
+		if (!runtime || !runtime->loading) {
+			continue;
+		}
+		runtime->loading = false;
+		runtime->loadingAnimation.stop(anim::type::instant);
+		repaintIds.push_back({ .value = value });
+	}
+	for (const auto id : repaintIds) {
+		requestPlaceholderRepaint(id);
+	}
+}
+
+void MarkdownArticle::Impl::addTaskMarkerRipple(
+		const PreparedEditListItemSource &source,
+		QPoint point) {
+	auto block = FindListItemBlock(&_blocks, source);
+	if (!block
+		|| block->taskState == TaskState::None
+		|| block->markerRect.isEmpty()) {
+		return;
+	}
+	auto runtime = block->taskMarkerRippleRuntime
+		? block->taskMarkerRippleRuntime
+		: getOrCreateTaskMarkerRippleRuntime(source);
+	if (!runtime) {
+		return;
+	}
+	block->taskMarkerRippleRuntime = runtime;
+	auto view = Ui::CheckView(
+		layoutStyle().list.taskCheck,
+		block->taskState == TaskState::Checked);
+	const auto mask = view.prepareRippleMask();
+	const auto size = mask.size();
+	if (!runtime->ripple || runtime->rippleSize != size) {
+		runtime->ripple = std::make_unique<Ui::RippleAnimation>(
+			st::defaultCheckbox.ripple,
+			mask,
+			[repaint = runtime->repaint] {
+				if (repaint) {
+					repaint();
+				}
+			});
+		runtime->rippleSize = size;
+	}
+	point -= (block->markerRect.topLeft()
+		+ st::defaultCheckbox.rippleAreaPosition);
+	point.setX(std::clamp(point.x(), 0, std::max(size.width() - 1, 0)));
+	point.setY(std::clamp(point.y(), 0, std::max(size.height() - 1, 0)));
+	runtime->ripple->add(point);
+	runtime->ripple->lastStop();
+	if (runtime->repaint) {
+		runtime->repaint();
+	}
+}
+
+void MarkdownArticle::Impl::addPlaceholderRipple(
+		PreparedPlaceholderBlockId id,
+		QPoint point) {
+	const auto block = FindPlaceholderBlock(&_blocks, id);
+	if (!block) {
+		return;
+	}
+	auto runtime = block->placeholderRuntime
+		? block->placeholderRuntime
+		: getOrCreatePlaceholderRuntime(id);
+	if (!runtime) {
+		return;
+	}
+	block->placeholderRuntime = runtime;
+	const auto size = block->mediaRect.size();
+	if (!runtime->ripple || runtime->rippleSize != size) {
+		runtime->ripple = std::make_unique<Ui::RippleAnimation>(
+			st::defaultRippleAnimation,
+			Ui::RippleAnimation::RoundRectMask(
+				size,
+				layoutStyle().placeholder.radius),
+			[=] {
+				requestPlaceholderRepaint(id);
+			});
+		runtime->rippleSize = size;
+	}
+	point.setX(std::clamp(point.x(), 0, std::max(size.width() - 1, 0)));
+	point.setY(std::clamp(point.y(), 0, std::max(size.height() - 1, 0)));
+	runtime->ripple->add(point);
+	requestPlaceholderRepaint(id);
+}
+
+void MarkdownArticle::Impl::stopPlaceholderRipple(
+		PreparedPlaceholderBlockId id) {
+	if (!id) {
+		return;
+	}
+	const auto i = _placeholderRuntimes.find(id.value);
+	if (i == end(_placeholderRuntimes)
+		|| !i->second
+		|| !i->second->ripple) {
+		return;
+	}
+	i->second->ripple->lastStop();
+	requestPlaceholderRepaint(id);
+}
+
+void MarkdownArticle::Impl::invalidateLayout() {
+	invalidateLayout(true);
+}
+
+void MarkdownArticle::Impl::invalidateGeometry() {
+	_width = -1;
+	_laidOutWidth = 0;
+	_height = 0;
+	captureScrollState();
+	clearPendingHighlightBlockPointers();
+	_anchors.clear();
+	_segments.clear();
+	_visibleSegmentSpan = {};
+	_segmentTops.clear();
+	_segmentBottoms.clear();
+}
+
+void MarkdownArticle::Impl::invalidateLayout(bool harvestCurrentBlocks) {
+	invalidateGeometry();
+	if (harvestCurrentBlocks) {
+		RebuildCachedTextLeafs(
+			_content.blocks.blocks,
+			&_blocks,
+			layoutStyle(),
+			&_cachedTextLeafs);
+	}
+	retainBlocks();
+}
+
+void MarkdownArticle::Impl::retainBlocks() {
+	if (_blocks.empty()) {
+		_blocksPainted = false;
+		return;
+	}
+	if (_blocksPainted) {
+		_retainedBlocks = std::move(_blocks);
+	}
+	_blocks.clear();
+	_blocksPainted = false;
+}
+
+int MarkdownArticle::Impl::currentDevicePixelRatio() const {
+	return std::max(style::DevicePixelRatio(), 1);
+}
+
+void MarkdownArticle::Impl::rebuildVisibleSegmentLookup() {
+	RebuildVisibleSegmentLookup(
+		_segments,
+		&_segmentTops,
+		&_segmentBottoms);
+	refreshVisibleSegmentSpan();
+}
+
+void MarkdownArticle::Impl::refreshVisibleSegmentSpan() {
+	_visibleSegmentSpan = _visibleRange
+		? LookupVisibleSegmentSpan(
+			_segmentTops,
+			_segmentBottoms,
+			*_visibleRange)
+		: SegmentSpan();
+}
+
+void MarkdownArticle::Impl::clearMediaBlocks() {
+	ClearMediaBlockStorage(&_mediaBlocks);
+}
+
+void MarkdownArticle::Impl::clearPlaceholderRuntimes() {
+	_placeholderRuntimes.clear();
+}
+
+void MarkdownArticle::Impl::refreshMediaBlockHosts() {
+	for (const auto &[id, block] : _mediaBlocks) {
+		if (block) {
+			block->setLayoutStyle(layoutStyle());
+			block->setHost(_mediaBlockHost);
+		}
+	}
+}
+
+auto MarkdownArticle::Impl::getOrCreateTaskMarkerRippleRuntime(
+		const PreparedEditListItemSource &source)
+-> std::shared_ptr<TaskMarkerRippleRuntime> {
+	if (const auto i = _taskMarkerRippleRuntimes.find(source);
+		i != end(_taskMarkerRippleRuntimes)) {
+		return i->second;
+	}
+	auto runtime = std::make_shared<TaskMarkerRippleRuntime>([=] {
+		requestTaskMarkerRepaint(source);
+	});
+	_taskMarkerRippleRuntimes.emplace(source, runtime);
+	return runtime;
+}
+
+std::shared_ptr<PlaceholderBlockRuntime>
+MarkdownArticle::Impl::getOrCreatePlaceholderRuntime(
+		PreparedPlaceholderBlockId id) {
+	if (!id) {
+		return nullptr;
+	}
+	if (const auto i = _placeholderRuntimes.find(id.value);
+		i != end(_placeholderRuntimes)) {
+		return i->second;
+	}
+	auto runtime = std::make_shared<PlaceholderBlockRuntime>([=] {
+		requestPlaceholderRepaint(id);
+	});
+	_placeholderRuntimes.emplace(id.value, runtime);
+	return runtime;
+}
+
+void MarkdownArticle::Impl::pruneTaskMarkerRuntimes() {
+	auto live = TaskMarkerSourceSet();
+	CollectTaskMarkerSources(_blocks, &live);
+	for (auto i = _taskMarkerRippleRuntimes.begin();
+		i != _taskMarkerRippleRuntimes.end();) {
+		if (live.find(i->first) != end(live)) {
+			++i;
+		} else {
+			i = _taskMarkerRippleRuntimes.erase(i);
+		}
+	}
+}
+
+void MarkdownArticle::Impl::prunePlaceholderRuntimes() {
+	auto live = std::unordered_set<uint64>();
+	CollectPlaceholderIds(_blocks, &live);
+	for (auto i = _placeholderRuntimes.begin(); i != _placeholderRuntimes.end();) {
+		if (live.find(i->first) != end(live)) {
+			++i;
+		} else {
+			i = _placeholderRuntimes.erase(i);
+		}
+	}
+}
+
+void MarkdownArticle::Impl::requestTaskMarkerRepaint(
+		const PreparedEditListItemSource &source) {
+	if (const auto block = FindListItemBlock(_blocks, source)) {
+		const auto rect = TaskMarkerRippleRect(*block, layoutStyle());
+		if (_textRepaintRect && !rect.isEmpty()) {
+			_textRepaintRect(rect);
+		} else if (_textRepaint) {
+			_textRepaint();
+		}
+	} else if (_textRepaint) {
+		_textRepaint();
+	}
+}
+
+void MarkdownArticle::Impl::requestPlaceholderRepaint(
+		PreparedPlaceholderBlockId id) {
+	if (const auto block = FindPlaceholderBlock(_blocks, id)) {
+		if (_textRepaintRect) {
+			_textRepaintRect(block->mediaRect);
+		} else if (_textRepaint) {
+			_textRepaint();
+		}
+	} else if (_textRepaint) {
+		_textRepaint();
+	}
+}
+
+std::shared_ptr<MediaBlock> MarkdownArticle::Impl::getOrCreateMediaBlock(
+		const PreparedBlock &prepared) {
+	switch (prepared.kind) {
+	case PreparedBlockKind::Photo:
+		return getOrCreateMediaBlock(
+			prepared.photo.id,
+			[=] {
+				return CreatePhotoMediaBlock(
+					prepared.photo,
+					_content.mediaRuntime,
+					layoutStyle());
+			});
+	case PreparedBlockKind::Video:
+		return getOrCreateMediaBlock(
+			prepared.video.id,
+			[=] {
+				return CreateVideoMediaBlock(
+					prepared.video,
+					_content.mediaRuntime,
+					layoutStyle());
+			});
+	case PreparedBlockKind::Map:
+		return getOrCreateMediaBlock(
+			prepared.map.id,
+			[=] {
+				return CreateMapMediaBlock(
+					prepared.map,
+					_content.mediaRuntime,
+					layoutStyle());
+			});
+	case PreparedBlockKind::Audio:
+		return getOrCreateMediaBlock(
+			prepared.audio.id,
+			[=] {
+				return CreateAudioMediaBlock(
+					prepared.audio,
+					_content.mediaRuntime,
+					layoutStyle());
+			});
+	case PreparedBlockKind::Channel:
+		return getOrCreateMediaBlock(
+			prepared.channel.id,
+			[=] {
+				return CreateChannelMediaBlock(
+					prepared.channel,
+					_content.mediaRuntime,
+					layoutStyle());
+			});
+	case PreparedBlockKind::GroupedMedia:
+		return getOrCreateMediaBlock(
+			prepared.groupedMedia.id,
+			[=] {
+				return CreateGroupedMediaBlock(
+					prepared.groupedMedia,
+					_content.mediaRuntime,
+					layoutStyle());
+			});
+	default:
+		return nullptr;
+	}
+}
+
+template <typename Factory>
+std::shared_ptr<MediaBlock> MarkdownArticle::Impl::getOrCreateMediaBlock(
+		PreparedMediaBlockId id,
+		Factory &&factory) {
+	if (!id) {
+		return nullptr;
+	}
+	if (const auto i = _mediaBlocks.find(id.value);
+		i != end(_mediaBlocks)) {
+		if (i->second) {
+			i->second->setLayoutStyle(layoutStyle());
+			i->second->setHost(_mediaBlockHost);
+		}
+		return i->second;
+	}
+	auto block = factory();
+	if (block) {
+		block->setLayoutStyle(layoutStyle());
+		block->setHost(_mediaBlockHost);
+	}
+	_mediaBlocks.emplace(id.value, block);
+	return block;
+}
+
+Spellchecker::HighlightProcessId MarkdownArticle::Impl::tryHighlightSyntax(
+		const QString &displayText,
+		const QString &language,
+		TextWithEntities &marked) {
+	const auto key = PendingHighlightKey{
+		.text = displayText,
+		.language = language,
+	};
+	if (const auto i = _pendingHighlightProcesses.find(key);
+		i != end(_pendingHighlightProcesses)) {
+		return i->second;
+	}
+	const auto processId = Spellchecker::TryHighlightSyntax(marked);
+	if (processId) {
+		registerPendingHighlightProcess(key, processId);
+	}
+	return processId;
+}
+
+SegmentSpan MarkdownArticle::Impl::candidateSegmentSpan(QPoint point) const {
+	if (_visibleRange
+		&& (_visibleRange->top <= point.y())
+		&& (point.y() < _visibleRange->bottom)) {
+		return _visibleSegmentSpan.empty()
+			? FullSegmentSpan(_segments)
+			: _visibleSegmentSpan;
+	}
+	return FullSegmentSpan(_segments);
+}
+
+void MarkdownArticle::Impl::clearPendingHighlightBlockPointers() {
+	for (auto &entry : _pendingHighlightEntries) {
+		entry.second.blocks.clear();
+	}
+}
+
+void MarkdownArticle::Impl::prunePendingHighlightProcessesForContent() {
+	if (_pendingHighlightProcesses.empty()) {
+		return;
+	}
+	auto live = std::unordered_set<
+		PendingHighlightKey,
+		PendingHighlightKeyHasher>();
+	CollectCodeBlockHighlightKeys(_content.blocks.blocks, &live);
+	for (auto i = _pendingHighlightProcesses.begin();
+			i != end(_pendingHighlightProcesses);) {
+		if (live.contains(i->first)) {
+			++i;
+			continue;
+		}
+		_pendingHighlightEntries.erase(i->second);
+		i = _pendingHighlightProcesses.erase(i);
+	}
+}
+
+void MarkdownArticle::Impl::registerPendingHighlightProcess(
+		const PendingHighlightKey &key,
+		Spellchecker::HighlightProcessId processId) {
+	_pendingHighlightProcesses[key] = processId;
+	auto &entry = _pendingHighlightEntries[processId];
+	entry.key = key;
+}
+
+void MarkdownArticle::Impl::registerPendingHighlightBlock(LaidOutBlock &block) {
+	if (!block.syntaxHighlightProcessId) {
+		return;
+	}
+	if (!_pendingHighlightEntries.contains(block.syntaxHighlightProcessId)) {
+		registerPendingHighlightProcess(
+			PendingHighlightKeyForBlock(block),
+			block.syntaxHighlightProcessId);
+	}
+	_pendingHighlightEntries[block.syntaxHighlightProcessId].blocks.push_back(
+		&block);
+}
+
+void MarkdownArticle::Impl::registerPendingHighlightBlocks(std::vector<LaidOutBlock> &blocks) {
+	for (auto &block : blocks) {
+		registerPendingHighlightBlock(block);
+		registerPendingHighlightBlocks(block.children);
+	}
+}
+
+void MarkdownArticle::Impl::resetFormulaRasterCache() {
+	_formulaRenders.clear();
+	_formulaRenders.resize(_content.formulas.size());
+}
+
+void MarkdownArticle::Impl::setPlaceholderLoadingValue(
+		PreparedPlaceholderBlockId id,
+		bool loading) {
+	if (!id) {
+		return;
+	}
+	const auto runtime = loading
+		? getOrCreatePlaceholderRuntime(id)
+		: [&]() -> std::shared_ptr<PlaceholderBlockRuntime> {
+			if (const auto i = _placeholderRuntimes.find(id.value);
+				i != end(_placeholderRuntimes)) {
+				return i->second;
+			}
+			return nullptr;
+		}();
+	if (!runtime || runtime->loading == loading) {
+		return;
+	}
+	runtime->loading = loading;
+	if (loading) {
+		runtime->loadingAnimation.start();
+	} else {
+		runtime->loadingAnimation.stop(anim::type::instant);
+	}
+	requestPlaceholderRepaint(id);
+}
+
+const style::Markdown &MarkdownArticle::Impl::layoutStyle() const {
+	return _style;
+}
+
+MarkdownArticleScrollOwnerIdentity MarkdownArticle::Impl::scrollOwnerIdentity(
+		const LaidOutBlock &block,
+		const std::vector<int> &preparedPath) const {
+	if (block.editBlock && ValidBlockPath(block.editBlock->path)) {
+		return { .blockPath = block.editBlock->path };
+	}
+	return { .preparedPath = preparedPath };
+}
+
+MarkdownArticleHorizontalScrollLookup
+MarkdownArticle::Impl::findHorizontalScrollOwner(QPoint point) const {
+	auto preparedPath = std::vector<int>();
+	return findHorizontalScrollOwner(
+		_blocks,
+		&_content.blocks.blocks,
+		point,
+		&preparedPath);
+}
+
+MarkdownArticleHorizontalScrollLookup
+MarkdownArticle::Impl::findHorizontalScrollOwner(
+		const std::vector<LaidOutBlock> &blocks,
+		const std::vector<PreparedBlock> *prepared,
+		QPoint point,
+		std::vector<int> *preparedPath) const {
+	for (auto i = 0, count = int(blocks.size()); i != count; ++i) {
+		const auto &block = blocks[i];
+		preparedPath->push_back(i);
+		const auto preparedBlock = (prepared && (i < prepared->size()))
+			? &(*prepared)[i]
+			: nullptr;
+		if (const auto result = findHorizontalScrollOwner(
+				block.children,
+				preparedBlock ? &preparedBlock->children : nullptr,
+				point,
+				preparedPath);
+			result.block) {
+			return result;
+		}
+		if (block.horizontalScrollMax > 0
+			&& !block.scrollViewportRect.isEmpty()) {
+			const auto identity = scrollOwnerIdentity(block, *preparedPath);
+			auto hit = MarkdownArticleHorizontalScrollHit{
+				.scrollable = true,
+				.overViewport = ContainsPoint(block.scrollViewportRect, point),
+				.overScrollbar = ContainsPoint(
+					block.scrollScrollbarTrackRect,
+					point),
+				.overScrollbarThumb = ContainsPoint(
+					block.scrollScrollbarThumbRect,
+					point),
+			};
+			if (hit.overViewport || hit.overScrollbar) {
+				return {
+					.hit = hit,
+					.identity = identity,
+					.block = &block,
+				};
+			}
+		}
+		preparedPath->pop_back();
+	}
+	return {};
+}
+
+std::optional<MarkdownArticleHorizontalScrollLookup>
+MarkdownArticle::Impl::findHorizontalScrollOwner(int segmentIndex) const {
+	const auto segment = FindSegment(&_segments, segmentIndex);
+	if (!segment || !IsEditableSegment(*segment)) {
+		return std::nullopt;
+	}
+	auto preparedPath = std::vector<int>();
+	return findHorizontalScrollOwner(
+		_blocks,
+		&_content.blocks.blocks,
+		*segment,
+		std::nullopt,
+		&preparedPath);
+}
+
+std::optional<MarkdownArticleHorizontalScrollLookup>
+MarkdownArticle::Impl::findHorizontalScrollOwner(
+		const std::vector<LaidOutBlock> &blocks,
+		const std::vector<PreparedBlock> *prepared,
+		const SelectableSegment &segment,
+		std::optional<MarkdownArticleHorizontalScrollLookup> owner,
+		std::vector<int> *preparedPath) const {
+	for (auto i = 0, count = int(blocks.size()); i != count; ++i) {
+		const auto &block = blocks[i];
+		preparedPath->push_back(i);
+		const auto preparedBlock = (prepared && (i < prepared->size()))
+			? &(*prepared)[i]
+			: nullptr;
+		auto nextOwner = owner;
+		if (!block.scrollViewportRect.isEmpty()) {
+			nextOwner = MarkdownArticleHorizontalScrollLookup{
+				.identity = scrollOwnerIdentity(block, *preparedPath),
+				.block = &block,
+			};
+		}
+		const auto matchesCell = [&] {
+			if (!segment.cell) {
+				return false;
+			}
+			for (const auto &row : block.tableRows) {
+				for (const auto &cell : row.cells) {
+					if (segment.cell == &cell) {
+						return true;
+					}
+				}
+			}
+			return false;
+		}();
+		if (segment.block == &block || matchesCell) {
+			return nextOwner;
+		}
+		if (const auto result = findHorizontalScrollOwner(
+				block.children,
+				preparedBlock ? &preparedBlock->children : nullptr,
+				segment,
+				nextOwner,
+				preparedPath)) {
+			return result;
+		}
+		preparedPath->pop_back();
+	}
+	return std::nullopt;
+}
+
+LaidOutBlock *MarkdownArticle::Impl::findScrollOwnerByIdentity(
+		const MarkdownArticleScrollOwnerIdentity &identity) {
+	auto preparedPath = std::vector<int>();
+	return findScrollOwnerByIdentity(
+		_blocks,
+		&_content.blocks.blocks,
+		identity,
+		&preparedPath);
+}
+
+LaidOutBlock *MarkdownArticle::Impl::findScrollOwnerByIdentity(
+		std::vector<LaidOutBlock> &blocks,
+		const std::vector<PreparedBlock> *prepared,
+		const MarkdownArticleScrollOwnerIdentity &identity,
+		std::vector<int> *preparedPath) {
+	for (auto i = 0, count = int(blocks.size()); i != count; ++i) {
+		auto &block = blocks[i];
+		preparedPath->push_back(i);
+		const auto preparedBlock = (prepared && (i < prepared->size()))
+			? &(*prepared)[i]
+			: nullptr;
+		if (!block.scrollViewportRect.isEmpty()) {
+			const auto current = scrollOwnerIdentity(block, *preparedPath);
+			if (current == identity) {
+				return &block;
+			}
+		}
+		if (const auto child = findScrollOwnerByIdentity(
+				block.children,
+				preparedBlock ? &preparedBlock->children : nullptr,
+				identity,
+				preparedPath)) {
+			return child;
+		}
+		preparedPath->pop_back();
+	}
+	return nullptr;
+}
+
+void MarkdownArticle::Impl::captureScrollState() {
+	auto preparedPath = std::vector<int>();
+	captureScrollState(
+		_blocks,
+		&_content.blocks.blocks,
+		&preparedPath);
+}
+
+void MarkdownArticle::Impl::captureScrollState(
+		const std::vector<LaidOutBlock> &blocks,
+		const std::vector<PreparedBlock> *prepared,
+		std::vector<int> *preparedPath) {
+	for (auto i = 0, count = int(blocks.size()); i != count; ++i) {
+		const auto &block = blocks[i];
+		preparedPath->push_back(i);
+		const auto preparedBlock = (prepared && (i < prepared->size()))
+			? &(*prepared)[i]
+			: nullptr;
+		if (!block.scrollViewportRect.isEmpty()) {
+			const auto identity = scrollOwnerIdentity(block, *preparedPath);
+			if (block.horizontalScrollLeft > 0) {
+				_capturedScrollLefts[identity] = block.horizontalScrollLeft;
+			} else {
+				_capturedScrollLefts.erase(identity);
+			}
+		}
+		captureScrollState(
+			block.children,
+			preparedBlock ? &preparedBlock->children : nullptr,
+			preparedPath);
+		preparedPath->pop_back();
+	}
+}
+
+void MarkdownArticle::Impl::restoreScrollState() {
+	auto preparedPath = std::vector<int>();
+	restoreScrollState(
+		_blocks,
+		&_content.blocks.blocks,
+		&preparedPath);
+}
+
+void MarkdownArticle::Impl::restoreScrollState(
+		std::vector<LaidOutBlock> &blocks,
+		const std::vector<PreparedBlock> *prepared,
+		std::vector<int> *preparedPath) {
+	for (auto i = 0, count = int(blocks.size()); i != count; ++i) {
+		auto &block = blocks[i];
+		preparedPath->push_back(i);
+		const auto preparedBlock = (prepared && (i < prepared->size()))
+			? &(*prepared)[i]
+			: nullptr;
+		if (!block.scrollViewportRect.isEmpty()) {
+			const auto identity = scrollOwnerIdentity(block, *preparedPath);
+			const auto j = _capturedScrollLefts.find(identity);
+			block.horizontalScrollLeft = (j != end(_capturedScrollLefts))
+				? std::clamp(j->second, 0, block.horizontalScrollMax)
+				: 0;
+		}
+		restoreScrollState(
+			block.children,
+			preparedBlock ? &preparedBlock->children : nullptr,
+			preparedPath);
+		preparedPath->pop_back();
+	}
+}
+
+void MarkdownArticle::Impl::refreshScrolledGeometry(
+		LaidOutBlock &block,
+		const ActiveHorizontalScrollOwnerState *activeOwner) {
+	RestoreLogicalBlockGeometry(&block);
+	if (activeOwner) {
+		ApplyTranslatedDescendantGeometry(&block, *activeOwner);
+	}
+
+	std::optional<ActiveHorizontalScrollOwnerState> nextOwner;
+	if (!activeOwner && !block.scrollViewportRect.isEmpty()) {
+		block.horizontalScrollLeft = std::clamp(
+			block.horizontalScrollLeft,
+			0,
+			block.horizontalScrollMax);
+		if (block.horizontalScrollMax > 0) {
+			const auto owner = ActiveHorizontalScrollOwnerState{
+				.viewport = block.scrollViewportRect,
+				.shift = -block.horizontalScrollLeft,
+			};
+			if (ScrollOwnerMovesOwnContent(block.kind)) {
+				ApplyOwnerContentGeometry(&block, owner);
+			}
+			if (ScrollOwnerMovesChildren(block.kind)) {
+				nextOwner = owner;
+			}
+		}
+		updateScrollbarThumb(block);
+	}
+	refreshScrolledGeometry(
+		block.children,
+		nextOwner ? &*nextOwner : activeOwner);
+}
+
+void MarkdownArticle::Impl::refreshScrolledGeometry(LaidOutBlock &block) {
+	refreshScrolledGeometry(block, nullptr);
+}
+
+void MarkdownArticle::Impl::refreshScrolledGeometry(
+		std::vector<LaidOutBlock> &blocks) {
+	refreshScrolledGeometry(blocks, nullptr);
+}
+
+void MarkdownArticle::Impl::refreshScrolledGeometry(
+		std::vector<LaidOutBlock> &blocks,
+		const ActiveHorizontalScrollOwnerState *activeOwner) {
+	for (auto &block : blocks) {
+		refreshScrolledGeometry(block, activeOwner);
+	}
+}
+
+void MarkdownArticle::Impl::updateScrollbarThumb(LaidOutBlock &block) {
+	if (block.horizontalScrollMax <= 0
+		|| block.scrollScrollbarTrackRect.isEmpty()) {
+		block.scrollScrollbarThumbRect = QRect();
+		block.tableScrollbarThumbRect = QRect();
+		return;
+	}
+	const auto trackWidth = block.scrollScrollbarTrackRect.width();
+	if (trackWidth <= 0) {
+		block.scrollScrollbarThumbRect = QRect();
+		block.tableScrollbarThumbRect = QRect();
+		return;
+	}
+	const auto viewportWidth = std::max(block.scrollViewportRect.width(), 1);
+	const auto contentWidth = std::max(block.scrollLogicalContentRect.width(), 1);
+	auto thumbWidth = (trackWidth * viewportWidth + (contentWidth / 2))
+		/ contentWidth;
+	thumbWidth = std::clamp(
+		thumbWidth,
+		std::min(layoutStyle().table.scrollbarMinThumbWidth, trackWidth),
+		trackWidth);
+	const auto available = std::max(trackWidth - thumbWidth, 0);
+	const auto thumbOffset = (available > 0)
+		? ((block.horizontalScrollLeft * available)
+			+ (block.horizontalScrollMax / 2))
+			/ block.horizontalScrollMax
+		: 0;
+	block.scrollScrollbarThumbRect = QRect(
+		block.scrollScrollbarTrackRect.x() + thumbOffset,
+		block.scrollScrollbarTrackRect.y(),
+		thumbWidth,
+		block.scrollScrollbarTrackRect.height());
+	if (block.kind == PreparedBlockKind::Table) {
+		block.tableScrollbarThumbRect = block.scrollScrollbarThumbRect;
+	}
+}
+
+bool MarkdownArticle::Impl::setScrollLeft(
+		LaidOutBlock &block,
+		const MarkdownArticleScrollOwnerIdentity &identity,
+		int left) {
+	left = std::clamp(left, 0, block.horizontalScrollMax);
+	if (block.horizontalScrollLeft == left) {
+		return false;
+	}
+	block.horizontalScrollLeft = left;
+	if (left > 0) {
+		_capturedScrollLefts[identity] = left;
+	} else {
+		_capturedScrollLefts.erase(identity);
+	}
+	refreshScrolledGeometry(block);
+	RefreshScrollableSegmentRects(block, &_segments);
+	if (_textRepaintRect) {
+		_textRepaintRect(block.outer);
+	} else if (_textRepaint) {
+		_textRepaint();
+	}
+	return true;
+}
+
+bool MarkdownArticle::Impl::revealSegment(int segmentIndex) {
+	const auto logicalRect = logicalSegmentRect(segmentIndex);
+	if (logicalRect.isEmpty()) {
+		return false;
+	}
+	const auto lookup = findHorizontalScrollOwner(segmentIndex);
+	if (!lookup || !lookup->block) {
+		return false;
+	}
+	const auto &owner = *lookup->block;
+	if (owner.scrollViewportRect.isEmpty()
+		|| owner.scrollLogicalContentRect.isEmpty()) {
+		return false;
+	}
+	const auto viewportWidth = owner.scrollViewportRect.width();
+	if (viewportWidth <= 0) {
+		return false;
+	}
+	const auto toLeft = logicalRect.x()
+		+ owner.horizontalScrollLeft
+		- owner.scrollLogicalContentRect.x();
+	const auto left = ComputeScrollTo(
+		toLeft,
+		toLeft + logicalRect.width(),
+		0,
+		owner.horizontalScrollMax,
+		owner.horizontalScrollLeft,
+		viewportWidth);
+	if (left == owner.horizontalScrollLeft) {
+		return false;
+	}
+	if (const auto block = findScrollOwnerByIdentity(lookup->identity)) {
+		return setScrollLeft(*block, lookup->identity, left);
+	}
+	return false;
+}
+
+MarkdownArticleHorizontalScrollHit MarkdownArticle::Impl::horizontalScrollHit(
+		QPoint point) const {
+	return findHorizontalScrollOwner(point).hit;
+}
+
+bool MarkdownArticle::Impl::canConsumeHorizontalScroll(
+		QPoint point,
+		int delta) const {
+	if (const auto lookup = findHorizontalScrollOwner(point);
+		lookup.block) {
+		const auto left = std::clamp(
+			lookup.block->horizontalScrollLeft - delta,
+			0,
+			lookup.block->horizontalScrollMax);
+		return (left != lookup.block->horizontalScrollLeft);
+	}
+	return false;
+}
+
+bool MarkdownArticle::Impl::consumeHorizontalScroll(QPoint point, int delta) {
+	if (const auto lookup = findHorizontalScrollOwner(point);
+		lookup.block) {
+		if (const auto block = findScrollOwnerByIdentity(lookup.identity)) {
+			return setScrollLeft(
+				*block,
+				lookup.identity,
+				block->horizontalScrollLeft - delta);
+		}
+	}
+	return false;
+}
+
+bool MarkdownArticle::Impl::beginHorizontalScroll(
+		QPoint point,
+		bool fromTouch) {
+	const auto lookup = findHorizontalScrollOwner(point);
+	if (!lookup.block) {
+		return false;
+	}
+	if (fromTouch) {
+		if (!lookup.hit.overViewport) {
+			return false;
+		}
+		_activeHorizontalScrollDrag = ActiveHorizontalScrollDrag{
+			.owner = lookup.identity,
+			.pressPoint = point,
+			.startScrollLeft = lookup.block->horizontalScrollLeft,
+			.fromTouch = true,
+		};
+		return true;
+	}
+	if (!lookup.hit.overScrollbar) {
+		return false;
+	}
+	const auto &thumb = lookup.block->scrollScrollbarThumbRect;
+	_activeHorizontalScrollDrag = ActiveHorizontalScrollDrag{
+		.owner = lookup.identity,
+		.pressPoint = point,
+		.startScrollLeft = lookup.block->horizontalScrollLeft,
+		.thumbGrabOffset = lookup.hit.overScrollbarThumb
+			? (point.x() - thumb.x())
+			: (thumb.width() / 2),
+	};
+	if (!lookup.hit.overScrollbarThumb) {
+		(void)updateHorizontalScroll(point);
+	}
+	return true;
+}
+
+bool MarkdownArticle::Impl::updateHorizontalScroll(QPoint point) {
+	if (!_activeHorizontalScrollDrag) {
+		return false;
+	}
+	const auto drag = *_activeHorizontalScrollDrag;
+	const auto block = findScrollOwnerByIdentity(drag.owner);
+	if (!block) {
+		return false;
+	}
+	if (drag.fromTouch) {
+		return setScrollLeft(
+			*block,
+			drag.owner,
+			drag.startScrollLeft - (point.x() - drag.pressPoint.x()));
+	}
+	if (block->scrollScrollbarTrackRect.isEmpty()) {
+		return false;
+	}
+	const auto available = std::max(
+		block->scrollScrollbarTrackRect.width()
+			- block->scrollScrollbarThumbRect.width(),
+		0);
+	auto thumbLeft = point.x() - drag.thumbGrabOffset;
+	thumbLeft = std::clamp(
+		thumbLeft,
+		block->scrollScrollbarTrackRect.x(),
+		block->scrollScrollbarTrackRect.x() + available);
+	const auto left = (available > 0)
+		? (((thumbLeft - block->scrollScrollbarTrackRect.x())
+			* block->horizontalScrollMax)
+			+ (available / 2))
+		/ available
+		: 0;
+	return setScrollLeft(*block, drag.owner, left);
+}
+
+void MarkdownArticle::Impl::endHorizontalScroll() {
+	_activeHorizontalScrollDrag.reset();
+}
+
+// The laid out width is passed through the _width field, assigned by the
+// callers right before the call, instead of a parameter, because GCC 15
+// IPA-CP with LTO wrongly constant-folded such a parameter to 1 (the lower
+// bound of the std::max(width, 1) clamps in the callers), collapsing rich
+// message bubbles to the minimum width in release Linux builds.
+void MarkdownArticle::Impl::finalizeRelayout(int heightBottom) {
+	const auto &page = layoutStyle().pagePadding;
+	++_layoutGeneration;
+	restoreScrollState();
+	refreshScrolledGeometry(_blocks);
+	_laidOutWidth = std::min(
+		_width,
+		std::max(
+			ArticleContentMaxRight(_blocks, layoutStyle()) + page.right(),
+			page.left() + page.right() + 1));
+	pruneTaskMarkerRuntimes();
+	prunePlaceholderRuntimes();
+	_relatedArticleImages.clear();
+	StoreRelatedArticleImageStates(
+		_blocks,
+		&_relatedArticleImages);
+	_height = heightBottom + page.bottom();
+	clearPendingHighlightBlockPointers();
+	_anchors.clear();
+	_segments.clear();
+	_visibleSegmentSpan = {};
+	_segmentTops.clear();
+	_segmentBottoms.clear();
+	registerPendingHighlightBlocks(_blocks);
+	CollectAnchors(_blocks, &_anchors);
+	CollectSelectableSegments(&_blocks, &_segments);
+	RefreshScrollableSegmentRects(_blocks, &_segments);
+	rebuildVisibleSegmentLookup();
+}
+
+void MarkdownArticle::Impl::relayout(int width) {
+	width = std::max(width, 1);
+	if (_width == width) {
+		return;
+	}
+	StoreRelatedArticleImageStates(
+		_blocks,
+		&_relatedArticleImages);
+	invalidateGeometry();
+	RebuildCachedTextLeafs(
+		_content.blocks.blocks,
+		&_blocks,
+		layoutStyle(),
+		&_cachedTextLeafs);
+	retainBlocks();
+
+	const auto &st = layoutStyle();
+	const auto &page = st.pagePadding;
+	const auto innerWidth = std::max(width - page.left() - page.right(), 1);
+	auto context = LayoutContext{
+		.articleLeft = page.left(),
+		.articleWidth = innerWidth,
+		.useArticleBands = true,
+		.editMode = _content.editMode,
+		.syntaxHighlightTracker = this,
+		.cachedTextLeafs = &_cachedTextLeafs,
+		.repaint = _textRepaint,
+		.repaintRect = _textRepaintRect,
+		.spoilerLinkFilter = _textSpoilerLinkFilter,
+	};
+	if (_editableHeightOverrideIndex >= 0 && _editableHeightOverride > 0) {
+		context.editableHeightOverride
+			= std::make_shared<EditableHeightOverride>(
+				EditableHeightOverride{
+					.editableIndex = _editableHeightOverrideIndex,
+					.height = _editableHeightOverride,
+				});
+	}
+	context.mediaBlockFactory = [=](const PreparedBlock &prepared) {
+		return getOrCreateMediaBlock(prepared);
+	};
+	context.placeholderRuntimeFactory = [=](PreparedPlaceholderBlockId id) {
+		return getOrCreatePlaceholderRuntime(id);
+	};
+	context.taskMarkerRippleRuntimeFactory
+		= [=](const PreparedEditListItemSource &source) {
+			return getOrCreateTaskMarkerRippleRuntime(source);
+		};
+	const auto contextScope = LayoutContextScope(context);
+	(void)contextScope;
+	const auto y = LayoutBlocks(
+		_content.blocks.blocks,
+		&_content.formulas,
+		&_formulaRenders,
+		_renderer.get(),
+		_inlineFormulaObjects.get(),
+		_content.mediaRuntime,
+		&_blocks,
+		st,
+		page.left(),
+		page.top(),
+		innerWidth,
+		context);
+	RestoreRelatedArticleImageStates(
+		&_blocks,
+		_relatedArticleImages);
+	_width = width;
+	finalizeRelayout(y);
+}
+
+void MarkdownArticle::Impl::relayoutRetained(int width) {
+	width = std::max(width, 1);
+	if (_width == width) {
+		return;
+	} else if (_blocks.empty()) {
+		relayout(width);
+		return;
+	}
+	captureScrollState();
+
+	const auto &st = layoutStyle();
+	const auto &page = st.pagePadding;
+	const auto innerWidth = std::max(width - page.left() - page.right(), 1);
+	auto context = LayoutContext{
+		.articleLeft = page.left(),
+		.articleWidth = innerWidth,
+		.useArticleBands = true,
+		.editMode = _content.editMode,
+		.syntaxHighlightTracker = this,
+		.cachedTextLeafs = &_cachedTextLeafs,
+		.repaint = _textRepaint,
+		.repaintRect = _textRepaintRect,
+		.spoilerLinkFilter = _textSpoilerLinkFilter,
+	};
+	if (_editableHeightOverrideIndex >= 0 && _editableHeightOverride > 0) {
+		context.editableHeightOverride
+			= std::make_shared<EditableHeightOverride>(
+				EditableHeightOverride{
+					.editableIndex = _editableHeightOverrideIndex,
+					.height = _editableHeightOverride,
+				});
+	}
+	context.mediaBlockFactory = [=](const PreparedBlock &prepared) {
+		return getOrCreateMediaBlock(prepared);
+	};
+	context.placeholderRuntimeFactory = [=](PreparedPlaceholderBlockId id) {
+		return getOrCreatePlaceholderRuntime(id);
+	};
+	context.taskMarkerRippleRuntimeFactory
+		= [=](const PreparedEditListItemSource &source) {
+			return getOrCreateTaskMarkerRippleRuntime(source);
+		};
+	const auto contextScope = LayoutContextScope(context);
+	(void)contextScope;
+	const auto y = RecountLaidOutBlocks(
+		_content.blocks.blocks,
+		_content.formulas,
+		&_blocks,
+		st,
+		page.left(),
+		page.top(),
+		innerWidth,
+		context);
+	if (!y) {
+		relayout(width);
+		return;
+	}
+	_width = width;
+	finalizeRelayout(*y);
+}
+
+MarkdownArticle::MarkdownArticle(
+	const style::Markdown &st,
+	std::shared_ptr<MathRenderer> renderer)
+: _impl(std::make_unique<Impl>(st, std::move(renderer))) {
+}
+
+MarkdownArticle::~MarkdownArticle() = default;
+MarkdownArticle::MarkdownArticle(MarkdownArticle &&) noexcept = default;
+MarkdownArticle &MarkdownArticle::operator=(MarkdownArticle &&) noexcept = default;
+
+void MarkdownArticle::setRenderer(std::shared_ptr<MathRenderer> renderer) {
+	_impl->setRenderer(std::move(renderer));
+}
+
+void MarkdownArticle::setMediaBlockHost(MediaBlockHost *host) {
+	_impl->setMediaBlockHost(host);
+}
+
+void MarkdownArticle::setTextRepaintCallbacks(
+		Fn<void()> repaint,
+		Fn<void(QRect)> repaintRect,
+		Fn<bool(const ClickContext&)> spoilerLinkFilter) {
+	_impl->setTextRepaintCallbacks(
+		std::move(repaint),
+		std::move(repaintRect),
+		std::move(spoilerLinkFilter));
+}
+
+void MarkdownArticle::setContent(MarkdownArticleContent content) {
+	_impl->setContent(std::move(content));
+}
+
+void MarkdownArticle::updatePreparedLeaf(
+		const PreparedEditLeafSource &source,
+		const MarkdownArticleContent &prepared) {
+	_impl->updatePreparedLeaf(source, prepared);
+}
+
+void MarkdownArticle::setEditableHeightOverride(
+		int editableIndex,
+		int height) {
+	_impl->setEditableHeightOverride(editableIndex, height);
+}
+
+void MarkdownArticle::setEditableHeightOverrideForSegment(
+		int segmentIndex,
+		int height) {
+	_impl->setEditableHeightOverrideForSegment(segmentIndex, height);
+}
+
+void MarkdownArticle::clearEditableHeightOverride() {
+	_impl->clearEditableHeightOverride();
+}
+
+void MarkdownArticle::setTextLeafHeightOverride(
+		int textLeafIndex,
+		int height) {
+	_impl->setTextLeafHeightOverride(textLeafIndex, height);
+}
+
+void MarkdownArticle::clearTextLeafHeightOverride() {
+	_impl->clearTextLeafHeightOverride();
+}
+
+void MarkdownArticle::invalidateLayout() {
+	_impl->invalidateLayout();
+}
+
+int MarkdownArticle::maxWidth() const {
+	return const_cast<Impl*>(_impl.get())->maxWidth();
+}
+
+int MarkdownArticle::lastLayoutWidth() const {
+	return _impl->lastLayoutWidth();
+}
+
+int MarkdownArticle::resizeGetHeight(int width) {
+	return _impl->resizeGetHeight(width);
+}
+
+auto MarkdownArticle::countRevealLinesGeometry(int width)
+-> std::vector<MarkdownArticleRevealLine> {
+	return _impl->countRevealLinesGeometry(width);
+}
+
+void MarkdownArticle::setVisibleTopBottom(int visibleTop, int visibleBottom) {
+	_impl->setVisibleTopBottom(visibleTop, visibleBottom);
+}
+
+void MarkdownArticle::paint(
+		Painter &p,
+		const MarkdownArticlePaintContext &context) const {
+	_impl->paint(p, context);
+}
+
+MarkdownArticleHitTestResult MarkdownArticle::hitTest(
+		QPoint point,
+		Ui::Text::StateRequest::Flags flags) const {
+	return _impl->hitTest(point, flags);
+}
+
+PreparedEditHit MarkdownArticle::editHitTest(QPoint point) const {
+	return _impl->editHitTest(point);
+}
+
+MarkdownArticleEditControlHit MarkdownArticle::editControlHitTest(
+		QPoint point) const {
+	return _impl->editControlHitTest(point);
+}
+
+void MarkdownArticle::addTaskMarkerRipple(
+		const PreparedEditListItemSource &source,
+		QPoint point) {
+	_impl->addTaskMarkerRipple(source, point);
+}
+
+MarkdownArticleHorizontalScrollHit MarkdownArticle::horizontalScrollHit(
+		QPoint point) const {
+	return _impl->horizontalScrollHit(point);
+}
+
+bool MarkdownArticle::canConsumeHorizontalScroll(
+		QPoint point,
+		int delta) const {
+	return _impl->canConsumeHorizontalScroll(point, delta);
+}
+
+bool MarkdownArticle::consumeHorizontalScroll(QPoint point, int delta) {
+	return _impl->consumeHorizontalScroll(point, delta);
+}
+
+bool MarkdownArticle::beginHorizontalScroll(QPoint point, bool fromTouch) {
+	return _impl->beginHorizontalScroll(point, fromTouch);
+}
+
+bool MarkdownArticle::updateHorizontalScroll(QPoint point) {
+	return _impl->updateHorizontalScroll(point);
+}
+
+void MarkdownArticle::endHorizontalScroll() {
+	_impl->endHorizontalScroll();
+}
+
+int MarkdownArticle::anchorTop(const QString &anchorId) const {
+	return _impl->anchorTop(anchorId);
+}
+
+MarkdownArticleAnchorExpansion MarkdownArticle::expandDetailsToAnchor(
+		const QString &anchorId) {
+	return _impl->expandDetailsToAnchor(anchorId);
+}
+
+bool MarkdownArticle::toggleDetails(const QString &anchorId) {
+	return _impl->toggleDetails(anchorId);
+}
+
+bool MarkdownArticle::segmentIsText(int index) const {
+	return _impl->segmentIsText(index);
+}
+
+bool MarkdownArticle::segmentIsDisplayMath(int index) const {
+	return _impl->segmentIsDisplayMath(index);
+}
+
+bool MarkdownArticle::segmentIsEditable(int index) const {
+	return _impl->segmentIsEditable(index);
+}
+
+int MarkdownArticle::segmentLength(int index) const {
+	return _impl->segmentLength(index);
+}
+
+int MarkdownArticle::firstTextSegmentIndex() const {
+	return _impl->firstTextSegmentIndex();
+}
+
+int MarkdownArticle::firstEditableSegmentIndex() const {
+	return _impl->firstEditableSegmentIndex();
+}
+
+int MarkdownArticle::textLeafIndexForSegment(int segmentIndex) const {
+	return _impl->textLeafIndexForSegment(segmentIndex);
+}
+
+int MarkdownArticle::segmentIndexForTextLeafIndex(int textLeafIndex) const {
+	return _impl->segmentIndexForTextLeafIndex(textLeafIndex);
+}
+
+int MarkdownArticle::editableIndexForSegment(int segmentIndex) const {
+	return _impl->editableIndexForSegment(segmentIndex);
+}
+
+int MarkdownArticle::segmentIndexForEditableIndex(int editableIndex) const {
+	return _impl->segmentIndexForEditableIndex(editableIndex);
+}
+
+QRect MarkdownArticle::textSegmentRect(int segmentIndex) const {
+	return _impl->textSegmentRect(segmentIndex);
+}
+
+QRect MarkdownArticle::logicalSegmentRect(int segmentIndex) const {
+	return _impl->logicalSegmentRect(segmentIndex);
+}
+
+QRect MarkdownArticle::segmentRect(int segmentIndex) const {
+	return _impl->segmentRect(segmentIndex);
+}
+
+QRect MarkdownArticle::displayMathEditRect(int segmentIndex) const {
+	return _impl->displayMathEditRect(segmentIndex);
+}
+
+QRect MarkdownArticle::displayMathBlockRect(int segmentIndex) const {
+	return _impl->displayMathBlockRect(segmentIndex);
+}
+
+bool MarkdownArticle::revealSegment(int segmentIndex) {
+	return _impl->revealSegment(segmentIndex);
+}
+
+MarkdownArticleTextLeafStyle MarkdownArticle::textLeafStyleForSegment(
+		int segmentIndex) const {
+	return _impl->textLeafStyleForSegment(segmentIndex);
+}
+
+MarkdownArticleTextLeafStyle MarkdownArticle::editableStyleForSegment(
+		int segmentIndex) const {
+	return _impl->editableStyleForSegment(segmentIndex);
+}
+
+int MarkdownArticle::selectionOffsetFromHit(
+		const MarkdownArticleHitTestResult &result,
+		TextSelectType selectionType) const {
+	return _impl->selectionOffsetFromHit(result, selectionType);
+}
+
+TextSelection MarkdownArticle::adjustSelection(
+		int segmentIndex,
+		TextSelection selection,
+		TextSelectType selectionType) const {
+	return _impl->adjustSelection(segmentIndex, selection, selectionType);
+}
+
+bool MarkdownArticle::selectionContains(
+		MarkdownArticleSelection selection,
+		const MarkdownArticleSelectionEndpoints *endpoints,
+		const MarkdownArticleHitTestResult &result) const {
+	return _impl->selectionContains(selection, endpoints, result);
+}
+
+TextForMimeData MarkdownArticle::textForContext(
+		const MarkdownArticleHitTestResult &result) const {
+	return _impl->textForContext(result);
+}
+
+TextForMimeData MarkdownArticle::textForSelection(
+		MarkdownArticleSelection selection,
+		const MarkdownArticleSelectionEndpoints *endpoints,
+		const PreparedEditSelection *structuralSelection) const {
+	return _impl->textForSelection(
+		selection,
+		endpoints,
+		structuralSelection);
+}
+
+bool MarkdownArticle::highlightProcessDone(
+		Spellchecker::HighlightProcessId processId) {
+	return _impl->highlightProcessDone(processId);
+}
+
+void MarkdownArticle::invalidatePaletteCache() {
+	_impl->invalidatePaletteCache();
+}
+
+void MarkdownArticle::invalidateRasterCache() {
+	_impl->invalidateRasterCache();
+}
+
+bool MarkdownArticle::hasHeavyPart() const {
+	return _impl && _impl->hasHeavyPart();
+}
+
+void MarkdownArticle::unloadHeavyPart() {
+	_impl->unloadHeavyPart();
+}
+
+void MarkdownArticle::hideSpoilers() {
+	_impl->hideSpoilers();
+}
+
+MediaBlockHost *MarkdownArticle::mediaBlockHost() const {
+	return _impl->mediaBlockHost();
+}
+
+void MarkdownArticle::setPlaceholderLoading(PreparedPlaceholderBlockId id) {
+	_impl->setPlaceholderLoading(id);
+}
+
+void MarkdownArticle::clearPlaceholderLoading(PreparedPlaceholderBlockId id) {
+	_impl->clearPlaceholderLoading(id);
+}
+
+void MarkdownArticle::clearAllPlaceholderLoading() {
+	_impl->clearAllPlaceholderLoading();
+}
+
+void MarkdownArticle::addPlaceholderRipple(
+		PreparedPlaceholderBlockId id,
+		QPoint point) {
+	_impl->addPlaceholderRipple(id, point);
+}
+
+void MarkdownArticle::stopPlaceholderRipple(PreparedPlaceholderBlockId id) {
+	_impl->stopPlaceholderRipple(id);
+}
+
+void MarkdownArticle::clearBeforeDestroy() {
+    base::take(_impl);
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_article.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_article.h
new file mode 100644
index 00000000000000..dee85673809e95
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_article.h
@@ -0,0 +1,397 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_common.h"
+#include "iv/markdown/iv_markdown_media_block.h"
+#include "iv/markdown/iv_markdown_prepare.h"
+
+#include "base/flat_map.h"
+#include "spellcheck/spellcheck_highlight_syntax.h"
+#include "ui/chat/chat_style.h"
+#include "ui/effects/radial_animation.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/style/style_core_types.h"
+#include "ui/text/text.h"
+#include "ui/click_handler.h"
+#include "ui/painter.h"
+
+#include <QtGui/QColor>
+
+#include <memory>
+#include <optional>
+#include <span>
+#include <vector>
+
+namespace style {
+struct Markdown;
+struct TextStyle;
+} // namespace style
+
+namespace Ui {
+class PathShiftGradient;
+} // namespace Ui
+
+namespace Iv::Markdown {
+
+struct PlaceholderBlockRuntime {
+	explicit PlaceholderBlockRuntime(Fn<void()> repaint);
+
+	ClickHandlerPtr clickHandler;
+	bool loading = false;
+	Ui::InfiniteRadialAnimation loadingAnimation;
+	std::unique_ptr<Ui::RippleAnimation> ripple;
+	QSize rippleSize;
+};
+
+struct TaskMarkerRippleRuntime {
+	explicit TaskMarkerRippleRuntime(Fn<void()> repaint);
+
+	Fn<void()> repaint;
+	std::unique_ptr<Ui::RippleAnimation> ripple;
+	QSize rippleSize;
+};
+
+struct MarkdownArticleSelectionPosition {
+	int segment = -1;
+	int offset = 0;
+
+	[[nodiscard]] bool valid() const {
+		return (segment >= 0);
+	}
+};
+
+inline bool operator==(
+		MarkdownArticleSelectionPosition a,
+		MarkdownArticleSelectionPosition b) {
+	return (a.segment == b.segment) && (a.offset == b.offset);
+}
+
+inline bool operator!=(
+		MarkdownArticleSelectionPosition a,
+		MarkdownArticleSelectionPosition b) {
+	return !(a == b);
+}
+
+struct MarkdownArticleSelection {
+	MarkdownArticleSelectionPosition from;
+	MarkdownArticleSelectionPosition to;
+
+	[[nodiscard]] bool empty() const;
+};
+
+inline bool MarkdownArticleSelection::empty() const {
+	return !from.valid()
+		|| !to.valid()
+		|| (from == to);
+}
+
+inline bool operator==(
+		MarkdownArticleSelection a,
+		MarkdownArticleSelection b) {
+	return (a.from == b.from) && (a.to == b.to);
+}
+
+inline bool operator!=(
+		MarkdownArticleSelection a,
+		MarkdownArticleSelection b) {
+	return !(a == b);
+}
+
+struct MarkdownArticleSelectionEndpoint {
+	int segment = -1;
+	bool direct = false;
+
+	[[nodiscard]] bool valid() const {
+		return (segment >= 0);
+	}
+};
+
+struct MarkdownArticleSelectionEndpoints {
+	MarkdownArticleSelectionEndpoint from;
+	MarkdownArticleSelectionEndpoint to;
+};
+
+struct SelectableSegment;
+
+struct PaintSelectionState {
+	const std::vector<SelectableSegment> *segments = nullptr;
+	MarkdownArticleSelection selection;
+	const MarkdownArticleSelectionEndpoints *endpoints = nullptr;
+	const PreparedEditSelection *structuralSelection = nullptr;
+
+	[[nodiscard]] bool empty() const {
+		return !segments || selection.empty();
+	}
+	[[nodiscard]] bool hasStructuralSelection() const {
+		return structuralSelection && !structuralSelection->empty();
+	}
+};
+
+struct MarkdownArticleThinkingPaintCache {
+	QImage mask;
+	QImage gradient;
+};
+
+struct MarkdownArticlePaintCaches {
+	Ui::Text::QuotePaintCache *pre = nullptr;
+	Ui::Text::QuotePaintCache *blockquote = nullptr;
+	MarkdownArticleThinkingPaintCache *thinking = nullptr;
+	Ui::PathShiftGradient *pathShiftGradient = nullptr;
+	std::span<Ui::Text::SpecialColor> colors;
+	const style::Markdown *st = nullptr;
+	Fn<void()> repaint;
+	Fn<void(QRect)> repaintRect;
+	std::optional<QColor> supplementaryColorOverride;
+};
+
+using MarkdownArticleRevealLine = Ui::Text::LineLayoutInfo;
+
+struct MarkdownArticleRevealPostprocess {
+	Fn<Fn<void(QImage&)>(int lineIndex, int availableWidth)> method;
+	not_null<QImage*> cache;
+};
+
+// Caches per-block / per-leaf reveal line counts while the reveal
+// animation is active, so that painting doesn't re-run line breaking
+// for all the blocks above the clip on every frame. Owned by the
+// article, valid for a single layout generation, freed on the first
+// paint after the reveal finishes.
+struct MarkdownArticleRevealLineCountsCache {
+	int layoutGeneration = -1;
+	base::flat_map<const void*, int> counts;
+};
+
+struct MarkdownArticleRevealPaintState {
+	int activeLine = -1;
+	int nextLine = 0;
+	const MarkdownArticleRevealPostprocess *postprocess = nullptr;
+	MarkdownArticleRevealLineCountsCache *lineCounts = nullptr;
+};
+
+struct MarkdownArticlePaintContext final : Ui::ChatPaintContext {
+	explicit MarkdownArticlePaintContext(const Ui::ChatPaintContext &context)
+	: Ui::ChatPaintContext(context) {
+	}
+
+	MarkdownArticlePaintCaches caches;
+	PaintSelectionState selectionState;
+	MarkdownArticleRevealPaintState *reveal = nullptr;
+	int hiddenTextSegmentIndex = -1;
+	int hiddenSegmentIndex = -1;
+	bool debugBlockGeometry = false;
+
+	[[nodiscard]] MarkdownArticlePaintContext translated(int x, int y) const {
+		auto result = *this;
+		result.translate(x, y);
+		return result;
+	}
+	[[nodiscard]] MarkdownArticlePaintContext translated(QPoint point) const {
+		return translated(point.x(), point.y());
+	}
+	[[nodiscard]] const style::Markdown &paintMarkdownStyle(
+			const style::Markdown &fallback) const {
+		return caches.st ? *caches.st : fallback;
+	}
+};
+
+struct MarkdownArticleHitTestResult {
+	int segmentIndex = -1;
+	Ui::Text::StateResult state;
+	std::optional<PreparedLink> preparedLink;
+	MediaActivation mediaActivation;
+	QPoint placeholderLocalPoint;
+	int forcedOffset = -1;
+	bool direct = false;
+	bool codeHeaderCopy = false;
+
+	[[nodiscard]] bool valid() const {
+		return (segmentIndex >= 0);
+	}
+};
+
+struct MarkdownArticleHorizontalScrollHit {
+	bool scrollable = false;
+	bool overViewport = false;
+	bool overScrollbar = false;
+	bool overScrollbarThumb = false;
+};
+
+enum class MarkdownArticleEditControlHitKind {
+	None,
+	TaskMarker,
+	DetailsToggle,
+};
+
+struct MarkdownArticleEditControlHit {
+	MarkdownArticleEditControlHitKind kind
+		= MarkdownArticleEditControlHitKind::None;
+	std::optional<PreparedEditListItemSource> listItem;
+	std::optional<PreparedEditBlockSource> block;
+
+	[[nodiscard]] bool valid() const {
+		switch (kind) {
+		case MarkdownArticleEditControlHitKind::TaskMarker:
+			return listItem.has_value();
+		case MarkdownArticleEditControlHitKind::DetailsToggle:
+			return block.has_value();
+		case MarkdownArticleEditControlHitKind::None:
+			break;
+		}
+		return false;
+	}
+};
+
+inline bool operator==(
+		MarkdownArticleEditControlHit a,
+		MarkdownArticleEditControlHit b) {
+	return (a.kind == b.kind)
+		&& (a.listItem == b.listItem)
+		&& (a.block == b.block);
+}
+
+inline bool operator!=(
+		MarkdownArticleEditControlHit a,
+		MarkdownArticleEditControlHit b) {
+	return !(a == b);
+}
+
+struct MarkdownArticleTextLeafStyle {
+	const style::TextStyle *textStyle = nullptr;
+	style::color textColor;
+	QColor markBg;
+	int lineHeight = 0;
+	style::align align = style::al_left;
+	bool italic = false;
+
+	[[nodiscard]] bool valid() const {
+		return textStyle && textColor;
+	}
+};
+
+struct MarkdownArticleAnchorExpansion {
+	bool found = false;
+	bool changed = false;
+};
+
+class MarkdownArticle {
+public:
+	MarkdownArticle(
+		const style::Markdown &st,
+		std::shared_ptr<MathRenderer> renderer = nullptr);
+	~MarkdownArticle();
+
+	MarkdownArticle(MarkdownArticle &&) noexcept;
+	MarkdownArticle &operator=(MarkdownArticle &&) noexcept;
+
+	void setRenderer(std::shared_ptr<MathRenderer> renderer);
+	void setMediaBlockHost(MediaBlockHost *host);
+	void setTextRepaintCallbacks(
+		Fn<void()> repaint,
+		Fn<void(QRect)> repaintRect,
+		Fn<bool(const ClickContext&)> spoilerLinkFilter = nullptr);
+	void setContent(MarkdownArticleContent content);
+	void updatePreparedLeaf(
+		const PreparedEditLeafSource &source,
+		const MarkdownArticleContent &prepared);
+	void setEditableHeightOverride(int editableIndex, int height);
+	void setEditableHeightOverrideForSegment(int segmentIndex, int height);
+	void clearEditableHeightOverride();
+	void setTextLeafHeightOverride(int textLeafIndex, int height);
+	void clearTextLeafHeightOverride();
+	void invalidateLayout();
+	[[nodiscard]] int maxWidth() const;
+	[[nodiscard]] int lastLayoutWidth() const;
+	[[nodiscard]] int resizeGetHeight(int width);
+	[[nodiscard]] auto countRevealLinesGeometry(int width)
+	-> std::vector<MarkdownArticleRevealLine>;
+	void setVisibleTopBottom(int visibleTop, int visibleBottom);
+	void paint(Painter &p, const MarkdownArticlePaintContext &context) const;
+	[[nodiscard]] MarkdownArticleHitTestResult hitTest(
+		QPoint point,
+		Ui::Text::StateRequest::Flags flags) const;
+	[[nodiscard]] PreparedEditHit editHitTest(QPoint point) const;
+	[[nodiscard]] MarkdownArticleEditControlHit editControlHitTest(
+		QPoint point) const;
+	void addTaskMarkerRipple(
+		const PreparedEditListItemSource &source,
+		QPoint point);
+	[[nodiscard]] MarkdownArticleHorizontalScrollHit horizontalScrollHit(
+		QPoint point) const;
+	[[nodiscard]] bool canConsumeHorizontalScroll(
+		QPoint point,
+		int delta) const;
+	[[nodiscard]] bool consumeHorizontalScroll(QPoint point, int delta);
+	[[nodiscard]] bool beginHorizontalScroll(QPoint point, bool fromTouch);
+	[[nodiscard]] bool updateHorizontalScroll(QPoint point);
+	void endHorizontalScroll();
+	[[nodiscard]] int anchorTop(const QString &anchorId) const;
+	[[nodiscard]] MarkdownArticleAnchorExpansion expandDetailsToAnchor(
+		const QString &anchorId);
+	[[nodiscard]] bool toggleDetails(const QString &anchorId);
+	[[nodiscard]] bool segmentIsText(int index) const;
+	[[nodiscard]] bool segmentIsDisplayMath(int index) const;
+	[[nodiscard]] bool segmentIsEditable(int index) const;
+	[[nodiscard]] int segmentLength(int index) const;
+	[[nodiscard]] int firstTextSegmentIndex() const;
+	[[nodiscard]] int firstEditableSegmentIndex() const;
+	[[nodiscard]] int textLeafIndexForSegment(int segmentIndex) const;
+	[[nodiscard]] int segmentIndexForTextLeafIndex(int textLeafIndex) const;
+	[[nodiscard]] int editableIndexForSegment(int segmentIndex) const;
+	[[nodiscard]] int segmentIndexForEditableIndex(int editableIndex) const;
+	[[nodiscard]] QRect textSegmentRect(int segmentIndex) const;
+	[[nodiscard]] QRect logicalSegmentRect(int segmentIndex) const;
+	[[nodiscard]] QRect segmentRect(int segmentIndex) const;
+	[[nodiscard]] QRect displayMathEditRect(int segmentIndex) const;
+	[[nodiscard]] QRect displayMathBlockRect(int segmentIndex) const;
+	[[nodiscard]] bool revealSegment(int segmentIndex);
+	[[nodiscard]] MarkdownArticleTextLeafStyle textLeafStyleForSegment(
+		int segmentIndex) const;
+	[[nodiscard]] MarkdownArticleTextLeafStyle editableStyleForSegment(
+		int segmentIndex) const;
+	[[nodiscard]] int selectionOffsetFromHit(
+		const MarkdownArticleHitTestResult &result,
+		TextSelectType selectionType) const;
+	[[nodiscard]] TextSelection adjustSelection(
+		int segmentIndex,
+		TextSelection selection,
+		TextSelectType selectionType) const;
+	[[nodiscard]] bool selectionContains(
+		MarkdownArticleSelection selection,
+		const MarkdownArticleSelectionEndpoints *endpoints,
+		const MarkdownArticleHitTestResult &result) const;
+	[[nodiscard]] TextForMimeData textForContext(
+		const MarkdownArticleHitTestResult &result) const;
+	[[nodiscard]] TextForMimeData textForSelection(
+		MarkdownArticleSelection selection,
+		const MarkdownArticleSelectionEndpoints *endpoints,
+		const PreparedEditSelection *structuralSelection = nullptr) const;
+	[[nodiscard]] bool highlightProcessDone(
+		Spellchecker::HighlightProcessId processId);
+	void invalidatePaletteCache();
+	void invalidateRasterCache();
+	[[nodiscard]] bool hasHeavyPart() const;
+	void unloadHeavyPart();
+	void hideSpoilers();
+	[[nodiscard]] MediaBlockHost *mediaBlockHost() const;
+	void setPlaceholderLoading(PreparedPlaceholderBlockId id);
+	void clearPlaceholderLoading(PreparedPlaceholderBlockId id);
+	void clearAllPlaceholderLoading();
+	void addPlaceholderRipple(PreparedPlaceholderBlockId id, QPoint point);
+	void stopPlaceholderRipple(PreparedPlaceholderBlockId id);
+
+    void clearBeforeDestroy();
+
+private:
+	class Impl;
+
+	std::unique_ptr<Impl> _impl;
+
+};
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_article_layout_blocks.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_layout_blocks.cpp
new file mode 100644
index 00000000000000..0be596ff52394d
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_layout_blocks.cpp
@@ -0,0 +1,4672 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_article_layout_blocks.h"
+#include "iv/markdown/iv_markdown_media_block.h"
+#include "iv/markdown/iv_markdown_article_text.h"
+#include "iv/markdown/iv_markdown_prepare_links.h"
+#include "iv/markdown/iv_markdown_prepare_serialize.h"
+#include "spellcheck/spellcheck_highlight_syntax.h"
+
+#include "lang/lang_keys.h"
+#include "styles/style_iv.h"
+#include "styles/style_widgets.h"
+
+#include <algorithm>
+#include <cmath>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+constexpr auto kIvMarkedTextOptions = TextParseOptions{
+	TextParseMultiline,
+	0,
+	0,
+	Qt::LayoutDirectionAuto,
+};
+
+constexpr auto kCodeTabColumns = 4;
+constexpr auto kCodeTrailingGuard = 0x2060;
+constexpr auto kReadableTextColumns = 12;
+constexpr auto kReadableTextLineHeights = 4;
+constexpr auto kReadableCodeColumns = 16;
+
+thread_local const LayoutContext *CurrentLayoutContext = nullptr;
+
+[[nodiscard]] QString DetailsStateText(bool open) {
+	return open
+		? tr::lng_iv_details_state_expanded(tr::now)
+		: tr::lng_iv_details_state_collapsed(tr::now);
+}
+
+[[nodiscard]] size_t CombineHash(size_t accumulator, size_t value) {
+	return (accumulator * 1315423911U) ^ value;
+}
+
+[[nodiscard]] size_t HashPreparedEditBlockPath(
+		const PreparedEditBlockPath &value) {
+	auto result = CombineHash(0, size_t(value.container.steps.size() + 1));
+	for (const auto &step : value.container.steps) {
+		result = CombineHash(result, size_t(step.kind));
+		result = CombineHash(result, size_t(step.blockIndex + 1));
+		result = CombineHash(result, size_t(step.listItemIndex + 1));
+	}
+	return CombineHash(result, size_t(value.index + 1));
+}
+
+[[nodiscard]] size_t HashPreparedEditBlockSource(
+		const PreparedEditBlockSource &value) {
+	return HashPreparedEditBlockPath(value.path);
+}
+
+[[nodiscard]] size_t HashPreparedEditListItemSource(
+		const PreparedEditListItemSource &value) {
+	auto result = HashPreparedEditBlockPath(value.block);
+	return CombineHash(result, size_t(value.listItemIndex + 1));
+}
+
+[[nodiscard]] size_t HashPreparedEditTableCellSource(
+		const PreparedEditTableCellSource &value) {
+	auto result = HashPreparedEditBlockPath(value.block);
+	result = CombineHash(result, size_t(value.tableRowIndex + 1));
+	result = CombineHash(result, size_t(value.tableCellIndex + 1));
+	result = CombineHash(result, size_t(value.column + 1));
+	result = CombineHash(result, size_t(value.colspan + 1));
+	return CombineHash(result, size_t(value.rowspan + 1));
+}
+
+[[nodiscard]] size_t HashPreparedEditLeafSource(
+		const PreparedEditLeafSource &value) {
+	auto result = CombineHash(0, size_t(value.kind));
+	result = CombineHash(result, HashPreparedEditBlockPath(value.block));
+	result = CombineHash(result, size_t(value.listItemIndex + 1));
+	result = CombineHash(result, size_t(value.tableRowIndex + 1));
+	return CombineHash(result, size_t(value.tableCellIndex + 1));
+}
+
+[[nodiscard]] style::align CellAlign(TableAlignment alignment) {
+	switch (alignment) {
+	case TableAlignment::Center:
+		return style::al_center;
+	case TableAlignment::Right:
+		return style::al_right;
+	case TableAlignment::None:
+	case TableAlignment::Left:
+		return style::al_left;
+	}
+	return style::al_left;
+}
+
+[[nodiscard]] const style::TextStyle &TableCellTextStyle(
+		const PreparedTableCell &prepared,
+		const style::Markdown &st) {
+	if (prepared.header) {
+		return st.table.headerStyle;
+	}
+	return st.table.bodyStyle;
+}
+
+[[nodiscard]] const style::TextStyle &TableCellTextStyle(
+		const LaidOutTableCell &cell,
+		const style::Markdown &st) {
+	if (cell.header) {
+		return st.table.headerStyle;
+	}
+	return st.table.bodyStyle;
+}
+
+[[nodiscard]] int TableBorder(
+		bool bordered,
+		const style::Markdown &st) {
+	return bordered ? st.table.border : 0;
+}
+
+[[nodiscard]] bool TextDependsOnMediaRuntime(
+		const TextWithEntities &text) {
+	for (const auto &entity : text.entities) {
+		if (entity.type() != EntityType::CustomEmoji) {
+			continue;
+		}
+		const auto parsed = ParseInlineTextObjectEntity(entity.data());
+		if (parsed && (parsed->kind == InlineTextObjectKind::IvImage)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] TextWithEntities DisplayMathFallbackText() {
+	auto result = TextWithEntities::Simple(u"Invalid formula"_q);
+	result.entities.push_back(EntityInText(
+		EntityType::Italic,
+		0,
+		result.text.size()));
+	return result;
+}
+
+[[nodiscard]] size_t TextStyleKey(const style::TextStyle &style) {
+	return reinterpret_cast<size_t>(&style);
+}
+
+void SetPlainTextLeaf(
+	Ui::Text::String *leaf,
+	const style::TextStyle &textStyle,
+	const QString &text,
+	int minResizeWidth);
+
+[[nodiscard]] CachedTextLeafSourceSignature MarkedTextLeafSourceSignature(
+		TextWithEntities text,
+		const style::TextStyle &textStyle,
+		int minResizeWidth) {
+	auto result = CachedTextLeafSourceSignature();
+	result.dependsOnMediaRuntime = TextDependsOnMediaRuntime(text);
+	result.text = std::move(text);
+	result.minResizeWidth = minResizeWidth;
+	result.styleKey = TextStyleKey(textStyle);
+	return result;
+}
+
+[[nodiscard]] CachedTextLeafSourceSignature PlainTextLeafSourceSignature(
+		const QString &text,
+		const style::TextStyle &textStyle,
+		int minResizeWidth) {
+	return MarkedTextLeafSourceSignature(
+		TextWithEntities::Simple(text),
+		textStyle,
+		minResizeWidth);
+}
+
+[[nodiscard]] CachedTextLeafSourceSignature CodeTextLeafSourceSignature(
+		const PreparedBlock &prepared,
+		const style::Markdown &st) {
+	auto result = MarkedTextLeafSourceSignature(
+		CodeBlockDisplayText(prepared.text),
+		st.code,
+		CodeTextMinResizeWidth(st));
+	result.codeLanguage = prepared.codeLanguage;
+	return result;
+}
+
+[[nodiscard]] CachedTextLeafKey BlockCachedTextLeafKey(
+		CachedTextLeafSlot slot,
+		const PreparedBlock &prepared,
+		const std::vector<int> &preparedPath) {
+	auto result = CachedTextLeafKey();
+	result.slot = slot;
+	if ((slot == CachedTextLeafSlot::Leaf
+			|| slot == CachedTextLeafSlot::Placeholder
+			|| slot == CachedTextLeafSlot::Fallback)
+		&& prepared.editLeaf) {
+		result.identityKind = CachedTextLeafIdentityKind::EditLeaf;
+		result.editLeaf = *prepared.editLeaf;
+		return result;
+	}
+	if ((slot == CachedTextLeafSlot::Marker) && prepared.editListItem) {
+		result.identityKind = CachedTextLeafIdentityKind::EditListItem;
+		result.editListItem = *prepared.editListItem;
+		return result;
+	}
+	if (prepared.editBlock) {
+		result.identityKind = CachedTextLeafIdentityKind::EditBlock;
+		result.editBlock = *prepared.editBlock;
+		return result;
+	}
+	if (prepared.editListItem) {
+		result.identityKind = CachedTextLeafIdentityKind::EditListItem;
+		result.editListItem = *prepared.editListItem;
+		return result;
+	}
+	if (prepared.editLeaf) {
+		result.identityKind = CachedTextLeafIdentityKind::EditLeaf;
+		result.editLeaf = *prepared.editLeaf;
+		return result;
+	}
+	result.preparedPath = preparedPath;
+	return result;
+}
+
+[[nodiscard]] CachedTextLeafKey TableCellCachedTextLeafKey(
+		CachedTextLeafSlot slot,
+		const PreparedTableCell &prepared,
+		const std::vector<int> &preparedPath,
+		int tableRowIndex,
+		int tableCellIndex) {
+	auto result = CachedTextLeafKey();
+	result.slot = slot;
+	result.tableRowIndex = tableRowIndex;
+	result.tableCellIndex = tableCellIndex;
+	if (prepared.editLeaf) {
+		result.identityKind = CachedTextLeafIdentityKind::EditLeaf;
+		result.editLeaf = *prepared.editLeaf;
+		return result;
+	}
+	if (prepared.editCell) {
+		result.identityKind = CachedTextLeafIdentityKind::EditTableCell;
+		result.editTableCell = *prepared.editCell;
+		return result;
+	}
+	result.preparedPath = preparedPath;
+	return result;
+}
+
+template <typename Builder, typename Consumer>
+auto WithCachedTextLeaf(
+		LayoutContext context,
+		CachedTextLeafKey key,
+		CachedTextLeafSourceSignature source,
+		Builder &&builder,
+		Consumer &&consumer) {
+	if (const auto pool = context.cachedTextLeafs) {
+		auto i = pool->entries.find(key);
+		if (i == end(pool->entries)
+			|| (i->second.source != source)
+			|| i->second.leaf.isEmpty()) {
+			auto entry = CachedTextLeafEntry();
+			entry.source = source;
+			builder(&entry.leaf, &entry.syntaxHighlightProcessId);
+			i = pool->entries.insert_or_assign(
+				std::move(key),
+				std::move(entry)).first;
+		}
+		return consumer(i->second.leaf, i->second.syntaxHighlightProcessId);
+	}
+	auto leaf = Ui::Text::String();
+	auto syntaxHighlightProcessId = Spellchecker::HighlightProcessId(0);
+	builder(&leaf, &syntaxHighlightProcessId);
+	return consumer(leaf, syntaxHighlightProcessId);
+}
+
+template <typename Builder>
+void BuildOrReuseCachedTextLeaf(
+		Ui::Text::String *leaf,
+		Spellchecker::HighlightProcessId *syntaxHighlightProcessId,
+		LayoutContext context,
+		CachedTextLeafKey key,
+		const CachedTextLeafSourceSignature &source,
+		Builder &&builder) {
+	if (const auto pool = context.cachedTextLeafs) {
+		if (const auto i = pool->entries.find(key);
+			i != end(pool->entries)
+			&& (i->second.source == source)
+			&& !i->second.leaf.isEmpty()) {
+			if (syntaxHighlightProcessId) {
+				*syntaxHighlightProcessId = i->second.syntaxHighlightProcessId;
+			}
+			*leaf = std::move(i->second.leaf);
+			pool->entries.erase(i);
+			SetTextLeafSpoilerLinkFilter(leaf, context.spoilerLinkFilter);
+			return;
+		}
+	}
+	builder(leaf, syntaxHighlightProcessId);
+	SetTextLeafSpoilerLinkFilter(leaf, context.spoilerLinkFilter);
+}
+
+[[nodiscard]] LaidOutTableCell InitializeTableCellLayout(
+		const PreparedTableCell &prepared,
+		const std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int tableRowIndex,
+		int tableCellIndex,
+		LayoutContext context) {
+	auto result = LaidOutTableCell();
+	const auto &textStyle = TableCellTextStyle(prepared, st);
+	const auto minResizeWidth = TableCellTextMinResizeWidth(textStyle, st);
+	result.header = prepared.header;
+	result.verticalAlignment = prepared.verticalAlignment;
+	result.align = CellAlign(prepared.alignment);
+	result.column = std::max(prepared.column, 0);
+	result.colspan = std::max(prepared.colspan, 1);
+	result.rowspan = std::max(prepared.rowspan, 1);
+	result.editCell = prepared.editCell;
+	result.editLeaf = prepared.editLeaf;
+	BuildOrReuseCachedTextLeaf(
+		&result.leaf,
+		nullptr,
+		context,
+		TableCellCachedTextLeafKey(
+			CachedTextLeafSlot::TableCellText,
+			prepared,
+			context.preparedPath,
+			tableRowIndex,
+			tableCellIndex),
+		MarkedTextLeafSourceSignature(prepared.text, textStyle, minResizeWidth),
+		[&](Ui::Text::String *leaf,
+				Spellchecker::HighlightProcessId*) {
+			SetTextLeaf(
+				leaf,
+				textStyle,
+				st,
+				prepared.text,
+				formulas,
+				inlineFormulaObjects,
+				mediaRuntime,
+				minResizeWidth,
+				context.repaint,
+				context.repaintRect);
+			BindLinks(leaf, prepared.links);
+		});
+	BindLinks(&result.leaf, prepared.links);
+	const auto usePlaceholder = prepared.text.text.isEmpty()
+		&& !prepared.editPlaceholderText.isEmpty();
+	if (usePlaceholder) {
+		result.placeholderText = prepared.editPlaceholderText;
+		BuildOrReuseCachedTextLeaf(
+			&result.placeholderLeaf,
+			nullptr,
+			context,
+			TableCellCachedTextLeafKey(
+				CachedTextLeafSlot::TableCellPlaceholder,
+				prepared,
+				context.preparedPath,
+				tableRowIndex,
+				tableCellIndex),
+			PlainTextLeafSourceSignature(
+				result.placeholderText,
+				textStyle,
+				minResizeWidth),
+			[&](Ui::Text::String *leaf,
+					Spellchecker::HighlightProcessId*) {
+				SetPlainTextLeaf(
+					leaf,
+					textStyle,
+					result.placeholderText,
+					minResizeWidth);
+			});
+	}
+	return result;
+}
+
+[[nodiscard]] int TableSpanWidth(
+		const std::vector<int> &columnWidths,
+		int column,
+		int colspan,
+		int border) {
+	const auto from = std::clamp(column, 0, int(columnWidths.size()));
+	const auto to = std::clamp(column + colspan, 0, int(columnWidths.size()));
+	if (from >= to) {
+		return 0;
+	}
+	auto result = 0;
+	for (auto current = from; current != to; ++current) {
+		result += columnWidths[current];
+	}
+	return result + std::max(to - from - 1, 0) * border;
+}
+
+[[nodiscard]] int TableSpanHeight(
+		const std::vector<int> &rowHeights,
+		int row,
+		int rowspan,
+		int border) {
+	const auto from = std::clamp(row, 0, int(rowHeights.size()));
+	const auto to = std::clamp(row + rowspan, 0, int(rowHeights.size()));
+	if (from >= to) {
+		return 0;
+	}
+	auto result = 0;
+	for (auto current = from; current != to; ++current) {
+		result += rowHeights[current];
+	}
+	return result + std::max(to - from - 1, 0) * border;
+}
+
+void DistributeSizeDeficits(
+		std::vector<int> *sizes,
+		std::vector<int> deficits,
+		int *extra) {
+	auto remaining = 0;
+	for (const auto deficit : deficits) {
+		remaining += std::max(deficit, 0);
+	}
+	while (*extra > 0 && remaining > 0) {
+		auto active = 0;
+		for (const auto deficit : deficits) {
+			if (deficit > 0) {
+				++active;
+			}
+		}
+		if (!active) {
+			break;
+		}
+		const auto step = std::max(*extra / active, 1);
+		for (auto i = 0, count = int(deficits.size()); i != count && *extra > 0; ++i) {
+			if (deficits[i] <= 0) {
+				continue;
+			}
+			const auto delta = std::min({ deficits[i], step, *extra });
+			(*sizes)[i] += delta;
+			deficits[i] -= delta;
+			remaining -= delta;
+			*extra -= delta;
+		}
+	}
+}
+
+void DistributeSpanDelta(
+		std::vector<int> *sizes,
+		int from,
+		int to,
+		int delta) {
+	from = std::clamp(from, 0, int(sizes->size()));
+	to = std::clamp(to, 0, int(sizes->size()));
+	while (delta > 0 && from < to) {
+		const auto active = to - from;
+		const auto step = std::max(delta / active, 1);
+		for (auto i = from; i != to && delta > 0; ++i) {
+			const auto current = std::min(step, delta);
+			(*sizes)[i] += current;
+			delta -= current;
+		}
+	}
+}
+
+struct TableCellGeometryData {
+	LaidOutTableCell *cell = nullptr;
+	int minimumWidth = 0;
+	int preferredWidth = 0;
+	int preferredHeight = 0;
+	int textHeight = 0;
+	bool usePlaceholder = false;
+};
+
+struct TableRowGeometryData {
+	std::vector<TableCellGeometryData> cells;
+	bool header = false;
+};
+
+struct TableSpannedCellGeometryData {
+	int row = 0;
+	TableCellGeometryData *cell = nullptr;
+};
+
+[[nodiscard]] std::vector<int> ComputeTableColumnWidths(
+		std::vector<TableRowGeometryData> &rows,
+		int columnCount,
+		int width,
+		const style::Markdown &st,
+		bool bordered,
+		bool *overflowed) {
+	const auto &padding = st.table.cellPadding;
+	const auto border = TableBorder(bordered, st);
+	const auto paddingWidth = padding.left() + padding.right();
+	auto constraints = std::vector<TableCellMinimumWidthConstraint>();
+	for (auto &row : rows) {
+		for (auto &cellData : row.cells) {
+			if (!cellData.cell || cellData.minimumWidth <= 0) {
+				continue;
+			}
+			constraints.push_back({
+				.column = cellData.cell->column,
+				.colspan = cellData.cell->colspan,
+				.minimumWidth = std::max(
+					cellData.minimumWidth + paddingWidth,
+					st.table.minColumnWidth),
+			});
+		}
+	}
+	auto result = ComputeTableColumnMinimumWidths(
+		std::move(constraints),
+		columnCount,
+		st,
+		bordered);
+	auto singleColumnDeficits = std::vector<int>(std::max(columnCount, 0), 0);
+	auto spannedCells = std::vector<TableSpannedCellGeometryData>();
+	for (auto row = 0, rowCount = int(rows.size()); row != rowCount; ++row) {
+		for (auto &cellData : rows[row].cells) {
+			if (!cellData.cell) {
+				continue;
+			}
+			const auto from = std::clamp(cellData.cell->column, 0, columnCount);
+			const auto to = std::clamp(
+				cellData.cell->column + cellData.cell->colspan,
+				0,
+				columnCount);
+			if (from >= to) {
+				continue;
+			}
+			const auto preferredWidth = cellData.preferredWidth
+				+ padding.left()
+				+ padding.right();
+			if ((to - from) == 1) {
+				singleColumnDeficits[from] = std::max(
+					singleColumnDeficits[from],
+					preferredWidth - result[from]);
+			} else {
+				spannedCells.push_back({ row, &cellData });
+			}
+		}
+	}
+
+	const auto availableWidth = std::max(width, 1);
+	const auto minimumGridWidth = (columnCount > 0)
+		? TableGridWidth(result, st, bordered)
+		: TableMinimumGridWidth(columnCount, st, bordered);
+	*overflowed = (minimumGridWidth > availableWidth);
+	if (*overflowed || !columnCount) {
+		return result;
+	}
+
+	auto extra = availableWidth - minimumGridWidth;
+	DistributeSizeDeficits(&result, std::move(singleColumnDeficits), &extra);
+	std::sort(
+		spannedCells.begin(),
+		spannedCells.end(),
+		[](const TableSpannedCellGeometryData &a,
+				const TableSpannedCellGeometryData &b) {
+			const auto aSpan = a.cell ? a.cell->cell->colspan : 0;
+			const auto bSpan = b.cell ? b.cell->cell->colspan : 0;
+			return (aSpan < bSpan)
+				|| ((aSpan == bSpan) && (a.row < b.row))
+				|| ((aSpan == bSpan)
+					&& (a.row == b.row)
+					&& a.cell
+					&& b.cell
+					&& (a.cell->cell->column < b.cell->cell->column));
+		});
+	for (const auto &spanned : spannedCells) {
+		if (!spanned.cell || !spanned.cell->cell || extra <= 0) {
+			break;
+		}
+		const auto from = std::clamp(spanned.cell->cell->column, 0, columnCount);
+		const auto to = std::clamp(
+			spanned.cell->cell->column + spanned.cell->cell->colspan,
+			0,
+			columnCount);
+		if (from >= to) {
+			continue;
+		}
+		const auto preferredWidth = spanned.cell->preferredWidth
+			+ padding.left()
+			+ padding.right();
+		const auto currentWidth = TableSpanWidth(
+			result,
+			from,
+			to - from,
+			border);
+		const auto delta = std::min(
+			std::max(preferredWidth - currentWidth, 0),
+			extra);
+		DistributeSpanDelta(&result, from, to, delta);
+		extra -= delta;
+	}
+
+	if (extra > 0) {
+		const auto base = extra / columnCount;
+		const auto tail = extra % columnCount;
+		for (auto column = 0; column != columnCount; ++column) {
+			result[column] += base + ((column < tail) ? 1 : 0);
+		}
+	}
+	return result;
+}
+
+void SetPlainTextLeaf(
+		Ui::Text::String *leaf,
+		const style::TextStyle &textStyle,
+		const QString &text,
+		int minResizeWidth) {
+	*leaf = Ui::Text::String(TextMinResizeWidth(minResizeWidth));
+	leaf->setMarkedText(
+		textStyle,
+		TextWithEntities::Simple(text),
+		kIvMarkedTextOptions);
+}
+
+void PopulateCodeBlockLeaf(
+		Ui::Text::String *leaf,
+		Spellchecker::HighlightProcessId *syntaxHighlightProcessId,
+		const TextWithEntities &codeText,
+		const std::vector<PreparedLink> &codeLinks,
+		const QString &codeLanguage,
+		const std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		bool allowAsyncSyntaxHighlighting,
+		CodeBlockSyntaxHighlightTracker *syntaxHighlightTracker,
+		Fn<void()> repaint,
+		Fn<void(QRect)> repaintRect,
+		Fn<bool(const ClickContext&)> spoilerLinkFilter) {
+	auto display = CodeBlockDisplayText(codeText);
+	auto highlightRequest = TextWithEntities();
+	highlightRequest.text = display.text;
+	if (!highlightRequest.text.isEmpty()) {
+		highlightRequest.entities.push_back(EntityInText(
+			EntityType::Pre,
+			0,
+			highlightRequest.text.size(),
+			codeLanguage));
+	}
+	const auto processId = allowAsyncSyntaxHighlighting
+		? (syntaxHighlightTracker
+			? syntaxHighlightTracker->tryHighlightSyntax(
+				highlightRequest.text,
+				codeLanguage,
+				highlightRequest)
+			: Spellchecker::TryHighlightSyntax(highlightRequest))
+		: 0;
+	for (const auto &entity : highlightRequest.entities) {
+		if (entity.type() == EntityType::Colorized
+			&& entity.length() > 0) {
+			display.entities.push_back(entity);
+		}
+	}
+	SortEntities(&display);
+	SetTextLeaf(
+		leaf,
+		st.code,
+		st,
+		display,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		CodeTextMinResizeWidth(st),
+		std::move(repaint),
+		std::move(repaintRect),
+		std::move(spoilerLinkFilter));
+	BindLinks(leaf, codeLinks);
+	if (syntaxHighlightProcessId) {
+		*syntaxHighlightProcessId = processId;
+	}
+}
+
+[[nodiscard]] int LeafHeight(
+		const Ui::Text::String &leaf,
+		const style::TextStyle &textStyle,
+		int width) {
+	return std::max(
+		leaf.countHeight(width, true),
+		TextLineHeight(textStyle));
+}
+
+[[nodiscard]] int LeafHeightWithLineLimit(
+		const Ui::Text::String &leaf,
+		const style::TextStyle &textStyle,
+		int width,
+		int lines) {
+	auto result = LeafHeight(leaf, textStyle, width);
+	if (lines > 0) {
+		result = std::min(result, lines * TextLineHeight(textStyle));
+	}
+	return result;
+}
+
+[[nodiscard]] QRect PaddedBand(
+		int left,
+		int width,
+		QMargins padding) {
+	const auto paddedLeft = left + padding.left();
+	const auto paddedWidth = std::max(
+		width - padding.left() - padding.right(),
+		1);
+	return QRect(paddedLeft, 0, paddedWidth, 0);
+}
+
+[[nodiscard]] QRect ArticleTextBand(
+		int fallbackLeft,
+		int fallbackWidth,
+		const style::Markdown &st,
+		const LayoutContext &context) {
+	return context.useArticleBands
+		? PaddedBand(
+			context.articleLeft,
+			context.articleWidth,
+			st.textPadding)
+		: QRect(fallbackLeft, 0, std::max(fallbackWidth, 1), 0);
+}
+
+[[nodiscard]] int LimitedMediaWidth(
+		int availableWidth,
+		int intrinsicWidth) {
+	const auto limit = (intrinsicWidth > 0)
+		? (2 * intrinsicWidth)
+		: availableWidth;
+	return std::clamp(limit, 1, std::max(availableWidth, 1));
+}
+
+void ApplyMediaBlockGeometry(
+		LaidOutBlock *block,
+		QRect geometry,
+		const style::Markdown &st) {
+	if (!block->mediaBlock) {
+		return;
+	}
+	block->mediaBlock->setGeometry(geometry);
+	auto actual = block->mediaBlock->geometry();
+	if (actual.width() < geometry.width() && actual.x() == geometry.x()) {
+		geometry.moveLeft(
+			geometry.x() + std::max((geometry.width() - actual.width()) / 2, 0));
+		block->mediaBlock->setGeometry(geometry);
+		actual = block->mediaBlock->geometry();
+	}
+	block->mediaRect = actual;
+
+	// Media blocks without text report their top as the baseline, while
+	// the consumers (like list item marker placement) expect a text line
+	// baseline. Treat the media top as the top of a normal text line, so
+	// that markers are placed as if a text line started at the media top.
+	block->firstLineBaseline = std::max(
+		block->mediaBlock->firstLineBaseline(),
+		TextLineBaseline(st.body, block->mediaRect.y()));
+
+	block->visibleMediaRect = block->mediaRect;
+}
+
+void FillMediaCaption(
+		LaidOutBlock *block,
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		LayoutContext context) {
+	if (prepared.text.text.isEmpty() && !prepared.forceTextSegment) {
+		return;
+	}
+	block->supplementary = prepared.supplementary;
+	BuildOrReuseMarkedTextLeaf(
+		&block->leaf,
+		CachedTextLeafSlot::Leaf,
+		prepared,
+		st.body,
+		st,
+		prepared.text,
+		prepared.links,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		FlowTextMinResizeWidth(st.body),
+		context);
+	if (prepared.text.text.isEmpty() && !prepared.editPlaceholderText.isEmpty()) {
+		BuildOrReuseEditPlaceholderLeaf(
+			&block->placeholderText,
+			&block->placeholderLeaf,
+			prepared,
+			prepared.editPlaceholderText,
+			st.body,
+			PlainTextMinResizeWidth(st.body),
+			context);
+	}
+}
+
+[[nodiscard]] LaidOutBlockLogicalGeometry ExtractLogicalGeometry(
+		const LaidOutBlock &block) {
+	return {
+		.outer = block.outer,
+		.headerRect = block.headerRect,
+		.bodyRect = block.bodyRect,
+		.iconRect = block.iconRect,
+		.textRect = block.textRect,
+		.labelRect = block.labelRect,
+		.subtitleRect = block.subtitleRect,
+		.actionRect = block.actionRect,
+		.markerRect = block.markerRect,
+		.contentRect = block.contentRect,
+		.formulaRect = block.formulaRect,
+		.tableRect = block.tableRect,
+		.mediaRect = block.mediaRect,
+		.thumbnailRect = block.thumbnailRect,
+		.markerCenter = block.markerCenter,
+	};
+}
+
+[[nodiscard]] LaidOutBlock FinalizeLaidOutBlock(LaidOutBlock block) {
+	block.logicalGeometry = ExtractLogicalGeometry(block);
+	return block;
+}
+
+void ClearBlockGeometry(LaidOutBlock *block) {
+	if (!block) {
+		return;
+	}
+	block->outer = QRect();
+	block->headerRect = QRect();
+	block->bodyRect = QRect();
+	block->iconRect = QRect();
+	block->textRect = QRect();
+	block->labelRect = QRect();
+	block->subtitleRect = QRect();
+	block->actionRect = QRect();
+	block->markerRect = QRect();
+	block->contentRect = QRect();
+	block->formulaRect = QRect();
+	block->tableRect = QRect();
+	block->mediaRect = QRect();
+	block->thumbnailRect = QRect();
+	block->visibleFormulaRect = QRect();
+	block->scrollViewportRect = QRect();
+	block->scrollLogicalContentRect = QRect();
+	block->scrollScrollbarTrackRect = QRect();
+	block->scrollScrollbarThumbRect = QRect();
+	block->visibleTableRect = QRect();
+	block->tableScrollbarTrackRect = QRect();
+	block->tableScrollbarThumbRect = QRect();
+	block->visibleMediaRect = QRect();
+	block->markerCenter = QPoint();
+	block->logicalGeometry = {};
+	block->textWidth = 0;
+	block->labelWidth = 0;
+	block->subtitleWidth = 0;
+	block->actionWidth = 0;
+	block->markerWidth = 0;
+	block->firstLineBaseline = -1;
+	block->formulaAlign = style::al_left;
+	block->overflowed = false;
+	block->insideHorizontalScroll = false;
+	block->horizontalScrollMax = 0;
+	block->horizontalScrollAncestorShift = 0;
+	block->tableColumnWidths.clear();
+}
+
+void ResetTableCellGeometry(LaidOutTableCell *cell) {
+	if (!cell) {
+		return;
+	}
+	cell->logicalOuter = QRect();
+	cell->logicalTextRect = QRect();
+	cell->outer = QRect();
+	cell->textRect = QRect();
+	cell->textWidth = 0;
+}
+
+void ResetTableRowGeometry(LaidOutTableRow *row) {
+	if (!row) {
+		return;
+	}
+	row->logicalOuter = QRect();
+	row->outer = QRect();
+	for (auto &cell : row->cells) {
+		ResetTableCellGeometry(&cell);
+	}
+}
+
+[[nodiscard]] bool TextNeedsRetainedLeaf(const QString &text) {
+	for (const auto ch : text) {
+		if (!Ui::Text::IsTrimmed(ch)
+			&& !Ui::Text::IsReplacedBySpace(ch)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] bool MissingRetainedLeaf(
+		const QString &text,
+		const Ui::Text::String &leaf) {
+	return TextNeedsRetainedLeaf(text) && leaf.isEmpty();
+}
+
+[[nodiscard]] bool MissingRetainedPlaceholderLeaf(
+		bool usePlaceholder,
+		const Ui::Text::String &leaf) {
+	return usePlaceholder && leaf.isEmpty();
+}
+
+void FinishBlockGeometry(LaidOutBlock *block) {
+	if (!block) {
+		return;
+	}
+	block->logicalGeometry = ExtractLogicalGeometry(*block);
+}
+
+[[nodiscard]] int ScrollbarReserveHeight(
+		bool scrollOwner,
+		int horizontalScrollMax,
+		const style::Markdown &st) {
+	return (scrollOwner && (horizontalScrollMax > 0))
+		? (st.table.scrollbarSkip + st.table.scrollbarHeight)
+		: 0;
+}
+
+void CopyCachedTextLeaf(
+		CachedTextLeafPool *pool,
+		CachedTextLeafKey key,
+		CachedTextLeafSourceSignature source,
+		Ui::Text::String *leaf,
+		Spellchecker::HighlightProcessId syntaxHighlightProcessId = 0) {
+	if (!pool || !leaf || leaf->isEmpty()) {
+		return;
+	}
+	pool->entries.insert_or_assign(
+		std::move(key),
+		CachedTextLeafEntry{
+			.leaf = std::move(*leaf),
+			.source = std::move(source),
+			.syntaxHighlightProcessId = syntaxHighlightProcessId,
+		});
+	*leaf = Ui::Text::String();
+}
+
+void CopyBlockCachedTextLeafs(
+		const PreparedBlock &prepared,
+		LaidOutBlock &block,
+		const style::Markdown &st,
+		CachedTextLeafPool *pool,
+		const std::vector<int> &preparedPath) {
+	const auto copyBlockLeaf = [&](CachedTextLeafSlot slot,
+			CachedTextLeafSourceSignature source,
+			Ui::Text::String *leaf,
+			Spellchecker::HighlightProcessId syntaxHighlightProcessId = 0) {
+		CopyCachedTextLeaf(
+			pool,
+			BlockCachedTextLeafKey(slot, prepared, preparedPath),
+			std::move(source),
+			leaf,
+			syntaxHighlightProcessId);
+	};
+	const auto copyTableCellLeaf = [&](
+			CachedTextLeafSlot slot,
+			const PreparedTableCell &preparedCell,
+			int tableRowIndex,
+			int tableCellIndex,
+			CachedTextLeafSourceSignature source,
+			Ui::Text::String *leaf) {
+		CopyCachedTextLeaf(
+			pool,
+			TableCellCachedTextLeafKey(
+				slot,
+				preparedCell,
+				preparedPath,
+				tableRowIndex,
+				tableCellIndex),
+			std::move(source),
+			leaf);
+	};
+
+	if (!block.marker.isEmpty()) {
+		copyBlockLeaf(
+			CachedTextLeafSlot::Marker,
+			PlainTextLeafSourceSignature(
+				ListMarkerText(prepared),
+				st.body,
+				PlainTextMinResizeWidth(st.body)),
+			&block.marker);
+	}
+
+	switch (prepared.kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading: {
+		const auto &textStyle = TextStyleFor(prepared, st);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Leaf,
+			MarkedTextLeafSourceSignature(
+				prepared.text,
+				textStyle,
+				FlowBlockMinimumWidth(prepared, st)),
+			&block.leaf);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				textStyle,
+				PlainTextMinResizeWidth(textStyle)),
+			&block.placeholderLeaf);
+	} break;
+	case PreparedBlockKind::CodeBlock:
+		copyBlockLeaf(
+			CachedTextLeafSlot::Leaf,
+			CodeTextLeafSourceSignature(prepared, st),
+			&block.leaf,
+			block.syntaxHighlightProcessId);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.code,
+				PlainTextMinResizeWidth(st.code)),
+			&block.placeholderLeaf);
+		break;
+	case PreparedBlockKind::DisplayMath:
+		copyBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.displayMath.fallbackStyle,
+				DisplayMathFallbackTextMinResizeWidth(st)),
+				&block.placeholderLeaf);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Fallback,
+			MarkedTextLeafSourceSignature(
+				DisplayMathFallbackText(),
+				st.displayMath.fallbackStyle,
+				DisplayMathFallbackTextMinResizeWidth(st)),
+			&block.fallbackLeaf);
+		break;
+	case PreparedBlockKind::Table: {
+		copyBlockLeaf(
+			CachedTextLeafSlot::Leaf,
+			MarkedTextLeafSourceSignature(
+				prepared.text,
+				st.body,
+				FlowTextMinResizeWidth(st.body)),
+			&block.leaf);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.body,
+				PlainTextMinResizeWidth(st.body)),
+			&block.placeholderLeaf);
+		const auto rowCount = std::min(
+			int(prepared.tableRows.size()),
+			int(block.tableRows.size()));
+		for (auto rowIndex = 0; rowIndex != rowCount; ++rowIndex) {
+			const auto cellCount = std::min(
+				int(prepared.tableRows[rowIndex].cells.size()),
+				int(block.tableRows[rowIndex].cells.size()));
+			for (auto cellIndex = 0; cellIndex != cellCount; ++cellIndex) {
+				const auto &preparedCell = prepared.tableRows[rowIndex].cells[cellIndex];
+				auto &cell = block.tableRows[rowIndex].cells[cellIndex];
+				const auto &textStyle = preparedCell.header
+					? st.table.headerStyle
+					: st.table.bodyStyle;
+				const auto minResizeWidth = TableCellTextMinResizeWidth(
+					textStyle,
+					st);
+				copyTableCellLeaf(
+					CachedTextLeafSlot::TableCellText,
+					preparedCell,
+					rowIndex,
+					cellIndex,
+					MarkedTextLeafSourceSignature(
+						preparedCell.text,
+						textStyle,
+						minResizeWidth),
+					&cell.leaf);
+				copyTableCellLeaf(
+					CachedTextLeafSlot::TableCellPlaceholder,
+					preparedCell,
+					rowIndex,
+					cellIndex,
+					PlainTextLeafSourceSignature(
+						preparedCell.editPlaceholderText,
+						textStyle,
+						minResizeWidth),
+					&cell.placeholderLeaf);
+			}
+		}
+	} break;
+	case PreparedBlockKind::Details:
+		copyBlockLeaf(
+			CachedTextLeafSlot::Leaf,
+			MarkedTextLeafSourceSignature(
+				prepared.text,
+				st.details.summaryStyle,
+				FlowTextMinResizeWidth(st.details.summaryStyle)),
+			&block.leaf);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.details.summaryStyle,
+				PlainTextMinResizeWidth(st.details.summaryStyle)),
+			&block.placeholderLeaf);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Action,
+			PlainTextLeafSourceSignature(
+				DetailsStateText(prepared.detailsOpen),
+				st.details.summaryStyle,
+				PlainTextMinResizeWidth(st.details.summaryStyle)),
+			&block.actionLeaf);
+		break;
+	case PreparedBlockKind::Placeholder:
+		copyBlockLeaf(
+			CachedTextLeafSlot::Label,
+			PlainTextLeafSourceSignature(
+				prepared.placeholder.label,
+				st.placeholder.labelStyle,
+				PlainTextMinResizeWidth(st.placeholder.labelStyle)),
+			&block.labelLeaf);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Leaf,
+			MarkedTextLeafSourceSignature(
+				prepared.text,
+				st.body,
+				FlowTextMinResizeWidth(st.body)),
+			&block.leaf);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.body,
+				PlainTextMinResizeWidth(st.body)),
+			&block.placeholderLeaf);
+		break;
+	case PreparedBlockKind::RelatedArticle:
+		copyBlockLeaf(
+			CachedTextLeafSlot::Label,
+			PlainTextLeafSourceSignature(
+				prepared.relatedArticle.title,
+				st.relatedArticle.titleStyle,
+				PlainTextMinResizeWidth(st.relatedArticle.titleStyle)),
+				&block.labelLeaf);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Subtitle,
+			PlainTextLeafSourceSignature(
+				prepared.relatedArticle.description,
+				st.relatedArticle.subtitleStyle,
+				PlainTextMinResizeWidth(st.relatedArticle.subtitleStyle)),
+				&block.subtitleLeaf);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Action,
+			PlainTextLeafSourceSignature(
+				prepared.relatedArticle.footer,
+				st.relatedArticle.footerStyle,
+				PlainTextMinResizeWidth(st.relatedArticle.footerStyle)),
+			&block.actionLeaf);
+		break;
+	case PreparedBlockKind::EmbedPost:
+		copyBlockLeaf(
+			CachedTextLeafSlot::Label,
+			PlainTextLeafSourceSignature(
+				prepared.embedPost.author,
+				st.embedPost.authorStyle,
+				PlainTextMinResizeWidth(st.embedPost.authorStyle)),
+			&block.labelLeaf);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Subtitle,
+			PlainTextLeafSourceSignature(
+				prepared.embedPost.dateText,
+				st.embedPost.dateStyle,
+				PlainTextMinResizeWidth(st.embedPost.dateStyle)),
+			&block.subtitleLeaf);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Leaf,
+			MarkedTextLeafSourceSignature(
+				prepared.text,
+				st.body,
+				FlowTextMinResizeWidth(st.body)),
+			&block.leaf);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.body,
+				PlainTextMinResizeWidth(st.body)),
+			&block.placeholderLeaf);
+		break;
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+		copyBlockLeaf(
+			CachedTextLeafSlot::Leaf,
+			MarkedTextLeafSourceSignature(
+				prepared.text,
+				st.body,
+				FlowTextMinResizeWidth(st.body)),
+			&block.leaf);
+		copyBlockLeaf(
+			CachedTextLeafSlot::Placeholder,
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.body,
+				PlainTextMinResizeWidth(st.body)),
+			&block.placeholderLeaf);
+		break;
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::Quote:
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+		break;
+	}
+}
+
+void CopyBlockCachedTextLeafs(
+		const std::vector<PreparedBlock> &preparedBlocks,
+		std::vector<LaidOutBlock> *blocks,
+		const style::Markdown &st,
+		CachedTextLeafPool *pool,
+		std::vector<int> *preparedPath) {
+	if (!pool || !blocks || !preparedPath) {
+		return;
+	}
+	const auto count = std::min(int(preparedBlocks.size()), int(blocks->size()));
+	for (auto i = 0; i != count; ++i) {
+		preparedPath->push_back(i);
+		CopyBlockCachedTextLeafs(
+			preparedBlocks[i],
+			(*blocks)[i],
+			st,
+			pool,
+			*preparedPath);
+		preparedPath->pop_back();
+	}
+}
+
+} // namespace
+
+void BuildOrReuseMarkedTextLeaf(
+		Ui::Text::String *leaf,
+		CachedTextLeafSlot slot,
+		const PreparedBlock &prepared,
+		const style::TextStyle &textStyle,
+		const style::Markdown &st,
+		const TextWithEntities &text,
+		const std::vector<PreparedLink> &links,
+		const std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		int minResizeWidth,
+		LayoutContext context) {
+	BuildOrReuseCachedTextLeaf(
+		leaf,
+		nullptr,
+		context,
+		BlockCachedTextLeafKey(slot, prepared, context.preparedPath),
+		MarkedTextLeafSourceSignature(text, textStyle, minResizeWidth),
+		[&](Ui::Text::String *leaf,
+				Spellchecker::HighlightProcessId*) {
+			SetTextLeaf(
+				leaf,
+				textStyle,
+				st,
+				text,
+				formulas,
+				inlineFormulaObjects,
+				mediaRuntime,
+				minResizeWidth,
+				context.repaint,
+				context.repaintRect);
+			BindLinks(leaf, links);
+		});
+	BindLinks(leaf, links);
+}
+
+void BuildOrReusePlainTextLeaf(
+		Ui::Text::String *leaf,
+		CachedTextLeafSlot slot,
+		const PreparedBlock &prepared,
+		const style::TextStyle &textStyle,
+		const QString &text,
+		int minResizeWidth,
+		LayoutContext context) {
+	BuildOrReuseCachedTextLeaf(
+		leaf,
+		nullptr,
+		context,
+		BlockCachedTextLeafKey(slot, prepared, context.preparedPath),
+		PlainTextLeafSourceSignature(text, textStyle, minResizeWidth),
+		[&](Ui::Text::String *leaf,
+				Spellchecker::HighlightProcessId*) {
+			SetPlainTextLeaf(leaf, textStyle, text, minResizeWidth);
+		});
+}
+
+void BuildOrReuseEditPlaceholderLeaf(
+		QString *placeholderText,
+		Ui::Text::String *placeholderLeaf,
+		const PreparedBlock &prepared,
+		const QString &text,
+		const style::TextStyle &textStyle,
+		int minResizeWidth,
+		LayoutContext context) {
+	if (text.isEmpty()) {
+		return;
+	}
+	*placeholderText = text;
+	BuildOrReusePlainTextLeaf(
+		placeholderLeaf,
+		CachedTextLeafSlot::Placeholder,
+		prepared,
+		textStyle,
+		*placeholderText,
+		minResizeWidth,
+		context);
+}
+
+void CopyCachedTextLeafs(
+		const std::vector<PreparedBlock> &preparedBlocks,
+		std::vector<LaidOutBlock> *blocks,
+		const style::Markdown &st,
+		CachedTextLeafPool *pool) {
+	if (!pool) {
+		return;
+	}
+	pool->entries.clear();
+	auto preparedPath = std::vector<int>();
+	CopyBlockCachedTextLeafs(
+		preparedBlocks,
+		blocks,
+		st,
+		pool,
+		&preparedPath);
+}
+
+size_t CachedTextLeafKeyHasher::operator()(
+		const CachedTextLeafKey &value) const noexcept {
+	auto result = CombineHash(0, size_t(value.slot));
+	result = CombineHash(result, size_t(value.identityKind));
+	switch (value.identityKind) {
+	case CachedTextLeafIdentityKind::PreparedPath:
+		result = CombineHash(result, size_t(value.preparedPath.size() + 1));
+		for (const auto step : value.preparedPath) {
+			result = CombineHash(result, size_t(step + 1));
+		}
+		result = CombineHash(result, size_t(value.tableRowIndex + 1));
+		return CombineHash(result, size_t(value.tableCellIndex + 1));
+	case CachedTextLeafIdentityKind::EditBlock:
+		return CombineHash(result, HashPreparedEditBlockSource(value.editBlock));
+	case CachedTextLeafIdentityKind::EditListItem:
+		return CombineHash(
+			result,
+			HashPreparedEditListItemSource(value.editListItem));
+	case CachedTextLeafIdentityKind::EditTableCell:
+		return CombineHash(
+			result,
+			HashPreparedEditTableCellSource(value.editTableCell));
+	case CachedTextLeafIdentityKind::EditLeaf:
+		return CombineHash(result, HashPreparedEditLeafSource(value.editLeaf));
+	}
+	return result;
+}
+
+LayoutContextScope::LayoutContextScope(const LayoutContext &context)
+: _previous(CurrentLayoutContext) {
+	CurrentLayoutContext = &context;
+}
+
+LayoutContextScope::~LayoutContextScope() {
+	CurrentLayoutContext = _previous;
+}
+
+void FillMediaCaptionContent(
+		LaidOutBlock *block,
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		LayoutContext context) {
+	FillMediaCaption(
+		block,
+		prepared,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		st,
+		context);
+}
+
+void LayoutMediaCaption(
+		LaidOutBlock *block,
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int skip,
+		int *bottom,
+		LayoutContext context) {
+	FillMediaCaption(
+		block,
+		prepared,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		st,
+		context);
+	const auto counted = LayoutMediaCaptionGeometry(
+		block,
+		prepared,
+		st,
+		left,
+		top,
+		width,
+		skip,
+		bottom,
+		context);
+	Expects(counted);
+}
+
+bool LayoutMediaCaptionGeometry(
+		LaidOutBlock *block,
+		const PreparedBlock &prepared,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int skip,
+		int *bottom,
+		LayoutContext context) {
+	if (!block || !bottom) {
+		return false;
+	}
+	if (prepared.text.text.isEmpty() && !prepared.forceTextSegment) {
+		return true;
+	}
+	if (MissingRetainedLeaf(prepared.text.text, block->leaf)) {
+		return false;
+	}
+	block->supplementary = prepared.supplementary;
+	const auto textBand = ArticleTextBand(left, width, st, context);
+	block->textWidth = std::max(textBand.width(), 1);
+	block->textRect = QRect(
+		textBand.x(),
+		top + skip,
+		block->textWidth,
+		ResolveEditableHeight(
+			std::max(
+				block->leaf.countHeight(block->textWidth, true),
+				TextLineHeight(st.body)),
+			context));
+	*bottom = block->textRect.y() + block->textRect.height();
+	return true;
+}
+
+[[nodiscard]] int SingleDigitOrderedMarkerWidth(
+		const style::Markdown &st) {
+	return std::max(
+		st.body.font->width(u"8."_q),
+		st.body.font->width(u"8)"_q));
+}
+
+QString CodeBlockDisplayText(const QString &text) {
+	auto result = QString();
+	result.reserve(text.size());
+
+	auto column = 0;
+	for (const auto ch : text) {
+		if (ch == QChar::Tabulation) {
+			const auto count = kCodeTabColumns - (column % kCodeTabColumns);
+			for (auto i = 0; i != count; ++i) {
+				result.append(QChar::Space);
+			}
+			column += count;
+			continue;
+		}
+		result.append(ch);
+		if (Ui::Text::IsNewline(ch)) {
+			column = 0;
+		} else {
+			++column;
+		}
+	}
+	if (result.isEmpty() || Ui::Text::IsTrimmed(result.back())) {
+		result.append(QChar(kCodeTrailingGuard));
+	}
+	return result;
+}
+
+TextWithEntities CodeBlockDisplayText(TextWithEntities text) {
+	auto result = TextWithEntities();
+	const auto sourceLength = int(text.text.size());
+	result.text.reserve(sourceLength);
+	result.entities.reserve(text.entities.size());
+
+	auto offsets = std::vector<int>();
+	offsets.reserve(sourceLength + 1);
+	auto column = 0;
+	for (auto i = 0; i != sourceLength; ++i) {
+		offsets.push_back(result.text.size());
+		const auto ch = text.text[i];
+		if (ch == QChar::Tabulation) {
+			const auto count = kCodeTabColumns - (column % kCodeTabColumns);
+			for (auto j = 0; j != count; ++j) {
+				result.text.append(QChar::Space);
+			}
+			column += count;
+			continue;
+		}
+		result.text.append(ch);
+		if (Ui::Text::IsNewline(ch)) {
+			column = 0;
+		} else {
+			++column;
+		}
+	}
+	offsets.push_back(result.text.size());
+
+	for (const auto &entity : text.entities) {
+		const auto from = entity.offset();
+		const auto length = entity.length();
+		if (entity.type() == EntityType::Pre
+			|| from < 0
+			|| from >= sourceLength
+			|| length <= 0) {
+			continue;
+		}
+		const auto till = from + std::min(length, sourceLength - from);
+		if (till <= from) {
+			continue;
+		}
+		const auto displayFrom = offsets[from];
+		const auto displayTill = offsets[till];
+		if (displayTill <= displayFrom) {
+			continue;
+		}
+		result.entities.push_back(EntityInText(
+			entity.type(),
+			displayFrom,
+			displayTill - displayFrom,
+			entity.data()));
+	}
+	if (result.text.isEmpty() || Ui::Text::IsTrimmed(result.text.back())) {
+		result.text.append(QChar(kCodeTrailingGuard));
+	}
+	return result;
+}
+
+bool IsFlowKind(PreparedBlockKind kind) {
+	return (kind == PreparedBlockKind::Paragraph)
+		|| (kind == PreparedBlockKind::Thinking)
+		|| (kind == PreparedBlockKind::Heading);
+}
+
+bool IsAnchorOnlyBlock(const PreparedBlock &block) {
+	return (block.kind == PreparedBlockKind::Paragraph)
+		&& !block.anchorId.isEmpty()
+		&& !TextNeedsRetainedLeaf(block.text.text)
+		&& block.text.entities.empty()
+		&& block.links.empty()
+		&& block.children.empty();
+}
+
+QString ListMarkerText(const PreparedBlock &block) {
+	if (block.listKind == ListKind::Ordered) {
+		const auto delimiter = (block.listDelimiter == ListDelimiter::Parenthesis)
+			? u")"_q
+			: u"."_q;
+		return QString::number(block.orderedNumber) + delimiter;
+	}
+	return QString();
+}
+
+int TextLineHeight(const style::TextStyle &style) {
+	return std::max(style.lineHeight, style.font->height);
+}
+
+int TextLineAscent(const style::TextStyle &style) {
+	if (style.qtextEditLineMetrics) {
+		const auto lineHeight = QFixed(TextLineHeight(style));
+		const auto leading = std::max(style.font->fleading, QFixed());
+		return std::clamp(
+			(lineHeight * 4 / 5) - leading,
+			QFixed(),
+			lineHeight).toInt();
+	}
+	const auto lineHeight = TextLineHeight(style);
+	const auto textTop = std::max(lineHeight - style.font->height, 0) / 2;
+	return textTop + style.font->ascent;
+}
+
+int TextLineBaseline(
+		const style::TextStyle &style,
+		int top) {
+	return top + TextLineAscent(style);
+}
+
+int ResolveEditableHeight(
+		int naturalHeight,
+		LayoutContext context) {
+	const auto state = context.editableHeightOverride;
+	if (!state) {
+		return naturalHeight;
+	}
+	const auto index = state->nextEditableIndex++;
+	return (index == state->editableIndex)
+		? std::max(state->height, 1)
+		: naturalHeight;
+}
+
+[[nodiscard]] int LeafFirstLineBaseline(
+		const Ui::Text::String &leaf,
+		const QRect &textRect,
+		const style::TextStyle &style,
+		bool breakEverywhere = true) {
+	const auto lines = leaf.countLinesGeometry(textRect.width(), breakEverywhere);
+	return textRect.y() + (lines.empty()
+		? TextLineBaseline(style)
+		: lines.front().baseline);
+}
+
+QPoint BulletMarkerCenter(
+		int left,
+		int baseline,
+		const style::Markdown &st) {
+	const auto &list = st.list;
+	const auto lineHeight = TextLineHeight(st.body);
+	const auto markerWidth = SingleDigitOrderedMarkerWidth(st);
+	const auto nominalBaseline = TextLineBaseline(st.body);
+	return QPoint(
+		left + list.markerWidth - list.bulletLeftShift - ((markerWidth + 1) / 2),
+		baseline + (lineHeight / 2) - nominalBaseline);
+}
+
+QMargins BlockquotePadding(const style::QuoteStyle &style) {
+	return style.padding
+		+ QMargins(0, style.header + style.verticalSkip, 0, style.verticalSkip);
+}
+
+int HorizontalMarginsWidth(QMargins margins) {
+	return std::max(margins.left(), 0) + std::max(margins.right(), 0);
+}
+
+Ui::Text::GeometryDescriptor TextGeometry(int width) {
+	auto result = Ui::Text::SimpleGeometry(std::max(width, 1), 0, 0, false);
+	result.breakEverywhere = true;
+	return result;
+}
+
+int TextMinResizeWidth(int width) {
+	return std::max(width, 1);
+}
+
+int ReadableTextMinWidth(const style::TextStyle &style) {
+	return std::max({
+		style.font->spacew * kReadableTextColumns,
+		TextLineHeight(style) * kReadableTextLineHeights,
+		1,
+	});
+}
+
+int FlowTextMinResizeWidth(const style::TextStyle &style) {
+	return ReadableTextMinWidth(style);
+}
+
+int LeafMinimumWidth(const Ui::Text::String &leaf) {
+	return leaf.isEmpty()
+		? 0
+		: std::min(leaf.minResizeWidth(), leaf.maxWidth());
+}
+
+int FlowBlockMinimumWidth(
+		const PreparedBlock &prepared,
+		const style::Markdown &st) {
+	if (IsAnchorOnlyBlock(prepared)
+		|| (prepared.text.text.isEmpty() && !prepared.forceTextSegment)) {
+		return 1;
+	}
+	return ReadableTextMinWidth(TextStyleFor(prepared, st));
+}
+
+int FlowBlockPreferredWidth(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		LayoutContext context) {
+	if (IsAnchorOnlyBlock(prepared)) {
+		return 1;
+	}
+	const auto &textStyle = TextStyleFor(prepared, st);
+	const auto minResizeWidth = FlowBlockMinimumWidth(prepared, st);
+	const auto usePlaceholder = prepared.text.text.isEmpty()
+		&& !prepared.editPlaceholderText.isEmpty();
+	if (!usePlaceholder) {
+		return WithCachedTextLeaf(
+			context,
+			BlockCachedTextLeafKey(
+				CachedTextLeafSlot::Leaf,
+				prepared,
+				context.preparedPath),
+			MarkedTextLeafSourceSignature(
+				prepared.text,
+				textStyle,
+				minResizeWidth),
+			[&](Ui::Text::String *leaf,
+					Spellchecker::HighlightProcessId*) {
+				SetTextLeaf(
+					leaf,
+					textStyle,
+					st,
+					prepared.text,
+					&formulas,
+					inlineFormulaObjects,
+					mediaRuntime,
+					minResizeWidth,
+					context.repaint,
+					context.repaintRect);
+				BindLinks(leaf, prepared.links);
+			},
+			[](const Ui::Text::String &leaf,
+					Spellchecker::HighlightProcessId) {
+				return leaf.maxWidth();
+			});
+	}
+	return WithCachedTextLeaf(
+		context,
+		BlockCachedTextLeafKey(
+			CachedTextLeafSlot::Placeholder,
+			prepared,
+			context.preparedPath),
+		PlainTextLeafSourceSignature(
+			prepared.editPlaceholderText,
+			textStyle,
+			PlainTextMinResizeWidth(textStyle)),
+		[&](Ui::Text::String *leaf,
+				Spellchecker::HighlightProcessId*) {
+			SetPlainTextLeaf(
+				leaf,
+				textStyle,
+				prepared.editPlaceholderText,
+				PlainTextMinResizeWidth(textStyle));
+		},
+		[](const Ui::Text::String &leaf,
+				Spellchecker::HighlightProcessId) {
+			return leaf.maxWidth();
+		});
+}
+
+int FlowBlockContentMinimumWidth(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		LayoutContext context) {
+	const auto base = FlowBlockMinimumWidth(prepared, st);
+	if (IsAnchorOnlyBlock(prepared) || prepared.text.text.isEmpty()) {
+		return base;
+	}
+	const auto &textStyle = TextStyleFor(prepared, st);
+	const auto minResizeWidth = FlowBlockMinimumWidth(prepared, st);
+	return WithCachedTextLeaf(
+		context,
+		BlockCachedTextLeafKey(
+			CachedTextLeafSlot::Leaf,
+			prepared,
+			context.preparedPath),
+		MarkedTextLeafSourceSignature(
+			prepared.text,
+			textStyle,
+			minResizeWidth),
+		[&](Ui::Text::String *leaf,
+				Spellchecker::HighlightProcessId*) {
+			SetTextLeaf(
+				leaf,
+				textStyle,
+				st,
+				prepared.text,
+				&formulas,
+				inlineFormulaObjects,
+				mediaRuntime,
+				minResizeWidth,
+				context.repaint,
+				context.repaintRect);
+			BindLinks(leaf, prepared.links);
+		},
+		[&](const Ui::Text::String &leaf,
+				Spellchecker::HighlightProcessId) {
+			return std::max(base, LeafMinimumWidth(leaf));
+		});
+}
+
+int DetailsSummaryContentMinimumWidth(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		LayoutContext context) {
+	const auto base = ReadableTextMinWidth(st.details.summaryStyle);
+	if (prepared.text.text.isEmpty()) {
+		return base;
+	}
+	const auto minResizeWidth = FlowTextMinResizeWidth(
+		st.details.summaryStyle);
+	return WithCachedTextLeaf(
+		context,
+		BlockCachedTextLeafKey(
+			CachedTextLeafSlot::Leaf,
+			prepared,
+			context.preparedPath),
+		MarkedTextLeafSourceSignature(
+			prepared.text,
+			st.details.summaryStyle,
+			minResizeWidth),
+		[&](Ui::Text::String *leaf,
+				Spellchecker::HighlightProcessId*) {
+			SetTextLeaf(
+				leaf,
+				st.details.summaryStyle,
+				st,
+				prepared.text,
+				&formulas,
+				inlineFormulaObjects,
+				mediaRuntime,
+				minResizeWidth,
+				context.repaint,
+				context.repaintRect);
+			BindLinks(leaf, prepared.links);
+		},
+		[&](const Ui::Text::String &leaf,
+				Spellchecker::HighlightProcessId) {
+			return std::max(base, LeafMinimumWidth(leaf));
+		});
+}
+
+int CodeBlockMinimumWidth(const style::Markdown &st) {
+	const auto padding = BlockquotePadding(st.code.pre);
+	const auto content = std::max({
+		st.code.font->spacew * kReadableCodeColumns,
+		ReadableTextMinWidth(st.code),
+		1,
+	});
+	return HorizontalMarginsWidth(padding) + content;
+}
+
+int CodeTextMinResizeWidth(const style::Markdown &st) {
+	return std::max(
+		CodeBlockMinimumWidth(st)
+			- HorizontalMarginsWidth(BlockquotePadding(st.code.pre)),
+		1);
+}
+
+int CodeBlockPreferredWidth(
+		const PreparedBlock &prepared,
+		const style::Markdown &st,
+		LayoutContext context) {
+	const auto padding = BlockquotePadding(st.code.pre);
+	const auto usePlaceholder = prepared.text.text.isEmpty()
+		&& !prepared.editPlaceholderText.isEmpty();
+	if (usePlaceholder) {
+		return HorizontalMarginsWidth(padding) + WithCachedTextLeaf(
+			context,
+			BlockCachedTextLeafKey(
+				CachedTextLeafSlot::Placeholder,
+				prepared,
+				context.preparedPath),
+			PlainTextLeafSourceSignature(
+				prepared.editPlaceholderText,
+				st.code,
+				PlainTextMinResizeWidth(st.code)),
+			[&](Ui::Text::String *leaf,
+					Spellchecker::HighlightProcessId*) {
+				SetPlainTextLeaf(
+					leaf,
+					st.code,
+					prepared.editPlaceholderText,
+					PlainTextMinResizeWidth(st.code));
+			},
+			[](const Ui::Text::String &leaf,
+					Spellchecker::HighlightProcessId) {
+				return leaf.maxWidth();
+			});
+	}
+	return HorizontalMarginsWidth(padding) + WithCachedTextLeaf(
+		context,
+		BlockCachedTextLeafKey(
+			CachedTextLeafSlot::Leaf,
+			prepared,
+			context.preparedPath),
+		CodeTextLeafSourceSignature(prepared, st),
+		[&](Ui::Text::String *leaf,
+				Spellchecker::HighlightProcessId *syntaxHighlightProcessId) {
+			PopulateCodeBlockLeaf(
+				leaf,
+				syntaxHighlightProcessId,
+				prepared.text,
+				prepared.links,
+				prepared.codeLanguage,
+				nullptr,
+				nullptr,
+				nullptr,
+				st,
+				context.allowAsyncSyntaxHighlighting,
+				context.syntaxHighlightTracker,
+				context.repaint,
+				context.repaintRect,
+				context.spoilerLinkFilter);
+		},
+		[](const Ui::Text::String &leaf,
+				Spellchecker::HighlightProcessId) {
+			return leaf.maxWidth();
+		});
+}
+
+int DisplayMathMinimumWidth(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		const style::Markdown &st) {
+	const auto &padding = st.displayMath.padding;
+	if (const auto formula = PreparedFormulaFor(formulas, prepared.formulaIndex);
+		formula && formula->measured.success) {
+		return HorizontalMarginsWidth(padding)
+			+ std::max(formula->measured.logicalSize.width(), 1);
+	}
+	const auto &fallbackPadding = st.displayMath.fallbackPadding;
+	auto fallbackText = DisplayMathFallbackText();
+	auto leaf = Ui::Text::String(ReadableTextMinWidth(st.displayMath.fallbackStyle));
+	leaf.setMarkedText(
+		st.displayMath.fallbackStyle,
+		std::move(fallbackText),
+		kIvMarkedTextOptions);
+	return HorizontalMarginsWidth(padding)
+		+ HorizontalMarginsWidth(fallbackPadding)
+		+ std::max({
+			leaf.maxWidth(),
+			ReadableTextMinWidth(st.displayMath.fallbackStyle),
+			1,
+		});
+}
+
+int DisplayMathPreferredWidth(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		const style::Markdown &st,
+		LayoutContext context) {
+	const auto &padding = st.displayMath.padding;
+	if (const auto formula = PreparedFormulaFor(formulas, prepared.formulaIndex);
+		formula && formula->measured.success) {
+		return HorizontalMarginsWidth(padding)
+			+ std::max(formula->measured.logicalSize.width(), 1);
+	}
+	const auto &fallbackPadding = st.displayMath.fallbackPadding;
+	const auto usePlaceholder = prepared.formulaTex.trimmed().isEmpty()
+		&& !prepared.editPlaceholderText.isEmpty();
+	if (usePlaceholder) {
+		return HorizontalMarginsWidth(padding)
+			+ HorizontalMarginsWidth(fallbackPadding)
+			+ WithCachedTextLeaf(
+				context,
+				BlockCachedTextLeafKey(
+					CachedTextLeafSlot::Placeholder,
+					prepared,
+					context.preparedPath),
+				PlainTextLeafSourceSignature(
+					prepared.editPlaceholderText,
+					st.displayMath.fallbackStyle,
+					DisplayMathFallbackTextMinResizeWidth(st)),
+				[&](Ui::Text::String *leaf,
+						Spellchecker::HighlightProcessId*) {
+					SetPlainTextLeaf(
+						leaf,
+						st.displayMath.fallbackStyle,
+						prepared.editPlaceholderText,
+						DisplayMathFallbackTextMinResizeWidth(st));
+				},
+				[](const Ui::Text::String &leaf,
+						Spellchecker::HighlightProcessId) {
+					return leaf.maxWidth();
+				});
+	}
+	return HorizontalMarginsWidth(padding)
+		+ HorizontalMarginsWidth(fallbackPadding)
+		+ WithCachedTextLeaf(
+			context,
+			BlockCachedTextLeafKey(
+				CachedTextLeafSlot::Fallback,
+				prepared,
+				context.preparedPath),
+			MarkedTextLeafSourceSignature(
+				DisplayMathFallbackText(),
+				st.displayMath.fallbackStyle,
+				DisplayMathFallbackTextMinResizeWidth(st)),
+			[&](Ui::Text::String *leaf,
+					Spellchecker::HighlightProcessId*) {
+				*leaf = Ui::Text::String(
+					TextMinResizeWidth(
+						DisplayMathFallbackTextMinResizeWidth(st)));
+				leaf->setMarkedText(
+					st.displayMath.fallbackStyle,
+					DisplayMathFallbackText(),
+					kIvMarkedTextOptions);
+			},
+			[](const Ui::Text::String &leaf,
+					Spellchecker::HighlightProcessId) {
+				return leaf.maxWidth();
+			});
+}
+
+int PlainTextMinResizeWidth(const style::TextStyle &style) {
+	return std::max(style.font->spacew, 1);
+}
+
+int DisplayMathFallbackTextMinResizeWidth(const style::Markdown &st) {
+	return PlainTextMinResizeWidth(st.displayMath.fallbackStyle);
+}
+
+int ContainerMinimumWidth(
+		int contentMinimumWidth,
+		QMargins padding) {
+	return std::max(contentMinimumWidth, 1) + HorizontalMarginsWidth(padding);
+}
+
+int TableMinimumGridWidth(
+		int columnCount,
+		const style::Markdown &st,
+		bool bordered) {
+	if (columnCount <= 0) {
+		return 0;
+	}
+	const auto border = TableBorder(bordered, st);
+	const auto minimum = st.table.minColumnWidth;
+	return border + columnCount * (minimum + border);
+}
+
+int TableCellTextMinResizeWidth(
+		const style::TextStyle &textStyle,
+		const style::Markdown &st) {
+	const auto &padding = st.table.cellPadding;
+	return std::max({
+		st.table.minColumnWidth - padding.left() - padding.right(),
+		textStyle.font->spacew,
+		1,
+	});
+}
+
+std::vector<int> ComputeTableColumnMinimumWidths(
+		std::vector<TableCellMinimumWidthConstraint> constraints,
+		int columnCount,
+		const style::Markdown &st,
+		bool bordered) {
+	// Fully empty columns may shrink below st.table.minColumnWidth,
+	// to the cell padding and some non-zero content width.
+	const auto &padding = st.table.cellPadding;
+	const auto emptyMinimum = padding.left()
+		+ padding.right()
+		+ std::max(st.table.bodyStyle.font->spacew, 1);
+	auto result = std::vector<int>(std::max(columnCount, 0), emptyMinimum);
+	if (result.empty()) {
+		return result;
+	}
+	const auto border = TableBorder(bordered, st);
+	auto spanned = std::vector<TableCellMinimumWidthConstraint>();
+	for (const auto &constraint : constraints) {
+		const auto from = std::clamp(constraint.column, 0, columnCount);
+		const auto to = std::clamp(
+			constraint.column + constraint.colspan,
+			0,
+			columnCount);
+		if (from >= to) {
+			continue;
+		} else if ((to - from) == 1) {
+			result[from] = std::max(result[from], constraint.minimumWidth);
+		} else {
+			spanned.push_back(constraint);
+		}
+	}
+	std::sort(
+		spanned.begin(),
+		spanned.end(),
+		[](const TableCellMinimumWidthConstraint &a,
+				const TableCellMinimumWidthConstraint &b) {
+			return (a.colspan < b.colspan)
+				|| ((a.colspan == b.colspan) && (a.column < b.column));
+		});
+	for (const auto &constraint : spanned) {
+		const auto from = std::clamp(constraint.column, 0, columnCount);
+		const auto to = std::clamp(
+			constraint.column + constraint.colspan,
+			0,
+			columnCount);
+		const auto current = TableSpanWidth(
+			result,
+			from,
+			to - from,
+			border);
+		const auto deficit = constraint.minimumWidth - current;
+		if (deficit > 0) {
+			DistributeSpanDelta(&result, from, to, deficit);
+		}
+	}
+	return result;
+}
+
+int TableGridWidth(
+		const std::vector<int> &columnWidths,
+		const style::Markdown &st,
+		bool bordered) {
+	if (columnWidths.empty()) {
+		return 0;
+	}
+	const auto border = TableBorder(bordered, st);
+	auto result = border;
+	for (const auto columnWidth : columnWidths) {
+		result += columnWidth + border;
+	}
+	return result;
+}
+
+int TableBlockContentMinimumWidth(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		LayoutContext context) {
+	const auto captionMinimum = prepared.text.text.isEmpty()
+		? 1
+		: [&] {
+			const auto base = FlowBlockMinimumWidth(prepared, st);
+			const auto minResizeWidth = FlowTextMinResizeWidth(st.body);
+			return WithCachedTextLeaf(
+				context,
+				BlockCachedTextLeafKey(
+					CachedTextLeafSlot::Leaf,
+					prepared,
+					context.preparedPath),
+				MarkedTextLeafSourceSignature(
+					prepared.text,
+					st.body,
+					minResizeWidth),
+				[&](Ui::Text::String *leaf,
+						Spellchecker::HighlightProcessId*) {
+					SetTextLeaf(
+						leaf,
+						st.body,
+						st,
+						prepared.text,
+						&formulas,
+						inlineFormulaObjects,
+						mediaRuntime,
+						minResizeWidth,
+						context.repaint,
+						context.repaintRect);
+					BindLinks(leaf, prepared.links);
+				},
+				[&](const Ui::Text::String &leaf,
+						Spellchecker::HighlightProcessId) {
+					return std::max(base, LeafMinimumWidth(leaf));
+				});
+		}();
+	const auto columnCount = prepared.tableColumnCount;
+	if (columnCount <= 0 || prepared.tableRows.empty()) {
+		return std::max(
+			captionMinimum,
+			TableMinimumGridWidth(columnCount, st, prepared.tableBordered));
+	}
+	const auto &padding = st.table.cellPadding;
+	const auto paddingWidth = padding.left() + padding.right();
+	auto constraints = std::vector<TableCellMinimumWidthConstraint>();
+	for (auto rowIndex = 0, rowCount = int(prepared.tableRows.size());
+			rowIndex != rowCount;
+			++rowIndex) {
+		const auto &row = prepared.tableRows[rowIndex];
+		for (auto cellIndex = 0, cellCount = int(row.cells.size());
+				cellIndex != cellCount;
+				++cellIndex) {
+			const auto &cell = row.cells[cellIndex];
+			if (cell.text.text.isEmpty()) {
+				continue;
+			}
+			const auto &textStyle = TableCellTextStyle(cell, st);
+			const auto minResizeWidth = TableCellTextMinResizeWidth(
+				textStyle,
+				st);
+			const auto leafMinimum = WithCachedTextLeaf(
+				context,
+				TableCellCachedTextLeafKey(
+					CachedTextLeafSlot::TableCellText,
+					cell,
+					context.preparedPath,
+					rowIndex,
+					cellIndex),
+				MarkedTextLeafSourceSignature(
+					cell.text,
+					textStyle,
+					minResizeWidth),
+				[&](Ui::Text::String *leaf,
+						Spellchecker::HighlightProcessId*) {
+					SetTextLeaf(
+						leaf,
+						textStyle,
+						st,
+						cell.text,
+						&formulas,
+						inlineFormulaObjects,
+						mediaRuntime,
+						minResizeWidth,
+						context.repaint,
+						context.repaintRect);
+					BindLinks(leaf, cell.links);
+				},
+				[](const Ui::Text::String &leaf,
+						Spellchecker::HighlightProcessId) {
+					return LeafMinimumWidth(leaf);
+				});
+			if (leafMinimum > 0) {
+				constraints.push_back({
+					.column = std::max(cell.column, 0),
+					.colspan = std::max(cell.colspan, 1),
+					.minimumWidth = std::max(
+						leafMinimum + paddingWidth,
+						st.table.minColumnWidth),
+				});
+			}
+		}
+	}
+	const auto columns = ComputeTableColumnMinimumWidths(
+		std::move(constraints),
+		columnCount,
+		st,
+		prepared.tableBordered);
+	return std::max(
+		captionMinimum,
+		TableGridWidth(columns, st, prepared.tableBordered));
+}
+
+int RetainedTableBlockMinimumWidth(
+		const PreparedBlock &prepared,
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	const auto &captionLeaf = block.placeholderLeaf.isEmpty()
+		? block.leaf
+		: block.placeholderLeaf;
+	const auto captionMinimum = prepared.text.text.isEmpty()
+		? 1
+		: std::max(
+			FlowBlockMinimumWidth(prepared, st),
+			LeafMinimumWidth(captionLeaf));
+	const auto columnCount = prepared.tableColumnCount;
+	if (columnCount <= 0 || block.tableRows.empty()) {
+		return std::max(
+			captionMinimum,
+			TableMinimumGridWidth(columnCount, st, prepared.tableBordered));
+	}
+	const auto &padding = st.table.cellPadding;
+	const auto paddingWidth = padding.left() + padding.right();
+	auto constraints = std::vector<TableCellMinimumWidthConstraint>();
+	const auto rowCount = int(std::min(
+		prepared.tableRows.size(),
+		block.tableRows.size()));
+	for (auto rowIndex = 0; rowIndex != rowCount; ++rowIndex) {
+		const auto &preparedCells = prepared.tableRows[rowIndex].cells;
+		const auto &cells = block.tableRows[rowIndex].cells;
+		const auto cellCount = int(std::min(
+			preparedCells.size(),
+			cells.size()));
+		for (auto cellIndex = 0; cellIndex != cellCount; ++cellIndex) {
+			const auto &preparedCell = preparedCells[cellIndex];
+			const auto &cell = cells[cellIndex];
+			const auto usePlaceholder = preparedCell.text.text.isEmpty()
+				&& !preparedCell.editPlaceholderText.isEmpty();
+			const auto &displayLeaf = usePlaceholder
+				? cell.placeholderLeaf
+				: cell.leaf;
+			const auto leafMinimum = LeafMinimumWidth(displayLeaf);
+			if (leafMinimum > 0) {
+				constraints.push_back({
+					.column = cell.column,
+					.colspan = cell.colspan,
+					.minimumWidth = std::max(
+						leafMinimum + paddingWidth,
+						st.table.minColumnWidth),
+				});
+			}
+		}
+	}
+	const auto columns = ComputeTableColumnMinimumWidths(
+		std::move(constraints),
+		columnCount,
+		st,
+		prepared.tableBordered);
+	return std::max(
+		captionMinimum,
+		TableGridWidth(columns, st, prepared.tableBordered));
+}
+
+int BlockSkip(
+		const PreparedBlock &block,
+		const style::Markdown &st) {
+	if (IsAnchorOnlyBlock(block)) {
+		return 0;
+	}
+	const auto &skips = st.blockSkips;
+	switch (block.kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+		return skips.paragraph;
+	case PreparedBlockKind::Heading:
+		return skips.heading;
+	case PreparedBlockKind::CodeBlock:
+		return skips.code;
+	case PreparedBlockKind::Rule:
+		return skips.rule;
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+		return skips.paragraph;
+	case PreparedBlockKind::Quote:
+		return skips.quote;
+	case PreparedBlockKind::DisplayMath:
+		return skips.displayMath;
+	case PreparedBlockKind::Table:
+		return skips.table;
+	case PreparedBlockKind::Photo:
+		return skips.photo;
+	case PreparedBlockKind::Video:
+		return skips.video;
+	case PreparedBlockKind::Audio:
+		return skips.audio;
+	case PreparedBlockKind::Map:
+		return skips.map;
+	case PreparedBlockKind::Channel:
+		return skips.channel;
+	case PreparedBlockKind::RelatedArticle:
+		return skips.relatedArticle;
+	case PreparedBlockKind::EmbedPost:
+		return skips.embedPost;
+	case PreparedBlockKind::Placeholder:
+		return skips.placeholder;
+	case PreparedBlockKind::Details:
+		return skips.paragraph;
+	case PreparedBlockKind::GroupedMedia:
+		return skips.groupedMedia;
+	}
+	return 0;
+}
+
+int BlockSkip(
+		const PreparedBlock &previous,
+		const PreparedBlock &block,
+		LayoutContext context,
+		const style::Markdown &st) {
+	if (previous.kind == PreparedBlockKind::Details
+		&& block.kind == PreparedBlockKind::Details) {
+		return 0;
+	}
+	if (context.tightList
+		&& IsFlowKind(previous.kind)
+		&& IsFlowKind(block.kind)) {
+		return 0;
+	}
+	return BlockSkip(block, st);
+}
+
+const style::TextStyle &TextStyleFor(
+		const PreparedBlock &block,
+		const style::Markdown &st) {
+	if (block.kind == PreparedBlockKind::CodeBlock) {
+		return st.code;
+	} else if (block.kind != PreparedBlockKind::Heading) {
+		return st.body;
+	}
+	switch (std::clamp(block.headingLevel, 1, 6)) {
+	case 1: return st.heading1;
+	case 2: return st.heading2;
+	case 3: return st.heading3;
+	case 4: return st.heading4;
+	case 5: return st.heading5;
+	case 6: return st.heading6;
+	}
+	return st.heading6;
+}
+
+void ApplyPreparedEditSources(
+		LaidOutBlock *block,
+		const PreparedBlock &prepared) {
+	block->editBlock = prepared.editBlock;
+	block->editListItem = prepared.editListItem;
+	block->editLeaf = prepared.editLeaf;
+}
+
+void RepopulateCodeBlockLeaf(
+		LaidOutBlock &block,
+		const std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		bool allowAsyncSyntaxHighlighting,
+		CodeBlockSyntaxHighlightTracker *syntaxHighlightTracker,
+		Fn<void()> repaint,
+		Fn<void(QRect)> repaintRect,
+		Fn<bool(const ClickContext&)> spoilerLinkFilter) {
+	PopulateCodeBlockLeaf(
+		&block.leaf,
+		&block.syntaxHighlightProcessId,
+		block.codeText,
+		block.codeLinks,
+		block.codeLanguage,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		st,
+		allowAsyncSyntaxHighlighting,
+		syntaxHighlightTracker,
+		std::move(repaint),
+		std::move(repaintRect),
+		std::move(spoilerLinkFilter));
+}
+
+void UpdateLaidOutLeafContent(
+		LaidOutBlock *block,
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		LayoutContext context) {
+	if (!block) {
+		return;
+	}
+	block->placeholderText = QString();
+	block->placeholderLeaf = Ui::Text::String();
+	block->fallbackLeaf = Ui::Text::String();
+	switch (prepared.kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading: {
+		const auto &textStyle = TextStyleFor(prepared, st);
+		BuildOrReuseMarkedTextLeaf(
+			&block->leaf,
+			CachedTextLeafSlot::Leaf,
+			prepared,
+			textStyle,
+			st,
+			prepared.text,
+			prepared.links,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			FlowBlockMinimumWidth(prepared, st),
+			context);
+		if (prepared.text.text.isEmpty()
+			&& !prepared.editPlaceholderText.isEmpty()) {
+			BuildOrReuseEditPlaceholderLeaf(
+				&block->placeholderText,
+				&block->placeholderLeaf,
+				prepared,
+				prepared.editPlaceholderText,
+				textStyle,
+				PlainTextMinResizeWidth(textStyle),
+				context);
+		}
+	} break;
+	case PreparedBlockKind::CodeBlock:
+		block->codeText = prepared.text;
+		block->codeLinks = prepared.links;
+		block->copyText = prepared.text.text;
+		block->codeLanguage = prepared.codeLanguage;
+		RepopulateCodeBlockLeaf(
+			*block,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			context.allowAsyncSyntaxHighlighting,
+			context.syntaxHighlightTracker,
+			context.repaint,
+			context.repaintRect,
+			context.spoilerLinkFilter);
+		if (prepared.text.text.isEmpty()
+			&& !prepared.editPlaceholderText.isEmpty()) {
+			BuildOrReuseEditPlaceholderLeaf(
+				&block->placeholderText,
+				&block->placeholderLeaf,
+				prepared,
+				prepared.editPlaceholderText,
+				st.code,
+				PlainTextMinResizeWidth(st.code),
+				context);
+		}
+		break;
+	case PreparedBlockKind::DisplayMath:
+		block->copyText = prepared.formulaTex;
+		block->formulaIndex = prepared.formulaIndex;
+		if (const auto formula = formulas
+				? PreparedFormulaFor(*formulas, prepared.formulaIndex)
+				: nullptr;
+			!formula || !formula->measured.success) {
+			if (prepared.formulaTex.trimmed().isEmpty()
+				&& !prepared.editPlaceholderText.isEmpty()) {
+				BuildOrReuseEditPlaceholderLeaf(
+					&block->placeholderText,
+					&block->placeholderLeaf,
+					prepared,
+					prepared.editPlaceholderText,
+					st.displayMath.fallbackStyle,
+					DisplayMathFallbackTextMinResizeWidth(st),
+					context);
+			} else {
+				BuildOrReuseMarkedTextLeaf(
+					&block->fallbackLeaf,
+					CachedTextLeafSlot::Fallback,
+					prepared,
+					st.displayMath.fallbackStyle,
+					st,
+					DisplayMathFallbackText(),
+					{},
+					nullptr,
+					nullptr,
+					nullptr,
+					DisplayMathFallbackTextMinResizeWidth(st),
+					context);
+			}
+		}
+		break;
+	case PreparedBlockKind::Table:
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::EmbedPost:
+		BuildOrReuseMarkedTextLeaf(
+			&block->leaf,
+			CachedTextLeafSlot::Leaf,
+			prepared,
+			st.body,
+			st,
+			prepared.text,
+			prepared.links,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			FlowTextMinResizeWidth(st.body),
+			context);
+		if (prepared.text.text.isEmpty()
+			&& !prepared.editPlaceholderText.isEmpty()) {
+			BuildOrReuseEditPlaceholderLeaf(
+				&block->placeholderText,
+				&block->placeholderLeaf,
+				prepared,
+				prepared.editPlaceholderText,
+				st.body,
+				PlainTextMinResizeWidth(st.body),
+				context);
+		}
+		break;
+	case PreparedBlockKind::Details:
+		BuildOrReuseMarkedTextLeaf(
+			&block->leaf,
+			CachedTextLeafSlot::Leaf,
+			prepared,
+			st.details.summaryStyle,
+			st,
+			prepared.text,
+			prepared.links,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			FlowTextMinResizeWidth(st.details.summaryStyle),
+			context);
+		if (prepared.text.text.isEmpty()
+			&& !prepared.editPlaceholderText.isEmpty()) {
+			BuildOrReuseEditPlaceholderLeaf(
+				&block->placeholderText,
+				&block->placeholderLeaf,
+				prepared,
+				prepared.editPlaceholderText,
+				st.details.summaryStyle,
+				PlainTextMinResizeWidth(st.details.summaryStyle),
+				context);
+		}
+		break;
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+	case PreparedBlockKind::Quote:
+	case PreparedBlockKind::Placeholder:
+	case PreparedBlockKind::RelatedArticle:
+		break;
+	}
+}
+
+void UpdateLaidOutLeafContent(
+		LaidOutTableCell *cell,
+		const PreparedTableCell &prepared,
+		const std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int tableRowIndex,
+		int tableCellIndex,
+		LayoutContext context) {
+	if (!cell) {
+		return;
+	}
+	const auto &textStyle = TableCellTextStyle(prepared, st);
+	const auto minResizeWidth = TableCellTextMinResizeWidth(textStyle, st);
+	cell->header = prepared.header;
+	cell->verticalAlignment = prepared.verticalAlignment;
+	cell->align = CellAlign(prepared.alignment);
+	cell->column = std::max(prepared.column, 0);
+	cell->colspan = std::max(prepared.colspan, 1);
+	cell->rowspan = std::max(prepared.rowspan, 1);
+	cell->placeholderText = QString();
+	cell->placeholderLeaf = Ui::Text::String();
+	cell->cachedPreferredWidth = -1;
+	cell->cachedPreferredHeight = 0;
+	BuildOrReuseCachedTextLeaf(
+		&cell->leaf,
+		nullptr,
+		context,
+		TableCellCachedTextLeafKey(
+			CachedTextLeafSlot::TableCellText,
+			prepared,
+			context.preparedPath,
+			tableRowIndex,
+			tableCellIndex),
+		MarkedTextLeafSourceSignature(prepared.text, textStyle, minResizeWidth),
+		[&](Ui::Text::String *leaf,
+				Spellchecker::HighlightProcessId*) {
+			SetTextLeaf(
+				leaf,
+				textStyle,
+				st,
+				prepared.text,
+				formulas,
+				inlineFormulaObjects,
+				mediaRuntime,
+				minResizeWidth,
+				context.repaint,
+				context.repaintRect);
+			BindLinks(leaf, prepared.links);
+		});
+	BindLinks(&cell->leaf, prepared.links);
+	if (prepared.text.text.isEmpty()
+		&& !prepared.editPlaceholderText.isEmpty()) {
+		cell->placeholderText = prepared.editPlaceholderText;
+		BuildOrReuseCachedTextLeaf(
+			&cell->placeholderLeaf,
+			nullptr,
+			context,
+			TableCellCachedTextLeafKey(
+				CachedTextLeafSlot::TableCellPlaceholder,
+				prepared,
+				context.preparedPath,
+				tableRowIndex,
+				tableCellIndex),
+			PlainTextLeafSourceSignature(
+				cell->placeholderText,
+				textStyle,
+				minResizeWidth),
+			[&](Ui::Text::String *leaf,
+					Spellchecker::HighlightProcessId*) {
+			SetPlainTextLeaf(
+				leaf,
+				textStyle,
+				cell->placeholderText,
+				minResizeWidth);
+			});
+	}
+}
+
+[[nodiscard]] std::optional<int> LayoutFlowBlockGeometry(
+	const PreparedBlock &prepared,
+	LaidOutBlock *block,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	bool scrollOwner,
+	LayoutContext context);
+[[nodiscard]] std::optional<int> LayoutCodeBlockGeometry(
+	const PreparedBlock &prepared,
+	LaidOutBlock *block,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	bool scrollOwner,
+	LayoutContext context);
+[[nodiscard]] std::optional<int> LayoutRuleBlockGeometry(
+	LaidOutBlock *block,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width);
+[[nodiscard]] std::optional<int> LayoutDisplayMathBlockGeometry(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> &formulas,
+	LaidOutBlock *block,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	bool scrollOwner,
+	LayoutContext context);
+[[nodiscard]] std::optional<int> LayoutTableBlockGeometry(
+	const PreparedBlock &prepared,
+	LaidOutBlock *block,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	bool scrollOwner,
+	LayoutContext context);
+[[nodiscard]] std::optional<int> LayoutPlaceholderBlockGeometry(
+	const PreparedBlock &prepared,
+	LaidOutBlock *block,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	LayoutContext context);
+[[nodiscard]] std::optional<int> LayoutRelatedArticleBlockGeometry(
+	const PreparedBlock &prepared,
+	LaidOutBlock *block,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	LayoutContext context);
+[[nodiscard]] std::optional<int> LayoutFramedMediaBlockGeometry(
+	LaidOutBlock *block,
+	const PreparedBlock &prepared,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	QMargins padding,
+	int captionSkip,
+	bool limitWidth,
+	bool centerMedia,
+	int intrinsicWidth,
+	LayoutContext context);
+[[nodiscard]] std::optional<int> LayoutCardMediaBlockGeometry(
+	LaidOutBlock *block,
+	const PreparedBlock &prepared,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	QMargins padding,
+	int captionSkip,
+	LayoutContext context);
+
+LaidOutBlock LayoutFlowBlock(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		bool scrollOwner,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = prepared.kind;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.headingLevel = prepared.headingLevel;
+	block.supplementary = prepared.supplementary;
+	block.pullquote = prepared.pullquote;
+	block.flowTextAlign = CellAlign(prepared.flowAlignment);
+	const auto &textStyle = TextStyleFor(prepared, st);
+	if (!IsAnchorOnlyBlock(prepared)) {
+		BuildOrReuseMarkedTextLeaf(
+			&block.leaf,
+			CachedTextLeafSlot::Leaf,
+			prepared,
+			textStyle,
+			st,
+			prepared.text,
+			prepared.links,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			FlowBlockMinimumWidth(prepared, st),
+			context);
+		const auto usePlaceholder = prepared.text.text.isEmpty()
+			&& !prepared.editPlaceholderText.isEmpty();
+		if (usePlaceholder) {
+			BuildOrReuseEditPlaceholderLeaf(
+				&block.placeholderText,
+				&block.placeholderLeaf,
+				prepared,
+				prepared.editPlaceholderText,
+				textStyle,
+				PlainTextMinResizeWidth(textStyle),
+				context);
+		}
+	}
+	const auto bottom = LayoutFlowBlockGeometry(
+		prepared,
+		&block,
+		st,
+		left,
+		top,
+		width,
+		logicalWidth,
+		scrollOwner,
+		context);
+	Expects(bottom.has_value());
+	return FinalizeLaidOutBlock(std::move(block));
+}
+
+LaidOutBlock LayoutCodeBlock(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		bool scrollOwner,
+		bool allowAsyncSyntaxHighlighting,
+		CodeBlockSyntaxHighlightTracker *syntaxHighlightTracker,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::CodeBlock;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.codeText = prepared.text;
+	block.codeLinks = prepared.links;
+	block.copyText = block.codeText.text;
+	block.codeLanguage = prepared.codeLanguage;
+	BuildOrReuseCachedTextLeaf(
+		&block.leaf,
+		&block.syntaxHighlightProcessId,
+		context,
+		BlockCachedTextLeafKey(
+			CachedTextLeafSlot::Leaf,
+			prepared,
+			context.preparedPath),
+		CodeTextLeafSourceSignature(prepared, st),
+		[&](Ui::Text::String *leaf,
+				Spellchecker::HighlightProcessId *syntaxHighlightProcessId) {
+			PopulateCodeBlockLeaf(
+				leaf,
+				syntaxHighlightProcessId,
+				block.codeText,
+				block.codeLinks,
+				block.codeLanguage,
+				formulas,
+				inlineFormulaObjects,
+				mediaRuntime,
+				st,
+				allowAsyncSyntaxHighlighting,
+				syntaxHighlightTracker,
+				context.repaint,
+				context.repaintRect,
+				context.spoilerLinkFilter);
+		});
+	BindLinks(&block.leaf, block.codeLinks);
+	if (!block.syntaxHighlightProcessId
+		&& allowAsyncSyntaxHighlighting
+		&& syntaxHighlightTracker) {
+		auto highlightRequest = TextWithEntities();
+		highlightRequest.text = CodeBlockDisplayText(block.codeText).text;
+		if (!highlightRequest.text.isEmpty()) {
+			highlightRequest.entities.push_back(EntityInText(
+				EntityType::Pre,
+				0,
+				highlightRequest.text.size(),
+				block.codeLanguage));
+		}
+		block.syntaxHighlightProcessId = syntaxHighlightTracker->tryHighlightSyntax(
+			highlightRequest.text,
+			block.codeLanguage,
+			highlightRequest);
+	}
+	const auto usePlaceholder = prepared.text.text.isEmpty()
+		&& !prepared.editPlaceholderText.isEmpty();
+	if (usePlaceholder) {
+		BuildOrReuseEditPlaceholderLeaf(
+			&block.placeholderText,
+			&block.placeholderLeaf,
+			prepared,
+			prepared.editPlaceholderText,
+			st.code,
+			PlainTextMinResizeWidth(st.code),
+			context);
+	}
+	const auto bottom = LayoutCodeBlockGeometry(
+		prepared,
+		&block,
+		st,
+		left,
+		top,
+		width,
+		logicalWidth,
+		scrollOwner,
+		context);
+	Expects(bottom.has_value());
+	return FinalizeLaidOutBlock(std::move(block));
+}
+
+LaidOutBlock LayoutRuleBlock(
+		const PreparedBlock &prepared,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::Rule;
+	const auto bottom = LayoutRuleBlockGeometry(
+		&block,
+		st,
+		left,
+		top,
+		width);
+	Expects(bottom.has_value());
+	return FinalizeLaidOutBlock(std::move(block));
+}
+
+LaidOutBlock LayoutDisplayMathBlock(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		bool scrollOwner,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::DisplayMath;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.formulaIndex = prepared.formulaIndex;
+	block.copyText = prepared.formulaTex;
+
+	const auto formula = PreparedFormulaFor(formulas, prepared.formulaIndex);
+	const auto usePlaceholder = prepared.formulaTex.trimmed().isEmpty()
+		&& !prepared.editPlaceholderText.isEmpty();
+	if (!(formula && formula->measured.success)) {
+		if (usePlaceholder) {
+			BuildOrReuseEditPlaceholderLeaf(
+				&block.placeholderText,
+				&block.placeholderLeaf,
+				prepared,
+				prepared.editPlaceholderText,
+				st.displayMath.fallbackStyle,
+				DisplayMathFallbackTextMinResizeWidth(st),
+				context);
+		} else {
+			BuildOrReuseMarkedTextLeaf(
+				&block.fallbackLeaf,
+				CachedTextLeafSlot::Fallback,
+				prepared,
+				st.displayMath.fallbackStyle,
+				st,
+				DisplayMathFallbackText(),
+				{},
+				nullptr,
+				nullptr,
+				nullptr,
+				DisplayMathFallbackTextMinResizeWidth(st),
+				context);
+		}
+	}
+	const auto bottom = LayoutDisplayMathBlockGeometry(
+		prepared,
+		formulas,
+		&block,
+		st,
+		left,
+		top,
+		width,
+		logicalWidth,
+		scrollOwner,
+		context);
+	Expects(bottom.has_value());
+	return FinalizeLaidOutBlock(std::move(block));
+}
+
+LaidOutBlock LayoutTableBlock(
+		const PreparedBlock &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		bool scrollOwner,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::Table;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.tableBordered = prepared.tableBordered;
+	block.tableStriped = prepared.tableStriped;
+	block.supplementary = prepared.supplementary;
+	block.flowTextAlign = style::al_center;
+
+	FillMediaCaption(
+		&block,
+		prepared,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		st,
+		context);
+
+	block.tableRows.reserve(prepared.tableRows.size());
+	for (auto rowIndex = 0, rowCount = int(prepared.tableRows.size());
+			rowIndex != rowCount;
+			++rowIndex) {
+		const auto &preparedRow = prepared.tableRows[rowIndex];
+		auto row = LaidOutTableRow();
+		row.header = preparedRow.header;
+		row.editRow = preparedRow.editRow;
+		row.cells.reserve(preparedRow.cells.size());
+		for (auto cellIndex = 0, cellCount = int(preparedRow.cells.size());
+				cellIndex != cellCount;
+				++cellIndex) {
+			auto cell = InitializeTableCellLayout(
+				preparedRow.cells[cellIndex],
+				formulas,
+				inlineFormulaObjects,
+				mediaRuntime,
+				st,
+				rowIndex,
+				cellIndex,
+				context);
+			row.cells.push_back(std::move(cell));
+		}
+		block.tableRows.push_back(std::move(row));
+	}
+
+	const auto bottom = LayoutTableBlockGeometry(
+		prepared,
+		&block,
+		st,
+		left,
+		top,
+		width,
+		logicalWidth,
+		scrollOwner,
+		context);
+	Expects(bottom.has_value());
+	return FinalizeLaidOutBlock(std::move(block));
+}
+
+LaidOutBlock LayoutPlaceholderBlock(
+		const PreparedBlock &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::Placeholder;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.copyText = prepared.placeholder.copyText;
+	block.labelText = prepared.placeholder.label;
+	block.placeholderId = prepared.placeholder.id;
+	if (block.placeholderId && context.placeholderRuntimeFactory) {
+		block.placeholderRuntime = context.placeholderRuntimeFactory(
+			block.placeholderId);
+	}
+	block.supplementary = prepared.supplementary;
+
+	const auto &style = st.placeholder;
+	BuildOrReusePlainTextLeaf(
+		&block.labelLeaf,
+		CachedTextLeafSlot::Label,
+		prepared,
+		style.labelStyle,
+		block.labelText,
+		PlainTextMinResizeWidth(style.labelStyle),
+		context);
+	if (prepared.placeholder.embed) {
+		block.activation.kind = MediaActivationKind::Embed;
+		block.activation.embed = *prepared.placeholder.embed;
+		block.activation.placeholderId = block.placeholderId;
+	}
+	FillMediaCaption(
+		&block,
+		prepared,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		st,
+		context);
+	const auto bottom = LayoutPlaceholderBlockGeometry(
+		prepared,
+		&block,
+		st,
+		left,
+		top,
+		width,
+		context);
+	Expects(bottom.has_value());
+	return FinalizeLaidOutBlock(std::move(block));
+}
+
+LaidOutBlock LayoutRelatedArticleBlock(
+		const PreparedBlock &prepared,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::RelatedArticle;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.copyText = prepared.relatedArticle.copyText;
+	block.labelText = prepared.relatedArticle.title;
+	block.preparedLink = prepared.relatedArticle.link;
+	block.preparedLinkHandler = CreatePreparedLinkHandler(
+		prepared.relatedArticle.link);
+	if (prepared.relatedArticle.photoId && mediaRuntime) {
+		block.photoRuntime = mediaRuntime->resolvePhoto(
+			prepared.relatedArticle.photoId);
+	}
+
+	const auto &card = st.relatedArticle;
+	block.thumbnailPhotoId = prepared.relatedArticle.photoId;
+	if (!prepared.relatedArticle.title.isEmpty()) {
+		BuildOrReusePlainTextLeaf(
+			&block.labelLeaf,
+			CachedTextLeafSlot::Label,
+			prepared,
+			card.titleStyle,
+			prepared.relatedArticle.title,
+			PlainTextMinResizeWidth(card.titleStyle),
+			context);
+	}
+	if (!prepared.relatedArticle.description.isEmpty()) {
+		BuildOrReusePlainTextLeaf(
+			&block.subtitleLeaf,
+			CachedTextLeafSlot::Subtitle,
+			prepared,
+			card.subtitleStyle,
+			prepared.relatedArticle.description,
+			PlainTextMinResizeWidth(card.subtitleStyle),
+			context);
+	}
+	if (!prepared.relatedArticle.footer.isEmpty()) {
+		BuildOrReusePlainTextLeaf(
+			&block.actionLeaf,
+			CachedTextLeafSlot::Action,
+			prepared,
+			card.footerStyle,
+			prepared.relatedArticle.footer,
+			PlainTextMinResizeWidth(card.footerStyle),
+			context);
+	}
+
+	const auto bottom = LayoutRelatedArticleBlockGeometry(
+		prepared,
+		&block,
+		st,
+		left,
+		top,
+		width,
+		context);
+	Expects(bottom.has_value());
+	return FinalizeLaidOutBlock(std::move(block));
+}
+
+LaidOutBlock LayoutPhotoBlock(
+		const PreparedBlock &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::Photo;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.supplementary = prepared.supplementary;
+	if (context.mediaBlockFactory) {
+		block.mediaBlock = context.mediaBlockFactory(prepared);
+	}
+	if (block.mediaBlock) {
+		block.copyText = block.mediaBlock->selectionData().copyText;
+	}
+	FillMediaCaption(
+		&block,
+		prepared,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		st,
+		context);
+	const auto bottom = LayoutFramedMediaBlockGeometry(
+		&block,
+		prepared,
+		st,
+		left,
+		top,
+		width,
+		st.photo.padding,
+		st.photo.captionSkip,
+		true,
+		true,
+		prepared.photo.width,
+		context);
+	Expects(bottom.has_value());
+	return FinalizeLaidOutBlock(std::move(block));
+}
+
+LaidOutBlock LayoutVideoBlock(
+		const PreparedBlock &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::Video;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.supplementary = prepared.supplementary;
+	if (context.mediaBlockFactory) {
+		block.mediaBlock = context.mediaBlockFactory(prepared);
+	}
+	if (block.mediaBlock) {
+		block.copyText = block.mediaBlock->selectionData().copyText;
+	}
+	FillMediaCaption(
+		&block,
+		prepared,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		st,
+		context);
+	const auto bottom = LayoutFramedMediaBlockGeometry(
+		&block,
+		prepared,
+		st,
+		left,
+		top,
+		width,
+		st.photo.padding,
+		st.photo.captionSkip,
+		true,
+		true,
+		prepared.video.media.width,
+		context);
+	Expects(bottom.has_value());
+	return FinalizeLaidOutBlock(std::move(block));
+}
+
+LaidOutBlock LayoutAudioBlock(
+		const PreparedBlock &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::Audio;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.supplementary = prepared.supplementary;
+	if (context.mediaBlockFactory) {
+		block.mediaBlock = context.mediaBlockFactory(prepared);
+	}
+	if (block.mediaBlock) {
+		block.copyText = block.mediaBlock->selectionData().copyText;
+	}
+	FillMediaCaption(
+		&block,
+		prepared,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		st,
+		context);
+	const auto bottom = LayoutCardMediaBlockGeometry(
+		&block,
+		prepared,
+		st,
+		left,
+		top,
+		width,
+		st.audio.padding,
+		st.audio.captionSkip,
+		context);
+	Expects(bottom.has_value());
+	return FinalizeLaidOutBlock(std::move(block));
+}
+
+LaidOutBlock LayoutMapBlock(
+		const PreparedBlock &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::Map;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.supplementary = prepared.supplementary;
+	if (context.mediaBlockFactory) {
+		block.mediaBlock = context.mediaBlockFactory(prepared);
+	}
+	if (block.mediaBlock) {
+		block.copyText = block.mediaBlock->selectionData().copyText;
+	}
+	FillMediaCaption(
+		&block,
+		prepared,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		st,
+		context);
+	const auto bottom = LayoutFramedMediaBlockGeometry(
+		&block,
+		prepared,
+		st,
+		left,
+		top,
+		width,
+		st.photo.padding,
+		st.photo.captionSkip,
+		false,
+		false,
+		0,
+		context);
+	Expects(bottom.has_value());
+	return FinalizeLaidOutBlock(std::move(block));
+}
+
+LaidOutBlock LayoutChannelBlock(
+		const PreparedBlock &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::Channel;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.supplementary = prepared.supplementary;
+	if (context.mediaBlockFactory) {
+		block.mediaBlock = context.mediaBlockFactory(prepared);
+	}
+	if (block.mediaBlock) {
+		block.copyText = block.mediaBlock->selectionData().copyText;
+	}
+	FillMediaCaption(
+		&block,
+		prepared,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		st,
+		context);
+	const auto bottom = LayoutCardMediaBlockGeometry(
+		&block,
+		prepared,
+		st,
+		left,
+		top,
+		width,
+		st.channel.padding,
+		st.audio.captionSkip,
+		context);
+	Expects(bottom.has_value());
+	return FinalizeLaidOutBlock(std::move(block));
+}
+
+LaidOutBlock LayoutGroupedMediaBlock(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::GroupedMedia;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.supplementary = prepared.supplementary;
+	if (context.mediaBlockFactory) {
+		block.mediaBlock = context.mediaBlockFactory(prepared);
+	}
+	if (block.mediaBlock) {
+		block.copyText = block.mediaBlock->selectionData().copyText;
+	}
+	FillMediaCaption(
+		&block,
+		prepared,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		st,
+		context);
+	const auto bottom = LayoutFramedMediaBlockGeometry(
+		&block,
+		prepared,
+		st,
+		left,
+		top,
+		width,
+		st.groupedMedia.padding,
+		st.groupedMedia.captionSkip,
+		false,
+		false,
+		0,
+		context);
+	Expects(bottom.has_value());
+	return FinalizeLaidOutBlock(std::move(block));
+}
+
+[[nodiscard]] std::optional<int> LayoutFlowBlockGeometry(
+		const PreparedBlock &prepared,
+		LaidOutBlock *block,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		bool scrollOwner,
+		LayoutContext context) {
+	if (!block) {
+		return std::nullopt;
+	}
+	const auto usePlaceholder = prepared.text.text.isEmpty()
+		&& !prepared.editPlaceholderText.isEmpty();
+	if (MissingRetainedLeaf(prepared.text.text, block->leaf)
+		|| MissingRetainedPlaceholderLeaf(usePlaceholder, block->placeholderLeaf)) {
+		return std::nullopt;
+	}
+	ClearBlockGeometry(block);
+	const auto visibleWidth = std::max(width, 1);
+	block->textWidth = std::max(
+		(logicalWidth > 0) ? logicalWidth : visibleWidth,
+		1);
+	if (IsAnchorOnlyBlock(prepared)) {
+		block->textRect = QRect(left, top, block->textWidth, 0);
+		block->contentRect = QRect(left, top, visibleWidth, 0);
+		block->outer = block->contentRect;
+		FinishBlockGeometry(block);
+		return block->outer.y() + block->outer.height();
+	}
+	const auto &textStyle = TextStyleFor(prepared, st);
+	const auto &displayLeaf = usePlaceholder
+		? block->placeholderLeaf
+		: block->leaf;
+	const auto height = ResolveEditableHeight(
+		LeafHeight(displayLeaf, textStyle, block->textWidth),
+		context);
+	block->textRect = QRect(left, top, block->textWidth, height);
+	block->contentRect = QRect(left, top, visibleWidth, height);
+	block->overflowed = (block->textWidth > visibleWidth);
+	block->horizontalScrollMax = scrollOwner
+		? std::max(block->textWidth - visibleWidth, 0)
+		: 0;
+	if (scrollOwner) {
+		block->scrollViewportRect = block->contentRect;
+		block->scrollLogicalContentRect = block->textRect;
+		if (block->horizontalScrollMax > 0) {
+			block->scrollScrollbarTrackRect = QRect(
+				left,
+				top + height + st.table.scrollbarSkip,
+				visibleWidth,
+				st.table.scrollbarHeight);
+		}
+	}
+	block->outer = QRect(
+		left,
+		top,
+		visibleWidth,
+		height + ScrollbarReserveHeight(
+			scrollOwner,
+			block->horizontalScrollMax,
+			st));
+	block->firstLineBaseline = LeafFirstLineBaseline(
+		displayLeaf,
+		block->textRect,
+		textStyle);
+	FinishBlockGeometry(block);
+	return block->outer.y() + block->outer.height();
+}
+
+[[nodiscard]] std::optional<int> LayoutCodeBlockGeometry(
+		const PreparedBlock &prepared,
+		LaidOutBlock *block,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		bool scrollOwner,
+		LayoutContext context) {
+	if (!block) {
+		return std::nullopt;
+	}
+	const auto usePlaceholder = prepared.text.text.isEmpty()
+		&& !prepared.editPlaceholderText.isEmpty();
+	if (MissingRetainedLeaf(prepared.text.text, block->leaf)
+		|| MissingRetainedPlaceholderLeaf(usePlaceholder, block->placeholderLeaf)) {
+		return std::nullopt;
+	}
+	ClearBlockGeometry(block);
+	const auto &pre = st.code.pre;
+	const auto padding = BlockquotePadding(pre);
+	const auto outerWidth = std::max(
+		width,
+		padding.left() + padding.right() + 1);
+	const auto logicalOuterWidth = std::max(
+		(logicalWidth > 0) ? logicalWidth : outerWidth,
+		padding.left() + padding.right() + 1);
+	const auto viewportWidth = std::max(
+		outerWidth - padding.left() - padding.right(),
+		1);
+	block->textWidth = std::max(
+		logicalOuterWidth - padding.left() - padding.right(),
+		1);
+	const auto &displayLeaf = usePlaceholder
+		? block->placeholderLeaf
+		: block->leaf;
+	const auto height = ResolveEditableHeight(
+		LeafHeight(displayLeaf, st.code, block->textWidth),
+		context);
+	block->overflowed = (block->textWidth > viewportWidth);
+	block->horizontalScrollMax = scrollOwner
+		? std::max(block->textWidth - viewportWidth, 0)
+		: 0;
+	const auto outerHeight = padding.top()
+		+ height
+		+ padding.bottom()
+		+ ScrollbarReserveHeight(
+			scrollOwner,
+			block->horizontalScrollMax,
+			st);
+	block->outer = QRect(left, top, outerWidth, outerHeight);
+	block->headerRect = QRect(left, top, outerWidth, pre.header);
+	block->bodyRect = QRect(
+		left,
+		top + pre.header,
+		outerWidth,
+		std::max(outerHeight - pre.header, 0));
+	block->contentRect = QRect(
+		left + padding.left(),
+		top + padding.top(),
+		viewportWidth,
+		height);
+	block->textRect = QRect(
+		left + padding.left(),
+		top + padding.top(),
+		block->textWidth,
+		height);
+	if (scrollOwner) {
+		block->scrollViewportRect = block->contentRect;
+		block->scrollLogicalContentRect = block->textRect;
+		if (block->horizontalScrollMax > 0) {
+			block->scrollScrollbarTrackRect = QRect(
+				block->contentRect.x(),
+				block->contentRect.y()
+					+ block->contentRect.height()
+					+ st.table.scrollbarSkip,
+				block->contentRect.width(),
+				st.table.scrollbarHeight);
+		}
+	}
+	block->firstLineBaseline = LeafFirstLineBaseline(
+		displayLeaf,
+		block->textRect,
+		st.code);
+	FinishBlockGeometry(block);
+	return block->outer.y() + block->outer.height();
+}
+
+[[nodiscard]] std::optional<int> LayoutRuleBlockGeometry(
+		LaidOutBlock *block,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width) {
+	if (!block) {
+		return std::nullopt;
+	}
+	ClearBlockGeometry(block);
+	block->outer = QRect(left, top, std::max(width, 1), st.rule.height);
+	block->textRect = block->outer;
+	FinishBlockGeometry(block);
+	return block->outer.y() + block->outer.height();
+}
+
+[[nodiscard]] std::optional<int> LayoutDisplayMathBlockGeometry(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		LaidOutBlock *block,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		bool scrollOwner,
+		LayoutContext context) {
+	if (!block) {
+		return std::nullopt;
+	}
+	const auto formula = PreparedFormulaFor(formulas, prepared.formulaIndex);
+	const auto usePlaceholder = prepared.formulaTex.trimmed().isEmpty()
+		&& !prepared.editPlaceholderText.isEmpty();
+	if (!formula || !formula->measured.success) {
+		if (usePlaceholder) {
+			if (block->placeholderLeaf.isEmpty()) {
+				return std::nullopt;
+			}
+		} else if (block->fallbackLeaf.isEmpty()) {
+			return std::nullopt;
+		}
+	}
+	ClearBlockGeometry(block);
+	const auto &padding = st.displayMath.padding;
+	const auto contentLeft = left + padding.left();
+	const auto contentTop = top + padding.top();
+	const auto contentWidth = std::max(
+		width - padding.left() - padding.right(),
+		1);
+	const auto contentLogicalWidth = std::max(
+		((logicalWidth > 0) ? logicalWidth : std::max(width, 1))
+			- padding.left()
+			- padding.right(),
+		1);
+	auto formulaWidth = 0;
+	auto formulaHeight = 0;
+	if (formula && formula->measured.success) {
+		formulaWidth = std::max(formula->measured.logicalSize.width(), 1);
+		formulaHeight = std::max(formula->measured.logicalSize.height(), 1);
+	} else {
+		const auto &fallbackPadding = st.displayMath.fallbackPadding;
+		const auto fallbackPaddingWidth = fallbackPadding.left()
+			+ fallbackPadding.right();
+		const auto &displayLeaf = usePlaceholder
+			? block->placeholderLeaf
+			: block->fallbackLeaf;
+		block->textWidth = std::max(
+			contentLogicalWidth - fallbackPaddingWidth,
+			1);
+		block->textWidth = std::min(
+			block->textWidth,
+			std::max(displayLeaf.maxWidth(), 1));
+		auto textHeight = LeafHeight(
+			displayLeaf,
+			st.displayMath.fallbackStyle,
+			block->textWidth);
+		formulaWidth = std::min(
+			block->textWidth + fallbackPaddingWidth,
+			contentLogicalWidth);
+		block->textWidth = std::max(formulaWidth - fallbackPaddingWidth, 1);
+		textHeight = LeafHeight(
+			displayLeaf,
+			st.displayMath.fallbackStyle,
+			block->textWidth);
+		formulaHeight = fallbackPadding.top()
+			+ textHeight
+			+ fallbackPadding.bottom();
+		block->textRect.setSize(QSize(block->textWidth, textHeight));
+	}
+	const auto centered = (st.displayMath.align == ::style::al_center)
+		&& (formulaWidth <= contentLogicalWidth);
+	block->formulaAlign = centered ? ::style::al_center : ::style::al_left;
+	block->contentRect = QRect(
+		contentLeft,
+		contentTop,
+		contentWidth,
+		formulaHeight);
+	block->formulaRect = QRect(
+		centered
+			? (contentLeft + ((contentLogicalWidth - formulaWidth) / 2))
+			: contentLeft,
+		contentTop,
+		formulaWidth,
+		formulaHeight);
+	block->visibleFormulaRect = block->formulaRect.intersected(block->contentRect);
+	block->outer = QRect(
+		left,
+		top,
+		std::max(width, 1),
+		padding.top()
+			+ formulaHeight
+			+ padding.bottom());
+	block->overflowed = (block->formulaRect.width()
+		> block->visibleFormulaRect.width());
+	block->horizontalScrollMax = scrollOwner
+		? std::max(block->formulaRect.width() - block->contentRect.width(), 0)
+		: 0;
+	if (scrollOwner) {
+		block->scrollViewportRect = block->contentRect;
+		block->scrollLogicalContentRect = block->formulaRect;
+		if (block->horizontalScrollMax > 0) {
+			block->scrollScrollbarTrackRect = QRect(
+				block->contentRect.x(),
+				block->contentRect.y()
+					+ block->contentRect.height()
+					+ st.table.scrollbarSkip,
+				block->contentRect.width(),
+				st.table.scrollbarHeight);
+			block->outer.setHeight(
+				block->outer.height()
+					+ ScrollbarReserveHeight(
+						scrollOwner,
+						block->horizontalScrollMax,
+						st));
+		}
+	}
+	block->outer.setHeight(ResolveEditableHeight(
+		block->outer.height(),
+		context));
+	if (!(formula && formula->measured.success)) {
+		const auto &fallbackPadding = st.displayMath.fallbackPadding;
+		const auto &displayLeaf = usePlaceholder
+			? block->placeholderLeaf
+			: block->fallbackLeaf;
+		block->textRect.moveTo(
+			block->formulaRect.x() + fallbackPadding.left(),
+			block->formulaRect.y() + fallbackPadding.top());
+		block->firstLineBaseline = LeafFirstLineBaseline(
+			displayLeaf,
+			block->textRect,
+			st.displayMath.fallbackStyle);
+	}
+	FinishBlockGeometry(block);
+	return block->outer.y() + block->outer.height();
+}
+
+[[nodiscard]] std::optional<int> LayoutTableBlockGeometry(
+		const PreparedBlock &prepared,
+		LaidOutBlock *block,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		bool scrollOwner,
+		LayoutContext context) {
+	if (!block || prepared.tableRows.size() != block->tableRows.size()) {
+		return std::nullopt;
+	}
+	const auto columnCount = prepared.tableColumnCount;
+	for (auto rowIndex = 0, rowCount = int(prepared.tableRows.size());
+			rowIndex != rowCount;
+			++rowIndex) {
+		const auto &preparedRow = prepared.tableRows[rowIndex];
+		const auto &row = block->tableRows[rowIndex];
+		if (preparedRow.cells.size() != row.cells.size()) {
+			return std::nullopt;
+		}
+		for (auto cellIndex = 0, cellCount = int(preparedRow.cells.size());
+				cellIndex != cellCount;
+				++cellIndex) {
+			const auto &preparedCell = preparedRow.cells[cellIndex];
+			const auto &cell = row.cells[cellIndex];
+			const auto usePlaceholder = preparedCell.text.text.isEmpty()
+				&& !preparedCell.editPlaceholderText.isEmpty();
+			if (preparedCell.header != cell.header
+				|| std::max(preparedCell.column, 0) != cell.column
+				|| std::max(preparedCell.colspan, 1) != cell.colspan
+				|| std::max(preparedCell.rowspan, 1) != cell.rowspan
+				|| preparedCell.verticalAlignment != cell.verticalAlignment
+				|| MissingRetainedLeaf(preparedCell.text.text, cell.leaf)
+				|| MissingRetainedPlaceholderLeaf(
+					usePlaceholder,
+					cell.placeholderLeaf)) {
+				return std::nullopt;
+			}
+		}
+	}
+	const auto useTitlePlaceholder = prepared.text.text.isEmpty()
+		&& !prepared.editPlaceholderText.isEmpty();
+	const auto hasTitle = !prepared.text.text.isEmpty()
+		|| prepared.forceTextSegment;
+	if ((hasTitle && MissingRetainedLeaf(prepared.text.text, block->leaf))
+		|| MissingRetainedPlaceholderLeaf(
+			useTitlePlaceholder,
+			block->placeholderLeaf)) {
+		return std::nullopt;
+	}
+	ClearBlockGeometry(block);
+	for (auto &row : block->tableRows) {
+		ResetTableRowGeometry(&row);
+	}
+	auto tableTop = top;
+	if (hasTitle) {
+		const auto &displayLeaf = useTitlePlaceholder
+			? block->placeholderLeaf
+			: block->leaf;
+		block->textWidth = std::max(width, 1);
+		block->textRect = QRect(
+			left,
+			top,
+			block->textWidth,
+			ResolveEditableHeight(
+				std::max(
+					displayLeaf.countHeight(block->textWidth, true),
+					TextLineHeight(st.body)),
+				context));
+		block->firstLineBaseline = LeafFirstLineBaseline(
+			displayLeaf,
+			block->textRect,
+			st.body);
+		tableTop = block->textRect.y()
+			+ block->textRect.height()
+			+ st.table.captionSkip;
+	}
+	const auto visibleWidth = std::max(width, 1);
+	const auto layoutWidth = std::max(
+		(logicalWidth > 0) ? logicalWidth : visibleWidth,
+		1);
+	if (!columnCount || prepared.tableRows.empty()) {
+		if (!block->textRect.isEmpty()) {
+			block->contentRect = block->textRect;
+			block->outer = block->textRect;
+		} else {
+			block->outer = QRect(left, top, visibleWidth, 0);
+		}
+		FinishBlockGeometry(block);
+		return block->outer.y() + block->outer.height();
+	}
+	auto rows = std::vector<TableRowGeometryData>();
+	rows.reserve(prepared.tableRows.size());
+	for (auto rowIndex = 0, rowCount = int(prepared.tableRows.size());
+			rowIndex != rowCount;
+			++rowIndex) {
+		const auto &preparedRow = prepared.tableRows[rowIndex];
+		auto row = TableRowGeometryData();
+		row.header = preparedRow.header;
+		row.cells.reserve(preparedRow.cells.size());
+		for (auto cellIndex = 0, cellCount = int(preparedRow.cells.size());
+				cellIndex != cellCount;
+				++cellIndex) {
+			auto &cell = block->tableRows[rowIndex].cells[cellIndex];
+			const auto &preparedCell = preparedRow.cells[cellIndex];
+			const auto usePlaceholder = preparedCell.text.text.isEmpty()
+				&& !preparedCell.editPlaceholderText.isEmpty();
+			const auto &displayLeaf = usePlaceholder
+				? cell.placeholderLeaf
+				: cell.leaf;
+			const auto &textStyle = TableCellTextStyle(cell, st);
+			auto cellData = TableCellGeometryData();
+			cellData.cell = &cell;
+			cellData.usePlaceholder = usePlaceholder;
+			cellData.minimumWidth = LeafMinimumWidth(displayLeaf);
+			cellData.preferredWidth = displayLeaf.maxWidth();
+			if (cell.cachedPreferredWidth != cellData.preferredWidth) {
+				cell.cachedPreferredWidth = cellData.preferredWidth;
+				cell.cachedPreferredHeight = std::max(
+					displayLeaf.countHeight(
+						std::max(cellData.preferredWidth, 1),
+						true),
+					TextLineHeight(textStyle));
+			}
+			cellData.preferredHeight = cell.cachedPreferredHeight;
+			row.cells.push_back(std::move(cellData));
+		}
+		rows.push_back(std::move(row));
+	}
+	block->tableColumnWidths = ComputeTableColumnWidths(
+		rows,
+		columnCount,
+		layoutWidth,
+		st,
+		block->tableBordered,
+		&block->overflowed);
+	const auto &padding = st.table.cellPadding;
+	const auto border = TableBorder(block->tableBordered, st);
+	auto tableWidth = border;
+	for (const auto columnWidth : block->tableColumnWidths) {
+		tableWidth += columnWidth + border;
+	}
+	auto columnLefts = std::vector<int>(columnCount, left + border);
+	auto x = left + border;
+	for (auto column = 0; column != columnCount; ++column) {
+		columnLefts[column] = x;
+		x += block->tableColumnWidths[column] + border;
+	}
+	auto rowHeights = std::vector<int>(rows.size(), 0);
+	auto rowSpans = std::vector<TableSpannedCellGeometryData>();
+	for (auto rowIndex = 0, rowCount = int(rows.size()); rowIndex != rowCount; ++rowIndex) {
+		for (auto &cellData : rows[rowIndex].cells) {
+			if (!cellData.cell) {
+				continue;
+			}
+			const auto spanWidth = TableSpanWidth(
+				block->tableColumnWidths,
+				cellData.cell->column,
+				cellData.cell->colspan,
+				border);
+			cellData.cell->textWidth = std::max(
+				spanWidth - padding.left() - padding.right(),
+				1);
+			const auto &textStyle = TableCellTextStyle(*cellData.cell, st);
+			const auto &displayLeaf = cellData.usePlaceholder
+				? cellData.cell->placeholderLeaf
+				: cellData.cell->leaf;
+			const auto naturalTextHeight = (cellData.cell->textWidth
+				>= cellData.preferredWidth)
+				? cellData.preferredHeight
+				: std::max(
+					displayLeaf.countHeight(
+						cellData.cell->textWidth,
+						true),
+					TextLineHeight(textStyle));
+			cellData.textHeight = ResolveEditableHeight(
+				naturalTextHeight,
+				context);
+			const auto outerHeight = cellData.textHeight
+				+ padding.top()
+				+ padding.bottom();
+			if (cellData.cell->rowspan == 1) {
+				rowHeights[rowIndex] = std::max(rowHeights[rowIndex], outerHeight);
+			} else {
+				rowSpans.push_back({ rowIndex, &cellData });
+			}
+		}
+	}
+	std::sort(
+		rowSpans.begin(),
+		rowSpans.end(),
+		[](const TableSpannedCellGeometryData &a,
+				const TableSpannedCellGeometryData &b) {
+			const auto aSpan = a.cell ? a.cell->cell->rowspan : 0;
+			const auto bSpan = b.cell ? b.cell->cell->rowspan : 0;
+			return (aSpan < bSpan)
+				|| ((aSpan == bSpan) && (a.row < b.row))
+				|| ((aSpan == bSpan)
+					&& (a.row == b.row)
+					&& a.cell
+					&& b.cell
+					&& (a.cell->cell->column < b.cell->cell->column));
+		});
+	for (const auto &spanned : rowSpans) {
+		if (!spanned.cell || !spanned.cell->cell) {
+			continue;
+		}
+		const auto outerHeight = spanned.cell->textHeight
+			+ padding.top()
+			+ padding.bottom();
+		const auto currentHeight = TableSpanHeight(
+			rowHeights,
+			spanned.row,
+			spanned.cell->cell->rowspan,
+			border);
+		DistributeSpanDelta(
+			&rowHeights,
+			spanned.row,
+			spanned.row + spanned.cell->cell->rowspan,
+			std::max(outerHeight - currentHeight, 0));
+	}
+	auto y = tableTop + border;
+	for (auto rowIndex = 0, rowCount = int(rows.size()); rowIndex != rowCount; ++rowIndex) {
+		auto &rowData = rows[rowIndex];
+		const auto rowHeight = rowHeights[rowIndex];
+		auto &row = block->tableRows[rowIndex];
+		row.header = rowData.header;
+		row.logicalOuter = QRect(
+			left + border,
+			y,
+			std::max(tableWidth - (2 * border), 0),
+			rowHeight);
+		row.outer = row.logicalOuter;
+		for (auto cellIndex = 0, cellCount = int(rowData.cells.size());
+				cellIndex != cellCount;
+				++cellIndex) {
+			auto &cellData = rowData.cells[cellIndex];
+			if (!cellData.cell) {
+				continue;
+			}
+			auto &cell = *cellData.cell;
+			const auto column = std::clamp(cell.column, 0, columnCount - 1);
+			const auto spanWidth = TableSpanWidth(
+				block->tableColumnWidths,
+				cell.column,
+				cell.colspan,
+				border);
+			const auto spanHeight = TableSpanHeight(
+				rowHeights,
+				rowIndex,
+				cell.rowspan,
+				border);
+			const auto cellTop = y;
+			const auto contentHeight = std::max(
+				spanHeight - padding.top() - padding.bottom(),
+				0);
+			auto textTop = cellTop + padding.top();
+			switch (cell.verticalAlignment) {
+			case PreparedTableCellVerticalAlignment::Middle:
+				textTop += std::max((contentHeight - cellData.textHeight) / 2, 0);
+				break;
+			case PreparedTableCellVerticalAlignment::Bottom:
+				textTop = cellTop
+					+ spanHeight
+					- padding.bottom()
+					- cellData.textHeight;
+				break;
+			case PreparedTableCellVerticalAlignment::Top:
+				break;
+			}
+			cell.logicalOuter = QRect(
+				columnLefts[column],
+				cellTop,
+				spanWidth,
+				spanHeight);
+			cell.logicalTextRect = QRect(
+				columnLefts[column] + padding.left(),
+				textTop,
+				cell.textWidth,
+				cellData.textHeight);
+			cell.outer = cell.logicalOuter;
+			cell.textRect = cell.logicalTextRect;
+		}
+		y += rowHeight + border;
+	}
+	const auto tableHeight = std::max(y - tableTop, border);
+	block->tableRect = QRect(left, tableTop, tableWidth, tableHeight);
+	block->visibleTableRect = QRect(
+		left,
+		tableTop,
+		std::min(tableWidth, visibleWidth),
+		tableHeight);
+	block->overflowed = (block->tableRect.width()
+		> block->visibleTableRect.width());
+	block->horizontalScrollMax = scrollOwner
+		? std::max(
+			block->tableRect.width() - block->visibleTableRect.width(),
+			0)
+		: 0;
+	auto tableContentRect = block->visibleTableRect;
+	if (scrollOwner) {
+		block->scrollLogicalContentRect = block->tableRect;
+		block->scrollViewportRect = block->visibleTableRect;
+		if (block->horizontalScrollMax > 0) {
+			block->scrollScrollbarTrackRect = QRect(
+				block->visibleTableRect.x(),
+				block->tableRect.y()
+					+ block->tableRect.height()
+					+ st.table.scrollbarSkip,
+				block->visibleTableRect.width(),
+				st.table.scrollbarHeight);
+		}
+	}
+	if (block->horizontalScrollMax > 0) {
+		block->tableScrollbarTrackRect = QRect(
+			block->visibleTableRect.x(),
+			block->tableRect.y()
+				+ block->tableRect.height()
+				+ st.table.scrollbarSkip,
+			block->visibleTableRect.width(),
+			st.table.scrollbarHeight);
+		block->tableScrollbarThumbRect = QRect();
+		block->scrollScrollbarThumbRect = block->tableScrollbarThumbRect;
+		tableContentRect = tableContentRect.united(block->tableScrollbarTrackRect);
+	}
+	block->contentRect = block->textRect.isEmpty()
+		? tableContentRect
+		: tableContentRect.isEmpty()
+		? block->textRect
+		: block->textRect.united(tableContentRect);
+	block->outer = block->contentRect;
+	if (!block->textRect.isEmpty()) {
+		FinishBlockGeometry(block);
+		return block->outer.y() + block->outer.height();
+	}
+	for (auto rowIndex = 0, rowCount = int(prepared.tableRows.size());
+			rowIndex != rowCount;
+			++rowIndex) {
+		for (auto cellIndex = 0, cellCount = int(prepared.tableRows[rowIndex].cells.size());
+				cellIndex != cellCount;
+				++cellIndex) {
+			auto &cell = block->tableRows[rowIndex].cells[cellIndex];
+			const auto &preparedCell = prepared.tableRows[rowIndex].cells[cellIndex];
+			const auto usePlaceholder = preparedCell.text.text.isEmpty()
+				&& !preparedCell.editPlaceholderText.isEmpty();
+			const auto &displayLeaf = usePlaceholder
+				? cell.placeholderLeaf
+				: cell.leaf;
+			if (displayLeaf.isEmpty()) {
+				continue;
+			}
+			block->firstLineBaseline = LeafFirstLineBaseline(
+				displayLeaf,
+				cell.textRect,
+				TableCellTextStyle(cell, st));
+			FinishBlockGeometry(block);
+			return block->outer.y() + block->outer.height();
+		}
+	}
+	FinishBlockGeometry(block);
+	return block->outer.y() + block->outer.height();
+}
+
+[[nodiscard]] std::optional<int> LayoutPlaceholderBlockGeometry(
+		const PreparedBlock &prepared,
+		LaidOutBlock *block,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		LayoutContext context) {
+	if (!block
+		|| MissingRetainedLeaf(prepared.placeholder.label, block->labelLeaf)) {
+		return std::nullopt;
+	}
+	ClearBlockGeometry(block);
+	const auto &style = st.placeholder;
+	const auto blockWidth = std::max(width, 1);
+	const auto contentLeft = left + style.padding.left();
+	const auto contentWidth = std::max(
+		blockWidth - style.padding.left() - style.padding.right(),
+		1);
+	block->labelWidth = contentWidth;
+	const auto labelHeight = std::max(
+		block->labelLeaf.countHeight(contentWidth, true),
+		TextLineHeight(style.labelStyle));
+	const auto mediaHeight = std::max(
+		style.minHeight,
+		labelHeight + style.padding.top() + style.padding.bottom());
+	block->mediaRect = QRect(left, top, blockWidth, mediaHeight);
+	block->visibleMediaRect = block->mediaRect;
+	if (block->placeholderRuntime
+		&& block->placeholderRuntime->ripple
+		&& block->placeholderRuntime->rippleSize != block->mediaRect.size()) {
+		block->placeholderRuntime->ripple = nullptr;
+		block->placeholderRuntime->rippleSize = QSize();
+	}
+	block->labelRect = QRect(
+		contentLeft,
+		top + std::max((mediaHeight - labelHeight) / 2, 0),
+		contentWidth,
+		labelHeight);
+	block->firstLineBaseline = LeafFirstLineBaseline(
+		block->labelLeaf,
+		block->labelRect,
+		style.labelStyle);
+	auto bottom = top + mediaHeight;
+	if (!LayoutMediaCaptionGeometry(
+			block,
+			prepared,
+			st,
+			contentLeft,
+			bottom,
+			contentWidth,
+			style.captionSkip,
+			&bottom,
+			context)) {
+		return std::nullopt;
+	}
+	block->contentRect = QRect(
+		left,
+		top,
+		blockWidth,
+		std::max(bottom - top, mediaHeight));
+	block->outer = block->contentRect;
+	FinishBlockGeometry(block);
+	return block->outer.y() + block->outer.height();
+}
+
+[[nodiscard]] std::optional<int> LayoutRelatedArticleBlockGeometry(
+		const PreparedBlock &prepared,
+		LaidOutBlock *block,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		LayoutContext context) {
+	if (!block
+		|| MissingRetainedLeaf(prepared.relatedArticle.title, block->labelLeaf)
+		|| MissingRetainedLeaf(
+			prepared.relatedArticle.description,
+			block->subtitleLeaf)
+		|| MissingRetainedLeaf(prepared.relatedArticle.footer, block->actionLeaf)) {
+		return std::nullopt;
+	}
+	ClearBlockGeometry(block);
+	const auto &card = st.relatedArticle;
+	const auto blockWidth = std::max(width, 1);
+	const auto hasThumbnail = (prepared.relatedArticle.photoId != 0);
+	const auto thumbnailSize = hasThumbnail
+		? std::max(card.thumbnailSize, 1)
+		: 0;
+	const auto thumbnailSkip = hasThumbnail ? card.thumbnailSkip : 0;
+	const auto contentLeft = left + card.padding.left();
+	const auto contentWidth = std::max(
+		blockWidth
+			- card.padding.left()
+			- card.padding.right()
+			- thumbnailSize
+			- thumbnailSkip,
+		1);
+	auto titleHeight = 0;
+	if (!prepared.relatedArticle.title.isEmpty()) {
+		block->labelWidth = contentWidth;
+		titleHeight = LeafHeightWithLineLimit(
+			block->labelLeaf,
+			card.titleStyle,
+			block->labelWidth,
+			card.titleLines);
+	}
+	auto subtitleHeight = 0;
+	if (!prepared.relatedArticle.description.isEmpty()) {
+		block->subtitleWidth = contentWidth;
+		subtitleHeight = LeafHeightWithLineLimit(
+			block->subtitleLeaf,
+			card.subtitleStyle,
+			block->subtitleWidth,
+			card.subtitleLines);
+	}
+	auto footerHeight = 0;
+	if (!prepared.relatedArticle.footer.isEmpty()) {
+		block->actionWidth = contentWidth;
+		footerHeight = LeafHeightWithLineLimit(
+			block->actionLeaf,
+			card.footerStyle,
+			block->actionWidth,
+			card.footerLines);
+	}
+	auto textHeight = 0;
+	if (titleHeight) {
+		textHeight += titleHeight;
+	}
+	if (subtitleHeight) {
+		textHeight += subtitleHeight + (textHeight ? card.textSkip : 0);
+	}
+	if (footerHeight) {
+		textHeight += footerHeight + (textHeight ? card.footerSkip : 0);
+	}
+	const auto cardContentHeight = std::max(textHeight, thumbnailSize);
+	const auto cardHeight = card.padding.top()
+		+ cardContentHeight
+		+ card.padding.bottom()
+		+ card.separator;
+	block->mediaRect = QRect(left, top, blockWidth, cardHeight);
+	block->visibleMediaRect = block->mediaRect;
+	if (hasThumbnail) {
+		block->thumbnailRect = QRect(
+			left + blockWidth - card.padding.right() - thumbnailSize,
+			top + card.padding.top()
+				+ std::max((cardContentHeight - thumbnailSize) / 2, 0),
+			thumbnailSize,
+			thumbnailSize);
+	}
+	auto textTop = top + card.padding.top()
+		+ std::max((cardContentHeight - textHeight) / 2, 0);
+	if (titleHeight) {
+		block->labelRect = QRect(
+			contentLeft,
+			textTop,
+			block->labelWidth,
+			titleHeight);
+		textTop += titleHeight;
+	}
+	if (subtitleHeight) {
+		textTop += block->labelRect.isEmpty() ? 0 : card.textSkip;
+		block->subtitleRect = QRect(
+			contentLeft,
+			textTop,
+			block->subtitleWidth,
+			subtitleHeight);
+		textTop += subtitleHeight;
+	}
+	if (footerHeight) {
+		textTop += (block->labelRect.isEmpty() && block->subtitleRect.isEmpty())
+			? 0
+			: card.footerSkip;
+		block->actionRect = QRect(
+			contentLeft,
+			textTop,
+			block->actionWidth,
+			footerHeight);
+	}
+	const auto setBaseline = [&](const Ui::Text::String &leaf,
+			QRect rect,
+			const style::TextStyle &textStyle) {
+		if (rect.isEmpty() || leaf.isEmpty()) {
+			return false;
+		}
+		block->firstLineBaseline = LeafFirstLineBaseline(leaf, rect, textStyle);
+		return true;
+	};
+	if (!setBaseline(block->labelLeaf, block->labelRect, card.titleStyle)
+		&& !setBaseline(
+			block->subtitleLeaf,
+			block->subtitleRect,
+			card.subtitleStyle)
+		&& !setBaseline(
+			block->actionLeaf,
+			block->actionRect,
+			card.footerStyle)) {
+		block->firstLineBaseline = top + card.padding.top();
+	}
+	block->contentRect = block->mediaRect;
+	block->outer = block->mediaRect;
+	FinishBlockGeometry(block);
+	return block->outer.y() + block->outer.height();
+}
+
+[[nodiscard]] std::optional<int> LayoutFramedMediaBlockGeometry(
+		LaidOutBlock *block,
+		const PreparedBlock &prepared,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		QMargins padding,
+		int captionSkip,
+		bool limitWidth,
+		bool centerMedia,
+		int intrinsicWidth,
+		LayoutContext context) {
+	if (!block) {
+		return std::nullopt;
+	}
+	ClearBlockGeometry(block);
+	const auto blockWidth = std::max(width, 1);
+	const auto availableLeft = left + padding.left();
+	const auto mediaTop = top + padding.top();
+	const auto availableWidth = std::max(
+		blockWidth - padding.left() - padding.right(),
+		1);
+	const auto mediaWidth = limitWidth
+		? LimitedMediaWidth(availableWidth, intrinsicWidth)
+		: availableWidth;
+	const auto mediaLeft = centerMedia
+		? (availableLeft + std::max((availableWidth - mediaWidth) / 2, 0))
+		: availableLeft;
+	const auto mediaHeight = block->mediaBlock
+		? block->mediaBlock->resizeGetHeight(mediaWidth)
+		: 0;
+	block->mediaRect = QRect(mediaLeft, mediaTop, mediaWidth, mediaHeight);
+	block->visibleMediaRect = block->mediaRect;
+	if (block->mediaBlock) {
+		ApplyMediaBlockGeometry(block, block->mediaRect, st);
+	}
+	auto bottom = block->mediaRect.y() + block->mediaRect.height()
+		+ padding.bottom();
+	if (!LayoutMediaCaptionGeometry(
+			block,
+			prepared,
+			st,
+			block->mediaRect.x(),
+			bottom,
+			std::max(block->mediaRect.width(), 1),
+			captionSkip,
+			&bottom,
+			context)) {
+		return std::nullopt;
+	}
+	block->contentRect = QRect(
+		block->mediaRect.x(),
+		block->mediaRect.y(),
+		block->mediaRect.width(),
+		std::max(bottom - block->mediaRect.y(), block->mediaRect.height()));
+	block->outer = QRect(
+		left,
+		top,
+		blockWidth,
+		std::max(bottom - top, block->mediaRect.height()));
+	FinishBlockGeometry(block);
+	return block->outer.y() + block->outer.height();
+}
+
+[[nodiscard]] std::optional<int> LayoutCardMediaBlockGeometry(
+		LaidOutBlock *block,
+		const PreparedBlock &prepared,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		QMargins padding,
+		int captionSkip,
+		LayoutContext context) {
+	if (!block) {
+		return std::nullopt;
+	}
+	ClearBlockGeometry(block);
+	const auto blockWidth = std::max(width, 1);
+	const auto cardHeight = block->mediaBlock
+		? block->mediaBlock->resizeGetHeight(blockWidth)
+		: 0;
+	block->mediaRect = QRect(left, top, blockWidth, cardHeight);
+	block->visibleMediaRect = block->mediaRect;
+	if (block->mediaBlock) {
+		ApplyMediaBlockGeometry(block, block->mediaRect, st);
+	}
+	auto bottom = top + cardHeight;
+	if (!LayoutMediaCaptionGeometry(
+			block,
+			prepared,
+			st,
+			left + padding.left(),
+			bottom,
+			std::max(blockWidth - padding.left() - padding.right(), 1),
+			captionSkip,
+			&bottom,
+			context)) {
+		return std::nullopt;
+	}
+	block->contentRect = QRect(
+		left,
+		top,
+		blockWidth,
+		std::max(bottom - top, cardHeight));
+	block->outer = block->contentRect;
+	FinishBlockGeometry(block);
+	return block->outer.y() + block->outer.height();
+}
+
+std::optional<int> RecountSimpleLaidOutBlock(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		LaidOutBlock *block,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		bool scrollOwner,
+		LayoutContext context) {
+	switch (prepared.kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+		return LayoutFlowBlockGeometry(
+			prepared,
+			block,
+			st,
+			left,
+			top,
+			width,
+			logicalWidth,
+			scrollOwner,
+			context);
+	case PreparedBlockKind::CodeBlock:
+		return LayoutCodeBlockGeometry(
+			prepared,
+			block,
+			st,
+			left,
+			top,
+			width,
+			logicalWidth,
+			scrollOwner,
+			context);
+	case PreparedBlockKind::Rule:
+		return LayoutRuleBlockGeometry(block, st, left, top, width);
+	case PreparedBlockKind::DisplayMath:
+		return LayoutDisplayMathBlockGeometry(
+			prepared,
+			formulas,
+			block,
+			st,
+			left,
+			top,
+			width,
+			logicalWidth,
+			scrollOwner,
+			context);
+	case PreparedBlockKind::Table:
+		return LayoutTableBlockGeometry(
+			prepared,
+			block,
+			st,
+			left,
+			top,
+			width,
+			logicalWidth,
+			scrollOwner,
+			context);
+	case PreparedBlockKind::Photo:
+		if (!block || !block->mediaBlock) {
+			return std::nullopt;
+		}
+		return LayoutFramedMediaBlockGeometry(
+			block,
+			prepared,
+			st,
+			left,
+			top,
+			width,
+			st.photo.padding,
+			st.photo.captionSkip,
+			true,
+			true,
+			prepared.photo.width,
+			context);
+	case PreparedBlockKind::Video:
+		if (!block || !block->mediaBlock) {
+			return std::nullopt;
+		}
+		return LayoutFramedMediaBlockGeometry(
+			block,
+			prepared,
+			st,
+			left,
+			top,
+			width,
+			st.photo.padding,
+			st.photo.captionSkip,
+			true,
+			true,
+			prepared.video.media.width,
+			context);
+	case PreparedBlockKind::Audio:
+		if (!block || !block->mediaBlock) {
+			return std::nullopt;
+		}
+		return LayoutCardMediaBlockGeometry(
+			block,
+			prepared,
+			st,
+			left,
+			top,
+			width,
+			st.audio.padding,
+			st.audio.captionSkip,
+			context);
+	case PreparedBlockKind::Map:
+		if (!block || !block->mediaBlock) {
+			return std::nullopt;
+		}
+		return LayoutFramedMediaBlockGeometry(
+			block,
+			prepared,
+			st,
+			left,
+			top,
+			width,
+			st.photo.padding,
+			st.photo.captionSkip,
+			false,
+			false,
+			0,
+			context);
+	case PreparedBlockKind::Channel:
+		if (!block || !block->mediaBlock) {
+			return std::nullopt;
+		}
+		return LayoutCardMediaBlockGeometry(
+			block,
+			prepared,
+			st,
+			left,
+			top,
+			width,
+			st.channel.padding,
+			st.audio.captionSkip,
+			context);
+	case PreparedBlockKind::GroupedMedia:
+		if (!block || !block->mediaBlock) {
+			return std::nullopt;
+		}
+		return LayoutFramedMediaBlockGeometry(
+			block,
+			prepared,
+			st,
+			left,
+			top,
+			width,
+			st.groupedMedia.padding,
+			st.groupedMedia.captionSkip,
+			false,
+			false,
+			0,
+			context);
+	case PreparedBlockKind::RelatedArticle:
+		return LayoutRelatedArticleBlockGeometry(
+			prepared,
+			block,
+			st,
+			left,
+			top,
+			width,
+			context);
+	case PreparedBlockKind::Placeholder:
+		return LayoutPlaceholderBlockGeometry(
+			prepared,
+			block,
+			st,
+			left,
+			top,
+			width,
+			context);
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+	case PreparedBlockKind::Quote:
+	case PreparedBlockKind::Details:
+	case PreparedBlockKind::EmbedPost:
+		break;
+	}
+	return std::nullopt;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_article_layout_blocks.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_layout_blocks.h
new file mode 100644
index 00000000000000..084da0259ddab1
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_layout_blocks.h
@@ -0,0 +1,692 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_article.h"
+#include "spellcheck/spellcheck_highlight_syntax.h"
+
+#include <functional>
+#include <memory>
+#include <optional>
+#include <unordered_map>
+#include <vector>
+
+namespace Ui {
+class DynamicImage;
+} // namespace Ui
+
+namespace style {
+struct st;
+struct QuoteStyle;
+struct TextStyle;
+} // namespace style
+
+namespace Iv::Markdown {
+
+class InlineFormulaObjectCache;
+class CodeBlockSyntaxHighlightTracker {
+public:
+	virtual ~CodeBlockSyntaxHighlightTracker() = default;
+
+	[[nodiscard]] virtual Spellchecker::HighlightProcessId tryHighlightSyntax(
+		const QString &displayText,
+		const QString &language,
+		TextWithEntities &marked) = 0;
+};
+
+struct LaidOutTableCell {
+	Ui::Text::String leaf;
+	QRect logicalOuter;
+	QRect logicalTextRect;
+	QString placeholderText;
+	Ui::Text::String placeholderLeaf;
+	QRect outer;
+	QRect textRect;
+	int textWidth = 0;
+
+	// Content-dependent, survives geometry resets, recomputed when
+	// the displayed leaf max width changes (so on content changes).
+	int cachedPreferredWidth = -1;
+	int cachedPreferredHeight = 0;
+	bool header = false;
+	PreparedTableCellVerticalAlignment verticalAlignment
+		= PreparedTableCellVerticalAlignment::Top;
+	style::align align = style::al_left;
+	int column = 0;
+	int colspan = 1;
+	int rowspan = 1;
+	int segmentIndex = -1;
+	int tableSegmentIndex = -1;
+	std::optional<PreparedEditTableCellSource> editCell;
+	std::optional<PreparedEditLeafSource> editLeaf;
+};
+
+struct LaidOutTableRow {
+	std::vector<LaidOutTableCell> cells;
+	QRect logicalOuter;
+	QRect outer;
+	bool header = false;
+	std::optional<PreparedEditTableRowSource> editRow;
+};
+
+struct LaidOutBlockLogicalGeometry {
+	QRect outer;
+	QRect headerRect;
+	QRect bodyRect;
+	QRect iconRect;
+	QRect textRect;
+	QRect labelRect;
+	QRect subtitleRect;
+	QRect actionRect;
+	QRect markerRect;
+	QRect contentRect;
+	QRect formulaRect;
+	QRect tableRect;
+	QRect mediaRect;
+	QRect thumbnailRect;
+	QPoint markerCenter;
+};
+
+struct LaidOutBlock {
+	PreparedBlockKind kind = PreparedBlockKind::Paragraph;
+	Ui::Text::String leaf;
+	QString placeholderText;
+	Ui::Text::String placeholderLeaf;
+	Ui::Text::String labelLeaf;
+	Ui::Text::String subtitleLeaf;
+	Ui::Text::String actionLeaf;
+	Ui::Text::String marker;
+	Ui::Text::String fallbackLeaf;
+	QString copyText;
+	TextWithEntities codeText;
+	std::vector<PreparedLink> codeLinks;
+	QString labelText;
+	QString codeLanguage;
+	std::optional<PreparedLink> preparedLink;
+	ClickHandlerPtr preparedLinkHandler;
+	PreparedPlaceholderBlockId placeholderId;
+	Spellchecker::HighlightProcessId syntaxHighlightProcessId = 0;
+	std::vector<LaidOutBlock> children;
+	std::vector<LaidOutTableRow> tableRows;
+	std::vector<int> tableColumnWidths;
+	QRect outer;
+	QRect headerRect;
+	QRect bodyRect;
+	QRect iconRect;
+	QRect textRect;
+	QRect labelRect;
+	QRect subtitleRect;
+	QRect actionRect;
+	QRect markerRect;
+	QRect contentRect;
+	QRect formulaRect;
+	QRect tableRect;
+	QRect mediaRect;
+	QRect thumbnailRect;
+	QRect visibleFormulaRect;
+	QRect scrollViewportRect;
+	QRect scrollLogicalContentRect;
+	QRect scrollScrollbarTrackRect;
+	QRect scrollScrollbarThumbRect;
+	QRect visibleTableRect;
+	QRect tableScrollbarTrackRect;
+	QRect tableScrollbarThumbRect;
+	QRect visibleMediaRect;
+	QPoint markerCenter;
+	LaidOutBlockLogicalGeometry logicalGeometry;
+	QString anchorId;
+	std::vector<QString> anchorIds;
+	int textWidth = 0;
+	int labelWidth = 0;
+	int subtitleWidth = 0;
+	int actionWidth = 0;
+	int markerWidth = 0;
+	int firstLineBaseline = -1;
+	int headingLevel = 0;
+	ListKind listKind = ListKind::Bullet;
+	ListDelimiter listDelimiter = ListDelimiter::None;
+	TaskState taskState = TaskState::None;
+	int formulaIndex = -1;
+	int orderedNumber = 0;
+	style::align flowTextAlign = style::al_left;
+	style::align formulaAlign = style::al_left;
+	bool collapsed = false;
+	bool detailsOpen = false;
+	bool overflowed = false;
+	bool tableBordered = true;
+	bool tableStriped = false;
+	bool supplementary = false;
+	bool pullquote = false;
+	bool insideHorizontalScroll = false;
+	int horizontalScrollLeft = 0;
+	int horizontalScrollMax = 0;
+	int horizontalScrollAncestorShift = 0;
+	int segmentIndex = -1;
+	int secondarySegmentIndex = -1;
+	int tertiarySegmentIndex = -1;
+	std::optional<PreparedEditBlockSource> editBlock;
+	std::optional<PreparedEditListItemSource> editListItem;
+	std::optional<PreparedEditLeafSource> editLeaf;
+	std::shared_ptr<MediaBlock> mediaBlock;
+	std::shared_ptr<PlaceholderBlockRuntime> placeholderRuntime;
+	std::shared_ptr<TaskMarkerRippleRuntime> taskMarkerRippleRuntime;
+	std::shared_ptr<PhotoRuntime> photoRuntime;
+	MediaActivation activation;
+	uint64 thumbnailPhotoId = 0;
+	mutable std::shared_ptr<Ui::DynamicImage> thumbnailImage;
+	mutable std::shared_ptr<Ui::DynamicImage> previousThumbnailImage;
+	mutable std::shared_ptr<Ui::DynamicImage> subscribedThumbnailImage;
+	mutable QSize thumbnailRequestSize;
+	mutable std::shared_ptr<Ui::DynamicImage> fullImage;
+	mutable std::shared_ptr<Ui::DynamicImage> previousFullImage;
+	mutable std::shared_ptr<Ui::DynamicImage> subscribedFullImage;
+	mutable QSize fullRequestSize;
+	mutable QImage colorizedFormulaImage;
+	mutable QColor colorizedFormulaColor;
+	mutable QSize colorizedFormulaSize;
+};
+
+struct EditableHeightOverride {
+	int editableIndex = -1;
+	int height = 0;
+	int nextEditableIndex = 0;
+};
+
+enum class CachedTextLeafSlot {
+	Leaf,
+	Placeholder,
+	Label,
+	Subtitle,
+	Action,
+	Marker,
+	Fallback,
+	TableCellText,
+	TableCellPlaceholder,
+};
+
+enum class CachedTextLeafIdentityKind {
+	PreparedPath,
+	EditBlock,
+	EditListItem,
+	EditTableCell,
+	EditLeaf,
+};
+
+struct CachedTextLeafKey {
+	CachedTextLeafSlot slot = CachedTextLeafSlot::Leaf;
+	CachedTextLeafIdentityKind identityKind
+		= CachedTextLeafIdentityKind::PreparedPath;
+	PreparedEditBlockSource editBlock;
+	PreparedEditListItemSource editListItem;
+	PreparedEditTableCellSource editTableCell;
+	PreparedEditLeafSource editLeaf;
+	std::vector<int> preparedPath;
+	int tableRowIndex = -1;
+	int tableCellIndex = -1;
+
+	friend inline bool operator==(
+			const CachedTextLeafKey &a,
+			const CachedTextLeafKey &b) {
+		if (a.slot != b.slot || a.identityKind != b.identityKind) {
+			return false;
+		}
+		switch (a.identityKind) {
+		case CachedTextLeafIdentityKind::PreparedPath:
+			return (a.preparedPath == b.preparedPath)
+				&& (a.tableRowIndex == b.tableRowIndex)
+				&& (a.tableCellIndex == b.tableCellIndex);
+		case CachedTextLeafIdentityKind::EditBlock:
+			return (a.editBlock == b.editBlock);
+		case CachedTextLeafIdentityKind::EditListItem:
+			return (a.editListItem == b.editListItem);
+		case CachedTextLeafIdentityKind::EditTableCell:
+			return (a.editTableCell == b.editTableCell);
+		case CachedTextLeafIdentityKind::EditLeaf:
+			return (a.editLeaf == b.editLeaf);
+		}
+		return false;
+	}
+
+	friend inline bool operator!=(
+			const CachedTextLeafKey &a,
+			const CachedTextLeafKey &b) {
+		return !(a == b);
+	}
+};
+
+struct CachedTextLeafKeyHasher {
+	[[nodiscard]] size_t operator()(
+		const CachedTextLeafKey &value) const noexcept;
+};
+
+struct CachedTextLeafSourceSignature {
+	TextWithEntities text;
+	QString codeLanguage;
+	int minResizeWidth = 1;
+	size_t styleKey = 0;
+	bool dependsOnMediaRuntime = false;
+
+	friend inline bool operator==(
+		const CachedTextLeafSourceSignature &a,
+		const CachedTextLeafSourceSignature &b) = default;
+	friend inline bool operator!=(
+		const CachedTextLeafSourceSignature &a,
+		const CachedTextLeafSourceSignature &b) {
+		return !(a == b);
+	}
+};
+
+struct CachedTextLeafEntry {
+	Ui::Text::String leaf;
+	CachedTextLeafSourceSignature source;
+	Spellchecker::HighlightProcessId syntaxHighlightProcessId = 0;
+};
+
+struct CachedTextLeafPool {
+	std::unordered_map<
+		CachedTextLeafKey,
+		CachedTextLeafEntry,
+		CachedTextLeafKeyHasher> entries;
+};
+
+struct LayoutContext {
+	int listDepth = 0;
+	int listItemDepth = 0;
+	int listItemContentShift = 0;
+	int quoteDepth = 0;
+	int articleLeft = 0;
+	int articleWidth = 0;
+	bool tightList = false;
+	bool useArticleBands = false;
+	bool editMode = false;
+	bool allowAsyncSyntaxHighlighting = true;
+	CodeBlockSyntaxHighlightTracker *syntaxHighlightTracker = nullptr;
+	CachedTextLeafPool *cachedTextLeafs = nullptr;
+	Fn<void()> repaint;
+	Fn<void(QRect)> repaintRect;
+	Fn<bool(const ClickContext&)> spoilerLinkFilter;
+	std::vector<int> preparedPath;
+	std::shared_ptr<EditableHeightOverride> editableHeightOverride;
+	std::function<std::shared_ptr<MediaBlock>(const PreparedBlock&)> mediaBlockFactory;
+	std::function<std::shared_ptr<PlaceholderBlockRuntime>(
+		PreparedPlaceholderBlockId)> placeholderRuntimeFactory;
+	std::function<std::shared_ptr<TaskMarkerRippleRuntime>(
+		const PreparedEditListItemSource&)> taskMarkerRippleRuntimeFactory;
+};
+
+class LayoutContextScope {
+public:
+	explicit LayoutContextScope(const LayoutContext &context);
+	~LayoutContextScope();
+
+	LayoutContextScope(const LayoutContextScope &) = delete;
+	LayoutContextScope &operator=(const LayoutContextScope &) = delete;
+
+private:
+	const LayoutContext *_previous = nullptr;
+};
+
+[[nodiscard]] bool IsAnchorOnlyBlock(const PreparedBlock &block);
+[[nodiscard]] bool IsFlowKind(PreparedBlockKind kind);
+[[nodiscard]] QString ListMarkerText(const PreparedBlock &block);
+[[nodiscard]] int TextLineHeight(const style::TextStyle &style);
+[[nodiscard]] int TextLineAscent(const style::TextStyle &style);
+[[nodiscard]] int TextLineBaseline(
+	const style::TextStyle &style,
+	int top = 0);
+[[nodiscard]] int ResolveEditableHeight(
+	int naturalHeight,
+	LayoutContext context);
+[[nodiscard]] QPoint BulletMarkerCenter(
+	int left,
+	int baseline,
+	const style::Markdown &st);
+[[nodiscard]] QMargins BlockquotePadding(const style::QuoteStyle &style);
+[[nodiscard]] int HorizontalMarginsWidth(QMargins margins);
+[[nodiscard]] Ui::Text::GeometryDescriptor TextGeometry(int width);
+[[nodiscard]] int TextMinResizeWidth(int width);
+[[nodiscard]] int ReadableTextMinWidth(const style::TextStyle &style);
+[[nodiscard]] int FlowTextMinResizeWidth(const style::TextStyle &style);
+[[nodiscard]] int FlowBlockMinimumWidth(
+	const PreparedBlock &prepared,
+	const style::Markdown &st);
+[[nodiscard]] int FlowBlockPreferredWidth(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> &formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	LayoutContext context = {});
+[[nodiscard]] int CodeBlockMinimumWidth(const style::Markdown &st);
+[[nodiscard]] int CodeTextMinResizeWidth(const style::Markdown &st);
+[[nodiscard]] int CodeBlockPreferredWidth(
+	const PreparedBlock &prepared,
+	const style::Markdown &st,
+	LayoutContext context = {});
+[[nodiscard]] int DisplayMathMinimumWidth(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> &formulas,
+	const style::Markdown &st);
+[[nodiscard]] int DisplayMathPreferredWidth(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> &formulas,
+	const style::Markdown &st,
+	LayoutContext context = {});
+[[nodiscard]] int PlainTextMinResizeWidth(const style::TextStyle &style);
+[[nodiscard]] int DisplayMathFallbackTextMinResizeWidth(
+	const style::Markdown &st);
+[[nodiscard]] int ContainerMinimumWidth(
+	int contentMinimumWidth,
+	QMargins padding);
+[[nodiscard]] int TableMinimumGridWidth(
+	int columnCount,
+	const style::Markdown &st,
+	bool bordered);
+[[nodiscard]] int TableCellTextMinResizeWidth(
+	const style::TextStyle &textStyle,
+	const style::Markdown &st);
+
+// Minimal width a text leaf can be laid out in without overflowing,
+// counting wide inline objects (custom emoji / inline formulas).
+[[nodiscard]] int LeafMinimumWidth(const Ui::Text::String &leaf);
+
+struct TableCellMinimumWidthConstraint {
+	int column = 0;
+	int colspan = 1;
+	int minimumWidth = 0; // Outer width, including cell padding.
+};
+[[nodiscard]] std::vector<int> ComputeTableColumnMinimumWidths(
+	std::vector<TableCellMinimumWidthConstraint> constraints,
+	int columnCount,
+	const style::Markdown &st,
+	bool bordered);
+[[nodiscard]] int TableGridWidth(
+	const std::vector<int> &columnWidths,
+	const style::Markdown &st,
+	bool bordered);
+[[nodiscard]] int FlowBlockContentMinimumWidth(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> &formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	LayoutContext context = {});
+[[nodiscard]] int DetailsSummaryContentMinimumWidth(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> &formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	LayoutContext context = {});
+[[nodiscard]] int TableBlockContentMinimumWidth(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> &formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	LayoutContext context = {});
+[[nodiscard]] int RetainedTableBlockMinimumWidth(
+	const PreparedBlock &prepared,
+	const LaidOutBlock &block,
+	const style::Markdown &st);
+[[nodiscard]] QString CodeBlockDisplayText(const QString &text);
+[[nodiscard]] TextWithEntities CodeBlockDisplayText(TextWithEntities text);
+[[nodiscard]] int BlockSkip(
+	const PreparedBlock &block,
+	const style::Markdown &st);
+[[nodiscard]] int BlockSkip(
+	const PreparedBlock &previous,
+	const PreparedBlock &block,
+	LayoutContext context,
+	const style::Markdown &st);
+[[nodiscard]] const style::TextStyle &TextStyleFor(
+	const PreparedBlock &block,
+	const style::Markdown &st);
+void CopyCachedTextLeafs(
+	const std::vector<PreparedBlock> &preparedBlocks,
+	std::vector<LaidOutBlock> *blocks,
+	const style::Markdown &st,
+	CachedTextLeafPool *pool);
+void BuildOrReuseMarkedTextLeaf(
+	Ui::Text::String *leaf,
+	CachedTextLeafSlot slot,
+	const PreparedBlock &prepared,
+	const style::TextStyle &textStyle,
+	const style::Markdown &st,
+	const TextWithEntities &text,
+	const std::vector<PreparedLink> &links,
+	const std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	int minResizeWidth,
+	LayoutContext context = {});
+void BuildOrReusePlainTextLeaf(
+	Ui::Text::String *leaf,
+	CachedTextLeafSlot slot,
+	const PreparedBlock &prepared,
+	const style::TextStyle &textStyle,
+	const QString &text,
+	int minResizeWidth,
+	LayoutContext context = {});
+void BuildOrReuseEditPlaceholderLeaf(
+	QString *placeholderText,
+	Ui::Text::String *placeholderLeaf,
+	const PreparedBlock &prepared,
+	const QString &text,
+	const style::TextStyle &textStyle,
+	int minResizeWidth,
+	LayoutContext context = {});
+void ApplyPreparedEditSources(
+	LaidOutBlock *block,
+	const PreparedBlock &prepared);
+void LayoutMediaCaption(
+	LaidOutBlock *block,
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int skip,
+	int *bottom,
+	LayoutContext context = {});
+void FillMediaCaptionContent(
+	LaidOutBlock *block,
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	LayoutContext context = {});
+[[nodiscard]] bool LayoutMediaCaptionGeometry(
+	LaidOutBlock *block,
+	const PreparedBlock &prepared,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int skip,
+	int *bottom,
+	LayoutContext context = {});
+void RepopulateCodeBlockLeaf(
+	LaidOutBlock &block,
+	const std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	bool allowAsyncSyntaxHighlighting,
+	CodeBlockSyntaxHighlightTracker *syntaxHighlightTracker = nullptr,
+	Fn<void()> repaint = nullptr,
+	Fn<void(QRect)> repaintRect = nullptr,
+	Fn<bool(const ClickContext&)> spoilerLinkFilter = nullptr);
+void UpdateLaidOutLeafContent(
+	LaidOutBlock *block,
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	LayoutContext context = {});
+void UpdateLaidOutLeafContent(
+	LaidOutTableCell *cell,
+	const PreparedTableCell &prepared,
+	const std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	int tableRowIndex,
+	int tableCellIndex,
+	LayoutContext context = {});
+
+[[nodiscard]] LaidOutBlock LayoutFlowBlock(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	bool scrollOwner,
+	LayoutContext context = {});
+[[nodiscard]] LaidOutBlock LayoutCodeBlock(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	bool scrollOwner,
+	bool allowAsyncSyntaxHighlighting,
+	CodeBlockSyntaxHighlightTracker *syntaxHighlightTracker = nullptr,
+	LayoutContext context = {});
+[[nodiscard]] LaidOutBlock LayoutRuleBlock(
+	const PreparedBlock &prepared,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width);
+[[nodiscard]] LaidOutBlock LayoutDisplayMathBlock(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> &formulas,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	bool scrollOwner,
+	LayoutContext context = {});
+[[nodiscard]] LaidOutBlock LayoutTableBlock(
+	const PreparedBlock &prepared,
+	std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	bool scrollOwner,
+	LayoutContext context = {});
+[[nodiscard]] LaidOutBlock LayoutPlaceholderBlock(
+	const PreparedBlock &prepared,
+	std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	LayoutContext context = {});
+[[nodiscard]] LaidOutBlock LayoutRelatedArticleBlock(
+	const PreparedBlock &prepared,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	LayoutContext context = {});
+[[nodiscard]] LaidOutBlock LayoutPhotoBlock(
+	const PreparedBlock &prepared,
+	std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	LayoutContext context = {});
+[[nodiscard]] LaidOutBlock LayoutVideoBlock(
+	const PreparedBlock &prepared,
+	std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	LayoutContext context = {});
+[[nodiscard]] LaidOutBlock LayoutAudioBlock(
+	const PreparedBlock &prepared,
+	std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	LayoutContext context = {});
+[[nodiscard]] LaidOutBlock LayoutMapBlock(
+	const PreparedBlock &prepared,
+	std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	LayoutContext context = {});
+[[nodiscard]] LaidOutBlock LayoutChannelBlock(
+	const PreparedBlock &prepared,
+	std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	LayoutContext context = {});
+[[nodiscard]] LaidOutBlock LayoutGroupedMediaBlock(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	LayoutContext context = {});
+[[nodiscard]] std::optional<int> RecountSimpleLaidOutBlock(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> &formulas,
+	LaidOutBlock *block,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	bool scrollOwner,
+	LayoutContext context = {});
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_article_layout_structure.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_layout_structure.cpp
new file mode 100644
index 00000000000000..383418362bacb3
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_layout_structure.cpp
@@ -0,0 +1,3833 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_article_layout_structure.h"
+#include "iv/markdown/iv_markdown_article_text.h"
+
+#include "lang/lang_keys.h"
+#include "styles/style_iv.h"
+
+#include <algorithm>
+
+namespace Iv::Markdown {
+namespace {
+
+[[nodiscard]] int LeafFirstLineBaseline(
+		const Ui::Text::String &leaf,
+		const QRect &textRect,
+		const style::TextStyle &style) {
+	const auto lines = leaf.countLinesGeometry(textRect.width(), true);
+	return textRect.y() + (lines.empty()
+		? TextLineBaseline(style)
+		: lines.front().baseline);
+}
+
+[[nodiscard]] int MarkdownBodyBaseline(
+		int top,
+		const style::Markdown &st) {
+	return TextLineBaseline(st.body, top);
+}
+
+[[nodiscard]] int BlockBottom(const LaidOutBlock &block) {
+	return block.outer.y() + block.outer.height();
+}
+
+[[nodiscard]] bool UsesMediaBand(PreparedBlockKind kind) {
+	switch (kind) {
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::RelatedArticle:
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::Details:
+		return true;
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+	case PreparedBlockKind::CodeBlock:
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+	case PreparedBlockKind::Quote:
+	case PreparedBlockKind::DisplayMath:
+	case PreparedBlockKind::Table:
+	case PreparedBlockKind::Placeholder:
+	case PreparedBlockKind::EmbedPost:
+		return false;
+	}
+	return false;
+}
+
+[[nodiscard]] QRect PaddedBand(
+		int left,
+		int width,
+		QMargins padding) {
+	return QRect(
+		left + padding.left(),
+		0,
+		std::max(width - padding.left() - padding.right(), 1),
+		0);
+}
+
+[[nodiscard]] int PaddedWidth(
+		int width,
+		QMargins padding) {
+	return std::max(width - padding.left() - padding.right(), 1);
+}
+
+[[nodiscard]] QRect BlockBand(
+		PreparedBlockKind kind,
+		const style::Markdown &st,
+		int left,
+		int width,
+		LayoutContext context) {
+	if (!context.useArticleBands) {
+		return QRect(left, 0, std::max(width, 1), 0);
+	}
+	return UsesMediaBand(kind)
+		? PaddedBand(left, width, st.mediaPadding)
+		: PaddedBand(left, width, st.textPadding);
+}
+
+[[nodiscard]] int BlockBandWidth(
+		PreparedBlockKind kind,
+		const style::Markdown &st,
+		int width,
+		LayoutContext context) {
+	if (!context.useArticleBands) {
+		return std::max(width, 1);
+	}
+	return UsesMediaBand(kind)
+		? PaddedWidth(width, st.mediaPadding)
+		: PaddedWidth(width, st.textPadding);
+}
+
+[[nodiscard]] bool IsRelatedArticlesHeader(
+		const PreparedBlock &block,
+		const PreparedBlock *next) {
+	return next
+		&& (block.kind == PreparedBlockKind::Heading)
+		&& (next->kind == PreparedBlockKind::RelatedArticle);
+}
+
+[[nodiscard]] const PreparedBlock *NextVisibleBlock(
+		const std::vector<PreparedBlock> &blocks,
+		int index) {
+	for (auto i = index + 1, count = int(blocks.size()); i != count; ++i) {
+		if (!IsAnchorOnlyBlock(blocks[i])) {
+			return &blocks[i];
+		}
+	}
+	return nullptr;
+}
+
+void PrepareNestedContext(
+		LayoutContext *context,
+		int left,
+		int width) {
+	context->useArticleBands = false;
+	context->articleLeft = left;
+	context->articleWidth = std::max(width, 1);
+	context->listItemContentShift = 0;
+}
+
+[[nodiscard]] bool FirstLineComesFromChildren(const LaidOutBlock &block) {
+	switch (block.kind) {
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+	case PreparedBlockKind::Quote:
+	case PreparedBlockKind::EmbedPost:
+		return true;
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+	case PreparedBlockKind::CodeBlock:
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::DisplayMath:
+	case PreparedBlockKind::Table:
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::RelatedArticle:
+	case PreparedBlockKind::Placeholder:
+	case PreparedBlockKind::Details:
+		return false;
+	}
+	return false;
+}
+
+[[nodiscard]] int ResolveFirstDisplayedLineBaseline(
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	if (block.firstLineBaseline >= 0) {
+		return block.firstLineBaseline;
+	}
+	if (FirstLineComesFromChildren(block)) {
+		for (const auto &child : block.children) {
+			if (child.outer.height() <= 0) {
+				continue;
+			}
+			return ResolveFirstDisplayedLineBaseline(child, st);
+		}
+	}
+	return MarkdownBodyBaseline(block.outer.y(), st);
+}
+
+void RefreshLogicalGeometry(LaidOutBlock *block) {
+	block->logicalGeometry = {
+		.outer = block->outer,
+		.headerRect = block->headerRect,
+		.bodyRect = block->bodyRect,
+		.iconRect = block->iconRect,
+		.textRect = block->textRect,
+		.labelRect = block->labelRect,
+		.subtitleRect = block->subtitleRect,
+		.actionRect = block->actionRect,
+		.markerRect = block->markerRect,
+		.contentRect = block->contentRect,
+		.formulaRect = block->formulaRect,
+		.tableRect = block->tableRect,
+		.mediaRect = block->mediaRect,
+		.thumbnailRect = block->thumbnailRect,
+		.markerCenter = block->markerCenter,
+	};
+}
+
+void ClearBlockGeometry(LaidOutBlock *block) {
+	if (!block) {
+		return;
+	}
+	block->outer = QRect();
+	block->headerRect = QRect();
+	block->bodyRect = QRect();
+	block->iconRect = QRect();
+	block->textRect = QRect();
+	block->labelRect = QRect();
+	block->subtitleRect = QRect();
+	block->actionRect = QRect();
+	block->markerRect = QRect();
+	block->contentRect = QRect();
+	block->formulaRect = QRect();
+	block->tableRect = QRect();
+	block->mediaRect = QRect();
+	block->thumbnailRect = QRect();
+	block->visibleFormulaRect = QRect();
+	block->scrollViewportRect = QRect();
+	block->scrollLogicalContentRect = QRect();
+	block->scrollScrollbarTrackRect = QRect();
+	block->scrollScrollbarThumbRect = QRect();
+	block->visibleTableRect = QRect();
+	block->tableScrollbarTrackRect = QRect();
+	block->tableScrollbarThumbRect = QRect();
+	block->visibleMediaRect = QRect();
+	block->markerCenter = QPoint();
+	block->logicalGeometry = {};
+	block->textWidth = 0;
+	block->labelWidth = 0;
+	block->subtitleWidth = 0;
+	block->actionWidth = 0;
+	block->markerWidth = 0;
+	block->firstLineBaseline = -1;
+	block->overflowed = false;
+	block->insideHorizontalScroll = false;
+	block->horizontalScrollMax = 0;
+	block->horizontalScrollAncestorShift = 0;
+}
+
+[[nodiscard]] int RetainedLeafHeight(
+		const Ui::Text::String &leaf,
+		const style::TextStyle &textStyle,
+		int width) {
+	return std::max(
+		leaf.countHeight(width, true),
+		TextLineHeight(textStyle));
+}
+
+[[nodiscard]] bool TextNeedsRetainedLeaf(const QString &text) {
+	for (const auto ch : text) {
+		if (!Ui::Text::IsTrimmed(ch)
+			&& !Ui::Text::IsReplacedBySpace(ch)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] bool MissingRetainedLeaf(
+		const QString &text,
+		const Ui::Text::String &leaf) {
+	return TextNeedsRetainedLeaf(text) && leaf.isEmpty();
+}
+
+struct WidthAnalysisNode {
+	std::vector<WidthAnalysisNode> children;
+	int contentMinimumWidth = 1;
+	int contentPreferredWidth = 1;
+	int outerMinimumWidth = 1;
+	int outerPreferredWidth = 1;
+	int scrollOwnerMinimumWidth = 1;
+	int scrollOwnerOverflowWidth = 1;
+	int scrollViewportMinimumWidth = 1;
+	int outerScrollViewportMinimumWidth = 1;
+	bool ownerEligible = false;
+	bool chosenScrollOwner = false;
+	bool subtreeNeedsScrollOwner = false;
+	bool subtreeHasChildMovingScrollOwner = false;
+	bool subtreeHasScrollOwner = false;
+};
+
+[[nodiscard]] int MaxChildOuterMinimumWidth(
+		const std::vector<WidthAnalysisNode> &children) {
+	auto result = 1;
+	for (const auto &child : children) {
+		result = std::max(result, child.outerMinimumWidth);
+	}
+	return result;
+}
+
+[[nodiscard]] int MaxChildOuterPreferredWidth(
+		const std::vector<WidthAnalysisNode> &children) {
+	auto result = 1;
+	for (const auto &child : children) {
+		result = std::max(result, child.outerPreferredWidth);
+	}
+	return result;
+}
+
+[[nodiscard]] int MaxUnresolvedChildOuterScrollViewportMinimumWidth(
+		const std::vector<WidthAnalysisNode> &children) {
+	auto result = 1;
+	for (const auto &child : children) {
+		if (child.subtreeNeedsScrollOwner) {
+			result = std::max(result, child.outerScrollViewportMinimumWidth);
+		}
+	}
+	return result;
+}
+
+void FinalizeOwnerSelection(
+		WidthAnalysisNode *analysis,
+		int availableWidth,
+		int visibleViewportWidth,
+		bool ownerMovesChildren) {
+	auto childNeedsScrollOwner = false;
+	auto childHasChildMovingScrollOwner = false;
+	auto childHasScrollOwner = false;
+	for (const auto &child : analysis->children) {
+		childNeedsScrollOwner |= child.subtreeNeedsScrollOwner;
+		childHasChildMovingScrollOwner
+			|= child.subtreeHasChildMovingScrollOwner;
+		childHasScrollOwner |= child.subtreeHasScrollOwner;
+	}
+	const auto nodeOverflows = analysis->scrollOwnerOverflowWidth
+		> std::max(availableWidth, 1);
+	const auto subtreeNeedsScrollOwner = childNeedsScrollOwner
+		|| (!childHasChildMovingScrollOwner && nodeOverflows);
+	const auto viewportIsReadable = std::max(visibleViewportWidth, 1)
+		>= std::max(analysis->scrollViewportMinimumWidth, 1);
+	analysis->chosenScrollOwner = subtreeNeedsScrollOwner
+		&& analysis->ownerEligible
+		&& viewportIsReadable;
+	analysis->subtreeNeedsScrollOwner = subtreeNeedsScrollOwner
+		&& !analysis->chosenScrollOwner;
+	analysis->subtreeHasChildMovingScrollOwner
+		= childHasChildMovingScrollOwner
+		|| (analysis->chosenScrollOwner && ownerMovesChildren);
+	analysis->subtreeHasScrollOwner = childHasScrollOwner
+		|| analysis->chosenScrollOwner;
+}
+
+[[nodiscard]] bool AnalysisOwnerMovesChildren(PreparedBlockKind kind) {
+	switch (kind) {
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+	case PreparedBlockKind::Quote:
+	case PreparedBlockKind::EmbedPost:
+	case PreparedBlockKind::Details:
+		return true;
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+	case PreparedBlockKind::CodeBlock:
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::DisplayMath:
+	case PreparedBlockKind::Table:
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::RelatedArticle:
+	case PreparedBlockKind::Placeholder:
+		return false;
+	}
+	return false;
+}
+
+[[nodiscard]] int ReadableScrollViewportMinimumWidth(
+		int contentMaxWidth,
+		const style::Markdown &st) {
+	return std::min(
+		std::max(contentMaxWidth, 1),
+		std::max(st.quoteReadableMinWidth, 1));
+}
+
+[[nodiscard]] int NestedScrollViewportMinimumWidth(
+		LayoutContext context,
+		int contentMaxWidth,
+		const style::Markdown &st) {
+	return (context.quoteDepth > 0 || context.listItemDepth > 0)
+		? ReadableScrollViewportMinimumWidth(contentMaxWidth, st)
+		: 1;
+}
+
+[[nodiscard]] int OrderedMarkerMinimumWidth(
+		const PreparedBlock &prepared,
+		const style::Markdown &st) {
+	return std::max(st.body.font->width(ListMarkerText(prepared)), 1);
+}
+
+[[nodiscard]] int ListItemMarkerMinimumWidth(
+		const PreparedBlock &prepared,
+		const style::Markdown &st) {
+	if (prepared.taskState != TaskState::None) {
+		return std::max(st.list.taskCheck.diameter, 1);
+	} else if (prepared.listKind == ListKind::Ordered) {
+		return OrderedMarkerMinimumWidth(prepared, st);
+	}
+	return std::max(st.list.markerWidth, 1);
+}
+
+[[nodiscard]] QMargins DetailsHeaderPadding(
+		LayoutContext context,
+		const style::Markdown &st) {
+	const auto &details = st.details;
+	return context.useArticleBands
+		? QMargins(
+			st.textPadding.left(),
+			details.headerPadding.top(),
+			st.textPadding.right(),
+			details.headerPadding.bottom())
+		: details.headerPadding;
+}
+
+[[nodiscard]] QString DetailsStateText(bool open) {
+	return open
+		? tr::lng_iv_details_state_expanded(tr::now)
+		: tr::lng_iv_details_state_collapsed(tr::now);
+}
+
+[[nodiscard]] int DetailsStateReserveWidth(const style::Markdown &st) {
+	return std::max({
+		st.details.summaryStyle.font->width(DetailsStateText(false)),
+		st.details.summaryStyle.font->width(DetailsStateText(true)),
+		1,
+	});
+}
+
+[[nodiscard]] QMargins DetailsBodyPadding(
+		LayoutContext context,
+		const style::Markdown &st) {
+	const auto &details = st.details;
+	return context.useArticleBands
+		? QMargins(
+			st.textPadding.left(),
+			details.bodyPadding.top(),
+			st.textPadding.right(),
+			details.bodyPadding.bottom())
+		: details.bodyPadding;
+}
+
+[[nodiscard]] const WidthAnalysisNode *NextActiveScrollOwner(
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner) {
+	return activeScrollOwner
+		? activeScrollOwner
+		: analysis.chosenScrollOwner
+		? &analysis
+		: nullptr;
+}
+
+[[nodiscard]] bool IsActiveScrollOwner(
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner) {
+	return (activeScrollOwner == &analysis);
+}
+
+[[nodiscard]] int LogicalOuterWidth(
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		int logicalWidth) {
+	const auto result = std::max(logicalWidth, 1);
+	return IsActiveScrollOwner(analysis, activeScrollOwner)
+		? std::max(result, analysis.scrollOwnerMinimumWidth)
+		: result;
+}
+
+[[nodiscard]] int ChildLayoutWidth(
+		const WidthAnalysisNode *activeScrollOwner,
+		int visibleWidth,
+		int logicalWidth) {
+	return activeScrollOwner
+		? std::max(logicalWidth, 1)
+		: std::max(visibleWidth, 1);
+}
+
+[[nodiscard]] int ScrollbarReserveHeight(
+		bool scrollOwner,
+		int horizontalScrollMax,
+		const style::Markdown &st) {
+	return (scrollOwner && (horizontalScrollMax > 0))
+		? (st.table.scrollbarSkip + st.table.scrollbarHeight)
+		: 0;
+}
+
+[[nodiscard]] WidthAnalysisNode AnalyzeBlock(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> &formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st,
+	int width,
+	LayoutContext context);
+
+[[nodiscard]] std::vector<WidthAnalysisNode> AnalyzeBlocks(
+		const std::vector<PreparedBlock> &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int width,
+		LayoutContext context) {
+	auto result = std::vector<WidthAnalysisNode>();
+	result.reserve(prepared.size());
+	for (auto i = 0, count = int(prepared.size()); i != count; ++i) {
+		const auto &block = prepared[i];
+		const auto next = NextVisibleBlock(prepared, i);
+		auto blockContext = context;
+		blockContext.preparedPath.push_back(i);
+		auto blockWidth = BlockBandWidth(block.kind, st, width, context);
+		if (IsRelatedArticlesHeader(block, next)) {
+			blockWidth = std::max(
+				width
+					- st.relatedArticle.headerPadding.left()
+					- st.relatedArticle.headerPadding.right(),
+				1);
+		}
+		result.push_back(AnalyzeBlock(
+			block,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			blockWidth,
+			blockContext));
+	}
+	return result;
+}
+
+[[nodiscard]] WidthAnalysisNode AnalyzeBlock(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st,
+		int width,
+		LayoutContext context) {
+	auto analysis = WidthAnalysisNode();
+	const auto availableWidth = std::max(width, 1);
+	auto visibleScrollViewportWidth = availableWidth;
+	switch (prepared.kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+		analysis.contentMinimumWidth = FlowBlockContentMinimumWidth(
+			prepared,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			context);
+		analysis.contentPreferredWidth = FlowBlockPreferredWidth(
+			prepared,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			context);
+		analysis.outerMinimumWidth = analysis.contentMinimumWidth;
+		analysis.outerPreferredWidth = analysis.contentPreferredWidth;
+		analysis.scrollOwnerMinimumWidth = analysis.outerMinimumWidth;
+		analysis.scrollViewportMinimumWidth
+			= NestedScrollViewportMinimumWidth(
+				context,
+				analysis.contentPreferredWidth,
+				st);
+		analysis.outerScrollViewportMinimumWidth = std::max(
+			analysis.outerMinimumWidth,
+			analysis.scrollViewportMinimumWidth);
+		analysis.scrollOwnerOverflowWidth
+			= (analysis.scrollViewportMinimumWidth > 1)
+			? analysis.outerScrollViewportMinimumWidth
+			: analysis.outerMinimumWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerMinimumWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.ownerEligible = !IsAnchorOnlyBlock(prepared);
+		break;
+	case PreparedBlockKind::CodeBlock: {
+		const auto padding = BlockquotePadding(st.code.pre);
+		visibleScrollViewportWidth = availableWidth
+			- HorizontalMarginsWidth(padding);
+		analysis.contentMinimumWidth = CodeBlockMinimumWidth(st);
+		analysis.contentPreferredWidth = CodeBlockPreferredWidth(
+			prepared,
+			st,
+			context);
+		analysis.outerMinimumWidth = analysis.contentMinimumWidth;
+		analysis.outerPreferredWidth = analysis.contentPreferredWidth;
+		analysis.scrollOwnerMinimumWidth = analysis.outerMinimumWidth;
+		const auto contentMaxWidth = std::max(
+			analysis.contentPreferredWidth - HorizontalMarginsWidth(padding),
+			1);
+		analysis.scrollViewportMinimumWidth
+			= NestedScrollViewportMinimumWidth(
+				context,
+				contentMaxWidth,
+				st);
+		analysis.outerScrollViewportMinimumWidth
+			= std::max(
+				HorizontalMarginsWidth(padding)
+					+ analysis.scrollViewportMinimumWidth,
+				analysis.outerPreferredWidth);
+		analysis.scrollOwnerOverflowWidth
+			= (analysis.scrollViewportMinimumWidth > 1)
+			? std::max(
+				analysis.outerMinimumWidth,
+				analysis.outerPreferredWidth)
+			: analysis.outerMinimumWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerMinimumWidth,
+			analysis.outerPreferredWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.ownerEligible = true;
+	} break;
+	case PreparedBlockKind::DisplayMath: {
+		const auto &padding = st.displayMath.padding;
+		visibleScrollViewportWidth = availableWidth
+			- HorizontalMarginsWidth(padding);
+		analysis.contentMinimumWidth = DisplayMathMinimumWidth(
+			prepared,
+			formulas,
+			st);
+		analysis.contentPreferredWidth = DisplayMathPreferredWidth(
+			prepared,
+			formulas,
+			st,
+			context);
+		analysis.outerMinimumWidth = analysis.contentMinimumWidth;
+		analysis.outerPreferredWidth = analysis.contentPreferredWidth;
+		analysis.scrollOwnerMinimumWidth = analysis.outerMinimumWidth;
+		const auto contentMaxWidth = std::max(
+			analysis.contentPreferredWidth - HorizontalMarginsWidth(padding),
+			1);
+		analysis.scrollViewportMinimumWidth
+			= NestedScrollViewportMinimumWidth(
+				context,
+				contentMaxWidth,
+				st);
+		analysis.outerScrollViewportMinimumWidth
+			= std::max(
+				HorizontalMarginsWidth(padding)
+					+ analysis.scrollViewportMinimumWidth,
+				analysis.outerPreferredWidth);
+		analysis.scrollOwnerOverflowWidth
+			= (analysis.scrollViewportMinimumWidth > 1)
+			? std::max(
+				analysis.outerMinimumWidth,
+				analysis.outerPreferredWidth)
+			: analysis.outerMinimumWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerMinimumWidth,
+			analysis.outerPreferredWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.ownerEligible = true;
+	} break;
+	case PreparedBlockKind::Table:
+		analysis.contentMinimumWidth = TableBlockContentMinimumWidth(
+			prepared,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			context);
+		analysis.contentPreferredWidth = analysis.contentMinimumWidth;
+		analysis.outerMinimumWidth = analysis.contentMinimumWidth;
+		analysis.outerPreferredWidth = analysis.contentPreferredWidth;
+		analysis.scrollOwnerMinimumWidth = analysis.outerMinimumWidth;
+		analysis.scrollViewportMinimumWidth
+			= NestedScrollViewportMinimumWidth(
+				context,
+				analysis.contentPreferredWidth,
+				st);
+		analysis.outerScrollViewportMinimumWidth = std::max(
+			analysis.outerMinimumWidth,
+			analysis.scrollViewportMinimumWidth);
+		analysis.scrollOwnerOverflowWidth
+			= (analysis.scrollViewportMinimumWidth > 1)
+			? analysis.outerScrollViewportMinimumWidth
+			: analysis.outerMinimumWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerMinimumWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.ownerEligible = true;
+		break;
+	case PreparedBlockKind::List: {
+		const auto depthDelta = std::max(
+			prepared.visualDepth - context.listDepth,
+			0);
+		const auto overhead = depthDelta * st.textPadding.left()
+			- context.listItemContentShift;
+		const auto childWidth = std::max(availableWidth - overhead, 1);
+		visibleScrollViewportWidth = childWidth;
+		auto childContext = context;
+		childContext.listDepth = prepared.visualDepth;
+		childContext.tightList = false;
+		PrepareNestedContext(&childContext, 0, childWidth);
+		analysis.children = AnalyzeBlocks(
+			prepared.children,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			childWidth,
+			childContext);
+		const auto childRequiredWidth
+			= MaxUnresolvedChildOuterScrollViewportMinimumWidth(
+				analysis.children);
+		const auto childNeedsScrollOwner = (childRequiredWidth > 1);
+		analysis.contentMinimumWidth = MaxChildOuterMinimumWidth(analysis.children);
+		analysis.contentPreferredWidth = MaxChildOuterPreferredWidth(
+			analysis.children);
+		analysis.outerMinimumWidth = overhead + analysis.contentMinimumWidth;
+		analysis.outerPreferredWidth = overhead + analysis.contentPreferredWidth;
+		const auto naturalOverflowWidth = overhead
+			+ analysis.contentMinimumWidth;
+		const auto requiredOverflowWidth = overhead
+			+ std::max(analysis.contentMinimumWidth, childRequiredWidth);
+		analysis.scrollViewportMinimumWidth = childNeedsScrollOwner
+			? ReadableScrollViewportMinimumWidth(
+				analysis.contentPreferredWidth,
+				st)
+			: 1;
+		analysis.outerScrollViewportMinimumWidth = overhead
+			+ (childNeedsScrollOwner ? childRequiredWidth : 1);
+		analysis.scrollOwnerOverflowWidth = childNeedsScrollOwner
+			? requiredOverflowWidth
+			: naturalOverflowWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerOverflowWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.ownerEligible = !prepared.children.empty();
+	} break;
+	case PreparedBlockKind::ListItem: {
+		const auto markerWidth = std::max(
+			st.list.markerWidth,
+			ListItemMarkerMinimumWidth(prepared, st));
+		const auto overhead = markerWidth + st.list.markerSkip;
+		const auto childWidth = std::max(availableWidth - overhead, 1);
+		visibleScrollViewportWidth = childWidth;
+		auto childContext = context;
+		childContext.tightList = false;
+		PrepareNestedContext(&childContext, 0, childWidth);
+		childContext.listItemDepth = context.listItemDepth + 1;
+		childContext.listItemContentShift = overhead;
+		analysis.children = AnalyzeBlocks(
+			prepared.children,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			childWidth,
+			childContext);
+		const auto childRequiredWidth
+			= MaxUnresolvedChildOuterScrollViewportMinimumWidth(
+				analysis.children);
+		const auto childNeedsScrollOwner = (childRequiredWidth > 1);
+		analysis.contentMinimumWidth = MaxChildOuterMinimumWidth(analysis.children);
+		analysis.contentPreferredWidth = MaxChildOuterPreferredWidth(
+			analysis.children);
+		analysis.outerMinimumWidth = overhead + analysis.contentMinimumWidth;
+		analysis.outerPreferredWidth = overhead + analysis.contentPreferredWidth;
+		const auto naturalOverflowWidth = overhead
+			+ analysis.contentMinimumWidth;
+		const auto requiredOverflowWidth = overhead
+			+ std::max(analysis.contentMinimumWidth, childRequiredWidth);
+		analysis.scrollViewportMinimumWidth = childNeedsScrollOwner
+			? ReadableScrollViewportMinimumWidth(
+				analysis.contentPreferredWidth,
+				st)
+			: 1;
+		analysis.outerScrollViewportMinimumWidth = overhead
+			+ (childNeedsScrollOwner ? childRequiredWidth : 1);
+		analysis.scrollOwnerOverflowWidth = childNeedsScrollOwner
+			? requiredOverflowWidth
+			: naturalOverflowWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerOverflowWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.ownerEligible = !prepared.children.empty();
+	} break;
+	case PreparedBlockKind::Quote: {
+		const auto depthDelta = std::max(
+			prepared.visualDepth - context.quoteDepth,
+			0);
+		const auto overhead = depthDelta * st.quoteIndent;
+		const auto padding = prepared.pullquote
+			? st.pullquote.padding
+			: BlockquotePadding(st.body.blockquote);
+		const auto paddingWidth = HorizontalMarginsWidth(padding);
+		auto childWidth = std::max(
+			availableWidth - overhead - paddingWidth,
+			1);
+		if (prepared.pullquote) {
+			childWidth = std::min(childWidth, std::max(st.pullquote.maxWidth, 1));
+		}
+		visibleScrollViewportWidth = childWidth;
+		auto childContext = context;
+		childContext.quoteDepth = prepared.visualDepth + 1;
+		childContext.tightList = false;
+		PrepareNestedContext(&childContext, 0, childWidth);
+		analysis.children = AnalyzeBlocks(
+			prepared.children,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			childWidth,
+			childContext);
+		const auto childRequiredWidth
+			= MaxUnresolvedChildOuterScrollViewportMinimumWidth(
+				analysis.children);
+		const auto childNeedsScrollOwner = (childRequiredWidth > 1);
+		analysis.contentMinimumWidth = MaxChildOuterMinimumWidth(analysis.children);
+		analysis.contentPreferredWidth = MaxChildOuterPreferredWidth(
+			analysis.children);
+		const auto visibleContentWidth = prepared.pullquote
+			? std::min(
+				analysis.contentMinimumWidth,
+				std::max(st.pullquote.maxWidth, 1))
+			: analysis.contentMinimumWidth;
+		const auto visiblePreferredContentWidth = prepared.pullquote
+			? std::min(
+				analysis.contentPreferredWidth,
+				std::max(st.pullquote.maxWidth, 1))
+			: analysis.contentPreferredWidth;
+		analysis.outerMinimumWidth = overhead
+			+ paddingWidth
+			+ visibleContentWidth;
+		analysis.outerPreferredWidth = overhead
+			+ paddingWidth
+			+ visiblePreferredContentWidth;
+		if (prepared.pullquote) {
+			const auto requiredContentWidth = std::max(
+				analysis.contentMinimumWidth,
+				childRequiredWidth);
+			analysis.scrollOwnerOverflowWidth = childNeedsScrollOwner
+				? overhead + paddingWidth + requiredContentWidth
+				: analysis.outerMinimumWidth;
+			analysis.scrollViewportMinimumWidth = childNeedsScrollOwner
+				? ReadableScrollViewportMinimumWidth(
+					analysis.contentPreferredWidth,
+					st)
+				: 1;
+			analysis.outerScrollViewportMinimumWidth = overhead
+				+ paddingWidth
+				+ (childNeedsScrollOwner ? childRequiredWidth : 1);
+			analysis.scrollOwnerMinimumWidth
+				= analysis.scrollOwnerOverflowWidth;
+			if (childNeedsScrollOwner) {
+				analysis.scrollOwnerMinimumWidth = std::max({
+					analysis.scrollOwnerMinimumWidth,
+					analysis.outerScrollViewportMinimumWidth,
+				});
+			}
+		} else {
+			const auto requiredContentWidth = std::max(
+				analysis.contentMinimumWidth,
+				childRequiredWidth);
+			analysis.scrollOwnerOverflowWidth = childNeedsScrollOwner
+				? overhead + paddingWidth + requiredContentWidth
+				: analysis.outerMinimumWidth;
+			analysis.scrollViewportMinimumWidth = childNeedsScrollOwner
+				? ReadableScrollViewportMinimumWidth(
+					analysis.contentPreferredWidth,
+					st)
+				: 1;
+			analysis.outerScrollViewportMinimumWidth = overhead
+				+ paddingWidth
+				+ (childNeedsScrollOwner ? childRequiredWidth : 1);
+			analysis.scrollOwnerMinimumWidth = std::max({
+				analysis.scrollOwnerOverflowWidth,
+				analysis.outerScrollViewportMinimumWidth,
+			});
+		}
+		analysis.ownerEligible = !prepared.children.empty();
+	} break;
+	case PreparedBlockKind::Details: {
+		const auto headerPadding = DetailsHeaderPadding(context, st);
+		const auto bodyPadding = DetailsBodyPadding(context, st);
+		const auto iconWidth = st.details.icon.empty()
+			? 0
+			: TextLineHeight(st.details.summaryStyle);
+		const auto iconSkip = iconWidth ? st.details.iconSkip : 0;
+		const auto actionWidth = context.editMode
+			? DetailsStateReserveWidth(st)
+			: 0;
+		const auto actionSkip = actionWidth ? st.details.stateSkip : 0;
+		const auto headerMinimumWidth = HorizontalMarginsWidth(headerPadding)
+			+ iconWidth
+			+ iconSkip
+			+ actionSkip
+			+ actionWidth
+			+ DetailsSummaryContentMinimumWidth(
+				prepared,
+				formulas,
+				inlineFormulaObjects,
+				mediaRuntime,
+				st,
+				context);
+		const auto bodyPaddingWidth = HorizontalMarginsWidth(bodyPadding);
+		auto bodyMinimumWidth = 1;
+		auto bodyPreferredWidth = 1;
+		auto childRequiredWidth = 1;
+		auto childNeedsScrollOwner = false;
+		if (!prepared.collapsed) {
+			const auto childWidth = std::max(
+				availableWidth - bodyPaddingWidth,
+				1);
+			visibleScrollViewportWidth = childWidth;
+			auto childContext = context;
+			PrepareNestedContext(&childContext, 0, childWidth);
+			analysis.children = AnalyzeBlocks(
+				prepared.children,
+				formulas,
+				inlineFormulaObjects,
+				mediaRuntime,
+				st,
+				childWidth,
+				childContext);
+			childRequiredWidth
+				= MaxUnresolvedChildOuterScrollViewportMinimumWidth(
+					analysis.children);
+			childNeedsScrollOwner = (childRequiredWidth > 1);
+			analysis.contentMinimumWidth = MaxChildOuterMinimumWidth(
+				analysis.children);
+			analysis.contentPreferredWidth = MaxChildOuterPreferredWidth(
+				analysis.children);
+			bodyMinimumWidth = ContainerMinimumWidth(
+				analysis.contentMinimumWidth,
+				bodyPadding);
+			bodyPreferredWidth = std::max(analysis.contentPreferredWidth, 1)
+				+ bodyPaddingWidth;
+			analysis.scrollViewportMinimumWidth = childNeedsScrollOwner
+				? ReadableScrollViewportMinimumWidth(
+					analysis.contentPreferredWidth,
+					st)
+				: 1;
+			analysis.outerScrollViewportMinimumWidth = bodyPaddingWidth
+				+ (childNeedsScrollOwner ? childRequiredWidth : 1);
+			analysis.scrollOwnerMinimumWidth = std::max({
+				bodyMinimumWidth,
+				analysis.outerScrollViewportMinimumWidth,
+			});
+		}
+		analysis.outerMinimumWidth = std::max(
+			headerMinimumWidth,
+			bodyMinimumWidth);
+		analysis.outerPreferredWidth = std::max(
+			headerMinimumWidth,
+			bodyPreferredWidth);
+		analysis.scrollOwnerOverflowWidth
+			= childNeedsScrollOwner
+			? bodyPaddingWidth
+				+ std::max(analysis.contentMinimumWidth, childRequiredWidth)
+			: bodyMinimumWidth;
+		analysis.ownerEligible = !prepared.collapsed
+			&& !prepared.children.empty();
+	} break;
+	case PreparedBlockKind::EmbedPost: {
+		const auto &style = st.embedPost;
+		const auto contentOverhead = style.accentWidth
+			+ style.accentSkip
+			+ style.padding.left()
+			+ style.padding.right();
+		const auto avatarWidth = prepared.embedPost.authorPhotoId
+			? std::max(style.avatarSize, 1)
+			: 0;
+		const auto headerGap = avatarWidth ? style.headerGap : 0;
+		auto headerTextWidth = 1;
+		auto headerTextPreferredWidth = 1;
+		if (!prepared.embedPost.author.isEmpty()) {
+			headerTextWidth = std::max(
+				headerTextWidth,
+				ReadableTextMinWidth(style.authorStyle));
+			headerTextPreferredWidth = std::max(
+				headerTextPreferredWidth,
+				style.authorStyle.font->width(prepared.embedPost.author));
+		}
+		if (!prepared.embedPost.dateText.isEmpty()) {
+			headerTextWidth = std::max(
+				headerTextWidth,
+				ReadableTextMinWidth(style.dateStyle));
+			headerTextPreferredWidth = std::max(
+				headerTextPreferredWidth,
+				style.dateStyle.font->width(prepared.embedPost.dateText));
+		}
+		const auto childWidth = std::max(availableWidth - contentOverhead, 1);
+		visibleScrollViewportWidth = childWidth;
+		auto childContext = context;
+		PrepareNestedContext(&childContext, 0, childWidth);
+		analysis.children = AnalyzeBlocks(
+			prepared.children,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			childWidth,
+			childContext);
+		const auto childRequiredWidth
+			= MaxUnresolvedChildOuterScrollViewportMinimumWidth(
+				analysis.children);
+		const auto childNeedsScrollOwner = (childRequiredWidth > 1);
+		analysis.contentMinimumWidth = MaxChildOuterMinimumWidth(analysis.children);
+		analysis.contentPreferredWidth = MaxChildOuterPreferredWidth(
+			analysis.children);
+		const auto naturalOverflowWidth = contentOverhead
+			+ analysis.contentMinimumWidth;
+		const auto requiredOverflowWidth = contentOverhead
+			+ std::max(analysis.contentMinimumWidth, childRequiredWidth);
+		analysis.scrollViewportMinimumWidth = childNeedsScrollOwner
+			? ReadableScrollViewportMinimumWidth(
+				analysis.contentPreferredWidth,
+				st)
+			: 1;
+		analysis.outerScrollViewportMinimumWidth = contentOverhead
+			+ (childNeedsScrollOwner ? childRequiredWidth : 1);
+		analysis.scrollOwnerOverflowWidth = childNeedsScrollOwner
+			? requiredOverflowWidth
+			: naturalOverflowWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerOverflowWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.outerMinimumWidth = std::max(
+			contentOverhead + avatarWidth + headerGap + headerTextWidth,
+			analysis.scrollOwnerOverflowWidth);
+		analysis.outerPreferredWidth = std::max(
+			contentOverhead + avatarWidth + headerGap + headerTextPreferredWidth,
+			contentOverhead + analysis.contentPreferredWidth);
+		analysis.ownerEligible = !prepared.children.empty();
+	} break;
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::RelatedArticle:
+	case PreparedBlockKind::Placeholder:
+		analysis.contentMinimumWidth = 1;
+		analysis.contentPreferredWidth = analysis.contentMinimumWidth;
+		analysis.outerMinimumWidth = 1;
+		analysis.outerPreferredWidth = analysis.contentPreferredWidth;
+		analysis.scrollOwnerMinimumWidth = analysis.outerMinimumWidth;
+		analysis.ownerEligible = false;
+		break;
+	}
+	FinalizeOwnerSelection(
+		&analysis,
+		availableWidth,
+		visibleScrollViewportWidth,
+		AnalysisOwnerMovesChildren(prepared.kind));
+	return analysis;
+}
+
+[[nodiscard]] const Ui::Text::String &DisplayedLeaf(
+		const LaidOutBlock &block) {
+	return block.placeholderLeaf.isEmpty()
+		? block.leaf
+		: block.placeholderLeaf;
+}
+
+[[nodiscard]] int RetainedLeafMaxWidth(
+		const Ui::Text::String &leaf,
+		int minimum = 1) {
+	return std::max(leaf.maxWidth(), std::max(minimum, 1));
+}
+
+[[nodiscard]] std::optional<WidthAnalysisNode> AnalyzeRetainedBlock(
+	const PreparedBlock &prepared,
+	const LaidOutBlock &block,
+	const std::vector<PreparedFormulaSlot> &formulas,
+	const style::Markdown &st,
+	int width,
+	LayoutContext context);
+
+[[nodiscard]] std::optional<std::vector<WidthAnalysisNode>> AnalyzeRetainedBlocks(
+		const std::vector<PreparedBlock> &prepared,
+		const std::vector<LaidOutBlock> &blocks,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		const style::Markdown &st,
+		int width,
+		LayoutContext context) {
+	if (prepared.size() != blocks.size()) {
+		return std::nullopt;
+	}
+	auto result = std::vector<WidthAnalysisNode>();
+	result.reserve(prepared.size());
+	for (auto i = 0, count = int(prepared.size()); i != count; ++i) {
+		const auto &preparedBlock = prepared[i];
+		const auto &block = blocks[i];
+		if (preparedBlock.kind != block.kind) {
+			return std::nullopt;
+		}
+		const auto next = NextVisibleBlock(prepared, i);
+		auto blockContext = context;
+		blockContext.preparedPath.push_back(i);
+		auto blockWidth = BlockBandWidth(preparedBlock.kind, st, width, context);
+		if (IsRelatedArticlesHeader(preparedBlock, next)) {
+			blockWidth = std::max(
+				width
+					- st.relatedArticle.headerPadding.left()
+					- st.relatedArticle.headerPadding.right(),
+				1);
+		}
+		auto analysis = AnalyzeRetainedBlock(
+			preparedBlock,
+			block,
+			formulas,
+			st,
+			blockWidth,
+			blockContext);
+		if (!analysis) {
+			return std::nullopt;
+		}
+		result.push_back(std::move(*analysis));
+	}
+	return result;
+}
+
+[[nodiscard]] std::optional<WidthAnalysisNode> AnalyzeRetainedBlock(
+		const PreparedBlock &prepared,
+		const LaidOutBlock &block,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		const style::Markdown &st,
+		int width,
+		LayoutContext context) {
+	if (prepared.kind != block.kind) {
+		return std::nullopt;
+	}
+	auto analysis = WidthAnalysisNode();
+	const auto availableWidth = std::max(width, 1);
+	auto visibleScrollViewportWidth = availableWidth;
+	switch (prepared.kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading: {
+		const auto &displayLeaf = DisplayedLeaf(block);
+		analysis.contentMinimumWidth = std::max(
+			FlowBlockMinimumWidth(prepared, st),
+			IsAnchorOnlyBlock(prepared)
+				? 0
+				: LeafMinimumWidth(displayLeaf));
+		analysis.contentPreferredWidth = IsAnchorOnlyBlock(prepared)
+			? 1
+			: RetainedLeafMaxWidth(displayLeaf);
+		analysis.outerMinimumWidth = analysis.contentMinimumWidth;
+		analysis.outerPreferredWidth = analysis.contentPreferredWidth;
+		analysis.scrollOwnerMinimumWidth = analysis.outerMinimumWidth;
+		analysis.scrollViewportMinimumWidth
+			= NestedScrollViewportMinimumWidth(
+				context,
+				analysis.contentPreferredWidth,
+				st);
+		analysis.outerScrollViewportMinimumWidth = std::max(
+			analysis.outerMinimumWidth,
+			analysis.scrollViewportMinimumWidth);
+		analysis.scrollOwnerOverflowWidth
+			= (analysis.scrollViewportMinimumWidth > 1)
+			? analysis.outerScrollViewportMinimumWidth
+			: analysis.outerMinimumWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerMinimumWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.ownerEligible = !IsAnchorOnlyBlock(prepared);
+	} break;
+	case PreparedBlockKind::CodeBlock: {
+		const auto padding = BlockquotePadding(st.code.pre);
+		visibleScrollViewportWidth = availableWidth
+			- HorizontalMarginsWidth(padding);
+		analysis.contentMinimumWidth = CodeBlockMinimumWidth(st);
+		analysis.contentPreferredWidth = HorizontalMarginsWidth(padding)
+			+ RetainedLeafMaxWidth(DisplayedLeaf(block));
+		analysis.outerMinimumWidth = analysis.contentMinimumWidth;
+		analysis.outerPreferredWidth = analysis.contentPreferredWidth;
+		analysis.scrollOwnerMinimumWidth = analysis.outerMinimumWidth;
+		const auto contentMaxWidth = std::max(
+			analysis.contentPreferredWidth - HorizontalMarginsWidth(padding),
+			1);
+		analysis.scrollViewportMinimumWidth
+			= NestedScrollViewportMinimumWidth(
+				context,
+				contentMaxWidth,
+				st);
+		analysis.outerScrollViewportMinimumWidth
+			= std::max(
+				HorizontalMarginsWidth(padding)
+					+ analysis.scrollViewportMinimumWidth,
+				analysis.outerPreferredWidth);
+		analysis.scrollOwnerOverflowWidth
+			= (analysis.scrollViewportMinimumWidth > 1)
+			? std::max(
+				analysis.outerMinimumWidth,
+				analysis.outerPreferredWidth)
+			: analysis.outerMinimumWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerMinimumWidth,
+			analysis.outerPreferredWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.ownerEligible = true;
+	} break;
+	case PreparedBlockKind::DisplayMath: {
+		const auto &padding = st.displayMath.padding;
+		visibleScrollViewportWidth = availableWidth
+			- HorizontalMarginsWidth(padding);
+		if (const auto formula = PreparedFormulaFor(formulas, prepared.formulaIndex);
+			formula && formula->measured.success) {
+			analysis.contentMinimumWidth = HorizontalMarginsWidth(padding)
+				+ std::max(formula->measured.logicalSize.width(), 1);
+			analysis.contentPreferredWidth = analysis.contentMinimumWidth;
+		} else {
+			const auto &fallbackPadding = st.displayMath.fallbackPadding;
+			const auto &displayLeaf = block.placeholderLeaf.isEmpty()
+				? block.fallbackLeaf
+				: block.placeholderLeaf;
+			const auto fallbackWidth = RetainedLeafMaxWidth(
+				displayLeaf,
+				ReadableTextMinWidth(st.displayMath.fallbackStyle));
+			analysis.contentMinimumWidth = HorizontalMarginsWidth(padding)
+				+ HorizontalMarginsWidth(fallbackPadding)
+				+ fallbackWidth;
+			analysis.contentPreferredWidth = analysis.contentMinimumWidth;
+		}
+		analysis.outerMinimumWidth = analysis.contentMinimumWidth;
+		analysis.outerPreferredWidth = analysis.contentPreferredWidth;
+		analysis.scrollOwnerMinimumWidth = analysis.outerMinimumWidth;
+		const auto contentMaxWidth = std::max(
+			analysis.contentPreferredWidth - HorizontalMarginsWidth(padding),
+			1);
+		analysis.scrollViewportMinimumWidth
+			= NestedScrollViewportMinimumWidth(
+				context,
+				contentMaxWidth,
+				st);
+		analysis.outerScrollViewportMinimumWidth
+			= std::max(
+				HorizontalMarginsWidth(padding)
+					+ analysis.scrollViewportMinimumWidth,
+				analysis.outerPreferredWidth);
+		analysis.scrollOwnerOverflowWidth
+			= (analysis.scrollViewportMinimumWidth > 1)
+			? std::max(
+				analysis.outerMinimumWidth,
+				analysis.outerPreferredWidth)
+			: analysis.outerMinimumWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerMinimumWidth,
+			analysis.outerPreferredWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.ownerEligible = true;
+	} break;
+	case PreparedBlockKind::Table:
+		if (prepared.tableRows.size() != block.tableRows.size()) {
+			return std::nullopt;
+		}
+		for (auto rowIndex = 0, rowCount = int(prepared.tableRows.size());
+				rowIndex != rowCount;
+				++rowIndex) {
+			if (prepared.tableRows[rowIndex].cells.size()
+				!= block.tableRows[rowIndex].cells.size()) {
+				return std::nullopt;
+			}
+		}
+		analysis.contentMinimumWidth = RetainedTableBlockMinimumWidth(
+			prepared,
+			block,
+			st);
+		analysis.contentPreferredWidth = analysis.contentMinimumWidth;
+		analysis.outerMinimumWidth = analysis.contentMinimumWidth;
+		analysis.outerPreferredWidth = analysis.contentPreferredWidth;
+		analysis.scrollOwnerMinimumWidth = analysis.outerMinimumWidth;
+		analysis.scrollViewportMinimumWidth
+			= NestedScrollViewportMinimumWidth(
+				context,
+				analysis.contentPreferredWidth,
+				st);
+		analysis.outerScrollViewportMinimumWidth = std::max(
+			analysis.scrollViewportMinimumWidth,
+			analysis.outerPreferredWidth);
+		analysis.scrollOwnerOverflowWidth
+			= (analysis.scrollViewportMinimumWidth > 1)
+			? std::max(
+				analysis.outerMinimumWidth,
+				analysis.outerPreferredWidth)
+			: analysis.outerMinimumWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerMinimumWidth,
+			analysis.outerPreferredWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.ownerEligible = true;
+		break;
+	case PreparedBlockKind::List: {
+		auto childContext = context;
+		const auto depthDelta = std::max(
+			prepared.visualDepth - context.listDepth,
+			0);
+		const auto overhead = depthDelta * st.textPadding.left()
+			- context.listItemContentShift;
+		const auto childWidth = std::max(availableWidth - overhead, 1);
+		visibleScrollViewportWidth = childWidth;
+		childContext.listDepth = prepared.visualDepth;
+		childContext.tightList = false;
+		PrepareNestedContext(&childContext, 0, childWidth);
+		auto children = AnalyzeRetainedBlocks(
+			prepared.children,
+			block.children,
+			formulas,
+			st,
+			childWidth,
+			childContext);
+		if (!children) {
+			return std::nullopt;
+		}
+		analysis.children = std::move(*children);
+		const auto childRequiredWidth
+			= MaxUnresolvedChildOuterScrollViewportMinimumWidth(
+				analysis.children);
+		const auto childNeedsScrollOwner = (childRequiredWidth > 1);
+		analysis.contentMinimumWidth = MaxChildOuterMinimumWidth(analysis.children);
+		analysis.contentPreferredWidth = MaxChildOuterPreferredWidth(
+			analysis.children);
+		analysis.outerMinimumWidth = overhead + analysis.contentMinimumWidth;
+		analysis.outerPreferredWidth = overhead + analysis.contentPreferredWidth;
+		const auto naturalOverflowWidth = overhead
+			+ analysis.contentMinimumWidth;
+		const auto requiredOverflowWidth = overhead
+			+ std::max(analysis.contentMinimumWidth, childRequiredWidth);
+		analysis.scrollViewportMinimumWidth = childNeedsScrollOwner
+			? ReadableScrollViewportMinimumWidth(
+				analysis.contentPreferredWidth,
+				st)
+			: 1;
+		analysis.outerScrollViewportMinimumWidth = overhead
+			+ (childNeedsScrollOwner ? childRequiredWidth : 1);
+		analysis.scrollOwnerOverflowWidth = childNeedsScrollOwner
+			? requiredOverflowWidth
+			: naturalOverflowWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerOverflowWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.ownerEligible = !prepared.children.empty();
+	} break;
+	case PreparedBlockKind::ListItem: {
+		if (prepared.children.size() != block.children.size()) {
+			return std::nullopt;
+		}
+		const auto markerWidth = std::max(
+			st.list.markerWidth,
+			(prepared.taskState != TaskState::None)
+				? st.list.taskCheck.diameter
+				: (!block.marker.isEmpty()
+					? RetainedLeafMaxWidth(block.marker)
+					: ListItemMarkerMinimumWidth(prepared, st)));
+		const auto overhead = markerWidth + st.list.markerSkip;
+		const auto childWidth = std::max(availableWidth - overhead, 1);
+		visibleScrollViewportWidth = childWidth;
+		auto childContext = context;
+		childContext.tightList = false;
+		PrepareNestedContext(&childContext, 0, childWidth);
+		childContext.listItemDepth = context.listItemDepth + 1;
+		childContext.listItemContentShift = overhead;
+		auto children = AnalyzeRetainedBlocks(
+			prepared.children,
+			block.children,
+			formulas,
+			st,
+			childWidth,
+			childContext);
+		if (!children) {
+			return std::nullopt;
+		}
+		analysis.children = std::move(*children);
+		const auto childRequiredWidth
+			= MaxUnresolvedChildOuterScrollViewportMinimumWidth(
+				analysis.children);
+		const auto childNeedsScrollOwner = (childRequiredWidth > 1);
+		analysis.contentMinimumWidth = MaxChildOuterMinimumWidth(analysis.children);
+		analysis.contentPreferredWidth = MaxChildOuterPreferredWidth(
+			analysis.children);
+		analysis.outerMinimumWidth = overhead + analysis.contentMinimumWidth;
+		analysis.outerPreferredWidth = overhead + analysis.contentPreferredWidth;
+		const auto naturalOverflowWidth = overhead
+			+ analysis.contentMinimumWidth;
+		const auto requiredOverflowWidth = overhead
+			+ std::max(analysis.contentMinimumWidth, childRequiredWidth);
+		analysis.scrollViewportMinimumWidth = childNeedsScrollOwner
+			? ReadableScrollViewportMinimumWidth(
+				analysis.contentPreferredWidth,
+				st)
+			: 1;
+		analysis.outerScrollViewportMinimumWidth = overhead
+			+ (childNeedsScrollOwner ? childRequiredWidth : 1);
+		analysis.scrollOwnerOverflowWidth = childNeedsScrollOwner
+			? requiredOverflowWidth
+			: naturalOverflowWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerOverflowWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.ownerEligible = !prepared.children.empty();
+	} break;
+	case PreparedBlockKind::Quote: {
+		const auto depthDelta = std::max(
+			prepared.visualDepth - context.quoteDepth,
+			0);
+		const auto overhead = depthDelta * st.quoteIndent;
+		const auto padding = prepared.pullquote
+			? st.pullquote.padding
+			: BlockquotePadding(st.body.blockquote);
+		const auto paddingWidth = HorizontalMarginsWidth(padding);
+		auto childWidth = std::max(
+			availableWidth - overhead - paddingWidth,
+			1);
+		if (prepared.pullquote) {
+			childWidth = std::min(childWidth, std::max(st.pullquote.maxWidth, 1));
+		}
+		visibleScrollViewportWidth = childWidth;
+		auto childContext = context;
+		childContext.quoteDepth = prepared.visualDepth + 1;
+		childContext.tightList = false;
+		PrepareNestedContext(&childContext, 0, childWidth);
+		auto children = AnalyzeRetainedBlocks(
+			prepared.children,
+			block.children,
+			formulas,
+			st,
+			childWidth,
+			childContext);
+		if (!children) {
+			return std::nullopt;
+		}
+		analysis.children = std::move(*children);
+		const auto childRequiredWidth
+			= MaxUnresolvedChildOuterScrollViewportMinimumWidth(
+				analysis.children);
+		const auto childNeedsScrollOwner = (childRequiredWidth > 1);
+		analysis.contentMinimumWidth = MaxChildOuterMinimumWidth(analysis.children);
+		analysis.contentPreferredWidth = MaxChildOuterPreferredWidth(
+			analysis.children);
+		const auto visibleContentWidth = prepared.pullquote
+			? std::min(
+				analysis.contentMinimumWidth,
+				std::max(st.pullquote.maxWidth, 1))
+			: analysis.contentMinimumWidth;
+		const auto visiblePreferredContentWidth = prepared.pullquote
+			? std::min(
+				analysis.contentPreferredWidth,
+				std::max(st.pullquote.maxWidth, 1))
+			: analysis.contentPreferredWidth;
+		analysis.outerMinimumWidth = overhead
+			+ paddingWidth
+			+ visibleContentWidth;
+		analysis.outerPreferredWidth = overhead
+			+ paddingWidth
+			+ visiblePreferredContentWidth;
+		if (prepared.pullquote) {
+			const auto requiredContentWidth = std::max(
+				analysis.contentMinimumWidth,
+				childRequiredWidth);
+			analysis.scrollOwnerOverflowWidth = childNeedsScrollOwner
+				? overhead + paddingWidth + requiredContentWidth
+				: analysis.outerMinimumWidth;
+			analysis.scrollViewportMinimumWidth = childNeedsScrollOwner
+				? ReadableScrollViewportMinimumWidth(
+					analysis.contentPreferredWidth,
+					st)
+				: 1;
+			analysis.outerScrollViewportMinimumWidth = overhead
+				+ paddingWidth
+				+ (childNeedsScrollOwner ? childRequiredWidth : 1);
+			analysis.scrollOwnerMinimumWidth
+				= analysis.scrollOwnerOverflowWidth;
+			if (childNeedsScrollOwner) {
+				analysis.scrollOwnerMinimumWidth = std::max({
+					analysis.scrollOwnerMinimumWidth,
+					analysis.outerScrollViewportMinimumWidth,
+				});
+			}
+		} else {
+			const auto requiredContentWidth = std::max(
+				analysis.contentMinimumWidth,
+				childRequiredWidth);
+			analysis.scrollOwnerOverflowWidth = childNeedsScrollOwner
+				? overhead + paddingWidth + requiredContentWidth
+				: analysis.outerMinimumWidth;
+			analysis.scrollViewportMinimumWidth = childNeedsScrollOwner
+				? ReadableScrollViewportMinimumWidth(
+					analysis.contentPreferredWidth,
+					st)
+				: 1;
+			analysis.outerScrollViewportMinimumWidth = overhead
+				+ paddingWidth
+				+ (childNeedsScrollOwner ? childRequiredWidth : 1);
+			analysis.scrollOwnerMinimumWidth = std::max({
+				analysis.scrollOwnerOverflowWidth,
+				analysis.outerScrollViewportMinimumWidth,
+			});
+		}
+		analysis.ownerEligible = !prepared.children.empty();
+	} break;
+	case PreparedBlockKind::Details: {
+		const auto headerPadding = DetailsHeaderPadding(context, st);
+		const auto bodyPadding = DetailsBodyPadding(context, st);
+		const auto iconWidth = st.details.icon.empty()
+			? 0
+			: TextLineHeight(st.details.summaryStyle);
+		const auto iconSkip = iconWidth ? st.details.iconSkip : 0;
+		const auto actionWidth = context.editMode
+			? DetailsStateReserveWidth(st)
+			: 0;
+		const auto actionSkip = actionWidth ? st.details.stateSkip : 0;
+		const auto summaryMinimumWidth = std::max(
+			ReadableTextMinWidth(st.details.summaryStyle),
+			LeafMinimumWidth(DisplayedLeaf(block)));
+		const auto headerMinimumWidth = HorizontalMarginsWidth(headerPadding)
+			+ iconWidth
+			+ iconSkip
+			+ actionSkip
+			+ actionWidth
+			+ summaryMinimumWidth;
+		const auto bodyPaddingWidth = HorizontalMarginsWidth(bodyPadding);
+		auto bodyMinimumWidth = 1;
+		auto bodyPreferredWidth = 1;
+		auto childRequiredWidth = 1;
+		auto childNeedsScrollOwner = false;
+		if (prepared.collapsed) {
+			if (!prepared.children.empty() && !block.children.empty()) {
+				return std::nullopt;
+			}
+		} else {
+			const auto childWidth = std::max(
+				availableWidth - bodyPaddingWidth,
+				1);
+			visibleScrollViewportWidth = childWidth;
+			auto childContext = context;
+			PrepareNestedContext(&childContext, 0, childWidth);
+			auto children = AnalyzeRetainedBlocks(
+				prepared.children,
+				block.children,
+				formulas,
+				st,
+				childWidth,
+				childContext);
+			if (!children) {
+				return std::nullopt;
+			}
+			analysis.children = std::move(*children);
+			childRequiredWidth
+				= MaxUnresolvedChildOuterScrollViewportMinimumWidth(
+					analysis.children);
+			childNeedsScrollOwner = (childRequiredWidth > 1);
+			analysis.contentMinimumWidth = MaxChildOuterMinimumWidth(
+				analysis.children);
+			analysis.contentPreferredWidth = MaxChildOuterPreferredWidth(
+				analysis.children);
+			bodyMinimumWidth = ContainerMinimumWidth(
+				analysis.contentMinimumWidth,
+				bodyPadding);
+			bodyPreferredWidth = std::max(analysis.contentPreferredWidth, 1)
+				+ bodyPaddingWidth;
+			analysis.scrollViewportMinimumWidth = childNeedsScrollOwner
+				? ReadableScrollViewportMinimumWidth(
+					analysis.contentPreferredWidth,
+					st)
+				: 1;
+			analysis.outerScrollViewportMinimumWidth = bodyPaddingWidth
+				+ (childNeedsScrollOwner ? childRequiredWidth : 1);
+			analysis.scrollOwnerMinimumWidth = std::max({
+				bodyMinimumWidth,
+				analysis.outerScrollViewportMinimumWidth,
+			});
+		}
+		analysis.outerMinimumWidth = std::max(
+			headerMinimumWidth,
+			bodyMinimumWidth);
+		analysis.outerPreferredWidth = std::max(
+			headerMinimumWidth,
+			bodyPreferredWidth);
+		analysis.scrollOwnerOverflowWidth
+			= childNeedsScrollOwner
+			? bodyPaddingWidth
+				+ std::max(analysis.contentMinimumWidth, childRequiredWidth)
+			: bodyMinimumWidth;
+		analysis.ownerEligible = !prepared.collapsed
+			&& !prepared.children.empty();
+	} break;
+	case PreparedBlockKind::EmbedPost: {
+		const auto &style = st.embedPost;
+		const auto contentOverhead = style.accentWidth
+			+ style.accentSkip
+			+ style.padding.left()
+			+ style.padding.right();
+		const auto avatarWidth = prepared.embedPost.authorPhotoId
+			? std::max(style.avatarSize, 1)
+			: 0;
+		const auto headerGap = avatarWidth ? style.headerGap : 0;
+		auto headerTextWidth = 1;
+		auto headerTextPreferredWidth = 1;
+		if (!block.labelLeaf.isEmpty()) {
+			headerTextWidth = std::max(
+				headerTextWidth,
+				ReadableTextMinWidth(style.authorStyle));
+			headerTextPreferredWidth = std::max(
+				headerTextPreferredWidth,
+				RetainedLeafMaxWidth(block.labelLeaf));
+		}
+		if (!block.subtitleLeaf.isEmpty()) {
+			headerTextWidth = std::max(
+				headerTextWidth,
+				ReadableTextMinWidth(style.dateStyle));
+			headerTextPreferredWidth = std::max(
+				headerTextPreferredWidth,
+				RetainedLeafMaxWidth(block.subtitleLeaf));
+		}
+		const auto childWidth = std::max(availableWidth - contentOverhead, 1);
+		visibleScrollViewportWidth = childWidth;
+		auto childContext = context;
+		PrepareNestedContext(&childContext, 0, childWidth);
+		auto children = AnalyzeRetainedBlocks(
+			prepared.children,
+			block.children,
+			formulas,
+			st,
+			childWidth,
+			childContext);
+		if (!children) {
+			return std::nullopt;
+		}
+		analysis.children = std::move(*children);
+		const auto childRequiredWidth
+			= MaxUnresolvedChildOuterScrollViewportMinimumWidth(
+				analysis.children);
+		const auto childNeedsScrollOwner = (childRequiredWidth > 1);
+		analysis.contentMinimumWidth = MaxChildOuterMinimumWidth(analysis.children);
+		analysis.contentPreferredWidth = MaxChildOuterPreferredWidth(
+			analysis.children);
+		const auto naturalOverflowWidth = contentOverhead
+			+ analysis.contentMinimumWidth;
+		const auto requiredOverflowWidth = contentOverhead
+			+ std::max(analysis.contentMinimumWidth, childRequiredWidth);
+		analysis.scrollViewportMinimumWidth = childNeedsScrollOwner
+			? ReadableScrollViewportMinimumWidth(
+				analysis.contentPreferredWidth,
+				st)
+			: 1;
+		analysis.outerScrollViewportMinimumWidth = contentOverhead
+			+ (childNeedsScrollOwner ? childRequiredWidth : 1);
+		analysis.scrollOwnerOverflowWidth = childNeedsScrollOwner
+			? requiredOverflowWidth
+			: naturalOverflowWidth;
+		analysis.scrollOwnerMinimumWidth = std::max({
+			analysis.scrollOwnerOverflowWidth,
+			analysis.outerScrollViewportMinimumWidth,
+		});
+		analysis.outerMinimumWidth = std::max(
+			contentOverhead + avatarWidth + headerGap + headerTextWidth,
+			analysis.scrollOwnerOverflowWidth);
+		analysis.outerPreferredWidth = std::max(
+			contentOverhead + avatarWidth + headerGap + headerTextPreferredWidth,
+			contentOverhead + analysis.contentPreferredWidth);
+		analysis.ownerEligible = !prepared.children.empty();
+	} break;
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::RelatedArticle:
+	case PreparedBlockKind::Placeholder:
+		analysis.contentMinimumWidth = 1;
+		analysis.contentPreferredWidth = analysis.contentMinimumWidth;
+		analysis.outerMinimumWidth = 1;
+		analysis.outerPreferredWidth = analysis.contentPreferredWidth;
+		analysis.scrollOwnerMinimumWidth = analysis.outerMinimumWidth;
+		analysis.ownerEligible = false;
+		break;
+	}
+	FinalizeOwnerSelection(
+		&analysis,
+		availableWidth,
+		visibleScrollViewportWidth,
+		AnalysisOwnerMovesChildren(prepared.kind));
+	return analysis;
+}
+
+[[nodiscard]] LaidOutBlock LayoutBlock(
+	const PreparedBlock &prepared,
+	std::vector<PreparedFormulaSlot> *formulas,
+	std::vector<RenderedFormula> *renderedFormulas,
+	MathRenderer *renderer,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const WidthAnalysisNode &analysis,
+	const WidthAnalysisNode *activeScrollOwner,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	LayoutContext context);
+
+[[nodiscard]] int LayoutBlocks(
+		const std::vector<PreparedBlock> &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		std::vector<LaidOutBlock> *blocks,
+		const std::vector<WidthAnalysisNode> &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context);
+
+using LayoutNestedBlocksCallback = std::function<std::optional<int>(
+	const std::vector<PreparedBlock> &prepared,
+	std::vector<LaidOutBlock> *blocks,
+	const std::vector<WidthAnalysisNode> &analysis,
+	const WidthAnalysisNode *activeScrollOwner,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	LayoutContext context)>;
+using LayoutListChildCallback = std::function<std::optional<int>(
+	int index,
+	const WidthAnalysisNode *activeScrollOwner,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	LayoutContext context,
+	bool tight)>;
+
+[[nodiscard]] LayoutNestedBlocksCallback FreshNestedBlocksCallback(
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st) {
+	return [
+		formulas,
+		renderedFormulas,
+		renderer,
+		inlineFormulaObjects,
+		mediaRuntime,
+		&st
+	](const std::vector<PreparedBlock> &prepared,
+			std::vector<LaidOutBlock> *blocks,
+			const std::vector<WidthAnalysisNode> &analysis,
+			const WidthAnalysisNode *activeScrollOwner,
+			int left,
+			int top,
+			int width,
+			int logicalWidth,
+			LayoutContext context) -> std::optional<int> {
+		if (!blocks) {
+			return std::nullopt;
+		}
+		blocks->clear();
+		return LayoutBlocks(
+			prepared,
+			formulas,
+			renderedFormulas,
+			renderer,
+			inlineFormulaObjects,
+			mediaRuntime,
+			blocks,
+			analysis,
+			activeScrollOwner,
+			st,
+			left,
+			top,
+			width,
+			logicalWidth,
+			context);
+	};
+}
+
+[[nodiscard]] std::optional<int> LayoutListItemBlockGeometry(
+	const PreparedBlock &prepared,
+	LaidOutBlock *block,
+	const WidthAnalysisNode &analysis,
+	const WidthAnalysisNode *activeScrollOwner,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	LayoutContext context,
+	bool tight,
+	const LayoutNestedBlocksCallback &layoutNestedBlocks);
+[[nodiscard]] std::optional<int> LayoutListBlockGeometry(
+	const PreparedBlock &prepared,
+	LaidOutBlock *block,
+	const WidthAnalysisNode &analysis,
+	const WidthAnalysisNode *activeScrollOwner,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	LayoutContext context,
+	const LayoutListChildCallback &layoutChild);
+[[nodiscard]] std::optional<int> LayoutQuoteBlockGeometry(
+	const PreparedBlock &prepared,
+	LaidOutBlock *block,
+	const WidthAnalysisNode &analysis,
+	const WidthAnalysisNode *activeScrollOwner,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	LayoutContext context,
+	const LayoutNestedBlocksCallback &layoutNestedBlocks);
+[[nodiscard]] std::optional<int> LayoutDetailsBlockGeometry(
+	const PreparedBlock &prepared,
+	LaidOutBlock *block,
+	const WidthAnalysisNode &analysis,
+	const WidthAnalysisNode *activeScrollOwner,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	LayoutContext context,
+	const LayoutNestedBlocksCallback &layoutNestedBlocks);
+[[nodiscard]] std::optional<int> LayoutEmbedPostBlockGeometry(
+	const PreparedBlock &prepared,
+	LaidOutBlock *block,
+	const WidthAnalysisNode &analysis,
+	const WidthAnalysisNode *activeScrollOwner,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	LayoutContext context,
+	const LayoutNestedBlocksCallback &layoutNestedBlocks);
+
+[[nodiscard]] LaidOutBlock LayoutListItemBlock(
+		const PreparedBlock &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context,
+		bool tight) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::ListItem;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.supplementary = prepared.supplementary;
+	block.listKind = prepared.listKind;
+	block.listDelimiter = prepared.listDelimiter;
+	block.taskState = prepared.taskState;
+	block.orderedNumber = prepared.orderedNumber;
+
+	const auto task = (prepared.taskState != TaskState::None);
+	const auto ordered = !task && (prepared.listKind == ListKind::Ordered);
+	const auto markerText = ordered ? ListMarkerText(prepared) : QString();
+	if (task
+		&& prepared.editListItem
+		&& context.taskMarkerRippleRuntimeFactory) {
+		block.taskMarkerRippleRuntime
+			= context.taskMarkerRippleRuntimeFactory(*prepared.editListItem);
+	}
+	if (ordered) {
+		BuildOrReusePlainTextLeaf(
+			&block.marker,
+			CachedTextLeafSlot::Marker,
+			prepared,
+			st.body,
+			markerText,
+			PlainTextMinResizeWidth(st.body),
+			context);
+	}
+	const auto bottom = LayoutListItemBlockGeometry(
+		prepared,
+		&block,
+		analysis,
+		activeScrollOwner,
+		st,
+		left,
+		top,
+		width,
+		logicalWidth,
+		context,
+		tight,
+		FreshNestedBlocksCallback(
+			formulas,
+			renderedFormulas,
+			renderer,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st));
+	Expects(bottom.has_value());
+	return block;
+}
+
+[[nodiscard]] LaidOutBlock LayoutListBlock(
+		const PreparedBlock &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::List;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.listKind = prepared.listKind;
+	block.listDelimiter = prepared.listDelimiter;
+	const auto layoutChild = [&](int index,
+			const WidthAnalysisNode *childActiveScrollOwner,
+			int childLeft,
+			int childTop,
+			int childWidth,
+			int childLogicalWidth,
+			LayoutContext childContext,
+			bool tight) -> std::optional<int> {
+		const auto &child = prepared.children[index];
+		auto laidOut = (child.kind == PreparedBlockKind::ListItem)
+			? LayoutListItemBlock(
+				child,
+				formulas,
+				renderedFormulas,
+				renderer,
+				inlineFormulaObjects,
+				mediaRuntime,
+				analysis.children[index],
+				childActiveScrollOwner,
+				st,
+				childLeft,
+				childTop,
+				childWidth,
+				childLogicalWidth,
+				childContext,
+				tight)
+			: LayoutBlock(
+				child,
+				formulas,
+				renderedFormulas,
+				renderer,
+				inlineFormulaObjects,
+				mediaRuntime,
+				analysis.children[index],
+				childActiveScrollOwner,
+				st,
+				childLeft,
+				childTop,
+				childWidth,
+				childLogicalWidth,
+				childContext);
+		const auto bottom = BlockBottom(laidOut);
+		block.children.push_back(std::move(laidOut));
+		return bottom;
+	};
+	const auto bottom = LayoutListBlockGeometry(
+		prepared,
+		&block,
+		analysis,
+		activeScrollOwner,
+		st,
+		left,
+		top,
+		width,
+		logicalWidth,
+		context,
+		layoutChild);
+	Expects(bottom.has_value());
+	return block;
+}
+
+
+[[nodiscard]] LaidOutBlock LayoutQuoteBlock(
+		const PreparedBlock &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::Quote;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.pullquote = prepared.pullquote;
+	const auto bottom = LayoutQuoteBlockGeometry(
+		prepared,
+		&block,
+		analysis,
+		activeScrollOwner,
+		st,
+		left,
+		top,
+		width,
+		logicalWidth,
+		context,
+		FreshNestedBlocksCallback(
+			formulas,
+			renderedFormulas,
+			renderer,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st));
+	Expects(bottom.has_value());
+	return block;
+}
+
+[[nodiscard]] LaidOutBlock LayoutDetailsBlock(
+		const PreparedBlock &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::Details;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.collapsed = prepared.collapsed;
+	block.detailsOpen = prepared.detailsOpen;
+	block.supplementary = prepared.supplementary;
+	const auto &details = st.details;
+	BuildOrReuseMarkedTextLeaf(
+		&block.leaf,
+		CachedTextLeafSlot::Leaf,
+		prepared,
+		details.summaryStyle,
+		st,
+		prepared.text,
+		prepared.links,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		FlowTextMinResizeWidth(details.summaryStyle),
+		context);
+	const auto usePlaceholder = prepared.text.text.isEmpty()
+		&& !prepared.editPlaceholderText.isEmpty();
+	if (usePlaceholder) {
+		BuildOrReuseEditPlaceholderLeaf(
+			&block.placeholderText,
+			&block.placeholderLeaf,
+			prepared,
+			prepared.editPlaceholderText,
+			details.summaryStyle,
+			PlainTextMinResizeWidth(details.summaryStyle),
+			context);
+	}
+	if (context.editMode) {
+		BuildOrReusePlainTextLeaf(
+			&block.actionLeaf,
+			CachedTextLeafSlot::Action,
+			prepared,
+			details.summaryStyle,
+			DetailsStateText(prepared.detailsOpen),
+			PlainTextMinResizeWidth(details.summaryStyle),
+			context);
+	}
+	const auto bottom = LayoutDetailsBlockGeometry(
+		prepared,
+		&block,
+		analysis,
+		activeScrollOwner,
+		st,
+		left,
+		top,
+		width,
+		logicalWidth,
+		context,
+		FreshNestedBlocksCallback(
+			formulas,
+			renderedFormulas,
+			renderer,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st));
+	Expects(bottom.has_value());
+	return block;
+}
+
+[[nodiscard]] LaidOutBlock LayoutEmbedPostBlock(
+		const PreparedBlock &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context) {
+	auto block = LaidOutBlock();
+	ApplyPreparedEditSources(&block, prepared);
+	block.kind = PreparedBlockKind::EmbedPost;
+	block.anchorId = prepared.anchorId;
+	block.anchorIds = prepared.anchorIds;
+	block.supplementary = prepared.supplementary;
+	block.thumbnailPhotoId = prepared.embedPost.authorPhotoId;
+	if (prepared.embedPost.authorPhotoId && mediaRuntime) {
+		block.photoRuntime = mediaRuntime->resolvePhoto(
+			prepared.embedPost.authorPhotoId);
+	}
+
+	const auto &style = st.embedPost;
+	if (!prepared.embedPost.author.isEmpty()) {
+		BuildOrReusePlainTextLeaf(
+			&block.labelLeaf,
+			CachedTextLeafSlot::Label,
+			prepared,
+			style.authorStyle,
+			prepared.embedPost.author,
+			PlainTextMinResizeWidth(style.authorStyle),
+			context);
+	}
+	if (!prepared.embedPost.dateText.isEmpty()) {
+		BuildOrReusePlainTextLeaf(
+			&block.subtitleLeaf,
+			CachedTextLeafSlot::Subtitle,
+			prepared,
+			style.dateStyle,
+			prepared.embedPost.dateText,
+			PlainTextMinResizeWidth(style.dateStyle),
+			context);
+	}
+	FillMediaCaptionContent(
+		&block,
+		prepared,
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		st,
+		context);
+	const auto bottom = LayoutEmbedPostBlockGeometry(
+		prepared,
+		&block,
+		analysis,
+		activeScrollOwner,
+		st,
+		left,
+		top,
+		width,
+		logicalWidth,
+		context,
+		FreshNestedBlocksCallback(
+			formulas,
+			renderedFormulas,
+			renderer,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st));
+	Expects(bottom.has_value());
+	return block;
+}
+
+[[nodiscard]] LaidOutBlock LayoutBlock(
+		const PreparedBlock &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context) {
+	const auto currentScrollOwner = NextActiveScrollOwner(
+		analysis,
+		activeScrollOwner);
+	const auto scrollOwner = IsActiveScrollOwner(analysis, currentScrollOwner);
+	const auto effectiveLogicalWidth = LogicalOuterWidth(
+		analysis,
+		currentScrollOwner,
+		logicalWidth);
+	switch (prepared.kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+		return LayoutFlowBlock(
+			prepared,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			scrollOwner,
+			context);
+	case PreparedBlockKind::CodeBlock:
+		return LayoutCodeBlock(
+			prepared,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			scrollOwner,
+			context.allowAsyncSyntaxHighlighting,
+			context.syntaxHighlightTracker,
+			context);
+	case PreparedBlockKind::Rule:
+		return LayoutRuleBlock(prepared, st, left, top, width);
+	case PreparedBlockKind::List:
+		return LayoutListBlock(
+			prepared,
+			formulas,
+			renderedFormulas,
+			renderer,
+			inlineFormulaObjects,
+			mediaRuntime,
+			analysis,
+			currentScrollOwner,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			context);
+	case PreparedBlockKind::ListItem:
+		return LayoutListItemBlock(
+			prepared,
+			formulas,
+			renderedFormulas,
+			renderer,
+			inlineFormulaObjects,
+			mediaRuntime,
+			analysis,
+			currentScrollOwner,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			context,
+			false);
+	case PreparedBlockKind::Quote:
+		return LayoutQuoteBlock(
+			prepared,
+			formulas,
+			renderedFormulas,
+			renderer,
+			inlineFormulaObjects,
+			mediaRuntime,
+			analysis,
+			currentScrollOwner,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			context);
+	case PreparedBlockKind::DisplayMath:
+		return LayoutDisplayMathBlock(
+			prepared,
+			*formulas,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			scrollOwner,
+			context);
+	case PreparedBlockKind::Table:
+		return LayoutTableBlock(
+			prepared,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			scrollOwner,
+			context);
+	case PreparedBlockKind::Photo:
+		return LayoutPhotoBlock(
+			prepared,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			left,
+			top,
+			width,
+			context);
+	case PreparedBlockKind::Video:
+		return LayoutVideoBlock(
+			prepared,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			left,
+			top,
+			width,
+			context);
+	case PreparedBlockKind::Audio:
+		return LayoutAudioBlock(
+			prepared,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			left,
+			top,
+			width,
+			context);
+	case PreparedBlockKind::Map:
+		return LayoutMapBlock(
+			prepared,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			left,
+			top,
+			width,
+			context);
+	case PreparedBlockKind::Channel:
+		return LayoutChannelBlock(
+			prepared,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			left,
+			top,
+			width,
+			context);
+	case PreparedBlockKind::GroupedMedia:
+		return LayoutGroupedMediaBlock(
+			prepared,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			left,
+			top,
+			width,
+			context);
+	case PreparedBlockKind::RelatedArticle:
+		return LayoutRelatedArticleBlock(
+			prepared,
+			st,
+			left,
+			top,
+			width,
+			mediaRuntime,
+			context);
+	case PreparedBlockKind::Placeholder:
+		return LayoutPlaceholderBlock(
+			prepared,
+			formulas,
+			inlineFormulaObjects,
+			mediaRuntime,
+			st,
+			left,
+			top,
+			width,
+			context);
+	case PreparedBlockKind::Details:
+		return LayoutDetailsBlock(
+			prepared,
+			formulas,
+			renderedFormulas,
+			renderer,
+			inlineFormulaObjects,
+			mediaRuntime,
+			analysis,
+			currentScrollOwner,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			context);
+	case PreparedBlockKind::EmbedPost:
+		return LayoutEmbedPostBlock(
+			prepared,
+			formulas,
+			renderedFormulas,
+			renderer,
+			inlineFormulaObjects,
+			mediaRuntime,
+			analysis,
+			currentScrollOwner,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			context);
+	}
+	Unexpected("Unknown markdown article block kind.");
+}
+
+int LayoutBlocks(
+		const std::vector<PreparedBlock> &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		std::vector<LaidOutBlock> *blocks,
+		const std::vector<WidthAnalysisNode> &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context) {
+	auto y = top;
+	auto previous = static_cast<const PreparedBlock*>(nullptr);
+	for (auto i = 0, count = int(prepared.size()); i != count; ++i) {
+		const auto &block = prepared[i];
+		const auto anchorOnly = IsAnchorOnlyBlock(block);
+		const auto next = NextVisibleBlock(prepared, i);
+		auto blockContext = context;
+		blockContext.preparedPath.push_back(i);
+		if (previous && !anchorOnly) {
+			y += BlockSkip(*previous, block, context, st);
+		}
+		const auto band = BlockBand(
+			block.kind,
+			st,
+			left,
+			std::max(width, 1),
+			context);
+		const auto logicalBandWidth = BlockBandWidth(
+			block.kind,
+			st,
+			logicalWidth,
+			context);
+		auto laidOut = IsRelatedArticlesHeader(block, next)
+			? LayoutFlowBlock(
+				block,
+				formulas,
+				inlineFormulaObjects,
+				mediaRuntime,
+				st,
+				left + st.relatedArticle.headerPadding.left(),
+				y + st.relatedArticle.headerPadding.top(),
+				std::max(
+					width
+						- st.relatedArticle.headerPadding.left()
+						- st.relatedArticle.headerPadding.right(),
+					1),
+				std::max(
+					logicalWidth
+						- st.relatedArticle.headerPadding.left()
+						- st.relatedArticle.headerPadding.right(),
+					1),
+				false,
+				blockContext)
+			: LayoutBlock(
+				block,
+				formulas,
+				renderedFormulas,
+				renderer,
+				inlineFormulaObjects,
+				mediaRuntime,
+				analysis[i],
+				activeScrollOwner,
+				st,
+				band.x(),
+				y,
+				band.width(),
+				logicalBandWidth,
+				blockContext);
+		if (IsRelatedArticlesHeader(block, next)) {
+			laidOut.headerRect = QRect(
+				left,
+				y,
+				std::max(width, 1),
+				laidOut.outer.height()
+					+ st.relatedArticle.headerPadding.top()
+					+ st.relatedArticle.headerPadding.bottom());
+			laidOut.outer = laidOut.headerRect;
+			laidOut.contentRect = laidOut.headerRect;
+			RefreshLogicalGeometry(&laidOut);
+		}
+		y = BlockBottom(laidOut);
+		blocks->push_back(std::move(laidOut));
+		if (!anchorOnly) {
+			previous = &block;
+		}
+	}
+	return y;
+}
+
+[[nodiscard]] std::optional<int> RecountBlockInPlace(
+	const PreparedBlock &prepared,
+	const std::vector<PreparedFormulaSlot> &formulas,
+	LaidOutBlock *block,
+	const WidthAnalysisNode &analysis,
+	const WidthAnalysisNode *activeScrollOwner,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	int logicalWidth,
+	LayoutContext context);
+
+[[nodiscard]] std::optional<int> RecountBlocksInPlace(
+		const std::vector<PreparedBlock> &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		std::vector<LaidOutBlock> *blocks,
+		const std::vector<WidthAnalysisNode> &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context);
+
+[[nodiscard]] LayoutNestedBlocksCallback RetainedNestedBlocksCallback(
+		const std::vector<PreparedFormulaSlot> &formulas,
+		const style::Markdown &st) {
+	return [
+		&formulas,
+		&st
+	](const std::vector<PreparedBlock> &prepared,
+			std::vector<LaidOutBlock> *blocks,
+			const std::vector<WidthAnalysisNode> &analysis,
+			const WidthAnalysisNode *activeScrollOwner,
+			int left,
+			int top,
+			int width,
+			int logicalWidth,
+			LayoutContext context) -> std::optional<int> {
+		return RecountBlocksInPlace(
+			prepared,
+			formulas,
+			blocks,
+			analysis,
+			activeScrollOwner,
+			st,
+			left,
+			top,
+			width,
+			logicalWidth,
+			context);
+	};
+}
+
+[[nodiscard]] std::optional<int> LayoutListItemBlockGeometry(
+		const PreparedBlock &prepared,
+		LaidOutBlock *block,
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context,
+		bool tight,
+		const LayoutNestedBlocksCallback &layoutNestedBlocks) {
+	if (!block) {
+		return std::nullopt;
+	}
+	const auto &list = st.list;
+	const auto bodyLineHeight = TextLineHeight(st.body);
+	const auto task = (prepared.taskState != TaskState::None);
+	const auto ordered = !task && (prepared.listKind == ListKind::Ordered);
+	auto markerTextWidth = 0;
+	auto markerTextHeight = bodyLineHeight;
+	if (ordered && block->marker.isEmpty()) {
+		return std::nullopt;
+	}
+	if (task) {
+		markerTextWidth = list.taskCheck.diameter;
+		markerTextHeight = list.taskCheck.diameter;
+	} else if (ordered) {
+		markerTextWidth = std::max(block->marker.maxWidth(), 1);
+		markerTextHeight = std::max(
+			block->marker.countHeight(markerTextWidth, true),
+			bodyLineHeight);
+	}
+	ClearBlockGeometry(block);
+	const auto currentScrollOwner = NextActiveScrollOwner(
+		analysis,
+		activeScrollOwner);
+	const auto scrollOwner = IsActiveScrollOwner(analysis, currentScrollOwner);
+	const auto outerLogicalWidth = LogicalOuterWidth(
+		analysis,
+		currentScrollOwner,
+		logicalWidth);
+	block->markerWidth = std::max(list.markerWidth, markerTextWidth);
+	const auto bodyLeft = left + block->markerWidth + list.markerSkip;
+	const auto bodyWidth = std::max(
+		width - block->markerWidth - list.markerSkip,
+		1);
+	const auto bodyLogicalWidth = std::max(
+		outerLogicalWidth - block->markerWidth - list.markerSkip,
+		1);
+	const auto childActiveScrollOwner = currentScrollOwner;
+	const auto bodyLayoutWidth = ChildLayoutWidth(
+		childActiveScrollOwner,
+		bodyWidth,
+		bodyLogicalWidth);
+	auto childContext = context;
+	childContext.tightList = tight;
+	PrepareNestedContext(&childContext, bodyLeft, bodyLayoutWidth);
+	childContext.listItemDepth = context.listItemDepth + 1;
+	childContext.listItemContentShift = block->markerWidth + list.markerSkip;
+	const auto childBottom = layoutNestedBlocks(
+		prepared.children,
+		&block->children,
+		analysis.children,
+		childActiveScrollOwner,
+		bodyLeft,
+		top,
+		bodyLayoutWidth,
+		bodyLogicalWidth,
+		childContext);
+	if (!childBottom) {
+		return std::nullopt;
+	}
+	const auto markerBaseline = [&] {
+		for (const auto &child : block->children) {
+			if (child.outer.height() <= 0) {
+				continue;
+			}
+			return ResolveFirstDisplayedLineBaseline(child, st);
+		}
+		return MarkdownBodyBaseline(top, st);
+	}();
+	const auto contentHeight = *childBottom - top;
+	const auto rowHeight = std::max({
+		contentHeight,
+		markerTextHeight,
+		bodyLineHeight,
+	});
+	const auto markerTop = top + std::max(
+		(bodyLineHeight - markerTextHeight) / 2,
+		0);
+	if (task) {
+		block->markerRect = QRect(
+			left,
+			markerTop,
+			list.taskCheck.diameter,
+			list.taskCheck.diameter);
+	} else if (ordered) {
+		const auto markerLeft = left + block->markerWidth - markerTextWidth;
+		const auto markerLeafBaseline = LeafFirstLineBaseline(
+			block->marker,
+			QRect(0, 0, markerTextWidth, markerTextHeight),
+			st.body);
+		block->markerRect = QRect(
+			markerLeft,
+			markerBaseline - markerLeafBaseline,
+			markerTextWidth,
+			markerTextHeight);
+	} else {
+		block->markerCenter = BulletMarkerCenter(left, markerBaseline, st);
+	}
+	block->contentRect = QRect(bodyLeft, top, bodyWidth, rowHeight);
+	block->horizontalScrollMax = scrollOwner
+		? std::max(bodyLogicalWidth - bodyWidth, 0)
+		: 0;
+	if (scrollOwner) {
+		block->scrollViewportRect = block->contentRect;
+		block->scrollLogicalContentRect = QRect(
+			bodyLeft,
+			top,
+			bodyLogicalWidth,
+			rowHeight);
+		if (block->horizontalScrollMax > 0) {
+			block->scrollScrollbarTrackRect = QRect(
+				bodyLeft,
+				top + rowHeight + st.table.scrollbarSkip,
+				bodyWidth,
+				st.table.scrollbarHeight);
+		}
+	}
+	block->outer = QRect(
+		left,
+		top,
+		std::max(width, 1),
+		rowHeight + ScrollbarReserveHeight(
+			scrollOwner,
+			block->horizontalScrollMax,
+			st));
+	block->firstLineBaseline = markerBaseline;
+	RefreshLogicalGeometry(block);
+	return BlockBottom(*block);
+}
+
+[[nodiscard]] std::optional<int> LayoutListBlockGeometry(
+		const PreparedBlock &prepared,
+		LaidOutBlock *block,
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context,
+		const LayoutListChildCallback &layoutChild) {
+	if (!block) {
+		return std::nullopt;
+	}
+	ClearBlockGeometry(block);
+	const auto depthDelta = std::max(prepared.visualDepth - context.listDepth, 0);
+	const auto indent = depthDelta * st.textPadding.left()
+		- context.listItemContentShift;
+	const auto listLeft = left + indent;
+	const auto listWidth = std::max(width - indent, 1);
+	const auto currentScrollOwner = NextActiveScrollOwner(
+		analysis,
+		activeScrollOwner);
+	const auto scrollOwner = IsActiveScrollOwner(analysis, currentScrollOwner);
+	const auto outerLogicalWidth = LogicalOuterWidth(
+		analysis,
+		currentScrollOwner,
+		logicalWidth);
+	const auto listLogicalWidth = std::max(outerLogicalWidth - indent, 1);
+	const auto childActiveScrollOwner = currentScrollOwner;
+	const auto listLayoutWidth = ChildLayoutWidth(
+		childActiveScrollOwner,
+		listWidth,
+		listLogicalWidth);
+	auto childContext = context;
+	childContext.listDepth = prepared.visualDepth;
+	childContext.tightList = false;
+	PrepareNestedContext(&childContext, listLeft, listLayoutWidth);
+	auto y = top;
+	auto previous = static_cast<const PreparedBlock*>(nullptr);
+	for (auto i = 0, count = int(prepared.children.size()); i != count; ++i) {
+		const auto &child = prepared.children[i];
+		const auto anchorOnly = IsAnchorOnlyBlock(child);
+		if (previous && !anchorOnly) {
+			y += prepared.tight ? 0 : BlockSkip(child, st);
+		}
+		const auto childBottom = layoutChild(
+			i,
+			childActiveScrollOwner,
+			listLeft,
+			y,
+			listLayoutWidth,
+			listLogicalWidth,
+			childContext,
+			prepared.tight);
+		if (!childBottom) {
+			return std::nullopt;
+		}
+		y = *childBottom;
+		if (!anchorOnly) {
+			previous = &child;
+		}
+	}
+	block->outer = QRect(
+		listLeft,
+		top,
+		listWidth,
+		std::max(y - top, 0));
+	block->contentRect = block->outer;
+	block->horizontalScrollMax = scrollOwner
+		? std::max(listLogicalWidth - listWidth, 0)
+		: 0;
+	if (scrollOwner) {
+		block->scrollViewportRect = block->contentRect;
+		block->scrollLogicalContentRect = QRect(
+			listLeft,
+			top,
+			listLogicalWidth,
+			block->contentRect.height());
+		if (block->horizontalScrollMax > 0) {
+			block->scrollScrollbarTrackRect = QRect(
+				listLeft,
+				block->contentRect.y()
+					+ block->contentRect.height()
+					+ st.table.scrollbarSkip,
+				listWidth,
+				st.table.scrollbarHeight);
+			block->outer.setHeight(
+				block->outer.height()
+					+ ScrollbarReserveHeight(
+						scrollOwner,
+						block->horizontalScrollMax,
+						st));
+		}
+	}
+	block->firstLineBaseline = ResolveFirstDisplayedLineBaseline(*block, st);
+	RefreshLogicalGeometry(block);
+	return BlockBottom(*block);
+}
+
+[[nodiscard]] std::optional<int> LayoutQuoteBlockGeometry(
+		const PreparedBlock &prepared,
+		LaidOutBlock *block,
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context,
+		const LayoutNestedBlocksCallback &layoutNestedBlocks) {
+	if (!block) {
+		return std::nullopt;
+	}
+	ClearBlockGeometry(block);
+	const auto depthDelta = std::max(
+		prepared.visualDepth - context.quoteDepth,
+		0);
+	const auto quoteLeft = left + depthDelta * st.quoteIndent;
+	const auto quoteWidth = std::max(
+		width - depthDelta * st.quoteIndent,
+		1);
+	const auto scrollOwner = IsActiveScrollOwner(analysis, activeScrollOwner);
+	const auto outerLogicalWidth = LogicalOuterWidth(
+		analysis,
+		activeScrollOwner,
+		logicalWidth);
+	const auto quoteLogicalWidth = std::max(
+		outerLogicalWidth - depthDelta * st.quoteIndent,
+		1);
+	const auto padding = prepared.pullquote
+		? st.pullquote.padding
+		: BlockquotePadding(st.body.blockquote);
+	const auto availableWidth = std::max(
+		quoteWidth - padding.left() - padding.right(),
+		1);
+	const auto contentWidth = prepared.pullquote
+		? std::min(availableWidth, std::max(st.pullquote.maxWidth, 1))
+		: availableWidth;
+	const auto logicalAvailableWidth = std::max(
+		quoteLogicalWidth - padding.left() - padding.right(),
+		1);
+	const auto contentLogicalWidth = prepared.pullquote
+		? std::min(logicalAvailableWidth, std::max(st.pullquote.maxWidth, 1))
+		: logicalAvailableWidth;
+	const auto contentLeft = prepared.pullquote
+		? (quoteLeft + padding.left() + ((availableWidth - contentWidth) / 2))
+		: (quoteLeft + padding.left());
+	const auto contentTop = top + padding.top();
+	const auto childActiveScrollOwner = NextActiveScrollOwner(
+		analysis,
+		activeScrollOwner);
+	const auto contentLayoutWidth = ChildLayoutWidth(
+		childActiveScrollOwner,
+		contentWidth,
+		contentLogicalWidth);
+	auto childContext = context;
+	childContext.quoteDepth = prepared.visualDepth + 1;
+	childContext.tightList = false;
+	PrepareNestedContext(&childContext, contentLeft, contentLayoutWidth);
+	const auto childBottom = layoutNestedBlocks(
+		prepared.children,
+		&block->children,
+		analysis.children,
+		childActiveScrollOwner,
+		contentLeft,
+		contentTop,
+		contentLayoutWidth,
+		contentLogicalWidth,
+		childContext);
+	if (!childBottom) {
+		return std::nullopt;
+	}
+	const auto contentHeight = std::max(
+		*childBottom - contentTop,
+		prepared.children.empty()
+			? TextLineHeight(st.body)
+			: 0);
+	block->horizontalScrollMax = scrollOwner
+		? std::max(contentLogicalWidth - contentWidth, 0)
+		: 0;
+	if (scrollOwner) {
+		block->scrollViewportRect = QRect(
+			contentLeft,
+			contentTop,
+			contentWidth,
+			contentHeight);
+		block->scrollLogicalContentRect = QRect(
+			contentLeft,
+			contentTop,
+			contentLogicalWidth,
+			contentHeight);
+		if (block->horizontalScrollMax > 0) {
+			block->scrollScrollbarTrackRect = QRect(
+				contentLeft,
+				contentTop + contentHeight + st.table.scrollbarSkip,
+				contentWidth,
+				st.table.scrollbarHeight);
+		}
+	}
+	const auto quoteHeight = padding.top()
+		+ contentHeight
+		+ padding.bottom()
+		+ ScrollbarReserveHeight(
+			scrollOwner,
+			block->horizontalScrollMax,
+			st);
+	block->outer = QRect(quoteLeft, top, quoteWidth, quoteHeight);
+	block->contentRect = QRect(
+		contentLeft,
+		contentTop,
+		contentWidth,
+		contentHeight);
+	block->firstLineBaseline = ResolveFirstDisplayedLineBaseline(*block, st);
+	RefreshLogicalGeometry(block);
+	return BlockBottom(*block);
+}
+
+[[nodiscard]] std::optional<int> LayoutDetailsBlockGeometry(
+		const PreparedBlock &prepared,
+		LaidOutBlock *block,
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context,
+		const LayoutNestedBlocksCallback &layoutNestedBlocks) {
+	if (!block) {
+		return std::nullopt;
+	}
+	const auto usePlaceholder = prepared.text.text.isEmpty()
+		&& !prepared.editPlaceholderText.isEmpty();
+	if (MissingRetainedLeaf(prepared.text.text, block->leaf)
+		|| (usePlaceholder && block->placeholderLeaf.isEmpty())) {
+		return std::nullopt;
+	}
+	const auto actionWidth = context.editMode
+		? DetailsStateReserveWidth(st)
+		: 0;
+	if (actionWidth > 0 && block->actionLeaf.isEmpty()) {
+		return std::nullopt;
+	}
+	ClearBlockGeometry(block);
+	const auto &details = st.details;
+	const auto headerPadding = DetailsHeaderPadding(context, st);
+	const auto bodyPadding = DetailsBodyPadding(context, st);
+	const auto headerWidth = std::max(width, 1);
+	const auto scrollOwner = IsActiveScrollOwner(analysis, activeScrollOwner);
+	const auto outerLogicalWidth = LogicalOuterWidth(
+		analysis,
+		activeScrollOwner,
+		logicalWidth);
+	const auto iconWidth = details.icon.empty()
+		? 0
+		: TextLineHeight(details.summaryStyle);
+	const auto iconHeight = iconWidth;
+	const auto iconSkip = iconWidth ? details.iconSkip : 0;
+	const auto actionSkip = actionWidth ? details.stateSkip : 0;
+	const auto actionZoneWidth = actionSkip + actionWidth;
+	const auto textLeft = left
+		+ headerPadding.left()
+		+ iconWidth
+		+ iconSkip;
+	block->textWidth = std::max(
+		headerWidth
+			- headerPadding.left()
+			- headerPadding.right()
+			- iconWidth
+			- iconSkip
+			- actionZoneWidth,
+		1);
+	const auto &displayLeaf = usePlaceholder
+		? block->placeholderLeaf
+		: block->leaf;
+	const auto summaryHeight = ResolveEditableHeight(
+		RetainedLeafHeight(
+			displayLeaf,
+			details.summaryStyle,
+			block->textWidth),
+		context);
+	auto actionHeight = 0;
+	if (actionWidth > 0) {
+		block->actionWidth = actionWidth;
+		actionHeight = RetainedLeafHeight(
+			block->actionLeaf,
+			details.summaryStyle,
+			block->actionWidth);
+	}
+	const auto headerContentHeight = std::max(summaryHeight, iconHeight);
+	const auto headerHeight = headerPadding.top()
+		+ headerContentHeight
+		+ headerPadding.bottom();
+	block->headerRect = QRect(left, top, headerWidth, headerHeight);
+	if (iconWidth > 0 && iconHeight > 0) {
+		block->iconRect = QRect(
+			left + headerPadding.left(),
+			top + (headerHeight - iconHeight) / 2,
+			iconWidth,
+			iconHeight);
+	}
+	block->textRect = QRect(
+		textLeft,
+		top + headerPadding.top()
+			+ std::max((headerContentHeight - summaryHeight) / 2, 0),
+		block->textWidth,
+		summaryHeight);
+	if (actionZoneWidth > 0 && actionHeight > 0) {
+		block->actionRect = QRect(
+			left + headerWidth - headerPadding.right() - actionZoneWidth,
+			top + headerPadding.top()
+				+ std::max((headerContentHeight - actionHeight) / 2, 0),
+			actionZoneWidth,
+			actionHeight);
+	}
+	block->firstLineBaseline = LeafFirstLineBaseline(
+		displayLeaf,
+		block->textRect,
+		details.summaryStyle);
+	const auto childActiveScrollOwner = NextActiveScrollOwner(
+		analysis,
+		activeScrollOwner);
+	auto bottom = top + headerHeight;
+	if (!prepared.collapsed) {
+		const auto childLeft = left + bodyPadding.left();
+		const auto childTop = bottom + bodyPadding.top();
+		const auto childWidth = std::max(
+			headerWidth
+				- bodyPadding.left()
+				- bodyPadding.right(),
+			1);
+		const auto childLogicalWidth = std::max(
+			outerLogicalWidth
+				- bodyPadding.left()
+				- bodyPadding.right(),
+			1);
+		const auto childLayoutWidth = ChildLayoutWidth(
+			childActiveScrollOwner,
+			childWidth,
+			childLogicalWidth);
+		auto childContext = context;
+		PrepareNestedContext(&childContext, childLeft, childLayoutWidth);
+		const auto childBottom = layoutNestedBlocks(
+			prepared.children,
+			&block->children,
+			analysis.children,
+			childActiveScrollOwner,
+			childLeft,
+			childTop,
+			childLayoutWidth,
+			childLogicalWidth,
+			childContext);
+		if (!childBottom) {
+			return std::nullopt;
+		}
+		const auto contentHeight = std::max(*childBottom - childTop, 0);
+		const auto bodyHeight = bodyPadding.top()
+			+ contentHeight
+			+ bodyPadding.bottom();
+		block->bodyRect = QRect(left, bottom, headerWidth, bodyHeight);
+		block->contentRect = QRect(
+			childLeft,
+			childTop,
+			childWidth,
+			contentHeight);
+		block->horizontalScrollMax = scrollOwner
+			? std::max(childLogicalWidth - childWidth, 0)
+			: 0;
+		if (scrollOwner) {
+			block->scrollViewportRect = block->contentRect;
+			block->scrollLogicalContentRect = QRect(
+				childLeft,
+				childTop,
+				childLogicalWidth,
+				contentHeight);
+			if (block->horizontalScrollMax > 0) {
+				block->scrollScrollbarTrackRect = QRect(
+					childLeft,
+					childTop + contentHeight + st.table.scrollbarSkip,
+					childWidth,
+					st.table.scrollbarHeight);
+			}
+		}
+		bottom += bodyHeight
+			+ ScrollbarReserveHeight(
+				scrollOwner,
+				block->horizontalScrollMax,
+				st);
+	}
+	block->outer = QRect(
+		left,
+		top,
+		headerWidth,
+		std::max(bottom - top, headerHeight));
+	RefreshLogicalGeometry(block);
+	return BlockBottom(*block);
+}
+
+[[nodiscard]] std::optional<int> LayoutEmbedPostBlockGeometry(
+		const PreparedBlock &prepared,
+		LaidOutBlock *block,
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context,
+		const LayoutNestedBlocksCallback &layoutNestedBlocks) {
+	if (!block
+		|| MissingRetainedLeaf(prepared.embedPost.author, block->labelLeaf)
+		|| MissingRetainedLeaf(prepared.embedPost.dateText, block->subtitleLeaf)
+		|| (prepared.embedPost.authorPhotoId && !block->photoRuntime)) {
+		return std::nullopt;
+	}
+	ClearBlockGeometry(block);
+	const auto &style = st.embedPost;
+	const auto blockWidth = std::max(width, 1);
+	const auto scrollOwner = IsActiveScrollOwner(analysis, activeScrollOwner);
+	const auto outerLogicalWidth = LogicalOuterWidth(
+		analysis,
+		activeScrollOwner,
+		logicalWidth);
+	const auto contentLeft = left
+		+ style.accentWidth
+		+ style.accentSkip
+		+ style.padding.left();
+	const auto contentTop = top + style.padding.top();
+	const auto contentWidth = std::max(
+		blockWidth
+			- style.accentWidth
+			- style.accentSkip
+			- style.padding.left()
+			- style.padding.right(),
+		1);
+	const auto contentLogicalWidth = std::max(
+		outerLogicalWidth
+			- style.accentWidth
+			- style.accentSkip
+			- style.padding.left()
+			- style.padding.right(),
+		1);
+	const auto hasAvatar = (block->photoRuntime != nullptr);
+	const auto avatarSize = hasAvatar ? std::max(style.avatarSize, 1) : 0;
+	const auto headerGap = hasAvatar ? style.headerGap : 0;
+	const auto textLeft = contentLeft + avatarSize + headerGap;
+	const auto textWidth = std::max(contentWidth - avatarSize - headerGap, 1);
+	const auto childActiveScrollOwner = NextActiveScrollOwner(
+		analysis,
+		activeScrollOwner);
+	auto authorHeight = 0;
+	if (!prepared.embedPost.author.isEmpty()) {
+		block->labelWidth = textWidth;
+		authorHeight = ResolveEditableHeight(
+			RetainedLeafHeight(
+				block->labelLeaf,
+				style.authorStyle,
+				textWidth),
+			context);
+	}
+	auto dateHeight = 0;
+	if (!prepared.embedPost.dateText.isEmpty()) {
+		block->subtitleWidth = textWidth;
+		dateHeight = ResolveEditableHeight(
+			RetainedLeafHeight(
+				block->subtitleLeaf,
+				style.dateStyle,
+				textWidth),
+			context);
+	}
+	const auto textHeight = authorHeight + dateHeight;
+	const auto headerHeight = std::max(textHeight, avatarSize);
+	if (headerHeight > 0) {
+		block->headerRect = QRect(contentLeft, contentTop, contentWidth, headerHeight);
+	}
+	if (avatarSize > 0) {
+		block->thumbnailRect = QRect(
+			contentLeft,
+			contentTop + std::max((headerHeight - avatarSize) / 2, 0),
+			avatarSize,
+			avatarSize);
+	}
+	auto textTop = contentTop + std::max((headerHeight - textHeight) / 2, 0);
+	if (authorHeight > 0) {
+		block->labelRect = QRect(textLeft, textTop, textWidth, authorHeight);
+		textTop += authorHeight;
+	}
+	if (dateHeight > 0) {
+		block->subtitleRect = QRect(textLeft, textTop, textWidth, dateHeight);
+	}
+	auto wrapperBottom = contentTop + headerHeight;
+	if (!prepared.children.empty()) {
+		const auto bodyTop = wrapperBottom + ((headerHeight > 0) ? style.bodySkip : 0);
+		const auto contentLayoutWidth = ChildLayoutWidth(
+			childActiveScrollOwner,
+			contentWidth,
+			contentLogicalWidth);
+		auto childContext = context;
+		PrepareNestedContext(&childContext, contentLeft, contentLayoutWidth);
+		const auto childBottom = layoutNestedBlocks(
+			prepared.children,
+			&block->children,
+			analysis.children,
+			childActiveScrollOwner,
+			contentLeft,
+			bodyTop,
+			contentLayoutWidth,
+			contentLogicalWidth,
+			childContext);
+		if (!childBottom) {
+			return std::nullopt;
+		}
+		const auto bodyHeight = std::max(*childBottom - bodyTop, 0);
+		block->bodyRect = QRect(contentLeft, bodyTop, contentWidth, bodyHeight);
+		wrapperBottom = std::max(wrapperBottom, *childBottom);
+		block->horizontalScrollMax = scrollOwner
+			? std::max(contentLogicalWidth - contentWidth, 0)
+			: 0;
+		if (scrollOwner) {
+			block->scrollViewportRect = block->bodyRect;
+			block->scrollLogicalContentRect = QRect(
+				contentLeft,
+				bodyTop,
+				contentLogicalWidth,
+				bodyHeight);
+			if (block->horizontalScrollMax > 0) {
+				block->scrollScrollbarTrackRect = QRect(
+					contentLeft,
+					bodyTop + bodyHeight + st.table.scrollbarSkip,
+					contentWidth,
+					st.table.scrollbarHeight);
+				wrapperBottom = std::max(
+					wrapperBottom,
+					block->scrollScrollbarTrackRect.y()
+						+ block->scrollScrollbarTrackRect.height());
+			}
+		}
+	}
+	block->contentRect = QRect(
+		contentLeft,
+		contentTop,
+		contentWidth,
+		std::max(wrapperBottom - contentTop, 0));
+	block->mediaRect = QRect(
+		left,
+		top,
+		blockWidth,
+		style.padding.top()
+			+ block->contentRect.height()
+			+ style.padding.bottom());
+	auto bottom = block->mediaRect.y() + block->mediaRect.height();
+	if (!LayoutMediaCaptionGeometry(
+			block,
+			prepared,
+			st,
+			left,
+			bottom,
+			blockWidth,
+			style.captionSkip,
+			&bottom,
+			context)) {
+		return std::nullopt;
+	}
+	block->outer = QRect(
+		left,
+		top,
+		blockWidth,
+		std::max(bottom - top, block->mediaRect.height()));
+	if (!block->labelRect.isEmpty() && !block->labelLeaf.isEmpty()) {
+		block->firstLineBaseline = LeafFirstLineBaseline(
+			block->labelLeaf,
+			block->labelRect,
+			style.authorStyle);
+	} else if (!block->subtitleRect.isEmpty() && !block->subtitleLeaf.isEmpty()) {
+		block->firstLineBaseline = LeafFirstLineBaseline(
+			block->subtitleLeaf,
+			block->subtitleRect,
+			style.dateStyle);
+	} else {
+		for (const auto &child : block->children) {
+			if (child.outer.height() <= 0) {
+				continue;
+			}
+			block->firstLineBaseline = ResolveFirstDisplayedLineBaseline(
+				child,
+				st);
+			break;
+		}
+		if (block->firstLineBaseline < 0) {
+			block->firstLineBaseline = MarkdownBodyBaseline(top, st);
+		}
+	}
+	RefreshLogicalGeometry(block);
+	return BlockBottom(*block);
+}
+
+[[nodiscard]] std::optional<int> RecountBlockInPlace(
+		const PreparedBlock &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		LaidOutBlock *block,
+		const WidthAnalysisNode &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context) {
+	const auto currentScrollOwner = NextActiveScrollOwner(
+		analysis,
+		activeScrollOwner);
+	const auto scrollOwner = IsActiveScrollOwner(analysis, currentScrollOwner);
+	const auto effectiveLogicalWidth = LogicalOuterWidth(
+		analysis,
+		currentScrollOwner,
+		logicalWidth);
+	switch (prepared.kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+	case PreparedBlockKind::CodeBlock:
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::DisplayMath:
+	case PreparedBlockKind::Table:
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::RelatedArticle:
+	case PreparedBlockKind::Placeholder:
+		return RecountSimpleLaidOutBlock(
+			prepared,
+			formulas,
+			block,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			scrollOwner,
+			context);
+	case PreparedBlockKind::List:
+		return LayoutListBlockGeometry(
+			prepared,
+			block,
+			analysis,
+			currentScrollOwner,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			context,
+			[&](int index,
+					const WidthAnalysisNode *childActiveScrollOwner,
+					int childLeft,
+					int childTop,
+					int childWidth,
+					int childLogicalWidth,
+					LayoutContext childContext,
+					bool tight) -> std::optional<int> {
+				const auto &child = prepared.children[index];
+				return (child.kind == PreparedBlockKind::ListItem)
+					? LayoutListItemBlockGeometry(
+						child,
+						&block->children[index],
+						analysis.children[index],
+						childActiveScrollOwner,
+						st,
+						childLeft,
+						childTop,
+						childWidth,
+						childLogicalWidth,
+						childContext,
+						tight,
+						RetainedNestedBlocksCallback(formulas, st))
+					: RecountBlockInPlace(
+						child,
+						formulas,
+						&block->children[index],
+						analysis.children[index],
+						childActiveScrollOwner,
+						st,
+						childLeft,
+						childTop,
+						childWidth,
+						childLogicalWidth,
+						childContext);
+			});
+	case PreparedBlockKind::ListItem:
+		return LayoutListItemBlockGeometry(
+			prepared,
+			block,
+			analysis,
+			currentScrollOwner,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			context,
+			false,
+			RetainedNestedBlocksCallback(formulas, st));
+	case PreparedBlockKind::Quote:
+		return LayoutQuoteBlockGeometry(
+			prepared,
+			block,
+			analysis,
+			currentScrollOwner,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			context,
+			RetainedNestedBlocksCallback(formulas, st));
+	case PreparedBlockKind::Details:
+		return LayoutDetailsBlockGeometry(
+			prepared,
+			block,
+			analysis,
+			currentScrollOwner,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			context,
+			RetainedNestedBlocksCallback(formulas, st));
+	case PreparedBlockKind::EmbedPost:
+		return LayoutEmbedPostBlockGeometry(
+			prepared,
+			block,
+			analysis,
+			currentScrollOwner,
+			st,
+			left,
+			top,
+			width,
+			effectiveLogicalWidth,
+			context,
+			RetainedNestedBlocksCallback(formulas, st));
+	}
+	return std::nullopt;
+}
+
+[[nodiscard]] const style::TextStyle &LaidOutFlowTextStyle(
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	if (block.kind != PreparedBlockKind::Heading) {
+		return st.body;
+	}
+	switch (std::clamp(block.headingLevel, 1, 6)) {
+	case 1: return st.heading1;
+	case 2: return st.heading2;
+	case 3: return st.heading3;
+	case 4: return st.heading4;
+	case 5: return st.heading5;
+	case 6: return st.heading6;
+	}
+	return st.heading6;
+}
+
+[[nodiscard]] int BlockContentMaxRight(
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	const auto outerRight = block.outer.x() + block.outer.width();
+	const auto textRight = [&] {
+		const auto &leaf = block.placeholderLeaf.isEmpty()
+			? block.leaf
+			: block.placeholderLeaf;
+		return (leaf.isEmpty() || block.textRect.isEmpty())
+			? 0
+			: (block.textRect.x()
+				+ std::min(leaf.maxWidth(), block.textRect.width()));
+	};
+	const auto childrenRight = [&] {
+		auto result = 0;
+		for (const auto &child : block.children) {
+			result = std::max(result, BlockContentMaxRight(child, st));
+		}
+		return result;
+	};
+	if (block.insideHorizontalScroll
+		|| (!block.scrollViewportRect.isEmpty()
+			&& block.horizontalScrollMax > 0)) {
+		return outerRight;
+	}
+	switch (block.kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading: {
+		if (block.flowTextAlign != style::al_left) {
+			return outerRight;
+		}
+		const auto &leaf = block.placeholderLeaf.isEmpty()
+			? block.leaf
+			: block.placeholderLeaf;
+		if (leaf.isEmpty() || block.textRect.isEmpty()) {
+			return 0;
+		}
+		const auto width = std::min(
+			std::max(
+				leaf.maxWidth(),
+				ReadableTextMinWidth(LaidOutFlowTextStyle(block, st))),
+			block.textRect.width());
+		return std::min(block.textRect.x() + width, outerRight);
+	}
+	case PreparedBlockKind::CodeBlock:
+		return std::min(
+			std::max(
+				textRight() + BlockquotePadding(st.code.pre).right(),
+				block.outer.x() + CodeBlockMinimumWidth(st)),
+			outerRight);
+	case PreparedBlockKind::Rule:
+		return block.outer.x();
+	case PreparedBlockKind::DisplayMath: {
+		if (!block.textRect.isEmpty()) {
+			return outerRight;
+		}
+		const auto &padding = st.displayMath.padding;
+		const auto formulaWidth = block.formulaRect.isEmpty()
+			? 1
+			: block.formulaRect.width();
+		return std::min(
+			block.outer.x()
+				+ padding.left()
+				+ formulaWidth
+				+ padding.right(),
+			outerRight);
+	}
+	case PreparedBlockKind::Table: {
+		const auto tableRight = block.tableRect.isEmpty()
+			? 0
+			: (block.tableRect.x() + block.tableRect.width());
+		return std::min(std::max(textRight(), tableRight), outerRight);
+	}
+	case PreparedBlockKind::List:
+		return std::min(childrenRight(), outerRight);
+	case PreparedBlockKind::ListItem:
+		return std::min(
+			std::max(
+				block.outer.x() + block.markerWidth,
+				childrenRight()),
+			outerRight);
+	case PreparedBlockKind::Quote:
+		return block.pullquote
+			? outerRight
+			: std::min(
+				childrenRight()
+					+ BlockquotePadding(st.body.blockquote).right(),
+				outerRight);
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::RelatedArticle:
+	case PreparedBlockKind::Placeholder:
+	case PreparedBlockKind::Details:
+	case PreparedBlockKind::EmbedPost:
+		return outerRight;
+	}
+	return outerRight;
+}
+
+[[nodiscard]] std::optional<int> RecountBlocksInPlace(
+		const std::vector<PreparedBlock> &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		std::vector<LaidOutBlock> *blocks,
+		const std::vector<WidthAnalysisNode> &analysis,
+		const WidthAnalysisNode *activeScrollOwner,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		int logicalWidth,
+		LayoutContext context) {
+	if (!blocks
+		|| prepared.size() != blocks->size()
+		|| prepared.size() != analysis.size()) {
+		return std::nullopt;
+	}
+	auto y = top;
+	auto previous = static_cast<const PreparedBlock*>(nullptr);
+	for (auto i = 0, count = int(prepared.size()); i != count; ++i) {
+		const auto &preparedBlock = prepared[i];
+		auto &live = (*blocks)[i];
+		const auto anchorOnly = IsAnchorOnlyBlock(preparedBlock);
+		const auto next = NextVisibleBlock(prepared, i);
+		auto blockContext = context;
+		blockContext.preparedPath.push_back(i);
+		if (previous && !anchorOnly) {
+			y += BlockSkip(*previous, preparedBlock, context, st);
+		}
+		const auto band = BlockBand(
+			preparedBlock.kind,
+			st,
+			left,
+			std::max(width, 1),
+			context);
+		const auto logicalBandWidth = BlockBandWidth(
+			preparedBlock.kind,
+			st,
+			logicalWidth,
+			context);
+		const auto bottom = IsRelatedArticlesHeader(preparedBlock, next)
+			? RecountSimpleLaidOutBlock(
+				preparedBlock,
+				formulas,
+				&live,
+				st,
+				left + st.relatedArticle.headerPadding.left(),
+				y + st.relatedArticle.headerPadding.top(),
+				std::max(
+					width
+						- st.relatedArticle.headerPadding.left()
+						- st.relatedArticle.headerPadding.right(),
+					1),
+				std::max(
+					logicalWidth
+						- st.relatedArticle.headerPadding.left()
+						- st.relatedArticle.headerPadding.right(),
+					1),
+				false,
+				blockContext)
+			: RecountBlockInPlace(
+				preparedBlock,
+				formulas,
+				&live,
+				analysis[i],
+				activeScrollOwner,
+				st,
+				band.x(),
+				y,
+				band.width(),
+				logicalBandWidth,
+				blockContext);
+		if (!bottom) {
+			return std::nullopt;
+		}
+		if (IsRelatedArticlesHeader(preparedBlock, next)) {
+			live.headerRect = QRect(
+				left,
+				y,
+				std::max(width, 1),
+				live.outer.height()
+					+ st.relatedArticle.headerPadding.top()
+					+ st.relatedArticle.headerPadding.bottom());
+			live.outer = live.headerRect;
+			live.contentRect = live.headerRect;
+			RefreshLogicalGeometry(&live);
+		}
+		y = BlockBottom(live);
+		if (!anchorOnly) {
+			previous = &preparedBlock;
+		}
+	}
+	return y;
+}
+
+} // namespace
+
+int LayoutBlocks(
+		const std::vector<PreparedBlock> &prepared,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		std::vector<LaidOutBlock> *blocks,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		LayoutContext context) {
+	const auto analysis = AnalyzeBlocks(
+		prepared,
+		*formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		st,
+		width,
+		context);
+	return LayoutBlocks(
+		prepared,
+		formulas,
+		renderedFormulas,
+		renderer,
+		inlineFormulaObjects,
+		mediaRuntime,
+		blocks,
+		analysis,
+		nullptr,
+		st,
+		left,
+		top,
+		width,
+		width,
+		context);
+}
+
+std::optional<int> RecountLaidOutBlocks(
+		const std::vector<PreparedBlock> &prepared,
+		const std::vector<PreparedFormulaSlot> &formulas,
+		std::vector<LaidOutBlock> *blocks,
+		const style::Markdown &st,
+		int left,
+		int top,
+		int width,
+		LayoutContext context) {
+	if (!blocks) {
+		return std::nullopt;
+	}
+	auto analysis = AnalyzeRetainedBlocks(
+		prepared,
+		*blocks,
+		formulas,
+		st,
+		width,
+		context);
+	if (!analysis) {
+		return std::nullopt;
+	}
+	return RecountBlocksInPlace(
+		prepared,
+		formulas,
+		blocks,
+		*analysis,
+		nullptr,
+		st,
+		left,
+		top,
+		width,
+		width,
+		context);
+}
+
+int ArticleContentMaxRight(
+		const std::vector<LaidOutBlock> &blocks,
+		const style::Markdown &st) {
+	auto result = 0;
+	for (const auto &block : blocks) {
+		const auto bandPadding = UsesMediaBand(block.kind)
+			? st.mediaPadding
+			: st.textPadding;
+		result = std::max(
+			result,
+			BlockContentMaxRight(block, st) - bandPadding.left());
+	}
+	return result;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_article_layout_structure.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_layout_structure.h
new file mode 100644
index 00000000000000..e8d0910fe0b6d1
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_layout_structure.h
@@ -0,0 +1,40 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_article_layout_blocks.h"
+
+namespace Iv::Markdown {
+
+[[nodiscard]] int LayoutBlocks(
+	const std::vector<PreparedBlock> &prepared,
+	std::vector<PreparedFormulaSlot> *formulas,
+	std::vector<RenderedFormula> *renderedFormulas,
+	MathRenderer *renderer,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	std::vector<LaidOutBlock> *blocks,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	LayoutContext context);
+[[nodiscard]] std::optional<int> RecountLaidOutBlocks(
+	const std::vector<PreparedBlock> &prepared,
+	const std::vector<PreparedFormulaSlot> &formulas,
+	std::vector<LaidOutBlock> *blocks,
+	const style::Markdown &st,
+	int left,
+	int top,
+	int width,
+	LayoutContext context);
+[[nodiscard]] int ArticleContentMaxRight(
+	const std::vector<LaidOutBlock> &blocks,
+	const style::Markdown &st);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_article_paint.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_paint.cpp
new file mode 100644
index 00000000000000..6de54fb2d8d7bb
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_paint.cpp
@@ -0,0 +1,3098 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_article_paint.h"
+#include "iv/markdown/iv_markdown_article.h"
+#include "iv/markdown/iv_markdown_article_text.h"
+#include "ui/dynamic_image.h"
+#include "ui/effects/path_shift_gradient.h"
+#include "ui/effects/toggle_arrow.h"
+#include "ui/integration.h"
+#include "ui/style/style_core_scale.h"
+#include "ui/widgets/checkbox.h"
+
+#include "styles/palette.h"
+#include "styles/style_iv.h"
+#include "styles/style_window.h"
+#include "styles/style_widgets.h"
+
+#include <QtGui/QPainterPath>
+
+#include <algorithm>
+#include <cmath>
+#include <optional>
+
+namespace Iv::Markdown {
+namespace {
+
+constexpr auto kThinkingGradientSlideDuration = crl::time(1000);
+constexpr auto kThinkingGradientWaitDuration = crl::time(1000);
+constexpr auto kThinkingGradientFullDuration = kThinkingGradientSlideDuration
+	+ kThinkingGradientWaitDuration;
+
+[[nodiscard]] QRectF CenterCropSourceRect(QSize source, QSize target) {
+	const auto sourceWidth = std::max(source.width(), 1);
+	const auto sourceHeight = std::max(source.height(), 1);
+	const auto targetWidth = std::max(target.width(), 1);
+	const auto targetHeight = std::max(target.height(), 1);
+	const auto sourceRatio = float64(sourceWidth) / sourceHeight;
+	const auto targetRatio = float64(targetWidth) / targetHeight;
+	if (sourceRatio > targetRatio) {
+		const auto width = sourceHeight * targetRatio;
+		return QRectF(
+			(sourceWidth - width) / 2.,
+			0.,
+			width,
+			sourceHeight);
+	}
+	const auto height = sourceWidth / targetRatio;
+	return QRectF(
+		0.,
+		(sourceHeight - height) / 2.,
+		sourceWidth,
+		height);
+}
+
+void PaintImageCenterCrop(Painter &p, QRect rect, const QImage &image) {
+	p.drawImage(
+		QRectF(rect),
+		image,
+		CenterCropSourceRect(image.size(), rect.size()));
+}
+
+[[nodiscard]] bool ImageCoversRect(const QImage &image, QRect rect) {
+	const auto ratio = std::max(image.devicePixelRatio(), 1.);
+	return (image.width() / ratio >= rect.width())
+		&& (image.height() / ratio >= rect.height());
+}
+
+[[nodiscard]] bool PaintDynamicImage(
+		Painter &p,
+		const std::shared_ptr<Ui::DynamicImage> &image,
+		QRect rect,
+		bool requireCovering = false) {
+	if (!image || rect.isEmpty()) {
+		return false;
+	}
+	if (const auto frame = image->image(std::max(rect.width(), rect.height()));
+		!frame.isNull()) {
+		if (requireCovering && !ImageCoversRect(frame, rect)) {
+			return false;
+		}
+		PaintImageCenterCrop(p, rect, frame);
+		return true;
+	}
+	return false;
+}
+
+[[nodiscard]] bool PaintThumbnailImage(
+		Painter &p,
+		QRect rect,
+		const std::shared_ptr<Ui::DynamicImage> &thumbnail,
+		const std::shared_ptr<Ui::DynamicImage> &previousThumbnail) {
+	return PaintDynamicImage(p, thumbnail, rect, true)
+		|| PaintDynamicImage(p, previousThumbnail, rect, true)
+		|| PaintDynamicImage(p, previousThumbnail, rect)
+		|| PaintDynamicImage(p, thumbnail, rect);
+}
+
+void UpdateResolvedImage(
+		std::shared_ptr<Ui::DynamicImage> *current,
+		std::shared_ptr<Ui::DynamicImage> *previous,
+		const std::shared_ptr<Ui::DynamicImage> &next) {
+	if (!current || !previous || !next) {
+		return;
+	} else if (next == *current) {
+		return;
+	} else if (next == *previous) {
+		std::swap(*current, *previous);
+		return;
+	}
+	*previous = std::move(*current);
+	*current = next;
+}
+
+template <typename RequestImage>
+void RefreshResolvedBlockImage(
+		const LaidOutBlock &block,
+		const MarkdownArticlePaintContext &context,
+		QSize size,
+		QSize *requestedSize,
+		std::shared_ptr<Ui::DynamicImage> *current,
+		std::shared_ptr<Ui::DynamicImage> *previous,
+		std::shared_ptr<Ui::DynamicImage> *subscribed,
+		RequestImage &&request) {
+	if (size.isEmpty() || !requestedSize || !current || !previous || !subscribed) {
+		return;
+	} else if (*requestedSize == size) {
+		return;
+	}
+	*requestedSize = size;
+	const auto image = request(size);
+	if (!image) {
+		return;
+	}
+	UpdateResolvedImage(current, previous, image);
+	if (image == *subscribed) {
+		return;
+	}
+	*subscribed = image;
+	const auto repaint = context.caches.repaint;
+	const auto repaintRect = context.caches.repaintRect;
+	const auto rect = block.mediaRect;
+	image->subscribeToUpdates([repaint, repaintRect, rect] {
+		if (repaintRect && !rect.isEmpty()) {
+			repaintRect(rect);
+		} else if (repaint) {
+			repaint();
+		}
+	});
+}
+
+[[nodiscard]] bool PaintRelatedArticleImage(
+		Painter &p,
+		QRect rect,
+		const std::shared_ptr<Ui::DynamicImage> &thumbnail,
+		const std::shared_ptr<Ui::DynamicImage> &full,
+		const std::shared_ptr<Ui::DynamicImage> &previousThumbnail,
+		const std::shared_ptr<Ui::DynamicImage> &previousFull) {
+	return PaintDynamicImage(p, full, rect, true)
+		|| PaintDynamicImage(p, previousFull, rect, true)
+		|| PaintDynamicImage(p, full, rect)
+		|| PaintDynamicImage(p, previousFull, rect)
+		|| PaintDynamicImage(p, thumbnail, rect, true)
+		|| PaintDynamicImage(p, previousThumbnail, rect, true)
+		|| PaintDynamicImage(p, previousThumbnail, rect)
+		|| PaintDynamicImage(p, thumbnail, rect);
+}
+
+[[nodiscard]] const style::Markdown &PaintStyle(
+		const MarkdownArticlePaintContext &context,
+		const style::Markdown &st) {
+	return context.paintMarkdownStyle(st);
+}
+
+[[nodiscard]] MarkdownArticlePaintContext ClippedContext(
+		const MarkdownArticlePaintContext &context,
+		QRect clip) {
+	auto result = context;
+	result.clip = clip;
+	return result;
+}
+
+[[nodiscard]] MarkdownArticlePaintContext RevealSuppressedContext(
+		const MarkdownArticlePaintContext &context) {
+	auto result = context;
+	result.reveal = nullptr;
+	return result;
+}
+
+[[nodiscard]] std::optional<int> ConsumeRevealLine(
+		const MarkdownArticlePaintContext &context) {
+	if (!context.reveal) {
+		return std::nullopt;
+	}
+	return context.reveal->nextLine++;
+}
+
+[[nodiscard]] int CountGenericRevealBand(QRect rect) {
+	return rect.isEmpty() ? 0 : 1;
+}
+
+[[nodiscard]] int CountTextRevealLines(
+		const Ui::Text::String &leaf,
+		QRect textRect,
+		int textWidth) {
+	if (textRect.isEmpty() || (textWidth <= 0)) {
+		return 0;
+	}
+	return int(leaf.countLinesGeometry(textWidth, true).size());
+}
+
+void PaintSelectableTextLeaf(
+	Painter &p,
+	const Ui::Text::String &leaf,
+	const MarkdownArticlePaintContext &context,
+	QRect rect,
+	int width,
+	int segmentIndex,
+	style::align align,
+	std::optional<TextSelection> selection,
+	int elisionLines);
+
+[[nodiscard]] int CountRevealLinesForBlocks(
+		const std::vector<LaidOutBlock> &blocks,
+		const style::Markdown &st);
+
+[[nodiscard]] int CountTableRevealLines(const LaidOutBlock &block) {
+	if (block.visibleTableRect.isEmpty()) {
+		return 0;
+	}
+	auto result = 0;
+	for (const auto &row : block.tableRows) {
+		if (row.outer.height() > 0) {
+			++result;
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] const Ui::Text::String &DisplayedEditableLeaf(
+		const LaidOutBlock &block) {
+	return block.placeholderLeaf.isEmpty()
+		? block.leaf
+		: block.placeholderLeaf;
+}
+
+[[nodiscard]] int CountMediaRevealLines(const LaidOutBlock &block) {
+	return CountGenericRevealBand(block.visibleMediaRect)
+		+ CountTextRevealLines(
+			DisplayedEditableLeaf(block),
+			block.textRect,
+			block.textWidth);
+}
+
+[[nodiscard]] int CountEmbedPostRevealLines(
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	auto result = 0;
+	if (!block.headerRect.isEmpty()) {
+		result += (block.mediaRect.width() > 0) ? 1 : 0;
+	} else if (block.children.empty()) {
+		result += CountGenericRevealBand(block.mediaRect);
+	}
+	result += CountRevealLinesForBlocks(block.children, st);
+	result += CountTextRevealLines(
+		DisplayedEditableLeaf(block),
+		block.textRect,
+		block.textWidth);
+	return result;
+}
+
+[[nodiscard]] int CountRevealLinesForBlock(
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	switch (block.kind) {
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+	case PreparedBlockKind::CodeBlock:
+		return CountTextRevealLines(
+			DisplayedEditableLeaf(block),
+			block.textRect,
+			block.textWidth);
+	case PreparedBlockKind::Rule:
+		return CountGenericRevealBand(block.outer);
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+	case PreparedBlockKind::Quote:
+		return CountRevealLinesForBlocks(block.children, st);
+	case PreparedBlockKind::DisplayMath:
+		return CountGenericRevealBand(block.visibleFormulaRect);
+	case PreparedBlockKind::Table:
+		return CountTextRevealLines(
+			DisplayedEditableLeaf(block),
+			block.textRect,
+			block.textWidth) + CountTableRevealLines(block);
+	case PreparedBlockKind::Details:
+		return CountTextRevealLines(
+			DisplayedEditableLeaf(block),
+			block.textRect,
+			block.textWidth) + CountRevealLinesForBlocks(block.children, st);
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::Placeholder:
+		return CountMediaRevealLines(block);
+	case PreparedBlockKind::RelatedArticle:
+		return CountGenericRevealBand(block.visibleMediaRect);
+	case PreparedBlockKind::EmbedPost:
+		return CountEmbedPostRevealLines(block, st);
+	}
+	Unexpected("Prepared block kind in CountRevealLinesForBlock.");
+}
+
+[[nodiscard]] int CountRevealLinesForBlocks(
+		const std::vector<LaidOutBlock> &blocks,
+		const style::Markdown &st) {
+	auto result = 0;
+	for (const auto &block : blocks) {
+		result += CountRevealLinesForBlock(block, st);
+	}
+	return result;
+}
+
+template <typename CountCallback>
+[[nodiscard]] int CachedRevealLineCount(
+		const MarkdownArticlePaintContext &context,
+		const void *key,
+		CountCallback &&count) {
+	const auto cache = context.reveal ? context.reveal->lineCounts : nullptr;
+	if (!cache) {
+		return count();
+	}
+	const auto i = cache->counts.find(key);
+	if (i != end(cache->counts)) {
+		return i->second;
+	}
+	const auto result = count();
+	cache->counts.emplace(key, result);
+	return result;
+}
+
+void AdvanceRevealLinesForBlock(
+		const MarkdownArticlePaintContext &context,
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	if (context.reveal) {
+		context.reveal->nextLine += CachedRevealLineCount(
+			context,
+			&block,
+			[&] { return CountRevealLinesForBlock(block, st); });
+	}
+}
+
+template <typename Callback>
+void PaintRevealBand(
+		Painter &p,
+		const MarkdownArticlePaintContext &context,
+		QRect band,
+		Callback paint) {
+	if (band.isEmpty()) {
+		return;
+	}
+	const auto lineIndex = ConsumeRevealLine(context);
+	const auto visible = context.clip.intersected(band);
+	if (visible.isEmpty()) {
+		return;
+	}
+
+	const auto paintDirect = [&] {
+		const auto local = ClippedContext(
+			RevealSuppressedContext(context),
+			visible);
+		p.save();
+		p.setClipRect(visible, Qt::IntersectClip);
+		paint(p, local);
+		p.restore();
+	};
+	if (!lineIndex) {
+		paintDirect();
+		return;
+	}
+
+	const auto reveal = context.reveal;
+	if (*lineIndex > reveal->activeLine) {
+		return;
+	} else if (*lineIndex < reveal->activeLine
+		|| !reveal->postprocess
+		|| !reveal->postprocess->method) {
+		paintDirect();
+		return;
+	}
+
+	auto postprocess = reveal->postprocess->method(*lineIndex, band.width());
+	if (!postprocess) {
+		paintDirect();
+		return;
+	}
+
+	const auto ratio = std::max(style::DevicePixelRatio(), 1);
+	const auto cacheWidth = band.width() * ratio;
+	const auto cacheHeight = band.height() * ratio;
+	auto &cache = *reveal->postprocess->cache;
+	if (cache.devicePixelRatio() != ratio
+		|| cache.width() < cacheWidth
+		|| cache.height() < cacheHeight) {
+		cache = QImage(
+			QSize(
+				std::max(cache.width(), cacheWidth),
+				std::max(cache.height(), cacheHeight)),
+			QImage::Format_ARGB32_Premultiplied);
+		cache.setDevicePixelRatio(ratio);
+	}
+	cache.fill(Qt::transparent);
+
+	{
+		auto cachePainter = Painter(&cache);
+		cachePainter.setFont(p.font());
+		cachePainter.setPen(p.pen());
+		cachePainter.setBrush(p.brush());
+		cachePainter.setRenderHints(p.renderHints());
+		cachePainter.setInactive(p.inactive());
+		cachePainter.setTextPalette(p.textPalette());
+		cachePainter.translate(-band.x(), -band.y());
+		cachePainter.setClipRect(band);
+		const auto local = ClippedContext(
+			RevealSuppressedContext(context),
+			band);
+		paint(cachePainter, local);
+	}
+
+	postprocess(cache);
+
+	p.save();
+	p.setClipRect(visible, Qt::IntersectClip);
+	p.drawImage(
+		QRectF(band),
+		cache,
+		QRectF(0, 0, cacheWidth, cacheHeight));
+	p.restore();
+}
+
+void EnsureThinkingPaintCacheImage(
+		QImage *image,
+		QSize logicalSize,
+		int ratio) {
+	if (!image || logicalSize.isEmpty()) {
+		return;
+	}
+	ratio = std::max(ratio, 1);
+	const auto neededSize = QSize(
+		logicalSize.width() * ratio,
+		logicalSize.height() * ratio);
+	if (image->devicePixelRatio() == ratio
+		&& image->format() == QImage::Format_ARGB32_Premultiplied
+		&& image->width() >= neededSize.width()
+		&& image->height() >= neededSize.height()) {
+		return;
+	}
+	*image = QImage(
+		QSize(
+			std::max(image->width(), neededSize.width()),
+			std::max(image->height(), neededSize.height())),
+		QImage::Format_ARGB32_Premultiplied);
+	image->setDevicePixelRatio(ratio);
+}
+
+[[nodiscard]] int ThinkingTextWidth(const LaidOutBlock &block) {
+	return std::clamp(
+		block.leaf.maxWidth(),
+		1,
+		std::max(block.textRect.width(), 1));
+}
+
+void FillThinkingGradientImage(
+		QImage *image,
+		QRect logicalRect,
+		QRect textRect,
+		int textWidth,
+		QColor baseColor,
+		QColor highlightColor) {
+	if (!image) {
+		return;
+	}
+	image->fill(Qt::transparent);
+	if (logicalRect.isEmpty()) {
+		return;
+	}
+	auto imagePainter = Painter(image);
+	const auto localRect = QRect(QPoint(), logicalRect.size());
+	const auto period = crl::now() % kThinkingGradientFullDuration;
+	if (period >= kThinkingGradientSlideDuration) {
+		imagePainter.fillRect(localRect, baseColor);
+		return;
+	}
+	const auto progress = period / float64(kThinkingGradientSlideDuration);
+	textWidth = std::max(textWidth, 1);
+	const auto gradientWidth = std::max(textWidth, 1);
+	const auto textLeft = textRect.x() - logicalRect.x();
+	const auto start = anim::interpolate(
+		textLeft - gradientWidth,
+		textLeft + textWidth,
+		progress);
+	auto gradient = QLinearGradient(start, 0, start + gradientWidth, 0);
+	gradient.setStops({
+		{ 0., baseColor },
+		{ 0.5, highlightColor },
+		{ 1., baseColor },
+	});
+	imagePainter.fillRect(localRect, QBrush(gradient));
+}
+
+[[nodiscard]] QColor WithOpacity(style::color color, double opacity) {
+	auto result = color->c;
+	result.setAlphaF(result.alphaF() * std::clamp(opacity, 0., 1.));
+	return result;
+}
+
+[[nodiscard]] QPen EditPlaceholderPen(
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	auto color = context.caches.supplementaryColorOverride.value_or(
+		PaintStyle(context, st).supplementaryTextColor->c);
+	color.setAlphaF(color.alphaF() * 0.5);
+	return QPen(color);
+}
+
+[[nodiscard]] bool PaintEditPlaceholderLeaf(
+		Painter &p,
+		const Ui::Text::String &placeholderLeaf,
+		bool empty,
+		const MarkdownArticlePaintContext &context,
+		QRect rect,
+		int width,
+		int segmentIndex,
+		const style::Markdown &st,
+		style::align align = style::al_left,
+		std::optional<TextSelection> selection = std::nullopt) {
+	if (!empty || placeholderLeaf.isEmpty() || rect.isEmpty()) {
+		return false;
+	}
+	p.save();
+	p.setPen(EditPlaceholderPen(st, context));
+	PaintSelectableTextLeaf(
+		p,
+		placeholderLeaf,
+		context,
+		rect,
+		width,
+		segmentIndex,
+		align,
+		selection,
+		0);
+	p.restore();
+	return true;
+}
+
+[[nodiscard]] QColor TableHeaderBg(const style::MarkdownTable &st) {
+	return WithOpacity(st.headerBg, st.headerBgOpacity);
+}
+
+[[nodiscard]] bool UseIncomingMessageDefaultPalette(
+		const MarkdownArticlePaintContext &context) {
+	return !context.outbg
+		&& (context.caches.st == &context.messageStyle()->richPageStyle);
+}
+
+[[nodiscard]] QColor ApplySelectedIncomingOverlay(
+		QColor base,
+		const MarkdownArticlePaintContext &context) {
+	if (!context.selected() || context.outbg) {
+		return base;
+	}
+	auto overlay = context.st->msgSelectOverlay()->c;
+	const auto alpha = overlay.alphaF();
+	overlay.setAlpha(base.alpha());
+	auto result = anim::color(base, overlay, alpha);
+	result.setAlpha(base.alpha());
+	return result;
+}
+
+[[nodiscard]] QColor EffectiveTableHeaderBg(
+		const style::Markdown &paintSt,
+		const MarkdownArticlePaintContext &context) {
+	return UseIncomingMessageDefaultPalette(context)
+		? ApplySelectedIncomingOverlay(
+			TableHeaderBg(st::defaultMarkdown.table),
+			context)
+		: TableHeaderBg(paintSt.table);
+}
+
+[[nodiscard]] QColor EffectiveTableBorderFg(
+		const style::Markdown &paintSt,
+		const MarkdownArticlePaintContext &context) {
+	const auto useIncoming = UseIncomingMessageDefaultPalette(context);
+	const auto &table = useIncoming
+		? st::defaultMarkdown.table
+		: paintSt.table;
+	auto result = WithOpacity(table.borderFg, table.headerBgOpacity * 3);
+	return useIncoming
+		? ApplySelectedIncomingOverlay(result, context)
+		: result;
+}
+
+[[nodiscard]] QColor EffectiveDividerFg(
+		const style::Markdown &paintSt,
+		const MarkdownArticlePaintContext &context) {
+	auto result = UseIncomingMessageDefaultPalette(context)
+		? ApplySelectedIncomingOverlay(
+			st::defaultMarkdown.rule.fg->c,
+			context)
+		: paintSt.rule.fg->c;
+	if (context.outbg) {
+		result.setAlphaF(result.alphaF() * 0.5);
+	}
+	return result;
+}
+
+void PaintDetailsIcon(
+		Painter &p,
+		QRect rect,
+		QColor color,
+		bool collapsed) {
+	const auto size = std::min(rect.width(), rect.height()) / 3.;
+	if (size <= 0.) {
+		return;
+	}
+	const auto center = QRectF(rect).center();
+	const auto path = Ui::ToggleUpDownArrowPath(
+		center.x(),
+		center.y(),
+		size,
+		st::mainMenuToggleFourStrokes,
+		collapsed ? 0. : 1.);
+	auto hq = PainterHighQualityEnabler(p);
+	p.fillPath(path, color);
+}
+
+void RefreshBlockThumbnail(
+		const LaidOutBlock &block,
+		const MarkdownArticlePaintContext &context) {
+	if (!block.photoRuntime || block.thumbnailRect.isEmpty()) {
+		return;
+	}
+	const auto size = block.thumbnailRect.size();
+	if (size.isEmpty() || block.thumbnailRequestSize == size) {
+		return;
+	}
+	block.thumbnailRequestSize = size;
+	if (const auto image = block.photoRuntime->thumbnail(size)) {
+		if (image != block.thumbnailImage) {
+			block.previousThumbnailImage = std::move(block.thumbnailImage);
+			block.thumbnailImage = image;
+		}
+		if (image != block.subscribedThumbnailImage) {
+			block.subscribedThumbnailImage = image;
+			const auto repaint = context.caches.repaint;
+			const auto repaintRect = context.caches.repaintRect;
+			const auto rect = block.mediaRect;
+			image->subscribeToUpdates([repaint, repaintRect, rect] {
+				if (repaintRect && !rect.isEmpty()) {
+					repaintRect(rect);
+				} else if (repaint) {
+					repaint();
+				}
+			});
+		}
+	}
+}
+
+void RefreshRelatedArticleImages(
+		const LaidOutBlock &block,
+		const MarkdownArticlePaintContext &context) {
+	if (!block.photoRuntime || block.thumbnailRect.isEmpty()) {
+		return;
+	}
+	const auto size = block.thumbnailRect.size();
+	RefreshResolvedBlockImage(
+		block,
+		context,
+		size,
+		&block.thumbnailRequestSize,
+		&block.thumbnailImage,
+		&block.previousThumbnailImage,
+		&block.subscribedThumbnailImage,
+		[&](QSize requested) {
+			return block.photoRuntime->thumbnail(requested);
+		});
+	RefreshResolvedBlockImage(
+		block,
+		context,
+		size,
+		&block.fullRequestSize,
+		&block.fullImage,
+		&block.previousFullImage,
+		&block.subscribedFullImage,
+		[&](QSize requested) {
+			return block.photoRuntime->full(requested);
+		});
+}
+
+void PaintTextLeaf(
+		Painter &p,
+		const Ui::Text::String &leaf,
+		const MarkdownArticlePaintContext &context,
+		QRect rect,
+		int width,
+		style::align align = style::al_left,
+		std::optional<TextSelection> selection = std::nullopt,
+		int elisionLines = 0) {
+	const auto availableWidth = std::max(width, 1);
+	auto linePostprocess = std::optional<Ui::Text::LinePostprocess>();
+	if (context.reveal && !elisionLines) {
+		const auto lineCount = CachedRevealLineCount(
+			context,
+			&leaf,
+			[&] {
+				return int(leaf.countLinesGeometry(
+					availableWidth,
+					true).size());
+			});
+		const auto baseLine = context.reveal->nextLine;
+		context.reveal->nextLine += lineCount;
+		if (const auto articlePostprocess = context.reveal->postprocess) {
+			const auto activeLine = context.reveal->activeLine;
+			linePostprocess.emplace(Ui::Text::LinePostprocess{
+				.method = [=](int lineIndex) -> Fn<void(QImage&)> {
+					const auto globalLine = baseLine + lineIndex;
+					if (globalLine != activeLine
+						|| !articlePostprocess->method) {
+						return nullptr;
+					}
+					return articlePostprocess->method(
+						globalLine,
+						availableWidth);
+				},
+				.cache = articlePostprocess->cache,
+			});
+		}
+	}
+	p.save();
+	if (!context.clip.isNull()) {
+		p.setClipRect(context.clip, Qt::IntersectClip);
+	}
+	leaf.draw(p, {
+		.position = rect.topLeft(),
+		.availableWidth = availableWidth,
+		.geometry = elisionLines
+			? Ui::Text::SimpleGeometry(availableWidth, elisionLines, 0, true)
+			: TextGeometry(availableWidth),
+		.align = align,
+		.clip = context.clip,
+		.palette = &p.textPalette(),
+		.pre = context.caches.pre,
+		.blockquote = context.caches.blockquote,
+		.colors = context.caches.colors,
+		.spoiler = Ui::Text::DefaultSpoilerCache(),
+		.now = context.now,
+		.selection = selection.value_or(TextSelection()),
+		.elisionLines = elisionLines,
+		.linePostprocess = linePostprocess ? &*linePostprocess : nullptr,
+	});
+	p.restore();
+}
+
+void PaintSelectableTextLeaf(
+		Painter &p,
+		const Ui::Text::String &leaf,
+		const MarkdownArticlePaintContext &context,
+		QRect rect,
+		int width,
+		int segmentIndex,
+		style::align align = style::al_left,
+		std::optional<TextSelection> selection = std::nullopt,
+		int elisionLines = 0) {
+	if ((segmentIndex >= 0)
+		&& ((context.hiddenTextSegmentIndex == segmentIndex)
+			|| (context.hiddenSegmentIndex == segmentIndex))) {
+		if (context.reveal && !elisionLines) {
+			context.reveal->nextLine += CachedRevealLineCount(
+				context,
+				&leaf,
+				[&] { return CountTextRevealLines(leaf, rect, width); });
+		}
+		return;
+	}
+	PaintTextLeaf(
+		p,
+		leaf,
+		context,
+		rect,
+		width,
+		align,
+		selection,
+		elisionLines);
+}
+
+[[nodiscard]] QRect FlowTextViewportRect(const LaidOutBlock &block) {
+	return block.scrollViewportRect.isEmpty()
+		? block.outer
+		: block.scrollViewportRect;
+}
+
+void SetTextLeafPen(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	const auto &paintSt = PaintStyle(context, st);
+	p.setPen(!block.supplementary
+		? paintSt.textColor->c
+		: context.caches.supplementaryColorOverride.value_or(
+			paintSt.supplementaryTextColor->c));
+}
+
+void PaintThinkingTextLeafDirect(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	const auto &paintSt = PaintStyle(context, st);
+	p.setPen(paintSt.supplementaryTextColor->c);
+	PaintSelectableTextLeaf(
+		p,
+		block.leaf,
+		context,
+		block.textRect,
+		block.textWidth,
+		block.segmentIndex,
+		style::al_left,
+		TextSelectionForSegmentIndex(
+			context.selectionState,
+			block.segmentIndex));
+}
+
+void PaintRelatedArticleTextLeaf(
+		Painter &p,
+		const Ui::Text::String &leaf,
+		const MarkdownArticlePaintContext &context,
+		QRect rect,
+		int width,
+		int elisionLines) {
+	const auto textClip = context.clip.intersected(rect);
+	if (textClip.isEmpty()) {
+		return;
+	}
+	const auto clipped = ClippedContext(context, textClip);
+	p.save();
+	p.setClipRect(textClip, Qt::IntersectClip);
+	PaintTextLeaf(
+		p,
+		leaf,
+		clipped,
+		rect,
+		width,
+		style::al_left,
+		std::nullopt,
+		elisionLines);
+	p.restore();
+}
+
+void PaintTaskMarker(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context,
+		int outerWidth) {
+	const auto rect = block.markerRect;
+	if (rect.isEmpty()) {
+		return;
+	}
+	const auto &paintSt = PaintStyle(context, st);
+	if (block.taskMarkerRippleRuntime && block.taskMarkerRippleRuntime->ripple) {
+		const auto rippleTopLeft = rect.topLeft()
+			+ st::defaultCheckbox.rippleAreaPosition;
+		block.taskMarkerRippleRuntime->ripple->paint(
+			p,
+			rippleTopLeft.x(),
+			rippleTopLeft.y(),
+			outerWidth);
+	}
+	auto view = Ui::CheckView(
+		paintSt.list.taskCheck,
+		block.taskState == TaskState::Checked);
+	view.finishAnimating();
+	view.paint(p, rect.left(), rect.top(), outerWidth);
+}
+
+void PaintBulletMarker(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	const auto radius = st.list.bulletRadius;
+	if (radius <= 0) {
+		return;
+	}
+	const auto &paintSt = PaintStyle(context, st);
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(paintSt.list.bulletFg->c);
+	p.drawEllipse(QPointF(block.markerCenter), radius, radius);
+}
+
+[[nodiscard]] const QImage &ColorizedDisplayFormulaImage(
+		const LaidOutBlock &block,
+		const RenderedFormula &formula,
+		QColor color) {
+	const auto size = formula.image.size();
+	if (block.colorizedFormulaImage.isNull()
+		|| (block.colorizedFormulaSize != size)
+		|| (block.colorizedFormulaColor != color)) {
+		block.colorizedFormulaImage = QImage(
+			size,
+			QImage::Format_ARGB32_Premultiplied);
+		style::colorizeImage(
+			formula.image,
+			color,
+			&block.colorizedFormulaImage,
+			QRect(),
+			QPoint(),
+			true);
+		block.colorizedFormulaColor = color;
+		block.colorizedFormulaSize = size;
+	}
+	return block.colorizedFormulaImage;
+}
+
+[[nodiscard]] int TableBorder(
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	return block.tableBordered ? st.table.border : 0;
+}
+
+struct TableOwnershipSlot {
+	const LaidOutTableCell *cell = nullptr;
+};
+
+using TableOwnershipGrid = std::vector<std::vector<TableOwnershipSlot>>;
+
+[[nodiscard]] TableOwnershipGrid BuildTableOwnershipGrid(
+		const LaidOutBlock &block) {
+	const auto rowCount = int(block.tableRows.size());
+	const auto columnCount = int(block.tableColumnWidths.size());
+	auto result = TableOwnershipGrid(
+		std::max(rowCount, 0),
+		std::vector<TableOwnershipSlot>(std::max(columnCount, 0)));
+	for (auto row = 0; row != rowCount; ++row) {
+		for (const auto &cell : block.tableRows[row].cells) {
+			const auto fromRow = std::clamp(row, 0, rowCount);
+			const auto toRow = std::clamp(row + cell.rowspan, 0, rowCount);
+			const auto fromColumn = std::clamp(cell.column, 0, columnCount);
+			const auto toColumn = std::clamp(
+				cell.column + cell.colspan,
+				0,
+				columnCount);
+			for (auto currentRow = fromRow; currentRow != toRow; ++currentRow) {
+				for (auto currentColumn = fromColumn;
+					currentColumn != toColumn;
+					++currentColumn) {
+					result[currentRow][currentColumn].cell = &cell;
+				}
+			}
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] QPainterPath TableShapePath(
+		const LaidOutBlock &block,
+		int border,
+		int radius) {
+	auto path = QPainterPath();
+	if (block.visibleTableRect.isEmpty()) {
+		return path;
+	}
+	if (border > 0) {
+		const auto half = border / 2.;
+		path.addRoundedRect(
+			QRectF(block.visibleTableRect).marginsRemoved({
+				half,
+				half,
+				half,
+				half,
+			}),
+			radius,
+			radius);
+	} else {
+		path.addRect(block.visibleTableRect);
+	}
+	return path;
+}
+
+[[nodiscard]] auto TableColumnLefts(
+		const LaidOutBlock &block,
+		int columnCount,
+		int border) -> std::vector<int> {
+	auto result = std::vector<int>(
+		std::max(columnCount, 0),
+		block.visibleTableRect.x() + border - block.horizontalScrollLeft);
+	auto separatorLeft = block.visibleTableRect.x()
+		+ border
+		- block.horizontalScrollLeft;
+	for (auto column = 0; column != columnCount; ++column) {
+		result[column] = separatorLeft;
+		if (column < int(block.tableColumnWidths.size())) {
+			separatorLeft += block.tableColumnWidths[column] + border;
+		}
+	}
+	return result;
+}
+
+void AddTableHorizontalBorderSegments(
+		QPainterPath *path,
+		const LaidOutBlock &block,
+		const TableOwnershipGrid &ownership,
+		const std::vector<int> &columnLefts,
+		QRectF inner,
+		float64 half) {
+	const auto rowCount = int(ownership.size());
+	const auto columnCount = rowCount ? int(ownership.front().size()) : 0;
+	for (auto boundaryRow = 1; boundaryRow != rowCount; ++boundaryRow) {
+		auto segmentStart = -1;
+		for (auto column = 0; column != columnCount; ++column) {
+			const auto split = ownership[boundaryRow - 1][column].cell
+				!= ownership[boundaryRow][column].cell;
+			if (split && (segmentStart < 0)) {
+				segmentStart = column;
+			} else if (!split && (segmentStart >= 0)) {
+				const auto fromX = (segmentStart == 0)
+					? inner.x()
+					: (columnLefts[segmentStart] - half);
+				const auto toX = columnLefts[column] - half;
+				const auto y = block.tableRows[boundaryRow].outer.y() - half;
+				path->moveTo(fromX, y);
+				path->lineTo(toX, y);
+				segmentStart = -1;
+			}
+		}
+		if (segmentStart >= 0) {
+			const auto fromX = (segmentStart == 0)
+				? inner.x()
+				: (columnLefts[segmentStart] - half);
+			const auto y = block.tableRows[boundaryRow].outer.y() - half;
+			path->moveTo(fromX, y);
+			path->lineTo(inner.x() + inner.width(), y);
+		}
+	}
+}
+
+void AddTableVerticalBorderSegments(
+		QPainterPath *path,
+		const LaidOutBlock &block,
+		const TableOwnershipGrid &ownership,
+		const std::vector<int> &columnLefts,
+		QRectF inner,
+		float64 half) {
+	const auto rowCount = int(ownership.size());
+	const auto columnCount = rowCount ? int(ownership.front().size()) : 0;
+	for (auto boundaryColumn = 1;
+		boundaryColumn != columnCount;
+		++boundaryColumn) {
+		auto segmentStart = -1;
+		for (auto row = 0; row != rowCount; ++row) {
+			const auto split = ownership[row][boundaryColumn - 1].cell
+				!= ownership[row][boundaryColumn].cell;
+			if (split && (segmentStart < 0)) {
+				segmentStart = row;
+			} else if (!split && (segmentStart >= 0)) {
+				const auto fromY = (segmentStart == 0)
+					? inner.y()
+					: (block.tableRows[segmentStart].outer.y() - half);
+				const auto toY = block.tableRows[row].outer.y() - half;
+				const auto x = columnLefts[boundaryColumn] - half;
+				path->moveTo(x, fromY);
+				path->lineTo(x, toY);
+				segmentStart = -1;
+			}
+		}
+		if (segmentStart >= 0) {
+			const auto fromY = (segmentStart == 0)
+				? inner.y()
+				: (block.tableRows[segmentStart].outer.y() - half);
+			const auto x = columnLefts[boundaryColumn] - half;
+			path->moveTo(x, fromY);
+			path->lineTo(x, inner.y() + inner.height());
+		}
+	}
+}
+
+[[nodiscard]] QPainterPath TableBorderPath(
+		const LaidOutBlock &block,
+		int border,
+		QPainterPath path) {
+	const auto ownership = BuildTableOwnershipGrid(block);
+	const auto rowCount = int(ownership.size());
+	const auto columnCount = rowCount
+		? int(ownership.front().size())
+		: int(block.tableColumnWidths.size());
+	if (!rowCount || !columnCount) {
+		return path;
+	}
+	const auto half = border / 2.;
+	const auto columnLefts = TableColumnLefts(block, columnCount, border);
+	const auto inner = QRectF(block.visibleTableRect).marginsRemoved({
+		half,
+		half,
+		half,
+		half,
+	});
+	AddTableHorizontalBorderSegments(
+		&path,
+		block,
+		ownership,
+		columnLefts,
+		inner,
+		half);
+	AddTableVerticalBorderSegments(
+		&path,
+		block,
+		ownership,
+		columnLefts,
+		inner,
+		half);
+	return path;
+}
+
+[[nodiscard]] QRect TableRowRevealBand(
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		int rowIndex) {
+	if (block.visibleTableRect.isEmpty()
+		|| rowIndex < 0
+		|| rowIndex >= int(block.tableRows.size())) {
+		return QRect();
+	}
+	const auto &row = block.tableRows[rowIndex];
+	if (row.outer.height() <= 0) {
+		return QRect();
+	}
+	const auto border = std::max(TableBorder(block, st), 0);
+	const auto top = (rowIndex == 0)
+		? block.visibleTableRect.y()
+		: row.outer.y();
+	const auto tableBottom = block.visibleTableRect.y()
+		+ block.visibleTableRect.height();
+	const auto bottom = std::min(
+		row.outer.y() + row.outer.height() + border,
+		tableBottom);
+	if (bottom <= top) {
+		return QRect();
+	}
+	return QRect(
+		block.visibleTableRect.x(),
+		top,
+		block.visibleTableRect.width(),
+		bottom - top);
+}
+
+[[nodiscard]] auto TableCellsForRowBand(
+		const TableOwnershipGrid &ownership,
+		int rowIndex,
+		QRect rowBand) -> std::vector<const LaidOutTableCell*> {
+	if (rowIndex < 0 || rowIndex >= int(ownership.size())) {
+		return {};
+	}
+	auto result = std::vector<const LaidOutTableCell*>();
+	result.reserve(ownership[rowIndex].size());
+	for (const auto &slot : ownership[rowIndex]) {
+		const auto cell = slot.cell;
+		if (!cell || !cell->outer.intersects(rowBand)) {
+			continue;
+		} else if (std::find(result.begin(), result.end(), cell)
+			!= result.end()) {
+			continue;
+		}
+		result.push_back(cell);
+	}
+	return result;
+}
+
+[[nodiscard]] int TableCellOriginRow(
+		const LaidOutBlock &block,
+		const LaidOutTableCell *cell) {
+	for (auto rowIndex = 0;
+		rowIndex != int(block.tableRows.size());
+		++rowIndex) {
+		for (const auto &current : block.tableRows[rowIndex].cells) {
+			if (&current == cell) {
+				return rowIndex;
+			}
+		}
+	}
+	return -1;
+}
+
+[[nodiscard]] bool StructuralTableRowOverlaySelected(
+		const PaintSelectionState &selectionState,
+		const LaidOutTableRow &row) {
+	return row.editRow
+		&& StructuralTableRowSelected(selectionState, *row.editRow);
+}
+
+[[nodiscard]] bool StructuralTableCellRowOverlaySelected(
+		const PaintSelectionState &selectionState,
+		const LaidOutTableCell &cell) {
+	if (!cell.editCell) {
+		return false;
+	}
+	auto row = PreparedEditTableRowSource();
+	row.block = cell.editCell->block;
+	row.tableRowIndex = cell.editCell->tableRowIndex;
+	return StructuralTableRowSelected(selectionState, row);
+}
+
+void PaintStructuralTableOverlays(
+		Painter &p,
+		const LaidOutBlock &block,
+		const QPainterPath &shapePath,
+		QRect clip,
+		const MarkdownArticlePaintContext &context) {
+	if (!context.selectionState.hasStructuralSelection() || clip.isEmpty()) {
+		return;
+	}
+	p.save();
+	p.setClipRect(clip, Qt::IntersectClip);
+	p.setClipPath(shapePath, Qt::IntersectClip);
+	for (const auto &row : block.tableRows) {
+		if (!row.outer.intersects(clip)
+			|| !StructuralTableRowOverlaySelected(
+				context.selectionState,
+				row)) {
+			continue;
+		}
+		p.fillRect(row.outer, p.textPalette().selectOverlay);
+	}
+	for (const auto &row : block.tableRows) {
+		if (!row.outer.intersects(clip)
+			|| StructuralTableRowOverlaySelected(
+				context.selectionState,
+				row)) {
+			continue;
+		}
+		for (const auto &cell : row.cells) {
+			if (!cell.outer.intersects(clip)
+				|| !cell.editCell
+				|| StructuralTableCellRowOverlaySelected(
+					context.selectionState,
+					cell)
+				|| !StructuralTableCellSelected(
+					context.selectionState,
+					*cell.editCell)) {
+				continue;
+			}
+			p.fillRect(cell.outer, p.textPalette().selectOverlay);
+		}
+	}
+	p.restore();
+}
+
+void PaintStructuralTableRowBandOverlays(
+		Painter &p,
+		const LaidOutBlock &block,
+		const std::vector<const LaidOutTableCell*> &cells,
+		int rowIndex,
+		const QPainterPath &shapePath,
+		QRect clip,
+		const MarkdownArticlePaintContext &context) {
+	if (!context.selectionState.hasStructuralSelection()
+		|| clip.isEmpty()
+		|| rowIndex < 0
+		|| rowIndex >= int(block.tableRows.size())) {
+		return;
+	}
+	const auto &row = block.tableRows[rowIndex];
+	p.save();
+	p.setClipRect(clip, Qt::IntersectClip);
+	p.setClipPath(shapePath, Qt::IntersectClip);
+	if (StructuralTableRowOverlaySelected(context.selectionState, row)) {
+		p.fillRect(row.outer, p.textPalette().selectOverlay);
+	}
+	for (const auto cell : cells) {
+		if (!cell
+			|| !cell->outer.intersects(clip)
+			|| !cell->editCell
+			|| StructuralTableCellRowOverlaySelected(
+				context.selectionState,
+				*cell)
+			|| !StructuralTableCellSelected(
+				context.selectionState,
+				*cell->editCell)) {
+			continue;
+		}
+		p.fillRect(cell->outer, p.textPalette().selectOverlay);
+	}
+	p.restore();
+}
+
+void PaintTableCaption(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	if (!block.textRect.isEmpty()) {
+		const auto selection = TextSelectionForSegmentIndex(
+			context.selectionState,
+			block.secondarySegmentIndex);
+		if (!PaintEditPlaceholderLeaf(
+				p,
+				block.placeholderLeaf,
+				block.leaf.isEmpty(),
+				context,
+				block.textRect,
+				block.textWidth,
+				block.secondarySegmentIndex,
+				st,
+				block.flowTextAlign,
+				selection)) {
+			SetTextLeafPen(p, block, st, context);
+			PaintSelectableTextLeaf(
+				p,
+				block.leaf,
+				context,
+				block.textRect,
+				block.textWidth,
+				block.secondarySegmentIndex,
+				block.flowTextAlign,
+				selection);
+		}
+	}
+}
+
+[[nodiscard]] int OverflowIndicatorWidth(
+		const LaidOutBlock &block,
+		const style::Markdown &st) {
+	return (block.kind == PreparedBlockKind::DisplayMath)
+		? st.displayMath.overflowWidth
+		: st.table.overflowWidth;
+}
+
+[[nodiscard]] QColor ScrollOwnerAccentColor(
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	const auto &paintSt = PaintStyle(context, st);
+	switch (block.kind) {
+	case PreparedBlockKind::Table:
+		return paintSt.table.overflowFg->c;
+	case PreparedBlockKind::DisplayMath:
+		return paintSt.displayMath.overflowFg->c;
+	case PreparedBlockKind::CodeBlock:
+		return paintSt.textPalette.monoFg->c;
+	case PreparedBlockKind::Quote:
+		return NonPullquoteQuoteCaptionColor(context, st);
+	case PreparedBlockKind::Details:
+		return paintSt.supplementaryTextColor->c;
+	case PreparedBlockKind::EmbedPost:
+		return paintSt.embedPost.accentFg->c;
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Thinking:
+	case PreparedBlockKind::Heading:
+	case PreparedBlockKind::Rule:
+	case PreparedBlockKind::List:
+	case PreparedBlockKind::ListItem:
+	case PreparedBlockKind::Photo:
+	case PreparedBlockKind::Video:
+	case PreparedBlockKind::Audio:
+	case PreparedBlockKind::Map:
+	case PreparedBlockKind::Channel:
+	case PreparedBlockKind::GroupedMedia:
+	case PreparedBlockKind::RelatedArticle:
+	case PreparedBlockKind::Placeholder:
+		return paintSt.table.overflowFg->c;
+	}
+	return paintSt.table.overflowFg->c;
+}
+
+[[nodiscard]] bool HorizontalRightEdgeHidden(const LaidOutBlock &block) {
+	return block.horizontalScrollMax > 0
+		&& (block.horizontalScrollLeft < block.horizontalScrollMax);
+}
+
+[[nodiscard]] QRect HorizontalScrollLogicalPaintRect(
+		const LaidOutBlock &block) {
+	if (block.insideHorizontalScroll) {
+		return block.logicalGeometry.outer.translated(
+			block.horizontalScrollAncestorShift,
+			0);
+	}
+	return block.outer;
+}
+
+void PaintHorizontalOverflowIndicators(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context,
+		QRect viewport,
+		const QPainterPath *clipPath = nullptr) {
+	if (block.horizontalScrollMax <= 0 || viewport.isEmpty()) {
+		return;
+	}
+	const auto indicatorWidth = std::min(
+		std::max(OverflowIndicatorWidth(block, st), 1),
+		viewport.width());
+	if (indicatorWidth <= 0) {
+		return;
+	}
+	const auto left = (block.horizontalScrollLeft > 0);
+	const auto right = HorizontalRightEdgeHidden(block);
+	if (!left && !right) {
+		return;
+	}
+	const auto color = ScrollOwnerAccentColor(block, st, context);
+	p.save();
+	p.setClipRect(viewport, Qt::IntersectClip);
+	if (clipPath) {
+		p.setClipPath(*clipPath, Qt::IntersectClip);
+	}
+	if (left) {
+		p.fillRect(
+			QRect(
+				viewport.x(),
+				viewport.y(),
+				indicatorWidth,
+				viewport.height()),
+			color);
+	}
+	if (right) {
+		p.fillRect(
+			QRect(
+				viewport.x()
+					+ viewport.width()
+					- indicatorWidth,
+				viewport.y(),
+				indicatorWidth,
+				viewport.height()),
+			color);
+	}
+	p.restore();
+}
+
+void PaintHorizontalScrollbar(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	if (block.horizontalScrollMax <= 0
+		|| block.scrollScrollbarTrackRect.isEmpty()) {
+		return;
+	}
+	const auto scrollbarRect = block.scrollScrollbarTrackRect.united(
+		block.scrollScrollbarThumbRect);
+	const auto scrollbarClip = context.clip.intersected(scrollbarRect);
+	if (scrollbarClip.isEmpty()) {
+		return;
+	}
+	const auto &paintSt = PaintStyle(context, st);
+	auto trackBg = QColor();
+	auto thumbBg = QColor();
+	if (block.kind == PreparedBlockKind::Table) {
+		trackBg = EffectiveTableHeaderBg(paintSt, context);
+		thumbBg = EffectiveTableBorderFg(paintSt, context);
+	} else {
+		thumbBg = ScrollOwnerAccentColor(block, st, context);
+		trackBg = thumbBg;
+		trackBg.setAlphaF(trackBg.alphaF() * 0.25);
+	}
+	const auto radius = block.scrollScrollbarTrackRect.height() / 2.;
+	p.save();
+	p.setClipRect(scrollbarClip, Qt::IntersectClip);
+	if (radius > 0.) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(trackBg);
+		p.drawRoundedRect(
+			QRectF(block.scrollScrollbarTrackRect),
+			radius,
+			radius);
+		if (!block.scrollScrollbarThumbRect.isEmpty()) {
+			p.setBrush(thumbBg);
+			p.drawRoundedRect(
+				QRectF(block.scrollScrollbarThumbRect),
+				radius,
+				radius);
+		}
+	} else {
+		p.fillRect(block.scrollScrollbarTrackRect, trackBg);
+		if (!block.scrollScrollbarThumbRect.isEmpty()) {
+			p.fillRect(block.scrollScrollbarThumbRect, thumbBg);
+		}
+	}
+	p.restore();
+}
+
+void PaintWholeTable(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	const auto tableClip = context.clip.intersected(block.visibleTableRect);
+	if (tableClip.isEmpty()) {
+		return;
+	}
+	const auto tableContext = ClippedContext(context, tableClip);
+
+	const auto border = TableBorder(block, st);
+	const auto radius = st.table.radius;
+	const auto shapePath = TableShapePath(block, border, radius);
+	const auto &paintSt = PaintStyle(context, st);
+	const auto headerBg = EffectiveTableHeaderBg(paintSt, context);
+	const auto borderFg = EffectiveTableBorderFg(paintSt, context);
+
+	p.save();
+	p.setClipRect(tableClip);
+	p.save();
+	p.setClipPath(shapePath, Qt::IntersectClip);
+	for (auto rowIndex = 0, rowCount = int(block.tableRows.size()); rowIndex != rowCount; ++rowIndex) {
+		const auto striped = block.tableStriped && ((rowIndex % 2) == 0);
+		for (const auto &cell : block.tableRows[rowIndex].cells) {
+			if (!cell.outer.intersects(tableClip)) {
+				continue;
+			}
+			if (!cell.header && !striped) {
+				continue;
+			}
+			p.fillRect(cell.outer, headerBg);
+		}
+	}
+	p.restore();
+
+	if (border > 0 && !block.visibleTableRect.isEmpty()) {
+		const auto path = TableBorderPath(block, border, shapePath);
+		auto hq = PainterHighQualityEnabler(p);
+		auto pen = QPen(borderFg, border);
+		p.setPen(pen);
+		p.setBrush(Qt::NoBrush);
+		p.drawPath(path);
+	}
+
+	p.setPen(paintSt.textColor->c);
+	for (const auto &row : block.tableRows) {
+		if (!row.outer.intersects(tableClip)) {
+			continue;
+		}
+		for (const auto &cell : row.cells) {
+			if (!cell.textRect.intersects(tableClip)) {
+				continue;
+			}
+			const auto selection = TextSelectionForSegmentIndex(
+				context.selectionState,
+				cell.segmentIndex);
+			if (!PaintEditPlaceholderLeaf(
+					p,
+					cell.placeholderLeaf,
+					cell.leaf.isEmpty(),
+					tableContext,
+					cell.textRect,
+					cell.textWidth,
+					cell.segmentIndex,
+					st,
+					cell.align,
+					selection)) {
+				PaintSelectableTextLeaf(
+					p,
+					cell.leaf,
+					tableContext,
+					cell.textRect,
+					cell.textWidth,
+					cell.segmentIndex,
+					cell.align,
+					selection);
+			}
+		}
+	}
+
+	if (block.segmentIndex >= 0
+		&& WholeSegmentSelected(
+			context.selectionState,
+			block.segmentIndex)) {
+		p.save();
+		p.setClipPath(shapePath, Qt::IntersectClip);
+		p.fillRect(block.visibleTableRect, p.textPalette().selectOverlay);
+		p.restore();
+	}
+	PaintStructuralTableOverlays(
+		p,
+		block,
+		shapePath,
+		tableClip,
+		context);
+
+	PaintHorizontalOverflowIndicators(
+		p,
+		block,
+		st,
+		context,
+		block.visibleTableRect,
+		&shapePath);
+
+	p.restore();
+}
+
+void PaintTableRowBand(
+		Painter &p,
+		const LaidOutBlock &block,
+		const TableOwnershipGrid &ownership,
+		int rowIndex,
+		QRect rowBand,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	const auto rowClip = context.clip.intersected(rowBand);
+	if (rowClip.isEmpty()) {
+		return;
+	}
+
+	const auto border = TableBorder(block, st);
+	const auto radius = st.table.radius;
+	const auto shapePath = TableShapePath(block, border, radius);
+	const auto &paintSt = PaintStyle(context, st);
+	const auto headerBg = EffectiveTableHeaderBg(paintSt, context);
+	const auto borderFg = EffectiveTableBorderFg(paintSt, context);
+	const auto cells = TableCellsForRowBand(ownership, rowIndex, rowBand);
+	const auto rowContext = ClippedContext(
+		RevealSuppressedContext(context),
+		rowClip);
+
+	p.save();
+	p.setClipRect(rowClip, Qt::IntersectClip);
+	p.save();
+	p.setClipPath(shapePath, Qt::IntersectClip);
+	for (const auto cell : cells) {
+		if (!cell || !cell->outer.intersects(rowClip)) {
+			continue;
+		}
+		const auto originRow = TableCellOriginRow(block, cell);
+		const auto striped = block.tableStriped
+			&& (originRow >= 0)
+			&& ((originRow % 2) == 0);
+		if (!cell->header && !striped) {
+			continue;
+		}
+		p.fillRect(cell->outer, headerBg);
+	}
+	p.restore();
+
+	if (border > 0 && !block.visibleTableRect.isEmpty()) {
+		const auto path = TableBorderPath(block, border, shapePath);
+		auto hq = PainterHighQualityEnabler(p);
+		auto pen = QPen(borderFg, border);
+		p.setPen(pen);
+		p.setBrush(Qt::NoBrush);
+		p.drawPath(path);
+	}
+
+	p.setPen(paintSt.textColor->c);
+	for (const auto cell : cells) {
+		if (!cell || !cell->textRect.intersects(rowClip)) {
+			continue;
+		}
+		const auto selection = TextSelectionForSegmentIndex(
+			context.selectionState,
+			cell->segmentIndex);
+		if (!PaintEditPlaceholderLeaf(
+				p,
+				cell->placeholderLeaf,
+				cell->leaf.isEmpty(),
+				rowContext,
+				cell->textRect,
+				cell->textWidth,
+				cell->segmentIndex,
+				st,
+				cell->align,
+				selection)) {
+			PaintSelectableTextLeaf(
+				p,
+				cell->leaf,
+				rowContext,
+				cell->textRect,
+				cell->textWidth,
+				cell->segmentIndex,
+				cell->align,
+				selection);
+		}
+	}
+
+	if (block.segmentIndex >= 0
+		&& WholeSegmentSelected(
+			context.selectionState,
+			block.segmentIndex)) {
+		p.save();
+		p.setClipPath(shapePath, Qt::IntersectClip);
+		p.fillRect(block.visibleTableRect, p.textPalette().selectOverlay);
+		p.restore();
+	}
+	PaintStructuralTableRowBandOverlays(
+		p,
+		block,
+		cells,
+		rowIndex,
+		shapePath,
+		rowClip,
+		context);
+
+	PaintHorizontalOverflowIndicators(
+		p,
+		block,
+		st,
+		context,
+		block.visibleTableRect,
+		&shapePath);
+
+	p.restore();
+}
+
+void PaintTableBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	PaintTableCaption(p, block, st, context);
+	if (!context.reveal) {
+		PaintWholeTable(p, block, st, context);
+	} else {
+		const auto ownership = BuildTableOwnershipGrid(block);
+		for (auto rowIndex = 0;
+			rowIndex != int(block.tableRows.size());
+			++rowIndex) {
+			const auto rowBand = TableRowRevealBand(block, st, rowIndex);
+			PaintRevealBand(
+				p,
+				context,
+				rowBand,
+				[&](Painter &p, const MarkdownArticlePaintContext &rowContext) {
+					PaintTableRowBand(
+						p,
+						block,
+						ownership,
+						rowIndex,
+						rowBand,
+						st,
+						rowContext);
+				});
+		}
+	}
+	PaintHorizontalScrollbar(p, block, st, context);
+}
+
+void PaintDisplayMathBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		int devicePixelRatio,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	PaintRevealBand(
+		p,
+		context,
+		block.visibleFormulaRect,
+		[&](Painter &p, const MarkdownArticlePaintContext &formulaContext) {
+			if (block.segmentIndex >= 0
+				&& (formulaContext.hiddenSegmentIndex == block.segmentIndex)) {
+				return;
+			}
+			const auto &paintSt = PaintStyle(formulaContext, st);
+			const auto formula = PreparedFormulaFor(formulas, block.formulaIndex);
+			p.setPen(paintSt.textColor->c);
+			const auto rendered = EnsureFormulaRendered(
+				formula,
+				FormulaRasterSlot(renderedFormulas, block.formulaIndex),
+				renderer,
+				devicePixelRatio,
+				st);
+			if (rendered.success) {
+				p.drawImage(
+					block.formulaRect.topLeft(),
+					ColorizedDisplayFormulaImage(
+						block,
+						rendered,
+						p.pen().color()));
+			}
+			if (!rendered.success) {
+				if (!PaintEditPlaceholderLeaf(
+						p,
+						block.placeholderLeaf,
+						block.copyText.trimmed().isEmpty(),
+						formulaContext,
+						block.textRect,
+						block.textWidth,
+						block.segmentIndex,
+						st,
+						block.formulaAlign)) {
+					p.setPen(paintSt.textColor->c);
+					PaintSelectableTextLeaf(
+						p,
+						block.fallbackLeaf,
+						formulaContext,
+						block.textRect,
+						block.textWidth,
+						block.segmentIndex,
+						block.formulaAlign);
+				}
+			}
+
+			if (block.segmentIndex >= 0
+				&& WholeSegmentSelected(
+					formulaContext.selectionState,
+					block.segmentIndex)) {
+				p.fillRect(
+					block.visibleFormulaRect,
+					p.textPalette().selectOverlay);
+			}
+
+		});
+	PaintHorizontalOverflowIndicators(
+		p,
+		block,
+		st,
+		context,
+		block.scrollViewportRect.isEmpty()
+			? block.visibleFormulaRect
+			: block.scrollViewportRect);
+	PaintHorizontalScrollbar(p, block, st, context);
+}
+
+void PaintQuoteBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		int devicePixelRatio,
+		int outerWidth,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	const auto quoteClip = context.clip.intersected(block.outer);
+	if (quoteClip.isEmpty()) {
+		return;
+	}
+
+	if (context.caches.blockquote) {
+		if (!block.pullquote) {
+			const auto &quoteStyle = st.body.blockquote;
+			Ui::Text::ValidateQuotePaintCache(
+				*context.caches.blockquote,
+				quoteStyle);
+
+			p.save();
+			p.setClipRect(quoteClip);
+			Ui::Text::FillQuotePaint(
+				p,
+				HorizontalScrollLogicalPaintRect(block),
+				*context.caches.blockquote,
+				quoteStyle);
+			p.restore();
+		}
+	}
+
+	auto local = ClippedContext(
+		context,
+		context.clip.intersected(block.contentRect));
+	if (!block.pullquote) {
+		local.caches.supplementaryColorOverride
+			= NonPullquoteQuoteCaptionColor(context, st);
+	}
+	PaintBlocks(
+		p,
+		block.children,
+		formulas,
+		renderedFormulas,
+		renderer,
+		devicePixelRatio,
+		outerWidth,
+		st,
+		local);
+	PaintHorizontalOverflowIndicators(
+		p,
+		block,
+		st,
+		context,
+		block.scrollViewportRect);
+	PaintHorizontalScrollbar(p, block, st, context);
+}
+
+void PaintCodeBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	const auto clip = context.clip.intersected(block.outer);
+	if (clip.isEmpty()) {
+		return;
+	}
+
+	const auto &pre = st.code.pre;
+	if (context.caches.pre) {
+		Ui::Text::ValidateQuotePaintCache(*context.caches.pre, pre);
+
+		p.save();
+		p.setClipRect(clip);
+		Ui::Text::FillQuotePaint(
+			p,
+			block.outer,
+			*context.caches.pre,
+			pre);
+		p.restore();
+	}
+
+	if (!block.headerRect.isEmpty()) {
+		const auto headerText = block.codeLanguage.isEmpty()
+			? Ui::Integration::Instance().phraseQuoteHeaderCopy()
+			: block.codeLanguage;
+		const auto font = st.code.font->monospace();
+		const auto availableWidth = block.outer.width()
+			- pre.headerPosition.x()
+			- pre.iconPosition.x()
+			- (!pre.icon.empty() ? pre.icon.width() : 0);
+		if (availableWidth > 0) {
+			const auto position = block.outer.topLeft()
+				+ pre.headerPosition;
+			p.save();
+			p.setClipRect(clip);
+			p.setFont(font);
+			p.setPen(p.textPalette().monoFg->c);
+			p.drawText(
+				position + QPoint(0, font->ascent),
+				font->elided(headerText, availableWidth));
+			p.restore();
+		}
+	}
+
+	const auto textClip = context.clip.intersected(block.contentRect);
+	const auto textContext = ClippedContext(context, textClip);
+	p.save();
+	const auto selection = TextSelectionForSegmentIndex(
+		textContext.selectionState,
+		block.segmentIndex);
+	if (!PaintEditPlaceholderLeaf(
+			p,
+			block.placeholderLeaf,
+			block.codeText.text.isEmpty(),
+			textContext,
+			block.textRect,
+			block.textWidth,
+			block.segmentIndex,
+			st,
+			style::al_left,
+			selection)) {
+		p.setPen(p.textPalette().monoFg->c);
+		PaintSelectableTextLeaf(
+			p,
+			block.leaf,
+			textContext,
+			block.textRect,
+			block.textWidth,
+			block.segmentIndex,
+			style::al_left,
+			selection);
+	}
+	p.restore();
+	PaintHorizontalOverflowIndicators(
+		p,
+		block,
+		st,
+		context,
+		block.scrollViewportRect.isEmpty()
+			? block.contentRect
+			: block.scrollViewportRect);
+	PaintHorizontalScrollbar(p, block, st, context);
+}
+
+void PaintPlaceholderBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		int outerWidth,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	PaintRevealBand(
+		p,
+		context,
+		block.visibleMediaRect,
+		[&](Painter &p, const MarkdownArticlePaintContext &visibleContext) {
+			auto hq = PainterHighQualityEnabler(p);
+			if (block.activation.kind == MediaActivationKind::Embed
+				&& block.placeholderRuntime) {
+				const auto border = st.placeholder.border;
+				const auto radius = st.placeholder.radius;
+				const auto borderSkip = border / 2;
+				const auto borderRect = block.mediaRect.marginsRemoved(QMargins(
+					borderSkip,
+					borderSkip,
+					borderSkip,
+					borderSkip));
+				const auto active = ClickHandler::showAsActive(
+					block.placeholderRuntime->clickHandler);
+				const auto pressed = ClickHandler::showAsPressed(
+					block.placeholderRuntime->clickHandler);
+				p.setPen(Qt::NoPen);
+				p.setBrush(st.placeholder.bg);
+				p.drawRoundedRect(block.mediaRect, radius, radius);
+				if (active || pressed) {
+					p.setBrush(st.placeholder.bgActive);
+					p.drawRoundedRect(block.mediaRect, radius, radius);
+				}
+				if (const auto &ripple = block.placeholderRuntime->ripple) {
+					ripple->paint(
+						p,
+						block.mediaRect.x(),
+						block.mediaRect.y(),
+						outerWidth,
+						&st.placeholder.rippleBg->c);
+				}
+				auto pen = QPen(st.placeholder.borderFg->c);
+				pen.setWidth(border);
+				p.setPen(pen);
+				p.setBrush(Qt::NoBrush);
+				p.drawRoundedRect(borderRect, radius, radius);
+				if (block.placeholderRuntime->loading) {
+					const auto size = QSize(
+						st.placeholder.spinnerSize,
+						st.placeholder.spinnerSize);
+					const auto spinner = style::centerrect(
+						block.mediaRect,
+						QRect(QPoint(), size));
+					Ui::InfiniteRadialAnimation::Draw(
+						p,
+						block.placeholderRuntime->loadingAnimation.computeState(),
+						spinner.topLeft(),
+						spinner.size(),
+						outerWidth,
+						QPen(st.placeholder.spinnerFg->c),
+						st.placeholder.spinnerWidth);
+				} else {
+					p.setPen(st.placeholder.labelFgActive->c);
+					PaintTextLeaf(
+						p,
+						block.labelLeaf,
+						visibleContext,
+						block.labelRect,
+						block.labelWidth,
+						style::al_center);
+				}
+			} else {
+				const auto max = block.labelLeaf.maxWidth();
+				const auto radius = st.placeholder.radius;
+				p.setBrush(st.placeholder.bg);
+				p.setPen(Qt::NoPen);
+				const auto skip = (max < block.labelRect.width())
+					? ((block.labelRect.width() - max) / 2)
+					: 0;
+				p.drawRoundedRect(
+					block.labelRect.marginsRemoved(
+						{ skip, 0, skip, 0 }
+					).marginsAdded(st.placeholder.padding),
+					radius,
+					radius);
+				p.setPen(st.placeholder.labelFg->c);
+				PaintTextLeaf(
+					p,
+					block.labelLeaf,
+					visibleContext,
+					block.labelRect,
+					block.labelWidth,
+					style::al_center);
+			}
+			if (block.segmentIndex >= 0
+				&& WholeSegmentSelected(
+					visibleContext.selectionState,
+					block.segmentIndex)) {
+				p.fillRect(block.visibleMediaRect, p.textPalette().selectOverlay);
+			}
+		});
+	if (!block.textRect.isEmpty()) {
+		const auto selection = TextSelectionForSegmentIndex(
+			context.selectionState,
+			block.secondarySegmentIndex);
+		if (!PaintEditPlaceholderLeaf(
+				p,
+				block.placeholderLeaf,
+				block.leaf.isEmpty(),
+				context,
+				block.textRect,
+				block.textWidth,
+				block.secondarySegmentIndex,
+				st,
+				style::al_left,
+				selection)) {
+			SetTextLeafPen(p, block, st, context);
+			PaintSelectableTextLeaf(
+				p,
+				block.leaf,
+				context,
+				block.textRect,
+				block.textWidth,
+				block.secondarySegmentIndex,
+				style::al_left,
+				selection);
+		}
+	}
+}
+
+[[nodiscard]] QPainterPath RoundedRectPath(QRect rect, int radius) {
+	auto path = QPainterPath();
+	path.addRoundedRect(QRectF(rect), radius, radius);
+	return path;
+}
+
+void PaintEmbedPostBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		int devicePixelRatio,
+		int outerWidth,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	const auto &style = st.embedPost;
+	const auto paintHeader = [&](
+			Painter &p,
+			const MarkdownArticlePaintContext &headerContext) {
+		RefreshBlockThumbnail(block, headerContext);
+		if (style.accentWidth > 0) {
+			p.fillRect(
+				QRect(
+					block.mediaRect.x(),
+					block.mediaRect.y(),
+					style.accentWidth,
+					block.mediaRect.height()),
+				style.accentFg->c);
+		}
+		if (block.photoRuntime && !block.thumbnailRect.isEmpty()) {
+			auto hq = PainterHighQualityEnabler(p);
+			const auto avatarPath = RoundedRectPath(
+				block.thumbnailRect,
+				style.avatarRadius);
+			p.save();
+			p.setClipPath(
+				avatarPath,
+				Qt::IntersectClip);
+			(void)PaintThumbnailImage(
+				p,
+				block.thumbnailRect,
+				block.thumbnailImage,
+				block.previousThumbnailImage);
+			p.restore();
+		}
+		if (!block.labelRect.isEmpty()) {
+			p.setPen(style.authorFg->c);
+			PaintSelectableTextLeaf(
+				p,
+				block.labelLeaf,
+				headerContext,
+				block.labelRect,
+				block.labelWidth,
+				block.segmentIndex,
+				style::al_left,
+				TextSelectionForSegmentIndex(
+					headerContext.selectionState,
+					block.segmentIndex));
+		}
+		if (!block.subtitleRect.isEmpty()) {
+			p.setPen(style.dateFg->c);
+			PaintSelectableTextLeaf(
+				p,
+				block.subtitleLeaf,
+				headerContext,
+				block.subtitleRect,
+				block.subtitleWidth,
+				block.secondarySegmentIndex,
+				style::al_left,
+				TextSelectionForSegmentIndex(
+					headerContext.selectionState,
+					block.secondarySegmentIndex));
+		}
+	};
+	if (context.reveal) {
+		if (!block.headerRect.isEmpty()) {
+			const auto headerBottom = block.headerRect.y()
+				+ block.headerRect.height();
+			PaintRevealBand(
+				p,
+				context,
+				QRect(
+					block.mediaRect.x(),
+					block.mediaRect.y(),
+					block.mediaRect.width(),
+					headerBottom - block.mediaRect.y()),
+				paintHeader);
+		} else if (block.children.empty()) {
+			PaintRevealBand(p, context, block.mediaRect, paintHeader);
+		}
+	} else {
+		const auto mediaClip = context.clip.intersected(block.mediaRect);
+		if (!mediaClip.isEmpty()) {
+			const auto mediaContext = ClippedContext(context, mediaClip);
+			p.save();
+			p.setClipRect(mediaClip);
+			paintHeader(p, mediaContext);
+			p.restore();
+		}
+	}
+	if (context.reveal
+		&& style.accentWidth > 0
+		&& !block.children.empty()) {
+		const auto top = !block.headerRect.isEmpty()
+			? block.headerRect.y() + block.headerRect.height()
+			: block.mediaRect.y();
+		const auto bottom = block.mediaRect.y() + block.mediaRect.height();
+		const auto accentRect = QRect(
+			block.mediaRect.x(),
+			top,
+			style.accentWidth,
+			std::max(bottom - top, 0));
+		const auto accentClip = context.clip.intersected(accentRect);
+		if (!accentClip.isEmpty()) {
+			p.save();
+			p.setClipRect(accentClip);
+			p.fillRect(accentRect, style.accentFg->c);
+			p.restore();
+		}
+	}
+	if (!block.bodyRect.isEmpty()) {
+		const auto bodyContext = ClippedContext(
+			context,
+			context.clip.intersected(
+				block.scrollViewportRect.isEmpty()
+					? block.bodyRect
+					: block.scrollViewportRect));
+		PaintBlocks(
+			p,
+			block.children,
+			formulas,
+			renderedFormulas,
+			renderer,
+			devicePixelRatio,
+			outerWidth,
+			st,
+			bodyContext);
+	}
+	PaintHorizontalOverflowIndicators(
+		p,
+		block,
+		st,
+		context,
+		block.scrollViewportRect);
+	PaintHorizontalScrollbar(p, block, st, context);
+	if (!block.textRect.isEmpty()) {
+		SetTextLeafPen(p, block, st, context);
+		PaintSelectableTextLeaf(
+			p,
+			block.leaf,
+			context,
+			block.textRect,
+			block.textWidth,
+			block.tertiarySegmentIndex,
+			style::al_left,
+			TextSelectionForSegmentIndex(
+				context.selectionState,
+				block.tertiarySegmentIndex));
+	}
+}
+
+void PaintMediaCaption(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	if (block.textRect.isEmpty()) {
+		return;
+	}
+	const auto selection = TextSelectionForSegmentIndex(
+		context.selectionState,
+		block.secondarySegmentIndex);
+	if (!PaintEditPlaceholderLeaf(
+			p,
+			block.placeholderLeaf,
+			block.leaf.isEmpty(),
+			context,
+			block.textRect,
+			block.textWidth,
+			block.secondarySegmentIndex,
+			st,
+			style::al_left,
+			selection)) {
+		SetTextLeafPen(p, block, st, context);
+		PaintSelectableTextLeaf(
+			p,
+			block.leaf,
+			context,
+			block.textRect,
+			block.textWidth,
+			block.secondarySegmentIndex,
+			style::al_left,
+			selection);
+	}
+}
+
+void PaintPersistentMediaBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		const MarkdownArticlePaintContext &context) {
+	PaintRevealBand(
+		p,
+		context,
+		block.visibleMediaRect,
+		[&](Painter &p, const MarkdownArticlePaintContext &mediaContext) {
+			if (block.mediaBlock) {
+				block.mediaBlock->paint(p, mediaContext);
+			}
+			if (block.segmentIndex >= 0
+				&& WholeSegmentSelected(
+					mediaContext.selectionState,
+					block.segmentIndex)) {
+				p.fillRect(block.mediaRect, p.textPalette().selectOverlay);
+			}
+		});
+}
+
+void PaintCardSurface(
+		Painter &p,
+		QRect rect,
+		int border,
+		const style::color &borderFg,
+		const style::color &bg,
+		int radius) {
+	if (rect.isEmpty()) {
+		return;
+	}
+	if (border <= 0) {
+		if (radius > 0) {
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(bg->c);
+			p.drawRoundedRect(rect, radius, radius);
+		} else {
+			p.fillRect(rect, bg->c);
+		}
+		return;
+	}
+	const auto half = border / 2.;
+	const auto inner = QRectF(rect).marginsRemoved({
+		half,
+		half,
+		half,
+		half,
+	});
+	if (radius > 0) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(QPen(borderFg->c, border));
+		p.setBrush(bg->c);
+		p.drawRoundedRect(inner, radius, radius);
+	} else {
+		p.fillRect(rect, bg->c);
+		p.setPen(QPen(borderFg->c, border));
+		p.setBrush(Qt::NoBrush);
+		p.drawRect(inner);
+	}
+}
+
+void PaintAudioBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	PaintPersistentMediaBlock(p, block, context);
+	PaintMediaCaption(p, block, st, context);
+}
+
+void PaintChannelBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	PaintPersistentMediaBlock(p, block, context);
+	PaintMediaCaption(p, block, st, context);
+}
+
+void PaintRelatedArticleBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	PaintRevealBand(
+		p,
+		context,
+		block.visibleMediaRect,
+		[&](Painter &p, const MarkdownArticlePaintContext &visibleContext) {
+			const auto &style = st.relatedArticle;
+			RefreshRelatedArticleImages(block, visibleContext);
+			PaintCardSurface(
+				p,
+				block.mediaRect,
+				style.border,
+				style.borderFg,
+				style.bg,
+				style.radius);
+			if (!block.thumbnailRect.isEmpty()) {
+				p.fillRect(block.thumbnailRect, style.bg->c);
+				if (style.thumbnailRadius > 0) {
+					auto hq = PainterHighQualityEnabler(p);
+					auto path = RoundedRectPath(
+						block.thumbnailRect,
+						style.thumbnailRadius);
+					p.save();
+					p.setClipPath(path, Qt::IntersectClip);
+					(void)PaintRelatedArticleImage(
+						p,
+						block.thumbnailRect,
+						block.thumbnailImage,
+						block.fullImage,
+						block.previousThumbnailImage,
+						block.previousFullImage);
+					p.restore();
+				} else {
+					(void)PaintRelatedArticleImage(
+						p,
+						block.thumbnailRect,
+						block.thumbnailImage,
+						block.fullImage,
+						block.previousThumbnailImage,
+						block.previousFullImage);
+				}
+			}
+			if (!block.labelRect.isEmpty()) {
+				p.setPen(st.textColor->c);
+				PaintRelatedArticleTextLeaf(
+					p,
+					block.labelLeaf,
+					visibleContext,
+					block.labelRect,
+					block.labelWidth,
+					style.titleLines);
+			}
+			if (!block.subtitleRect.isEmpty()) {
+				p.setPen(st.textColor->c);
+				PaintRelatedArticleTextLeaf(
+					p,
+					block.subtitleLeaf,
+					visibleContext,
+					block.subtitleRect,
+					block.subtitleWidth,
+					style.subtitleLines);
+			}
+			if (!block.actionRect.isEmpty()) {
+				p.setPen(st.supplementaryTextColor->c);
+				PaintRelatedArticleTextLeaf(
+					p,
+					block.actionLeaf,
+					visibleContext,
+					block.actionRect,
+					block.actionWidth,
+					style.footerLines);
+			}
+			if (block.segmentIndex >= 0
+				&& WholeSegmentSelected(
+					visibleContext.selectionState,
+					block.segmentIndex)) {
+				p.fillRect(
+					block.visibleMediaRect,
+					p.textPalette().selectOverlay);
+			}
+			if (style.separator > 0) {
+				p.fillRect(
+					QRect(
+						block.mediaRect.x(),
+						block.mediaRect.y()
+							+ block.mediaRect.height()
+							- style.separator,
+						block.mediaRect.width(),
+						style.separator),
+					style.separatorFg->c);
+			}
+		});
+}
+
+void PaintPhotoBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	PaintPersistentMediaBlock(p, block, context);
+	PaintMediaCaption(p, block, st, context);
+}
+
+void PaintVideoBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	PaintPersistentMediaBlock(p, block, context);
+	PaintMediaCaption(p, block, st, context);
+}
+
+void PaintMapBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	PaintPersistentMediaBlock(p, block, context);
+	PaintMediaCaption(p, block, st, context);
+}
+
+void PaintGroupedMediaBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	PaintRevealBand(
+		p,
+		context,
+		block.visibleMediaRect,
+		[&](Painter &p, const MarkdownArticlePaintContext &mediaContext) {
+			if (block.mediaBlock) {
+				block.mediaBlock->paint(p, mediaContext);
+				if ((block.segmentIndex >= 0)
+					&& WholeSegmentSelected(
+						mediaContext.selectionState,
+						block.segmentIndex)) {
+					const auto &style = PaintStyle(
+						mediaContext,
+						st).groupedMedia;
+					auto overlay = p.textPalette().selectOverlay->c;
+					overlay.setAlphaF(std::clamp(
+						style.overlayOpacity,
+						0.,
+						1.));
+					p.fillPath(
+						RoundedRectPath(block.mediaRect, style.radius),
+						overlay);
+				}
+			}
+		});
+	PaintMediaCaption(p, block, st, context);
+}
+
+void PaintDetailsBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		int devicePixelRatio,
+		int outerWidth,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	const auto visible = context.clip.intersected(block.outer);
+	if (visible.isEmpty()) {
+		return;
+	}
+
+	const auto &details = st.details;
+	const auto &paintSt = PaintStyle(context, st);
+	const auto lineHeight = details.border;
+	const auto lineRect = QRect(
+		block.outer.x(),
+		block.outer.y() + block.outer.height() - lineHeight,
+		block.outer.width(),
+		lineHeight);
+	const auto lineFg = EffectiveDividerFg(paintSt, context);
+
+	p.save();
+	p.setClipRect(visible);
+	if (lineHeight > 0 && !lineRect.isEmpty()) {
+		p.fillRect(lineRect, lineFg);
+	}
+	if (!block.iconRect.isEmpty()) {
+		const auto collapsed = block.actionRect.isEmpty()
+			? block.collapsed
+			: !block.detailsOpen;
+		PaintDetailsIcon(
+			p,
+			block.iconRect,
+			paintSt.supplementaryTextColor->c,
+			collapsed);
+	}
+	const auto selection = TextSelectionForSegmentIndex(
+		context.selectionState,
+		block.segmentIndex);
+	if (!PaintEditPlaceholderLeaf(
+			p,
+			block.placeholderLeaf,
+			block.leaf.isEmpty(),
+			context,
+			block.textRect,
+			block.textWidth,
+			block.segmentIndex,
+			st,
+			style::al_left,
+			selection)) {
+		p.setPen(paintSt.textColor->c);
+		PaintSelectableTextLeaf(
+			p,
+			block.leaf,
+			context,
+			block.textRect,
+			block.textWidth,
+			block.segmentIndex,
+			style::al_left,
+			selection);
+	}
+	if (!block.actionRect.isEmpty()) {
+		p.setPen(paintSt.supplementaryTextColor->c);
+		PaintTextLeaf(
+			p,
+			block.actionLeaf,
+			context,
+			block.actionRect,
+			block.actionRect.width(),
+			style::al_right);
+	}
+	p.restore();
+
+	if (!block.bodyRect.isEmpty()) {
+		const auto bodyContext = ClippedContext(
+			context,
+			context.clip.intersected(block.bodyRect));
+		PaintBlocks(
+			p,
+			block.children,
+			formulas,
+			renderedFormulas,
+			renderer,
+			devicePixelRatio,
+			outerWidth,
+			st,
+			bodyContext);
+	}
+	PaintHorizontalOverflowIndicators(
+		p,
+		block,
+		st,
+		context,
+		block.scrollViewportRect);
+	PaintHorizontalScrollbar(p, block, st, context);
+}
+
+void PaintThinkingBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		int devicePixelRatio,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	const auto viewport = FlowTextViewportRect(block);
+	const auto contentClip = context.clip.intersected(viewport);
+	const auto &paintSt = PaintStyle(context, st);
+	const auto baseColor = paintSt.supplementaryTextColor;
+	const auto selection = TextSelectionForSegmentIndex(
+		context.selectionState,
+		block.segmentIndex);
+	const auto logicalRect = viewport;
+	const auto visible = context.clip.intersected(block.outer);
+	if (visible.isEmpty()) {
+		AdvanceRevealLinesForBlock(context, block, st);
+		return;
+	}
+
+	const auto thinking = context.caches.thinking;
+	const auto pathShiftGradient = context.caches.pathShiftGradient;
+	if (!thinking || !pathShiftGradient) {
+		if (!contentClip.isEmpty()) {
+			PaintThinkingTextLeafDirect(
+				p,
+				block,
+				st,
+				ClippedContext(context, contentClip));
+		}
+		PaintHorizontalOverflowIndicators(
+			p,
+			block,
+			st,
+			context,
+			viewport);
+		PaintHorizontalScrollbar(p, block, st, context);
+		return;
+	}
+	if (selection && !selection->empty()) {
+		if (!contentClip.isEmpty()) {
+			PaintThinkingTextLeafDirect(
+				p,
+				block,
+				st,
+				ClippedContext(context, contentClip));
+		}
+		PaintHorizontalOverflowIndicators(
+			p,
+			block,
+			st,
+			context,
+			viewport);
+		PaintHorizontalScrollbar(p, block, st, context);
+		return;
+	}
+
+	const auto ratio = std::max(devicePixelRatio, 1);
+	const auto cacheWidth = logicalRect.width() * ratio;
+	const auto cacheHeight = logicalRect.height() * ratio;
+	EnsureThinkingPaintCacheImage(
+		&thinking->mask,
+		logicalRect.size(),
+		ratio);
+	EnsureThinkingPaintCacheImage(
+		&thinking->gradient,
+		logicalRect.size(),
+		ratio);
+	thinking->mask.fill(Qt::transparent);
+
+	{
+		auto maskPainter = Painter(&thinking->mask);
+		maskPainter.translate(-logicalRect.topLeft());
+		maskPainter.setClipRect(logicalRect);
+		maskPainter.setPen(QColor(255, 255, 255));
+		PaintSelectableTextLeaf(
+			maskPainter,
+			block.leaf,
+			ClippedContext(context, logicalRect),
+			block.textRect,
+			block.textWidth,
+			block.segmentIndex,
+			style::al_left,
+			TextSelection());
+	}
+
+	const auto textWidth = ThinkingTextWidth(block);
+	const auto highlightColor = anim::color(
+		baseColor->c,
+		::st::radialFg->c,
+		0.8);
+	const auto localRect = QRect(QPoint(), logicalRect.size());
+	const auto painted = pathShiftGradient->paint(
+		[&](const Ui::PathShiftGradient::Background &) {
+			FillThinkingGradientImage(
+				&thinking->gradient,
+				logicalRect,
+				block.textRect,
+				textWidth,
+				baseColor->c,
+				highlightColor);
+			auto gradientPainter = Painter(&thinking->gradient);
+			gradientPainter.setCompositionMode(
+				QPainter::CompositionMode_DestinationIn);
+			gradientPainter.drawImage(
+				QRectF(localRect),
+				thinking->mask,
+				QRectF(0, 0, cacheWidth, cacheHeight));
+			gradientPainter.setCompositionMode(
+				QPainter::CompositionMode_SourceOver);
+			return true;
+		});
+	if (!painted) {
+		PaintHorizontalOverflowIndicators(
+			p,
+			block,
+			st,
+			context,
+			viewport);
+		PaintHorizontalScrollbar(p, block, st, context);
+		return;
+	}
+
+	p.save();
+	p.setClipRect(contentClip, Qt::IntersectClip);
+	p.drawImage(
+		QRectF(logicalRect),
+		thinking->gradient,
+		QRectF(0, 0, cacheWidth, cacheHeight));
+	p.restore();
+	PaintHorizontalOverflowIndicators(
+		p,
+		block,
+		st,
+		context,
+		viewport);
+	PaintHorizontalScrollbar(p, block, st, context);
+}
+
+void PaintStructuralBlockOverlay(
+		Painter &p,
+		const LaidOutBlock &block,
+		const MarkdownArticlePaintContext &context) {
+	if (!context.selectionState.hasStructuralSelection()
+		|| block.outer.isEmpty()) {
+		return;
+	}
+	const auto selected = (block.editBlock
+			&& StructuralBlockSelected(
+				context.selectionState,
+				*block.editBlock))
+		|| (block.editListItem
+			&& StructuralListItemSelected(
+				context.selectionState,
+				*block.editListItem));
+	if (!selected) {
+		return;
+	}
+	const auto visible = context.clip.intersected(block.outer);
+	if (visible.isEmpty()) {
+		return;
+	}
+	p.save();
+	p.setClipRect(visible, Qt::IntersectClip);
+	p.fillRect(block.outer, p.textPalette().selectOverlay);
+	p.restore();
+}
+
+void PaintBlock(
+		Painter &p,
+		const LaidOutBlock &block,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		int devicePixelRatio,
+		int outerWidth,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	if (!block.outer.intersects(context.clip)
+		&& block.kind != PreparedBlockKind::Thinking) {
+		return;
+	}
+	if (context.debugBlockGeometry && !block.outer.isEmpty()) {
+		switch (reinterpret_cast<quintptr>(&block) % 4) {
+		case 0:
+			p.fillRect(block.outer, QColor(128, 0, 0, 32));
+			break;
+		case 1:
+			p.fillRect(block.outer, QColor(0, 128, 0, 32));
+			break;
+		case 2:
+			p.fillRect(block.outer, QColor(0, 0, 128, 32));
+			break;
+		default:
+			p.fillRect(block.outer, QColor(128, 128, 128, 32));
+			break;
+		}
+	}
+	const auto &paintSt = PaintStyle(context, st);
+
+	switch (block.kind) {
+	case PreparedBlockKind::Thinking:
+		PaintThinkingBlock(p, block, devicePixelRatio, st, context);
+		break;
+	case PreparedBlockKind::Paragraph:
+	case PreparedBlockKind::Heading:
+		if (!block.headerRect.isEmpty()) {
+			p.fillRect(block.headerRect, paintSt.relatedArticle.headerBg->c);
+		}
+		{
+			const auto flowContext = ClippedContext(
+				context,
+				context.clip.intersected(FlowTextViewportRect(block)));
+			const auto selection = TextSelectionForSegmentIndex(
+				flowContext.selectionState,
+				block.segmentIndex);
+			if (!PaintEditPlaceholderLeaf(
+					p,
+					block.placeholderLeaf,
+					block.leaf.isEmpty(),
+					flowContext,
+					block.textRect,
+					block.textWidth,
+					block.segmentIndex,
+					st,
+					block.flowTextAlign,
+					selection)) {
+				SetTextLeafPen(p, block, st, context);
+				PaintSelectableTextLeaf(
+					p,
+					block.leaf,
+					flowContext,
+					block.textRect,
+					block.textWidth,
+					block.segmentIndex,
+					block.flowTextAlign,
+					selection);
+			}
+		}
+		PaintHorizontalOverflowIndicators(
+			p,
+			block,
+			st,
+			context,
+			FlowTextViewportRect(block));
+		PaintHorizontalScrollbar(p, block, st, context);
+		break;
+	case PreparedBlockKind::CodeBlock:
+		PaintCodeBlock(p, block, st, context);
+		break;
+	case PreparedBlockKind::Rule:
+		PaintRevealBand(
+			p,
+			context,
+			block.outer,
+			[&](Painter &p, const MarkdownArticlePaintContext &context) {
+				p.fillRect(block.outer, EffectiveDividerFg(paintSt, context));
+			});
+		break;
+	case PreparedBlockKind::List:
+		{
+			const auto childContext = block.scrollViewportRect.isEmpty()
+				? context
+				: ClippedContext(
+					context,
+					context.clip.intersected(block.scrollViewportRect));
+			PaintBlocks(
+				p,
+				block.children,
+				formulas,
+				renderedFormulas,
+				renderer,
+				devicePixelRatio,
+				outerWidth,
+				st,
+				childContext);
+			PaintHorizontalOverflowIndicators(
+				p,
+				block,
+				st,
+				context,
+				block.scrollViewportRect);
+			PaintHorizontalScrollbar(p, block, st, context);
+		}
+		break;
+	case PreparedBlockKind::ListItem:
+		if (!context.reveal
+			|| context.reveal->activeLine >= context.reveal->nextLine) {
+			const auto markerContext = RevealSuppressedContext(context);
+			if (block.taskState != TaskState::None) {
+				PaintTaskMarker(p, block, st, markerContext, outerWidth);
+			} else if (block.listKind == ListKind::Ordered
+				&& !block.markerRect.isEmpty()) {
+				p.setPen(paintSt.textColor->c);
+				PaintTextLeaf(
+					p,
+					block.marker,
+					markerContext,
+					block.markerRect,
+					block.markerWidth);
+			} else if (block.listKind == ListKind::Bullet) {
+				PaintBulletMarker(p, block, st, markerContext);
+			}
+		}
+		{
+			const auto childContext = block.scrollViewportRect.isEmpty()
+				? context
+				: ClippedContext(
+					context,
+					context.clip.intersected(block.scrollViewportRect));
+			PaintBlocks(
+				p,
+				block.children,
+				formulas,
+				renderedFormulas,
+				renderer,
+				devicePixelRatio,
+				outerWidth,
+				st,
+				childContext);
+			PaintHorizontalOverflowIndicators(
+				p,
+				block,
+				st,
+				context,
+				block.scrollViewportRect);
+			PaintHorizontalScrollbar(p, block, st, context);
+		}
+		break;
+	case PreparedBlockKind::Quote:
+		PaintQuoteBlock(
+			p,
+			block,
+			formulas,
+			renderedFormulas,
+			renderer,
+			devicePixelRatio,
+			outerWidth,
+			st,
+			context);
+		break;
+	case PreparedBlockKind::DisplayMath:
+		PaintDisplayMathBlock(
+			p,
+			block,
+			formulas,
+			renderedFormulas,
+			renderer,
+			devicePixelRatio,
+			st,
+			context);
+		break;
+	case PreparedBlockKind::Table:
+		PaintTableBlock(p, block, st, context);
+		break;
+	case PreparedBlockKind::Photo:
+		PaintPhotoBlock(p, block, st, context);
+		break;
+	case PreparedBlockKind::Video:
+		PaintVideoBlock(p, block, st, context);
+		break;
+	case PreparedBlockKind::Audio:
+		PaintAudioBlock(p, block, st, context);
+		break;
+	case PreparedBlockKind::Map:
+		PaintMapBlock(p, block, st, context);
+		break;
+	case PreparedBlockKind::Channel:
+		PaintChannelBlock(p, block, st, context);
+		break;
+	case PreparedBlockKind::RelatedArticle:
+		PaintRelatedArticleBlock(p, block, st, context);
+		break;
+	case PreparedBlockKind::EmbedPost:
+		PaintEmbedPostBlock(
+			p,
+			block,
+			formulas,
+			renderedFormulas,
+			renderer,
+			devicePixelRatio,
+			outerWidth,
+			st,
+			context);
+		break;
+	case PreparedBlockKind::Placeholder:
+		PaintPlaceholderBlock(p, block, outerWidth, st, context);
+		break;
+	case PreparedBlockKind::GroupedMedia:
+		PaintGroupedMediaBlock(p, block, st, context);
+		break;
+	case PreparedBlockKind::Details:
+		PaintDetailsBlock(
+			p,
+			block,
+			formulas,
+			renderedFormulas,
+			renderer,
+			devicePixelRatio,
+			outerWidth,
+			st,
+			context);
+		break;
+	}
+	PaintStructuralBlockOverlay(p, block, context);
+}
+
+} // namespace
+
+QColor NonPullquoteQuoteCaptionColor(
+		const MarkdownArticlePaintContext &context,
+		const style::Markdown &st) {
+	if (!context.caches.blockquote) {
+		return PaintStyle(context, st).supplementaryTextColor->c;
+	}
+	return anim::color(
+		context.caches.blockquote->bg,
+		context.caches.blockquote->outlines[0],
+		0.9);
+}
+
+void PaintBlocks(
+		Painter &p,
+		const std::vector<LaidOutBlock> &blocks,
+		std::vector<PreparedFormulaSlot> *formulas,
+		std::vector<RenderedFormula> *renderedFormulas,
+		MathRenderer *renderer,
+		int devicePixelRatio,
+		int outerWidth,
+		const style::Markdown &st,
+		const MarkdownArticlePaintContext &context) {
+	for (const auto &block : blocks) {
+		if (block.outer.bottom() < context.clip.top()) {
+			AdvanceRevealLinesForBlock(context, block, st);
+			continue;
+		} else if (block.outer.top() > context.clip.bottom()) {
+			break;
+		}
+		PaintBlock(
+			p,
+			block,
+			formulas,
+			renderedFormulas,
+			renderer,
+			devicePixelRatio,
+			outerWidth,
+			st,
+			context);
+	}
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_article_paint.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_paint.h
new file mode 100644
index 00000000000000..969176e0c1df7f
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_paint.h
@@ -0,0 +1,32 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_article_selection.h"
+
+class QColor;
+
+namespace Iv::Markdown {
+
+struct MarkdownArticlePaintContext;
+
+[[nodiscard]] QColor NonPullquoteQuoteCaptionColor(
+	const MarkdownArticlePaintContext &context,
+	const style::Markdown &st);
+void PaintBlocks(
+	Painter &p,
+	const std::vector<LaidOutBlock> &blocks,
+	std::vector<PreparedFormulaSlot> *formulas,
+	std::vector<RenderedFormula> *renderedFormulas,
+	MathRenderer *renderer,
+	int devicePixelRatio,
+	int outerWidth,
+	const style::Markdown &st,
+	const MarkdownArticlePaintContext &context);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_article_selection.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_selection.cpp
new file mode 100644
index 00000000000000..c0e03cc7b6688b
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_selection.cpp
@@ -0,0 +1,1302 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_article_selection.h"
+#include "iv/markdown/iv_markdown_prepare_links.h"
+#include "ui/text/text_utilities.h"
+
+#include "styles/style_iv.h"
+
+#include <algorithm>
+
+namespace Iv::Markdown {
+namespace {
+
+constexpr auto kCodeTabColumns = 4;
+const auto kPhotoCopyLabel = u"Photo"_q;
+
+struct TableCopySlot {
+	const LaidOutTableCell *cell = nullptr;
+	bool origin = false;
+};
+
+[[nodiscard]] auto BuildTableCopyGrid(const LaidOutBlock &block)
+-> std::vector<std::vector<TableCopySlot>> {
+	const auto rowCount = int(block.tableRows.size());
+	const auto columnCount = int(block.tableColumnWidths.size());
+	auto result = std::vector<std::vector<TableCopySlot>>(
+		std::max(rowCount, 0),
+		std::vector<TableCopySlot>(std::max(columnCount, 0)));
+	for (auto rowIndex = 0; rowIndex != rowCount; ++rowIndex) {
+		for (const auto &cell : block.tableRows[rowIndex].cells) {
+			const auto fromRow = std::clamp(rowIndex, 0, rowCount);
+			const auto toRow = std::clamp(rowIndex + cell.rowspan, 0, rowCount);
+			const auto fromColumn = std::clamp(cell.column, 0, columnCount);
+			const auto toColumn = std::clamp(
+				cell.column + cell.colspan,
+				0,
+				columnCount);
+			for (auto currentRow = fromRow; currentRow != toRow; ++currentRow) {
+				for (auto currentColumn = fromColumn;
+					currentColumn != toColumn;
+					++currentColumn) {
+					auto &slot = result[currentRow][currentColumn];
+					slot.cell = &cell;
+					slot.origin = (currentRow == rowIndex)
+						&& (currentColumn == cell.column);
+				}
+			}
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] QRect ClipRectHorizontally(QRect rect, QRect clip) {
+	if (rect.isEmpty() || clip.isEmpty()) {
+		return QRect();
+	}
+	const auto left = std::max(rect.x(), clip.x());
+	const auto right = std::min(
+		rect.x() + rect.width(),
+		clip.x() + clip.width());
+	return QRect(
+		left,
+		rect.y(),
+		std::max(right - left, 0),
+		rect.height());
+}
+
+[[nodiscard]] QRect VisibleTextRect(QRect textRect, QRect outerRect) {
+	return ClipRectHorizontally(textRect, outerRect);
+}
+
+void RefreshBlockSegmentRect(
+		const LaidOutBlock &block,
+		SelectableSegment *segment) {
+	if (!segment) {
+		return;
+	}
+	switch (segment->kind) {
+	case SelectableSegmentKind::DisplayMath:
+		segment->outerRect = block.visibleFormulaRect;
+		break;
+	case SelectableSegmentKind::Table:
+		segment->outerRect = block.visibleTableRect;
+		break;
+	case SelectableSegmentKind::Placeholder:
+	case SelectableSegmentKind::Photo:
+	case SelectableSegmentKind::Media:
+		segment->outerRect = block.visibleMediaRect;
+		break;
+	case SelectableSegmentKind::CodeBlock:
+		segment->outerRect = block.outer;
+		segment->textRect = VisibleTextRect(
+			block.textRect,
+			block.contentRect.isEmpty() ? block.outer : block.contentRect);
+		break;
+	case SelectableSegmentKind::TextLeaf: {
+		auto sourceRect = QRect();
+		auto containerRect = block.outer;
+		auto interactionRect = QRect();
+		if (segment->leaf == &block.leaf) {
+			sourceRect = block.textRect;
+			if (block.kind == PreparedBlockKind::Details) {
+				interactionRect = block.headerRect;
+				containerRect = block.headerRect;
+			} else if (block.kind == PreparedBlockKind::CodeBlock) {
+				containerRect = block.contentRect;
+			}
+		} else if (segment->leaf == &block.labelLeaf) {
+			sourceRect = block.labelRect;
+			containerRect = block.headerRect.isEmpty()
+				? block.outer
+				: block.headerRect;
+		} else if (segment->leaf == &block.subtitleLeaf) {
+			sourceRect = block.subtitleRect;
+			containerRect = block.headerRect.isEmpty()
+				? block.outer
+				: block.headerRect;
+		} else if (segment->leaf == &block.actionLeaf) {
+			sourceRect = block.actionRect;
+		}
+		const auto visibleRect = VisibleTextRect(sourceRect, containerRect);
+		segment->outerRect = interactionRect.isEmpty()
+			? visibleRect
+			: interactionRect;
+		segment->textRect = visibleRect;
+	} break;
+	}
+}
+
+[[nodiscard]] TextForMimeData CopyTextForDisplayMath(const LaidOutBlock &block) {
+	return TextForMimeData::Simple(u"$$"_q + block.copyText + u"$$"_q);
+}
+
+[[nodiscard]] TextForMimeData CopyTextForCodeBlock(
+		const LaidOutBlock &block,
+		TextSelection selection = AllTextSelection) {
+	if (selection == AllTextSelection) {
+		auto rich = block.codeText;
+		if (!rich.text.isEmpty()) {
+			rich.entities.push_back(EntityInText(
+				EntityType::Pre,
+				0,
+				rich.text.size(),
+				block.codeLanguage));
+			SortEntities(&rich);
+		}
+		return TextForMimeData::Rich(std::move(rich));
+	}
+	auto from = 0;
+	auto to = 0;
+	auto displayPosition = 0;
+	auto column = 0;
+	auto found = false;
+	const auto &text = block.codeText.text;
+	for (auto i = 0, count = int(text.size()); i != count; ++i) {
+		const auto ch = text[i];
+		const auto width = (ch == QChar::Tabulation)
+			? (kCodeTabColumns - (column % kCodeTabColumns))
+			: 1;
+		const auto nextDisplayPosition = displayPosition + width;
+		if (selection.to <= displayPosition) {
+			break;
+		}
+		if (selection.from < nextDisplayPosition
+			&& selection.to > displayPosition) {
+			if (!found) {
+				from = i;
+				found = true;
+			}
+			to = i + 1;
+		}
+		displayPosition = nextDisplayPosition;
+		if (Ui::Text::IsNewline(ch)) {
+			column = 0;
+		} else {
+			column += width;
+		}
+	}
+	if (!found || to <= from) {
+		return TextForMimeData();
+	}
+	auto rich = Ui::Text::Mid(block.codeText, from, to - from);
+	if (!rich.text.isEmpty()) {
+		rich.entities.push_back(EntityInText(
+			EntityType::Pre,
+			0,
+			rich.text.size(),
+			block.codeLanguage));
+		SortEntities(&rich);
+	}
+	return TextForMimeData::Rich(std::move(rich));
+}
+
+[[nodiscard]] TextForMimeData CopyTextForTable(const LaidOutBlock &block) {
+	const auto rowCount = int(block.tableRows.size());
+	const auto columnCount = int(block.tableColumnWidths.size());
+	auto result = TextForMimeData();
+	const auto grid = BuildTableCopyGrid(block);
+	if (!block.leaf.isEmpty()) {
+		result.append(block.leaf.toTextForMimeData());
+		if (rowCount > 0 && columnCount > 0) {
+			result.append(u"\n"_q);
+		}
+	}
+	for (auto rowIndex = 0; rowIndex != rowCount; ++rowIndex) {
+		if (rowIndex) {
+			result.append(u"\n"_q);
+		}
+		for (auto column = 0; column != columnCount; ++column) {
+			if (column) {
+				result.append(u"\t"_q);
+			}
+			const auto &slot = grid[rowIndex][column];
+			if (slot.origin && slot.cell) {
+				result.append(slot.cell->leaf.toTextForMimeData());
+			}
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] TextForMimeData CopyTextForTableRange(
+		const LaidOutBlock &block,
+		int rowFrom,
+		int rowTill,
+		int columnFrom,
+		int columnTill) {
+	const auto rowCount = int(block.tableRows.size());
+	const auto columnCount = int(block.tableColumnWidths.size());
+	rowFrom = std::clamp(rowFrom, 0, rowCount);
+	rowTill = std::clamp(rowTill, 0, rowCount);
+	columnFrom = std::clamp(columnFrom, 0, columnCount);
+	columnTill = std::clamp(columnTill, 0, columnCount);
+	if (rowTill <= rowFrom || columnTill <= columnFrom) {
+		return TextForMimeData();
+	}
+	const auto grid = BuildTableCopyGrid(block);
+	auto result = TextForMimeData();
+	auto emitted = std::vector<const LaidOutTableCell*>();
+	for (auto rowIndex = rowFrom; rowIndex != rowTill; ++rowIndex) {
+		if (rowIndex != rowFrom) {
+			result.append(u"\n"_q);
+		}
+		for (auto column = columnFrom; column != columnTill; ++column) {
+			if (column != columnFrom) {
+				result.append(u"\t"_q);
+			}
+			const auto &slot = grid[rowIndex][column];
+			if (slot.cell
+				&& (std::find(
+					emitted.begin(),
+					emitted.end(),
+					slot.cell) == emitted.end())) {
+				result.append(slot.cell->leaf.toTextForMimeData());
+				emitted.push_back(slot.cell);
+			}
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] TextForMimeData CopyTextForMediaBlock(
+		const QString &label,
+		const Ui::Text::String &captionLeaf) {
+	auto result = label.isEmpty()
+		? TextForMimeData()
+		: TextForMimeData::Simple(label);
+	if (!captionLeaf.isEmpty()) {
+		if (!result.empty()) {
+			result.append(u"\n"_q);
+		}
+		result.append(captionLeaf.toTextForMimeData());
+	}
+	return result;
+}
+
+[[nodiscard]] TextForMimeData CopyTextForSingleMediaBlock(
+		const LaidOutBlock &block,
+		const QString &fallback = QString()) {
+	const auto selectionData = block.mediaBlock
+		? block.mediaBlock->selectionData()
+		: MediaBlockSelectionData();
+	const auto label = !selectionData.copyText.isEmpty()
+		? selectionData.copyText
+		: !block.copyText.isEmpty()
+		? block.copyText
+		: !block.labelText.isEmpty()
+		? block.labelText
+		: fallback;
+	return CopyTextForMediaBlock(label, block.leaf);
+}
+
+[[nodiscard]] TextForMimeData CopyTextForPhotoBlock(const LaidOutBlock &block) {
+	return CopyTextForSingleMediaBlock(block, kPhotoCopyLabel);
+}
+
+[[nodiscard]] TextForMimeData CopyTextForPlaceholderBlock(
+		const LaidOutBlock &block) {
+	return CopyTextForMediaBlock(
+		block.labelText.isEmpty() ? block.copyText : block.labelText,
+		block.leaf);
+}
+
+[[nodiscard]] int AddSelectableSegment(
+		std::vector<SelectableSegment> *segments,
+		SelectableSegment segment) {
+	segment.index = int(segments->size());
+	segment.length = std::max(segment.length, 0);
+	segments->push_back(std::move(segment));
+	return segment.index;
+}
+
+[[nodiscard]] int CompareSelectionPositions(
+		MarkdownArticleSelectionPosition a,
+		MarkdownArticleSelectionPosition b) {
+	if (a.segment != b.segment) {
+		return (a.segment < b.segment) ? -1 : 1;
+	}
+	if (a.offset != b.offset) {
+		return (a.offset < b.offset) ? -1 : 1;
+	}
+	return 0;
+}
+
+[[nodiscard]] MarkdownArticleSelection NormalizeSelection(
+		MarkdownArticleSelection selection) {
+	if (selection.empty()) {
+		return {};
+	}
+	if (CompareSelectionPositions(selection.from, selection.to) > 0) {
+		std::swap(selection.from, selection.to);
+	}
+	return selection;
+}
+
+[[nodiscard]] int LastTableCellSegmentIndex(
+		const std::vector<SelectableSegment> *segments,
+		int tableSegmentIndex) {
+	auto result = tableSegmentIndex;
+	if (!segments) {
+		return result;
+	}
+	for (const auto &segment : *segments) {
+		if (segment.tableSegmentIndex == tableSegmentIndex) {
+			result = std::max(result, segment.index);
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] std::optional<int> SingleTableCellSelection(
+		const PaintSelectionState &selectionState,
+		int tableSegmentIndex) {
+	if (selectionState.empty()
+		|| !selectionState.endpoints
+		|| tableSegmentIndex < 0) {
+		return std::nullopt;
+	}
+	const auto normalized = NormalizeSelection(selectionState.selection);
+	if (normalized.empty()) {
+		return std::nullopt;
+	}
+	const auto lastCellSegment = LastTableCellSegmentIndex(
+		selectionState.segments,
+		tableSegmentIndex);
+	const auto spansWholeTable = (normalized.from.segment < tableSegmentIndex)
+		&& (normalized.to.segment > lastCellSegment);
+	auto tableHit = false;
+	auto cellSegment = -1;
+	auto multipleCells = false;
+	const auto consider = [&](MarkdownArticleSelectionEndpoint endpoint) {
+		if (!endpoint.valid() || !endpoint.direct) {
+			return;
+		}
+		const auto segment = FindSegment(selectionState.segments, endpoint.segment);
+		if (!segment) {
+			return;
+		}
+		if (segment->index == tableSegmentIndex) {
+			tableHit = true;
+			return;
+		}
+		if (segment->tableSegmentIndex != tableSegmentIndex) {
+			return;
+		}
+		if (cellSegment < 0) {
+			cellSegment = segment->index;
+		} else if (cellSegment != segment->index) {
+			multipleCells = true;
+		}
+	};
+	consider(selectionState.endpoints->from);
+	consider(selectionState.endpoints->to);
+	if (tableHit || multipleCells || cellSegment < 0 || spansWholeTable) {
+		return std::nullopt;
+	}
+	return cellSegment;
+}
+
+[[nodiscard]] std::optional<TextSelection> BaseTextSelectionForSegment(
+		const SelectableSegment &segment,
+		MarkdownArticleSelection selection) {
+	if (selection.empty() || !segment.isTextLeaf()) {
+		return std::nullopt;
+	}
+	selection = NormalizeSelection(selection);
+	if (selection.empty()
+		|| selection.from.segment > segment.index
+		|| selection.to.segment < segment.index) {
+		return std::nullopt;
+	}
+	auto from = 0;
+	auto to = SegmentLength(segment);
+	if (selection.from.segment == segment.index) {
+		from = selection.from.offset;
+	}
+	if (selection.to.segment == segment.index) {
+		to = selection.to.offset;
+	}
+	from = std::clamp(from, 0, SegmentLength(segment));
+	to = std::clamp(to, 0, SegmentLength(segment));
+	if (from >= to) {
+		return std::nullopt;
+	}
+	return TextSelection(uint16(from), uint16(to));
+}
+
+[[nodiscard]] bool RangeSelectsWholeSegment(
+		const SelectableSegment &segment,
+		MarkdownArticleSelection selection) {
+	selection = NormalizeSelection(selection);
+	if (selection.empty()
+		|| selection.from.segment > segment.index
+		|| selection.to.segment < segment.index) {
+		return false;
+	}
+	auto from = 0;
+	auto to = SegmentLength(segment);
+	if (selection.from.segment == segment.index) {
+		from = selection.from.offset;
+	}
+	if (selection.to.segment == segment.index) {
+		to = selection.to.offset;
+	}
+	from = std::clamp(from, 0, SegmentLength(segment));
+	to = std::clamp(to, 0, SegmentLength(segment));
+	return (from < to);
+}
+
+[[nodiscard]] bool IndexInRange(int index, int from, int till) {
+	return (index >= from) && (index < till);
+}
+
+[[nodiscard]] bool RangesIntersect(
+		int firstFrom,
+		int firstTill,
+		int secondFrom,
+		int secondTill) {
+	return (firstFrom < secondTill) && (secondFrom < firstTill);
+}
+
+[[nodiscard]] const PreparedEditSelection *StructuralSelection(
+		const PaintSelectionState &selectionState,
+		PreparedEditSelectionKind kind) {
+	if (!selectionState.hasStructuralSelection()) {
+		return nullptr;
+	}
+	const auto selection = selectionState.structuralSelection;
+	return (selection->kind == kind) ? selection : nullptr;
+}
+
+[[nodiscard]] bool ContainerHasPrefix(
+		const PreparedEditBlockContainerPath &path,
+		const PreparedEditBlockContainerPath &prefix) {
+	if (path.steps.size() < prefix.steps.size()) {
+		return false;
+	}
+	return std::equal(
+		prefix.steps.begin(),
+		prefix.steps.end(),
+		path.steps.begin());
+}
+
+[[nodiscard]] bool PathInBlockRange(
+		const PreparedEditBlockPath &path,
+		const PreparedEditBlockRange &range) {
+	if (path.container == range.container) {
+		return IndexInRange(path.index, range.from, range.till);
+	}
+	if (!ContainerHasPrefix(path.container, range.container)
+		|| (path.container.steps.size() <= range.container.steps.size())) {
+		return false;
+	}
+	const auto &step = path.container.steps[range.container.steps.size()];
+	return IndexInRange(step.blockIndex, range.from, range.till);
+}
+
+[[nodiscard]] bool PathInListItemRange(
+		const PreparedEditBlockPath &path,
+		const PreparedEditListItemRange &range) {
+	if (!ContainerHasPrefix(path.container, range.block.container)
+		|| (path.container.steps.size() <= range.block.container.steps.size())) {
+		return false;
+	}
+	const auto &step = path.container.steps[range.block.container.steps.size()];
+	return (step.kind == PreparedEditBlockContainerKind::ListItemChildren)
+		&& (step.blockIndex == range.block.index)
+		&& IndexInRange(step.listItemIndex, range.from, range.till);
+}
+
+[[nodiscard]] bool BlockSourceInStructuralSelection(
+		const PreparedEditBlockSource &source,
+		const PreparedEditSelection &selection) {
+	switch (selection.kind) {
+	case PreparedEditSelectionKind::Blocks:
+		return PathInBlockRange(source.path, selection.blocks);
+	case PreparedEditSelectionKind::ListItems:
+		return PathInListItemRange(source.path, selection.listItems);
+	case PreparedEditSelectionKind::TableRows:
+	case PreparedEditSelectionKind::TableCells:
+	case PreparedEditSelectionKind::None:
+		return false;
+	}
+	return false;
+}
+
+[[nodiscard]] bool ListItemSourceInStructuralSelection(
+		const PreparedEditListItemSource &source,
+		const PreparedEditSelection &selection) {
+	switch (selection.kind) {
+	case PreparedEditSelectionKind::Blocks:
+		return PathInBlockRange(source.block, selection.blocks);
+	case PreparedEditSelectionKind::ListItems:
+		return (source.block == selection.listItems.block)
+			&& IndexInRange(
+				source.listItemIndex,
+				selection.listItems.from,
+				selection.listItems.till);
+	case PreparedEditSelectionKind::TableRows:
+	case PreparedEditSelectionKind::TableCells:
+	case PreparedEditSelectionKind::None:
+		return false;
+	}
+	return false;
+}
+
+[[nodiscard]] bool BlockBelongsToStructuralSelection(
+		const LaidOutBlock &block,
+		const PreparedEditSelection &selection) {
+	return (block.editListItem
+		&& ListItemSourceInStructuralSelection(*block.editListItem, selection))
+		|| (block.editBlock
+			&& BlockSourceInStructuralSelection(*block.editBlock, selection));
+}
+
+[[nodiscard]] bool WholeSegmentStructurallySelected(
+		const SelectableSegment &segment,
+		const PaintSelectionState &selectionState) {
+	if (!selectionState.hasStructuralSelection() || !segment.block) {
+		return false;
+	}
+	switch (segment.kind) {
+	case SelectableSegmentKind::CodeBlock:
+	case SelectableSegmentKind::DisplayMath:
+	case SelectableSegmentKind::Table:
+	case SelectableSegmentKind::Placeholder:
+	case SelectableSegmentKind::Photo:
+	case SelectableSegmentKind::Media:
+		return BlockBelongsToStructuralSelection(
+			*segment.block,
+			*selectionState.structuralSelection);
+	case SelectableSegmentKind::TextLeaf:
+		return false;
+	}
+	return false;
+}
+
+[[nodiscard]] std::optional<TextSelection> StructuralTextSelectionForSegment(
+		const SelectableSegment &segment,
+		const PaintSelectionState &selectionState) {
+	if (!selectionState.hasStructuralSelection()
+		|| !segment.isTextLeaf()
+		|| !segment.block) {
+		return std::nullopt;
+	}
+	switch (selectionState.structuralSelection->kind) {
+	case PreparedEditSelectionKind::Blocks:
+	case PreparedEditSelectionKind::ListItems:
+		return BlockBelongsToStructuralSelection(
+			*segment.block,
+			*selectionState.structuralSelection)
+			? std::make_optional(AllTextSelection)
+			: std::nullopt;
+	case PreparedEditSelectionKind::TableRows:
+	case PreparedEditSelectionKind::TableCells:
+	case PreparedEditSelectionKind::None:
+		return std::nullopt;
+	}
+	return std::nullopt;
+}
+
+[[nodiscard]] const LaidOutBlock *FindTableBlock(
+		const std::vector<SelectableSegment> &segments,
+		const PreparedEditBlockPath &path) {
+	for (const auto &segment : segments) {
+		if (!segment.block
+			|| (segment.block->kind != PreparedBlockKind::Table)
+			|| !segment.block->editBlock
+			|| (segment.block->editBlock->path != path)) {
+			continue;
+		}
+		return segment.block;
+	}
+	return nullptr;
+}
+
+[[nodiscard]] TextForMimeData TextForStructuralTableSelection(
+		const std::vector<SelectableSegment> &segments,
+		const PreparedEditSelection &selection) {
+	switch (selection.kind) {
+	case PreparedEditSelectionKind::TableRows: {
+		const auto block = FindTableBlock(segments, selection.tableRows.block);
+		return block
+			? CopyTextForTableRange(
+				*block,
+				selection.tableRows.from,
+				selection.tableRows.till,
+				0,
+				int(block->tableColumnWidths.size()))
+			: TextForMimeData();
+	}
+	case PreparedEditSelectionKind::TableCells: {
+		const auto block = FindTableBlock(segments, selection.tableCells.block);
+		return block
+			? CopyTextForTableRange(
+				*block,
+				selection.tableCells.rowFrom,
+				selection.tableCells.rowTill,
+				selection.tableCells.columnFrom,
+				selection.tableCells.columnTill)
+			: TextForMimeData();
+	}
+	case PreparedEditSelectionKind::Blocks:
+	case PreparedEditSelectionKind::ListItems:
+	case PreparedEditSelectionKind::None:
+		return TextForMimeData();
+	}
+	return TextForMimeData();
+}
+
+[[nodiscard]] const style::TextStyle &HeadingTextStyle(
+		int level,
+		const style::Markdown &st) {
+	switch (std::clamp(level, 1, 6)) {
+	case 1: return st.heading1;
+	case 2: return st.heading2;
+	case 3: return st.heading3;
+	case 4: return st.heading4;
+	case 5: return st.heading5;
+	case 6: return st.heading6;
+	}
+	return st.heading6;
+}
+
+[[nodiscard]] bool IsEmbedPostAuthorSegment(
+		const SelectableSegment &segment) {
+	return segment.block
+		&& (segment.block->kind == PreparedBlockKind::EmbedPost)
+		&& (segment.leaf == &segment.block->labelLeaf);
+}
+
+[[nodiscard]] bool IsEmbedPostDateSegment(
+		const SelectableSegment &segment) {
+	return segment.block
+		&& (segment.block->kind == PreparedBlockKind::EmbedPost)
+		&& (segment.leaf == &segment.block->subtitleLeaf);
+}
+
+} // namespace
+
+void CollectSelectableSegments(
+		std::vector<LaidOutBlock> *blocks,
+		std::vector<SelectableSegment> *segments) {
+	if (!blocks) {
+		return;
+	}
+	for (auto &block : *blocks) {
+		block.segmentIndex = -1;
+		block.secondarySegmentIndex = -1;
+		block.tertiarySegmentIndex = -1;
+		switch (block.kind) {
+		case PreparedBlockKind::Paragraph:
+		case PreparedBlockKind::Thinking:
+		case PreparedBlockKind::Heading:
+		case PreparedBlockKind::Details: {
+			if (block.leaf.isEmpty() && block.textRect.isEmpty()) {
+				break;
+			}
+			auto segment = SelectableSegment();
+			segment.kind = SelectableSegmentKind::TextLeaf;
+			segment.leaf = &block.leaf;
+			segment.block = &block;
+			segment.outerRect = (block.kind == PreparedBlockKind::Details)
+				? block.headerRect
+				: block.textRect;
+			segment.textRect = block.textRect;
+			segment.textWidth = block.textWidth;
+			segment.align = block.flowTextAlign;
+			segment.length = block.leaf.length();
+			block.segmentIndex = AddSelectableSegment(
+				segments,
+				std::move(segment));
+		} break;
+		case PreparedBlockKind::CodeBlock: {
+			auto segment = SelectableSegment();
+			segment.kind = SelectableSegmentKind::CodeBlock;
+			segment.leaf = &block.leaf;
+			segment.block = &block;
+			segment.outerRect = block.outer;
+			segment.textRect = block.textRect;
+			segment.textWidth = block.textWidth;
+			segment.length = block.leaf.length();
+			block.segmentIndex = AddSelectableSegment(
+				segments,
+				std::move(segment));
+		} break;
+		case PreparedBlockKind::DisplayMath: {
+			auto segment = SelectableSegment();
+			segment.kind = SelectableSegmentKind::DisplayMath;
+			segment.block = &block;
+			segment.outerRect = block.visibleFormulaRect;
+			segment.align = block.formulaAlign;
+			segment.length = 1;
+			block.segmentIndex = AddSelectableSegment(
+				segments,
+				std::move(segment));
+		} break;
+		case PreparedBlockKind::Table: {
+			if (!block.textRect.isEmpty()) {
+				auto textSegment = SelectableSegment();
+				textSegment.kind = SelectableSegmentKind::TextLeaf;
+				textSegment.leaf = &block.leaf;
+				textSegment.block = &block;
+				textSegment.outerRect = block.textRect;
+				textSegment.textRect = block.textRect;
+				textSegment.textWidth = block.textWidth;
+				textSegment.align = block.flowTextAlign;
+				textSegment.length = block.leaf.length();
+				block.secondarySegmentIndex = AddSelectableSegment(
+					segments,
+					std::move(textSegment));
+			}
+			auto segment = SelectableSegment();
+			segment.kind = SelectableSegmentKind::Table;
+			segment.block = &block;
+			segment.outerRect = block.visibleTableRect;
+			segment.length = 1;
+			block.segmentIndex = AddSelectableSegment(
+				segments,
+				std::move(segment));
+			if (block.secondarySegmentIndex >= 0) {
+				(*segments)[block.secondarySegmentIndex].parentSegmentIndex
+					= block.segmentIndex;
+			}
+			for (auto &row : block.tableRows) {
+				for (auto &cell : row.cells) {
+					auto cellSegment = SelectableSegment();
+					cellSegment.kind = SelectableSegmentKind::TextLeaf;
+					cellSegment.leaf = &cell.leaf;
+					cellSegment.block = &block;
+					cellSegment.cell = &cell;
+					cellSegment.outerRect = cell.outer;
+					cellSegment.textRect = cell.textRect;
+					cellSegment.textWidth = cell.textWidth;
+					cellSegment.align = cell.align;
+					cellSegment.length = cell.leaf.length();
+					cellSegment.tableSegmentIndex = block.segmentIndex;
+					cell.tableSegmentIndex = block.segmentIndex;
+					cell.segmentIndex = AddSelectableSegment(
+						segments,
+						std::move(cellSegment));
+				}
+			}
+		} break;
+		case PreparedBlockKind::RelatedArticle:
+		case PreparedBlockKind::Placeholder:
+		case PreparedBlockKind::Photo:
+		case PreparedBlockKind::Video:
+		case PreparedBlockKind::Audio:
+		case PreparedBlockKind::Map:
+		case PreparedBlockKind::Channel:
+		case PreparedBlockKind::GroupedMedia: {
+			auto segment = SelectableSegment();
+			segment.kind = (block.kind == PreparedBlockKind::Photo)
+				? SelectableSegmentKind::Photo
+				: (block.kind == PreparedBlockKind::Placeholder)
+				? SelectableSegmentKind::Placeholder
+				: SelectableSegmentKind::Media;
+			segment.block = &block;
+			segment.outerRect = block.mediaRect;
+			segment.length = 1;
+			block.segmentIndex = AddSelectableSegment(
+				segments,
+				std::move(segment));
+			if (!block.textRect.isEmpty()) {
+				auto textSegment = SelectableSegment();
+				textSegment.kind = SelectableSegmentKind::TextLeaf;
+				textSegment.leaf = &block.leaf;
+				textSegment.block = &block;
+				textSegment.outerRect = block.textRect;
+				textSegment.textRect = block.textRect;
+				textSegment.textWidth = block.textWidth;
+				textSegment.length = block.leaf.length();
+				textSegment.parentSegmentIndex = block.segmentIndex;
+				block.secondarySegmentIndex = AddSelectableSegment(
+					segments,
+					std::move(textSegment));
+			}
+		} break;
+		case PreparedBlockKind::EmbedPost: {
+			if (!block.labelRect.isEmpty() && !block.labelLeaf.isEmpty()) {
+				auto authorSegment = SelectableSegment();
+				authorSegment.kind = SelectableSegmentKind::TextLeaf;
+				authorSegment.leaf = &block.labelLeaf;
+				authorSegment.block = &block;
+				authorSegment.outerRect = block.labelRect;
+				authorSegment.textRect = block.labelRect;
+				authorSegment.textWidth = block.labelWidth;
+				authorSegment.length = block.labelLeaf.length();
+				block.segmentIndex = AddSelectableSegment(
+					segments,
+					std::move(authorSegment));
+			}
+			if (!block.subtitleRect.isEmpty() && !block.subtitleLeaf.isEmpty()) {
+				auto dateSegment = SelectableSegment();
+				dateSegment.kind = SelectableSegmentKind::TextLeaf;
+				dateSegment.leaf = &block.subtitleLeaf;
+				dateSegment.block = &block;
+				dateSegment.outerRect = block.subtitleRect;
+				dateSegment.textRect = block.subtitleRect;
+				dateSegment.textWidth = block.subtitleWidth;
+				dateSegment.length = block.subtitleLeaf.length();
+				block.secondarySegmentIndex = AddSelectableSegment(
+					segments,
+					std::move(dateSegment));
+			}
+			CollectSelectableSegments(&block.children, segments);
+			if (!block.textRect.isEmpty() && !block.leaf.isEmpty()) {
+				auto captionSegment = SelectableSegment();
+				captionSegment.kind = SelectableSegmentKind::TextLeaf;
+				captionSegment.leaf = &block.leaf;
+				captionSegment.block = &block;
+				captionSegment.outerRect = block.textRect;
+				captionSegment.textRect = block.textRect;
+				captionSegment.textWidth = block.textWidth;
+				captionSegment.length = block.leaf.length();
+				block.tertiarySegmentIndex = AddSelectableSegment(
+					segments,
+					std::move(captionSegment));
+			}
+			continue;
+		}
+		case PreparedBlockKind::List:
+		case PreparedBlockKind::ListItem:
+		case PreparedBlockKind::Quote:
+		case PreparedBlockKind::Rule:
+			break;
+		}
+		CollectSelectableSegments(&block.children, segments);
+	}
+}
+
+void RefreshScrollableSegmentRects(
+		const std::vector<LaidOutBlock> &blocks,
+		std::vector<SelectableSegment> *segments) {
+	if (!segments) {
+		return;
+	}
+	for (const auto &block : blocks) {
+		RefreshScrollableSegmentRects(block, segments);
+	}
+}
+
+void RefreshScrollableSegmentRects(
+		const LaidOutBlock &block,
+		std::vector<SelectableSegment> *segments) {
+	if (!segments) {
+		return;
+	}
+	const auto refreshIndex = [&](int index) {
+		if (index < 0 || index >= int(segments->size())) {
+			return;
+		}
+		RefreshBlockSegmentRect(block, &(*segments)[index]);
+	};
+	refreshIndex(block.segmentIndex);
+	refreshIndex(block.secondarySegmentIndex);
+	refreshIndex(block.tertiarySegmentIndex);
+	if (block.kind == PreparedBlockKind::Table) {
+		for (const auto &row : block.tableRows) {
+			for (const auto &cell : row.cells) {
+				if (cell.segmentIndex < 0
+					|| cell.segmentIndex >= int(segments->size())) {
+					continue;
+				}
+				auto &segment = (*segments)[cell.segmentIndex];
+				segment.outerRect = cell.outer;
+				segment.textRect = VisibleTextRect(
+					cell.textRect,
+					cell.outer);
+			}
+		}
+	}
+	RefreshScrollableSegmentRects(block.children, segments);
+}
+
+void CollectAnchors(
+		const std::vector<LaidOutBlock> &blocks,
+		std::vector<std::pair<QString, int>> *anchors) {
+	if (!anchors) {
+		return;
+	}
+	for (const auto &block : blocks) {
+		if (!block.anchorId.isEmpty() || !block.anchorIds.empty()) {
+			const auto top = !block.textRect.isEmpty()
+				? block.textRect.top()
+				: [&] {
+					for (const auto &child : block.children) {
+						if (child.outer.height() > 0) {
+							return child.outer.top();
+						}
+					}
+					return block.outer.top();
+				}();
+			if (!block.anchorId.isEmpty()) {
+				anchors->push_back({ block.anchorId, top });
+			}
+			for (const auto &anchorId : block.anchorIds) {
+				anchors->push_back({ anchorId, top });
+			}
+		}
+		CollectAnchors(block.children, anchors);
+	}
+}
+
+const SelectableSegment *FindSegment(
+		const std::vector<SelectableSegment> *segments,
+		int index) {
+	if (!segments || index < 0 || index >= int(segments->size())) {
+		return nullptr;
+	}
+	return &(*segments)[index];
+}
+
+int SegmentLength(const SelectableSegment &segment) {
+	return std::max(segment.length, 0);
+}
+
+const style::TextStyle &TextStyleForSegment(
+		const SelectableSegment &segment,
+		const style::Markdown &st) {
+	if (segment.cell) {
+		return segment.cell->header
+			? st.table.headerStyle
+			: st.table.bodyStyle;
+	} else if (IsEmbedPostAuthorSegment(segment)) {
+		return st.embedPost.authorStyle;
+	} else if (IsEmbedPostDateSegment(segment)) {
+		return st.embedPost.dateStyle;
+	} else if (segment.kind == SelectableSegmentKind::CodeBlock) {
+		return st.code;
+	} else if (!segment.block) {
+		return st.body;
+	}
+	switch (segment.block->kind) {
+	case PreparedBlockKind::Details:
+		return st.details.summaryStyle;
+	case PreparedBlockKind::CodeBlock:
+		return st.code;
+	case PreparedBlockKind::Heading:
+		return HeadingTextStyle(segment.block->headingLevel, st);
+	default:
+		return st.body;
+	}
+}
+
+style::color TextColorForSegment(
+		const SelectableSegment &segment,
+		const style::Markdown &st) {
+	if (IsEmbedPostAuthorSegment(segment)) {
+		return st.embedPost.authorFg;
+	} else if (IsEmbedPostDateSegment(segment)) {
+		return st.embedPost.dateFg;
+	} else if (segment.block
+		&& (segment.block->kind == PreparedBlockKind::Thinking)) {
+		return st.supplementaryTextColor;
+	} else if (segment.kind == SelectableSegmentKind::CodeBlock
+		|| (segment.block
+			&& segment.block->kind == PreparedBlockKind::CodeBlock)) {
+		return st.textPalette.monoFg;
+	} else if (segment.block && segment.block->supplementary) {
+		return st.supplementaryTextColor;
+	}
+	return st.textColor;
+}
+
+bool TableSegmentSelected(
+		const PaintSelectionState &selectionState,
+		int tableSegmentIndex) {
+	if (!selectionState.segments || tableSegmentIndex < 0) {
+		return false;
+	}
+	if (selectionState.hasStructuralSelection()) {
+		if (const auto segment = FindSegment(
+				selectionState.segments,
+				tableSegmentIndex);
+			segment && WholeSegmentStructurallySelected(
+				*segment,
+				selectionState)) {
+			return true;
+		}
+	}
+	if (SingleTableCellSelection(selectionState, tableSegmentIndex)) {
+		return false;
+	}
+	const auto normalized = NormalizeSelection(selectionState.selection);
+	if (normalized.empty()) {
+		return false;
+	}
+	auto selectedCells = 0;
+	auto selectedCellIndex = -1;
+	for (const auto &segment : *selectionState.segments) {
+		if (segment.tableSegmentIndex != tableSegmentIndex
+			|| segment.index == tableSegmentIndex) {
+			continue;
+		}
+		const auto textSelection = BaseTextSelectionForSegment(
+			segment,
+			normalized);
+		if (!textSelection || textSelection->empty()) {
+			continue;
+		}
+		if (++selectedCells == 1) {
+			selectedCellIndex = segment.index;
+		} else {
+			return true;
+		}
+	}
+	const auto table = FindSegment(selectionState.segments, tableSegmentIndex);
+	if (!table || !RangeSelectsWholeSegment(*table, normalized)) {
+		return false;
+	}
+	if (selectedCells != 1) {
+		return true;
+	}
+	if (normalized.from.segment == tableSegmentIndex
+		|| normalized.to.segment == tableSegmentIndex) {
+		return true;
+	}
+	const auto lower = std::min(tableSegmentIndex, selectedCellIndex);
+	const auto upper = std::max(tableSegmentIndex, selectedCellIndex);
+	return (normalized.from.segment < lower)
+		&& (normalized.to.segment > upper);
+}
+
+bool StructuralBlockSelected(
+		const PaintSelectionState &selectionState,
+		const PreparedEditBlockSource &source) {
+	const auto selection = StructuralSelection(
+		selectionState,
+		PreparedEditSelectionKind::Blocks);
+	if (!selection) {
+		return false;
+	}
+	const auto &range = selection->blocks;
+	return (source.path.container == range.container)
+		&& IndexInRange(source.path.index, range.from, range.till);
+}
+
+bool StructuralListItemSelected(
+		const PaintSelectionState &selectionState,
+		const PreparedEditListItemSource &source) {
+	const auto selection = StructuralSelection(
+		selectionState,
+		PreparedEditSelectionKind::ListItems);
+	if (!selection) {
+		return false;
+	}
+	const auto &range = selection->listItems;
+	return (source.block == range.block)
+		&& IndexInRange(source.listItemIndex, range.from, range.till);
+}
+
+bool StructuralTableRowSelected(
+		const PaintSelectionState &selectionState,
+		const PreparedEditTableRowSource &source) {
+	const auto selection = StructuralSelection(
+		selectionState,
+		PreparedEditSelectionKind::TableRows);
+	if (!selection) {
+		return false;
+	}
+	const auto &range = selection->tableRows;
+	return (source.block == range.block)
+		&& IndexInRange(source.tableRowIndex, range.from, range.till);
+}
+
+bool StructuralTableCellSelected(
+		const PaintSelectionState &selectionState,
+		const PreparedEditTableCellSource &source) {
+	const auto selection = StructuralSelection(
+		selectionState,
+		PreparedEditSelectionKind::TableCells);
+	if (!selection) {
+		return false;
+	}
+	const auto &range = selection->tableCells;
+	if (range.empty()
+		|| source.tableRowIndex < 0
+		|| source.column < 0
+		|| source.colspan <= 0
+		|| source.rowspan <= 0) {
+		return false;
+	}
+	return (source.block == range.block)
+		&& RangesIntersect(
+			source.tableRowIndex,
+			source.tableRowIndex + source.rowspan,
+			range.rowFrom,
+			range.rowTill)
+		&& RangesIntersect(
+			source.column,
+			source.column + source.colspan,
+			range.columnFrom,
+			range.columnTill);
+}
+
+std::optional<TextSelection> TextSelectionForSegment(
+		const SelectableSegment &segment,
+		const PaintSelectionState &selectionState) {
+	if (!selectionState.segments) {
+		return std::nullopt;
+	}
+	if (segment.tableSegmentIndex >= 0) {
+		if (const auto singleCell = SingleTableCellSelection(
+				selectionState,
+				segment.tableSegmentIndex);
+			singleCell && *singleCell != segment.index) {
+			return std::nullopt;
+		}
+	}
+	if (segment.tableSegmentIndex >= 0
+		&& TableSegmentSelected(selectionState, segment.tableSegmentIndex)) {
+		return std::nullopt;
+	}
+	if (const auto structural = StructuralTextSelectionForSegment(
+			segment,
+			selectionState)) {
+		return structural;
+	}
+	return BaseTextSelectionForSegment(segment, selectionState.selection);
+}
+
+std::optional<TextSelection> TextSelectionForSegmentIndex(
+		const PaintSelectionState &selectionState,
+		int index) {
+	const auto segment = FindSegment(selectionState.segments, index);
+	return segment
+		? TextSelectionForSegment(*segment, selectionState)
+		: std::nullopt;
+}
+
+bool WholeSegmentSelected(
+		const SelectableSegment &segment,
+		const PaintSelectionState &selectionState) {
+	if (!selectionState.segments || segment.isTextLeaf()) {
+		return false;
+	}
+	if (WholeSegmentStructurallySelected(segment, selectionState)) {
+		return true;
+	}
+	if (segment.kind == SelectableSegmentKind::Table) {
+		return TableSegmentSelected(selectionState, segment.index);
+	}
+	return RangeSelectsWholeSegment(segment, selectionState.selection);
+}
+
+bool WholeSegmentSelected(
+		const PaintSelectionState &selectionState,
+		int index) {
+	const auto segment = FindSegment(selectionState.segments, index);
+	return segment
+		? WholeSegmentSelected(*segment, selectionState)
+		: false;
+}
+
+TextForMimeData TextForSegment(
+		const SelectableSegment &segment,
+		TextSelection selection) {
+	switch (segment.kind) {
+	case SelectableSegmentKind::TextLeaf:
+		return segment.leaf
+			? segment.leaf->toTextForMimeData(selection)
+			: TextForMimeData();
+	case SelectableSegmentKind::CodeBlock:
+		return segment.block
+			? CopyTextForCodeBlock(*segment.block, selection)
+			: TextForMimeData();
+	case SelectableSegmentKind::DisplayMath:
+		return segment.block
+			? CopyTextForDisplayMath(*segment.block)
+			: TextForMimeData();
+	case SelectableSegmentKind::Table:
+		return segment.block
+			? CopyTextForTable(*segment.block)
+			: TextForMimeData();
+	case SelectableSegmentKind::Placeholder:
+		return segment.block
+			? CopyTextForPlaceholderBlock(*segment.block)
+			: TextForMimeData();
+	case SelectableSegmentKind::Photo:
+		return segment.block
+			? CopyTextForPhotoBlock(*segment.block)
+			: TextForMimeData();
+	case SelectableSegmentKind::Media:
+		return segment.block
+			? CopyTextForSingleMediaBlock(*segment.block)
+			: TextForMimeData();
+	}
+	return TextForMimeData();
+}
+
+TextForMimeData TextForSelectedSegments(
+		const std::vector<SelectableSegment> &segments,
+		MarkdownArticleSelection selection,
+		const MarkdownArticleSelectionEndpoints *endpoints,
+		const PreparedEditSelection *structuralSelection) {
+	if (structuralSelection
+		&& !structuralSelection->empty()
+		&& (structuralSelection->kind == PreparedEditSelectionKind::TableRows
+			|| structuralSelection->kind
+				== PreparedEditSelectionKind::TableCells)) {
+		return TextForStructuralTableSelection(segments, *structuralSelection);
+	}
+	if (selection.empty()
+		&& (!structuralSelection || structuralSelection->empty())) {
+		return TextForMimeData();
+	}
+	const auto selectionState = PaintSelectionState{
+		.segments = &segments,
+		.selection = selection,
+		.endpoints = endpoints,
+		.structuralSelection = structuralSelection,
+	};
+	auto pieces = std::vector<TextForMimeData>();
+	for (const auto &segment : segments) {
+		if (segment.isTextLeaf()) {
+			if (segment.parentSegmentIndex >= 0
+				&& WholeSegmentSelected(
+					selectionState,
+					segment.parentSegmentIndex)) {
+				continue;
+			}
+			if (const auto textSelection = TextSelectionForSegment(
+					segment,
+					selectionState);
+				textSelection && !textSelection->empty()) {
+				if (auto text = TextForSegment(segment, *textSelection);
+					!text.empty()) {
+					pieces.push_back(std::move(text));
+				}
+			}
+			continue;
+		}
+		if (!WholeSegmentSelected(segment, selectionState)) {
+			continue;
+		}
+		if (auto text = TextForSegment(segment); !text.empty()) {
+			pieces.push_back(std::move(text));
+		}
+	}
+	if (pieces.empty()) {
+		return TextForMimeData();
+	} else if (pieces.size() == 1) {
+		return std::move(pieces.front());
+	}
+	auto result = TextForMimeData();
+	for (auto i = 0, count = int(pieces.size()); i != count; ++i) {
+		if (i) {
+			result.append(u"\n"_q);
+		}
+		result.append(std::move(pieces[i]));
+	}
+	return result;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_article_selection.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_selection.h
new file mode 100644
index 00000000000000..6d1f15e3609c88
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_selection.h
@@ -0,0 +1,115 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_article_layout_blocks.h"
+
+namespace Iv::Markdown {
+
+enum class SelectableSegmentKind {
+	TextLeaf,
+	CodeBlock,
+	DisplayMath,
+	Table,
+	Placeholder,
+	Photo,
+	Media,
+};
+
+struct SelectableSegment {
+	SelectableSegmentKind kind = SelectableSegmentKind::TextLeaf;
+	const Ui::Text::String *leaf = nullptr;
+	const LaidOutBlock *block = nullptr;
+	const LaidOutTableCell *cell = nullptr;
+	QRect outerRect;
+	QRect textRect;
+	int textWidth = 0;
+	style::align align = style::al_left;
+	int index = -1;
+	int length = 0;
+	int tableSegmentIndex = -1;
+	int parentSegmentIndex = -1;
+
+	[[nodiscard]] bool isTextLeaf() const {
+		return (leaf != nullptr);
+	}
+};
+
+struct LogicalVisibleRange {
+	int top = 0;
+	int bottom = 0;
+};
+
+struct SegmentSpan {
+	int from = 0;
+	int till = 0;
+
+	[[nodiscard]] bool empty() const {
+		return (from >= till);
+	}
+};
+
+void CollectSelectableSegments(
+	std::vector<LaidOutBlock> *blocks,
+	std::vector<SelectableSegment> *segments);
+void RefreshScrollableSegmentRects(
+	const std::vector<LaidOutBlock> &blocks,
+	std::vector<SelectableSegment> *segments);
+void RefreshScrollableSegmentRects(
+	const LaidOutBlock &block,
+	std::vector<SelectableSegment> *segments);
+void CollectAnchors(
+	const std::vector<LaidOutBlock> &blocks,
+	std::vector<std::pair<QString, int>> *anchors);
+[[nodiscard]] const SelectableSegment *FindSegment(
+	const std::vector<SelectableSegment> *segments,
+	int index);
+[[nodiscard]] int SegmentLength(const SelectableSegment &segment);
+[[nodiscard]] const style::TextStyle &TextStyleForSegment(
+	const SelectableSegment &segment,
+	const style::Markdown &st);
+[[nodiscard]] style::color TextColorForSegment(
+	const SelectableSegment &segment,
+	const style::Markdown &st);
+[[nodiscard]] std::optional<TextSelection> TextSelectionForSegment(
+	const SelectableSegment &segment,
+	const PaintSelectionState &selectionState);
+[[nodiscard]] std::optional<TextSelection> TextSelectionForSegmentIndex(
+	const PaintSelectionState &selectionState,
+	int index);
+[[nodiscard]] bool WholeSegmentSelected(
+	const SelectableSegment &segment,
+	const PaintSelectionState &selectionState);
+[[nodiscard]] bool WholeSegmentSelected(
+	const PaintSelectionState &selectionState,
+	int index);
+[[nodiscard]] bool TableSegmentSelected(
+	const PaintSelectionState &selectionState,
+	int tableSegmentIndex);
+[[nodiscard]] bool StructuralBlockSelected(
+	const PaintSelectionState &selectionState,
+	const PreparedEditBlockSource &source);
+[[nodiscard]] bool StructuralListItemSelected(
+	const PaintSelectionState &selectionState,
+	const PreparedEditListItemSource &source);
+[[nodiscard]] bool StructuralTableRowSelected(
+	const PaintSelectionState &selectionState,
+	const PreparedEditTableRowSource &source);
+[[nodiscard]] bool StructuralTableCellSelected(
+	const PaintSelectionState &selectionState,
+	const PreparedEditTableCellSource &source);
+[[nodiscard]] TextForMimeData TextForSegment(
+	const SelectableSegment &segment,
+	TextSelection selection = AllTextSelection);
+[[nodiscard]] TextForMimeData TextForSelectedSegments(
+	const std::vector<SelectableSegment> &segments,
+	MarkdownArticleSelection selection,
+	const MarkdownArticleSelectionEndpoints *endpoints,
+	const PreparedEditSelection *structuralSelection = nullptr);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_article_text.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_text.cpp
new file mode 100644
index 00000000000000..db109f195b910b
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_text.cpp
@@ -0,0 +1,1197 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_article_text.h"
+#include "iv/markdown/iv_markdown_article_layout_blocks.h"
+#include "iv/markdown/iv_markdown_prepare_serialize.h"
+#include "lang/lang_keys.h"
+#include "ui/style/style_core.h"
+#include "ui/style/style_core_scale.h"
+#include "ui/text/text_custom_emoji.h"
+#include "ui/basic_click_handlers.h"
+#include "ui/dynamic_image.h"
+#include "ui/integration.h"
+
+#include "styles/palette.h"
+#include "styles/style_iv.h"
+
+#include <algorithm>
+#include <cmath>
+#include <limits>
+#include <map>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+constexpr auto kIvMarkedTextOptions = TextParseOptions{
+	TextParseMultiline,
+	0,
+	0,
+	Qt::LayoutDirectionAuto,
+};
+
+struct PreparedLinkExternalData {
+	ClickHandler::TextEntity entity;
+	QString copyText;
+	QString copyLabel;
+};
+
+[[nodiscard]] QString OpenableTargetForLink(const PreparedLink &link) {
+	return link.fragment.isEmpty()
+		? link.target
+		: (link.target + u"#"_q + link.fragment);
+}
+
+[[nodiscard]] std::optional<PreparedLinkExternalData> ExternalDataForLink(
+		const PreparedLink &link) {
+	if (link.kind != PreparedLinkKind::External
+		&& link.kind != PreparedLinkKind::InstantViewPage) {
+		return std::nullopt;
+	}
+	const auto target = OpenableTargetForLink(link);
+	auto type = link.entityType;
+	if (type != EntityType::Url
+		&& type != EntityType::CustomUrl
+		&& type != EntityType::Email) {
+		if (target.isEmpty()) {
+			return std::nullopt;
+		}
+		type = UrlClickHandler::IsEmail(target)
+			? EntityType::Email
+			: EntityType::CustomUrl;
+	}
+	return PreparedLinkExternalData{
+		.entity = { type, target },
+		.copyText = link.fragment.isEmpty() && !link.copyText.isEmpty()
+			? link.copyText
+			: target,
+		.copyLabel = (type == EntityType::Email)
+			? Ui::Integration::Instance().phraseContextCopyEmail()
+			: Ui::Integration::Instance().phraseContextCopyLink(),
+	};
+}
+
+[[nodiscard]] ClickHandler::TextEntity TextEntityForLink(
+		const PreparedLink &link) {
+	if (const auto external = ExternalDataForLink(link)) {
+		return external->entity;
+	}
+	return {};
+}
+
+[[nodiscard]] QString CopyTextForLink(const PreparedLink &link) {
+	if (const auto external = ExternalDataForLink(link)) {
+		return external->copyText;
+	}
+	switch (link.kind) {
+	case PreparedLinkKind::Anchor:
+	case PreparedLinkKind::FootnoteBacklink:
+		return link.target.isEmpty() ? QString() : (u"#"_q + link.target);
+	case PreparedLinkKind::Footnote:
+		return !link.copyText.isEmpty() ? link.copyText : link.target;
+	case PreparedLinkKind::LocalFile:
+		return link.fragment.isEmpty()
+			? link.target
+			: (link.target + u"#"_q + link.fragment);
+	case PreparedLinkKind::External:
+	case PreparedLinkKind::InstantViewPage:
+		return link.target;
+	case PreparedLinkKind::RejectedRelative:
+	case PreparedLinkKind::ToggleDetails:
+		return QString();
+	}
+	return QString();
+}
+
+[[nodiscard]] QString CopyLabelForLink(const PreparedLink &link) {
+	if (const auto external = ExternalDataForLink(link)) {
+		return external->copyLabel;
+	}
+	switch (link.kind) {
+	case PreparedLinkKind::RejectedRelative:
+	case PreparedLinkKind::ToggleDetails:
+		return QString();
+	case PreparedLinkKind::External:
+	case PreparedLinkKind::InstantViewPage:
+	case PreparedLinkKind::Anchor:
+	case PreparedLinkKind::Footnote:
+	case PreparedLinkKind::FootnoteBacklink:
+	case PreparedLinkKind::LocalFile:
+		return tr::lng_context_copy_link(tr::now);
+	}
+	return QString();
+}
+
+class PreparedLinkClickHandler final : public ClickHandler {
+public:
+	explicit PreparedLinkClickHandler(PreparedLink link);
+
+	void onClick(ClickContext) const override;
+
+	[[nodiscard]] const PreparedLink &link() const;
+
+	QString url() const override;
+
+	QString copyToClipboardText() const override;
+
+	QString copyToClipboardContextItemText() const override;
+
+	TextEntity getTextEntity() const override;
+
+private:
+	PreparedLink _link;
+
+};
+
+PreparedLinkClickHandler::PreparedLinkClickHandler(PreparedLink link)
+: _link(std::move(link)) {
+}
+
+void PreparedLinkClickHandler::onClick(ClickContext) const {
+}
+
+const PreparedLink &PreparedLinkClickHandler::link() const {
+	return _link;
+}
+
+QString PreparedLinkClickHandler::url() const {
+	return _link.target;
+}
+
+QString PreparedLinkClickHandler::copyToClipboardText() const {
+	return CopyTextForLink(_link);
+}
+
+QString PreparedLinkClickHandler::copyToClipboardContextItemText() const {
+	return copyToClipboardText().isEmpty()
+		? QString()
+		: CopyLabelForLink(_link);
+}
+
+ClickHandler::TextEntity PreparedLinkClickHandler::getTextEntity() const {
+	return TextEntityForLink(_link);
+}
+
+[[nodiscard]] int FormulaTextSize(const style::TextStyle &textStyle) {
+	return std::max(textStyle.font->height, 1);
+}
+
+[[nodiscard]] int ScaleFormulaCap(int cap, int textSize, int baseTextSize) {
+	if (cap <= 0) {
+		return 0;
+	}
+	const auto numerator = int64(cap) * std::max(textSize, 1);
+	const auto denominator = std::max(baseTextSize, 1);
+	return std::max(int((numerator + denominator - 1) / denominator), 1);
+}
+
+[[nodiscard]] PreparedFormulaMeasurementSignature FormulaRenderSignature(
+		const PreparedFormulaSlot &slot,
+		const style::Markdown &st) {
+	const auto &displayMath = st.displayMath;
+	return {
+		.trimmedTex = slot.trimmedTex.trimmed(),
+		.kind = slot.kind,
+		.textSize = slot.textSize ? slot.textSize : displayMath.textSize,
+		.renderWidthCap = slot.renderWidthCap
+			? slot.renderWidthCap
+			: displayMath.maxRenderWidth,
+		.renderHeightCap = slot.renderHeightCap
+			? slot.renderHeightCap
+			: displayMath.maxRenderHeight,
+	};
+}
+
+[[nodiscard]] PreparedFormulaMeasurementSignature InlineFormulaSignature(
+		QString trimmedTex,
+		const style::TextStyle &textStyle,
+		const style::Markdown &st) {
+	const auto &displayMath = st.displayMath;
+	const auto textSize = FormulaTextSize(textStyle);
+	return {
+		.trimmedTex = std::move(trimmedTex).trimmed(),
+		.kind = MathKind::Inline,
+		.textSize = textSize,
+		.renderWidthCap = ScaleFormulaCap(
+			displayMath.maxRenderWidth,
+			textSize,
+			displayMath.textSize),
+		.renderHeightCap = ScaleFormulaCap(
+			displayMath.maxRenderHeight,
+			textSize,
+			displayMath.textSize),
+	};
+}
+
+template <typename Formula>
+void NormalizeInlineFormulaRasterMetrics(Formula *formula);
+
+[[nodiscard]] RenderedFormula MeasuredFallback(const MeasuredFormula &measured) {
+	auto result = RenderedFormula();
+	result.logicalSize = measured.logicalSize;
+	result.logicalDepth = measured.logicalDepth;
+	result.exact = measured.exact;
+	result.fallbackText = measured.fallbackText;
+	result.error = measured.error;
+	result.success = false;
+	result.overflow = measured.overflow;
+	result.tooLarge = measured.tooLarge;
+	NormalizeInlineFormulaRasterMetrics(&result);
+	return result;
+}
+
+[[nodiscard]] int RenderFormulaDevicePixelRatio(const RenderedFormula &formula) {
+	const auto ratio = formula.image.devicePixelRatio();
+	return (ratio > 0.) ? int(std::round(ratio)) : 0;
+}
+
+[[nodiscard]] int RoundedInlineFormulaMetric(int scaledValue) {
+	return (scaledValue > 0)
+		? ((scaledValue + kFormulaExactMetricScale - 1)
+			/ kFormulaExactMetricScale)
+		: 0;
+}
+
+[[nodiscard]] int FlooredInlineFormulaMetric(int scaledValue) {
+	return (scaledValue >= 0)
+		? (scaledValue / kFormulaExactMetricScale)
+		: -((-scaledValue + kFormulaExactMetricScale - 1)
+			/ kFormulaExactMetricScale);
+}
+
+[[nodiscard]] qreal LogicalInlineFormulaMetric(int scaledValue) {
+	return qreal(scaledValue) / qreal(kFormulaExactMetricScale);
+}
+
+struct InlineFormulaColorizedKey {
+	QRgb color = 0;
+	int devicePixelRatio = 0;
+
+	friend bool operator<(
+		InlineFormulaColorizedKey a,
+		InlineFormulaColorizedKey b);
+};
+
+bool operator<(
+		InlineFormulaColorizedKey a,
+		InlineFormulaColorizedKey b) {
+	if (a.color != b.color) {
+		return a.color < b.color;
+	}
+	return a.devicePixelRatio < b.devicePixelRatio;
+}
+
+class InlineFormulaSharedState final {
+public:
+	InlineFormulaSharedState(
+		PreparedFormulaMeasurementSignature signature,
+		std::shared_ptr<const MeasuredFormula> measuredData,
+		QString displayFallbackText,
+		std::shared_ptr<MathRenderer> renderer);
+
+	[[nodiscard]] int width() const;
+	[[nodiscard]] bool failed() const;
+	[[nodiscard]] std::optional<Ui::Text::CustomEmojiVerticalMetrics> vertical(
+		const style::TextStyle &textStyle) const;
+	void paint(
+		QPainter &p,
+		const Ui::Text::CustomEmoji::Context &context,
+		const QString &replacementText,
+		int fallbackWidth) const;
+	void setRenderer(std::shared_ptr<MathRenderer> renderer);
+	void invalidatePaletteCache();
+	void invalidateRasterCache();
+
+private:
+	[[nodiscard]] const MeasuredFormula &measured() const;
+	[[nodiscard]] MathRenderer *renderer() const;
+	[[nodiscard]] RenderedFormula ensureRendered(int devicePixelRatio) const;
+	[[nodiscard]] const QImage *colorizedImage(
+		const QColor &color,
+		int devicePixelRatio) const;
+
+	PreparedFormulaMeasurementSignature _signature;
+	std::shared_ptr<const MeasuredFormula> _measuredData;
+	QString _displayFallbackText;
+	mutable std::shared_ptr<MathRenderer> _renderer;
+	mutable std::map<int, RenderedFormula> _rendered;
+	mutable std::map<InlineFormulaColorizedKey, QImage> _colorized;
+
+};
+
+struct InlineFormulaGeometry {
+	int width = 1;
+	int imageHeight = 0;
+	int imageDescent = 0;
+	int ascent = 0;
+	int descent = 0;
+	int paintOffsetYScaled = 0;
+};
+
+template <typename Formula>
+[[nodiscard]] InlineFormulaGeometry InlineFormulaGeometryFrom(
+		const Formula &formula) {
+	const auto imageHeight = std::max(formula.logicalSize.height(), 0);
+	const auto imageDescent = std::clamp(formula.logicalDepth, 0, imageHeight);
+	auto result = InlineFormulaGeometry{
+		.width = std::max(formula.logicalSize.width(), 1),
+		.imageHeight = imageHeight,
+		.imageDescent = imageDescent,
+		.ascent = imageHeight - imageDescent,
+		.descent = imageDescent,
+	};
+	const auto &exact = formula.exact;
+	const auto exactHeight = exact.scaledSize.height();
+	if ((exact.scaledSize.width() <= 0) || (exactHeight <= 0)) {
+		return result;
+	}
+	const auto exactAscent = std::clamp(exact.scaledAscent, 0, exactHeight);
+	const auto exactDescent = std::max(exactHeight - exactAscent, 0);
+	const auto topInset = std::clamp(exact.scaledInsets.top(), 0, exactAscent);
+	const auto bottomInset = std::clamp(
+		exact.scaledInsets.bottom(),
+		0,
+		exactDescent);
+	const auto paintTop = topInset - exactAscent;
+	const auto paintBottom = std::max(exactDescent - bottomInset, 0);
+	const auto imageWidth = RoundedInlineFormulaMetric(
+		exact.scaledSize.width());
+	const auto exactImageHeight = RoundedInlineFormulaMetric(exactHeight);
+	const auto exactImageAscent = std::clamp(
+		RoundedInlineFormulaMetric(exactAscent),
+		0,
+		exactImageHeight);
+	const auto top = FlooredInlineFormulaMetric(paintTop);
+	const auto bottom = RoundedInlineFormulaMetric(paintBottom);
+	result.width = std::max(imageWidth, 1);
+	result.imageHeight = exactImageHeight;
+	result.imageDescent = std::max(exactImageHeight - exactImageAscent, 0);
+	if (top < 0 || bottom > 0) {
+		result.ascent = std::max(-top, 0);
+		result.descent = std::max(bottom, 0);
+		result.paintOffsetYScaled = (-exactAscent) - (top * kFormulaExactMetricScale);
+	} else if (exactImageHeight > 0) {
+		result.ascent = exactImageHeight - result.imageDescent;
+		result.descent = result.imageDescent;
+	}
+	return result;
+}
+
+template <typename Formula>
+void NormalizeInlineFormulaRasterMetrics(Formula *formula) {
+	if (!formula) {
+		return;
+	}
+	const auto geometry = InlineFormulaGeometryFrom(*formula);
+	formula->logicalSize = QSize(geometry.width, geometry.imageHeight);
+	formula->logicalDepth = geometry.imageDescent;
+}
+
+class InlineFormulaObject final : public Ui::Text::CustomEmoji {
+public:
+	InlineFormulaObject(
+		QString replacementText,
+		int fallbackWidth,
+		std::shared_ptr<InlineFormulaSharedState> state);
+
+	int width() override;
+	QString entityData() override;
+	std::optional<Ui::Text::CustomEmojiVerticalMetrics> vertical(
+		const style::TextStyle &textStyle) override;
+	QString replacementText() override;
+	Ui::Text::CustomEmojiSemantics semantics() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	QString _replacementText;
+	int _fallbackWidth = 1;
+	const std::shared_ptr<InlineFormulaSharedState> _state;
+
+};
+
+class InlineIvImageObject final : public Ui::Text::CustomEmoji {
+public:
+	InlineIvImageObject(
+		QString replacementText,
+		int width,
+		int height,
+		std::shared_ptr<Ui::DynamicImage> image,
+		Fn<void()> repaint,
+		Fn<void(QRect)> repaintRect);
+
+	int width() override;
+	QString entityData() override;
+	std::optional<Ui::Text::CustomEmojiVerticalMetrics> vertical(
+		const style::TextStyle &textStyle) override;
+	QString replacementText() override;
+	Ui::Text::CustomEmojiSemantics semantics() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	QString _replacementText;
+	int _width = 1;
+	int _height = 1;
+	const std::shared_ptr<Ui::DynamicImage> _image;
+	const Fn<void()> _repaint;
+	const Fn<void(QRect)> _repaintRect;
+	const std::shared_ptr<QRect> _lastPaintRect = std::make_shared<QRect>();
+	bool _subscribed = false;
+
+};
+
+[[nodiscard]] QString InlineFormulaDisplayFallbackText(
+		const PreparedFormulaMeasurementSignature &signature,
+		const MeasuredFormula &measured) {
+	if (!measured.fallbackText.isEmpty()) {
+		return measured.fallbackText;
+	} else if (!signature.trimmedTex.isEmpty()) {
+		return signature.trimmedTex;
+	}
+	return u"[math]"_q;
+}
+
+[[nodiscard]] std::shared_ptr<const MeasuredFormula>
+FindInlineFormulaMeasuredData(
+		const std::vector<PreparedFormulaSlot> *formulas,
+		const PreparedFormulaMeasurementSignature &signature,
+		const style::Markdown &st,
+		MeasuredFormula *measured) {
+	if (!formulas) {
+		return nullptr;
+	}
+	for (const auto &slot : *formulas) {
+		if (!slot.present
+			|| (FormulaRenderSignature(slot, st) != signature)) {
+			continue;
+		}
+		if (measured) {
+			*measured = slot.measured;
+		}
+		if (slot.measuredData) {
+			return slot.measuredData;
+		}
+		return std::make_shared<MeasuredFormula>(slot.measured);
+	}
+	return nullptr;
+}
+
+} // namespace
+
+ClickHandlerPtr CreatePreparedLinkHandler(PreparedLink link) {
+	return std::make_shared<PreparedLinkClickHandler>(std::move(link));
+}
+
+std::optional<PreparedLink> ExtractPreparedLink(const ClickHandlerPtr &link) {
+	if (const auto prepared = std::dynamic_pointer_cast<PreparedLinkClickHandler>(
+			link)) {
+		return prepared->link();
+	}
+	return std::nullopt;
+}
+
+void BindLinks(
+		Ui::Text::String *leaf,
+		const std::vector<PreparedLink> &links) {
+	for (const auto &link : links) {
+		leaf->setLink(
+			link.index,
+			CreatePreparedLinkHandler(link));
+	}
+}
+
+void SetTextLeafSpoilerLinkFilter(
+		Ui::Text::String *leaf,
+		Fn<bool(const ClickContext&)> spoilerLinkFilter) {
+	if (!leaf->hasSpoilers()) {
+		return;
+	}
+	if (spoilerLinkFilter) {
+		leaf->setSpoilerLinkFilter(std::move(spoilerLinkFilter));
+	} else {
+		leaf->setSpoilerLinkFilter([](const ClickContext &context) {
+			return context.button == Qt::LeftButton;
+		});
+	}
+}
+
+const PreparedFormulaSlot *PreparedFormulaFor(
+		const std::vector<PreparedFormulaSlot> &formulas,
+		int formulaIndex) {
+	if (formulaIndex < 0 || formulaIndex >= int(formulas.size())) {
+		return nullptr;
+	} else if (!formulas[formulaIndex].present) {
+		return nullptr;
+	}
+	return &formulas[formulaIndex];
+}
+
+PreparedFormulaSlot *PreparedFormulaFor(
+		std::vector<PreparedFormulaSlot> *formulas,
+		int formulaIndex) {
+	if (!formulas || formulaIndex < 0 || formulaIndex >= int(formulas->size())) {
+		return nullptr;
+	} else if (!(*formulas)[formulaIndex].present) {
+		return nullptr;
+	}
+	return &(*formulas)[formulaIndex];
+}
+
+RenderedFormula *FormulaRasterSlot(
+		std::vector<RenderedFormula> *rendered,
+		int formulaIndex) {
+	if (!rendered || formulaIndex < 0) {
+		return nullptr;
+	}
+	if (formulaIndex >= int(rendered->size())) {
+		rendered->resize(formulaIndex + 1);
+	}
+	return &(*rendered)[formulaIndex];
+}
+
+RenderedFormula EnsureFormulaRendered(
+		const PreparedFormulaMeasurementSignature &signature,
+		const MeasuredFormula &measured,
+		RenderedFormula *rendered,
+		MathRenderer *renderer,
+		int devicePixelRatio) {
+	if (!measured.success) {
+		return MeasuredFallback(measured);
+	}
+	if (rendered
+		&& rendered->success
+		&& (RenderFormulaDevicePixelRatio(*rendered) == devicePixelRatio)) {
+		return *rendered;
+	}
+	auto ownedRenderer = std::shared_ptr<MathRenderer>();
+	if (!renderer) {
+		ownedRenderer = std::make_shared<MathRenderer>();
+		renderer = ownedRenderer.get();
+	}
+	auto local = renderer->renderFormula({
+		.trimmedTex = signature.trimmedTex,
+		.kind = signature.kind,
+		.textSize = signature.textSize,
+		.renderWidthCap = signature.renderWidthCap,
+		.renderHeightCap = signature.renderHeightCap,
+		.devicePixelRatio = devicePixelRatio,
+	});
+	if (local.logicalSize.isEmpty()) {
+		local.logicalSize = measured.logicalSize;
+		local.logicalDepth = measured.logicalDepth;
+		local.exact = measured.exact;
+		local.fallbackText = measured.fallbackText;
+		local.error = measured.error;
+		local.overflow = measured.overflow;
+		local.tooLarge = measured.tooLarge;
+		NormalizeInlineFormulaRasterMetrics(&local);
+	}
+	if (rendered) {
+		*rendered = std::move(local);
+		return rendered->success ? *rendered : MeasuredFallback(measured);
+	}
+	return local.success ? local : MeasuredFallback(measured);
+}
+
+RenderedFormula EnsureFormulaRendered(
+		const PreparedFormulaSlot *slot,
+		RenderedFormula *rendered,
+		MathRenderer *renderer,
+		int devicePixelRatio,
+		const style::Markdown &st) {
+	if (!slot) {
+		return RenderedFormula();
+	}
+	return EnsureFormulaRendered(
+		FormulaRenderSignature(*slot, st),
+		slot->measured,
+		rendered,
+		renderer,
+		devicePixelRatio);
+}
+
+class InlineFormulaObjectCache final {
+public:
+	InlineFormulaObjectCache() = default;
+
+	void setRenderer(std::shared_ptr<MathRenderer> renderer);
+	void clear();
+	void invalidatePaletteCache();
+	void invalidateRasterCache();
+	[[nodiscard]] std::unique_ptr<Ui::Text::CustomEmoji> create(
+		const InlineTextObjectFormulaData &data,
+		const style::TextStyle &textStyle,
+		const style::Markdown &st,
+		const std::vector<PreparedFormulaSlot> *formulas);
+
+private:
+	[[nodiscard]] std::shared_ptr<InlineFormulaSharedState> lookupOrCreate(
+		const PreparedFormulaMeasurementSignature &signature,
+		const style::TextStyle &textStyle,
+		const style::Markdown &st,
+		const std::vector<PreparedFormulaSlot> *formulas);
+
+	std::shared_ptr<MathRenderer> _renderer;
+	std::map<
+		PreparedFormulaMeasurementSignature,
+		std::shared_ptr<InlineFormulaSharedState>,
+		PreparedFormulaMeasurementSignatureLess> _states;
+
+};
+
+InlineFormulaSharedState::InlineFormulaSharedState(
+	PreparedFormulaMeasurementSignature signature,
+	std::shared_ptr<const MeasuredFormula> measuredData,
+	QString displayFallbackText,
+	std::shared_ptr<MathRenderer> renderer)
+: _signature(std::move(signature))
+, _measuredData(std::move(measuredData))
+, _displayFallbackText(std::move(displayFallbackText))
+, _renderer(std::move(renderer)) {
+}
+
+int InlineFormulaSharedState::width() const {
+	const auto geometry = InlineFormulaGeometryFrom(measured());
+	return (measured().success && (geometry.width > 0))
+		? geometry.width
+		: 1;
+}
+
+bool InlineFormulaSharedState::failed() const {
+	return !measured().success;
+}
+
+auto InlineFormulaSharedState::vertical(const style::TextStyle &textStyle) const
+-> std::optional<Ui::Text::CustomEmojiVerticalMetrics> {
+	const auto &formula = measured();
+	const auto geometry = InlineFormulaGeometryFrom(formula);
+	if (formula.success && (geometry.imageHeight > 0)) {
+		return Ui::Text::CustomEmojiVerticalMetrics{
+			.ascent = geometry.ascent,
+			.descent = geometry.descent,
+		};
+	}
+	const auto ascent = std::max(TextLineAscent(textStyle), 0);
+	return Ui::Text::CustomEmojiVerticalMetrics{
+		.ascent = ascent,
+		.descent = std::max(TextLineHeight(textStyle) - ascent, 0),
+	};
+}
+
+void InlineFormulaSharedState::paint(
+		QPainter &p,
+		const Ui::Text::CustomEmoji::Context &context,
+		const QString &replacementText,
+		int fallbackWidth) const {
+	const auto rendered = ensureRendered(std::max(style::DevicePixelRatio(), 1));
+	if (rendered.success) {
+		const auto geometry = InlineFormulaGeometryFrom(rendered);
+		if (const auto image = colorizedImage(
+				context.textColor,
+				std::max(style::DevicePixelRatio(), 1))) {
+			p.drawImage(
+				QPointF(context.position)
+					+ QPointF(0., LogicalInlineFormulaMetric(
+						geometry.paintOffsetYScaled)),
+				*image);
+		}
+		return;
+	}
+	const auto fallbackText = replacementText.isEmpty()
+		? _displayFallbackText
+		: replacementText;
+	if (fallbackText.isEmpty()) {
+		return;
+	}
+	p.save();
+	p.setPen(context.textColor);
+	p.drawText(
+		QRect(
+			context.position.x(),
+			context.position.y(),
+			std::max(fallbackWidth, 1),
+			p.fontMetrics().height()),
+		Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine,
+		fallbackText);
+	p.restore();
+}
+
+void InlineFormulaSharedState::setRenderer(std::shared_ptr<MathRenderer> renderer) {
+	_renderer = std::move(renderer);
+	invalidateRasterCache();
+}
+
+void InlineFormulaSharedState::invalidatePaletteCache() {
+	_colorized.clear();
+}
+
+void InlineFormulaSharedState::invalidateRasterCache() {
+	_rendered.clear();
+	_colorized.clear();
+}
+
+const MeasuredFormula &InlineFormulaSharedState::measured() const {
+	static const auto kEmpty = MeasuredFormula();
+	return _measuredData ? *_measuredData : kEmpty;
+}
+
+MathRenderer *InlineFormulaSharedState::renderer() const {
+	if (!_renderer) {
+		_renderer = std::make_shared<MathRenderer>();
+	}
+	return _renderer.get();
+}
+
+RenderedFormula InlineFormulaSharedState::ensureRendered(
+		int devicePixelRatio) const {
+	if (!measured().success) {
+		return MeasuredFallback(measured());
+	}
+	if (const auto i = _rendered.find(devicePixelRatio); i != end(_rendered)) {
+		return i->second;
+	}
+	auto rendered = renderer()->renderFormula({
+		.trimmedTex = _signature.trimmedTex,
+		.kind = _signature.kind,
+		.textSize = _signature.textSize,
+		.renderWidthCap = _signature.renderWidthCap,
+		.renderHeightCap = _signature.renderHeightCap,
+		.devicePixelRatio = devicePixelRatio,
+	});
+	if (rendered.logicalSize.isEmpty()) {
+		rendered.logicalSize = measured().logicalSize;
+		rendered.logicalDepth = measured().logicalDepth;
+		rendered.exact = measured().exact;
+		rendered.fallbackText = measured().fallbackText;
+		rendered.error = measured().error;
+		rendered.overflow = measured().overflow;
+		rendered.tooLarge = measured().tooLarge;
+		NormalizeInlineFormulaRasterMetrics(&rendered);
+	}
+	if (!rendered.success) {
+		rendered = MeasuredFallback(measured());
+	}
+	const auto i = _rendered.emplace(
+		devicePixelRatio,
+		std::move(rendered)).first;
+	return i->second;
+}
+
+const QImage *InlineFormulaSharedState::colorizedImage(
+		const QColor &color,
+		int devicePixelRatio) const {
+	const auto rendered = ensureRendered(devicePixelRatio);
+	if (!rendered.success) {
+		return nullptr;
+	}
+	const auto key = InlineFormulaColorizedKey{
+		.color = color.rgba(),
+		.devicePixelRatio = devicePixelRatio,
+	};
+	if (const auto i = _colorized.find(key); i != end(_colorized)) {
+		return &i->second;
+	}
+	auto colorized = QImage(
+		rendered.image.size(),
+		QImage::Format_ARGB32_Premultiplied);
+	style::colorizeImage(
+		rendered.image,
+		color,
+		&colorized,
+		QRect(),
+		QPoint(),
+		true);
+	const auto i = _colorized.emplace(
+		key,
+		std::move(colorized)).first;
+	return &i->second;
+}
+
+InlineFormulaObject::InlineFormulaObject(
+	QString replacementText,
+	int fallbackWidth,
+	std::shared_ptr<InlineFormulaSharedState> state)
+: _replacementText(std::move(replacementText))
+, _fallbackWidth(std::max(fallbackWidth, 1))
+, _state(std::move(state)) {
+}
+
+int InlineFormulaObject::width() {
+	if (!_state || _state->failed()) {
+		return _fallbackWidth;
+	}
+	return _state->width();
+}
+
+QString InlineFormulaObject::entityData() {
+	return QString();
+}
+
+auto InlineFormulaObject::vertical(const style::TextStyle &textStyle)
+-> std::optional<Ui::Text::CustomEmojiVerticalMetrics> {
+	return _state ? _state->vertical(textStyle) : std::nullopt;
+}
+
+QString InlineFormulaObject::replacementText() {
+	return _replacementText;
+}
+
+Ui::Text::CustomEmojiSemantics InlineFormulaObject::semantics() {
+	return {
+		.isEmoji = false,
+		.isRealCustomEmoji = false,
+		.exportEntity = false,
+		.unloadPersistentAnimation = false,
+		.allowCustomEmojiClick = false,
+	};
+}
+
+void InlineFormulaObject::paint(QPainter &p, const Context &context) {
+	if (_state) {
+		_state->paint(p, context, _replacementText, _fallbackWidth);
+	}
+}
+
+void InlineFormulaObject::unload() {
+}
+
+bool InlineFormulaObject::ready() {
+	return true;
+}
+
+bool InlineFormulaObject::readyInDefaultState() {
+	return true;
+}
+
+void InlineFormulaObjectCache::setRenderer(std::shared_ptr<MathRenderer> renderer) {
+	_renderer = std::move(renderer);
+	for (const auto &entry : _states) {
+		const auto &state = entry.second;
+		if (state) {
+			state->setRenderer(_renderer);
+		}
+	}
+}
+
+void InlineFormulaObjectCache::clear() {
+	_states.clear();
+}
+
+void InlineFormulaObjectCache::invalidatePaletteCache() {
+	for (const auto &entry : _states) {
+		const auto &state = entry.second;
+		if (state) {
+			state->invalidatePaletteCache();
+		}
+	}
+}
+
+void InlineFormulaObjectCache::invalidateRasterCache() {
+	for (const auto &entry : _states) {
+		const auto &state = entry.second;
+		if (state) {
+			state->invalidateRasterCache();
+		}
+	}
+}
+
+InlineIvImageObject::InlineIvImageObject(
+	QString replacementText,
+	int width,
+	int height,
+	std::shared_ptr<Ui::DynamicImage> image,
+	Fn<void()> repaint,
+	Fn<void(QRect)> repaintRect)
+: _replacementText(std::move(replacementText))
+, _width(std::max(width, 1))
+, _height(std::max(height, 1))
+, _image(std::move(image))
+, _repaint(std::move(repaint))
+, _repaintRect(std::move(repaintRect)) {
+}
+
+int InlineIvImageObject::width() {
+	return _width;
+}
+
+QString InlineIvImageObject::entityData() {
+	return QString();
+}
+
+auto InlineIvImageObject::vertical(const style::TextStyle &textStyle)
+-> std::optional<Ui::Text::CustomEmojiVerticalMetrics> {
+	if (_height > 0) {
+		const auto line = TextLineHeight(textStyle);
+		const auto above = _height - (_height / 2);
+		const auto ascent = above - (line / 2) + TextLineAscent(textStyle);
+		return Ui::Text::CustomEmojiVerticalMetrics{
+			.ascent = ascent,
+			.descent = _height - ascent,
+		};
+	}
+	const auto ascent = std::max(TextLineAscent(textStyle), 0);
+	return Ui::Text::CustomEmojiVerticalMetrics{
+		.ascent = ascent,
+		.descent = std::max(TextLineHeight(textStyle) - ascent, 0),
+	};
+}
+
+QString InlineIvImageObject::replacementText() {
+	return _replacementText;
+}
+
+Ui::Text::CustomEmojiSemantics InlineIvImageObject::semantics() {
+	return {
+		.isEmoji = false,
+		.isRealCustomEmoji = false,
+		.exportEntity = false,
+		.unloadPersistentAnimation = false,
+		.allowCustomEmojiClick = false,
+	};
+}
+
+void InlineIvImageObject::paint(QPainter &p, const Context &context) {
+	*_lastPaintRect = QRect(context.position, QSize(_width, _height));
+	if (_image) {
+		if (!_subscribed) {
+			_subscribed = true;
+			const auto repaint = _repaint;
+			const auto repaintRect = _repaintRect;
+			const auto lastPaintRect = _lastPaintRect;
+			_image->subscribeToUpdates([=] {
+				if (repaintRect && lastPaintRect && !lastPaintRect->isEmpty()) {
+					repaintRect(*lastPaintRect);
+				} else if (repaint) {
+					repaint();
+				}
+			});
+		}
+		if (const auto image = _image->image(std::max(_width, _height));
+			!image.isNull()) {
+			p.drawImage(
+				QRect(context.position, QSize(_width, _height)),
+				image);
+			return;
+		}
+	}
+	if (_replacementText.isEmpty()) {
+		return;
+	}
+	p.save();
+	p.setPen(context.textColor);
+	p.drawText(
+		QRect(context.position, QSize(_width, _height)),
+		Qt::AlignCenter | Qt::TextWordWrap,
+		_replacementText);
+	p.restore();
+}
+
+void InlineIvImageObject::unload() {
+	if (_subscribed && _image) {
+		_subscribed = false;
+		_image->subscribeToUpdates(nullptr);
+	}
+}
+
+bool InlineIvImageObject::ready() {
+	return true;
+}
+
+bool InlineIvImageObject::readyInDefaultState() {
+	return true;
+}
+
+std::unique_ptr<Ui::Text::CustomEmoji> InlineFormulaObjectCache::create(
+		const InlineTextObjectFormulaData &data,
+		const style::TextStyle &textStyle,
+		const style::Markdown &st,
+		const std::vector<PreparedFormulaSlot> *formulas) {
+	auto replacementText = data.copySource;
+	if (replacementText.isEmpty()) {
+		replacementText = u"$"_q + data.trimmedTex + u"$"_q;
+	}
+	auto state = lookupOrCreate(
+		InlineFormulaSignature(data.trimmedTex, textStyle, st),
+		textStyle,
+		st,
+		formulas);
+	if (!state) {
+		return nullptr;
+	}
+	const auto fallbackWidth = std::max(
+		textStyle.font->width(replacementText),
+		1);
+	return std::make_unique<InlineFormulaObject>(
+		std::move(replacementText),
+		fallbackWidth,
+		std::move(state));
+}
+
+auto InlineFormulaObjectCache::lookupOrCreate(
+		const PreparedFormulaMeasurementSignature &signature,
+		const style::TextStyle &textStyle,
+		const style::Markdown &st,
+		const std::vector<PreparedFormulaSlot> *formulas)
+-> std::shared_ptr<InlineFormulaSharedState> {
+	if (const auto i = _states.find(signature); i != end(_states)) {
+		return i->second;
+	}
+	auto measured = MeasuredFormula();
+	auto measuredData = FindInlineFormulaMeasuredData(
+		formulas,
+		signature,
+		st,
+		&measured);
+	if (measuredData) {
+		measured = *measuredData;
+	} else {
+		if (!_renderer) {
+			_renderer = std::make_shared<MathRenderer>();
+		}
+		measured = _renderer->measureFormula({
+			.trimmedTex = signature.trimmedTex,
+			.kind = signature.kind,
+			.textSize = signature.textSize,
+			.renderWidthCap = signature.renderWidthCap,
+			.renderHeightCap = signature.renderHeightCap,
+		});
+		measuredData = std::make_shared<MeasuredFormula>(measured);
+	}
+	const auto fallbackText = InlineFormulaDisplayFallbackText(
+		signature,
+		measured);
+	auto state = std::make_shared<InlineFormulaSharedState>(
+		signature,
+		std::move(measuredData),
+		fallbackText,
+		_renderer);
+	_states.emplace(signature, state);
+	return state;
+}
+
+std::shared_ptr<InlineFormulaObjectCache> CreateInlineFormulaObjectCache(
+		std::shared_ptr<MathRenderer> renderer) {
+	auto result = std::make_shared<InlineFormulaObjectCache>();
+	result->setRenderer(std::move(renderer));
+	return result;
+}
+
+void SetInlineFormulaObjectCacheRenderer(
+		const std::shared_ptr<InlineFormulaObjectCache> &cache,
+		std::shared_ptr<MathRenderer> renderer) {
+	if (cache) {
+		cache->setRenderer(std::move(renderer));
+	}
+}
+
+void ClearInlineFormulaObjectCache(
+		const std::shared_ptr<InlineFormulaObjectCache> &cache) {
+	if (cache) {
+		cache->clear();
+	}
+}
+
+void InvalidateInlineFormulaPaletteCache(
+		const std::shared_ptr<InlineFormulaObjectCache> &cache) {
+	if (cache) {
+		cache->invalidatePaletteCache();
+	}
+}
+
+void InvalidateInlineFormulaRasterCache(
+		const std::shared_ptr<InlineFormulaObjectCache> &cache) {
+	if (cache) {
+		cache->invalidateRasterCache();
+	}
+}
+
+void SetTextLeaf(
+		Ui::Text::String *leaf,
+		const style::TextStyle &textStyle,
+		const style::Markdown &st,
+		const TextWithEntities &text,
+		const std::vector<PreparedFormulaSlot> *formulas,
+		InlineFormulaObjectCache *inlineFormulaObjects,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		int minResizeWidth,
+		Fn<void()> repaint,
+		Fn<void(QRect)> repaintRect,
+		Fn<bool(const ClickContext&)> spoilerLinkFilter) {
+	*leaf = Ui::Text::String(TextMinResizeWidth(minResizeWidth));
+	auto context = mediaRuntime
+		? mediaRuntime->textContext()
+		: Ui::Text::MarkedContext();
+	context.repaint = repaint;
+	const auto textStylePtr = &textStyle;
+	const auto stPtr = &st;
+	auto originalCustomEmojiFactory = std::move(context.customEmojiFactory);
+	context.customEmojiFactory = [
+		formulas,
+		inlineFormulaObjects,
+		mediaRuntime,
+		repaintRect = std::move(repaintRect),
+		originalCustomEmojiFactory = std::move(originalCustomEmojiFactory),
+		textStyle = textStylePtr,
+		st = stPtr
+	](
+			QStringView data,
+			const Ui::Text::MarkedContext &context
+	) -> std::unique_ptr<Ui::Text::CustomEmoji> {
+		const auto parsed = ParseInlineTextObjectEntity(data);
+		if (!parsed) {
+			return originalCustomEmojiFactory
+				? originalCustomEmojiFactory(data, context)
+				: std::unique_ptr<Ui::Text::CustomEmoji>();
+		}
+		switch (parsed->kind) {
+		case InlineTextObjectKind::Formula: {
+			if (!inlineFormulaObjects) {
+				return std::unique_ptr<Ui::Text::CustomEmoji>();
+			}
+			const auto formula = std::get_if<InlineTextObjectFormulaData>(
+				&parsed->data);
+			return formula
+				? inlineFormulaObjects->create(
+					*formula,
+					*textStyle,
+					*st,
+					formulas)
+				: std::unique_ptr<Ui::Text::CustomEmoji>();
+		} break;
+		case InlineTextObjectKind::IvImage: {
+			const auto image = std::get_if<InlineTextObjectIvImageData>(
+				&parsed->data);
+			if (!image) {
+				return std::unique_ptr<Ui::Text::CustomEmoji>();
+			}
+			const auto resolved = mediaRuntime
+				? mediaRuntime->resolveInlineImage(
+					image->documentId,
+					QSize(image->width, image->height))
+				: nullptr;
+			return std::make_unique<InlineIvImageObject>(
+				image->replacementText,
+				image->width,
+				image->height,
+				std::move(resolved),
+				context.repaint,
+				repaintRect);
+		}
+		}
+		return std::unique_ptr<Ui::Text::CustomEmoji>();
+	};
+	leaf->setMarkedText(textStyle, text, kIvMarkedTextOptions, context);
+	SetTextLeafSpoilerLinkFilter(leaf, std::move(spoilerLinkFilter));
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_article_text.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_text.h
new file mode 100644
index 00000000000000..3b20c6d8875979
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_article_text.h
@@ -0,0 +1,77 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_article.h"
+
+#include "ui/click_handler.h"
+
+#include <memory>
+#include <optional>
+
+namespace style {
+struct Markdown;
+struct TextStyle;
+} // namespace style
+
+namespace Iv::Markdown {
+
+class InlineFormulaObjectCache;
+
+[[nodiscard]] ClickHandlerPtr CreatePreparedLinkHandler(PreparedLink link);
+[[nodiscard]] std::optional<PreparedLink> ExtractPreparedLink(
+	const ClickHandlerPtr &link);
+void BindLinks(
+	Ui::Text::String *leaf,
+	const std::vector<PreparedLink> &links);
+void SetTextLeafSpoilerLinkFilter(
+	Ui::Text::String *leaf,
+	Fn<bool(const ClickContext&)> spoilerLinkFilter = nullptr);
+
+[[nodiscard]] std::shared_ptr<InlineFormulaObjectCache>
+CreateInlineFormulaObjectCache(std::shared_ptr<MathRenderer> renderer);
+void SetInlineFormulaObjectCacheRenderer(
+	const std::shared_ptr<InlineFormulaObjectCache> &cache,
+	std::shared_ptr<MathRenderer> renderer);
+void ClearInlineFormulaObjectCache(
+	const std::shared_ptr<InlineFormulaObjectCache> &cache);
+void InvalidateInlineFormulaPaletteCache(
+	const std::shared_ptr<InlineFormulaObjectCache> &cache);
+void InvalidateInlineFormulaRasterCache(
+	const std::shared_ptr<InlineFormulaObjectCache> &cache);
+
+[[nodiscard]] const PreparedFormulaSlot *PreparedFormulaFor(
+	const std::vector<PreparedFormulaSlot> &formulas,
+	int formulaIndex);
+[[nodiscard]] PreparedFormulaSlot *PreparedFormulaFor(
+	std::vector<PreparedFormulaSlot> *formulas,
+	int formulaIndex);
+[[nodiscard]] RenderedFormula *FormulaRasterSlot(
+	std::vector<RenderedFormula> *rendered,
+	int formulaIndex);
+[[nodiscard]] RenderedFormula EnsureFormulaRendered(
+	const PreparedFormulaSlot *slot,
+	RenderedFormula *rendered,
+	MathRenderer *renderer,
+	int devicePixelRatio,
+	const style::Markdown &st);
+
+void SetTextLeaf(
+	Ui::Text::String *leaf,
+	const style::TextStyle &textStyle,
+	const style::Markdown &st,
+	const TextWithEntities &text,
+	const std::vector<PreparedFormulaSlot> *formulas,
+	InlineFormulaObjectCache *inlineFormulaObjects,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	int minResizeWidth,
+	Fn<void()> repaint = nullptr,
+	Fn<void(QRect)> repaintRect = nullptr,
+	Fn<bool(const ClickContext&)> spoilerLinkFilter = nullptr);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_common.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_common.cpp
new file mode 100644
index 00000000000000..2a4d7f204a9cb6
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_common.cpp
@@ -0,0 +1,48 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_common.h"
+#include "base/basic_types.h"
+
+#include <array>
+
+namespace Iv::Markdown {
+
+bool LooksLikeMarkdownFile(const QString &fileName, const QString &mimeType) {
+	const auto suffixes = std::array{
+		u".md"_q,
+		u".markdown"_q,
+	};
+	auto suffixMatches = false;
+	for (const auto &suffix : suffixes) {
+		if (fileName.endsWith(suffix, Qt::CaseInsensitive)) {
+			suffixMatches = true;
+			break;
+		}
+	}
+	if (!suffixMatches) {
+		return false;
+	}
+	if (mimeType.isEmpty()) {
+		return true;
+	}
+
+	const auto normalized = mimeType.trimmed().toLower();
+	const auto acceptedMimeTypes = std::array{
+		u"text/markdown"_q,
+		u"text/x-markdown"_q,
+		u"text/plain"_q,
+	};
+	for (const auto &accepted : acceptedMimeTypes) {
+		if (normalized == accepted) {
+			return true;
+		}
+	}
+	return false;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_common.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_common.h
new file mode 100644
index 00000000000000..59444a4fe11f35
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_common.h
@@ -0,0 +1,292 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include <QtCore/QByteArray>
+#include <QtCore/QSize>
+#include <QtCore/QString>
+#include <QtCore/QVariant>
+
+#include <rpl/never.h>
+#include <rpl/producer.h>
+
+#include <functional>
+#include <memory>
+
+#include "ui/text/text.h"
+#include "webview/webview_common.h"
+
+namespace Ui {
+class DynamicImage;
+class Show;
+} // namespace Ui
+
+namespace Iv {
+class Delegate;
+} // namespace Iv
+
+namespace Iv::Markdown {
+
+class MediaBlock;
+class HostedMediaBlockFactory;
+class PhotoRuntime {
+public:
+	virtual ~PhotoRuntime() = default;
+
+	[[nodiscard]] virtual std::shared_ptr<Ui::DynamicImage> thumbnail(
+		QSize size) const = 0;
+	[[nodiscard]] virtual std::shared_ptr<Ui::DynamicImage> full(
+		QSize size) const = 0;
+	[[nodiscard]] virtual bool loaded() const = 0;
+	[[nodiscard]] virtual bool loading() const = 0;
+	[[nodiscard]] virtual double progress() const = 0;
+	virtual void open(Qt::MouseButton button) const = 0;
+};
+
+class DocumentRuntime {
+public:
+	virtual ~DocumentRuntime() = default;
+
+	[[nodiscard]] virtual std::shared_ptr<Ui::DynamicImage> thumbnail(
+		QSize size) const = 0;
+	[[nodiscard]] virtual std::shared_ptr<Ui::DynamicImage> full(
+		QSize size) const = 0;
+	[[nodiscard]] virtual bool loaded() const = 0;
+	[[nodiscard]] virtual bool loading() const = 0;
+	[[nodiscard]] virtual double progress() const = 0;
+	virtual void open(Qt::MouseButton button) const = 0;
+};
+
+class MapRuntime {
+public:
+	virtual ~MapRuntime() = default;
+
+	[[nodiscard]] virtual std::shared_ptr<Ui::DynamicImage> thumbnail(
+		QSize size) const = 0;
+	[[nodiscard]] virtual std::shared_ptr<Ui::DynamicImage> full(
+		QSize size) const = 0;
+	[[nodiscard]] virtual bool loaded() const = 0;
+	[[nodiscard]] virtual bool loading() const = 0;
+	[[nodiscard]] virtual double progress() const = 0;
+};
+
+class ChannelRuntime {
+public:
+	virtual ~ChannelRuntime() = default;
+
+	[[nodiscard]] virtual bool joinVisible() const = 0;
+	virtual void open(Qt::MouseButton button) const = 0;
+	virtual void join(Qt::MouseButton button) const = 0;
+};
+
+struct PreparedMediaBlockId {
+	uint64 value = 0;
+
+	[[nodiscard]] explicit operator bool() const {
+		return (value != 0);
+	}
+};
+
+struct PreparedPlaceholderBlockId {
+	uint64 value = 0;
+
+	[[nodiscard]] explicit operator bool() const {
+		return (value != 0);
+	}
+};
+
+struct PreparedPhotoBlockData;
+struct PreparedVideoBlockData;
+struct PreparedAudioBlockData;
+struct PreparedMapBlockData;
+struct PreparedGroupedMediaBlockData;
+
+class HostedMediaBlockFactory {
+public:
+	virtual ~HostedMediaBlockFactory() = default;
+
+	[[nodiscard]] virtual std::shared_ptr<MediaBlock> createPhoto(
+		const PreparedPhotoBlockData &prepared) const {
+		return nullptr;
+	}
+	[[nodiscard]] virtual std::shared_ptr<MediaBlock> createVideo(
+		const PreparedVideoBlockData &prepared) const {
+		return nullptr;
+	}
+	[[nodiscard]] virtual std::shared_ptr<MediaBlock> createAudio(
+		const PreparedAudioBlockData &prepared) const {
+		return nullptr;
+	}
+	[[nodiscard]] virtual std::shared_ptr<MediaBlock> createMap(
+		const PreparedMapBlockData &prepared) const {
+		return nullptr;
+	}
+	[[nodiscard]] virtual std::shared_ptr<MediaBlock> createGroupedMedia(
+		const PreparedGroupedMediaBlockData &prepared) const {
+		return nullptr;
+	}
+};
+
+class MediaRuntime {
+public:
+	virtual ~MediaRuntime() = default;
+
+	[[nodiscard]] virtual Ui::Text::MarkedContext textContext() const;
+	[[nodiscard]] virtual QString mentionNameEntityData(uint64 userId) const;
+	[[nodiscard]] virtual std::shared_ptr<Ui::DynamicImage> resolveInlineImage(
+		uint64 documentId,
+		QSize size) const = 0;
+	[[nodiscard]] virtual std::shared_ptr<PhotoRuntime> resolvePhoto(
+		uint64 photoId) const = 0;
+	[[nodiscard]] virtual std::shared_ptr<DocumentRuntime> resolveDocument(
+		uint64 documentId) const;
+	virtual void registerPhoto(
+		uint64 photoId,
+		TextWithEntities caption = {}) const;
+	virtual void registerDocument(
+		uint64 documentId,
+		TextWithEntities caption = {}) const;
+	[[nodiscard]] virtual std::shared_ptr<MapRuntime> resolveMap(
+		double latitude,
+		double longitude,
+		uint64 accessHash,
+		QSize size,
+		int zoom) const;
+	[[nodiscard]] virtual std::shared_ptr<ChannelRuntime> resolveChannel(
+		uint64 channelId,
+		const QString &username) const;
+	[[nodiscard]] virtual rpl::producer<uint64> channelJoinedChanges() const;
+	[[nodiscard]] virtual std::shared_ptr<HostedMediaBlockFactory>
+	hostedMediaBlockFactory() const;
+};
+
+inline Ui::Text::MarkedContext MediaRuntime::textContext() const {
+	return {};
+}
+
+inline QString MediaRuntime::mentionNameEntityData(uint64) const {
+	return QString();
+}
+
+inline std::shared_ptr<DocumentRuntime> MediaRuntime::resolveDocument(
+		uint64) const {
+	return nullptr;
+}
+
+inline void MediaRuntime::registerPhoto(uint64, TextWithEntities) const {
+}
+
+inline void MediaRuntime::registerDocument(uint64, TextWithEntities) const {
+}
+
+inline std::shared_ptr<MapRuntime> MediaRuntime::resolveMap(
+		double,
+		double,
+		uint64,
+		QSize,
+		int) const {
+	return nullptr;
+}
+
+inline std::shared_ptr<ChannelRuntime> MediaRuntime::resolveChannel(
+		uint64,
+		const QString &) const {
+	return nullptr;
+}
+
+inline rpl::producer<uint64> MediaRuntime::channelJoinedChanges() const {
+	return rpl::never<uint64>();
+}
+
+inline auto MediaRuntime::hostedMediaBlockFactory() const
+-> std::shared_ptr<HostedMediaBlockFactory> {
+	return nullptr;
+}
+
+enum class MediaActivationKind {
+	None,
+	ExternalUrl,
+	Embed,
+	Photo,
+	Document,
+	OpenChannel,
+	JoinChannel,
+};
+
+struct EmbedRequest {
+	QByteArray html;
+	QString url;
+	int width = 0;
+	int height = 0;
+	bool fullWidth = false;
+	bool fixedHeight = false;
+	bool allowScrolling = false;
+
+	[[nodiscard]] explicit operator bool() const {
+		return !html.isEmpty() || !url.isEmpty();
+	}
+};
+
+struct MediaActivation {
+	MediaActivationKind kind = MediaActivationKind::None;
+	QString url;
+	EmbedRequest embed;
+	PreparedPlaceholderBlockId placeholderId;
+	std::shared_ptr<PhotoRuntime> photo;
+	std::shared_ptr<DocumentRuntime> document;
+	std::shared_ptr<ChannelRuntime> channel;
+};
+
+enum class ViewerKind {
+	Auto,
+	LocalFile,
+	InstantView,
+};
+
+struct OpenOptions {
+	QString sourceName;
+	QString sourcePath;
+	QString sourceUrl;
+	QString initialFragment;
+	uint64 currentPageId = 0;
+	ViewerKind viewerKind = ViewerKind::Auto;
+	Iv::Delegate *delegate = nullptr;
+	QVariant clickHandlerContext;
+	std::shared_ptr<QVariant> clickHandlerContextRef;
+	std::function<void()> openSource;
+	std::function<void(std::shared_ptr<Ui::Show>)> share;
+	Webview::StorageId ivWebviewStorageId;
+	std::function<bool(
+		const MediaActivation &,
+		Qt::MouseButton)> activateMedia;
+	rpl::producer<> downloadTaskFinished;
+};
+
+struct ParseOptions {
+	QString sourceName;
+};
+
+[[nodiscard]] bool LooksLikeMarkdownFile(
+	const QString &fileName,
+	const QString &mimeType = QString());
+
+struct Event {
+	enum class Type {
+		Close,
+		Quit,
+		OpenPage,
+		OpenFile,
+		Report,
+	};
+	Type type = Type::Close;
+	uint64 webpageId = 0;
+	QString url;
+	QVariant context;
+};
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_controller.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_controller.cpp
new file mode 100644
index 00000000000000..18c71ed69068a6
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_controller.cpp
@@ -0,0 +1,1211 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_controller.h"
+#include "base/event_filter.h"
+#include "base/weak_ptr.h"
+#include "core/click_handler_types.h"
+#include "core/credits_amount.h"
+#include "core/file_utilities.h"
+#include "iv/markdown/iv_markdown_parse.h"
+#include "iv/markdown/iv_markdown_view.h"
+#include "iv/iv_delegate_impl.h"
+#include "iv/iv_zoom_controls.h"
+#include "lang/lang_keys.h"
+#include "ui/layers/layer_manager.h"
+#include "ui/layers/show.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/rp_window.h"
+#include "ui/wrap/fade_wrap.h"
+#include "logs.h"
+
+#include "styles/palette.h"
+#include "styles/style_iv.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_window.h"
+
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QUrl>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QKeySequence>
+#include <QtGui/QPainter>
+
+#include <algorithm>
+#include <memory>
+#include <utility>
+#include <vector>
+
+namespace Iv::Markdown {
+namespace {
+
+constexpr auto kZoomStep = int(10);
+
+[[nodiscard]] OpenOptions PrepareOpenOptions(
+		OpenOptions options,
+		not_null<Delegate*> delegate,
+		const QString &title) {
+	options.delegate = delegate;
+	Q_UNUSED(title);
+	return options;
+}
+
+[[nodiscard]] ViewerKind ResolveViewerKind(const OpenOptions &options) {
+	return (options.viewerKind != ViewerKind::Auto)
+		? options.viewerKind
+		: options.sourcePath.isEmpty()
+		? ViewerKind::InstantView
+		: ViewerKind::LocalFile;
+}
+
+[[nodiscard]] QString SubtitleText(
+		const OpenOptions &options,
+		const QString &title) {
+	if (!options.sourceName.trimmed().isEmpty()) {
+		return options.sourceName.trimmed();
+	}
+	const auto host = QUrl(options.sourceUrl).host().trimmed();
+	return !host.isEmpty() ? host : title.trimmed();
+}
+
+[[nodiscard]] QString OpenSourceLabel(ViewerKind kind) {
+	return (kind == ViewerKind::InstantView)
+		? tr::lng_iv_open_in_browser(tr::now)
+		: tr::lng_markdown_preview_open_file(tr::now);
+}
+
+[[nodiscard]] const style::icon *OpenSourceIcon(ViewerKind kind) {
+	return (kind == ViewerKind::InstantView)
+		? &st::menuIconIpAddress
+		: &st::menuIconFile;
+}
+
+[[nodiscard]] QVariant ExtendClickHandlerContext(
+		QVariant context,
+		const std::shared_ptr<Ui::Show> &show) {
+	if (!show) {
+		return context;
+	} else if (!context.isValid()
+		|| context.canConvert<ClickHandlerContext>()) {
+		auto clickContext = context.isValid()
+			? context.value<ClickHandlerContext>()
+			: ClickHandlerContext();
+		clickContext.show = show;
+		return QVariant::fromValue(clickContext);
+	}
+	return context;
+}
+
+[[nodiscard]] std::shared_ptr<QVariant> ResolveClickHandlerContextRef(
+		const std::shared_ptr<QVariant> &current,
+		const OpenOptions &options) {
+	return options.clickHandlerContextRef
+		? options.clickHandlerContextRef
+		: (current ? current : std::make_shared<QVariant>());
+}
+
+void ProcessZoomShortcut(not_null<Delegate*> delegate, QKeyEvent *event) {
+	if (!(event->modifiers() & Qt::ControlModifier)) {
+		return;
+	}
+	if (event->key() == Qt::Key_Plus || event->key() == Qt::Key_Equal) {
+		event->accept();
+		delegate->ivSetZoom(delegate->ivZoom() + kZoomStep);
+	} else if (event->key() == Qt::Key_Minus) {
+		event->accept();
+		delegate->ivSetZoom(delegate->ivZoom() - kZoomStep);
+	} else if (event->key() == Qt::Key_0) {
+		event->accept();
+		delegate->ivSetZoom(0);
+	}
+}
+
+struct OpenTarget {
+	QString path;
+	QString fragment;
+};
+
+struct PageHistoryTarget {
+	uint64 pageId = 0;
+	QString sourceUrl;
+	QString hash;
+};
+
+[[nodiscard]] bool IsReadableLocalFile(const QFileInfo &info) {
+	return info.exists() && info.isFile() && info.isReadable();
+}
+
+struct ReadSource {
+	QString path;
+	QString name;
+	QByteArray bytes;
+
+	explicit operator bool() const {
+		return !path.isEmpty();
+	}
+};
+[[nodiscard]] ReadSource ReadLocalSource(
+		const QString &path,
+		const MarkdownParseLimits &limits) {
+	const auto info = QFileInfo(path);
+	auto name = info.fileName();
+	if (!IsReadableLocalFile(info) || !LooksLikeMarkdownFile(name)) {
+		return {};
+	} else if (info.size() > limits.maxSourceBytes) {
+		DEBUG_LOG(("Native Markdown IV: rejected local file too large: %1"
+			).arg(path));
+		return {};
+	}
+	auto file = QFile(path);
+	if (!file.open(QIODevice::ReadOnly)) {
+		return {};
+	}
+	auto data = file.read(limits.maxSourceBytes);
+	if (file.error() != QFileDevice::NoError || !file.atEnd()) {
+		DEBUG_LOG(("Native Markdown IV: could not read local file: %1"
+			).arg(path));
+		return {};
+	}
+	return {
+		.path = info.absoluteFilePath(),
+		.name = std::move(name),
+		.bytes = std::move(data),
+	};
+}
+
+[[nodiscard]] QString NormalizeFragmentId(QString fragment) {
+	fragment = QString::fromUtf8(
+		QByteArray::fromPercentEncoding(fragment.toUtf8()));
+	fragment = fragment.trimmed().toLower();
+	while (fragment.startsWith(QChar('#'))) {
+		fragment.remove(0, 1);
+	}
+	return fragment;
+}
+
+[[nodiscard]] PageHistoryTarget ParsePageHistoryTarget(
+		uint64 pageId,
+		QString url) {
+	const auto hash = url.indexOf(QChar('#'));
+	return (hash < 0)
+		? PageHistoryTarget{
+			.pageId = pageId,
+			.sourceUrl = std::move(url),
+		}
+		: PageHistoryTarget{
+			.pageId = pageId,
+			.sourceUrl = url.mid(0, hash),
+			.hash = NormalizeFragmentId(url.mid(hash + 1)),
+		};
+}
+
+[[nodiscard]] QString ComposePageHistoryUrl(const PageHistoryTarget &target) {
+	return target.hash.isEmpty()
+		? target.sourceUrl
+		: (target.sourceUrl + u"#"_q + target.hash);
+}
+
+[[nodiscard]] OpenTarget ParseOpenTarget(QString path) {
+	const auto direct = QFileInfo(path);
+	if (direct.exists()) {
+		return { path, QString() };
+	}
+	const auto hash = path.lastIndexOf(QChar('#'));
+	if (hash <= 0) {
+		return { path, QString() };
+	}
+	const auto candidate = path.mid(0, hash);
+	if (candidate.isEmpty()) {
+		return { path, QString() };
+	}
+	const auto info = QFileInfo(candidate);
+	return info.exists()
+		? OpenTarget{ candidate, NormalizeFragmentId(path.mid(hash + 1)) }
+		: OpenTarget{ path, QString() };
+}
+
+[[nodiscard]] bool HasPreviewableContent(const MarkdownNode &node) {
+	switch (node.kind) {
+	case NodeKind::Document:
+	case NodeKind::Unsupported:
+		break;
+	default:
+		return true;
+	}
+	return std::any_of(
+		node.children.begin(),
+		node.children.end(),
+		[](const MarkdownNode &child) {
+			return HasPreviewableContent(child);
+		});
+}
+
+[[nodiscard]] bool AcceptsPreview(const PreparedDocument &document) {
+	return HasPreviewableContent(document.document)
+		|| !document.formulas.empty();
+}
+
+void LogDocumentWarnings(
+		const PreparedDocument &document,
+		const QString &path) {
+	for (const auto &warning : document.warnings) {
+		DEBUG_LOG(("Native Markdown IV: warning (%1): %2"
+			).arg(warning
+			).arg(path));
+	}
+}
+
+} // namespace
+
+Controller::Controller(
+	not_null<Delegate*> delegate,
+	PreparedDocument document,
+	QString title,
+	OpenOptions options)
+: _delegate(delegate)
+, _document(std::make_shared<PreparedDocument>(std::move(document)))
+, _title(std::move(title))
+, _renderer(nullptr)
+, _options(PrepareOpenOptions(std::move(options), delegate, _title)) {
+	_clickHandlerContextRef = ResolveClickHandlerContextRef(
+		_clickHandlerContextRef,
+		_options);
+	_options.clickHandlerContextRef = _clickHandlerContextRef;
+	createWindow();
+}
+
+Controller::Controller(
+	not_null<Delegate*> delegate,
+	MarkdownArticleContent content,
+	QString title,
+	std::shared_ptr<MathRenderer> renderer,
+	OpenOptions options)
+: _delegate(delegate)
+, _preparedContent(std::move(content))
+, _title(std::move(title))
+, _renderer(renderer ? std::move(renderer) : std::make_shared<MathRenderer>())
+, _options(PrepareOpenOptions(std::move(options), delegate, _title)) {
+	_clickHandlerContextRef = ResolveClickHandlerContextRef(
+		_clickHandlerContextRef,
+		_options);
+	_options.clickHandlerContextRef = _clickHandlerContextRef;
+	createWindow();
+}
+
+Controller::~Controller() = default;
+
+rpl::lifetime &Controller::lifetime() {
+	return _lifetime;
+}
+
+void Controller::activate() {
+	if (_window->isMinimized()) {
+		_window->showNormal();
+	} else if (_window->isHidden()) {
+		_window->show();
+	}
+	_window->raise();
+	_window->activateWindow();
+	_window->setFocus();
+	if (_preview) {
+		_preview->setFocus();
+	}
+}
+
+void Controller::update(
+		MarkdownArticleContent content,
+		QString title,
+		OpenOptions options) {
+	setContent(
+		std::move(content),
+		std::move(title),
+		std::move(options),
+		true);
+}
+
+void Controller::show(
+		MarkdownArticleContent content,
+		QString title,
+		OpenOptions options) {
+	setContent(
+		std::move(content),
+		std::move(title),
+		std::move(options),
+		false);
+	activate();
+}
+
+void Controller::setContent(
+		MarkdownArticleContent content,
+		QString title,
+		OpenOptions options,
+		bool preserveScroll) {
+	const auto scrollTop = (preserveScroll && _preview)
+		? MarkdownPreviewScrollTop(_preview.get())
+		: 0;
+	if (preserveScroll) {
+		saveCurrentHistoryScroll(scrollTop);
+	}
+	auto refreshed = PrepareOpenOptions(std::move(options), _delegate, title);
+	if (preserveScroll && historyEnabled(refreshed)) {
+		auto activeIndex = -1;
+		if (_shownHistoryIndex >= 0
+			&& _shownHistoryIndex < int(_history.size())) {
+			activeIndex = _shownHistoryIndex;
+		} else if (_historyIndex >= 0
+			&& _historyIndex < int(_history.size())) {
+			activeIndex = _historyIndex;
+		}
+		if (activeIndex >= 0
+			&& sameHistoryPage(
+				_history[activeIndex],
+				refreshed.currentPageId,
+				refreshed.sourceUrl)) {
+			refreshed.initialFragment = _history[activeIndex].hash;
+		}
+	}
+	if (preserveScroll
+		&& _preview
+		&& historyEnabled(refreshed)) {
+		auto activeIndex = -1;
+		if (_shownHistoryIndex >= 0
+			&& _shownHistoryIndex < int(_history.size())) {
+			activeIndex = _shownHistoryIndex;
+		} else if (_historyIndex >= 0
+			&& _historyIndex < int(_history.size())) {
+			activeIndex = _historyIndex;
+		}
+		if (activeIndex >= 0
+			&& sameHistoryLocation(
+				_history[activeIndex],
+				refreshed.currentPageId,
+				refreshed.sourceUrl,
+				refreshed.initialFragment)) {
+			_title = std::move(title);
+			if (_menu) {
+				_menu = nullptr;
+				_menuToggle->setForceRippled(false);
+			}
+			const auto updated = updateExistingPreview(
+				std::move(content),
+				std::move(refreshed),
+				scrollTop);
+			Assert(updated);
+			if (updated) {
+				refreshTitle();
+				if (_window && _window->isActiveWindow() && _preview) {
+					_preview->setFocus();
+				}
+				updateHistoryButtons();
+			}
+			return;
+		}
+	}
+	if (historyEnabled(refreshed)
+		&& _shownHistoryIndex >= 0
+		&& _shownHistoryIndex < int(_history.size())
+		&& !sameHistoryPage(
+			_history[_shownHistoryIndex],
+			refreshed.currentPageId,
+			refreshed.sourceUrl)) {
+		saveCurrentHistoryScroll();
+	}
+	if (historyEnabled(refreshed)) {
+		auto index = findHistoryEntry(
+			refreshed.currentPageId,
+			refreshed.sourceUrl,
+			refreshed.initialFragment);
+		if (index < 0) {
+			if (_historyIndex < 0) {
+				_history.push_back({});
+				index = 0;
+			} else {
+				_history.resize(_historyIndex + 1);
+				index = int(_history.size());
+				_history.push_back({});
+			}
+			_historyIndex = index;
+		} else if (index != _historyIndex) {
+			updateCurrentHistoryEntry(content, title, refreshed);
+			updateHistoryButtons();
+			return;
+		}
+	}
+	_preparedContent = std::move(content);
+	_title = std::move(title);
+	_options = refreshed;
+	_clickHandlerContextRef = ResolveClickHandlerContextRef(
+		_clickHandlerContextRef,
+		_options);
+	_options.clickHandlerContextRef = _clickHandlerContextRef;
+	if (_menu) {
+		_menu = nullptr;
+		_menuToggle->setForceRippled(false);
+	}
+	refreshTitle();
+	createPreview();
+	if (preserveScroll && _preview) {
+		ScrollMarkdownPreviewToY(_preview.get(), scrollTop);
+	}
+	if (_window && _window->isActiveWindow() && _preview) {
+		_preview->setFocus();
+	}
+	updateHistoryButtons();
+}
+
+bool Controller::updateExistingPreview(
+		MarkdownArticleContent content,
+		OpenOptions options,
+		int scrollTop) {
+	Expects(_preview != nullptr);
+
+	_preparedContent = std::move(content);
+	_options = std::move(options);
+	_clickHandlerContextRef = ResolveClickHandlerContextRef(
+		_clickHandlerContextRef,
+		_options);
+	_options.clickHandlerContextRef = _clickHandlerContextRef;
+	auto previewOptions = _options;
+	previewOptions.clickHandlerContextRef = _clickHandlerContextRef;
+	previewOptions.clickHandlerContext = ExtendClickHandlerContext(
+		std::move(previewOptions.clickHandlerContext),
+		_show);
+	if (previewOptions.clickHandlerContextRef) {
+		*previewOptions.clickHandlerContextRef
+			= previewOptions.clickHandlerContext;
+	}
+	if (historyEnabled(_options)) {
+		updateCurrentHistoryEntry(*_preparedContent, _title, _options);
+		const auto index = findHistoryEntry(
+			_options.currentPageId,
+			_options.sourceUrl,
+			_options.initialFragment);
+		Assert(index >= 0);
+		if (index >= 0) {
+			_historyIndex = index;
+			_shownHistoryIndex = index;
+		}
+	} else {
+		_historyIndex = -1;
+		_shownHistoryIndex = -1;
+	}
+	previewOptions.initialFragment = QString();
+	if (!UpdateMarkdownPreviewWidget(
+			_preview.get(),
+			std::move(*_preparedContent),
+			previewOptions)) {
+		return false;
+	}
+	_preparedContent.reset();
+	ScrollMarkdownPreviewToY(_preview.get(), scrollTop);
+	return true;
+}
+
+void Controller::updateOptions(OpenOptions options) {
+	const auto initialFragment = options.initialFragment;
+	auto refreshed = PrepareOpenOptions(std::move(options), _delegate, _title);
+	if (refreshed.sourceName.isEmpty()) {
+		refreshed.sourceName = _options.sourceName;
+	}
+	if (refreshed.sourcePath.isEmpty()) {
+		refreshed.sourcePath = _options.sourcePath;
+	}
+	if (refreshed.sourceUrl.isEmpty()) {
+		refreshed.sourceUrl = _options.sourceUrl;
+	}
+	if (!refreshed.ivWebviewStorageId) {
+		refreshed.ivWebviewStorageId = _options.ivWebviewStorageId;
+	}
+	if (refreshed.viewerKind == ViewerKind::Auto) {
+		refreshed.viewerKind = _options.viewerKind;
+	}
+	if (!refreshed.openSource) {
+		refreshed.openSource = _options.openSource;
+	}
+	if (!refreshed.activateMedia) {
+		refreshed.activateMedia = _options.activateMedia;
+	}
+	_options = std::move(refreshed);
+	if (!_clickHandlerContextRef) {
+		_clickHandlerContextRef = std::make_shared<QVariant>();
+	}
+	_options.clickHandlerContextRef = _clickHandlerContextRef;
+	if (_clickHandlerContextRef) {
+		*_clickHandlerContextRef = ExtendClickHandlerContext(
+			_options.clickHandlerContext,
+			_show);
+	}
+	if (_menu) {
+		_menu = nullptr;
+		_menuToggle->setForceRippled(false);
+	}
+	refreshTitle();
+	if (!initialFragment.isEmpty() && _preview) {
+		const auto scrolled = ScrollMarkdownPreviewToAnchor(
+			_preview.get(),
+			initialFragment);
+		static_cast<void>(scrolled);
+	}
+	if (_window && _window->isActiveWindow() && _preview) {
+		_preview->setFocus();
+	}
+}
+
+bool Controller::active() const {
+	return _window && _window->isActiveWindow();
+}
+
+void Controller::showJoinedTooltip() {
+	if (_show) {
+		_show->showToast(tr::lng_action_you_joined(tr::now));
+	}
+}
+
+void Controller::minimize() {
+	if (_window) {
+		_window->setWindowState(_window->windowState() | Qt::WindowMinimized);
+	}
+}
+
+void Controller::close() {
+	_events.fire({ Event::Type::Close });
+}
+
+ViewerKind Controller::viewerKind() const {
+	return ResolveViewerKind(_options);
+}
+
+QString Controller::subtitleText() const {
+	return SubtitleText(_options, _title);
+}
+
+bool Controller::canOpenSource() const {
+	if (_options.openSource) {
+		return true;
+	}
+	return (viewerKind() == ViewerKind::InstantView)
+		? !_options.sourceUrl.isEmpty()
+		: !_options.sourcePath.isEmpty();
+}
+
+bool Controller::canShare() const {
+	return static_cast<bool>(_options.share);
+}
+
+bool Controller::historyEnabled(const OpenOptions &options) const {
+	return (ResolveViewerKind(options) == ViewerKind::InstantView)
+		&& (options.currentPageId != 0);
+}
+
+bool Controller::sameHistoryPage(
+		const HistoryEntry &entry,
+		uint64 pageId,
+		const QString &sourceUrl) const {
+	return entry.pageId
+		? (entry.pageId == pageId)
+		: (!sourceUrl.isEmpty() && entry.sourceUrl == sourceUrl);
+}
+
+bool Controller::sameCurrentPage(uint64 pageId, const QString &sourceUrl) const {
+	return (pageId != 0
+		&& _options.currentPageId != 0
+		&& pageId == _options.currentPageId)
+		|| (!sourceUrl.isEmpty()
+			&& !_options.sourceUrl.isEmpty()
+			&& sourceUrl == _options.sourceUrl);
+}
+
+bool Controller::sameHistoryLocation(
+		const HistoryEntry &entry,
+		uint64 pageId,
+		const QString &sourceUrl,
+		const QString &hash) const {
+	return sameHistoryPage(entry, pageId, sourceUrl)
+		&& (entry.hash == hash);
+}
+
+int Controller::findHistoryEntry(
+		uint64 pageId,
+		const QString &sourceUrl,
+		const QString &hash) const {
+	if (_historyIndex >= 0
+		&& _historyIndex < int(_history.size())
+		&& sameHistoryLocation(
+			_history[_historyIndex],
+			pageId,
+			sourceUrl,
+			hash)) {
+		return _historyIndex;
+	}
+	if (_shownHistoryIndex >= 0
+		&& _shownHistoryIndex < int(_history.size())
+		&& _shownHistoryIndex != _historyIndex
+		&& sameHistoryLocation(
+			_history[_shownHistoryIndex],
+			pageId,
+			sourceUrl,
+			hash)) {
+		return _shownHistoryIndex;
+	}
+	for (auto i = 0, count = int(_history.size()); i != count; ++i) {
+		if (sameHistoryLocation(_history[i], pageId, sourceUrl, hash)) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+void Controller::saveCurrentHistoryScroll(std::optional<int> scrollTop) {
+	const auto index = (_shownHistoryIndex >= 0)
+		? _shownHistoryIndex
+		: _historyIndex;
+	if (!_preview
+		|| index < 0
+		|| index >= int(_history.size())) {
+		return;
+	}
+	_history[index].scrollTop = scrollTop.value_or(
+		MarkdownPreviewScrollTop(_preview.get()));
+}
+
+void Controller::updateCurrentHistoryEntry(
+		const MarkdownArticleContent &content,
+		const QString &title,
+		const OpenOptions &options) {
+	if (!historyEnabled(options)) {
+		return;
+	}
+	auto index = findHistoryEntry(
+		options.currentPageId,
+		options.sourceUrl,
+		options.initialFragment);
+	if (index < 0) {
+		if (_historyIndex < 0) {
+			_history.push_back({});
+			index = 0;
+			_historyIndex = 0;
+		} else {
+			_history.resize(_historyIndex + 1);
+			index = int(_history.size());
+			_history.push_back({});
+			_historyIndex = index;
+		}
+	}
+	auto &entry = _history[index];
+	entry.pageId = options.currentPageId;
+	entry.sourceUrl = options.sourceUrl;
+	entry.hash = options.initialFragment;
+	entry.title = title;
+	entry.preparedContent = std::make_shared<MarkdownArticleContent>(content);
+	entry.options = options;
+}
+
+void Controller::handleOpenPage(Event event) {
+	if (!historyEnabled(_options)) {
+		_events.fire(std::move(event));
+		return;
+	}
+	const auto target = ParsePageHistoryTarget(event.webpageId, event.url);
+	if (!target.pageId || target.sourceUrl.isEmpty()) {
+		_events.fire(std::move(event));
+		return;
+	}
+	const auto currentIndex = (_historyIndex >= 0
+		&& _historyIndex < int(_history.size()))
+		? _historyIndex
+		: -1;
+	const auto current = (currentIndex >= 0) ? &_history[currentIndex] : nullptr;
+	const auto samePage = sameCurrentPage(target.pageId, target.sourceUrl)
+		|| (current
+			&& sameHistoryPage(*current, target.pageId, target.sourceUrl));
+	if (samePage) {
+		if (target.hash.isEmpty()) {
+			if (_preview) {
+				ScrollMarkdownPreviewToY(
+					_preview.get(),
+					0,
+					MarkdownPreviewScrollMode::Animated);
+			}
+			return;
+		}
+		if (_preview
+			&& ScrollMarkdownPreviewToAnchor(
+				_preview.get(),
+				target.hash,
+				MarkdownPreviewScrollMode::Animated)) {
+			return;
+		}
+		DEBUG_LOG(("Native Markdown IV: unresolved anchor: %1"
+			).arg(target.hash));
+		return;
+	}
+	saveCurrentHistoryScroll();
+	auto targetIndex = -1;
+	if ((_historyIndex + 1) < int(_history.size())
+		&& sameHistoryLocation(
+			_history[_historyIndex + 1],
+			target.pageId,
+			target.sourceUrl,
+			target.hash)) {
+		targetIndex = _historyIndex + 1;
+	} else {
+		auto options = _options;
+		options.sourceUrl = target.sourceUrl;
+		options.initialFragment = target.hash;
+		options.currentPageId = target.pageId;
+		_history.resize(_historyIndex + 1);
+		_history.push_back({
+			.pageId = target.pageId,
+			.sourceUrl = target.sourceUrl,
+			.hash = target.hash,
+			.options = std::move(options),
+		});
+		targetIndex = int(_history.size()) - 1;
+	}
+	auto &entry = _history[targetIndex];
+	entry.pageId = target.pageId;
+	entry.sourceUrl = target.sourceUrl;
+	entry.hash = target.hash;
+	entry.options.sourceUrl = target.sourceUrl;
+	entry.options.initialFragment = target.hash;
+	entry.options.currentPageId = target.pageId;
+	_historyIndex = targetIndex;
+	updateHistoryButtons();
+	if (!showHistoryEntry(targetIndex)) {
+		event.url = ComposePageHistoryUrl(target);
+		_events.fire(std::move(event));
+	}
+}
+
+bool Controller::showHistoryEntry(int index) {
+	if (index < 0 || index >= int(_history.size())) {
+		return false;
+	}
+	const auto &entry = _history[index];
+	if (!entry.hydrated()) {
+		return false;
+	}
+	auto options = entry.options;
+	options.sourceUrl = entry.sourceUrl;
+	options.initialFragment = entry.hash;
+	options.currentPageId = entry.pageId;
+	setContent(*entry.preparedContent, entry.title, std::move(options), false);
+	if (_preview) {
+		ScrollMarkdownPreviewToY(_preview.get(), entry.scrollTop);
+	}
+	return true;
+}
+
+void Controller::stepHistory(int delta) {
+	const auto index = _historyIndex + delta;
+	if (index < 0 || index >= int(_history.size())) {
+		return;
+	}
+	saveCurrentHistoryScroll();
+	_historyIndex = index;
+	updateHistoryButtons();
+	if (!showHistoryEntry(index)) {
+		const auto &entry = _history[index];
+		_events.fire({
+			.type = Event::Type::OpenPage,
+			.webpageId = entry.pageId,
+			.url = ComposePageHistoryUrl(PageHistoryTarget{
+				.pageId = entry.pageId,
+				.sourceUrl = entry.sourceUrl,
+				.hash = entry.hash,
+			}),
+		});
+	}
+}
+
+void Controller::updateHistoryButtons() {
+	if (!_back || !_forward) {
+		return;
+	}
+	const auto canGoBack = (_historyIndex > 0);
+	const auto canGoForward = (_historyIndex >= 0)
+		&& ((_historyIndex + 1) < int(_history.size()));
+	const auto updateButton = [](
+			Ui::FadeWrapScaled<Ui::IconButton> *button,
+			bool enabled,
+			const style::icon &disabledIcon) {
+		Expects(button != nullptr);
+		button->entity()->setDisabled(!enabled);
+		button->entity()->setIconOverride(
+			enabled ? nullptr : &disabledIcon,
+			enabled ? nullptr : &disabledIcon);
+		button->entity()->setPointerCursor(enabled);
+		button->setAttribute(Qt::WA_TransparentForMouseEvents, !enabled);
+		if (!enabled) {
+			button->entity()->clearState();
+		}
+	};
+	_back->toggle(canGoBack || canGoForward, anim::type::normal);
+	_forward->toggle(canGoForward, anim::type::normal);
+	updateButton(_back, canGoBack, st::ivBackIconDisabled);
+	updateButton(_forward, canGoForward, st::ivForwardIconDisabled);
+	if (_window) {
+		updateTitleGeometry(_window->body()->width());
+	}
+}
+
+void Controller::refreshTitle() {
+	if (_window) {
+		_window->setTitle(_title);
+		_window->setWindowTitle(_title);
+	}
+	if (_subtitle) {
+		_subtitle->setText(subtitleText());
+		updateTitleGeometry(_window->body()->width());
+	}
+}
+
+void Controller::updateTitleGeometry(int newWidth) const {
+	_subtitleWrap->setGeometry(0, 0, newWidth, st::ivSubtitleHeight);
+	const auto progressBack = _back
+		? _subtitleBackShift.value(_back->toggled() ? 1. : 0.)
+		: 0.;
+	const auto progressForward = _forward
+		? _subtitleForwardShift.value(_forward->toggled() ? 1. : 0.)
+		: 0.;
+	const auto backAdded = (_back
+		? (_back->width() + st::ivSubtitleSkip - st::ivSubtitleLeft)
+		: 0);
+	const auto forwardAdded = _forward ? _forward->width() : 0;
+	const auto left = int(st::ivSubtitleLeft
+		+ anim::interpolate(0, backAdded, progressBack)
+		+ anim::interpolate(0, forwardAdded, progressForward));
+	_subtitle->resizeToWidth(newWidth - left - _menuToggle->width());
+	_subtitle->moveToLeft(left, st::ivSubtitleTop);
+	if (_back) {
+		_back->moveToLeft(0, 0);
+	}
+	if (_forward) {
+		_forward->moveToLeft(
+			_back ? int(_back->width() * progressBack) : 0,
+			0);
+	}
+	_menuToggle->moveToRight(0, 0);
+	_titleShadow->resizeToWidth(newWidth);
+	_titleShadow->move(0, st::ivSubtitleHeight);
+}
+
+void Controller::openSource() {
+	if (_options.openSource) {
+		_options.openSource();
+	} else if (viewerKind() == ViewerKind::InstantView) {
+		File::OpenUrl(_options.sourceUrl);
+	} else {
+		File::Launch(_options.sourcePath);
+	}
+}
+
+void Controller::showMenu() {
+	if (!_window || _menu) {
+		return;
+	}
+	_menu = base::make_unique_q<Ui::PopupMenu>(
+		_window.get(),
+		st::popupMenuWithIcons);
+	_menu->setDestroyedCallback(crl::guard(_window.get(), [
+			this,
+			menu = _menu.get()] {
+		if (_menu == menu) {
+			_menuToggle->setForceRippled(false);
+		}
+	}));
+	_menuToggle->setForceRippled(true);
+
+	const auto hasOpenSource = canOpenSource();
+	if (hasOpenSource) {
+		_menu->addAction(
+			OpenSourceLabel(viewerKind()),
+			crl::guard(_window.get(), [=] {
+				openSource();
+			}),
+			OpenSourceIcon(viewerKind()));
+	}
+
+	if (canShare()) {
+		_menu->addAction(
+			tr::lng_iv_share(tr::now),
+			crl::guard(_window.get(), [=, share = _options.share] {
+				share(_show);
+			}),
+			&st::menuIconShare);
+	}
+
+	if (hasOpenSource || canShare()) {
+		_menu->addSeparator();
+	}
+	_menu->addAction(CreateZoomMenuAction(_menu, _delegate));
+
+	_menu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
+	_menu->popup(_window->body()->mapToGlobal(
+		QPoint(_window->body()->width(), 0) + st::ivMenuPosition));
+}
+
+void Controller::createLayerManager() {
+	if (!_window || _layerManager) {
+		return;
+	}
+	_layerManager = std::make_unique<Ui::LayerManager>(
+		not_null{ _window->body().get() });
+	_layerManager->setHideByBackgroundClick(false);
+	_show = _layerManager->uiShow();
+}
+
+void Controller::createPreview() {
+	if (!_container) {
+		return;
+	}
+	const auto parent = _container;
+	auto options = _options;
+	options.clickHandlerContextRef = _clickHandlerContextRef;
+	options.clickHandlerContext = ExtendClickHandlerContext(
+		std::move(options.clickHandlerContext),
+		_show);
+	if (options.clickHandlerContextRef) {
+		*options.clickHandlerContextRef = options.clickHandlerContext;
+	}
+	const auto callback = [=](Event event) {
+		switch (event.type) {
+		case Event::Type::OpenPage:
+			handleOpenPage(std::move(event));
+			break;
+		case Event::Type::Close:
+		case Event::Type::Quit:
+		case Event::Type::OpenFile:
+		case Event::Type::Report:
+			_events.fire(std::move(event));
+			break;
+		}
+	};
+	_preview = nullptr;
+	const auto preparedForHistory = (_preparedContent && historyEnabled(options))
+		? std::make_shared<MarkdownArticleContent>(*_preparedContent)
+		: nullptr;
+	_preview = _preparedContent
+		? CreateMarkdownPreviewWidget(
+			parent,
+			std::move(*_preparedContent),
+			_renderer,
+			callback,
+			options)
+		: CreateMarkdownPreviewWidget(
+			parent,
+			*_document,
+			callback,
+			options);
+	_preparedContent.reset();
+	if (preparedForHistory) {
+		updateCurrentHistoryEntry(*preparedForHistory, _title, options);
+		_shownHistoryIndex = _historyIndex;
+	} else {
+		_shownHistoryIndex = -1;
+	}
+	_preview->setGeometry(parent->rect());
+	parent->sizeValue() | rpl::on_next([=](QSize size) {
+		_preview->resize(size);
+	}, _preview->lifetime());
+
+	_titleShadow->show(anim::type::instant);
+
+	_preview->show();
+	updateHistoryButtons();
+}
+
+void Controller::createWindow() {
+	_window = std::make_unique<Ui::RpWindow>();
+	const auto window = _window.get();
+	_titleShadow.create(window->body().get());
+	_subtitleWrap = std::make_unique<Ui::RpWidget>(window->body().get());
+	_subtitle = std::make_unique<Ui::FlatLabel>(
+		_subtitleWrap.get(),
+		subtitleText(),
+		st::ivSubtitle);
+	_subtitle->setSelectable(true);
+	_menuToggle.create(_subtitleWrap.get(), st::ivMenuToggle);
+	_menuToggle->setClickedCallback([=] {
+		showMenu();
+	});
+	_back.create(
+		_subtitleWrap.get(),
+		object_ptr<Ui::IconButton>(_subtitleWrap.get(), st::ivBack));
+	_back->entity()->setClickedCallback([=] {
+		stepHistory(-1);
+	});
+	_forward.create(
+		_subtitleWrap.get(),
+		object_ptr<Ui::IconButton>(_subtitleWrap.get(), st::ivForward));
+	_forward->entity()->setClickedCallback([=] {
+		stepHistory(1);
+	});
+	_back->toggledValue(
+	) | rpl::on_next([=](bool toggled) {
+		_subtitleBackShift.start(
+			[=] { updateTitleGeometry(_window->body()->width()); },
+			toggled ? 0. : 1.,
+			toggled ? 1. : 0.,
+			st::fadeWrapDuration);
+	}, _back->lifetime());
+	_back->hide(anim::type::instant);
+	_forward->toggledValue(
+	) | rpl::on_next([=](bool toggled) {
+		_subtitleForwardShift.start(
+			[=] { updateTitleGeometry(_window->body()->width()); },
+			toggled ? 0. : 1.,
+			toggled ? 1. : 0.,
+			st::fadeWrapDuration);
+	}, _forward->lifetime());
+	_forward->hide(anim::type::instant);
+	_subtitleBackShift.stop();
+	_subtitleForwardShift.stop();
+	_subtitleWrap->paintRequest() | rpl::on_next([=](QRect clip) {
+		QPainter(_subtitleWrap.get()).fillRect(clip, st::windowBg);
+	}, _subtitleWrap->lifetime());
+	window->body()->widthValue() | rpl::on_next([=](int width) {
+		updateTitleGeometry(width);
+	}, _subtitle->lifetime());
+	window->setTitle(_title);
+	window->setWindowTitle(_title);
+	window->setGeometry(_delegate->ivGeometry(window));
+	window->setMinimumSize({ st::ivWidthMin, st::ivHeightMin });
+	window->geometryValue(
+	) | rpl::distinct_until_changed(
+	) | rpl::skip(1) | rpl::on_next([=] {
+		_delegate->ivSaveGeometry(window);
+	}, window->lifetime());
+	window->body()->paintRequest() | rpl::on_next([=](QRect clip) {
+		QPainter(window->body().get()).fillRect(clip, st::windowBg);
+	}, window->body()->lifetime());
+	_container = Ui::CreateChild<Ui::RpWidget>(window->body().get());
+	rpl::combine(
+		window->body()->sizeValue(),
+		_subtitleWrap->heightValue()
+	) | rpl::on_next([=](QSize size, int titleHeight) {
+		_container->setGeometry(QRect(QPoint(), size).marginsRemoved(
+			{ 0, titleHeight, 0, 0 }));
+	}, _container->lifetime());
+	_container->paintRequest() | rpl::on_next([=](QRect clip) {
+		QPainter(_container).fillRect(clip, st::windowBg);
+	}, _container->lifetime());
+	updateTitleGeometry(window->body()->width());
+
+	createLayerManager();
+	createPreview();
+	_container->show();
+	updateHistoryButtons();
+
+	window->events() | rpl::on_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::Close) {
+			close();
+		} else if (e->type() == QEvent::KeyPress) {
+			const auto event = static_cast<QKeyEvent*>(e.get());
+			if (event->key() == Qt::Key_Escape) {
+				event->accept();
+				close();
+			}
+		}
+	}, window->lifetime());
+	base::install_event_filter(window, qApp, [=](not_null<QEvent*> e) {
+		if (e->type() != QEvent::ShortcutOverride || !window->isActiveWindow()) {
+			return base::EventFilterResult::Continue;
+		}
+		const auto event = static_cast<QKeyEvent*>(e.get());
+		const auto previousAccepted = event->isAccepted();
+		ProcessZoomShortcut(_delegate, event);
+		return event->isAccepted() && !previousAccepted
+			? base::EventFilterResult::Cancel
+			: base::EventFilterResult::Continue;
+	});
+
+	_titleShadow->raise();
+	window->show();
+}
+
+std::unique_ptr<Controller> TryOpenLocalFile(
+		not_null<Delegate*> delegate,
+		const QString &path,
+		OpenOptions options) {
+	const auto &limits = ParseLimitsForIv();
+	const auto target = ParseOpenTarget(path);
+
+	const auto source = ReadLocalSource(target.path, limits);
+	if (!source) {
+		return nullptr;
+	}
+	const auto &bytes = source.bytes;
+	const auto &fallbackTitle = source.name;
+
+	const auto start = crl::now();
+	auto validateResult = ValidateMarkdownSourceForIv(
+		bytes,
+		ParseOptions{ fallbackTitle });
+	const auto validated = crl::now();
+	if (!validateResult.ok) {
+		DEBUG_LOG(("Native Markdown IV: "
+			"source validation failure (%1, %2 ms): %3"
+			).arg(validateResult.error
+			).arg(validated - start
+			).arg(target.path));
+		return nullptr;
+	}
+
+	auto parseResult = ParseMarkdownForIv(std::move(validateResult.source));
+	const auto parsed = crl::now();
+	if (!parseResult.ok) {
+		const auto &error = parseResult.error;
+		if (error.startsWith(u"cmark-"_q)) {
+			DEBUG_LOG(("Native Markdown IV: "
+				"cmark parse failure (%1, %2 ms): %3"
+				).arg(error
+				).arg(parsed - validated
+				).arg(target.path));
+		} else {
+			DEBUG_LOG(("Native Markdown IV: parse failure (%1, %2 ms): %3"
+				).arg(error
+				).arg(parsed - validated
+				).arg(target.path));
+		}
+		return nullptr;
+	} else if (!AcceptsPreview(parseResult.document)) {
+		DEBUG_LOG(("Native Markdown IV: "
+			"unsupported or empty document (%1 ms): %2"
+			).arg(crl::now() - parsed
+			).arg(target.path));
+		return nullptr;
+	}
+	LogDocumentWarnings(parseResult.document, target.path);
+
+	DEBUG_LOG(("Native Markdown IV: "
+		"opening as native Markdown IV (%1 ms validate, %2 ms parse): %3"
+		).arg(validated - start
+		).arg(parsed - validated
+		).arg(target.path));
+
+	if (options.sourceName.isEmpty()) {
+		options.sourceName = source.name;
+	}
+	options.sourcePath = std::move(source.path);
+	options.initialFragment = std::move(target.fragment);
+	if (options.viewerKind == ViewerKind::Auto) {
+		options.viewerKind = ViewerKind::LocalFile;
+	}
+	return std::make_unique<Controller>(
+		delegate,
+		std::move(parseResult.document),
+		(parseResult.document.title.trimmed().isEmpty()
+			? fallbackTitle
+			: parseResult.document.title.trimmed()),
+		std::move(options));
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_controller.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_controller.h
new file mode 100644
index 00000000000000..9dc759837f7e68
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_controller.h
@@ -0,0 +1,172 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+#include "base/unique_qptr.h"
+#include "iv/markdown/iv_markdown_document.h"
+#include "iv/markdown/iv_markdown_prepare.h"
+#include "ui/effects/animations.h"
+#include "ui/widgets/rp_window.h"
+
+#include <optional>
+#include <QtCore/QString>
+#include <QtCore/QVariant>
+
+namespace Ui {
+class FlatLabel;
+class IconButton;
+class LayerManager;
+class PopupMenu;
+class Show;
+class FadeShadow;
+template <typename Widget>
+class FadeWrapScaled;
+} // namespace Ui
+
+namespace Iv::Markdown {
+
+class Controller final {
+public:
+	Controller(
+		not_null<Delegate*> delegate,
+		PreparedDocument document,
+		QString title,
+		OpenOptions options = {});
+	Controller(
+		not_null<Delegate*> delegate,
+		MarkdownArticleContent content,
+		QString title,
+		std::shared_ptr<MathRenderer> renderer = nullptr,
+		OpenOptions options = {});
+	~Controller();
+
+	void activate();
+	void show(
+		MarkdownArticleContent content,
+		QString title,
+		OpenOptions options = {});
+	void update(
+		MarkdownArticleContent content,
+		QString title,
+		OpenOptions options = {});
+	void updateOptions(OpenOptions options = {});
+
+	[[nodiscard]] bool active() const;
+	void showJoinedTooltip();
+	void minimize();
+
+	[[nodiscard]] rpl::producer<Event> events() const {
+		return _events.events();
+	}
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
+private:
+	struct HistoryEntry;
+
+	void close();
+	void createWindow();
+	void createLayerManager();
+	void createPreview();
+	[[nodiscard]] bool updateExistingPreview(
+		MarkdownArticleContent content,
+		OpenOptions options,
+		int scrollTop);
+	void setContent(
+		MarkdownArticleContent content,
+		QString title,
+		OpenOptions options,
+		bool preserveScroll);
+	void updateTitleGeometry(int newWidth) const;
+	void showMenu();
+	void openSource();
+	[[nodiscard]] ViewerKind viewerKind() const;
+	[[nodiscard]] QString subtitleText() const;
+	[[nodiscard]] bool canOpenSource() const;
+	[[nodiscard]] bool canShare() const;
+	[[nodiscard]] bool historyEnabled(const OpenOptions &options) const;
+	[[nodiscard]] bool sameHistoryPage(
+		const HistoryEntry &entry,
+		uint64 pageId,
+		const QString &sourceUrl) const;
+	[[nodiscard]] bool sameCurrentPage(
+		uint64 pageId,
+		const QString &sourceUrl) const;
+	[[nodiscard]] bool sameHistoryLocation(
+		const HistoryEntry &entry,
+		uint64 pageId,
+		const QString &sourceUrl,
+		const QString &hash) const;
+	[[nodiscard]] int findHistoryEntry(
+		uint64 pageId,
+		const QString &sourceUrl,
+		const QString &hash) const;
+	void saveCurrentHistoryScroll(std::optional<int> scrollTop = std::nullopt);
+	void updateCurrentHistoryEntry(
+		const MarkdownArticleContent &content,
+		const QString &title,
+		const OpenOptions &options);
+	void handleOpenPage(Event event);
+	[[nodiscard]] bool showHistoryEntry(int index);
+	void stepHistory(int delta);
+	void updateHistoryButtons();
+	void refreshTitle();
+
+	struct HistoryEntry {
+		uint64 pageId = 0;
+		QString sourceUrl;
+		QString hash;
+		QString title;
+		std::shared_ptr<MarkdownArticleContent> preparedContent;
+		OpenOptions options;
+		int scrollTop = 0;
+
+		[[nodiscard]] bool hydrated() const {
+			return preparedContent != nullptr;
+		}
+	};
+
+	const not_null<Delegate*> _delegate;
+
+	const std::shared_ptr<const PreparedDocument> _document;
+	std::optional<MarkdownArticleContent> _preparedContent;
+	QString _title;
+	const std::shared_ptr<MathRenderer> _renderer;
+	OpenOptions _options;
+	std::shared_ptr<QVariant> _clickHandlerContextRef;
+	std::unique_ptr<Ui::RpWindow> _window;
+	std::unique_ptr<Ui::RpWidget> _subtitleWrap;
+	std::unique_ptr<Ui::FlatLabel> _subtitle;
+	Ui::Animations::Simple _subtitleBackShift;
+	Ui::Animations::Simple _subtitleForwardShift;
+	object_ptr<Ui::IconButton> _menuToggle = { nullptr };
+	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _back = { nullptr };
+	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _forward = { nullptr };
+	object_ptr<Ui::FadeShadow> _titleShadow = { nullptr };
+	base::unique_qptr<Ui::PopupMenu> _menu;
+	Ui::RpWidget *_container = nullptr;
+	std::unique_ptr<Ui::LayerManager> _layerManager;
+	std::shared_ptr<Ui::Show> _show;
+	std::unique_ptr<Ui::RpWidget> _preview;
+	std::vector<HistoryEntry> _history;
+	int _historyIndex = -1;
+	int _shownHistoryIndex = -1;
+
+	rpl::event_stream<Event> _events;
+
+	rpl::lifetime _lifetime;
+
+};
+
+[[nodiscard]] std::unique_ptr<Controller> TryOpenLocalFile(
+	not_null<Delegate*> delegate,
+	const QString &path,
+	OpenOptions options = {});
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_document.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_document.cpp
new file mode 100644
index 00000000000000..aca8baabb41eb4
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_document.cpp
@@ -0,0 +1,309 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_document.h"
+
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+[[nodiscard]] QString BoolString(bool value) {
+	return value ? u"true"_q : u"false"_q;
+}
+
+[[nodiscard]] QString NodeKindName(NodeKind kind) {
+	switch (kind) {
+	case NodeKind::Document: return u"Document"_q;
+	case NodeKind::Paragraph: return u"Paragraph"_q;
+	case NodeKind::Heading: return u"Heading"_q;
+	case NodeKind::Text: return u"Text"_q;
+	case NodeKind::Emphasis: return u"Emphasis"_q;
+	case NodeKind::Strong: return u"Strong"_q;
+	case NodeKind::Strike: return u"Strike"_q;
+	case NodeKind::InlineCode: return u"InlineCode"_q;
+	case NodeKind::CodeBlock: return u"CodeBlock"_q;
+	case NodeKind::Link: return u"Link"_q;
+	case NodeKind::List: return u"List"_q;
+	case NodeKind::ListItem: return u"ListItem"_q;
+	case NodeKind::Blockquote: return u"Blockquote"_q;
+	case NodeKind::ThematicBreak: return u"ThematicBreak"_q;
+	case NodeKind::Table: return u"Table"_q;
+	case NodeKind::TableRow: return u"TableRow"_q;
+	case NodeKind::TableCell: return u"TableCell"_q;
+	case NodeKind::HtmlInline: return u"HtmlInline"_q;
+	case NodeKind::HtmlBlock: return u"HtmlBlock"_q;
+	case NodeKind::FootnoteReference: return u"FootnoteReference"_q;
+	case NodeKind::FootnoteDefinition: return u"FootnoteDefinition"_q;
+	case NodeKind::DisplayMath: return u"DisplayMath"_q;
+	case NodeKind::InlineMath: return u"InlineMath"_q;
+	case NodeKind::SoftBreak: return u"SoftBreak"_q;
+	case NodeKind::LineBreak: return u"LineBreak"_q;
+	case NodeKind::Unsupported: return u"Unsupported"_q;
+	}
+	return u"Unsupported"_q;
+}
+
+[[nodiscard]] QString MathKindName(MathKind kind) {
+	switch (kind) {
+	case MathKind::Inline: return u"Inline"_q;
+	case MathKind::Display: return u"Display"_q;
+	}
+	return u"Inline"_q;
+}
+
+[[nodiscard]] QString ListKindName(ListKind kind) {
+	switch (kind) {
+	case ListKind::Bullet: return u"Bullet"_q;
+	case ListKind::Ordered: return u"Ordered"_q;
+	}
+	return u"Bullet"_q;
+}
+
+[[nodiscard]] QString ListDelimiterName(ListDelimiter delimiter) {
+	switch (delimiter) {
+	case ListDelimiter::None: return u"None"_q;
+	case ListDelimiter::Period: return u"Period"_q;
+	case ListDelimiter::Parenthesis: return u"Parenthesis"_q;
+	}
+	return u"None"_q;
+}
+
+[[nodiscard]] QString HtmlBlockKindName(HtmlBlockKind kind) {
+	switch (kind) {
+	case HtmlBlockKind::None: return u"None"_q;
+	case HtmlBlockKind::Comment: return u"Comment"_q;
+	case HtmlBlockKind::Details: return u"Details"_q;
+	case HtmlBlockKind::Unsupported: return u"Unsupported"_q;
+	}
+	return u"None"_q;
+}
+
+[[nodiscard]] QString TaskStateName(TaskState state) {
+	switch (state) {
+	case TaskState::None: return u"None"_q;
+	case TaskState::Unchecked: return u"Unchecked"_q;
+	case TaskState::Checked: return u"Checked"_q;
+	}
+	return u"None"_q;
+}
+
+[[nodiscard]] QString TableAlignmentName(TableAlignment alignment) {
+	switch (alignment) {
+	case TableAlignment::None: return u"None"_q;
+	case TableAlignment::Left: return u"Left"_q;
+	case TableAlignment::Center: return u"Center"_q;
+	case TableAlignment::Right: return u"Right"_q;
+	}
+	return u"None"_q;
+}
+
+[[nodiscard]] QString RangeString(const SourceRange &range) {
+	if (!range.available) {
+		return u"unavailable"_q;
+	}
+	return u"%1:%2-%3:%4[%5,%6]"_q.arg(
+		range.startLine
+	).arg(
+		range.startColumn
+	).arg(
+		range.endLine
+	).arg(
+		range.endColumn
+	).arg(
+		range.startOffset
+	).arg(
+		range.endOffset);
+}
+
+[[nodiscard]] QString EscapedValue(QString value) {
+	value.replace(u"\\"_q, u"\\\\"_q);
+	value.replace(u"\r"_q, u"\\r"_q);
+	value.replace(u"\n"_q, u"\\n"_q);
+	value.replace(u"\t"_q, u"\\t"_q);
+	return value;
+}
+
+void AddRequiredStringAttribute(
+		QString *line,
+		const QString &name,
+		const QString &value) {
+	line->append(u" "_q);
+	line->append(name);
+	line->append(u"=\""_q);
+	line->append(EscapedValue(value));
+	line->append(u"\""_q);
+}
+
+void AddStringAttribute(
+		QString *line,
+		const QString &name,
+		const QString &value) {
+	if (value.isEmpty()) {
+		return;
+	}
+	AddRequiredStringAttribute(line, name, value);
+}
+
+void AddIntAttribute(QString *line, const QString &name, int value) {
+	line->append(u" "_q);
+	line->append(name);
+	line->append(u"="_q);
+	line->append(QString::number(value));
+}
+
+void AddBoolAttribute(QString *line, const QString &name, bool value) {
+	if (!value) {
+		return;
+	}
+	line->append(u" "_q);
+	line->append(name);
+	line->append(u"="_q);
+	line->append(BoolString(value));
+}
+
+[[nodiscard]] QString TableAlignmentsString(
+		const std::vector<TableAlignment> &alignments) {
+	auto names = QStringList();
+	for (const auto alignment : alignments) {
+		names.append(TableAlignmentName(alignment));
+	}
+	return names.join(u","_q);
+}
+
+void DumpNode(
+		const MarkdownNode &node,
+		int depth,
+		QStringList *lines) {
+	auto line = u"node"_q;
+	AddIntAttribute(&line, u"depth"_q, depth);
+	AddStringAttribute(&line, u"kind"_q, NodeKindName(node.kind));
+	AddStringAttribute(&line, u"range"_q, RangeString(node.range));
+	AddIntAttribute(
+		&line,
+		u"children"_q,
+		static_cast<int>(node.children.size()));
+	AddStringAttribute(&line, u"text"_q, node.text);
+	AddStringAttribute(&line, u"url"_q, node.url);
+	AddStringAttribute(&line, u"title"_q, node.title);
+	AddStringAttribute(&line, u"info"_q, node.info);
+	AddStringAttribute(&line, u"raw"_q, node.raw);
+	AddStringAttribute(&line, u"anchorId"_q, node.anchorId);
+	AddStringAttribute(&line, u"footnoteLabel"_q, node.footnoteLabel);
+	AddStringAttribute(&line, u"detailsSummary"_q, node.detailsSummary);
+	AddStringAttribute(&line, u"detailsBody"_q, node.detailsBody);
+	AddStringAttribute(&line, u"unsupportedKind"_q, node.unsupportedKind);
+	if (node.headingLevel != 0) {
+		AddIntAttribute(&line, u"headingLevel"_q, node.headingLevel);
+	}
+	if (node.listStart != 0) {
+		AddIntAttribute(&line, u"listStart"_q, node.listStart);
+	}
+	if (node.tableColumn != -1) {
+		AddIntAttribute(&line, u"tableColumn"_q, node.tableColumn);
+	}
+	if (node.formulaIndex != -1) {
+		AddIntAttribute(&line, u"formulaIndex"_q, node.formulaIndex);
+	}
+	if (node.footnoteOrdinal != 0) {
+		AddIntAttribute(&line, u"footnoteOrdinal"_q, node.footnoteOrdinal);
+	}
+	if (node.kind == NodeKind::List) {
+		AddStringAttribute(&line, u"listKind"_q, ListKindName(node.listKind));
+		AddStringAttribute(
+			&line,
+			u"listDelimiter"_q,
+			ListDelimiterName(node.listDelimiter));
+	}
+	if (node.htmlBlockKind != HtmlBlockKind::None) {
+		AddStringAttribute(
+			&line,
+			u"htmlBlockKind"_q,
+			HtmlBlockKindName(node.htmlBlockKind));
+	}
+	if (node.taskState != TaskState::None) {
+		AddStringAttribute(&line, u"taskState"_q, TaskStateName(node.taskState));
+	}
+	AddBoolAttribute(&line, u"tight"_q, node.tight);
+	AddBoolAttribute(&line, u"autolink"_q, node.autolink);
+	AddBoolAttribute(&line, u"tableHeader"_q, node.tableHeader);
+	AddBoolAttribute(&line, u"detailsOpen"_q, node.detailsOpen);
+	if (!node.tableAlignments.empty()) {
+		AddStringAttribute(
+			&line,
+			u"tableAlignments"_q,
+			TableAlignmentsString(node.tableAlignments));
+	}
+	lines->append(line);
+	for (const auto &child : node.children) {
+		DumpNode(child, depth + 1, lines);
+	}
+}
+
+} // namespace
+
+PreparedDocument EmptyDocument(QString sourceName) {
+	auto document = PreparedDocument();
+	document.sourceName = std::move(sourceName);
+	document.document.kind = NodeKind::Document;
+	return document;
+}
+
+QString DumpForDebug(const PreparedDocument &document) {
+	auto lines = QStringList();
+	lines.append(u"sourceName=\"%1\""_q.arg(
+		EscapedValue(document.sourceName)));
+	lines.append(u"title=\"%1\""_q.arg(
+		EscapedValue(document.title)));
+	lines.append(u"sourceLength=%1"_q.arg(
+		static_cast<qlonglong>(document.sourceText.size())));
+	lines.append(u"empty=%1"_q.arg(BoolString(document.empty)));
+	lines.append(u"cmarkNodeCount=%1"_q.arg(
+		document.stats.cmarkNodeCount));
+	lines.append(u"convertedNodeCount=%1"_q.arg(
+		document.stats.convertedNodeCount));
+	lines.append(u"maxDepth=%1"_q.arg(
+		document.stats.maxDepth));
+	lines.append(u"inlineFormulaCount=%1"_q.arg(
+		document.stats.inlineFormulaCount));
+	lines.append(u"displayFormulaCount=%1"_q.arg(
+		document.stats.displayFormulaCount));
+	lines.append(u"tablesSeen=%1"_q.arg(
+		BoolString(document.stats.tablesSeen)));
+	lines.append(u"taskListsSeen=%1"_q.arg(
+		BoolString(document.stats.taskListsSeen)));
+	lines.append(u"strikethroughSeen=%1"_q.arg(
+		BoolString(document.stats.strikethroughSeen)));
+	lines.append(u"autolinksSeen=%1"_q.arg(
+		BoolString(document.stats.autolinksSeen)));
+	lines.append(u"footnotesSeen=%1"_q.arg(
+		BoolString(document.stats.footnotesSeen)));
+	lines.append(u"warnings=%1"_q.arg(
+		static_cast<qlonglong>(document.warnings.size())));
+	for (auto i = qsizetype(0); i != document.warnings.size(); ++i) {
+		lines.append(u"warning index=%1 text=\"%2\""_q.arg(
+			i + 1
+		).arg(
+			EscapedValue(document.warnings[i])));
+	}
+	lines.append(u"nodes=preorder"_q);
+	DumpNode(document.document, 0, &lines);
+	lines.append(u"formulas=%1"_q.arg(
+		static_cast<qlonglong>(document.formulas.size())));
+	for (const auto &formula : document.formulas) {
+		auto line = u"formula"_q;
+		AddIntAttribute(&line, u"index"_q, formula.index);
+		AddStringAttribute(&line, u"kind"_q, MathKindName(formula.kind));
+		AddStringAttribute(&line, u"range"_q, RangeString(formula.range));
+		AddRequiredStringAttribute(&line, u"parent"_q, formula.parentNodeKind);
+		AddRequiredStringAttribute(&line, u"tex"_q, formula.tex);
+		lines.append(line);
+	}
+	return lines.join(u"\n"_q);
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_document.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_document.h
new file mode 100644
index 00000000000000..5bc00f8ded733d
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_document.h
@@ -0,0 +1,280 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_common.h"
+
+#include <QtCore/QMargins>
+#include <QtCore/QSize>
+#include <QtCore/QStringList>
+
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace Iv::Markdown {
+
+enum class NodeKind {
+	Document,
+	Paragraph,
+	Heading,
+	Text,
+	Emphasis,
+	Strong,
+	Strike,
+	InlineCode,
+	CodeBlock,
+	Link,
+	List,
+	ListItem,
+	Blockquote,
+	ThematicBreak,
+	Table,
+	TableRow,
+	TableCell,
+	HtmlInline,
+	HtmlBlock,
+	FootnoteReference,
+	FootnoteDefinition,
+	DisplayMath,
+	InlineMath,
+	SoftBreak,
+	LineBreak,
+	Unsupported,
+};
+
+enum class MathKind {
+	Inline,
+	Display,
+};
+
+enum class ListKind {
+	Bullet,
+	Ordered,
+};
+
+enum class ListDelimiter {
+	None,
+	Period,
+	Parenthesis,
+};
+
+enum class TaskState {
+	None,
+	Unchecked,
+	Checked,
+};
+
+enum class TableAlignment {
+	None,
+	Left,
+	Center,
+	Right,
+};
+
+enum class HtmlBlockKind {
+	None,
+	Comment,
+	Details,
+	Unsupported,
+};
+
+struct SourceRange {
+	bool available = false;
+	int startLine = 0;
+	int startColumn = 0;
+	int endLine = 0;
+	int endColumn = 0;
+	int startOffset = 0;
+	int endOffset = 0;
+};
+
+struct MarkdownNode {
+	NodeKind kind = NodeKind::Unsupported;
+	SourceRange range;
+	QString text;
+	QString url;
+	QString title;
+	QString info;
+	QString raw;
+	QString anchorId;
+	QString footnoteLabel;
+	QString detailsSummary;
+	QString detailsBody;
+	QString unsupportedKind;
+	std::vector<MarkdownNode> children;
+	std::vector<TableAlignment> tableAlignments;
+	int headingLevel = 0;
+	int listStart = 0;
+	int tableColumn = -1;
+	int formulaIndex = -1;
+	int footnoteOrdinal = 0;
+	ListKind listKind = ListKind::Bullet;
+	ListDelimiter listDelimiter = ListDelimiter::None;
+	TaskState taskState = TaskState::None;
+	HtmlBlockKind htmlBlockKind = HtmlBlockKind::None;
+	bool tight = false;
+	bool autolink = false;
+	bool tableHeader = false;
+	bool detailsOpen = false;
+};
+
+struct MathFormula {
+	int index = 0;
+	MathKind kind = MathKind::Inline;
+	QString tex;
+	SourceRange range;
+	QString parentNodeKind;
+};
+
+struct ParseStats {
+	int cmarkNodeCount = 0;
+	int convertedNodeCount = 0;
+	int maxDepth = 0;
+	int inlineFormulaCount = 0;
+	int displayFormulaCount = 0;
+	bool tablesSeen = false;
+	bool taskListsSeen = false;
+	bool strikethroughSeen = false;
+	bool autolinksSeen = false;
+	bool footnotesSeen = false;
+};
+
+inline constexpr auto kFormulaExactMetricScale = 64;
+
+struct FormulaExactMetrics {
+	QSize scaledSize;
+	int scaledAscent = 0;
+	QMargins scaledInsets;
+};
+
+struct MeasuredFormula {
+	QSize logicalSize;
+	int logicalDepth = 0;
+	FormulaExactMetrics exact;
+	QString fallbackText;
+	QString error;
+	bool success = false;
+	bool overflow = false;
+	bool tooLarge = false;
+};
+
+struct PreparedFormulaMeasurementSignature {
+	QString trimmedTex;
+	MathKind kind = MathKind::Display;
+	int textSize = 0;
+	int renderWidthCap = 0;
+	int renderHeightCap = 0;
+};
+
+inline bool operator==(
+		const PreparedFormulaMeasurementSignature &a,
+		const PreparedFormulaMeasurementSignature &b) {
+	return a.trimmedTex == b.trimmedTex
+		&& a.kind == b.kind
+		&& a.textSize == b.textSize
+		&& a.renderWidthCap == b.renderWidthCap
+		&& a.renderHeightCap == b.renderHeightCap;
+}
+
+struct PreparedFormulaMeasurementCacheEntry {
+	PreparedFormulaMeasurementSignature signature;
+	std::shared_ptr<const MeasuredFormula> data;
+};
+
+struct PreparedFormulaMeasurementSignatureLess {
+	[[nodiscard]] bool operator()(
+		const PreparedFormulaMeasurementSignature &a,
+		const PreparedFormulaMeasurementSignature &b) const;
+};
+
+inline bool PreparedFormulaMeasurementSignatureLess::operator()(
+		const PreparedFormulaMeasurementSignature &a,
+		const PreparedFormulaMeasurementSignature &b) const {
+	if (a.trimmedTex != b.trimmedTex) {
+		return a.trimmedTex < b.trimmedTex;
+	} else if (a.kind != b.kind) {
+		return (int(a.kind) < int(b.kind));
+	} else if (a.textSize != b.textSize) {
+		return a.textSize < b.textSize;
+	} else if (a.renderWidthCap != b.renderWidthCap) {
+		return a.renderWidthCap < b.renderWidthCap;
+	}
+	return a.renderHeightCap < b.renderHeightCap;
+}
+
+struct PreparedFormulaMeasurementCacheState {
+	std::vector<PreparedFormulaMeasurementCacheEntry> slots;
+	std::map<
+		PreparedFormulaMeasurementSignature,
+		std::shared_ptr<const MeasuredFormula>,
+		PreparedFormulaMeasurementSignatureLess> bySignature;
+};
+
+struct PreparedDocument {
+	QString sourceName;
+	QString title;
+	QString sourceText;
+	MarkdownNode document;
+	std::vector<MathFormula> formulas;
+	ParseStats stats;
+	QStringList warnings;
+	bool empty = true;
+	std::shared_ptr<PreparedFormulaMeasurementCacheState> formulaMeasurementCache
+		= std::make_shared<PreparedFormulaMeasurementCacheState>();
+
+	PreparedDocument() = default;
+
+	PreparedDocument(const PreparedDocument &other);
+
+	PreparedDocument &operator=(const PreparedDocument &other);
+
+	PreparedDocument(PreparedDocument &&) noexcept = default;
+	PreparedDocument &operator=(PreparedDocument &&) noexcept = default;
+};
+
+inline PreparedDocument::PreparedDocument(const PreparedDocument &other)
+	: sourceName(other.sourceName)
+	, title(other.title)
+	, sourceText(other.sourceText)
+	, document(other.document)
+	, formulas(other.formulas)
+	, stats(other.stats)
+	, warnings(other.warnings)
+	, empty(other.empty)
+	, formulaMeasurementCache(
+		std::make_shared<PreparedFormulaMeasurementCacheState>()) {
+}
+
+inline PreparedDocument &PreparedDocument::operator=(
+		const PreparedDocument &other) {
+	if (this != &other) {
+		sourceName = other.sourceName;
+		title = other.title;
+		sourceText = other.sourceText;
+		document = other.document;
+		formulas = other.formulas;
+		stats = other.stats;
+		warnings = other.warnings;
+		empty = other.empty;
+		formulaMeasurementCache = std::make_shared<
+			PreparedFormulaMeasurementCacheState>();
+	}
+	return *this;
+}
+
+struct ParseResult {
+	PreparedDocument document;
+	QString error;
+	bool ok = true;
+};
+
+[[nodiscard]] PreparedDocument EmptyDocument(QString sourceName = QString());
+[[nodiscard]] QString DumpForDebug(const PreparedDocument &document);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_embed_overlay.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_embed_overlay.cpp
new file mode 100644
index 00000000000000..efc110342aea82
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_embed_overlay.cpp
@@ -0,0 +1,1037 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_embed_overlay.h"
+
+#include "base/algorithm.h"
+#include "core/file_utilities.h"
+#include "ui/chat/attach/attach_bot_webview.h"
+#include "lang/lang_keys.h"
+#include "ui/cached_round_corners.h"
+#include "ui/style/style_core_direction.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/padding_wrap.h"
+#include "webview/webview_data_stream_memory.h"
+#include "webview/webview_embed.h"
+#include "webview/webview_interface.h"
+
+#include "styles/style_layers.h"
+#include "styles/style_iv.h"
+
+#include <QtCore/QEvent>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QWindow>
+#include <QtWidgets/QApplication>
+
+#include <algorithm>
+#include <cmath>
+#include <limits>
+
+namespace Iv::Markdown {
+namespace {
+
+constexpr auto kReadyRevealDelay = crl::time(1000);
+constexpr auto kHtmlRequestPrefix = "html/";
+
+[[nodiscard]] TextWithEntities GenericWebviewErrorText() {
+	return { u"Error: Could not initialize WebView."_q };
+}
+
+[[nodiscard]] TextWithEntities CrashedWebviewErrorText() {
+	return { u"Error: WebView has crashed."_q };
+}
+
+[[nodiscard]] QSize CloseButtonHitSize() {
+	const auto &style = st::markdownEmbedOverlayClose;
+	return QSize(
+		std::max(
+			style.width,
+			style.rippleAreaSize + 2 * style.rippleAreaPosition.x()),
+		std::max(
+			style.height,
+			style.rippleAreaSize + 2 * style.rippleAreaPosition.y()));
+}
+
+[[nodiscard]] int CloseButtonHitHeight() {
+	return CloseButtonHitSize().height();
+}
+
+[[nodiscard]] bool ShowsErrorSurface(EmbedOverlay::Mode mode) {
+	return mode == EmbedOverlay::Mode::Error;
+}
+
+[[nodiscard]] bool UsesExternalWindow(EmbedOverlay::Mode mode) {
+	return mode == EmbedOverlay::Mode::External;
+}
+
+enum class LayoutMode {
+	RoundedEmbedded,
+	FullWidthEmbedded,
+	ErrorSurface,
+};
+
+[[nodiscard]] LayoutMode CurrentLayoutMode(
+		EmbedOverlay::Mode mode,
+		const EmbedRequest &request) {
+	if (ShowsErrorSurface(mode)) {
+		return LayoutMode::ErrorSurface;
+	}
+	return request.fullWidth
+		? LayoutMode::FullWidthEmbedded
+		: LayoutMode::RoundedEmbedded;
+}
+
+[[nodiscard]] bool ShowsCloseButton(
+		EmbedOverlay::Mode mode,
+		const EmbedRequest &) {
+	return ShowsErrorSurface(mode)
+		|| (mode == EmbedOverlay::Mode::EmbeddedVisible);
+}
+
+[[nodiscard]] TextWithEntities AddFallbackAction(
+		TextWithEntities text,
+		const QString &url) {
+	if (url.isEmpty()) {
+		return text;
+	}
+	return std::move(text).append(u"\n\n"_q).append(tr::link(
+		tr::lng_iv_open_in_browser(tr::now),
+		url));
+}
+
+[[nodiscard]] int ParsePositiveInt(const QJsonValue &value) {
+	auto parsed = 0.;
+	if (value.isDouble()) {
+		parsed = value.toDouble();
+	} else if (value.isString()) {
+		auto text = value.toString().trimmed();
+		if (text.endsWith(u"px"_q)) {
+			text.chop(2);
+		}
+		auto ok = false;
+		parsed = text.toDouble(&ok);
+		if (!ok) {
+			return 0;
+		}
+	} else {
+		return 0;
+	}
+	if (parsed <= 0.
+		|| parsed > static_cast<double>(std::numeric_limits<int>::max())) {
+		return 0;
+	}
+	return static_cast<int>(std::round(parsed));
+}
+
+[[nodiscard]] int ResizeFrameHeight(const QJsonObject &object) {
+	if (object.value("eventType").toString() != u"resize_frame"_q) {
+		return 0;
+	}
+	return ParsePositiveInt(
+		object.value("eventData").toObject().value("height"));
+}
+
+[[nodiscard]] int ResizeFrameHeight(const QJsonDocument &message) {
+	if (message.isArray()) {
+		const auto array = message.array();
+		if (array.size() < 2 || array[0].toString() != u"resize_frame"_q) {
+			return 0;
+		}
+		return ParsePositiveInt(array[1].toObject().value("height"));
+	}
+	return message.isObject() ? ResizeFrameHeight(message.object()) : 0;
+}
+
+[[nodiscard]] QByteArray EmbedInitScript() {
+	return QByteArray(
+		"(function(){"
+		"window.TelegramWebviewProxy={"
+		"postEvent:function(eventType,eventData){"
+		"if(window.external&&typeof window.external.invoke==='function'){"
+		"try{"
+		"window.external.invoke(JSON.stringify([eventType,eventData]));"
+		"}catch(e){}"
+		"}"
+		"}"
+		"};"
+		"})();");
+}
+
+[[nodiscard]] QByteArray NormalizeDataRequestId(const std::string &id) {
+	auto result = QByteArray::fromStdString(id);
+	if (const auto hash = result.indexOf('#'); hash >= 0) {
+		result = result.left(hash);
+	}
+	while (result.startsWith('/')) {
+		result.remove(0, 1);
+	}
+	return result;
+}
+
+} // namespace
+
+EmbedOverlay::EmbedOverlay(
+	QWidget *parent,
+	std::function<void(QString)> linkActivationCallback,
+	Webview::StorageId storageId)
+: Ui::RpWidget(parent)
+, _webviewParent(parent)
+, _linkActivationCallback(std::move(linkActivationCallback))
+, _storageId(std::move(storageId))
+, _readyDelayTimer([=] {
+	revealReadyEmbed();
+})
+, _loadingAnimation(
+	[=] {
+		if (!anim::Disabled()) {
+			update(_contentGeometry);
+			if (_content) {
+				_content->update();
+			}
+		}
+	},
+	st::markdownEmbedOverlay.loading) {
+	setObjectName(u"nativeIvEmbedOverlay"_q);
+	setMouseTracking(true);
+	QWidget::hide();
+
+	_content = Ui::CreateChild<Ui::RpWidget>(this);
+	_content->setObjectName(u"nativeIvEmbedOverlayShell"_q);
+	_content->paintRequest(
+	) | rpl::on_next([=] {
+		if (!_loading || _contentGeometry.isEmpty()) {
+			return;
+		}
+		auto p = QPainter(_content);
+		const auto size = st::markdownEmbedOverlay.loading.size;
+		const auto loader = style::centerrect(
+			bodyRectInContent(),
+			QRect(QPoint(), size));
+		_loadingAnimation.draw(p, loader.topLeft(), size, _content->width());
+	}, _content->lifetime());
+	_content->show();
+
+	_close = Ui::CreateChild<Ui::IconButton>(this, st::markdownEmbedOverlayClose);
+	_close->setObjectName(u"nativeIvEmbedOverlayClose"_q);
+	_close->setClickedCallback([=] {
+		closeEmbed();
+	});
+	_close->hide();
+}
+
+EmbedOverlay::~EmbedOverlay() {
+	destroyWebview();
+	cancelReadyDelay();
+	removeEscapeFilter();
+}
+
+bool EmbedOverlay::preloadEmbed(
+		const EmbedRequest &request,
+		std::function<void()> shownCallback,
+		std::function<void()> failedCallback) {
+	return startEmbed(
+		request,
+		Mode::EmbeddedPreload,
+		true,
+		std::move(shownCallback),
+		std::move(failedCallback));
+}
+
+bool EmbedOverlay::showEmbed(const EmbedRequest &request) {
+	return startEmbed(request, Mode::EmbeddedVisible, true, {}, {});
+}
+
+bool EmbedOverlay::showExternalEmbed(const EmbedRequest &request) {
+	return startEmbed(request, Mode::External, true, {}, {});
+}
+
+void EmbedOverlay::cancelPreload() {
+	closeEmbed();
+}
+
+bool EmbedOverlay::startEmbed(
+		const EmbedRequest &request,
+		Mode mode,
+		bool showErrorOnFailure,
+		std::function<void()> shownCallback,
+		std::function<void()> failedCallback) {
+	if (!request) {
+		return false;
+	}
+	closeEmbed();
+	if (isHidden()) {
+		_focusRestore = QApplication::focusWidget();
+	}
+	_request = request;
+	_preferredBodySize = QSize();
+	_pendingPreferredBodySize = QSize();
+	_htmlRequestId = htmlRequestId();
+	_cssToQtScale = 1.;
+	_ready = false;
+	_mode = mode;
+	_loading = !UsesExternalWindow(mode);
+	_showErrorOnFailure = showErrorOnFailure;
+	_shownCallback = std::move(shownCallback);
+	_failedCallback = std::move(failedCallback);
+	clearWebviewError();
+	QWidget::hide();
+	removeEscapeFilter();
+	updateContentGeometry();
+	if (_loading) {
+		_loadingAnimation.start();
+	}
+	_content->update();
+	const auto available = Webview::Availability();
+	if (!_webview) {
+		if (available.error != Webview::Available::Error::None) {
+			showWebviewError(Ui::BotWebView::ErrorText(available));
+			return true;
+		}
+	}
+	ensureWebview();
+	if (_webview && _webview->widget()) {
+		updateWebviewGeometry();
+		if (!request.html.isEmpty()) {
+			if (available.customSchemeRequests) {
+				_webview->navigateToData(QString::fromUtf8(_htmlRequestId));
+			} else {
+				showWebviewError(GenericWebviewErrorText());
+			}
+		} else if (!request.url.isEmpty()) {
+			_webview->navigate(request.url);
+		} else {
+			showWebviewError(GenericWebviewErrorText());
+		}
+		if (_error && !_error->isHidden()) {
+			_error->raise();
+		}
+	} else {
+		showWebviewError();
+	}
+	return true;
+}
+
+void EmbedOverlay::closeEmbed() {
+	destroyWebview();
+	resetState();
+}
+
+void EmbedOverlay::updateGeometry(QRect geometry, int contentWidth) {
+	setGeometry(geometry);
+	_contentWidth = contentWidth;
+	updateContentGeometry();
+	if (!isHidden()) {
+		raiseSurfaces();
+	}
+}
+
+void EmbedOverlay::testHandleWebviewMessage(const QJsonDocument &message) {
+	handleWebviewMessage(message);
+}
+
+void EmbedOverlay::testHandleNavigationDone(bool success) {
+	handleNavigationDone(success);
+}
+
+bool EmbedOverlay::testLoadingCoverVisible() const {
+	return _loading;
+}
+
+bool EmbedOverlay::testReadyDelayScheduled() const {
+	return _readyDelayTimer.isActive();
+}
+
+void EmbedOverlay::testFireReadyDelay() {
+	cancelReadyDelay();
+	revealReadyEmbed();
+}
+
+const Webview::StorageId &EmbedOverlay::testEffectiveStorageId() const {
+	return _storageId;
+}
+
+QRect EmbedOverlay::testBodyGeometry() const {
+	return bodyGeometry();
+}
+
+EmbedOverlay::Mode EmbedOverlay::testMode() const {
+	return _mode;
+}
+
+bool EmbedOverlay::eventFilter(QObject *object, QEvent *event) {
+	const auto type = event->type();
+	if (isHidden()
+		|| (type != QEvent::ShortcutOverride && type != QEvent::KeyPress)
+		|| !eventFromOverlayWindow(object)) {
+		return QObject::eventFilter(object, event);
+	}
+	const auto keyEvent = static_cast<QKeyEvent*>(event);
+	if (keyEvent->key() != Qt::Key_Escape) {
+		return QObject::eventFilter(object, event);
+	}
+	keyEvent->accept();
+	if (type == QEvent::KeyPress) {
+		closeEmbed();
+	}
+	return true;
+}
+
+void EmbedOverlay::paintEvent(QPaintEvent *e) {
+	Q_UNUSED(e);
+
+	auto p = QPainter(this);
+	const auto full = rect();
+	p.fillRect(full, st::markdownEmbedOverlay.scrimBg);
+	if (_contentGeometry.isEmpty()) {
+		return;
+	}
+	switch (CurrentLayoutMode(_mode, _request)) {
+	case LayoutMode::FullWidthEmbedded:
+		p.fillRect(_contentGeometry, st::markdownEmbedOverlay.bg);
+		break;
+	case LayoutMode::RoundedEmbedded:
+	case LayoutMode::ErrorSurface:
+		Ui::FillRoundRect(
+			p,
+			_contentGeometry,
+			st::markdownEmbedOverlay.bg,
+			Ui::PrepareCornerPixmaps(
+				st::roundRadiusSmall,
+				st::markdownEmbedOverlay.bg));
+		break;
+	}
+}
+
+void EmbedOverlay::mousePressEvent(QMouseEvent *e) {
+	const auto closeHit = _close
+		&& !_close->isHidden()
+		&& _close->geometry().contains(e->pos());
+	_pressedOutside = !_contentGeometry.contains(e->pos()) && !closeHit;
+	e->accept();
+}
+
+void EmbedOverlay::mouseReleaseEvent(QMouseEvent *e) {
+	const auto closeHit = _close
+		&& !_close->isHidden()
+		&& _close->geometry().contains(e->pos());
+	const auto outside = !_contentGeometry.contains(e->pos()) && !closeHit;
+	if (_pressedOutside && outside && e->button() == Qt::LeftButton) {
+		closeEmbed();
+	}
+	_pressedOutside = false;
+	e->accept();
+}
+
+void EmbedOverlay::installEscapeFilter() {
+	if (!_escapeFilterInstalled) {
+		qApp->installEventFilter(this);
+		_escapeFilterInstalled = true;
+	}
+}
+
+void EmbedOverlay::removeEscapeFilter() {
+	if (_escapeFilterInstalled) {
+		qApp->removeEventFilter(this);
+		_escapeFilterInstalled = false;
+	}
+}
+
+bool EmbedOverlay::eventFromOverlayWindow(QObject *object) const {
+	const auto overlayWindow = window();
+	const auto activeWindow = QApplication::activeWindow();
+	if (!overlayWindow) {
+		return true;
+	} else if (const auto widget = qobject_cast<QWidget*>(object)) {
+		return widget->window() == overlayWindow;
+	} else if (const auto qwindow = qobject_cast<QWindow*>(object)) {
+		return (qwindow == overlayWindow->windowHandle())
+			|| !activeWindow
+			|| (activeWindow == overlayWindow);
+	}
+	return !activeWindow || (activeWindow == overlayWindow);
+}
+
+void EmbedOverlay::resetState() {
+	cancelReadyDelay();
+	_loading = false;
+	_loadingAnimation.stop(anim::type::instant);
+	if (_content) {
+		_content->update();
+	}
+	removeEscapeFilter();
+	QWidget::hide();
+	clearWebviewError();
+	_request = EmbedRequest();
+	_preferredBodySize = QSize();
+	_pendingPreferredBodySize = QSize();
+	_htmlRequestId = QByteArray();
+	_cssToQtScale = 1.;
+	_ready = false;
+	_externalWindowCloseReported = false;
+	_showErrorOnFailure = false;
+	_shownCallback = nullptr;
+	_failedCallback = nullptr;
+	_mode = Mode::Hidden;
+	_pressedOutside = false;
+	restoreFocus();
+}
+
+Webview::WindowConfig EmbedOverlay::makeWindowConfig() const {
+	return {
+		.opaqueBg = st::markdownEmbedOverlay.bg->c,
+		.storageId = _storageId,
+		.safe = true,
+		.mode = UsesExternalWindow(_mode)
+			? Webview::WindowMode::External
+			: Webview::WindowMode::Embedded,
+		.initialSize = UsesExternalWindow(_mode)
+			? externalInitialSize()
+			: QSize(),
+	};
+}
+
+QSize EmbedOverlay::externalInitialSize() const {
+	auto width = _request.fullWidth
+		? _contentWidth
+		: _request.width;
+	if (width <= 0) {
+		width = st::markdownEmbedOverlay.size.width();
+	}
+	auto height = _request.height;
+	if ((height > 0) && (_request.width > 0)) {
+		height = std::max(
+			static_cast<int>(std::round(
+				width * (double(_request.height) / _request.width))),
+			1);
+	}
+	if (height <= 0) {
+		height = st::markdownEmbedOverlay.size.height();
+	}
+	return QSize(width, height);
+}
+
+void EmbedOverlay::ensureWebview() {
+	if (_webview && _webview->widget()) {
+		updateContentGeometry();
+		return;
+	}
+	const auto generation = ++_webviewGeneration;
+	_webview = std::make_unique<Webview::Window>(
+		_webviewParent ? _webviewParent.data() : this,
+		makeWindowConfig());
+	const auto raw = _webview.get();
+	const auto widget = raw->widget();
+	if (!widget) {
+		_webview = nullptr;
+		showWebviewError();
+		return;
+	}
+	widget->hide();
+	QObject::connect(widget, &QObject::destroyed, this, [=] {
+		if (_webviewGeneration != generation
+			|| !_webview
+			|| _webview.get() != raw) {
+			return;
+		}
+		crl::on_main(this, [=] {
+			if (_webviewGeneration == generation
+				&& _webview
+				&& _webview.get() == raw) {
+				if (UsesExternalWindow(_mode) && _externalWindowCloseReported) {
+					_webview = nullptr;
+					resetState();
+					return;
+				}
+				_webview = nullptr;
+				showWebviewError(CrashedWebviewErrorText());
+			}
+		});
+	});
+	raw->setExternalWindowCloseHandler([=] {
+		if (_webviewGeneration == generation
+			&& _webview
+			&& (_webview.get() == raw)) {
+			_externalWindowCloseReported = true;
+		}
+	});
+	raw->setDataRequestHandler([=](Webview::DataRequest request) {
+		return handleDataRequest(std::move(request));
+	});
+	raw->init(EmbedInitScript());
+	raw->setNavigationStartHandler([=](const QString &uri, bool newWindow) {
+		if (uri == u"about:blank"_q) {
+			return true;
+		}
+		if (!newWindow && !_ready && !uri.isEmpty()) {
+			return true;
+		}
+		if (UsesExternalWindow(_mode) && !newWindow && !uri.isEmpty()) {
+			return true;
+		}
+		if (_linkActivationCallback && !uri.isEmpty()) {
+			_linkActivationCallback(uri);
+		}
+		return false;
+	});
+	raw->setNavigationDoneHandler([=](bool success) {
+		crl::on_main(this, [=] {
+			if (_webviewGeneration == generation
+				&& _webview
+				&& (_webview.get() == raw)) {
+				handleNavigationDone(success);
+			}
+		});
+	});
+	raw->setMessageHandler([=](const QJsonDocument &message) {
+		crl::on_main(this, [=] {
+			if (_webviewGeneration == generation
+				&& _webview
+				&& (_webview.get() == raw)) {
+				handleWebviewMessage(message);
+			}
+		});
+	});
+	updateContentGeometry();
+}
+
+void EmbedOverlay::handleWebviewMessage(const QJsonDocument &message) {
+	if (!_request) {
+		return;
+	}
+	if (const auto height = ResizeFrameHeight(message)) {
+		applyPreferredBodyHeight(cssPixelsToQt(height));
+		return;
+	}
+	const auto object = message.object();
+	const auto event = object.value("event").toString();
+	if (event != u"preferred_size"_q) {
+		return;
+	}
+	const auto width = ParsePositiveInt(object.value("width"));
+	const auto height = ParsePositiveInt(object.value("height"));
+	if (!width || !height) {
+		return;
+	}
+	auto viewportWidth = ParsePositiveInt(object.value("viewportWidth"));
+	if (!viewportWidth) {
+		viewportWidth = ParsePositiveInt(object.value("viewport_width"));
+	}
+	if (!viewportWidth) {
+		viewportWidth = ParsePositiveInt(object.value("innerWidth"));
+	}
+	updateCssToQtScale(viewportWidth);
+	applyPreferredBodySize(QSize(cssPixelsToQt(width), cssPixelsToQt(height)));
+}
+
+void EmbedOverlay::handleNavigationDone(bool success) {
+	if (!_request) {
+		return;
+	}
+	if (!success) {
+		if (UsesExternalWindow(_mode) && _externalWindowCloseReported) {
+			destroyWebview();
+			resetState();
+			return;
+		}
+		showWebviewError();
+		return;
+	}
+	if (!_ready) {
+		setReady();
+	}
+}
+
+void EmbedOverlay::cancelReadyDelay() {
+	_readyDelayTimer.cancel();
+}
+
+void EmbedOverlay::setReady() {
+	if (_ready || !_webview || !_webview->widget()) {
+		return;
+	}
+	_ready = true;
+	if (_pendingPreferredBodySize.isValid()
+		&& (_pendingPreferredBodySize.width() > 0
+			|| _pendingPreferredBodySize.height() > 0)) {
+		_preferredBodySize = _pendingPreferredBodySize;
+		_pendingPreferredBodySize = QSize();
+	}
+	updateContentGeometry();
+	cancelReadyDelay();
+	if (UsesExternalWindow(_mode)) {
+		_loading = false;
+		_loadingAnimation.stop(anim::type::normal);
+		_content->update();
+		if (const auto shownCallback = base::take(_shownCallback)) {
+			shownCallback();
+		}
+		_failedCallback = nullptr;
+		return;
+	}
+	_readyDelayTimer.callOnce(kReadyRevealDelay);
+}
+
+void EmbedOverlay::revealReadyEmbed() {
+	if (!_ready || !_request || !_webview || !_webview->widget()) {
+		return;
+	}
+	cancelReadyDelay();
+	clearWebviewError();
+	if (_mode == Mode::EmbeddedPreload) {
+		_mode = Mode::EmbeddedVisible;
+	}
+	QWidget::show();
+	installEscapeFilter();
+	raiseSurfaces();
+	updateContentGeometry();
+	_loading = false;
+	_loadingAnimation.stop(anim::type::normal);
+	_content->update();
+	_webview->widget()->show();
+	_webview->widget()->raise();
+	_webview->focus();
+	update();
+	_content->update();
+	if (const auto shownCallback = base::take(_shownCallback)) {
+		shownCallback();
+	}
+	_failedCallback = nullptr;
+}
+
+void EmbedOverlay::applyPreferredBodySize(QSize size) {
+	if (!size.isValid()) {
+		return;
+	}
+	if (!_ready) {
+		_pendingPreferredBodySize = size;
+		return;
+	}
+	if (_preferredBodySize == size) {
+		return;
+	}
+	_preferredBodySize = size;
+	updateContentGeometry();
+}
+
+void EmbedOverlay::applyPreferredBodyHeight(int height) {
+	if (height <= 0) {
+		return;
+	}
+	applyPreferredBodySize(QSize(_preferredBodySize.width(), height));
+}
+
+void EmbedOverlay::updateCssToQtScale(int viewportWidth) {
+	const auto body = bodyGeometry();
+	if (viewportWidth <= 0 || body.width() <= 0) {
+		return;
+	}
+	_cssToQtScale = std::clamp(body.width() / double(viewportWidth), 0.25, 4.);
+}
+
+void EmbedOverlay::updateContentGeometry() {
+	if (!_content) {
+		return;
+	}
+	const auto layout = CurrentLayoutMode(_mode, _request);
+	const auto fullWidth = (layout == LayoutMode::FullWidthEmbedded);
+	const auto margin = st::markdownEmbedOverlay.margin;
+	const auto available = fullWidth
+		? rect().marginsRemoved({ 0, margin.top(), 0, margin.bottom() })
+		: rect().marginsRemoved(margin);
+	const auto verticalReserve = (layout != LayoutMode::ErrorSurface)
+		? std::min(
+			CloseButtonHitHeight(),
+			std::max((available.height() - 1) / 2, 0))
+		: 0;
+	if (available.isEmpty()) {
+		_contentGeometry = QRect();
+		_content->setGeometry(_contentGeometry);
+		updateWebviewGeometry();
+		if (_error) {
+			_error->setGeometry(QRect());
+		}
+		if (_close) {
+			_close->hide();
+		}
+		update();
+		return;
+	}
+	const auto showClose = ShowsCloseButton(_mode, _request);
+	if ((layout == LayoutMode::ErrorSurface) && _error) {
+		const auto width = std::clamp(
+			(_contentWidth > 0)
+				? _contentWidth
+				: st::markdownEmbedOverlay.size.width(),
+			1,
+			std::max(available.width(), 1));
+		_error->resizeToWidth(width);
+		_contentGeometry = style::centerrect(
+			available,
+			QRect(QPoint(), _error->size()));
+	} else {
+		const auto embedAvailable = available.marginsRemoved(
+			QMargins(0, verticalReserve, 0, verticalReserve));
+		const auto padding = contentPadding();
+		const auto horizontalPadding = padding.left() + padding.right();
+		const auto verticalPadding = padding.top() + padding.bottom();
+		const auto availableWidth = std::max(embedAvailable.width(), 1);
+		const auto availableHeight = std::max(embedAvailable.height(), 1);
+		const auto availableBodyHeight = std::max(
+			availableHeight - verticalPadding,
+			1);
+		const auto width = fullWidth
+			? availableWidth
+			: std::clamp(
+				(_contentWidth > 0)
+					? _contentWidth
+					: st::markdownEmbedOverlay.size.width(),
+				1,
+				availableWidth);
+		const auto bodyWidth = std::max(width - horizontalPadding, 1);
+		const auto desiredBodyHeight = [&] {
+			if (_preferredBodySize.height() > 0) {
+				return _preferredBodySize.height();
+			}
+			if (_request.height > 0) {
+				if (_request.width > 0) {
+					return std::max(
+						static_cast<int>(std::round(
+							bodyWidth
+								* (double(_request.height) / _request.width))),
+						1);
+				}
+				return _request.height;
+			}
+			return st::markdownEmbedOverlay.size.height();
+		}();
+		const auto height = std::min(
+			std::clamp(desiredBodyHeight, 1, availableBodyHeight)
+				+ verticalPadding,
+			availableHeight);
+		_contentGeometry = style::centerrect(
+			embedAvailable,
+			QRect(0, 0, width, height));
+	}
+	_content->setGeometry(_contentGeometry);
+	if (_close) {
+		if (showClose) {
+			_close->show();
+			if (layout == LayoutMode::RoundedEmbedded) {
+				_close->move(
+					std::max(
+						_contentGeometry.x()
+							+ _contentGeometry.width()
+							- _close->width(),
+						0),
+					std::max(_contentGeometry.y() - _close->height(), 0));
+			} else {
+				_close->moveToRight(0, 0);
+			}
+		} else {
+			_close->hide();
+		}
+	}
+	updateWebviewGeometry();
+	if (_error && _errorLabel) {
+		_errorLabel->setContextCopyText(_request.url);
+		if (layout == LayoutMode::ErrorSurface) {
+			_error->moveToLeft(0, 0, _content->width());
+		} else {
+			const auto body = bodyRectInContent();
+			_error->resizeToWidth(std::max(body.width(), 1));
+			_error->moveToLeft(
+				body.x(),
+				body.y() + std::max((body.height() - _error->height()) / 2, 0),
+				_content->width());
+		}
+		_error->raise();
+	}
+	if (_close && !_close->isHidden()) {
+		_close->raise();
+	}
+	update();
+	_content->update();
+}
+
+void EmbedOverlay::updateWebviewGeometry() {
+	if (_webview && _webview->widget()) {
+		_webview->widget()->setGeometry(bodyGeometry());
+		if (!_webview->widget()->isHidden()) {
+			_webview->widget()->raise();
+			if (_close && !_close->isHidden()) {
+				_close->raise();
+			}
+		}
+	}
+}
+
+void EmbedOverlay::raiseSurfaces() {
+	raise();
+	if (_content) {
+		_content->raise();
+	}
+	if (_webview && _webview->widget() && !_webview->widget()->isHidden()) {
+		_webview->widget()->raise();
+	}
+	if (_error && !_error->isHidden()) {
+		_error->raise();
+	}
+	if (_close && !_close->isHidden()) {
+		_close->raise();
+	}
+}
+
+void EmbedOverlay::hideWebview() {
+	if (_webview && _webview->widget()) {
+		_webview->widget()->hide();
+	}
+}
+
+void EmbedOverlay::destroyWebview() {
+	++_webviewGeneration;
+	if (_webview) {
+		if (const auto widget = _webview->widget()) {
+			widget->hide();
+		}
+		_webview = nullptr;
+	}
+}
+
+void EmbedOverlay::showWebviewError() {
+	const auto available = Webview::Availability();
+	showWebviewError((available.error != Webview::Available::Error::None)
+		? Ui::BotWebView::ErrorText(available)
+		: GenericWebviewErrorText());
+}
+
+void EmbedOverlay::showWebviewError(const TextWithEntities &text) {
+	if (UsesExternalWindow(_mode) && _externalWindowCloseReported) {
+		destroyWebview();
+		resetState();
+		return;
+	}
+	cancelReadyDelay();
+	_ready = false;
+	_loading = false;
+	_loadingAnimation.stop(anim::type::normal);
+	_content->update();
+	hideWebview();
+	destroyWebview();
+	_shownCallback = nullptr;
+	const auto failedCallback = base::take(_failedCallback);
+	const auto showError = !isHidden() || _showErrorOnFailure;
+	_showErrorOnFailure = false;
+	if (!showError) {
+		resetState();
+		if (failedCallback) {
+			failedCallback();
+		}
+		return;
+	}
+	QWidget::show();
+	installEscapeFilter();
+	_mode = Mode::Error;
+	raiseSurfaces();
+	if (!_error) {
+		_error = Ui::CreateChild<Ui::PaddingWrap<Ui::FlatLabel>>(
+			_content,
+			object_ptr<Ui::FlatLabel>(
+				_content,
+				QString(),
+				st::markdownEmbedOverlay.errorLabel),
+			st::markdownEmbedOverlay.errorPadding);
+		_error->setObjectName(u"nativeIvEmbedOverlayErrorWrap"_q);
+		_errorLabel = _error->entity();
+		_errorLabel->setObjectName(u"nativeIvEmbedOverlayError"_q);
+		_errorLabel->setClickHandlerFilter([=](
+				const ClickHandlerPtr &handler,
+				Qt::MouseButton) {
+			const auto entity = handler->getTextEntity();
+			if (entity.type != EntityType::CustomUrl) {
+				return true;
+			}
+			File::OpenUrl(entity.data);
+			return false;
+		});
+	}
+	_errorLabel->setMarkedText(AddFallbackAction(text, _request.url));
+	_error->show();
+	updateContentGeometry();
+	if (failedCallback) {
+		failedCallback();
+	}
+}
+
+void EmbedOverlay::clearWebviewError() {
+	if (_error) {
+		_error->hide();
+	}
+}
+
+void EmbedOverlay::restoreFocus() {
+	if (_focusRestore && _focusRestore->isVisible()) {
+		_focusRestore->setFocus(Qt::OtherFocusReason);
+	}
+	_focusRestore = nullptr;
+}
+
+QRect EmbedOverlay::bodyGeometry() const {
+	return _contentGeometry.isEmpty()
+		? QRect()
+		: _contentGeometry.marginsRemoved(contentPadding());
+}
+
+QRect EmbedOverlay::bodyRectInContent() const {
+	const auto body = bodyGeometry();
+	return QRect(
+		body.topLeft() - _contentGeometry.topLeft(),
+		body.size());
+}
+
+QMargins EmbedOverlay::contentPadding() const {
+	if (ShowsErrorSurface(_mode) || UsesExternalWindow(_mode)) {
+		return QMargins();
+	}
+	return _request.fullWidth ? QMargins() : st::markdownEmbedOverlay.padding;
+}
+
+int EmbedOverlay::cssPixelsToQt(int value) const {
+	return (value > 0)
+		? std::max(static_cast<int>(std::round(value * _cssToQtScale)), 1)
+		: 0;
+}
+
+QByteArray EmbedOverlay::htmlRequestId() {
+	return !_request.html.isEmpty()
+		? QByteArray(kHtmlRequestPrefix)
+			+ QByteArray::number(++_dataResourceGeneration)
+		: QByteArray();
+}
+
+Webview::DataResult EmbedOverlay::handleDataRequest(
+		Webview::DataRequest request) {
+	const auto id = NormalizeDataRequestId(request.id);
+	if (id != _htmlRequestId || _request.html.isEmpty()) {
+		return Webview::DataResult::Failed;
+	}
+	request.done({
+		.stream = std::make_unique<Webview::DataStreamFromMemory>(
+			_request.html,
+			"text/html; charset=utf-8"),
+	});
+	return Webview::DataResult::Done;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_embed_overlay.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_embed_overlay.h
new file mode 100644
index 00000000000000..bf8e731c74bc7a
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_embed_overlay.h
@@ -0,0 +1,159 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "iv/markdown/iv_markdown_common.h"
+#include "ui/effects/radial_animation.h"
+#include "ui/rp_widget.h"
+
+#include <functional>
+#include <memory>
+#include <string>
+
+#include <QtCore/QPointer>
+#include <QtCore/QRect>
+#include <QtCore/QSize>
+
+class QEvent;
+class QJsonDocument;
+class QMouseEvent;
+class QObject;
+class QPaintEvent;
+class QWidget;
+struct TextWithEntities;
+
+namespace Ui {
+class FlatLabel;
+class IconButton;
+template <typename Widget>
+class PaddingWrap;
+class RpWidget;
+} // namespace Ui
+
+namespace Webview {
+struct DataRequest;
+enum class DataResult;
+class Window;
+struct WindowConfig;
+} // namespace Webview
+
+namespace Iv::Markdown {
+
+class EmbedOverlay final : public Ui::RpWidget {
+public:
+	enum class Mode {
+		Hidden,
+		EmbeddedPreload,
+		EmbeddedVisible,
+		Error,
+		External,
+	};
+
+	EmbedOverlay(
+		QWidget *parent,
+		std::function<void(QString)> linkActivationCallback,
+		Webview::StorageId storageId);
+	~EmbedOverlay();
+
+	[[nodiscard]] bool preloadEmbed(
+		const EmbedRequest &request,
+		std::function<void()> shownCallback = {},
+		std::function<void()> failedCallback = {});
+	[[nodiscard]] bool showEmbed(const EmbedRequest &request);
+	[[nodiscard]] bool showExternalEmbed(const EmbedRequest &request);
+	void cancelPreload();
+	void closeEmbed();
+	void updateGeometry(QRect geometry, int contentWidth);
+	void testHandleWebviewMessage(const QJsonDocument &message);
+	void testHandleNavigationDone(bool success);
+	[[nodiscard]] bool testLoadingCoverVisible() const;
+	[[nodiscard]] bool testReadyDelayScheduled() const;
+	void testFireReadyDelay();
+	[[nodiscard]] const Webview::StorageId &testEffectiveStorageId() const;
+	[[nodiscard]] QRect testBodyGeometry() const;
+	[[nodiscard]] Mode testMode() const;
+
+protected:
+	bool eventFilter(QObject *object, QEvent *event) override;
+	void paintEvent(QPaintEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+
+private:
+	void installEscapeFilter();
+	void removeEscapeFilter();
+	[[nodiscard]] bool eventFromOverlayWindow(QObject *object) const;
+	void resetState();
+	[[nodiscard]] bool startEmbed(
+		const EmbedRequest &request,
+		Mode mode,
+		bool showErrorOnFailure,
+		std::function<void()> shownCallback,
+		std::function<void()> failedCallback);
+	void ensureWebview();
+	[[nodiscard]] Webview::WindowConfig makeWindowConfig() const;
+	[[nodiscard]] QSize externalInitialSize() const;
+	void handleWebviewMessage(const QJsonDocument &message);
+	void handleNavigationDone(bool success);
+	void cancelReadyDelay();
+	void setReady();
+	void revealReadyEmbed();
+	void applyPreferredBodySize(QSize size);
+	void applyPreferredBodyHeight(int height);
+	void updateCssToQtScale(int viewportWidth);
+	void updateContentGeometry();
+	void updateWebviewGeometry();
+	void raiseSurfaces();
+	void hideWebview();
+	void destroyWebview();
+	void showWebviewError();
+	void showWebviewError(const TextWithEntities &text);
+	void clearWebviewError();
+	void restoreFocus();
+	[[nodiscard]] QRect bodyGeometry() const;
+	[[nodiscard]] QRect bodyRectInContent() const;
+	[[nodiscard]] QMargins contentPadding() const;
+	[[nodiscard]] int cssPixelsToQt(int value) const;
+	[[nodiscard]] QByteArray htmlRequestId();
+	[[nodiscard]] Webview::DataResult handleDataRequest(
+		Webview::DataRequest request);
+
+	const QPointer<QWidget> _webviewParent;
+	const std::function<void(QString)> _linkActivationCallback;
+	const Webview::StorageId _storageId;
+	Ui::RpWidget *_content = nullptr;
+	Ui::IconButton *_close = nullptr;
+	Ui::PaddingWrap<Ui::FlatLabel> *_error = nullptr;
+	Ui::FlatLabel *_errorLabel = nullptr;
+	std::unique_ptr<Webview::Window> _webview;
+	base::Timer _readyDelayTimer;
+	Ui::InfiniteRadialAnimation _loadingAnimation;
+	EmbedRequest _request;
+	QRect _contentGeometry;
+	QSize _preferredBodySize;
+	QSize _pendingPreferredBodySize;
+	QByteArray _htmlRequestId;
+	QPointer<QWidget> _focusRestore;
+	std::function<void()> _shownCallback;
+	std::function<void()> _failedCallback;
+	int _contentWidth = 0;
+	int _dataResourceGeneration = 0;
+	int _webviewGeneration = 0;
+	double _cssToQtScale = 1.;
+	Mode _mode = Mode::Hidden;
+	bool _pressedOutside = false;
+	bool _externalWindowCloseReported = false;
+	bool _ready = false;
+	bool _loading = false;
+	bool _showErrorOnFailure = false;
+	bool _escapeFilterInstalled = false;
+
+};
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_history_view_media.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_history_view_media.cpp
new file mode 100644
index 00000000000000..2554a968066957
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_history_view_media.cpp
@@ -0,0 +1,749 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_history_view_media.h"
+
+#include "iv/markdown/iv_markdown_article.h"
+#include "base/unixtime.h"
+#include "iv/markdown/iv_markdown_media_block.h"
+
+#include <QtCore/QDate>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtWidgets/QApplication>
+#include <array>
+#include <unordered_set>
+
+#include "settings.h"
+#include "ui/image/image_location.h"
+#include "data/data_types.h"
+#include "data/data_document.h"
+#include "data/data_file_click_handler.h"
+#include "data/data_photo.h"
+#include "data/data_session.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/admin_log/history_admin_log_item.h"
+#include "history/history_location_manager.h"
+#include "history/view/history_view_cursor_state.h"
+#include "history/history_view_top_toast.h"
+#include "history/view/history_view_element.h"
+#include "history/view/history_view_message.h"
+#include "history/view/media/history_view_media.h"
+#include "ui/basic_click_handlers.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+
+#include "rpl/filter.h"
+#include "rpl/lifetime.h"
+
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+class IvHistoryViewDelegate final : public HistoryView::SimpleElementDelegate {
+public:
+	IvHistoryViewDelegate(
+		not_null<Window::SessionController*> controller,
+		not_null<::Data::Session*> session,
+		Fn<void()> update);
+
+	HistoryView::Context elementContext() override;
+
+	HistoryView::ElementChatMode elementChatMode() override;
+
+	bool elementAnimationsPaused() override;
+
+	void elementOpenPhoto(
+			not_null<PhotoData*> photo,
+			FullMsgId context) override;
+
+	void elementOpenDocument(
+			not_null<DocumentData*> document,
+			FullMsgId context,
+			bool showInMediaView = false) override;
+
+	void elementCancelUpload(const FullMsgId &context) override;
+
+	void elementShowTooltip(
+			const TextWithEntities &text,
+			Fn<void()> hiddenCallback) override;
+
+private:
+	const not_null<::Data::Session*> _session;
+	HistoryView::InfoTooltip _tooltip;
+};
+
+IvHistoryViewDelegate::IvHistoryViewDelegate(
+	not_null<Window::SessionController*> controller,
+	not_null<::Data::Session*> session,
+	Fn<void()> update)
+: HistoryView::SimpleElementDelegate(controller, std::move(update))
+, _session(session) {
+}
+
+HistoryView::Context IvHistoryViewDelegate::elementContext() {
+	return HistoryView::Context::TTLViewer;
+}
+
+HistoryView::ElementChatMode IvHistoryViewDelegate::elementChatMode() {
+	return HistoryView::ElementChatMode::Default;
+}
+
+bool IvHistoryViewDelegate::elementAnimationsPaused() {
+	return false;
+}
+
+void IvHistoryViewDelegate::elementOpenPhoto(
+		not_null<PhotoData*> photo,
+		FullMsgId context) {
+	controller()->openPhoto(photo, { .id = context });
+}
+
+void IvHistoryViewDelegate::elementOpenDocument(
+		not_null<DocumentData*> document,
+		FullMsgId context,
+		bool showInMediaView) {
+	controller()->openDocument(
+		document,
+		showInMediaView,
+		{ .id = context });
+}
+
+void IvHistoryViewDelegate::elementCancelUpload(const FullMsgId &context) {
+	if (const auto item = _session->message(context)) {
+		controller()->cancelUploadLayer(item);
+	}
+}
+
+void IvHistoryViewDelegate::elementShowTooltip(
+		const TextWithEntities &text,
+		Fn<void()> hiddenCallback) {
+	const auto widget = QApplication::activeWindow();
+	if (!widget) {
+		return;
+	}
+	_tooltip.show(
+		not_null{ widget },
+		&_session->session(),
+		text,
+		std::move(hiddenCallback));
+}
+
+struct IvHistoryViewHit {
+	ClickHandlerPtr link;
+	MediaActivation activation;
+	bool supported = true;
+};
+
+[[nodiscard]] MediaActivation ExternalActivation(QString url) {
+	auto result = MediaActivation();
+	if (!url.isEmpty()) {
+		result.kind = MediaActivationKind::ExternalUrl;
+		result.url = std::move(url);
+	}
+	return result;
+}
+
+[[nodiscard]] not_null<HistoryItem*> CreateIvHostMessage(
+		not_null<History*> history,
+		QString pageUrl) {
+	const auto item = history->addNewLocalMessage({
+		.id = history->nextNonHistoryEntryId(),
+		.flags = (MessageFlag::FakeHistoryItem
+			| MessageFlag::Local
+			| MessageFlag::HideDisplayDate),
+		.date = base::unixtime::now(),
+	}, TextWithEntities(), MTP_messageMediaEmpty());
+	item->setMediaForInstantView(std::move(pageUrl));
+	return item;
+}
+
+class IvHistoryViewBlock final : public MediaBlock {
+public:
+	explicit IvHistoryViewBlock(IvHistoryViewMediaDescriptor descriptor);
+	~IvHistoryViewBlock();
+
+	[[nodiscard]] uint64 stableId() const override;
+
+	[[nodiscard]] bool supported() const;
+
+	[[nodiscard]] int resizeGetHeight(int width) override;
+
+	void setGeometry(QRect geometry) override;
+
+	[[nodiscard]] QRect geometry() const override;
+
+	[[nodiscard]] int firstLineBaseline() const override;
+
+	void paint(
+		Painter &p,
+		const MarkdownArticlePaintContext &context) const override;
+
+	[[nodiscard]] ClickHandlerPtr linkAt(QPoint point) const override;
+
+	[[nodiscard]] MediaActivation activationAt(QPoint point) const override;
+
+	[[nodiscard]] MediaBlockSelectionData selectionData() const override;
+
+	[[nodiscard]] bool hasHeavyPart() const override;
+
+	void unloadHeavyPart() override;
+
+	void hideSpoilers() override;
+
+private:
+	[[nodiscard]] IvHistoryViewHit resolveHit(QPoint point) const;
+
+	[[nodiscard]] IvHistoryViewHit resolveLocalHit(QPoint point) const;
+
+	[[nodiscard]] IvHistoryViewHit classifyState(
+			const HistoryView::TextState &state) const;
+
+	[[nodiscard]] IvHistoryViewHit classifyHandler(
+			const ClickHandlerPtr &handler) const;
+
+	[[nodiscard]] bool probeSupport();
+
+	[[nodiscard]] bool supportsHitClassification();
+
+	void hostUpdated() override;
+
+	const uint64 _stableId = 0;
+	const IvHistoryViewMediaKind _kind = IvHistoryViewMediaKind::Map;
+	const QString _copyText;
+	const QSize _layoutHint;
+	const std::shared_ptr<PhotoRuntime> _photoRuntime;
+	const std::shared_ptr<DocumentRuntime> _documentRuntime;
+	const base::flat_map<
+		uint64,
+		std::shared_ptr<PhotoRuntime>> _groupedPhotoRuntimes;
+	const base::flat_map<
+		uint64,
+		std::shared_ptr<DocumentRuntime>> _groupedDocumentRuntimes;
+	const std::shared_ptr<IvHistoryViewMediaHost> _host;
+	const std::vector<std::shared_ptr<void>> _keepAlive;
+	std::unique_ptr<HistoryView::Media> _media;
+	QRect _geometry;
+	int _requestedWidth = 0;
+	bool _supported = false;
+	MediaBlockHost *_registeredBridgeHost = nullptr;
+};
+
+IvHistoryViewBlock::IvHistoryViewBlock(
+	IvHistoryViewMediaDescriptor descriptor)
+: _stableId(descriptor.stableId)
+, _kind(descriptor.kind)
+, _copyText(std::move(descriptor.copyText))
+, _layoutHint(descriptor.layoutHint)
+, _photoRuntime(std::move(descriptor.photo))
+, _documentRuntime(std::move(descriptor.document))
+, _groupedPhotoRuntimes(std::move(descriptor.groupedPhotos))
+, _groupedDocumentRuntimes(std::move(descriptor.groupedDocuments))
+, _host(std::move(descriptor.host))
+, _keepAlive(std::move(descriptor.keepAlive)) {
+	if (descriptor.mediaFactory) {
+		_media = descriptor.mediaFactory(_host->view());
+	}
+	if (_media) {
+		_media->initDimensions();
+	}
+	_supported = _media && probeSupport();
+}
+
+IvHistoryViewBlock::~IvHistoryViewBlock() {
+	if (const auto registered = _registeredBridgeHost) {
+		_registeredBridgeHost = nullptr;
+		_host->unregisterViewRequestBridge(registered);
+	}
+}
+
+uint64 IvHistoryViewBlock::stableId() const {
+	return _stableId;
+}
+
+bool IvHistoryViewBlock::supported() const {
+	return _supported;
+}
+
+int IvHistoryViewBlock::resizeGetHeight(int width) {
+	if (!_media) {
+		return 0;
+	}
+	_requestedWidth = std::max(width, 1);
+	return _media->resizeGetHeight(_requestedWidth);
+}
+
+void IvHistoryViewBlock::setGeometry(QRect geometry) {
+	if (!_media) {
+		_geometry = geometry;
+		return;
+	}
+	const auto width = std::max(geometry.width(), 1);
+	if (_requestedWidth != width) {
+		_requestedWidth = width;
+		_media->resizeGetHeight(_requestedWidth);
+	}
+	_geometry = QRect(geometry.topLeft(), _media->currentSize());
+}
+
+QRect IvHistoryViewBlock::geometry() const {
+	return _geometry;
+}
+
+int IvHistoryViewBlock::firstLineBaseline() const {
+	return _geometry.y();
+}
+
+void IvHistoryViewBlock::paint(
+		Painter &p,
+		const MarkdownArticlePaintContext &context) const {
+	if (!_media || _geometry.isEmpty()) {
+		return;
+	}
+	const auto visible = context.clip.intersected(_geometry);
+	if (visible.isEmpty()) {
+		return;
+	}
+	p.save();
+	p.translate(_geometry.topLeft());
+	auto local = context.translated(-_geometry.topLeft());
+	local.clip = visible.translated(-_geometry.topLeft());
+	_media->draw(p, local);
+	p.restore();
+}
+
+ClickHandlerPtr IvHistoryViewBlock::linkAt(QPoint point) const {
+	return resolveHit(point).link;
+}
+
+MediaActivation IvHistoryViewBlock::activationAt(QPoint point) const {
+	return resolveHit(point).activation;
+}
+
+MediaBlockSelectionData IvHistoryViewBlock::selectionData() const {
+	return {
+		.copyText = _copyText,
+	};
+}
+
+bool IvHistoryViewBlock::hasHeavyPart() const {
+	return _media && _media->hasHeavyPart();
+}
+
+void IvHistoryViewBlock::unloadHeavyPart() {
+	const auto had = hasHeavyPart();
+	if (_media) {
+		_media->unloadHeavyPart();
+	}
+	if (had) {
+		_host->view()->checkHeavyPart();
+	}
+}
+
+void IvHistoryViewBlock::hideSpoilers() {
+	if (_media) {
+		_media->hideSpoilers();
+	}
+}
+
+IvHistoryViewHit IvHistoryViewBlock::resolveHit(QPoint point) const {
+	auto result = IvHistoryViewHit();
+	if (!_supported || !_media || !_geometry.contains(point)) {
+		return result;
+	}
+	return resolveLocalHit(point - _geometry.topLeft());
+}
+
+IvHistoryViewHit IvHistoryViewBlock::resolveLocalHit(QPoint point) const {
+	auto result = IvHistoryViewHit();
+	if (!_media) {
+		return result;
+	}
+	const auto state = _media->textState(
+		point,
+		HistoryView::StateRequest{
+			.flags = Ui::Text::StateRequest::Flag::LookupLink
+				| Ui::Text::StateRequest::Flag::LookupCustomTooltip,
+		});
+	return classifyState(state);
+}
+
+IvHistoryViewHit IvHistoryViewBlock::classifyState(
+		const HistoryView::TextState &state) const {
+	return classifyHandler(state.link);
+}
+
+IvHistoryViewHit IvHistoryViewBlock::classifyHandler(
+		const ClickHandlerPtr &handler) const {
+	auto result = IvHistoryViewHit();
+	if (!handler) {
+		return result;
+	}
+	if (_kind == IvHistoryViewMediaKind::Photo) {
+		if (std::dynamic_pointer_cast<LambdaClickHandler>(handler)) {
+			result.link = handler;
+			return result;
+		}
+		if (std::dynamic_pointer_cast<PhotoSaveClickHandler>(handler)
+			|| std::dynamic_pointer_cast<PhotoCancelClickHandler>(handler)) {
+			result.link = handler;
+			return result;
+		}
+		if (std::dynamic_pointer_cast<PhotoOpenClickHandler>(handler)
+			&& _photoRuntime) {
+			result.activation.kind = MediaActivationKind::Photo;
+			result.activation.photo = _photoRuntime;
+			return result;
+		}
+		result.supported = false;
+		return result;
+	}
+	if (std::dynamic_pointer_cast<VoiceSeekClickHandler>(handler)
+		|| std::dynamic_pointer_cast<LambdaClickHandler>(handler)
+		|| std::dynamic_pointer_cast<PhotoSaveClickHandler>(handler)
+		|| std::dynamic_pointer_cast<PhotoCancelClickHandler>(handler)
+		|| std::dynamic_pointer_cast<DocumentSaveClickHandler>(handler)
+		|| std::dynamic_pointer_cast<DocumentCancelClickHandler>(handler)
+		|| std::dynamic_pointer_cast<DocumentOpenWithClickHandler>(handler)) {
+		result.link = handler;
+		return result;
+	}
+	if (_kind == IvHistoryViewMediaKind::Audio
+		&& std::dynamic_pointer_cast<DocumentOpenClickHandler>(handler)) {
+		result.link = handler;
+		return result;
+	}
+	if (_kind == IvHistoryViewMediaKind::GroupedMedia) {
+		if (const auto photoOpen
+			= std::dynamic_pointer_cast<PhotoOpenClickHandler>(handler)) {
+			const auto i = _groupedPhotoRuntimes.find(photoOpen->photo()->id);
+			if (i != end(_groupedPhotoRuntimes)) {
+				result.activation.kind = MediaActivationKind::Photo;
+				result.activation.photo = i->second;
+				return result;
+			}
+		} else if (const auto documentOpen
+			= std::dynamic_pointer_cast<DocumentOpenClickHandler>(handler)) {
+			const auto i = _groupedDocumentRuntimes.find(
+				documentOpen->document()->id);
+			if (i != end(_groupedDocumentRuntimes)) {
+				result.activation.kind = MediaActivationKind::Document;
+				result.activation.document = i->second;
+				return result;
+			}
+		}
+		result.supported = false;
+		return result;
+	}
+	if (std::dynamic_pointer_cast<PhotoOpenClickHandler>(handler)
+		&& _photoRuntime) {
+		result.activation.kind = MediaActivationKind::Photo;
+		result.activation.photo = _photoRuntime;
+		return result;
+	}
+	if (std::dynamic_pointer_cast<DocumentOpenClickHandler>(handler)
+		&& _documentRuntime) {
+		result.activation.kind = MediaActivationKind::Document;
+		result.activation.document = _documentRuntime;
+		return result;
+	}
+	if (std::dynamic_pointer_cast<LocationClickHandler>(handler)) {
+		result.activation = ExternalActivation(handler->url());
+		return result;
+	}
+	if (std::dynamic_pointer_cast<UrlClickHandler>(handler)
+		|| !handler->url().isEmpty()) {
+		result.activation = ExternalActivation(handler->url());
+		return result;
+	}
+	result.supported = false;
+	return result;
+}
+
+bool IvHistoryViewBlock::probeSupport() {
+	if (!_media) {
+		return false;
+	}
+	switch (_kind) {
+	case IvHistoryViewMediaKind::Photo:
+		return supportsHitClassification();
+	case IvHistoryViewMediaKind::Document:
+		return supportsHitClassification();
+	case IvHistoryViewMediaKind::GroupedMedia:
+		return supportsHitClassification();
+	case IvHistoryViewMediaKind::Map:
+	case IvHistoryViewMediaKind::Audio:
+		return true;
+	}
+	return false;
+}
+
+bool IvHistoryViewBlock::supportsHitClassification() {
+	const auto width = std::max(_layoutHint.width(), 1);
+	_media->resizeGetHeight(width);
+	const auto size = _media->currentSize();
+	if (size.isEmpty()) {
+		return false;
+	}
+	const auto right = std::max(size.width() - 1, 0);
+	const auto bottom = std::max(size.height() - 1, 0);
+	const auto points = std::array{
+		QPoint(size.width() / 2, size.height() / 2),
+		QPoint(0, 0),
+		QPoint(right, 0),
+		QPoint(0, bottom),
+		QPoint(right, bottom),
+	};
+	for (const auto &point : points) {
+		if (!resolveLocalHit(point).supported) {
+			return false;
+		}
+	}
+	return true;
+}
+
+void IvHistoryViewBlock::hostUpdated() {
+	const auto current = host();
+	if (_registeredBridgeHost == current) {
+		return;
+	}
+	if (_registeredBridgeHost) {
+		_host->unregisterViewRequestBridge(_registeredBridgeHost);
+	}
+	_registeredBridgeHost = current;
+	if (_registeredBridgeHost) {
+		_host->registerViewRequestBridge(_registeredBridgeHost);
+	}
+}
+
+} // namespace
+
+struct IvHistoryViewMediaHost::State {
+	State(
+		not_null<Window::SessionController*> controller,
+		not_null<History*> history,
+		QString pageUrl);
+	State(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item);
+	explicit State(not_null<HistoryView::Element*> view);
+
+	const not_null<::Data::Session*> session;
+	const QString pageUrl;
+	const std::unique_ptr<IvHistoryViewDelegate> delegate;
+	const not_null<HistoryItem*> item;
+	AdminLog::OwnedItem owned;
+	std::unique_ptr<HistoryView::Element> realView;
+	HistoryView::Element *view = nullptr;
+	bool needsViewRequestBridge = true;
+	MediaBlockHost *bridgeHost = nullptr;
+	int bridgeHostReferences = 0;
+	rpl::lifetime bridgeLifetime;
+};
+
+IvHistoryViewMediaHost::State::State(
+	not_null<Window::SessionController*> controller,
+	not_null<History*> history,
+	QString pageUrl)
+: session(&history->owner())
+, pageUrl(std::move(pageUrl))
+, delegate(std::make_unique<IvHistoryViewDelegate>(
+	controller,
+	session,
+	[=] {
+		if (view) {
+			view->repaint();
+		}
+	}))
+, item(CreateIvHostMessage(history, this->pageUrl))
+, owned(delegate.get(), item)
+, view(static_cast<HistoryView::Message*>(owned.get())) {
+	static_cast<HistoryView::Message*>(view)->setInstantViewMediaRuntime(
+		this->pageUrl);
+}
+
+IvHistoryViewMediaHost::State::State(
+	not_null<Window::SessionController*> controller,
+	not_null<HistoryItem*> item)
+: session(&item->history()->owner())
+, delegate(std::make_unique<IvHistoryViewDelegate>(
+	controller,
+	session,
+	[=] {
+		if (view) {
+			view->repaint();
+		}
+	}))
+, item(item)
+, realView(this->item->createView(delegate.get()))
+, view(static_cast<HistoryView::Message*>(realView.get())) {
+	static_cast<HistoryView::Message*>(view)->setInstantViewMediaRuntime(
+		this->pageUrl);
+}
+
+IvHistoryViewMediaHost::State::State(
+	not_null<HistoryView::Element*> view)
+: session(&view->history()->owner())
+, item(view->data())
+, view(view.get())
+, needsViewRequestBridge(false) {
+}
+
+IvHistoryViewMediaHost::IvHistoryViewMediaHost(
+	not_null<Window::SessionController*> controller,
+	not_null<History*> history,
+	QString pageUrl)
+: _state(std::make_unique<State>(
+	controller,
+	history,
+	std::move(pageUrl))) {
+}
+
+IvHistoryViewMediaHost::IvHistoryViewMediaHost(
+	not_null<Window::SessionController*> controller,
+	not_null<HistoryItem*> item)
+: _state(std::make_unique<State>(controller, item)) {
+}
+
+IvHistoryViewMediaHost::IvHistoryViewMediaHost(
+	not_null<HistoryView::Element*> view)
+: _state(std::make_unique<State>(view)) {
+}
+
+IvHistoryViewMediaHost::~IvHistoryViewMediaHost() = default;
+
+not_null<::Data::Session*> IvHistoryViewMediaHost::session() const {
+	return _state->session;
+}
+
+not_null<HistoryItem*> IvHistoryViewMediaHost::item() const {
+	return _state->item;
+}
+
+not_null<HistoryView::Element*> IvHistoryViewMediaHost::view() const {
+	return not_null<HistoryView::Element*>{ _state->view };
+}
+
+const QString &IvHistoryViewMediaHost::pageUrl() const {
+	return _state->pageUrl;
+}
+
+bool IvHistoryViewMediaHost::needsViewRequestBridge() const {
+	return _state->needsViewRequestBridge;
+}
+
+void IvHistoryViewMediaHost::registerViewRequestBridge(MediaBlockHost *host) {
+	if (!host || !_state->needsViewRequestBridge) {
+		return;
+	}
+	if (_state->bridgeHost == host) {
+		++_state->bridgeHostReferences;
+		return;
+	}
+	_state->bridgeLifetime.destroy();
+	_state->bridgeHost = host;
+	_state->bridgeHostReferences = 1;
+	_state->session->viewRepaintRequest(
+	) | rpl::filter([=](::Data::RequestViewRepaint data) {
+		return (data.view == _state->view);
+	}) | rpl::on_next([=](::Data::RequestViewRepaint) {
+		if (_state->bridgeHost) {
+			_state->bridgeHost->requestRepaint(QRect());
+		}
+	}, _state->bridgeLifetime);
+	_state->session->viewResizeRequest(
+	) | rpl::filter([=](not_null<HistoryView::Element*> view) {
+		return (view == _state->view);
+	}) | rpl::on_next([=](not_null<HistoryView::Element*>) {
+		if (_state->bridgeHost) {
+			_state->bridgeHost->requestRelayout(QRect());
+		}
+	}, _state->bridgeLifetime);
+}
+
+void IvHistoryViewMediaHost::unregisterViewRequestBridge(MediaBlockHost *host) {
+	if (!host
+		|| !_state->needsViewRequestBridge
+		|| _state->bridgeHost != host) {
+		return;
+	}
+	--_state->bridgeHostReferences;
+	if (_state->bridgeHostReferences > 0) {
+		return;
+	}
+	_state->bridgeHostReferences = 0;
+	_state->bridgeHost = nullptr;
+	_state->bridgeLifetime.destroy();
+}
+
+void IvHistoryViewMediaHost::registerPhoto(not_null<PhotoData*> photo) const {
+	_state->item->addPhotoForInstantView(photo);
+}
+
+void IvHistoryViewMediaHost::registerDocument(
+		not_null<DocumentData*> document) const {
+	_state->item->addDocumentForInstantView(document);
+}
+
+IvHistoryViewMediaBlockFactory::IvHistoryViewMediaBlockFactory(
+	base::weak_ptr<Window::SessionController> controller,
+	PhotoFactory createPhoto,
+	VideoFactory createVideo,
+	AudioFactory createAudio,
+	MapFactory createMap,
+	GroupedMediaFactory createGroupedMedia)
+: _controller(std::move(controller))
+, _createPhoto(std::move(createPhoto))
+, _createVideo(std::move(createVideo))
+, _createAudio(std::move(createAudio))
+, _createMap(std::move(createMap))
+, _createGroupedMedia(std::move(createGroupedMedia)) {
+}
+
+std::shared_ptr<MediaBlock> IvHistoryViewMediaBlockFactory::createPhoto(
+		const PreparedPhotoBlockData &prepared) const {
+	return create(prepared, _createPhoto);
+}
+
+std::shared_ptr<MediaBlock> IvHistoryViewMediaBlockFactory::createVideo(
+		const PreparedVideoBlockData &prepared) const {
+	return create(prepared, _createVideo);
+}
+
+std::shared_ptr<MediaBlock> IvHistoryViewMediaBlockFactory::createAudio(
+		const PreparedAudioBlockData &prepared) const {
+	return create(prepared, _createAudio);
+}
+
+std::shared_ptr<MediaBlock> IvHistoryViewMediaBlockFactory::createMap(
+		const PreparedMapBlockData &prepared) const {
+	return create(prepared, _createMap);
+}
+
+auto IvHistoryViewMediaBlockFactory::createGroupedMedia(
+	const PreparedGroupedMediaBlockData &prepared) const
+-> std::shared_ptr<MediaBlock> {
+	return create(prepared, _createGroupedMedia);
+}
+
+std::shared_ptr<MediaBlock> CreateIvHistoryViewMediaBlock(
+		IvHistoryViewMediaDescriptor descriptor) {
+	if (!descriptor.host) {
+		return nullptr;
+	}
+	if (!descriptor.mediaFactory) {
+		return nullptr;
+	}
+	const auto block = std::make_shared<IvHistoryViewBlock>(
+		std::move(descriptor));
+	return block->supported() ? block : nullptr;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_history_view_media.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_history_view_media.h
new file mode 100644
index 00000000000000..1a384138e14d8d
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_history_view_media.h
@@ -0,0 +1,162 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_common.h"
+#include "base/flat_map.h"
+#include "base/weak_ptr.h"
+
+#include <functional>
+#include <memory>
+#include <vector>
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+class DocumentData;
+class History;
+class HistoryItem;
+class PhotoData;
+
+namespace HistoryView {
+class Element;
+class Media;
+class Message;
+} // namespace HistoryView
+
+namespace Data {
+class Session;
+} // namespace Data
+
+namespace Iv::Markdown {
+
+class MediaBlockHost;
+
+class IvHistoryViewMediaHost final {
+public:
+	IvHistoryViewMediaHost(
+		not_null<Window::SessionController*> controller,
+		not_null<History*> history,
+		QString pageUrl);
+	IvHistoryViewMediaHost(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item);
+	explicit IvHistoryViewMediaHost(
+		not_null<HistoryView::Element*> view);
+	~IvHistoryViewMediaHost();
+
+	[[nodiscard]] not_null<::Data::Session*> session() const;
+	[[nodiscard]] not_null<HistoryItem*> item() const;
+	[[nodiscard]] not_null<HistoryView::Element*> view() const;
+	[[nodiscard]] const QString &pageUrl() const;
+	[[nodiscard]] bool needsViewRequestBridge() const;
+	void registerViewRequestBridge(MediaBlockHost *host);
+	void unregisterViewRequestBridge(MediaBlockHost *host);
+
+	void registerPhoto(not_null<PhotoData*> photo) const;
+	void registerDocument(not_null<DocumentData*> document) const;
+
+private:
+	struct State;
+	std::unique_ptr<State> _state;
+};
+
+enum class IvHistoryViewMediaKind {
+	Photo,
+	Document,
+	Map,
+	Audio,
+	GroupedMedia,
+};
+
+struct IvHistoryViewMediaDescriptor {
+	using MediaFactory = std::function<std::unique_ptr<HistoryView::Media>(
+		not_null<HistoryView::Element*> view)>;
+
+	uint64 stableId = 0;
+	IvHistoryViewMediaKind kind = IvHistoryViewMediaKind::Map;
+	QString copyText;
+	QSize layoutHint;
+	std::shared_ptr<IvHistoryViewMediaHost> host;
+	MediaFactory mediaFactory;
+	std::vector<std::shared_ptr<void>> keepAlive;
+	std::shared_ptr<PhotoRuntime> photo;
+	std::shared_ptr<DocumentRuntime> document;
+	base::flat_map<uint64, std::shared_ptr<PhotoRuntime>> groupedPhotos;
+	base::flat_map<
+		uint64,
+		std::shared_ptr<DocumentRuntime>> groupedDocuments;
+};
+
+class IvHistoryViewMediaBlockFactory final : public HostedMediaBlockFactory {
+public:
+	using PhotoFactory = std::function<std::shared_ptr<MediaBlock>(
+		Window::SessionController *controller,
+		const PreparedPhotoBlockData &prepared)>;
+	using VideoFactory = std::function<std::shared_ptr<MediaBlock>(
+		Window::SessionController *controller,
+		const PreparedVideoBlockData &prepared)>;
+	using AudioFactory = std::function<std::shared_ptr<MediaBlock>(
+		Window::SessionController *controller,
+		const PreparedAudioBlockData &prepared)>;
+	using MapFactory = std::function<std::shared_ptr<MediaBlock>(
+		Window::SessionController *controller,
+		const PreparedMapBlockData &prepared)>;
+	using GroupedMediaFactory = std::function<std::shared_ptr<MediaBlock>(
+		Window::SessionController *controller,
+		const PreparedGroupedMediaBlockData &prepared)>;
+
+	IvHistoryViewMediaBlockFactory(
+		base::weak_ptr<Window::SessionController> controller,
+		PhotoFactory createPhoto = {},
+		VideoFactory createVideo = {},
+		AudioFactory createAudio = {},
+		MapFactory createMap = {},
+		GroupedMediaFactory createGroupedMedia = {});
+
+	[[nodiscard]] std::shared_ptr<MediaBlock> createPhoto(
+		const PreparedPhotoBlockData &prepared) const override;
+	[[nodiscard]] std::shared_ptr<MediaBlock> createVideo(
+		const PreparedVideoBlockData &prepared) const override;
+	[[nodiscard]] std::shared_ptr<MediaBlock> createAudio(
+		const PreparedAudioBlockData &prepared) const override;
+	[[nodiscard]] std::shared_ptr<MediaBlock> createMap(
+		const PreparedMapBlockData &prepared) const override;
+	[[nodiscard]] std::shared_ptr<MediaBlock> createGroupedMedia(
+		const PreparedGroupedMediaBlockData &prepared) const override;
+
+private:
+	template <typename Prepared, typename Factory>
+	[[nodiscard]] std::shared_ptr<MediaBlock> create(
+			const Prepared &prepared,
+			const Factory &factory) const;
+
+	const base::weak_ptr<Window::SessionController> _controller;
+	const PhotoFactory _createPhoto;
+	const VideoFactory _createVideo;
+	const AudioFactory _createAudio;
+	const MapFactory _createMap;
+	const GroupedMediaFactory _createGroupedMedia;
+};
+
+template <typename Prepared, typename Factory>
+std::shared_ptr<MediaBlock> IvHistoryViewMediaBlockFactory::create(
+		const Prepared &prepared,
+		const Factory &factory) const {
+	if (!factory) {
+		return nullptr;
+	}
+	const auto controller = _controller.get();
+	return controller ? factory(controller, prepared) : nullptr;
+}
+
+[[nodiscard]] std::shared_ptr<MediaBlock> CreateIvHistoryViewMediaBlock(
+	IvHistoryViewMediaDescriptor descriptor);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_math.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_math.cpp
new file mode 100644
index 00000000000000..62122bd569ba17
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_math.cpp
@@ -0,0 +1,401 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_math.h"
+
+#include <QtCore/QString>
+
+#include <algorithm>
+#include <limits>
+#include <utility>
+#include <vector>
+
+namespace Iv::Markdown {
+namespace {
+
+[[nodiscard]] bool SetError(QString *error, QString value) {
+	if (error) {
+		*error = std::move(value);
+	}
+	return false;
+}
+
+[[nodiscard]] bool IsMasked(const std::vector<bool> &mask, int offset) {
+	return (offset >= 0)
+		&& (offset < static_cast<int>(mask.size()))
+		&& mask[offset];
+}
+
+[[nodiscard]] bool IsAsciiLetter(char ch) {
+	return ((ch >= 'a') && (ch <= 'z'))
+		|| ((ch >= 'A') && (ch <= 'Z'));
+}
+
+void OffsetToPosition(
+		const std::vector<int> &lineStarts,
+		int offset,
+		int *line,
+		int *column) {
+	const auto clampedOffset = std::max(offset, 0);
+	auto resultLine = 1;
+	auto resultColumn = clampedOffset + 1;
+	if (!lineStarts.empty()) {
+		auto i = std::upper_bound(
+			lineStarts.begin(),
+			lineStarts.end(),
+			clampedOffset);
+		if (i != lineStarts.begin()) {
+			--i;
+			resultLine = static_cast<int>(i - lineStarts.begin()) + 1;
+			resultColumn = clampedOffset - *i + 1;
+		}
+	}
+	if (line) {
+		*line = resultLine;
+	}
+	if (column) {
+		*column = resultColumn;
+	}
+}
+
+[[nodiscard]] QString FindParentBlock(
+		const std::vector<MathScanBlock> &blocks,
+		int line,
+		int column) {
+	auto best = u"document"_q;
+	auto bestSpan = std::numeric_limits<int>::max();
+	for (const auto &block : blocks) {
+		const auto &range = block.range;
+		if (!range.available) {
+			continue;
+		} else if (line < range.startLine || line > range.endLine) {
+			continue;
+		} else if (line == range.startLine && column < range.startColumn) {
+			continue;
+		} else if (line == range.endLine && column > range.endColumn) {
+			continue;
+		}
+		const auto span = (range.endLine - range.startLine) * 1000
+			+ (range.endColumn - range.startColumn);
+		if (span < bestSpan) {
+			bestSpan = span;
+			best = block.nodeKind;
+		}
+	}
+	return best;
+}
+
+[[nodiscard]] bool LooksLikeCurrency(const QByteArray &content) {
+	if (content.isEmpty()) {
+		return true;
+	}
+	auto hasDigit = false;
+	const auto size = static_cast<int>(content.size());
+	for (auto i = 0; i != size; ++i) {
+		const auto ch = content.at(i);
+		if (ch >= '0' && ch <= '9') {
+			hasDigit = true;
+		} else if (ch != '.' && ch != ',' && ch != ' ') {
+			return false;
+		}
+	}
+	return hasDigit;
+}
+
+[[nodiscard]] bool HasStrongMathSignal(const QByteArray &content) {
+	const auto size = static_cast<int>(content.size());
+	const auto hasVisibleNeighbors = [&](int position) {
+		auto left = position - 1;
+		while (left >= 0) {
+			const auto ch = content.at(left);
+			if (ch != ' ' && ch != '\t' && ch != '\n' && ch != '\r') {
+				break;
+			}
+			--left;
+		}
+		auto right = position + 1;
+		while (right < size) {
+			const auto ch = content.at(right);
+			if (ch != ' ' && ch != '\t' && ch != '\n' && ch != '\r') {
+				break;
+			}
+			++right;
+		}
+		return (left >= 0) && (right < size);
+	};
+	for (auto i = 0; i != size; ++i) {
+		const auto ch = content.at(i);
+		if (ch == '\\' && (i + 1) < size) {
+			const auto next = content.at(i + 1);
+			if (IsAsciiLetter(next)
+				|| next == ','
+				|| next == ':'
+				|| next == ';'
+				|| next == '!') {
+				return true;
+			}
+		} else if (ch == '^' || ch == '_') {
+			if (hasVisibleNeighbors(i)) {
+				return true;
+			}
+		} else if (ch == '+'
+			|| ch == '='
+			|| ch == '<'
+			|| ch == '>') {
+			if (hasVisibleNeighbors(i)) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] bool LooksLikeProse(const QByteArray &content) {
+	auto alphaWords = 0;
+	auto longestRun = 0;
+	const auto size = static_cast<int>(content.size());
+	auto i = 0;
+	while (i < size) {
+		while (i < size && !IsAsciiLetter(content.at(i))) {
+			++i;
+		}
+		const auto start = i;
+		while (i < size && IsAsciiLetter(content.at(i))) {
+			++i;
+		}
+		const auto length = i - start;
+		if (length >= 2 && (start == 0 || content.at(start - 1) != '\\')) {
+			++alphaWords;
+			longestRun = std::max(longestRun, length);
+		}
+	}
+	return alphaWords >= 2 || longestRun >= 5;
+}
+
+[[nodiscard]] QByteArray StripBlockquoteMarkers(QByteArray content) {
+	auto cleaned = QByteArray();
+	cleaned.reserve(content.size());
+	const auto size = static_cast<int>(content.size());
+	auto position = 0;
+	while (position < size) {
+		auto endOfLine = position;
+		while (endOfLine < size && content.at(endOfLine) != '\n') {
+			++endOfLine;
+		}
+		auto start = position;
+		if (position > 0) {
+			while (start < endOfLine) {
+				while (start < endOfLine
+					&& (content.at(start) == ' ' || content.at(start) == '\t')) {
+					++start;
+				}
+				if (start < endOfLine && content.at(start) == '>') {
+					++start;
+					continue;
+				}
+				break;
+			}
+			if (start < endOfLine && content.at(start) == ' ') {
+				++start;
+			}
+		}
+		cleaned.append(content.constData() + start, endOfLine - start);
+		if (endOfLine < size) {
+			cleaned.append('\n');
+		}
+		position = endOfLine + 1;
+	}
+	return cleaned;
+}
+
+[[nodiscard]] SourceRange RangeForOffsets(
+		const std::vector<int> &lineStarts,
+		int sourceSize,
+		int startOffset,
+		int endOffset) {
+	auto startLine = 0;
+	auto startColumn = 0;
+	auto endLine = 0;
+	auto endColumn = 0;
+	OffsetToPosition(lineStarts, startOffset, &startLine, &startColumn);
+	OffsetToPosition(
+		lineStarts,
+		std::max(startOffset, endOffset - 1),
+		&endLine,
+		&endColumn);
+	return RangeFromLineColumns(
+		lineStarts,
+		sourceSize,
+		startLine,
+		startColumn,
+		endLine,
+		endColumn);
+}
+
+[[nodiscard]] bool ExceedsFormulaBytes(
+		const QByteArray &content,
+		int maxFormulaBytes) {
+	return (maxFormulaBytes >= 0)
+		&& (content.size() > maxFormulaBytes);
+}
+
+[[nodiscard]] bool ExceedsFormulaCount(
+		const std::vector<MathFormula> &formulas,
+		int maxFormulaCount) {
+	return (maxFormulaCount >= 0)
+		&& (static_cast<int>(formulas.size()) >= maxFormulaCount);
+}
+
+} // namespace
+
+std::vector<int> BuildLineStarts(const QByteArray &source) {
+	auto result = std::vector<int>();
+	result.push_back(0);
+	const auto size = static_cast<int>(source.size());
+	for (auto i = 0; i != size; ++i) {
+		if (source.at(i) == '\n') {
+			result.push_back(i + 1);
+		}
+	}
+	return result;
+}
+
+SourceRange RangeFromLineColumns(
+		const std::vector<int> &lineStarts,
+		int sourceSize,
+		int startLine,
+		int startColumn,
+		int endLine,
+		int endColumn) {
+	auto result = SourceRange();
+	result.startLine = startLine;
+	result.startColumn = startColumn;
+	result.endLine = endLine;
+	result.endColumn = endColumn;
+	const auto linesCount = static_cast<int>(lineStarts.size());
+	if (startLine <= 0
+		|| endLine <= 0
+		|| startLine > linesCount
+		|| endLine > linesCount) {
+		return result;
+	}
+	const auto maxOffset = std::max(sourceSize, 0);
+	const auto startOffset = lineStarts[startLine - 1]
+		+ std::max(0, startColumn - 1);
+	const auto endOffset = lineStarts[endLine - 1]
+		+ std::max(0, endColumn);
+	result.available = true;
+	result.startOffset = std::clamp(startOffset, 0, maxOffset);
+	result.endOffset = std::clamp(endOffset, 0, maxOffset);
+	return result;
+}
+
+bool ExtractMathRegions(
+		const QByteArray &source,
+		const std::vector<bool> &mask,
+		const std::vector<int> &lineStarts,
+		const std::vector<MathScanBlock> &blocks,
+		int maxFormulaBytes,
+		int maxFormulaCount,
+		std::vector<MathFormula> *out,
+		QString *error) {
+	if (!out) {
+		return SetError(error, u"invalid-output"_q);
+	}
+	auto formulas = std::vector<MathFormula>();
+	const auto size = static_cast<int>(source.size());
+	auto i = 0;
+	while (i < size) {
+		if (IsMasked(mask, i) || source.at(i) != '$') {
+			++i;
+			continue;
+		}
+		if (i > 0 && source.at(i - 1) == '\\') {
+			++i;
+			continue;
+		}
+		const auto display = (i + 1 < size)
+			&& (source.at(i + 1) == '$')
+			&& !IsMasked(mask, i + 1);
+		const auto delimiterSize = display ? 2 : 1;
+		const auto contentStart = i + delimiterSize;
+		auto j = contentStart;
+		auto closing = -1;
+		while (j < size) {
+			if (IsMasked(mask, j)) {
+				++j;
+				continue;
+			}
+			if (source.at(j) == '\\') {
+				j += 2;
+				continue;
+			}
+			if (!display && source.at(j) == '\n') {
+				break;
+			}
+			if (!display && source.at(j) == '$') {
+				closing = j;
+				break;
+			}
+			if (display
+				&& source.at(j) == '$'
+				&& (j + 1 < size)
+				&& source.at(j + 1) == '$'
+				&& !IsMasked(mask, j + 1)) {
+				closing = j;
+				break;
+			}
+			++j;
+		}
+		if (closing < 0) {
+			++i;
+			continue;
+		}
+		auto content = source.mid(contentStart, closing - contentStart);
+		if (!display && LooksLikeCurrency(content)) {
+			++i;
+			continue;
+		}
+		if (!display
+			&& !HasStrongMathSignal(content)
+			&& LooksLikeProse(content)) {
+			++i;
+			continue;
+		}
+		if (display) {
+			content = StripBlockquoteMarkers(std::move(content));
+		}
+		if (ExceedsFormulaBytes(content, maxFormulaBytes)) {
+			return SetError(error, u"formula-too-large"_q);
+		}
+		if (ExceedsFormulaCount(formulas, maxFormulaCount)) {
+			return SetError(error, u"too-many-formulas"_q);
+		}
+		auto startLine = 0;
+		auto startColumn = 0;
+		OffsetToPosition(lineStarts, i, &startLine, &startColumn);
+		auto formula = MathFormula();
+		formula.index = static_cast<int>(formulas.size()) + 1;
+		formula.kind = display ? MathKind::Display : MathKind::Inline;
+		formula.tex = QString::fromUtf8(content.constData(), content.size());
+		formula.range = RangeForOffsets(
+			lineStarts,
+			size,
+			i,
+			closing + delimiterSize);
+		formula.parentNodeKind = FindParentBlock(blocks, startLine, startColumn);
+		formulas.push_back(std::move(formula));
+		i = closing + delimiterSize;
+	}
+	*out = std::move(formulas);
+	if (error) {
+		error->clear();
+	}
+	return true;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_math.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_math.h
new file mode 100644
index 00000000000000..e0ff3959f39745
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_math.h
@@ -0,0 +1,41 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_document.h"
+
+#include <QtCore/QByteArray>
+
+#include <vector>
+
+namespace Iv::Markdown {
+
+struct MathScanBlock {
+	SourceRange range;
+	QString nodeKind;
+};
+
+[[nodiscard]] std::vector<int> BuildLineStarts(const QByteArray &source);
+[[nodiscard]] SourceRange RangeFromLineColumns(
+	const std::vector<int> &lineStarts,
+	int sourceSize,
+	int startLine,
+	int startColumn,
+	int endLine,
+	int endColumn);
+[[nodiscard]] bool ExtractMathRegions(
+	const QByteArray &source,
+	const std::vector<bool> &mask,
+	const std::vector<int> &lineStarts,
+	const std::vector<MathScanBlock> &blocks,
+	int maxFormulaBytes,
+	int maxFormulaCount,
+	std::vector<MathFormula> *out,
+	QString *error);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_math_renderer.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_math_renderer.cpp
new file mode 100644
index 00000000000000..f5eefa1c6df816
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_math_renderer.cpp
@@ -0,0 +1,267 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_math_renderer.h"
+
+#include <algorithm>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+[[nodiscard]] FormulaCacheKey NormalizeKey(
+		const MicrotexRenderRequest &request) {
+	return {
+		.trimmedTex = request.trimmedTex.trimmed(),
+		.kind = request.kind,
+		.textSize = request.textSize,
+		.renderWidthCap = request.renderWidthCap,
+		.renderHeightCap = request.renderHeightCap,
+		.devicePixelRatio = request.devicePixelRatio,
+	};
+}
+
+[[nodiscard]] MicrotexMeasureRequest NormalizeRequest(
+		const MicrotexMeasureRequest &request) {
+	return {
+		.trimmedTex = request.trimmedTex.trimmed(),
+		.kind = request.kind,
+		.textSize = request.textSize,
+		.renderWidthCap = request.renderWidthCap,
+		.renderHeightCap = request.renderHeightCap,
+	};
+}
+
+[[nodiscard]] QString FallbackText(const QString &trimmedTex) {
+	return trimmedTex.isEmpty()
+		? u"[math]"_q
+		: trimmedTex;
+}
+
+[[nodiscard]] int64 EstimateQStringBytes(const QString &value) {
+	return int64(value.size()) * sizeof(QChar);
+}
+
+[[nodiscard]] int64 EstimateQImageBytes(const QImage &image) {
+	return image.isNull() ? 0 : int64(image.sizeInBytes());
+}
+
+[[nodiscard]] MeasuredFormula FinalizeMeasured(
+		QString trimmedTex,
+		MeasuredFormula result) {
+	result.fallbackText = FallbackText(trimmedTex);
+	return result;
+}
+
+[[nodiscard]] RenderedFormula FinalizeRendered(
+		QString trimmedTex,
+		MicrotexRenderResult result) {
+	auto measured = FinalizeMeasured(
+		std::move(trimmedTex),
+		std::move(result.measured));
+	auto rendered = RenderedFormula();
+	rendered.image = std::move(result.image);
+	rendered.logicalSize = measured.logicalSize;
+	rendered.logicalDepth = measured.logicalDepth;
+	rendered.exact = measured.exact;
+	rendered.fallbackText = std::move(measured.fallbackText);
+	rendered.error = std::move(measured.error);
+	rendered.success = measured.success && !rendered.image.isNull();
+	rendered.overflow = measured.overflow;
+	rendered.tooLarge = measured.tooLarge;
+	return rendered;
+}
+
+} // namespace
+
+const RenderedFormula *FormulaCache::find(const FormulaCacheKey &key) {
+	const auto i = _entries.find(key);
+	if (i == _entries.end()) {
+		return nullptr;
+	}
+	touch(i);
+	return &i->second.value;
+}
+
+FormulaCacheMutation FormulaCache::put(
+		FormulaCacheKey key,
+		RenderedFormula value) {
+	if (_budgetBytes <= 0) {
+		if (const auto i = _entries.find(key); i != _entries.end()) {
+			erase(i);
+		}
+		return {};
+	}
+	const auto sizeBytes = estimateBytes(key, value);
+	if (sizeBytes > _budgetBytes) {
+		if (const auto i = _entries.find(key); i != _entries.end()) {
+			erase(i);
+		}
+		return {};
+	}
+	if (const auto i = _entries.find(key); i != _entries.end()) {
+		erase(i);
+	}
+	_lru.push_back(key);
+	const auto lru = std::prev(_lru.end());
+	_entries.emplace(std::move(key), Entry{
+		.value = std::move(value),
+		.sizeBytes = sizeBytes,
+		.lru = lru,
+	});
+	_sizeBytes += sizeBytes;
+	return evictToBudget();
+}
+
+FormulaCacheMutation FormulaCache::setBudgetBytes(int64 bytes) {
+	_budgetBytes = std::max<int64>(0, bytes);
+	return evictToBudget();
+}
+
+int64 FormulaCache::budgetBytes() const {
+	return _budgetBytes;
+}
+
+int64 FormulaCache::sizeBytes() const {
+	return _sizeBytes;
+}
+
+int FormulaCache::size() const {
+	return int(_entries.size());
+}
+
+void FormulaCache::clear() {
+	_entries.clear();
+	_lru.clear();
+	_sizeBytes = 0;
+}
+
+int64 FormulaCache::estimateBytes(
+		const FormulaCacheKey &key,
+		const RenderedFormula &value) const {
+	return sizeof(FormulaCacheKey)
+		+ sizeof(Entry)
+		+ EstimateQStringBytes(key.trimmedTex)
+		+ EstimateQImageBytes(value.image)
+		+ EstimateQStringBytes(value.fallbackText)
+		+ EstimateQStringBytes(value.error);
+}
+
+void FormulaCache::touch(std::map<FormulaCacheKey, Entry>::iterator i) {
+	_lru.erase(i->second.lru);
+	_lru.push_back(i->first);
+	i->second.lru = std::prev(_lru.end());
+}
+
+void FormulaCache::erase(std::map<FormulaCacheKey, Entry>::iterator i) {
+	_sizeBytes -= i->second.sizeBytes;
+	_lru.erase(i->second.lru);
+	_entries.erase(i);
+}
+
+FormulaCacheMutation FormulaCache::evictToBudget() {
+	auto result = FormulaCacheMutation();
+	while (((_budgetBytes <= 0) || (_sizeBytes > _budgetBytes)) && !_lru.empty()) {
+		const auto oldest = _lru.front();
+		const auto i = _entries.find(oldest);
+		if (i == _entries.end()) {
+			_lru.pop_front();
+			continue;
+		}
+		result.evictedBytes += i->second.sizeBytes;
+		++result.evictedEntries;
+		erase(i);
+	}
+	return result;
+}
+
+MeasuredFormula MathRenderer::measureFormula(
+		const MicrotexMeasureRequest &request) {
+	const auto normalized = NormalizeRequest(request);
+	return FinalizeMeasured(
+		normalized.trimmedTex,
+		MeasureWithMicrotex(normalized));
+}
+
+RenderedFormula MathRenderer::renderFormula(
+		const MicrotexRenderRequest &request) {
+	const auto key = makeKey(request);
+	if (const auto cached = _cache.find(key)) {
+		++_debugCounters.hits;
+		return *cached;
+	}
+	++_debugCounters.misses;
+	auto rendered = FinalizeRendered(
+		key.trimmedTex,
+		RenderWithMicrotex({
+			.trimmedTex = key.trimmedTex,
+			.kind = key.kind,
+			.textSize = key.textSize,
+			.renderWidthCap = key.renderWidthCap,
+			.renderHeightCap = key.renderHeightCap,
+			.devicePixelRatio = key.devicePixelRatio,
+		}));
+	if (rendered.success) {
+		++_debugCounters.rendered;
+	} else {
+		++_debugCounters.failed;
+	}
+	applyCacheMutation(_cache.put(key, rendered));
+	return rendered;
+}
+
+void MathRenderer::clearCache(bool resetDebugCounters) {
+	_cache.clear();
+	if (resetDebugCounters) {
+		_debugCounters = FormulaDebugCounters();
+	} else {
+		syncCacheCounters();
+	}
+}
+
+void MathRenderer::invalidate(bool resetDebugCounters) {
+	clearCache(resetDebugCounters);
+}
+
+void MathRenderer::resetDebugCounters() {
+	_debugCounters = FormulaDebugCounters();
+	syncCacheCounters();
+}
+
+void MathRenderer::setCacheBudgetBytes(int64 bytes) {
+	applyCacheMutation(_cache.setBudgetBytes(bytes));
+}
+
+const FormulaDebugCounters &MathRenderer::debugCounters() const {
+	return _debugCounters;
+}
+
+int64 MathRenderer::cacheBudgetBytes() const {
+	return _cache.budgetBytes();
+}
+
+int64 MathRenderer::cacheUsageBytes() const {
+	return _cache.sizeBytes();
+}
+
+FormulaCacheKey MathRenderer::makeKey(
+		const MicrotexRenderRequest &request) const {
+	return NormalizeKey(request);
+}
+
+void MathRenderer::syncCacheCounters() {
+	_debugCounters.cacheEntries = _cache.size();
+	_debugCounters.cacheBytes = _cache.sizeBytes();
+}
+
+void MathRenderer::applyCacheMutation(FormulaCacheMutation mutation) {
+	_debugCounters.evictedEntries += mutation.evictedEntries;
+	_debugCounters.evictedBytes += mutation.evictedBytes;
+	syncCacheCounters();
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_math_renderer.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_math_renderer.h
new file mode 100644
index 00000000000000..722bab57ddc299
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_math_renderer.h
@@ -0,0 +1,153 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_microtex.h"
+
+#include "base/basic_types.h"
+
+#include <QtCore/QSize>
+#include <QtCore/QString>
+#include <QtGui/QImage>
+
+#include <list>
+#include <map>
+#include <tuple>
+
+namespace Iv::Markdown {
+
+struct FormulaCacheKey {
+	QString trimmedTex;
+	MathKind kind = MathKind::Display;
+	int textSize = 0;
+	int renderWidthCap = 0;
+	int renderHeightCap = 0;
+	int devicePixelRatio = 1;
+};
+
+inline bool operator==(const FormulaCacheKey &a, const FormulaCacheKey &b) {
+	return std::tie(
+		a.trimmedTex,
+		a.kind,
+		a.textSize,
+		a.renderWidthCap,
+		a.renderHeightCap,
+		a.devicePixelRatio) == std::tie(
+		b.trimmedTex,
+		b.kind,
+		b.textSize,
+		b.renderWidthCap,
+		b.renderHeightCap,
+		b.devicePixelRatio);
+}
+
+inline bool operator<(const FormulaCacheKey &a, const FormulaCacheKey &b) {
+	return std::tie(
+		a.trimmedTex,
+		a.kind,
+		a.textSize,
+		a.renderWidthCap,
+		a.renderHeightCap,
+		a.devicePixelRatio) < std::tie(
+		b.trimmedTex,
+		b.kind,
+		b.textSize,
+		b.renderWidthCap,
+		b.renderHeightCap,
+		b.devicePixelRatio);
+}
+
+struct RenderedFormula {
+	QImage image;
+	QSize logicalSize;
+	int logicalDepth = 0;
+	FormulaExactMetrics exact;
+	QString fallbackText;
+	QString error;
+	bool success = false;
+	bool overflow = false;
+	bool tooLarge = false;
+};
+
+struct FormulaDebugCounters {
+	int rendered = 0;
+	int failed = 0;
+	int hits = 0;
+	int misses = 0;
+	int evictedEntries = 0;
+	int64 evictedBytes = 0;
+	int cacheEntries = 0;
+	int64 cacheBytes = 0;
+};
+
+struct FormulaCacheMutation {
+	int evictedEntries = 0;
+	int64 evictedBytes = 0;
+};
+
+class FormulaCache {
+public:
+	[[nodiscard]] const RenderedFormula *find(
+		const FormulaCacheKey &key);
+	[[nodiscard]] FormulaCacheMutation put(
+		FormulaCacheKey key,
+		RenderedFormula value);
+	[[nodiscard]] FormulaCacheMutation setBudgetBytes(int64 bytes);
+	[[nodiscard]] int64 budgetBytes() const;
+	[[nodiscard]] int64 sizeBytes() const;
+	[[nodiscard]] int size() const;
+	void clear();
+
+private:
+	struct Entry {
+		RenderedFormula value;
+		int64 sizeBytes = 0;
+		std::list<FormulaCacheKey>::iterator lru;
+	};
+
+	[[nodiscard]] int64 estimateBytes(
+		const FormulaCacheKey &key,
+		const RenderedFormula &value) const;
+	void touch(std::map<FormulaCacheKey, Entry>::iterator i);
+	void erase(std::map<FormulaCacheKey, Entry>::iterator i);
+	[[nodiscard]] FormulaCacheMutation evictToBudget();
+
+	std::map<FormulaCacheKey, Entry> _entries;
+	std::list<FormulaCacheKey> _lru;
+	int64 _budgetBytes = 32 * 1024 * 1024;
+	int64 _sizeBytes = 0;
+
+};
+
+class MathRenderer {
+public:
+	[[nodiscard]] MeasuredFormula measureFormula(
+		const MicrotexMeasureRequest &request);
+	[[nodiscard]] RenderedFormula renderFormula(
+		const MicrotexRenderRequest &request);
+	void clearCache(bool resetDebugCounters = false);
+	void invalidate(bool resetDebugCounters = false);
+	void resetDebugCounters();
+	void setCacheBudgetBytes(int64 bytes);
+
+	[[nodiscard]] const FormulaDebugCounters &debugCounters() const;
+	[[nodiscard]] int64 cacheBudgetBytes() const;
+	[[nodiscard]] int64 cacheUsageBytes() const;
+
+private:
+	[[nodiscard]] FormulaCacheKey makeKey(
+		const MicrotexRenderRequest &request) const;
+	void syncCacheCounters();
+	void applyCacheMutation(FormulaCacheMutation mutation);
+
+	FormulaCache _cache;
+	FormulaDebugCounters _debugCounters;
+
+};
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_media_block.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_media_block.cpp
new file mode 100644
index 00000000000000..885e5339a5d793
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_media_block.cpp
@@ -0,0 +1,1934 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_media_block.h"
+
+#include "iv/markdown/iv_markdown_article.h"
+#include "iv/markdown/iv_markdown_article_layout_blocks.h"
+#include "iv/markdown/iv_markdown_prepare.h"
+#include "lang/lang_keys.h"
+#include "ui/dynamic_image.h"
+#include "ui/effects/spoiler_mess.h"
+#include "ui/grouped_layout.h"
+#include "ui/image/image_prepare.h"
+
+#include "rpl/lifetime.h"
+
+#include "styles/palette.h"
+#include "styles/style_iv.h"
+#include "styles/style_widgets.h"
+
+#include <QtGui/QPainterPath>
+
+#include <algorithm>
+#include <cmath>
+#include <limits>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+constexpr auto kIvMarkedTextOptions = TextParseOptions{
+	TextParseMultiline,
+	0,
+	0,
+	Qt::LayoutDirectionAuto,
+};
+
+constexpr auto kMaxGroupedMediaLayoutItems = 10;
+
+[[nodiscard]] bool PaintDynamicImage(
+		Painter &p,
+		const std::shared_ptr<Ui::DynamicImage> &image,
+		QRect rect) {
+	if (!image || rect.isEmpty()) {
+		return false;
+	}
+	if (const auto frame = image->image(std::max(rect.width(), rect.height()));
+		!frame.isNull()) {
+		p.drawImage(rect, frame);
+		return true;
+	}
+	return false;
+}
+
+[[nodiscard]] bool PaintResolvedImages(
+		Painter &p,
+		QRect rect,
+		const std::shared_ptr<Ui::DynamicImage> &thumbnail,
+		const std::shared_ptr<Ui::DynamicImage> &full,
+		const std::shared_ptr<Ui::DynamicImage> &previousThumbnail,
+		const std::shared_ptr<Ui::DynamicImage> &previousFull) {
+	const auto paintedThumbnail = PaintDynamicImage(p, thumbnail, rect);
+	const auto paintedFull = PaintDynamicImage(p, full, rect);
+	if (paintedThumbnail || paintedFull) {
+		return true;
+	}
+	const auto paintedPreviousThumbnail = PaintDynamicImage(
+		p,
+		previousThumbnail,
+		rect);
+	const auto paintedPreviousFull = PaintDynamicImage(p, previousFull, rect);
+	return paintedPreviousThumbnail || paintedPreviousFull;
+}
+
+[[nodiscard]] QImage ResolvedImageFrame(
+		const std::shared_ptr<Ui::DynamicImage> &current,
+		const std::shared_ptr<Ui::DynamicImage> &previous,
+		int size) {
+	if (current) {
+		if (const auto frame = current->image(size); !frame.isNull()) {
+			return frame;
+		}
+	}
+	if (previous) {
+		return previous->image(size);
+	}
+	return QImage();
+}
+
+[[nodiscard]] QImage PrepareWithBlurredBackground(
+		QSize outer,
+		QSize inner,
+		QImage large,
+		QImage blurred) {
+	const auto ratio = style::DevicePixelRatio();
+	auto background = QImage(
+		outer * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	background.setDevicePixelRatio(ratio);
+	if (blurred.isNull()) {
+		background.fill(Qt::black);
+		if (large.isNull()) {
+			return background;
+		}
+	}
+	auto p = QPainter(&background);
+	if (!blurred.isNull()) {
+		auto cover = blurred.scaled(
+			outer * ratio,
+			Qt::KeepAspectRatioByExpanding,
+			Qt::SmoothTransformation);
+		if (cover.size() != outer * ratio) {
+			cover = cover.copy(QRect(
+				QPoint(
+					(cover.width() - outer.width() * ratio) / 2,
+					(cover.height() - outer.height() * ratio) / 2),
+				outer * ratio));
+		}
+		cover = Images::Blur(std::move(cover), true);
+		cover.setDevicePixelRatio(ratio);
+		p.drawImage(QPoint(), cover);
+		p.fillRect(QRect(QPoint(), outer), QColor(0, 0, 0, 48));
+	}
+	if (!large.isNull()) {
+		auto image = large.scaled(
+			inner * ratio,
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation);
+		image.setDevicePixelRatio(ratio);
+		p.drawImage(
+			(outer.width() - inner.width()) / 2,
+			(outer.height() - inner.height()) / 2,
+			image);
+	}
+	return background;
+}
+
+[[nodiscard]] const style::Markdown &PaintStyle(
+		const MarkdownArticlePaintContext &context,
+		const style::Markdown &st) {
+	return context.paintMarkdownStyle(st);
+}
+
+[[nodiscard]] MarkdownArticlePaintContext ClippedContext(
+		const MarkdownArticlePaintContext &context,
+		QRect clip) {
+	auto result = context;
+	result.clip = clip;
+	return result;
+}
+
+void PaintImageSpoiler(Painter &p, QRect rect) {
+	Ui::FillSpoilerRect(p, rect, Ui::DefaultImageSpoiler().frame());
+}
+
+[[nodiscard]] bool UpdateResolvedImage(
+		std::shared_ptr<Ui::DynamicImage> *current,
+		std::shared_ptr<Ui::DynamicImage> *previous,
+		const std::shared_ptr<Ui::DynamicImage> &next) {
+	if (!current || !previous || !next) {
+		return false;
+	} else if (next == *current) {
+		return false;
+	} else if (next == *previous) {
+		std::swap(*current, *previous);
+		return false;
+	}
+	*previous = std::move(*current);
+	*current = next;
+	return true;
+}
+
+template <typename Runtime, typename SubscribeCallback>
+void RefreshResolvedImages(
+		const std::shared_ptr<Runtime> &runtime,
+		QSize size,
+		QSize *requestedSize,
+		std::shared_ptr<Ui::DynamicImage> *thumbnail,
+		std::shared_ptr<Ui::DynamicImage> *previousThumbnail,
+		std::shared_ptr<Ui::DynamicImage> *full,
+		std::shared_ptr<Ui::DynamicImage> *previousFull,
+		SubscribeCallback &&subscribe) {
+	if (!runtime || !requestedSize || size.isEmpty() || (*requestedSize == size)) {
+		return;
+	}
+	*requestedSize = size;
+	if (UpdateResolvedImage(
+			thumbnail,
+			previousThumbnail,
+			runtime->thumbnail(size))) {
+		subscribe(*thumbnail);
+	}
+	if (UpdateResolvedImage(full, previousFull, runtime->full(size))) {
+		subscribe(*full);
+	}
+}
+
+void PaintPhotoProgress(
+		Painter &p,
+		QRect rect,
+		const style::MarkdownPhoto &style,
+		double progress) {
+	const auto size = std::min({
+		style.progressSize,
+		rect.width(),
+		rect.height(),
+	});
+	if (size <= 0) {
+		return;
+	}
+	const auto thickness = std::max(style.progressWidth, 1);
+	const auto ring = QRect(
+		rect.center().x() - (size / 2),
+		rect.center().y() - (size / 2),
+		size,
+		size);
+	auto hq = PainterHighQualityEnabler(p);
+	p.setBrush(Qt::NoBrush);
+	p.setPen(QPen(style.progressBg->c, thickness));
+	p.drawEllipse(ring);
+	p.setPen(QPen(style.progressFg->c, thickness));
+	p.drawArc(
+		ring,
+		90 * 16,
+		-int(std::round(360. * 16. * std::clamp(progress, 0., 1.))));
+}
+
+[[nodiscard]] int MediaHeightForWidth(
+		int width,
+		int aspectWidth,
+		int aspectHeight) {
+	aspectWidth = std::max(aspectWidth, 1);
+	aspectHeight = std::max(aspectHeight, 1);
+	return std::max(
+		int((int64(width) * aspectHeight + aspectWidth - 1) / aspectWidth),
+		1);
+}
+
+void SetPlainTextLeaf(
+		Ui::Text::String *leaf,
+		const style::TextStyle &textStyle,
+		const QString &text,
+		int width) {
+	*leaf = Ui::Text::String(TextMinResizeWidth(width));
+	leaf->setMarkedText(
+		textStyle,
+		TextWithEntities::Simple(text),
+		kIvMarkedTextOptions);
+}
+
+[[nodiscard]] int LeafHeight(
+		const Ui::Text::String &leaf,
+		const style::TextStyle &textStyle,
+		int width) {
+	return std::max(
+		leaf.countHeight(width, true),
+		TextLineHeight(textStyle));
+}
+
+[[nodiscard]] int LeafFirstLineBaseline(
+		const Ui::Text::String &leaf,
+		const QRect &textRect,
+		const style::TextStyle &textStyle) {
+	const auto lines = leaf.countLinesGeometry(textRect.width(), true);
+	return textRect.y() + (lines.empty()
+		? TextLineBaseline(textStyle)
+		: lines.front().baseline);
+}
+
+void PaintTextLeaf(
+		Painter &p,
+		const Ui::Text::String &leaf,
+		const MarkdownArticlePaintContext &context,
+		QRect rect,
+		int width,
+		style::align align = style::al_left) {
+	const auto availableWidth = std::max(width, 1);
+	leaf.draw(p, {
+		.position = rect.topLeft(),
+		.availableWidth = availableWidth,
+		.geometry = TextGeometry(availableWidth),
+		.align = align,
+		.clip = context.clip,
+		.palette = &p.textPalette(),
+		.pre = context.caches.pre,
+		.blockquote = context.caches.blockquote,
+		.colors = context.caches.colors,
+		.spoiler = Ui::Text::DefaultSpoilerCache(),
+		.now = context.now,
+	});
+}
+
+void PaintCardSurface(
+		Painter &p,
+		QRect rect,
+		int border,
+		const style::color &borderFg,
+		const style::color &bg,
+		int radius) {
+	if (rect.isEmpty()) {
+		return;
+	}
+	if (border <= 0) {
+		if (radius > 0) {
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(bg->c);
+			p.drawRoundedRect(rect, radius, radius);
+		} else {
+			p.fillRect(rect, bg->c);
+		}
+		return;
+	}
+	const auto half = border / 2.;
+	const auto inner = QRectF(rect).marginsRemoved({
+		half,
+		half,
+		half,
+		half,
+	});
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(QPen(borderFg->c, border));
+	p.setBrush(bg->c);
+	p.drawRoundedRect(inner, radius, radius);
+}
+
+[[nodiscard]] QString ChannelCopyText(const PreparedChannelBlockData &channel) {
+	return channel.title;
+}
+
+[[nodiscard]] QString GroupedMediaCopyText(
+		const PreparedGroupedMediaBlockData &grouped) {
+	auto photos = 0;
+	auto videos = 0;
+	for (const auto &item : grouped.items) {
+		if (item.media.kind == PreparedMediaItemKind::Photo) {
+			++photos;
+		} else {
+			++videos;
+		}
+	}
+	if (photos && !videos) {
+		return tr::lng_media_selected_photo(tr::now, lt_count, photos);
+	} else if (videos && !photos) {
+		return tr::lng_media_selected_video(tr::now, lt_count, videos);
+	}
+	return QString();
+}
+
+[[nodiscard]] QString GroupedMediaItemCopyText(PreparedMediaItemKind kind) {
+	return (kind == PreparedMediaItemKind::Photo)
+		? u"Photo"_q
+		: tr::lng_in_dlg_video(tr::now);
+}
+
+[[nodiscard]] int GroupedMediaMinWidth(int width, int spacing) {
+	return std::max((width - 2 * spacing) / 3, 1);
+}
+
+[[nodiscard]] int GroupedMediaLayoutWidth(
+		const std::vector<Ui::GroupMediaLayout> &layout) {
+	auto result = 0;
+	for (const auto &part : layout) {
+		result = std::max(
+			result,
+			part.geometry.x() + part.geometry.width());
+	}
+	return result;
+}
+
+[[nodiscard]] int GroupedMediaLayoutHeight(
+		const std::vector<Ui::GroupMediaLayout> &layout) {
+	auto result = 0;
+	for (const auto &part : layout) {
+		result = std::max(
+			result,
+			part.geometry.y() + part.geometry.height());
+	}
+	return result;
+}
+
+[[nodiscard]] QPainterPath RoundedRectPath(QRect rect, int radius) {
+	auto path = QPainterPath();
+	path.addRoundedRect(QRectF(rect), radius, radius);
+	return path;
+}
+
+void PaintRoundButton(
+		Painter &p,
+		QRect rect,
+		const style::color &bg,
+		const style::icon &icon) {
+	if (rect.isEmpty()) {
+		return;
+	}
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(bg->c);
+	p.drawEllipse(rect);
+	icon.paintInCenter(p, rect);
+}
+
+enum class ImageBackedMediaKind {
+	Photo,
+	Video,
+	Map,
+};
+
+struct MapDescriptor {
+	double latitude = 0.;
+	double longitude = 0.;
+	uint64 accessHash = 0;
+	int zoom = 0;
+	QString url;
+};
+
+class ImageBackedMediaBlock final : public MediaBlock {
+public:
+	ImageBackedMediaBlock(
+		const PreparedPhotoBlockData &prepared,
+		std::shared_ptr<MediaRuntime> mediaRuntime);
+
+	ImageBackedMediaBlock(
+		const PreparedVideoBlockData &prepared,
+		std::shared_ptr<MediaRuntime> mediaRuntime);
+
+	ImageBackedMediaBlock(
+		const PreparedMapBlockData &prepared,
+		std::shared_ptr<MediaRuntime> mediaRuntime);
+
+	[[nodiscard]] uint64 stableId() const override;
+
+	[[nodiscard]] int resizeGetHeight(int width) override;
+
+	void setGeometry(QRect geometry) override;
+
+	[[nodiscard]] QRect geometry() const override;
+
+	[[nodiscard]] int firstLineBaseline() const override;
+
+	void paint(
+			Painter &p,
+			const MarkdownArticlePaintContext &context) const override;
+
+	[[nodiscard]] ClickHandlerPtr linkAt(QPoint point) const override;
+
+	[[nodiscard]] MediaActivation activationAt(QPoint point) const override;
+
+	[[nodiscard]] MediaBlockSelectionData selectionData() const override;
+
+private:
+	void ensureResolved(QSize size);
+
+	void ensurePhotoResolved(QSize size);
+
+	void ensureVideoResolved(QSize size);
+
+	void ensureMapResolved(QSize size);
+
+	template <typename Runtime>
+	void resolveImages(
+			const std::shared_ptr<Runtime> &runtime,
+			QSize size);
+
+	void subscribeImage(const std::shared_ptr<Ui::DynamicImage> &image);
+
+	[[nodiscard]] bool loading() const;
+
+	[[nodiscard]] double progress() const;
+
+	const ImageBackedMediaKind _kind;
+	const uint64 _stableId = 0;
+	const QString _copyText;
+	const int _aspectWidth = 0;
+	const int _aspectHeight = 0;
+	const std::shared_ptr<MediaRuntime> _mediaRuntime;
+	const uint64 _photoId = 0;
+	const uint64 _documentId = 0;
+	const QString _url;
+	const bool _viewerOpen = false;
+	const bool _spoiler = false;
+	const MapDescriptor _map;
+
+	QRect _geometry;
+	MediaActivation _activation;
+	std::shared_ptr<PhotoRuntime> _photoRuntime;
+	std::shared_ptr<DocumentRuntime> _documentRuntime;
+	std::shared_ptr<MapRuntime> _mapRuntime;
+	std::shared_ptr<Ui::DynamicImage> _thumbnailImage;
+	std::shared_ptr<Ui::DynamicImage> _fullImage;
+	std::shared_ptr<Ui::DynamicImage> _previousThumbnailImage;
+	std::shared_ptr<Ui::DynamicImage> _previousFullImage;
+	QSize _requestedImageSize;
+	QSize _mapRuntimeSize;
+	bool _photoRuntimeResolved = false;
+	bool _documentRuntimeResolved = false;
+	bool _mapRuntimeResolved = false;
+};
+
+ImageBackedMediaBlock::ImageBackedMediaBlock(
+	const PreparedPhotoBlockData &prepared,
+	std::shared_ptr<MediaRuntime> mediaRuntime)
+: _kind(ImageBackedMediaKind::Photo)
+, _stableId(prepared.id.value)
+, _copyText(u"Photo"_q)
+, _aspectWidth(prepared.width)
+, _aspectHeight(prepared.height)
+, _mediaRuntime(std::move(mediaRuntime))
+, _photoId(prepared.photoId)
+, _url(prepared.urlOverride)
+, _viewerOpen(prepared.viewerOpen)
+, _spoiler(prepared.spoiler) {
+	if (!_url.isEmpty()) {
+		_activation.kind = MediaActivationKind::ExternalUrl;
+		_activation.url = _url;
+	}
+}
+
+ImageBackedMediaBlock::ImageBackedMediaBlock(
+	const PreparedVideoBlockData &prepared,
+	std::shared_ptr<MediaRuntime> mediaRuntime)
+: _kind(ImageBackedMediaKind::Video)
+, _stableId(prepared.id.value)
+, _copyText(tr::lng_in_dlg_video(tr::now))
+, _aspectWidth(prepared.media.width)
+, _aspectHeight(prepared.media.height)
+, _mediaRuntime(std::move(mediaRuntime))
+, _documentId(prepared.media.id)
+, _spoiler(prepared.media.spoiler) {
+}
+
+ImageBackedMediaBlock::ImageBackedMediaBlock(
+	const PreparedMapBlockData &prepared,
+	std::shared_ptr<MediaRuntime> mediaRuntime)
+: _kind(ImageBackedMediaKind::Map)
+, _stableId(prepared.id.value)
+, _copyText(tr::lng_maps_point(tr::now))
+, _aspectWidth(prepared.width)
+, _aspectHeight(prepared.height)
+, _mediaRuntime(std::move(mediaRuntime))
+, _map(MapDescriptor {
+	.latitude = prepared.latitude,
+	.longitude = prepared.longitude,
+	.accessHash = prepared.accessHash,
+	.zoom = prepared.zoom,
+	.url = prepared.url,
+}) {
+	if (!_map.url.isEmpty()) {
+		_activation.kind = MediaActivationKind::ExternalUrl;
+		_activation.url = _map.url;
+	}
+}
+
+uint64 ImageBackedMediaBlock::stableId() const {
+	return _stableId;
+}
+
+int ImageBackedMediaBlock::resizeGetHeight(int width) {
+	return MediaHeightForWidth(width, _aspectWidth, _aspectHeight);
+}
+
+void ImageBackedMediaBlock::setGeometry(QRect geometry) {
+	_geometry = geometry;
+	ensureResolved(geometry.size());
+}
+
+QRect ImageBackedMediaBlock::geometry() const {
+	return _geometry;
+}
+
+int ImageBackedMediaBlock::firstLineBaseline() const {
+	return _geometry.y();
+}
+
+void ImageBackedMediaBlock::paint(
+		Painter &p,
+		const MarkdownArticlePaintContext &context) const {
+	const auto visible = context.clip.intersected(_geometry);
+	if (visible.isEmpty()) {
+		return;
+	}
+	const auto &st = PaintStyle(context, layoutStyle());
+	p.save();
+	p.setClipRect(visible);
+	const auto painted = PaintResolvedImages(
+			p,
+			_geometry,
+			_thumbnailImage,
+			_fullImage,
+			_previousThumbnailImage,
+			_previousFullImage);
+	if (painted && _spoiler) {
+		PaintImageSpoiler(p, _geometry);
+	}
+
+	if (loading()) {
+		PaintPhotoProgress(
+			p,
+			_geometry,
+			st.photo,
+			progress());
+	}
+	p.restore();
+}
+
+ClickHandlerPtr ImageBackedMediaBlock::linkAt(QPoint point) const {
+	Q_UNUSED(point);
+	return nullptr;
+}
+
+MediaActivation ImageBackedMediaBlock::activationAt(
+		QPoint point) const {
+	return _geometry.contains(point) ? _activation : MediaActivation();
+}
+
+MediaBlockSelectionData ImageBackedMediaBlock::selectionData() const {
+	return {
+		.copyText = _copyText,
+	};
+}
+
+void ImageBackedMediaBlock::ensureResolved(QSize size) {
+	if (size.isEmpty()) {
+		return;
+	}
+
+	switch (_kind) {
+	case ImageBackedMediaKind::Photo:
+		ensurePhotoResolved(size);
+		break;
+	case ImageBackedMediaKind::Video:
+		ensureVideoResolved(size);
+		break;
+	case ImageBackedMediaKind::Map:
+		ensureMapResolved(size);
+		break;
+	}
+}
+
+void ImageBackedMediaBlock::ensurePhotoResolved(QSize size) {
+	if (!_photoRuntimeResolved) {
+		_photoRuntimeResolved = true;
+		if (_mediaRuntime) {
+			_photoRuntime = _mediaRuntime->resolvePhoto(_photoId);
+		}
+		if (_url.isEmpty() && _viewerOpen && _photoRuntime) {
+			_activation.kind = MediaActivationKind::Photo;
+			_activation.photo = _photoRuntime;
+		}
+	}
+	resolveImages(_photoRuntime, size);
+}
+
+void ImageBackedMediaBlock::ensureVideoResolved(QSize size) {
+	if (!_documentRuntimeResolved) {
+		_documentRuntimeResolved = true;
+		if (_mediaRuntime) {
+			_documentRuntime = _mediaRuntime->resolveDocument(_documentId);
+		}
+		if (_documentRuntime) {
+			_activation.kind = MediaActivationKind::Document;
+			_activation.document = _documentRuntime;
+		}
+	}
+	resolveImages(_documentRuntime, size);
+}
+
+void ImageBackedMediaBlock::ensureMapResolved(QSize size) {
+	if (!_mapRuntimeResolved || (_mapRuntimeSize != size)) {
+		_mapRuntimeResolved = true;
+		_mapRuntimeSize = size;
+		if (_mediaRuntime) {
+			_mapRuntime = _mediaRuntime->resolveMap(
+				_map.latitude,
+				_map.longitude,
+				_map.accessHash,
+				size,
+				_map.zoom);
+		}
+	}
+	resolveImages(_mapRuntime, size);
+}
+
+template <typename Runtime>
+void ImageBackedMediaBlock::resolveImages(
+		const std::shared_ptr<Runtime> &runtime,
+		QSize size) {
+	RefreshResolvedImages(
+		runtime,
+		size,
+		&_requestedImageSize,
+		&_thumbnailImage,
+		&_previousThumbnailImage,
+		&_fullImage,
+		&_previousFullImage,
+		[&](const std::shared_ptr<Ui::DynamicImage> &image) {
+			subscribeImage(image);
+		});
+}
+
+void ImageBackedMediaBlock::subscribeImage(const std::shared_ptr<Ui::DynamicImage> &image) {
+	if (!image) {
+		return;
+	}
+
+	const auto weak = std::weak_ptr<MediaBlock>(shared_from_this());
+	image->subscribeToUpdates([weak] {
+		if (const auto block = weak.lock()) {
+			if (const auto host = block->host()) {
+				host->requestRepaint(block->geometry());
+			}
+		}
+	});
+}
+
+bool ImageBackedMediaBlock::loading() const {
+	if (_photoRuntime) {
+		return _photoRuntime->loading();
+	} else if (_documentRuntime) {
+		return _documentRuntime->loading();
+	} else if (_mapRuntime) {
+		return _mapRuntime->loading();
+	}
+	return false;
+}
+
+double ImageBackedMediaBlock::progress() const {
+	if (_photoRuntime) {
+		return _photoRuntime->progress();
+	} else if (_documentRuntime) {
+		return _documentRuntime->progress();
+	} else if (_mapRuntime) {
+		return _mapRuntime->progress();
+	}
+	return 0.;
+}
+
+class ChannelMediaBlock final : public MediaBlock {
+public:
+	ChannelMediaBlock(
+		const PreparedChannelBlockData &prepared,
+		std::shared_ptr<MediaRuntime> mediaRuntime);
+
+	[[nodiscard]] uint64 stableId() const override;
+
+	[[nodiscard]] int resizeGetHeight(int width) override;
+
+	void setGeometry(QRect geometry) override;
+
+	[[nodiscard]] QRect geometry() const override;
+
+	[[nodiscard]] int firstLineBaseline() const override;
+
+	void paint(
+			Painter &p,
+			const MarkdownArticlePaintContext &context) const override;
+
+	[[nodiscard]] ClickHandlerPtr linkAt(QPoint point) const override;
+
+	[[nodiscard]] MediaActivation activationAt(QPoint point) const override;
+
+	[[nodiscard]] MediaBlockSelectionData selectionData() const override;
+
+private:
+	void resolveChannel();
+
+	void rebuildLayout(int width);
+
+	void applyGeometry();
+
+	void handleJoinedChange();
+
+	const uint64 _stableId = 0;
+	const uint64 _channelId = 0;
+	const QString _titleText;
+	const QString _copyText;
+	const QString _username;
+	const std::shared_ptr<MediaRuntime> _mediaRuntime;
+	std::shared_ptr<ChannelRuntime> _channelRuntime;
+	MediaActivation _openActivation;
+	MediaActivation _joinActivation;
+	QRect _geometry;
+	Ui::Text::String _titleLeaf;
+	QString _actionText;
+	ClickHandlerPtr _joinLink;
+	QRect _titleRect;
+	QRect _actionRect;
+	rpl::lifetime _joinedChangesLifetime;
+	int _layoutWidth = 1;
+	int _height = 1;
+	int _titleWidth = 1;
+	int _actionWidth = 0;
+	int _actionOuterWidth = 0;
+	int _actionOuterHeight = 0;
+	int _textHeight = 0;
+	int _cardContentHeight = 0;
+	int _firstLineBaseline = 0;
+	bool _joinVisible = false;
+	bool _channelResolved = false;
+};
+
+ChannelMediaBlock::ChannelMediaBlock(
+	const PreparedChannelBlockData &prepared,
+	std::shared_ptr<MediaRuntime> mediaRuntime)
+: _stableId(prepared.id.value)
+, _channelId(prepared.channelId)
+, _titleText(prepared.title)
+, _copyText(ChannelCopyText(prepared))
+, _username(prepared.username)
+, _mediaRuntime(std::move(mediaRuntime)) {
+	resolveChannel();
+	if (_mediaRuntime) {
+		_mediaRuntime->channelJoinedChanges() | rpl::on_next([=](uint64 id) {
+			if (id == _channelId) {
+				handleJoinedChange();
+			}
+		}, _joinedChangesLifetime);
+	}
+}
+
+uint64 ChannelMediaBlock::stableId() const {
+	return _stableId;
+}
+
+int ChannelMediaBlock::resizeGetHeight(int width) {
+	rebuildLayout(width);
+	return _height;
+}
+
+void ChannelMediaBlock::setGeometry(QRect geometry) {
+	if (_layoutWidth != std::max(geometry.width(), 1)) {
+		rebuildLayout(geometry.width());
+	}
+	_geometry = QRect(
+		geometry.topLeft(),
+		QSize(_layoutWidth, _height));
+	applyGeometry();
+}
+
+QRect ChannelMediaBlock::geometry() const {
+	return _geometry;
+}
+
+int ChannelMediaBlock::firstLineBaseline() const {
+	return _firstLineBaseline;
+}
+
+void ChannelMediaBlock::paint(
+		Painter &p,
+		const MarkdownArticlePaintContext &context) const {
+	const auto visible = context.clip.intersected(_geometry);
+	if (visible.isEmpty()) {
+		return;
+	}
+	const auto visibleContext = ClippedContext(context, visible);
+	const auto &layout = layoutStyle().channel;
+	const auto &paint = PaintStyle(context, layoutStyle()).channel;
+	const auto &buttonLayout = layout.button;
+	const auto &buttonPaint = paint.button;
+	p.save();
+	p.setClipRect(visible);
+	PaintCardSurface(
+		p,
+		_geometry,
+		layout.border,
+		paint.borderFg,
+		paint.bg,
+		layout.radius);
+	p.setPen(paint.titleFg->c);
+	PaintTextLeaf(
+		p,
+		_titleLeaf,
+		visibleContext,
+		_titleRect,
+		_titleWidth);
+	if (_joinVisible && !_actionRect.isEmpty()) {
+		const auto innerRect = _actionRect.marginsRemoved(buttonLayout.padding);
+		PaintCardSurface(
+			p,
+			_actionRect,
+			buttonLayout.border,
+			buttonPaint.borderFg,
+			buttonPaint.bg,
+			buttonLayout.radius);
+		p.setPen(buttonPaint.textFg->c);
+		p.setFont((ClickHandler::showAsActive(_joinLink)
+			|| ClickHandler::showAsPressed(_joinLink))
+			? buttonLayout.textStyle.font->underline()
+			: buttonLayout.textStyle.font);
+		p.drawText(innerRect, Qt::AlignCenter, _actionText);
+	}
+	p.restore();
+}
+
+ClickHandlerPtr ChannelMediaBlock::linkAt(QPoint point) const {
+	if (_joinVisible
+		&& _joinLink
+		&& !_actionRect.isEmpty()
+		&& _actionRect.contains(point)) {
+		return _joinLink;
+	}
+	return nullptr;
+}
+
+MediaActivation ChannelMediaBlock::activationAt(QPoint point) const {
+	if (!_geometry.contains(point)) {
+		return {};
+	}
+	if (_joinVisible && !_actionRect.isEmpty() && _actionRect.contains(point)) {
+		return _joinActivation;
+	}
+	return _openActivation;
+}
+
+MediaBlockSelectionData ChannelMediaBlock::selectionData() const {
+	return {
+		.copyText = _copyText,
+	};
+}
+
+void ChannelMediaBlock::resolveChannel() {
+	if (_channelResolved) {
+		return;
+	}
+	_channelResolved = true;
+	if (_mediaRuntime) {
+		_channelRuntime = _mediaRuntime->resolveChannel(_channelId, _username);
+	}
+	_openActivation = {};
+	_joinActivation = {};
+	_joinLink = nullptr;
+	if (_channelRuntime) {
+		_openActivation.kind = MediaActivationKind::OpenChannel;
+		_openActivation.channel = _channelRuntime;
+	}
+}
+
+void ChannelMediaBlock::rebuildLayout(int width) {
+	resolveChannel();
+	const auto &card = layoutStyle().channel;
+	const auto &padding = card.padding;
+	const auto &button = card.button;
+	const auto &buttonPadding = button.padding;
+	const auto &titleStyle = card.titleStyle;
+	const auto &actionStyle = button.textStyle;
+	_layoutWidth = std::max(width, 1);
+	_joinVisible = _channelRuntime && _channelRuntime->joinVisible();
+	if (_joinVisible && _channelRuntime) {
+		_joinActivation.kind = MediaActivationKind::JoinChannel;
+		_joinActivation.channel = _channelRuntime;
+		if (!_joinLink) {
+			_joinLink = std::make_shared<LambdaClickHandler>(
+				[runtime = _channelRuntime](ClickContext context) {
+					runtime->join(context.button);
+				});
+		}
+	} else {
+		_joinActivation = {};
+		_joinLink = nullptr;
+	}
+
+	auto actionTextHeight = 0;
+	auto actionOuterWidth = 0;
+	auto actionOuterHeight = 0;
+	if (_joinVisible) {
+		_actionText = tr::lng_iv_join_channel(tr::now);
+		_actionWidth = std::max(actionStyle.font->width(_actionText), 1);
+		actionTextHeight = TextLineHeight(actionStyle);
+		actionOuterWidth = _actionWidth
+			+ buttonPadding.left()
+			+ buttonPadding.right();
+		actionOuterHeight = actionTextHeight
+			+ buttonPadding.top()
+			+ buttonPadding.bottom();
+	} else {
+		_actionText = QString();
+		_actionWidth = 0;
+	}
+
+	_titleWidth = std::max(
+		_layoutWidth
+			- padding.left()
+			- (_joinVisible
+				? (actionOuterWidth + card.buttonSkip)
+				: padding.right()),
+		1);
+	SetPlainTextLeaf(
+		&_titleLeaf,
+		titleStyle,
+		_titleText,
+		_titleWidth);
+	const auto titleHeight = LeafHeight(
+		_titleLeaf,
+		titleStyle,
+		_titleWidth);
+
+	_textHeight = titleHeight;
+	_actionOuterWidth = actionOuterWidth;
+	_actionOuterHeight = actionOuterHeight;
+	_cardContentHeight = std::max(_textHeight, _actionOuterHeight);
+	_height = padding.top() + _cardContentHeight + padding.bottom();
+}
+
+void ChannelMediaBlock::applyGeometry() {
+	const auto &card = layoutStyle().channel;
+	const auto &padding = card.padding;
+	const auto &titleStyle = card.titleStyle;
+	const auto contentLeft = _geometry.x() + padding.left();
+	const auto textTop = _geometry.y() + padding.top()
+		+ std::max((_cardContentHeight - _textHeight) / 2, 0);
+	const auto titleHeight = LeafHeight(
+		_titleLeaf,
+		titleStyle,
+		_titleWidth);
+	_titleRect = QRect(
+		contentLeft,
+		textTop,
+		_titleWidth,
+		titleHeight);
+	_firstLineBaseline = LeafFirstLineBaseline(
+		_titleLeaf,
+		_titleRect,
+		titleStyle);
+	if (_joinVisible && _actionOuterWidth > 0 && _actionOuterHeight > 0) {
+		_actionRect = QRect(
+			_geometry.x() + _layoutWidth - _actionOuterWidth,
+			_geometry.y(),
+			_actionOuterWidth,
+			_height);
+	} else {
+		_actionRect = QRect();
+	}
+}
+
+void ChannelMediaBlock::handleJoinedChange() {
+	if (_geometry.width() <= 0 && _layoutWidth <= 0) {
+		_channelResolved = false;
+		resolveChannel();
+		return;
+	}
+	const auto previousGeometry = _geometry;
+	const auto previousTitleRect = _titleRect;
+	const auto previousActionRect = _actionRect;
+	const auto previousHeight = _height;
+	const auto previousJoinVisible = _joinVisible;
+	_channelResolved = false;
+	resolveChannel();
+	rebuildLayout((_geometry.width() > 0) ? _geometry.width() : _layoutWidth);
+	if (_geometry.width() > 0) {
+		_geometry = QRect(
+			previousGeometry.topLeft(),
+			QSize(_layoutWidth, _height));
+		applyGeometry();
+	}
+	if (_height != previousHeight) {
+		requestRelayout(QRect());
+	} else if (_joinVisible != previousJoinVisible
+		|| _titleRect != previousTitleRect
+		|| _actionRect != previousActionRect) {
+		requestRepaint(previousGeometry);
+	}
+}
+
+class GroupedMediaBlock final : public MediaBlock {
+public:
+	GroupedMediaBlock(
+		const PreparedGroupedMediaBlockData &prepared,
+		std::shared_ptr<MediaRuntime> mediaRuntime);
+
+	[[nodiscard]] uint64 stableId() const override;
+
+	[[nodiscard]] int resizeGetHeight(int width) override;
+
+	void setGeometry(QRect geometry) override;
+
+	[[nodiscard]] QRect geometry() const override;
+
+	[[nodiscard]] int firstLineBaseline() const override;
+
+	void paint(
+			Painter &p,
+			const MarkdownArticlePaintContext &context) const override;
+
+	[[nodiscard]] ClickHandlerPtr linkAt(QPoint point) const override;
+
+	[[nodiscard]] MediaActivation activationAt(QPoint point) const override;
+
+	[[nodiscard]] MediaBlockSelectionData selectionData() const override;
+
+private:
+	struct ItemState {
+		PreparedMediaItemKind kind = PreparedMediaItemKind::Photo;
+		uint64 id = 0;
+		QSize original;
+		QString copyText;
+		QRect relativeRect;
+		QRect rect;
+		MediaActivation activation;
+		std::shared_ptr<PhotoRuntime> photoRuntime;
+		std::shared_ptr<DocumentRuntime> documentRuntime;
+		std::shared_ptr<Ui::DynamicImage> thumbnailImage;
+		std::shared_ptr<Ui::DynamicImage> fullImage;
+		std::shared_ptr<Ui::DynamicImage> previousThumbnailImage;
+		std::shared_ptr<Ui::DynamicImage> previousFullImage;
+		QSize requestedSize;
+		bool spoiler = false;
+		bool runtimeResolved = false;
+	};
+
+	void rebuildLayout(int width);
+
+	void clearCollageLayout();
+
+	[[nodiscard]] int fallbackHeight(int width) const;
+
+	void applyGeometry();
+
+	void resolveRuntime(ItemState &item);
+
+	void resolveImages(ItemState &item);
+
+	void subscribeImage(
+			const std::shared_ptr<Ui::DynamicImage> &image,
+			const ItemState *item);
+
+	void handleImageUpdate(int index);
+
+	void paintItem(
+		Painter &p,
+		const ItemState &item,
+		const style::Markdown &st) const;
+
+	[[nodiscard]] bool itemLoading(const ItemState &item) const;
+
+	[[nodiscard]] double itemProgress(const ItemState &item) const;
+
+	void paintActiveItem(Painter &p, const style::Markdown &st) const;
+
+	[[nodiscard]] bool paintActiveItemWithBlurredBackground(
+		Painter &p,
+		const ItemState &item) const;
+
+	void paintNavigation(
+		Painter &p,
+		const style::Markdown &st) const;
+
+	void ensureNavigationLinks();
+
+	void updateNavigationRects();
+
+	void stepActiveIndex(int delta);
+
+	[[nodiscard]] int activeItemForegroundHeight(int width) const;
+
+	[[nodiscard]] int activeItemHeight(int width) const;
+
+	[[nodiscard]] int slideshowNavigationFrameHeight(int width) const;
+
+	[[nodiscard]] ItemState *activeItem();
+
+	[[nodiscard]] const ItemState *activeItem() const;
+
+	const uint64 _stableId = 0;
+	const PreparedGroupedMediaIntent _intent = PreparedGroupedMediaIntent::Collage;
+	const QString _copyText;
+	const QSize _fallbackSize;
+	const std::shared_ptr<MediaRuntime> _mediaRuntime;
+	std::vector<ItemState> _items;
+	QRect _geometry;
+	QRect _previousRect;
+	QRect _nextRect;
+	ClickHandlerPtr _previousLink;
+	ClickHandlerPtr _nextLink;
+	int _layoutWidth = 1;
+	int _contentWidth = 1;
+	int _height = 1;
+	int _activeIndex = 0;
+	bool _useCollageLayout = false;
+};
+
+GroupedMediaBlock::GroupedMediaBlock(
+	const PreparedGroupedMediaBlockData &prepared,
+	std::shared_ptr<MediaRuntime> mediaRuntime)
+: _stableId(prepared.id.value)
+, _intent(prepared.intent)
+, _copyText(GroupedMediaCopyText(prepared))
+, _fallbackSize(prepared.items.empty()
+	? QSize()
+	: QSize(
+		std::max(prepared.items.front().media.width, 1),
+		std::max(prepared.items.front().media.height, 1)))
+, _mediaRuntime(std::move(mediaRuntime)) {
+	_items.reserve(prepared.items.size());
+	for (const auto &item : prepared.items) {
+		auto state = ItemState();
+		state.kind = item.media.kind;
+		state.id = item.media.id;
+		state.original = QSize(
+			std::max(item.media.width, 1),
+			std::max(item.media.height, 1));
+		state.copyText = GroupedMediaItemCopyText(item.media.kind);
+		state.spoiler = item.media.spoiler;
+		_items.push_back(std::move(state));
+	}
+}
+
+uint64 GroupedMediaBlock::stableId() const {
+	return _stableId;
+}
+
+int GroupedMediaBlock::resizeGetHeight(int width) {
+	rebuildLayout(width);
+	return _height;
+}
+
+void GroupedMediaBlock::setGeometry(QRect geometry) {
+	rebuildLayout(geometry.width());
+	const auto contentWidth = std::max(_contentWidth, 1);
+	_height = std::max(_height, 1);
+	_geometry = QRect(
+		geometry.topLeft()
+			+ QPoint(
+				std::max((geometry.width() - contentWidth) / 2, 0),
+				0),
+		QSize(contentWidth, _height));
+	ensureNavigationLinks();
+	applyGeometry();
+}
+
+QRect GroupedMediaBlock::geometry() const {
+	return _geometry;
+}
+
+int GroupedMediaBlock::firstLineBaseline() const {
+	return _geometry.y();
+}
+
+void GroupedMediaBlock::paint(
+		Painter &p,
+		const MarkdownArticlePaintContext &context) const {
+	const auto visible = context.clip.intersected(_geometry);
+	if (visible.isEmpty()) {
+		return;
+	}
+	const auto &layout = layoutStyle();
+	const auto &st = PaintStyle(context, layout);
+	const auto &layoutGrouped = layout.groupedMedia;
+	p.save();
+	p.setClipRect(visible);
+	const auto path = RoundedRectPath(_geometry, layoutGrouped.radius);
+	p.setClipPath(path, Qt::IntersectClip);
+	if (_intent == PreparedGroupedMediaIntent::Slideshow) {
+		paintActiveItem(p, st);
+		paintNavigation(p, st);
+	} else if (_useCollageLayout) {
+		for (const auto &item : _items) {
+			paintItem(p, item, st);
+		}
+	}
+	p.restore();
+}
+
+ClickHandlerPtr GroupedMediaBlock::linkAt(QPoint point) const {
+	if (_intent == PreparedGroupedMediaIntent::Slideshow) {
+		if (_previousRect.contains(point)) {
+			return _previousLink;
+		} else if (_nextRect.contains(point)) {
+			return _nextLink;
+		}
+	}
+	return nullptr;
+}
+
+MediaActivation GroupedMediaBlock::activationAt(QPoint point) const {
+	if (!_geometry.contains(point)) {
+		return {};
+	} else if (_intent == PreparedGroupedMediaIntent::Slideshow) {
+		if (_previousRect.contains(point) || _nextRect.contains(point)) {
+			return {};
+		}
+		if (const auto item = activeItem()) {
+			return item->activation;
+		}
+		return {};
+	} else if (!_useCollageLayout) {
+		return {};
+	}
+	for (const auto &item : _items) {
+		if (item.rect.contains(point)) {
+			return item.activation;
+		}
+	}
+	return {};
+}
+
+MediaBlockSelectionData GroupedMediaBlock::selectionData() const {
+	return {
+		.copyText = _copyText,
+	};
+}
+
+void GroupedMediaBlock::rebuildLayout(int width) {
+	_layoutWidth = std::max(width, 1);
+	_contentWidth = _layoutWidth;
+	_height = (_intent == PreparedGroupedMediaIntent::Slideshow)
+		? activeItemHeight(_layoutWidth)
+		: fallbackHeight(_layoutWidth);
+	_useCollageLayout = false;
+	for (auto &item : _items) {
+		item.relativeRect = QRect();
+	}
+	if (_items.empty()) {
+		return;
+	} else if (_intent == PreparedGroupedMediaIntent::Slideshow) {
+		return;
+	} else if (_intent != PreparedGroupedMediaIntent::Collage) {
+		return;
+	}
+
+	const auto spacing = layoutStyle().groupedMedia.itemSkip;
+	auto top = 0;
+	auto maxWidth = 0;
+	auto index = 0;
+	const auto count = int(_items.size());
+	while (index != count) {
+		const auto batchCount = std::min(
+			count - index,
+			kMaxGroupedMediaLayoutItems);
+		auto sizes = std::vector<QSize>();
+		sizes.reserve(batchCount);
+		for (auto i = 0; i != batchCount; ++i) {
+			sizes.push_back(_items[index + i].original);
+		}
+		const auto layout = Ui::LayoutMediaGroup(
+			sizes,
+			_layoutWidth,
+			GroupedMediaMinWidth(_layoutWidth, spacing),
+			spacing);
+		if (int(layout.size()) != batchCount) {
+			clearCollageLayout();
+			return;
+		}
+		for (auto i = 0; i != batchCount; ++i) {
+			_items[index + i].relativeRect = layout[i].geometry.translated(0, top);
+		}
+		maxWidth = std::max(maxWidth, GroupedMediaLayoutWidth(layout));
+		top += GroupedMediaLayoutHeight(layout);
+		index += batchCount;
+		if (index != count) {
+			top += spacing;
+		}
+	}
+	_contentWidth = std::max(maxWidth, 1);
+	_height = std::max(top, 1);
+	_useCollageLayout = true;
+}
+
+void GroupedMediaBlock::clearCollageLayout() {
+	_contentWidth = _layoutWidth;
+	_height = fallbackHeight(_layoutWidth);
+	_useCollageLayout = false;
+	for (auto &item : _items) {
+		item.relativeRect = QRect();
+		item.rect = QRect();
+	}
+}
+
+int GroupedMediaBlock::fallbackHeight(int width) const {
+	if (_fallbackSize.isEmpty()) {
+		return std::max(layoutStyle().placeholder.minHeight, 1);
+	}
+	return MediaHeightForWidth(
+		width,
+		_fallbackSize.width(),
+		_fallbackSize.height());
+}
+
+void GroupedMediaBlock::applyGeometry() {
+	_previousRect = QRect();
+	_nextRect = QRect();
+	if (_intent == PreparedGroupedMediaIntent::Slideshow) {
+		for (auto &item : _items) {
+			item.rect = QRect();
+		}
+		if (auto item = activeItem()) {
+			item->rect = _geometry;
+			resolveRuntime(*item);
+			resolveImages(*item);
+		}
+		updateNavigationRects();
+		return;
+	} else if (!_useCollageLayout) {
+		for (auto &item : _items) {
+			item.rect = QRect();
+		}
+		return;
+	}
+	for (auto &item : _items) {
+		item.rect = item.relativeRect.isEmpty()
+			? QRect()
+			: item.relativeRect.translated(_geometry.topLeft());
+		resolveRuntime(item);
+		resolveImages(item);
+	}
+}
+
+void GroupedMediaBlock::resolveRuntime(ItemState &item) {
+	if (item.runtimeResolved) {
+		return;
+	}
+	item.runtimeResolved = true;
+	if (item.kind == PreparedMediaItemKind::Photo) {
+		if (_mediaRuntime) {
+			item.photoRuntime = _mediaRuntime->resolvePhoto(item.id);
+		}
+		if (item.photoRuntime) {
+			item.activation.kind = MediaActivationKind::Photo;
+			item.activation.photo = item.photoRuntime;
+		}
+	} else {
+		if (_mediaRuntime) {
+			item.documentRuntime = _mediaRuntime->resolveDocument(item.id);
+		}
+		if (item.documentRuntime) {
+			item.activation.kind = MediaActivationKind::Document;
+			item.activation.document = item.documentRuntime;
+		}
+	}
+}
+
+void GroupedMediaBlock::resolveImages(ItemState &item) {
+	if (item.rect.isEmpty()) {
+		return;
+	}
+	if (item.photoRuntime) {
+		RefreshResolvedImages(
+			item.photoRuntime,
+			item.rect.size(),
+			&item.requestedSize,
+			&item.thumbnailImage,
+			&item.previousThumbnailImage,
+			&item.fullImage,
+			&item.previousFullImage,
+			[&](const std::shared_ptr<Ui::DynamicImage> &image) {
+				subscribeImage(image, &item);
+			});
+	} else if (item.documentRuntime) {
+		RefreshResolvedImages(
+			item.documentRuntime,
+			item.rect.size(),
+			&item.requestedSize,
+			&item.thumbnailImage,
+			&item.previousThumbnailImage,
+			&item.fullImage,
+			&item.previousFullImage,
+			[&](const std::shared_ptr<Ui::DynamicImage> &image) {
+				subscribeImage(image, &item);
+			});
+	}
+}
+
+void GroupedMediaBlock::subscribeImage(
+		const std::shared_ptr<Ui::DynamicImage> &image,
+		const ItemState *item) {
+	if (!image || !item) {
+		return;
+	}
+	const auto index = int(item - _items.data());
+	const auto weak = std::weak_ptr<GroupedMediaBlock>(
+		std::static_pointer_cast<GroupedMediaBlock>(shared_from_this()));
+	image->subscribeToUpdates([weak, index] {
+		if (const auto block = weak.lock()) {
+			block->handleImageUpdate(index);
+		}
+	});
+}
+
+void GroupedMediaBlock::handleImageUpdate(int index) {
+	if (index < 0 || index >= int(_items.size())) {
+		return;
+	} else if (_intent == PreparedGroupedMediaIntent::Slideshow) {
+		if (index == _activeIndex) {
+			requestRepaint(_geometry);
+		}
+		return;
+	}
+	requestRepaint(_items[index].rect);
+}
+
+void GroupedMediaBlock::paintItem(
+		Painter &p,
+		const ItemState &item,
+		const style::Markdown &st) const {
+	if (item.rect.isEmpty()) {
+		return;
+	}
+	const auto painted = PaintResolvedImages(
+			p,
+			item.rect,
+			item.thumbnailImage,
+			item.fullImage,
+			item.previousThumbnailImage,
+			item.previousFullImage);
+	if (painted && item.spoiler) {
+		PaintImageSpoiler(p, item.rect);
+	}
+	if (itemLoading(item)) {
+		PaintPhotoProgress(
+			p,
+			item.rect,
+			st.photo,
+			itemProgress(item));
+	}
+}
+
+bool GroupedMediaBlock::itemLoading(const ItemState &item) const {
+	if (item.photoRuntime) {
+		return item.photoRuntime->loading();
+	} else if (item.documentRuntime) {
+		return item.documentRuntime->loading();
+	}
+	return false;
+}
+
+double GroupedMediaBlock::itemProgress(const ItemState &item) const {
+	if (item.photoRuntime) {
+		return item.photoRuntime->progress();
+	} else if (item.documentRuntime) {
+		return item.documentRuntime->progress();
+	}
+	return 0.;
+}
+
+void GroupedMediaBlock::paintActiveItem(
+		Painter &p,
+		const style::Markdown &st) const {
+	const auto item = activeItem();
+	if (!item) {
+		return;
+	}
+	const auto foregroundHeight = activeItemForegroundHeight(_geometry.width());
+	const auto painted = (foregroundHeight < _geometry.height())
+		? paintActiveItemWithBlurredBackground(p, *item)
+		: PaintResolvedImages(
+			p,
+			_geometry,
+			item->thumbnailImage,
+			item->fullImage,
+			item->previousThumbnailImage,
+			item->previousFullImage);
+	if (painted && item->spoiler) {
+		PaintImageSpoiler(p, _geometry);
+	}
+	if (itemLoading(*item)) {
+		PaintPhotoProgress(
+			p,
+			_geometry,
+			st.photo,
+			itemProgress(*item));
+	}
+}
+
+bool GroupedMediaBlock::paintActiveItemWithBlurredBackground(
+		Painter &p,
+		const ItemState &item) const {
+	const auto foregroundHeight = std::clamp(
+		activeItemForegroundHeight(_geometry.width()),
+		1,
+		std::max(_geometry.height(), 1));
+	if (foregroundHeight >= _geometry.height()) {
+		return false;
+	}
+	const auto size = std::max(_geometry.width(), _geometry.height());
+	auto large = ResolvedImageFrame(
+		item.fullImage,
+		item.previousFullImage,
+		size);
+	if (large.isNull()) {
+		large = ResolvedImageFrame(
+			item.thumbnailImage,
+			item.previousThumbnailImage,
+			size);
+	}
+	if (large.isNull()) {
+		return false;
+	}
+	auto blurred = ResolvedImageFrame(
+		item.thumbnailImage,
+		item.previousThumbnailImage,
+		size);
+	if (blurred.isNull()) {
+		blurred = large;
+	}
+	const auto prepared = PrepareWithBlurredBackground(
+		_geometry.size(),
+		QSize(_geometry.width(), foregroundHeight),
+		std::move(large),
+		std::move(blurred));
+	if (prepared.isNull()) {
+		return false;
+	}
+	p.drawImage(_geometry.topLeft(), prepared);
+	return true;
+}
+
+void GroupedMediaBlock::paintNavigation(
+		Painter &p,
+		const style::Markdown &st) const {
+	if ((_intent != PreparedGroupedMediaIntent::Slideshow)
+		|| (_items.size() < 2)) {
+		return;
+	}
+	const auto &style = st.groupedMedia;
+	if (!_previousRect.isEmpty()) {
+		const auto active = ClickHandler::showAsActive(_previousLink)
+			|| ClickHandler::showAsPressed(_previousLink);
+		PaintRoundButton(
+			p,
+			_previousRect,
+			active ? style.navButtonBgOver : style.navButtonBg,
+			active ? style.navPreviousIconOver : style.navPreviousIcon);
+	}
+	if (!_nextRect.isEmpty()) {
+		const auto active = ClickHandler::showAsActive(_nextLink)
+			|| ClickHandler::showAsPressed(_nextLink);
+		PaintRoundButton(
+			p,
+			_nextRect,
+			active ? style.navButtonBgOver : style.navButtonBg,
+			active ? style.navNextIconOver : style.navNextIcon);
+	}
+}
+
+void GroupedMediaBlock::ensureNavigationLinks() {
+	if ((_intent != PreparedGroupedMediaIntent::Slideshow)
+		|| (_items.size() < 2)
+		|| (_previousLink && _nextLink)) {
+		return;
+	}
+	const auto weak = std::weak_ptr<GroupedMediaBlock>(
+		std::static_pointer_cast<GroupedMediaBlock>(shared_from_this()));
+	_previousLink = std::make_shared<LambdaClickHandler>([weak] {
+		if (const auto block = weak.lock()) {
+			block->stepActiveIndex(-1);
+		}
+	});
+	_nextLink = std::make_shared<LambdaClickHandler>([weak] {
+		if (const auto block = weak.lock()) {
+			block->stepActiveIndex(1);
+		}
+	});
+}
+
+void GroupedMediaBlock::updateNavigationRects() {
+	if ((_intent != PreparedGroupedMediaIntent::Slideshow)
+		|| (_items.size() < 2)
+		|| _geometry.isEmpty()) {
+		return;
+	}
+	const auto &style = layoutStyle().groupedMedia;
+	const auto frameHeight = slideshowNavigationFrameHeight(_geometry.width());
+	const auto availableWidth = std::max(
+		(_geometry.width() - 2 * style.navButtonSkip) / 2,
+		0);
+	const auto size = std::min({
+		style.navButtonSize,
+		std::max(frameHeight, 0),
+		availableWidth,
+	});
+	if (size <= 0) {
+		return;
+	}
+	const auto top = _geometry.y() + std::max((frameHeight - size) / 2, 0);
+	_previousRect = QRect(
+		_geometry.x() + style.navButtonSkip,
+		top,
+		size,
+		size);
+	_nextRect = QRect(
+		_geometry.x() + _geometry.width() - style.navButtonSkip - size,
+		top,
+		size,
+		size);
+}
+
+void GroupedMediaBlock::stepActiveIndex(int delta) {
+	if ((_intent != PreparedGroupedMediaIntent::Slideshow)
+		|| (_items.size() < 2)) {
+		return;
+	}
+	const auto count = int(_items.size());
+	const auto next = (int(_activeIndex) + delta % count + count) % count;
+	if (next == _activeIndex) {
+		return;
+	}
+	const auto width = std::max(
+		(_geometry.width() > 0) ? _geometry.width() : _layoutWidth,
+		1);
+	const auto previousGeometry = _geometry;
+	const auto previousHeight = activeItemHeight(width);
+	_activeIndex = next;
+	const auto nextHeight = activeItemHeight(width);
+	_height = nextHeight;
+	if (_geometry.isEmpty()) {
+		return;
+	} else if (previousHeight != nextHeight) {
+		_geometry = QRect(
+			previousGeometry.topLeft(),
+			QSize(previousGeometry.width(), nextHeight));
+		applyGeometry();
+		requestRelayout(QRect());
+		return;
+	}
+	applyGeometry();
+	requestRepaint(previousGeometry.united(_geometry));
+}
+
+int GroupedMediaBlock::activeItemForegroundHeight(int width) const {
+	if (const auto item = activeItem()) {
+		return MediaHeightForWidth(
+			width,
+			item->original.width(),
+			item->original.height());
+	}
+	return fallbackHeight(width);
+}
+
+int GroupedMediaBlock::activeItemHeight(int width) const {
+	return std::max(
+		activeItemForegroundHeight(width),
+		std::max(layoutStyle().groupedMedia.slideshowMinHeight, 1));
+}
+
+int GroupedMediaBlock::slideshowNavigationFrameHeight(int width) const {
+	auto result = std::numeric_limits<int>::max();
+	for (const auto &item : _items) {
+		result = std::min(
+			result,
+			MediaHeightForWidth(
+				width,
+				item.original.width(),
+				item.original.height()));
+	}
+	if (result == std::numeric_limits<int>::max()) {
+		result = fallbackHeight(width);
+	}
+	return std::max(
+		result,
+		std::max(layoutStyle().groupedMedia.slideshowMinHeight, 1));
+}
+
+GroupedMediaBlock::ItemState *GroupedMediaBlock::activeItem() {
+	return (_activeIndex >= 0 && _activeIndex < int(_items.size()))
+		? &_items[_activeIndex]
+		: nullptr;
+}
+
+const GroupedMediaBlock::ItemState *GroupedMediaBlock::activeItem() const {
+	return (_activeIndex >= 0 && _activeIndex < int(_items.size()))
+		? &_items[_activeIndex]
+		: nullptr;
+}
+
+} // namespace
+
+MediaBlock::~MediaBlock() = default;
+
+void MediaBlock::setHost(MediaBlockHost *host) {
+	if (_host == host) {
+		return;
+	}
+	_host = host;
+	hostUpdated();
+}
+
+MediaBlockHost *MediaBlock::host() const {
+	return _host;
+}
+
+bool MediaBlock::hasHeavyPart() const {
+	return false;
+}
+
+void MediaBlock::unloadHeavyPart() {
+}
+
+void MediaBlock::hideSpoilers() {
+}
+
+void MediaBlock::setLayoutStyle(const style::Markdown &st) {
+	if (_st == &st) {
+		return;
+	}
+	_st = &st;
+	layoutStyleUpdated();
+}
+
+const style::Markdown &MediaBlock::layoutStyle() const {
+	return *_st;
+}
+
+void MediaBlock::requestRepaint(QRect articleRect) const {
+	if (_host) {
+		_host->requestRepaint(articleRect);
+	}
+}
+
+void MediaBlock::requestRelayout(QRect articleRect) const {
+	if (_host) {
+		_host->requestRelayout(articleRect);
+	}
+}
+
+void MediaBlock::layoutStyleUpdated() {
+}
+
+void MediaBlock::hostUpdated() {
+}
+
+std::shared_ptr<MediaBlock> CreatePhotoMediaBlock(
+		const PreparedPhotoBlockData &prepared,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st) {
+	if (mediaRuntime
+		&& prepared.viewerOpen
+		&& prepared.urlOverride.isEmpty()) {
+		mediaRuntime->registerPhoto(prepared.photoId, prepared.caption);
+		if (const auto hosted = mediaRuntime->hostedMediaBlockFactory()) {
+			if (const auto block = hosted->createPhoto(prepared)) {
+				block->setLayoutStyle(st);
+				return block;
+			}
+		}
+	}
+	auto result = std::make_shared<ImageBackedMediaBlock>(prepared, mediaRuntime);
+	result->setLayoutStyle(st);
+	return result;
+}
+
+std::shared_ptr<MediaBlock> CreateVideoMediaBlock(
+		const PreparedVideoBlockData &prepared,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st) {
+	if (mediaRuntime) {
+		mediaRuntime->registerDocument(prepared.media.id, prepared.caption);
+		if (const auto hosted = mediaRuntime->hostedMediaBlockFactory()) {
+			if (const auto block = hosted->createVideo(prepared)) {
+				block->setLayoutStyle(st);
+				return block;
+			}
+		}
+	}
+	auto result = std::make_shared<ImageBackedMediaBlock>(prepared, mediaRuntime);
+	result->setLayoutStyle(st);
+	return result;
+}
+
+std::shared_ptr<MediaBlock> CreateAudioMediaBlock(
+		const PreparedAudioBlockData &prepared,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st) {
+	if (mediaRuntime) {
+		if (const auto hosted = mediaRuntime->hostedMediaBlockFactory()) {
+			if (const auto block = hosted->createAudio(prepared)) {
+				block->setLayoutStyle(st);
+				return block;
+			}
+		}
+	}
+	return nullptr;
+}
+
+std::shared_ptr<MediaBlock> CreateMapMediaBlock(
+		const PreparedMapBlockData &prepared,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st) {
+	if (mediaRuntime) {
+		if (const auto hosted = mediaRuntime->hostedMediaBlockFactory()) {
+			if (const auto block = hosted->createMap(prepared)) {
+				block->setLayoutStyle(st);
+				return block;
+			}
+		}
+	}
+	auto result = std::make_shared<ImageBackedMediaBlock>(prepared, mediaRuntime);
+	result->setLayoutStyle(st);
+	return result;
+}
+
+std::shared_ptr<MediaBlock> CreateChannelMediaBlock(
+		const PreparedChannelBlockData &prepared,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st) {
+	auto result = std::make_shared<ChannelMediaBlock>(prepared, mediaRuntime);
+	result->setLayoutStyle(st);
+	return result;
+}
+
+std::shared_ptr<MediaBlock> CreateGroupedMediaBlock(
+		const PreparedGroupedMediaBlockData &prepared,
+		const std::shared_ptr<MediaRuntime> &mediaRuntime,
+		const style::Markdown &st) {
+	if (mediaRuntime) {
+		for (const auto &item : prepared.items) {
+			switch (item.media.kind) {
+			case PreparedMediaItemKind::Photo:
+				mediaRuntime->registerPhoto(
+					item.media.id,
+					prepared.caption);
+				break;
+			case PreparedMediaItemKind::Document:
+				mediaRuntime->registerDocument(
+					item.media.id,
+					prepared.caption);
+				break;
+			}
+		}
+		if (const auto hosted = mediaRuntime->hostedMediaBlockFactory()) {
+			if (const auto block = hosted->createGroupedMedia(prepared)) {
+				block->setLayoutStyle(st);
+				return block;
+			}
+		}
+	}
+	auto result = std::make_shared<GroupedMediaBlock>(prepared, mediaRuntime);
+	result->setLayoutStyle(st);
+	return result;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_media_block.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_media_block.h
new file mode 100644
index 00000000000000..1b2659be422651
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_media_block.h
@@ -0,0 +1,109 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_common.h"
+
+#include "ui/click_handler.h"
+#include "ui/painter.h"
+#include "ui/text/text_entity.h"
+
+#include <memory>
+
+#include <QtCore/QPoint>
+#include <QtCore/QRect>
+
+namespace style {
+struct Markdown;
+} // namespace style
+
+namespace Iv::Markdown {
+
+struct MarkdownArticlePaintContext;
+class MediaRuntime;
+struct PreparedAudioBlockData;
+struct PreparedChannelBlockData;
+struct PreparedGroupedMediaBlockData;
+struct PreparedMapBlockData;
+struct PreparedPhotoBlockData;
+struct PreparedVideoBlockData;
+
+class MediaBlockHost {
+public:
+	virtual ~MediaBlockHost() = default;
+
+	virtual void requestRepaint(QRect articleRect) = 0;
+	virtual void requestRelayout(QRect articleRect) = 0;
+};
+
+struct MediaBlockSelectionData {
+	QString copyText;
+	TextWithEntities caption;
+};
+
+class MediaBlock : public std::enable_shared_from_this<MediaBlock> {
+public:
+	virtual ~MediaBlock();
+
+	void setHost(MediaBlockHost *host);
+	[[nodiscard]] MediaBlockHost *host() const;
+
+	[[nodiscard]] virtual uint64 stableId() const = 0;
+	[[nodiscard]] virtual int resizeGetHeight(int width) = 0;
+	virtual void setGeometry(QRect geometry) = 0;
+	[[nodiscard]] virtual QRect geometry() const = 0;
+	[[nodiscard]] virtual int firstLineBaseline() const = 0;
+	void setLayoutStyle(const style::Markdown &st);
+	virtual void paint(
+		Painter &p,
+		const MarkdownArticlePaintContext &context) const = 0;
+	[[nodiscard]] virtual ClickHandlerPtr linkAt(QPoint point) const = 0;
+	[[nodiscard]] virtual MediaActivation activationAt(QPoint point) const = 0;
+	[[nodiscard]] virtual MediaBlockSelectionData selectionData() const = 0;
+	[[nodiscard]] virtual bool hasHeavyPart() const;
+	virtual void unloadHeavyPart();
+	virtual void hideSpoilers();
+
+protected:
+	void requestRepaint(QRect articleRect) const;
+	void requestRelayout(QRect articleRect) const;
+	[[nodiscard]] const style::Markdown &layoutStyle() const;
+	virtual void layoutStyleUpdated();
+	virtual void hostUpdated();
+
+private:
+	MediaBlockHost *_host = nullptr;
+	const style::Markdown *_st = nullptr;
+};
+
+[[nodiscard]] std::shared_ptr<MediaBlock> CreatePhotoMediaBlock(
+	const PreparedPhotoBlockData &prepared,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st);
+[[nodiscard]] std::shared_ptr<MediaBlock> CreateVideoMediaBlock(
+	const PreparedVideoBlockData &prepared,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st);
+[[nodiscard]] std::shared_ptr<MediaBlock> CreateAudioMediaBlock(
+	const PreparedAudioBlockData &prepared,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st);
+[[nodiscard]] std::shared_ptr<MediaBlock> CreateMapMediaBlock(
+	const PreparedMapBlockData &prepared,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st);
+[[nodiscard]] std::shared_ptr<MediaBlock> CreateChannelMediaBlock(
+	const PreparedChannelBlockData &prepared,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st);
+[[nodiscard]] std::shared_ptr<MediaBlock> CreateGroupedMediaBlock(
+	const PreparedGroupedMediaBlockData &prepared,
+	const std::shared_ptr<MediaRuntime> &mediaRuntime,
+	const style::Markdown &st);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_media_reuse.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_media_reuse.cpp
new file mode 100644
index 00000000000000..296276048973c2
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_media_reuse.cpp
@@ -0,0 +1,313 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_media_reuse.h"
+
+#include <cstring>
+#include <optional>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+struct MediaReuseGroupedItem {
+	PreparedMediaItemKind kind = PreparedMediaItemKind::Photo;
+	uint64 backingId = 0;
+	int width = 0;
+	int height = 0;
+	bool spoiler = false;
+
+	friend inline bool operator==(
+		const MediaReuseGroupedItem &,
+		const MediaReuseGroupedItem &) = default;
+};
+
+struct MediaReuseKey {
+	PreparedBlockKind kind = PreparedBlockKind::Paragraph;
+	PreparedMediaItemKind mediaKind = PreparedMediaItemKind::Photo;
+	PreparedGroupedMediaIntent groupedIntent
+		= PreparedGroupedMediaIntent::Collage;
+	uint64 backingId = 0;
+	uint64 accessHash = 0;
+	int width = 0;
+	int height = 0;
+	int zoom = 0;
+	int duration = 0;
+	double latitude = 0.;
+	double longitude = 0.;
+	QString title;
+	QString performer;
+	QString fileName;
+	QString username;
+	QString url;
+	QString urlOverride;
+	bool viewerOpen = false;
+	bool spoiler = false;
+	std::vector<MediaReuseGroupedItem> groupedItems;
+
+	friend inline bool operator==(
+		const MediaReuseKey &,
+		const MediaReuseKey &) = default;
+};
+
+void MediaReuseHashCombine(size_t *result, size_t value) {
+	*result = (*result * 1315423911U) ^ value;
+}
+
+template <typename Value>
+void MediaReuseHashCombine(size_t *result, const Value &value) {
+	MediaReuseHashCombine(result, size_t(qHash(value)));
+}
+
+[[nodiscard]] uint64 MediaReuseDoubleBits(double value) {
+	if (value == 0.) {
+		return 0;
+	}
+	auto result = uint64(0);
+	std::memcpy(&result, &value, sizeof(result));
+	return result;
+}
+
+struct MediaReuseKeyHasher {
+	[[nodiscard]] size_t operator()(
+			const MediaReuseKey &key) const noexcept;
+};
+
+size_t MediaReuseKeyHasher::operator()(
+		const MediaReuseKey &key) const noexcept {
+	auto result = size_t(0);
+	MediaReuseHashCombine(&result, int(key.kind));
+	MediaReuseHashCombine(&result, int(key.mediaKind));
+	MediaReuseHashCombine(&result, int(key.groupedIntent));
+	MediaReuseHashCombine(&result, key.backingId);
+	MediaReuseHashCombine(&result, key.accessHash);
+	MediaReuseHashCombine(&result, key.width);
+	MediaReuseHashCombine(&result, key.height);
+	MediaReuseHashCombine(&result, key.zoom);
+	MediaReuseHashCombine(&result, key.duration);
+	MediaReuseHashCombine(&result, MediaReuseDoubleBits(key.latitude));
+	MediaReuseHashCombine(&result, MediaReuseDoubleBits(key.longitude));
+	MediaReuseHashCombine(&result, key.title);
+	MediaReuseHashCombine(&result, key.performer);
+	MediaReuseHashCombine(&result, key.fileName);
+	MediaReuseHashCombine(&result, key.username);
+	MediaReuseHashCombine(&result, key.url);
+	MediaReuseHashCombine(&result, key.urlOverride);
+	MediaReuseHashCombine(&result, int(key.viewerOpen));
+	MediaReuseHashCombine(&result, int(key.spoiler));
+	for (const auto &item : key.groupedItems) {
+		MediaReuseHashCombine(&result, int(item.kind));
+		MediaReuseHashCombine(&result, item.backingId);
+		MediaReuseHashCombine(&result, item.width);
+		MediaReuseHashCombine(&result, item.height);
+		MediaReuseHashCombine(&result, int(item.spoiler));
+	}
+	return result;
+}
+
+using MediaBlockReusePool = std::unordered_map<
+	MediaReuseKey,
+	std::vector<std::shared_ptr<MediaBlock>>,
+	MediaReuseKeyHasher>;
+
+[[nodiscard]] MediaReuseGroupedItem MediaReuseGroupedItemForPreparedMedia(
+		const PreparedMediaItemData &media) {
+	return {
+		.kind = media.kind,
+		.backingId = media.id,
+		.width = media.width,
+		.height = media.height,
+		.spoiler = media.spoiler,
+	};
+}
+
+[[nodiscard]] PreparedMediaBlockId MediaIdForPreparedBlock(
+		const PreparedBlock &block) {
+	switch (block.kind) {
+	case PreparedBlockKind::Photo:
+		return block.photo.id;
+	case PreparedBlockKind::Video:
+		return block.video.id;
+	case PreparedBlockKind::Audio:
+		return block.audio.id;
+	case PreparedBlockKind::Map:
+		return block.map.id;
+	case PreparedBlockKind::Channel:
+		return block.channel.id;
+	case PreparedBlockKind::GroupedMedia:
+		return block.groupedMedia.id;
+	default:
+		return {};
+	}
+}
+
+[[nodiscard]] std::optional<MediaReuseKey> MediaKeyForPreparedBlock(
+		const PreparedBlock &block) {
+	switch (block.kind) {
+	case PreparedBlockKind::Photo:
+		return MediaReuseKey{
+			.kind = block.kind,
+			.backingId = block.photo.photoId,
+			.width = block.photo.width,
+			.height = block.photo.height,
+			.urlOverride = block.photo.urlOverride,
+			.viewerOpen = block.photo.viewerOpen,
+			.spoiler = block.photo.spoiler,
+		};
+	case PreparedBlockKind::Video:
+		return MediaReuseKey{
+			.kind = block.kind,
+			.mediaKind = block.video.media.kind,
+			.backingId = block.video.media.id,
+			.width = block.video.media.width,
+			.height = block.video.media.height,
+			.spoiler = block.video.media.spoiler,
+		};
+	case PreparedBlockKind::Audio:
+		return MediaReuseKey{
+			.kind = block.kind,
+			.backingId = block.audio.documentId,
+			.duration = block.audio.duration,
+			.title = block.audio.title,
+			.performer = block.audio.performer,
+			.fileName = block.audio.fileName,
+		};
+	case PreparedBlockKind::Map:
+		return MediaReuseKey{
+			.kind = block.kind,
+			.accessHash = block.map.accessHash,
+			.width = block.map.width,
+			.height = block.map.height,
+			.zoom = block.map.zoom,
+			.latitude = block.map.latitude,
+			.longitude = block.map.longitude,
+			.url = block.map.url,
+		};
+	case PreparedBlockKind::Channel:
+		return MediaReuseKey{
+			.kind = block.kind,
+			.backingId = block.channel.channelId,
+			.title = block.channel.title,
+			.username = block.channel.username,
+		};
+	case PreparedBlockKind::GroupedMedia: {
+		auto groupedItems = std::vector<MediaReuseGroupedItem>();
+		groupedItems.reserve(block.groupedMedia.items.size());
+		for (const auto &item : block.groupedMedia.items) {
+			groupedItems.push_back(
+				MediaReuseGroupedItemForPreparedMedia(item.media));
+		}
+		return MediaReuseKey{
+			.kind = block.kind,
+			.groupedIntent = block.groupedMedia.intent,
+			.groupedItems = std::move(groupedItems),
+		};
+	}
+	default:
+		return std::nullopt;
+	}
+}
+
+void ClearMediaBlockReusePool(MediaBlockReusePool *pool) {
+	if (!pool) {
+		return;
+	}
+	for (const auto &entry : *pool) {
+		for (const auto &block : entry.second) {
+			if (block) {
+				block->setHost(nullptr);
+			}
+		}
+	}
+	pool->clear();
+}
+
+void CollectOldMediaBlocksForReuse(
+		const std::vector<PreparedBlock> &blocks,
+		MediaBlockStorage *oldBlocks,
+		MediaBlockReusePool *pool) {
+	if (!oldBlocks || !pool) {
+		return;
+	}
+	for (const auto &block : blocks) {
+		if (const auto id = MediaIdForPreparedBlock(block); id) {
+			if (const auto key = MediaKeyForPreparedBlock(block)) {
+				if (const auto i = oldBlocks->find(id.value);
+					i != end(*oldBlocks)) {
+					if (i->second) {
+						(*pool)[*key].push_back(std::move(i->second));
+					}
+					oldBlocks->erase(i);
+				}
+			}
+		}
+		CollectOldMediaBlocksForReuse(block.children, oldBlocks, pool);
+	}
+}
+
+void CollectReusedMediaBlocks(
+		const std::vector<PreparedBlock> &blocks,
+		MediaBlockReusePool *pool,
+		MediaBlockStorage *reusedBlocks) {
+	if (!pool || !reusedBlocks) {
+		return;
+	}
+	for (const auto &block : blocks) {
+		if (const auto id = MediaIdForPreparedBlock(block); id) {
+			if (const auto key = MediaKeyForPreparedBlock(block)) {
+				if (auto i = pool->find(*key); i != end(*pool)) {
+					if (!i->second.empty()) {
+						auto reused = std::move(i->second.front());
+						i->second.erase(begin(i->second));
+						if (reused) {
+							reusedBlocks->emplace(id.value, std::move(reused));
+						}
+					}
+					if (i->second.empty()) {
+						pool->erase(i);
+					}
+				}
+			}
+		}
+		CollectReusedMediaBlocks(block.children, pool, reusedBlocks);
+	}
+}
+
+} // namespace
+
+void ClearMediaBlockStorage(MediaBlockStorage *blocks) {
+	if (!blocks) {
+		return;
+	}
+	for (const auto &entry : *blocks) {
+		if (entry.second) {
+			entry.second->setHost(nullptr);
+		}
+	}
+	blocks->clear();
+}
+
+MediaBlockStorage ReuseMediaBlocks(
+		const std::vector<PreparedBlock> &oldPreparedBlocks,
+		MediaBlockStorage *oldMediaBlocks,
+		const std::vector<PreparedBlock> &newPreparedBlocks) {
+	auto pool = MediaBlockReusePool();
+	auto result = MediaBlockStorage();
+	CollectOldMediaBlocksForReuse(
+		oldPreparedBlocks,
+		oldMediaBlocks,
+		&pool);
+	CollectReusedMediaBlocks(
+		newPreparedBlocks,
+		&pool,
+		&result);
+	ClearMediaBlockStorage(oldMediaBlocks);
+	ClearMediaBlockReusePool(&pool);
+	return result;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_media_reuse.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_media_reuse.h
new file mode 100644
index 00000000000000..f4a16758d1e9a0
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_media_reuse.h
@@ -0,0 +1,30 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_media_block.h"
+#include "iv/markdown/iv_markdown_prepare.h"
+
+#include <memory>
+#include <unordered_map>
+#include <vector>
+
+namespace Iv::Markdown {
+
+using MediaBlockStorage = std::unordered_map<
+	uint64,
+	std::shared_ptr<MediaBlock>>;
+
+void ClearMediaBlockStorage(MediaBlockStorage *blocks);
+
+[[nodiscard]] MediaBlockStorage ReuseMediaBlocks(
+	const std::vector<PreparedBlock> &oldPreparedBlocks,
+	MediaBlockStorage *oldMediaBlocks,
+	const std::vector<PreparedBlock> &newPreparedBlocks);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_microtex.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_microtex.cpp
new file mode 100644
index 00000000000000..454cc354231a88
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_microtex.cpp
@@ -0,0 +1,429 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_microtex.h"
+#include "base/base_file_utilities.h"
+#include "platform/qt/graphic_qt.h"
+#include "latex.h"
+
+#include <QtCore/QSize>
+#include <QtCore/QString>
+#include <QtGui/QPainter>
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <exception>
+#include <limits>
+#include <memory>
+#include <mutex>
+#include <utility>
+
+#ifndef Q_OS_MAC
+void InitIvMarkdownMicrotexBundledResource() {
+	Q_INIT_RESOURCE(bundled);
+}
+#endif // !Q_OS_MAC
+
+namespace Iv::Markdown {
+namespace {
+
+constexpr auto kBytesPerPixel = int64(4);
+constexpr auto kMaxFormulaImageBytes = int64(128) * 1024 * 1024;
+constexpr auto kFormulaForegroundRgba = 0xFFFFFFFFU;
+
+std::once_flag MicrotexInitOnce;
+bool MicrotexInitialized = false;
+QString MicrotexInitError;
+
+struct PreparedMicrotexRequest {
+	QString trimmedTex;
+	MathKind kind = MathKind::Display;
+	int textSize = 0;
+	int renderWidthCap = 0;
+	int renderHeightCap = 0;
+	int metricTextSize = 0;
+	int metricRenderWidthCap = 0;
+	int metricRenderHeightCap = 0;
+};
+
+struct ParsedMicrotexFormula {
+	std::unique_ptr<tex::TeXRender> render;
+	MeasuredFormula measured;
+};
+
+[[nodiscard]] QString ExceptionText(const std::exception &exception) {
+	return QString::fromUtf8(exception.what());
+}
+
+[[nodiscard]] std::wstring ToWide(const QString &value) {
+	auto result = std::wstring();
+	result.reserve(size_t(value.size()));
+	for (const auto ch : value) {
+		result.push_back(wchar_t(ch.unicode()));
+	}
+	return result;
+}
+
+[[nodiscard]] bool PhysicalImageRejected(int64 width, int64 height) {
+	if (width <= 0 || height <= 0) {
+		return true;
+	}
+	return (width > std::numeric_limits<int>::max())
+		|| (height > std::numeric_limits<int>::max())
+		|| (width * height > (kMaxFormulaImageBytes / kBytesPerPixel));
+}
+
+[[nodiscard]] bool ComputePhysicalSize(
+		QSize logicalSize,
+		int ratio,
+		QSize *physicalSize) {
+	const auto width = int64(logicalSize.width()) * ratio;
+	const auto height = int64(logicalSize.height()) * ratio;
+	if (PhysicalImageRejected(width, height)) {
+		return false;
+	}
+	if (physicalSize) {
+		*physicalSize = QSize(int(width), int(height));
+	}
+	return true;
+}
+
+// MicroTeX lays the outer alignment environments (align, gather, equation,
+// ...) out to the full text width we pass as the render width cap, and
+// TeXRender::getWidth() adds insets on top, so their measured width always
+// lands a couple of units above the cap and the logical-size-cap check
+// below rejects them no matter the content. Their inner variants (aligned,
+// gathered, ...) produce the same rows at natural width, which also fits
+// chat bubbles better than a forced full-width block.
+[[nodiscard]] QString RewriteFullWidthEnvironments(QString tex) {
+	if (!tex.contains(u"\\begin{"_q)) {
+		return tex;
+	}
+	static const auto kRewrites = std::array<std::pair<QString, QString>, 12>{{
+		{ u"align*"_q, u"aligned"_q },
+		{ u"align"_q, u"aligned"_q },
+		{ u"flalign*"_q, u"aligned"_q },
+		{ u"flalign"_q, u"aligned"_q },
+		{ u"alignat*"_q, u"alignedat"_q },
+		{ u"alignat"_q, u"alignedat"_q },
+		{ u"gather*"_q, u"gathered"_q },
+		{ u"gather"_q, u"gathered"_q },
+		{ u"multline*"_q, u"gathered"_q },
+		{ u"multline"_q, u"gathered"_q },
+		// MicroTeX expands equation to align, so it is full-width too.
+		{ u"equation*"_q, u"gathered"_q },
+		{ u"equation"_q, u"gathered"_q },
+	}};
+	for (const auto &[from, to] : kRewrites) {
+		tex.replace(
+			u"\\begin{"_q + from + u'}',
+			u"\\begin{"_q + to + u'}');
+		tex.replace(
+			u"\\end{"_q + from + u'}',
+			u"\\end{"_q + to + u'}');
+	}
+	return tex;
+}
+
+[[nodiscard]] QString PreparedTeX(MathKind kind, const QString &trimmedTex) {
+	auto result = RewriteFullWidthEnvironments(trimmedTex);
+	if (kind == MathKind::Display) {
+		result = u"\\displaystyle "_q + result;
+	}
+	return result;
+}
+
+[[nodiscard]] bool TooLargeFailure(const QString &error) {
+	return (error == u"render-width-cap-exceeded"_q)
+		|| (error == u"logical-size-cap-exceeded"_q)
+		|| (error == u"physical-image-cap-exceeded"_q);
+}
+
+[[nodiscard]] bool ScaleMetricValue(
+		int value,
+		int *scaled) {
+	if (!scaled) {
+		return false;
+	}
+	const auto scaledValue = int64(value) * kFormulaExactMetricScale;
+	if (scaledValue > std::numeric_limits<int>::max()) {
+		return false;
+	}
+	*scaled = int(scaledValue);
+	return true;
+}
+
+[[nodiscard]] int RoundedLogicalMetric(int scaledValue) {
+	return (scaledValue > 0)
+		? ((scaledValue + kFormulaExactMetricScale - 1)
+			/ kFormulaExactMetricScale)
+		: 0;
+}
+
+[[nodiscard]] FormulaExactMetrics ExtractExactMetrics(
+		tex::TeXRender &render) {
+	const auto scaledSize = QSize(
+		render.getWidth(),
+		render.getHeight());
+	const auto scaledAscent = std::clamp(
+		int(std::lround(render.getBaseline() * scaledSize.height())),
+		0,
+		scaledSize.height());
+	const auto insets = render.getInsets();
+	return {
+		.scaledSize = scaledSize,
+		.scaledAscent = scaledAscent,
+		.scaledInsets = QMargins(
+			insets.left,
+			insets.top,
+			insets.right,
+			insets.bottom),
+	};
+}
+
+void FillMeasuredMetrics(
+		MeasuredFormula *measured,
+		const FormulaExactMetrics &exact) {
+	if (!measured) {
+		return;
+	}
+	measured->exact = exact;
+	measured->logicalSize = QSize(
+		RoundedLogicalMetric(exact.scaledSize.width()),
+		RoundedLogicalMetric(exact.scaledSize.height()));
+	const auto scaledDepth = std::max(
+		exact.scaledSize.height() - exact.scaledAscent,
+		0);
+	measured->logicalDepth = std::clamp(
+		RoundedLogicalMetric(scaledDepth),
+		0,
+		measured->logicalSize.height());
+}
+
+void FinalizeFailure(MeasuredFormula *result) {
+	if (!result || result->success) {
+		return;
+	}
+	const auto tooLarge = TooLargeFailure(result->error);
+	result->overflow = tooLarge;
+	result->tooLarge = tooLarge;
+}
+
+[[nodiscard]] bool PrepareRequest(
+		const MicrotexMeasureRequest &request,
+		PreparedMicrotexRequest *prepared,
+		MeasuredFormula *result) {
+	if (!prepared || !result) {
+		return false;
+	}
+	if (!EnsureMicrotexInitialized(&result->error)) {
+		return false;
+	}
+	if (request.textSize <= 0) {
+		result->error = u"invalid-text-size"_q;
+		return false;
+	}
+	if (request.renderWidthCap <= 0) {
+		result->error = u"invalid-render-width"_q;
+		return false;
+	}
+	if (request.renderHeightCap <= 0) {
+		result->error = u"invalid-render-height"_q;
+		return false;
+	}
+	const auto trimmedTex = request.trimmedTex.trimmed();
+	if (trimmedTex.isEmpty()) {
+		result->error = u"empty-tex"_q;
+		return false;
+	}
+	auto metricTextSize = 0;
+	auto metricRenderWidthCap = 0;
+	auto metricRenderHeightCap = 0;
+	if (!ScaleMetricValue(request.textSize, &metricTextSize)) {
+		result->error = u"text-size-overflow"_q;
+		return false;
+	}
+	if (!ScaleMetricValue(
+			request.renderWidthCap,
+			&metricRenderWidthCap)) {
+		result->error = u"render-width-overflow"_q;
+		return false;
+	}
+	if (!ScaleMetricValue(
+			request.renderHeightCap,
+			&metricRenderHeightCap)) {
+		result->error = u"render-height-overflow"_q;
+		return false;
+	}
+	*prepared = {
+		.trimmedTex = trimmedTex,
+		.kind = request.kind,
+		.textSize = request.textSize,
+		.renderWidthCap = request.renderWidthCap,
+		.renderHeightCap = request.renderHeightCap,
+		.metricTextSize = metricTextSize,
+		.metricRenderWidthCap = metricRenderWidthCap,
+		.metricRenderHeightCap = metricRenderHeightCap,
+	};
+	return true;
+}
+
+[[nodiscard]] ParsedMicrotexFormula ParseFormula(
+		const PreparedMicrotexRequest &request) {
+	auto result = ParsedMicrotexFormula();
+	try {
+		auto render = std::unique_ptr<tex::TeXRender>(tex::LaTeX::parse(
+			ToWide(PreparedTeX(request.kind, request.trimmedTex)),
+			request.metricRenderWidthCap,
+			float(request.metricTextSize),
+			float(request.metricTextSize) * 0.25f,
+			kFormulaForegroundRgba));
+		if (!render) {
+			result.measured.error = u"parse-returned-null"_q;
+			return result;
+		}
+		FillMeasuredMetrics(&result.measured, ExtractExactMetrics(*render));
+		const auto logicalSize = result.measured.logicalSize;
+		if (logicalSize.width() <= 0 || logicalSize.height() <= 0) {
+			result.measured.error = u"invalid-render-size"_q;
+			return result;
+		}
+		// In partial mode MicroTeX swallows parse errors inside arguments
+		// (e.g. of \displaystyle) and renders an EmptyAtom, which measures
+		// 1x1 scaled units. Fall back to the source text instead of
+		// painting an invisible formula.
+		const auto scaledSize = result.measured.exact.scaledSize;
+		if (scaledSize.width() <= 1 && scaledSize.height() <= 1) {
+			result.measured.error = u"empty-render"_q;
+			return result;
+		}
+		if (logicalSize.width() > request.renderWidthCap
+			|| logicalSize.height() > request.renderHeightCap) {
+			result.measured.error = u"logical-size-cap-exceeded"_q;
+			result.measured.overflow = true;
+			result.measured.tooLarge = true;
+			return result;
+		}
+		result.measured.success = true;
+		result.render = std::move(render);
+		return result;
+	} catch (const std::exception &exception) {
+		result.measured.error = ExceptionText(exception);
+		return result;
+	} catch (...) {
+		result.measured.error = u"unknown-exception"_q;
+		return result;
+	}
+}
+
+} // namespace
+
+bool EnsureMicrotexInitialized(QString *error) {
+	std::call_once(MicrotexInitOnce, [] {
+		try {
+#ifdef Q_OS_MAC // Use resources from the .app bundle on macOS.
+
+			base::RegisterBundledResources(u"external_microtex_bundled.rcc"_q);
+
+#else // Q_OS_MAC
+
+			InitIvMarkdownMicrotexBundledResource();
+
+#endif // Q_OS_MAC
+
+			tex::LaTeX::initBundled();
+			MicrotexInitialized = true;
+		} catch (const std::exception &exception) {
+			MicrotexInitError = ExceptionText(exception);
+		} catch (...) {
+			MicrotexInitError = u"unknown-exception"_q;
+		}
+	});
+	if (!MicrotexInitialized && error) {
+		*error = MicrotexInitError;
+	} else if (MicrotexInitialized && error) {
+		error->clear();
+	}
+	return MicrotexInitialized;
+}
+
+MeasuredFormula MeasureWithMicrotex(const MicrotexMeasureRequest &request) {
+	auto prepared = PreparedMicrotexRequest();
+	auto result = MeasuredFormula();
+	if (!PrepareRequest(request, &prepared, &result)) {
+		FinalizeFailure(&result);
+		return result;
+	}
+	return ParseFormula(prepared).measured;
+}
+
+MicrotexRenderResult RenderWithMicrotex(const MicrotexRenderRequest &request) {
+	auto result = MicrotexRenderResult();
+	auto prepared = PreparedMicrotexRequest();
+	if (!PrepareRequest(
+			MicrotexMeasureRequest{
+				.trimmedTex = request.trimmedTex,
+				.kind = request.kind,
+				.textSize = request.textSize,
+				.renderWidthCap = request.renderWidthCap,
+				.renderHeightCap = request.renderHeightCap,
+			},
+			&prepared,
+			&result.measured)) {
+		FinalizeFailure(&result.measured);
+		return result;
+	}
+	if (request.devicePixelRatio <= 0) {
+		result.measured.error = u"invalid-device-pixel-ratio"_q;
+		return result;
+	}
+	auto parsed = ParseFormula(prepared);
+	result.measured = std::move(parsed.measured);
+	if (!result.measured.success) {
+		return result;
+	}
+	auto physicalSize = QSize();
+	if (!ComputePhysicalSize(
+			result.measured.logicalSize,
+			request.devicePixelRatio,
+			&physicalSize)) {
+		result.measured.success = false;
+		result.measured.error = u"physical-image-cap-exceeded"_q;
+		result.measured.overflow = true;
+		result.measured.tooLarge = true;
+		return result;
+	}
+	auto image = QImage(
+		physicalSize,
+		QImage::Format_ARGB32_Premultiplied);
+	if (image.isNull()) {
+		result.measured.success = false;
+		result.measured.error = u"image-allocation-failed"_q;
+		return result;
+	}
+	image.setDevicePixelRatio(request.devicePixelRatio);
+	image.fill(Qt::transparent);
+	{
+		QPainter painter(&image);
+		painter.setRenderHint(QPainter::Antialiasing, true);
+		painter.setRenderHint(QPainter::TextAntialiasing, true);
+		painter.scale(
+			1. / double(kFormulaExactMetricScale),
+			1. / double(kFormulaExactMetricScale));
+		tex::Graphics2D_qt graphics(&painter);
+		parsed.render->draw(graphics, 0, 0);
+	}
+	result.image = std::move(image);
+	return result;
+}
+
+bool MicrotexBackendLinked() {
+	return true;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_microtex.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_microtex.h
new file mode 100644
index 00000000000000..60e1e9c79aa9e2
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_microtex.h
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_document.h"
+
+#include <QtCore/QSize>
+#include <QtGui/QImage>
+
+namespace Iv::Markdown {
+
+struct MicrotexMeasureRequest {
+	QString trimmedTex;
+	MathKind kind = MathKind::Display;
+	int textSize = 0;
+	int renderWidthCap = 0;
+	int renderHeightCap = 0;
+};
+
+struct MicrotexRenderRequest {
+	QString trimmedTex;
+	MathKind kind = MathKind::Display;
+	int textSize = 0;
+	int renderWidthCap = 0;
+	int renderHeightCap = 0;
+	int devicePixelRatio = 1;
+};
+
+struct MicrotexRenderResult {
+	QImage image;
+	MeasuredFormula measured;
+};
+
+[[nodiscard]] bool EnsureMicrotexInitialized(QString *error = nullptr);
+[[nodiscard]] MeasuredFormula MeasureWithMicrotex(
+	const MicrotexMeasureRequest &request);
+[[nodiscard]] MicrotexRenderResult RenderWithMicrotex(
+	const MicrotexRenderRequest &request);
+[[nodiscard]] bool MicrotexBackendLinked();
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_parse.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse.cpp
new file mode 100644
index 00000000000000..14b0370ec04db8
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse.cpp
@@ -0,0 +1,36 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_parse.h"
+#include "iv/markdown/iv_markdown_parse_finalize.h"
+#include "iv/markdown/iv_markdown_parse_validate.h"
+
+#include <utility>
+
+namespace Iv::Markdown {
+
+const MarkdownParseLimits &ParseLimitsForIv() {
+	static const auto result = MarkdownParseLimits{
+		.maxSourceBytes = 4 * 1024 * 1024,
+		.maxCmarkNodes = 100000,
+		.maxNesting = 128,
+		.maxFormulaBytes = 64 * 1024,
+		.maxFormulaCount = 10000,
+	};
+	return result;
+}
+
+ParseResult ParseMarkdownForIv(const QByteArray &source, ParseOptions options) {
+	auto validated = ValidateMarkdownSourceForIv(source, std::move(options));
+	return validated.ok
+		? ParseMarkdownForIv(std::move(validated.source))
+		: Failure(
+			std::move(validated.source.sourceName),
+			std::move(validated.error));
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_parse.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse.h
new file mode 100644
index 00000000000000..90cc6dcf49927e
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse.h
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_document.h"
+
+#include <QtCore/QByteArray>
+
+namespace Iv::Markdown {
+
+struct MarkdownParseLimits {
+	int maxSourceBytes = 0;
+	int maxCmarkNodes = 0;
+	int maxNesting = 0;
+	int maxFormulaBytes = 0;
+	int maxFormulaCount = 0;
+};
+
+struct ValidatedMarkdownSource {
+	QByteArray normalized;
+	QString decoded;
+	std::vector<int> lineStarts;
+	QString sourceName;
+};
+
+struct MarkdownSourceValidationResult {
+	ValidatedMarkdownSource source;
+	QString error;
+	bool ok = true;
+};
+
+[[nodiscard]] const MarkdownParseLimits &ParseLimitsForIv();
+[[nodiscard]] MarkdownSourceValidationResult ValidateMarkdownSourceForIv(
+	const QByteArray &source,
+	ParseOptions options = {});
+[[nodiscard]] ParseResult ParseMarkdownForIv(ValidatedMarkdownSource source);
+[[nodiscard]] ParseResult ParseMarkdownForIv(
+	const QByteArray &source,
+	ParseOptions options = {});
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_convert.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_convert.cpp
new file mode 100644
index 00000000000000..f01635fc890aa9
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_convert.cpp
@@ -0,0 +1,753 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_parse_convert.h"
+
+#include <algorithm>
+#include <array>
+#include <cmark-gfm-core-extensions.h>
+#include <cmark-gfm-extension_api.h>
+#include <cstddef>
+#include <cstdint>
+#include <mutex>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+[[nodiscard]] QString ExtensionError(
+		const QString &prefix,
+		const char *name) {
+	return u"%1-%2"_q.arg(prefix, QString::fromUtf8(name));
+}
+
+void AddWarning(ParserState *state, QString warning) {
+	if (state && state->warnings && !warning.isEmpty()) {
+		state->warnings->push_back(std::move(warning));
+	}
+}
+
+[[nodiscard]] QString FromCmarkString(const char *value) {
+	return value ? QString::fromUtf8(value) : QString();
+}
+
+[[nodiscard]] QString RawTypeString(cmark_node *node) {
+	return node ? FromCmarkString(cmark_node_get_type_string(node)) : QString();
+}
+
+[[nodiscard]] bool IsCoreNodeType(cmark_node_type type) {
+	constexpr auto kCoreTypes = std::array{
+		CMARK_NODE_DOCUMENT,
+		CMARK_NODE_BLOCK_QUOTE,
+		CMARK_NODE_LIST,
+		CMARK_NODE_ITEM,
+		CMARK_NODE_CODE_BLOCK,
+		CMARK_NODE_HTML_BLOCK,
+		CMARK_NODE_CUSTOM_BLOCK,
+		CMARK_NODE_PARAGRAPH,
+		CMARK_NODE_HEADING,
+		CMARK_NODE_THEMATIC_BREAK,
+		CMARK_NODE_FOOTNOTE_DEFINITION,
+		CMARK_NODE_TEXT,
+		CMARK_NODE_SOFTBREAK,
+		CMARK_NODE_LINEBREAK,
+		CMARK_NODE_CODE,
+		CMARK_NODE_HTML_INLINE,
+		CMARK_NODE_CUSTOM_INLINE,
+		CMARK_NODE_EMPH,
+		CMARK_NODE_STRONG,
+		CMARK_NODE_LINK,
+		CMARK_NODE_IMAGE,
+		CMARK_NODE_FOOTNOTE_REFERENCE,
+	};
+	return std::find(kCoreTypes.begin(), kCoreTypes.end(), type)
+		!= kCoreTypes.end();
+}
+
+[[nodiscard]] QString CmarkKind(cmark_node *node) {
+	if (!node) {
+		return u"unknown"_q;
+	}
+	const auto type = cmark_node_get_type(node);
+	const auto raw = RawTypeString(node);
+	if (!IsCoreNodeType(type)) {
+		return raw.isEmpty() ? u"unknown"_q : raw;
+	}
+	switch (type) {
+	case CMARK_NODE_DOCUMENT: return u"document"_q;
+	case CMARK_NODE_BLOCK_QUOTE: return u"block_quote"_q;
+	case CMARK_NODE_LIST: return u"list"_q;
+	case CMARK_NODE_ITEM: return u"item"_q;
+	case CMARK_NODE_CODE_BLOCK: return u"code_block"_q;
+	case CMARK_NODE_HTML_BLOCK: return u"html_block"_q;
+	case CMARK_NODE_CUSTOM_BLOCK: return u"custom_block"_q;
+	case CMARK_NODE_PARAGRAPH: return u"paragraph"_q;
+	case CMARK_NODE_HEADING: return u"heading"_q;
+	case CMARK_NODE_THEMATIC_BREAK: return u"thematic_break"_q;
+	case CMARK_NODE_FOOTNOTE_DEFINITION:
+		return u"footnote_definition"_q;
+	case CMARK_NODE_TEXT: return u"text"_q;
+	case CMARK_NODE_SOFTBREAK: return u"softbreak"_q;
+	case CMARK_NODE_LINEBREAK: return u"linebreak"_q;
+	case CMARK_NODE_CODE: return u"code"_q;
+	case CMARK_NODE_HTML_INLINE: return u"html_inline"_q;
+	case CMARK_NODE_CUSTOM_INLINE: return u"custom_inline"_q;
+	case CMARK_NODE_EMPH: return u"emph"_q;
+	case CMARK_NODE_STRONG: return u"strong"_q;
+	case CMARK_NODE_LINK: return u"link"_q;
+	case CMARK_NODE_IMAGE: return u"image"_q;
+	case CMARK_NODE_FOOTNOTE_REFERENCE:
+		return u"footnote_reference"_q;
+	case CMARK_NODE_NONE: return u"none"_q;
+	}
+	return raw.isEmpty() ? u"unknown"_q : raw;
+}
+
+[[nodiscard]] SourceRange RangeFromCmarkLines(
+		const std::vector<int> &lineStarts,
+		int sourceSize,
+		int startLine,
+		int startColumn,
+		int endLine,
+		int endColumn) {
+	auto result = SourceRange();
+	result.startLine = startLine;
+	result.startColumn = startColumn;
+	result.endLine = endLine;
+	result.endColumn = endColumn;
+	const auto linesCount = static_cast<int>(lineStarts.size());
+	if (startLine <= 0
+		|| endLine <= 0
+		|| startLine > linesCount
+		|| endLine > linesCount) {
+		return result;
+	}
+	const auto maxOffset = std::max(sourceSize, 0);
+	const auto startOffset = lineStarts[startLine - 1]
+		+ std::max(0, startColumn - 1);
+	const auto endOffset = lineStarts[endLine - 1]
+		+ std::max(0, endColumn);
+	result.available = true;
+	result.startOffset = std::clamp(startOffset, 0, maxOffset);
+	result.endOffset = std::clamp(endOffset, 0, maxOffset);
+	return result;
+}
+
+[[nodiscard]] SourceRange NodeRange(
+		cmark_node *node,
+		const std::vector<int> &lineStarts,
+		int sourceSize) {
+	return node
+		? RangeFromCmarkLines(
+			lineStarts,
+			sourceSize,
+			cmark_node_get_start_line(node),
+			cmark_node_get_start_column(node),
+			cmark_node_get_end_line(node),
+			cmark_node_get_end_column(node))
+		: SourceRange();
+}
+
+[[nodiscard, maybe_unused]] QString SourceSlice(
+		const QByteArray &source,
+		const SourceRange &range) {
+	if (!range.available) {
+		return QString();
+	}
+	const auto sourceSize = static_cast<int>(source.size());
+	const auto start = std::clamp(range.startOffset, 0, sourceSize);
+	const auto end = std::clamp(range.endOffset, start, sourceSize);
+	const auto slice = source.mid(start, end - start);
+	return QString::fromUtf8(slice.constData(), slice.size());
+}
+
+template <std::size_t Size>
+[[nodiscard]] bool IsAnyKind(
+		const QString &kind,
+		const std::array<QString, Size> &values) {
+	for (const auto &value : values) {
+		if (kind == value) {
+			return true;
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] bool HasCmarkSourceRange(cmark_node *node) {
+	return node
+		&& cmark_node_get_start_line(node) > 0
+		&& cmark_node_get_end_line(node) > 0;
+}
+
+[[nodiscard]] bool IsBlockNodeType(cmark_node_type type) {
+	return (type & CMARK_NODE_TYPE_MASK) == CMARK_NODE_TYPE_BLOCK;
+}
+
+void MarkMaskRange(std::vector<bool> *mask, const SourceRange &range) {
+	if (!mask || !range.available) {
+		return;
+	}
+	const auto size = static_cast<int>(mask->size());
+	const auto start = std::clamp(range.startOffset, 0, size);
+	const auto end = std::clamp(range.endOffset, start, size);
+	for (auto i = start; i != end; ++i) {
+		(*mask)[i] = true;
+	}
+}
+
+[[nodiscard]] bool IsMathMaskedNode(cmark_node *node) {
+	if (!node) {
+		return false;
+	}
+	constexpr auto kMaskedTypes = std::array{
+		CMARK_NODE_CODE,
+		CMARK_NODE_CODE_BLOCK,
+		CMARK_NODE_HTML_INLINE,
+		CMARK_NODE_HTML_BLOCK,
+	};
+	const auto type = cmark_node_get_type(node);
+	return std::find(kMaskedTypes.begin(), kMaskedTypes.end(), type)
+		!= kMaskedTypes.end();
+}
+
+[[nodiscard]] bool IsTaskListItem(cmark_node *node) {
+	if (!node
+		|| cmark_node_get_type(node) != CMARK_NODE_ITEM
+		|| RawTypeString(node) != u"tasklist"_q) {
+		return false;
+	}
+	(void)cmark_gfm_extensions_get_tasklist_item_checked(node);
+	return true;
+}
+
+[[nodiscard]] bool IsBlockForMathParent(cmark_node *node) {
+	if (!node) {
+		return false;
+	}
+	const auto kind = CmarkKind(node);
+	static const auto kBlockKinds = std::array{
+		u"paragraph"_q,
+		u"heading"_q,
+		u"list"_q,
+		u"item"_q,
+		u"block_quote"_q,
+		u"code_block"_q,
+		u"html_block"_q,
+		u"thematic_break"_q,
+		u"table"_q,
+		u"table_header"_q,
+		u"table_row"_q,
+		u"table_cell"_q,
+		u"footnote_definition"_q,
+	};
+	if (IsAnyKind(kind, kBlockKinds)) {
+		return true;
+	}
+	const auto type = cmark_node_get_type(node);
+	return !IsCoreNodeType(type)
+		&& IsBlockNodeType(type)
+		&& HasCmarkSourceRange(node);
+}
+
+void RecordCapabilities(cmark_node *node, ParserState *state) {
+	if (!node || !state || !state->stats) {
+		return;
+	}
+	const auto kind = CmarkKind(node);
+	static const auto kTableKinds = std::array{
+		u"table"_q,
+		u"table_header"_q,
+		u"table_row"_q,
+		u"table_cell"_q,
+	};
+	if (IsAnyKind(kind, kTableKinds)) {
+		state->stats->tablesSeen = true;
+	}
+	if (IsTaskListItem(node)) {
+		state->stats->taskListsSeen = true;
+	}
+	if (kind == u"strikethrough"_q) {
+		state->stats->strikethroughSeen = true;
+	} else if (kind == u"footnote_reference"_q
+		|| kind == u"footnote_definition"_q) {
+		state->stats->footnotesSeen = true;
+	}
+}
+
+[[nodiscard]] bool FailScanMetadata(ParserState *state, QString error) {
+	if (state) {
+		state->error = std::move(error);
+		state->failed = true;
+	}
+	return false;
+}
+
+[[nodiscard]] NodeKind ExtensionNodeKind(const QString &raw) {
+	struct Entry {
+		QString name;
+		NodeKind kind = NodeKind::Unsupported;
+	};
+	static const auto kEntries = std::array{
+		Entry{ u"strikethrough"_q, NodeKind::Strike },
+		Entry{ u"table"_q, NodeKind::Table },
+		Entry{ u"table_header"_q, NodeKind::TableRow },
+		Entry{ u"table_row"_q, NodeKind::TableRow },
+		Entry{ u"table_cell"_q, NodeKind::TableCell },
+	};
+	for (const auto &entry : kEntries) {
+		if (raw == entry.name) {
+			return entry.kind;
+		}
+	}
+	return NodeKind::Unsupported;
+}
+
+[[nodiscard]] NodeKind NodeKindFor(cmark_node *node) {
+	if (!node) {
+		return NodeKind::Unsupported;
+	}
+	const auto type = cmark_node_get_type(node);
+	switch (type) {
+	case CMARK_NODE_DOCUMENT: return NodeKind::Document;
+	case CMARK_NODE_BLOCK_QUOTE: return NodeKind::Blockquote;
+	case CMARK_NODE_LIST: return NodeKind::List;
+	case CMARK_NODE_ITEM: return NodeKind::ListItem;
+	case CMARK_NODE_CODE_BLOCK: return NodeKind::CodeBlock;
+	case CMARK_NODE_HTML_BLOCK: return NodeKind::HtmlBlock;
+	case CMARK_NODE_PARAGRAPH: return NodeKind::Paragraph;
+	case CMARK_NODE_HEADING: return NodeKind::Heading;
+	case CMARK_NODE_THEMATIC_BREAK: return NodeKind::ThematicBreak;
+	case CMARK_NODE_FOOTNOTE_DEFINITION: return NodeKind::FootnoteDefinition;
+	case CMARK_NODE_TEXT: return NodeKind::Text;
+	case CMARK_NODE_SOFTBREAK: return NodeKind::SoftBreak;
+	case CMARK_NODE_LINEBREAK: return NodeKind::LineBreak;
+	case CMARK_NODE_CODE: return NodeKind::InlineCode;
+	case CMARK_NODE_HTML_INLINE: return NodeKind::HtmlInline;
+	case CMARK_NODE_EMPH: return NodeKind::Emphasis;
+	case CMARK_NODE_STRONG: return NodeKind::Strong;
+	case CMARK_NODE_LINK: return NodeKind::Link;
+	case CMARK_NODE_FOOTNOTE_REFERENCE: return NodeKind::FootnoteReference;
+	default: break;
+	}
+	return ExtensionNodeKind(RawTypeString(node));
+}
+
+[[nodiscard]] ListKind ListKindFor(cmark_node *node) {
+	return (node && cmark_node_get_list_type(node) == CMARK_ORDERED_LIST)
+		? ListKind::Ordered
+		: ListKind::Bullet;
+}
+
+[[nodiscard]] ListDelimiter ListDelimiterFor(cmark_node *node) {
+	if (!node) {
+		return ListDelimiter::None;
+	}
+	switch (cmark_node_get_list_delim(node)) {
+	case CMARK_PERIOD_DELIM: return ListDelimiter::Period;
+	case CMARK_PAREN_DELIM: return ListDelimiter::Parenthesis;
+	case CMARK_NO_DELIM: return ListDelimiter::None;
+	}
+	return ListDelimiter::None;
+}
+
+[[nodiscard]] TaskState TaskStateFor(cmark_node *node) {
+	if (!IsTaskListItem(node)) {
+		return TaskState::None;
+	}
+	return cmark_gfm_extensions_get_tasklist_item_checked(node)
+		? TaskState::Checked
+		: TaskState::Unchecked;
+}
+
+[[nodiscard]] TableAlignment TableAlignmentFor(uint8_t value) {
+	switch (value) {
+	case 'l': return TableAlignment::Left;
+	case 'c': return TableAlignment::Center;
+	case 'r': return TableAlignment::Right;
+	default: return TableAlignment::None;
+	}
+}
+
+[[nodiscard]] std::vector<TableAlignment> TableAlignmentsFor(cmark_node *node) {
+	auto result = std::vector<TableAlignment>();
+	if (!node) {
+		return result;
+	}
+	const auto columns = cmark_gfm_extensions_get_table_columns(node);
+	if (!columns) {
+		return result;
+	}
+	result.reserve(columns);
+	const auto alignments = cmark_gfm_extensions_get_table_alignments(node);
+	for (auto i = uint16_t(0); i != columns; ++i) {
+		result.push_back(
+			alignments
+				? TableAlignmentFor(alignments[i])
+				: TableAlignment::None);
+	}
+	return result;
+}
+
+[[nodiscard]] bool TableRowIsHeader(cmark_node *node) {
+	return node && cmark_gfm_extensions_get_table_row_is_header(node) != 0;
+}
+
+[[nodiscard]] int TableCellColumn(cmark_node *node) {
+	if (!node) {
+		return -1;
+	}
+	auto result = 0;
+	for (auto previous = cmark_node_previous(node); previous;) {
+		if (NodeKindFor(previous) == NodeKind::TableCell) {
+			++result;
+		}
+		previous = cmark_node_previous(previous);
+	}
+	return result;
+}
+
+[[nodiscard]] QString ExtractFootnoteLabel(
+		QString raw,
+		bool definition) {
+	raw = raw.trimmed();
+	if (!raw.startsWith(u"[^"_q)) {
+		return QString();
+	}
+	const auto closing = raw.indexOf(u']');
+	if (closing <= 2) {
+		return QString();
+	}
+	if (definition && (closing + 1 >= raw.size() || raw[closing + 1] != u':')) {
+		return QString();
+	}
+	return raw.mid(2, closing - 2).trimmed();
+}
+
+[[nodiscard]] bool ParseDetailsOpenAttribute(QString raw) {
+	raw = raw.trimmed().toLower();
+	if (raw.isEmpty()) {
+		return false;
+	}
+	return (raw == u"open"_q)
+		|| (raw == u"open=\"\""_q)
+		|| (raw == u"open=''"_q)
+		|| (raw == u"open=\"open\""_q)
+		|| (raw == u"open='open'"_q);
+}
+
+[[nodiscard]] ParsedDetailsBlock ParseDetailsBlock(QString raw) {
+	auto result = ParsedDetailsBlock();
+	raw = raw.trimmed();
+	if (!raw.startsWith(u"<details"_q, Qt::CaseInsensitive)
+		|| !raw.endsWith(u"</details>"_q, Qt::CaseInsensitive)) {
+		return result;
+	}
+	const auto openingEnd = raw.indexOf(QChar('>'));
+	if (openingEnd < 0) {
+		return result;
+	}
+	const auto openingAttributes = raw.mid(8, openingEnd - 8);
+	if (!openingAttributes.trimmed().isEmpty()
+		&& !ParseDetailsOpenAttribute(openingAttributes)) {
+		return result;
+	}
+	result.open = ParseDetailsOpenAttribute(openingAttributes);
+	auto inner = raw.mid(
+		openingEnd + 1,
+		raw.size() - openingEnd - 11);
+	if (inner.contains(u"<details"_q, Qt::CaseInsensitive)) {
+		return result;
+	}
+	inner = inner.trimmed();
+	if (!inner.startsWith(u"<summary>"_q, Qt::CaseInsensitive)) {
+		return result;
+	}
+	const auto summaryClosing = inner.indexOf(
+		u"</summary>"_q,
+		0,
+		Qt::CaseInsensitive);
+	if (summaryClosing < 0) {
+		return result;
+	}
+	result.summary = inner.mid(9, summaryClosing - 9).trimmed();
+	result.body = inner.mid(summaryClosing + 10).trimmed();
+	result.ok = !result.summary.isEmpty();
+	return result;
+}
+
+[[nodiscard]] QString PlainText(const MarkdownNode &node) {
+	auto result = node.text;
+	for (const auto &child : node.children) {
+		result.append(PlainText(child));
+	}
+	return result;
+}
+
+[[nodiscard]] bool LinkLooksAutolink(const MarkdownNode &node) {
+	const auto text = PlainText(node);
+	if (text.isEmpty() || node.url.isEmpty()) {
+		return false;
+	}
+	if (text == node.url) {
+		return true;
+	}
+	const auto mailto = u"mailto:"_q;
+	return node.url.startsWith(mailto, Qt::CaseInsensitive)
+		&& text == node.url.mid(mailto.size());
+}
+
+void FillNodeAttributes(
+		cmark_node *node,
+		ParserState *state,
+		MarkdownNode *out) {
+	switch (out->kind) {
+	case NodeKind::Text:
+	case NodeKind::InlineCode:
+		out->text = FromCmarkString(cmark_node_get_literal(node));
+		break;
+	case NodeKind::CodeBlock:
+		out->text = FromCmarkString(cmark_node_get_literal(node));
+		out->info = FromCmarkString(cmark_node_get_fence_info(node));
+		break;
+	case NodeKind::HtmlBlock: {
+		out->raw = FromCmarkString(cmark_node_get_literal(node));
+		const auto trimmed = out->raw.trimmed();
+		if (trimmed.startsWith(u"<!--"_q) && trimmed.endsWith(u"-->"_q)) {
+			out->htmlBlockKind = HtmlBlockKind::Comment;
+		} else if (trimmed.startsWith(u"<details"_q, Qt::CaseInsensitive)) {
+			const auto details = ParseDetailsBlock(out->raw);
+			if (details.ok) {
+				out->htmlBlockKind = HtmlBlockKind::Details;
+				out->detailsSummary = details.summary;
+				out->detailsBody = details.body;
+				out->detailsOpen = details.open;
+			} else {
+				out->htmlBlockKind = HtmlBlockKind::Unsupported;
+				AddWarning(
+					state,
+					u"Malformed details block at %1:%2"_q.arg(
+						out->range.startLine
+					).arg(
+						out->range.startColumn));
+			}
+		} else if (!trimmed.isEmpty()) {
+			out->htmlBlockKind = HtmlBlockKind::Unsupported;
+			AddWarning(
+				state,
+				u"Unsupported HTML block at %1:%2"_q.arg(
+					out->range.startLine
+				).arg(
+					out->range.startColumn));
+		}
+	} break;
+	case NodeKind::HtmlInline:
+		out->raw = FromCmarkString(cmark_node_get_literal(node));
+		break;
+	case NodeKind::SoftBreak:
+	case NodeKind::LineBreak:
+		out->text = u"\n"_q;
+		break;
+	case NodeKind::Heading:
+		out->headingLevel = cmark_node_get_heading_level(node);
+		break;
+	case NodeKind::List:
+		out->listKind = ListKindFor(node);
+		out->listDelimiter = ListDelimiterFor(node);
+		out->listStart = cmark_node_get_list_start(node);
+		out->tight = cmark_node_get_list_tight(node) != 0;
+		break;
+	case NodeKind::ListItem:
+		out->taskState = TaskStateFor(node);
+		break;
+	case NodeKind::Table:
+		out->tableAlignments = TableAlignmentsFor(node);
+		break;
+	case NodeKind::TableRow:
+		out->tableHeader = TableRowIsHeader(node);
+		break;
+	case NodeKind::TableCell:
+		out->tableColumn = TableCellColumn(node);
+		break;
+	case NodeKind::Link:
+		out->url = FromCmarkString(cmark_node_get_url(node));
+		out->title = FromCmarkString(cmark_node_get_title(node));
+		break;
+	case NodeKind::FootnoteReference:
+		out->raw = SourceSlice(state->normalizedSource, out->range);
+		if (const auto parent = cmark_node_parent_footnote_def(node)) {
+			out->footnoteLabel = FromCmarkString(cmark_node_get_literal(parent));
+		}
+		if (out->footnoteLabel.isEmpty()) {
+			out->footnoteLabel = ExtractFootnoteLabel(out->raw, false);
+		}
+		break;
+	case NodeKind::FootnoteDefinition:
+		out->raw = SourceSlice(state->normalizedSource, out->range);
+		out->footnoteLabel = FromCmarkString(cmark_node_get_literal(node));
+		if (out->footnoteLabel.isEmpty()) {
+			out->footnoteLabel = ExtractFootnoteLabel(out->raw, true);
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+void EnsureCmarkExtensionsRegistered() {
+	static std::once_flag once;
+	std::call_once(once, [] {
+		cmark_gfm_core_extensions_ensure_registered();
+	});
+}
+
+} // namespace
+
+void ParserDeleter::operator()(cmark_parser *parser) const {
+	if (parser) {
+		cmark_parser_free(parser);
+	}
+}
+
+void NodeDeleter::operator()(cmark_node *node) const {
+	if (node) {
+		cmark_node_free(node);
+	}
+}
+
+bool AttachExtensions(cmark_parser *parser, QString *error) {
+	if (!parser) {
+		if (error) {
+			*error = u"cmark-parser-failed"_q;
+		}
+		return false;
+	}
+	EnsureCmarkExtensionsRegistered();
+	constexpr auto kExtensions = std::array<const char *, 5>{
+		"table",
+		"strikethrough",
+		"autolink",
+		"tagfilter",
+		"tasklist",
+	};
+	for (const auto name : kExtensions) {
+		const auto extension = cmark_find_syntax_extension(name);
+		if (!extension) {
+			if (error) {
+				*error = ExtensionError(u"cmark-extension-missing"_q, name);
+			}
+			return false;
+		}
+		if (!cmark_parser_attach_syntax_extension(parser, extension)) {
+			if (error) {
+				*error = ExtensionError(
+					u"cmark-extension-attach-failed"_q,
+					name);
+			}
+			return false;
+		}
+	}
+	if (error) {
+		error->clear();
+	}
+	return true;
+}
+
+bool CollectScanMetadata(
+		cmark_node *node,
+		ParserState *state,
+		int depth) {
+	const auto &limits = ParseLimitsForIv();
+	if (!node || !state || state->failed) {
+		return false;
+	}
+	if (state->stats) {
+		state->stats->maxDepth = std::max(state->stats->maxDepth, depth);
+	}
+	if (depth > limits.maxNesting) {
+		return FailScanMetadata(state, u"cmark-nesting-too-deep"_q);
+	}
+	if (state->stats) {
+		++state->stats->cmarkNodeCount;
+		if (state->stats->cmarkNodeCount > limits.maxCmarkNodes) {
+			return FailScanMetadata(state, u"too-many-cmark-nodes"_q);
+		}
+	}
+	RecordCapabilities(node, state);
+	const auto range = NodeRange(
+		node,
+		state->lineStarts,
+		static_cast<int>(state->normalizedSource.size()));
+	if (IsBlockForMathParent(node) && state->scanBlocks) {
+		state->scanBlocks->push_back(MathScanBlock{ range, CmarkKind(node) });
+	}
+	if (IsMathMaskedNode(node)) {
+		MarkMaskRange(state->mask, range);
+	}
+	for (auto child = cmark_node_first_child(node); child;) {
+		const auto next = cmark_node_next(child);
+		if (!CollectScanMetadata(child, state, depth + 1)) {
+			return false;
+		}
+		child = next;
+	}
+	return true;
+}
+
+QString NormalizeParsedFragmentId(QString fragment) {
+	fragment = QString::fromUtf8(
+		QByteArray::fromPercentEncoding(fragment.toUtf8()));
+	fragment = fragment.trimmed().toLower();
+	while (fragment.startsWith(u"#"_q)) {
+		fragment.remove(0, 1);
+	}
+	return fragment;
+}
+
+bool ConvertNode(
+		cmark_node *node,
+		ParserState *state,
+		int depth,
+		MarkdownNode *out) {
+	const auto &limits = ParseLimitsForIv();
+	if (!node || !state || !out || state->failed) {
+		return false;
+	}
+	if (depth > limits.maxNesting) {
+		return FailScanMetadata(state, u"cmark-nesting-too-deep"_q);
+	}
+	out->kind = NodeKindFor(node);
+	out->range = NodeRange(
+		node,
+		state->lineStarts,
+		static_cast<int>(state->normalizedSource.size()));
+	if (out->kind == NodeKind::Unsupported) {
+		out->unsupportedKind = CmarkKind(node);
+		out->raw = SourceSlice(state->normalizedSource, out->range);
+	}
+	FillNodeAttributes(node, state, out);
+	for (auto child = cmark_node_first_child(node); child;) {
+		const auto next = cmark_node_next(child);
+		auto converted = MarkdownNode();
+		if (!ConvertNode(child, state, depth + 1, &converted)) {
+			return false;
+		}
+		out->children.push_back(std::move(converted));
+		child = next;
+	}
+	if (out->kind == NodeKind::Link) {
+		out->autolink = LinkLooksAutolink(*out);
+		if (out->autolink && state->stats) {
+			state->stats->autolinksSeen = true;
+		}
+	}
+	if (state->stats) {
+		++state->stats->convertedNodeCount;
+	}
+	return true;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_convert.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_convert.h
new file mode 100644
index 00000000000000..3960bacd299f7c
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_convert.h
@@ -0,0 +1,61 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_math.h"
+#include "iv/markdown/iv_markdown_parse.h"
+
+#include <cmark-gfm.h>
+
+#include <memory>
+#include <vector>
+
+namespace Iv::Markdown {
+
+struct ParserDeleter {
+	void operator()(cmark_parser *parser) const;
+};
+
+struct NodeDeleter {
+	void operator()(cmark_node *node) const;
+};
+
+using ParserPointer = std::unique_ptr<cmark_parser, ParserDeleter>;
+using NodePointer = std::unique_ptr<cmark_node, NodeDeleter>;
+
+struct ParserState {
+	const QByteArray &normalizedSource;
+	const std::vector<int> &lineStarts;
+	std::vector<bool> *mask = nullptr;
+	std::vector<MathScanBlock> *scanBlocks = nullptr;
+	ParseStats *stats = nullptr;
+	QStringList *warnings = nullptr;
+	QString error;
+	bool failed = false;
+};
+
+struct ParsedDetailsBlock {
+	QString summary;
+	QString body;
+	bool open = false;
+	bool ok = false;
+};
+
+[[nodiscard]] bool AttachExtensions(cmark_parser *parser, QString *error);
+[[nodiscard]] bool CollectScanMetadata(
+	cmark_node *node,
+	ParserState *state,
+	int depth);
+[[nodiscard]] QString NormalizeParsedFragmentId(QString fragment);
+[[nodiscard]] bool ConvertNode(
+	cmark_node *node,
+	ParserState *state,
+	int depth,
+	MarkdownNode *out);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_finalize.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_finalize.cpp
new file mode 100644
index 00000000000000..9bf3c39cef13e3
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_finalize.cpp
@@ -0,0 +1,827 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_parse_finalize.h"
+#include "iv/markdown/iv_markdown_parse_validate.h"
+
+#include <algorithm>
+#include <cstddef>
+#include <limits>
+#include <utility>
+#include <vector>
+
+namespace Iv::Markdown {
+namespace {
+
+void OffsetToPosition(
+		const std::vector<int> &lineStarts,
+		int offset,
+		int *line,
+		int *column) {
+	const auto clampedOffset = std::max(offset, 0);
+	auto resultLine = 1;
+	auto resultColumn = clampedOffset + 1;
+	if (!lineStarts.empty()) {
+		auto i = std::upper_bound(
+			lineStarts.begin(),
+			lineStarts.end(),
+			clampedOffset);
+		if (i != lineStarts.begin()) {
+			--i;
+			resultLine = static_cast<int>(i - lineStarts.begin()) + 1;
+			resultColumn = clampedOffset - *i + 1;
+		}
+	}
+	if (line) {
+		*line = resultLine;
+	}
+	if (column) {
+		*column = resultColumn;
+	}
+}
+
+[[nodiscard]] QString SourceSlice(
+		const QByteArray &source,
+		const SourceRange &range) {
+	if (!range.available) {
+		return QString();
+	}
+	const auto sourceSize = static_cast<int>(source.size());
+	const auto start = std::clamp(range.startOffset, 0, sourceSize);
+	const auto end = std::clamp(range.endOffset, start, sourceSize);
+	const auto slice = source.mid(start, end - start);
+	return QString::fromUtf8(slice.constData(), slice.size());
+}
+
+[[nodiscard]] SourceRange RangeForOffsets(
+		const std::vector<int> &lineStarts,
+		int sourceSize,
+		int startOffset,
+		int endOffset) {
+	auto startLine = 0;
+	auto startColumn = 0;
+	auto endLine = 0;
+	auto endColumn = 0;
+	OffsetToPosition(lineStarts, startOffset, &startLine, &startColumn);
+	OffsetToPosition(
+		lineStarts,
+		std::max(startOffset, endOffset - 1),
+		&endLine,
+		&endColumn);
+	return RangeFromLineColumns(
+		lineStarts,
+		sourceSize,
+		startLine,
+		startColumn,
+		endLine,
+		endColumn);
+}
+
+[[nodiscard]] QString PlainText(const MarkdownNode &node) {
+	auto result = node.text;
+	for (const auto &child : node.children) {
+		result.append(PlainText(child));
+	}
+	return result;
+}
+
+[[nodiscard]] QString AnchorIdBaseFromText(QString text) {
+	text = text.trimmed().toLower();
+	auto result = QString();
+	auto pendingHyphen = false;
+	for (const auto ch : text) {
+		if (ch.isLetterOrNumber()) {
+			if (pendingHyphen && !result.isEmpty()) {
+				result.append(QChar('-'));
+			}
+			result.append(ch);
+			pendingHyphen = false;
+		} else if (!result.isEmpty()) {
+			pendingHyphen = true;
+		}
+	}
+	if (result.isEmpty()) {
+		return u"section"_q;
+	}
+	return result;
+}
+
+[[nodiscard]] QString FootnoteDefinitionAnchorId(int ordinal) {
+	return (ordinal > 0) ? (u"fn-"_q + QString::number(ordinal)) : QString();
+}
+
+[[nodiscard]] MarkdownNode DisplayMathNode(
+		const MathFormula &formula,
+		int vectorIndex) {
+	auto result = MarkdownNode();
+	result.kind = NodeKind::DisplayMath;
+	result.range = formula.range;
+	result.text = formula.tex;
+	result.formulaIndex = vectorIndex;
+	return result;
+}
+
+[[nodiscard]] int RangeEndOffset(const SourceRange &range) {
+	return range.available ? range.endOffset : std::numeric_limits<int>::min();
+}
+
+[[nodiscard]] int RangeStartOffset(const SourceRange &range) {
+	return range.available
+		? range.startOffset
+		: std::numeric_limits<int>::max();
+}
+
+[[nodiscard]] bool IsBreakNode(NodeKind kind) {
+	return kind == NodeKind::SoftBreak || kind == NodeKind::LineBreak;
+}
+
+void TrimBreakEdges(std::vector<MarkdownNode> *children) {
+	if (!children) {
+		return;
+	}
+	while (!children->empty() && IsBreakNode(children->front().kind)) {
+		children->erase(children->begin());
+	}
+	while (!children->empty() && IsBreakNode(children->back().kind)) {
+		children->pop_back();
+	}
+}
+
+[[nodiscard]] bool RangeContains(
+		const SourceRange &outer,
+		const SourceRange &inner) {
+	return outer.available
+		&& inner.available
+		&& outer.startOffset <= inner.startOffset
+		&& outer.endOffset >= inner.endOffset;
+}
+
+[[nodiscard]] bool RangeOverlaps(
+		const SourceRange &range,
+		int clipStart,
+		int clipEnd) {
+	return range.available
+		&& (range.endOffset > clipStart)
+		&& (range.startOffset < clipEnd);
+}
+
+[[nodiscard]] bool FirstAvailableRange(
+		const MarkdownNode &node,
+		SourceRange *out);
+[[nodiscard]] bool LastAvailableRange(
+		const MarkdownNode &node,
+		SourceRange *out);
+
+[[nodiscard]] bool FirstAvailableRangeInChildren(
+		const std::vector<MarkdownNode> &children,
+		SourceRange *out) {
+	for (const auto &child : children) {
+		if (FirstAvailableRange(child, out)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] bool LastAvailableRangeInChildren(
+		const std::vector<MarkdownNode> &children,
+		SourceRange *out) {
+	for (auto i = children.rbegin(); i != children.rend(); ++i) {
+		if (LastAvailableRange(*i, out)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] bool FirstAvailableRange(
+		const MarkdownNode &node,
+		SourceRange *out) {
+	if (node.range.available) {
+		if (out) {
+			*out = node.range;
+		}
+		return true;
+	}
+	return FirstAvailableRangeInChildren(node.children, out);
+}
+
+[[nodiscard]] bool LastAvailableRange(
+		const MarkdownNode &node,
+		SourceRange *out) {
+	if (node.range.available) {
+		if (out) {
+			*out = node.range;
+		}
+		return true;
+	}
+	return LastAvailableRangeInChildren(node.children, out);
+}
+
+[[nodiscard]] bool RangeFromChildren(
+		const std::vector<MarkdownNode> &children,
+		SourceRange *out) {
+	auto first = SourceRange();
+	auto last = SourceRange();
+	if (!FirstAvailableRangeInChildren(children, &first)
+		|| !LastAvailableRangeInChildren(children, &last)) {
+		return false;
+	}
+	auto result = first;
+	result.endLine = last.endLine;
+	result.endColumn = last.endColumn;
+	result.endOffset = last.endOffset;
+	if (out) {
+		*out = result;
+	}
+	return true;
+}
+
+[[nodiscard]] bool ClipNodeToOffsets(
+		const MarkdownNode &node,
+		const QByteArray &source,
+		const std::vector<int> &lineStarts,
+		int clipStart,
+		int clipEnd,
+		MarkdownNode *out) {
+	if (!out || clipEnd <= clipStart || IsBreakNode(node.kind)) {
+		return false;
+	}
+	if (node.range.available && !RangeOverlaps(node.range, clipStart, clipEnd)) {
+		return false;
+	}
+	if (node.children.empty()) {
+		if (!node.range.available) {
+			return false;
+		}
+		const auto clippedStart = std::max(node.range.startOffset, clipStart);
+		const auto clippedEnd = std::min(node.range.endOffset, clipEnd);
+		if (clippedEnd <= clippedStart) {
+			return false;
+		}
+		*out = node;
+		out->range = RangeForOffsets(
+			lineStarts,
+			static_cast<int>(source.size()),
+			clippedStart,
+			clippedEnd);
+		if (clippedStart == node.range.startOffset
+			&& clippedEnd == node.range.endOffset) {
+			return true;
+		}
+		switch (node.kind) {
+		case NodeKind::Text:
+		case NodeKind::InlineCode:
+			out->text = SourceSlice(source, out->range);
+			break;
+		case NodeKind::HtmlBlock:
+		case NodeKind::HtmlInline:
+		case NodeKind::Unsupported:
+			out->raw = SourceSlice(source, out->range);
+			break;
+		default:
+			return false;
+		}
+		return true;
+	}
+	auto result = node;
+	result.children.clear();
+	for (const auto &child : node.children) {
+		if (IsBreakNode(child.kind)) {
+			if (!result.children.empty()) {
+				result.children.push_back(child);
+			}
+			continue;
+		}
+		auto clippedChild = MarkdownNode();
+		if (ClipNodeToOffsets(
+				child,
+				source,
+				lineStarts,
+				clipStart,
+				clipEnd,
+				&clippedChild)) {
+			result.children.push_back(std::move(clippedChild));
+		}
+	}
+	TrimBreakEdges(&result.children);
+	if (result.children.empty()) {
+		return false;
+	}
+	auto clippedRange = SourceRange();
+	if (RangeFromChildren(result.children, &clippedRange)) {
+		result.range = clippedRange;
+	}
+	*out = std::move(result);
+	return true;
+}
+
+[[nodiscard]] bool ParagraphSegment(
+		const MarkdownNode &paragraph,
+		const QByteArray &source,
+		const std::vector<int> &lineStarts,
+		int clipStart,
+		int clipEnd,
+		MarkdownNode *out) {
+	if (clipEnd <= clipStart) {
+		return false;
+	}
+	return ClipNodeToOffsets(
+		paragraph,
+		source,
+		lineStarts,
+		clipStart,
+		clipEnd,
+		out);
+}
+
+[[nodiscard]] std::vector<MarkdownNode> SplitParagraphAroundDisplayMath(
+		const MarkdownNode &paragraph,
+		const std::vector<MathFormula> &formulas,
+		const std::vector<int> &displayIndexes,
+		int begin,
+		int end,
+		const QByteArray &source,
+		const std::vector<int> &lineStarts) {
+	auto result = std::vector<MarkdownNode>();
+	if (!paragraph.range.available) {
+		result.push_back(paragraph);
+		return result;
+	}
+	auto cursor = paragraph.range.startOffset;
+	for (auto i = begin; i != end; ++i) {
+		const auto formulaIndex = displayIndexes[i];
+		const auto &formula = formulas[formulaIndex];
+		if (!RangeContains(paragraph.range, formula.range)) {
+			continue;
+		}
+		auto segment = MarkdownNode();
+		if (ParagraphSegment(
+				paragraph,
+				source,
+				lineStarts,
+				cursor,
+				formula.range.startOffset,
+				&segment)) {
+			result.push_back(std::move(segment));
+		}
+		result.push_back(DisplayMathNode(formula, formulaIndex));
+		cursor = std::max(cursor, formula.range.endOffset);
+	}
+	auto tail = MarkdownNode();
+	if (ParagraphSegment(
+			paragraph,
+			source,
+			lineStarts,
+			cursor,
+			paragraph.range.endOffset,
+			&tail)) {
+		result.push_back(std::move(tail));
+	}
+	return result;
+}
+
+[[nodiscard]] std::vector<int> DisplayFormulaIndexes(
+		const std::vector<MathFormula> &formulas) {
+	auto result = std::vector<int>();
+	const auto count = static_cast<int>(formulas.size());
+	for (auto i = 0; i != count; ++i) {
+		if (formulas[i].kind == MathKind::Display) {
+			result.push_back(i);
+		}
+	}
+	std::sort(
+		result.begin(),
+		result.end(),
+		[&](int left, int right) {
+			const auto leftOffset = RangeStartOffset(formulas[left].range);
+			const auto rightOffset = RangeStartOffset(formulas[right].range);
+			return (leftOffset != rightOffset)
+				? (leftOffset < rightOffset)
+				: (left < right);
+		});
+	return result;
+}
+
+[[nodiscard]] bool CanNormalizeDisplayMathChildren(NodeKind kind) {
+	switch (kind) {
+	case NodeKind::Document:
+	case NodeKind::List:
+	case NodeKind::ListItem:
+	case NodeKind::Blockquote:
+	case NodeKind::Table:
+	case NodeKind::TableRow:
+		return true;
+	default:
+		return false;
+	}
+}
+
+void NormalizeDisplayMathChildren(
+		MarkdownNode *node,
+		const std::vector<MathFormula> &formulas,
+		const std::vector<int> &displayIndexes,
+		int begin,
+		int end,
+		const QByteArray &source,
+		const std::vector<int> &lineStarts) {
+	if (!node || begin >= end || node->children.empty()) {
+		return;
+	}
+	auto originalChildren = std::move(node->children);
+	auto children = std::vector<MarkdownNode>();
+	children.reserve(originalChildren.size() + (end - begin));
+	auto formula = begin;
+	for (auto &child : originalChildren) {
+		while (formula != end
+			&& child.range.available
+			&& RangeEndOffset(formulas[displayIndexes[formula]].range)
+				<= child.range.startOffset) {
+			const auto formulaIndex = displayIndexes[formula];
+			children.push_back(DisplayMathNode(formulas[formulaIndex], formulaIndex));
+			++formula;
+		}
+		auto childEnd = formula;
+		while (childEnd != end) {
+			const auto &formulaRange = formulas[displayIndexes[childEnd]].range;
+			if (!RangeContains(child.range, formulaRange)) {
+				break;
+			}
+			++childEnd;
+		}
+		if (formula != childEnd && child.kind == NodeKind::Paragraph) {
+			auto split = SplitParagraphAroundDisplayMath(
+				child,
+				formulas,
+				displayIndexes,
+				formula,
+				childEnd,
+				source,
+				lineStarts);
+			for (auto &part : split) {
+				children.push_back(std::move(part));
+			}
+			formula = childEnd;
+			continue;
+		}
+		if (formula != childEnd && child.kind == NodeKind::TableCell) {
+			children.push_back(std::move(child));
+			formula = childEnd;
+			continue;
+		}
+		if (formula != childEnd && CanNormalizeDisplayMathChildren(child.kind)) {
+			NormalizeDisplayMathChildren(
+				&child,
+				formulas,
+				displayIndexes,
+				formula,
+				childEnd,
+				source,
+				lineStarts);
+			formula = childEnd;
+		}
+		children.push_back(std::move(child));
+	}
+	while (formula != end) {
+		const auto formulaIndex = displayIndexes[formula];
+		children.push_back(DisplayMathNode(formulas[formulaIndex], formulaIndex));
+		++formula;
+	}
+	node->children = std::move(children);
+}
+
+[[nodiscard]] int CountNodes(const MarkdownNode &node) {
+	auto result = 1;
+	for (const auto &child : node.children) {
+		result += CountNodes(child);
+	}
+	return result;
+}
+
+[[nodiscard]] int *FindNamedCounter(
+		std::vector<std::pair<QString, int>> *entries,
+		const QString &key) {
+	if (!entries) {
+		return nullptr;
+	}
+	for (auto &entry : *entries) {
+		if (entry.first == key) {
+			return &entry.second;
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] int FindNamedValue(
+		const std::vector<std::pair<QString, int>> &entries,
+		const QString &key) {
+	for (const auto &entry : entries) {
+		if (entry.first == key) {
+			return entry.second;
+		}
+	}
+	return 0;
+}
+
+[[nodiscard]] bool ContainsAnchorId(
+		const std::vector<QString> &anchors,
+		const QString &value) {
+	return std::find(anchors.begin(), anchors.end(), value) != anchors.end();
+}
+
+void AssignHeadingAnchors(
+		MarkdownNode *node,
+		std::vector<std::pair<QString, int>> *counts,
+		QStringList *warnings) {
+	if (!node) {
+		return;
+	}
+	if (node->kind == NodeKind::Heading) {
+		const auto base = AnchorIdBaseFromText(PlainText(*node));
+		auto count = FindNamedCounter(counts, base);
+		if (count) {
+			++(*count);
+			node->anchorId = base + u"-"_q + QString::number(*count);
+			if (warnings) {
+				warnings->push_back(
+					u"Duplicate heading anchor \"%1\" remapped to \"%2\""_q.arg(
+						base
+					).arg(
+						node->anchorId));
+			}
+		} else {
+			counts->push_back({ base, 1 });
+			node->anchorId = base;
+		}
+	}
+	for (auto &child : node->children) {
+		AssignHeadingAnchors(&child, counts, warnings);
+	}
+}
+
+void AssignFootnoteDefinitionOrdinals(
+		MarkdownNode *node,
+		std::vector<std::pair<QString, int>> *definitions,
+		int *nextOrdinal,
+		QStringList *warnings) {
+	if (!node || !definitions || !nextOrdinal) {
+		return;
+	}
+	if (node->kind == NodeKind::FootnoteDefinition) {
+		if (node->footnoteLabel.isEmpty()) {
+			if (warnings) {
+				warnings->push_back(
+					u"Footnote definition without label at %1:%2"_q.arg(
+						node->range.startLine
+					).arg(
+						node->range.startColumn));
+			}
+		} else if (const auto existing = FindNamedValue(
+				*definitions,
+				node->footnoteLabel)) {
+			node->footnoteOrdinal = existing;
+			node->anchorId = FootnoteDefinitionAnchorId(existing);
+			if (warnings) {
+				warnings->push_back(
+					u"Duplicate footnote definition \"%1\""_q.arg(
+						node->footnoteLabel));
+			}
+		} else {
+			node->footnoteOrdinal = *nextOrdinal;
+			node->anchorId = FootnoteDefinitionAnchorId(*nextOrdinal);
+			definitions->push_back({ node->footnoteLabel, *nextOrdinal });
+			++(*nextOrdinal);
+		}
+	}
+	for (auto &child : node->children) {
+		AssignFootnoteDefinitionOrdinals(&child, definitions, nextOrdinal, warnings);
+	}
+}
+
+void AssignFootnoteReferenceOrdinals(
+		MarkdownNode *node,
+		const std::vector<std::pair<QString, int>> &definitions,
+		QStringList *warnings) {
+	if (!node) {
+		return;
+	}
+	if (node->kind == NodeKind::FootnoteReference) {
+		if (node->footnoteLabel.isEmpty()) {
+			if (warnings) {
+				warnings->push_back(
+					u"Footnote reference without label at %1:%2"_q.arg(
+						node->range.startLine
+					).arg(
+						node->range.startColumn));
+			}
+		} else if (const auto ordinal = FindNamedValue(
+				definitions,
+				node->footnoteLabel)) {
+			node->footnoteOrdinal = ordinal;
+		} else if (warnings) {
+			warnings->push_back(
+				u"Unresolved footnote reference \"%1\""_q.arg(
+					node->footnoteLabel));
+		}
+	}
+	for (auto &child : node->children) {
+		AssignFootnoteReferenceOrdinals(&child, definitions, warnings);
+	}
+}
+
+void CollectAnchorIds(
+		const MarkdownNode &node,
+		std::vector<QString> *anchors) {
+	if (!anchors) {
+		return;
+	}
+	if (!node.anchorId.isEmpty()
+		&& (node.kind == NodeKind::Heading
+			|| node.kind == NodeKind::FootnoteDefinition)) {
+		anchors->push_back(node.anchorId);
+	}
+	for (const auto &child : node.children) {
+		CollectAnchorIds(child, anchors);
+	}
+}
+
+void ValidateLocalFragments(
+		const MarkdownNode &node,
+		const std::vector<QString> &anchors,
+		QStringList *warnings) {
+	if (node.kind == NodeKind::Link && node.url.startsWith(QChar('#'))) {
+		const auto fragment = NormalizeParsedFragmentId(node.url.mid(1));
+		if (fragment.isEmpty() || !ContainsAnchorId(anchors, fragment)) {
+			if (warnings) {
+				warnings->push_back(
+					u"Unresolved local fragment \"%1\""_q.arg(
+						node.url));
+			}
+		}
+	}
+	for (const auto &child : node.children) {
+		ValidateLocalFragments(child, anchors, warnings);
+	}
+}
+
+[[nodiscard]] QString FirstHeadingTitle(const MarkdownNode &node) {
+	if (node.kind == NodeKind::Heading) {
+		return PlainText(node).trimmed();
+	}
+	for (const auto &child : node.children) {
+		const auto result = FirstHeadingTitle(child);
+		if (!result.isEmpty()) {
+			return result;
+		}
+	}
+	return QString();
+}
+
+void FillFormulaStats(PreparedDocument *document) {
+	if (!document) {
+		return;
+	}
+	document->stats.inlineFormulaCount = 0;
+	document->stats.displayFormulaCount = 0;
+	for (const auto &formula : document->formulas) {
+		switch (formula.kind) {
+		case MathKind::Inline:
+			++document->stats.inlineFormulaCount;
+			break;
+		case MathKind::Display:
+			++document->stats.displayFormulaCount;
+			break;
+		}
+	}
+}
+
+} // namespace
+
+void FinalizeDocumentSemantics(PreparedDocument *document) {
+	if (!document) {
+		return;
+	}
+	auto headingCounts = std::vector<std::pair<QString, int>>();
+	AssignHeadingAnchors(
+		&document->document,
+		&headingCounts,
+		&document->warnings);
+
+	auto footnoteDefinitions = std::vector<std::pair<QString, int>>();
+	auto nextFootnoteOrdinal = 1;
+	AssignFootnoteDefinitionOrdinals(
+		&document->document,
+		&footnoteDefinitions,
+		&nextFootnoteOrdinal,
+		&document->warnings);
+	AssignFootnoteReferenceOrdinals(
+		&document->document,
+		footnoteDefinitions,
+		&document->warnings);
+
+	auto anchors = std::vector<QString>();
+	CollectAnchorIds(document->document, &anchors);
+	ValidateLocalFragments(document->document, anchors, &document->warnings);
+}
+
+void NormalizeDisplayMathBlocks(
+		PreparedDocument *document,
+		const QByteArray &source,
+		const std::vector<int> &lineStarts) {
+	if (!document) {
+		return;
+	}
+	const auto displayIndexes = DisplayFormulaIndexes(document->formulas);
+	if (!displayIndexes.empty()) {
+		NormalizeDisplayMathChildren(
+			&document->document,
+			document->formulas,
+			displayIndexes,
+			0,
+			static_cast<int>(displayIndexes.size()),
+			source,
+			lineStarts);
+	}
+	document->stats.convertedNodeCount = CountNodes(document->document);
+}
+
+ParseResult ParseMarkdownForIv(ValidatedMarkdownSource source) {
+	const auto &limits = ParseLimitsForIv();
+	auto mask = std::vector<bool>(source.normalized.size(), false);
+	const auto parserOptions = CMARK_OPT_DEFAULT
+		| CMARK_OPT_SOURCEPOS
+		| CMARK_OPT_FOOTNOTES
+		| CMARK_OPT_STRIKETHROUGH_DOUBLE_TILDE;
+	auto parser = ParserPointer(cmark_parser_new(parserOptions));
+	if (!parser) {
+		return Failure(
+			source.sourceName,
+			u"cmark-parser-failed"_q);
+	}
+	auto error = QString();
+	if (!AttachExtensions(parser.get(), &error)) {
+		return Failure(source.sourceName, std::move(error));
+	}
+	cmark_parser_feed(
+		parser.get(),
+		source.normalized.constData(),
+		static_cast<std::size_t>(source.normalized.size()));
+	auto root = NodePointer(cmark_parser_finish(parser.get()));
+	if (!root) {
+		return Failure(
+			source.sourceName,
+			u"cmark-parser-failed"_q);
+	}
+	auto document = EmptyDocument(std::move(source.sourceName));
+	document.sourceText = std::move(source.decoded);
+	auto scanBlocks = std::vector<MathScanBlock>();
+	auto state = ParserState{
+		source.normalized,
+		source.lineStarts,
+		&mask,
+		&scanBlocks,
+		&document.stats,
+		&document.warnings,
+	};
+	if (!CollectScanMetadata(root.get(), &state, 0)) {
+		return Failure(std::move(document.sourceName), std::move(state.error));
+	}
+	if (!ExtractMathRegions(
+			source.normalized,
+			mask,
+			source.lineStarts,
+			scanBlocks,
+			limits.maxFormulaBytes,
+			limits.maxFormulaCount,
+			&document.formulas,
+			&error)) {
+		return Failure(std::move(document.sourceName), std::move(error));
+	}
+	if (!ConvertNode(
+			root.get(),
+			&state,
+			0,
+			&document.document)) {
+		return Failure(
+			std::move(document.sourceName),
+			state.error.isEmpty()
+				? u"cmark-conversion-failed"_q
+				: std::move(state.error));
+	}
+	FillFormulaStats(&document);
+	NormalizeDisplayMathBlocks(
+		&document,
+		source.normalized,
+		source.lineStarts);
+	FinalizeDocumentSemantics(&document);
+	document.title = FirstHeadingTitle(document.document);
+	document.empty = document.document.children.empty()
+		&& document.formulas.empty();
+	return ParseResult{ std::move(document), QString(), true };
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_finalize.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_finalize.h
new file mode 100644
index 00000000000000..7ce7a590eb8c08
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_finalize.h
@@ -0,0 +1,20 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_parse_convert.h"
+
+namespace Iv::Markdown {
+
+void NormalizeDisplayMathBlocks(
+	PreparedDocument *document,
+	const QByteArray &source,
+	const std::vector<int> &lineStarts);
+void FinalizeDocumentSemantics(PreparedDocument *document);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_validate.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_validate.cpp
new file mode 100644
index 00000000000000..16663c9a83e6b0
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_validate.cpp
@@ -0,0 +1,205 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_parse_validate.h"
+#include "iv/markdown/iv_markdown_math.h"
+
+#include <array>
+#include <cstddef>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+[[nodiscard]] unsigned char ByteAt(const QByteArray &source, int index) {
+	return static_cast<unsigned char>(source.at(index));
+}
+
+template <std::size_t Size>
+[[nodiscard]] bool HasPrefix(
+		const QByteArray &source,
+		const std::array<unsigned char, Size> &prefix) {
+	if (source.size() < static_cast<int>(Size)) {
+		return false;
+	}
+	for (auto i = std::size_t(0); i != Size; ++i) {
+		if (ByteAt(source, static_cast<int>(i)) != prefix[i]) {
+			return false;
+		}
+	}
+	return true;
+}
+
+[[nodiscard]] bool HasUtf8Bom(const QByteArray &source) {
+	constexpr auto kUtf8Bom = std::array<unsigned char, 3>{
+		0xEF,
+		0xBB,
+		0xBF,
+	};
+	return HasPrefix(source, kUtf8Bom);
+}
+
+[[nodiscard]] bool HasUnsupportedUnicodeBom(const QByteArray &source) {
+	constexpr auto kUtf32Boms = std::array{
+		std::array<unsigned char, 4>{ 0x00, 0x00, 0xFE, 0xFF },
+		std::array<unsigned char, 4>{ 0xFF, 0xFE, 0x00, 0x00 },
+	};
+	for (const auto &bom : kUtf32Boms) {
+		if (HasPrefix(source, bom)) {
+			return true;
+		}
+	}
+	constexpr auto kUtf16Boms = std::array{
+		std::array<unsigned char, 2>{ 0xFE, 0xFF },
+		std::array<unsigned char, 2>{ 0xFF, 0xFE },
+	};
+	for (const auto &bom : kUtf16Boms) {
+		if (HasPrefix(source, bom)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] QByteArray StripUtf8Bom(QByteArray source) {
+	if (HasUtf8Bom(source)) {
+		source.remove(0, 3);
+	}
+	return source;
+}
+
+[[nodiscard]] bool IsAllowedControl(unsigned char byte) {
+	return byte == '\t' || byte == '\n' || byte == '\r';
+}
+
+[[nodiscard]] bool LooksBinary(const QByteArray &source) {
+	const auto size = static_cast<int>(source.size());
+	if (size == 0) {
+		return false;
+	}
+	auto controlBytes = 0;
+	for (auto i = 0; i != size; ++i) {
+		const auto byte = ByteAt(source, i);
+		if (byte == 0) {
+			return true;
+		} else if ((byte < 0x20 || byte == 0x7F)
+			&& !IsAllowedControl(byte)) {
+			++controlBytes;
+		}
+	}
+	return (controlBytes * 10) > size;
+}
+
+[[nodiscard]] bool IsUtf8Continuation(unsigned char byte) {
+	return (byte & 0xC0) == 0x80;
+}
+
+[[nodiscard]] bool IsValidCodepoint(int codepoint, int minimum) {
+	return codepoint >= minimum
+		&& codepoint <= 0x10FFFF
+		&& (codepoint < 0xD800 || codepoint > 0xDFFF);
+}
+
+[[nodiscard]] bool IsValidUtf8(const QByteArray &source) {
+	const auto size = static_cast<int>(source.size());
+	for (auto i = 0; i != size; ++i) {
+		const auto byte = ByteAt(source, i);
+		if (byte <= 0x7F) {
+			continue;
+		}
+		auto extraBytes = 0;
+		auto codepoint = 0;
+		auto minimum = 0;
+		if (byte >= 0xC2 && byte <= 0xDF) {
+			extraBytes = 1;
+			codepoint = byte & 0x1F;
+			minimum = 0x80;
+		} else if (byte >= 0xE0 && byte <= 0xEF) {
+			extraBytes = 2;
+			codepoint = byte & 0x0F;
+			minimum = 0x800;
+		} else if (byte >= 0xF0 && byte <= 0xF4) {
+			extraBytes = 3;
+			codepoint = byte & 0x07;
+			minimum = 0x10000;
+		} else {
+			return false;
+		}
+		if (i + extraBytes >= size) {
+			return false;
+		}
+		for (auto j = 1; j <= extraBytes; ++j) {
+			const auto continuation = ByteAt(source, i + j);
+			if (!IsUtf8Continuation(continuation)) {
+				return false;
+			}
+			codepoint = (codepoint << 6) | (continuation & 0x3F);
+		}
+		if (!IsValidCodepoint(codepoint, minimum)) {
+			return false;
+		}
+		i += extraBytes;
+	}
+	return true;
+}
+
+} // namespace
+
+ParseResult Failure(QString sourceName, QString error) {
+	auto result = ParseResult();
+	result.document = EmptyDocument(std::move(sourceName));
+	result.error = std::move(error);
+	result.ok = false;
+	return result;
+}
+
+MarkdownSourceValidationResult ValidationFailure(
+		QString sourceName,
+		QString error) {
+	auto result = MarkdownSourceValidationResult();
+	result.source.sourceName = std::move(sourceName);
+	result.error = std::move(error);
+	result.ok = false;
+	return result;
+}
+
+MarkdownSourceValidationResult ValidateMarkdownSourceForIv(
+		const QByteArray &source,
+		ParseOptions options) {
+	const auto &limits = ParseLimitsForIv();
+	if (source.size() > limits.maxSourceBytes) {
+		return ValidationFailure(
+			std::move(options.sourceName),
+			u"source-too-large"_q);
+	}
+	if (HasUnsupportedUnicodeBom(source)) {
+		return ValidationFailure(
+			std::move(options.sourceName),
+			u"source-unsupported-bom"_q);
+	}
+	auto normalized = StripUtf8Bom(source);
+	if (LooksBinary(normalized)) {
+		return ValidationFailure(
+			std::move(options.sourceName),
+			u"source-binary"_q);
+	}
+	if (!IsValidUtf8(normalized)) {
+		return ValidationFailure(
+			std::move(options.sourceName),
+			u"source-invalid-utf8"_q);
+	}
+	auto result = MarkdownSourceValidationResult();
+	result.source.normalized = std::move(normalized);
+	result.source.decoded = QString::fromUtf8(
+		result.source.normalized.constData(),
+		result.source.normalized.size());
+	result.source.lineStarts = BuildLineStarts(result.source.normalized);
+	result.source.sourceName = std::move(options.sourceName);
+	return result;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_validate.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_validate.h
new file mode 100644
index 00000000000000..0f04dbf7e4a321
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_parse_validate.h
@@ -0,0 +1,19 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_parse.h"
+
+namespace Iv::Markdown {
+
+[[nodiscard]] ParseResult Failure(QString sourceName, QString error);
+[[nodiscard]] MarkdownSourceValidationResult ValidationFailure(
+	QString sourceName,
+	QString error);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare.cpp
new file mode 100644
index 00000000000000..b02780e1fa251c
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare.cpp
@@ -0,0 +1,267 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_prepare.h"
+#include "iv/iv_rich_page.h"
+#include "iv/markdown/iv_markdown_prepare_blocks.h"
+#include "iv/markdown/iv_markdown_prepare_formulas.h"
+#include "iv/markdown/iv_markdown_prepare_native_blocks.h"
+#include "iv/markdown/iv_markdown_prepare_native_richtext.h"
+#include "iv/markdown/iv_markdown_prepare_state.h"
+
+#include <QtCore/QElapsedTimer>
+
+#include <algorithm>
+#include <limits>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+[[nodiscard]] int CountPreparedContentBlocks(
+		const MarkdownArticleContent &content) {
+	auto result = CountPreparedBlocks(content.blocks.blocks);
+	for (const auto &footnote : content.footnotes) {
+		result += CountPreparedBlocks(footnote.blocks);
+	}
+	return result;
+}
+
+[[nodiscard]] PreparedBlock ContentTooLongBlock() {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Placeholder;
+	block.placeholder.label = u"Content Too Long"_q;
+	block.placeholder.copyText = block.placeholder.label;
+	return block;
+}
+
+void KeepPreparedBlocksUpToLimit(
+		std::vector<PreparedBlock> *blocks,
+		int *remaining) {
+	auto keep = size_t(0);
+	for (; keep != blocks->size(); ++keep) {
+		if (*remaining <= 0) {
+			break;
+		}
+		--*remaining;
+		KeepPreparedBlocksUpToLimit(&(*blocks)[keep].children, remaining);
+	}
+	if (keep != blocks->size()) {
+		blocks->erase(blocks->begin() + keep, blocks->end());
+	}
+}
+
+void ApplySoftPreparedBlockLimit(std::vector<PreparedBlock> *blocks) {
+	const auto limit = PrepareLimitsForIv().maxPreparedBlocks;
+	if (CountPreparedBlocks(*blocks) <= limit) {
+		return;
+	}
+	auto remaining = std::max(limit - 1, 0);
+	KeepPreparedBlocksUpToLimit(blocks, &remaining);
+	blocks->push_back(ContentTooLongBlock());
+}
+
+[[nodiscard]] int PositiveLimit(int value, int fallback) {
+	return (value > 0) ? value : fallback;
+}
+
+[[nodiscard]] int LimitProduct(int a, int b) {
+	return int(std::min<int64>(
+		int64(a) * b,
+		std::numeric_limits<int>::max()));
+}
+
+} // namespace
+
+const MarkdownPrepareLimits &PrepareLimitsForIv() {
+	static const auto result = MarkdownPrepareLimits{
+		.tableRender = {
+			.maxRows = 128,
+			.maxColumns = 20,
+			.maxCells = 1024,
+		},
+		.markdownTableRender = {
+			.maxRows = 1'000,
+			.maxColumns = 50,
+			.maxCells = 50'000,
+		},
+		.visualListDepth = 16,
+		.visualQuoteDepth = 16,
+		.maxPreparedBlocks = 4096,
+	};
+	return result;
+}
+
+const MarkdownPrepareTableRenderLimits &PrepareTableRenderLimitsForIv() {
+	return PrepareLimitsForIv().tableRender;
+}
+
+MarkdownPrepareTableRenderLimits PrepareTableRenderLimitsForRichMessage(
+		const RichMessageLimits &limits) {
+	const auto fallback = RichMessageLimits();
+	const auto maxRows = PositiveLimit(limits.maxBlocks, fallback.maxBlocks);
+	const auto maxColumns = PositiveLimit(
+		limits.maxTableCols,
+		fallback.maxTableCols);
+	return {
+		.maxRows = maxRows,
+		.maxColumns = maxColumns,
+		.maxCells = LimitProduct(maxRows, maxColumns),
+	};
+}
+
+auto PrepareMarkdownTableRenderLimitsForIv()
+-> const MarkdownPrepareTableRenderLimits & {
+	return PrepareLimitsForIv().markdownTableRender;
+}
+
+MarkdownArticleContent PrepareSynchronously(PrepareRequest request) {
+	auto state = PrepareState();
+	auto timer = QElapsedTimer();
+	timer.start();
+	state.request = &request;
+	const auto finish = [&] {
+		state.result.debug.prepareMs = int(timer.elapsed());
+		return std::move(state.result);
+	};
+
+	if (!request.document) {
+		state.setTerminalFailure(
+			PrepareTerminalFailure::InvalidRequest,
+			u"missing-document"_q);
+		return finish();
+	}
+	if (const auto invalidStyle = InvalidStyleReason(request.dimensions)
+		; !invalidStyle.isEmpty()) {
+		state.setTerminalFailure(
+			PrepareTerminalFailure::InvalidStyle,
+			invalidStyle);
+		return finish();
+	}
+
+	state.sourceUtf8 = request.document->sourceText.toUtf8();
+	state.result.formulas.resize(FormulaSlotCount(*request.document));
+	state.result.debug.sourceWarningCount = int(request.document->warnings.size());
+
+	state.result.blocks = PrepareRenderData(*request.document, &state);
+	if (CountPreparedContentBlocks(state.result)
+		> PrepareLimitsForIv().maxPreparedBlocks) {
+		state.setTerminalFailure(
+			PrepareTerminalFailure::DocumentTooLarge,
+			u"prepared-block-limit"_q);
+		ClearPreparedOutput(&state.result);
+		return finish();
+	}
+	MeasurePreparedFormulas(&state);
+	if (state.result.failure.failed()) {
+		ClearPreparedOutput(&state.result);
+	}
+	return finish();
+}
+
+NativeInstantViewPrepareResult TryPrepareNativeInstantView(
+		NativeInstantViewPrepareRequest request) {
+	auto state = NativeIvPrepareState();
+	auto timer = QElapsedTimer();
+	timer.start();
+	state.result.mediaRuntime = std::move(request.mediaRuntime);
+	state.result.editMode = request.editMode;
+	state.dimensions = request.dimensionsOverride.value_or(
+		CaptureMarkdownPrepareDimensions());
+	state.tableRenderLimits = request.tableRenderLimits.value_or(
+		PrepareTableRenderLimitsForIv());
+	state.editMode = request.editMode;
+	const auto finish = [&](NativeInstantViewPrepareResultKind kind, QString reason) {
+		state.result.debug.prepareMs = int(timer.elapsed());
+		return NativeInstantViewPrepareResult{
+			.kind = kind,
+			.content = std::move(state.result),
+			.debugReason = std::move(reason),
+		};
+	};
+
+	if (!request.richPage) {
+		state.setFailure(
+			PrepareTerminalFailure::InvalidRequest,
+			u"missing-native-iv-rich-page"_q);
+		ClearPreparedOutput(&state.result);
+		return finish(
+			NativeInstantViewPrepareResultKind::Failure,
+			state.result.failure.debugReason);
+	}
+
+	if (!PrepareNativeIvBlocks(
+			*request.richPage,
+			&state.result.blocks.blocks,
+			&state)) {
+		if (state.result.failure.failed()) {
+			ClearPreparedOutput(&state.result);
+			return finish(
+				NativeInstantViewPrepareResultKind::Failure,
+				state.result.failure.debugReason);
+		}
+		(void)PrepareNativeIvPlainPlaceholderBlock(
+			u"Prepare Failed"_q,
+			&state.result.blocks.blocks);
+	}
+	ApplySoftPreparedBlockLimit(&state.result.blocks.blocks);
+	MeasureNativeIvPreparedFormulas(&state);
+	if (state.result.failure.failed()) {
+		ClearPreparedOutput(&state.result);
+		return finish(
+			NativeInstantViewPrepareResultKind::Failure,
+			state.result.failure.debugReason);
+	}
+	return finish(
+		NativeInstantViewPrepareResultKind::Supported,
+		QString());
+}
+
+NativeInstantViewLeafUpdateResult UpdatePreparedNativeInstantViewLeaf(
+		MarkdownArticleContent *content,
+		const RichPage &page,
+		const PreparedEditLeafSource &source,
+		std::optional<MarkdownPrepareTableRenderLimits> tableRenderLimits) {
+	if (!content) {
+		return NativeInstantViewLeafUpdateResult::Failed;
+	}
+	auto state = NativeIvPrepareState();
+	state.result.mediaRuntime = content->mediaRuntime;
+	state.result.editMode = content->editMode;
+	state.result.formulas = content->formulas;
+	state.dimensions = CaptureMarkdownPrepareDimensions();
+	state.tableRenderLimits = tableRenderLimits.value_or(
+		PrepareTableRenderLimitsForIv());
+	state.editMode = content->editMode;
+	state.nextFormulaIndex = int(content->formulas.size());
+	auto blocks = content->blocks.blocks;
+	auto formulaRange = NativeIvPreparedLeafFormulaRange{
+		.from = state.nextFormulaIndex,
+		.till = state.nextFormulaIndex,
+	};
+	const auto updated = UpdatePreparedNativeIvLeaf(
+		&blocks,
+		page,
+		source,
+		&state,
+		&formulaRange);
+	if (updated != NativeInstantViewLeafUpdateResult::Updated) {
+		return updated;
+	}
+	MeasureNativeIvPreparedFormulas(
+		&state,
+		formulaRange.from,
+		formulaRange.till);
+	if (state.result.failure.failed()) {
+		return NativeInstantViewLeafUpdateResult::Failed;
+	}
+	content->blocks.blocks = std::move(blocks);
+	content->formulas = std::move(state.result.formulas);
+	return NativeInstantViewLeafUpdateResult::Updated;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare.h
new file mode 100644
index 00000000000000..2ed94638af3403
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare.h
@@ -0,0 +1,798 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_document.h"
+#include "iv/markdown/iv_markdown_math_renderer.h"
+
+#include "ui/text/text_entity.h"
+
+#include <array>
+#include <memory>
+#include <optional>
+#include <variant>
+#include <vector>
+
+namespace style {
+struct Markdown;
+} // namespace style
+
+namespace Iv {
+struct RichPage;
+struct RichMessageLimits;
+} // namespace Iv
+
+namespace Iv::Markdown {
+
+enum class PreparedBlockKind {
+	Paragraph,
+	Thinking,
+	Heading,
+	CodeBlock,
+	Rule,
+	List,
+	ListItem,
+	Quote,
+	DisplayMath,
+	Table,
+	Details,
+	Photo,
+	Video,
+	Audio,
+	Map,
+	Channel,
+	GroupedMedia,
+	RelatedArticle,
+	EmbedPost,
+	Placeholder,
+};
+
+enum class PreparedLinkKind {
+	External,
+	InstantViewPage,
+	Anchor,
+	Footnote,
+	FootnoteBacklink,
+	LocalFile,
+	RejectedRelative,
+	ToggleDetails,
+};
+
+struct PreparedLink {
+	uint16 index = 0;
+	PreparedLinkKind kind = PreparedLinkKind::External;
+	QString target;
+	QString fragment;
+	QString copyText;
+	EntityType entityType = EntityType::Invalid;
+	EntityLinkShown shown = EntityLinkShown::Full;
+	uint64 webpageId = 0;
+};
+
+enum class InlineTextObjectKind {
+	Formula,
+	IvImage,
+};
+
+struct InlineTextObjectFormulaData {
+	QString copySource;
+	QString trimmedTex;
+};
+
+struct InlineTextObjectIvImageData {
+	uint64 documentId = 0;
+	int width = 0;
+	int height = 0;
+	QString replacementText;
+};
+
+struct InlineTextObjectEntity {
+	InlineTextObjectKind kind = InlineTextObjectKind::Formula;
+	std::variant<
+		InlineTextObjectFormulaData,
+		InlineTextObjectIvImageData> data = InlineTextObjectFormulaData();
+};
+
+enum class PreparedTableCellVerticalAlignment {
+	Top,
+	Middle,
+	Bottom,
+};
+
+enum class PreparedEditBlockContainerKind {
+	Root,
+	BlockChildren,
+	ListItemChildren,
+};
+
+struct PreparedEditBlockContainerStep {
+	PreparedEditBlockContainerKind kind
+		= PreparedEditBlockContainerKind::BlockChildren;
+	int blockIndex = -1;
+	int listItemIndex = -1;
+
+	friend inline bool operator==(
+			const PreparedEditBlockContainerStep &a,
+			const PreparedEditBlockContainerStep &b) {
+		return (a.kind == b.kind)
+			&& (a.blockIndex == b.blockIndex)
+			&& (a.listItemIndex == b.listItemIndex);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditBlockContainerStep &a,
+			const PreparedEditBlockContainerStep &b) {
+		return !(a == b);
+	}
+};
+
+struct PreparedEditBlockContainerPath {
+	std::vector<PreparedEditBlockContainerStep> steps;
+
+	friend inline bool operator==(
+			const PreparedEditBlockContainerPath &a,
+			const PreparedEditBlockContainerPath &b) {
+		return (a.steps == b.steps);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditBlockContainerPath &a,
+			const PreparedEditBlockContainerPath &b) {
+		return !(a == b);
+	}
+};
+
+struct PreparedEditBlockPath {
+	PreparedEditBlockContainerPath container;
+	int index = -1;
+
+	friend inline bool operator==(
+			const PreparedEditBlockPath &a,
+			const PreparedEditBlockPath &b) {
+		return (a.container == b.container)
+			&& (a.index == b.index);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditBlockPath &a,
+			const PreparedEditBlockPath &b) {
+		return !(a == b);
+	}
+};
+
+enum class PreparedEditLeafKind {
+	BlockText,
+	BlockCaption,
+	ListItemText,
+	TableCellText,
+	MathFormula,
+};
+
+struct PreparedEditLeafSource {
+	PreparedEditLeafKind kind = PreparedEditLeafKind::BlockText;
+	PreparedEditBlockPath block;
+	int listItemIndex = -1;
+	int tableRowIndex = -1;
+	int tableCellIndex = -1;
+
+	friend inline bool operator==(
+			const PreparedEditLeafSource &a,
+			const PreparedEditLeafSource &b) {
+		return (a.kind == b.kind)
+			&& (a.block == b.block)
+			&& (a.listItemIndex == b.listItemIndex)
+			&& (a.tableRowIndex == b.tableRowIndex)
+			&& (a.tableCellIndex == b.tableCellIndex);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditLeafSource &a,
+			const PreparedEditLeafSource &b) {
+		return !(a == b);
+	}
+};
+
+struct PreparedEditBlockSource {
+	PreparedEditBlockPath path;
+
+	friend inline bool operator==(
+			const PreparedEditBlockSource &a,
+			const PreparedEditBlockSource &b) {
+		return (a.path == b.path);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditBlockSource &a,
+			const PreparedEditBlockSource &b) {
+		return !(a == b);
+	}
+};
+
+struct PreparedEditListItemSource {
+	PreparedEditBlockPath block;
+	int listItemIndex = -1;
+
+	friend inline bool operator==(
+			const PreparedEditListItemSource &a,
+			const PreparedEditListItemSource &b) {
+		return (a.block == b.block)
+			&& (a.listItemIndex == b.listItemIndex);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditListItemSource &a,
+			const PreparedEditListItemSource &b) {
+		return !(a == b);
+	}
+};
+
+struct PreparedEditTableRowSource {
+	PreparedEditBlockPath block;
+	int tableRowIndex = -1;
+
+	friend inline bool operator==(
+			const PreparedEditTableRowSource &a,
+			const PreparedEditTableRowSource &b) {
+		return (a.block == b.block)
+			&& (a.tableRowIndex == b.tableRowIndex);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditTableRowSource &a,
+			const PreparedEditTableRowSource &b) {
+		return !(a == b);
+	}
+};
+
+struct PreparedEditTableCellSource {
+	PreparedEditBlockPath block;
+	int tableRowIndex = -1;
+	int tableCellIndex = -1;
+	int column = -1;
+	int colspan = 1;
+	int rowspan = 1;
+
+	friend inline bool operator==(
+			const PreparedEditTableCellSource &a,
+			const PreparedEditTableCellSource &b) {
+		return (a.block == b.block)
+			&& (a.tableRowIndex == b.tableRowIndex)
+			&& (a.tableCellIndex == b.tableCellIndex)
+			&& (a.column == b.column)
+			&& (a.colspan == b.colspan)
+			&& (a.rowspan == b.rowspan);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditTableCellSource &a,
+			const PreparedEditTableCellSource &b) {
+		return !(a == b);
+	}
+};
+
+struct PreparedEditBlockRange {
+	PreparedEditBlockContainerPath container;
+	int from = -1;
+	int till = -1;
+
+	[[nodiscard]] bool empty() const {
+		return (from < 0) || (till <= from);
+	}
+
+	friend inline bool operator==(
+			const PreparedEditBlockRange &a,
+			const PreparedEditBlockRange &b) {
+		return (a.container == b.container)
+			&& (a.from == b.from)
+			&& (a.till == b.till);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditBlockRange &a,
+			const PreparedEditBlockRange &b) {
+		return !(a == b);
+	}
+};
+
+struct PreparedEditListItemRange {
+	PreparedEditBlockPath block;
+	int from = -1;
+	int till = -1;
+
+	[[nodiscard]] bool empty() const {
+		return (from < 0) || (till <= from);
+	}
+
+	friend inline bool operator==(
+			const PreparedEditListItemRange &a,
+			const PreparedEditListItemRange &b) {
+		return (a.block == b.block)
+			&& (a.from == b.from)
+			&& (a.till == b.till);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditListItemRange &a,
+			const PreparedEditListItemRange &b) {
+		return !(a == b);
+	}
+};
+
+struct PreparedEditTableRowRange {
+	PreparedEditBlockPath block;
+	int from = -1;
+	int till = -1;
+
+	[[nodiscard]] bool empty() const {
+		return (from < 0) || (till <= from);
+	}
+
+	friend inline bool operator==(
+			const PreparedEditTableRowRange &a,
+			const PreparedEditTableRowRange &b) {
+		return (a.block == b.block)
+			&& (a.from == b.from)
+			&& (a.till == b.till);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditTableRowRange &a,
+			const PreparedEditTableRowRange &b) {
+		return !(a == b);
+	}
+};
+
+struct PreparedEditTableCellRange {
+	PreparedEditBlockPath block;
+	int rowFrom = -1;
+	int rowTill = -1;
+	int columnFrom = -1;
+	int columnTill = -1;
+
+	[[nodiscard]] bool empty() const {
+		return (rowFrom < 0)
+			|| (rowTill <= rowFrom)
+			|| (columnFrom < 0)
+			|| (columnTill <= columnFrom);
+	}
+
+	friend inline bool operator==(
+			const PreparedEditTableCellRange &a,
+			const PreparedEditTableCellRange &b) {
+		return (a.block == b.block)
+			&& (a.rowFrom == b.rowFrom)
+			&& (a.rowTill == b.rowTill)
+			&& (a.columnFrom == b.columnFrom)
+			&& (a.columnTill == b.columnTill);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditTableCellRange &a,
+			const PreparedEditTableCellRange &b) {
+		return !(a == b);
+	}
+};
+
+enum class PreparedEditSelectionKind {
+	None,
+	Blocks,
+	ListItems,
+	TableRows,
+	TableCells,
+};
+
+struct PreparedEditSelection {
+	PreparedEditSelectionKind kind = PreparedEditSelectionKind::None;
+	PreparedEditBlockRange blocks;
+	PreparedEditListItemRange listItems;
+	PreparedEditTableRowRange tableRows;
+	PreparedEditTableCellRange tableCells;
+
+	[[nodiscard]] bool empty() const {
+		switch (kind) {
+		case PreparedEditSelectionKind::Blocks:
+			return blocks.empty();
+		case PreparedEditSelectionKind::ListItems:
+			return listItems.empty();
+		case PreparedEditSelectionKind::TableRows:
+			return tableRows.empty();
+		case PreparedEditSelectionKind::TableCells:
+			return tableCells.empty();
+		case PreparedEditSelectionKind::None:
+			return true;
+		}
+		return true;
+	}
+
+	friend inline bool operator==(
+			const PreparedEditSelection &a,
+			const PreparedEditSelection &b) {
+		return (a.kind == b.kind)
+			&& (a.blocks == b.blocks)
+			&& (a.listItems == b.listItems)
+			&& (a.tableRows == b.tableRows)
+			&& (a.tableCells == b.tableCells);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditSelection &a,
+			const PreparedEditSelection &b) {
+		return !(a == b);
+	}
+};
+
+enum class PreparedEditHitKind {
+	None,
+	Block,
+	ListItem,
+	TableRow,
+	TableCell,
+	Leaf,
+};
+
+struct PreparedEditHit {
+	PreparedEditHitKind kind = PreparedEditHitKind::None;
+	std::optional<PreparedEditBlockSource> block;
+	std::optional<PreparedEditListItemSource> listItem;
+	std::optional<PreparedEditTableRowSource> tableRow;
+	std::optional<PreparedEditTableCellSource> tableCell;
+	std::optional<PreparedEditLeafSource> leaf;
+
+	[[nodiscard]] bool valid() const {
+		switch (kind) {
+		case PreparedEditHitKind::Block:
+			return block.has_value();
+		case PreparedEditHitKind::ListItem:
+			return listItem.has_value();
+		case PreparedEditHitKind::TableRow:
+			return tableRow.has_value();
+		case PreparedEditHitKind::TableCell:
+			return tableCell.has_value();
+		case PreparedEditHitKind::Leaf:
+			return leaf.has_value();
+		case PreparedEditHitKind::None:
+			return false;
+		}
+		return false;
+	}
+
+	friend inline bool operator==(
+			const PreparedEditHit &a,
+			const PreparedEditHit &b) {
+		return (a.kind == b.kind)
+			&& (a.block == b.block)
+			&& (a.listItem == b.listItem)
+			&& (a.tableRow == b.tableRow)
+			&& (a.tableCell == b.tableCell)
+			&& (a.leaf == b.leaf);
+	}
+
+	friend inline bool operator!=(
+			const PreparedEditHit &a,
+			const PreparedEditHit &b) {
+		return !(a == b);
+	}
+};
+
+struct PreparedTableCell {
+	TextWithEntities text;
+	std::vector<PreparedLink> links;
+	int column = 0;
+	TableAlignment alignment = TableAlignment::None;
+	bool header = false;
+	PreparedTableCellVerticalAlignment verticalAlignment
+		= PreparedTableCellVerticalAlignment::Top;
+	int colspan = 1;
+	int rowspan = 1;
+	std::optional<PreparedEditTableCellSource> editCell;
+	std::optional<PreparedEditLeafSource> editLeaf;
+	QString editPlaceholderText;
+};
+
+struct PreparedTableRow {
+	std::vector<PreparedTableCell> cells;
+	bool header = false;
+	std::optional<PreparedEditTableRowSource> editRow;
+};
+
+struct PreparedPhotoBlockData {
+	PreparedMediaBlockId id;
+	uint64 photoId = 0;
+	int width = 0;
+	int height = 0;
+	QString urlOverride;
+	TextWithEntities caption;
+	bool spoiler = false;
+	bool viewerOpen = false;
+};
+
+enum class PreparedMediaItemKind {
+	Photo,
+	Document,
+};
+
+struct PreparedMediaItemData {
+	PreparedMediaItemKind kind = PreparedMediaItemKind::Photo;
+	uint64 id = 0;
+	int width = 0;
+	int height = 0;
+	bool spoiler = false;
+};
+
+struct PreparedVideoBlockData {
+	PreparedMediaBlockId id;
+	PreparedMediaItemData media;
+	TextWithEntities caption;
+};
+
+struct PreparedAudioBlockData {
+	PreparedMediaBlockId id;
+	uint64 documentId = 0;
+	QString title;
+	QString performer;
+	QString fileName;
+	int duration = 0;
+};
+
+struct PreparedMapBlockData {
+	PreparedMediaBlockId id;
+	double latitude = 0.;
+	double longitude = 0.;
+	uint64 accessHash = 0;
+	int width = 0;
+	int height = 0;
+	int zoom = 0;
+	QString url;
+};
+
+struct PreparedChannelBlockData {
+	PreparedMediaBlockId id;
+	uint64 channelId = 0;
+	QString title;
+	QString username;
+};
+
+enum class PreparedGroupedMediaIntent {
+	Collage,
+	Slideshow,
+};
+
+struct PreparedGroupedMediaItemData {
+	PreparedMediaBlockId id;
+	PreparedMediaItemData media;
+};
+
+struct PreparedGroupedMediaBlockData {
+	PreparedMediaBlockId id;
+	PreparedGroupedMediaIntent intent = PreparedGroupedMediaIntent::Collage;
+	std::vector<PreparedGroupedMediaItemData> items;
+	TextWithEntities caption;
+};
+
+struct PreparedPlaceholderBlockData {
+	PreparedPlaceholderBlockId id;
+	QString label;
+	QString copyText;
+	std::optional<EmbedRequest> embed;
+};
+
+struct PreparedRelatedArticleBlockData {
+	PreparedLink link;
+	QString copyText;
+	QString title;
+	QString description;
+	QString footer;
+	uint64 photoId = 0;
+};
+
+struct PreparedEmbedPostBlockData {
+	QString url;
+	uint64 authorPhotoId = 0;
+	QString author;
+	QString dateText;
+};
+
+struct PreparedBlock {
+	PreparedBlockKind kind = PreparedBlockKind::Paragraph;
+	TextWithEntities text;
+	std::vector<PreparedLink> links;
+	std::vector<PreparedBlock> children;
+	std::vector<PreparedTableRow> tableRows;
+	std::vector<TableAlignment> tableAlignments;
+	TableAlignment flowAlignment = TableAlignment::Left;
+	QString codeLanguage;
+	QString formulaTex;
+	QString anchorId;
+	std::vector<QString> anchorIds;
+	PreparedPhotoBlockData photo;
+	PreparedVideoBlockData video;
+	PreparedAudioBlockData audio;
+	PreparedMapBlockData map;
+	PreparedChannelBlockData channel;
+	PreparedGroupedMediaBlockData groupedMedia;
+	PreparedEmbedPostBlockData embedPost;
+	PreparedPlaceholderBlockData placeholder;
+	PreparedRelatedArticleBlockData relatedArticle;
+	ListKind listKind = ListKind::Bullet;
+	ListDelimiter listDelimiter = ListDelimiter::None;
+	MathKind mathKind = MathKind::Display;
+	TaskState taskState = TaskState::None;
+	int headingLevel = 0;
+	int formulaIndex = -1;
+	int orderedNumber = 0;
+	int startNumber = 1;
+	int actualDepth = 0;
+	int visualDepth = 0;
+	int tableColumnCount = 0;
+	bool tableBordered = true;
+	bool tableStriped = false;
+	bool collapsed = false;
+	bool detailsOpen = false;
+	bool depthClamped = false;
+	bool tight = false;
+	bool supplementary = false;
+	bool pullquote = false;
+	bool forceTextSegment = false;
+	std::optional<PreparedEditBlockSource> editBlock;
+	std::optional<PreparedEditListItemSource> editListItem;
+	std::optional<PreparedEditLeafSource> editLeaf;
+	QString editPlaceholderText;
+};
+
+struct PreparedRenderDocument {
+	std::vector<PreparedBlock> blocks;
+};
+
+struct PreparedFootnote {
+	QString label;
+	QString displayText;
+	TextWithEntities text;
+	std::vector<PreparedLink> links;
+	std::vector<PreparedBlock> blocks;
+};
+
+struct MarkdownPrepareDimensions {
+	int bodyTextSize = 0;
+	std::array<int, 6> headingTextSizes = { 0, 0, 0, 0, 0, 0 };
+	int tableHeaderTextSize = 0;
+	int tableBodyTextSize = 0;
+	int displayMathTextSize = 0;
+	int displayMathMaxRenderWidth = 0;
+	int displayMathMaxRenderHeight = 0;
+};
+
+struct MarkdownPrepareTableRenderLimits {
+	int maxRows = 0;
+	int maxColumns = 0;
+	int maxCells = 0;
+};
+
+struct MarkdownPrepareLimits {
+	MarkdownPrepareTableRenderLimits tableRender;
+	MarkdownPrepareTableRenderLimits markdownTableRender;
+	int visualListDepth = 0;
+	int visualQuoteDepth = 0;
+	int maxPreparedBlocks = 0;
+};
+
+enum class PrepareTerminalFailure {
+	None,
+	InvalidRequest,
+	InvalidStyle,
+	DocumentTooLarge,
+	InternalError,
+};
+
+struct PrepareFailureStatus {
+	PrepareTerminalFailure terminal = PrepareTerminalFailure::None;
+	QString debugReason;
+
+	[[nodiscard]] bool failed() const {
+		return (terminal != PrepareTerminalFailure::None);
+	}
+};
+
+struct PrepareDebugStats {
+	int prepareMs = 0;
+	int formulaMeasureMs = 0;
+	int formulaRenderMs = 0;
+	int sourceWarningCount = 0;
+	int prepareWarningCount = 0;
+	int formulaWarningCount = 0;
+};
+
+struct PreparedFormulaSlot {
+	QString trimmedTex;
+	MathKind kind = MathKind::Display;
+	int textSize = 0;
+	int renderWidthCap = 0;
+	int renderHeightCap = 0;
+	std::shared_ptr<const MeasuredFormula> measuredData;
+	MeasuredFormula measured;
+	bool present = false;
+};
+
+struct PrepareRequest {
+	std::shared_ptr<const PreparedDocument> document;
+	std::shared_ptr<MathRenderer> renderer;
+	MarkdownPrepareDimensions dimensions;
+	QString sourcePath;
+};
+
+struct NativeInstantViewPrepareRequest {
+	std::shared_ptr<const Iv::RichPage> richPage;
+	std::shared_ptr<MediaRuntime> mediaRuntime;
+	std::optional<MarkdownPrepareDimensions> dimensionsOverride;
+	std::optional<MarkdownPrepareTableRenderLimits> tableRenderLimits;
+	bool editMode = false;
+};
+
+struct MarkdownArticleContent {
+	PreparedRenderDocument blocks;
+	std::vector<PreparedFootnote> footnotes;
+	std::vector<PreparedFormulaSlot> formulas;
+	std::shared_ptr<MediaRuntime> mediaRuntime;
+	bool editMode = false;
+	PrepareFailureStatus failure;
+	PrepareDebugStats debug;
+};
+
+enum class NativeInstantViewPrepareResultKind {
+	Supported,
+	Unsupported,
+	Failure,
+};
+
+enum class NativeInstantViewLeafUpdateResult {
+	Updated,
+	Unsupported,
+	Failed,
+};
+
+struct NativeInstantViewPrepareResult {
+	NativeInstantViewPrepareResultKind kind
+		= NativeInstantViewPrepareResultKind::Unsupported;
+	MarkdownArticleContent content;
+	QString debugReason;
+
+	[[nodiscard]] bool supported() const {
+		return (kind == NativeInstantViewPrepareResultKind::Supported);
+	}
+
+	[[nodiscard]] bool unsupported() const {
+		return (kind == NativeInstantViewPrepareResultKind::Unsupported);
+	}
+
+	[[nodiscard]] bool failed() const {
+		return (kind == NativeInstantViewPrepareResultKind::Failure);
+	}
+};
+
+[[nodiscard]] const MarkdownPrepareTableRenderLimits &PrepareTableRenderLimitsForIv();
+[[nodiscard]] MarkdownPrepareTableRenderLimits PrepareTableRenderLimitsForRichMessage(
+	const RichMessageLimits &limits);
+[[nodiscard]] auto PrepareMarkdownTableRenderLimitsForIv()
+-> const MarkdownPrepareTableRenderLimits &;
+[[nodiscard]] const MarkdownPrepareLimits &PrepareLimitsForIv();
+[[nodiscard]] MarkdownPrepareDimensions CaptureMarkdownPrepareDimensions();
+[[nodiscard]] MarkdownPrepareDimensions CaptureMarkdownPrepareDimensions(
+	const style::Markdown &st);
+[[nodiscard]] QString SerializeInlineTextObjectEntity(
+	const InlineTextObjectEntity &object);
+[[nodiscard]] QString InlineFormulaCopySource(const QString &source);
+[[nodiscard]] MarkdownArticleContent PrepareSynchronously(PrepareRequest request);
+[[nodiscard]] NativeInstantViewPrepareResult TryPrepareNativeInstantView(
+	NativeInstantViewPrepareRequest request);
+[[nodiscard]] NativeInstantViewLeafUpdateResult UpdatePreparedNativeInstantViewLeaf(
+	MarkdownArticleContent *content,
+	const RichPage &page,
+	const PreparedEditLeafSource &source,
+	std::optional<MarkdownPrepareTableRenderLimits> tableRenderLimits
+		= std::nullopt);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_blocks.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_blocks.cpp
new file mode 100644
index 00000000000000..9de3ee95906f99
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_blocks.cpp
@@ -0,0 +1,768 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_prepare_blocks.h"
+#include "iv/markdown/iv_markdown_prepare_inline.h"
+#include "iv/markdown/iv_markdown_prepare_links.h"
+
+#include <QtCore/QString>
+
+#include <algorithm>
+#include <limits>
+#include <memory>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+[[nodiscard]] QString DetailsAnchorId(PrepareState *state) {
+	return u"details-"_q + QString::number(++state->nextGeneratedId);
+}
+
+[[nodiscard]] int CappedListDepth(int depth) {
+	return std::min(depth, std::max(PrepareLimitsForIv().visualListDepth, 0));
+}
+
+[[nodiscard]] int CappedQuoteDepth(int depth) {
+	return std::min(depth, std::max(PrepareLimitsForIv().visualQuoteDepth, 0));
+}
+
+[[nodiscard]] int ScaleFormulaCap(int cap, int textSize, int baseTextSize) {
+	if (cap <= 0) {
+		return 0;
+	}
+	const auto numerator = int64(cap) * std::max(textSize, 1);
+	const auto denominator = std::max(baseTextSize, 1);
+	return std::max(int((numerator + denominator - 1) / denominator), 1);
+}
+
+[[nodiscard]] QString StripOneTrailingNewline(QString text) {
+	if (text.endsWith(u"\r\n"_q)) {
+		text.chop(2);
+	} else if (!text.isEmpty()) {
+		const auto last = text.back();
+		if ((last == QChar(u'\n')) || (last == QChar(u'\r'))) {
+			text.chop(1);
+		}
+	}
+	return text;
+}
+
+[[nodiscard]] int FlowFormulaTextSize(
+		PreparedBlockKind kind,
+		int headingLevel,
+		const MarkdownPrepareDimensions &dimensions) {
+	if (kind != PreparedBlockKind::Heading) {
+		return dimensions.bodyTextSize;
+	}
+	const auto index = std::clamp(headingLevel, 1, 6) - 1;
+	if (index < int(dimensions.headingTextSizes.size())) {
+		return dimensions.headingTextSizes[index];
+	}
+	return dimensions.bodyTextSize;
+}
+
+[[nodiscard]] int TableCellFormulaTextSize(
+		bool header,
+		const MarkdownPrepareDimensions &dimensions) {
+	return header
+		? dimensions.tableHeaderTextSize
+		: dimensions.tableBodyTextSize;
+}
+
+void PrepareTableCellText(
+		const MarkdownNode &cell,
+		bool header,
+		TextWithEntities *text,
+		std::vector<PreparedLink> *links,
+		PrepareState *state) {
+	const auto textSize = TableCellFormulaTextSize(
+		header,
+		state->request->dimensions);
+	PrepareInlineRichText(
+		cell,
+		textSize,
+		ScaleFormulaCap(
+			state->request->dimensions.displayMathMaxRenderWidth,
+			textSize,
+			state->request->dimensions.displayMathTextSize),
+		ScaleFormulaCap(
+			state->request->dimensions.displayMathMaxRenderHeight,
+			textSize,
+			state->request->dimensions.displayMathTextSize),
+		nullptr,
+		text,
+		links,
+	state);
+	SortEntities(text);
+}
+
+[[nodiscard]] int EffectiveTableRowWidth(const MarkdownNode &row) {
+	auto result = 0;
+	auto expectedColumn = 0;
+	for (const auto &cell : row.children) {
+		if (cell.kind != NodeKind::TableCell) {
+			return 0;
+		}
+		const auto column = (cell.tableColumn >= 0)
+			? cell.tableColumn
+			: expectedColumn;
+		if (column != expectedColumn) {
+			return 0;
+		}
+		result = std::max(result, column + 1);
+		++expectedColumn;
+	}
+	return result;
+}
+
+[[nodiscard]] int EffectiveTableColumnCount(const MarkdownNode &node) {
+	auto result = int(node.tableAlignments.size());
+	for (const auto &row : node.children) {
+		if (row.kind != NodeKind::TableRow) {
+			return 0;
+		}
+		const auto width = EffectiveTableRowWidth(row);
+		if (!width) {
+			return 0;
+		}
+		result = std::max(result, width);
+	}
+	return result;
+}
+
+[[nodiscard]] std::vector<TableAlignment> NormalizedTableAlignments(
+		const MarkdownNode &node,
+		int columnCount) {
+	auto result = std::vector<TableAlignment>(
+		std::max(columnCount, 0),
+		TableAlignment::None);
+	const auto limit = std::min(columnCount, int(node.tableAlignments.size()));
+	for (auto i = 0; i != limit; ++i) {
+		result[i] = node.tableAlignments[i];
+	}
+	return result;
+}
+
+[[nodiscard]] bool ShouldFlattenTable(
+		const MarkdownNode &node,
+		PrepareState *state) {
+	const auto &limits = PrepareMarkdownTableRenderLimitsForIv();
+	if (node.children.empty()) {
+		if (state) {
+			state->addPrepareWarning();
+		}
+		return true;
+	}
+	const auto rowCount = int(node.children.size());
+	if (rowCount > limits.maxRows) {
+		if (state) {
+			state->addPrepareWarning();
+		}
+		return true;
+	}
+	auto cellCount = 0;
+	for (const auto &row : node.children) {
+		if (row.kind != NodeKind::TableRow || row.children.empty()) {
+			if (state) {
+				state->addPrepareWarning();
+			}
+			return true;
+		}
+		const auto width = EffectiveTableRowWidth(row);
+		if (!width || width > limits.maxColumns) {
+			if (state) {
+				state->addPrepareWarning();
+			}
+			return true;
+		}
+		cellCount += width;
+		if (cellCount > limits.maxCells) {
+			if (state) {
+				state->addPrepareWarning();
+			}
+			return true;
+		}
+	}
+	const auto columnCount = EffectiveTableColumnCount(node);
+	if (!columnCount || columnCount > limits.maxColumns) {
+		if (state) {
+			state->addPrepareWarning();
+		}
+		return true;
+	}
+	if ((rowCount * columnCount) > limits.maxCells) {
+		if (state) {
+			state->addPrepareWarning();
+		}
+		return true;
+	}
+	return false;
+}
+
+[[nodiscard]] std::vector<PreparedBlock> PrepareFallbackBlocks(
+	const MarkdownNode &node,
+	PrepareContext context,
+	PrepareState *state);
+
+[[nodiscard]] std::vector<PreparedBlock> PrepareTableBlocks(
+		const MarkdownNode &node,
+		PrepareContext context,
+	PrepareState *state) {
+	const auto columnCount = EffectiveTableColumnCount(node);
+	if (ShouldFlattenTable(node, state) || !columnCount) {
+		return PrepareFallbackBlocks(node, context, state);
+	}
+
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Table;
+	block.tableColumnCount = columnCount;
+	block.tableAlignments = NormalizedTableAlignments(node, columnCount);
+	block.tableBordered = true;
+	block.tableStriped = false;
+	block.tableRows.reserve(node.children.size());
+
+	for (const auto &rowNode : node.children) {
+		if (rowNode.kind != NodeKind::TableRow) {
+			return PrepareFallbackBlocks(node, context, state);
+		}
+
+		auto row = PreparedTableRow();
+		row.header = rowNode.tableHeader;
+		row.cells.reserve(columnCount);
+
+		auto expectedColumn = 0;
+		for (const auto &cellNode : rowNode.children) {
+			if (cellNode.kind != NodeKind::TableCell) {
+				return PrepareFallbackBlocks(node, context, state);
+			}
+			const auto column = (cellNode.tableColumn >= 0)
+				? cellNode.tableColumn
+				: expectedColumn;
+			if (column != expectedColumn || column >= columnCount) {
+				return PrepareFallbackBlocks(node, context, state);
+			}
+
+			auto cell = PreparedTableCell();
+			cell.column = column;
+			cell.alignment = block.tableAlignments[column];
+			cell.header = rowNode.tableHeader;
+			cell.verticalAlignment = PreparedTableCellVerticalAlignment::Top;
+			cell.colspan = 1;
+			cell.rowspan = 1;
+			PrepareTableCellText(
+				cellNode,
+				rowNode.tableHeader,
+				&cell.text,
+				&cell.links,
+				state);
+			row.cells.push_back(std::move(cell));
+			++expectedColumn;
+		}
+		for (auto column = expectedColumn; column != columnCount; ++column) {
+			auto cell = PreparedTableCell();
+			cell.column = column;
+			cell.alignment = block.tableAlignments[column];
+			cell.header = rowNode.tableHeader;
+			cell.verticalAlignment = PreparedTableCellVerticalAlignment::Top;
+			cell.colspan = 1;
+			cell.rowspan = 1;
+			row.cells.push_back(std::move(cell));
+		}
+		block.tableRows.push_back(std::move(row));
+	}
+	return { std::move(block) };
+}
+
+void AppendPrepared(
+		std::vector<PreparedBlock> &&from,
+		std::vector<PreparedBlock> *to) {
+	for (auto &block : from) {
+		to->push_back(std::move(block));
+	}
+}
+
+void AppendRichBlock(
+		std::vector<PreparedBlock> *blocks,
+		PreparedBlockKind kind,
+		int headingLevel,
+		TextWithEntities text,
+		std::vector<PreparedLink> links,
+		QString anchorId = QString(),
+		bool collapsed = false,
+		bool allowEmpty = false) {
+	SortEntities(&text);
+	if (text.text.isEmpty() && !allowEmpty) {
+		return;
+	}
+	auto block = PreparedBlock();
+	block.kind = kind;
+	block.headingLevel = headingLevel;
+	block.text = std::move(text);
+	block.links = std::move(links);
+	block.anchorId = std::move(anchorId);
+	block.collapsed = collapsed;
+	blocks->push_back(std::move(block));
+}
+
+[[nodiscard]] PreparedBlock EmptyParagraphBlock() {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Paragraph;
+	return block;
+}
+
+[[nodiscard]] PreparedBlock PrepareCodeBlock(const MarkdownNode &node) {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::CodeBlock;
+	block.text.text = StripOneTrailingNewline(node.text);
+	block.codeLanguage = FirstInfoToken(node.info);
+	return block;
+}
+
+[[nodiscard]] PreparedBlock PrepareRuleBlock() {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Rule;
+	return block;
+}
+
+[[nodiscard]] PreparedBlock PrepareDisplayMathBlock(
+		const MarkdownNode &node,
+		PrepareState *state) {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::DisplayMath;
+	block.formulaTex = !node.text.isEmpty() ? node.text : node.raw;
+	block.mathKind = MathKind::Display;
+	block.formulaIndex = node.formulaIndex;
+	state->rememberFormula(block);
+	return block;
+}
+
+void CollectFootnoteDefinitions(
+		const MarkdownNode &node,
+		std::vector<FootnoteDefinitionEntry> *definitions) {
+	if (!definitions) {
+		return;
+	}
+	if (node.kind == NodeKind::FootnoteDefinition && node.footnoteOrdinal > 0) {
+		if (node.footnoteOrdinal > int(definitions->size())) {
+			definitions->resize(node.footnoteOrdinal);
+		}
+		auto &entry = (*definitions)[node.footnoteOrdinal - 1];
+		if (!entry.node) {
+			entry.node = &node;
+		}
+	}
+	for (const auto &child : node.children) {
+		CollectFootnoteDefinitions(child, definitions);
+	}
+}
+
+[[nodiscard]] std::vector<PreparedBlock> PrepareBlocks(
+	const MarkdownNode &node,
+	PrepareContext context,
+	PrepareState *state);
+
+[[nodiscard]] std::vector<PreparedBlock> PrepareChildren(
+		const MarkdownNode &node,
+		PrepareContext context,
+		PrepareState *state) {
+	auto result = std::vector<PreparedBlock>();
+	for (const auto &child : node.children) {
+		AppendPrepared(PrepareBlocks(child, context, state), &result);
+	}
+	return result;
+}
+
+[[nodiscard]] uint16 InternalPreparedLinkIndex(const QString &data) {
+	const auto prefix = u"internal:index"_q;
+	return (data.size() == prefix.size() + 1 && data.startsWith(prefix))
+		? uint16(data.back().unicode())
+		: uint16(0);
+}
+
+[[nodiscard]] uint16 RemappedPreparedLinkIndex(
+		const std::vector<std::pair<uint16, uint16>> &remapped,
+		uint16 index) {
+	for (const auto &[from, to] : remapped) {
+		if (from == index) {
+			return to;
+		}
+	}
+	return 0;
+}
+
+void AppendFootnoteTextFragment(
+		const TextWithEntities &fromText,
+		const std::vector<PreparedLink> &fromLinks,
+		TextWithEntities *toText,
+		std::vector<PreparedLink> *toLinks) {
+	auto remapped = std::vector<std::pair<uint16, uint16>>();
+	remapped.reserve(fromLinks.size());
+	for (const auto &link : fromLinks) {
+		const auto index = toLinks->size() + 1;
+		if (index > std::numeric_limits<uint16>::max()) {
+			continue;
+		}
+		auto copy = link;
+		copy.index = uint16(index);
+		remapped.push_back({ link.index, copy.index });
+		toLinks->push_back(std::move(copy));
+	}
+
+	const auto shift = toText->text.size();
+	toText->text.append(fromText.text);
+	toText->entities.reserve(toText->entities.size() + fromText.entities.size());
+	for (const auto &entity : fromText.entities) {
+		auto data = entity.data();
+		if (entity.type() == EntityType::CustomUrl) {
+			if (const auto from = InternalPreparedLinkIndex(data)) {
+				if (const auto to = RemappedPreparedLinkIndex(remapped, from)) {
+					data = InternalLinkData(to);
+				}
+			}
+		}
+		toText->entities.push_back(EntityInText(
+			entity.type(),
+			entity.offset() + shift,
+			entity.length(),
+			data));
+	}
+}
+
+void AppendFootnoteVisibleText(
+		const TextWithEntities &fromText,
+		const std::vector<PreparedLink> &fromLinks,
+		TextWithEntities *toText,
+		std::vector<PreparedLink> *toLinks) {
+	if (fromText.text.isEmpty()) {
+		return;
+	}
+	if (!toText->text.isEmpty()) {
+		toText->text.append(u"\n\n"_q);
+	}
+	AppendFootnoteTextFragment(fromText, fromLinks, toText, toLinks);
+}
+
+void FlattenFootnoteBlock(
+		const PreparedBlock &block,
+		TextWithEntities *text,
+		std::vector<PreparedLink> *links) {
+	AppendFootnoteVisibleText(block.text, block.links, text, links);
+	for (const auto &row : block.tableRows) {
+		for (const auto &cell : row.cells) {
+			AppendFootnoteVisibleText(cell.text, cell.links, text, links);
+		}
+	}
+	for (const auto &child : block.children) {
+		FlattenFootnoteBlock(child, text, links);
+	}
+}
+
+void FlattenFootnoteBlocks(
+		const std::vector<PreparedBlock> &blocks,
+		TextWithEntities *text,
+		std::vector<PreparedLink> *links) {
+	for (const auto &block : blocks) {
+		FlattenFootnoteBlock(block, text, links);
+	}
+	SortEntities(text);
+}
+
+void PrepareFootnotes(PrepareState *state) {
+	if (!state || state->footnoteDefinitions.empty()) {
+		return;
+	}
+	state->result.footnotes.reserve(state->footnoteDefinitions.size());
+	for (const auto &entry : state->footnoteDefinitions) {
+		if (!entry.node) {
+			continue;
+		}
+		auto footnote = PreparedFootnote();
+		footnote.label = !entry.node->footnoteLabel.isEmpty()
+			? entry.node->footnoteLabel
+			: QString::number(entry.node->footnoteOrdinal);
+		footnote.displayText = u"["_q + footnote.label + u"]"_q;
+		footnote.blocks = PrepareChildren(*entry.node, {}, state);
+		FlattenFootnoteBlocks(footnote.blocks, &footnote.text, &footnote.links);
+		if (footnote.text.text.isEmpty()) {
+			footnote.text = TextWithEntities::Simple(footnote.displayText);
+		}
+		state->result.footnotes.push_back(std::move(footnote));
+	}
+}
+
+[[nodiscard]] std::vector<PreparedBlock> PrepareNestedDetailsBody(
+		const MarkdownNode &node,
+		PrepareState *state) {
+	const auto fallback = [&] {
+		if (state) {
+			state->addPrepareWarning();
+		}
+		auto blocks = std::vector<PreparedBlock>();
+		AppendRichBlock(
+			&blocks,
+			PreparedBlockKind::Paragraph,
+			0,
+			TextWithEntities::Simple(node.detailsBody),
+			std::vector<PreparedLink>());
+		return blocks;
+	};
+	if (node.detailsBody.isEmpty()) {
+		return {};
+	}
+	const auto parsed = ParseMarkdownForIv(
+		node.detailsBody.toUtf8(),
+		ParseOptions{ state->request->document->sourceName + u"#details"_q });
+	if (!parsed.ok
+		|| !parsed.document.formulas.empty()
+		|| parsed.document.stats.footnotesSeen) {
+		return fallback();
+	}
+	auto nestedRequest = PrepareRequest{
+		.document = std::make_shared<const PreparedDocument>(parsed.document),
+		.renderer = state->request->renderer,
+		.dimensions = state->request->dimensions,
+		.sourcePath = state->request->sourcePath,
+	};
+	auto nested = PrepareSynchronously(std::move(nestedRequest));
+	state->addPrepareWarnings(nested.debug.prepareWarningCount);
+	state->addFormulaWarnings(nested.debug.formulaWarningCount);
+	return nested.failure.failed()
+		? fallback()
+		: std::move(nested.blocks.blocks);
+}
+
+[[nodiscard]] std::vector<PreparedBlock> PrepareDetailsBlocks(
+		const MarkdownNode &node,
+		PrepareState *state) {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Details;
+	block.anchorId = DetailsAnchorId(state);
+	block.collapsed = !node.detailsOpen;
+	block.text = TextWithEntities::Simple(node.detailsSummary);
+	block.children = PrepareNestedDetailsBody(node, state);
+	return { std::move(block) };
+}
+
+[[nodiscard]] std::vector<PreparedBlock> PrepareDocumentBlocks(
+		const MarkdownNode &node,
+		PrepareState *state) {
+	return PrepareChildren(node, {}, state);
+}
+
+[[nodiscard]] std::vector<PreparedBlock> PrepareFlowBlock(
+		const MarkdownNode &node,
+		PreparedBlockKind kind,
+		PrepareState *state) {
+	auto result = std::vector<PreparedBlock>();
+	auto anchorId = (kind == PreparedBlockKind::Heading)
+		? node.anchorId
+		: QString();
+	auto text = TextWithEntities();
+	auto links = std::vector<PreparedLink>();
+	const auto textSize = FlowFormulaTextSize(
+		kind,
+		(kind == PreparedBlockKind::Heading) ? node.headingLevel : 0,
+		state->request->dimensions);
+	PrepareInlineRichText(
+		node,
+		textSize,
+		ScaleFormulaCap(
+			state->request->dimensions.displayMathMaxRenderWidth,
+			textSize,
+			state->request->dimensions.displayMathTextSize),
+		ScaleFormulaCap(
+			state->request->dimensions.displayMathMaxRenderHeight,
+			textSize,
+			state->request->dimensions.displayMathTextSize),
+		&anchorId,
+		&text,
+		&links,
+		state);
+	AppendRichBlock(
+		&result,
+		kind,
+		(kind == PreparedBlockKind::Heading) ? node.headingLevel : 0,
+		std::move(text),
+		std::move(links),
+		std::move(anchorId));
+	return result;
+}
+
+[[nodiscard]] PreparedBlock PrepareListItemBlock(
+		const MarkdownNode &node,
+		PrepareContext context,
+		const PreparedBlock &list,
+		int orderedNumber,
+		PrepareState *state) {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::ListItem;
+	block.listKind = list.listKind;
+	block.listDelimiter = list.listDelimiter;
+	block.taskState = node.taskState;
+	block.orderedNumber = orderedNumber;
+	block.actualDepth = list.actualDepth;
+	block.visualDepth = list.visualDepth;
+	block.depthClamped = list.depthClamped;
+
+	auto childContext = context;
+	childContext.listDepth = context.listDepth + 1;
+	for (const auto &child : node.children) {
+		AppendPrepared(PrepareBlocks(child, childContext, state), &block.children);
+	}
+	if (block.children.empty()) {
+		block.children.push_back(EmptyParagraphBlock());
+	}
+	return block;
+}
+
+[[nodiscard]] PreparedBlock PrepareListBlock(
+		const MarkdownNode &node,
+		PrepareContext context,
+		PrepareState *state) {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::List;
+	block.listKind = node.listKind;
+	block.listDelimiter = node.listDelimiter;
+	block.startNumber = (node.listKind == ListKind::Ordered && node.listStart > 0)
+		? node.listStart
+		: 1;
+	block.actualDepth = context.listDepth;
+	block.visualDepth = CappedListDepth(block.actualDepth);
+	block.depthClamped = (block.actualDepth > block.visualDepth);
+	block.tight = node.tight;
+
+	auto nextNumber = block.startNumber;
+	auto childContext = context;
+	childContext.listDepth = context.listDepth + 1;
+	for (const auto &child : node.children) {
+		if (child.kind == NodeKind::ListItem) {
+			auto item = PrepareListItemBlock(
+				child,
+				context,
+				block,
+				(node.listKind == ListKind::Ordered) ? nextNumber : 0,
+				state);
+			block.children.push_back(std::move(item));
+			if (node.listKind == ListKind::Ordered) {
+				++nextNumber;
+			}
+		} else {
+			AppendPrepared(PrepareBlocks(child, childContext, state), &block.children);
+		}
+	}
+	return block;
+}
+
+[[nodiscard]] PreparedBlock PrepareQuoteBlock(
+		const MarkdownNode &node,
+		PrepareContext context,
+		PrepareState *state) {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Quote;
+	block.actualDepth = context.quoteDepth;
+	block.visualDepth = CappedQuoteDepth(block.actualDepth);
+	block.depthClamped = (block.actualDepth > block.visualDepth);
+
+	auto childContext = context;
+	childContext.quoteDepth = context.quoteDepth + 1;
+	block.children = PrepareChildren(node, childContext, state);
+	return block;
+}
+
+[[nodiscard]] std::vector<PreparedBlock> PrepareFallbackBlocks(
+		const MarkdownNode &node,
+		PrepareContext context,
+		PrepareState *state) {
+	if (node.kind == NodeKind::HtmlBlock) {
+		if (node.htmlBlockKind == HtmlBlockKind::Comment) {
+			return {};
+		} else if (node.htmlBlockKind == HtmlBlockKind::Details) {
+			return PrepareDetailsBlocks(node, state);
+		}
+	}
+	if (!node.children.empty()) {
+		return PrepareChildren(node, context, state);
+	}
+	const auto text = !node.text.isEmpty() ? node.text : node.raw;
+	if (text.isEmpty()) {
+		return {};
+	}
+	auto result = std::vector<PreparedBlock>();
+	AppendRichBlock(
+		&result,
+		PreparedBlockKind::Paragraph,
+		0,
+		TextWithEntities::Simple(text),
+		std::vector<PreparedLink>());
+	return result;
+}
+
+[[nodiscard]] std::vector<PreparedBlock> PrepareBlocks(
+		const MarkdownNode &node,
+		PrepareContext context,
+		PrepareState *state) {
+	switch (node.kind) {
+	case NodeKind::Document:
+		return PrepareDocumentBlocks(node, state);
+	case NodeKind::TableRow:
+	case NodeKind::TableCell:
+	case NodeKind::HtmlBlock:
+	case NodeKind::Unsupported:
+		return PrepareFallbackBlocks(node, context, state);
+	case NodeKind::DisplayMath:
+		return { PrepareDisplayMathBlock(node, state) };
+	case NodeKind::Paragraph:
+		return PrepareFlowBlock(node, PreparedBlockKind::Paragraph, state);
+	case NodeKind::Heading:
+		return PrepareFlowBlock(node, PreparedBlockKind::Heading, state);
+	case NodeKind::FootnoteDefinition:
+		return {};
+	case NodeKind::CodeBlock:
+		return { PrepareCodeBlock(node) };
+	case NodeKind::ThematicBreak:
+		return { PrepareRuleBlock() };
+	case NodeKind::List: {
+		auto block = PrepareListBlock(node, context, state);
+		return { std::move(block) };
+	} break;
+	case NodeKind::ListItem: {
+		auto list = PreparedBlock();
+		list.kind = PreparedBlockKind::List;
+		list.actualDepth = context.listDepth;
+		list.visualDepth = CappedListDepth(list.actualDepth);
+		list.depthClamped = (list.actualDepth > list.visualDepth);
+		auto block = PrepareListItemBlock(node, context, list, 0, state);
+		return { std::move(block) };
+	} break;
+	case NodeKind::Blockquote: {
+		auto block = PrepareQuoteBlock(node, context, state);
+		return { std::move(block) };
+	} break;
+	case NodeKind::Table:
+		return PrepareTableBlocks(node, context, state);
+	default:
+		return PrepareFallbackBlocks(node, context, state);
+	}
+	return {};
+}
+
+} // namespace
+
+PreparedRenderDocument PrepareRenderData(
+		const PreparedDocument &document,
+		PrepareState *state) {
+	auto result = PreparedRenderDocument();
+	state->result.footnotes.clear();
+	state->footnoteDefinitions.clear();
+	CollectFootnoteDefinitions(document.document, &state->footnoteDefinitions);
+	result.blocks = PrepareBlocks(document.document, {}, state);
+	PrepareFootnotes(state);
+	return result;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_blocks.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_blocks.h
new file mode 100644
index 00000000000000..cdcd31d9a22ce4
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_blocks.h
@@ -0,0 +1,18 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_prepare_state.h"
+
+namespace Iv::Markdown {
+
+[[nodiscard]] PreparedRenderDocument PrepareRenderData(
+	const PreparedDocument &document,
+	PrepareState *state);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_formulas.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_formulas.cpp
new file mode 100644
index 00000000000000..01d9ec26fe21c1
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_formulas.cpp
@@ -0,0 +1,202 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_prepare_formulas.h"
+
+#include <QtCore/QElapsedTimer>
+
+#include <algorithm>
+#include <memory>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+[[nodiscard]] PreparedFormulaMeasurementSignature FormulaMeasurementSignature(
+		const PreparedFormulaSlot &slot,
+		const MarkdownPrepareDimensions &dimensions) {
+	return {
+		.trimmedTex = slot.trimmedTex.trimmed(),
+		.kind = slot.kind,
+		.textSize = slot.textSize
+			? slot.textSize
+			: dimensions.displayMathTextSize,
+		.renderWidthCap = slot.renderWidthCap
+			? slot.renderWidthCap
+			: dimensions.displayMathMaxRenderWidth,
+		.renderHeightCap = slot.renderHeightCap
+			? slot.renderHeightCap
+			: dimensions.displayMathMaxRenderHeight,
+	};
+}
+
+[[nodiscard]] std::shared_ptr<const MeasuredFormula>
+FindDocumentFormulaMeasurement(
+		const std::shared_ptr<const PreparedDocument> &document,
+		int index,
+		const PreparedFormulaMeasurementSignature &signature) {
+	const auto cache = document ? document->formulaMeasurementCache : nullptr;
+	if (!cache) {
+		return nullptr;
+	}
+	if (index >= 0 && index < int(cache->slots.size())) {
+		const auto &entry = cache->slots[index];
+		if (entry.data && entry.signature == signature) {
+			cache->bySignature.emplace(signature, entry.data);
+			return entry.data;
+		}
+	}
+	if (const auto i = cache->bySignature.find(signature)
+		; i != end(cache->bySignature)) {
+		if (index >= 0) {
+			if (index >= int(cache->slots.size())) {
+				cache->slots.resize(index + 1);
+			}
+			cache->slots[index] = {
+				.signature = signature,
+				.data = i->second,
+			};
+		}
+		return i->second;
+	}
+	return nullptr;
+}
+
+void RememberDocumentFormulaMeasurement(
+		const std::shared_ptr<const PreparedDocument> &document,
+		int index,
+		PreparedFormulaMeasurementSignature signature,
+		std::shared_ptr<const MeasuredFormula> data) {
+	const auto cache = document ? document->formulaMeasurementCache : nullptr;
+	if (!cache || index < 0 || !data) {
+		return;
+	}
+	auto shared = std::move(data);
+	if (const auto i = cache->bySignature.find(signature)
+		; i != end(cache->bySignature)) {
+		shared = i->second;
+	} else {
+		cache->bySignature.emplace(signature, shared);
+	}
+	if (index >= int(cache->slots.size())) {
+		cache->slots.resize(index + 1);
+	}
+	cache->slots[index] = {
+		.signature = std::move(signature),
+		.data = std::move(shared),
+	};
+}
+
+} // namespace
+
+int CountPreparedBlocks(const std::vector<PreparedBlock> &blocks) {
+	auto result = 0;
+	for (const auto &block : blocks) {
+		++result;
+		result += CountPreparedBlocks(block.children);
+	}
+	return result;
+}
+
+int FormulaSlotCount(const PreparedDocument &document) {
+	auto result = 0;
+	for (const auto &formula : document.formulas) {
+		result = std::max(result, formula.index + 1);
+	}
+	return result;
+}
+
+void MeasurePreparedFormulas(PrepareState *state) {
+	const auto &dimensions = state->request->dimensions;
+	auto ownedRenderer = std::shared_ptr<MathRenderer>();
+	auto renderer = state->request ? state->request->renderer.get() : nullptr;
+	if (!renderer) {
+		ownedRenderer = std::make_shared<MathRenderer>();
+		renderer = ownedRenderer.get();
+	}
+	auto timer = QElapsedTimer();
+	timer.start();
+	for (auto i = 0, count = int(state->result.formulas.size()); i != count; ++i) {
+		auto &slot = state->result.formulas[i];
+		if (!slot.present) {
+			continue;
+		}
+		const auto signature = FormulaMeasurementSignature(slot, dimensions);
+		if (const auto cached = FindDocumentFormulaMeasurement(
+				state->request->document,
+				i,
+				signature)) {
+			slot.measuredData = cached;
+			slot.measured = *cached;
+		} else {
+			auto data = std::make_shared<MeasuredFormula>(renderer->measureFormula({
+				.trimmedTex = signature.trimmedTex,
+				.kind = signature.kind,
+				.textSize = signature.textSize,
+				.renderWidthCap = signature.renderWidthCap,
+				.renderHeightCap = signature.renderHeightCap,
+			}));
+			slot.measuredData = data;
+			slot.measured = *data;
+			RememberDocumentFormulaMeasurement(
+				state->request->document,
+				i,
+				signature,
+				std::move(data));
+		}
+		if (!slot.measured.success) {
+			state->addFormulaWarning();
+		}
+	}
+	state->result.debug.formulaMeasureMs = int(timer.elapsed());
+	state->result.debug.formulaRenderMs
+		= state->result.debug.formulaMeasureMs;
+}
+
+void MeasureNativeIvPreparedFormulas(NativeIvPrepareState *state) {
+	MeasureNativeIvPreparedFormulas(
+		state,
+		0,
+		int(state->result.formulas.size()));
+}
+
+void MeasureNativeIvPreparedFormulas(
+		NativeIvPrepareState *state,
+		int from,
+		int till) {
+	const auto &dimensions = state->dimensions;
+	auto renderer = MathRenderer();
+	auto timer = QElapsedTimer();
+	timer.start();
+	const auto count = int(state->result.formulas.size());
+	from = std::clamp(from, 0, count);
+	till = std::clamp(till, from, count);
+	for (auto i = from; i != till; ++i) {
+		auto &slot = state->result.formulas[i];
+		if (!slot.present) {
+			continue;
+		}
+		const auto signature = FormulaMeasurementSignature(slot, dimensions);
+		auto data = std::make_shared<MeasuredFormula>(renderer.measureFormula({
+			.trimmedTex = signature.trimmedTex,
+			.kind = signature.kind,
+			.textSize = signature.textSize,
+			.renderWidthCap = signature.renderWidthCap,
+			.renderHeightCap = signature.renderHeightCap,
+		}));
+		slot.measuredData = data;
+		slot.measured = *data;
+		if (!slot.measured.success) {
+			state->addFormulaWarning();
+		}
+	}
+	state->result.debug.formulaMeasureMs = int(timer.elapsed());
+	state->result.debug.formulaRenderMs
+		= state->result.debug.formulaMeasureMs;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_formulas.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_formulas.h
new file mode 100644
index 00000000000000..4955a70fb42df5
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_formulas.h
@@ -0,0 +1,23 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_prepare_state.h"
+
+namespace Iv::Markdown {
+
+[[nodiscard]] int CountPreparedBlocks(const std::vector<PreparedBlock> &blocks);
+[[nodiscard]] int FormulaSlotCount(const PreparedDocument &document);
+void MeasurePreparedFormulas(PrepareState *state);
+void MeasureNativeIvPreparedFormulas(NativeIvPrepareState *state);
+void MeasureNativeIvPreparedFormulas(
+	NativeIvPrepareState *state,
+	int from,
+	int till);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_inline.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_inline.cpp
new file mode 100644
index 00000000000000..7d1331d69a329d
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_inline.cpp
@@ -0,0 +1,661 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_prepare_inline.h"
+#include "iv/markdown/iv_markdown_prepare_links.h"
+#include "iv/markdown/iv_markdown_prepare_serialize.h"
+#include "ui/basic_click_handlers.h"
+
+#include <QtCore/QUrl>
+
+#include <algorithm>
+#include <limits>
+
+namespace Iv::Markdown {
+namespace {
+
+struct InlineFormulaSource {
+	int formulaIndex = -1;
+	SourceRange range;
+	QString copySource;
+};
+
+struct InlineFormulaContext {
+	const std::vector<InlineFormulaSource> *formulas = nullptr;
+	QString *blockAnchorId = nullptr;
+	int next = 0;
+	int textSize = 0;
+	int renderWidthCap = 0;
+	int renderHeightCap = 0;
+};
+
+enum class RawInlineTag {
+	None,
+	SubOpen,
+	SubClose,
+	SupOpen,
+	SupClose,
+	MarkOpen,
+	MarkClose,
+};
+
+[[nodiscard]] QString ExternalLinkDisplayText(const PreparedLink &link) {
+	if (link.entityType == EntityType::Email) {
+		return link.target;
+	}
+	const auto original = QUrl(link.target);
+	const auto good = QUrl(original.isValid()
+		? original.toEncoded()
+		: QString());
+	return good.isValid() ? good.toDisplayString() : link.target;
+}
+
+void FinalizePreparedExternalLink(
+		PreparedLink *link,
+		QStringView renderedText) {
+	if (!link
+		|| link->kind != PreparedLinkKind::External
+		|| link->entityType != EntityType::Url) {
+		return;
+	}
+	if (renderedText == QStringView(ExternalLinkDisplayText(*link))) {
+		return;
+	}
+	if (UrlClickHandler::EncodeForOpening(renderedText.toString())
+		== link->target) {
+		link->shown = EntityLinkShown::Partial;
+		return;
+	}
+	link->entityType = EntityType::CustomUrl;
+}
+
+[[nodiscard]] bool RangeContains(
+		const SourceRange &outer,
+		const SourceRange &inner) {
+	return outer.available
+		&& inner.available
+		&& outer.startOffset <= inner.startOffset
+		&& outer.endOffset >= inner.endOffset;
+}
+
+struct DecodedDisplaySpan {
+	int offset = -1;
+	int length = 0;
+};
+
+[[nodiscard]] int DisplayOffsetForSourceOffset(
+		const MarkdownNode &node,
+		const QString &value,
+		int sourceOffset,
+		const PrepareState *state) {
+	if (!state
+		|| !node.range.available
+		|| sourceOffset < node.range.startOffset
+		|| sourceOffset > node.range.endOffset) {
+		return -1;
+	}
+	const auto prefixSize = sourceOffset - node.range.startOffset;
+	if (!prefixSize) {
+		return 0;
+	}
+	const auto prefix = state->sourceUtf8.mid(
+		node.range.startOffset,
+		prefixSize);
+	const auto displayPrefix = DecodeMarkdownTextPrefix(prefix);
+	return value.startsWith(displayPrefix) ? displayPrefix.size() : -1;
+}
+
+[[nodiscard]] DecodedDisplaySpan DisplaySpanForSourceRange(
+		const MarkdownNode &node,
+		const QString &value,
+		const SourceRange &range,
+		const PrepareState *state) {
+	auto result = DecodedDisplaySpan();
+	if (!state
+		|| !node.range.available
+		|| !range.available
+		|| range.startOffset < node.range.startOffset
+		|| range.endOffset < range.startOffset
+		|| range.endOffset > node.range.endOffset) {
+		return result;
+	}
+	const auto offset = DisplayOffsetForSourceOffset(
+		node,
+		value,
+		range.startOffset,
+		state);
+	if (offset < 0) {
+		return result;
+	}
+	const auto decoded = DecodeMarkdownTextPrefix(
+		state->sourceUtf8.mid(
+			range.startOffset,
+			range.endOffset - range.startOffset));
+	const auto length = int(decoded.size());
+	if ((offset + length) > value.size()
+		|| value.mid(offset, length) != decoded) {
+		return result;
+	}
+	result.offset = offset;
+	result.length = length;
+	return result;
+}
+
+[[nodiscard]] std::vector<InlineFormulaSource> CollectInlineFormulas(
+		const MarkdownNode &node,
+		PrepareState *state) {
+	auto result = std::vector<InlineFormulaSource>();
+	if (!state
+		|| !state->request
+		|| !state->request->document
+		|| !node.range.available) {
+		return result;
+	}
+	const auto &formulas = state->request->document->formulas;
+	for (auto i = 0, count = int(formulas.size()); i != count; ++i) {
+		const auto &formula = formulas[i];
+		if (formula.kind != MathKind::Inline
+			|| !RangeContains(node.range, formula.range)) {
+			continue;
+		}
+		auto copySource = state->formulaSourceText(i);
+		if (copySource.isEmpty()) {
+			copySource = u"$"_q + formula.tex + u"$"_q;
+		}
+		result.push_back({
+			.formulaIndex = i,
+			.range = formula.range,
+			.copySource = std::move(copySource),
+		});
+	}
+	return result;
+}
+
+void ReplaceInlineFormulasInAppendedText(
+		const MarkdownNode &node,
+		const QString &value,
+		int from,
+		TextWithEntities *text,
+		InlineFormulaContext *inlineFormulas,
+		PrepareState *state) {
+	if (!text
+		|| !inlineFormulas
+		|| !inlineFormulas->formulas
+		|| !state
+		|| inlineFormulas->next >= int(inlineFormulas->formulas->size())
+		|| !node.range.available) {
+		return;
+	}
+	auto removedLength = 0;
+	while (inlineFormulas->next < int(inlineFormulas->formulas->size())) {
+		const auto &formula = (*inlineFormulas->formulas)[inlineFormulas->next];
+		if (formula.range.endOffset <= node.range.startOffset) {
+			++inlineFormulas->next;
+			continue;
+		} else if (!RangeContains(node.range, formula.range)) {
+			break;
+		}
+
+		const auto displaySpan = DisplaySpanForSourceRange(
+			node,
+			value,
+			formula.range,
+			state);
+		if (displaySpan.offset < 0 || displaySpan.length <= 0) {
+			++inlineFormulas->next;
+			continue;
+		}
+		const auto found = from + displaySpan.offset - removedLength;
+		text->text.replace(
+			found,
+			displaySpan.length,
+			QString(QChar::ObjectReplacementCharacter));
+		const auto &source = state->request->document->formulas[formula.formulaIndex];
+		const auto entityData = SerializeInlineTextObjectEntity({
+			.kind = InlineTextObjectKind::Formula,
+			.data = InlineTextObjectFormulaData{
+				.copySource = formula.copySource,
+				.trimmedTex = source.tex.trimmed(),
+			},
+		});
+		if (!entityData.isEmpty()) {
+			text->entities.push_back(EntityInText(
+				EntityType::CustomEmoji,
+				found,
+				1,
+				entityData));
+		}
+		removedLength += (displaySpan.length - 1);
+
+		state->rememberFormula(
+			formula.formulaIndex,
+			MathKind::Inline,
+			source.tex,
+			inlineFormulas->textSize,
+			inlineFormulas->renderWidthCap,
+			inlineFormulas->renderHeightCap);
+		++inlineFormulas->next;
+	}
+}
+
+void AppendTextWithInlineFormulas(
+		const MarkdownNode &node,
+		const QString &value,
+		TextWithEntities *text,
+		InlineFormulaContext *inlineFormulas,
+		PrepareState *state) {
+	const auto from = text->text.size();
+	text->append(value);
+	ReplaceInlineFormulasInAppendedText(
+		node,
+		value,
+		from,
+		text,
+		inlineFormulas,
+		state);
+}
+
+[[nodiscard]] RawInlineTag ParseRawInlineTag(const MarkdownNode &node) {
+	if (node.kind != NodeKind::HtmlInline) {
+		return RawInlineTag::None;
+	} else if (node.raw == u"<sub>"_q) {
+		return RawInlineTag::SubOpen;
+	} else if (node.raw == u"</sub>"_q) {
+		return RawInlineTag::SubClose;
+	} else if (node.raw == u"<sup>"_q) {
+		return RawInlineTag::SupOpen;
+	} else if (node.raw == u"</sup>"_q) {
+		return RawInlineTag::SupClose;
+	} else if (node.raw == u"<mark>"_q) {
+		return RawInlineTag::MarkOpen;
+	} else if (node.raw == u"</mark>"_q) {
+		return RawInlineTag::MarkClose;
+	}
+	return RawInlineTag::None;
+}
+
+[[nodiscard]] bool IsSimpleRawInlineLineBreak(const MarkdownNode &node) {
+	return (node.kind == NodeKind::HtmlInline) && (node.raw == u"<br>"_q);
+}
+
+[[nodiscard]] bool IsOpeningRawInlineTag(RawInlineTag tag) {
+	return (tag == RawInlineTag::SubOpen)
+		|| (tag == RawInlineTag::SupOpen)
+		|| (tag == RawInlineTag::MarkOpen);
+}
+
+[[nodiscard]] RawInlineTag MatchingClosingRawInlineTag(RawInlineTag tag) {
+	switch (tag) {
+	case RawInlineTag::SubOpen: return RawInlineTag::SubClose;
+	case RawInlineTag::SupOpen: return RawInlineTag::SupClose;
+	case RawInlineTag::MarkOpen: return RawInlineTag::MarkClose;
+	default: return RawInlineTag::None;
+	}
+}
+
+[[nodiscard]] EntityType EntityTypeForRawInlineTag(RawInlineTag tag) {
+	switch (tag) {
+	case RawInlineTag::SubOpen: return EntityType::Subscript;
+	case RawInlineTag::SupOpen: return EntityType::Superscript;
+	case RawInlineTag::MarkOpen: return EntityType::Marked;
+	default: return EntityType::Invalid;
+	}
+}
+
+[[nodiscard]] int FindMatchingRawInlineTag(
+		const std::vector<MarkdownNode> &nodes,
+		int from,
+		int till,
+		RawInlineTag openingTag) {
+	if (!IsOpeningRawInlineTag(openingTag)) {
+		return -1;
+	}
+	auto stack = std::vector<RawInlineTag>();
+	stack.push_back(openingTag);
+	for (auto i = from; i != till; ++i) {
+		const auto tag = ParseRawInlineTag(nodes[i]);
+		if (tag == RawInlineTag::None) {
+			continue;
+		} else if (IsOpeningRawInlineTag(tag)) {
+			stack.push_back(tag);
+		} else if (stack.empty()
+			|| MatchingClosingRawInlineTag(stack.back()) != tag) {
+			return -1;
+		} else if (stack.size() == 1) {
+			return i;
+		} else {
+			stack.pop_back();
+		}
+	}
+	return -1;
+}
+
+void AppendInline(
+	const MarkdownNode &node,
+	TextWithEntities *text,
+	std::vector<PreparedLink> *links,
+	InlineFormulaContext *inlineFormulas,
+	PrepareState *state);
+
+void AppendInlineRange(
+		const std::vector<MarkdownNode> &nodes,
+		int from,
+		int till,
+		TextWithEntities *text,
+		std::vector<PreparedLink> *links,
+		InlineFormulaContext *inlineFormulas,
+		PrepareState *state) {
+	for (auto i = from; i != till; ++i) {
+		const auto &node = nodes[i];
+		const auto tag = ParseRawInlineTag(node);
+		if (IsOpeningRawInlineTag(tag)) {
+			const auto closing = FindMatchingRawInlineTag(
+				nodes,
+				i + 1,
+				till,
+				tag);
+			if (closing > i) {
+				const auto entityFrom = text->text.size();
+				AppendInlineRange(
+					nodes,
+					i + 1,
+					closing,
+					text,
+					links,
+					inlineFormulas,
+					state);
+				const auto entityLength = text->text.size() - entityFrom;
+				if (entityLength > 0) {
+					text->entities.push_back(EntityInText(
+						EntityTypeForRawInlineTag(tag),
+						entityFrom,
+						entityLength));
+				}
+				i = closing;
+				continue;
+			}
+		}
+		if (IsSimpleRawInlineLineBreak(node)
+			&& ((i + 1) < till)
+			&& (nodes[i + 1].kind == NodeKind::SoftBreak)) {
+			text->append(QChar('\n'));
+			++i;
+			continue;
+		}
+		AppendInline(node, text, links, inlineFormulas, state);
+	}
+}
+
+void AppendInline(
+		const MarkdownNode &node,
+		TextWithEntities *text,
+		std::vector<PreparedLink> *links,
+		InlineFormulaContext *inlineFormulas,
+		PrepareState *state) {
+	const auto from = text->text.size();
+	switch (node.kind) {
+	case NodeKind::Text:
+	case NodeKind::InlineMath:
+		AppendTextWithInlineFormulas(
+			node,
+			node.text,
+			text,
+			inlineFormulas,
+			state);
+		break;
+	case NodeKind::SoftBreak:
+		text->append(QChar(' '));
+		break;
+	case NodeKind::LineBreak:
+		text->append(QChar('\n'));
+		break;
+	case NodeKind::Emphasis:
+		AppendInlineRange(
+			node.children,
+			0,
+			int(node.children.size()),
+			text,
+			links,
+			inlineFormulas,
+			state);
+		if (text->text.size() > from) {
+			text->entities.push_back(
+				EntityInText(
+					EntityType::Italic,
+					from,
+					text->text.size() - from));
+		}
+		break;
+	case NodeKind::Strong:
+		AppendInlineRange(
+			node.children,
+			0,
+			int(node.children.size()),
+			text,
+			links,
+			inlineFormulas,
+			state);
+		if (text->text.size() > from) {
+			text->entities.push_back(
+				EntityInText(
+					EntityType::Bold,
+					from,
+					text->text.size() - from));
+		}
+		break;
+	case NodeKind::Strike:
+		AppendInlineRange(
+			node.children,
+			0,
+			int(node.children.size()),
+			text,
+			links,
+			inlineFormulas,
+			state);
+		if (text->text.size() > from) {
+			text->entities.push_back(
+				EntityInText(
+					EntityType::StrikeOut,
+					from,
+					text->text.size() - from));
+		}
+		break;
+	case NodeKind::InlineCode:
+		if (!node.text.isEmpty()) {
+			text->append(node.text);
+		} else {
+			AppendInlineRange(
+				node.children,
+				0,
+				int(node.children.size()),
+				text,
+				links,
+				inlineFormulas,
+				state);
+		}
+		if (text->text.size() > from) {
+			text->entities.push_back(
+				EntityInText(
+					EntityType::Code,
+					from,
+					text->text.size() - from));
+		}
+		break;
+	case NodeKind::Link: {
+		AppendInlineRange(
+			node.children,
+			0,
+			int(node.children.size()),
+			text,
+			links,
+			inlineFormulas,
+			state);
+		if (text->text.size() == from && !node.url.isEmpty()) {
+			text->append(node.url);
+		}
+		const auto length = text->text.size() - from;
+		if (length <= 0 || node.url.isEmpty()) {
+			break;
+		}
+		const auto index = links->size() + 1;
+		if (index > std::numeric_limits<uint16>::max()) {
+			break;
+		}
+		auto preparedLink = ClassifiedLink(uint16(index), node.url, state);
+		FinalizePreparedExternalLink(
+			&preparedLink,
+			QStringView(text->text).mid(from, length));
+		text->entities.push_back(
+			EntityInText(
+				EntityType::CustomUrl,
+				from,
+				length,
+				InternalLinkData(uint16(index))));
+		links->push_back(std::move(preparedLink));
+	} break;
+	case NodeKind::FootnoteReference: {
+		if (node.footnoteOrdinal <= 0) {
+			const auto fallback = !node.raw.isEmpty()
+				? node.raw
+				: (u"[^"_q + node.footnoteLabel + u"]"_q);
+			AppendTextWithInlineFormulas(
+				node,
+				fallback,
+				text,
+				inlineFormulas,
+				state);
+			break;
+		}
+		const auto index = links->size() + 1;
+		const auto label = !node.footnoteLabel.isEmpty()
+			? node.footnoteLabel
+			: QString::number(node.footnoteOrdinal);
+		const auto display = u"["_q + label + u"]"_q;
+		text->append(display);
+		const auto length = display.size();
+		if (length > 0) {
+			text->entities.push_back(EntityInText(
+				EntityType::Superscript,
+				from,
+				length));
+		}
+		if (index <= std::numeric_limits<uint16>::max()) {
+			text->entities.push_back(EntityInText(
+				EntityType::CustomUrl,
+				from,
+				length,
+				InternalLinkData(uint16(index))));
+			links->push_back({
+				.index = uint16(index),
+				.kind = PreparedLinkKind::Footnote,
+				.target = label,
+				.copyText = display,
+			});
+		}
+	} break;
+	case NodeKind::HtmlInline:
+	case NodeKind::Unsupported:
+		if (!node.raw.isEmpty()) {
+			AppendTextWithInlineFormulas(
+				node,
+				node.raw,
+				text,
+				inlineFormulas,
+				state);
+		} else if (!node.children.empty()) {
+			AppendInlineRange(
+				node.children,
+				0,
+				int(node.children.size()),
+				text,
+				links,
+				inlineFormulas,
+				state);
+		} else if (!node.text.isEmpty()) {
+			AppendTextWithInlineFormulas(
+				node,
+				node.text,
+				text,
+				inlineFormulas,
+				state);
+		}
+		break;
+	default:
+		if (!node.children.empty()) {
+			AppendInlineRange(
+				node.children,
+				0,
+				int(node.children.size()),
+				text,
+				links,
+				inlineFormulas,
+				state);
+		} else if (!node.text.isEmpty()) {
+			AppendTextWithInlineFormulas(
+				node,
+				node.text,
+				text,
+				inlineFormulas,
+				state);
+		} else if (!node.raw.isEmpty()) {
+			AppendTextWithInlineFormulas(
+				node,
+				node.raw,
+				text,
+				inlineFormulas,
+				state);
+		}
+		break;
+	}
+}
+
+} // namespace
+
+void PrepareInlineRichText(
+		const MarkdownNode &node,
+		int textSize,
+		int renderWidthCap,
+		int renderHeightCap,
+		QString *blockAnchorId,
+		TextWithEntities *text,
+		std::vector<PreparedLink> *links,
+		PrepareState *state) {
+	auto formulas = CollectInlineFormulas(node, state);
+	auto inlineFormulas = InlineFormulaContext{
+		.formulas = &formulas,
+		.blockAnchorId = blockAnchorId,
+		.textSize = textSize,
+		.renderWidthCap = renderWidthCap,
+		.renderHeightCap = renderHeightCap,
+	};
+	if (!node.children.empty()) {
+		AppendInlineRange(
+			node.children,
+			0,
+			int(node.children.size()),
+			text,
+			links,
+			&inlineFormulas,
+			state);
+	} else if (!node.text.isEmpty()) {
+		AppendTextWithInlineFormulas(
+			node,
+			node.text,
+			text,
+			&inlineFormulas,
+			state);
+	} else if (!node.raw.isEmpty()) {
+		AppendTextWithInlineFormulas(
+			node,
+			node.raw,
+			text,
+			&inlineFormulas,
+			state);
+	}
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_inline.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_inline.h
new file mode 100644
index 00000000000000..746335e9b3eb01
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_inline.h
@@ -0,0 +1,24 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_prepare_state.h"
+
+namespace Iv::Markdown {
+
+void PrepareInlineRichText(
+	const MarkdownNode &node,
+	int textSize,
+	int renderWidthCap,
+	int renderHeightCap,
+	QString *blockAnchorId,
+	TextWithEntities *text,
+	std::vector<PreparedLink> *links,
+	PrepareState *state);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_links.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_links.cpp
new file mode 100644
index 00000000000000..b9ac8a51709148
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_links.cpp
@@ -0,0 +1,334 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_prepare_links.h"
+#include "ui/basic_click_handlers.h"
+
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QUrl>
+
+#include <algorithm>
+
+namespace Iv::Markdown {
+namespace {
+
+[[nodiscard]] bool HasUrlScheme(const QString &target) {
+	if (target.isEmpty()) {
+		return false;
+	}
+	const auto colon = target.indexOf(QChar(':'));
+	if (colon <= 0) {
+		return false;
+	}
+	const auto slash = target.indexOf(QChar('/'));
+	const auto question = target.indexOf(QChar('?'));
+	const auto hash = target.indexOf(QChar('#'));
+	auto limit = target.size();
+	for (const auto value : { slash, question, hash }) {
+		if (value >= 0) {
+			limit = std::min(limit, value);
+		}
+	}
+	if (colon >= limit) {
+		return false;
+	}
+	if (!target[0].isLetter()) {
+		return false;
+	}
+	for (auto i = 1; i != colon; ++i) {
+		const auto ch = target[i];
+		if (!ch.isLetterOrNumber() && ch != QChar('+') && ch != QChar('-')
+			&& ch != QChar('.')) {
+			return false;
+		}
+	}
+	return true;
+}
+
+[[nodiscard]] bool LooksLikeWindowsDrivePath(const QString &target) {
+	return target.size() >= 2
+		&& target[0].isLetter()
+		&& target[1] == QChar(':');
+}
+
+[[nodiscard]] bool LooksLikeFileUrl(const QString &target) {
+	return target.size() >= 5
+		&& target.left(5).compare(u"file:"_q, Qt::CaseInsensitive) == 0;
+}
+
+[[nodiscard]] bool LooksLikeFilesystemTarget(const QString &target) {
+	return target.startsWith(u"/"_q)
+		|| target.startsWith(u"\\"_q)
+		|| target.startsWith(u"//"_q)
+		|| target.startsWith(u"\\\\"_q)
+		|| LooksLikeWindowsDrivePath(target)
+		|| LooksLikeFileUrl(target);
+}
+
+[[nodiscard]] QString ComparablePath(QString path) {
+	path = QDir::fromNativeSeparators(QDir::cleanPath(path));
+	return path.toLower();
+}
+
+[[nodiscard]] bool IsContainedPath(
+		const QString &baseDirectory,
+		const QString &resolvedPath) {
+	const auto base = ComparablePath(baseDirectory);
+	const auto resolved = ComparablePath(resolvedPath);
+	return (resolved == base) || resolved.startsWith(base + u"/"_q);
+}
+
+[[nodiscard]] bool IsEscapableAscii(char ch) {
+	const auto value = uchar(ch);
+	return (value >= 0x21 && value <= 0x2F)
+		|| (value >= 0x3A && value <= 0x40)
+		|| (value >= 0x5B && value <= 0x60)
+		|| (value >= 0x7B && value <= 0x7E);
+}
+
+[[nodiscard]] bool AppendHtmlEntityText(
+		const QByteArray &entity,
+		QString *result) {
+	if (entity == "amp") {
+		result->append(QChar('&'));
+	} else if (entity == "lt") {
+		result->append(QChar('<'));
+	} else if (entity == "gt") {
+		result->append(QChar('>'));
+	} else if (entity == "quot") {
+		result->append(QChar('"'));
+	} else if (entity == "apos") {
+		result->append(QChar('\''));
+	} else if (entity.startsWith("#x") || entity.startsWith("#X")) {
+		auto ok = false;
+		const auto value = entity.mid(2).toUInt(&ok, 16);
+		if (!ok || value > 0xFFFF) {
+			return false;
+		}
+		result->append(QChar(ushort(value)));
+	} else if (entity.startsWith("#")) {
+		auto ok = false;
+		const auto value = entity.mid(1).toUInt(&ok, 10);
+		if (!ok || value > 0xFFFF) {
+			return false;
+		}
+		result->append(QChar(ushort(value)));
+	} else {
+		return false;
+	}
+	return true;
+}
+
+[[nodiscard]] QString NormalizeMailtoTarget(const QString &target) {
+	const auto parsed = QUrl(target);
+	auto result = parsed.path(QUrl::FullyDecoded);
+	if (result.isEmpty()) {
+		result = target.mid(target.indexOf(QChar(':')) + 1);
+		const auto question = result.indexOf(QChar('?'));
+		if (question >= 0) {
+			result = result.left(question);
+		}
+		result = QString::fromUtf8(
+			QByteArray::fromPercentEncoding(result.toUtf8()));
+	}
+	while (result.startsWith(u"/"_q)) {
+		result.remove(0, 1);
+	}
+	return result.trimmed();
+}
+
+[[nodiscard]] QString ExternalLinkDisplayText(const PreparedLink &link) {
+	if (link.entityType == EntityType::Email) {
+		return link.target;
+	}
+	const auto original = QUrl(link.target);
+	const auto good = QUrl(original.isValid()
+		? original.toEncoded()
+		: QString());
+	return good.isValid() ? good.toDisplayString() : link.target;
+}
+
+} // namespace
+
+void NormalizePreparedUrlLink(PreparedLink *result, const QString &target) {
+	if (!result) {
+		return;
+	}
+	result->fragment = QString();
+	if (target.startsWith(u"mailto:"_q, Qt::CaseInsensitive)) {
+		result->target = NormalizeMailtoTarget(target);
+		result->copyText = result->target;
+		result->entityType = EntityType::Email;
+		result->shown = EntityLinkShown::Full;
+		return;
+	}
+	result->target = UrlClickHandler::EncodeForOpening(target);
+	result->copyText = result->target;
+	result->entityType = EntityType::Url;
+	result->shown = EntityLinkShown::Full;
+}
+
+void FinalizePreparedUrlLink(
+		PreparedLink *link,
+		QStringView renderedText) {
+	if (!link || link->entityType != EntityType::Url) {
+		return;
+	}
+	if (renderedText == QStringView(ExternalLinkDisplayText(*link))) {
+		return;
+	}
+	if (UrlClickHandler::EncodeForOpening(renderedText.toString())
+		== link->target) {
+		link->shown = EntityLinkShown::Partial;
+		return;
+	}
+	link->entityType = EntityType::CustomUrl;
+}
+
+QString InternalLinkData(uint16 index) {
+	return u"internal:index"_q + QChar(index);
+}
+
+QString NormalizeFragmentId(QString fragment) {
+	fragment = QString::fromUtf8(
+		QByteArray::fromPercentEncoding(fragment.toUtf8()));
+	fragment = fragment.trimmed().toLower();
+	while (fragment.startsWith(u"#"_q)) {
+		fragment.remove(0, 1);
+	}
+	return fragment;
+}
+
+PreparedLink ClassifiedLink(
+		uint16 index,
+		QString target,
+		const PrepareState *state) {
+	auto result = PreparedLink();
+	result.index = index;
+	if (target.startsWith(QChar('#'))) {
+		result.kind = PreparedLinkKind::Anchor;
+		result.target = NormalizeFragmentId(target.mid(1));
+		return result;
+	}
+	if (LooksLikeFilesystemTarget(target)) {
+		result.kind = PreparedLinkKind::RejectedRelative;
+		return result;
+	}
+	if (HasUrlScheme(target)) {
+		result.kind = PreparedLinkKind::External;
+		NormalizePreparedUrlLink(&result, target);
+		return result;
+	}
+
+	auto fragmentIndex = target.indexOf(QChar('#'));
+	if (fragmentIndex >= 0) {
+		result.fragment = NormalizeFragmentId(target.mid(fragmentIndex + 1));
+		target = target.left(fragmentIndex);
+	}
+	result.target = target;
+
+	if (target.isEmpty()) {
+		result.kind = PreparedLinkKind::Anchor;
+		result.target = result.fragment;
+		result.fragment = QString();
+		return result;
+	}
+	if (!state
+		|| !state->request
+		|| state->request->sourcePath.isEmpty()) {
+		result.kind = PreparedLinkKind::RejectedRelative;
+		return result;
+	}
+	if (target.contains(QChar('?'))) {
+		result.kind = PreparedLinkKind::RejectedRelative;
+		return result;
+	}
+	const auto baseDirectory = QFileInfo(state->request->sourcePath).absolutePath();
+	if (baseDirectory.isEmpty()) {
+		result.kind = PreparedLinkKind::RejectedRelative;
+		return result;
+	}
+	const auto resolved = QDir(baseDirectory).absoluteFilePath(target);
+	const auto cleanedResolved = QDir::cleanPath(resolved);
+	if (!IsContainedPath(baseDirectory, cleanedResolved)
+		|| !LooksLikeMarkdownFile(cleanedResolved)) {
+		result.kind = PreparedLinkKind::RejectedRelative;
+		return result;
+	}
+	result.kind = PreparedLinkKind::LocalFile;
+	result.target = cleanedResolved;
+	return result;
+}
+
+QString FirstInfoToken(const QString &info) {
+	const auto trimmed = info.trimmed();
+	for (auto i = 0; i != trimmed.size(); ++i) {
+		if (trimmed[i].isSpace()) {
+			return trimmed.left(i);
+		}
+	}
+	return trimmed;
+}
+
+void SortEntities(TextWithEntities *text) {
+	auto &entities = text->entities;
+	std::sort(
+		entities.begin(),
+		entities.end(),
+		[](const EntityInText &left, const EntityInText &right) {
+			if (left.offset() != right.offset()) {
+				return left.offset() < right.offset();
+			} else if (left.length() != right.length()) {
+				return left.length() > right.length();
+			}
+			return int(left.type()) < int(right.type());
+		});
+}
+
+QString DecodeMarkdownTextPrefix(QByteArray bytes) {
+	auto result = QString();
+	auto plainFrom = 0;
+	const auto flushPlain = [&](int till) {
+		if (till > plainFrom) {
+			result.append(QString::fromUtf8(
+				bytes.constData() + plainFrom,
+				till - plainFrom));
+		}
+	};
+	for (auto i = 0; i != bytes.size();) {
+		if (bytes[i] == '\\'
+			&& (i + 1) < bytes.size()
+			&& IsEscapableAscii(bytes[i + 1])) {
+			flushPlain(i);
+			result.append(QChar(ushort(uchar(bytes[i + 1]))));
+			i += 2;
+			plainFrom = i;
+		} else if (bytes[i] == '&') {
+			const auto semicolon = bytes.indexOf(';', i + 1);
+			if (semicolon > i && semicolon - i <= 32) {
+				auto entityText = QString();
+				if (AppendHtmlEntityText(
+						bytes.mid(i + 1, semicolon - i - 1),
+						&entityText)) {
+					flushPlain(i);
+					result.append(entityText);
+					i = semicolon + 1;
+					plainFrom = i;
+					continue;
+				}
+			}
+			++i;
+		} else {
+			++i;
+		}
+	}
+	flushPlain(bytes.size());
+	return result;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_links.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_links.h
new file mode 100644
index 00000000000000..1036f0983dedde
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_links.h
@@ -0,0 +1,28 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_prepare_state.h"
+
+#include <QtCore/QStringView>
+
+namespace Iv::Markdown {
+
+[[nodiscard]] QString InternalLinkData(uint16 index);
+[[nodiscard]] QString NormalizeFragmentId(QString fragment);
+void NormalizePreparedUrlLink(PreparedLink *result, const QString &target);
+void FinalizePreparedUrlLink(PreparedLink *link, QStringView renderedText);
+[[nodiscard]] PreparedLink ClassifiedLink(
+	uint16 index,
+	QString target,
+	const PrepareState *state);
+void SortEntities(TextWithEntities *text);
+[[nodiscard]] QString FirstInfoToken(const QString &info);
+[[nodiscard]] QString DecodeMarkdownTextPrefix(QByteArray bytes);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_native_blocks.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_native_blocks.cpp
new file mode 100644
index 00000000000000..43f2ce25c5349b
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_native_blocks.cpp
@@ -0,0 +1,1966 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_prepare_native_blocks.h"
+#include "base/unixtime.h"
+#include "iv/iv_rich_page.h"
+#include "iv/markdown/iv_markdown_prepare_links.h"
+#include "lang/lang_keys.h"
+
+#include <algorithm>
+#include <limits>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+using RichPage = Iv::RichPage;
+using RichPageBlock = Iv::RichPage::Block;
+using RichPageBlockKind = Iv::RichPage::BlockKind;
+using RichPageListItem = Iv::RichPage::ListItem;
+using RichPageRelatedArticle = Iv::RichPage::RelatedArticle;
+using RichPageTableCell = Iv::RichPage::TableCell;
+using RichPageTableRow = Iv::RichPage::TableRow;
+
+struct NativeIvDepthContext {
+	int listDepth = 0;
+	int quoteDepth = 0;
+};
+
+[[nodiscard]] int CappedNativeIvListDepth(int depth) {
+	return std::min(depth, std::max(PrepareLimitsForIv().visualListDepth, 0));
+}
+
+[[nodiscard]] int CappedNativeIvQuoteDepth(int depth) {
+	return std::min(depth, std::max(PrepareLimitsForIv().visualQuoteDepth, 0));
+}
+
+[[nodiscard]] bool PrepareCanonicalNativeIvBlocks(
+	const std::vector<RichPageBlock> &blocks,
+	std::vector<PreparedBlock> *result,
+	NativeIvPrepareState *state,
+	PreparedEditBlockContainerPath container,
+	NativeIvDepthContext depthContext);
+
+[[nodiscard]] QString NativeIvDateText(TimeId date) {
+	return langDateTimeFull(base::unixtime::parse(date));
+}
+
+[[nodiscard]] int ScaleNativeIvFormulaCap(
+		int cap,
+		int textSize,
+		int baseTextSize) {
+	if (cap <= 0) {
+		return 0;
+	}
+	const auto numerator = int64(cap) * std::max(textSize, 1);
+	const auto denominator = std::max(baseTextSize, 1);
+	return std::max(int((numerator + denominator - 1) / denominator), 1);
+}
+
+[[nodiscard]] NativeIvRichTextContext NativeIvRichTextContextForTextSize(
+		int textSize,
+		const MarkdownPrepareDimensions &dimensions) {
+	return {
+		.textSize = textSize,
+		.renderWidthCap = ScaleNativeIvFormulaCap(
+			dimensions.displayMathMaxRenderWidth,
+			textSize,
+			dimensions.displayMathTextSize),
+		.renderHeightCap = ScaleNativeIvFormulaCap(
+			dimensions.displayMathMaxRenderHeight,
+			textSize,
+			dimensions.displayMathTextSize),
+	};
+}
+
+[[nodiscard]] int NativeIvFlowTextSize(
+		PreparedBlockKind kind,
+		int headingLevel,
+		const MarkdownPrepareDimensions &dimensions) {
+	if (kind == PreparedBlockKind::Heading
+		&& headingLevel >= 1
+		&& headingLevel <= int(dimensions.headingTextSizes.size())) {
+		return dimensions.headingTextSizes[headingLevel - 1];
+	}
+	return dimensions.bodyTextSize;
+}
+
+[[nodiscard]] PreparedLink PrepareNativeIvRelatedArticleLink(
+		QString url,
+		uint64 webpageId,
+		QStringView renderedText) {
+	auto result = PreparedLink();
+	if (webpageId) {
+		result.kind = PreparedLinkKind::InstantViewPage;
+		result.webpageId = webpageId;
+		NormalizePreparedUrlLink(&result, url);
+	} else {
+		result = ClassifiedLink(0, url, nullptr);
+		if (result.kind == PreparedLinkKind::RejectedRelative
+			|| result.kind == PreparedLinkKind::LocalFile) {
+			result.kind = PreparedLinkKind::External;
+			NormalizePreparedUrlLink(&result, url);
+		}
+	}
+	FinalizePreparedUrlLink(&result, renderedText);
+	return result;
+}
+
+[[nodiscard]] QString NativeIvDetailsAnchorId(NativeIvPrepareState *state) {
+	return u"details-"_q + QString::number(++state->nextGeneratedId);
+}
+
+void SortPreparedIvRichText(PreparedIvRichText *text) {
+	SortEntities(&text->text);
+}
+
+[[nodiscard]] TextWithEntities StripOneTrailingNewline(TextWithEntities text) {
+	auto removed = 0;
+	if (text.text.endsWith(u"\r\n"_q)) {
+		removed = 2;
+	} else if (!text.text.isEmpty()) {
+		const auto last = text.text.back();
+		if ((last == QChar(u'\n')) || (last == QChar(u'\r'))) {
+			removed = 1;
+		}
+	}
+	if (!removed) {
+		return text;
+	}
+	const auto newLength = text.text.size() - removed;
+	text.text.chop(removed);
+	for (auto &entity : text.entities) {
+		entity.updateTextEnd(newLength);
+	}
+	text.entities.erase(
+		std::remove_if(
+			text.entities.begin(),
+			text.entities.end(),
+			[](const EntityInText &entity) {
+				return (entity.length() <= 0);
+			}),
+		text.entities.end());
+	return text;
+}
+
+[[nodiscard]] bool RichTextHasMeaningfulContent(
+		const RichPage::RichText &text) {
+	return !text.text.text.trimmed().isEmpty()
+		|| !text.anchorId.isEmpty()
+		|| !text.anchorIds.empty();
+}
+
+[[nodiscard]] PreparedBlock EmptyParagraphBlock() {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Paragraph;
+	return block;
+}
+
+[[nodiscard]] PreparedBlock PrepareNativeIvEmbedPostFallbackParagraph(
+		QString url) {
+	auto block = EmptyParagraphBlock();
+	if (url.isEmpty()) {
+		return block;
+	}
+	auto link = PreparedLink();
+	link.index = 1;
+	link.kind = PreparedLinkKind::External;
+	NormalizePreparedUrlLink(&link, url);
+	FinalizePreparedUrlLink(&link, url);
+	block.text.text = std::move(url);
+	block.text.entities.push_back(EntityInText(
+		EntityType::CustomUrl,
+		0,
+		block.text.text.size(),
+		InternalLinkData(link.index)));
+	block.links.push_back(std::move(link));
+	return block;
+}
+
+[[nodiscard]] PreparedBlock PrepareRuleBlock() {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Rule;
+	return block;
+}
+
+void WrapPreparedIvRichTextItalic(PreparedIvRichText *prepared) {
+	if (!prepared || prepared->text.text.isEmpty()) {
+		return;
+	}
+	prepared->text.entities.push_back(EntityInText(
+		EntityType::Italic,
+		0,
+		prepared->text.text.size()));
+}
+
+void ApplyNativeIvEditPlaceholderText(PreparedBlock *block);
+
+bool AppendPreparedQuoteParagraph(
+		std::vector<PreparedBlock> *result,
+		PreparedIvRichText prepared,
+		bool pullquote,
+		bool supplementary = false,
+		bool allowEmpty = false,
+		std::optional<PreparedEditLeafSource> editLeaf = std::nullopt) {
+	if (pullquote) {
+		WrapPreparedIvRichTextItalic(&prepared);
+	}
+	const auto count = result->size();
+	if (!AppendPreparedIvRichBlock(
+			result,
+			PreparedBlockKind::Paragraph,
+			0,
+			std::move(prepared),
+			QString(),
+			allowEmpty,
+			supplementary,
+			std::nullopt,
+			std::move(editLeaf))) {
+		return false;
+	}
+	if (result->size() > count) {
+		if (allowEmpty) {
+			ApplyNativeIvEditPlaceholderText(&result->back());
+		}
+		if (pullquote) {
+			result->back().flowAlignment = TableAlignment::Center;
+			result->back().pullquote = true;
+		}
+	}
+	return true;
+}
+
+[[nodiscard]] bool ParseOrderedNumber(
+		const QString &value,
+		int *result) {
+	auto ok = false;
+	const auto parsed = value.toInt(&ok);
+	if (!ok) {
+		return false;
+	}
+	*result = parsed;
+	return true;
+}
+
+[[nodiscard]] int NextNativeIvOrderedNumber(const PreparedBlock &result) {
+	return result.children.empty()
+		? result.startNumber
+		: (result.children.back().orderedNumber + 1);
+}
+
+using NativeIvTableOccupancyRow = std::vector<char>;
+using NativeIvTableOccupancyGrid = std::vector<NativeIvTableOccupancyRow>;
+
+[[nodiscard]] int NormalizeNativeIvTableSpan(int span) {
+	return std::max(span, 1);
+}
+
+[[nodiscard]] int ClampNativeIvTableRowspan(
+		int rawRowspan,
+		int row,
+		int rowCount) {
+	if ((row < 0) || (row >= rowCount) || (rowCount <= 0)) {
+		return 0;
+	}
+	const auto remainingRows = int64(rowCount) - row;
+	return int(std::min<int64>(
+		NormalizeNativeIvTableSpan(rawRowspan),
+		remainingRows));
+}
+
+[[nodiscard]] int ClampNativeIvTableColspan(
+		int rawColspan,
+		int column,
+		int maxColumns) {
+	if ((column < 0) || (column >= maxColumns) || (maxColumns <= 0)) {
+		return 0;
+	}
+	const auto remainingColumns = int64(maxColumns) - column;
+	return int(std::min<int64>(
+		NormalizeNativeIvTableSpan(rawColspan),
+		remainingColumns));
+}
+
+[[nodiscard]] bool CanOccupyNativeIvTableSlots(
+		const NativeIvTableOccupancyGrid &occupancy,
+		int row,
+		int column,
+		int rowspan,
+		int colspan) {
+	if ((row < 0)
+		|| (column < 0)
+		|| (rowspan <= 0)
+		|| (colspan <= 0)
+		|| (row >= int(occupancy.size()))) {
+		return false;
+	}
+	const auto rowLimit = int(std::min<int64>(
+		int64(row) + rowspan,
+		occupancy.size()));
+	const auto columnLimit64 = int64(column) + colspan;
+	if (columnLimit64 <= column) {
+		return false;
+	}
+	const auto columnLimit = int(std::min<int64>(
+		columnLimit64,
+		std::numeric_limits<int>::max()));
+	for (auto currentRow = row; currentRow < rowLimit; ++currentRow) {
+		const auto &occupied = occupancy[currentRow];
+		const auto occupiedLimit = std::min(columnLimit, int(occupied.size()));
+		for (auto currentColumn = column;
+			currentColumn < occupiedLimit;
+			++currentColumn) {
+			if (occupied[currentColumn]) {
+				return false;
+			}
+		}
+	}
+	return true;
+}
+
+[[nodiscard]] int FirstAvailableNativeIvTableColumn(
+		const NativeIvTableOccupancyGrid &occupancy,
+		int row,
+		int rowspan,
+		int colspan,
+		int maxColumns) {
+	if ((row < 0)
+		|| (row >= int(occupancy.size()))
+		|| (rowspan <= 0)
+		|| (colspan <= 0)
+		|| (maxColumns <= 0)) {
+		return -1;
+	}
+	for (auto column = 0; column < maxColumns; ++column) {
+		const auto effectiveColspan = ClampNativeIvTableColspan(
+			colspan,
+			column,
+			maxColumns);
+		if (effectiveColspan <= 0) {
+			continue;
+		}
+		if (CanOccupyNativeIvTableSlots(
+				occupancy,
+				row,
+				column,
+				rowspan,
+				effectiveColspan)) {
+			return column;
+		}
+	}
+	return -1;
+}
+
+void MarkNativeIvTableSlots(
+		NativeIvTableOccupancyGrid *occupancy,
+		int row,
+		int column,
+		int rowspan,
+		int colspan) {
+	if ((row < 0)
+		|| (column < 0)
+		|| (rowspan <= 0)
+		|| (colspan <= 0)
+		|| (row >= int(occupancy->size()))) {
+		return;
+	}
+	const auto rowLimit = int(std::min<int64>(
+		int64(row) + rowspan,
+		occupancy->size()));
+	const auto columnLimit64 = int64(column) + colspan;
+	if (columnLimit64 <= column) {
+		return;
+	}
+	const auto columnLimit = int(std::min<int64>(
+		columnLimit64,
+		std::numeric_limits<int>::max()));
+	for (auto currentRow = row; currentRow < rowLimit; ++currentRow) {
+		auto &occupied = (*occupancy)[currentRow];
+		if (columnLimit > int(occupied.size())) {
+			occupied.resize(columnLimit, false);
+		}
+		for (auto currentColumn = column;
+			currentColumn < columnLimit;
+			++currentColumn) {
+			occupied[currentColumn] = true;
+		}
+	}
+}
+
+[[nodiscard]] int NativeIvTableColumnCount(
+		const NativeIvTableOccupancyGrid &occupancy) {
+	auto result = 0;
+	for (const auto &row : occupancy) {
+		result = std::max(result, int(row.size()));
+	}
+	return result;
+}
+
+[[maybe_unused]] [[nodiscard]] PreparedEditBlockContainerPath BlockChildrenContainer(
+		PreparedEditBlockPath block) {
+	auto result = std::move(block.container);
+	result.steps.push_back({
+		.kind = PreparedEditBlockContainerKind::BlockChildren,
+		.blockIndex = block.index,
+	});
+	return result;
+}
+
+[[maybe_unused]] [[nodiscard]] PreparedEditBlockContainerPath ListItemChildrenContainer(
+		PreparedEditBlockPath block,
+		int listItemIndex) {
+	auto result = std::move(block.container);
+	result.steps.push_back({
+		.kind = PreparedEditBlockContainerKind::ListItemChildren,
+		.blockIndex = block.index,
+		.listItemIndex = listItemIndex,
+	});
+	return result;
+}
+
+[[nodiscard]] PreparedEditBlockSource BlockSource(
+		PreparedEditBlockPath block) {
+	return { .path = std::move(block) };
+}
+
+[[maybe_unused]] [[nodiscard]] PreparedEditListItemSource ListItemSource(
+		PreparedEditBlockPath block,
+		int listItemIndex) {
+	return {
+		.block = std::move(block),
+		.listItemIndex = listItemIndex,
+	};
+}
+
+[[maybe_unused]] [[nodiscard]] PreparedEditTableRowSource TableRowSource(
+		PreparedEditBlockPath block,
+		int tableRowIndex) {
+	return {
+		.block = std::move(block),
+		.tableRowIndex = tableRowIndex,
+	};
+}
+
+[[maybe_unused]] [[nodiscard]] PreparedEditTableCellSource TableCellSource(
+		PreparedEditBlockPath block,
+		int tableRowIndex,
+		int tableCellIndex,
+		int column,
+		int colspan,
+		int rowspan) {
+	return {
+		.block = std::move(block),
+		.tableRowIndex = tableRowIndex,
+		.tableCellIndex = tableCellIndex,
+		.column = column,
+		.colspan = colspan,
+		.rowspan = rowspan,
+	};
+}
+
+[[nodiscard]] PreparedEditLeafSource BlockTextLeafSource(
+		PreparedEditBlockPath block) {
+	return {
+		.kind = PreparedEditLeafKind::BlockText,
+		.block = std::move(block),
+	};
+}
+
+[[nodiscard]] PreparedEditLeafSource BlockCaptionLeafSource(
+		PreparedEditBlockPath block) {
+	return {
+		.kind = PreparedEditLeafKind::BlockCaption,
+		.block = std::move(block),
+	};
+}
+
+[[nodiscard]] PreparedEditLeafSource ListItemTextLeafSource(
+		PreparedEditBlockPath block,
+		int listItemIndex) {
+	return {
+		.kind = PreparedEditLeafKind::ListItemText,
+		.block = std::move(block),
+		.listItemIndex = listItemIndex,
+	};
+}
+
+[[maybe_unused]] [[nodiscard]] PreparedEditLeafSource TableCellTextLeafSource(
+		PreparedEditBlockPath block,
+		int tableRowIndex,
+		int tableCellIndex) {
+	return {
+		.kind = PreparedEditLeafKind::TableCellText,
+		.block = std::move(block),
+		.tableRowIndex = tableRowIndex,
+		.tableCellIndex = tableCellIndex,
+	};
+}
+
+[[nodiscard]] PreparedEditLeafSource MathFormulaLeafSource(
+		PreparedEditBlockPath block) {
+	return {
+		.kind = PreparedEditLeafKind::MathFormula,
+		.block = std::move(block),
+	};
+}
+
+void ApplyBlockCaptionEditSource(
+		PreparedBlock *block,
+		PreparedEditBlockPath path) {
+	block->editBlock = BlockSource(path);
+	block->editLeaf = BlockCaptionLeafSource(path);
+}
+
+[[nodiscard]] QString NativeIvEditPlaceholderText(
+		PreparedBlockKind kind,
+		PreparedEditLeafKind leafKind) {
+	switch (leafKind) {
+	case PreparedEditLeafKind::BlockCaption:
+		return u"Caption"_q;
+	case PreparedEditLeafKind::TableCellText:
+		return u"Cell"_q;
+	case PreparedEditLeafKind::MathFormula:
+		return u"x^2 + y^2"_q;
+	case PreparedEditLeafKind::ListItemText:
+		return u"Text"_q;
+	case PreparedEditLeafKind::BlockText:
+		if (kind == PreparedBlockKind::Table) {
+			return u"Title"_q;
+		}
+		return (kind == PreparedBlockKind::Heading)
+			|| (kind == PreparedBlockKind::Details)
+			? u"Header"_q
+			: u"Text"_q;
+	}
+	return QString();
+}
+
+void ApplyNativeIvEditPlaceholderText(PreparedBlock *block) {
+	if (!block->editLeaf) {
+		return;
+	}
+	block->editPlaceholderText = NativeIvEditPlaceholderText(
+		block->kind,
+		block->editLeaf->kind);
+}
+
+void ApplyNativeIvEditPlaceholderText(PreparedTableCell *cell) {
+	if (!cell->editLeaf) {
+		return;
+	}
+	cell->editPlaceholderText = NativeIvEditPlaceholderText(
+		PreparedBlockKind::Table,
+		cell->editLeaf->kind);
+}
+
+[[nodiscard]] const std::vector<RichPageBlock> *ResolveCanonicalNativeIvContainer(
+		const RichPage &page,
+		const PreparedEditBlockContainerPath &container) {
+	auto blocks = &page.blocks;
+	for (const auto &step : container.steps) {
+		if (step.kind == PreparedEditBlockContainerKind::Root) {
+			blocks = &page.blocks;
+			continue;
+		}
+		if (step.blockIndex < 0 || step.blockIndex >= int(blocks->size())) {
+			return nullptr;
+		}
+		const auto &block = (*blocks)[step.blockIndex];
+		switch (step.kind) {
+		case PreparedEditBlockContainerKind::BlockChildren:
+			blocks = &block.blocks;
+			break;
+		case PreparedEditBlockContainerKind::ListItemChildren:
+			if (step.listItemIndex < 0
+				|| step.listItemIndex >= int(block.listItems.size())) {
+				return nullptr;
+			}
+			blocks = &block.listItems[step.listItemIndex].blocks;
+			break;
+		case PreparedEditBlockContainerKind::Root:
+			blocks = &page.blocks;
+			break;
+		}
+	}
+	return blocks;
+}
+
+[[nodiscard]] const RichPageBlock *ResolveCanonicalNativeIvBlock(
+		const RichPage &page,
+		const PreparedEditBlockPath &path) {
+	const auto container = ResolveCanonicalNativeIvContainer(page, path.container);
+	if (!container || path.index < 0 || path.index >= int(container->size())) {
+		return nullptr;
+	}
+	return &(*container)[path.index];
+}
+
+[[nodiscard]] PreparedBlock *FindPreparedNativeIvBlockByPath(
+		std::vector<PreparedBlock> *blocks,
+		const PreparedEditBlockPath &path) {
+	for (auto &block : *blocks) {
+		if (block.editBlock && block.editBlock->path == path) {
+			return &block;
+		}
+		if (const auto nested = FindPreparedNativeIvBlockByPath(
+				&block.children,
+				path)) {
+			return nested;
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] PreparedBlock *FindPreparedNativeIvLeafBlock(
+		PreparedBlock *block,
+		const PreparedEditLeafSource &source) {
+	if (!block) {
+		return nullptr;
+	}
+	if (block->editLeaf && (*block->editLeaf == source)) {
+		return block;
+	}
+	for (auto &child : block->children) {
+		if (const auto nested = FindPreparedNativeIvLeafBlock(&child, source)) {
+			return nested;
+		}
+	}
+	return nullptr;
+}
+
+[[nodiscard]] PreparedTableCell *FindPreparedNativeIvLeafCell(
+		PreparedBlock *block,
+		const PreparedEditLeafSource &source) {
+	if (!block) {
+		return nullptr;
+	}
+	for (auto &row : block->tableRows) {
+		for (auto &cell : row.cells) {
+			if (cell.editLeaf && (*cell.editLeaf == source)) {
+				return &cell;
+			}
+		}
+	}
+	return nullptr;
+}
+
+void StripPreparedDetailsSummaryLinks(PreparedIvRichText *summary) {
+	if (summary->links.empty()) {
+		return;
+	}
+	const auto from = std::remove_if(
+		summary->text.entities.begin(),
+		summary->text.entities.end(),
+		[](const EntityInText &entity) {
+			return entity.type() == EntityType::CustomUrl;
+		});
+	summary->text.entities.erase(from, summary->text.entities.end());
+	summary->links.clear();
+}
+
+void RefreshPreparedNativeIvBlockPlaceholder(
+		PreparedBlock *block,
+		NativeIvPrepareState *state) {
+	block->editPlaceholderText = QString();
+	if (state->editMode && block->editLeaf) {
+		ApplyNativeIvEditPlaceholderText(block);
+	}
+}
+
+void RefreshPreparedNativeIvCellPlaceholder(
+		PreparedTableCell *cell,
+		NativeIvPrepareState *state) {
+	cell->editPlaceholderText = QString();
+	if (state->editMode && cell->editLeaf) {
+		ApplyNativeIvEditPlaceholderText(cell);
+	}
+}
+
+void RefreshPreparedNativeIvMediaCaptionPlaceholder(
+		PreparedBlock *block,
+		NativeIvPrepareState *state) {
+	block->editPlaceholderText = QString();
+	if (state->editMode && block->editLeaf) {
+		ApplyNativeIvEditPlaceholderText(block);
+	}
+}
+
+void RefreshPreparedNativeIvPlaceholderCopyText(PreparedBlock *block) {
+	if (block->kind != PreparedBlockKind::Placeholder) {
+		return;
+	}
+	block->placeholder.copyText = block->text.text.isEmpty()
+		? block->placeholder.label
+		: (block->placeholder.label + u"\n"_q + block->text.text);
+}
+
+[[nodiscard]] bool PreparePreparedNativeIvRichText(
+		const RichPage::RichText &text,
+		PreparedIvRichText *prepared,
+		NativeIvPrepareState *state,
+		NativeIvRichTextContext context = {}) {
+	return PrepareNativeIvRichText(text, prepared, nullptr, state, context);
+}
+
+[[nodiscard]] NativeInstantViewLeafUpdateResult UpdatePreparedNativeIvBlockText(
+		PreparedBlock *preparedBlock,
+		const RichPageBlock &canonicalBlock,
+		const PreparedEditLeafSource &source,
+		NativeIvPrepareState *state,
+		NativeIvPreparedLeafFormulaRange *formulaRange) {
+	formulaRange->from = state->nextFormulaIndex;
+	formulaRange->till = state->nextFormulaIndex;
+	switch (canonicalBlock.kind) {
+	case RichPageBlockKind::Heading:
+	case RichPageBlockKind::Paragraph:
+	case RichPageBlockKind::Footer: {
+		if (!preparedBlock->editLeaf || (*preparedBlock->editLeaf != source)) {
+			return NativeInstantViewLeafUpdateResult::Unsupported;
+		}
+		auto prepared = PreparedIvRichText();
+		const auto kind = (canonicalBlock.kind == RichPageBlockKind::Heading)
+			? PreparedBlockKind::Heading
+			: PreparedBlockKind::Paragraph;
+		const auto context = NativeIvRichTextContextForTextSize(
+			NativeIvFlowTextSize(
+				kind,
+				canonicalBlock.headingLevel,
+				state->dimensions),
+			state->dimensions);
+		if (!PreparePreparedNativeIvRichText(
+				canonicalBlock.text,
+				&prepared,
+				state,
+				context)) {
+			return NativeInstantViewLeafUpdateResult::Failed;
+		}
+		SortPreparedIvRichText(&prepared);
+		preparedBlock->text = std::move(prepared.text);
+		preparedBlock->links = std::move(prepared.links);
+		RefreshPreparedNativeIvBlockPlaceholder(preparedBlock, state);
+	} break;
+	case RichPageBlockKind::Code: {
+		if (!preparedBlock->editLeaf || (*preparedBlock->editLeaf != source)) {
+			return NativeInstantViewLeafUpdateResult::Unsupported;
+		}
+		auto prepared = PreparedIvRichText();
+		if (!PreparePreparedNativeIvRichText(
+				canonicalBlock.text,
+				&prepared,
+				state,
+				{ .dropClickHandlers = true })) {
+			return NativeInstantViewLeafUpdateResult::Failed;
+		}
+		SortPreparedIvRichText(&prepared);
+		preparedBlock->text = StripOneTrailingNewline(std::move(prepared.text));
+		preparedBlock->links = std::move(prepared.links);
+		RefreshPreparedNativeIvBlockPlaceholder(preparedBlock, state);
+	} break;
+	case RichPageBlockKind::Quote: {
+		const auto target = FindPreparedNativeIvLeafBlock(preparedBlock, source);
+		if (!target) {
+			return NativeInstantViewLeafUpdateResult::Unsupported;
+		}
+		auto prepared = PreparedIvRichText();
+		if (!PreparePreparedNativeIvRichText(
+				canonicalBlock.text,
+				&prepared,
+				state)) {
+			return NativeInstantViewLeafUpdateResult::Failed;
+		}
+		if (canonicalBlock.pullquote) {
+			WrapPreparedIvRichTextItalic(&prepared);
+		}
+		SortPreparedIvRichText(&prepared);
+		target->text = std::move(prepared.text);
+		target->links = std::move(prepared.links);
+		RefreshPreparedNativeIvBlockPlaceholder(target, state);
+	} break;
+	case RichPageBlockKind::Table: {
+		if (!preparedBlock->editLeaf || (*preparedBlock->editLeaf != source)) {
+			return NativeInstantViewLeafUpdateResult::Unsupported;
+		}
+		auto prepared = PreparedIvRichText();
+		if (!PreparePreparedNativeIvRichText(
+				canonicalBlock.text,
+				&prepared,
+				state)) {
+			return NativeInstantViewLeafUpdateResult::Failed;
+		}
+		SortPreparedIvRichText(&prepared);
+		preparedBlock->text = std::move(prepared.text);
+		preparedBlock->links = std::move(prepared.links);
+	} break;
+	case RichPageBlockKind::Details: {
+		if (!preparedBlock->editLeaf || (*preparedBlock->editLeaf != source)) {
+			return NativeInstantViewLeafUpdateResult::Unsupported;
+		}
+		auto prepared = PreparedIvRichText();
+		if (!PreparePreparedNativeIvRichText(
+				canonicalBlock.text,
+				&prepared,
+				state)) {
+			return NativeInstantViewLeafUpdateResult::Failed;
+		}
+		StripPreparedDetailsSummaryLinks(&prepared);
+		SortPreparedIvRichText(&prepared);
+		preparedBlock->text = std::move(prepared.text);
+		preparedBlock->links = std::move(prepared.links);
+		RefreshPreparedNativeIvBlockPlaceholder(preparedBlock, state);
+	} break;
+	case RichPageBlockKind::Math: {
+		if (!preparedBlock->editLeaf || (*preparedBlock->editLeaf != source)) {
+			return NativeInstantViewLeafUpdateResult::Unsupported;
+		}
+		if (canonicalBlock.formula.trimmed().isEmpty() && !state->editMode) {
+			return NativeInstantViewLeafUpdateResult::Unsupported;
+		}
+		auto formulaIndex = preparedBlock->formulaIndex;
+		if (formulaIndex >= 0 && formulaIndex < int(state->result.formulas.size())) {
+			auto slot = PreparedFormulaSlot();
+			slot.trimmedTex = canonicalBlock.formula.trimmed();
+			slot.kind = MathKind::Display;
+			slot.textSize = state->dimensions.displayMathTextSize;
+			slot.renderWidthCap = state->dimensions.displayMathMaxRenderWidth;
+			slot.renderHeightCap = state->dimensions.displayMathMaxRenderHeight;
+			slot.present = true;
+			state->result.formulas[formulaIndex] = std::move(slot);
+		} else {
+			auto prepared = PreparedBlock();
+			prepared.kind = PreparedBlockKind::DisplayMath;
+			prepared.formulaTex = canonicalBlock.formula;
+			prepared.mathKind = MathKind::Display;
+			formulaIndex = state->rememberFormula(prepared);
+		}
+		preparedBlock->formulaTex = canonicalBlock.formula;
+		preparedBlock->formulaIndex = formulaIndex;
+		RefreshPreparedNativeIvBlockPlaceholder(preparedBlock, state);
+		formulaRange->from = formulaIndex;
+		formulaRange->till = formulaIndex + 1;
+	} break;
+	default:
+		return NativeInstantViewLeafUpdateResult::Unsupported;
+	}
+	if (canonicalBlock.kind != RichPageBlockKind::Math) {
+		formulaRange->till = state->nextFormulaIndex;
+	}
+	return NativeInstantViewLeafUpdateResult::Updated;
+}
+
+[[nodiscard]] NativeInstantViewLeafUpdateResult UpdatePreparedNativeIvBlockCaption(
+		PreparedBlock *preparedBlock,
+		const RichPageBlock &canonicalBlock,
+		const PreparedEditLeafSource &source,
+		NativeIvPrepareState *state,
+		NativeIvPreparedLeafFormulaRange *formulaRange) {
+	formulaRange->from = state->nextFormulaIndex;
+	formulaRange->till = state->nextFormulaIndex;
+	switch (canonicalBlock.kind) {
+	case RichPageBlockKind::Quote: {
+		const auto target = FindPreparedNativeIvLeafBlock(preparedBlock, source);
+		if (!target) {
+			return NativeInstantViewLeafUpdateResult::Unsupported;
+		}
+		auto prepared = PreparedIvRichText();
+		if (!PreparePreparedNativeIvRichText(
+				canonicalBlock.caption,
+				&prepared,
+				state)) {
+			return NativeInstantViewLeafUpdateResult::Failed;
+		}
+		if (canonicalBlock.pullquote) {
+			WrapPreparedIvRichTextItalic(&prepared);
+		}
+		SortPreparedIvRichText(&prepared);
+		target->text = std::move(prepared.text);
+		target->links = std::move(prepared.links);
+		RefreshPreparedNativeIvBlockPlaceholder(target, state);
+	} break;
+	case RichPageBlockKind::Photo:
+	case RichPageBlockKind::Video:
+	case RichPageBlockKind::Audio:
+	case RichPageBlockKind::Map: {
+		if (!preparedBlock->editLeaf || (*preparedBlock->editLeaf != source)) {
+			return NativeInstantViewLeafUpdateResult::Unsupported;
+		}
+		auto prepared = PreparedIvRichText();
+		if (!PreparePreparedNativeIvRichText(
+				canonicalBlock.caption,
+				&prepared,
+				state)) {
+			return NativeInstantViewLeafUpdateResult::Failed;
+		}
+		SortPreparedIvRichText(&prepared);
+		preparedBlock->text = std::move(prepared.text);
+		preparedBlock->links = std::move(prepared.links);
+		if (preparedBlock->kind == PreparedBlockKind::Photo) {
+			preparedBlock->photo.caption = preparedBlock->text;
+		} else if (preparedBlock->kind == PreparedBlockKind::Video) {
+			preparedBlock->video.caption = preparedBlock->text;
+		}
+		RefreshPreparedNativeIvMediaCaptionPlaceholder(preparedBlock, state);
+		RefreshPreparedNativeIvPlaceholderCopyText(preparedBlock);
+	} break;
+	default:
+		return NativeInstantViewLeafUpdateResult::Unsupported;
+	}
+	formulaRange->till = state->nextFormulaIndex;
+	return NativeInstantViewLeafUpdateResult::Updated;
+}
+
+[[nodiscard]] NativeInstantViewLeafUpdateResult UpdatePreparedNativeIvListItemText(
+		PreparedBlock *preparedBlock,
+		const RichPageListItem &canonicalItem,
+		const PreparedEditLeafSource &source,
+		NativeIvPrepareState *state,
+		NativeIvPreparedLeafFormulaRange *formulaRange) {
+	const auto target = FindPreparedNativeIvLeafBlock(preparedBlock, source);
+	if (!target) {
+		return NativeInstantViewLeafUpdateResult::Unsupported;
+	}
+	formulaRange->from = state->nextFormulaIndex;
+	formulaRange->till = state->nextFormulaIndex;
+	auto prepared = PreparedIvRichText();
+	if (!PreparePreparedNativeIvRichText(canonicalItem.text, &prepared, state)) {
+		return NativeInstantViewLeafUpdateResult::Failed;
+	}
+	SortPreparedIvRichText(&prepared);
+	target->text = std::move(prepared.text);
+	target->links = std::move(prepared.links);
+	RefreshPreparedNativeIvBlockPlaceholder(target, state);
+	formulaRange->till = state->nextFormulaIndex;
+	return NativeInstantViewLeafUpdateResult::Updated;
+}
+
+[[nodiscard]] NativeInstantViewLeafUpdateResult UpdatePreparedNativeIvTableCellText(
+		PreparedBlock *preparedBlock,
+		const RichPageTableCell &canonicalCell,
+		const PreparedEditLeafSource &source,
+		NativeIvPrepareState *state,
+		NativeIvPreparedLeafFormulaRange *formulaRange) {
+	const auto target = FindPreparedNativeIvLeafCell(preparedBlock, source);
+	if (!target) {
+		return NativeInstantViewLeafUpdateResult::Unsupported;
+	}
+	formulaRange->from = state->nextFormulaIndex;
+	formulaRange->till = state->nextFormulaIndex;
+	auto prepared = PreparedIvRichText();
+	const auto context = NativeIvRichTextContextForTextSize(
+		canonicalCell.header
+			? state->dimensions.tableHeaderTextSize
+			: state->dimensions.tableBodyTextSize,
+		state->dimensions);
+	if (!PreparePreparedNativeIvRichText(
+			canonicalCell.text,
+			&prepared,
+			state,
+			context)) {
+		return NativeInstantViewLeafUpdateResult::Failed;
+	}
+	SortPreparedIvRichText(&prepared);
+	target->text = std::move(prepared.text);
+	target->links = std::move(prepared.links);
+	RefreshPreparedNativeIvCellPlaceholder(target, state);
+	formulaRange->till = state->nextFormulaIndex;
+	return NativeInstantViewLeafUpdateResult::Updated;
+}
+
+using PrepareCanonicalMediaBlock = bool (*)(
+	const RichPageBlock &data,
+	std::vector<PreparedBlock> *result,
+	NativeIvPrepareState *state);
+
+[[nodiscard]] bool PrepareCanonicalNativeIvMediaBlock(
+		const RichPageBlock &data,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state,
+		PreparedEditBlockPath path,
+		PrepareCanonicalMediaBlock prepare) {
+	const auto count = result->size();
+	if (!prepare(data, result, state)) {
+		return false;
+	}
+	if (result->size() > count) {
+		ApplyBlockCaptionEditSource(&result->back(), std::move(path));
+		if (state->editMode) {
+			ApplyNativeIvEditPlaceholderText(&result->back());
+		}
+	}
+	return true;
+}
+
+[[nodiscard]] bool PrepareCanonicalNativeIvGroupedMediaBlock(
+		const RichPageBlock &data,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state,
+		PreparedEditBlockPath path) {
+	const auto count = result->size();
+	if (!PrepareNativeIvGroupedMediaBlock(data, result, state)) {
+		return false;
+	}
+	if (result->size() > count) {
+		result->back().editBlock = BlockSource(std::move(path));
+	}
+	return true;
+}
+
+void ClearPreparedEditSources(std::vector<PreparedBlock> *blocks) {
+	for (auto &block : *blocks) {
+		block.editBlock.reset();
+		block.editListItem.reset();
+		block.editLeaf.reset();
+		for (auto &row : block.tableRows) {
+			row.editRow.reset();
+			for (auto &cell : row.cells) {
+				cell.editCell.reset();
+				cell.editLeaf.reset();
+			}
+		}
+		ClearPreparedEditSources(&block.children);
+	}
+}
+
+[[nodiscard]] bool PrepareNativeIvRichPlaceholderBlock(
+		QString label,
+		const RichPage::RichText &caption,
+		QString anchorId,
+		std::optional<EmbedRequest> embed,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state) {
+	auto prepared = PreparedIvRichText();
+	if (!PrepareNativeIvRichText(
+			caption,
+			&prepared,
+			&anchorId,
+			state)) {
+		return state->result.failure.failed()
+			? false
+			: PrepareNativeIvPlainPlaceholderBlock(std::move(label), result);
+	}
+	SortPreparedIvRichText(&prepared);
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Placeholder;
+	block.text = std::move(prepared.text);
+	block.links = std::move(prepared.links);
+	block.anchorId = std::move(anchorId);
+	block.anchorIds = std::move(prepared.anchorIds);
+	block.supplementary = true;
+	block.placeholder.label = std::move(label);
+	block.placeholder.copyText = block.text.text.isEmpty()
+		? block.placeholder.label
+		: (block.placeholder.label + u"\n"_q + block.text.text);
+	block.placeholder.embed = std::move(embed);
+	if (block.placeholder.embed) {
+		block.placeholder.id = { .value = uint64(++state->nextGeneratedId) };
+	}
+	result->push_back(std::move(block));
+	return true;
+}
+
+[[nodiscard]] auto EmbedRequestFromCanonicalBlock(
+		const RichPageBlock &block) -> std::optional<EmbedRequest> {
+	auto request = EmbedRequest{
+		.width = block.width,
+		.height = block.height,
+		.fullWidth = block.fullWidth,
+		.fixedHeight = block.fixedHeight,
+		.allowScrolling = block.allowScrolling,
+	};
+	if (!block.url.isEmpty()) {
+		request.url = block.url;
+	} else if (!block.html.isEmpty()) {
+		request.html = block.html;
+	} else {
+		return std::nullopt;
+	}
+	return request;
+}
+
+[[nodiscard]] bool AppendNativeIvFlowBlock(
+		std::vector<PreparedBlock> *result,
+		PreparedBlockKind kind,
+		int headingLevel,
+		const RichPage::RichText &text,
+		QString anchorId,
+		std::optional<PreparedEditBlockPath> path,
+		NativeIvPrepareState *state,
+		bool allowEmpty = false) {
+	auto prepared = PreparedIvRichText();
+	const auto context = NativeIvRichTextContextForTextSize(
+		NativeIvFlowTextSize(kind, headingLevel, state->dimensions),
+		state->dimensions);
+	if (!PrepareNativeIvRichText(
+			text,
+			&prepared,
+			&anchorId,
+			state,
+			context)) {
+		return false;
+	}
+	auto editBlock = std::optional<PreparedEditBlockSource>();
+	auto editLeaf = std::optional<PreparedEditLeafSource>();
+	if (path) {
+		editBlock = BlockSource(*path);
+		editLeaf = BlockTextLeafSource(*path);
+	}
+	const auto count = result->size();
+	const auto appended = AppendPreparedIvRichBlock(
+		result,
+		kind,
+		headingLevel,
+		std::move(prepared),
+		std::move(anchorId),
+		allowEmpty || state->editMode,
+		false,
+		std::move(editBlock),
+		std::move(editLeaf));
+	if (appended && state->editMode && (result->size() > count)) {
+		ApplyNativeIvEditPlaceholderText(&result->back());
+	}
+	return appended;
+}
+
+[[nodiscard]] bool PrepareCanonicalNativeIvQuoteBlock(
+		const RichPageBlock &data,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state,
+		PreparedEditBlockPath path,
+		NativeIvDepthContext depthContext) {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Quote;
+	block.anchorId = data.anchorId;
+	block.pullquote = data.pullquote;
+	block.actualDepth = depthContext.quoteDepth;
+	block.visualDepth = CappedNativeIvQuoteDepth(block.actualDepth);
+	block.depthClamped = (block.actualDepth > block.visualDepth);
+	block.editBlock = BlockSource(path);
+	auto body = PreparedIvRichText();
+	if (!PrepareNativeIvRichText(data.text, &body, &block.anchorId, state)) {
+		return false;
+	}
+	if (data.blocks.empty() && !AppendPreparedQuoteParagraph(
+			&block.children,
+			std::move(body),
+			data.pullquote,
+			false,
+			state->editMode,
+			BlockTextLeafSource(path))) {
+		return false;
+	}
+	auto childContext = depthContext;
+	++childContext.quoteDepth;
+	if (!data.blocks.empty() && !PrepareCanonicalNativeIvBlocks(
+			data.blocks,
+			&block.children,
+			state,
+			BlockChildrenContainer(path),
+			childContext)) {
+		return false;
+	}
+	auto cite = PreparedIvRichText();
+	if (!PrepareNativeIvRichText(data.caption, &cite, &block.anchorId, state)) {
+		return false;
+	}
+	if (!AppendPreparedQuoteParagraph(
+			&block.children,
+			std::move(cite),
+			data.pullquote,
+			true,
+			state->editMode,
+			BlockCaptionLeafSource(path))) {
+		return false;
+	}
+	if (block.children.empty()) {
+		block.children.push_back(EmptyParagraphBlock());
+		if (data.pullquote) {
+			block.children.back().flowAlignment = TableAlignment::Center;
+			block.children.back().pullquote = true;
+		}
+	}
+	result->push_back(std::move(block));
+	return true;
+}
+
+[[nodiscard]] TaskState NativeIvTaskStateFromRichPage(
+		RichPage::TaskState state) {
+	switch (state) {
+	case RichPage::TaskState::Unchecked:
+		return TaskState::Unchecked;
+	case RichPage::TaskState::Checked:
+		return TaskState::Checked;
+	case RichPage::TaskState::None:
+		break;
+	}
+	return TaskState::None;
+}
+
+[[nodiscard]] bool PrepareCanonicalNativeIvList(
+		const std::vector<RichPageListItem> &items,
+		PreparedBlock *result,
+		NativeIvPrepareState *state,
+		PreparedEditBlockPath path,
+		NativeIvDepthContext depthContext) {
+	result->actualDepth = depthContext.listDepth;
+	result->visualDepth = CappedNativeIvListDepth(result->actualDepth);
+	result->depthClamped = (result->actualDepth > result->visualDepth);
+	result->editBlock = BlockSource(path);
+	auto firstNumber = true;
+	for (auto i = 0, count = int(items.size()); i != count; ++i) {
+		const auto &item = items[i];
+		auto block = PreparedBlock();
+		block.kind = PreparedBlockKind::ListItem;
+		block.listKind = result->listKind;
+		block.listDelimiter = result->listDelimiter;
+		block.taskState = NativeIvTaskStateFromRichPage(item.taskState);
+		block.actualDepth = result->actualDepth;
+		block.visualDepth = result->visualDepth;
+		block.depthClamped = result->depthClamped;
+		block.editListItem = ListItemSource(path, i);
+		if (result->listKind == ListKind::Ordered) {
+			auto orderedNumber = 0;
+			if (!ParseOrderedNumber(item.number, &orderedNumber)) {
+				orderedNumber = NextNativeIvOrderedNumber(*result);
+			}
+			block.orderedNumber = orderedNumber;
+			if (firstNumber) {
+				result->startNumber = block.orderedNumber;
+				firstNumber = false;
+			}
+		}
+		if (RichTextHasMeaningfulContent(item.text)) {
+			auto prepared = PreparedIvRichText();
+			auto anchorId = item.anchorId;
+			if (!PrepareNativeIvRichText(
+					item.text,
+					&prepared,
+					&anchorId,
+					state)) {
+				return false;
+			}
+			block.anchorId = std::move(anchorId);
+			if (!AppendPreparedIvRichBlock(
+					&block.children,
+					PreparedBlockKind::Paragraph,
+					0,
+					std::move(prepared),
+					QString(),
+					state->editMode,
+					false,
+					std::nullopt,
+					ListItemTextLeafSource(path, i))) {
+				return false;
+			}
+			if (state->editMode && !block.children.empty()) {
+				ApplyNativeIvEditPlaceholderText(&block.children.back());
+			}
+		}
+		auto childContext = depthContext;
+		++childContext.listDepth;
+		if (!item.blocks.empty() && !PrepareCanonicalNativeIvBlocks(
+				item.blocks,
+				&block.children,
+				state,
+				ListItemChildrenContainer(path, i),
+				childContext)) {
+			return false;
+		}
+		if (block.children.empty()) {
+			block.children.push_back(EmptyParagraphBlock());
+			block.children.back().editLeaf = ListItemTextLeafSource(path, i);
+			if (state->editMode) {
+				ApplyNativeIvEditPlaceholderText(&block.children.back());
+			}
+		}
+		result->children.push_back(std::move(block));
+	}
+	return true;
+}
+
+[[nodiscard]] TableAlignment NativeIvTableAlignment(
+		const RichPageTableCell &cell) {
+	switch (cell.alignment) {
+	case RichPage::TableAlignment::Center:
+		return TableAlignment::Center;
+	case RichPage::TableAlignment::Right:
+		return TableAlignment::Right;
+	case RichPage::TableAlignment::Left:
+		break;
+	}
+	return TableAlignment::Left;
+}
+
+[[nodiscard]] PreparedTableCellVerticalAlignment NativeIvTableVerticalAlignment(
+		const RichPageTableCell &cell) {
+	switch (cell.verticalAlignment) {
+	case RichPage::TableVerticalAlignment::Middle:
+		return PreparedTableCellVerticalAlignment::Middle;
+	case RichPage::TableVerticalAlignment::Bottom:
+		return PreparedTableCellVerticalAlignment::Bottom;
+	case RichPage::TableVerticalAlignment::Top:
+		break;
+	}
+	return PreparedTableCellVerticalAlignment::Top;
+}
+
+[[nodiscard]] bool PrepareCanonicalNativeIvTableBlock(
+		const RichPageBlock &data,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state,
+		PreparedEditBlockPath path) {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Table;
+	block.tableBordered = data.bordered;
+	block.tableStriped = data.striped;
+	block.editBlock = BlockSource(path);
+	auto title = PreparedIvRichText();
+	block.anchorId = data.anchorId;
+	if (!PrepareNativeIvRichText(data.text, &title, &block.anchorId, state)) {
+		return false;
+	}
+	SortPreparedIvRichText(&title);
+	block.text = std::move(title.text);
+	block.links = std::move(title.links);
+	block.anchorIds = std::move(title.anchorIds);
+	if (!block.text.text.isEmpty() || state->editMode) {
+		block.editLeaf = BlockTextLeafSource(path);
+	}
+	if (state->editMode) {
+		block.forceTextSegment = true;
+		ApplyNativeIvEditPlaceholderText(&block);
+	}
+
+	const auto &limits = state->tableRenderLimits;
+	const auto rowCount = std::min(int(data.tableRows.size()), limits.maxRows);
+	auto occupancy = NativeIvTableOccupancyGrid(rowCount);
+	block.tableRows.reserve(rowCount);
+	auto occupiedSlotCountSoFar = int64(0);
+
+	for (auto rowIndex = 0; rowIndex != rowCount; ++rowIndex) {
+		const auto &row = data.tableRows[rowIndex];
+		auto preparedRow = PreparedTableRow();
+		preparedRow.editRow = TableRowSource(path, rowIndex);
+		preparedRow.cells.reserve(std::min(int(row.cells.size()), limits.maxColumns));
+		for (auto cellIndex = 0, cellCount = int(row.cells.size());
+				cellIndex != cellCount;
+				++cellIndex) {
+			const auto &cell = row.cells[cellIndex];
+			auto preparedCell = PreparedTableCell();
+			const auto normalizedColspan = NormalizeNativeIvTableSpan(cell.colspan);
+			const auto rowspan = ClampNativeIvTableRowspan(
+				cell.rowspan,
+				rowIndex,
+				rowCount);
+			if (rowspan <= 0) {
+				continue;
+			}
+			const auto column = FirstAvailableNativeIvTableColumn(
+				occupancy,
+				rowIndex,
+				rowspan,
+				normalizedColspan,
+				limits.maxColumns);
+			if (column < 0) {
+				continue;
+			}
+			const auto colspan = ClampNativeIvTableColspan(
+				normalizedColspan,
+				column,
+				limits.maxColumns);
+			if (colspan <= 0) {
+				continue;
+			}
+			const auto occupiedSlotGrowth = int64(rowspan) * colspan;
+			if (occupiedSlotGrowth > limits.maxCells
+				|| (occupiedSlotCountSoFar + occupiedSlotGrowth) > limits.maxCells) {
+				continue;
+			}
+			preparedCell.column = column;
+			preparedCell.alignment = NativeIvTableAlignment(cell);
+			preparedCell.header = cell.header;
+			preparedCell.verticalAlignment = NativeIvTableVerticalAlignment(cell);
+			preparedCell.colspan = colspan;
+			preparedCell.rowspan = rowspan;
+			preparedCell.editCell = TableCellSource(
+				path,
+				rowIndex,
+				cellIndex,
+				column,
+				colspan,
+				rowspan);
+			preparedCell.editLeaf = TableCellTextLeafSource(
+				path,
+				rowIndex,
+				cellIndex);
+			if (state->editMode) {
+				ApplyNativeIvEditPlaceholderText(&preparedCell);
+			}
+			if (!cell.text.text.empty()) {
+				auto rich = PreparedIvRichText();
+				const auto context = NativeIvRichTextContextForTextSize(
+					cell.header
+						? state->dimensions.tableHeaderTextSize
+						: state->dimensions.tableBodyTextSize,
+					state->dimensions);
+				if (!PrepareNativeIvRichText(
+						cell.text,
+						&rich,
+						nullptr,
+						state,
+						context)) {
+					return false;
+				}
+				SortPreparedIvRichText(&rich);
+				preparedCell.text = std::move(rich.text);
+				preparedCell.links = std::move(rich.links);
+			}
+			MarkNativeIvTableSlots(
+				&occupancy,
+				rowIndex,
+				column,
+				rowspan,
+				colspan);
+			occupiedSlotCountSoFar += occupiedSlotGrowth;
+			preparedRow.cells.push_back(std::move(preparedCell));
+		}
+		preparedRow.header = !preparedRow.cells.empty()
+			&& std::all_of(
+				preparedRow.cells.begin(),
+				preparedRow.cells.end(),
+				[](const PreparedTableCell &cell) {
+					return cell.header;
+				});
+		block.tableRows.push_back(std::move(preparedRow));
+	}
+
+	block.tableColumnCount = NativeIvTableColumnCount(occupancy);
+	block.tableAlignments.resize(block.tableColumnCount, TableAlignment::Left);
+	for (const auto &preparedRow : block.tableRows) {
+		for (const auto &preparedCell : preparedRow.cells) {
+			const auto from = std::max(preparedCell.column, 0);
+			const auto to = std::min(
+				preparedCell.column + preparedCell.colspan,
+				block.tableColumnCount);
+			for (auto column = from; column != to; ++column) {
+				block.tableAlignments[column] = preparedCell.alignment;
+			}
+		}
+	}
+	result->push_back(std::move(block));
+	return true;
+}
+
+[[nodiscard]] bool PrepareCanonicalNativeIvDetailsBlock(
+		const RichPageBlock &data,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state,
+		PreparedEditBlockPath path,
+		NativeIvDepthContext depthContext) {
+	auto summary = PreparedIvRichText();
+	auto anchorId = NativeIvDetailsAnchorId(state);
+	if (!PrepareNativeIvRichText(
+			data.text,
+			&summary,
+			&anchorId,
+			state)) {
+		return false;
+	}
+	if (!summary.links.empty()) {
+		const auto from = std::remove_if(
+			summary.text.entities.begin(),
+			summary.text.entities.end(),
+			[](const EntityInText &entity) {
+				return entity.type() == EntityType::CustomUrl;
+			});
+		summary.text.entities.erase(from, summary.text.entities.end());
+		summary.links.clear();
+	}
+	SortPreparedIvRichText(&summary);
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Details;
+	block.anchorId = std::move(anchorId);
+	block.detailsOpen = data.open;
+	block.collapsed = state->editMode ? false : !data.open;
+	block.text = std::move(summary.text);
+	block.links = std::move(summary.links);
+	block.anchorIds = std::move(summary.anchorIds);
+	block.editBlock = BlockSource(path);
+	block.editLeaf = BlockTextLeafSource(path);
+	if (state->editMode) {
+		ApplyNativeIvEditPlaceholderText(&block);
+	}
+	return PrepareCanonicalNativeIvBlocks(
+		data.blocks,
+		&block.children,
+		state,
+		BlockChildrenContainer(path),
+		depthContext)
+		? (result->push_back(std::move(block)), true)
+		: false;
+}
+
+[[nodiscard]] QString NativeIvRelatedArticleFooterText(
+		const RichPageRelatedArticle &article) {
+	if (article.publishedDate && !article.author.isEmpty()) {
+		return article.author + u", "_q + NativeIvDateText(article.publishedDate);
+	} else if (article.publishedDate) {
+		return NativeIvDateText(article.publishedDate);
+	}
+	return article.author;
+}
+
+[[nodiscard]] bool PrepareCanonicalNativeIvRelatedArticlesBlock(
+		const RichPageBlock &data,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state) {
+	auto related = std::vector<PreparedBlock>();
+	related.reserve(data.relatedArticles.size());
+	for (const auto &article : data.relatedArticles) {
+		auto prepared = PreparedBlock();
+		prepared.kind = PreparedBlockKind::RelatedArticle;
+		prepared.relatedArticle.title = article.title.trimmed();
+		prepared.relatedArticle.description = article.description.trimmed();
+		prepared.relatedArticle.footer = NativeIvRelatedArticleFooterText(article);
+		prepared.relatedArticle.photoId = article.photoId;
+		if (prepared.relatedArticle.title.isEmpty()
+			&& prepared.relatedArticle.description.isEmpty()
+			&& prepared.relatedArticle.footer.isEmpty()) {
+			prepared.relatedArticle.title = article.url.trimmed();
+		}
+		const auto linkText = !prepared.relatedArticle.title.isEmpty()
+			? prepared.relatedArticle.title
+			: !prepared.relatedArticle.description.isEmpty()
+			? prepared.relatedArticle.description
+			: prepared.relatedArticle.footer;
+		prepared.relatedArticle.link = PrepareNativeIvRelatedArticleLink(
+			article.url,
+			article.webpageId,
+			linkText);
+		const auto appendLine = [&](QString *copyText, const QString &line) {
+			if (line.isEmpty()) {
+				return;
+			} else if (!copyText->isEmpty()) {
+				copyText->append(QChar('\n'));
+			}
+			copyText->append(line);
+		};
+		appendLine(&prepared.relatedArticle.copyText, prepared.relatedArticle.title);
+		appendLine(
+			&prepared.relatedArticle.copyText,
+			prepared.relatedArticle.description);
+		appendLine(&prepared.relatedArticle.copyText, prepared.relatedArticle.footer);
+		if (prepared.relatedArticle.copyText.isEmpty()) {
+			prepared.relatedArticle.copyText = prepared.relatedArticle.link.target;
+		}
+		related.push_back(std::move(prepared));
+	}
+	if (related.empty()) {
+		return true;
+	}
+
+	auto title = PreparedIvRichText();
+	auto anchorId = data.anchorId;
+	if (!PrepareNativeIvRichText(data.text, &title, &anchorId, state)) {
+		return false;
+	}
+	SortPreparedIvRichText(&title);
+	if (!title.text.text.isEmpty()) {
+		if (!AppendPreparedIvRichBlock(
+				result,
+				PreparedBlockKind::Heading,
+				4,
+				std::move(title),
+				std::move(anchorId),
+				state->editMode)) {
+			return false;
+		}
+	} else if (!anchorId.isEmpty() && related.front().anchorId.isEmpty()) {
+		related.front().anchorId = std::move(anchorId);
+	}
+	result->insert(
+		result->end(),
+		std::make_move_iterator(related.begin()),
+		std::make_move_iterator(related.end()));
+	return true;
+}
+
+[[nodiscard]] bool PrepareCanonicalNativeIvEmbedPostBlock(
+		const RichPageBlock &data,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state,
+		NativeIvDepthContext depthContext) {
+	auto caption = PreparedIvRichText();
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::EmbedPost;
+	block.embedPost.url = data.url.trimmed();
+	block.embedPost.authorPhotoId = data.photoId;
+	block.embedPost.author = data.author.trimmed();
+	if (data.date) {
+		block.embedPost.dateText = NativeIvDateText(data.date);
+	}
+	auto anchorId = data.anchorId;
+	if (!PrepareNativeIvRichText(data.caption, &caption, &anchorId, state)) {
+		return false;
+	}
+	SortPreparedIvRichText(&caption);
+	block.text = std::move(caption.text);
+	block.links = std::move(caption.links);
+	block.anchorId = std::move(anchorId);
+	block.anchorIds = std::move(caption.anchorIds);
+	block.supplementary = true;
+	if (data.blocks.empty()) {
+		block.children.push_back(
+			PrepareNativeIvEmbedPostFallbackParagraph(block.embedPost.url));
+	} else if (!PrepareCanonicalNativeIvBlocks(
+			data.blocks,
+			&block.children,
+			state,
+			PreparedEditBlockContainerPath(),
+			depthContext)) {
+		return false;
+	} else {
+		ClearPreparedEditSources(&block.children);
+	}
+	result->push_back(std::move(block));
+	return true;
+}
+
+[[nodiscard]] bool PrepareCanonicalNativeIvBlock(
+		const RichPageBlock &block,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state,
+		PreparedEditBlockPath path,
+		NativeIvDepthContext depthContext) {
+	if (state->blocked()) {
+		return false;
+	}
+	switch (block.kind) {
+	case RichPageBlockKind::Unsupported:
+		return true;
+	case RichPageBlockKind::Heading:
+		return AppendNativeIvFlowBlock(
+			result,
+			PreparedBlockKind::Heading,
+			block.headingLevel,
+			block.text,
+			block.anchorId,
+			path,
+			state);
+	case RichPageBlockKind::Paragraph:
+	case RichPageBlockKind::Footer:
+		return AppendNativeIvFlowBlock(
+			result,
+			PreparedBlockKind::Paragraph,
+			0,
+			block.text,
+			block.anchorId,
+			path,
+			state);
+	case RichPageBlockKind::Thinking:
+		return AppendNativeIvFlowBlock(
+			result,
+			PreparedBlockKind::Thinking,
+			0,
+			block.text,
+			block.anchorId,
+			std::nullopt,
+			state);
+	case RichPageBlockKind::AuthorDate: {
+		auto prepared = PreparedIvRichText();
+		auto anchorId = block.anchorId;
+		if (!PrepareNativeIvRichText(
+				block.text,
+				&prepared,
+				&anchorId,
+				state)) {
+			return false;
+		}
+		if (block.date) {
+			if (!prepared.text.text.isEmpty()) {
+				prepared.text.append(u" \u2022 "_q);
+			}
+			prepared.text.append(NativeIvDateText(block.date));
+		}
+		return AppendPreparedIvRichBlock(
+			result,
+			PreparedBlockKind::Paragraph,
+			0,
+			std::move(prepared),
+			std::move(anchorId),
+			false,
+			true);
+	}
+	case RichPageBlockKind::Code: {
+		auto prepared = PreparedIvRichText();
+		auto anchorId = block.anchorId;
+		if (!PrepareNativeIvRichText(
+				block.text,
+				&prepared,
+				&anchorId,
+				state,
+				{ .dropClickHandlers = true })) {
+			return false;
+		}
+		auto code = PreparedBlock();
+		code.kind = PreparedBlockKind::CodeBlock;
+		code.anchorId = std::move(anchorId);
+		code.codeLanguage = block.language;
+		SortPreparedIvRichText(&prepared);
+		code.text = StripOneTrailingNewline(std::move(prepared.text));
+		code.links = std::move(prepared.links);
+		code.anchorIds = std::move(prepared.anchorIds);
+		code.editBlock = BlockSource(path);
+		code.editLeaf = BlockTextLeafSource(path);
+		if (state->editMode) {
+			ApplyNativeIvEditPlaceholderText(&code);
+		}
+		result->push_back(std::move(code));
+		return true;
+	}
+	case RichPageBlockKind::Divider: {
+		auto prepared = PrepareRuleBlock();
+		prepared.editBlock = BlockSource(path);
+		result->push_back(std::move(prepared));
+		return true;
+	}
+	case RichPageBlockKind::Anchor: {
+		auto prepared = PreparedIvRichText();
+		auto editBlock = std::optional<PreparedEditBlockSource>();
+		editBlock = BlockSource(path);
+		return AppendPreparedIvRichBlock(
+			result,
+			PreparedBlockKind::Paragraph,
+			0,
+			std::move(prepared),
+			block.anchorId,
+			true,
+			false,
+			std::move(editBlock));
+	}
+	case RichPageBlockKind::List: {
+		auto prepared = PreparedBlock();
+		prepared.kind = PreparedBlockKind::List;
+		prepared.listKind = (block.listKind == RichPage::ListKind::Ordered)
+			? ListKind::Ordered
+			: ListKind::Bullet;
+		if (prepared.listKind == ListKind::Ordered) {
+			prepared.listDelimiter = ListDelimiter::Period;
+			prepared.startNumber = 1;
+		}
+		return PrepareCanonicalNativeIvList(
+			block.listItems,
+			&prepared,
+			state,
+			path,
+			depthContext)
+			? (result->push_back(std::move(prepared)), true)
+			: false;
+	}
+	case RichPageBlockKind::Quote:
+		return PrepareCanonicalNativeIvQuoteBlock(
+			block,
+			result,
+			state,
+			path,
+			depthContext);
+	case RichPageBlockKind::Photo:
+		return PrepareCanonicalNativeIvMediaBlock(
+			block,
+			result,
+			state,
+			path,
+			PrepareNativeIvPhotoBlock);
+	case RichPageBlockKind::Video:
+		return PrepareCanonicalNativeIvMediaBlock(
+			block,
+			result,
+			state,
+			path,
+			PrepareNativeIvVideoBlock);
+	case RichPageBlockKind::Embed:
+		return PrepareNativeIvRichPlaceholderBlock(
+			tr::lng_iv_click_to_view(tr::now),
+			block.caption,
+			block.anchorId,
+			EmbedRequestFromCanonicalBlock(block),
+			result,
+			state);
+	case RichPageBlockKind::EmbedPost:
+		return PrepareCanonicalNativeIvEmbedPostBlock(
+			block,
+			result,
+			state,
+			depthContext);
+	case RichPageBlockKind::GroupedMedia:
+		return PrepareCanonicalNativeIvGroupedMediaBlock(
+			block,
+			result,
+			state,
+			path);
+	case RichPageBlockKind::Channel:
+		return PrepareNativeIvChannelBlock(block, result, state);
+	case RichPageBlockKind::Audio:
+		return PrepareCanonicalNativeIvMediaBlock(
+			block,
+			result,
+			state,
+			path,
+			PrepareNativeIvAudioBlock);
+	case RichPageBlockKind::Math:
+		if (block.formula.trimmed().isEmpty() && !state->editMode) {
+			return true;
+		} else {
+			auto prepared = PreparedBlock();
+			prepared.kind = PreparedBlockKind::DisplayMath;
+			prepared.formulaTex = block.formula;
+			prepared.mathKind = MathKind::Display;
+			prepared.editBlock = BlockSource(path);
+			prepared.editLeaf = MathFormulaLeafSource(path);
+			if (state->editMode) {
+				ApplyNativeIvEditPlaceholderText(&prepared);
+			}
+			prepared.formulaIndex = state->rememberFormula(prepared);
+			result->push_back(std::move(prepared));
+			return true;
+		}
+	case RichPageBlockKind::Table:
+		return PrepareCanonicalNativeIvTableBlock(block, result, state, path);
+	case RichPageBlockKind::Details:
+		return PrepareCanonicalNativeIvDetailsBlock(
+			block,
+			result,
+			state,
+			path,
+			depthContext);
+	case RichPageBlockKind::RelatedArticles:
+		return PrepareCanonicalNativeIvRelatedArticlesBlock(block, result, state);
+	case RichPageBlockKind::Map:
+		return PrepareCanonicalNativeIvMediaBlock(
+			block,
+			result,
+			state,
+			path,
+			PrepareNativeIvMapBlock);
+	}
+	return true;
+}
+
+[[nodiscard]] bool PrepareCanonicalNativeIvBlocks(
+		const std::vector<RichPageBlock> &blocks,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state,
+		PreparedEditBlockContainerPath container,
+		NativeIvDepthContext depthContext) {
+	for (auto i = 0, count = int(blocks.size()); i != count; ++i) {
+		const auto path = PreparedEditBlockPath{
+			.container = container,
+			.index = i,
+		};
+		if (!PrepareCanonicalNativeIvBlock(
+				blocks[i],
+				result,
+				state,
+				path,
+				depthContext)) {
+			if (state->result.failure.failed()) {
+				return false;
+			}
+			(void)PrepareNativeIvPlainPlaceholderBlock(
+				u"Unsupported Block"_q,
+				result);
+		}
+	}
+	return !state->result.failure.failed();
+}
+
+} // namespace
+
+bool PrepareNativeIvBlocks(
+		const Iv::RichPage &page,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state) {
+	return PrepareCanonicalNativeIvBlocks(
+		page.blocks,
+		result,
+		state,
+		PreparedEditBlockContainerPath(),
+		NativeIvDepthContext());
+}
+
+NativeInstantViewLeafUpdateResult UpdatePreparedNativeIvLeaf(
+		std::vector<PreparedBlock> *blocks,
+		const Iv::RichPage &page,
+		const PreparedEditLeafSource &source,
+		NativeIvPrepareState *state,
+		NativeIvPreparedLeafFormulaRange *formulaRange) {
+	if (!blocks || !state || !formulaRange) {
+		return NativeInstantViewLeafUpdateResult::Failed;
+	}
+	const auto canonicalBlock = ResolveCanonicalNativeIvBlock(page, source.block);
+	const auto preparedBlock = FindPreparedNativeIvBlockByPath(blocks, source.block);
+	if (!canonicalBlock || !preparedBlock) {
+		return NativeInstantViewLeafUpdateResult::Unsupported;
+	}
+	switch (source.kind) {
+	case PreparedEditLeafKind::BlockText:
+	case PreparedEditLeafKind::MathFormula:
+	case PreparedEditLeafKind::BlockCaption:
+		break;
+	case PreparedEditLeafKind::ListItemText:
+		if (source.listItemIndex < 0
+			|| source.listItemIndex >= int(canonicalBlock->listItems.size())) {
+			return NativeInstantViewLeafUpdateResult::Unsupported;
+		}
+		break;
+	case PreparedEditLeafKind::TableCellText:
+		if (source.tableRowIndex < 0
+			|| source.tableRowIndex >= int(canonicalBlock->tableRows.size())) {
+			return NativeInstantViewLeafUpdateResult::Unsupported;
+		}
+		if (source.tableCellIndex < 0
+			|| source.tableCellIndex
+				>= int(canonicalBlock->tableRows[source.tableRowIndex].cells.size())) {
+			return NativeInstantViewLeafUpdateResult::Unsupported;
+		}
+		break;
+	}
+	switch (source.kind) {
+	case PreparedEditLeafKind::BlockText:
+	case PreparedEditLeafKind::MathFormula:
+		return UpdatePreparedNativeIvBlockText(
+			preparedBlock,
+			*canonicalBlock,
+			source,
+			state,
+			formulaRange);
+	case PreparedEditLeafKind::BlockCaption:
+		return UpdatePreparedNativeIvBlockCaption(
+			preparedBlock,
+			*canonicalBlock,
+			source,
+			state,
+			formulaRange);
+	case PreparedEditLeafKind::ListItemText:
+		return UpdatePreparedNativeIvListItemText(
+			preparedBlock,
+			canonicalBlock->listItems[source.listItemIndex],
+			source,
+			state,
+			formulaRange);
+	case PreparedEditLeafKind::TableCellText:
+		return UpdatePreparedNativeIvTableCellText(
+			preparedBlock,
+			canonicalBlock->tableRows[source.tableRowIndex]
+				.cells[source.tableCellIndex],
+			source,
+			state,
+			formulaRange);
+	}
+	return NativeInstantViewLeafUpdateResult::Unsupported;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_native_blocks.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_native_blocks.h
new file mode 100644
index 00000000000000..e2ae0b9fb0707f
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_native_blocks.h
@@ -0,0 +1,30 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_prepare_native_richtext.h"
+
+namespace Iv::Markdown {
+
+struct NativeIvPreparedLeafFormulaRange {
+	int from = 0;
+	int till = 0;
+};
+
+[[nodiscard]] bool PrepareNativeIvBlocks(
+	const Iv::RichPage &page,
+	std::vector<PreparedBlock> *result,
+	NativeIvPrepareState *state);
+[[nodiscard]] NativeInstantViewLeafUpdateResult UpdatePreparedNativeIvLeaf(
+	std::vector<PreparedBlock> *blocks,
+	const Iv::RichPage &page,
+	const PreparedEditLeafSource &source,
+	NativeIvPrepareState *state,
+	NativeIvPreparedLeafFormulaRange *formulaRange);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_native_richtext.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_native_richtext.cpp
new file mode 100644
index 00000000000000..577d26fb7b9d58
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_native_richtext.cpp
@@ -0,0 +1,647 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_prepare_native_richtext.h"
+
+struct GeoPointLocation;
+
+#include "base/algorithm.h"
+#include "data/data_location.h"
+#include "iv/markdown/iv_markdown_prepare_links.h"
+#include "iv/markdown/iv_markdown_prepare_serialize.h"
+#include "ui/basic_click_handlers.h"
+#include "history/history_location_manager.h"
+
+#include <algorithm>
+#include <limits>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+constexpr auto kDefaultMapWidth = 400;
+constexpr auto kDefaultMapHeight = 200;
+
+[[nodiscard]] uint64 GeneratePreparedBlockIdValue(
+		NativeIvPrepareState *state) {
+	return uint64(++state->nextGeneratedId);
+}
+
+[[nodiscard]] PreparedMediaBlockId GeneratePreparedMediaBlockId(
+		NativeIvPrepareState *state) {
+	return { .value = GeneratePreparedBlockIdValue(state) };
+}
+
+[[nodiscard]] uint64 CanonicalPhotoId(const Iv::RichPage::Block &data) {
+	return data.photoId;
+}
+
+[[nodiscard]] uint64 CanonicalPhotoId(
+		const Iv::RichPage::GroupedMediaItem &data) {
+	return data.photoId;
+}
+
+[[nodiscard]] uint64 CanonicalDocumentId(const Iv::RichPage::Block &data) {
+	return data.documentId;
+}
+
+[[nodiscard]] uint64 CanonicalDocumentId(
+		const Iv::RichPage::GroupedMediaItem &data) {
+	return data.documentId;
+}
+
+[[nodiscard]] int CanonicalWidth(const Iv::RichPage::Block &data) {
+	return data.width;
+}
+
+[[nodiscard]] int CanonicalWidth(
+		const Iv::RichPage::GroupedMediaItem &data) {
+	return data.width;
+}
+
+[[nodiscard]] int CanonicalHeight(const Iv::RichPage::Block &data) {
+	return data.height;
+}
+
+[[nodiscard]] int CanonicalHeight(
+		const Iv::RichPage::GroupedMediaItem &data) {
+	return data.height;
+}
+
+[[nodiscard]] bool PrepareNativeIvGroupedMediaItem(
+		const Iv::RichPage::GroupedMediaItem &item,
+		PreparedGroupedMediaItemData *result) {
+	switch (item.kind) {
+	case Iv::RichPage::BlockKind::Photo: {
+		const auto photoId = CanonicalPhotoId(item);
+		const auto width = CanonicalWidth(item);
+		const auto height = CanonicalHeight(item);
+		if (!photoId || width <= 0 || height <= 0) {
+			return false;
+		}
+		result->media.kind = PreparedMediaItemKind::Photo;
+		result->media.id = photoId;
+		result->media.width = width;
+		result->media.height = height;
+		result->media.spoiler = item.spoiler;
+		return true;
+	}
+	case Iv::RichPage::BlockKind::Video: {
+		const auto documentId = CanonicalDocumentId(item);
+		const auto width = CanonicalWidth(item);
+		const auto height = CanonicalHeight(item);
+		if (!documentId || width <= 0 || height <= 0) {
+			return false;
+		}
+		result->media.kind = PreparedMediaItemKind::Document;
+		result->media.id = documentId;
+		result->media.width = width;
+		result->media.height = height;
+		result->media.spoiler = item.spoiler;
+		return true;
+	}
+	default:
+		return false;
+	}
+}
+
+void SortPreparedIvRichText(PreparedIvRichText *text) {
+	SortEntities(&text->text);
+}
+
+[[nodiscard]] const QString &NativeIvLinkColorizedEntityData() {
+	static const auto result = [] {
+		auto value = QString();
+		value.reserve(2);
+		value.push_back(QChar(kNativeIvLinkSpecialColorIndex));
+		value.push_back(QChar(kNativeIvLinkSpecialColorIndex));
+		return value;
+	}();
+	return result;
+}
+
+[[nodiscard]] bool AddNativeIvPreparedLink(
+		TextWithEntities *text,
+		std::vector<PreparedLink> *links,
+		int from,
+		int length,
+		QString target,
+		uint64 webpageId = 0) {
+	if (!length || target.isEmpty()) {
+		return true;
+	}
+	const auto index = links->size() + 1;
+	if (index > std::numeric_limits<uint16>::max()) {
+		return true;
+	}
+	auto prepared = PreparedLink();
+	if (webpageId) {
+		prepared.index = uint16(index);
+		prepared.kind = PreparedLinkKind::InstantViewPage;
+		prepared.webpageId = webpageId;
+		NormalizePreparedUrlLink(&prepared, target);
+	} else {
+		prepared = ClassifiedLink(uint16(index), target, nullptr);
+	}
+	if (prepared.kind == PreparedLinkKind::RejectedRelative
+		|| prepared.kind == PreparedLinkKind::LocalFile) {
+		return true;
+	}
+	FinalizePreparedUrlLink(&prepared, QStringView(text->text).mid(from, length));
+	if (prepared.kind == PreparedLinkKind::InstantViewPage) {
+		text->entities.push_back(EntityInText(
+			EntityType::Colorized,
+			from,
+			length,
+			NativeIvLinkColorizedEntityData()));
+	}
+	text->entities.push_back(EntityInText(
+		EntityType::CustomUrl,
+		from,
+		length,
+		InternalLinkData(uint16(index))));
+	links->push_back(std::move(prepared));
+	return true;
+}
+
+void AddNativeIvBlockAnchor(
+		QString *blockAnchorId,
+		std::vector<QString> *blockAnchorIds,
+		QString anchorId) {
+	if (anchorId.isEmpty()) {
+		return;
+	}
+	if (blockAnchorId && blockAnchorId->isEmpty()) {
+		*blockAnchorId = std::move(anchorId);
+		return;
+	}
+	if (blockAnchorId && *blockAnchorId == anchorId) {
+		return;
+	}
+	if (blockAnchorIds
+		&& !ranges::contains(*blockAnchorIds, anchorId)) {
+		blockAnchorIds->push_back(std::move(anchorId));
+	}
+}
+
+[[nodiscard]] bool DropNativeIvClickHandlerEntity(EntityType type) {
+	switch (type) {
+	case EntityType::Mention:
+	case EntityType::Hashtag:
+	case EntityType::BotCommand:
+	case EntityType::Cashtag:
+	case EntityType::Url:
+	case EntityType::Email:
+	case EntityType::Phone:
+	case EntityType::BankCard:
+	case EntityType::CustomUrl:
+	case EntityType::MentionName:
+	case EntityType::FormattedDate:
+		return true;
+	default:
+		return false;
+	}
+}
+
+void RememberCanonicalInlineFormula(
+		const EntityInText &entity,
+		NativeIvPrepareState *state,
+		NativeIvRichTextContext context) {
+	if (entity.type() != EntityType::CustomEmoji) {
+		return;
+	}
+	const auto parsed = ParseInlineTextObjectEntity(entity.data());
+	if (!parsed || parsed->kind != InlineTextObjectKind::Formula) {
+		return;
+	}
+	const auto formula = std::get_if<InlineTextObjectFormulaData>(&parsed->data);
+	if (!formula) {
+		return;
+	}
+	(void)state->rememberFormula(
+		MathKind::Inline,
+		formula->trimmedTex,
+		context.textSize,
+		context.renderWidthCap,
+		context.renderHeightCap);
+}
+
+void AppendCanonicalNativeIvRichText(
+		const Iv::RichPage::RichText &text,
+		PreparedIvRichText *result,
+		NativeIvPrepareState *state,
+		NativeIvRichTextContext context) {
+	const auto shift = result->text.text.size();
+	result->text.text.append(text.text.text);
+	result->text.entities.reserve(
+		result->text.entities.size() + text.text.entities.size());
+	for (const auto &entity : text.text.entities) {
+		if (context.dropClickHandlers
+			&& DropNativeIvClickHandlerEntity(entity.type())) {
+			continue;
+		}
+		if (entity.type() == EntityType::CustomUrl) {
+			if (entity.offset() < 0
+				|| entity.length() <= 0
+				|| entity.offset() >= text.text.text.size()) {
+				continue;
+			}
+			const auto length = std::min(
+				entity.length(),
+				int(text.text.text.size()) - entity.offset());
+			const auto decoded = Iv::DecodeRichPageLinkUrl(entity.data());
+			(void)AddNativeIvPreparedLink(
+				&result->text,
+				&result->links,
+				shift + entity.offset(),
+				length,
+				decoded ? decoded->url : entity.data(),
+				decoded ? decoded->webpageId : 0);
+			continue;
+		}
+		RememberCanonicalInlineFormula(entity, state, context);
+		result->text.entities.push_back(EntityInText(
+			entity.type(),
+			entity.offset() + shift,
+			entity.length(),
+			entity.data()));
+	}
+}
+
+[[nodiscard]] int ScaleNativeIvFormulaCap(
+		int cap,
+		int textSize,
+		int baseTextSize) {
+	if (cap <= 0) {
+		return 0;
+	}
+	const auto numerator = int64(cap) * std::max(textSize, 1);
+	const auto denominator = std::max(baseTextSize, 1);
+	return std::max(int((numerator + denominator - 1) / denominator), 1);
+}
+
+[[nodiscard]] NativeIvRichTextContext ResolveNativeIvRichTextContext(
+		NativeIvPrepareState *state,
+		NativeIvRichTextContext context) {
+	const auto bodyTextSize = state->dimensions.bodyTextSize;
+	if (!context.textSize) {
+		context.textSize = bodyTextSize;
+	}
+	if (!context.renderWidthCap) {
+		context.renderWidthCap = ScaleNativeIvFormulaCap(
+			state->dimensions.displayMathMaxRenderWidth,
+			context.textSize,
+			state->dimensions.displayMathTextSize);
+	}
+	if (!context.renderHeightCap) {
+		context.renderHeightCap = ScaleNativeIvFormulaCap(
+			state->dimensions.displayMathMaxRenderHeight,
+			context.textSize,
+			state->dimensions.displayMathTextSize);
+	}
+	return context;
+}
+
+[[nodiscard]] bool PrepareNativeIvCaption(
+		const Iv::RichPage::RichText &caption,
+		PreparedIvRichText *result,
+		QString *blockAnchorId,
+		NativeIvPrepareState *state) {
+	return PrepareNativeIvRichText(
+		caption,
+		result,
+		blockAnchorId,
+		state);
+}
+
+[[nodiscard]] bool PrepareNativeIvCanonicalPlaceholderBlock(
+		QString label,
+		const Iv::RichPage::RichText &caption,
+		QString anchorId,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state) {
+	auto prepared = PreparedIvRichText();
+	if (!PrepareNativeIvCaption(caption, &prepared, &anchorId, state)) {
+		return state->result.failure.failed()
+			? false
+			: PrepareNativeIvPlainPlaceholderBlock(std::move(label), result);
+	}
+	SortPreparedIvRichText(&prepared);
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Placeholder;
+	block.text = std::move(prepared.text);
+	block.links = std::move(prepared.links);
+	block.anchorId = std::move(anchorId);
+	block.anchorIds = std::move(prepared.anchorIds);
+	block.supplementary = true;
+	block.forceTextSegment = state->editMode;
+	block.placeholder.label = std::move(label);
+	block.placeholder.copyText = block.text.text.isEmpty()
+		? block.placeholder.label
+		: (block.placeholder.label + u"\n"_q + block.text.text);
+	result->push_back(std::move(block));
+	return true;
+}
+
+void ApplyEmptyMediaCaptionPlaceholder(
+		PreparedBlock *block,
+		NativeIvPrepareState *state) {
+	if (!state->editMode || !block->text.text.isEmpty()) {
+		return;
+	}
+	block->editPlaceholderText = u"Caption"_q;
+}
+
+} // namespace
+
+bool PrepareNativeIvRichText(
+		const Iv::RichPage::RichText &text,
+		PreparedIvRichText *result,
+		QString *blockAnchorId,
+		NativeIvPrepareState *state,
+		NativeIvRichTextContext context) {
+	context = ResolveNativeIvRichTextContext(state, context);
+	AddNativeIvBlockAnchor(blockAnchorId, &result->anchorIds, text.anchorId);
+	for (const auto &anchorId : text.anchorIds) {
+		AddNativeIvBlockAnchor(blockAnchorId, &result->anchorIds, anchorId);
+	}
+	AppendCanonicalNativeIvRichText(text, result, state, context);
+	return true;
+}
+
+bool AppendPreparedIvRichBlock(
+		std::vector<PreparedBlock> *result,
+		PreparedBlockKind kind,
+		int headingLevel,
+		PreparedIvRichText prepared,
+		QString anchorId,
+		bool allowEmpty,
+		bool supplementary,
+		std::optional<PreparedEditBlockSource> editBlock,
+		std::optional<PreparedEditLeafSource> editLeaf) {
+	SortPreparedIvRichText(&prepared);
+	if (prepared.text.text.isEmpty() && !allowEmpty) {
+		return true;
+	}
+	auto block = PreparedBlock();
+	block.kind = kind;
+	block.headingLevel = headingLevel;
+	block.text = std::move(prepared.text);
+	block.links = std::move(prepared.links);
+	block.anchorId = std::move(anchorId);
+	block.anchorIds = std::move(prepared.anchorIds);
+	block.supplementary = supplementary;
+	block.editBlock = std::move(editBlock);
+	block.editLeaf = std::move(editLeaf);
+	result->push_back(std::move(block));
+	return true;
+}
+
+bool PrepareNativeIvPlainPlaceholderBlock(
+		QString label,
+		std::vector<PreparedBlock> *result) {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Placeholder;
+	block.placeholder.label = std::move(label);
+	block.placeholder.copyText = block.placeholder.label;
+	result->push_back(std::move(block));
+	return true;
+}
+
+bool PrepareNativeIvPhotoBlock(
+		const Iv::RichPage::Block &data,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state) {
+	if (!CanonicalPhotoId(data)
+		|| CanonicalWidth(data) <= 0
+		|| CanonicalHeight(data) <= 0) {
+		return state->editMode
+			? PrepareNativeIvCanonicalPlaceholderBlock(
+				u"Photo"_q,
+				data.caption,
+				data.anchorId,
+				result,
+				state)
+			: true;
+	}
+	auto caption = PreparedIvRichText();
+	auto anchorId = QString();
+	if (!PrepareNativeIvCaption(data.caption, &caption, &anchorId, state)) {
+		return false;
+	}
+	SortPreparedIvRichText(&caption);
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Photo;
+	block.text = std::move(caption.text);
+	block.links = std::move(caption.links);
+	block.anchorId = data.anchorId.isEmpty() ? std::move(anchorId) : data.anchorId;
+	block.anchorIds = std::move(caption.anchorIds);
+	block.supplementary = true;
+	block.forceTextSegment = state->editMode;
+	ApplyEmptyMediaCaptionPlaceholder(&block, state);
+	block.photo.id = GeneratePreparedMediaBlockId(state);
+	block.photo.photoId = CanonicalPhotoId(data);
+	block.photo.width = CanonicalWidth(data);
+	block.photo.height = CanonicalHeight(data);
+	block.photo.urlOverride = data.url;
+	block.photo.caption = block.text;
+	block.photo.spoiler = data.spoiler;
+	block.photo.viewerOpen = true;
+	result->push_back(std::move(block));
+	return true;
+}
+
+bool PrepareNativeIvVideoBlock(
+		const Iv::RichPage::Block &data,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state) {
+	if (!CanonicalDocumentId(data)
+		|| CanonicalWidth(data) <= 0
+		|| CanonicalHeight(data) <= 0) {
+		return state->editMode
+			? PrepareNativeIvCanonicalPlaceholderBlock(
+				u"Video"_q,
+				data.caption,
+				data.anchorId,
+				result,
+				state)
+			: true;
+	}
+	auto caption = PreparedIvRichText();
+	auto anchorId = QString();
+	if (!PrepareNativeIvCaption(data.caption, &caption, &anchorId, state)) {
+		return false;
+	}
+	SortPreparedIvRichText(&caption);
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Video;
+	block.text = std::move(caption.text);
+	block.links = std::move(caption.links);
+	block.anchorId = data.anchorId.isEmpty() ? std::move(anchorId) : data.anchorId;
+	block.anchorIds = std::move(caption.anchorIds);
+	block.supplementary = true;
+	block.forceTextSegment = state->editMode;
+	ApplyEmptyMediaCaptionPlaceholder(&block, state);
+	block.video.id = GeneratePreparedMediaBlockId(state);
+	block.video.media.kind = PreparedMediaItemKind::Document;
+	block.video.media.id = CanonicalDocumentId(data);
+	block.video.media.width = CanonicalWidth(data);
+	block.video.media.height = CanonicalHeight(data);
+	block.video.media.spoiler = data.spoiler;
+	block.video.caption = block.text;
+	result->push_back(std::move(block));
+	return true;
+}
+
+bool PrepareNativeIvAudioBlock(
+		const Iv::RichPage::Block &data,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state) {
+	if (!CanonicalDocumentId(data)) {
+		return state->editMode
+			? PrepareNativeIvCanonicalPlaceholderBlock(
+				u"Audio"_q,
+				data.caption,
+				data.anchorId,
+				result,
+				state)
+			: true;
+	}
+	auto caption = PreparedIvRichText();
+	auto anchorId = QString();
+	if (!PrepareNativeIvCaption(data.caption, &caption, &anchorId, state)) {
+		return false;
+	}
+	SortPreparedIvRichText(&caption);
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Audio;
+	block.text = std::move(caption.text);
+	block.links = std::move(caption.links);
+	block.anchorId = data.anchorId.isEmpty() ? std::move(anchorId) : data.anchorId;
+	block.anchorIds = std::move(caption.anchorIds);
+	block.supplementary = true;
+	block.forceTextSegment = state->editMode;
+	ApplyEmptyMediaCaptionPlaceholder(&block, state);
+	block.audio.id = GeneratePreparedMediaBlockId(state);
+	block.audio.documentId = CanonicalDocumentId(data);
+	block.audio.title = data.audioTitle;
+	block.audio.performer = data.audioPerformer;
+	block.audio.fileName = data.audioFileName;
+	block.audio.duration = data.audioDuration;
+	result->push_back(std::move(block));
+	return true;
+}
+
+bool PrepareNativeIvMapBlock(
+		const Iv::RichPage::Block &data,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state) {
+	const auto width = (data.width > 0) ? data.width : kDefaultMapWidth;
+	const auto height = (data.height > 0) ? data.height : kDefaultMapHeight;
+	if (data.zoom <= 0 || (!data.accessHash && !state->editMode)) {
+		return state->editMode
+			? PrepareNativeIvCanonicalPlaceholderBlock(
+				u"Map"_q,
+				data.caption,
+				data.anchorId,
+				result,
+				state)
+			: true;
+	}
+	auto caption = PreparedIvRichText();
+	auto anchorId = QString();
+	if (!PrepareNativeIvCaption(data.caption, &caption, &anchorId, state)) {
+		return false;
+	}
+	SortPreparedIvRichText(&caption);
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Map;
+	block.text = std::move(caption.text);
+	block.links = std::move(caption.links);
+	block.anchorId = data.anchorId.isEmpty() ? std::move(anchorId) : data.anchorId;
+	block.anchorIds = std::move(caption.anchorIds);
+	block.supplementary = true;
+	block.forceTextSegment = state->editMode;
+	ApplyEmptyMediaCaptionPlaceholder(&block, state);
+	block.map.id = GeneratePreparedMediaBlockId(state);
+	block.map.latitude = data.latitude;
+	block.map.longitude = data.longitude;
+	block.map.accessHash = data.accessHash;
+	block.map.width = width;
+	block.map.height = height;
+	block.map.zoom = data.zoom;
+	block.map.url = LocationClickHandler::Url(Data::LocationPoint(
+		data.latitude,
+		data.longitude,
+		Data::LocationPoint::NoAccessHash));
+	result->push_back(std::move(block));
+	return true;
+}
+
+bool PrepareNativeIvChannelBlock(
+		const Iv::RichPage::Block &data,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state) {
+	auto prepared = PreparedChannelBlockData();
+	prepared.channelId = data.channelId;
+	prepared.title = data.channelTitle;
+	prepared.username = data.username;
+	if (!prepared.channelId || prepared.title.isEmpty()) {
+		return true;
+	}
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::Channel;
+	prepared.id = GeneratePreparedMediaBlockId(state);
+	block.channel = std::move(prepared);
+	result->push_back(std::move(block));
+	return true;
+}
+
+bool PrepareNativeIvGroupedMediaBlock(
+		const Iv::RichPage::Block &data,
+		std::vector<PreparedBlock> *result,
+		NativeIvPrepareState *state) {
+	auto block = PreparedBlock();
+	block.kind = PreparedBlockKind::GroupedMedia;
+	block.groupedMedia.id = GeneratePreparedMediaBlockId(state);
+	block.groupedMedia.intent = (data.mediaIntent
+		== Iv::RichPage::GroupedMediaIntent::Slideshow)
+		? PreparedGroupedMediaIntent::Slideshow
+		: PreparedGroupedMediaIntent::Collage;
+	block.groupedMedia.items.reserve(data.mediaItems.size());
+	for (const auto &item : data.mediaItems) {
+		auto prepared = PreparedGroupedMediaItemData();
+		prepared.id = GeneratePreparedMediaBlockId(state);
+		if (!PrepareNativeIvGroupedMediaItem(item, &prepared)) {
+			continue;
+		}
+		block.groupedMedia.items.push_back(std::move(prepared));
+	}
+	if (block.groupedMedia.items.empty()) {
+		return true;
+	}
+	auto preparedCaption = PreparedIvRichText();
+	auto anchorId = QString();
+	if (!PrepareNativeIvCaption(
+			data.caption,
+			&preparedCaption,
+			&anchorId,
+			state)) {
+		return false;
+	}
+	SortPreparedIvRichText(&preparedCaption);
+	block.text = std::move(preparedCaption.text);
+	block.links = std::move(preparedCaption.links);
+	block.anchorId = data.anchorId.isEmpty() ? std::move(anchorId) : data.anchorId;
+	block.anchorIds = std::move(preparedCaption.anchorIds);
+	block.supplementary = true;
+	block.groupedMedia.caption = block.text;
+	result->push_back(std::move(block));
+	return true;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_native_richtext.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_native_richtext.h
new file mode 100644
index 00000000000000..f755443b3e00d7
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_native_richtext.h
@@ -0,0 +1,74 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/iv_rich_page.h"
+#include "iv/markdown/iv_markdown_prepare_state.h"
+
+namespace Iv::Markdown {
+
+inline constexpr auto kNativeIvLinkSpecialColorIndex = 9;
+
+struct PreparedIvRichText {
+	TextWithEntities text;
+	std::vector<PreparedLink> links;
+	std::vector<QString> anchorIds;
+};
+
+struct NativeIvRichTextContext {
+	int textSize = 0;
+	int renderWidthCap = 0;
+	int renderHeightCap = 0;
+	bool dropClickHandlers = false;
+};
+
+[[nodiscard]] bool PrepareNativeIvPlainPlaceholderBlock(
+	QString label,
+	std::vector<PreparedBlock> *result);
+[[nodiscard]] bool PrepareNativeIvPhotoBlock(
+	const Iv::RichPage::Block &data,
+	std::vector<PreparedBlock> *result,
+	NativeIvPrepareState *state);
+[[nodiscard]] bool PrepareNativeIvVideoBlock(
+	const Iv::RichPage::Block &data,
+	std::vector<PreparedBlock> *result,
+	NativeIvPrepareState *state);
+[[nodiscard]] bool PrepareNativeIvAudioBlock(
+	const Iv::RichPage::Block &data,
+	std::vector<PreparedBlock> *result,
+	NativeIvPrepareState *state);
+[[nodiscard]] bool PrepareNativeIvMapBlock(
+	const Iv::RichPage::Block &data,
+	std::vector<PreparedBlock> *result,
+	NativeIvPrepareState *state);
+[[nodiscard]] bool PrepareNativeIvChannelBlock(
+	const Iv::RichPage::Block &data,
+	std::vector<PreparedBlock> *result,
+	NativeIvPrepareState *state);
+[[nodiscard]] bool PrepareNativeIvGroupedMediaBlock(
+	const Iv::RichPage::Block &data,
+	std::vector<PreparedBlock> *result,
+	NativeIvPrepareState *state);
+[[nodiscard]] bool PrepareNativeIvRichText(
+	const Iv::RichPage::RichText &text,
+	PreparedIvRichText *result,
+	QString *blockAnchorId,
+	NativeIvPrepareState *state,
+	NativeIvRichTextContext context = {});
+[[nodiscard]] bool AppendPreparedIvRichBlock(
+	std::vector<PreparedBlock> *result,
+	PreparedBlockKind kind,
+	int headingLevel,
+	PreparedIvRichText prepared,
+	QString anchorId = QString(),
+	bool allowEmpty = false,
+	bool supplementary = false,
+	std::optional<PreparedEditBlockSource> editBlock = std::nullopt,
+	std::optional<PreparedEditLeafSource> editLeaf = std::nullopt);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_serialize.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_serialize.cpp
new file mode 100644
index 00000000000000..af2d0370c046c4
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_serialize.cpp
@@ -0,0 +1,139 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_prepare_serialize.h"
+
+#include "styles/style_iv.h"
+#include "styles/style_widgets.h"
+
+#include <QtCore/QByteArray>
+
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+[[nodiscard]] QString EncodeInlineTextObjectField(const QString &value) {
+	return QString::fromUtf8(value.toUtf8().toPercentEncoding());
+}
+
+[[nodiscard]] QString DecodeInlineTextObjectField(QStringView value) {
+	return QString::fromUtf8(
+		QByteArray::fromPercentEncoding(value.toLatin1()));
+}
+
+[[nodiscard]] int TextSizeForFormula(const style::TextStyle &textStyle) {
+	return std::max(textStyle.font->height, 1);
+}
+
+} // namespace
+
+QString SerializeInlineTextObjectEntity(const InlineTextObjectEntity &object) {
+	switch (object.kind) {
+	case InlineTextObjectKind::Formula: {
+		const auto data = std::get_if<InlineTextObjectFormulaData>(&object.data);
+		if (!data) {
+			return QString();
+		}
+		return u"iv-markdown:inline-text-object;formula;"_q
+			+ EncodeInlineTextObjectField(data->copySource)
+			+ u";"_q
+			+ EncodeInlineTextObjectField(data->trimmedTex);
+	} break;
+	case InlineTextObjectKind::IvImage: {
+		const auto data = std::get_if<InlineTextObjectIvImageData>(&object.data);
+		if (!data) {
+			return QString();
+		}
+		return u"iv-markdown:inline-text-object;iv-image;"_q
+			+ QString::number(data->documentId)
+			+ u";"_q
+			+ QString::number(data->width)
+			+ u";"_q
+			+ QString::number(data->height)
+			+ u";"_q
+			+ EncodeInlineTextObjectField(data->replacementText);
+	} break;
+	}
+	return QString();
+}
+
+std::optional<InlineTextObjectEntity> ParseInlineTextObjectEntity(
+		QStringView data) {
+	const auto parts = data.split(QChar(';'), Qt::KeepEmptyParts);
+	if (parts.size() < 2
+		|| parts[0] != u"iv-markdown:inline-text-object"_q) {
+		return std::nullopt;
+	}
+	if (parts[1] == u"formula"_q) {
+		if (parts.size() != 4) {
+			return std::nullopt;
+		}
+		return InlineTextObjectEntity{
+			.kind = InlineTextObjectKind::Formula,
+			.data = InlineTextObjectFormulaData{
+				.copySource = DecodeInlineTextObjectField(parts[2]),
+				.trimmedTex = DecodeInlineTextObjectField(parts[3]),
+			},
+		};
+	} else if (parts[1] == u"iv-image"_q) {
+		if (parts.size() != 6) {
+			return std::nullopt;
+		}
+		auto documentIdOk = false;
+		auto widthOk = false;
+		auto heightOk = false;
+		const auto documentId = parts[2].toULongLong(&documentIdOk);
+		const auto width = parts[3].toInt(&widthOk);
+		const auto height = parts[4].toInt(&heightOk);
+		if (!documentIdOk || !widthOk || !heightOk) {
+			return std::nullopt;
+		}
+		return InlineTextObjectEntity{
+			.kind = InlineTextObjectKind::IvImage,
+			.data = InlineTextObjectIvImageData{
+				.documentId = documentId,
+				.width = width,
+				.height = height,
+				.replacementText = DecodeInlineTextObjectField(parts[5]),
+			},
+		};
+	}
+	return std::nullopt;
+}
+
+QString InlineFormulaCopySource(const QString &source) {
+	return u"$"_q + source + u"$"_q;
+}
+
+MarkdownPrepareDimensions CaptureMarkdownPrepareDimensions() {
+	return CaptureMarkdownPrepareDimensions(st::defaultMarkdown);
+}
+
+MarkdownPrepareDimensions CaptureMarkdownPrepareDimensions(
+		const style::Markdown &st) {
+	auto result = MarkdownPrepareDimensions();
+	result.bodyTextSize = TextSizeForFormula(st.body);
+	result.headingTextSizes = {
+		TextSizeForFormula(st.heading1),
+		TextSizeForFormula(st.heading2),
+		TextSizeForFormula(st.heading3),
+		TextSizeForFormula(st.heading4),
+		TextSizeForFormula(st.heading5),
+		TextSizeForFormula(st.heading6),
+	};
+	result.tableHeaderTextSize = TextSizeForFormula(
+		st.table.headerStyle);
+	result.tableBodyTextSize = TextSizeForFormula(
+		st.table.bodyStyle);
+	result.displayMathTextSize = st.displayMath.textSize;
+	result.displayMathMaxRenderWidth = st.displayMath.maxRenderWidth;
+	result.displayMathMaxRenderHeight = st.displayMath.maxRenderHeight;
+	return result;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_serialize.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_serialize.h
new file mode 100644
index 00000000000000..439cfd4d09b6ac
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_serialize.h
@@ -0,0 +1,27 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_prepare.h"
+
+namespace style {
+struct Markdown;
+} // namespace style
+
+namespace Iv::Markdown {
+
+[[nodiscard]] QString SerializeInlineTextObjectEntity(
+	const InlineTextObjectEntity &object);
+[[nodiscard]] std::optional<InlineTextObjectEntity> ParseInlineTextObjectEntity(
+	QStringView data);
+[[nodiscard]] QString InlineFormulaCopySource(const QString &source);
+[[nodiscard]] MarkdownPrepareDimensions CaptureMarkdownPrepareDimensions();
+[[nodiscard]] MarkdownPrepareDimensions CaptureMarkdownPrepareDimensions(
+	const style::Markdown &st);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_state.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_state.cpp
new file mode 100644
index 00000000000000..38ba3c93428860
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_state.cpp
@@ -0,0 +1,145 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_prepare_state.h"
+
+#include <algorithm>
+#include <utility>
+
+namespace Iv::Markdown {
+
+void PrepareState::rememberFormula(
+		int index,
+		MathKind kind,
+		QString formulaTex,
+		int textSize,
+		int renderWidthCap,
+		int renderHeightCap) {
+	if (index < 0) {
+		return;
+	}
+	if (index >= int(result.formulas.size())) {
+		result.formulas.resize(index + 1);
+	}
+	auto &slot = result.formulas[index];
+	slot.trimmedTex = formulaTex.trimmed();
+	slot.kind = kind;
+	slot.textSize = textSize;
+	slot.renderWidthCap = renderWidthCap;
+	slot.renderHeightCap = renderHeightCap;
+	slot.present = true;
+}
+
+void PrepareState::rememberFormula(const PreparedBlock &block) {
+	rememberFormula(
+		block.formulaIndex,
+		block.mathKind,
+		block.formulaTex,
+		request->dimensions.displayMathTextSize,
+		request->dimensions.displayMathMaxRenderWidth,
+		request->dimensions.displayMathMaxRenderHeight);
+}
+
+int NativeIvPrepareState::rememberFormula(
+		MathKind kind,
+		QString formulaTex,
+		int textSize,
+		int renderWidthCap,
+		int renderHeightCap) {
+	const auto index = nextFormulaIndex++;
+	if (index >= int(result.formulas.size())) {
+		result.formulas.resize(index + 1);
+	}
+	auto &slot = result.formulas[index];
+	slot.trimmedTex = formulaTex.trimmed();
+	slot.kind = kind;
+	slot.textSize = textSize;
+	slot.renderWidthCap = renderWidthCap;
+	slot.renderHeightCap = renderHeightCap;
+	slot.present = true;
+	return index;
+}
+
+int NativeIvPrepareState::rememberFormula(const PreparedBlock &block) {
+	return rememberFormula(
+		block.mathKind,
+		block.formulaTex,
+		dimensions.displayMathTextSize,
+		dimensions.displayMathMaxRenderWidth,
+		dimensions.displayMathMaxRenderHeight);
+}
+
+void PrepareState::addPrepareWarning() {
+	++result.debug.prepareWarningCount;
+}
+
+void PrepareState::addFormulaWarning() {
+	++result.debug.formulaWarningCount;
+}
+
+void NativeIvPrepareState::addFormulaWarning() {
+	++result.debug.formulaWarningCount;
+}
+
+void PrepareState::addPrepareWarnings(int count) {
+	result.debug.prepareWarningCount += count;
+}
+
+void PrepareState::addFormulaWarnings(int count) {
+	result.debug.formulaWarningCount += count;
+}
+
+void PrepareState::setTerminalFailure(
+		PrepareTerminalFailure terminal,
+		QString debugReason) {
+	if (result.failure.failed()) {
+		return;
+	}
+	result.failure.terminal = terminal;
+	result.failure.debugReason = std::move(debugReason);
+}
+
+QString PrepareState::formulaSourceText(int index) const {
+	if (!request
+		|| !request->document
+		|| index < 0
+		|| index >= int(request->document->formulas.size())) {
+		return QString();
+	}
+	const auto &range = request->document->formulas[index].range;
+	const auto size = int(sourceUtf8.size());
+	const auto from = std::clamp(range.startOffset, 0, size);
+	const auto till = std::clamp(range.endOffset, from, size);
+	return QString::fromUtf8(sourceUtf8.constData() + from, till - from);
+}
+
+void NativeIvPrepareState::setFailure(
+		PrepareTerminalFailure terminal,
+		QString debugReason) {
+	if (result.failure.failed()) {
+		return;
+	}
+	result.failure.terminal = terminal;
+	result.failure.debugReason = std::move(debugReason);
+}
+
+bool NativeIvPrepareState::blocked() const {
+	return result.failure.failed();
+}
+
+QString InvalidStyleReason(const MarkdownPrepareDimensions &dimensions) {
+	Q_UNUSED(dimensions);
+	return QString();
+}
+
+void ClearPreparedOutput(MarkdownArticleContent *result) {
+	result->blocks.blocks.clear();
+	result->footnotes.clear();
+	result->formulas.clear();
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_state.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_state.h
new file mode 100644
index 00000000000000..d35597d5b57057
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_prepare_state.h
@@ -0,0 +1,79 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_parse.h"
+#include "iv/markdown/iv_markdown_prepare.h"
+
+#include <QtCore/QByteArray>
+
+#include <vector>
+
+namespace Iv::Markdown {
+
+struct PrepareContext {
+	int listDepth = 0;
+	int quoteDepth = 0;
+};
+
+struct FootnoteDefinitionEntry {
+	const MarkdownNode *node = nullptr;
+};
+
+struct PrepareState {
+	const PrepareRequest *request = nullptr;
+	MarkdownArticleContent result;
+	QByteArray sourceUtf8;
+	std::vector<FootnoteDefinitionEntry> footnoteDefinitions;
+	int nextGeneratedId = 0;
+
+	void rememberFormula(
+		int index,
+		MathKind kind,
+		QString formulaTex,
+		int textSize,
+		int renderWidthCap,
+		int renderHeightCap);
+	void rememberFormula(const PreparedBlock &block);
+	void addPrepareWarning();
+	void addFormulaWarning();
+	void addPrepareWarnings(int count);
+	void addFormulaWarnings(int count);
+	void setTerminalFailure(
+		PrepareTerminalFailure terminal,
+		QString debugReason);
+	[[nodiscard]] QString formulaSourceText(int index) const;
+};
+
+struct NativeIvPrepareState {
+	MarkdownArticleContent result;
+	MarkdownPrepareDimensions dimensions;
+	MarkdownPrepareTableRenderLimits tableRenderLimits;
+	bool editMode = false;
+	int nextGeneratedId = 0;
+	int nextFormulaIndex = 0;
+
+	[[nodiscard]] int rememberFormula(
+		MathKind kind,
+		QString formulaTex,
+		int textSize,
+		int renderWidthCap,
+		int renderHeightCap);
+	[[nodiscard]] int rememberFormula(const PreparedBlock &block);
+	void addFormulaWarning();
+	void setFailure(
+		PrepareTerminalFailure terminal,
+		QString debugReason);
+	[[nodiscard]] bool blocked() const;
+};
+
+[[nodiscard]] QString InvalidStyleReason(
+	const MarkdownPrepareDimensions &dimensions);
+void ClearPreparedOutput(MarkdownArticleContent *result);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_view.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_view.cpp
new file mode 100644
index 00000000000000..0f27947618b8a4
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_view.cpp
@@ -0,0 +1,1079 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_view.h"
+#include "base/algorithm.h"
+#include "base/weak_ptr.h"
+#include "base/platform/base_platform_info.h"
+#include "core/click_handler_types.h"
+#include "core/credits_amount.h"
+#include "core/file_utilities.h"
+#include "iv/markdown/iv_markdown_article_text.h"
+#include "iv/markdown/iv_markdown_embed_overlay.h"
+#include "iv/markdown/iv_markdown_prepare_links.h"
+#include "iv/markdown/iv_markdown_view_widget.h"
+#include "iv/iv_delegate.h"
+#include "lang/lang_keys.h"
+#include "ui/controls/jump_down_button.h"
+#include "ui/effects/animations.h"
+#include "ui/layers/generic_box.h"
+#include "ui/layers/layer_manager.h"
+#include "ui/style/style_core_scale.h"
+#include "ui/text/text.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/basic_click_handlers.h"
+#include "ui/integration.h"
+#include "ui/rect.h"
+#include "logs.h"
+
+#include "styles/style_iv.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_layers.h"
+#include "styles/style_window.h"
+
+#include <QtCore/QElapsedTimer>
+#include <QtGui/QPainter>
+#include <QtGui/QScreen>
+
+#include <algorithm>
+#include <cstdlib>
+#include <memory>
+#include <optional>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+#ifndef NDEBUG
+[[nodiscard]] QString PrepareTerminalFailureName(
+		PrepareTerminalFailure failure) {
+	switch (failure) {
+	case PrepareTerminalFailure::None:
+		return u"none"_q;
+	case PrepareTerminalFailure::InvalidRequest:
+		return u"invalid-request"_q;
+	case PrepareTerminalFailure::InvalidStyle:
+		return u"invalid-style"_q;
+	case PrepareTerminalFailure::DocumentTooLarge:
+		return u"document-too-large"_q;
+	case PrepareTerminalFailure::InternalError:
+		return u"internal-error"_q;
+	}
+	return u"unknown"_q;
+}
+
+[[nodiscard]] QString PrepareFailureReasonText(
+		const PrepareFailureStatus &failure) {
+	return !failure.debugReason.isEmpty()
+		? failure.debugReason
+		: PrepareTerminalFailureName(failure.terminal);
+}
+#endif
+
+[[nodiscard]] QVariant CurrentClickHandlerContext(const OpenOptions &options) {
+	return options.clickHandlerContextRef
+		? *options.clickHandlerContextRef
+		: options.clickHandlerContext;
+}
+
+[[nodiscard]] const PreparedFootnote *FindFootnote(
+		const std::vector<PreparedFootnote> &footnotes,
+		const QString &target) {
+	const auto i = std::find_if(
+		footnotes.begin(),
+		footnotes.end(),
+		[&](const PreparedFootnote &footnote) {
+			return (footnote.label == target);
+		});
+	return (i != footnotes.end()) ? &*i : nullptr;
+}
+
+[[nodiscard]] int FootnoteLabelContentWidth(
+		not_null<Ui::FlatLabel*> label,
+		int maxWidth) {
+	const auto heightForWidth = [&](int width) {
+		label->resizeToWidth(width);
+		return label->heightNoMargins();
+	};
+	const auto natural = label->naturalWidth();
+	const auto minWidth = std::min(st::markdownFootnoteLabel.minWidth, maxWidth);
+	auto result = std::max(
+		(natural >= 0) ? std::min(natural, maxWidth) : maxWidth,
+		minWidth);
+	if (result >= label->textMaxWidth()) {
+		return result;
+	}
+	auto large = result;
+	auto small = std::max(result / 2, minWidth);
+	const auto largeHeight = heightForWidth(large);
+	while (large - small > 1) {
+		const auto middle = (large + small) / 2;
+		if (largeHeight == heightForWidth(middle)) {
+			large = middle;
+		} else {
+			small = middle;
+		}
+	}
+	return large;
+}
+
+[[nodiscard]] std::optional<EntityLinkData> ExternalEntityLinkData(
+		const PreparedLink &link) {
+	if (link.kind != PreparedLinkKind::External || link.target.isEmpty()) {
+		return std::nullopt;
+	}
+	switch (link.entityType) {
+	case EntityType::Url:
+	case EntityType::CustomUrl:
+	case EntityType::Email:
+		return EntityLinkData{
+			.text = !link.copyText.isEmpty() ? link.copyText : link.target,
+			.data = link.target,
+			.type = link.entityType,
+			.shown = link.shown,
+		};
+	default:
+		return std::nullopt;
+	}
+}
+
+[[nodiscard]] bool ActivateExternalLink(
+		const PreparedLink &link,
+		Qt::MouseButton button,
+		QVariant context) {
+	const auto data = ExternalEntityLinkData(link);
+	if (!data) {
+		return false;
+	}
+	const auto handler = Ui::Integration::Instance().createLinkHandler(
+		*data,
+		Ui::Text::MarkedContext());
+	if (!handler) {
+		return false;
+	}
+	auto click = ClickContext();
+	click.button = button;
+	click.other = std::move(context);
+	handler->onClick(std::move(click));
+	return true;
+}
+
+[[nodiscard]] std::optional<QString> CurrentPageExternalLinkFragment(
+		const PreparedLink &link,
+		const OpenOptions &options) {
+	if (link.kind != PreparedLinkKind::External
+		|| link.target.isEmpty()
+		|| options.sourceUrl.isEmpty()) {
+		return std::nullopt;
+	}
+	const auto hash = link.target.indexOf(QChar('#'));
+	const auto base = (hash < 0) ? link.target : link.target.mid(0, hash);
+	if (base != options.sourceUrl
+		&& base != UrlClickHandler::EncodeForOpening(options.sourceUrl)) {
+		return std::nullopt;
+	}
+	auto fragment = (hash < 0) ? QString() : link.target.mid(hash + 1);
+	return NormalizeFragmentId(std::move(fragment));
+}
+
+[[nodiscard]] bool ShowWrongLayoutBar(const OpenOptions &options) {
+	return (options.viewerKind != ViewerKind::LocalFile)
+		&& !options.sourceUrl.isEmpty()
+		&& (options.currentPageId != 0);
+}
+
+} // namespace
+
+class MarkdownPreviewRoot final : public Ui::RpWidget {
+public:
+	MarkdownPreviewRoot(
+		QWidget *parent,
+		const PreparedDocument &document,
+		Fn<void(Event)> callback,
+		const OpenOptions &options);
+	MarkdownPreviewRoot(
+		QWidget *parent,
+		MarkdownArticleContent content,
+		std::shared_ptr<MathRenderer> renderer,
+		Fn<void(Event)> callback,
+		const OpenOptions &options);
+	bool scrollToAnchor(
+		const QString &anchorId,
+		MarkdownPreviewScrollMode mode);
+	void scrollToY(int top, MarkdownPreviewScrollMode mode);
+	[[nodiscard]] int scrollTop() const;
+	[[nodiscard]] rpl::producer<int> scrollTopValue() const;
+	bool updateContent(MarkdownArticleContent prepared, OpenOptions options);
+
+private:
+	struct PendingEmbedState {
+		PreparedPlaceholderBlockId placeholderId;
+		uint64 generation = 0;
+	};
+
+	void setup();
+	void prepareArticle();
+	void activateLink(const PreparedLink &link, Qt::MouseButton button);
+	void closeEmbed();
+	void openEmbedLink(QString url);
+	void showFootnote(const PreparedLink &link, Qt::MouseButton button);
+	[[nodiscard]] bool showEmbed(const MediaActivation &activation);
+	void fillFootnoteBox(
+		not_null<Ui::GenericBox*> box,
+		PreparedFootnote footnote);
+	void applyPreparedContent(MarkdownArticleContent prepared, int prepareMs);
+	void scrollToTop();
+	void scrollToYAnimated(int top);
+	void updateBodyVisibleTopBottom();
+	void updateScrollToTopVisibility();
+	void startScrollToTopButtonAnimation(bool shown);
+	void updateScrollToTopPosition();
+	void updateChildrenGeometry(QSize size);
+	void updateWrongLayoutGeometry();
+	void updateFailureGeometry();
+	void logPreparationSummary(
+		const PrepareFailureStatus &failure,
+		const PrepareDebugStats &debug,
+		int prepareMs,
+		int layoutMs) const;
+
+	OpenOptions _options;
+	const std::shared_ptr<const PreparedDocument> _document;
+	std::optional<MarkdownArticleContent> _preparedContent;
+	const Fn<void(Event)> _callback;
+	std::vector<PreparedFootnote> _footnotes;
+	std::unique_ptr<Ui::LayerManager> _footnoteLayerManager;
+	EmbedOverlay *_embedOverlay = nullptr;
+	Ui::ScrollArea *_scroll = nullptr;
+	Ui::RpWidget *_scrollContent = nullptr;
+	Ui::JumpDownButton *_scrollToTop = nullptr;
+	MarkdownDocumentWidget *_body = nullptr;
+	Ui::RpWidget *_wrongLayoutBar = nullptr;
+	Ui::LinkButton *_wrongLayout = nullptr;
+	Ui::FlatLabel *_failure = nullptr;
+	Ui::LinkButton *_failureOpen = nullptr;
+	const std::shared_ptr<MathRenderer> _renderer;
+	std::shared_ptr<MarkdownArticle> _article;
+	QString _pendingFragment;
+	int _devicePixelRatio = 0;
+	PendingEmbedState _pendingEmbed;
+	Ui::Animations::Simple _scrollToAnimation;
+	Ui::Animations::Simple _scrollToTopShown;
+	bool _scrollToTopIsShown = false;
+
+};
+
+MarkdownPreviewRoot::MarkdownPreviewRoot(
+	QWidget *parent,
+	const PreparedDocument &document,
+	Fn<void(Event)> callback,
+	const OpenOptions &options)
+: Ui::RpWidget(parent)
+, _options(options)
+, _document(std::make_shared<PreparedDocument>(document))
+, _callback(std::move(callback))
+, _renderer(std::make_shared<MathRenderer>())
+, _pendingFragment(options.initialFragment) {
+	setup();
+}
+
+MarkdownPreviewRoot::MarkdownPreviewRoot(
+	QWidget *parent,
+	MarkdownArticleContent content,
+	std::shared_ptr<MathRenderer> renderer,
+	Fn<void(Event)> callback,
+	const OpenOptions &options)
+: Ui::RpWidget(parent)
+, _options(options)
+, _preparedContent(std::move(content))
+, _callback(std::move(callback))
+, _renderer(renderer ? std::move(renderer) : std::make_shared<MathRenderer>())
+, _pendingFragment(options.initialFragment) {
+	setup();
+}
+
+void MarkdownPreviewRoot::setup() {
+	_footnoteLayerManager = std::make_unique<Ui::LayerManager>(not_null{ this });
+	_footnoteLayerManager->setHideByBackgroundClick(true);
+
+	_scroll = Ui::CreateChild<Ui::ScrollArea>(this, st::boxScroll);
+	_scroll->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+	_scrollContent = _scroll->setOwnedWidget(object_ptr<Ui::RpWidget>(_scroll));
+	_body = Ui::CreateChild<MarkdownDocumentWidget>(_scrollContent);
+	_scrollToTop = Ui::CreateChild<Ui::JumpDownButton>(_scroll, st::dialogsToUp);
+	_scrollToTop->setClickedCallback([=] { scrollToTop(); });
+	_scrollToTop->setAccessibleName(tr::lng_sr_scroll_to_top(tr::now));
+	_scrollToTop->raise();
+	if (ShowWrongLayoutBar(_options)) {
+		_wrongLayoutBar = Ui::CreateChild<Ui::RpWidget>(_scrollContent);
+		_wrongLayoutBar->paintRequest(
+		) | rpl::on_next([=](QRect clip) {
+			QPainter(_wrongLayoutBar).fillRect(clip, st::windowBgOver);
+		}, _wrongLayoutBar->lifetime());
+		_wrongLayout = Ui::CreateChild<Ui::LinkButton>(
+			_wrongLayoutBar,
+			tr::lng_iv_wrong_layout(tr::now),
+			st::ivWrongLayoutLink);
+		_wrongLayout->setClickedCallback([=] {
+			_callback({
+				.type = Event::Type::Report,
+				.webpageId = _options.currentPageId,
+				.context = CurrentClickHandlerContext(_options),
+			});
+		});
+		_wrongLayoutBar->hide();
+	}
+	_failure = Ui::CreateChild<Ui::FlatLabel>(
+		this,
+		tr::lng_markdown_preview_cant(tr::now),
+		st::defaultMarkdown.failure.label);
+	_failureOpen = Ui::CreateChild<Ui::LinkButton>(
+		this,
+		tr::lng_markdown_preview_open_file(tr::now));
+	_embedOverlay = Ui::CreateChild<EmbedOverlay>(
+		this,
+		[=](QString url) {
+			openEmbedLink(std::move(url));
+		},
+		_options.ivWebviewStorageId);
+	_embedOverlay->hide();
+
+	_scroll->hide();
+	if (_body) {
+		_body->hide();
+		_body->setClickHandlerContext(
+			CurrentClickHandlerContext(_options),
+			_options.clickHandlerContextRef);
+		_body->setLinkActivationCallback([=](
+				const PreparedLink &link,
+				Qt::MouseButton button) {
+			activateLink(link, button);
+		});
+		_body->setMediaActivationCallback([=](
+				const MediaActivation &activation,
+				Qt::MouseButton button) {
+			if (activation.kind == MediaActivationKind::Embed) {
+				return (button == Qt::LeftButton || button == Qt::MiddleButton)
+					? showEmbed(activation)
+					: false;
+			}
+			return _options.activateMedia
+				? _options.activateMedia(activation, button)
+				: false;
+		});
+		if (_options.delegate) {
+			_body->setZoom(_options.delegate->ivZoom());
+		}
+		_body->heightValue(
+		) | rpl::on_next([=](int) {
+			updateChildrenGeometry(size());
+		}, _body->lifetime());
+	}
+	_failure->hide();
+	_failureOpen->hide();
+	_failureOpen->setClickedCallback([=] {
+		if (!_options.sourcePath.isEmpty()) {
+			File::Launch(_options.sourcePath);
+		}
+	});
+
+	sizeValue() | rpl::on_next([=](QSize size) {
+		updateChildrenGeometry(size);
+	}, lifetime());
+
+	rpl::combine(
+		_scroll->scrollTopValue(),
+		_scroll->heightValue()
+	) | rpl::on_next([=](int, int) {
+		updateBodyVisibleTopBottom();
+		updateScrollToTopVisibility();
+		updateScrollToTopPosition();
+	}, lifetime());
+
+	style::PaletteChanged() | rpl::on_next([=] {
+		if (_body && !_body->isHidden()) {
+			_body->refreshPalette();
+		}
+	}, lifetime());
+
+	screenValue() | rpl::on_next([=](not_null<QScreen*>) {
+		const auto devicePixelRatio = style::DevicePixelRatio();
+		if (devicePixelRatio == _devicePixelRatio) {
+			return;
+		}
+		_devicePixelRatio = devicePixelRatio;
+		if (_body && !_body->isHidden()) {
+			_body->invalidateRasterCache();
+		}
+	}, lifetime());
+
+	if (_options.delegate) {
+		_options.delegate->ivZoomValue(
+		) | rpl::on_next([=](int value) {
+			if (_body) {
+				_body->setZoom(value);
+				updateChildrenGeometry(size());
+			}
+		}, lifetime());
+	}
+
+	rpl::duplicate(
+		_options.downloadTaskFinished
+	) | rpl::on_next([=] {
+		update();
+	}, lifetime());
+
+	_devicePixelRatio = style::DevicePixelRatio();
+	prepareArticle();
+}
+
+void MarkdownPreviewRoot::prepareArticle() {
+	if (_preparedContent) {
+		applyPreparedContent(std::move(*_preparedContent), 0);
+		_preparedContent.reset();
+		return;
+	}
+	if (_renderer) {
+		_renderer->resetDebugCounters();
+	}
+	auto timer = QElapsedTimer();
+	timer.start();
+	auto prepared = PrepareSynchronously({
+		.document = _document,
+		.renderer = _renderer,
+		.dimensions = CaptureMarkdownPrepareDimensions(),
+		.sourcePath = _options.sourcePath,
+	});
+	applyPreparedContent(std::move(prepared), int(timer.elapsed()));
+}
+
+bool MarkdownPreviewRoot::updateContent(
+		MarkdownArticleContent prepared,
+		OpenOptions options) {
+	_options = std::move(options);
+	if (!_options.initialFragment.isEmpty()) {
+		_pendingFragment = _options.initialFragment;
+	}
+	if (_body) {
+		_body->setClickHandlerContext(
+			CurrentClickHandlerContext(_options),
+			_options.clickHandlerContextRef);
+	}
+	applyPreparedContent(std::move(prepared), 0);
+	return true;
+}
+
+void MarkdownPreviewRoot::activateLink(
+		const PreparedLink &link,
+		Qt::MouseButton button) {
+	if (button != Qt::LeftButton && button != Qt::MiddleButton) {
+		return;
+	}
+	switch (link.kind) {
+	case PreparedLinkKind::External: {
+		if (const auto fragment = CurrentPageExternalLinkFragment(
+				link,
+				_options)) {
+			if (fragment->isEmpty()) {
+				scrollToY(0, MarkdownPreviewScrollMode::Animated);
+			} else if (!scrollToAnchor(
+					*fragment,
+					MarkdownPreviewScrollMode::Animated)) {
+				DEBUG_LOG(("Native Markdown IV: unresolved anchor: %1").arg(
+					*fragment));
+			}
+			return;
+		}
+		if (!ActivateExternalLink(
+				link,
+				button,
+				CurrentClickHandlerContext(_options))) {
+			DEBUG_LOG(("Native Markdown IV: failed external link activation: %1").arg(
+				link.target));
+		}
+	} break;
+	case PreparedLinkKind::InstantViewPage: {
+		auto target = link.target;
+		if (!link.fragment.isEmpty()) {
+			target += u"#"_q + link.fragment;
+		}
+		_callback({
+			.type = Event::Type::OpenPage,
+			.webpageId = link.webpageId,
+			.url = std::move(target),
+			.context = CurrentClickHandlerContext(_options),
+		});
+	} break;
+	case PreparedLinkKind::Anchor:
+	case PreparedLinkKind::FootnoteBacklink:
+		if (!scrollToAnchor(link.target, MarkdownPreviewScrollMode::Animated)) {
+			DEBUG_LOG(("Native Markdown IV: unresolved anchor: %1").arg(
+				link.target));
+		}
+		break;
+	case PreparedLinkKind::Footnote:
+		showFootnote(link, button);
+		break;
+	case PreparedLinkKind::LocalFile: {
+		auto target = link.target;
+		if (!link.fragment.isEmpty()) {
+			target += u"#"_q + link.fragment;
+		}
+		_callback({
+			.type = Event::Type::OpenFile,
+			.url = std::move(target),
+			.context = CurrentClickHandlerContext(_options),
+		});
+	} break;
+	case PreparedLinkKind::RejectedRelative:
+		DEBUG_LOG(("Native Markdown IV: "
+			"rejected relative markdown link: %1").arg(
+			link.target));
+		break;
+	case PreparedLinkKind::ToggleDetails:
+		if (_body && !_body->toggleDetails(link.target)) {
+			DEBUG_LOG(("Native Markdown IV: failed details toggle: %1").arg(
+				link.target));
+		}
+		break;
+	}
+}
+
+void MarkdownPreviewRoot::closeEmbed() {
+	if (_body) {
+		_body->clearAllPlaceholderLoading();
+	}
+	const auto hadPending = bool(_pendingEmbed.placeholderId);
+	_pendingEmbed.placeholderId = {};
+	if (!_embedOverlay) {
+		return;
+	}
+	if (hadPending) {
+		_embedOverlay->cancelPreload();
+	} else {
+		_embedOverlay->closeEmbed();
+	}
+}
+
+void MarkdownPreviewRoot::openEmbedLink(QString url) {
+	if (url.isEmpty()) {
+		return;
+	}
+	closeEmbed();
+	HiddenUrlClickHandler::Open(url, CurrentClickHandlerContext(_options));
+}
+
+void MarkdownPreviewRoot::showFootnote(
+		const PreparedLink &link,
+		Qt::MouseButton button) {
+	Q_UNUSED(button);
+
+	const auto found = FindFootnote(_footnotes, link.target);
+	if (!found) {
+		DEBUG_LOG(("Native Markdown IV: unresolved footnote: %1").arg(
+			link.target));
+		return;
+	}
+	if (!_footnoteLayerManager) {
+		DEBUG_LOG(("Native Markdown IV: missing footnote layer manager: %1").arg(
+			link.target));
+		return;
+	}
+
+	const auto footnote = *found;
+	_footnoteLayerManager->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+		fillFootnoteBox(box, footnote);
+	}));
+}
+
+bool MarkdownPreviewRoot::showEmbed(const MediaActivation &activation) {
+	if (activation.kind != MediaActivationKind::Embed
+		|| !activation.embed
+		|| !activation.placeholderId) {
+		return false;
+	}
+	if (Platform::IsLinux()) {
+		closeEmbed();
+		return _embedOverlay
+			? _embedOverlay->showExternalEmbed(activation.embed)
+			: false;
+	}
+	const auto placeholderId = activation.placeholderId;
+	const auto generation = ++_pendingEmbed.generation;
+	if (_body && _pendingEmbed.placeholderId) {
+		_body->clearPlaceholderLoading(_pendingEmbed.placeholderId);
+	}
+	if (_pendingEmbed.placeholderId && _embedOverlay) {
+		_embedOverlay->cancelPreload();
+	}
+	_pendingEmbed.placeholderId = placeholderId;
+	if (_body) {
+		_body->setPlaceholderLoading(placeholderId);
+	}
+	const auto finishPending = [=] {
+		if (_pendingEmbed.generation != generation
+			|| (_pendingEmbed.placeholderId.value != placeholderId.value)) {
+			return;
+		}
+		if (_body) {
+			_body->clearPlaceholderLoading(placeholderId);
+		}
+		_pendingEmbed.placeholderId = {};
+	};
+	if (!_embedOverlay) {
+		finishPending();
+		return false;
+	}
+	const auto started = _embedOverlay->preloadEmbed(
+		activation.embed,
+		finishPending,
+		finishPending);
+	if (!started) {
+		finishPending();
+	}
+	return started;
+}
+
+void MarkdownPreviewRoot::fillFootnoteBox(
+		not_null<Ui::GenericBox*> box,
+		PreparedFootnote footnote) {
+	box->setStyle(st::markdownFootnoteBox);
+	box->setNoContentMargin(true);
+	box->setCloseByOutsideClick(true);
+	box->clearButtons();
+
+	auto label = object_ptr<Ui::FlatLabel>(box, st::markdownFootnoteLabel);
+	label->setMarkedText(footnote.text);
+	label->setTryMakeSimilarLines(true);
+	for (const auto &link : footnote.links) {
+		label->setLink(link.index, CreatePreparedLinkHandler(link));
+	}
+	label->setClickHandlerFilter([=](
+			const ClickHandlerPtr &handler,
+			Qt::MouseButton button) {
+		if (const auto prepared = ExtractPreparedLink(handler)) {
+			activateLink(*prepared, button);
+			return false;
+		}
+		return true;
+	});
+
+	const auto skips = rect::m::sum::h(st::markdownFootnotePadding);
+	const auto contentWidth = FootnoteLabelContentWidth(
+		label.get(),
+		std::max(
+			st::boxWideWidth - skips,
+			st::markdownFootnoteLabel.minWidth));
+	label->resizeToWidth(contentWidth);
+	box->setWidth(contentWidth + skips);
+	box->addRow(std::move(label), st::markdownFootnotePadding);
+}
+
+void MarkdownPreviewRoot::applyPreparedContent(
+	MarkdownArticleContent prepared,
+	int prepareMs) {
+	const auto failure = prepared.failure;
+	const auto debug = prepared.debug;
+	closeEmbed();
+	if (failure.failed()) {
+		_article = nullptr;
+		_footnotes.clear();
+		_scrollToAnimation.stop();
+		startScrollToTopButtonAnimation(false);
+		_scroll->hide();
+		if (_body) {
+			_body->setArticle(nullptr);
+			_body->hide();
+		}
+		if (_wrongLayoutBar) {
+			_wrongLayoutBar->hide();
+		}
+		_failure->show();
+		if (_options.sourcePath.isEmpty()) {
+			_failureOpen->hide();
+		} else {
+			_failureOpen->show();
+		}
+		_failure->raise();
+		_failureOpen->raise();
+		updateFailureGeometry();
+		logPreparationSummary(failure, debug, prepareMs, 0);
+		return;
+	}
+
+	_footnotes = prepared.footnotes;
+
+	if (!_body) {
+		_article = nullptr;
+		logPreparationSummary(failure, debug, prepareMs, 0);
+		return;
+	}
+
+	const auto restoreArticle = !_article;
+	if (!_article) {
+		_article = std::make_shared<MarkdownArticle>(
+			st::defaultMarkdown,
+			_renderer);
+	}
+	_article->setContent(std::move(prepared));
+	_body->setClickHandlerContext(
+		CurrentClickHandlerContext(_options),
+		_options.clickHandlerContextRef);
+	if (restoreArticle) {
+		updateChildrenGeometry(size());
+		_body->setArticle(_article);
+		if (_options.delegate) {
+			_body->setZoom(_options.delegate->ivZoom());
+		}
+	} else {
+		_body->articleContentChanged();
+	}
+	_scroll->show();
+	_body->show();
+	if (_wrongLayoutBar) {
+		_wrongLayoutBar->show();
+	}
+	updateChildrenGeometry(size());
+	updateBodyVisibleTopBottom();
+	_failure->hide();
+	_failureOpen->hide();
+	if (!_pendingFragment.isEmpty()) {
+		const auto scrolled = scrollToAnchor(
+			_pendingFragment,
+			MarkdownPreviewScrollMode::Instant);
+		static_cast<void>(scrolled);
+		_pendingFragment.clear();
+	}
+	_scrollToTop->raise();
+	updateScrollToTopVisibility();
+	updateScrollToTopPosition();
+	logPreparationSummary(
+		failure,
+		debug,
+		prepareMs,
+		_body->lastRelayoutMs());
+}
+
+bool MarkdownPreviewRoot::scrollToAnchor(
+		const QString &anchorId,
+		MarkdownPreviewScrollMode mode) {
+	if (!_body || !_scroll || anchorId.isEmpty()) {
+		return false;
+	}
+	auto top = _body->anchorTop(anchorId);
+	if (top < 0) {
+		if (!_body->expandDetailsToAnchor(anchorId)) {
+			return false;
+		}
+		top = _body->anchorTop(anchorId);
+		if (top < 0) {
+			return false;
+		}
+	}
+	scrollToY(top, mode);
+	return true;
+}
+
+void MarkdownPreviewRoot::scrollToY(
+		int top,
+		MarkdownPreviewScrollMode mode) {
+	if (!_scroll) {
+		return;
+	}
+	switch (mode) {
+	case MarkdownPreviewScrollMode::Instant:
+		_scrollToAnimation.stop();
+		_scroll->scrollToY(top);
+		updateScrollToTopVisibility();
+		break;
+	case MarkdownPreviewScrollMode::Animated:
+		scrollToYAnimated(top);
+		break;
+	}
+}
+
+int MarkdownPreviewRoot::scrollTop() const {
+	return _scroll ? _scroll->scrollTop() : 0;
+}
+
+rpl::producer<int> MarkdownPreviewRoot::scrollTopValue() const {
+	return _scroll
+		? _scroll->scrollTopValue()
+		: rpl::single(0) | rpl::type_erased;
+}
+
+bool ScrollMarkdownPreviewToAnchor(
+		Ui::RpWidget *preview,
+		const QString &anchorId,
+		MarkdownPreviewScrollMode mode) {
+	const auto root = dynamic_cast<MarkdownPreviewRoot*>(preview);
+	return root ? root->scrollToAnchor(anchorId, mode) : false;
+}
+
+void ScrollMarkdownPreviewToY(
+		Ui::RpWidget *preview,
+		int top,
+		MarkdownPreviewScrollMode mode) {
+	if (const auto root = dynamic_cast<MarkdownPreviewRoot*>(preview)) {
+		root->scrollToY(top, mode);
+	}
+}
+
+int MarkdownPreviewScrollTop(Ui::RpWidget *preview) {
+	const auto root = dynamic_cast<MarkdownPreviewRoot*>(preview);
+	return root ? root->scrollTop() : 0;
+}
+
+rpl::producer<int> MarkdownPreviewScrollTopValue(Ui::RpWidget *preview) {
+	const auto root = dynamic_cast<MarkdownPreviewRoot*>(preview);
+	return root ? root->scrollTopValue() : rpl::single(0);
+}
+
+void MarkdownPreviewRoot::scrollToTop() {
+	if (!_scroll || _scrollToAnimation.animating()) {
+		return;
+	}
+	if (_scroll->scrollTop() == 0) {
+		return;
+	}
+	scrollToYAnimated(0);
+}
+
+void MarkdownPreviewRoot::scrollToYAnimated(int top) {
+	if (!_scroll) {
+		return;
+	}
+	const auto scrollTo = _scroll->computeScrollToY(top, -1);
+	_scrollToAnimation.stop();
+	auto scrollTop = _scroll->scrollTop();
+	if (scrollTop == scrollTo) {
+		updateScrollToTopVisibility();
+		return;
+	}
+	const auto maxAnimatedDelta = _scroll->height();
+	if (scrollTo + maxAnimatedDelta < scrollTop) {
+		scrollTop = scrollTo + maxAnimatedDelta;
+		_scroll->scrollToY(scrollTop);
+	} else if (scrollTo - maxAnimatedDelta > scrollTop) {
+		scrollTop = scrollTo - maxAnimatedDelta;
+		_scroll->scrollToY(scrollTop);
+	}
+
+	startScrollToTopButtonAnimation(false);
+
+	const auto scroll = [=] {
+		if (!_scroll) {
+			return;
+		}
+		const auto animated = qRound(_scrollToAnimation.value(scrollTo));
+		const auto animatedDelta = animated - scrollTo;
+		const auto realDelta = _scroll->scrollTop() - scrollTo;
+		if (base::OppositeSigns(realDelta, animatedDelta)) {
+			_scrollToAnimation.stop();
+		} else if (std::abs(realDelta) > std::abs(animatedDelta)) {
+			_scroll->scrollToY(animated);
+		}
+	};
+
+	_scrollToAnimation.start(
+		scroll,
+		scrollTop,
+		scrollTo,
+		st::slideDuration,
+		anim::sineInOut);
+}
+
+void MarkdownPreviewRoot::updateBodyVisibleTopBottom() {
+	if (_body) {
+		const auto scrollTop = _scroll->scrollTop();
+		_body->setVisibleTopBottom(scrollTop, scrollTop + _scroll->height());
+	}
+}
+
+void MarkdownPreviewRoot::updateScrollToTopVisibility() {
+	if (_scrollToAnimation.animating()) {
+		return;
+	}
+	startScrollToTopButtonAnimation(
+		!_scroll->isHidden()
+		&& (_scroll->scrollTop() > (st::historyToDownShownAfter / 2)));
+}
+
+void MarkdownPreviewRoot::startScrollToTopButtonAnimation(bool shown) {
+	if (_scrollToTopIsShown == shown) {
+		return;
+	}
+	_scrollToTopIsShown = shown;
+	_scrollToTopShown.start(
+		[=] { updateScrollToTopPosition(); },
+		_scrollToTopIsShown ? 0. : 1.,
+		_scrollToTopIsShown ? 1. : 0.,
+		st::historyToDownDuration);
+}
+
+void MarkdownPreviewRoot::updateScrollToTopPosition() {
+	const auto top = anim::interpolate(
+		0,
+		_scrollToTop->height() + st::connectingMargin.top(),
+		_scrollToTopShown.value(_scrollToTopIsShown ? 1. : 0.));
+	_scrollToTop->moveToRight(
+		st::historyToDownPosition.x(),
+		_scroll->height() - top);
+	const auto shouldBeHidden
+		= !_scrollToTopIsShown && !_scrollToTopShown.animating();
+	if (shouldBeHidden != _scrollToTop->isHidden()) {
+		_scrollToTop->setVisible(!shouldBeHidden);
+	}
+}
+
+void MarkdownPreviewRoot::updateChildrenGeometry(QSize size) {
+	_scroll->setGeometry(QRect(QPoint(), size));
+	const auto contentWidth = std::max(_scroll->width(), 1);
+	auto bodyWidth = contentWidth;
+	if (_body) {
+		bodyWidth = std::min(bodyWidth, _body->maxWidth());
+		_body->resizeToWidth(bodyWidth);
+		_body->moveToLeft(
+			std::max((contentWidth - bodyWidth) / 2, 0),
+			0,
+			contentWidth);
+		updateBodyVisibleTopBottom();
+	}
+	if (_scrollContent) {
+		const auto bodyHeight = _body ? _body->height() : 0;
+		const auto footerHeight = (_wrongLayoutBar
+			&& !_wrongLayoutBar->isHidden())
+			? st::ivWrongLayoutBarHeight
+			: 0;
+		_scrollContent->resize(
+			contentWidth,
+			std::max(_scroll->height(), bodyHeight + footerHeight));
+	}
+	updateWrongLayoutGeometry();
+	if (_embedOverlay) {
+		_embedOverlay->updateGeometry(QRect(QPoint(), size), bodyWidth);
+	}
+	_scrollToTop->raise();
+	updateScrollToTopPosition();
+	updateFailureGeometry();
+}
+
+void MarkdownPreviewRoot::updateWrongLayoutGeometry() {
+	if (!_wrongLayoutBar || !_wrongLayout) {
+		return;
+	}
+	const auto footerHeight = st::ivWrongLayoutBarHeight;
+	const auto contentWidth = _scrollContent
+		? std::max(_scrollContent->width(), 1)
+		: std::max(width(), 1);
+	const auto contentHeight = _scrollContent
+		? _scrollContent->height()
+		: height();
+	_wrongLayoutBar->setGeometry(
+		0,
+		std::max(contentHeight - footerHeight, 0),
+		contentWidth,
+		footerHeight);
+	_wrongLayout->resizeToNaturalWidth(contentWidth);
+	_wrongLayout->moveToLeft(
+		std::max((contentWidth - _wrongLayout->width()) / 2, 0),
+		std::max((footerHeight - _wrongLayout->height()) / 2, 0),
+		contentWidth);
+}
+
+void MarkdownPreviewRoot::updateFailureGeometry() {
+	const auto availableWidth = std::max(width(), 1);
+	const auto failureWidth = std::min(
+		availableWidth,
+		st::defaultMarkdown.failure.width);
+	_failure->resizeToWidth(failureWidth);
+	_failureOpen->resizeToNaturalWidth(failureWidth);
+	const auto openVisible = !_failureOpen->isHidden();
+	const auto totalHeight = _failure->height()
+		+ (openVisible
+			? (st::defaultMarkdown.failure.skip + _failureOpen->height())
+			: 0);
+	const auto top = std::max((height() - totalHeight) / 2, 0);
+	_failure->moveToLeft(
+		(availableWidth - failureWidth) / 2,
+		top,
+		availableWidth);
+	if (openVisible) {
+		_failureOpen->moveToLeft(
+			(availableWidth - _failureOpen->width()) / 2,
+			top + _failure->height() + st::defaultMarkdown.failure.skip,
+			availableWidth);
+	}
+}
+
+void MarkdownPreviewRoot::logPreparationSummary(
+		const PrepareFailureStatus &failure,
+		const PrepareDebugStats &debug,
+		int prepareMs,
+		int layoutMs) const {
+#ifndef NDEBUG
+	const auto counters = _renderer ? _renderer->debugCounters() : FormulaDebugCounters();
+	const auto reason = PrepareFailureReasonText(failure);
+	DEBUG_LOG((
+		failure.failed()
+			? "Native Markdown IV: unexpected preview prepare failure (%1 ms prepare, %2 ms layout, %3 ms formulas, cache hits=%4 misses=%5 bytes=%6, terminal=%7): %8"
+			: "Native Markdown IV: preview prepare success (%1 ms prepare, %2 ms layout, %3 ms formulas, cache hits=%4 misses=%5 bytes=%6, terminal=%7): %8"
+		).arg(prepareMs
+		).arg(layoutMs
+		).arg(debug.formulaMeasureMs
+		).arg(counters.hits
+		).arg(counters.misses
+		).arg(qlonglong(counters.cacheBytes)
+		).arg(reason
+		).arg(_options.sourcePath));
+#else
+	Q_UNUSED(failure);
+	Q_UNUSED(debug);
+	Q_UNUSED(prepareMs);
+	Q_UNUSED(layoutMs);
+#endif
+}
+
+std::unique_ptr<Ui::RpWidget> CreateMarkdownPreviewWidget(
+		QWidget *parent,
+		const PreparedDocument &document,
+		Fn<void(Event)> callback,
+		const OpenOptions &options) {
+	return std::make_unique<MarkdownPreviewRoot>(
+		parent,
+		document,
+		std::move(callback),
+		options);
+}
+
+std::unique_ptr<Ui::RpWidget> CreateMarkdownPreviewWidget(
+		QWidget *parent,
+		MarkdownArticleContent content,
+		std::shared_ptr<MathRenderer> renderer,
+		Fn<void(Event)> callback,
+		const OpenOptions &options) {
+	return std::make_unique<MarkdownPreviewRoot>(
+		parent,
+		std::move(content),
+		std::move(renderer),
+		std::move(callback),
+		options);
+}
+
+bool UpdateMarkdownPreviewWidget(
+		Ui::RpWidget *preview,
+		MarkdownArticleContent content,
+		const OpenOptions &options) {
+	if (const auto root = dynamic_cast<MarkdownPreviewRoot*>(preview)) {
+		return root->updateContent(std::move(content), options);
+	}
+	return false;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_view.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_view.h
new file mode 100644
index 00000000000000..11484c99e468ba
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_view.h
@@ -0,0 +1,52 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_document.h"
+#include "iv/markdown/iv_markdown_prepare.h"
+
+#include <memory>
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Iv::Markdown {
+
+[[nodiscard]] std::unique_ptr<Ui::RpWidget> CreateMarkdownPreviewWidget(
+	QWidget *parent,
+	const PreparedDocument &document,
+	Fn<void(Event)> callback,
+	const OpenOptions &options = {});
+[[nodiscard]] std::unique_ptr<Ui::RpWidget> CreateMarkdownPreviewWidget(
+	QWidget *parent,
+	MarkdownArticleContent content,
+	std::shared_ptr<MathRenderer> renderer,
+	Fn<void(Event)> callback,
+	const OpenOptions &options = {});
+bool UpdateMarkdownPreviewWidget(
+	Ui::RpWidget *preview,
+	MarkdownArticleContent content,
+	const OpenOptions &options);
+enum class MarkdownPreviewScrollMode {
+	Instant,
+	Animated,
+};
+bool ScrollMarkdownPreviewToAnchor(
+	Ui::RpWidget *preview,
+	const QString &anchorId,
+	MarkdownPreviewScrollMode mode = MarkdownPreviewScrollMode::Instant);
+void ScrollMarkdownPreviewToY(
+	Ui::RpWidget *preview,
+	int top,
+	MarkdownPreviewScrollMode mode = MarkdownPreviewScrollMode::Instant);
+[[nodiscard]] int MarkdownPreviewScrollTop(Ui::RpWidget *preview);
+[[nodiscard]] rpl::producer<int> MarkdownPreviewScrollTopValue(
+	Ui::RpWidget *preview);
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_view_widget.cpp b/Telegram/SourceFiles/iv/markdown/iv_markdown_view_widget.cpp
new file mode 100644
index 00000000000000..d4b880a6086f2a
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_view_widget.cpp
@@ -0,0 +1,1369 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "iv/markdown/iv_markdown_view_widget.h"
+
+#include "base/qt/qt_common_adapters.h"
+#include "base/weak_ptr.h"
+#include "core/click_handler_types.h"
+#include "core/credits_amount.h"
+#include "core/file_utilities.h"
+#include "iv/markdown/iv_markdown_article_text.h"
+#include "iv/markdown/iv_markdown_prepare_native_richtext.h"
+#include "lang/lang_keys.h"
+#include "spellcheck/spellcheck_highlight_syntax.h"
+#include "ui/chat/chat_style.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/layers/show.h"
+#include "ui/text/text_extended_data.h"
+#include "ui/toast/toast.h"
+#include "ui/ui_utility.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/color_contrast.h"
+#include "ui/integration.h"
+
+#include "styles/palette.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_iv.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QPointer>
+#include <QtGui/QClipboard>
+#include <QtGui/QContextMenuEvent>
+#include <QtGui/QCursor>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QKeySequence>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QTouchEvent>
+#include <QtGui/QWheelEvent>
+#include <QtWidgets/QApplication>
+
+#include <algorithm>
+#include <cmath>
+#include <utility>
+
+namespace Iv::Markdown {
+namespace {
+
+void EnsureBlockquotePaintCache(
+		std::unique_ptr<Ui::Text::QuotePaintCache> &cache,
+		const style::color &color) {
+	if (cache) {
+		return;
+	}
+	cache = std::make_unique<Ui::Text::QuotePaintCache>();
+	cache->bg = color->c;
+	cache->bg.setAlpha(Ui::kDefaultBgOpacity * 255);
+	cache->outlines[0] = color->c;
+	cache->outlines[0].setAlpha(Ui::kDefaultOutline1Opacity * 255);
+	cache->outlines[1] = cache->outlines[2] = QColor(0, 0, 0, 0);
+	cache->header = color->c;
+	cache->header.setAlpha(Ui::kDefaultOutline2Opacity * 255);
+	cache->icon = color->c;
+	cache->icon.setAlpha(Ui::kDefaultOutline3Opacity * 255);
+}
+
+[[nodiscard]] bool UseDarkPrePaintBackground() {
+	const auto withBg = [](const QColor &color) {
+		return Ui::CountContrast(st::windowBg->c, color);
+	};
+	return withBg({ 0, 0, 0 }) < withBg({ 255, 255, 255 });
+}
+
+void EnsurePrePaintCache(
+		std::unique_ptr<Ui::Text::QuotePaintCache> &cache,
+		const style::color &color) {
+	if (cache) {
+		return;
+	}
+	cache = std::make_unique<Ui::Text::QuotePaintCache>();
+	if (UseDarkPrePaintBackground()) {
+		cache->bg = QColor(0, 0, 0, 192);
+	} else {
+		cache->bg = color->c;
+		cache->bg.setAlpha(Ui::kDefaultBgOpacity * 255);
+	}
+	cache->outlines[0] = color->c;
+	cache->outlines[0].setAlpha(Ui::kDefaultOutline1Opacity * 255);
+	cache->outlines[1] = cache->outlines[2] = QColor(0, 0, 0, 0);
+	cache->header = color->c;
+	cache->header.setAlpha(Ui::kDefaultOutline2Opacity * 255);
+	cache->icon = color->c;
+	cache->icon.setAlpha(Ui::kDefaultOutline3Opacity * 255);
+}
+
+[[nodiscard]] int CompareSelectionPositions(
+		MarkdownArticleSelectionPosition a,
+		MarkdownArticleSelectionPosition b) {
+	if (a.segment != b.segment) {
+		return (a.segment < b.segment) ? -1 : 1;
+	}
+	if (a.offset != b.offset) {
+		return (a.offset < b.offset) ? -1 : 1;
+	}
+	return 0;
+}
+
+[[nodiscard]] MarkdownArticleSelection NormalizeSelection(
+		MarkdownArticleSelection selection) {
+	if (selection.empty()) {
+		return {};
+	}
+	if (CompareSelectionPositions(selection.from, selection.to) > 0) {
+		std::swap(selection.from, selection.to);
+	}
+	return selection;
+}
+
+[[nodiscard]] MarkdownArticleSelectionEndpoint MakeSelectionEndpoint(
+		const MarkdownArticleHitTestResult &result) {
+	return {
+		.segment = result.segmentIndex,
+		.direct = result.direct,
+	};
+}
+
+[[nodiscard]] std::vector<Ui::Text::SpecialColor> HighlightColors(
+		not_null<const Ui::ChatStyle*> style) {
+	auto result = Ui::SyntaxHighlightColors(style);
+
+	const auto &fg = style->lightButtonFg();
+	const auto &bg = style->lightButtonBgOver();
+	result.push_back({ &fg->p, &fg->p, &bg->b, &bg->b });
+
+	Ensures(result.size() == kNativeIvLinkSpecialColorIndex);
+	return result;
+}
+
+[[nodiscard]] std::unique_ptr<Ui::ChatTheme> CreateStandaloneChatTheme() {
+	const auto palette = style::main_palette::get();
+	return std::make_unique<Ui::ChatTheme>(Ui::ChatThemeDescriptor{
+		.preparePalette = [=](style::palette &copy) {
+			copy = *palette;
+		},
+		.backgroundData = {
+			.colors = { palette->windowBg()->c },
+		},
+	});
+}
+
+[[nodiscard]] QPoint LocalPosition(QWheelEvent *e) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	return e->position().toPoint();
+#else // Qt >= 6.0
+	return e->pos();
+#endif // Qt >= 6.0
+}
+
+[[nodiscard]] QPoint ArticlePointFromWidget(QPoint point, double scale) {
+	if (scale != 1.) {
+		point = QPoint(
+			int(std::floor(point.x() / scale)),
+			int(std::floor(point.y() / scale)));
+	}
+	return point;
+}
+
+} // namespace
+
+MarkdownDocumentWidget::MarkdownDocumentWidget(QWidget *parent)
+: Ui::RpWidget(parent)
+, _theme(CreateStandaloneChatTheme())
+, _style(std::make_unique<Ui::ChatStyle>(style::main_palette::get())) {
+	_style->apply(_theme.get());
+	_highlightColors = HighlightColors(_style.get());
+
+	setMouseTracking(true);
+	setAttribute(Qt::WA_AcceptTouchEvents);
+	setFocusPolicy(Qt::StrongFocus);
+
+	Spellchecker::HighlightReady(
+	) | rpl::on_next([=](Spellchecker::HighlightProcessId processId) {
+		if (_article && _article->highlightProcessDone(processId)) {
+			update();
+		}
+	}, _highlightReadyLifetime);
+}
+
+MarkdownDocumentWidget::~MarkdownDocumentWidget() {
+	if (_article && (_article->mediaBlockHost() == this)) {
+		_article->setTextRepaintCallbacks(nullptr, nullptr);
+		_article->setMediaBlockHost(nullptr);
+	}
+}
+
+void MarkdownDocumentWidget::setLinkActivationCallback(
+		std::function<void(const PreparedLink &, Qt::MouseButton)> callback) {
+	_activateLink = std::move(callback);
+}
+
+void MarkdownDocumentWidget::setMediaActivationCallback(
+		std::function<bool(const MediaActivation &, Qt::MouseButton)> callback) {
+	_activateMedia = std::move(callback);
+}
+
+void MarkdownDocumentWidget::setClickHandlerContext(
+		QVariant context,
+		std::shared_ptr<QVariant> contextRef) {
+	_clickHandlerContext = std::move(context);
+	_clickHandlerContextRef = std::move(contextRef);
+}
+
+void MarkdownDocumentWidget::setArticle(
+		std::shared_ptr<MarkdownArticle> article) {
+	ClickHandler::clearActive(this);
+	applyCursor(style::cur_default);
+	auto previous = std::move(_article);
+	if (previous && (previous->mediaBlockHost() == this)) {
+		previous->setTextRepaintCallbacks(nullptr, nullptr);
+		previous->setMediaBlockHost(nullptr);
+	}
+	if (previous && article && _articlePainted) {
+		_retainedArticle = std::move(previous);
+	} else if (!article) {
+		_retainedArticle = nullptr;
+	}
+	_article = std::move(article);
+	_articlePainted = false;
+	if (_article) {
+		const auto weak = QPointer<MarkdownDocumentWidget>(this);
+		_article->setTextRepaintCallbacks(
+			[=] {
+				if (weak) {
+					weak->requestRepaint(QRect());
+				}
+			},
+			[=](QRect articleRect) {
+				if (weak) {
+					weak->requestRepaint(articleRect);
+				}
+			});
+		_article->setMediaBlockHost(this);
+	}
+	_lastRelayoutMs = 0;
+	resetTextPaintCaches();
+	resetSelection();
+	forceRelayoutCurrentWidth();
+}
+
+void MarkdownDocumentWidget::articleContentChanged() {
+	ClickHandler::clearActive(this);
+	applyCursor(style::cur_default);
+	stopPressedPlaceholderRipple();
+	clearSelection();
+	_articlePainted = false;
+	resetTextPaintCaches();
+	forceRelayoutCurrentWidth();
+}
+
+void MarkdownDocumentWidget::setZoom(int value) {
+	value = (value > 0) ? value : 100;
+	if (_zoom == value) {
+		return;
+	}
+	_zoom = value;
+	clearSelection();
+	forceRelayoutCurrentWidth();
+}
+
+void MarkdownDocumentWidget::refreshPalette() {
+	ClickHandler::clearActive(this);
+	applyCursor(style::cur_default);
+	_theme = CreateStandaloneChatTheme();
+	_style->apply(_theme.get());
+	_highlightColors = HighlightColors(_style.get());
+	resetTextPaintCaches();
+	if (_article) {
+		_article->invalidatePaletteCache();
+	}
+	update();
+}
+
+void MarkdownDocumentWidget::invalidateRasterCache() {
+	ClickHandler::clearActive(this);
+	applyCursor(style::cur_default);
+	if (_article) {
+		_article->invalidateRasterCache();
+	}
+	relayoutCurrentWidth(false);
+	update();
+}
+
+int MarkdownDocumentWidget::maxWidth() const {
+	return _article
+		? std::max(int(std::ceil(_article->maxWidth() * zoomScale())), 1)
+		: 1;
+}
+
+int MarkdownDocumentWidget::anchorTop(const QString &anchorId) const {
+	const auto top = _article ? _article->anchorTop(anchorId) : -1;
+	if (top < 0) {
+		return -1;
+	}
+	return int(std::floor(top * zoomScale()));
+}
+
+bool MarkdownDocumentWidget::expandDetailsToAnchor(const QString &anchorId) {
+	if (!_article) {
+		return false;
+	}
+	const auto result = _article->expandDetailsToAnchor(anchorId);
+	if (!result.found) {
+		return false;
+	}
+	if (result.changed) {
+		clearSelection();
+		forceRelayoutCurrentWidth();
+		updateHoverAtCursor();
+	}
+	return true;
+}
+
+bool MarkdownDocumentWidget::toggleDetails(const QString &anchorId) {
+	if (!_article || !_article->toggleDetails(anchorId)) {
+		return false;
+	}
+	clearSelection();
+	forceRelayoutCurrentWidth();
+	updateHoverAtCursor();
+	return true;
+}
+
+int MarkdownDocumentWidget::lastRelayoutMs() const {
+	return _lastRelayoutMs;
+}
+
+int MarkdownDocumentWidget::resizeGetHeight(int newWidth) {
+	ClickHandler::clearActive(this);
+	applyCursor(style::cur_default);
+	clearSelection();
+	if (!_article) {
+		return 1;
+	}
+	const auto scale = zoomScale();
+	const auto layoutWidth = std::max(int(std::floor(newWidth / scale)), 1);
+	auto timer = QElapsedTimer();
+	timer.start();
+	const auto layoutHeight = _article->resizeGetHeight(layoutWidth);
+	syncArticleVisibleTopBottom();
+	_lastRelayoutMs = int(timer.elapsed());
+	return std::max(int(std::ceil(layoutHeight * scale)), 1);
+}
+
+void MarkdownDocumentWidget::requestRepaint(QRect articleRect) {
+	crl::on_main(this, [=] {
+		if (!_article) {
+			return;
+		}
+		if (articleRect.isEmpty()) {
+			update();
+		} else {
+			update(articleRectToWidget(articleRect));
+		}
+	});
+}
+
+void MarkdownDocumentWidget::requestRelayout(QRect articleRect) {
+	crl::on_main(this, [=] {
+		if (!_article) {
+			return;
+		}
+		_article->invalidateLayout();
+		const auto previousHeight = height();
+		const auto scale = zoomScale();
+		const auto layoutWidth = std::max(int(std::floor(width() / scale)), 1);
+		auto timer = QElapsedTimer();
+		timer.start();
+		const auto articleHeight = _article->resizeGetHeight(layoutWidth);
+		syncArticleVisibleTopBottom();
+		_lastRelayoutMs = int(timer.elapsed());
+		const auto newHeight = std::max(int(std::ceil(articleHeight * scale)), 1);
+		if (previousHeight != newHeight) {
+			resize(width(), newHeight);
+			update();
+		} else if (articleRect.isEmpty()) {
+			update();
+		} else {
+			update(articleRectToWidget(articleRect));
+		}
+		updateHoverAtCursor();
+	});
+}
+
+void MarkdownDocumentWidget::setPlaceholderLoading(
+		PreparedPlaceholderBlockId id) {
+	if (_article) {
+		_article->setPlaceholderLoading(id);
+	}
+}
+
+void MarkdownDocumentWidget::clearPlaceholderLoading(
+		PreparedPlaceholderBlockId id) {
+	if (_article) {
+		_article->clearPlaceholderLoading(id);
+	}
+}
+
+void MarkdownDocumentWidget::clearAllPlaceholderLoading() {
+	if (_article) {
+		_article->clearAllPlaceholderLoading();
+	}
+}
+
+void MarkdownDocumentWidget::addPlaceholderRipple(
+		PreparedPlaceholderBlockId id,
+		QPoint point) {
+	if (_article) {
+		_article->addPlaceholderRipple(id, point);
+	}
+}
+
+void MarkdownDocumentWidget::stopPlaceholderRipple(
+		PreparedPlaceholderBlockId id) {
+	if (_article) {
+		_article->stopPlaceholderRipple(id);
+	}
+}
+
+void MarkdownDocumentWidget::paintEvent(QPaintEvent *e) {
+	if (!_article) {
+		return;
+	}
+	auto p = Painter(this);
+	p.setTextPalette(st::inTextPalette);
+	const auto scale = zoomScale();
+	const auto clip = (scale == 1.)
+		? e->rect()
+		: QRect(
+			int(std::floor(e->rect().x() / scale)),
+			int(std::floor(e->rect().y() / scale)),
+			int(std::ceil(e->rect().width() / scale)) + 1,
+			int(std::ceil(e->rect().height() / scale)) + 1);
+	auto context = textPaintContext(clip);
+	if (scale == 1.) {
+		_article->paint(p, context);
+		_articlePainted = true;
+		_retainedArticle = nullptr;
+		return;
+	}
+	p.save();
+	p.scale(scale, scale);
+	_article->paint(p, context);
+	p.restore();
+	_articlePainted = true;
+	_retainedArticle = nullptr;
+}
+
+void MarkdownDocumentWidget::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	_visibleRange = Ui::VisibleRange{
+		.top = visibleTop,
+		.bottom = visibleBottom,
+	};
+	syncArticleVisibleTopBottom();
+}
+
+void MarkdownDocumentWidget::keyPressEvent(QKeyEvent *e) {
+	if (e == QKeySequence::Copy && !selectionForCopy().empty()) {
+		copySelectedText();
+		return;
+	}
+	Ui::RpWidget::keyPressEvent(e);
+}
+
+void MarkdownDocumentWidget::contextMenuEvent(QContextMenuEvent *e) {
+	const auto globalPoint = (e->reason() == QContextMenuEvent::Mouse)
+		? e->globalPos()
+		: QCursor::pos();
+	const auto localPoint = (e->reason() == QContextMenuEvent::Mouse)
+		? e->pos()
+		: mapFromGlobal(globalPoint);
+	const auto state = hitTest(
+		localPoint,
+		Ui::Text::StateRequest::Flag::LookupLink
+			| Ui::Text::StateRequest::Flag::LookupSymbol);
+	const auto selection = selectionForCopy();
+	const auto uponSelection = !selection.empty()
+		&& ((e->reason() != QContextMenuEvent::Mouse)
+			|| selectionContains(selection, state));
+	const auto contextText = uponSelection
+		? TextForMimeData()
+		: (_article ? _article->textForContext(state) : TextForMimeData());
+	const auto link = state.preparedLink;
+
+	_contextMenu = base::make_unique_q<Ui::PopupMenu>(
+		this,
+		st::popupMenuWithIcons);
+	if (uponSelection) {
+		_contextMenu->addAction(
+			Ui::Integration::Instance().phraseContextCopySelected(),
+			[=] { copySelectedText(); },
+			&st::menuIconCopy);
+	} else if (!contextText.empty()) {
+		_contextMenu->addAction(
+			tr::lng_context_copy_text(tr::now),
+			[text = contextText, this] {
+				TextUtilities::SetClipboardText(text);
+				showToast(tr::lng_text_copied(tr::now));
+			},
+			&st::menuIconCopy);
+	}
+
+	if (link) {
+		const auto handler = CreatePreparedLinkHandler(*link);
+		const auto copyText = handler ? handler->copyToClipboardText() : QString();
+		const auto copyLabel = handler
+			? handler->copyToClipboardContextItemText()
+			: QString();
+		if (!copyText.isEmpty() && !copyLabel.isEmpty()) {
+			_contextMenu->addAction(
+				copyLabel,
+				[text = copyText] {
+					QGuiApplication::clipboard()->setText(text);
+				},
+				&st::menuIconCopy);
+		}
+		switch (link->kind) {
+		case PreparedLinkKind::RejectedRelative:
+		case PreparedLinkKind::ToggleDetails:
+			break;
+		case PreparedLinkKind::External:
+		case PreparedLinkKind::InstantViewPage:
+		case PreparedLinkKind::Anchor:
+		case PreparedLinkKind::Footnote:
+		case PreparedLinkKind::FootnoteBacklink:
+		case PreparedLinkKind::LocalFile:
+			_contextMenu->addAction(
+				tr::lng_open_link(tr::now),
+				[=, prepared = *link] {
+					if (_activateLink) {
+						_activateLink(prepared, Qt::LeftButton);
+					}
+				},
+				&st::menuIconAddress);
+			break;
+		}
+	}
+
+	if (_contextMenu->empty()) {
+		_contextMenu = nullptr;
+		return;
+	}
+	_contextMenu->popup(globalPoint);
+	e->accept();
+}
+
+void MarkdownDocumentWidget::wheelEvent(QWheelEvent *e) {
+	const auto phase = e->phase();
+	if (phase == Qt::NoScrollPhase) {
+		_horizontalScrollLock = std::nullopt;
+	} else if (phase == Qt::ScrollBegin) {
+		_horizontalScrollLock = std::nullopt;
+	}
+	if (!_article) {
+		e->ignore();
+		return;
+	}
+	const auto delta = Ui::ScrollDeltaF(e);
+	const auto horizontal = (std::abs(delta.x()) > std::abs(delta.y()));
+	if (phase != Qt::NoScrollPhase
+		&& phase != Qt::ScrollBegin
+		&& !_horizontalScrollLock) {
+		_horizontalScrollLock = horizontal ? Qt::Horizontal : Qt::Vertical;
+	}
+	const auto local = ArticlePointFromWidget(LocalPosition(e), zoomScale());
+	if (!_article->horizontalScrollHit(local).scrollable) {
+		e->ignore();
+		return;
+	}
+	if (horizontal) {
+		if (_horizontalScrollLock == Qt::Vertical) {
+			e->ignore();
+			return;
+		}
+		(void)_article->consumeHorizontalScroll(
+			local,
+			int(std::round(delta.x())));
+		e->accept();
+		return;
+	}
+	if (_horizontalScrollLock == Qt::Horizontal) {
+		e->accept();
+	} else {
+		e->ignore();
+	}
+}
+
+void MarkdownDocumentWidget::touchEvent(QTouchEvent *e) {
+	if (e->type() == QEvent::TouchCancel) {
+		_pendingTouchHorizontalScrollPoint = std::nullopt;
+		if (!_activeTouchHorizontalScroll) {
+			return;
+		}
+		_activeTouchHorizontalScroll = false;
+		if (_article) {
+			_article->endHorizontalScroll();
+		}
+		e->accept();
+		return;
+	}
+	if (!_article || e->touchPoints().isEmpty()) {
+		return;
+	}
+	const auto point = mapFromGlobal(
+		e->touchPoints().cbegin()->screenPos().toPoint());
+	const auto local = ArticlePointFromWidget(point, zoomScale());
+	switch (e->type()) {
+	case QEvent::TouchBegin: {
+		_pendingTouchHorizontalScrollPoint = std::nullopt;
+		const auto hit = _article->horizontalScrollHit(local);
+		_activeTouchHorizontalScroll = hit.overScrollbar
+			&& _article->beginHorizontalScroll(local, false);
+		if (!_activeTouchHorizontalScroll && hit.overViewport) {
+			_pendingTouchHorizontalScrollPoint = local;
+		}
+		if (_activeTouchHorizontalScroll) {
+			e->accept();
+		}
+	} break;
+	case QEvent::TouchUpdate:
+		if (_activeTouchHorizontalScroll) {
+			(void)_article->updateHorizontalScroll(local);
+			e->accept();
+		} else if (_pendingTouchHorizontalScrollPoint) {
+			const auto delta = local - *_pendingTouchHorizontalScrollPoint;
+			if (delta.manhattanLength() < QApplication::startDragDistance()) {
+				break;
+			}
+			const auto horizontal = (std::abs(delta.x()) > std::abs(delta.y()));
+			if (!horizontal) {
+				_pendingTouchHorizontalScrollPoint = std::nullopt;
+				break;
+			}
+			_activeTouchHorizontalScroll = _article->beginHorizontalScroll(
+				*_pendingTouchHorizontalScrollPoint,
+				true);
+			_pendingTouchHorizontalScrollPoint = std::nullopt;
+			if (_activeTouchHorizontalScroll) {
+				(void)_article->updateHorizontalScroll(local);
+				e->accept();
+			}
+		}
+		break;
+	case QEvent::TouchEnd:
+		_pendingTouchHorizontalScrollPoint = std::nullopt;
+		if (_activeTouchHorizontalScroll) {
+			_activeTouchHorizontalScroll = false;
+			_article->endHorizontalScroll();
+			e->accept();
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+void MarkdownDocumentWidget::mouseMoveEvent(QMouseEvent *e) {
+	if (_activeHorizontalScrollDrag) {
+		if (_article) {
+			(void)_article->updateHorizontalScroll(
+				ArticlePointFromWidget(e->pos(), zoomScale()));
+		}
+		e->accept();
+		return;
+	}
+	dragActionUpdate(e->pos());
+}
+
+void MarkdownDocumentWidget::mousePressEvent(QMouseEvent *e) {
+	if (e->button() == Qt::LeftButton) {
+		if (_article && _article->beginHorizontalScroll(
+				ArticlePointFromWidget(e->pos(), zoomScale()),
+				false)) {
+			_activeHorizontalScrollDrag = true;
+			e->accept();
+			return;
+		}
+		dragActionStart(e->pos(), e->button());
+		return;
+	}
+	updateHover(hitTest(
+		e->pos(),
+		Ui::Text::StateRequest::Flag::LookupLink
+			| Ui::Text::StateRequest::Flag::LookupSymbol));
+	if (e->button() == Qt::MiddleButton) {
+		ClickHandler::pressed();
+	}
+}
+
+void MarkdownDocumentWidget::mouseReleaseEvent(QMouseEvent *e) {
+	const auto weak = base::make_weak(this);
+	if (_activeHorizontalScrollDrag && e->button() == Qt::LeftButton) {
+		if (_article) {
+			(void)_article->updateHorizontalScroll(
+				ArticlePointFromWidget(e->pos(), zoomScale()));
+		}
+		_activeHorizontalScrollDrag = false;
+		if (_article) {
+			_article->endHorizontalScroll();
+		}
+		if (weak && rect().contains(e->pos())) {
+			updateHover(hitTest(
+				e->pos(),
+				Ui::Text::StateRequest::Flag::LookupLink
+					| Ui::Text::StateRequest::Flag::LookupSymbol));
+		} else if (weak) {
+			ClickHandler::clearActive(this);
+			applyCursor(style::cur_default);
+		}
+		e->accept();
+		return;
+	}
+	dragActionFinish(e->pos(), e->button());
+	if (weak && !rect().contains(e->pos())) {
+		ClickHandler::clearActive(this);
+		applyCursor(style::cur_default);
+	}
+}
+
+void MarkdownDocumentWidget::mouseDoubleClickEvent(QMouseEvent *e) {
+	if (_article && _article->horizontalScrollHit(
+			ArticlePointFromWidget(e->pos(), zoomScale())).overScrollbar) {
+		return;
+	}
+	dragActionStart(e->pos(), e->button());
+	if (_dragAction != Selecting || _selectionType != TextSelectType::Letters) {
+		return;
+	}
+	const auto state = hitTest(
+		e->pos(),
+		Ui::Text::StateRequest::Flag::LookupLink
+			| Ui::Text::StateRequest::Flag::LookupSymbol);
+	if (!_article
+		|| !_article->segmentIsText(state.segmentIndex)
+		|| !state.direct
+		|| !state.state.uponSymbol) {
+		return;
+	}
+	_dragSegment = state.segmentIndex;
+	_dragSymbol = selectionOffsetFromHit(state);
+	_selectionType = TextSelectType::Words;
+	_selection = selectionFromHit(state);
+	_savedSelection = {};
+	_selectionEndpoints = {
+		.from = MakeSelectionEndpoint(state),
+		.to = MakeSelectionEndpoint(state),
+	};
+	_savedSelectionEndpoints = {};
+	if (_selection.from.segment == _dragSegment
+		&& _selection.to.segment == _dragSegment) {
+		_dragExpandedSelection = TextSelection(
+			uint16(_selection.from.offset),
+			uint16(_selection.to.offset));
+	}
+	setFocus();
+	updateHover(state);
+	update();
+}
+
+void MarkdownDocumentWidget::focusOutEvent(QFocusEvent *e) {
+	stopPressedPlaceholderRipple();
+	if (!_selection.empty()) {
+		_savedSelection = _selection;
+		_savedSelectionEndpoints = _selectionEndpoints;
+		_selection = {};
+		_selectionEndpoints = {};
+		update();
+	}
+	ClickHandler::clearActive(this);
+	applyCursor(style::cur_default);
+	Ui::RpWidget::focusOutEvent(e);
+}
+
+void MarkdownDocumentWidget::focusInEvent(QFocusEvent *e) {
+	if (!_savedSelection.empty()) {
+		_selection = _savedSelection;
+		_selectionEndpoints = _savedSelectionEndpoints;
+		_savedSelection = {};
+		_savedSelectionEndpoints = {};
+		update();
+	}
+	Ui::RpWidget::focusInEvent(e);
+}
+
+bool MarkdownDocumentWidget::eventHook(QEvent *e) {
+	if (e->type() == QEvent::TouchBegin
+		|| e->type() == QEvent::TouchUpdate
+		|| e->type() == QEvent::TouchEnd
+		|| e->type() == QEvent::TouchCancel) {
+		auto *ev = static_cast<QTouchEvent*>(e);
+		if (ev->device()->type() == base::TouchDevice::TouchScreen) {
+			const auto active = _activeTouchHorizontalScroll;
+			touchEvent(ev);
+			if (active || _activeTouchHorizontalScroll) {
+				return true;
+			}
+		}
+	}
+	return Ui::RpWidget::eventHook(e);
+}
+
+void MarkdownDocumentWidget::leaveEventHook(QEvent *e) {
+	ClickHandler::clearActive(this);
+	applyCursor((_dragAction == Selecting)
+		? style::cur_text
+		: style::cur_default);
+	Ui::RpWidget::leaveEventHook(e);
+}
+
+void MarkdownDocumentWidget::clickHandlerActiveChanged(
+		const ClickHandlerPtr &,
+		bool) {
+	update();
+}
+
+void MarkdownDocumentWidget::clickHandlerPressedChanged(
+		const ClickHandlerPtr &,
+		bool) {
+	update();
+}
+
+ClickHandlerPtr MarkdownDocumentWidget::linkAt(QPoint point) const {
+	return hitTest(
+		point,
+		Ui::Text::StateRequest::Flag::LookupLink
+			| Ui::Text::StateRequest::Flag::LookupSymbol).state.link;
+}
+
+MarkdownArticleHitTestResult MarkdownDocumentWidget::hitTest(
+		QPoint point,
+		Ui::Text::StateRequest::Flags flags) const {
+	if (!_article) {
+		return {};
+	}
+	return _article->hitTest(
+		ArticlePointFromWidget(point, zoomScale()),
+		flags);
+}
+
+MarkdownArticleSelection MarkdownDocumentWidget::selectionForCopy() const {
+	return !_selection.empty()
+		? _selection
+		: _contextMenu
+		? _savedSelection
+		: MarkdownArticleSelection();
+}
+
+MarkdownArticleSelectionEndpoints MarkdownDocumentWidget::selectionEndpointsForCopy() const {
+	return !_selection.empty()
+		? _selectionEndpoints
+		: _contextMenu
+		? _savedSelectionEndpoints
+		: MarkdownArticleSelectionEndpoints();
+}
+
+bool MarkdownDocumentWidget::selectionContains(
+		MarkdownArticleSelection selection,
+		const MarkdownArticleHitTestResult &result) const {
+	const auto endpoints = selectionEndpointsForCopy();
+	return _article
+		? _article->selectionContains(
+			selection,
+			&endpoints,
+			result)
+		: false;
+}
+
+int MarkdownDocumentWidget::selectionOffsetFromHit(
+		const MarkdownArticleHitTestResult &result) const {
+	return _article
+		? _article->selectionOffsetFromHit(result, _selectionType)
+		: 0;
+}
+
+MarkdownArticleSelection MarkdownDocumentWidget::selectionFromHit(
+		const MarkdownArticleHitTestResult &result) const {
+	if (!_article || _dragSegment < 0 || !result.valid()) {
+		return {};
+	}
+	auto first = _dragSymbol;
+	auto second = selectionOffsetFromHit(result);
+	if (_selectionType != TextSelectType::Letters
+		&& !_dragExpandedSelection.empty()
+		&& result.segmentIndex != _dragSegment) {
+		first = (CompareSelectionPositions(
+			MarkdownArticleSelectionPosition{ result.segmentIndex, second },
+			MarkdownArticleSelectionPosition{ _dragSegment, _dragSymbol }) < 0)
+			? _dragExpandedSelection.to
+			: _dragExpandedSelection.from;
+	}
+	if (result.segmentIndex == _dragSegment
+		&& _article->segmentIsText(_dragSegment)) {
+		const auto adjusted = _article->adjustSelection(
+			_dragSegment,
+			TextSelection(
+				uint16(std::min(first, second)),
+				uint16(std::max(first, second))),
+			_selectionType);
+		return {
+			{ _dragSegment, adjusted.from },
+			{ _dragSegment, adjusted.to },
+		};
+	}
+	return NormalizeSelection({
+		{ _dragSegment, first },
+		{ result.segmentIndex, second },
+	});
+}
+
+TextForMimeData MarkdownDocumentWidget::getSelectedText() const {
+	const auto endpoints = selectionEndpointsForCopy();
+	return _article
+		? _article->textForSelection(
+			selectionForCopy(),
+			&endpoints)
+		: TextForMimeData();
+}
+
+QVariant MarkdownDocumentWidget::clickHandlerContext() const {
+	return _clickHandlerContextRef
+		? *_clickHandlerContextRef
+		: _clickHandlerContext;
+}
+
+QVariant MarkdownDocumentWidget::viewerToastClickHandlerContext() const {
+	const auto context = clickHandlerContext().value<ClickHandlerContext>();
+	if (!context.show) {
+		return clickHandlerContext();
+	}
+	auto sanitized = context;
+	sanitized.sessionWindow = base::weak_ptr<Window::SessionController>();
+	return QVariant::fromValue(sanitized);
+}
+
+void MarkdownDocumentWidget::showToast(const QString &text) const {
+	const auto context = clickHandlerContext().value<ClickHandlerContext>();
+	if (context.show) {
+		context.show->showToast({
+			.text = { text },
+			.iconLottie = u"toast/copy"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
+	}
+}
+
+void MarkdownDocumentWidget::copySelectedText() {
+	if (const auto text = getSelectedText(); !text.empty()) {
+		TextUtilities::SetClipboardText(text);
+		showToast(tr::lng_text_copied(tr::now));
+	}
+}
+
+void MarkdownDocumentWidget::copyCodeBlock(
+		const MarkdownArticleHitTestResult &state) {
+	if (!_article) {
+		return;
+	}
+	auto text = _article->textForContext(state);
+	if (text.empty()) {
+		return;
+	}
+	if (!text.rich.text.endsWith('\n')) {
+		text.rich.text.append('\n');
+	}
+	if (!text.expanded.endsWith('\n')) {
+		text.expanded.append('\n');
+	}
+	if (Ui::Integration::Instance().copyPreOnClick(
+			viewerToastClickHandlerContext())) {
+		TextUtilities::SetClipboardText(std::move(text));
+	}
+}
+
+void MarkdownDocumentWidget::syncArticleVisibleTopBottom() {
+	if (!_article) {
+		return;
+	}
+	const auto scale = zoomScale();
+	_article->setVisibleTopBottom(
+		int(std::floor(_visibleRange.top / scale)),
+		int(std::ceil(_visibleRange.bottom / scale)));
+}
+
+void MarkdownDocumentWidget::relayoutCurrentWidth(bool clearSelection) {
+	if (clearSelection) {
+		this->clearSelection();
+	}
+	if (!_article) {
+		_lastRelayoutMs = 0;
+		return;
+	}
+	const auto scale = zoomScale();
+	const auto layoutWidth = std::max(int(std::floor(width() / scale)), 1);
+	auto timer = QElapsedTimer();
+	timer.start();
+	const auto articleHeight = _article->resizeGetHeight(layoutWidth);
+	syncArticleVisibleTopBottom();
+	(void)articleHeight;
+	_lastRelayoutMs = int(timer.elapsed());
+}
+
+void MarkdownDocumentWidget::forceRelayoutCurrentWidth() {
+	resizeToWidth(width());
+	update();
+}
+
+void MarkdownDocumentWidget::updateHover(
+		const MarkdownArticleHitTestResult &state) {
+	const auto changed = ClickHandler::setActive(state.state.link, this);
+	auto cursor = style::cur_default;
+	if (_dragAction == NoDrag) {
+		if (state.codeHeaderCopy
+			|| state.state.link
+			|| (state.preparedLink
+				&& state.preparedLink->kind == PreparedLinkKind::ToggleDetails)
+			|| state.mediaActivation.kind != MediaActivationKind::None) {
+			cursor = style::cur_pointer;
+		} else if (state.direct) {
+			cursor = style::cur_text;
+		}
+	} else {
+		if (_dragAction == Selecting) {
+			const auto selection = selectionFromHit(state);
+			const auto endpoints = MarkdownArticleSelectionEndpoints{
+				.from = _selectionEndpoints.from.valid()
+					? _selectionEndpoints.from
+					: MarkdownArticleSelectionEndpoint{ _dragSegment, false },
+				.to = MakeSelectionEndpoint(state),
+			};
+			const auto endpointsChanged
+				= (_selectionEndpoints.from.segment != endpoints.from.segment)
+				|| (_selectionEndpoints.from.direct != endpoints.from.direct)
+				|| (_selectionEndpoints.to.segment != endpoints.to.segment)
+				|| (_selectionEndpoints.to.direct != endpoints.to.direct);
+			if (_selection != selection || endpointsChanged) {
+				_selection = selection;
+				_selectionEndpoints = endpoints;
+				_savedSelection = {};
+				_savedSelectionEndpoints = {};
+				setFocus();
+				update();
+			} else {
+				_selectionEndpoints = endpoints;
+			}
+			cursor = style::cur_text;
+		} else if (ClickHandler::getPressed()) {
+			cursor = style::cur_pointer;
+		}
+	}
+	if (changed || cursor != _cursor) {
+		applyCursor(cursor);
+	}
+}
+
+void MarkdownDocumentWidget::updateHoverAtCursor() {
+	const auto point = mapFromGlobal(QCursor::pos());
+	if (rect().contains(point)) {
+		updateHover(hitTest(
+			point,
+			Ui::Text::StateRequest::Flag::LookupLink
+				| Ui::Text::StateRequest::Flag::LookupSymbol));
+	} else {
+		ClickHandler::clearActive(this);
+		applyCursor(style::cur_default);
+	}
+}
+
+void MarkdownDocumentWidget::resetSelection() {
+	_selection = {};
+	_savedSelection = {};
+	_selectionEndpoints = {};
+	_savedSelectionEndpoints = {};
+	_selectionType = TextSelectType::Letters;
+	_dragAction = NoDrag;
+	_dragStartPosition = QPoint();
+	_dragSegment = -1;
+	_dragSymbol = 0;
+	_dragExpandedSelection = {};
+	_selectionClickPreparedLink = std::nullopt;
+	_dragStartHadSelection = false;
+}
+
+void MarkdownDocumentWidget::clearSelection() {
+	const auto hadSelection = !_selection.empty()
+		|| !_savedSelection.empty()
+		|| (_dragAction != NoDrag);
+	resetSelection();
+	if (hadSelection) {
+		update();
+	}
+}
+
+void MarkdownDocumentWidget::resetTextPaintCaches() {
+	_prePaintCache = nullptr;
+	_blockquotePaintCache = nullptr;
+}
+
+QRect MarkdownDocumentWidget::articleRectToWidget(QRect articleRect) const {
+	if (articleRect.isEmpty()) {
+		return rect();
+	}
+	const auto scale = zoomScale();
+	const auto left = int(std::floor(articleRect.x() * scale));
+	const auto top = int(std::floor(articleRect.y() * scale));
+	const auto right = int(std::ceil(
+		(articleRect.x() + articleRect.width()) * scale));
+	const auto bottom = int(std::ceil(
+		(articleRect.y() + articleRect.height()) * scale));
+	return QRect(
+		left,
+		top,
+		std::max(right - left, 1),
+		std::max(bottom - top, 1));
+}
+
+Ui::Text::QuotePaintCache *MarkdownDocumentWidget::ensurePrePaintCache() {
+	EnsurePrePaintCache(_prePaintCache, st::inTextPalette.monoFg);
+	return _prePaintCache.get();
+}
+
+Ui::Text::QuotePaintCache *MarkdownDocumentWidget::ensureBlockquotePaintCache() {
+	EnsureBlockquotePaintCache(
+		_blockquotePaintCache,
+		st::defaultMarkdown.quotePaintColors.blockquote);
+	return _blockquotePaintCache.get();
+}
+
+MarkdownArticlePaintContext MarkdownDocumentWidget::textPaintContext(
+		QRect clip) {
+	const auto scale = zoomScale();
+	const auto logicalRect = QRect(QPoint(), QSize(
+		std::max(int(std::floor(width() / scale)), 1),
+		std::max(int(std::floor(height() / scale)), 1)));
+	auto context = MarkdownArticlePaintContext(_theme->preparePaintContext(
+		_style.get(),
+		logicalRect,
+		logicalRect,
+		clip,
+		!window()->isActiveWindow()));
+	context.caches = {
+		.pre = ensurePrePaintCache(),
+		.blockquote = ensureBlockquotePaintCache(),
+		.colors = _highlightColors,
+		.repaint = [=] {
+			crl::on_main(this, [=] {
+				update();
+			});
+		},
+		.repaintRect = [=](QRect articleRect) {
+			crl::on_main(this, [=] {
+				if (articleRect.isEmpty()) {
+					update();
+				} else {
+					update(articleRectToWidget(articleRect));
+				}
+			});
+		},
+	};
+	context.selectionState.selection = _selection;
+	context.selectionState.endpoints = &_selectionEndpoints;
+	return context;
+}
+
+void MarkdownDocumentWidget::stopPressedPlaceholderRipple() {
+	if (_pressedPlaceholderId) {
+		stopPlaceholderRipple(_pressedPlaceholderId);
+		_pressedPlaceholderId = {};
+	}
+}
+
+void MarkdownDocumentWidget::dragActionStart(
+		QPoint point,
+		Qt::MouseButton button) {
+	stopPressedPlaceholderRipple();
+	const auto state = hitTest(
+		point,
+		Ui::Text::StateRequest::Flag::LookupLink
+			| Ui::Text::StateRequest::Flag::LookupSymbol);
+	updateHover(state);
+	if (button != Qt::LeftButton) {
+		return;
+	}
+	if (state.codeHeaderCopy) {
+		clearSelection();
+		_dragStartPosition = point;
+		_selectionClickPreparedLink = std::nullopt;
+		_dragAction = PrepareDrag;
+		return;
+	}
+	if (state.mediaActivation.kind == MediaActivationKind::Embed
+		&& state.mediaActivation.placeholderId) {
+		_pressedPlaceholderId = state.mediaActivation.placeholderId;
+		addPlaceholderRipple(
+			state.mediaActivation.placeholderId,
+			state.placeholderLocalPoint);
+	}
+	_dragStartPosition = point;
+	_dragStartHadSelection = !selectionForCopy().empty();
+	_selectionClickPreparedLink = (state.preparedLink
+		&& state.preparedLink->kind == PreparedLinkKind::ToggleDetails)
+		? state.preparedLink
+		: std::nullopt;
+	ClickHandler::pressed();
+	_dragAction = NoDrag;
+	_dragExpandedSelection = {};
+	_dragSegment = -1;
+	_dragSymbol = 0;
+	if (ClickHandler::getPressed()) {
+		_dragStartPosition = point;
+		_dragAction = PrepareDrag;
+		return;
+	}
+	if (!state.valid()) {
+		clearSelection();
+		return;
+	}
+	_dragSegment = state.segmentIndex;
+	_dragSymbol = selectionOffsetFromHit(state);
+	_selection = {
+		{ _dragSegment, _dragSymbol },
+		{ _dragSegment, _dragSymbol },
+	};
+	_savedSelection = {};
+	_selectionEndpoints = {
+		.from = MakeSelectionEndpoint(state),
+		.to = MakeSelectionEndpoint(state),
+	};
+	_savedSelectionEndpoints = {};
+	_dragAction = Selecting;
+	update();
+}
+
+MarkdownArticleHitTestResult MarkdownDocumentWidget::dragActionUpdate(QPoint point) {
+	const auto state = hitTest(
+		point,
+		Ui::Text::StateRequest::Flag::LookupLink
+			| Ui::Text::StateRequest::Flag::LookupSymbol);
+	if (_dragAction == PrepareDrag
+		&& (point - _dragStartPosition).manhattanLength()
+			>= QApplication::startDragDistance()) {
+		_dragAction = Dragging;
+	}
+	updateHover(state);
+	return state;
+}
+
+MarkdownArticleHitTestResult MarkdownDocumentWidget::dragActionFinish(
+		QPoint point,
+		Qt::MouseButton button) {
+	const auto state = dragActionUpdate(point);
+	stopPressedPlaceholderRipple();
+	auto activated = ClickHandler::unpressed();
+	const auto dragStartHadSelection = _dragStartHadSelection;
+	const auto wasClick = (_dragAction == NoDrag)
+		|| (_dragAction == PrepareDrag);
+	const auto toggleFromDetailsClick = !dragStartHadSelection
+		&& _selection.empty()
+		&& _selectionClickPreparedLink
+		&& (point - _dragStartPosition).manhattanLength()
+			< QApplication::startDragDistance()
+		&& state.preparedLink
+		&& state.preparedLink->kind == PreparedLinkKind::ToggleDetails
+		&& state.preparedLink->target == _selectionClickPreparedLink->target;
+	if (_dragAction == Dragging
+		|| (_dragAction == Selecting && !_selection.empty())) {
+		activated = nullptr;
+	} else if (_dragAction == PrepareDrag && button != Qt::RightButton) {
+		clearSelection();
+	}
+	const auto preparedToggle = toggleFromDetailsClick
+		? state.preparedLink
+		: std::nullopt;
+	_dragStartHadSelection = false;
+	_dragAction = NoDrag;
+	_selectionType = TextSelectType::Letters;
+	_dragExpandedSelection = {};
+	updateHover(state);
+	if (state.codeHeaderCopy
+		&& (button == Qt::LeftButton || button == Qt::MiddleButton)
+		&& wasClick) {
+		copyCodeBlock(state);
+		return state;
+	}
+	if (activated
+		&& (button == Qt::LeftButton || button == Qt::MiddleButton)) {
+		if (state.mediaActivation.kind != MediaActivationKind::None
+			&& _activateMedia
+			&& _activateMedia(state.mediaActivation, button)) {
+			return state;
+		}
+		if (state.preparedLink && _activateLink) {
+			if (state.preparedLink->kind == PreparedLinkKind::ToggleDetails
+				&& dragStartHadSelection) {
+				return state;
+			}
+			_activateLink(*state.preparedLink, button);
+		} else {
+			auto clickHandlerContext = this->clickHandlerContext();
+			const auto monospace = std::dynamic_pointer_cast<MonospaceClickHandler>(
+				activated);
+			const auto pre = dynamic_cast<Ui::Text::PreClickHandler*>(
+				activated.get());
+			if (monospace || pre) {
+				clickHandlerContext = viewerToastClickHandlerContext();
+			}
+			if (monospace) {
+				const auto context = clickHandlerContext.value<ClickHandlerContext>();
+				if (context.show) {
+					const auto handled = Ui::Integration::Instance().copyPreOnClick(
+						clickHandlerContext);
+					static_cast<void>(handled);
+				}
+			}
+			auto context = ClickContext();
+			context.button = button;
+			context.other = std::move(clickHandlerContext);
+			ActivateClickHandler(window(), activated, context);
+		}
+	} else if (preparedToggle
+		&& (button == Qt::LeftButton || button == Qt::MiddleButton)
+		&& _activateLink) {
+		clearSelection();
+		_activateLink(*preparedToggle, button);
+		return state;
+	} else if ((button == Qt::LeftButton || button == Qt::MiddleButton)
+		&& state.mediaActivation.kind != MediaActivationKind::None
+		&& _activateMedia
+		&& _activateMedia(state.mediaActivation, button)) {
+		return state;
+	}
+	if (QGuiApplication::clipboard()->supportsSelection()
+		&& !_selection.empty()) {
+		if (const auto text = getSelectedText(); !text.empty()) {
+			TextUtilities::SetClipboardText(text, QClipboard::Selection);
+		}
+	}
+	return state;
+}
+
+void MarkdownDocumentWidget::applyCursor(style::cursor cursor) {
+	if (_cursor != cursor) {
+		_cursor = cursor;
+		setCursor(_cursor);
+	}
+}
+
+double MarkdownDocumentWidget::zoomScale() const {
+	return std::max(_zoom, 1) / 100.;
+}
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/iv/markdown/iv_markdown_view_widget.h b/Telegram/SourceFiles/iv/markdown/iv_markdown_view_widget.h
new file mode 100644
index 00000000000000..f3a56e38bc49ca
--- /dev/null
+++ b/Telegram/SourceFiles/iv/markdown/iv_markdown_view_widget.h
@@ -0,0 +1,178 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "iv/markdown/iv_markdown_article.h"
+#include "iv/markdown/iv_markdown_view.h"
+
+#include "base/unique_qptr.h"
+#include "rpl/lifetime.h"
+#include "ui/click_handler.h"
+#include "ui/rp_widget.h"
+#include "ui/style/style_core_types.h"
+
+#include <functional>
+#include <memory>
+#include <optional>
+#include <vector>
+#include <QtCore/QVariant>
+
+namespace Ui {
+class ChatStyle;
+class ChatTheme;
+class PopupMenu;
+namespace Text {
+struct QuotePaintCache;
+} // namespace Text
+} // namespace Ui
+
+class QTouchEvent;
+class QWheelEvent;
+
+namespace Iv::Markdown {
+
+class MarkdownDocumentWidget final
+	: public Ui::RpWidget
+	, public ClickHandlerHost
+	, public MediaBlockHost {
+public:
+	explicit MarkdownDocumentWidget(QWidget *parent);
+	~MarkdownDocumentWidget() override;
+
+	void setLinkActivationCallback(
+		std::function<void(const PreparedLink &, Qt::MouseButton)> callback);
+	void setMediaActivationCallback(
+		std::function<bool(const MediaActivation &, Qt::MouseButton)> callback);
+	void setClickHandlerContext(
+		QVariant context,
+		std::shared_ptr<QVariant> contextRef = nullptr);
+	void setArticle(std::shared_ptr<MarkdownArticle> article);
+	void articleContentChanged();
+	void setZoom(int value);
+	void refreshPalette();
+	void invalidateRasterCache();
+	[[nodiscard]] int maxWidth() const;
+	[[nodiscard]] int anchorTop(const QString &anchorId) const;
+	[[nodiscard]] bool expandDetailsToAnchor(const QString &anchorId);
+	[[nodiscard]] bool toggleDetails(const QString &anchorId);
+	[[nodiscard]] int lastRelayoutMs() const;
+	int resizeGetHeight(int newWidth) override;
+	void requestRepaint(QRect articleRect) override;
+	void requestRelayout(QRect articleRect) override;
+	void setPlaceholderLoading(PreparedPlaceholderBlockId id);
+	void clearPlaceholderLoading(PreparedPlaceholderBlockId id);
+	void clearAllPlaceholderLoading();
+	void addPlaceholderRipple(PreparedPlaceholderBlockId id, QPoint point);
+	void stopPlaceholderRipple(PreparedPlaceholderBlockId id);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void visibleTopBottomUpdated(int visibleTop, int visibleBottom) override;
+	void keyPressEvent(QKeyEvent *e) override;
+	void contextMenuEvent(QContextMenuEvent *e) override;
+	void wheelEvent(QWheelEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void mouseDoubleClickEvent(QMouseEvent *e) override;
+	void focusOutEvent(QFocusEvent *e) override;
+	void focusInEvent(QFocusEvent *e) override;
+	bool eventHook(QEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+	void clickHandlerActiveChanged(const ClickHandlerPtr &, bool) override;
+	void clickHandlerPressedChanged(const ClickHandlerPtr &, bool) override;
+
+private:
+	enum DragAction {
+		NoDrag = 0x00,
+		PrepareDrag = 0x01,
+		Dragging = 0x02,
+		Selecting = 0x04,
+	};
+
+	[[nodiscard]] ClickHandlerPtr linkAt(QPoint point) const;
+	[[nodiscard]] MarkdownArticleHitTestResult hitTest(
+		QPoint point,
+		Ui::Text::StateRequest::Flags flags) const;
+	[[nodiscard]] MarkdownArticleSelection selectionForCopy() const;
+	[[nodiscard]] MarkdownArticleSelectionEndpoints selectionEndpointsForCopy() const;
+	[[nodiscard]] bool selectionContains(
+		MarkdownArticleSelection selection,
+		const MarkdownArticleHitTestResult &result) const;
+	[[nodiscard]] int selectionOffsetFromHit(
+		const MarkdownArticleHitTestResult &result) const;
+	[[nodiscard]] MarkdownArticleSelection selectionFromHit(
+		const MarkdownArticleHitTestResult &result) const;
+	[[nodiscard]] TextForMimeData getSelectedText() const;
+	[[nodiscard]] QVariant clickHandlerContext() const;
+	[[nodiscard]] QVariant viewerToastClickHandlerContext() const;
+	void showToast(const QString &text) const;
+	void copySelectedText();
+	void copyCodeBlock(const MarkdownArticleHitTestResult &state);
+
+	void syncArticleVisibleTopBottom();
+	void relayoutCurrentWidth(bool clearSelection);
+	void forceRelayoutCurrentWidth();
+	void updateHover(const MarkdownArticleHitTestResult &state);
+	void updateHoverAtCursor();
+	void resetSelection();
+	void clearSelection();
+	void resetTextPaintCaches();
+	[[nodiscard]] QRect articleRectToWidget(QRect articleRect) const;
+	[[nodiscard]] Ui::Text::QuotePaintCache *ensurePrePaintCache();
+	[[nodiscard]] Ui::Text::QuotePaintCache *ensureBlockquotePaintCache();
+	[[nodiscard]] MarkdownArticlePaintContext textPaintContext(QRect clip);
+	void touchEvent(QTouchEvent *e);
+	void stopPressedPlaceholderRipple();
+	void dragActionStart(QPoint point, Qt::MouseButton button);
+	MarkdownArticleHitTestResult dragActionUpdate(QPoint point);
+	MarkdownArticleHitTestResult dragActionFinish(
+		QPoint point,
+		Qt::MouseButton button);
+	void applyCursor(style::cursor cursor);
+	[[nodiscard]] double zoomScale() const;
+
+	std::shared_ptr<MarkdownArticle> _article;
+	std::shared_ptr<MarkdownArticle> _retainedArticle;
+	std::unique_ptr<Ui::ChatTheme> _theme;
+	std::unique_ptr<Ui::ChatStyle> _style;
+	std::vector<Ui::Text::SpecialColor> _highlightColors;
+	std::unique_ptr<Ui::Text::QuotePaintCache> _prePaintCache;
+	std::unique_ptr<Ui::Text::QuotePaintCache> _blockquotePaintCache;
+	rpl::lifetime _highlightReadyLifetime;
+	std::function<void(const PreparedLink &, Qt::MouseButton)> _activateLink;
+	std::function<bool(const MediaActivation &, Qt::MouseButton)> _activateMedia;
+	QVariant _clickHandlerContext;
+	std::shared_ptr<QVariant> _clickHandlerContextRef;
+	MarkdownArticleSelection _selection;
+	MarkdownArticleSelection _savedSelection;
+	MarkdownArticleSelectionEndpoints _selectionEndpoints;
+	MarkdownArticleSelectionEndpoints _savedSelectionEndpoints;
+	TextSelectType _selectionType = TextSelectType::Letters;
+	style::cursor _cursor = style::cur_default;
+	DragAction _dragAction = NoDrag;
+	QPoint _dragStartPosition;
+	int _dragSegment = -1;
+	int _dragSymbol = 0;
+	TextSelection _dragExpandedSelection;
+	std::optional<PreparedLink> _selectionClickPreparedLink;
+	PreparedPlaceholderBlockId _pressedPlaceholderId;
+	bool _dragStartHadSelection = false;
+	int _lastRelayoutMs = 0;
+	int _zoom = 100;
+	Ui::VisibleRange _visibleRange;
+	std::optional<Qt::Orientation> _horizontalScrollLock;
+	base::unique_qptr<Ui::PopupMenu> _contextMenu;
+	bool _activeHorizontalScrollDrag = false;
+	bool _articlePainted = false;
+	bool _activeTouchHorizontalScroll = false;
+	std::optional<QPoint> _pendingTouchHorizontalScrollPoint;
+
+};
+
+} // namespace Iv::Markdown
diff --git a/Telegram/SourceFiles/lang/lang_cloud_manager.cpp b/Telegram/SourceFiles/lang/lang_cloud_manager.cpp
index 5bbe85cedfb5ff..39679934c1f2e1 100644
--- a/Telegram/SourceFiles/lang/lang_cloud_manager.cpp
+++ b/Telegram/SourceFiles/lang/lang_cloud_manager.cpp
@@ -79,12 +79,12 @@ void ConfirmSwitchBox::prepare() {
 		? tr::lng_language_switch_about_official
 		: tr::lng_language_switch_about_unofficial)(
 			lt_lang_name,
-			rpl::single(Ui::Text::Bold(_name)),
+			rpl::single(tr::bold(_name)),
 			lt_percent,
-			rpl::single(Ui::Text::Bold(QString::number(_percent))),
+			rpl::single(tr::bold(QString::number(_percent))),
 			lt_link,
-			tr::lng_language_switch_link() | Ui::Text::ToLink(_editLink),
-			Ui::Text::WithEntities);
+			tr::lng_language_switch_link(tr::url(_editLink)),
+			tr::marked);
 	const auto content = Ui::CreateChild<Ui::PaddingWrap<Ui::FlatLabel>>(
 		this,
 		object_ptr<Ui::FlatLabel>(
@@ -103,7 +103,7 @@ void ConfirmSwitchBox::prepare() {
 
 	content->resizeToWidth(st::boxWideWidth);
 	content->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWideWidth, height);
 	}, lifetime());
 }
@@ -120,10 +120,10 @@ void NotReadyBox::prepare() {
 
 	auto text = tr::lng_language_not_ready_about(
 		lt_lang_name,
-		rpl::single(_name) | Ui::Text::ToWithEntities(),
+		rpl::single(tr::marked(_name)),
 		lt_link,
-		tr::lng_language_not_ready_link() | Ui::Text::ToLink(_editLink),
-		Ui::Text::WithEntities);
+		tr::lng_language_not_ready_link(tr::url(_editLink)),
+		tr::marked);
 	const auto content = Ui::CreateChild<Ui::PaddingWrap<Ui::FlatLabel>>(
 		this,
 		object_ptr<Ui::FlatLabel>(
@@ -137,7 +137,7 @@ void NotReadyBox::prepare() {
 
 	content->resizeToWidth(st::boxWidth);
 	content->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWidth, height);
 	}, lifetime());
 }
@@ -162,9 +162,9 @@ CloudManager::CloudManager(Instance &langpack)
 	Core::App().domain().activeValue(
 	) | rpl::filter([=](Main::Account *account) {
 		return (account != nullptr);
-	}) | rpl::start_with_next_done([=](Main::Account *account) {
+	}) | rpl::on_next_done([=](Main::Account *account) {
 		*mtpLifetime = account->mtpMainSessionValue(
-		) | rpl::start_with_next([=](not_null<MTP::Instance*> instance) {
+		) | rpl::on_next([=](not_null<MTP::Instance*> instance) {
 			_api.emplace(instance);
 			resendRequests();
 		});
@@ -333,7 +333,7 @@ void CloudManager::offerSwitchLangPack() {
 
 	if (!showOfferSwitchBox()) {
 		languageListChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			showOfferSwitchBox();
 		}, _lifetime);
 		requestLanguageList();
@@ -620,6 +620,62 @@ void CloudManager::changeIdAndReInitConnection(const Language &data) {
 	}
 }
 
+void CloudManager::getValueForLang(
+		const QString &key,
+		const QString &langId,
+		Fn<void(const QString &)> callback) {
+	const auto requestKey = langId + ':' + key;
+	auto &request = _getValueForLangRequests[requestKey];
+	request.callback = std::move(callback);
+	if (!_api) {
+		request.requestId = -1;
+		return;
+	}
+	_api->request(base::take(request.requestId)).cancel();
+	request.requestId = _api->request(
+		MTPlangpack_GetStrings(
+			MTP_string(Lang::CloudLangPackName()),
+			MTP_string(langId),
+			MTP_vector<MTPstring>(1, MTP_string(key))
+	)).done([=](const MTPVector<MTPLangPackString> &result) {
+		const auto it = _getValueForLangRequests.find(requestKey);
+		if (it != _getValueForLangRequests.end()) {
+			const auto onstack = it->second.callback;
+			_getValueForLangRequests.erase(it);
+			const auto values = Instance::ParseStrings(result);
+			for (const auto &[k, v] : values) {
+				onstack(v);
+				return;
+			}
+			onstack(QString());
+		}
+	}).fail([=] {
+		const auto it = _getValueForLangRequests.find(requestKey);
+		if (it != _getValueForLangRequests.end()) {
+			const auto onstack = it->second.callback;
+			_getValueForLangRequests.erase(it);
+			onstack(QString());
+		}
+	}).send();
+}
+
+void CloudManager::resendPendingValueRequests() {
+	if (!_api) {
+		return;
+	}
+	for (const auto &[requestKey, request] : _getValueForLangRequests) {
+		if (request.requestId == -1) {
+			const auto colonPos = requestKey.indexOf(':');
+			if (colonPos > 0) {
+				getValueForLang(
+					requestKey.mid(colonPos + 1),
+					requestKey.left(colonPos),
+					request.callback);
+			}
+		}
+	}
+}
+
 void CloudManager::resendRequests() {
 	if (packRequestId(Pack::Base)) {
 		requestLangPackDifference(Pack::Base);
@@ -633,6 +689,7 @@ void CloudManager::resendRequests() {
 	if (_switchingToLanguageRequest) {
 		sendSwitchingToLanguageRequest();
 	}
+	resendPendingValueRequests();
 }
 
 CloudManager &CurrentCloudManager() {
diff --git a/Telegram/SourceFiles/lang/lang_cloud_manager.h b/Telegram/SourceFiles/lang/lang_cloud_manager.h
index 4d1a100971b40e..c27438591de46d 100644
--- a/Telegram/SourceFiles/lang/lang_cloud_manager.h
+++ b/Telegram/SourceFiles/lang/lang_cloud_manager.h
@@ -48,6 +48,11 @@ class CloudManager : public base::has_weak_ptr {
 		return _suggestedLanguage;
 	}
 
+	void getValueForLang(
+		const QString &key,
+		const QString &langId,
+		Fn<void(const QString &)> callback);
+
 private:
 	mtpRequestId &packRequestId(Pack pack);
 	mtpRequestId packRequestId(Pack pack) const;
@@ -69,6 +74,7 @@ class CloudManager : public base::has_weak_ptr {
 	void changeIdAndReInitConnection(const Language &data);
 
 	void sendSwitchingToLanguageRequest();
+	void resendPendingValueRequests();
 	void resendRequests();
 
 	std::optional<MTP::Sender> _api;
@@ -90,6 +96,12 @@ class CloudManager : public base::has_weak_ptr {
 
 	mtpRequestId _getKeysForSwitchRequestId = 0;
 
+	struct ValueRequest {
+		mtpRequestId requestId = 0;
+		Fn<void(const QString &)> callback;
+	};
+	base::flat_map<QString, ValueRequest> _getValueForLangRequests;
+
 	rpl::event_stream<> _languageListChanged;
 	rpl::event_stream<> _firstLanguageSuggestion;
 
diff --git a/Telegram/SourceFiles/lang/lang_keys.cpp b/Telegram/SourceFiles/lang/lang_keys.cpp
index aa65ed81d79be5..f3269a40992592 100644
--- a/Telegram/SourceFiles/lang/lang_keys.cpp
+++ b/Telegram/SourceFiles/lang/lang_keys.cpp
@@ -110,6 +110,20 @@ QString langDayOfMonthFull(const QDate &date) {
 	});
 }
 
+QString langDayOfMonthShort(const QDate &date) {
+	auto day = date.day();
+	return langDateMaybeWithYear(date, [&](int month, int year) {
+		return QLocale().toString(date, QLocale::ShortFormat);
+	}, [day](int month, int year) {
+		return tr::lng_month_day(
+			tr::now,
+			lt_month,
+			MonthSmall(month)(tr::now),
+			lt_day,
+			QString::number(day));
+	});
+}
+
 QString langMonthOfYear(int month, int year) {
 	return (month > 0 && month <= 12)
 		? tr::lng_month_year(
@@ -149,7 +163,15 @@ QString langMonthFull(const QDate &date) {
 }
 
 QString langDayOfWeek(int index) {
-	return (index > 0 && index <= 7) ? Weekday(index)(tr::now) : u"DAY_ERR"_q;
+	return (index > 0 && index <= 7)
+		? Weekday(index)(tr::now)
+		: u"DAY_ERR"_q;
+}
+
+QString langDayOfWeekFull(int index) {
+	return (index > 0 && index <= 7)
+		? WeekdayFull(index)(tr::now)
+		: u"DAY_ERR"_q;
 }
 
 QString langDateTime(const QDateTime &date) {
@@ -247,4 +269,17 @@ tr::phrase<> Weekday(int index) {
 	Unexpected("Index in Weekday.");
 }
 
+tr::phrase<> WeekdayFull(int index) {
+	switch (index) {
+	case 1: return tr::lng_hours_monday;
+	case 2: return tr::lng_hours_tuesday;
+	case 3: return tr::lng_hours_wednesday;
+	case 4: return tr::lng_hours_thursday;
+	case 5: return tr::lng_hours_friday;
+	case 6: return tr::lng_hours_saturday;
+	case 7: return tr::lng_hours_sunday;
+	}
+	Unexpected("Index in WeekdayFull.");
+}
+
 } // namespace Lang
diff --git a/Telegram/SourceFiles/lang/lang_keys.h b/Telegram/SourceFiles/lang/lang_keys.h
index f49f4fd32c59ff..ec576b07e31367 100644
--- a/Telegram/SourceFiles/lang/lang_keys.h
+++ b/Telegram/SourceFiles/lang/lang_keys.h
@@ -15,16 +15,22 @@ For license and copyright information please follow this link:
 
 [[nodiscard]] QString langDayOfMonth(const QDate &date);
 [[nodiscard]] QString langDayOfMonthFull(const QDate &date);
+[[nodiscard]] QString langDayOfMonthShort(const QDate &date);
 [[nodiscard]] QString langMonthOfYear(int month, int year);
 [[nodiscard]] QString langMonth(const QDate &date);
 [[nodiscard]] QString langMonthOfYearFull(int month, int year);
 [[nodiscard]] QString langMonthFull(const QDate &date);
 [[nodiscard]] QString langDayOfWeek(int index);
+[[nodiscard]] QString langDayOfWeekFull(int index);
 
 [[nodiscard]] inline QString langDayOfWeek(const QDate &date) {
 	return langDayOfWeek(date.dayOfWeek());
 }
 
+[[nodiscard]] inline QString langDayOfWeekFull(const QDate &date) {
+	return langDayOfWeekFull(date.dayOfWeek());
+}
+
 [[nodiscard]] QString langDateTime(const QDateTime &date);
 [[nodiscard]] QString langDateTimeFull(const QDateTime &date);
 [[nodiscard]] bool langFirstNameGoesSecond();
@@ -41,5 +47,6 @@ namespace Lang {
 [[nodiscard]] tr::phrase<> MonthSmall(int index);
 [[nodiscard]] tr::phrase<> MonthDay(int index);
 [[nodiscard]] tr::phrase<> Weekday(int index);
+[[nodiscard]] tr::phrase<> WeekdayFull(int index);
 
 } // namespace Lang
diff --git a/Telegram/SourceFiles/lang/lang_tag.cpp b/Telegram/SourceFiles/lang/lang_tag.cpp
index 7b1a10acb3e268..5a4bd28775f8b9 100644
--- a/Telegram/SourceFiles/lang/lang_tag.cpp
+++ b/Telegram/SourceFiles/lang/lang_tag.cpp
@@ -7,11 +7,14 @@ For license and copyright information please follow this link:
 */
 #include "lang/lang_tag.h"
 
+#include "core/credits_amount.h"
 #include "lang/lang_keys.h"
 #include "ui/text/text.h"
 #include "base/qt/qt_common_adapters.h"
 #include "base/qt/qt_string_view.h"
 
+#include <QtCore/QLocale>
+
 namespace Lang {
 namespace {
 
@@ -914,7 +917,7 @@ int NonZeroPartToInt(QString value) {
 		: (value.isEmpty() ? 0 : value.toInt());
 }
 
-ShortenedCount FormatCountToShort(int64 number) {
+ShortenedCount FormatCountToShort(int64 number, bool onlyK) {
 	auto result = ShortenedCount{ number };
 	const auto abs = std::abs(number);
 	const auto shorten = [&](int64 divider, char multiplier) {
@@ -929,8 +932,11 @@ ShortenedCount FormatCountToShort(int64 number) {
 		// Update given number.
 		// E.g. 12345 will be 12000.
 		result.number = rounded * divider;
+		result.shortened = true;
 	};
-	if (abs >= 1'000'000) {
+	if (!onlyK && abs >= 1'000'000'000) {
+		shorten(1'000'000'000, 'B');
+	} else if (!onlyK && abs >= 1'000'000) {
 		shorten(1'000'000, 'M');
 	} else if (abs >= 10'000) {
 		shorten(1'000, 'K');
@@ -941,7 +947,40 @@ ShortenedCount FormatCountToShort(int64 number) {
 }
 
 QString FormatCountDecimal(int64 number) {
-	return QString("%L1").arg(number);
+	return QLocale().toString(number);
+}
+
+QString FormatExactCountDecimal(float64 number) {
+	const auto locale = QLocale();
+	if (qFuzzyCompare(number, base::SafeRound(number))) {
+		return locale.toString(int64(base::SafeRound(number)));
+	}
+
+	// Somehow using QLocale::FloatingPointShortest sometimes produces
+	// "0.8500000000000001" on some systems / locales,
+	// so I want to stick to 6 digits max (default third argument value).
+	auto result = locale.toString(number, 'f');
+	const auto zero = locale.zeroDigit();
+	while (result.endsWith(zero)) {
+		result.chop(1);
+	}
+	return result;
+}
+
+ShortenedCount FormatCreditsAmountToShort(CreditsAmount amount) {
+	const auto attempt = FormatCountToShort(amount.whole());
+	return attempt.shortened ? attempt : ShortenedCount{
+		.string = FormatCreditsAmountDecimal(amount),
+	};
+}
+
+QString FormatCreditsAmountDecimal(CreditsAmount amount) {
+	return FormatExactCountDecimal(amount.value());
+}
+
+QString FormatCreditsAmountRounded(CreditsAmount amount) {
+	const auto value = amount.value();
+	return FormatExactCountDecimal(base::SafeRound(value * 100.) / 100.);
 }
 
 PluralResult Plural(
@@ -967,14 +1006,11 @@ PluralResult Plural(
 	const auto t = f;
 
 	const auto useNonDefaultPlural = (ChoosePlural != ChoosePluralDefault)
-		&& Lang::details::IsNonDefaultPlural(keyBase);
-	const auto shift = (useNonDefaultPlural ? ChoosePlural : ChoosePluralDefault)(
-		(integer ? i : -1),
-		i,
-		v,
-		w,
-		f,
-		t);
+		&& (keyBase == kPluralKeyBaseForCloudValue
+			|| Lang::details::IsNonDefaultPlural(keyBase));
+	const auto shift = (useNonDefaultPlural
+		? ChoosePlural
+		: ChoosePluralDefault)((integer ? i : -1), i, v, w, f, t);
 	if (integer) {
 		const auto round = qRound(value);
 		if (type == lt_count_short) {
diff --git a/Telegram/SourceFiles/lang/lang_tag.h b/Telegram/SourceFiles/lang/lang_tag.h
index 297ae1ff2e1fa8..74088d960271f3 100644
--- a/Telegram/SourceFiles/lang/lang_tag.h
+++ b/Telegram/SourceFiles/lang/lang_tag.h
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+class CreditsAmount;
+
 enum lngtag_count : int;
 
 namespace Lang {
@@ -22,14 +24,23 @@ constexpr auto kTagReplacementSize = 4;
 struct ShortenedCount {
 	int64 number = 0;
 	QString string;
+	bool shortened = false;
 };
-[[nodiscard]] ShortenedCount FormatCountToShort(int64 number);
+[[nodiscard]] ShortenedCount FormatCountToShort(
+	int64 number,
+	bool onlyK = false);
 [[nodiscard]] QString FormatCountDecimal(int64 number);
+[[nodiscard]] QString FormatExactCountDecimal(float64 number);
+[[nodiscard]] ShortenedCount FormatCreditsAmountToShort(
+	CreditsAmount amount);
+[[nodiscard]] QString FormatCreditsAmountDecimal(CreditsAmount amount);
+[[nodiscard]] QString FormatCreditsAmountRounded(CreditsAmount amount);
 
 struct PluralResult {
 	int keyShift = 0;
 	QString replacement;
 };
+inline constexpr auto kPluralKeyBaseForCloudValue = ushort(-1);
 PluralResult Plural(
 	ushort keyBase,
 	float64 value,
diff --git a/Telegram/SourceFiles/lang/lang_text_entity.h b/Telegram/SourceFiles/lang/lang_text_entity.h
index b1204ba1e9d2b2..6c69645f7c2c93 100644
--- a/Telegram/SourceFiles/lang/lang_text_entity.h
+++ b/Telegram/SourceFiles/lang/lang_text_entity.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "ui/text/text_entity.h"
+#include "ui/text/text_utilities.h"
 
 namespace Lang {
 
@@ -32,3 +33,193 @@ struct ReplaceTag<TextWithEntities> {
 };
 
 } // namespace Lang
+
+namespace tr {
+namespace details {
+
+struct UpperProjection {
+	[[nodiscard]] QString operator()(const QString &value) const {
+		return value.toUpper();
+	}
+	[[nodiscard]] QString operator()(QString &&value) const {
+		return std::move(value).toUpper();
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			const TextWithEntities &value) const {
+		return { value.text.toUpper(), value.entities };
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			TextWithEntities &&value) const {
+		return {
+			std::move(value.text).toUpper(),
+			std::move(value.entities) };
+	}
+};
+
+struct MarkedProjection {
+	[[nodiscard]] TextWithEntities operator()() const {
+		return {};
+	}
+	[[nodiscard]] TextWithEntities operator()(const QString &value) const {
+		return TextWithEntities{ value };
+	}
+	[[nodiscard]] TextWithEntities operator()(QString &&value) const {
+		return TextWithEntities{ std::move(value) };
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			const TextWithEntities &value) const {
+		return value;
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			TextWithEntities &&value) const {
+		return std::move(value);
+	}
+};
+
+struct RichProjection {
+	[[nodiscard]] TextWithEntities operator()(const QString &value) const {
+		return Ui::Text::RichLangValue(value);
+	}
+};
+
+struct BoldProjection {
+	[[nodiscard]] TextWithEntities operator()(const QString &value) const {
+		return Ui::Text::Bold(value);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			const TextWithEntities &value) const {
+		return Ui::Text::Wrapped(value, EntityType::Bold);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			TextWithEntities &&value) const {
+		return Ui::Text::Wrapped(std::move(value), EntityType::Bold);
+	}
+};
+
+struct SemiboldProjection {
+	[[nodiscard]] TextWithEntities operator()(const QString &value) const {
+		return Ui::Text::Semibold(value);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			const TextWithEntities &value) const {
+		return Ui::Text::Wrapped(value, EntityType::Semibold);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			TextWithEntities &&value) const {
+		return Ui::Text::Wrapped(std::move(value), EntityType::Semibold);
+	}
+};
+
+struct ItalicProjection {
+	[[nodiscard]] TextWithEntities operator()(const QString &value) const {
+		return Ui::Text::Italic(value);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			const TextWithEntities &value) const {
+		return Ui::Text::Wrapped(value, EntityType::Italic);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			TextWithEntities &&value) const {
+		return Ui::Text::Wrapped(std::move(value), EntityType::Italic);
+	}
+};
+
+struct UnderlineProjection {
+	[[nodiscard]] TextWithEntities operator()(const QString &value) const {
+		return Ui::Text::Underline(value);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			const TextWithEntities &value) const {
+		return Ui::Text::Wrapped(value, EntityType::Underline);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			TextWithEntities &&value) const {
+		return Ui::Text::Wrapped(std::move(value), EntityType::Underline);
+	}
+};
+
+struct StrikeOutProjection {
+	[[nodiscard]] TextWithEntities operator()(const QString &value) const {
+		return Ui::Text::StrikeOut(value);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			const TextWithEntities &value) const {
+		return Ui::Text::Wrapped(value, EntityType::StrikeOut);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			TextWithEntities &&value) const {
+		return Ui::Text::Wrapped(std::move(value), EntityType::StrikeOut);
+	}
+};
+
+struct LinkProjection {
+	[[nodiscard]] TextWithEntities operator()(const QString &value) const {
+		return Ui::Text::Link(value);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			const QString &value,
+			const QString &url) const {
+		return Ui::Text::Link(value, url);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			const QString &value,
+			int index) const {
+		return Ui::Text::Link(value, index);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			const TextWithEntities &value) const {
+		return Ui::Text::Link(value);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			const TextWithEntities &value,
+			const QString &url) const {
+		return Ui::Text::Link(value, url);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			const TextWithEntities &value,
+			int index) const {
+		return Ui::Text::Link(value, index);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			TextWithEntities &&value) const {
+		return Ui::Text::Link(std::move(value));
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			TextWithEntities &&value,
+			const QString &url) const {
+		return Ui::Text::Link(std::move(value), url);
+	}
+	[[nodiscard]] TextWithEntities operator()(
+			TextWithEntities &&value,
+			int index) const {
+		return Ui::Text::Link(std::move(value), index);
+	}
+};
+
+struct UrlProjection {
+	[[nodiscard]] auto operator()(const QString &url) const {
+		return [url](auto &&text) {
+			return Ui::Text::Link(std::forward<decltype(text)>(text), url);
+		};
+	}
+	[[nodiscard]] auto operator()(int index) const {
+		return [index](auto &&text) {
+			return Ui::Text::Link(std::forward<decltype(text)>(text), index);
+		};
+	}
+};
+
+} // namespace details
+
+inline constexpr details::UpperProjection upper{};
+inline constexpr details::MarkedProjection marked{};
+inline constexpr details::RichProjection rich{};
+inline constexpr details::BoldProjection bold{};
+inline constexpr details::SemiboldProjection semibold{};
+inline constexpr details::ItalicProjection italic{};
+inline constexpr details::UnderlineProjection underline{};
+inline constexpr details::StrikeOutProjection strikeout{};
+inline constexpr details::LinkProjection link{};
+inline constexpr details::UrlProjection url{};
+
+} // namespace tr
diff --git a/Telegram/SourceFiles/lang/translate_mtproto_provider.cpp b/Telegram/SourceFiles/lang/translate_mtproto_provider.cpp
new file mode 100644
index 00000000000000..32fc122ca1eb0e
--- /dev/null
+++ b/Telegram/SourceFiles/lang/translate_mtproto_provider.cpp
@@ -0,0 +1,167 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "lang/translate_mtproto_provider.h"
+
+#include "api/api_text_entities.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+#include "mtproto/sender.h"
+#include "spellcheck/platform/platform_language.h"
+
+namespace Ui {
+namespace {
+
+class MTProtoTranslateProvider final : public TranslateProvider {
+public:
+	explicit MTProtoTranslateProvider(not_null<Main::Session*> session)
+	: _session(session)
+	, _api(&session->mtp()) {
+	}
+
+	[[nodiscard]] bool supportsMessageId() const override {
+		return true;
+	}
+
+	void request(
+			TranslateProviderRequest request,
+			LanguageId to,
+			Fn<void(TranslateProviderResult)> done) override {
+		requestBatch(
+			{ std::move(request) },
+			to,
+			[done = std::move(done)](
+					int,
+					TranslateProviderResult result) {
+				done(std::move(result));
+			},
+			[] {});
+	}
+
+	void requestBatch(
+			std::vector<TranslateProviderRequest> requests,
+			const LanguageId &to,
+			Fn<void(int, TranslateProviderResult)> doneOne,
+			Fn<void()> doneAll) override {
+		using Flag = MTPmessages_TranslateText::Flag;
+		if (requests.empty()) {
+			doneAll();
+			return;
+		}
+
+		const auto failAll = [=] {
+			for (auto i = 0; i != requests.size(); ++i) {
+				doneOne(i, TranslateProviderResult{
+					.error = TranslateProviderError::Unknown,
+				});
+			}
+			doneAll();
+		};
+		const auto doneFromList = [=, session = _session](
+				const QVector<MTPTextWithEntities> &list) {
+			for (auto i = 0; i != requests.size(); ++i) {
+				doneOne(
+					i,
+					(i < list.size())
+						? TranslateProviderResult{
+							.text = Api::ParseTextWithEntities(
+								session,
+								list[i]),
+						}
+						: TranslateProviderResult{
+							.error = TranslateProviderError::Unknown,
+						});
+			}
+			doneAll();
+		};
+
+		const auto firstPeer = PeerId(requests.front().peerId);
+		const auto allWithIds = ranges::all_of(
+			requests,
+			[&](const TranslateProviderRequest &request) {
+				return (PeerId(request.peerId) == firstPeer)
+					&& (request.msgId != 0);
+			});
+		if (allWithIds) {
+			const auto peer = _session->data().peerLoaded(firstPeer);
+			if (!peer) {
+				failAll();
+				return;
+			}
+			auto ids = QVector<MTPint>();
+			ids.reserve(requests.size());
+			for (const auto &request : requests) {
+				ids.push_back(MTP_int(MsgId(request.msgId)));
+			}
+			_api.request(MTPmessages_TranslateText(
+				MTP_flags(Flag::f_peer | Flag::f_id),
+				peer->input(),
+				MTP_vector<MTPint>(ids),
+				MTPVector<MTPTextWithEntities>(),
+				MTP_string(to.twoLetterCode()),
+				MTPstring() // tone
+			)).done([=](const MTPmessages_TranslatedText &result) {
+				doneFromList(result.data().vresult().v);
+			}).fail([=](const MTP::Error &) {
+				failAll();
+			}).send();
+			return;
+		}
+
+		const auto allWithText = ranges::all_of(
+			requests,
+			[](const TranslateProviderRequest &request) {
+				return !request.text.text.isEmpty();
+			});
+		if (!allWithText) {
+			TranslateProvider::requestBatch(
+				std::move(requests),
+				to,
+				std::move(doneOne),
+				std::move(doneAll));
+			return;
+		}
+
+		auto text = QVector<MTPTextWithEntities>();
+		text.reserve(requests.size());
+		for (const auto &request : requests) {
+			text.push_back(MTP_textWithEntities(
+				MTP_string(request.text.text),
+				Api::EntitiesToMTP(
+					_session,
+					request.text.entities,
+					Api::ConvertOption::SkipLocal)));
+		}
+		_api.request(MTPmessages_TranslateText(
+			MTP_flags(Flag::f_text),
+			MTP_inputPeerEmpty(),
+			MTPVector<MTPint>(),
+			MTP_vector<MTPTextWithEntities>(text),
+			MTP_string(to.twoLetterCode()),
+			MTPstring() // tone
+		)).done([=](const MTPmessages_TranslatedText &result) {
+			doneFromList(result.data().vresult().v);
+		}).fail([=](const MTP::Error &) {
+			failAll();
+		}).send();
+	}
+
+private:
+	const not_null<Main::Session*> _session;
+	MTP::Sender _api;
+
+};
+
+} // namespace
+
+std::unique_ptr<TranslateProvider> CreateMTProtoTranslateProvider(
+		not_null<Main::Session*> session) {
+	return std::make_unique<MTProtoTranslateProvider>(session);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/lang/translate_mtproto_provider.h b/Telegram/SourceFiles/lang/translate_mtproto_provider.h
new file mode 100644
index 00000000000000..9121450ecc4b62
--- /dev/null
+++ b/Telegram/SourceFiles/lang/translate_mtproto_provider.h
@@ -0,0 +1,21 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "translate_provider.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+
+[[nodiscard]] std::unique_ptr<TranslateProvider> CreateMTProtoTranslateProvider(
+	not_null<Main::Session*> session);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/lang/translate_provider.cpp b/Telegram/SourceFiles/lang/translate_provider.cpp
new file mode 100644
index 00000000000000..ff6e43e1ecdf39
--- /dev/null
+++ b/Telegram/SourceFiles/lang/translate_provider.cpp
@@ -0,0 +1,70 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "lang/translate_provider.h"
+
+#include "base/options.h"
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "data/data_msg_id.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "history/history_item.h"
+#include "lang/translate_mtproto_provider.h"
+#include "lang/translate_url_provider.h"
+#include "platform/platform_translate_provider.h"
+
+namespace {
+
+base::options::option<QString> OptionTranslateUrlTemplate({
+	.id = "translate-url-template",
+	.name = "Translate URL template",
+	.description = "Template URL for custom translation provider."
+		" Supports %q text, %f source language and %t target language.",
+});
+
+} // namespace
+
+namespace Ui {
+
+std::unique_ptr<TranslateProvider> CreateTranslateProvider(
+		not_null<Main::Session*> session) {
+	const auto urlTemplate = OptionTranslateUrlTemplate.value();
+	if (!urlTemplate.isEmpty()
+		&& urlTemplate.contains(u"%q"_q)) {
+		return CreateUrlTranslateProvider(urlTemplate);
+	}
+	if (Core::App().settings().usePlatformTranslation()
+		&& Platform::IsTranslateProviderAvailable()) {
+		return Platform::CreateTranslateProvider();
+	}
+	return CreateMTProtoTranslateProvider(session);
+}
+
+TranslateProviderRequest PrepareTranslateProviderRequest(
+		not_null<TranslateProvider*> provider,
+		not_null<PeerData*> peer,
+		MsgId msgId,
+		TextWithEntities text) {
+	auto result = TranslateProviderRequest{
+		.peerId = uint64(peer->id.value),
+		.msgId = IsServerMsgId(msgId) ? msgId.bare : 0,
+		.text = std::move(text),
+	};
+	if (provider->supportsMessageId()) {
+		return result;
+	}
+	if (result.msgId) {
+		if (const auto i = peer->owner().message(peer, MsgId(result.msgId))) {
+			result.text = i->originalText();
+		}
+		result.msgId = 0;
+	}
+	return result;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/lang/translate_provider.h b/Telegram/SourceFiles/lang/translate_provider.h
new file mode 100644
index 00000000000000..e420c260af1492
--- /dev/null
+++ b/Telegram/SourceFiles/lang/translate_provider.h
@@ -0,0 +1,30 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include <translate_provider.h>
+
+class PeerData;
+struct MsgId;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+
+[[nodiscard]] std::unique_ptr<TranslateProvider> CreateTranslateProvider(
+	not_null<Main::Session*> session);
+
+[[nodiscard]] TranslateProviderRequest PrepareTranslateProviderRequest(
+	not_null<TranslateProvider*> provider,
+	not_null<PeerData*> peer,
+	MsgId msgId,
+	TextWithEntities text);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/lang/translate_url_provider.cpp b/Telegram/SourceFiles/lang/translate_url_provider.cpp
new file mode 100644
index 00000000000000..d9c5bb00d4d61f
--- /dev/null
+++ b/Telegram/SourceFiles/lang/translate_url_provider.cpp
@@ -0,0 +1,249 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "lang/translate_url_provider.h"
+
+#include "spellcheck/platform/platform_language.h"
+#include "ui/text/text_html_tags.h"
+
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonParseError>
+#include <QtCore/QUrl>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QNetworkRequest>
+
+namespace Ui {
+namespace {
+
+[[nodiscard]] bool SkipJsonKey(const QString &key) {
+	return (key.compare(u"code"_q, Qt::CaseInsensitive) == 0);
+}
+
+[[nodiscard]] QString DetectFromLanguage(const QString &text) {
+#ifndef TDESKTOP_DISABLE_SPELLCHECK
+	const auto result = Platform::Language::Recognize(text);
+	return result.known() ? result.twoLetterCode() : u"auto"_q;
+#else // TDESKTOP_DISABLE_SPELLCHECK
+	return u"auto"_q;
+#endif // !TDESKTOP_DISABLE_SPELLCHECK
+}
+
+[[nodiscard]] QString JsonValueToText(const QJsonValue &v) {
+	switch (v.type()) {
+	case QJsonValue::Null: return u"null"_q;
+	case QJsonValue::Bool: return v.toBool()
+		? u"true"_q
+		: u"false"_q;
+	case QJsonValue::Double: return QString::number(v.toDouble(), 'g', 15);
+	case QJsonValue::String: return v.toString().trimmed();
+	case QJsonValue::Array: return QString::fromUtf8(
+		QJsonDocument(v.toArray()).toJson(QJsonDocument::Compact));
+	case QJsonValue::Object: return QString::fromUtf8(
+		QJsonDocument(v.toObject()).toJson(QJsonDocument::Compact));
+	case QJsonValue::Undefined: return QString();
+	}
+	return QString();
+}
+
+[[nodiscard]] std::optional<QString> ParseSegmentedArrayResponse(
+		const QJsonDocument &parsed) {
+	if (!parsed.isArray()) {
+		return std::nullopt;
+	}
+	const auto root = parsed.array();
+	if (root.isEmpty() || !root[0].isArray()) {
+		return std::nullopt;
+	}
+	const auto segments = root[0].toArray();
+	auto translated = QString();
+	for (const auto &segmentValue : segments) {
+		if (!segmentValue.isArray()) {
+			return std::nullopt;
+		}
+		const auto segment = segmentValue.toArray();
+		if (segment.isEmpty()) {
+			return std::nullopt;
+		}
+		if (!segment[0].isString()) {
+			return std::nullopt;
+		}
+		translated += segment[0].toString();
+	}
+	if (translated.trimmed().isEmpty()) {
+		return std::nullopt;
+	}
+	return translated;
+}
+
+struct JsonLine {
+	QString name;
+	QString value;
+	int length = 0;
+};
+
+void CollectJsonLines(
+		const QString &name,
+		const QJsonValue &value,
+		std::vector<JsonLine> &lines) {
+	if (value.isObject()) {
+		const auto object = value.toObject();
+		for (auto i = object.constBegin(); i != object.constEnd(); ++i) {
+			if (SkipJsonKey(i.key())) {
+				continue;
+			}
+			CollectJsonLines(
+				name.isEmpty() ? i.key() : (name + '.' + i.key()),
+				i.value(),
+				lines);
+		}
+		return;
+	}
+	if (value.isArray()) {
+		const auto array = value.toArray();
+		for (auto i = 0; i != array.size(); ++i) {
+			CollectJsonLines(
+				u"%1[%2]"_q.arg(name).arg(i),
+				array.at(i),
+				lines);
+		}
+		return;
+	}
+	const auto text = JsonValueToText(value);
+	if (text.isEmpty()) {
+		return;
+	}
+	lines.push_back(JsonLine{
+		.name = name,
+		.value = text,
+		.length = int(text.size()),
+	});
+}
+
+[[nodiscard]] std::optional<QString> FormatJsonResponse(
+		const QByteArray &body) {
+	auto error = QJsonParseError();
+	const auto parsed = QJsonDocument::fromJson(body, &error);
+	if (error.error != QJsonParseError::NoError) {
+		return std::nullopt;
+	}
+	if (const auto parsedArray = ParseSegmentedArrayResponse(parsed)) {
+		return parsedArray;
+	}
+	auto lines = std::vector<JsonLine>();
+	if (parsed.isObject()) {
+		const auto object = parsed.object();
+		for (auto i = object.constBegin(); i != object.constEnd(); ++i) {
+			if (SkipJsonKey(i.key())) {
+				continue;
+			}
+			CollectJsonLines(i.key(), i.value(), lines);
+		}
+	} else if (parsed.isArray()) {
+		const auto array = parsed.array();
+		for (auto i = 0; i != array.size(); ++i) {
+			CollectJsonLines(u"[%1]"_q.arg(i), array.at(i), lines);
+		}
+	}
+	if (lines.empty()) {
+		return QString::fromUtf8(body);
+	}
+	ranges::sort(lines, [](const JsonLine &a, const JsonLine &b) {
+		return (a.length != b.length)
+			? (a.length > b.length)
+			: (a.name < b.name);
+	});
+	auto result = QString();
+	result.reserve(lines.size() * 16);
+	for (auto i = 0; i != int(lines.size()); ++i) {
+		const auto &line = lines[i];
+		if (!line.name.isEmpty()) {
+			result += line.name;
+			result += '\n';
+		}
+		result += line.value;
+		if (i + 1 != int(lines.size())) {
+			result += "\n\n";
+		}
+	}
+	return result;
+}
+
+class UrlTranslateProvider final : public TranslateProvider {
+public:
+	explicit UrlTranslateProvider(QString urlTemplate)
+	: _urlTemplate(std::move(urlTemplate)) {
+	}
+
+	[[nodiscard]] bool supportsMessageId() const override {
+		return false;
+	}
+
+	void request(
+			TranslateProviderRequest request,
+			LanguageId to,
+			Fn<void(TranslateProviderResult)> done) override {
+		if (request.text.text.isEmpty()) {
+			done(TranslateProviderResult{
+				.error = TranslateProviderError::Unknown,
+			});
+			return;
+		}
+		auto url = _urlTemplate;
+		const auto from = DetectFromLanguage(request.text.text);
+		const auto toCode = to.twoLetterCode();
+		url.replace(
+			u"%q"_q,
+			QString::fromLatin1(
+				QUrl::toPercentEncoding(
+					TextUtilities::EscapeForHtml(request.text.text))));
+		url.replace(
+			u"%f"_q,
+			QString::fromLatin1(QUrl::toPercentEncoding(from)));
+		url.replace(
+			u"%t"_q,
+			QString::fromLatin1(QUrl::toPercentEncoding(toCode)));
+		const auto requestUrl = QUrl(url);
+		if (!requestUrl.isValid()) {
+			done(TranslateProviderResult{
+				.error = TranslateProviderError::Unknown,
+			});
+			return;
+		}
+		auto networkRequest = QNetworkRequest(requestUrl);
+		const auto reply = _network.get(networkRequest);
+		QObject::connect(reply, &QNetworkReply::finished, [=] {
+			auto result = TranslateProviderResult();
+			if (reply->error() != QNetworkReply::NoError) {
+				result.error = TranslateProviderError::Unknown;
+			} else {
+				const auto body = reply->readAll();
+				const auto formatted = FormatJsonResponse(body).value_or(
+					QString::fromUtf8(body));
+				result.text = TextWithEntities{ formatted };
+			}
+			done(std::move(result));
+			reply->deleteLater();
+		});
+	}
+
+private:
+	const QString _urlTemplate;
+	QNetworkAccessManager _network;
+
+};
+
+} // namespace
+
+std::unique_ptr<TranslateProvider> CreateUrlTranslateProvider(
+		QString urlTemplate) {
+	return std::make_unique<UrlTranslateProvider>(std::move(urlTemplate));
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/lang/translate_url_provider.h b/Telegram/SourceFiles/lang/translate_url_provider.h
new file mode 100644
index 00000000000000..8bb1efbb03c662
--- /dev/null
+++ b/Telegram/SourceFiles/lang/translate_url_provider.h
@@ -0,0 +1,17 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "translate_provider.h"
+
+namespace Ui {
+
+[[nodiscard]] std::unique_ptr<TranslateProvider> CreateUrlTranslateProvider(
+	QString urlTemplate);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/layout/abstract_layout_item.cpp b/Telegram/SourceFiles/layout/abstract_layout_item.cpp
index d83f0a71212d54..4961a513f53045 100644
--- a/Telegram/SourceFiles/layout/abstract_layout_item.cpp
+++ b/Telegram/SourceFiles/layout/abstract_layout_item.cpp
@@ -37,6 +37,18 @@ int AbstractLayoutItem::position() const {
 	return _position;
 }
 
+void AbstractLayoutItem::setShiftX(int x) {
+	_shiftX = x;
+}
+
+void AbstractLayoutItem::setShiftY(int y) {
+	_shiftY = y;
+}
+
+QPoint AbstractLayoutItem::shift() const {
+	return { _shiftX, _shiftY };
+}
+
 bool AbstractLayoutItem::hasPoint(QPoint point) const {
 	return QRect(0, 0, width(), height()).contains(point);
 }
diff --git a/Telegram/SourceFiles/layout/abstract_layout_item.h b/Telegram/SourceFiles/layout/abstract_layout_item.h
index d50b619ccf4733..99bd0b4ccdbd8e 100644
--- a/Telegram/SourceFiles/layout/abstract_layout_item.h
+++ b/Telegram/SourceFiles/layout/abstract_layout_item.h
@@ -41,6 +41,10 @@ class AbstractLayoutItem
 	virtual void setPosition(int position);
 	[[nodiscard]] int position() const;
 
+	void setShiftX(int x);
+	void setShiftY(int y);
+	[[nodiscard]] QPoint shift() const;
+
 	[[nodiscard]] bool hasPoint(QPoint point) const;
 
 	virtual ~AbstractLayoutItem();
@@ -51,5 +55,7 @@ class AbstractLayoutItem
 	int _maxw = 0;
 	int _minh = 0;
 	int _position = 0; // < 0 means removed from layout
+	int _shiftX = 0;
+	int _shiftY = 0;
 
 };
diff --git a/Telegram/SourceFiles/layout/layout_document_generic_preview.cpp b/Telegram/SourceFiles/layout/layout_document_generic_preview.cpp
index a0a92850e8b811..feb86a51b1ec61 100644
--- a/Telegram/SourceFiles/layout/layout_document_generic_preview.cpp
+++ b/Telegram/SourceFiles/layout/layout_document_generic_preview.cpp
@@ -12,47 +12,29 @@ For license and copyright information please follow this link:
 #include "styles/style_media_view.h"
 
 namespace Layout {
+namespace {
 
-const style::icon *DocumentGenericPreview::icon() const {
-	switch (index) {
-	case 0: return &st::mediaviewFileBlue;
-	case 1: return &st::mediaviewFileGreen;
-	case 2: return &st::mediaviewFileRed;
-	case 3: return &st::mediaviewFileYellow;
-	}
-	Unexpected("Color index in DocumentGenericPreview::icon.");
-}
-
-DocumentGenericPreview DocumentGenericPreview::Create(
-		DocumentData *document) {
-	auto colorIndex = 0;
-
-	const auto name = (document
-		? (document->filename().isEmpty()
-			? (document->sticker()
-				? tr::lng_in_dlg_sticker(tr::now)
-				: u"Unknown File"_q)
-			: document->filename())
-		: tr::lng_message_empty(tr::now)).toLower();
-	auto lastDot = name.lastIndexOf('.');
-	const auto mime = document ? document->mimeString() : QString();
+[[nodiscard]] int ColorIndexForName(
+		const QString &name,
+		const QString &mime = QString()) {
+	const auto lastDot = name.lastIndexOf('.');
 	if (name.endsWith(u".doc"_q) ||
 		name.endsWith(u".docx"_q) ||
 		name.endsWith(u".txt"_q) ||
 		name.endsWith(u".psd"_q) ||
 		mime.startsWith(u"text/"_q)) {
-		colorIndex = 0;
+		return 0;
 	} else if (
 		name.endsWith(u".xls"_q) ||
 		name.endsWith(u".xlsx"_q) ||
 		name.endsWith(u".csv"_q)) {
-		colorIndex = 1;
+		return 1;
 	} else if (
 		name.endsWith(u".pdf"_q) ||
 		name.endsWith(u".ppt"_q) ||
 		name.endsWith(u".pptx"_q) ||
 		name.endsWith(u".key"_q)) {
-		colorIndex = 2;
+		return 2;
 	} else if (
 		name.endsWith(u".zip"_q) ||
 		name.endsWith(u".rar"_q) ||
@@ -60,22 +42,19 @@ DocumentGenericPreview DocumentGenericPreview::Create(
 		name.endsWith(u".mp3"_q) ||
 		name.endsWith(u".mov"_q) ||
 		name.endsWith(u".avi"_q)) {
-		colorIndex = 3;
-	} else {
-		auto ch = (lastDot >= 0 && lastDot + 1 < name.size())
-			? name.at(lastDot + 1)
-			: (name.isEmpty()
-				? (mime.isEmpty() ? '0' : mime.at(0))
-				: name.at(0));
-		colorIndex = (ch.unicode() % 4) & 3;
+		return 3;
 	}
+	const auto ch = (lastDot >= 0 && lastDot + 1 < name.size())
+		? name.at(lastDot + 1)
+		: (name.isEmpty()
+			? (mime.isEmpty() ? QChar('0') : mime.at(0))
+			: name.at(0));
+	return (ch.unicode() % 4) & 3;
+}
 
-	const auto ext = document
-		? ((lastDot < 0 || lastDot + 2 > name.size())
-			? name
-			: name.mid(lastDot + 1))
-		: QString();
-
+[[nodiscard]] DocumentGenericPreview BuildFromColorIndex(
+		int colorIndex,
+		const QString &ext) {
 	switch (colorIndex) {
 	case 0: return {
 		.index = colorIndex,
@@ -110,7 +89,52 @@ DocumentGenericPreview DocumentGenericPreview::Create(
 		.ext = ext,
 	};
 	}
-	Unexpected("Color index in CreateDocumentGenericPreview.");
+	Unexpected("Color index in BuildFromColorIndex.");
+}
+
+} // namespace
+
+const style::icon *DocumentGenericPreview::icon() const {
+	switch (index) {
+	case 0: return &st::mediaviewFileBlue;
+	case 1: return &st::mediaviewFileGreen;
+	case 2: return &st::mediaviewFileRed;
+	case 3: return &st::mediaviewFileYellow;
+	}
+	Unexpected("Color index in DocumentGenericPreview::icon.");
+}
+
+DocumentGenericPreview DocumentGenericPreview::Create(
+		DocumentData *document) {
+	const auto name = (document
+		? (document->filename().isEmpty()
+			? (document->sticker()
+				? tr::lng_in_dlg_sticker(tr::now)
+				: u"Unknown File"_q)
+			: document->filename())
+		: tr::lng_message_empty(tr::now)).toLower();
+	const auto mime = document ? document->mimeString() : QString();
+	const auto colorIndex = ColorIndexForName(name, mime);
+	const auto lastDot = name.lastIndexOf('.');
+	const auto ext = document
+		? ((lastDot < 0 || lastDot + 2 > name.size())
+			? name
+			: name.mid(lastDot + 1))
+		: QString();
+
+	return BuildFromColorIndex(colorIndex, ext);
+}
+
+DocumentGenericPreview DocumentGenericPreview::Create(
+		const QString &filename) {
+	const auto name = filename.toLower();
+	const auto colorIndex = ColorIndexForName(name);
+	const auto lastDot = name.lastIndexOf('.');
+	const auto ext = (lastDot < 0 || lastDot + 2 > name.size())
+		? name
+		: name.mid(lastDot + 1);
+
+	return BuildFromColorIndex(colorIndex, ext);
 }
 
 // Ui::CachedRoundCorners DocumentCorners(int32 colorIndex) {
diff --git a/Telegram/SourceFiles/layout/layout_document_generic_preview.h b/Telegram/SourceFiles/layout/layout_document_generic_preview.h
index a75cb011e76c90..46d5e43d308d0d 100644
--- a/Telegram/SourceFiles/layout/layout_document_generic_preview.h
+++ b/Telegram/SourceFiles/layout/layout_document_generic_preview.h
@@ -11,6 +11,7 @@ namespace Layout {
 
 struct DocumentGenericPreview final {
 	static DocumentGenericPreview Create(DocumentData *document);
+	static DocumentGenericPreview Create(const QString &filename);
 	const style::icon *icon() const;
 	const int index;
 	const style::color &color;
diff --git a/Telegram/SourceFiles/layout/layout_selection.cpp b/Telegram/SourceFiles/layout/layout_selection.cpp
index 32f48b20fb91fb..52d0b3f099e57c 100644
--- a/Telegram/SourceFiles/layout/layout_selection.cpp
+++ b/Telegram/SourceFiles/layout/layout_selection.cpp
@@ -14,15 +14,27 @@ bool IsSubGroupSelection(TextSelection selection) {
 bool IsGroupItemSelection(
 		TextSelection selection,
 		int index) {
-	Expects(index >= 0 && index < 0x0F);
+	Expects(index >= 0 && index < kMaxGroupSelectionItems);
 
 	return IsSubGroupSelection(selection) && (selection.to & (1 << index));
 }
 
+int FirstGroupItemIndex(TextSelection selection) {
+	if (!IsSubGroupSelection(selection)) {
+		return -1;
+	}
+	for (auto i = 0; i != kMaxGroupSelectionItems; ++i) {
+		if (selection.to & (1 << i)) {
+			return i;
+		}
+	}
+	return -1;
+}
+
 TextSelection AddGroupItemSelection(
 		TextSelection selection,
 		int index) {
-	Expects(index >= 0 && index < 0x0F);
+	Expects(index >= 0 && index < kMaxGroupSelectionItems);
 
 	const auto bit = uint16(1U << index);
 	return TextSelection(
@@ -33,7 +45,7 @@ TextSelection AddGroupItemSelection(
 TextSelection RemoveGroupItemSelection(
 		TextSelection selection,
 		int index) {
-	Expects(index >= 0 && index < 0x0F);
+	Expects(index >= 0 && index < kMaxGroupSelectionItems);
 
 	const auto bit = uint16(1U << index);
 	return IsSubGroupSelection(selection)
diff --git a/Telegram/SourceFiles/layout/layout_selection.h b/Telegram/SourceFiles/layout/layout_selection.h
index 726fc19c529e57..3a7be49fcaa220 100644
--- a/Telegram/SourceFiles/layout/layout_selection.h
+++ b/Telegram/SourceFiles/layout/layout_selection.h
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "ui/text/text.h"
 
 constexpr auto FullSelection = TextSelection { 0xFFFF, 0xFFFF };
+constexpr auto kMaxGroupSelectionItems = 0x0F;
 
 [[nodiscard]] bool IsSubGroupSelection(TextSelection selection);
 
@@ -17,6 +18,8 @@ constexpr auto FullSelection = TextSelection { 0xFFFF, 0xFFFF };
 		TextSelection selection,
 		int index);
 
+[[nodiscard]] int FirstGroupItemIndex(TextSelection selection);
+
 [[nodiscard]] TextSelection AddGroupItemSelection(
 		TextSelection selection,
 		int index);
diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp
index 9a04542efae607..451ee22c87d5dd 100644
--- a/Telegram/SourceFiles/logs.cpp
+++ b/Telegram/SourceFiles/logs.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "platform/platform_specific.h"
 #include "core/crash_reports.h"
 #include "core/launcher.h"
+#include "core/version.h"
 #include "mtproto/facade.h"
 
 namespace {
@@ -32,7 +33,6 @@ class WritingEntryScope final {
 enum LogDataType {
 	LogDataMain,
 	LogDataDebug,
-	LogDataTcp,
 	LogDataMtp,
 
 	LogDataCount
@@ -54,7 +54,6 @@ QString _logsFilePath(LogDataType type, const QString &postfix = QString()) {
 	switch (type) {
 	case LogDataMain: path += u"log"_q + postfix + u".txt"_q; break;
 	case LogDataDebug: path += u"DebugLogs/log"_q + postfix + u".txt"_q; break;
-	case LogDataTcp: path += u"DebugLogs/tcp"_q + postfix + u".txt"_q; break;
 	case LogDataMtp: path += u"DebugLogs/mtp"_q + postfix + u".txt"_q; break;
 	}
 	return path;
@@ -146,36 +145,48 @@ class LogsDataFields {
 			if (postfix.isEmpty()) { // instance checked, need to move to log.txt
 				Assert(!files[type]->fileName().isEmpty()); // one of log_startXX.txt should've been opened already
 
-				auto to = std::make_unique<QFile>(_logsFilePath(type, postfix));
-				if (to->exists() && !to->remove()) {
-					LOG(("Could not delete '%1' file to start new logging: %2").arg(to->fileName(), to->errorString()));
+				const auto startName = files[type]->fileName();
+				const auto targetName = _logsFilePath(type, postfix);
+
+				auto target = QFile(targetName);
+				if (target.exists() && !target.remove()) {
+					LOG(("Could not delete '%1' file to start new logging: %2").arg(targetName, target.errorString()));
 					return false;
 				}
-				if (auto from = QFile(files[type]->fileName()); !from.copy(to->fileName())) { // don't close files[type] yet
-					LOG(("Could not copy '%1' to '%2' to start new logging: %3").arg(files[type]->fileName(), to->fileName(), from.errorString()));
+
+				files[type]->close();
+
+				const auto reopenStart = [&](const QString &name) {
+					files[type]->setFileName(name);
+					return files[type]->open(mode | QIODevice::Append);
+				};
+
+				auto source = QFile(startName);
+				if (!source.rename(targetName)) {
+					if (reopenStart(startName)) {
+						LOG(("Could not rename '%1' to '%2' to start new logging: %3").arg(startName, targetName, source.errorString()));
+					}
 					return false;
 				}
-				if (to->open(mode | QIODevice::Append)) {
-					std::swap(files[type], to);
-					LOG(("Moved logging from '%1' to '%2'!").arg(to->fileName(), files[type]->fileName()));
-					to->remove();
-
-					LogsStartIndexChosen = -1;
-
-					QDir working(cWorkingDir()); // delete all other log_startXX.txt that we can
-					QStringList oldlogs = working.entryList(QStringList("log_start*.txt"), QDir::Files);
-					for (QStringList::const_iterator i = oldlogs.cbegin(), e = oldlogs.cend(); i != e; ++i) {
-						QString oldlog = cWorkingDir() + *i, oldlogend = i->mid(u"log_start"_q.size());
-						if (oldlogend.size() == 1 + u".txt"_q.size() && oldlogend.at(0).isDigit() && base::StringViewMid(oldlogend, 1) == u".txt"_q) {
-							bool removed = QFile(oldlog).remove();
-							LOG(("Old start log '%1' found, deleted: %2").arg(*i, Logs::b(removed)));
-						}
-					}
+				if (!reopenStart(targetName)) {
+					LOG(("Could not open '%1' file to start new logging: %2").arg(targetName, files[type]->errorString()));
+					return false;
+				}
+				LOG(("Moved logging from '%1' to '%2'!").arg(startName, files[type]->fileName()));
 
-					return true;
+				LogsStartIndexChosen = -1;
+
+				QDir working(cWorkingDir()); // delete all other log_startXX.txt that we can
+				QStringList oldlogs = working.entryList(QStringList("log_start*.txt"), QDir::Files);
+				for (QStringList::const_iterator i = oldlogs.cbegin(), e = oldlogs.cend(); i != e; ++i) {
+					QString oldlog = cWorkingDir() + *i, oldlogend = i->mid(u"log_start"_q.size());
+					if (oldlogend.size() == 1 + u".txt"_q.size() && oldlogend.at(0).isDigit() && base::StringViewMid(oldlogend, 1) == u".txt"_q) {
+						bool removed = QFile(oldlog).remove();
+						LOG(("Old start log '%1' found, deleted: %2").arg(*i, Logs::b(removed)));
+					}
 				}
-				LOG(("Could not open '%1' file to start new logging: %2").arg(to->fileName(), to->errorString()));
-				return false;
+
+				return true;
 			} else {
 				bool found = false;
 				int32 oldest = -1; // find not existing log_startX.txt or pick the oldest one (by lastModified)
@@ -245,7 +256,6 @@ NEW LOGGING INSTANCE STARTED!!!\n\
 		QString postfix = QString("_%4_%5").arg((part * switchEach) / 60, 2, 10, QChar('0')).arg((part * switchEach) % 60, 2, 10, QChar('0'));
 
 		reopen(LogDataDebug, dayIndex, postfix);
-		reopen(LogDataTcp, dayIndex, postfix);
 		reopen(LogDataMtp, dayIndex, postfix);
 	}
 
@@ -335,11 +345,7 @@ void SetDebugEnabled(bool enabled) {
 }
 
 bool DebugEnabled() {
-#if defined _DEBUG
-	return true;
-#else
 	return DebugModeEnabled;
-#endif
 }
 
 bool WritingEntry() {
@@ -524,11 +530,6 @@ void writeDebug(const QString &v) {
 #endif
 }
 
-void writeTcp(const QString &v) {
-	const auto msg = QString("%1 %2\n").arg(_logsEntryStart(), v);
-	_logsWrite(LogDataTcp, msg);
-}
-
 void writeMtp(int32 dc, const QString &v) {
 	const auto expanded = [&] {
 		const auto bare = MTP::isTemporaryDcId(dc)
diff --git a/Telegram/SourceFiles/logs.h b/Telegram/SourceFiles/logs.h
index b9de4401f29eb5..460bb0502f8593 100644
--- a/Telegram/SourceFiles/logs.h
+++ b/Telegram/SourceFiles/logs.h
@@ -28,7 +28,6 @@ void closeMain();
 
 void writeMain(const QString &v);
 void writeDebug(const QString &v);
-void writeTcp(const QString &v);
 void writeMtp(int32 dc, const QString &v);
 
 QString full();
@@ -65,13 +64,6 @@ inline MemoryBuffer mb(const void *ptr, uint32 size) {
 
 } // namespace Logs
 
-#define TCP_LOG(msg) {\
-	if (Logs::DebugEnabled() || !Logs::started()) {\
-		Logs::writeTcp(QString msg);\
-	}\
-}
-//usage TCP_LOG(("log: %1 %2").arg(1).arg(2))
-
 #define MTP_LOG(dc, msg) {\
 	if (Logs::DebugEnabled() || !Logs::started()) {\
 		Logs::writeMtp(dc, QString msg);\
diff --git a/Telegram/SourceFiles/main/main_account.cpp b/Telegram/SourceFiles/main/main_account.cpp
index 380356bd6896e4..2db253318783f2 100644
--- a/Telegram/SourceFiles/main/main_account.cpp
+++ b/Telegram/SourceFiles/main/main_account.cpp
@@ -95,7 +95,7 @@ void Account::watchProxyChanges() {
 	using ProxyChange = Core::Application::ProxyChange;
 
 	Core::App().proxyChanges(
-	) | rpl::start_with_next([=](const ProxyChange &change) {
+	) | rpl::on_next([=](const ProxyChange &change) {
 		const auto key = [&](const MTP::ProxyData &proxy) {
 			return (proxy.type == MTP::ProxyData::Type::Mtproto)
 				? std::make_pair(proxy.host, proxy.port)
@@ -115,7 +115,7 @@ void Account::watchProxyChanges() {
 
 void Account::watchSessionChanges() {
 	sessionChanges(
-	) | rpl::start_with_next([=](Session *session) {
+	) | rpl::on_next([=](Session *session) {
 		if (!session && _mtp) {
 			_mtp->setUserPhone(QString());
 		}
@@ -170,10 +170,12 @@ void Account::createSession(
 			MTPstring(), // lang_code
 			MTPEmojiStatus(),
 			MTPVector<MTPUsername>(),
-			MTPint(), // stories_max_id
+			MTPRecentStory(),
 			MTPPeerColor(), // color
 			MTPPeerColor(), // profile_color
-			MTPint()), // bot_active_users
+			MTPint(), // bot_active_users
+			MTPlong(), // bot_verification_icon
+			MTPlong()), // send_paid_messages_stars
 		serialized,
 		streamVersion,
 		std::move(settings));
@@ -425,7 +427,7 @@ void Account::startMtp(std::unique_ptr<MTP::Config> config) {
 	_mtp->writeKeysRequests(
 	) | rpl::filter([=] {
 		return !*writingKeys;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		*writingKeys = true;
 		Ui::PostponeCall(_mtp.get(), [=] {
 			local().writeMtpData();
@@ -439,7 +441,7 @@ void Account::startMtp(std::unique_ptr<MTP::Config> config) {
 		_mtp->dcOptions().changed() | rpl::to_empty
 	) | rpl::filter([=] {
 		return !*writingConfig;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		*writingConfig = true;
 		Ui::PostponeCall(_mtp.get(), [=] {
 			local().writeMtpConfig();
@@ -460,6 +462,7 @@ void Account::startMtp(std::unique_ptr<MTP::Config> config) {
 	_mtp->setStateChangedHandler([=](MTP::ShiftedDcId dc, int32 state) {
 		if (dc == _mtp->mainDcId()) {
 			Core::App().settings().proxy().connectionTypeChangesNotify();
+			Core::App().checkProxyRotation(this, state);
 		}
 	});
 	_mtp->setSessionResetHandler([=](MTP::ShiftedDcId shiftedDcId) {
@@ -567,11 +570,11 @@ void Account::destroyMtpKeys(MTP::AuthKeysList &&keys) {
 		MTP::Instance::Mode::KeysDestroyer,
 		std::move(destroyFields));
 	_mtpForKeysDestroy->writeKeysRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		local().writeMtpData();
 	}, _mtpForKeysDestroy->lifetime());
 	_mtpForKeysDestroy->allKeysDestroyed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		LOG(("MTP Info: all keys scheduled for destroy are destroyed."));
 		crl::on_main(this, [=] {
 			_mtpForKeysDestroy = nullptr;
diff --git a/Telegram/SourceFiles/main/main_app_config.cpp b/Telegram/SourceFiles/main/main_app_config.cpp
index dc5f6d51f3cfd6..0bfc149c07a1fb 100644
--- a/Telegram/SourceFiles/main/main_app_config.cpp
+++ b/Telegram/SourceFiles/main/main_app_config.cpp
@@ -7,9 +7,13 @@ For license and copyright information please follow this link:
 */
 #include "main/main_app_config.h"
 
+#include "api/api_authorizations.h"
 #include "apiwrap.h"
 #include "base/call_delayed.h"
+#include "calls/group/ui/calls_group_stars_coloring.h"
+#include "data/data_session.h"
 #include "main/main_account.h"
+#include "main/main_session.h"
 #include "ui/chat/chat_style.h"
 
 namespace Main {
@@ -23,7 +27,8 @@ AppConfig::AppConfig(not_null<Account*> account) : _account(account) {
 	account->sessionChanges(
 	) | rpl::filter([=](Session *session) {
 		return (session != nullptr);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
+		_lastFrozenRefresh = 0;
 		refresh();
 	}, _lifetime);
 }
@@ -32,9 +37,22 @@ AppConfig::~AppConfig() = default;
 
 void AppConfig::start() {
 	_account->mtpMainSessionValue(
-	) | rpl::start_with_next([=](not_null<MTP::Instance*> instance) {
+	) | rpl::on_next([=](not_null<MTP::Instance*> instance) {
 		_api.emplace(instance);
+		_requestId = 0;
 		refresh();
+
+		_frozenTrackLifetime = instance->frozenErrorReceived(
+		) | rpl::on_next([=] {
+			if (!get<int>(u"freeze_since_date"_q, 0)) {
+				const auto now = crl::now();
+				if (!_lastFrozenRefresh
+					|| now > _lastFrozenRefresh + kRefreshTimeout) {
+					_lastFrozenRefresh = now;
+					refresh();
+				}
+			}
+		});
 	}, _lifetime);
 }
 
@@ -42,6 +60,265 @@ int AppConfig::quoteLengthMax() const {
 	return get<int>(u"quote_length_max"_q, 1024);
 }
 
+int AppConfig::stargiftConvertPeriodMax() const {
+	return get<int>(
+		u"stargifts_convert_period_max"_q,
+		_account->mtp().isTestMode() ? 300 : (90 * 86400));
+}
+
+int AppConfig::noForwardsRequestExpirePeriod() const {
+	return get<int>(
+		u"no_forwards_request_expire_period"_q,
+		_account->mtp().isTestMode() ? 300 : 86400);
+}
+
+const std::vector<QString> &AppConfig::startRefPrefixes() {
+	if (_startRefPrefixes.empty()) {
+		_startRefPrefixes = get<std::vector<QString>>(
+			u"starref_start_param_prefixes"_q,
+			std::vector<QString>());
+	}
+	return _startRefPrefixes;
+}
+
+bool AppConfig::starrefSetupAllowed() const {
+	return get<bool>(u"starref_program_allowed"_q, false);
+}
+
+bool AppConfig::starrefJoinAllowed() const {
+	return get<bool>(u"starref_connect_allowed"_q, false);
+}
+
+int AppConfig::starrefCommissionMin() const {
+	return get<int>(u"starref_min_commission_permille"_q, 1);
+}
+
+int AppConfig::starrefCommissionMax() const {
+	return get<int>(u"starref_max_commission_permille"_q, 900);
+}
+
+int AppConfig::starsWithdrawMax() const {
+	return get<int>(u"stars_revenue_withdrawal_max"_q, 100);
+}
+
+float64 AppConfig::starsWithdrawRate() const {
+	return get<float64>(u"stars_usd_withdraw_rate_x1000"_q, 1300) / 1000.;
+}
+
+float64 AppConfig::currencyWithdrawRate() const {
+	return get<float64>(u"ton_usd_rate"_q, 1);
+}
+
+float64 AppConfig::starsSellRate() const {
+	return get<float64>(u"stars_usd_sell_rate_x1000"_q, 1410) / 1000.;
+}
+
+float64 AppConfig::currencySellRate() const {
+	return get<float64>(u"ton_usd_rate"_q, 1);
+}
+
+bool AppConfig::paidMessagesAvailable() const {
+	return get<bool>(u"stars_paid_messages_available"_q, false);
+}
+
+int AppConfig::paidMessageStarsMax() const {
+	return get<int>(u"stars_paid_message_amount_max"_q, 10'000);
+}
+
+int AppConfig::paidMessageCommission() const {
+	return get<int>(u"stars_paid_message_commission_permille"_q, 850);
+}
+
+int AppConfig::paidMessageChannelStarsDefault() const {
+	return get<int>(u"stars_paid_messages_channel_amount_default"_q, 10);
+}
+
+int AppConfig::pinnedGiftsLimit() const {
+	return get<int>(u"stargifts_pinned_to_top_limit"_q, 6);
+}
+
+int AppConfig::giftCollectionsLimit() const {
+	return get<int>(u"stargifts_collections_limit"_q, 10);
+}
+
+int AppConfig::giftCollectionGiftsLimit() const {
+	return get<int>(u"stargifts_collection_gifts_limit"_q, 500);
+}
+
+bool AppConfig::callsDisabledForSession() const {
+	const auto authorizations = _account->sessionExists()
+		? &_account->session().api().authorizations()
+		: nullptr;
+	return get<bool>(
+		u"call_requests_disabled"_q,
+		authorizations->callsDisabledHere());
+}
+
+int AppConfig::confcallSizeLimit() const {
+	return get<int>(
+		u"conference_call_size_limit"_q,
+		_account->mtp().isTestMode() ? 5 : 100);
+}
+
+bool AppConfig::confcallPrioritizeVP8() const {
+	return get<bool>(u"confcall_use_vp8"_q, false);
+}
+
+int AppConfig::giftResaleStarsMin() const {
+	return get<int>(u"stars_stargift_resale_amount_min"_q, 125);
+}
+
+int AppConfig::giftResaleStarsMax() const {
+	return get<int>(u"stars_stargift_resale_amount_max"_q, 35000);
+}
+
+int AppConfig::giftResaleStarsThousandths() const {
+	return get<int>(u"stars_stargift_resale_commission_permille"_q, 800);
+}
+
+int64 AppConfig::giftResaleNanoTonMin() const {
+	return get<int64>(u"ton_stargift_resale_amount_min"_q, 250'000'000LL);
+}
+
+int64 AppConfig::giftResaleNanoTonMax() const {
+	return get<int64>(
+		u"ton_stargift_resale_amount_max"_q,
+		1'000'000'000'000'000LL);
+}
+
+int AppConfig::giftResaleNanoTonThousandths() const {
+	return get<int>(u"ton_stargift_resale_commission_permille"_q, 800);
+}
+
+int AppConfig::pollOptionsLimit() const {
+	return get<int>(u"poll_answers_max"_q, 12);
+}
+
+int AppConfig::pollAnswerDeletePeriod() const {
+	return get<int>(u"poll_answer_delete_period"_q, 300);
+}
+
+int AppConfig::pollCountriesMax() const {
+	return get<int>(u"poll_countries_max"_q, 12);
+}
+
+QString AppConfig::phoneCountryIso2() const {
+	return get<QString>(u"phone_country_iso2"_q, QString());
+}
+
+int AppConfig::todoListItemsLimit() const {
+	return get<int>(
+		u"todo_items_max"_q,
+		_account->mtp().isTestMode() ? 10 : 30);
+}
+
+int AppConfig::todoListTitleLimit() const {
+	return get<int>(u"todo_title_length_max"_q, 32);
+}
+
+int AppConfig::todoListItemTextLimit() const {
+	return get<int>(u"todo_item_length_max"_q, 64);
+}
+
+int AppConfig::suggestedPostCommissionStars() const {
+	return get<int>(u"stars_suggested_post_commission_permille"_q, 850);
+}
+
+int AppConfig::suggestedPostCommissionTon() const {
+	return get<int>(u"ton_suggested_post_commission_permille"_q, 850);
+}
+
+int AppConfig::suggestedPostStarsMin() const {
+	return get<int>(u"stars_suggested_post_amount_min"_q, 5);
+}
+
+int AppConfig::suggestedPostStarsMax() const {
+	return get<int>(u"stars_suggested_post_amount_max"_q, 100'000);
+}
+
+int64 AppConfig::suggestedPostNanoTonMin() const {
+	return get<int64>(u"ton_suggested_post_amount_min"_q, 10'000'000LL);
+}
+
+int64 AppConfig::suggestedPostNanoTonMax() const {
+	return get<int64>(
+		u"ton_suggested_post_amount_max"_q,
+		10'000'000'000'000LL);
+}
+
+int AppConfig::suggestedPostDelayMin() const {
+	return get<int>(u"stars_suggested_post_future_min"_q, 300);
+}
+
+int AppConfig::suggestedPostDelayMax() const {
+	return get<int>(u"appConfig.stars_suggested_post_future_max"_q, 2678400);
+}
+
+TimeId AppConfig::suggestedPostAgeMin() const {
+	return get<int>(u"stars_suggested_post_age_min"_q, 86400);
+}
+
+bool AppConfig::ageVerifyNeeded() const {
+	return get<bool>(u"need_age_video_verification"_q, false);
+}
+
+QString AppConfig::ageVerifyCountry() const {
+	return get<QString>(u"verify_age_country"_q, QString());
+}
+
+int AppConfig::ageVerifyMinAge() const {
+	return get<int>(u"verify_age_min"_q, 18);
+}
+
+QString AppConfig::ageVerifyBotUsername() const {
+	return get<QString>(u"verify_age_bot_username"_q, QString());
+}
+
+int AppConfig::storiesAlbumsLimit() const {
+	return get<int>(u"stories_albums_limit"_q, 100);
+}
+
+int AppConfig::storiesAlbumLimit() const {
+	return get<int>(u"stories_album_stories_limit"_q, 1000);
+}
+
+int AppConfig::groupCallMessageLengthLimit() const {
+	return get<int>(u"group_call_message_length_limit"_q, 128);
+}
+
+TimeId AppConfig::groupCallMessageTTL() const {
+	return get<int>(u"group_call_message_ttl"_q, 10);
+}
+
+int AppConfig::passkeysAccountPasskeysMax() const {
+	return get<int>(u"passkeys_account_passkeys_max"_q, 10);
+}
+
+bool AppConfig::settingsDisplayPasskeys() const {
+	return get<bool>(u"settings_display_passkeys"_q, false);
+}
+
+int64 AppConfig::stakeDiceNanoTonMin() const {
+	return get<int64>(u"ton_stakedice_stake_amount_min"_q, 100'000'000LL);
+}
+
+int64 AppConfig::stakeDiceNanoTonMax() const {
+	return get<int64>(u"ton_stakedice_stake_amount_max"_q, 50'000'000'000LL);
+}
+
+std::vector<int64> AppConfig::stakeDiceNanoTonSuggested() const {
+	return get<std::vector<int64>>(
+		u"ton_stakedice_stake_suggested_amounts"_q,
+		std::vector<int64>{
+			100'000'000LL,
+			1'000'000'000LL,
+			2'000'000'000LL,
+			5'000'000'000LL,
+			10'000'000'000LL,
+			20'000'000'000LL,
+		});
+}
+
 void AppConfig::refresh(bool force) {
 	if (_requestId || !_api) {
 		if (force) {
@@ -72,6 +349,8 @@ void AppConfig::refresh(bool force) {
 			}
 			updateIgnoredRestrictionReasons(std::move(was));
 
+			_groupCallColorings = {};
+
 			DEBUG_LOG(("getAppConfig result handled."));
 			_refreshed.fire({});
 		}, [](const MTPDhelp_appConfigNotModified &) {});
@@ -224,32 +503,54 @@ std::vector<int> AppConfig::getIntArray(
 	});
 }
 
-bool AppConfig::suggestionCurrent(const QString &key) const {
-	return !_dismissedSuggestions.contains(key)
-		&& ranges::contains(
-			get<std::vector<QString>>(
-				u"pending_suggestions"_q,
-				std::vector<QString>()),
-			key);
-}
-
-rpl::producer<> AppConfig::suggestionRequested(const QString &key) const {
-	return value(
-	) | rpl::filter([=] {
-		return suggestionCurrent(key);
+std::vector<std::vector<int>> AppConfig::getIntIntArray(
+		const QString &key,
+		std::vector<std::vector<int>> &&fallback) const {
+	return getValue(key, [&](const MTPJSONValue &value) {
+		return value.match([&](const MTPDjsonArray &data) {
+			auto result = std::vector<std::vector<int>>();
+			result.reserve(data.vvalue().v.size());
+			for (const auto &entry : data.vvalue().v) {
+				if (entry.type() != mtpc_jsonArray) {
+					return std::move(fallback);
+				}
+				const auto &list = entry.c_jsonArray().vvalue().v;
+				auto &last = result.emplace_back();
+				last.reserve(list.size());
+				for (const auto &inner : list) {
+					if (inner.type() != mtpc_jsonNumber) {
+						return std::move(fallback);
+					}
+					last.push_back(
+						int(base::SafeRound(inner.c_jsonNumber().vvalue().v)));
+				}
+			}
+			return result;
+		}, [&](const auto &data) {
+			return std::move(fallback);
+		});
 	});
 }
 
-void AppConfig::dismissSuggestion(const QString &key) {
-	Expects(_api.has_value());
-
-	if (!_dismissedSuggestions.emplace(key).second) {
-		return;
-	}
-	_api->request(MTPhelp_DismissSuggestion(
-		MTP_inputPeerEmpty(),
-		MTP_string(key)
-	)).send();
+std::vector<int64> AppConfig::getInt64Array(
+		const QString &key,
+		std::vector<int64> &&fallback) const {
+	return getValue(key, [&](const MTPJSONValue &value) {
+		return value.match([&](const MTPDjsonArray &data) {
+			auto result = std::vector<int64>();
+			result.reserve(data.vvalue().v.size());
+			for (const auto &entry : data.vvalue().v) {
+				if (entry.type() != mtpc_jsonNumber) {
+					return std::move(fallback);
+				}
+				result.push_back(
+					int64(base::SafeRound(entry.c_jsonNumber().vvalue().v)));
+			}
+			return result;
+		}, [&](const auto &data) {
+			return std::move(fallback);
+		});
+	});
 }
 
 bool AppConfig::newRequirePremiumFree() const {
@@ -258,4 +559,147 @@ bool AppConfig::newRequirePremiumFree() const {
 		false);
 }
 
+auto AppConfig::groupCallColorings() const -> std::vector<StarsColoring> {
+	if (!_groupCallColorings.empty()) {
+		return _groupCallColorings;
+	}
+	const auto key = u"stars_groupcall_message_limits"_q;
+	getValue(key, [&](const MTPJSONValue &value) {
+		value.match([&](const MTPDjsonArray &data) {
+			const auto &list = data.vvalue().v;
+			_groupCallColorings.reserve(list.size());
+			for (const auto &entry : list) {
+				entry.match([&](const MTPDjsonObject &data) {
+					auto &entry = _groupCallColorings.emplace_back();
+					const auto &fields = data.vvalue().v;
+					for (const auto &field : fields) {
+						const auto &key = field.data().vkey().v;
+						const auto &value = field.data().vvalue();
+						const auto error = [&] {
+							LOG(("API Error: Incorrect value for %1."
+								).arg(qs(key)));
+							return std::nullopt;
+						};
+						const auto number = [&]() -> std::optional<int> {
+							if (value.type() != mtpc_jsonNumber) {
+								return error();
+							}
+							const auto &data = value.c_jsonNumber();
+							const auto v = base::SafeRound(data.vvalue().v);
+							if (v < 0) {
+								return error();
+							}
+							return int(v);
+						};
+						const auto color = [&]() -> std::optional<int> {
+							if (value.type() != mtpc_jsonString) {
+								return error();
+							}
+							const auto &data = value.c_jsonString();
+							const auto text = data.vvalue().v;
+							if (text.size() != 6) {
+								return error();
+							}
+							const auto digit = [&](int i) {
+								Expects(i >= 0 && i < 6);
+
+								const auto ch = text[i];
+								return (ch >= '0' && ch <= '9')
+									? int(ch - '0')
+									: (ch >= 'A' && ch <= 'F')
+									? (int(ch - 'A') + 10)
+									: (ch >= 'a' && ch <= 'f')
+									? (int(ch - 'a') + 10)
+									: std::optional<int>();
+							};
+							const auto component = [&](int i) {
+								const auto a = digit(i), b = digit(i + 1);
+								return (a && b)
+									? ((*a) * 16 + (*b))
+									: std::optional<int>();
+							};
+							const auto r = component(0);
+							const auto g = component(2);
+							const auto b = component(4);
+							if (!r || !g || !b) {
+								return error();
+							}
+							return ((*r) << 16) | ((*g) << 8) | (*b);
+						};
+						if (key == "stars"_q) {
+							if (const auto n = number()) {
+								entry.fromStars = *n;
+							} else {
+								return _groupCallColorings.pop_back();
+							}
+						} else if (key == "pin_period"_q) {
+							if (const auto n = number()) {
+								entry.secondsPin = *n;
+							} else {
+								return _groupCallColorings.pop_back();
+							}
+						} else if (key == "text_length_max"_q) {
+							if (const auto n = number()) {
+								entry.charactersMax = *n;
+							} else {
+								return _groupCallColorings.pop_back();
+							}
+						} else if (key == "emoji_max"_q) {
+							if (const auto n = number()) {
+								entry.emojiLimit = *n;
+							} else {
+								return _groupCallColorings.pop_back();
+							}
+						} else if (key == "color1"_q) {
+							if (const auto c = color()) {
+								entry.bgLight = *c;
+							} else {
+								return _groupCallColorings.pop_back();
+							}
+						} else if (key == "color_bg"_q) {
+							if (const auto c = color()) {
+								entry.bgDark = *c;
+							} else {
+								return _groupCallColorings.pop_back();
+							}
+						}
+					}
+				}, [](const auto &) {});
+			}
+		}, [](const auto &) {});
+	});
+	if (_groupCallColorings.empty()) {
+		_groupCallColorings = std::vector<StarsColoring>{
+			{ 0x955CDB, 0x49079B, 0, 30, 30, 0 }, // purple
+			{ 0x955CDB, 0x49079B, 10, 60, 60, 1 }, // still purple
+			{ 0x46A3EB, 0x00508E, 50, 120, 80, 2 }, // blue
+			{ 0x40A920, 0x176200, 100, 300, 110, 3 }, // green
+			{ 0xE29A09, 0x9A3E00, 250, 600, 150, 4 }, // yellow
+			{ 0xED771E, 0x9B3100, 500, 900, 200, 7 }, // orange
+			{ 0xE14542, 0x8B0503, 2'000, 1800, 280, 10 }, // red
+			{ 0x596473, 0x252C36, 10'000, 3600, 400, 20 }, // silver
+		};
+	} else {
+		const auto proj = &StarsColoring::fromStars;
+		if (!ranges::contains(_groupCallColorings, 0, proj)) {
+			_groupCallColorings.insert(
+				begin(_groupCallColorings),
+				{ 0x955CDB, 0x49079B, 0, 30, 30, 0 });
+		}
+		ranges::sort(_groupCallColorings, ranges::less(), proj);
+	}
+	return _groupCallColorings;
+}
+
+std::vector<std::vector<int>> AppConfig::craftAttributePermilles() const {
+	return get<std::vector<std::vector<int>>>(
+		u"stargifts_craft_attribute_permilles"_q,
+		{
+			{ 90 },
+			{ 80, 200 },
+			{ 70, 190, 460 },
+			{ 60, 180, 450, 1000 },
+		});
+}
+
 } // namespace Main
diff --git a/Telegram/SourceFiles/main/main_app_config.h b/Telegram/SourceFiles/main/main_app_config.h
index fc02858a3c88dd..c15e12cc15085b 100644
--- a/Telegram/SourceFiles/main/main_app_config.h
+++ b/Telegram/SourceFiles/main/main_app_config.h
@@ -14,6 +14,11 @@ namespace Ui {
 struct ColorIndicesCompressed;
 } // namespace Ui
 
+namespace Calls::Group::Ui {
+using namespace ::Ui;
+struct StarsColoring;
+} // namespace Calls::Group::Ui
+
 namespace Main {
 
 class Account;
@@ -31,6 +36,8 @@ class AppConfig final {
 			return getDouble(key, fallback);
 		} else if constexpr (std::is_same_v<Type, int>) {
 			return int(base::SafeRound(getDouble(key, double(fallback))));
+		} else if constexpr (std::is_same_v<Type, int64>) {
+			return int64(base::SafeRound(getDouble(key, double(fallback))));
 		} else if constexpr (std::is_same_v<Type, QString>) {
 			return getString(key, fallback);
 		} else if constexpr (std::is_same_v<Type, std::vector<QString>>) {
@@ -40,6 +47,10 @@ class AppConfig final {
 			return getStringMap(key, std::move(fallback));
 		} else if constexpr (std::is_same_v<Type, std::vector<int>>) {
 			return getIntArray(key, std::move(fallback));
+		} else if constexpr (std::is_same_v<Type, std::vector<std::vector<int>>>) {
+			return getIntIntArray(key, std::move(fallback));
+		} else if constexpr (std::is_same_v<Type, std::vector<int64>>) {
+			return getInt64Array(key, std::move(fallback));
 		} else if constexpr (std::is_same_v<Type, bool>) {
 			return getBool(key, fallback);
 		}
@@ -48,11 +59,6 @@ class AppConfig final {
 	[[nodiscard]] rpl::producer<> refreshed() const;
 	[[nodiscard]] rpl::producer<> value() const;
 
-	[[nodiscard]] bool suggestionCurrent(const QString &key) const;
-	[[nodiscard]] rpl::producer<> suggestionRequested(
-		const QString &key) const;
-	void dismissSuggestion(const QString &key);
-
 	[[nodiscard]] bool newRequirePremiumFree() const;
 
 	[[nodiscard]] auto ignoredRestrictionReasons() const
@@ -64,6 +70,80 @@ class AppConfig final {
 	}
 
 	[[nodiscard]] int quoteLengthMax() const;
+	[[nodiscard]] int stargiftConvertPeriodMax() const;
+	[[nodiscard]] int noForwardsRequestExpirePeriod() const;
+
+	[[nodiscard]] const std::vector<QString> &startRefPrefixes();
+	[[nodiscard]] bool starrefSetupAllowed() const;
+	[[nodiscard]] bool starrefJoinAllowed() const;
+	[[nodiscard]] int starrefCommissionMin() const;
+	[[nodiscard]] int starrefCommissionMax() const;
+
+	[[nodiscard]] int starsWithdrawMax() const;
+	[[nodiscard]] float64 starsWithdrawRate() const;
+	[[nodiscard]] float64 currencyWithdrawRate() const;
+	[[nodiscard]] float64 starsSellRate() const;
+	[[nodiscard]] float64 currencySellRate() const;
+	[[nodiscard]] bool paidMessagesAvailable() const;
+	[[nodiscard]] int paidMessageStarsMax() const;
+	[[nodiscard]] int paidMessageCommission() const;
+	[[nodiscard]] int paidMessageChannelStarsDefault() const;
+
+	[[nodiscard]] int pinnedGiftsLimit() const;
+	[[nodiscard]] int giftCollectionsLimit() const;
+	[[nodiscard]] int giftCollectionGiftsLimit() const;
+
+	[[nodiscard]] bool callsDisabledForSession() const;
+	[[nodiscard]] int confcallSizeLimit() const;
+	[[nodiscard]] bool confcallPrioritizeVP8() const;
+
+	[[nodiscard]] int giftResaleStarsMin() const;
+	[[nodiscard]] int giftResaleStarsMax() const;
+	[[nodiscard]] int giftResaleStarsThousandths() const;
+	[[nodiscard]] int64 giftResaleNanoTonMin() const;
+	[[nodiscard]] int64 giftResaleNanoTonMax() const;
+	[[nodiscard]] int giftResaleNanoTonThousandths() const;
+
+	[[nodiscard]] int pollOptionsLimit() const;
+	[[nodiscard]] int pollAnswerDeletePeriod() const;
+	[[nodiscard]] int pollCountriesMax() const;
+	[[nodiscard]] QString phoneCountryIso2() const;
+	[[nodiscard]] int todoListItemsLimit() const;
+	[[nodiscard]] int todoListTitleLimit() const;
+	[[nodiscard]] int todoListItemTextLimit() const;
+
+	[[nodiscard]] int suggestedPostCommissionStars() const;
+	[[nodiscard]] int suggestedPostCommissionTon() const;
+	[[nodiscard]] int suggestedPostStarsMin() const;
+	[[nodiscard]] int suggestedPostStarsMax() const;
+	[[nodiscard]] int64 suggestedPostNanoTonMin() const;
+	[[nodiscard]] int64 suggestedPostNanoTonMax() const;
+	[[nodiscard]] int suggestedPostDelayMin() const;
+	[[nodiscard]] int suggestedPostDelayMax() const;
+	[[nodiscard]] TimeId suggestedPostAgeMin() const;
+
+	[[nodiscard]] bool ageVerifyNeeded() const;
+	[[nodiscard]] QString ageVerifyCountry() const;
+	[[nodiscard]] int ageVerifyMinAge() const;
+	[[nodiscard]] QString ageVerifyBotUsername() const;
+
+	[[nodiscard]] int storiesAlbumsLimit() const;
+	[[nodiscard]] int storiesAlbumLimit() const;
+
+	[[nodiscard]] int groupCallMessageLengthLimit() const;
+	[[nodiscard]] TimeId groupCallMessageTTL() const;
+
+	[[nodiscard]] int passkeysAccountPasskeysMax() const;
+	[[nodiscard]] bool settingsDisplayPasskeys() const;
+
+	[[nodiscard]] int64 stakeDiceNanoTonMin() const;
+	[[nodiscard]] int64 stakeDiceNanoTonMax() const;
+	[[nodiscard]] std::vector<int64> stakeDiceNanoTonSuggested() const;
+
+	using StarsColoring = Calls::Group::Ui::StarsColoring;
+	[[nodiscard]] std::vector<StarsColoring> groupCallColorings() const;
+
+	[[nodiscard]] std::vector<std::vector<int>> craftAttributePermilles() const;
 
 	void refresh(bool force = false);
 
@@ -93,6 +173,12 @@ class AppConfig final {
 	[[nodiscard]] std::vector<int> getIntArray(
 		const QString &key,
 		std::vector<int> &&fallback) const;
+	[[nodiscard]] std::vector<std::vector<int>> getIntIntArray(
+		const QString &key,
+		std::vector<std::vector<int>> &&fallback) const;
+	[[nodiscard]] std::vector<int64> getInt64Array(
+		const QString &key,
+		std::vector<int64> &&fallback) const;
 
 	void updateIgnoredRestrictionReasons(std::vector<QString> was);
 
@@ -103,11 +189,17 @@ class AppConfig final {
 	bool _pendingRefresh = false;
 	base::flat_map<QString, MTPJSONValue> _data;
 	rpl::event_stream<> _refreshed;
-	base::flat_set<QString> _dismissedSuggestions;
 
 	std::vector<QString> _ignoreRestrictionReasons;
 	rpl::event_stream<std::vector<QString>> _ignoreRestrictionChanges;
 
+	std::vector<QString> _startRefPrefixes;
+
+	mutable std::vector<StarsColoring> _groupCallColorings;
+
+	crl::time _lastFrozenRefresh = 0;
+	rpl::lifetime _frozenTrackLifetime;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/main/main_domain.cpp b/Telegram/SourceFiles/main/main_domain.cpp
index 714f7e29196eaf..554bd6ae45068d 100644
--- a/Telegram/SourceFiles/main/main_domain.cpp
+++ b/Telegram/SourceFiles/main/main_domain.cpp
@@ -32,7 +32,7 @@ Domain::Domain(const QString &dataName)
 : _dataName(dataName)
 , _local(std::make_unique<Storage::Domain>(this, dataName)) {
 	_active.changes(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		// In case we had a legacy passcoded app we start settings here.
 		Core::App().startSettingsAndBackground();
 
@@ -52,7 +52,7 @@ Domain::Domain(const QString &dataName)
 				Data::PeerUpdate::Flag::Username)
 			: rpl::never<Data::PeerUpdate>();
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([](const Data::PeerUpdate &update) {
+	) | rpl::on_next([](const Data::PeerUpdate &update) {
 		CrashReports::SetAnnotation("Username", update.peer->username());
 	}, _lifetime);
 }
@@ -343,15 +343,15 @@ void Domain::watchSession(not_null<Account*> account) {
 	account->sessionValue(
 	) | rpl::filter([=](Session *session) {
 		return session != nullptr;
-	}) | rpl::start_with_next([=](Session *session) {
+	}) | rpl::on_next([=](Session *session) {
 		session->data().unreadBadgeChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			scheduleUpdateUnreadBadge();
 		}, session->lifetime());
 
 		Data::AmPremiumValue(
 			session
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_lastMaxAccounts = maxAccounts();
 		}, session->lifetime());
 	}, account->lifetime());
@@ -359,7 +359,7 @@ void Domain::watchSession(not_null<Account*> account) {
 	account->sessionChanges(
 	) | rpl::filter([=](Session *session) {
 		return !session;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		scheduleUpdateUnreadBadge();
 		closeAccountWindows(account);
 		crl::on_main(&Core::App(), [=] {
diff --git a/Telegram/SourceFiles/main/main_domain.h b/Telegram/SourceFiles/main/main_domain.h
index 2e69222b9aaa6c..99e2c9d5b3bc7a 100644
--- a/Telegram/SourceFiles/main/main_domain.h
+++ b/Telegram/SourceFiles/main/main_domain.h
@@ -74,6 +74,9 @@ class Domain final : public base::has_weak_ptr {
 	void activate(not_null<Main::Account*> account);
 	void addActivated(MTP::Environment environment, bool newWindow = false);
 
+	// Drops session-less accounts that have no window open for them.
+	void removeRedundantAccounts();
+
 	// Interface for Storage::Domain.
 	void accountAddedInStorage(AccountWithIndex accountWithIndex);
 	void activateFromStorage(int index);
@@ -83,7 +86,6 @@ class Domain final : public base::has_weak_ptr {
 	void activateAfterStarting();
 	void closeAccountWindows(not_null<Main::Account*> account);
 	bool removePasscodeIfEmpty();
-	void removeRedundantAccounts();
 	void watchSession(not_null<Account*> account);
 	void scheduleWriteAccounts();
 	void checkForLastProductionConfig(not_null<Main::Account*> account);
diff --git a/Telegram/SourceFiles/main/main_session.cpp b/Telegram/SourceFiles/main/main_session.cpp
index 7f398e0a703122..c73f3c7dc0f159 100644
--- a/Telegram/SourceFiles/main/main_session.cpp
+++ b/Telegram/SourceFiles/main/main_session.cpp
@@ -31,11 +31,18 @@ For license and copyright information please follow this link:
 #include "storage/storage_facade.h"
 #include "data/components/credits.h"
 #include "data/components/factchecks.h"
+#include "data/components/gift_auctions.h"
 #include "data/components/location_pickers.h"
+#include "data/components/passkeys.h"
+#include "data/components/promo_suggestions.h"
+#include "data/components/recent_inline_bots.h"
 #include "data/components/recent_peers.h"
+#include "data/components/recent_shared_media_gifts.h"
 #include "data/components/scheduled_messages.h"
 #include "data/components/sponsored_messages.h"
 #include "data/components/top_peers.h"
+#include "settings/settings_faq_suggestions.h"
+#include "settings/settings_recent_searches.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "data/data_user.h"
@@ -109,16 +116,59 @@ Session::Session(
 , _sendAsPeers(std::make_unique<SendAsPeers>(this))
 , _attachWebView(std::make_unique<InlineBots::AttachWebView>(this))
 , _recentPeers(std::make_unique<Data::RecentPeers>(this))
+, _recentSharedGifts(std::make_unique<Data::RecentSharedMediaGifts>(this))
+, _giftAuctions(std::make_unique<Data::GiftAuctions>(this))
 , _scheduledMessages(std::make_unique<Data::ScheduledMessages>(this))
 , _sponsoredMessages(std::make_unique<Data::SponsoredMessages>(this))
 , _topPeers(std::make_unique<Data::TopPeers>(this, Data::TopPeerType::Chat))
 , _topBotApps(
 	std::make_unique<Data::TopPeers>(this, Data::TopPeerType::BotApp))
+, _topGuestChatBots(std::make_unique<Data::TopPeers>(
+	this,
+	Data::TopPeerType::BotGuestChat))
+, _recentInlineBots(std::make_unique<Data::RecentInlineBots>(this))
 , _factchecks(std::make_unique<Data::Factchecks>(this))
 , _locationPickers(std::make_unique<Data::LocationPickers>())
 , _credits(std::make_unique<Data::Credits>(this))
+, _promoSuggestions(std::make_unique<Data::PromoSuggestions>(this, [=] {
+	using State = Data::SetupEmailState;
+	if (_promoSuggestions->setupEmailState() == State::Setup
+		|| _promoSuggestions->setupEmailState() == State::SetupNoSkip) {
+		if (_settings->setupEmailState() == State::Setup
+			|| _settings->setupEmailState() == State::SetupNoSkip) {
+			crl::on_main([=] {
+			// base::call_delayed(5000, [=] {
+				Core::App().lockBySetupEmail();
+			});
+			const auto unlockLifetime = std::make_shared<rpl::lifetime>();
+			_promoSuggestions->setupEmailStateValue(
+			) | rpl::filter([](Data::SetupEmailState s) {
+				return s == Data::SetupEmailState::None;
+			}) | rpl::take(1) | rpl::on_next(crl::guard(this, [=] {
+				Core::App().unlockSetupEmail();
+				_settings->setSetupEmailState(State::None);
+				saveSettingsDelayed(200);
+				unlockLifetime->destroy();
+			}), *unlockLifetime);
+		} else {
+			_settings->setSetupEmailState(
+				_promoSuggestions->setupEmailState());
+			saveSettingsDelayed(200);
+		}
+	} else {
+		if (_settings->setupEmailState() == State::Setup
+			|| _settings->setupEmailState() == State::SetupNoSkip) {
+			_settings->setSetupEmailState(State::None);
+			saveSettingsDelayed(200);
+		}
+	}
+}))
+, _passkeys(std::make_unique<Data::Passkeys>(this))
+, _faqSuggestions(std::make_unique<Settings::FaqSuggestions>(this))
+, _recentSettingsSearches(std::make_unique<Settings::RecentSearches>(this))
 , _cachedReactionIconFactory(std::make_unique<ReactionIconFactory>())
 , _supportHelper(Support::Helper::Create(this))
+, _fastButtonsBots(std::make_unique<Support::FastButtonsBots>(this))
 , _saveSettingsTimer([=] { saveSettings(); }) {
 	Expects(_settings != nullptr);
 
@@ -132,13 +182,13 @@ Session::Session(
 	changes().peerFlagsValue(
 		_user,
 		Data::PeerUpdate::Flag::Photo
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto view = Ui::PeerUserpicView{ .cloud = _selfUserpicView };
 		[[maybe_unused]] const auto image = _user->userpicCloudImage(view);
 		_selfUserpicView = view.cloud;
 	}, lifetime());
 
-	crl::on_main(this, [=] {
+	crl::on_main_queue(this, { [=] {
 		using Flag = Data::PeerUpdate::Flag;
 		changes().peerUpdates(
 			_user,
@@ -147,7 +197,7 @@ Session::Session(
 			| Flag::Photo
 			| Flag::About
 			| Flag::PhoneNumber
-		) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+		) | rpl::on_next([=](const Data::PeerUpdate &update) {
 			local().writeSelf();
 
 			if (update.flags & Flag::PhoneNumber) {
@@ -159,15 +209,6 @@ Session::Session(
 			}
 		}, _lifetime);
 
-#ifndef OS_MAC_STORE
-		appConfig().value(
-		) | rpl::start_with_next([=] {
-			_premiumPossible = !appConfig().get<bool>(
-				u"premium_purchase_blocked"_q,
-				true);
-		}, _lifetime);
-#endif // OS_MAC_STORE
-
 		if (_settings->hadLegacyCallsPeerToPeerNobody()) {
 			api().userPrivacy().save(
 				Api::UserPrivacy::Key::CallsPeer2Peer,
@@ -176,23 +217,36 @@ Session::Session(
 				});
 			saveSettingsDelayed();
 		}
-
+	}, [=] {
 		// Storage::Account uses Main::Account::session() in those methods.
 		// So they can't be called during Main::Session construction.
+		//
+		// They are deferred via crl::on_main which fires after the
+		// constructor returns and _session is set.
+		//
+		// Steps are chained via crl::on_main so that paint events
+		// can be processed between heavy file reads.
 		local().readInstalledStickers();
+	}, [=] {
 		local().readInstalledMasks();
+	}, [=] {
 		local().readInstalledCustomEmoji();
+	}, [=] {
 		local().readFeaturedStickers();
+	}, [=] {
 		local().readFeaturedCustomEmoji();
+	}, [=] {
 		local().readRecentStickers();
 		local().readRecentMasks();
 		local().readFavedStickers();
 		local().readSavedGifs();
+	}, [=] {
 		data().stickers().notifyUpdated(Data::StickersType::Stickers);
 		data().stickers().notifyUpdated(Data::StickersType::Masks);
 		data().stickers().notifyUpdated(Data::StickersType::Emoji);
 		data().stickers().notifySavedGifsUpdated();
-	});
+		DEBUG_LOG(("Init: Account stored data load finished."));
+	} }).dispatch();
 
 #ifndef TDESKTOP_DISABLE_SPELLCHECK
 	Spellchecker::Start(this);
@@ -203,6 +257,31 @@ Session::Session(
 	_api->requestNotifySettings(MTP_inputNotifyBroadcasts());
 
 	Core::App().downloadManager().trackSession(this);
+
+	appConfig().value(
+	) | rpl::on_next([=] {
+		appConfigRefreshed();
+	}, _lifetime);
+}
+
+void Session::appConfigRefreshed() {
+	const auto &config = appConfig();
+
+	_frozen = FreezeInfo{
+		.since = config.get<int>(u"freeze_since_date"_q, 0),
+		.until = config.get<int>(u"freeze_until_date"_q, 0),
+		.appealUrl = config.get<QString>(u"freeze_appeal_url"_q, QString()),
+	};
+
+#ifndef OS_MAC_STORE
+	_premiumPossible = !config.get<bool>(
+		u"premium_purchase_blocked"_q,
+		true);
+#endif // OS_MAC_STORE
+
+	_messagePrimaryEditedDate = config.get<bool>(
+		u"message_primary_edited_date"_q,
+		false);
 }
 
 void Session::setTmpPassword(const QByteArray &password, TimeId validUntil) {
@@ -426,6 +505,18 @@ Support::Templates& Session::supportTemplates() const {
 	return supportHelper().templates();
 }
 
+Support::FastButtonsBots &Session::fastButtonsBots() const {
+	return *_fastButtonsBots;
+}
+
+FreezeInfo Session::frozen() const {
+	return _frozen.current();
+}
+
+rpl::producer<FreezeInfo> Session::frozenValue() const {
+	return _frozen.value();
+}
+
 void Session::addWindow(not_null<Window::SessionController*> controller) {
 	_windows.emplace(controller);
 	controller->lifetime().add([=] {
diff --git a/Telegram/SourceFiles/main/main_session.h b/Telegram/SourceFiles/main/main_session.h
index 0a6917f383c8f1..eadc0f6f226818 100644
--- a/Telegram/SourceFiles/main/main_session.h
+++ b/Telegram/SourceFiles/main/main_session.h
@@ -26,20 +26,31 @@ struct ConfigFields;
 namespace Support {
 class Helper;
 class Templates;
+class FastButtonsBots;
 } // namespace Support
 
 namespace Data {
 class Session;
 class Changes;
+class GiftAuctions;
+class RecentInlineBots;
 class RecentPeers;
+class RecentSharedMediaGifts;
 class ScheduledMessages;
 class SponsoredMessages;
 class TopPeers;
 class Factchecks;
 class LocationPickers;
 class Credits;
+class PromoSuggestions;
+class Passkeys;
 } // namespace Data
 
+namespace Settings {
+class FaqSuggestions;
+class RecentSearches;
+} // namespace Settings
+
 namespace HistoryView::Reactions {
 class CachedIconFactory;
 } // namespace HistoryView::Reactions
@@ -79,6 +90,19 @@ class Domain;
 class SessionSettings;
 class SendAsPeers;
 
+struct FreezeInfo {
+	TimeId since = 0;
+	TimeId until = 0;
+	QString appealUrl;
+
+	explicit operator bool() const {
+		return since != 0;
+	}
+	friend inline bool operator==(
+		const FreezeInfo &,
+		const FreezeInfo &) = default;
+};
+
 class Session final : public base::has_weak_ptr {
 public:
 	Session(
@@ -96,6 +120,9 @@ class Session final : public base::has_weak_ptr {
 	[[nodiscard]] Storage::Domain &domainLocal() const;
 
 	[[nodiscard]] AppConfig &appConfig() const;
+	[[nodiscard]] bool messagePrimaryEditedDate() const {
+		return _messagePrimaryEditedDate;
+	}
 
 	[[nodiscard]] bool premium() const;
 	[[nodiscard]] bool premiumPossible() const;
@@ -118,6 +145,12 @@ class Session final : public base::has_weak_ptr {
 	[[nodiscard]] Data::RecentPeers &recentPeers() const {
 		return *_recentPeers;
 	}
+	[[nodiscard]] Data::RecentSharedMediaGifts &recentSharedGifts() const {
+		return *_recentSharedGifts;
+	}
+	[[nodiscard]] Data::GiftAuctions &giftAuctions() const {
+		return *_giftAuctions;
+	}
 	[[nodiscard]] Data::SponsoredMessages &sponsoredMessages() const {
 		return *_sponsoredMessages;
 	}
@@ -130,6 +163,12 @@ class Session final : public base::has_weak_ptr {
 	[[nodiscard]] Data::TopPeers &topBotApps() const {
 		return *_topBotApps;
 	}
+	[[nodiscard]] Data::TopPeers &topGuestChatBots() const {
+		return *_topGuestChatBots;
+	}
+	[[nodiscard]] Data::RecentInlineBots &recentInlineBots() const {
+		return *_recentInlineBots;
+	}
 	[[nodiscard]] Data::Factchecks &factchecks() const {
 		return *_factchecks;
 	}
@@ -175,6 +214,18 @@ class Session final : public base::has_weak_ptr {
 	[[nodiscard]] InlineBots::AttachWebView &attachWebView() const {
 		return *_attachWebView;
 	}
+	[[nodiscard]] Data::PromoSuggestions &promoSuggestions() const {
+		return *_promoSuggestions;
+	}
+	[[nodiscard]] Data::Passkeys &passkeys() const {
+		return *_passkeys;
+	}
+	[[nodiscard]] Settings::FaqSuggestions &faqSuggestions() const {
+		return *_faqSuggestions;
+	}
+	[[nodiscard]] Settings::RecentSearches &recentSettingsSearches() const {
+		return *_recentSettingsSearches;
+	}
 	[[nodiscard]] auto cachedReactionIconFactory() const
 	-> HistoryView::Reactions::CachedIconFactory & {
 		return *_cachedReactionIconFactory;
@@ -233,6 +284,10 @@ class Session final : public base::has_weak_ptr {
 	[[nodiscard]] bool supportMode() const;
 	[[nodiscard]] Support::Helper &supportHelper() const;
 	[[nodiscard]] Support::Templates &supportTemplates() const;
+	[[nodiscard]] Support::FastButtonsBots &fastButtonsBots() const;
+
+	[[nodiscard]] FreezeInfo frozen() const;
+	[[nodiscard]] rpl::producer<FreezeInfo> frozenValue() const;
 
 	[[nodiscard]] auto colorIndicesValue()
 		-> rpl::producer<Ui::ColorIndicesCompressed>;
@@ -240,6 +295,8 @@ class Session final : public base::has_weak_ptr {
 private:
 	static constexpr auto kDefaultSaveDelay = crl::time(1000);
 
+	void appConfigRefreshed();
+
 	const UserId _userId;
 	const not_null<Account*> _account;
 
@@ -263,21 +320,31 @@ class Session final : public base::has_weak_ptr {
 	const std::unique_ptr<SendAsPeers> _sendAsPeers;
 	const std::unique_ptr<InlineBots::AttachWebView> _attachWebView;
 	const std::unique_ptr<Data::RecentPeers> _recentPeers;
+	const std::unique_ptr<Data::RecentSharedMediaGifts> _recentSharedGifts;
+	const std::unique_ptr<Data::GiftAuctions> _giftAuctions;
 	const std::unique_ptr<Data::ScheduledMessages> _scheduledMessages;
 	const std::unique_ptr<Data::SponsoredMessages> _sponsoredMessages;
 	const std::unique_ptr<Data::TopPeers> _topPeers;
 	const std::unique_ptr<Data::TopPeers> _topBotApps;
+	const std::unique_ptr<Data::TopPeers> _topGuestChatBots;
+	const std::unique_ptr<Data::RecentInlineBots> _recentInlineBots;
 	const std::unique_ptr<Data::Factchecks> _factchecks;
 	const std::unique_ptr<Data::LocationPickers> _locationPickers;
 	const std::unique_ptr<Data::Credits> _credits;
+	const std::unique_ptr<Data::PromoSuggestions> _promoSuggestions;
+	const std::unique_ptr<Data::Passkeys> _passkeys;
+	const std::unique_ptr<Settings::FaqSuggestions> _faqSuggestions;
+	const std::unique_ptr<Settings::RecentSearches> _recentSettingsSearches;
 
 	using ReactionIconFactory = HistoryView::Reactions::CachedIconFactory;
 	const std::unique_ptr<ReactionIconFactory> _cachedReactionIconFactory;
 
 	const std::unique_ptr<Support::Helper> _supportHelper;
+	const std::unique_ptr<Support::FastButtonsBots> _fastButtonsBots;
 
 	std::shared_ptr<QImage> _selfUserpicView;
 	rpl::variable<bool> _premiumPossible = false;
+	bool _messagePrimaryEditedDate = false;
 
 	rpl::event_stream<bool> _termsLockChanges;
 	std::unique_ptr<Window::TermsLock> _termsLock;
@@ -285,6 +352,8 @@ class Session final : public base::has_weak_ptr {
 	base::flat_set<not_null<Window::SessionController*>> _windows;
 	base::Timer _saveSettingsTimer;
 
+	rpl::variable<FreezeInfo> _frozen;
+
 	QByteArray _tmpPassword;
 	TimeId _tmpPasswordValidUntil = 0;
 
diff --git a/Telegram/SourceFiles/main/main_session_settings.cpp b/Telegram/SourceFiles/main/main_session_settings.cpp
index 253116dea86b31..937e88bd2ac9d1 100644
--- a/Telegram/SourceFiles/main/main_session_settings.cpp
+++ b/Telegram/SourceFiles/main/main_session_settings.cpp
@@ -16,6 +16,7 @@ For license and copyright information please follow this link:
 #include "boxes/send_files_box.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "data/components/promo_suggestions.h"
 
 namespace Main {
 namespace {
@@ -23,31 +24,53 @@ namespace {
 constexpr auto kLegacyCallsPeerToPeerNobody = 4;
 constexpr auto kVersionTag = -1;
 constexpr auto kVersion = 2;
-constexpr auto kMaxSavedPlaybackPositions = 16;
 
 } // namespace
 
 SessionSettings::SessionSettings()
 : _selectorTab(ChatHelpers::SelectorTab::Emoji)
-, _supportSwitch(Support::SwitchSettings::Next) {
+, _supportSwitch(Support::SwitchSettings::Next)
+, _setupEmailState(Data::SetupEmailState::None) {
 }
 
 QByteArray SessionSettings::serialize() const {
 	const auto autoDownload = _autoDownload.serialize();
-	const auto size = sizeof(qint32) * 4
+	auto size = sizeof(qint32) * 4
 		+ _groupStickersSectionHidden.size() * sizeof(quint64)
 		+ sizeof(qint32) * 4
 		+ Serialize::bytearraySize(autoDownload)
-		+ sizeof(qint32) * 5
-		+ _mediaLastPlaybackPosition.size() * 2 * sizeof(quint64)
-		+ sizeof(qint32) * 5
-		+ sizeof(qint32)
+		+ sizeof(qint32) * 11
 		+ (_mutePeriods.size() * sizeof(quint64))
-		+ sizeof(qint32) * 2
-		+ _hiddenPinnedMessages.size() * (sizeof(quint64) * 3)
-		+ sizeof(qint32)
+		+ sizeof(qint32) * 3
 		+ _groupEmojiSectionHidden.size() * sizeof(quint64)
-		+ sizeof(qint32) * 2;
+		+ sizeof(qint32) * 3
+		+ _hiddenPinnedMessages.size() * (sizeof(quint64) * 4)
+		+ sizeof(qint32)
+		+ sizeof(qint32) // _ringtoneDefaultVolumes size
+		+ (_ringtoneDefaultVolumes.size()
+			* (0
+				+ sizeof(uint8_t) * 1 // Data::DefaultNotify
+				+ sizeof(ushort))) // Volume
+		+ sizeof(qint32) // _ringtoneVolumes size
+		+ (_ringtoneVolumes.size()
+			* (0
+				+ sizeof(quint64) * 3 // ThreadId
+				+ sizeof(ushort))) // Volume
+		+ sizeof(qint32) // _ratedTranscriptions size
+		+ (_ratedTranscriptions.size() * sizeof(quint64))
+		+ sizeof(qint32); // _unreviewed size
+	for (const auto &auth : _unreviewed) {
+		size += sizeof(quint64) + sizeof(qint32) + sizeof(qint32)
+			+ Serialize::stringSize(auth.device)
+			+ Serialize::stringSize(auth.location);
+	}
+	size += sizeof(qint32); // _setupEmailState
+	size += sizeof(qint32) // _moderateCommonGroups size
+		+ (_moderateCommonGroups.size() * sizeof(qint32));
+	size += sizeof(qint32);
+	size += sizeof(qint32)
+		+ _subsectionTabsModes.size() * (sizeof(quint64) + sizeof(qint32));
+	size += sizeof(qint32); // _phoneNumberHidden
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -71,37 +94,71 @@ QByteArray SessionSettings::serialize() const {
 			<< qint32(_archiveCollapsed.current() ? 1 : 0)
 			<< qint32(_archiveInMainMenu.current() ? 1 : 0)
 			<< qint32(_skipArchiveInSearch.current() ? 1 : 0)
-			<< qint32(_mediaLastPlaybackPosition.size());
-		for (const auto &[id, time] : _mediaLastPlaybackPosition) {
-			stream << quint64(id) << qint64(time);
-		}
-		stream
-			<< qint32(0) // very old _hiddenPinnedMessages.size());
+			<< qint32(0) // old _mediaLastPlaybackPosition.size());
+			<< qint32(0) // very very old _hiddenPinnedMessages.size());
 			<< qint32(_dialogsFiltersEnabled ? 1 : 0)
 			<< qint32(_supportAllSilent ? 1 : 0)
 			<< qint32(_photoEditorHintShowsCount)
-			<< qint32(0) // old _hiddenPinnedMessages.size());
+			<< qint32(0) // very old _hiddenPinnedMessages.size());
 			<< qint32(_mutePeriods.size());
 		for (const auto &period : _mutePeriods) {
 			stream << quint64(period);
 		}
 		stream
 			<< qint32(0) // old _skipPremiumStickersSet
+			<< qint32(0) // old _hiddenPinnedMessages.size());
+			<< qint32(_groupEmojiSectionHidden.size());
+		for (const auto &peerId : _groupEmojiSectionHidden) {
+			stream << SerializePeerId(peerId);
+		}
+		stream
+			<< qint32(_lastNonPremiumLimitDownload)
+			<< qint32(_lastNonPremiumLimitUpload)
 			<< qint32(_hiddenPinnedMessages.size());
 		for (const auto &[key, value] : _hiddenPinnedMessages) {
 			stream
 				<< SerializePeerId(key.peerId)
 				<< qint64(key.topicRootId.bare)
+				<< SerializePeerId(key.monoforumPeerId)
 				<< qint64(value.bare);
 		}
-		stream
-			<< qint32(_groupEmojiSectionHidden.size());
-		for (const auto &peerId : _groupEmojiSectionHidden) {
-			stream << SerializePeerId(peerId);
+		stream << qint32(0);
+		stream << qint32(_ringtoneDefaultVolumes.size());
+		for (const auto &[key, value] : _ringtoneDefaultVolumes) {
+			stream << uint8_t(key) << ushort(value);
 		}
-		stream
-			<< qint32(_lastNonPremiumLimitDownload)
-			<< qint32(_lastNonPremiumLimitUpload);
+		stream << qint32(_ringtoneVolumes.size());
+		for (const auto &[key, value] : _ringtoneVolumes) {
+			stream
+				<< SerializePeerId(key.peerId)
+				<< qint64(key.topicRootId.bare)
+				<< SerializePeerId(key.monoforumPeerId)
+				<< ushort(value);
+		}
+		stream << qint32(_ratedTranscriptions.size());
+		for (const auto &transcriptionId : _ratedTranscriptions) {
+			stream << quint64(transcriptionId);
+		}
+		stream << qint32(_unreviewed.size());
+		for (const auto &auth : _unreviewed) {
+			stream
+				<< quint64(auth.hash)
+				<< qint32(auth.unconfirmed ? 1 : 0)
+				<< qint32(auth.date)
+				<< auth.device
+				<< auth.location;
+		}
+		stream << qint32(static_cast<int>(_setupEmailState));
+		stream << qint32(_moderateCommonGroups.size());
+		for (const auto &filterId : _moderateCommonGroups) {
+			stream << qint32(filterId);
+		}
+		stream << qint32(_disableSharingBoxShowsCount);
+		stream << qint32(_subsectionTabsModes.size());
+		for (const auto &[peerId, mode] : _subsectionTabsModes) {
+			stream << SerializePeerId(peerId) << qint32(mode);
+		}
+		stream << qint32(_phoneNumberHidden.current() ? 1 : 0);
 	}
 
 	Ensures(result.size() == size);
@@ -156,12 +213,12 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	qint32 appSuggestEmoji = app.suggestEmoji() ? 1 : 0;
 	qint32 appSuggestStickersByEmoji = app.suggestStickersByEmoji() ? 1 : 0;
 	qint32 appSpellcheckerEnabled = app.spellcheckerEnabled() ? 1 : 0;
-	std::vector<std::pair<DocumentId, crl::time>> mediaLastPlaybackPosition;
 	qint32 appVideoPlaybackSpeed = app.videoPlaybackSpeedSerialized();
 	QByteArray appVideoPipGeometry = app.videoPipGeometry();
 	std::vector<int> appDictionariesEnabled;
 	qint32 appAutoDownloadDictionaries = app.autoDownloadDictionaries() ? 1 : 0;
 	base::flat_map<ThreadId, MsgId> hiddenPinnedMessages;
+	base::flat_map<PeerId, qint32> subsectionTabsModes;
 	qint32 dialogsFiltersEnabled = _dialogsFiltersEnabled ? 1 : 0;
 	qint32 supportAllSilent = _supportAllSilent ? 1 : 0;
 	qint32 photoEditorHintShowsCount = _photoEditorHintShowsCount;
@@ -169,6 +226,14 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	qint32 legacySkipPremiumStickersSet = 0;
 	qint32 lastNonPremiumLimitDownload = 0;
 	qint32 lastNonPremiumLimitUpload = 0;
+	base::flat_map<Data::DefaultNotify, ushort> ringtoneDefaultVolumes;
+	base::flat_map<ThreadId, ushort> ringtoneVolumes;
+	base::flat_set<uint64> ratedTranscriptions;
+	std::vector<Data::UnreviewedAuth> unreviewed;
+	qint32 setupEmailState = 0;
+	std::vector<int32> moderateCommonGroups;
+	qint32 disableSharingBoxShowsCount = 0;
+	qint32 phoneNumberHidden = 0;
 
 	stream >> versionTag;
 	if (versionTag == kVersionTag) {
@@ -313,7 +378,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 						"Bad data for SessionSettings::addFromSerialized()"));
 					return;
 				}
-				mediaLastPlaybackPosition.emplace_back(documentId, time);
+				// Old mediaLastPlaybackPosition.
 			}
 		}
 	}
@@ -397,7 +462,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 		stream >> count;
 		if (stream.status() == QDataStream::Ok) {
 			for (auto i = 0; i != count; ++i) {
-				quint64 period;
+				auto period = quint64();
 				stream >> period;
 				mutePeriods.emplace_back(period);
 			}
@@ -410,6 +475,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 		auto count = qint32(0);
 		stream >> count;
 		if (stream.status() == QDataStream::Ok) {
+			// Legacy.
 			for (auto i = 0; i != count; ++i) {
 				auto keyPeerId = quint64();
 				auto keyTopicRootId = qint64();
@@ -447,6 +513,185 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 			>> lastNonPremiumLimitDownload
 			>> lastNonPremiumLimitUpload;
 	}
+	if (!stream.atEnd()) {
+		auto count = qint32(0);
+		stream >> count;
+		if (stream.status() == QDataStream::Ok) {
+			for (auto i = 0; i != count; ++i) {
+				auto keyPeerId = quint64();
+				auto keyTopicRootId = qint64();
+				auto keyMonoforumPeerId = quint64();
+				auto value = qint64();
+				stream
+					>> keyPeerId
+					>> keyTopicRootId
+					>> keyMonoforumPeerId
+					>> value;
+				if (stream.status() != QDataStream::Ok) {
+					LOG(("App Error: "
+						"Bad data for SessionSettings::addFromSerialized()"));
+					return;
+				}
+				hiddenPinnedMessages.emplace(ThreadId{
+					DeserializePeerId(keyPeerId),
+					keyTopicRootId,
+					DeserializePeerId(keyMonoforumPeerId),
+				}, value);
+			}
+		}
+	}
+	if (!stream.atEnd()) {
+		auto count = qint32(0);
+		stream >> count;
+		if (stream.status() == QDataStream::Ok) {
+			for (auto i = 0; i != count; ++i) {
+				auto peerId = quint64();
+				stream >> peerId;
+				if (stream.status() != QDataStream::Ok) {
+					LOG(("App Error: "
+						"Bad data for SessionSettings::addFromSerialized()"));
+					return;
+				}
+				subsectionTabsModes.emplace(
+					DeserializePeerId(peerId), qint32(1));
+			}
+		}
+	}
+	if (!stream.atEnd()) {
+		auto count = qint32(0);
+		stream >> count;
+		if (stream.status() == QDataStream::Ok) {
+			for (auto i = 0; i != count; ++i) {
+				auto keyDefaultNotify = uint8_t();
+				auto value = ushort();
+				stream
+					>> keyDefaultNotify
+					>> value;
+				if (stream.status() != QDataStream::Ok) {
+					LOG(("App Error: "
+						"Bad data for SessionSettings::addFromSerialized()"));
+					return;
+				}
+				ringtoneDefaultVolumes.emplace(
+					static_cast<Data::DefaultNotify>(keyDefaultNotify),
+					value);
+			}
+		}
+	}
+	if (!stream.atEnd()) {
+		auto count = qint32(0);
+		stream >> count;
+		if (stream.status() == QDataStream::Ok) {
+			for (auto i = 0; i != count; ++i) {
+				auto keyPeerId = quint64();
+				auto keyTopicRootId = qint64();
+				auto keyMonoforumPeerId = quint64();
+				auto value = ushort();
+				stream
+					>> keyPeerId
+					>> keyTopicRootId
+					>> keyMonoforumPeerId
+					>> value;
+				if (stream.status() != QDataStream::Ok) {
+					LOG(("App Error: "
+						"Bad data for SessionSettings::addFromSerialized()"));
+					return;
+				}
+				ringtoneVolumes.emplace(ThreadId{
+					DeserializePeerId(keyPeerId),
+					keyTopicRootId,
+					DeserializePeerId(keyMonoforumPeerId),
+				}, value);
+			}
+		}
+	}
+	if (!stream.atEnd()) {
+		auto count = qint32(0);
+		stream >> count;
+		if (stream.status() == QDataStream::Ok) {
+			for (auto i = 0; i != count; ++i) {
+				auto transcriptionId = quint64();
+				stream >> transcriptionId;
+				if (stream.status() != QDataStream::Ok) {
+					LOG(("App Error: "
+						"Bad data for SessionSettings::addFromSerialized()"
+						"with ratedTranscriptions"));
+					return;
+				}
+				ratedTranscriptions.emplace(transcriptionId);
+			}
+		}
+	}
+	if (!stream.atEnd()) {
+		auto count = qint32(0);
+		stream >> count;
+		if (stream.status() == QDataStream::Ok) {
+			for (auto i = 0; i != count; ++i) {
+				auto hash = quint64();
+				auto unconfirmed = qint32();
+				auto date = qint32();
+				QString device, location;
+				stream >> hash >> unconfirmed >> date >> device >> location;
+				if (stream.status() != QDataStream::Ok) {
+					LOG(("App Error: "
+						"Bad data for SessionSettings::addFromSerialized()"
+						"with unreviewed"));
+					return;
+				}
+				unreviewed.emplace_back(Data::UnreviewedAuth{
+					.hash = hash,
+					.unconfirmed = (unconfirmed == 1),
+					.date = TimeId(date),
+					.device = device,
+					.location = location,
+				});
+			}
+		}
+	}
+	if (!stream.atEnd()) {
+		stream >> setupEmailState;
+	}
+	if (!stream.atEnd()) {
+		auto count = qint32(0);
+		stream >> count;
+		if (stream.status() == QDataStream::Ok) {
+			for (auto i = 0; i != count; ++i) {
+				qint32 filterId;
+				stream >> filterId;
+				if (stream.status() != QDataStream::Ok) {
+					LOG(("App Error: "
+						"Bad data for SessionSettings::addFromSerialized()"
+						"with moderateCommonGroups"));
+					return;
+				}
+				moderateCommonGroups.emplace_back(filterId);
+			}
+		}
+	}
+	if (!stream.atEnd()) {
+		stream >> disableSharingBoxShowsCount;
+	}
+	if (!stream.atEnd()) {
+		auto count = qint32(0);
+		stream >> count;
+		if (stream.status() == QDataStream::Ok) {
+			for (auto i = 0; i != count; ++i) {
+				auto peerId = quint64();
+				auto mode = qint32(0);
+				stream >> peerId >> mode;
+				if (stream.status() != QDataStream::Ok) {
+					LOG(("App Error: "
+						"Bad data for SessionSettings::addFromSerialized()"));
+					return;
+				}
+				subsectionTabsModes.emplace(
+					DeserializePeerId(peerId), mode);
+			}
+		}
+	}
+	if (!stream.atEnd()) {
+		stream >> phoneNumberHidden;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for SessionSettings::addFromSerialized()"));
@@ -486,7 +731,6 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	_archiveCollapsed = (archiveCollapsed == 1);
 	_archiveInMainMenu = (archiveInMainMenu == 1);
 	_skipArchiveInSearch = (skipArchiveInSearch == 1);
-	_mediaLastPlaybackPosition = std::move(mediaLastPlaybackPosition);
 	_hiddenPinnedMessages = std::move(hiddenPinnedMessages);
 	_dialogsFiltersEnabled = (dialogsFiltersEnabled == 1);
 	_supportAllSilent = (supportAllSilent == 1);
@@ -494,6 +738,26 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	_mutePeriods = std::move(mutePeriods);
 	_lastNonPremiumLimitDownload = lastNonPremiumLimitDownload;
 	_lastNonPremiumLimitUpload = lastNonPremiumLimitUpload;
+	_subsectionTabsModes = std::move(subsectionTabsModes);
+	_ringtoneDefaultVolumes = std::move(ringtoneDefaultVolumes);
+	_ringtoneVolumes = std::move(ringtoneVolumes);
+	_ratedTranscriptions = std::move(ratedTranscriptions);
+	_unreviewed = std::move(unreviewed);
+	auto uncheckedSetupEmailState = static_cast<Data::SetupEmailState>(
+		setupEmailState);
+	switch (uncheckedSetupEmailState) {
+	case Data::SetupEmailState::None:
+	case Data::SetupEmailState::Setup:
+	case Data::SetupEmailState::SetupNoSkip:
+	case Data::SetupEmailState::SettingUp:
+	case Data::SetupEmailState::SettingUpNoSkip:
+		_setupEmailState = uncheckedSetupEmailState;
+		break;
+	}
+
+	_moderateCommonGroups = std::move(moderateCommonGroups);
+	_disableSharingBoxShowsCount = disableSharingBoxShowsCount;
+	_phoneNumberHidden = (phoneNumberHidden == 1);
 
 	if (version < 2) {
 		app.setLastSeenWarningSeen(appLastSeenWarningSeen == 1);
@@ -567,34 +831,6 @@ rpl::producer<bool> SessionSettings::supportAllSearchResultsValue() const {
 	return _supportAllSearchResults.value();
 }
 
-void SessionSettings::setMediaLastPlaybackPosition(DocumentId id, crl::time time) {
-	auto &map = _mediaLastPlaybackPosition;
-	const auto i = ranges::find(
-		map,
-		id,
-		&std::pair<DocumentId, crl::time>::first);
-	if (i != map.end()) {
-		if (time > 0) {
-			i->second = time;
-		} else {
-			map.erase(i);
-		}
-	} else if (time > 0) {
-		if (map.size() >= kMaxSavedPlaybackPositions) {
-			map.erase(map.begin());
-		}
-		map.emplace_back(id, time);
-	}
-}
-
-crl::time SessionSettings::mediaLastPlaybackPosition(DocumentId id) const {
-	const auto i = ranges::find(
-		_mediaLastPlaybackPosition,
-		id,
-		&std::pair<DocumentId, crl::time>::first);
-	return (i != _mediaLastPlaybackPosition.end()) ? i->second : 0;
-}
-
 void SessionSettings::setArchiveCollapsed(bool collapsed) {
 	_archiveCollapsed = collapsed;
 }
@@ -633,16 +869,22 @@ rpl::producer<bool> SessionSettings::skipArchiveInSearchChanges() const {
 
 MsgId SessionSettings::hiddenPinnedMessageId(
 		PeerId peerId,
-		MsgId topicRootId) const {
-	const auto i = _hiddenPinnedMessages.find({ peerId, topicRootId });
+		MsgId topicRootId,
+		PeerId monoforumPeerId) const {
+	const auto i = _hiddenPinnedMessages.find({
+		peerId,
+		topicRootId,
+		monoforumPeerId,
+	});
 	return (i != end(_hiddenPinnedMessages)) ? i->second : 0;
 }
 
 void SessionSettings::setHiddenPinnedMessageId(
 		PeerId peerId,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		MsgId msgId) {
-	const auto id = ThreadId{ peerId, topicRootId };
+	const auto id = ThreadId{ peerId, topicRootId, monoforumPeerId };
 	if (msgId) {
 		_hiddenPinnedMessages[id] = msgId;
 	} else {
@@ -650,6 +892,21 @@ void SessionSettings::setHiddenPinnedMessageId(
 	}
 }
 
+qint32 SessionSettings::subsectionTabsMode(PeerId peerId) const {
+	const auto i = _subsectionTabsModes.find(peerId);
+	return (i != end(_subsectionTabsModes)) ? i->second : 0;
+}
+
+void SessionSettings::setSubsectionTabsMode(
+		PeerId peerId,
+		qint32 mode) {
+	if (mode) {
+		_subsectionTabsModes[peerId] = mode;
+	} else {
+		_subsectionTabsModes.remove(peerId);
+	}
+}
+
 bool SessionSettings::photoEditorHintShown() const {
 	return _photoEditorHintShowsCount < kPhotoEditorHintMaxShowsCount;
 }
@@ -660,6 +917,20 @@ void SessionSettings::incrementPhotoEditorHintShown() {
 	}
 }
 
+bool SessionSettings::shouldShowDisableSharingBox() const {
+	return _disableSharingBoxShowsCount < kDisableSharingBoxMaxShowsCount;
+}
+
+void SessionSettings::incrementDisableSharingBoxShown() {
+	if (shouldShowDisableSharingBox()) {
+		_disableSharingBoxShowsCount++;
+	}
+}
+
+void SessionSettings::resetDisableSharingBoxShown() {
+	_disableSharingBoxShowsCount = 0;
+}
+
 std::vector<TimeId> SessionSettings::mutePeriods() const {
 	return _mutePeriods;
 }
@@ -676,4 +947,66 @@ void SessionSettings::addMutePeriod(TimeId period) {
 	}
 }
 
+ushort SessionSettings::ringtoneVolume(
+		Data::DefaultNotify defaultNotify) const {
+	const auto i = _ringtoneDefaultVolumes.find(defaultNotify);
+	return (i != end(_ringtoneDefaultVolumes)) ? i->second : 0;
+}
+
+void SessionSettings::setRingtoneVolume(
+		Data::DefaultNotify defaultNotify,
+		ushort volume) {
+	if (volume > 0 && volume <= 100) {
+		_ringtoneDefaultVolumes[defaultNotify] = volume;
+	} else {
+		_ringtoneDefaultVolumes.remove(defaultNotify);
+	}
+}
+
+ushort SessionSettings::ringtoneVolume(
+		PeerId peerId,
+		MsgId topicRootId,
+		PeerId monoforumPeerId) const {
+	const auto i = _ringtoneVolumes.find(
+		ThreadId{ peerId, topicRootId, monoforumPeerId });
+	return (i != end(_ringtoneVolumes)) ? i->second : 0;
+}
+
+void SessionSettings::setRingtoneVolume(
+		PeerId peerId,
+		MsgId topicRootId,
+		PeerId monoforumPeerId,
+		ushort volume) {
+	const auto id = ThreadId{ peerId, topicRootId, monoforumPeerId };
+	if (volume > 0 && volume <= 100) {
+		_ringtoneVolumes[id] = volume;
+	} else {
+		_ringtoneVolumes.remove(id);
+	}
+}
+
+void SessionSettings::markTranscriptionAsRated(uint64 transcriptionId) {
+	_ratedTranscriptions.emplace(transcriptionId);
+}
+
+bool SessionSettings::isTranscriptionRated(uint64 transcriptionId) const {
+	return _ratedTranscriptions.contains(transcriptionId);
+}
+
+void SessionSettings::setUnreviewed(std::vector<Data::UnreviewedAuth> auths) {
+	_unreviewed = std::move(auths);
+}
+
+const std::vector<Data::UnreviewedAuth> &SessionSettings::unreviewed() const {
+	return _unreviewed;
+}
+
+void SessionSettings::setSetupEmailState(Data::SetupEmailState state) {
+	_setupEmailState = state;
+}
+
+Data::SetupEmailState SessionSettings::setupEmailState() const {
+	return _setupEmailState;
+}
+
 } // namespace Main
diff --git a/Telegram/SourceFiles/main/main_session_settings.h b/Telegram/SourceFiles/main/main_session_settings.h
index c44b6f785c618a..1d4502707fc779 100644
--- a/Telegram/SourceFiles/main/main_session_settings.h
+++ b/Telegram/SourceFiles/main/main_session_settings.h
@@ -8,6 +8,8 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "data/data_auto_download.h"
+#include "data/notify/data_peer_notify_settings.h"
+#include "data/data_authorization.h"
 #include "ui/rect_part.h"
 
 namespace Support {
@@ -18,6 +20,10 @@ namespace ChatHelpers {
 enum class SelectorTab;
 } // namespace ChatHelpers
 
+namespace Data {
+enum class SetupEmailState;
+} // namespace Data
+
 namespace Main {
 
 class SessionSettings final {
@@ -85,9 +91,6 @@ class SessionSettings final {
 		_groupEmojiSectionHidden.remove(peerId);
 	}
 
-	void setMediaLastPlaybackPosition(DocumentId id, crl::time time);
-	[[nodiscard]] crl::time mediaLastPlaybackPosition(DocumentId id) const;
-
 	[[nodiscard]] Data::AutoDownload::Full &autoDownload() {
 		return _autoDownload;
 	}
@@ -113,12 +116,17 @@ class SessionSettings final {
 
 	[[nodiscard]] MsgId hiddenPinnedMessageId(
 		PeerId peerId,
-		MsgId topicRootId = 0) const;
+		MsgId topicRootId = 0,
+		PeerId monoforumPeerId = 0) const;
 	void setHiddenPinnedMessageId(
 		PeerId peerId,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		MsgId msgId);
 
+	[[nodiscard]] qint32 subsectionTabsMode(PeerId peerId) const;
+	void setSubsectionTabsMode(PeerId peerId, qint32 mode);
+
 	[[nodiscard]] bool dialogsFiltersEnabled() const {
 		return _dialogsFiltersEnabled;
 	}
@@ -129,6 +137,10 @@ class SessionSettings final {
 	[[nodiscard]] bool photoEditorHintShown() const;
 	void incrementPhotoEditorHintShown();
 
+	[[nodiscard]] bool shouldShowDisableSharingBox() const;
+	void incrementDisableSharingBoxShown();
+	void resetDisableSharingBoxShown();
+
 	[[nodiscard]] std::vector<TimeId> mutePeriods() const;
 	void addMutePeriod(TimeId period);
 
@@ -144,14 +156,56 @@ class SessionSettings final {
 	void setLastNonPremiumLimitUpload(TimeId when) {
 		_lastNonPremiumLimitUpload = when;
 	}
+	void setRingtoneVolume(
+		Data::DefaultNotify defaultNotify,
+		ushort volume);
+	[[nodiscard]] ushort ringtoneVolume(
+		Data::DefaultNotify defaultNotify) const;
+	void setRingtoneVolume(
+		PeerId peerId,
+		MsgId topicRootId,
+		PeerId monoforumPeerId,
+		ushort volume);
+	[[nodiscard]] ushort ringtoneVolume(
+		PeerId peerId,
+		MsgId topicRootId,
+		PeerId monoforumPeerId) const;
+
+	void markTranscriptionAsRated(uint64 transcriptionId);
+	[[nodiscard]] bool isTranscriptionRated(uint64 transcriptionId) const;
+
+	void setUnreviewed(std::vector<Data::UnreviewedAuth> auths);
+	[[nodiscard]] const std::vector<Data::UnreviewedAuth> &unreviewed() const;
+
+	void setSetupEmailState(Data::SetupEmailState state);
+	[[nodiscard]] Data::SetupEmailState setupEmailState() const;
+
+	void setModerateCommonGroups(std::vector<int32> groups) {
+		_moderateCommonGroups = std::move(groups);
+	}
+	[[nodiscard]] const std::vector<int32> &moderateCommonGroups() const {
+		return _moderateCommonGroups;
+	}
+
+	void setPhoneNumberHidden(bool hidden) {
+		_phoneNumberHidden = hidden;
+	}
+	[[nodiscard]] bool phoneNumberHidden() const {
+		return _phoneNumberHidden.current();
+	}
+	[[nodiscard]] rpl::producer<bool> phoneNumberHiddenValue() const {
+		return _phoneNumberHidden.value();
+	}
 
 private:
 	static constexpr auto kDefaultSupportChatsLimitSlice = 7 * 24 * 60 * 60;
 	static constexpr auto kPhotoEditorHintMaxShowsCount = 5;
+	static constexpr auto kDisableSharingBoxMaxShowsCount = 3;
 
 	struct ThreadId {
 		PeerId peerId;
 		MsgId topicRootId;
+		PeerId monoforumPeerId;
 
 		friend inline constexpr auto operator<=>(
 			ThreadId,
@@ -166,10 +220,13 @@ class SessionSettings final {
 	rpl::variable<bool> _archiveCollapsed = false;
 	rpl::variable<bool> _archiveInMainMenu = false;
 	rpl::variable<bool> _skipArchiveInSearch = false;
-	std::vector<std::pair<DocumentId, crl::time>> _mediaLastPlaybackPosition;
 	base::flat_map<ThreadId, MsgId> _hiddenPinnedMessages;
+	base::flat_map<PeerId, qint32> _subsectionTabsModes;
+	base::flat_map<Data::DefaultNotify, ushort> _ringtoneDefaultVolumes;
+	base::flat_map<ThreadId, ushort> _ringtoneVolumes;
 	bool _dialogsFiltersEnabled = false;
 	int _photoEditorHintShowsCount = 0;
+	int _disableSharingBoxShowsCount = 0;
 	std::vector<TimeId> _mutePeriods;
 	TimeId _lastNonPremiumLimitDownload = 0;
 	TimeId _lastNonPremiumLimitUpload = 0;
@@ -182,6 +239,16 @@ class SessionSettings final {
 		= kDefaultSupportChatsLimitSlice;
 	rpl::variable<bool> _supportAllSearchResults = false;
 
+	base::flat_set<uint64> _ratedTranscriptions;
+
+	std::vector<Data::UnreviewedAuth> _unreviewed;
+
+	Data::SetupEmailState _setupEmailState;
+
+	std::vector<int32> _moderateCommonGroups;
+
+	rpl::variable<bool> _phoneNumberHidden = false;
+
 };
 
 } // namespace Main
diff --git a/Telegram/SourceFiles/main/session/send_as_peers.cpp b/Telegram/SourceFiles/main/session/send_as_peers.cpp
index 050c87f6ed2a4b..86113c3885f9c5 100644
--- a/Telegram/SourceFiles/main/session/send_as_peers.cpp
+++ b/Telegram/SourceFiles/main/session/send_as_peers.cpp
@@ -23,7 +23,8 @@ constexpr auto kRequestEach = 30 * crl::time(1000);
 
 SendAsPeers::SendAsPeers(not_null<Session*> session)
 : _session(session)
-, _onlyMe({ { .peer = session->user(), .premiumRequired = false } }) {
+, _onlyMe({ { .peer = session->user(), .premiumRequired = false } })
+, _onlyMePaid({ session->user() }) {
 	_session->changes().peerUpdates(
 		Data::PeerUpdate::Flag::Rights
 	) | rpl::map([=](const Data::PeerUpdate &update) {
@@ -38,42 +39,52 @@ SendAsPeers::SendAsPeers(not_null<Session*> session)
 	}) | rpl::distinct_until_changed(
 	) | rpl::filter([=](not_null<PeerData*> peer, int) {
 		return _lists.contains(peer) || _lastRequestTime.contains(peer);
-	}) | rpl::start_with_next([=](not_null<PeerData*> peer, int) {
+	}) | rpl::on_next([=](not_null<PeerData*> peer, int) {
 		refresh(peer, true);
 	}, _lifetime);
 }
 
-bool SendAsPeers::shouldChoose(not_null<PeerData*> peer) {
-	refresh(peer);
-	const auto channel = peer->asBroadcast();
-	return Data::CanSendAnything(peer, false)
-		&& (list(peer).size() > 1)
+bool SendAsPeers::shouldChoose(SendAsKey key) {
+	refresh(key);
+	if (list(key).size() < 2) {
+		return false;
+	}
+	if (key.type == SendAsType::VideoStream) {
+		return true;
+	}
+	const auto channel = key.peer->asBroadcast();
+	return Data::CanSendAnything(key.peer, false)
 		&& (!channel
 			|| channel->addsSignature()
 			|| channel->signatureProfiles());
 }
 
-void SendAsPeers::refresh(not_null<PeerData*> peer, bool force) {
-	if (!peer->isChannel()) {
+void SendAsPeers::refresh(SendAsKey key, bool force) {
+	if (key.type != SendAsType::VideoStream && !key.peer->isChannel()) {
 		return;
 	}
 	const auto now = crl::now();
-	const auto i = _lastRequestTime.find(peer);
+	const auto i = _lastRequestTime.find(key);
 	const auto when = (i == end(_lastRequestTime)) ? -1 : i->second;
 	if (!force && (when >= 0 && now < when + kRequestEach)) {
 		return;
 	}
-	_lastRequestTime[peer] = now;
-	request(peer);
+	_lastRequestTime[key] = now;
+	request(key);
+	if (key.type == SendAsType::Message) {
+		request({ key.peer, SendAsType::PaidReaction });
+	}
 }
 
-const std::vector<SendAsPeer> &SendAsPeers::list(
-		not_null<PeerData*> peer) const {
-	const auto i = _lists.find(peer);
+const std::vector<SendAsPeer> &SendAsPeers::list(SendAsKey key) const {
+	if (key.type != SendAsType::VideoStream && !key.peer->isChannel()) {
+		return _onlyMe;
+	}
+	const auto i = _lists.find(key);
 	return (i != end(_lists)) ? i->second : _onlyMe;
 }
 
-rpl::producer<not_null<PeerData*>> SendAsPeers::updated() const {
+rpl::producer<SendAsKey> SendAsPeers::updated() const {
 	return _updates.events();
 }
 
@@ -81,8 +92,8 @@ void SendAsPeers::saveChosen(
 		not_null<PeerData*> peer,
 		not_null<PeerData*> chosen) {
 	peer->session().api().request(MTPmessages_SaveDefaultSendAs(
-		peer->input,
-		chosen->input
+		peer->input(),
+		chosen->input()
 	)).send();
 
 	setChosen(peer, chosen->id);
@@ -100,7 +111,7 @@ void SendAsPeers::setChosen(not_null<PeerData*> peer, PeerId chosenId) {
 	} else {
 		_chosen[peer] = chosenId;
 	}
-	_updates.fire_copy(peer);
+	_updates.fire({ peer });
 }
 
 PeerId SendAsPeers::chosen(not_null<PeerData*> peer) const {
@@ -110,7 +121,7 @@ PeerId SendAsPeers::chosen(not_null<PeerData*> peer) const {
 
 not_null<PeerData*> SendAsPeers::resolveChosen(
 		not_null<PeerData*> peer) const {
-	return ResolveChosen(peer, list(peer), chosen(peer));
+	return ResolveChosen(peer, list({ peer }), chosen(peer));
 }
 
 not_null<PeerData*> SendAsPeers::ResolveChosen(
@@ -133,12 +144,18 @@ not_null<PeerData*> SendAsPeers::ResolveChosen(
 		: fallback;
 }
 
-void SendAsPeers::request(not_null<PeerData*> peer) {
-	peer->session().api().request(MTPchannels_GetSendAs(
-		peer->input
+void SendAsPeers::request(SendAsKey key) {
+	using Flag = MTPchannels_GetSendAs::Flag;
+	key.peer->session().api().request(MTPchannels_GetSendAs(
+		MTP_flags((key.type == SendAsType::PaidReaction)
+			? Flag::f_for_paid_reactions
+			: (key.type == SendAsType::VideoStream)
+			? Flag::f_for_live_stories
+			: Flag()),
+		key.peer->input()
 	)).done([=](const MTPchannels_SendAsPeers &result) {
 		auto parsed = std::vector<SendAsPeer>();
-		auto &owner = peer->owner();
+		auto &owner = key.peer->owner();
 		result.match([&](const MTPDchannels_sendAsPeers &data) {
 			owner.processUsers(data.vusers());
 			owner.processChats(data.vchats());
@@ -156,14 +173,14 @@ void SendAsPeers::request(not_null<PeerData*> peer) {
 			}
 		});
 		if (parsed.size() > 1) {
-			auto &now = _lists[peer];
+			auto &now = _lists[key];
 			if (now != parsed) {
 				now = std::move(parsed);
-				_updates.fire_copy(peer);
+				_updates.fire_copy(key);
 			}
-		} else if (const auto i = _lists.find(peer); i != end(_lists)) {
+		} else if (const auto i = _lists.find(key); i != end(_lists)) {
 			_lists.erase(i);
-			_updates.fire_copy(peer);
+			_updates.fire_copy(key);
 		}
 	}).send();
 }
diff --git a/Telegram/SourceFiles/main/session/send_as_peers.h b/Telegram/SourceFiles/main/session/send_as_peers.h
index b047ca3ce543af..df09f6b4616cbf 100644
--- a/Telegram/SourceFiles/main/session/send_as_peers.h
+++ b/Telegram/SourceFiles/main/session/send_as_peers.h
@@ -20,20 +20,43 @@ struct SendAsPeer {
 	friend inline auto operator<=>(SendAsPeer, SendAsPeer) = default;
 };
 
+enum class SendAsType : uchar {
+	Message,
+	PaidReaction,
+	VideoStream,
+};
+
+struct SendAsKey {
+	SendAsKey(
+		not_null<PeerData*> peer,
+		SendAsType type = SendAsType::Message)
+	: peer(peer)
+	, type(type) {
+	}
+
+	friend inline auto operator<=>(SendAsKey, SendAsKey) = default;
+	friend inline bool operator==(SendAsKey, SendAsKey) = default;
+
+	not_null<PeerData*> peer;
+	SendAsType type = SendAsType::Message;
+};
+
 class SendAsPeers final {
 public:
 	explicit SendAsPeers(not_null<Session*> session);
 
-	bool shouldChoose(not_null<PeerData*> peer);
-	void refresh(not_null<PeerData*> peer, bool force = false);
-	[[nodiscard]] const std::vector<SendAsPeer> &list(
-		not_null<PeerData*> peer) const;
-	[[nodiscard]] rpl::producer<not_null<PeerData*>> updated() const;
+	bool shouldChoose(SendAsKey key);
+	void refresh(SendAsKey key, bool force = false);
+	[[nodiscard]] const std::vector<SendAsPeer> &list(SendAsKey key) const;
+	[[nodiscard]] rpl::producer<SendAsKey> updated() const;
 
 	void saveChosen(not_null<PeerData*> peer, not_null<PeerData*> chosen);
 	void setChosen(not_null<PeerData*> peer, PeerId chosenId);
 	[[nodiscard]] PeerId chosen(not_null<PeerData*> peer) const;
 
+	[[nodiscard]] const std::vector<not_null<PeerData*>> &paidReactionList(
+		not_null<PeerData*> peer) const;
+
 	// If !list(peer).empty() then the result will be from that list.
 	[[nodiscard]] not_null<PeerData*> resolveChosen(
 		not_null<PeerData*> peer) const;
@@ -44,16 +67,17 @@ class SendAsPeers final {
 		PeerId chosen);
 
 private:
-	void request(not_null<PeerData*> peer);
+	void request(SendAsKey key);
 
 	const not_null<Session*> _session;
 	const std::vector<SendAsPeer> _onlyMe;
+	const std::vector<not_null<PeerData*>> _onlyMePaid;
 
-	base::flat_map<not_null<PeerData*>, std::vector<SendAsPeer>> _lists;
-	base::flat_map<not_null<PeerData*>, crl::time> _lastRequestTime;
+	base::flat_map<SendAsKey, std::vector<SendAsPeer>> _lists;
+	base::flat_map<SendAsKey, crl::time> _lastRequestTime;
 	base::flat_map<not_null<PeerData*>, PeerId> _chosen;
 
-	rpl::event_stream<not_null<PeerData*>> _updates;
+	rpl::event_stream<SendAsKey> _updates;
 
 	rpl::lifetime _lifetime;
 
diff --git a/Telegram/SourceFiles/main/session/session_show.cpp b/Telegram/SourceFiles/main/session/session_show.cpp
index a9914e87d8c0eb..1f740d44138595 100644
--- a/Telegram/SourceFiles/main/session/session_show.cpp
+++ b/Telegram/SourceFiles/main/session/session_show.cpp
@@ -7,6 +7,11 @@ For license and copyright information please follow this link:
 */
 #include "main/session/session_show.h"
 
+#include "chat_helpers/message_field.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/layers/generic_box.h"
+
 namespace Main {
 namespace {
 
@@ -70,6 +75,14 @@ Session &SimpleSessionShow::session() const {
 
 } // namespace
 
+bool SessionShow::showFrozenError() {
+	if (!session().frozen()) {
+		return false;
+	}
+	showBox(Box(FrozenInfoBox, &session(), FreezeInfoStyleOverride()));
+	return true;
+}
+
 std::shared_ptr<SessionShow> MakeSessionShow(
 		std::shared_ptr<Ui::Show> show,
 		not_null<Session*> session) {
diff --git a/Telegram/SourceFiles/main/session/session_show.h b/Telegram/SourceFiles/main/session/session_show.h
index ae764e1254f713..16f8e6f9136725 100644
--- a/Telegram/SourceFiles/main/session/session_show.h
+++ b/Telegram/SourceFiles/main/session/session_show.h
@@ -16,6 +16,9 @@ class Session;
 class SessionShow : public Ui::Show {
 public:
 	[[nodiscard]] virtual Main::Session &session() const = 0;
+
+	bool showFrozenError();
+
 };
 
 [[nodiscard]] std::shared_ptr<SessionShow> MakeSessionShow(
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 90941598832695..5196e8435a727c 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -16,6 +16,7 @@ For license and copyright information please follow this link:
 #include "data/data_web_page.h"
 #include "data/data_game.h"
 #include "data/data_peer_values.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "data/data_folder.h"
@@ -43,6 +44,7 @@ For license and copyright information please follow this link:
 #include "window/window_history_hider.h"
 #include "window/window_controller.h"
 #include "window/window_peer_menu.h"
+#include "window/window_session_controller_link_info.h"
 #include "window/themes/window_theme.h"
 #include "chat_helpers/bot_command.h"
 #include "chat_helpers/tabbed_selector.h" // TabbedSelector::refreshStickers
@@ -51,10 +53,11 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "dialogs/dialogs_widget.h"
 #include "history/history_widget.h"
-#include "history/history_item_helpers.h" // GetErrorTextForSending.
+#include "history/history_drag_area.h"
+#include "history/history_item_helpers.h" // GetErrorForSending.
 #include "history/view/media/history_view_media.h"
+#include "history/view/history_view_chat_section.h"
 #include "history/view/history_view_service_message.h"
-#include "history/view/history_view_sublist_section.h"
 #include "lang/lang_keys.h"
 #include "lang/lang_cloud_manager.h"
 #include "inline_bots/inline_bot_layout_item.h"
@@ -68,10 +71,12 @@ For license and copyright information please follow this link:
 #include "media/player/media_player_dropdown.h"
 #include "media/player/media_player_instance.h"
 #include "base/qthelp_regex.h"
+#include "base/options.h"
 #include "mtproto/mtproto_dc_options.h"
 #include "core/update_checker.h"
 #include "core/shortcuts.h"
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "core/changelogs.h"
 #include "core/mime_type.h"
 #include "calls/calls_call.h"
@@ -85,7 +90,7 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "main/main_app_config.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "support/support_helper.h"
 #include "storage/storage_user_photos.h"
 #include "styles/style_dialogs.h"
@@ -103,8 +108,16 @@ void ClearBotStartToken(PeerData *peer) {
 	}
 }
 
+base::options::toggle ForceComposeSearchOneColumn({
+	.id = kForceComposeSearchOneColumn,
+	.name = "Force embedded search in chats",
+	.description = "Force in one-column mode the embedded search in chats.",
+});
+
 } // namespace
 
+const char kForceComposeSearchOneColumn[] = "force-compose-search-one-column";
+
 enum StackItemType {
 	HistoryStackItem,
 	SectionStackItem,
@@ -221,6 +234,8 @@ StackItemSection::StackItemSection(
 rpl::producer<> StackItemSection::sectionRemoveRequests() const {
 	if (const auto topic = _memento->topicForRemoveRequests()) {
 		return rpl::merge(_memento->removeRequests(), topic->destroyed());
+	} else if (const auto sublist = _memento->sublistForRemoveRequests()) {
+		return rpl::merge(_memento->removeRequests(), sublist->destroyed());
 	}
 	return _memento->removeRequests();
 }
@@ -262,16 +277,16 @@ MainWidget::MainWidget(
 	}
 
 	_history->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		handleHistoryBack();
 	}, lifetime());
 
 	Core::App().calls().currentCallValue(
-	) | rpl::start_with_next([=](Calls::Call *call) {
+	) | rpl::on_next([=](Calls::Call *call) {
 		setCurrentCall(call);
 	}, lifetime());
 	Core::App().calls().currentGroupCallValue(
-	) | rpl::start_with_next([=](Calls::GroupCall *call) {
+	) | rpl::on_next([=](Calls::GroupCall *call) {
 		setCurrentGroupCall(call);
 	}, lifetime());
 	if (_callTopBar) {
@@ -282,12 +297,12 @@ MainWidget::MainWidget(
 		floatPlayerDelegate());
 
 	Core::App().floatPlayerClosed(
-	) | rpl::start_with_next([=](FullMsgId itemId) {
+	) | rpl::on_next([=](FullMsgId itemId) {
 		floatPlayerClosed(itemId);
 	}, lifetime());
 
 	Core::App().exportManager().currentView(
-	) | rpl::start_with_next([=](Export::View::PanelController *view) {
+	) | rpl::on_next([=](Export::View::PanelController *view) {
 		setCurrentExportView(view);
 	}, lifetime());
 	if (_exportTopBar) {
@@ -295,12 +310,12 @@ MainWidget::MainWidget(
 	}
 
 	Media::Player::instance()->closePlayerRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeBothPlayers();
 	}, lifetime());
 
 	Media::Player::instance()->updatedNotifier(
-	) | rpl::start_with_next([=](const Media::Player::TrackState &state) {
+	) | rpl::on_next([=](const Media::Player::TrackState &state) {
 		handleAudioUpdate(state);
 	}, lifetime());
 	handleAudioUpdate(Media::Player::instance()->getState(AudioMsgId::Type::Song));
@@ -310,7 +325,7 @@ MainWidget::MainWidget(
 	}
 
 	_controller->chatsForceDisplayWideChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		crl::on_main(this, [=] {
 			updateDialogsWidthAnimated();
 		});
@@ -327,13 +342,13 @@ MainWidget::MainWidget(
 		Core::App().settings().dialogsNoChatWidthRatioChanges(
 		) | filter(false) | rpl::to_empty,
 		Core::App().settings().thirdColumnWidthChanges() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateControlsGeometry();
 	}, lifetime());
 
 	session().changes().historyUpdates(
 		Data::HistoryUpdate::Flag::MessageSent
-	) | rpl::start_with_next([=](const Data::HistoryUpdate &update) {
+	) | rpl::on_next([=](const Data::HistoryUpdate &update) {
 		const auto history = update.history;
 		history->forgetScrollState();
 		if (const auto from = history->peer->migrateFrom()) {
@@ -346,7 +361,7 @@ MainWidget::MainWidget(
 
 	session().changes().entryUpdates(
 		Data::EntryUpdate::Flag::LocalDraftSet
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		auto params = Window::SectionShow();
 		params.reapplyLocalDraft = true;
 		controller->showThread(
@@ -377,14 +392,14 @@ MainWidget::MainWidget(
 			return std::make_tuple(key, can);
 		});
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([this](Dialogs::Key key, bool canWrite) {
+	) | rpl::on_next([this](Dialogs::Key key, bool canWrite) {
 		updateThirdColumnToCurrentChat(key, canWrite);
 	}, lifetime());
 
 	QCoreApplication::instance()->installEventFilter(this);
 
 	Media::Player::instance()->tracksFinished(
-	) | rpl::start_with_next([=](AudioMsgId::Type type) {
+	) | rpl::on_next([=](AudioMsgId::Type type) {
 		if (type == AudioMsgId::Type::Voice) {
 			const auto songState = Media::Player::instance()->getState(
 				AudioMsgId::Type::Song);
@@ -401,7 +416,7 @@ MainWidget::MainWidget(
 	}, lifetime());
 
 	_controller->adaptive().changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		handleAdaptiveLayoutUpdate();
 	}, lifetime());
 
@@ -423,9 +438,22 @@ MainWidget::MainWidget(
 	cSetOtherOnline(0);
 
 	session().data().stickers().notifySavedGifsUpdated();
+
+	const auto weak = base::make_weak(controller);
+	DragArea::SetupProxyDropArea(this, [=](const QString &localUrl) {
+		Core::App().openLocalUrl(
+			localUrl,
+			QVariant::fromValue(ClickHandlerContext{
+				.sessionWindow = weak,
+			}));
+	});
 }
 
-MainWidget::~MainWidget() = default;
+MainWidget::~MainWidget() {
+	if (_controller->activeChatCurrent()) {
+		session().api().saveCurrentDraftToCloud();
+	}
+}
 
 Main::Session &MainWidget::session() const {
 	return _controller->session();
@@ -442,7 +470,7 @@ void MainWidget::setupConnectingWidget() {
 		&session().account(),
 		_controller->adaptive().oneColumnValue() | rpl::map(!_1));
 	_controller->connectingBottomSkipValue(
-	) | rpl::start_with_next([=](int skip) {
+	) | rpl::on_next([=](int skip) {
 		_connecting->setBottomSkip(skip);
 	}, lifetime());
 }
@@ -555,19 +583,20 @@ bool MainWidget::setForwardDraft(
 	const auto history = thread->owningHistory();
 	const auto items = session().data().idsToItems(draft.ids);
 	const auto topicRootId = thread->topicRootId();
-	const auto error = GetErrorTextForSending(
+	const auto monoforumPeerId = thread->monoforumPeerId();
+	const auto error = GetErrorForSending(
 		history->peer,
 		{
 			.topicRootId = topicRootId,
 			.forward = &items,
 			.ignoreSlowmodeCountdown = true,
 		});
-	if (!error.isEmpty()) {
-		_controller->show(Ui::MakeInformBox(error));
+	if (error) {
+		Data::ShowSendErrorToast(_controller, history->peer, error);
 		return false;
 	}
 
-	history->setForwardDraft(topicRootId, std::move(draft));
+	history->setForwardDraft(topicRootId, monoforumPeerId, std::move(draft));
 	_controller->showThread(
 		thread,
 		ShowAtUnreadMsgId,
@@ -594,12 +623,17 @@ bool MainWidget::shareUrl(
 	};
 	const auto history = thread->owningHistory();
 	const auto topicRootId = thread->topicRootId();
+	const auto monoforumPeerId = thread->monoforumPeerId();
 	history->setLocalDraft(std::make_unique<Data::Draft>(
 		textWithTags,
-		FullReplyTo{ .topicRootId = topicRootId },
+		FullReplyTo{
+			.topicRootId = topicRootId,
+			.monoforumPeerId = monoforumPeerId,
+		},
+		SuggestOptions(),
 		cursor,
 		Data::WebPageDraft()));
-	history->clearLocalEditDraft(topicRootId);
+	history->clearLocalEditDraft(topicRootId, monoforumPeerId);
 	history->session().changes().entryUpdated(
 		thread,
 		Data::EntryUpdate::Flag::LocalDraftSet);
@@ -610,12 +644,12 @@ bool MainWidget::sendPaths(
 		not_null<Data::Thread*> thread,
 		const QStringList &paths) {
 	if (!Data::CanSendAnyOf(thread, Data::FilesSendRestrictions())) {
-		_controller->show(Ui::MakeInformBox(
-			tr::lng_forward_send_files_cant()));
+		_controller->showToast(
+			tr::lng_forward_send_files_cant(tr::now));
 		return false;
 	} else if (const auto error = Data::AnyFileRestrictionError(
 			thread->peer())) {
-		_controller->show(Ui::MakeInformBox(*error));
+		Data::ShowSendErrorToast(controller(), thread->peer(), error);
 		return false;
 	} else {
 		_controller->showThread(
@@ -631,17 +665,31 @@ bool MainWidget::sendPaths(
 
 bool MainWidget::filesOrForwardDrop(
 		not_null<Data::Thread*> thread,
-		not_null<const QMimeData*> data) {
-	if (const auto forum = thread->asForum()) {
-		Window::ShowDropMediaBox(
-			_controller,
-			Core::ShareMimeMediaData(data),
-			forum);
-		if (_hider) {
-			_hider->startHide();
-			clearHider(_hider);
+		not_null<const QMimeData*> data,
+		bool forumResolved) {
+	if (!forumResolved) {
+		if (const auto forum = thread->asForum()) {
+			Window::ShowDropMediaBox(
+				_controller,
+				Core::ShareMimeMediaData(data),
+				forum);
+			if (_hider) {
+				_hider->startHide();
+				clearHider(_hider);
+			}
+			return true;
+		} else if (const auto history = thread->asHistory()
+			; history && history->peer->monoforum()) {
+			Window::ShowDropMediaBox(
+				_controller,
+				Core::ShareMimeMediaData(data),
+				history->peer->monoforum());
+			if (_hider) {
+				_hider->startHide();
+				clearHider(_hider);
+			}
+			return true;
 		}
-		return true;
 	}
 	if (data->hasFormat(u"application/x-td-forward"_q)) {
 		auto draft = Data::ForwardDraft{
@@ -658,12 +706,12 @@ bool MainWidget::filesOrForwardDrop(
 		}
 		return false;
 	} else if (!Data::CanSendAnyOf(thread, Data::FilesSendRestrictions())) {
-		_controller->show(Ui::MakeInformBox(
-			tr::lng_forward_send_files_cant()));
+		_controller->showToast(
+			tr::lng_forward_send_files_cant(tr::now));
 		return false;
 	} else if (const auto error = Data::AnyFileRestrictionError(
 			thread->peer())) {
-		_controller->show(Ui::MakeInformBox(*error));
+		Data::ShowSendErrorToast(_controller, thread->peer(), error);
 		return false;
 	} else {
 		_controller->showThread(
@@ -700,7 +748,7 @@ void MainWidget::hiderLayer(base::unique_qptr<Window::HistoryHider> hider) {
 	_hider->setParent(this);
 
 	_hider->hidden(
-	) | rpl::start_with_next([=, instance = _hider.get()] {
+	) | rpl::on_next([=, instance = _hider.get()] {
 		clearHider(instance);
 		instance->hide();
 		instance->deleteLater();
@@ -743,13 +791,30 @@ void MainWidget::hideSingleUseKeyboard(FullMsgId replyToId) {
 	_history->hideSingleUseKeyboard(replyToId);
 }
 
-void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat) {
+void MainWidget::searchMessages(
+		const QString &query,
+		Dialogs::Key inChat,
+		PeerData *searchFrom) {
+	const auto complex = Data::HashtagWithUsernameFromQuery(query);
+	if (!complex.username.isEmpty()) {
+		_controller->showPeerByLink(Window::PeerByLinkInfo{
+			.usernameOrId = complex.username,
+			.text = complex.hashtag,
+			.resolveType = Window::ResolveType::HashtagSearch,
+		});
+		return;
+	}
 	auto tags = Data::SearchTagsFromQuery(query);
-	if (_dialogs) {
+	const auto archiveWindow = (_controller->windowId().type
+		== Window::SeparateType::Archive);
+	if (_dialogs
+		&& !archiveWindow
+		&& (!ForceComposeSearchOneColumn.value() || !isOneColumn())) {
 		auto state = Dialogs::SearchState{
 			.inChat = ((tags.empty() || inChat.sublist())
 				? inChat
 				: session().data().history(session().user())),
+			.fromPeer = inChat ? searchFrom : nullptr,
 			.tags = tags,
 			.query = tags.empty() ? query : QString(),
 		};
@@ -762,20 +827,27 @@ void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat) {
 		}
 	} else {
 		if (const auto sublist = inChat.sublist()) {
+			using namespace HistoryView;
 			controller()->showSection(
-				std::make_shared<HistoryView::SublistMemento>(sublist));
+				std::make_shared<ChatMemento>(ChatViewId{
+					.history = sublist->owningHistory(),
+					.sublist = sublist,
+				}));
 		} else if (!tags.empty()) {
 			inChat = controller()->session().data().history(
 				controller()->session().user());
 		}
 		if ((!_mainSection
-			|| !_mainSection->searchInChatEmbedded(inChat, query))
-			&& !_history->searchInChatEmbedded(inChat, query)) {
+			|| !_mainSection->searchInChatEmbedded(query, inChat, searchFrom))
+			&& !_history->searchInChatEmbedded(query, inChat, searchFrom)) {
 			const auto account = not_null(&session().account());
 			if (const auto window = Core::App().windowFor(account)) {
 				if (const auto controller = window->sessionController()) {
-					controller->content()->searchMessages(query, inChat);
 					controller->widget()->activate();
+					controller->content()->searchMessages(
+						query,
+						inChat,
+						searchFrom);
 				}
 			}
 		}
@@ -833,7 +905,7 @@ void MainWidget::createPlayer() {
 		rpl::merge(
 			_player->heightValue() | rpl::map_to(true),
 			_player->shownValue()
-		) | rpl::start_with_next(
+		) | rpl::on_next(
 			[this] { playerHeightUpdated(); },
 			_player->lifetime());
 		_player->entity()->setCloseCallback([=] {
@@ -852,7 +924,7 @@ void MainWidget::createPlayer() {
 		});
 
 		_player->entity()->togglePlaylistRequests(
-		) | rpl::start_with_next([=](bool shown) {
+		) | rpl::on_next([=](bool shown) {
 			if (!shown) {
 				_playerPlaylist->hideFromOther();
 				return;
@@ -909,15 +981,15 @@ void MainWidget::setCurrentCall(Calls::Call *call) {
 	}
 	_currentCallLifetime.destroy();
 	_currentCall = call;
-	if (_currentCall) {
+	if (call) {
 		_callTopBar.destroy();
-		_currentCall->stateValue(
-		) | rpl::start_with_next([=](Calls::Call::State state) {
+		call->stateValue(
+		) | rpl::on_next([=](Calls::Call::State state) {
 			using State = Calls::Call::State;
 			if (state != State::Established) {
 				destroyCallTopBar();
 			} else if (!_callTopBar) {
-				createCallTopBar();
+				createCallTopBar(call, nullptr);
 			}
 		}, _currentCallLifetime);
 	} else {
@@ -931,10 +1003,10 @@ void MainWidget::setCurrentGroupCall(Calls::GroupCall *call) {
 	}
 	_currentCallLifetime.destroy();
 	_currentGroupCall = call;
-	if (_currentGroupCall) {
+	if (call) {
 		_callTopBar.destroy();
 		_currentGroupCall->stateValue(
-		) | rpl::start_with_next([=](Calls::GroupCall::State state) {
+		) | rpl::on_next([=](Calls::GroupCall::State state) {
 			using State = Calls::GroupCall::State;
 			if (state != State::Creating
 				&& state != State::Waiting
@@ -943,7 +1015,7 @@ void MainWidget::setCurrentGroupCall(Calls::GroupCall *call) {
 				&& state != State::Connecting) {
 				destroyCallTopBar();
 			} else if (!_callTopBar) {
-				createCallTopBar();
+				createCallTopBar(nullptr, call);
 			}
 		}, _currentCallLifetime);
 	} else {
@@ -951,18 +1023,20 @@ void MainWidget::setCurrentGroupCall(Calls::GroupCall *call) {
 	}
 }
 
-void MainWidget::createCallTopBar() {
-	Expects(_currentCall != nullptr || _currentGroupCall != nullptr);
+void MainWidget::createCallTopBar(
+		Calls::Call *call,
+		Calls::GroupCall *group) {
+	Expects(call || group);
 
 	const auto show = controller()->uiShow();
 	_callTopBar.create(
 		this,
-		(_currentCall
-			? object_ptr<Calls::TopBar>(this, _currentCall, show)
-			: object_ptr<Calls::TopBar>(this, _currentGroupCall, show)));
+		(call
+			? object_ptr<Calls::TopBar>(this, call, show)
+			: object_ptr<Calls::TopBar>(this, group, show)));
 	_callTopBar->entity()->initBlobsUnder(this, _callTopBar->geometryValue());
 	_callTopBar->heightValue(
-	) | rpl::start_with_next([this](int value) {
+	) | rpl::on_next([this](int value) {
 		callTopBarHeightUpdated(value);
 	}, lifetime());
 	orderWidgets();
@@ -998,7 +1072,7 @@ void MainWidget::setCurrentExportView(Export::View::PanelController *view) {
 	_currentExportView = view;
 	if (_currentExportView) {
 		_currentExportView->progressState(
-		) | rpl::start_with_next([=](Export::View::Content &&data) {
+		) | rpl::on_next([=](Export::View::Content &&data) {
 			if (!data.rows.empty()
 				&& data.rows[0].id == Export::View::Content::kDoneId) {
 				LOG(("Export Info: Destroy top bar by Done."));
@@ -1024,7 +1098,7 @@ void MainWidget::createExportTopBar(Export::View::Content &&data) {
 		object_ptr<Export::View::TopBar>(this, std::move(data)),
 		_controller->adaptive().oneColumnValue());
 	_exportTopBar->entity()->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_currentExportView) {
 			_currentExportView->activatePanel();
 		}
@@ -1042,7 +1116,7 @@ void MainWidget::createExportTopBar(Export::View::Content &&data) {
 	rpl::merge(
 		_exportTopBar->heightValue() | rpl::map_to(true),
 		_exportTopBar->shownValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		exportTopBarHeightUpdated();
 	}, _exportTopBar->lifetime());
 }
@@ -1070,7 +1144,15 @@ void MainWidget::exportTopBarHeightUpdated() {
 }
 
 SendMenu::Details MainWidget::sendMenuDetails() const {
-	return _history->sendMenuDetails();
+	return _mainSection
+		? _mainSection->sendMenuDetails()
+		: _history->sendMenuDetails();
+}
+
+bool MainWidget::processChosenSticker(ChatHelpers::FileChosen &&chosen) {
+	return _mainSection
+		? _mainSection->processChosenSticker(std::move(chosen))
+		: _history->processChosenSticker(std::move(chosen));
 }
 
 void MainWidget::dialogsCancelled() {
@@ -1081,6 +1163,12 @@ void MainWidget::dialogsCancelled() {
 	_history->activate();
 }
 
+void MainWidget::toggleFiltersMenu(bool value) const {
+	if (_dialogs) {
+		_dialogs->toggleFiltersMenu(value);
+	}
+}
+
 void MainWidget::setChatBackground(
 		const Data::WallPaper &background,
 		QImage &&image) {
@@ -1143,7 +1231,7 @@ float64 MainWidget::chatBackgroundProgress() const {
 	if (_background) {
 		if (_background->generating) {
 			return 1.;
-		} else if (const auto document = _background->data.document()) {
+		} else if (_background->data.document()) {
 			return _background->dataMedia->progress();
 		}
 	}
@@ -1266,6 +1354,8 @@ bool MainWidget::showHistoryInDifferentWindow(
 		return true;
 	} else if (windowId().hasChatsList()) {
 		return false;
+	} else if (params.preferCurrentWindow) {
+		return false;
 	}
 	const auto account = not_null(&session().account());
 	auto primary = Core::App().separateWindowFor(account);
@@ -1324,6 +1414,7 @@ void MainWidget::showHistory(
 	}
 
 	if (peerId && params.activation != anim::activation::background) {
+		Core::App().hideMediaView();
 		_controller->window().activate();
 	}
 
@@ -1357,18 +1448,21 @@ void MainWidget::showHistory(
 		}
 		_stack.clear();
 	} else {
-		for (auto i = 0, s = int(_stack.size()); i < s; ++i) {
-			if (_stack.at(i)->type() == HistoryStackItem && _stack.at(i)->peer()->id == peerId) {
-				foundInStack = true;
-				while (int(_stack.size()) > i + 1) {
-					ClearBotStartToken(_stack.back()->peer());
+		if (!params.allowDuplicateInStack) {
+			for (auto i = 0, s = int(_stack.size()); i < s; ++i) {
+				if (_stack.at(i)->type() == HistoryStackItem
+					&& _stack.at(i)->peer()->id == peerId) {
+					foundInStack = true;
+					while (int(_stack.size()) > i + 1) {
+						ClearBotStartToken(_stack.back()->peer());
+						_stack.pop_back();
+					}
 					_stack.pop_back();
+					if (!back) {
+						back = true;
+					}
+					break;
 				}
-				_stack.pop_back();
-				if (!back) {
-					back = true;
-				}
-				break;
 			}
 		}
 		if (const auto activeChat = _controller->activeChatCurrent()) {
@@ -1391,6 +1485,9 @@ void MainWidget::showHistory(
 			|| (params.animated == anim::type::instant)) {
 			return false;
 		}
+		if (params.slideFromBottom) {
+			return !_history->isHidden();
+		}
 		if (!peerId) {
 			if (isOneColumn()) {
 				return _dialogs && _dialogs->isHidden();
@@ -1425,11 +1522,7 @@ void MainWidget::showHistory(
 		&& way != Way::Forward) {
 		ClearBotStartToken(_history->peer());
 	}
-	_history->showHistory(
-		peerId,
-		showAtMsgId,
-		params.highlightPart,
-		params.highlightPartOffsetHint);
+	_history->showHistory(peerId, showAtMsgId, params);
 	if (alreadyThatPeer && params.reapplyLocalDraft) {
 		_history->applyDraft(HistoryWidget::FieldHistoryAction::NewEntry);
 	}
@@ -1468,12 +1561,14 @@ void MainWidget::showHistory(
 		if (!_showAnimation) {
 			if (!animationParams.oldContentCache.isNull()) {
 				_history->showAnimated(
-					back
+					params.slideFromBottom
+						? Window::SlideDirection::FromBottom
+						: back
 						? Window::SlideDirection::FromLeft
 						: Window::SlideDirection::FromRight,
 					animationParams);
 			} else {
-				_history->show();
+				_history->showFast();
 				crl::on_main(this, [=] {
 					_controller->widget()->setInnerFocus();
 				});
@@ -1493,6 +1588,19 @@ void MainWidget::showHistory(
 	}
 
 	floatPlayerCheckVisibility();
+
+	controller()->dropSubsectionTabs();
+}
+
+bool MainWidget::handleDrawToReplyRequest(Data::DrawToReplyRequest request) {
+	if (_mainSection) {
+		using namespace HistoryView;
+		if (const auto с = dynamic_cast<ChatWidget*>(_mainSection.data())) {
+			return с->handleDrawToReplyRequest(std::move(request));
+		}
+		return false;
+	}
+	return _history->handleDrawToReplyRequest(std::move(request));
 }
 
 void MainWidget::showMessage(
@@ -1505,6 +1613,7 @@ void MainWidget::showMessage(
 			if (_mainSection->showMessage(peerId, params, itemId)) {
 				if (params.activation != anim::activation::background) {
 					_controller->window().activate();
+					_controller->window().hideSettingsAndLayer();
 				}
 				return;
 			}
@@ -1520,6 +1629,12 @@ void MainWidget::showMessage(
 		if (params.activation != anim::activation::background) {
 			_controller->window().activate();
 		}
+	} else if (const auto sublist = item->savedSublist()
+		; sublist && sublist->parentChat()) {
+		_controller->showSublist(sublist, item->id, params);
+		if (params.activation != anim::activation::background) {
+			_controller->window().activate();
+		}
 	} else {
 		// showPeerHistory may be redirected to different window,
 		// so we don't call activate() on current controller's window.
@@ -1581,7 +1696,7 @@ bool MainWidget::saveSectionInStack(
 	const auto raw = _stack.back().get();
 	raw->setThirdSectionWeak(_thirdSection.data());
 	raw->removeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto i = begin(_stack); i != end(_stack); ++i) {
 			if (i->get() == raw) {
 				_stack.erase(i);
@@ -1722,9 +1837,9 @@ void MainWidget::showNewSection(
 	auto saveInStack = (params.way == SectionShow::Way::Forward);
 	const auto thirdSectionTop = getThirdSectionTop();
 	const auto newThirdGeometry = QRect(
-		width() - st::columnMinimalWidthThird,
+		width() - _thirdColumnWidth,
 		thirdSectionTop,
-		st::columnMinimalWidthThird,
+		_thirdColumnWidth,
 		height() - thirdSectionTop);
 	auto newThirdSection = (isThreeColumn() && params.thirdColumn)
 		? memento->createWidget(
@@ -1803,7 +1918,7 @@ void MainWidget::showNewSection(
 	if (newThirdSection) {
 		_thirdSection = std::move(newThirdSection);
 		_thirdSection->removeRequests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			destroyThirdSection();
 			_thirdShadow.destroy();
 			updateControlsGeometry();
@@ -1939,23 +2054,23 @@ void MainWidget::showNonPremiumLimitToast(bool download) {
 				tr::now,
 				lt_percent,
 				TextWithEntities{ QString::number(percent - 100) },
-				Ui::Text::RichLangValue)
+				tr::rich)
 		: (download
 			? tr::lng_limit_download_increase_times
 			: tr::lng_limit_upload_increase_times)(
 				tr::now,
 				lt_count,
 				percent / 100,
-				Ui::Text::RichLangValue);
+				tr::rich);
 	auto text = (download
 		? tr::lng_limit_download_subscribe
 		: tr::lng_limit_upload_subscribe)(
 			tr::now,
 			lt_link,
-			Ui::Text::Link(Ui::Text::Bold(link)),
+			tr::link(tr::bold(link)),
 			lt_increase,
 			TextWithEntities{ increase },
-			Ui::Text::RichLangValue);
+			tr::rich);
 	auto filter = [=](ClickHandlerPtr handler, Qt::MouseButton button) {
 		Settings::ShowPremium(
 			controller(),
@@ -1987,6 +2102,8 @@ bool MainWidget::showBackFromStack(const SectionShow &params) {
 		});
 		return (_dialogs != nullptr);
 	}
+	session().api().saveCurrentDraftToCloud();
+
 	auto item = std::move(_stack.back());
 	_stack.pop_back();
 	if (const auto currentHistoryPeer = _history->peer()) {
@@ -2314,6 +2431,9 @@ void MainWidget::updateControlsGeometry() {
 						(thread->asTopic()
 							? std::make_shared<Info::Memento>(
 								thread->asTopic())
+							: thread->asSublist()
+							? std::make_shared<Info::Memento>(
+								thread->asSublist())
 							: Info::Memento::Default(
 								thread->asHistory()->peer)),
 						params.withThirdColumn());
@@ -2577,14 +2697,17 @@ auto MainWidget::thirdSectionForCurrentMainSection(
 		return std::move(_thirdSectionFromStack);
 	} else if (const auto topic = key.topic()) {
 		return std::make_shared<Info::Memento>(topic);
+	} else if (const auto sublist = key.sublist()
+		; sublist && sublist->parentChat()) {
+		return std::make_shared<Info::Memento>(sublist);
 	} else if (const auto peer = key.peer()) {
 		return std::make_shared<Info::Memento>(
 			peer,
 			Info::Memento::DefaultSection(peer));
 	} else if (const auto sublist = key.sublist()) {
 		return std::make_shared<Info::Memento>(
-			session().user(),
-			Info::Memento::DefaultSection(session().user()));
+			sublist->owningHistory()->peer,
+			Info::Memento::DefaultSection(sublist->owningHistory()->peer));
 	}
 	Unexpected("Key in MainWidget::thirdSectionForCurrentMainSection().");
 }
@@ -2708,6 +2831,7 @@ bool MainWidget::eventFilter(QObject *o, QEvent *e) {
 			const auto event = static_cast<QMouseEvent*>(e);
 			if (event->button() == Qt::BackButton) {
 				if (!Core::App().hideMediaView()
+					&& !_controller->window().closeLayerByBackButton()
 					&& (!_dialogs || !_dialogs->cancelSearchByMouseBack())) {
 					handleHistoryBack();
 				}
@@ -2735,6 +2859,9 @@ void MainWidget::handleAdaptiveLayoutUpdate() {
 }
 
 void MainWidget::handleHistoryBack() {
+	if (_mainSection && _mainSection->showBackInternal()) {
+		return;
+	}
 	const auto openedFolder = _controller->openedFolder().current();
 	const auto openedForum = _controller->shownForum().current();
 	const auto rootPeer = !_stack.empty()
@@ -2748,7 +2875,9 @@ void MainWidget::handleHistoryBack() {
 		? rootPeer->owner().historyLoaded(rootPeer)
 		: nullptr;
 	const auto rootFolder = rootHistory ? rootHistory->folder() : nullptr;
-	if (openedForum && (!rootPeer || rootPeer->forum() != openedForum)) {
+	if (openedForum
+		&& _stack.empty()
+		&& (!rootPeer || rootPeer->forum() != openedForum)) {
 		_controller->closeForum();
 	} else if (!openedFolder
 		|| (rootFolder == openedFolder)
@@ -2829,29 +2958,14 @@ int MainWidget::backgroundFromY() const {
 
 bool MainWidget::contentOverlapped(const QRect &globalRect) {
 	return _history->contentOverlapped(globalRect)
-		|| _playerPlaylist->overlaps(globalRect);
+		/*|| _playerPlaylist->overlaps(globalRect)*/;
 }
 
 void MainWidget::activate() {
 	if (_showAnimation) {
 		return;
-	} else if (const auto paths = cSendPaths(); !paths.isEmpty()) {
-		const auto interpret = u"interpret://"_q;
-		cSetSendPaths(QStringList());
-		if (paths[0].startsWith(interpret)) {
-			const auto error = Support::InterpretSendPath(
-				_controller,
-				paths[0].mid(interpret.size()));
-			if (!error.isEmpty()) {
-				_controller->show(Ui::MakeInformBox(error));
-			}
-		} else {
-			const auto chosen = [=](not_null<Data::Thread*> thread) {
-				return sendPaths(thread, paths);
-			};
-			Window::ShowChooseRecipientBox(_controller, chosen);
-		}
-	} else if (_mainSection) {
+	}
+	if (_mainSection) {
 		_mainSection->setInnerFocus();
 	} else if (_hider) {
 		Assert(_dialogs != nullptr);
@@ -2867,6 +2981,25 @@ void MainWidget::activate() {
 	_controller->widget()->fixOrder();
 }
 
+void MainWidget::handleStartFiles(
+		QStringList interprets,
+		QStringList paths) {
+	for (const auto &interpret : interprets) {
+		const auto error = Support::InterpretSendPath(
+			_controller,
+			interpret);
+		if (!error.isEmpty()) {
+			_controller->show(Ui::MakeInformBox(error));
+		}
+	}
+	if (!paths.isEmpty()) {
+		const auto chosen = [=](not_null<Data::Thread*> thread) {
+			return sendPaths(thread, paths);
+		};
+		Window::ShowChooseRecipientBox(_controller, chosen);
+	}
+}
+
 bool MainWidget::animatingShow() const {
 	return _showAnimation != nullptr;
 }
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 4465e5685a7812..d3c03fc6699fcc 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -19,6 +19,10 @@ namespace Bot {
 struct SendCommandRequest;
 } // namespace Bot
 
+namespace ChatHelpers {
+struct FileChosen;
+} // namespace ChatHelpers
+
 namespace SendMenu {
 struct Details;
 } // namespace SendMenu
@@ -31,7 +35,9 @@ namespace Data {
 class Thread;
 class WallPaper;
 struct ForwardDraft;
+struct DrawToReplyRequest;
 class Forum;
+class SavedMessages;
 struct ReportInput;
 } // namespace Data
 
@@ -91,6 +97,8 @@ namespace Core {
 class Changelogs;
 } // namespace Core
 
+extern const char kForceComposeSearchOneColumn[];
+
 class MainWidget final
 	: public Ui::RpWidget
 	, private Media::Player::FloatDelegate {
@@ -119,6 +127,7 @@ class MainWidget final
 	void showAnimated(QPixmap oldContentCache, bool back = false);
 
 	void activate();
+	void handleStartFiles(QStringList interprets, QStringList paths);
 
 	void windowShown();
 
@@ -140,6 +149,7 @@ class MainWidget final
 	void checkMainSectionToLayer();
 
 	[[nodiscard]] SendMenu::Details sendMenuDetails() const;
+	bool processChosenSticker(ChatHelpers::FileChosen &&chosen);
 
 	[[nodiscard]] bool animatingShow() const;
 
@@ -158,12 +168,16 @@ class MainWidget final
 		const QString &text) const;
 	bool filesOrForwardDrop(
 		not_null<Data::Thread*> thread,
-		not_null<const QMimeData*> data);
+		not_null<const QMimeData*> data,
+		bool forumResolved = false);
 
 	void sendBotCommand(Bot::SendCommandRequest request);
 	void hideSingleUseKeyboard(FullMsgId replyToId);
 
-	void searchMessages(const QString &query, Dialogs::Key inChat);
+	void searchMessages(
+		const QString &query,
+		Dialogs::Key inChat,
+		PeerData *searchFrom = nullptr);
 
 	void setChatBackground(
 		const Data::WallPaper &background,
@@ -191,6 +205,7 @@ class MainWidget final
 		PeerId peer,
 		const SectionShow &params,
 		MsgId msgId);
+	bool handleDrawToReplyRequest(Data::DrawToReplyRequest request);
 	void showMessage(
 		not_null<const HistoryItem*> item,
 		const SectionShow &params);
@@ -210,6 +225,7 @@ class MainWidget final
 	void showNonPremiumLimitToast(bool download);
 
 	void dialogsCancelled();
+	void toggleFiltersMenu(bool value) const;
 
 private:
 	void paintEvent(QPaintEvent *e) override;
@@ -240,7 +256,7 @@ class MainWidget final
 
 	void setCurrentCall(Calls::Call *call);
 	void setCurrentGroupCall(Calls::GroupCall *call);
-	void createCallTopBar();
+	void createCallTopBar(Calls::Call *call, Calls::GroupCall *group);
 	void destroyCallTopBar();
 	void callTopBarHeightUpdated(int callTopBarHeight);
 
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index e7ed0c618d1ac3..7d6cb7db6c6799 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 #include "data/data_document_media.h"
 #include "dialogs/ui/dialogs_layout.h"
 #include "history/history.h"
+#include "history/history_drag_area.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/shadow.h"
@@ -43,6 +44,7 @@ For license and copyright information please follow this link:
 #include "window/window_main_menu.h"
 #include "window/window_controller.h" // App::wnd.
 #include "window/window_session_controller.h"
+#include "window/window_setup_email.h"
 #include "window/window_media_preview.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_layers.h"
@@ -89,17 +91,17 @@ MainWindow::MainWindow(not_null<Window::Controller*> controller)
 
 	using Window::Theme::BackgroundUpdate;
 	Window::Theme::Background()->updates(
-	) | rpl::start_with_next([=](const BackgroundUpdate &data) {
+	) | rpl::on_next([=](const BackgroundUpdate &data) {
 		themeUpdated(data);
 	}, lifetime());
 
 	Core::App().passcodeLockChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateGlobalMenu();
 	}, lifetime());
 
 	Ui::Emoji::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::ForceFullRepaint(this);
 	}, lifetime());
 
@@ -143,14 +145,16 @@ void MainWindow::finishFirstShow() {
 	windowActiveValue(
 	) | rpl::skip(1) | rpl::filter(
 		!rpl::mappers::_1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::Tooltip::Hide();
 	}, lifetime());
 
 	setAttribute(Qt::WA_NoSystemBackground);
 
-	if (!_passcodeLock && _main) {
+	if (!_passcodeLock && !_setupEmailLock && _main) {
 		_main->activate();
+	} else if (!_passcodeLock && !_setupEmailLock && _intro) {
+		_intro->setInnerFocus();
 	}
 }
 
@@ -161,10 +165,12 @@ void MainWindow::clearWidgetsHook() {
 	if (!Core::App().passcodeLocked()) {
 		_passcodeLock.destroy();
 	}
+	_setupEmailLock.destroy();
 }
 
 QPixmap MainWindow::grabForSlideAnimation() {
-	return Ui::GrabWidget(bodyWidget());
+	const auto body = bodyWidget();
+	return body->size().isEmpty() ? QPixmap() : Ui::GrabWidget(body);
 }
 
 void MainWindow::preventOrInvoke(Fn<void()> callback) {
@@ -198,6 +204,56 @@ void MainWindow::setupPasscodeLock() {
 	}
 }
 
+void MainWindow::setupSetupEmailLock() {
+	auto animated = (_main || _intro || _passcodeLock);
+	auto oldContentCache = animated ? grabForSlideAnimation() : QPixmap();
+	_setupEmailLock.create(bodyWidget(), &controller());
+	updateControlsGeometry();
+
+	ui_hideSettingsAndLayer(anim::type::instant);
+	if (_main) {
+		_main->hide();
+	}
+	if (_intro) {
+		_intro->hide();
+	}
+	if (_passcodeLock) {
+		_passcodeLock->hide();
+	}
+	if (animated) {
+		_setupEmailLock->showAnimated(std::move(oldContentCache));
+	} else {
+		_setupEmailLock->showFinished();
+		setInnerFocus();
+	}
+	if (const auto sessionController = controller().sessionController()) {
+		sessionController->session().attachWebView().closeAll();
+	}
+}
+
+void MainWindow::clearSetupEmailLock() {
+	if (!_setupEmailLock) {
+		return;
+	}
+
+	auto oldContentCache = grabForSlideAnimation();
+	_setupEmailLock.destroy();
+	if (_passcodeLock) {
+		_passcodeLock->show();
+		updateControlsGeometry();
+		_passcodeLock->showAnimated(std::move(oldContentCache));
+	} else if (_intro) {
+		_intro->show();
+		updateControlsGeometry();
+		_intro->showAnimated(std::move(oldContentCache), true);
+	} else if (_main) {
+		_main->show();
+		updateControlsGeometry();
+		_main->showAnimated(std::move(oldContentCache), true);
+		Core::App().checkStartUrls();
+	}
+}
+
 void MainWindow::clearPasscodeLock() {
 	Expects(_intro || _main);
 
@@ -207,7 +263,11 @@ void MainWindow::clearPasscodeLock() {
 
 	auto oldContentCache = grabForSlideAnimation();
 	_passcodeLock.destroy();
-	if (_intro) {
+	if (_setupEmailLock) {
+		_setupEmailLock->show();
+		updateControlsGeometry();
+		_setupEmailLock->showAnimated(std::move(oldContentCache));
+	} else if (_intro) {
 		_intro->show();
 		updateControlsGeometry();
 		_intro->showAnimated(std::move(oldContentCache), true);
@@ -215,29 +275,34 @@ void MainWindow::clearPasscodeLock() {
 		_main->show();
 		updateControlsGeometry();
 		_main->showAnimated(std::move(oldContentCache), true);
-		Core::App().checkStartUrl();
+		Core::App().checkStartUrls();
 	}
 }
 
 void MainWindow::setupIntro(
 		Intro::EnterPoint point,
+		Main::Account *accountBeforeIntro,
 		QPixmap oldContentCache) {
-	auto animated = (_main || _passcodeLock);
+	auto animated = (_main || _passcodeLock || _setupEmailLock);
 
 	destroyLayer();
 	auto created = object_ptr<Intro::Widget>(
 		bodyWidget(),
 		&controller(),
 		&account(),
-		point);
+		point,
+		accountBeforeIntro);
 	created->showSettingsRequested(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showSettings();
 	}, created->lifetime());
 
 	clearWidgets();
 	_intro = std::move(created);
-	if (_passcodeLock) {
+	DragArea::SetupProxyDropArea(_intro.data(), [](const QString &localUrl) {
+		Core::App().openLocalUrl(localUrl, {});
+	});
+	if (_passcodeLock || _setupEmailLock) {
 		_intro->hide();
 	} else {
 		_intro->show();
@@ -257,9 +322,13 @@ void MainWindow::setupMain(
 	Expects(account().sessionExists());
 
 	const auto animated = _intro
-		|| (_passcodeLock && !Core::App().passcodeLocked());
-	const auto weakAnimatedLayer = (_main && _layer && !_passcodeLock)
-		? Ui::MakeWeak(_layer.get())
+		|| (_passcodeLock && !Core::App().passcodeLocked())
+		|| _setupEmailLock;
+	const auto weakAnimatedLayer = (_main
+			&& _layer
+			&& !_passcodeLock
+			&& !_setupEmailLock)
+		? base::make_weak(_layer.get())
 		: nullptr;
 	if (weakAnimatedLayer) {
 		Assert(!animated);
@@ -275,7 +344,7 @@ void MainWindow::setupMain(
 	_main->controller()->showByInitialId(
 		Window::SectionShow::Way::ClearStack,
 		singlePeerShowAtMsgId);
-	if (_passcodeLock) {
+	if (_passcodeLock || _setupEmailLock) {
 		_main->hide();
 	} else {
 		_main->show();
@@ -285,16 +354,16 @@ void MainWindow::setupMain(
 		} else {
 			_main->activate();
 		}
-		Core::App().checkStartUrl();
+		Core::App().checkStartUrls();
 	}
 	fixOrder();
-	if (const auto strong = weakAnimatedLayer.data()) {
+	if (const auto strong = weakAnimatedLayer.get()) {
 		strong->hideAllAnimatedRun();
 	}
 }
 
 void MainWindow::showSettings() {
-	if (_passcodeLock) {
+	if (_passcodeLock || _setupEmailLock) {
 		return;
 	}
 
@@ -310,7 +379,7 @@ void MainWindow::showSettings() {
 void MainWindow::showSpecialLayer(
 		object_ptr<Ui::LayerWidget> layer,
 		anim::type animated) {
-	if (_passcodeLock) {
+	if (_passcodeLock || _setupEmailLock) {
 		return;
 	}
 
@@ -332,7 +401,7 @@ bool MainWindow::showSectionInExistingLayer(
 }
 
 void MainWindow::showMainMenu() {
-	if (_passcodeLock) return;
+	if (_passcodeLock || _setupEmailLock) return;
 
 	if (isHidden()) showFromTray();
 
@@ -353,10 +422,15 @@ void MainWindow::ensureLayerCreated() {
 	_layer->hideFinishEvents(
 	) | rpl::filter([=] {
 		return _layer != nullptr; // Last hide finish is sent from destructor.
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		destroyLayer();
 	}, _layer->lifetime());
 
+	_layer->boxShownValue(
+	) | rpl::on_next([=](bool shown) {
+		_boxShown = shown;
+	}, _layer->lifetime());
+
 	if (const auto controller = sessionController()) {
 		controller->enableGifPauseReason(Window::GifPauseReason::Layer);
 	}
@@ -368,6 +442,7 @@ void MainWindow::destroyLayer() {
 	}
 
 	auto layer = base::take(_layer);
+	_boxShown = false;
 	const auto resetFocus = Ui::InFocusChain(layer);
 	if (resetFocus) {
 		setFocus();
@@ -435,6 +510,14 @@ bool MainWindow::ui_isLayerShown() const {
 	return _layer != nullptr;
 }
 
+rpl::producer<bool> MainWindow::ui_boxShownValue() const {
+	return _boxShown.value();
+}
+
+bool MainWindow::closeLayerByBackButton() {
+	return _layer && _layer->closeCurrentByBackButton();
+}
+
 bool MainWindow::showMediaPreview(
 		Data::FileOrigin origin,
 		not_null<DocumentData*> document) {
@@ -542,6 +625,8 @@ void MainWindow::setInnerFocus() {
 		_layer->setInnerFocus();
 	} else if (_passcodeLock) {
 		_passcodeLock->setInnerFocus();
+	} else if (_setupEmailLock) {
+		_setupEmailLock->setInnerFocus();
 	} else if (_main) {
 		_main->setInnerFocus();
 	} else if (_intro) {
@@ -625,6 +710,7 @@ bool MainWindow::takeThirdSectionFromLayer() {
 }
 
 void MainWindow::fixOrder() {
+	if (_setupEmailLock) _setupEmailLock->raise();
 	if (_passcodeLock) _passcodeLock->raise();
 	if (_layer) _layer->raise();
 	if (_mediaPreview) _mediaPreview->raise();
@@ -662,6 +748,7 @@ void MainWindow::updateControlsGeometry() {
 
 	auto body = bodyWidget()->rect();
 	if (_passcodeLock) _passcodeLock->setGeometry(body);
+	if (_setupEmailLock) _setupEmailLock->setGeometry(body);
 	auto mainLeft = 0;
 	auto mainWidth = body.width();
 	if (const auto session = sessionController()) {
@@ -685,14 +772,18 @@ void MainWindow::updateControlsGeometry() {
 	if (_main) _main->checkMainSectionToLayer();
 }
 
-void MainWindow::sendPaths() {
+void MainWindow::handleStartFiles(
+		QStringList interprets,
+		QStringList paths) {
 	if (controller().locked()) {
 		return;
 	}
 	Core::App().hideMediaView();
 	ui_hideSettingsAndLayer(anim::type::instant);
 	if (_main) {
-		_main->activate();
+		_main->handleStartFiles(
+			std::move(interprets),
+			std::move(paths));
 	}
 }
 
diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h
index 4befae7c629600..9290e00694e6ea 100644
--- a/Telegram/SourceFiles/mainwindow.h
+++ b/Telegram/SourceFiles/mainwindow.h
@@ -10,8 +10,14 @@ For license and copyright information please follow this link:
 #include "platform/platform_main_window.h"
 #include "ui/layers/layer_widget.h"
 
+#include <QtCore/QStringList>
+
 class MainWidget;
 
+namespace Main {
+class Account;
+} // namespace Main
+
 namespace Intro {
 class Widget;
 enum class EnterPoint : uchar;
@@ -22,6 +28,7 @@ class MediaPreviewWidget;
 class SectionMemento;
 struct SectionShow;
 class PasscodeLockWidget;
+class SetupEmailLockWidget;
 namespace Theme {
 struct BackgroundUpdate;
 class WarningWidget;
@@ -49,7 +56,12 @@ class MainWindow : public Platform::MainWindow {
 
 	void setupPasscodeLock();
 	void clearPasscodeLock();
-	void setupIntro(Intro::EnterPoint point, QPixmap oldContentCache);
+	void setupSetupEmailLock();
+	void clearSetupEmailLock();
+	void setupIntro(
+		Intro::EnterPoint point,
+		Main::Account *accountBeforeIntro,
+		QPixmap oldContentCache);
 	void setupMain(MsgId singlePeerShowAtMsgId, QPixmap oldContentCache);
 
 	void showSettings();
@@ -63,7 +75,7 @@ class MainWindow : public Platform::MainWindow {
 
 	bool takeThirdSectionFromLayer();
 
-	void sendPaths();
+	void handleStartFiles(QStringList interprets, QStringList paths);
 
 	[[nodiscard]] bool contentOverlapped(const QRect &globalRect);
 	[[nodiscard]] bool contentOverlapped(QWidget *w, QPaintEvent *e) {
@@ -97,6 +109,8 @@ class MainWindow : public Platform::MainWindow {
 	void ui_hideSettingsAndLayer(anim::type animated);
 	void ui_removeLayerBlackout();
 	[[nodiscard]] bool ui_isLayerShown() const;
+	[[nodiscard]] rpl::producer<bool> ui_boxShownValue() const;
+	bool closeLayerByBackButton();
 	bool showMediaPreview(
 		Data::FileOrigin origin,
 		not_null<DocumentData*> document);
@@ -124,9 +138,11 @@ class MainWindow : public Platform::MainWindow {
 	QPoint _lastMousePosition;
 
 	object_ptr<Window::PasscodeLockWidget> _passcodeLock = { nullptr };
+	object_ptr<Window::SetupEmailLockWidget> _setupEmailLock = { nullptr };
 	object_ptr<Intro::Widget> _intro = { nullptr };
 	object_ptr<MainWidget> _main = { nullptr };
 	base::unique_qptr<Ui::LayerStackWidget> _layer;
+	rpl::variable<bool> _boxShown = false;
 	object_ptr<Window::MediaPreviewWidget> _mediaPreview = { nullptr };
 
 	object_ptr<Window::Theme::WarningWidget> _testingThemeWarning = { nullptr };
diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp
index 2b4c570843a2e1..c0de2bb26cb990 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio.cpp
@@ -472,14 +472,14 @@ Mixer::Mixer(not_null<Audio::Instance*> instance)
 	connect(this, SIGNAL(suppressAll(qint64)), _fader, SLOT(onSuppressAll(qint64)));
 
 	Core::App().settings().songVolumeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		InvokeQueued(_fader, [fader = _fader] {
 			fader->songVolumeChanged();
 		});
 	}, _lifetime);
 
 	Core::App().settings().videoVolumeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		InvokeQueued(_fader, [fader = _fader] {
 			fader->videoVolumeChanged();
 		});
@@ -806,10 +806,9 @@ void Mixer::externalSoundProgress(const AudioMsgId &audio) {
 }
 
 bool Mixer::checkCurrentALError(AudioMsgId::Type type) {
-	if (!Audio::PlaybackErrorHappened()) return true;
-
-	const auto data = trackForType(type);
-	if (!data) {
+	if (!Audio::PlaybackErrorHappened()) {
+		return true;
+	} else if (const auto data = trackForType(type)) {
 		setStoppedState(data, State::StoppedAtError);
 		onError(data->state.id);
 	}
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
index 1bbf9b10c28b32..849a8964b3b167 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
@@ -88,13 +88,15 @@ class Instance::Inner final : public QObject {
 	void start(
 		Webrtc::DeviceResolvedId id,
 		Fn<void(Update)> updated,
-		Fn<void()> error);
+		Fn<void()> error,
+		Fn<void(Chunk)> externalProcessing);
 	void stop(Fn<void(Result&&)> callback = nullptr);
 	void pause(bool value, Fn<void(Result&&)> callback);
 
 private:
 	void process();
 
+	bool initializeFFmpeg();
 	[[nodiscard]] bool processFrame(int32 offset, int32 framesize);
 	void fail();
 
@@ -104,6 +106,7 @@ class Instance::Inner final : public QObject {
 	// Returns number of packets written or -1 on error
 	[[nodiscard]] int writePackets();
 
+	Fn<void(Chunk)> _externalProcessing;
 	Fn<void(Update)> _updated;
 	Fn<void()> _error;
 
@@ -131,7 +134,7 @@ Instance::Instance() : _inner(std::make_unique<Inner>(&_thread)) {
 	_thread.start();
 }
 
-void Instance::start() {
+void Instance::start(Fn<void(Chunk)> externalProcessing) {
 	_updates.fire_done();
 	const auto id = Audio::Current().captureDeviceId();
 	InvokeQueued(_inner.get(), [=] {
@@ -141,9 +144,9 @@ void Instance::start() {
 			});
 		}, [=] {
 			crl::on_main(this, [=] {
-				_updates.fire_error({});
+				_updates.fire_error(Error::Other);
 			});
-		});
+		}, externalProcessing);
 		crl::on_main(this, [=] {
 			_started = true;
 		});
@@ -167,13 +170,15 @@ void Instance::stop(Fn<void(Result&&)> callback) {
 }
 
 void Instance::pause(bool value, Fn<void(Result&&)> callback) {
-	Expects(callback != nullptr || !value);
 	InvokeQueued(_inner.get(), [=] {
-		_inner->pause(value, [=](Result &&result) {
-			crl::on_main([=, result = std::move(result)]() mutable {
-				callback(std::move(result));
-			});
-		});
+		auto done = callback
+			? [=](Result &&result) {
+				crl::on_main([=, result = std::move(result)]() mutable {
+					callback(std::move(result));
+				});
+			}
+			: std::move(callback);
+		_inner->pause(value, std::move(done));
 	});
 }
 
@@ -304,7 +309,9 @@ void Instance::Inner::fail() {
 void Instance::Inner::start(
 		Webrtc::DeviceResolvedId id,
 		Fn<void(Update)> updated,
-		Fn<void()> error) {
+		Fn<void()> error,
+		Fn<void(Chunk)> externalProcessing) {
+	_externalProcessing = std::move(externalProcessing);
 	_updated = std::move(updated);
 	_error = std::move(error);
 	if (_paused) {
@@ -329,8 +336,19 @@ void Instance::Inner::start(
 		d->device = nullptr;
 		fail();
 		return;
+	} else if (!_externalProcessing) {
+		if (!initializeFFmpeg()) {
+			fail();
+			return;
+		}
 	}
+	_timer.callEach(50);
+	_captured.clear();
+	_captured.reserve(kCaptureBufferSlice);
+	DEBUG_LOG(("Audio Capture: started!"));
+}
 
+bool Instance::Inner::initializeFFmpeg() {
 	// Create encoding context
 
 	d->ioBuffer = (uchar*)av_malloc(FFmpeg::kAVBlockSize);
@@ -347,14 +365,12 @@ void Instance::Inner::start(
 	}
 	if (!fmt) {
 		LOG(("Audio Error: Unable to find opus AVOutputFormat for capture"));
-		fail();
-		return;
+		return false;
 	}
 
 	if ((res = avformat_alloc_output_context2(&d->fmtContext, (AVOutputFormat*)fmt, 0, 0)) < 0) {
 		LOG(("Audio Error: Unable to avformat_alloc_output_context2 for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	}
 	d->fmtContext->pb = d->ioContext;
 	d->fmtContext->flags |= AVFMT_FLAG_CUSTOM_IO;
@@ -364,34 +380,26 @@ void Instance::Inner::start(
 	d->codec = avcodec_find_encoder(fmt->audio_codec);
 	if (!d->codec) {
 		LOG(("Audio Error: Unable to avcodec_find_encoder for capture"));
-		fail();
-		return;
+		return false;
 	}
 	d->stream = avformat_new_stream(d->fmtContext, d->codec);
 	if (!d->stream) {
 		LOG(("Audio Error: Unable to avformat_new_stream for capture"));
-		fail();
-		return;
+		return false;
 	}
 	d->stream->id = d->fmtContext->nb_streams - 1;
 	d->codecContext = avcodec_alloc_context3(d->codec);
 	if (!d->codecContext) {
 		LOG(("Audio Error: Unable to avcodec_alloc_context3 for capture"));
-		fail();
-		return;
+		return false;
 	}
 
 	av_opt_set_int(d->codecContext, "refcounted_frames", 1, 0);
 
 	d->codecContext->sample_fmt = AV_SAMPLE_FMT_FLTP;
 	d->codecContext->bit_rate = 32000;
-#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	d->codecContext->ch_layout = AV_CHANNEL_LAYOUT_MONO;
 	d->channels = d->codecContext->ch_layout.nb_channels;
-#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	d->codecContext->channel_layout = AV_CH_LAYOUT_MONO;
-	d->channels = d->codecContext->channels = 1;
-#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	d->codecContext->sample_rate = kCaptureFrequency;
 
 	if (d->fmtContext->oformat->flags & AVFMT_GLOBALHEADER) {
@@ -401,8 +409,7 @@ void Instance::Inner::start(
 	// Open audio stream
 	if ((res = avcodec_open2(d->codecContext, d->codec, nullptr)) < 0) {
 		LOG(("Audio Error: Unable to avcodec_open2 for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	}
 
 	// Alloc source samples
@@ -417,7 +424,6 @@ void Instance::Inner::start(
 	// Using _captured directly
 
 	// Prepare resampling
-#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	res = swr_alloc_set_opts2(
 		&d->swrContext,
 		&d->codecContext->ch_layout,
@@ -428,54 +434,29 @@ void Instance::Inner::start(
 		d->codecContext->sample_rate,
 		0,
 		nullptr);
-#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	d->swrContext = swr_alloc_set_opts(
-		d->swrContext,
-		d->codecContext->channel_layout,
-		d->codecContext->sample_fmt,
-		d->codecContext->sample_rate,
-		d->codecContext->channel_layout,
-		AV_SAMPLE_FMT_S16,
-		d->codecContext->sample_rate,
-		0,
-		nullptr);
-	res = 0;
-#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	if (res < 0 || !d->swrContext) {
 		LOG(("Audio Error: Unable to swr_alloc_set_opts2 for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	} else if ((res = swr_init(d->swrContext)) < 0) {
 		LOG(("Audio Error: Unable to swr_init for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	}
-
 	d->maxDstSamples = d->srcSamples;
 	if ((res = av_samples_alloc_array_and_samples(&d->dstSamplesData, 0, d->channels, d->maxDstSamples, d->codecContext->sample_fmt, 0)) < 0) {
 		LOG(("Audio Error: Unable to av_samples_alloc_array_and_samples for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	}
 	d->dstSamplesSize = av_samples_get_buffer_size(0, d->channels, d->maxDstSamples, d->codecContext->sample_fmt, 0);
-
 	if ((res = avcodec_parameters_from_context(d->stream->codecpar, d->codecContext)) < 0) {
 		LOG(("Audio Error: Unable to avcodec_parameters_from_context for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	}
-
 	// Write file header
 	if ((res = avformat_write_header(d->fmtContext, 0)) < 0) {
 		LOG(("Audio Error: Unable to avformat_write_header for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-		fail();
-		return;
+		return false;
 	}
-
-	_timer.callEach(50);
-	_captured.clear();
-	_captured.reserve(kCaptureBufferSlice);
-	DEBUG_LOG(("Audio Capture: started!"));
+	return true;
 }
 
 void Instance::Inner::pause(bool value, Fn<void(Result&&)> callback) {
@@ -483,11 +464,16 @@ void Instance::Inner::pause(bool value, Fn<void(Result&&)> callback) {
 	if (!_paused) {
 		return;
 	}
-	callback({
-		d->fullSamples ? d->data : QByteArray(),
-		d->fullSamples ? CollectWaveform(d->waveform) : VoiceWaveform(),
-		qint32(d->fullSamples),
-	});
+	if (callback) {
+		callback({
+			.bytes = d->fullSamples ? d->data : QByteArray(),
+			.waveform = (d->fullSamples
+				? CollectWaveform(d->waveform)
+				: VoiceWaveform()),
+			.duration = ((d->fullSamples * crl::time(1000))
+				/ int64(kCaptureFrequency)),
+		});
+	}
 }
 
 void Instance::Inner::stop(Fn<void(Result&&)> callback) {
@@ -559,7 +545,7 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
 	_captured = QByteArray();
 
 	// Finish stream
-	if (needResult && hadDevice) {
+	if (needResult && hadDevice && d->fmtContext) {
 		av_write_trailer(d->fmtContext);
 	}
 
@@ -622,7 +608,11 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
 	}
 
 	if (needResult) {
-		callback({ result, waveform, samples });
+		callback({
+			.bytes = result,
+			.waveform = waveform,
+			.duration = (samples * crl::time(1000)) / kCaptureFrequency,
+		});
 	}
 }
 
@@ -658,6 +648,13 @@ void Instance::Inner::process() {
 		if (ErrorHappened(d->device)) {
 			fail();
 			return;
+		} else if (_externalProcessing) {
+			_externalProcessing({
+				.finished = crl::now(),
+				.samples = base::take(_captured),
+				.frequency = kCaptureFrequency,
+			});
+			return;
 		}
 
 		// Count new recording level and update view
@@ -666,7 +663,7 @@ void Instance::Inner::process() {
 		auto levelindex = d->fullSamples + static_cast<int>(s / sizeof(short));
 		for (auto ptr = (const short*)(_captured.constData() + s), end = (const short*)(_captured.constData() + news); ptr < end; ++ptr, ++levelindex) {
 			if (levelindex > skipSamples) {
-				uint16 value = qAbs(*ptr);
+				uint16 value = qAbs(int(*ptr));
 				if (levelindex < skipSamples + fadeSamples) {
 					value = qRound(value * float64(levelindex - skipSamples) / fadeSamples);
 				}
@@ -734,7 +731,7 @@ bool Instance::Inner::processFrame(int32 offset, int32 framesize) {
 
 	d->waveform.reserve(d->waveform.size() + (samplesCnt / d->waveformEach) + 1);
 	for (short *ptr = srcSamplesDataChannel, *end = ptr + samplesCnt; ptr != end; ++ptr) {
-		uint16 value = qAbs(*ptr);
+		uint16 value = qAbs(int(*ptr));
 		if (d->waveformPeak < value) {
 			d->waveformPeak = value;
 		}
@@ -770,12 +767,7 @@ bool Instance::Inner::processFrame(int32 offset, int32 framesize) {
 	AVFrame *frame = av_frame_alloc();
 
 	frame->format = d->codecContext->sample_fmt;
-#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	av_channel_layout_copy(&frame->ch_layout, &d->codecContext->ch_layout);
-#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	frame->channels = d->codecContext->channels;
-	frame->channel_layout = d->codecContext->channel_layout;
-#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	frame->sample_rate = d->codecContext->sample_rate;
 	frame->nb_samples = d->dstSamples;
 	frame->pts = av_rescale_q(d->fullSamples, AVRational { 1, d->codecContext->sample_rate }, d->codecContext->time_base);
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.h b/Telegram/SourceFiles/media/audio/media_audio_capture.h
index 2b46bd7facc1c1..fb79b39dde4ad3 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.h
@@ -7,16 +7,32 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include <QtCore/QThread>
 #include <QtCore/QTimer>
 
-struct AVFrame;
-
 namespace Media {
 namespace Capture {
 
 struct Update {
 	int samples = 0;
 	ushort level = 0;
+
+	bool finished = false;
+};
+
+enum class Error : uchar {
+	Other,
+	AudioInit,
+	VideoInit,
+	AudioTimeout,
+	VideoTimeout,
+	Encoding,
+};
+
+struct Chunk {
+	crl::time finished = 0;
+	QByteArray samples;
+	int frequency = 0;
 };
 
 struct Result;
@@ -34,7 +50,7 @@ class Instance final : public QObject {
 		return _available;
 	}
 
-	[[nodiscard]] rpl::producer<Update, rpl::empty_error> updated() const {
+	[[nodiscard]] rpl::producer<Update, Error> updated() const {
 		return _updates.events();
 	}
 
@@ -45,9 +61,9 @@ class Instance final : public QObject {
 		return _started.changes();
 	}
 
-	void start();
+	void start(Fn<void(Chunk)> externalProcessing = nullptr);
 	void stop(Fn<void(Result&&)> callback = nullptr);
-	void pause(bool value, Fn<void(Result&&)> callback);
+	void pause(bool value, Fn<void(Result&&)> callback = nullptr);
 
 private:
 	class Inner;
@@ -55,7 +71,7 @@ class Instance final : public QObject {
 
 	bool _available = false;
 	rpl::variable<bool> _started = false;
-	rpl::event_stream<Update, rpl::empty_error> _updates;
+	rpl::event_stream<Update, Error> _updates;
 	QThread _thread;
 	std::unique_ptr<Inner> _inner;
 
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture_common.h b/Telegram/SourceFiles/media/audio/media_audio_capture_common.h
index 370259f5831e72..e276ad4e94a934 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture_common.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture_common.h
@@ -12,7 +12,8 @@ namespace Media::Capture {
 struct Result {
 	QByteArray bytes;
 	VoiceWaveform waveform;
-	int samples = 0;
+	crl::time duration;
+	bool video = false;
 };
 
 } // namespace Media::Capture
diff --git a/Telegram/SourceFiles/media/audio/media_audio_edit.cpp b/Telegram/SourceFiles/media/audio/media_audio_edit.cpp
new file mode 100644
index 00000000000000..393d7d09a0968e
--- /dev/null
+++ b/Telegram/SourceFiles/media/audio/media_audio_edit.cpp
@@ -0,0 +1,407 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/audio/media_audio_edit.h"
+
+#include "ffmpeg/ffmpeg_bytes_io_wrap.h"
+#include "ffmpeg/ffmpeg_utility.h"
+
+namespace Media {
+
+[[nodiscard]] AudioEditResult TrimAudioToRange(
+		const QByteArray &content,
+		crl::time from,
+		crl::time till) {
+	using namespace FFmpeg;
+
+	if (content.isEmpty() || (from < 0) || (till <= from)) {
+		return {};
+	}
+
+	auto inputWrap = ReadBytesWrap{
+		.size = content.size(),
+		.data = reinterpret_cast<const uchar*>(content.constData()),
+	};
+	auto input = MakeFormatPointer(
+		&inputWrap,
+		&ReadBytesWrap::Read,
+		nullptr,
+		&ReadBytesWrap::Seek);
+	if (!input) {
+		return {};
+	}
+
+	auto error = AvErrorWrap(avformat_find_stream_info(input.get(), nullptr));
+	if (error) {
+		LogError(u"avformat_find_stream_info"_q, error);
+		return {};
+	}
+
+	const auto streamId = av_find_best_stream(
+		input.get(),
+		AVMEDIA_TYPE_AUDIO,
+		-1,
+		-1,
+		nullptr,
+		0);
+	if (streamId < 0) {
+		LogError(u"av_find_best_stream"_q, AvErrorWrap(streamId));
+		return {};
+	}
+
+	const auto inStream = input->streams[streamId];
+	auto outputWrap = WriteBytesWrap();
+	auto output = MakeWriteFormatPointer(
+		static_cast<void*>(&outputWrap),
+		nullptr,
+		&WriteBytesWrap::Write,
+		&WriteBytesWrap::Seek,
+		"opus"_q);
+	if (!output) {
+		return {};
+	}
+
+	const auto outStream = avformat_new_stream(output.get(), nullptr);
+	if (!outStream) {
+		LogError(u"avformat_new_stream"_q);
+		return {};
+	}
+
+	error = AvErrorWrap(avcodec_parameters_copy(
+		outStream->codecpar,
+		inStream->codecpar));
+	if (error) {
+		LogError(u"avcodec_parameters_copy"_q, error);
+		return {};
+	}
+	outStream->codecpar->codec_tag = 0;
+	outStream->time_base = inStream->time_base;
+
+	error = AvErrorWrap(avformat_write_header(output.get(), nullptr));
+	if (error) {
+		LogError(u"avformat_write_header"_q, error);
+		return {};
+	}
+
+	const auto fromPts = TimeToPts(from, inStream->time_base);
+	const auto tillPts = TimeToPts(till, inStream->time_base);
+	auto firstPts = int64(AV_NOPTS_VALUE);
+	auto firstDts = int64(AV_NOPTS_VALUE);
+	auto lastPts = std::numeric_limits<int64>::min();
+	auto lastDts = std::numeric_limits<int64>::min();
+	auto durationPts = int64(0);
+	auto copied = 0;
+
+	auto packet = AVPacket();
+	av_init_packet(&packet);
+	while (true) {
+		error = AvErrorWrap(av_read_frame(input.get(), &packet));
+		if (error.code() == AVERROR_EOF) {
+			break;
+		} else if (error) {
+			LogError(u"av_read_frame"_q, error);
+			return {};
+		}
+		const auto guard = gsl::finally([&] {
+			av_packet_unref(&packet);
+		});
+		if (packet.stream_index != streamId) {
+			continue;
+		}
+
+		const auto packetStart = (packet.pts != AV_NOPTS_VALUE)
+			? packet.pts
+			: packet.dts;
+		const auto packetDuration = std::max(int64(packet.duration), int64());
+		const auto packetEnd = (packetStart != AV_NOPTS_VALUE)
+			? (packetStart + packetDuration)
+			: AV_NOPTS_VALUE;
+		if ((packetStart != AV_NOPTS_VALUE) && (packetStart >= tillPts)) {
+			break;
+		}
+		if ((packetEnd != AV_NOPTS_VALUE) && (packetEnd <= fromPts)) {
+			continue;
+		}
+
+		if (packet.pts != AV_NOPTS_VALUE) {
+			if (firstPts == AV_NOPTS_VALUE) {
+				firstPts = packet.pts;
+			}
+			packet.pts -= firstPts;
+			if (packet.pts < 0) {
+				packet.pts = 0;
+			}
+			if (packet.pts <= lastPts) {
+				packet.pts = lastPts + 1;
+			}
+			lastPts = packet.pts;
+		}
+		if (packet.dts != AV_NOPTS_VALUE) {
+			if (firstDts == AV_NOPTS_VALUE) {
+				firstDts = packet.dts;
+			}
+			packet.dts -= firstDts;
+			if (packet.dts < 0) {
+				packet.dts = 0;
+			}
+			if (packet.dts <= lastDts) {
+				packet.dts = lastDts + 1;
+			}
+			lastDts = packet.dts;
+		}
+
+		const auto packetPosition = (packet.pts != AV_NOPTS_VALUE)
+			? packet.pts
+			: packet.dts;
+		if (packetPosition != AV_NOPTS_VALUE) {
+			durationPts = std::max(
+				durationPts,
+				packetPosition + std::max(int64(packet.duration), int64()));
+		}
+
+		packet.stream_index = outStream->index;
+		error = AvErrorWrap(av_interleaved_write_frame(output.get(), &packet));
+		if (error) {
+			LogError(u"av_interleaved_write_frame"_q, error);
+			return {};
+		}
+		++copied;
+	}
+
+	if (!copied) {
+		return {};
+	}
+
+	error = AvErrorWrap(av_write_trailer(output.get()));
+	if (error) {
+		LogError(u"av_write_trailer"_q, error);
+		return {};
+	}
+
+	auto result = AudioEditResult();
+	result.content = std::move(outputWrap.content);
+	result.waveform = audioCountWaveform(Core::FileLocation(), result.content);
+	result.duration = durationPts
+		? PtsToTimeCeil(durationPts, outStream->time_base)
+		: (till - from);
+	return result;
+}
+
+[[nodiscard]] AudioEditResult ConcatAudio(
+		const QByteArray &first,
+		const QByteArray &second) {
+	using namespace FFmpeg;
+
+	if (first.isEmpty() || second.isEmpty()) {
+		return {};
+	}
+
+	auto firstWrap = ReadBytesWrap{
+		.size = first.size(),
+		.data = reinterpret_cast<const uchar*>(first.constData()),
+	};
+	auto firstInput = MakeFormatPointer(
+		&firstWrap,
+		&ReadBytesWrap::Read,
+		nullptr,
+		&ReadBytesWrap::Seek);
+	if (!firstInput) {
+		return {};
+	}
+
+	auto secondWrap = ReadBytesWrap{
+		.size = second.size(),
+		.data = reinterpret_cast<const uchar*>(second.constData()),
+	};
+	auto secondInput = MakeFormatPointer(
+		&secondWrap,
+		&ReadBytesWrap::Read,
+		nullptr,
+		&ReadBytesWrap::Seek);
+	if (!secondInput) {
+		return {};
+	}
+
+	const auto prepareStream = [](not_null<AVFormatContext*> input) {
+		auto error = AvErrorWrap(avformat_find_stream_info(input, nullptr));
+		if (error) {
+			LogError(u"avformat_find_stream_info"_q, error);
+			return static_cast<AVStream*>(nullptr);
+		}
+		const auto streamId = av_find_best_stream(
+			input,
+			AVMEDIA_TYPE_AUDIO,
+			-1,
+			-1,
+			nullptr,
+			0);
+		if (streamId < 0) {
+			LogError(u"av_find_best_stream"_q, AvErrorWrap(streamId));
+			return static_cast<AVStream*>(nullptr);
+		}
+		return input->streams[streamId];
+	};
+	const auto firstStream = prepareStream(firstInput.get());
+	if (!firstStream) {
+		return {};
+	}
+	const auto secondStream = prepareStream(secondInput.get());
+	if (!secondStream) {
+		return {};
+	}
+
+	auto outputWrap = WriteBytesWrap();
+	auto output = MakeWriteFormatPointer(
+		static_cast<void*>(&outputWrap),
+		nullptr,
+		&WriteBytesWrap::Write,
+		&WriteBytesWrap::Seek,
+		"opus"_q);
+	if (!output) {
+		return {};
+	}
+	const auto outStream = avformat_new_stream(output.get(), nullptr);
+	if (!outStream) {
+		LogError(u"avformat_new_stream"_q);
+		return {};
+	}
+
+	auto error = AvErrorWrap(avcodec_parameters_copy(
+		outStream->codecpar,
+		firstStream->codecpar));
+	if (error) {
+		LogError(u"avcodec_parameters_copy"_q, error);
+		return {};
+	}
+	outStream->codecpar->codec_tag = 0;
+	outStream->time_base = firstStream->time_base;
+
+	error = AvErrorWrap(avformat_write_header(output.get(), nullptr));
+	if (error) {
+		LogError(u"avformat_write_header"_q, error);
+		return {};
+	}
+
+	auto offsetPts = int64(0);
+	auto durationPts = int64(0);
+	auto lastPts = std::numeric_limits<int64>::min();
+	auto lastDts = std::numeric_limits<int64>::min();
+	auto copied = 0;
+
+	const auto append = [&](
+			not_null<AVFormatContext*> input,
+			not_null<AVStream*> inStream) {
+		auto firstPts = int64(AV_NOPTS_VALUE);
+		auto firstDts = int64(AV_NOPTS_VALUE);
+		auto sourceEndPts = offsetPts;
+
+		auto packet = AVPacket();
+		av_init_packet(&packet);
+		while (true) {
+			auto error = AvErrorWrap(av_read_frame(input, &packet));
+			if (error.code() == AVERROR_EOF) {
+				break;
+			} else if (error) {
+				LogError(u"av_read_frame"_q, error);
+				return false;
+			}
+			const auto guard = gsl::finally([&] {
+				av_packet_unref(&packet);
+			});
+			if (packet.stream_index != inStream->index) {
+				continue;
+			}
+
+			if (packet.pts != AV_NOPTS_VALUE) {
+				if (firstPts == AV_NOPTS_VALUE) {
+					firstPts = packet.pts;
+				}
+				packet.pts -= firstPts;
+				if (packet.pts < 0) {
+					packet.pts = 0;
+				}
+				packet.pts = av_rescale_q(
+					packet.pts,
+					inStream->time_base,
+					outStream->time_base);
+				packet.pts += offsetPts;
+				if (packet.pts <= lastPts) {
+					packet.pts = lastPts + 1;
+				}
+				lastPts = packet.pts;
+			}
+			if (packet.dts != AV_NOPTS_VALUE) {
+				if (firstDts == AV_NOPTS_VALUE) {
+					firstDts = packet.dts;
+				}
+				packet.dts -= firstDts;
+				if (packet.dts < 0) {
+					packet.dts = 0;
+				}
+				packet.dts = av_rescale_q(
+					packet.dts,
+					inStream->time_base,
+					outStream->time_base);
+				packet.dts += offsetPts;
+				if (packet.dts <= lastDts) {
+					packet.dts = lastDts + 1;
+				}
+				lastDts = packet.dts;
+			}
+			packet.duration = (packet.duration > 0)
+				? av_rescale_q(
+					packet.duration,
+					inStream->time_base,
+					outStream->time_base)
+				: 0;
+
+			const auto packetPosition = (packet.pts != AV_NOPTS_VALUE)
+				? packet.pts
+				: packet.dts;
+			if (packetPosition != AV_NOPTS_VALUE) {
+				const auto packetEnd = packetPosition
+					+ std::max(int64(packet.duration), int64());
+				durationPts = std::max(durationPts, packetEnd);
+				sourceEndPts = std::max(sourceEndPts, packetEnd);
+			}
+
+			packet.stream_index = outStream->index;
+			error = AvErrorWrap(av_interleaved_write_frame(output.get(), &packet));
+			if (error) {
+				LogError(u"av_interleaved_write_frame"_q, error);
+				return false;
+			}
+			++copied;
+		}
+
+		offsetPts = sourceEndPts;
+		return true;
+	};
+	if (!append(firstInput.get(), firstStream)
+		|| !append(secondInput.get(), secondStream)) {
+		return {};
+	}
+	if (!copied) {
+		return {};
+	}
+
+	error = AvErrorWrap(av_write_trailer(output.get()));
+	if (error) {
+		LogError(u"av_write_trailer"_q, error);
+		return {};
+	}
+
+	auto result = AudioEditResult();
+	result.content = std::move(outputWrap.content);
+	result.waveform = audioCountWaveform(Core::FileLocation(), result.content);
+	result.duration = durationPts
+		? PtsToTimeCeil(durationPts, outStream->time_base)
+		: 0;
+	return result;
+}
+
+} // namespace Media
diff --git a/Telegram/SourceFiles/media/audio/media_audio_edit.h b/Telegram/SourceFiles/media/audio/media_audio_edit.h
new file mode 100644
index 00000000000000..6d360ffde1d8b1
--- /dev/null
+++ b/Telegram/SourceFiles/media/audio/media_audio_edit.h
@@ -0,0 +1,29 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "media/audio/media_audio.h"
+
+namespace Media {
+
+struct AudioEditResult {
+	QByteArray content;
+	VoiceWaveform waveform;
+	crl::time duration = 0;
+};
+
+[[nodiscard]] AudioEditResult TrimAudioToRange(
+	const QByteArray &content,
+	crl::time from,
+	crl::time till);
+
+[[nodiscard]] AudioEditResult ConcatAudio(
+	const QByteArray &first,
+	const QByteArray &second);
+
+} // namespace Media
diff --git a/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp
index bdfe863bd61d87..3dc9e15e9b661d 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp
@@ -25,19 +25,6 @@ using FFmpeg::LogError;
 
 } // namespace
 
-#if !DA_FFMPEG_NEW_CHANNEL_LAYOUT
-uint64_t AbstractFFMpegLoader::ComputeChannelLayout(
-		uint64_t channel_layout,
-		int channels) {
-	if (channel_layout) {
-		if (av_get_channel_layout_nb_channels(channel_layout) == channels) {
-			return channel_layout;
-		}
-	}
-	return av_get_default_channel_layout(channels);
-}
-#endif // !DA_FFMPEG_NEW_CHANNEL_LAYOUT
-
 int64 AbstractFFMpegLoader::Mul(int64 value, AVRational rational) {
 	return value * rational.num / rational.den;
 }
@@ -244,41 +231,14 @@ bool AbstractAudioFFMpegLoader::initUsingContext(
 		not_null<AVCodecContext*> context,
 		float64 speed) {
 	_swrSrcSampleFormat = context->sample_fmt;
-#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	const AVChannelLayout mono = AV_CHANNEL_LAYOUT_MONO;
 	const AVChannelLayout stereo = AV_CHANNEL_LAYOUT_STEREO;
-	const auto useMono = !av_channel_layout_compare(
-		&context->ch_layout,
-		&mono);
-	const auto useStereo = !av_channel_layout_compare(
-		&context->ch_layout,
-		&stereo);
-	const auto copyDstChannelLayout = [&] {
-		av_channel_layout_copy(&_swrDstChannelLayout, &context->ch_layout);
-	};
-#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	const auto layout = ComputeChannelLayout(
-		context->channel_layout,
-		context->channels);
-	if (!layout) {
-		LOG(("Audio Error: Unknown channel layout %1 for %2 channels."
-			).arg(context->channel_layout
-			).arg(context->channels
-			));
-		return false;
-	}
-	const auto useMono = (layout == AV_CH_LAYOUT_MONO);
-	const auto useStereo = (layout == AV_CH_LAYOUT_STEREO);
-	const auto copyDstChannelLayout = [&] {
-		_swrDstChannelLayout = layout;
-	};
-#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	if (useMono) {
+	if (!av_channel_layout_compare(&context->ch_layout, &mono)) {
 		switch (_swrSrcSampleFormat) {
 		case AV_SAMPLE_FMT_U8:
 		case AV_SAMPLE_FMT_U8P:
 			_swrDstSampleFormat = _swrSrcSampleFormat;
-			copyDstChannelLayout();
+			av_channel_layout_copy(&_swrDstChannelLayout, &context->ch_layout);
 			_outputChannels = 1;
 			_outputSampleSize = 1;
 			_outputFormat = AL_FORMAT_MONO8;
@@ -286,24 +246,24 @@ bool AbstractAudioFFMpegLoader::initUsingContext(
 		case AV_SAMPLE_FMT_S16:
 		case AV_SAMPLE_FMT_S16P:
 			_swrDstSampleFormat = _swrSrcSampleFormat;
-			copyDstChannelLayout();
+			av_channel_layout_copy(&_swrDstChannelLayout, &context->ch_layout);
 			_outputChannels = 1;
 			_outputSampleSize = sizeof(uint16);
 			_outputFormat = AL_FORMAT_MONO16;
 			break;
 		}
-	} else if (useStereo) {
+	} else if (!av_channel_layout_compare(&context->ch_layout, &stereo)) {
 		switch (_swrSrcSampleFormat) {
 		case AV_SAMPLE_FMT_U8:
 			_swrDstSampleFormat = _swrSrcSampleFormat;
-			copyDstChannelLayout();
+			av_channel_layout_copy(&_swrDstChannelLayout, &context->ch_layout);
 			_outputChannels = 2;
 			_outputSampleSize = 2;
 			_outputFormat = AL_FORMAT_STEREO8;
 			break;
 		case AV_SAMPLE_FMT_S16:
 			_swrDstSampleFormat = _swrSrcSampleFormat;
-			copyDstChannelLayout();
+			av_channel_layout_copy(&_swrDstChannelLayout, &context->ch_layout);
 			_outputChannels = 2;
 			_outputSampleSize = 2 * sizeof(uint16);
 			_outputFormat = AL_FORMAT_STEREO16;
@@ -400,34 +360,16 @@ auto AbstractAudioFFMpegLoader::fillFrameFromQueued()
 
 bool AbstractAudioFFMpegLoader::frameHasDesiredFormat(
 		not_null<AVFrame*> frame) const {
-	const auto sameChannelLayout = [&] {
-#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
-		return !av_channel_layout_compare(
-			&frame->ch_layout,
-			&_swrDstChannelLayout);
-#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-		const auto frameChannelLayout = ComputeChannelLayout(
-			frame->channel_layout,
-			frame->channels);
-		return (frameChannelLayout == _swrDstChannelLayout);
-#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	};
 	return true
 		&& (frame->format == _swrDstSampleFormat)
 		&& (frame->sample_rate == _swrDstRate)
-		&& sameChannelLayout();
+		&& !av_channel_layout_compare(
+			&frame->ch_layout,
+			&_swrDstChannelLayout);
 }
 
 bool AbstractAudioFFMpegLoader::initResampleForFrame() {
-#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	const auto bad = !_frame->ch_layout.nb_channels;
-#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	const auto frameChannelLayout = ComputeChannelLayout(
-		_frame->channel_layout,
-		_frame->channels);
-	const auto bad = !frameChannelLayout;
-#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	if (bad) {
+	if (!_frame->ch_layout.nb_channels) {
 		LOG(("Audio Error: "
 			"Unknown channel layout for frame in file '%1', "
 			"data size '%2'"
@@ -443,38 +385,25 @@ bool AbstractAudioFFMpegLoader::initResampleForFrame() {
 			));
 		return false;
 	} else if (_swrContext) {
-		const auto sameChannelLayout = [&] {
-#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
-			return !av_channel_layout_compare(
-				&_frame->ch_layout,
-				&_swrSrcChannelLayout);
-#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-			return (frameChannelLayout == _swrSrcChannelLayout);
-#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-		};
 		if (true
 			&& (_frame->format == _swrSrcSampleFormat)
 			&& (_frame->sample_rate == _swrSrcRate)
-			&& sameChannelLayout()) {
+			&& !av_channel_layout_compare(
+				&_frame->ch_layout,
+				&_swrSrcChannelLayout)) {
 			return true;
 		}
 		swr_close(_swrContext);
 	}
 
 	_swrSrcSampleFormat = static_cast<AVSampleFormat>(_frame->format);
-#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	av_channel_layout_copy(&_swrSrcChannelLayout, &_frame->ch_layout);
-#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	_swrSrcChannelLayout = frameChannelLayout;
-#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	_swrSrcRate = _frame->sample_rate;
 	return initResampleUsingFormat();
 }
 
 bool AbstractAudioFFMpegLoader::initResampleUsingFormat() {
-	AvErrorWrap error = 0;
-#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	error = swr_alloc_set_opts2(
+	auto error = swr_alloc_set_opts2(
 		&_swrContext,
 		&_swrDstChannelLayout,
 		_swrDstSampleFormat,
@@ -484,18 +413,6 @@ bool AbstractAudioFFMpegLoader::initResampleUsingFormat() {
 		_swrSrcRate,
 		0,
 		nullptr);
-#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	_swrContext = swr_alloc_set_opts(
-		_swrContext,
-		_swrDstChannelLayout,
-		_swrDstSampleFormat,
-		_swrDstRate,
-		_swrSrcChannelLayout,
-		_swrSrcSampleFormat,
-		_swrSrcRate,
-		0,
-		nullptr);
-#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	if (error || !_swrContext) {
 		LogError(u"swr_alloc_set_opts2"_q, error);
 		return false;
@@ -524,13 +441,9 @@ bool AbstractAudioFFMpegLoader::ensureResampleSpaceAvailable(int samples) {
 		AV_ROUND_UP)));
 	_resampledFrame->sample_rate = _swrDstRate;
 	_resampledFrame->format = _swrDstSampleFormat;
-#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	av_channel_layout_copy(
 		&_resampledFrame->ch_layout,
 		&_swrDstChannelLayout);
-#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	_resampledFrame->channel_layout = _swrDstChannelLayout;
-#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	_resampledFrame->nb_samples = allocate;
 	if (AvErrorWrap error = av_frame_get_buffer(_resampledFrame.get(), 0)) {
 		LogError(u"av_frame_get_buffer"_q, error);
@@ -589,18 +502,10 @@ void AbstractAudioFFMpegLoader::createSpeedFilter(float64 speed) {
 	}
 
 	char layout[64] = { 0 };
-#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	av_channel_layout_describe(
 		&_swrDstChannelLayout,
 		layout,
 		sizeof(layout));
-#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	av_get_channel_layout_string(
-		layout,
-		sizeof(layout),
-		0,
-		_swrDstChannelLayout);
-#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
 
 	av_opt_set(
 		_filterSrc,
diff --git a/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h
index 5c7d3df8df39fa..d5ccc90947789b 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h
@@ -50,12 +50,6 @@ class AbstractFFMpegLoader : public AudioPlayerLoader {
 		return _samplesFrequency;
 	}
 
-#if !DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	static uint64_t ComputeChannelLayout(
-		uint64_t channel_layout,
-		int channels);
-#endif // !DA_FFMPEG_NEW_CHANNEL_LAYOUT
-
 	[[nodiscard]] int64 startedAtSample() const {
 		return _startedAtSample;
 	}
@@ -72,11 +66,7 @@ class AbstractFFMpegLoader : public AudioPlayerLoader {
 	uchar *ioBuffer = nullptr;
 	AVIOContext *ioContext = nullptr;
 	AVFormatContext *fmtContext = nullptr;
-#if LIBAVFORMAT_VERSION_MAJOR >= 59
 	const AVCodec *codec = nullptr;
-#else
-	AVCodec *codec = nullptr;
-#endif
 	int32 streamId = 0;
 
 	bool _opened = false;
@@ -170,13 +160,8 @@ class AbstractAudioFFMpegLoader : public AbstractFFMpegLoader {
 	const int _swrDstRate = Media::Player::kDefaultFrequency;
 	AVSampleFormat _swrDstSampleFormat = AV_SAMPLE_FMT_S16;
 
-#if DA_FFMPEG_NEW_CHANNEL_LAYOUT
 	AVChannelLayout _swrSrcChannelLayout = AV_CHANNEL_LAYOUT_STEREO;
 	AVChannelLayout _swrDstChannelLayout = AV_CHANNEL_LAYOUT_STEREO;
-#else // DA_FFMPEG_NEW_CHANNEL_LAYOUT
-	uint64_t _swrSrcChannelLayout = 0;
-	uint64_t _swrDstChannelLayout = AV_CH_LAYOUT_STEREO;
-#endif // DA_FFMPEG_NEW_CHANNEL_LAYOUT
 
 	AVFilterGraph *_filterGraph = nullptr;
 	float64 _filterSpeed = 1.;
diff --git a/Telegram/SourceFiles/media/audio/media_audio_local_cache.cpp b/Telegram/SourceFiles/media/audio/media_audio_local_cache.cpp
new file mode 100644
index 00000000000000..195b018bf171b5
--- /dev/null
+++ b/Telegram/SourceFiles/media/audio/media_audio_local_cache.cpp
@@ -0,0 +1,338 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/audio/media_audio_local_cache.h"
+
+#include "ffmpeg/ffmpeg_bytes_io_wrap.h"
+#include "ffmpeg/ffmpeg_utility.h"
+
+namespace Media::Audio {
+namespace {
+
+constexpr auto kMaxDuration = 3 * crl::time(1000);
+constexpr auto kFrameSize = 4096;
+
+[[nodiscard]] QByteArray ConvertAndCut(const QByteArray &bytes) {
+	using namespace FFmpeg;
+
+	if (bytes.isEmpty()) {
+		return {};
+	}
+
+	auto wrap = ReadBytesWrap{
+		.size = bytes.size(),
+		.data = reinterpret_cast<const uchar*>(bytes.constData()),
+	};
+
+	auto input = MakeFormatPointer(
+		&wrap,
+		&ReadBytesWrap::Read,
+		nullptr,
+		&ReadBytesWrap::Seek);
+	if (!input) {
+		return {};
+	}
+
+	auto error = AvErrorWrap(avformat_find_stream_info(input.get(), 0));
+	if (error) {
+		LogError(u"avformat_find_stream_info"_q, error);
+		return {};
+	}
+
+
+	auto inCodec = (const AVCodec*)nullptr;
+	const auto streamId = av_find_best_stream(
+		input.get(),
+		AVMEDIA_TYPE_AUDIO,
+		-1,
+		-1,
+		&inCodec,
+		0);
+	if (streamId < 0) {
+		LogError(u"av_find_best_stream"_q, AvErrorWrap(streamId));
+		return {};
+	}
+
+	auto inStream = input->streams[streamId];
+	auto inCodecPar = inStream->codecpar;
+	auto inCodecContext = CodecPointer(avcodec_alloc_context3(nullptr));
+	if (!inCodecContext) {
+		return {};
+	}
+
+	if (avcodec_parameters_to_context(inCodecContext.get(), inCodecPar) < 0) {
+		return {};
+	}
+
+	if (avcodec_open2(inCodecContext.get(), inCodec, nullptr) < 0) {
+		return {};
+	}
+
+	auto result = WriteBytesWrap();
+	auto outFormat = MakeWriteFormatPointer(
+		static_cast<void*>(&result),
+		nullptr,
+		&WriteBytesWrap::Write,
+		&WriteBytesWrap::Seek,
+		"wav"_q);
+	if (!outFormat) {
+		return {};
+	}
+
+	// Find and open output codec
+	auto outCodec = avcodec_find_encoder(AV_CODEC_ID_PCM_S16LE);
+	if (!outCodec) {
+		return {};
+	}
+
+	auto outStream = avformat_new_stream(outFormat.get(), outCodec);
+	if (!outStream) {
+		return {};
+	}
+
+	auto outCodecContext = CodecPointer(
+		avcodec_alloc_context3(outCodec));
+	if (!outCodecContext) {
+		return {};
+	}
+
+	auto mono = AVChannelLayout(AV_CHANNEL_LAYOUT_MONO);
+	auto stereo = AVChannelLayout(AV_CHANNEL_LAYOUT_STEREO);
+	const auto in = &inCodecContext->ch_layout;
+	if (!av_channel_layout_compare(in, &mono)
+		|| !av_channel_layout_compare(in, &stereo)) {
+		av_channel_layout_copy(&outCodecContext->ch_layout, in);
+	} else {
+		outCodecContext->ch_layout = AV_CHANNEL_LAYOUT_STEREO;
+	}
+	const auto rate = 44'100;
+	outCodecContext->sample_fmt = AV_SAMPLE_FMT_S16;
+	outCodecContext->time_base = AVRational{ 1, rate };
+	outCodecContext->sample_rate = rate;
+
+	error = avcodec_open2(outCodecContext.get(), outCodec, nullptr);
+	if (error) {
+		LogError("avcodec_open2", error);
+		return {};
+	}
+
+	error = avcodec_parameters_from_context(
+		outStream->codecpar,
+		outCodecContext.get());
+	if (error) {
+		LogError("avcodec_parameters_from_context", error);
+		return {};
+	}
+
+	error = avformat_write_header(outFormat.get(), nullptr);
+	if (error) {
+		LogError("avformat_write_header", error);
+		return {};
+	}
+
+	auto swrContext = MakeSwresamplePointer(
+		&inCodecContext->ch_layout,
+		inCodecContext->sample_fmt,
+		inCodecContext->sample_rate,
+		&outCodecContext->ch_layout,
+		outCodecContext->sample_fmt,
+		outCodecContext->sample_rate);
+	if (!swrContext) {
+		return {};
+	}
+
+	auto packet = av_packet_alloc();
+	const auto guard = gsl::finally([&] {
+		av_packet_free(&packet);
+	});
+
+	auto frame = MakeFramePointer();
+	if (!frame) {
+		return {};
+	}
+
+	auto outFrame = MakeFramePointer();
+	if (!outFrame) {
+		return {};
+	}
+
+	outFrame->nb_samples = kFrameSize;
+	outFrame->format = outCodecContext->sample_fmt;
+	av_channel_layout_copy(
+		&outFrame->ch_layout,
+		&outCodecContext->ch_layout);
+	outFrame->sample_rate = outCodecContext->sample_rate;
+
+	error = av_frame_get_buffer(outFrame.get(), 0);
+	if (error) {
+		LogError("av_frame_get_buffer", error);
+		return {};
+	}
+
+	auto pts = int64_t(0);
+	auto maxPts = int64_t(kMaxDuration) * rate / 1000;
+	const auto writeFrame = [&](AVFrame *frame) { // nullptr to flush
+		error = avcodec_send_frame(outCodecContext.get(), frame);
+		if (error) {
+			LogError("avcodec_send_frame", error);
+			return error;
+		}
+		auto pkt = av_packet_alloc();
+		const auto guard = gsl::finally([&] {
+			av_packet_free(&pkt);
+		});
+		while (true) {
+			error = avcodec_receive_packet(outCodecContext.get(), pkt);
+			if (error) {
+				if (error.code() != AVERROR(EAGAIN)
+					&& error.code() != AVERROR_EOF) {
+					LogError("avcodec_receive_packet", error);
+				}
+				return error;
+			}
+			pkt->stream_index = outStream->index;
+			av_packet_rescale_ts(
+				pkt,
+				outCodecContext->time_base,
+				outStream->time_base);
+			error = av_interleaved_write_frame(outFormat.get(), pkt);
+			if (error) {
+				LogError("av_interleaved_write_frame", error);
+				return error;
+			}
+		}
+	};
+
+	while (pts < maxPts) {
+		error = av_read_frame(input.get(), packet);
+		const auto finished = (error.code() == AVERROR_EOF);
+		if (!finished) {
+			if (error) {
+				LogError("av_read_frame", error);
+				return {};
+			}
+			auto guard = gsl::finally([&] {
+				av_packet_unref(packet);
+			});
+			if (packet->stream_index != streamId) {
+				continue;
+			}
+			error = avcodec_send_packet(inCodecContext.get(), packet);
+			if (error) {
+				LogError("avcodec_send_packet", error);
+				return {};
+			}
+		}
+
+		while (true) {
+			error = avcodec_receive_frame(inCodecContext.get(), frame.get());
+			if (error) {
+				if (error.code() == AVERROR(EAGAIN)
+					|| error.code() == AVERROR_EOF) {
+					break;
+				} else {
+					LogError("avcodec_receive_frame", error);
+					return {};
+				}
+			}
+			error = swr_convert(
+				swrContext.get(),
+				outFrame->data,
+				kFrameSize,
+				(const uint8_t**)frame->data,
+				frame->nb_samples);
+			if (error) {
+				LogError("swr_convert", error);
+				return {};
+			}
+			const auto samples = error.code();
+			if (!samples) {
+				continue;
+			}
+
+			outFrame->nb_samples = samples;
+			outFrame->pts = pts;
+			pts += samples;
+			if (pts > maxPts) {
+				break;
+			}
+
+			error = writeFrame(outFrame.get());
+			if (error && error.code() != AVERROR(EAGAIN)) {
+				return {};
+			}
+		}
+
+		if (finished) {
+			break;
+		}
+	}
+	error = writeFrame(nullptr);
+	if (error && error.code() != AVERROR_EOF) {
+		return {};
+	}
+	error = av_write_trailer(outFormat.get());
+	if (error) {
+		LogError("av_write_trailer", error);
+		return {};
+	}
+	return result.content;
+}
+
+} // namespace
+
+LocalSound LocalCache::sound(
+		DocumentId id,
+		Fn<QByteArray()> resolveOriginalBytes,
+		Fn<QByteArray()> fallbackOriginalBytes) {
+	auto &result = _cache[id];
+	if (!result.isEmpty()) {
+		return { id, result };
+	}
+	result = ConvertAndCut(resolveOriginalBytes());
+	return !result.isEmpty()
+		? LocalSound{ id, result }
+		: fallbackOriginalBytes
+		? sound(0, fallbackOriginalBytes, nullptr)
+		: LocalSound();
+}
+
+LocalDiskCache::LocalDiskCache(const QString &folder)
+: _base(folder + '/') {
+	QDir().mkpath(_base);
+}
+
+QString LocalDiskCache::name(const LocalSound &sound) {
+	if (!sound) {
+		return {};
+	}
+	const auto i = _paths.find(sound.id);
+	if (i != end(_paths)) {
+		return i->second;
+	}
+
+	auto result = u"TD_%1"_q.arg(sound.id
+		? QString::number(sound.id, 16).toUpper()
+		: u"Default"_q);
+	const auto path = _base + u"%1.wav"_q.arg(result);
+
+	auto f = QFile(path);
+	if (f.open(QIODevice::WriteOnly)) {
+		f.write(sound.wav);
+		f.close();
+	}
+
+	_paths.emplace(sound.id, result);
+	return result;
+}
+
+QString LocalDiskCache::path(const LocalSound &sound) {
+	const auto part = name(sound);
+	return part.isEmpty() ? QString() : _base + part + u".wav"_q;
+}
+
+} // namespace Media::Audio
diff --git a/Telegram/SourceFiles/media/audio/media_audio_local_cache.h b/Telegram/SourceFiles/media/audio/media_audio_local_cache.h
new file mode 100644
index 00000000000000..53f4295d30fc63
--- /dev/null
+++ b/Telegram/SourceFiles/media/audio/media_audio_local_cache.h
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Media::Audio {
+
+struct LocalSound {
+    DocumentId id = 0;
+    QByteArray wav;
+
+    explicit operator bool() const {
+        return !wav.isEmpty();
+    }
+};
+
+class LocalCache final {
+public:
+    [[nodiscard]] LocalSound sound(
+        DocumentId id,
+        Fn<QByteArray()> resolveOriginalBytes,
+        Fn<QByteArray()> fallbackOriginalBytes);
+
+private:
+    base::flat_map<DocumentId, QByteArray> _cache;
+
+};
+
+class LocalDiskCache final {
+public:
+    explicit LocalDiskCache(const QString &folder);
+
+    [[nodiscard]] QString name(const LocalSound &sound);
+    [[nodiscard]] QString path(const LocalSound &sound);
+
+private:
+    const QString _base;
+	base::flat_map<DocumentId, QString> _paths;
+
+};
+
+} // namespace Media::Audio
diff --git a/Telegram/SourceFiles/media/audio/media_audio_track.cpp b/Telegram/SourceFiles/media/audio/media_audio_track.cpp
index bbf2ea5bd7791f..4b80750c7a88f1 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_track.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_track.cpp
@@ -142,7 +142,7 @@ void Track::fillFromFile(const QString &filePath) {
 	}
 }
 
-void Track::playWithLooping(bool looping) {
+void Track::playWithLooping(bool looping, float64 volumeOverride) {
 	_active = true;
 	if (failed() || _samples.empty()) {
 		finish();
@@ -152,7 +152,12 @@ void Track::playWithLooping(bool looping) {
 	alSourceStop(_alSource);
 	_looping = looping;
 	alSourcei(_alSource, AL_LOOPING, _looping ? 1 : 0);
-	alSourcef(_alSource, AL_GAIN, _volume);
+	alSourcef(
+		_alSource,
+		AL_GAIN,
+		(volumeOverride > 0)
+			? volumeOverride
+			: float64(Core::App().settings().notificationsVolume()) / 100.);
 	alSourcePlay(_alSource);
 	_instance->trackStarted(this);
 }
@@ -273,7 +278,7 @@ Instance::Instance()
 	});
 
 	_playbackDeviceId.changes(
-	) | rpl::start_with_next([=](Webrtc::DeviceResolvedId id) {
+	) | rpl::on_next([=](Webrtc::DeviceResolvedId id) {
 		if (Player::internal::DetachIfDeviceChanged(this, id)) {
 			_detachFromDeviceForce = false;
 		}
diff --git a/Telegram/SourceFiles/media/audio/media_audio_track.h b/Telegram/SourceFiles/media/audio/media_audio_track.h
index 5016a19c935c55..a4476a28eecb2b 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_track.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_track.h
@@ -30,11 +30,11 @@ class Track {
 	void fillFromFile(const Core::FileLocation &location);
 	void fillFromFile(const QString &filePath);
 
-	void playOnce() {
-		playWithLooping(false);
+	void playOnce(float64 volumeOverride = -1) {
+		playWithLooping(false, volumeOverride);
 	}
-	void playInLoop() {
-		playWithLooping(true);
+	void playInLoop(float64 volumeOverride = -1) {
+		playWithLooping(true, volumeOverride);
 	}
 
 	bool isLooping() const {
@@ -61,14 +61,13 @@ class Track {
 private:
 	void finish();
 	void ensureSourceCreated();
-	void playWithLooping(bool looping);
+	void playWithLooping(bool looping, float64 volumeOverride);
 
 	not_null<Instance*> _instance;
 
 	bool _failed = false;
 	bool _active = false;
 	bool _looping = false;
-	float64 _volume = 1.;
 
 	int64 _samplesCount = 0;
 	int32 _sampleRate = 0;
diff --git a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
index 1188f023242097..eca860d9bd1bec 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
+++ b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "media/clip/media_clip_ffmpeg.h"
 
 #include "core/file_location.h"
+#include "media/media_common.h"
 #include "logs.h"
 
 namespace Media {
@@ -19,30 +20,10 @@ constexpr auto kSkipInvalidDataPackets = 10;
 constexpr auto kMaxInlineArea = 1280 * 720;
 constexpr auto kMaxSendingArea = 3840 * 2160; // usual 4K
 
-// See https://github.com/telegramdesktop/tdesktop/issues/7225
-constexpr auto kAlignImageBy = 64;
-
-void alignedImageBufferCleanupHandler(void *data) {
-	auto buffer = static_cast<uchar*>(data);
-	delete[] buffer;
-}
-
-// Create a QImage of desired size where all the data is aligned to 16 bytes.
-QImage createAlignedImage(QSize size) {
-	auto width = size.width();
-	auto height = size.height();
-	auto widthalign = kAlignImageBy / 4;
-	auto neededwidth = width + ((width % widthalign) ? (widthalign - (width % widthalign)) : 0);
-	auto bytesperline = neededwidth * 4;
-	auto buffer = new uchar[bytesperline * height + kAlignImageBy];
-	auto cleanupdata = static_cast<void*>(buffer);
-	auto bufferval = reinterpret_cast<uintptr_t>(buffer);
-	auto alignedbuffer = buffer + ((bufferval % kAlignImageBy) ? (kAlignImageBy - (bufferval % kAlignImageBy)) : 0);
-	return QImage(alignedbuffer, width, height, bytesperline, QImage::Format_ARGB32_Premultiplied, alignedImageBufferCleanupHandler, cleanupdata);
-}
-
-bool isAlignedImage(const QImage &image) {
-	return !(reinterpret_cast<uintptr_t>(image.constBits()) % kAlignImageBy) && !(image.bytesPerLine() % kAlignImageBy);
+[[nodiscard]] auto MaxAreaForMode(ReaderImplementation::Mode mode) {
+	return (mode == ReaderImplementation::Mode::Inspecting)
+		? kMaxSendingArea
+		: kMaxInlineArea;
 }
 
 } // namespace
@@ -58,10 +39,8 @@ ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
 	do {
 		int res = avcodec_receive_frame(_codecContext, _frame.get());
 		if (res >= 0) {
-			const auto limit = (_mode == Mode::Inspecting)
-				? kMaxSendingArea
-				: kMaxInlineArea;
-			if (_frame->width * _frame->height > limit) {
+			const auto limit = MaxAreaForMode(_mode);
+			if (!::Media::ValidFrameSize(_frame->width, _frame->height, limit)) {
 				return ReadResult::Error;
 			}
 			processReadFrame();
@@ -144,11 +123,7 @@ ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
 }
 
 void FFMpegReaderImplementation::processReadFrame() {
-#if DA_FFMPEG_HAVE_DURATION
 	int64 duration = _frame->duration;
-#else
-	int64 duration = _frame->pkt_duration;
-#endif
 	int64 framePts = _frame->pts;
 	crl::time frameMs = (framePts * 1000LL * _fmtContext->streams[_streamId]->time_base.num) / _fmtContext->streams[_streamId]->time_base.den;
 	_currentFrameDelay = _nextFrameDelay;
@@ -227,15 +202,22 @@ bool FFMpegReaderImplementation::renderFrame(
 	if (!size.isEmpty() && rotationSwapWidthHeight()) {
 		toSize.transpose();
 	}
-	if (to.isNull() || to.size() != toSize || !to.isDetached() || !isAlignedImage(to)) {
-		to = createAlignedImage(toSize);
+	if (!FFmpeg::GoodStorageForFrame(to, toSize)) {
+		to = FFmpeg::CreateFrameStorage(toSize);
+		if (to.isNull()) {
+			LOG(("Gif Error: Bad storage size %1").arg(logData()));
+			return false;
+		}
 	}
 	const auto format = (_frame->format == AV_PIX_FMT_NONE)
 		? _codecContext->pix_fmt
 		: _frame->format;
 	const auto bgra = (format == AV_PIX_FMT_BGRA);
 	hasAlpha = bgra || (format == AV_PIX_FMT_YUVA420P);
-	if (_frame->width == toSize.width() && _frame->height == toSize.height() && bgra) {
+	if (bgra
+		&& _frame->width == toSize.width()
+		&& _frame->height == toSize.height()
+		&& _frame->linesize[0] > 0) {
 		int32 sbpl = _frame->linesize[0], dbpl = to.bytesPerLine(), bpl = qMin(sbpl, dbpl);
 		uchar *s = _frame->data[0], *d = to.bits();
 		for (int32 i = 0, l = _frame->height; i < l; ++i) {
@@ -347,6 +329,8 @@ bool FFMpegReaderImplementation::start(Mode mode, crl::time &positionMs) {
 		const auto audioStreamId = av_find_best_stream(_fmtContext, AVMEDIA_TYPE_AUDIO, -1, -1, nullptr, 0);
 		_hasAudioStream = (audioStreamId >= 0);
 	}
+	_codecContext->max_pixels = FFmpeg::MaxPixelsForAreaLimit(
+		MaxAreaForMode(_mode));
 
 	if ((res = avcodec_open2(_codecContext, codec, nullptr)) < 0) {
 		LOG(("Gif Error: Unable to avcodec_open2 %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
diff --git a/Telegram/SourceFiles/media/media_common.h b/Telegram/SourceFiles/media/media_common.h
index c155a40849d16b..6cfb6290ce9df5 100644
--- a/Telegram/SourceFiles/media/media_common.h
+++ b/Telegram/SourceFiles/media/media_common.h
@@ -9,6 +9,9 @@ For license and copyright information please follow this link:
 
 #include "base/algorithm.h"
 
+#include <compare>
+#include <cstdint>
+
 namespace Media {
 
 enum class RepeatMode {
@@ -23,10 +26,33 @@ enum class OrderMode {
 	Shuffle,
 };
 
+struct VideoQuality {
+	uint32 manual : 1 = 0;
+	uint32 height : 30 = 0;
+	uint32 original : 1 = 0;
+
+	friend inline constexpr auto operator<=>(
+		VideoQuality,
+		VideoQuality) = default;
+	friend inline constexpr bool operator==(
+		VideoQuality,
+		VideoQuality) = default;
+};
+
 inline constexpr auto kSpeedMin = 0.5;
 inline constexpr auto kSpeedMax = 2.5;
 inline constexpr auto kSpedUpDefault = 1.7;
 
+[[nodiscard]] inline bool ValidFrameSize(int w, int h, int maxArea) {
+	return (w > 0)
+		&& (h > 0)
+		&& (int64_t(w) * h <= int64_t(maxArea));
+}
+
+[[nodiscard]] inline bool ValidFrameSize(QSize size, int maxArea) {
+	return ValidFrameSize(size.width(), size.height(), maxArea);
+}
+
 [[nodiscard]] inline bool EqualSpeeds(float64 a, float64 b) {
 	return int(base::SafeRound(a * 10.)) == int(base::SafeRound(b * 10.));
 }
diff --git a/Telegram/SourceFiles/media/player/media_player.style b/Telegram/SourceFiles/media/player/media_player.style
index 5e5a3ec8bb6f7a..708346f178539b 100644
--- a/Telegram/SourceFiles/media/player/media_player.style
+++ b/Telegram/SourceFiles/media/player/media_player.style
@@ -29,6 +29,7 @@ MediaPlayerButton {
 
 MediaSpeedMenu {
 	dropdown: DropdownMenu;
+	qualityMenu: Menu;
 	activeCheck: icon;
 	activeCheckSkip: pixels;
 	sliderStyle: TextStyle;
@@ -63,6 +64,7 @@ MediaSpeedButton {
 	rippleRadius: pixels;
 	menu: MediaSpeedMenu;
 	menuAlign: align;
+	menuPosition: point;
 }
 
 mediaPlayerButton: MediaPlayerButton {
@@ -159,22 +161,26 @@ mediaPlayerCancelIcon: icon{
 
 mediaPlayerMenu: DropdownMenu(defaultDropdownMenu) {
 	wrap: InnerDropdown(defaultInnerDropdown) {
-		scrollPadding: margins(0px, 4px, 0px, 4px);
-		padding: margins(10px, 2px, 10px, 10px);
+		scrollPadding: margins(0px, 6px, 0px, 6px);
+		padding: margins(10px, 10px, 10px, 10px);
 	}
 }
 mediaPlayerMenuCheck: icon {{ "player/player_check", mediaPlayerActiveFg }};
 
+mediaPlayerSpeedMenuInner: Menu(menuWithIcons) {
+	separator: MenuSeparator(defaultMenuSeparator) {
+		padding: margins(0px, 4px, 0px, 4px);
+		width: 6px;
+	}
+	itemPadding: margins(54px, 7px, 54px, 9px);
+	itemFgDisabled: mediaPlayerActiveFg;
+}
 mediaPlayerSpeedMenu: MediaSpeedMenu {
 	dropdown: DropdownMenu(mediaPlayerMenu) {
-		menu: Menu(menuWithIcons) {
-			separator: MenuSeparator(defaultMenuSeparator) {
-				padding: margins(0px, 4px, 0px, 4px);
-				width: 6px;
-			}
-			itemPadding: margins(54px, 7px, 54px, 9px);
-			itemFgDisabled: mediaPlayerActiveFg;
-		}
+		menu: mediaPlayerSpeedMenuInner;
+	}
+	qualityMenu: Menu(mediaPlayerSpeedMenuInner) {
+		itemPadding: margins(17px, 7px, 54px, 9px);
 	}
 	activeCheck: mediaPlayerMenuCheck;
 	activeCheckSkip: 8px;
@@ -223,6 +229,7 @@ mediaPlayerSpeedButton: MediaSpeedButton {
 	rippleRadius: 4px;
 	menu: mediaPlayerSpeedMenu;
 	menuAlign: align(topright);
+	menuPosition: point(-2px, -1px);
 }
 
 mediaPlayerVolumeIcon0: icon {
@@ -291,11 +298,6 @@ mediaPlayerPanelMarginLeft: 10px;
 mediaPlayerPanelMarginBottom: 10px;
 mediaPlayerPanelWidth: 344px;
 
-mediaPlayerPanelNextButton: IconButton(mediaPlayerRepeatButton) {
-	width: 37px;
-	icon: icon {{ "player/player_forward", mediaPlayerActiveFg, point(6px, 4px) }};
-}
-
 mediaPlayerPanelPlaybackPadding: 8px;
 mediaPlayerPanelPlayback: defaultContinuousSlider;
 
diff --git a/Telegram/SourceFiles/media/player/media_player_button.cpp b/Telegram/SourceFiles/media/player/media_player_button.cpp
index 0e9ab424a4b781..59fd6c8743dc79 100644
--- a/Telegram/SourceFiles/media/player/media_player_button.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_button.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "ui/effects/ripple_animation.h"
 #include "ui/painter.h"
 #include "styles/style_media_player.h"
+#include "styles/style_media_view.h"
 
 #include <QtCore/QtMath>
 
@@ -307,7 +308,7 @@ SpeedButton::SpeedButton(QWidget *parent, const style::MediaSpeedButton &st)
 	resize(_st.size);
 }
 
-void SpeedButton::setSpeed(float64 speed, anim::type animated) {
+void SpeedButton::setSpeed(float64 speed) {
 	_isDefault = EqualSpeeds(speed, 1.);
 	_layout.setSpeed(speed);
 	update();
@@ -337,4 +338,169 @@ QImage SpeedButton::prepareRippleMask() const {
 		_st.rippleRadius);
 }
 
+SettingsButton::SettingsButton(
+	QWidget *parent,
+	const style::MediaSpeedButton &st)
+: RippleButton(parent, st.ripple)
+, _st(st)
+, _isDefaultSpeed(true) {
+	resize(_st.size);
+}
+
+void SettingsButton::setSpeed(float64 speed) {
+	if (_speed != speed) {
+		_speed = speed;
+		_isDefaultSpeed = EqualSpeeds(speed, 1.);
+		update();
+	}
+}
+
+void SettingsButton::setQuality(Media::VideoQuality quality) {
+	if (_quality != quality) {
+		_quality = quality;
+		update();
+	}
+}
+
+void SettingsButton::setActive(bool active) {
+	if (_active == active) {
+		return;
+	}
+	_active = active;
+	_activeAnimation.start([=] {
+		update();
+	}, active ? 0. : 1., active ? 1. : 0., st::mediaviewOverDuration);
+}
+
+void SettingsButton::onStateChanged(State was, StateChangeSource source) {
+	RippleButton::onStateChanged(was, source);
+
+	const auto nowOver = isOver();
+	const auto wasOver = static_cast<bool>(was & StateFlag::Over);
+	if (nowOver != wasOver) {
+		_overAnimation.start([=] {
+			update();
+		}, nowOver ? 0. : 1., nowOver ? 1. : 0., st::mediaviewOverDuration);
+	}
+}
+
+void SettingsButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	paintRipple(
+		p,
+		QPoint(_st.padding.left(), _st.padding.top()),
+		_isDefaultSpeed ? nullptr : &_st.rippleActiveColor->c);
+
+	prepareFrame();
+	p.drawImage(0, 0, _frameCache);
+}
+
+void SettingsButton::prepareFrame() {
+	const auto ratio = style::DevicePixelRatio();
+	if (_frameCache.size() != _st.size * ratio) {
+		_frameCache = QImage(
+			_st.size * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		_frameCache.setDevicePixelRatio(ratio);
+	}
+	_frameCache.fill(Qt::transparent);
+	auto p = QPainter(&_frameCache);
+
+	const auto inner = QRect(
+		QPoint(),
+		_st.size
+	).marginsRemoved(_st.padding);
+
+	auto hq = std::optional<PainterHighQualityEnabler>();
+	const auto over = _overAnimation.value(isOver() ? 1. : 0.);
+	const auto color = anim::color(_st.fg, _st.overFg, over);
+	const auto active = _activeAnimation.value(_active ? 1. : 0.);
+	if (active > 0.) {
+		const auto shift = QRectF(inner).center();
+		p.save();
+		p.translate(shift);
+		p.rotate(active * 60.);
+		p.translate(-shift);
+		hq.emplace(p);
+	}
+	_st.icon.paintInCenter(p, inner, color);
+	if (active > 0.) {
+		p.restore();
+		hq.reset();
+	}
+
+	const auto rounded = int(base::SafeRound(_speed * 10));
+	if (rounded != 10) {
+		const auto text = (rounded % 10)
+			? QString::number(rounded / 10.)
+			: u"%1X"_q.arg(rounded / 10);
+		paintBadge(p, text, RectPart::TopLeft, color);
+	}
+	const auto height = _quality.height;
+	const auto text = !height
+		? QString()
+		: (height > 2000)
+		? u"4K"_q
+		: (height > 1000)
+		? u"FHD"_q
+		: (height > 700)
+		? u"HD"_q
+		: u"SD"_q;
+	if (!text.isEmpty()) {
+		paintBadge(p, text, RectPart::BottomRight, color);
+	}
+}
+
+void SettingsButton::paintBadge(
+		QPainter &p,
+		const QString &text,
+		RectPart origin,
+		QColor color) {
+	auto hq = PainterHighQualityEnabler(p);
+	const auto xpadding = style::ConvertScale(2.);
+	const auto ypadding = 0;
+	const auto skip = style::ConvertScale(2.);
+	const auto width = _st.font->width(text);
+	const auto height = _st.font->height;
+	const auto radius = height / 3.;
+	const auto left = (origin == RectPart::TopLeft)
+		|| (origin == RectPart::BottomLeft);
+	const auto top = (origin == RectPart::TopLeft)
+		|| (origin == RectPart::TopRight);
+	const auto x = left ? 0 : (_st.size.width() - width - 2 * xpadding);
+	const auto y = top
+		? skip
+		: (_st.size.height() - height - 2 * ypadding - skip);
+	p.setCompositionMode(QPainter::CompositionMode_Source);
+	const auto stroke = style::ConvertScaleExact(1.);
+	p.setPen(QPen(Qt::transparent, stroke));
+	p.setFont(_st.font);
+	p.setBrush(color);
+	p.drawRoundedRect(
+		QRectF(
+			x - stroke / 2.,
+			y - stroke / 2.,
+			width + 2 * xpadding + stroke,
+			height + 2 * ypadding + stroke),
+		radius,
+		radius);
+	p.setPen(Qt::transparent);
+	p.drawText(x + xpadding, y + ypadding + _st.font->ascent, text);
+}
+
+QPoint SettingsButton::prepareRippleStartPosition() const {
+	const auto inner = rect().marginsRemoved(_st.padding);
+	const auto result = mapFromGlobal(QCursor::pos()) - inner.topLeft();
+	return inner.contains(result)
+		? result
+		: DisabledRippleStartPosition();
+}
+
+QImage SettingsButton::prepareRippleMask() const {
+	return Ui::RippleAnimation::RoundRectMask(
+		rect().marginsRemoved(_st.padding).size(),
+		_st.rippleRadius);
+}
+
 } // namespace Media::Player
diff --git a/Telegram/SourceFiles/media/player/media_player_button.h b/Telegram/SourceFiles/media/player/media_player_button.h
index 750b533eb64341..998e23452afbeb 100644
--- a/Telegram/SourceFiles/media/player/media_player_button.h
+++ b/Telegram/SourceFiles/media/player/media_player_button.h
@@ -7,8 +7,10 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "media/media_common.h"
 #include "ui/effects/animations.h"
 #include "ui/widgets/buttons.h"
+#include "ui/rect_part.h"
 
 #include <QtGui/QFontMetrics>
 
@@ -87,7 +89,7 @@ class SpeedButton final : public Ui::RippleButton {
 		return _st;
 	}
 
-	void setSpeed(float64 speed, anim::type animated = anim::type::normal);
+	void setSpeed(float64 speed);
 
 private:
 	void paintEvent(QPaintEvent *e) override;
@@ -101,4 +103,42 @@ class SpeedButton final : public Ui::RippleButton {
 
 };
 
+class SettingsButton final : public Ui::RippleButton {
+public:
+	SettingsButton(QWidget *parent, const style::MediaSpeedButton &st);
+
+	[[nodiscard]] const style::MediaSpeedButton &st() const {
+		return _st;
+	}
+
+	void setSpeed(float64 speed);
+	void setQuality(Media::VideoQuality quality);
+	void setActive(bool active);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	QPoint prepareRippleStartPosition() const override;
+	QImage prepareRippleMask() const override;
+
+	void onStateChanged(State was, StateChangeSource source) override;
+
+	void paintBadge(
+		QPainter &p,
+		const QString &text,
+		RectPart origin,
+		QColor color);
+	void prepareFrame();
+
+	const style::MediaSpeedButton &_st;
+	Ui::Animations::Simple _activeAnimation;
+	Ui::Animations::Simple _overAnimation;
+	QImage _frameCache;
+	float _speed = 1.;
+	Media::VideoQuality _quality;
+	bool _isDefaultSpeed = false;
+	bool _active = false;
+
+};
+
 } // namespace Media::Player
diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
index 0a8b181fed94eb..fe1cfbe0b8e754 100644
--- a/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_dropdown.cpp
@@ -50,7 +50,7 @@ constexpr auto kSpeedStickedValues
 class SpeedSliderItem final : public Ui::Menu::ItemBase {
 public:
 	SpeedSliderItem(
-		not_null<RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::MediaSpeedMenu &st,
 		rpl::producer<float64> value);
 
@@ -84,7 +84,7 @@ class SpeedSliderItem final : public Ui::Menu::ItemBase {
 };
 
 SpeedSliderItem::SpeedSliderItem(
-	not_null<RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::MediaSpeedMenu &st,
 	rpl::producer<float64> value)
 : Ui::Menu::ItemBase(parent, st.dropdown.menu)
@@ -95,7 +95,7 @@ SpeedSliderItem::SpeedSliderItem(
 	+ st.dropdown.menu.itemStyle.font->height
 	+ st.sliderPadding.bottom())
 , _debounceTimer([=] { _debounced.fire(current()); }) {
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 	enableMouseSelecting();
 	enableMouseSelecting(_slider.get());
 
@@ -106,7 +106,7 @@ SpeedSliderItem::SpeedSliderItem(
 	_slider->setAlwaysDisplayMarker(true);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		const auto geometry = QRect(QPoint(), size);
 		const auto padding = _st.sliderPadding;
 		const auto inner = geometry - padding;
@@ -118,7 +118,7 @@ SpeedSliderItem::SpeedSliderItem(
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
+	) | rpl::on_next([=](const QRect &clip) {
 		auto p = Painter(this);
 
 		p.fillRect(clip, _st.dropdown.menu.itemBg);
@@ -148,12 +148,12 @@ SpeedSliderItem::SpeedSliderItem(
 
 	std::move(
 		value
-	) | rpl::start_with_next([=](float64 external) {
+	) | rpl::on_next([=](float64 external) {
 		setExternalValue(external);
 	}, lifetime());
 
 	_last.value(
-	) | rpl::start_with_next([=](float64 value) {
+	) | rpl::on_next([=](float64 value) {
 		const auto text = QString::number(value, 'f', 1) + 'x';
 		if (_text.toString() != text) {
 			_text.setText(_st.sliderStyle, text);
@@ -177,14 +177,15 @@ void FillSpeedMenu(
 		not_null<Ui::Menu::Menu*> menu,
 		const style::MediaSpeedMenu &st,
 		rpl::producer<float64> value,
-		Fn<void(float64)> callback) {
+		Fn<void(float64)> callback,
+		bool onlySlider) {
 	auto slider = base::make_unique_q<SpeedSliderItem>(
 		menu,
 		st,
 		rpl::duplicate(value));
 
 	slider->debouncedChanges(
-	) | rpl::start_with_next(callback, slider->lifetime());
+	) | rpl::on_next(callback, slider->lifetime());
 
 	struct State {
 		rpl::variable<float64> realtime;
@@ -198,6 +199,11 @@ void FillSpeedMenu(
 	));
 
 	menu->addAction(std::move(slider));
+
+	if (onlySlider) {
+		return;
+	}
+
 	menu->addSeparator(&st.dropdown.menu.separator);
 
 	struct SpeedPoint {
@@ -253,12 +259,12 @@ void FillSpeedMenu(
 		const auto check = Ui::CreateChild<Ui::RpWidget>(raw);
 		check->resize(st.activeCheck.size());
 		check->paintRequest(
-		) | rpl::start_with_next([check, icon = &st.activeCheck] {
+		) | rpl::on_next([check, icon = &st.activeCheck] {
 			auto p = QPainter(check);
 			icon->paint(p, 0, 0, check->width());
 		}, check->lifetime());
 		raw->sizeValue(
-		) | rpl::start_with_next([=, skip = st.activeCheckSkip](QSize size) {
+		) | rpl::on_next([=, skip = st.activeCheckSkip](QSize size) {
 			check->moveToRight(
 				skip,
 				(size.height() - check->height()) / 2,
@@ -266,7 +272,7 @@ void FillSpeedMenu(
 		}, check->lifetime());
 		check->setAttribute(Qt::WA_TransparentForMouseEvents);
 		state->realtime.value(
-		) | rpl::start_with_next([=](float64 now) {
+		) | rpl::on_next([=](float64 now) {
 			const auto chosen = EqualSpeeds(speed, now);
 			const auto overriden = chosen ? iconActive : icon;
 			raw->setIcon(overriden, overriden);
@@ -329,7 +335,7 @@ Dropdown::Dropdown(QWidget *parent)
 	macWindowDeactivateEvents(
 	) | rpl::filter([=] {
 		return !isHidden();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		leaveEvent(nullptr);
 	}, lifetime());
 
@@ -376,7 +382,7 @@ void Dropdown::paintEvent(QPaintEvent *e) {
 	// draw shadow
 	auto shadowedRect = rect().marginsRemoved(getMargin());
 	auto shadowedSides = RectPart::Left | RectPart::Right | RectPart::Bottom;
-	Ui::Shadow::paint(p, shadowedRect, width(), st::defaultRoundShadow, shadowedSides);
+	Ui::Shadow::paint(p, shadowedRect, width(), st::roundShadowRadius8px, shadowedSides);
 	const auto &corners = Ui::CachedCornerPixmaps(Ui::MenuCorners);
 	const auto fill = Ui::CornersPixmaps{
 		.p = { QPixmap(), QPixmap(), corners.p[2], corners.p[3] },
@@ -489,17 +495,19 @@ WithDropdownController::WithDropdownController(
 	not_null<QWidget*> menuParent,
 	const style::DropdownMenu &menuSt,
 	Qt::Alignment menuAlign,
+	QPoint menuPosition,
 	Fn<void(bool)> menuOverCallback)
 : _button(button)
 , _menuParent(menuParent)
 , _menuSt(menuSt)
 , _menuAlign(menuAlign)
+, _menuPosition(menuPosition)
 , _menuOverCallback(std::move(menuOverCallback)) {
 	button->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return (e->type() == QEvent::Enter)
 			|| (e->type() == QEvent::Leave);
-	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
 		_overButton = (e->type() == QEvent::Enter);
 		if (_overButton) {
 			InvokeQueued(button, [=] {
@@ -528,8 +536,8 @@ void WithDropdownController::updateDropdownGeometry() {
 	const auto mwidth = _menu->width();
 	const auto mheight = _menu->height();
 	const auto padding = _menuSt.wrap.padding;
-	const auto x = st::mediaPlayerMenuPosition.x();
-	const auto y = st::mediaPlayerMenuPosition.y();
+	const auto x = _menuPosition.x();
+	const auto y = _menuPosition.y();
 	const auto position = _menu->parentWidget()->mapFromGlobal(
 		_button->mapToGlobal(QPoint())
 	) + [&] {
@@ -552,6 +560,10 @@ void WithDropdownController::updateDropdownGeometry() {
 	_menu->move(position);
 }
 
+rpl::producer<bool> WithDropdownController::menuToggledValue() const {
+	return _menuToggled.value();
+}
+
 void WithDropdownController::hideTemporarily() {
 	if (_menu && !_menu->isHidden()) {
 		_temporarilyHidden = true;
@@ -575,7 +587,7 @@ void WithDropdownController::showMenu() {
 	_menu.emplace(_menuParent, _menuSt);
 	const auto raw = _menu.get();
 	_menu->events(
-	) | rpl::start_with_next([this](not_null<QEvent*> e) {
+	) | rpl::on_next([this](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::Enter) {
 			_menuOverCallback(true);
@@ -584,10 +596,20 @@ void WithDropdownController::showMenu() {
 		}
 	}, _menu->lifetime());
 	_menu->setHiddenCallback([=]{
+		if (_menu.get() == raw) {
+			_menuToggled = false;
+		}
 		Ui::PostponeCall(raw, [this] {
 			_menu = nullptr;
+			_menuToggled = false;
 		});
 	});
+	_menu->setShowStartCallback([=] {
+		_menuToggled = true;
+	});
+	_menu->setHideStartCallback([=] {
+		_menuToggled = false;
+	});
 	_button->installEventFilter(raw);
 	fillMenu(raw);
 	updateDropdownGeometry();
@@ -602,6 +624,7 @@ void WithDropdownController::showMenu() {
 		Unexpected("Menu align value.");
 	}();
 	_menu->showAnimated(origin);
+	_menuToggled = true;
 }
 
 OrderController::OrderController(
@@ -615,6 +638,7 @@ OrderController::OrderController(
 	menuParent,
 	st::mediaPlayerMenu,
 	style::al_topright,
+	st::mediaPlayerMenuPosition,
 	std::move(menuOverCallback))
 , _button(button)
 , _appOrder(std::move(value))
@@ -624,7 +648,7 @@ OrderController::OrderController(
 	});
 
 	_appOrder.value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateIcon();
 	}, button->lifetime());
 }
@@ -656,7 +680,7 @@ void OrderController::fillMenu(not_null<Ui::DropdownMenu*> menu) {
 			Unexpected("Order mode in addOrderAction.");
 		}();
 		menu->addAction(base::make_unique_q<Ui::Menu::Action>(
-			menu,
+			menu->menu(),
 			(active
 				? st::mediaPlayerOrderMenuActive
 				: st::mediaPlayerOrderMenu),
@@ -689,42 +713,64 @@ void OrderController::updateIcon() {
 }
 
 SpeedController::SpeedController(
-	not_null<SpeedButton*> button,
+	not_null<Ui::AbstractButton*> button,
+	const style::MediaSpeedButton &st,
 	not_null<QWidget*> menuParent,
 	Fn<void(bool)> menuOverCallback,
 	Fn<float64(bool lastNonDefault)> value,
-	Fn<void(float64)> change)
+	Fn<void(float64)> change,
+	std::vector<VideoQuality> qualities,
+	Fn<VideoQuality()> quality,
+	Fn<void(VideoQuality)> changeQuality)
 : WithDropdownController(
 	button,
 	menuParent,
-	button->st().menu.dropdown,
-	button->st().menuAlign,
+	st.menu.dropdown,
+	st.menuAlign,
+	st.menuPosition,
 	std::move(menuOverCallback))
-, _st(button->st())
+, _st(st)
 , _lookup(std::move(value))
-, _change(std::move(change)) {
+, _change(std::move(change))
+, _qualities(std::move(qualities))
+, _lookupQuality(std::move(quality))
+, _changeQuality(std::move(changeQuality)) {
+	Expects(_qualities.empty() || (_lookupQuality && _changeQuality));
+
 	button->setClickedCallback([=] {
-		toggleDefault();
-		save();
-		if (const auto current = menu()) {
-			current->otherEnter();
+		if (_lookup && !_lookupQuality && !_changeQuality) {
+			toggleDefault();
+			save();
+			if (const auto current = menu()) {
+				current->otherEnter();
+			}
+		} else {
+			showMenu();
 		}
 	});
+	if (const auto lookup = _lookup) {
+		setSpeed(lookup(false));
+		_speed = lookup(true);
+	}
+}
 
-	setSpeed(_lookup(false));
-	_speed = _lookup(true);
+rpl::producer<> SpeedController::saved() const {
+	return _saved.events();
+}
 
-	button->setSpeed(_speed, anim::type::instant);
+rpl::producer<float64> SpeedController::realtimeValue() const {
+	return _speedChanged.events_starting_with(speed());
+}
 
-	_speedChanged.events_starting_with(
-		speed()
-	) | rpl::start_with_next([=](float64 speed) {
-		button->setSpeed(speed);
-	}, button->lifetime());
+void SpeedController::reloadFromLookup() {
+	if (const auto lookup = _lookup) {
+		setSpeed(lookup(false));
+		_speed = lookup(true);
+	}
 }
 
-rpl::producer<> SpeedController::saved() const {
-	return _saved.events();
+void SpeedController::setQualities(std::vector<VideoQuality> qualities) {
+	_qualities = std::move(qualities);
 }
 
 float64 SpeedController::speed() const {
@@ -752,16 +798,92 @@ void SpeedController::setSpeed(float64 newSpeed) {
 }
 
 void SpeedController::save() {
-	_change(speed());
+	if (const auto change = _change) {
+		change(speed());
+	}
 	_saved.fire({});
 }
 
+void SpeedController::setQuality(VideoQuality quality) {
+	_quality = quality;
+	_changeQuality(quality);
+}
+
 void SpeedController::fillMenu(not_null<Ui::DropdownMenu*> menu) {
-	FillSpeedMenu(
-		menu->menu(),
-		_st.menu,
-		_speedChanged.events_starting_with(speed()),
-		[=](float64 speed) { setSpeed(speed); save(); });
+	if (_lookup) {
+		FillSpeedMenu(
+			menu->menu(),
+			_st.menu,
+			_speedChanged.events_starting_with(speed()),
+			[=](float64 speed) { setSpeed(speed); save(); },
+			!_qualities.empty());
+	}
+	if (_qualities.empty()) {
+		return;
+	}
+	_quality = _lookupQuality();
+	const auto raw = menu->menu();
+	const auto &st = _st.menu;
+	if (_lookup) {
+		raw->addSeparator(&st.dropdown.menu.separator);
+	}
+
+	const auto add = [&](VideoQuality quality) {
+		const auto automatic = tr::lng_mediaview_quality_auto(tr::now);
+		const auto text = (!quality.height && !quality.original)
+			? automatic
+			: quality.original
+			? tr::lng_mediaview_quality_original(
+				tr::now,
+				lt_quality,
+				QString::number(quality.height))
+			: u"%1p"_q.arg(quality.height);
+		auto action = base::make_unique_q<Ui::Menu::Action>(
+			raw,
+			st.qualityMenu,
+			Ui::Menu::CreateAction(
+				raw,
+				text,
+				[=] { _changeQuality(quality); }),
+			nullptr,
+			nullptr);
+		const auto rawAction = action.get();
+		const auto check = Ui::CreateChild<Ui::RpWidget>(rawAction);
+		check->resize(st.activeCheck.size());
+		check->paintRequest(
+		) | rpl::on_next([check, icon = &st.activeCheck] {
+			auto p = QPainter(check);
+			icon->paint(p, 0, 0, check->width());
+		}, check->lifetime());
+		rawAction->sizeValue(
+		) | rpl::on_next([=, skip = st.activeCheckSkip](QSize size) {
+			check->moveToRight(
+				skip,
+				(size.height() - check->height()) / 2,
+				size.width());
+		}, check->lifetime());
+		check->setAttribute(Qt::WA_TransparentForMouseEvents);
+		_quality.value(
+		) | rpl::on_next([=](VideoQuality now) {
+			const auto chosen = now.manual
+				? (now == quality)
+				: (!quality.height && !quality.original);
+			rawAction->action()->setEnabled(!chosen);
+			if (!quality.height && !quality.original) {
+				const auto suffix = now.manual
+					? QString()
+					: u"\t%1p"_q.arg(now.height);
+				rawAction->action()->setText(automatic + suffix);
+			}
+			check->setVisible(chosen);
+		}, rawAction->lifetime());
+		menu->addAction(std::move(action));
+	};
+
+	add(VideoQuality());
+	for (const auto &quality : _qualities) {
+		add(quality);
+	}
 }
 
 } // namespace Media::Player
diff --git a/Telegram/SourceFiles/media/player/media_player_dropdown.h b/Telegram/SourceFiles/media/player/media_player_dropdown.h
index 63197dbb87bbb5..1345f98d0984f9 100644
--- a/Telegram/SourceFiles/media/player/media_player_dropdown.h
+++ b/Telegram/SourceFiles/media/player/media_player_dropdown.h
@@ -30,8 +30,6 @@ class Menu;
 
 namespace Media::Player {
 
-class SpeedButton;
-
 class Dropdown final : public Ui::RpWidget {
 public:
 	explicit Dropdown(QWidget *parent);
@@ -75,6 +73,7 @@ class WithDropdownController {
 		not_null<QWidget*> menuParent,
 		const style::DropdownMenu &menuSt,
 		Qt::Alignment menuAlign,
+		QPoint menuPosition,
 		Fn<void(bool)> menuOverCallback);
 	virtual ~WithDropdownController() = default;
 
@@ -82,6 +81,7 @@ class WithDropdownController {
 	Ui::DropdownMenu *menu() const;
 
 	void updateDropdownGeometry();
+	[[nodiscard]] rpl::producer<bool> menuToggledValue() const;
 
 	void hideTemporarily();
 	void showBack();
@@ -96,8 +96,10 @@ class WithDropdownController {
 	const not_null<QWidget*> _menuParent;
 	const style::DropdownMenu &_menuSt;
 	const Qt::Alignment _menuAlign = Qt::AlignTop | Qt::AlignRight;
+	const QPoint _menuPosition;
 	const Fn<void(bool)> _menuOverCallback;
 	base::unique_qptr<Ui::DropdownMenu> _menu;
+	rpl::variable<bool> _menuToggled;
 	bool _temporarilyHidden = false;
 	bool _overButton = false;
 
@@ -125,13 +127,20 @@ class OrderController final : public WithDropdownController {
 class SpeedController final : public WithDropdownController {
 public:
 	SpeedController(
-		not_null<SpeedButton*> button,
+		not_null<Ui::AbstractButton*> button,
+		const style::MediaSpeedButton &st,
 		not_null<QWidget*> menuParent,
 		Fn<void(bool)> menuOverCallback,
 		Fn<float64(bool lastNonDefault)> value,
-		Fn<void(float64)> change);
+		Fn<void(float64)> change,
+		std::vector<VideoQuality> qualities = {},
+		Fn<VideoQuality()> quality = nullptr,
+		Fn<void(VideoQuality)> changeQuality = nullptr);
 
 	[[nodiscard]] rpl::producer<> saved() const;
+	[[nodiscard]] rpl::producer<float64> realtimeValue() const;
+	void reloadFromLookup();
+	void setQualities(std::vector<VideoQuality> qualities);
 
 private:
 	void fillMenu(not_null<Ui::DropdownMenu*> menu) override;
@@ -141,6 +150,7 @@ class SpeedController final : public WithDropdownController {
 	[[nodiscard]] float64 lastNonDefaultSpeed() const;
 	void toggleDefault();
 	void setSpeed(float64 newSpeed);
+	void setQuality(VideoQuality quality);
 	void save();
 
 	const style::MediaSpeedButton &_st;
@@ -151,6 +161,11 @@ class SpeedController final : public WithDropdownController {
 	rpl::event_stream<float64> _speedChanged;
 	rpl::event_stream<> _saved;
 
+	std::vector<VideoQuality> _qualities;
+	Fn<VideoQuality()> _lookupQuality;
+	Fn<void(VideoQuality)> _changeQuality;
+	rpl::variable<VideoQuality> _quality;
+
 };
 
 } // namespace Media::Player
diff --git a/Telegram/SourceFiles/media/player/media_player_float.cpp b/Telegram/SourceFiles/media/player/media_player_float.cpp
index 755eef4dcf8f76..2fa095e364c220 100644
--- a/Telegram/SourceFiles/media/player/media_player_float.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_float.cpp
@@ -110,21 +110,21 @@ Float::Float(
 	prepareShadow();
 
 	document->session().data().itemRepaintRequest(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		if (_item == item) {
 			repaintItem();
 		}
 	}, lifetime());
 
 	document->session().data().itemRemoved(
-	) | rpl::start_with_next([this](auto item) {
+	) | rpl::on_next([this](auto item) {
 		if (_item == item) {
 			detach();
 		}
 	}, lifetime());
 
 	document->session().account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		detach();
 	}, lifetime());
 
@@ -320,7 +320,7 @@ FloatController::FloatController(not_null<FloatDelegate*> delegate)
 	Media::Player::instance()->trackChanged(
 	) | rpl::filter([=](AudioMsgId::Type type) {
 		return (type == AudioMsgId::Type::Voice);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		checkCurrent();
 	}, _lifetime);
 
@@ -343,38 +343,38 @@ void FloatController::replaceDelegate(not_null<FloatDelegate*> delegate) {
 
 void FloatController::startDelegateHandling() {
 	_delegate->floatPlayerCheckVisibilityRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkVisibility();
 	}, _delegateLifetime);
 
 	_delegate->floatPlayerHideAllRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideAll();
 	}, _delegateLifetime);
 
 	_delegate->floatPlayerShowVisibleRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showVisible();
 	}, _delegateLifetime);
 
 	_delegate->floatPlayerRaiseAllRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		raiseAll();
 	}, _delegateLifetime);
 
 	_delegate->floatPlayerUpdatePositionsRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updatePositions();
 	}, _delegateLifetime);
 
 	_delegate->floatPlayerFilterWheelEventRequests(
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const FloatDelegate::FloatPlayerFilterWheelEventRequest &request) {
 		*request.result = filterWheelEvent(request.object, request.event);
 	}, _delegateLifetime);
 
 	_delegate->floatPlayerAreaUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkVisibility();
 	}, _delegateLifetime);
 }
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp
index 4dc687a2779b08..9cb6df004c57d3 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp
@@ -17,6 +17,7 @@ For license and copyright information please follow this link:
 #include "base/power_save_blocker.h"
 #include "media/audio/media_audio.h"
 #include "media/audio/media_audio_capture.h"
+#include "media/player/media_player_listen_tracker.h"
 #include "media/streaming/media_streaming_instance.h"
 #include "media/streaming/media_streaming_player.h"
 #include "media/view/media_view_playback_progress.h"
@@ -34,6 +35,7 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "main/main_account.h" // session->account().sessionChanges().
 #include "main/main_session_settings.h"
+#include "storage/storage_account.h"
 
 namespace Media {
 namespace Player {
@@ -50,7 +52,8 @@ constexpr auto kIdsPreloadAfter = 28;
 constexpr auto kShufflePlaylistLimit = 10'000;
 constexpr auto kRememberShuffledOrderItems = 16;
 
-constexpr auto kMinLengthForSavePosition = 20 * TimeId(60); // 20 minutes.
+constexpr auto kMinLengthForSavePositionVideo = TimeId(60); // 1 minute.
+constexpr auto kMinLengthForSavePositionMusic = 20 * TimeId(60); // 20.
 
 base::options::toggle OptionDisableAutoplayNext({
 	.id = kOptionDisableAutoplayNext,
@@ -59,6 +62,18 @@ base::options::toggle OptionDisableAutoplayNext({
 		"Audio file / Voice Message / Video message.",
 });
 
+[[nodiscard]] float64 LookupPlaybackSpeed(const AudioMsgId &audioId) {
+	if (!audioId.changeablePlaybackSpeed()) {
+		return 1.;
+	}
+	const auto document = audioId.audio();
+	return (document
+		&& !document->isVoiceMessage()
+		&& !document->isVideoMessage())
+		? Core::App().settings().audioPlaybackSpeed()
+		: Core::App().settings().voicePlaybackSpeed();
+}
+
 } // namespace
 
 const char kOptionDisableAutoplayNext[] = "disable-autoplay-next";
@@ -83,8 +98,10 @@ struct Instance::ShuffleData {
 	std::vector<UniversalMsgId> playedIds;
 	History *history = nullptr;
 	MsgId topicRootId = 0;
+	PeerId monoforumPeerId = 0;
 	History *migrated = nullptr;
 	bool scheduled = false;
+	bool savedMusic = false;
 	int indexInPlayedIds = 0;
 	bool allLoaded = false;
 	rpl::lifetime nextSliceLifetime;
@@ -108,18 +125,20 @@ void finish(not_null<Audio::Instance*> instance) {
 void SaveLastPlaybackPosition(
 		not_null<DocumentData*> document,
 		const TrackState &state) {
+	const auto limit = document->isVideoFile()
+		? kMinLengthForSavePositionVideo
+		: kMinLengthForSavePositionMusic;
 	const auto time = (state.position == kTimeUnknown
 		|| state.length == kTimeUnknown
 		|| state.state == State::PausedAtEnd
 		|| IsStopped(state.state))
 		? TimeId(0)
-		: (state.length >= kMinLengthForSavePosition * state.frequency)
+		: (state.length >= limit * state.frequency)
 		? (state.position / state.frequency) * crl::time(1000)
 		: TimeId(0);
 	auto &session = document->session();
-	if (session.settings().mediaLastPlaybackPosition(document->id) != time) {
-		session.settings().setMediaLastPlaybackPosition(document->id, time);
-		session.saveSettingsDelayed();
+	if (session.local().mediaLastPlaybackPosition(document->id) != time) {
+		session.local().setMediaLastPlaybackPosition(document->id, time);
 	}
 }
 
@@ -143,13 +162,13 @@ Instance::Instance()
 : _songData(AudioMsgId::Type::Song, SharedMediaType::MusicFile)
 , _voiceData(AudioMsgId::Type::Voice, SharedMediaType::RoundVoiceFile) {
 	Media::Player::Updated(
-	) | rpl::start_with_next([=](const AudioMsgId &audioId) {
+	) | rpl::on_next([=](const AudioMsgId &audioId) {
 		handleSongUpdate(audioId);
 	}, _lifetime);
 
 	repeatChanges(
 		&_songData
-	) | rpl::start_with_next([=](RepeatMode mode) {
+	) | rpl::on_next([=](RepeatMode mode) {
 		if (mode == RepeatMode::All) {
 			refreshPlaylist(&_songData);
 		}
@@ -157,7 +176,7 @@ Instance::Instance()
 
 	orderChanges(
 		&_songData
-	) | rpl::start_with_next([=](OrderMode mode) {
+	) | rpl::on_next([=](OrderMode mode) {
 		if (mode == OrderMode::Shuffle) {
 			validateShuffleData(&_songData);
 		} else {
@@ -170,7 +189,7 @@ Instance::Instance()
 		Core::App().calls().currentCallValue(),
 		Core::App().calls().currentGroupCallValue(),
 		_1 || _2
-	) | rpl::start_with_next([=](bool call) {
+	) | rpl::on_next([=](bool call) {
 		if (call) {
 			pauseOnCall(AudioMsgId::Type::Voice);
 			pauseOnCall(AudioMsgId::Type::Song);
@@ -181,9 +200,13 @@ Instance::Instance()
 	}, _lifetime);
 
 	setupShortcuts();
+
+	_listenTracker = std::make_unique<MusicListenTracker>();
 }
 
-Instance::~Instance() = default;
+Instance::~Instance() {
+	_listenTracker->finalize();
+}
 
 AudioMsgId::Type Instance::getActiveType() const {
 	if (const auto data = getData(AudioMsgId::Type::Voice)) {
@@ -243,6 +266,7 @@ void Instance::setHistory(
 	if (history) {
 		data->history = history->migrateToOrMe();
 		data->topicRootId = 0;
+		data->monoforumPeerId = 0;
 		data->migrated = data->history->migrateFrom();
 		setSession(data, &history->session());
 	} else {
@@ -261,7 +285,7 @@ void Instance::setSession(not_null<Data*> data, Main::Session *session) {
 	data->session = session;
 	if (session) {
 		session->account().sessionChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			setSession(data, nullptr);
 		}, data->sessionLifetime);
 
@@ -269,7 +293,7 @@ void Instance::setSession(not_null<Data*> data, Main::Session *session) {
 		) | rpl::filter([=](not_null<DocumentData*> document) {
 			// Before refactoring it was called only for audio files.
 			return document->isAudioFile();
-		}) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+		}) | rpl::on_next([=](not_null<DocumentData*> document) {
 			const auto type = AudioMsgId::Type::Song;
 			emitUpdate(type, [&](const AudioMsgId &audioId) {
 				return (audioId.audio() == document);
@@ -279,7 +303,7 @@ void Instance::setSession(not_null<Data*> data, Main::Session *session) {
 		session->data().itemRemoved(
 		) | rpl::filter([=](not_null<const HistoryItem*> item) {
 			return (data->current.contextId() == item->fullId());
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			stopAndClear(data);
 		}, data->sessionLifetime);
 	} else {
@@ -345,6 +369,7 @@ bool Instance::validPlaylist(not_null<const Data*> data) const {
 		const auto inSameDomain = [](const Key &a, const Key &b) {
 			return (a.peerId == b.peerId)
 				&& (a.topicRootId == b.topicRootId)
+				&& (a.monoforumPeerId == b.monoforumPeerId)
 				&& (a.migratedPeerId == b.migratedPeerId);
 		};
 		const auto countDistanceInData = [&](const Key &a, const Key &b) {
@@ -380,13 +405,15 @@ void Instance::validatePlaylist(not_null<Data*> data) {
 		const auto sharedMediaViewer = (key->topicRootId
 			== SparseIdsMergedSlice::kScheduledTopicId)
 			? SharedScheduledMediaViewer
+			: (key->topicRootId == SparseIdsMergedSlice::kSavedMusicTopicId)
+			? SavedMusicMediaViewer
 			: SharedMediaMergedViewer;
 		sharedMediaViewer(
 			&data->history->session(),
 			SharedMediaMergedKey(*key, data->overview),
 			kIdsLimit,
 			kIdsLimit
-		) | rpl::start_with_next([=](SparseIdsMergedSlice &&update) {
+		) | rpl::on_next([=](SparseIdsMergedSlice &&update) {
 			data->playlistSlice = std::move(update);
 			data->playlistSliceKey = key;
 			refreshOtherPlaylist(data);
@@ -406,7 +433,10 @@ auto Instance::playlistKey(not_null<const Data*> data) const
 		return {};
 	}
 	const auto item = data->history->owner().message(contextId);
-	if (!item || (!item->isRegular() && !item->isScheduled())) {
+	if (!item
+		|| (!item->isRegular()
+			&& !item->isScheduled()
+			&& !item->isSavedMusicItem())) {
 		return {};
 	}
 
@@ -417,7 +447,10 @@ auto Instance::playlistKey(not_null<const Data*> data) const
 		data->history->peer->id,
 		(item->isScheduled()
 			? SparseIdsMergedSlice::kScheduledTopicId
+			: item->isSavedMusicItem()
+			? SparseIdsMergedSlice::kSavedMusicTopicId
 			: data->topicRootId),
+		data->monoforumPeerId,
 		data->migrated ? data->migrated->peer->id : 0,
 		universalId);
 }
@@ -440,7 +473,7 @@ void Instance::validateOtherPlaylist(not_null<Data*> data) {
 			SharedMediaMergedKey(*key, data->overview),
 			kIdsLimit,
 			kIdsLimit
-		) | rpl::start_with_next([=](SparseIdsMergedSlice &&update) {
+		) | rpl::on_next([=](SparseIdsMergedSlice &&update) {
 			data->playlistOtherSlice = std::move(update);
 			playlistUpdated(data);
 		}, data->playlistOtherLifetime);
@@ -475,6 +508,7 @@ auto Instance::playlistOtherKey(not_null<const Data*> data) const
 	return SliceKey(
 		data->history->peer->id,
 		data->topicRootId,
+		data->monoforumPeerId,
 		data->migrated ? data->migrated->peer->id : 0,
 		(data->playlistSlice->skippedBefore() == 0
 			? ServerMaxMsgId - 1
@@ -823,7 +857,7 @@ void Instance::playStreamed(
 	data->streamed->instance.lockPlayer();
 
 	data->streamed->instance.player().updates(
-	) | rpl::start_with_next_error([=](Streaming::Update &&update) {
+	) | rpl::on_next_error([=](Streaming::Update &&update) {
 		handleStreamingUpdate(data, std::move(update));
 	}, [=](Streaming::Error &&error) {
 		handleStreamingError(data, std::move(error));
@@ -842,16 +876,14 @@ Streaming::PlaybackOptions Instance::streamingOptions(
 	result.mode = (document && document->isVideoMessage())
 		? Streaming::Mode::Both
 		: Streaming::Mode::Audio;
-	result.speed = audioId.changeablePlaybackSpeed()
-		? Core::App().settings().voicePlaybackSpeed()
-		: 1.;
+	result.speed = LookupPlaybackSpeed(audioId);
 	result.audioId = audioId;
 	if (position >= 0) {
 		result.position = position;
 	} else if (document) {
-		auto &settings = document->session().settings();
-		result.position = settings.mediaLastPlaybackPosition(document->id);
-		settings.setMediaLastPlaybackPosition(document->id, 0);
+		auto &local = document->session().local();
+		result.position = local.mediaLastPlaybackPosition(document->id);
+		local.setMediaLastPlaybackPosition(document->id, 0);
 	} else {
 		result.position = 0;
 	}
@@ -869,14 +901,20 @@ void Instance::pause(AudioMsgId::Type type) {
 	}
 }
 
-void Instance::stop(AudioMsgId::Type type) {
+void Instance::stop(AudioMsgId::Type type, bool asFinished) {
 	if (const auto data = getData(type)) {
 		if (data->streamed) {
 			clearStreamed(data);
 		}
+		if (type == AudioMsgId::Type::Song) {
+			_listenTracker->finalize();
+		}
 		data->resumeOnCallEnd = false;
 		_playerStopped.fire_copy({type});
 	}
+	if (asFinished) {
+		_tracksFinished.fire_copy(type);
+	}
 }
 
 void Instance::stopAndClear(not_null<Data*> data) {
@@ -896,13 +934,18 @@ void Instance::validateShuffleData(not_null<Data*> data) {
 	const auto key = playlistKey(data);
 	const auto scheduled = key
 		&& (key->topicRootId == SparseIdsMergedSlice::kScheduledTopicId);
+	const auto savedMusic = key
+		&& (key->topicRootId == SparseIdsMergedSlice::kSavedMusicTopicId);
 	if (raw->history != data->history
 		|| raw->topicRootId != data->topicRootId
+		|| raw->monoforumPeerId != data->monoforumPeerId
 		|| raw->migrated != data->migrated
-		|| raw->scheduled != scheduled) {
+		|| raw->scheduled != scheduled
+		|| raw->savedMusic != savedMusic) {
 		raw->history = data->history;
 		raw->migrated = data->migrated;
 		raw->scheduled = scheduled;
+		raw->savedMusic = savedMusic;
 		raw->nextSliceLifetime.destroy();
 		raw->allLoaded = false;
 		raw->playlist.clear();
@@ -949,18 +992,22 @@ void Instance::validateShuffleData(not_null<Data*> data) {
 	const auto last = raw->playlist.empty()
 		? MsgId(ServerMaxMsgId - 1)
 		: raw->playlist.back();
-	SharedMediaMergedViewer(
+	const auto sharedMediaViewer = raw->savedMusic
+		? SavedMusicMediaViewer
+		: SharedMediaMergedViewer;
+	sharedMediaViewer(
 		&raw->history->session(),
 		SharedMediaMergedKey(
 			SliceKey(
 				raw->history->peer->id,
 				raw->topicRootId,
+				raw->monoforumPeerId,
 				raw->migrated ? raw->migrated->peer->id : 0,
 				last),
 			data->overview),
 		kIdsLimit,
 		kIdsLimit
-	) | rpl::start_with_next([=](SparseIdsMergedSlice &&update) {
+	) | rpl::on_next([=](SparseIdsMergedSlice &&update) {
 		raw->nextSliceLifetime.destroy();
 
 		const auto size = update.size();
@@ -1000,7 +1047,7 @@ void Instance::setupShuffleData(not_null<Data*> data) {
 			: MsgId(0);
 	}) | rpl::filter(
 		rpl::mappers::_1 != MsgId(0)
-	) | rpl::start_with_next([=](MsgId id) {
+	) | rpl::on_next([=](MsgId id) {
 		const auto i = ranges::find(raw->playlist, id);
 		if (i != end(raw->playlist)) {
 			raw->playlist.erase(i);
@@ -1133,14 +1180,13 @@ void Instance::cancelSeeking(AudioMsgId::Type type) {
 	_seekingChanges.fire({ .seeking = Seeking::Cancel, .type = type });
 }
 
-void Instance::updateVoicePlaybackSpeed() {
+void Instance::updatePlaybackSpeed() {
 	if (const auto data = getData(getActiveType())) {
 		if (!data->current.changeablePlaybackSpeed()) {
 			return;
 		}
 		if (const auto streamed = data->streamed.get()) {
-			streamed->instance.setSpeed(
-				Core::App().settings().voicePlaybackSpeed());
+			streamed->instance.setSpeed(LookupPlaybackSpeed(data->current));
 		}
 	}
 }
@@ -1200,6 +1246,21 @@ Streaming::Instance *Instance::roundVideoStreamed(HistoryItem *item) const {
 	return nullptr;
 }
 
+Streaming::Instance *Instance::roundVideoPreview(
+		not_null<DocumentData*> document) const {
+	if (const auto data = getData(AudioMsgId::Type::Voice)) {
+		if (const auto streamed = data->streamed.get()) {
+			if (streamed->id.audio() == document) {
+				const auto player = &streamed->instance.player();
+				if (player->ready() && !player->videoSize().isEmpty()) {
+					return &streamed->instance;
+				}
+			}
+		}
+	}
+	return nullptr;
+}
+
 View::PlaybackProgress *Instance::roundVideoPlayback(
 		HistoryItem *item) const {
 	return roundVideoStreamed(item)
@@ -1221,6 +1282,18 @@ void Instance::emitUpdate(AudioMsgId::Type type, CheckCallback check) {
 			}
 		}
 		updatePowerSaveBlocker(data, state);
+		const auto activelyPlayingRound = (type == AudioMsgId::Type::Voice)
+			&& !IsPausedOrPausing(state.state)
+			&& !IsStoppedOrStopping(state.state)
+			&& data->current.audio()
+			&& data->current.audio()->isVideoMessage();
+		if (_roundPlaying != activelyPlayingRound) {
+			_roundPlaying = activelyPlayingRound;
+			Core::App().floatPlayerToggleGifsPaused(activelyPlayingRound);
+		}
+		if (type == AudioMsgId::Type::Song) {
+			_listenTracker->update(state);
+		}
 
 		auto finished = false;
 		_updatedNotifier.fire_copy({state});
@@ -1242,7 +1315,7 @@ void Instance::emitUpdate(AudioMsgId::Type type, CheckCallback check) {
 
 void Instance::setupShortcuts() {
 	Shortcuts::Requests(
-	) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(Command::MediaPlay) && request->handle([=] {
 			playPause();
@@ -1272,6 +1345,7 @@ void Instance::setupShortcuts() {
 }
 
 void Instance::stopAndClose() {
+	_listenTracker->finalize();
 	_closePlayerRequests.fire({});
 
 	stop(AudioMsgId::Type::Voice);
@@ -1285,28 +1359,27 @@ void Instance::handleStreamingUpdate(
 		Streaming::Update &&update) {
 	using namespace Streaming;
 
-	v::match(update.data, [&](Information &update) {
+	v::match(update.data, [&](const Information &update) {
 		if (!update.video.size.isEmpty()) {
 			data->streamed->progress.setValueChangedCallback([=](
 					float64,
 					float64) {
 				requestRoundVideoRepaint();
 			});
-			_roundPlaying = true;
-			Core::App().floatPlayerToggleGifsPaused(true);
 			requestRoundVideoResize();
 		}
 		emitUpdate(data->type);
-	}, [&](PreloadedVideo &update) {
+	}, [&](PreloadedVideo) {
 		//emitUpdate(data->type, [](AudioMsgId) { return true; });
-	}, [&](UpdateVideo &update) {
+	}, [&](UpdateVideo) {
 		emitUpdate(data->type);
-	}, [&](PreloadedAudio &update) {
+	}, [&](PreloadedAudio) {
 		//emitUpdate(data->type, [](AudioMsgId) { return true; });
-	}, [&](UpdateAudio &update) {
+	}, [&](UpdateAudio) {
 		emitUpdate(data->type);
-	}, [&](WaitingForData) {
-	}, [&](MutedByOther) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
 	}, [&](Finished) {
 		emitUpdate(data->type);
 		if (data->streamed && data->streamed->instance.player().finished()) {
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.h b/Telegram/SourceFiles/media/player/media_player_instance.h
index fce26855bd90da..1dc220ad6d86c6 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.h
+++ b/Telegram/SourceFiles/media/player/media_player_instance.h
@@ -51,6 +51,7 @@ namespace Player {
 extern const char kOptionDisableAutoplayNext[];
 
 class Instance;
+class MusicListenTracker;
 struct TrackState;
 
 void start(not_null<Audio::Instance*> instance);
@@ -72,7 +73,7 @@ class Instance final {
 
 	void play(AudioMsgId::Type type);
 	void pause(AudioMsgId::Type type);
-	void stop(AudioMsgId::Type type);
+	void stop(AudioMsgId::Type type, bool asFinished = false);
 	void playPause(AudioMsgId::Type type);
 	bool next(AudioMsgId::Type type);
 	bool previous(AudioMsgId::Type type);
@@ -109,6 +110,9 @@ class Instance final {
 	[[nodiscard]] View::PlaybackProgress *roundVideoPlayback(
 		HistoryItem *item) const;
 
+	[[nodiscard]] Streaming::Instance *roundVideoPreview(
+		not_null<DocumentData*> document) const;
+
 	[[nodiscard]] AudioMsgId current(AudioMsgId::Type type) const {
 		if (const auto data = getData(type)) {
 			return data->current;
@@ -126,7 +130,7 @@ class Instance final {
 	void finishSeeking(AudioMsgId::Type type, float64 progress);
 	void cancelSeeking(AudioMsgId::Type type);
 
-	void updateVoicePlaybackSpeed();
+	void updatePlaybackSpeed();
 
 	[[nodiscard]] bool nextAvailable(AudioMsgId::Type type) const;
 	[[nodiscard]] bool previousAvailable(AudioMsgId::Type type) const;
@@ -191,6 +195,7 @@ class Instance final {
 		rpl::event_stream<> playlistChanges;
 		History *history = nullptr;
 		MsgId topicRootId = 0;
+		PeerId monoforumPeerId = 0;
 		History *migrated = nullptr;
 		Main::Session *session = nullptr;
 		bool isPlaying = false;
@@ -299,6 +304,7 @@ class Instance final {
 
 	Data _songData;
 	Data _voiceData;
+	std::unique_ptr<MusicListenTracker> _listenTracker;
 	bool _roundPlaying = false;
 
 	rpl::event_stream<Switch> _switchToNext;
diff --git a/Telegram/SourceFiles/media/player/media_player_listen_tracker.cpp b/Telegram/SourceFiles/media/player/media_player_listen_tracker.cpp
new file mode 100644
index 00000000000000..6ca1718a0c10c8
--- /dev/null
+++ b/Telegram/SourceFiles/media/player/media_player_listen_tracker.cpp
@@ -0,0 +1,102 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/player/media_player_listen_tracker.h"
+
+#include "apiwrap.h"
+#include "data/data_document.h"
+#include "data/data_file_origin.h"
+#include "main/main_session.h"
+#include "media/audio/media_audio.h"
+
+namespace Media::Player {
+namespace {
+
+constexpr auto kReportDurationSecondsMin = TimeId(3);
+
+} // namespace
+
+MusicListenTracker::MusicListenTracker()
+: _pauseTimer([=] { pauseTimedOut(); }) {
+}
+
+void MusicListenTracker::update(const TrackState &state) {
+	const auto document = state.id.audio();
+	if (!document || !document->isSong()) {
+		finalize();
+		return;
+	} else if (_document != document) {
+		finalize();
+		_document = document;
+		_contextId = state.id.contextId();
+		_listenedMs = 0;
+		_playing = false;
+		_pauseTimer.cancel();
+	}
+	const auto stopped = IsStopped(state.state);
+	const auto playing = !stopped && !IsPausedOrPausing(state.state);
+	if (_playing == playing) {
+		return;
+	} else if (!_playing) {
+		_playing = true;
+		_playStartedAt = crl::now();
+		_pauseTimer.cancel();
+	} else {
+		_playing = false;
+		_listenedMs += crl::now() - _playStartedAt;
+		if (stopped) {
+			report();
+		} else {
+			_pauseTimer.callOnce(60 * crl::time(1000));
+		}
+	}
+}
+
+void MusicListenTracker::finalize() {
+	if (base::take(_playing)) {
+		_listenedMs += crl::now() - _playStartedAt;
+	}
+	_pauseTimer.cancel();
+	report();
+}
+
+void MusicListenTracker::report() {
+	const auto document = base::take(_document);
+	const auto contextId = base::take(_contextId);
+	const auto duration = static_cast<int>(base::take(_listenedMs) / 1000);
+	if (!document || duration < kReportDurationSecondsMin) {
+		return;
+	}
+
+	const auto origin = Data::FileOrigin(
+		Data::FileOriginMessage(contextId));
+	const auto send = [=](auto resend) -> void {
+		const auto usedFileReference = document->fileReference();
+		document->session().api().request(MTPmessages_ReportMusicListen(
+			document->mtpInput(),
+			MTP_int(duration)
+		)).fail([=](const MTP::Error &error) {
+			if (error.code() == 400
+				&& error.type().startsWith(u"FILE_REFERENCE_"_q)) {
+				document->session().api().refreshFileReference(
+					origin,
+					[=](const auto &) {
+						if (document->fileReference() != usedFileReference) {
+							resend(resend);
+						}
+					});
+			}
+		}).send();
+	};
+	send(send);
+}
+
+void MusicListenTracker::pauseTimedOut() {
+	report();
+}
+
+} // namespace Media::Player
diff --git a/Telegram/SourceFiles/media/player/media_player_listen_tracker.h b/Telegram/SourceFiles/media/player/media_player_listen_tracker.h
new file mode 100644
index 00000000000000..5ffc1d4eab3990
--- /dev/null
+++ b/Telegram/SourceFiles/media/player/media_player_listen_tracker.h
@@ -0,0 +1,40 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+
+#include <crl/crl_time.h>
+
+class DocumentData;
+
+namespace Media::Player {
+
+struct TrackState;
+
+class MusicListenTracker final {
+public:
+	MusicListenTracker();
+
+	void update(const TrackState &state);
+	void finalize();
+
+private:
+	void report();
+	void pauseTimedOut();
+
+	DocumentData *_document = nullptr;
+	FullMsgId _contextId;
+	crl::time _listenedMs = 0;
+	crl::time _playStartedAt = 0;
+	bool _playing = false;
+	base::Timer _pauseTimer;
+
+};
+
+} // namespace Media::Player
diff --git a/Telegram/SourceFiles/media/player/media_player_panel.cpp b/Telegram/SourceFiles/media/player/media_player_panel.cpp
index 2b7ab6d82345d7..8a257d899e2c8c 100644
--- a/Telegram/SourceFiles/media/player/media_player_panel.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_panel.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "media/player/media_player_instance.h"
 #include "info/media/info_media_list_widget.h"
+#include "info/saved/info_saved_music_widget.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "data/data_session.h"
@@ -99,7 +100,7 @@ void Panel::updateControlsGeometry() {
 	if (scrollHeight > 0) {
 		_scroll->setGeometryToRight(contentRight(), scrollTop, width, scrollHeight);
 	}
-	if (const auto widget = static_cast<TWidget*>(_scroll->widget())) {
+	if (const auto widget = static_cast<RpWidget*>(_scroll->widget())) {
 		widget->resizeToWidth(width);
 	}
 }
@@ -157,7 +158,7 @@ void Panel::paintEvent(QPaintEvent *e) {
 		| RectPart::Bottom
 		| (rtl() ? RectPart::Left : RectPart::Right)
 		| RectPart::Top;
-	Ui::Shadow::paint(p, shadowedRect, width(), st::defaultRoundShadow, shadowedSides);
+	Ui::Shadow::paint(p, shadowedRect, width(), st::roundShadowRadius8px, shadowedSides);
 	Ui::FillRoundRect(p, shadowedRect, st::menuBg, Ui::MenuCorners);
 }
 
@@ -209,7 +210,7 @@ void Panel::ensureCreated() {
 
 	_refreshListLifetime = instance()->playlistChanges(
 		AudioMsgId::Type::Song
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshList();
 	});
 	refreshList();
@@ -217,7 +218,7 @@ void Panel::ensureCreated() {
 	macWindowDeactivateEvents(
 	) | rpl::filter([=] {
 		return !isHidden();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		leaveEvent(nullptr);
 	}, _refreshListLifetime);
 
@@ -227,6 +228,7 @@ void Panel::ensureCreated() {
 void Panel::refreshList() {
 	const auto current = instance()->current(AudioMsgId::Type::Song);
 	const auto contextId = current.contextId();
+	auto savedMusicItem = false;
 	const auto peer = [&]() -> PeerData* {
 		if (const auto document = current.audio()) {
 			if (&document->session() != &session()) {
@@ -241,9 +243,12 @@ void Panel::refreshList() {
 		const auto document = media ? media->document() : nullptr;
 		if (!document
 			|| !document->isSharedMediaMusic()
-			|| (!item->isRegular() && !item->isScheduled())) {
+			|| (!item->isRegular()
+				&& !item->isScheduled()
+				&& !item->isSavedMusicItem())) {
 			return nullptr;
 		}
+		savedMusicItem = item->isSavedMusicItem();
 		const auto result = item->history()->peer;
 		if (const auto migrated = result->migrateTo()) {
 			return migrated;
@@ -251,13 +256,19 @@ void Panel::refreshList() {
 		return result;
 	}();
 	const auto migrated = peer ? peer->migrateFrom() : nullptr;
-	if (_listPeer != peer || _listMigratedPeer != migrated) {
+	const auto listPeer = savedMusicItem ? nullptr : peer;
+	const auto listMusicPeer = savedMusicItem ? peer : nullptr;
+	const auto listMigratedPeer = savedMusicItem ? nullptr : migrated;
+	if (_listPeer != listPeer
+		|| _listMusicPeer != listMusicPeer
+		|| _listMigratedPeer != listMigratedPeer) {
 		_scroll->takeWidget<QWidget>().destroy();
-		_listPeer = _listMigratedPeer = nullptr;
+		_listPeer = _listMusicPeer = _listMigratedPeer = nullptr;
 	}
-	if (peer && !_listPeer) {
-		_listPeer = peer;
-		_listMigratedPeer = migrated;
+	if ((listPeer && !_listPeer) || (listMusicPeer && !_listMusicPeer)) {
+		_listPeer = listPeer;
+		_listMusicPeer = listMusicPeer;
+		_listMigratedPeer = listMigratedPeer;
 		auto list = object_ptr<ListWidget>(this, infoController());
 
 		const auto weak = _scroll->setOwnedWidget(std::move(list));
@@ -266,19 +277,19 @@ void Panel::refreshList() {
 		updateControlsGeometry();
 
 		weak->checkForHide(
-		) | rpl::start_with_next([this] {
+		) | rpl::on_next([this] {
 			if (!rect().contains(mapFromGlobal(QCursor::pos()))) {
 				_hideTimer.callOnce(kDelayedHideTimeout);
 			}
 		}, weak->lifetime());
 
 		weak->heightValue(
-		) | rpl::start_with_next([this](int newHeight) {
+		) | rpl::on_next([this](int newHeight) {
 			listHeightUpdated(newHeight);
 		}, weak->lifetime());
 
 		weak->scrollToRequests(
-		) | rpl::start_with_next([this](int newScrollTop) {
+		) | rpl::on_next([this](int newScrollTop) {
 			_scroll->scrollToY(newScrollTop);
 		}, weak->lifetime());
 
@@ -287,15 +298,19 @@ void Panel::refreshList() {
 		rpl::combine(
 			_scroll->scrollTopValue(),
 			_scroll->heightValue()
-		) | rpl::start_with_next([=](int top, int height) {
+		) | rpl::on_next([=](int top, int height) {
 			const auto bottom = top + height;
 			weak->setVisibleTopBottom(top, bottom);
 		}, weak->lifetime());
 
-		auto memento = Info::Media::Memento(
+		auto musicMemento = Info::Saved::MusicMemento(peer);
+		auto mediaMemento = Info::Media::Memento(
 			peer,
 			migratedPeerId(),
-			section().mediaType());
+			(listMusicPeer
+				? Storage::SharedMediaType::MusicFile
+				: section().mediaType()));
+		auto &memento = listMusicPeer ? musicMemento.media() : mediaMemento;
 		memento.setAroundId(contextId);
 		memento.setIdsLimit(kPlaylistIdsLimit);
 		memento.setScrollTopItem({ contextId, peer->session().uniqueId() });
@@ -308,12 +323,14 @@ void Panel::performDestroy() {
 	if (!_scroll->widget()) return;
 
 	_scroll->takeWidget<QWidget>().destroy();
-	_listPeer = _listMigratedPeer = nullptr;
+	_listPeer = _listMusicPeer = _listMigratedPeer = nullptr;
 	_refreshListLifetime.destroy();
 }
 
 Info::Key Panel::key() const {
-	return Info::Key(_listPeer);
+	return _listMusicPeer
+		? Info::Key(Info::Saved::MusicTag{ _listMusicPeer })
+		: Info::Key(_listPeer);
 }
 
 PeerData *Panel::migrated() const {
@@ -321,7 +338,9 @@ PeerData *Panel::migrated() const {
 }
 
 Info::Section Panel::section() const {
-	return Info::Section(Info::Section::MediaType::MusicFile);
+	return _listMusicPeer
+		? Info::Section(Info::Section::Type::SavedMusic)
+		: Info::Section(Info::Section::MediaType::MusicFile);
 }
 
 void Panel::startShow() {
diff --git a/Telegram/SourceFiles/media/player/media_player_panel.h b/Telegram/SourceFiles/media/player/media_player_panel.h
index 9123834cee210f..c46b499c3a0b35 100644
--- a/Telegram/SourceFiles/media/player/media_player_panel.h
+++ b/Telegram/SourceFiles/media/player/media_player_panel.h
@@ -101,6 +101,7 @@ class Panel : public Ui::RpWidget, private Info::AbstractController {
 
 	rpl::lifetime _refreshListLifetime;
 	PeerData *_listPeer = nullptr;
+	PeerData *_listMusicPeer = nullptr;
 	PeerData *_listMigratedPeer = nullptr;
 
 };
diff --git a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
index c8e4af7967272d..a2dc29e8192ccb 100644
--- a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
@@ -43,7 +43,7 @@ VolumeController::VolumeController(
 		Core::App().saveSettingsDelayed();
 	});
 	Core::App().settings().songVolumeChanges(
-	) | rpl::start_with_next([=](float64 volume) {
+	) | rpl::on_next([=](float64 volume) {
 		if (!_slider->isChanging()) {
 			_slider->setValue(volume);
 		}
@@ -93,7 +93,7 @@ void PrepareVolumeDropdown(
 	volume->setIsVertical(true);
 
 	dropdown->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto rect = QRect(QPoint(), size);
 		const auto inner = rect.marginsRemoved(dropdown->getMargin());
 		volume->setGeometry(
@@ -108,7 +108,7 @@ void PrepareVolumeDropdown(
 
 	std::move(
 		outerWheelEvents
-	) | rpl::start_with_next([=](not_null<QWheelEvent*> e) {
+	) | rpl::on_next([=](not_null<QWheelEvent*> e) {
 		volume->outerWheelEvent(e);
 	}, volume->lifetime());
 }
diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp
index f45bda81a738d1..c7036665ab1053 100644
--- a/Telegram/SourceFiles/media/player/media_player_widget.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp
@@ -73,16 +73,32 @@ Widget::Widget(
 , _speedController(
 	std::make_unique<SpeedController>(
 		_speedToggle.data(),
+		_speedToggle->st(),
 		dropdownsParent,
 		[=](bool over) { markOver(over); },
 		[=](bool lastNonDefault) { return speedLookup(lastNonDefault); },
 		[=](float64 speed) { saveSpeed(speed); })) {
+	_speedController->realtimeValue(
+	) | rpl::on_next([=](float64 speed) {
+		_speedToggle->setSpeed(speed);
+		_speedToggle->setAccessibleName(tr::lng_mediaview_playback_speed(
+			tr::now,
+			lt_speed,
+			QString::number(base::SafeRound(speed * 10) / 10.) + "x"));
+	}, _speedToggle->lifetime());
+	_speedToggle->finishAnimating();
+
 	setAttribute(Qt::WA_OpaquePaintEvent);
 	setMouseTracking(true);
 	resize(width(), st::mediaPlayerHeight + st::lineWidth);
 
 	setupRightControls();
 
+	_volumeToggle->setAccessibleName(tr::lng_ringtones_box_volume(tr::now));
+	_repeatToggle->setAccessibleName(tr::lng_schedule_repeat_label(tr::now));
+	_orderToggle->setAccessibleName(tr::lng_sr_playback_order(tr::now));
+	_close->setAccessibleName(tr::lng_sr_player_close(tr::now));
+
 	_nameLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 	_timeLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 
@@ -120,12 +136,12 @@ Widget::Widget(
 		mixer()->setSongVolume(volume);
 	});
 	Core::App().settings().songVolumeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateVolumeToggleIcon();
 	}, lifetime());
 
 	Core::App().settings().playerRepeatModeValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateRepeatToggleIcon();
 	}, lifetime());
 
@@ -143,23 +159,33 @@ Widget::Widget(
 	});
 
 	_speedController->saved(
-	) | rpl::start_with_next([=] {
-		instance()->updateVoicePlaybackSpeed();
+	) | rpl::on_next([=] {
+		instance()->updatePlaybackSpeed();
+	}, lifetime());
+
+	rpl::merge(
+		Core::App().settings().voicePlaybackSpeedChanges() | rpl::to_empty,
+		Core::App().settings().audioPlaybackSpeedChanges() | rpl::to_empty
+	) | rpl::on_next([=] {
+		_speedController->reloadFromLookup();
 	}, lifetime());
 
 	instance()->trackChanged(
 	) | rpl::filter([=](AudioMsgId::Type type) {
 		return (type == _type);
-	}) | rpl::start_with_next([=](AudioMsgId::Type type) {
+	}) | rpl::on_next([=](AudioMsgId::Type type) {
 		handleSongChange();
 		updateControlsVisibility();
 		updateLabelsGeometry();
 	}, lifetime());
 
-	instance()->tracksFinished(
-	) | rpl::filter([=](AudioMsgId::Type type) {
-		return (type == AudioMsgId::Type::Voice);
-	}) | rpl::start_with_next([=](AudioMsgId::Type type) {
+	rpl::merge(
+		instance()->tracksFinished(
+		) | rpl::filter([=](AudioMsgId::Type type) {
+			return (type == AudioMsgId::Type::Voice);
+		}) | rpl::to_empty,
+		instance()->stops(AudioMsgId::Type::Voice)
+	) | rpl::on_next([=] {
 		_voiceIsActive = false;
 		const auto currentSong = instance()->current(AudioMsgId::Type::Song);
 		const auto songState = instance()->getState(AudioMsgId::Type::Song);
@@ -169,7 +195,7 @@ Widget::Widget(
 	}, lifetime());
 
 	instance()->updatedNotifier(
-	) | rpl::start_with_next([=](const TrackState &state) {
+	) | rpl::on_next([=](const TrackState &state) {
 		handleSongUpdate(state);
 	}, lifetime());
 
@@ -181,7 +207,7 @@ Widget::Widget(
 	}));
 	_volumeToggle->installEventFilter(_volume.get());
 	_volume->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::Enter) {
 			markOver(true);
 		} else if (e->type() == QEvent::Leave) {
@@ -200,7 +226,7 @@ void Widget::hidePlaylistOn(not_null<Ui::RpWidget*> widget) {
 	widget->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return (e->type() == QEvent::Enter);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateOverLabelsState(false);
 	}, widget->lifetime());
 }
@@ -208,7 +234,7 @@ void Widget::hidePlaylistOn(not_null<Ui::RpWidget*> widget) {
 void Widget::setupRightControls() {
 	const auto raw = rightControls();
 	raw->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(raw);
 		const auto &icon = st::mediaPlayerControlsFade;
 		const auto fade = QRect(0, 0, icon.width(), raw->height());
@@ -382,7 +408,8 @@ void Widget::updateControlsWrapVisibility() {
 
 void Widget::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
-	auto fill = e->rect().intersected(QRect(0, 0, width(), st::mediaPlayerHeight));
+	auto fill = e->rect().intersected(
+		QRect(0, 0, width(), st::mediaPlayerHeight + st::lineWidth));
 	if (!fill.isEmpty()) {
 		p.fillRect(fill, st::mediaPlayerBg);
 	}
@@ -423,11 +450,19 @@ void Widget::saveOrder(OrderMode mode) {
 }
 
 float64 Widget::speedLookup(bool lastNonDefault) const {
-	return Core::App().settings().voicePlaybackSpeed(lastNonDefault);
+	const auto &settings = Core::App().settings();
+	return (_type == AudioMsgId::Type::Song)
+		? settings.audioPlaybackSpeed(lastNonDefault)
+		: settings.voicePlaybackSpeed(lastNonDefault);
 }
 
 void Widget::saveSpeed(float64 speed) {
-	Core::App().settings().setVoicePlaybackSpeed(speed);
+	auto &settings = Core::App().settings();
+	if (_type == AudioMsgId::Type::Song) {
+		settings.setAudioPlaybackSpeed(speed);
+	} else {
+		settings.setVoicePlaybackSpeed(speed);
+	}
 	Core::App().saveSettingsDelayed();
 }
 
@@ -593,7 +628,7 @@ void Widget::setType(AudioMsgId::Type type) {
 		updateOverLabelsState(_labelsOver);
 		_playlistChangesLifetime = instance()->playlistChanges(
 			_type
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			handlePlaylistUpdate();
 		});
 		// maybe the type change causes a change of the button layout
@@ -623,6 +658,9 @@ void Widget::handleSongUpdate(const TrackState &state) {
 		: showPause
 		? &st::mediaPlayerPauseIcon
 		: nullptr);
+	_playPause->setAccessibleName(showPause
+		? tr::lng_shortcuts_media_pause(tr::now)
+		: tr::lng_shortcuts_media_play(tr::now));
 
 	updateTimeText(state);
 }
@@ -635,7 +673,7 @@ void Widget::updateTimeText(const TrackState &state) {
 		display = state.position;
 	} else if (state.length) {
 		display = state.length;
-	} else if (const auto song = document->song()) {
+	} else if (document->song()) {
 		display = (document->duration() * frequency) / 1000;
 	}
 
@@ -680,46 +718,13 @@ void Widget::handleSongChange() {
 		return;
 	}
 	_lastSongId = current;
+	_speedController->reloadFromLookup();
 
 	auto textWithEntities = TextWithEntities();
 	if (document->isVoiceMessage() || document->isVideoMessage()) {
-		if (const auto item = document->owner().message(current.contextId())) {
-			const auto name = (!item->out() || item->isPost())
-				? item->fromOriginal()->name()
-				: tr::lng_from_you(tr::now);
-			const auto date = [item] {
-				const auto parsed = ItemDateTime(item);
-				const auto date = parsed.date();
-				const auto time = QLocale().toString(parsed.time(), QLocale::ShortFormat);
-				const auto today = QDateTime::currentDateTime().date();
-				if (date == today) {
-					return tr::lng_player_message_today(
-						tr::now,
-						lt_time,
-						time);
-				} else if (date.addDays(1) == today) {
-					return tr::lng_player_message_yesterday(
-						tr::now,
-						lt_time,
-						time);
-				}
-				return tr::lng_player_message_date(
-					tr::now,
-					lt_date,
-					langDayOfMonthFull(date),
-					lt_time,
-					time);
-			};
-
-			textWithEntities.text = name + ' ' + date();
-			textWithEntities.entities.append(EntityInText(
-				EntityType::Semibold,
-				0,
-				name.size(),
-				QString()));
-		} else {
-			textWithEntities.text = tr::lng_media_audio(tr::now);
-		}
+		textWithEntities = Ui::Text::FormatVoiceName(
+			document,
+			current.contextId()).textWithEntities(true);
 	} else {
 		textWithEntities = Ui::Text::FormatSongNameFor(document)
 			.textWithEntities(true);
@@ -752,11 +757,13 @@ void Widget::createPrevNextButtons() {
 		_previousTrack->setClickedCallback([=]() {
 			instance()->previous(_type);
 		});
+		_previousTrack->setAccessibleName(tr::lng_shortcuts_media_previous(tr::now));
 		_nextTrack.create(this, st::mediaPlayerNextButton);
 		_nextTrack->show();
 		_nextTrack->setClickedCallback([=]() {
 			instance()->next(_type);
 		});
+		_nextTrack->setAccessibleName(tr::lng_shortcuts_media_next(tr::now));
 		hidePlaylistOn(_previousTrack);
 		hidePlaylistOn(_nextTrack);
 		updatePlayPrevNextPositions();
diff --git a/Telegram/SourceFiles/media/stories/media_stories.style b/Telegram/SourceFiles/media/stories/media_stories.style
new file mode 100644
index 00000000000000..02513f4dfc6e1f
--- /dev/null
+++ b/Telegram/SourceFiles/media/stories/media_stories.style
@@ -0,0 +1,80 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+using "ui/basic.style";
+using "ui/widgets/widgets.style";
+using "boxes/boxes.style";
+
+StealthBoxStyle {
+	box: Box;
+	buttonLabel: FlatLabel;
+	lockIcon: icon;
+	boxClose: IconButton;
+	about: FlatLabel;
+	featureTitle: FlatLabel;
+	featureAbout: FlatLabel;
+	featurePastIcon: icon;
+	featureNextIcon: icon;
+	logoIcon: icon;
+	logoBg: color;
+}
+
+storiesStealthStyleDefault: StealthBoxStyle {
+	box: Box(defaultBox) {
+		buttonPadding: margins(10px, 10px, 10px, 10px);
+		buttonHeight: 42px;
+		button: RoundButton(defaultActiveButton) {
+			height: 42px;
+			textTop: 12px;
+			style: semiboldTextStyle;
+		}
+		margin: margins(0px, 56px, 0px, 10px);
+		bg: windowBg;
+		title: FlatLabel(boxTitle) {
+			align: align(top);
+		}
+		titleAdditionalFg: windowSubTextFg;
+	}
+	buttonLabel: FlatLabel(defaultFlatLabel) {
+		textFg: activeButtonFg;
+		style: semiboldTextStyle;
+		align: align(top);
+		minWidth: 20px;
+		maxHeight: 20px;
+	}
+	lockIcon: icon {{ "dialogs/dialogs_lock_on", windowFgActive }};
+	boxClose: IconButton(defaultIconButton) {
+		width: boxTitleHeight;
+		height: boxTitleHeight;
+		icon: icon {{ "box_button_close", boxTitleCloseFg }};
+		iconOver: icon {{ "box_button_close", boxTitleCloseFgOver }};
+		rippleAreaPosition: point(4px, 4px);
+		rippleAreaSize: 40px;
+		ripple: RippleAnimation(defaultRippleAnimation) {
+			color: windowBgOver;
+		}
+	}
+	about: FlatLabel(defaultFlatLabel) {
+		textFg: windowSubTextFg;
+		align: align(top);
+		minWidth: 20px;
+	}
+	featureTitle: FlatLabel(defaultFlatLabel) {
+		textFg: windowBoldFg;
+		style: semiboldTextStyle;
+		minWidth: 10px;
+		maxHeight: 20px;
+	}
+	featureAbout: FlatLabel(defaultFlatLabel) {
+		textFg: windowSubTextFg;
+		minWidth: 20px;
+	}
+	featurePastIcon: icon {{ "stories/stealth_5m", windowActiveTextFg }};
+	featureNextIcon: icon {{ "stories/stealth_25m", windowActiveTextFg }};
+	logoIcon: icon {{ "stories/stealth_logo", windowFgActive }};
+	logoBg: windowBgActive;
+}
diff --git a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
index f3c4a112fa5a12..209ef7776671ba 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_caption_full_view.cpp
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 #include "chat_helpers/compose/compose_show.h"
 #include "media/stories/media_stories_controller.h"
 #include "media/stories/media_stories_view.h"
+#include "media/view/media_view_open_common.h"
 #include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/labels.h"
 #include "ui/click_handler.h"
@@ -30,14 +31,15 @@ CaptionFullView::CaptionFullView(not_null<Controller*> controller)
 		object_ptr<Ui::FlatLabel>(_scroll.get(), st::storiesCaptionFull),
 		st::mediaviewCaptionPadding + _controller->repostCaptionPadding())))
 , _text(_wrap->entity()) {
-	_text->setMarkedText(controller->captionText(), Core::MarkedTextContext{
+	using namespace Media::View;
+	const auto text = StripQuoteEntities(controller->captionText());
+	_text->setMarkedText(text, Core::TextContext({
 		.session = &controller->uiShow()->session(),
-		.customEmojiRepaint = [=] { _text->update(); },
-	});
+	}));
 
 	startAnimation();
 	_controller->layoutValue(
-	) | rpl::start_with_next([=](const Layout &layout) {
+	) | rpl::on_next([=](const Layout &layout) {
 		if (_outer != layout.content) {
 			const auto skip = layout.header.y()
 				+ layout.header.height()
@@ -109,7 +111,7 @@ CaptionFullView::CaptionFullView(not_null<Controller*> controller)
 		_scroll->movementValue()
 	) | rpl::filter([=] {
 		return !_closing;
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			Ui::ElasticScrollPosition position,
 			Ui::ElasticScrollMovement movement) {
 		const auto overscrollTop = std::max(-position.overscroll, 0);
@@ -133,7 +135,7 @@ CaptionFullView::CaptionFullView(not_null<Controller*> controller)
 		}
 	}, _scroll->lifetime());
 
-	_wrap->paintRequest() | rpl::start_with_next([=] {
+	_wrap->paintRequest() | rpl::on_next([=] {
 		if (_controller->repost()) {
 			auto p = Painter(_wrap.get());
 			_controller->drawRepostInfo(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 1405eaae5fca03..6dd7e1559ab3dc 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -13,18 +13,24 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "boxes/peers/prepare_short_info_box.h"
 #include "boxes/report_messages_box.h"
+#include "calls/group/calls_group_call.h"
+#include "calls/group/calls_group_messages.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
 #include "core/core_settings.h"
+#include "core/local_url_handlers.h"
 #include "core/update_checker.h"
 #include "data/data_changes.h"
 #include "data/data_document.h"
+#include "data/data_group_call.h"
 #include "data/data_file_origin.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
+#include "history/view/controls/compose_controls_common.h"
 #include "history/view/reactions/history_view_reactions_strip.h"
+#include "history/view/history_view_paid_reaction_toast.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "media/stories/media_stories_caption_full_view.h"
@@ -40,8 +46,12 @@ For license and copyright information please follow this link:
 #include "media/stories/media_stories_stealth.h"
 #include "media/stories/media_stories_view.h"
 #include "media/audio/media_audio.h"
+#include "info/stories/info_stories_common.h"
+#include "payments/payments_reaction_process.h"
+#include "settings/settings_credits_graphics.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/boxes/report_box_graphics.h"
+#include "ui/controls/send_button.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
@@ -236,13 +246,13 @@ void Controller::Unsupported::setup(not_null<PeerData*> peer) {
 
 	_bg = std::make_unique<Ui::RpWidget>(wrap);
 	_bg->show();
-	_bg->paintRequest() | rpl::start_with_next([=] {
+	_bg->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(_bg.get());
 		_bgRound.paint(p, _bg->rect());
 	}, _bg->lifetime());
 
 	_controller->layoutValue(
-	) | rpl::start_with_next([=](const Layout &layout) {
+	) | rpl::on_next([=](const Layout &layout) {
 		_bg->setGeometry(layout.content);
 	}, _bg->lifetime());
 
@@ -256,14 +266,13 @@ void Controller::Unsupported::setup(not_null<PeerData*> peer) {
 		wrap,
 		tr::lng_update_telegram(),
 		st::storiesUnsupportedUpdate);
-	_button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	_button->show();
 
 	rpl::combine(
 		_controller->layoutValue(),
 		_text->sizeValue(),
 		_button->sizeValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const Layout &layout,
 			QSize text,
 			QSize button) {
@@ -294,6 +303,13 @@ Controller::Controller(not_null<Delegate*> delegate)
 , _replyArea(std::make_unique<ReplyArea>(this))
 , _reactions(std::make_unique<Reactions>(this))
 , _recentViews(std::make_unique<RecentViews>(this))
+, _paidReactionToast(std::make_unique<PaidReactionToast>(
+	_wrap,
+	&delegate->storiesShow()->session().data(),
+	paidReactionToastTopValue(),
+	[=](not_null<Calls::GroupCall*> call) {
+		return _videoStreamCall.get() == call;
+	}))
 , _weatherInCelsius(ResolveWeatherInCelsius()){
 	initLayout();
 
@@ -304,7 +320,7 @@ Controller::Controller(not_null<Delegate*> delegate)
 		_reactions->activeValue(),
 		_1 || _2
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
 		_replyActive = active;
 		updateContentFaded();
 	}, _lifetime);
@@ -317,14 +333,14 @@ Controller::Controller(not_null<Delegate*> delegate)
 	}
 
 	_reactions->chosen(
-	) | rpl::start_with_next([=](Reactions::Chosen chosen) {
+	) | rpl::on_next([=](Reactions::Chosen chosen) {
 		if (reactionChosen(chosen.mode, chosen.reaction)) {
 			_reactions->animateAndProcess(std::move(chosen));
 		}
 	}, _lifetime);
 
 	_delegate->storiesLayerShown(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		if (_layerShown != shown) {
 			_layerShown = shown;
 			updatePlayingAllowed();
@@ -332,7 +348,7 @@ Controller::Controller(not_null<Delegate*> delegate)
 	}, _lifetime);
 
 	_header->tooltipShownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		if (_tooltipShown != shown) {
 			_tooltipShown = shown;
 			updatePlayingAllowed();
@@ -340,7 +356,7 @@ Controller::Controller(not_null<Delegate*> delegate)
 	}, _lifetime);
 
 	_wrap->windowActiveValue(
-	) | rpl::start_with_next([=](bool active) {
+	) | rpl::on_next([=](bool active) {
 		_windowActive = active;
 		updatePlayingAllowed();
 	}, _lifetime);
@@ -448,7 +464,7 @@ void Controller::initLayout() {
 				QSize(contentWidth, headerHeight));
 		}
 		layout.controlsWidth = std::max(
-			layout.content.width(),
+			layout.content.width() + st::storiesControlsExtend * 2,
 			st::storiesControlsMinWidth);
 		layout.controlsBottomPosition = QPoint(
 			(size.width() - layout.controlsWidth) / 2,
@@ -549,6 +565,9 @@ void Controller::rebuildActiveAreas(const Layout &layout) const {
 		area.radius = scale.width() * area.radiusOriginal / 100.;
 		if (const auto view = area.view.get()) {
 			view->setAreaGeometry(area.geometry, area.radius);
+			view->setContentRect(
+				layout.content,
+				st::storiesRadius);
 		}
 	}
 }
@@ -606,7 +625,8 @@ TextWithEntities Controller::captionText() const {
 }
 
 bool Controller::skipCaption() const {
-	return (_captionFullView != nullptr)
+	return _videoStream
+		|| (_captionFullView != nullptr)
 		|| (_captionText.empty() && !repost());
 }
 
@@ -656,6 +676,18 @@ bool Controller::reactionChosen(ReactionsMode mode, ChosenReaction chosen) {
 	return result;
 }
 
+rpl::producer<int> Controller::paidReactionToastTopValue() const {
+	return _layout.value(
+	) | rpl::map([](const std::optional<Layout> &layout) {
+		const auto base = !layout
+			? 0
+			: (layout->headerLayout == HeaderLayout::Normal)
+			? (layout->header.y() + layout->header.height())
+			: layout->content.y();
+		return base + st::storiesHeaderMargin.bottom();
+	});
+}
+
 void Controller::showFullCaption() {
 	if (_captionText.empty()) {
 		return;
@@ -701,44 +733,25 @@ void Controller::rebuildFromContext(
 	}, [&](StoriesContextPeer) {
 		source = stories.source(peerId);
 		hideSiblings();
-	}, [&](StoriesContextSaved) {
-		if (stories.savedCountKnown(peerId)) {
-			const auto &saved = stories.saved(peerId);
-			auto sorted = RespectingPinned(saved);
+	}, [&](StoriesContextAlbum album) {
+		const auto known = stories.albumIdsCountKnown(peerId, album.id);
+		if (known) {
+			const auto &ids = stories.albumIds(peerId, album.id);
+			auto sorted = RespectingPinned(ids);
 			const auto i = ranges::find(sorted, id);
 			const auto tillEnd = int(end(sorted) - i);
 			if (tillEnd > 0) {
 				_index = int(i - begin(sorted));
+				const auto total = stories.albumIdsCount(peerId, album.id);
 				list = StoriesList{
 					.peer = peer,
-					.ids = saved,
+					.ids = ids,
 					.sorted = std::move(sorted),
-					.total = stories.savedCount(peerId),
+					.total = total,
 				};
-				if (saved.list.size() < list->total
+				if (ids.list.size() < list->total
 					&& tillEnd < kPreloadStoriesCount) {
-					stories.savedLoadMore(peerId);
-				}
-			}
-		}
-		hideSiblings();
-	}, [&](StoriesContextArchive) {
-		if (stories.archiveCountKnown(peerId)) {
-			const auto &archive = stories.archive(peerId);
-			auto sorted = RespectingPinned(archive);
-			const auto i = ranges::find(sorted, id);
-			const auto tillEnd = int(end(sorted) - i);
-			if (tillEnd > 0) {
-				_index = int(i - begin(sorted));
-				list = StoriesList{
-					.peer = peer,
-					.ids = archive,
-					.sorted = std::move(sorted),
-					.total = stories.archiveCount(peerId),
-				};
-				if (archive.list.size() < list->total
-					&& tillEnd < kPreloadStoriesCount) {
-					stories.archiveLoadMore(peerId);
+					stories.albumIdsLoadMore(peerId, album.id);
 				}
 			}
 		}
@@ -808,6 +821,7 @@ void Controller::rebuildFromContext(
 	_slider->show({
 		.index = _sliderCount ? _sliderIndex : _index,
 		.total = _sliderCount ? _sliderCount : shownCount(),
+		.videoStream = videoStream(),
 	});
 }
 
@@ -845,29 +859,28 @@ void Controller::show(
 	_context = context;
 	_waitingForId = {};
 	_waitingForDelta = 0;
+	_videoStream = story->call();
+	if (!_videoStream) {
+		clearVideoStreamCall();
+	}
 
 	rebuildFromContext(peer, storyId);
 	_contextLifetime.destroy();
 	const auto subscribeToSource = [&] {
 		stories.sourceChanged() | rpl::filter(
 			rpl::mappers::_1 == storyId.peer
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			rebuildFromContext(peer, storyId);
 		}, _contextLifetime);
 	};
 	v::match(_context.data, [&](Data::StoriesContextSingle) {
 	}, [&](Data::StoriesContextPeer) {
 		subscribeToSource();
-	}, [&](Data::StoriesContextSaved) {
-		stories.savedChanged() | rpl::filter(
-			rpl::mappers::_1 == storyId.peer
-		) | rpl::start_with_next([=] {
-			rebuildFromContext(peer, storyId);
-			checkMoveByDelta();
-		}, _contextLifetime);
-	}, [&](Data::StoriesContextArchive) {
-		stories.archiveChanged(
-		) | rpl::start_with_next([=] {
+	}, [&](Data::StoriesContextAlbum album) {
+		const auto key = Data::StoryAlbumIdsKey{ storyId.peer, album.id };
+		stories.albumIdsChanged() | rpl::filter(
+			rpl::mappers::_1 == key
+		) | rpl::on_next([=] {
 			rebuildFromContext(peer, storyId);
 			checkMoveByDelta();
 		}, _contextLifetime);
@@ -911,16 +924,19 @@ void Controller::show(
 		.privacy = story->privacy(),
 		.edited = story->edited(),
 		.video = (document != nullptr),
+		.videoStream = videoStream(),
 		.silent = (document && document->isSilentVideo()),
-	});
+	}, _videoStream ? _videoStream->fullCountValue() : nullptr);
 	uiShow()->hideLayer(anim::type::instant);
 	if (!changeShown(story)) {
 		return;
 	}
 
+	clearVideoStreamCall();
 	_replyArea->show({
 		.peer = unsupported ? nullptr : peer.get(),
 		.id = story->id(),
+		.videoStream = _videoStream,
 	}, _reactions->likedValue());
 
 	const auto wasLikeButton = QPointer(_recentViews->likeButton());
@@ -930,8 +946,10 @@ void Controller::show(
 		.forwards = story->forwards(),
 		.views = story->views(),
 		.total = story->interactions(),
-		.type = RecentViewsTypeFor(peer),
-		.canViewReactions = CanViewReactionsFor(peer) && !peer->isMegagroup(),
+		.type = RecentViewsTypeFor(peer, videoStream()),
+		.canViewReactions = (!_videoStream
+			&& CanViewReactionsFor(peer)
+			&& !peer->isMegagroup()),
 	}, _reactions->likedValue());
 	if (const auto nowLikeButton = _recentViews->likeButton()) {
 		if (wasLikeButton != nowLikeButton) {
@@ -1008,13 +1026,13 @@ void Controller::subscribeToSession() {
 	}
 	_session->changes().storyUpdates(
 		Data::StoryUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](Data::StoryUpdate update) {
+	) | rpl::on_next([=](Data::StoryUpdate update) {
 		if (update.story->fullId() == _shown) {
 			_delegate->storiesClose();
 		}
 	}, _sessionLifetime);
 	_session->data().stories().itemsChanged(
-	) | rpl::start_with_next([=](PeerId peerId) {
+	) | rpl::on_next([=](PeerId peerId) {
 		if (_waitingForId.peer == peerId) {
 			checkWaitingFor();
 		}
@@ -1025,7 +1043,7 @@ void Controller::subscribeToSession() {
 		| Data::StoryUpdate::Flag::Reaction
 	) | rpl::filter([=](const Data::StoryUpdate &update) {
 		return (update.story == this->story());
-	}) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
+	}) | rpl::on_next([=](const Data::StoryUpdate &update) {
 		if (update.flags & Data::StoryUpdate::Flag::Edited) {
 			show(update.story, _context);
 			_delegate->storiesRedisplay(update.story);
@@ -1037,8 +1055,10 @@ void Controller::subscribeToSession() {
 				.forwards = update.story->forwards(),
 				.views = update.story->views(),
 				.total = update.story->interactions(),
-				.type = RecentViewsTypeFor(peer),
-				.canViewReactions = CanViewReactionsFor(peer) && !peer->isMegagroup(),
+				.type = RecentViewsTypeFor(peer, videoStream()),
+				.canViewReactions = (!_videoStream
+					&& CanViewReactionsFor(peer)
+					&& !peer->isMegagroup()),
 			});
 			updateAreas(update.story);
 		}
@@ -1274,11 +1294,12 @@ ClickHandlerPtr Controller::lookupAreaHandler(QPoint point) const {
 				});
 			}
 		}
+		const auto weak = base::make_weak(this);
 		for (const auto &url : _urlAreas) {
 			_areas.push_back({
 				.original = url.area.geometry,
 				.rotation = url.area.rotation,
-				.handler = std::make_shared<HiddenUrlClickHandler>(url.url),
+				.handler = MakeUrlAreaHandler(weak, url.url),
 			});
 		}
 		for (const auto &weather : _weatherAreas) {
@@ -1598,10 +1619,8 @@ void Controller::loadMoreToList() {
 	const auto peer = shownPeer();
 	const auto peerId = _shown.peer;
 	auto &stories = peer->owner().stories();
-	v::match(_context.data, [&](StoriesContextSaved) {
-		stories.savedLoadMore(peerId);
-	}, [&](StoriesContextArchive) {
-		stories.archiveLoadMore(peerId);
+	v::match(_context.data, [&](StoriesContextAlbum album) {
+		stories.albumIdsLoadMore(peerId, album.id);
 	}, [](const auto &) {
 	});
 }
@@ -1717,6 +1736,67 @@ void Controller::unfocusReply() {
 	_wrap->setFocus();
 }
 
+rpl::producer<CommentsState> Controller::commentsStateValue() const {
+	return _commentsState.value();
+}
+
+void Controller::setCommentsShownToggles(rpl::producer<> toggles) {
+	auto fromButton = std::move(
+		toggles
+	) | rpl::map([=] {
+		if (_commentsState.current() != CommentsState::Shown) {
+			_commentsLastReadId = _commentsLastId;
+			if (_commentsHas.current() == CommentsHas::WithUnread) {
+				_commentsHas = CommentsHas::AllRead;
+			}
+		}
+		return (_commentsState.current() == CommentsState::Shown)
+			? CommentsState::Hidden
+			: CommentsState::Shown;
+	});
+	auto fromUnread = _commentsHas.value(
+	) | rpl::map([=](CommentsHas value) {
+		const auto now = _commentsState.current();
+		return (value == CommentsHas::None)
+			? CommentsState::Empty
+			: (value == CommentsHas::WithUnread)
+			? CommentsState::WithNew
+			: (now == CommentsState::Shown || now == CommentsState::Empty)
+			? CommentsState::Shown
+			: CommentsState::Hidden;
+	});
+	_commentsState = rpl::merge(
+		std::move(fromButton),
+		std::move(fromUnread),
+		_commentsStateShowFromPinned.events());
+}
+
+auto Controller::starsReactionsValue() const
+-> rpl::producer<Ui::SendStarButtonState> {
+	return rpl::combine(
+		_starsReactions.value(),
+		_starsReactionHighlighted.value()
+	) | rpl::map([=](int stars, bool highlighted) {
+		return Ui::SendStarButtonState{ stars, highlighted };
+	});
+}
+
+auto Controller::starsReactionsEffects() const
+-> rpl::producer<SendStarButtonEffect> {
+	return _starsReactionEffects.events();
+}
+
+void Controller::setStarsReactionIncrements(rpl::producer<int> increments) {
+	std::move(
+		increments
+	) | rpl::on_next([=](int count) {
+		if (const auto call = _videoStreamCall.get()) {
+			const auto show = _delegate->storiesShow();
+			Payments::TryAddingPaidReaction(call, count, show);
+		}
+	}, _videoStreamLifetime);
+}
+
 void Controller::shareRequested() {
 	const auto show = _delegate->storiesShow();
 	if (auto box = PrepareShareBox(show, _shown, true)) {
@@ -1760,7 +1840,10 @@ void Controller::toggleInProfileRequested(bool inProfile) {
 	if (!story || !story->peer()->isSelf()) {
 		return;
 	}
-	if (!inProfile && v::is<Data::StoriesContextSaved>(_context.data)) {
+	if (!inProfile
+		&& v::is<Data::StoriesContextAlbum>(_context.data)
+		&& (v::get<Data::StoriesContextAlbum>(_context.data).id
+			!= Data::kStoriesAlbumIdArchive)) {
 		moveFromShown();
 	}
 	story->owner().stories().toggleInProfileList(
@@ -1803,6 +1886,82 @@ auto Controller::attachReactionsToMenu(
 	return _reactions->attachToMenu(menu, desiredPosition);
 }
 
+void Controller::updateVideoStream(not_null<Calls::GroupCall*> videoStream) {
+	_videoStreamCall = videoStream;
+
+	using namespace Calls::Group;
+	videoStream->messages()->listValue(
+	) | rpl::on_next([=](const std::vector<Message> &messages) {
+		if (_commentsState.current() == CommentsState::Shown
+			|| _commentsState.current() == CommentsState::Empty) {
+			for (const auto &message : messages | ranges::views::reverse) {
+				if (message.id > 0) {
+					_commentsLastId = _commentsLastReadId = message.id;
+					break;
+				}
+			}
+			_commentsHas = messages.empty()
+				? CommentsHas::None
+				: CommentsHas::AllRead;
+			return;
+		}
+		auto has = false;
+		const auto from = videoStream->messagesFrom();
+		for (const auto &message : messages | ranges::views::reverse) {
+			if (message.peer != from) {
+				_commentsLastId = message.id;
+				if (message.id > _commentsLastReadId) {
+					has = true;
+				}
+				break;
+			}
+		}
+		_commentsHas = messages.empty()
+			? CommentsHas::None
+			: has
+			? CommentsHas::WithUnread
+			: CommentsHas::AllRead;
+	}, _videoStreamLifetime);
+
+	videoStream->messages()->hiddenShowRequested(
+	) | rpl::filter([=] {
+		return _commentsState.current() != CommentsState::Empty;
+	}) | rpl::map_to(
+		CommentsState::Shown
+	) | rpl::start_to_stream(
+		_commentsStateShowFromPinned,
+		_videoStreamLifetime);
+
+	_starsReactions = rpl::single(Calls::Group::StarsDonor()) | rpl::then(
+		videoStream->messages()->starsValueChanges()
+	) | rpl::map([=](const Calls::Group::StarsDonor &donor) {
+		if (const auto peer = donor.peer) {
+			_starsReactionEffects.fire({
+				.from = peer,
+				.stars = donor.stars,
+			});
+		}
+		return videoStream->messages()->starsLocalState().total;
+	});
+	_paidReactionToast->shownForCall(
+	) | rpl::on_next([=](Calls::GroupCall *call) {
+		_starsReactionHighlighted = (call == videoStream);
+	}, _videoStreamLifetime);
+
+	_replyArea->updateVideoStream(videoStream);
+}
+
+void Controller::clearVideoStreamCall() {
+	_videoStreamCall = nullptr;
+	_starsReactionHighlighted = false;
+	_starsReactions = 0;
+	_videoStreamLifetime.destroy();
+}
+
+bool Controller::videoStream() const {
+	return _videoStream != nullptr;
+}
+
 rpl::lifetime &Controller::lifetime() {
 	return _lifetime;
 }
@@ -1829,14 +1988,14 @@ Ui::Toast::Config PrepareToggleInProfileToast(
 					? tr::lng_stories_channel_save_done
 					: tr::lng_stories_save_done)(
 						tr::now,
-						Ui::Text::Bold)
+						tr::bold)
 				: (channel
 					? tr::lng_stories_channel_save_done_many
 					: tr::lng_stories_save_done_many)(
 						tr::now,
 						lt_count,
 						count,
-						Ui::Text::Bold)).append(
+						tr::bold)).append(
 							'\n').append((channel
 								? tr::lng_stories_channel_save_done_about
 								: tr::lng_stories_save_done_about)(tr::now))
@@ -1845,14 +2004,14 @@ Ui::Toast::Config PrepareToggleInProfileToast(
 					? tr::lng_stories_channel_archive_done
 					: tr::lng_stories_archive_done)(
 						tr::now,
-						Ui::Text::WithEntities)
+						tr::marked)
 				: (channel
 					? tr::lng_stories_channel_archive_done_many
 					: tr::lng_stories_archive_done_many)(
 						tr::now,
 						lt_count,
 						count,
-						Ui::Text::WithEntities))),
+						tr::marked))),
 		.st = &st::storiesActionToast,
 		.duration = (inProfile
 			? Data::Stories::kInProfileToastDuration
@@ -1886,6 +2045,10 @@ Ui::Toast::Config PrepareTogglePinToast(
 					tr::now,
 					lt_count,
 					count))) },
+		.iconLottie = pin
+			? u"toast/pin"_q
+			: u"toast/unpin"_q,
+		.iconLottieSize = st::toastLottieIconSize,
 		.st = &st::storiesActionToast,
 		.duration = (pin
 			? Data::Stories::kInProfileToastDuration
@@ -1921,6 +2084,7 @@ object_ptr<Ui::BoxContent> PrepareShortInfoBox(not_null<PeerData*> peer) {
 		peer,
 		open,
 		[] { return false; },
+		nullptr,
 		&st::storiesShortInfoBox);
 }
 
@@ -1939,4 +2103,37 @@ ClickHandlerPtr MakeChannelPostHandler(
 	}));
 }
 
+ClickHandlerPtr MakeUrlAreaHandler(
+		base::weak_ptr<Controller> weak,
+		const QString &url) {
+	class Handler final : public HiddenUrlClickHandler {
+	public:
+		Handler(const QString &url, base::weak_ptr<Controller> weak)
+		: HiddenUrlClickHandler(url), _weak(weak) {
+		}
+
+		void onClick(ClickContext context) const override {
+			const auto raw = url();
+			const auto strong = _weak.get();
+			const auto prefix = u"tg://nft?slug="_q;
+			if (raw.startsWith(prefix) && strong) {
+				const auto slug = raw.mid(
+					prefix.size()
+				).split('&').front().split('#').front();
+				Core::ResolveAndShowUniqueGift(
+					strong->uiShow(),
+					slug,
+					::Settings::DarkCreditsEntryBoxStyle());
+			} else {
+				HiddenUrlClickHandler::onClick(context);
+			}
+		}
+
+	private:
+		base::weak_ptr<Controller> _weak;
+
+	};
+	return std::make_shared<Handler>(url, weak);
+}
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.h b/Telegram/SourceFiles/media/stories/media_stories_controller.h
index 860908b96737d1..baf0d69c150ac5 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.h
@@ -19,6 +19,10 @@ namespace base {
 class PowerSaveBlocker;
 } // namespace base
 
+namespace Calls {
+class GroupCall;
+} // namespace Calls
+
 namespace ChatHelpers {
 class Show;
 struct FileChosen;
@@ -29,15 +33,25 @@ struct FileOrigin;
 class DocumentMedia;
 } // namespace Data
 
+namespace HistoryView::Controls {
+enum class ToggleCommentsState;
+struct SendStarButtonEffect;
+} // namespace HistoryView::Controls
+
 namespace HistoryView::Reactions {
 struct ChosenReaction;
 enum class AttachSelectorResult;
 } // namespace HistoryView::Reactions
 
+namespace HistoryView {
+class PaidReactionToast;
+} // namespace HistoryView
+
 namespace Ui {
 class RpWidget;
 class BoxContent;
 class PopupMenu;
+struct SendStarButtonState;
 } // namespace Ui
 
 namespace Ui::Toast {
@@ -71,6 +85,10 @@ enum class ReactionsMode;
 class StoryAreaView;
 struct RepostClickHandler;
 
+using CommentsState = HistoryView::Controls::ToggleCommentsState;
+using PaidReactionToast = HistoryView::PaidReactionToast;
+using SendStarButtonEffect = HistoryView::Controls::SendStarButtonEffect;
+
 enum class HeaderLayout {
 	Normal,
 	Outside,
@@ -121,6 +139,7 @@ class Controller final : public base::has_weak_ptr {
 	[[nodiscard]] bool closeByClickAt(QPoint position) const;
 	[[nodiscard]] Data::FileOrigin fileOrigin() const;
 	[[nodiscard]] TextWithEntities captionText() const;
+	[[nodiscard]] bool videoStream() const;
 	[[nodiscard]] bool skipCaption() const;
 	[[nodiscard]] bool repost() const;
 	void toggleLiked();
@@ -165,6 +184,14 @@ class Controller final : public base::has_weak_ptr {
 	[[nodiscard]] const Data::StoryViews &views(int limit, bool initial);
 	[[nodiscard]] rpl::producer<> moreViewsLoaded() const;
 
+	[[nodiscard]] rpl::producer<CommentsState> commentsStateValue() const;
+	void setCommentsShownToggles(rpl::producer<> toggles);
+	[[nodiscard]] auto starsReactionsValue() const
+		-> rpl::producer<Ui::SendStarButtonState>;
+	[[nodiscard]] auto starsReactionsEffects() const
+		-> rpl::producer<SendStarButtonEffect>;
+	void setStarsReactionIncrements(rpl::producer<int> increments);
+
 	void unfocusReply();
 	void shareRequested();
 	void deleteRequested();
@@ -182,6 +209,8 @@ class Controller final : public base::has_weak_ptr {
 		not_null<Ui::PopupMenu*> menu,
 		QPoint desiredPosition);
 
+	void updateVideoStream(not_null<Calls::GroupCall*> videoStream);
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
@@ -215,6 +244,11 @@ class Controller final : public base::has_weak_ptr {
 		ClickHandlerPtr handler;
 		std::unique_ptr<StoryAreaView> view;
 	};
+	enum class CommentsHas {
+		None,
+		AllRead,
+		WithUnread,
+	};
 
 	void initLayout();
 	bool changeShown(Data::Story *story);
@@ -263,6 +297,8 @@ class Controller final : public base::has_weak_ptr {
 	[[nodiscard]] int repostSkipTop() const;
 	void updateAreas(Data::Story *story);
 	bool reactionChosen(ReactionsMode mode, ChosenReaction chosen);
+	[[nodiscard]] rpl::producer<int> paidReactionToastTopValue() const;
+	void clearVideoStreamCall();
 
 	const not_null<Delegate*> _delegate;
 
@@ -279,6 +315,11 @@ class Controller final : public base::has_weak_ptr {
 	std::unique_ptr<CaptionFullView> _captionFullView;
 	std::unique_ptr<RepostView> _repostView;
 
+	std::shared_ptr<Data::GroupCall> _videoStream;
+	base::weak_ptr<Calls::GroupCall> _videoStreamCall;
+	std::unique_ptr<PaidReactionToast> _paidReactionToast;
+	rpl::lifetime _videoStreamLifetime;
+
 	Ui::Animations::Simple _contentFadeAnimation;
 	bool _contentFaded = false;
 
@@ -310,6 +351,15 @@ class Controller final : public base::has_weak_ptr {
 	mutable std::vector<ActiveArea> _areas;
 	mutable rpl::variable<bool> _weatherInCelsius;
 
+	rpl::variable<CommentsState> _commentsState;
+	rpl::event_stream<CommentsState> _commentsStateShowFromPinned;
+	rpl::variable<CommentsHas> _commentsHas;
+	MsgId _commentsLastReadId = 0;
+	MsgId _commentsLastId = 0;
+	rpl::variable<int> _starsReactions;
+	rpl::variable<bool> _starsReactionHighlighted;
+	rpl::event_stream<SendStarButtonEffect> _starsReactionEffects;
+
 	std::vector<CachedSource> _cachedSourcesList;
 	int _cachedSourceIndex = -1;
 	bool _showingUnreadSources = false;
@@ -349,5 +399,8 @@ void ReportRequested(
 [[nodiscard]] ClickHandlerPtr MakeChannelPostHandler(
 	not_null<Main::Session*> session,
 	FullMsgId item);
+[[nodiscard]] ClickHandlerPtr MakeUrlAreaHandler(
+	base::weak_ptr<Controller> weak,
+	const QString &url);
 
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 7277109c3f29ab..f1113de0ebda46 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -17,6 +17,8 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/layers/box_content.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "ui/text/custom_emoji_text_badge.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
@@ -27,6 +29,7 @@ For license and copyright information please follow this link:
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "ui/ui_utility.h"
+#include "styles/style_calls.h"
 #include "styles/style_media_view.h"
 
 #include <QtGui/QGuiApplication>
@@ -246,19 +249,23 @@ struct MadePrivacyBadge {
 	const auto index = data.fullIndex + 1;
 	const auto count = data.fullCount;
 	return count
-		? QString::fromUtf8(" \xE2\x80\xA2 %1/%2").arg(index).arg(count)
+		? QString::fromUtf8(" %3 %1/%2")
+			.arg(index)
+			.arg(count)
+			.arg(Ui::kQBullet)
 		: QString();
 }
 
 [[nodiscard]] Timestamp ComposeDetails(HeaderData data, TimeId now) {
 	auto result = ComposeTimestamp(data.date, now);
 	if (data.edited) {
-		result.text.append(
-			QString::fromUtf8(" \xE2\x80\xA2 ") + tr::lng_edited(tr::now));
+		result.text.append(' '
+			+ Ui::kQBullet
+			+ ' '
+			+ tr::lng_edited(tr::now));
 	}
 	if (data.fromPeer || !data.repostFrom.isEmpty()) {
-		result.text = QString::fromUtf8("\xE2\x80\xA2 ")
-			+ result.text;
+		result.text = Ui::kQBullet + ' ' + result.text;
 	}
 	return result;
 }
@@ -269,17 +276,14 @@ struct MadePrivacyBadge {
 			from,
 			st::storiesRepostUserpicPadding));
 	result.append(from->name());
-	return Ui::Text::Link(result);
+	return tr::link(result);
 }
 
 [[nodiscard]] TextWithEntities RepostNameValue(
 		not_null<Data::Session*> owner,
 		PeerData *peer,
 		QString name) {
-	auto result = Ui::Text::SingleCustomEmoji(
-		owner->customEmojiManager().registerInternalEmoji(
-			st::storiesRepostIcon,
-			st::storiesRepostIconPadding));
+	auto result = Ui::Text::IconEmoji(&st::storiesRepostIcon);
 	if (peer) {
 		result.append(Ui::Text::SingleCustomEmoji(
 			owner->customEmojiManager().peerUserpicEmojiData(
@@ -287,7 +291,7 @@ struct MadePrivacyBadge {
 				st::storiesRepostUserpicPadding)));
 	}
 	result.append(name);
-	return Ui::Text::Link(result);
+	return tr::link(result);
 }
 
 } // namespace
@@ -299,8 +303,9 @@ Header::Header(not_null<Controller*> controller)
 
 Header::~Header() = default;
 
-void Header::show(HeaderData data) {
+void Header::show(HeaderData data, rpl::producer<int> videoStreamViewers) {
 	if (_data == data) {
+		setVideoStreamViewers(std::move(videoStreamViewers));
 		return;
 	}
 	const auto peerChanged = !_data || (_data->peer != data.peer);
@@ -363,13 +368,13 @@ void Header::show(HeaderData data) {
 		rpl::combine(
 			_name->widthValue(),
 			raw->heightValue()
-		) | rpl::start_with_next(updateInfoGeometry, _name->lifetime());
+		) | rpl::on_next(updateInfoGeometry, _name->lifetime());
 
 		raw->show();
 		_widget = std::move(widget);
 
 		_controller->layoutValue(
-		) | rpl::start_with_next([=](const Layout &layout) {
+		) | rpl::on_next([=](const Layout &layout) {
 			raw->setGeometry(layout.header);
 			_contentGeometry = layout.content;
 			updateTooltipGeometry();
@@ -381,12 +386,12 @@ void Header::show(HeaderData data) {
 		std::move(timestamp.text),
 		st::storiesHeaderDate);
 	_date->setAttribute(Qt::WA_TransparentForMouseEvents);
-	_date->setOpacity(kDateOpacity);
 	_date->show();
 	_date->move(st::storiesHeaderDatePosition);
+	setVideoStreamViewers(std::move(videoStreamViewers));
 
 	_date->widthValue(
-	) | rpl::start_with_next(updateInfoGeometry, _date->lifetime());
+	) | rpl::on_next(updateInfoGeometry, _date->lifetime());
 
 	if (!data.fromPeer && data.repostFrom.isEmpty()) {
 		_repost = nullptr;
@@ -402,11 +407,8 @@ void Header::show(HeaderData data) {
 				data.repostFrom);
 		const auto prefix = data.fromPeer ? data.fromPeer : data.repostPeer;
 		_repost->setMarkedText(
-			(prefix ? Ui::Text::Link(prefixName) : prefixName),
-			Core::MarkedTextContext{
-				.session = &data.peer->session(),
-				.customEmojiRepaint = [=] { _repost->update(); },
-			});
+			(prefix ? tr::link(prefixName) : prefixName),
+			Core::TextContext({ .session = &data.peer->session() }));
 		if (prefix) {
 			_repost->setClickHandlerFilter([=](const auto &...) {
 				_controller->uiShow()->show(PrepareShortInfoBox(prefix));
@@ -415,7 +417,7 @@ void Header::show(HeaderData data) {
 		}
 		_repost->show();
 		_repost->widthValue(
-		) | rpl::start_with_next(updateInfoGeometry, _repost->lifetime());
+		) | rpl::on_next(updateInfoGeometry, _repost->lifetime());
 	}
 
 	auto counter = ComposeCounter(data);
@@ -450,26 +452,32 @@ void Header::show(HeaderData data) {
 				&& _privacyBadgeGeometry.contains(
 					static_cast<QMouseEvent*>(e.get())->pos());
 			return (_privacyBadgeOver != over);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			_privacyBadgeOver = !_privacyBadgeOver;
 			toggleTooltip(Tooltip::Privacy, _privacyBadgeOver);
 		}, _privacy->lifetime());
 	}
 
-	if (data.video) {
-		createPlayPause();
+	if (data.video || data.videoStream) {
+		if (data.video) {
+			createPlayPause();
+		}
 		createVolumeToggle();
 
-		_widget->widthValue() | rpl::start_with_next([=](int width) {
-			const auto playPause = st::storiesPlayButtonPosition;
-			_playPause->moveToRight(playPause.x(), playPause.y(), width);
+		_widget->widthValue() | rpl::on_next([=](int width) {
+			if (_playPause) {
+				const auto playPause = st::storiesPlayButtonPosition;
+				_playPause->moveToRight(playPause.x(), playPause.y(), width);
+			}
 			const auto volume = st::storiesVolumeButtonPosition;
 			_volumeToggle->moveToRight(volume.x(), volume.y(), width);
 			updateTooltipGeometry();
-		}, _playPause->lifetime());
+		}, _volumeToggle->lifetime());
 
-		_pauseState = _controller->pauseState();
-		applyPauseState();
+		if (data.video) {
+			_pauseState = _controller->pauseState();
+			applyPauseState();
+		}
 	} else {
 		_playPause = nullptr;
 		_volumeToggle = nullptr;
@@ -480,7 +488,7 @@ void Header::show(HeaderData data) {
 		_widget->widthValue(),
 		_counter ? _counter->widthValue() : rpl::single(0),
 		_dateUpdated.events_starting_with_copy(rpl::empty)
-	) | rpl::start_with_next([=](int outer, int counter, auto) {
+	) | rpl::on_next([=](int outer, int counter, auto) {
 		const auto right = _playPause
 			? _playPause->x()
 			: (outer - st::storiesHeaderMargin.right());
@@ -533,6 +541,37 @@ void Header::show(HeaderData data) {
 	}
 }
 
+void Header::setVideoStreamViewers(rpl::producer<int> viewers) {
+	_videoStreamViewersLifetime.destroy();
+	if (!_date) {
+		return;
+	} else if (!viewers) {
+		_date->setOpacity(kDateOpacity);
+		return;
+	}
+	_date->setOpacity(1.);
+	auto helper = Ui::Text::CustomEmojiHelper();
+	const auto badge = helper.paletteDependent(
+		Ui::Text::CustomEmojiTextBadge(
+			tr::lng_video_stream_live(tr::now).toUpper(),
+			st::groupCallMessageBadge,
+			st::groupCallMessageBadgeMargin));
+	const auto context = helper.context();
+	_videoStreamViewersLifetime = std::move(
+		viewers
+	) | rpl::on_next([=](int count) {
+		auto text = badge;
+		if (count) {
+			text.append(' ').append(tr::lng_group_call_rtmp_viewers(
+				tr::now,
+				lt_count_decimal,
+				count));
+		}
+		_date->setMarkedText(text, context);
+		_dateUpdated.fire({});
+	});
+}
+
 void Header::createPlayPause() {
 	struct PlayPauseState {
 		Ui::Animations::Simple overAnimation;
@@ -544,7 +583,7 @@ void Header::createPlayPause() {
 	const auto state = lifetime.make_state<PlayPauseState>();
 
 	_playPause->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::Enter || type == QEvent::Leave) {
 			const auto over = (e->type() == QEvent::Enter);
@@ -568,7 +607,7 @@ void Header::createPlayPause() {
 		}
 	}, lifetime);
 
-	_playPause->paintRequest() | rpl::start_with_next([=] {
+	_playPause->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(_playPause.get());
 		const auto paused = (_pauseState == PauseState::Paused)
 			|| (_pauseState == PauseState::InactivePaused);
@@ -602,7 +641,11 @@ void Header::createVolumeToggle() {
 		bool dropdownOver = false;
 	};
 	_volumeToggle = std::make_unique<Ui::RpWidget>(_widget.get());
-	auto &lifetime = _volumeToggle->lifetime();
+	_volume = std::make_unique<Ui::FadeWrap<Ui::RpWidget>>(
+		_widget->parentWidget(),
+		object_ptr<Ui::RpWidget>(_widget->parentWidget()));
+
+	auto &lifetime = _volume->lifetime();
 	const auto state = lifetime.make_state<VolumeState>();
 	state->silent = _data->silent;
 	state->hideTimer.setCallback([=] {
@@ -610,7 +653,7 @@ void Header::createVolumeToggle() {
 	});
 
 	_volumeToggle->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::Enter || type == QEvent::Leave) {
 			const auto over = (e->type() == QEvent::Enter);
@@ -628,7 +671,7 @@ void Header::createVolumeToggle() {
 		}
 	}, lifetime);
 
-	_volumeToggle->paintRequest() | rpl::start_with_next([=] {
+	_volumeToggle->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(_volumeToggle.get());
 		p.setOpacity(state->silent
 			? kControlOpacityDisabled
@@ -640,12 +683,9 @@ void Header::createVolumeToggle() {
 	}, lifetime);
 	updateVolumeIcon();
 
-	_volume = std::make_unique<Ui::FadeWrap<Ui::RpWidget>>(
-		_widget->parentWidget(),
-		object_ptr<Ui::RpWidget>(_widget->parentWidget()));
 	_volume->toggle(false, anim::type::instant);
 	_volume->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::Enter || type == QEvent::Leave) {
 			const auto over = (e->type() == QEvent::Enter);
@@ -666,7 +706,7 @@ void Header::createVolumeToggle() {
 		_widget->positionValue(),
 		_volumeToggle->positionValue(),
 		rpl::mappers::_1 + rpl::mappers::_2
-	) | rpl::start_with_next([=](QPoint position) {
+	) | rpl::on_next([=](QPoint position) {
 		_volume->move(position);
 	}, _volume->lifetime());
 
@@ -691,7 +731,7 @@ void Header::toggleTooltip(Tooltip type, bool show) {
 	}
 	const auto text = [&]() -> TextWithEntities {
 		using Privacy = Data::StoryPrivacy;
-		const auto boldName = Ui::Text::Bold(_data->peer->shortName());
+		const auto boldName = tr::bold(_data->peer->shortName());
 		const auto self = _data->peer->isSelf();
 		switch (type) {
 		case Tooltip::SilentVideo:
@@ -701,32 +741,32 @@ void Header::toggleTooltip(Tooltip type, bool show) {
 				return self
 					? tr::lng_stories_about_close_friends_my(
 						tr::now,
-						Ui::Text::RichLangValue)
+						tr::rich)
 					: tr::lng_stories_about_close_friends(
 						tr::now,
 						lt_user,
 						boldName,
-						Ui::Text::RichLangValue);
+						tr::rich);
 			case Privacy::Contacts:
 				return self
 					? tr::lng_stories_about_contacts_my(
 						tr::now,
-						Ui::Text::RichLangValue)
+						tr::rich)
 					: tr::lng_stories_about_contacts(
 						tr::now,
 						lt_user,
 						boldName,
-						Ui::Text::RichLangValue);
+						tr::rich);
 			case Privacy::SelectedContacts:
 				return self
 					? tr::lng_stories_about_selected_contacts_my(
 						tr::now,
-						Ui::Text::RichLangValue)
+						tr::rich)
 					: tr::lng_stories_about_selected_contacts(
 						tr::now,
 						lt_user,
 						boldName,
-						Ui::Text::RichLangValue);
+						tr::rich);
 			}
 		}
 		return {};
@@ -744,9 +784,9 @@ void Header::toggleTooltip(Tooltip type, bool show) {
 			st::storiesInfoTooltipLabel),
 		st::storiesInfoTooltip);
 	const auto tooltip = _tooltip.get();
-	const auto weak = QPointer<QWidget>(tooltip);
+	const auto weak = base::make_weak(tooltip);
 	const auto destroy = [=] {
-		delete weak.data();
+		delete weak.get();
 	};
 	tooltip->setAttribute(Qt::WA_TransparentForMouseEvents);
 	tooltip->setHiddenCallback(destroy);
@@ -815,7 +855,7 @@ void Header::rebuildVolumeControls(
 		dropdown.get(),
 		st::storiesVolumeButton);
 	_volumeIcon.value(
-	) | rpl::start_with_next([=](const style::icon *icon) {
+	) | rpl::on_next([=](const style::icon *icon) {
 		button->setIconOverride(icon, icon);
 	}, button->lifetime());
 
@@ -866,7 +906,7 @@ void Header::rebuildVolumeControls(
 	}
 
 	dropdown->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(dropdown);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto radius = button->width() / 2.;
@@ -922,7 +962,7 @@ rpl::producer<bool> Header::tooltipShownValue() const {
 }
 
 void Header::updateDateText() {
-	if (!_date || !_data || !_data->date) {
+	if (!_date || !_data || !_data->date || _videoStreamViewersLifetime) {
 		return;
 	}
 	auto timestamp = ComposeDetails(*_data, base::unixtime::now());
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.h b/Telegram/SourceFiles/media/stories/media_stories_header.h
index f02c4ff376d587..b6a4bb3b948c92 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.h
@@ -41,6 +41,7 @@ struct HeaderData {
 	Data::StoryPrivacy privacy = {};
 	bool edited = false;
 	bool video = false;
+	bool videoStream = false;
 	bool silent = false;
 
 	friend inline auto operator<=>(HeaderData, HeaderData) = default;
@@ -55,7 +56,7 @@ class Header final {
 	void updatePauseState();
 	void updateVolumeIcon();
 
-	void show(HeaderData data);
+	void show(HeaderData data, rpl::producer<int> videoStreamViewers);
 	void raise();
 
 	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
@@ -77,6 +78,7 @@ class Header final {
 		bool horizontal);
 	void toggleTooltip(Tooltip type, bool show);
 	void updateTooltipGeometry();
+	void setVideoStreamViewers(rpl::producer<int> viewers);
 
 	const not_null<Controller*> _controller;
 
@@ -105,6 +107,8 @@ class Header final {
 	bool _ignoreWindowMove = false;
 	bool _privacyBadgeOver = false;
 
+	rpl::lifetime _videoStreamViewersLifetime;
+
 };
 
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
index 2ac9d29f37bc61..9a1875cd255e01 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.cpp
@@ -74,6 +74,7 @@ class ReactionView final
 		const Data::SuggestedReaction &reaction);
 
 	void setAreaGeometry(QRect geometry, float64 radius) override;
+	void setContentRect(QRect rect, int radius) override;
 	void updateReactionsCount(int count) override;
 	void playEffect() override;
 	bool contains(QPoint point) override;
@@ -129,6 +130,7 @@ class ReactionView final
 	std::unique_ptr<Ui::ReactionFlyAnimation> _effect;
 	std::vector<Stopping> _effectStopping;
 	QRect _effectTarget;
+	QRect _contentRect;
 
 };
 
@@ -141,6 +143,7 @@ class WeatherView final : public Ui::RpWidget, public StoryAreaView {
 		rpl::producer<bool> weatherInCelsius);
 
 	void setAreaGeometry(QRect geometry, float64 radius) override;
+	void setContentRect(QRect rect, int radius) override;
 	void updateReactionsCount(int count) override;
 	void playEffect() override;
 	bool contains(QPoint point) override;
@@ -168,6 +171,7 @@ class WeatherView final : public Ui::RpWidget, public StoryAreaView {
 
 	std::shared_ptr<HistoryView::StickerPlayer> _sticker;
 	rpl::lifetime _lifetime;
+	QRect _contentRect;
 
 };
 
@@ -205,6 +209,18 @@ class WeatherView final : public Ui::RpWidget, public StoryAreaView {
 	return (luminance > 0.705) ? QColor(0, 0, 0) : QColor(255, 255, 255);
 }
 
+void ClipToContentRect(
+		QPainter &p,
+		QRect contentRect,
+		QRect widgetGeometry) {
+	if (contentRect.isEmpty()
+		|| contentRect.contains(widgetGeometry)) {
+		return;
+	}
+	p.setClipRect(QRectF(
+		contentRect.translated(-widgetGeometry.topLeft())));
+}
+
 ReactionView::ReactionView(
 	QWidget *parent,
 	not_null<Main::Session*> session,
@@ -221,7 +237,7 @@ ReactionView::ReactionView(
 	GenerateFakeItem(
 		delegate(),
 		session->data().history(PeerData::kServiceNotificationsId))) {
-	style::PaletteChanged() | rpl::start_with_next([=] {
+	style::PaletteChanged() | rpl::on_next([=] {
 		_background = QImage();
 	}, lifetime());
 
@@ -256,8 +272,8 @@ ReactionView::ReactionView(
 		- st::msgMargin.bottom();
 
 	session->data().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const Element*> element) {
-		if (element == view) {
+	) | rpl::on_next([=](Data::RequestViewRepaint data) {
+		if (data.view == view) {
 			update();
 		}
 	}, lifetime());
@@ -294,6 +310,10 @@ void ReactionView::setAreaGeometry(QRect geometry, float64 radius) {
 	updateEffectGeometry();
 }
 
+void ReactionView::setContentRect(QRect rect, int radius) {
+	_contentRect = rect;
+}
+
 void ReactionView::updateReactionsCount(int count) {
 	if (_data.count == count) {
 		return;
@@ -350,6 +370,9 @@ void ReactionView::playEffect() {
 }
 
 bool ReactionView::contains(QPoint point) {
+	if (!_contentRect.isEmpty() && !_contentRect.contains(point)) {
+		return false;
+	}
 	const auto circle = _apiGeometry;
 	const auto radius = std::min(circle.width(), circle.height()) / 2;
 	const auto delta = circle.center() - point;
@@ -374,7 +397,7 @@ void ReactionView::createEffectCanvas() {
 	const auto raw = _effectCanvas.get();
 	raw->setAttribute(Qt::WA_TransparentForMouseEvents);
 	raw->show();
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		if (!_effect || _effect->finished()) {
 			crl::on_main(_effectCanvas.get(), [=] {
 				_effect = nullptr;
@@ -386,6 +409,7 @@ void ReactionView::createEffectCanvas() {
 		const auto now = crl::now();
 		auto p = QPainter(raw);
 		auto hq = PainterHighQualityEnabler(p);
+		ClipToContentRect(p, _contentRect, raw->geometry());
 		_effectStopping.erase(ranges::remove_if(_effectStopping, [&](
 				const Stopping &stopping) {
 			if (!stopping.animation.animating()
@@ -428,7 +452,9 @@ void ReactionView::paintEvent(QPaintEvent *e) {
 	auto p = Painter(this);
 	if (!_size) {
 		return;
-	} else if (_background.size() != size() * style::DevicePixelRatio()) {
+	}
+	ClipToContentRect(p, _contentRect, geometry());
+	if (_background.size() != size() * style::DevicePixelRatio()) {
 		cacheBackground();
 	}
 	p.drawImage(0, 0, _background);
@@ -544,7 +570,7 @@ WeatherView::WeatherView(
 	setAttribute(Qt::WA_TransparentForMouseEvents);
 	show();
 
-	std::move(weatherInCelsius) | rpl::start_with_next([=](bool celsius) {
+	std::move(weatherInCelsius) | rpl::on_next([=](bool celsius) {
 		_celsius = celsius;
 		_background = {};
 		update();
@@ -565,7 +591,7 @@ void WeatherView::watchForSticker() {
 			return document != nullptr;
 		}) | rpl::take(
 			1
-		) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+		) | rpl::on_next([=](not_null<DocumentData*> document) {
 			setStickerFrom(document);
 			update();
 		}, lifetime());
@@ -576,9 +602,10 @@ void WeatherView::setAreaGeometry(QRect geometry, float64 radius) {
 	const auto diagxdiag = (geometry.width() * geometry.width())
 		+ (geometry.height() * geometry.height());
 	const auto diag = std::sqrt(diagxdiag);
+	const auto shift = diag * 2 / 3.;
 	const auto topleft = QRectF(geometry).center()
-		- QPointF(diag / 2., diag / 2.);
-	const auto bottomright = topleft + QPointF(diag, diag);
+		- QPointF(shift, shift);
+	const auto bottomright = topleft + QPointF(shift, shift) * 2;
 	const auto left = int(std::floor(topleft.x()));
 	const auto top = int(std::floor(topleft.y()));
 	const auto right = int(std::ceil(bottomright.x()));
@@ -593,6 +620,10 @@ void WeatherView::setAreaGeometry(QRect geometry, float64 radius) {
 	_background = {};
 }
 
+void WeatherView::setContentRect(QRect rect, int radius) {
+	_contentRect = rect;
+}
+
 void WeatherView::updateReactionsCount(int count) {
 	Unexpected("WeatherView::updateRactionsCount.");
 }
@@ -602,6 +633,9 @@ void WeatherView::playEffect() {
 }
 
 bool WeatherView::contains(QPoint point) {
+	if (!_contentRect.isEmpty() && !_contentRect.contains(point)) {
+		return false;
+	}
 	const auto geometry = _rect.translated(pos()).toRect();
 	const auto angle = -_data.area.rotation;
 	return geometry.contains(Rotated(point, geometry.center(), angle));
@@ -609,6 +643,7 @@ bool WeatherView::contains(QPoint point) {
 
 void WeatherView::paintEvent(QPaintEvent *e) {
 	auto p = Painter(this);
+	ClipToContentRect(p, _contentRect, geometry());
 	if (_background.size() != size() * style::DevicePixelRatio()) {
 		cacheBackground();
 	}
@@ -655,10 +690,10 @@ void WeatherView::setStickerFrom(not_null<DocumentData*> document) {
 	media->goodThumbnailWanted();
 
 	rpl::single() | rpl::then(
-		document->owner().session().downloaderTaskFinished()
+		document->session().downloaderTaskFinished()
 	) | rpl::filter([=] {
 		return media->loaded();
-	}) | rpl::take(1) | rpl::start_with_next([=] {
+	}) | rpl::take(1) | rpl::on_next([=] {
 		const auto sticker = document->sticker();
 		if (sticker->isLottie()) {
 			_sticker = std::make_shared<HistoryView::LottiePlayer>(
@@ -701,7 +736,7 @@ void WeatherView::cacheBackground() {
 	p.translate(-center);
 
 	const auto format = [](float64 value) {
-		return QString::number(int(base::SafeRound(value * 10)) / 10.);
+		return QString::number(int(base::SafeRound(value)));
 	};
 	const auto text = [&] {
 		const auto celsius = _data.millicelsius / 1000.;
@@ -712,11 +747,11 @@ void WeatherView::cacheBackground() {
 		return format(fahrenheit);
 	}().append(QChar(0xb0)).append(_celsius ? "C" : "F");
 	const auto metrics = QFontMetrics(_font);
-	const auto textWidth = metrics.horizontalAdvance(text);
-	_padding = int(_rect.height() / 6);
-	const auto fullWidth = (_emoji ? _emojiSize : 0)
+	const auto textWidth = qCeil(metrics.horizontalAdvance(text));
+	_padding = int(_rect.height() / 5);
+	const auto fullWidth = (_emoji ? (_emojiSize - _padding) : 0)
 		+ textWidth
-		+ (2 * _padding);
+		+ (4 * _padding);
 	const auto left = _rect.x() + (_rect.width() - fullWidth) / 2;
 	_wrapped = QRect(left, _rect.y(), fullWidth, _rect.height());
 
@@ -725,7 +760,7 @@ void WeatherView::cacheBackground() {
 	p.setPen(_fg);
 	p.setFont(_font);
 	p.drawText(_wrapped.marginsRemoved(
-		{ _padding + (_emoji ? _emojiSize : 0), 0, _padding, 0 }),
+		{ 2 * _padding + (_emoji ? (_emojiSize - _padding) : 0), 0, 2 * _padding, 0 }),
 		text,
 		style::al_center);
 }
@@ -734,34 +769,6 @@ void WeatherView::cacheBackground() {
 	return { QString() + QChar(10084) };
 }
 
-[[nodiscard]] Data::PossibleItemReactionsRef LookupPossibleReactions(
-		not_null<Main::Session*> session) {
-	auto result = Data::PossibleItemReactionsRef();
-	const auto reactions = &session->data().reactions();
-	const auto &full = reactions->list(Data::Reactions::Type::Active);
-	const auto &top = reactions->list(Data::Reactions::Type::Top);
-	const auto &recent = reactions->list(Data::Reactions::Type::Recent);
-	const auto premiumPossible = session->premiumPossible();
-	auto added = base::flat_set<Data::ReactionId>();
-	result.recent.reserve(full.size());
-	for (const auto &reaction : ranges::views::concat(top, recent, full)) {
-		if (premiumPossible || !reaction.id.custom()) {
-			if (added.emplace(reaction.id).second) {
-				result.recent.push_back(&reaction);
-			}
-		}
-	}
-	result.customAllowed = premiumPossible;
-	const auto i = ranges::find(
-		result.recent,
-		reactions->favoriteId(),
-		&Data::Reaction::id);
-	if (i != end(result.recent) && i != begin(result.recent)) {
-		std::rotate(begin(result.recent), i, i + 1);
-	}
-	return result;
-}
-
 HistoryView::Context ReactionView::elementContext() {
 	return HistoryView::Context::ContactPreview;
 }
@@ -906,9 +913,11 @@ void Reactions::Panel::attachToReactionButton(
 }
 
 void Reactions::Panel::create() {
-	auto reactions = LookupPossibleReactions(
+	auto reactions = Data::LookupPossibleReactions(
 		&_controller->uiShow()->session());
-	if (reactions.recent.empty()) {
+	if (reactions.recent.empty()
+		|| (_mode.current() == Mode::Message
+			&& _controller->videoStream())) {
 		return;
 	}
 	_parent = std::make_unique<Ui::RpWidget>(_controller->wrap().get());
@@ -916,7 +925,7 @@ void Reactions::Panel::create() {
 
 	const auto mode = _mode.current();
 
-	_parent->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	_parent->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonPress) {
 			const auto event = static_cast<QMouseEvent*>(e.get());
 			if (event->button() == Qt::LeftButton) {
@@ -943,10 +952,11 @@ void Reactions::Panel::create() {
 		[=](bool fast) { hide(mode); },
 		nullptr, // iconFactory
 		nullptr, // paused
-		true);
+		true,
+		_controller->wrap().get());
 
 	_selector->chosen(
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			HistoryView::Reactions::ChosenReaction reaction) {
 		_chosen.fire({ .reaction = reaction, .mode = mode });
 		hide(mode);
@@ -964,7 +974,7 @@ void Reactions::Panel::create() {
 	rpl::combine(
 		_controller->layoutValue(),
 		_shownValue.value()
-	) | rpl::start_with_next([=](const Layout &layout, float64 shown) {
+	) | rpl::on_next([=](const Layout &layout, float64 shown) {
 		const auto story = _controller->story();
 		const auto viewsReactionsMode = story && story->peer()->isChannel();
 		const auto width = margins.left()
@@ -995,11 +1005,11 @@ void Reactions::Panel::create() {
 	}, _selector->lifetime());
 
 	_selector->willExpand(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_expanded = true;
 	}, _selector->lifetime());
 
-	_selector->escapes() | rpl::start_with_next([=] {
+	_selector->escapes() | rpl::on_next([=] {
 		if (mode == Mode::Message) {
 			collapse(mode);
 		} else {
@@ -1020,7 +1030,7 @@ void Reactions::Panel::fadeOutSelector() {
 	raw->widget.setGeometry(geometry);
 	raw->widget.show();
 	raw->widget.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto opacity = raw->animation.value(0.)) {
 			auto p = QPainter(&raw->widget);
 			p.setOpacity(opacity);
@@ -1056,7 +1066,7 @@ void Reactions::Panel::updateShowState() {
 Reactions::Reactions(not_null<Controller*> controller)
 : _controller(controller)
 , _panel(std::make_unique<Panel>(_controller)) {
-	_panel->chosen() | rpl::start_with_next([=](Chosen &&chosen) {
+	_panel->chosen() | rpl::on_next([=](Chosen &&chosen) {
 		_chosen.fire(std::move(chosen));
 	}, _lifetime);
 }
@@ -1100,7 +1110,7 @@ void Reactions::setReplyFieldState(
 		rpl::producer<bool> hasSendText) {
 	std::move(
 		focused
-	) | rpl::start_with_next([=](bool focused) {
+	) | rpl::on_next([=](bool focused) {
 		_replyFocused = focused;
 		if (!_replyFocused) {
 			_panel->hideIfCollapsed(Reactions::Mode::Message);
@@ -1111,7 +1121,7 @@ void Reactions::setReplyFieldState(
 
 	std::move(
 		hasSendText
-	) | rpl::start_with_next([=](bool has) {
+	) | rpl::on_next([=](bool has) {
 		_hasSendText = has;
 		if (_replyFocused) {
 			if (_hasSendText) {
@@ -1142,7 +1152,7 @@ auto Reactions::attachToMenu(
 	using namespace HistoryView::Reactions;
 
 	const auto story = _controller->story();
-	if (!story || story->peer()->isSelf()) {
+	if (!story || story->peer()->isSelf() || story->call()) {
 		return AttachStripResult::Skipped;
 	}
 
@@ -1152,14 +1162,14 @@ auto Reactions::attachToMenu(
 		desiredPosition,
 		st::storiesReactionsPan,
 		show,
-		LookupPossibleReactions(&show->session()),
+		Data::LookupPossibleReactions(&show->session()),
 		TextWithEntities());
 	if (!result) {
 		return result.error();
 	}
 	const auto selector = *result;
 
-	selector->chosen() | rpl::start_with_next([=](ChosenReaction reaction) {
+	selector->chosen() | rpl::on_next([=](ChosenReaction reaction) {
 		menu->hideMenu();
 		_chosen.fire({ reaction, ReactionsMode::Reaction });
 	}, selector->lifetime());
@@ -1185,7 +1195,7 @@ void Reactions::showLikeFrom(Data::Story *story) {
 	_likeFromLifetime = story->session().changes().storyUpdates(
 		story,
 		Data::StoryUpdate::Flag::Reaction
-	) | rpl::start_with_next([=](const Data::StoryUpdate &update) {
+	) | rpl::on_next([=](const Data::StoryUpdate &update) {
 		setLikedIdFrom(update.story);
 	});
 }
@@ -1284,7 +1294,7 @@ void Reactions::initLikeIcon(
 	_likeIcon = std::make_unique<Ui::RpWidget>(_likeIconWidget);
 	const auto icon = _likeIcon.get();
 	icon->show();
-	_likeIconWidget->sizeValue() | rpl::start_with_next([=](QSize size) {
+	_likeIconWidget->sizeValue() | rpl::on_next([=](QSize size) {
 		icon->setGeometry(QRect(QPoint(), size));
 	}, icon->lifetime());
 
@@ -1351,7 +1361,7 @@ void Reactions::initLikeIcon(
 			});
 		}
 	};
-	icon->paintRequest() | rpl::start_with_next([=] {
+	icon->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(icon);
 		if (!fly->cache.isNull()) {
 			p.drawImage(0, 0, fly->cache);
@@ -1405,7 +1415,7 @@ void Reactions::waitForLikeIcon(
 	}) | rpl::flatten_latest(
 	) | rpl::filter(
 		rpl::mappers::_1
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		setLikedId(owner, id, true);
 
 		crl::on_main(&_likeIconGuard, [=] {
@@ -1453,7 +1463,7 @@ void Reactions::startReactionAnimation(
 		[] { return st::storiesComposeWhiteText->c; },
 		Data::CustomEmojiSizeTag::Isolated);
 	const auto layer = _reactionAnimation->layer();
-	wrap->paintRequest() | rpl::start_with_next([=] {
+	wrap->paintRequest() | rpl::on_next([=] {
 		if (!_reactionAnimation->paintBadgeFrame(target)) {
 			InvokeQueued(layer, [=] {
 				_reactionAnimation = nullptr;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reactions.h b/Telegram/SourceFiles/media/stories/media_stories_reactions.h
index 11da4c456edc55..9bb09ecfbdea5c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reactions.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reactions.h
@@ -47,6 +47,7 @@ class StoryAreaView {
 	virtual ~StoryAreaView() = default;
 
 	virtual void setAreaGeometry(QRect geometry, float64 radius) = 0;
+	virtual void setContentRect(QRect rect, int radius) = 0;
 	virtual void updateReactionsCount(int count) = 0;
 	virtual void playEffect() = 0;
 	virtual bool contains(QPoint point) = 0;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
index 66456372583f30..151d85cab4fbcf 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.cpp
@@ -107,7 +107,7 @@ constexpr auto kLoadViewsPages = 2;
 			list.front()->session().downloaderTaskFinished(
 			) | rpl::filter([=] {
 				return state->someUserpicsNotLoaded && !state->scheduled;
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				for (const auto &userpic : state->userpics) {
 					if (userpic.peer->userpicUniqueKey(userpic.view)
 						!= userpic.uniqueKey) {
@@ -129,16 +129,20 @@ constexpr auto kLoadViewsPages = 2;
 		const QString &date,
 		not_null<Data::Story*> repost) {
 	return date + (repost->repostModified()
-		? (QString::fromUtf8(" \xE2\x80\xA2 ") + tr::lng_edited(tr::now))
+		? (' ' + Ui::kQBullet + ' ' + tr::lng_edited(tr::now))
 		: !repost->caption().empty()
-		? (QString::fromUtf8(" \xE2\x80\xA2 ") + tr::lng_commented(tr::now))
+		? (' ' + Ui::kQBullet + ' ' + tr::lng_commented(tr::now))
 		: QString());
 }
 
 } // namespace
 
-RecentViewsType RecentViewsTypeFor(not_null<PeerData*> peer) {
-	return peer->isSelf()
+RecentViewsType RecentViewsTypeFor(
+		not_null<PeerData*> peer,
+		bool videoStream) {
+	return videoStream
+		? RecentViewsType::Other
+		: peer->isSelf()
 		? RecentViewsType::Self
 		: peer->isBroadcast()
 		? RecentViewsType::Channel
@@ -169,7 +173,7 @@ void RecentViews::show(
 				likedValue
 			) | rpl::map([](const Data::ReactionId &id) {
 				return !id.empty();
-			}) | rpl::start_with_next([=](bool liked) {
+			}) | rpl::on_next([=](bool liked) {
 				const auto icon = liked
 					? &st::storiesComposeControls.liked
 					: &st::storiesLikesIcon;
@@ -255,7 +259,7 @@ void RecentViews::refreshClickHandler() {
 				&& (e->type() == QEvent::MouseButtonPress)
 				&& (static_cast<QMouseEvent*>(e.get())->button()
 					== Qt::LeftButton);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			showMenu();
 		});
 	}
@@ -267,7 +271,7 @@ void RecentViews::refreshClickHandler() {
 void RecentViews::updateUserpics() {
 	_userpicsLifetime = ContentByUsers(
 		_data.list
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const std::vector<Ui::GroupCallUser> &list) {
 		_userpics->update(list, true);
 	});
@@ -280,7 +284,7 @@ void RecentViews::setupUserpics() {
 		rpl::single(true),
 		[=] { _widget->update(); });
 
-	_userpics->widthValue() | rpl::start_with_next([=](int width) {
+	_userpics->widthValue() | rpl::on_next([=](int width) {
 		if (_userpicsWidth != width) {
 			_userpicsWidth = width;
 			updatePartsGeometry();
@@ -294,13 +298,13 @@ void RecentViews::setupWidget() {
 	raw->show();
 
 	_controller->layoutValue(
-	) | rpl::start_with_next([=](const Layout &layout) {
+	) | rpl::on_next([=](const Layout &layout) {
 		_outer = layout.views;
 		updatePartsGeometry();
 	}, raw->lifetime());
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(raw);
 		_userpics->paint(
 			p,
@@ -325,7 +329,7 @@ void RecentViews::setupViewsReactions() {
 	_likeIcon->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	_controller->layoutValue(
-	) | rpl::start_with_next([=](const Layout &layout) {
+	) | rpl::on_next([=](const Layout &layout) {
 		_outer = QRect(
 			layout.content.x(),
 			layout.views.y(),
@@ -342,7 +346,7 @@ void RecentViews::setupViewsReactions() {
 	views->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	views->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto left = (_data.type == RecentViewsType::Changelog)
 			? st::mediaviewCaptionPadding.left()
 			: st::storiesViewsTextPosition.x();
@@ -352,11 +356,10 @@ void RecentViews::setupViewsReactions() {
 	}, _viewsWrap->lifetime());
 	_viewsWrap->paintRequest() | rpl::filter([=] {
 		return (_data.type != RecentViewsType::Changelog);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		auto p = QPainter(_viewsWrap.get());
 		const auto &icon = st::storiesViewsIcon;
-		const auto top = (_viewsWrap->height() - icon.height()) / 2;
-		icon.paint(p, 0, top, _viewsWrap->width());
+		icon.paint(p, 0, st::storiesViewsIconTop, _viewsWrap->width());
 	}, _viewsWrap->lifetime());
 
 	_likeIcon->move(0, 0);
@@ -369,7 +372,7 @@ void RecentViews::setupViewsReactions() {
 	likes->move(st::storiesLikesTextPosition);
 
 	likes->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		width += width
 			? st::storiesLikesTextRightSkip
 			: st::storiesLikesEmptyRightSkip;
@@ -402,7 +405,7 @@ void RecentViews::updatePartsGeometry() {
 	const auto skip = st::storiesRecentViewsSkip;
 	const auto full = _userpicsWidth + skip + _text.maxWidth();
 	const auto add = (_data.type == RecentViewsType::Channel)
-		? st::storiesViewsTextPosition.y()
+		? st::storiesChannelReactionsTextTop
 		: 0;
 	const auto use = std::min(full, _outer.width());
 	const auto ux = _outer.x() + (_outer.width() - use) / 2;
@@ -476,7 +479,7 @@ void RecentViews::showMenu() {
 				< (scrollTop
 					+ st::storiesViewsMenu.maxHeight * kLoadViewsPages);
 		}) | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuildMenuTail();
 	}, _menuShortLifetime);
 
@@ -496,7 +499,7 @@ void RecentViews::showMenu() {
 	_menu->setForcedVerticalOrigin(PopupMenu::VerticalOrigin::Bottom);
 	_menu->popup(QPoint(
 		geometry.x() + (_widget->width() - size.width()) / 2,
-		geometry.y() + _widget->height()));
+		geometry.y()));
 
 	_menuEntriesCount = _menuEntriesCount.current() + added;
 }
@@ -626,7 +629,7 @@ void RecentViews::subscribeToMenuUserpicsLoading(
 			}
 			return true;
 		})
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_waitingUserpicsCheck = false;
 		for (auto i = begin(_waitingForUserpics)
 			; i != end(_waitingForUserpics)
diff --git a/Telegram/SourceFiles/media/stories/media_stories_recent_views.h b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
index ea8d69313c980a..83dd2efde21e0e 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_recent_views.h
@@ -58,7 +58,9 @@ struct RecentViewsData {
 		const RecentViewsData &) = default;
 };
 
-[[nodiscard]] RecentViewsType RecentViewsTypeFor(not_null<PeerData*> peer);
+[[nodiscard]] RecentViewsType RecentViewsTypeFor(
+	not_null<PeerData*> peer,
+	bool videoStream);
 [[nodiscard]] bool CanViewReactionsFor(not_null<PeerData*> peer);
 
 class RecentViews final {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index 136c77b7a598c0..c1fae9a2ee0f5a 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -15,26 +15,39 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "boxes/premium_limits_box.h"
 #include "boxes/send_files_box.h"
+#include "boxes/share_box.h" // ShareBoxStyleOverrides
+#include "calls/group/calls_group_call.h"
+#include "calls/group/calls_group_messages.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "core/file_utilities.h"
 #include "core/mime_type.h"
 #include "data/stickers/data_custom_emoji.h"
+#include "data/data_changes.h"
+#include "data/data_chat_participant_status.h"
+#include "data/components/recent_inline_bots.h"
 #include "data/data_document.h"
+#include "data/data_group_call.h"
 #include "data/data_message_reaction_id.h"
+#include "data/data_message_reactions.h"
 #include "data/data_peer_values.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "history/view/controls/compose_controls_common.h"
 #include "history/view/controls/history_view_compose_controls.h"
+#include "history/view/history_view_schedule_box.h" // ScheduleBoxStyleArgs
 #include "history/history_item_helpers.h"
 #include "history/history.h"
 #include "inline_bots/inline_bot_result.h"
 #include "lang/lang_keys.h"
+#include "main/session/send_as_peers.h"
 #include "main/main_session.h"
 #include "media/stories/media_stories_controller.h"
 #include "media/stories/media_stories_stealth.h"
+#include "media/view/media_view_video_stream.h"
 #include "menu/menu_send.h"
+#include "payments/ui/payments_reaction_box.h" // MaxTopPaidDonorsShown
+#include "settings/settings_credits_graphics.h" // DarkCreditsEntryBoxStyle
 #include "storage/localimageloader.h"
 #include "storage/storage_account.h"
 #include "storage/storage_media_prepare.h"
@@ -51,14 +64,19 @@ namespace {
 
 [[nodiscard]] rpl::producer<QString> PlaceholderText(
 		const std::shared_ptr<ChatHelpers::Show> &show,
-		rpl::producer<bool> isComment) {
+		rpl::producer<ReplyAreaType> type,
+		rpl::producer<int> starsPerMessage) {
 	return rpl::combine(
 		show->session().data().stories().stealthModeValue(),
-		std::move(isComment)
-	) | rpl::map([](Data::StealthMode value, bool isComment) {
-		return std::tuple(value.enabledTill, isComment);
+		std::move(type),
+		std::move(starsPerMessage)
+	) | rpl::map([](
+			Data::StealthMode value,
+			ReplyAreaType type,
+			int starsPerMessage) {
+		return std::tuple(value.enabledTill, type, starsPerMessage);
 	}) | rpl::distinct_until_changed(
-	) | rpl::map([](TimeId till, bool isComment) {
+	) | rpl::map([](TimeId till, ReplyAreaType type, int starsPerMessage) {
 		return rpl::single(
 			rpl::empty
 		) | rpl::then(
@@ -70,17 +88,51 @@ namespace {
 		}) | rpl::then(
 			rpl::single(0)
 		) | rpl::map([=](TimeId left) {
-			return left
+			return (type == ReplyAreaType::VideoStreamComment)
+				? (starsPerMessage
+					? tr::lng_video_stream_comment_paid_ph(
+						lt_count,
+						rpl::single(starsPerMessage * 1.))
+					: tr::lng_video_stream_comment_ph())
+				: starsPerMessage
+				? tr::lng_message_stars_ph(
+					lt_count,
+					rpl::single(starsPerMessage * 1.))
+				: left
 				? tr::lng_stealth_mode_countdown(
 					lt_left,
 					rpl::single(TimeLeftText(left)))
-				: isComment
+				: (type == ReplyAreaType::Comment)
 				? tr::lng_story_comment_ph()
 				: tr::lng_story_reply_ph();
 		}) | rpl::flatten_latest();
 	}) | rpl::flatten_latest();
 }
 
+[[nodiscard]] ChatHelpers::ComposeFeatures Features(
+		bool videoStream,
+		bool videoStreamManager) {
+	return {
+		.likes = !videoStream,
+		.sendAs = videoStream,
+		.ttlInfo = false,
+		.attachments = !videoStream,
+		.botCommandSend = false,
+		.silentBroadcastToggle = false,
+		.attachBotsMenu = false,
+		.inlineBots = false,
+		.megagroupSet = false,
+		.stickersSettings = false,
+		.openStickerSets = false,
+		.autocompleteHashtags = false,
+		.autocompleteMentions = false,
+		.autocompleteCommands = false,
+		.recordMediaMessage = !videoStream,
+		.editMessageStars = videoStream,
+		.emojiOnlyPanel = videoStream,
+	};
+}
+
 } // namespace
 
 class ReplyArea::Cant final : public Ui::RpWidget {
@@ -127,24 +179,11 @@ ReplyArea::ReplyArea(not_null<Controller*> controller)
 		.stickerOrEmojiChosen = _controller->stickerOrEmojiChosen(),
 		.customPlaceholder = PlaceholderText(
 			_controller->uiShow(),
-			rpl::deferred([=] { return _isComment.value(); })),
+			rpl::deferred([=] { return _type.value(); }),
+			rpl::deferred([=] { return _starsForMessage.value(); })),
 		.voiceCustomCancelText = tr::lng_record_cancel_stories(tr::now),
 		.voiceLockFromBottom = true,
-		.features = {
-			.likes = true,
-			.sendAs = false,
-			.ttlInfo = false,
-			.botCommandSend = false,
-			.silentBroadcastToggle = false,
-			.attachBotsMenu = false,
-			.inlineBots = false,
-			.megagroupSet = false,
-			.stickersSettings = false,
-			.openStickerSets = false,
-			.autocompleteHashtags = false,
-			.autocompleteMentions = false,
-			.autocompleteCommands = false,
-		},
+		.features = Features(false, false),
 	}
 )) {
 	initGeometry();
@@ -159,7 +198,7 @@ void ReplyArea::initGeometry() {
 	rpl::combine(
 		_controller->layoutValue(),
 		_controls->height()
-	) | rpl::start_with_next([=](const Layout &layout, int height) {
+	) | rpl::on_next([=](const Layout &layout, int height) {
 		const auto content = layout.content;
 		_controls->resizeToWidth(layout.controlsWidth);
 		if (_controls->heightCurrent() == height) {
@@ -198,39 +237,81 @@ bool ReplyArea::sendReaction(const Data::ReactionId &id) {
 		}
 	}
 	return !message.textWithTags.empty()
-		&& send(std::move(message), {}, true);
+		&& send(std::move(message), true);
 }
 
 void ReplyArea::send(Api::SendOptions options) {
+	auto text = _controls->getTextWithAppliedMarkdown();
+	const auto stars = _controls->chosenStarsForMessage();
+	if (const auto stream = _videoStream.get()) {
+		if (stars > 0) {
+			const auto weak = _videoStream;
+			const auto done = [=](Settings::SmallBalanceResult result) {
+				if (result == Settings::SmallBalanceResult::Success
+					|| result == Settings::SmallBalanceResult::Already) {
+					if (const auto strong = weak.get()) {
+						strong->messages()->send(text, stars);
+						_controls->clear();
+					}
+				}
+			};
+			using namespace Settings;
+			MaybeRequestBalanceIncrease(
+				_controller->uiShow(),
+				stars,
+				SmallBalanceVideoStream{ stream->peer()->id },
+				crl::guard(this, done));
+		} else {
+			stream->messages()->send(std::move(text), stars);
+			_controls->clear();
+		}
+		return;
+	}
 	const auto webPageDraft = _controls->webPageDraft();
 
 	auto message = Api::MessageToSend(prepareSendAction(options));
-	message.textWithTags = _controls->getTextWithAppliedMarkdown();
+	message.textWithTags = std::move(text);
 	message.webPage = webPageDraft;
 
-	send(std::move(message), options);
+	send(std::move(message));
 }
 
 bool ReplyArea::send(
 		Api::MessageToSend message,
-		Api::SendOptions options,
 		bool skipToast) {
-	if (!options.scheduled && showSlowmodeError()) {
+	if (!message.action.options.scheduled && showSlowmodeError()) {
 		return false;
 	}
 
-	const auto error = GetErrorTextForSending(
-		_data.peer,
-		{
-			.topicRootId = MsgId(0),
-			.text = &message.textWithTags,
-			.ignoreSlowmodeCountdown = (options.scheduled != 0),
-		});
-	if (!error.isEmpty()) {
-		_controller->uiShow()->showToast(error);
+	auto request = SendingErrorRequest{
+		.topicRootId = MsgId(0),
+		.text = &message.textWithTags,
+		.ignoreSlowmodeCountdown = (message.action.options.scheduled != 0),
+	};
+	request.messagesCount = ComputeSendingMessagesCount(
+		message.action.history,
+		request);
+	const auto error = GetErrorForSending(_data.peer, request);
+	if (error) {
+		Data::ShowSendErrorToast(_controller->uiShow(), _data.peer, error);
 		return false;
 	}
 
+	if (!message.action.options.scheduled) {
+		const auto withPaymentApproved = [=](int approved) {
+			auto copy = message;
+			copy.action.options.starsApproved = approved;
+			send(copy);
+		};
+		const auto checked = checkSendPayment(
+			request.messagesCount,
+			message.action.options,
+			withPaymentApproved);
+		if (!checked) {
+			return false;
+		}
+	}
+
 	session().api().sendMessage(std::move(message));
 
 	finishSending(skipToast);
@@ -238,12 +319,47 @@ bool ReplyArea::send(
 	return true;
 }
 
-void ReplyArea::sendVoice(VoiceToSend &&data) {
+bool ReplyArea::checkSendPayment(
+		int messagesCount,
+		Api::SendOptions options,
+		Fn<void(int)> withPaymentApproved) {
+	const auto st1 = ::Settings::DarkCreditsEntryBoxStyle();
+	const auto st2 = st1.shareBox.get();
+	const auto st3 = st2 ? st2->scheduleBox.get() : nullptr;
+	return _data.peer
+		&& _sendPayment.check(
+			_controller->uiShow(),
+			_data.peer,
+			options,
+			messagesCount,
+			std::move(withPaymentApproved),
+			{
+				.label = st3 ? st3->chooseDateTimeArgs.labelStyle : nullptr,
+				.checkbox = st2 ? st2->checkbox : nullptr,
+			});
+}
+
+void ReplyArea::sendVoice(const VoiceToSend &data) {
 	auto action = prepareSendAction(data.options);
+
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = data;
+		copy.options.starsApproved = approved;
+		sendVoice(copy);
+	};
+	const auto checked = checkSendPayment(
+		1,
+		action.options,
+		withPaymentApproved);
+	if (!checked) {
+		return;
+	}
+
 	session().api().sendVoiceMessage(
 		data.bytes,
 		data.waveform,
 		data.duration,
+		data.video,
 		std::move(action));
 
 	_controls->clearListenState();
@@ -261,12 +377,24 @@ bool ReplyArea::sendExistingDocument(
 		_data.peer,
 		ChatRestriction::SendStickers);
 	if (error) {
-		show->showToast(*error);
+		Data::ShowSendErrorToast(show, _data.peer, error);
 		return false;
 	} else if (showSlowmodeError()
 		|| Window::ShowSendPremiumError(show, document)) {
 		return false;
 	}
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = messageToSend;
+		copy.action.options.starsApproved = approved;
+		sendExistingDocument(document, std::move(copy), localId);
+	};
+	const auto checked = checkSendPayment(
+		1,
+		messageToSend.action.options,
+		withPaymentApproved);
+	if (!checked) {
+		return false;
+	}
 
 	Api::SendExistingDocument(std::move(messageToSend), document, localId);
 
@@ -289,15 +417,27 @@ bool ReplyArea::sendExistingPhoto(
 		_data.peer,
 		ChatRestriction::SendPhotos);
 	if (error) {
-		show->showToast(*error);
+		Data::ShowSendErrorToast(show, _data.peer, error);
 		return false;
 	} else if (showSlowmodeError()) {
 		return false;
 	}
+	const auto action = prepareSendAction(options);
 
-	Api::SendExistingPhoto(
-		Api::MessageToSend(prepareSendAction(options)),
-		photo);
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = options;
+		copy.starsApproved = approved;
+		sendExistingPhoto(photo, copy);
+	};
+	const auto checked = checkSendPayment(
+		1,
+		action.options,
+		withPaymentApproved);
+	if (!checked) {
+		return false;
+	}
+
+	Api::SendExistingPhoto(Api::MessageToSend(action), photo);
 
 	_controls->cancelReplyMessage();
 	finishSending();
@@ -305,36 +445,44 @@ bool ReplyArea::sendExistingPhoto(
 }
 
 void ReplyArea::sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot) {
-	const auto errorText = result->getErrorOnSend(history());
-	if (!errorText.isEmpty()) {
-		_controller->uiShow()->showToast(errorText);
+	if (const auto error = result->getErrorOnSend(history())) {
+		const auto show = _controller->uiShow();
+		Data::ShowSendErrorToast(show, history()->peer, error);
 		return;
 	}
 	sendInlineResult(result, bot, {}, std::nullopt);
 }
 
 void ReplyArea::sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot,
 		Api::SendOptions options,
 		std::optional<MsgId> localMessageId) {
 	auto action = prepareSendAction(options);
 	action.generateLocal = true;
-	session().api().sendInlineResult(bot, result, action, localMessageId);
-
-	auto &bots = cRefRecentInlineBots();
-	const auto index = bots.indexOf(bot);
-	if (index) {
-		if (index > 0) {
-			bots.removeAt(index);
-		} else if (bots.size() >= RecentInlineBotsLimit) {
-			bots.resize(RecentInlineBotsLimit - 1);
-		}
-		bots.push_front(bot);
-		bot->session().local().writeRecentHashtagsAndBots();
+
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = options;
+		copy.starsApproved = approved;
+		sendInlineResult(result, bot, copy, localMessageId);
+	};
+	const auto checked = checkSendPayment(
+		1,
+		action.options,
+		withPaymentApproved);
+	if (!checked) {
+		return;
 	}
+
+	session().api().sendInlineResult(
+		bot,
+		result.get(),
+		action,
+		localMessageId);
+
+	bot->session().recentInlineBots().bump(bot);
 	finishSending();
 	_controls->clear();
 }
@@ -356,45 +504,15 @@ void ReplyArea::uploadFile(
 
 bool ReplyArea::showSendingFilesError(
 		const Ui::PreparedList &list) const {
-	return showSendingFilesError(list, std::nullopt);
+	const auto show = _controller->uiShow();
+	const auto peer = _data.peer;
+	return Data::ShowSendError(show, peer, list, std::nullopt, true);
 }
 
 bool ReplyArea::showSendingFilesError(
-		const Ui::PreparedList &list,
-		std::optional<bool> compress) const {
-	const auto text = [&] {
-		const auto peer = _data.peer;
-		const auto error = Data::FileRestrictionError(peer, list, compress);
-		if (error) {
-			return *error;
-		}
-		using Error = Ui::PreparedList::Error;
-		switch (list.error) {
-		case Error::None: return QString();
-		case Error::EmptyFile:
-		case Error::Directory:
-		case Error::NonLocalUrl: return tr::lng_send_image_empty(
-			tr::now,
-			lt_name,
-			list.errorData);
-		case Error::TooLargeFile: return u"(toolarge)"_q;
-		}
-		return tr::lng_forward_send_files_cant(tr::now);
-	}();
-	if (text.isEmpty()) {
-		return false;
-	} else if (text == u"(toolarge)"_q) {
-		const auto fileSize = list.files.back().size;
-		_controller->uiShow()->showBox(Box(
-			FileSizeLimitBox,
-			&session(),
-			fileSize,
-			&st::storiesComposePremium));
-		return true;
-	}
-
-	_controller->uiShow()->showToast(text);
-	return true;
+		const Ui::PreparedBundle &bundle) const {
+	const auto show = _controller->uiShow();
+	return Data::ShowSendError(show, _data.peer, bundle, true);
 }
 
 not_null<History*> ReplyArea::history() const {
@@ -421,7 +539,7 @@ void ReplyArea::chooseAttach(
 	}
 	const auto peer = not_null(_data.peer);
 	if (const auto error = Data::AnyFileRestrictionError(peer)) {
-		_controller->uiShow()->showToast(*error);
+		Data::ShowSendErrorToast(_controller->uiShow(), peer, error);
 		return;
 	} else if (showSlowmodeError()) {
 		return;
@@ -472,9 +590,27 @@ void ReplyArea::chooseAttach(
 
 Fn<SendMenu::Details()> ReplyArea::sendMenuDetails() const {
 	return crl::guard(this, [=] {
+		const auto call = _videoStream
+			? _videoStream->lookupReal()
+			: nullptr;
 		return SendMenu::Details{
-			.type = SendMenu::Type::SilentOnly,
-			.effectAllowed = _data.peer && _data.peer->isUser(),
+			.type = (!_data.videoStream
+				? SendMenu::Type::SilentOnly
+				: !call
+				? SendMenu::Type::Disabled
+				: SendMenu::Type::EditCommentPrice),
+			.commentStreamerName = (call
+				? call->peer()->shortName()
+				: QString()),
+			.price = (_data.videoStream
+				? uint64(_controls->chosenStarsForMessage())
+				: std::optional<uint64>()),
+			.commentPriceMin = (call
+				? uint64(call->canManage() ? call->messagesMinPrice() : 0)
+				: std::optional<uint64>()),
+			.effectAllowed = (!_data.videoStream
+				&& _data.peer
+				&& _data.peer->isUser()),
 		};
 	});
 }
@@ -523,14 +659,17 @@ bool ReplyArea::confirmSendingFiles(
 	}
 
 	const auto show = _controller->uiShow();
-	auto confirmed = [=](auto &&...args) {
-		sendingFilesConfirmed(std::forward<decltype(args)>(args)...);
+	auto confirmed = [=](
+			std::shared_ptr<Ui::PreparedBundle> bundle,
+			Api::SendOptions options,
+			FullReplyTo) {
+		sendingFilesConfirmed(std::move(bundle), options);
 	};
 	show->show(Box<SendFilesBox>(SendFilesBoxDescriptor{
 		.show = show,
 		.list = std::move(list),
 		.caption = _controls->getTextWithAppliedMarkdown(),
-		.captionToPeer = _data.peer,
+		.toPeer = _data.peer,
 		.limits = DefaultLimitsForPeer(_data.peer),
 		.check = DefaultCheckForPeer(show, _data.peer),
 		.sendType = Api::SendType::Normal,
@@ -544,41 +683,35 @@ bool ReplyArea::confirmSendingFiles(
 }
 
 void ReplyArea::sendingFilesConfirmed(
-		Ui::PreparedList &&list,
-		Ui::SendFilesWay way,
-		TextWithTags &&caption,
-		Api::SendOptions options,
-		bool ctrlShiftEnter) {
-	Expects(list.filesToProcess.empty());
-
-	if (showSendingFilesError(list, way.sendImagesAsPhotos())) {
+		std::shared_ptr<Ui::PreparedBundle> bundle,
+		Api::SendOptions options) {
+	if (showSendingFilesError(*bundle)) {
 		return;
 	}
-	auto groups = DivideByGroups(
-		std::move(list),
-		way,
-		_data.peer->slowmodeApplied());
-	const auto type = way.sendImagesAsPhotos()
-		? SendMediaType::Photo
-		: SendMediaType::File;
+	const auto compress = bundle->way.sendImagesAsPhotos();
+	const auto type = compress ? SendMediaType::Photo : SendMediaType::File;
 	auto action = prepareSendAction(options);
 	action.clearDraft = false;
-	if ((groups.size() != 1 || !groups.front().sentWithCaption())
-		&& !caption.text.isEmpty()) {
-		auto message = Api::MessageToSend(action);
-		message.textWithTags = base::take(caption);
-		session().api().sendMessage(std::move(message));
+
+	const auto withPaymentApproved = [=](int approved) {
+		auto copy = options;
+		copy.starsApproved = approved;
+		sendingFilesConfirmed(bundle, copy);
+	};
+	const auto checked = checkSendPayment(
+		bundle->totalCount,
+		action.options,
+		withPaymentApproved);
+	if (!checked) {
+		return;
 	}
-	for (auto &group : groups) {
+
+	auto &api = session().api();
+	for (auto &group : bundle->groups) {
 		const auto album = (group.type != Ui::AlbumType::None)
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
-		session().api().sendFiles(
-			std::move(group.list),
-			type,
-			base::take(caption),
-			album,
-			action);
+		api.sendFiles(std::move(group.list), type, album, action);
 	}
 	finishSending();
 }
@@ -602,24 +735,24 @@ bool ReplyArea::confirmSendingFiles(
 
 void ReplyArea::initActions() {
 	_controls->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->unfocusReply();
 	}, _lifetime);
 
 	_controls->sendRequests(
-	) | rpl::start_with_next([=](Api::SendOptions options) {
+	) | rpl::on_next([=](Api::SendOptions options) {
 		send(options);
 	}, _lifetime);
 
 	_controls->sendVoiceRequests(
-	) | rpl::start_with_next([=](VoiceToSend &&data) {
-		sendVoice(std::move(data));
+	) | rpl::on_next([=](const VoiceToSend &data) {
+		sendVoice(data);
 	}, _lifetime);
 
 	_controls->attachRequests(
 	) | rpl::filter([=] {
 		return !_chooseAttachRequest;
-	}) | rpl::start_with_next([=](std::optional<bool> overrideCompress) {
+	}) | rpl::on_next([=](std::optional<bool> overrideCompress) {
 		_chooseAttachRequest = true;
 		base::call_delayed(
 			st::storiesAttach.ripple.hideDuration,
@@ -627,8 +760,14 @@ void ReplyArea::initActions() {
 			[=] { chooseAttach(overrideCompress); });
 	}, _lifetime);
 
+	_controls->setSendAsFileConfirmed(crl::guard(this, [=](
+			std::shared_ptr<Ui::PreparedBundle> bundle,
+			Api::SendOptions options) {
+		sendingFilesConfirmed(std::move(bundle), options);
+	}));
+
 	_controls->fileChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		_controller->uiShow()->hideLayer();
 		auto messageToSend = Api::MessageToSend(
 			prepareSendAction(data.options));
@@ -640,18 +779,18 @@ void ReplyArea::initActions() {
 	}, _lifetime);
 
 	_controls->photoChosen(
-	) | rpl::start_with_next([=](ChatHelpers::PhotoChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::PhotoChosen chosen) {
 		sendExistingPhoto(chosen.photo, chosen.options);
 	}, _lifetime);
 
 	_controls->inlineResultChosen(
-	) | rpl::start_with_next([=](ChatHelpers::InlineChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::InlineChosen chosen) {
 		const auto localId = chosen.messageSendingFrom.localId;
 		sendInlineResult(chosen.result, chosen.bot, chosen.options, localId);
 	}, _lifetime);
 
 	_controls->likeToggled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->toggleLiked();
 	}, _lifetime);
 
@@ -670,7 +809,7 @@ void ReplyArea::initActions() {
 	});
 
 	_controls->lockShowStarts(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 	}, _lifetime);
 
 	_controls->show();
@@ -684,8 +823,29 @@ void ReplyArea::show(
 	if (_data == data) {
 		return;
 	}
+	const auto stream = data.videoStream.get();
 	const auto peerChanged = (_data.peer != data.peer);
+	const auto streamChanged = (_data.videoStream.get() != stream);
 	_data = data;
+	if (streamChanged) {
+		const auto manager = stream && stream->canManage();
+		_controls->updateFeatures(Features(stream != nullptr, manager));
+		_controls->setToggleCommentsButton(stream
+			? _controller->commentsStateValue()
+			: nullptr);
+		_controller->setCommentsShownToggles(
+			_controls->commentsShownToggles());
+	}
+	using Controls = HistoryView::ComposeControls;
+	_controls->setStarsReactionCounter(
+		stream ? _controller->starsReactionsValue() : nullptr,
+		stream ? _controller->starsReactionsEffects() : nullptr);
+	_controller->setStarsReactionIncrements(
+		_controls->starsReactionIncrements(
+		) | rpl::map([](Controls::StarReactionIncrement increment) {
+			return increment.count;
+		}));
+	_starsForMessage = starsPerMessageValue();
 	if (!peerChanged) {
 		if (_data.peer) {
 			_controls->clear();
@@ -696,25 +856,45 @@ void ReplyArea::show(
 	const auto peer = data.peer;
 	const auto history = peer ? peer->owner().history(peer).get() : nullptr;
 	const auto user = peer->asUser();
-	_isComment = peer->isMegagroup();
-	auto writeRestriction = Data::CanSendAnythingValue(
-		peer
-	) | rpl::map([=](bool can) {
-		using namespace HistoryView::Controls;
-		return (can
-			|| !user
-			|| !user->meRequiresPremiumToWrite()
-			|| user->session().premium())
-			? WriteRestriction()
-			: WriteRestriction{
-				.text = tr::lng_send_non_premium_story(tr::now),
-				.button = tr::lng_send_non_premium_unlock(tr::now),
-				.type = WriteRestrictionType::PremiumRequired,
-			};
-	});
+	_type = peer->isMegagroup()
+		? ReplyAreaType::Comment
+		: ReplyAreaType::Reply;
+	auto writeRestriction = stream
+		? rpl::combine(
+			stream->messagesEnabledValue(),
+			stream->loadedValue()
+		) | rpl::map([=](bool enabled, bool loaded) {
+			using namespace HistoryView::Controls;
+			return !loaded
+				? WriteRestriction{ .type = WriteRestrictionType::Hidden }
+				: enabled
+				? WriteRestriction()
+				: WriteRestriction{
+					.text = tr::lng_video_stream_comments_disabled(tr::now),
+					.type = WriteRestrictionType::Rights,
+				};
+		}) | rpl::type_erased
+		: Data::CanSendAnythingValue(
+			peer
+		) | rpl::map([=](bool can) {
+			using namespace HistoryView::Controls;
+			return peer->session().frozen()
+				? WriteRestriction{ .type = WriteRestrictionType::Frozen }
+				: (can
+				|| !user
+				|| !user->requiresPremiumToWrite()
+				|| user->session().premium())
+				? WriteRestriction()
+				: WriteRestriction{
+					.text = tr::lng_send_non_premium_story(tr::now),
+					.button = tr::lng_send_non_premium_unlock(tr::now),
+					.type = WriteRestrictionType::PremiumRequired,
+				};
+		});
 	using namespace HistoryView;
 	_controls->setHistory({
 		.history = history,
+		.videoStream = _data.videoStream,
 		.showSlowmodeError = [=] { return showSlowmodeError(); },
 		.sendActionFactory = [=] { return prepareSendAction({}); },
 		.slowmodeSecondsLeft = SlowmodeSecondsLeft(history->peer),
@@ -724,11 +904,15 @@ void ReplyArea::show(
 		) | rpl::map([](const Data::ReactionId &id) {
 			return !id.empty();
 		}),
+		.minStarsCount = (stream
+			? _starsForMessage.value()
+			: rpl::producer<int>()),
 		.writeRestriction = std::move(writeRestriction),
 	});
 	_controls->clear();
 	const auto hidden = peer
-		&& (peer->isBroadcast() || peer->isSelf() || peer->isServiceUser());
+		&& (peer->isBroadcast() || peer->isSelf() || peer->isServiceUser())
+		&& !stream;
 	const auto cant = !peer;
 	if (!hidden && !cant) {
 		_controls->show();
@@ -737,7 +921,7 @@ void ReplyArea::show(
 		if (cant) {
 			_cant = std::make_unique<Cant>(_controller->wrap());
 			_controller->layoutValue(
-			) | rpl::start_with_next([=](const Layout &layout) {
+			) | rpl::on_next([=](const Layout &layout) {
 				const auto height = st::storiesComposeControls.attach.height;
 				const auto position = layout.controlsBottomPosition
 					- QPoint(0, height);
@@ -750,6 +934,32 @@ void ReplyArea::show(
 	}
 }
 
+rpl::producer<int> ReplyArea::starsPerMessageValue() const {
+	if (const auto stream = _data.videoStream.get()) {
+		return rpl::combine(
+			Data::CanManageGroupCallValue(stream->peer()),
+			stream->messagesMinPriceValue()
+		) | rpl::map([=](bool canManage, int price) {
+			return canManage ? 0 : price;
+		});
+	} else if (const auto peer = _data.peer) {
+		using Flag = Data::PeerUpdate::Flag;
+		return peer->session().changes().peerFlagsValue(
+			peer,
+			Flag::StarsPerMessage | Flag::FullInfo
+		) | rpl::map([=] {
+			return peer->starsPerMessageChecked();
+		});
+	}
+	return rpl::single(0);
+}
+
+void ReplyArea::updateVideoStream(not_null<Calls::GroupCall*> videoStream) {
+	_type = ReplyAreaType::VideoStreamComment;
+	_videoStream = videoStream;
+	_controls->setStarsReactionTop(View::TopVideoStreamDonors(videoStream));
+}
+
 bool ReplyArea::showSlowmodeError() {
 	const auto text = [&] {
 		const auto story = _controller->story();
@@ -763,8 +973,7 @@ bool ReplyArea::showSlowmodeError() {
 				lt_left,
 				Ui::FormatDurationWordsSlowmode(left));
 		} else if (peer->slowmodeApplied()) {
-			const auto history = peer->owner().history(peer);
-			if (const auto item = history->latestSendingMessage()) {
+			if (peer->owner().history(peer)->latestSendingMessage()) {
 				return tr::lng_slowmode_no_many(tr::now);
 			}
 		}
@@ -815,7 +1024,7 @@ void ReplyArea::tryProcessKeyInput(not_null<QKeyEvent*> e) {
 	_controls->tryProcessKeyInput(e);
 }
 
-not_null<Ui::RpWidget*> ReplyArea::likeAnimationTarget() const {
+Ui::RpWidget *ReplyArea::likeAnimationTarget() const {
 	return _controls->likeAnimationTarget();
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.h b/Telegram/SourceFiles/media/stories/media_stories_reply.h
index 981cc48c14c114..461e58ce8b99ce 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "base/weak_ptr.h"
+#include "history/history_item_helpers.h"
 
 class History;
 enum class SendMediaType;
@@ -18,7 +19,12 @@ struct SendAction;
 struct SendOptions;
 } // namespace Api
 
+namespace Calls {
+class GroupCall;
+} // namespace Calls
+
 namespace Data {
+class GroupCall;
 struct ReactionId;
 } // namespace Data
 
@@ -44,6 +50,7 @@ struct Details;
 
 namespace Ui {
 struct PreparedList;
+struct PreparedBundle;
 class SendFilesWay;
 class RpWidget;
 } // namespace Ui
@@ -55,11 +62,18 @@ class Controller;
 struct ReplyAreaData {
 	PeerData *peer = nullptr;
 	StoryId id = 0;
+	std::shared_ptr<Data::GroupCall> videoStream;
 
 	friend inline auto operator<=>(ReplyAreaData, ReplyAreaData) = default;
 	friend inline bool operator==(ReplyAreaData, ReplyAreaData) = default;
 };
 
+enum class ReplyAreaType {
+	Reply,
+	Comment,
+	VideoStreamComment,
+};
+
 class ReplyArea final : public base::has_weak_ptr {
 public:
 	explicit ReplyArea(not_null<Controller*> controller);
@@ -78,7 +92,9 @@ class ReplyArea final : public base::has_weak_ptr {
 	[[nodiscard]] bool ignoreWindowMove(QPoint position) const;
 	void tryProcessKeyInput(not_null<QKeyEvent*> e);
 
-	[[nodiscard]] not_null<Ui::RpWidget*> likeAnimationTarget() const;
+	[[nodiscard]] Ui::RpWidget *likeAnimationTarget() const;
+
+	void updateVideoStream(not_null<Calls::GroupCall*> videoStream);
 
 private:
 	class Cant;
@@ -90,9 +106,13 @@ class ReplyArea final : public base::has_weak_ptr {
 
 	bool send(
 		Api::MessageToSend message,
-		Api::SendOptions options,
 		bool skipToast = false);
 
+	[[nodiscard]] bool checkSendPayment(
+		int messagesCount,
+		Api::SendOptions options,
+		Fn<void(int)> withPaymentApproved);
+
 	void uploadFile(const QByteArray &fileContent, SendMediaType type);
 	bool confirmSendingFiles(
 		QImage &&image,
@@ -107,15 +127,11 @@ class ReplyArea final : public base::has_weak_ptr {
 		std::optional<bool> overrideSendImagesAsPhotos,
 		const QString &insertTextOnCancel = QString());
 	bool showSendingFilesError(const Ui::PreparedList &list) const;
-	bool showSendingFilesError(
-		const Ui::PreparedList &list,
-		std::optional<bool> compress) const;
+	bool showSendingFilesError(const Ui::PreparedBundle &bundle) const;
+
 	void sendingFilesConfirmed(
-		Ui::PreparedList &&list,
-		Ui::SendFilesWay way,
-		TextWithTags &&caption,
-		Api::SendOptions options,
-		bool ctrlShiftEnter);
+		std::shared_ptr<Ui::PreparedBundle> bundle,
+		Api::SendOptions options);
 	void finishSending(bool skipToast = false);
 
 	bool sendExistingDocument(
@@ -127,10 +143,10 @@ class ReplyArea final : public base::has_weak_ptr {
 		not_null<PhotoData*> photo,
 		Api::SendOptions options);
 	void sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot);
 	void sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot,
 		Api::SendOptions options,
 		std::optional<MsgId> localMessageId);
@@ -141,16 +157,19 @@ class ReplyArea final : public base::has_weak_ptr {
 	[[nodiscard]] Api::SendAction prepareSendAction(
 		Api::SendOptions options) const;
 	void send(Api::SendOptions options);
-	void sendVoice(VoiceToSend &&data);
+	void sendVoice(const VoiceToSend &data);
 	void chooseAttach(std::optional<bool> overrideSendImagesAsPhotos);
 
 	[[nodiscard]] Fn<SendMenu::Details()> sendMenuDetails() const;
+	[[nodiscard]] rpl::producer<int> starsPerMessageValue() const;
 
 	void showPremiumToast(not_null<DocumentData*> emoji);
 	[[nodiscard]] bool showSlowmodeError();
 
 	const not_null<Controller*> _controller;
-	rpl::variable<bool> _isComment;
+	rpl::variable<ReplyAreaType> _type;
+	rpl::variable<int> _starsForMessage;
+	base::weak_ptr<Calls::GroupCall> _videoStream;
 
 	const std::unique_ptr<HistoryView::ComposeControls> _controls;
 	std::unique_ptr<Cant> _cant;
@@ -160,6 +179,8 @@ class ReplyArea final : public base::has_weak_ptr {
 	bool _chooseAttachRequest = false;
 	rpl::variable<bool> _choosingAttach;
 
+	SendPaymentHelper _sendPayment;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
index 4dfdd6a56aaa79..d157ab1cdf29b2 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
@@ -46,7 +46,7 @@ RepostView::RepostView(
 	}
 
 	_story->session().colorIndicesValue(
-	) | rpl::start_with_next([=](Ui::ColorIndicesCompressed &&indices) {
+	) | rpl::on_next([=](Ui::ColorIndicesCompressed &&indices) {
 		_colorIndices = std::move(indices);
 		if (_maxWidth) {
 			_controller->repaint();
@@ -105,7 +105,6 @@ void RepostView::draw(Painter &p, int x, int y, int availableWidth) {
 				crl::guard(this, [=] { _controller->repaint(); }));
 		}
 		ValidateBackgroundEmoji(
-			backgroundEmojiId,
 			backgroundEmoji,
 			backgroundEmojiCache,
 			cache);
@@ -115,7 +114,8 @@ void RepostView::draw(Painter &p, int x, int y, int availableWidth) {
 				p,
 				rect,
 				hasQuoteIcon,
-				*backgroundEmojiCache);
+				*backgroundEmojiCache,
+				backgroundEmoji->firstGiftFrame);
 		}
 	}
 	cache->bg = rippleColor;
@@ -240,21 +240,20 @@ void RepostView::recountDimensions() {
 	}
 
 	auto nameFull = TextWithEntities();
-	nameFull.append(HistoryView::Reply::PeerEmoji(owner, _sourcePeer));
+	nameFull.append(HistoryView::Reply::PeerEmoji(_sourcePeer));
 	nameFull.append(name);
-	auto context = Core::MarkedTextContext{
+	auto context = Core::TextContext({
 		.session = &_story->session(),
-		.customEmojiRepaint = [] {},
 		.customEmojiLoopLimit = 1,
-	};
+	});
 	_name.setMarkedText(
 		st::semiboldTextStyle,
 		nameFull,
 		Ui::NameTextOptions(),
 		context);
-	context.customEmojiRepaint = crl::guard(this, [=] {
+	context.repaint = crl::guard(this, [=] {
 		_controller->repaint();
-	}),
+	});
 	_text.setMarkedText(
 		st::defaultTextStyle,
 		text,
diff --git a/Telegram/SourceFiles/media/stories/media_stories_share.cpp b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
index 773239e0b582c5..8538759fec618c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_share.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_share.cpp
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 #include "boxes/share_box.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/data_channel.h"
 #include "data/data_chat_participant_status.h"
 #include "data/data_forum_topic.h"
 #include "data/data_histories.h"
@@ -22,10 +23,11 @@ For license and copyright information please follow this link:
 #include "data/data_thread.h"
 #include "data/data_user.h"
 #include "history/history.h"
-#include "history/history_item_helpers.h" // GetErrorTextForSending.
+#include "history/history_item_helpers.h" // GetErrorForSending.
 #include "history/view/history_view_context_menu.h" // CopyStoryLink.
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "settings/settings_credits_graphics.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/text/text_utilities.h"
 #include "styles/style_calls.h"
@@ -46,6 +48,10 @@ namespace Media::Stories {
 		return { nullptr };
 	}
 	const auto canCopyLink = story->hasDirectLink();
+	const auto shareJustLink = (story->call() != nullptr);
+	if (!canCopyLink && shareJustLink) {
+		return { nullptr };
+	}
 
 	auto copyCallback = [=] {
 		const auto story = resolve();
@@ -64,18 +70,25 @@ namespace Media::Stories {
 	const auto state = std::make_shared<State>();
 	auto filterCallback = [=](not_null<Data::Thread*> thread) {
 		if (const auto user = thread->peer()->asUser()) {
-			if (user->canSendIgnoreRequirePremium()) {
+			if (user->canSendIgnoreMoneyRestrictions()) {
 				return true;
 			}
 		}
+		if (shareJustLink) {
+			return ::Data::CanSend(thread, ChatRestriction::SendOther);
+		}
 		return Data::CanSend(thread, ChatRestriction::SendPhotos)
 			&& Data::CanSend(thread, ChatRestriction::SendVideos);
 	};
 	auto copyLinkCallback = canCopyLink
 		? Fn<void()>(std::move(copyCallback))
 		: Fn<void()>();
+	auto countMessagesCallback = [=](const TextWithTags &comment) {
+		return (shareJustLink || comment.text.isEmpty()) ? 1 : 2;
+	};
 	auto submitCallback = [=](
 			std::vector<not_null<Data::Thread*>> &&result,
+			Fn<bool()> checkPaid,
 			TextWithTags &&comment,
 			Api::SendOptions options,
 			Data::ForwardOptions forwardOptions) {
@@ -87,32 +100,41 @@ namespace Media::Stories {
 			return;
 		}
 		const auto peer = story->peer();
-		const auto error = [&] {
-			for (const auto thread : result) {
-				const auto error = GetErrorTextForSending(
-					thread,
-					{ .story = story, .text = &comment });
-				if (!error.isEmpty()) {
-					return std::make_pair(error, thread);
+		const auto error = GetErrorForSending(
+			result,
+			{ .story = shareJustLink ? nullptr : story, .text = &comment });
+		if (error.error) {
+			show->showBox(MakeSendErrorBox(error, result.size() > 1));
+			return;
+		} else if (!checkPaid()) {
+			return;
+		} else if (shareJustLink) {
+			const auto url = session->api().exportDirectStoryLink(story);
+			if (!comment.text.isEmpty()) {
+				comment.text = url + "\n" + comment.text;
+				const auto add = url.size() + 1;
+				for (auto &tag : comment.tags) {
+					tag.offset += add;
 				}
+			} else {
+				comment.text = url;
 			}
-			return std::make_pair(QString(), result.front());
-		}();
-		if (!error.first.isEmpty()) {
-			auto text = TextWithEntities();
-			if (result.size() > 1) {
-				text.append(
-					Ui::Text::Bold(error.second->chatListName())
-				).append("\n\n");
+			auto &api = show->session().api();
+			for (const auto &thread : result) {
+				auto message = Api::MessageToSend(
+					Api::SendAction(thread, options));
+				message.textWithTags = comment;
+				message.action.clearDraft = false;
+				api.sendMessage(std::move(message));
 			}
-			text.append(error.first);
-			show->showBox(Ui::MakeInformBox(text));
+			show->showToast(tr::lng_share_done(tr::now));
+			show->hideLayer();
 			return;
 		}
 
-		const auto api = &story->owner().session().api();
+		const auto api = &story->session().api();
 		auto &histories = story->owner().histories();
-		for (const auto thread : result) {
+		for (const auto &thread : result) {
 			const auto action = Api::SendAction(thread, options);
 			if (!comment.text.isEmpty()) {
 				auto message = Api::MessageToSend(action);
@@ -124,25 +146,39 @@ namespace Media::Stories {
 			const auto threadPeer = thread->peer();
 			const auto threadHistory = thread->owningHistory();
 			const auto randomId = base::RandomValue<uint64>();
-			auto sendFlags = MTPmessages_SendMedia::Flags(0);
+			using SendFlag = MTPmessages_SendMedia::Flag;
+			auto sendFlags = SendFlag(0) | SendFlag(0);
 			if (action.replyTo) {
-				sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to;
+				sendFlags |= SendFlag::f_reply_to;
 			}
 			const auto silentPost = ShouldSendSilent(threadPeer, options);
 			if (silentPost) {
-				sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
+				sendFlags |= SendFlag::f_silent;
 			}
 			if (options.scheduled) {
-				sendFlags |= MTPmessages_SendMedia::Flag::f_schedule_date;
+				sendFlags |= SendFlag::f_schedule_date;
+				if (options.scheduleRepeatPeriod) {
+					sendFlags |= SendFlag::f_schedule_repeat_period;
+				}
 			}
 			if (options.shortcutId) {
-				sendFlags |= MTPmessages_SendMedia::Flag::f_quick_reply_shortcut;
+				sendFlags |= SendFlag::f_quick_reply_shortcut;
 			}
 			if (options.effectId) {
-				sendFlags |= MTPmessages_SendMedia::Flag::f_effect;
+				sendFlags |= SendFlag::f_effect;
+			}
+			if (options.suggest) {
+				sendFlags |= SendFlag::f_suggested_post;
 			}
 			if (options.invertCaption) {
-				sendFlags |= MTPmessages_SendMedia::Flag::f_invert_media;
+				sendFlags |= SendFlag::f_invert_media;
+			}
+			const auto starsPaid = std::min(
+				threadHistory->peer->starsPerMessageChecked(),
+				options.starsApproved);
+			if (starsPaid) {
+				options.starsApproved -= starsPaid;
+				sendFlags |= SendFlag::f_allow_paid_stars;
 			}
 			const auto done = [=] {
 				if (!--state->requests) {
@@ -158,17 +194,20 @@ namespace Media::Stories {
 				randomId,
 				Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 					MTP_flags(sendFlags),
-					threadPeer->input,
+					threadPeer->input(),
 					Data::Histories::ReplyToPlaceholder(),
-					MTP_inputMediaStory(peer->input, MTP_int(id.story)),
+					MTP_inputMediaStory(peer->input(), MTP_int(id.story)),
 					MTPstring(),
 					MTP_long(randomId),
 					MTPReplyMarkup(),
 					MTPVector<MTPMessageEntity>(),
 					MTP_int(options.scheduled),
+					MTP_int(options.scheduleRepeatPeriod),
 					MTP_inputPeerEmpty(),
 					Data::ShortcutIdToMTP(session, options.shortcutId),
-					MTP_long(options.effectId)
+					MTP_long(options.effectId),
+					MTP_long(starsPaid),
+					Api::SuggestToMTP(options.suggest)
 				), [=](
 						const MTPUpdates &result,
 						const MTP::Response &response) {
@@ -182,36 +221,99 @@ namespace Media::Stories {
 			++state->requests;
 		}
 	};
+	const auto st = viewerStyle
+		? ::Settings::DarkCreditsEntryBoxStyle()
+		: ::Settings::CreditsEntryBoxStyleOverrides();
+	return Box<ShareBox>(ShareBox::Descriptor{
+		.session = session,
+		.copyCallback = std::move(copyLinkCallback),
+		.countMessagesCallback = std::move(countMessagesCallback),
+		.submitCallback = std::move(submitCallback),
+		.filterCallback = std::move(filterCallback),
+		.st = st.shareBox ? *st.shareBox : ShareBoxStyleOverrides(),
+		.moneyRestrictionError = ShareMessageMoneyRestrictionError(),
+	});
+}
 
-	const auto viewerScheduleStyle = [&] {
-		auto date = Ui::ChooseDateTimeStyleArgs();
-		date.labelStyle = &st::groupCallBoxLabel;
-		date.dateFieldStyle = &st::groupCallScheduleDateField;
-		date.timeFieldStyle = &st::groupCallScheduleTimeField;
-		date.separatorStyle = &st::callMuteButtonLabel;
-		date.atStyle = &st::callMuteButtonLabel;
-		date.calendarStyle = &st::groupCallCalendarColors;
+QString FormatShareAtTime(TimeId seconds) {
+	const auto minutes = seconds / 60;
+	const auto h = minutes / 60;
+	const auto m = minutes % 60;
+	const auto s = seconds % 60;
+	const auto zero = QChar('0');
+	return h
+		? u"%1:%2:%3"_q.arg(h).arg(m, 2, 10, zero).arg(s, 2, 10, zero)
+		: u"%1:%2"_q.arg(m).arg(s, 2, 10, zero);
+}
 
-		auto st = HistoryView::ScheduleBoxStyleArgs();
-		st.topButtonStyle = &st::groupCallMenuToggle;
-		st.popupMenuStyle = &st::groupCallPopupMenu;
-		st.chooseDateTimeArgs = std::move(date);
-		return st;
+object_ptr<Ui::BoxContent> PrepareShareAtTimeBox(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<HistoryItem*> item,
+		TimeId videoTimestamp) {
+	const auto id = item->fullId();
+	const auto history = item->history();
+	const auto owner = &history->owner();
+	const auto session = &history->session();
+	const auto canCopyLink = item->hasDirectLink()
+		&& history->peer->isBroadcast()
+		&& history->peer->asBroadcast()->hasUsername();
+	const auto hasCaptions = item->media()
+		&& !item->originalText().text.isEmpty()
+		&& item->media()->allowsEditCaption();
+	const auto hasOnlyForcedForwardedInfo = !hasCaptions
+		&& item->media()
+		&& item->media()->forceForwardedInfo();
+
+	auto copyCallback = [=] {
+		const auto item = owner->message(id);
+		if (!item) {
+			return;
+		}
+		CopyPostLink(
+			show,
+			item->fullId(),
+			HistoryView::Context::History,
+			videoTimestamp);
 	};
 
+	const auto requiredRight = item->requiredSendRight();
+	const auto requiresInline = item->requiresSendInlineRight();
+	auto filterCallback = [=](not_null<Data::Thread*> thread) {
+		if (const auto user = thread->peer()->asUser()) {
+			if (user->canSendIgnoreMoneyRestrictions()) {
+				return true;
+			}
+		}
+		return Data::CanSend(thread, requiredRight)
+			&& (!requiresInline
+				|| Data::CanSend(thread, ChatRestriction::SendInline));
+	};
+	auto copyLinkCallback = canCopyLink
+		? Fn<void()>(std::move(copyCallback))
+		: Fn<void()>();
+	const auto st = ::Settings::DarkCreditsEntryBoxStyle();
 	return Box<ShareBox>(ShareBox::Descriptor{
 		.session = session,
 		.copyCallback = std::move(copyLinkCallback),
-		.submitCallback = std::move(submitCallback),
+		.countMessagesCallback = ShareBox::DefaultForwardCountMessages(
+			history,
+			{ id }),
+		.submitCallback = ShareBox::DefaultForwardCallback(
+			show,
+			history,
+			{ id },
+			videoTimestamp),
 		.filterCallback = std::move(filterCallback),
-		.stMultiSelect = viewerStyle ? &st::groupCallMultiSelect : nullptr,
-		.stComment = viewerStyle ? &st::groupCallShareBoxComment : nullptr,
-		.st = viewerStyle ? &st::groupCallShareBoxList : nullptr,
-		.stLabel = viewerStyle ? &st::groupCallField : nullptr,
-		.scheduleBoxStyle = (viewerStyle
-			? viewerScheduleStyle()
-			: HistoryView::ScheduleBoxStyleArgs()),
-		.premiumRequiredError = SharePremiumRequiredError(),
+		.titleOverride = tr::lng_share_at_time_title(
+			lt_time,
+			rpl::single(FormatShareAtTime(videoTimestamp))),
+		.st = st.shareBox ? *st.shareBox : ShareBoxStyleOverrides(),
+		.forwardOptions = {
+			.sendersCount = ItemsForwardSendersCount({ item }),
+			.captionsCount = ItemsForwardCaptionsCount({ item }),
+			.show = !hasOnlyForcedForwardedInfo,
+		},
+		.moneyRestrictionError = ShareMessageMoneyRestrictionError(),
 	});
 }
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_share.h b/Telegram/SourceFiles/media/stories/media_stories_share.h
index efb633930ce1d0..c7149b0ca980a8 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_share.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_share.h
@@ -24,4 +24,11 @@ namespace Media::Stories {
 	FullStoryId id,
 	bool viewerStyle = false);
 
+[[nodiscard]] QString FormatShareAtTime(TimeId seconds);
+
+[[nodiscard]] object_ptr<Ui::BoxContent> PrepareShareAtTimeBox(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<HistoryItem*> item,
+	TimeId videoTimestamp);
+
 } // namespace Media::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
index 6e4947ece53803..637110a7b3b185 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_sibling.cpp
@@ -128,7 +128,7 @@ QImage Sibling::LoaderPhoto::good() {
 		return image->original();
 	} else if (!_waitingLoading) {
 		_photo->session().downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (_media->loaded()) {
 				_update();
 			}
@@ -184,7 +184,7 @@ void Sibling::LoaderVideo::createStreamedPlayer() {
 		[] {}); // waitingCallback
 	_streamed->lockPlayer();
 	_streamed->player().updates(
-	) | rpl::start_with_next_error([=](Streaming::Update &&update) {
+	) | rpl::on_next_error([=](Streaming::Update &&update) {
 		v::match(update.data, [&](Streaming::Information &update) {
 			_update();
 		}, [](const auto &update) {
@@ -219,7 +219,7 @@ void Sibling::LoaderVideo::waitForGoodThumbnail() {
 			if (const auto strong = weak.get()) {
 				if (!strong->updateAfterGoodCheck()) {
 					strong->_video->session().downloaderTaskFinished(
-					) | rpl::start_with_next([=] {
+					) | rpl::on_next([=] {
 						strong->updateAfterGoodCheck();
 					}, strong->_waitingGoodGeneration);
 				}
@@ -275,6 +275,8 @@ void Sibling::checkStory() {
 		_loader = std::make_unique<LoaderVideo>(document, origin, [=] {
 			check();
 		});
+	}, [&](const std::shared_ptr<Data::GroupCall> &call) {
+		_loader = nullptr;
 	}, [&](v::null_t) {
 		_loader = nullptr;
 	});
@@ -352,7 +354,7 @@ QImage Sibling::nameImage(const SiblingLayout &layout) {
 		const auto family = 0; // Default font family.
 		const auto font = style::font(
 			_nameFontSize,
-			style::FontFlag::Semibold,
+			style::FontFlag::Bold,
 			family);
 		_name.reset();
 		_nameStyle = std::make_unique<style::TextStyle>(style::TextStyle{
diff --git a/Telegram/SourceFiles/media/stories/media_stories_slider.cpp b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
index 53f39c1adf32ba..81697eaa2c990f 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_slider.cpp
@@ -49,14 +49,15 @@ void Slider::show(SliderData data) {
 
 	raw->widthValue() | rpl::filter([=](int width) {
 		return (width >= st::storiesSliderWidth);
-	}) | rpl::start_with_next([=](int width) {
+	}) | rpl::on_next([=](int width) {
 		layout(width);
 	}, raw->lifetime());
 
 	raw->paintRequest(
 	) | rpl::filter([=] {
-		return (raw->width() >= st::storiesSliderWidth);
-	}) | rpl::start_with_next([=](QRect clip) {
+		return !_data.videoStream
+			&& (raw->width() >= st::storiesSliderWidth);
+	}) | rpl::on_next([=](QRect clip) {
 		paint(QRectF(clip));
 	}, raw->lifetime());
 
@@ -68,7 +69,7 @@ void Slider::show(SliderData data) {
 	});
 
 	_controller->layoutValue(
-	) | rpl::start_with_next([=](const Layout &layout) {
+	) | rpl::on_next([=](const Layout &layout) {
 		raw->setGeometry(layout.slider - st::storiesSliderMargin);
 	}, raw->lifetime());
 }
@@ -126,21 +127,24 @@ void Slider::paint(QRectF clip) {
 		} else if (i == _data.index) {
 			const auto progress = _progress->value();
 			const auto full = _rects[i].width();
-			const auto min = _rects[i].height();
+			const auto height = _rects[i].height();
+			const auto min = height;
 			const auto activeWidth = std::max(full * progress, min);
 			const auto inactiveWidth = full - activeWidth + min;
 			const auto activeLeft = _rects[i].left();
 			const auto inactiveLeft = activeLeft + activeWidth - min;
 			p.setOpacity(kOpacityInactive);
 			p.drawRoundedRect(
-				QRectF(inactiveLeft, 0, inactiveWidth, min),
-				radius,
-				radius);
-			p.setOpacity(kOpacityActive);
-			p.drawRoundedRect(
-				QRectF(activeLeft, 0, activeWidth, min),
+				QRectF(inactiveLeft, 0, inactiveWidth, height),
 				radius,
 				radius);
+			if (activeWidth > 0.) {
+				p.setOpacity(kOpacityActive);
+				p.drawRoundedRect(
+					QRectF(activeLeft, 0, activeWidth, height),
+					radius,
+					radius);
+			}
 		} else {
 			p.setOpacity((i < _data.index)
 				? kOpacityActive
diff --git a/Telegram/SourceFiles/media/stories/media_stories_slider.h b/Telegram/SourceFiles/media/stories/media_stories_slider.h
index 37d1c71ec192b3..37dbca0504c342 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_slider.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_slider.h
@@ -26,6 +26,7 @@ class Controller;
 struct SliderData {
 	int index = 0;
 	int total = 0;
+	bool videoStream = false;
 
 	friend inline auto operator<=>(SliderData, SliderData) = default;
 	friend inline bool operator==(SliderData, SliderData) = default;
diff --git a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
index 3578e3fb0b3603..10c4c05ef4f908 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
@@ -17,16 +17,21 @@ For license and copyright information please follow this link:
 #include "info/profile/info_profile_icon.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
+#include "ui/controls/feature_list.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/painter.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "styles/style_media_view.h"
+#include "styles/style_media_stories.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 
 namespace Media::Stories {
 namespace {
@@ -38,12 +43,7 @@ struct State {
 	Data::StealthMode mode;
 	TimeId now = 0;
 	bool premium = false;
-};
-
-struct Feature {
-	const style::icon &icon;
-	QString title;
-	TextWithEntities about;
+	bool hasCallback = false;
 };
 
 [[nodiscard]] Ui::Toast::Config ToastAlready(TimeId left) {
@@ -53,7 +53,7 @@ struct Feature {
 			tr::now,
 			lt_left,
 			TextWithEntities{ TimeLeftText(left) },
-			Ui::Text::RichLangValue),
+			tr::rich),
 		.st = &st::storiesStealthToast,
 		.adaptive = true,
 		.duration = kAlreadyToastDuration,
@@ -65,7 +65,7 @@ struct Feature {
 		.title = tr::lng_stealth_mode_enabled_tip_title(tr::now),
 		.text = tr::lng_stealth_mode_enabled_tip(
 			tr::now,
-			Ui::Text::RichLangValue),
+			tr::rich),
 		.st = &st::storiesStealthToast,
 		.adaptive = true,
 		.duration = kAlreadyToastDuration,
@@ -76,7 +76,7 @@ struct Feature {
 	return {
 		.text = tr::lng_stealth_mode_cooldown_tip(
 			tr::now,
-			Ui::Text::RichLangValue),
+			tr::rich),
 		.st = &st::storiesStealthToast,
 		.adaptive = true,
 		.duration = kAlreadyToastDuration,
@@ -84,11 +84,12 @@ struct Feature {
 }
 
 [[nodiscard]] rpl::producer<State> StateValue(
-		not_null<Main::Session*> session) {
+		not_null<Main::Session*> session,
+		bool hasCallback = false) {
 	return rpl::combine(
 		session->data().stories().stealthModeValue(),
 		Data::AmPremiumValue(session)
-	) | rpl::map([](Data::StealthMode mode, bool premium) {
+	) | rpl::map([=](Data::StealthMode mode, bool premium) {
 		return rpl::make_producer<State>([=](auto consumer) {
 			struct Info {
 				base::Timer timer;
@@ -121,7 +122,8 @@ struct Feature {
 					info->timer.callOnce(left * crl::time(1000));
 				}
 				if (send) {
-					consumer.put_next(State{ mode, now, premium });
+					consumer.put_next(
+						State{ mode, now, premium, hasCallback });
 				}
 				if (left <= 0) {
 					consumer.put_done();
@@ -134,25 +136,29 @@ struct Feature {
 	}) | rpl::flatten_latest();
 }
 
-[[nodiscard]] Feature FeaturePast() {
+[[nodiscard]] Ui::FeatureListEntry FeaturePast(
+		const style::StealthBoxStyle &st) {
 	return {
-		.icon = st::storiesStealthFeaturePastIcon,
+		.icon = st.featurePastIcon,
 		.title = tr::lng_stealth_mode_past_title(tr::now),
 		.about = { tr::lng_stealth_mode_past_about(tr::now) },
 	};
 }
 
-[[nodiscard]] Feature FeatureNext() {
+[[nodiscard]] Ui::FeatureListEntry FeatureNext(
+		const style::StealthBoxStyle &st) {
 	return {
-		.icon = st::storiesStealthFeatureNextIcon,
+		.icon = st.featureNextIcon,
 		.title = tr::lng_stealth_mode_next_title(tr::now),
 		.about = { tr::lng_stealth_mode_next_about(tr::now) },
 	};
 }
 
-[[nodiscard]] object_ptr<Ui::RpWidget> MakeLogo(QWidget *parent) {
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeLogo(
+		QWidget *parent,
+		const style::StealthBoxStyle &st) {
 	const auto add = st::storiesStealthLogoAdd;
-	const auto icon = &st::storiesStealthLogoIcon;
+	const auto icon = &st.logoIcon;
 	const auto size = QSize(2 * add, 2 * add) + icon->size();
 	auto result = object_ptr<Ui::PaddingWrap<Ui::RpWidget>>(
 		parent,
@@ -161,10 +167,10 @@ struct Feature {
 	const auto inner = result->entity();
 	inner->resize(size);
 	inner->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=, &st] {
 		auto p = QPainter(inner);
 		auto hq = PainterHighQualityEnabler(p);
-		p.setBrush(st::storiesComposeBlue);
+		p.setBrush(st.logoBg);
 		p.setPen(Qt::NoPen);
 		const auto left = (inner->width() - size.width()) / 2;
 		const auto top = (inner->height() - size.height()) / 2;
@@ -175,19 +181,22 @@ struct Feature {
 	return result;
 }
 
-[[nodiscard]] object_ptr<Ui::RpWidget> MakeTitle(QWidget *parent) {
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeTitle(
+		QWidget *parent,
+		const style::StealthBoxStyle &st) {
 	return object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
 		parent,
 		object_ptr<Ui::FlatLabel>(
 			parent,
 			tr::lng_stealth_mode_title(tr::now),
-			st::storiesStealthBox.title),
+			st.box.title),
 		st::storiesStealthTitleMargin);
 }
 
 [[nodiscard]] object_ptr<Ui::RpWidget> MakeAbout(
 		QWidget *parent,
-		rpl::producer<State> state) {
+		rpl::producer<State> state,
+		const style::StealthBoxStyle &st) {
 	auto text = std::move(state) | rpl::map([](const State &state) {
 		return state.premium
 			? tr::lng_stealth_mode_about(tr::now)
@@ -198,57 +207,21 @@ struct Feature {
 		object_ptr<Ui::FlatLabel>(
 			parent,
 			std::move(text),
-			st::storiesStealthAbout),
+			st.about),
 		st::storiesStealthAboutMargin);
 }
 
-[[nodiscard]] object_ptr<Ui::RpWidget> MakeFeature(
-		QWidget *parent,
-		Feature feature) {
-	auto result = object_ptr<Ui::PaddingWrap<>>(
-		parent,
-		object_ptr<Ui::RpWidget>(parent),
-		st::storiesStealthFeatureMargin);
-	const auto widget = result->entity();
-	const auto icon = Ui::CreateChild<Info::Profile::FloatingIcon>(
-		widget,
-		feature.icon,
-		st::storiesStealthFeatureIconPosition);
-	const auto title = Ui::CreateChild<Ui::FlatLabel>(
-		widget,
-		feature.title,
-		st::storiesStealthFeatureTitle);
-	const auto about = Ui::CreateChild<Ui::FlatLabel>(
-		widget,
-		rpl::single(feature.about),
-		st::storiesStealthFeatureAbout);
-	icon->show();
-	title->show();
-	about->show();
-	widget->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		const auto left = st::storiesStealthFeatureLabelLeft;
-		const auto available = width - left;
-		title->resizeToWidth(available);
-		about->resizeToWidth(available);
-		auto top = 0;
-		title->move(left, top);
-		top += title->height() + st::storiesStealthFeatureSkip;
-		about->move(left, top);
-		top += about->height();
-		widget->resize(width, top);
-	}, widget->lifetime());
-	return result;
-}
-
 [[nodiscard]] object_ptr<Ui::RoundButton> MakeButton(
 		QWidget *parent,
-		rpl::producer<State> state) {
+		rpl::producer<State> state,
+		const style::StealthBoxStyle &st) {
 	auto text = rpl::duplicate(state) | rpl::map([](const State &state) {
 		if (!state.premium) {
 			return tr::lng_stealth_mode_unlock();
 		} else if (state.mode.cooldownTill <= state.now) {
-			return tr::lng_stealth_mode_enable();
+			return state.hasCallback
+				? tr::lng_stealth_mode_enable_and_open()
+				: tr::lng_stealth_mode_enable();
 		}
 		return rpl::single(
 			rpl::empty
@@ -261,38 +234,39 @@ struct Feature {
 				tr::now,
 				lt_left,
 				TimeLeftText(left));
-		}) | rpl::type_erased();
+		}) | rpl::type_erased;
 	}) | rpl::flatten_latest();
 
 	auto result = object_ptr<Ui::RoundButton>(
 		parent,
 		rpl::single(QString()),
-		st::storiesStealthBox.button);
+		st.box.button);
 	const auto raw = result.data();
+	raw->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
 		raw,
 		std::move(text),
-		st::storiesStealthButtonLabel);
+		st.buttonLabel);
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
 	label->show();
 
 	const auto lock = Ui::CreateChild<Ui::RpWidget>(raw);
 	lock->setAttribute(Qt::WA_TransparentForMouseEvents);
-	lock->resize(st::storiesStealthLockIcon.size());
+	lock->resize(st.lockIcon.size());
 	lock->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=, &st] {
 		auto p = QPainter(lock);
-		st::storiesStealthLockIcon.paintInCenter(p, lock->rect());
+		st.lockIcon.paintInCenter(p, lock->rect());
 	}, lock->lifetime());
 
-	const auto lockLeft = -st::storiesStealthButtonLabel.style.font->height;
-	const auto updateLabelLockGeometry = [=] {
+	const auto lockLeft = -st.buttonLabel.style.font->height;
+	const auto updateLabelLockGeometry = [=, &st] {
 		const auto outer = raw->width();
-		const auto added = -st::storiesStealthBox.button.width;
+		const auto added = -st.box.button.width;
 		const auto skip = lock->isHidden() ? 0 : (lockLeft + lock->width());
 		const auto width = outer - added - skip;
-		const auto top = st::storiesStealthBox.button.textTop;
+		const auto top = st.box.button.textTop;
 		label->resizeToWidth(width);
 		label->move(added / 2, top);
 		const auto inner = std::min(label->textMaxWidth(), width);
@@ -301,7 +275,7 @@ struct Feature {
 		lock->move(right + lockLeft, top + lockTop);
 	};
 
-	std::move(state) | rpl::start_with_next([=](const State &state) {
+	std::move(state) | rpl::on_next([=](const State &state) {
 		const auto cooldown = state.premium
 			&& (state.mode.cooldownTill > state.now);
 		label->setOpacity(cooldown ? kCooldownButtonLabelOpacity : 1.);
@@ -310,39 +284,49 @@ struct Feature {
 	}, label->lifetime());
 
 	raw->widthValue(
-	) | rpl::start_with_next(updateLabelLockGeometry, label->lifetime());
+	) | rpl::on_next(updateLabelLockGeometry, label->lifetime());
 
 	return result;
 }
 
 [[nodiscard]] object_ptr<Ui::BoxContent> StealthModeBox(
-		std::shared_ptr<ChatHelpers::Show> show) {
+		std::shared_ptr<ChatHelpers::Show> show,
+		Fn<void()> onActivated,
+		const style::StealthBoxStyle &st) {
 	return Box([=](not_null<Ui::GenericBox*> box) {
 		struct Data {
 			rpl::variable<State> state;
 			bool requested = false;
 		};
 		const auto data = box->lifetime().make_state<Data>();
-		data->state = StateValue(&show->session());
+		data->state = StateValue(&show->session(), onActivated != nullptr);
 		box->setWidth(st::boxWideWidth);
-		box->setStyle(st::storiesStealthBox);
-		box->addRow(MakeLogo(box));
-		box->addRow(MakeTitle(box));
-		box->addRow(MakeAbout(box, data->state.value()));
-		box->addRow(MakeFeature(box, FeaturePast()));
+		box->setStyle(st.box);
+		box->addRow(MakeLogo(box, st));
+		box->addRow(MakeTitle(box, st), style::al_top);
+		box->addRow(MakeAbout(box, data->state.value(), st), style::al_top);
+		const auto make = [&](const Ui::FeatureListEntry &entry) {
+			return Ui::MakeFeatureListEntry(
+				box,
+				entry,
+				{},
+				st.featureTitle,
+				st.featureAbout);
+		};
+		box->addRow(make(FeaturePast(st)));
 		box->addRow(
-			MakeFeature(box, FeatureNext()),
+			make(FeatureNext(st)),
 			(st::boxRowPadding
 				+ QMargins(0, 0, 0, st::storiesStealthBoxBottom)));
 		box->setNoContentMargin(true);
-		box->addTopButton(st::storiesStealthBoxClose, [=] {
+		box->addTopButton(st.boxClose, [=] {
 			box->closeBox();
 		});
 		const auto button = box->addButton(
-			MakeButton(box, data->state.value()));
+			MakeButton(box, data->state.value(), st));
 		button->resizeToWidth(st::boxWideWidth
-			- st::storiesStealthBox.buttonPadding.left()
-			- st::storiesStealthBox.buttonPadding.right());
+			- st.box.buttonPadding.left()
+			- st.box.buttonPadding.right());
 		button->setClickedCallback([=] {
 			const auto now = data->state.current();
 			if (now.mode.enabledTill > now.now) {
@@ -350,8 +334,7 @@ struct Feature {
 				box->closeBox();
 			} else if (!now.premium) {
 				data->requested = false;
-				const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
-				if (const auto window = show->resolveWindow(usage)) {
+				if (const auto window = show->resolveWindow()) {
 					ShowPremiumPreviewBox(window, PremiumFeature::Stories);
 					window->window().activate();
 				}
@@ -366,25 +349,60 @@ struct Feature {
 		});
 		data->state.value() | rpl::filter([](const State &state) {
 			return state.mode.enabledTill > state.now;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			box->closeBox();
 			show->showToast(ToastActivated());
+			if (onActivated) {
+				onActivated();
+			}
 		}, box->lifetime());
 	});
 }
 
 } // namespace
 
-void SetupStealthMode(std::shared_ptr<ChatHelpers::Show> show) {
+void SetupStealthMode(
+		std::shared_ptr<ChatHelpers::Show> show,
+		StealthModeDescriptor descriptor) {
+	const auto onActivated = descriptor.onActivated;
+	const auto st = descriptor.st;
 	const auto now = base::unixtime::now();
 	const auto mode = show->session().data().stories().stealthMode();
 	if (const auto left = mode.enabledTill - now; left > 0) {
 		show->showToast(ToastAlready(left));
+		if (onActivated) {
+			onActivated();
+		}
 	} else {
-		show->show(StealthModeBox(show));
+		const auto &style = st ? *st : st::storiesStealthStyle;
+		show->show(StealthModeBox(show, onActivated, style));
 	}
 }
 
+void AddStealthModeMenu(
+		const Ui::Menu::MenuCallback &add,
+		not_null<PeerData*> peer,
+		not_null<Window::SessionController*> controller) {
+	if (!peer->session().premiumPossible() || !peer->isUser()) {
+		return;
+	}
+	const auto now = base::unixtime::now();
+	const auto stealth = peer->owner().stories().stealthMode();
+	add(
+		tr::lng_stories_view_anonymously(tr::now),
+		[=] {
+			SetupStealthMode(
+				controller->uiShow(),
+				StealthModeDescriptor{
+					[=] { controller->openPeerStories(peer->id); },
+					&st::storiesStealthStyleDefault,
+				});
+		},
+		((peer->session().premium() || (stealth.enabledTill > now))
+			? &st::menuIconStealth
+			: &st::menuIconStealthLocked));
+}
+
 QString TimeLeftText(int left) {
 	Expects(left >= 0);
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_stealth.h b/Telegram/SourceFiles/media/stories/media_stories_stealth.h
index f40b77bc488ac9..9c1d69b4767790 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_stealth.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_stealth.h
@@ -7,13 +7,37 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+namespace style {
+struct StealthBoxStyle;
+} // namespace style
+
 namespace ChatHelpers {
 class Show;
 } // namespace ChatHelpers
 
+namespace Ui::Menu {
+struct MenuCallback;
+} // namespace Ui::Menu
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
 namespace Media::Stories {
 
-void SetupStealthMode(std::shared_ptr<ChatHelpers::Show> show);
+struct StealthModeDescriptor {
+	Fn<void()> onActivated = nullptr;
+	const style::StealthBoxStyle *st = nullptr;
+};
+
+void SetupStealthMode(
+	std::shared_ptr<ChatHelpers::Show> show,
+	StealthModeDescriptor descriptor = {});
+
+void AddStealthModeMenu(
+	const Ui::Menu::MenuCallback &add,
+	not_null<PeerData*> peer,
+	not_null<Window::SessionController*> controller);
 
 [[nodiscard]] QString TimeLeftText(int left);
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
index 73bd57e9328eb6..8fe4a5de24fd67 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "media/stories/media_stories_view.h"
 
 #include "data/data_file_origin.h"
+#include "history/view/controls/compose_controls_common.h"
 #include "media/stories/media_stories_controller.h"
 #include "media/stories/media_stories_delegate.h"
 #include "media/stories/media_stories_header.h"
@@ -174,6 +175,18 @@ std::shared_ptr<ChatHelpers::Show> View::uiShow() const {
 	return _controller->uiShow();
 }
 
+
+void View::updateVideoStream(not_null<Calls::GroupCall*> videoStream) {
+	_controller->updateVideoStream(videoStream);
+}
+
+rpl::producer<bool> View::commentsShownValue() const {
+	return _controller->commentsStateValue(
+	) | rpl::map([=](CommentsState state) {
+		return (state == CommentsState::Shown);
+	}) | rpl::distinct_until_changed();
+}
+
 rpl::lifetime &View::lifetime() {
 	return _controller->lifetime();
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_view.h b/Telegram/SourceFiles/media/stories/media_stories_view.h
index 9436841d363093..0f3e59e99503aa 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_view.h
+++ b/Telegram/SourceFiles/media/stories/media_stories_view.h
@@ -9,6 +9,10 @@ For license and copyright information please follow this link:
 
 class ClickHandlerHost;
 
+namespace Calls {
+class GroupCall;
+} // namespace Calls
+
 namespace ChatHelpers {
 class Show;
 } // namespace ChatHelpers
@@ -131,6 +135,9 @@ class View final {
 
 	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() const;
 
+	void updateVideoStream(not_null<Calls::GroupCall*> videoStream);
+	[[nodiscard]] rpl::producer<bool> commentsShownValue() const;
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_audio_track.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_audio_track.cpp
index ff18b6777c67ab..7d89c447fccd87 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_audio_track.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_audio_track.cpp
@@ -197,7 +197,7 @@ rpl::producer<crl::time> AudioTrack::playPosition() {
 
 	if (!_subscription) {
 		_subscription = Media::Player::Updated(
-		) | rpl::start_with_next([=](const AudioMsgId &id) {
+		) | rpl::on_next([=](const AudioMsgId &id) {
 			using State = Media::Player::State;
 			if (id != _audioId) {
 				return;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_common.h b/Telegram/SourceFiles/media/streaming/media_streaming_common.h
index f91afead259601..567e09fb7ab5a5 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_common.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_common.h
@@ -23,6 +23,8 @@ bool SupportsSpeedControl();
 
 namespace Streaming {
 
+inline constexpr auto kMaxFrameArea = 3840 * 2160;
+
 inline bool SupportsSpeedControl() {
 	return Media::Audio::SupportsSpeedControl();
 }
@@ -59,8 +61,10 @@ struct TrackState {
 struct VideoInformation {
 	TrackState state;
 	QSize size;
+	QSize realSize;
 	QImage cover;
 	int rotation = 0;
+	float64 fps = 0.;
 	bool alpha = false;
 };
 
@@ -93,6 +97,11 @@ struct WaitingForData {
 	bool waiting = false;
 };
 
+struct SpeedEstimate {
+	int bytesPerSecond = 0;
+	bool unreliable = false;
+};
+
 struct MutedByOther {
 };
 
@@ -107,6 +116,7 @@ struct Update {
 		PreloadedAudio,
 		UpdateAudio,
 		WaitingForData,
+		SpeedEstimate,
 		MutedByOther,
 		Finished> data;
 };
@@ -167,6 +177,7 @@ enum class FrameFormat {
 	ARGB32,
 	YUV420,
 	NV12,
+	NativeTexture,
 };
 
 struct FrameChannel {
@@ -182,9 +193,16 @@ struct FrameYUV {
 	FrameChannel v;
 };
 
+struct NativeFrame {
+	void *pixelBuffer = nullptr;
+	QSize size;
+	QSize chromaSize;
+};
+
 struct FrameWithInfo {
 	QImage image;
 	FrameYUV *yuv = nullptr;
+	NativeFrame *nativeFrame = nullptr;
 	FrameFormat format = FrameFormat::None;
 	int index = -1;
 	bool alpha = false;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
index 27c090443da55b..abe2a7a9c1e258 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_document.cpp
@@ -29,45 +29,51 @@ constexpr auto kWaitingFastDuration = crl::time(200);
 constexpr auto kWaitingShowDuration = crl::time(500);
 constexpr auto kWaitingShowDelay = crl::time(500);
 constexpr auto kGoodThumbQuality = 87;
+constexpr auto kSwitchQualityUpPreloadedThreshold = 4 * crl::time(1000);
+constexpr auto kSwitchQualityUpSpeedMultiplier = 1.2;
 
 } // namespace
 
 Document::Document(
 	not_null<DocumentData*> document,
-	std::shared_ptr<Reader> reader)
-: Document(std::move(reader), document, nullptr) {
+	std::shared_ptr<Reader> reader,
+	std::vector<QualityDescriptor> otherQualities)
+: Document(std::move(reader), document, {}, std::move(otherQualities)) {
 	_player.fullInCache(
-	) | rpl::start_with_next([=](bool fullInCache) {
+	) | rpl::on_next([=](bool fullInCache) {
 		_document->setLoadedInMediaCache(fullInCache);
 	}, _player.lifetime());
 }
 
 Document::Document(
 	not_null<PhotoData*> photo,
-	std::shared_ptr<Reader> reader)
-: Document(std::move(reader), nullptr, photo) {
+	std::shared_ptr<Reader> reader,
+	std::vector<QualityDescriptor> otherQualities)
+: Document(std::move(reader), {}, photo, {}) {
 }
 
 Document::Document(std::unique_ptr<Loader> loader)
-: Document(std::make_shared<Reader>(std::move(loader)), nullptr, nullptr) {
+: Document(std::make_shared<Reader>(std::move(loader)), {}, {}, {}) {
 }
 
 Document::Document(
 	std::shared_ptr<Reader> reader,
 	DocumentData *document,
-	PhotoData *photo)
+	PhotoData *photo,
+	std::vector<QualityDescriptor> otherQualities)
 : _document(document)
 , _photo(photo)
 , _player(std::move(reader))
 , _radial(
-		[=] { waitingCallback(); },
-		st::defaultInfiniteRadialAnimation) {
+	[=] { waitingCallback(); },
+	st::defaultInfiniteRadialAnimation)
+, _otherQualities(std::move(otherQualities)) {
 	resubscribe();
 }
 
 void Document::resubscribe() {
 	_subscription = _player.updates(
-	) | rpl::start_with_next_error([=](Update &&update) {
+	) | rpl::on_next_error([=](Update &&update) {
 		handleUpdate(std::move(update));
 	}, [=](Streaming::Error &&error) {
 		handleError(std::move(error));
@@ -138,20 +144,27 @@ Ui::RadialState Document::waitingState() const {
 	return _radial.computeState();
 }
 
+rpl::producer<int> Document::switchQualityRequests() const {
+	return _switchQualityRequests.events();
+}
+
 void Document::handleUpdate(Update &&update) {
 	v::match(update.data, [&](Information &update) {
 		ready(std::move(update));
-	}, [&](const PreloadedVideo &update) {
+	}, [&](PreloadedVideo update) {
 		_info.video.state.receivedTill = update.till;
-	}, [&](const UpdateVideo &update) {
+		checkSwitchToHigherQuality();
+	}, [&](UpdateVideo update) {
 		_info.video.state.position = update.position;
-	}, [&](const PreloadedAudio &update) {
+	}, [&](PreloadedAudio update) {
 		_info.audio.state.receivedTill = update.till;
-	}, [&](const UpdateAudio &update) {
+	}, [&](UpdateAudio update) {
 		_info.audio.state.position = update.position;
-	}, [&](const WaitingForData &update) {
+	}, [&](WaitingForData update) {
 		waitingChange(update.waiting);
-	}, [&](MutedByOther) {
+	}, [&](SpeedEstimate update) {
+		checkForQualitySwitch(update);
+	}, [](MutedByOther) {
 	}, [&](Finished) {
 		const auto finishTrack = [](TrackState &state) {
 			state.position = state.receivedTill = state.duration;
@@ -161,6 +174,76 @@ void Document::handleUpdate(Update &&update) {
 	});
 }
 
+void Document::setOtherQualities(std::vector<QualityDescriptor> value) {
+	_otherQualities = std::move(value);
+	checkForQualitySwitch(_lastSpeedEstimate);
+}
+
+void Document::checkForQualitySwitch(SpeedEstimate estimate) {
+	_lastSpeedEstimate = estimate;
+	if (!checkSwitchToHigherQuality()) {
+		checkSwitchToLowerQuality();
+	}
+}
+
+bool Document::checkSwitchToHigherQuality() {
+	if (_otherQualities.empty()
+		|| (_info.video.state.duration == kTimeUnknown)
+		|| (_info.video.state.duration == kDurationUnavailable)
+		|| (_info.video.state.position == kTimeUnknown)
+		|| (_info.video.state.receivedTill == kTimeUnknown)
+		|| !_lastSpeedEstimate.bytesPerSecond
+		|| _lastSpeedEstimate.unreliable
+		|| (_info.video.state.receivedTill
+			< std::min(
+				_info.video.state.duration,
+				(_info.video.state.position
+					+ kSwitchQualityUpPreloadedThreshold)))) {
+		return false;
+	}
+	const auto size = _player.fileSize();
+	Assert(size >= 0 && size <= std::numeric_limits<uint32>::max());
+	auto to = QualityDescriptor{ .sizeInBytes = uint32(size) };
+	const auto duration = _info.video.state.duration / 1000.;
+	const auto speed = _player.speed();
+	const auto multiplier = speed * kSwitchQualityUpSpeedMultiplier;
+	for (const auto &descriptor : _otherQualities) {
+		const auto perSecond = descriptor.sizeInBytes / duration;
+		if (descriptor.sizeInBytes > to.sizeInBytes
+			&& _lastSpeedEstimate.bytesPerSecond >= perSecond * multiplier) {
+			to = descriptor;
+		}
+	}
+	if (!to.height) {
+		return false;
+	}
+	_switchQualityRequests.fire_copy(to.height);
+	return true;
+}
+
+bool Document::checkSwitchToLowerQuality() {
+	if (_otherQualities.empty()
+		|| !_waiting
+		|| !_radial.animating()
+		|| !_lastSpeedEstimate.bytesPerSecond) {
+		return false;
+	}
+	const auto size = _player.fileSize();
+	Assert(size >= 0 && size <= std::numeric_limits<uint32>::max());
+	auto to = QualityDescriptor();
+	for (const auto &descriptor : _otherQualities) {
+		if (descriptor.sizeInBytes < size
+			&& descriptor.sizeInBytes > to.sizeInBytes) {
+			to = descriptor;
+		}
+	}
+	if (!to.height) {
+		return false;
+	}
+	_switchQualityRequests.fire_copy(to.height);
+	return true;
+}
+
 void Document::handleError(Error &&error) {
 	if (_document) {
 		if (error == Error::NotStreamable) {
@@ -192,11 +275,11 @@ void Document::waitingChange(bool waiting) {
 			_radial.start(
 				st::defaultInfiniteRadialAnimation.sineDuration);
 		}
-		_fading.start(
-			[=] { waitingCallback(); },
-			_waiting ? 0. : 1.,
-			_waiting ? 1. : 0.,
-			duration);
+		_fading.start([=] {
+			waitingCallback();
+		}, _waiting ? 0. : 1., _waiting ? 1. : 0., duration);
+
+		checkSwitchToLowerQuality();
 	};
 	if (waiting) {
 		if (_radial.animating()) {
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_document.h b/Telegram/SourceFiles/media/streaming/media_streaming_document.h
index f192aebb1a735b..bdb579593c3a1e 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_document.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_document.h
@@ -14,20 +14,26 @@ For license and copyright information please follow this link:
 
 class DocumentData;
 
-namespace Media {
-namespace Streaming {
+namespace Media::Streaming {
 
 class Instance;
 class Loader;
 
+struct QualityDescriptor {
+	uint32 sizeInBytes = 0;
+	uint32 height = 0;
+};
+
 class Document {
 public:
 	Document(
 		not_null<DocumentData*> document,
-		std::shared_ptr<Reader> reader);
+		std::shared_ptr<Reader> reader,
+		std::vector<QualityDescriptor> otherQualities = {});
 	Document(
 		not_null<PhotoData*> photo,
-		std::shared_ptr<Reader> reader);
+		std::shared_ptr<Reader> reader,
+		std::vector<QualityDescriptor> otherQualities = {});
 	explicit Document(std::unique_ptr<Loader> loader);
 
 	void play(const PlaybackOptions &options);
@@ -41,11 +47,15 @@ class Document {
 	[[nodiscard]] float64 waitingOpacity() const;
 	[[nodiscard]] Ui::RadialState waitingState() const;
 
+	void setOtherQualities(std::vector<QualityDescriptor> value);
+	[[nodiscard]] rpl::producer<int> switchQualityRequests() const;
+
 private:
 	Document(
 		std::shared_ptr<Reader> reader,
 		DocumentData *document,
-		PhotoData *photo);
+		PhotoData *photo,
+		std::vector<QualityDescriptor> otherQualities);
 
 	friend class Instance;
 
@@ -54,6 +64,9 @@ class Document {
 	void refreshPlayerPriority();
 
 	void waitingCallback();
+	void checkForQualitySwitch(SpeedEstimate estimate);
+	bool checkSwitchToHigherQuality();
+	bool checkSwitchToLowerQuality();
 
 	void handleUpdate(Update &&update);
 	void handleError(Error &&error);
@@ -71,14 +84,15 @@ class Document {
 
 	rpl::lifetime _subscription;
 
-	bool _waiting = false;
 	mutable Ui::InfiniteRadialAnimation _radial;
 	Ui::Animations::Simple _fading;
 	base::Timer _timer;
 	base::flat_set<not_null<Instance*>> _instances;
+	std::vector<QualityDescriptor> _otherQualities;
+	rpl::event_stream<int> _switchQualityRequests;
+	SpeedEstimate _lastSpeedEstimate;
+	bool _waiting = false;
 
 };
 
-
-} // namespace Streaming
-} // namespace Media
+} // namespace Media::Streaming
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
index 22427c2ff09e7d..bb53d30cae00ba 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
@@ -172,6 +172,7 @@ Stream File::Context::initStream(
 		result.codec = FFmpeg::MakeCodecPointer({
 			.stream = info,
 			.hwAllowed = options.hwAllow,
+			.videoMaxArea = kMaxFrameArea,
 		});
 		if (!result.codec) {
 			return result;
@@ -179,6 +180,10 @@ Stream File::Context::initStream(
 		result.rotation = FFmpeg::ReadRotationFromMetadata(info);
 		result.aspect = FFmpeg::ValidateAspectRatio(
 			info->sample_aspect_ratio);
+		const auto guessed = av_guess_frame_rate(format, info, nullptr);
+		if (guessed.num > 0 && guessed.den > 0) {
+			result.fps = av_q2d(guessed);
+		}
 	} else if (type == AVMEDIA_TYPE_AUDIO) {
 		result.frequency = info->codecpar->sample_rate;
 		if (!result.frequency) {
@@ -490,6 +495,14 @@ void File::setLoaderPriority(int priority) {
 	_reader->setLoaderPriority(priority);
 }
 
+int64 File::size() const {
+	return _reader->size();
+}
+
+rpl::producer<SpeedEstimate> File::speedEstimate() const {
+	return _reader->speedEstimate();
+}
+
 File::~File() {
 	stop();
 }
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_file.h b/Telegram/SourceFiles/media/streaming/media_streaming_file.h
index 38af455378dc64..c17a8d19517c12 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_file.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_file.h
@@ -42,6 +42,9 @@ class File final {
 	[[nodiscard]] bool isRemoteLoader() const;
 	void setLoaderPriority(int priority);
 
+	[[nodiscard]] int64 size() const;
+	[[nodiscard]] rpl::producer<SpeedEstimate> speedEstimate() const;
+
 	~File();
 
 private:
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp
index 898bf76787fe66..4d4149ce35ff67 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_instance.cpp
@@ -17,6 +17,19 @@ For license and copyright information please follow this link:
 namespace Media {
 namespace Streaming {
 
+Instance::Instance(const Instance &other)
+: _shared(other._shared)
+, _waitingCallback(other._waitingCallback)
+, _priority(other._priority)
+, _playerLocked(other._playerLocked) {
+	if (_shared) {
+		_shared->registerInstance(this);
+		if (_playerLocked) {
+			_shared->player().lock();
+		}
+	}
+}
+
 Instance::Instance(
 	std::shared_ptr<Document> shared,
 	Fn<void()> waitingCallback)
@@ -36,6 +49,21 @@ Instance::Instance(
 	std::move(waitingCallback)) {
 }
 
+Instance::Instance(
+	not_null<DocumentData*> quality,
+	not_null<DocumentData*> original,
+	HistoryItem *context,
+	Data::FileOrigin origin,
+	Fn<void()> waitingCallback)
+: Instance(
+	quality->owner().streaming().sharedDocument(
+		quality,
+		original,
+		context,
+		origin),
+	std::move(waitingCallback)) {
+}
+
 Instance::Instance(
 	not_null<PhotoData*> photo,
 	Data::FileOrigin origin,
@@ -72,6 +100,10 @@ const Information &Instance::info() const {
 	return _shared->info();
 }
 
+rpl::producer<int> Instance::switchQualityRequests() const {
+	return _shared->switchQualityRequests();
+}
+
 void Instance::play(const PlaybackOptions &options) {
 	Expects(_shared != nullptr);
 
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_instance.h b/Telegram/SourceFiles/media/streaming/media_streaming_instance.h
index 126cf9db08ec93..31477940197a31 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_instance.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_instance.h
@@ -27,6 +27,7 @@ class Player;
 
 class Instance {
 public:
+	Instance(const Instance &other);
 	Instance(
 		std::shared_ptr<Document> shared,
 		Fn<void()> waitingCallback);
@@ -34,6 +35,12 @@ class Instance {
 		not_null<DocumentData*> document,
 		Data::FileOrigin origin,
 		Fn<void()> waitingCallback);
+	Instance(
+		not_null<DocumentData*> quality,
+		not_null<DocumentData*> original,
+		HistoryItem *context,
+		Data::FileOrigin origin,
+		Fn<void()> waitingCallback);
 	Instance(
 		not_null<PhotoData*> photo,
 		Data::FileOrigin origin,
@@ -45,6 +52,7 @@ class Instance {
 
 	[[nodiscard]] const Player &player() const;
 	[[nodiscard]] const Information &info() const;
+	[[nodiscard]] rpl::producer<int> switchQualityRequests() const;
 
 	void play(const PlaybackOptions &options);
 	void pause();
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_loader.h b/Telegram/SourceFiles/media/streaming/media_streaming_loader.h
index 55845c5200b427..f95183babf459c 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_loader.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_loader.h
@@ -7,12 +7,13 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "media/streaming/media_streaming_common.h"
+
 namespace Storage {
 class StreamedFileDownloader;
 } // namespace Storage
 
-namespace Media {
-namespace Streaming {
+namespace Media::Streaming {
 
 struct LoadedPart {
 	int64 offset = 0;
@@ -41,6 +42,8 @@ class Loader {
 
 	// Parts will be sent from the main thread.
 	[[nodiscard]] virtual rpl::producer<LoadedPart> parts() const = 0;
+	[[nodiscard]] virtual auto speedEstimate() const
+		-> rpl::producer<SpeedEstimate> = 0;
 
 	virtual void attachDownloader(
 		not_null<Storage::StreamedFileDownloader*> downloader) = 0;
@@ -74,5 +77,4 @@ class PriorityQueue {
 
 };
 
-} // namespace Streaming
-} // namespace Media
+} // namespace Media::Streaming
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp
index a85dbe7756d087..868296d7be8ee4 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.cpp
@@ -84,6 +84,10 @@ rpl::producer<LoadedPart> LoaderLocal::parts() const {
 	return _parts.events();
 }
 
+rpl::producer<SpeedEstimate> LoaderLocal::speedEstimate() const {
+	return rpl::never<SpeedEstimate>();
+}
+
 void LoaderLocal::attachDownloader(
 		not_null<Storage::StreamedFileDownloader*> downloader) {
 	Unexpected("Downloader attached to a local streaming loader.");
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.h b/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.h
index 9531f66837d225..efb6d41bd62ba5 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_loader_local.h
@@ -33,6 +33,7 @@ class LoaderLocal : public Loader, public base::has_weak_ptr {
 
 	// Parts will be sent from the main thread.
 	[[nodiscard]] rpl::producer<LoadedPart> parts() const override;
+	[[nodiscard]] rpl::producer<SpeedEstimate> speedEstimate() const override;
 
 	void attachDownloader(
 		not_null<Storage::StreamedFileDownloader*> downloader) override;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.cpp
index 15f881403ad7ba..d6f869c581afcd 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.cpp
@@ -14,6 +14,12 @@ For license and copyright information please follow this link:
 
 namespace Media {
 namespace Streaming {
+namespace {
+
+constexpr auto kCheckStatsInterval = crl::time(1000);
+constexpr auto kInitialStatsWait = 5 * crl::time(1000);
+
+} // namespace
 
 LoaderMtproto::LoaderMtproto(
 	not_null<Storage::DownloadManagerMtproto*> owner,
@@ -22,7 +28,8 @@ LoaderMtproto::LoaderMtproto(
 	Data::FileOrigin origin)
 : DownloadMtprotoTask(owner, location, origin)
 , _size(size)
-, _api(&api().instance()) {
+, _api(&api().instance())
+, _statsTimer([=] { checkStats(); }) {
 }
 
 Storage::Cache::Key LoaderMtproto::baseCacheKey() const {
@@ -121,12 +128,32 @@ bool LoaderMtproto::readyToRequest() const {
 
 int64 LoaderMtproto::takeNextRequestOffset() {
 	const auto offset = _requested.take();
+	Assert(offset.has_value());
+
+	const auto time = crl::now();
+	if (!_firstRequestStart) {
+		_firstRequestStart = time;
+	}
+	_stats.push_back({ .start = crl::now(), .offset = *offset });
 
 	Ensures(offset.has_value());
 	return *offset;
 }
 
 bool LoaderMtproto::feedPart(int64 offset, const QByteArray &bytes) {
+	const auto time = crl::now();
+	for (auto &entry : _stats) {
+		if (entry.offset == offset && entry.start < time) {
+			entry.end = time;
+			if (!_statsTimer.isActive()) {
+				const auto checkAt = std::max(
+					time + kCheckStatsInterval,
+					_firstRequestStart + kInitialStatsWait);
+				_statsTimer.callOnce(checkAt - time);
+			}
+			break;
+		}
+	}
 	_parts.fire({ offset, bytes });
 	return true;
 }
@@ -139,5 +166,56 @@ rpl::producer<LoadedPart> LoaderMtproto::parts() const {
 	return _parts.events();
 }
 
+rpl::producer<SpeedEstimate> LoaderMtproto::speedEstimate() const {
+	return _speedEstimate.events();
+}
+
+void LoaderMtproto::checkStats() {
+	const auto time = crl::now();
+	const auto from = time - kInitialStatsWait;
+	{ // Erase all stats entries that are too old.
+		for (auto i = begin(_stats); i != end(_stats);) {
+			if (i->start >= from) {
+				break;
+			} else if (i->end && i->end < from) {
+				i = _stats.erase(i);
+			} else {
+				++i;
+			}
+		}
+	}
+	if (_stats.empty()) {
+		return;
+	}
+	// Count duration for which at least one request was in progress.
+	// This is the time we should consider for download speed.
+	// We don't count time when no requests were in progress.
+	auto durationCountedTill = _stats.front().start;
+	auto duration = crl::time(0);
+	auto received = int64(0);
+	for (const auto &entry : _stats) {
+		if (entry.start > durationCountedTill) {
+			durationCountedTill = entry.start;
+		}
+		const auto till = entry.end ? entry.end : time;
+		if (till > durationCountedTill) {
+			duration += (till - durationCountedTill);
+			durationCountedTill = till;
+		}
+		if (entry.end) {
+			received += Storage::kDownloadPartSize;
+		}
+	}
+	if (duration) {
+		_speedEstimate.fire({
+			.bytesPerSecond = int(std::clamp(
+				int64(received * 1000 / duration),
+				int64(0),
+				int64(64 * 1024 * 1024))),
+			.unreliable = (received < 3 * Storage::kDownloadPartSize),
+		});
+	}
+}
+
 } // namespace Streaming
 } // namespace Media
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.h b/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.h
index 93635efb188bf5..c3a025a1ed118f 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_loader_mtproto.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "base/timer.h"
 #include "media/streaming/media_streaming_loader.h"
 #include "mtproto/sender.h"
 #include "data/data_file_origin.h"
@@ -36,12 +37,19 @@ class LoaderMtproto : public Loader, public Storage::DownloadMtprotoTask {
 
 	// Parts will be sent from the main thread.
 	[[nodiscard]] rpl::producer<LoadedPart> parts() const override;
+	[[nodiscard]] rpl::producer<SpeedEstimate> speedEstimate() const override;
 
 	void attachDownloader(
 		not_null<Storage::StreamedFileDownloader*> downloader) override;
 	void clearAttachedDownloader() override;
 
 private:
+	struct StatsEntry {
+		crl::time start = 0;
+		crl::time end = 0;
+		int64 offset = 0;
+	};
+
 	bool readyToRequest() const override;
 	int64 takeNextRequestOffset() override;
 	bool feedPart(int64 offset, const QByteArray &bytes) override;
@@ -50,6 +58,8 @@ class LoaderMtproto : public Loader, public Storage::DownloadMtprotoTask {
 	void cancelForOffset(int64 offset);
 	void addToQueueWithPriority();
 
+	void checkStats();
+
 	const int64 _size = 0;
 	int _priority = 0;
 
@@ -57,6 +67,11 @@ class LoaderMtproto : public Loader, public Storage::DownloadMtprotoTask {
 
 	PriorityQueue _requested;
 	rpl::event_stream<LoadedPart> _parts;
+	rpl::event_stream<SpeedEstimate> _speedEstimate;
+
+	std::vector<StatsEntry> _stats;
+	crl::time _firstRequestStart = 0;
+	base::Timer _statsTimer;
 
 	Storage::StreamedFileDownloader *_downloader = nullptr;
 
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_native_frame_mac.h b/Telegram/SourceFiles/media/streaming/media_streaming_native_frame_mac.h
new file mode 100644
index 00000000000000..b1222f15423ebe
--- /dev/null
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_native_frame_mac.h
@@ -0,0 +1,22 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#ifdef Q_OS_MAC
+
+#include <QtGui/QImage>
+
+namespace Media::Streaming {
+
+struct NativeFrame;
+
+[[nodiscard]] QImage ConvertNativeFrameToARGB32(const NativeFrame &frame);
+
+} // namespace Media::Streaming
+
+#endif // Q_OS_MAC
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_native_frame_mac.mm b/Telegram/SourceFiles/media/streaming/media_streaming_native_frame_mac.mm
new file mode 100644
index 00000000000000..8bb1c164e40336
--- /dev/null
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_native_frame_mac.mm
@@ -0,0 +1,129 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/streaming/media_streaming_native_frame_mac.h"
+
+#ifdef Q_OS_MAC
+
+#include "media/streaming/media_streaming_common.h"
+#include "ffmpeg/ffmpeg_utility.h"
+
+#include <CoreVideo/CoreVideo.h>
+
+namespace Media::Streaming {
+namespace {
+
+class PixelBufferLock final {
+public:
+	PixelBufferLock(CVPixelBufferRef buffer, CVPixelBufferLockFlags flags)
+	: _buffer(buffer)
+	, _flags(flags)
+	, _locked(CVPixelBufferLockBaseAddress(buffer, flags) == kCVReturnSuccess) {
+	}
+
+	PixelBufferLock(const PixelBufferLock &) = delete;
+	PixelBufferLock &operator=(const PixelBufferLock &) = delete;
+	PixelBufferLock(PixelBufferLock &&) = delete;
+	PixelBufferLock &operator=(PixelBufferLock &&) = delete;
+
+	~PixelBufferLock() {
+		if (_locked) {
+			CVPixelBufferUnlockBaseAddress(_buffer, _flags);
+		}
+	}
+
+	[[nodiscard]] bool locked() const {
+		return _locked;
+	}
+
+private:
+	CVPixelBufferRef _buffer;
+	CVPixelBufferLockFlags _flags;
+	bool _locked;
+
+};
+
+} // namespace
+
+QImage ConvertNativeFrameToARGB32(const NativeFrame &frame) {
+	if (!frame.pixelBuffer || frame.size.isEmpty()) {
+		return QImage();
+	}
+	const auto pixelBuffer = static_cast<CVPixelBufferRef>(frame.pixelBuffer);
+	const auto format = CVPixelBufferGetPixelFormatType(pixelBuffer);
+	if (format != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
+		&& format != kCVPixelFormatType_420YpCbCr8BiPlanarFullRange) {
+		return QImage();
+	}
+	const auto lock = PixelBufferLock(
+		pixelBuffer,
+		kCVPixelBufferLock_ReadOnly);
+	if (!lock.locked()) {
+		return QImage();
+	}
+
+	const auto y = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 0);
+	const auto uv = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 1);
+	if (!y || !uv) {
+		return QImage();
+	}
+	const auto yStride = int(
+		CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0));
+	const auto uvStride = int(
+		CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 1));
+	if (yStride <= 0 || uvStride <= 0) {
+		return QImage();
+	}
+
+	auto storage = FFmpeg::CreateFrameStorage(frame.size);
+	if (storage.isNull() || !storage.bits()) {
+		return QImage();
+	}
+	const auto swscale = FFmpeg::MakeSwscalePointer(
+		frame.size,
+		AV_PIX_FMT_NV12,
+		frame.size,
+		AV_PIX_FMT_BGRA);
+	if (!swscale) {
+		return QImage();
+	}
+
+	const uint8_t *srcData[AV_NUM_DATA_POINTERS] = {
+		static_cast<const uint8_t*>(y),
+		static_cast<const uint8_t*>(uv),
+		nullptr,
+		nullptr,
+	};
+	int srcLinesize[AV_NUM_DATA_POINTERS] = {
+		yStride,
+		uvStride,
+		0,
+		0,
+	};
+	uint8_t *dstData[AV_NUM_DATA_POINTERS] = {
+		storage.bits(),
+		nullptr,
+	};
+	int dstLinesize[AV_NUM_DATA_POINTERS] = {
+		int(storage.bytesPerLine()),
+		0,
+	};
+	sws_scale(
+		swscale.get(),
+		srcData,
+		srcLinesize,
+		0,
+		frame.size.height(),
+		dstData,
+		dstLinesize);
+
+	return storage;
+}
+
+} // namespace Media::Streaming
+
+#endif // Q_OS_MAC
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
index 699cbdf58fc64e..950c0e2f1dbec0 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
@@ -62,8 +62,10 @@ void SaveValidVideoInformation(
 
 	SaveValidStateInformation(to.state, std::move(from.state));
 	to.size = from.size;
+	to.realSize = from.realSize;
 	to.cover = std::move(from.cover);
 	to.rotation = from.rotation;
+	to.fps = from.fps;
 	to.alpha = from.alpha;
 }
 
@@ -715,12 +717,16 @@ void Player::start() {
 	_stage = Stage::Started;
 	const auto guard = base::make_weak(&_sessionGuard);
 
+	_file->speedEstimate() | rpl::on_next([=](SpeedEstimate value) {
+		_updates.fire({ value });
+	}, _sessionLifetime);
+
 	rpl::merge(
 		_audio ? _audio->waitingForData() : nullptr,
 		_video ? _video->waitingForData() : nullptr
 	) | rpl::filter([=] {
 		return !bothReceivedEnough(kBufferFor);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_pausedByWaitingForData = true;
 		updatePausedState();
 		_updates.fire({ WaitingForData{ true } });
@@ -728,7 +734,7 @@ void Player::start() {
 
 	if (guard && _audio && !_audioFinished) {
 		_audio->playPosition(
-		) | rpl::start_with_next_done([=](crl::time position) {
+		) | rpl::on_next_done([=](crl::time position) {
 			audioPlayedTill(position);
 		}, [=] {
 			Expects(_stage == Stage::Started);
@@ -742,7 +748,7 @@ void Player::start() {
 
 	if (guard && _video) {
 		_video->checkNextFrame(
-		) | rpl::start_with_next_done([=] {
+		) | rpl::on_next_done([=] {
 			checkVideoStep();
 		}, [=] {
 			Assert(_stage == Stage::Started);
@@ -756,7 +762,7 @@ void Player::start() {
 		crl::on_main_update_requests(
 		) | rpl::filter([=] {
 			return !_videoFinished;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			checkVideoStep();
 		}, _sessionLifetime);
 	}
@@ -881,6 +887,10 @@ rpl::producer<bool> Player::fullInCache() const {
 	return _fullInCache.events();
 }
 
+int64 Player::fileSize() const {
+	return _file->size();
+}
+
 QSize Player::videoSize() const {
 	return _information.video.size;
 }
@@ -958,7 +968,9 @@ Media::Player::TrackState Player::prepareLegacyState() const {
 		if (duration > 0) {
 			result.length = duration;
 		} else {
-			result.length = std::max(crl::time(result.position), crl::time(0));
+			result.length = std::max(
+				crl::time(result.position),
+				crl::time(0));
 		}
 	}
 	return result;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_player.h b/Telegram/SourceFiles/media/streaming/media_streaming_player.h
index 148dc7a11e246b..0b8257dae49a7d 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_player.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_player.h
@@ -60,6 +60,7 @@ class Player final : private FileDelegate {
 	[[nodiscard]] rpl::producer<Update, Error> updates() const;
 	[[nodiscard]] rpl::producer<bool> fullInCache() const;
 
+	[[nodiscard]] int64 fileSize() const;
 	[[nodiscard]] QSize videoSize() const;
 	[[nodiscard]] QImage frame(
 		const FrameRequest &request,
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
index 95654e590e35df..7839a783bcb5eb 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
@@ -536,12 +536,12 @@ void Reader::Slices::processPart(
 		_header.addPart(offset, bytes);
 		checkSliceFullLoaded(0);
 		return;
-	} else if (_headerMode == HeaderMode::Unknown) {
-		if (_header.parts.contains(offset)) {
-			return;
-		} else if (_header.parts.size() < kMaxPartsInHeader) {
-			_header.addPart(offset, bytes);
-		}
+	//} else if (_headerMode == HeaderMode::Unknown) {
+	//	if (_header.parts.contains(offset)) {
+	//		return;
+	//	} else if (_header.parts.size() < kMaxPartsInHeader) {
+	//		_header.addPart(offset, bytes);
+	//	}
 	}
 	const auto index = offset / kInSlice;
 	_data[index].addPart(offset - index * kInSlice, std::move(bytes));
@@ -599,6 +599,17 @@ auto Reader::Slices::fill(uint32 offset, bytes::span buffer) -> FillResult {
 			result.state = FillState::WaitingCache;
 		}
 	};
+	const auto addToHeader = [&](int slice, auto parts) {
+		if (_headerMode == HeaderMode::Unknown) {
+			for (const auto &part : parts) {
+				const auto totalOffset = slice * kInSlice + part.first;
+				if (!_header.parts.contains(totalOffset)
+					&& _header.parts.size() < kMaxPartsInHeader) {
+					_header.addPart(totalOffset, part.second);
+				}
+			}
+		}
+	};
 	const auto firstFrom = offset - fromSlice * kInSlice;
 	const auto firstTill = std::min(kInSlice, till - fromSlice * kInSlice);
 	const auto secondFrom = 0;
@@ -615,18 +626,18 @@ auto Reader::Slices::fill(uint32 offset, bytes::span buffer) -> FillResult {
 	}
 	if (first.ready && second.ready) {
 		markSliceUsed(fromSlice);
-		CopyLoaded(
-			buffer,
-			ranges::make_subrange(first.start, first.finish),
-			firstFrom,
-			firstTill);
+		auto &&list = ranges::make_subrange(first.start, first.finish);
+		CopyLoaded(buffer, list, firstFrom, firstTill);
+		addToHeader(fromSlice, list);
 		if (fromSlice + 1 < tillSlice) {
 			markSliceUsed(fromSlice + 1);
+			auto &&list = ranges::make_subrange(second.start, second.finish);
 			CopyLoaded(
 				buffer.subspan(firstTill - firstFrom),
-				ranges::make_subrange(second.start, second.finish),
+				list,
 				secondFrom,
 				secondTill);
+			addToHeader(fromSlice + 1, list);
 		}
 		result.toCache = serializeAndUnloadUnused();
 		result.state = FillState::Success;
@@ -846,7 +857,7 @@ Reader::Reader(
 , _cacheHelper(cache ? InitCacheHelper(_loader->baseCacheKey()) : nullptr)
 , _slices(_loader->size(), _cacheHelper != nullptr) {
 	_loader->parts(
-	) | rpl::start_with_next([=](LoadedPart &&part) {
+	) | rpl::on_next([=](LoadedPart &&part) {
 		if (_attachedDownloader) {
 			_partsForDownloader.fire_copy(part);
 		}
@@ -1099,6 +1110,10 @@ void Reader::continueDownloaderFromMainThread() {
 	}
 }
 
+rpl::producer<SpeedEstimate> Reader::speedEstimate() const {
+	return _loader->speedEstimate();
+}
+
 void Reader::setLoaderPriority(int priority) {
 	if (_realPriority == priority) {
 		return;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_reader.h b/Telegram/SourceFiles/media/streaming/media_streaming_reader.h
index 1798298461d03a..a86a55fcdfdd3c 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_reader.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_reader.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "media/streaming/media_streaming_common.h"
 #include "media/streaming/media_streaming_loader.h"
 #include "base/bytes.h"
 #include "base/weak_ptr.h"
@@ -78,6 +79,7 @@ class Reader final : public base::has_weak_ptr {
 	void cancelForDownloader(
 		not_null<Storage::StreamedFileDownloader*> downloader);
 	void continueDownloaderFromMainThread();
+	[[nodiscard]] rpl::producer<SpeedEstimate> speedEstimate() const;
 
 	~Reader();
 
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_round_preview.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_round_preview.cpp
new file mode 100644
index 00000000000000..56beb61eccf28f
--- /dev/null
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_round_preview.cpp
@@ -0,0 +1,62 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/streaming/media_streaming_round_preview.h"
+
+namespace Media::Streaming {
+
+RoundPreview::RoundPreview(const QByteArray &bytes, int size)
+: _bytes(bytes)
+, _reader(
+	Clip::MakeReader(_bytes, [=](Clip::Notification update) {
+		clipCallback(update);
+	}))
+, _size(size) {
+}
+
+std::shared_ptr<Ui::DynamicImage> RoundPreview::clone() {
+	Unexpected("RoundPreview::clone.");
+}
+
+QImage RoundPreview::image(int size) {
+	if (!_reader || !_reader->started()) {
+		return QImage();
+	}
+	return _reader->current({
+		.frame = QSize(_size, _size),
+		.factor = style::DevicePixelRatio(),
+		.radius = ImageRoundRadius::Ellipse,
+	}, crl::now());
+}
+
+void RoundPreview::subscribeToUpdates(Fn<void()> callback) {
+	_repaint = std::move(callback);
+}
+
+void RoundPreview::clipCallback(Clip::Notification notification) {
+	switch (notification) {
+	case Clip::Notification::Reinit: {
+		if (_reader->state() == ::Media::Clip::State::Error) {
+			_reader.setBad();
+		} else if (_reader->ready() && !_reader->started()) {
+			_reader->start({
+				.frame = QSize(_size, _size),
+				.factor = style::DevicePixelRatio(),
+				.radius = ImageRoundRadius::Ellipse,
+			});
+		}
+	} break;
+
+	case Clip::Notification::Repaint: break;
+	}
+
+	if (const auto onstack = _repaint) {
+		onstack();
+	}
+}
+
+} // namespace Media::Streaming
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_round_preview.h b/Telegram/SourceFiles/media/streaming/media_streaming_round_preview.h
new file mode 100644
index 00000000000000..64440bc4978a9b
--- /dev/null
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_round_preview.h
@@ -0,0 +1,35 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/dynamic_image.h"
+
+#include "media/clip/media_clip_reader.h"
+
+namespace Media::Streaming {
+
+class RoundPreview final : public Ui::DynamicImage {
+public:
+	RoundPreview(const QByteArray &bytes, int size);
+
+	std::shared_ptr<DynamicImage> clone() override;
+
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	void clipCallback(Clip::Notification notification);
+
+	const QByteArray _bytes;
+	Clip::ReaderPointer _reader;
+	Fn<void()> _repaint;
+	int _size = 0;
+
+};
+
+} // namespace Media::Streaming
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_utility.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_utility.cpp
index fdfbe20f82719b..3f6d312dd2e9b9 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_utility.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_utility.cpp
@@ -154,11 +154,16 @@ QImage ConvertFrame(
 
 	if (!FFmpeg::GoodStorageForFrame(storage, resize)) {
 		storage = FFmpeg::CreateFrameStorage(resize);
+		if (storage.isNull()) {
+			return QImage();
+		}
 	}
 
 	const auto format = AV_PIX_FMT_BGRA;
 	const auto hasDesiredFormat = (frame->format == format);
-	if (frameSize == storage.size() && hasDesiredFormat) {
+	if (hasDesiredFormat
+		&& frameSize == storage.size()
+		&& frame->linesize[0] > 0) {
 		static_assert(sizeof(uint32) == FFmpeg::kPixelBytesSize);
 		auto to = reinterpret_cast<uint32*>(storage.bits());
 		auto from = reinterpret_cast<const uint32*>(frame->data[0]);
@@ -427,6 +432,9 @@ QImage PrepareByRequest(
 		: request.outer;
 	if (!FFmpeg::GoodStorageForFrame(storage, outer)) {
 		storage = FFmpeg::CreateFrameStorage(outer);
+		if (storage.isNull()) {
+			return QImage();
+		}
 	}
 
 	if (hasAlpha && request.keepAlpha) {
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_utility.h b/Telegram/SourceFiles/media/streaming/media_streaming_utility.h
index 23dfadd89b0778..cd32347746047e 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_utility.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_utility.h
@@ -41,6 +41,7 @@ struct Stream {
 	// Video only.
 	int rotation = 0;
 	AVRational aspect = FFmpeg::kNormalAspect;
+	float64 fps = 0.;
 	FFmpeg::SwscalePointer swscale;
 };
 
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp
index b9518125fd706a..a022b30dee2802 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp
@@ -9,19 +9,27 @@ For license and copyright information please follow this link:
 
 #include "ffmpeg/ffmpeg_utility.h"
 #include "media/audio/media_audio.h"
+#include "media/media_common.h"
 #include "base/concurrent_timer.h"
 #include "core/crash_reports.h"
 #include "base/debug_log.h"
 
+#ifdef Q_OS_MAC
+#include "media/streaming/media_streaming_native_frame_mac.h"
+
+#include <CoreVideo/CoreVideo.h>
+#endif // Q_OS_MAC
+
 namespace Media {
 namespace Streaming {
 namespace {
 
-constexpr auto kMaxFrameArea = 3840 * 2160; // usual 4K
 constexpr auto kDisplaySkipped = crl::time(-1);
 constexpr auto kFinishedPosition = std::numeric_limits<crl::time>::max();
 static_assert(kDisplaySkipped != kTimeUnknown);
 
+using ::Media::ValidFrameSize;
+
 [[nodiscard]] QImage ConvertToARGB32(
 		FrameFormat format,
 		const FrameYUV &data) {
@@ -35,6 +43,9 @@ static_assert(kDisplaySkipped != kTimeUnknown);
 	//}
 
 	auto result = FFmpeg::CreateFrameStorage(data.size);
+	if (result.isNull()) {
+		return QImage();
+	}
 	const auto swscale = FFmpeg::MakeSwscalePointer(
 		data.size,
 		(format == FrameFormat::YUV420
@@ -198,15 +209,15 @@ VideoTrackObject::VideoTrackObject(
 
 rpl::producer<> VideoTrackObject::checkNextFrame() const {
 	return interrupted()
-		? (rpl::complete<>() | rpl::type_erased())
+		? (rpl::complete<>() | rpl::type_erased)
 		: !_shared->firstPresentHappened()
-		? (_checkNextFrame.events() | rpl::type_erased())
+		? (_checkNextFrame.events() | rpl::type_erased)
 		: _checkNextFrame.events_starting_with({});
 }
 
 rpl::producer<> VideoTrackObject::waitingForData() const {
 	return interrupted()
-		? (rpl::never() | rpl::type_erased())
+		? (rpl::never() | rpl::type_erased)
 		: _waitingForData.events();
 }
 
@@ -373,6 +384,15 @@ auto VideoTrackObject::readFrame(not_null<Frame*> frame) -> FrameResult {
 		_waitingForData.fire({});
 		return FrameResult::Waiting;
 	}
+	const auto decodedFrame = _stream.decodedFrame.get();
+	const auto valid = ValidFrameSize(
+		decodedFrame->width,
+		decodedFrame->height,
+		kMaxFrameArea);
+	if (!valid) {
+		fail(Error::InvalidData);
+		return FrameResult::Error;
+	}
 	const auto position = currentFramePosition();
 	if (position == kTimeUnknown) {
 		fail(Error::InvalidData);
@@ -439,7 +459,42 @@ void VideoTrackObject::rasterizeFrame(not_null<Frame*> frame) {
 
 	fillRequests(frame);
 	frame->format = FrameFormat::None;
+	frame->nativeFrame = NativeFrame();
 	if (frame->decoded->hw_frames_ctx) {
+#ifdef Q_OS_MAC
+		const auto hwFormat = frame->decoded->format;
+		const auto wantARGB = requireARGB32();
+		const auto isVT = (hwFormat == AV_PIX_FMT_VIDEOTOOLBOX);
+		const auto pb = isVT ? (void*)frame->decoded->data[3] : nullptr;
+		const auto pbFormat = pb
+			? CVPixelBufferGetPixelFormatType(
+				static_cast<CVPixelBufferRef>(pb))
+			: 0;
+		const auto pbSupported = (pb != nullptr)
+			&& (pbFormat == kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
+				|| pbFormat == kCVPixelFormatType_420YpCbCr8BiPlanarFullRange);
+		if (!wantARGB && isVT && pbSupported) {
+				const auto w = frame->decoded->width;
+				const auto h = frame->decoded->height;
+				frame->nativeFrame = NativeFrame{
+					.pixelBuffer = pb,
+					.size = { w, h },
+					.chromaSize = {
+						(w + 1) / 2,
+						(h + 1) / 2,
+					},
+				};
+				frame->alpha = false;
+				frame->format = FrameFormat::NativeTexture;
+				if (!frame->original.isNull()) {
+					frame->original = QImage();
+					for (auto &[_, prepared] : frame->prepared) {
+						prepared.image = QImage();
+					}
+				}
+				return;
+		}
+#endif // Q_OS_MAC
 		if (!frame->transferred) {
 			frame->transferred = FFmpeg::MakeFramePointer();
 		}
@@ -649,7 +704,11 @@ bool VideoTrackObject::tryReadFirstFrame(FFmpeg::Packet &&packet) {
 
 bool VideoTrackObject::processFirstFrame() {
 	const auto decodedFrame = _stream.decodedFrame.get();
-	if (decodedFrame->width * decodedFrame->height > kMaxFrameArea) {
+	const auto valid = ValidFrameSize(
+		decodedFrame->width,
+		decodedFrame->height,
+		kMaxFrameArea);
+	if (!valid) {
 		return false;
 	} else if (decodedFrame->hw_frames_ctx) {
 		if (!_stream.transferredFrame) {
@@ -716,6 +775,10 @@ void VideoTrackObject::callReady() {
 	const auto frame = _shared->frameForPaint();
 	++_frameIndex;
 
+	const auto frameSize = frame->original.isNull()
+		? frame->yuv.size
+		: frame->original.size();
+
 	base::take(_ready)({ VideoInformation{
 		.state = {
 			.position = _syncTimePoint.trackTime,
@@ -725,10 +788,14 @@ void VideoTrackObject::callReady() {
 			.duration = _stream.duration,
 		},
 		.size = FFmpeg::TransposeSizeByRotation(
-			FFmpeg::CorrectByAspect(frame->original.size(), _stream.aspect),
+			FFmpeg::CorrectByAspect(frameSize, _stream.aspect),
+			_stream.rotation),
+		.realSize = FFmpeg::TransposeSizeByRotation(
+			frameSize,
 			_stream.rotation),
 		.cover = frame->original,
 		.rotation = _stream.rotation,
+		.fps = _stream.fps,
 		.alpha = frame->alpha,
 	} });
 }
@@ -1189,6 +1256,7 @@ FrameWithInfo VideoTrack::frameWithInfo(const Instance *instance) {
 	return {
 		.image = data.frame->original,
 		.yuv = &data.frame->yuv,
+		.nativeFrame = &data.frame->nativeFrame,
 		.format = data.frame->format,
 		.index = data.index,
 		.alpha = data.frame->alpha,
@@ -1211,10 +1279,15 @@ QImage VideoTrack::frameImage(
 			unwrapped.updateFrameRequest(instance, useRequest);
 		});
 	}
-	if (frame->original.isNull()
-		&& (frame->format == FrameFormat::YUV420
-			|| frame->format == FrameFormat::NV12)) {
-		frame->original = ConvertToARGB32(frame->format, frame->yuv);
+	if (frame->original.isNull()) {
+		if (frame->format == FrameFormat::YUV420
+			|| frame->format == FrameFormat::NV12) {
+			frame->original = ConvertToARGB32(frame->format, frame->yuv);
+#ifdef Q_OS_MAC
+		} else if (frame->format == FrameFormat::NativeTexture) {
+			frame->original = ConvertNativeFrameToARGB32(frame->nativeFrame);
+#endif // Q_OS_MAC
+		}
 	}
 	if (GoodForRequest(
 			frame->original,
@@ -1252,10 +1325,15 @@ QImage VideoTrack::frameImage(
 
 QImage VideoTrack::currentFrameImage() {
 	const auto frame = _shared->frameForPaint();
-	if (frame->original.isNull()
-		&& (frame->format == FrameFormat::YUV420
-			|| frame->format == FrameFormat::NV12)) {
-		frame->original = ConvertToARGB32(frame->format, frame->yuv);
+	if (frame->original.isNull()) {
+		if (frame->format == FrameFormat::YUV420
+			|| frame->format == FrameFormat::NV12) {
+			frame->original = ConvertToARGB32(frame->format, frame->yuv);
+#ifdef Q_OS_MAC
+		} else if (frame->format == FrameFormat::NativeTexture) {
+			frame->original = ConvertNativeFrameToARGB32(frame->nativeFrame);
+#endif // Q_OS_MAC
+		}
 	}
 	return frame->original;
 }
@@ -1315,7 +1393,8 @@ bool VideoTrack::IsRasterized(not_null<const Frame*> frame) {
 	return IsDecoded(frame)
 		&& (!frame->original.isNull()
 			|| frame->format == FrameFormat::YUV420
-			|| frame->format == FrameFormat::NV12);
+			|| frame->format == FrameFormat::NV12
+			|| frame->format == FrameFormat::NativeTexture);
 }
 
 bool VideoTrack::IsStale(not_null<const Frame*> frame, crl::time trackTime) {
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.h b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.h
index 87a6d85cbebb71..f89748835bc8e9 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.h
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.h
@@ -85,6 +85,7 @@ class VideoTrack final {
 		FFmpeg::FramePointer transferred;
 		QImage original;
 		FrameYUV yuv;
+		NativeFrame nativeFrame;
 		crl::time position = kTimeUnknown;
 		crl::time displayed = kTimeUnknown;
 		crl::time display = kTimeUnknown;
diff --git a/Telegram/SourceFiles/media/system_media_controls_manager.cpp b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
index 91f016aa565243..4cadadd051be90 100644
--- a/Telegram/SourceFiles/media/system_media_controls_manager.cpp
+++ b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
@@ -7,23 +7,33 @@ For license and copyright information please follow this link:
 */
 #include "media/system_media_controls_manager.h"
 
-#include "media/audio/media_audio.h"
 #include "base/platform/base_platform_system_media_controls.h"
 #include "core/application.h"
 #include "core/core_settings.h"
-#include "data/data_document.h"
+#include "core/version.h"
 #include "data/data_document_media.h"
+#include "data/data_document.h"
 #include "data/data_file_origin.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "history/history_item_components.h"
+#include "history/history_item_helpers.h"
+#include "history/history_item.h"
+#include "history/history.h"
+#include "lang/lang_keys.h"
 #include "main/main_account.h"
 #include "main/main_session.h"
 #include "media/audio/media_audio.h"
 #include "media/streaming/media_streaming_instance.h"
 #include "media/streaming/media_streaming_player.h"
+#include "media/system_media_controls_video.h"
 #include "ui/text/format_song_document_name.h"
 
 namespace Media {
 namespace {
 
+constexpr auto kSkipMs = crl::time(15 * 1000);
+
 [[nodiscard]] auto RepeatModeToLoopStatus(Media::RepeatMode mode) {
 	using Mode = Media::RepeatMode;
 	using Status = base::Platform::SystemMediaControls::LoopStatus;
@@ -41,6 +51,157 @@ bool SystemMediaControlsManager::Supported() {
 	return base::Platform::SystemMediaControls::Supported();
 }
 
+float64 SystemMediaControlsManager::lookupPlaybackRate() const {
+	const auto mediaPlayer = Media::Player::instance();
+	const auto type = mediaPlayer->getActiveType();
+	const auto current = mediaPlayer->current(type);
+	if (!current || !current.changeablePlaybackSpeed()) {
+		return 1.;
+	}
+	const auto document = current.audio();
+	return (document
+		&& !document->isVoiceMessage()
+		&& !document->isVideoMessage())
+		? Core::App().settings().audioPlaybackSpeed()
+		: Core::App().settings().voicePlaybackSpeed();
+}
+
+void SystemMediaControlsManager::applyPlayerTrack(AudioMsgId::Type audioType) {
+	const auto mediaPlayer = Media::Player::instance();
+	_lifetimeDownload.destroy();
+
+	const auto current = mediaPlayer->current(audioType);
+	if (!current) {
+		return;
+	}
+	if ((_lastAudioMsgId.contextId() == current.contextId())
+		&& (_lastAudioMsgId.audio() == current.audio())
+		&& (_lastAudioMsgId.type() == current.type())) {
+		return;
+	}
+	const auto document = current.audio();
+
+	const auto &[title, performer] = (audioType
+			== AudioMsgId::Type::Voice)
+		? Ui::Text::FormatVoiceName(
+			document,
+			current.contextId()).composedName()
+		: Ui::Text::FormatSongNameFor(document).composedName();
+	_controls->setArtist(performer);
+	_controls->setTitle(title);
+
+	if (_controls->seekingSupported()) {
+		const auto state = mediaPlayer->getState(audioType);
+		_controls->setDuration(state.length);
+		// macOS NowPlaying and Linux MPRIS update the track position
+		// according to the rate property
+		// while the playback status is "playing",
+		// so we should change the track position only when
+		// the track is changed
+		// or when the position is changed by the user.
+		_controls->setPosition(state.position);
+		_controls->setPlaybackRate(lookupPlaybackRate());
+
+		_streamed = std::make_unique<Media::Streaming::Instance>(
+			document,
+			current.contextId(),
+			nullptr);
+	}
+
+	// Setting a thumbnail can take a long time,
+	// so we need to update the display before that.
+	_controls->updateDisplay();
+
+	if (audioType == AudioMsgId::Type::Voice) {
+		if (const auto item = document->owner().message(
+				current.contextId())) {
+			constexpr auto kUserpicSize = 50;
+			const auto forwarded = item->Get<HistoryMessageForwarded>();
+			const auto peer = (forwarded && forwarded->originalSender)
+				? forwarded->originalSender
+				: (!item->out() || item->isPost())
+				? item->fromOriginal().get()
+				: item->history()->peer.get();
+			const auto userpic = PeerData::GenerateUserpicImage(
+				peer,
+				_cachedUserpicView,
+				kUserpicSize,
+				0);
+			if (!userpic.isNull()) {
+				_controls->setThumbnail(userpic);
+			} else {
+				peer->session().downloaderTaskFinished(
+				) | rpl::on_next([=] {
+					const auto userpic = PeerData::GenerateUserpicImage(
+						peer,
+						_cachedUserpicView,
+						kUserpicSize,
+						0);
+					if (!userpic.isNull()) {
+						_controls->setThumbnail(userpic);
+						_lifetimeDownload.destroy();
+					}
+				}, _lifetimeDownload);
+				_controls->clearThumbnail();
+			}
+		} else {
+			_controls->clearThumbnail();
+		}
+	} else if (document && document->isSongWithCover()) {
+		const auto view = document->createMediaView();
+		view->thumbnailWanted(current.contextId());
+		_cachedMediaView.push_back(view);
+		if (const auto imagePtr = view->thumbnail()) {
+			_controls->setThumbnail(imagePtr->original());
+		} else {
+			document->session().downloaderTaskFinished(
+			) | rpl::on_next([=] {
+				if (const auto imagePtr = view->thumbnail()) {
+					_controls->setThumbnail(imagePtr->original());
+					_lifetimeDownload.destroy();
+				}
+			}, _lifetimeDownload);
+			_controls->clearThumbnail();
+		}
+	} else {
+		_controls->clearThumbnail();
+	}
+
+	_lastAudioMsgId = current;
+}
+
+void SystemMediaControlsManager::syncPlayerStateToControls() {
+	using PlaybackStatus
+		= base::Platform::SystemMediaControls::PlaybackStatus;
+	using namespace Media::Player;
+	const auto mediaPlayer = Media::Player::instance();
+	const auto type = mediaPlayer->current(AudioMsgId::Type::Song)
+		? AudioMsgId::Type::Song
+		: AudioMsgId::Type::Voice;
+	const auto current = mediaPlayer->current(type);
+	if (!current) {
+		_cachedMediaView.clear();
+		_streamed = nullptr;
+		_controls->setEnabled(false);
+		_controls->clearMetadata();
+		return;
+	}
+	_controls->setEnabled(true);
+	_controls->setIsPlayPauseEnabled(true);
+	_controls->setIsStopEnabled(true);
+	_controls->setIsNextEnabled(mediaPlayer->nextAvailable(type));
+	_controls->setIsPreviousEnabled(mediaPlayer->previousAvailable(type));
+	const auto state = mediaPlayer->getState(type);
+	_controls->setPlaybackStatus(IsStoppedOrStopping(state.state)
+		? PlaybackStatus::Stopped
+		: IsPausedOrPausing(state.state)
+		? PlaybackStatus::Paused
+		: PlaybackStatus::Playing);
+	_lastAudioMsgId = AudioMsgId();
+	applyPlayerTrack(type);
+	_controls->updateDisplay();
+}
+
 SystemMediaControlsManager::SystemMediaControlsManager()
 : _controls(std::make_unique<base::Platform::SystemMediaControls>()) {
 
@@ -54,13 +215,13 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 		LOG(("SystemMediaControlsManager failed to init."));
 		return;
 	}
-	const auto type = AudioMsgId::Type::Song;
-
 	using TrackState = Media::Player::TrackState;
 	const auto mediaPlayer = Media::Player::instance();
 
 	auto trackFilter = rpl::filter([=](const TrackState &state) {
-		return (state.id.type() == type);
+		const auto type = state.id.type();
+		return (type == AudioMsgId::Type::Song)
+			|| (type == AudioMsgId::Type::Voice);
 	});
 
 	mediaPlayer->updatedNotifier(
@@ -79,14 +240,29 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 		}
 		return PlaybackStatus::Playing;
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](PlaybackStatus status) {
+	) | rpl::on_next([=](PlaybackStatus status) {
+		if (_videoDelegate) {
+			return;
+		}
+		if (_controls->seekingSupported()) {
+			const auto type = mediaPlayer->getActiveType();
+			_controls->setPosition(mediaPlayer->getState(type).position);
+		}
 		_controls->setPlaybackStatus(status);
 	}, _lifetime);
 
 	rpl::merge(
-		mediaPlayer->stops(type) | rpl::map_to(false),
-		mediaPlayer->startsPlay(type) | rpl::map_to(true)
-	) | rpl::distinct_until_changed() | rpl::start_with_next([=](bool audio) {
+		mediaPlayer->stops(AudioMsgId::Type::Song) | rpl::map_to(false),
+		mediaPlayer->startsPlay(AudioMsgId::Type::Song) | rpl::map_to(true),
+		mediaPlayer->stops(AudioMsgId::Type::Voice) | rpl::map_to(false),
+		mediaPlayer->startsPlay(AudioMsgId::Type::Voice) | rpl::map_to(true)
+	) | rpl::distinct_until_changed() | rpl::on_next([=](bool audio) {
+		if (_videoDelegate) {
+			return;
+		}
+		const auto type = mediaPlayer->current(AudioMsgId::Type::Song)
+			? AudioMsgId::Type::Song
+			: AudioMsgId::Type::Voice;
 		_controls->setEnabled(audio);
 		if (audio) {
 			_controls->setIsNextEnabled(mediaPlayer->nextAvailable(type));
@@ -106,15 +282,22 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 
 	auto trackChanged = mediaPlayer->trackChanged(
 	) | rpl::filter([=](AudioMsgId::Type audioType) {
-		return audioType == type;
+		return (audioType == AudioMsgId::Type::Song)
+			|| (audioType == AudioMsgId::Type::Voice);
 	});
 
 	auto unlocked = Core::App().passcodeLockChanges(
 	) | rpl::filter([=](bool locked) {
-		return !locked && (mediaPlayer->current(type));
-	}) | rpl::map([=] {
-		return type;
+		return !locked && (mediaPlayer->current(AudioMsgId::Type::Song)
+			|| mediaPlayer->current(AudioMsgId::Type::Voice));
+	}) | rpl::map([=]() -> AudioMsgId::Type {
+		return mediaPlayer->current(AudioMsgId::Type::Song)
+			? AudioMsgId::Type::Song
+			: AudioMsgId::Type::Voice;
 	}) | rpl::before_next([=] {
+		if (_videoDelegate) {
+			return;
+		}
 		_controls->setEnabled(true);
 		_controls->updateDisplay();
 	});
@@ -122,73 +305,22 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 	rpl::merge(
 		std::move(trackChanged),
 		std::move(unlocked)
-	) | rpl::start_with_next([=](AudioMsgId::Type audioType) {
-		_lifetimeDownload.destroy();
-
-		const auto current = mediaPlayer->current(audioType);
-		if (!current) {
+	) | rpl::on_next([=](AudioMsgId::Type audioType) {
+		if (_videoDelegate) {
 			return;
 		}
-		if ((_lastAudioMsgId.contextId() == current.contextId())
-			&& (_lastAudioMsgId.audio() == current.audio())
-			&& (_lastAudioMsgId.type() == current.type())) {
-			return;
-		}
-		const auto document = current.audio();
-
-		const auto &[title, performer] = Ui::Text::FormatSongNameFor(document)
-			.composedName();
-
-		_controls->setArtist(performer);
-		_controls->setTitle(title);
-
-		if (_controls->seekingSupported()) {
-			const auto state = mediaPlayer->getState(audioType);
-			_controls->setDuration(state.length);
-			// macOS NowPlaying and Linux MPRIS update the track position
-			// according to the rate property
-			// while the playback status is "playing",
-			// so we should change the track position only when
-			// the track is changed
-			// or when the position is changed by the user.
-			_controls->setPosition(state.position);
-
-			_streamed = std::make_unique<Media::Streaming::Instance>(
-				document,
-				current.contextId(),
-				nullptr);
-		}
-
-		// Setting a thumbnail can take a long time,
-		// so we need to update the display before that.
-		_controls->updateDisplay();
-
-		if (document && document->isSongWithCover()) {
-			const auto view = document->createMediaView();
-			view->thumbnailWanted(current.contextId());
-			_cachedMediaView.push_back(view);
-			if (const auto imagePtr = view->thumbnail()) {
-				_controls->setThumbnail(imagePtr->original());
-			} else {
-				document->session().downloaderTaskFinished(
-				) | rpl::start_with_next([=] {
-					if (const auto imagePtr = view->thumbnail()) {
-						_controls->setThumbnail(imagePtr->original());
-						_lifetimeDownload.destroy();
-					}
-				}, _lifetimeDownload);
-				_controls->clearThumbnail();
-			}
-		} else {
-			_controls->clearThumbnail();
-		}
-
-		_lastAudioMsgId = current;
+		applyPlayerTrack(audioType);
 	}, _lifetime);
 
-	mediaPlayer->playlistChanges(
-		type
-	) | rpl::start_with_next([=] {
+	rpl::merge(
+		mediaPlayer->playlistChanges(AudioMsgId::Type::Song)
+			| rpl::map_to(AudioMsgId::Type::Song),
+		mediaPlayer->playlistChanges(AudioMsgId::Type::Voice)
+			| rpl::map_to(AudioMsgId::Type::Voice)
+	) | rpl::on_next([=](AudioMsgId::Type type) {
+		if (_videoDelegate) {
+			return;
+		}
 		_controls->setIsNextEnabled(mediaPlayer->nextAvailable(type));
 		_controls->setIsPreviousEnabled(mediaPlayer->previousAvailable(type));
 	}, _lifetime);
@@ -197,20 +329,65 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 	using Media::OrderMode;
 
 	Core::App().settings().playerRepeatModeValue(
-	) | rpl::start_with_next([=](RepeatMode mode) {
+	) | rpl::on_next([=](RepeatMode mode) {
+		if (_videoDelegate) {
+			return;
+		}
 		_controls->setLoopStatus(RepeatModeToLoopStatus(mode));
 	}, _lifetime);
 
 	Core::App().settings().playerOrderModeValue(
-	) | rpl::start_with_next([=](OrderMode mode) {
+	) | rpl::on_next([=](OrderMode mode) {
 		if (mode != OrderMode::Shuffle) {
 			_lastOrderMode = mode;
 		}
+		if (_videoDelegate) {
+			return;
+		}
 		_controls->setShuffle(mode == OrderMode::Shuffle);
 	}, _lifetime);
 
+	rpl::merge(
+		Core::App().settings().voicePlaybackSpeedChanges() | rpl::to_empty,
+		Core::App().settings().audioPlaybackSpeedChanges() | rpl::to_empty
+	) | rpl::on_next([=] {
+		if (_videoDelegate) {
+			return;
+		}
+		_controls->setPlaybackRate(lookupPlaybackRate());
+	}, _lifetime);
+
 	_controls->commandRequests(
-	) | rpl::start_with_next([=](Command command) {
+	) | rpl::on_next([=](Command command) {
+		if (_videoDelegate) {
+			switch (command) {
+			case Command::PlayPause: _videoDelegate->smtcPlayPause(); break;
+			case Command::Play: _videoDelegate->smtcPlay(); break;
+			case Command::Pause: _videoDelegate->smtcPause(); break;
+			case Command::Stop: _videoDelegate->smtcStop(); break;
+			case Command::Next: _videoDelegate->smtcNext(); break;
+			case Command::Previous: _videoDelegate->smtcPrevious(); break;
+			case Command::Raise: Core::App().activate(); break;
+			case Command::Quit: _videoDelegate->smtcStop(); break;
+			case Command::SkipForward:
+			case Command::SkipBackward: {
+				if (_videoState.duration > 0) {
+					const auto delta = (command == Command::SkipForward)
+						? kSkipMs
+						: -kSkipMs;
+					const auto position = std::clamp(
+						crl::time(_videoState.position + delta),
+						crl::time(0),
+						_videoState.duration);
+					_videoDelegate->smtcSeek(position);
+				}
+				break;
+			}
+			default: break;
+			}
+			return;
+		}
+		const auto type = mediaPlayer->getActiveType();
 		switch (command) {
 		case Command::PlayPause: mediaPlayer->playPause(type); break;
 		case Command::Play: mediaPlayer->play(type); break;
@@ -246,29 +423,62 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 			Media::Player::instance()->stopAndClose();
 			break;
 		}
+		case Command::SkipForward:
+		case Command::SkipBackward: {
+			const auto state = mediaPlayer->getState(type);
+			if (state.length > 0) {
+				const auto delta = (command == Command::SkipForward)
+					? kSkipMs
+					: -kSkipMs;
+				const auto position = std::clamp(
+					crl::time(state.position + delta),
+					crl::time(0),
+					crl::time(state.length));
+				mediaPlayer->finishSeeking(
+					type,
+					position / float64(state.length));
+			}
+			break;
+		}
 		}
 	}, _lifetime);
 
 	if (_controls->seekingSupported()) {
-		mediaPlayer->seekingChanges(
-			type
+		rpl::merge(
+			mediaPlayer->seekingChanges(AudioMsgId::Type::Song),
+			mediaPlayer->seekingChanges(AudioMsgId::Type::Voice)
 		) | rpl::filter([](Media::Player::Instance::Seeking seeking) {
 			return (seeking == Media::Player::Instance::Seeking::Finish);
 		}) | rpl::map([=] {
+			const auto type = mediaPlayer->getActiveType();
 			return mediaPlayer->getState(type).position;
 		}) | rpl::distinct_until_changed(
-		) | rpl::start_with_next([=](int position) {
+		) | rpl::on_next([=](int position) {
+			if (_videoDelegate) {
+				return;
+			}
 			_controls->setPosition(position);
 			_controls->updateDisplay();
 		}, _lifetime);
 
 		_controls->seekRequests(
-		) | rpl::start_with_next([=](float64 progress) {
+		) | rpl::on_next([=](float64 progress) {
+			if (_videoDelegate) {
+				_videoDelegate->smtcSeek(
+					crl::time(progress * _videoState.duration));
+				return;
+			}
+			const auto type = mediaPlayer->getActiveType();
 			mediaPlayer->finishSeeking(type, progress);
 		}, _lifetime);
 
 		_controls->updatePositionRequests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
+			if (_videoDelegate) {
+				_controls->setPosition(_videoState.position);
+				return;
+			}
+			const auto type = mediaPlayer->getActiveType();
 			_controls->setPosition(mediaPlayer->getState(type).position);
 		}, _lifetime);
 	}
@@ -276,7 +486,7 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 	Core::App().passcodeLockValue(
 	) | rpl::filter([=](bool locked) {
 		return locked && Core::App().maybePrimarySession();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_controls->setEnabled(false);
 	}, _lifetime);
 
@@ -285,12 +495,15 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 			Core::App().settings().songVolume()
 		) | rpl::then(
 			Core::App().settings().songVolumeChanges()
-		) | rpl::start_with_next([=](float64 volume) {
+		) | rpl::on_next([=](float64 volume) {
+			if (_videoDelegate) {
+				return;
+			}
 			_controls->setVolume(volume);
 		}, _lifetime);
 
 		_controls->volumeChangeRequests(
-		) | rpl::start_with_next([](float64 volume) {
+		) | rpl::on_next([](float64 volume) {
 			Player::mixer()->setSongVolume(volume);
 			if (volume > 0) {
 				Core::App().settings().setRememberedSongVolume(volume);
@@ -299,6 +512,103 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 		}, _lifetime);
 	}
 
+	_inited = true;
+}
+
+void SystemMediaControlsManager::videoStart(
+		not_null<SystemMediaControlsVideoDelegate*> delegate,
+		VideoState state) {
+	if (!_inited) {
+		return;
+	}
+	using PlaybackStatus
+		= base::Platform::SystemMediaControls::PlaybackStatus;
+	_videoDelegate = delegate;
+	_videoState = state;
+	_lifetimeDownload.destroy();
+	_controls->setEnabled(true);
+	_controls->setIsPlayPauseEnabled(true);
+	_controls->setIsStopEnabled(true);
+	_controls->setIsNextEnabled(state.nextAvailable);
+	_controls->setIsPreviousEnabled(state.previousAvailable);
+	_controls->setTitle(state.title);
+	_controls->setArtist(state.artist);
+	_controls->clearThumbnail();
+	if (_controls->seekingSupported()) {
+		_controls->setDuration(state.duration);
+		_controls->setPosition(state.position);
+		_controls->setPlaybackRate(
+			Core::App().settings().videoPlaybackSpeed());
+	}
+	_controls->setPlaybackStatus(state.playing
+		? PlaybackStatus::Playing
+		: PlaybackStatus::Paused);
+	_controls->updateDisplay();
+}
+
+void SystemMediaControlsManager::videoUpdate(VideoState state) {
+	if (!_inited || !_videoDelegate) {
+		return;
+	}
+	using PlaybackStatus
+		= base::Platform::SystemMediaControls::PlaybackStatus;
+	auto display = false;
+	if (state.title != _videoState.title) {
+		_controls->setTitle(state.title);
+		display = true;
+	}
+	if (state.artist != _videoState.artist) {
+		_controls->setArtist(state.artist);
+		display = true;
+	}
+	if (state.nextAvailable != _videoState.nextAvailable) {
+		_controls->setIsNextEnabled(state.nextAvailable);
+	}
+	if (state.previousAvailable != _videoState.previousAvailable) {
+		_controls->setIsPreviousEnabled(state.previousAvailable);
+	}
+	const auto statusChanged = (state.playing != _videoState.playing);
+	if (_controls->seekingSupported()) {
+		if (state.duration != _videoState.duration) {
+			_controls->setDuration(state.duration);
+		}
+		if (statusChanged || !state.playing) {
+			_controls->setPosition(state.position);
+			_controls->setPlaybackRate(
+				Core::App().settings().videoPlaybackSpeed());
+		}
+	}
+	if (statusChanged) {
+		_controls->setPlaybackStatus(state.playing
+			? PlaybackStatus::Playing
+			: PlaybackStatus::Paused);
+	}
+	if (display) {
+		_controls->updateDisplay();
+	}
+	_videoState = state;
+}
+
+void SystemMediaControlsManager::videoSetThumbnail(const QImage &thumbnail) {
+	if (!_inited || !_videoDelegate) {
+		return;
+	}
+	if (thumbnail.isNull()) {
+		_controls->clearThumbnail();
+	} else {
+		_controls->setThumbnail(thumbnail);
+	}
+	_controls->updateDisplay();
+}
+
+void SystemMediaControlsManager::videoFinish(
+		not_null<SystemMediaControlsVideoDelegate*> delegate) {
+	if (!_inited || (_videoDelegate != delegate)) {
+		return;
+	}
+	_videoDelegate = nullptr;
+	_videoState = VideoState();
+	syncPlayerStateToControls();
 }
 
 SystemMediaControlsManager::~SystemMediaControlsManager() = default;
diff --git a/Telegram/SourceFiles/media/system_media_controls_manager.h b/Telegram/SourceFiles/media/system_media_controls_manager.h
index e7c6ececf93329..6ab5b537b1ed7b 100644
--- a/Telegram/SourceFiles/media/system_media_controls_manager.h
+++ b/Telegram/SourceFiles/media/system_media_controls_manager.h
@@ -10,6 +10,8 @@ For license and copyright information please follow this link:
 #include "data/data_audio_msg_id.h"
 #include "media/player/media_player_instance.h"
 #include "media/media_common.h"
+#include "media/system_media_controls_video.h"
+#include "ui/userpic_view.h"
 
 namespace base::Platform {
 class SystemMediaControls;
@@ -29,20 +31,36 @@ class Instance;
 
 namespace Media {
 
-class SystemMediaControlsManager {
+class SystemMediaControlsManager final : public SystemMediaControlsVideoSink {
 public:
 	SystemMediaControlsManager();
 	~SystemMediaControlsManager();
 
 	static bool Supported();
 
+	void videoStart(
+		not_null<SystemMediaControlsVideoDelegate*> delegate,
+		VideoState state) override;
+	void videoUpdate(VideoState state) override;
+	void videoSetThumbnail(const QImage &thumbnail) override;
+	void videoFinish(
+		not_null<SystemMediaControlsVideoDelegate*> delegate) override;
+
 private:
+	[[nodiscard]] float64 lookupPlaybackRate() const;
+	void applyPlayerTrack(AudioMsgId::Type audioType);
+	void syncPlayerStateToControls();
+
 	const std::unique_ptr<base::Platform::SystemMediaControls> _controls;
 
 	std::vector<std::shared_ptr<Data::DocumentMedia>> _cachedMediaView;
+	Ui::PeerUserpicView _cachedUserpicView;
 	std::unique_ptr<Streaming::Instance> _streamed;
 	AudioMsgId _lastAudioMsgId;
 	OrderMode _lastOrderMode = OrderMode::Default;
+	bool _inited = false;
+	SystemMediaControlsVideoDelegate *_videoDelegate = nullptr;
+	VideoState _videoState;
 
 	rpl::lifetime _lifetimeDownload;
 	rpl::lifetime _lifetime;
diff --git a/Telegram/SourceFiles/media/system_media_controls_video.h b/Telegram/SourceFiles/media/system_media_controls_video.h
new file mode 100644
index 00000000000000..65e801f340a366
--- /dev/null
+++ b/Telegram/SourceFiles/media/system_media_controls_video.h
@@ -0,0 +1,50 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Media {
+
+class SystemMediaControlsVideoDelegate {
+public:
+	virtual void smtcPlay() = 0;
+	virtual void smtcPause() = 0;
+	virtual void smtcPlayPause() = 0;
+	virtual void smtcStop() = 0;
+	virtual void smtcNext() = 0;
+	virtual void smtcPrevious() = 0;
+	virtual void smtcSeek(crl::time position) = 0;
+
+protected:
+	~SystemMediaControlsVideoDelegate() = default;
+};
+
+class SystemMediaControlsVideoSink {
+public:
+	struct VideoState {
+		QString title;
+		QString artist;
+		crl::time position = 0;
+		crl::time duration = 0;
+		bool playing = false;
+		bool nextAvailable = false;
+		bool previousAvailable = false;
+	};
+
+	virtual void videoStart(
+		not_null<SystemMediaControlsVideoDelegate*> delegate,
+		VideoState state) = 0;
+	virtual void videoUpdate(VideoState state) = 0;
+	virtual void videoSetThumbnail(const QImage &thumbnail) = 0;
+	virtual void videoFinish(
+		not_null<SystemMediaControlsVideoDelegate*> delegate) = 0;
+
+protected:
+	~SystemMediaControlsVideoSink() = default;
+};
+
+} // namespace Media
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index e1fb123d7cf3c3..4b0794c15528a4 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -10,7 +10,9 @@ using "ui/basic.style";
 using "ui/widgets/widgets.style";
 using "ui/menu_icons.style";
 using "media/player/media_player.style";
+using "media/stories/media_stories.style";
 using "boxes/boxes.style";
+using "calls/calls.style";
 using "chat_helpers/chat_helpers.style";
 
 mediaviewOverDuration: 150;
@@ -27,6 +29,7 @@ mediaviewPlayback: MediaSlider {
 	seekSize: size(12px, 12px);
 	duration: mediaviewOverDuration;
 }
+mediaviewPlaybackTimestamp: size(2px, 10px);
 mediaviewPlaybackTop: 49px;
 mediaviewPlayProgressTop: 46px;
 
@@ -39,6 +42,12 @@ mediaviewControlsButton: IconButton {
 }
 
 mediaviewControllerSize: size(480px, 72px);
+mediaviewTimestampLabelTop: 63px;
+mediaviewTimestampLabelHeight: 10px;
+mediaviewTimestampLabel: LabelSimple(defaultLabelSimple) {
+	font: font(12px);
+	textFg: mediaviewPlaybackProgressFg;
+}
 mediaviewPlayProgressLabel: LabelSimple(defaultLabelSimple) {
 	font: font(12px semibold);
 	textFg: mediaviewPlaybackProgressFg;
@@ -71,6 +80,8 @@ mediaviewPipButton: IconButton(mediaviewControlsButton) {
 	iconPosition: point(4px, 4px);
 }
 
+mediaviewPipShadow: callShadow;
+
 mediaviewFullScreenButtonSkip: 4px;
 mediaviewFullScreenButton: IconButton(mediaviewPipButton) {
 	icon: icon {{ "player/player_fullscreen", mediaviewPlaybackIconFg }};
@@ -113,6 +124,23 @@ mediaviewSaveLocked: icon {{ "mediaview/download_locked", mediaviewControlFg }};
 mediaviewShare: icon {{ "mediaview/viewer_share", mediaviewControlFg }};
 mediaviewRotate: icon {{ "mediaview/rotate", mediaviewControlFg }};
 mediaviewMore: icon {{ "title_menu_dots", mediaviewControlFg }};
+mediaviewRecognize: icon {{ "mediaview/recognize", mediaviewControlFg }};
+mediaviewDraw: icon {{ "mediaview/draw", mediaviewControlFg }};
+
+mediaviewVoteButton: RoundButton(defaultActiveButton) {
+	height: 36px;
+	radius: 18px;
+}
+mediaviewVoteButtonMargin: 8px;
+
+mediaviewPollVotersUserpics: GroupCallUserpics {
+	size: 24px;
+	shift: 8px;
+	stroke: 2px;
+	align: align(left);
+}
+mediaviewPollVotersPadding: margins(12px, 0px, 14px, 0px);
+mediaviewPollVotersSpacing: 6px;
 
 mediaviewFileRed: icon {
 	{ size(25px, 25px), mediaviewFileBg },
@@ -169,10 +197,9 @@ mediaviewMenuShadow: Shadow(defaultEmptyShadow) {
 }
 mediaviewPanelAnimation: PanelAnimation(defaultPanelAnimation) {
 	fadeBg: groupCallMenuBg;
-	shadow: mediaviewMenuShadow;
 }
 mediaviewPopupMenu: PopupMenu(defaultPopupMenu) {
-	shadow: mediaviewMenuShadow;
+	shadowFallback: groupCallMenuBg;
 	menu: mediaviewMenu;
 	animation: mediaviewPanelAnimation;
 }
@@ -195,13 +222,39 @@ mediaviewSaveMsgHiding: 2500;
 mediaviewSaveMsgStyle: TextStyle(defaultTextStyle) {
 	font: font(16px);
 }
+mediaviewChapterPadding: margins(20px, 12px, 20px, 12px);
+mediaviewChapterFont: font(15px semibold);
+mediaviewChapterShowing: 200;
+mediaviewChapterShown: 1500;
+mediaviewChapterHiding: 400;
+mediaviewChapterArrowSize: 10px;
+mediaviewChapterArrowWidth: 6px;
+mediaviewChapterArrowShift: 16px;
+mediaviewChapterArrowGap: 12px;
+mediaviewChapterArrowSlide: 350;
+mediaviewChapterArrowPause: 1500;
+mediaviewChapterArrowFade: 300;
+
+mediaviewSpeedBoostPadding: margins(12px, 6px, 12px, 6px);
+mediaviewSpeedBoostFont: font(16px semibold);
+mediaviewSpeedBoostShowing: 150;
+mediaviewSpeedBoostHiding: 200;
+mediaviewSpeedBoostArrowHeight: 9px;
+mediaviewSpeedBoostArrowWidth: 7px;
+mediaviewSpeedBoostArrowGap: 2px;
+mediaviewSpeedBoostArrowOverlap: 2px;
+mediaviewSpeedBoostTextRight: 8px;
+mediaviewSpeedBoostTop: 12px;
+mediaviewSpeedBoostHoldDelay: 200;
+mediaviewSpeedBoostDragPerUnit: 300px;
+
 mediaviewTextPalette: TextPalette(defaultTextPalette) {
 	linkFg: mediaviewTextLinkFg;
 	monoFg: mediaviewCaptionFg;
 	spoilerFg: mediaviewCaptionFg;
 }
 
-mediaviewCaptionStyle: defaultTextStyle;
+mediaviewCaptionStyle: historyTextStyle;
 
 mediaviewThickFont: semiboldFont;
 mediaviewFont: normalFont;
@@ -209,6 +262,7 @@ mediaviewTextStyle: defaultTextStyle;
 
 mediaviewTextLeft: 14px;
 mediaviewTextSkip: 10px;
+mediaviewTextSkipHalf: 5px;
 mediaviewHeaderTop: 47px;
 mediaviewTextTop: 26px;
 
@@ -216,8 +270,8 @@ mediaviewControlSize: 90px;
 mediaviewIconSize: size(46px, 54px);
 mediaviewIconOver: 36px;
 
-mediaviewWaitHide: 2000;
-mediaviewHideDuration: 1000;
+mediaviewWaitHide: 1100;
+mediaviewHideDuration: 600;
 mediaviewShowDuration: 200;
 mediaviewFadeDuration: 150;
 
@@ -306,18 +360,21 @@ mediaviewTitleMaximizeMacPadding: margins(0px, 4px, 8px, 4px);
 
 mediaviewShadowTop: icon{{ "mediaview/shadow_top", windowShadowFg }};
 mediaviewShadowBottom: icon{{ "mediaview/shadow_bottom", windowShadowFg }};
-
+mediaviewWideMenuSeparator: MenuSeparator(mediaviewMenuSeparator) {
+	padding: margins(0px, 4px, 0px, 4px);
+	width: 6px;
+}
+mediaviewSpeedMenuInner: Menu(mediaviewMenu) {
+	separator: mediaviewWideMenuSeparator;
+	itemPadding: margins(54px, 7px, 54px, 9px);
+	itemFgDisabled: mediaviewTextLinkFg;
+}
 mediaviewSpeedMenu: MediaSpeedMenu(mediaPlayerSpeedMenu) {
 	dropdown: DropdownMenu(mediaviewDropdownMenu) {
-		menu: Menu(mediaviewMenu) {
-			separator: MenuSeparator(mediaviewMenuSeparator) {
-				fg: groupCallMenuBgOver;
-				padding: margins(0px, 4px, 0px, 4px);
-				width: 6px;
-			}
-			itemPadding: margins(54px, 7px, 54px, 9px);
-			itemFgDisabled: mediaviewTextLinkFg;
-		}
+		menu: mediaviewSpeedMenuInner;
+	}
+	qualityMenu: Menu(mediaviewSpeedMenuInner) {
+		itemPadding: margins(17px, 7px, 54px, 9px);
 	}
 	activeCheck: icon {{ "player/player_check", mediaviewTextLinkFg }};
 	slider: MediaSlider(defaultContinuousSlider) {
@@ -347,10 +404,11 @@ mediaviewSpeedMenu: MediaSpeedMenu(mediaPlayerSpeedMenu) {
 mediaviewSpeedButton: MediaSpeedButton(mediaPlayerSpeedButton) {
 	size: size(32px, 32px);
 	padding: margins(0px, 0px, 0px, 0px);
+	font: font(8px bold);
 	fg: mediaviewPlaybackIconFg;
 	overFg: mediaviewPlaybackIconFgOver;
 	activeFg: mediaviewTextLinkFg;
-	icon: icon{{ "player/player_speed", mediaviewPlaybackIconFg }};
+	icon: icon{{ "player/player_settings", mediaviewPlaybackIconFg }};
 	ripple: RippleAnimation(defaultRippleAnimation) {
 		color: mediaviewPlaybackIconRipple;
 	}
@@ -358,6 +416,7 @@ mediaviewSpeedButton: MediaSpeedButton(mediaPlayerSpeedButton) {
 	rippleRadius: 16px;
 	menu: mediaviewSpeedMenu;
 	menuAlign: align(bottomright);
+	menuPosition: point(-2px, 31px);
 }
 
 themePreviewSize: size(903px, 584px);
@@ -410,8 +469,6 @@ pipVolumeIcon1Over: icon {{ "player/player_volume_small", mediaviewPipControlsFg
 pipVolumeIcon2: icon {{ "player/player_volume_on", mediaviewPipControlsFg }};
 pipVolumeIcon2Over: icon {{ "player/player_volume_on", mediaviewPipControlsFgOver }};
 
-speedSliderDividerSize: size(2px, 8px);
-
 storiesMaxSize: size(540px, 960px);
 storiesSiblingWidthMin: 200px; // Try making sibling not less than this.
 storiesMaxNameFontSize: 17px;
@@ -448,7 +505,8 @@ storiesHeaderRepostWidthMin: 40px;
 storiesShadowTop: icon{{ "mediaview/shadow_bottom-flip_vertical", windowShadowFg }};
 storiesShadowBottom: mediaviewShadowBottom;
 storiesControlsMinWidth: 280px;
-storiesFieldMargin: margins(0px, 14px, 0px, 16px);
+storiesControlsExtend: 4px;
+storiesFieldMargin: margins(0px, 18px, 0px, 12px);
 storiesSideSkip: 145px;
 storiesCaptionFull: FlatLabel(defaultFlatLabel) {
 	style: mediaviewCaptionStyle;
@@ -470,16 +528,21 @@ storiesComposeRipple: RippleAnimation(defaultRippleAnimation) {
 	color: groupCallMembersBgRipple;
 }
 storiesAttach: IconButton(historyAttach) {
+	width: 42px;
+	height: 42px;
 	icon: icon {{ "chat/input_attach", storiesComposeGrayIcon }};
 	iconOver: icon {{ "chat/input_attach", storiesComposeGrayIcon }};
+	rippleAreaPosition: point(1px, 1px);
 	ripple: storiesComposeRippleLight;
 }
 storiesLike: IconButton(storiesAttach) {
 	icon: icon {{ "chat/input_like", storiesComposeGrayIcon }};
 	iconOver: icon {{ "chat/input_like", storiesComposeGrayIcon }};
 }
-storiesRecordVoice: icon {{ "chat/input_record", storiesComposeGrayIcon }};
-storiesRecordVoiceOver: icon {{ "chat/input_record", storiesComposeGrayIcon }};
+storiesEditStars: IconButton(storiesAttach) {
+	icon: icon{{ "chat/input_paid", storiesComposeGrayIcon }};
+	iconOver: icon{{ "chat/input_paid", storiesComposeGrayIcon }};
+}
 storiesRemoveSet: IconButton(stickerPanRemoveSet) {
 	icon: icon {{ "simple_close", storiesComposeGrayIcon }};
 	iconOver: icon {{ "simple_close", storiesComposeGrayIcon }};
@@ -511,10 +574,9 @@ storiesMenu: Menu(defaultMenu) {
 		color: groupCallMenuBgRipple;
 	}
 }
-storiesMenuShadow: mediaviewMenuShadow;
 storiesMenuAnimation: mediaviewPanelAnimation;
 storiesPopupMenu: PopupMenu(defaultPopupMenu) {
-	shadow: storiesMenuShadow;
+	shadowFallback: groupCallMenuBg;
 	menu: storiesMenu;
 	animation: storiesMenuAnimation;
 }
@@ -590,10 +652,7 @@ storiesEmojiPan: EmojiPan(defaultEmojiPan) {
 	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", storiesComposeBg }};
 	fadeRight: icon {{ "fade_horizontal", storiesComposeBg }};
 	menu: storiesPopupMenuWithIcons;
-	expandedSeparator: MenuSeparator(storiesMenuSeparator) {
-		padding: margins(0px, 4px, 0px, 4px);
-		width: 6px;
-	}
+	expandedSeparator: mediaviewWideMenuSeparator;
 	tabs: SettingsSlider(emojiTabs) {
 		barFgActive: storiesComposeBlue;
 		labelFg: storiesComposeGrayText;
@@ -611,6 +670,7 @@ storiesEmojiPan: EmojiPan(defaultEmojiPan) {
 	}
 	icons: ComposeIcons {
 		settings: icon {{ "emoji/emoji_settings", storiesComposeGrayIcon }};
+		collectibles: icon {{ "menu/unique", storiesComposeGrayIcon }};
 
 		recent: icon {{ "emoji/emoji_recent", storiesComposeGrayIcon }};
 		recentActive: icon {{ "emoji/emoji_recent", storiesComposeWhiteText }};
@@ -639,10 +699,11 @@ storiesEmojiPan: EmojiPan(defaultEmojiPan) {
 		menuSchedule: icon {{ "menu/calendar", storiesComposeWhiteText }};
 		menuWhenOnline: icon {{ "menu/send_when_online", storiesComposeWhiteText }};
 		menuSpoiler: icon {{ "menu/spoiler_on", storiesComposeWhiteText }};
-		menuSpoilerOff: icon {{ "menu/spoiler_off", storiesComposeWhiteText }};
 		menuBelow: icon {{ "menu/link_below", storiesComposeWhiteText }};
 		menuAbove: icon {{ "menu/link_above", storiesComposeWhiteText }};
+		menuQualityHigh: icon {{ "menu/quality_hd", storiesComposeWhiteText }};
 		menuPrice: icon {{ "menu/earn", storiesComposeWhiteText }};
+		menuEditStars: icon {{ "chat/input_paid", storiesComposeWhiteText, point(-8px, -8px) }};
 
 		stripBubble: icon{
 			{ "chat/reactions_bubble_shadow", windowShadowFg },
@@ -668,10 +729,26 @@ storiesBoxInputField: InputField(defaultComposeFilesField) {
 	borderFgActive: storiesComposeBlue;
 	menu: storiesPopupMenu;
 }
+storiesChooseSendAs: ChooseSendAs(defaultChooseSendAs) {
+	button: SendAsButton(defaultSendAsButton) {
+		width: 42px;
+		height: 42px;
+	}
+	label: FlatLabel(defaultFlatLabel) {
+		minWidth: 272px;
+		textFg: storiesComposeWhiteText;
+	}
+	list: groupCallJoinAsList;
+}
+storiesCommentSentAt: Menu(storiesMenu, whoSentItem) {
+	itemFgDisabled: groupCallMembersFg;
+}
 storiesComposeControls: ComposeControls(defaultComposeControls) {
 	bg: storiesComposeBg;
-	radius: storiesRadius;
+	radius: 21px;
+	padding: margins(1px, 8px, 1px, 6px);
 	field: InputField(historyComposeField) {
+		textMargins: margins(2px, 0px, 2px, 0px);
 		textFg: storiesComposeWhiteText;
 		textBg: storiesComposeBg;
 		placeholderFg: storiesComposeGrayText;
@@ -679,19 +756,49 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 		placeholderFgError: storiesComposeGrayText;
 		menu: storiesPopupMenu;
 	}
+	fieldLeft: 10px;
 	send: SendButton(historySend) {
+		sendIconPosition: point(9px, 9px);
+		sendIconFillPadding: 5px;
 		inner: IconButton(storiesAttach) {
-			icon: icon {{ "chat/input_send", storiesComposeBlue }};
-			iconOver: icon {{ "chat/input_send", storiesComposeBlue }};
+			width: 42px;
+			height: 42px;
+			icon: icon {{ "chat/input_send_round", windowFgActive }};
+			iconOver: icon {{ "chat/input_send_round", windowFgActive }};
+			rippleAreaSize: 40px;
+			rippleAreaPosition: point(1px, 1px);
 		}
-		record: storiesRecordVoice;
-		recordOver: storiesRecordVoiceOver;
 		sendDisabledFg: storiesComposeGrayText;
+		sendIconFg: windowFgActive;
 	}
 	attach: storiesAttach;
 	emoji: storiesAttachEmoji;
 	like: storiesLike;
 	liked: icon{};
+	editStars: storiesEditStars;
+	commentsShow: IconButton(storiesAttach) {
+		icon: icon {{ "chat/input_comments_expand", storiesComposeGrayIcon }};
+		iconOver: icon {{ "chat/input_comments_expand", storiesComposeGrayIcon }};
+	}
+	commentsShown: icon {{ "chat/input_comments_hide", storiesComposeGrayIcon }};
+	commentsSkip: 8px;
+	commentsUnreadSize: 6px;
+	commentsUnreadMargin: 2px;
+	commentsUnreadPosition: point(24px, 8px);
+	starsReactionCounter: RoundButton(defaultActiveButton) {
+		style: TextStyle(semiboldTextStyle) {
+			font: font(9px semibold);
+		}
+		textFg: storiesComposeGrayIcon;
+		textFgOver: storiesComposeGrayIcon;
+		textBg: storiesComposeBg;
+		textBgOver: storiesComposeBg;
+		numbersSkip: 2px;
+		padding: margins(4px, 0px, 4px, 1px);
+		textTop: 1px;
+		ripple: storiesComposeRippleLight;
+	}
+	starsSkip: 8px;
 	suggestions: EmojiSuggestions(defaultEmojiSuggestions) {
 		dropdown: InnerDropdown(emojiSuggestionsDropdown) {
 			animation: PanelAnimation(defaultPanelAnimation) {
@@ -810,6 +917,7 @@ storiesComposeControls: ComposeControls(defaultComposeControls) {
 		position: point(37px, 14px);
 		icon: icon{{ "emoji/premium_lock", storiesComposeGrayIcon, point(13px, 14px) }};
 	}
+	chooseSendAs: storiesChooseSendAs;
 }
 storiesViewsMenu: PopupMenu(storiesPopupMenuWithIcons) {
 	scrollPadding: margins(0px, 6px, 0px, 4px);
@@ -830,6 +938,27 @@ storiesWhoViewed: WhoRead(defaultWhoRead) {
 		align: align(left);
 	}
 }
+mediaviewEmojiPan: EmojiPan(storiesEmojiPan) {
+	showAnimation: PanelAnimation(emojiPanAnimation) {
+		fadeBg: groupCallMenuBg;
+	}
+	bg: groupCallMenuBg;
+	overBg: groupCallMenuBgOver;
+	pathBg: groupCallMenuBgRipple;
+	pathFg: groupCallMenuBgOver;
+	categoriesBg: groupCallMenuBg;
+	categoriesBgOver: groupCallMenuBgOver;
+	fadeLeft: icon {{ "fade_horizontal-flip_horizontal", groupCallMenuBg }};
+	fadeRight: icon {{ "fade_horizontal", groupCallMenuBg }};
+	tabs: SettingsSlider(emojiTabs) {
+		barFgActive: storiesComposeBlue;
+		labelFg: storiesComposeGrayText;
+		labelFgActive: storiesComposeBlue;
+		rippleBg: groupCallMenuBgOver;
+		rippleBgActive: groupCallMenuBgOver;
+	}
+}
+
 storiesReactionsPan: EmojiPan(storiesEmojiPan) {
 	margin: margins(reactStripSkip, 0px, reactStripSkip, 0px);
 	padding: margins(reactStripSkip, 0px, reactStripSkip, reactStripSkip);
@@ -901,8 +1030,7 @@ storiesReportBox: ReportBox(defaultReportBox) {
 		textMargins: margins(1px, 26px, 1px, 4px);
 		heightMax: 116px;
 	}
-	dividerBg: groupCallBg;
-	dividerFg: groupCallVideoSubTextFg;
+	divider: groupCallDividerLabel;
 	spam: icon {{ "menu/delete", storiesComposeWhiteText }};
 	fake: icon {{ "menu/fake", storiesComposeWhiteText }};
 	violence: icon {{ "menu/violence", storiesComposeWhiteText }};
@@ -966,7 +1094,6 @@ storiesCaptionPullThreshold: 50px;
 storiesShowMorePadding: margins(6px, 4px, 6px, 4px);
 storiesShowMoreFont: semiboldFont;
 
-storiesStealthLogoIcon: icon{{ "stories/stealth_logo", storiesComposeWhiteText }};
 storiesStealthLogoAdd: 12px;
 storiesStealthLogoMargin: margins(0px, 28px, 0px, 7px);
 storiesStealthBox: Box(defaultBox) {
@@ -994,14 +1121,6 @@ storiesStealthBox: Box(defaultBox) {
 	}
 	titleAdditionalFg: groupCallMemberNotJoinedStatus;
 }
-storiesStealthButtonLabel: FlatLabel(defaultFlatLabel) {
-	style: semiboldTextStyle;
-	textFg: storiesComposeWhiteText;
-	align: align(top);
-	minWidth: 20px;
-	maxHeight: 20px;
-}
-storiesStealthLockIcon: icon {{ "dialogs/dialogs_lock_on", storiesComposeWhiteText }};
 storiesStealthTitleMargin: margins(0px, 10px, 0px, 0px);
 storiesStealthBoxClose: IconButton(defaultIconButton) {
 	width: boxTitleHeight;
@@ -1014,34 +1133,47 @@ storiesStealthBoxClose: IconButton(defaultIconButton) {
 	rippleAreaSize: 40px;
 	ripple: storiesComposeRippleLight;
 }
-storiesStealthAbout: FlatLabel(defaultFlatLabel) {
-	textFg: storiesComposeGrayText;
-	align: align(top);
-	minWidth: 20px;
-}
 storiesStealthAboutMargin: margins(0px, 5px, 0px, 15px);
-storiesStealthFeatureTitle: storiesHeaderName;
-storiesStealthFeatureAbout: FlatLabel(defaultFlatLabel) {
-	textFg: storiesComposeGrayText;
-	minWidth: 20px;
-}
-storiesStealthFeaturePastIcon: icon{{ "stories/stealth_5m", storiesComposeBlue }};
-storiesStealthFeatureNextIcon: icon{{ "stories/stealth_25m", storiesComposeBlue }};
-storiesStealthFeatureIconPosition: point(3px, 7px);
-storiesStealthFeatureMargin: margins(0px, 8px, 0px, 6px);
-storiesStealthFeatureLabelLeft: 46px;
-storiesStealthFeatureSkip: 2px;
 storiesStealthBoxBottom: 11px;
 storiesStealthToast: Toast(defaultMultilineToast) {
 	maxWidth: 340px;
 }
 
+storiesStealthStyle: StealthBoxStyle {
+	box: storiesStealthBox;
+	buttonLabel: FlatLabel(defaultFlatLabel) {
+		style: semiboldTextStyle;
+		textFg: storiesComposeWhiteText;
+		align: align(top);
+		minWidth: 20px;
+		maxHeight: 20px;
+	}
+	lockIcon: icon {{ "dialogs/dialogs_lock_on", storiesComposeWhiteText }};
+	boxClose: storiesStealthBoxClose;
+	about: FlatLabel(defaultFlatLabel) {
+		textFg: storiesComposeGrayText;
+		align: align(top);
+		minWidth: 20px;
+	}
+	featureTitle: storiesHeaderName;
+	featureAbout: FlatLabel(defaultFlatLabel) {
+		textFg: storiesComposeGrayText;
+		minWidth: 20px;
+	}
+	featurePastIcon: icon{{ "stories/stealth_5m", storiesComposeBlue }};
+	featureNextIcon: icon{{ "stories/stealth_25m", storiesComposeBlue }};
+	logoIcon: icon{{ "stories/stealth_logo", storiesComposeWhiteText }};
+	logoBg: storiesComposeBlue;
+}
+
 storiesViewsPosition: point(4px, 29px);
 storiesViewsIcon: icon{{ "mediaview/views", storiesComposeGrayText }};
+storiesViewsIconTop: 11px;
 storiesViewsText: FlatLabel(defaultFlatLabel) {
 	textFg: storiesComposeGrayText;
 }
 storiesViewsTextPosition: point(26px, 14px);
+storiesChannelReactionsTextTop: 16px;
 
 storiesLikesPosition: point(0px, 29px);
 storiesLikesIcon: icon {{ "chat/input_like", storiesComposeWhiteText }};
@@ -1064,8 +1196,10 @@ storiesRepostSimpleStyle: QuoteStyle(defaultQuoteStyle) {
 	outline: 0px;
 	radius: 10px;
 }
-storiesRepostIcon: icon {{ "mediaview/mini_repost", windowFg }};
-storiesRepostIconPadding: margins(0px, 4px, 2px, 0px);
+storiesRepostIcon: IconEmoji{
+	icon: icon {{ "mediaview/mini_repost", windowFg }};
+	padding: margins(0px, 4px, 2px, 0px);
+}
 storiesRepostUserpicPadding: margins(0px, 1px, 4px, 0px);
 
 mediaviewSponsoredButton: RoundButton(defaultActiveButton) {
@@ -1076,3 +1210,34 @@ mediaviewSponsoredButton: RoundButton(defaultActiveButton) {
 
 	ripple: universalRippleAnimation;
 }
+
+mediaSponsoredSkip: 16px;
+mediaSponsoredShift: 16px;
+mediaSponsoredPadding: margins(12px, 8px, 8px, 8px);
+mediaSponsoredThumb: 48px;
+mediaSponsoredCloseTwice: 3px;
+mediaSponsoredCloseSmall: 3px;
+mediaSponsoredCloseSize: 11px;
+mediaSponsoredCloseCorner: 6px;
+mediaSponsoredCloseFull: 64px;
+mediaSponsoredCloseStroke: 2px;
+mediaSponsoredCloseRipple: 36px;
+mediaSponsoredCloseDiameter: 24px;
+mediaSponsoredCloseFont: font(12px bold);
+
+mediaSponsoredAbout: RoundButton(defaultActiveButton) {
+	textFg: windowActiveTextFg;
+	textFgOver: windowActiveTextFg;
+	textBg: lightButtonBgOver;
+	textBgOver: lightButtonBgOver;
+	width: -12px;
+	height: 18px;
+	radius: 9px;
+	textTop: 0px;
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: lightButtonBgRipple;
+	}
+}
diff --git a/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp b/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp
index c03c20c8e7e9d4..a76072b47718c7 100644
--- a/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "media/view/media_view_group_thumbs.h"
 
+#include "base/variant.h"
 #include "data/data_shared_media.h"
 #include "data/data_user_photos.h"
 #include "data/data_photo.h"
@@ -14,6 +15,7 @@ For license and copyright information please follow this link:
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_media_types.h"
+#include "data/data_poll.h"
 #include "data/data_session.h"
 #include "data/data_web_page.h"
 #include "data/data_file_origin.h"
@@ -58,6 +60,8 @@ using Key = GroupThumbs::Key;
 		return DebugSerializeMsgId(itemId);
 	}, [&](GroupThumbs::CollageKey key) {
 		return QString("collage%1").arg(key.index);
+	}, [&](GroupThumbs::InstantViewKey key) {
+		return QString("iv%1").arg(key.index);
 	});
 }
 
@@ -76,6 +80,14 @@ using Key = GroupThumbs::Key;
 }
 #endif
 
+Data::FileOrigin ComputeLocalThumbOrigin(const Context &context) {
+	return v::match(context, [](FullMsgId itemId) {
+		return Data::FileOrigin(itemId);
+	}, [](auto&&) {
+		return Data::FileOrigin();
+	});
+}
+
 Data::FileOrigin ComputeFileOrigin(const Key &key, const Context &context) {
 	return v::match(key, [&](PhotoId photoId) {
 		return v::match(context, [&](PeerId peerId) {
@@ -88,11 +100,9 @@ Data::FileOrigin ComputeFileOrigin(const Key &key, const Context &context) {
 	}, [](FullMsgId itemId) {
 		return Data::FileOrigin(itemId);
 	}, [&](GroupThumbs::CollageKey) {
-		return v::match(context, [](const GroupThumbs::CollageSlice &slice) {
-			return Data::FileOrigin(slice.context);
-		}, [](auto&&) {
-			return Data::FileOrigin();
-		});
+		return ComputeLocalThumbOrigin(context);
+	}, [&](GroupThumbs::InstantViewKey) {
+		return ComputeLocalThumbOrigin(context);
 	});
 }
 
@@ -135,6 +145,13 @@ Context ComputeContext(
 	return slice.context;
 }
 
+Context ComputeContext(
+		not_null<Main::Session*> session,
+		const GroupThumbs::InstantViewSlice &slice,
+		int index) {
+	return slice.context;
+}
+
 Key ComputeKey(const SharedMediaWithLastSlice &slice, int index) {
 	Expects(index >= 0 && index < slice.size());
 
@@ -155,6 +172,51 @@ Key ComputeKey(const GroupThumbs::CollageSlice &slice, int index) {
 	return GroupThumbs::CollageKey{ index };
 }
 
+Key ComputeKey(const GroupThumbs::InstantViewSlice &slice, int index) {
+	return GroupThumbs::InstantViewKey{ index };
+}
+
+const GroupThumbs::InstantViewItems *ComputeInstantViewItems(
+		const SharedMediaWithLastSlice &) {
+	return nullptr;
+}
+
+const GroupThumbs::InstantViewItems *ComputeInstantViewItems(
+		const UserPhotosSlice &) {
+	return nullptr;
+}
+
+const GroupThumbs::InstantViewItems *ComputeInstantViewItems(
+		const GroupThumbs::CollageSlice &) {
+	return nullptr;
+}
+
+const GroupThumbs::InstantViewItems *ComputeInstantViewItems(
+		const GroupThumbs::InstantViewSlice &slice) {
+	return &*slice.data;
+}
+
+std::optional<WebPageCollage::Item> PollAnswerMediaItemByIndex(
+		not_null<PollData*> poll,
+		int index) {
+	auto current = 0;
+	for (const auto &answer : poll->answers) {
+		const auto &media = answer.media;
+		auto item = std::optional<WebPageCollage::Item>();
+		if (media.photo) {
+			item = WebPageCollage::Item(media.photo);
+		} else if (media.document && !media.document->sticker()) {
+			item = WebPageCollage::Item(media.document);
+		}
+		if (item) {
+			if (current++ == index) {
+				return item;
+			}
+		}
+	}
+	return std::nullopt;
+}
+
 int ComputeThumbsLimit(int availableWidth) {
 	const auto singleWidth = st::mediaviewGroupWidth
 		+ 2 * st::mediaviewGroupSkip;
@@ -455,6 +517,10 @@ int GroupThumbs::CollageSlice::size() const {
 	return data->items.size();
 }
 
+int GroupThumbs::InstantViewSlice::size() const {
+	return data->size();
+}
+
 GroupThumbs::GroupThumbs(not_null<Main::Session*> session, Context context)
 : _session(session)
 , _context(context) {
@@ -475,8 +541,10 @@ void GroupThumbs::RefreshFromSlice(
 		int index,
 		int availableWidth) {
 	const auto context = ComputeContext(session, slice, index);
+	const auto instantViewItems = ComputeInstantViewItems(slice);
 	if (instance) {
 		instance->updateContext(context);
+		instance->updateInstantViewItems(instantViewItems);
 	}
 	if (v::is_null(context)) {
 		if (instance) {
@@ -507,9 +575,11 @@ void GroupThumbs::RefreshFromSlice(
 		if (!instance) {
 			instance = std::make_unique<GroupThumbs>(session, context);
 		}
+		instance->updateInstantViewItems(instantViewItems);
 		instance->fillItems(slice, from, index, till);
 		instance->resizeToWidth(availableWidth);
 	} else if (instance) {
+		instance->updateInstantViewItems(instantViewItems);
 		instance->clear();
 		instance->resizeToWidth(availableWidth);
 	}
@@ -576,6 +646,10 @@ void GroupThumbs::fillItems(
 	startDelayedAnimation();
 }
 
+void GroupThumbs::updateInstantViewItems(const InstantViewItems *items) {
+	_instantViewItems = items;
+}
+
 void GroupThumbs::animateAliveItems(int current) {
 	Expects(current >= 0 && current < _items.size());
 
@@ -674,11 +748,25 @@ auto GroupThumbs::createThumb(Key key)
 							key,
 							*invoice,
 							collageKey->index);
+					} else if (const auto poll = media->poll()) {
+						if (const auto item = PollAnswerMediaItemByIndex(
+								poll,
+								collageKey->index)) {
+							return v::match(*item, [&](PhotoData *photo) {
+								return createThumb(key, photo);
+							}, [&](DocumentData *document) {
+								return createThumb(key, document);
+							});
+						}
 					}
 				}
 			}
 		}
 		return createThumb(key, nullptr);
+	} else if (const auto instantViewKey = std::get_if<InstantViewKey>(&key)) {
+		return _instantViewItems
+			? createThumb(key, *_instantViewItems, instantViewKey->index)
+			: createThumb(key, nullptr);
 	}
 	Unexpected("Value of Key in GroupThumbs::createThumb()");
 }
@@ -691,13 +779,30 @@ auto GroupThumbs::createThumb(
 	if (index < 0 || index >= collage.items.size()) {
 		return createThumb(key, nullptr);
 	}
-	const auto &item = collage.items[index];
-	if (const auto photo = std::get_if<PhotoData*>(&item)) {
-		return createThumb(key, (*photo));
-	} else if (const auto document = std::get_if<DocumentData*>(&item)) {
-		return createThumb(key, (*document));
+	return v::match(collage.items[index], [&](PhotoData *photo) {
+		return createThumb(key, photo);
+	}, [&](DocumentData *document) {
+		return createThumb(key, document);
+	});
+}
+
+auto GroupThumbs::createThumb(
+	Key key,
+	const InstantViewItems &items,
+	int index)
+-> std::unique_ptr<Thumb> {
+	if (index < 0 || index >= items.size()) {
+		return createThumb(key, nullptr);
 	}
-	return createThumb(key, nullptr);
+	return v::match(items[index], [&](PhotoData *photo) {
+		return photo
+			? createThumb(key, not_null{ photo })
+			: createThumb(key, nullptr);
+	}, [&](DocumentData *document) {
+		return document
+			? createThumb(key, not_null{ document })
+			: createThumb(key, nullptr);
+	});
 }
 
 auto GroupThumbs::createThumb(
@@ -792,7 +897,17 @@ void GroupThumbs::Refresh(
 	RefreshFromSlice(session, instance, slice, index, availableWidth);
 }
 
+void GroupThumbs::Refresh(
+		not_null<Main::Session*> session,
+		std::unique_ptr<GroupThumbs> &instance,
+		const InstantViewSlice &slice,
+		int index,
+		int availableWidth) {
+	RefreshFromSlice(session, instance, slice, index, availableWidth);
+}
+
 void GroupThumbs::clear() {
+	_instantViewItems = nullptr;
 	if (_items.empty()) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/media/view/media_view_group_thumbs.h b/Telegram/SourceFiles/media/view/media_view_group_thumbs.h
index ebcdc373713ec0..608fd88a333f91 100644
--- a/Telegram/SourceFiles/media/view/media_view_group_thumbs.h
+++ b/Telegram/SourceFiles/media/view/media_view_group_thumbs.h
@@ -35,13 +35,27 @@ class GroupThumbs : public base::has_weak_ptr {
 			return index < other.index;
 		}
 	};
+	struct InstantViewKey {
+		int index = 0;
+
+		inline bool operator<(const InstantViewKey &other) const {
+			return index < other.index;
+		}
+	};
 	struct CollageSlice {
 		FullMsgId context;
 		not_null<const WebPageCollage*> data;
 
 		int size() const;
 	};
-	using Key = std::variant<PhotoId, FullMsgId, CollageKey>;
+	using InstantViewItems = std::vector<HistoryMessageMediaForInstantView::Item>;
+	struct InstantViewSlice {
+		FullMsgId context;
+		not_null<const InstantViewItems*> data;
+
+		int size() const;
+	};
+	using Key = std::variant<PhotoId, FullMsgId, CollageKey, InstantViewKey>;
 
 	static void Refresh(
 		not_null<Main::Session*> session,
@@ -61,6 +75,12 @@ class GroupThumbs : public base::has_weak_ptr {
 		const CollageSlice &slice,
 		int index,
 		int availableWidth);
+	static void Refresh(
+		not_null<Main::Session*> session,
+		std::unique_ptr<GroupThumbs> &instance,
+		const InstantViewSlice &slice,
+		int index,
+		int availableWidth);
 	void clear();
 
 	void resizeToWidth(int newWidth);
@@ -106,6 +126,7 @@ class GroupThumbs : public base::has_weak_ptr {
 	template <typename Slice>
 	void fillItems(const Slice &slice, int from, int index, int till);
 	void updateContext(Context context);
+	void updateInstantViewItems(const InstantViewItems *items);
 	void markCacheStale();
 	not_null<Thumb*> validateCacheEntry(Key key);
 	std::unique_ptr<Thumb> createThumb(Key key);
@@ -113,6 +134,10 @@ class GroupThumbs : public base::has_weak_ptr {
 		Key key,
 		const WebPageCollage &collage,
 		int index);
+	std::unique_ptr<Thumb> createThumb(
+		Key key,
+		const InstantViewItems &items,
+		int index);
 	std::unique_ptr<Thumb> createThumb(
 		Key key,
 		const Data::Invoice &invoice,
@@ -139,6 +164,7 @@ class GroupThumbs : public base::has_weak_ptr {
 	std::vector<not_null<Thumb*>> _items;
 	std::vector<not_null<Thumb*>> _dying;
 	base::flat_map<Key, std::unique_ptr<Thumb>> _cache;
+	const InstantViewItems *_instantViewItems = nullptr;
 	int _width = 0;
 	QRect _updatedRect;
 
diff --git a/Telegram/SourceFiles/media/view/media_view_metal_texture.h b/Telegram/SourceFiles/media/view/media_view_metal_texture.h
new file mode 100644
index 00000000000000..b637e36eb41309
--- /dev/null
+++ b/Telegram/SourceFiles/media/view/media_view_metal_texture.h
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#ifdef Q_OS_MAC
+
+#include <QtCore/QSize>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+class QRhi;
+class QRhiTexture;
+
+namespace Media::View {
+
+class MetalTextureCache final {
+public:
+	MetalTextureCache();
+	~MetalTextureCache();
+
+	bool createTexturesFromPixelBuffer(
+		QRhi *rhi,
+		void *cvPixelBuffer,
+		QRhiTexture **yTexture,
+		QRhiTexture **uvTexture,
+		QSize *lumaSize,
+		QSize *chromaSize);
+
+	void flush();
+
+private:
+	struct Private;
+	std::unique_ptr<Private> _private;
+
+};
+
+} // namespace Media::View
+
+#endif // Qt >= 6.7
+
+#endif // Q_OS_MAC
diff --git a/Telegram/SourceFiles/media/view/media_view_metal_texture.mm b/Telegram/SourceFiles/media/view/media_view_metal_texture.mm
new file mode 100644
index 00000000000000..f488cd6eaa6002
--- /dev/null
+++ b/Telegram/SourceFiles/media/view/media_view_metal_texture.mm
@@ -0,0 +1,163 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/view/media_view_metal_texture.h"
+
+#ifdef Q_OS_MAC
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+#include <CoreVideo/CoreVideo.h>
+#include <Metal/Metal.h>
+#include <rhi/qrhi.h>
+
+namespace Media::View {
+
+struct MetalTextureCache::Private {
+	CVMetalTextureCacheRef cache = nullptr;
+	CVMetalTextureRef yTextureRef = nullptr;
+	CVMetalTextureRef uvTextureRef = nullptr;
+	id<MTLDevice> device = nil;
+};
+
+MetalTextureCache::MetalTextureCache()
+: _private(std::make_unique<Private>()) {
+}
+
+MetalTextureCache::~MetalTextureCache() {
+	flush();
+	if (_private->cache) {
+		CFRelease(_private->cache);
+	}
+}
+
+bool MetalTextureCache::createTexturesFromPixelBuffer(
+		QRhi *rhi,
+		void *cvPixelBuffer,
+		QRhiTexture **yTexture,
+		QRhiTexture **uvTexture,
+		QSize *lumaSize,
+		QSize *chromaSize) {
+	if (!cvPixelBuffer || !rhi) {
+		return false;
+	}
+
+	auto pixelBuffer = static_cast<CVPixelBufferRef>(cvPixelBuffer);
+	const auto format = CVPixelBufferGetPixelFormatType(pixelBuffer);
+	if (format != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
+		&& format != kCVPixelFormatType_420YpCbCr8BiPlanarFullRange) {
+		return false;
+	}
+
+	const auto nativeHandles = rhi->nativeHandles();
+	if (!nativeHandles) {
+		return false;
+	}
+	auto *mtlDevice = static_cast<id<MTLDevice>>(
+		static_cast<const QRhiMetalNativeHandles*>(nativeHandles)->dev);
+	if (!mtlDevice) {
+		return false;
+	}
+
+	if (_private->device != mtlDevice) {
+		if (_private->cache) {
+			CFRelease(_private->cache);
+			_private->cache = nullptr;
+		}
+		_private->device = mtlDevice;
+	}
+	if (!_private->cache) {
+		auto status = CVMetalTextureCacheCreate(
+			kCFAllocatorDefault,
+			nil,
+			mtlDevice,
+			nil,
+			&_private->cache);
+		if (status != kCVReturnSuccess || !_private->cache) {
+			return false;
+		}
+	}
+
+	flush();
+
+	const auto width = CVPixelBufferGetWidth(pixelBuffer);
+	const auto height = CVPixelBufferGetHeight(pixelBuffer);
+
+	CVReturn status = CVMetalTextureCacheCreateTextureFromImage(
+		kCFAllocatorDefault,
+		_private->cache,
+		pixelBuffer,
+		nil,
+		MTLPixelFormatR8Unorm,
+		width,
+		height,
+		0,
+		&_private->yTextureRef);
+	if (status != kCVReturnSuccess || !_private->yTextureRef) {
+		return false;
+	}
+
+	const auto uvWidth = (width + 1) / 2;
+	const auto uvHeight = (height + 1) / 2;
+	status = CVMetalTextureCacheCreateTextureFromImage(
+		kCFAllocatorDefault,
+		_private->cache,
+		pixelBuffer,
+		nil,
+		MTLPixelFormatRG8Unorm,
+		uvWidth,
+		uvHeight,
+		1,
+		&_private->uvTextureRef);
+	if (status != kCVReturnSuccess || !_private->uvTextureRef) {
+		CFRelease(_private->yTextureRef);
+		_private->yTextureRef = nullptr;
+		return false;
+	}
+
+	auto *yMtlTexture = CVMetalTextureGetTexture(_private->yTextureRef);
+	auto *uvMtlTexture = CVMetalTextureGetTexture(_private->uvTextureRef);
+	if (!yMtlTexture || !uvMtlTexture) {
+		flush();
+		return false;
+	}
+
+	*lumaSize = QSize(width, height);
+	*chromaSize = QSize(uvWidth, uvHeight);
+
+	if (!*yTexture || (*yTexture)->pixelSize() != *lumaSize) {
+		delete *yTexture;
+		*yTexture = rhi->newTexture(QRhiTexture::R8, *lumaSize);
+	}
+	if (!*uvTexture || (*uvTexture)->pixelSize() != *chromaSize) {
+		delete *uvTexture;
+		*uvTexture = rhi->newTexture(QRhiTexture::RG8, *chromaSize);
+	}
+
+	(*yTexture)->createFrom({quint64(yMtlTexture), 0});
+	(*uvTexture)->createFrom({quint64(uvMtlTexture), 0});
+
+	return true;
+}
+
+void MetalTextureCache::flush() {
+	if (_private->yTextureRef) {
+		CFRelease(_private->yTextureRef);
+		_private->yTextureRef = nullptr;
+	}
+	if (_private->uvTextureRef) {
+		CFRelease(_private->uvTextureRef);
+		_private->uvTextureRef = nullptr;
+	}
+	if (_private->cache) {
+		CVMetalTextureCacheFlush(_private->cache, 0);
+	}
+}
+
+} // namespace Media::View
+
+#endif // Qt >= 6.7
+#endif // Q_OS_MAC
diff --git a/Telegram/SourceFiles/media/view/media_view_open_common.cpp b/Telegram/SourceFiles/media/view/media_view_open_common.cpp
new file mode 100644
index 00000000000000..de40d8e3074efd
--- /dev/null
+++ b/Telegram/SourceFiles/media/view/media_view_open_common.cpp
@@ -0,0 +1,41 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/view/media_view_open_common.h"
+
+#include "history/history_item.h"
+#include "data/data_media_types.h"
+#include "data/data_web_page.h"
+
+namespace Media::View {
+
+TimeId ExtractVideoTimestamp(not_null<HistoryItem*> item) {
+	const auto media = item->media();
+	if (!media) {
+		return 0;
+	} else if (const auto timestamp = media->videoTimestamp()) {
+		return timestamp;
+	} else if (const auto webpage = media->webpage()) {
+		return webpage->extractVideoTimestamp();
+	}
+	return 0;
+}
+
+TextWithEntities StripQuoteEntities(TextWithEntities text) {
+	for (auto i = text.entities.begin(); i != text.entities.end();) {
+		if (i->type() == EntityType::Blockquote) {
+			i = text.entities.erase(i);
+			continue;
+		} else if (i->type() == EntityType::Pre) {
+			*i = EntityInText(EntityType::Code, i->offset(), i->length());
+		}
+		++i;
+	}
+	return text;
+}
+
+} // namespace Media::View
diff --git a/Telegram/SourceFiles/media/view/media_view_open_common.h b/Telegram/SourceFiles/media/view/media_view_open_common.h
index ff56af25dae51d..0676cc9cd19b6a 100644
--- a/Telegram/SourceFiles/media/view/media_view_open_common.h
+++ b/Telegram/SourceFiles/media/view/media_view_open_common.h
@@ -30,11 +30,15 @@ struct OpenRequest {
 		Window::SessionController *controller,
 		not_null<PhotoData*> photo,
 		HistoryItem *item,
-		MsgId topicRootId)
+		MsgId topicRootId,
+		PeerId monoforumPeerId,
+		bool showDrawButton = false)
 	: _controller(controller)
 	, _photo(photo)
 	, _item(item)
-	, _topicRootId(topicRootId) {
+	, _topicRootId(topicRootId)
+	, _monoforumPeerId(monoforumPeerId)
+	, _showDrawButton(showDrawButton) {
 	}
 	OpenRequest(
 		Window::SessionController *controller,
@@ -50,14 +54,18 @@ struct OpenRequest {
 		not_null<DocumentData*> document,
 		HistoryItem *item,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		bool continueStreaming = false,
-		crl::time startTime = 0)
+		crl::time startTime = 0,
+		bool showDrawButton = false)
 	: _controller(controller)
 	, _document(document)
 	, _item(item)
 	, _topicRootId(topicRootId)
+	, _monoforumPeerId(monoforumPeerId)
 	, _continueStreaming(continueStreaming)
-	, _startTime(startTime) {
+	, _startTime(startTime)
+	, _showDrawButton(showDrawButton) {
 	}
 	OpenRequest(
 		Window::SessionController *controller,
@@ -77,6 +85,17 @@ struct OpenRequest {
 	, _storiesContext(context) {
 	}
 
+	OpenRequest(
+		Window::SessionController *controller,
+		std::shared_ptr<Data::GroupCall> call,
+		QString linkSlug,
+		MsgId joinMessageId)
+	: _controller(controller)
+	, _call(std::move(call))
+	, _callLinkSlug(std::move(linkSlug))
+	, _callJoinMessageId(joinMessageId) {
+	}
+
 	[[nodiscard]] PeerData *peer() const {
 		return _peer;
 	}
@@ -92,6 +111,9 @@ struct OpenRequest {
 	[[nodiscard]] MsgId topicRootId() const {
 		return _topicRootId;
 	}
+	[[nodiscard]] PeerId monoforumPeerId() const {
+		return _monoforumPeerId;
+	}
 
 	[[nodiscard]] DocumentData *document() const {
 		return _document;
@@ -104,6 +126,16 @@ struct OpenRequest {
 		return _storiesContext;
 	}
 
+	[[nodiscard]] const std::shared_ptr<Data::GroupCall> &call() const {
+		return _call;
+	}
+	[[nodiscard]] const QString &callLinkSlug() const {
+		return _callLinkSlug;
+	}
+	[[nodiscard]] MsgId callJoinMessageId() const {
+		return _callJoinMessageId;
+	}
+
 	[[nodiscard]] std::optional<Data::CloudTheme> cloudTheme() const {
 		return _cloudTheme;
 	}
@@ -120,6 +152,10 @@ struct OpenRequest {
 		return _startTime;
 	}
 
+	[[nodiscard]] bool showDrawButton() const {
+		return _showDrawButton;
+	}
+
 private:
 	Window::SessionController *_controller = nullptr;
 	DocumentData *_document = nullptr;
@@ -129,10 +165,20 @@ struct OpenRequest {
 	PeerData *_peer = nullptr;
 	HistoryItem *_item = nullptr;
 	MsgId _topicRootId = 0;
+	PeerId _monoforumPeerId = 0;
 	std::optional<Data::CloudTheme> _cloudTheme = std::nullopt;
 	bool _continueStreaming = false;
 	crl::time _startTime = 0;
+	bool _showDrawButton = false;
+
+	std::shared_ptr<Data::GroupCall> _call;
+	QString _callLinkSlug;
+	MsgId _callJoinMessageId = 0;
 
 };
 
+[[nodiscard]] TimeId ExtractVideoTimestamp(not_null<HistoryItem*> item);
+
+[[nodiscard]] TextWithEntities StripQuoteEntities(TextWithEntities text);
+
 } // namespace Media::View
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
index 99be5557f6f769..2eafa76ba62f37 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.cpp
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 #include "ui/painter.h"
 #include "media/stories/media_stories_view.h"
 #include "media/streaming/media_streaming_common.h"
+#include "media/view/media_view_video_stream.h"
 #include "platform/platform_overlay_widget.h"
 #include "base/platform/base_platform_info.h"
 #include "core/crash_reports.h"
@@ -27,7 +28,9 @@ constexpr auto kRadialLoadingOffset = kNotchOffset + 4;
 constexpr auto kThemePreviewOffset = kRadialLoadingOffset + 4;
 constexpr auto kDocumentBubbleOffset = kThemePreviewOffset + 4;
 constexpr auto kSaveMsgOffset = kDocumentBubbleOffset + 4;
-constexpr auto kFooterOffset = kSaveMsgOffset + 4;
+constexpr auto kChapterOffset = kSaveMsgOffset + 4;
+constexpr auto kSpeedBoostOffset = kChapterOffset + 4;
+constexpr auto kFooterOffset = kSpeedBoostOffset + 4;
 constexpr auto kCaptionOffset = kFooterOffset + 4;
 constexpr auto kGroupThumbsOffset = kCaptionOffset + 4;
 constexpr auto kControlsOffset = kGroupThumbsOffset + 4;
@@ -104,12 +107,40 @@ float roundedCorner() {
 	};
 }
 
+[[nodiscard]] QRectF StoryCropTextureRect(
+		QSizeF imageSize,
+		QSizeF targetSize) {
+	if (imageSize.isEmpty() || targetSize.isEmpty()) {
+		return QRectF(0., 0., 1., 1.);
+	}
+	const auto targetAspect = targetSize.width() / targetSize.height();
+	const auto imageAspect = imageSize.width() / imageSize.height();
+	if (imageAspect > targetAspect) {
+		const auto cropW = imageSize.height() * targetAspect;
+		const auto offset = (imageSize.width() - cropW) / 2.;
+		return QRectF(
+			offset / imageSize.width(),
+			0.,
+			cropW / imageSize.width(),
+			1.);
+	} else if (imageAspect < targetAspect) {
+		const auto cropH = imageSize.width() / targetAspect;
+		const auto offset = (imageSize.height() - cropH) / 2.;
+		return QRectF(
+			0.,
+			offset / imageSize.height(),
+			1.,
+			cropH / imageSize.height());
+	}
+	return QRectF(0., 0., 1., 1.);
+}
+
 } // namespace
 
 OverlayWidget::RendererGL::RendererGL(not_null<OverlayWidget*> owner)
 : _owner(owner) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controlsFadeImage.invalidate();
 		_radialImage.invalidate();
 		_documentBubbleImage.invalidate();
@@ -122,11 +153,11 @@ OverlayWidget::RendererGL::RendererGL(not_null<OverlayWidget*> owner)
 
 	crl::on_main(this, [=] {
 		_owner->_storiesChanged.events(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (_owner->_storiesSession) {
 				Data::AmPremiumValue(
 					_owner->_storiesSession
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					invalidateControls();
 				}, _storiesLifetime);
 			} else {
@@ -137,9 +168,7 @@ OverlayWidget::RendererGL::RendererGL(not_null<OverlayWidget*> owner)
 	});
 }
 
-void OverlayWidget::RendererGL::init(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions &f) {
+void OverlayWidget::RendererGL::init(QOpenGLFunctions &f) {
 	constexpr auto kQuads = 9;
 	constexpr auto kQuadVertices = kQuads * 4;
 	constexpr auto kQuadValues = kQuadVertices * 4;
@@ -243,10 +272,18 @@ void OverlayWidget::RendererGL::init(
 		renderer ? renderer : "[nullptr]");
 }
 
-void OverlayWidget::RendererGL::deinit(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions *f) {
+void OverlayWidget::RendererGL::deinit(QOpenGLFunctions *f) {
 	_textures.destroy(f);
+	for (auto i = 0; i != 3; ++i) {
+		_rgbaSize[i] = QSize();
+		_cacheKeys[i] = 0;
+	}
+	_lumaSize = QSize();
+	_chromaSize = QSize();
+	_chromaSizeV = QSize();
+	_chromaNV12 = false;
+	_trackFrameIndex = 0;
+	_streamedIndex = 0;
 	_imageProgram = std::nullopt;
 	_texturedVertexShader = nullptr;
 	_withTransparencyProgram = std::nullopt;
@@ -275,6 +312,9 @@ void OverlayWidget::RendererGL::paint(
 	if (handleHideWorkaround(f)) {
 		return;
 	}
+	if (const auto stream = _owner->_videoStream.get()) {
+		stream->ensureBorrowedRenderer(f);
+	}
 	const auto factor = widget->devicePixelRatioF();
 	if (_factor != factor) {
 		_factor = factor;
@@ -339,6 +379,10 @@ void OverlayWidget::RendererGL::paintBackground() {
 	}
 }
 
+void OverlayWidget::RendererGL::paintVideoStream() {
+	_owner->_videoStream->borrowedPaint(*_f);
+}
+
 void OverlayWidget::RendererGL::paintTransformedVideoFrame(
 		ContentGeometry geometry) {
 	const auto data = _owner->videoFrameWithInfo();
@@ -352,6 +396,16 @@ void OverlayWidget::RendererGL::paintTransformedVideoFrame(
 			data.alpha,
 			data.alpha);
 		return;
+	} else if (data.format == Streaming::FrameFormat::NativeTexture) {
+		const auto image = _owner->currentVideoFrameImage();
+		if (!image.isNull()) {
+			paintTransformedStaticContent(
+				image,
+				geometry,
+				data.alpha,
+				data.alpha);
+		}
+		return;
 	}
 	Assert(!data.yuv->size.isEmpty());
 	const auto program = (data.format == Streaming::FrameFormat::NV12)
@@ -390,8 +444,8 @@ void OverlayWidget::RendererGL::paintTransformedVideoFrame(
 			nv12changed ? QSize() : _chromaSize,
 			yuv->u.stride / (nv12 ? 2 : 1),
 			yuv->u.data);
+		_chromaSize = yuv->chromaSize;
 		if (nv12) {
-			_chromaSize = yuv->chromaSize;
 			_f->glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
 		}
 		_chromaNV12 = nv12;
@@ -409,10 +463,10 @@ void OverlayWidget::RendererGL::paintTransformedVideoFrame(
 				GL_ALPHA,
 				GL_ALPHA,
 				yuv->chromaSize,
-				_chromaSize,
+				_chromaSizeV,
 				yuv->v.stride,
 				yuv->v.data);
-			_chromaSize = yuv->chromaSize;
+			_chromaSizeV = yuv->chromaSize;
 			_f->glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
 		}
 
@@ -429,7 +483,19 @@ void OverlayWidget::RendererGL::paintTransformedVideoFrame(
 	program->setUniformValue("f_texture", GLint(nv12 ? 2 : 3));
 
 	toggleBlending(geometry.roundRadius > 0.);
-	paintTransformedContent(program, geometry, false);
+	const auto textureRect = _owner->_stories
+		? StoryCropTextureRect(QSizeF(yuv->size), geometry.rect.size())
+		: QRectF(0., 0., 1., 1.);
+	paintTransformedContent(program, geometry, false, textureRect);
+
+	if (_owner->_recognitionResult.success
+		&& !_owner->_recognitionResult.items.empty()) {
+		const auto opacity = _owner->_recognitionAnimation.value(
+			_owner->_showRecognitionResults ? 1. : 0.);
+		if (opacity > 0.) {
+			paintRecognitionOverlay(data.image, geometry, opacity);
+		}
+	}
 }
 
 void OverlayWidget::RendererGL::paintTransformedStaticContent(
@@ -504,13 +570,31 @@ void OverlayWidget::RendererGL::paintTransformedStaticContent(
 
 	toggleBlending((geometry.roundRadius > 0.)
 		|| (semiTransparent && !fillTransparentBackground));
-	paintTransformedContent(&*program, geometry, fillTransparentBackground);
+	const auto textureRect = _owner->_stories
+		? StoryCropTextureRect(QSizeF(image.size()), geometry.rect.size())
+		: QRectF(0., 0., 1., 1.);
+	paintTransformedContent(
+		&*program,
+		geometry,
+		fillTransparentBackground,
+		textureRect);
+
+	if (_owner->_recognitionResult.success
+		&& !_owner->_recognitionResult.items.empty()
+		&& !image.isNull()) {
+		const auto opacity = _owner->_recognitionAnimation.value(
+			_owner->_showRecognitionResults ? 1. : 0.);
+		if (opacity > 0.) {
+			paintRecognitionOverlay(image, geometry, opacity);
+		}
+	}
 }
 
 void OverlayWidget::RendererGL::paintTransformedContent(
 		not_null<QOpenGLShaderProgram*> program,
 		ContentGeometry geometry,
-		bool fillTransparentBackground) {
+		bool fillTransparentBackground,
+		QRectF textureRect) {
 	const auto rect = scaleRect(
 		transformRect(geometry.rect),
 		geometry.scale);
@@ -530,18 +614,22 @@ void OverlayWidget::RendererGL::paintTransformedContent(
 	const auto topright = rotated(rect.right(), rect.top());
 	const auto bottomright = rotated(rect.right(), rect.bottom());
 	const auto bottomleft = rotated(rect.left(), rect.bottom());
+	const auto texLeft = float(textureRect.x());
+	const auto texRight = float(textureRect.x() + textureRect.width());
+	const auto texTop = 1.f - float(textureRect.y());
+	const auto texBottom = 1.f - float(textureRect.y() + textureRect.height());
 	const GLfloat coords[] = {
 		topleft[0], topleft[1],
-		0.f, 1.f,
+		texLeft, texTop,
 
 		topright[0], topright[1],
-		1.f, 1.f,
+		texRight, texTop,
 
 		bottomright[0], bottomright[1],
-		1.f, 0.f,
+		texRight, texBottom,
 
 		bottomleft[0], bottomleft[1],
-		0.f, 0.f,
+		texLeft, texBottom,
 	};
 
 	_contentBuffer->bind();
@@ -658,6 +746,20 @@ void OverlayWidget::RendererGL::paintSaveMsg(QRect outer) {
 	}, kSaveMsgOffset, true);
 }
 
+void OverlayWidget::RendererGL::paintChapter(QRect outer) {
+	paintUsingRaster(_chapterImage, outer, [&](Painter &&p) {
+		const auto newOuter = QRect(QPoint(), outer.size());
+		_owner->paintChapterContent(p, newOuter, newOuter);
+	}, kChapterOffset, true);
+}
+
+void OverlayWidget::RendererGL::paintSpeedBoost(QRect outer) {
+	paintUsingRaster(_speedBoostImage, outer, [&](Painter &&p) {
+		const auto newOuter = QRect(QPoint(), outer.size());
+		_owner->paintSpeedBoostContent(p, newOuter, newOuter);
+	}, kSpeedBoostOffset, true);
+}
+
 void OverlayWidget::RendererGL::paintControlsStart() {
 	validateControls();
 	_f->glActiveTexture(GL_TEXTURE0);
@@ -753,6 +855,8 @@ auto OverlayWidget::RendererGL::controlMeta(Over control) const -> Control {
 	case Over::Share: return { 3, &st::mediaviewShare };
 	case Over::Rotate: return { 4, &st::mediaviewRotate };
 	case Over::More: return { 5, &st::mediaviewMore };
+	case Over::Draw: return { 6, &st::mediaviewDraw };
+	case Over::Recognize: return { 7, &st::mediaviewRecognize };
 	}
 	Unexpected("Control value in OverlayWidget::RendererGL::ControlIndex.");
 }
@@ -768,6 +872,8 @@ void OverlayWidget::RendererGL::validateControls() {
 		controlMeta(Over::Share),
 		controlMeta(Over::Rotate),
 		controlMeta(Over::More),
+		controlMeta(Over::Draw),
+		controlMeta(Over::Recognize),
 	};
 	auto maxWidth = 0;
 	auto fullHeight = 0;
@@ -1114,4 +1220,112 @@ Rect OverlayWidget::RendererGL::scaleRect(
 		unscaled.height() + addh);
 }
 
+void OverlayWidget::RendererGL::paintRecognitionOverlay(
+		const QImage &image,
+		ContentGeometry geometry,
+		float64 opacity) {
+	const auto rect = scaleRect(
+		transformRect(geometry.rect),
+		geometry.scale);
+	const auto centerx = rect.x() + rect.width() / 2;
+	const auto centery = rect.y() + rect.height() / 2;
+	const auto radians = float(geometry.rotation * M_PI / 180.);
+	const auto rsin = std::sin(radians);
+	const auto rcos = std::cos(radians);
+	const auto rotated = [&](float x, float y) -> std::array<float, 2> {
+		x -= centerx;
+		y -= centery;
+		return std::array<float, 2>{
+			centerx + (x * rcos + y * rsin),
+			centery + (y * rcos - x * rsin)
+		};
+	};
+
+	const auto scale = rect.width() / float64(image.width());
+	const auto imageTopLeft = QPointF(rect.left(), rect.top());
+
+	_fillProgram->bind();
+	_fillProgram->setUniformValue("viewport", _uniformViewport);
+	_contentBuffer->bind();
+
+	_f->glEnable(GL_STENCIL_TEST);
+	_f->glClear(GL_STENCIL_BUFFER_BIT);
+	_f->glStencilFunc(GL_ALWAYS, 1, 0xFF);
+	_f->glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
+	_f->glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+
+	for (const auto &item : _owner->_recognitionResult.items) {
+		const auto &r = item.rect;
+		const auto lightRect = QRectF(
+			imageTopLeft.x() + r.left() * _ifactor * scale,
+			imageTopLeft.y()
+				+ (image.height() - (r.y() + r.height()) * _ifactor) * scale,
+			r.width() * _ifactor * scale,
+			r.height() * _ifactor * scale);
+		const auto tl = rotated(lightRect.left(), lightRect.top());
+		const auto tr = rotated(lightRect.right(), lightRect.top());
+		const auto br = rotated(lightRect.right(), lightRect.bottom());
+		const auto bl = rotated(lightRect.left(), lightRect.bottom());
+		const GLfloat coords[] = {
+			tl[0], tl[1], tr[0], tr[1], br[0], br[1], bl[0], bl[1],
+		};
+		_contentBuffer->write(0, coords, sizeof(coords));
+		FillRectangle(*_f, &*_fillProgram, 0, QColor(255, 255, 255));
+	}
+
+	_f->glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+	_f->glStencilFunc(GL_NOTEQUAL, 1, 0xFF);
+	_f->glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+
+	_f->glEnable(GL_BLEND);
+	_f->glBlendFuncSeparate(GL_ZERO, GL_SRC_COLOR, GL_ZERO, GL_ONE);
+
+	const auto tl = rotated(rect.left(), rect.top());
+	const auto tr = rotated(rect.right(), rect.top());
+	const auto br = rotated(rect.right(), rect.bottom());
+	const auto bl = rotated(rect.left(), rect.bottom());
+	const auto dark = int(150 + (255 - 150) * (1. - opacity));
+	const GLfloat darkRect[] = {
+		tl[0], tl[1], tr[0], tr[1], br[0], br[1], bl[0], bl[1],
+	};
+	_contentBuffer->write(0, darkRect, sizeof(darkRect));
+	FillRectangle(*_f, &*_fillProgram, 0, QColor(dark, dark, dark, 255));
+
+	const auto spans = _owner->_recognition.spans();
+	if (!spans.empty()) {
+		_f->glDisable(GL_STENCIL_TEST);
+		_f->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		const auto alpha = int(128 * opacity);
+		for (const auto &span : spans) {
+			const auto band = _owner->_recognition.bandFor(
+				span.item,
+				span.from,
+				span.till);
+			if (band.isEmpty()) {
+				continue;
+			}
+			const auto selRect = QRectF(
+				imageTopLeft.x() + band.left() * _ifactor * scale,
+				imageTopLeft.y()
+					+ (image.height() - (band.y() + band.height()) * _ifactor)
+						* scale,
+				band.width() * _ifactor * scale,
+				band.height() * _ifactor * scale);
+			const auto stl = rotated(selRect.left(), selRect.top());
+			const auto str = rotated(selRect.right(), selRect.top());
+			const auto sbr = rotated(selRect.right(), selRect.bottom());
+			const auto sbl = rotated(selRect.left(), selRect.bottom());
+			const GLfloat selCoords[] = {
+				stl[0], stl[1], str[0], str[1],
+				sbr[0], sbr[1], sbl[0], sbl[1],
+			};
+			_contentBuffer->write(0, selCoords, sizeof(selCoords));
+			FillRectangle(*_f, &*_fillProgram, 0, QColor(48, 128, 255, alpha));
+		}
+	}
+
+	_f->glDisable(GL_BLEND);
+	_f->glDisable(GL_STENCIL_TEST);
+}
+
 } // namespace Media::View
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
index 0138a492dc90ee..680e4448c4cc60 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_opengl.h
@@ -21,13 +21,9 @@ class OverlayWidget::RendererGL final
 public:
 	explicit RendererGL(not_null<OverlayWidget*> owner);
 
-	void init(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions &f) override;
+	void init(QOpenGLFunctions &f) override;
 
-	void deinit(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions *f) override;
+	void deinit(QOpenGLFunctions *f) override;
 
 	void paint(
 		not_null<QOpenGLWidget*> widget,
@@ -43,6 +39,7 @@ class OverlayWidget::RendererGL final
 	bool handleHideWorkaround(QOpenGLFunctions &f);
 
 	void paintBackground() override;
+	void paintVideoStream() override;
 	void paintTransformedVideoFrame(ContentGeometry geometry) override;
 	void paintTransformedStaticContent(
 		const QImage &image,
@@ -53,7 +50,8 @@ class OverlayWidget::RendererGL final
 	void paintTransformedContent(
 		not_null<QOpenGLShaderProgram*> program,
 		ContentGeometry geometry,
-		bool fillTransparentBackground);
+		bool fillTransparentBackground,
+		QRectF textureRect = QRectF(0., 0., 1., 1.));
 	void paintRadialLoading(
 		QRect inner,
 		bool radial,
@@ -61,6 +59,8 @@ class OverlayWidget::RendererGL final
 	void paintThemePreview(QRect outer) override;
 	void paintDocumentBubble(QRect outer, QRect icon) override;
 	void paintSaveMsg(QRect outer) override;
+	void paintChapter(QRect outer) override;
+	void paintSpeedBoost(QRect outer) override;
 	void paintControlsStart() override;
 	void paintControl(
 		Over control,
@@ -79,6 +79,11 @@ class OverlayWidget::RendererGL final
 		QRect rect,
 		float64 opacity = 1.) override;
 
+	void paintRecognitionOverlay(
+		const QImage &image,
+		ContentGeometry geometry,
+		float64 opacity);
+
 	//void invalidate();
 
 	void paintUsingRaster(
@@ -130,7 +135,8 @@ class OverlayWidget::RendererGL final
 	Ui::GL::Textures<6> _textures; // image, sibling, right sibling, y, u, v
 	QSize _rgbaSize[3];
 	QSize _lumaSize;
-	QSize _chromaSize;
+	QSize _chromaSize; // size of texture 4 (UV for NV12, U for YUV420)
+	QSize _chromaSizeV; // size of texture 5 (V for YUV420 only)
 	qint64 _cacheKeys[3] = { 0 }; // image, sibling, right sibling
 	int _trackFrameIndex = 0;
 	int _streamedIndex = 0;
@@ -141,6 +147,8 @@ class OverlayWidget::RendererGL final
 	Ui::GL::Image _documentBubbleImage;
 	Ui::GL::Image _themePreviewImage;
 	Ui::GL::Image _saveMsgImage;
+	Ui::GL::Image _chapterImage;
+	Ui::GL::Image _speedBoostImage;
 	Ui::GL::Image _footerImage;
 	Ui::GL::Image _captionImage;
 	Ui::GL::Image _groupThumbsImage;
@@ -149,7 +157,7 @@ class OverlayWidget::RendererGL final
 	static constexpr auto kStoriesSiblingPartsCount = 4;
 	Ui::GL::Image _storiesSiblingParts[kStoriesSiblingPartsCount];
 
-	static constexpr auto kControlsCount = 6;
+	static constexpr auto kControlsCount = 8;
 	[[nodiscard]] Control controlMeta(Over control) const;
 
 	// Last one is for the over circle image.
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
index 2867a363c32605..96191417734cdb 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_raster.cpp
@@ -10,10 +10,38 @@ For license and copyright information please follow this link:
 #include "ui/painter.h"
 #include "media/stories/media_stories_view.h"
 #include "media/view/media_view_pip.h"
+#include "media/view/media_view_video_stream.h"
 #include "platform/platform_overlay_widget.h"
 #include "styles/style_media_view.h"
 
 namespace Media::View {
+namespace {
+
+[[nodiscard]] QRectF StoryCropRect(QSizeF imageSize, QSizeF targetSize) {
+	if (imageSize.isEmpty() || targetSize.isEmpty()) {
+		return QRectF();
+	}
+	const auto targetAspect = targetSize.width() / targetSize.height();
+	const auto imageAspect = imageSize.width() / imageSize.height();
+	if (imageAspect > targetAspect) {
+		const auto cropW = imageSize.height() * targetAspect;
+		return QRectF(
+			(imageSize.width() - cropW) / 2.,
+			0.,
+			cropW,
+			imageSize.height());
+	} else if (imageAspect < targetAspect) {
+		const auto cropH = imageSize.width() / targetAspect;
+		return QRectF(
+			0.,
+			(imageSize.height() - cropH) / 2.,
+			imageSize.width(),
+			cropH);
+	}
+	return QRectF();
+}
+
+} // namespace
 
 OverlayWidget::RendererSW::RendererSW(not_null<OverlayWidget*> owner)
 : _owner(owner)
@@ -27,7 +55,7 @@ bool OverlayWidget::RendererSW::handleHideWorkaround() {
 }
 
 void OverlayWidget::RendererSW::paintFallback(
-		Painter &&p,
+		Painter &p,
 		const QRegion &clip,
 		Ui::GL::Backend backend) {
 	if (handleHideWorkaround()) {
@@ -35,6 +63,9 @@ void OverlayWidget::RendererSW::paintFallback(
 		p.fillRect(clip.boundingRect(), Qt::transparent);
 		return;
 	}
+	if (const auto stream = _owner->_videoStream.get()) {
+		stream->ensureBorrowedRenderer();
+	}
 	_p = &p;
 	_clip = &clip;
 	_clipOuter = clip.boundingRect();
@@ -65,6 +96,10 @@ void OverlayWidget::RendererSW::paintBackground() {
 	_p->setCompositionMode(m);
 }
 
+void OverlayWidget::RendererSW::paintVideoStream() {
+	_owner->_videoStream->borrowedPaint(*_p, *_clip);
+}
+
 QRect OverlayWidget::RendererSW::TransformRect(
 		QRectF geometry,
 		int rotation) {
@@ -92,7 +127,11 @@ void OverlayWidget::RendererSW::paintTransformedVideoFrame(
 	if (!rect.intersects(_clipOuter)) {
 		return;
 	}
-	paintTransformedImage(_owner->videoFrame(), rect, rotation);
+	const auto image = _owner->videoFrame();
+	const auto sourceRect = _owner->_stories
+		? StoryCropRect(QSizeF(image.size()), geometry.rect.size())
+		: QRectF();
+	paintTransformedImage(image, rect, rotation, sourceRect);
 	paintControlsFade(rect, geometry);
 }
 
@@ -112,7 +151,10 @@ void OverlayWidget::RendererSW::paintTransformedStaticContent(
 		_p->fillRect(rect, _transparentBrush);
 	}
 	if (!image.isNull()) {
-		paintTransformedImage(image, rect, rotation);
+		const auto sourceRect = _owner->_stories
+			? StoryCropRect(QSizeF(image.size()), geometry.rect.size())
+			: QRectF();
+		paintTransformedImage(image, rect, rotation, sourceRect);
 	}
 	paintControlsFade(rect, geometry);
 }
@@ -184,14 +226,19 @@ void OverlayWidget::RendererSW::paintControlsFade(
 void OverlayWidget::RendererSW::paintTransformedImage(
 		const QImage &image,
 		QRect rect,
-		int rotation) {
+		int rotation,
+		const QRectF &sourceRect) {
 	PainterHighQualityEnabler hq(*_p);
 	if (UsePainterRotation(rotation)) {
 		if (rotation) {
 			_p->save();
 			_p->rotate(rotation);
 		}
-		_p->drawImage(RotatedRect(rect, rotation), image);
+		if (sourceRect.isValid()) {
+			_p->drawImage(QRectF(RotatedRect(rect, rotation)), image, sourceRect);
+		} else {
+			_p->drawImage(RotatedRect(rect, rotation), image);
+		}
 		if (rotation) {
 			_p->restore();
 		}
@@ -228,6 +275,18 @@ void OverlayWidget::RendererSW::paintSaveMsg(QRect outer) {
 	}
 }
 
+void OverlayWidget::RendererSW::paintChapter(QRect outer) {
+	if (outer.intersects(_clipOuter)) {
+		_owner->paintChapterContent(*_p, outer, _clipOuter);
+	}
+}
+
+void OverlayWidget::RendererSW::paintSpeedBoost(QRect outer) {
+	if (outer.intersects(_clipOuter)) {
+		_owner->paintSpeedBoostContent(*_p, outer, _clipOuter);
+	}
+}
+
 void OverlayWidget::RendererSW::paintControlsStart() {
 }
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_raster.h b/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
index 8057e4d91b498c..7a75930cd33226 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_raster.h
@@ -16,12 +16,13 @@ class OverlayWidget::RendererSW final : public OverlayWidget::Renderer {
 	explicit RendererSW(not_null<OverlayWidget*> owner);
 
 	void paintFallback(
-		Painter &&p,
+		Painter &p,
 		const QRegion &clip,
 		Ui::GL::Backend backend) override;
 
 private:
 	void paintBackground() override;
+	void paintVideoStream() override;
 	void paintTransformedVideoFrame(ContentGeometry geometry) override;
 	void paintTransformedStaticContent(
 		const QImage &image,
@@ -32,7 +33,8 @@ class OverlayWidget::RendererSW final : public OverlayWidget::Renderer {
 	void paintTransformedImage(
 		const QImage &image,
 		QRect rect,
-		int rotation);
+		int rotation,
+		const QRectF &sourceRect = QRectF());
 	void paintControlsFade(QRect content, const ContentGeometry &geometry);
 	void paintRadialLoading(
 		QRect inner,
@@ -41,6 +43,8 @@ class OverlayWidget::RendererSW final : public OverlayWidget::Renderer {
 	void paintThemePreview(QRect outer) override;
 	void paintDocumentBubble(QRect outer, QRect icon) override;
 	void paintSaveMsg(QRect outer) override;
+	void paintChapter(QRect outer) override;
+	void paintSpeedBoost(QRect outer) override;
 	void paintControlsStart() override;
 	void paintControl(
 		Over control,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_renderer.h b/Telegram/SourceFiles/media/view/media_view_overlay_renderer.h
index 612bad39eb18c6..a77a33ef876f89 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_renderer.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_renderer.h
@@ -18,6 +18,7 @@ namespace Media::View {
 class OverlayWidget::Renderer : public Ui::GL::Renderer {
 public:
 	virtual void paintBackground() = 0;
+	virtual void paintVideoStream() = 0;
 	virtual void paintTransformedVideoFrame(ContentGeometry geometry) = 0;
 	virtual void paintTransformedStaticContent(
 		const QImage &image,
@@ -32,6 +33,8 @@ class OverlayWidget::Renderer : public Ui::GL::Renderer {
 	virtual void paintThemePreview(QRect outer) = 0;
 	virtual void paintDocumentBubble(QRect outer, QRect icon) = 0;
 	virtual void paintSaveMsg(QRect outer) = 0;
+	virtual void paintChapter(QRect outer) = 0;
+	virtual void paintSpeedBoost(QRect outer) = 0;
 	virtual void paintControlsStart() = 0;
 	virtual void paintControl(
 		Over control,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_rhi.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_rhi.cpp
new file mode 100644
index 00000000000000..b15549770b63b5
--- /dev/null
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_rhi.cpp
@@ -0,0 +1,1868 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/view/media_view_overlay_rhi.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+#include "ui/rhi/rhi_shader.h"
+#include "ui/painter.h"
+#include "data/data_peer_values.h"
+#include "media/streaming/media_streaming_common.h"
+#include "media/view/media_view_video_stream.h"
+#include "platform/platform_overlay_widget.h"
+#include "base/debug_log.h"
+#include "styles/style_media_view.h"
+
+#include <rhi/qrhi.h>
+
+namespace Media::View {
+namespace {
+
+using namespace Ui::GL;
+
+struct ImageUniforms {
+	float viewport[2];
+	float g_opacity;
+	float _pad0;
+};
+static_assert(sizeof(ImageUniforms) % 16 == 0);
+
+struct ContentUniforms {
+	float viewport[2];
+	float _pad0[2];
+	float shadowTopRect[4];
+	float shadowBottomSkipOpacityFullFade[4];
+	float roundRect[4];
+	float roundRadius;
+	float _pad1[3];
+};
+static_assert(sizeof(ContentUniforms) == 80);
+
+struct TransparentContentUniforms {
+	float viewport[2];
+	float _pad0[2];
+	float shadowTopRect[4];
+	float shadowBottomSkipOpacityFullFade[4];
+	float transparentBg[4];
+	float transparentFg[4];
+	float transparentSize;
+	float _pad1[3];
+};
+static_assert(sizeof(TransparentContentUniforms) == 96);
+
+struct RoundedCornersUniforms {
+	float viewport[2];
+	float _pad0[2];
+	float roundRect[4];
+	float roundRadius;
+	float _pad1[3];
+};
+static_assert(sizeof(RoundedCornersUniforms) == 48);
+
+[[nodiscard]] QRectF StoryCropTextureRect(
+		QSizeF imageSize,
+		QSizeF targetSize) {
+	if (imageSize.isEmpty() || targetSize.isEmpty()) {
+		return QRectF(0., 0., 1., 1.);
+	}
+	const auto targetAspect = targetSize.width() / targetSize.height();
+	const auto imageAspect = imageSize.width() / imageSize.height();
+	if (imageAspect > targetAspect) {
+		const auto cropW = imageSize.height() * targetAspect;
+		const auto offset = (imageSize.width() - cropW) / 2.;
+		return QRectF(
+			offset / imageSize.width(),
+			0.,
+			cropW / imageSize.width(),
+			1.);
+	} else if (imageAspect < targetAspect) {
+		const auto cropH = imageSize.width() / targetAspect;
+		const auto offset = (imageSize.height() - cropH) / 2.;
+		return QRectF(
+			0.,
+			offset / imageSize.height(),
+			1.,
+			cropH / imageSize.height());
+	}
+	return QRectF(0., 0., 1., 1.);
+}
+
+[[nodiscard]] QShader LoadShader(const QString &name) {
+	return Ui::Rhi::ShaderFromFile(
+		u":/shaders/"_q + name + u".qsb"_q);
+}
+
+} // namespace
+
+OverlayWidget::RendererRhi::~RendererRhi() {
+	releaseResources();
+}
+
+OverlayWidget::RendererRhi::RendererRhi(not_null<OverlayWidget*> owner)
+: _owner(owner) {
+	style::PaletteChanged(
+	) | rpl::on_next([=] {
+		ranges::fill(_cacheKeys, quint64(0));
+		invalidateControls();
+	}, _lifetime);
+
+	crl::on_main(this, [=] {
+		_owner->_storiesChanged.events(
+		) | rpl::on_next([=] {
+			if (_owner->_storiesSession) {
+				Data::AmPremiumValue(
+					_owner->_storiesSession
+				) | rpl::on_next([=] {
+					ranges::fill(_cacheKeys, quint64(0));
+					invalidateControls();
+				}, _storiesLifetime);
+			} else {
+				_storiesLifetime.destroy();
+				ranges::fill(_cacheKeys, quint64(0));
+				invalidateControls();
+			}
+		}, _lifetime);
+	});
+}
+
+void OverlayWidget::RendererRhi::initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (_initialized && _rhi == rhi) {
+		return;
+	}
+	releaseResources();
+
+	_rhi = rhi;
+	_rt = rt;
+	_cb = cb;
+
+	_vertexBuffer = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::VertexBuffer,
+		kMaxDraws * kVertexSize);
+	_vertexBuffer->create();
+
+	_fillVertexBuffer = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::VertexBuffer,
+		4 * 4 * 2 * sizeof(float));
+	_fillVertexBuffer->create();
+
+	_uniformBuffer = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::UniformBuffer,
+		kMaxDraws * 256);
+	_uniformBuffer->create();
+
+	_sampler = rhi->newSampler(
+		QRhiSampler::Linear,
+		QRhiSampler::Linear,
+		QRhiSampler::None,
+		QRhiSampler::ClampToEdge,
+		QRhiSampler::ClampToEdge);
+	_sampler->create();
+
+	_placeholderTexture = rhi->newTexture(QRhiTexture::RGBA8, QSize(1, 1));
+	_placeholderTexture->create();
+
+	createPipelines();
+	_initialized = true;
+
+	LOG(("[RENDERER_TEST] component=overlay backend=%1 device=%2 status=OK")
+		.arg(rhi->backendName())
+		.arg(rhi->driverInfo().deviceName));
+}
+
+void OverlayWidget::RendererRhi::createPipelines() {
+	const auto rpDesc = _rt->renderPassDescriptor();
+
+	const auto argb32Vert = LoadShader(u"argb32.vert"_q);
+	const auto argb32Frag = LoadShader(u"argb32.frag"_q);
+	const auto controlsFrag = LoadShader(u"controls.frag"_q);
+
+	auto *sampleSrb = _rhi->newShaderResourceBindings();
+	sampleSrb->setBindings({
+		QRhiShaderResourceBinding::uniformBufferWithDynamicOffset(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			sizeof(ImageUniforms)),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+	});
+	sampleSrb->create();
+	_perDrawSrbs.push_back(sampleSrb);
+
+	auto *imagePipeline = _rhi->newGraphicsPipeline();
+	imagePipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, argb32Vert },
+		{ QRhiShaderStage::Fragment, argb32Frag },
+	});
+	QRhiVertexInputLayout inputLayout;
+	inputLayout.setBindings({ { 4 * sizeof(float) } });
+	inputLayout.setAttributes({
+		{ 0, 0, QRhiVertexInputAttribute::Float2, 0 },
+		{ 0, 1, QRhiVertexInputAttribute::Float2, 2 * sizeof(float) },
+	});
+	imagePipeline->setVertexInputLayout(inputLayout);
+	imagePipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip);
+	imagePipeline->setShaderResourceBindings(sampleSrb);
+	imagePipeline->setRenderPassDescriptor(rpDesc);
+	imagePipeline->create();
+	_imagePipeline = imagePipeline;
+
+	auto *imageBlendPipeline = _rhi->newGraphicsPipeline();
+	imageBlendPipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, argb32Vert },
+		{ QRhiShaderStage::Fragment, controlsFrag },
+	});
+	imageBlendPipeline->setVertexInputLayout(inputLayout);
+	QRhiGraphicsPipeline::TargetBlend blend;
+	blend.enable = true;
+	blend.srcColor = QRhiGraphicsPipeline::One;
+	blend.dstColor = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+	blend.srcAlpha = QRhiGraphicsPipeline::One;
+	blend.dstAlpha = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+	imageBlendPipeline->setTargetBlends({ blend });
+	imageBlendPipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip);
+	imageBlendPipeline->setShaderResourceBindings(sampleSrb);
+	imageBlendPipeline->setRenderPassDescriptor(rpDesc);
+	imageBlendPipeline->create();
+	_imageBlendPipeline = imageBlendPipeline;
+
+	const auto staticContentFrag = LoadShader(u"static_content.frag"_q);
+	const auto transparentContentFrag = LoadShader(
+		u"transparent_content.frag"_q);
+
+	auto *contentSrb = _rhi->newShaderResourceBindings();
+	contentSrb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			0,
+			sizeof(ContentUniforms)),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+	});
+	contentSrb->create();
+	_perDrawSrbs.push_back(contentSrb);
+
+	auto *staticPipeline = _rhi->newGraphicsPipeline();
+	staticPipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, argb32Vert },
+		{ QRhiShaderStage::Fragment, staticContentFrag },
+	});
+	staticPipeline->setVertexInputLayout(inputLayout);
+	staticPipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip);
+	staticPipeline->setShaderResourceBindings(contentSrb);
+	staticPipeline->setRenderPassDescriptor(rpDesc);
+	staticPipeline->create();
+	_staticContentPipeline = staticPipeline;
+
+	auto *staticBlendPipeline = _rhi->newGraphicsPipeline();
+	staticBlendPipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, argb32Vert },
+		{ QRhiShaderStage::Fragment, staticContentFrag },
+	});
+	staticBlendPipeline->setVertexInputLayout(inputLayout);
+	staticBlendPipeline->setTargetBlends({ blend });
+	staticBlendPipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip);
+	staticBlendPipeline->setShaderResourceBindings(contentSrb);
+	staticBlendPipeline->setRenderPassDescriptor(rpDesc);
+	staticBlendPipeline->create();
+	_staticContentBlendPipeline = staticBlendPipeline;
+
+	auto *transparentSrb = _rhi->newShaderResourceBindings();
+	transparentSrb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			0,
+			sizeof(TransparentContentUniforms)),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+	});
+	transparentSrb->create();
+	_perDrawSrbs.push_back(transparentSrb);
+
+	auto *transparentPipeline = _rhi->newGraphicsPipeline();
+	transparentPipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, argb32Vert },
+		{ QRhiShaderStage::Fragment, transparentContentFrag },
+	});
+	transparentPipeline->setVertexInputLayout(inputLayout);
+	transparentPipeline->setTargetBlends({ blend });
+	transparentPipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip);
+	transparentPipeline->setShaderResourceBindings(transparentSrb);
+	transparentPipeline->setRenderPassDescriptor(rpDesc);
+	transparentPipeline->create();
+	_transparentContentPipeline = transparentPipeline;
+
+	const auto fillVert = LoadShader(u"fill.vert"_q);
+	const auto roundedCornersFrag = LoadShader(u"rounded_corners.frag"_q);
+
+	auto *roundedSrb = _rhi->newShaderResourceBindings();
+	roundedSrb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			0,
+			sizeof(RoundedCornersUniforms)),
+	});
+	roundedSrb->create();
+	_perDrawSrbs.push_back(roundedSrb);
+
+	QRhiVertexInputLayout fillInputLayout;
+	fillInputLayout.setBindings({ { 2 * sizeof(float) } });
+	fillInputLayout.setAttributes({
+		{ 0, 0, QRhiVertexInputAttribute::Float2, 0 },
+	});
+
+	QRhiGraphicsPipeline::TargetBlend cornerBlend;
+	cornerBlend.enable = true;
+	cornerBlend.srcColor = QRhiGraphicsPipeline::Zero;
+	cornerBlend.dstColor = QRhiGraphicsPipeline::SrcAlpha;
+	cornerBlend.srcAlpha = QRhiGraphicsPipeline::Zero;
+	cornerBlend.dstAlpha = QRhiGraphicsPipeline::SrcAlpha;
+
+	auto *roundedPipeline = _rhi->newGraphicsPipeline();
+	roundedPipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, fillVert },
+		{ QRhiShaderStage::Fragment, roundedCornersFrag },
+	});
+	roundedPipeline->setVertexInputLayout(fillInputLayout);
+	roundedPipeline->setTargetBlends({ cornerBlend });
+	roundedPipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip);
+	roundedPipeline->setShaderResourceBindings(roundedSrb);
+	roundedPipeline->setRenderPassDescriptor(rpDesc);
+	roundedPipeline->create();
+	_roundedCornersPipeline = roundedPipeline;
+
+	const auto yuv420Frag = LoadShader(u"yuv420_content.frag"_q);
+	const auto nv12Frag = LoadShader(u"nv12_content.frag"_q);
+
+	auto *yuv420Srb = _rhi->newShaderResourceBindings();
+	yuv420Srb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			0,
+			sizeof(ContentUniforms)),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			3,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			4,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+	});
+	yuv420Srb->create();
+	_perDrawSrbs.push_back(yuv420Srb);
+
+	auto createYuvPipeline = [&](const QShader &frag, bool blending,
+			QRhiShaderResourceBindings *srb) {
+		auto *pipeline = _rhi->newGraphicsPipeline();
+		pipeline->setShaderStages({
+			{ QRhiShaderStage::Vertex, argb32Vert },
+			{ QRhiShaderStage::Fragment, frag },
+		});
+		pipeline->setVertexInputLayout(inputLayout);
+		if (blending) {
+			pipeline->setTargetBlends({ blend });
+		}
+		pipeline->setTopology(QRhiGraphicsPipeline::TriangleStrip);
+		pipeline->setShaderResourceBindings(srb);
+		pipeline->setRenderPassDescriptor(rpDesc);
+		pipeline->create();
+		return pipeline;
+	};
+
+	_yuv420Pipeline = createYuvPipeline(yuv420Frag, false, yuv420Srb);
+	_yuv420BlendPipeline = createYuvPipeline(yuv420Frag, true, yuv420Srb);
+
+	auto *nv12Srb = _rhi->newShaderResourceBindings();
+	nv12Srb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			0,
+			sizeof(ContentUniforms)),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			3,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+	});
+	nv12Srb->create();
+	_perDrawSrbs.push_back(nv12Srb);
+
+	_nv12Pipeline = createYuvPipeline(nv12Frag, false, nv12Srb);
+	_nv12BlendPipeline = createYuvPipeline(nv12Frag, true, nv12Srb);
+}
+
+void OverlayWidget::RendererRhi::render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (_owner->_hideWorkaround) {
+		return;
+	}
+	_rhi = rhi;
+	_rt = rt;
+	_cb = cb;
+	_nextVertexSlot = 0;
+	_nextPoolIndex = 0;
+	for (auto *srb : _perDrawSrbs) {
+		delete srb;
+	}
+	_perDrawSrbs.clear();
+	_drawCommands.clear();
+
+	const auto size = rt->pixelSize();
+	const auto factor = _owner->widget()->devicePixelRatioF();
+	if (_factor != factor) {
+		_factor = factor;
+		_ifactor = int(std::ceil(factor));
+		ranges::fill(_cacheKeys, quint64(0));
+		invalidateControls();
+		delete _controlsFadeTexture;
+		_controlsFadeTexture = nullptr;
+	}
+	_viewport = QSize(
+		int(size.width() / _factor),
+		int(size.height() / _factor));
+
+	_rub = rhi->nextResourceUpdateBatch();
+	_pendingVideoStream = nullptr;
+
+	_owner->paint(this);
+
+	if (_pendingVideoStream) {
+		_pendingVideoStream->borrowedPaintOffscreen(_rhi, _rt, _cb);
+	}
+
+	if (const auto notch = _owner->topNotchSkip()) {
+		auto blackImage = QImage(1, 1, QImage::Format_ARGB32_Premultiplied);
+		blackImage.fill(Qt::black);
+		auto *blackTex = acquirePoolTexture(QSize(1, 1));
+		_rub->uploadTexture(
+			blackTex,
+			QRhiTextureUploadDescription(
+				QRhiTextureUploadEntry(0, 0,
+					QRhiTextureSubresourceUploadDescription(blackImage))));
+		const auto notchRect = transformRect(
+			QRect(0, 0, _owner->width(), notch));
+		const float notchCoords[] = {
+			notchRect.left(), notchRect.bottom(), 0.f, 0.f,
+			notchRect.right(), notchRect.bottom(), 1.f, 0.f,
+			notchRect.left(), notchRect.top(), 0.f, 1.f,
+			notchRect.right(), notchRect.top(), 1.f, 1.f,
+		};
+		drawTexturedQuad(_imagePipeline, blackTex, notchCoords);
+	}
+
+	cb->beginPass(rt, QColor(0, 0, 0, 0), { 1.0f, 0 }, _rub);
+	_rub = nullptr;
+
+	for (const auto &cmd : _drawCommands) {
+		cb->setGraphicsPipeline(cmd.pipeline);
+		cb->setShaderResources(cmd.srb);
+		cb->setViewport({
+			0, 0,
+			float(rt->pixelSize().width()),
+			float(rt->pixelSize().height()) });
+		if (cmd.fillVertex) {
+			const QRhiCommandBuffer::VertexInput vbufBinding(
+				_fillVertexBuffer,
+				cmd.vertexIndex * 4 * 2 * sizeof(float));
+			cb->setVertexInput(0, 1, &vbufBinding);
+		} else {
+			const QRhiCommandBuffer::VertexInput vbufBinding(
+				_vertexBuffer, cmd.vertexIndex * kVertexSize);
+			cb->setVertexInput(0, 1, &vbufBinding);
+		}
+		cb->draw(4);
+	}
+	_drawCommands.clear();
+
+	if (_pendingVideoStream) {
+		_pendingVideoStream->borrowedPaintOnscreen(_rhi, _rt, _cb);
+		_pendingVideoStream = nullptr;
+	}
+
+	cb->endPass();
+}
+
+QRhiTexture *OverlayWidget::RendererRhi::acquirePoolTexture(QSize size) {
+	if (_nextPoolIndex < int(_texturePool.size())) {
+		auto &entry = _texturePool[_nextPoolIndex++];
+		if (entry.size == size) {
+			return entry.texture;
+		}
+		delete entry.texture;
+		entry.texture = _rhi->newTexture(QRhiTexture::BGRA8, size);
+		entry.texture->create();
+		entry.size = size;
+		return entry.texture;
+	}
+	auto *tex = _rhi->newTexture(QRhiTexture::BGRA8, size);
+	tex->create();
+	_texturePool.push_back({ tex, size });
+	_nextPoolIndex++;
+	return tex;
+}
+
+void OverlayWidget::RendererRhi::releaseResources() {
+	_drawCommands.clear();
+
+	for (auto &entry : _texturePool) {
+		delete entry.texture;
+	}
+	_texturePool.clear();
+
+	delete _imagePipeline;
+	_imagePipeline = nullptr;
+	delete _imageBlendPipeline;
+	_imageBlendPipeline = nullptr;
+	delete _staticContentPipeline;
+	_staticContentPipeline = nullptr;
+	delete _staticContentBlendPipeline;
+	_staticContentBlendPipeline = nullptr;
+	delete _transparentContentPipeline;
+	_transparentContentPipeline = nullptr;
+	delete _roundedCornersPipeline;
+	_roundedCornersPipeline = nullptr;
+	delete _yuv420Pipeline;
+	_yuv420Pipeline = nullptr;
+	delete _yuv420BlendPipeline;
+	_yuv420BlendPipeline = nullptr;
+	delete _nv12Pipeline;
+	_nv12Pipeline = nullptr;
+	delete _nv12BlendPipeline;
+	_nv12BlendPipeline = nullptr;
+
+	for (auto &tex : _storiesSiblingTextures) {
+		delete tex;
+		tex = nullptr;
+	}
+	ranges::fill(_storiesSiblingSizes, QSize());
+	ranges::fill(_storiesSiblingCacheKeys, quint64(0));
+
+	delete _controlsAtlasTexture;
+	_controlsAtlasTexture = nullptr;
+	_controlsAtlasSize = QSize();
+	ranges::fill(_controlsTextures, QRect());
+
+	delete _controlsFadeTexture;
+	_controlsFadeTexture = nullptr;
+	_controlsFadeSize = QSize();
+
+	for (auto *srb : _perDrawSrbs) {
+		delete srb;
+	}
+	_perDrawSrbs.clear();
+
+	for (auto &tex : _rgbaTextures) {
+		delete tex;
+		tex = nullptr;
+	}
+	ranges::fill(_rgbaSizes, QSize());
+	ranges::fill(_cacheKeys, quint64(0));
+
+	delete _yTexture;
+	_yTexture = nullptr;
+	delete _uTexture;
+	_uTexture = nullptr;
+	delete _vTexture;
+	_vTexture = nullptr;
+	delete _uvTexture;
+	_uvTexture = nullptr;
+	_lumaSize = QSize();
+	_chromaSize = QSize();
+	_chromaNV12 = false;
+	_usingExternalVideoTextures = false;
+	_trackFrameIndex = 0;
+	_streamedIndex = 0;
+#ifdef Q_OS_MAC
+	_metalTextureCache.flush();
+#endif // Q_OS_MAC
+
+	delete _placeholderTexture;
+	_placeholderTexture = nullptr;
+
+	delete _vertexBuffer;
+	_vertexBuffer = nullptr;
+	delete _fillVertexBuffer;
+	_fillVertexBuffer = nullptr;
+	delete _uniformBuffer;
+	_uniformBuffer = nullptr;
+	delete _sampler;
+	_sampler = nullptr;
+
+	_initialized = false;
+}
+
+QColor OverlayWidget::RendererRhi::rhiClearColor() {
+	if (_owner->_hideWorkaround) {
+		return QColor(0, 0, 0, 0);
+	} else if (_owner->_fullScreenVideo) {
+		return st::mediaviewVideoBg->c;
+	} else {
+		return st::mediaviewBg->c;
+	}
+}
+
+std::optional<QColor> OverlayWidget::RendererRhi::clearColor() {
+	if (_owner->_hideWorkaround) {
+		return QColor(0, 0, 0, 0);
+	} else if (_owner->_fullScreenVideo) {
+		return st::mediaviewVideoBg->c;
+	} else {
+		return st::mediaviewBg->c;
+	}
+}
+
+void OverlayWidget::RendererRhi::drawTexturedQuad(
+		QRhiGraphicsPipeline *pipeline,
+		QRhiTexture *texture,
+		const float *coords,
+		float opacity,
+		bool blend) {
+	if (_nextVertexSlot >= kMaxDraws || !texture) {
+		return;
+	}
+	const auto slot = _nextVertexSlot++;
+	const auto vOffset = slot * kVertexSize;
+	const auto uOffset = slot * 256;
+
+	_rub->updateDynamicBuffer(
+		_vertexBuffer, vOffset, kVertexSize, coords);
+
+	ImageUniforms uniforms{};
+	uniforms.viewport[0] = _viewport.width() * _factor;
+	uniforms.viewport[1] = _viewport.height() * _factor;
+	uniforms.g_opacity = opacity;
+	_rub->updateDynamicBuffer(
+		_uniformBuffer, uOffset, sizeof(ImageUniforms), &uniforms);
+
+	auto *srb = _rhi->newShaderResourceBindings();
+	srb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			uOffset,
+			sizeof(ImageUniforms)),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			texture,
+			_sampler),
+	});
+	srb->create();
+	_perDrawSrbs.push_back(srb);
+
+	_drawCommands.push_back({
+		.pipeline = blend ? _imageBlendPipeline : pipeline,
+		.srb = srb,
+		.vertexIndex = slot,
+	});
+}
+
+void OverlayWidget::RendererRhi::paintUsingRaster(
+		QRect rect,
+		Fn<void(Painter&)> method,
+		bool transparent,
+		float opacity) {
+	if (!_imagePipeline || rect.isEmpty()) {
+		return;
+	}
+	const auto size = rect.size() * _ifactor;
+	auto raster = QImage(size, QImage::Format_ARGB32_Premultiplied);
+	raster.setDevicePixelRatio(_factor);
+	raster.fill(Qt::transparent);
+	{
+		auto painter = Painter(&raster);
+		method(painter);
+	}
+
+	auto *tex = acquirePoolTexture(size);
+	_rub->uploadTexture(
+		tex,
+		QRhiTextureUploadDescription(
+			QRhiTextureUploadEntry(0, 0,
+				QRhiTextureSubresourceUploadDescription(raster))));
+
+	const auto rRect = transformRect(rect);
+	const float coords[] = {
+		rRect.left(), rRect.bottom(),
+		0.f, 0.f,
+
+		rRect.right(), rRect.bottom(),
+		1.f, 0.f,
+
+		rRect.left(), rRect.top(),
+		0.f, 1.f,
+
+		rRect.right(), rRect.top(),
+		1.f, 1.f,
+	};
+
+	drawTexturedQuad(
+		_imagePipeline,
+		tex,
+		coords,
+		opacity,
+		transparent);
+}
+
+void OverlayWidget::RendererRhi::validateControlsFade() {
+	const auto forStories = (_owner->_stories != nullptr);
+	const auto flip = !forStories && !_owner->topShadowOnTheRight();
+	if (_controlsFadeTexture
+		&& _shadowTopFlip == flip
+		&& _shadowsForStories == forStories) {
+		return;
+	}
+	_shadowTopFlip = flip;
+	_shadowsForStories = forStories;
+	const auto &top = _shadowsForStories
+		? st::storiesShadowTop
+		: st::mediaviewShadowTop;
+	const auto &bottom = _shadowsForStories
+		? st::storiesShadowBottom
+		: st::mediaviewShadowBottom;
+	const auto width = top.width();
+	const auto bottomTop = top.height();
+	const auto height = bottomTop + bottom.height();
+
+	auto image = QImage(
+		QSize(width, height) * _ifactor,
+		QImage::Format_ARGB32_Premultiplied);
+	image.fill(Qt::transparent);
+	image.setDevicePixelRatio(_ifactor);
+	{
+		auto p = QPainter(&image);
+		top.paint(p, 0, 0, width);
+		bottom.fill(p, QRect(0, bottomTop, width, bottom.height()));
+	}
+	if (flip) {
+		image = std::move(image).mirrored(true, false);
+	}
+
+	const auto size = image.size();
+	if (!_controlsFadeTexture || _controlsFadeSize != size) {
+		delete _controlsFadeTexture;
+		_controlsFadeTexture = _rhi->newTexture(
+			QRhiTexture::BGRA8,
+			size);
+		_controlsFadeTexture->create();
+		_controlsFadeSize = size;
+	}
+	_rub->uploadTexture(
+		_controlsFadeTexture,
+		QRhiTextureUploadDescription(
+			QRhiTextureUploadEntry(0, 0,
+				QRhiTextureSubresourceUploadDescription(image))));
+}
+
+void OverlayWidget::RendererRhi::fillShadowUniforms(
+		float *shadowTopRect,
+		float *shadowBottomSkipOpacityFullFade,
+		ContentGeometry geometry) const {
+	if (_owner->_stories) {
+		const auto &top = st::storiesShadowTop.size();
+		const auto shadowTop = geometry.topShadowShown
+			? geometry.rect.y()
+			: geometry.rect.y() - top.height();
+		const auto tRect = transformRect(
+			QRect(QPoint(geometry.rect.x(), shadowTop), top));
+		shadowTopRect[0] = tRect.x();
+		shadowTopRect[1] = tRect.y();
+		shadowTopRect[2] = tRect.width();
+		shadowTopRect[3] = tRect.height();
+	} else {
+		const auto &top = st::mediaviewShadowTop.size();
+		const auto point = QPoint(
+			_shadowTopFlip ? 0 : (_viewport.width() - top.width()),
+			0);
+		const auto tRect = transformRect(QRect(point, top));
+		shadowTopRect[0] = tRect.x();
+		shadowTopRect[1] = tRect.y();
+		shadowTopRect[2] = tRect.width();
+		shadowTopRect[3] = tRect.height();
+	}
+	const auto &bottom = _owner->_stories
+		? st::storiesShadowBottom
+		: st::mediaviewShadowBottom;
+	shadowBottomSkipOpacityFullFade[0] = bottom.height() * _factor;
+	shadowBottomSkipOpacityFullFade[1] =
+		geometry.bottomShadowSkip * _factor;
+	shadowBottomSkipOpacityFullFade[2] = geometry.controlsOpacity;
+	shadowBottomSkipOpacityFullFade[3] = 1.f - float(geometry.fade);
+}
+
+void OverlayWidget::RendererRhi::drawContentQuad(
+		QRhiTexture *contentTexture,
+		const float *coords,
+		ContentGeometry geometry,
+		bool fillTransparentBackground,
+		bool blend) {
+	if (_nextVertexSlot >= kMaxDraws || !contentTexture) {
+		return;
+	}
+
+	validateControlsFade();
+
+	const auto slot = _nextVertexSlot++;
+	const auto vOffset = slot * kVertexSize;
+	const auto uOffset = slot * 256;
+
+	_rub->updateDynamicBuffer(
+		_vertexBuffer, vOffset, kVertexSize, coords);
+
+	const auto vw = _viewport.width() * _factor;
+	const auto vh = _viewport.height() * _factor;
+
+	auto *pipeline = fillTransparentBackground
+		? _transparentContentPipeline
+		: (blend ? _staticContentBlendPipeline : _staticContentPipeline);
+
+	if (fillTransparentBackground) {
+		const auto c_bg = st::mediaviewTransparentBg->c;
+		const auto c_fg = st::mediaviewTransparentFg->c;
+		TransparentContentUniforms uniforms{};
+		uniforms.viewport[0] = vw;
+		uniforms.viewport[1] = vh;
+		fillShadowUniforms(
+			uniforms.shadowTopRect,
+			uniforms.shadowBottomSkipOpacityFullFade,
+			geometry);
+		uniforms.transparentBg[0] = float(c_bg.redF());
+		uniforms.transparentBg[1] = float(c_bg.greenF());
+		uniforms.transparentBg[2] = float(c_bg.blueF());
+		uniforms.transparentBg[3] = float(c_bg.alphaF());
+		uniforms.transparentFg[0] = float(c_fg.redF());
+		uniforms.transparentFg[1] = float(c_fg.greenF());
+		uniforms.transparentFg[2] = float(c_fg.blueF());
+		uniforms.transparentFg[3] = float(c_fg.alphaF());
+		uniforms.transparentSize =
+			st::transparentPlaceholderSize * _factor;
+		_rub->updateDynamicBuffer(
+			_uniformBuffer,
+			uOffset,
+			sizeof(TransparentContentUniforms),
+			&uniforms);
+	} else {
+		ContentUniforms uniforms{};
+		uniforms.viewport[0] = vw;
+		uniforms.viewport[1] = vh;
+		fillShadowUniforms(
+			uniforms.shadowTopRect,
+			uniforms.shadowBottomSkipOpacityFullFade,
+			geometry);
+		const auto rRect = scaleRect(
+			transformRect(geometry.rect),
+			geometry.scale);
+		if (geometry.roundRadius) {
+			uniforms.roundRect[0] = rRect.x();
+			uniforms.roundRect[1] = rRect.y();
+			uniforms.roundRect[2] = rRect.width();
+			uniforms.roundRect[3] = rRect.height();
+		} else {
+			uniforms.roundRect[0] = 0;
+			uniforms.roundRect[1] = 0;
+			uniforms.roundRect[2] = vw;
+			uniforms.roundRect[3] = vh;
+		}
+		uniforms.roundRadius = geometry.roundRadius * _factor;
+		_rub->updateDynamicBuffer(
+			_uniformBuffer,
+			uOffset,
+			sizeof(ContentUniforms),
+			&uniforms);
+	}
+
+	auto *srb = _rhi->newShaderResourceBindings();
+	srb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			uOffset,
+			fillTransparentBackground
+				? int(sizeof(TransparentContentUniforms))
+				: int(sizeof(ContentUniforms))),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			contentTexture,
+			_sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::FragmentStage,
+			_controlsFadeTexture
+				? _controlsFadeTexture
+				: _placeholderTexture,
+			_sampler),
+	});
+	srb->create();
+	_perDrawSrbs.push_back(srb);
+
+	_drawCommands.push_back({
+		.pipeline = pipeline,
+		.srb = srb,
+		.vertexIndex = slot,
+	});
+}
+
+void OverlayWidget::RendererRhi::paintBackground() {
+	const auto &bg = _owner->_fullScreenVideo
+		? st::mediaviewVideoBg
+		: st::mediaviewBg;
+	const auto c = bg->c;
+	const auto vw = float(_viewport.width() * _factor);
+	const auto vh = float(_viewport.height() * _factor);
+
+	auto bgImage = QImage(1, 1, QImage::Format_ARGB32_Premultiplied);
+	bgImage.fill(c);
+
+	auto *tex = acquirePoolTexture(QSize(1, 1));
+	_rub->uploadTexture(
+		tex,
+		QRhiTextureUploadDescription(
+			QRhiTextureUploadEntry(0, 0,
+				QRhiTextureSubresourceUploadDescription(bgImage))));
+
+	const float coords[] = {
+		0.f, vh, 0.f, 0.f,
+		vw,  vh, 1.f, 0.f,
+		0.f, 0.f, 0.f, 1.f,
+		vw,  0.f, 1.f, 1.f,
+	};
+	drawTexturedQuad(_imagePipeline, tex, coords);
+}
+
+void OverlayWidget::RendererRhi::paintVideoStream() {
+	_pendingVideoStream = _owner->_videoStream.get();
+}
+
+void OverlayWidget::RendererRhi::paintTransformedVideoFrame(
+		ContentGeometry geometry) {
+	const auto data = _owner->videoFrameWithInfo();
+	if (data.format == Streaming::FrameFormat::None) {
+		return;
+	} else if (data.format == Streaming::FrameFormat::ARGB32) {
+		Assert(!data.image.isNull());
+		paintTransformedStaticContent(
+			data.image,
+			geometry,
+			data.alpha,
+			data.alpha);
+		return;
+	}
+	const auto nativeTexture =
+		(data.format == Streaming::FrameFormat::NativeTexture);
+	const auto nv12 = nativeTexture
+		|| (data.format == Streaming::FrameFormat::NV12);
+	const auto yuv = data.yuv;
+	const auto nv12changed = !nativeTexture && (_chromaNV12 != nv12);
+
+	const auto upload = (_trackFrameIndex != data.index)
+		|| (_streamedIndex != _owner->streamedIndex());
+
+	_trackFrameIndex = data.index;
+	_streamedIndex = _owner->streamedIndex();
+
+	if (upload) {
+		auto zeroCopied = false;
+#ifdef Q_OS_MAC
+		if (nativeTexture && data.nativeFrame
+			&& data.nativeFrame->pixelBuffer) {
+			if (_metalTextureCache.createTexturesFromPixelBuffer(
+					_rhi,
+					data.nativeFrame->pixelBuffer,
+					&_yTexture,
+					&_uvTexture,
+					&_lumaSize,
+					&_chromaSize)) {
+				_chromaNV12 = true;
+				zeroCopied = true;
+			} else {
+				return;
+			}
+		}
+#endif // Q_OS_MAC
+		if (!zeroCopied) {
+		if (_usingExternalVideoTextures) {
+			delete _yTexture;
+			_yTexture = nullptr;
+			delete _uTexture;
+			_uTexture = nullptr;
+			delete _vTexture;
+			_vTexture = nullptr;
+			delete _uvTexture;
+			_uvTexture = nullptr;
+			_lumaSize = QSize();
+			_chromaSize = QSize();
+#ifdef Q_OS_MAC
+			_metalTextureCache.flush();
+#endif // Q_OS_MAC
+		}
+		if (!yuv || yuv->size.isEmpty()) {
+			return;
+		}
+		if (!_yTexture || _lumaSize != yuv->size) {
+			delete _yTexture;
+			_yTexture = _rhi->newTexture(QRhiTexture::R8, yuv->size);
+			_yTexture->create();
+			_lumaSize = yuv->size;
+		}
+		auto yDesc = QRhiTextureSubresourceUploadDescription(
+			yuv->y.data,
+			yuv->y.stride * yuv->size.height());
+		yDesc.setDataStride(yuv->y.stride);
+		_rub->uploadTexture(
+			_yTexture,
+			QRhiTextureUploadDescription(
+				QRhiTextureUploadEntry(0, 0, yDesc)));
+
+		if (nv12) {
+			if (!_uvTexture || nv12changed
+				|| _chromaSize != yuv->chromaSize) {
+				delete _uvTexture;
+				_uvTexture = _rhi->newTexture(
+					QRhiTexture::RG8,
+					yuv->chromaSize);
+				_uvTexture->create();
+				_chromaSize = yuv->chromaSize;
+			}
+			auto uvDesc = QRhiTextureSubresourceUploadDescription(
+				yuv->u.data,
+				yuv->u.stride * yuv->chromaSize.height());
+			uvDesc.setDataStride(yuv->u.stride);
+			_rub->uploadTexture(
+				_uvTexture,
+				QRhiTextureUploadDescription(
+					QRhiTextureUploadEntry(0, 0, uvDesc)));
+		} else {
+			if (!_uTexture || nv12changed
+				|| _chromaSize != yuv->chromaSize) {
+				delete _uTexture;
+				_uTexture = _rhi->newTexture(
+					QRhiTexture::R8,
+					yuv->chromaSize);
+				_uTexture->create();
+				delete _vTexture;
+				_vTexture = _rhi->newTexture(
+					QRhiTexture::R8,
+					yuv->chromaSize);
+				_vTexture->create();
+				_chromaSize = yuv->chromaSize;
+			}
+			auto uDesc = QRhiTextureSubresourceUploadDescription(
+				yuv->u.data,
+				yuv->u.stride * yuv->chromaSize.height());
+			uDesc.setDataStride(yuv->u.stride);
+			_rub->uploadTexture(
+				_uTexture,
+				QRhiTextureUploadDescription(
+					QRhiTextureUploadEntry(0, 0, uDesc)));
+			auto vDesc = QRhiTextureSubresourceUploadDescription(
+				yuv->v.data,
+				yuv->v.stride * yuv->chromaSize.height());
+			vDesc.setDataStride(yuv->v.stride);
+			_rub->uploadTexture(
+				_vTexture,
+				QRhiTextureUploadDescription(
+					QRhiTextureUploadEntry(0, 0, vDesc)));
+		}
+		_chromaNV12 = nv12;
+		} // if (!zeroCopied)
+		_usingExternalVideoTextures = zeroCopied;
+	}
+
+	validateControlsFade();
+
+	if (_nextVertexSlot >= kMaxDraws) {
+		return;
+	}
+
+	const auto textureRect = _owner->_stories
+		? StoryCropTextureRect(
+			QSizeF(nativeTexture ? _lumaSize : yuv->size),
+			geometry.rect.size())
+		: QRectF(0., 0., 1., 1.);
+	const auto texLeft = float(textureRect.x());
+	const auto texRight = float(textureRect.x() + textureRect.width());
+	const auto texTop = float(textureRect.y());
+	const auto texBottom = float(textureRect.y() + textureRect.height());
+
+	const auto rRect = scaleRect(
+		transformRect(geometry.rect),
+		geometry.scale);
+	const auto centerx = rRect.x() + rRect.width() / 2;
+	const auto centery = rRect.y() + rRect.height() / 2;
+	const auto rsin = float(std::sin(geometry.rotation * M_PI / 180.));
+	const auto rcos = float(std::cos(geometry.rotation * M_PI / 180.));
+	const auto rotated = [&](float x, float y) -> std::array<float, 2> {
+		x -= centerx;
+		y -= centery;
+		return { centerx + x * rcos + y * rsin,
+		         centery + y * rcos - x * rsin };
+	};
+	const auto tl = rotated(rRect.left(), rRect.bottom());
+	const auto tr = rotated(rRect.right(), rRect.bottom());
+	const auto bl = rotated(rRect.left(), rRect.top());
+	const auto br = rotated(rRect.right(), rRect.top());
+
+	const auto slot = _nextVertexSlot++;
+	const auto vOffset = slot * kVertexSize;
+	const auto uOffset = slot * 256;
+	const float coords[] = {
+		tl[0], tl[1], texLeft, texTop,
+		tr[0], tr[1], texRight, texTop,
+		bl[0], bl[1], texLeft, texBottom,
+		br[0], br[1], texRight, texBottom,
+	};
+	_rub->updateDynamicBuffer(
+		_vertexBuffer, vOffset, kVertexSize, coords);
+
+	const auto vw = _viewport.width() * _factor;
+	const auto vh = _viewport.height() * _factor;
+	ContentUniforms uniforms{};
+	uniforms.viewport[0] = vw;
+	uniforms.viewport[1] = vh;
+	fillShadowUniforms(
+		uniforms.shadowTopRect,
+		uniforms.shadowBottomSkipOpacityFullFade,
+		geometry);
+	if (geometry.roundRadius) {
+		uniforms.roundRect[0] = rRect.x();
+		uniforms.roundRect[1] = rRect.y();
+		uniforms.roundRect[2] = rRect.width();
+		uniforms.roundRect[3] = rRect.height();
+	} else {
+		uniforms.roundRect[0] = 0;
+		uniforms.roundRect[1] = 0;
+		uniforms.roundRect[2] = vw;
+		uniforms.roundRect[3] = vh;
+	}
+	uniforms.roundRadius = geometry.roundRadius * _factor;
+	_rub->updateDynamicBuffer(
+		_uniformBuffer, uOffset, sizeof(ContentUniforms), &uniforms);
+
+	const auto blendEnabled = (geometry.roundRadius > 0.);
+	auto *srb = _rhi->newShaderResourceBindings();
+	if (nv12) {
+		srb->setBindings({
+			QRhiShaderResourceBinding::uniformBuffer(
+				0,
+				QRhiShaderResourceBinding::VertexStage
+					| QRhiShaderResourceBinding::FragmentStage,
+				_uniformBuffer,
+				uOffset,
+				sizeof(ContentUniforms)),
+			QRhiShaderResourceBinding::sampledTexture(
+				1,
+				QRhiShaderResourceBinding::FragmentStage,
+				_yTexture,
+				_sampler),
+			QRhiShaderResourceBinding::sampledTexture(
+				2,
+				QRhiShaderResourceBinding::FragmentStage,
+				_uvTexture,
+				_sampler),
+			QRhiShaderResourceBinding::sampledTexture(
+				3,
+				QRhiShaderResourceBinding::FragmentStage,
+				_controlsFadeTexture
+					? _controlsFadeTexture
+					: _placeholderTexture,
+				_sampler),
+		});
+	} else {
+		srb->setBindings({
+			QRhiShaderResourceBinding::uniformBuffer(
+				0,
+				QRhiShaderResourceBinding::VertexStage
+					| QRhiShaderResourceBinding::FragmentStage,
+				_uniformBuffer,
+				uOffset,
+				sizeof(ContentUniforms)),
+			QRhiShaderResourceBinding::sampledTexture(
+				1,
+				QRhiShaderResourceBinding::FragmentStage,
+				_yTexture,
+				_sampler),
+			QRhiShaderResourceBinding::sampledTexture(
+				2,
+				QRhiShaderResourceBinding::FragmentStage,
+				_uTexture,
+				_sampler),
+			QRhiShaderResourceBinding::sampledTexture(
+				3,
+				QRhiShaderResourceBinding::FragmentStage,
+				_vTexture,
+				_sampler),
+			QRhiShaderResourceBinding::sampledTexture(
+				4,
+				QRhiShaderResourceBinding::FragmentStage,
+				_controlsFadeTexture
+					? _controlsFadeTexture
+					: _placeholderTexture,
+				_sampler),
+		});
+	}
+	srb->create();
+	_perDrawSrbs.push_back(srb);
+
+	auto *pipeline = nv12
+		? (blendEnabled ? _nv12BlendPipeline : _nv12Pipeline)
+		: (blendEnabled ? _yuv420BlendPipeline : _yuv420Pipeline);
+	_drawCommands.push_back({
+		.pipeline = pipeline,
+		.srb = srb,
+		.vertexIndex = slot,
+	});
+
+	if (_owner->_recognitionResult.success
+		&& !_owner->_recognitionResult.items.empty()) {
+		const auto opacity = _owner->_recognitionAnimation.value(
+			_owner->_showRecognitionResults ? 1. : 0.);
+		if (opacity > 0.) {
+			paintRecognitionOverlay(data.image, geometry);
+		}
+	}
+}
+
+void OverlayWidget::RendererRhi::paintRecognitionOverlay(
+		const QImage &image,
+		ContentGeometry geometry) {
+	if (!_owner->_recognitionResult.success
+		|| _owner->_recognitionResult.items.empty()) {
+		return;
+	}
+	const auto opacity = _owner->_recognitionAnimation.value(
+		_owner->_showRecognitionResults ? 1. : 0.);
+	if (opacity <= 0.) {
+		return;
+	}
+	const auto rect = geometry.rect;
+	const auto overlaySize = rect.size().toSize() * _ifactor;
+	if (overlaySize.isEmpty()) {
+		return;
+	}
+	auto overlay = QImage(
+		overlaySize,
+		QImage::Format_ARGB32_Premultiplied);
+	overlay.setDevicePixelRatio(_factor);
+	overlay.fill(QColor(0, 0, 0, int(77 * opacity)));
+
+	const auto scale = rect.width() / float(image.width());
+	{
+		auto p = QPainter(&overlay);
+		p.setCompositionMode(QPainter::CompositionMode_Clear);
+		for (const auto &item : _owner->_recognitionResult.items) {
+			const auto &r = item.rect;
+			p.fillRect(QRectF(
+				r.x() * _ifactor * scale,
+				r.y() * _ifactor * scale,
+				r.width() * _ifactor * scale,
+				r.height() * _ifactor * scale), Qt::transparent);
+		}
+		const auto spans = _owner->_recognition.spans();
+		if (!spans.empty()) {
+			p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+			const auto color = QColor(48, 128, 255, int(128 * opacity));
+			for (const auto &span : spans) {
+				const auto band = _owner->_recognition.bandFor(
+					span.item,
+					span.from,
+					span.till);
+				if (!band.isEmpty()) {
+					p.fillRect(QRectF(
+						band.x() * _ifactor * scale,
+						band.y() * _ifactor * scale,
+						band.width() * _ifactor * scale,
+						band.height() * _ifactor * scale), color);
+				}
+			}
+		}
+	}
+
+	auto *tex = acquirePoolTexture(overlaySize);
+	_rub->uploadTexture(
+		tex,
+		QRhiTextureUploadDescription(
+			QRhiTextureUploadEntry(0, 0,
+				QRhiTextureSubresourceUploadDescription(overlay))));
+
+	const auto rRect = scaleRect(transformRect(rect), geometry.scale);
+	const auto centerx = rRect.x() + rRect.width() / 2;
+	const auto centery = rRect.y() + rRect.height() / 2;
+	const auto rsin = float(std::sin(geometry.rotation * M_PI / 180.));
+	const auto rcos = float(std::cos(geometry.rotation * M_PI / 180.));
+	const auto rotated = [&](float x, float y) -> std::array<float, 2> {
+		x -= centerx;
+		y -= centery;
+		return { centerx + x * rcos + y * rsin,
+		         centery + y * rcos - x * rsin };
+	};
+	const auto tl = rotated(rRect.left(), rRect.bottom());
+	const auto tr = rotated(rRect.right(), rRect.bottom());
+	const auto bl = rotated(rRect.left(), rRect.top());
+	const auto br = rotated(rRect.right(), rRect.top());
+	const float coords[] = {
+		tl[0], tl[1], 0.f, 0.f,
+		tr[0], tr[1], 1.f, 0.f,
+		bl[0], bl[1], 0.f, 1.f,
+		br[0], br[1], 1.f, 1.f,
+	};
+	drawTexturedQuad(_imagePipeline, tex, coords, 1.f, true);
+}
+
+void OverlayWidget::RendererRhi::paintTransformedStaticContent(
+		const QImage &image,
+		ContentGeometry geometry,
+		bool semiTransparent,
+		bool fillTransparentBackground,
+		int index) {
+	Expects(index >= 0 && index < 3);
+
+	if (image.isNull() || geometry.rect.isEmpty() || !_imagePipeline) {
+		return;
+	}
+
+	const auto cacheKey = image.cacheKey();
+	const auto upload = (_cacheKeys[index] != cacheKey);
+	if (upload) {
+		_cacheKeys[index] = cacheKey;
+		if (!_rgbaTextures[index]
+			|| _rgbaSizes[index] != image.size()) {
+			delete _rgbaTextures[index];
+			_rgbaTextures[index] = _rhi->newTexture(
+				QRhiTexture::BGRA8,
+				image.size());
+			_rgbaTextures[index]->create();
+			_rgbaSizes[index] = image.size();
+		}
+		_rub->uploadTexture(
+			_rgbaTextures[index],
+			QRhiTextureUploadDescription(
+				QRhiTextureUploadEntry(0, 0,
+					QRhiTextureSubresourceUploadDescription(image))));
+	}
+
+	const auto textureRect = _owner->_stories
+		? StoryCropTextureRect(
+			QSizeF(image.size()),
+			geometry.rect.size())
+		: QRectF(0., 0., 1., 1.);
+	const auto texLeft = float(textureRect.x());
+	const auto texRight = float(textureRect.x() + textureRect.width());
+	const auto texTop = float(textureRect.y());
+	const auto texBottom = float(textureRect.y() + textureRect.height());
+
+	const auto rRect = scaleRect(
+		transformRect(geometry.rect),
+		geometry.scale);
+	const auto centerx = rRect.x() + rRect.width() / 2;
+	const auto centery = rRect.y() + rRect.height() / 2;
+	const auto rsin = float(std::sin(geometry.rotation * M_PI / 180.));
+	const auto rcos = float(std::cos(geometry.rotation * M_PI / 180.));
+	const auto rotated = [&](float x, float y) -> std::array<float, 2> {
+		x -= centerx;
+		y -= centery;
+		return { centerx + x * rcos + y * rsin,
+		         centery + y * rcos - x * rsin };
+	};
+	const auto tl = rotated(rRect.left(), rRect.bottom());
+	const auto tr = rotated(rRect.right(), rRect.bottom());
+	const auto bl = rotated(rRect.left(), rRect.top());
+	const auto br = rotated(rRect.right(), rRect.top());
+	const float coords[] = {
+		tl[0], tl[1], texLeft, texTop,
+		tr[0], tr[1], texRight, texTop,
+		bl[0], bl[1], texLeft, texBottom,
+		br[0], br[1], texRight, texBottom,
+	};
+
+	const auto blend = (geometry.roundRadius > 0.)
+		|| (semiTransparent && !fillTransparentBackground);
+	drawContentQuad(
+		_rgbaTextures[index],
+		coords,
+		geometry,
+		fillTransparentBackground,
+		blend);
+	paintRecognitionOverlay(image, geometry);
+}
+
+void OverlayWidget::RendererRhi::paintRadialLoading(
+		QRect inner,
+		bool radial,
+		float64 radialOpacity) {
+	paintUsingRaster(inner, [&](Painter &p) {
+		const auto newInner = QRect(QPoint(), inner.size());
+		_owner->paintRadialLoadingContent(p, newInner, radial, radialOpacity);
+	}, true);
+}
+
+void OverlayWidget::RendererRhi::paintThemePreview(QRect outer) {
+	paintUsingRaster(outer, [&](Painter &p) {
+		const auto newOuter = QRect(QPoint(), outer.size());
+		_owner->paintThemePreviewContent(p, newOuter, newOuter);
+	});
+}
+
+void OverlayWidget::RendererRhi::paintDocumentBubble(
+		QRect outer,
+		QRect icon) {
+	paintUsingRaster(outer, [&](Painter &p) {
+		const auto newOuter = QRect(QPoint(), outer.size());
+		const auto newIcon = icon.translated(-outer.topLeft());
+		_owner->paintDocumentBubbleContent(p, newOuter, newIcon, newOuter);
+	}, true);
+}
+
+void OverlayWidget::RendererRhi::paintSaveMsg(QRect outer) {
+	paintUsingRaster(outer, [&](Painter &p) {
+		const auto newOuter = QRect(QPoint(), outer.size());
+		_owner->paintSaveMsgContent(p, newOuter, newOuter);
+	}, true);
+}
+
+void OverlayWidget::RendererRhi::paintChapter(QRect outer) {
+	paintUsingRaster(outer, [&](Painter &p) {
+		const auto newOuter = QRect(QPoint(), outer.size());
+		_owner->paintChapterContent(p, newOuter, newOuter);
+	}, true);
+}
+
+void OverlayWidget::RendererRhi::paintSpeedBoost(QRect outer) {
+	paintUsingRaster(outer, [&](Painter &p) {
+		const auto newOuter = QRect(QPoint(), outer.size());
+		_owner->paintSpeedBoostContent(p, newOuter, newOuter);
+	}, true);
+}
+
+auto OverlayWidget::RendererRhi::controlMeta(Over control) const
+-> Control {
+	const auto stories = [&] {
+		return (_owner->_stories != nullptr);
+	};
+	switch (control) {
+	case Over::Left: return {
+		0,
+		stories() ? &st::storiesLeft : &st::mediaviewLeft
+	};
+	case Over::Right: return {
+		1,
+		stories() ? &st::storiesRight : &st::mediaviewRight
+	};
+	case Over::Save: return {
+		2,
+		(_owner->saveControlLocked()
+			? &st::mediaviewSaveLocked
+			: &st::mediaviewSave)
+	};
+	case Over::Share: return { 3, &st::mediaviewShare };
+	case Over::Rotate: return { 4, &st::mediaviewRotate };
+	case Over::More: return { 5, &st::mediaviewMore };
+	case Over::Draw: return { 6, &st::mediaviewDraw };
+	case Over::Recognize: return { 7, &st::mediaviewRecognize };
+	}
+	Unexpected("Control value in OverlayWidget::RendererRhi::controlMeta.");
+}
+
+void OverlayWidget::RendererRhi::validateControls() {
+	if (_controlsAtlasTexture) {
+		return;
+	}
+	const auto metas = {
+		controlMeta(Over::Left),
+		controlMeta(Over::Right),
+		controlMeta(Over::Save),
+		controlMeta(Over::Share),
+		controlMeta(Over::Rotate),
+		controlMeta(Over::More),
+		controlMeta(Over::Draw),
+		controlMeta(Over::Recognize),
+	};
+	auto maxWidth = 0;
+	auto fullHeight = 0;
+	for (const auto &meta : metas) {
+		maxWidth = std::max(meta.icon->width(), maxWidth);
+		fullHeight += meta.icon->height();
+	}
+	maxWidth = std::max(st::mediaviewIconOver, maxWidth);
+	fullHeight += st::mediaviewIconOver;
+	auto image = QImage(
+		QSize(maxWidth, fullHeight) * _ifactor,
+		QImage::Format_ARGB32_Premultiplied);
+	image.fill(Qt::transparent);
+	image.setDevicePixelRatio(_ifactor);
+	{
+		auto p = QPainter(&image);
+		auto index = 0;
+		auto height = 0;
+		for (const auto &meta : metas) {
+			meta.icon->paint(p, 0, height, maxWidth);
+			_controlsTextures[index++] = QRect(
+				QPoint(0, height) * _ifactor,
+				meta.icon->size() * _ifactor);
+			height += meta.icon->height();
+		}
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(OverBackgroundColor());
+		p.drawEllipse(
+			QRect(0, height, st::mediaviewIconOver, st::mediaviewIconOver));
+		_controlsTextures[index++] = QRect(
+			QPoint(0, height) * _ifactor,
+			QSize(st::mediaviewIconOver, st::mediaviewIconOver) * _ifactor);
+	}
+
+	const auto size = image.size();
+	_controlsAtlasTexture = _rhi->newTexture(QRhiTexture::BGRA8, size);
+	_controlsAtlasTexture->create();
+	_controlsAtlasSize = size;
+	_rub->uploadTexture(
+		_controlsAtlasTexture,
+		QRhiTextureUploadDescription(
+			QRhiTextureUploadEntry(0, 0,
+				QRhiTextureSubresourceUploadDescription(image))));
+}
+
+void OverlayWidget::RendererRhi::invalidateControls() {
+	delete _controlsAtlasTexture;
+	_controlsAtlasTexture = nullptr;
+	ranges::fill(_controlsTextures, QRect());
+}
+
+void OverlayWidget::RendererRhi::paintControlsStart() {
+	validateControls();
+}
+
+void OverlayWidget::RendererRhi::paintControl(
+		Over control,
+		QRect over,
+		float64 overOpacity,
+		QRect inner,
+		float64 innerOpacity,
+		const style::icon &icon) {
+	if (!_controlsAtlasTexture) {
+		return;
+	}
+	const auto meta = controlMeta(control);
+	Assert(meta.icon == &icon);
+
+	const auto atlasW = float(_controlsAtlasSize.width());
+	const auto atlasH = float(_controlsAtlasSize.height());
+
+	if (!over.isEmpty() && overOpacity > 0.) {
+		const auto overAlpha = float(overOpacity * kOverBackgroundOpacity);
+		const auto &overTex = _controlsTextures[kControlsCount];
+		const auto overGeometry = transformRect(over);
+		// QRect::right()/bottom() return x+width-1 / y+height-1
+		// (inclusive), which is one texel short of the atlas sub-rect.
+		// Sampling only up to that coordinate stretches the (width-1)
+		// texels across the full destination quad, making the rendered
+		// icon / hover circle look one pixel too wide and clips its
+		// right/bottom antialiased edge.
+		const auto tl = overTex.left() / atlasW;
+		const auto tr = (overTex.x() + overTex.width()) / atlasW;
+		const auto tt = overTex.top() / atlasH;
+		const auto tb = (overTex.y() + overTex.height()) / atlasH;
+		const float overCoords[] = {
+			overGeometry.left(), overGeometry.bottom(), tl, tt,
+			overGeometry.right(), overGeometry.bottom(), tr, tt,
+			overGeometry.left(), overGeometry.top(), tl, tb,
+			overGeometry.right(), overGeometry.top(), tr, tb,
+		};
+		drawTexturedQuad(
+			_imagePipeline,
+			_controlsAtlasTexture,
+			overCoords,
+			overAlpha,
+			true);
+	}
+
+	const auto &iconTex = _controlsTextures[meta.index];
+	const auto iconGeometry = transformRect(inner);
+	const auto tl = iconTex.left() / atlasW;
+	const auto tr = (iconTex.x() + iconTex.width()) / atlasW;
+	const auto tt = iconTex.top() / atlasH;
+	const auto tb = (iconTex.y() + iconTex.height()) / atlasH;
+	const float iconCoords[] = {
+		iconGeometry.left(), iconGeometry.bottom(), tl, tt,
+		iconGeometry.right(), iconGeometry.bottom(), tr, tt,
+		iconGeometry.left(), iconGeometry.top(), tl, tb,
+		iconGeometry.right(), iconGeometry.top(), tr, tb,
+	};
+	drawTexturedQuad(
+		_imagePipeline,
+		_controlsAtlasTexture,
+		iconCoords,
+		float(innerOpacity),
+		true);
+}
+
+void OverlayWidget::RendererRhi::paintFooter(
+		QRect outer,
+		float64 opacity) {
+	if (outer.isEmpty() || opacity <= 0.) {
+		return;
+	}
+	paintUsingRaster(outer, [&](Painter &p) {
+		const auto newOuter = QRect(QPoint(), outer.size());
+		_owner->paintFooterContent(p, newOuter, newOuter, opacity);
+	}, true);
+}
+
+void OverlayWidget::RendererRhi::paintCaption(
+		QRect outer,
+		float64 opacity) {
+	if (outer.isEmpty() || opacity <= 0.) {
+		return;
+	}
+	paintUsingRaster(outer, [&](Painter &p) {
+		const auto newOuter = QRect(QPoint(), outer.size());
+		_owner->paintCaptionContent(p, newOuter, newOuter, opacity);
+	}, true);
+}
+
+void OverlayWidget::RendererRhi::paintGroupThumbs(
+		QRect outer,
+		float64 opacity) {
+	if (outer.isEmpty() || opacity <= 0.) {
+		return;
+	}
+	paintUsingRaster(outer, [&](Painter &p) {
+		const auto newOuter = QRect(QPoint(), outer.size());
+		_owner->paintGroupThumbsContent(p, newOuter, newOuter, opacity);
+	}, true);
+}
+
+void OverlayWidget::RendererRhi::paintRoundedCorners(int radius) {
+	if (!_roundedCornersPipeline || radius <= 0) {
+		return;
+	}
+
+	const auto vw = _viewport.width() * _factor;
+	const auto vh = _viewport.height() * _factor;
+
+	RoundedCornersUniforms uniforms{};
+	uniforms.viewport[0] = vw;
+	uniforms.viewport[1] = vh;
+	const auto roundRect = transformRect(QRect(QPoint(), _viewport));
+	uniforms.roundRect[0] = roundRect.x();
+	uniforms.roundRect[1] = roundRect.y();
+	uniforms.roundRect[2] = roundRect.width();
+	uniforms.roundRect[3] = roundRect.height();
+	uniforms.roundRadius = radius * _factor;
+
+	const auto topLeft = transformRect(
+		QRect(0, 0, radius, radius));
+	const auto topRight = transformRect(
+		QRect(_viewport.width() - radius, 0, radius, radius));
+	const auto bottomRight = transformRect(QRect(
+		_viewport.width() - radius,
+		_viewport.height() - radius,
+		radius,
+		radius));
+	const auto bottomLeft = transformRect(
+		QRect(0, _viewport.height() - radius, radius, radius));
+
+	const auto corners = {
+		std::ref(topLeft),
+		std::ref(topRight),
+		std::ref(bottomRight),
+		std::ref(bottomLeft),
+	};
+
+	auto cornerIndex = 0;
+	for (const auto &corner : corners) {
+		if (_nextVertexSlot >= kMaxDraws) {
+			break;
+		}
+		const auto slot = _nextVertexSlot++;
+		const auto uOffset = slot * 256;
+
+		const float coords[] = {
+			corner.get().left(), corner.get().bottom(),
+			corner.get().right(), corner.get().bottom(),
+			corner.get().left(), corner.get().top(),
+			corner.get().right(), corner.get().top(),
+		};
+
+		_rub->updateDynamicBuffer(
+			_fillVertexBuffer,
+			cornerIndex * int(sizeof(coords)),
+			sizeof(coords),
+			coords);
+
+		_rub->updateDynamicBuffer(
+			_uniformBuffer,
+			uOffset,
+			sizeof(RoundedCornersUniforms),
+			&uniforms);
+
+		auto *srb = _rhi->newShaderResourceBindings();
+		srb->setBindings({
+			QRhiShaderResourceBinding::uniformBuffer(
+				0,
+				QRhiShaderResourceBinding::VertexStage
+					| QRhiShaderResourceBinding::FragmentStage,
+				_uniformBuffer,
+				uOffset,
+				sizeof(RoundedCornersUniforms)),
+		});
+		srb->create();
+		_perDrawSrbs.push_back(srb);
+
+		_drawCommands.push_back({
+			.pipeline = _roundedCornersPipeline,
+			.srb = srb,
+			.vertexIndex = cornerIndex,
+			.fillVertex = true,
+		});
+		++cornerIndex;
+	}
+}
+
+void OverlayWidget::RendererRhi::paintStoriesSiblingPart(
+		int index,
+		const QImage &image,
+		QRect rect,
+		float64 opacity) {
+	Expects(index >= 0 && index < kStoriesSiblingPartsCount);
+
+	if (image.isNull() || rect.isEmpty()) {
+		return;
+	}
+
+	const auto cacheKey = image.cacheKey();
+	if (_storiesSiblingCacheKeys[index] != cacheKey
+		|| !_storiesSiblingTextures[index]
+		|| _storiesSiblingSizes[index] != image.size()) {
+		_storiesSiblingCacheKeys[index] = cacheKey;
+		delete _storiesSiblingTextures[index];
+		_storiesSiblingTextures[index] = _rhi->newTexture(
+			QRhiTexture::BGRA8,
+			image.size());
+		_storiesSiblingTextures[index]->create();
+		_storiesSiblingSizes[index] = image.size();
+		_rub->uploadTexture(
+			_storiesSiblingTextures[index],
+			QRhiTextureUploadDescription(
+				QRhiTextureUploadEntry(0, 0,
+					QRhiTextureSubresourceUploadDescription(image))));
+	}
+
+	const auto rRect = transformRect(rect);
+	const float coords[] = {
+		rRect.left(), rRect.bottom(), 0.f, 0.f,
+		rRect.right(), rRect.bottom(), 1.f, 0.f,
+		rRect.left(), rRect.top(), 0.f, 1.f,
+		rRect.right(), rRect.top(), 1.f, 1.f,
+	};
+	drawTexturedQuad(
+		_imagePipeline,
+		_storiesSiblingTextures[index],
+		coords,
+		float(opacity),
+		true);
+}
+
+Rect OverlayWidget::RendererRhi::transformRect(const Rect &raster) const {
+	return TransformRect(raster, _viewport, _factor);
+}
+
+Rect OverlayWidget::RendererRhi::transformRect(const QRectF &raster) const {
+	return TransformRect(raster, _viewport, _factor);
+}
+
+Rect OverlayWidget::RendererRhi::transformRect(const QRect &raster) const {
+	return TransformRect(Rect(raster), _viewport, _factor);
+}
+
+Rect OverlayWidget::RendererRhi::scaleRect(
+		const Rect &unscaled,
+		float64 scale) const {
+	const auto added = scale - 1.;
+	const auto addw = unscaled.width() * added;
+	const auto addh = unscaled.height() * added;
+	return Rect(
+		unscaled.x() - addw / 2,
+		unscaled.y() - addh / 2,
+		unscaled.width() + addw,
+		unscaled.height() + addh);
+}
+
+} // namespace Media::View
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_rhi.h b/Telegram/SourceFiles/media/view/media_view_overlay_rhi.h
new file mode 100644
index 00000000000000..059d22ff5f5bb9
--- /dev/null
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_rhi.h
@@ -0,0 +1,229 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "media/view/media_view_overlay_renderer.h"
+#include "ui/rhi/rhi_renderer.h"
+#include "ui/rhi/rhi_image.h"
+#ifdef Q_OS_MAC
+#include "media/view/media_view_metal_texture.h"
+#endif
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+class QRhi;
+class QRhiBuffer;
+class QRhiTexture;
+class QRhiSampler;
+class QRhiGraphicsPipeline;
+class QRhiShaderResourceBindings;
+class QRhiResourceUpdateBatch;
+
+namespace Media::View {
+
+class VideoStream;
+
+class OverlayWidget::RendererRhi final
+	: public OverlayWidget::Renderer
+	, public Ui::Rhi::Renderer
+	, public base::has_weak_ptr {
+public:
+	explicit RendererRhi(not_null<OverlayWidget*> owner);
+	~RendererRhi();
+
+	void initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void releaseResources() override;
+
+	QColor rhiClearColor() override;
+	std::optional<QColor> clearColor() override;
+
+private:
+	void paintBackground() override;
+	void paintVideoStream() override;
+	void paintTransformedVideoFrame(ContentGeometry geometry) override;
+	void paintTransformedStaticContent(
+		const QImage &image,
+		ContentGeometry geometry,
+		bool semiTransparent,
+		bool fillTransparentBackground,
+		int index = 0) override;
+	void paintRadialLoading(
+		QRect inner,
+		bool radial,
+		float64 radialOpacity) override;
+	void paintThemePreview(QRect outer) override;
+	void paintDocumentBubble(QRect outer, QRect icon) override;
+	void paintSaveMsg(QRect outer) override;
+	void paintChapter(QRect outer) override;
+	void paintSpeedBoost(QRect outer) override;
+	void paintControlsStart() override;
+	void paintControl(
+		Over control,
+		QRect over,
+		float64 overOpacity,
+		QRect inner,
+		float64 innerOpacity,
+		const style::icon &icon) override;
+	void paintFooter(QRect outer, float64 opacity) override;
+	void paintCaption(QRect outer, float64 opacity) override;
+	void paintGroupThumbs(QRect outer, float64 opacity) override;
+	void paintRoundedCorners(int radius) override;
+	void paintStoriesSiblingPart(
+		int index,
+		const QImage &image,
+		QRect rect,
+		float64 opacity = 1.) override;
+
+	void paintRecognitionOverlay(
+		const QImage &image,
+		ContentGeometry geometry);
+
+	struct Control {
+		int index = -1;
+		not_null<const style::icon*> icon;
+	};
+
+	void createPipelines();
+	void validateControlsFade();
+	void validateControls();
+	void invalidateControls();
+	[[nodiscard]] Control controlMeta(Over control) const;
+
+	void drawTexturedQuad(
+		QRhiGraphicsPipeline *pipeline,
+		QRhiTexture *texture,
+		const float *coords,
+		float opacity = 1.f,
+		bool blend = false);
+
+	void drawContentQuad(
+		QRhiTexture *contentTexture,
+		const float *coords,
+		ContentGeometry geometry,
+		bool fillTransparentBackground,
+		bool blend);
+
+	void fillShadowUniforms(
+		float *shadowTopRect,
+		float *shadowBottomSkipOpacityFullFade,
+		ContentGeometry geometry) const;
+
+	void paintUsingRaster(
+		QRect rect,
+		Fn<void(Painter&)> method,
+		bool transparent = false,
+		float opacity = 1.f);
+
+	[[nodiscard]] Ui::GL::Rect transformRect(const QRect &raster) const;
+	[[nodiscard]] Ui::GL::Rect transformRect(const QRectF &raster) const;
+	[[nodiscard]] Ui::GL::Rect transformRect(
+		const Ui::GL::Rect &raster) const;
+	[[nodiscard]] Ui::GL::Rect scaleRect(
+		const Ui::GL::Rect &unscaled,
+		float64 scale) const;
+
+	const not_null<OverlayWidget*> _owner;
+
+	QRhi *_rhi = nullptr;
+	QRhiRenderTarget *_rt = nullptr;
+	QRhiCommandBuffer *_cb = nullptr;
+	QRhiResourceUpdateBatch *_rub = nullptr;
+	QSize _viewport;
+	float _factor = 1.;
+	int _ifactor = 1;
+
+	static constexpr int kMaxDraws = 32;
+	static constexpr int kVertexSize = 4 * 4 * sizeof(float);
+
+	QRhiBuffer *_vertexBuffer = nullptr;
+	QRhiBuffer *_fillVertexBuffer = nullptr;
+	QRhiBuffer *_uniformBuffer = nullptr;
+	QRhiSampler *_sampler = nullptr;
+	QRhiTexture *_placeholderTexture = nullptr;
+
+	QRhiGraphicsPipeline *_imagePipeline = nullptr;
+	QRhiGraphicsPipeline *_imageBlendPipeline = nullptr;
+	QRhiGraphicsPipeline *_staticContentPipeline = nullptr;
+	QRhiGraphicsPipeline *_staticContentBlendPipeline = nullptr;
+	QRhiGraphicsPipeline *_transparentContentPipeline = nullptr;
+	QRhiGraphicsPipeline *_roundedCornersPipeline = nullptr;
+	QRhiGraphicsPipeline *_yuv420Pipeline = nullptr;
+	QRhiGraphicsPipeline *_yuv420BlendPipeline = nullptr;
+	QRhiGraphicsPipeline *_nv12Pipeline = nullptr;
+	QRhiGraphicsPipeline *_nv12BlendPipeline = nullptr;
+
+	struct DrawCommand {
+		QRhiGraphicsPipeline *pipeline = nullptr;
+		QRhiShaderResourceBindings *srb = nullptr;
+		int vertexIndex = 0;
+		bool fillVertex = false;
+	};
+	std::vector<DrawCommand> _drawCommands;
+	std::vector<QRhiShaderResourceBindings*> _perDrawSrbs;
+	int _nextVertexSlot = 0;
+
+	QRhiTexture *_rgbaTextures[3] = {};
+	QSize _rgbaSizes[3];
+	quint64 _cacheKeys[3] = {};
+
+	QRhiTexture *_yTexture = nullptr;
+	QRhiTexture *_uTexture = nullptr;
+	QRhiTexture *_vTexture = nullptr;
+	QRhiTexture *_uvTexture = nullptr;
+	QSize _lumaSize;
+	QSize _chromaSize;
+	bool _chromaNV12 = false;
+	bool _usingExternalVideoTextures = false;
+	int _trackFrameIndex = 0;
+	int _streamedIndex = 0;
+
+	struct PoolTexture {
+		QRhiTexture *texture = nullptr;
+		QSize size;
+	};
+	std::vector<PoolTexture> _texturePool;
+	int _nextPoolIndex = 0;
+	[[nodiscard]] QRhiTexture *acquirePoolTexture(QSize size);
+
+	static constexpr auto kControlsCount = 8;
+	QRhiTexture *_controlsAtlasTexture = nullptr;
+	QSize _controlsAtlasSize;
+	std::array<QRect, kControlsCount + 1> _controlsTextures;
+
+	static constexpr auto kStoriesSiblingPartsCount = 4;
+	QRhiTexture *_storiesSiblingTextures[kStoriesSiblingPartsCount] = {};
+	QSize _storiesSiblingSizes[kStoriesSiblingPartsCount];
+	quint64 _storiesSiblingCacheKeys[kStoriesSiblingPartsCount] = {};
+
+	QRhiTexture *_controlsFadeTexture = nullptr;
+	QSize _controlsFadeSize;
+	bool _shadowTopFlip = false;
+	bool _shadowsForStories = false;
+
+#ifdef Q_OS_MAC
+	MetalTextureCache _metalTextureCache;
+#endif
+
+	VideoStream *_pendingVideoStream = nullptr;
+	bool _initialized = false;
+
+	rpl::lifetime _storiesLifetime;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Media::View
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 9362819b3a95a4..408dc364718184 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -10,10 +10,13 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "api/api_attached_stickers.h"
 #include "api/api_peer_photo.h"
+#include "api/api_polls.h"
 #include "base/qt/qt_common_adapters.h"
+#include "base/timer_rpl.h"
 #include "lang/lang_keys.h"
 #include "menu/menu_sponsored.h"
 #include "boxes/premium_preview_box.h"
+#include "calls/calls_instance.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
 #include "core/file_utilities.h"
@@ -27,8 +30,11 @@ For license and copyright information please follow this link:
 #include "ui/widgets/dropdown_menu.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/buttons.h"
+#include "ui/controls/swipe_handler.h"
+#include "ui/controls/swipe_handler_data.h"
 #include "ui/layers/layer_manager.h"
 #include "ui/text/text_utilities.h"
+#include "ui/chat/chat_style.h"
 #include "ui/platform/ui_platform_window_title.h"
 #include "ui/toast/toast.h"
 #include "ui/text/format_values.h"
@@ -44,20 +50,28 @@ For license and copyright information please follow this link:
 #include "info/info_controller.h"
 #include "info/statistics/info_statistics_widget.h"
 #include "boxes/delete_messages_box.h"
+#include "boxes/moderate_messages_box.h"
 #include "boxes/report_messages_box.h"
 #include "media/audio/media_audio.h"
 #include "media/view/media_view_group_thumbs.h"
 #include "media/view/media_view_pip.h"
 #include "media/view/media_view_overlay_raster.h"
 #include "media/view/media_view_overlay_opengl.h"
+#include "media/view/media_view_overlay_rhi.h"
+#include "media/view/media_view_playback_sponsored.h"
+#include "media/view/media_view_video_stream.h"
+#include "media/stories/media_stories_share.h"
 #include "media/stories/media_stories_view.h"
+#include "media/streaming/media_streaming_document.h"
 #include "media/streaming/media_streaming_player.h"
 #include "media/player/media_player_instance.h"
 #include "history/history.h"
 #include "history/history_item_helpers.h"
 #include "history/view/media/history_view_media.h"
+#include "history/view/history_view_group_call_bar.h"
 #include "history/view/reactions/history_view_reactions_selector.h"
 #include "data/components/sponsored_messages.h"
+#include "data/data_group_call.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
@@ -69,9 +83,11 @@ For license and copyright information please follow this link:
 #include "data/data_document_resolver.h"
 #include "data/data_file_click_handler.h"
 #include "data/data_download_manager.h"
+#include "data/data_poll.h"
 #include "window/themes/window_theme_preview.h"
 #include "window/window_peer_menu.h"
 #include "window/window_controller.h"
+#include "base/platform/base_platform_haptic.h"
 #include "base/platform/base_platform_info.h"
 #include "base/power_save_blocker.h"
 #include "base/random.h"
@@ -86,11 +102,14 @@ For license and copyright information please follow this link:
 #include "platform/platform_overlay_widget.h"
 #include "storage/file_download.h"
 #include "storage/storage_account.h"
-#include "calls/calls_instance.h"
 #include "styles/style_media_view.h"
 #include "styles/style_calls.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
+#include "platform/platform_text_recognition.h"
+
+#include <QGraphicsOpacityEffect>
 
 #ifdef Q_OS_MAC
 #include "platform/mac/touchbar/mac_touchbar_media_view.h"
@@ -99,6 +118,8 @@ For license and copyright information please follow this link:
 #include <QtWidgets/QApplication>
 #include <QtCore/QBuffer>
 #include <QtGui/QGuiApplication>
+#include <QtGui/QNativeGestureEvent>
+#include <QtGui/QPainterPathStroker>
 #include <QtGui/QWindow>
 #include <QtGui/QScreen>
 
@@ -108,11 +129,66 @@ namespace Media {
 namespace View {
 namespace {
 
+struct RecognitionId {
+	uint64 sessionUniqueId = 0;
+	PhotoId photoId = 0;
+	DocumentId documentId = 0;
+
+	friend inline auto operator<=>(RecognitionId, RecognitionId) = default;
+};
+
+using RecognitionResult = Platform::TextRecognition::Result;
+using RecognitionCacheMap = base::flat_map<RecognitionId, RecognitionResult>;
+
+[[nodiscard]] RecognitionCacheMap *RecognitionCache() {
+	static auto cache = Platform::TextRecognition::IsAvailable()
+		? std::make_unique<base::flat_map<RecognitionId, RecognitionResult>>()
+		: nullptr;
+	return cache.get();
+}
+
+[[nodiscard]] bool InstantViewMediaItemMatches(
+		const HistoryMessageMediaForInstantView::Item &item,
+		PhotoData *photo,
+		DocumentData *document) {
+	if (const auto itemPhoto = std::get_if<PhotoData*>(&item)) {
+		return *itemPhoto == photo;
+	} else if (const auto itemDocument = std::get_if<DocumentData*>(&item)) {
+		return *itemDocument == document;
+	}
+	return false;
+}
+
+[[nodiscard]] std::optional<TextWithEntities> InstantViewMediaCaption(
+		HistoryItem *message,
+		PhotoData *photo,
+		DocumentData *document) {
+	if (!message || (!photo && !document)) {
+		return std::nullopt;
+	}
+	const auto media = message->Get<HistoryMessageMediaForInstantView>();
+	if (!media) {
+		return std::nullopt;
+	}
+	for (auto i = size_t(); i != media->items.size(); ++i) {
+		if (InstantViewMediaItemMatches(media->items[i], photo, document)) {
+			return (i < media->captions.size())
+				? media->captions[i]
+				: TextWithEntities();
+		}
+	}
+	return std::nullopt;
+}
+
 constexpr auto kPreloadCount = 3;
 constexpr auto kMaxZoomLevel = 7; // x8
 constexpr auto kZoomToScreenLevel = 1024;
+constexpr auto kPinchZoomStep = 0.25;
 constexpr auto kOverlayLoaderPriority = 2;
 constexpr auto kSeekTimeMs = 5 * crl::time(1000);
+constexpr auto kSeekTimeMsLong = 10 * crl::time(1000);
+constexpr auto kFrameStepFallbackFps = 30.;
+constexpr auto kFrameStepThrottleMs = crl::time(150);
 
 // macOS OpenGL renderer fails to render larger texture
 // even though it reports that max texture size is 16384.
@@ -226,6 +302,65 @@ QWidget *PipDelegate::pipParentWidget() {
 	return false;
 }
 
+[[nodiscard]] std::optional<WebPageCollage::Item> PollInputMediaItem(
+		const PollMedia &media) {
+	if (media.photo) {
+		return WebPageCollage::Item(media.photo);
+	} else if (media.document && !media.document->sticker()) {
+		return WebPageCollage::Item(media.document);
+	}
+	return std::nullopt;
+}
+
+[[nodiscard]] std::optional<WebPageCollage::Item> PollAnswerMediaItem(
+		const PollAnswer &answer) {
+	return PollInputMediaItem(answer.media);
+}
+
+[[nodiscard]] bool IsPollAnswerMediaItem(
+		not_null<PollData*> poll,
+		const WebPageCollage::Item &item) {
+	return ranges::any_of(poll->answers, [&](const PollAnswer &answer) {
+		const auto candidate = PollAnswerMediaItem(answer);
+		return candidate && (*candidate == item);
+	});
+}
+
+[[nodiscard]] std::optional<WebPageCollage> PollAnswersCollage(
+		not_null<PollData*> poll) {
+	auto result = WebPageCollage();
+	for (const auto &answer : poll->answers) {
+		if (const auto item = PollAnswerMediaItem(answer)) {
+			result.items.push_back(*item);
+		}
+	}
+	return result.items.empty()
+		? std::nullopt
+		: std::make_optional(std::move(result));
+}
+
+void RefreshCaptionQuoteCaches(
+		Ui::Text::QuotePaintCache &blockquote,
+		Ui::Text::QuotePaintCache &pre) {
+	const auto withAlpha = [](QColor color, float64 opacity) {
+		color.setAlpha(int(opacity * 255));
+		return color;
+	};
+
+	const auto accent = st::mediaviewTextLinkFg->c;
+	blockquote.bg = withAlpha(accent, Ui::kDefaultBgOpacity);
+	blockquote.outlines[0] = withAlpha(accent, Ui::kDefaultOutline1Opacity);
+	blockquote.outlines[1] = blockquote.outlines[2] = QColor(0, 0, 0, 0);
+	blockquote.icon = accent;
+
+	const auto mono = st::mediaviewCaptionFg->c;
+	pre.bg = QColor(0, 0, 0, 192);
+	pre.outlines[0] = withAlpha(mono, Ui::kDefaultOutline1Opacity);
+	pre.outlines[1] = pre.outlines[2] = QColor(0, 0, 0, 0);
+	pre.header = withAlpha(mono, Ui::kDefaultOutline2Opacity);
+	pre.icon = withAlpha(mono, Ui::kDefaultOutline3Opacity);
+}
+
 } // namespace
 
 class OverlayWidget::SponsoredButton : public Ui::RippleButton {
@@ -311,6 +446,16 @@ struct OverlayWidget::UserPhotos {
 	rpl::lifetime lifetime;
 };
 
+struct OverlayWidget::InstantViewMedia {
+	InstantViewMedia(HistoryItem *item, InstantViewItem key)
+	: item(item)
+	, key(std::move(key)) {
+	}
+
+	HistoryItem *item = nullptr;
+	InstantViewItem key;
+};
+
 struct OverlayWidget::Collage {
 	Collage(CollageKey key) : key(key) {
 	}
@@ -320,7 +465,9 @@ struct OverlayWidget::Collage {
 
 struct OverlayWidget::Streamed {
 	Streamed(
-		not_null<DocumentData*> document,
+		not_null<DocumentData*> quality,
+		not_null<DocumentData*> original,
+		HistoryItem *context,
 		Data::FileOrigin origin,
 		Fn<void()> waitingCallback);
 	Streamed(
@@ -330,8 +477,10 @@ struct OverlayWidget::Streamed {
 
 	Streaming::Instance instance;
 	std::unique_ptr<PlaybackControls> controls;
+	std::unique_ptr<PlaybackSponsored> sponsored;
 	std::unique_ptr<base::PowerSaveBlocker> powerSaveBlocker;
 
+	bool ready = false;
 	bool withSound = false;
 	bool pausedBySeek = false;
 	bool resumeOnCallEnd = false;
@@ -341,6 +490,10 @@ struct OverlayWidget::PipWrap {
 	PipWrap(
 		QWidget *parent,
 		not_null<DocumentData*> document,
+		Data::FileOrigin origin,
+		not_null<DocumentData*> chosenQuality,
+		HistoryItem *context,
+		VideoQuality quality,
 		std::shared_ptr<Streaming::Document> shared,
 		FnMut<void()> closeAndContinue,
 		FnMut<void()> destroy);
@@ -356,6 +509,7 @@ struct OverlayWidget::PipWrap {
 struct OverlayWidget::ItemContext {
 	not_null<HistoryItem*> item;
 	MsgId topicRootId = 0;
+	PeerId monoforumPeerId = 0;
 };
 
 struct OverlayWidget::StoriesContext {
@@ -426,6 +580,10 @@ class OverlayWidget::Show final : public ChatHelpers::Show {
 		return { SendMenu::Type::SilentOnly };
 	}
 
+	Window::SessionController *resolveWindow() const override {
+		return _widget->findWindow();
+	}
+
 	bool showMediaPreview(
 			Data::FileOrigin origin,
 			not_null<DocumentData*> document) const override {
@@ -448,10 +606,12 @@ class OverlayWidget::Show final : public ChatHelpers::Show {
 };
 
 OverlayWidget::Streamed::Streamed(
-	not_null<DocumentData*> document,
+	not_null<DocumentData*> quality,
+	not_null<DocumentData*> original,
+	HistoryItem *context,
 	Data::FileOrigin origin,
 	Fn<void()> waitingCallback)
-: instance(document, origin, std::move(waitingCallback)) {
+: instance(quality, original, context, origin, std::move(waitingCallback)) {
 }
 
 OverlayWidget::Streamed::Streamed(
@@ -464,6 +624,10 @@ OverlayWidget::Streamed::Streamed(
 OverlayWidget::PipWrap::PipWrap(
 	QWidget *parent,
 	not_null<DocumentData*> document,
+	Data::FileOrigin origin,
+	not_null<DocumentData*> chosenQuality,
+	HistoryItem *context,
+	VideoQuality quality,
 	std::shared_ptr<Streaming::Document> shared,
 	FnMut<void()> closeAndContinue,
 	FnMut<void()> destroy)
@@ -471,13 +635,17 @@ OverlayWidget::PipWrap::PipWrap(
 , wrapped(
 	&delegate,
 	document,
+	origin,
+	chosenQuality,
+	context,
+	quality,
 	std::move(shared),
 	std::move(closeAndContinue),
 	std::move(destroy)) {
 }
 
 OverlayWidget::OverlayWidget()
-: _wrap(std::make_unique<Ui::GL::Window>())
+: _wrap(std::make_unique<Ui::GL::Window>(Ui::GL::Window::Translucent::Yes))
 , _window(_wrap->window())
 , _helper(Platform::CreateOverlayWidgetHelper(_window.get(), [=](bool maximized) {
 	toggleFullScreen(maximized);
@@ -489,6 +657,7 @@ OverlayWidget::OverlayWidget()
 , _widget(_surface->rpWidget())
 , _fullscreen(Core::App().settings().mediaViewPosition().maximized == 2)
 , _windowed(Core::App().settings().mediaViewPosition().maximized == 0)
+, _quality(Core::App().settings().videoQuality())
 , _layerBg(std::make_unique<Ui::LayerManager>(_body))
 , _docDownload(_body, tr::lng_media_download(tr::now), st::mediaviewFileLink)
 , _docSaveAs(_body, tr::lng_mediaview_save_as(tr::now), st::mediaviewFileLink)
@@ -496,14 +665,20 @@ OverlayWidget::OverlayWidget()
 , _radial([=](crl::time now) { return radialAnimationCallback(now); })
 , _lastAction(-st::mediaviewDeltaFromLastAction, -st::mediaviewDeltaFromLastAction)
 , _stateAnimation([=](crl::time now) { return stateAnimationCallback(now); })
-, _dropdown(_body, st::mediaviewDropdownMenu) {
+, _dropdown(_body, st::mediaviewDropdownMenu)
+, _speedBoostTicker([=] {
+	updateSpeedBoost();
+	return isSpeedBoostShown();
+}) {
 	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
 	_layerBg->setHideByBackgroundClick(true);
 
+	_recognition.setSources(&_recognitionResult, &_staticContent);
+
 	CrashReports::SetAnnotation("OpenGL Renderer", "[not-initialized]");
 
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
@@ -515,13 +690,25 @@ OverlayWidget::OverlayWidget()
 		_saveMsgAnimation.start([=] { updateSaveMsg(); }, 1., 0., delay);
 	});
 
+	_chapterTimer.setCallback([=, delay = st::mediaviewChapterHiding] {
+		_chapterAnimation.start([=] { updateChapter(); }, 1., 0., delay);
+	});
+
+	_speedBoostHoldTimer.setCallback([=] {
+		startSpeedBoost();
+	});
+
+	_frameStepThrottle.setCallback([=] {
+		flushPendingFrameStep();
+	});
+
 	_docRectImage = QImage(
 		st::mediaviewFileSize * style::DevicePixelRatio(),
 		QImage::Format_ARGB32_Premultiplied);
 	_docRectImage.setDevicePixelRatio(style::DevicePixelRatio());
 
 	Shortcuts::Requests(
-	) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		request->check(
 			Shortcuts::Command::MediaViewerFullscreen
 		) && request->handle([=] {
@@ -624,6 +811,8 @@ OverlayWidget::OverlayWidget()
 			updateControlsGeometry();
 		} else if (type == QEvent::KeyPress) {
 			handleKeyPress(static_cast<QKeyEvent*>(e.get()));
+		} else if (type == QEvent::KeyRelease) {
+			handleKeyRelease(static_cast<QKeyEvent*>(e.get()));
 		}
 		return base::EventFilterResult::Continue;
 	});
@@ -654,11 +843,16 @@ OverlayWidget::OverlayWidget()
 			}
 		} else if (type == QEvent::Wheel) {
 			handleWheelEvent(static_cast<QWheelEvent*>(e.get()));
+		} else if (type == QEvent::NativeGesture) {
+			if (handleNativeGesture(static_cast<QNativeGestureEvent*>(e.get()))) {
+				return base::EventFilterResult::Cancel;
+			}
 		}
 		return base::EventFilterResult::Continue;
 	});
+	setupSwipeNavigation();
 	_helper->mouseEvents(
-	) | rpl::start_with_next([=](not_null<QMouseEvent*> e) {
+	) | rpl::on_next([=](not_null<QMouseEvent*> e) {
 		if (_helper->skipTitleHitTest(e->windowPos().toPoint())) {
 			return;
 		}
@@ -678,13 +872,13 @@ OverlayWidget::OverlayWidget()
 	}, lifetime());
 	_topShadowRight = _helper->controlsSideRightValue();
 	_topShadowRight.changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateControlsGeometry();
 		update();
 	}, lifetime());
 
 	_helper->topNotchSkipValue(
-	) | rpl::start_with_next([=](int notch) {
+	) | rpl::on_next([=](int notch) {
 		if (_topNotchSize != notch) {
 			_topNotchSize = notch;
 			if (_fullscreen) {
@@ -706,7 +900,7 @@ OverlayWidget::OverlayWidget()
 	_widget->setMouseTracking(true);
 
 	_window->screenValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](not_null<QScreen*> screen) {
+	) | rpl::skip(1) | rpl::on_next([=](not_null<QScreen*> screen) {
 		handleScreenChanged(screen);
 	}, lifetime());
 	subscribeToScreenGeometry();
@@ -716,6 +910,7 @@ OverlayWidget::OverlayWidget()
 #ifdef Q_OS_MAC
 	TouchBar::SetupMediaViewTouchBar(
 		_window->winId(),
+		tr::lng_mediaview_title(tr::now),
 		static_cast<PlaybackControls::Delegate*>(this),
 		_touchbarTrackState.events(),
 		_touchbarDisplay.events(),
@@ -727,7 +922,7 @@ OverlayWidget::OverlayWidget()
 		Core::App().calls().currentCallValue(),
 		Core::App().calls().currentGroupCallValue(),
 		_1 || _2
-	) | rpl::start_with_next([=](bool call) {
+	) | rpl::on_next([=](bool call) {
 		if (!_streamed
 			|| !_document
 			|| (_document->isAnimation() && !_document->isVideoMessage())) {
@@ -744,7 +939,7 @@ OverlayWidget::OverlayWidget()
 
 	_controlsHideTimer.setCallback([=] { hideControls(); });
 	_helper->controlsActivations(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		activateControls();
 	}, lifetime());
 
@@ -759,18 +954,22 @@ OverlayWidget::OverlayWidget()
 }
 
 void OverlayWidget::showSaveMsgToast(const QString &path, auto phrase) {
-	showSaveMsgToastWith(path, phrase(
-		tr::now,
-		lt_downloads,
-		Ui::Text::Link(
-			tr::lng_mediaview_downloads(tr::now),
-			"internal:show_saved_message"),
-		Ui::Text::WithEntities));
+	showSaveMsgToastWith(
+		path,
+		phrase(
+			tr::now,
+			lt_downloads,
+			tr::link(
+				tr::lng_mediaview_downloads(tr::now),
+				"internal:show_saved_message"),
+			tr::marked),
+		st::mediaviewSaveMsgShown);
 }
 
 void OverlayWidget::showSaveMsgToastWith(
 		const QString &path,
-		const TextWithEntities &text) {
+		const TextWithEntities &text,
+		crl::time duration) {
 	_saveMsgFilename = path;
 	_saveMsgText.setMarkedText(st::mediaviewSaveMsgStyle, text);
 	const auto w = _saveMsgText.maxWidth()
@@ -787,11 +986,11 @@ void OverlayWidget::showSaveMsgToastWith(
 	const auto callback = [=](float64 value) {
 		updateSaveMsg();
 		if (!_saveMsgAnimation.animating()) {
-			_saveMsgTimer.callOnce(st::mediaviewSaveMsgShown);
+			_saveMsgTimer.callOnce(duration);
 		}
 	};
-	const auto duration = st::mediaviewSaveMsgShowing;
-	_saveMsgAnimation.start(callback, 0., 1., duration);
+	const auto animDuration = st::mediaviewSaveMsgShowing;
+	_saveMsgAnimation.start(callback, 0., 1., animDuration);
 	updateSaveMsg();
 }
 
@@ -834,7 +1033,7 @@ void OverlayWidget::setupWindow() {
 		{ st::mediaviewMinWidth, st::mediaviewMinHeight });
 
 	_window->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		toggleApplicationEventFilter(shown);
 		if (!shown) {
 			clearAfterHide();
@@ -909,13 +1108,12 @@ void OverlayWidget::initNormalGeometry() {
 	const auto saved = Core::App().settings().mediaViewPosition();
 	const auto adjusted = Core::AdjustToScale(saved, u"Viewer"_q);
 	const auto initial = DefaultPosition();
-	_normalGeometry = initial.rect();
-	if (const auto active = Core::App().activeWindow()) {
-		_normalGeometry = active->widget()->countInitialGeometry(
-			adjusted,
-			initial,
-			{ st::mediaviewMinWidth, st::mediaviewMinHeight });
-	}
+	_normalGeometry = Window::CountInitialGeometry(
+		_window,
+		adjusted,
+		initial,
+		{ st::mediaviewMinWidth, st::mediaviewMinHeight },
+		u"Viewer"_q);
 }
 
 void OverlayWidget::savePosition() {
@@ -932,7 +1130,7 @@ void OverlayWidget::savePosition() {
 		realPosition.maximized = 1;
 		realPosition.moncrc = 0;
 		DEBUG_LOG(("Viewer Pos: Saving maximized position."));
-	} else if (!_wasWindowedMode && !Platform::IsMac()) {
+	} else if (!_wasWindowedMode) {
 		return;
 	} else {
 		auto r = _normalGeometry = _window->body()->mapToGlobal(
@@ -954,7 +1152,8 @@ void OverlayWidget::savePosition() {
 	realPosition = Window::PositionWithScreen(
 		realPosition,
 		_window,
-		{ st::mediaviewMinWidth, st::mediaviewMinHeight });
+		{ st::mediaviewMinWidth, st::mediaviewMinHeight },
+		u"Viewer"_q);
 	if (realPosition.w >= st::mediaviewMinWidth
 		&& realPosition.h >= st::mediaviewMinHeight
 		&& realPosition != savedPosition) {
@@ -976,12 +1175,24 @@ void OverlayWidget::updateGeometry(bool inMove) {
 	if (_fullscreen) {
 		updateGeometryToScreen(inMove);
 	} else if (_windowed && _normalGeometryInited) {
-		DEBUG_LOG(("Viewer Pos: Setting %1, %2, %3, %4")
-			.arg(_normalGeometry.x())
-			.arg(_normalGeometry.y())
-			.arg(_normalGeometry.width())
-			.arg(_normalGeometry.height()));
-		_window->setGeometry(_normalGeometry);
+		const auto setGeometry = [=](QRect geometry) {
+			DEBUG_LOG(("Viewer Pos: Setting %1, %2, %3, %4")
+				.arg(geometry.x())
+				.arg(geometry.y())
+				.arg(geometry.width())
+				.arg(geometry.height()));
+			_window->setGeometry(geometry);
+		};
+		const auto geometry = _normalGeometry;
+		setGeometry(geometry);
+		if constexpr (Platform::IsMac()) {
+			// Either macOS or Qt immediately overwrite the geometry for
+			// some time (perhaps until the window is really on screen),
+			// try to set again later in event loop
+			InvokeQueued(_window, [=] {
+				setGeometry(geometry);
+			});
+		}
 	}
 	if constexpr (!Platform::IsMac()) {
 		if (_fullscreen) {
@@ -1006,7 +1217,7 @@ void OverlayWidget::updateGeometryToScreen(bool inMove) {
 		.arg(available.y())
 		.arg(available.width())
 		.arg(available.height()));
-	_window->setGeometry(available);
+	_window->Ui::RpWidget::setGeometry(available);
 }
 
 void OverlayWidget::updateControlsGeometry() {
@@ -1084,6 +1295,9 @@ QSize OverlayWidget::flipSizeByRotation(QSize size) const {
 
 bool OverlayWidget::hasCopyMediaRestriction(bool skipPremiumCheck) const {
 	if (const auto story = _stories ? _stories->story() : nullptr) {
+		if (story->call()) {
+			return true;
+		}
 		return skipPremiumCheck
 			? !story->canDownloadIfPremium()
 			: !story->canDownloadChecked();
@@ -1100,19 +1314,26 @@ bool OverlayWidget::showCopyMediaRestriction(bool skipPRemiumCheck) {
 	} else if (_history) {
 		uiShow()->showToast(_history->peer->isBroadcast()
 			? tr::lng_error_nocopy_channel(tr::now)
+			: _history->peer->isUser()
+			? tr::lng_error_nocopy_user(tr::now)
 			: tr::lng_error_nocopy_group(tr::now));
 	}
 	return true;
 }
 
 bool OverlayWidget::videoShown() const {
-	return _streamed && !_streamed->instance.info().video.cover.isNull();
+	return _streamed
+		&& _streamed->ready
+		&& !_streamed->instance.info().video.cover.isNull();
 }
 
 QSize OverlayWidget::videoSize() const {
 	Expects(videoShown());
 
-	return flipSizeByRotation(_streamed->instance.info().video.size);
+	const auto use = (_document && _chosenQuality != _document)
+		? _chosenQuality->dimensions
+		: _streamed->instance.info().video.size;
+	return flipSizeByRotation(use);
 }
 
 bool OverlayWidget::streamingRequiresControls() const {
@@ -1176,6 +1397,9 @@ void OverlayWidget::setStaticContent(QImage image) {
 		image = std::move(image).convertToFormat(kGood);
 	}
 	image.setDevicePixelRatio(style::DevicePixelRatio());
+	if (_flip) {
+		image = image.mirrored(_flip & Qt::Horizontal, _flip & Qt::Vertical);
+	}
 	_staticContent = std::move(image);
 	_staticContentTransparent = IsSemitransparent(_staticContent);
 }
@@ -1194,6 +1418,7 @@ bool OverlayWidget::opaqueContentShown() const {
 }
 
 void OverlayWidget::clearStreaming(bool savePosition) {
+	finishSystemMediaControls();
 	if (_streamed && _document && savePosition) {
 		Media::Player::SaveLastPlaybackPosition(
 			_document,
@@ -1207,7 +1432,8 @@ void OverlayWidget::documentUpdated(not_null<DocumentData*> document) {
 	if (_document != document) {
 		return;
 	} else if (documentBubbleShown()) {
-		if ((_document->loading() && _docCancel->isHidden()) || (!_document->loading() && !_docCancel->isHidden())) {
+		if ((_document->loading() && _docCancel->isHidden())
+			|| (!_document->loading() && !_docCancel->isHidden())) {
 			updateControls();
 		} else if (_document->loading()) {
 			updateDocSize();
@@ -1257,6 +1483,10 @@ void OverlayWidget::refreshNavVisibility() {
 	if (_stories) {
 		_leftNavVisible = _stories->subjumpAvailable(-1);
 		_rightNavVisible = _stories->subjumpAvailable(1);
+	} else if (_instantViewMediaData) {
+		_leftNavVisible = _index && (*_index > 0);
+		_rightNavVisible = _index
+			&& (*_index + 1 < _instantViewMediaData->size());
 	} else if (_sharedMediaData) {
 		_leftNavVisible = _index && (*_index > 0);
 		_rightNavVisible = _index && (*_index + 1 < _sharedMediaData->size());
@@ -1304,8 +1534,7 @@ void OverlayWidget::checkForSaveLoaded() {
 
 void OverlayWidget::showPremiumDownloadPromo() {
 	const auto filter = [=](const auto &...) {
-		const auto usage = ChatHelpers::WindowUsage::PremiumPromo;
-		if (const auto window = uiShow()->resolveWindow(usage)) {
+		if (const auto window = uiShow()->resolveWindow()) {
 			ShowPremiumPreviewBox(window, PremiumFeature::Stories);
 			window->window().activate();
 		}
@@ -1315,10 +1544,10 @@ void OverlayWidget::showPremiumDownloadPromo() {
 		.text = tr::lng_stories_save_promo(
 			tr::now,
 			lt_link,
-			Ui::Text::Link(
-				Ui::Text::Bold(
+			tr::link(
+				tr::bold(
 					tr::lng_send_as_premium_required_link(tr::now))),
-			Ui::Text::WithEntities),
+			tr::marked),
 		.filter = filter,
 		.adaptive = true,
 		.duration = kStorySavePromoDuration,
@@ -1378,6 +1607,12 @@ void OverlayWidget::updateControls() {
 	_saveVisible = computeSaveButtonVisible();
 	_shareVisible = story && story->canShare();
 	_rotateVisible = !_themePreviewShown && !story;
+	_drawVisible = _drawButtonEnabled
+		&& !_themePreviewShown
+		&& !story
+		&& (_photo || (_document && _document->isImage()));
+	_recognizeVisible = _recognitionResult.success
+		&& !_recognitionResult.items.empty();
 	const auto navRect = [&](int i) {
 		return QRect(
 			width() - st::mediaviewIconSize.width() * i,
@@ -1405,6 +1640,18 @@ void OverlayWidget::updateControls() {
 	_saveNav = navRect(index);
 	_saveNavOver = style::centerrect(_saveNav, overRect);
 	_saveNavIcon = style::centerrect(_saveNav, st::mediaviewSave);
+	if (_saveVisible) {
+		++index;
+	}
+	_drawNav = navRect(index);
+	_drawNavOver = style::centerrect(_drawNav, overRect);
+	_drawNavIcon = style::centerrect(_drawNav, st::mediaviewDraw);
+	if (_drawVisible) {
+		++index;
+	}
+	_recognizeNav = navRect(index);
+	_recognizeNavOver = style::centerrect(_recognizeNav, overRect);
+	_recognizeNavIcon = style::centerrect(_recognizeNav, st::mediaviewRecognize);
 	Assert(st::mediaviewSave.size() == st::mediaviewSaveLocked.size());
 
 	const auto dNow = QDateTime::currentDateTime();
@@ -1429,13 +1676,26 @@ void OverlayWidget::updateControls() {
 			height() - st::mediaviewTextTop,
 			qMin(_fromNameLabel.maxWidth(), width() / 3),
 			st::mediaviewFont->height);
+		const auto separatorWidth = st::mediaviewFont->width(Ui::kQBullet);
+		_separatorNav = QRect(
+			st::mediaviewTextLeft
+				+ _nameNav.width()
+				+ st::mediaviewTextSkipHalf,
+			height() - st::mediaviewTextTop,
+			separatorWidth,
+			st::mediaviewFont->height);
 		_dateNav = QRect(
-			st::mediaviewTextLeft + _nameNav.width() + st::mediaviewTextSkip,
+			st::mediaviewTextLeft
+				+ _nameNav.width()
+				+ st::mediaviewTextSkipHalf
+				+ separatorWidth
+				+ st::mediaviewTextSkipHalf,
 			height() - st::mediaviewTextTop,
 			st::mediaviewFont->width(_dateText),
 			st::mediaviewFont->height);
 	} else {
 		_nameNav = QRect();
+		_separatorNav = QRect();
 		_dateNav = QRect(
 			st::mediaviewTextLeft,
 			height() - st::mediaviewTextTop,
@@ -1466,8 +1726,30 @@ void OverlayWidget::resizeCenteredControls() {
 
 	refreshClipControllerGeometry();
 	refreshSponsoredButtonGeometry();
+	refreshVoteButton();
+	refreshPollVotersWidget();
+	refreshVoteButtonGeometry();
+	refreshPollVotersWidgetGeometry();
 	refreshCaptionGeometry();
 	refreshSponsoredButtonWidth();
+
+	_pollUpdateLifetime.destroy();
+	if (currentPollAnswer()) {
+		const auto media = _message ? _message->media() : nullptr;
+		const auto poll = media ? media->poll() : nullptr;
+		if (poll && _session) {
+			_session->data().pollUpdates(
+			) | rpl::filter([=](not_null<PollData*> updated) {
+				return updated == poll;
+			}) | rpl::on_next([=] {
+				refreshVoteButton();
+				refreshPollVotersWidget();
+				refreshVoteButtonGeometry();
+				refreshPollVotersWidgetGeometry();
+				refreshCaptionGeometry();
+			}, _pollUpdateLifetime);
+		}
+	}
 }
 
 void OverlayWidget::refreshCaptionGeometry() {
@@ -1481,6 +1763,9 @@ void OverlayWidget::refreshCaptionGeometry() {
 	if (_caption.isEmpty() && (!_stories || !_stories->repost())) {
 		_captionRect = QRect();
 		return;
+	} else if (_fullScreenVideo) {
+		_captionRect = QRect();
+		return;
 	}
 
 	if (_groupThumbs && _groupThumbs->hiding()) {
@@ -1491,6 +1776,10 @@ void OverlayWidget::refreshCaptionGeometry() {
 		? (_y + _h)
 		: _sponsoredButton
 		? (_sponsoredButton->y() - st::mediaviewCaptionMargin.height())
+		: _voteButton
+		? (_voteButton->y() - st::mediaviewCaptionMargin.height())
+		: _pollVotersWidget
+		? (_pollVotersWidget->y() - st::mediaviewCaptionMargin.height())
 		: (_streamed && _streamed->controls)
 		? (_streamed->controls->y() - st::mediaviewCaptionMargin.height())
 		: _groupThumbs
@@ -1569,15 +1858,210 @@ void OverlayWidget::refreshSponsoredButtonWidth() {
 		_sponsoredButton->y());
 }
 
+const PollAnswer *OverlayWidget::currentPollAnswer() const {
+	if (!_message || !_session) {
+		return nullptr;
+	}
+	const auto media = _message->media();
+	if (!media) {
+		return nullptr;
+	}
+	const auto poll = media->poll();
+	if (!poll || (!_photo && !_document)) {
+		return nullptr;
+	}
+	const auto current = _photo
+		? WebPageCollage::Item(_photo)
+		: WebPageCollage::Item(_document);
+	for (const auto &answer : poll->answers) {
+		const auto candidate = PollAnswerMediaItem(answer);
+		if (candidate && (*candidate == current)) {
+			return &answer;
+		}
+	}
+	return nullptr;
+}
+
+void OverlayWidget::refreshVoteButton() {
+	const auto answer = currentPollAnswer();
+	const auto media = _message ? _message->media() : nullptr;
+	const auto poll = media ? media->poll() : nullptr;
+	const auto show = answer
+		&& poll
+		&& !answer->chosen
+		&& !poll->closed()
+		&& !poll->voted()
+		&& poll->sendingVotes.empty();
+	if (!show) {
+		if (_voteButton) {
+			_voteButton.destroy();
+		}
+		return;
+	}
+	if (!_voteButton) {
+		_voteButton.create(
+			_body,
+			tr::lng_polls_submit_votes(),
+			st::mediaviewVoteButton);
+		const auto effect = Ui::CreateChild<QGraphicsOpacityEffect>(
+			_voteButton.data());
+		effect->setOpacity(_controlsOpacity.current());
+		_voteButton->setGraphicsEffect(effect);
+		_voteButton->setClickedCallback([=] {
+			if (!_session) {
+				return;
+			}
+			const auto current = currentPollAnswer();
+			if (!current) {
+				return;
+			}
+			_session->api().polls().sendVotes(
+				_message->fullId(),
+				{ current->option });
+			_voteButton.destroy();
+			refreshCaptionGeometry();
+		});
+	}
+	_voteButton->show();
+}
+
+void OverlayWidget::refreshVoteButtonGeometry() {
+	if (!_voteButton) {
+		return;
+	}
+	const auto controllerBottom = (_groupThumbs && !_fullScreenVideo)
+		? _groupThumbsTop
+		: height();
+	_voteButton->moveToLeft(
+		(width() - _voteButton->width()) / 2,
+		controllerBottom
+			- ((_streamed && _streamed->controls)
+				? (_streamed->controls->height()
+					+ st::mediaviewCaptionPadding.bottom())
+				: 0)
+			- _voteButton->height()
+			- st::mediaviewVoteButtonMargin);
+}
+
+void OverlayWidget::refreshPollVotersWidget() {
+	const auto answer = currentPollAnswer();
+	const auto show = answer
+		&& (answer->votes > 0)
+		&& !_voteButton;
+	if (!show) {
+		_pollVotersWidget.destroy();
+		return;
+	}
+
+	_pollVotersWidget.destroy();
+	_pollVotersWidget.create(_body);
+
+	const auto effect = Ui::CreateChild<QGraphicsOpacityEffect>(
+		_pollVotersWidget.data());
+	effect->setOpacity(_controlsOpacity.current());
+	_pollVotersWidget->setGraphicsEffect(effect);
+
+	auto prepared = HistoryView::PrepareUserpicsInRow(
+		answer->recentVoters,
+		st::mediaviewPollVotersUserpics,
+		3);
+
+	const auto votesText = tr::lng_polls_votes_count(
+		tr::now,
+		lt_count,
+		answer->votes);
+	const auto &font = st::semiboldFont;
+	const auto textWidth = font->width(votesText);
+
+	const auto userpicsWidth = prepared.width;
+	const auto spacing = (userpicsWidth > 0)
+		? st::mediaviewPollVotersSpacing
+		: 0;
+	const auto &padding = st::mediaviewPollVotersPadding;
+	const auto widgetWidth = padding.left()
+		+ userpicsWidth
+		+ spacing
+		+ textWidth
+		+ padding.right();
+	const auto widgetHeight = st::mediaviewVoteButton.height;
+
+	_pollVotersWidget->resize(widgetWidth, widgetHeight);
+
+	const auto userpicSize = st::mediaviewPollVotersUserpics.size;
+	const auto raw = _pollVotersWidget.data();
+	raw->paintRequest() | rpl::on_next([=,
+			image = std::move(prepared.image)] {
+		auto p = QPainter(raw);
+		auto hq = PainterHighQualityEnabler(p);
+
+		const auto radius = st::mediaviewCaptionRadius;
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::mediaviewCaptionBg);
+		p.drawRoundedRect(raw->rect(), radius, radius);
+
+		auto left = padding.left();
+
+		if (!image.isNull()) {
+			const auto top = (widgetHeight - userpicSize) / 2;
+			p.drawImage(left, top, image);
+			left += userpicsWidth + spacing;
+		}
+
+		p.setFont(font);
+		p.setPen(st::mediaviewCaptionFg);
+		const auto textTop = (widgetHeight + font->ascent - font->descent) / 2;
+		p.drawText(left, textTop, votesText);
+	}, raw->lifetime());
+
+	_pollVotersWidget->show();
+}
+
+void OverlayWidget::refreshPollVotersWidgetGeometry() {
+	if (!_pollVotersWidget) {
+		return;
+	}
+	const auto controllerBottom = (_groupThumbs && !_fullScreenVideo)
+		? _groupThumbsTop
+		: height();
+	_pollVotersWidget->moveToLeft(
+		(width() - _pollVotersWidget->width()) / 2,
+		controllerBottom
+			- ((_streamed && _streamed->controls)
+				? (_streamed->controls->height()
+					+ st::mediaviewCaptionPadding.bottom())
+				: 0)
+			- _pollVotersWidget->height()
+			- st::mediaviewVoteButtonMargin);
+}
+
 void OverlayWidget::fillContextMenuActions(
 		const Ui::Menu::MenuCallback &addAction) {
 	if (_message && _message->isSponsored()) {
 		if (const auto window = findWindow()) {
 			const auto show = window->uiShow();
-			Menu::FillSponsored(_body, addAction, show, _message, true);
+			const auto fullId = _message->fullId();
+			Menu::FillSponsored(
+				addAction,
+				show,
+				fullId,
+				{ .dark = true, .skipInfo = true });
 		}
 		return;
 	}
+	if (_message) {
+		const auto media = _message->media();
+		const auto invoice = media ? media->invoice() : nullptr;
+		if (invoice
+			&& invoice->isPaidMedia
+			&& invoice->currency == Ui::kCreditsCurrency
+			&& !invoice->extendedMedia.empty()
+			&& invoice->amount > 0) {
+			addAction(
+				Lang::FormatCountDecimal(invoice->amount),
+				[] {},
+				&st::mediaMenuIconStar);
+		}
+	}
 	const auto story = _stories ? _stories->story() : nullptr;
 	if (!story && _document && _document->loading()) {
 		addAction(
@@ -1591,6 +2075,22 @@ void OverlayWidget::fillContextMenuActions(
 			[=] { toMessage(); },
 			&st::mediaMenuIconShowInChat);
 	}
+	if (currentPollAnswer()) {
+		const auto media = _message ? _message->media() : nullptr;
+		const auto poll = media ? media->poll() : nullptr;
+		if (poll
+			&& poll->voted()
+			&& !poll->closed()
+			&& !poll->quiz()
+			&& !poll->revotingDisabled()) {
+			const auto itemId = _message->fullId();
+			addAction(tr::lng_polls_retract(tr::now), [=] {
+				if (_session) {
+					_session->api().polls().sendVotes(itemId, {});
+				}
+			}, &st::mediaMenuIconRetractVote);
+		}
+	}
 	if (story && story->peer()->isSelf()) {
 		const auto inProfile = story->inProfile();
 		const auto text = inProfile
@@ -1615,10 +2115,19 @@ void OverlayWidget::fillContextMenuActions(
 			[=] { showInFolder(); },
 			&st::mediaMenuIconShowInFolder);
 	}
-	if (!hasCopyMediaRestriction()) {
+	const auto hasRecognitionSelection = _recognition.hasSelection();
+	if (hasRecognitionSelection) {
+		addAction(
+			tr::lng_context_copy_selected(tr::now),
+			[=] { copyRecognitionSelection(); },
+			&st::mediaMenuIconCopy);
+	}
+	if (!hasRecognitionSelection && !hasCopyMediaRestriction()) {
 		if ((_document && documentContentShown()) || (_photo && _photoMedia->loaded())) {
 			addAction(
-				tr::lng_mediaview_copy(tr::now),
+				((_document && _streamed)
+					? tr::lng_mediaview_copy_frame(tr::now)
+					: tr::lng_mediaview_copy(tr::now)),
 				[=] { copyMedia(); },
 				&st::mediaMenuIconCopy);
 		}
@@ -1635,6 +2144,31 @@ void OverlayWidget::fillContextMenuActions(
 			tr::lng_mediaview_forward(tr::now),
 			[=] { forwardMedia(); },
 			&st::mediaMenuIconForward);
+		if (canShareAtTime()) {
+			const auto now = [=] {
+				return tr::lng_mediaview_share_at_time(
+					tr::now,
+					lt_time,
+					Stories::FormatShareAtTime(shareAtVideoTimestamp()));
+			};
+			const auto action = addAction(
+				now(),
+				[=] { shareAtTime(); },
+				&st::mediaMenuIconShare);
+			struct State {
+				rpl::variable<QString> text;
+				rpl::lifetime lifetime;
+			};
+			const auto state = Ui::CreateChild<State>(action);
+			state->text = rpl::single(
+				rpl::empty
+			) | rpl::then(
+				base::timer_each(120)
+			) | rpl::map(now);
+			state->text.changes() | rpl::on_next([=](QString value) {
+				action->setText(value);
+			}, state->lifetime);
+		}
 	}
 	if (story && story->canShare()) {
 		addAction(tr::lng_mediaview_forward(tr::now), [=] {
@@ -1715,7 +2249,7 @@ void OverlayWidget::fillContextMenuActions(
 			peer->session().changes().peerFlagsValue(
 				peer,
 				Data::PeerUpdate::Flag::Photo
-			) | rpl::start_with_next([=]() mutable {
+			) | rpl::on_next([=]() mutable {
 				if (lifetime) {
 					base::take(lifetime)->destroy();
 				}
@@ -1781,7 +2315,11 @@ void OverlayWidget::fillContextMenuActions(
 			}, &st::mediaMenuIconStats);
 		}
 	}
-	if (_stories && _stories->allowStealthMode()) {
+	if (_stories
+		&& _stories->allowStealthMode()
+		&& story
+		&& story->peer()->isUser()
+		&& !story->call()) {
 		const auto now = base::unixtime::now();
 		const auto stealth = _session->data().stories().stealthMode();
 		addAction(tr::lng_stealth_mode_menu_item(tr::now), [=] {
@@ -1799,6 +2337,9 @@ void OverlayWidget::fillContextMenuActions(
 
 auto OverlayWidget::computeOverviewType() const
 -> std::optional<SharedMediaType> {
+	if (_instantViewMediaData) {
+		return std::nullopt;
+	}
 	if (const auto mediaType = sharedMediaType()) {
 		if (const auto overviewType = SharedMediaOverviewType(*mediaType)) {
 			return overviewType;
@@ -1858,6 +2399,24 @@ bool OverlayWidget::updateControlsAnimation(crl::time now) {
 			Qt::WA_TransparentForMouseEvents,
 			value < 1);
 	}
+	if (_voteButton) {
+		const auto value = _controlsOpacity.current();
+		if (const auto e = _voteButton->graphicsEffect()) {
+			static_cast<QGraphicsOpacityEffect*>(e)->setOpacity(value);
+		}
+		_voteButton->setAttribute(
+			Qt::WA_TransparentForMouseEvents,
+			value < 1);
+	}
+	if (_pollVotersWidget) {
+		const auto value = _controlsOpacity.current();
+		if (const auto e = _pollVotersWidget->graphicsEffect()) {
+			static_cast<QGraphicsOpacityEffect*>(e)->setOpacity(value);
+		}
+		_pollVotersWidget->setAttribute(
+			Qt::WA_TransparentForMouseEvents,
+			value < 1);
+	}
 	_helper->setControlsOpacity(_controlsOpacity.current());
 	const auto content = finalContentRect();
 	const auto siblingType = (_over == Over::LeftStories)
@@ -1870,12 +2429,17 @@ bool OverlayWidget::updateControlsAnimation(crl::time now) {
 		+ (_over == Over::Share ? _shareNavOver : _shareNavIcon)
 		+ (_over == Over::Rotate ? _rotateNavOver : _rotateNavIcon)
 		+ (_over == Over::More ? _moreNavOver : _moreNavIcon)
+		+ (_over == Over::Draw ? _drawNavOver : _drawNavIcon)
+		+ (_over == Over::Recognize
+			? _recognizeNavOver
+			: _recognizeNavIcon)
 		+ ((_stories
 			&& (_over == Over::LeftStories || _over == Over::RightStories))
 			? _stories->sibling(siblingType).layout.geometry
 			: QRect())
 		+ _headerNav
 		+ _nameNav
+		+ _separatorNav
 		+ _dateNav
 		+ _captionRect.marginsAdded(st::mediaviewCaptionPadding)
 		+ _groupThumbsRect
@@ -1892,7 +2456,9 @@ void OverlayWidget::waitingAnimationCallback() {
 }
 
 void OverlayWidget::updateCursor() {
-	setCursor((_controlsState == ControlsHidden)
+	setCursor((_clickHandlerActive || _clickHandlerPressed)
+		? style::cur_pointer
+		: (_controlsState == ControlsHidden)
 		? Qt::BlankCursor
 		: (_over == Over::None || (_over == Over::Video && _stories))
 		? style::cur_default
@@ -1925,7 +2491,7 @@ OverlayWidget::ContentGeometry OverlayWidget::contentGeometry() const {
 	const auto controlsOpacity = _controlsOpacity.current();
 	const auto toRotation = qreal(finalContentRotation());
 	const auto toRectRotated = QRectF(finalContentRect());
-	const auto toRectCenter = toRectRotated.center();
+	const auto toRectCenter = rect::center(toRectRotated);
 	const auto toRect = ((int(toRotation) % 180) == 90)
 		? QRectF(
 			toRectCenter.x() - toRectRotated.height() / 2.,
@@ -2025,6 +2591,16 @@ void OverlayWidget::resizeContentByScreenSize() {
 		_h = content.height();
 		_zoom = 0;
 		updateNavigationControlsGeometry();
+		if (_videoStream) {
+			_videoStream->updateGeometry(_x, _y, _w, _h);
+		}
+		return;
+	} else if (_videoStream) {
+		_w = _body->width() / 2;
+		_h = _body->height() / 2;
+		_x = (_body->width() - _w) / 2;
+		_y = (_body->height() - _h) / 2;
+		_videoStream->updateGeometry(_x, _y, _w, _h);
 		return;
 	}
 	recountSkipTop();
@@ -2065,7 +2641,9 @@ void OverlayWidget::resizeContentByScreenSize() {
 		_h = _height;
 	}
 	_x = (width() - _w) / 2;
-	_y = _skipTop + (useh - _h) / 2;
+	_y = _fullScreenVideo
+		? (_minUsedTop + (_maxUsedHeight - _h) / 2)
+		: (_skipTop + (useh - _h) / 2);
 	_geometryAnimation.stop();
 }
 
@@ -2129,7 +2707,7 @@ bool OverlayWidget::radialAnimationCallback(crl::time now) {
 		update(radialRect());
 	}
 	const auto ready = _document && _documentMedia->loaded();
-	const auto streamVideo = ready && _documentMedia->canBePlayed(_message);
+	const auto streamVideo = ready && _documentMedia->canBePlayed();
 	const auto tryOpenImage = ready
 		&& (_document->size < Images::kReadBytesLimit);
 	if (ready && ((tryOpenImage && !_radial.animating()) || streamVideo)) {
@@ -2245,6 +2823,8 @@ void OverlayWidget::clearSession() {
 	_caption.clear();
 	_sharedMedia = nullptr;
 	_userPhotos = nullptr;
+	_instantViewMedia = nullptr;
+	_instantViewMediaData = std::nullopt;
 	_collage = nullptr;
 	_session = nullptr;
 }
@@ -2258,15 +2838,34 @@ OverlayWidget::~OverlayWidget() {
 
 void OverlayWidget::assignMediaPointer(DocumentData *document) {
 	_savePhotoVideoWhenLoaded = SavePhotoVideo::None;
+	_flip = {};
 	_photo = nullptr;
 	_photoMedia = nullptr;
+	_videoStream = nullptr;
 	if (_document != document) {
+		_streamedQualityChangeFrame = QImage();
+		_streamedQualityChangeFinished = false;
 		if ((_document = document)) {
+			_quality = _document->initialPlaybackVideoQuality(
+				Core::App().settings().videoQuality());
+			_chosenQuality = _document->chooseQuality(_message, _quality);
 			_documentMedia = _document->createMediaView();
-			_documentMedia->goodThumbnailWanted();
-			_documentMedia->thumbnailWanted(fileOrigin());
+			_videoCover = LookupVideoCover(_document, _message);
+			if (_videoCover) {
+				_videoCoverMedia = _videoCover->createMediaView();
+				_videoCoverMedia->wanted(
+					Data::PhotoSize::Large,
+					fileOrigin());
+			} else {
+				_videoCoverMedia = nullptr;
+				_documentMedia->goodThumbnailWanted();
+				_documentMedia->thumbnailWanted(fileOrigin());
+			}
 		} else {
+			_chosenQuality = nullptr;
 			_documentMedia = nullptr;
+			_videoCover = nullptr;
+			_videoCoverMedia = nullptr;
 		}
 		_documentLoadingTo = QString();
 	}
@@ -2274,10 +2873,17 @@ void OverlayWidget::assignMediaPointer(DocumentData *document) {
 
 void OverlayWidget::assignMediaPointer(not_null<PhotoData*> photo) {
 	_savePhotoVideoWhenLoaded = SavePhotoVideo::None;
+	_chosenQuality = nullptr;
+	_streamedQualityChangeFrame = QImage();
+	_streamedQualityChangeFinished = false;
 	_document = nullptr;
 	_documentMedia = nullptr;
 	_documentLoadingTo = QString();
+	_videoCover = nullptr;
+	_videoCoverMedia = nullptr;
+	_videoStream = nullptr;
 	if (_photo != photo) {
+		_flip = {};
 		_photo = photo;
 		_photoMedia = _photo->createMediaView();
 		_photoMedia->wanted(Data::PhotoSize::Small, fileOrigin());
@@ -2287,21 +2893,54 @@ void OverlayWidget::assignMediaPointer(not_null<PhotoData*> photo) {
 	}
 }
 
+void OverlayWidget::assignMediaPointer(
+		std::shared_ptr<Data::GroupCall> call) {
+	_savePhotoVideoWhenLoaded = SavePhotoVideo::None;
+	_chosenQuality = nullptr;
+	_streamedQualityChangeFrame = QImage();
+	_streamedQualityChangeFinished = false;
+	_document = nullptr;
+	_documentMedia = nullptr;
+	_documentLoadingTo = QString();
+	_videoCover = nullptr;
+	_videoCoverMedia = nullptr;
+	_flip = {};
+	_photo = nullptr;
+	_photoMedia = nullptr;
+
+	_videoStream = nullptr;
+	_videoStream = std::make_unique<VideoStream>(
+		_body,
+		_surface.get(),
+		_opengl,
+		_wrap->backend(),
+		uiShow(),
+		std::move(call),
+		_callLinkSlug,
+		_callJoinMessageId);
+	_videoStream->closeRequests() | rpl::on_next([=] {
+		close();
+	}, _videoStream->lifetime());
+	if (const auto stories = _stories.get()) {
+		stories->updateVideoStream(_videoStream->call());
+		_videoStream->toggleCommentsOn(stories->commentsShownValue());
+	}
+	_widget->lower();
+}
+
 void OverlayWidget::clickHandlerActiveChanged(
 		const ClickHandlerPtr &p,
 		bool active) {
-	setCursor((active || ClickHandler::getPressed())
-		? style::cur_pointer
-		: style::cur_default);
+	_clickHandlerActive = active;
+	updateCursor();
 	update(QRegion(_saveMsg) + captionGeometry());
 }
 
 void OverlayWidget::clickHandlerPressedChanged(
 		const ClickHandlerPtr &p,
 		bool pressed) {
-	setCursor((pressed || ClickHandler::getActive())
-		? style::cur_pointer
-		: style::cur_default);
+	_clickHandlerPressed = pressed;
+	updateCursor();
 	update(QRegion(_saveMsg) + captionGeometry());
 }
 
@@ -2355,7 +2994,7 @@ void OverlayWidget::toggleFullScreen(bool fullscreen) {
 }
 
 void OverlayWidget::activateControls() {
-	if (!_menu && !_mousePressed && !_stories) {
+	if (!_menu && !_mousePressed && !_touchMove && !_stories) {
 		_controlsHideTimer.callOnce(st::mediaviewWaitHide);
 	}
 	if (_fullScreenVideo) {
@@ -2385,7 +3024,8 @@ void OverlayWidget::hideControls(bool force) {
 				&& _streamed->controls
 				&& _streamed->controls->hasMenu())
 			|| _menu
-			|| _mousePressed) {
+			|| _mousePressed
+			|| _touchMove) {
 			return;
 		}
 	}
@@ -2441,7 +3081,7 @@ void OverlayWidget::subscribeToScreenGeometry() {
 		&QScreen::geometryChanged
 	) | rpl::filter([=] {
 		return !isHidden() && !isMinimized() && _fullscreen;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateGeometry();
 	}, _screenGeometryLifetime);
 }
@@ -2502,8 +3142,9 @@ void OverlayWidget::saveAs() {
 					QFile(location.name()).copy(file);
 				} else {
 					QFile f(file);
-					f.open(QIODevice::WriteOnly);
-					f.write(bytes);
+					if (f.open(QIODevice::WriteOnly)) {
+						f.write(bytes);
+					}
 				}
 				if (_message) {
 					auto &manager = Core::App().downloadManager();
@@ -2589,7 +3230,9 @@ void OverlayWidget::handleDocumentClick() {
 			findWindow(),
 			_document,
 			_message,
-			_topicRootId);
+			_topicRootId,
+			_monoforumPeerId,
+			_drawButtonEnabled);
 		if (_document && _document->loading() && !_radial.animating()) {
 			_radial.start(_documentMedia->progress());
 		}
@@ -2597,6 +3240,33 @@ void OverlayWidget::handleDocumentClick() {
 	}
 }
 
+bool OverlayWidget::canShareAtTime() const {
+	const auto media = _message ? _message->media() : nullptr;
+	return _document
+		&& media
+		&& _streamed
+		&& (_document == media->document())
+		&& _document->isVideoFile()
+		&& !media->webpage();
+}
+
+TimeId OverlayWidget::shareAtVideoTimestamp() const {
+	return _streamedPosition / crl::time(1000);
+}
+
+void OverlayWidget::shareAtTime() {
+	if (!canShareAtTime()) {
+		return;
+	}
+	if (!_streamed->instance.player().paused()
+		&& !_streamed->instance.player().finished()) {
+		playbackPauseResume();
+	}
+	const auto show = uiShow();
+	const auto timestamp = shareAtVideoTimestamp();
+	show->show(Stories::PrepareShareAtTimeBox(show, _message, timestamp));
+}
+
 void OverlayWidget::downloadMedia() {
 	if (!_photo && !_document) {
 		return;
@@ -2711,7 +3381,7 @@ void OverlayWidget::downloadMedia() {
 void OverlayWidget::saveCancel() {
 	if (_document && _document->loading()) {
 		_document->cancel();
-		if (_documentMedia->canBePlayed(_message)) {
+		if (_documentMedia->canBePlayed()) {
 			redisplayContent();
 		}
 	}
@@ -2786,10 +3456,21 @@ void OverlayWidget::deleteMedia() {
 					Ui::LayerOption::CloseOther);
 			}
 		} else if (message) {
-			const auto suggestModerateActions = true;
-			window->show(
-				Box<DeleteMessagesBox>(message, suggestModerateActions),
-				Ui::LayerOption::CloseOther);
+			const auto list = HistoryItemsList{ message };
+			if (CanCreateModerateMessagesBox(list)) {
+				const auto opt = DefaultModerateMessagesBoxOptions();
+				window->show(
+					Box(
+						CreateModerateMessagesBox,
+						ModerateMessagesBoxEntry{ .items = list },
+						nullptr,
+						opt),
+					Ui::LayerOption::CloseOther);
+			} else {
+				window->show(
+					Box<DeleteMessagesBox>(message),
+					Ui::LayerOption::CloseOther);
+			}
 		}
 	}
 }
@@ -2808,13 +3489,22 @@ void OverlayWidget::showMediaOverview() {
 				const auto topic = _topicRootId
 					? _history->peer->forumTopicFor(_topicRootId)
 					: nullptr;
+				const auto sublist = _monoforumPeerId
+					? _history->peer->monoforumSublistFor(_monoforumPeerId)
+					: nullptr;
 				if (_topicRootId && !topic) {
 					return;
+				} else if (_monoforumPeerId && !sublist) {
+					return;
 				}
 				window->showSection(_topicRootId
 					? std::make_shared<Info::Memento>(
 						topic,
 						Info::Section(*overviewType))
+					: _monoforumPeerId
+					? std::make_shared<Info::Memento>(
+						sublist,
+						Info::Section(*overviewType))
 					: std::make_shared<Info::Memento>(
 						_history->peer,
 						Info::Section(*overviewType)));
@@ -2823,6 +3513,37 @@ void OverlayWidget::showMediaOverview() {
 	}
 }
 
+void OverlayWidget::recognize() {
+	_showRecognitionResults = !_showRecognitionResults;
+	if (!_showRecognitionResults) {
+		clearRecognitionSelection();
+	}
+	_recognitionAnimation.start(
+		[=] { update(); },
+		_showRecognitionResults ? 0. : 1.,
+		_showRecognitionResults ? 1. : 0.,
+		st::widgetFadeDuration);
+}
+
+void OverlayWidget::draw() {
+	if (!_session) {
+		return;
+	}
+	const auto photoId = _photo ? _photo->id : PhotoId();
+	const auto documentId = (_document && _document->isImage())
+		? _document->id
+		: DocumentId();
+	if (!photoId && !documentId) {
+		return;
+	}
+	_session->data().requestDrawToReply({
+		_message ? _message->fullId() : FullMsgId(),
+		photoId,
+		documentId,
+	});
+	close();
+}
+
 void OverlayWidget::copyMedia() {
 	if (showCopyMediaRestriction()) {
 		return;
@@ -2876,6 +3597,19 @@ auto OverlayWidget::sharedMediaType() const
 		if (const auto media = _message->media()) {
 			if (media->webpage() || media->invoice()) {
 				return std::nullopt;
+			} else if (const auto poll = media->poll()) {
+				const auto isPollMedia = [&](const auto &item) {
+					return IsPollAnswerMediaItem(poll, item)
+						|| (PollInputMediaItem(poll->solutionMedia)
+							== item);
+				};
+				if ((_photo
+						&& isPollMedia(WebPageCollage::Item(_photo)))
+					|| (_document
+						&& isPollMedia(
+							WebPageCollage::Item(_document)))) {
+					return std::nullopt;
+				}
 			}
 		}
 		if (_photo) {
@@ -2904,6 +3638,7 @@ auto OverlayWidget::sharedMediaKey() const -> std::optional<SharedMediaKey> {
 		return SharedMediaKey{
 			_history->peer->id,
 			MsgId(0), // topicRootId
+			PeerId(0), // monoforumPeerId
 			_migrated ? _migrated->peer->id : 0,
 			SharedMediaType::ChatPhoto,
 			_photo
@@ -2919,6 +3654,7 @@ auto OverlayWidget::sharedMediaKey() const -> std::optional<SharedMediaKey> {
 			(isScheduled
 				? SparseIdsMergedSlice::kScheduledTopicId
 				: _topicRootId),
+			(isScheduled ? PeerId() : _monoforumPeerId),
 			_migrated ? _migrated->peer->id : 0,
 			type,
 			(_message->history() == _history
@@ -2938,6 +3674,12 @@ Data::FileOrigin OverlayWidget::fileOrigin() const {
 	} else if (_message) {
 		return _message->fullId();
 	} else if (_photo && _user) {
+		const auto dominated = (_user->hasPersonalPhoto()
+				&& _photo->id == _user->userpicPhotoId())
+			|| SyncUserFallbackPhotoViewer(_user) == _photo->id;
+		if (dominated) {
+			return Data::FileOriginFullUser(peerToUser(_user->id));
+		}
 		return Data::FileOriginUserPhoto(peerToUser(_user->id), _photo->id);
 	} else if (_photo && _peer && _peer->userpicPhotoId() == _photo->id) {
 		return Data::FileOriginPeerPhoto(_peer->id);
@@ -2953,6 +3695,12 @@ Data::FileOrigin OverlayWidget::fileOrigin(const Entity &entity) const {
 	}
 	const auto photo = v::get<not_null<PhotoData*>>(entity.data);
 	if (_user) {
+		const auto dominated = (_user->hasPersonalPhoto()
+				&& photo->id == _user->userpicPhotoId())
+			|| SyncUserFallbackPhotoViewer(_user) == photo->id;
+		if (dominated) {
+			return Data::FileOriginFullUser(peerToUser(_user->id));
+		}
 		return Data::FileOriginUserPhoto(peerToUser(_user->id), photo->id);
 	} else if (_peer && _peer->userpicPhotoId() == photo->id) {
 		return Data::FileOriginPeerPhoto(_peer->id);
@@ -3009,7 +3757,7 @@ void OverlayWidget::validateSharedMedia() {
 			*key,
 			kIdsLimit,
 			kIdsLimit
-		) | rpl::start_with_next([this](
+		) | rpl::on_next([this](
 				SharedMediaWithLastSlice &&update) {
 			handleSharedMediaUpdate(std::move(update));
 		}, _sharedMedia->lifetime);
@@ -3072,7 +3820,7 @@ void OverlayWidget::validateUserPhotos() {
 			*key,
 			kIdsLimit,
 			kIdsLimit
-		) | rpl::start_with_next([this](
+		) | rpl::on_next([this](
 				UserPhotosSlice &&update) {
 			handleUserPhotosUpdate(std::move(update));
 		}, _userPhotos->lifetime);
@@ -3093,25 +3841,84 @@ void OverlayWidget::handleUserPhotosUpdate(UserPhotosSlice &&update) {
 	preloadData(0);
 }
 
-std::optional<OverlayWidget::CollageKey> OverlayWidget::collageKey() const {
-	if (_message) {
-		if (const auto media = _message->media()) {
-			if (const auto page = media->webpage()) {
-				for (const auto &item : page->collage.items) {
-					if (item == _photo || item == _document) {
-						return item;
-					}
-				}
-			} else if (const auto invoice = media->invoice()) {
-				for (const auto &item : invoice->extendedMedia) {
-					if (_photo && item->photo() == _photo) {
-						return _photo;
-					} else if (_document && item->document() == _document) {
-						return _document;
-					}
-				}
-			}
-		}
+auto OverlayWidget::instantViewMediaKey() const
+-> std::optional<InstantViewItem> {
+	if (_photo) {
+		return InstantViewItem(_photo);
+	} else if (_document) {
+		return InstantViewItem(_document);
+	}
+	return std::nullopt;
+}
+
+bool OverlayWidget::validInstantViewMedia() const {
+	if (const auto key = instantViewMediaKey()) {
+		if (!_instantViewMedia || (_instantViewMedia->item != _message)) {
+			return false;
+		}
+		if (*key == _instantViewMedia->key) {
+			return true;
+		} else if (_instantViewMediaData) {
+			const auto &items = *_instantViewMediaData;
+			if (ranges::find(items, *key) != end(items)
+				&& ranges::find(items, _instantViewMedia->key) != end(items)) {
+				return true;
+			}
+		}
+	}
+	return (_instantViewMedia == nullptr);
+}
+
+void OverlayWidget::validateInstantViewMedia() {
+	if (_message) {
+		if (const auto media = _message->Get<HistoryMessageMediaForInstantView>()) {
+			if (const auto key = instantViewMediaKey()) {
+				const auto i = ranges::find(media->items, *key);
+				if (i != end(media->items)) {
+					_instantViewMedia = std::make_unique<InstantViewMedia>(
+						_message,
+						*key);
+					_instantViewMediaData = media->items;
+					return;
+				}
+			}
+		}
+	}
+	_instantViewMedia = nullptr;
+	_instantViewMediaData = std::nullopt;
+}
+
+std::optional<OverlayWidget::CollageKey> OverlayWidget::collageKey() const {
+	if (_message) {
+		if (const auto media = _message->media()) {
+			if (const auto page = media->webpage()) {
+				for (const auto &item : page->collage.items) {
+					if (item == _photo || item == _document) {
+						return item;
+					}
+				}
+			} else if (const auto invoice = media->invoice()) {
+				for (const auto &item : invoice->extendedMedia) {
+					if (_photo && item->photo() == _photo) {
+						return _photo;
+					} else if (_document && item->document() == _document) {
+						return _document;
+					}
+				}
+			} else if (const auto poll = media->poll()) {
+				if (_photo
+					&& IsPollAnswerMediaItem(
+						poll,
+						WebPageCollage::Item(_photo))) {
+					return _photo;
+				} else if (_document
+					&& IsPollAnswerMediaItem(
+						poll,
+						WebPageCollage::Item(_document))) {
+					return _document;
+				}
+			}
+		}
 	}
 	return std::nullopt;
 }
@@ -3153,6 +3960,8 @@ void OverlayWidget::validateCollage() {
 							data.items.push_back(document);
 						}
 					}
+				} else if (const auto poll = media->poll()) {
+					_collageData = PollAnswersCollage(poll);
 				}
 			}
 		}
@@ -3163,7 +3972,14 @@ void OverlayWidget::validateCollage() {
 }
 
 void OverlayWidget::refreshMediaViewer() {
-	if (!validSharedMedia()) {
+	if (!validInstantViewMedia()) {
+		validateInstantViewMedia();
+	}
+	if (_instantViewMediaData) {
+		_sharedMedia = nullptr;
+		_sharedMediaData = std::nullopt;
+		_sharedMediaDataKey = std::nullopt;
+	} else if (!validSharedMedia()) {
 		validateSharedMedia();
 	}
 	if (!validUserPhotos()) {
@@ -3198,17 +4014,39 @@ void OverlayWidget::refreshCaption() {
 	_caption = Ui::Text::String();
 	const auto caption = [&] {
 		if (_stories) {
-			return _stories->captionText();
+			return StripQuoteEntities(_stories->captionText());
 		} else if (_message) {
+			if (const auto caption = InstantViewMediaCaption(
+					_message,
+					_photo,
+					_document)) {
+				return *caption;
+			}
 			if (const auto media = _message->media()) {
 				if (media->webpage()) {
 					if (_message->isSponsored()) {
 						return TextWithEntities()
-							.append(Ui::Text::Bold(media->webpage()->title))
+							.append(tr::bold(media->webpage()->title))
 							.append('\n')
 							.append(media->webpage()->description);
 					}
 					return TextWithEntities();
+				} else if (const auto poll = media->poll()) {
+					const auto current = _photo
+						? WebPageCollage::Item(_photo)
+						: WebPageCollage::Item(_document);
+					for (const auto &answer : poll->answers) {
+						const auto candidate = PollAnswerMediaItem(answer);
+						if (candidate && (*candidate == current)) {
+							return answer.text;
+						}
+					}
+					const auto solution = PollInputMediaItem(
+						poll->solutionMedia);
+					if (solution && (*solution == current)) {
+						return poll->solution;
+					}
+					return TextWithEntities();
 				}
 			}
 			return _message->translatedText();
@@ -3216,6 +4054,10 @@ void OverlayWidget::refreshCaption() {
 		return TextWithEntities();
 	}();
 	if (caption.text.isEmpty()) {
+		if (_streamed && _streamed->controls) {
+			_streamed->controls->setTimestamps({});
+			refreshClipControllerGeometry();
+		}
 		return;
 	}
 
@@ -3233,32 +4075,102 @@ void OverlayWidget::refreshCaption() {
 		}
 		update(captionGeometry());
 	};
-	const auto context = Core::MarkedTextContext{
+	const auto context = Core::TextContext({
 		.session = (_stories
 			? _storiesSession
 			: &_message->history()->session()),
-		.customEmojiRepaint = captionRepaint,
-	};
+		.repaint = captionRepaint,
+	});
+	auto captionText = base.isEmpty()
+		? caption
+		: AddTimestampLinks(caption, duration, base);
+	refreshTimestampDividers(captionText, duration);
 	_caption.setMarkedText(
 		st::mediaviewCaptionStyle,
-		(base.isEmpty()
-			? caption
-			: AddTimestampLinks(caption, duration, base)),
+		std::move(captionText),
 		(_message
 			? Ui::ItemTextOptions(_message)
 			: Ui::ItemTextDefaultOptions()),
 		context);
 	if (_caption.hasSpoilers()) {
-		const auto weak = Ui::MakeWeak(widget());
+		const auto weak = base::make_weak(widget());
 		_caption.setSpoilerLinkFilter([=](const ClickContext &context) {
 			return (weak != nullptr);
 		});
 	}
+	if (_caption.hasCollapsedBlockquots()) {
+		_caption.setBlockquoteExpandCallback(crl::guard(_widget, [=](
+				int index,
+				bool expanded) {
+			const auto wasGeometry = captionGeometry();
+			refreshCaptionGeometry();
+			update(wasGeometry.united(captionGeometry()));
+		}));
+	}
+}
+
+void OverlayWidget::refreshTimestampDividers(
+		const TextWithEntities &caption,
+		TimeId duration) {
+	if (!_streamed || !_streamed->controls || duration <= 0) {
+		return;
+	}
+	using Data = PlaybackControls::TimestampData;
+	auto timestamps = std::vector<Data>();
+	for (const auto &entity : caption.entities) {
+		if (entity.type() != EntityType::CustomUrl
+			|| !entity.data().startsWith(
+				u"internal:media_timestamp"_q)) {
+			continue;
+		}
+		const auto tPos = entity.data().lastIndexOf(u"&t="_q);
+		if (tPos < 0) {
+			continue;
+		}
+		auto ok = false;
+		const auto time = entity.data().mid(tPos + 3).toInt(&ok);
+		if (!ok || time < 0 || time > duration) {
+			continue;
+		}
+		const auto offset = entity.offset();
+		const auto atLineStart = (offset == 0)
+			|| (caption.text[offset - 1] == '\n');
+		auto label = QString();
+		if (atLineStart) {
+			const auto entityEnd = offset + entity.length();
+			const auto nl = caption.text.indexOf('\n', entityEnd);
+			const auto lineEnd = (nl >= 0)
+				? nl
+				: caption.text.size();
+			label = caption.text.mid(
+				entityEnd,
+				lineEnd - entityEnd).trimmed();
+			if (label.startsWith(u"- "_q)) {
+				label = label.mid(2).trimmed();
+			} else if (label.startsWith(u"-"_q)) {
+				label = label.mid(1).trimmed();
+			}
+		}
+		timestamps.push_back({
+			.position = float64(time) / duration,
+			.label = std::move(label),
+		});
+	}
+	_streamed->controls->setTimestamps(std::move(timestamps));
+	refreshClipControllerGeometry();
 }
 
 void OverlayWidget::refreshGroupThumbs() {
 	const auto existed = (_groupThumbs != nullptr);
-	if (_index && _sharedMediaData) {
+	if (_index && _instantViewMediaData) {
+		const auto messageId = _message ? _message->fullId() : FullMsgId();
+		View::GroupThumbs::Refresh(
+			_session,
+			_groupThumbs,
+			{ messageId, &*_instantViewMediaData },
+			*_index,
+			_groupThumbsAvailableWidth);
+	} else if (_index && _sharedMediaData) {
 		View::GroupThumbs::Refresh(
 			_session,
 			_groupThumbs,
@@ -3293,7 +4205,7 @@ void OverlayWidget::initGroupThumbs() {
 	Expects(_groupThumbs != nullptr);
 
 	_groupThumbs->updateRequests(
-	) | rpl::start_with_next([this](QRect rect) {
+	) | rpl::on_next([this](QRect rect) {
 		const auto shift = (width() / 2);
 		_groupThumbsRect = QRect(
 			shift + rect.x(),
@@ -3304,8 +4216,9 @@ void OverlayWidget::initGroupThumbs() {
 	}, _groupThumbs->lifetime());
 
 	_groupThumbs->activateRequests(
-	) | rpl::start_with_next([this](View::GroupThumbs::Key key) {
+	) | rpl::on_next([this](View::GroupThumbs::Key key) {
 		using CollageKey = View::GroupThumbs::CollageKey;
+		using InstantViewKey = View::GroupThumbs::InstantViewKey;
 		if (const auto photoId = std::get_if<PhotoId>(&key)) {
 			const auto photo = _session->data().photo(*photoId);
 			moveToEntity({ photo, nullptr });
@@ -3315,6 +4228,10 @@ void OverlayWidget::initGroupThumbs() {
 			if (_collageData) {
 				moveToEntity(entityForCollage(collageKey->index));
 			}
+		} else if (const auto instantViewKey = std::get_if<InstantViewKey>(&key)) {
+			if (_instantViewMediaData) {
+				moveToEntity(entityForInstantViewMedia(instantViewKey->index));
+			}
 		}
 	}, _groupThumbs->lifetime());
 
@@ -3386,6 +4303,11 @@ void OverlayWidget::hide() {
 	clearBeforeHide();
 	applyHideWindowWorkaround();
 	_window->hide();
+	if (Platform::IsWayland()) {
+		if (const auto handle = _window->windowHandle()) {
+			handle->destroy();
+		}
+	}
 }
 
 void OverlayWidget::setCursor(style::cursor cursor) {
@@ -3415,9 +4337,12 @@ void OverlayWidget::show(OpenRequest request) {
 	const auto story = request.story();
 	const auto document = story ? story->document() : request.document();
 	const auto photo = story ? story->photo() : request.photo();
+	const auto call = story ? story->call() : request.call();
 	const auto contextItem = request.item();
 	const auto contextPeer = request.peer();
 	const auto contextTopicRootId = request.topicRootId();
+	const auto contextMonoforumPeerId = request.monoforumPeerId();
+	_drawButtonEnabled = request.showDrawButton();
 	if (!request.continueStreaming() && !request.startTime() && !_reShow) {
 		if (_message && (_message == contextItem)) {
 			return close();
@@ -3453,7 +4378,11 @@ void OverlayWidget::show(OpenRequest request) {
 		} else if (contextPeer) {
 			setContext(contextPeer);
 		} else if (contextItem) {
-			setContext(ItemContext{ contextItem, contextTopicRootId });
+			setContext(ItemContext{
+				contextItem,
+				contextTopicRootId,
+				contextMonoforumPeerId,
+			});
 		} else {
 			setContext(v::null);
 		}
@@ -3465,8 +4394,12 @@ void OverlayWidget::show(OpenRequest request) {
 		displayPhoto(photo);
 		preloadData(0);
 		activateControls();
-	} else if (story || document) {
-		setSession(document ? &document->session() : &story->session());
+	} else if (story || document || call) {
+		setSession(document
+			? &document->session()
+			: story
+			? &story->session()
+			: &call->session());
 
 		if (story) {
 			setContext(StoriesContext{
@@ -3475,7 +4408,11 @@ void OverlayWidget::show(OpenRequest request) {
 				request.storiesContext(),
 			});
 		} else if (contextItem) {
-			setContext(ItemContext{ contextItem, contextTopicRootId });
+			setContext(ItemContext{
+				contextItem,
+				contextTopicRootId,
+				contextMonoforumPeerId,
+			});
 		} else {
 			setContext(v::null);
 		}
@@ -3483,13 +4420,19 @@ void OverlayWidget::show(OpenRequest request) {
 		clearControlsState();
 
 		_streamingStartPaused = false;
-		displayDocument(
-			document,
-			anim::activation::normal,
-			request.cloudTheme()
-				? *request.cloudTheme()
-				: Data::CloudTheme(),
-			{ request.continueStreaming(), request.startTime() });
+		if (call) {
+			_callLinkSlug = request.callLinkSlug();
+			_callJoinMessageId = request.callJoinMessageId();
+			displayVideoStream(call, anim::activation::normal);
+		} else {
+			displayDocument(
+				document,
+				anim::activation::normal,
+				(request.cloudTheme()
+					? *request.cloudTheme()
+					: Data::CloudTheme()),
+				{ request.continueStreaming(), request.startTime() });
+		}
 		if (!isHidden()) {
 			preloadData(0);
 			activateControls();
@@ -3513,9 +4456,19 @@ void OverlayWidget::displayPhoto(
 	destroyThemePreview();
 
 	_fullScreenVideo = false;
+	const auto photoChanged = (_photo != photo);
 	assignMediaPointer(photo);
 	_rotation = _photo->owner().mediaRotation().get(_photo);
 	_radial.stop();
+	if (photoChanged) {
+		_showRecognitionResults = false;
+		_recognitionResult = {};
+		_recognitionPendingSessionUniqueId = 0;
+		_recognitionPendingPhotoId = 0;
+		_recognitionPendingDocumentId = 0;
+		_recognitionRetryOnLarge = false;
+		clearRecognitionSelection();
+	}
 
 	refreshMediaViewer();
 
@@ -3524,6 +4477,8 @@ void OverlayWidget::displayPhoto(
 		initStreaming();
 	}
 
+	tryStartTextRecognition();
+
 	initSponsoredButton();
 
 	refreshCaption();
@@ -3575,6 +4530,7 @@ void OverlayWidget::displayDocument(
 		const StartStreaming &startStreaming) {
 	_fullScreenVideo = false;
 	_staticContent = QImage();
+	const auto documentChanged = (_document != doc);
 	clearStreaming(_document != doc);
 	destroyThemePreview();
 	assignMediaPointer(doc);
@@ -3584,6 +4540,15 @@ void OverlayWidget::displayDocument(
 		: 0;
 	_themeCloudData = cloud;
 	_radial.stop();
+	if (documentChanged) {
+		_showRecognitionResults = false;
+		_recognitionResult = {};
+		_recognitionPendingSessionUniqueId = 0;
+		_recognitionPendingPhotoId = 0;
+		_recognitionPendingDocumentId = 0;
+		_recognitionRetryOnLarge = false;
+		clearRecognitionSelection();
+	}
 
 	_touchbarDisplay.fire(TouchBarItemType::None);
 
@@ -3600,7 +4565,7 @@ void OverlayWidget::displayDocument(
 			}
 		} else {
 			initSponsoredButton();
-			if (_documentMedia->canBePlayed(_message)
+			if (_documentMedia->canBePlayed()
 				&& initStreaming(startStreaming)) {
 			} else if (_document->isVideoFile()) {
 				_documentMedia->automaticLoad(fileOrigin(), _message);
@@ -3633,6 +4598,8 @@ void OverlayWidget::displayDocument(
 	}
 	refreshCaption();
 
+	tryStartTextRecognition();
+
 	const auto docGeneric = Layout::DocumentGenericPreview::Create(_document);
 	_docExt = docGeneric.ext;
 	_docIconColor = docGeneric.color;
@@ -3705,6 +4672,26 @@ void OverlayWidget::displayDocument(
 	}
 }
 
+// Empty messages shown as docs: doc can be nullptr.
+void OverlayWidget::displayVideoStream(
+		const std::shared_ptr<Data::GroupCall> &call,
+		anim::activation activation) {
+	_fullScreenVideo = false;
+	_staticContent = QImage();
+	clearStreaming(true);
+	destroyThemePreview();
+	assignMediaPointer(call);
+
+	_rotation = 0;
+	_radial.stop();
+
+	_touchbarDisplay.fire(TouchBarItemType::None);
+
+	contentSizeChanged();
+	_blurred = false;
+	displayFinished(activation);
+}
+
 void OverlayWidget::initSponsoredButton() {
 	const auto has = _message && _message->isSponsored() && _session;
 	if (has && _sponsoredButton) {
@@ -3789,7 +4776,7 @@ void OverlayWidget::showAndActivate() {
 }
 
 bool OverlayWidget::canInitStreaming() const {
-	return (_document && _documentMedia->canBePlayed(_message))
+	return (_document && _documentMedia->canBePlayed())
 		|| (_photo && _photo->videoCanBePlayed());
 }
 
@@ -3812,20 +4799,39 @@ bool OverlayWidget::initStreaming(const StartStreaming &startStreaming) {
 	Core::App().updateNonIdle();
 
 	_streamed->instance.player().updates(
-	) | rpl::start_with_next_error([=](Streaming::Update &&update) {
+	) | rpl::on_next_error([=](Streaming::Update &&update) {
 		handleStreamingUpdate(std::move(update));
 	}, [=](Streaming::Error &&error) {
 		handleStreamingError(std::move(error));
 	}, _streamed->instance.lifetime());
 
+	_streamed->instance.switchQualityRequests(
+	) | rpl::filter([=](int quality) {
+		return !_quality.manual && _quality.height != quality;
+	}) | rpl::on_next([=](int quality) {
+		applyVideoQuality({
+			.manual = 0,
+			.height = uint32(quality),
+		});
+	}, _streamed->instance.lifetime());
+
+	const auto continuing = startStreaming.continueStreaming
+		&& _pip
+		&& (_pip->wrapped.shared().get()
+			== _streamed->instance.shared().get());
 	if (startStreaming.continueStreaming) {
 		_pip = nullptr;
 	}
-	if (!startStreaming.continueStreaming
+	if (!continuing
 		|| (!_streamed->instance.player().active()
 			&& !_streamed->instance.player().finished())) {
 		startStreamingPlayer(startStreaming);
 	} else {
+		if (_streamed->instance.player().ready()) {
+			markStreamedReady();
+		} else {
+			_streamed->ready = false;
+		}
 		updatePlaybackState();
 	}
 	return true;
@@ -3838,6 +4844,7 @@ void OverlayWidget::startStreamingPlayer(
 	const auto &player = _streamed->instance.player();
 	if (player.playing()) {
 		if (!_streamed->withSound) {
+			markStreamedReady();
 			return;
 		}
 		_pip = nullptr;
@@ -3847,12 +4854,24 @@ void OverlayWidget::startStreamingPlayer(
 		return;
 	}
 
-	const auto position = _document
+	_streamedPosition = _document
 		? startStreaming.startTime
 		: _photo
 		? _photo->videoStartPosition()
 		: 0;
-	restartAtSeekPosition(position);
+	restartAtSeekPosition(_streamedPosition);
+}
+
+void OverlayWidget::markStreamedReady() {
+	Expects(_streamed != nullptr);
+
+	if (_streamed->ready) {
+		return;
+	}
+	_streamed->ready = true;
+	if (const auto sponsored = _streamed->sponsored.get()) {
+		sponsored->start();
+	}
 }
 
 void OverlayWidget::initStreamingThumbnail() {
@@ -3875,13 +4894,19 @@ void OverlayWidget::initStreamingThumbnail() {
 		}
 		return thumbnail;
 	};
-	const auto good = _document
+	const auto good = _videoCover
+		? _videoCoverMedia->image(Data::PhotoSize::Large)
+		: _document
 		? _documentMedia->goodThumbnail()
 		: _photoMedia->image(Data::PhotoSize::Large);
-	const auto thumbnail = _document
+	const auto thumbnail = _videoCover
+		? _videoCoverMedia->image(Data::PhotoSize::Small)
+		: _document
 		? _documentMedia->thumbnail()
 		: computePhotoThumbnail();
-	const auto blurred = _document
+	const auto blurred = _videoCover
+		? _videoCoverMedia->thumbnailInline()
+		: _document
 		? _documentMedia->thumbnailInline()
 		: _photoMedia->thumbnailInline();
 	const auto size = _photo
@@ -3891,9 +4916,15 @@ void OverlayWidget::initStreamingThumbnail() {
 		: good
 		? good->size()
 		: _document->dimensions;
-	if (!good && !thumbnail && !blurred) {
+	if (size.isEmpty()) {
+		return;
+	} else if (!_streamedQualityChangeFrame.isNull()) {
+		setStaticContent(_streamedQualityChangeFrame.scaled(
+			size,
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation));
 		return;
-	} else if (size.isEmpty()) {
+	} else if (!good && !thumbnail && !blurred) {
 		return;
 	}
 	const auto options = VideoThumbOptions(_document);
@@ -3914,8 +4945,25 @@ void OverlayWidget::initStreamingThumbnail() {
 }
 
 void OverlayWidget::streamingReady(Streaming::Information &&info) {
+	markStreamedReady();
 	if (videoShown()) {
+		if (_document
+			&& _streamed
+			&& _streamed->ready
+			&& (!_chosenQuality || _chosenQuality == _document)) {
+			if (const auto video = _document->video()) {
+				video->realVideoSize = info.video.realSize;
+			}
+		}
 		applyVideoSize();
+		_streamedQualityChangeFrame = QImage();
+		if (_streamed && _streamed->controls) {
+			crl::on_main(_widget, [=] {
+				if (_streamed && _streamed->controls) {
+					_streamed->controls->updateSpeedToggleQuality();
+				}
+			});
+		}
 	} else {
 		updateContentRect();
 	}
@@ -3934,11 +4982,18 @@ void OverlayWidget::applyVideoSize() {
 
 bool OverlayWidget::createStreamingObjects() {
 	Expects(_photo || _document);
+	Expects(!_streamed);
 
 	const auto origin = fileOrigin();
 	const auto callback = [=] { waitingAnimationCallback(); };
-	if (_document) {
-		_streamed = std::make_unique<Streamed>(_document, origin, callback);
+	const auto video = _chosenQuality ? _chosenQuality : _document;
+	if (video) {
+		_streamed = std::make_unique<Streamed>(
+			video,
+			_document,
+			_message,
+			origin,
+			callback);
 	} else {
 		_streamed = std::make_unique<Streamed>(_photo, origin, callback);
 	}
@@ -3949,8 +5004,8 @@ bool OverlayWidget::createStreamingObjects() {
 	++_streamedCreated;
 	_streamed->instance.setPriority(kOverlayLoaderPriority);
 	_streamed->instance.lockPlayer();
-	_streamed->withSound = _document
-		&& !_document->isSilentVideo()
+	_streamed->withSound = video
+		&& !video->isSilentVideo()
 		&& (_document->isAudioFile()
 			|| _document->isVideoFile()
 			|| _document->isVoiceMessage()
@@ -3960,6 +5015,18 @@ bool OverlayWidget::createStreamingObjects() {
 			_body,
 			static_cast<PlaybackControls::Delegate*>(this));
 		_streamed->controls->show();
+		_streamed->sponsored = PlaybackSponsored::Has(_message)
+			? std::make_unique<PlaybackSponsored>(
+				_streamed->controls.get(),
+				uiShow(),
+				_message)
+			: nullptr;
+		if (const auto sponsored = _streamed->sponsored.get()) {
+			_layerBg->layerShownValue(
+			) | rpl::on_next([=](bool shown) {
+				sponsored->setPaused(shown);
+			}, sponsored->lifetime());
+		}
 		refreshClipControllerGeometry();
 	}
 	return true;
@@ -4011,18 +5078,20 @@ void OverlayWidget::handleStreamingUpdate(Streaming::Update &&update) {
 
 	v::match(update.data, [&](Information &update) {
 		streamingReady(std::move(update));
-	}, [&](const PreloadedVideo &update) {
+	}, [&](PreloadedVideo) {
 		updatePlaybackState();
-	}, [&](const UpdateVideo &update) {
+	}, [&](UpdateVideo update) {
 		updateContentRect();
 		Core::App().updateNonIdle();
 		updatePlaybackState();
-	}, [&](const PreloadedAudio &update) {
+		_streamedPosition = update.position;
+	}, [&](PreloadedAudio) {
 		updatePlaybackState();
-	}, [&](const UpdateAudio &update) {
+	}, [&](UpdateAudio) {
 		updatePlaybackState();
-	}, [&](WaitingForData) {
-	}, [&](MutedByOther) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
 	}, [&](Finished) {
 		updatePlaybackState();
 	});
@@ -4087,7 +5156,7 @@ void OverlayWidget::initThemePreview() {
 	const auto weakSession = base::make_weak(&_document->session());
 	const auto path = _document->location().name();
 	const auto id = _themePreviewId = base::RandomValue<uint64>();
-	const auto weak = Ui::MakeWeak(_widget);
+	const auto weak = base::make_weak(_widget);
 	crl::async([=, data = std::move(current)]() mutable {
 		auto preview = GeneratePreview(
 			bytes,
@@ -4103,12 +5172,10 @@ void OverlayWidget::initThemePreview() {
 			_themePreviewId = 0;
 			_themePreview = std::move(result);
 			if (_themePreview) {
-				using TextTransform = Ui::RoundButton::TextTransform;
 				_themeApply.create(
 					_body,
 					tr::lng_theme_preview_apply(),
 					st::themePreviewApplyButton);
-				_themeApply->setTextTransform(TextTransform::NoTransform);
 				_themeApply->show();
 				_themeApply->setClickedCallback([=] {
 					const auto &object = Background()->themeObject();
@@ -4125,7 +5192,6 @@ void OverlayWidget::initThemePreview() {
 					_body,
 					tr::lng_cancel(),
 					st::themePreviewCancelButton);
-				_themeCancel->setTextTransform(TextTransform::NoTransform);
 				_themeCancel->show();
 				_themeCancel->setClickedCallback([this] { close(); });
 				if (const auto slug = _themeCloudData.slug; !slug.isEmpty()) {
@@ -4133,13 +5199,17 @@ void OverlayWidget::initThemePreview() {
 						_body,
 						tr::lng_theme_share(),
 						st::themePreviewCancelButton);
-					_themeShare->setTextTransform(TextTransform::NoTransform);
 					_themeShare->show();
 					_themeShare->setClickedCallback([=] {
 						QGuiApplication::clipboard()->setText(
 							session->createInternalLinkFull("addtheme/" + slug));
-						uiShow()->showToast(
-							tr::lng_background_link_copied(tr::now));
+						uiShow()->showToast({
+							.text = {
+								tr::lng_background_link_copied(tr::now),
+							},
+							.iconLottie = u"toast/voip_invite"_q,
+							.iconLottieSize = st::toastLottieIconSize,
+						});
 					});
 				} else {
 					_themeShare.destroy();
@@ -4168,9 +5238,11 @@ void OverlayWidget::refreshClipControllerGeometry() {
 	const auto controllerWidth = std::min(
 		st::mediaviewControllerSize.width(),
 		width() - 2 * skip);
-	_streamed->controls->resize(
-		controllerWidth,
-		st::mediaviewControllerSize.height());
+	const auto controllerHeight = st::mediaviewControllerSize.height()
+		+ (_streamed->controls->hasTimestamps()
+			? st::mediaviewTimestampLabelHeight
+			: 0);
+	_streamed->controls->resize(controllerWidth, controllerHeight);
 	_streamed->controls->move(
 		(width() - controllerWidth) / 2,
 		(controllerBottom // Duplicated in recountSkipTop().
@@ -4243,7 +5315,9 @@ void OverlayWidget::playbackPauseResume() {
 			redisplayContent();
 		}
 	} else if (_streamed->instance.player().finished()
-		|| !_streamed->instance.player().active()) {
+		|| !_streamed->instance.player().active()
+		|| _streamedQualityChangeFinished) {
+		_streamedQualityChangeFinished = false;
 		_streamingStartPaused = false;
 		restartAtSeekPosition(0);
 	} else if (_streamed->instance.player().paused()) {
@@ -4256,6 +5330,21 @@ void OverlayWidget::playbackPauseResume() {
 	}
 }
 
+void OverlayWidget::flushPendingFrameStep() {
+	if (!_streamed || !_frameStepPending) {
+		_frameStepThrottle.cancel();
+		return;
+	}
+	const auto fps = _streamed->instance.info().video.fps;
+	const auto stepMs = 1000.
+		/ ((fps > 0.) ? fps : kFrameStepFallbackFps);
+	const auto shift = crl::time(std::round(_frameStepPending * stepMs));
+	_frameStepPending = 0;
+	_streamingStartPaused = true;
+	seekRelativeTime(shift);
+	_frameStepThrottle.callOnce(kFrameStepThrottleMs);
+}
+
 void OverlayWidget::seekRelativeTime(crl::time time) {
 	Expects(_streamed != nullptr);
 
@@ -4283,9 +5372,11 @@ void OverlayWidget::restartAtSeekPosition(crl::time position) {
 		_rotation = saved;
 		updateContentRect();
 	}
+	const auto overrideDuration = _stories
+		|| (_chosenQuality && _chosenQuality != _document);
 	auto options = Streaming::PlaybackOptions{
 		.position = position,
-		.durationOverride = ((_stories
+		.durationOverride = ((overrideDuration
 			&& _document
 			&& _document->hasDuration())
 			? _document->duration()
@@ -4312,6 +5403,7 @@ void OverlayWidget::restartAtSeekPosition(crl::time position) {
 		_streamed->instance.pause();
 	} else {
 		playbackPauseMusic();
+		_streamedQualityChangeFinished = false;
 	}
 	_streamed->pausedBySeek = false;
 
@@ -4340,6 +5432,8 @@ void OverlayWidget::playbackControlsSeekFinished(crl::time position) {
 void OverlayWidget::playbackControlsVolumeChanged(float64 volume) {
 	if (_streamed) {
 		Player::mixer()->setVideoVolume(volume);
+	} else if (_videoStream) {
+		_videoStream->setVolume(volume);
 	}
 	Core::App().settings().setVideoVolume(volume);
 	Core::App().saveSettingsDelayed();
@@ -4380,6 +5474,107 @@ float64 OverlayWidget::playbackControlsCurrentSpeed(bool lastNonDefault) {
 	return Core::App().settings().videoPlaybackSpeed(lastNonDefault);
 }
 
+std::vector<VideoQuality> OverlayWidget::playbackControlsQualities() {
+	if (!_document) {
+		return {};
+	}
+	const auto &list = _document->resolveQualities(_message);
+	if (list.empty()) {
+		return {};
+	}
+	auto result = std::vector<VideoQuality>();
+	result.reserve(list.size() + 1);
+	const auto add = [&](not_null<DocumentData*> quality) {
+		const auto original = (quality == _document);
+		const auto height = original
+			? quality->resolveOriginalVideoQuality()
+			: quality->resolveVideoQuality();
+		if (!height) {
+			return;
+		}
+		const auto value = VideoQuality{
+			.manual = 1u,
+			.height = uint32(height),
+			.original = original ? 1u : 0u,
+		};
+		if (!ranges::contains(result, value)) {
+			result.push_back(value);
+		}
+	};
+	if (!_document->filepath(true).isEmpty()) {
+		add(_document);
+	}
+	for (const auto &quality : list) {
+		add(quality);
+	}
+	return result;
+}
+
+VideoQuality OverlayWidget::playbackControlsCurrentQuality() {
+	if (!_chosenQuality) {
+		return _quality;
+	}
+	const auto original = (_chosenQuality == _document);
+	return {
+		.manual = _quality.manual,
+		.height = uint32(original
+			? _chosenQuality->resolveOriginalVideoQuality()
+			: _chosenQuality->resolveVideoQuality()),
+		.original = original ? 1u : 0u,
+	};
+}
+
+void OverlayWidget::playbackControlsQualityChanged(VideoQuality quality) {
+	applyVideoQuality({
+		.manual = uint32(quality.height ? 1 : 0),
+		.height = quality.height,
+		.original = quality.original,
+	});
+}
+
+void OverlayWidget::applyVideoQuality(VideoQuality value) {
+	if (_quality == value) {
+		return;
+	}
+	_quality = value;
+	Core::App().settings().setVideoQuality(value);
+	Core::App().saveSettingsDelayed();
+
+	if (!_document) {
+		return;
+	}
+	const auto resolved = _document->chooseQuality(_message, _quality);
+	if (_chosenQuality == resolved) {
+		return;
+	}
+	_chosenQuality = resolved;
+	if (_streamed && _streamed->instance.ready()) {
+		_streamedQualityChangeFrame = currentVideoFrameImage();
+	}
+	if (_streamed
+		&& (!_streamed->instance.player().active()
+			|| _streamed->instance.player().finished())) {
+		_streamedQualityChangeFinished = true;
+	}
+	_streamingStartPaused = _streamedQualityChangeFinished
+		|| (_streamed && _streamed->instance.player().paused());
+	const auto wasFullScreen = _fullScreenVideo;
+	clearStreaming();
+	const auto time = _streamedPosition;
+	const auto startStreaming = StartStreaming(false, time);
+	if (!canInitStreaming() || !initStreaming(startStreaming)) {
+		redisplayContent();
+	} else {
+		if (_fullScreenVideo != wasFullScreen) {
+			_fullScreenVideo = wasFullScreen;
+			if (_streamed->controls) {
+				_streamed->controls->setInFullScreen(_fullScreenVideo);
+			}
+		}
+		refreshCaption();
+	}
+}
+
 void OverlayWidget::switchToPip() {
 	Expects(_streamed != nullptr);
 	Expects(_document != nullptr);
@@ -4387,6 +5582,7 @@ void OverlayWidget::switchToPip() {
 	const auto document = _document;
 	const auto messageId = _message ? _message->fullId() : FullMsgId();
 	const auto topicRootId = _topicRootId;
+	const auto monoforumPeerId = _monoforumPeerId;
 	const auto closeAndContinue = [=] {
 		_showAsPip = false;
 		show(OpenRequest(
@@ -4394,12 +5590,17 @@ void OverlayWidget::switchToPip() {
 			document,
 			document->owner().message(messageId),
 			topicRootId,
+			monoforumPeerId,
 			true));
 	};
 	_showAsPip = true;
 	_pip = std::make_unique<PipWrap>(
 		_window,
 		document,
+		fileOrigin(),
+		_chosenQuality ? _chosenQuality : document,
+		_message,
+		_quality,
 		_streamed->instance.shared(),
 		closeAndContinue,
 		[=] { _pip = nullptr; });
@@ -4408,14 +5609,14 @@ void OverlayWidget::switchToPip() {
 		raw->history()->owner().itemRemoved(
 		) | rpl::filter([=](not_null<const HistoryItem*> item) {
 			return (raw == item);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			_pip = nullptr;
 		}, _pip->lifetime);
 
 		Core::App().passcodeLockChanges(
 		) | rpl::filter(
 			rpl::mappers::_1
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_pip = nullptr;
 		}, _pip->lifetime);
 	}
@@ -4475,6 +5676,8 @@ void OverlayWidget::storiesJumpTo(
 		displayPhoto(photo, anim::activation::background);
 	}, [&](not_null<DocumentData*> document) {
 		displayDocument(document, anim::activation::background);
+	}, [&](const std::shared_ptr<Data::GroupCall> &call) {
+		displayVideoStream(call, anim::activation::background);
 	}, [&](v::null_t) {
 		displayDocument(nullptr, anim::activation::background);
 	});
@@ -4489,6 +5692,8 @@ void OverlayWidget::storiesRedisplay(not_null<Data::Story*> story) {
 		displayPhoto(photo, anim::activation::background);
 	}, [&](not_null<DocumentData*> document) {
 		displayDocument(document, anim::activation::background);
+	}, [&](const std::shared_ptr<Data::GroupCall> &call) {
+		displayVideoStream(call, anim::activation::background);
 	}, [&](v::null_t) {
 		displayDocument(nullptr, anim::activation::background);
 	});
@@ -4622,13 +5827,16 @@ void OverlayWidget::playbackPauseMusic() {
 void OverlayWidget::updatePlaybackState() {
 	Expects(_streamed != nullptr);
 
+	refreshSystemMediaControls();
 	if (!_streamed->controls && !_stories) {
 		return;
 	}
 	const auto state = _streamed->instance.player().prepareLegacyState();
 	if (state.position != kTimeUnknown && state.length != kTimeUnknown) {
+		_streamedPosition = state.position;
 		if (_streamed->controls) {
 			_streamed->controls->updatePlayback(state);
+			_streamed->controls->updateSpeedToggleQuality();
 			_touchbarTrackState.fire_copy(state);
 			updatePowerSaveBlocker(state);
 		}
@@ -4638,6 +5846,134 @@ void OverlayWidget::updatePlaybackState() {
 	}
 }
 
+void OverlayWidget::setSystemMediaControls(
+		SystemMediaControlsVideoSink *sink) {
+	_smtcSink = sink;
+}
+
+void OverlayWidget::refreshSystemMediaControls() {
+	if (!_smtcSink) {
+		return;
+	}
+	const auto self = static_cast<SystemMediaControlsVideoDelegate*>(this);
+	if (!_streamed || !_streamed->withSound) {
+		_smtcSink->videoFinish(self);
+		return;
+	}
+	const auto &player = _streamed->instance.player();
+	const auto state = player.prepareLegacyState();
+	if (state.position == kTimeUnknown || state.length == kTimeUnknown) {
+		return;
+	}
+	const auto channel = _from && _from->isBroadcast();
+	const auto filename = _document ? _document->filename() : QString();
+	auto title = channel ? _fromName : filename;
+	if (title.isEmpty()) {
+		title = _fromName;
+	}
+	auto video = SystemMediaControlsVideoSink::VideoState{
+		.title = title,
+		.artist = channel ? filename : _fromName,
+		.position = std::max(state.position, crl::time(0)),
+		.duration = std::max(state.length, crl::time(0)),
+		.playing = (!player.paused() && !player.finished()),
+		.nextAvailable = _rightNavVisible,
+		.previousAvailable = _leftNavVisible,
+	};
+	if (_smtcDocument != _document) {
+		_smtcDocument = _document;
+		_smtcThumbnailSet = false;
+		_smtcSink->videoStart(self, video);
+	} else {
+		_smtcSink->videoUpdate(video);
+	}
+	if (!_smtcThumbnailSet) {
+		const auto cover = systemMediaControlsThumbnail();
+		if (!cover.isNull()) {
+			_smtcSink->videoSetThumbnail(cover);
+			_smtcThumbnailSet = true;
+		}
+	}
+}
+
+QImage OverlayWidget::systemMediaControlsThumbnail() const {
+	const auto original = [](Image *image) {
+		return image ? image->original() : QImage();
+	};
+	auto result = QImage();
+	if (_videoCover && _videoCoverMedia) {
+		result = original(_videoCoverMedia->image(Data::PhotoSize::Large));
+		if (result.isNull()) {
+			result = original(
+				_videoCoverMedia->image(Data::PhotoSize::Small));
+		}
+	} else if (_documentMedia) {
+		result = original(_documentMedia->goodThumbnail());
+		if (result.isNull()) {
+			result = original(_documentMedia->thumbnail());
+		}
+	}
+	if (result.isNull() && _streamed) {
+		result = currentVideoFrameImage();
+	}
+	return result;
+}
+
+void OverlayWidget::finishSystemMediaControls() {
+	if (_smtcSink) {
+		_smtcSink->videoFinish(
+			static_cast<SystemMediaControlsVideoDelegate*>(this));
+	}
+	_smtcDocument = nullptr;
+}
+
+void OverlayWidget::smtcPlay() {
+	if (!_streamed) {
+		return;
+	}
+	const auto &player = _streamed->instance.player();
+	if (player.paused() || player.finished() || !player.active()) {
+		playbackPauseResume();
+	}
+}
+
+void OverlayWidget::smtcPause() {
+	if (!_streamed) {
+		return;
+	}
+	const auto &player = _streamed->instance.player();
+	if (!player.paused() && !player.finished() && player.active()) {
+		playbackPauseResume();
+	}
+}
+
+void OverlayWidget::smtcPlayPause() {
+	if (_streamed) {
+		playbackPauseResume();
+	}
+}
+
+void OverlayWidget::smtcStop() {
+	close();
+}
+
+void OverlayWidget::smtcNext() {
+	moveToNext(1);
+}
+
+void OverlayWidget::smtcPrevious() {
+	moveToNext(-1);
+}
+
+void OverlayWidget::smtcSeek(crl::time position) {
+	if (!_streamed) {
+		return;
+	}
+	_streamingStartPaused = _streamed->instance.player().paused();
+	restartAtSeekPosition(position);
+	activateControls();
+}
+
 void OverlayWidget::validatePhotoImage(Image *image, bool blurred) {
 	if (!image) {
 		return;
@@ -4675,10 +6011,128 @@ void OverlayWidget::validatePhotoCurrentImage() {
 	if (_staticContent.isNull()) {
 		_photoMedia->wanted(Data::PhotoSize::Small, fileOrigin());
 	}
+	if (_recognitionRetryOnLarge) {
+		if (const auto image = _photoMedia->image(Data::PhotoSize::Large)
+			; image && !image->original().isNull()) {
+			tryStartTextRecognition();
+		}
+	}
+}
+
+void OverlayWidget::tryStartTextRecognition() {
+	if (_stories
+		|| !_session
+		|| !Platform::TextRecognition::IsAvailable()) {
+		return;
+	}
+	const auto forPhoto = (_photo != nullptr) && (_photoMedia != nullptr);
+	const auto forDocument = !_photo
+		&& _document
+		&& _document->isImage()
+		&& !_staticContent.isNull();
+	if (!forPhoto && !forDocument) {
+		return;
+	}
+	const auto cache = RecognitionCache();
+	if (!cache) {
+		return;
+	}
+	const auto id = RecognitionId{
+		.sessionUniqueId = _session->uniqueId(),
+		.photoId = forPhoto ? _photo->id : PhotoId(),
+		.documentId = forDocument ? _document->id : DocumentId(),
+	};
+	if (const auto cached = cache->find(id); cached != cache->end()) {
+		_recognitionRetryOnLarge = false;
+		const auto changed = (_recognitionResult.success != cached->second.success)
+			|| (_recognitionResult.items.size() != cached->second.items.size());
+		_recognitionResult = cached->second;
+		if (changed) {
+			updateControls();
+		}
+		return;
+	}
+	if (_recognitionPendingSessionUniqueId == id.sessionUniqueId
+		&& _recognitionPendingPhotoId == id.photoId
+		&& _recognitionPendingDocumentId == id.documentId) {
+		_recognitionRetryOnLarge = false;
+		return;
+	}
+	auto original = QImage();
+	auto recognizeSize = QSize();
+	if (forPhoto) {
+		_photoMedia->wanted(Data::PhotoSize::Large, fileOrigin());
+		if (const auto image = _photoMedia->image(Data::PhotoSize::Large)) {
+			original = image->original();
+		}
+	} else {
+		const auto ratio = style::DevicePixelRatio();
+		const auto percent = style::Scale();
+		const auto target = QSize(
+			(_staticContent.width() * 100) / (ratio * percent),
+			(_staticContent.height() * 100) / (ratio * percent));
+		original = _staticContent;
+		if (!target.isEmpty() && target != original.size()) {
+			recognizeSize = target;
+		}
+	}
+	if (original.isNull()) {
+		_recognitionRetryOnLarge = true;
+		return;
+	}
+	_recognitionRetryOnLarge = false;
+	_recognitionPendingSessionUniqueId = id.sessionUniqueId;
+	_recognitionPendingPhotoId = id.photoId;
+	_recognitionPendingDocumentId = id.documentId;
+	const auto weak = base::make_weak(_widget);
+	crl::async([=] {
+		const auto input = recognizeSize.isEmpty()
+			? original
+			: original.scaled(
+				recognizeSize,
+				Qt::IgnoreAspectRatio,
+				Qt::SmoothTransformation);
+		auto result = Platform::TextRecognition::RecognizeText(input);
+		crl::on_main(weak, [=, result = std::move(result)]() mutable {
+			const auto cache = RecognitionCache();
+			if (!cache) {
+				return;
+			}
+			const auto pendingMatches = (_recognitionPendingSessionUniqueId
+				== id.sessionUniqueId)
+				&& (_recognitionPendingPhotoId == id.photoId)
+				&& (_recognitionPendingDocumentId == id.documentId);
+			if (pendingMatches) {
+				_recognitionPendingSessionUniqueId = 0;
+				_recognitionPendingPhotoId = 0;
+				_recognitionPendingDocumentId = 0;
+			}
+			(*cache)[id] = result;
+			const auto stillSame = _session
+				&& (_session->uniqueId() == id.sessionUniqueId)
+				&& (id.photoId
+					? (_photo && _photo->id == id.photoId)
+					: (_document && _document->id == id.documentId));
+			if (!stillSame) {
+				return;
+			}
+			_recognitionResult = std::move(result);
+			updateControls();
+		});
+	});
 }
 
 Ui::GL::ChosenRenderer OverlayWidget::chooseRenderer(
 		Ui::GL::Backend backend) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (backend == Ui::GL::Backend::QRhi) {
+		_opengl = true;
+		return {
+			.renderer = std::make_unique<RendererRhi>(this),
+			.backend = Ui::GL::Backend::QRhi,
+		};
+	}
+#endif // Qt >= 6.7
 	_opengl = (backend == Ui::GL::Backend::OpenGL);
 	return {
 		.renderer = (_opengl
@@ -4747,7 +6201,11 @@ void OverlayWidget::paint(not_null<Renderer*> renderer) {
 			}
 		}
 	} else if (_stories) {
-		// Unsupported story.
+		if (_videoStream) {
+			renderer->paintVideoStream();
+		} else {
+			// Unsupported story.
+		}
 	} else if (_themePreviewShown) {
 		renderer->paintThemePreview(_themePreviewRect);
 	} else if (documentBubbleShown() && !_docRect.isEmpty()) {
@@ -4756,6 +6214,12 @@ void OverlayWidget::paint(not_null<Renderer*> renderer) {
 	if (isSaveMsgShown()) {
 		renderer->paintSaveMsg(_saveMsg);
 	}
+	if (isChapterShown()) {
+		renderer->paintChapter(_chapterRect);
+	}
+	if (isSpeedBoostShown()) {
+		renderer->paintSpeedBoost(_speedBoostRect);
+	}
 
 	const auto opacity = _fullScreenVideo ? 0. : _controlsOpacity.current();
 	if (opacity > 0) {
@@ -5016,6 +6480,317 @@ void OverlayWidget::paintSaveMsgContent(
 	p.setOpacity(1);
 }
 
+void OverlayWidget::showChapterIndicator(
+		const QString &name,
+		int direction) {
+	if (name.isEmpty()) {
+		return;
+	}
+	_chapterText = name;
+
+	const auto font = st::mediaviewChapterFont;
+	const auto padding = st::mediaviewChapterPadding;
+	const auto arrowSpace = st::mediaviewChapterArrowWidth
+		+ st::mediaviewChapterArrowGap;
+	const auto textWidth = font->width(_chapterText);
+	const auto w = padding.left()
+		+ arrowSpace
+		+ textWidth
+		+ arrowSpace
+		+ padding.right();
+	const auto h = rect::m::sum::v(padding) + font->height;
+	_chapterRect = QRect(
+		(width() - w) / 2,
+		_minUsedTop + (_maxUsedHeight - h) / 2,
+		w,
+		h);
+
+	if (isChapterShown()) {
+		_chapterTimer.callOnce(st::mediaviewChapterShown);
+	} else {
+		const auto callback = [=](float64 value) {
+			updateChapter();
+			if (!_chapterAnimation.animating()) {
+				_chapterTimer.callOnce(st::mediaviewChapterShown);
+			}
+		};
+		_chapterAnimation.start(
+			callback,
+			0.,
+			1.,
+			st::mediaviewChapterShowing);
+	}
+
+	_chapterArrows.erase(
+		ranges::remove_if(
+			_chapterArrows,
+			[&](const auto &a) {
+				return !a->animation.animating()
+					|| (a->direction != direction);
+			}),
+		_chapterArrows.end());
+	auto arrow = std::make_unique<ChapterArrow>();
+	arrow->direction = direction;
+	arrow->animation.start(
+		[=] { updateChapter(); },
+		0.,
+		1.,
+		st::mediaviewChapterArrowSlide
+			+ st::mediaviewChapterArrowPause
+			+ st::mediaviewChapterArrowFade);
+	_chapterArrows.push_back(std::move(arrow));
+	updateChapter();
+}
+
+void OverlayWidget::paintChapterContent(
+		Painter &p,
+		QRect outer,
+		QRect clip) {
+	const auto opacity = _chapterAnimation.value(1.);
+	p.setOpacity(opacity);
+	Ui::FillRoundRect(
+		p,
+		outer,
+		st::mediaviewSaveMsgBg,
+		Ui::MediaviewSaveCorners);
+
+	const auto font = st::mediaviewChapterFont;
+	const auto padding = st::mediaviewChapterPadding;
+	const auto arrowSize = st::mediaviewChapterArrowSize;
+	const auto arrowWidth = st::mediaviewChapterArrowWidth;
+	const auto arrowGap = st::mediaviewChapterArrowGap;
+	const auto textX = outer.x()
+		+ padding.left()
+		+ arrowWidth
+		+ arrowGap;
+	const auto textY = outer.y() + padding.top();
+
+	p.setFont(font);
+	p.setPen(st::mediaviewSaveMsgFg);
+	p.drawText(textX, textY + font->ascent, _chapterText);
+
+	const auto cy = outer.y() + outer.height() / 2.;
+	const auto halfH = arrowSize / 2.;
+	const auto totalDuration = float64(st::mediaviewChapterArrowSlide
+		+ st::mediaviewChapterArrowPause
+		+ st::mediaviewChapterArrowFade);
+	const auto slideEnd = st::mediaviewChapterArrowSlide / totalDuration;
+	const auto fadeStart = 1. - st::mediaviewChapterArrowFade / totalDuration;
+	auto hq = PainterHighQualityEnabler(p);
+	auto pen = QPen(st::mediaviewSaveMsgFg->c);
+	pen.setWidthF(st::lineWidth * 1.5);
+	pen.setCapStyle(Qt::RoundCap);
+	pen.setJoinStyle(Qt::RoundJoin);
+	p.setPen(pen);
+	p.setBrush(Qt::NoBrush);
+	for (const auto &arrow : _chapterArrows) {
+		if (!arrow->animation.animating()) {
+			continue;
+		}
+		const auto progress = arrow->animation.value(1.);
+		const auto slideProgress = std::min(progress / slideEnd, 1.);
+		const auto shift = st::mediaviewChapterArrowShift * slideProgress;
+		const auto arrowOpacity = (progress <= fadeStart)
+			? slideProgress
+			: (1. - progress) / (1. - fadeStart);
+		p.setOpacity(opacity * arrowOpacity);
+		auto path = QPainterPath();
+		if (arrow->direction > 0) {
+			const auto ax = outer.x()
+				+ outer.width()
+				- padding.right()
+				- arrowGap
+				- arrowWidth
+				+ shift;
+			path.moveTo(ax, cy - halfH);
+			path.lineTo(ax + arrowWidth, cy);
+			path.lineTo(ax, cy + halfH);
+		} else {
+			const auto ax = outer.x()
+				+ padding.left()
+				+ arrowGap
+				+ arrowWidth
+				- shift;
+			path.moveTo(ax, cy - halfH);
+			path.lineTo(ax - arrowWidth, cy);
+			path.lineTo(ax, cy + halfH);
+		}
+		p.drawPath(path);
+	}
+	p.setOpacity(1);
+}
+
+bool OverlayWidget::isChapterShown() const {
+	return _chapterAnimation.animating() || _chapterTimer.isActive();
+}
+
+void OverlayWidget::updateChapter() {
+	update(_chapterRect);
+}
+
+void OverlayWidget::startSpeedBoost() {
+	if (_speedBoostActive || !_streamed || _stories) {
+		return;
+	}
+	if (_speedBoostFromMouse && _down != Over::Video) {
+		return;
+	}
+	_speedBoostActive = true;
+	_speedBoostSavedSpeed = _streamed->instance.speed();
+	_speedBoostSpeed = 2.0;
+	_speedBoostPhase = 0.;
+	_speedBoostLastFrame = crl::now();
+	_streamed->instance.setSpeed(_speedBoostSpeed);
+	_speedBoostHoldTimer.cancel();
+
+	updateSpeedBoostRect();
+	_speedBoostAnimation.start(
+		[=] { updateSpeedBoost(); },
+		0.,
+		1.,
+		st::mediaviewSpeedBoostShowing);
+	_speedBoostTicker.start();
+}
+
+void OverlayWidget::stopSpeedBoost() {
+	if (!_speedBoostActive) {
+		return;
+	}
+	_speedBoostActive = false;
+	_speedBoostFromMouse = false;
+	_speedBoostHoldTimer.cancel();
+	if (_streamed) {
+		_streamed->instance.setSpeed(_speedBoostSavedSpeed);
+	}
+	_speedBoostAnimation.start(
+		[=] { updateSpeedBoost(); },
+		1.,
+		0.,
+		st::mediaviewSpeedBoostHiding);
+}
+
+void OverlayWidget::updateSpeedBoostRect() {
+	const auto was = _speedBoostRect;
+	const auto font = st::mediaviewSpeedBoostFont;
+	const auto padding = st::mediaviewSpeedBoostPadding;
+	const auto maxText
+		= QString::fromUtf8("%1\xC3\x97").arg(kSpeedMax, 0, 'f', 1);
+	const auto arrowStep = std::max(
+		1,
+		st::mediaviewSpeedBoostArrowWidth
+			+ st::mediaviewSpeedBoostArrowGap
+			- st::mediaviewSpeedBoostArrowOverlap);
+	const auto arrowSpace = st::mediaviewSpeedBoostArrowWidth
+		+ arrowStep
+		+ st::mediaviewSpeedBoostTextRight;
+	const auto w = padding.left()
+		+ font->width(maxText)
+		+ arrowSpace
+		+ padding.right();
+	const auto h = rect::m::sum::v(padding) + font->height;
+	_speedBoostRect = QRect(
+		(width() - w) / 2,
+		_minUsedTop + st::mediaviewSpeedBoostTop,
+		w,
+		h);
+	if (was != _speedBoostRect && !was.isEmpty()) {
+		update(was);
+	}
+}
+
+void OverlayWidget::paintSpeedBoostContent(
+		Painter &p,
+		QRect outer,
+		QRect clip) {
+	const auto opacity = _speedBoostAnimation.value(
+		_speedBoostActive ? 1. : 0.);
+	if (opacity <= 0.) {
+		return;
+	}
+
+	const auto scale = 0.6 + 0.4 * opacity;
+	p.save();
+	p.translate(rect::center(outer));
+	p.scale(scale, scale);
+	p.translate(-rect::center(outer));
+
+	p.setOpacity(opacity);
+	Ui::FillRoundRect(
+		p,
+		outer,
+		st::mediaviewSaveMsgBg,
+		Ui::MediaviewSaveCorners);
+
+	const auto font = st::mediaviewSpeedBoostFont;
+	const auto padding = st::mediaviewSpeedBoostPadding;
+	const auto text
+		= QString::fromUtf8("%1\xC3\x97").arg(_speedBoostSpeed, 0, 'f', 1);
+	const auto arrowWidth = st::mediaviewSpeedBoostArrowWidth;
+	const auto arrowHeight = st::mediaviewSpeedBoostArrowHeight;
+	const auto arrowGap = st::mediaviewSpeedBoostArrowGap;
+	const auto arrowRound = style::ConvertFloatScale(1.5);
+	const auto arrowStep = std::max(
+		1,
+		arrowWidth + arrowGap - st::mediaviewSpeedBoostArrowOverlap);
+	const auto arrowsWidth = arrowWidth + arrowStep;
+	const auto innerArrowWidth = arrowWidth - arrowRound * 2.;
+	const auto innerArrowHeight = arrowHeight - arrowRound * 2.;
+	const auto innerHalfH = innerArrowHeight / 2.;
+	const auto textRight = st::mediaviewSpeedBoostTextRight;
+	const auto textWidth = font->width(text);
+	const auto contentWidth = textWidth + textRight + arrowsWidth;
+	const auto contentX = outer.x()
+		+ (outer.width() - contentWidth) / 2.;
+	const auto textY = outer.y() + padding.top();
+	p.setFont(font);
+	p.setPen(st::mediaviewSaveMsgFg);
+	p.drawText(int(contentX), textY + font->ascent, text);
+
+	const auto cy = outer.y() + outer.height() / 2.;
+	const auto arrowsX = contentX + textWidth + textRight;
+	const auto now = crl::now();
+	const auto dt = std::min(
+		0.016,
+		(now - _speedBoostLastFrame) / 1000.);
+	_speedBoostLastFrame = now;
+	_speedBoostPhase += dt * 1.5 * std::min(_speedBoostSpeed, 4.);
+
+	auto hq = PainterHighQualityEnabler(p);
+	auto stroker = QPainterPathStroker();
+	if (arrowRound > 0.) {
+		stroker.setWidth(arrowRound * 2.);
+		stroker.setCapStyle(Qt::RoundCap);
+		stroker.setJoinStyle(Qt::RoundJoin);
+	}
+	p.setPen(Qt::NoPen);
+	for (auto i = 0; i < 2; ++i) {
+		const auto phase = _speedBoostPhase + i * 0.17;
+		const auto pulse = std::sin(phase * M_PI) / 2. + 1.;
+		const auto alpha = opacity * (0.2 + 0.75 * pulse);
+		p.setBrush(anim::with_alpha(st::mediaviewSaveMsgFg->c, alpha));
+		const auto ax = arrowsX + i * arrowStep;
+		auto path = QPainterPath();
+		path.moveTo(ax + arrowRound, cy - innerHalfH);
+		path.lineTo(ax + arrowRound + innerArrowWidth, cy);
+		path.lineTo(ax + arrowRound, cy + innerHalfH);
+		path.closeSubpath();
+		if (arrowRound > 0.) {
+			path = path.united(stroker.createStroke(path));
+		}
+		p.drawPath(path);
+	}
+	p.restore();
+	p.setOpacity(1);
+}
+
+bool OverlayWidget::isSpeedBoostShown() const {
+	return _speedBoostActive || _speedBoostAnimation.animating();
+}
+
+void OverlayWidget::updateSpeedBoost() {
+	update(_speedBoostRect);
+}
+
 bool OverlayWidget::saveControlLocked() const {
 	const auto story = _stories ? _stories->story() : nullptr;
 	return story
@@ -5076,6 +6851,18 @@ void OverlayWidget::paintControls(
 			_moreNavOver,
 			_moreNavIcon,
 			st::mediaviewMore },
+		{
+			Over::Draw,
+			_drawVisible,
+			_drawNavOver,
+			_drawNavIcon,
+			st::mediaviewDraw },
+		{
+			Over::Recognize,
+			_recognizeVisible,
+			_recognizeNavOver,
+			_recognizeNavIcon,
+			st::mediaviewRecognize },
 	};
 
 	renderer->paintControlsStart();
@@ -5147,6 +6934,18 @@ void OverlayWidget::paintFooterContent(
 		}
 	}
 
+	// separator
+	if (_separatorNav.isValid()) {
+		const auto separator = _separatorNav.translated(shift);
+		if (separator.intersects(clip)) {
+			p.setOpacity(controlOpacity(0.) * opacity);
+			p.drawText(
+				separator.left(),
+				separator.top() + st::mediaviewFont->ascent,
+				Ui::kQBullet);
+		}
+	}
+
 	// date
 	if (date.intersects(clip)) {
 		float64 o = overLevel(Over::Date);
@@ -5161,7 +6960,7 @@ void OverlayWidget::paintFooterContent(
 }
 
 QRect OverlayWidget::footerGeometry() const {
-	return _headerNav.united(_nameNav).united(_dateNav);
+	return _headerNav.united(_nameNav).united(_separatorNav).united(_dateNav);
 }
 
 void OverlayWidget::paintCaptionContent(
@@ -5188,10 +6987,13 @@ void OverlayWidget::paintCaptionContent(
 	}
 	if (inner.intersects(clip)) {
 		p.setPen(st::mediaviewCaptionFg);
+		RefreshCaptionQuoteCaches(_captionBlockquoteCache, _captionPreCache);
 		_caption.draw(p, {
 			.position = inner.topLeft(),
 			.availableWidth = inner.width(),
 			.palette = &st::mediaviewTextPalette,
+			.pre = &_captionPreCache,
+			.blockquote = &_captionBlockquoteCache,
 			.spoiler = Ui::Text::DefaultSpoilerCache(),
 			.pausedEmoji = On(PowerSaving::kEmojiChat),
 			.pausedSpoiler = On(PowerSaving::kChatSpoiler),
@@ -5268,9 +7070,60 @@ void OverlayWidget::handleKeyPress(not_null<QKeyEvent*> e) {
 		if (toggleFull) {
 			playbackToggleFullScreen();
 			return;
-		} else if (key == Qt::Key_Space) {
+		} else if (key == Qt::Key_K) {
 			playbackPauseResume();
 			return;
+		} else if (key == Qt::Key_Space) {
+			if (!e->isAutoRepeat()) {
+				_speedBoostHoldTimer.callOnce(
+					st::mediaviewSpeedBoostHoldDelay);
+			}
+			return;
+		} else if (key == Qt::Key_J) {
+			activateControls();
+			seekRelativeTime(-kSeekTimeMsLong);
+			return;
+		} else if (key == Qt::Key_L) {
+			activateControls();
+			seekRelativeTime(kSeekTimeMsLong);
+			return;
+		} else if ((key == Qt::Key_Period || key == Qt::Key_Comma)
+			&& _streamed->instance.player().paused()) {
+			activateControls();
+			_frameStepPending += (key == Qt::Key_Period) ? 1 : -1;
+			if (!_frameStepThrottle.isActive()) {
+				flushPendingFrameStep();
+				_frameStepThrottle.callOnce(kFrameStepThrottleMs);
+			}
+			return;
+		} else if (modifiers.testFlag(Qt::AltModifier)
+			&& (key == Qt::Key_Left || key == Qt::Key_Right)
+			&& _streamed->controls
+			&& _streamed->controls->hasTimestamps()) {
+			const auto &state = _streamed->instance.info().video.state;
+			const auto duration = state.duration;
+			if (duration > 0) {
+				const auto progress = state.position
+					/ float64(duration);
+				const auto &controls = _streamed->controls;
+				if (key == Qt::Key_Right) {
+					if (const auto ts = controls->nextTimestamp(progress)) {
+						activateControls();
+						restartAtProgress(ts->position);
+						showChapterIndicator(ts->label, 1);
+					}
+				} else {
+					if (const auto ts = controls->prevTimestamp(progress)) {
+						activateControls();
+						restartAtProgress(ts->position);
+						showChapterIndicator(ts->label, -1);
+					} else {
+						activateControls();
+						restartAtSeekPosition(0);
+					}
+				}
+			}
+			return;
 		} else if (_fullScreenVideo) {
 			if (key == Qt::Key_Escape) {
 				playbackToggleFullScreen();
@@ -5301,7 +7154,9 @@ void OverlayWidget::handleKeyPress(not_null<QKeyEvent*> e) {
 	} else if (e == QKeySequence::Save || e == QKeySequence::SaveAs) {
 		saveAs();
 	} else if (key == Qt::Key_Copy || (key == Qt::Key_C && ctrl)) {
-		copyMedia();
+		if (!copyRecognitionSelection()) {
+			copyMedia();
+		}
 	} else if (key == Qt::Key_Enter
 		|| key == Qt::Key_Return
 		|| key == Qt::Key_Space) {
@@ -5317,6 +7172,26 @@ void OverlayWidget::handleKeyPress(not_null<QKeyEvent*> e) {
 			activateControls();
 		}
 		moveToNext(-1);
+	} else if (key == Qt::Key_H && !_stories) {
+		if (_flip & Qt::Horizontal) {
+			_flip &= ~Qt::Horizontal;
+		} else {
+			_flip |= Qt::Horizontal;
+		}
+		if (_photo) {
+			validatePhotoCurrentImage();
+			redisplayContent();
+		}
+	} else if (key == Qt::Key_V && !_stories) {
+		if (_flip & Qt::Vertical) {
+			_flip &= ~Qt::Vertical;
+		} else {
+			_flip |= Qt::Vertical;
+		}
+		if (_photo) {
+			validatePhotoCurrentImage();
+			redisplayContent();
+		}
 	} else if (key == Qt::Key_Right) {
 		if (_controlsHideTimer.isActive()) {
 			activateControls();
@@ -5338,13 +7213,32 @@ void OverlayWidget::handleKeyPress(not_null<QKeyEvent*> e) {
 	}
 }
 
+void OverlayWidget::handleKeyRelease(not_null<QKeyEvent*> e) {
+	if (e->isAutoRepeat()) {
+		return;
+	}
+	if (e->key() == Qt::Key_Space && _streamed && !_stories) {
+		if (_speedBoostHoldTimer.isActive()) {
+			_speedBoostHoldTimer.cancel();
+			playbackPauseResume();
+		} else if (_speedBoostActive) {
+			stopSpeedBoost();
+		}
+	}
+}
+
 void OverlayWidget::handleWheelEvent(not_null<QWheelEvent*> e) {
 	constexpr auto step = int(QWheelEvent::DefaultDeltasPerStep);
 
+	const auto angle = e->angleDelta();
+	if (_swipeNavigating || std::abs(angle.x()) > std::abs(angle.y())) {
+		_verticalWheelDelta = 0;
+		return;
+	}
 	const auto acceptForJump = !_stories
 		&& ((e->source() == Qt::MouseEventNotSynthesized)
 			|| (e->source() == Qt::MouseEventSynthesizedBySystem));
-	_verticalWheelDelta += e->angleDelta().y();
+	_verticalWheelDelta += angle.y();
 	while (qAbs(_verticalWheelDelta) >= step) {
 		if (_verticalWheelDelta < 0) {
 			_verticalWheelDelta += step;
@@ -5364,6 +7258,87 @@ void OverlayWidget::handleWheelEvent(not_null<QWheelEvent*> e) {
 	}
 }
 
+void OverlayWidget::setupSwipeNavigation() {
+	struct State {
+		Ui::Controls::SwipeBackResult back;
+		bool mirrored = false;
+	};
+	const auto state = lifetime().make_state<State>();
+	const auto colors = []() -> std::pair<QColor, QColor> {
+		return {
+			st::mediaviewControlBg->c,
+			st::mediaviewControlFg->c,
+		};
+	};
+	auto update = [=](Ui::Controls::SwipeContextData data) {
+		_swipeNavigating = (data.translation != 0);
+		if (data.translation != 0) {
+			const auto mirrored = (data.translation < 0);
+			if (!state->back.callback || state->mirrored != mirrored) {
+				state->back = Ui::Controls::SetupSwipeBack(
+					_body,
+					colors,
+					mirrored,
+					false,
+					[=] { return _minUsedTop + _maxUsedHeight / 2; });
+				state->mirrored = mirrored;
+			}
+			state->back.callback(data);
+		} else if (state->back.lifetime) {
+			state->back = {};
+		}
+	};
+	auto init = [=](Ui::Controls::SwipeHandlerInitData data) {
+		if (_stories) {
+			return Ui::Controls::SwipeHandlerFinishData();
+		}
+		const auto next = (data.direction == Qt::LeftToRight);
+		if (next ? !_rightNavVisible : !_leftNavVisible) {
+			return Ui::Controls::SwipeHandlerFinishData();
+		}
+		return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
+			moveToNext(next ? 1 : -1);
+		});
+	};
+	Ui::Controls::SetupSwipeHandler({
+		.widget = _body,
+		.update = std::move(update),
+		.init = std::move(init),
+	});
+}
+
+bool OverlayWidget::handleNativeGesture(not_null<QNativeGestureEvent*> e) {
+	if (e->gestureType() == Qt::BeginNativeGesture) {
+		_pinchZoomAccumulated = 0.;
+		_zoomAtLimit = false;
+		return false;
+	} else if (e->gestureType() != Qt::ZoomNativeGesture) {
+		return false;
+	} else if (_stories || _fullScreenVideo) {
+		return false;
+	}
+	const auto stepZoom = [&](auto &&zoom) {
+		const auto before = _zoom;
+		zoom();
+		if (_zoom != before) {
+			_zoomAtLimit = false;
+		} else if (!_zoomAtLimit) {
+			_zoomAtLimit = true;
+			base::Platform::Haptic();
+		}
+	};
+	_pinchZoomAccumulated += e->value();
+	while (_pinchZoomAccumulated >= kPinchZoomStep) {
+		_pinchZoomAccumulated -= kPinchZoomStep;
+		stepZoom([&] { zoomIn(); });
+	}
+	while (_pinchZoomAccumulated <= -kPinchZoomStep) {
+		_pinchZoomAccumulated += kPinchZoomStep;
+		stepZoom([&] { zoomOut(); });
+	}
+	return true;
+}
+
 void OverlayWidget::setZoomLevel(int newZoom, bool force) {
 	if (_stories
 		|| (!force && _zoom == newZoom)
@@ -5443,6 +7418,22 @@ OverlayWidget::Entity OverlayWidget::entityForSharedMedia(int index) const {
 	return { v::null, nullptr };
 }
 
+OverlayWidget::Entity OverlayWidget::entityForInstantViewMedia(int index) const {
+	Expects(_instantViewMediaData.has_value());
+	Expects(_session != nullptr);
+
+	const auto &items = *_instantViewMediaData;
+	if (!_message || index < 0 || index >= items.size()) {
+		return { v::null, nullptr };
+	}
+	if (const auto document = std::get_if<DocumentData*>(&items[index])) {
+		return { *document, _message, _topicRootId, _monoforumPeerId };
+	} else if (const auto photo = std::get_if<PhotoData*>(&items[index])) {
+		return { *photo, _message, _topicRootId, _monoforumPeerId };
+	}
+	return { v::null, nullptr };
+}
+
 OverlayWidget::Entity OverlayWidget::entityForCollage(int index) const {
 	Expects(_collageData.has_value());
 	Expects(_session != nullptr);
@@ -5452,9 +7443,9 @@ OverlayWidget::Entity OverlayWidget::entityForCollage(int index) const {
 		return { v::null, nullptr };
 	}
 	if (const auto document = std::get_if<DocumentData*>(&items[index])) {
-		return { *document, _message, _topicRootId };
+		return { *document, _message, _topicRootId, _monoforumPeerId };
 	} else if (const auto photo = std::get_if<PhotoData*>(&items[index])) {
-		return { *photo, _message, _topicRootId };
+		return { *photo, _message, _topicRootId, _monoforumPeerId };
 	}
 	return { v::null, nullptr };
 }
@@ -5465,18 +7456,20 @@ OverlayWidget::Entity OverlayWidget::entityForItemId(const FullMsgId &itemId) co
 	if (const auto item = _session->data().message(itemId)) {
 		if (const auto media = item->media()) {
 			if (const auto photo = media->photo()) {
-				return { photo, item, _topicRootId };
+				return { photo, item, _topicRootId, _monoforumPeerId };
 			} else if (const auto document = media->document()) {
-				return { document, item, _topicRootId };
+				return { document, item, _topicRootId, _monoforumPeerId };
 			}
 		}
-		return { v::null, item, _topicRootId };
+		return { v::null, item, _topicRootId, _monoforumPeerId };
 	}
 	return { v::null, nullptr };
 }
 
 OverlayWidget::Entity OverlayWidget::entityByIndex(int index) const {
-	if (_sharedMediaData) {
+	if (_instantViewMediaData) {
+		return entityForInstantViewMedia(index);
+	} else if (_sharedMediaData) {
 		return entityForSharedMedia(index);
 	} else if (_userPhotosData) {
 		return entityForUserPhotos(index);
@@ -5497,16 +7490,21 @@ void OverlayWidget::setContext(
 		_history = _message->history();
 		_peer = _history->peer;
 		_topicRootId = _peer->isForum() ? item->topicRootId : MsgId();
+		_monoforumPeerId = _peer->amMonoforumAdmin()
+			? item->monoforumPeerId
+			: PeerId();
 		setStoriesPeer(nullptr);
 	} else if (const auto peer = std::get_if<not_null<PeerData*>>(&context)) {
 		_peer = *peer;
 		_history = _peer->owner().history(_peer);
 		_message = nullptr;
 		_topicRootId = MsgId();
+		_monoforumPeerId = PeerId();
 		setStoriesPeer(nullptr);
 	} else if (const auto story = std::get_if<StoriesContext>(&context)) {
 		_message = nullptr;
 		_topicRootId = MsgId();
+		_monoforumPeerId = PeerId();
 		_history = nullptr;
 		_peer = nullptr;
 		setStoriesPeer(story->peer);
@@ -5520,6 +7518,7 @@ void OverlayWidget::setContext(
 	} else {
 		_message = nullptr;
 		_topicRootId = MsgId();
+		_monoforumPeerId = PeerId();
 		_history = nullptr;
 		_peer = nullptr;
 		setStoriesPeer(nullptr);
@@ -5541,18 +7540,21 @@ void OverlayWidget::setStoriesPeer(PeerData *peer) {
 	const auto session = peer ? &peer->session() : nullptr;
 	if (!session && !_storiesSession) {
 		Assert(!_stories);
+		Assert(!_videoStream);
 	} else if (!peer) {
+		_videoStream = nullptr;
 		_stories = nullptr;
 		_storiesSession = nullptr;
 		_storiesChanged.fire({});
 		updateNavigationControlsGeometry();
 	} else if (_storiesSession != session) {
+		_videoStream = nullptr;
 		_stories = nullptr;
 		_storiesSession = session;
 		const auto delegate = static_cast<Stories::Delegate*>(this);
 		_stories = std::make_unique<Stories::View>(delegate);
 		_stories->finalShownGeometryValue(
-		) | rpl::skip(1) | rpl::start_with_next([=] {
+		) | rpl::skip(1) | rpl::on_next([=] {
 			updateControlsGeometry();
 		}, _stories->lifetime());
 		_storiesChanged.fire({});
@@ -5569,7 +7571,7 @@ void OverlayWidget::setSession(not_null<Main::Session*> session) {
 	_window->setWindowIcon(Window::CreateIcon(session));
 
 	session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!isHidden()) {
 			updateControls();
 			checkForSaveLoaded();
@@ -5579,25 +7581,25 @@ void OverlayWidget::setSession(not_null<Main::Session*> session) {
 	session->data().documentLoadProgress(
 	) | rpl::filter([=] {
 		return !isHidden();
-	}) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+	}) | rpl::on_next([=](not_null<DocumentData*> document) {
 		documentUpdated(document);
 	}, _sessionLifetime);
 
 	session->data().itemIdChanged(
-	) | rpl::start_with_next([=](const Data::Session::IdChange &change) {
+	) | rpl::on_next([=](const Data::Session::IdChange &change) {
 		changingMsgId(change.newId, change.oldId);
 	}, _sessionLifetime);
 
 	session->data().itemRemoved(
 	) | rpl::filter([=](not_null<const HistoryItem*> item) {
 		return (_message == item);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		close();
 		clearSession();
 	}, _sessionLifetime);
 
 	session->account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		clearSession();
 	}, _sessionLifetime);
 }
@@ -5617,7 +7619,11 @@ bool OverlayWidget::moveToEntity(const Entity &entity, int preloadDelta) {
 		return false;
 	}
 	if (const auto item = entity.item) {
-		setContext(ItemContext{ item, entity.topicRootId });
+		setContext(ItemContext{
+			item,
+			entity.topicRootId,
+			entity.monoforumPeerId,
+		});
 	} else if (_peer) {
 		setContext(_peer);
 	} else {
@@ -5657,7 +7663,7 @@ void OverlayWidget::preloadData(int delta) {
 			const auto &[i, ok] = documents.emplace(
 				(*document)->createMediaView());
 			(*i)->thumbnailWanted(fileOrigin(entity));
-			if (!(*i)->canBePlayed(entity.item)) {
+			if (!(*i)->canBePlayed()) {
 				(*i)->automaticLoad(fileOrigin(entity), entity.item);
 			}
 		}
@@ -5694,13 +7700,35 @@ void OverlayWidget::handleMousePress(
 				|| _over == Over::Save
 				|| _over == Over::Share
 				|| _over == Over::Rotate
+				|| _over == Over::Draw
+				|| _over == Over::Recognize
 				|| _over == Over::Icon
 				|| _over == Over::More
 				|| _over == Over::Video) {
 				_down = _over;
 				if (_over == Over::Video && _stories) {
 					_stories->contentPressed(true);
+				} else if (_over == Over::Video
+					&& _streamed
+					&& !_stories) {
+					_speedBoostFromMouse = true;
+					_speedBoostDragAccum = position.x();
+					_speedBoostHoldTimer.callOnce(
+						st::mediaviewSpeedBoostHoldDelay);
 				}
+			} else if (const auto at = ((_showRecognitionResults
+					&& _recognitionResult.success
+					&& !_recognitionResult.items.empty())
+					? _recognition.positionAt(
+						position,
+						finalContentRect(),
+						_rotation,
+						false)
+					: RecognitionPosition())
+				; at.item >= 0) {
+				_recognition.start(at);
+				_mStart = position;
+				update();
 			} else if (!_saveMsg.contains(position) || !isSaveMsgShown()) {
 				_pressed = true;
 				_dragging = 0;
@@ -5723,7 +7751,13 @@ bool OverlayWidget::handleDoubleClick(
 
 	if (_over != Over::Video || button != Qt::LeftButton) {
 		return false;
-	} else if (_stories) {
+	}
+	_speedBoostHoldTimer.cancel();
+	_speedBoostFromMouse = false;
+	if (_speedBoostActive) {
+		stopSpeedBoost();
+	}
+	if (_stories) {
 		if (ClickHandler::getActive()) {
 			return false;
 		}
@@ -5742,21 +7776,130 @@ void OverlayWidget::snapXY() {
 	auto ymin = height() - _h, ymax = _minUsedTop;
 	accumulate_min(xmin, (width() - _w) / 2);
 	accumulate_max(xmax, (width() - _w) / 2);
-	accumulate_min(ymin, _skipTop + (_availableHeight - _h) / 2);
-	accumulate_max(ymax, _skipTop + (_availableHeight - _h) / 2);
+	const auto centerY = _fullScreenVideo
+		? (_minUsedTop + (_maxUsedHeight - _h) / 2)
+		: (_skipTop + (_availableHeight - _h) / 2);
+	accumulate_min(ymin, centerY);
+	accumulate_max(ymax, centerY);
 	accumulate_max(_x, xmin);
 	accumulate_min(_x, xmax);
 	accumulate_max(_y, ymin);
 	accumulate_min(_y, ymax);
 }
 
+auto OverlayWidget::scaledRecognitionRect(QPoint position)
+const -> std::optional<Platform::TextRecognition::RectWithText> {
+	auto contentRect = finalContentRect();
+	if (_rotation) {
+		auto transform = QTransform();
+		const auto center = rect::center(contentRect);
+		transform.translate(center.x(), center.y());
+		transform.rotate(-_rotation);
+		transform.translate(-center.x(), -center.y());
+		contentRect = transform.mapRect(contentRect);
+		position = transform.map(position);
+	}
+	const auto imageSize = _staticContent.size()
+		/ style::DevicePixelRatio();
+	if (imageSize.isEmpty() || !contentRect.contains(position)) {
+		return std::nullopt;
+	}
+	const auto scale = contentRect.width() / float64(imageSize.width());
+	for (const auto &item : _recognitionResult.items) {
+		const auto &rect = item.rect;
+		const auto scaledRect = QRect(
+			contentRect.x() + int(rect.x() * scale),
+			contentRect.y() + int(rect.y() * scale),
+			int(rect.width() * scale),
+			int(rect.height() * scale));
+		if (scaledRect.contains(position)) {
+			return Platform::TextRecognition::RectWithText{
+				.text = item.text,
+				.rect = scaledRect,
+			};
+		}
+	}
+	return std::nullopt;
+}
+
+void OverlayWidget::updateRecognitionSelection(QPoint position) {
+	const auto focus = _recognition.positionAt(
+		position,
+		finalContentRect(),
+		_rotation,
+		true);
+	if (_recognition.updateFocus(focus)) {
+		update();
+	}
+}
+
+void OverlayWidget::clearRecognitionSelection() {
+	if (_recognition.clear()) {
+		update();
+	}
+}
+
+bool OverlayWidget::copyRecognitionSelection() {
+	const auto text = _recognition.selectedText();
+	if (text.isEmpty()) {
+		return false;
+	}
+	TextUtilities::SetClipboardText(TextForMimeData::Simple(text));
+	showSaveMsgToastWith(
+		QString(),
+		{ tr::lng_text_copied(tr::now) },
+		1000);
+	return true;
+}
+
 void OverlayWidget::handleMouseMove(QPoint position) {
+	if (_speedBoostFromMouse && !_speedBoostActive) {
+		if (_speedBoostHoldTimer.isActive()) {
+			_speedBoostDragAccum = position.x();
+		}
+	} else if (_speedBoostActive && _speedBoostFromMouse) {
+		const auto delta = position.x() - _speedBoostDragAccum;
+		_speedBoostDragAccum = position.x();
+		const auto perUnit = float64(st::mediaviewSpeedBoostDragPerUnit);
+		if (perUnit > 0.) {
+			const auto speed = std::clamp(
+				_speedBoostSpeed + delta / perUnit,
+				kSpeedMin,
+				kSpeedMax);
+			if (_speedBoostSpeed != speed) {
+				_speedBoostSpeed = speed;
+				if (_streamed) {
+					_streamed->instance.setSpeed(speed);
+				}
+				updateSpeedBoost();
+			}
+		}
+	}
 	updateOver(position);
 	if (_lastAction.x() >= 0
 		&& ((position - _lastAction).manhattanLength()
 			>= st::mediaviewDeltaFromLastAction)) {
 		_lastAction = QPoint(-st::mediaviewDeltaFromLastAction, -st::mediaviewDeltaFromLastAction);
 	}
+	if (_recognition.selecting()) {
+		if (!_recognition.dragged()
+			&& ((position - _mStart).manhattanLength()
+				>= QApplication::startDragDistance())) {
+			_recognition.setDragged(true);
+		}
+		updateRecognitionSelection(position);
+		setCursor(style::cur_text);
+		return;
+	}
+	if (_recognitionResult.success
+		&& !_recognitionResult.items.empty()
+		&& _showRecognitionResults) {
+		if (scaledRecognitionRect(position)) {
+			setCursor(style::cur_text);
+		} else if (!_pressed) {
+			setCursor(style::cur_default);
+		}
+	}
 	if (_pressed) {
 		if (!_dragging
 			&& ((position - _mStart).manhattanLength()
@@ -5803,9 +7946,11 @@ void OverlayWidget::updateOverRect(Over state) {
 	case Over::Save: update(_saveNavOver); break;
 	case Over::Share: update(_shareNavOver); break;
 	case Over::Rotate: update(_rotateNavOver); break;
+	case Over::Draw: update(_drawNavOver); break;
 	case Over::Icon: update(_docIconRect); break;
 	case Over::Header: update(_headerNav); break;
 	case Over::More: update(_moreNavOver); break;
+	case Over::Recognize: update(_recognizeNavOver); break;
 	}
 }
 
@@ -5858,7 +8003,7 @@ void OverlayWidget::updateOver(QPoint pos) {
 		auto textState = _saveMsgText.getState(pos - _saveMsg.topLeft() - QPoint(st::mediaviewSaveMsgPadding.left(), st::mediaviewSaveMsgPadding.top()), _saveMsg.width() - st::mediaviewSaveMsgPadding.left() - st::mediaviewSaveMsgPadding.right());
 		lnk = textState.link;
 		lnkhost = this;
-	} else if (_captionRect.contains(pos)) {
+	} else if (_captionRect.contains(pos) && !_fullScreenVideo) {
 		auto request = Ui::Text::StateRequestElided();
 		const auto lineHeight = st::mediaviewCaptionStyle.font->height;
 		request.lines = _captionRect.height() / lineHeight;
@@ -5940,6 +8085,10 @@ void OverlayWidget::updateOver(QPoint pos) {
 		updateOverState(Over::Icon);
 	} else if (_moreNav.contains(pos)) {
 		updateOverState(Over::More);
+	} else if (_drawVisible && _drawNav.contains(pos)) {
+		updateOverState(Over::Draw);
+	} else if (_recognizeVisible && _recognizeNav.contains(pos)) {
+		updateOverState(Over::Recognize);
 	} else if (contentShown() && finalContentRect().contains(pos)) {
 		if (_stories) {
 			updateOverState(Over::Video);
@@ -5994,6 +8143,38 @@ void OverlayWidget::handleMouseRelease(
 		return;
 	}
 
+	if (_recognition.selecting()) {
+		_recognition.setSelecting(false);
+		if (_recognition.dragged()) {
+			_recognition.setDragged(false);
+			_over = _down = Over::None;
+			_pressed = false;
+			_dragging = 0;
+			return;
+		}
+		_recognition.setDragged(false);
+		clearRecognitionSelection();
+	}
+
+	if (_recognitionResult.success
+		&& !_dragging
+		&& !_recognitionResult.items.empty()
+		&& _showRecognitionResults
+		&& button == Qt::LeftButton) {
+		if (const auto result = scaledRecognitionRect(position)) {
+			TextUtilities::SetClipboardText(
+				TextForMimeData::Simple(result->text));
+			showSaveMsgToastWith(
+				QString(),
+				{ tr::lng_text_copied(tr::now) },
+				1000);
+			_over = _down = Over::None;
+			_pressed = false;
+			_dragging = 0;
+			return;
+		}
+	}
+
 	if (_over == Over::Name && _down == Over::Name) {
 		if (_from) {
 			if (!_windowed) {
@@ -6018,21 +8199,37 @@ void OverlayWidget::handleMouseRelease(
 		handleDocumentClick();
 	} else if (_over == Over::More && _down == Over::More) {
 		InvokeQueued(_widget, [=] { showDropdown(); });
-	} else if (_over == Over::Video && _down == Over::Video) {
+	} else if (_over == Over::Draw && _down == Over::Draw) {
+		draw();
+	} else if (_over == Over::Recognize && _down == Over::Recognize) {
+		recognize();
+	} else if (_down == Over::Video) {
 		if (_stories) {
 			_stories->contentPressed(false);
-		} else if (_streamed && !_window->mousePressCancelled()) {
-			if (_sponsoredButton && _session && _message) {
-				const auto sponsoredMessages = &_session->sponsoredMessages();
-				const auto fullId = _message->fullId();
-				const auto details = sponsoredMessages->lookupDetails(fullId);
-				if (const auto link = details.link; !link.isEmpty()) {
-					UrlClickHandler::Open(link);
-					sponsoredMessages->clicked(fullId, true, true);
-					hide();
-				}
+		} else {
+			_speedBoostHoldTimer.cancel();
+			if (_speedBoostActive && _speedBoostFromMouse) {
+				stopSpeedBoost();
 			} else {
-				playbackPauseResume();
+				_speedBoostFromMouse = false;
+				if (_over == Over::Video
+					&& _streamed
+					&& !_window->mousePressCancelled()) {
+					if (_sponsoredButton && _session && _message) {
+						const auto sponsoredMessages
+							= &_session->sponsoredMessages();
+						const auto fullId = _message->fullId();
+						const auto details = sponsoredMessages->lookupDetails(
+							fullId);
+						if (const auto link = details.link; !link.isEmpty()) {
+							UrlClickHandler::Open(link);
+							sponsoredMessages->clicked(fullId, true, true);
+							hide();
+						}
+					} else {
+						playbackPauseResume();
+					}
+				}
 			}
 		}
 	} else if (_pressed) {
@@ -6049,7 +8246,9 @@ void OverlayWidget::handleMouseRelease(
 			&& position.y() > st::mediaviewTitleButton.height
 			&& (position - _lastAction).manhattanLength()
 				>= st::mediaviewDeltaFromLastAction) {
-			if (_themePreviewShown) {
+			if (_recognition.hasSelection()) {
+				clearRecognitionSelection();
+			} else if (_themePreviewShown) {
 				if (!_themePreviewRect.contains(position)) {
 					close();
 				}
@@ -6119,8 +8318,8 @@ bool OverlayWidget::handleTouchEvent(not_null<QTouchEvent*> e) {
 		return false;
 	} else if (e->type() == QEvent::TouchBegin
 		&& !e->touchPoints().isEmpty()
-		&& _body->childAt(
-			_body->mapFromGlobal(
+		&& _widget->childAt(
+			_widget->mapFromGlobal(
 				e->touchPoints().cbegin()->screenPos().toPoint()))) {
 		return false;
 	}
@@ -6133,6 +8332,7 @@ bool OverlayWidget::handleTouchEvent(not_null<QTouchEvent*> e) {
 		_touchPress = true;
 		_touchMove = _touchRightButton = false;
 		_touchStart = e->touchPoints().cbegin()->screenPos().toPoint();
+		activateControls();
 	} break;
 
 	case QEvent::TouchUpdate: {
@@ -6142,13 +8342,14 @@ bool OverlayWidget::handleTouchEvent(not_null<QTouchEvent*> e) {
 		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
 			_touchMove = true;
 		}
+		activateControls();
 	} break;
 
 	case QEvent::TouchEnd: {
 		if (!_touchPress) {
 			break;
 		}
-		auto weak = Ui::MakeWeak(_widget);
+		auto weak = base::make_weak(_widget);
 		if (!_touchMove) {
 			const auto button = _touchRightButton
 				? Qt::RightButton
@@ -6179,6 +8380,7 @@ bool OverlayWidget::handleTouchEvent(not_null<QTouchEvent*> e) {
 		_touchTimer.cancel();
 	} break;
 	}
+	e->accept();
 	return true;
 }
 
@@ -6262,7 +8464,7 @@ void OverlayWidget::applyHideWindowWorkaround() {
 		raw->setGeometry(_window->rect());
 		raw->show();
 		raw->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (_hideWorkaround.get() == raw) {
 				_hideWorkaround.release();
 			}
@@ -6282,14 +8484,15 @@ void OverlayWidget::applyHideWindowWorkaround() {
 }
 
 Window::SessionController *OverlayWidget::findWindow(bool switchTo) const {
-	if (!_session) {
+	const auto session = _session ? _session : _storiesSession;
+	if (!session) {
 		return nullptr;
 	}
 
 	const auto window = _openedFrom.get();
 	if (window) {
 		if (const auto controller = window->sessionController()) {
-			if (&controller->session() == _session) {
+			if (&controller->session() == session) {
 				return controller;
 			}
 		}
@@ -6297,7 +8500,7 @@ Window::SessionController *OverlayWidget::findWindow(bool switchTo) const {
 
 	if (switchTo) {
 		auto controllerPtr = (Window::SessionController*)nullptr;
-		const auto account = not_null(&_session->account());
+		const auto account = not_null(&session->account());
 		const auto sessionWindow = Core::App().windowFor(account);
 		const auto anyWindow = (sessionWindow
 			&& &sessionWindow->account() == account)
@@ -6307,7 +8510,7 @@ Window::SessionController *OverlayWidget::findWindow(bool switchTo) const {
 			: sessionWindow;
 		if (anyWindow) {
 			anyWindow->invokeForSessionController(
-				&_session->account(),
+				&session->account(),
 				_history ? _history->peer.get() : nullptr,
 				[&](not_null<Window::SessionController*> newController) {
 					controllerPtr = newController;
@@ -6327,6 +8530,8 @@ void OverlayWidget::clearBeforeHide() {
 	_sharedMediaDataKey = std::nullopt;
 	_userPhotos = nullptr;
 	_userPhotosData = std::nullopt;
+	_instantViewMedia = nullptr;
+	_instantViewMediaData = std::nullopt;
 	_collage = nullptr;
 	_collageData = std::nullopt;
 	clearStreaming();
@@ -6338,6 +8543,16 @@ void OverlayWidget::clearBeforeHide() {
 	if (_menu) {
 		_menu->hideMenu(true);
 	}
+	_chapterText = QString();
+	_chapterRect = QRect();
+	_chapterAnimation.stop();
+	_chapterTimer.cancel();
+	_chapterArrows.clear();
+	_speedBoostActive = false;
+	_speedBoostFromMouse = false;
+	_speedBoostAnimation.stop();
+	_speedBoostHoldTimer.cancel();
+	_speedBoostTicker.stop();
 	_controlsHideTimer.cancel();
 	_controlsState = ControlsShown;
 	_controlsOpacity = anim::value(1);
@@ -6345,15 +8560,27 @@ void OverlayWidget::clearBeforeHide() {
 	_groupThumbs = nullptr;
 	_groupThumbsRect = QRect();
 	_sponsoredButton = nullptr;
+	_voteButton.destroy();
+	_pollVotersWidget.destroy();
+	_pollUpdateLifetime.destroy();
+	_showRecognitionResults = false;
 }
 
 void OverlayWidget::clearAfterHide() {
+	_recognitionResult = {};
+	_recognitionPendingSessionUniqueId = 0;
+	_recognitionPendingPhotoId = 0;
+	_recognitionPendingDocumentId = 0;
+	_recognitionRetryOnLarge = false;
+	clearRecognitionSelection();
 	_body->hide();
 	clearStreaming();
 	destroyThemePreview();
 	_radial.stop();
 	_staticContent = QImage();
 	_themePreview = nullptr;
+	_voteButton.destroyDelayed();
+	_pollVotersWidget.destroyDelayed();
 	_themeApply.destroyDelayed();
 	_themeCancel.destroyDelayed();
 	_themeShare.destroyDelayed();
@@ -6384,7 +8611,18 @@ void OverlayWidget::updateSaveMsg() {
 
 void OverlayWidget::findCurrent() {
 	using namespace rpl::mappers;
-	if (_sharedMediaData) {
+	if (_instantViewMediaData) {
+		const auto key = instantViewMediaKey();
+		const auto &items = *_instantViewMediaData;
+		const auto i = key
+			? ranges::find(items, *key)
+			: end(items);
+		_index = (i != end(items))
+			? std::make_optional(int(i - begin(items)))
+			: std::nullopt;
+		_fullIndex = _index;
+		_fullCount = items.size();
+	} else if (_sharedMediaData) {
 		_index = _message
 			? _sharedMediaData->indexOf(_message->fullId())
 			: _photo ? _sharedMediaData->indexOf(_photo) : std::nullopt;
@@ -6430,7 +8668,8 @@ void OverlayWidget::updateHeader() {
 		} else {
 			if (_user
 				&& (index == count - 1)
-				&& SyncUserFallbackPhotoViewer(_user)) {
+				&& _photo
+				&& SyncUserFallbackPhotoViewer(_user) == _photo->id) {
 				_headerText = tr::lng_mediaview_profile_public_photo(tr::now);
 			} else if (_user
 				&& _user->hasPersonalPhoto()
@@ -6454,7 +8693,13 @@ void OverlayWidget::updateHeader() {
 		} else if (_message) {
 			_headerText = tr::lng_mediaview_single_photo(tr::now);
 		} else if (_user) {
-			_headerText = tr::lng_mediaview_profile_photo(tr::now);
+			if (_user->hasPersonalPhoto()
+				&& _photo
+				&& (_photo->id == _user->userpicPhotoId())) {
+				_headerText = tr::lng_mediaview_profile_photo_by_you(tr::now);
+			} else {
+				_headerText = tr::lng_mediaview_profile_photo(tr::now);
+			}
 		} else if ((_history && _history->peer->isBroadcast())
 			|| (_peer && _peer->isChannel() && !_peer->isMegagroup())) {
 			_headerText = tr::lng_mediaview_channel_photo(tr::now);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 5114b169c7d1e4..1cfe931aea1b9f 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -16,17 +16,27 @@ For license and copyright information please follow this link:
 #include "data/data_user_photos.h"
 #include "data/data_web_page.h"
 #include "data/data_cloud_themes.h" // Data::CloudTheme.
+#include "media/stories/media_stories_delegate.h"
 #include "media/view/media_view_playback_controls.h"
 #include "media/view/media_view_open_common.h"
-#include "media/stories/media_stories_delegate.h"
+#include "media/view/media_view_recognition_selection.h"
+#include "media/media_common.h"
+#include "media/system_media_controls_video.h"
+#include "platform/platform_text_recognition.h"
 
 class History;
+struct PollAnswer;
 
 namespace anim {
 enum class activation : uchar;
 } // namespace anim
 
+namespace Calls {
+class GroupCall;
+} // namespace Calls
+
 namespace Data {
+class GroupCall;
 class PhotoMedia;
 class DocumentMedia;
 struct StoriesContext;
@@ -77,17 +87,22 @@ struct ContentLayout;
 
 namespace Media::View {
 
+class VideoStream;
+class PlaybackSponsored;
 class GroupThumbs;
 class Pip;
 
 class OverlayWidget final
 	: public ClickHandlerHost
 	, private PlaybackControls::Delegate
-	, private Stories::Delegate {
+	, private Stories::Delegate
+	, private Media::SystemMediaControlsVideoDelegate {
 public:
 	OverlayWidget();
 	~OverlayWidget();
 
+	void setSystemMediaControls(SystemMediaControlsVideoSink *sink);
+
 	enum class TouchBarItemType {
 		Photo,
 		Video,
@@ -107,15 +122,6 @@ class OverlayWidget final
 
 	void show(OpenRequest request);
 
-	//void leaveToChildEvent(QEvent *e, QWidget *child) override {
-	//	// e -- from enterEvent() of child TWidget
-	//	updateOverState(Over::None);
-	//}
-	//void enterFromChildEvent(QEvent *e, QWidget *child) override {
-	//	// e -- from leaveEvent() of child TWidget
-	//	updateOver(mapFromGlobal(QCursor::pos()));
-	//}
-
 	void activateControls();
 	void close();
 	void minimize();
@@ -138,9 +144,11 @@ class OverlayWidget final
 	struct PipWrap;
 	struct ItemContext;
 	struct StoriesContext;
+	struct InstantViewMedia;
 	class Renderer;
 	class RendererSW;
 	class RendererGL;
+	class RendererRhi;
 	class SponsoredButton;
 
 	// If changing, see paintControls()!
@@ -158,6 +166,8 @@ class OverlayWidget final
 		Share,
 		Rotate,
 		More,
+		Draw,
+		Recognize,
 		Icon,
 		Video,
 		Caption,
@@ -169,7 +179,10 @@ class OverlayWidget final
 			not_null<DocumentData*>> data;
 		HistoryItem *item = nullptr;
 		MsgId topicRootId = 0;
+		PeerId monoforumPeerId = 0;
 	};
+	using InstantViewItem = std::variant<PhotoData*, DocumentData*>;
+	using InstantViewItems = std::vector<InstantViewItem>;
 	enum class SavePhotoVideo {
 		None,
 		QuickSave,
@@ -218,7 +231,10 @@ class OverlayWidget final
 	bool handleDoubleClick(QPoint position, Qt::MouseButton button);
 	bool handleTouchEvent(not_null<QTouchEvent*> e);
 	void handleWheelEvent(not_null<QWheelEvent*> e);
+	bool handleNativeGesture(not_null<QNativeGestureEvent*> e);
+	void setupSwipeNavigation();
 	void handleKeyPress(not_null<QKeyEvent*> e);
+	void handleKeyRelease(not_null<QKeyEvent*> e);
 
 	void toggleApplicationEventFilter(bool install);
 	bool filterApplicationEvent(
@@ -236,10 +252,22 @@ class OverlayWidget final
 	void playbackControlsVolumeChangeFinished() override;
 	void playbackControlsSpeedChanged(float64 speed) override;
 	float64 playbackControlsCurrentSpeed(bool lastNonDefault) override;
+	std::vector<VideoQuality> playbackControlsQualities() override;
+	VideoQuality playbackControlsCurrentQuality() override;
+	void playbackControlsQualityChanged(VideoQuality quality) override;
 	void playbackControlsToFullScreen() override;
 	void playbackControlsFromFullScreen() override;
 	void playbackControlsToPictureInPicture() override;
 	void playbackControlsRotate() override;
+
+	void smtcPlay() override;
+	void smtcPause() override;
+	void smtcPlayPause() override;
+	void smtcStop() override;
+	void smtcNext() override;
+	void smtcPrevious() override;
+	void smtcSeek(crl::time position) override;
+
 	void playbackPauseResume();
 	void playbackToggleFullScreen();
 	void playbackPauseOnCall();
@@ -281,16 +309,29 @@ class OverlayWidget final
 	void deleteMedia();
 	void showMediaOverview();
 	void copyMedia();
+	void recognize();
+	void draw();
 	void receiveMouse();
 	void showAttachedStickers();
+
+	[[nodiscard]] auto scaledRecognitionRect(QPoint position)
+	const -> std::optional<Platform::TextRecognition::RectWithText>;
+	void updateRecognitionSelection(QPoint position);
+	void clearRecognitionSelection();
+	bool copyRecognitionSelection();
 	void showDropdown();
 	void handleTouchTimer();
 	void handleDocumentClick();
 
+	[[nodiscard]] bool canShareAtTime() const;
+	[[nodiscard]] TimeId shareAtVideoTimestamp() const;
+	void shareAtTime();
+
 	void showSaveMsgToast(const QString &path, auto phrase);
 	void showSaveMsgToastWith(
 		const QString &path,
-		const TextWithEntities &text);
+		const TextWithEntities &text,
+		crl::time duration = 0);
 	void updateSaveMsg();
 
 	void clearBeforeHide();
@@ -298,6 +339,7 @@ class OverlayWidget final
 
 	void assignMediaPointer(DocumentData *document);
 	void assignMediaPointer(not_null<PhotoData*> photo);
+	void assignMediaPointer(std::shared_ptr<Data::GroupCall> call);
 
 	void updateOver(QPoint mpos);
 	void initFullScreen();
@@ -315,11 +357,13 @@ class OverlayWidget final
 	void checkForSaveLoaded();
 	void showPremiumDownloadPromo();
 
-	Entity entityForUserPhotos(int index) const;
-	Entity entityForSharedMedia(int index) const;
-	Entity entityForCollage(int index) const;
-	Entity entityByIndex(int index) const;
-	Entity entityForItemId(const FullMsgId &itemId) const;
+	[[nodiscard]] std::optional<InstantViewItem> instantViewMediaKey() const;
+	[[nodiscard]] Entity entityForUserPhotos(int index) const;
+	[[nodiscard]] Entity entityForInstantViewMedia(int index) const;
+	[[nodiscard]] Entity entityForSharedMedia(int index) const;
+	[[nodiscard]] Entity entityForCollage(int index) const;
+	[[nodiscard]] Entity entityByIndex(int index) const;
+	[[nodiscard]] Entity entityForItemId(const FullMsgId &itemId) const;
 	bool moveToEntity(const Entity &entity, int preloadDelta = 0);
 
 	void setContext(std::variant<
@@ -335,23 +379,26 @@ class OverlayWidget final
 	struct SharedMedia;
 	using SharedMediaType = SharedMediaWithLastSlice::Type;
 	using SharedMediaKey = SharedMediaWithLastSlice::Key;
-	std::optional<SharedMediaType> sharedMediaType() const;
-	std::optional<SharedMediaKey> sharedMediaKey() const;
-	std::optional<SharedMediaType> computeOverviewType() const;
+	[[nodiscard]] std::optional<SharedMediaType> sharedMediaType() const;
+	[[nodiscard]] std::optional<SharedMediaKey> sharedMediaKey() const;
+	[[nodiscard]] std::optional<SharedMediaType> computeOverviewType() const;
 	bool validSharedMedia() const;
 	void validateSharedMedia();
 	void handleSharedMediaUpdate(SharedMediaWithLastSlice &&update);
 
 	struct UserPhotos;
 	using UserPhotosKey = UserPhotosSlice::Key;
-	std::optional<UserPhotosKey> userPhotosKey() const;
+	[[nodiscard]] std::optional<UserPhotosKey> userPhotosKey() const;
 	bool validUserPhotos() const;
 	void validateUserPhotos();
 	void handleUserPhotosUpdate(UserPhotosSlice &&update);
 
+	bool validInstantViewMedia() const;
+	void validateInstantViewMedia();
+
 	struct Collage;
 	using CollageKey = WebPageCollage::Item;
-	std::optional<CollageKey> collageKey() const;
+	[[nodiscard]] std::optional<CollageKey> collageKey() const;
 	bool validCollage() const;
 	void validateCollage();
 
@@ -360,6 +407,9 @@ class OverlayWidget final
 
 	void refreshFromLabel();
 	void refreshCaption();
+	void refreshTimestampDividers(
+		const TextWithEntities &caption,
+		TimeId duration);
 	void refreshMediaViewer();
 	void refreshNavVisibility();
 	void refreshGroupThumbs();
@@ -384,6 +434,9 @@ class OverlayWidget final
 		anim::activation activation = anim::activation::normal,
 		const Data::CloudTheme &cloud = Data::CloudTheme(),
 		const StartStreaming &startStreaming = StartStreaming());
+	void displayVideoStream(
+		const std::shared_ptr<Data::GroupCall> &call,
+		anim::activation activation = anim::activation::normal);
 	void displayFinished(anim::activation activation);
 	void redisplayContent();
 	void findCurrent();
@@ -392,9 +445,13 @@ class OverlayWidget final
 	void setZoomLevel(int newZoom, bool force = false);
 
 	void updatePlaybackState();
+	void refreshSystemMediaControls();
+	void finishSystemMediaControls();
+	[[nodiscard]] QImage systemMediaControlsThumbnail() const;
 	void seekRelativeTime(crl::time time);
 	void restartAtProgress(float64 progress);
 	void restartAtSeekPosition(crl::time position);
+	void flushPendingFrameStep();
 
 	void refreshClipControllerGeometry();
 	void refreshCaptionGeometry();
@@ -403,6 +460,7 @@ class OverlayWidget final
 		const StartStreaming &startStreaming = StartStreaming());
 	void startStreamingPlayer(const StartStreaming &startStreaming);
 	void initStreamingThumbnail();
+	void markStreamedReady();
 	void streamingReady(Streaming::Information &&info);
 	[[nodiscard]] bool createStreamingObjects();
 	void handleStreamingUpdate(Streaming::Update &&update);
@@ -417,6 +475,12 @@ class OverlayWidget final
 	void refreshSponsoredButtonGeometry();
 	void refreshSponsoredButtonWidth();
 
+	void refreshVoteButton();
+	void refreshVoteButtonGeometry();
+	void refreshPollVotersWidget();
+	void refreshPollVotersWidgetGeometry();
+	[[nodiscard]] const PollAnswer *currentPollAnswer() const;
+
 	void documentUpdated(not_null<DocumentData*> document);
 	void changingMsgId(FullMsgId newId, MsgId oldId);
 
@@ -430,11 +494,11 @@ class OverlayWidget final
 	void contentSizeChanged();
 
 	// Radial animation interface.
-	float64 radialProgress() const;
-	bool radialLoading() const;
-	QRect radialRect() const;
+	[[nodiscard]] float64 radialProgress() const;
+	[[nodiscard]] bool radialLoading() const;
+	[[nodiscard]] QRect radialRect() const;
 	void radialStart();
-	crl::time radialTimeShift() const;
+	[[nodiscard]] crl::time radialTimeShift() const;
 
 	void updateHeader();
 	void snapXY();
@@ -487,6 +551,18 @@ class OverlayWidget final
 		bool nonbright = false) const;
 	[[nodiscard]] bool isSaveMsgShown() const;
 
+	void showChapterIndicator(const QString &name, int direction);
+	void paintChapterContent(Painter &p, QRect outer, QRect clip);
+	[[nodiscard]] bool isChapterShown() const;
+	void updateChapter();
+
+	void startSpeedBoost();
+	void stopSpeedBoost();
+	void updateSpeedBoostRect();
+	void paintSpeedBoostContent(Painter &p, QRect outer, QRect clip);
+	[[nodiscard]] bool isSpeedBoostShown() const;
+	void updateSpeedBoost();
+
 	void updateOverRect(Over state);
 	bool updateOverState(Over newState);
 	float64 overLevel(Over control) const;
@@ -496,6 +572,7 @@ class OverlayWidget final
 
 	void validatePhotoImage(Image *image, bool blurred);
 	void validatePhotoCurrentImage();
+	void tryStartTextRecognition();
 
 	[[nodiscard]] bool hasCopyMediaRestriction(
 		bool skipPremiumCheck = false) const;
@@ -524,6 +601,7 @@ class OverlayWidget final
 	void clearStreaming(bool savePosition = true);
 	[[nodiscard]] bool canInitStreaming() const;
 	[[nodiscard]] bool saveControlLocked() const;
+	void applyVideoQuality(VideoQuality value);
 
 	[[nodiscard]] bool topShadowOnTheRight() const;
 	void applyHideWindowWorkaround();
@@ -551,9 +629,13 @@ class OverlayWidget final
 	rpl::lifetime _sessionLifetime;
 	PhotoData *_photo = nullptr;
 	DocumentData *_document = nullptr;
+	DocumentData *_chosenQuality = nullptr;
+	PhotoData *_videoCover = nullptr;
+	Media::VideoQuality _quality;
 	QString _documentLoadingTo;
 	std::shared_ptr<Data::PhotoMedia> _photoMedia;
 	std::shared_ptr<Data::DocumentMedia> _documentMedia;
+	std::shared_ptr<Data::PhotoMedia> _videoCoverMedia;
 	base::flat_set<std::shared_ptr<Data::PhotoMedia>> _preloadPhotos;
 	base::flat_set<std::shared_ptr<Data::DocumentMedia>> _preloadDocuments;
 	int _rotation = 0;
@@ -562,14 +644,18 @@ class OverlayWidget final
 	std::optional<SharedMediaWithLastSlice::Key> _sharedMediaDataKey;
 	std::unique_ptr<UserPhotos> _userPhotos;
 	std::optional<UserPhotosSlice> _userPhotosData;
+	std::unique_ptr<InstantViewMedia> _instantViewMedia;
+	std::optional<InstantViewItems> _instantViewMediaData;
 	std::unique_ptr<Collage> _collage;
 	std::optional<WebPageCollage> _collageData;
 
 	QRect _leftNav, _leftNavOver, _leftNavIcon;
 	QRect _rightNav, _rightNavOver, _rightNavIcon;
-	QRect _headerNav, _nameNav, _dateNav;
+	QRect _headerNav, _nameNav, _dateNav, _separatorNav;
 	QRect _rotateNav, _rotateNavOver, _rotateNavIcon;
 	QRect _shareNav, _shareNavOver, _shareNavIcon;
+	QRect _drawNav, _drawNavOver, _drawNavIcon;
+	QRect _recognizeNav, _recognizeNavOver, _recognizeNavIcon;
 	QRect _saveNav, _saveNavOver, _saveNavIcon;
 	QRect _moreNav, _moreNavOver, _moreNavIcon;
 	bool _leftNavVisible = false;
@@ -577,6 +663,9 @@ class OverlayWidget final
 	bool _saveVisible = false;
 	bool _shareVisible = false;
 	bool _rotateVisible = false;
+	bool _drawButtonEnabled = true;
+	bool _drawVisible = false;
+	bool _recognizeVisible = false;
 	bool _headerHasLink = false;
 	QString _dateText;
 	QString _headerText;
@@ -592,6 +681,8 @@ class OverlayWidget final
 	int _groupThumbsLeft = 0;
 	int _groupThumbsTop = 0;
 	Ui::Text::String _caption;
+	Ui::Text::QuotePaintCache _captionPreCache;
+	Ui::Text::QuotePaintCache _captionBlockquoteCache;
 	QRect _captionRect;
 	ClickHandlerPtr _captionExpandLink;
 	int _captionShowMoreWidth = 0;
@@ -625,9 +716,17 @@ class OverlayWidget final
 
 	std::unique_ptr<Streamed> _streamed;
 	std::unique_ptr<PipWrap> _pip;
+	QImage _streamedQualityChangeFrame;
+	crl::time _streamedPosition = 0;
+	SystemMediaControlsVideoSink *_smtcSink = nullptr;
+	DocumentData *_smtcDocument = nullptr;
+	bool _smtcThumbnailSet = false;
 	int _streamedCreated = 0;
+	bool _streamedQualityChangeFinished = false;
 	bool _showAsPip = false;
 
+	Qt::Orientations _flip;
+
 	std::unique_ptr<Stories::View> _stories;
 	std::shared_ptr<Show> _cachedShow;
 	rpl::event_stream<> _storiesChanged;
@@ -635,6 +734,10 @@ class OverlayWidget final
 	rpl::event_stream<ChatHelpers::FileChosen> _storiesStickerOrEmojiChosen;
 	std::unique_ptr<Ui::LayerManager> _layerBg;
 
+	std::unique_ptr<VideoStream> _videoStream;
+	QString _callLinkSlug;
+	MsgId _callJoinMessageId;
+
 	const style::icon *_docIcon = nullptr;
 	style::color _docIconColor;
 	QString _docName, _docSize, _docExt;
@@ -656,6 +759,7 @@ class OverlayWidget final
 	History *_migrated = nullptr;
 	History *_history = nullptr; // if conversation photos or files overview
 	MsgId _topicRootId = 0;
+	PeerId _monoforumPeerId = 0;
 	PeerData *_peer = nullptr;
 	UserData *_user = nullptr; // if user profile photos overview
 
@@ -700,9 +804,14 @@ class OverlayWidget final
 	base::Timer _dropdownShowTimer;
 
 	base::unique_qptr<SponsoredButton> _sponsoredButton;
+	object_ptr<Ui::RoundButton> _voteButton = { nullptr };
+	object_ptr<Ui::RpWidget> _pollVotersWidget = { nullptr };
+	rpl::lifetime _pollUpdateLifetime;
 
 	bool _receiveMouse = true;
 	bool _processingKeyPress = false;
+	bool _clickHandlerActive = false;
+	bool _clickHandlerPressed = false;
 
 	bool _touchPress = false;
 	bool _touchMove = false;
@@ -718,6 +827,30 @@ class OverlayWidget final
 	Ui::Animations::Simple _saveMsgAnimation;
 	base::Timer _saveMsgTimer;
 
+	QString _chapterText;
+	QRect _chapterRect;
+	Ui::Animations::Simple _chapterAnimation;
+	base::Timer _chapterTimer;
+	struct ChapterArrow {
+		Ui::Animations::Simple animation;
+		int direction = 0;
+	};
+	std::vector<std::unique_ptr<ChapterArrow>> _chapterArrows;
+
+	bool _speedBoostActive = false;
+	bool _speedBoostFromMouse = false;
+	float64 _speedBoostSavedSpeed = 1.;
+	float64 _speedBoostSpeed = 2.;
+	float64 _speedBoostDragAccum = 0.;
+	QRect _speedBoostRect;
+	Ui::Animations::Simple _speedBoostAnimation;
+	base::Timer _speedBoostHoldTimer;
+	base::Timer _frameStepThrottle;
+	int _frameStepPending = 0;
+	Ui::Animations::Basic _speedBoostTicker;
+	float64 _speedBoostPhase = 0.;
+	crl::time _speedBoostLastFrame = 0;
+
 	base::flat_map<Over, crl::time> _animations;
 	base::flat_map<Over, anim::value> _animationOpacities;
 
@@ -726,6 +859,18 @@ class OverlayWidget final
 	rpl::event_stream<bool> _touchbarFullscreenToggled;
 
 	int _verticalWheelDelta = 0;
+	float64 _pinchZoomAccumulated = 0.;
+	bool _zoomAtLimit = false;
+	bool _swipeNavigating = false;
+
+	Platform::TextRecognition::Result _recognitionResult;
+	uint64 _recognitionPendingSessionUniqueId = 0;
+	PhotoId _recognitionPendingPhotoId = 0;
+	DocumentId _recognitionPendingDocumentId = 0;
+	bool _recognitionRetryOnLarge = false;
+	bool _showRecognitionResults = false;
+	Ui::Animations::Simple _recognitionAnimation;
+	RecognitionSelection _recognition;
 
 	bool _themePreviewShown = false;
 	uint64 _themePreviewId = 0;
diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
index cf9ea707998f86..0a01b546193d6c 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 #include "media/view/media_view_playback_progress.h"
 #include "media/view/media_view_pip_opengl.h"
 #include "media/view/media_view_pip_raster.h"
+#include "media/view/media_view_pip_rhi.h"
 #include "media/audio/media_audio.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
@@ -31,6 +32,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/shadow.h"
 #include "ui/text/format_values.h"
 #include "ui/gl/gl_surface.h"
+#include "ui/gl/gl_detection.h"
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "window/window_controller.h"
@@ -330,11 +332,20 @@ QImage RotateFrameImage(QImage image, int rotation) {
 	return image.transformed(transform);
 }
 
+const style::Shadow &PipShadow() {
+	return st::mediaviewPipShadow;
+}
+
 PipPanel::PipPanel(
 	QWidget *parent,
 	Fn<Ui::GL::ChosenRenderer(Ui::GL::Capabilities)> renderer)
-: _content(Ui::GL::CreateSurface(std::move(renderer)))
+: _window(std::make_unique<Ui::RpWidget>(nullptr))
 , _parent(parent) {
+	auto chosen = std::move(renderer)(
+		Ui::GL::CheckCapabilities(nullptr));
+	_content = Ui::GL::CreateSurface(
+		_window.get(),
+		std::move(chosen));
 }
 
 void PipPanel::init() {
@@ -352,6 +363,12 @@ void PipPanel::init() {
 	widget()->resize(0, 0);
 	widget()->hide();
 
+	_content->rpWidget()->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_window->sizeValue(
+	) | rpl::on_next([=](QSize size) {
+		_content->rpWidget()->setGeometry(QRect(QPoint(), size));
+	}, _window->lifetime());
+
 	rpl::merge(
 		rp()->shownValue() | rpl::to_empty,
 		rp()->paintRequest() | rpl::to_empty
@@ -359,30 +376,35 @@ void PipPanel::init() {
 		return widget()->windowHandle()
 			&& widget()->windowHandle()->isExposed();
 	}) | rpl::distinct_until_changed(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		// Workaround Qt's forced transient parent.
 		Ui::Platform::ClearTransientParent(widget());
 	}, rp()->lifetime());
 
+	rp()->shownValue(
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
+		Ui::Platform::SetWindowMargins(widget(), _padding);
+	}, rp()->lifetime());
+
 	rp()->screenValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](not_null<QScreen*> screen) {
+	) | rpl::skip(1) | rpl::on_next([=](not_null<QScreen*> screen) {
 		handleScreenChanged(screen);
 	}, rp()->lifetime());
 
 	if (Platform::IsWayland()) {
 		rp()->sizeValue(
-		) | rpl::skip(1) | rpl::start_with_next([=](QSize size) {
+		) | rpl::skip(1) | rpl::on_next([=](QSize size) {
 			handleWaylandResize(size);
 		}, rp()->lifetime());
 	}
 }
 
 not_null<QWidget*> PipPanel::widget() const {
-	return _content->rpWidget();
+	return _window.get();
 }
 
 not_null<Ui::RpWidgetWrap*> PipPanel::rp() const {
-	return _content.get();
+	return _window.get();
 }
 
 void PipPanel::setAspectRatio(QSize ratio) {
@@ -574,7 +596,7 @@ void PipPanel::setPositionOnScreen(Position position, QRect available) {
 }
 
 void PipPanel::update() {
-	widget()->update();
+	_content->rpWidget()->update();
 }
 
 void PipPanel::setGeometry(QRect geometry) {
@@ -863,7 +885,7 @@ void PipPanel::updateDecorations() {
 	});
 	const auto position = countPosition();
 	const auto use = Ui::Platform::TranslucentWindowsSupported();
-	const auto full = use ? st::callShadow.extend : style::margins();
+	const auto full = use ? PipShadow().extend : style::margins();
 	const auto padding = style::margins(
 		(position.attached & RectPart::Left) ? 0 : full.left(),
 		(position.attached & RectPart::Top) ? 0 : full.top(),
@@ -878,6 +900,9 @@ void PipPanel::updateDecorations() {
 	_padding = padding;
 	_useTransparency = use;
 	widget()->setAttribute(Qt::WA_OpaquePaintEvent, !_useTransparency);
+	if (widget()->windowHandle()) {
+		Ui::Platform::SetWindowMargins(widget(), _padding);
+	}
 	setGeometry(newGeometry);
 	update();
 }
@@ -885,18 +910,30 @@ void PipPanel::updateDecorations() {
 Pip::Pip(
 	not_null<Delegate*> delegate,
 	not_null<DocumentData*> data,
+	Data::FileOrigin origin,
+	not_null<DocumentData*> chosenQuality,
+	HistoryItem *context,
+	VideoQuality quality,
 	std::shared_ptr<Streaming::Document> shared,
 	FnMut<void()> closeAndContinue,
 	FnMut<void()> destroy)
 : _delegate(delegate)
 , _data(data)
-, _instance(std::move(shared), [=] { waitingAnimationCallback(); })
+, _origin(origin)
+, _chosenQuality(chosenQuality)
+, _context(context)
+, _quality(quality)
+, _instance(
+	std::in_place,
+	std::move(shared),
+	[=] { waitingAnimationCallback(); })
 , _panel(
 	_delegate->pipParentWidget(),
 	[=](Ui::GL::Capabilities capabilities) {
 		return chooseRenderer(capabilities);
 	})
 , _playbackProgress(std::make_unique<PlaybackProgress>())
+, _dataMedia(_data->createMediaView())
 , _rotation(data->owner().mediaRotation().get(data))
 , _lastPositiveVolume((Core::App().settings().videoVolume() > 0.)
 	? Core::App().settings().videoVolume()
@@ -908,18 +945,31 @@ Pip::Pip(
 	setupStreaming();
 
 	_data->session().account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_destroy();
 	}, _panel.rp()->lifetime());
+
+	if (_context) {
+		_data->owner().itemRemoved(
+		) | rpl::on_next([=](not_null<const HistoryItem*> data) {
+			if (_context != data) {
+				_context = nullptr;
+			}
+		}, _panel.rp()->lifetime());
+	}
 }
 
 Pip::~Pip() = default;
 
+std::shared_ptr<Streaming::Document> Pip::shared() const {
+	return _instance->shared();
+}
+
 void Pip::setupPanel() {
 	_panel.init();
 	const auto size = [&] {
-		if (!_instance.info().video.size.isEmpty()) {
-			return _instance.info().video.size;
+		if (!_instance->info().video.size.isEmpty()) {
+			return _instance->info().video.size;
 		}
 		const auto media = _data->activeMediaView();
 		if (media) {
@@ -934,12 +984,12 @@ void Pip::setupPanel() {
 	_panel.widget()->show();
 
 	_panel.saveGeometryRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		saveGeometry();
 	}, _panel.rp()->lifetime());
 
 	_panel.rp()->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		const auto mousePosition = [&] {
 			return static_cast<QMouseEvent*>(e.get())->pos();
 		};
@@ -976,7 +1026,7 @@ void Pip::handleLeave() {
 }
 
 void Pip::handleMouseMove(QPoint position) {
-	const auto weak = Ui::MakeWeak(_panel.widget());
+	const auto weak = base::make_weak(_panel.widget());
 	const auto guard = gsl::finally([&] {
 		if (weak) {
 			_panel.handleMouseMove(position);
@@ -1032,7 +1082,7 @@ void Pip::updateActiveState(OverState wasShown) {
 		const auto nowIsShown = (shownActiveState() == shownState);
 		if ((wasShown == shownState) != nowIsShown) {
 			button.active.start(
-				[=, &button] { _panel.widget()->update(button.icon); },
+				[=] { _panel.update(); },
 				nowIsShown ? 0. : 1.,
 				nowIsShown ? 1. : 0.,
 				st::fadeWrapDuration,
@@ -1054,7 +1104,7 @@ Pip::OverState Pip::ResolveShownOver(OverState state) {
 }
 
 void Pip::handleMousePress(QPoint position, Qt::MouseButton button) {
-	const auto weak = Ui::MakeWeak(_panel.widget());
+	const auto weak = base::make_weak(_panel.widget());
 	const auto guard = gsl::finally([&] {
 		if (weak) {
 			_panel.handleMousePress(position, button);
@@ -1072,7 +1122,7 @@ void Pip::handleMousePress(QPoint position, Qt::MouseButton button) {
 }
 
 void Pip::handleMouseRelease(QPoint position, Qt::MouseButton button) {
-	const auto weak = Ui::MakeWeak(_panel.widget());
+	const auto weak = base::make_weak(_panel.widget());
 	const auto guard = gsl::finally([&] {
 		if (weak) {
 			_panel.handleMouseRelease(position, button);
@@ -1138,8 +1188,8 @@ void Pip::seekProgress(float64 value) {
 		_lastDurationMs);
 	if (_seekPositionMs != positionMs) {
 		_seekPositionMs = positionMs;
-		if (!_instance.player().paused()
-			&& !_instance.player().finished()) {
+		if (!_instance->player().paused()
+			&& !_instance->player().finished()) {
 			_pausedBySeek = true;
 			playbackPauseResume();
 		}
@@ -1157,7 +1207,7 @@ void Pip::seekFinish(float64 value) {
 		crl::time(0),
 		_lastDurationMs);
 	_seekPositionMs = -1;
-	_startPaused = !_pausedBySeek && !_instance.player().finished();
+	_startPaused = !_pausedBySeek && !_instance->player().finished();
 	restartAtSeekPosition(positionMs);
 }
 
@@ -1197,7 +1247,7 @@ void Pip::setupButtons() {
 	_panel.rp()->sizeValue(
 	) | rpl::map([=] {
 		return _panel.inner();
-	}) | rpl::start_with_next([=](QRect rect) {
+	}) | rpl::on_next([=](QRect rect) {
 		const auto skip = st::pipControlSkip;
 		_close.area = QRect(
 			rect.x(),
@@ -1234,7 +1284,8 @@ void Pip::setupButtons() {
 			rect.y(),
 			volumeToggleWidth,
 			volumeToggleHeight);
-		if (!Ui::Platform::TitleControlsOnLeft()) {
+		using Ui::Platform::TitleControlsLayout;
+		if (!TitleControlsLayout::Instance()->current().onLeft()) {
 			_close.area.moveLeft(rect.x()
 				+ rect.width()
 				- (_close.area.x() - rect.x())
@@ -1277,7 +1328,7 @@ void Pip::setupButtons() {
 	_playbackProgress->setValueChangedCallback([=](
 			float64 value,
 			float64 receivedTill) {
-		_panel.widget()->update(_playback.area);
+		_panel.update();
 	});
 }
 
@@ -1294,20 +1345,83 @@ void Pip::updatePlayPauseResumeState(const Player::TrackState &state) {
 }
 
 void Pip::setupStreaming() {
-	_instance.setPriority(kPipLoaderPriority);
-	_instance.lockPlayer();
-
-	_instance.player().updates(
-	) | rpl::start_with_next_error([=](Streaming::Update &&update) {
+	_instance->setPriority(kPipLoaderPriority);
+	_instance->lockPlayer();
+
+	_instance->switchQualityRequests(
+	) | rpl::filter([=](int quality) {
+		return !_quality.manual && _quality.height != quality;
+	}) | rpl::on_next([=](int quality) {
+		applyVideoQuality({
+			.manual = 0,
+			.height = uint32(quality),
+		});
+	}, _instance->lifetime());
+
+	_instance->player().updates(
+	) | rpl::on_next_error([=](Streaming::Update &&update) {
 		handleStreamingUpdate(std::move(update));
 	}, [=](Streaming::Error &&error) {
 		handleStreamingError(std::move(error));
-	}, _instance.lifetime());
+	}, _instance->lifetime());
 	updatePlaybackState();
 }
 
+void Pip::applyVideoQuality(VideoQuality value) {
+	if (_quality == value
+		|| !_dataMedia->canBePlayed()) {
+		return;
+	}
+	const auto resolved = _data->chooseQuality(_context, value);
+	if (_chosenQuality == resolved) {
+		return;
+	}
+	auto instance = Streaming::Instance(
+		resolved,
+		_data,
+		_context,
+		_origin,
+		[=] { waitingAnimationCallback(); });
+	if (!instance.valid()) {
+		return;
+	}
+
+	if (_instance->ready()) {
+		_qualityChangeFrame = currentVideoFrameImage();
+	}
+	if (!_instance->player().active()
+		|| _instance->player().finished()) {
+		_qualityChangeFinished = true;
+	}
+	_startPaused = _qualityChangeFinished || _instance->player().paused();
+
+	_quality = value;
+	Core::App().settings().setVideoQuality(value);
+	Core::App().saveSettingsDelayed();
+	_chosenQuality = resolved;
+	_instance.emplace(std::move(instance));
+	setupStreaming();
+	restartAtSeekPosition(_lastUpdatePosition);
+}
+
+QImage Pip::currentVideoFrameImage() const {
+	return _instance->player().ready()
+		? _instance->player().currentFrameImage()
+		: _instance->info().video.cover;
+}
+
 Ui::GL::ChosenRenderer Pip::chooseRenderer(
 		Ui::GL::Capabilities capabilities) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (Ui::GL::WidgetsRhiSupported()) {
+		LOG(("Renderer: [QRhi] (PipPanel)"));
+		_opengl = true;
+		return {
+			.renderer = std::make_unique<RendererRhi>(this),
+			.backend = Ui::GL::Backend::QRhi,
+		};
+	}
+#endif // Qt >= 6.8
 	const auto use = Platform::IsMac()
 		? true
 		: capabilities.transparency;
@@ -1336,12 +1450,12 @@ void Pip::paint(not_null<Renderer*> renderer) const {
 		.fade = controlsShown,
 		.outer = _panel.widget()->size(),
 		.rotation = _rotation,
-		.videoRotation = _instance.info().video.rotation,
+		.videoRotation = _instance->info().video.rotation,
 		.useTransparency = _panel.useTransparency(),
 	};
 	if (canUseVideoFrame()) {
 		renderer->paintTransformedVideoFrame(geometry);
-		_instance.markFrameShown();
+		_instance->markFrameShown();
 	} else {
 		const auto content = staticContent();
 		if (_preparedCoverState == ThumbState::Cover) {
@@ -1349,7 +1463,7 @@ void Pip::paint(not_null<Renderer*> renderer) const {
 		}
 		renderer->paintTransformedStaticContent(content, geometry);
 	}
-	if (_instance.waitingShown()) {
+	if (_instance->waitingShown()) {
 		renderer->paintRadialLoading(countRadialRect(), controlsShown);
 	}
 	if (controlsShown > 0) {
@@ -1532,28 +1646,31 @@ void Pip::paintVolumeControllerContent(
 void Pip::handleStreamingUpdate(Streaming::Update &&update) {
 	using namespace Streaming;
 
-	v::match(update.data, [&](Information &update) {
+	v::match(update.data, [&](const Information &update) {
 		_panel.setAspectRatio(
 			FlipSizeByRotation(update.video.size, _rotation));
-	}, [&](const PreloadedVideo &update) {
+		_qualityChangeFrame = QImage();
+	}, [&](PreloadedVideo) {
 		updatePlaybackState();
-	}, [&](const UpdateVideo &update) {
+	}, [&](UpdateVideo update) {
 		_panel.update();
 		Core::App().updateNonIdle();
 		updatePlaybackState();
-	}, [&](const PreloadedAudio &update) {
+		_lastUpdatePosition = update.position;
+	}, [&](PreloadedAudio) {
 		updatePlaybackState();
-	}, [&](const UpdateAudio &update) {
+	}, [&](UpdateAudio) {
 		updatePlaybackState();
-	}, [&](WaitingForData) {
-	}, [&](MutedByOther) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
 	}, [&](Finished) {
 		updatePlaybackState();
 	});
 }
 
 void Pip::updatePlaybackState() {
-	const auto state = _instance.player().prepareLegacyState();
+	const auto state = _instance->player().prepareLegacyState();
 	updatePlayPauseResumeState(state);
 	if (state.position == kTimeUnknown
 		|| state.length == kTimeUnknown
@@ -1606,11 +1723,7 @@ void Pip::updatePlaybackTexts(
 	_timeAlready = already;
 	_timeLeft = left;
 	_timeLeftWidth = st::pipPlaybackFont->width(_timeLeft);
-	_panel.widget()->update(QRect(
-		_playback.area.x(),
-		_playback.icon.y() - st::pipPlaybackFont->height,
-		_playback.area.width(),
-		st::pipPlaybackFont->height));
+	_panel.update();
 }
 
 void Pip::handleStreamingError(Streaming::Error &&error) {
@@ -1618,61 +1731,65 @@ void Pip::handleStreamingError(Streaming::Error &&error) {
 }
 
 void Pip::playbackPauseResume() {
-	if (_instance.player().failed()) {
+	if (_instance->player().failed()) {
 		_panel.widget()->close();
-	} else if (_instance.player().finished()
-		|| !_instance.player().active()) {
+	} else if (_instance->player().finished()
+		|| !_instance->player().active()) {
 		_startPaused = false;
 		restartAtSeekPosition(0);
-	} else if (_instance.player().paused()) {
-		_instance.resume();
+	} else if (_instance->player().paused()) {
+		_instance->resume();
 		updatePlaybackState();
 	} else {
-		_instance.pause();
+		_instance->pause();
 		updatePlaybackState();
 	}
 }
 
 void Pip::restartAtSeekPosition(crl::time position) {
-	if (!_instance.info().video.cover.isNull()) {
+	_lastUpdatePosition = position;
+
+	if (!_instance->info().video.cover.isNull()) {
 		_preparedCoverStorage = QImage();
 		_preparedCoverState = ThumbState::Empty;
-		_instance.saveFrameToCover();
+		_instance->saveFrameToCover();
 	}
 
 	auto options = Streaming::PlaybackOptions();
 	options.position = position;
 	options.hwAllowed = Core::App().settings().hardwareAcceleratedVideo();
-	options.audioId = _instance.player().prepareLegacyState().id;
+	options.audioId = _instance->player().prepareLegacyState().id;
 	options.speed = _delegate->pipPlaybackSpeed();
 
-	_instance.play(options);
+	_instance->play(options);
 	if (_startPaused) {
-		_instance.pause();
+		_instance->pause();
 	}
 	_pausedBySeek = false;
 	updatePlaybackState();
 }
 
 bool Pip::canUseVideoFrame() const {
-	return _instance.player().ready()
-		&& !_instance.info().video.cover.isNull();
+	return _instance->player().ready()
+		&& !_instance->info().video.cover.isNull();
 }
 
 QImage Pip::videoFrame(const FrameRequest &request) const {
 	Expects(canUseVideoFrame());
 
-	return _instance.frame(request);
+	return _instance->frame(request);
 }
 
 Streaming::FrameWithInfo Pip::videoFrameWithInfo() const {
 	Expects(canUseVideoFrame());
 
-	return _instance.frameWithInfo();
+	return _instance->frameWithInfo();
 }
 
 QImage Pip::staticContent() const {
-	const auto &cover = _instance.info().video.cover;
+	const auto &cover = !_qualityChangeFrame.isNull()
+		? _qualityChangeFrame
+		: _instance->info().video.cover;
 	const auto media = _data->activeMediaView();
 	const auto use = media
 		? media
@@ -1700,7 +1817,7 @@ QImage Pip::staticContent() const {
 	}
 	_preparedCoverState = state;
 	if (state == ThumbState::Cover) {
-		_preparedCoverStorage = _instance.info().video.cover;
+		_preparedCoverStorage = cover;
 	} else {
 		_preparedCoverStorage = (good
 			? good
@@ -1726,7 +1843,7 @@ void Pip::paintRadialLoadingContent(
 		st::radialLine,
 		st::radialLine,
 		st::radialLine));
-	p.setOpacity(_instance.waitingOpacity());
+	p.setOpacity(_instance->waitingOpacity());
 	p.setPen(Qt::NoPen);
 	p.setBrush(st::radialBg);
 	{
@@ -1736,7 +1853,7 @@ void Pip::paintRadialLoadingContent(
 	p.setOpacity(1.);
 	Ui::InfiniteRadialAnimation::Draw(
 		p,
-		_instance.waitingState(),
+		_instance->waitingState(),
 		arc.topLeft(),
 		arc.size(),
 		_panel.widget()->width(),
@@ -1773,7 +1890,7 @@ Pip::OverState Pip::computeState(QPoint position) const {
 }
 
 void Pip::waitingAnimationCallback() {
-	_panel.widget()->update(countRadialRect());
+	_panel.update();
 }
 
 } // namespace View
diff --git a/Telegram/SourceFiles/media/view/media_view_pip.h b/Telegram/SourceFiles/media/view/media_view_pip.h
index d0156e1bd224a8..0dcde9499c542d 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.h
+++ b/Telegram/SourceFiles/media/view/media_view_pip.h
@@ -7,13 +7,17 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "data/data_file_origin.h"
 #include "media/streaming/media_streaming_instance.h"
+#include "media/media_common.h"
 #include "ui/effects/animations.h"
 #include "ui/round_rect.h"
 #include "ui/rp_widget.h"
 
 #include <QtCore/QPointer>
 
+class HistoryItem;
+
 namespace base {
 class PowerSaveBlocker;
 } // namespace base
@@ -22,6 +26,10 @@ namespace Data {
 class DocumentMedia;
 } // namespace Data
 
+namespace style {
+struct Shadow;
+} // namespace style
+
 namespace Ui {
 class IconButton;
 template <typename Widget>
@@ -32,12 +40,15 @@ struct Capabilities;
 } // namespace GL
 } // namespace Ui
 
-namespace Media {
-namespace Player {
+namespace Media::Player {
 struct TrackState;
-} // namespace Player
+} // namespace Media::Player
+
+namespace Media::Streaming {
+class Document;
+} // namespace Media::Streaming
 
-namespace View {
+namespace Media::View {
 
 class PlaybackProgress;
 
@@ -45,6 +56,7 @@ class PlaybackProgress;
 [[nodiscard]] bool UsePainterRotation(int rotation);
 [[nodiscard]] QSize FlipSizeByRotation(QSize size, int rotation);
 [[nodiscard]] QImage RotateFrameImage(QImage image, int rotation);
+[[nodiscard]] const style::Shadow &PipShadow();
 
 class PipPanel final {
 public:
@@ -97,7 +109,8 @@ class PipPanel final {
 	void moveAnimated(QPoint to);
 	void updateDecorations();
 
-	const std::unique_ptr<Ui::RpWidgetWrap> _content;
+	const std::unique_ptr<Ui::RpWidget> _window;
+	std::unique_ptr<Ui::RpWidgetWrap> _content;
 	const QPointer<QWidget> _parent;
 	RectParts _attached = RectParts();
 	RectParts _snapped = RectParts();
@@ -134,11 +147,17 @@ class Pip final {
 	Pip(
 		not_null<Delegate*> delegate,
 		not_null<DocumentData*> data,
+		Data::FileOrigin origin,
+		not_null<DocumentData*> chosenQuality,
+		HistoryItem *context,
+		VideoQuality quality,
 		std::shared_ptr<Streaming::Document> shared,
 		FnMut<void()> closeAndContinue,
 		FnMut<void()> destroy);
 	~Pip();
 
+	[[nodiscard]] std::shared_ptr<Streaming::Document> shared() const;
+
 private:
 	enum class OverState {
 		None,
@@ -179,6 +198,7 @@ class Pip final {
 	class Renderer;
 	class RendererGL;
 	class RendererSW;
+	class RendererRhi;
 
 	void setupPanel();
 	void setupButtons();
@@ -245,6 +265,8 @@ class Pip final {
 		QRect outer,
 		float64 shown) const;
 	[[nodiscard]] QRect countRadialRect() const;
+	void applyVideoQuality(VideoQuality value);
+	[[nodiscard]] QImage currentVideoFrameImage() const;
 
 	void seekUpdate(QPoint position);
 	void seekProgress(float64 value);
@@ -252,7 +274,11 @@ class Pip final {
 
 	const not_null<Delegate*> _delegate;
 	const not_null<DocumentData*> _data;
-	Streaming::Instance _instance;
+	const Data::FileOrigin _origin;
+	DocumentData *_chosenQuality = nullptr;
+	HistoryItem *_context = nullptr;
+	Media::VideoQuality _quality;
+	std::optional<Streaming::Instance> _instance;
 	bool _opengl = false;
 	PipPanel _panel;
 	QSize _size;
@@ -260,6 +286,10 @@ class Pip final {
 	std::unique_ptr<PlaybackProgress> _playbackProgress;
 	std::shared_ptr<Data::DocumentMedia> _dataMedia;
 
+	QImage _qualityChangeFrame;
+	bool _qualityChangeFinished = false;
+	crl::time _lastUpdatePosition = 0;
+
 	bool _showPause = false;
 	bool _startPaused = false;
 	bool _pausedBySeek = false;
@@ -288,5 +318,4 @@ class Pip final {
 
 };
 
-} // namespace View
-} // namespace Media
+} // namespace Media::View
diff --git a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
index f4be398c20b762..2b38ee6b0dfab7 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip_opengl.cpp
@@ -13,7 +13,7 @@ For license and copyright information please follow this link:
 #include "media/streaming/media_streaming_common.h"
 #include "base/platform/base_platform_info.h"
 #include "styles/style_media_view.h"
-#include "styles/style_calls.h" // st::callShadow.
+#include "styles/style_widgets.h"
 
 namespace Media::View {
 namespace {
@@ -148,7 +148,7 @@ vec4 shadow() {
 Pip::RendererGL::RendererGL(not_null<Pip*> owner)
 : _owner(owner) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_radialImage.invalidate();
 		_playbackImage.invalidate();
 		_volumeControllerImage.invalidate();
@@ -156,9 +156,7 @@ Pip::RendererGL::RendererGL(not_null<Pip*> owner)
 	}, _lifetime);
 }
 
-void Pip::RendererGL::init(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions &f) {
+void Pip::RendererGL::init(QOpenGLFunctions &f) {
 	constexpr auto kQuads = 8;
 	constexpr auto kQuadVertices = kQuads * 4;
 	constexpr auto kQuadValues = kQuadVertices * 4;
@@ -233,10 +231,20 @@ void Pip::RendererGL::init(
 	createShadowTexture();
 }
 
-void Pip::RendererGL::deinit(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions *f) {
+void Pip::RendererGL::deinit(QOpenGLFunctions *f) {
+	_radialImage.destroy(f);
+	_controlsImage.destroy(f);
+	_playbackImage.destroy(f);
+	_volumeControllerImage.destroy(f);
+	_shadowImage.destroy(f);
 	_textures.destroy(f);
+	_rgbaSize = QSize();
+	_lumaSize = QSize();
+	_chromaSize = QSize();
+	_chromaSizeV = QSize();
+	_chromaNV12 = false;
+	_trackFrameIndex = 0;
+	_cacheKey = 0;
 	_imageProgram = std::nullopt;
 	_texturedVertexShader = nullptr;
 	_argb32Program = std::nullopt;
@@ -247,8 +255,8 @@ void Pip::RendererGL::deinit(
 }
 
 void Pip::RendererGL::createShadowTexture() {
-	const auto &shadow = st::callShadow;
-	const auto size = 2 * st::callShadow.topLeft.size()
+	const auto &shadow = PipShadow();
+	const auto size = 2 * PipShadow().topLeft.size()
 		+ QSize(st::roundRadiusLarge, st::roundRadiusLarge);
 	auto image = QImage(
 		size * style::DevicePixelRatio(),
@@ -300,6 +308,12 @@ void Pip::RendererGL::paintTransformedVideoFrame(
 		Assert(!data.image.isNull());
 		paintTransformedStaticContent(data.image, geometry);
 		return;
+	} else if (data.format == Streaming::FrameFormat::NativeTexture) {
+		const auto image = _owner->currentVideoFrameImage();
+		if (!image.isNull()) {
+			paintTransformedStaticContent(image, geometry);
+		}
+		return;
 	}
 	Assert(!data.yuv->size.isEmpty());
 	const auto program = (data.format == Streaming::FrameFormat::NV12)
@@ -336,8 +350,8 @@ void Pip::RendererGL::paintTransformedVideoFrame(
 			nv12changed ? QSize() : _chromaSize,
 			yuv->u.stride / (nv12 ? 2 : 1),
 			yuv->u.data);
+		_chromaSize = yuv->chromaSize;
 		if (nv12) {
-			_chromaSize = yuv->chromaSize;
 			_f->glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
 		}
 		_chromaNV12 = nv12;
@@ -350,10 +364,10 @@ void Pip::RendererGL::paintTransformedVideoFrame(
 				GL_ALPHA,
 				GL_ALPHA,
 				yuv->chromaSize,
-				_chromaSize,
+				_chromaSizeV,
 				yuv->v.stride,
 				yuv->v.data);
-			_chromaSize = yuv->chromaSize;
+			_chromaSizeV = yuv->chromaSize;
 			_f->glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
 		}
 	}
@@ -441,15 +455,15 @@ void Pip::RendererGL::paintTransformedContent(
 	program->setUniformValue("h_texture", GLint(rgbaFrame ? 1 : 3));
 	program->setUniformValue("h_size", QSizeF(_shadowImage.image().size()));
 	program->setUniformValue("h_extend", QVector4D(
-		st::callShadow.extend.left() * globalFactor,
-		st::callShadow.extend.top() * globalFactor,
-		st::callShadow.extend.right() * globalFactor,
-		st::callShadow.extend.bottom() * globalFactor));
+		PipShadow().extend.left() * globalFactor,
+		PipShadow().extend.top() * globalFactor,
+		PipShadow().extend.right() * globalFactor,
+		PipShadow().extend.bottom() * globalFactor));
 	program->setUniformValue("h_components", QVector4D(
-		float(st::callShadow.topLeft.width() * globalFactor),
-		float(st::callShadow.topLeft.height() * globalFactor),
-		float(st::callShadow.left.width() * globalFactor),
-		float(st::callShadow.top.height() * globalFactor)));
+		float(PipShadow().topLeft.width() * globalFactor),
+		float(PipShadow().topLeft.height() * globalFactor),
+		float(PipShadow().left.width() * globalFactor),
+		float(PipShadow().top.height() * globalFactor)));
 	program->setUniformValue(
 		"roundRadius",
 		GLfloat(st::roundRadiusLarge * _factor));
@@ -779,14 +793,14 @@ QRect Pip::RendererGL::RoundingRect(ContentGeometry geometry) {
 		inner.y(),
 		geometry.outer.width() - inner.x() - inner.width(),
 		geometry.outer.height() - inner.y() - inner.height(),
-		st::callShadow.topLeft.width(),
-		st::callShadow.topLeft.height(),
-		st::callShadow.topRight.width(),
-		st::callShadow.topRight.height(),
-		st::callShadow.bottomRight.width(),
-		st::callShadow.bottomRight.height(),
-		st::callShadow.bottomLeft.width(),
-		st::callShadow.bottomLeft.height(),
+		PipShadow().topLeft.width(),
+		PipShadow().topLeft.height(),
+		PipShadow().topRight.width(),
+		PipShadow().topRight.height(),
+		PipShadow().bottomRight.width(),
+		PipShadow().bottomRight.height(),
+		PipShadow().bottomLeft.width(),
+		PipShadow().bottomLeft.height(),
 	});
 	return geometry.inner.marginsAdded({
 		(attached & RectPart::Left) ? added : 0,
diff --git a/Telegram/SourceFiles/media/view/media_view_pip_opengl.h b/Telegram/SourceFiles/media/view/media_view_pip_opengl.h
index 21d9b521e770a6..351cfb9eec1be8 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip_opengl.h
+++ b/Telegram/SourceFiles/media/view/media_view_pip_opengl.h
@@ -19,13 +19,9 @@ class Pip::RendererGL final : public Pip::Renderer {
 public:
 	explicit RendererGL(not_null<Pip*> owner);
 
-	void init(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions &f) override;
+	void init(QOpenGLFunctions &f) override;
 
-	void deinit(
-		not_null<QOpenGLWidget*> widget,
-		QOpenGLFunctions *f) override;
+	void deinit(QOpenGLFunctions *f) override;
 
 	void paint(
 		not_null<QOpenGLWidget*> widget,
@@ -106,7 +102,8 @@ class Pip::RendererGL final : public Pip::Renderer {
 	Ui::GL::Textures<4> _textures;
 	QSize _rgbaSize;
 	QSize _lumaSize;
-	QSize _chromaSize;
+	QSize _chromaSize; // size of texture 2 (UV for NV12, U for YUV420)
+	QSize _chromaSizeV; // size of texture 3 (V for YUV420 only)
 	quint64 _cacheKey = 0;
 	int _trackFrameIndex = 0;
 	bool _chromaNV12 = false;
diff --git a/Telegram/SourceFiles/media/view/media_view_pip_raster.cpp b/Telegram/SourceFiles/media/view/media_view_pip_raster.cpp
index 4698309b8b69ff..e164b449aae871 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip_raster.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip_raster.cpp
@@ -10,7 +10,8 @@ For license and copyright information please follow this link:
 #include "ui/image/image_prepare.h"
 #include "ui/widgets/shadow.h"
 #include "ui/painter.h"
-#include "styles/style_calls.h" // st::callShadow.
+#include "styles/style_media_view.h"
+#include "styles/style_widgets.h"
 
 namespace Media::View {
 namespace {
@@ -69,7 +70,7 @@ Pip::RendererSW::RendererSW(not_null<Pip*> owner)
 }
 
 void Pip::RendererSW::paintFallback(
-		Painter &&p,
+		Painter &p,
 		const QRegion &clip,
 		Ui::GL::Backend backend) {
 	_p = &p;
@@ -183,7 +184,11 @@ void Pip::RendererSW::paintTransformedImage(
 	const auto rect = geometry.inner;
 	const auto rotation = geometry.rotation;
 	if (geometry.useTransparency) {
-		Ui::Shadow::paint(*_p, rect, geometry.outer.width(), st::callShadow);
+		Ui::Shadow::paint(
+			*_p,
+			rect,
+			geometry.outer.width(),
+			PipShadow());
 	}
 
 	if (UsePainterRotation(rotation)) {
diff --git a/Telegram/SourceFiles/media/view/media_view_pip_raster.h b/Telegram/SourceFiles/media/view/media_view_pip_raster.h
index d24513c4381eae..9a03b7ad7269a9 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip_raster.h
+++ b/Telegram/SourceFiles/media/view/media_view_pip_raster.h
@@ -16,7 +16,7 @@ class Pip::RendererSW final : public Pip::Renderer {
 	explicit RendererSW(not_null<Pip*> owner);
 
 	void paintFallback(
-		Painter &&p,
+		Painter &p,
 		const QRegion &clip,
 		Ui::GL::Backend backend) override;
 
diff --git a/Telegram/SourceFiles/media/view/media_view_pip_rhi.cpp b/Telegram/SourceFiles/media/view/media_view_pip_rhi.cpp
new file mode 100644
index 00000000000000..1f53a7e4087166
--- /dev/null
+++ b/Telegram/SourceFiles/media/view/media_view_pip_rhi.cpp
@@ -0,0 +1,1159 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/view/media_view_pip_rhi.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+#include "ui/rhi/rhi_shader.h"
+#include "ui/widgets/shadow.h"
+#include "media/streaming/media_streaming_common.h"
+#include "base/platform/base_platform_info.h"
+#include "styles/style_media_view.h"
+#include "styles/style_widgets.h"
+
+#include <rhi/qrhi.h>
+
+namespace Media::View {
+namespace {
+
+using namespace Ui::GL;
+
+struct PipUniforms {
+	float viewport[2];
+	float _pad0[2];
+	float roundRect[4];
+	float roundRadius;
+	float _pad1[3];
+	float fadeColor[4];
+	float h_size[2];
+	float _pad2[2];
+	float h_extend[4];
+	float h_components[4];
+};
+static_assert(sizeof(PipUniforms) % 16 == 0);
+
+struct ImageUniforms {
+	float viewport[2];
+	float g_opacity;
+	float o_opacity;
+};
+static_assert(sizeof(ImageUniforms) % 16 == 0);
+
+[[nodiscard]] QShader LoadShader(const QString &name) {
+	return Ui::Rhi::ShaderFromFile(
+		u":/shaders/"_q + name + u".qsb"_q);
+}
+
+[[nodiscard]] QRhiGraphicsPipeline *CreatePipeline(
+		QRhi *rhi,
+		QRhiRenderPassDescriptor *rpDesc,
+		QRhiShaderResourceBindings *srb,
+		const QShader &vertexShader,
+		const QShader &fragmentShader,
+		bool blending,
+		int vertexStride,
+		int attributeCount = 2,
+		QRhiGraphicsPipeline::Topology topology
+			= QRhiGraphicsPipeline::TriangleStrip) {
+	auto pipeline = rhi->newGraphicsPipeline();
+
+	pipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, vertexShader },
+		{ QRhiShaderStage::Fragment, fragmentShader },
+	});
+
+	QRhiVertexInputLayout inputLayout;
+	inputLayout.setBindings({
+		{ quint32(vertexStride) },
+	});
+	if (attributeCount == 2) {
+		inputLayout.setAttributes({
+			{ 0, 0, QRhiVertexInputAttribute::Float2, 0 },
+			{ 0, 1, QRhiVertexInputAttribute::Float2, 2 * sizeof(float) },
+		});
+	} else if (attributeCount == 3) {
+		inputLayout.setAttributes({
+			{ 0, 0, QRhiVertexInputAttribute::Float2, 0 },
+			{ 0, 1, QRhiVertexInputAttribute::Float2, 2 * sizeof(float) },
+			{ 0, 2, QRhiVertexInputAttribute::Float2, 4 * sizeof(float) },
+		});
+	} else {
+		Unexpected("Attribute count in PiP::RendererRhi::CreatePipeline.");
+	}
+	pipeline->setVertexInputLayout(inputLayout);
+
+	if (blending) {
+		QRhiGraphicsPipeline::TargetBlend blend;
+		blend.enable = true;
+		blend.srcColor = QRhiGraphicsPipeline::One;
+		blend.dstColor = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+		blend.srcAlpha = QRhiGraphicsPipeline::One;
+		blend.dstAlpha = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+		pipeline->setTargetBlends({ blend });
+	}
+
+	pipeline->setTopology(topology);
+	pipeline->setShaderResourceBindings(srb);
+	pipeline->setRenderPassDescriptor(rpDesc);
+	pipeline->create();
+
+	return pipeline;
+}
+
+} // namespace
+
+Pip::RendererRhi::RendererRhi(not_null<Pip*> owner)
+: _owner(owner) {
+	style::PaletteChanged(
+	) | rpl::on_next([=] {
+		_radialImage.invalidate();
+		_playbackImage.invalidate();
+		_volumeControllerImage.invalidate();
+		invalidateControls();
+	}, _lifetime);
+}
+
+Pip::RendererRhi::~RendererRhi() {
+	releaseResources();
+}
+
+void Pip::RendererRhi::initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (_initialized && _rhi == rhi && _rt == rt) {
+		return;
+	}
+	releaseResources();
+
+	_rhi = rhi;
+	_rt = rt;
+	_cb = cb;
+
+	_vertexBuffer = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::VertexBuffer,
+		kMaxDraws * kVertexSlotSize);
+	_vertexBuffer->create();
+
+	_uniformBuffer = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::UniformBuffer,
+		kMaxDraws * 256);
+	_uniformBuffer->create();
+
+	_sampler = rhi->newSampler(
+		QRhiSampler::Linear,
+		QRhiSampler::Linear,
+		QRhiSampler::None,
+		QRhiSampler::ClampToEdge,
+		QRhiSampler::ClampToEdge);
+	_sampler->create();
+
+	_placeholderTexture = rhi->newTexture(QRhiTexture::RGBA8, QSize(1, 1));
+	_placeholderTexture->create();
+
+	createPipelines();
+	createShadowTexture();
+	_initialized = true;
+}
+
+void Pip::RendererRhi::createPipelines() {
+	const auto rpDesc = _rt->renderPassDescriptor();
+
+	const auto argb32Vert = LoadShader(u"argb32.vert"_q);
+	const auto passthroughVert = LoadShader(u"passthrough.vert"_q);
+	const auto argb32Frag = LoadShader(u"argb32.frag"_q);
+	const auto pipArgb32Frag = LoadShader(u"pip_argb32.frag"_q);
+	const auto controlsFrag = LoadShader(u"pip_controls.frag"_q);
+
+	_argb32Srb = _rhi->newShaderResourceBindings();
+	_argb32Srb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+	});
+	_argb32Srb->create();
+
+	_argb32Pipeline = CreatePipeline(
+		_rhi,
+		rpDesc,
+		_argb32Srb,
+		passthroughVert,
+		pipArgb32Frag,
+		false,
+		4 * sizeof(float));
+
+	_imageSrb = _rhi->newShaderResourceBindings();
+	_imageSrb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+	});
+	_imageSrb->create();
+
+	_imagePipeline = CreatePipeline(
+		_rhi,
+		rpDesc,
+		_imageSrb,
+		argb32Vert,
+		argb32Frag,
+		false,
+		4 * sizeof(float));
+
+	_imageBlendPipeline = CreatePipeline(
+		_rhi,
+		rpDesc,
+		_imageSrb,
+		argb32Vert,
+		argb32Frag,
+		true,
+		4 * sizeof(float));
+
+	const auto pipControlsVert = LoadShader(u"pip_controls.vert"_q);
+	_controlsSrb = _rhi->newShaderResourceBindings();
+	_controlsSrb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_sampler),
+	});
+	_controlsSrb->create();
+
+	_controlsPipeline = CreatePipeline(
+		_rhi,
+		rpDesc,
+		_controlsSrb,
+		pipControlsVert,
+		controlsFrag,
+		true,
+		6 * sizeof(float),
+		3);
+
+	const auto pipYuv420Frag = LoadShader(u"pip_yuv420.frag"_q);
+	const auto pipNv12Frag = LoadShader(u"pip_nv12.frag"_q);
+
+	_yuv420Srb = _rhi->newShaderResourceBindings();
+	_yuv420Srb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer),
+		QRhiShaderResourceBinding::sampledTexture(
+			1, QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture, _sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2, QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture, _sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			3, QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture, _sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			4, QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture, _sampler),
+	});
+	_yuv420Srb->create();
+
+	_yuv420Pipeline = CreatePipeline(
+		_rhi, rpDesc, _yuv420Srb,
+		passthroughVert, pipYuv420Frag, false, 4 * sizeof(float));
+
+	_nv12Srb = _rhi->newShaderResourceBindings();
+	_nv12Srb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer),
+		QRhiShaderResourceBinding::sampledTexture(
+			1, QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture, _sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2, QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture, _sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			3, QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture, _sampler),
+	});
+	_nv12Srb->create();
+
+	_nv12Pipeline = CreatePipeline(
+		_rhi, rpDesc, _nv12Srb,
+		passthroughVert, pipNv12Frag, false, 4 * sizeof(float));
+}
+
+void Pip::RendererRhi::render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	_rhi = rhi;
+	_rt = rt;
+	_cb = cb;
+	_nextSrbIndex = 0;
+	_drawCommands.clear();
+	_nextDrawSlot = 0;
+
+	const auto size = rt->pixelSize();
+	const auto factor = float(
+		_owner->_panel.widget()->devicePixelRatioF());
+	if (_factor != factor) {
+		_factor = factor;
+		_ifactor = int(std::ceil(_factor));
+		invalidateControls();
+	}
+	_viewport = QSize(
+		int(size.width() / _factor),
+		int(size.height() / _factor));
+
+	_rub = rhi->nextResourceUpdateBatch();
+
+	_owner->paint(this);
+
+	const auto bg = QColor(0, 0, 0, 0);
+	cb->beginPass(rt, bg, { 1.0f, 0 }, _rub);
+	_rub = nullptr;
+
+	for (const auto &cmd : _drawCommands) {
+		cb->setGraphicsPipeline(cmd.pipeline);
+		cb->setShaderResources(cmd.srb);
+		cb->setViewport({
+			0, 0,
+			float(rt->pixelSize().width()),
+			float(rt->pixelSize().height()) });
+		const QRhiCommandBuffer::VertexInput vbufBinding(
+			cmd.vertexBuffer, cmd.vertexOffset);
+		cb->setVertexInput(0, 1, &vbufBinding);
+		cb->draw(4);
+	}
+	_drawCommands.clear();
+
+	cb->endPass();
+}
+
+void Pip::RendererRhi::releaseResources() {
+	_drawCommands.clear();
+	for (auto *srb : _srbPool) {
+		delete srb;
+	}
+	_srbPool.clear();
+	_nextSrbIndex = 0;
+
+	_shadowImage.destroy();
+	_radialImage.destroy();
+	_controlsImage.destroy();
+	_playbackImage.destroy();
+	_volumeControllerImage.destroy();
+
+	delete _argb32Pipeline;
+	_argb32Pipeline = nullptr;
+	delete _yuv420Pipeline;
+	_yuv420Pipeline = nullptr;
+	delete _nv12Pipeline;
+	_nv12Pipeline = nullptr;
+	delete _imagePipeline;
+	_imagePipeline = nullptr;
+	delete _imageBlendPipeline;
+	_imageBlendPipeline = nullptr;
+	delete _controlsPipeline;
+	_controlsPipeline = nullptr;
+
+	delete _argb32Srb;
+	_argb32Srb = nullptr;
+	delete _yuv420Srb;
+	_yuv420Srb = nullptr;
+	delete _nv12Srb;
+	_nv12Srb = nullptr;
+	delete _imageSrb;
+	_imageSrb = nullptr;
+	delete _controlsSrb;
+	_controlsSrb = nullptr;
+
+	delete _placeholderTexture;
+	_placeholderTexture = nullptr;
+	delete _rgbaTexture;
+	_rgbaTexture = nullptr;
+	_rgbaSize = QSize();
+	_cacheKey = 0;
+	delete _yTexture;
+	_yTexture = nullptr;
+	delete _uTexture;
+	_uTexture = nullptr;
+	delete _vTexture;
+	_vTexture = nullptr;
+	delete _uvTexture;
+	_uvTexture = nullptr;
+	_lumaSize = QSize();
+	_chromaSize = QSize();
+	_trackFrameIndex = -1;
+	_chromaNV12 = false;
+	_usingExternalVideoTextures = false;
+#ifdef Q_OS_MAC
+	_metalTextureCache.flush();
+#endif // Q_OS_MAC
+
+	delete _vertexBuffer;
+	_vertexBuffer = nullptr;
+	delete _uniformBuffer;
+	_uniformBuffer = nullptr;
+	delete _sampler;
+	_sampler = nullptr;
+
+	_initialized = false;
+}
+
+int Pip::RendererRhi::allocateDrawSlot() {
+	return (_nextDrawSlot < kMaxDraws) ? _nextDrawSlot++ : -1;
+}
+
+QRhiShaderResourceBindings *Pip::RendererRhi::allocateSrb() {
+	if (_nextSrbIndex < int(_srbPool.size())) {
+		return _srbPool[_nextSrbIndex++];
+	}
+	auto *srb = _rhi->newShaderResourceBindings();
+	_srbPool.push_back(srb);
+	_nextSrbIndex++;
+	return srb;
+}
+
+void Pip::RendererRhi::createShadowTexture() {
+	const auto &shadow = PipShadow();
+	const auto size = 2 * PipShadow().topLeft.size()
+		+ QSize(st::roundRadiusLarge, st::roundRadiusLarge);
+	auto image = QImage(
+		size * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(style::DevicePixelRatio());
+	image.fill(Qt::transparent);
+	{
+		auto p = QPainter(&image);
+		Ui::Shadow::paint(
+			p,
+			QRect(QPoint(), size).marginsRemoved(shadow.extend),
+			size.width(),
+			shadow);
+	}
+	_shadowImage.setImage(std::move(image));
+}
+
+void Pip::RendererRhi::paintTransformedVideoFrame(
+		ContentGeometry geometry) {
+	const auto data = _owner->videoFrameWithInfo();
+	if (data.format == Streaming::FrameFormat::None) {
+		return;
+	}
+	geometry.rotation = (geometry.rotation + geometry.videoRotation) % 360;
+	if (data.format == Streaming::FrameFormat::ARGB32) {
+		if (data.image.isNull()) {
+			return;
+		}
+		paintTransformedStaticContent(data.image, geometry);
+		return;
+	}
+	const auto nativeTexture =
+		(data.format == Streaming::FrameFormat::NativeTexture);
+	const auto nv12 = nativeTexture
+		|| (data.format == Streaming::FrameFormat::NV12);
+	const auto yuv = data.yuv;
+	const auto nv12changed = !nativeTexture && (_chromaNV12 != nv12);
+	const auto upload = (_trackFrameIndex != data.index);
+	_trackFrameIndex = data.index;
+
+	if (upload) {
+		auto zeroCopied = false;
+#ifdef Q_OS_MAC
+		if (nativeTexture && data.nativeFrame
+			&& data.nativeFrame->pixelBuffer) {
+			const auto ok = _metalTextureCache.createTexturesFromPixelBuffer(
+					_rhi,
+					data.nativeFrame->pixelBuffer,
+					&_yTexture,
+					&_uvTexture,
+					&_lumaSize,
+					&_chromaSize);
+			if (ok) {
+				_chromaNV12 = true;
+				zeroCopied = true;
+			} else {
+				return;
+			}
+		}
+#endif // Q_OS_MAC
+		if (!zeroCopied) {
+			if (_usingExternalVideoTextures) {
+				delete _yTexture;
+				_yTexture = nullptr;
+				delete _uTexture;
+				_uTexture = nullptr;
+				delete _vTexture;
+				_vTexture = nullptr;
+				delete _uvTexture;
+				_uvTexture = nullptr;
+				_lumaSize = QSize();
+				_chromaSize = QSize();
+#ifdef Q_OS_MAC
+				_metalTextureCache.flush();
+#endif // Q_OS_MAC
+			}
+			if (!yuv || yuv->size.isEmpty()) {
+				return;
+			}
+			if (!_yTexture || _lumaSize != yuv->size) {
+				delete _yTexture;
+				_yTexture = _rhi->newTexture(QRhiTexture::R8, yuv->size);
+				_yTexture->create();
+				_lumaSize = yuv->size;
+			}
+			auto yDesc = QRhiTextureSubresourceUploadDescription(
+				yuv->y.data, yuv->y.stride * yuv->size.height());
+			yDesc.setDataStride(yuv->y.stride);
+			_rub->uploadTexture(_yTexture,
+				QRhiTextureUploadDescription(
+					QRhiTextureUploadEntry(0, 0, yDesc)));
+
+			if (nv12) {
+				if (!_uvTexture || nv12changed
+					|| _chromaSize != yuv->chromaSize) {
+					delete _uvTexture;
+					_uvTexture = _rhi->newTexture(
+						QRhiTexture::RG8, yuv->chromaSize);
+					_uvTexture->create();
+					_chromaSize = yuv->chromaSize;
+				}
+				auto uvDesc = QRhiTextureSubresourceUploadDescription(
+					yuv->u.data, yuv->u.stride * yuv->chromaSize.height());
+				uvDesc.setDataStride(yuv->u.stride);
+				_rub->uploadTexture(_uvTexture,
+					QRhiTextureUploadDescription(
+						QRhiTextureUploadEntry(0, 0, uvDesc)));
+			} else {
+				if (!_uTexture || nv12changed
+					|| _chromaSize != yuv->chromaSize) {
+					delete _uTexture;
+					_uTexture = _rhi->newTexture(
+						QRhiTexture::R8, yuv->chromaSize);
+					_uTexture->create();
+					delete _vTexture;
+					_vTexture = _rhi->newTexture(
+						QRhiTexture::R8, yuv->chromaSize);
+					_vTexture->create();
+					_chromaSize = yuv->chromaSize;
+				}
+				auto uDesc = QRhiTextureSubresourceUploadDescription(
+					yuv->u.data, yuv->u.stride * yuv->chromaSize.height());
+				uDesc.setDataStride(yuv->u.stride);
+				_rub->uploadTexture(_uTexture,
+					QRhiTextureUploadDescription(
+						QRhiTextureUploadEntry(0, 0, uDesc)));
+				auto vDesc = QRhiTextureSubresourceUploadDescription(
+					yuv->v.data, yuv->v.stride * yuv->chromaSize.height());
+				vDesc.setDataStride(yuv->v.stride);
+				_rub->uploadTexture(_vTexture,
+					QRhiTextureUploadDescription(
+						QRhiTextureUploadEntry(0, 0, vDesc)));
+			}
+		} // !zeroCopied
+		_chromaNV12 = nv12;
+		_usingExternalVideoTextures = zeroCopied;
+	}
+
+	_shadowImage.upload(_rhi, _rub);
+
+	if (nv12) {
+		const auto slot = allocateDrawSlot();
+		if (slot < 0) {
+			return;
+		}
+		auto *srb = allocateSrb();
+		srb->setBindings({
+			QRhiShaderResourceBinding::uniformBuffer(
+				0,
+				QRhiShaderResourceBinding::VertexStage
+					| QRhiShaderResourceBinding::FragmentStage,
+				_uniformBuffer,
+				slot * 256,
+				sizeof(PipUniforms)),
+			QRhiShaderResourceBinding::sampledTexture(
+				1, QRhiShaderResourceBinding::FragmentStage,
+				_yTexture, _sampler),
+			QRhiShaderResourceBinding::sampledTexture(
+				2, QRhiShaderResourceBinding::FragmentStage,
+				_uvTexture, _sampler),
+			QRhiShaderResourceBinding::sampledTexture(
+				3, QRhiShaderResourceBinding::FragmentStage,
+				_shadowImage.texture()
+					? _shadowImage.texture()
+					: _placeholderTexture,
+				_sampler),
+		});
+		srb->create();
+		paintTransformedContent(_nv12Pipeline, srb, geometry, slot);
+	} else {
+		const auto slot = allocateDrawSlot();
+		if (slot < 0) {
+			return;
+		}
+		auto *srb = allocateSrb();
+		srb->setBindings({
+			QRhiShaderResourceBinding::uniformBuffer(
+				0,
+				QRhiShaderResourceBinding::VertexStage
+					| QRhiShaderResourceBinding::FragmentStage,
+				_uniformBuffer,
+				slot * 256,
+				sizeof(PipUniforms)),
+			QRhiShaderResourceBinding::sampledTexture(
+				1, QRhiShaderResourceBinding::FragmentStage,
+				_yTexture, _sampler),
+			QRhiShaderResourceBinding::sampledTexture(
+				2, QRhiShaderResourceBinding::FragmentStage,
+				_uTexture, _sampler),
+			QRhiShaderResourceBinding::sampledTexture(
+				3, QRhiShaderResourceBinding::FragmentStage,
+				_vTexture, _sampler),
+			QRhiShaderResourceBinding::sampledTexture(
+				4, QRhiShaderResourceBinding::FragmentStage,
+				_shadowImage.texture()
+					? _shadowImage.texture()
+					: _placeholderTexture,
+				_sampler),
+		});
+		srb->create();
+		paintTransformedContent(_yuv420Pipeline, srb, geometry, slot);
+	}
+}
+
+void Pip::RendererRhi::paintTransformedStaticContent(
+		const QImage &image,
+		ContentGeometry geometry) {
+	if (image.isNull() || !_argb32Pipeline) {
+		return;
+	}
+
+	const auto cacheKey = image.cacheKey();
+	if (_cacheKey != cacheKey) {
+		_cacheKey = cacheKey;
+		if (!_rgbaTexture || _rgbaSize != image.size()) {
+			delete _rgbaTexture;
+			_rgbaTexture = _rhi->newTexture(
+				QRhiTexture::BGRA8,
+				image.size());
+			_rgbaTexture->create();
+			_rgbaSize = image.size();
+		}
+		auto desc = QRhiTextureSubresourceUploadDescription(image);
+		_rub->uploadTexture(
+			_rgbaTexture,
+			QRhiTextureUploadDescription(
+				QRhiTextureUploadEntry(0, 0, desc)));
+	}
+
+	const auto slot = allocateDrawSlot();
+	if (slot < 0) {
+		return;
+	}
+	auto *srb = allocateSrb();
+	srb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			slot * 256,
+			sizeof(PipUniforms)),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_rgbaTexture,
+			_sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::FragmentStage,
+			_shadowImage.texture()
+				? _shadowImage.texture()
+				: _placeholderTexture,
+			_sampler),
+	});
+	srb->create();
+
+	_shadowImage.upload(_rhi, _rub);
+
+	paintTransformedContent(_argb32Pipeline, srb, geometry, slot);
+}
+
+void Pip::RendererRhi::paintTransformedContent(
+		QRhiGraphicsPipeline *pipeline,
+		QRhiShaderResourceBindings *srb,
+		ContentGeometry geometry,
+		int slot) {
+	std::array<std::array<float, 2>, 4> rect = { {
+		{ { -1.f, 1.f } },
+		{ { 1.f, 1.f } },
+		{ { 1.f, -1.f } },
+		{ { -1.f, -1.f } },
+	} };
+	if (const auto shift = (geometry.rotation / 90); shift != 0) {
+		std::rotate(begin(rect), begin(rect) + shift, end(rect));
+	}
+	const auto xscale = 1.f / geometry.inner.width();
+	const auto yscale = 1.f / geometry.inner.height();
+	const float coords[] = {
+		rect[0][0], rect[0][1],
+		-geometry.inner.x() * xscale,
+		-geometry.inner.y() * yscale,
+
+		rect[1][0], rect[1][1],
+		(geometry.outer.width() - geometry.inner.x()) * xscale,
+		-geometry.inner.y() * yscale,
+
+		rect[3][0], rect[3][1],
+		-geometry.inner.x() * xscale,
+		(geometry.outer.height() - geometry.inner.y()) * yscale,
+
+		rect[2][0], rect[2][1],
+		(geometry.outer.width() - geometry.inner.x()) * xscale,
+		(geometry.outer.height() - geometry.inner.y()) * yscale,
+	};
+
+	const auto vOffset = slot * kVertexSlotSize;
+	const auto uOffset = slot * 256;
+	_rub->updateDynamicBuffer(
+		_vertexBuffer,
+		vOffset,
+		sizeof(coords),
+		coords);
+
+	const auto globalFactor = _factor;
+	const auto fadeAlpha = float(
+		st::radialBg->c.alphaF() * geometry.fade);
+	const auto roundRect = transformRect(RoundingRect(geometry));
+
+	PipUniforms uniforms{};
+	uniforms.viewport[0] = _viewport.width() * _factor;
+	uniforms.viewport[1] = _viewport.height() * _factor;
+	uniforms.roundRect[0] = roundRect.left();
+	uniforms.roundRect[1] = roundRect.top();
+	uniforms.roundRect[2] = roundRect.width();
+	uniforms.roundRect[3] = roundRect.height();
+	uniforms.roundRadius = st::roundRadiusLarge * _factor;
+	uniforms.fadeColor[0] = float(st::radialBg->c.redF() * fadeAlpha);
+	uniforms.fadeColor[1] = float(st::radialBg->c.greenF() * fadeAlpha);
+	uniforms.fadeColor[2] = float(st::radialBg->c.blueF() * fadeAlpha);
+	uniforms.fadeColor[3] = fadeAlpha;
+	const auto &shadowImg = _shadowImage.image();
+	uniforms.h_size[0] = shadowImg.width();
+	uniforms.h_size[1] = shadowImg.height();
+	uniforms.h_extend[0] = PipShadow().extend.left() * globalFactor;
+	uniforms.h_extend[1] = PipShadow().extend.top() * globalFactor;
+	uniforms.h_extend[2] = PipShadow().extend.right() * globalFactor;
+	uniforms.h_extend[3] = PipShadow().extend.bottom() * globalFactor;
+	uniforms.h_components[0] = PipShadow().topLeft.width() * globalFactor;
+	uniforms.h_components[1] = PipShadow().topLeft.height() * globalFactor;
+	uniforms.h_components[2] = PipShadow().left.width() * globalFactor;
+	uniforms.h_components[3] = PipShadow().top.height() * globalFactor;
+
+	_rub->updateDynamicBuffer(
+		_uniformBuffer,
+		uOffset,
+		sizeof(PipUniforms),
+		&uniforms);
+
+	_drawCommands.push_back({
+		.pipeline = pipeline,
+		.srb = srb,
+		.vertexBuffer = _vertexBuffer,
+		.vertexOffset = quint32(vOffset),
+	});
+}
+
+void Pip::RendererRhi::paintRadialLoading(
+		QRect inner,
+		float64 controlsShown) {
+	paintUsingRaster(_radialImage, inner, [&](QPainter &&p) {
+		const auto newInner = QRect(QPoint(), inner.size());
+		const auto fg = st::radialFg->c;
+		const auto fade = st::radialBg->c;
+		const auto fadeAlpha = controlsShown * fade.alphaF();
+		const auto fgAlpha = 1. - fadeAlpha;
+		const auto color = (fadeAlpha == 0.) ? fg : QColor(
+			int(base::SafeRound(
+				fg.red() * fgAlpha + fade.red() * fadeAlpha)),
+			int(base::SafeRound(
+				fg.green() * fgAlpha + fade.green() * fadeAlpha)),
+			int(base::SafeRound(
+				fg.blue() * fgAlpha + fade.blue() * fadeAlpha)),
+			fg.alpha());
+
+		_owner->paintRadialLoadingContent(p, newInner, color);
+	}, true);
+}
+
+void Pip::RendererRhi::paintPlayback(QRect outer, float64 shown) {
+	paintUsingRaster(_playbackImage, outer, [&](QPainter &&p) {
+		const auto newOuter = QRect(QPoint(), outer.size());
+		_owner->paintPlaybackContent(p, newOuter, shown);
+	}, true);
+}
+
+void Pip::RendererRhi::paintVolumeController(QRect outer, float64 shown) {
+	paintUsingRaster(
+		_volumeControllerImage,
+		outer,
+		[&](QPainter &&p) {
+			const auto newOuter = QRect(QPoint(), outer.size());
+			_owner->paintVolumeControllerContent(p, newOuter, shown);
+		},
+		true);
+}
+
+void Pip::RendererRhi::paintButtonsStart() {
+	validateControls();
+}
+
+void Pip::RendererRhi::paintButton(
+		const Button &button,
+		int outerWidth,
+		float64 shown,
+		float64 over,
+		const style::icon &icon,
+		const style::icon &iconOver) {
+	const auto tryIndex = [&](int stateIndex) -> std::optional<Control> {
+		const auto result = ControlMeta(button.state, stateIndex);
+		return (result.icon == &icon && result.iconOver == &iconOver)
+			? std::make_optional(result)
+			: std::nullopt;
+	};
+	const auto meta = tryIndex(0)
+		? *tryIndex(0)
+		: tryIndex(1)
+		? *tryIndex(1)
+		: *tryIndex(2);
+	Assert(meta.icon == &icon && meta.iconOver == &iconOver);
+
+	_controlsImage.upload(_rhi, _rub);
+	if (!_controlsImage.texture()) {
+		return;
+	}
+
+	const auto iconRect = _controlsImage.texturedRect(
+		button.icon,
+		_controlsTextures[meta.index * 2 + 0]);
+	const auto overRect = _controlsImage.texturedRect(
+		button.icon,
+		_controlsTextures[meta.index * 2 + 1]);
+	const auto geo = transformRect(iconRect.geometry);
+
+	const float coords[] = {
+		geo.left(), geo.top(),
+		iconRect.texture.left(), iconRect.texture.bottom(),
+		overRect.texture.left(), overRect.texture.bottom(),
+
+		geo.right(), geo.top(),
+		iconRect.texture.right(), iconRect.texture.bottom(),
+		overRect.texture.right(), overRect.texture.bottom(),
+
+		geo.left(), geo.bottom(),
+		iconRect.texture.left(), iconRect.texture.top(),
+		overRect.texture.left(), overRect.texture.top(),
+
+		geo.right(), geo.bottom(),
+		iconRect.texture.right(), iconRect.texture.top(),
+		overRect.texture.right(), overRect.texture.top(),
+	};
+	const auto slot = allocateDrawSlot();
+	if (slot < 0) {
+		return;
+	}
+	const auto vOffset = slot * kVertexSlotSize;
+	const auto uOffset = slot * 256;
+	_rub->updateDynamicBuffer(
+		_vertexBuffer, vOffset, sizeof(coords), coords);
+
+	ImageUniforms uniforms{};
+	uniforms.viewport[0] = _viewport.width() * _factor;
+	uniforms.viewport[1] = _viewport.height() * _factor;
+	uniforms.g_opacity = float(shown);
+	uniforms.o_opacity = float(over);
+	_rub->updateDynamicBuffer(
+		_uniformBuffer, uOffset, sizeof(ImageUniforms), &uniforms);
+
+	auto *srb = allocateSrb();
+	srb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer,
+			uOffset,
+			sizeof(ImageUniforms)),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_controlsImage.texture(),
+			_sampler),
+	});
+	srb->create();
+
+	_drawCommands.push_back({
+		.pipeline = _controlsPipeline,
+		.srb = srb,
+		.vertexBuffer = _vertexBuffer,
+		.vertexOffset = quint32(vOffset),
+	});
+}
+
+auto Pip::RendererRhi::ControlMeta(OverState control, int index)
+-> Control {
+	Expects(index >= 0);
+
+	switch (control) {
+	case OverState::Close: Assert(index < 1); return {
+		0,
+		&st::pipCloseIcon,
+		&st::pipCloseIconOver,
+	};
+	case OverState::Enlarge: Assert(index < 1); return {
+		1,
+		&st::pipEnlargeIcon,
+		&st::pipEnlargeIconOver,
+	};
+	case OverState::VolumeToggle: Assert(index < 3); return {
+		(2 + index),
+		(index == 0
+			? &st::pipVolumeIcon0
+			: (index == 1)
+			? &st::pipVolumeIcon1
+			: &st::pipVolumeIcon2),
+		(index == 0
+			? &st::pipVolumeIcon0Over
+			: (index == 1)
+			? &st::pipVolumeIcon1Over
+			: &st::pipVolumeIcon2Over),
+	};
+	case OverState::Other: Assert(index < 2); return {
+		(5 + index),
+		(index ? &st::pipPauseIcon : &st::pipPlayIcon),
+		(index ? &st::pipPauseIconOver : &st::pipPlayIconOver),
+	};
+	}
+	Unexpected("Control value in Pip::RendererRhi::ControlIndex.");
+}
+
+void Pip::RendererRhi::validateControls() {
+	if (!_controlsImage.image().isNull()) {
+		return;
+	}
+	const auto metas = {
+		ControlMeta(OverState::Close),
+		ControlMeta(OverState::Enlarge),
+		ControlMeta(OverState::VolumeToggle),
+		ControlMeta(OverState::VolumeToggle, 1),
+		ControlMeta(OverState::VolumeToggle, 2),
+		ControlMeta(OverState::Other),
+		ControlMeta(OverState::Other, 1),
+	};
+	auto maxWidth = 0;
+	auto fullHeight = 0;
+	for (const auto &meta : metas) {
+		Assert(meta.icon->size() == meta.iconOver->size());
+		maxWidth = std::max(meta.icon->width(), maxWidth);
+		fullHeight += 2 * meta.icon->height();
+	}
+	auto image = QImage(
+		QSize(maxWidth, fullHeight) * _ifactor,
+		QImage::Format_ARGB32_Premultiplied);
+	image.fill(Qt::transparent);
+	image.setDevicePixelRatio(_ifactor);
+	{
+		auto p = QPainter(&image);
+		auto index = 0;
+		auto height = 0;
+		const auto paint = [&](not_null<const style::icon*> icon) {
+			icon->paint(p, 0, height, maxWidth);
+			_controlsTextures[index++] = QRect(
+				QPoint(0, height) * _ifactor,
+				icon->size() * _ifactor);
+			height += icon->height();
+		};
+		for (const auto &meta : metas) {
+			paint(meta.icon);
+			paint(meta.iconOver);
+		}
+	}
+	_controlsImage.setImage(std::move(image));
+}
+
+void Pip::RendererRhi::invalidateControls() {
+	_controlsImage.invalidate();
+	ranges::fill(_controlsTextures, QRect());
+}
+
+void Pip::RendererRhi::paintUsingRaster(
+		Ui::Rhi::Image &image,
+		QRect rect,
+		Fn<void(QPainter&&)> method,
+		bool transparent) {
+	auto raster = image.takeImage();
+	const auto size = rect.size() * _ifactor;
+	if (raster.width() < size.width()
+		|| raster.height() < size.height()) {
+		raster = QImage(size, QImage::Format_ARGB32_Premultiplied);
+		raster.setDevicePixelRatio(_factor);
+		if (!transparent
+			&& (raster.width() > size.width()
+				|| raster.height() > size.height())) {
+			raster.fill(Qt::transparent);
+		}
+	} else if (raster.devicePixelRatio() != _ifactor) {
+		raster.setDevicePixelRatio(_ifactor);
+	}
+
+	if (transparent) {
+		raster.fill(Qt::transparent);
+	}
+	method(QPainter(&raster));
+
+	image.setImage(std::move(raster), size);
+	image.upload(_rhi, _rub);
+
+	const auto textured = image.texturedRect(
+		rect,
+		QRect(QPoint(), size));
+	const auto geometry = transformRect(textured.geometry);
+	const float coords[] = {
+		geometry.left(), geometry.top(),
+		textured.texture.left(), textured.texture.bottom(),
+
+		geometry.right(), geometry.top(),
+		textured.texture.right(), textured.texture.bottom(),
+
+		geometry.left(), geometry.bottom(),
+		textured.texture.left(), textured.texture.top(),
+
+		geometry.right(), geometry.bottom(),
+		textured.texture.right(), textured.texture.top(),
+	};
+	const auto slot = allocateDrawSlot();
+	if (slot < 0) {
+		return;
+	}
+	const auto vOffset = slot * kVertexSlotSize;
+	const auto uOffset = slot * 256;
+	_rub->updateDynamicBuffer(
+		_vertexBuffer,
+		vOffset,
+		sizeof(coords),
+		coords);
+
+	ImageUniforms uniforms{};
+	uniforms.viewport[0] = _viewport.width() * _factor;
+	uniforms.viewport[1] = _viewport.height() * _factor;
+	uniforms.g_opacity = 1.0f;
+
+	_rub->updateDynamicBuffer(
+		_uniformBuffer,
+		uOffset,
+		sizeof(ImageUniforms),
+		&uniforms);
+
+	if (image.texture()) {
+		auto *srb = allocateSrb();
+		srb->setBindings({
+			QRhiShaderResourceBinding::uniformBuffer(
+				0,
+				QRhiShaderResourceBinding::VertexStage
+					| QRhiShaderResourceBinding::FragmentStage,
+				_uniformBuffer,
+				uOffset,
+				sizeof(ImageUniforms)),
+			QRhiShaderResourceBinding::sampledTexture(
+				1,
+				QRhiShaderResourceBinding::FragmentStage,
+				image.texture(),
+				_sampler),
+		});
+		srb->create();
+
+		const auto pipeline = transparent
+			? _imageBlendPipeline
+			: _imagePipeline;
+		_drawCommands.push_back({
+			.pipeline = pipeline,
+			.srb = srb,
+			.vertexBuffer = _vertexBuffer,
+			.vertexOffset = quint32(vOffset),
+		});
+	}
+}
+
+QRect Pip::RendererRhi::RoundingRect(ContentGeometry geometry) {
+	const auto inner = geometry.inner;
+	const auto attached = geometry.attached;
+	const auto added = std::max({
+		st::roundRadiusLarge,
+		inner.x(),
+		inner.y(),
+		geometry.outer.width() - inner.x() - inner.width(),
+		geometry.outer.height() - inner.y() - inner.height(),
+		PipShadow().topLeft.width(),
+		PipShadow().topLeft.height(),
+		PipShadow().topRight.width(),
+		PipShadow().topRight.height(),
+		PipShadow().bottomRight.width(),
+		PipShadow().bottomRight.height(),
+		PipShadow().bottomLeft.width(),
+		PipShadow().bottomLeft.height(),
+	});
+	return geometry.inner.marginsAdded({
+		(attached & RectPart::Left) ? added : 0,
+		(attached & RectPart::Top) ? added : 0,
+		(attached & RectPart::Right) ? added : 0,
+		(attached & RectPart::Bottom) ? added : 0,
+	});
+}
+
+Rect Pip::RendererRhi::transformRect(const Rect &raster) const {
+	return TransformRect(raster, _viewport, _factor);
+}
+
+Rect Pip::RendererRhi::transformRect(const QRectF &raster) const {
+	return TransformRect(raster, _viewport, _factor);
+}
+
+Rect Pip::RendererRhi::transformRect(const QRect &raster) const {
+	return TransformRect(Rect(raster), _viewport, _factor);
+}
+
+} // namespace Media::View
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/media/view/media_view_pip_rhi.h b/Telegram/SourceFiles/media/view/media_view_pip_rhi.h
new file mode 100644
index 00000000000000..5498c0e1844fce
--- /dev/null
+++ b/Telegram/SourceFiles/media/view/media_view_pip_rhi.h
@@ -0,0 +1,188 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "media/view/media_view_pip_renderer.h"
+#include "ui/rhi/rhi_renderer.h"
+#include "ui/rhi/rhi_image.h"
+#include "ui/gl/gl_math.h"
+
+#ifdef Q_OS_MAC
+#include "media/view/media_view_metal_texture.h"
+#endif
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+class QRhi;
+class QRhiBuffer;
+class QRhiTexture;
+class QRhiSampler;
+class QRhiGraphicsPipeline;
+class QRhiShaderResourceBindings;
+class QRhiResourceUpdateBatch;
+
+namespace Media::View {
+
+class Pip::RendererRhi final
+	: public Pip::Renderer
+	, public Ui::Rhi::Renderer {
+public:
+	explicit RendererRhi(not_null<Pip*> owner);
+	~RendererRhi();
+
+	void initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void releaseResources() override;
+
+	QColor rhiClearColor() override {
+		return QColor(0, 0, 0, 0);
+	}
+
+	std::optional<QColor> clearColor() override {
+		return QColor(0, 0, 0, 0);
+	}
+
+private:
+	struct Control {
+		int index = -1;
+		not_null<const style::icon*> icon;
+		not_null<const style::icon*> iconOver;
+	};
+
+	void paintTransformedVideoFrame(ContentGeometry geometry) override;
+	void paintTransformedStaticContent(
+		const QImage &image,
+		ContentGeometry geometry) override;
+	void paintRadialLoading(
+		QRect inner,
+		float64 controlsShown) override;
+	void paintButtonsStart() override;
+	void paintButton(
+		const Button &button,
+		int outerWidth,
+		float64 shown,
+		float64 over,
+		const style::icon &icon,
+		const style::icon &iconOver) override;
+	void paintPlayback(QRect outer, float64 shown) override;
+	void paintVolumeController(QRect outer, float64 shown) override;
+
+	void paintTransformedContent(
+		QRhiGraphicsPipeline *pipeline,
+		QRhiShaderResourceBindings *srb,
+		ContentGeometry geometry,
+		int slot);
+	void paintUsingRaster(
+		Ui::Rhi::Image &image,
+		QRect rect,
+		Fn<void(QPainter&&)> method,
+		bool transparent = false);
+	[[nodiscard]] int allocateDrawSlot();
+	[[nodiscard]] QRhiShaderResourceBindings *allocateSrb();
+
+	struct DrawCommand {
+		QRhiGraphicsPipeline *pipeline = nullptr;
+		QRhiShaderResourceBindings *srb = nullptr;
+		QRhiBuffer *vertexBuffer = nullptr;
+		quint32 vertexOffset = 0;
+	};
+
+	void createShadowTexture();
+	void createPipelines();
+	void validateControls();
+	void invalidateControls();
+
+	[[nodiscard]] static QRect RoundingRect(ContentGeometry geometry);
+	[[nodiscard]] static Control ControlMeta(
+		OverState control,
+		int index = 0);
+
+	[[nodiscard]] Ui::GL::Rect transformRect(const QRect &raster) const;
+	[[nodiscard]] Ui::GL::Rect transformRect(const QRectF &raster) const;
+	[[nodiscard]] Ui::GL::Rect transformRect(
+		const Ui::GL::Rect &raster) const;
+
+	const not_null<Pip*> _owner;
+
+	QRhi *_rhi = nullptr;
+	QRhiRenderTarget *_rt = nullptr;
+	QRhiCommandBuffer *_cb = nullptr;
+	QRhiResourceUpdateBatch *_rub = nullptr;
+	QSize _viewport;
+	float _factor = 1.;
+	int _ifactor = 1;
+
+	QRhiBuffer *_vertexBuffer = nullptr;
+	QRhiBuffer *_uniformBuffer = nullptr;
+	QRhiSampler *_sampler = nullptr;
+
+	QRhiTexture *_placeholderTexture = nullptr;
+	QRhiTexture *_rgbaTexture = nullptr;
+	QSize _rgbaSize;
+	quint64 _cacheKey = 0;
+	int _trackFrameIndex = -1;
+	bool _chromaNV12 = false;
+	bool _usingExternalVideoTextures = false;
+
+	QRhiTexture *_yTexture = nullptr;
+	QRhiTexture *_uTexture = nullptr;
+	QRhiTexture *_vTexture = nullptr;
+	QRhiTexture *_uvTexture = nullptr;
+	QSize _lumaSize;
+	QSize _chromaSize;
+
+	QRhiGraphicsPipeline *_argb32Pipeline = nullptr;
+	QRhiGraphicsPipeline *_yuv420Pipeline = nullptr;
+	QRhiGraphicsPipeline *_nv12Pipeline = nullptr;
+	QRhiGraphicsPipeline *_imagePipeline = nullptr;
+	QRhiGraphicsPipeline *_imageBlendPipeline = nullptr;
+	QRhiGraphicsPipeline *_controlsPipeline = nullptr;
+
+	// Layout-only SRBs: used solely as pipeline layout templates,
+	// not for actual draw calls. Per-draw SRBs come from _srbPool.
+	QRhiShaderResourceBindings *_argb32Srb = nullptr;
+	QRhiShaderResourceBindings *_yuv420Srb = nullptr;
+	QRhiShaderResourceBindings *_nv12Srb = nullptr;
+	QRhiShaderResourceBindings *_imageSrb = nullptr;
+	QRhiShaderResourceBindings *_controlsSrb = nullptr;
+
+	std::vector<QRhiShaderResourceBindings*> _srbPool;
+	int _nextSrbIndex = 0;
+
+	Ui::Rhi::Image _shadowImage;
+	Ui::Rhi::Image _radialImage;
+	Ui::Rhi::Image _controlsImage;
+	Ui::Rhi::Image _playbackImage;
+	Ui::Rhi::Image _volumeControllerImage;
+
+	static constexpr auto kControlsCount = 7;
+	static constexpr auto kMaxDraws = 12;
+	static constexpr auto kVertexSlotSize = 4 * 6 * sizeof(float);
+	std::array<QRect, kControlsCount * 2> _controlsTextures;
+	std::vector<DrawCommand> _drawCommands;
+	int _nextDrawSlot = 0;
+
+	bool _initialized = false;
+
+#ifdef Q_OS_MAC
+	MetalTextureCache _metalTextureCache;
+#endif
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Media::View
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
index 896a66ec767fcf..6fb911a43d9722 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "media/player/media_player_button.h"
 #include "media/player/media_player_dropdown.h"
 #include "media/view/media_view_playback_progress.h"
+#include "ui/widgets/cross_fade_label.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/continuous_sliders.h"
 #include "ui/effects/fade_animation.h"
@@ -23,19 +24,26 @@ For license and copyright information please follow this link:
 
 namespace Media {
 namespace View {
+namespace  {
+
+constexpr auto kEps = 0.005;
+
+} // namespace
 
 PlaybackControls::PlaybackControls(
 	QWidget *parent,
 	not_null<Delegate*> delegate)
 : RpWidget(parent)
 , _delegate(delegate)
+, _speedControllable(Media::Audio::SupportsSpeedControl())
+, _qualitiesList(_delegate->playbackControlsQualities())
 , _playPauseResume(this, st::mediaviewPlayButton)
 , _playbackSlider(this, st::mediaviewPlayback)
 , _playbackProgress(std::make_unique<PlaybackProgress>())
 , _volumeToggle(this, st::mediaviewVolumeToggle)
 , _volumeController(this, st::mediaviewPlayback)
-, _speedToggle(Media::Audio::SupportsSpeedControl()
-	? object_ptr<Player::SpeedButton>(this, st::mediaviewSpeedButton)
+, _speedToggle((_speedControllable || !_qualitiesList.empty())
+	? object_ptr<Player::SettingsButton>(this, st::mediaviewSpeedButton)
 	: nullptr)
 , _fullScreenToggle(this, st::mediaviewFullScreenButton)
 , _pictureInPicture(this, st::mediaviewPipButton)
@@ -44,10 +52,20 @@ PlaybackControls::PlaybackControls(
 , _speedController(_speedToggle
 	? std::make_unique<Player::SpeedController>(
 		_speedToggle.data(),
+		_speedToggle->st(),
 		parent,
 		[=](bool) {},
-		[=](bool lastNonDefault) { return speedLookup(lastNonDefault); },
-		[=](float64 speed) { saveSpeed(speed); })
+		(_speedControllable
+			? [=](bool lastNonDefault) {
+				return speedLookup(lastNonDefault);
+			}
+			: Fn<float64(bool)>()),
+		(_speedControllable
+			? [=](float64 speed) { saveSpeed(speed); }
+			: Fn<void(float64)>()),
+		_qualitiesList,
+		[=] { return _delegate->playbackControlsCurrentQuality(); },
+		[=](Media::VideoQuality quality) { saveQuality(quality); })
 	: nullptr)
 , _fadeAnimation(std::make_unique<Ui::FadeAnimation>(this)) {
 	_fadeAnimation->show();
@@ -58,6 +76,18 @@ PlaybackControls::PlaybackControls(
 		fadeUpdated(opacity);
 	});
 
+	_speedToggle->setSpeed(_speedControllable
+		? _delegate->playbackControlsCurrentSpeed(false)
+		: 1.);
+	updateSpeedToggleQuality();
+
+	if (const auto controller = _speedController.get()) {
+		controller->menuToggledValue(
+		) | rpl::on_next([=](bool toggled) {
+			_speedToggle->setActive(toggled);
+		}, _speedToggle->lifetime());
+	}
+
 	_pictureInPicture->addClickHandler([=] {
 		_delegate->playbackControlsToPictureInPicture();
 	});
@@ -119,6 +149,7 @@ void PlaybackControls::handleSeekProgress(float64 progress) {
 	if (_seekPositionMs != positionMs) {
 		_seekPositionMs = positionMs;
 		refreshTimeTexts();
+		updateTimestampLabel();
 
 		// This may destroy PlaybackControls.
 		_delegate->playbackControlsSeekProgress(positionMs);
@@ -183,15 +214,31 @@ void PlaybackControls::fadeUpdated(float64 opacity) {
 	_volumeController->setFadeOpacity(opacity);
 }
 
-
 float64 PlaybackControls::speedLookup(bool lastNonDefault) const {
 	return _delegate->playbackControlsCurrentSpeed(lastNonDefault);
 }
 
 void PlaybackControls::saveSpeed(float64 speed) {
+	_speedToggle->setSpeed(speed);
 	_delegate->playbackControlsSpeedChanged(speed);
 }
 
+void PlaybackControls::saveQuality(Media::VideoQuality quality) {
+	_speedToggle->setQuality(quality);
+	_delegate->playbackControlsQualityChanged(quality);
+}
+
+void PlaybackControls::updateSpeedToggleQuality() {
+	const auto qualities = _delegate->playbackControlsQualities();
+	if (_qualitiesList != qualities) {
+		_qualitiesList = qualities;
+		if (_speedController) {
+			_speedController->setQualities(qualities);
+		}
+	}
+	_speedToggle->setQuality(_delegate->playbackControlsCurrentQuality());
+}
+
 void PlaybackControls::updatePlaybackSpeed(float64 speed) {
 	DEBUG_LOG(("Media playback speed: update to %1.").arg(speed));
 	_delegate->playbackControlsSpeedChanged(speed);
@@ -202,6 +249,7 @@ void PlaybackControls::updatePlayback(const Player::TrackState &state) {
 	updatePlayPauseResumeState(state);
 	_playbackProgress->updateState(state, countDownloadedTillPercent(state));
 	updateTimeTexts(state);
+	updateTimestampLabel();
 }
 
 void PlaybackControls::updateVolumeToggleIcon() {
@@ -233,6 +281,87 @@ float64 PlaybackControls::countDownloadedTillPercent(
 	return (_loadingReady - header) / float64(_loadingTotal - header);
 }
 
+void PlaybackControls::setTimestamps(std::vector<TimestampData> timestamps) {
+	_playbackSlider->clearDividers();
+	_playbackSlider->setDividerStyle(
+		Ui::MediaSlider::DividerStyle::Gaps);
+	_timestamps = std::move(timestamps);
+	for (const auto &ts : _timestamps) {
+		if (ts.position > 0.) {
+			_playbackSlider->addDivider(
+				ts.position,
+				st::mediaviewPlaybackTimestamp);
+		}
+	}
+	const auto hasLabels = ranges::any_of(
+		_timestamps,
+		[](const auto &ts) { return !ts.label.isEmpty(); });
+	if (hasLabels && !_timestampLabel) {
+		_timestampLabel.create(
+			this,
+			st::mediaviewTimestampLabel);
+		_timestampLabel->show();
+	} else if (!hasLabels) {
+		_timestampLabel.destroy();
+	}
+	_playbackSlider->update();
+	_currentTimestampIndex = -1;
+	updateTimestampLabel();
+}
+
+bool PlaybackControls::hasTimestamps() const {
+	return _timestampLabel != nullptr;
+}
+
+auto PlaybackControls::nextTimestamp(float64 progress) const
+-> std::optional<TimestampData> {
+	for (const auto &ts : _timestamps) {
+		if (ts.position > progress + kEps) {
+			return ts;
+		}
+	}
+	return std::nullopt;
+}
+
+auto PlaybackControls::prevTimestamp(float64 progress) const
+-> std::optional<TimestampData> {
+	for (auto i = int(_timestamps.size()) - 1; i >= 0; --i) {
+		if (_timestamps[i].position < progress - kEps) {
+			return _timestamps[i];
+		}
+	}
+	return std::nullopt;
+}
+
+void PlaybackControls::updateTimestampLabel() {
+	if (!_timestampLabel) {
+		return;
+	}
+	const auto progress = _playbackSlider->value();
+	auto index = -1;
+	for (auto i = int(_timestamps.size()) - 1; i >= 0; --i) {
+		if (_timestamps[i].position <= progress) {
+			index = i;
+			break;
+		}
+	}
+	if (index == _currentTimestampIndex) {
+		return;
+	}
+	const auto previous = _currentTimestampIndex;
+	_currentTimestampIndex = index;
+	_timestampLabel->setDirection((index > previous) ? 1 : -1);
+	auto text = (index >= 0) ? _timestamps[index].label : QString();
+	const auto maxWidth = _playbackSlider->width();
+	if (maxWidth > 0
+		&& st::mediaviewTimestampLabel.font->width(text) > maxWidth) {
+		text = st::mediaviewTimestampLabel.font->elided(text, maxWidth);
+	}
+	_timestampLabel->setText(text);
+	resizeEvent(nullptr);
+	refreshFadeCache();
+}
+
 void PlaybackControls::setLoadingProgress(int64 ready, int64 total) {
 	if (_loadingReady == ready && _loadingTotal == total) {
 		return;
@@ -341,6 +470,15 @@ void PlaybackControls::resizeEvent(QResizeEvent *e) {
 	_playbackSlider->resize(playbackWidth, st::mediaviewPlayback.seekSize.height());
 	_playbackSlider->moveToLeft(textLeft + 2 * textSkip + _playedAlready->width(), st::mediaviewPlaybackTop);
 
+	if (_timestampLabel) {
+		_timestampLabel->resize(
+			_playbackSlider->width(),
+			_timestampLabel->height());
+		_timestampLabel->moveToLeft(
+			_playbackSlider->x(),
+			st::mediaviewTimestampLabelTop);
+	}
+
 	_playPauseResume->moveToLeft(
 		(width() - _playPauseResume->width()) / 2,
 		st::mediaviewPlayButtonTop);
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.h b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
index ac5e15baa074dd..1c06dfb6b62c64 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.h
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.h
@@ -9,8 +9,10 @@ For license and copyright information please follow this link:
 
 #include "ui/rp_widget.h"
 #include "base/object_ptr.h"
+#include "media/media_common.h"
 
 namespace Ui {
+class CrossFadeLabel;
 class LabelSimple;
 class FadeAnimation;
 class IconButton;
@@ -18,14 +20,13 @@ class MediaSlider;
 class PopupMenu;
 } // namespace Ui
 
-namespace Media {
-namespace Player {
+namespace Media::Player {
 struct TrackState;
-class SpeedButton;
+class SettingsButton;
 class SpeedController;
-} // namespace Player
+} // namespace Media::Player
 
-namespace View {
+namespace Media::View {
 
 class PlaybackProgress;
 
@@ -44,12 +45,23 @@ class PlaybackControls : public Ui::RpWidget {
 		virtual void playbackControlsSpeedChanged(float64 speed) = 0;
 		[[nodiscard]] virtual float64 playbackControlsCurrentSpeed(
 			bool lastNonDefault) = 0;
+		[[nodiscard]] virtual auto playbackControlsQualities()
+			-> std::vector<Media::VideoQuality> = 0;
+		[[nodiscard]] virtual auto playbackControlsCurrentQuality()
+			-> VideoQuality = 0;
+		virtual void playbackControlsQualityChanged(
+			Media::VideoQuality quality) = 0;
 		virtual void playbackControlsToFullScreen() = 0;
 		virtual void playbackControlsFromFullScreen() = 0;
 		virtual void playbackControlsToPictureInPicture() = 0;
 		virtual void playbackControlsRotate() = 0;
 	};
 
+	struct TimestampData {
+		float64 position = 0.;
+		QString label;
+	};
+
 	PlaybackControls(QWidget *parent, not_null<Delegate*> delegate);
 	~PlaybackControls();
 
@@ -58,7 +70,15 @@ class PlaybackControls : public Ui::RpWidget {
 
 	void updatePlayback(const Player::TrackState &state);
 	void setLoadingProgress(int64 ready, int64 total);
+	void setTimestamps(std::vector<TimestampData> timestamps);
 	void setInFullScreen(bool inFullScreen);
+	void updatePlaybackSpeed(float64 speed);
+	void updateSpeedToggleQuality();
+	[[nodiscard]] bool hasTimestamps() const;
+	[[nodiscard]] std::optional<TimestampData> nextTimestamp(
+		float64 progress) const;
+	[[nodiscard]] std::optional<TimestampData> prevTimestamp(
+		float64 progress) const;
 	[[nodiscard]] bool hasMenu() const;
 	[[nodiscard]] bool dragging() const;
 
@@ -79,7 +99,6 @@ class PlaybackControls : public Ui::RpWidget {
 	[[nodiscard]] float64 countDownloadedTillPercent(
 		const Player::TrackState &state) const;
 
-	void updatePlaybackSpeed(float64 speed);
 	void updateVolumeToggleIcon();
 	void updateDownloadProgressPosition();
 
@@ -90,8 +109,14 @@ class PlaybackControls : public Ui::RpWidget {
 	[[nodiscard]] float64 speedLookup(bool lastNonDefault) const;
 	void saveSpeed(float64 speed);
 
+	void saveQuality(Media::VideoQuality quality);
+	void updateTimestampLabel();
+
 	const not_null<Delegate*> _delegate;
 
+	bool _speedControllable = false;
+	std::vector<Media::VideoQuality> _qualitiesList;
+
 	bool _inFullScreen = false;
 	bool _showPause = false;
 	bool _childrenHidden = false;
@@ -108,16 +133,18 @@ class PlaybackControls : public Ui::RpWidget {
 	std::unique_ptr<PlaybackProgress> _receivedTillProgress;
 	object_ptr<Ui::IconButton> _volumeToggle;
 	object_ptr<Ui::MediaSlider> _volumeController;
-	object_ptr<Player::SpeedButton> _speedToggle;
+	object_ptr<Player::SettingsButton> _speedToggle;
 	object_ptr<Ui::IconButton> _fullScreenToggle;
 	object_ptr<Ui::IconButton> _pictureInPicture;
 	object_ptr<Ui::LabelSimple> _playedAlready;
 	object_ptr<Ui::LabelSimple> _toPlayLeft;
 	object_ptr<Ui::LabelSimple> _downloadProgress = { nullptr };
+	object_ptr<Ui::CrossFadeLabel> _timestampLabel = { nullptr };
+	std::vector<TimestampData> _timestamps;
+	int _currentTimestampIndex = -1;
 	std::unique_ptr<Player::SpeedController> _speedController;
 	std::unique_ptr<Ui::FadeAnimation> _fadeAnimation;
 
 };
 
-} // namespace View
-} // namespace Media
+} // namespace Media::View
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_sponsored.cpp b/Telegram/SourceFiles/media/view/media_view_playback_sponsored.cpp
new file mode 100644
index 00000000000000..8024ceed8c5f3c
--- /dev/null
+++ b/Telegram/SourceFiles/media/view/media_view_playback_sponsored.cpp
@@ -0,0 +1,765 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/view/media_view_playback_sponsored.h"
+
+#include "boxes/premium_preview_box.h"
+#include "data/components/sponsored_messages.h"
+#include "data/data_file_origin.h"
+#include "data/data_photo.h"
+#include "data/data_photo_media.h"
+#include "data/data_session.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "menu/menu_sponsored.h"
+#include "ui/effects/numbers_animation.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/basic_click_handlers.h"
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "ui/cached_round_corners.h"
+#include "styles/style_chat.h"
+#include "styles/style_media_view.h"
+
+namespace Media::View {
+namespace {
+
+constexpr auto kStartDelayMin = crl::time(1000);
+constexpr auto kDurationMin = 5 * crl::time(1000);
+
+enum class Action {
+	Close,
+	PromotePremium,
+	Pause,
+	Unpause,
+};
+
+class Close final : public Ui::RippleButton {
+public:
+	Close(
+		not_null<QWidget*> parent,
+		const style::RippleAnimation &st,
+		rpl::producer<crl::time> allowCloseAt);
+
+	[[nodiscard]] rpl::producer<Action> actions() const;
+
+private:
+	QPoint prepareRippleStartPosition() const override;
+	QImage prepareRippleMask() const override;
+	void paintEvent(QPaintEvent *e) override;
+
+	void updateProgress(crl::time now);
+
+	rpl::event_stream<Action> _actions;
+
+	Ui::NumbersAnimation _countdown;
+	Ui::Animations::Basic _progress;
+	base::Timer _noAnimationTimer;
+	crl::time _allowCloseAt = 0;
+	crl::time _startedAt = 0;
+	crl::time _pausedAt = 0;
+	int _secondsTill = 0;
+	int _rippleSize = 0;
+	QPoint _rippleOrigin;
+	bool _allowClose = false;
+
+};
+
+Close::Close(
+	not_null<QWidget*> parent,
+	const style::RippleAnimation &st,
+	rpl::producer<crl::time> allowCloseAt)
+: RippleButton(parent, st)
+, _countdown(st::mediaSponsoredCloseFont, [=] { update(); })
+, _progress([=](crl::time now) { updateProgress(now); })
+, _noAnimationTimer([=] { updateProgress(crl::now()); })
+, _startedAt(crl::now()) {
+	resize(st::mediaSponsoredCloseFull, st::mediaSponsoredCloseFull);
+
+	const auto size = st::mediaSponsoredCloseRipple;
+	const auto cut = int(base::SafeRound((width() - size) / 2.));
+	_rippleSize = std::min(width() - 2 * cut, height() - 2 * cut);
+	_rippleOrigin = QPoint(
+		(width() - _rippleSize) / 2,
+		(height() - _rippleSize) / 2);
+
+	std::move(
+		allowCloseAt
+	) | rpl::on_next([=](crl::time at) {
+		const auto now = crl::now();
+		if (!at) {
+			updateProgress(now);
+			_pausedAt = now;
+			_progress.stop();
+		} else {
+			if (_pausedAt) {
+				_startedAt += now - base::take(_pausedAt);
+			}
+			_allowCloseAt = at;
+			updateProgress(now);
+			if (!anim::Disabled()) {
+				_progress.start();
+			} else if (!_allowClose) {
+				_noAnimationTimer.callEach(crl::time(200));
+			}
+		}
+	}, lifetime());
+	updateProgress(_startedAt);
+
+	setClickedCallback([=] {
+		_actions.fire(_allowClose ? Action::Close : Action::PromotePremium);
+	});
+}
+
+rpl::producer<Action> Close::actions() const {
+	return _actions.events();
+}
+
+void Close::updateProgress(crl::time now) {
+	update();
+}
+
+QPoint Close::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos()) - _rippleOrigin;
+}
+
+QImage Close::prepareRippleMask() const {
+	return Ui::RippleAnimation::EllipseMask({ _rippleSize, _rippleSize });
+}
+
+void Close::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	paintRipple(p, _rippleOrigin);
+
+	const auto now = crl::now();
+	if (!_pausedAt) {
+		_allowClose = (now >= _allowCloseAt);
+	}
+	const auto msTill = _allowCloseAt - (_pausedAt ? _pausedAt : now);
+	const auto msFull = _allowCloseAt - _startedAt;
+	const auto secondsTill = (std::max(msTill, crl::time()) + 999) / 1000;
+	const auto secondsFull = (std::max(msFull, crl::time()) + 999) / 1000;
+	const auto allowCloseLeft = anim::Disabled()
+		? (secondsFull ? (secondsTill / float64(secondsFull)) : 0)
+		: std::max(msFull ? (msTill / float64(msFull)) : 0., 0.);
+	const auto duration = crl::time(st::fadeWrapDuration);
+	const auto allowedProgress = anim::Disabled()
+		? (secondsTill ? 0. : 1.)
+		: std::clamp(-msTill, crl::time(), duration) / float64(duration);
+
+	if (_secondsTill != secondsTill) {
+		const auto initial = !_secondsTill;
+		_secondsTill = secondsTill;
+		_countdown.setText(QString::number(_secondsTill), _secondsTill);
+		if (initial) {
+			_countdown.finishAnimating();
+		}
+	}
+
+	auto pen = st::mediaviewTextLinkFg->p;
+	if (allowedProgress < 1.) {
+		if (allowedProgress > 0.) {
+			p.setOpacity(1. - allowedProgress);
+		}
+		p.setPen(pen);
+
+		const auto inner = QRect(
+			(width() - st::mediaSponsoredCloseDiameter) / 2,
+			(height() - st::mediaSponsoredCloseDiameter) / 2,
+			st::mediaSponsoredCloseDiameter,
+			st::mediaSponsoredCloseDiameter);
+		_countdown.paint(
+			p,
+			inner.x() + (inner.width() - _countdown.countWidth()) / 2,
+			(inner.y()
+				+ (inner.height()
+					- st::mediaSponsoredCloseFont->height) / 2),
+			width());
+
+		const auto skip = 0.23;
+		const auto len = int(base::SafeRound(
+			arc::kFullLength * (1. - skip) * allowCloseLeft));
+		if (len > 0) {
+			const auto from = arc::kFullLength / 4;
+			auto hq = PainterHighQualityEnabler(p);
+			pen.setWidthF(st::mediaSponsoredCloseStroke);
+			pen.setCapStyle(Qt::RoundCap);
+			p.setPen(pen);
+			p.drawArc(inner, from, len);
+		}
+
+		p.setOpacity(1.);
+	}
+
+	const auto sizeFinal = st::mediaSponsoredCloseSize;
+	const auto sizeSmall = st::mediaSponsoredCloseCorner;
+	const auto twiceFinal = st::mediaSponsoredCloseTwice;
+	const auto twiceSmall = st::mediaSponsoredCloseSmall;
+	const auto size = sizeSmall + allowedProgress * (sizeFinal - sizeSmall);
+	const auto twice = twiceSmall
+		+ allowedProgress * (twiceFinal - twiceSmall);
+	const auto leftFinal = (width() - size) / 2.;
+	const auto leftSmall = (width() + st::mediaSponsoredCloseDiameter) / 2.
+		- (st::mediaSponsoredCloseStroke / 2.)
+		- sizeSmall;
+	const auto topFinal = (height() - size) / 2.;
+	const auto topSmall = (height() - st::mediaSponsoredCloseDiameter) / 2.;
+	const auto left = leftSmall + allowedProgress * (leftFinal - leftSmall);
+	const auto top = topSmall + allowedProgress * (topFinal - topSmall);
+
+	auto hq = PainterHighQualityEnabler(p);
+	pen.setWidthF(twice / 2.);
+	p.setPen(pen);
+	p.drawLine(QPointF(left, top), QPointF(left + size, top + size));
+	p.drawLine(QPointF(left + size, top), QPointF(left, top + size));
+}
+
+[[nodiscard]] style::RoundButton PrepareAboutStyle() {
+	static auto textBg = style::complex_color([] {
+		auto result = st::mediaviewTextLinkFg->c;
+		result.setAlphaF(result.alphaF() * 0.1);
+		return result;
+	});
+	static auto textBgOver = style::complex_color([] {
+		auto result = st::mediaviewTextLinkFg->c;
+		result.setAlphaF(result.alphaF() * 0.15);
+		return result;
+	});
+	static auto rippleColor = style::complex_color([] {
+		auto result = st::mediaviewTextLinkFg->c;
+		result.setAlphaF(result.alphaF() * 0.2);
+		return result;
+	});
+
+	auto result = st::mediaSponsoredAbout;
+	result.textFg = st::mediaviewTextLinkFg;
+	result.textFgOver = st::mediaviewTextLinkFg;
+	result.textBg = textBg.color();
+	result.textBgOver = textBgOver.color();
+	result.ripple.color = rippleColor.color();
+	return result;
+}
+
+} // namespace
+
+class PlaybackSponsored::Message final : public Ui::RpWidget {
+public:
+	Message(
+		QWidget *parent,
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::SponsoredMessage &data,
+		rpl::producer<crl::time> allowCloseAt);
+
+	[[nodiscard]] rpl::producer<Action> actions() const;
+
+	void setFinalPosition(int x, int y);
+
+	void fadeIn();
+	void fadeOut(Fn<void()> hidden);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+
+	int resizeGetHeight(int newWidth) override;
+
+	void populate();
+	void startFadeIn();
+	void updateShown(Fn<void()> finished = nullptr);
+	void startFade(Fn<void()> finished);
+
+	const not_null<Main::Session*> _session;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const Data::SponsoredMessage _data;
+
+	style::RoundButton _aboutSt;
+	std::unique_ptr<Ui::RoundButton> _about;
+	std::unique_ptr<Close> _close;
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
+	rpl::event_stream<Action> _actions;
+
+	std::shared_ptr<Data::PhotoMedia> _photo;
+	Ui::Text::String _title;
+	Ui::Text::String _text;
+
+	QPoint _finalPosition;
+	int _left = 0;
+	int _top = 0;
+	int _titleHeight = 0;
+	int _textHeight = 0;
+
+	QImage _cache;
+	Ui::Animations::Simple _showAnimation;
+	bool _shown = false;
+	bool _over = false;
+	bool _pressed = false;
+
+	rpl::lifetime _photoLifetime;
+
+};
+
+PlaybackSponsored::Message::Message(
+	QWidget *parent,
+	std::shared_ptr<ChatHelpers::Show> show,
+	const Data::SponsoredMessage &data,
+	rpl::producer<crl::time> allowCloseAt)
+: RpWidget(parent)
+, _session(&data.history->session())
+, _show(std::move(show))
+, _data(data)
+, _aboutSt(PrepareAboutStyle())
+, _about(std::make_unique<Ui::RoundButton>(
+	this,
+	tr::lng_search_sponsored_button(),
+	_aboutSt))
+, _close(
+	std::make_unique<Close>(
+		this,
+		_aboutSt.ripple,
+		std::move(allowCloseAt))) {
+	setMouseTracking(true);
+	populate();
+	hide();
+}
+
+rpl::producer<Action> PlaybackSponsored::Message::actions() const {
+	return rpl::merge(_actions.events(), _close->actions());
+}
+
+void PlaybackSponsored::Message::setFinalPosition(int x, int y) {
+	_finalPosition = { x, y };
+	if (_shown) {
+		updateShown();
+	}
+}
+
+void PlaybackSponsored::Message::fadeIn() {
+	_shown = true;
+	if (!_photo || _photo->loaded()) {
+		startFadeIn();
+		return;
+	}
+	_photo->owner()->session().downloaderTaskFinished(
+	) | rpl::filter([=] {
+		return _photo->loaded();
+	}) | rpl::on_next([=] {
+		_photoLifetime.destroy();
+		startFadeIn();
+	}, _photoLifetime);
+}
+
+void PlaybackSponsored::Message::startFadeIn() {
+	if (!_shown) {
+		return;
+	}
+	startFade([=] {
+		_session->sponsoredMessages().view(_data.randomId);
+	});
+	show();
+}
+
+void PlaybackSponsored::Message::fadeOut(Fn<void()> hidden) {
+	if (!_shown) {
+		if (const auto onstack = hidden) {
+			onstack();
+		}
+		return;
+	}
+	_shown = false;
+	startFade(std::move(hidden));
+}
+
+void PlaybackSponsored::Message::startFade(Fn<void()> finished) {
+	_cache = Ui::GrabWidgetToImage(this);
+	_about->hide();
+	_close->hide();
+	const auto from = _shown ? 0. : 1.;
+	const auto till = _shown ? 1. : 0.;
+	_showAnimation.start([=] {
+		updateShown(finished);
+	}, from, till, st::fadeWrapDuration);
+}
+
+void PlaybackSponsored::Message::updateShown(Fn<void()> finished) {
+	const auto shown = _showAnimation.value(_shown ? 1. : 0.);
+	const auto shift = anim::interpolate(st::mediaSponsoredShift, 0, shown);
+	move(_finalPosition.x(), _finalPosition.y() + shift);
+	update();
+	if (!_showAnimation.animating()) {
+		_cache = QImage();
+		_close->show();
+		_about->show();
+		if (const auto onstack = finished) {
+			onstack();
+		}
+	}
+}
+
+void PlaybackSponsored::Message::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	const auto shown = _showAnimation.value(_shown ? 1. : 0.);
+	if (!_cache.isNull()) {
+		p.setOpacity(shown);
+		p.drawImage(0, 0, _cache);
+		return;
+	}
+
+	Ui::FillRoundRect(
+		p,
+		rect(),
+		st::mediaviewSaveMsgBg,
+		Ui::MediaviewSaveCorners);
+
+	const auto &padding = st::mediaSponsoredPadding;
+	if (_photo) {
+		if (const auto image = _photo->image(Data::PhotoSize::Large)) {
+			const auto size = st::mediaSponsoredThumb;
+			const auto x = padding.left();
+			const auto y = (height() - size) / 2;
+			p.drawPixmap(
+				x,
+				y,
+				image->pixSingle(
+					size,
+					size,
+					{ .options = Images::Option::RoundCircle }));
+		}
+	}
+
+	p.setPen(st::mediaviewControlFg);
+
+	_title.draw(p, {
+		.position = { _left, _top },
+		.availableWidth = _about->x() - _left,
+		.palette = &st::mediaviewTextPalette,
+	});
+
+	_text.draw(p, {
+		.position = { _left, _top + _titleHeight },
+		.availableWidth = _close->x() - _left,
+		.palette = &st::mediaviewTextPalette,
+	});
+}
+
+void PlaybackSponsored::Message::mouseMoveEvent(QMouseEvent *e) {
+	const auto &padding = st::mediaSponsoredPadding;
+	const auto point = e->pos();
+	const auto about = _about->geometry();
+	const auto close = _close->geometry();
+	const auto over = !about.marginsAdded(padding).contains(point)
+		&& !close.marginsAdded(padding).contains(point);
+	if (_over != over) {
+		_over = over;
+		setCursor(_over ? style::cur_pointer : style::cur_default);
+	}
+}
+
+void PlaybackSponsored::Message::mousePressEvent(QMouseEvent *e) {
+	if (_over) {
+		_pressed = true;
+	}
+}
+
+void PlaybackSponsored::Message::mouseReleaseEvent(QMouseEvent *e) {
+	if (base::take(_pressed) && _over) {
+		_session->sponsoredMessages().clicked(_data.randomId, false, false);
+		UrlClickHandler::Open(_data.link);
+	}
+}
+
+int PlaybackSponsored::Message::resizeGetHeight(int newWidth) {
+	const auto &padding = st::mediaSponsoredPadding;
+	const auto userpic = st::mediaSponsoredThumb;
+	_left = padding.left() + (_photo ? (userpic + padding.left()) : 0);
+	const auto innerWidth = newWidth - _left - _close->width();
+	const auto titleWidth = innerWidth - _about->width() - padding.right();
+	_titleHeight = _title.countHeight(titleWidth);
+	_textHeight = _text.countHeight(innerWidth);
+
+	const auto use = std::max(_titleHeight + _textHeight, userpic);
+
+	const auto height = padding.top() + use + padding.bottom();
+	_top = padding.top() + (use - _titleHeight - _textHeight) / 2;
+
+	_about->move(
+		_left + std::min(titleWidth, _title.maxWidth()) + padding.right(),
+		_top);
+	_close->move(
+		newWidth - _close->width(),
+		(height - _close->height()) / 2);
+
+	return height;
+}
+
+void PlaybackSponsored::Message::populate() {
+	const auto &from = _data.from;
+	const auto photo = from.photoId
+		? _data.history->owner().photo(from.photoId).get()
+		: nullptr;
+	if (photo) {
+		_photo = photo->createMediaView();
+		photo->load({}, LoadFromCloudOrLocal, true);
+	}
+	_title = Ui::Text::String(
+		st::semiboldTextStyle,
+		from.title,
+		kDefaultTextOptions,
+		st::msgMinWidth);
+	_text = Ui::Text::String(
+		st::defaultTextStyle,
+		_data.textWithEntities,
+		kMarkupTextOptions,
+		st::msgMinWidth);
+
+	_about->setClickedCallback([=] {
+		_menu = nullptr;
+		const auto parent = parentWidget();
+		_menu = base::make_unique_q<Ui::PopupMenu>(
+			parent,
+			st::mediaviewPopupMenu);
+		const auto raw = _menu.get();
+		const auto addAction = Ui::Menu::CreateAddActionCallback(raw);
+		Menu::FillSponsored(
+			addAction,
+			_show,
+			Menu::SponsoredPhrases::Channel,
+			_session->sponsoredMessages().lookupDetails(_data),
+			_session->sponsoredMessages().createReportCallback(
+				_data.randomId,
+				crl::guard(this, [=] { _actions.fire(Action::Close); })),
+			{ .dark = true });
+		_actions.fire(Action::Pause);
+		Ui::Connect(raw, &QObject::destroyed, this, [=] {
+			_actions.fire(Action::Unpause);
+		});
+		raw->popup(QCursor::pos());
+	});
+}
+
+PlaybackSponsored::PlaybackSponsored(
+	not_null<Ui::RpWidget*> controls,
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<HistoryItem*> item)
+: _parent(controls->parentWidget())
+, _session(&item->history()->session())
+, _show(std::move(show))
+, _itemId(item->fullId())
+, _controlsGeometry(controls->geometryValue())
+, _timer([=] { update(); }) {
+	_session->sponsoredMessages().requestForVideo(item, crl::guard(this, [=](
+			Data::SponsoredForVideo data) {
+		if (data.list.empty()) {
+			return;
+		}
+		_data = std::move(data);
+		if (_data->state.initial()
+			|| (_data->state.itemIndex > _data->list.size())
+			|| (_data->state.itemIndex == _data->list.size()
+				&& _data->state.leftTillShow <= 0)) {
+			_data->state.itemIndex = 0;
+			_data->state.leftTillShow = std::max(
+				_data->startDelay,
+				kStartDelayMin);
+		}
+		update();
+	}));
+}
+
+PlaybackSponsored::~PlaybackSponsored() {
+	saveState();
+}
+
+void PlaybackSponsored::start() {
+	_started = true;
+	if (!_paused) {
+		_start = crl::now();
+		update();
+	}
+}
+
+void PlaybackSponsored::setPaused(bool paused) {
+	setPausedOutside(paused);
+}
+
+void PlaybackSponsored::updatePaused() {
+	const auto paused = _pausedInside || _pausedOutside;
+	if (_paused == paused) {
+		return;
+	} else if (_started && paused) {
+		update();
+	}
+	_paused = paused;
+	if (!_started) {
+		return;
+	} else if (_paused) {
+		_start = 0;
+		_timer.cancel();
+		_allowCloseAt = 0;
+	} else {
+		_start = crl::now();
+		update();
+	}
+}
+
+void PlaybackSponsored::setPausedInside(bool paused) {
+	if (_pausedInside == paused) {
+		return;
+	}
+	_pausedInside = paused;
+	updatePaused();
+}
+
+void PlaybackSponsored::setPausedOutside(bool paused) {
+	if (_pausedOutside == paused) {
+		return;
+	}
+	_pausedOutside = paused;
+	updatePaused();
+}
+
+void PlaybackSponsored::finish() {
+	_timer.cancel();
+	if (_data) {
+		saveState();
+		_data = std::nullopt;
+	}
+}
+
+void PlaybackSponsored::update() {
+	if (!_data || !_start) {
+		return;
+	}
+
+	const auto [now, state] = computeState();
+	const auto message = (_data->state.itemIndex < _data->list.size())
+		? &_data->list[state.itemIndex]
+		: nullptr;
+	const auto duration = message
+		? std::max(
+			message->durationMin + kDurationMin,
+			message->durationMax)
+		: crl::time(0);
+	if (_data->state.leftTillShow > 0 && state.leftTillShow <= 0) {
+		_data->state.leftTillShow = 0;
+		if (duration) {
+			_allowCloseAt = now + message->durationMin;
+			show(*message);
+
+			_start = now;
+			_timer.callOnce(duration);
+			saveState();
+		} else {
+			finish();
+		}
+	} else if (_data->state.leftTillShow <= 0
+		&& state.leftTillShow <= -duration) {
+		hide(now);
+	} else {
+		if (state.leftTillShow <= 0 && duration) {
+			_allowCloseAt = now + state.leftTillShow + message->durationMin;
+			if (!_widget) {
+				show(*message);
+			}
+		}
+		_data->state = state;
+		_timer.callOnce((state.leftTillShow > 0)
+			? state.leftTillShow
+			: (state.leftTillShow + duration));
+	}
+}
+
+
+void PlaybackSponsored::show(const Data::SponsoredMessage &data) {
+	_widget = std::make_unique<Message>(
+		_parent,
+		_show,
+		data,
+		_allowCloseAt.value());
+	const auto raw = _widget.get();
+
+	_controlsGeometry.value() | rpl::on_next([=](QRect controls) {
+		raw->resizeToWidth(controls.width());
+		raw->setFinalPosition(
+			controls.x(),
+			controls.y() - st::mediaSponsoredSkip - raw->height());
+	}, raw->lifetime());
+
+	raw->actions() | rpl::on_next([=](Action action) {
+		switch (action) {
+		case Action::Close: hide(crl::now()); break;
+		case Action::PromotePremium: showPremiumPromo(); break;
+		case Action::Pause: setPausedInside(true); break;
+		case Action::Unpause: setPausedInside(false); break;
+		}
+	}, raw->lifetime());
+
+	raw->fadeIn();
+}
+
+void PlaybackSponsored::showPremiumPromo() {
+	ShowPremiumPreviewBox(_show, PremiumFeature::NoAds);
+}
+
+void PlaybackSponsored::hide(crl::time now) {
+	Expects(_widget != nullptr);
+
+	_widget->fadeOut([this, raw = _widget.get()] {
+		if (_widget.get() == raw) {
+			_widget = nullptr;
+		}
+	});
+
+	++_data->state.itemIndex;
+	_data->state.leftTillShow = std::max(
+		_data->betweenDelay,
+		kStartDelayMin);
+	_start = now;
+	_timer.callOnce(_data->state.leftTillShow);
+	saveState();
+}
+
+void PlaybackSponsored::saveState() {
+	_session->sponsoredMessages().updateForVideo(
+		_itemId,
+		computeState().data);
+}
+
+PlaybackSponsored::State PlaybackSponsored::computeState() const {
+	auto result = State{ crl::now() };
+	if (!_data) {
+		return result;
+	}
+	result.data = _data->state;
+	if (!_start) {
+		return result;
+	}
+	const auto elapsed = result.now - _start;
+	result.data.leftTillShow -= elapsed;
+	return result;
+}
+
+rpl::lifetime &PlaybackSponsored::lifetime() {
+	return _lifetime;
+}
+
+bool PlaybackSponsored::Has(HistoryItem *item) {
+	return item
+		&& item->history()->session().sponsoredMessages().canHaveFor(item);
+}
+
+} // namespace Media::View
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_sponsored.h b/Telegram/SourceFiles/media/view/media_view_playback_sponsored.h
new file mode 100644
index 00000000000000..84fe4b9c429709
--- /dev/null
+++ b/Telegram/SourceFiles/media/view/media_view_playback_sponsored.h
@@ -0,0 +1,83 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "base/weak_ptr.h"
+#include "data/components/sponsored_messages.h"
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Media::View {
+
+class PlaybackSponsored final : public base::has_weak_ptr {
+public:
+	PlaybackSponsored(
+		not_null<Ui::RpWidget*> controls,
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<HistoryItem*> item);
+	~PlaybackSponsored();
+
+	void start();
+	void setPaused(bool paused);
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
+	[[nodiscard]] static bool Has(HistoryItem *item);
+
+private:
+	class Message;
+	struct State {
+		crl::time now = 0;
+		Data::SponsoredForVideoState data;
+	};
+
+	void update();
+	void finish();
+	void updatePaused();
+	void showPremiumPromo();
+	void setPausedInside(bool paused);
+	void setPausedOutside(bool paused);
+	void show(const Data::SponsoredMessage &data);
+	void hide(crl::time now);
+	[[nodiscard]] State computeState() const;
+	void saveState();
+
+	const not_null<QWidget*> _parent;
+	const not_null<Main::Session*> _session;
+	const std::shared_ptr<ChatHelpers::Show> _show;
+	const FullMsgId _itemId;
+
+	rpl::variable<QRect> _controlsGeometry;
+	std::unique_ptr<Message> _widget;
+
+	rpl::variable<crl::time> _allowCloseAt;
+	crl::time _start = 0;
+	bool _started = false;
+	bool _paused = false;
+	bool _pausedInside = false;
+	bool _pausedOutside = false;
+	base::Timer _timer;
+
+	std::optional<Data::SponsoredForVideo> _data;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Media::View
diff --git a/Telegram/SourceFiles/media/view/media_view_recognition_selection.cpp b/Telegram/SourceFiles/media/view/media_view_recognition_selection.cpp
new file mode 100644
index 00000000000000..c182d3ca390a8a
--- /dev/null
+++ b/Telegram/SourceFiles/media/view/media_view_recognition_selection.cpp
@@ -0,0 +1,368 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/view/media_view_recognition_selection.h"
+
+#include "ui/rect.h"
+#include "ui/style/style_core.h"
+
+namespace Media::View {
+
+void RecognitionSelection::setSources(
+		not_null<const Result*> result,
+		not_null<const QImage*> image) {
+	_result = result;
+	_image = image;
+}
+
+RecognitionPosition RecognitionSelection::positionAt(
+		QPoint position,
+		QRect contentRect,
+		int rotation,
+		bool allowOutside) const {
+	if (!_result->success || _result->items.empty()) {
+		return {};
+	}
+	if (rotation) {
+		auto transform = QTransform();
+		const auto center = rect::center(contentRect);
+		transform.translate(center.x(), center.y());
+		transform.rotate(-rotation);
+		transform.translate(-center.x(), -center.y());
+		contentRect = transform.mapRect(contentRect);
+		position = transform.map(position);
+	}
+	const auto imageSize = _image->size() / style::DevicePixelRatio();
+	if (imageSize.isEmpty()) {
+		return {};
+	}
+	const auto scale = contentRect.width() / float64(imageSize.width());
+	const auto scaled = [&](QRect rect) {
+		return QRect(
+			contentRect.x() + int(rect.x() * scale),
+			contentRect.y() + int(rect.y() * scale),
+			int(rect.width() * scale),
+			int(rect.height() * scale));
+	};
+	const auto &items = _result->items;
+	auto found = -1;
+	auto bestDy = std::numeric_limits<int>::max();
+	auto bestDx = std::numeric_limits<int>::max();
+	for (auto i = 0, count = int(items.size()); i != count; ++i) {
+		const auto box = scaled(items[i].rect);
+		if (allowOutside) {
+			const auto dy = (position.y() < box.top())
+				? (box.top() - position.y())
+				: (position.y() > box.bottom())
+				? (position.y() - box.bottom())
+				: 0;
+			const auto dx = (position.x() < box.left())
+				? (box.left() - position.x())
+				: (position.x() > box.right())
+				? (position.x() - box.right())
+				: 0;
+			if (dy < bestDy || (dy == bestDy && dx < bestDx)) {
+				bestDy = dy;
+				bestDx = dx;
+				found = i;
+			}
+		} else if (box.contains(position)) {
+			found = i;
+			break;
+		}
+	}
+	if (found < 0) {
+		return {};
+	}
+	const auto length = int(items[found].text.size());
+	const auto &bounds = charBounds(found);
+	auto character = length;
+	for (auto i = 0; i != length; ++i) {
+		const auto center = contentRect.x()
+			+ int((bounds[i] + bounds[i + 1]) / 2. * scale);
+		if (position.x() < center) {
+			character = i;
+			break;
+		}
+	}
+	return { found, character };
+}
+
+const std::vector<int> &RecognitionSelection::charBounds(int index) const {
+	static const auto kEmpty = std::vector<int>();
+	const auto &items = _result->items;
+	const auto count = int(items.size());
+	if (index < 0 || index >= count) {
+		return kEmpty;
+	}
+	const auto key = _image->cacheKey();
+	if (_boundsKey != key || int(_boundsCache.size()) != count) {
+		_boundsKey = key;
+		_boundsCache.assign(count, {});
+	}
+	auto &cached = _boundsCache[index];
+	if (!cached.empty()) {
+		return cached;
+	}
+	const auto &item = items[index];
+	const auto length = int(item.text.size());
+	const auto line = item.rect;
+	auto bounds = std::vector<int>();
+	auto usable = (length > 0) && (int(item.glyphs.size()) == length);
+	if (usable) {
+		for (const auto &glyph : item.glyphs) {
+			if (glyph.isNull()
+				|| (length > 1 && glyph.width() * 5 > line.width() * 3)) {
+				usable = false;
+				break;
+			}
+		}
+	}
+	if (length <= 0) {
+		bounds = { line.x() };
+	} else if (usable) {
+		bounds.resize(length + 1);
+		bounds[0] = item.glyphs.front().left();
+		for (auto i = 1; i != length; ++i) {
+			bounds[i] = (item.glyphs[i - 1].right()
+				+ item.glyphs[i].left()) / 2;
+		}
+		bounds[length] = item.glyphs.back().right();
+	} else if (auto ink = inkBounds(line, length); !ink.empty()) {
+		bounds = std::move(ink);
+	} else {
+		bounds.resize(length + 1);
+		for (auto i = 0; i != length + 1; ++i) {
+			bounds[i] = line.x() + (line.width() * i) / length;
+		}
+	}
+	cached = std::move(bounds);
+	return cached;
+}
+
+std::vector<int> RecognitionSelection::inkBounds(
+		QRect line,
+		int length) const {
+	const auto &image = *_image;
+	if (image.isNull() || image.depth() != 32 || length <= 0) {
+		return {};
+	}
+	const auto ratio = style::DevicePixelRatio();
+	const auto region = QRect(
+		line.x() * ratio,
+		line.y() * ratio,
+		line.width() * ratio,
+		line.height() * ratio
+	).intersected(QRect(QPoint(), image.size()));
+	const auto width = region.width();
+	const auto height = region.height();
+	if (width < length * 2 || height < 2) {
+		return {};
+	}
+	const auto x0 = region.x();
+	const auto y0 = region.y();
+
+	auto histogram = std::array<int, 256>{};
+	for (auto y = 0; y != height; ++y) {
+		const auto row = reinterpret_cast<const QRgb*>(
+			image.constScanLine(y0 + y));
+		for (auto x = 0; x != width; ++x) {
+			++histogram[qGray(row[x0 + x])];
+		}
+	}
+	auto background = 0;
+	for (auto level = 0, best = -1; level != 256; ++level) {
+		if (histogram[level] > best) {
+			best = histogram[level];
+			background = level;
+		}
+	}
+	constexpr auto kInkThreshold = 56;
+	const auto columnThreshold = std::max(1, height / 6);
+
+	auto ink = std::vector<int>(width, 0);
+	for (auto y = 0; y != height; ++y) {
+		const auto row = reinterpret_cast<const QRgb*>(
+			image.constScanLine(y0 + y));
+		for (auto x = 0; x != width; ++x) {
+			if (std::abs(qGray(row[x0 + x]) - background) > kInkThreshold) {
+				++ink[x];
+			}
+		}
+	}
+
+	auto segments = std::vector<std::pair<int, int>>();
+	auto inSegment = false;
+	auto start = 0;
+	for (auto x = 0; x != width; ++x) {
+		const auto inky = (ink[x] >= columnThreshold);
+		if (inky && !inSegment) {
+			inSegment = true;
+			start = x;
+		} else if (!inky && inSegment) {
+			inSegment = false;
+			segments.push_back({ start, x });
+		}
+	}
+	if (inSegment) {
+		segments.push_back({ start, width });
+	}
+	if (int(segments.size()) != length) {
+		return {};
+	}
+
+	auto bounds = std::vector<int>(length + 1);
+	bounds[0] = line.x() + segments.front().first / ratio;
+	for (auto i = 1; i != length; ++i) {
+		const auto gap = (segments[i - 1].second + segments[i].first) / 2;
+		bounds[i] = line.x() + gap / ratio;
+	}
+	bounds[length] = line.x() + segments.back().second / ratio;
+	return bounds;
+}
+
+std::vector<RecognitionSpan> RecognitionSelection::spans() const {
+	const auto &items = _result->items;
+	const auto count = int(items.size());
+	if (_anchor.item < 0
+		|| _focus.item < 0
+		|| _anchor.item >= count
+		|| _focus.item >= count) {
+		return {};
+	}
+
+	auto order = std::vector<int>(count);
+	for (auto i = 0; i != count; ++i) {
+		order[i] = i;
+	}
+	const auto centerY = [&](int i) {
+		return items[i].rect.y() + items[i].rect.height() / 2;
+	};
+	std::sort(order.begin(), order.end(), [&](int a, int b) {
+		return centerY(a) < centerY(b);
+	});
+	auto row = std::vector<int>(count, 0);
+	auto rows = 0;
+	for (auto k = 1; k != count; ++k) {
+		const auto prev = order[k - 1];
+		const auto cur = order[k];
+		const auto threshold = std::max(
+			items[prev].rect.height(),
+			items[cur].rect.height()) / 2;
+		if (centerY(cur) - centerY(prev) > threshold) {
+			++rows;
+		}
+		row[cur] = rows;
+	}
+	std::stable_sort(order.begin(), order.end(), [&](int a, int b) {
+		return (row[a] != row[b])
+			? (row[a] < row[b])
+			: (items[a].rect.x() < items[b].rect.x());
+	});
+	auto rank = std::vector<int>(count);
+	for (auto k = 0; k != count; ++k) {
+		rank[order[k]] = k;
+	}
+
+	auto from = _anchor;
+	auto till = _focus;
+	auto fromRank = rank[from.item];
+	auto tillRank = rank[till.item];
+	if (tillRank < fromRank
+		|| (tillRank == fromRank && till.character < from.character)) {
+		std::swap(from, till);
+		std::swap(fromRank, tillRank);
+	}
+	if (fromRank == tillRank && from.character == till.character) {
+		return {};
+	}
+
+	auto result = std::vector<RecognitionSpan>();
+	auto lastRow = -1;
+	for (auto r = fromRank; r <= tillRank; ++r) {
+		const auto item = order[r];
+		const auto length = int(items[item].text.size());
+		const auto c0 = (item == from.item)
+			? std::clamp(from.character, 0, length)
+			: 0;
+		const auto c1 = (item == till.item)
+			? std::clamp(till.character, 0, length)
+			: length;
+		if (c1 <= c0) {
+			continue;
+		}
+		result.push_back({ item, c0, c1, (row[item] != lastRow) });
+		lastRow = row[item];
+	}
+	return result;
+}
+
+QRect RecognitionSelection::bandFor(int item, int from, int till) const {
+	const auto &items = _result->items;
+	if (item < 0 || item >= int(items.size())) {
+		return {};
+	}
+	const auto &entry = items[item];
+	const auto length = int(entry.text.size());
+	const auto c0 = std::clamp(from, 0, length);
+	const auto c1 = std::clamp(till, 0, length);
+	if (c1 <= c0) {
+		return {};
+	}
+	const auto &bounds = charBounds(item);
+	const auto left = bounds[c0];
+	const auto right = bounds[c1];
+	return (right > left)
+		? QRect(left, entry.rect.y(), right - left, entry.rect.height())
+		: entry.rect;
+}
+
+QString RecognitionSelection::selectedText() const {
+	const auto list = spans();
+	const auto &items = _result->items;
+	auto result = QString();
+	for (const auto &span : list) {
+		if (!result.isEmpty()) {
+			result += span.rowStart ? '\n' : ' ';
+		}
+		const auto &text = items[span.item].text;
+		result += text.mid(span.from, span.till - span.from);
+	}
+	return result;
+}
+
+void RecognitionSelection::start(RecognitionPosition position) {
+	_anchor = position;
+	_focus = position;
+	_selecting = true;
+	_dragged = false;
+}
+
+bool RecognitionSelection::updateFocus(RecognitionPosition position) {
+	if (position.item >= 0 && _focus != position) {
+		_focus = position;
+		return true;
+	}
+	return false;
+}
+
+bool RecognitionSelection::clear() {
+	_selecting = false;
+	_dragged = false;
+	if (_anchor.item >= 0 || _focus.item >= 0) {
+		_anchor = RecognitionPosition();
+		_focus = RecognitionPosition();
+		return true;
+	}
+	return false;
+}
+
+bool RecognitionSelection::hasSelection() const {
+	return !spans().empty();
+}
+
+} // namespace Media::View
diff --git a/Telegram/SourceFiles/media/view/media_view_recognition_selection.h b/Telegram/SourceFiles/media/view/media_view_recognition_selection.h
new file mode 100644
index 00000000000000..c3627e4435f7b9
--- /dev/null
+++ b/Telegram/SourceFiles/media/view/media_view_recognition_selection.h
@@ -0,0 +1,80 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "platform/platform_text_recognition.h"
+
+namespace Media::View {
+
+struct RecognitionPosition {
+	int item = -1;
+	int character = 0;
+
+	friend inline auto operator<=>(
+		RecognitionPosition,
+		RecognitionPosition) = default;
+};
+
+struct RecognitionSpan {
+	int item = 0;
+	int from = 0;
+	int till = 0;
+	bool rowStart = false;
+};
+
+class RecognitionSelection final {
+public:
+	using Result = Platform::TextRecognition::Result;
+
+	void setSources(
+		not_null<const Result*> result,
+		not_null<const QImage*> image);
+
+	[[nodiscard]] RecognitionPosition positionAt(
+		QPoint position,
+		QRect contentRect,
+		int rotation,
+		bool allowOutside) const;
+
+	void start(RecognitionPosition position);
+	bool updateFocus(RecognitionPosition position);
+	[[nodiscard]] bool selecting() const {
+		return _selecting;
+	}
+	void setSelecting(bool value) {
+		_selecting = value;
+	}
+	[[nodiscard]] bool dragged() const {
+		return _dragged;
+	}
+	void setDragged(bool value) {
+		_dragged = value;
+	}
+	bool clear();
+	[[nodiscard]] bool hasSelection() const;
+
+	[[nodiscard]] std::vector<RecognitionSpan> spans() const;
+	[[nodiscard]] QRect bandFor(int item, int from, int till) const;
+	[[nodiscard]] QString selectedText() const;
+
+private:
+	[[nodiscard]] const std::vector<int> &charBounds(int index) const;
+	[[nodiscard]] std::vector<int> inkBounds(QRect line, int length) const;
+
+	const Result *_result = nullptr;
+	const QImage *_image = nullptr;
+	RecognitionPosition _anchor;
+	RecognitionPosition _focus;
+	bool _selecting = false;
+	bool _dragged = false;
+	mutable std::vector<std::vector<int>> _boundsCache;
+	mutable qint64 _boundsKey = 0;
+
+};
+
+} // namespace Media::View
diff --git a/Telegram/SourceFiles/media/view/media_view_video_stream.cpp b/Telegram/SourceFiles/media/view/media_view_video_stream.cpp
new file mode 100644
index 00000000000000..e22ec2f8fc0e03
--- /dev/null
+++ b/Telegram/SourceFiles/media/view/media_view_video_stream.cpp
@@ -0,0 +1,395 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "media/view/media_view_video_stream.h"
+
+#include "data/data_message_reactions.h"
+#include "calls/group/calls_group_call.h"
+#include "calls/group/calls_group_common.h"
+#include "calls/group/calls_group_members.h"
+#include "calls/group/calls_group_messages.h"
+#include "calls/group/calls_group_messages_ui.h"
+#include "calls/group/calls_group_viewport.h"
+#include "calls/calls_instance.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "payments/ui/payments_reaction_box.h"
+#include "ui/effects/path_shift_gradient.h"
+#include "ui/painter.h"
+#include "styles/style_calls.h"
+#include "styles/style_media_view.h"
+
+namespace Media::View {
+
+class VideoStream::Delegate final : public Calls::GroupCall::Delegate {
+public:
+	explicit Delegate(Fn<void()> close);
+
+	void groupCallFinished(not_null<Calls::GroupCall*> call) override;
+	void groupCallFailed(not_null<Calls::GroupCall*> call) override;
+	void groupCallRequestPermissionsOrFail(Fn<void()> onSuccess) override;
+	void groupCallPlaySound(GroupCallSound sound) override;
+	auto groupCallGetVideoCapture(const QString &deviceId)
+		-> std::shared_ptr<tgcalls::VideoCaptureInterface> override;
+	FnMut<void()> groupCallAddAsyncWaiter() override;
+
+private:
+	Fn<void()> _close;
+
+};
+
+class VideoStream::Loading final {
+public:
+	Loading(not_null<QWidget*> parent, not_null<VideoStream*> stream);
+
+	void lower();
+	void setGeometry(int x, int y, int width, int height);
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
+private:
+	void setup(not_null<QWidget*> parent);
+
+	const not_null<VideoStream*> _stream;
+	std::unique_ptr<Ui::RpWidget> _bg;
+	std::unique_ptr<Ui::PathShiftGradient> _gradient;
+
+};
+
+auto TopVideoStreamDonors(not_null<Calls::GroupCall*> call)
+-> rpl::producer<std::vector<Data::MessageReactionsTopPaid>> {
+	const auto messages = call->messages();
+	return rpl::single(rpl::empty) | rpl::then(
+		messages->starsValueChanges() | rpl::to_empty
+	) | rpl::map([=] {
+		const auto &list = messages->starsTop().topDonors;
+		auto still = Ui::MaxTopPaidDonorsShown();
+		auto result = std::vector<Data::MessageReactionsTopPaid>();
+		result.reserve(list.size());
+		for (const auto &item : list) {
+			result.push_back({
+				.peer = item.peer,
+				.count = uint32(item.stars),
+				.my = item.my ? 1U : 0U,
+			});
+			if (!item.my && !--still) {
+				break;
+			}
+		}
+		return result;
+	});
+}
+
+auto TopDonorPlaces(not_null<Calls::GroupCall*> call)
+-> rpl::producer<std::vector<not_null<PeerData*>>> {
+	return TopVideoStreamDonors(
+		call
+	) | rpl::map([=](const std::vector<Data::MessageReactionsTopPaid> &lst) {
+		auto result = std::vector<not_null<PeerData*>>();
+		auto left = Ui::MaxTopPaidDonorsShown();
+		result.reserve(lst.size());
+		for (const auto &donor : lst) {
+			result.push_back(donor.peer);
+			if (!--left) {
+				break;
+			}
+		}
+		return result;
+	});
+}
+
+VideoStream::Delegate::Delegate(Fn<void()> close)
+: _close(std::move(close)) {
+}
+
+void VideoStream::Delegate::groupCallFinished(
+		not_null<Calls::GroupCall*> call) {
+	crl::on_main(call, _close);
+}
+
+void VideoStream::Delegate::groupCallFailed(not_null<Calls::GroupCall*> call) {
+	crl::on_main(call, _close);
+}
+
+void VideoStream::Delegate::groupCallRequestPermissionsOrFail(
+		Fn<void()> onSuccess) {
+}
+
+void VideoStream::Delegate::groupCallPlaySound(GroupCallSound sound) {
+}
+
+auto VideoStream::Delegate::groupCallGetVideoCapture(const QString &deviceId)
+-> std::shared_ptr<tgcalls::VideoCaptureInterface> {
+	return nullptr;
+}
+
+FnMut<void()> VideoStream::Delegate::groupCallAddAsyncWaiter() {
+	return [] {};
+}
+
+VideoStream::Loading::Loading(
+	not_null<QWidget*> parent,
+	not_null<VideoStream*> stream)
+: _stream(stream) {
+	setup(parent);
+}
+
+void VideoStream::Loading::lower() {
+	_bg->lower();
+}
+
+void VideoStream::Loading::setGeometry(int x, int y, int width, int height) {
+	_bg->setGeometry(x, y, width, height);
+}
+
+rpl::lifetime &VideoStream::Loading::lifetime() {
+	return _bg->lifetime();
+}
+
+void VideoStream::Loading::setup(not_null<QWidget*> parent) {
+	_bg = std::make_unique<Ui::RpWidget>(parent);
+
+	_gradient = std::make_unique<Ui::PathShiftGradient>(
+		st::storiesComposeBg,
+		st::storiesComposeBgRipple,
+		[=] { _bg->update(); });
+
+	_bg->show();
+	_bg->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(_bg.get());
+		auto hq = PainterHighQualityEnabler(p);
+
+		_gradient->startFrame(0, _bg->width(), _bg->width() / 3);
+		_gradient->paint([&](const Ui::PathShiftGradient::Background &bg) {
+			const auto stroke = style::ConvertScaleExact(2);
+			if (const auto color = std::get_if<style::color>(&bg)) {
+				auto pen = (*color)->p;
+				pen.setWidthF(stroke);
+				p.setPen(pen);
+				p.setBrush(*color);
+			} else {
+				const auto gradient = v::get<QLinearGradient*>(bg);
+
+				auto copy = *gradient;
+				copy.setStops({
+					{ 0., st::storiesComposeBg->c },
+					{ 0.5, st::white->c },
+					{ 1., st::storiesComposeBg->c },
+				});
+				auto pen = QPen(QBrush(copy), stroke);
+				p.setPen(pen);
+				p.setBrush(*gradient);
+			}
+			const auto half = stroke / 2.;
+			const auto remove = QMarginsF(half, half, half, half);
+			const auto rect = QRectF(_bg->rect()).marginsRemoved(remove);
+			const auto radius = st::storiesRadius - half;
+			p.drawRoundedRect(rect, radius, radius);
+			return true;
+		});
+	}, _bg->lifetime());
+}
+
+VideoStream::VideoStream(
+	not_null<QWidget*> parent,
+	not_null<Ui::RpWidgetWrap*> borrowedRp,
+	bool borrowedOpenGL,
+	Ui::GL::Backend backend,
+	std::shared_ptr<ChatHelpers::Show> show,
+	std::shared_ptr<Data::GroupCall> call,
+	QString callLinkSlug,
+	MsgId callJoinMessageId)
+: _show(std::move(show))
+, _delegate(std::make_unique<Delegate>([=] { _closeRequests.fire({}); }))
+, _loading(std::make_unique<Loading>(parent, this))
+, _call(std::make_unique<Calls::GroupCall>(
+	_delegate.get(),
+	Calls::StartConferenceInfo{
+		.show = _show,
+		.call = std::move(call),
+		.linkSlug = callLinkSlug,
+		.joinMessageId = callJoinMessageId,
+	}))
+, _members(
+	std::make_unique<Calls::Group::Members>(
+		parent,
+		_call.get(),
+		Calls::Group::PanelMode::VideoStream,
+		backend))
+, _viewport(
+	std::make_unique<Calls::Group::Viewport>(
+		parent,
+		Calls::Group::PanelMode::VideoStream,
+		backend,
+		borrowedRp,
+		borrowedOpenGL))
+, _messages(
+	std::make_unique<Calls::Group::MessagesUi>(
+		parent,
+		_show,
+		Calls::Group::MessagesMode::VideoStream,
+		_call->messages()->listValue(),
+		TopDonorPlaces(_call.get()),
+		_call->messages()->idUpdates(),
+		_call->canManageValue(),
+		_commentsShown.value())) {
+	Core::App().calls().registerVideoStream(_call.get());
+	setupMembers();
+	setupVideo();
+	setupMessages();
+}
+
+VideoStream::~VideoStream() {
+}
+
+not_null<Calls::GroupCall*> VideoStream::call() const {
+	return _call.get();
+}
+
+rpl::producer<> VideoStream::closeRequests() const {
+	return _closeRequests.events();
+}
+
+void VideoStream::updateGeometry(int x, int y, int width, int height) {
+	const auto skip = st::groupCallMessageSkip;
+	_viewport->setGeometry(false, { x, y, width, height });
+	_messages->move(x + skip, y + height, width - 2 * skip, height / 2);
+	if (_loading) {
+		_loading->setGeometry(x, y, width, height);
+	}
+}
+
+void VideoStream::toggleCommentsOn(rpl::producer<bool> shown) {
+	_commentsShown = std::move(shown);
+}
+
+void VideoStream::ensureBorrowedRenderer(QOpenGLFunctions &f) {
+	_viewport->ensureBorrowedRenderer(f);
+}
+
+void VideoStream::borrowedPaint(QOpenGLFunctions &f) {
+	_viewport->borrowedPaint(f);
+}
+
+void VideoStream::ensureBorrowedRenderer() {
+	_viewport->ensureBorrowedRenderer();
+}
+
+void VideoStream::borrowedPaint(Painter &p, const QRegion &clip) {
+	_viewport->borrowedPaint(p, clip);
+}
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+void VideoStream::borrowedPaintOffscreen(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	_viewport->borrowedPaintOffscreen(rhi, rt, cb);
+}
+
+void VideoStream::borrowedPaintOnscreen(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	_viewport->borrowedPaintOnscreen(rhi, rt, cb);
+}
+#endif
+
+rpl::lifetime &VideoStream::lifetime() {
+	return _lifetime;
+}
+
+void VideoStream::setupMembers() {
+}
+
+void VideoStream::setupVideo() {
+	const auto setupTile = [=](
+			const Calls::VideoEndpoint &endpoint,
+			const std::unique_ptr<Calls::GroupCall::VideoTrack> &track) {
+		using namespace rpl::mappers;
+		const auto row = endpoint.rtmp()
+			? _members->rtmpFakeRow(Calls::GroupCall::TrackPeer(track)).get()
+			: _members->lookupRow(Calls::GroupCall::TrackPeer(track));
+		Assert(row != nullptr);
+
+		auto pinned = rpl::combine(
+			_call->videoEndpointLargeValue(),
+			_call->videoEndpointPinnedValue()
+		) | rpl::map(_1 == endpoint && _2);
+		const auto self = (endpoint.peer == _call->joinAs());
+		_viewport->add(
+			endpoint,
+			Calls::Group::VideoTileTrack{
+				Calls::GroupCall::TrackPointer(track),
+				row,
+			},
+			Calls::GroupCall::TrackSizeValue(track),
+			std::move(pinned),
+			self);
+	};
+	for (const auto &[endpoint, track] : _call->activeVideoTracks()) {
+		setupTile(endpoint, track);
+	}
+	_call->videoStreamActiveUpdates(
+	) | rpl::on_next([=](const Calls::VideoStateToggle &update) {
+		if (update.value) {
+			// Add async (=> the participant row is definitely in Members).
+			const auto endpoint = update.endpoint;
+			crl::on_main(_viewport->widget(), [=] {
+				const auto &tracks = _call->activeVideoTracks();
+				const auto i = tracks.find(endpoint);
+				if (i != end(tracks)) {
+					setupTile(endpoint, i->second);
+				}
+			});
+		} else {
+			// Remove sync.
+			_viewport->remove(update.endpoint);
+		}
+	}, _viewport->lifetime());
+
+	_viewport->qualityRequests(
+	) | rpl::on_next([=](const Calls::VideoQualityRequest &request) {
+		_call->requestVideoQuality(request.endpoint, request.quality);
+	}, _viewport->lifetime());
+
+	_loading->lower();
+	_viewport->widget()->lower();
+	_viewport->setControlsShown(0.);
+
+	_call->hasVideoWithFramesValue(
+	) | rpl::on_next([=](bool has) {
+		if (has) {
+			_loading = nullptr;
+		}
+	}, _loading->lifetime());
+
+	setVolume(Core::App().settings().videoVolume());
+}
+
+void VideoStream::setupMessages() {
+	_messages->hiddenShowRequested() | rpl::on_next([=] {
+		_call->messages()->requestHiddenShow();
+	}, _messages->lifetime());
+
+
+	_messages->deleteRequests(
+	) | rpl::on_next([=](Calls::Group::MessageDeleteRequest event) {
+		_call->messages()->deleteConfirmed(event);
+	}, _messages->lifetime());
+}
+
+void VideoStream::setVolume(float64 volume) {
+	const auto value = volume * Calls::Group::kDefaultVolume;
+	_call->changeVolume({
+		.peer = _call->peer(),
+		.volume = int(base::SafeRound(value)),
+	});
+}
+
+} // namespace Media::View
diff --git a/Telegram/SourceFiles/media/view/media_view_video_stream.h b/Telegram/SourceFiles/media/view/media_view_video_stream.h
new file mode 100644
index 00000000000000..0685e7ac8d381f
--- /dev/null
+++ b/Telegram/SourceFiles/media/view/media_view_video_stream.h
@@ -0,0 +1,104 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class Painter;
+class QOpenGLFunctions;
+class QRhi;
+class QRhiRenderTarget;
+class QRhiCommandBuffer;
+
+namespace Calls {
+class GroupCall;
+} // namespace Calls
+
+namespace Calls::Group {
+class Members;
+class Viewport;
+class MessagesUi;
+} // namespace Calls::Group
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Data {
+class GroupCall;
+struct MessageReactionsTopPaid;
+} // namespace Data
+
+namespace Ui {
+class RpWidgetWrap;
+} // namespace Ui
+
+namespace Ui::GL {
+enum class Backend;
+} // namespace Ui::GL
+
+namespace Media::View {
+
+[[nodiscard]] auto TopVideoStreamDonors(not_null<Calls::GroupCall*> call)
+-> rpl::producer<std::vector<Data::MessageReactionsTopPaid>>;
+
+class VideoStream final {
+public:
+	VideoStream(
+		not_null<QWidget*> parent,
+		not_null<Ui::RpWidgetWrap*> borrowedRp,
+		bool borrowedOpenGL,
+		Ui::GL::Backend backend,
+		std::shared_ptr<ChatHelpers::Show> show,
+		std::shared_ptr<Data::GroupCall> call,
+		QString callLinkSlug,
+		MsgId callJoinMessageId);
+	~VideoStream();
+
+	[[nodiscard]] not_null<Calls::GroupCall*> call() const;
+	[[nodiscard]] rpl::producer<> closeRequests() const;
+
+	void setVolume(float64 volume);
+	void updateGeometry(int x, int y, int width, int height);
+	void toggleCommentsOn(rpl::producer<bool> shown);
+
+	void ensureBorrowedRenderer(QOpenGLFunctions &f);
+	void borrowedPaint(QOpenGLFunctions &f);
+
+	void ensureBorrowedRenderer();
+	void borrowedPaint(Painter &p, const QRegion &clip);
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	void borrowedPaintOffscreen(QRhi *rhi, QRhiRenderTarget *rt, QRhiCommandBuffer *cb);
+	void borrowedPaintOnscreen(QRhi *rhi, QRhiRenderTarget *rt, QRhiCommandBuffer *cb);
+#endif
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
+private:
+	class Delegate;
+	class Loading;
+
+	void setupVideo();
+	void setupMembers();
+	void setupMessages();
+
+	rpl::variable<bool> _commentsShown;
+
+	std::shared_ptr<ChatHelpers::Show> _show;
+	std::unique_ptr<Delegate> _delegate;
+	std::unique_ptr<Loading> _loading;
+	std::unique_ptr<Calls::GroupCall> _call;
+	std::unique_ptr<Calls::Group::Members> _members;
+	std::unique_ptr<Calls::Group::Viewport> _viewport;
+	std::unique_ptr<Calls::Group::MessagesUi> _messages;
+
+	rpl::event_stream<> _closeRequests;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Media::View
diff --git a/Telegram/SourceFiles/menu/gift_resale_filter.cpp b/Telegram/SourceFiles/menu/gift_resale_filter.cpp
new file mode 100644
index 00000000000000..5926e0ba75e719
--- /dev/null
+++ b/Telegram/SourceFiles/menu/gift_resale_filter.cpp
@@ -0,0 +1,147 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "menu/gift_resale_filter.h"
+
+#include "ui/effects/ripple_animation.h"
+#include "ui/text/text_custom_emoji.h"
+#include "ui/painter.h"
+#include "styles/style_credits.h" // giftBoxResaleColorSize
+#include "styles/style_media_player.h" // mediaPlayerMenuCheck
+
+namespace Ui {
+namespace {
+
+[[nodiscard]] Text::MarkedContext WithRepaint(
+		const Text::MarkedContext &context,
+		Fn<void()> repaint) {
+	auto result = context;
+	result.repaint = std::move(repaint);
+	return result;
+}
+
+[[nodiscard]] QString SerializeColorData(const QColor &color) {
+	return u"color:%1,%2,%3,%4"_q
+		.arg(color.red())
+		.arg(color.green())
+		.arg(color.blue())
+		.arg(color.alpha());
+}
+
+[[nodiscard]] bool IsColorData(QStringView data) {
+	return data.startsWith(u"color:"_q);
+}
+
+[[nodiscard]] QColor ParseColorData(QStringView data) {
+	Expects(data.size() > 12);
+
+	const auto parts = data.mid(6).split(',');
+	Assert(parts.size() == 4);
+	return QColor(
+		parts[0].toInt(),
+		parts[1].toInt(),
+		parts[2].toInt(),
+		parts[3].toInt());
+}
+
+} // namespace
+
+GiftResaleFilterAction::GiftResaleFilterAction(
+	not_null<Menu::Menu*> parent,
+	const style::Menu &st,
+	const TextWithEntities &text,
+	const Text::MarkedContext &context,
+	QString iconEmojiData,
+	const style::icon *icon)
+: Action(parent, st, new QAction(parent), icon, icon)
+, _iconEmoji(iconEmojiData.isEmpty()
+	? nullptr
+	: context.customEmojiFactory(
+		iconEmojiData,
+		WithRepaint(context, [=] { update(); }))) {
+	setMarkedText(text, QString(), context);
+}
+
+void GiftResaleFilterAction::paintEvent(QPaintEvent *e) {
+	Action::paintEvent(e);
+
+	Painter p(this);
+
+	const auto enabled = isEnabled();
+	const auto selected = isSelected();
+	const auto fg = selected
+		? st().itemFgOver
+		: enabled
+		? st().itemFg
+		: st().itemFgDisabled;
+	if (const auto emoji = _iconEmoji.get()) {
+		const auto x = st().itemIconPosition.x();
+		const auto y = (height() - st::emojiSize) / 2;
+		emoji->paint(p, {
+			.textColor = fg->c,
+			.position = { x, y },
+		});
+	}
+	if (_checked) {
+		const auto &icon = st::mediaPlayerMenuCheck;
+		const auto skip = st().itemRightSkip;
+		const auto left = width() - skip - icon.width();
+		const auto top = (height() - icon.height()) / 2;
+		icon.paint(p, left, top, width());
+	}
+}
+
+void GiftResaleFilterAction::setChecked(bool checked) {
+	if (_checked != checked) {
+		_checked = checked;
+		update();
+	}
+}
+
+GiftResaleColorEmoji::GiftResaleColorEmoji(QStringView data)
+: _color(ParseColorData(data)) {
+}
+
+bool GiftResaleColorEmoji::Owns(QStringView data) {
+	return IsColorData(data);
+}
+
+QString GiftResaleColorEmoji::DataFor(QColor color) {
+	return SerializeColorData(color);
+}
+
+int GiftResaleColorEmoji::width() {
+	return st::giftBoxResaleColorSize;
+}
+
+QString GiftResaleColorEmoji::entityData() {
+	return DataFor(_color);
+}
+
+void GiftResaleColorEmoji::paint(QPainter &p, const Context &context) {
+	auto hq = PainterHighQualityEnabler(p);
+	p.setBrush(_color);
+	p.setPen(Qt::NoPen);
+	p.drawEllipse(
+		context.position.x(),
+		context.position.y() + st::giftBoxResaleColorTop,
+		width(),
+		width());
+}
+
+void GiftResaleColorEmoji::unload() {
+}
+
+bool GiftResaleColorEmoji::ready() {
+	return true;
+}
+
+bool GiftResaleColorEmoji::readyInDefaultState() {
+	return true;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/menu/gift_resale_filter.h b/Telegram/SourceFiles/menu/gift_resale_filter.h
new file mode 100644
index 00000000000000..43a74e4af47a98
--- /dev/null
+++ b/Telegram/SourceFiles/menu/gift_resale_filter.h
@@ -0,0 +1,55 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/menu/menu_action.h"
+#include "ui/text/text_custom_emoji.h"
+
+namespace Ui {
+
+class GiftResaleFilterAction final : public Menu::Action {
+public:
+	GiftResaleFilterAction(
+		not_null<Menu::Menu*> parent,
+		const style::Menu &st,
+		const TextWithEntities &text,
+		const Text::MarkedContext &context,
+		QString iconEmojiData,
+		const style::icon *icon);
+
+	void setChecked(bool checked);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	const std::unique_ptr<Text::CustomEmoji> _iconEmoji;
+	bool _checked = false;
+
+};
+
+class GiftResaleColorEmoji final : public Text::CustomEmoji {
+public:
+	GiftResaleColorEmoji(QStringView data);
+
+	[[nodiscard]] static bool Owns(QStringView data);
+	[[nodiscard]] static QString DataFor(QColor color);
+
+	int width() override;
+	QString entityData() override;
+
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	QColor _color;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/menu/menu_action_with_thumbnail.cpp b/Telegram/SourceFiles/menu/menu_action_with_thumbnail.cpp
new file mode 100644
index 00000000000000..c3547489797078
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_action_with_thumbnail.cpp
@@ -0,0 +1,47 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "menu/menu_action_with_thumbnail.h"
+
+#include "ui/dynamic_image.h"
+#include "ui/painter.h"
+
+namespace Menu {
+
+ActionWithThumbnail::ActionWithThumbnail(
+	not_null<Ui::Menu::Menu*> parent,
+	const style::Menu &st,
+	not_null<QAction*> action,
+	std::shared_ptr<Ui::DynamicImage> thumbnail,
+	int thumbnailSize)
+: Ui::Menu::Action(parent, st, action, nullptr, nullptr)
+, _thumbnail(std::move(thumbnail))
+, _thumbnailSize(thumbnailSize) {
+	if (_thumbnail) {
+		_thumbnail->subscribeToUpdates([=] { update(); });
+	}
+}
+
+ActionWithThumbnail::~ActionWithThumbnail() {
+	if (_thumbnail) {
+		_thumbnail->subscribeToUpdates(nullptr);
+	}
+}
+
+void ActionWithThumbnail::paintEvent(QPaintEvent *e) {
+	Ui::Menu::Action::paintEvent(e);
+	if (!_thumbnail) {
+		return;
+	}
+	auto p = QPainter(this);
+	const auto pos = st().itemIconPosition;
+	p.drawImage(
+		QRect(pos.x(), pos.y(), _thumbnailSize, _thumbnailSize),
+		_thumbnail->image(_thumbnailSize));
+}
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_action_with_thumbnail.h b/Telegram/SourceFiles/menu/menu_action_with_thumbnail.h
new file mode 100644
index 00000000000000..42831204b1935c
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_action_with_thumbnail.h
@@ -0,0 +1,37 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/menu/menu_action.h"
+
+namespace Ui {
+class DynamicImage;
+} // namespace Ui
+
+namespace Menu {
+
+class ActionWithThumbnail final : public Ui::Menu::Action {
+public:
+	ActionWithThumbnail(
+		not_null<Ui::Menu::Menu*> parent,
+		const style::Menu &st,
+		not_null<QAction*> action,
+		std::shared_ptr<Ui::DynamicImage> thumbnail,
+		int thumbnailSize);
+	~ActionWithThumbnail();
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	std::shared_ptr<Ui::DynamicImage> _thumbnail;
+	int _thumbnailSize = 0;
+
+};
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_antispam_validator.cpp b/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
index 16c183a6c93bcb..c8f58bf99fcd5f 100644
--- a/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
+++ b/Telegram/SourceFiles/menu/menu_antispam_validator.cpp
@@ -93,20 +93,20 @@ object_ptr<Ui::RpWidget> AntiSpamValidator::createButton() const {
 	_channel->session().changes().peerUpdates(
 		_channel,
 		UpdateFlag::Members | UpdateFlag::Admins
-	) | rpl::start_with_next(updateLocked, button->lifetime());
+	) | rpl::on_next(updateLocked, button->lifetime());
 	updateLocked();
 	button->toggledValue(
-	) | rpl::start_with_next([=, controller = _controller](bool toggled) {
+	) | rpl::on_next([=, controller = _controller](bool toggled) {
 		if (state->locked.current() && toggled) {
 			state->toggled.fire(false);
 			controller->showToast(tr::lng_manage_peer_antispam_not_enough(
 				tr::now,
 				lt_count,
 				EnableAntiSpamMinMembers(channel),
-				Ui::Text::RichLangValue));
+				tr::rich));
 		} else {
 			channel->session().api().request(MTPchannels_ToggleAntiSpam(
-				channel->inputChannel,
+				channel->inputChannel(),
 				MTP_bool(toggled)
 			)).done([=](const MTPUpdates &result) {
 				channel->session().api().applyUpdates(result);
@@ -157,11 +157,11 @@ void AntiSpamValidator::addAction(
 		const auto text = tr::lng_admin_log_antispam_menu_report_toast(
 			tr::now,
 			lt_link,
-			Ui::Text::Link(
+			tr::link(
 				tr::lng_admin_log_antispam_menu_report_toast_link(
 					tr::now),
 				"internal:show"),
-			Ui::Text::RichLangValue);
+			tr::rich);
 		const auto showToast = [=,
 				window = _controller,
 				channel = _channel] {
@@ -184,7 +184,7 @@ void AntiSpamValidator::addAction(
 			[=, channel = _channel] {
 				_channel->session().api().request(
 					MTPchannels_ReportAntiSpamFalsePositive(
-						channel->inputChannel,
+						channel->inputChannel(),
 						MTP_int(eventId)
 				)).done(showToast).send();
 			},
diff --git a/Telegram/SourceFiles/menu/menu_check_item.cpp b/Telegram/SourceFiles/menu/menu_check_item.cpp
index f76e5d3b9b8e3c..f0e5f46f8c2cf0 100644
--- a/Telegram/SourceFiles/menu/menu_check_item.cpp
+++ b/Telegram/SourceFiles/menu/menu_check_item.cpp
@@ -15,20 +15,17 @@ namespace Menu {
 void ItemWithCheck::init(bool checked) {
 	enableMouseSelecting();
 
-	AbstractButton::setDisabled(true);
+	ItemBase::setPreventClose(true);
 
 	_checkView = std::make_unique<Ui::CheckView>(st::defaultCheck, false);
 	_checkView->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		setIcon(checked ? &st::mediaPlayerMenuCheck : nullptr);
 	}, lifetime());
 
 	_checkView->setChecked(checked, anim::type::normal);
-	AbstractButton::clicks(
-	) | rpl::start_with_next([=] {
-		_checkView->setChecked(
-			!_checkView->checked(),
-			anim::type::normal);
+	ItemBase::clicks() | rpl::on_next([=] {
+		_checkView->setChecked(!_checkView->checked(), anim::type::normal);
 	}, lifetime());
 }
 
diff --git a/Telegram/SourceFiles/menu/menu_checked_action.cpp b/Telegram/SourceFiles/menu/menu_checked_action.cpp
new file mode 100644
index 00000000000000..7285204ce6a680
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_checked_action.cpp
@@ -0,0 +1,83 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "menu/menu_checked_action.h"
+
+#include "base/unique_qptr.h"
+#include "ui/widgets/menu/menu_action.h"
+#include "ui/widgets/menu/menu_common.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/painter.h"
+
+#include "styles/style_media_player.h"
+
+namespace {
+
+class CheckedAction final : public Ui::Menu::Action {
+public:
+	CheckedAction(
+		not_null<Ui::Menu::Menu*> parent,
+		const style::Menu &st,
+		not_null<QAction*> action,
+		const style::icon *icon,
+		bool checked);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	const bool _checked = false;
+
+};
+
+CheckedAction::CheckedAction(
+	not_null<Ui::Menu::Menu*> parent,
+	const style::Menu &st,
+	not_null<QAction*> action,
+	const style::icon *icon,
+	bool checked)
+: Ui::Menu::Action(parent, st, action, icon, icon)
+, _checked(checked) {
+	setMinWidth(minWidth() + st.itemRightSkip + st::mediaPlayerMenuCheck.width());
+}
+
+void CheckedAction::paintEvent(QPaintEvent *e) {
+	Ui::Menu::Action::paintEvent(e);
+
+	if (!_checked) {
+		return;
+	}
+
+	Painter p(this);
+	const auto &icon = st::mediaPlayerMenuCheck;
+	const auto left = width() - st().itemRightSkip - icon.width();
+	const auto top = (height() - icon.height()) / 2;
+	icon.paint(p, left, top, width());
+}
+
+} // namespace
+
+namespace Menu {
+
+not_null<QAction*> AddCheckedAction(
+		not_null<Ui::PopupMenu*> menu,
+		const QString &text,
+		Fn<void()> callback,
+		const style::icon *icon,
+		bool checked) {
+	auto item = base::make_unique_q<CheckedAction>(
+		menu->menu(),
+		menu->st().menu,
+		Ui::Menu::CreateAction(
+			menu->menu().get(),
+			text,
+			std::move(callback)),
+		icon,
+		checked);
+	return menu->addAction(std::move(item));
+}
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_checked_action.h b/Telegram/SourceFiles/menu/menu_checked_action.h
new file mode 100644
index 00000000000000..6426c1770a0df3
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_checked_action.h
@@ -0,0 +1,28 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/basic_types.h"
+#include "ui/style/style_core_types.h"
+
+class QAction;
+
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
+namespace Menu {
+
+not_null<QAction*> AddCheckedAction(
+	not_null<Ui::PopupMenu*> menu,
+	const QString &text,
+	Fn<void()> callback,
+	const style::icon *icon,
+	bool checked);
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_dock.cpp b/Telegram/SourceFiles/menu/menu_dock.cpp
new file mode 100644
index 00000000000000..932d31ce111ef0
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_dock.cpp
@@ -0,0 +1,83 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "menu/menu_dock.h"
+
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/main_account.h"
+#include "main/main_domain.h"
+#include "main/main_session.h"
+#include "media/audio/media_audio.h"
+#include "media/player/media_player_instance.h"
+#include "ui/text/text_utilities.h"
+
+#include <QtWidgets/QMenu>
+
+namespace Menu {
+
+void RefreshDockMenu(QMenu *menu) {
+	menu->clear();
+	if (!Core::IsAppLaunched()) {
+		return;
+	}
+
+	const auto accounts = Core::App().domain().orderedAccounts();
+	if (accounts.size() > 1 && !Core::App().passcodeLocked()) {
+		menu->addSeparator();
+		const auto profilesHeader = menu->addAction(
+			tr::lng_mac_menu_profiles(tr::now));
+		profilesHeader->setEnabled(false);
+		constexpr auto kMaxLength = 30;
+		for (const auto &account : accounts) {
+			if (account->sessionExists()) {
+				const auto name = account->session().user()->name();
+				menu->addAction(
+					(name.size() > kMaxLength)
+						? (name.mid(0, kMaxLength) + Ui::kQEllipsis)
+						: name,
+					[account] {
+						Core::App().ensureSeparateWindowFor(account);
+					});
+			}
+		}
+		menu->addSeparator();
+	}
+
+	menu->addAction(
+		Core::App().settings().desktopNotify()
+			? tr::lng_disable_notifications_from_tray(tr::now)
+			: tr::lng_enable_notifications_from_tray(tr::now),
+		[] {
+			auto &settings = Core::App().settings();
+			settings.setDesktopNotify(!settings.desktopNotify());
+		});
+
+	using namespace Media::Player;
+	const auto type = instance()->getActiveType();
+	const auto state = instance()->getState(type);
+	if (!IsStoppedOrStopping(state.state)) {
+		menu->addSeparator();
+		const auto previous = menu->addAction(
+			tr::lng_mac_menu_player_previous(tr::now),
+			[] { instance()->previous(); });
+		previous->setEnabled(instance()->previousAvailable(type));
+		menu->addAction(
+			IsPausedOrPausing(state.state)
+				? tr::lng_mac_menu_player_resume(tr::now)
+				: tr::lng_mac_menu_player_pause(tr::now),
+			[] { instance()->playPause(); });
+		const auto next = menu->addAction(
+			tr::lng_mac_menu_player_next(tr::now),
+			[] { instance()->next(); });
+		next->setEnabled(instance()->nextAvailable(type));
+	}
+}
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_dock.h b/Telegram/SourceFiles/menu/menu_dock.h
new file mode 100644
index 00000000000000..d7e2982a1f1367
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_dock.h
@@ -0,0 +1,16 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class QMenu;
+
+namespace Menu {
+
+void RefreshDockMenu(QMenu *menu);
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_item_download_files.cpp b/Telegram/SourceFiles/menu/menu_item_download_files.cpp
index dd510b53698305..050ead06f4bba6 100644
--- a/Telegram/SourceFiles/menu/menu_item_download_files.cpp
+++ b/Telegram/SourceFiles/menu/menu_item_download_files.cpp
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #include "menu/menu_item_download_files.h"
 
+#include "base/base_file_utilities.h"
+#include "base/unixtime.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "core/file_utilities.h"
@@ -28,6 +30,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/popup_menu.h"
 #include "window/window_session_controller.h"
 #include "window/window_controller.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
 #include "styles/style_widgets.h"
 
@@ -102,20 +105,28 @@ void AddAction(
 							: tr::lng_mediaview_saved_to)(
 						tr::now,
 						lt_downloads,
-						Ui::Text::Link(
+						tr::link(
 							tr::lng_mediaview_downloads(tr::now),
 							"internal:show_saved_message"),
-						Ui::Text::WithEntities),
+						tr::marked),
 					.filter = filter,
+					.iconLottie = u"toast/save_to_gallery"_q,
+					.iconLottieSize = st::toastLottieIconSize,
 					.st = &st::defaultToast,
 				});
 			};
 
 		auto views = std::vector<std::shared_ptr<Data::PhotoMedia>>();
+		auto dates = std::vector<TimeId>();
 		for (const auto &[photo, fullId] : photos) {
 			if (const auto view = photo->createMediaView()) {
 				view->wanted(Data::PhotoSize::Large, fullId);
 				views.push_back(view);
+				const auto photoDate = photo->date();
+				const auto item = session->data().message(fullId);
+				dates.push_back(photoDate
+					? photoDate
+					: (item ? item->date() : TimeId(0)));
 			}
 		}
 
@@ -138,7 +149,18 @@ void AddAction(
 			auto lastPath = QString();
 			for (auto i = 0; i < views.size(); i++) {
 				lastPath = fullPath(i + 1);
-				views[i]->saveToFile(lastPath);
+				if (views[i]->saveToFile(lastPath) && dates[i] > 0) {
+					auto f = QFile(lastPath);
+					if (f.open(QIODevice::ReadWrite)) {
+						const auto when = base::unixtime::parse(dates[i]);
+						f.setFileTime(
+							when,
+							QFileDevice::FileModificationTime);
+						f.setFileTime(
+							when,
+							QFileDevice::FileAccessTime);
+					}
+				}
 			}
 			if (showToast) {
 				showToast(lastPath);
@@ -150,7 +172,7 @@ void AddAction(
 		} else {
 			auto lifetime = std::make_shared<rpl::lifetime>();
 			session->downloaderTaskFinished(
-			) | rpl::start_with_next([=]() mutable {
+			) | rpl::on_next([=]() mutable {
 				if (finalCheck()) {
 					saveToFiles();
 					base::take(lifetime)->destroy();
@@ -161,7 +183,9 @@ void AddAction(
 	const auto saveDocuments = [=](const QString &folderPath) {
 		for (const auto &[document, origin] : documents) {
 			if (!folderPath.isEmpty()) {
-				document->save(origin, folderPath + document->filename());
+				const auto name =
+					base::FileNameFromUserString(document->filename());
+				document->save(origin, folderPath + name);
 			} else {
 				DocumentSaveClickHandler::SaveAndTrack(origin, document);
 			}
@@ -226,8 +250,8 @@ void AddDownloadFilesAction(
 			return;
 		}
 	}
-	const auto done = [weak = Ui::MakeWeak(list)] {
-		if (const auto strong = weak.data()) {
+	const auto done = [weak = base::make_weak(list)] {
+		if (const auto strong = weak.get()) {
 			strong->cancelSelection();
 		}
 	};
@@ -237,20 +261,20 @@ void AddDownloadFilesAction(
 void AddDownloadFilesAction(
 		not_null<Ui::PopupMenu*> menu,
 		not_null<Window::SessionController*> window,
-		const std::map<HistoryItem*, TextSelection, std::less<>> &items,
+		const std::vector<not_null<HistoryItem*>> &items,
 		not_null<HistoryInner*> list) {
 	if (items.empty()) {
 		return;
 	}
 	auto docs = Documents();
 	auto photos = Photos();
-	for (const auto &pair : items) {
-		if (!Added(pair.first, docs, photos)) {
+	for (const auto &item : items) {
+		if (!Added(item, docs, photos)) {
 			return;
 		}
 	}
-	const auto done = [weak = Ui::MakeWeak(list)] {
-		if (const auto strong = weak.data()) {
+	const auto done = [weak = base::make_weak(list)] {
+		if (const auto strong = weak.get()) {
 			strong->clearSelected();
 		}
 	};
diff --git a/Telegram/SourceFiles/menu/menu_item_download_files.h b/Telegram/SourceFiles/menu/menu_item_download_files.h
index 91e270b7163d94..7e271f647a2123 100644
--- a/Telegram/SourceFiles/menu/menu_item_download_files.h
+++ b/Telegram/SourceFiles/menu/menu_item_download_files.h
@@ -34,8 +34,7 @@ void AddDownloadFilesAction(
 void AddDownloadFilesAction(
 	not_null<Ui::PopupMenu*> menu,
 	not_null<Window::SessionController*> window,
-	// From the legacy history inner widget.
-	const std::map<HistoryItem*, TextSelection, std::less<>> &items,
+	const std::vector<not_null<HistoryItem*>> &items,
 	not_null<HistoryInner*> list);
 
 } // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp b/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp
new file mode 100644
index 00000000000000..192e64aa14bdb6
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp
@@ -0,0 +1,217 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "menu/menu_item_rate_transcribe.h"
+
+#include "base/call_delayed.h"
+#include "lang/lang_keys.h"
+#include "ui/rect.h"
+#include "ui/toast/toast.h"
+#include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/wrap/vertical_layout.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_layers.h"
+
+namespace Menu {
+namespace {
+
+constexpr auto kDuration = crl::time(5000);
+
+} // namespace
+
+RateTranscribe::RateTranscribe(
+	not_null<Ui::PopupMenu*> popupMenu,
+	const style::Menu &st,
+	Fn<void(bool)> rate)
+: Ui::Menu::ItemBase(popupMenu->menu(), st)
+, _dummyAction(Ui::CreateChild<QAction>(this))
+, _leftButton(Ui::CreateSimpleCircleButton(
+	this,
+	st::defaultRippleAnimation))
+, _rightButton(Ui::CreateSimpleCircleButton(
+	this,
+	st::defaultRippleAnimation)) {
+	setAcceptBoth(true);
+
+	fitToMenuWidth();
+
+	enableMouseSelecting();
+
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	Ui::AddSkip(content);
+
+	const auto label = content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_context_rate_transcription(),
+			st::boxDividerLabel),
+		style::margins(),
+		style::al_top);
+	setMinWidth(
+		label->st().style.font->width(
+			tr::lng_context_rate_transcription(tr::now)));
+	widthValue() | rpl::on_next([=, menu = popupMenu->menu()](int w) {
+		content->resizeToWidth(menu->width());
+	}, content->lifetime());
+	Ui::AddSkip(content);
+
+	// const auto leftButton = Ui::CreateChild<Ui::IconButton>(
+	// 	this,
+	// 	st::menuTranscribeDummyButton);
+	// const auto rightButton = Ui::CreateChild<Ui::IconButton>(
+	// 	this,
+	// 	st::menuTranscribeDummyButton);
+	{
+		_leftButton->resize(Size(st::menuTranscribeDummyButton.width));
+		const auto label = Ui::CreateChild<Ui::FlatLabel>(
+			_leftButton,
+			QString::fromUtf8("\U0001F44D"));
+		label->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+		_leftButton->sizeValue() | rpl::on_next([=](QSize s) {
+			label->moveToLeft(
+				(s.width() - label->width()) / 2,
+				(s.height() - label->height()) / 2);
+		}, label->lifetime());
+	}
+	{
+		_rightButton->resize(Size(st::menuTranscribeDummyButton.width));
+		const auto label = Ui::CreateChild<Ui::FlatLabel>(
+			_rightButton,
+			QString::fromUtf8("\U0001F44E"));
+		label->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+		_rightButton->sizeValue() | rpl::on_next([=](QSize s) {
+			label->moveToLeft(
+				(s.width() - label->width()) / 2,
+				(s.height() - label->height()) / 2);
+		}, label->lifetime());
+	}
+	{
+		const auto showToast = [=,
+				weak = base::make_weak(popupMenu->parentWidget())]{
+			if (const auto strong = weak.get()) {
+				base::call_delayed(
+					st::universalDuration * 1.1,
+					crl::guard(strong, [=] {
+						Ui::Toast::Show(strong->window(), {
+							.text = tr::lng_toast_sent_rate_transcription(
+								tr::now,
+								TextWithEntities::Simple),
+							.duration = kDuration,
+						});
+					}));
+			}
+		};
+		const auto hideMenu = [=, weak = base::make_weak(popupMenu)] {
+			if (const auto strong = weak.get()) {
+				base::call_delayed(
+					st::universalDuration,
+					crl::guard(strong, [=] { strong->hideMenu(false); }));
+			}
+		};
+		_leftButton->setClickedCallback([=] {
+			rate(true);
+			showToast();
+			hideMenu();
+		});
+		_rightButton->setClickedCallback([=] {
+			rate(false);
+			showToast();
+			hideMenu();
+		});
+	}
+	_desiredHeight = rect::m::sum::v(st::menuTranscribeItemPadding)
+		+ st::menuTranscribeDummyButton.height
+		+ label->st().style.font->height;
+	rpl::combine(
+		content->geometryValue(),
+		label->geometryValue()
+	) | rpl::on_next([=](
+			const QRect &contentRect,
+			const QRect &labelRect) {
+		_leftButton->moveToLeft(
+			labelRect.x(),
+			rect::bottom(contentRect));
+		_rightButton->moveToLeft(
+			rect::right(labelRect) - _rightButton->width(),
+			rect::bottom(contentRect));
+		_desiredHeight = rect::m::sum::v(st::menuTranscribeItemPadding)
+			+ _leftButton->height()
+			+ labelRect.height();
+	}, _leftButton->lifetime());
+	_leftButton->show();
+	_rightButton->show();
+
+	selects() | rpl::on_next([=](const Ui::Menu::CallbackData &data) {
+		if (data.selected
+			&& data.source == Ui::Menu::TriggeredSource::Keyboard) {
+			_leftButton->setForceRippled(true);
+			_selectedButton = SelectedButton::Left;
+		} else if (!data.selected) {
+			_leftButton->setForceRippled(false);
+			_rightButton->setForceRippled(false);
+			_selectedButton = SelectedButton::None;
+		}
+	}, lifetime());
+}
+
+not_null<QAction*> RateTranscribe::action() const {
+	return _dummyAction;
+}
+
+bool RateTranscribe::isEnabled() const {
+	return true;
+}
+
+int RateTranscribe::contentHeight() const {
+	return _desiredHeight;
+}
+
+void RateTranscribe::handleKeyPress(not_null<QKeyEvent*> e) {
+	const auto key = e->key();
+	if (key == Qt::Key_Left) {
+		if (_selectedButton == SelectedButton::Right) {
+			_rightButton->setForceRippled(false);
+			_leftButton->setForceRippled(true);
+			_selectedButton = SelectedButton::Left;
+		} else if (_selectedButton == SelectedButton::Left) {
+			_leftButton->setForceRippled(false);
+			_rightButton->setForceRippled(true);
+			_selectedButton = SelectedButton::Right;
+		} else {
+			_leftButton->setForceRippled(true);
+			_selectedButton = SelectedButton::Left;
+		}
+	} else if (key == Qt::Key_Right) {
+		if (_selectedButton == SelectedButton::Left) {
+			_leftButton->setForceRippled(false);
+			_rightButton->setForceRippled(true);
+			_selectedButton = SelectedButton::Right;
+		} else if (_selectedButton == SelectedButton::Right) {
+			_rightButton->setForceRippled(false);
+			_leftButton->setForceRippled(true);
+			_selectedButton = SelectedButton::Left;
+		} else {
+			_leftButton->setForceRippled(true);
+			_selectedButton = SelectedButton::Left;
+		}
+	} else if (key == Qt::Key_Return
+			|| key == Qt::Key_Enter
+			|| key == Qt::Key_Space) {
+		if (_selectedButton == SelectedButton::Left) {
+			_leftButton->clicked(Qt::KeyboardModifiers(), Qt::LeftButton);
+		} else if (_selectedButton == SelectedButton::Right) {
+			_rightButton->clicked(Qt::KeyboardModifiers(), Qt::LeftButton);
+		}
+	}
+}
+
+} // namespace Menu
\ No newline at end of file
diff --git a/Telegram/SourceFiles/menu/menu_item_rate_transcribe.h b/Telegram/SourceFiles/menu/menu_item_rate_transcribe.h
new file mode 100644
index 00000000000000..c1ac40d99a2fb4
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_item_rate_transcribe.h
@@ -0,0 +1,51 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/menu/menu_item_base.h"
+
+class HistoryItem;
+
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
+namespace Menu {
+
+class RateTranscribe final : public Ui::Menu::ItemBase {
+public:
+	RateTranscribe(
+		not_null<Ui::PopupMenu*> parent,
+		const style::Menu &st,
+		Fn<void(bool)> rate);
+
+	not_null<QAction*> action() const override;
+	bool isEnabled() const override;
+
+protected:
+	int contentHeight() const override;
+	void handleKeyPress(not_null<QKeyEvent*> e) override;
+
+private:
+	enum class SelectedButton {
+		None,
+		Left,
+		Right,
+	};
+
+	int _desiredHeight = 0;
+	not_null<QAction*> _dummyAction;
+	not_null<Ui::RippleButton*> _leftButton;
+	not_null<Ui::RippleButton*> _rightButton;
+	SelectedButton _selectedButton = SelectedButton::None;
+
+};
+
+bool HasRateTranscribeItem(not_null<HistoryItem*>);
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.cpp b/Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.cpp
new file mode 100644
index 00000000000000..685f1b5b20daf5
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.cpp
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "menu/menu_item_rate_transcribe_session.h"
+
+#include "api/api_transcribes.h"
+#include "apiwrap.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/rect.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/vertical_layout.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_layers.h"
+
+namespace Menu {
+
+Fn<void(bool)> RateTranscribeCallbackFactory(
+		not_null<HistoryItem*> item) {
+	return [item](bool good) {
+		item->history()->peer->session().api().transcribes().rate(
+			item,
+			good);
+	};
+}
+
+bool HasRateTranscribeItem(not_null<HistoryItem*> item) {
+	const auto &peer = item->history()->peer;
+	if (!peer->session().api().transcribes().entry(
+			item).result.isEmpty()) {
+		return !peer->session().api().transcribes().isRated(item);
+	}
+	return false;
+}
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.h b/Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.h
new file mode 100644
index 00000000000000..92ce16aeb22999
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.h
@@ -0,0 +1,19 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class HistoryItem;
+
+namespace Menu {
+
+[[nodiscard]] Fn<void(bool)> RateTranscribeCallbackFactory(
+	not_null<HistoryItem*>);
+
+[[nodiscard]] bool HasRateTranscribeItem(not_null<HistoryItem*>);
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_mute.cpp b/Telegram/SourceFiles/menu/menu_mute.cpp
index 661ef06727f662..3e038b35180066 100644
--- a/Telegram/SourceFiles/menu/menu_mute.cpp
+++ b/Telegram/SourceFiles/menu/menu_mute.cpp
@@ -69,7 +69,7 @@ void IconWithText::paintEvent(QPaintEvent *e) {
 class MuteItem final : public Ui::Menu::Action {
 public:
 	MuteItem(
-		not_null<RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &st,
 		Descriptor descriptor);
 
@@ -85,7 +85,7 @@ class MuteItem final : public Ui::Menu::Action {
 };
 
 MuteItem::MuteItem(
-	not_null<RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &st,
 	Descriptor descriptor)
 : Ui::Menu::Action(
@@ -96,7 +96,7 @@ MuteItem::MuteItem(
 	nullptr)
 , _itemIconPosition(st.itemIconPosition) {
 	descriptor.isMutedValue(
-	) | rpl::start_with_next([=](bool isMuted) {
+	) | rpl::on_next([=](bool isMuted) {
 		action()->setText(isMuted
 			? tr::lng_mute_menu_duration_unmute(tr::now)
 			: tr::lng_mute_menu_duration_forever(tr::now));
@@ -113,7 +113,7 @@ MuteItem::MuteItem(
 	}, lifetime());
 	_animation.stop();
 
-	setClickedCallback([=] {
+	setActionTriggered([=] {
 		descriptor.updateMutePeriod(_isMuted ? 0 : kMuteForeverValue);
 	});
 }
@@ -253,6 +253,7 @@ Descriptor ThreadDescriptor(not_null<Data::Thread*> thread) {
 		.currentSound = currentSound,
 		.updateSound = updateSound,
 		.updateMutePeriod = updateMutePeriod,
+		.volumeController = Data::ThreadRingtonesVolumeController(thread),
 	};
 }
 
@@ -290,6 +291,7 @@ Descriptor DefaultDescriptor(
 		.currentSound = currentSound,
 		.updateSound = updateSound,
 		.updateMutePeriod = updateMutePeriod,
+		.volumeController = DefaultRingtonesVolumeController(session, type),
 	};
 }
 
@@ -304,7 +306,8 @@ void FillMuteMenu(
 				RingtonesBox,
 				session,
 				*currentSound,
-				descriptor.updateSound));
+				descriptor.updateSound,
+				descriptor.volumeController));
 		}
 	};
 	menu->addAction(
@@ -337,7 +340,7 @@ void FillMuteMenu(
 		};
 
 		auto item = base::make_unique_q<IconWithText>(
-			menu,
+			menu->menu(),
 			st,
 			Ui::Menu::CreateAction(
 				menu->menu().get(),
@@ -358,21 +361,25 @@ void FillMuteMenu(
 		&st::menuIconMuteFor);
 
 	menu->addAction(
-		base::make_unique_q<MuteItem>(menu, menu->st().menu, descriptor));
+		base::make_unique_q<MuteItem>(
+			menu->menu(),
+			menu->st().menu,
+			descriptor));
 }
 
 void SetupMuteMenu(
 		not_null<Ui::RpWidget*> parent,
 		rpl::producer<> triggers,
 		Fn<std::optional<Descriptor>()> makeDescriptor,
-		std::shared_ptr<Ui::Show> show) {
+		std::shared_ptr<Ui::Show> show,
+		Fn<QPoint()> positionCallback) {
 	struct State {
 		base::unique_qptr<Ui::PopupMenu> menu;
 	};
 	const auto state = parent->lifetime().make_state<State>();
 	std::move(
 		triggers
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (state->menu) {
 			return;
 		} else if (const auto descriptor = makeDescriptor()) {
@@ -380,7 +387,9 @@ void SetupMuteMenu(
 				parent,
 				st::popupMenuWithIcons);
 			FillMuteMenu(state->menu.get(), *descriptor, show);
-			state->menu->popup(QCursor::pos());
+			state->menu->popup(positionCallback
+				? positionCallback()
+				: QCursor::pos());
 		}
 	}, parent->lifetime());
 }
diff --git a/Telegram/SourceFiles/menu/menu_mute.h b/Telegram/SourceFiles/menu/menu_mute.h
index a6d8186686ab25..1892895367a6c2 100644
--- a/Telegram/SourceFiles/menu/menu_mute.h
+++ b/Telegram/SourceFiles/menu/menu_mute.h
@@ -7,10 +7,13 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "data/notify/data_peer_notify_volume.h" // VolumeController
+
 namespace Data {
 class Thread;
 struct NotifySound;
-enum class DefaultNotify;
+enum class DefaultNotify : uint8_t;
+struct VolumeController;
 } // namespace Data
 
 namespace Main {
@@ -31,6 +34,7 @@ struct Descriptor {
 	Fn<std::optional<Data::NotifySound>()> currentSound;
 	Fn<void(Data::NotifySound)> updateSound;
 	Fn<void(TimeId)> updateMutePeriod;
+	Data::VolumeController volumeController;
 };
 
 [[nodiscard]] Descriptor ThreadDescriptor(not_null<Data::Thread*> thread);
@@ -47,7 +51,8 @@ void SetupMuteMenu(
 	not_null<Ui::RpWidget*> parent,
 	rpl::producer<> triggers,
 	Fn<std::optional<Descriptor>()> makeDescriptor,
-	std::shared_ptr<Ui::Show> show);
+	std::shared_ptr<Ui::Show> show,
+	Fn<QPoint()> positionCallback = nullptr);
 
 inline void FillMuteMenu(
 		not_null<Ui::PopupMenu*> menu,
@@ -60,13 +65,14 @@ inline void SetupMuteMenu(
 		not_null<Ui::RpWidget*> parent,
 		rpl::producer<> triggers,
 		Fn<Data::Thread*()> makeThread,
-		std::shared_ptr<Ui::Show> show) {
+		std::shared_ptr<Ui::Show> show,
+		Fn<QPoint()> positionCallback = nullptr) {
 	SetupMuteMenu(parent, std::move(triggers), [=] {
 		const auto thread = makeThread();
 		return thread
 			? ThreadDescriptor(thread)
 			: std::optional<Descriptor>();
-	}, std::move(show));
+	}, std::move(show), positionCallback);
 }
 
 } // namespace MuteMenu
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index dd880778466103..1e2bb9c49525b0 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -7,11 +7,14 @@ For license and copyright information please follow this link:
 */
 #include "menu/menu_send.h"
 
+#include "menu/menu_checked_action.h"
+
 #include "api/api_common.h"
 #include "base/event_filter.h"
 #include "base/unixtime.h"
 #include "boxes/abstract_box.h"
 #include "boxes/premium_preview_box.h"
+#include "calls/group/calls_group_stars_box.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "core/shortcuts.h"
@@ -45,10 +48,11 @@ For license and copyright information please follow this link:
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
 #include "data/data_message_reactions.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
 #include "styles/style_chat.h"
@@ -143,6 +147,7 @@ class EffectPreview final : public Ui::RpWidget {
 	QImage _bg;
 	QPoint _itemShift;
 	QRect _iconRect;
+	Ui::BoxShadow _boxShadow;
 	std::unique_ptr<Ui::InfiniteRadialAnimation> _loading;
 
 	Ui::Animations::Simple _shownAnimation;
@@ -276,13 +281,14 @@ EffectPreview::EffectPreview(
 			this,
 			tr::lng_effect_premium(
 				lt_link,
-				tr::lng_effect_premium_link() | Ui::Text::ToLink(),
-				Ui::Text::WithEntities),
+				tr::lng_effect_premium_link(tr::link),
+				tr::marked),
 			st::effectPreviewPromoLabel),
 		st::effectPreviewPromoPadding))
 , _bottom(_send ? ((Ui::RpWidget*)_send.get()) : _premiumPromoLabel.get())
 , _close(done)
-, _actionWithEffect(ComposeActionWithEffect(action, _effectId, done)) {
+, _actionWithEffect(ComposeActionWithEffect(action, _effectId, done))
+, _boxShadow(st::previewMenu.animation.shadow) {
 	_chatStyle->apply(_theme.get());
 
 	setupGeometry(position);
@@ -372,8 +378,7 @@ void EffectPreview::mousePressEvent(QMouseEvent *e) {
 void EffectPreview::setupGeometry(QPoint position) {
 	const auto parent = parentWidget();
 	const auto innerSize = HistoryView::Sticker::MessageEffectSize();
-	const auto shadow = st::previewMenu.shadow;
-	const auto extend = shadow.extend;
+	const auto extend = Ui::BoxShadow::ExtendFor(st::previewMenu.shadow);
 	_inner = QRect(QPoint(extend.left(), extend.top()), innerSize);
 	_bottom->resizeToWidth(_inner.width());
 	const auto size = _inner.marginsAdded(extend).size()
@@ -404,7 +409,7 @@ void EffectPreview::setupBackground() {
 		QImage::Format_ARGB32_Premultiplied);
 	_bg.setDevicePixelRatio(ratio);
 	repaintBackground();
-	_theme->repaintBackgroundRequests() | rpl::start_with_next([=] {
+	_theme->repaintBackgroundRequests() | rpl::on_next([=] {
 		repaintBackground();
 		update();
 	}, lifetime());
@@ -452,6 +457,7 @@ void EffectPreview::repaintBackground() {
 			_chatStyle.get(),
 			rect,
 			rect,
+			rect,
 			false);
 		context.outbg = _item->hasOutLayout();
 		_item->draw(p, context);
@@ -466,9 +472,8 @@ void EffectPreview::repaintBackground() {
 	_bg.fill(Qt::transparent);
 	auto p = QPainter(&_bg);
 
-	const auto &shadow = st::previewMenu.animation.shadow;
 	const auto shadowed = QRect(_inner.topLeft(), inner);
-	Ui::Shadow::paint(p, shadowed, width(), shadow);
+	_boxShadow.paint(p, shadowed, st::previewMenu.radius);
 	p.drawImage(_inner.topLeft(), bg);
 }
 
@@ -483,7 +488,7 @@ void EffectPreview::setupLottie() {
 	}
 	rpl::single(rpl::empty) | rpl::then(
 		_show->session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (checkLoaded()) {
 			_readyCheckLifetime.destroy();
 			createLottie();
@@ -499,7 +504,7 @@ void EffectPreview::createLottie() {
 		Stickers::EffectType::MessageEffect);
 	const auto raw = _lottie.get();
 	raw->updates(
-	) | rpl::start_with_next([=](Lottie::Update update) {
+	) | rpl::on_next([=](Lottie::Update update) {
 		v::match(update.data, [&](const Lottie::Information &information) {
 		}, [&](const Lottie::DisplayFrameRequest &request) {
 			this->update();
@@ -522,8 +527,7 @@ void EffectPreview::setupSend(Details details) {
 		}, _actionWithEffect);
 	} else {
 		_premiumPromoLabel->entity()->setClickHandlerFilter([=](auto&&...) {
-			const auto window = _show->resolveWindow(
-				ChatHelpers::WindowUsage::PremiumPromo);
+			const auto window = _show->resolveWindow();
 			if (window) {
 				if (const auto onstack = _close) {
 					onstack();
@@ -589,7 +593,7 @@ void EffectPreview::toggle(bool shown) {
 Fn<void(Action, Details)> DefaultCallback(
 		std::shared_ptr<ChatHelpers::Show> show,
 		Fn<void(Api::SendOptions)> send) {
-	const auto guard = Ui::MakeWeak(show->toastParent());
+	const auto guard = base::make_weak(show->toastParent());
 	return [=](Action action, Details details) {
 		if (action.type == ActionType::Send) {
 			send(action.options);
@@ -601,9 +605,9 @@ Fn<void(Action, Details)> DefaultCallback(
 			details,
 			send,
 			action.options);
-		const auto weak = Ui::MakeWeak(box.data());
+		const auto weak = base::make_weak(box.data());
 		show->showBox(std::move(box));
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->setCloseByOutsideClick(false);
 		}
 	};
@@ -618,9 +622,9 @@ FillMenuResult AttachSendMenuEffect(
 	Expects(show != nullptr);
 
 	using namespace HistoryView::Reactions;
-	const auto effect = std::make_shared<QPointer<EffectPreview>>();
+	const auto effect = std::make_shared<base::weak_qptr<EffectPreview>>();
 	const auto position = desiredPositionOverride.value_or(QCursor::pos());
-	const auto selector = (show && details.effectAllowed)
+	const auto selector = details.effectAllowed
 		? AttachSelectorToMenu(
 			menu,
 			position,
@@ -640,18 +644,18 @@ FillMenuResult AttachSendMenuEffect(
 	}
 
 	(*selector)->chosen(
-	) | rpl::start_with_next([=](ChosenReaction chosen) {
+	) | rpl::on_next([=](ChosenReaction chosen) {
 		const auto &reactions = show->session().data().reactions();
 		const auto &effects = reactions.list(Data::Reactions::Type::Effects);
 		const auto i = ranges::find(effects, chosen.id, &Data::Reaction::id);
 		if (i != end(effects)) {
-			if (const auto strong = effect->data()) {
+			if (const auto strong = effect->get()) {
 				strong->hideAnimated();
 			}
-			const auto weak = Ui::MakeWeak(menu);
+			const auto weak = base::make_weak(menu);
 			const auto done = [=] {
-				delete effect->data();
-				if (const auto strong = weak.data()) {
+				delete effect->get();
+				if (const auto strong = weak.get()) {
 					strong->hideMenu(true);
 				}
 			};
@@ -670,9 +674,47 @@ FillMenuResult AttachSendMenuEffect(
 	return FillMenuResult::Prepared;
 }
 
+FillMenuResult FillEditCommentPriceMenu(
+		not_null<Ui::PopupMenu*> menu,
+		std::shared_ptr<ChatHelpers::Show> show,
+		Details details,
+		Fn<void(Action, Details)> action,
+		const style::ComposeIcons *iconsOverride,
+		std::optional<QPoint> desiredPositionOverride) {
+	Expects(show != nullptr);
+
+	const auto &icons = iconsOverride
+		? *iconsOverride
+		: st::defaultComposeIcons;
+	menu->addAction(tr::lng_video_stream_edit_stars(tr::now), [=] {
+		show->show(Calls::Group::MakeVideoStreamStarsBox({
+			.show = show,
+			.min = int(details.commentPriceMin.value_or(1)),
+			.current = int(details.price.value_or(1)),
+			.save = [=](int count) {
+				auto copy = details;
+				copy.price = count;
+				action({ {}, Action::Type::ChangePrice }, copy);
+			},
+			.name = details.commentStreamerName,
+			//.preview = details.commentPreview,
+		}));
+	}, &icons.menuEditStars);
+	if (details.price.value_or(0) > details.commentPriceMin.value_or(0)) {
+		auto copy = details;
+		copy.price = details.commentPriceMin.value_or(0);
+		menu->addAction(tr::lng_video_stream_remove_stars(tr::now), [=] {
+			action({ {}, Action::Type::ChangePrice }, copy);
+		}, &icons.menuGifRemove);
+	}
+	const auto position = desiredPositionOverride.value_or(QCursor::pos());
+	menu->prepareGeometryFor(position);
+	return FillMenuResult::Prepared;
+}
+
 FillMenuResult FillSendMenu(
 		not_null<Ui::PopupMenu*> menu,
-		std::shared_ptr<ChatHelpers::Show> showForEffect,
+		std::shared_ptr<ChatHelpers::Show> maybeShow,
 		Details details,
 		Fn<void(Action, Details)> action,
 		const style::ComposeIcons *iconsOverride,
@@ -682,9 +724,18 @@ FillMenuResult FillSendMenu(
 	const auto empty = !sending
 		&& (details.spoiler == SpoilerState::None)
 		&& (details.caption == CaptionState::None)
+		&& (details.photoQuality == PhotoQualityState::None)
 		&& !details.price.has_value();
 	if (empty || !action) {
 		return FillMenuResult::Skipped;
+	} else if (type == Type::EditCommentPrice) {
+		return FillEditCommentPriceMenu(
+			menu,
+			maybeShow,
+			details,
+			action,
+			iconsOverride,
+			desiredPositionOverride);
 	}
 	const auto &icons = iconsOverride
 		? *iconsOverride
@@ -698,7 +749,7 @@ FillMenuResult FillSendMenu(
 	}
 	if (sending && type != Type::SilentOnly) {
 		menu->addAction(
-			(type == Type::Reminder
+			((type == Type::Reminder)
 				? tr::lng_reminder_message(tr::now)
 				: tr::lng_schedule_message(tr::now)),
 			[=] { action({ .type = ActionType::Schedule }, details); },
@@ -716,20 +767,33 @@ FillMenuResult FillSendMenu(
 	if ((type != Type::Disabled)
 		&& ((details.spoiler != SpoilerState::None)
 			|| (details.caption != CaptionState::None)
+			|| (details.photoQuality != PhotoQualityState::None)
 			|| details.price.has_value())) {
 		menu->addSeparator(&st::expandedMenuSeparator);
 	}
+	if (details.photoQuality != PhotoQualityState::None) {
+		const auto high = (details.photoQuality == PhotoQualityState::High);
+		Menu::AddCheckedAction(
+			menu,
+			tr::lng_send_high_quality(tr::now),
+			[=] { action({ .type = high
+				? ActionType::PhotoQualityOff
+				: ActionType::PhotoQualityOn
+			}, details); },
+			&icons.menuQualityHigh,
+			high);
+	}
 	if (details.spoiler != SpoilerState::None) {
 		const auto spoilered = (details.spoiler == SpoilerState::Enabled);
-		menu->addAction(
-			(spoilered
-				? tr::lng_context_disable_spoiler(tr::now)
-				: tr::lng_context_spoiler_effect(tr::now)),
+		Menu::AddCheckedAction(
+			menu,
+			tr::lng_context_spoiler_effect(tr::now),
 			[=] { action({ .type = spoilered
 				? ActionType::SpoilerOff
 				: ActionType::SpoilerOn
 			}, details); },
-			spoilered ? &icons.menuSpoilerOff : &icons.menuSpoiler);
+			&icons.menuSpoiler,
+			spoilered);
 	}
 	if (details.caption != CaptionState::None) {
 		const auto above = (details.caption == CaptionState::Above);
@@ -752,10 +816,10 @@ FillMenuResult FillSendMenu(
 			&icons.menuPrice);
 	}
 
-	if (showForEffect) {
+	if (maybeShow) {
 		return AttachSendMenuEffect(
 			menu,
-			showForEffect,
+			maybeShow,
 			details,
 			action,
 			desiredPositionOverride);
@@ -767,15 +831,22 @@ FillMenuResult FillSendMenu(
 
 void SetupMenuAndShortcuts(
 		not_null<Ui::RpWidget*> button,
-		std::shared_ptr<ChatHelpers::Show> show,
+		std::shared_ptr<ChatHelpers::Show> maybeShow,
 		Fn<Details()> details,
-		Fn<void(Action, Details)> action) {
+		Fn<void(Action, Details)> action,
+		const style::PopupMenu *stOverride,
+		const style::ComposeIcons *iconsOverride) {
 	const auto menu = std::make_shared<base::unique_qptr<Ui::PopupMenu>>();
 	const auto showMenu = [=] {
 		*menu = base::make_unique_q<Ui::PopupMenu>(
 			button,
-			st::popupMenuWithIcons);
-		const auto result = FillSendMenu(*menu, show, details(), action);
+			stOverride ? *stOverride : st::popupMenuWithIcons);
+		const auto result = FillSendMenu(
+			*menu,
+			maybeShow,
+			details(),
+			action,
+			iconsOverride);
 		if (result != FillMenuResult::Prepared) {
 			return false;
 		}
@@ -792,7 +863,7 @@ void SetupMenuAndShortcuts(
 	Shortcuts::Requests(
 	) | rpl::filter([=] {
 		return button->isActiveWindow();
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	}) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 
 		const auto now = details().type;
@@ -889,7 +960,7 @@ void SetupUnreadMentionsMenu(
 		using Flag = MTPmessages_ReadMentions::Flag;
 		peer->session().api().request(MTPmessages_ReadMentions(
 			MTP_flags(rootId ? Flag::f_top_msg_id : Flag()),
-			peer->input,
+			peer->input(),
 			MTP_int(rootId)
 		)).done([=](const MTPmessages_AffectedHistory &result) {
 			const auto offset = peer->session().api().applyAffectedHistory(
@@ -925,12 +996,58 @@ void SetupUnreadReactionsMenu(
 			return;
 		}
 		const auto topic = thread->asTopic();
+		const auto sublist = thread->asSublist();
 		const auto peer = thread->peer();
 		const auto rootId = topic ? topic->rootId() : 0;
 		using Flag = MTPmessages_ReadReactions::Flag;
 		peer->session().api().request(MTPmessages_ReadReactions(
+			MTP_flags((rootId ? Flag::f_top_msg_id : Flag(0))
+				| (sublist ? Flag::f_saved_peer_id : Flag(0))),
+			peer->input(),
+			MTP_int(rootId),
+			sublist ? sublist->sublistPeer()->input() : MTPInputPeer()
+		)).done([=](const MTPmessages_AffectedHistory &result) {
+			const auto offset = peer->session().api().applyAffectedHistory(
+				peer,
+				result);
+			if (offset > 0) {
+				resend(weakThread, done, resend);
+			} else {
+				done();
+				peer->owner().history(peer)->clearUnreadReactionsFor(
+					rootId,
+					sublist);
+			}
+		}).fail(done).send();
+	};
+	const auto sendRequest = [=](
+			not_null<Data::Thread*> thread,
+			Fn<void()> done) {
+		sendOne(base::make_weak(thread), std::move(done), sendOne);
+	};
+	SetupReadAllMenu(button, currentThread, text, sendRequest);
+}
+
+void SetupUnreadPollVotesMenu(
+		not_null<Ui::RpWidget*> button,
+		Fn<Data::Thread*()> currentThread) {
+	const auto text = tr::lng_context_mark_read_poll_votes_all(tr::now);
+	const auto sendOne = [=](
+			base::weak_ptr<Data::Thread> weakThread,
+			Fn<void()> done,
+			auto resend) -> void {
+		const auto thread = weakThread.get();
+		if (!thread) {
+			done();
+			return;
+		}
+		const auto topic = thread->asTopic();
+		const auto peer = thread->peer();
+		const auto rootId = topic ? topic->rootId() : 0;
+		using Flag = MTPmessages_ReadPollVotes::Flag;
+		peer->session().api().request(MTPmessages_ReadPollVotes(
 			MTP_flags(rootId ? Flag::f_top_msg_id : Flag(0)),
-			peer->input,
+			peer->input(),
 			MTP_int(rootId)
 		)).done([=](const MTPmessages_AffectedHistory &result) {
 			const auto offset = peer->session().api().applyAffectedHistory(
@@ -940,7 +1057,8 @@ void SetupUnreadReactionsMenu(
 				resend(weakThread, done, resend);
 			} else {
 				done();
-				peer->owner().history(peer)->clearUnreadReactionsFor(rootId);
+				peer->owner().history(peer)->clearUnreadPollVotesFor(
+					rootId);
 			}
 		}).fail(done).send();
 	};
diff --git a/Telegram/SourceFiles/menu/menu_send.h b/Telegram/SourceFiles/menu/menu_send.h
index a361dc11651a87..81d107fe372e35 100644
--- a/Telegram/SourceFiles/menu/menu_send.h
+++ b/Telegram/SourceFiles/menu/menu_send.h
@@ -8,9 +8,11 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "api/api_common.h"
+#include "menu/menu_send_details.h"
 
 namespace style {
 struct ComposeIcons;
+struct PopupMenu;
 } // namespace style
 
 namespace ChatHelpers {
@@ -29,34 +31,6 @@ class Thread;
 
 namespace SendMenu {
 
-enum class Type : uchar {
-	Disabled,
-	SilentOnly,
-	Scheduled,
-	ScheduledToUser, // For "Send when online".
-	Reminder,
-};
-
-enum class SpoilerState : uchar {
-	None,
-	Enabled,
-	Possible,
-};
-
-enum class CaptionState : uchar {
-	None,
-	Below,
-	Above,
-};
-
-struct Details {
-	Type type = Type::Disabled;
-	SpoilerState spoiler = SpoilerState::None;
-	CaptionState caption = CaptionState::None;
-	std::optional<uint64> price;
-	bool effectAllowed = false;
-};
-
 enum class FillMenuResult : uchar {
 	Prepared,
 	Skipped,
@@ -70,6 +44,8 @@ enum class ActionType : uchar {
 	SpoilerOff,
 	CaptionUp,
 	CaptionDown,
+	PhotoQualityOn,
+	PhotoQualityOff,
 	ChangePrice,
 };
 struct Action {
@@ -84,7 +60,7 @@ struct Action {
 
 FillMenuResult FillSendMenu(
 	not_null<Ui::PopupMenu*> menu,
-	std::shared_ptr<ChatHelpers::Show> showForEffect,
+	std::shared_ptr<ChatHelpers::Show> maybeShow,
 	Details details,
 	Fn<void(Action, Details)> action,
 	const style::ComposeIcons *iconsOverride = nullptr,
@@ -99,9 +75,11 @@ FillMenuResult AttachSendMenuEffect(
 
 void SetupMenuAndShortcuts(
 	not_null<Ui::RpWidget*> button,
-	std::shared_ptr<ChatHelpers::Show> show,
+	std::shared_ptr<ChatHelpers::Show> maybeShow,
 	Fn<Details()> details,
-	Fn<void(Action, Details)> action);
+	Fn<void(Action, Details)> action,
+	const style::PopupMenu *stOverride = nullptr,
+	const style::ComposeIcons *iconsOverride = nullptr);
 
 void SetupUnreadMentionsMenu(
 	not_null<Ui::RpWidget*> button,
@@ -111,4 +89,8 @@ void SetupUnreadReactionsMenu(
 	not_null<Ui::RpWidget*> button,
 	Fn<Data::Thread*()> currentThread);
 
+void SetupUnreadPollVotesMenu(
+	not_null<Ui::RpWidget*> button,
+	Fn<Data::Thread*()> currentThread);
+
 } // namespace SendMenu
diff --git a/Telegram/SourceFiles/menu/menu_send_details.h b/Telegram/SourceFiles/menu/menu_send_details.h
new file mode 100644
index 00000000000000..e30c7c2b05ee14
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_send_details.h
@@ -0,0 +1,53 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/text/text_entity.h"
+
+namespace SendMenu {
+
+enum class Type : uchar {
+	Disabled,
+	SilentOnly,
+	Scheduled,
+	ScheduledToUser, // For "Send when online".
+	Reminder,
+	EditCommentPrice,
+};
+
+enum class SpoilerState : uchar {
+	None,
+	Enabled,
+	Possible,
+};
+
+enum class CaptionState : uchar {
+	None,
+	Below,
+	Above,
+};
+
+enum class PhotoQualityState : uchar {
+	None,
+	Standard,
+	High,
+};
+
+struct Details {
+	Type type = Type::Disabled;
+	SpoilerState spoiler = SpoilerState::None;
+	CaptionState caption = CaptionState::None;
+	PhotoQualityState photoQuality = PhotoQualityState::None;
+	TextWithTags commentPreview;
+	QString commentStreamerName;
+	std::optional<uint64> price;
+	std::optional<uint64> commentPriceMin;
+	bool effectAllowed = false;
+};
+
+} // namespace SendMenu
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 7e49275446d599..e2ff3fd0f55fab 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "boxes/premium_preview_box.h"
 #include "chat_helpers/compose/compose_show.h"
+#include "core/ui_integration.h" // TextContext
 #include "data/components/sponsored_messages.h"
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
@@ -24,12 +25,14 @@ For license and copyright information please follow this link:
 #include "ui/toast/toast.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
-#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/menu/menu_multiline_action.h"
 #include "ui/widgets/popup_menu.h"
 #include "styles/style_channel_earn.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_media_view.h"
 #include "styles/style_menu_icons.h"
@@ -39,13 +42,25 @@ For license and copyright information please follow this link:
 namespace Menu {
 namespace {
 
+[[nodiscard]] SponsoredPhrases PhrasesForMessage(FullMsgId fullId) {
+	return peerIsChannel(fullId.peer)
+		? SponsoredPhrases::Channel
+		: SponsoredPhrases::Bot;
+}
+
 void AboutBox(
 		not_null<Ui::GenericBox*> box,
-		std::shared_ptr<ChatHelpers::Show> show) {
+		std::shared_ptr<ChatHelpers::Show> show,
+		SponsoredPhrases phrases,
+		const Data::SponsoredMessages::Details &details,
+		Data::SponsoredReportAction report) {
 	constexpr auto kUrl = "https://promote.telegram.org"_cs;
 
+	box->setWidth(st::boxWideWidth);
 	box->setNoContentMargin(true);
 
+	const auto isChannel = (phrases == SponsoredPhrases::Channel);
+	const auto isSearch = (phrases == SponsoredPhrases::Search);
 	const auto session = &show->session();
 
 	const auto content = box->verticalLayout().get();
@@ -60,11 +75,10 @@ void AboutBox(
 		const auto rect = Rect(icon.size() * 1.4);
 		auto owned = object_ptr<Ui::RpWidget>(content);
 		owned->resize(rect.size());
-		const auto widget = box->addRow(object_ptr<Ui::CenterWrap<>>(
-			content,
-			std::move(owned)))->entity();
+		owned->setNaturalWidth(rect.width());
+		const auto widget = box->addRow(std::move(owned), style::al_top);
 		widget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = Painter(widget);
 			auto hq = PainterHighQualityEnabler(p);
 			p.setPen(Qt::NoPen);
@@ -75,19 +89,19 @@ void AboutBox(
 	}
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
-	box->addRow(object_ptr<Ui::CenterWrap<>>(
-		content,
+	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			content,
 			tr::lng_sponsored_menu_revenued_about(),
-			st::boxTitle)));
+			st::boxTitle),
+		style::al_top);
 	Ui::AddSkip(content);
-	box->addRow(object_ptr<Ui::CenterWrap<>>(
-		content,
+	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			content,
 			tr::lng_sponsored_revenued_subtitle(),
-			st::channelEarnLearnDescription)));
+			st::channelEarnLearnDescription),
+		style::al_top);
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 	{
@@ -116,13 +130,13 @@ void AboutBox(
 			const auto left = Ui::CreateChild<Ui::RpWidget>(
 				box->verticalLayout().get());
 			left->paintRequest(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				auto p = Painter(left);
 				icon.paint(p, 0, 0, left->width());
 			}, left->lifetime());
 			left->resize(icon.size());
 			top->geometryValue(
-			) | rpl::start_with_next([=](const QRect &g) {
+			) | rpl::on_next([=](const QRect &g) {
 				left->moveToLeft(
 					(g.left() - left->width()) / 2,
 					g.top() + st::channelEarnHistoryThreeSkip);
@@ -131,29 +145,60 @@ void AboutBox(
 		};
 		addEntry(
 			tr::lng_sponsored_revenued_info1_title(),
-			tr::lng_sponsored_revenued_info1_description(
-				Ui::Text::RichLangValue),
+			(isChannel
+				? tr::lng_sponsored_revenued_info1_description
+				: isSearch
+				? tr::lng_sponsored_revenued_info1_search_description
+				: tr::lng_sponsored_revenued_info1_bot_description)(
+					tr::rich),
 			st::sponsoredAboutPrivacyIcon);
+		if (!isSearch) {
+			Ui::AddSkip(content);
+			Ui::AddSkip(content);
+			addEntry(
+				(isChannel
+					? tr::lng_sponsored_revenued_info2_title
+					: tr::lng_sponsored_revenued_info2_bot_title)(),
+				(isChannel
+					? tr::lng_sponsored_revenued_info2_description
+					: tr::lng_sponsored_revenued_info2_bot_description)(
+						tr::rich),
+				st::sponsoredAboutSplitIcon);
+		}
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
-		addEntry(
-			tr::lng_sponsored_revenued_info2_title(),
-			tr::lng_sponsored_revenued_info2_description(
-				Ui::Text::RichLangValue),
-			st::sponsoredAboutSplitIcon);
-		Ui::AddSkip(content);
-		Ui::AddSkip(content);
+		auto link = tr::lng_settings_privacy_premium_link(
+		) | rpl::map([](QString t) {
+			return tr::link(std::move(t), u"internal:"_q);
+		});
 		addEntry(
 			tr::lng_sponsored_revenued_info3_title(),
-			tr::lng_sponsored_revenued_info3_description(
-				lt_count,
-				rpl::single(float64(levels)),
-				lt_link,
-				tr::lng_settings_privacy_premium_link(
-				) | rpl::map([=](QString t) {
-					return Ui::Text::Link(std::move(t), u"internal:"_q);
-				}),
-				Ui::Text::RichLangValue),
+			(isChannel
+				? tr::lng_sponsored_revenued_info3_description(
+					lt_count,
+					rpl::single(float64(levels)),
+					lt_link,
+					std::move(link),
+					tr::rich)
+				: isSearch
+				? tr::lng_sponsored_revenued_info3_search_description(
+					lt_link,
+					tr::lng_sponsored_revenued_info3_search_link(
+						lt_arrow,
+						rpl::single(
+							Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+						tr::marked
+					) | rpl::map([](TextWithEntities &&link) {
+						return Ui::Text::Wrapped(
+							std::move(link),
+							EntityType::CustomUrl,
+							u"internal:"_q);
+					}),
+					tr::rich)
+				: tr::lng_sponsored_revenued_info3_bot_description(
+					lt_link,
+					std::move(link),
+					tr::rich)),
 			st::sponsoredAboutRemoveIcon)->setClickHandlerFilter([=](
 					const auto &...) {
 				ShowPremiumPreviewBox(show, PremiumFeature::NoAds);
@@ -166,36 +211,34 @@ void AboutBox(
 	Ui::AddSkip(content);
 	{
 		box->addRow(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				content,
-				object_ptr<Ui::FlatLabel>(
-					content,
-					tr::lng_sponsored_revenued_footer_title(),
-					st::boxTitle)));
+				tr::lng_sponsored_revenued_footer_title(),
+				st::boxTitle),
+			style::al_top);
 	}
 	Ui::AddSkip(content);
 	{
-		const auto arrow = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				st::topicButtonArrow,
-				st::channelEarnLearnArrowMargins,
-				false));
+		const auto arrow = Ui::Text::IconEmoji(&st::textMoreIconEmoji);
 		const auto available = box->width()
 			- rect::m::sum::h(st::boxRowPadding);
 		box->addRow(
-			Ui::CreateLabelWithCustomEmoji(
+			object_ptr<Ui::FlatLabel>(
 				content,
-				tr::lng_sponsored_revenued_footer_description(
-					lt_link,
-					tr::lng_channel_earn_about_link(
-						lt_emoji,
-						rpl::single(arrow),
-						Ui::Text::RichLangValue
-					) | rpl::map([=](TextWithEntities text) {
-						return Ui::Text::Link(std::move(text), kUrl.utf16());
-					}),
-					Ui::Text::RichLangValue),
-				{ .session = session },
+				(isChannel
+					? tr::lng_sponsored_revenued_footer_description
+					: isSearch
+					? tr::lng_sponsored_revenued_footer_search_description
+					: tr::lng_sponsored_revenued_footer_bot_description)(
+						lt_link,
+						tr::lng_channel_earn_about_link(
+							lt_emoji,
+							rpl::single(arrow),
+							tr::rich
+						) | rpl::map([=](TextWithEntities t) {
+							return tr::link(std::move(t), kUrl.utf16());
+						}),
+						tr::rich),
 				st::channelEarnLearnDescription))->resizeToWidth(available);
 	}
 	Ui::AddSkip(content);
@@ -207,6 +250,7 @@ void AboutBox(
 			box,
 			tr::lng_box_ok(),
 			st::defaultActiveButton);
+		button->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 		button->resizeToWidth(box->width()
 			- st.buttonPadding.left()
 			- st.buttonPadding.left());
@@ -214,29 +258,69 @@ void AboutBox(
 		box->addButton(std::move(button));
 	}
 
+	if (!isChannel) {
+		const auto top = Ui::CreateChild<Ui::IconButton>(
+			box,
+			st::infoTopBarMenu);
+		box->widthValue(
+		) | rpl::on_next([=](int width) {
+			top->raise();
+			top->moveToLeft(
+				width - top->width() - st::defaultScrollArea.width,
+				0);
+		}, top->lifetime());
+		using MenuPtr = base::unique_qptr<Ui::PopupMenu>;
+		const auto menu = top->lifetime().make_state<MenuPtr>();
+		top->setClickedCallback([=] {
+			*menu = base::make_unique_q<Ui::PopupMenu>(
+				box->window(),
+				st::popupMenuWithIcons);
+			const auto raw = menu->get();
+			raw->animatePhaseValue(
+			) | rpl::on_next([=](Ui::PopupMenu::AnimatePhase phase) {
+				top->setForceRippled(false
+					|| phase == Ui::PopupMenu::AnimatePhase::Shown
+					|| phase == Ui::PopupMenu::AnimatePhase::StartShow);
+			}, top->lifetime());
+			raw->setDestroyedCallback([=] {
+				top->setForceRippled(false);
+			});
+			FillSponsored(
+				Ui::Menu::CreateAddActionCallback(menu->get()),
+				show,
+				phrases,
+				details,
+				report,
+				{ .skipAbout = true });
+			const auto global = top->mapToGlobal(
+				QPoint(top->width() / 4 * 3, top->height() / 2));
+			raw->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
+			raw->popup(
+				QPoint(
+					global.x(),
+					std::max(global.y(), QCursor::pos().y())));
+			return true;
+		});
+	}
 }
 
 void ShowReportSponsoredBox(
 		std::shared_ptr<ChatHelpers::Show> show,
-		not_null<HistoryItem*> item) {
-	const auto peer = item->history()->peer;
-	auto &sponsoredMessages = peer->session().sponsoredMessages();
-	const auto fullId = item->fullId();
-	const auto report = sponsoredMessages.createReportCallback(fullId);
-	const auto guideLink = Ui::Text::Link(
+		Data::SponsoredReportAction report) {
+	const auto guideLink = tr::link(
 		tr::lng_report_sponsored_reported_link(tr::now),
 		u"https://promote.telegram.org/guidelines"_q);
 
 	auto performRequest = [=](
 			const auto &repeatRequest,
 			Data::SponsoredReportResult::Id id) -> void {
-		report(id, [=](const Data::SponsoredReportResult &result) {
+		report.callback(id, [=](const Data::SponsoredReportResult &result) {
 			if (!result.error.isEmpty()) {
 				show->showToast(result.error);
 			}
 			if (!result.options.empty()) {
 				show->show(Box([=](not_null<Ui::GenericBox*> box) {
-					box->setTitle(rpl::single(result.title));
+					box->setTitle(result.title);
 
 					for (const auto &option : result.options) {
 						const auto button = Ui::AddReportOptionButton(
@@ -261,10 +345,9 @@ void ShowReportSponsoredBox(
 								tr::lng_report_sponsored_reported_learn(
 									lt_link,
 									rpl::single(guideLink),
-									Ui::Text::WithEntities),
+									tr::marked),
 								st::boxDividerLabel),
-							st::defaultBoxDividerLabelPadding,
-							RectPart::Top | RectPart::Bottom));
+							st::defaultBoxDividerLabelPadding));
 					}
 					box->addButton(
 						tr::lng_close(),
@@ -283,7 +366,7 @@ void ShowReportSponsoredBox(
 						tr::now,
 						lt_link,
 						guideLink,
-						Ui::Text::WithEntities);
+						tr::marked);
 					show->showToast({
 						.text = std::move(text),
 						.duration = kToastDuration,
@@ -303,64 +386,134 @@ void ShowReportSponsoredBox(
 } // namespace
 
 void FillSponsored(
-		not_null<Ui::RpWidget*> parent,
 		const Ui::Menu::MenuCallback &addAction,
 		std::shared_ptr<ChatHelpers::Show> show,
-		not_null<HistoryItem*> item,
-		bool mediaViewer) {
-	Expects(item->isSponsored());
-
-	const auto session = &item->history()->session();
-
-	addAction(tr::lng_sponsored_menu_revenued_about(tr::now), [=] {
-		show->show(Box(AboutBox, show));
-	}, (mediaViewer ? &st::mediaMenuIconInfo : &st::menuIconInfo));
+		SponsoredPhrases phrases,
+		const Data::SponsoredMessages::Details &details,
+		Data::SponsoredReportAction report,
+		SponsoredMenuSettings settings) {
+	const auto session = &show->session();
+	const auto &info = details.info;
+	const auto dark = settings.dark;
 
-	addAction(tr::lng_sponsored_menu_revenued_report(tr::now), [=] {
-		ShowReportSponsoredBox(show, item);
-	}, (mediaViewer ? &st::mediaMenuIconBlock : &st::menuIconBlock));
+	if (!settings.skipInfo && !info.empty()) {
+		auto fillSubmenu = [&](not_null<Ui::PopupMenu*> menu) {
+			const auto allText = ranges::accumulate(
+				info,
+				TextWithEntities(),
+				[](TextWithEntities a, TextWithEntities b) {
+					return a.text.isEmpty() ? b : a.append('\n').append(b);
+				}).text;
+			const auto callback = [=] {
+				TextUtilities::SetClipboardText({ allText });
+				show->showToast({
+					.text = { tr::lng_text_copied(tr::now) },
+					.iconLottie = u"toast/copy"_q,
+					.iconLottieSize = st::toastLottieIconSize,
+				});
+			};
+			for (const auto &i : info) {
+				auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
+					menu->menu(),
+					dark ? st::storiesMenu : st::defaultMenu,
+					(dark
+						? st::historySponsorInfoItemDark
+						: st::historySponsorInfoItem),
+					st::historyHasCustomEmojiPosition,
+					base::duplicate(i));
+				item->clicks(
+				) | rpl::on_next(callback, menu->lifetime());
+				menu->addAction(std::move(item));
+				if (i != details.info.back()) {
+					menu->addSeparator();
+				}
+			}
+		};
+		addAction({
+			.text = tr::lng_sponsored_info_menu(tr::now),
+			.handler = nullptr,
+			.icon = (dark
+				? &st::mediaMenuIconChannel
+				: &st::menuIconChannel),
+			.fillSubmenu = std::move(fillSubmenu),
+		});
+		addAction({
+			.separatorSt = (dark
+				? &st::mediaviewMenuSeparator
+				: &st::expandedMenuSeparator),
+			.isSeparator = true,
+		});
+	}
+	if (details.canReport) {
+		if (!settings.skipAbout) {
+			addAction(tr::lng_sponsored_menu_revenued_about(tr::now), [=] {
+				show->show(Box(AboutBox, show, phrases, details, report));
+			}, (dark ? &st::mediaMenuIconInfo : &st::menuIconInfo));
+		}
 
-	addAction({
-		.separatorSt = (mediaViewer
-			? &st::mediaviewMenuSeparator
-			: &st::expandedMenuSeparator),
-		.isSeparator = true,
-	});
+		addAction(tr::lng_sponsored_menu_revenued_report(tr::now), [=] {
+			ShowReportSponsoredBox(show, report);
+		}, (dark ? &st::mediaMenuIconBlock : &st::menuIconBlock));
 
+		addAction({
+			.separatorSt = (dark
+				? &st::mediaviewMenuSeparator
+				: &st::expandedMenuSeparator),
+			.isSeparator = true,
+		});
+	}
 	addAction(tr::lng_sponsored_hide_ads(tr::now), [=] {
 		if (session->premium()) {
 			using Result = Data::SponsoredReportResult;
-			session->sponsoredMessages().createReportCallback(
-				item->fullId())(Result::Id("-1"), [](const auto &) {});
+			report.callback(Result::Id("-1"), [](const auto &) {});
 		} else {
 			ShowPremiumPreviewBox(show, PremiumFeature::NoAds);
 		}
-	}, (mediaViewer ? &st::mediaMenuIconCancel : &st::menuIconCancel));
+	}, (dark ? &st::mediaMenuIconCancel : &st::menuIconCancel));
+}
+
+void FillSponsored(
+		const Ui::Menu::MenuCallback &addAction,
+		std::shared_ptr<ChatHelpers::Show> show,
+		const FullMsgId &fullId,
+		SponsoredMenuSettings settings) {
+	const auto session = &show->session();
+	FillSponsored(
+		addAction,
+		show,
+		PhrasesForMessage(fullId),
+		session->sponsoredMessages().lookupDetails(fullId),
+		session->sponsoredMessages().createReportCallback(fullId),
+		settings);
 }
 
 void ShowSponsored(
 		not_null<Ui::RpWidget*> parent,
 		std::shared_ptr<ChatHelpers::Show> show,
-		not_null<HistoryItem*> item) {
-	Expects(item->isSponsored());
-
+		const FullMsgId &fullId) {
 	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
 		parent.get(),
 		st::popupMenuWithIcons);
 
 	FillSponsored(
-		parent,
 		Ui::Menu::CreateAddActionCallback(menu),
 		show,
-		item,
-		false);
+		fullId);
 
 	menu->popup(QCursor::pos());
 }
 
-void ShowSponsoredAbout(std::shared_ptr<ChatHelpers::Show> show) {
+void ShowSponsoredAbout(
+		std::shared_ptr<ChatHelpers::Show> show,
+		const FullMsgId &fullId) {
+	const auto session = &show->session();
 	show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
-		AboutBox(box, show);
+		AboutBox(
+			box,
+			show,
+			PhrasesForMessage(fullId),
+			session->sponsoredMessages().lookupDetails(fullId),
+			session->sponsoredMessages().createReportCallback(fullId));
 	}));
 }
 
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.h b/Telegram/SourceFiles/menu/menu_sponsored.h
index 3085aad952385d..987630e4bb07f9 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.h
+++ b/Telegram/SourceFiles/menu/menu_sponsored.h
@@ -11,6 +11,11 @@ namespace ChatHelpers {
 class Show;
 } // namespace ChatHelpers
 
+namespace Data {
+struct SponsoredMessageDetails;
+struct SponsoredReportAction;
+} // namespace Data
+
 namespace Ui {
 class RpWidget;
 namespace Menu {
@@ -22,18 +27,39 @@ class HistoryItem;
 
 namespace Menu {
 
+enum class SponsoredPhrases {
+	Channel,
+	Bot,
+	Search,
+};
+
+struct SponsoredMenuSettings {
+	bool dark = false;
+	bool skipAbout = false;
+	bool skipInfo = false;
+};
+
 void FillSponsored(
-	not_null<Ui::RpWidget*> parent,
 	const Ui::Menu::MenuCallback &addAction,
 	std::shared_ptr<ChatHelpers::Show> show,
-	not_null<HistoryItem*> item,
-	bool mediaViewer);
+	SponsoredPhrases phrases,
+	const Data::SponsoredMessageDetails &details,
+	Data::SponsoredReportAction report,
+	SponsoredMenuSettings settings = {});
+
+void FillSponsored(
+	const Ui::Menu::MenuCallback &addAction,
+	std::shared_ptr<ChatHelpers::Show> show,
+	const FullMsgId &fullId,
+	SponsoredMenuSettings settings = {});
 
 void ShowSponsored(
 	not_null<Ui::RpWidget*> parent,
 	std::shared_ptr<ChatHelpers::Show> show,
-	not_null<HistoryItem*> item);
+	const FullMsgId &fullId);
 
-void ShowSponsoredAbout(std::shared_ptr<ChatHelpers::Show> show);
+void ShowSponsoredAbout(
+	std::shared_ptr<ChatHelpers::Show> show,
+	const FullMsgId &fullId);
 
 } // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_timecode_action.cpp b/Telegram/SourceFiles/menu/menu_timecode_action.cpp
new file mode 100644
index 00000000000000..06f166111c821b
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_timecode_action.cpp
@@ -0,0 +1,126 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "menu/menu_timecode_action.h"
+
+#include "base/unique_qptr.h"
+#include "lang/lang_keys.h"
+#include "ui/painter.h"
+#include "ui/text/format_values.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/menu/menu_action.h"
+#include "ui/widgets/menu/menu_common.h"
+#include "ui/widgets/popup_menu.h"
+
+#include "styles/style_chat.h"
+#include "styles/style_menu_icons.h"
+
+namespace {
+
+class TimecodeAction final : public Ui::Menu::Action {
+public:
+	TimecodeAction(
+		not_null<Ui::Menu::Menu*> parent,
+		const style::Menu &st,
+		not_null<QAction*> action,
+		const style::icon *icon,
+		const QString &timecode,
+		rpl::producer<QString> updates);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	const style::icon *_replyIcon = nullptr;
+	QString _timecode;
+
+};
+
+TimecodeAction::TimecodeAction(
+	not_null<Ui::Menu::Menu*> parent,
+	const style::Menu &st,
+	not_null<QAction*> action,
+	const style::icon *icon,
+	const QString &timecode,
+	rpl::producer<QString> updates)
+: Ui::Menu::Action(parent, st, action, nullptr, nullptr)
+, _replyIcon(icon)
+, _timecode(timecode) {
+	std::move(updates) | rpl::on_next([=](const QString &value) {
+		_timecode = value;
+		update();
+	}, lifetime());
+}
+
+void TimecodeAction::paintEvent(QPaintEvent *e) {
+	Ui::Menu::Action::paintEvent(e);
+
+	auto p = Painter(this);
+	if (_replyIcon) {
+		const auto pos = st().itemIconPosition;
+		const auto iconW = _replyIcon->width();
+		constexpr auto kScale = 0.8;
+		const auto dx = pos.x() + (iconW * (1. - kScale)) / 2.;
+		const auto dy = pos.y();
+		auto hq = PainterHighQualityEnabler(p);
+		p.translate(dx, dy);
+		p.scale(kScale, kScale);
+		_replyIcon->paint(p, 0, 0, width() / kScale);
+		p.resetTransform();
+	}
+	const auto &font = st::menuTimecodeFont;
+	p.setFont(font);
+	p.setPen(st::menuIconColor);
+	const auto iconRight = st().itemIconPosition.x()
+		+ st::menuIconReply.width();
+	const auto textWidth = font->width(_timecode);
+	const auto x = iconRight - textWidth;
+	const auto y = st().itemIconPosition.y()
+		+ st::menuIconReply.height()
+		- font->descent;
+	p.drawText(x, y, _timecode);
+}
+
+} // namespace
+
+namespace Menu {
+
+void InsertTextAtCursor(
+		not_null<Ui::InputField*> field,
+		const QString &text) {
+	auto cursor = field->textCursor();
+	const auto pos = cursor.position();
+	const auto doc = field->getTextWithTags().text;
+	const auto needSpaceBefore = pos > 0
+		&& !doc[pos - 1].isSpace();
+	auto insert = QString();
+	if (needSpaceBefore) {
+		insert += ' ';
+	}
+	insert += text + ' ';
+	cursor.insertText(insert);
+	field->setTextCursor(cursor);
+}
+
+not_null<QAction*> AddTimecodeAction(
+		not_null<Ui::PopupMenu*> menu,
+		const QString &timecode,
+		rpl::producer<QString> updates,
+		Fn<void()> callback) {
+	auto item = base::make_unique_q<TimecodeAction>(
+		menu->menu(),
+		menu->st().menu,
+		Ui::Menu::CreateAction(
+			menu->menu().get(),
+			tr::lng_context_reply_with_timecode(tr::now),
+			std::move(callback)),
+		&st::menuIconReply,
+		timecode,
+		std::move(updates));
+	return menu->addAction(std::move(item));
+}
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_timecode_action.h b/Telegram/SourceFiles/menu/menu_timecode_action.h
new file mode 100644
index 00000000000000..ac8b77cdd980e8
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_timecode_action.h
@@ -0,0 +1,31 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/basic_types.h"
+
+class QAction;
+
+namespace Ui {
+class InputField;
+class PopupMenu;
+} // namespace Ui
+
+namespace Menu {
+
+void InsertTextAtCursor(
+	not_null<Ui::InputField*> field,
+	const QString &text);
+
+not_null<QAction*> AddTimecodeAction(
+	not_null<Ui::PopupMenu*> menu,
+	const QString &timecode,
+	rpl::producer<QString> updates,
+	Fn<void()> callback);
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_ttl.cpp b/Telegram/SourceFiles/menu/menu_ttl.cpp
index f77294a2f2e079..9c4db841f8625a 100644
--- a/Telegram/SourceFiles/menu/menu_ttl.cpp
+++ b/Telegram/SourceFiles/menu/menu_ttl.cpp
@@ -103,13 +103,13 @@ TextItem::TextItem(
 		+ st.itemIconPosition.x());
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		_label->moveToLeft(
 			st.itemIconPosition.x(),
 			(s.height() - _label->height()) / 2);
 	}, lifetime());
 
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 }
 
 not_null<QAction*> TextItem::action() const {
@@ -261,7 +261,7 @@ void SetupTTLMenu(
 	const auto state = parent->lifetime().make_state<State>();
 	std::move(
 		triggers
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (state->menu) {
 			return;
 		}
diff --git a/Telegram/SourceFiles/menu/menu_ttl_validator.cpp b/Telegram/SourceFiles/menu/menu_ttl_validator.cpp
index a5ecac4278a78a..3c12f44d8b898b 100644
--- a/Telegram/SourceFiles/menu/menu_ttl_validator.cpp
+++ b/Telegram/SourceFiles/menu/menu_ttl_validator.cpp
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 #include "data/data_peer.h"
 #include "data/data_user.h"
 #include "lang/lang_keys.h"
+#include "main/session/session_show.h"
 #include "main/main_session.h"
 #include "menu/menu_ttl.h"
 #include "ui/layers/generic_box.h"
@@ -75,7 +76,7 @@ Args TTLValidator::createArgs() const {
 		}
 		state->savingPeriod = period;
 		state->savingRequestId = api.request(MTPmessages_SetHistoryTTL(
-			peer->input,
+			peer->input(),
 			MTP_int(period)
 		)).done([=](const MTPUpdates &result) {
 			peer->session().api().applyUpdates(result);
@@ -95,9 +96,9 @@ Args TTLValidator::createArgs() const {
 		lt_link,
 		tr::lng_ttl_edit_about2_link(
 		) | rpl::map([=](const QString &s) {
-			return Ui::Text::Link(s, "tg://settings/auto_delete");
+			return tr::link(s, "tg://settings/auto_delete");
 		}),
-		Ui::Text::WithEntities);
+		tr::marked);
 	auto about = rpl::combine(
 		std::move(about1),
 		std::move(about2)
@@ -112,7 +113,11 @@ bool TTLValidator::can() const {
 	return (_peer->isUser()
 			&& !_peer->isSelf()
 			&& !_peer->isNotificationsUser()
-			&& !_peer->asUser()->isInaccessible())
+			&& !_peer->asUser()->isInaccessible()
+			&& !_peer->asUser()->starsPerMessage()
+			&& !_peer->asUser()->isVerifyCodes()
+			&& (!_peer->asUser()->requiresPremiumToWrite()
+				|| _peer->session().premium()))
 		|| (_peer->isChat()
 			&& _peer->asChat()->canEditInformation()
 			&& _peer->asChat()->amIn())
@@ -130,6 +135,9 @@ const style::icon *TTLValidator::icon() const {
 }
 
 void TTLValidator::showBox() const {
+	if (Main::MakeSessionShow(_show, &_peer->session())->showFrozenError()) {
+		return;
+	}
 	_show->showBox(Box(TTLBox, createArgs()));
 }
 
diff --git a/Telegram/SourceFiles/mtproto/connection_tcp.cpp b/Telegram/SourceFiles/mtproto/connection_tcp.cpp
index 26dff1dd9752e4..44321c3a8c1da3 100644
--- a/Telegram/SourceFiles/mtproto/connection_tcp.cpp
+++ b/Telegram/SourceFiles/mtproto/connection_tcp.cpp
@@ -547,27 +547,27 @@ void TcpConnection::connectToServer(
 	CONNECTION_LOG_INFO("Connecting...");
 
 	_socket->connected(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		socketConnected();
 	}, _connectedLifetime);
 
 	_socket->disconnected(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		socketDisconnected();
 	}, _lifetime);
 
 	_socket->readyRead(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		socketRead();
 	}, _lifetime);
 
 	_socket->error(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		socketError();
 	}, _lifetime);
 
 	_socket->syncTimeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		syncTimeRequest();
 	}, _lifetime);
 
diff --git a/Telegram/SourceFiles/mtproto/dedicated_file_loader.cpp b/Telegram/SourceFiles/mtproto/dedicated_file_loader.cpp
index 850d5c6c117cec..1a63c5507e1835 100644
--- a/Telegram/SourceFiles/mtproto/dedicated_file_loader.cpp
+++ b/Telegram/SourceFiles/mtproto/dedicated_file_loader.cpp
@@ -97,7 +97,7 @@ WeakInstance::WeakInstance(base::weak_ptr<Main::Session> session)
 	_session->account().sessionChanges(
 	) | rpl::filter([](Main::Session *session) {
 		return !session;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		die();
 	}, _lifetime);
 }
@@ -155,14 +155,22 @@ AbstractDedicatedLoader::AbstractDedicatedLoader(
 	int chunkSize)
 : _filepath(filepath)
 , _chunkSize(chunkSize) {
+	progress() | rpl::on_next([=](Progress progress) {
+		QMutexLocker lock(&_sizesMutex);
+		_alreadySize = progress.already;
+		_totalSize = progress.size;
+		_preferPercent = progress.percent;
+	}, lifetime());
 }
 
 void AbstractDedicatedLoader::start() {
-	if (!validateOutput()
-		|| (!_output.isOpen() && !_output.open(QIODevice::Append))) {
-		QFile(_filepath).remove();
-		threadSafeFailed();
-		return;
+	if (!_filepath.isEmpty()) {
+		if (!validateOutput()
+			|| (!_output.isOpen() && !_output.open(QIODevice::Append))) {
+			QFile(_filepath).remove();
+			threadSafeFailed();
+			return;
+		}
 	}
 
 	LOG(("Update Info: Starting loading '%1' from %2 offset."
@@ -181,6 +189,10 @@ int64 AbstractDedicatedLoader::totalSize() const {
 	return _totalSize;
 }
 
+bool AbstractDedicatedLoader::preferPercent() const {
+	return _preferPercent;
+}
+
 rpl::producer<QString> AbstractDedicatedLoader::ready() const {
 	return _ready.events();
 }
@@ -194,6 +206,9 @@ rpl::producer<> AbstractDedicatedLoader::failed() const {
 }
 
 void AbstractDedicatedLoader::wipeFolder() {
+	if (_filepath.isEmpty()) {
+		return;
+	}
 	QFileInfo info(_filepath);
 	const auto dir = info.dir();
 	const auto all = dir.entryInfoList(QDir::Files);
@@ -416,10 +431,11 @@ void ResolveChannel(
 			).arg(QString::number(error.code()) + ':' + error.type()));
 		fail();
 	};
-	mtp->send(
-		MTPcontacts_ResolveUsername(MTP_string(username)),
-		doneHandler,
-		failHandler);
+	mtp->send(MTPcontacts_ResolveUsername(
+		MTP_flags(0),
+		MTP_string(username),
+		MTP_string()
+	), doneHandler, failHandler);
 }
 
 std::optional<MTPMessage> GetMessagesElement(
diff --git a/Telegram/SourceFiles/mtproto/dedicated_file_loader.h b/Telegram/SourceFiles/mtproto/dedicated_file_loader.h
index 4a4e7eb24a526d..652feb250f4dd1 100644
--- a/Telegram/SourceFiles/mtproto/dedicated_file_loader.h
+++ b/Telegram/SourceFiles/mtproto/dedicated_file_loader.h
@@ -54,6 +54,7 @@ class AbstractDedicatedLoader : public base::has_weak_ptr {
 	struct Progress {
 		int64 already = 0;
 		int64 size = 0;
+		bool percent = false;
 
 		inline bool operator<(const Progress &other) const {
 			return (already < other.already)
@@ -70,6 +71,7 @@ class AbstractDedicatedLoader : public base::has_weak_ptr {
 
 	int64 alreadySize() const;
 	int64 totalSize() const;
+	bool preferPercent() const;
 
 	rpl::producer<Progress> progress() const;
 	rpl::producer<QString> ready() const;
@@ -81,6 +83,8 @@ class AbstractDedicatedLoader : public base::has_weak_ptr {
 
 protected:
 	void threadSafeFailed();
+	void threadSafeProgress(Progress progress);
+	void threadSafeReady();
 
 	// Single threaded.
 	void writeChunk(bytes::const_span data, int totalSize);
@@ -89,8 +93,6 @@ class AbstractDedicatedLoader : public base::has_weak_ptr {
 	virtual void startLoading() = 0;
 
 	bool validateOutput();
-	void threadSafeProgress(Progress progress);
-	void threadSafeReady();
 
 	QString _filepath;
 	int _chunkSize = 0;
@@ -98,6 +100,7 @@ class AbstractDedicatedLoader : public base::has_weak_ptr {
 	QFile _output;
 	int64 _alreadySize = 0;
 	int64 _totalSize = 0;
+	bool _preferPercent = false;
 	mutable QMutex _sizesMutex;
 	rpl::event_stream<Progress> _progress;
 	rpl::event_stream<QString> _ready;
diff --git a/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp b/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
index 0f20d25b3ce43c..b7b10a47c4cc54 100644
--- a/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
+++ b/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
@@ -65,7 +65,7 @@ QByteArray DnsUserAgent() {
 	static const auto kResult = QByteArray(
 		"Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
 		"AppleWebKit/537.36 (KHTML, like Gecko) "
-		"Chrome/129.0.0.0 Safari/537.36");
+		"Chrome/148.0.0.0 Safari/537.36");
 	return kResult;
 }
 
diff --git a/Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp b/Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp
index 36aa87598fab4f..a3c96288547ba7 100644
--- a/Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp
+++ b/Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "base/openssl_help.h"
 #include "base/bytes.h"
 #include "base/invoke_queued.h"
+#include "base/random.h"
 #include "base/unixtime.h"
 
 #include <QtCore/QtEndian>
@@ -20,7 +21,7 @@ namespace MTP::details {
 namespace {
 
 constexpr auto kMaxGrease = 8;
-constexpr auto kClientHelloLength = 517;
+constexpr auto kClientHelloLimit = 2048;
 constexpr auto kHelloDigestLength = 32;
 constexpr auto kLengthSize = sizeof(uint16);
 const auto kServerHelloPart1 = qstr("\x16\x03\x03");
@@ -68,6 +69,15 @@ using BigNumContext = openssl::Context;
 	const auto K = [&] {
 		pushToBack(MTP_tlsBlockPublicKey());
 	};
+	const auto M = [&] {
+		pushToBack(MTP_tlsBlockM());
+	};
+	const auto E = [&] {
+		pushToBack(MTP_tlsBlockE());
+	};
+	const auto P = [&] {
+		pushToBack(MTP_tlsBlockPadding());
+	};
 	const auto OpenScope = [&] {
 		stack.emplace_back(Scope());
 	};
@@ -112,7 +122,11 @@ using BigNumContext = openssl::Context;
 
 	stack.emplace_back(Scope());
 
-	S("\x16\x03\x01\x02\x00\x01\x00\x01\xfc\x03\x03"_q);
+	S("\x16\x03\x01"_q);
+	OpenScope();
+	S("\x01\x00"_q);
+	OpenScope();
+	S("\x03\x03"_q);
 	Z(32);
 	S("\x20"_q);
 	R(32);
@@ -121,7 +135,8 @@ using BigNumContext = openssl::Context;
 	S(""
 		"\x13\x01\x13\x02\x13\x03\xc0\x2b\xc0\x2f\xc0\x2c\xc0\x30\xcc\xa9"
 		"\xcc\xa8\xc0\x13\xc0\x14\x00\x9c\x00\x9d\x00\x2f\x00\x35\x01\x00"
-		"\x01\x93"_q);
+		""_q);
+	OpenScope();
 	G(2);
 	S("\x00\x00"_q);
 	OpenPermutation(); {
@@ -140,9 +155,9 @@ using BigNumContext = openssl::Context;
 			S("\x00\x05\x00\x05\x01\x00\x00\x00\x00"_q);
 		}
 		StartPermutationElement(); {
-			S("\x00\x0a\x00\x0a\x00\x08"_q);
+			S("\x00\x0a\x00\x0c\x00\x0a"_q);
 			G(4);
-			S("\x00\x1d\x00\x17\x00\x18"_q);
+			S("\x11\xec\x00\x1d\x00\x17\x00\x18"_q);
 		}
 		StartPermutationElement(); {
 			S("\x00\x0b\x00\x02\x01\x00"_q);
@@ -178,20 +193,39 @@ using BigNumContext = openssl::Context;
 			S("\x00\x2d\x00\x02\x01\x01"_q);
 		}
 		StartPermutationElement(); {
-			S("\x00\x33\x00\x2b\x00\x29"_q);
+			S("\x00\x33\x04\xef\x04\xed"_q);
 			G(4);
-			S("\x00\x01\x00\x00\x1d\x00\x20"_q);
+			S("\x00\x01\x00\x11\xec\x04\xc0"_q);
+			M();
+			K();
+			S("\x00\x1d\x00\x20"_q);
 			K();
 		}
 		StartPermutationElement(); {
-			S("\x44\x69\x00\x05\x00\x03\x02\x68\x32"_q);
+			S("\x44\xcd\x00\x05\x00\x03\x02\x68\x32"_q);
+		}
+		StartPermutationElement(); {
+			S("\xfe\x0d"_q);
+			OpenScope();
+			S("\x00\x00\x01\x00\x01"_q);
+			R(1);
+			S("\x00\x20"_q);
+			R(32);
+			OpenScope();
+			E();
+			CloseScope();
+			CloseScope();
 		}
 		StartPermutationElement(); {
 			S("\xff\x01\x00\x01\x00"_q);
 		}
 	} ClosePermutation();
 	G(3);
-	S("\x00\x01\x00\x00\x15"_q);
+	S("\x00\x01\x00"_q);
+	P();
+	CloseScope();
+	CloseScope();
+	CloseScope();
 
 	return MTP_tlsClientHello(MTP_vector<MTPTlsBlock>(Finish()));
 }
@@ -211,93 +245,41 @@ using BigNumContext = openssl::Context;
 	return result;
 }
 
-// Returns y^2 = x^3 + 486662 * x^2 + x.
-[[nodiscard]] BigNum GenerateY2(
-		const BigNum &x,
-		const BigNum &mod,
-		const BigNumContext &context) {
-	auto coef = BigNum(486662);
-	auto y = BigNum::ModAdd(x, coef, mod, context);
-	y.setModMul(y, x, mod, context);
-	coef.setWord(1);
-	y.setModAdd(y, coef, mod, context);
-	return BigNum::ModMul(y, x, mod, context);
-}
-
-// Returns x_2 = (x^2 - 1)^2/(4*y^2).
-[[nodiscard]] BigNum GenerateX2(
-		const BigNum &x,
-		const BigNum &mod,
-		const BigNumContext &context) {
-	auto denominator = GenerateY2(x, mod, context);
-	auto coef = BigNum(4);
-	denominator.setModMul(denominator, coef, mod, context);
-
-	auto numerator = BigNum::ModMul(x, x, mod, context);
-	coef.setWord(1);
-	numerator.setModSub(numerator, coef, mod, context);
-	numerator.setModMul(numerator, numerator, mod, context);
+[[nodiscard]] bytes::vector GeneratePublicKey() {
+	const auto context = EVP_PKEY_CTX_new_id(NID_ED25519, nullptr);
+	if (!context) {
+		return {};
+	}
+	const auto guardContext = gsl::finally([&] {
+		EVP_PKEY_CTX_free(context);
+	});
 
-	denominator.setModInverse(denominator, mod, context);
-	return BigNum::ModMul(numerator, denominator, mod, context);
-}
+	if (EVP_PKEY_keygen_init(context) <= 0) {
+		return {};
+	}
 
-[[nodiscard]] bytes::vector GeneratePublicKey() {
-	const auto context = BigNumContext();
-	const char modBytes[] = ""
-		"\x7f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-		"\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xed";
-	const char powBytes[] = ""
-		"\x3f\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
-		"\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xf6";
-	const auto mod = BigNum(bytes::make_span(modBytes).subspan(0, 32));
-	const auto pow = BigNum(bytes::make_span(powBytes).subspan(0, 32));
-
-	auto x = BigNum();
-	do {
-		while (true) {
-			auto random = bytes::vector(32);
-			bytes::set_random(random);
-			random[31] &= bytes::type(0x7FU);
-			x.setBytes(random);
-			x.setModMul(x, x, mod, context);
-
-			auto y = GenerateY2(x, mod, context);
-			if (BigNum::ModExp(y, pow, mod, context).isOne()) {
-				break;
-			}
-		}
-		for (auto i = 0; i != 3; ++i) {
-			x = GenerateX2(x, mod, context);
-		}
-		const auto xBytes = x.getBytes();
-		Assert(!xBytes.empty());
-		Assert(xBytes.size() <= 32);
-	} while (x.bytesSize() == 32);
+	auto key = (EVP_PKEY*)nullptr;
+	if (EVP_PKEY_keygen(context, &key) <= 0) {
+		return {};
+	}
+	const auto guardKey = gsl::finally([&] {
+		EVP_PKEY_free(key);
+	});
 
-	const auto xBytes = x.getBytes();
-	auto result = bytes::vector(32, bytes::type());
-	bytes::copy(
-		bytes::make_span(result).subspan(32 - xBytes.size()),
-		xBytes);
-	ranges::reverse(result);
-
-	//auto string = QString();
-	//string.reserve(64);
-	//for (const auto byte : result) {
-	//	const auto code = uchar(byte);
-	//	const auto hex = [](uchar value) -> char {
-	//		if (value >= 0 && value <= 9) {
-	//			return '0' + value;
-	//		} else if (value >= 10 && value <= 15) {
-	//			return 'a' + (value - 10);
-	//		}
-	//		return '-';
-	//	};
-	//	string.append(hex(code / 16)).append(hex(code % 16));
-	//}
-	//LOG(("KEY: %1").arg(string));
+	auto length = size_t(0);
+	if (!EVP_PKEY_get_raw_public_key(key, nullptr, &length)) {
+		return {};
+	}
+	Assert(length == 32);
 
+	auto result = bytes::vector(length);
+	const auto code = EVP_PKEY_get_raw_public_key(
+		key,
+		reinterpret_cast<unsigned char *>(result.data()),
+		&length);
+	if (!code) {
+		return {};
+	}
 	return result;
 }
 
@@ -332,6 +314,9 @@ class Generator {
 		void writeBlock(const MTPDtlsBlockPublicKey &data);
 		void writeBlock(const MTPDtlsBlockScope &data);
 		void writeBlock(const MTPDtlsBlockPermutation &data);
+		void writeBlock(const MTPDtlsBlockM &data);
+		void writeBlock(const MTPDtlsBlockE &data);
+		void writeBlock(const MTPDtlsBlockPadding &data);
 		void finalize(bytes::const_span key);
 		[[nodiscard]] QByteArray extractDigest() const;
 
@@ -339,7 +324,6 @@ class Generator {
 		[[nodiscard]] QByteArray take();
 
 	private:
-		void writePadding();
 		void writeDigest(bytes::const_span key);
 		void injectTimestamp();
 
@@ -363,7 +347,7 @@ Generator::Part::Part(
 	const bytes::vector &greases)
 : _domain(domain)
 , _greases(greases) {
-	_result.reserve(kClientHelloLength);
+	_result.reserve(kClientHelloLimit);
 	_data = _result.constData();
 }
 
@@ -380,7 +364,7 @@ QByteArray Generator::Part::take() {
 bytes::span Generator::Part::grow(int size) {
 	if (_error
 		|| size <= 0
-		|| _result.size() + size > kClientHelloLength) {
+		|| _result.size() + size > kClientHelloLimit) {
 		_error = true;
 		return bytes::span();
 	}
@@ -496,6 +480,45 @@ void Generator::Part::writeBlock(const MTPDtlsBlockPermutation &data) {
 	}
 }
 
+void Generator::Part::writeBlock(const MTPDtlsBlockM &data) {
+	constexpr auto kElements = 384;
+	constexpr auto kAdded = 32;
+
+	const auto storage = grow(kElements * 3 + kAdded);
+	if (storage.empty()) {
+		return;
+	}
+
+	auto random = bytes::vector(kElements * 8 + kAdded);
+	bytes::set_random(random);
+
+	auto chars = reinterpret_cast<char*>(storage.data());
+	const auto ints = reinterpret_cast<const uint32*>(random.data());
+	for (auto i = 0; i < kElements; ++i) {
+		const auto a = int(ints[i * 2] % 3329);
+		const auto b = int(ints[i * 2 + 1] % 3329);
+		*chars++ = (char)(a & 255);
+		*chars++ = (char)((a >> 8) + ((b & 15) << 4));
+		*chars++ = (char)(b >> 4);
+	}
+	bytes::set_random(storage.subspan(kElements * 3));
+}
+
+void Generator::Part::writeBlock(const MTPDtlsBlockE &data) {
+	const auto lengths = std::array{ 144, 176, 208, 240 };
+	const auto length = lengths[base::RandomIndex(lengths.size())];
+	writeBlock(MTP_tlsBlockRandom(MTP_int(length)));
+}
+
+void Generator::Part::writeBlock(const MTPDtlsBlockPadding &data) {
+	const auto length = int(_result.size());
+	if (length < 513) {
+		const auto zero = MTP_tlsBlockZero(MTP_int(513 - length));
+		writeBlock(MTP_tlsBlockString(MTP_bytes("\x00\x15"_q)));
+		writeBlock(MTP_tlsBlockScope(MTP_vector<MTPTlsBlock>(1, zero)));
+	}
+}
+
 void Generator::Part::finalize(bytes::const_span key) {
 	if (_error) {
 		return;
@@ -503,7 +526,6 @@ void Generator::Part::finalize(bytes::const_span key) {
 		_error = true;
 		return;
 	}
-	writePadding();
 	writeDigest(key);
 	injectTimestamp();
 }
@@ -515,14 +537,6 @@ QByteArray Generator::Part::extractDigest() const {
 	return _result.mid(_digestPosition, kHelloDigestLength);
 }
 
-void Generator::Part::writePadding() {
-	Expects(_result.size() <= kClientHelloLength - kLengthSize);
-
-	const auto padding = kClientHelloLength - kLengthSize - _result.size();
-	writeBlock(MTP_tlsBlockScope(
-		MTP_vector<MTPTlsBlock>(1, MTP_tlsBlockZero(MTP_int(padding)))));
-}
-
 void Generator::Part::writeDigest(bytes::const_span key) {
 	Expects(_digestPosition >= 0);
 
@@ -549,9 +563,7 @@ Generator::Generator(
 	bytes::const_span key)
 : _greases(PrepareGreases())
 , _result(domain, _greases) {
-	_result.writeBlocks(rules.match([&](const MTPDtlsClientHello &data) {
-		return data.vblocks().v;
-	}));
+	_result.writeBlocks(rules.data().vblocks().v);
 	_result.finalize(key);
 }
 
diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.cpp b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
index ee109583701366..a7dd178b7107ca 100644
--- a/Telegram/SourceFiles/mtproto/mtp_instance.cpp
+++ b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
@@ -100,6 +100,7 @@ class Instance::Private : private Sender {
 
 	[[nodiscard]] auto nonPremiumDelayedRequests() const
 	-> rpl::producer<mtpRequestId>;
+	[[nodiscard]] rpl::producer<> frozenErrorReceived() const;
 
 	void restart();
 	void restart(ShiftedDcId shiftedDcId);
@@ -286,6 +287,7 @@ class Instance::Private : private Sender {
 	Fn<void(ShiftedDcId shiftedDcId)> _sessionResetHandler;
 
 	rpl::event_stream<mtpRequestId> _nonPremiumDelayedRequests;
+	rpl::event_stream<> _frozenErrorReceived;
 
 	base::Timer _checkDelayedTimer;
 
@@ -319,12 +321,12 @@ Instance::Private::Private(
 	_fileSessionThreads.resize(2 * std::max(idealThreadPoolSize / 2, 1));
 
 	details::unpaused(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		unpaused();
 	}, _lifetime);
 
 	_networkReachability->availableChanges(
-	) | rpl::start_with_next([=](bool available) {
+	) | rpl::on_next([=](bool available) {
 		restart();
 	}, _lifetime);
 
@@ -333,7 +335,7 @@ Instance::Private::Private(
 
 	_customDeviceModel = Core::App().settings().customDeviceModel();
 	Core::App().settings().customDeviceModelChanges(
-	) | rpl::start_with_next([=](const QString &value) {
+	) | rpl::on_next([=](const QString &value) {
 		QMutexLocker lock(&_deviceModelMutex);
 		_customDeviceModel = value;
 		lock.unlock();
@@ -363,7 +365,7 @@ Instance::Private::Private(
 	}
 
 	_proxySettings.connectionTypeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_configLoader) {
 			_configLoader->setProxyEnabled(_proxySettings.isEnabled());
 		}
@@ -562,6 +564,10 @@ auto Instance::Private::nonPremiumDelayedRequests() const
 	return _nonPremiumDelayedRequests.events();
 }
 
+rpl::producer<> Instance::Private::frozenErrorReceived() const {
+	return _frozenErrorReceived.events();
+}
+
 void Instance::Private::requestConfigIfOld() {
 	const auto timeout = _config->values().blockedMode
 		? kConfigBecomesOldForBlockedIn
@@ -1593,6 +1599,8 @@ bool Instance::Private::onErrorDefault(
 		return true;
 	} else if (type == u"CONNECTION_LANG_CODE_INVALID"_q) {
 		Lang::CurrentCloudManager().resetToDefault();
+	} else if (type == u"FROZEN_METHOD_INVALID"_q) {
+		_frozenErrorReceived.fire({});
 	}
 	if (badGuestDc) _badGuestDcRequests.erase(requestId);
 	return false;
@@ -1920,6 +1928,10 @@ rpl::producer<mtpRequestId> Instance::nonPremiumDelayedRequests() const {
 	return _private->nonPremiumDelayedRequests();
 }
 
+rpl::producer<> Instance::frozenErrorReceived() const {
+	return _private->frozenErrorReceived();
+}
+
 void Instance::requestConfigIfOld() {
 	_private->requestConfigIfOld();
 }
diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.h b/Telegram/SourceFiles/mtproto/mtp_instance.h
index 55401065f65599..eeb56d29cc8316 100644
--- a/Telegram/SourceFiles/mtproto/mtp_instance.h
+++ b/Telegram/SourceFiles/mtproto/mtp_instance.h
@@ -142,6 +142,7 @@ class Instance : public QObject {
 
 	[[nodiscard]] auto nonPremiumDelayedRequests() const
 		-> rpl::producer<mtpRequestId>;
+	[[nodiscard]] rpl::producer<> frozenErrorReceived() const;
 
 	void syncHttpUnixtime();
 
diff --git a/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.cpp b/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.cpp
index 5bb4d5d2054908..89ad7d9625f085 100644
--- a/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.cpp
+++ b/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.cpp
@@ -76,7 +76,7 @@ auto ConcurrentSender::with_instance(Method &&method)
 		weak = _weak,
 		method = std::forward<Method>(method)
 	]() mutable {
-		if (const auto instance = weak.data()) {
+		if (const auto instance = weak.get()) {
 			std::move(method)(instance);
 		}
 	});
@@ -136,7 +136,7 @@ mtpRequestId ConcurrentSender::RequestBuilder::send() {
 }
 
 ConcurrentSender::ConcurrentSender(
-	QPointer<Instance> weak,
+	base::weak_qptr<Instance> weak,
 	Fn<void(FnMut<void()>)> runner)
 : _weak(weak)
 , _runner(runner) {
diff --git a/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.h b/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.h
index 47daaf7a6cd91f..f96d0fe3ac1f1c 100644
--- a/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.h
+++ b/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.h
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "base/bytes.h"
 #include "base/weak_ptr.h"
+#include "base/weak_qptr.h"
 #include "base/flat_map.h"
 #include "mtproto/core_types.h"
 #include "mtproto/details/mtproto_serialized_request.h"
@@ -83,7 +84,7 @@ class ConcurrentSender : public base::has_weak_ptr {
 
 public:
 	ConcurrentSender(
-		QPointer<Instance> weak,
+		base::weak_qptr<Instance> weak,
 		Fn<void(FnMut<void()>)> runner);
 
 	template <typename Request>
@@ -184,7 +185,7 @@ class ConcurrentSender : public base::has_weak_ptr {
 	void senderRequestCancelAll();
 	void senderRequestDetach(mtpRequestId requestId);
 
-	const QPointer<Instance> _weak;
+	const base::weak_qptr<Instance> _weak;
 	const Fn<void(FnMut<void()>)> _runner;
 	base::flat_map<mtpRequestId, Handlers> _requests;
 
diff --git a/Telegram/SourceFiles/mtproto/mtproto_proxy_data.cpp b/Telegram/SourceFiles/mtproto/mtproto_proxy_data.cpp
index 8ed267514cee13..f1f2c5402f87b2 100644
--- a/Telegram/SourceFiles/mtproto/mtproto_proxy_data.cpp
+++ b/Telegram/SourceFiles/mtproto/mtproto_proxy_data.cpp
@@ -110,6 +110,7 @@ namespace {
 
 [[nodiscard]] ProxyData::Status Base64UrlMtprotoPasswordStatus(
 		const QString &password) {
+	// IncorrectSecret
 	const auto inner = Base64UrlInner(password);
 	const auto size = (inner.size() * 3) / 4;
 	const auto valid = (size == 16)
@@ -121,10 +122,15 @@ namespace {
 			&& (password[0] == '7')
 			&& (password[1] >= 'g')
 			&& (password[1] <= 'v'));
+	const auto incorrect = (size >= 21
+		&& password[0].toLower() == 'e'
+		&& password[1].toLower() == 'e');
 	if (size < 16) {
 		return ProxyData::Status::Invalid;
 	} else if (valid) {
 		return ProxyData::Status::Valid;
+	} else if (incorrect) {
+		return ProxyData::Status::IncorrectSecret;
 	}
 	return ProxyData::Status::Unsupported;
 }
@@ -153,7 +159,7 @@ ProxyData::Status ProxyData::status() const {
 }
 
 bool ProxyData::supportsCalls() const {
-	return (type == Type::Socks5);
+	return false;// (type == Type::Socks5);
 }
 
 bool ProxyData::tryCustomResolve() const {
diff --git a/Telegram/SourceFiles/mtproto/mtproto_proxy_data.h b/Telegram/SourceFiles/mtproto/mtproto_proxy_data.h
index 52acf6661db357..367ee3f52385c2 100644
--- a/Telegram/SourceFiles/mtproto/mtproto_proxy_data.h
+++ b/Telegram/SourceFiles/mtproto/mtproto_proxy_data.h
@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include <QtNetwork/QNetworkProxy>
+
 namespace MTP {
 
 struct ProxyData {
@@ -24,6 +26,7 @@ struct ProxyData {
 	enum class Status {
 		Valid,
 		Unsupported,
+		IncorrectSecret,
 		Invalid,
 	};
 
diff --git a/Telegram/SourceFiles/mtproto/mtproto_response.cpp b/Telegram/SourceFiles/mtproto/mtproto_response.cpp
index 772904433454e5..a6456394834ed9 100644
--- a/Telegram/SourceFiles/mtproto/mtproto_response.cpp
+++ b/Telegram/SourceFiles/mtproto/mtproto_response.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "mtproto/mtproto_response.h"
 
 #include <QtCore/QRegularExpression>
+#include <QtCore/QDebug>
 
 namespace MTP {
 namespace {
@@ -76,4 +77,15 @@ Error Error::Local(
 	return Error(MTPLocal(type, description));
 }
 
+QDebug operator<<(QDebug debug, const Error &error) {
+	return debug.nospace()
+		<< "MTP::Error("
+		<< error.code()
+		<< ", "
+		<< error.type()
+		<< ", "
+		<< error.description()
+		<< ")";
+}
+
 } // namespace MTP
diff --git a/Telegram/SourceFiles/mtproto/mtproto_response.h b/Telegram/SourceFiles/mtproto/mtproto_response.h
index 3a810b200e15ab..4025f784561e8b 100644
--- a/Telegram/SourceFiles/mtproto/mtproto_response.h
+++ b/Telegram/SourceFiles/mtproto/mtproto_response.h
@@ -9,6 +9,8 @@ For license and copyright information please follow this link:
 
 #include "base/flat_set.h"
 
+class QDebug;
+
 namespace MTP {
 
 class Error {
@@ -55,6 +57,17 @@ inline bool IsDefaultHandledError(const Error &error) {
 	return IsTemporaryError(error);
 }
 
+inline bool IgnoreError(const Error &error) {
+	return error.code() == 406;
+}
+
+template <typename ShowPtr>
+void ShowErrorFallback(const ShowPtr &show, const Error &error) {
+	if (!IgnoreError(error)) {
+		show->showToast(error.type());
+	}
+}
+
 struct Response {
 	mtpBuffer reply;
 	mtpMsgId outerMsgId = 0;
@@ -69,4 +82,6 @@ struct ResponseHandler {
 	FailHandler fail;
 };
 
+[[nodiscard]] QDebug operator<<(QDebug debug, const Error &error);
+
 } // namespace MTP
diff --git a/Telegram/SourceFiles/mtproto/proxy_check.cpp b/Telegram/SourceFiles/mtproto/proxy_check.cpp
new file mode 100644
index 00000000000000..831c8453cf64ad
--- /dev/null
+++ b/Telegram/SourceFiles/mtproto/proxy_check.cpp
@@ -0,0 +1,111 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "mtproto/proxy_check.h"
+
+#include "mtproto/facade.h"
+#include "mtproto/mtproto_dc_options.h"
+
+namespace MTP {
+
+using Connection = details::AbstractConnection;
+
+void ResetProxyCheckers(
+		ProxyCheckConnection &v4,
+		ProxyCheckConnection &v6) {
+	v4 = nullptr;
+	v6 = nullptr;
+}
+
+void DropProxyChecker(
+		ProxyCheckConnection &v4,
+		ProxyCheckConnection &v6,
+		not_null<Connection*> raw) {
+	if (v4.get() == raw) {
+		v4 = nullptr;
+	} else if (v6.get() == raw) {
+		v6 = nullptr;
+	}
+}
+
+bool HasProxyCheckers(
+		const ProxyCheckConnection &v4,
+		const ProxyCheckConnection &v6) {
+	return v4 || v6;
+}
+
+void StartProxyCheck(
+		not_null<Instance*> mtproto,
+		const ProxyData &proxy,
+		bool tryIPv6,
+		ProxyCheckConnection &v4,
+		ProxyCheckConnection &v6,
+		Fn<void(Connection *raw, int ping)> done,
+		Fn<void(Connection *raw)> fail) {
+	using Variants = DcOptions::Variants;
+
+	ResetProxyCheckers(v4, v6);
+	const auto connType = (proxy.type == ProxyData::Type::Http)
+		? Variants::Http
+		: Variants::Tcp;
+	const auto dcId = mtproto->mainDcId();
+	const auto setup = [&](ProxyCheckConnection &checker, const bytes::vector &secret) {
+		checker = Connection::Create(
+			mtproto,
+			connType,
+			QThread::currentThread(),
+			secret,
+			proxy);
+		const auto raw = checker.get();
+		raw->connect(raw, &Connection::connected, [=] {
+			if (done) {
+				done(raw, raw->pingTime());
+			}
+		});
+		const auto failed = [=] {
+			if (fail) {
+				fail(raw);
+			}
+		};
+		raw->connect(raw, &Connection::disconnected, failed);
+		raw->connect(raw, &Connection::error, failed);
+	};
+	if (proxy.type == ProxyData::Type::Mtproto) {
+		const auto secret = proxy.secretFromMtprotoPassword();
+		setup(v4, secret);
+		v4->connectToServer(
+			proxy.host,
+			proxy.port,
+			secret,
+			dcId,
+			false);
+		return;
+	}
+	const auto options = mtproto->dcOptions().lookup(
+		dcId,
+		DcType::Regular,
+		true);
+	const auto tryConnect = [&](ProxyCheckConnection &checker, Variants::Address address) {
+		const auto &list = options.data[address][connType];
+		if (list.empty() || ((address == Variants::IPv6) && !tryIPv6)) {
+			checker = nullptr;
+			return;
+		}
+		const auto &endpoint = list.front();
+		setup(checker, endpoint.secret);
+		checker->connectToServer(
+			QString::fromStdString(endpoint.ip),
+			endpoint.port,
+			endpoint.secret,
+			dcId,
+			false);
+	};
+	tryConnect(v4, Variants::IPv4);
+	tryConnect(v6, Variants::IPv6);
+}
+
+} // namespace MTP
diff --git a/Telegram/SourceFiles/mtproto/proxy_check.h b/Telegram/SourceFiles/mtproto/proxy_check.h
new file mode 100644
index 00000000000000..1cbfb15fd2cae6
--- /dev/null
+++ b/Telegram/SourceFiles/mtproto/proxy_check.h
@@ -0,0 +1,35 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "mtproto/connection_abstract.h"
+
+namespace MTP {
+
+using ProxyCheckConnection = details::ConnectionPointer;
+
+void ResetProxyCheckers(
+	ProxyCheckConnection &v4,
+	ProxyCheckConnection &v6);
+void DropProxyChecker(
+	ProxyCheckConnection &v4,
+	ProxyCheckConnection &v6,
+	not_null<details::AbstractConnection*> raw);
+[[nodiscard]] bool HasProxyCheckers(
+	const ProxyCheckConnection &v4,
+	const ProxyCheckConnection &v6);
+void StartProxyCheck(
+	not_null<Instance*> mtproto,
+	const ProxyData &proxy,
+	bool tryIPv6,
+	ProxyCheckConnection &v4,
+	ProxyCheckConnection &v6,
+	Fn<void(details::AbstractConnection *raw, int ping)> done,
+	Fn<void(details::AbstractConnection *raw)> fail);
+
+} // namespace MTP
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 72acb3884e23f2..2784293c112f7e 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -22,30 +22,32 @@ inputUserSelf#f7c1b13f = InputUser;
 inputUser#f21158c6 user_id:long access_hash:long = InputUser;
 inputUserFromMessage#1da448e2 peer:InputPeer msg_id:int user_id:long = InputUser;
 
-inputPhoneContact#f392b7f4 client_id:long phone:string first_name:string last_name:string = InputContact;
+inputPhoneContact#6a1dc4be flags:# client_id:long phone:string first_name:string last_name:string note:flags.0?TextWithEntities = InputContact;
 
 inputFile#f52ff27f id:long parts:int name:string md5_checksum:string = InputFile;
 inputFileBig#fa4f0bb5 id:long parts:int name:string = InputFile;
 inputFileStoryDocument#62dc8b48 id:InputDocument = InputFile;
 
 inputMediaEmpty#9664f57f = InputMedia;
-inputMediaUploadedPhoto#1e287d04 flags:# spoiler:flags.2?true file:InputFile stickers:flags.0?Vector<InputDocument> ttl_seconds:flags.1?int = InputMedia;
-inputMediaPhoto#b3ba0635 flags:# spoiler:flags.1?true id:InputPhoto ttl_seconds:flags.0?int = InputMedia;
+inputMediaUploadedPhoto#7d8375da flags:# spoiler:flags.2?true live_photo:flags.3?true file:InputFile stickers:flags.0?Vector<InputDocument> ttl_seconds:flags.1?int video:flags.3?InputDocument = InputMedia;
+inputMediaPhoto#e3af4434 flags:# spoiler:flags.1?true live_photo:flags.2?true id:InputPhoto ttl_seconds:flags.0?int video:flags.2?InputDocument = InputMedia;
 inputMediaGeoPoint#f9c44144 geo_point:InputGeoPoint = InputMedia;
 inputMediaContact#f8ab7dfb phone_number:string first_name:string last_name:string vcard:string = InputMedia;
-inputMediaUploadedDocument#5b38c6c1 flags:# nosound_video:flags.3?true force_file:flags.4?true spoiler:flags.5?true file:InputFile thumb:flags.2?InputFile mime_type:string attributes:Vector<DocumentAttribute> stickers:flags.0?Vector<InputDocument> ttl_seconds:flags.1?int = InputMedia;
-inputMediaDocument#33473058 flags:# spoiler:flags.2?true id:InputDocument ttl_seconds:flags.0?int query:flags.1?string = InputMedia;
+inputMediaUploadedDocument#37c9330 flags:# nosound_video:flags.3?true force_file:flags.4?true spoiler:flags.5?true file:InputFile thumb:flags.2?InputFile mime_type:string attributes:Vector<DocumentAttribute> stickers:flags.0?Vector<InputDocument> video_cover:flags.6?InputPhoto video_timestamp:flags.7?int ttl_seconds:flags.1?int = InputMedia;
+inputMediaDocument#a8763ab5 flags:# spoiler:flags.2?true id:InputDocument video_cover:flags.3?InputPhoto video_timestamp:flags.4?int ttl_seconds:flags.0?int query:flags.1?string = InputMedia;
 inputMediaVenue#c13d1c11 geo_point:InputGeoPoint title:string address:string provider:string venue_id:string venue_type:string = InputMedia;
 inputMediaPhotoExternal#e5bbfe1a flags:# spoiler:flags.1?true url:string ttl_seconds:flags.0?int = InputMedia;
-inputMediaDocumentExternal#fb52dc99 flags:# spoiler:flags.1?true url:string ttl_seconds:flags.0?int = InputMedia;
+inputMediaDocumentExternal#779600f9 flags:# spoiler:flags.1?true url:string ttl_seconds:flags.0?int video_cover:flags.2?InputPhoto video_timestamp:flags.3?int = InputMedia;
 inputMediaGame#d33f43f3 id:InputGame = InputMedia;
 inputMediaInvoice#405fef0d flags:# title:string description:string photo:flags.0?InputWebDocument invoice:Invoice payload:bytes provider:flags.3?string provider_data:DataJSON start_param:flags.1?string extended_media:flags.2?InputMedia = InputMedia;
 inputMediaGeoLive#971fa843 flags:# stopped:flags.0?true geo_point:InputGeoPoint heading:flags.2?int period:flags.1?int proximity_notification_radius:flags.3?int = InputMedia;
-inputMediaPoll#f94e5f1 flags:# poll:Poll correct_answers:flags.0?Vector<bytes> solution:flags.1?string solution_entities:flags.1?Vector<MessageEntity> = InputMedia;
+inputMediaPoll#883a4108 flags:# poll:Poll correct_answers:flags.0?Vector<int> attached_media:flags.3?InputMedia solution:flags.1?string solution_entities:flags.1?Vector<MessageEntity> solution_media:flags.2?InputMedia = InputMedia;
 inputMediaDice#e66fbf7b emoticon:string = InputMedia;
 inputMediaStory#89fdd778 peer:InputPeer id:int = InputMedia;
 inputMediaWebPage#c21b8849 flags:# force_large_media:flags.0?true force_small_media:flags.1?true optional:flags.2?true url:string = InputMedia;
 inputMediaPaidMedia#c4103386 flags:# stars_amount:long extended_media:Vector<InputMedia> payload:flags.0?string = InputMedia;
+inputMediaTodo#9fc55fde todo:TodoList = InputMedia;
+inputMediaStakeDice#f3a9244a game_hash:string ton_amount:long client_seed:bytes = InputMedia;
 
 inputChatPhotoEmpty#1ca48f57 = InputChatPhoto;
 inputChatUploadedPhoto#bdcdaec0 flags:# file:flags.0?InputFile video:flags.1?InputFile video_start_ts:flags.2?double video_emoji_markup:flags.3?VideoSize = InputChatPhoto;
@@ -84,7 +86,7 @@ storage.fileMp4#b3cea0e4 = storage.FileType;
 storage.fileWebp#1081464c = storage.FileType;
 
 userEmpty#d3bc4b7a id:long = User;
-user#83314fca flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true min:flags.20?true bot_inline_geo:flags.21?true support:flags.23?true scam:flags.24?true apply_min_photo:flags.25?true fake:flags.26?true bot_attach_menu:flags.27?true premium:flags.28?true attach_menu_enabled:flags.29?true flags2:# bot_can_edit:flags2.1?true close_friend:flags2.2?true stories_hidden:flags2.3?true stories_unavailable:flags2.4?true contact_require_premium:flags2.10?true bot_business:flags2.11?true bot_has_main_app:flags2.13?true id:long access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?Vector<RestrictionReason> bot_inline_placeholder:flags.19?string lang_code:flags.22?string emoji_status:flags.30?EmojiStatus usernames:flags2.0?Vector<Username> stories_max_id:flags2.5?int color:flags2.8?PeerColor profile_color:flags2.9?PeerColor bot_active_users:flags2.12?int = User;
+user#31774388 flags:# self:flags.10?true contact:flags.11?true mutual_contact:flags.12?true deleted:flags.13?true bot:flags.14?true bot_chat_history:flags.15?true bot_nochats:flags.16?true verified:flags.17?true restricted:flags.18?true min:flags.20?true bot_inline_geo:flags.21?true support:flags.23?true scam:flags.24?true apply_min_photo:flags.25?true fake:flags.26?true bot_attach_menu:flags.27?true premium:flags.28?true attach_menu_enabled:flags.29?true flags2:# bot_can_edit:flags2.1?true close_friend:flags2.2?true stories_hidden:flags2.3?true stories_unavailable:flags2.4?true contact_require_premium:flags2.10?true bot_business:flags2.11?true bot_has_main_app:flags2.13?true bot_forum_view:flags2.16?true bot_forum_can_manage_topics:flags2.17?true bot_can_manage_bots:flags2.18?true bot_guestchat:flags2.19?true bot_guard:flags2.20?true id:long access_hash:flags.0?long first_name:flags.1?string last_name:flags.2?string username:flags.3?string phone:flags.4?string photo:flags.5?UserProfilePhoto status:flags.6?UserStatus bot_info_version:flags.14?int restriction_reason:flags.18?Vector<RestrictionReason> bot_inline_placeholder:flags.19?string lang_code:flags.22?string emoji_status:flags.30?EmojiStatus usernames:flags2.0?Vector<Username> stories_max_id:flags2.5?RecentStory color:flags2.8?PeerColor profile_color:flags2.9?PeerColor bot_active_users:flags2.12?int bot_verification_icon:flags2.14?long send_paid_messages_stars:flags2.15?long = User;
 
 userProfilePhotoEmpty#4f11bae1 = UserProfilePhoto;
 userProfilePhoto#82d1f706 flags:# has_video:flags.0?true personal:flags.2?true photo_id:long stripped_thumb:flags.1?bytes dc_id:int = UserProfilePhoto;
@@ -99,15 +101,15 @@ userStatusLastMonth#65899777 flags:# by_me:flags.0?true = UserStatus;
 chatEmpty#29562865 id:long = Chat;
 chat#41cbf256 flags:# creator:flags.0?true left:flags.2?true deactivated:flags.5?true call_active:flags.23?true call_not_empty:flags.24?true noforwards:flags.25?true id:long title:string photo:ChatPhoto participants_count:int date:int version:int migrated_to:flags.6?InputChannel admin_rights:flags.14?ChatAdminRights default_banned_rights:flags.18?ChatBannedRights = Chat;
 chatForbidden#6592a1a7 id:long title:string = Chat;
-channel#fe4478bd flags:# creator:flags.0?true left:flags.2?true broadcast:flags.5?true verified:flags.7?true megagroup:flags.8?true restricted:flags.9?true signatures:flags.11?true min:flags.12?true scam:flags.19?true has_link:flags.20?true has_geo:flags.21?true slowmode_enabled:flags.22?true call_active:flags.23?true call_not_empty:flags.24?true fake:flags.25?true gigagroup:flags.26?true noforwards:flags.27?true join_to_send:flags.28?true join_request:flags.29?true forum:flags.30?true flags2:# stories_hidden:flags2.1?true stories_hidden_min:flags2.2?true stories_unavailable:flags2.3?true signature_profiles:flags2.12?true id:long access_hash:flags.13?long title:string username:flags.6?string photo:ChatPhoto date:int restriction_reason:flags.9?Vector<RestrictionReason> admin_rights:flags.14?ChatAdminRights banned_rights:flags.15?ChatBannedRights default_banned_rights:flags.18?ChatBannedRights participants_count:flags.17?int usernames:flags2.0?Vector<Username> stories_max_id:flags2.4?int color:flags2.7?PeerColor profile_color:flags2.8?PeerColor emoji_status:flags2.9?EmojiStatus level:flags2.10?int subscription_until_date:flags2.11?int = Chat;
-channelForbidden#17d493d5 flags:# broadcast:flags.5?true megagroup:flags.8?true id:long access_hash:long title:string until_date:flags.16?int = Chat;
+channel#1c32b11c flags:# creator:flags.0?true left:flags.2?true broadcast:flags.5?true verified:flags.7?true megagroup:flags.8?true restricted:flags.9?true signatures:flags.11?true min:flags.12?true scam:flags.19?true has_link:flags.20?true has_geo:flags.21?true slowmode_enabled:flags.22?true call_active:flags.23?true call_not_empty:flags.24?true fake:flags.25?true gigagroup:flags.26?true noforwards:flags.27?true join_to_send:flags.28?true join_request:flags.29?true forum:flags.30?true flags2:# stories_hidden:flags2.1?true stories_hidden_min:flags2.2?true stories_unavailable:flags2.3?true signature_profiles:flags2.12?true autotranslation:flags2.15?true broadcast_messages_allowed:flags2.16?true monoforum:flags2.17?true forum_tabs:flags2.19?true id:long access_hash:flags.13?long title:string username:flags.6?string photo:ChatPhoto date:int restriction_reason:flags.9?Vector<RestrictionReason> admin_rights:flags.14?ChatAdminRights banned_rights:flags.15?ChatBannedRights default_banned_rights:flags.18?ChatBannedRights participants_count:flags.17?int usernames:flags2.0?Vector<Username> stories_max_id:flags2.4?RecentStory color:flags2.7?PeerColor profile_color:flags2.8?PeerColor emoji_status:flags2.9?EmojiStatus level:flags2.10?int subscription_until_date:flags2.11?int bot_verification_icon:flags2.13?long send_paid_messages_stars:flags2.14?long linked_monoforum_id:flags2.18?long = Chat;
+channelForbidden#17d493d5 flags:# broadcast:flags.5?true megagroup:flags.8?true monoforum:flags.10?true id:long access_hash:long title:string until_date:flags.16?int = Chat;
 
 chatFull#2633421b flags:# can_set_username:flags.7?true has_scheduled:flags.8?true translations_disabled:flags.19?true id:long about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:flags.13?ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int call:flags.12?InputGroupCall ttl_period:flags.14?int groupcall_default_join_as:flags.15?Peer theme_emoticon:flags.16?string requests_pending:flags.17?int recent_requesters:flags.17?Vector<long> available_reactions:flags.18?ChatReactions reactions_limit:flags.20?int = ChatFull;
-channelFull#bbab348d flags:# can_view_participants:flags.3?true can_set_username:flags.6?true can_set_stickers:flags.7?true hidden_prehistory:flags.10?true can_set_location:flags.16?true has_scheduled:flags.19?true can_view_stats:flags.20?true blocked:flags.22?true flags2:# can_delete_channel:flags2.0?true antispam:flags2.1?true participants_hidden:flags2.2?true translations_disabled:flags2.3?true stories_pinned_available:flags2.5?true view_forum_as_messages:flags2.6?true restricted_sponsored:flags2.11?true can_view_revenue:flags2.12?true paid_media_allowed:flags2.14?true can_view_stars_revenue:flags2.15?true paid_reactions_available:flags2.16?true id:long about:string participants_count:flags.0?int admins_count:flags.1?int kicked_count:flags.2?int banned_count:flags.2?int online_count:flags.13?int read_inbox_max_id:int read_outbox_max_id:int unread_count:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:flags.23?ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?long migrated_from_max_id:flags.4?int pinned_msg_id:flags.5?int stickerset:flags.8?StickerSet available_min_id:flags.9?int folder_id:flags.11?int linked_chat_id:flags.14?long location:flags.15?ChannelLocation slowmode_seconds:flags.17?int slowmode_next_send_date:flags.18?int stats_dc:flags.12?int pts:int call:flags.21?InputGroupCall ttl_period:flags.24?int pending_suggestions:flags.25?Vector<string> groupcall_default_join_as:flags.26?Peer theme_emoticon:flags.27?string requests_pending:flags.28?int recent_requesters:flags.28?Vector<long> default_send_as:flags.29?Peer available_reactions:flags.30?ChatReactions reactions_limit:flags2.13?int stories:flags2.4?PeerStories wallpaper:flags2.7?WallPaper boosts_applied:flags2.8?int boosts_unrestrict:flags2.9?int emojiset:flags2.10?StickerSet = ChatFull;
+channelFull#a04e8d3a flags:# can_view_participants:flags.3?true can_set_username:flags.6?true can_set_stickers:flags.7?true hidden_prehistory:flags.10?true can_set_location:flags.16?true has_scheduled:flags.19?true can_view_stats:flags.20?true blocked:flags.22?true flags2:# can_delete_channel:flags2.0?true antispam:flags2.1?true participants_hidden:flags2.2?true translations_disabled:flags2.3?true stories_pinned_available:flags2.5?true view_forum_as_messages:flags2.6?true restricted_sponsored:flags2.11?true can_view_revenue:flags2.12?true paid_media_allowed:flags2.14?true can_view_stars_revenue:flags2.15?true paid_reactions_available:flags2.16?true stargifts_available:flags2.19?true paid_messages_available:flags2.20?true id:long about:string participants_count:flags.0?int admins_count:flags.1?int kicked_count:flags.2?int banned_count:flags.2?int online_count:flags.13?int read_inbox_max_id:int read_outbox_max_id:int unread_count:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:flags.23?ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?long migrated_from_max_id:flags.4?int pinned_msg_id:flags.5?int stickerset:flags.8?StickerSet available_min_id:flags.9?int folder_id:flags.11?int linked_chat_id:flags.14?long location:flags.15?ChannelLocation slowmode_seconds:flags.17?int slowmode_next_send_date:flags.18?int stats_dc:flags.12?int pts:int call:flags.21?InputGroupCall ttl_period:flags.24?int pending_suggestions:flags.25?Vector<string> groupcall_default_join_as:flags.26?Peer theme_emoticon:flags.27?string requests_pending:flags.28?int recent_requesters:flags.28?Vector<long> default_send_as:flags.29?Peer available_reactions:flags.30?ChatReactions reactions_limit:flags2.13?int stories:flags2.4?PeerStories wallpaper:flags2.7?WallPaper boosts_applied:flags2.8?int boosts_unrestrict:flags2.9?int emojiset:flags2.10?StickerSet bot_verification:flags2.17?BotVerification stargifts_count:flags2.18?int send_paid_messages_stars:flags2.21?long main_tab:flags2.22?ProfileTab guard_bot_id:flags2.23?long = ChatFull;
 
-chatParticipant#c02d4007 user_id:long inviter_id:long date:int = ChatParticipant;
-chatParticipantCreator#e46bcee4 user_id:long = ChatParticipant;
-chatParticipantAdmin#a0933f5b user_id:long inviter_id:long date:int = ChatParticipant;
+chatParticipant#38e79fde flags:# user_id:long inviter_id:long date:int rank:flags.0?string = ChatParticipant;
+chatParticipantCreator#e1f867b8 flags:# user_id:long rank:flags.0?string = ChatParticipant;
+chatParticipantAdmin#360d5d2 flags:# user_id:long inviter_id:long date:int rank:flags.0?string = ChatParticipant;
 
 chatParticipantsForbidden#8763d3e1 flags:# chat_id:long self_participant:flags.0?ChatParticipant = ChatParticipants;
 chatParticipants#3cbc93f8 chat_id:long participants:Vector<ChatParticipant> version:int = ChatParticipants;
@@ -116,26 +118,28 @@ chatPhotoEmpty#37c1011c = ChatPhoto;
 chatPhoto#1c6e1c11 flags:# has_video:flags.0?true photo_id:long stripped_thumb:flags.1?bytes dc_id:int = ChatPhoto;
 
 messageEmpty#90a6ca84 flags:# id:int peer_id:flags.0?Peer = Message;
-message#94345242 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true from_scheduled:flags.18?true legacy:flags.19?true edit_hide:flags.21?true pinned:flags.24?true noforwards:flags.26?true invert_media:flags.27?true flags2:# offline:flags2.1?true id:int from_id:flags.8?Peer from_boosts_applied:flags.29?int peer_id:Peer saved_peer_id:flags.28?Peer fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?long via_business_bot_id:flags2.0?long reply_to:flags.3?MessageReplyHeader date:int message:string media:flags.9?MessageMedia reply_markup:flags.6?ReplyMarkup entities:flags.7?Vector<MessageEntity> views:flags.10?int forwards:flags.10?int replies:flags.23?MessageReplies edit_date:flags.15?int post_author:flags.16?string grouped_id:flags.17?long reactions:flags.20?MessageReactions restriction_reason:flags.22?Vector<RestrictionReason> ttl_period:flags.25?int quick_reply_shortcut_id:flags.30?int effect:flags2.2?long factcheck:flags2.3?FactCheck = Message;
-messageService#2b085862 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true legacy:flags.19?true id:int from_id:flags.8?Peer peer_id:Peer reply_to:flags.3?MessageReplyHeader date:int action:MessageAction ttl_period:flags.25?int = Message;
+message#7600b9d3 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true from_scheduled:flags.18?true legacy:flags.19?true edit_hide:flags.21?true pinned:flags.24?true noforwards:flags.26?true invert_media:flags.27?true flags2:# offline:flags2.1?true video_processing_pending:flags2.4?true paid_suggested_post_stars:flags2.8?true paid_suggested_post_ton:flags2.9?true id:int from_id:flags.8?Peer from_boosts_applied:flags.29?int from_rank:flags2.12?string peer_id:Peer saved_peer_id:flags.28?Peer fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?long via_business_bot_id:flags2.0?long guestchat_via_from:flags2.19?Peer reply_to:flags.3?MessageReplyHeader date:int message:string media:flags.9?MessageMedia reply_markup:flags.6?ReplyMarkup entities:flags.7?Vector<MessageEntity> views:flags.10?int forwards:flags.10?int replies:flags.23?MessageReplies edit_date:flags.15?int post_author:flags.16?string grouped_id:flags.17?long reactions:flags.20?MessageReactions restriction_reason:flags.22?Vector<RestrictionReason> ttl_period:flags.25?int quick_reply_shortcut_id:flags.30?int effect:flags2.2?long factcheck:flags2.3?FactCheck report_delivery_until_date:flags2.5?int paid_message_stars:flags2.6?long suggested_post:flags2.7?SuggestedPost schedule_repeat_period:flags2.10?int summary_from_language:flags2.11?string rich_message:flags2.13?RichMessage = Message;
+messageService#7a800e0a flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true reactions_are_possible:flags.9?true silent:flags.13?true post:flags.14?true legacy:flags.19?true id:int from_id:flags.8?Peer peer_id:Peer saved_peer_id:flags.28?Peer reply_to:flags.3?MessageReplyHeader date:int action:MessageAction reactions:flags.20?MessageReactions ttl_period:flags.25?int = Message;
 
 messageMediaEmpty#3ded6320 = MessageMedia;
-messageMediaPhoto#695150d7 flags:# spoiler:flags.3?true photo:flags.0?Photo ttl_seconds:flags.2?int = MessageMedia;
+messageMediaPhoto#e216eb63 flags:# spoiler:flags.3?true live_photo:flags.4?true photo:flags.0?Photo ttl_seconds:flags.2?int video:flags.4?Document = MessageMedia;
 messageMediaGeo#56e0d474 geo:GeoPoint = MessageMedia;
 messageMediaContact#70322949 phone_number:string first_name:string last_name:string vcard:string user_id:long = MessageMedia;
 messageMediaUnsupported#9f84f49e = MessageMedia;
-messageMediaDocument#dd570bd5 flags:# nopremium:flags.3?true spoiler:flags.4?true video:flags.6?true round:flags.7?true voice:flags.8?true document:flags.0?Document alt_documents:flags.5?Vector<Document> ttl_seconds:flags.2?int = MessageMedia;
+messageMediaDocument#52d8ccd9 flags:# nopremium:flags.3?true spoiler:flags.4?true video:flags.6?true round:flags.7?true voice:flags.8?true document:flags.0?Document alt_documents:flags.5?Vector<Document> video_cover:flags.9?Photo video_timestamp:flags.10?int ttl_seconds:flags.2?int = MessageMedia;
 messageMediaWebPage#ddf10c3b flags:# force_large_media:flags.0?true force_small_media:flags.1?true manual:flags.3?true safe:flags.4?true webpage:WebPage = MessageMedia;
 messageMediaVenue#2ec0533f geo:GeoPoint title:string address:string provider:string venue_id:string venue_type:string = MessageMedia;
 messageMediaGame#fdb19008 game:Game = MessageMedia;
 messageMediaInvoice#f6a548d3 flags:# shipping_address_requested:flags.1?true test:flags.3?true title:string description:string photo:flags.0?WebDocument receipt_msg_id:flags.2?int currency:string total_amount:long start_param:string extended_media:flags.4?MessageExtendedMedia = MessageMedia;
 messageMediaGeoLive#b940c666 flags:# geo:GeoPoint heading:flags.0?int period:int proximity_notification_radius:flags.1?int = MessageMedia;
-messageMediaPoll#4bd6e798 poll:Poll results:PollResults = MessageMedia;
-messageMediaDice#3f7ee58b value:int emoticon:string = MessageMedia;
+messageMediaPoll#773f4e66 flags:# poll:Poll results:PollResults attached_media:flags.0?MessageMedia = MessageMedia;
+messageMediaDice#8cbec07 flags:# value:int emoticon:string game_outcome:flags.0?messages.EmojiGameOutcome = MessageMedia;
 messageMediaStory#68cb6283 flags:# via_mention:flags.1?true peer:Peer id:int story:flags.0?StoryItem = MessageMedia;
 messageMediaGiveaway#aa073beb flags:# only_new_subscribers:flags.0?true winners_are_visible:flags.2?true channels:Vector<long> countries_iso2:flags.1?Vector<string> prize_description:flags.3?string quantity:int months:flags.4?int stars:flags.5?long until_date:int = MessageMedia;
 messageMediaGiveawayResults#ceaa3ea1 flags:# only_new_subscribers:flags.0?true refunded:flags.2?true channel_id:long additional_peers_count:flags.3?int launch_msg_id:int winners_count:int unclaimed_count:int winners:Vector<long> months:flags.4?int stars:flags.5?long prize_description:flags.1?string until_date:int = MessageMedia;
 messageMediaPaidMedia#a8852491 stars_amount:long extended_media:Vector<MessageExtendedMedia> = MessageMedia;
+messageMediaToDo#8a53b014 flags:# todo:TodoList completions:flags.0?Vector<TodoCompletion> = MessageMedia;
+messageMediaVideoStream#ca5cab89 flags:# rtmp_stream:flags.0?true call:InputGroupCall = MessageMedia;
 
 messageActionEmpty#b6aef7b0 = MessageAction;
 messageActionChatCreate#bd47cbad title:string users:Vector<long> = MessageAction;
@@ -151,8 +155,8 @@ messageActionChannelMigrateFrom#ea3948e9 title:string chat_id:long = MessageActi
 messageActionPinMessage#94bd38ed = MessageAction;
 messageActionHistoryClear#9fbab604 = MessageAction;
 messageActionGameScore#92a72876 game_id:long score:int = MessageAction;
-messageActionPaymentSentMe#8f31b327 flags:# recurring_init:flags.2?true recurring_used:flags.3?true currency:string total_amount:long payload:bytes info:flags.0?PaymentRequestedInfo shipping_option_id:flags.1?string charge:PaymentCharge = MessageAction;
-messageActionPaymentSent#96163f56 flags:# recurring_init:flags.2?true recurring_used:flags.3?true currency:string total_amount:long invoice_slug:flags.0?string = MessageAction;
+messageActionPaymentSentMe#ffa00ccc flags:# recurring_init:flags.2?true recurring_used:flags.3?true currency:string total_amount:long payload:bytes info:flags.0?PaymentRequestedInfo shipping_option_id:flags.1?string charge:PaymentCharge subscription_until_date:flags.4?int = MessageAction;
+messageActionPaymentSent#c624b16e flags:# recurring_init:flags.2?true recurring_used:flags.3?true currency:string total_amount:long invoice_slug:flags.0?string subscription_until_date:flags.4?int = MessageAction;
 messageActionPhoneCall#80e11a7f flags:# video:flags.2?true call_id:long reason:flags.0?PhoneCallDiscardReason duration:flags.1?int = MessageAction;
 messageActionScreenshotTaken#4792929b = MessageAction;
 messageActionCustomAction#fae69f56 message:string = MessageAction;
@@ -165,17 +169,17 @@ messageActionGroupCall#7a0d7f42 flags:# call:InputGroupCall duration:flags.0?int
 messageActionInviteToGroupCall#502f92f7 call:InputGroupCall users:Vector<long> = MessageAction;
 messageActionSetMessagesTTL#3c134d7b flags:# period:int auto_setting_from:flags.0?long = MessageAction;
 messageActionGroupCallScheduled#b3a07661 call:InputGroupCall schedule_date:int = MessageAction;
-messageActionSetChatTheme#aa786345 emoticon:string = MessageAction;
+messageActionSetChatTheme#b91bbd3a theme:ChatTheme = MessageAction;
 messageActionChatJoinedByRequest#ebbca3cb = MessageAction;
 messageActionWebViewDataSentMe#47dd8079 text:string data:string = MessageAction;
 messageActionWebViewDataSent#b4c38cb5 text:string = MessageAction;
-messageActionGiftPremium#6c6274fa flags:# currency:string amount:long months:int crypto_currency:flags.0?string crypto_amount:flags.0?long message:flags.1?TextWithEntities = MessageAction;
-messageActionTopicCreate#d999256 flags:# title:string icon_color:int icon_emoji_id:flags.0?long = MessageAction;
+messageActionGiftPremium#48e91302 flags:# currency:string amount:long days:int crypto_currency:flags.0?string crypto_amount:flags.0?long message:flags.1?TextWithEntities = MessageAction;
+messageActionTopicCreate#d999256 flags:# title_missing:flags.1?true title:string icon_color:int icon_emoji_id:flags.0?long = MessageAction;
 messageActionTopicEdit#c0944820 flags:# title:flags.0?string icon_emoji_id:flags.1?long closed:flags.2?Bool hidden:flags.3?Bool = MessageAction;
 messageActionSuggestProfilePhoto#57de635e photo:Photo = MessageAction;
 messageActionRequestedPeer#31518e9b button_id:int peers:Vector<Peer> = MessageAction;
 messageActionSetChatWallPaper#5060a3f4 flags:# same:flags.0?true for_both:flags.1?true wallpaper:WallPaper = MessageAction;
-messageActionGiftCode#56d03994 flags:# via_giveaway:flags.0?true unclaimed:flags.2?true boost_peer:flags.1?Peer months:int slug:string currency:flags.2?string amount:flags.2?long crypto_currency:flags.3?string crypto_amount:flags.3?long message:flags.4?TextWithEntities = MessageAction;
+messageActionGiftCode#31c48347 flags:# via_giveaway:flags.0?true unclaimed:flags.5?true boost_peer:flags.1?Peer days:int slug:string currency:flags.2?string amount:flags.2?long crypto_currency:flags.3?string crypto_amount:flags.3?long message:flags.4?TextWithEntities = MessageAction;
 messageActionGiveawayLaunch#a80f51e4 flags:# stars:flags.0?long = MessageAction;
 messageActionGiveawayResults#87e2f155 flags:# stars:flags.0?true winners_count:int unclaimed_count:int = MessageAction;
 messageActionBoostApply#cc02aa6d boosts:int = MessageAction;
@@ -183,9 +187,29 @@ messageActionRequestedPeerSentMe#93b31848 button_id:int peers:Vector<RequestedPe
 messageActionPaymentRefunded#41b3e202 flags:# peer:Peer currency:string total_amount:long payload:flags.0?bytes charge:PaymentCharge = MessageAction;
 messageActionGiftStars#45d5b021 flags:# currency:string amount:long stars:long crypto_currency:flags.0?string crypto_amount:flags.0?long transaction_id:flags.1?string = MessageAction;
 messageActionPrizeStars#b00c47a2 flags:# unclaimed:flags.0?true stars:long transaction_id:string boost_peer:Peer giveaway_msg_id:int = MessageAction;
-messageActionStarGift#9bb3ef44 flags:# name_hidden:flags.0?true saved:flags.2?true converted:flags.3?true gift:StarGift message:flags.1?TextWithEntities convert_stars:long = MessageAction;
-
-dialog#d58a08c6 flags:# pinned:flags.2?true unread_mark:flags.3?true view_forum_as_messages:flags.6?true peer:Peer top_message:int read_inbox_max_id:int read_outbox_max_id:int unread_count:int unread_mentions_count:int unread_reactions_count:int notify_settings:PeerNotifySettings pts:flags.0?int draft:flags.1?DraftMessage folder_id:flags.4?int ttl_period:flags.5?int = Dialog;
+messageActionStarGift#ea2c31d3 flags:# name_hidden:flags.0?true saved:flags.2?true converted:flags.3?true upgraded:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true prepaid_upgrade:flags.13?true upgrade_separate:flags.16?true auction_acquired:flags.17?true gift:StarGift message:flags.1?TextWithEntities convert_stars:flags.4?long upgrade_msg_id:flags.5?int upgrade_stars:flags.8?long from_id:flags.11?Peer peer:flags.12?Peer saved_id:flags.12?long prepaid_upgrade_hash:flags.14?string gift_msg_id:flags.15?int to_id:flags.18?Peer gift_num:flags.19?int = MessageAction;
+messageActionStarGiftUnique#e6c31522 flags:# upgrade:flags.0?true transferred:flags.1?true saved:flags.2?true refunded:flags.5?true prepaid_upgrade:flags.11?true assigned:flags.13?true from_offer:flags.14?true craft:flags.16?true gift:StarGift can_export_at:flags.3?int transfer_stars:flags.4?long from_id:flags.6?Peer peer:flags.7?Peer saved_id:flags.7?long resale_amount:flags.8?StarsAmount can_transfer_at:flags.9?int can_resell_at:flags.10?int drop_original_details_stars:flags.12?long can_craft_at:flags.15?int = MessageAction;
+messageActionPaidMessagesRefunded#ac1f1fcd count:int stars:long = MessageAction;
+messageActionPaidMessagesPrice#84b88578 flags:# broadcast_messages_allowed:flags.0?true stars:long = MessageAction;
+messageActionConferenceCall#2ffe2f7a flags:# missed:flags.0?true active:flags.1?true video:flags.4?true call_id:long duration:flags.2?int other_participants:flags.3?Vector<Peer> = MessageAction;
+messageActionTodoCompletions#cc7c5c89 completed:Vector<int> incompleted:Vector<int> = MessageAction;
+messageActionTodoAppendTasks#c7edbc83 list:Vector<TodoItem> = MessageAction;
+messageActionSuggestedPostApproval#ee7a1596 flags:# rejected:flags.0?true balance_too_low:flags.1?true reject_comment:flags.2?string schedule_date:flags.3?int price:flags.4?StarsAmount = MessageAction;
+messageActionSuggestedPostSuccess#95ddcf69 price:StarsAmount = MessageAction;
+messageActionSuggestedPostRefund#69f916f8 flags:# payer_initiated:flags.0?true = MessageAction;
+messageActionGiftTon#a8a3c699 flags:# currency:string amount:long crypto_currency:string crypto_amount:long transaction_id:flags.0?string = MessageAction;
+messageActionSuggestBirthday#2c8f2a25 birthday:Birthday = MessageAction;
+messageActionStarGiftPurchaseOffer#774278d4 flags:# accepted:flags.0?true declined:flags.1?true gift:StarGift price:StarsAmount expires_at:int = MessageAction;
+messageActionStarGiftPurchaseOfferDeclined#73ada76b flags:# expired:flags.0?true gift:StarGift price:StarsAmount = MessageAction;
+messageActionNewCreatorPending#b07ed085 new_creator_id:long = MessageAction;
+messageActionChangeCreator#e188503b new_creator_id:long = MessageAction;
+messageActionNoForwardsToggle#bf7d6572 prev_value:Bool new_value:Bool = MessageAction;
+messageActionNoForwardsRequest#3e2793ba flags:# expired:flags.0?true prev_value:Bool new_value:Bool = MessageAction;
+messageActionPollAppendAnswer#9da1cd6c answer:PollAnswer = MessageAction;
+messageActionPollDeleteAnswer#399674dc answer:PollAnswer = MessageAction;
+messageActionManagedBotCreated#16605e3e bot_id:long = MessageAction;
+
+dialog#fc89f7f3 flags:# pinned:flags.2?true unread_mark:flags.3?true view_forum_as_messages:flags.6?true peer:Peer top_message:int read_inbox_max_id:int read_outbox_max_id:int unread_count:int unread_mentions_count:int unread_reactions_count:int unread_poll_votes_count:int notify_settings:PeerNotifySettings pts:flags.0?int draft:flags.1?DraftMessage folder_id:flags.4?int ttl_period:flags.5?int = Dialog;
 dialogFolder#71bd134c flags:# pinned:flags.2?true folder:Folder peer:Peer top_message:int unread_muted_peers_count:int unread_unmuted_peers_count:int unread_muted_messages_count:int unread_unmuted_messages_count:int = Dialog;
 
 photoEmpty#2331b22d id:long = Photo;
@@ -203,6 +227,7 @@ geoPoint#b2a2f663 flags:# long:double lat:double access_hash:long accuracy_radiu
 
 auth.sentCode#5e002502 flags:# type:auth.SentCodeType phone_code_hash:string next_type:flags.1?auth.CodeType timeout:flags.2?int = auth.SentCode;
 auth.sentCodeSuccess#2390fe44 authorization:auth.Authorization = auth.SentCode;
+auth.sentCodePaymentRequired#f8827ebf store_product:string phone_code_hash:string support_email_address:string support_email_subject:string premium_days:int currency:string amount:long = auth.SentCode;
 
 auth.authorization#2ea2c0d4 flags:# setup_password_required:flags.1?true otherwise_relogin_days:flags.1?int tmp_sessions:flags.0?int future_auth_token:flags.2?bytes user:User = auth.Authorization;
 auth.authorizationSignUpRequired#44747e9a flags:# terms_of_service:flags.0?help.TermsOfService = auth.Authorization;
@@ -219,7 +244,7 @@ inputPeerNotifySettings#cacb6ae2 flags:# show_previews:flags.0?Bool silent:flags
 
 peerNotifySettings#99622c0c flags:# show_previews:flags.0?Bool silent:flags.1?Bool mute_until:flags.2?int ios_sound:flags.3?NotificationSound android_sound:flags.4?NotificationSound other_sound:flags.5?NotificationSound stories_muted:flags.6?Bool stories_hide_sender:flags.7?Bool stories_ios_sound:flags.8?NotificationSound stories_android_sound:flags.9?NotificationSound stories_other_sound:flags.10?NotificationSound = PeerNotifySettings;
 
-peerSettings#acd66c5e flags:# report_spam:flags.0?true add_contact:flags.1?true block_contact:flags.2?true share_contact:flags.3?true need_contacts_exception:flags.4?true report_geo:flags.5?true autoarchived:flags.7?true invite_members:flags.8?true request_chat_broadcast:flags.10?true business_bot_paused:flags.11?true business_bot_can_reply:flags.12?true geo_distance:flags.6?int request_chat_title:flags.9?string request_chat_date:flags.9?int business_bot_id:flags.13?long business_bot_manage_url:flags.13?string = PeerSettings;
+peerSettings#f47741f7 flags:# report_spam:flags.0?true add_contact:flags.1?true block_contact:flags.2?true share_contact:flags.3?true need_contacts_exception:flags.4?true report_geo:flags.5?true autoarchived:flags.7?true invite_members:flags.8?true request_chat_broadcast:flags.10?true business_bot_paused:flags.11?true business_bot_can_reply:flags.12?true geo_distance:flags.6?int request_chat_title:flags.9?string request_chat_date:flags.9?int business_bot_id:flags.13?long business_bot_manage_url:flags.13?string charge_paid_message_stars:flags.14?long registration_month:flags.15?string phone_country:flags.16?string name_change_date:flags.17?int photo_change_date:flags.18?int = PeerSettings;
 
 wallPaper#a437c3ed id:long flags:# creator:flags.0?true default:flags.1?true pattern:flags.3?true dark:flags.4?true access_hash:long slug:string document:Document settings:flags.2?WallPaperSettings = WallPaper;
 wallPaperNoFile#e0804116 id:long flags:# default:flags.1?true dark:flags.4?true settings:flags.2?WallPaperSettings = WallPaper;
@@ -235,7 +260,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#1f58e369 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# sponsored_enabled:flags2.7?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights premium_gifts:flags.19?Vector<PremiumGiftOption> wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday personal_channel_id:flags2.6?long personal_channel_message:flags2.6?int stargifts_count:flags2.8?int = UserFull;
+userFull#6cbe645 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# sponsored_enabled:flags2.7?true can_view_revenue:flags2.9?true bot_can_manage_emoji_status:flags2.10?true display_gifts_button:flags2.16?true noforwards_my_enabled:flags2.23?true noforwards_peer_enabled:flags2.24?true unofficial_security_risk:flags2.26?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme:flags.15?ChatTheme private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday personal_channel_id:flags2.6?long personal_channel_message:flags2.6?int stargifts_count:flags2.8?int starref_program:flags2.11?StarRefProgram bot_verification:flags2.12?BotVerification send_paid_messages_stars:flags2.14?long disallowed_gifts:flags2.15?DisallowedGiftsSettings stars_rating:flags2.17?StarsRating stars_my_pending_rating:flags2.18?StarsRating stars_my_pending_rating_date:flags2.18?int main_tab:flags2.20?ProfileTab saved_music:flags2.21?Document note:flags2.22?TextWithEntities bot_manager_id:flags2.25?long = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -255,8 +280,8 @@ messages.dialogs#15ba6c40 dialogs:Vector<Dialog> messages:Vector<Message> chats:
 messages.dialogsSlice#71e094f3 count:int dialogs:Vector<Dialog> messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Dialogs;
 messages.dialogsNotModified#f0e3e596 count:int = messages.Dialogs;
 
-messages.messages#8c718e87 messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
-messages.messagesSlice#3a54685e flags:# inexact:flags.1?true count:int next_rate:flags.0?int offset_id_offset:flags.2?int messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
+messages.messages#1d73e7ea messages:Vector<Message> topics:Vector<ForumTopic> chats:Vector<Chat> users:Vector<User> = messages.Messages;
+messages.messagesSlice#5f206716 flags:# inexact:flags.1?true count:int next_rate:flags.0?int offset_id_offset:flags.2?int search_flood:flags.3?SearchPostsFlood messages:Vector<Message> topics:Vector<ForumTopic> chats:Vector<Chat> users:Vector<User> = messages.Messages;
 messages.channelMessages#c776ba4e flags:# inexact:flags.1?true pts:int count:int offset_id_offset:flags.2?int messages:Vector<Message> topics:Vector<ForumTopic> chats:Vector<Chat> users:Vector<User> = messages.Messages;
 messages.messagesNotModified#74535f21 count:int = messages.Messages;
 
@@ -284,11 +309,12 @@ inputMessagesFilterMyMentions#c1f8e69a = MessagesFilter;
 inputMessagesFilterGeo#e7026d0d = MessagesFilter;
 inputMessagesFilterContacts#e062db83 = MessagesFilter;
 inputMessagesFilterPinned#1bb00451 = MessagesFilter;
+inputMessagesFilterPoll#fa2bc90a = MessagesFilter;
 
 updateNewMessage#1f2b0afd message:Message pts:int pts_count:int = Update;
 updateMessageID#4e90bfd6 id:int random_id:long = Update;
 updateDeleteMessages#a20db0e5 messages:Vector<int> pts:int pts_count:int = Update;
-updateUserTyping#c01e857f user_id:long action:SendMessageAction = Update;
+updateUserTyping#2a17bf5c flags:# user_id:long top_msg_id:flags.0?int action:SendMessageAction = Update;
 updateChatUserTyping#83487af0 chat_id:long from_id:Peer action:SendMessageAction = Update;
 updateChatParticipants#7761198 participants:ChatParticipants = Update;
 updateUserStatus#e5bdf8de user_id:long status:UserStatus = Update;
@@ -305,7 +331,7 @@ updateNotifySettings#bec268ef peer:NotifyPeer notify_settings:PeerNotifySettings
 updateServiceNotification#ebe46819 flags:# popup:flags.0?true invert_media:flags.2?true inbox_date:flags.1?int type:string message:string media:MessageMedia entities:Vector<MessageEntity> = Update;
 updatePrivacy#ee3b272a key:PrivacyKey rules:Vector<PrivacyRule> = Update;
 updateUserPhone#5492a13 user_id:long phone:string = Update;
-updateReadHistoryInbox#9c974fdf flags:# folder_id:flags.0?int peer:Peer max_id:int still_unread_count:int pts:int pts_count:int = Update;
+updateReadHistoryInbox#9e84bc99 flags:# folder_id:flags.0?int peer:Peer top_msg_id:flags.1?int max_id:int still_unread_count:int pts:int pts_count:int = Update;
 updateReadHistoryOutbox#2f2f21bf peer:Peer max_id:int pts:int pts_count:int = Update;
 updateWebPage#7f891213 webpage:WebPage pts:int pts_count:int = Update;
 updateReadMessagesContents#f8227181 flags:# messages:Vector<int> pts:int pts_count:int date:flags.0?int = Update;
@@ -327,7 +353,7 @@ updateBotCallbackQuery#b9cfc48d flags:# query_id:long user_id:long peer:Peer msg
 updateEditMessage#e40370a3 message:Message pts:int pts_count:int = Update;
 updateInlineBotCallbackQuery#691e9052 flags:# query_id:long user_id:long msg_id:InputBotInlineMessageID chat_instance:long data:flags.0?bytes game_short_name:flags.1?string = Update;
 updateReadChannelOutbox#b75f99a9 channel_id:long max_id:int = Update;
-updateDraftMessage#1b49ec6d flags:# peer:Peer top_msg_id:flags.0?int draft:DraftMessage = Update;
+updateDraftMessage#edfc111e flags:# peer:Peer top_msg_id:flags.0?int saved_peer_id:flags.1?Peer draft:DraftMessage = Update;
 updateReadFeaturedStickers#571d2742 = Update;
 updateRecentStickers#9a422c20 = Update;
 updateConfig#a229dd06 = Update;
@@ -343,21 +369,21 @@ updatePhoneCall#ab0f6b1e phone_call:PhoneCall = Update;
 updateLangPackTooLong#46560264 lang_code:string = Update;
 updateLangPack#56022f4d difference:LangPackDifference = Update;
 updateFavedStickers#e511996d = Update;
-updateChannelReadMessagesContents#ea29055d flags:# channel_id:long top_msg_id:flags.0?int messages:Vector<int> = Update;
+updateChannelReadMessagesContents#25f324f7 flags:# channel_id:long top_msg_id:flags.0?int saved_peer_id:flags.1?Peer messages:Vector<int> = Update;
 updateContactsReset#7084a7be = Update;
 updateChannelAvailableMessages#b23fc698 channel_id:long available_min_id:int = Update;
-updateDialogUnreadMark#e16459c3 flags:# unread:flags.0?true peer:DialogPeer = Update;
-updateMessagePoll#aca1657b flags:# poll_id:long poll:flags.0?Poll results:PollResults = Update;
+updateDialogUnreadMark#b658f23e flags:# unread:flags.0?true peer:DialogPeer saved_peer_id:flags.1?Peer = Update;
+updateMessagePoll#d64c522b flags:# peer:flags.1?Peer msg_id:flags.1?int top_msg_id:flags.2?int poll_id:long poll:flags.0?Poll results:PollResults = Update;
 updateChatDefaultBannedRights#54c01850 peer:Peer default_banned_rights:ChatBannedRights version:int = Update;
 updateFolderPeers#19360dc0 folder_peers:Vector<FolderPeer> pts:int pts_count:int = Update;
 updatePeerSettings#6a7e7366 peer:Peer settings:PeerSettings = Update;
 updatePeerLocated#b4afcfb0 peers:Vector<PeerLocated> = Update;
 updateNewScheduledMessage#39a51dfb message:Message = Update;
-updateDeleteScheduledMessages#90866cee peer:Peer messages:Vector<int> = Update;
+updateDeleteScheduledMessages#f2a71983 flags:# peer:Peer messages:Vector<int> sent_messages:flags.0?Vector<int> = Update;
 updateTheme#8216fba3 theme:Theme = Update;
 updateGeoLiveViewed#871fb939 peer:Peer msg_id:int = Update;
 updateLoginToken#564fe691 = Update;
-updateMessagePollVote#24f40e77 poll_id:long peer:Peer options:Vector<bytes> qts:int = Update;
+updateMessagePollVote#7699f014 poll_id:long peer:Peer options:Vector<bytes> positions:Vector<int> qts:int = Update;
 updateDialogFilter#26ffde7d flags:# id:int filter:flags.0?DialogFilter = Update;
 updateDialogFilterOrder#a5d72105 order:Vector<int> = Update;
 updateDialogFilters#3504914f = Update;
@@ -371,7 +397,7 @@ updatePinnedMessages#ed85eab5 flags:# pinned:flags.0?true peer:Peer messages:Vec
 updatePinnedChannelMessages#5bb98608 flags:# pinned:flags.0?true channel_id:long messages:Vector<int> pts:int pts_count:int = Update;
 updateChat#f89a6a4e chat_id:long = Update;
 updateGroupCallParticipants#f2ebdb4e call:InputGroupCall participants:Vector<GroupCallParticipant> version:int = Update;
-updateGroupCall#14b24500 chat_id:long call:GroupCall = Update;
+updateGroupCall#9d2216e0 flags:# live_story:flags.2?true peer:flags.1?Peer call:GroupCall = Update;
 updatePeerHistoryTTL#bb9bb9a5 flags:# peer:Peer ttl_period:flags.0?int = Update;
 updateChatParticipant#d087663a flags:# chat_id:long date:int actor_id:long user_id:long prev_participant:flags.0?ChatParticipant new_participant:flags.1?ChatParticipant invite:flags.2?ExportedChatInvite qts:int = Update;
 updateChannelParticipant#985d3abb flags:# via_chatlist:flags.3?true channel_id:long date:int actor_id:long user_id:long prev_participant:flags.0?ChannelParticipant new_participant:flags.1?ChannelParticipant invite:flags.2?ExportedChatInvite qts:int = Update;
@@ -379,8 +405,8 @@ updateBotStopped#c4870a49 user_id:long date:int stopped:Bool qts:int = Update;
 updateGroupCallConnection#b783982 flags:# presentation:flags.0?true params:DataJSON = Update;
 updateBotCommands#4d712f2e peer:Peer bot_id:long commands:Vector<BotCommand> = Update;
 updatePendingJoinRequests#7063c3db peer:Peer requests_pending:int recent_requesters:Vector<long> = Update;
-updateBotChatInviteRequester#11dfa986 peer:Peer date:int user_id:long about:string invite:ExportedChatInvite qts:int = Update;
-updateMessageReactions#5e1b3cb8 flags:# peer:Peer msg_id:int top_msg_id:flags.0?int reactions:MessageReactions = Update;
+updateBotChatInviteRequester#7cb34d79 flags:# peer:Peer date:int user_id:long about:string invite:ExportedChatInvite qts:int query_id:flags.0?long = Update;
+updateMessageReactions#1e297bfa flags:# peer:Peer msg_id:int top_msg_id:flags.0?int saved_peer_id:flags.1?Peer reactions:MessageReactions = Update;
 updateAttachMenuBots#17b7a20b = Update;
 updateWebViewResultSent#1592b79d query_id:long = Update;
 updateBotMenuButton#14b85813 bot_id:long button:BotMenuButton = Update;
@@ -392,8 +418,6 @@ updateRecentEmojiStatuses#30f443db = Update;
 updateRecentReactions#6f7863f4 = Update;
 updateMoveStickerSetToTop#86fccf85 flags:# masks:flags.0?true emojis:flags.1?true stickerset:long = Update;
 updateMessageExtendedMedia#d5a41724 peer:Peer msg_id:int extended_media:Vector<MessageExtendedMedia> = Update;
-updateChannelPinnedTopic#192efbe3 flags:# pinned:flags.0?true channel_id:long topic_id:int = Update;
-updateChannelPinnedTopics#fe198602 flags:# channel_id:long order:flags.0?Vector<int> = Update;
 updateUser#20529438 user_id:long = Update;
 updateAutoSaveSettings#ec05b097 = Update;
 updateStory#75b3b798 peer:Peer story:StoryItem = Update;
@@ -420,12 +444,33 @@ updateBotNewBusinessMessage#9ddb347c flags:# connection_id:string message:Messag
 updateBotEditBusinessMessage#7df587c flags:# connection_id:string message:Message reply_to_message:flags.0?Message qts:int = Update;
 updateBotDeleteBusinessMessage#a02a982e connection_id:string peer:Peer messages:Vector<int> qts:int = Update;
 updateNewStoryReaction#1824e40b story_id:int peer:Peer reaction:Reaction = Update;
-updateBroadcastRevenueTransactions#dfd961f5 peer:Peer balances:BroadcastRevenueBalances = Update;
-updateStarsBalance#fb85198 balance:long = Update;
+updateStarsBalance#4e80a379 balance:StarsAmount = Update;
 updateBusinessBotCallbackQuery#1ea2fda7 flags:# query_id:long user_id:long connection_id:string message:Message reply_to_message:flags.2?Message chat_instance:long data:flags.0?bytes = Update;
 updateStarsRevenueStatus#a584b019 peer:Peer status:StarsRevenueStatus = Update;
 updateBotPurchasedPaidMedia#283bd312 user_id:long payload:string qts:int = Update;
-updatePaidReactionPrivacy#51ca7aec private:Bool = Update;
+updatePaidReactionPrivacy#8b725fce private:PaidReactionPrivacy = Update;
+updateSentPhoneCode#504aa18f sent_code:auth.SentCode = Update;
+updateGroupCallChainBlocks#a477288f call:InputGroupCall sub_chain_id:int blocks:Vector<bytes> next_offset:int = Update;
+updateReadMonoForumInbox#77b0e372 channel_id:long saved_peer_id:Peer read_max_id:int = Update;
+updateReadMonoForumOutbox#a4a79376 channel_id:long saved_peer_id:Peer read_max_id:int = Update;
+updateMonoForumNoPaidException#9f812b08 flags:# exception:flags.0?true channel_id:long saved_peer_id:Peer = Update;
+updateGroupCallMessage#d8326f0d call:InputGroupCall message:GroupCallMessage = Update;
+updateGroupCallEncryptedMessage#c957a766 call:InputGroupCall from_id:Peer encrypted_message:bytes = Update;
+updatePinnedForumTopic#683b2c52 flags:# pinned:flags.0?true peer:Peer topic_id:int = Update;
+updatePinnedForumTopics#def143d0 flags:# peer:Peer order:flags.0?Vector<int> = Update;
+updateDeleteGroupCallMessages#3e85e92c call:InputGroupCall messages:Vector<int> = Update;
+updateStarGiftAuctionState#48e246c2 gift_id:long state:StarGiftAuctionState = Update;
+updateStarGiftAuctionUserState#dc58f31e gift_id:long user_state:StarGiftAuctionUserState = Update;
+updateEmojiGameInfo#fb9c547a info:messages.EmojiGameInfo = Update;
+updateStarGiftCraftFail#ac072444 = Update;
+updateChatParticipantRank#bd8367b9 chat_id:long user_id:long rank:string version:int = Update;
+updateManagedBot#4880ed9a user_id:long bot_id:long qts:int = Update;
+updateBotGuestChatQuery#cdd4093d flags:# query_id:long message:Message reference_messages:flags.0?Vector<Message> qts:int = Update;
+updateAiComposeTones#8c0f91fb = Update;
+updateJoinChatWebViewDecision#bdac7e70 peer:Peer query_id:long result:JoinChatBotResult = Update;
+updateNewBotConnection#b22083a6 flags:# confirmed:flags.0?true bot_id:long date:flags.1?int device:flags.1?string location:flags.1?string = Update;
+updateWebBrowserSettings#c39a2ade flags:# open_external_browser:flags.0?true display_close_button:flags.1?true = Update;
+updateWebBrowserException#140502d1 flags:# delete:flags.1?true open_external_browser:flags.0?Bool exception:WebDomainException = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -518,6 +563,9 @@ sendMessageHistoryImportAction#dbda9246 progress:int = SendMessageAction;
 sendMessageChooseStickerAction#b05ac6b1 = SendMessageAction;
 sendMessageEmojiInteraction#25972bcb emoticon:string msg_id:int interaction:DataJSON = SendMessageAction;
 sendMessageEmojiInteractionSeen#b665902e emoticon:string = SendMessageAction;
+sendMessageTextDraftAction#376d975c random_id:long text:TextWithEntities = SendMessageAction;
+inputSendMessageRichMessageDraftAction#e2b23b51 random_id:long rich_message:InputRichMessage = SendMessageAction;
+sendMessageRichMessageDraftAction#a2cb24f9 random_id:long rich_message:RichMessage = SendMessageAction;
 
 contacts.found#b3134d9d my_results:Vector<Peer> results:Vector<Peer> chats:Vector<Chat> users:Vector<User> = contacts.Found;
 
@@ -532,6 +580,9 @@ inputPrivacyKeyAddedByPhone#d1219bdd = InputPrivacyKey;
 inputPrivacyKeyVoiceMessages#aee69d68 = InputPrivacyKey;
 inputPrivacyKeyAbout#3823cc40 = InputPrivacyKey;
 inputPrivacyKeyBirthday#d65a11cc = InputPrivacyKey;
+inputPrivacyKeyStarGiftsAutoSave#e1732341 = InputPrivacyKey;
+inputPrivacyKeyNoPaidMessages#bdc597b4 = InputPrivacyKey;
+inputPrivacyKeySavedMusic#4dbe9226 = InputPrivacyKey;
 
 privacyKeyStatusTimestamp#bc2eab30 = PrivacyKey;
 privacyKeyChatInvite#500e6dfa = PrivacyKey;
@@ -544,6 +595,9 @@ privacyKeyAddedByPhone#42ffd42b = PrivacyKey;
 privacyKeyVoiceMessages#697f414 = PrivacyKey;
 privacyKeyAbout#a486b761 = PrivacyKey;
 privacyKeyBirthday#2000a518 = PrivacyKey;
+privacyKeyStarGiftsAutoSave#2ca4fdf8 = PrivacyKey;
+privacyKeyNoPaidMessages#17d348d2 = PrivacyKey;
+privacyKeySavedMusic#ff7a571b = PrivacyKey;
 
 inputPrivacyValueAllowContacts#d09e07b = InputPrivacyRule;
 inputPrivacyValueAllowAll#184b35ce = InputPrivacyRule;
@@ -555,6 +609,8 @@ inputPrivacyValueAllowChatParticipants#840649cf chats:Vector<long> = InputPrivac
 inputPrivacyValueDisallowChatParticipants#e94f0f86 chats:Vector<long> = InputPrivacyRule;
 inputPrivacyValueAllowCloseFriends#2f453e49 = InputPrivacyRule;
 inputPrivacyValueAllowPremium#77cdc9f1 = InputPrivacyRule;
+inputPrivacyValueAllowBots#5a4fcce5 = InputPrivacyRule;
+inputPrivacyValueDisallowBots#c4e57915 = InputPrivacyRule;
 
 privacyValueAllowContacts#fffe1bac = PrivacyRule;
 privacyValueAllowAll#65427b82 = PrivacyRule;
@@ -566,6 +622,8 @@ privacyValueAllowChatParticipants#6b134e8e chats:Vector<long> = PrivacyRule;
 privacyValueDisallowChatParticipants#41c87565 chats:Vector<long> = PrivacyRule;
 privacyValueAllowCloseFriends#f7e8d89b = PrivacyRule;
 privacyValueAllowPremium#ece9814b = PrivacyRule;
+privacyValueAllowBots#21461b5d = PrivacyRule;
+privacyValueDisallowBots#f6a5f82f = PrivacyRule;
 
 account.privacyRules#50a04e45 rules:Vector<PrivacyRule> chats:Vector<Chat> users:Vector<User> = account.PrivacyRules;
 
@@ -592,7 +650,7 @@ messages.affectedMessages#84d19185 pts:int pts_count:int = messages.AffectedMess
 
 webPageEmpty#211a1788 flags:# id:long url:flags.0?string = WebPage;
 webPagePending#b0d13e47 flags:# id:long url:flags.0?string date:int = WebPage;
-webPage#e89c45b2 flags:# has_large_media:flags.13?true id:long url:string display_url:string hash:int type:flags.0?string site_name:flags.1?string title:flags.2?string description:flags.3?string photo:flags.4?Photo embed_url:flags.5?string embed_type:flags.5?string embed_width:flags.6?int embed_height:flags.6?int duration:flags.7?int author:flags.8?string document:flags.9?Document cached_page:flags.10?Page attributes:flags.12?Vector<WebPageAttribute> = WebPage;
+webPage#e89c45b2 flags:# has_large_media:flags.13?true video_cover_photo:flags.14?true id:long url:string display_url:string hash:int type:flags.0?string site_name:flags.1?string title:flags.2?string description:flags.3?string photo:flags.4?Photo embed_url:flags.5?string embed_type:flags.5?string embed_width:flags.6?int embed_height:flags.6?int duration:flags.7?int author:flags.8?string document:flags.9?Document cached_page:flags.10?Page attributes:flags.12?Vector<WebPageAttribute> = WebPage;
 webPageNotModified#7311ca11 flags:# cached_page_views:flags.0?int = WebPage;
 
 authorization#ad01d61d flags:# current:flags.0?true official_app:flags.1?true password_pending:flags.2?true encrypted_requests_disabled:flags.3?true call_requests_disabled:flags.4?true unconfirmed:flags.5?true hash:long device_model:string platform:string system_version:string api_id:int app_name:string app_version:string date_created:int date_active:int ip:string country:string region:string = Authorization;
@@ -613,7 +671,7 @@ chatInviteExported#a22cbd96 flags:# revoked:flags.0?true permanent:flags.5?true
 chatInvitePublicJoinRequests#ed107ab7 = ExportedChatInvite;
 
 chatInviteAlready#5a686d7c chat:Chat = ChatInvite;
-chatInvite#fe65389d flags:# channel:flags.0?true broadcast:flags.1?true public:flags.2?true megagroup:flags.3?true request_needed:flags.6?true verified:flags.7?true scam:flags.8?true fake:flags.9?true can_refulfill_subscription:flags.11?true title:string about:flags.5?string photo:Photo participants_count:int participants:flags.4?Vector<User> color:int subscription_pricing:flags.10?StarsSubscriptionPricing subscription_form_id:flags.12?long = ChatInvite;
+chatInvite#5c9d3702 flags:# channel:flags.0?true broadcast:flags.1?true public:flags.2?true megagroup:flags.3?true request_needed:flags.6?true verified:flags.7?true scam:flags.8?true fake:flags.9?true can_refulfill_subscription:flags.11?true title:string about:flags.5?string photo:Photo participants_count:int participants:flags.4?Vector<User> color:int subscription_pricing:flags.10?StarsSubscriptionPricing subscription_form_id:flags.12?long bot_verification:flags.13?BotVerification = ChatInvite;
 chatInvitePeek#61695cb0 chat:Chat expires:int = ChatInvite;
 
 inputStickerSetEmpty#ffb62b95 = InputStickerSet;
@@ -627,6 +685,7 @@ inputStickerSetEmojiGenericAnimations#4c4d4ce = InputStickerSet;
 inputStickerSetEmojiDefaultStatuses#29d0f5ee = InputStickerSet;
 inputStickerSetEmojiDefaultTopicIcons#44c1f8e9 = InputStickerSet;
 inputStickerSetEmojiChannelDefaultStatuses#49748553 = InputStickerSet;
+inputStickerSetTonGifts#1cf671a0 = InputStickerSet;
 
 stickerSet#2dd14edc flags:# archived:flags.1?true official:flags.2?true masks:flags.3?true emojis:flags.7?true text_color:flags.9?true channel_emoji_status:flags.10?true creator:flags.11?true installed_date:flags.0?int id:long access_hash:long title:string short_name:string thumbs:flags.4?Vector<PhotoSize> thumb_dc_id:flags.4?int thumb_version:flags.4?int thumb_document_id:flags.8?long count:int hash:int = StickerSet;
 
@@ -635,26 +694,26 @@ messages.stickerSetNotModified#d3f924eb = messages.StickerSet;
 
 botCommand#c27ac8c7 command:string description:string = BotCommand;
 
-botInfo#82437e74 flags:# has_preview_medias:flags.6?true user_id:flags.0?long description:flags.1?string description_photo:flags.4?Photo description_document:flags.5?Document commands:flags.2?Vector<BotCommand> menu_button:flags.3?BotMenuButton privacy_policy_url:flags.7?string = BotInfo;
-
-keyboardButton#a2fa4880 text:string = KeyboardButton;
-keyboardButtonUrl#258aff05 text:string url:string = KeyboardButton;
-keyboardButtonCallback#35bbdb6b flags:# requires_password:flags.0?true text:string data:bytes = KeyboardButton;
-keyboardButtonRequestPhone#b16a6c29 text:string = KeyboardButton;
-keyboardButtonRequestGeoLocation#fc796b3f text:string = KeyboardButton;
-keyboardButtonSwitchInline#93b9fbb5 flags:# same_peer:flags.0?true text:string query:string peer_types:flags.1?Vector<InlineQueryPeerType> = KeyboardButton;
-keyboardButtonGame#50f41ccf text:string = KeyboardButton;
-keyboardButtonBuy#afd93fbb text:string = KeyboardButton;
-keyboardButtonUrlAuth#10b78d29 flags:# text:string fwd_text:flags.0?string url:string button_id:int = KeyboardButton;
-inputKeyboardButtonUrlAuth#d02e7fd4 flags:# request_write_access:flags.0?true text:string fwd_text:flags.1?string url:string bot:InputUser = KeyboardButton;
-keyboardButtonRequestPoll#bbc7515d flags:# quiz:flags.0?Bool text:string = KeyboardButton;
-inputKeyboardButtonUserProfile#e988037b text:string user_id:InputUser = KeyboardButton;
-keyboardButtonUserProfile#308660c1 text:string user_id:long = KeyboardButton;
-keyboardButtonWebView#13767230 text:string url:string = KeyboardButton;
-keyboardButtonSimpleWebView#a0c0505c text:string url:string = KeyboardButton;
-keyboardButtonRequestPeer#53d7bfd8 text:string button_id:int peer_type:RequestPeerType max_quantity:int = KeyboardButton;
-inputKeyboardButtonRequestPeer#c9662d05 flags:# name_requested:flags.0?true username_requested:flags.1?true photo_requested:flags.2?true text:string button_id:int peer_type:RequestPeerType max_quantity:int = KeyboardButton;
-keyboardButtonCopy#75d2698e text:string copy_text:string = KeyboardButton;
+botInfo#4d8a0299 flags:# has_preview_medias:flags.6?true user_id:flags.0?long description:flags.1?string description_photo:flags.4?Photo description_document:flags.5?Document commands:flags.2?Vector<BotCommand> menu_button:flags.3?BotMenuButton privacy_policy_url:flags.7?string app_settings:flags.8?BotAppSettings verifier_settings:flags.9?BotVerifierSettings = BotInfo;
+
+keyboardButton#7d170cff flags:# style:flags.10?KeyboardButtonStyle text:string = KeyboardButton;
+keyboardButtonUrl#d80c25ec flags:# style:flags.10?KeyboardButtonStyle text:string url:string = KeyboardButton;
+keyboardButtonCallback#e62bc960 flags:# requires_password:flags.0?true style:flags.10?KeyboardButtonStyle text:string data:bytes = KeyboardButton;
+keyboardButtonRequestPhone#417efd8f flags:# style:flags.10?KeyboardButtonStyle text:string = KeyboardButton;
+keyboardButtonRequestGeoLocation#aa40f94d flags:# style:flags.10?KeyboardButtonStyle text:string = KeyboardButton;
+keyboardButtonSwitchInline#991399fc flags:# same_peer:flags.0?true style:flags.10?KeyboardButtonStyle text:string query:string peer_types:flags.1?Vector<InlineQueryPeerType> = KeyboardButton;
+keyboardButtonGame#89c590f9 flags:# style:flags.10?KeyboardButtonStyle text:string = KeyboardButton;
+keyboardButtonBuy#3fa53905 flags:# style:flags.10?KeyboardButtonStyle text:string = KeyboardButton;
+keyboardButtonUrlAuth#f51006f9 flags:# style:flags.10?KeyboardButtonStyle text:string fwd_text:flags.0?string url:string button_id:int = KeyboardButton;
+inputKeyboardButtonUrlAuth#68013e72 flags:# request_write_access:flags.0?true style:flags.10?KeyboardButtonStyle text:string fwd_text:flags.1?string url:string bot:InputUser = KeyboardButton;
+keyboardButtonRequestPoll#7a11d782 flags:# style:flags.10?KeyboardButtonStyle quiz:flags.0?Bool text:string = KeyboardButton;
+inputKeyboardButtonUserProfile#7d5e07c7 flags:# style:flags.10?KeyboardButtonStyle text:string user_id:InputUser = KeyboardButton;
+keyboardButtonUserProfile#c0fd5d09 flags:# style:flags.10?KeyboardButtonStyle text:string user_id:long = KeyboardButton;
+keyboardButtonWebView#e846b1a0 flags:# style:flags.10?KeyboardButtonStyle text:string url:string = KeyboardButton;
+keyboardButtonSimpleWebView#e15c4370 flags:# style:flags.10?KeyboardButtonStyle text:string url:string = KeyboardButton;
+keyboardButtonRequestPeer#5b0f15f5 flags:# style:flags.10?KeyboardButtonStyle text:string button_id:int peer_type:RequestPeerType max_quantity:int = KeyboardButton;
+inputKeyboardButtonRequestPeer#2b78156 flags:# name_requested:flags.0?true username_requested:flags.1?true photo_requested:flags.2?true style:flags.10?KeyboardButtonStyle text:string button_id:int peer_type:RequestPeerType max_quantity:int = KeyboardButton;
+keyboardButtonCopy#bcc4af10 flags:# style:flags.10?KeyboardButtonStyle text:string copy_text:string = KeyboardButton;
 
 keyboardButtonRow#77608b83 buttons:Vector<KeyboardButton> = KeyboardButtonRow;
 
@@ -684,6 +743,10 @@ messageEntityBankCard#761e6af4 offset:int length:int = MessageEntity;
 messageEntitySpoiler#32ca960f offset:int length:int = MessageEntity;
 messageEntityCustomEmoji#c8cf05f8 offset:int length:int document_id:long = MessageEntity;
 messageEntityBlockquote#f1ccaaac flags:# collapsed:flags.0?true offset:int length:int = MessageEntity;
+messageEntityFormattedDate#904ac7c7 flags:# relative:flags.0?true short_time:flags.1?true long_time:flags.2?true short_date:flags.3?true long_date:flags.4?true day_of_week:flags.5?true offset:int length:int date:int = MessageEntity;
+messageEntityDiffInsert#71777116 offset:int length:int = MessageEntity;
+messageEntityDiffReplace#c6c1e5a7 offset:int length:int old_text:string = MessageEntity;
+messageEntityDiffDelete#652c1c5 offset:int length:int = MessageEntity;
 
 inputChannelEmpty#ee8c1e86 = InputChannel;
 inputChannel#f35aec28 channel_id:long access_hash:long = InputChannel;
@@ -700,11 +763,11 @@ updates.channelDifference#2064674e flags:# final:flags.0?true pts:int timeout:fl
 channelMessagesFilterEmpty#94d42ee7 = ChannelMessagesFilter;
 channelMessagesFilter#cd77d957 flags:# exclude_new_messages:flags.1?true ranges:Vector<MessageRange> = ChannelMessagesFilter;
 
-channelParticipant#cb397619 flags:# user_id:long date:int subscription_until_date:flags.0?int = ChannelParticipant;
-channelParticipantSelf#4f607bef flags:# via_request:flags.0?true user_id:long inviter_id:long date:int subscription_until_date:flags.1?int = ChannelParticipant;
+channelParticipant#1bd54456 flags:# user_id:long date:int subscription_until_date:flags.0?int rank:flags.2?string = ChannelParticipant;
+channelParticipantSelf#a9478a1a flags:# via_request:flags.0?true user_id:long inviter_id:long date:int subscription_until_date:flags.1?int rank:flags.2?string = ChannelParticipant;
 channelParticipantCreator#2fe601d3 flags:# user_id:long admin_rights:ChatAdminRights rank:flags.0?string = ChannelParticipant;
 channelParticipantAdmin#34c3bb53 flags:# can_edit:flags.0?true self:flags.1?true user_id:long inviter_id:flags.1?long promoted_by:long date:int admin_rights:ChatAdminRights rank:flags.2?string = ChannelParticipant;
-channelParticipantBanned#6df8014e flags:# left:flags.0?true peer:Peer kicked_by:long date:int banned_rights:ChatBannedRights = ChannelParticipant;
+channelParticipantBanned#d5f0ad91 flags:# left:flags.0?true peer:Peer kicked_by:long date:int banned_rights:ChatBannedRights rank:flags.2?string = ChannelParticipant;
 channelParticipantLeft#1b03f006 peer:Peer = ChannelParticipant;
 
 channelParticipantsRecent#de3f3c79 = ChannelParticipantsFilter;
@@ -734,6 +797,7 @@ inputBotInlineMessageMediaContact#a6edbffd flags:# phone_number:string first_nam
 inputBotInlineMessageGame#4b425864 flags:# reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
 inputBotInlineMessageMediaInvoice#d7e78225 flags:# title:string description:string photo:flags.0?InputWebDocument invoice:Invoice payload:bytes provider:string provider_data:DataJSON reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
 inputBotInlineMessageMediaWebPage#bddcc510 flags:# invert_media:flags.3?true force_large_media:flags.4?true force_small_media:flags.5?true optional:flags.6?true message:string entities:flags.1?Vector<MessageEntity> url:string reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
+inputBotInlineMessageRichMessage#b43df56c flags:# reply_markup:flags.2?ReplyMarkup rich_message:InputRichMessage = InputBotInlineMessage;
 
 inputBotInlineResult#88bf9319 flags:# id:string type:string title:flags.1?string description:flags.2?string url:flags.3?string thumb:flags.4?InputWebDocument content:flags.5?InputWebDocument send_message:InputBotInlineMessage = InputBotInlineResult;
 inputBotInlineResultPhoto#a8d864a7 id:string type:string photo:InputPhoto send_message:InputBotInlineMessage = InputBotInlineResult;
@@ -747,6 +811,7 @@ botInlineMessageMediaVenue#8a86659c flags:# geo:GeoPoint title:string address:st
 botInlineMessageMediaContact#18d1cdc2 flags:# phone_number:string first_name:string last_name:string vcard:string reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
 botInlineMessageMediaInvoice#354a9b09 flags:# shipping_address_requested:flags.1?true test:flags.3?true title:string description:string photo:flags.0?WebDocument currency:string total_amount:long reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
 botInlineMessageMediaWebPage#809ad9a6 flags:# invert_media:flags.3?true force_large_media:flags.4?true force_small_media:flags.5?true manual:flags.7?true safe:flags.8?true message:string entities:flags.1?Vector<MessageEntity> url:string reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
+botInlineMessageRichMessage#a617e7b flags:# reply_markup:flags.2?ReplyMarkup rich_message:RichMessage = BotInlineMessage;
 
 botInlineResult#11965f3a flags:# id:string type:string title:flags.1?string description:flags.2?string url:flags.3?string thumb:flags.4?WebDocument content:flags.5?WebDocument send_message:BotInlineMessage = BotInlineResult;
 botInlineMediaResult#17db940b flags:# id:string type:string photo:flags.0?Photo document:flags.1?Document title:flags.2?string description:flags.3?string send_message:BotInlineMessage = BotInlineResult;
@@ -797,6 +862,7 @@ topPeerCategoryPhoneCalls#1e76a78c = TopPeerCategory;
 topPeerCategoryForwardUsers#a8406ca9 = TopPeerCategory;
 topPeerCategoryForwardChats#fbeec0f0 = TopPeerCategory;
 topPeerCategoryBotsApp#fd9e7bec = TopPeerCategory;
+topPeerCategoryBotsGuestChat#6c24f3dd = TopPeerCategory;
 
 topPeerCategoryPeers#fb834291 category:TopPeerCategory count:int peers:Vector<TopPeer> = TopPeerCategoryPeers;
 
@@ -805,7 +871,7 @@ contacts.topPeers#70b772a8 categories:Vector<TopPeerCategoryPeers> chats:Vector<
 contacts.topPeersDisabled#b52c939d = contacts.TopPeers;
 
 draftMessageEmpty#1b0c841a flags:# date:flags.0?int = DraftMessage;
-draftMessage#2d65321f flags:# no_webpage:flags.1?true invert_media:flags.6?true reply_to:flags.4?InputReplyTo message:string entities:flags.3?Vector<MessageEntity> media:flags.5?InputMedia date:int effect:flags.7?long = DraftMessage;
+draftMessage#60fe3294 flags:# no_webpage:flags.1?true invert_media:flags.6?true reply_to:flags.4?InputReplyTo message:string entities:flags.3?Vector<MessageEntity> media:flags.5?InputMedia date:int effect:flags.7?long suggested_post:flags.8?SuggestedPost rich_message:flags.9?RichMessage = DraftMessage;
 
 messages.featuredStickersNotModified#c6dc0c66 count:int = messages.FeaturedStickers;
 messages.featuredStickers#be382906 flags:# premium:flags.0?true hash:long count:int sets:Vector<StickerSetCovered> unread:Vector<long> = messages.FeaturedStickers;
@@ -853,6 +919,19 @@ textMarked#34b8621 text:RichText = RichText;
 textPhone#1ccb966a text:RichText phone:string = RichText;
 textImage#81ccf4f document_id:long w:int h:int = RichText;
 textAnchor#35553762 text:RichText name:string = RichText;
+textMath#9d2eac97 source:string = RichText;
+textCustomEmoji#a26156c0 document_id:long alt:string = RichText;
+textSpoiler#4c2a5d62 text:RichText = RichText;
+textMention#cd24cf44 text:RichText = RichText;
+textHashtag#519524ea text:RichText = RichText;
+textBotCommand#2ff29d3 text:RichText = RichText;
+textCashtag#7b9e1801 text:RichText = RichText;
+textAutoUrl#ac6a83aa text:RichText = RichText;
+textAutoEmail#c556a45d text:RichText = RichText;
+textAutoPhone#24c26789 text:RichText = RichText;
+textBankCard#b956812d text:RichText = RichText;
+textMentionName#1a9fbfc text:RichText user_id:long = RichText;
+textDate#a5b45e2b flags:# relative:flags.0?true short_time:flags.1?true long_time:flags.2?true short_date:flags.3?true long_date:flags.4?true day_of_week:flags.5?true text:RichText date:int = RichText;
 
 pageBlockUnsupported#13567e8a = PageBlock;
 pageBlockTitle#70abc3fd text:RichText = PageBlock;
@@ -868,8 +947,8 @@ pageBlockAnchor#ce0d37b0 name:string = PageBlock;
 pageBlockList#e4e88011 items:Vector<PageListItem> = PageBlock;
 pageBlockBlockquote#263d7c26 text:RichText caption:RichText = PageBlock;
 pageBlockPullquote#4f4456d3 text:RichText caption:RichText = PageBlock;
-pageBlockPhoto#1759c560 flags:# photo_id:long caption:PageCaption url:flags.0?string webpage_id:flags.0?long = PageBlock;
-pageBlockVideo#7c8fe7b6 flags:# autoplay:flags.0?true loop:flags.1?true video_id:long caption:PageCaption = PageBlock;
+pageBlockPhoto#1759c560 flags:# spoiler:flags.1?true photo_id:long caption:PageCaption url:flags.0?string webpage_id:flags.0?long = PageBlock;
+pageBlockVideo#7c8fe7b6 flags:# autoplay:flags.0?true loop:flags.1?true spoiler:flags.2?true video_id:long caption:PageCaption = PageBlock;
 pageBlockCover#39f23300 cover:PageBlock = PageBlock;
 pageBlockEmbed#a8718dc5 flags:# full_width:flags.0?true allow_scrolling:flags.3?true url:flags.1?string html:flags.2?string poster_photo_id:flags.4?long w:flags.5?int h:flags.5?int caption:PageCaption = PageBlock;
 pageBlockEmbedPost#f259a80b url:string webpage_id:long author_photo_id:long author:string date:int blocks:Vector<PageBlock> caption:PageCaption = PageBlock;
@@ -879,21 +958,32 @@ pageBlockChannel#ef1751b5 channel:Chat = PageBlock;
 pageBlockAudio#804361ea audio_id:long caption:PageCaption = PageBlock;
 pageBlockKicker#1e148390 text:RichText = PageBlock;
 pageBlockTable#bf4dea82 flags:# bordered:flags.0?true striped:flags.1?true title:RichText rows:Vector<PageTableRow> = PageBlock;
-pageBlockOrderedList#9a8ae1e1 items:Vector<PageListOrderedItem> = PageBlock;
+pageBlockOrderedList#1fd6f6c1 flags:# reversed:flags.2?true items:Vector<PageListOrderedItem> start:flags.0?int type:flags.1?string = PageBlock;
 pageBlockDetails#76768bed flags:# open:flags.0?true blocks:Vector<PageBlock> title:RichText = PageBlock;
 pageBlockRelatedArticles#16115a96 title:RichText articles:Vector<PageRelatedArticle> = PageBlock;
 pageBlockMap#a44f3ef6 geo:GeoPoint zoom:int w:int h:int caption:PageCaption = PageBlock;
+pageBlockHeading1#baff072f text:RichText = PageBlock;
+pageBlockHeading2#96b2aec text:RichText = PageBlock;
+pageBlockHeading3#67e731ad text:RichText = PageBlock;
+pageBlockHeading4#b532772b text:RichText = PageBlock;
+pageBlockHeading5#dbbe6c6a text:RichText = PageBlock;
+pageBlockHeading6#682a41a9 text:RichText = PageBlock;
+pageBlockMath#59080c20 source:string = PageBlock;
+pageBlockThinking#3c29a3e2 text:RichText = PageBlock;
+inputPageBlockMap#574b617f geo:InputGeoPoint zoom:int w:int h:int caption:PageCaption = PageBlock;
+pageBlockBlockquoteBlocks#e6e47c4 blocks:Vector<PageBlock> caption:RichText = PageBlock;
 
 phoneCallDiscardReasonMissed#85e42301 = PhoneCallDiscardReason;
 phoneCallDiscardReasonDisconnect#e095c1a0 = PhoneCallDiscardReason;
 phoneCallDiscardReasonHangup#57adc690 = PhoneCallDiscardReason;
 phoneCallDiscardReasonBusy#faf7e8c9 = PhoneCallDiscardReason;
+phoneCallDiscardReasonMigrateConferenceCall#9fbbf1f7 slug:string = PhoneCallDiscardReason;
 
 dataJSON#7d748d04 data:string = DataJSON;
 
 labeledPrice#cb296bf8 label:string amount:long = LabeledPrice;
 
-invoice#5db95a15 flags:# test:flags.0?true name_requested:flags.1?true phone_requested:flags.2?true email_requested:flags.3?true shipping_address_requested:flags.4?true flexible:flags.5?true phone_to_provider:flags.6?true email_to_provider:flags.7?true recurring:flags.9?true currency:string prices:Vector<LabeledPrice> max_tip_amount:flags.8?long suggested_tip_amounts:flags.8?Vector<long> terms_url:flags.10?string = Invoice;
+invoice#49ee584 flags:# test:flags.0?true name_requested:flags.1?true phone_requested:flags.2?true email_requested:flags.3?true shipping_address_requested:flags.4?true flexible:flags.5?true phone_to_provider:flags.6?true email_to_provider:flags.7?true recurring:flags.9?true currency:string prices:Vector<LabeledPrice> max_tip_amount:flags.8?long suggested_tip_amounts:flags.8?Vector<long> terms_url:flags.10?string subscription_period:flags.11?int = Invoice;
 
 paymentCharge#ea02c27e id:string provider_charge_id:string = PaymentCharge;
 
@@ -945,7 +1035,7 @@ phoneCallEmpty#5366c915 id:long = PhoneCall;
 phoneCallWaiting#c5226f17 flags:# video:flags.6?true id:long access_hash:long date:int admin_id:long participant_id:long protocol:PhoneCallProtocol receive_date:flags.0?int = PhoneCall;
 phoneCallRequested#14b0ed0c flags:# video:flags.6?true id:long access_hash:long date:int admin_id:long participant_id:long g_a_hash:bytes protocol:PhoneCallProtocol = PhoneCall;
 phoneCallAccepted#3660c311 flags:# video:flags.6?true id:long access_hash:long date:int admin_id:long participant_id:long g_b:bytes protocol:PhoneCallProtocol = PhoneCall;
-phoneCall#30535af5 flags:# p2p_allowed:flags.5?true video:flags.6?true id:long access_hash:long date:int admin_id:long participant_id:long g_a_or_b:bytes key_fingerprint:long protocol:PhoneCallProtocol connections:Vector<PhoneConnection> start_date:int custom_parameters:flags.7?DataJSON = PhoneCall;
+phoneCall#30535af5 flags:# p2p_allowed:flags.5?true video:flags.6?true conference_supported:flags.8?true id:long access_hash:long date:int admin_id:long participant_id:long g_a_or_b:bytes key_fingerprint:long protocol:PhoneCallProtocol connections:Vector<PhoneConnection> start_date:int custom_parameters:flags.7?DataJSON = PhoneCall;
 phoneCallDiscarded#50ca4de1 flags:# need_rating:flags.2?true need_debug:flags.3?true video:flags.6?true id:long reason:flags.0?PhoneCallDiscardReason duration:flags.1?int = PhoneCall;
 
 phoneConnection#9cc123c7 flags:# tcp:flags.0?true id:long ip:string ipv6:string port:int peer_tag:bytes = PhoneConnection;
@@ -1020,12 +1110,14 @@ channelAdminLogEventActionChangeEmojiStatus#3ea9feb1 prev_value:EmojiStatus new_
 channelAdminLogEventActionChangeEmojiStickerSet#46d840ab prev_stickerset:InputStickerSet new_stickerset:InputStickerSet = ChannelAdminLogEventAction;
 channelAdminLogEventActionToggleSignatureProfiles#60a79c79 new_value:Bool = ChannelAdminLogEventAction;
 channelAdminLogEventActionParticipantSubExtend#64642db3 prev_participant:ChannelParticipant new_participant:ChannelParticipant = ChannelAdminLogEventAction;
+channelAdminLogEventActionToggleAutotranslation#c517f77e new_value:Bool = ChannelAdminLogEventAction;
+channelAdminLogEventActionParticipantEditRank#5806b4ec user_id:long prev_rank:string new_rank:string = ChannelAdminLogEventAction;
 
 channelAdminLogEvent#1fad68cd id:long date:int user_id:long action:ChannelAdminLogEventAction = ChannelAdminLogEvent;
 
 channels.adminLogResults#ed8af74d events:Vector<ChannelAdminLogEvent> chats:Vector<Chat> users:Vector<User> = channels.AdminLogResults;
 
-channelAdminLogEventsFilter#ea107ae4 flags:# join:flags.0?true leave:flags.1?true invite:flags.2?true ban:flags.3?true unban:flags.4?true kick:flags.5?true unkick:flags.6?true promote:flags.7?true demote:flags.8?true info:flags.9?true settings:flags.10?true pinned:flags.11?true edit:flags.12?true delete:flags.13?true group_call:flags.14?true invites:flags.15?true send:flags.16?true forums:flags.17?true sub_extend:flags.18?true = ChannelAdminLogEventsFilter;
+channelAdminLogEventsFilter#ea107ae4 flags:# join:flags.0?true leave:flags.1?true invite:flags.2?true ban:flags.3?true unban:flags.4?true kick:flags.5?true unkick:flags.6?true promote:flags.7?true demote:flags.8?true info:flags.9?true settings:flags.10?true pinned:flags.11?true edit:flags.12?true delete:flags.13?true group_call:flags.14?true invites:flags.15?true send:flags.16?true forums:flags.17?true sub_extend:flags.18?true edit_rank:flags.19?true = ChannelAdminLogEventsFilter;
 
 popularContact#5ce14175 client_id:long importers:int = PopularContact;
 
@@ -1156,11 +1248,11 @@ pageTableRow#e0c0c5e5 cells:Vector<PageTableCell> = PageTableRow;
 
 pageCaption#6f747657 text:RichText credit:RichText = PageCaption;
 
-pageListItemText#b92fb6cd text:RichText = PageListItem;
-pageListItemBlocks#25e073fc blocks:Vector<PageBlock> = PageListItem;
+pageListItemText#2f58683c flags:# checkbox:flags.0?true checked:flags.1?true text:RichText = PageListItem;
+pageListItemBlocks#63ca67aa flags:# checkbox:flags.0?true checked:flags.1?true blocks:Vector<PageBlock> = PageListItem;
 
-pageListOrderedItemText#5e068047 num:string text:RichText = PageListOrderedItem;
-pageListOrderedItemBlocks#98dd8936 num:string blocks:Vector<PageBlock> = PageListOrderedItem;
+pageListOrderedItemText#15031189 flags:# checkbox:flags.0?true checked:flags.1?true num:flags.2?string text:RichText value:flags.3?int type:flags.4?string = PageListOrderedItem;
+pageListOrderedItemBlocks#8ff2d5f0 flags:# checkbox:flags.0?true checked:flags.1?true num:flags.2?string blocks:Vector<PageBlock> value:flags.3?int type:flags.4?string = PageListOrderedItem;
 
 pageRelatedArticle#b390dc08 flags:# url:string webpage_id:long title:flags.0?string description:flags.1?string photo_id:flags.2?long author:flags.3?string published_date:flags.4?int = PageRelatedArticle;
 
@@ -1171,21 +1263,22 @@ help.supportName#8c05f1c9 name:string = help.SupportName;
 help.userInfoEmpty#f3ae2eed = help.UserInfo;
 help.userInfo#1eb3758 message:string entities:Vector<MessageEntity> author:string date:int = help.UserInfo;
 
-pollAnswer#ff16e2ca text:TextWithEntities option:bytes = PollAnswer;
+pollAnswer#4b7d786a flags:# text:TextWithEntities option:bytes media:flags.0?MessageMedia added_by:flags.1?Peer date:flags.1?int = PollAnswer;
+inputPollAnswer#199fed96 flags:# text:TextWithEntities media:flags.0?InputMedia = PollAnswer;
 
-poll#58747131 id:long flags:# closed:flags.0?true public_voters:flags.1?true multiple_choice:flags.2?true quiz:flags.3?true question:TextWithEntities answers:Vector<PollAnswer> close_period:flags.4?int close_date:flags.5?int = Poll;
+poll#966e2dbf id:long flags:# closed:flags.0?true public_voters:flags.1?true multiple_choice:flags.2?true quiz:flags.3?true open_answers:flags.6?true revoting_disabled:flags.7?true shuffle_answers:flags.8?true hide_results_until_close:flags.9?true creator:flags.10?true subscribers_only:flags.11?true question:TextWithEntities answers:Vector<PollAnswer> close_period:flags.4?int close_date:flags.5?int countries_iso2:flags.12?Vector<string> hash:long = Poll;
 
-pollAnswerVoters#3b6ddad2 flags:# chosen:flags.0?true correct:flags.1?true option:bytes voters:int = PollAnswerVoters;
+pollAnswerVoters#3645230a flags:# chosen:flags.0?true correct:flags.1?true option:bytes voters:flags.2?int recent_voters:flags.2?Vector<Peer> = PollAnswerVoters;
 
-pollResults#7adf2420 flags:# min:flags.0?true results:flags.1?Vector<PollAnswerVoters> total_voters:flags.2?int recent_voters:flags.3?Vector<Peer> solution:flags.4?string solution_entities:flags.4?Vector<MessageEntity> = PollResults;
+pollResults#ba7bb15e flags:# min:flags.0?true has_unread_votes:flags.6?true can_view_stats:flags.7?true results:flags.1?Vector<PollAnswerVoters> total_voters:flags.2?int recent_voters:flags.3?Vector<Peer> solution:flags.4?string solution_entities:flags.4?Vector<MessageEntity> solution_media:flags.5?MessageMedia = PollResults;
 
 chatOnlines#f041e250 onlines:int = ChatOnlines;
 
 statsURL#47a971e0 url:string = StatsURL;
 
-chatAdminRights#5fb224d5 flags:# change_info:flags.0?true post_messages:flags.1?true edit_messages:flags.2?true delete_messages:flags.3?true ban_users:flags.4?true invite_users:flags.5?true pin_messages:flags.7?true add_admins:flags.9?true anonymous:flags.10?true manage_call:flags.11?true other:flags.12?true manage_topics:flags.13?true post_stories:flags.14?true edit_stories:flags.15?true delete_stories:flags.16?true = ChatAdminRights;
+chatAdminRights#5fb224d5 flags:# change_info:flags.0?true post_messages:flags.1?true edit_messages:flags.2?true delete_messages:flags.3?true ban_users:flags.4?true invite_users:flags.5?true pin_messages:flags.7?true add_admins:flags.9?true anonymous:flags.10?true manage_call:flags.11?true other:flags.12?true manage_topics:flags.13?true post_stories:flags.14?true edit_stories:flags.15?true delete_stories:flags.16?true manage_direct_messages:flags.17?true manage_ranks:flags.18?true = ChatAdminRights;
 
-chatBannedRights#9f120418 flags:# view_messages:flags.0?true send_messages:flags.1?true send_media:flags.2?true send_stickers:flags.3?true send_gifs:flags.4?true send_games:flags.5?true send_inline:flags.6?true embed_links:flags.7?true send_polls:flags.8?true change_info:flags.10?true invite_users:flags.15?true pin_messages:flags.17?true manage_topics:flags.18?true send_photos:flags.19?true send_videos:flags.20?true send_roundvideos:flags.21?true send_audios:flags.22?true send_voices:flags.23?true send_docs:flags.24?true send_plain:flags.25?true until_date:int = ChatBannedRights;
+chatBannedRights#9f120418 flags:# view_messages:flags.0?true send_messages:flags.1?true send_media:flags.2?true send_stickers:flags.3?true send_gifs:flags.4?true send_games:flags.5?true send_inline:flags.6?true embed_links:flags.7?true send_polls:flags.8?true change_info:flags.10?true invite_users:flags.15?true pin_messages:flags.17?true manage_topics:flags.18?true send_photos:flags.19?true send_videos:flags.20?true send_roundvideos:flags.21?true send_audios:flags.22?true send_voices:flags.23?true send_docs:flags.24?true send_plain:flags.25?true edit_rank:flags.26?true send_reactions:flags.27?true until_date:int = ChatBannedRights;
 
 inputWallPaper#e630b979 id:long access_hash:long = InputWallPaper;
 inputWallPaperSlug#72091c80 slug:string = InputWallPaper;
@@ -1219,8 +1312,8 @@ folderPeer#e9baa668 peer:Peer folder_id:int = FolderPeer;
 
 messages.searchCounter#e844ebff flags:# inexact:flags.1?true filter:MessagesFilter count:int = messages.SearchCounter;
 
-urlAuthResultRequest#92d33a0e flags:# request_write_access:flags.0?true bot:User domain:string = UrlAuthResult;
-urlAuthResultAccepted#8f8c0e4e url:string = UrlAuthResult;
+urlAuthResultRequest#3cd623ec flags:# request_write_access:flags.0?true request_phone_number:flags.1?true match_codes_first:flags.5?true is_app:flags.6?true bot:User domain:string browser:flags.2?string platform:flags.2?string ip:flags.2?string region:flags.2?string match_codes:flags.3?Vector<string> user_id_hint:flags.4?long verified_app_name:flags.7?string = UrlAuthResult;
+urlAuthResultAccepted#623a8fa0 flags:# url:flags.0?string = UrlAuthResult;
 urlAuthResultDefault#a9d6db1f = UrlAuthResult;
 
 channelLocationEmpty#bfb5ad8b = ChannelLocation;
@@ -1260,6 +1353,10 @@ themeSettings#fa58b6d4 flags:# message_colors_animated:flags.2?true base_theme:B
 webPageAttributeTheme#54b56617 flags:# documents:flags.0?Vector<Document> settings:flags.1?ThemeSettings = WebPageAttribute;
 webPageAttributeStory#2e94c3e7 flags:# peer:Peer id:int story:flags.0?StoryItem = WebPageAttribute;
 webPageAttributeStickerSet#50cc03d3 flags:# emojis:flags.0?true text_color:flags.1?true stickers:Vector<Document> = WebPageAttribute;
+webPageAttributeUniqueStarGift#cf6f6db8 gift:StarGift = WebPageAttribute;
+webPageAttributeStarGiftCollection#31cad303 icons:Vector<Document> = WebPageAttribute;
+webPageAttributeStarGiftAuction#1c641c2 gift:StarGift end_date:int = WebPageAttribute;
+webPageAttributeAiComposeTone#7781fe18 emoji_id:long = WebPageAttribute;
 
 messages.votesList#4899484e flags:# count:int votes:Vector<MessagePeerVote> chats:Vector<Chat> users:Vector<User> next_offset:flags.0?string = messages.VotesList;
 
@@ -1267,9 +1364,9 @@ bankCardOpenUrl#f568028a url:string name:string = BankCardOpenUrl;
 
 payments.bankCardData#3e24e573 title:string open_urls:Vector<BankCardOpenUrl> = payments.BankCardData;
 
-dialogFilter#5fb5523b flags:# contacts:flags.0?true non_contacts:flags.1?true groups:flags.2?true broadcasts:flags.3?true bots:flags.4?true exclude_muted:flags.11?true exclude_read:flags.12?true exclude_archived:flags.13?true id:int title:string emoticon:flags.25?string color:flags.27?int pinned_peers:Vector<InputPeer> include_peers:Vector<InputPeer> exclude_peers:Vector<InputPeer> = DialogFilter;
+dialogFilter#aa472651 flags:# contacts:flags.0?true non_contacts:flags.1?true groups:flags.2?true broadcasts:flags.3?true bots:flags.4?true exclude_muted:flags.11?true exclude_read:flags.12?true exclude_archived:flags.13?true title_noanimate:flags.28?true id:int title:TextWithEntities emoticon:flags.25?string color:flags.27?int pinned_peers:Vector<InputPeer> include_peers:Vector<InputPeer> exclude_peers:Vector<InputPeer> = DialogFilter;
 dialogFilterDefault#363293ae = DialogFilter;
-dialogFilterChatlist#9fe28ea4 flags:# has_my_invites:flags.26?true id:int title:string emoticon:flags.25?string color:flags.27?int pinned_peers:Vector<InputPeer> include_peers:Vector<InputPeer> = DialogFilter;
+dialogFilterChatlist#96537bd7 flags:# has_my_invites:flags.26?true title_noanimate:flags.28?true id:int title:TextWithEntities emoticon:flags.25?string color:flags.27?int pinned_peers:Vector<InputPeer> include_peers:Vector<InputPeer> = DialogFilter;
 
 dialogFilterSuggested#77744d4a filter:DialogFilter description:string = DialogFilterSuggested;
 
@@ -1286,7 +1383,7 @@ statsGraph#8ea464b6 flags:# json:DataJSON zoom_token:flags.0?string = StatsGraph
 stats.broadcastStats#396ca5fc period:StatsDateRangeDays followers:StatsAbsValueAndPrev views_per_post:StatsAbsValueAndPrev shares_per_post:StatsAbsValueAndPrev reactions_per_post:StatsAbsValueAndPrev views_per_story:StatsAbsValueAndPrev shares_per_story:StatsAbsValueAndPrev reactions_per_story:StatsAbsValueAndPrev enabled_notifications:StatsPercentValue growth_graph:StatsGraph followers_graph:StatsGraph mute_graph:StatsGraph top_hours_graph:StatsGraph interactions_graph:StatsGraph iv_interactions_graph:StatsGraph views_by_source_graph:StatsGraph new_followers_by_source_graph:StatsGraph languages_graph:StatsGraph reactions_by_emotion_graph:StatsGraph story_interactions_graph:StatsGraph story_reactions_by_emotion_graph:StatsGraph recent_posts_interactions:Vector<PostInteractionCounters> = stats.BroadcastStats;
 
 help.promoDataEmpty#98f6ac75 expires:int = help.PromoData;
-help.promoData#8c39793f flags:# proxy:flags.0?true expires:int peer:Peer chats:Vector<Chat> users:Vector<User> psa_type:flags.1?string psa_message:flags.2?string = help.PromoData;
+help.promoData#8a4d87a flags:# proxy:flags.0?true expires:int peer:flags.3?Peer psa_type:flags.1?string psa_message:flags.2?string pending_suggestions:Vector<string> dismissed_suggestions:Vector<string> custom_pending_suggestion:flags.4?PendingSuggestion chats:Vector<Chat> users:Vector<User> = help.PromoData;
 
 videoSize#de33b094 flags:# type:string w:int h:int size:int video_start_ts:flags.0?double = VideoSize;
 videoSizeEmojiMarkup#f85c413c emoji_id:long background_colors:Vector<int> = VideoSize;
@@ -1300,7 +1397,7 @@ statsGroupTopInviter#535f779d user_id:long invitations:int = StatsGroupTopInvite
 
 stats.megagroupStats#ef7ff916 period:StatsDateRangeDays members:StatsAbsValueAndPrev messages:StatsAbsValueAndPrev viewers:StatsAbsValueAndPrev posters:StatsAbsValueAndPrev growth_graph:StatsGraph members_graph:StatsGraph new_members_by_source_graph:StatsGraph languages_graph:StatsGraph messages_graph:StatsGraph actions_graph:StatsGraph top_hours_graph:StatsGraph weekdays_graph:StatsGraph top_posters:Vector<StatsGroupTopPoster> top_admins:Vector<StatsGroupTopAdmin> top_inviters:Vector<StatsGroupTopInviter> users:Vector<User> = stats.MegagroupStats;
 
-globalPrivacySettings#734c4ccb flags:# archive_and_mute_new_noncontact_peers:flags.0?true keep_archived_unmuted:flags.1?true keep_archived_folders:flags.2?true hide_read_marks:flags.3?true new_noncontact_peers_require_premium:flags.4?true = GlobalPrivacySettings;
+globalPrivacySettings#fe41b34f flags:# archive_and_mute_new_noncontact_peers:flags.0?true keep_archived_unmuted:flags.1?true keep_archived_folders:flags.2?true hide_read_marks:flags.3?true new_noncontact_peers_require_premium:flags.4?true display_gifts_button:flags.7?true noncontact_peers_paid_stars:flags.5?long disallowed_gifts:flags.6?DisallowedGiftsSettings = GlobalPrivacySettings;
 
 help.countryCode#4203c5ef flags:# country_code:string prefixes:flags.0?Vector<string> patterns:flags.1?Vector<string> = help.CountryCode;
 
@@ -1315,7 +1412,7 @@ messages.messageViews#b6c4f543 views:Vector<MessageViews> chats:Vector<Chat> use
 
 messages.discussionMessage#a6341782 flags:# messages:Vector<Message> max_id:flags.0?int read_inbox_max_id:flags.1?int read_outbox_max_id:flags.2?int unread_count:int chats:Vector<Chat> users:Vector<User> = messages.DiscussionMessage;
 
-messageReplyHeader#afbc09db flags:# reply_to_scheduled:flags.2?true forum_topic:flags.3?true quote:flags.9?true reply_to_msg_id:flags.4?int reply_to_peer_id:flags.0?Peer reply_from:flags.5?MessageFwdHeader reply_media:flags.8?MessageMedia reply_to_top_id:flags.1?int quote_text:flags.6?string quote_entities:flags.7?Vector<MessageEntity> quote_offset:flags.10?int = MessageReplyHeader;
+messageReplyHeader#1b97dd66 flags:# reply_to_scheduled:flags.2?true forum_topic:flags.3?true quote:flags.9?true reply_to_ephemeral:flags.13?true reply_to_msg_id:flags.4?int reply_to_peer_id:flags.0?Peer reply_from:flags.5?MessageFwdHeader reply_media:flags.8?MessageMedia reply_to_top_id:flags.1?int quote_text:flags.6?string quote_entities:flags.7?Vector<MessageEntity> quote_offset:flags.10?int todo_item_id:flags.11?int poll_option:flags.12?bytes = MessageReplyHeader;
 messageReplyStoryHeader#e5af939 peer:Peer story_id:int = MessageReplyHeader;
 
 messageReplies#83d60fc2 flags:# comments:flags.0?true replies:int replies_pts:int recent_repliers:flags.1?Vector<Peer> channel_id:flags.0?long max_id:flags.2?int read_max_id:flags.3?int = MessageReplies;
@@ -1325,11 +1422,13 @@ peerBlocked#e8fd8014 peer_id:Peer date:int = PeerBlocked;
 stats.messageStats#7fe91c14 views_graph:StatsGraph reactions_by_emotion_graph:StatsGraph = stats.MessageStats;
 
 groupCallDiscarded#7780bcb4 id:long access_hash:long duration:int = GroupCall;
-groupCall#d597650c flags:# join_muted:flags.1?true can_change_join_muted:flags.2?true join_date_asc:flags.6?true schedule_start_subscribed:flags.8?true can_start_video:flags.9?true record_video_active:flags.11?true rtmp_stream:flags.12?true listeners_hidden:flags.13?true id:long access_hash:long participants_count:int title:flags.3?string stream_dc_id:flags.4?int record_start_date:flags.5?int schedule_date:flags.7?int unmuted_video_count:flags.10?int unmuted_video_limit:int version:int = GroupCall;
+groupCall#efb2b617 flags:# join_muted:flags.1?true can_change_join_muted:flags.2?true join_date_asc:flags.6?true schedule_start_subscribed:flags.8?true can_start_video:flags.9?true record_video_active:flags.11?true rtmp_stream:flags.12?true listeners_hidden:flags.13?true conference:flags.14?true creator:flags.15?true messages_enabled:flags.17?true can_change_messages_enabled:flags.18?true min:flags.19?true id:long access_hash:long participants_count:int title:flags.3?string stream_dc_id:flags.4?int record_start_date:flags.5?int schedule_date:flags.7?int unmuted_video_count:flags.10?int unmuted_video_limit:int version:int invite_link:flags.16?string send_paid_messages_stars:flags.20?long default_send_as:flags.21?Peer = GroupCall;
 
 inputGroupCall#d8aa840f id:long access_hash:long = InputGroupCall;
+inputGroupCallSlug#fe06823f slug:string = InputGroupCall;
+inputGroupCallInviteMessage#8c10603f msg_id:int = InputGroupCall;
 
-groupCallParticipant#eba636fe flags:# muted:flags.0?true left:flags.1?true can_self_unmute:flags.2?true just_joined:flags.4?true versioned:flags.5?true min:flags.8?true muted_by_you:flags.9?true volume_by_admin:flags.10?true self:flags.12?true video_joined:flags.15?true peer:Peer date:int active_date:flags.3?int source:int volume:flags.7?int about:flags.11?string raise_hand_rating:flags.13?long video:flags.6?GroupCallParticipantVideo presentation:flags.14?GroupCallParticipantVideo = GroupCallParticipant;
+groupCallParticipant#2a3dc7ac flags:# muted:flags.0?true left:flags.1?true can_self_unmute:flags.2?true just_joined:flags.4?true versioned:flags.5?true min:flags.8?true muted_by_you:flags.9?true volume_by_admin:flags.10?true self:flags.12?true video_joined:flags.15?true peer:Peer date:int active_date:flags.3?int source:int volume:flags.7?int about:flags.11?string raise_hand_rating:flags.13?long video:flags.6?GroupCallParticipantVideo presentation:flags.14?GroupCallParticipantVideo paid_stars_total:flags.16?long = GroupCallParticipant;
 
 phone.groupCall#9e727aad call:GroupCall participants:Vector<GroupCallParticipant> participants_next_offset:string chats:Vector<Chat> users:Vector<User> = phone.GroupCall;
 
@@ -1385,9 +1484,15 @@ account.resetPasswordFailedWait#e3779861 retry_date:int = account.ResetPasswordR
 account.resetPasswordRequestedWait#e9effc7d until_date:int = account.ResetPasswordResult;
 account.resetPasswordOk#e926d63e = account.ResetPasswordResult;
 
-sponsoredMessage#4d93a990 flags:# recommended:flags.5?true can_report:flags.12?true random_id:bytes url:string title:string message:string entities:flags.1?Vector<MessageEntity> photo:flags.6?Photo media:flags.14?MessageMedia color:flags.13?PeerColor button_text:string sponsor_info:flags.7?string additional_info:flags.8?string = SponsoredMessage;
+chatTheme#c3dffc04 emoticon:string = ChatTheme;
+chatThemeUniqueGift#3458f9c8 gift:StarGift theme_settings:Vector<ThemeSettings> = ChatTheme;
+
+account.chatThemesNotModified#e011e1c4 = account.ChatThemes;
+account.chatThemes#be098173 flags:# hash:long themes:Vector<ChatTheme> chats:Vector<Chat> users:Vector<User> next_offset:flags.0?string = account.ChatThemes;
 
-messages.sponsoredMessages#c9ee1d87 flags:# posts_between:flags.0?int messages:Vector<SponsoredMessage> chats:Vector<Chat> users:Vector<User> = messages.SponsoredMessages;
+sponsoredMessage#7dbf8673 flags:# recommended:flags.5?true can_report:flags.12?true random_id:bytes url:string title:string message:string entities:flags.1?Vector<MessageEntity> photo:flags.6?Photo media:flags.14?MessageMedia color:flags.13?PeerColor button_text:string sponsor_info:flags.7?string additional_info:flags.8?string min_display_duration:flags.15?int max_display_duration:flags.15?int = SponsoredMessage;
+
+messages.sponsoredMessages#ffda656d flags:# posts_between:flags.0?int start_delay:flags.1?int between_delay:flags.2?int messages:Vector<SponsoredMessage> chats:Vector<Chat> users:Vector<User> = messages.SponsoredMessages;
 messages.sponsoredMessagesEmpty#1839490f = messages.SponsoredMessages;
 
 searchResultsCalendarPeriod#c9b0539f date:int min_msg_id:int max_msg_id:int count:int = SearchResultsCalendarPeriod;
@@ -1436,7 +1541,7 @@ attachMenuBots#3c4301c0 hash:long bots:Vector<AttachMenuBot> users:Vector<User>
 
 attachMenuBotsBot#93bf667f bot:AttachMenuBot users:Vector<User> = AttachMenuBotsBot;
 
-webViewResultUrl#4d22ff98 flags:# fullsize:flags.1?true query_id:flags.0?long url:string = WebViewResult;
+webViewResultUrl#4d22ff98 flags:# fullsize:flags.1?true fullscreen:flags.2?true same_origin:flags.3?true query_id:flags.0?long url:string = WebViewResult;
 
 webViewMessageSent#c94511c flags:# msg_id:flags.0?InputBotInlineMessageID = WebViewMessageSent;
 
@@ -1466,7 +1571,16 @@ inputInvoiceSlug#c326caef slug:string = InputInvoice;
 inputInvoicePremiumGiftCode#98986c0d purpose:InputStorePaymentPurpose option:PremiumGiftCodeOption = InputInvoice;
 inputInvoiceStars#65f00ce3 purpose:InputStorePaymentPurpose = InputInvoice;
 inputInvoiceChatInviteSubscription#34e793f1 hash:string = InputInvoice;
-inputInvoiceStarGift#25d8c1d8 flags:# hide_name:flags.0?true user_id:InputUser gift_id:long message:flags.1?TextWithEntities = InputInvoice;
+inputInvoiceStarGift#e8625e92 flags:# hide_name:flags.0?true include_upgrade:flags.2?true peer:InputPeer gift_id:long message:flags.1?TextWithEntities = InputInvoice;
+inputInvoiceStarGiftUpgrade#4d818d5d flags:# keep_original_details:flags.0?true stargift:InputSavedStarGift = InputInvoice;
+inputInvoiceStarGiftTransfer#4a5f5bd9 stargift:InputSavedStarGift to_id:InputPeer = InputInvoice;
+inputInvoicePremiumGiftStars#dabab2ef flags:# user_id:InputUser months:int message:flags.0?TextWithEntities = InputInvoice;
+inputInvoiceBusinessBotTransferStars#f4997e42 bot:InputUser stars:long = InputInvoice;
+inputInvoiceStarGiftResale#c39f5324 flags:# ton:flags.0?true slug:string to_id:InputPeer = InputInvoice;
+inputInvoiceStarGiftPrepaidUpgrade#9a0b48b8 peer:InputPeer hash:string = InputInvoice;
+inputInvoicePremiumAuthCode#3e77f614 purpose:InputStorePaymentPurpose = InputInvoice;
+inputInvoiceStarGiftDropOriginalDetails#923d8d1 stargift:InputSavedStarGift = InputInvoice;
+inputInvoiceStarGiftAuctionBid#1ecafa10 flags:# hide_name:flags.0?true update_bid:flags.2?true peer:flags.3?InputPeer gift_id:long bid_amount:long message:flags.1?TextWithEntities = InputInvoice;
 
 payments.exportedInvoice#aed0cbd9 url:string = payments.ExportedInvoice;
 
@@ -1478,17 +1592,17 @@ inputStorePaymentPremiumSubscription#a6751e66 flags:# restore:flags.0?true upgra
 inputStorePaymentGiftPremium#616f7fe8 user_id:InputUser currency:string amount:long = InputStorePaymentPurpose;
 inputStorePaymentPremiumGiftCode#fb790393 flags:# users:Vector<InputUser> boost_peer:flags.0?InputPeer currency:string amount:long message:flags.1?TextWithEntities = InputStorePaymentPurpose;
 inputStorePaymentPremiumGiveaway#160544ca flags:# only_new_subscribers:flags.0?true winners_are_visible:flags.3?true boost_peer:InputPeer additional_peers:flags.1?Vector<InputPeer> countries_iso2:flags.2?Vector<string> prize_description:flags.4?string random_id:long until_date:int currency:string amount:long = InputStorePaymentPurpose;
-inputStorePaymentStarsTopup#dddd0f56 stars:long currency:string amount:long = InputStorePaymentPurpose;
+inputStorePaymentStarsTopup#f9a2a6cb flags:# stars:long currency:string amount:long spend_purpose_peer:flags.0?InputPeer = InputStorePaymentPurpose;
 inputStorePaymentStarsGift#1d741ef7 user_id:InputUser stars:long currency:string amount:long = InputStorePaymentPurpose;
 inputStorePaymentStarsGiveaway#751f08fa flags:# only_new_subscribers:flags.0?true winners_are_visible:flags.3?true stars:long boost_peer:InputPeer additional_peers:flags.1?Vector<InputPeer> countries_iso2:flags.2?Vector<string> prize_description:flags.4?string random_id:long until_date:int currency:string amount:long users:int = InputStorePaymentPurpose;
-
-premiumGiftOption#74c34319 flags:# months:int currency:string amount:long bot_url:string store_product:flags.0?string = PremiumGiftOption;
+inputStorePaymentAuthCode#3fc18057 flags:# restore:flags.0?true phone_number:string phone_code_hash:string premium_days:int currency:string amount:long = InputStorePaymentPurpose;
 
 paymentFormMethod#88f8f21b url:string title:string = PaymentFormMethod;
 
 emojiStatusEmpty#2de11aae = EmojiStatus;
-emojiStatus#929b619d document_id:long = EmojiStatus;
-emojiStatusUntil#fa30a8c7 document_id:long until:int = EmojiStatus;
+emojiStatus#e7ff068a flags:# document_id:long until:flags.0?int = EmojiStatus;
+emojiStatusCollectible#7184603b flags:# collectible_id:long document_id:long title:string slug:string pattern_document_id:long center_color:int edge_color:int pattern_color:int text_color:int until:flags.0?int = EmojiStatus;
+inputEmojiStatusCollectible#7141dbf flags:# collectible_id:long until:flags.0?int = EmojiStatus;
 
 account.emojiStatusesNotModified#d08ce645 = account.EmojiStatuses;
 account.emojiStatuses#90c467d1 hash:long statuses:Vector<EmojiStatus> = account.EmojiStatuses;
@@ -1528,7 +1642,7 @@ stickerKeyword#fcfeb29c document_id:long keyword:Vector<string> = StickerKeyword
 username#b4073647 flags:# editable:flags.0?true active:flags.1?true username:string = Username;
 
 forumTopicDeleted#23f109b id:int = ForumTopic;
-forumTopic#71701da9 flags:# my:flags.1?true closed:flags.2?true pinned:flags.3?true short:flags.5?true hidden:flags.6?true id:int date:int title:string icon_color:int icon_emoji_id:flags.0?long top_message:int read_inbox_max_id:int read_outbox_max_id:int unread_count:int unread_mentions_count:int unread_reactions_count:int from_id:Peer notify_settings:PeerNotifySettings draft:flags.4?DraftMessage = ForumTopic;
+forumTopic#fcdad815 flags:# my:flags.1?true closed:flags.2?true pinned:flags.3?true short:flags.5?true hidden:flags.6?true title_missing:flags.7?true id:int date:int peer:Peer title:string icon_color:int icon_emoji_id:flags.0?long top_message:int read_inbox_max_id:int read_outbox_max_id:int unread_count:int unread_mentions_count:int unread_reactions_count:int unread_poll_votes_count:int from_id:Peer notify_settings:PeerNotifySettings draft:flags.4?DraftMessage = ForumTopic;
 
 messages.forumTopics#367617d3 flags:# order_by_create_date:flags.0?true count:int topics:Vector<ForumTopic> messages:Vector<Message> chats:Vector<Chat> users:Vector<User> pts:int = messages.ForumTopics;
 
@@ -1539,6 +1653,7 @@ exportedContactToken#41bf109b url:string expires:int = ExportedContactToken;
 requestPeerTypeUser#5f3b8a00 flags:# bot:flags.0?Bool premium:flags.1?Bool = RequestPeerType;
 requestPeerTypeChat#c9f06e1b flags:# creator:flags.0?true bot_participant:flags.5?true has_username:flags.3?Bool forum:flags.4?Bool user_admin_rights:flags.1?ChatAdminRights bot_admin_rights:flags.2?ChatAdminRights = RequestPeerType;
 requestPeerTypeBroadcast#339bef6c flags:# creator:flags.0?true has_username:flags.3?Bool user_admin_rights:flags.1?ChatAdminRights bot_admin_rights:flags.2?ChatAdminRights = RequestPeerType;
+requestPeerTypeCreateBot#3e81e078 flags:# bot_managed:flags.0?true suggested_name:flags.1?string suggested_username:flags.2?string = RequestPeerType;
 
 emojiListNotModified#481eadfa = EmojiList;
 emojiList#7a1e11d1 hash:long document_id:Vector<long> = EmojiList;
@@ -1584,7 +1699,7 @@ chatlists.exportedChatlistInvite#10e6e3a6 filter:DialogFilter invite:ExportedCha
 chatlists.exportedInvites#10ab6dc7 invites:Vector<ExportedChatlistInvite> chats:Vector<Chat> users:Vector<User> = chatlists.ExportedInvites;
 
 chatlists.chatlistInviteAlready#fa87f659 filter_id:int missing_peers:Vector<Peer> already_peers:Vector<Peer> chats:Vector<Chat> users:Vector<User> = chatlists.ChatlistInvite;
-chatlists.chatlistInvite#1dcd839d flags:# title:string emoticon:flags.0?string peers:Vector<Peer> chats:Vector<Chat> users:Vector<User> = chatlists.ChatlistInvite;
+chatlists.chatlistInvite#f10ece2f flags:# title_noanimate:flags.1?true title:TextWithEntities emoticon:flags.0?string peers:Vector<Peer> chats:Vector<Chat> users:Vector<User> = chatlists.ChatlistInvite;
 
 chatlists.chatlistUpdates#93bd878d missing_peers:Vector<Peer> chats:Vector<Chat> users:Vector<User> = chatlists.ChatlistUpdates;
 
@@ -1597,8 +1712,8 @@ messagePeerVoteMultiple#4628f6e6 peer:Peer options:Vector<bytes> date:int = Mess
 storyViews#8d595cd6 flags:# has_viewers:flags.1?true views_count:int forwards_count:flags.2?int reactions:flags.3?Vector<ReactionCount> reactions_count:flags.4?int recent_viewers:flags.0?Vector<long> = StoryViews;
 
 storyItemDeleted#51e6ee4f id:int = StoryItem;
-storyItemSkipped#ffadc913 flags:# close_friends:flags.8?true id:int date:int expire_date:int = StoryItem;
-storyItem#79b26a24 flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true noforwards:flags.10?true edited:flags.11?true contacts:flags.12?true selected_contacts:flags.13?true out:flags.16?true id:int date:int from_id:flags.18?Peer fwd_from:flags.17?StoryFwdHeader expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia media_areas:flags.14?Vector<MediaArea> privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews sent_reaction:flags.15?Reaction = StoryItem;
+storyItemSkipped#ffadc913 flags:# close_friends:flags.8?true live:flags.9?true id:int date:int expire_date:int = StoryItem;
+storyItem#16a4b93c flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true noforwards:flags.10?true edited:flags.11?true contacts:flags.12?true selected_contacts:flags.13?true out:flags.16?true id:int date:int from_id:flags.18?Peer fwd_from:flags.17?StoryFwdHeader expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia media_areas:flags.14?Vector<MediaArea> privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews sent_reaction:flags.15?Reaction albums:flags.19?Vector<int> music:flags.20?Document = StoryItem;
 
 stories.allStoriesNotModified#1158fe3e flags:# state:string stealth_mode:StoriesStealthMode = stories.AllStories;
 stories.allStories#6efc5e81 flags:# has_more:flags.0?true count:int state:string peer_stories:Vector<PeerStories> chats:Vector<Chat> users:Vector<User> stealth_mode:StoriesStealthMode = stories.AllStories;
@@ -1613,8 +1728,9 @@ stories.storyViewsList#59d78fc5 flags:# count:int views_count:int forwards_count
 
 stories.storyViews#de9eed1d views:Vector<StoryViews> users:Vector<User> = stories.StoryViews;
 
-inputReplyToMessage#22c0f6d5 flags:# reply_to_msg_id:int top_msg_id:flags.0?int reply_to_peer_id:flags.1?InputPeer quote_text:flags.2?string quote_entities:flags.3?Vector<MessageEntity> quote_offset:flags.4?int = InputReplyTo;
+inputReplyToMessage#3bd4b7c2 flags:# reply_to_msg_id:int top_msg_id:flags.0?int reply_to_peer_id:flags.1?InputPeer quote_text:flags.2?string quote_entities:flags.3?Vector<MessageEntity> quote_offset:flags.4?int monoforum_peer_id:flags.5?InputPeer todo_item_id:flags.6?int poll_option:flags.7?bytes = InputReplyTo;
 inputReplyToStory#5881323a peer:InputPeer story_id:int = InputReplyTo;
+inputReplyToMonoForum#69d66c45 monoforum_peer_id:InputPeer = InputReplyTo;
 
 exportedStoryLink#3fc9053b link:string = ExportedStoryLink;
 
@@ -1630,6 +1746,7 @@ mediaAreaChannelPost#770416af coordinates:MediaAreaCoordinates channel_id:long m
 inputMediaAreaChannelPost#2271f2bf coordinates:MediaAreaCoordinates channel:InputChannel msg_id:int = MediaArea;
 mediaAreaUrl#37381085 coordinates:MediaAreaCoordinates url:string = MediaArea;
 mediaAreaWeather#49a6549c coordinates:MediaAreaCoordinates emoji:string temperature_c:double color:int = MediaArea;
+mediaAreaStarGift#5787686d coordinates:MediaAreaCoordinates slug:string = MediaArea;
 
 peerStories#9a35e999 flags:# peer:Peer max_read_id:flags.0?int stories:Vector<StoryItem> = PeerStories;
 
@@ -1639,7 +1756,7 @@ messages.webPage#fd5e12bd webpage:WebPage chats:Vector<Chat> users:Vector<User>
 
 premiumGiftCodeOption#257e962b flags:# users:int months:int store_product:flags.0?string store_quantity:flags.1?int currency:string amount:long = PremiumGiftCodeOption;
 
-payments.checkedGiftCode#284a1096 flags:# via_giveaway:flags.2?true from_id:flags.4?Peer giveaway_msg_id:flags.3?int to_id:flags.0?long date:int months:int used_date:flags.1?int chats:Vector<Chat> users:Vector<User> = payments.CheckedGiftCode;
+payments.checkedGiftCode#eb983f8f flags:# via_giveaway:flags.2?true from_id:flags.4?Peer giveaway_msg_id:flags.3?int to_id:flags.0?long date:int days:int used_date:flags.1?int chats:Vector<Chat> users:Vector<User> = payments.CheckedGiftCode;
 
 payments.giveawayInfo#4367daa0 flags:# participating:flags.0?true preparing_results:flags.3?true start_date:int joined_too_early_date:flags.1?int admin_disallowed_chat_id:flags.2?long disallowed_country:flags.4?string = payments.GiveawayInfo;
 payments.giveawayInfoResults#e175e66f flags:# winner:flags.0?true refunded:flags.1?true start_date:int gift_code_slug:flags.3?string stars_prize:flags.4?long finish_date:int winners_count:int activated_count:flags.2?int = payments.GiveawayInfo;
@@ -1670,6 +1787,8 @@ publicForwardStory#edf3add0 peer:Peer story:StoryItem = PublicForward;
 stats.publicForwards#93037e20 flags:# count:int forwards:Vector<PublicForward> next_offset:flags.0?string chats:Vector<Chat> users:Vector<User> = stats.PublicForwards;
 
 peerColor#b54b5acf flags:# color:flags.0?int background_emoji_id:flags.1?long = PeerColor;
+peerColorCollectible#b9c0639a flags:# collectible_id:long gift_emoji_id:long background_emoji_id:long accent_color:int colors:Vector<int> dark_accent_color:flags.0?int dark_colors:flags.1?Vector<int> = PeerColor;
+inputPeerColorCollectible#b8ea86a9 collectible_id:long = PeerColor;
 
 help.peerColorSet#26219a58 colors:Vector<int> = help.PeerColorSet;
 help.peerColorProfileSet#767d61eb palette_colors:Vector<int> bg_colors:Vector<int> story_colors:Vector<int> = help.PeerColorSet;
@@ -1686,6 +1805,7 @@ storyReactionPublicRepost#cfcd0f13 peer_id:Peer story:StoryItem = StoryReaction;
 stories.storyReactionsList#aa5f789c flags:# count:int reactions:Vector<StoryReaction> chats:Vector<Chat> users:Vector<User> next_offset:flags.0?string = stories.StoryReactionsList;
 
 savedDialog#bd87cb6c flags:# pinned:flags.2?true peer:Peer top_message:int = SavedDialog;
+monoForumDialog#64407ea7 flags:# unread_mark:flags.3?true nopaid_messages_exception:flags.4?true peer:Peer top_message:int read_inbox_max_id:int read_outbox_max_id:int unread_count:int unread_reactions_count:int draft:flags.1?DraftMessage = SavedDialog;
 
 messages.savedDialogs#f83ae221 dialogs:Vector<SavedDialog> messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.SavedDialogs;
 messages.savedDialogsSlice#44ba9dd9 count:int dialogs:Vector<SavedDialog> messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.SavedDialogs;
@@ -1739,7 +1859,7 @@ inputQuickReplyShortcutId#1190cf1 shortcut_id:int = InputQuickReplyShortcut;
 messages.quickReplies#c68d6695 quick_replies:Vector<QuickReply> messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.QuickReplies;
 messages.quickRepliesNotModified#5f91eb5b = messages.QuickReplies;
 
-connectedBot#bd068601 flags:# can_reply:flags.0?true bot_id:long recipients:BusinessBotRecipients = ConnectedBot;
+connectedBot#33ed001 flags:# bot_id:long recipients:BusinessBotRecipients rights:BusinessBotRights device:flags.0?string date:flags.1?int location:flags.2?string = ConnectedBot;
 
 account.connectedBots#17d7f87b connected_bots:Vector<ConnectedBot> users:Vector<User> = account.ConnectedBots;
 
@@ -1747,7 +1867,7 @@ messages.dialogFilters#2ad93719 flags:# tags_enabled:flags.0?true filters:Vector
 
 birthday#6c8e1e06 flags:# day:int month:int year:flags.0?int = Birthday;
 
-botBusinessConnection#896433b4 flags:# can_reply:flags.0?true disabled:flags.1?true connection_id:string user_id:long dc_id:int date:int = BotBusinessConnection;
+botBusinessConnection#8f34b2f5 flags:# disabled:flags.1?true connection_id:string user_id:long dc_id:int date:int rights:flags.2?BusinessBotRights = BotBusinessConnection;
 
 inputBusinessIntro#9c469cd flags:# title:string description:string sticker:flags.0?InputDocument = InputBusinessIntro;
 
@@ -1790,22 +1910,10 @@ channels.sponsoredMessageReportResultChooseOption#846f9e42 title:string options:
 channels.sponsoredMessageReportResultAdsHidden#3e3bcf2f = channels.SponsoredMessageReportResult;
 channels.sponsoredMessageReportResultReported#ad798849 = channels.SponsoredMessageReportResult;
 
-stats.broadcastRevenueStats#5407e297 top_hours_graph:StatsGraph revenue_graph:StatsGraph balances:BroadcastRevenueBalances usd_rate:double = stats.BroadcastRevenueStats;
-
-stats.broadcastRevenueWithdrawalUrl#ec659737 url:string = stats.BroadcastRevenueWithdrawalUrl;
-
-broadcastRevenueTransactionProceeds#557e2cc4 amount:long from_date:int to_date:int = BroadcastRevenueTransaction;
-broadcastRevenueTransactionWithdrawal#5a590978 flags:# pending:flags.0?true failed:flags.2?true amount:long date:int provider:string transaction_date:flags.1?int transaction_url:flags.1?string = BroadcastRevenueTransaction;
-broadcastRevenueTransactionRefund#42d30d2e amount:long date:int provider:string = BroadcastRevenueTransaction;
-
-stats.broadcastRevenueTransactions#87158466 count:int transactions:Vector<BroadcastRevenueTransaction> = stats.BroadcastRevenueTransactions;
-
 reactionNotificationsFromContacts#bac3a61a = ReactionNotificationsFrom;
 reactionNotificationsFromAll#4b9e22a0 = ReactionNotificationsFrom;
 
-reactionsNotifySettings#56e34970 flags:# messages_notify_from:flags.0?ReactionNotificationsFrom stories_notify_from:flags.1?ReactionNotificationsFrom sound:NotificationSound show_previews:Bool = ReactionsNotifySettings;
-
-broadcastRevenueBalances#c3ff71e7 flags:# withdrawal_enabled:flags.0?true current_balance:long available_balance:long overall_revenue:long = BroadcastRevenueBalances;
+reactionsNotifySettings#71e4ea58 flags:# messages_notify_from:flags.0?ReactionNotificationsFrom stories_notify_from:flags.1?ReactionNotificationsFrom poll_votes_notify_from:flags.2?ReactionNotificationsFrom sound:NotificationSound show_previews:Bool = ReactionsNotifySettings;
 
 availableEffect#93c3e27e flags:# premium_required:flags.2?true id:long emoticon:string static_icon_id:flags.0?long effect_sticker_id:long effect_animation_id:flags.1?long = AvailableEffect;
 
@@ -1821,12 +1929,13 @@ starsTransactionPeerPremiumBot#250dbaf8 = StarsTransactionPeer;
 starsTransactionPeerFragment#e92fd902 = StarsTransactionPeer;
 starsTransactionPeer#d80da15d peer:Peer = StarsTransactionPeer;
 starsTransactionPeerAds#60682812 = StarsTransactionPeer;
+starsTransactionPeerAPI#f9677aad = StarsTransactionPeer;
 
 starsTopupOption#bd915c0 flags:# extended:flags.1?true stars:long store_product:flags.0?string currency:string amount:long = StarsTopupOption;
 
-starsTransaction#a9ee4c2 flags:# refund:flags.3?true pending:flags.4?true failed:flags.6?true gift:flags.10?true reaction:flags.11?true id:string stars:long date:int peer:StarsTransactionPeer title:flags.0?string description:flags.1?string photo:flags.2?WebDocument transaction_date:flags.5?int transaction_url:flags.5?string bot_payload:flags.7?bytes msg_id:flags.8?int extended_media:flags.9?Vector<MessageMedia> subscription_period:flags.12?int giveaway_post_id:flags.13?int stargift:flags.14?StarGift = StarsTransaction;
+starsTransaction#13659eb0 flags:# refund:flags.3?true pending:flags.4?true failed:flags.6?true gift:flags.10?true reaction:flags.11?true stargift_upgrade:flags.18?true business_transfer:flags.21?true stargift_resale:flags.22?true posts_search:flags.24?true stargift_prepaid_upgrade:flags.25?true stargift_drop_original_details:flags.26?true phonegroup_message:flags.27?true stargift_auction_bid:flags.28?true offer:flags.29?true id:string amount:StarsAmount date:int peer:StarsTransactionPeer title:flags.0?string description:flags.1?string photo:flags.2?WebDocument transaction_date:flags.5?int transaction_url:flags.5?string bot_payload:flags.7?bytes msg_id:flags.8?int extended_media:flags.9?Vector<MessageMedia> subscription_period:flags.12?int giveaway_post_id:flags.13?int stargift:flags.14?StarGift floodskip_number:flags.15?int starref_commission_permille:flags.16?int starref_peer:flags.17?Peer starref_amount:flags.17?StarsAmount paid_messages:flags.19?int premium_gift_months:flags.20?int ads_proceeds_from_date:flags.23?int ads_proceeds_to_date:flags.23?int = StarsTransaction;
 
-payments.starsStatus#bbfa316c flags:# balance:long subscriptions:flags.1?Vector<StarsSubscription> subscriptions_next_offset:flags.2?string subscriptions_missing_balance:flags.4?long history:flags.3?Vector<StarsTransaction> next_offset:flags.0?string chats:Vector<Chat> users:Vector<User> = payments.StarsStatus;
+payments.starsStatus#6c9ce8ed flags:# balance:StarsAmount subscriptions:flags.1?Vector<StarsSubscription> subscriptions_next_offset:flags.2?string subscriptions_missing_balance:flags.4?long history:flags.3?Vector<StarsTransaction> next_offset:flags.0?string chats:Vector<Chat> users:Vector<User> = payments.StarsStatus;
 
 foundStory#e87acbc0 peer:Peer story:StoryItem = FoundStory;
 
@@ -1834,9 +1943,9 @@ stories.foundStories#e2de7737 flags:# count:int stories:Vector<FoundStory> next_
 
 geoPointAddress#de4c5d93 flags:# country_iso2:string state:flags.0?string city:flags.1?string street:flags.2?string = GeoPointAddress;
 
-starsRevenueStatus#79342946 flags:# withdrawal_enabled:flags.0?true current_balance:long available_balance:long overall_revenue:long next_withdrawal_at:flags.1?int = StarsRevenueStatus;
+starsRevenueStatus#febe5491 flags:# withdrawal_enabled:flags.0?true current_balance:StarsAmount available_balance:StarsAmount overall_revenue:StarsAmount next_withdrawal_at:flags.1?int = StarsRevenueStatus;
 
-payments.starsRevenueStats#c92bb73b revenue_graph:StatsGraph status:StarsRevenueStatus usd_rate:double = payments.StarsRevenueStats;
+payments.starsRevenueStats#6c207376 flags:# top_hours_graph:flags.0?StatsGraph revenue_graph:StatsGraph status:StarsRevenueStatus usd_rate:double = payments.StarsRevenueStats;
 
 payments.starsRevenueWithdrawalUrl#1dab80b7 url:string = payments.StarsRevenueWithdrawalUrl;
 
@@ -1854,7 +1963,7 @@ bots.previewInfo#ca71d64 media:Vector<BotPreviewMedia> lang_codes:Vector<string>
 
 starsSubscriptionPricing#5416d58 period:int amount:long = StarsSubscriptionPricing;
 
-starsSubscription#538ecf18 flags:# canceled:flags.0?true can_refulfill:flags.1?true missing_balance:flags.2?true id:string peer:Peer until_date:int pricing:StarsSubscriptionPricing chat_invite_hash:flags.3?string = StarsSubscription;
+starsSubscription#2e6eab1a flags:# canceled:flags.0?true can_refulfill:flags.1?true missing_balance:flags.2?true bot_canceled:flags.7?true id:string peer:Peer until_date:int pricing:StarsSubscriptionPricing chat_invite_hash:flags.3?string title:flags.4?string photo:flags.5?WebDocument invoice_slug:flags.6?string = StarsSubscription;
 
 messageReactor#4ba3a95a flags:# top:flags.0?true my:flags.1?true anonymous:flags.2?true peer_id:flags.3?Peer count:int = MessageReactor;
 
@@ -1862,14 +1971,11 @@ starsGiveawayOption#94ce852a flags:# extended:flags.0?true default:flags.1?true
 
 starsGiveawayWinnersOption#54236209 flags:# default:flags.0?true users:int per_user_stars:long = StarsGiveawayWinnersOption;
 
-starGift#aea174ee flags:# limited:flags.0?true id:long sticker:Document stars:long availability_remains:flags.0?int availability_total:flags.0?int convert_stars:long = StarGift;
+starGift#313a9547 flags:# limited:flags.0?true sold_out:flags.1?true birthday:flags.2?true require_premium:flags.7?true limited_per_user:flags.8?true peer_color_available:flags.10?true auction:flags.11?true id:long sticker:Document stars:long availability_remains:flags.0?int availability_total:flags.0?int availability_resale:flags.4?long convert_stars:long first_sale_date:flags.1?int last_sale_date:flags.1?int upgrade_stars:flags.3?long resell_min_stars:flags.4?long title:flags.5?string released_by:flags.6?Peer per_user_total:flags.8?int per_user_remains:flags.8?int locked_until_date:flags.9?int auction_slug:flags.11?string gifts_per_round:flags.11?int auction_start_date:flags.11?int upgrade_variants:flags.12?int background:flags.13?StarGiftBackground = StarGift;
+starGiftUnique#85f0a9cd flags:# require_premium:flags.6?true resale_ton_only:flags.7?true theme_available:flags.9?true burned:flags.14?true crafted:flags.15?true id:long gift_id:long title:string slug:string num:int owner_id:flags.0?Peer owner_name:flags.1?string owner_address:flags.2?string attributes:Vector<StarGiftAttribute> availability_issued:int availability_total:int gift_address:flags.3?string resell_amount:flags.4?Vector<StarsAmount> released_by:flags.5?Peer value_amount:flags.8?long value_currency:flags.8?string value_usd_amount:flags.8?long theme_peer:flags.10?Peer peer_color:flags.11?PeerColor host_id:flags.12?Peer offer_min_stars:flags.13?int craft_chance_permille:flags.16?int = StarGift;
 
 payments.starGiftsNotModified#a388a368 = payments.StarGifts;
-payments.starGifts#901689ea hash:int gifts:Vector<StarGift> = payments.StarGifts;
-
-userStarGift#eea49a6e flags:# name_hidden:flags.0?true unsaved:flags.5?true from_id:flags.1?long date:int gift:StarGift message:flags.2?TextWithEntities msg_id:flags.3?int convert_stars:flags.4?long = UserStarGift;
-
-payments.userStarGifts#6b65b517 flags:# count:int gifts:Vector<UserStarGift> next_offset:flags.0?string users:Vector<User> = payments.UserStarGifts;
+payments.starGifts#2ed82995 hash:int gifts:Vector<StarGift> chats:Vector<Chat> users:Vector<User> = payments.StarGifts;
 
 messageReportOption#7903e3d9 text:string option:bytes = MessageReportOption;
 
@@ -1877,6 +1983,243 @@ reportResultChooseOption#f0e4e0b6 title:string options:Vector<MessageReportOptio
 reportResultAddComment#6f09ac31 flags:# optional:flags.0?true option:bytes = ReportResult;
 reportResultReported#8db33c4b = ReportResult;
 
+messages.botPreparedInlineMessage#8ecf0511 id:string expire_date:int = messages.BotPreparedInlineMessage;
+
+messages.preparedInlineMessage#ff57708d query_id:long result:BotInlineResult peer_types:Vector<InlineQueryPeerType> cache_time:int users:Vector<User> = messages.PreparedInlineMessage;
+
+botAppSettings#c99b1950 flags:# placeholder_path:flags.0?bytes background_color:flags.1?int background_dark_color:flags.2?int header_color:flags.3?int header_dark_color:flags.4?int = BotAppSettings;
+
+starRefProgram#dd0c66f2 flags:# bot_id:long commission_permille:int duration_months:flags.0?int end_date:flags.1?int daily_revenue_per_user:flags.2?StarsAmount = StarRefProgram;
+
+connectedBotStarRef#19a13f71 flags:# revoked:flags.1?true url:string date:int bot_id:long commission_permille:int duration_months:flags.0?int participants:long revenue:long = ConnectedBotStarRef;
+
+payments.connectedStarRefBots#98d5ea1d count:int connected_bots:Vector<ConnectedBotStarRef> users:Vector<User> = payments.ConnectedStarRefBots;
+
+payments.suggestedStarRefBots#b4d5d859 flags:# count:int suggested_bots:Vector<StarRefProgram> users:Vector<User> next_offset:flags.0?string = payments.SuggestedStarRefBots;
+
+starsAmount#bbb6b4a3 amount:long nanos:int = StarsAmount;
+starsTonAmount#74aee3e0 amount:long = StarsAmount;
+
+messages.foundStickersNotModified#6010c534 flags:# next_offset:flags.0?int = messages.FoundStickers;
+messages.foundStickers#82c9e290 flags:# next_offset:flags.0?int hash:long stickers:Vector<Document> = messages.FoundStickers;
+
+botVerifierSettings#b0cd6617 flags:# can_modify_custom_description:flags.1?true icon:long company:string custom_description:flags.0?string = BotVerifierSettings;
+
+botVerification#f93cd45c bot_id:long icon:long description:string = BotVerification;
+
+starGiftAttributeModel#565251e2 flags:# crafted:flags.0?true name:string document:Document rarity:StarGiftAttributeRarity = StarGiftAttribute;
+starGiftAttributePattern#4e7085ea name:string document:Document rarity:StarGiftAttributeRarity = StarGiftAttribute;
+starGiftAttributeBackdrop#9f2504e4 name:string backdrop_id:int center_color:int edge_color:int pattern_color:int text_color:int rarity:StarGiftAttributeRarity = StarGiftAttribute;
+starGiftAttributeOriginalDetails#e0bff26c flags:# sender_id:flags.0?Peer recipient_id:Peer date:int message:flags.1?TextWithEntities = StarGiftAttribute;
+
+payments.starGiftUpgradePreview#3de1dfed sample_attributes:Vector<StarGiftAttribute> prices:Vector<StarGiftUpgradePrice> next_prices:Vector<StarGiftUpgradePrice> = payments.StarGiftUpgradePreview;
+
+users.users#62d706b8 users:Vector<User> = users.Users;
+users.usersSlice#315a4974 count:int users:Vector<User> = users.Users;
+
+payments.uniqueStarGift#416c56e8 gift:StarGift chats:Vector<Chat> users:Vector<User> = payments.UniqueStarGift;
+
+messages.webPagePreview#8c9a88ac media:MessageMedia chats:Vector<Chat> users:Vector<User> = messages.WebPagePreview;
+
+savedStarGift#41df43fc flags:# name_hidden:flags.0?true unsaved:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true pinned_to_top:flags.12?true upgrade_separate:flags.17?true from_id:flags.1?Peer date:int gift:StarGift message:flags.2?TextWithEntities msg_id:flags.3?int saved_id:flags.11?long convert_stars:flags.4?long upgrade_stars:flags.6?long can_export_at:flags.7?int transfer_stars:flags.8?long can_transfer_at:flags.13?int can_resell_at:flags.14?int collection_id:flags.15?Vector<int> prepaid_upgrade_hash:flags.16?string drop_original_details_stars:flags.18?long gift_num:flags.19?int can_craft_at:flags.20?int = SavedStarGift;
+
+payments.savedStarGifts#95f389b1 flags:# count:int chat_notifications_enabled:flags.1?Bool gifts:Vector<SavedStarGift> next_offset:flags.0?string chats:Vector<Chat> users:Vector<User> = payments.SavedStarGifts;
+
+inputSavedStarGiftUser#69279795 msg_id:int = InputSavedStarGift;
+inputSavedStarGiftChat#f101aa7f peer:InputPeer saved_id:long = InputSavedStarGift;
+inputSavedStarGiftSlug#2085c238 slug:string = InputSavedStarGift;
+
+payments.starGiftWithdrawalUrl#84aa3a9c url:string = payments.StarGiftWithdrawalUrl;
+
+paidReactionPrivacyDefault#206ad49e = PaidReactionPrivacy;
+paidReactionPrivacyAnonymous#1f0c1ad9 = PaidReactionPrivacy;
+paidReactionPrivacyPeer#dc6cfcf0 peer:InputPeer = PaidReactionPrivacy;
+
+account.paidMessagesRevenue#1e109708 stars_amount:long = account.PaidMessagesRevenue;
+
+requirementToContactEmpty#50a9839 = RequirementToContact;
+requirementToContactPremium#e581e4e9 = RequirementToContact;
+requirementToContactPaidMessages#b4f67e93 stars_amount:long = RequirementToContact;
+
+businessBotRights#a0624cf7 flags:# reply:flags.0?true read_messages:flags.1?true delete_sent_messages:flags.2?true delete_received_messages:flags.3?true edit_name:flags.4?true edit_bio:flags.5?true edit_profile_photo:flags.6?true edit_username:flags.7?true view_gifts:flags.8?true sell_gifts:flags.9?true change_gift_settings:flags.10?true transfer_and_upgrade_gifts:flags.11?true transfer_stars:flags.12?true manage_stories:flags.13?true = BusinessBotRights;
+
+disallowedGiftsSettings#71f276c4 flags:# disallow_unlimited_stargifts:flags.0?true disallow_limited_stargifts:flags.1?true disallow_unique_stargifts:flags.2?true disallow_premium_gifts:flags.3?true disallow_stargifts_from_channels:flags.4?true = DisallowedGiftsSettings;
+
+sponsoredPeer#c69708d3 flags:# random_id:bytes peer:Peer sponsor_info:flags.0?string additional_info:flags.1?string = SponsoredPeer;
+
+contacts.sponsoredPeersEmpty#ea32b4b1 = contacts.SponsoredPeers;
+contacts.sponsoredPeers#eb032884 peers:Vector<SponsoredPeer> chats:Vector<Chat> users:Vector<User> = contacts.SponsoredPeers;
+
+starGiftAttributeIdModel#48aaae3c document_id:long = StarGiftAttributeId;
+starGiftAttributeIdPattern#4a162433 document_id:long = StarGiftAttributeId;
+starGiftAttributeIdBackdrop#1f01c757 backdrop_id:int = StarGiftAttributeId;
+
+starGiftAttributeCounter#2eb1b658 attribute:StarGiftAttributeId count:int = StarGiftAttributeCounter;
+
+payments.resaleStarGifts#947a12df flags:# count:int gifts:Vector<StarGift> next_offset:flags.0?string attributes:flags.1?Vector<StarGiftAttribute> attributes_hash:flags.1?long chats:Vector<Chat> counters:flags.2?Vector<StarGiftAttributeCounter> users:Vector<User> = payments.ResaleStarGifts;
+
+stories.canSendStoryCount#c387c04e count_remains:int = stories.CanSendStoryCount;
+
+pendingSuggestion#e7e82e12 suggestion:string title:TextWithEntities description:TextWithEntities url:string = PendingSuggestion;
+
+todoItem#cba9a52f id:int title:TextWithEntities = TodoItem;
+
+todoList#49b92a26 flags:# others_can_append:flags.0?true others_can_complete:flags.1?true title:TextWithEntities list:Vector<TodoItem> = TodoList;
+
+todoCompletion#221bb5e4 id:int completed_by:Peer date:int = TodoCompletion;
+
+suggestedPost#e8e37e5 flags:# accepted:flags.1?true rejected:flags.2?true price:flags.3?StarsAmount schedule_date:flags.0?int = SuggestedPost;
+
+starsRating#1b0e4f07 flags:# level:int current_level_stars:long stars:long next_level_stars:flags.0?long = StarsRating;
+
+starGiftCollection#9d6b13b0 flags:# collection_id:int title:string icon:flags.0?Document gifts_count:int hash:long = StarGiftCollection;
+
+payments.starGiftCollectionsNotModified#a0ba4f17 = payments.StarGiftCollections;
+payments.starGiftCollections#8a2932f3 collections:Vector<StarGiftCollection> = payments.StarGiftCollections;
+
+storyAlbum#9325705a flags:# album_id:int title:string icon_photo:flags.0?Photo icon_video:flags.1?Document = StoryAlbum;
+
+stories.albumsNotModified#564edaeb = stories.Albums;
+stories.albums#c3987a3a hash:long albums:Vector<StoryAlbum> = stories.Albums;
+
+searchPostsFlood#3e0b5b6a flags:# query_is_free:flags.0?true total_daily:int remains:int wait_till:flags.1?int stars_amount:long = SearchPostsFlood;
+
+payments.uniqueStarGiftValueInfo#512fe446 flags:# last_sale_on_fragment:flags.1?true value_is_average:flags.6?true currency:string value:long initial_sale_date:int initial_sale_stars:long initial_sale_price:long last_sale_date:flags.0?int last_sale_price:flags.0?long floor_price:flags.2?long average_price:flags.3?long listed_count:flags.4?int fragment_listed_count:flags.5?int fragment_listed_url:flags.5?string = payments.UniqueStarGiftValueInfo;
+
+profileTabPosts#b98cd696 = ProfileTab;
+profileTabGifts#4d4bd46a = ProfileTab;
+profileTabMedia#72c64955 = ProfileTab;
+profileTabFiles#ab339c00 = ProfileTab;
+profileTabMusic#9f27d26e = ProfileTab;
+profileTabVoice#e477092e = ProfileTab;
+profileTabLinks#d3656499 = ProfileTab;
+profileTabGifs#a2c0f695 = ProfileTab;
+
+users.savedMusicNotModified#e3878aa4 count:int = users.SavedMusic;
+users.savedMusic#34a2f297 count:int documents:Vector<Document> = users.SavedMusic;
+
+account.savedMusicIdsNotModified#4fc81d6e = account.SavedMusicIds;
+account.savedMusicIds#998d6636 ids:Vector<long> = account.SavedMusicIds;
+
+payments.checkCanSendGiftResultOk#374fa7ad = payments.CheckCanSendGiftResult;
+payments.checkCanSendGiftResultFail#d5e58274 reason:TextWithEntities = payments.CheckCanSendGiftResult;
+
+inputChatThemeEmpty#83268483 = InputChatTheme;
+inputChatTheme#c93de95c emoticon:string = InputChatTheme;
+inputChatThemeUniqueGift#87e5dfe4 slug:string = InputChatTheme;
+
+starGiftUpgradePrice#99ea331d date:int upgrade_stars:long = StarGiftUpgradePrice;
+
+groupCallMessage#1a8afc7e flags:# from_admin:flags.1?true id:int from_id:Peer date:int message:TextWithEntities paid_message_stars:flags.0?long = GroupCallMessage;
+
+groupCallDonor#ee430c85 flags:# top:flags.0?true my:flags.1?true peer_id:flags.3?Peer stars:long = GroupCallDonor;
+
+phone.groupCallStars#9d1dbd26 total_stars:long top_donors:Vector<GroupCallDonor> chats:Vector<Chat> users:Vector<User> = phone.GroupCallStars;
+
+recentStory#711d692d flags:# live:flags.0?true max_id:flags.1?int = RecentStory;
+
+auctionBidLevel#310240cc pos:int amount:long date:int = AuctionBidLevel;
+
+starGiftAuctionStateNotModified#fe333952 = StarGiftAuctionState;
+starGiftAuctionState#771a4e66 version:int start_date:int end_date:int min_bid_amount:long bid_levels:Vector<AuctionBidLevel> top_bidders:Vector<long> next_round_at:int last_gift_num:int gifts_left:int current_round:int total_rounds:int rounds:Vector<StarGiftAuctionRound> = StarGiftAuctionState;
+starGiftAuctionStateFinished#972dabbf flags:# start_date:int end_date:int average_price:long listed_count:flags.0?int fragment_listed_count:flags.1?int fragment_listed_url:flags.1?string = StarGiftAuctionState;
+
+starGiftAuctionUserState#2eeed1c4 flags:# returned:flags.1?true bid_amount:flags.0?long bid_date:flags.0?int min_bid_amount:flags.0?long bid_peer:flags.0?Peer acquired_count:int = StarGiftAuctionUserState;
+
+payments.starGiftAuctionState#6b39f4ec gift:StarGift state:StarGiftAuctionState user_state:StarGiftAuctionUserState timeout:int users:Vector<User> chats:Vector<Chat> = payments.StarGiftAuctionState;
+
+starGiftAuctionAcquiredGift#42b00348 flags:# name_hidden:flags.0?true peer:Peer date:int bid_amount:long round:int pos:int message:flags.1?TextWithEntities gift_num:flags.2?int = StarGiftAuctionAcquiredGift;
+
+payments.starGiftAuctionAcquiredGifts#7d5bd1f0 gifts:Vector<StarGiftAuctionAcquiredGift> users:Vector<User> chats:Vector<Chat> = payments.StarGiftAuctionAcquiredGifts;
+
+starGiftActiveAuctionState#d31bc45d gift:StarGift state:StarGiftAuctionState user_state:StarGiftAuctionUserState = StarGiftActiveAuctionState;
+
+payments.starGiftActiveAuctionsNotModified#db33dad0 = payments.StarGiftActiveAuctions;
+payments.starGiftActiveAuctions#aef6abbc auctions:Vector<StarGiftActiveAuctionState> users:Vector<User> chats:Vector<Chat> = payments.StarGiftActiveAuctions;
+
+inputStarGiftAuction#2e16c98 gift_id:long = InputStarGiftAuction;
+inputStarGiftAuctionSlug#7ab58308 slug:string = InputStarGiftAuction;
+
+passkey#98613ebf flags:# id:string name:string date:int software_emoji_id:flags.0?long last_usage_date:flags.1?int = Passkey;
+
+account.passkeys#f8e0aa1c passkeys:Vector<Passkey> = account.Passkeys;
+
+account.passkeyRegistrationOptions#e16b5ce1 options:DataJSON = account.PasskeyRegistrationOptions;
+
+auth.passkeyLoginOptions#e2037789 options:DataJSON = auth.PasskeyLoginOptions;
+
+inputPasskeyResponseRegister#3e63935c client_data:DataJSON attestation_data:bytes = InputPasskeyResponse;
+inputPasskeyResponseLogin#c31fc14a client_data:DataJSON authenticator_data:bytes signature:bytes user_handle:string = InputPasskeyResponse;
+
+inputPasskeyCredentialPublicKey#3c27b78f id:string raw_id:string response:InputPasskeyResponse = InputPasskeyCredential;
+inputPasskeyCredentialFirebasePNV#5b1ccb28 pnv_token:string = InputPasskeyCredential;
+
+starGiftBackground#aff56398 center_color:int edge_color:int text_color:int = StarGiftBackground;
+
+starGiftAuctionRound#3aae0528 num:int duration:int = StarGiftAuctionRound;
+starGiftAuctionRoundExtendable#aa021e5 num:int duration:int extend_top:int extend_window:int = StarGiftAuctionRound;
+
+payments.starGiftUpgradeAttributes#46c6e36f attributes:Vector<StarGiftAttribute> = payments.StarGiftUpgradeAttributes;
+
+messages.emojiGameOutcome#da2ad647 seed:bytes stake_ton_amount:long ton_amount:long = messages.EmojiGameOutcome;
+
+messages.emojiGameUnavailable#59e65335 = messages.EmojiGameInfo;
+messages.emojiGameDiceInfo#44e56023 flags:# game_hash:string prev_stake:long current_streak:int params:Vector<int> plays_left:flags.0?int = messages.EmojiGameInfo;
+
+starGiftAttributeRarity#36437737 permille:int = StarGiftAttributeRarity;
+starGiftAttributeRarityUncommon#dbce6389 = StarGiftAttributeRarity;
+starGiftAttributeRarityRare#f08d516b = StarGiftAttributeRarity;
+starGiftAttributeRarityEpic#78fbf3a8 = StarGiftAttributeRarity;
+starGiftAttributeRarityLegendary#cef7e7a8 = StarGiftAttributeRarity;
+
+keyboardButtonStyle#4fdd3430 flags:# bg_primary:flags.0?true bg_danger:flags.1?true bg_success:flags.2?true icon:flags.3?long = KeyboardButtonStyle;
+
+inputMessageReadMetric#402b4495 msg_id:int view_id:long time_in_view_ms:int active_time_in_view_ms:int height_to_viewport_ratio_permille:int seen_range_ratio_permille:int = InputMessageReadMetric;
+
+bots.exportedBotToken#3c60b621 token:string = bots.ExportedBotToken;
+
+bots.requestedButton#f13bbcd7 webapp_req_id:string = bots.RequestedButton;
+
+messages.composedMessageWithAI#90d7adfa flags:# result_text:TextWithEntities diff_text:flags.0?TextWithEntities = messages.ComposedMessageWithAI;
+
+stats.pollStats#2999beed votes_graph:StatsGraph = stats.PollStats;
+
+inputAiComposeToneDefault#1fe9a9bf tone:string = InputAiComposeTone;
+inputAiComposeToneID#773c080 id:long access_hash:long = InputAiComposeTone;
+inputAiComposeToneSlug#1fa01357 slug:string = InputAiComposeTone;
+
+aiComposeTone#cff63ea9 flags:# creator:flags.0?true id:long access_hash:long slug:string title:string emoji_id:flags.1?long prompt:flags.4?string installs_count:flags.2?int author_id:flags.3?long example_english:flags.5?AiComposeToneExample = AiComposeTone;
+aiComposeToneDefault#9bad6414 tone:string emoji_id:long title:string = AiComposeTone;
+
+aicompose.tonesNotModified#c1f46103 = aicompose.Tones;
+aicompose.tones#6c9d0efe hash:long tones:Vector<AiComposeTone> users:Vector<User> = aicompose.Tones;
+
+aiComposeToneExample#f1d628ec from:TextWithEntities to:TextWithEntities = AiComposeToneExample;
+
+bots.accessSettings#dd1fbf93 flags:# restricted:flags.0?true add_users:flags.1?Vector<User> = bots.AccessSettings;
+
+messages.chatInviteJoinResultOk#445663a7 updates:Updates = messages.ChatInviteJoinResult;
+messages.chatInviteJoinResultWebView#2f51c337 bot_id:long webview:WebViewResult users:Vector<User> = messages.ChatInviteJoinResult;
+
+joinChatBotResultApproved#ae152a69 = JoinChatBotResult;
+joinChatBotResultDeclined#efa0194 = JoinChatBotResult;
+joinChatBotResultQueued#98a3a840 = JoinChatBotResult;
+joinChatBotResultWebView#d6e3b813 url:string = JoinChatBotResult;
+
+webDomainException#933ca597 flags:# domain:string url:string title:string favicon:flags.0?long = WebDomainException;
+
+account.webBrowserSettingsNotModified#c31c8f4e = account.WebBrowserSettings;
+account.webBrowserSettings#79eb8cb3 flags:# open_external_browser:flags.0?true display_close_button:flags.1?true external_exceptions:Vector<WebDomainException> inapp_exceptions:Vector<WebDomainException> hash:long = account.WebBrowserSettings;
+
+inputRichFilePhoto#9b00622b id:string photo:InputPhoto = InputRichFile;
+inputRichFileDocument#83281dbd id:string document:InputDocument = InputRichFile;
+
+inputRichMessage#e4c449fc flags:# rtl:flags.0?true noautolink:flags.1?true blocks:Vector<PageBlock> photos:flags.2?Vector<InputPhoto> documents:flags.3?Vector<InputDocument> users:flags.4?Vector<InputUser> = InputRichMessage;
+inputRichMessageHTML#dacb836a flags:# rtl:flags.0?true noautolink:flags.1?true html:string files:flags.2?Vector<InputRichFile> = InputRichMessage;
+inputRichMessageMarkdown#4b572c flags:# rtl:flags.0?true noautolink:flags.1?true markdown:string files:flags.2?Vector<InputRichFile> = InputRichMessage;
+
+richMessage#baf39d8b flags:# rtl:flags.0?true part:flags.1?true blocks:Vector<PageBlock> photos:Vector<Photo> documents:Vector<Document> = RichMessage;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1889,6 +2232,7 @@ invokeWithTakeout#aca9fd2e {X:Type} takeout_id:long query:!X = X;
 invokeWithBusinessConnection#dd289f8e {X:Type} connection_id:string query:!X = X;
 invokeWithGooglePlayIntegrity#1df92984 {X:Type} nonce:string token:string query:!X = X;
 invokeWithApnsSecret#0dae54f8 {X:Type} nonce:string secret:string query:!X = X;
+invokeWithReCaptcha#adbb0f94 {X:Type} token:string query:!X = X;
 
 auth.sendCode#a677244f phone_number:string api_id:int api_hash:string settings:CodeSettings = auth.SentCode;
 auth.signUp#aac7b717 flags:# no_joined_notifications:flags.0?true phone_number:string phone_code_hash:string first_name:string last_name:string = auth.Authorization;
@@ -1913,6 +2257,9 @@ auth.importWebTokenAuthorization#2db873a9 api_id:int api_hash:string web_auth_to
 auth.requestFirebaseSms#8e39261e flags:# phone_number:string phone_code_hash:string safety_net_token:flags.0?string play_integrity_token:flags.2?string ios_push_secret:flags.1?string = Bool;
 auth.resetLoginEmail#7e960193 phone_number:string phone_code_hash:string = auth.SentCode;
 auth.reportMissingCode#cb9deff6 phone_number:string phone_code_hash:string mnc:string = Bool;
+auth.checkPaidAuth#56e59f9c phone_number:string phone_code_hash:string form_id:long = auth.SentCode;
+auth.initPasskeyLogin#518ad0b7 api_id:int api_hash:string = auth.PasskeyLoginOptions;
+auth.finishPasskeyLogin#9857ad07 flags:# credential:InputPasskeyCredential from_dc_id:flags.0?int from_auth_key_id:flags.0?long = auth.Authorization;
 
 account.registerDevice#ec86017a flags:# no_muted:flags.0?true token_type:int token:string app_sandbox:Bool secret:bytes other_uids:Vector<long> = Bool;
 account.unregisterDevice#6a0d3206 token_type:int token:string other_uids:Vector<long> = Bool;
@@ -2002,7 +2349,7 @@ account.getAutoSaveSettings#adcbbcda = account.AutoSaveSettings;
 account.saveAutoSaveSettings#d69b8361 flags:# users:flags.0?true chats:flags.1?true broadcasts:flags.2?true peer:flags.3?InputPeer settings:AutoSaveSettings = Bool;
 account.deleteAutoSaveExceptions#53bc0020 = Bool;
 account.invalidateSignInCodes#ca8ae8ba codes:Vector<string> = Bool;
-account.updateColor#7cefa15d flags:# for_profile:flags.1?true color:flags.2?int background_emoji_id:flags.0?long = Bool;
+account.updateColor#684d214e flags:# for_profile:flags.1?true color:flags.2?PeerColor = Bool;
 account.getDefaultBackgroundEmojis#a60ab9ce hash:long = EmojiList;
 account.getChannelDefaultEmojiStatuses#7727a7d5 hash:long = account.EmojiStatuses;
 account.getChannelRestrictedStatusEmojis#35a9e0d5 hash:long = EmojiList;
@@ -2010,7 +2357,7 @@ account.updateBusinessWorkHours#4b00e066 flags:# business_work_hours:flags.0?Bus
 account.updateBusinessLocation#9e6b131a flags:# geo_point:flags.1?InputGeoPoint address:flags.0?string = Bool;
 account.updateBusinessGreetingMessage#66cdafc4 flags:# message:flags.0?InputBusinessGreetingMessage = Bool;
 account.updateBusinessAwayMessage#a26a7fa5 flags:# message:flags.0?InputBusinessAwayMessage = Bool;
-account.updateConnectedBot#43d8521d flags:# can_reply:flags.0?true deleted:flags.1?true bot:InputUser recipients:InputBusinessBotRecipients = Updates;
+account.updateConnectedBot#66a08c7e flags:# deleted:flags.1?true rights:flags.0?BusinessBotRights bot:InputUser recipients:InputBusinessBotRecipients = Updates;
 account.getConnectedBots#4ea4c80f = account.ConnectedBots;
 account.getBotBusinessConnection#76a86270 connection_id:string = Updates;
 account.updateBusinessIntro#a614d034 flags:# intro:flags.0?InputBusinessIntro = Bool;
@@ -2026,11 +2373,30 @@ account.updatePersonalChannel#d94305e0 channel:InputChannel = Bool;
 account.toggleSponsoredMessages#b9d9a38d enabled:Bool = Bool;
 account.getReactionsNotifySettings#6dd654c = ReactionsNotifySettings;
 account.setReactionsNotifySettings#316ce548 settings:ReactionsNotifySettings = ReactionsNotifySettings;
+account.getCollectibleEmojiStatuses#2e7b4543 hash:long = account.EmojiStatuses;
+account.getPaidMessagesRevenue#19ba4a67 flags:# parent_peer:flags.0?InputPeer user_id:InputUser = account.PaidMessagesRevenue;
+account.toggleNoPaidMessagesException#fe2eda76 flags:# refund_charged:flags.0?true require_payment:flags.2?true parent_peer:flags.1?InputPeer user_id:InputUser = Bool;
+account.setMainProfileTab#5dee78b0 tab:ProfileTab = Bool;
+account.saveMusic#b26732a9 flags:# unsave:flags.0?true id:InputDocument after_id:flags.1?InputDocument = Bool;
+account.getSavedMusicIds#e09d5faf hash:long = account.SavedMusicIds;
+account.getUniqueGiftChatThemes#e42ce9c9 offset:string limit:int hash:long = account.ChatThemes;
+account.initPasskeyRegistration#429547e8 = account.PasskeyRegistrationOptions;
+account.registerPasskey#55b41fd6 credential:InputPasskeyCredential = Passkey;
+account.getPasskeys#ea1f0c52 = account.Passkeys;
+account.deletePasskey#f5b5563f id:string = Bool;
+account.confirmBotConnection#67ed1f68 bot_id:InputUser = Bool;
+account.getWebBrowserSettings#56655768 hash:long = account.WebBrowserSettings;
+account.updateWebBrowserSettings#9adf82fe flags:# open_external_browser:flags.0?true display_close_button:flags.1?true = account.WebBrowserSettings;
+account.toggleWebBrowserSettingsException#60ed4229 flags:# delete:flags.1?true open_external_browser:flags.0?Bool url:string = Updates;
+account.deleteWebBrowserSettingsExceptions#86a0765d = account.WebBrowserSettings;
 
 users.getUsers#d91a548 id:Vector<InputUser> = Vector<User>;
 users.getFullUser#b60f5918 id:InputUser = users.UserFull;
 users.setSecureValueErrors#90c894b5 id:InputUser errors:Vector<SecureValueError> = Bool;
-users.getIsPremiumRequiredToContact#a622aa10 id:Vector<InputUser> = Vector<Bool>;
+users.getRequirementsToContact#d89a83a3 id:Vector<InputUser> = Vector<RequirementToContact>;
+users.getSavedMusic#788d7fe3 id:InputUser offset:int limit:int hash:long = users.SavedMusic;
+users.getSavedMusicByID#7573a4e9 id:InputUser documents:Vector<InputDocument> = users.SavedMusic;
+users.suggestBirthday#fc533372 id:InputUser birthday:Birthday = Updates;
 
 contacts.getContactIDs#7adc669d hash:long = Vector<int>;
 contacts.getStatuses#c4a353ee = Vector<ContactStatus>;
@@ -2041,14 +2407,14 @@ contacts.deleteByPhones#1013fd9e phones:Vector<string> = Bool;
 contacts.block#2e2e8734 flags:# my_stories_from:flags.0?true id:InputPeer = Bool;
 contacts.unblock#b550d328 flags:# my_stories_from:flags.0?true id:InputPeer = Bool;
 contacts.getBlocked#9a868f80 flags:# my_stories_from:flags.0?true offset:int limit:int = contacts.Blocked;
-contacts.search#11f812d8 q:string limit:int = contacts.Found;
-contacts.resolveUsername#f93ccba3 username:string = contacts.ResolvedPeer;
-contacts.getTopPeers#973478b6 flags:# correspondents:flags.0?true bots_pm:flags.1?true bots_inline:flags.2?true phone_calls:flags.3?true forward_users:flags.4?true forward_chats:flags.5?true groups:flags.10?true channels:flags.15?true bots_app:flags.16?true offset:int limit:int hash:long = contacts.TopPeers;
+contacts.search#5f58d0f flags:# broadcasts:flags.0?true bots:flags.1?true q:string limit:int = contacts.Found;
+contacts.resolveUsername#725afbbc flags:# username:string referer:flags.0?string = contacts.ResolvedPeer;
+contacts.getTopPeers#973478b6 flags:# correspondents:flags.0?true bots_pm:flags.1?true bots_inline:flags.2?true phone_calls:flags.3?true forward_users:flags.4?true forward_chats:flags.5?true groups:flags.10?true channels:flags.15?true bots_app:flags.16?true bots_guestchat:flags.17?true offset:int limit:int hash:long = contacts.TopPeers;
 contacts.resetTopPeerRating#1ae373ac category:TopPeerCategory peer:InputPeer = Bool;
 contacts.resetSaved#879537f1 = Bool;
 contacts.getSaved#82f1e39f = Vector<SavedContact>;
 contacts.toggleTopPeers#8514bdda enabled:Bool = Bool;
-contacts.addContact#e8f463d0 flags:# add_phone_privacy_exception:flags.0?true id:InputUser first_name:string last_name:string phone:string = Updates;
+contacts.addContact#d9ba2e54 flags:# add_phone_privacy_exception:flags.0?true id:InputUser first_name:string last_name:string phone:string note:flags.1?TextWithEntities = Updates;
 contacts.acceptContact#f831a20f id:InputUser = Updates;
 contacts.getLocated#d348bc44 flags:# background:flags.1?true geo_point:InputGeoPoint self_expires:flags.0?int = Updates;
 contacts.blockFromReplies#29a8962c flags:# delete_message:flags.0?true delete_history:flags.1?true report_spam:flags.2?true msg_id:int = Updates;
@@ -2058,6 +2424,8 @@ contacts.importContactToken#13005788 token:string = User;
 contacts.editCloseFriends#ba6705f0 id:Vector<long> = Bool;
 contacts.setBlocked#94c65c76 flags:# my_stories_from:flags.0?true id:Vector<InputPeer> limit:int = Bool;
 contacts.getBirthdays#daeda864 = contacts.ContactBirthdays;
+contacts.getSponsoredPeers#b6c8c393 q:string = contacts.SponsoredPeers;
+contacts.updateContactNote#139f63fb id:InputUser note:TextWithEntities = Bool;
 
 messages.getMessages#63c66506 id:Vector<InputMessage> = messages.Messages;
 messages.getDialogs#a0f4cb4f flags:# exclude_pinned:flags.0?true folder_id:flags.1?int offset_date:int offset_id:int offset_peer:InputPeer limit:int hash:long = messages.Dialogs;
@@ -2068,9 +2436,9 @@ messages.deleteHistory#b08f922a flags:# just_clear:flags.0?true revoke:flags.1?t
 messages.deleteMessages#e58e95d2 flags:# revoke:flags.0?true id:Vector<int> = messages.AffectedMessages;
 messages.receivedMessages#5a954c0 max_id:int = Vector<ReceivedNotifyMessage>;
 messages.setTyping#58943ee2 flags:# peer:InputPeer top_msg_id:flags.0?int action:SendMessageAction = Bool;
-messages.sendMessage#983f9745 flags:# no_webpage:flags.1?true silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true invert_media:flags.16?true peer:InputPeer reply_to:flags.0?InputReplyTo message:string random_id:long reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut effect:flags.18?long = Updates;
-messages.sendMedia#7852834e flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true invert_media:flags.16?true peer:InputPeer reply_to:flags.0?InputReplyTo media:InputMedia message:string random_id:long reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut effect:flags.18?long = Updates;
-messages.forwardMessages#d5039208 flags:# silent:flags.5?true background:flags.6?true with_my_score:flags.8?true drop_author:flags.11?true drop_media_captions:flags.12?true noforwards:flags.14?true from_peer:InputPeer id:Vector<int> random_id:Vector<long> to_peer:InputPeer top_msg_id:flags.9?int schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut = Updates;
+messages.sendMessage#fef48f62 flags:# no_webpage:flags.1?true silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true invert_media:flags.16?true allow_paid_floodskip:flags.19?true peer:InputPeer reply_to:flags.0?InputReplyTo message:string random_id:long reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.10?int schedule_repeat_period:flags.24?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut effect:flags.18?long allow_paid_stars:flags.21?long suggested_post:flags.22?SuggestedPost rich_message:flags.23?InputRichMessage = Updates;
+messages.sendMedia#330e77f flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true invert_media:flags.16?true allow_paid_floodskip:flags.19?true peer:InputPeer reply_to:flags.0?InputReplyTo media:InputMedia message:string random_id:long reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.10?int schedule_repeat_period:flags.24?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut effect:flags.18?long allow_paid_stars:flags.21?long suggested_post:flags.22?SuggestedPost = Updates;
+messages.forwardMessages#13704a7c flags:# silent:flags.5?true background:flags.6?true with_my_score:flags.8?true drop_author:flags.11?true drop_media_captions:flags.12?true noforwards:flags.14?true allow_paid_floodskip:flags.19?true from_peer:InputPeer id:Vector<int> random_id:Vector<long> to_peer:InputPeer top_msg_id:flags.9?int reply_to:flags.22?InputReplyTo schedule_date:flags.10?int schedule_repeat_period:flags.24?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut effect:flags.18?long video_timestamp:flags.20?int allow_paid_stars:flags.21?long suggested_post:flags.23?SuggestedPost = Updates;
 messages.reportSpam#cf1592db peer:InputPeer = Bool;
 messages.getPeerSettings#efd9a6a2 peer:InputPeer = messages.PeerSettings;
 messages.report#fc78af9b peer:InputPeer id:Vector<int> option:bytes message:string = ReportResult;
@@ -2095,10 +2463,10 @@ messages.reportEncryptedSpam#4b0c8c0f peer:InputEncryptedChat = Bool;
 messages.readMessageContents#36a73f77 id:Vector<int> = messages.AffectedMessages;
 messages.getStickers#d5a5d3a1 emoticon:string hash:long = messages.Stickers;
 messages.getAllStickers#b8a0a1a8 hash:long = messages.AllStickers;
-messages.getWebPagePreview#8b68b0cc flags:# message:string entities:flags.3?Vector<MessageEntity> = MessageMedia;
+messages.getWebPagePreview#570d6f6f flags:# message:string entities:flags.3?Vector<MessageEntity> = messages.WebPagePreview;
 messages.exportChatInvite#a455de90 flags:# legacy_revoke_permanent:flags.2?true request_needed:flags.3?true peer:InputPeer expire_date:flags.0?int usage_limit:flags.1?int title:flags.4?string subscription_pricing:flags.5?StarsSubscriptionPricing = ExportedChatInvite;
 messages.checkChatInvite#3eadb1bb hash:string = ChatInvite;
-messages.importChatInvite#6c50051c hash:string = Updates;
+messages.importChatInvite#de91436e hash:string = messages.ChatInviteJoinResult;
 messages.getStickerSet#c8a0ec74 stickerset:InputStickerSet hash:int = messages.StickerSet;
 messages.installStickerSet#c78fe460 stickerset:InputStickerSet archived:Bool = messages.StickerSetInstallResult;
 messages.uninstallStickerSet#f96e55de stickerset:InputStickerSet = Bool;
@@ -2106,21 +2474,21 @@ messages.startBot#e6df7378 bot:InputUser peer:InputPeer random_id:long start_par
 messages.getMessagesViews#5784d3e1 peer:InputPeer id:Vector<int> increment:Bool = messages.MessageViews;
 messages.editChatAdmin#a85bd1c2 chat_id:long user_id:InputUser is_admin:Bool = Bool;
 messages.migrateChat#a2875319 chat_id:long = Updates;
-messages.searchGlobal#4bc6589a flags:# broadcasts_only:flags.1?true folder_id:flags.0?int q:string filter:MessagesFilter min_date:int max_date:int offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
+messages.searchGlobal#4bc6589a flags:# broadcasts_only:flags.1?true groups_only:flags.2?true users_only:flags.3?true folder_id:flags.0?int q:string filter:MessagesFilter min_date:int max_date:int offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
 messages.reorderStickerSets#78337739 flags:# masks:flags.0?true emojis:flags.1?true order:Vector<long> = Bool;
 messages.getDocumentByHash#b1f2061f sha256:bytes size:long mime_type:string = Document;
 messages.getSavedGifs#5cf09635 hash:long = messages.SavedGifs;
 messages.saveGif#327a30cb id:InputDocument unsave:Bool = Bool;
 messages.getInlineBotResults#514e999d flags:# bot:InputUser peer:InputPeer geo_point:flags.0?InputGeoPoint query:string offset:string = messages.BotResults;
 messages.setInlineBotResults#bb12a419 flags:# gallery:flags.0?true private:flags.1?true query_id:long results:Vector<InputBotInlineResult> cache_time:int next_offset:flags.2?string switch_pm:flags.3?InlineBotSwitchPM switch_webview:flags.4?InlineBotWebView = Bool;
-messages.sendInlineBotResult#3ebee86a flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true hide_via:flags.11?true peer:InputPeer reply_to:flags.0?InputReplyTo random_id:long query_id:long id:string schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut = Updates;
+messages.sendInlineBotResult#c0cf7646 flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true hide_via:flags.11?true peer:InputPeer reply_to:flags.0?InputReplyTo random_id:long query_id:long id:string schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut allow_paid_stars:flags.21?long = Updates;
 messages.getMessageEditData#fda68d36 peer:InputPeer id:int = messages.MessageEditData;
-messages.editMessage#dfd14005 flags:# no_webpage:flags.1?true invert_media:flags.16?true peer:InputPeer id:int message:flags.11?string media:flags.14?InputMedia reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.15?int quick_reply_shortcut_id:flags.17?int = Updates;
-messages.editInlineBotMessage#83557dba flags:# no_webpage:flags.1?true invert_media:flags.16?true id:InputBotInlineMessageID message:flags.11?string media:flags.14?InputMedia reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> = Bool;
+messages.editMessage#b106e66c flags:# no_webpage:flags.1?true invert_media:flags.16?true peer:InputPeer id:int message:flags.11?string media:flags.14?InputMedia reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> schedule_date:flags.15?int schedule_repeat_period:flags.18?int quick_reply_shortcut_id:flags.17?int rich_message:flags.23?InputRichMessage = Updates;
+messages.editInlineBotMessage#a423bb51 flags:# no_webpage:flags.1?true invert_media:flags.16?true id:InputBotInlineMessageID message:flags.11?string media:flags.14?InputMedia reply_markup:flags.2?ReplyMarkup entities:flags.3?Vector<MessageEntity> rich_message:flags.23?InputRichMessage = Bool;
 messages.getBotCallbackAnswer#9342ca07 flags:# game:flags.1?true peer:InputPeer msg_id:int data:flags.0?bytes password:flags.2?InputCheckPasswordSRP = messages.BotCallbackAnswer;
 messages.setBotCallbackAnswer#d58f130a flags:# alert:flags.1?true query_id:long message:flags.0?string url:flags.2?string cache_time:int = Bool;
 messages.getPeerDialogs#e470bcfd peers:Vector<InputDialogPeer> = messages.PeerDialogs;
-messages.saveDraft#d372c5ce flags:# no_webpage:flags.1?true invert_media:flags.6?true reply_to:flags.4?InputReplyTo peer:InputPeer message:string entities:flags.3?Vector<MessageEntity> media:flags.5?InputMedia effect:flags.7?long = Bool;
+messages.saveDraft#ad0fa15c flags:# no_webpage:flags.1?true invert_media:flags.6?true reply_to:flags.4?InputReplyTo peer:InputPeer message:string entities:flags.3?Vector<MessageEntity> media:flags.5?InputMedia effect:flags.7?long suggested_post:flags.8?SuggestedPost rich_message:flags.9?InputRichMessage = Bool;
 messages.getAllDrafts#6a3f8d65 = Updates;
 messages.getFeaturedStickers#64780b14 hash:long = messages.FeaturedStickers;
 messages.readFeaturedStickers#5b118126 id:Vector<long> = Bool;
@@ -2148,16 +2516,16 @@ messages.faveSticker#b9ffc55b id:InputDocument unfave:Bool = Bool;
 messages.getUnreadMentions#f107e790 flags:# peer:InputPeer top_msg_id:flags.0?int offset_id:int add_offset:int limit:int max_id:int min_id:int = messages.Messages;
 messages.readMentions#36e5bf4d flags:# peer:InputPeer top_msg_id:flags.0?int = messages.AffectedHistory;
 messages.getRecentLocations#702a40e0 peer:InputPeer limit:int hash:long = messages.Messages;
-messages.sendMultiMedia#37b74355 flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true invert_media:flags.16?true peer:InputPeer reply_to:flags.0?InputReplyTo multi_media:Vector<InputSingleMedia> schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut effect:flags.18?long = Updates;
+messages.sendMultiMedia#1bf89d74 flags:# silent:flags.5?true background:flags.6?true clear_draft:flags.7?true noforwards:flags.14?true update_stickersets_order:flags.15?true invert_media:flags.16?true allow_paid_floodskip:flags.19?true peer:InputPeer reply_to:flags.0?InputReplyTo multi_media:Vector<InputSingleMedia> schedule_date:flags.10?int send_as:flags.13?InputPeer quick_reply_shortcut:flags.17?InputQuickReplyShortcut effect:flags.18?long allow_paid_stars:flags.21?long = Updates;
 messages.uploadEncryptedFile#5057c497 peer:InputEncryptedChat file:InputEncryptedFile = EncryptedFile;
 messages.searchStickerSets#35705b8a flags:# exclude_featured:flags.0?true q:string hash:long = messages.FoundStickerSets;
 messages.getSplitRanges#1cff7e08 = Vector<MessageRange>;
-messages.markDialogUnread#c286d98f flags:# unread:flags.0?true peer:InputDialogPeer = Bool;
-messages.getDialogUnreadMarks#22e24e22 = Vector<DialogPeer>;
+messages.markDialogUnread#8c5006f8 flags:# unread:flags.0?true parent_peer:flags.1?InputPeer peer:InputDialogPeer = Bool;
+messages.getDialogUnreadMarks#21202222 flags:# parent_peer:flags.0?InputPeer = Vector<DialogPeer>;
 messages.clearAllDrafts#7e58ee9c = Bool;
 messages.updatePinnedMessage#d2aaf7ec flags:# silent:flags.0?true unpin:flags.1?true pm_oneside:flags.2?true peer:InputPeer id:int = Updates;
 messages.sendVote#10ea6184 peer:InputPeer msg_id:int options:Vector<bytes> = Updates;
-messages.getPollResults#73bb643b peer:InputPeer msg_id:int = Updates;
+messages.getPollResults#eda3e33b peer:InputPeer msg_id:int poll_hash:long = Updates;
 messages.getOnlines#6e2be050 peer:InputPeer = ChatOnlines;
 messages.editChatAbout#def60797 peer:InputPeer about:string = Bool;
 messages.editChatDefaultBannedRights#a5866b41 peer:InputPeer banned_rights:ChatBannedRights = Updates;
@@ -2166,8 +2534,8 @@ messages.getEmojiKeywordsDifference#1508b6af lang_code:string from_version:int =
 messages.getEmojiKeywordsLanguages#4e9963b2 lang_codes:Vector<string> = Vector<EmojiLanguage>;
 messages.getEmojiURL#d5b10c26 lang_code:string = EmojiURL;
 messages.getSearchCounters#1bbcf300 flags:# peer:InputPeer saved_peer_id:flags.2?InputPeer top_msg_id:flags.0?int filters:Vector<MessagesFilter> = Vector<messages.SearchCounter>;
-messages.requestUrlAuth#198fb446 flags:# peer:flags.1?InputPeer msg_id:flags.1?int button_id:flags.1?int url:flags.2?string = UrlAuthResult;
-messages.acceptUrlAuth#b12c7125 flags:# write_allowed:flags.0?true peer:flags.1?InputPeer msg_id:flags.1?int button_id:flags.1?int url:flags.2?string = UrlAuthResult;
+messages.requestUrlAuth#894cc99c flags:# peer:flags.1?InputPeer msg_id:flags.1?int button_id:flags.1?int url:flags.2?string in_app_origin:flags.3?string = UrlAuthResult;
+messages.acceptUrlAuth#67a3f0de flags:# write_allowed:flags.0?true share_phone_number:flags.3?true peer:flags.1?InputPeer msg_id:flags.1?int button_id:flags.1?int url:flags.2?string match_code:flags.4?string = UrlAuthResult;
 messages.hidePeerSettingsBar#4facb138 peer:InputPeer = Bool;
 messages.getScheduledHistory#f516760b peer:InputPeer hash:long = messages.Messages;
 messages.getScheduledMessages#bdbb0464 peer:InputPeer id:Vector<int> = messages.Messages;
@@ -2183,7 +2551,7 @@ messages.getOldFeaturedStickers#7ed094a1 offset:int limit:int hash:long = messag
 messages.getReplies#22ddd30c peer:InputPeer msg_id:int offset_id:int offset_date:int add_offset:int limit:int max_id:int min_id:int hash:long = messages.Messages;
 messages.getDiscussionMessage#446972fd peer:InputPeer msg_id:int = messages.DiscussionMessage;
 messages.readDiscussion#f731a9f4 peer:InputPeer msg_id:int read_max_id:int = Bool;
-messages.unpinAllMessages#ee22b9a8 flags:# peer:InputPeer top_msg_id:flags.0?int = messages.AffectedHistory;
+messages.unpinAllMessages#62dd747 flags:# peer:InputPeer top_msg_id:flags.0?int saved_peer_id:flags.1?InputPeer = messages.AffectedHistory;
 messages.deleteChat#5bd0ee50 chat_id:long = Bool;
 messages.deletePhoneCallHistory#f9cbe409 flags:# revoke:flags.0?true = messages.AffectedFoundMessages;
 messages.checkHistoryImport#43fe19f3 import_head:string = messages.HistoryImportParsed;
@@ -2199,13 +2567,13 @@ messages.getAdminsWithInvites#3920e6ef peer:InputPeer = messages.ChatAdminsWithI
 messages.getChatInviteImporters#df04dd4e flags:# requested:flags.0?true subscription_expired:flags.3?true peer:InputPeer link:flags.1?string q:flags.2?string offset_date:int offset_user:InputUser limit:int = messages.ChatInviteImporters;
 messages.setHistoryTTL#b80e5fe4 peer:InputPeer period:int = Updates;
 messages.checkHistoryImportPeer#5dc60f03 peer:InputPeer = messages.CheckedHistoryImportPeer;
-messages.setChatTheme#e63be13f peer:InputPeer emoticon:string = Updates;
+messages.setChatTheme#81202c9 peer:InputPeer theme:InputChatTheme = Updates;
 messages.getMessageReadParticipants#31c1c44f peer:InputPeer msg_id:int = Vector<ReadParticipantDate>;
 messages.getSearchResultsCalendar#6aa3f6bd flags:# peer:InputPeer saved_peer_id:flags.2?InputPeer filter:MessagesFilter offset_id:int offset_date:int = messages.SearchResultsCalendar;
 messages.getSearchResultsPositions#9c7f2f10 flags:# peer:InputPeer saved_peer_id:flags.2?InputPeer filter:MessagesFilter offset_id:int limit:int = messages.SearchResultsPositions;
 messages.hideChatJoinRequest#7fe7e815 flags:# approved:flags.0?true peer:InputPeer user_id:InputUser = Updates;
 messages.hideAllChatJoinRequests#e085f4ea flags:# approved:flags.0?true peer:InputPeer link:flags.1?string = Updates;
-messages.toggleNoForwards#b11eafa2 peer:InputPeer enabled:Bool = Updates;
+messages.toggleNoForwards#b2081a35 flags:# peer:InputPeer enabled:Bool request_msg_id:flags.0?int = Updates;
 messages.saveDefaultSendAs#ccfddf96 peer:InputPeer send_as:InputPeer = Bool;
 messages.sendReaction#d30d78d4 flags:# big:flags.1?true add_to_recent:flags.2?true peer:InputPeer msg_id:int reaction:flags.0?Vector<Reaction> = Updates;
 messages.getMessagesReactions#8bba90e6 peer:InputPeer id:Vector<int> = Updates;
@@ -2213,16 +2581,16 @@ messages.getMessageReactionsList#461b3f48 flags:# peer:InputPeer id:int reaction
 messages.setChatAvailableReactions#864b2581 flags:# peer:InputPeer available_reactions:ChatReactions reactions_limit:flags.0?int paid_enabled:flags.1?Bool = Updates;
 messages.getAvailableReactions#18dea0ac hash:int = messages.AvailableReactions;
 messages.setDefaultReaction#4f47a016 reaction:Reaction = Bool;
-messages.translateText#63183030 flags:# peer:flags.0?InputPeer id:flags.0?Vector<int> text:flags.1?Vector<TextWithEntities> to_lang:string = messages.TranslatedText;
-messages.getUnreadReactions#3223495b flags:# peer:InputPeer top_msg_id:flags.0?int offset_id:int add_offset:int limit:int max_id:int min_id:int = messages.Messages;
-messages.readReactions#54aa7f8e flags:# peer:InputPeer top_msg_id:flags.0?int = messages.AffectedHistory;
+messages.translateText#a5eec345 flags:# peer:flags.0?InputPeer id:flags.0?Vector<int> text:flags.1?Vector<TextWithEntities> to_lang:string tone:flags.2?string = messages.TranslatedText;
+messages.getUnreadReactions#bd7f90ac flags:# peer:InputPeer top_msg_id:flags.0?int saved_peer_id:flags.1?InputPeer offset_id:int add_offset:int limit:int max_id:int min_id:int = messages.Messages;
+messages.readReactions#9ec44f93 flags:# peer:InputPeer top_msg_id:flags.0?int saved_peer_id:flags.1?InputPeer = messages.AffectedHistory;
 messages.searchSentMedia#107e31a0 q:string filter:MessagesFilter limit:int = messages.Messages;
 messages.getAttachMenuBots#16fcc2cb hash:long = AttachMenuBots;
 messages.getAttachMenuBot#77216192 bot:InputUser = AttachMenuBotsBot;
 messages.toggleBotInAttachMenu#69f59d69 flags:# write_allowed:flags.0?true bot:InputUser enabled:Bool = Bool;
-messages.requestWebView#269dc2c1 flags:# from_bot_menu:flags.4?true silent:flags.5?true compact:flags.7?true peer:InputPeer bot:InputUser url:flags.1?string start_param:flags.3?string theme_params:flags.2?DataJSON platform:string reply_to:flags.0?InputReplyTo send_as:flags.13?InputPeer = WebViewResult;
+messages.requestWebView#269dc2c1 flags:# from_bot_menu:flags.4?true silent:flags.5?true compact:flags.7?true fullscreen:flags.8?true peer:InputPeer bot:InputUser url:flags.1?string start_param:flags.3?string theme_params:flags.2?DataJSON platform:string reply_to:flags.0?InputReplyTo send_as:flags.13?InputPeer = WebViewResult;
 messages.prolongWebView#b0d81a83 flags:# silent:flags.5?true peer:InputPeer bot:InputUser query_id:long reply_to:flags.0?InputReplyTo send_as:flags.13?InputPeer = Bool;
-messages.requestSimpleWebView#413a3e73 flags:# from_switch_webview:flags.1?true from_side_menu:flags.2?true compact:flags.7?true bot:InputUser url:flags.3?string start_param:flags.4?string theme_params:flags.0?DataJSON platform:string = WebViewResult;
+messages.requestSimpleWebView#413a3e73 flags:# from_switch_webview:flags.1?true from_side_menu:flags.2?true compact:flags.7?true fullscreen:flags.8?true bot:InputUser url:flags.3?string start_param:flags.4?string theme_params:flags.0?DataJSON platform:string = WebViewResult;
 messages.sendWebViewResultMessage#a4314f5 bot_query_id:string result:InputBotInlineResult = WebViewMessageSent;
 messages.sendWebViewData#dc0242c8 bot:InputUser random_id:long button_text:string data:string = Updates;
 messages.transcribeAudio#269e9a49 peer:InputPeer msg_id:int = messages.TranscribedAudio;
@@ -2237,19 +2605,19 @@ messages.clearRecentReactions#9dfeefb4 = Bool;
 messages.getExtendedMedia#84f80814 peer:InputPeer id:Vector<int> = Updates;
 messages.setDefaultHistoryTTL#9eb51445 period:int = Bool;
 messages.getDefaultHistoryTTL#658b7188 = DefaultHistoryTTL;
-messages.sendBotRequestedPeer#91b2d060 peer:InputPeer msg_id:int button_id:int requested_peers:Vector<InputPeer> = Updates;
+messages.sendBotRequestedPeer#6c5cf2a7 flags:# peer:InputPeer msg_id:flags.0?int webapp_req_id:flags.1?string button_id:int requested_peers:Vector<InputPeer> = Updates;
 messages.getEmojiGroups#7488ce5b hash:int = messages.EmojiGroups;
 messages.getEmojiStatusGroups#2ecd56cd hash:int = messages.EmojiGroups;
 messages.getEmojiProfilePhotoGroups#21a548f3 hash:int = messages.EmojiGroups;
 messages.searchCustomEmoji#2c11c0d7 emoticon:string hash:long = EmojiList;
 messages.togglePeerTranslations#e47cb579 flags:# disabled:flags.0?true peer:InputPeer = Bool;
 messages.getBotApp#34fdc5c3 app:InputBotApp hash:long = messages.BotApp;
-messages.requestAppWebView#53618bce flags:# write_allowed:flags.0?true compact:flags.7?true peer:InputPeer app:InputBotApp start_param:flags.1?string theme_params:flags.2?DataJSON platform:string = WebViewResult;
+messages.requestAppWebView#53618bce flags:# write_allowed:flags.0?true compact:flags.7?true fullscreen:flags.8?true peer:InputPeer app:InputBotApp start_param:flags.1?string theme_params:flags.2?DataJSON platform:string = WebViewResult;
 messages.setChatWallPaper#8ffacae1 flags:# for_both:flags.3?true revert:flags.4?true peer:InputPeer wallpaper:flags.0?InputWallPaper settings:flags.2?WallPaperSettings id:flags.1?int = Updates;
 messages.searchEmojiStickerSets#92b4494c flags:# exclude_featured:flags.0?true q:string hash:long = messages.FoundStickerSets;
-messages.getSavedDialogs#5381d21a flags:# exclude_pinned:flags.0?true offset_date:int offset_id:int offset_peer:InputPeer limit:int hash:long = messages.SavedDialogs;
-messages.getSavedHistory#3d9a414d peer:InputPeer offset_id:int offset_date:int add_offset:int limit:int max_id:int min_id:int hash:long = messages.Messages;
-messages.deleteSavedHistory#6e98102b flags:# peer:InputPeer max_id:int min_date:flags.2?int max_date:flags.3?int = messages.AffectedHistory;
+messages.getSavedDialogs#1e91fc99 flags:# exclude_pinned:flags.0?true parent_peer:flags.1?InputPeer offset_date:int offset_id:int offset_peer:InputPeer limit:int hash:long = messages.SavedDialogs;
+messages.getSavedHistory#998ab009 flags:# parent_peer:flags.0?InputPeer peer:InputPeer offset_id:int offset_date:int add_offset:int limit:int max_id:int min_id:int hash:long = messages.Messages;
+messages.deleteSavedHistory#4dc5085f flags:# parent_peer:flags.0?InputPeer peer:InputPeer max_id:int min_date:flags.2?int max_date:flags.3?int = messages.AffectedHistory;
 messages.getPinnedSavedDialogs#d63d94e0 = messages.SavedDialogs;
 messages.toggleSavedDialogPin#ac81bbde flags:# pinned:flags.0?true peer:InputDialogPeer = Bool;
 messages.reorderPinnedSavedDialogs#8b716587 flags:# force:flags.0?true order:Vector<InputDialogPeer> = Bool;
@@ -2272,10 +2640,49 @@ messages.getAvailableEffects#dea20a39 hash:int = messages.AvailableEffects;
 messages.editFactCheck#589ee75 peer:InputPeer msg_id:int text:TextWithEntities = Updates;
 messages.deleteFactCheck#d1da940c peer:InputPeer msg_id:int = Updates;
 messages.getFactCheck#b9cdc5ee peer:InputPeer msg_id:Vector<int> = Vector<FactCheck>;
-messages.requestMainWebView#c9e01e7b flags:# compact:flags.7?true peer:InputPeer bot:InputUser start_param:flags.1?string theme_params:flags.0?DataJSON platform:string = WebViewResult;
-messages.sendPaidReaction#9dd6a67b flags:# peer:InputPeer msg_id:int count:int random_id:long private:flags.0?Bool = Updates;
-messages.togglePaidReactionPrivacy#849ad397 peer:InputPeer msg_id:int private:Bool = Bool;
+messages.requestMainWebView#c9e01e7b flags:# compact:flags.7?true fullscreen:flags.8?true peer:InputPeer bot:InputUser start_param:flags.1?string theme_params:flags.0?DataJSON platform:string = WebViewResult;
+messages.sendPaidReaction#58bbcb50 flags:# peer:InputPeer msg_id:int count:int random_id:long private:flags.0?PaidReactionPrivacy = Updates;
+messages.togglePaidReactionPrivacy#435885b5 peer:InputPeer msg_id:int private:PaidReactionPrivacy = Bool;
 messages.getPaidReactionPrivacy#472455aa = Updates;
+messages.viewSponsoredMessage#269e3643 random_id:bytes = Bool;
+messages.clickSponsoredMessage#8235057e flags:# media:flags.0?true fullscreen:flags.1?true random_id:bytes = Bool;
+messages.reportSponsoredMessage#12cbf0c4 random_id:bytes option:bytes = channels.SponsoredMessageReportResult;
+messages.getSponsoredMessages#3d6ce850 flags:# peer:InputPeer msg_id:flags.0?int = messages.SponsoredMessages;
+messages.savePreparedInlineMessage#f21f7f2f flags:# result:InputBotInlineResult user_id:InputUser peer_types:flags.0?Vector<InlineQueryPeerType> = messages.BotPreparedInlineMessage;
+messages.getPreparedInlineMessage#857ebdb8 bot:InputUser id:string = messages.PreparedInlineMessage;
+messages.searchStickers#29b1c66a flags:# emojis:flags.0?true q:string emoticon:string lang_code:Vector<string> offset:int limit:int hash:long = messages.FoundStickers;
+messages.reportMessagesDelivery#5a6d7395 flags:# push:flags.0?true peer:InputPeer id:Vector<int> = Bool;
+messages.getSavedDialogsByID#6f6f9c96 flags:# parent_peer:flags.1?InputPeer ids:Vector<InputPeer> = messages.SavedDialogs;
+messages.readSavedHistory#ba4a3b5b parent_peer:InputPeer peer:InputPeer max_id:int = Bool;
+messages.toggleTodoCompleted#d3e03124 peer:InputPeer msg_id:int completed:Vector<int> incompleted:Vector<int> = Updates;
+messages.appendTodoList#21a61057 peer:InputPeer msg_id:int list:Vector<TodoItem> = Updates;
+messages.toggleSuggestedPostApproval#8107455c flags:# reject:flags.1?true peer:InputPeer msg_id:int schedule_date:flags.0?int reject_comment:flags.2?string = Updates;
+messages.getForumTopics#3ba47bff flags:# peer:InputPeer q:flags.0?string offset_date:int offset_id:int offset_topic:int limit:int = messages.ForumTopics;
+messages.getForumTopicsByID#af0a4a08 peer:InputPeer topics:Vector<int> = messages.ForumTopics;
+messages.editForumTopic#cecc1134 flags:# peer:InputPeer topic_id:int title:flags.0?string icon_emoji_id:flags.1?long closed:flags.2?Bool hidden:flags.3?Bool = Updates;
+messages.updatePinnedForumTopic#175df251 peer:InputPeer topic_id:int pinned:Bool = Updates;
+messages.reorderPinnedForumTopics#e7841f0 flags:# force:flags.0?true peer:InputPeer order:Vector<int> = Updates;
+messages.createForumTopic#2f98c3d5 flags:# title_missing:flags.4?true peer:InputPeer title:string icon_color:flags.0?int icon_emoji_id:flags.3?long random_id:long send_as:flags.2?InputPeer = Updates;
+messages.deleteTopicHistory#d2816f10 peer:InputPeer top_msg_id:int = messages.AffectedHistory;
+messages.getEmojiGameInfo#fb7e8ca7 = messages.EmojiGameInfo;
+messages.summarizeText#abbbd346 flags:# peer:InputPeer id:int to_lang:flags.0?string tone:flags.2?string = TextWithEntities;
+messages.editChatCreator#f743b857 peer:InputPeer user_id:InputUser password:InputCheckPasswordSRP = Updates;
+messages.getFutureChatCreatorAfterLeave#3b7d0ea6 peer:InputPeer = User;
+messages.editChatParticipantRank#a00f32b0 peer:InputPeer participant:InputPeer rank:string = Updates;
+messages.declineUrlAuth#35436bbc url:string = Bool;
+messages.checkUrlAuthMatchCode#c9a47b0b url:string match_code:string = Bool;
+messages.composeMessageWithAI#daecc589 flags:# proofread:flags.0?true emojify:flags.3?true text:TextWithEntities translate_to_lang:flags.1?string tone:flags.2?InputAiComposeTone = messages.ComposedMessageWithAI;
+messages.reportReadMetrics#4067c5e6 peer:InputPeer metrics:Vector<InputMessageReadMetric> = Bool;
+messages.reportMusicListen#ddbcd819 id:InputDocument listened_duration:int = Bool;
+messages.addPollAnswer#19bc4b6d peer:InputPeer msg_id:int answer:PollAnswer = Updates;
+messages.deletePollAnswer#ac8505a5 peer:InputPeer msg_id:int option:bytes = Updates;
+messages.getUnreadPollVotes#43286cf2 flags:# peer:InputPeer top_msg_id:flags.0?int offset_id:int add_offset:int limit:int max_id:int min_id:int = messages.Messages;
+messages.readPollVotes#1720b4d8 flags:# peer:InputPeer top_msg_id:flags.0?int = messages.AffectedHistory;
+messages.setBotGuestChatResult#b8f106e3 query_id:long result:InputBotInlineResult = InputBotInlineMessageID;
+messages.deleteParticipantReactions#a0b80cf8 peer:InputPeer participant:InputPeer = Bool;
+messages.deleteParticipantReaction#e3b7f82c peer:InputPeer msg_id:int participant:InputPeer = Updates;
+messages.getPersonalChannelHistory#55fb0996 user_id:InputUser limit:int max_id:int min_id:int hash:long = messages.Messages;
+messages.getRichMessage#501569cf peer:InputPeer id:int = messages.Messages;
 
 updates.getState#edd4882a = updates.State;
 updates.getDifference#19c2f763 flags:# pts:int pts_limit:flags.1?int pts_total_limit:flags.0?int date:int qts:int qts_limit:flags.2?int = updates.Difference;
@@ -2331,12 +2738,12 @@ channels.getParticipant#a0ab6cc6 channel:InputChannel participant:InputPeer = ch
 channels.getChannels#a7f6bbb id:Vector<InputChannel> = messages.Chats;
 channels.getFullChannel#8736a09 channel:InputChannel = messages.ChatFull;
 channels.createChannel#91006707 flags:# broadcast:flags.0?true megagroup:flags.1?true for_import:flags.3?true forum:flags.5?true title:string about:string geo_point:flags.2?InputGeoPoint address:flags.2?string ttl_period:flags.4?int = Updates;
-channels.editAdmin#d33c8902 channel:InputChannel user_id:InputUser admin_rights:ChatAdminRights rank:string = Updates;
+channels.editAdmin#9a98ad68 flags:# channel:InputChannel user_id:InputUser admin_rights:ChatAdminRights rank:flags.0?string = Updates;
 channels.editTitle#566decd0 channel:InputChannel title:string = Updates;
 channels.editPhoto#f12e57c9 channel:InputChannel photo:InputChatPhoto = Updates;
 channels.checkUsername#10e6bd2c channel:InputChannel username:string = Bool;
 channels.updateUsername#3514b3de channel:InputChannel username:string = Bool;
-channels.joinChannel#24b524c5 channel:InputChannel = Updates;
+channels.joinChannel#7f6a1e22 channel:InputChannel = messages.ChatInviteJoinResult;
 channels.leaveChannel#f836aa95 channel:InputChannel = Updates;
 channels.inviteToChannel#c9e33d54 channel:InputChannel users:Vector<InputUser> = messages.InvitedUsers;
 channels.deleteChannel#c0111fe3 channel:InputChannel = Updates;
@@ -2352,41 +2759,34 @@ channels.togglePreHistoryHidden#eabbb94c channel:InputChannel enabled:Bool = Upd
 channels.getLeftChannels#8341ecc0 offset:int = messages.Chats;
 channels.getGroupsForDiscussion#f5dad378 = messages.Chats;
 channels.setDiscussionGroup#40582bb2 broadcast:InputChannel group:InputChannel = Bool;
-channels.editCreator#8f38cd1f channel:InputChannel user_id:InputUser password:InputCheckPasswordSRP = Updates;
 channels.editLocation#58e63f6d channel:InputChannel geo_point:InputGeoPoint address:string = Bool;
 channels.toggleSlowMode#edd49ef0 channel:InputChannel seconds:int = Updates;
 channels.getInactiveChannels#11e831ee = messages.InactiveChats;
 channels.convertToGigagroup#b290c69 channel:InputChannel = Updates;
-channels.viewSponsoredMessage#beaedb94 channel:InputChannel random_id:bytes = Bool;
-channels.getSponsoredMessages#ec210fbf channel:InputChannel = messages.SponsoredMessages;
-channels.getSendAs#dc770ee peer:InputPeer = channels.SendAsPeers;
+channels.getSendAs#e785a43f flags:# for_paid_reactions:flags.0?true for_live_stories:flags.1?true peer:InputPeer = channels.SendAsPeers;
 channels.deleteParticipantHistory#367544db channel:InputChannel participant:InputPeer = messages.AffectedHistory;
 channels.toggleJoinToSend#e4cb9580 channel:InputChannel enabled:Bool = Updates;
-channels.toggleJoinRequest#4c2985b6 channel:InputChannel enabled:Bool = Updates;
+channels.toggleJoinRequest#ecc2618 flags:# apply_to_invites:flags.1?true channel:InputChannel enabled:Bool guard_bot:flags.0?InputUser = Updates;
 channels.reorderUsernames#b45ced1d channel:InputChannel order:Vector<string> = Bool;
 channels.toggleUsername#50f24105 channel:InputChannel username:string active:Bool = Bool;
 channels.deactivateAllUsernames#a245dd3 channel:InputChannel = Bool;
-channels.toggleForum#a4298b29 channel:InputChannel enabled:Bool = Updates;
-channels.createForumTopic#f40c0224 flags:# channel:InputChannel title:string icon_color:flags.0?int icon_emoji_id:flags.3?long random_id:long send_as:flags.2?InputPeer = Updates;
-channels.getForumTopics#de560d1 flags:# channel:InputChannel q:flags.0?string offset_date:int offset_id:int offset_topic:int limit:int = messages.ForumTopics;
-channels.getForumTopicsByID#b0831eb9 channel:InputChannel topics:Vector<int> = messages.ForumTopics;
-channels.editForumTopic#f4dfa185 flags:# channel:InputChannel topic_id:int title:flags.0?string icon_emoji_id:flags.1?long closed:flags.2?Bool hidden:flags.3?Bool = Updates;
-channels.updatePinnedForumTopic#6c2d9026 channel:InputChannel topic_id:int pinned:Bool = Updates;
-channels.deleteTopicHistory#34435f2d channel:InputChannel top_msg_id:int = messages.AffectedHistory;
-channels.reorderPinnedForumTopics#2950a18f flags:# force:flags.0?true channel:InputChannel order:Vector<int> = Updates;
+channels.toggleForum#3ff75734 channel:InputChannel enabled:Bool tabs:Bool = Updates;
 channels.toggleAntiSpam#68f3e4eb channel:InputChannel enabled:Bool = Updates;
 channels.reportAntiSpamFalsePositive#a850a693 channel:InputChannel msg_id:int = Bool;
 channels.toggleParticipantsHidden#6a6e7854 channel:InputChannel enabled:Bool = Updates;
-channels.clickSponsoredMessage#1445d75 flags:# media:flags.0?true fullscreen:flags.1?true channel:InputChannel random_id:bytes = Bool;
 channels.updateColor#d8aa3671 flags:# for_profile:flags.1?true channel:InputChannel color:flags.2?int background_emoji_id:flags.0?long = Updates;
 channels.toggleViewForumAsMessages#9738bb15 channel:InputChannel enabled:Bool = Updates;
 channels.getChannelRecommendations#25a71742 flags:# channel:flags.0?InputChannel = messages.Chats;
 channels.updateEmojiStatus#f0d3e6a8 channel:InputChannel emoji_status:EmojiStatus = Updates;
 channels.setBoostsToUnblockRestrictions#ad399cee channel:InputChannel boosts:int = Updates;
 channels.setEmojiStickers#3cd930b7 channel:InputChannel stickerset:InputStickerSet = Bool;
-channels.reportSponsoredMessage#af8ff6b9 channel:InputChannel random_id:bytes option:bytes = channels.SponsoredMessageReportResult;
 channels.restrictSponsoredMessages#9ae91519 channel:InputChannel restricted:Bool = Updates;
-channels.searchPosts#d19f987b hashtag:string offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
+channels.searchPosts#f2c4f24d flags:# hashtag:flags.0?string query:flags.1?string offset_rate:int offset_peer:InputPeer offset_id:int limit:int allow_paid_stars:flags.2?long = messages.Messages;
+channels.updatePaidMessagesPrice#4b12327b flags:# broadcast_messages_allowed:flags.0?true channel:InputChannel send_paid_messages_stars:long = Updates;
+channels.toggleAutotranslation#167fc0a1 channel:InputChannel enabled:Bool = Updates;
+channels.getMessageAuthor#ece2a0e6 channel:InputChannel id:int = User;
+channels.checkSearchPostsFlood#22567115 flags:# query:flags.0?string = SearchPostsFlood;
+channels.setMainProfileTab#3583fcb1 channel:InputChannel tab:ProfileTab = Bool;
 
 bots.sendCustomRequest#aa2769ed custom_method:string params:DataJSON = DataJSON;
 bots.answerWebhookJSONQuery#e6213f4d query_id:long data:DataJSON = Bool;
@@ -2411,6 +2811,21 @@ bots.deletePreviewMedia#2d0135b3 bot:InputUser lang_code:string media:Vector<Inp
 bots.reorderPreviewMedias#b627f3aa bot:InputUser lang_code:string order:Vector<InputMedia> = Bool;
 bots.getPreviewInfo#423ab3ad bot:InputUser lang_code:string = bots.PreviewInfo;
 bots.getPreviewMedias#a2a5594d bot:InputUser = Vector<BotPreviewMedia>;
+bots.updateUserEmojiStatus#ed9f30c5 user_id:InputUser emoji_status:EmojiStatus = Bool;
+bots.toggleUserEmojiStatusPermission#6de6392 bot:InputUser enabled:Bool = Bool;
+bots.checkDownloadFileParams#50077589 bot:InputUser file_name:string url:string = Bool;
+bots.getAdminedBots#b0711d83 = Vector<User>;
+bots.updateStarRefProgram#778b5ab3 flags:# bot:InputUser commission_permille:int duration_months:flags.0?int = StarRefProgram;
+bots.setCustomVerification#8b89dfbd flags:# enabled:flags.1?true bot:flags.0?InputUser peer:InputPeer custom_description:flags.2?string = Bool;
+bots.getBotRecommendations#a1b70815 bot:InputUser = users.Users;
+bots.checkUsername#87f2219b username:string = Bool;
+bots.createBot#e5b17f2b flags:# via_deeplink:flags.0?true name:string username:string manager_id:InputUser = User;
+bots.exportBotToken#bd0d99eb bot:InputUser revoke:Bool = bots.ExportedBotToken;
+bots.requestWebViewButton#31a2a35e user_id:InputUser button:KeyboardButton = bots.RequestedButton;
+bots.getRequestedWebViewButton#bf25b7f3 bot:InputUser webapp_req_id:string = KeyboardButton;
+bots.getAccessSettings#213853a3 bot:InputUser = bots.AccessSettings;
+bots.editAccessSettings#31813cd8 flags:# restricted:flags.0?true bot:InputUser add_users:flags.1?Vector<InputUser> = Bool;
+bots.setJoinChatResults#e71a4810 query_id:long result:JoinChatBotResult = Bool;
 
 payments.getPaymentForm#37148dbb flags:# invoice:InputInvoice theme_params:flags.0?DataJSON = payments.PaymentForm;
 payments.getPaymentReceipt#2478d1cc peer:InputPeer msg_id:int = payments.PaymentReceipt;
@@ -2422,30 +2837,61 @@ payments.getBankCardData#2e79d779 number:string = payments.BankCardData;
 payments.exportInvoice#f91b065 invoice_media:InputMedia = payments.ExportedInvoice;
 payments.assignAppStoreTransaction#80ed747d receipt:bytes purpose:InputStorePaymentPurpose = Updates;
 payments.assignPlayMarketTransaction#dffd50d3 receipt:DataJSON purpose:InputStorePaymentPurpose = Updates;
-payments.canPurchasePremium#9fc19eb6 purpose:InputStorePaymentPurpose = Bool;
 payments.getPremiumGiftCodeOptions#2757ba54 flags:# boost_peer:flags.0?InputPeer = Vector<PremiumGiftCodeOption>;
 payments.checkGiftCode#8e51b4c1 slug:string = payments.CheckedGiftCode;
 payments.applyGiftCode#f6e26854 slug:string = Updates;
 payments.getGiveawayInfo#f4239425 peer:InputPeer msg_id:int = payments.GiveawayInfo;
 payments.launchPrepaidGiveaway#5ff58f20 peer:InputPeer giveaway_id:long purpose:InputStorePaymentPurpose = Updates;
 payments.getStarsTopupOptions#c00ec7d3 = Vector<StarsTopupOption>;
-payments.getStarsStatus#104fcfa7 peer:InputPeer = payments.StarsStatus;
-payments.getStarsTransactions#69da4557 flags:# inbound:flags.0?true outbound:flags.1?true ascending:flags.2?true subscription_id:flags.3?string peer:InputPeer offset:string limit:int = payments.StarsStatus;
+payments.getStarsStatus#4ea9b3bf flags:# ton:flags.0?true peer:InputPeer = payments.StarsStatus;
+payments.getStarsTransactions#69da4557 flags:# inbound:flags.0?true outbound:flags.1?true ascending:flags.2?true ton:flags.4?true subscription_id:flags.3?string peer:InputPeer offset:string limit:int = payments.StarsStatus;
 payments.sendStarsForm#7998c914 form_id:long invoice:InputInvoice = payments.PaymentResult;
 payments.refundStarsCharge#25ae8f4a user_id:InputUser charge_id:string = Updates;
-payments.getStarsRevenueStats#d91ffad6 flags:# dark:flags.0?true peer:InputPeer = payments.StarsRevenueStats;
-payments.getStarsRevenueWithdrawalUrl#13bbe8b3 peer:InputPeer stars:long password:InputCheckPasswordSRP = payments.StarsRevenueWithdrawalUrl;
+payments.getStarsRevenueStats#d91ffad6 flags:# dark:flags.0?true ton:flags.1?true peer:InputPeer = payments.StarsRevenueStats;
+payments.getStarsRevenueWithdrawalUrl#2433dc92 flags:# ton:flags.0?true peer:InputPeer amount:flags.1?long password:InputCheckPasswordSRP = payments.StarsRevenueWithdrawalUrl;
 payments.getStarsRevenueAdsAccountUrl#d1d7efc5 peer:InputPeer = payments.StarsRevenueAdsAccountUrl;
-payments.getStarsTransactionsByID#27842d2e peer:InputPeer id:Vector<InputStarsTransaction> = payments.StarsStatus;
+payments.getStarsTransactionsByID#2dca16b8 flags:# ton:flags.0?true peer:InputPeer id:Vector<InputStarsTransaction> = payments.StarsStatus;
 payments.getStarsGiftOptions#d3c96bc8 flags:# user_id:flags.0?InputUser = Vector<StarsGiftOption>;
 payments.getStarsSubscriptions#32512c5 flags:# missing_balance:flags.0?true peer:InputPeer offset:string = payments.StarsStatus;
 payments.changeStarsSubscription#c7770878 flags:# peer:InputPeer subscription_id:string canceled:flags.0?Bool = Bool;
 payments.fulfillStarsSubscription#cc5bebb3 peer:InputPeer subscription_id:string = Bool;
 payments.getStarsGiveawayOptions#bd1efd3e = Vector<StarsGiveawayOption>;
 payments.getStarGifts#c4563590 hash:int = payments.StarGifts;
-payments.getUserStarGifts#5e72c7e1 user_id:InputUser offset:string limit:int = payments.UserStarGifts;
-payments.saveStarGift#87acf08e flags:# unsave:flags.0?true user_id:InputUser msg_id:int = Bool;
-payments.convertStarGift#421e027 user_id:InputUser msg_id:int = Bool;
+payments.saveStarGift#2a2a697c flags:# unsave:flags.0?true stargift:InputSavedStarGift = Bool;
+payments.convertStarGift#74bf076b stargift:InputSavedStarGift = Bool;
+payments.botCancelStarsSubscription#6dfa0622 flags:# restore:flags.0?true user_id:InputUser charge_id:string = Bool;
+payments.getConnectedStarRefBots#5869a553 flags:# peer:InputPeer offset_date:flags.2?int offset_link:flags.2?string limit:int = payments.ConnectedStarRefBots;
+payments.getConnectedStarRefBot#b7d998f0 peer:InputPeer bot:InputUser = payments.ConnectedStarRefBots;
+payments.getSuggestedStarRefBots#d6b48f7 flags:# order_by_revenue:flags.0?true order_by_date:flags.1?true peer:InputPeer offset:string limit:int = payments.SuggestedStarRefBots;
+payments.connectStarRefBot#7ed5348a peer:InputPeer bot:InputUser = payments.ConnectedStarRefBots;
+payments.editConnectedStarRefBot#e4fca4a3 flags:# revoked:flags.0?true peer:InputPeer link:string = payments.ConnectedStarRefBots;
+payments.getStarGiftUpgradePreview#9c9abcb1 gift_id:long = payments.StarGiftUpgradePreview;
+payments.upgradeStarGift#aed6e4f5 flags:# keep_original_details:flags.0?true stargift:InputSavedStarGift = Updates;
+payments.transferStarGift#7f18176a stargift:InputSavedStarGift to_id:InputPeer = Updates;
+payments.getUniqueStarGift#a1974d72 slug:string = payments.UniqueStarGift;
+payments.getSavedStarGifts#a319e569 flags:# exclude_unsaved:flags.0?true exclude_saved:flags.1?true exclude_unlimited:flags.2?true exclude_unique:flags.4?true sort_by_value:flags.5?true exclude_upgradable:flags.7?true exclude_unupgradable:flags.8?true peer_color_available:flags.9?true exclude_hosted:flags.10?true peer:InputPeer collection_id:flags.6?int offset:string limit:int = payments.SavedStarGifts;
+payments.getSavedStarGift#b455a106 stargift:Vector<InputSavedStarGift> = payments.SavedStarGifts;
+payments.getStarGiftWithdrawalUrl#d06e93a8 stargift:InputSavedStarGift password:InputCheckPasswordSRP = payments.StarGiftWithdrawalUrl;
+payments.toggleChatStarGiftNotifications#60eaefa1 flags:# enabled:flags.0?true peer:InputPeer = Bool;
+payments.toggleStarGiftsPinnedToTop#1513e7b0 peer:InputPeer stargift:Vector<InputSavedStarGift> = Bool;
+payments.canPurchaseStore#4fdc5ea7 purpose:InputStorePaymentPurpose = Bool;
+payments.getResaleStarGifts#7a5fa236 flags:# sort_by_price:flags.1?true sort_by_num:flags.2?true for_craft:flags.4?true stars_only:flags.5?true attributes_hash:flags.0?long gift_id:long attributes:flags.3?Vector<StarGiftAttributeId> offset:string limit:int = payments.ResaleStarGifts;
+payments.updateStarGiftPrice#edbe6ccb stargift:InputSavedStarGift resell_amount:StarsAmount = Updates;
+payments.createStarGiftCollection#1f4a0e87 peer:InputPeer title:string stargift:Vector<InputSavedStarGift> = StarGiftCollection;
+payments.updateStarGiftCollection#4fddbee7 flags:# peer:InputPeer collection_id:int title:flags.0?string delete_stargift:flags.1?Vector<InputSavedStarGift> add_stargift:flags.2?Vector<InputSavedStarGift> order:flags.3?Vector<InputSavedStarGift> = StarGiftCollection;
+payments.reorderStarGiftCollections#c32af4cc peer:InputPeer order:Vector<int> = Bool;
+payments.deleteStarGiftCollection#ad5648e8 peer:InputPeer collection_id:int = Bool;
+payments.getStarGiftCollections#981b91dd peer:InputPeer hash:long = payments.StarGiftCollections;
+payments.getUniqueStarGiftValueInfo#4365af6b slug:string = payments.UniqueStarGiftValueInfo;
+payments.checkCanSendGift#c0c4edc9 gift_id:long = payments.CheckCanSendGiftResult;
+payments.getStarGiftAuctionState#5c9ff4d6 auction:InputStarGiftAuction version:int = payments.StarGiftAuctionState;
+payments.getStarGiftAuctionAcquiredGifts#6ba2cbec gift_id:long = payments.StarGiftAuctionAcquiredGifts;
+payments.getStarGiftActiveAuctions#a5d0514d hash:long = payments.StarGiftActiveAuctions;
+payments.resolveStarGiftOffer#e9ce781c flags:# decline:flags.0?true offer_msg_id:int = Updates;
+payments.sendStarGiftOffer#8fb86b41 flags:# peer:InputPeer slug:string price:StarsAmount duration:int random_id:long allow_paid_stars:flags.0?long = Updates;
+payments.getStarGiftUpgradeAttributes#6d038b58 gift_id:long = payments.StarGiftUpgradeAttributes;
+payments.getCraftStarGifts#fd05dd00 gift_id:long offset:string limit:int = payments.SavedStarGifts;
+payments.craftStarGift#b0f9684f stargift:Vector<InputSavedStarGift> = Updates;
 
 stickers.createStickerSet#9021ab67 flags:# masks:flags.0?true emojis:flags.5?true text_color:flags.6?true user_id:InputUser title:string short_name:string thumb:flags.2?InputDocument stickers:Vector<InputStickerSetItem> software:flags.3?string = messages.StickerSet;
 stickers.removeStickerFromSet#f7760f51 sticker:InputDocument = messages.StickerSet;
@@ -2469,11 +2915,11 @@ phone.setCallRating#59ead627 flags:# user_initiative:flags.0?true peer:InputPhon
 phone.saveCallDebug#277add7e peer:InputPhoneCall debug:DataJSON = Bool;
 phone.sendSignalingData#ff7a9383 peer:InputPhoneCall data:bytes = Bool;
 phone.createGroupCall#48cdc6d8 flags:# rtmp_stream:flags.2?true peer:InputPeer random_id:int title:flags.0?string schedule_date:flags.1?int = Updates;
-phone.joinGroupCall#b132ff7b flags:# muted:flags.0?true video_stopped:flags.2?true call:InputGroupCall join_as:InputPeer invite_hash:flags.1?string params:DataJSON = Updates;
+phone.joinGroupCall#8fb53057 flags:# muted:flags.0?true video_stopped:flags.2?true call:InputGroupCall join_as:InputPeer invite_hash:flags.1?string public_key:flags.3?int256 block:flags.3?bytes params:DataJSON = Updates;
 phone.leaveGroupCall#500377f9 call:InputGroupCall source:int = Updates;
 phone.inviteToGroupCall#7b393160 call:InputGroupCall users:Vector<InputUser> = Updates;
 phone.discardGroupCall#7a777135 call:InputGroupCall = Updates;
-phone.toggleGroupCallSettings#74bbb43d flags:# reset_invite_hash:flags.1?true call:InputGroupCall join_muted:flags.0?Bool = Updates;
+phone.toggleGroupCallSettings#974392f2 flags:# reset_invite_hash:flags.1?true call:InputGroupCall join_muted:flags.0?Bool messages_enabled:flags.2?Bool send_paid_messages_stars:flags.3?long = Updates;
 phone.getGroupCall#41845db call:InputGroupCall limit:int = phone.GroupCall;
 phone.getGroupParticipants#c558d8ab call:InputGroupCall ids:Vector<InputPeer> sources:Vector<int> offset:string limit:int = phone.GroupParticipants;
 phone.checkGroupCall#b59cf977 call:InputGroupCall sources:Vector<int> = Vector<int>;
@@ -2488,8 +2934,20 @@ phone.saveDefaultGroupCallJoinAs#575e1f8c peer:InputPeer join_as:InputPeer = Boo
 phone.joinGroupCallPresentation#cbea6bc4 call:InputGroupCall params:DataJSON = Updates;
 phone.leaveGroupCallPresentation#1c50d144 call:InputGroupCall = Updates;
 phone.getGroupCallStreamChannels#1ab21940 call:InputGroupCall = phone.GroupCallStreamChannels;
-phone.getGroupCallStreamRtmpUrl#deb3abbf peer:InputPeer revoke:Bool = phone.GroupCallStreamRtmpUrl;
+phone.getGroupCallStreamRtmpUrl#5af4c73a flags:# live_story:flags.0?true peer:InputPeer revoke:Bool = phone.GroupCallStreamRtmpUrl;
 phone.saveCallLog#41248786 peer:InputPhoneCall file:InputFile = Bool;
+phone.createConferenceCall#7d0444bb flags:# muted:flags.0?true video_stopped:flags.2?true join:flags.3?true random_id:int public_key:flags.3?int256 block:flags.3?bytes params:flags.3?DataJSON = Updates;
+phone.deleteConferenceCallParticipants#8ca60525 flags:# only_left:flags.0?true kick:flags.1?true call:InputGroupCall ids:Vector<long> block:bytes = Updates;
+phone.sendConferenceCallBroadcast#c6701900 call:InputGroupCall block:bytes = Updates;
+phone.inviteConferenceCallParticipant#bcf22685 flags:# video:flags.0?true call:InputGroupCall user_id:InputUser = Updates;
+phone.declineConferenceCallInvite#3c479971 msg_id:int = Updates;
+phone.getGroupCallChainBlocks#ee9f88a6 call:InputGroupCall sub_chain_id:int offset:int limit:int = Updates;
+phone.sendGroupCallMessage#b1d11410 flags:# call:InputGroupCall random_id:long message:TextWithEntities allow_paid_stars:flags.0?long send_as:flags.1?InputPeer = Updates;
+phone.sendGroupCallEncryptedMessage#e5afa56d call:InputGroupCall encrypted_message:bytes = Bool;
+phone.deleteGroupCallMessages#f64f54f7 flags:# report_spam:flags.0?true call:InputGroupCall messages:Vector<int> = Updates;
+phone.deleteGroupCallParticipantMessages#1dbfeca0 flags:# report_spam:flags.0?true call:InputGroupCall participant:InputPeer = Updates;
+phone.getGroupCallStars#6f636302 call:InputGroupCall = phone.GroupCallStars;
+phone.saveDefaultSendAs#4167add1 call:InputGroupCall send_as:InputPeer = Bool;
 
 langpack.getLangPack#f2f2330a lang_pack:string lang_code:string = LangPackDifference;
 langpack.getStrings#efea3803 lang_pack:string lang_code:string keys:Vector<string> = Vector<LangPackString>;
@@ -2506,9 +2964,7 @@ stats.getMessagePublicForwards#5f150144 channel:InputChannel msg_id:int offset:s
 stats.getMessageStats#b6e0a3f5 flags:# dark:flags.0?true channel:InputChannel msg_id:int = stats.MessageStats;
 stats.getStoryStats#374fef40 flags:# dark:flags.0?true peer:InputPeer id:int = stats.StoryStats;
 stats.getStoryPublicForwards#a6437ef6 peer:InputPeer id:int offset:string limit:int = stats.PublicForwards;
-stats.getBroadcastRevenueStats#75dfb671 flags:# dark:flags.0?true channel:InputChannel = stats.BroadcastRevenueStats;
-stats.getBroadcastRevenueWithdrawalUrl#2a65ef73 channel:InputChannel password:InputCheckPasswordSRP = stats.BroadcastRevenueWithdrawalUrl;
-stats.getBroadcastRevenueTransactions#69280f channel:InputChannel offset:int limit:int = stats.BroadcastRevenueTransactions;
+stats.getPollStats#c27dfa68 flags:# dark:flags.0?true peer:InputPeer msg_id:int = stats.PollStats;
 
 chatlists.exportChatlistInvite#8472478e chatlist:InputChatlist title:string peers:Vector<InputPeer> = chatlists.ExportedChatlistInvite;
 chatlists.deleteExportedInvite#719c5c5e chatlist:InputChatlist slug:string = Bool;
@@ -2522,9 +2978,9 @@ chatlists.hideChatlistUpdates#66e486fb chatlist:InputChatlist = Bool;
 chatlists.getLeaveChatlistSuggestions#fdbcd714 chatlist:InputChatlist = Vector<Peer>;
 chatlists.leaveChatlist#74fae13a chatlist:InputChatlist peers:Vector<InputPeer> = Updates;
 
-stories.canSendStory#c7dfdfdd peer:InputPeer = Bool;
-stories.sendStory#e4e6694b flags:# pinned:flags.2?true noforwards:flags.4?true fwd_modified:flags.7?true peer:InputPeer media:InputMedia media_areas:flags.5?Vector<MediaArea> caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> random_id:long period:flags.3?int fwd_from_id:flags.6?InputPeer fwd_from_story:flags.6?int = Updates;
-stories.editStory#b583ba46 flags:# peer:InputPeer id:int media:flags.0?InputMedia media_areas:flags.3?Vector<MediaArea> caption:flags.1?string entities:flags.1?Vector<MessageEntity> privacy_rules:flags.2?Vector<InputPrivacyRule> = Updates;
+stories.canSendStory#30eb63f0 peer:InputPeer = stories.CanSendStoryCount;
+stories.sendStory#8f9e6898 flags:# pinned:flags.2?true noforwards:flags.4?true fwd_modified:flags.7?true peer:InputPeer media:InputMedia media_areas:flags.5?Vector<MediaArea> caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> random_id:long period:flags.3?int fwd_from_id:flags.6?InputPeer fwd_from_story:flags.6?int albums:flags.8?Vector<int> music:flags.9?InputDocument = Updates;
+stories.editStory#2c63a72b flags:# peer:InputPeer id:int media:flags.0?InputMedia media_areas:flags.3?Vector<MediaArea> caption:flags.1?string entities:flags.1?Vector<MessageEntity> privacy_rules:flags.2?Vector<InputPrivacyRule> music:flags.4?InputDocument = Updates;
 stories.deleteStories#ae59db5f peer:InputPeer id:Vector<int> = Vector<int>;
 stories.togglePinned#9a75a1ef peer:InputPeer id:Vector<int> pinned:Bool = Vector<int>;
 stories.getAllStories#eeb0d625 flags:# next:flags.1?true hidden:flags.2?true state:flags.0?string = stories.AllStories;
@@ -2542,12 +2998,19 @@ stories.activateStealthMode#57bbd166 flags:# past:flags.0?true future:flags.1?tr
 stories.sendReaction#7fd736b2 flags:# add_to_recent:flags.0?true peer:InputPeer story_id:int reaction:Reaction = Updates;
 stories.getPeerStories#2c4ada50 peer:InputPeer = stories.PeerStories;
 stories.getAllReadPeerStories#9b5ae7f9 = Updates;
-stories.getPeerMaxIDs#535983c3 id:Vector<InputPeer> = Vector<int>;
+stories.getPeerMaxIDs#78499170 id:Vector<InputPeer> = Vector<RecentStory>;
 stories.getChatsToSend#a56a8b60 = messages.Chats;
 stories.togglePeerStoriesHidden#bd0415c4 peer:InputPeer hidden:Bool = Bool;
 stories.getStoryReactionsList#b9b2881f flags:# forwards_first:flags.2?true peer:InputPeer id:int reaction:flags.0?Reaction offset:flags.1?string limit:int = stories.StoryReactionsList;
 stories.togglePinnedToTop#b297e9b peer:InputPeer id:Vector<int> = Bool;
-stories.searchPosts#6cea116a flags:# hashtag:flags.0?string area:flags.1?MediaArea offset:string limit:int = stories.FoundStories;
+stories.searchPosts#d1810907 flags:# hashtag:flags.0?string area:flags.1?MediaArea peer:flags.2?InputPeer offset:string limit:int = stories.FoundStories;
+stories.createAlbum#a36396e5 peer:InputPeer title:string stories:Vector<int> = StoryAlbum;
+stories.updateAlbum#5e5259b6 flags:# peer:InputPeer album_id:int title:flags.0?string delete_stories:flags.1?Vector<int> add_stories:flags.2?Vector<int> order:flags.3?Vector<int> = StoryAlbum;
+stories.reorderAlbums#8535fbd9 peer:InputPeer order:Vector<int> = Bool;
+stories.deleteAlbum#8d3456d0 peer:InputPeer album_id:int = Bool;
+stories.getAlbums#25b3eac7 peer:InputPeer hash:long = stories.Albums;
+stories.getAlbumStories#ac806d61 peer:InputPeer album_id:int offset:int limit:int = stories.Stories;
+stories.startLive#d069ccde flags:# pinned:flags.2?true noforwards:flags.4?true rtmp_stream:flags.5?true peer:InputPeer caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> random_id:long messages_enabled:flags.6?Bool send_paid_messages_stars:flags.7?long = Updates;
 
 premium.getBoostsList#60f67660 flags:# gifts:flags.0?true peer:InputPeer offset:string limit:int = premium.BoostsList;
 premium.getMyBoosts#be77b4a = premium.MyBoosts;
@@ -2565,4 +3028,12 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-// LAYER 190
+aicompose.createTone#4aa83913 flags:# display_author:flags.0?true emoji_id:long title:string prompt:string = AiComposeTone;
+aicompose.updateTone#903bcf59 flags:# tone:InputAiComposeTone display_author:flags.0?Bool emoji_id:flags.1?long title:flags.2?string prompt:flags.3?string = AiComposeTone;
+aicompose.saveTone#1782cbb1 tone:InputAiComposeTone unsave:Bool = Bool;
+aicompose.deleteTone#dd39316a tone:InputAiComposeTone = Bool;
+aicompose.getTone#b2e8ba03 tone:InputAiComposeTone = aicompose.Tones;
+aicompose.getTones#abd59201 hash:long = aicompose.Tones;
+aicompose.getToneExample#d1b4ab14 tone:InputAiComposeTone num:int = AiComposeToneExample;
+
+// LAYER 227
diff --git a/Telegram/SourceFiles/mtproto/scheme/mtproto.tl b/Telegram/SourceFiles/mtproto/scheme/mtproto.tl
index 57d571fcda6e0a..76225965bfc794 100644
--- a/Telegram/SourceFiles/mtproto/scheme/mtproto.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/mtproto.tl
@@ -112,6 +112,9 @@ tlsBlockGrease seed:int = TlsBlock;
 tlsBlockPublicKey = TlsBlock;
 tlsBlockScope entries:Vector<TlsBlock> = TlsBlock;
 tlsBlockPermutation entries:Vector<Vector<TlsBlock>> = TlsBlock;
+tlsBlockM = TlsBlock;
+tlsBlockE = TlsBlock;
+tlsBlockPadding = TlsBlock;
 
 ---functions---
 
diff --git a/Telegram/SourceFiles/mtproto/session.cpp b/Telegram/SourceFiles/mtproto/session.cpp
index 0a50a45614fe7c..a826f70c93f097 100644
--- a/Telegram/SourceFiles/mtproto/session.cpp
+++ b/Telegram/SourceFiles/mtproto/session.cpp
@@ -180,7 +180,7 @@ void Session::watchDcKeyChanges() {
 	_instance->dcTemporaryKeyChanged(
 	) | rpl::filter([=](DcId dcId) {
 		return (dcId == _shiftedDcId) || (dcId == BareDcId(_shiftedDcId));
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		DEBUG_LOG(("AuthKey Info: dcTemporaryKeyChanged in Session %1"
 			).arg(_shiftedDcId));
 		if (const auto captured = _private) {
@@ -197,7 +197,7 @@ void Session::watchDcOptionsChanges() {
 	_instance->dcOptions().changed(
 	) | rpl::filter([=](DcId dcId) {
 		return (BareDcId(_shiftedDcId) == dcId) && (_private != nullptr);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		InvokeQueued(_private, [captured = _private] {
 			captured->dcOptionsChanged();
 		});
@@ -207,7 +207,7 @@ void Session::watchDcOptionsChanges() {
 	) | rpl::filter([=] {
 		return (_private != nullptr)
 			&& (_instance->dcOptions().dcType(_shiftedDcId) == DcType::Cdn);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		InvokeQueued(_private, [captured = _private] {
 			captured->cdnConfigChanged();
 		});
@@ -399,12 +399,10 @@ int32 Session::getState() const {
 
 	if (_private) {
 		const auto s = _private->getState();
-		if (s == ConnectedState) {
+		if (s == ConnectedState
+			|| s == ConnectingState
+			|| s == DisconnectedState) {
 			return s;
-		} else if (s == ConnectingState || s == DisconnectedState) {
-			if (result < 0) {
-				return s;
-			}
 		} else if (s < 0) {
 			if (result < 0 && s > result) {
 				result = s;
diff --git a/Telegram/SourceFiles/mtproto/session_private.cpp b/Telegram/SourceFiles/mtproto/session_private.cpp
index 96a0c82686f96d..86be336379b403 100644
--- a/Telegram/SourceFiles/mtproto/session_private.cpp
+++ b/Telegram/SourceFiles/mtproto/session_private.cpp
@@ -5,8 +5,10 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
+#include "base/options.h"
 #include "mtproto/session_private.h"
 
+#include "core/version.h"
 #include "mtproto/details/mtproto_bound_key_creator.h"
 #include "mtproto/details/mtproto_dcenter.h"
 #include "mtproto/details/mtproto_dump_to_text.h"
@@ -138,8 +140,16 @@ void WrapInvokeAfter(
 	return different;
 }
 
+base::options::toggle OptionPreferIPv6({
+	.id = kOptionPreferIPv6,
+	.name = "Prefer IPv6",
+	.description = "Prefer IPv6 if it is available. Require \"Try connecting through IPv6\" to be enabled",
+});
+
 } // namespace
 
+const char kOptionPreferIPv6[] = "prefer-ipv6";
+
 SessionPrivate::SessionPrivate(
 	not_null<Instance*> instance,
 	not_null<QThread*> thread,
@@ -187,7 +197,7 @@ void SessionPrivate::appendTestConnection(
 		const bytes::vector &protocolSecret) {
 	QWriteLocker lock(&_stateMutex);
 
-	const auto priority = (qthelp::is_ipv6(ip) ? 0 : 1)
+	const auto priority = (qthelp::is_ipv6(ip) ? (OptionPreferIPv6.value() ? 2 : 0) : 1)
 		+ (protocol == DcOptions::Variants::Tcp ? 1 : 0)
 		+ (protocolSecret.empty() ? 0 : 1);
 	_testConnections.push_back({
@@ -1126,6 +1136,8 @@ void SessionPrivate::onSentSome(uint64 size) {
 	if (!_waitForReceivedTimer.isActive()) {
 		auto remain = static_cast<uint64>(_waitForReceived);
 		if (!_oldConnection) {
+			Assert(remain <= kMaxReceiveTimeout);
+
 			// 8kb / sec, so 512 kb give 64 sec
 			auto remainBySize = size * _waitForReceived / 8192;
 			remain = std::clamp(
@@ -1203,7 +1215,9 @@ void SessionPrivate::waitReceivedFailed() {
 
 	DEBUG_LOG(("MTP Info: bad connection, _waitForReceived: %1ms").arg(_waitForReceived));
 	if (_waitForReceived < kMaxReceiveTimeout) {
-		_waitForReceived *= 2;
+		_waitForReceived = std::min(
+			_waitForReceived * 2,
+			kMaxReceiveTimeout);
 	}
 	doDisconnect();
 	if (_retryTimer.isActive()) {
@@ -1379,9 +1393,10 @@ void SessionPrivate::handleReceived() {
 		auto sfrom = decryptedInts + 4U; // msg_id + seq_no + length + message
 		MTP_LOG(_shiftedDcId, ("Recv: ")
 			+ DumpToText(sfrom, end)
-			+ QString(" (dc:%1,key:%2)"
+			+ QString(" (dc:%1,key:%2,session:%3)"
 			).arg(AbstractConnection::ProtocolDcDebugId(getProtocolDcId())
-			).arg(_encryptionKey->keyId()));
+			).arg(_encryptionKey->keyId()
+			).arg(_sessionId));
 
 		const auto registered = _receivedMessageIds.registerMsgId(
 			msgId,
@@ -2654,9 +2669,10 @@ bool SessionPrivate::sendSecureRequest(
 	auto from = request->constData() + 4;
 	MTP_LOG(_shiftedDcId, ("Send: ")
 		+ DumpToText(from, from + messageSize)
-		+ QString(" (dc:%1,key:%2)"
+		+ QString(" (dc:%1,key:%2,session:%3)"
 		).arg(AbstractConnection::ProtocolDcDebugId(getProtocolDcId())
-		).arg(_encryptionKey->keyId()));
+		).arg(_encryptionKey->keyId()
+		).arg(_sessionId));
 
 	uchar encryptedSHA256[32];
 	MTPint128 &msgKey(*(MTPint128*)(encryptedSHA256 + 8));
diff --git a/Telegram/SourceFiles/mtproto/session_private.h b/Telegram/SourceFiles/mtproto/session_private.h
index f54d95097838ad..7ab6558c9c22c9 100644
--- a/Telegram/SourceFiles/mtproto/session_private.h
+++ b/Telegram/SourceFiles/mtproto/session_private.h
@@ -240,5 +240,7 @@ class SessionPrivate final : public QObject {
 
 };
 
+extern const char kOptionPreferIPv6[];
+
 } // namespace details
 } // namespace MTP
diff --git a/Telegram/SourceFiles/overview/overview.style b/Telegram/SourceFiles/overview/overview.style
index 6910d536bad097..d51f1de1d1cd81 100644
--- a/Telegram/SourceFiles/overview/overview.style
+++ b/Telegram/SourceFiles/overview/overview.style
@@ -132,6 +132,11 @@ linksBorderFg: shadowFg;
 linksPhotoSize: 46px;
 linksPhotoPadding: 12px;
 
+overviewLinkIvIcon: IconEmoji {
+	icon: icon {{ "info/info_iv_mini-12x12", windowActiveTextFg }};
+	padding: margins(0px, 5px, 2px, 0px);
+}
+
 overviewVideoStatusMargin: 3px;
 overviewVideoStatusPadding: point(6px, 0px);
 overviewVideoStatusRadius: 4px;
diff --git a/Telegram/SourceFiles/overview/overview_checkbox.cpp b/Telegram/SourceFiles/overview/overview_checkbox.cpp
new file mode 100644
index 00000000000000..9722aa21fed56c
--- /dev/null
+++ b/Telegram/SourceFiles/overview/overview_checkbox.cpp
@@ -0,0 +1,60 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "overview/overview_checkbox.h"
+
+#include "styles/style_overview.h"
+#include "styles/style_widgets.h"
+
+namespace Overview::Layout {
+
+void Checkbox::paint(
+		QPainter &p,
+		QPoint position,
+		int outerWidth,
+		bool selected,
+		bool selecting) {
+	_check.setDisplayInactive(selecting);
+	_check.setChecked(selected);
+	const auto pression = _pression.value((_active && _pressed) ? 1. : 0.);
+	const auto scale = 1. - (1. - st::overviewCheckPressedSize) * pression;
+	_check.paint(p, position.x(), position.y(), outerWidth, scale);
+}
+
+void Checkbox::setActive(bool active) {
+	_active = active;
+	if (_pressed) {
+		startAnimation();
+	}
+}
+
+void Checkbox::setPressed(bool pressed) {
+	_pressed = pressed;
+	if (_active) {
+		startAnimation();
+	}
+}
+
+void Checkbox::setChecked(bool checked, anim::type animated) {
+	_check.setChecked(checked, animated);
+}
+
+void Checkbox::startAnimation() {
+	const auto showPressed = (_pressed && _active);
+	_pression.start(
+		_updateCallback,
+		showPressed ? 0. : 1.,
+		showPressed ? 1. : 0.,
+		st::overviewCheck.duration);
+}
+
+void Checkbox::finishAnimating() {
+	_pression.stop();
+	_check.finishAnimating();
+}
+
+} // namespace Overview::Layout
diff --git a/Telegram/SourceFiles/overview/overview_checkbox.h b/Telegram/SourceFiles/overview/overview_checkbox.h
new file mode 100644
index 00000000000000..2da919e232b948
--- /dev/null
+++ b/Telegram/SourceFiles/overview/overview_checkbox.h
@@ -0,0 +1,54 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/round_checkbox.h"
+
+namespace style {
+struct RoundCheckbox;
+} // namespace style
+
+namespace Overview::Layout {
+
+class Checkbox {
+public:
+	template <typename UpdateCallback>
+	Checkbox(UpdateCallback callback, const style::RoundCheckbox &st)
+	: _updateCallback(callback)
+	, _check(st, _updateCallback) {
+	}
+
+	void paint(
+		QPainter &p,
+		QPoint position,
+		int outerWidth,
+		bool selected,
+		bool selecting);
+
+	void setActive(bool active);
+	void setPressed(bool pressed);
+	void setChecked(bool checked, anim::type animated = anim::type::normal);
+	void finishAnimating();
+
+	void invalidateCache() {
+		_check.invalidateCache();
+	}
+
+private:
+	void startAnimation();
+
+	Fn<void()> _updateCallback;
+	Ui::RoundCheckbox _check;
+
+	Ui::Animations::Simple _pression;
+	bool _active = false;
+	bool _pressed = false;
+
+};
+
+} // namespace Overview::Layout
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 4357a17eb1123e..ca3f7aee686054 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -7,8 +7,11 @@ For license and copyright information please follow this link:
 */
 #include "overview/overview_layout.h"
 
+#include "overview/overview_checkbox.h"
 #include "overview/overview_layout_delegate.h"
-#include "core/ui_integration.h" // Core::MarkedTextContext.
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "core/ui_integration.h" // TextContext
 #include "data/data_document.h"
 #include "data/data_document_resolver.h"
 #include "data/data_session.h"
@@ -23,6 +26,7 @@ For license and copyright information please follow this link:
 #include "storage/file_upload.h"
 #include "main/main_session.h"
 #include "media/audio/media_audio.h"
+#include "media/media_common.h"
 #include "media/player/media_player_instance.h"
 #include "storage/localstorage.h"
 #include "history/history.h"
@@ -30,8 +34,11 @@ For license and copyright information please follow this link:
 #include "history/history_item_components.h"
 #include "history/history_item_helpers.h"
 #include "history/view/history_view_cursor_state.h"
+#include "history/view/media/history_view_media_common.h"
 #include "history/view/media/history_view_document.h" // DrawThumbnailAsSongCover
+#include "iv/iv_instance.h"
 #include "base/unixtime.h"
+#include "boxes/sticker_set_box.h"
 #include "ui/effects/round_checkbox.h"
 #include "ui/effects/spoiler_mess.h"
 #include "ui/image/image.h"
@@ -43,12 +50,12 @@ For license and copyright information please follow this link:
 #include "ui/painter.h"
 #include "ui/power_saving.h"
 #include "ui/ui_utility.h"
+#include "window/window_session_controller.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_overview.h"
 
-namespace Overview {
-namespace Layout {
+namespace Overview::Layout {
 namespace {
 
 using TextState = HistoryView::TextState;
@@ -63,11 +70,62 @@ TextParseOptions _documentNameOptions = {
 constexpr auto kMaxInlineArea = 1280 * 720;
 constexpr auto kStoryRatio = 1.46;
 
+using ::Media::ValidFrameSize;
+
 [[nodiscard]] bool CanPlayInline(not_null<DocumentData*> document) {
-	const auto dimensions = document->dimensions;
-	return dimensions.width() * dimensions.height() <= kMaxInlineArea;
+	return ValidFrameSize(document->dimensions, kMaxInlineArea);
+}
+
+[[nodiscard]] ClickHandlerPtr MakeUrlHandler(const QString &url) {
+	return UrlClickHandler::IsSuspicious(url)
+		? std::make_shared<HiddenUrlClickHandler>(url)
+		: std::make_shared<UrlClickHandler>(url, false);
 }
 
+void OpenPreferringIv(
+		not_null<Window::SessionController*> controller,
+		WebPageData *page,
+		const TextWithEntities &text,
+		const QString &url,
+		QVariant context) {
+	if (page && page->iv && UrlMatchesWebPage(page, url)) {
+		const auto hash = ExtractHash(page, text);
+		Core::App().iv().show(controller, page->iv.get(), hash);
+	} else {
+		Core::App().iv().openWithIvPreferred(controller, url, context);
+	}
+}
+
+class IvLink final : public UrlClickHandler {
+public:
+	IvLink(WebPageData *page, TextWithEntities text, const QString &url)
+	: UrlClickHandler(url, false)
+	, _page(page)
+	, _text(std::move(text)) {
+	}
+
+	void onClick(ClickContext context) const override {
+		const auto button = context.button;
+		if (button != Qt::LeftButton && button != Qt::MiddleButton) {
+			return;
+		}
+		const auto my = context.other.value<ClickHandlerContext>();
+		if (const auto controller = my.sessionWindow.get()) {
+			OpenPreferringIv(
+				controller,
+				_page,
+				_text,
+				originalUrl(),
+				context.other);
+		}
+	}
+
+private:
+	WebPageData *_page = nullptr;
+	TextWithEntities _text;
+
+};
+
 [[nodiscard]] QImage CropMediaFrame(QImage image, int width, int height) {
 	const auto ratio = style::DevicePixelRatio();
 	width *= ratio;
@@ -98,63 +156,28 @@ constexpr auto kStoryRatio = 1.46;
 	}
 }
 
-} // namespace
-
-class Checkbox {
-public:
-	template <typename UpdateCallback>
-	Checkbox(UpdateCallback callback, const style::RoundCheckbox &st)
-	: _updateCallback(callback)
-	, _check(st, _updateCallback) {
-	}
-
-	void paint(Painter &p, QPoint position, int outerWidth, bool selected, bool selecting);
-
-	void setActive(bool active);
-	void setPressed(bool pressed);
-
-	void invalidateCache() {
-		_check.invalidateCache();
-	}
-
-private:
-	void startAnimation();
-
-	Fn<void()> _updateCallback;
-	Ui::RoundCheckbox _check;
-
-	Ui::Animations::Simple _pression;
-	bool _active = false;
-	bool _pressed = false;
-
-};
-
-void Checkbox::paint(Painter &p, QPoint position, int outerWidth, bool selected, bool selecting) {
-	_check.setDisplayInactive(selecting);
-	_check.setChecked(selected);
-	const auto pression = _pression.value((_active && _pressed) ? 1. : 0.);
-	const auto masterScale = 1. - (1. - st::overviewCheckPressedSize) * pression;
-	_check.paint(p, position.x(), position.y(), outerWidth, masterScale);
-}
-
-void Checkbox::setActive(bool active) {
-	_active = active;
-	if (_pressed) {
-		startAnimation();
-	}
-}
-
-void Checkbox::setPressed(bool pressed) {
-	_pressed = pressed;
-	if (_active) {
-		startAnimation();
-	}
+void PaintSensitiveTag(Painter &p, QRect r) {
+	auto text = Ui::Text::String();
+	text.setText(
+		st::semiboldTextStyle,
+		tr::lng_sensitive_tag(tr::now));
+	const auto width = text.maxWidth();
+	const auto inner = QRect(0, 0, width, text.minHeight());
+	const auto outer = style::centerrect(r, inner.marginsAdded(st::paidTagPadding));
+	const auto size = outer.size();
+	const auto radius = std::min(size.width(), size.height()) / 2;
+	auto hq = PainterHighQualityEnabler(p);
+
+	p.setPen(Qt::NoPen);
+	p.setBrush(st::radialBg);
+	p.drawRoundedRect(outer, radius, radius);
+	p.setPen(st::radialFg);
+	text.draw(p, {
+		.position = outer.marginsRemoved(st::paidTagPadding).topLeft(),
+	});
 }
 
-void Checkbox::startAnimation() {
-	auto showPressed = (_pressed && _active);
-	_pression.start(_updateCallback, showPressed ? 0. : 1., showPressed ? 1. : 0., st::overviewCheck.duration);
-}
+} // namespace
 
 ItemBase::ItemBase(
 	not_null<Delegate*> delegate,
@@ -327,18 +350,29 @@ Photo::Photo(
 	MediaOptions options)
 : ItemBase(delegate, parent)
 , _data(photo)
-, _link(std::make_shared<PhotoOpenClickHandler>(
-	photo,
-	crl::guard(this, [=](FullMsgId id) {
+, _spoiler((options.spoiler || parent->isMediaSensitive())
+	? std::make_unique<Ui::SpoilerAnimation>([=] {
+		delegate->repaintItem(this);
+	})
+	: nullptr)
+, _sensitiveSpoiler(parent->isMediaSensitive() ? 1 : 0)
+, _story(options.story)
+, _storyPinned(options.storyPinned)
+, _storyShowPinned(options.storyShowPinned)
+, _storyHidden(options.storyHidden)
+, _storyShowHidden(options.storyShowHidden)
+, _link(_sensitiveSpoiler
+	? HistoryView::MakeSensitiveMediaLink(
+		std::make_shared<LambdaClickHandler>(crl::guard(this, [=] {
+			maybeClearSensitiveSpoiler();
+		})),
+		parent)
+	: _spoiler
+	? std::make_shared<LambdaClickHandler>(crl::guard(this, [=] {
 		clearSpoiler();
-		delegate->openPhoto(photo, id);
-	}),
-	parent->fullId()))
-, _spoiler(options.spoiler ? std::make_unique<Ui::SpoilerAnimation>([=] {
-	delegate->repaintItem(this);
-}) : nullptr)
-, _pinned(options.pinned)
-, _story(options.story) {
+		_link = makeOpenPhotoHandler();
+	}))
+	: makeOpenPhotoHandler()) {
 	if (_data->inlineThumbnailBytes().isEmpty()
 		&& (_data->hasExact(Data::PhotoSize::Small)
 			|| _data->hasExact(Data::PhotoSize::Thumbnail))) {
@@ -348,6 +382,16 @@ Photo::Photo(
 
 Photo::~Photo() = default;
 
+ClickHandlerPtr Photo::makeOpenPhotoHandler() {
+	return std::make_shared<PhotoOpenClickHandler>(
+		_data,
+		crl::guard(this, [=](FullMsgId id) {
+			clearSpoiler();
+			delegate()->openPhoto(_data, id);
+		}),
+		parent()->fullId());
+}
+
 void Photo::initDimensions() {
 	_maxw = 2 * st::overviewPhotoMinSize;
 	_minh = _story ? qRound(_maxw * kStoryRatio) : _maxw;
@@ -373,7 +417,7 @@ void Photo::paint(Painter &p, const QRect &clip, TextSelection selection, const
 				|| _dataMedia->image(Data::PhotoSize::Thumbnail));
 		if ((good && !_goodLoaded) || widthChanged) {
 			_goodLoaded = good;
-			_pix = QPixmap();
+			_pix = QImage();
 			if (_goodLoaded) {
 				setPixFrom(_dataMedia->image(Data::PhotoSize::Large)
 					? _dataMedia->image(Data::PhotoSize::Large)
@@ -391,7 +435,7 @@ void Photo::paint(Painter &p, const QRect &clip, TextSelection selection, const
 	if (_pix.isNull()) {
 		p.fillRect(0, 0, _width, _height, st::overviewPhotoBg);
 	} else {
-		p.drawPixmap(0, 0, _pix);
+		p.drawImage(0, 0, _pix);
 	}
 
 	if (_spoiler) {
@@ -401,13 +445,27 @@ void Photo::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			QRect(0, 0, _width, _height),
 			Ui::DefaultImageSpoiler().frame(
 				_spoiler->index(context->ms, paused)));
+
+		if (_sensitiveSpoiler) {
+			PaintSensitiveTag(p, QRect(0, 0, _width, _height));
+		}
+	}
+
+	if (_storyHidden) {
+		delegate()->hiddenMark()->paint(
+			p,
+			_pix,
+			_hiddenBgCache,
+			QPoint(),
+			QSize(_width, _height),
+			_width);
 	}
 
 	if (selected) {
 		p.fillRect(0, 0, _width, _height, st::overviewPhotoSelectOverlay);
 	}
 
-	if (_pinned) {
+	if (_storyPinned) {
 		const auto &icon = selected
 			? st::storyPinnedIconSelected
 			: st::storyPinnedIcon;
@@ -427,12 +485,12 @@ void Photo::setPixFrom(not_null<Image*> image) {
 	if (!_goodLoaded) {
 		img = Images::Blur(std::move(img));
 	}
-	_pix = Ui::PixmapFromImage(
-		CropMediaFrame(std::move(img), _width, _height));
+	_pix = CropMediaFrame(std::move(img), _width, _height);
 
 	// In case we have inline thumbnail we can unload all images and we still
 	// won't get a blank image in the media viewer when the photo is opened.
-	if (!_data->inlineThumbnailBytes().isEmpty()) {
+	if (!_data->inlineThumbnailBytes().isEmpty()
+		&& !delegate()->keepPhotoMediaLoaded()) {
 		_dataMedia = nullptr;
 		delegate()->unregisterHeavyItem(this);
 	}
@@ -453,15 +511,25 @@ void Photo::ensureDataMediaCreated() const {
 void Photo::clearSpoiler() {
 	if (_spoiler) {
 		_spoiler = nullptr;
-		_pix = QPixmap();
+		_sensitiveSpoiler = false;
+		_pix = QImage();
 		delegate()->repaintItem(this);
 	}
 }
 
+void Photo::maybeClearSensitiveSpoiler() {
+	if (_sensitiveSpoiler) {
+		clearSpoiler();
+		_link = makeOpenPhotoHandler();
+	}
+}
+
 void Photo::itemDataChanged() {
-	const auto pinned = parent()->isPinned();
-	if (_pinned != pinned) {
-		_pinned = pinned;
+	const auto pinned = _storyShowPinned && parent()->isPinned();
+	const auto hidden = _storyShowHidden && !parent()->storyInProfile();
+	if (_storyPinned != pinned || _storyHidden != hidden) {
+		_storyPinned = pinned;
+		_storyHidden = hidden;
 		delegate()->repaintItem(this);
 	}
 }
@@ -486,14 +554,40 @@ Video::Video(
 	MediaOptions options)
 : RadialProgressItem(delegate, parent)
 , _data(video)
+, _videoCover(LookupVideoCover(video, parent))
 , _duration(Ui::FormatDurationText(_data->duration() / 1000))
-, _spoiler(options.spoiler ? std::make_unique<Ui::SpoilerAnimation>([=] {
-	delegate->repaintItem(this);
-}) : nullptr)
-, _pinned(options.pinned)
-, _story(options.story) {
+, _spoiler((options.spoiler || parent->isMediaSensitive())
+	? std::make_unique<Ui::SpoilerAnimation>([=] {
+		delegate->repaintItem(this);
+	})
+	: nullptr)
+, _sensitiveSpoiler(parent->isMediaSensitive() ? 1 : 0)
+, _story(options.story)
+, _storyPinned(options.storyPinned)
+, _storyShowPinned(options.storyShowPinned)
+, _storyHidden(options.storyHidden)
+, _storyShowHidden(options.storyShowHidden) {
 	setDocumentLinks(_data);
-	_data->loadThumbnail(parent->fullId());
+	if (_sensitiveSpoiler) {
+		_openl = HistoryView::MakeSensitiveMediaLink(
+			std::make_shared<LambdaClickHandler>(crl::guard(this, [=] {
+				clearSpoiler();
+				setDocumentLinks(_data);
+			})),
+			parent);
+	} else if (_spoiler) {
+		_openl = std::make_shared<LambdaClickHandler>(crl::guard(this, [=] {
+			clearSpoiler();
+			setDocumentLinks(_data);
+		}));
+	}
+	if (!_videoCover) {
+		_data->loadThumbnail(parent->fullId());
+	} else if (_videoCover->inlineThumbnailBytes().isEmpty()
+		&& (_videoCover->hasExact(Data::PhotoSize::Small)
+			|| _videoCover->hasExact(Data::PhotoSize::Thumbnail))) {
+		_videoCover->load(Data::PhotoSize::Small, parent->fullId());
+	}
 }
 
 Video::~Video() = default;
@@ -512,13 +606,27 @@ int32 Video::resizeGetHeight(int32 width) {
 	return _height;
 }
 
-void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const PaintContext *context) {
+void Video::paint(
+		Painter &p,
+		const QRect &clip,
+		TextSelection selection,
+		const PaintContext *context) {
 	ensureDataMediaCreated();
 
 	const auto selected = (selection == FullSelection);
-	const auto blurred = _dataMedia->thumbnailInline();
-	const auto thumbnail = _spoiler ? nullptr : _dataMedia->thumbnail();
-	const auto good = _spoiler ? nullptr : _dataMedia->goodThumbnail();
+	const auto blurred = _videoCover
+		? _videoCoverMedia->thumbnailInline()
+		: _dataMedia->thumbnailInline();
+	const auto thumbnail = _spoiler
+		? nullptr
+		: _videoCover
+		? _videoCoverMedia->image(Data::PhotoSize::Small)
+		: _dataMedia->thumbnail();
+	const auto good = _spoiler
+		? nullptr
+		: _videoCover
+		? _videoCoverMedia->image(Data::PhotoSize::Large)
+		: _dataMedia->goodThumbnail();
 
 	bool loaded = dataLoaded(), displayLoading = _data->displayLoading();
 	if (displayLoading) {
@@ -539,15 +647,14 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			: thumbnail
 			? thumbnail->original()
 			: Images::Blur(blurred->original());
-		_pix = Ui::PixmapFromImage(
-			CropMediaFrame(std::move(img), _width, _height));
+		_pix = CropMediaFrame(std::move(img), _width, _height);
 		_pixBlurred = !(thumbnail || good);
 	}
 
 	if (_pix.isNull()) {
 		p.fillRect(0, 0, _width, _height, st::overviewPhotoBg);
 	} else {
-		p.drawPixmap(0, 0, _pix);
+		p.drawImage(0, 0, _pix);
 	}
 
 	if (_spoiler) {
@@ -557,13 +664,27 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			QRect(0, 0, _width, _height),
 			Ui::DefaultImageSpoiler().frame(
 				_spoiler->index(context->ms, paused)));
+
+		if (_sensitiveSpoiler) {
+			PaintSensitiveTag(p, QRect(0, 0, _width, _height));
+		}
+	}
+
+	if (_storyHidden) {
+		delegate()->hiddenMark()->paint(
+			p,
+			_pix,
+			_hiddenBgCache,
+			QPoint(),
+			QSize(_width, _height),
+			_width);
 	}
 
 	if (selected) {
 		p.fillRect(QRect(0, 0, _width, _height), st::overviewPhotoSelectOverlay);
 	}
 
-	if (_pinned) {
+	if (_storyPinned) {
 		const auto &icon = selected
 			? st::storyPinnedIconSelected
 			: st::storyPinnedIcon;
@@ -572,7 +693,7 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 
 	if (!selected && !context->selecting && radialOpacity < 1.) {
 		if (clip.intersects(QRect(0, _height - st::normalFont->height, _width, st::normalFont->height))) {
-			const auto download = !loaded && !_dataMedia->canBePlayed(parent());
+			const auto download = !loaded && !_dataMedia->canBePlayed();
 			const auto &icon = download
 				? (selected ? st::overviewVideoDownloadSelected : st::overviewVideoDownload)
 				: (selected ? st::overviewVideoPlaySelected : st::overviewVideoPlay);
@@ -580,14 +701,22 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			const auto margin = st::overviewVideoStatusMargin;
 			const auto padding = st::overviewVideoStatusPadding;
 			const auto statusX = margin + padding.x(), statusY = _height - margin - padding.y() - st::normalFont->height;
-			const auto statusW = icon.width() + padding.x() + st::normalFont->width(text) + 2 * padding.x();
+			const auto fullW = icon.width()
+				+ 3 * padding.x()
+				+ st::normalFont->width(text);
+			const auto showText = (fullW <= _width - 2 * margin);
+			const auto statusW = showText
+				? fullW
+				: (icon.width() + 2 * padding.x());
 			const auto statusH = st::normalFont->height + 2 * padding.y();
 			p.setOpacity(1. - radialOpacity);
 			Ui::FillRoundRect(p, statusX - padding.x(), statusY - padding.y(), statusW, statusH, selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? Ui::OverviewVideoSelectedCorners : Ui::OverviewVideoCorners);
 			p.setFont(st::normalFont);
 			p.setPen(st::msgDateImgFg);
 			icon.paint(p, statusX, statusY + (st::normalFont->height - icon.height()) / 2, _width);
-			p.drawTextLeft(statusX + icon.width() + padding.x(), statusY, _width, text, statusW - 2 * padding.x());
+			if (showText) {
+				p.drawTextLeft(statusX + icon.width() + padding.x(), statusY, _width, text, statusW - 2 * padding.x());
+			}
 		}
 	}
 
@@ -598,7 +727,7 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 		if (selected) {
 			p.setBrush(st::msgDateImgBgSelected);
 		} else {
-			auto over = ClickHandler::showAsActive((_data->loading() || _data->uploading()) ? _cancell : (loaded || _dataMedia->canBePlayed(parent())) ? _openl : _savel);
+			auto over = ClickHandler::showAsActive((_data->loading() || _data->uploading()) ? _cancell : (loaded || _dataMedia->canBePlayed()) ? _openl : _savel);
 			p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, _a_iconOver.value(over ? 1. : 0.)));
 		}
 
@@ -626,27 +755,42 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 }
 
 void Video::ensureDataMediaCreated() const {
-	if (_dataMedia) {
+	if (_dataMedia && (!_videoCover || _videoCoverMedia)) {
 		return;
 	}
 	_dataMedia = _data->createMediaView();
-	_dataMedia->goodThumbnailWanted();
-	_dataMedia->thumbnailWanted(parent()->fullId());
+	if (_videoCover) {
+		_videoCoverMedia = _videoCover->createMediaView();
+		_videoCover->load(Data::PhotoSize::Large, parent()->fullId());
+	} else {
+		_dataMedia->goodThumbnailWanted();
+		_dataMedia->thumbnailWanted(parent()->fullId());
+	}
 	delegate()->registerHeavyItem(this);
 }
 
 void Video::clearSpoiler() {
 	if (_spoiler) {
 		_spoiler = nullptr;
-		_pix = QPixmap();
+		_sensitiveSpoiler = false;
+		_pix = QImage();
 		delegate()->repaintItem(this);
 	}
 }
 
+void Video::maybeClearSensitiveSpoiler() {
+	if (_sensitiveSpoiler) {
+		clearSpoiler();
+		setDocumentLinks(_data);
+	}
+}
+
 void Video::itemDataChanged() {
-	const auto pinned = parent()->isPinned();
-	if (_pinned != pinned) {
-		_pinned = pinned;
+	const auto pinned = _storyShowPinned && parent()->isPinned();
+	const auto hidden = _storyShowHidden && !parent()->storyInProfile();
+	if (_storyPinned != pinned || _storyHidden != hidden) {
+		_storyPinned = pinned;
+		_storyHidden = hidden;
 		delegate()->repaintItem(this);
 	}
 }
@@ -678,9 +822,11 @@ TextState Video::getState(
 		StateRequest request) const {
 	if (hasPoint(point)) {
 		ensureDataMediaCreated();
-		const auto link = (_data->loading() || _data->uploading())
+		const auto link = _sensitiveSpoiler
+			? _openl
+			: (_data->loading() || _data->uploading())
 			? _cancell
-			: (dataLoaded() || _dataMedia->canBePlayed(parent()))
+			: (dataLoaded() || _dataMedia->canBePlayed())
 			? _openl
 			: _savel;
 		return { parent(), link };
@@ -731,7 +877,7 @@ Voice::Voice(
 	_data->loadThumbnail(parent->fullId());
 
 	updateName();
-	const auto dateText = Ui::Text::Link(
+	const auto dateText = tr::link(
 		langDateTime(base::unixtime::parse(parent->date()))); // Link 1.
 	_details.setMarkedText(
 		st::defaultTextStyle,
@@ -741,7 +887,7 @@ Voice::Voice(
 			dateText,
 			lt_duration,
 			{ .text = Ui::FormatDurationText(_data->duration() / 1000) },
-			Ui::Text::WithEntities));
+			tr::marked));
 	_details.setLink(1, JumpToMessageClickHandler(parent));
 }
 
@@ -808,7 +954,7 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 		}
 		const auto &checkLink = (_data->loading() || _data->uploading())
 			? _cancell
-			: (_dataMedia->canBePlayed(parent()) || loaded)
+			: (_dataMedia->canBePlayed() || loaded)
 			? _openl
 			: _savel;
 		if (selected) {
@@ -836,7 +982,7 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 				return &(selected ? _st.voiceCancelSelected : _st.voiceCancel);
 			} else if (showPause) {
 				return &(selected ? _st.voicePauseSelected : _st.voicePause);
-			} else if (_dataMedia->canBePlayed(parent())) {
+			} else if (_dataMedia->canBePlayed()) {
 				return &(selected ? _st.voicePlaySelected : _st.voicePlay);
 			}
 			return &(selected
@@ -923,7 +1069,7 @@ TextState Voice::getState(
 	if (inner.contains(point)) {
 		const auto link = (_data->loading() || _data->uploading())
 			? _cancell
-			: (_dataMedia->canBePlayed(parent()) || loaded)
+			: (_dataMedia->canBePlayed() || loaded)
 			? _openl
 			: _savel;
 		return { parent(), link };
@@ -995,7 +1141,7 @@ const style::RoundCheckbox &Voice::checkboxStyle() const {
 }
 
 void Voice::updateName() {
-	if (const auto forwarded = parent()->Get<HistoryMessageForwarded>()) {
+	if (parent()->Has<HistoryMessageForwarded>()) {
 		const auto info = parent()->originalHiddenSenderInfo();
 		const auto name = info
 			? tr::lng_forwarded(tr::now, lt_user, info->nameText().toString())
@@ -1020,10 +1166,10 @@ void Voice::updateName() {
 		st::defaultTextStyle,
 		parent()->originalText(),
 		Ui::DialogTextOptions(),
-		Core::MarkedTextContext{
+		Core::TextContext({
 			.session = &parent()->history()->session(),
-			.customEmojiRepaint = [=] { delegate()->repaintItem(this); },
-		});
+			.repaint = [=] { delegate()->repaintItem(this); },
+		}));
 }
 
 bool Voice::updateStatusText() {
@@ -1094,11 +1240,17 @@ Document::Document(
 		0);
 
 	if (withThumb()) {
-		_data->loadThumbnail(parent->fullId());
-		auto tw = style::ConvertScale(_data->thumbnailLocation().width());
-		auto th = style::ConvertScale(_data->thumbnailLocation().height());
-		if (tw > th) {
-			_thumbw = (tw * _st.fileThumbSize) / th;
+		if (_data->hasThumbnail()) {
+			_data->loadThumbnail(parent->fullId());
+			auto tw = style::ConvertScale(
+				_data->thumbnailLocation().width());
+			auto th = style::ConvertScale(
+				_data->thumbnailLocation().height());
+			if (tw > th) {
+				_thumbw = (tw * _st.fileThumbSize) / th;
+			} else {
+				_thumbw = _st.fileThumbSize;
+			}
 		} else {
 			_thumbw = _st.fileThumbSize;
 		}
@@ -1116,7 +1268,7 @@ Document::Document(
 bool Document::downloadInCorner() const {
 	return _data->isAudioFile()
 		&& parent()->allowsForward()
-		&& _data->canBeStreamed(parent())
+		&& _data->canBeStreamed()
 		&& !_data->inappPlaybackFailed();
 }
 
@@ -1179,7 +1331,7 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 				} else {
 					const auto over = ClickHandler::showAsActive(isLoading
 						? _cancell
-						: (loaded || _dataMedia->canBePlayed(parent()))
+						: (loaded || _dataMedia->canBePlayed())
 						? _openl
 						: _savel);
 					p.setBrush(anim::brush(
@@ -1201,7 +1353,7 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 						return &(selected
 							? _st.voicePauseSelected
 							: _st.voicePause);
-					} else if (loaded || _dataMedia->canBePlayed(parent())) {
+					} else if (loaded || _dataMedia->canBePlayed()) {
 						return &(selected
 							? _st.voicePlaySelected
 							: _st.voicePlay);
@@ -1214,7 +1366,7 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 					return &(selected ? _st.songCancelSelected : _st.songCancel);
 				} else if (showPause) {
 					return &(selected ? _st.songPauseSelected : _st.songPause);
-				} else if (loaded || _dataMedia->canBePlayed(parent())) {
+				} else if (loaded || _dataMedia->canBePlayed()) {
 					return &(selected ? _st.songPlaySelected : _st.songPlay);
 				}
 				return &(selected ? _st.songDownloadSelected : _st.songDownload);
@@ -1242,49 +1394,7 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 
 		QRect rthumb(style::rtlrect(0, st::linksBorder + _st.filePadding.top(), _st.fileThumbSize, _st.fileThumbSize, _width));
 		if (clip.intersects(rthumb)) {
-			if (wthumb) {
-				ensureDataMediaCreated();
-				const auto thumbnail = _dataMedia->thumbnail();
-				const auto blurred = _dataMedia->thumbnailInline();
-				if (thumbnail || blurred) {
-					if (_thumb.isNull() || (thumbnail && !_thumbLoaded)) {
-						_thumbLoaded = (thumbnail != nullptr);
-						const auto options = Images::Option::RoundSmall
-							| (_thumbLoaded
-								? Images::Option()
-								: Images::Option::Blur);
-						const auto image = thumbnail ? thumbnail : blurred;
-						_thumb = image->pixNoCache(
-							_thumbw * style::DevicePixelRatio(),
-							{
-								.options = options,
-								.outer = QSize(
-									_st.fileThumbSize,
-									_st.fileThumbSize),
-							});
-					}
-					p.drawPixmap(rthumb.topLeft(), _thumb);
-				} else {
-					p.setPen(Qt::NoPen);
-					p.setBrush(st::overviewFileThumbBg);
-					p.drawRoundedRect(
-						rthumb,
-						st::roundRadiusSmall,
-						st::roundRadiusSmall);
-				}
-			} else {
-				p.setPen(Qt::NoPen);
-				p.setBrush(_generic.color);
-				p.drawRoundedRect(
-					rthumb,
-					st::roundRadiusSmall,
-					st::roundRadiusSmall);
-				if (!radial && loaded && !_ext.isEmpty()) {
-					p.setFont(st::overviewFileExtFont);
-					p.setPen(st::overviewFileExtFg);
-					p.drawText(rthumb.left() + (rthumb.width() - _extw) / 2, rthumb.top() + st::overviewFileExtTop + st::overviewFileExtFont->ascent, _ext);
-				}
-			}
+			paintThumbnail(p, rthumb, wthumb, !radial && loaded);
 			if (selected) {
 				p.setPen(Qt::NoPen);
 				p.setBrush(st::defaultTextPalette.selectOverlay);
@@ -1368,6 +1478,85 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 	paintCheckbox(p, { checkLeft, checkTop }, selected, context);
 }
 
+void Document::paintThumbnail(
+		Painter &p,
+		QRect rthumb,
+		bool wthumb,
+		bool withExt) {
+	if (wthumb) {
+		ensureDataMediaCreated();
+		const auto good = _data->isSvgImage()
+			? _dataMedia->goodThumbnail()
+			: nullptr;
+		const auto thumbnail = good
+			? good
+			: _dataMedia->thumbnail();
+		const auto blurred = _dataMedia->thumbnailInline();
+		if (thumbnail || blurred) {
+			if (_thumb.isNull() || (thumbnail && !_thumbLoaded)) {
+				_thumbLoaded = (thumbnail != nullptr);
+				const auto options = Images::Option::RoundSmall
+					| (_thumbLoaded
+						? Images::Option()
+						: Images::Option::Blur);
+				const auto image = thumbnail ? thumbnail : blurred;
+				_thumb = image->pixNoCache(
+					_thumbw * style::DevicePixelRatio(),
+					{
+						.options = options,
+						.outer = QSize(
+							_st.fileThumbSize,
+							_st.fileThumbSize),
+					});
+			}
+			p.drawPixmap(rthumb.topLeft(), _thumb);
+		} else {
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::overviewFileThumbBg);
+			p.drawRoundedRect(
+				rthumb,
+				st::roundRadiusSmall,
+				st::roundRadiusSmall);
+		}
+	} else {
+		p.setPen(Qt::NoPen);
+		p.setBrush(_generic.color);
+		p.drawRoundedRect(
+			rthumb,
+			st::roundRadiusSmall,
+			st::roundRadiusSmall);
+		if (withExt && !_ext.isEmpty()) {
+			p.setFont(st::overviewFileExtFont);
+			p.setPen(st::overviewFileExtFg);
+			p.drawText(
+				rthumb.left() + (rthumb.width() - _extw) / 2,
+				rthumb.top()
+					+ st::overviewFileExtTop
+					+ st::overviewFileExtFont->ascent,
+				_ext);
+		}
+	}
+}
+
+QImage Document::dragPreviewImage() {
+	ensureDataMediaCreated();
+	const auto ratio = style::DevicePixelRatio();
+	auto result = QImage(
+		QSize(_st.fileThumbSize, _st.fileThumbSize) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(ratio);
+	result.fill(Qt::transparent);
+
+	auto p = Painter(&result);
+	auto hq = PainterHighQualityEnabler(p);
+	paintThumbnail(
+		p,
+		QRect(0, 0, _st.fileThumbSize, _st.fileThumbSize),
+		withThumb(),
+		true);
+	return result;
+}
+
 void Document::drawCornerDownload(QPainter &p, bool selected, const PaintContext *context) const {
 	if (dataLoaded()
 		|| _data->loadedInMediaCache()
@@ -1452,7 +1641,7 @@ TextState Document::getState(
 			const auto link = (!downloadInCorner()
 				&& (_data->loading() || _data->uploading()))
 				? _cancell
-				: (loaded || _dataMedia->canBePlayed(parent()))
+				: (loaded || _dataMedia->canBePlayed())
 				? _openl
 				: _savel;
 			return { parent(), link };
@@ -1540,6 +1729,10 @@ void Document::ensureDataMediaCreated() const {
 	}
 	_dataMedia = _data->createMediaView();
 	_dataMedia->thumbnailWanted(parent()->fullId());
+	if (_data->isSvgImage()) {
+		_dataMedia->goodThumbnailWanted();
+		Data::DocumentMedia::CheckGoodThumbnail(_data);
+	}
 	delegate()->registerHeavyItem(this);
 }
 
@@ -1568,7 +1761,8 @@ bool Document::iconAnimated() const {
 }
 
 bool Document::withThumb() const {
-	return !songLayout() && _data->hasThumbnail();
+	return !songLayout()
+		&& (_data->hasThumbnail() || _data->isSvgImage());
 }
 
 bool Document::updateStatusText() {
@@ -1633,7 +1827,7 @@ Link::Link(
 		const auto customUrl = entity.data();
 		const auto entityText = text.mid(entity.offset(), entity.length());
 		const auto url = customUrl.isEmpty() ? entityText : customUrl;
-		if (_links.isEmpty()) {
+		if (_links.empty()) {
 			mainUrl = url;
 		}
 		_links.push_back(LinkEntry(url, entityText));
@@ -1672,11 +1866,7 @@ Link::Link(
 		}
 	}
 
-	const auto createHandler = [](const QString &url) {
-		return UrlClickHandler::IsSuspicious(url)
-			? std::make_shared<HiddenUrlClickHandler>(url)
-			: std::make_shared<UrlClickHandler>(url, false);
-	};
+	const auto createHandler = MakeUrlHandler;
 	_page = media ? media->webpage() : nullptr;
 	if (_page) {
 		mainUrl = _page->url;
@@ -1710,6 +1900,7 @@ Link::Link(
 	} else if (!mainUrl.isEmpty()) {
 		_photol = createHandler(mainUrl);
 	}
+
 	if (from >= till && _page) {
 		text = _page->description.text;
 		from = 0;
@@ -1767,6 +1958,71 @@ Link::Link(
 		}
 	}
 	_titlew = st::semiboldFont->width(_title);
+
+	setupLinks(textWithEntities, mainUrl);
+}
+
+void Link::setupLinks(
+		const TextWithEntities &text,
+		const QString &mainUrl) {
+	const auto page = _page;
+	const auto ivCapable = [=](const QString &url) {
+		return Iv::PreferForUri(url)
+			|| (page && page->iv && UrlMatchesWebPage(page, url));
+	};
+	const auto makeHandler = [&](const QString &url, bool iv) {
+		return iv
+			? ClickHandlerPtr(std::make_shared<IvLink>(page, text, url))
+			: MakeUrlHandler(url);
+	};
+	static const auto kLinkOptions = TextParseOptions{
+		0,
+		0,
+		0,
+		Qt::LayoutDirectionAuto,
+	};
+	for (auto &link : _links) {
+		const auto iv = ivCapable(link.url);
+		link.handler = makeHandler(link.url, iv);
+		auto markup = iv
+			? Ui::Text::IconEmoji(&st::overviewLinkIvIcon)
+			: TextWithEntities();
+		const auto offset = int(markup.text.size());
+		markup.append(link.display);
+		markup.entities.push_back({
+			EntityType::CustomUrl,
+			offset,
+			int(link.display.size()),
+			link.url,
+		});
+		link.text.setMarkedText(st::defaultTextStyle, markup, kLinkOptions);
+		link.text.setLink(1, link.handler);
+	}
+
+	const auto titleUrl = !mainUrl.isEmpty()
+		? mainUrl
+		: (page ? page->url : QString());
+	if (!titleUrl.isEmpty()) {
+		_titlel = makeHandler(titleUrl, ivCapable(titleUrl));
+	}
+
+	if (!mainUrl.isEmpty() && ivCapable(mainUrl)) {
+		const auto previous = _photol;
+		_photol = std::make_shared<LambdaClickHandler>([=](
+				ClickContext context) {
+			const auto my = context.other.value<ClickHandlerContext>();
+			if (const auto controller = my.sessionWindow.get()) {
+				OpenPreferringIv(
+					controller,
+					page,
+					text,
+					mainUrl,
+					context.other);
+			} else if (previous) {
+				previous->onClick(context);
+			}
+		});
+	}
 }
 
 void Link::initDimensions() {
@@ -1785,8 +2041,11 @@ void Link::initDimensions() {
 int32 Link::resizeGetHeight(int32 width) {
 	_width = qMin(width, _maxw);
 	int32 w = _width - st::linksPhotoSize - st::linksPhotoPadding;
-	for (const auto &link : std::as_const(_links)) {
-		link.lnk->setFullDisplayed(w >= link.width);
+	for (const auto &link : _links) {
+		if (const auto handler = std::dynamic_pointer_cast<TextClickHandler>(
+				link.handler)) {
+			handler->setFullDisplayed(w >= link.text.maxWidth());
+		}
 	}
 
 	_height = 0;
@@ -1840,10 +2099,10 @@ void Link::paint(Painter &p, const QRect &clip, TextSelection selection, const P
 	}
 
 	p.setPen(st::windowActiveTextFg);
-	for (const auto &link : std::as_const(_links)) {
-		if (clip.intersects(style::rtlrect(left, top, qMin(w, link.width), st::normalFont->height, _width))) {
-			p.setFont(ClickHandler::showAsActive(link.lnk) ? st::normalFont->underline() : st::normalFont);
-			p.drawTextLeft(left, top, _width, (w < link.width) ? st::normalFont->elided(link.text, w) : link.text);
+	for (const auto &link : _links) {
+		const auto width = link.text.maxWidth();
+		if (clip.intersects(style::rtlrect(left, top, qMin(w, width), st::normalFont->height, _width))) {
+			link.text.drawLeftElided(p, left, top, w, _width);
 		}
 		top += st::normalFont->height;
 	}
@@ -1980,7 +2239,7 @@ TextState Link::getState(
 	}
 	if (!_title.isEmpty()) {
 		if (style::rtlrect(left, top, qMin(w, _titlew), st::semiboldFont->height, _width).contains(point)) {
-			return { parent(), _photol };
+			return { parent(), _titlel };
 		}
 		top += st::webPageTitleFont->height;
 	}
@@ -1988,8 +2247,9 @@ TextState Link::getState(
 		top += qMin(st::normalFont->height * 3, _text.countHeight(w));
 	}
 	for (const auto &link : _links) {
-		if (style::rtlrect(left, top, qMin(w, link.width), st::normalFont->height, _width).contains(point)) {
-			return { parent(), ClickHandlerPtr(link.lnk) };
+		const auto width = link.text.maxWidth();
+		if (style::rtlrect(left, top, qMin(w, width), st::normalFont->height, _width).contains(point)) {
+			return { parent(), link.handler };
 		}
 		top += st::normalFont->height;
 	}
@@ -2000,12 +2260,9 @@ const style::RoundCheckbox &Link::checkboxStyle() const {
 	return st::overviewSmallCheck;
 }
 
-Link::LinkEntry::LinkEntry(const QString &url, const QString &text)
-: text(text)
-, width(st::normalFont->width(text))
-, lnk(UrlClickHandler::IsSuspicious(url)
-	? std::make_shared<HiddenUrlClickHandler>(url)
-	: std::make_shared<UrlClickHandler>(url)) {
+Link::LinkEntry::LinkEntry(const QString &url, const QString &display)
+: url(url)
+, display(display) {
 }
 
 // Copied from inline_bot_layout_internal.
@@ -2014,8 +2271,22 @@ Gif::Gif(
 	not_null<HistoryItem*> parent,
 	not_null<DocumentData*> gif)
 : RadialProgressItem(delegate, parent)
-, _data(gif) {
+, _data(gif)
+, _spoiler(parent->isMediaSensitive()
+	? std::make_unique<Ui::SpoilerAnimation>([=] {
+		delegate->repaintItem(this);
+	})
+	: nullptr)
+, _sensitiveSpoiler(parent->isMediaSensitive() ? 1 : 0) {
 	setDocumentLinks(_data, true);
+	if (_sensitiveSpoiler) {
+		_openl = HistoryView::MakeSensitiveMediaLink(
+			std::make_shared<LambdaClickHandler>(crl::guard(this, [=] {
+				clearSpoiler();
+				setDocumentLinks(_data, true);
+			})),
+			parent);
+	}
 	_data->loadThumbnail(parent->fullId());
 }
 
@@ -2090,10 +2361,11 @@ void Gif::clipCallback(Media::Clip::Notification notification) {
 			if (_gif->state() == State::Error) {
 				_gif.setBad();
 			} else if (_gif->ready() && !_gif->started()) {
-				if (_gif->width() * _gif->height() > kMaxInlineArea) {
-					_data->dimensions = QSize(
-						_gif->width(),
-						_gif->height());
+				const auto size = QSize(_gif->width(), _gif->height());
+				if (!ValidFrameSize(size, kMaxInlineArea)) {
+					if (!size.isEmpty()) {
+						_data->dimensions = size;
+					}
 					_gif.reset();
 				} else {
 					_gif->start({
@@ -2118,6 +2390,23 @@ void Gif::clipCallback(Media::Clip::Notification notification) {
 	}
 }
 
+void Gif::clearSpoiler() {
+	if (_spoiler) {
+		_spoiler = nullptr;
+		_sensitiveSpoiler = false;
+		_thumb = QImage();
+		_thumbGood = false;
+		delegate()->repaintItem(this);
+	}
+}
+
+void Gif::maybeClearSensitiveSpoiler() {
+	if (_sensitiveSpoiler) {
+		clearSpoiler();
+		setDocumentLinks(_data);
+	}
+}
+
 void Gif::validateThumbnail(
 		Image *image,
 		QSize size,
@@ -2143,7 +2432,9 @@ void Gif::prepareThumbnail(QSize size, QSize frame) {
 	Assert(document != nullptr);
 
 	ensureDataMediaCreated();
-	validateThumbnail(_dataMedia->thumbnail(), size, frame, true);
+	if (!_spoiler) {
+		validateThumbnail(_dataMedia->thumbnail(), size, frame, true);
+	}
 	validateThumbnail(_dataMedia->thumbnailInline(), size, frame, false);
 }
 
@@ -2172,7 +2463,7 @@ void Gif::paint(
 		});
 	}
 
-	const auto animating = (_gif && _gif->started());
+	const auto animating = !_spoiler && (_gif && _gif->started());
 	if (displayLoading) {
 		ensureRadial();
 		if (!_radial->animating()) {
@@ -2202,6 +2493,19 @@ void Gif::paint(
 		}
 	}
 
+	if (_spoiler) {
+		const auto paused = context->paused || On(PowerSaving::kChatSpoiler);
+		Ui::FillSpoilerRect(
+			p,
+			r,
+			Ui::DefaultImageSpoiler().frame(
+				_spoiler->index(context->ms, paused)));
+
+		if (_sensitiveSpoiler) {
+			PaintSensitiveTag(p, r);
+		}
+	}
+
 	const auto selected = (selection == FullSelection);
 
 	if (radial
@@ -2328,5 +2632,4 @@ void Gif::updateStatusText() {
 	}
 }
 
-} // namespace Layout
-} // namespace Overview
+} // namespace Overview::Layout
diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h
index 936379e36b3052..6613d8fdad22a8 100644
--- a/Telegram/SourceFiles/overview/overview_layout.h
+++ b/Telegram/SourceFiles/overview/overview_layout.h
@@ -31,8 +31,7 @@ namespace Ui {
 class SpoilerAnimation;
 } // namespace Ui
 
-namespace Overview {
-namespace Layout {
+namespace Overview::Layout {
 
 class Checkbox;
 class ItemBase;
@@ -76,6 +75,9 @@ class ItemBase : public LayoutItemBase, public base::has_weak_ptr {
 	virtual void clearHeavyPart() {
 	}
 
+	virtual void maybeClearSensitiveSpoiler() {
+	}
+
 protected:
 	[[nodiscard]] not_null<HistoryItem*> parent() const {
 		return _parent;
@@ -181,14 +183,17 @@ class StatusText {
 
 };
 
-struct Info : public RuntimeComponent<Info, LayoutItemBase> {
+struct Info : RuntimeComponent<Info, LayoutItemBase> {
 	int top = 0;
 };
 
 struct MediaOptions {
 	bool spoiler = false;
-	bool pinned = false;
 	bool story = false;
+	bool storyPinned = false;
+	bool storyShowPinned = false;
+	bool storyHidden = false;
+	bool storyShowHidden = false;
 };
 
 class Photo final : public ItemBase {
@@ -210,20 +215,29 @@ class Photo final : public ItemBase {
 	void itemDataChanged() override;
 	void clearHeavyPart() override;
 
+	void maybeClearSensitiveSpoiler() override;
+
 private:
 	void ensureDataMediaCreated() const;
 	void setPixFrom(not_null<Image*> image);
+	[[nodiscard]] ClickHandlerPtr makeOpenPhotoHandler();
 	void clearSpoiler();
 
 	const not_null<PhotoData*> _data;
 	mutable std::shared_ptr<Data::PhotoMedia> _dataMedia;
-	ClickHandlerPtr _link;
 	std::unique_ptr<Ui::SpoilerAnimation> _spoiler;
 
-	QPixmap _pix;
-	bool _goodLoaded = false;
-	bool _pinned = false;
-	bool _story = false;
+	QImage _pix;
+	QImage _hiddenBgCache;
+	bool _goodLoaded : 1 = false;
+	bool _sensitiveSpoiler : 1 = false;
+	bool _story : 1 = false;
+	bool _storyPinned : 1 = false;
+	bool _storyShowPinned : 1 = false;
+	bool _storyHidden : 1 = false;
+	bool _storyShowHidden : 1 = false;
+
+	ClickHandlerPtr _link;
 
 };
 
@@ -249,6 +263,9 @@ class Gif final : public RadialProgressItem {
 	void clearHeavyPart() override;
 	void setPosition(int32 position) override;
 
+	void clearSpoiler() override;
+	void maybeClearSensitiveSpoiler() override;
+
 protected:
 	float64 dataProgress() const override;
 	bool dataFinished() const override;
@@ -279,9 +296,11 @@ class Gif final : public RadialProgressItem {
 	const not_null<DocumentData*> _data;
 	mutable std::shared_ptr<Data::DocumentMedia> _dataMedia;
 	StatusText _status;
+	std::unique_ptr<Ui::SpoilerAnimation> _spoiler;
 
 	QImage _thumb;
 	bool _thumbGood = false;
+	bool _sensitiveSpoiler = false;
 
 };
 
@@ -305,6 +324,8 @@ class Video final : public RadialProgressItem {
 	void clearHeavyPart() override;
 	void clearSpoiler() override;
 
+	void maybeClearSensitiveSpoiler() override;
+
 protected:
 	float64 dataProgress() const override;
 	bool dataFinished() const override;
@@ -316,16 +337,23 @@ class Video final : public RadialProgressItem {
 	void updateStatusText();
 
 	const not_null<DocumentData*> _data;
+	PhotoData *_videoCover = nullptr;
 	mutable std::shared_ptr<Data::DocumentMedia> _dataMedia;
+	mutable std::shared_ptr<Data::PhotoMedia> _videoCoverMedia;
 	StatusText _status;
 
 	QString _duration;
 	std::unique_ptr<Ui::SpoilerAnimation> _spoiler;
 
-	QPixmap _pix;
-	bool _pixBlurred = true;
-	bool _pinned = false;
-	bool _story = false;
+	QImage _pix;
+	QImage _hiddenBgCache;
+	bool _pixBlurred : 1 = true;
+	bool _sensitiveSpoiler : 1 = false;
+	bool _story : 1 = false;
+	bool _storyPinned : 1 = false;
+	bool _storyShowPinned : 1 = false;
+	bool _storyHidden : 1 = false;
+	bool _storyShowHidden : 1 = false;
 
 };
 
@@ -394,6 +422,8 @@ class Document final : public RadialProgressItem {
 
 	void clearHeavyPart() override;
 
+	[[nodiscard]] QImage dragPreviewImage();
+
 protected:
 	float64 dataProgress() const override;
 	bool dataFinished() const override;
@@ -410,6 +440,7 @@ class Document final : public RadialProgressItem {
 
 	[[nodiscard]] bool songLayout() const;
 	void ensureDataMediaCreated() const;
+	void paintThumbnail(Painter &p, QRect rthumb, bool wthumb, bool withExt);
 
 	not_null<DocumentData*> _data;
 	mutable std::shared_ptr<Data::DocumentMedia> _dataMedia;
@@ -457,8 +488,12 @@ class Link final : public ItemBase {
 	void ensurePhotoMediaCreated();
 	void ensureDocumentMediaCreated();
 	void validateThumbnail();
+	void setupLinks(
+		const TextWithEntities &text,
+		const QString &mainUrl);
 
 	ClickHandlerPtr _photol;
+	ClickHandlerPtr _titlel;
 
 	QString _title, _letter;
 	int _titlew = 0;
@@ -473,15 +508,15 @@ class Link final : public ItemBase {
 
 	struct LinkEntry {
 		LinkEntry() = default;
-		LinkEntry(const QString &url, const QString &text);
+		LinkEntry(const QString &url, const QString &display);
 
-		QString text;
-		int width = 0;
-		std::shared_ptr<TextClickHandler> lnk;
+		QString url;
+		QString display;
+		Ui::Text::String text;
+		ClickHandlerPtr handler;
 	};
-	QVector<LinkEntry> _links;
+	std::vector<LinkEntry> _links;
 
 };
 
-} // namespace Layout
-} // namespace Overview
+} // namespace Overview::Layout
diff --git a/Telegram/SourceFiles/overview/overview_layout_delegate.h b/Telegram/SourceFiles/overview/overview_layout_delegate.h
index e2fc7717d621af..0d016974b102be 100644
--- a/Telegram/SourceFiles/overview/overview_layout_delegate.h
+++ b/Telegram/SourceFiles/overview/overview_layout_delegate.h
@@ -7,8 +7,9 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-namespace Overview {
-namespace Layout {
+class StickerPremiumMark;
+
+namespace Overview::Layout {
 
 class ItemBase;
 
@@ -18,6 +19,11 @@ class Delegate {
 	virtual void unregisterHeavyItem(not_null<const ItemBase*> item) = 0;
 	virtual void repaintItem(not_null<const ItemBase*> item) = 0;
 	virtual bool itemVisible(not_null<const ItemBase*> item) = 0;
+	[[nodiscard]] virtual bool keepPhotoMediaLoaded() {
+		return false;
+	}
+
+	[[nodiscard]] virtual not_null<StickerPremiumMark*> hiddenMark() = 0;
 
 	virtual void openPhoto(not_null<PhotoData*> photo, FullMsgId id) = 0;
 	virtual void openDocument(
@@ -27,5 +33,4 @@ class Delegate {
 
 };
 
-} // namespace Layout
-} // namespace Overview
+} // namespace Overview::Layout
diff --git a/Telegram/SourceFiles/passport/passport.style b/Telegram/SourceFiles/passport/passport.style
index f3a4985753b1a2..df494e425fcd31 100644
--- a/Telegram/SourceFiles/passport/passport.style
+++ b/Telegram/SourceFiles/passport/passport.style
@@ -108,9 +108,7 @@ passportContactErrorMargin: margins(0px, 0px, 0px, 14px);
 passportRowPadding: margins(22px, 8px, 25px, 8px);
 passportRowIconSkip: 10px;
 passportRowSkip: 2px;
-passportRowRipple: RippleAnimation(defaultRippleAnimation) {
-	color: windowBgOver;
-}
+passportRowRipple: defaultRippleAnimationBgOver;
 passportRowReadyIcon: icon {{ "passport_ready", windowActiveTextFg }};
 passportRowEmptyIcon: icon {{ "passport_empty", menuIconFgOver }};
 passportRowTitleFg: windowFg;
diff --git a/Telegram/SourceFiles/passport/passport_edit_identity_box.cpp b/Telegram/SourceFiles/passport/passport_edit_identity_box.cpp
index 68285b9b757eb4..18be2ad425d6bc 100644
--- a/Telegram/SourceFiles/passport/passport_edit_identity_box.cpp
+++ b/Telegram/SourceFiles/passport/passport_edit_identity_box.cpp
@@ -174,7 +174,7 @@ void IdentityBox::prepare() {
 		_scans.back()->setImage(scan.thumb);
 		_scans.back()->resizeToWidth(st::boxWideWidth);
 		_scans.back()->deleteClicks(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_controller->deleteScan(_valueIndex, index - 1);
 		}, lifetime());
 	}
@@ -186,7 +186,7 @@ void IdentityBox::prepare() {
 		closeBox();
 	});
 	_controller->scanUpdated(
-	) | rpl::start_with_next([=](ScanInfo &&info) {
+	) | rpl::on_next([=](ScanInfo &&info) {
 		updateScan(std::move(info));
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/passport/passport_encryption.cpp b/Telegram/SourceFiles/passport/passport_encryption.cpp
index c5c6e2a7e6102a..0f36980bcaf8b8 100644
--- a/Telegram/SourceFiles/passport/passport_encryption.cpp
+++ b/Telegram/SourceFiles/passport/passport_encryption.cpp
@@ -374,6 +374,9 @@ bytes::vector DecryptData(
 	} else if (dataSecret.size() != kSecretSize) {
 		LOG(("API Error: Bad data secret size %1").arg(dataSecret.size()));
 		return {};
+	} else if ((encrypted.size() % kAlignTo) != 0) {
+		LOG(("API Error: Bad encrypted size %1").arg(encrypted.size()));
+		return {};
 	}
 
 	const auto bytesForEncryptionKey = bytes::concatenate(
diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp
index 6f5fd491650876..2229cbb5ed7e3f 100644
--- a/Telegram/SourceFiles/passport/passport_form_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp
@@ -1005,7 +1005,7 @@ void FormController::recoverPassword() {
 			pattern,
 			fields));
 		box->newPasswordSet(
-		) | rpl::start_with_next([=](const QByteArray &password) {
+		) | rpl::on_next([=](const QByteArray &password) {
 			if (password.isEmpty()) {
 				reloadPassword();
 			} else {
@@ -1014,7 +1014,7 @@ void FormController::recoverPassword() {
 		}, box->lifetime());
 
 		box->recoveryExpired(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	}).fail([=](const MTP::Error &error) {
@@ -1300,7 +1300,7 @@ void FormController::fillNativeFromFallback() {
 		scheme.additionalShown
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=](Scheme::AdditionalVisibility v) {
+	) | rpl::on_next([=](Scheme::AdditionalVisibility v) {
 		if (v != Scheme::AdditionalVisibility::OnlyIfError) {
 			return;
 		}
@@ -1558,17 +1558,17 @@ void FormController::subscribeToUploader() {
 	using namespace Storage;
 
 	session().uploader().secureReady(
-	) | rpl::start_with_next([=](const UploadSecureDone &data) {
+	) | rpl::on_next([=](const UploadSecureDone &data) {
 		scanUploadDone(data);
 	}, _uploaderSubscriptions);
 
 	session().uploader().secureProgress(
-	) | rpl::start_with_next([=](const UploadSecureProgress &data) {
+	) | rpl::on_next([=](const UploadSecureProgress &data) {
 		scanUploadProgress(data);
 	}, _uploaderSubscriptions);
 
 	session().uploader().secureFailed(
-	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+	) | rpl::on_next([=](const FullMsgId &fullId) {
 		scanUploadFail(fullId);
 	}, _uploaderSubscriptions);
 }
@@ -1809,7 +1809,7 @@ void FormController::loadFile(File &file) {
 			Data::kImageCacheTag));
 	const auto loader = j->second.get();
 	loader->updates(
-	) | rpl::start_with_next_error_done([=] {
+	) | rpl::on_next_error_done([=] {
 		fileLoadProgress(key, loader->currentOffset());
 	}, [=](FileLoader::Error error) {
 		fileLoadFail(key);
@@ -2229,6 +2229,9 @@ void FormController::startPhoneVerification(not_null<Value*> value) {
 		}, [](const MTPDauth_sentCodeSuccess &) {
 			LOG(("API Error: Unexpected auth.sentCodeSuccess "
 				"(FormController::startPhoneVerification)."));
+		}, [](const MTPDauth_sentCodePaymentRequired &) {
+			LOG(("API Error: Unexpected auth.sentCodePaymentRequired "
+				"(FormController::startPhoneVerification)."));
 		});
 	}).fail([=](const MTP::Error &error) {
 		value->verification.requestId = 0;
diff --git a/Telegram/SourceFiles/passport/passport_form_view_controller.h b/Telegram/SourceFiles/passport/passport_form_view_controller.h
index b2a22fbdbcc55c..590d7c2109cb6c 100644
--- a/Telegram/SourceFiles/passport/passport_form_view_controller.h
+++ b/Telegram/SourceFiles/passport/passport_form_view_controller.h
@@ -63,11 +63,11 @@ class ViewController {
 	}
 
 	template <typename BoxType>
-	QPointer<BoxType> show(
+	base::weak_qptr<BoxType> show(
 			object_ptr<BoxType> box,
 			Ui::LayerOptions options = Ui::LayerOption::KeepOther,
 			anim::type animated = anim::type::normal) {
-		auto result = QPointer<BoxType>(box.data());
+		auto result = base::weak_qptr<BoxType>(box.data());
 		showBox(std::move(box), options, animated);
 		return result;
 	}
diff --git a/Telegram/SourceFiles/passport/passport_panel.cpp b/Telegram/SourceFiles/passport/passport_panel.cpp
index 8db7c18f853b4b..352a9ee0318be0 100644
--- a/Telegram/SourceFiles/passport/passport_panel.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel.cpp
@@ -29,12 +29,12 @@ Panel::Panel(not_null<PanelController*> controller)
 	_widget->setInnerSize(st::passportPanelSize);
 
 	_widget->closeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->cancelAuth();
 	}, _widget->lifetime());
 
 	_widget->closeEvents(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->cancelAuthSure();
 	}, _widget->lifetime());
 }
@@ -76,7 +76,7 @@ void Panel::showCriticalError(const QString &error) {
 			st::passportErrorLabel),
 		style::margins(0, st::passportPanelSize.height() / 3, 0, 0));
 	container->widthValue(
-	) | rpl::start_with_next([label = container->entity()](int width) {
+	) | rpl::on_next([label = container->entity()](int width) {
 		label->resize(width, label->height());
 	}, container->lifetime());
 
diff --git a/Telegram/SourceFiles/passport/passport_panel_controller.cpp b/Telegram/SourceFiles/passport/passport_panel_controller.cpp
index 14ee9bd789f7ae..1ae8d6ae7118e2 100644
--- a/Telegram/SourceFiles/passport/passport_panel_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_controller.cpp
@@ -451,7 +451,7 @@ EditDocumentScheme GetDocumentScheme(
 				ValueClass::Fields,
 				Ui::PanelDetailsType::Country,
 				"country_code"_q,
-				tr::lng_passport_country(tr::now),
+				tr::lng_passport_residence_country(tr::now),
 				CountryValidate,
 				CountryFormat,
 			},
@@ -575,20 +575,20 @@ PanelController::PanelController(not_null<FormController*> form)
 : _form(form)
 , _scopes(ComputeScopes(_form->form())) {
 	_form->secretReadyEvents(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		ensurePanelCreated();
 		_panel->showForm();
 	}, lifetime());
 
 	_form->verificationNeeded(
-	) | rpl::start_with_next([=](not_null<const Value*> value) {
+	) | rpl::on_next([=](not_null<const Value*> value) {
 		processVerificationNeeded(value);
 	}, lifetime());
 
 	_form->verificationUpdate(
 	) | rpl::filter([=](not_null<const Value*> field) {
 		return (field->verification.codeLength == 0);
-	}) | rpl::start_with_next([=](not_null<const Value*> field) {
+	}) | rpl::on_next([=](not_null<const Value*> field) {
 		_verificationBoxes.erase(field);
 	}, lifetime());
 }
@@ -704,7 +704,7 @@ void PanelController::setupPassword() {
 
 	auto box = show(Box<PasscodeBox>(&_form->window()->session(), fields));
 	box->newPasswordSet(
-	) | rpl::start_with_next([=](const QByteArray &password) {
+	) | rpl::on_next([=](const QByteArray &password) {
 		if (password.isEmpty()) {
 			_form->reloadPassword();
 		} else {
@@ -713,12 +713,12 @@ void PanelController::setupPassword() {
 	}, box->lifetime());
 
 	box->passwordReloadNeeded(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_form->reloadPassword();
 	}, box->lifetime());
 
 	box->clearUnconfirmedPassword(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_form->cancelPassword();
 	}, box->lifetime());
 }
@@ -741,13 +741,13 @@ void PanelController::validateRecoveryEmail() {
 
 	std::move(
 		validation.reloadRequests
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_form->reloadPassword();
 	}, validation.box->lifetime());
 
 	std::move(
 		validation.cancelRequests
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_form->cancelPassword();
 	}, validation.box->lifetime());
 
@@ -910,7 +910,7 @@ void PanelController::suggestReset(Fn<void()> callback) {
 		.confirmed = [=] { resetPassport(callback); },
 		.cancelled = [=] { cancelReset(); },
 		.confirmText = Lang::Hard::PassportCorruptedReset(),
-	})).data());
+	})).get());
 }
 
 void PanelController::resetPassport(Fn<void()> callback) {
@@ -921,7 +921,7 @@ void PanelController::resetPassport(Fn<void()> callback) {
 		.confirmText = Lang::Hard::PassportCorruptedReset(),
 		.confirmStyle = &st::attentionBoxButton,
 	}));
-	_resetBox = Ui::BoxPointer(box.data());
+	_resetBox = Ui::BoxPointer(box.get());
 }
 
 void PanelController::cancelReset() {
@@ -1210,7 +1210,7 @@ void PanelController::startScopeEdit(
 					std::move(scans),
 					std::move(translations),
 					PrepareSpecialFiles(*_editDocument));
-			const auto weak = Ui::MakeWeak(result.data());
+			const auto weak = base::make_weak(result.data());
 			_panelHasUnsavedChanges = [=] {
 				return weak ? weak->hasUnsavedChanges() : false;
 			};
@@ -1229,7 +1229,7 @@ void PanelController::startScopeEdit(
 					std::move(preferredLanguage)),
 				_editValue->error,
 				_editValue->data.parsedInEdit);
-			const auto weak = Ui::MakeWeak(result.data());
+			const auto weak = base::make_weak(result.data());
 			_panelHasUnsavedChanges = [=] {
 				return weak ? weak->hasUnsavedChanges() : false;
 			};
@@ -1265,12 +1265,12 @@ void PanelController::startScopeEdit(
 	_panel->setBackAllowed(true);
 
 	_panel->backRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		cancelEditScope();
 	}, content->lifetime());
 
 	_form->valueSaveFinished(
-	) | rpl::start_with_next([=](not_null<const Value*> value) {
+	) | rpl::on_next([=](not_null<const Value*> value) {
 		processValueSaveFinished(value);
 	}, content->lifetime());
 
@@ -1343,7 +1343,7 @@ void PanelController::processVerificationNeeded(
 					return field->verification.call != nullptr;
 				}) | rpl::map([=](not_null<const Value*> field) {
 					return field->verification.call->getText();
-				})) : (rpl::single(QString()) | rpl::type_erased()),
+				})) : (rpl::single(QString()) | rpl::type_erased),
 
 				rpl::duplicate(
 					update
@@ -1351,7 +1351,7 @@ void PanelController::processVerificationNeeded(
 					return field->verification.error;
 				}) | rpl::distinct_until_changed()));
 			box->boxClosing(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				account->setHandleLoginCode(nullptr);
 			}, box->lifetime());
 			return box;
@@ -1375,7 +1375,7 @@ void PanelController::processVerificationNeeded(
 	}();
 
 	box->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_form->cancelValueVerification(value);
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/passport/passport_panel_controller.h b/Telegram/SourceFiles/passport/passport_panel_controller.h
index 5c3d296b474db3..c08645056e5b6c 100644
--- a/Telegram/SourceFiles/passport/passport_panel_controller.h
+++ b/Telegram/SourceFiles/passport/passport_panel_controller.h
@@ -174,7 +174,7 @@ class PanelController : public ViewController {
 
 	std::unique_ptr<Panel> _panel;
 	Fn<bool()> _panelHasUnsavedChanges;
-	QPointer<Ui::BoxContent> _confirmForgetChangesBox;
+	base::weak_qptr<Ui::BoxContent> _confirmForgetChangesBox;
 	std::vector<Ui::BoxPointer> _editScopeBoxes;
 	Scope *_editScope = nullptr;
 	const Value *_editValue = nullptr;
diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_contact.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_contact.cpp
index 9e1d108512f372..4fb39508f8f506 100644
--- a/Telegram/SourceFiles/passport/passport_panel_edit_contact.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_edit_contact.cpp
@@ -20,7 +20,6 @@ For license and copyright information please follow this link:
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/text/format_values.h" // Ui::FormatPhone
-#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "ui/widgets/fields/special_fields.h"
 #include "boxes/abstract_box.h"
 #include "data/data_user.h"
@@ -145,12 +144,10 @@ void VerifyBox::setupControls(
 				st::fragmentBoxButton),
 			small);
 		_content->widthValue(
-		) | rpl::start_with_next([=](int w) {
+		) | rpl::on_next([=](int w) {
 			button->setFullWidth(w - small.left() - small.right());
 		}, button->lifetime());
 		button->setClickedCallback([=] { ::File::OpenUrl(openUrl); });
-		button->setTextTransform(
-			Ui::RoundButton::TextTransform::NoTransform);
 	}
 	if (resend) {
 		auto link = TextWithEntities{ tr::lng_cloud_password_resend(tr::now) };
@@ -171,14 +168,14 @@ void VerifyBox::setupControls(
 			small);
 		std::move(
 			resent
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_content->resizeToWidth(st::boxWidth);
 		}, _content->lifetime());
 		label->overrideLinkClickHandler(resend);
 	}
 	std::move(
 		error
-	) | rpl::start_with_next([=](const QString &error) {
+	) | rpl::on_next([=](const QString &error) {
 		if (error.isEmpty()) {
 			problem->hide(anim::type::normal);
 		} else {
@@ -195,10 +192,10 @@ void VerifyBox::setupControls(
 	if (codeLength > 0) {
 		_code->setAutoSubmit(codeLength, _submit);
 	} else {
-		_code->submits() | rpl::start_with_next(_submit, _code->lifetime());
+		_code->submits() | rpl::on_next(_submit, _code->lifetime());
 	}
 	_code->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		problem->hide(anim::type::normal);
 	}, _code->lifetime());
 }
@@ -215,7 +212,7 @@ void VerifyBox::prepare() {
 
 	_content->resizeToWidth(st::boxWidth);
 	_content->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWidth, height);
 	}, _content->lifetime());
 }
@@ -239,6 +236,7 @@ PanelEditContact::PanelEditContact(
 		this,
 		tr::lng_passport_save_value(),
 		st::passportPanelSaveValue) {
+	_done->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 	setupControls(data, existing);
 }
 
@@ -246,7 +244,7 @@ void PanelEditContact::setupControls(
 		const QString &data,
 		const QString &existing) {
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_content->resizeToWidth(width);
 	}, _content->lifetime());
 
@@ -311,11 +309,11 @@ void PanelEditContact::setupControls(
 
 	_field->move(0, 0);
 	_field->heightValue(
-	) | rpl::start_with_next([=, pointer = wrap.data()](int height) {
+	) | rpl::on_next([=, pointer = wrap.data()](int height) {
 		pointer->resize(pointer->width(), height);
 	}, _field->lifetime());
 	wrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_field->resize(width, _field->height());
 	}, _field->lifetime());
 
@@ -344,7 +342,7 @@ void PanelEditContact::setupControls(
 		_content->add(
 			object_ptr<Ui::SettingsButton>(
 				_content,
-				std::move(*text) | Ui::Text::ToUpper(),
+				std::move(*text) | rpl::map(tr::upper),
 				st::passportDeleteButton),
 			st::passportUploadButtonPadding
 		)->addClickHandler([=] {
@@ -353,7 +351,7 @@ void PanelEditContact::setupControls(
 	}
 
 	_controller->saveErrors(
-	) | rpl::start_with_next([=](const ScopeError &error) {
+	) | rpl::on_next([=](const ScopeError &error) {
 		if (error.key == QString("value")) {
 			_field->showError();
 			errorWrap->entity()->setText(error.text);
diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_document.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_document.cpp
index bac92c2c80c302..686d280ad22193 100644
--- a/Telegram/SourceFiles/passport/passport_panel_edit_document.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_edit_document.cpp
@@ -22,7 +22,6 @@ For license and copyright information please follow this link:
 #include "countries/countries_instance.h"
 #include "data/data_user.h" // ->bot()->session()
 #include "main/main_session.h" // ->session().user()
-#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "boxes/abstract_box.h"
 #include "ui/boxes/confirm_box.h"
 #include "lang/lang_keys.h"
@@ -223,6 +222,7 @@ PanelEditDocument::PanelEditDocument(
 		this,
 		tr::lng_passport_save_value(),
 		st::passportPanelSaveValue) {
+	_done->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 	setupControls(
 		&error,
 		&data,
@@ -249,6 +249,7 @@ PanelEditDocument::PanelEditDocument(
 		this,
 		tr::lng_passport_save_value(),
 		st::passportPanelSaveValue) {
+	_done->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 	setupControls(
 		nullptr,
 		nullptr,
@@ -272,6 +273,7 @@ PanelEditDocument::PanelEditDocument(
 		this,
 		tr::lng_passport_save_value(),
 		st::passportPanelSaveValue) {
+	_done->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 	setupControls(&error, &data, nullptr, nullptr, {}, {}, {});
 }
 
@@ -312,7 +314,7 @@ not_null<Ui::RpWidget*> PanelEditDocument::setupContent(
 	const auto inner = _scroll->setOwnedWidget(
 		object_ptr<Ui::VerticalLayout>(this));
 	_scroll->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		inner->resizeToWidth(width);
 	}, inner->lifetime());
 
@@ -442,7 +444,7 @@ not_null<Ui::RpWidget*> PanelEditDocument::setupContent(
 				st::passportNativeNameHeaderPadding);
 			std::move(
 				title
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				const auto &padding = st::passportNativeNameHeaderPadding;
 				const auto available = added->width()
 					- padding.left()
@@ -483,19 +485,20 @@ not_null<Ui::RpWidget*> PanelEditDocument::setupContent(
 
 			std::move(langValue) | rpl::map(
 				shown
-			) | rpl::start_with_next([=](bool visible) {
+			) | rpl::on_next([=](bool visible) {
 				_additionalShown = visible;
 			}, lifetime());
 		}
 
-		inner->add(
-			object_ptr<Ui::FixedHeightWidget>(inner, st::passportDetailsSkip));
+		inner->add(object_ptr<Ui::FixedHeightWidget>(
+			inner,
+			st::passportDetailsSkip));
 	}
 	if (auto text = _controller->deleteValueLabel()) {
 		inner->add(
 			object_ptr<Ui::SettingsButton>(
 				inner,
-				std::move(*text) | Ui::Text::ToUpper(),
+				std::move(*text) | rpl::map(tr::upper),
 				st::passportDeleteButton),
 			st::passportUploadButtonPadding
 		)->addClickHandler([=] {
@@ -544,7 +547,7 @@ void PanelEditDocument::createDetailsRow(
 			row.lengthLimit)));
 	const bool details = (row.valueClass != Scheme::ValueClass::Scans);
 	it->second->value(
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		if (details) {
 			_fieldsChanged = true;
 			updateCommonError();
diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
index 35d5bd8eace71e..503cb744189faa 100644
--- a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
@@ -16,7 +16,6 @@ For license and copyright information please follow this link:
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/chat/attach/attach_prepare.h"
-#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "ui/text/text_options.h"
 #include "ui/image/image_prepare.h"
 #include "ui/painter.h"
@@ -225,7 +224,7 @@ Ui::SlideWrap<ScanButton> *EditScans::List::nonDeletedErrorRow() const {
 rpl::producer<QString> EditScans::List::uploadButtonText() const {
 	return (files.empty()
 		? tr::lng_passport_upload_scans
-		: tr::lng_passport_upload_more)() | Ui::Text::ToUpper();
+		: tr::lng_passport_upload_more)(tr::upper);
 }
 
 void EditScans::List::hideError() {
@@ -291,12 +290,12 @@ void EditScans::List::pushScan(const ScanInfo &info) {
 	const auto scan = rows.back()->entity();
 
 	scan->deleteClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		controller->deleteScan(type, index);
 	}, scan->lifetime());
 
 	scan->restoreClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		controller->restoreScan(type, index);
 	}, scan->lifetime());
 
@@ -328,6 +327,7 @@ ScanButton::ScanButton(
 		this,
 		tr::lng_passport_delete_scan_undo(),
 		_st.restore)) {
+	_restore->entity()->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 	_delete->toggle(!deleted, anim::type::instant);
 	_restore->toggle(deleted, anim::type::instant);
 }
@@ -684,9 +684,8 @@ void EditScans::setupSpecialScans(
 		}
 		auto label = scan.rowCreated.value(
 		) | rpl::map([=, type = type](bool created) {
-			return uploadText(type, created)();
-		}) | rpl::flatten_latest(
-		) | Ui::Text::ToUpper();
+			return uploadText(type, created)(tr::upper);
+		}) | rpl::flatten_latest();
 		scan.upload = inner->add(
 			object_ptr<Ui::SettingsButton>(
 				inner,
@@ -713,17 +712,17 @@ void EditScans::setupSpecialScans(
 
 void EditScans::init() {
 	_controller->scanUpdated(
-	) | rpl::start_with_next([=](ScanInfo &&info) {
+	) | rpl::on_next([=](ScanInfo &&info) {
 		updateScan(std::move(info));
 	}, lifetime());
 
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_content->resizeToWidth(width);
 	}, _content->lifetime());
 
 	_content->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		resize(width(), height);
 	}, _content->lifetime());
 }
@@ -822,12 +821,12 @@ void EditScans::createSpecialScanRow(
 	const auto row = scan.row->entity();
 
 	row->deleteClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->deleteScan(type, std::nullopt);
 	}, row->lifetime());
 
 	row->restoreClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->restoreScan(type, std::nullopt);
 	}, row->lifetime());
 
diff --git a/Telegram/SourceFiles/passport/passport_panel_form.cpp b/Telegram/SourceFiles/passport/passport_panel_form.cpp
index 3c3d72533817c2..a1dd34c22cd57d 100644
--- a/Telegram/SourceFiles/passport/passport_panel_form.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_form.cpp
@@ -41,6 +41,7 @@ PanelForm::PanelForm(
 		this,
 		tr::lng_passport_authorize(),
 		st::passportPanelAuthorize) {
+	_submit->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 	setupControls();
 }
 
@@ -60,43 +61,33 @@ not_null<Ui::RpWidget*> PanelForm::setupContent() {
 	const auto inner = _scroll->setOwnedWidget(
 		object_ptr<Ui::VerticalLayout>(this));
 	_scroll->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		inner->resizeToWidth(width);
 	}, inner->lifetime());
 
-	const auto userpicWrap = inner->add(
-		object_ptr<Ui::FixedHeightWidget>(
-			inner,
-			st::passportFormUserpic.size.height()),
-		st::passportFormUserpicPadding);
-	_userpic = Ui::AttachParentChild(
-		userpicWrap,
+	_userpic = inner->add(
 		object_ptr<Ui::UserpicButton>(
-			userpicWrap,
+			inner,
 			bot,
-			st::passportFormUserpic));
-	userpicWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		_userpic->move((width - _userpic->width()) / 2, _userpic->y());
-	}, _userpic->lifetime());
+			st::passportFormUserpic),
+		st::passportFormUserpicPadding,
+		style::al_top);
 
 	_about1 = inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			inner,
-			object_ptr<Ui::FlatLabel>(
-				inner,
-				tr::lng_passport_request1(tr::now, lt_bot, bot->name()),
-				st::passportPasswordLabelBold)),
-		st::passportFormAbout1Padding)->entity();
+			tr::lng_passport_request1(tr::now, lt_bot, bot->name()),
+			st::passportPasswordLabelBold),
+		st::passportFormAbout1Padding,
+		style::al_top);
 
 	_about2 = inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			inner,
-			object_ptr<Ui::FlatLabel>(
-				inner,
-				tr::lng_passport_request2(tr::now),
-				st::passportPasswordLabel)),
-		st::passportFormAbout2Padding)->entity();
+			tr::lng_passport_request2(tr::now),
+			st::passportPasswordLabel),
+		st::passportFormAbout2Padding,
+		style::al_top);
 
 	inner->add(object_ptr<Ui::BoxContentDivider>(
 		inner,
@@ -127,7 +118,7 @@ not_null<Ui::RpWidget*> PanelForm::setupContent() {
 		++index;
 	});
 	_controller->refillRows(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto index = 0;
 		_controller->fillRows([&](
 				QString title,
@@ -148,22 +139,22 @@ not_null<Ui::RpWidget*> PanelForm::setupContent() {
 	auto policyLink = tr::lng_passport_policy(
 		lt_bot,
 		rpl::single(bot->name())
-	) | Ui::Text::ToLink(
-		policyUrl
+	) | rpl::map(
+		tr::url(policyUrl)
 	) | rpl::map([=](TextWithEntities &&text) {
 		return Ui::Text::Wrapped(std::move(text), EntityType::Bold);
 	});
 	auto text = policyUrl.isEmpty()
 		? tr::lng_passport_allow(
 			lt_bot,
-			rpl::single('@' + bot->username())
-		) | Ui::Text::ToWithEntities()
+			rpl::single(tr::marked('@' + bot->username())),
+			tr::marked)
 		: tr::lng_passport_accept_allow(
 			lt_policy,
 			std::move(policyLink),
 			lt_bot,
-			rpl::single('@' + bot->username()) | Ui::Text::ToWithEntities(),
-			Ui::Text::WithEntities);
+			rpl::single(tr::marked('@' + bot->username())),
+			tr::marked);
 	const auto policy = inner->add(
 		object_ptr<Ui::FlatLabel>(
 			inner,
diff --git a/Telegram/SourceFiles/passport/passport_panel_password.cpp b/Telegram/SourceFiles/passport/passport_panel_password.cpp
index 7046f14f08cc7a..48a4f404726f96 100644
--- a/Telegram/SourceFiles/passport/passport_panel_password.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_password.cpp
@@ -49,6 +49,7 @@ PanelAskPassword::PanelAskPassword(
 	tr::lng_passport_password_placeholder())
 , _submit(this, tr::lng_passport_next(), st::passportPasswordSubmit)
 , _forgot(this, tr::lng_signin_recover(tr::now), st::defaultLinkButton) {
+	_submit->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 	connect(_password, &Ui::PasswordInput::submitted, this, [=] {
 		submit();
 	});
@@ -62,7 +63,7 @@ PanelAskPassword::PanelAskPassword(
 			st::passportPasswordHintLabel);
 	}
 	_controller->passwordError(
-	) | rpl::start_with_next([=](const QString &error) {
+	) | rpl::on_next([=](const QString &error) {
 		showError(error);
 	}, lifetime());
 
@@ -123,12 +124,12 @@ void PanelAskPassword::updateControlsGeometry() {
 		_password->height());
 	_password->moveToLeft((width() - _password->width()) / 2, top);
 
-	top -= st::passportPasswordFieldSkip + _about2->height();
 	_about2->resizeToWidth(availableWidth);
+	top -= st::passportPasswordFieldSkip + _about2->height();
 	_about2->moveToLeft(padding.left(), top);
 
-	top -= _about1->height();
 	_about1->resizeToWidth(availableWidth);
+	top -= _about1->height();
 	_about1->moveToLeft(padding.left(), top);
 
 	top -= st::passportPasswordUserpicSkip + _userpic->height();
@@ -166,51 +167,47 @@ PanelNoPassword::PanelNoPassword(
 
 void PanelNoPassword::setupContent() {
 	widthValue(
-	) | rpl::start_with_next([=](int newWidth) {
+	) | rpl::on_next([=](int newWidth) {
 		_inner->resizeToWidth(newWidth);
 	}, _inner->lifetime());
 
 	_inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			_inner,
-			object_ptr<Ui::FlatLabel>(
-				_inner,
-				tr::lng_passport_request1(
-					tr::now,
-					lt_bot,
-					_controller->bot()->name()),
-				st::passportPasswordLabelBold)),
-		st::passportPasswordAbout1Padding)->entity();
+			tr::lng_passport_request1(
+				tr::now,
+				lt_bot,
+				_controller->bot()->name()),
+			st::passportPasswordLabelBold),
+		st::passportPasswordAbout1Padding,
+		style::al_top);
 
 	_inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			_inner,
-			object_ptr<Ui::FlatLabel>(
-				_inner,
-				tr::lng_passport_request2(tr::now),
-				st::passportPasswordLabel)),
-		st::passportPasswordAbout2Padding)->entity();
+			tr::lng_passport_request2(tr::now),
+			st::passportPasswordLabel),
+		st::passportPasswordAbout2Padding,
+		style::al_top);
 
 	const auto iconWrap = _inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FixedHeightWidget>>(
+		object_ptr<Ui::FixedHeightWidget>(
 			_inner,
-			object_ptr<Ui::FixedHeightWidget>(
-				_inner,
-				st::passportPasswordIconHeight)));
-	iconWrap->entity()->resizeToWidth(st::passportPasswordIcon.width());
+			st::passportPasswordIconHeight),
+		style::al_top);
+	iconWrap->setNaturalWidth(st::passportPasswordIcon.width());
 	Ui::CreateChild<Info::Profile::FloatingIcon>(
-		iconWrap->entity(),
+		iconWrap,
 		st::passportPasswordIcon,
 		QPoint(0, 0));
 
 	_inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			_inner,
-			object_ptr<Ui::FlatLabel>(
-				_inner,
-				tr::lng_passport_create_password(tr::now),
-				st::passportPasswordSetupLabel)),
-		st::passportFormAbout2Padding)->entity();
+			tr::lng_passport_create_password(tr::now),
+			st::passportPasswordSetupLabel),
+		st::passportFormAbout2Padding,
+		style::al_top);
 
 	refreshBottom();
 }
@@ -218,24 +215,23 @@ void PanelNoPassword::setupContent() {
 void PanelNoPassword::refreshBottom() {
 	const auto pattern = _controller->unconfirmedEmailPattern();
 	_about.reset(_inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			_inner,
-			object_ptr<Ui::FlatLabel>(
-				_inner,
-				(pattern.isEmpty()
-					? tr::lng_passport_about_password(tr::now)
-					: tr::lng_passport_code_sent(tr::now, lt_email, pattern)),
-				st::passportPasswordSetupLabel)),
-		st::passportFormAbout2Padding)->entity());
+			(pattern.isEmpty()
+				? tr::lng_passport_about_password(tr::now)
+				: tr::lng_passport_code_sent(tr::now, lt_email, pattern)),
+			st::passportPasswordSetupLabel),
+		st::passportFormAbout2Padding,
+		style::al_top));
 	if (pattern.isEmpty()) {
 		const auto button = _inner->add(
-			object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+			object_ptr<Ui::RoundButton>(
 				_inner,
-				object_ptr<Ui::RoundButton>(
-					_inner,
-					tr::lng_passport_password_create(),
-					st::defaultBoxButton)));
-		button->entity()->addClickHandler([=] {
+				tr::lng_passport_password_create(),
+				st::defaultBoxButton),
+			style::al_top);
+		button->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
+		button->addClickHandler([=] {
 			_controller->setupPassword();
 		});
 	} else {
@@ -247,8 +243,6 @@ void PanelNoPassword::refreshBottom() {
 			container,
 			tr::lng_cancel(),
 			st::defaultBoxButton);
-		cancel->setTextTransform(
-			Ui::RoundButton::TextTransform::NoTransform);
 		cancel->addClickHandler([=] {
 			_controller->cancelPasswordSubmit();
 		});
@@ -256,13 +250,11 @@ void PanelNoPassword::refreshBottom() {
 			container,
 			tr::lng_passport_email_validate(),
 			st::defaultBoxButton);
-		validate->setTextTransform(
-			Ui::RoundButton::TextTransform::NoTransform);
 		validate->addClickHandler([=] {
 			_controller->validateRecoveryEmail();
 		});
 		container->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto both = cancel->width()
 				+ validate->width()
 				+ st::boxLittleSkip;
diff --git a/Telegram/SourceFiles/passport/ui/passport_details_row.cpp b/Telegram/SourceFiles/passport/ui/passport_details_row.cpp
index 55739b7dbb6622..df899454b9e313 100644
--- a/Telegram/SourceFiles/passport/ui/passport_details_row.cpp
+++ b/Telegram/SourceFiles/passport/ui/passport_details_row.cpp
@@ -272,7 +272,7 @@ AbstractTextRow<Input>::AbstractTextRow(
 	_field->setMaxLength(limit);
 	if constexpr (std::is_same<Input, Ui::InputField>::value) {
 		_field->changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_value = valueCurrent();
 		}, _field->lifetime());
 	} else {
@@ -332,7 +332,7 @@ CountryRow::CountryRow(
 , _link(this, CountryString(value), st::boxLinkButton)
 , _value(value) {
 	_value.changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		hideCountryError();
 	}, lifetime());
 
@@ -405,7 +405,7 @@ void CountryRow::chooseCountry() {
 		CountrySelectBox::Type::Countries);
 	const auto raw = box.data();
 	raw->countryChosen(
-	) | rpl::start_with_next([=](QString iso) {
+	) | rpl::on_next([=](QString iso) {
 		_value = iso;
 		_link->setText(CountryString(iso));
 		hideCountryError();
@@ -571,7 +571,7 @@ DateRow::DateRow(
 	GetYear(value))
 , _value(valueCurrent()) {
 	const auto focused = [=](const object_ptr<DateInput> &field) {
-		return [this, pointer = MakeWeak(field.data())]{
+		return [this, pointer = base::make_weak(field.data())]{
 			_borderAnimationStart = pointer->borderAnimationStart()
 				+ pointer->x()
 				- _day->x();
@@ -594,18 +594,18 @@ DateRow::DateRow(
 	connect(_month, &MaskedInputField::changed, changed);
 	connect(_year, &MaskedInputField::changed, changed);
 	_day->setMaxValue(31);
-	_day->putNext() | rpl::start_with_next([=](QChar ch) {
+	_day->putNext() | rpl::on_next([=](QChar ch) {
 		putNext(_month, ch);
 	}, lifetime());
 	_month->setMaxValue(12);
-	_month->putNext() | rpl::start_with_next([=](QChar ch) {
+	_month->putNext() | rpl::on_next([=](QChar ch) {
 		putNext(_year, ch);
 	}, lifetime());
-	_month->erasePrevious() | rpl::start_with_next([=] {
+	_month->erasePrevious() | rpl::on_next([=] {
 		erasePrevious(_day);
 	}, lifetime());
 	_year->setMaxValue(2999);
-	_year->erasePrevious() | rpl::start_with_next([=] {
+	_year->erasePrevious() | rpl::on_next([=] {
 		erasePrevious(_month);
 	}, lifetime());
 	_separator1->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -613,7 +613,7 @@ DateRow::DateRow(
 	setMouseTracking(true);
 
 	_value.changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		setErrorShown(false);
 	}, lifetime());
 }
@@ -919,7 +919,10 @@ int GenderRow::resizeInner(int left, int top, int width) {
 	top += st::passportDetailsField.textMargins.top();
 	top -= st::defaultCheckbox.textPosition.y();
 	_male->moveToLeft(left, top);
-	left += _male->widthNoMargins() + st::passportDetailsGenderSkip;
+	left += _male->checkRect().width()
+		+ st::defaultCheckbox.style.font->width(
+			tr::lng_passport_gender_male(tr::now))
+		+ st::passportDetailsGenderSkip;
 	_female->moveToLeft(left, top);
 	return st::semiboldFont->height;
 }
@@ -1065,7 +1068,7 @@ void PanelDetailsRow::showError(std::optional<QString> error) {
 		_errorHideSubscription = true;
 
 		value(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			hideError();
 		}, lifetime());
 	}
@@ -1090,7 +1093,7 @@ void PanelDetailsRow::showError(std::optional<QString> error) {
 			_error->entity()->setText(*error);
 		}
 		_error->heightValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			resizeToWidth(width());
 		}, _error->lifetime());
 		_error->show(anim::type::normal);
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.cpp b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
index 0925d8937ca639..522c86b13476d1 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
@@ -53,7 +53,7 @@ base::flat_map<not_null<Main::Session*>, SessionProcesses> Processes;
 	const auto j = Processes.emplace(session).first;
 	auto &result = j->second;
 	session->account().sessionChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Processes.erase(session);
 	}, result.lifetime);
 	return result;
@@ -66,7 +66,6 @@ void CheckoutProcess::Start(
 		Mode mode,
 		Fn<void(CheckoutResult)> reactivate,
 		Fn<void(NonPanelPaymentForm)> nonPanelPaymentFormProcess) {
-	const auto hasNonPanelPaymentFormProcess = !!nonPanelPaymentFormProcess;
 	auto &processes = LookupSessionProcesses(&item->history()->session());
 	const auto media = item->media();
 	const auto invoice = media ? media->invoice() : nullptr;
@@ -87,9 +86,7 @@ void CheckoutProcess::Start(
 		i->second->setReactivateCallback(std::move(reactivate));
 		i->second->setNonPanelPaymentFormProcess(
 			std::move(nonPanelPaymentFormProcess));
-		if (!hasNonPanelPaymentFormProcess) {
-			i->second->requestActivate();
-		}
+		i->second->requestActivate();
 		return;
 	}
 	const auto j = processes.byItem.emplace(
@@ -100,9 +97,7 @@ void CheckoutProcess::Start(
 			std::move(reactivate),
 			std::move(nonPanelPaymentFormProcess),
 			PrivateTag{})).first;
-	if (!hasNonPanelPaymentFormProcess) {
-		j->second->requestActivate();
-	}
+	j->second->requestActivate();
 }
 
 void CheckoutProcess::Start(
@@ -110,16 +105,13 @@ void CheckoutProcess::Start(
 		const QString &slug,
 		Fn<void(CheckoutResult)> reactivate,
 		Fn<void(NonPanelPaymentForm)> nonPanelPaymentFormProcess) {
-	const auto hasNonPanelPaymentFormProcess = !!nonPanelPaymentFormProcess;
 	auto &processes = LookupSessionProcesses(session);
 	const auto i = processes.bySlug.find(slug);
 	if (i != end(processes.bySlug)) {
 		i->second->setReactivateCallback(std::move(reactivate));
 		i->second->setNonPanelPaymentFormProcess(
 			std::move(nonPanelPaymentFormProcess));
-		if (!hasNonPanelPaymentFormProcess) {
-			i->second->requestActivate();
-		}
+		i->second->requestActivate();
 		return;
 	}
 	const auto j = processes.bySlug.emplace(
@@ -130,20 +122,21 @@ void CheckoutProcess::Start(
 			std::move(reactivate),
 			std::move(nonPanelPaymentFormProcess),
 			PrivateTag{})).first;
-	if (!hasNonPanelPaymentFormProcess) {
-		j->second->requestActivate();
-	}
+	j->second->requestActivate();
 }
 
 void CheckoutProcess::Start(
 		InvoicePremiumGiftCode giftCodeInvoice,
-		Fn<void(CheckoutResult)> reactivate) {
+		Fn<void(CheckoutResult)> reactivate,
+		Fn<void(NonPanelPaymentForm)> nonPanelPaymentFormProcess) {
 	const auto randomId = giftCodeInvoice.randomId;
 	auto id = InvoiceId{ std::move(giftCodeInvoice) };
 	auto &processes = LookupSessionProcesses(SessionFromId(id));
 	const auto i = processes.byRandomId.find(randomId);
 	if (i != end(processes.byRandomId)) {
 		i->second->setReactivateCallback(std::move(reactivate));
+		i->second->setNonPanelPaymentFormProcess(
+			std::move(nonPanelPaymentFormProcess));
 		i->second->requestActivate();
 		return;
 	}
@@ -153,7 +146,7 @@ void CheckoutProcess::Start(
 			std::move(id),
 			Mode::Payment,
 			std::move(reactivate),
-			nullptr,
+			std::move(nonPanelPaymentFormProcess),
 			PrivateTag{})).first;
 	j->second->requestActivate();
 }
@@ -332,17 +325,17 @@ CheckoutProcess::CheckoutProcess(
 , _reactivate(std::move(reactivate))
 , _nonPanelPaymentFormProcess(std::move(nonPanelPaymentFormProcess)) {
 	_form->updates(
-	) | rpl::start_with_next([=](const FormUpdate &update) {
+	) | rpl::on_next([=](const FormUpdate &update) {
 		handleFormUpdate(update);
 	}, _lifetime);
 
 	_panel->savedMethodChosen(
-	) | rpl::start_with_next([=](QString id) {
+	) | rpl::on_next([=](QString id) {
 		_form->chooseSavedMethod(id);
 	}, _panel->lifetime());
 
 	_panel->backRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		panelCancelEdit();
 	}, _panel->lifetime());
 	if (!_nonPanelPaymentFormProcess) {
@@ -352,7 +345,7 @@ CheckoutProcess::CheckoutProcess(
 
 	if (mode == Mode::Payment) {
 		_session->api().cloudPassword().state(
-		) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
+		) | rpl::on_next([=](const Core::CloudPasswordState &state) {
 			_form->setHasPassword(state.hasPassword);
 		}, _lifetime);
 	}
@@ -372,7 +365,9 @@ void CheckoutProcess::setNonPanelPaymentFormProcess(
 }
 
 void CheckoutProcess::requestActivate() {
-	_panel->requestActivate();
+	if (!_nonPanelPaymentFormProcess) {
+		_panel->requestActivate();
+	}
 }
 
 not_null<Ui::PanelDelegate*> CheckoutProcess::panelDelegate() {
@@ -415,7 +410,7 @@ void CheckoutProcess::handleFormUpdate(const FormUpdate &update) {
 		UnregisterPaymentStart(this);
 		_submitState = SubmitState::Validated;
 		_panel->showWarning(data.bot->name(), data.provider->name());
-		if (const auto box = _enterPasswordBox.data()) {
+		if (const auto box = _enterPasswordBox.get()) {
 			box->closeBox();
 		}
 	}, [&](const VerificationNeeded &data) {
@@ -539,7 +534,7 @@ void CheckoutProcess::handleError(const Error &error) {
 		showToast({ "SmartGlocal Error: " + id });
 	} break;
 	case Error::Type::TmpPassword:
-		if (const auto box = _enterPasswordBox.data()) {
+		if (const auto box = _enterPasswordBox.get()) {
 			if (!box->handleCustomCheckError(id)) {
 				showToast({ "Error: Could not generate tmp password." });
 			}
@@ -547,7 +542,7 @@ void CheckoutProcess::handleError(const Error &error) {
 		break;
 	case Error::Type::Send:
 		_sendFormFailed = true;
-		if (const auto box = _enterPasswordBox.data()) {
+		if (const auto box = _enterPasswordBox.get()) {
 			box->closeBox();
 		}
 		if (_submitState == SubmitState::Finishing) {
@@ -862,7 +857,7 @@ void CheckoutProcess::requestPassword() {
 		fields.customSubmitButton = tr::lng_payments_password_submit();
 		fields.customCheckCallback = [=](
 				const Core::CloudPasswordResult &result,
-				QPointer<PasscodeBox> box) {
+				base::weak_qptr<PasscodeBox> box) {
 			_enterPasswordBox = box;
 			_form->submit(result);
 		};
@@ -883,12 +878,12 @@ void CheckoutProcess::panelSetPassword() {
 		rpl::merge(
 			box->newPasswordSet() | rpl::to_empty,
 			box->passwordReloadNeeded()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_session->api().cloudPassword().reload();
 		}, box->lifetime());
 
 		box->clearUnconfirmedPassword(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_session->api().cloudPassword().clearUnconfirmedPassword();
 		}, box->lifetime());
 
@@ -908,7 +903,7 @@ void CheckoutProcess::getPasswordState(
 		return;
 	}
 	_session->api().cloudPassword().state(
-	) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
+	) | rpl::on_next([=](const Core::CloudPasswordState &state) {
 		_gettingPasswordState.destroy();
 		callback(state);
 	}, _gettingPasswordState);
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.h b/Telegram/SourceFiles/payments/payments_checkout_process.h
index 8131a453363266..ad6648c5008a88 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.h
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.h
@@ -54,6 +54,7 @@ enum class CheckoutResult {
 	Pending,
 	Cancelled,
 	Failed,
+	Free, // Gift transfer attempt that doesn't need any payment.
 };
 
 struct RealFormPresentedNotification {
@@ -88,7 +89,8 @@ class CheckoutProcess final
 		Fn<void(NonPanelPaymentForm)> nonPanelPaymentFormProcess);
 	static void Start(
 		InvoicePremiumGiftCode giftCodeInvoice,
-		Fn<void(CheckoutResult)> reactivate);
+		Fn<void(CheckoutResult)> reactivate,
+		Fn<void(NonPanelPaymentForm)> nonPanelPaymentFormProcess = nullptr);
 	static void Start(
 		InvoiceCredits creditsInvoice,
 		Fn<void(CheckoutResult)> reactivate);
@@ -187,7 +189,7 @@ class CheckoutProcess final
 	const not_null<Main::Session*> _session;
 	const std::unique_ptr<Form> _form;
 	const std::unique_ptr<Ui::Panel> _panel;
-	QPointer<PasscodeBox> _enterPasswordBox;
+	base::weak_qptr<PasscodeBox> _enterPasswordBox;
 	Fn<void(CheckoutResult)> _reactivate;
 	Fn<void(NonPanelPaymentForm)> _nonPanelPaymentFormProcess;
 	SubmitState _submitState = SubmitState::None;
diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index 7941404c464f88..50b22888d6a4c7 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -122,7 +122,7 @@ not_null<Main::Session*> SessionFromId(const InvoiceId &id) {
 	} else if (const auto slug = std::get_if<InvoiceCredits>(&id.value)) {
 		return slug->session;
 	} else if (const auto gift = std::get_if<InvoiceStarGift>(&id.value)) {
-		return &gift->user->session();
+		return &gift->recipient->session();
 	}
 	const auto &giftCode = v::get<InvoicePremiumGiftCode>(id.value);
 	const auto users = std::get_if<InvoicePremiumGiftCodeUsers>(
@@ -158,11 +158,11 @@ MTPinputStorePaymentPurpose InvoicePremiumGiftCodeGiveawayToTL(
 			| (giveaway.additionalPrize.isEmpty()
 				? Flag()
 				: Flag::f_prize_description)),
-		giveaway.boostPeer->input,
+		giveaway.boostPeer->input(),
 		MTP_vector_from_range(ranges::views::all(
 			giveaway.additionalChannels
 		) | ranges::views::transform([](not_null<ChannelData*> c) {
-			return MTPInputPeer(c->input);
+			return MTPInputPeer(c->input());
 		})),
 		MTP_vector_from_range(ranges::views::all(
 			giveaway.countries
@@ -178,7 +178,7 @@ MTPinputStorePaymentPurpose InvoicePremiumGiftCodeGiveawayToTL(
 
 MTPinputStorePaymentPurpose InvoiceCreditsGiveawayToTL(
 		const InvoicePremiumGiftCode &invoice) {
-	Expects(invoice.creditsAmount.has_value());
+	Expects(invoice.giveawayCredits.has_value());
 	const auto &giveaway = v::get<InvoicePremiumGiftCodeGiveaway>(
 		invoice.purpose);
 	using Flag = MTPDinputStorePaymentStarsGiveaway::Flag;
@@ -199,12 +199,12 @@ MTPinputStorePaymentPurpose InvoiceCreditsGiveawayToTL(
 			| (giveaway.additionalPrize.isEmpty()
 				? Flag()
 				: Flag::f_prize_description)),
-		MTP_long(*invoice.creditsAmount),
-		giveaway.boostPeer->input,
+		MTP_long(*invoice.giveawayCredits),
+		giveaway.boostPeer->input(),
 		MTP_vector_from_range(ranges::views::all(
 			giveaway.additionalChannels
 		) | ranges::views::transform([](not_null<ChannelData*> c) {
-			return MTPInputPeer(c->input);
+			return MTPInputPeer(c->input());
 		})),
 		MTP_vector_from_range(ranges::views::all(
 			giveaway.countries
@@ -219,6 +219,13 @@ MTPinputStorePaymentPurpose InvoiceCreditsGiveawayToTL(
 		MTP_int(invoice.users));
 }
 
+bool IsPremiumForStarsInvoice(const InvoiceId &id) {
+	const auto giftCode = std::get_if<InvoicePremiumGiftCode>(&id.value);
+	return giftCode
+		&& !giftCode->giveawayCredits
+		&& (giftCode->currency == ::Ui::kCreditsCurrency);
+}
+
 Form::Form(InvoiceId id, bool receipt)
 : _id(id)
 , _session(SessionFromId(id))
@@ -289,7 +296,7 @@ void Form::loadThumbnail(not_null<PhotoData*> photo) {
 	_thumbnailLoadProcess->view = std::move(view);
 	photo->load(Data::PhotoSize::Thumbnail, thumbnailFileOrigin());
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto &view = _thumbnailLoadProcess->view;
 		if (auto good = prepareGoodThumbnail(view); !good.isNull()) {
 			_invoice.cover.thumbnail = std::move(good);
@@ -359,7 +366,7 @@ QImage Form::prepareEmptyThumbnail() const {
 MTPInputInvoice Form::inputInvoice() const {
 	if (const auto message = std::get_if<InvoiceMessage>(&_id.value)) {
 		return MTP_inputInvoiceMessage(
-			message->peer->input,
+			message->peer->input(),
 			MTP_int(message->itemId.bare));
 	} else if (const auto slug = std::get_if<InvoiceSlug>(&_id.value)) {
 		return MTP_inputInvoiceSlug(MTP_string(slug->slug));
@@ -368,33 +375,42 @@ MTPInputInvoice Form::inputInvoice() const {
 			if (const auto user = _session->data().user(userId)) {
 				return MTP_inputInvoiceStars(
 					MTP_inputStorePaymentStarsGift(
-						user->inputUser,
+						user->inputUser(),
 						MTP_long(credits->credits),
 						MTP_string(credits->currency),
 						MTP_long(credits->amount)));
 			}
 		}
+		const auto spendPeer = credits->spendPurposePeerId
+			? _session->data().peerLoaded(credits->spendPurposePeerId)
+			: nullptr;
+		using Flag = MTPDinputStorePaymentStarsTopup::Flag;
 		return MTP_inputInvoiceStars(
 			MTP_inputStorePaymentStarsTopup(
+				MTP_flags(spendPeer
+					? Flag::f_spend_purpose_peer
+					: Flag()),
 				MTP_long(credits->credits),
 				MTP_string(credits->currency),
-				MTP_long(credits->amount)));
+				MTP_long(credits->amount),
+				spendPeer ? spendPeer->input() : MTPInputPeer()));
 	} else if (const auto gift = std::get_if<InvoiceStarGift>(&_id.value)) {
 		using Flag = MTPDinputInvoiceStarGift::Flag;
 		return MTP_inputInvoiceStarGift(
 			MTP_flags((gift->anonymous ? Flag::f_hide_name : Flag(0))
-				| (gift->message.empty() ? Flag(0) : Flag::f_message)),
-			gift->user->inputUser,
+				| (gift->message.empty() ? Flag(0) : Flag::f_message)
+				| (gift->upgraded ? Flag::f_include_upgrade : Flag(0))),
+			gift->recipient->input(),
 			MTP_long(gift->giftId),
 			MTP_textWithEntities(
 				MTP_string(gift->message.text),
 				Api::EntitiesToMTP(
-					&gift->user->session(),
+					&gift->recipient->session(),
 					gift->message.entities,
 					Api::ConvertOption::SkipLocal)));
 	}
 	const auto &giftCode = v::get<InvoicePremiumGiftCode>(_id.value);
-	if (giftCode.creditsAmount) {
+	if (giftCode.giveawayCredits) {
 		return MTP_inputInvoiceStars(InvoiceCreditsGiveawayToTL(giftCode));
 	}
 	using Flag = MTPDpremiumGiftCodeOption::Flag;
@@ -411,26 +427,38 @@ MTPInputInvoice Form::inputInvoice() const {
 		MTP_long(giftCode.amount));
 	const auto users = std::get_if<InvoicePremiumGiftCodeUsers>(
 		&giftCode.purpose);
-	if (users) {
+	auto message = (users && !users->message.empty())
+		? MTP_textWithEntities(
+			MTP_string(users->message.text),
+			Api::EntitiesToMTP(
+				&users->users.front()->session(),
+				users->message.entities,
+				Api::ConvertOption::SkipLocal))
+		: std::optional<MTPTextWithEntities>();
+	if (users
+		&& users->users.size() == 1
+		&& giftCode.currency == ::Ui::kCreditsCurrency) {
+		using Flag = MTPDinputInvoicePremiumGiftStars::Flag;
+		return MTP_inputInvoicePremiumGiftStars(
+			MTP_flags(message ? Flag::f_message : Flag()),
+			users->users.front()->inputUser(),
+			MTP_int(giftCode.months),
+			message.value_or(MTPTextWithEntities()));
+	} else if (users) {
 		using Flag = MTPDinputStorePaymentPremiumGiftCode::Flag;
 		return MTP_inputInvoicePremiumGiftCode(
 			MTP_inputStorePaymentPremiumGiftCode(
 				MTP_flags((users->boostPeer ? Flag::f_boost_peer : Flag())
-					| (users->message.empty() ? Flag(0) : Flag::f_message)),
+					| (message ? Flag::f_message : Flag())),
 				MTP_vector_from_range(ranges::views::all(
 					users->users
 				) | ranges::views::transform([](not_null<UserData*> user) {
-					return MTPInputUser(user->inputUser);
+					return MTPInputUser(user->inputUser());
 				})),
-				users->boostPeer ? users->boostPeer->input : MTPInputPeer(),
+				users->boostPeer ? users->boostPeer->input() : MTPInputPeer(),
 				MTP_string(giftCode.currency),
 				MTP_long(giftCode.amount),
-				MTP_textWithEntities(
-					MTP_string(users->message.text),
-					Api::EntitiesToMTP(
-						&users->users.front()->session(),
-						users->message.entities,
-						Api::ConvertOption::SkipLocal))),
+				message.value_or(MTPTextWithEntities())),
 			option);
 	} else {
 		return MTP_inputInvoicePremiumGiftCode(
@@ -456,6 +484,8 @@ void Form::requestForm() {
 			const auto amount = tlPrices.empty()
 				? 0
 				: tlPrices.front().data().vamount().v;
+			const auto subscriptionPeriod
+				= data.vinvoice().data().vsubscription_period().value_or(0);
 			if (currency != ::Ui::kCreditsCurrency || !amount) {
 				using Type = Error::Type;
 				_updates.fire(Error{ Type::Form, u"Bad Stars Form."_q });
@@ -467,6 +497,7 @@ void Form::requestForm() {
 				.credits = amount,
 				.currency = currency,
 				.amount = amount,
+				.subscriptionPeriod = subscriptionPeriod,
 			};
 			const auto formData = CreditsFormData{
 				.id = _id,
@@ -508,6 +539,7 @@ void Form::requestForm() {
 				.invoice = invoice,
 				.inputInvoice = inputInvoice(),
 				.starGiftLimitedCount = gift ? gift->limitedCount : 0,
+				.starGiftPerUserLimit = gift ? gift->perUserLimit : 0,
 				.starGiftForm = true,
 			};
 			_updates.fire(CreditsPaymentStarted{ .data = formData });
@@ -524,7 +556,7 @@ void Form::requestReceipt() {
 	const auto message = v::get<InvoiceMessage>(_id.value);
 	showProgress();
 	_api.request(MTPpayments_GetPaymentReceipt(
-		message.peer->input,
+		message.peer->input(),
 		MTP_int(message.itemId.bare)
 	)).done([=](const MTPpayments_PaymentReceipt &result) {
 		hideProgress();
@@ -608,7 +640,7 @@ void Form::processReceipt(const MTPDpayments_paymentReceiptStars &data) {
 				ImageLocation())
 			: nullptr,
 		.peerId = peerFromUser(data.vbot_id().v),
-		.credits = data.vtotal_amount().v,
+		.credits = CreditsAmount(data.vtotal_amount().v),
 		.date = data.vdate().v,
 	};
 	_updates.fire(CreditsReceiptReady{ .data = receiptData });
@@ -900,7 +932,7 @@ void Form::submit() {
 	if (index < list.size() && password.isEmpty()) {
 		_updates.fire(TmpPasswordRequired{});
 		return;
-	} else if (!_session->local().isBotTrustedPayment(_details.botId)) {
+	} else if (!_session->local().isPeerTrustedPayment(_details.botId)) {
 		_updates.fire(BotTrustRequired{
 			.bot = _session->data().user(_details.botId),
 			.provider = _session->data().user(_details.providerId),
@@ -1303,7 +1335,7 @@ void Form::acceptTerms() {
 }
 
 void Form::trustBot() {
-	_session->local().markBotTrustedPayment(_details.botId);
+	_session->local().markPeerTrustedPayment(_details.botId);
 }
 
 void Form::processShippingOptions(const QVector<MTPShippingOption> &data) {
diff --git a/Telegram/SourceFiles/payments/payments_form.h b/Telegram/SourceFiles/payments/payments_form.h
index 9b0d38d4d5f94e..1fc35c61a77342 100644
--- a/Telegram/SourceFiles/payments/payments_form.h
+++ b/Telegram/SourceFiles/payments/payments_form.h
@@ -153,7 +153,7 @@ struct InvoicePremiumGiftCode {
 
 	QString currency;
 	QString storeProduct;
-	std::optional<uint64> creditsAmount;
+	std::optional<uint64> giveawayCredits;
 	uint64 randomId = 0;
 	uint64 amount = 0;
 	int storeQuantity = 0;
@@ -170,15 +170,19 @@ struct InvoiceCredits {
 	uint64 amount = 0;
 	bool extended = false;
 	PeerId giftPeerId = PeerId(0);
+	int subscriptionPeriod = 0;
+	PeerId spendPurposePeerId = PeerId(0);
 };
 
 struct InvoiceStarGift {
 	uint64 giftId = 0;
 	uint64 randomId = 0;
 	TextWithEntities message;
-	not_null<UserData*> user;
+	not_null<PeerData*> recipient;
 	int limitedCount = 0;
+	int perUserLimit = 0;
 	bool anonymous = false;
+	bool upgraded = false;
 };
 
 struct InvoiceId {
@@ -200,6 +204,7 @@ struct CreditsFormData {
 	InvoiceCredits invoice;
 	MTPInputInvoice inputInvoice;
 	int starGiftLimitedCount = 0;
+	int starGiftPerUserLimit = 0;
 	bool starGiftForm = false;
 };
 
@@ -209,7 +214,7 @@ struct CreditsReceiptData {
 	QString description;
 	PhotoData *photo = nullptr;
 	PeerId peerId = PeerId(0);
-	uint64 credits = 0;
+	CreditsAmount credits;
 	TimeId date = 0;
 };
 
@@ -285,6 +290,8 @@ struct FormUpdate : std::variant<
 [[nodiscard]] MTPinputStorePaymentPurpose InvoiceCreditsGiveawayToTL(
 	const InvoicePremiumGiftCode &invoice);
 
+[[nodiscard]] bool IsPremiumForStarsInvoice(const InvoiceId &id);
+
 class Form final : public base::has_weak_ptr {
 public:
 	Form(InvoiceId id, bool receipt);
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
index 6f348df4f33560..fa517bf9c25421 100644
--- a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
@@ -46,63 +46,85 @@ void ProcessCreditsPayment(
 		QPointer<QWidget> fireworks,
 		std::shared_ptr<CreditsFormData> form,
 		Fn<void(CheckoutResult)> maybeReturnToBot) {
-	const auto done = [=](Settings::SmallBalanceResult result) {
+	const auto hasBadResult = [=](Settings::SmallBalanceResult result) {
 		if (result == Settings::SmallBalanceResult::Blocked) {
 			if (const auto onstack = maybeReturnToBot) {
 				onstack(CheckoutResult::Failed);
 			}
-			return;
+			return true;
 		} else if (result == Settings::SmallBalanceResult::Cancelled) {
 			if (const auto onstack = maybeReturnToBot) {
 				onstack(CheckoutResult::Cancelled);
 			}
+			return true;
+		}
+		return false;
+	};
+	const auto done = [=](Settings::SmallBalanceResult result) {
+		if (hasBadResult(result)) {
 			return;
-		} else if (form->starGiftForm) {
-			const auto done = [=](std::optional<QString> error) {
-				const auto onstack = maybeReturnToBot;
-				if (error) {
-					if (*error == u"STARGIFT_USAGE_LIMITED"_q) {
-						if (form->starGiftLimitedCount) {
-							show->showToast({
-								.title = tr::lng_gift_sold_out_title(
-									tr::now),
-								.text = tr::lng_gift_sold_out_text(
-									tr::now,
-									lt_count_decimal,
-									form->starGiftLimitedCount,
-									Ui::Text::RichLangValue),
-							});
-						} else {
-							show->showToast(
-								tr::lng_gift_sold_out_title(tr::now));
-						}
+		}
+		const auto done = [=](std::optional<QString> error) {
+			const auto onstack = maybeReturnToBot;
+			if (error) {
+				if (*error == u"STARGIFT_USAGE_LIMITED"_q) {
+					if (form->starGiftLimitedCount) {
+						show->showToast({
+							.title = tr::lng_gift_sold_out_title(
+								tr::now),
+							.text = tr::lng_gift_sold_out_text(
+								tr::now,
+								lt_count_decimal,
+								form->starGiftLimitedCount,
+								tr::rich),
+						});
 					} else {
-						show->showToast(*error);
-					}
-					if (onstack) {
-						onstack(CheckoutResult::Failed);
+						show->showToast(
+							tr::lng_gift_sold_out_title(tr::now));
 					}
-				} else if (onstack) {
-					onstack(CheckoutResult::Paid);
+				} else if (*error == u"STARGIFT_USER_USAGE_LIMITED"_q) {
+					show->showToast({
+						.text = tr::lng_gift_sent_finished(
+							tr::now,
+							lt_count,
+							std::max(form->starGiftPerUserLimit, 1),
+							tr::rich),
+					});
+				} else {
+					show->showToast(*error);
 				}
-			};
-			Ui::SendStarGift(&show->session(), form, done);
-			return;
-		}
+				if (onstack) {
+					onstack(CheckoutResult::Failed);
+				}
+			} else if (onstack) {
+				onstack(CheckoutResult::Paid);
+			}
+		};
+		Ui::SendStarsForm(&show->session(), form, done);
+	};
+	using namespace Settings;
+	auto source = Ui::SmallBalanceSourceFromForm(form);
+	if (form->starGiftForm || IsPremiumForStarsInvoice(form->id)) {
+		const auto credits = form->invoice.credits;
+		MaybeRequestBalanceIncrease(show, credits, source, done);
+	} else {
 		const auto unsuccessful = std::make_shared<bool>(true);
 		const auto box = show->show(Box(
 			Ui::SendCreditsBox,
 			form,
-			[=] {
-			*unsuccessful = false;
-			if (const auto widget = fireworks.data()) {
-				Ui::StartFireworks(widget);
-			}
-			if (const auto onstack = maybeReturnToBot) {
-				onstack(CheckoutResult::Paid);
-			}
-		}));
-		box->boxClosing() | rpl::start_with_next([=] {
+			[=](Settings::SmallBalanceResult result) {
+				*unsuccessful = false;
+				if (hasBadResult(result)) {
+					return;
+				}
+				if (const auto widget = fireworks.data()) {
+					Ui::StartFireworks(widget);
+				}
+				if (const auto onstack = maybeReturnToBot) {
+					onstack(CheckoutResult::Paid);
+				}
+			}));
+		box->boxClosing() | rpl::on_next([=] {
 			crl::on_main([=] {
 				if (*unsuccessful) {
 					if (const auto onstack = maybeReturnToBot) {
@@ -111,15 +133,7 @@ void ProcessCreditsPayment(
 				}
 			});
 		}, box->lifetime());
-	};
-	using namespace Settings;
-	const auto starGift = std::get_if<InvoiceStarGift>(&form->id.value);
-	auto source = !starGift
-		? SmallBalanceSource(SmallBalanceBot{ .botId = form->botId })
-		: SmallBalanceSource(SmallBalanceStarGift{
-			.userId = peerToUser(starGift->user->id)
-		});
-	MaybeRequestBalanceIncrease(show, form->invoice.credits, source, done);
+	}
 }
 
 void ProcessCreditsReceipt(
diff --git a/Telegram/SourceFiles/payments/payments_reaction_process.cpp b/Telegram/SourceFiles/payments/payments_reaction_process.cpp
index 7050fa120a8d31..d9a2cd5408dac1 100644
--- a/Telegram/SourceFiles/payments/payments_reaction_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_reaction_process.cpp
@@ -10,8 +10,11 @@ For license and copyright information please follow this link:
 #include "api/api_credits.h"
 #include "api/api_global_privacy.h"
 #include "apiwrap.h"
+#include "boxes/peers/prepare_short_info_box.h"
 #include "boxes/send_credits_box.h" // CreditsEmojiSmall.
-#include "core/ui_integration.h" // MarkedTextContext.
+#include "calls/group/calls_group_call.h"
+#include "calls/group/calls_group_messages.h"
+#include "core/ui_integration.h" // TextContext.
 #include "data/components/credits.h"
 #include "data/data_channel.h"
 #include "data/data_message_reactions.h"
@@ -22,6 +25,7 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
 #include "main/session/session_show.h"
+#include "main/session/send_as_peers.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "payments/ui/payments_reaction_box.h"
@@ -37,19 +41,19 @@ For license and copyright information please follow this link:
 namespace Payments {
 namespace {
 
-constexpr auto kMaxPerReactionFallback = 2'500;
+constexpr auto kMaxPerReactionFallback = 10'000;
 constexpr auto kDefaultPerReaction = 50;
 
 void TryAddingPaidReaction(
-		not_null<Main::Session*> session,
+		std::shared_ptr<Main::SessionShow> show,
 		FullMsgId itemId,
 		base::weak_ptr<HistoryView::Element> weakView,
 		int count,
-		std::optional<bool> anonymous,
-		std::shared_ptr<Ui::Show> show,
+		std::optional<PeerId> shownPeer,
 		Fn<void(bool)> finished) {
+	const auto owner = &show->session().data();
 	const auto checkItem = [=] {
-		const auto item = session->data().message(itemId);
+		const auto item = owner->message(itemId);
 		if (!item) {
 			if (const auto onstack = finished) {
 				onstack(false);
@@ -66,7 +70,7 @@ void TryAddingPaidReaction(
 		if (result == Settings::SmallBalanceResult::Success
 			|| result == Settings::SmallBalanceResult::Already) {
 			if (const auto item = checkItem()) {
-				item->addPaidReaction(count, anonymous);
+				item->addPaidReaction(count, shownPeer);
 				if (const auto view = count ? weakView.get() : nullptr) {
 					const auto history = view->history();
 					history->owner().notifyViewPaidReactionSent(view);
@@ -84,7 +88,7 @@ void TryAddingPaidReaction(
 	};
 	const auto channelId = peerToChannel(itemId.peer);
 	Settings::MaybeRequestBalanceIncrease(
-		Main::MakeSessionShow(show, session),
+		show,
 		count,
 		Settings::SmallBalanceReaction{ .channelId = channelId },
 		done);
@@ -105,19 +109,54 @@ void TryAddingPaidReaction(
 		not_null<HistoryItem*> item,
 		HistoryView::Element *view,
 		int count,
-		std::optional<bool> anonymous,
-		std::shared_ptr<Ui::Show> show,
+		std::optional<PeerId> shownPeer,
+		std::shared_ptr<Main::SessionShow> show,
 		Fn<void(bool)> finished) {
 	TryAddingPaidReaction(
-		&item->history()->session(),
+		std::move(show),
 		item->fullId(),
 		view,
 		count,
-		anonymous,
-		std::move(show),
+		shownPeer,
 		std::move(finished));
 }
 
+void TryAddingPaidReaction(
+		not_null<Calls::GroupCall*> call,
+		int count,
+		std::shared_ptr<Main::SessionShow> show,
+		Fn<void(bool)> finished) {
+	const auto checkCall = [weak = base::make_weak(call), finished] {
+		const auto strong = weak.get();
+		if (!strong) {
+			if (const auto onstack = finished) {
+				onstack(false);
+			}
+		}
+		return strong;
+	};
+
+	const auto done = [=](Settings::SmallBalanceResult result) {
+		if (result == Settings::SmallBalanceResult::Success
+			|| result == Settings::SmallBalanceResult::Already) {
+			if (const auto call = checkCall()) {
+				call->messages()->reactionsPaidAdd(count);
+				call->peer()->owner().notifyCallPaidReactionSent(call);
+				if (const auto onstack = finished) {
+					onstack(true);
+				}
+			}
+		} else if (const auto onstack = finished) {
+			onstack(false);
+		}
+	};
+	Settings::MaybeRequestBalanceIncrease(
+		show,
+		count,
+		Settings::SmallBalanceVideoStream{ .streamerId = call->peer()->id },
+		done);
+}
+
 void ShowPaidReactionDetails(
 		not_null<Window::SessionController*> controller,
 		not_null<HistoryItem*> item,
@@ -139,27 +178,27 @@ void ShowPaidReactionDetails(
 	const auto chosen = std::clamp(kDefaultPerReaction, 1, max);
 
 	struct State {
-		QPointer<Ui::BoxContent> selectBox;
-		bool ignoreAnonymousSwitch = false;
+		base::weak_qptr<Ui::BoxContent> selectBox;
+		bool ignoreShownPeerSwitch = false;
 		bool sending = false;
 	};
 	const auto state = std::make_shared<State>();
 	session->credits().load(true);
 
 	const auto weakView = base::make_weak(view);
-	const auto send = [=](int count, bool anonymous, auto resend) -> void {
+	const auto send = [=](int count, PeerId shownPeer, auto resend) -> void {
 		Expects(count >= 0);
 
 		const auto finish = [=](bool success) {
 			state->sending = false;
 			if (success && count > 0) {
-				state->ignoreAnonymousSwitch = true;
-				if (const auto strong = state->selectBox.data()) {
+				state->ignoreShownPeerSwitch = true;
+				if (const auto strong = state->selectBox.get()) {
 					strong->closeBox();
 				}
 			}
 		};
-		if (state->sending || (!count && state->ignoreAnonymousSwitch)) {
+		if (state->sending || (!count && state->ignoreShownPeerSwitch)) {
 			return;
 		} else if (const auto item = session->data().message(itemId)) {
 			state->sending = true;
@@ -167,7 +206,7 @@ void ShowPaidReactionDetails(
 				item,
 				weakView.get(),
 				count,
-				anonymous,
+				shownPeer,
 				show,
 				finish);
 		}
@@ -175,22 +214,13 @@ void ShowPaidReactionDetails(
 
 	auto submitText = [=](rpl::producer<int> amount) {
 		auto nice = std::move(amount) | rpl::map([=](int count) {
-			return Ui::CreditsEmojiSmall(session).append(
+			return Ui::CreditsEmojiSmall().append(
 				Lang::FormatCountDecimal(count));
 		});
 		return tr::lng_paid_react_send(
 			lt_price,
 			std::move(nice),
-			Ui::Text::RichLangValue
-		) | rpl::map([=](TextWithEntities &&text) {
-			return Ui::TextWithContext{
-				.text = std::move(text),
-				.context = Core::MarkedTextContext{
-					.session = session,
-					.customEmojiRepaint = [] {},
-				},
-			};
-		});
+			tr::rich);
 	};
 	auto top = std::vector<Ui::PaidReactionTop>();
 	const auto add = [&](const Data::MessageReactionsTopPaid &entry) {
@@ -199,60 +229,76 @@ void ShowPaidReactionDetails(
 			? peer->shortName()
 			: tr::lng_paid_react_anonymous(tr::now);
 		const auto open = [=] {
-			controller->showPeerInfo(peer);
+			controller->uiShow()->show(PrepareShortInfoBox(peer, controller));
 		};
 		top.push_back({
 			.name = name,
 			.photo = (peer
 				? Ui::MakeUserpicThumbnail(peer)
 				: Ui::MakeHiddenAuthorThumbnail()),
+			.barePeerId = peer ? uint64(peer->id.value) : 0,
 			.count = int(entry.count),
 			.click = peer ? open : Fn<void()>(),
 			.my = (entry.my == 1),
 		});
 	};
+	const auto linked = item->discussionPostOriginalSender();
+	const auto channel = (linked ? linked : item->history()->peer.get());
+	const auto channels = session->sendAsPeers().list(
+		{ channel, Main::SendAsType::PaidReaction }
+	) | ranges::views::transform(
+		&Main::SendAsPeer::peer
+	) | ranges::to_vector;
 	const auto topPaid = item->topPaidReactionsWithLocal();
-	top.reserve(topPaid.size() + 2);
+	top.reserve(topPaid.size() + 2 + channels.size());
 	for (const auto &entry : topPaid) {
 		add(entry);
-		if (entry.my) {
-			auto copy = entry;
-			copy.peer = entry.peer ? nullptr : session->user().get();
-			add(copy);
-		}
 	}
-	if (!ranges::contains(top, true, &Ui::PaidReactionTop::my)) {
-		auto entry = Data::MessageReactionsTopPaid{
-			.peer = session->user(),
-			.count = 0,
-			.my = true,
-		};
-		add(entry);
-		entry.peer = nullptr;
-		add(entry);
-		if (session->api().globalPrivacy().paidReactionAnonymousCurrent()) {
-			std::swap(top.front(), top.back());
+	auto myAdded = base::flat_set<uint64>();
+	const auto i = ranges::find(top, true, &Ui::PaidReactionTop::my);
+	if (i != end(top)) {
+		myAdded.emplace(i->barePeerId);
+	}
+	const auto myCount = uint32((i != end(top)) ? i->count : 0);
+	const auto myAdd = [&](PeerData *peer) {
+		const auto barePeerId = peer ? uint64(peer->id.value) : 0;
+		if (!myAdded.emplace(barePeerId).second) {
+			return;
 		}
+		add(Data::MessageReactionsTopPaid{
+			.peer = peer,
+			.count = myCount,
+			.my = true,
+		});
+	};
+	const auto globalPrivacy = &session->api().globalPrivacy();
+	const auto shown = globalPrivacy->paidReactionShownPeerCurrent();
+	const auto owner = &session->data();
+	const auto shownPeer = shown ? owner->peer(shown).get() : nullptr;
+	myAdd(shownPeer);
+	myAdd(session->user());
+	myAdd(nullptr);
+	for (const auto &channel : channels) {
+		myAdd(channel);
 	}
-	ranges::sort(top, ranges::greater(), &Ui::PaidReactionTop::count);
+	ranges::stable_sort(top, ranges::greater(), &Ui::PaidReactionTop::count);
 
-	const auto linked = item->discussionPostOriginalSender();
-	const auto channel = (linked ? linked : item->history()->peer.get());
 	state->selectBox = show->show(Ui::MakePaidReactionBox({
 		.chosen = chosen,
 		.max = max,
 		.top = std::move(top),
-		.channel = channel->name(),
+		.session = &channel->session(),
+		.name = channel->name(),
 		.submit = std::move(submitText),
 		.balanceValue = session->credits().balanceValue(),
-		.send = [=](int count, bool anonymous) {
-			send(count, anonymous, send);
+		.send = [=](int count, uint64 barePeerId) {
+			send(count, PeerId(barePeerId), send);
 		},
 	}));
 
-	if (const auto strong = state->selectBox.data()) {
+	if (const auto strong = state->selectBox.get()) {
 		session->data().itemRemoved(
-		) | rpl::start_with_next([=](not_null<const HistoryItem*> removed) {
+		) | rpl::on_next([=](not_null<const HistoryItem*> removed) {
 			if (removed == item) {
 				strong->closeBox();
 			}
diff --git a/Telegram/SourceFiles/payments/payments_reaction_process.h b/Telegram/SourceFiles/payments/payments_reaction_process.h
index 1aa5d7b5ed69c8..1071b0dfbbba81 100644
--- a/Telegram/SourceFiles/payments/payments_reaction_process.h
+++ b/Telegram/SourceFiles/payments/payments_reaction_process.h
@@ -11,13 +11,17 @@ enum class HistoryReactionSource : char;
 
 class HistoryItem;
 
+namespace Calls {
+class GroupCall;
+} // namespace Calls
+
 namespace HistoryView {
 class Element;
 } // namespace HistoryView
 
-namespace Ui {
-class Show;
-} // namespace Ui
+namespace Main {
+class SessionShow;
+} // namespace Main
 
 namespace Window {
 class SessionController;
@@ -31,8 +35,14 @@ void TryAddingPaidReaction(
 	not_null<HistoryItem*> item,
 	HistoryView::Element *view,
 	int count,
-	std::optional<bool> anonymous,
-	std::shared_ptr<Ui::Show> show,
+	std::optional<PeerId> shownPeer,
+	std::shared_ptr<Main::SessionShow> show,
+	Fn<void(bool)> finished = nullptr);
+
+void TryAddingPaidReaction(
+	not_null<Calls::GroupCall*> call,
+	int count,
+	std::shared_ptr<Main::SessionShow> show,
 	Fn<void(bool)> finished = nullptr);
 
 void ShowPaidReactionDetails(
diff --git a/Telegram/SourceFiles/payments/ui/payments.style b/Telegram/SourceFiles/payments/ui/payments.style
index fd9e57baba6431..cb19f1ab3f2671 100644
--- a/Telegram/SourceFiles/payments/ui/payments.style
+++ b/Telegram/SourceFiles/payments/ui/payments.style
@@ -128,7 +128,7 @@ paymentsToProviderLabel: paymentsShippingPrice;
 paymentsToProviderPadding: margins(28px, 6px, 28px, 6px);
 
 paymentsCriticalError: FlatLabel(boxLabel) {
-	minWidth: 370px;
+	minWidth: 340px;
 	align: align(top);
 	textFg: windowSubTextFg;
 }
@@ -150,3 +150,17 @@ botWebViewBottomButton: RoundButton(paymentsPanelSubmit) {
 	}
 	textTop: 11px;
 }
+botWebViewRadialStroke: 3px;
+botWebViewMenu: PopupMenu(popupMenuWithIcons) {
+	maxHeight: 360px;
+}
+botWebViewShellRadius: 7px;
+botWebViewShellPadding: margins(12px, 12px, 12px, 12px);
+botWebViewShellShadowPadding: margins(14px, 12px, 14px, 16px);
+botWebViewShellHeaderHeight: 60px;
+botWebViewShellTitlePadding: margins(0px, 0px, 0px, 0px);
+botWebViewShellBadgeSkip: 4px;
+botWebViewShellFrameRadius: 6px;
+botWebViewShellMenuButtonSize: size(36px, 36px);
+botWebViewShellDisclosureSkip: 12px;
+botWebViewShellFooterButtonSkip: 10px;
diff --git a/Telegram/SourceFiles/payments/ui/payments_edit_card.cpp b/Telegram/SourceFiles/payments/ui/payments_edit_card.cpp
index ec18ef6d270a26..0c2aac434e9ee4 100644
--- a/Telegram/SourceFiles/payments/ui/payments_edit_card.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_edit_card.cpp
@@ -221,6 +221,8 @@ EditCard::EditCard(
 		this,
 		tr::lng_cancel(),
 		st::paymentsPanelButton) {
+	_submit->setTextTransform(RoundButtonTextTransform::ToUpper);
+	_cancel->setTextTransform(RoundButtonTextTransform::ToUpper);
 	setupControls();
 }
 
@@ -273,7 +275,7 @@ not_null<RpWidget*> EditCard::setupContent() {
 		object_ptr<VerticalLayout>(this));
 
 	_scroll->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		inner->resizeToWidth(width);
 	}, inner->lifetime());
 
@@ -317,7 +319,7 @@ not_null<RpWidget*> EditCard::setupContent() {
 		.validator = CvcValidator([=] { return _number->value(); }),
 	});
 	container->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto left = (width - st::paymentsExpireCvcSkip) / 2;
 		const auto right = width - st::paymentsExpireCvcSkip - left;
 		_expire->widget()->resizeToWidth(left);
@@ -359,7 +361,7 @@ not_null<RpWidget*> EditCard::setupContent() {
 		});
 		if (_country) {
 			_country->finished(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_zip->setFocus();
 			}, lifetime());
 		}
@@ -374,7 +376,7 @@ not_null<RpWidget*> EditCard::setupContent() {
 	}
 
 	last->submitted(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_delegate->panelValidateCard(collect(), _save && _save->checked());
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/payments/ui/payments_edit_information.cpp b/Telegram/SourceFiles/payments/ui/payments_edit_information.cpp
index ab96a8a9ea26a5..aa409b72c29041 100644
--- a/Telegram/SourceFiles/payments/ui/payments_edit_information.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_edit_information.cpp
@@ -52,6 +52,8 @@ EditInformation::EditInformation(
 		this,
 		tr::lng_cancel(),
 		st::paymentsPanelButton) {
+	_submit->setTextTransform(RoundButtonTextTransform::ToUpper);
+	_cancel->setTextTransform(RoundButtonTextTransform::ToUpper);
 	setupControls();
 }
 
@@ -106,7 +108,7 @@ not_null<RpWidget*> EditInformation::setupContent() {
 		object_ptr<VerticalLayout>(this));
 
 	_scroll->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		inner->resizeToWidth(width);
 	}, inner->lifetime());
 
@@ -209,7 +211,7 @@ not_null<RpWidget*> EditInformation::setupContent() {
 
 	if (last) {
 		last->submitted(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_delegate->panelValidateInformation(collect());
 		}, lifetime());
 	}
diff --git a/Telegram/SourceFiles/payments/ui/payments_field.cpp b/Telegram/SourceFiles/payments/ui/payments_field.cpp
index e5fbcb34e68fd4..346c6cb0ab20ee 100644
--- a/Telegram/SourceFiles/payments/ui/payments_field.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_field.cpp
@@ -375,7 +375,7 @@ struct SimpleFieldState {
 	};
 	std::move(
 		textPossiblyChanged
-	) | rpl::start_with_next(updateRight, result->lifetime());
+	) | rpl::on_next(updateRight, result->lifetime());
 	if (state->left) {
 		state->left->raise();
 	}
@@ -478,11 +478,11 @@ void Field::setupMaskedGeometry() {
 
 	_wrap->resize(_masked->size());
 	_wrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_masked->resize(width, _masked->height());
 	}, _masked->lifetime());
 	_masked->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_wrap->resize(_wrap->width(), height);
 	}, _masked->lifetime());
 }
@@ -506,7 +506,7 @@ void Field::setupCountry() {
 			CountrySelectBox::Type::Countries);
 		const auto raw = box.data();
 		raw->countryChosen(
-		) | rpl::start_with_next([=](QString iso2) {
+		) | rpl::on_next([=](QString iso2) {
 			_countryIso2 = iso2;
 			_masked->setText(Countries::Instance().countryNameByISO2(iso2));
 			_masked->hideError();
@@ -519,7 +519,7 @@ void Field::setupCountry() {
 				}
 			}
 		}, _masked->lifetime());
-		raw->boxClosing() | rpl::start_with_next([=] {
+		raw->boxClosing() | rpl::on_next([=] {
 			setFocus();
 		}, _masked->lifetime());
 		_config.showBox(std::move(box));
@@ -613,7 +613,7 @@ void Field::setupValidator(Fn<ValidateResult(ValidateRequest)> validator) {
 		const auto raw = _input->rawTextEdit();
 		QObject::connect(raw, &QTextEdit::cursorPositionChanged, save);
 		_input->changes(
-		) | rpl::start_with_next(validate, _input->lifetime());
+		) | rpl::on_next(validate, _input->lifetime());
 	}
 }
 
@@ -652,21 +652,21 @@ void Field::setupSubmit() {
 		QObject::connect(_masked, &MaskedInputField::submitted, submitted);
 	} else {
 		_input->submits(
-		) | rpl::start_with_next(submitted, _input->lifetime());
+		) | rpl::on_next(submitted, _input->lifetime());
 	}
 }
 
 void Field::setNextField(not_null<Field*> field) {
 	_nextField = field;
 
-	finished() | rpl::start_with_next([=] {
+	finished() | rpl::on_next([=] {
 		field->setFocus();
 	}, _masked ? _masked->lifetime() : _input->lifetime());
 }
 
 void Field::setPreviousField(not_null<Field*> field) {
 	frontBackspace(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		field->setFocus();
 	}, _masked ? _masked->lifetime() : _input->lifetime());
 }
diff --git a/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp b/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
index ae68d8bdde9b02..bb178a0530e4e5 100644
--- a/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
@@ -119,10 +119,12 @@ bool FormSummary::showCriticalError(const TextWithEntities &text) {
 		return false;
 	}
 	Ui::AddSkip(_layout.get(), st::paymentsPricesTopSkip);
-	_layout->add(object_ptr<FlatLabel>(
-		_layout.get(),
-		rpl::single(text),
-		st::paymentsCriticalError));
+	_layout->add(
+		object_ptr<FlatLabel>(
+			_layout.get(),
+			rpl::single(text),
+			st::paymentsCriticalError),
+		style::al_top);
 	return true;
 }
 
@@ -168,13 +170,10 @@ void FormSummary::setupControls() {
 	setupContent(_layout.get());
 
 	if (_submit) {
-		_submit->setTextTransform(
-			Ui::RoundButton::TextTransform::NoTransform);
 		_submit->addClickHandler([=] {
 			_delegate->panelSubmit();
 		});
 	}
-	_cancel->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	_cancel->addClickHandler([=] {
 		_delegate->panelRequestClose();
 	});
@@ -198,7 +197,7 @@ void FormSummary::setupControls() {
 	rpl::merge(
 		(_submit ? _submit->widthValue() : rpl::single(0)),
 		_cancel->widthValue()
-	) | rpl::skip(2) | rpl::start_with_next([=] {
+	) | rpl::skip(2) | rpl::on_next([=] {
 		updateControlsGeometry();
 	}, lifetime());
 }
@@ -225,7 +224,7 @@ void FormSummary::setupCover(not_null<VerticalLayout*> layout) {
 		_invoice.cover.seller,
 		st::paymentsSeller);
 	cover->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		if (state->thumbnail.isNull()) {
 			return;
 		}
@@ -242,7 +241,7 @@ void FormSummary::setupCover(not_null<VerticalLayout*> layout) {
 	rpl::combine(
 		cover->widthValue(),
 		_thumbnails.events_starting_with_copy(_invoice.cover.thumbnail)
-	) | rpl::start_with_next([=](int width, QImage &&thumbnail) {
+	) | rpl::on_next([=](int width, QImage &&thumbnail) {
 		const auto &padding = st::paymentsCoverPadding;
 		const auto thumbnailSkip = st::paymentsThumbnailSize.width()
 			+ st::paymentsThumbnailSkip;
@@ -312,7 +311,7 @@ void FormSummary::setupPrices(not_null<VerticalLayout*> layout) {
 		rpl::combine(
 			left->topValue(),
 			layout->widthValue()
-		) | rpl::start_with_next([=](int top, int width) {
+		) | rpl::on_next([=](int top, int width) {
 			right->moveToRight(st::paymentsPricePadding.right(), top, width);
 		}, right->lifetime());
 		return right;
@@ -360,7 +359,7 @@ void FormSummary::setupPrices(not_null<VerticalLayout*> layout) {
 		const auto text = formatAmount(_invoice.tipsSelected);
 		const auto label = addRow(
 			tr::lng_payments_tips_label(tr::now),
-			Ui::Text::Link(text));
+			tr::link(text));
 		label->overrideLinkClickHandler([=] {
 			_delegate->panelChooseTips();
 		});
@@ -409,7 +408,7 @@ void FormSummary::setupSuggestedTips(not_null<VerticalLayout*> layout) {
 	outer->widthValue(
 	) | rpl::filter([=](int outerWidth) {
 		return outerWidth >= state->maxWidth;
-	}) | rpl::start_with_next([=](int outerWidth) {
+	}) | rpl::on_next([=](int outerWidth) {
 		const auto skip = st::paymentsTipSkip;
 		const auto &buttons = state->buttons;
 		auto left = outerWidth;
@@ -563,7 +562,7 @@ void FormSummary::setupSections(not_null<VerticalLayout*> layout) {
 
 void FormSummary::setupContent(not_null<VerticalLayout*> layout) {
 	_scroll->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		layout->resizeToWidth(width);
 	}, layout->lifetime());
 
diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
index 2bc023e8c79fb1..eac1cf9b5879b2 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
@@ -75,19 +75,19 @@ Panel::Panel(not_null<PanelDelegate*> delegate)
 	_widget->setInnerSize(st::paymentsPanelSize);
 
 	_widget->closeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_delegate->panelRequestClose();
 	}, _widget->lifetime());
 
 	_widget->closeEvents(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_delegate->panelCloseSure();
 	}, _widget->lifetime());
 
 	style::PaletteChanged(
 	) | rpl::filter([=] {
 		return !_themeUpdateScheduled;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_themeUpdateScheduled = true;
 		crl::on_main(_widget.get(), [=] {
 			_themeUpdateScheduled = false;
@@ -115,7 +115,7 @@ void Panel::toggleProgress(bool shown) {
 			_widget.get(),
 			[=] { return progressRect(); });
 		_progress->widget.paintRequest(
-		) | rpl::start_with_next([=](QRect clip) {
+		) | rpl::on_next([=](QRect clip) {
 			auto p = QPainter(&_progress->widget);
 			p.setOpacity(
 				_progress->shownAnimation.value(_progress->shown ? 1. : 0.));
@@ -183,7 +183,7 @@ void Panel::setupProgressGeometry() {
 	_progress->geometryLifetime.destroy();
 	if (_webviewBottom) {
 		_webviewBottom->geometryValue(
-		) | rpl::start_with_next([=](QRect bottom) {
+		) | rpl::on_next([=](QRect bottom) {
 			const auto height = bottom.height();
 			const auto size = st::paymentsLoading.size;
 			const auto skip = (height - size.height()) / 2;
@@ -201,7 +201,7 @@ void Panel::setupProgressGeometry() {
 		}, _progress->geometryLifetime);
 	} else if (_weakFormSummary) {
 		_weakFormSummary->sizeValue(
-		) | rpl::start_with_next([=](QSize form) {
+		) | rpl::on_next([=](QSize form) {
 			const auto full = _widget->innerGeometry();
 			const auto size = st::defaultBoxButton.height;
 			const auto inner = _weakFormSummary->contentHeight();
@@ -218,12 +218,12 @@ void Panel::setupProgressGeometry() {
 		}, _progress->geometryLifetime);
 	} else if (_weakEditInformation) {
 		_weakEditInformation->geometryValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_progress->widget.setGeometry(_widget->innerGeometry());
 		}, _progress->geometryLifetime);
 	} else if (_weakEditCard) {
 		_weakEditCard->geometryValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_progress->widget.setGeometry(_widget->innerGeometry());
 		}, _progress->geometryLifetime);
 	}
@@ -349,7 +349,7 @@ void Panel::chooseShippingOption(const ShippingOptions &options) {
 			const auto area = CreateChild<AbstractButton>(layout.get());
 			area->setClickedCallback([=] { group->setValue(index); });
 			button->geometryValue(
-			) | rpl::start_with_next([=](QRect geometry) {
+			) | rpl::on_next([=](QRect geometry) {
 				label->move(
 					geometry.topLeft() + st::paymentsShippingLabelPosition);
 				price->move(
@@ -417,7 +417,7 @@ void Panel::chooseTips(const Invoice &invoice) {
 			}
 		};
 		row->submitted(
-		) | rpl::start_with_next(submit, box->lifetime());
+		) | rpl::on_next(submit, box->lifetime());
 		box->addButton(tr::lng_settings_save(), submit);
 		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 	}));
@@ -516,7 +516,7 @@ bool Panel::showWebview(
 		rpl::combine(
 			_webviewBottom->widthValue(),
 			label->widthValue()
-		) | rpl::start_with_next([=](int outerWidth, int width) {
+		) | rpl::on_next([=](int outerWidth, int width) {
 			label->move((outerWidth - width) / 2, padding.top());
 		}, label->lifetime());
 		label->show();
@@ -540,7 +540,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			return _widget->innerGeometry();
 		}),
 		bottom->heightValue()
-	) | rpl::start_with_next([=](QRect inner, int height) {
+	) | rpl::on_next([=](QRect inner, int height) {
 		bottom->move(inner.x(), inner.y() + inner.height() - height);
 		bottom->resizeToWidth(inner.width());
 		_footerHeight = bottom->height();
@@ -550,7 +550,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 	_webview = std::make_unique<WebviewWithLifetime>(
 		container,
 		Webview::WindowConfig{
-			.opaqueBg = params.opaqueBg,
+			.opaqueBg = params.bodyBg,
 			.storageId = _delegate->panelWebviewStorageId(),
 		});
 
@@ -591,7 +591,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 	rpl::combine(
 		container->geometryValue(),
 		_footerHeight.value()
-	) | rpl::start_with_next([=](QRect geometry, int footer) {
+	) | rpl::on_next([=](QRect geometry, int footer) {
 		if (const auto view = raw->widget()) {
 			view->setGeometry(geometry.marginsRemoved({ 0, 0, 0, footer }));
 		}
@@ -742,8 +742,8 @@ void Panel::requestTermsAcceptance(
 				? tr::lng_payments_terms_text
 				: tr::lng_payments_terms_text_once)(
 					lt_bot,
-					rpl::single(Ui::Text::Bold('@' + username)),
-					Ui::Text::WithEntities),
+					rpl::single(tr::bold('@' + username)),
+					tr::marked),
 			st::boxLabel));
 		const auto update = std::make_shared<Fn<void()>>();
 		auto checkView = std::make_unique<Ui::CheckView>(
@@ -756,10 +756,10 @@ void Panel::requestTermsAcceptance(
 				box.get(),
 				tr::lng_payments_terms_agree(
 					lt_link,
-					rpl::single(Ui::Text::Link(
+					rpl::single(tr::link(
 						tr::lng_payments_terms_link(tr::now),
 						url)),
-					Ui::Text::WithEntities),
+					tr::marked),
 				st::defaultBoxCheckbox,
 				std::move(checkView)),
 			{
@@ -852,7 +852,7 @@ void Panel::showBox(object_ptr<BoxContent> box) {
 		if (hideNow || _webview->lastHidingBox) {
 			const auto raw = _webview->lastHidingBox = box.data();
 			box->boxClosing(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				const auto widget = _webview
 					? _webview->window.widget()
 					: nullptr;
@@ -881,10 +881,13 @@ void Panel::showCriticalError(const TextWithEntities &text) {
 	_progress = nullptr;
 	_webviewProgress = false;
 	if (!_weakFormSummary || !_weakFormSummary->showCriticalError(text)) {
-		auto error = base::make_unique_q<PaddingWrap<FlatLabel>>(
-			_widget.get(),
+		auto wrap = base::make_unique_q<RpWidget>(_widget.get());
+		const auto raw = wrap.get();
+
+		const auto error = CreateChild<PaddingWrap<FlatLabel>>(
+			raw,
 			object_ptr<FlatLabel>(
-				_widget.get(),
+				raw,
 				rpl::single(text),
 				st::paymentsCriticalError),
 			st::paymentsCriticalErrorPadding);
@@ -898,7 +901,13 @@ void Panel::showCriticalError(const TextWithEntities &text) {
 			_delegate->panelOpenUrl(entity.data);
 			return false;
 		});
-		_widget->showInner(std::move(error));
+
+		raw->widthValue() | rpl::on_next([=](int width) {
+			error->resizeToWidth(width);
+			raw->resize(width, error->height());
+		}, raw->lifetime());
+
+		_widget->showInner(std::move(wrap));
 	}
 }
 
@@ -919,7 +928,7 @@ void Panel::updateThemeParams(const Webview::ThemeParams &params) {
 		return;
 	}
 	_webview->window.updateTheme(
-		params.opaqueBg,
+		params.bodyBg,
 		params.scrollBg,
 		params.scrollBgOver,
 		params.scrollBarBg,
diff --git a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
index c874eb3a9d285c..4288e55e3e36aa 100644
--- a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
@@ -8,29 +8,43 @@ For license and copyright information please follow this link:
 #include "payments/ui/payments_reaction_box.h"
 
 #include "base/qt/qt_compare.h"
+#include "calls/group/ui/calls_group_stars_coloring.h"
 #include "lang/lang_keys.h"
 #include "ui/boxes/boost_box.h" // MakeBoostFeaturesBadge.
+#include "ui/controls/who_reacted_context_action.h"
 #include "ui/effects/premium_bubble.h"
+#include "ui/effects/ministar_particles.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
+#include "ui/widgets/labels.h"
 #include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/wrap/slide_wrap.h"
+#include "ui/color_int_conversion.h"
 #include "ui/dynamic_image.h"
 #include "ui/painter.h"
 #include "ui/vertical_list.h"
+#include "styles/style_calls.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_credits.h"
+#include "styles/style_info.h"
+#include "styles/style_info_levels.h"
 #include "styles/style_layers.h"
+#include "styles/style_media_player.h"
 #include "styles/style_premium.h"
 #include "styles/style_settings.h"
 
 namespace Settings {
 [[nodiscard]] not_null<Ui::RpWidget*> AddBalanceWidget(
 	not_null<Ui::RpWidget*> parent,
-	rpl::producer<uint64> balanceValue,
-	bool rightAlign);
+	not_null<Main::Session*> session,
+	rpl::producer<CreditsAmount> balanceValue,
+	bool rightAlign,
+	rpl::producer<float64> opacityValue = nullptr,
+	bool dark = false);
 } // namespace Settings
 
 namespace Ui {
@@ -46,158 +60,72 @@ struct TopReactorKey {
 	friend inline auto operator<=>(
 		const TopReactorKey &,
 		const TopReactorKey &) = default;
-	friend inline bool operator==(
-		const TopReactorKey &,
-		const TopReactorKey &) = default;
-};
-
-struct Discreter {
-	Fn<int(float64)> ratioToValue;
-	Fn<float64(int)> valueToRatio;
 };
 
-[[nodiscard]] Discreter DiscreterForMax(int max) {
-	Expects(max >= 2);
-
-	// 1/8 of width is 1..10
-	// 1/3 of width is 1..100
-	// 2/3 of width is 1..1000
-
-	auto thresholds = base::flat_map<float64, int>();
-	thresholds.emplace(0., 1);
-	if (max <= 40) {
-		thresholds.emplace(1., max);
-	} else if (max <= 300) {
-		thresholds.emplace(1. / 4, 10);
-		thresholds.emplace(1., max);
-	} else if (max <= 600) {
-		thresholds.emplace(1. / 8, 10);
-		thresholds.emplace(1. / 2, 100);
-		thresholds.emplace(1., max);
-	} else if (max <= 1900) {
-		thresholds.emplace(1. / 8, 10);
-		thresholds.emplace(1. / 3, 100);
-		thresholds.emplace(1., max);
-	} else {
-		thresholds.emplace(1. / 8, 10);
-		thresholds.emplace(1. / 3, 100);
-		thresholds.emplace(2. / 3, 1000);
-		thresholds.emplace(1., max);
-	}
-
-	const auto ratioToValue = [=](float64 ratio) {
-		ratio = std::clamp(ratio, 0., 1.);
-		const auto j = thresholds.lower_bound(ratio);
-		if (j == begin(thresholds)) {
-			return 1;
-		}
-		const auto i = j - 1;
-		const auto progress = (ratio - i->first) / (j->first - i->first);
-		const auto value = i->second + (j->second - i->second) * progress;
-		return int(base::SafeRound(value));
-	};
-	const auto valueToRatio = [=](int value) {
-		value = std::clamp(value, 1, max);
-		auto i = begin(thresholds);
-		auto j = i + 1;
-		while (j->second < value) {
-			i = j++;
-		}
-		const auto progress = (value - i->second)
-			/ float64(j->second - i->second);
-		return i->first + (j->first - i->first) * progress;
-	};
-	return {
-		.ratioToValue = ratioToValue,
-		.valueToRatio = valueToRatio,
-	};
+[[nodiscard]] QImage GenerateBadgeImage(
+		const std::vector<Calls::Group::Ui::StarsColoring> &colorings,
+		int count,
+		bool videoStream) {
+	return GenerateSmallBadgeImage(
+		Lang::FormatCountDecimal(count),
+		st::paidReactTopStarIcon,
+		(videoStream
+			? Ui::ColorFromSerialized(
+				Calls::Group::Ui::StarsColoringForCount(
+					colorings,
+					count
+				).bgLight)
+			: st::creditsBg3->c),
+		videoStream ? st::white->c : st::premiumButtonFg->c,
+		videoStream ? &st::groupCallTopReactorBadge : nullptr);
 }
 
-void PaidReactionSlider(
-		not_null<VerticalLayout*> container,
-		int current,
-		int max,
-		Fn<void(int)> changed) {
-	Expects(current >= 1 && current <= max);
-
-	const auto slider = container->add(
-		object_ptr<MediaSlider>(container, st::paidReactSlider),
-		st::boxRowPadding + QMargins(0, st::paidReactSliderTop, 0, 0));
-	slider->resize(slider->width(), st::paidReactSlider.seekSize.height());
-
-	const auto discreter = DiscreterForMax(max);
-	slider->setAlwaysDisplayMarker(true);
-	slider->setDirection(ContinuousSlider::Direction::Horizontal);
-	slider->setValue(discreter.valueToRatio(current));
-	slider->setAdjustCallback([=](float64 ratio) {
-		return discreter.valueToRatio(discreter.ratioToValue(ratio));
-	});
-	const auto ratioToValue = discreter.ratioToValue;
-	slider->setChangeProgressCallback([=](float64 value) {
-		changed(ratioToValue(value));
-	});
-	slider->setChangeFinishedCallback([=](float64 value) {
-		changed(ratioToValue(value));
-	});
-}
-
-[[nodiscard]] QImage GenerateBadgeImage(int count) {
-	const auto text = Lang::FormatCountDecimal(count);
-	const auto length = st::chatSimilarBadgeFont->width(text);
-	const auto contents = st::chatSimilarLockedIconPosition.x()
-		+ st::paidReactTopStarIcon.width()
-		+ st::paidReactTopStarSkip
-		+ length;
-	const auto badge = QRect(
-		st::chatSimilarBadgePadding.left(),
-		st::chatSimilarBadgePadding.top(),
-		contents,
-		st::chatSimilarBadgeFont->height);
-	const auto rect = badge.marginsAdded(st::chatSimilarBadgePadding);
-
-	auto result = QImage(
-		rect.size() * style::DevicePixelRatio(),
-		QImage::Format_ARGB32_Premultiplied);
-	result.setDevicePixelRatio(style::DevicePixelRatio());
-	result.fill(Qt::transparent);
-	auto q = QPainter(&result);
-
-	const auto &font = st::chatSimilarBadgeFont;
-	const auto textTop = badge.y() + font->ascent;
-	const auto icon = &st::paidReactTopStarIcon;
-	const auto position = st::chatSimilarLockedIconPosition;
-
-	auto hq = PainterHighQualityEnabler(q);
-	q.setBrush(st::creditsBg3);
-	q.setPen(Qt::NoPen);
-	const auto radius = rect.height() / 2.;
-	q.drawRoundedRect(rect, radius, radius);
-
-	auto textLeft = 0;
-	if (icon) {
-		icon->paint(
-			q,
-			badge.x() + position.x(),
-			badge.y() + position.y(),
-			rect.width());
-		textLeft += position.x() + icon->width() + st::paidReactTopStarSkip;
-	}
-
-	q.setFont(font);
-	q.setPen(st::premiumButtonFg);
-	q.drawText(textLeft, textTop, text);
-	q.end();
-
-	return result;
+void AddArrowDown(not_null<RpWidget*> widget) {
+	const auto arrow = CreateChild<RpWidget>(widget);
+	const auto icon = &st::paidReactChannelArrow;
+	const auto skip = st::lineWidth * 4;
+	const auto size = icon->width() + skip * 2;
+	arrow->resize(size, size);
+	widget->widthValue() | rpl::on_next([=](int width) {
+		const auto left = (width - st::paidReactTopUserpic) / 2;
+		arrow->moveToRight(left - skip, -st::lineWidth, width);
+	}, widget->lifetime());
+	arrow->paintRequest() | rpl::on_next([=] {
+		Painter p(arrow);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(st::activeButtonBg);
+		p.setPen(st::activeButtonFg);
+		const auto rect = arrow->rect();
+		const auto line = st::lineWidth;
+		p.drawEllipse(rect.marginsRemoved({ line, line, line, line }));
+		icon->paint(p, skip, (size - icon->height()) / 2 + line, size);
+	}, widget->lifetime());
+	arrow->setAttribute(Qt::WA_TransparentForMouseEvents);
+	arrow->show();
 }
 
 [[nodiscard]] not_null<RpWidget*> MakeTopReactor(
 		not_null<QWidget*> parent,
-		const PaidReactionTop &data) {
+		const PaidReactionTop &data,
+		int place,
+		const std::vector<Calls::Group::Ui::StarsColoring> &colorings,
+		Fn<void()> selectShownPeer,
+		bool videoStream) {
+	auto top = 0;
+	auto height = st::paidReactTopNameSkip + st::normalFont->height;
+	if (videoStream) {
+		top += st::paidReactCrownSkip;
+		height += top;
+	}
+
 	const auto result = CreateChild<AbstractButton>(parent);
+	result->resize(0, height);
 	result->show();
 	if (data.click && !data.my) {
 		result->setClickedCallback(data.click);
+	} else if (data.click && selectShownPeer) {
+		result->setClickedCallback(selectShownPeer);
+		AddArrowDown(result);
 	} else {
 		result->setAttribute(Qt::WA_TransparentForMouseEvents);
 	}
@@ -215,27 +143,51 @@ void PaidReactionSlider(
 		result->update();
 	});
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->badge = QImage();
 	}, result->lifetime());
-	result->paintRequest() | rpl::start_with_next([=] {
+	result->paintRequest() | rpl::on_next([=] {
 		auto p = Painter(result);
 		const auto left = (result->width() - st::paidReactTopUserpic) / 2;
-		p.drawImage(left, 0, photo->image(st::paidReactTopUserpic));
+		p.drawImage(left, top, photo->image(st::paidReactTopUserpic));
 
 		if (state->badge.isNull()) {
-			state->badge = GenerateBadgeImage(count);
+			state->badge = GenerateBadgeImage(colorings, count, videoStream);
 		}
 		const auto bwidth = state->badge.width()
 			/ state->badge.devicePixelRatio();
 		p.drawImage(
 			(result->width() - bwidth) / 2,
-			st::paidReactTopBadgeSkip,
+			top + st::paidReactTopBadgeSkip,
 			state->badge);
 
-		p.setPen(st::windowFg);
+		if (videoStream) {
+			const auto bg = Calls::Group::Ui::StarsColoringForCount(
+				colorings,
+				count
+			).bgLight;
+			const auto &icon = st::paidReactCrown;
+			const auto left = (result->width() - icon.width()) / 2;
+			const auto shift = st::paidReactCrownOutline;
+			const auto outline = st::groupCallMembersBg->c;
+			icon.paint(p, left - shift, shift, result->width(), outline);
+			icon.paint(p, left + shift, shift, result->width(), outline);
+			icon.paint(p, left, 0, result->width(), bg);
+
+			const auto top = st::paidReactCrownTop;
+			p.setPen(st::white);
+			p.setFont(st::levelStyle.font);
+			p.drawText(
+				QRect(left, top, icon.width(), icon.height()),
+				QString::number(place),
+				style::al_top);
+
+			p.setPen(st::groupCallMembersFg);
+		} else {
+			p.setPen(st::windowFg);
+		}
 		const auto skip = st::normalFont->spacew;
-		const auto nameTop = st::paidReactTopNameSkip;
+		const auto nameTop = top + st::paidReactTopNameSkip;
 		const auto available = result->width() - skip * 2;
 		state->name.draw(p, skip, nameTop, available, style::al_top);
 	}, result->lifetime());
@@ -243,23 +195,77 @@ void PaidReactionSlider(
 	return result;
 }
 
+void SelectShownPeer(
+		std::shared_ptr<base::weak_qptr<PopupMenu>> menu,
+		not_null<QWidget*> parent,
+		const std::vector<PaidReactionTop> &mine,
+		uint64 selected,
+		Fn<void(uint64)> callback) {
+	if (*menu) {
+		(*menu)->hideMenu();
+	}
+	(*menu) = CreateChild<PopupMenu>(
+		parent,
+		st::paidReactChannelMenu);
+
+	struct Entry {
+		not_null<Ui::WhoReactedEntryAction*> action;
+		std::shared_ptr<Ui::DynamicImage> userpic;
+	};
+	auto actions = std::make_shared<std::vector<Entry>>();
+	actions->reserve(mine.size());
+	for (const auto &entry : mine) {
+		auto action = base::make_unique_q<WhoReactedEntryAction>(
+			(*menu)->menu(),
+			nullptr,
+			(*menu)->menu()->st(),
+			Ui::WhoReactedEntryData());
+		const auto index = int(actions->size());
+		actions->push_back({ action.get(), entry.photo->clone() });
+		const auto id = entry.barePeerId;
+		const auto updateUserpic = [=] {
+			const auto size = st::defaultWhoRead.photoSize;
+			actions->at(index).action->setData({
+				.text = entry.name,
+				.type = ((id == selected)
+					? Ui::WhoReactedType::RefRecipientNow
+					: Ui::WhoReactedType::RefRecipient),
+				.userpic = actions->at(index).userpic->image(size),
+				.callback = [=] { callback(id); },
+			});
+		};
+		actions->back().userpic->subscribeToUpdates(updateUserpic);
+
+		(*menu)->addAction(std::move(action));
+		updateUserpic();
+	}
+	(*menu)->popup(QCursor::pos());
+}
+
 void FillTopReactors(
 		not_null<VerticalLayout*> container,
 		std::vector<PaidReactionTop> top,
+		const std::vector<Calls::Group::Ui::StarsColoring> &colorings,
 		rpl::producer<int> chosen,
-		rpl::producer<bool> anonymous) {
-	container->add(
-		MakeBoostFeaturesBadge(
-			container,
-			tr::lng_paid_react_top_title(),
-			[](QRect) { return st::creditsBg3->b; }),
-		st::boxRowPadding + st::paidReactTopTitleMargin);
-
-	const auto height = st::paidReactTopNameSkip + st::normalFont->height;
+		rpl::producer<uint64> shownPeer,
+		Fn<void(uint64)> changeShownPeer,
+		bool videoStream) {
+	const auto badge = videoStream
+		? nullptr
+		: container->add(
+			object_ptr<SlideWrap<RpWidget>>(
+				container,
+				MakeBoostFeaturesBadge(
+					container,
+					tr::lng_paid_react_top_title(),
+					[](QRect) { return st::creditsBg3->b; }),
+				st::paidReactTopTitleMargin),
+			st::boxRowPadding,
+			style::al_top);
 	const auto wrap = container->add(
 		object_ptr<SlideWrap<FixedHeightWidget>>(
 			container,
-			object_ptr<FixedHeightWidget>(container, height),
+			object_ptr<FixedHeightWidget>(container, 0),
 			st::paidReactTopMargin));
 	const auto parent = wrap->entity();
 	using Key = TopReactorKey;
@@ -271,28 +277,33 @@ void FillTopReactors(
 		bool chosenChanged = false;
 	};
 	const auto state = wrap->lifetime().make_state<State>();
+	const auto menu = std::make_shared<base::weak_qptr<Ui::PopupMenu>>();
 
 	rpl::combine(
 		std::move(chosen),
-		std::move(anonymous)
-	) | rpl::start_with_next([=](int chosen, bool anonymous) {
+		std::move(shownPeer)
+	) | rpl::on_next([=](int chosen, uint64 barePeerId) {
 		if (!state->initialChosen) {
 			state->initialChosen = chosen;
 		} else if (*state->initialChosen != chosen) {
 			state->chosenChanged = true;
 		}
+		auto mine = std::vector<PaidReactionTop>();
 		auto list = std::vector<PaidReactionTop>();
 		list.reserve(kMaxTopPaidShown + 1);
 		for (const auto &entry : top) {
 			if (!entry.my) {
 				list.push_back(entry);
-			} else if (!entry.click == anonymous) {
+			} else if (entry.barePeerId == barePeerId) {
 				auto copy = entry;
 				if (state->chosenChanged) {
 					copy.count += chosen;
 				}
 				list.push_back(copy);
 			}
+			if (entry.my && entry.barePeerId) {
+				mine.push_back(entry);
+			}
 		}
 		ranges::stable_sort(
 			list,
@@ -302,13 +313,28 @@ void FillTopReactors(
 			|| (!list.empty() && !list.back().count)) {
 			list.pop_back();
 		}
+		auto selectShownPeer = (mine.size() < 2)
+			? Fn<void()>()
+			: [=] { SelectShownPeer(
+				menu,
+				parent,
+				mine,
+				barePeerId,
+				changeShownPeer); };
 		if (list.empty()) {
+			if (badge) {
+				badge->hide(anim::type::normal);
+			}
 			wrap->hide(anim::type::normal);
 		} else {
+			if (badge) {
+				badge->show(anim::type::normal);
+			}
 			for (const auto &widget : state->widgets) {
 				widget->hide();
 			}
 			state->widgets.clear();
+			auto index = 0;
 			for (const auto &entry : list) {
 				const auto key = Key{
 					.photo = entry.photo,
@@ -318,7 +344,13 @@ void FillTopReactors(
 				const auto i = state->cache.find(key);
 				const auto widget = (i != end(state->cache))
 					? i->second
-					: MakeTopReactor(parent, entry);
+					: MakeTopReactor(
+						parent,
+						entry,
+						++index,
+						colorings,
+						selectShownPeer,
+						videoStream);
 				state->widgets.push_back(widget);
 				widget->show();
 			}
@@ -332,12 +364,18 @@ void FillTopReactors(
 
 		state->updated.fire({});
 	}, wrap->lifetime());
+	if (badge) {
+		badge->finishAnimating();
+	}
 	wrap->finishAnimating();
 
 	rpl::combine(
 		state->updated.events_starting_with({}),
 		wrap->widthValue()
-	) | rpl::start_with_next([=](auto, int width) {
+	) | rpl::on_next([=](auto, int width) {
+		if (!state->widgets.empty()) {
+			parent->resize(parent->width(), state->widgets.back()->height());
+		}
 		const auto single = width / 4;
 		if (single <= st::paidReactTopUserpic) {
 			return;
@@ -345,12 +383,73 @@ void FillTopReactors(
 		const auto count = int(state->widgets.size());
 		auto left = (width - single * count) / 2;
 		for (const auto &widget : state->widgets) {
-			widget->setGeometry(left, 0, single, height);
+			widget->setGeometry(left, 0, single, widget->height());
 			left += single;
 		}
 	}, wrap->lifetime());
 }
 
+[[nodiscard]] not_null<RpWidget*> MakeStarSelectInfoBlock(
+		not_null<RpWidget*> parent,
+		rpl::producer<TextWithEntities> title,
+		rpl::producer<QString> subtext,
+		Fn<void()> click,
+		Text::MarkedContext context,
+		bool dark) {
+	const auto result = CreateChild<AbstractButton>(parent);
+
+	const auto titleHeight = st::starSelectInfoTitle.style.font->height;
+	const auto subtextHeight = st::starSelectInfoSubtext.style.font->height;
+	const auto height = titleHeight + subtextHeight;
+
+	result->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(result);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(dark ? st::groupCallMembersBgOver : st::windowBgOver);
+		const auto radius = st::boxRadius;
+		p.drawRoundedRect(result->rect(), radius, radius);
+	}, result->lifetime());
+
+	result->resize(
+		result->width(),
+		QSize(height, height).grownBy(st::starSelectInfoPadding).height());
+
+	const auto titleLabel = CreateChild<FlatLabel>(
+		result,
+		std::move(title),
+		dark ? st::videoStreamInfoTitle : st::starSelectInfoTitle,
+		st::defaultPopupMenu,
+		context);
+	const auto subtextLabel = CreateChild<FlatLabel>(
+		result,
+		std::move(subtext),
+		dark ? st::videoStreamInfoSubtext : st::starSelectInfoSubtext);
+
+	if (click) {
+		result->setClickedCallback(std::move(click));
+		titleLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+		subtextLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+	} else {
+		result->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
+
+	rpl::combine(
+		result->widthValue(),
+		titleLabel->widthValue(),
+		subtextLabel->widthValue()
+	) | rpl::on_next([=](int width, int titlew, int subtextw) {
+		const auto padding = st::starSelectInfoPadding;
+		titleLabel->moveToLeft((width - titlew) / 2, padding.top(), width);
+		subtextLabel->moveToLeft(
+			(width - subtextw) / 2,
+			padding.top() + titleHeight,
+			width);
+	}, result->lifetime());
+
+	return result;
+}
+
 } // namespace
 
 void PaidReactionsBox(
@@ -358,16 +457,28 @@ void PaidReactionsBox(
 		PaidReactionBoxArgs &&args) {
 	Expects(!args.top.empty());
 
-	args.max = std::max(args.max, 2);
-	args.chosen = std::clamp(args.chosen, 1, args.max);
+	const auto dark = args.dark;
+	args.min = std::max(args.min, 1);
+	args.max = std::max({
+		args.min + 1,
+		args.max,
+		args.explicitlyAllowed,
+		args.chosen,
+	});
+
+	const auto allowed = args.explicitlyAllowed;
+	args.chosen = (allowed && args.chosen == allowed)
+		? allowed
+		: std::clamp(args.chosen, args.min, args.max);
 
 	box->setWidth(st::boxWideWidth);
-	box->setStyle(st::paidReactBox);
+	box->setStyle(dark ? st::darkEditStarsBox : st::paidReactBox);
 	box->setNoContentMargin(true);
 
 	struct State {
 		rpl::variable<int> chosen;
-		rpl::variable<bool> anonymous;
+		rpl::variable<uint64> shownPeer;
+		uint64 savedShownPeer = 0;
 	};
 	const auto state = box->lifetime().make_state<State>();
 
@@ -376,156 +487,546 @@ void PaidReactionsBox(
 		state->chosen = count;
 	};
 
-	const auto initialAnonymous = ranges::find(
+	const auto colorings = args.colorings;
+	const auto videoStreamChoosing = args.videoStreamChoosing;
+	const auto videoStreamSending = args.videoStreamSending;
+	const auto videoStreamAdmin = args.videoStreamAdmin;
+	const auto videoStream = videoStreamChoosing || videoStreamSending;
+	const auto initialShownPeer = ranges::find(
 		args.top,
 		true,
 		&PaidReactionTop::my
-	)->click == nullptr;
-	state->anonymous = initialAnonymous;
+	)->barePeerId;
+	state->shownPeer = initialShownPeer;
+	state->savedShownPeer = ranges::find_if(args.top, [](
+			const PaidReactionTop &entry) {
+		return entry.my && entry.barePeerId != 0;
+	})->barePeerId;
 
 	const auto content = box->verticalLayout();
 	AddSkip(content, st::boxTitleClose.height + st::paidReactBubbleTop);
 
-	const auto valueToRatio = DiscreterForMax(args.max).valueToRatio;
-	auto bubbleRowState = state->chosen.value() | rpl::map([=](int value) {
-		const auto full = st::boxWideWidth
-			- st::boxRowPadding.left()
-			- st::boxRowPadding.right();
-		const auto marker = st::paidReactSlider.seekSize.width();
-		const auto start = marker / 2;
-		const auto inner = full - marker;
-		const auto correct = start + inner * valueToRatio(value);
-		return Premium::BubbleRowState{
-			.counter = value,
-			.ratio = correct / full,
-		};
-	});
-	Premium::AddBubbleRow(
+	const auto activeFgOverride = [=](int count) {
+		const auto coloring = Calls::Group::Ui::StarsColoringForCount(
+			colorings,
+			count);
+		return Ui::ColorFromSerialized(coloring.bgLight);
+	};
+	AddStarSelectBubble(
 		content,
-		st::boostBubble,
 		BoxShowFinishes(box),
-		std::move(bubbleRowState),
-		Premium::BubbleType::Credits,
-		nullptr,
-		&st::paidReactBubbleIcon,
-		st::boxRowPadding);
+		state->chosen.value(),
+		args.max,
+		videoStream ? activeFgOverride : Fn<QColor(int)>());
 
 	const auto already = ranges::find(
 		args.top,
 		true,
 		&PaidReactionTop::my)->count;
-	PaidReactionSlider(content, args.chosen, args.max, changed);
+	PaidReactionSlider(
+		content,
+		(dark ? st::darkEditStarsSlider : st::paidReactSlider),
+		args.min,
+		args.explicitlyAllowed,
+		rpl::single(args.chosen),
+		args.max,
+		changed,
+		videoStream ? activeFgOverride : Fn<QColor(int)>());
+
+	box->addTopButton(
+		dark ? st::darkEditStarsClose : st::boxTitleClose,
+		[=] { box->closeBox(); });
 
-	box->addTopButton(st::boxTitleClose, [=] { box->closeBox(); });
+	const auto addTopReactors = [&] {
+		FillTopReactors(
+			content,
+			std::move(args.top),
+			colorings,
+			(videoStreamAdmin
+				? rpl::single(state->chosen.current())
+				: state->chosen.value() | rpl::type_erased),
+			(videoStreamAdmin
+				? rpl::single(state->shownPeer.current())
+				: state->shownPeer.value() | rpl::type_erased),
+			[=](uint64 barePeerId) {
+				state->shownPeer = state->savedShownPeer = barePeerId;
+			},
+			videoStream);
+	};
+
+	if (videoStreamChoosing) {
+		using namespace Calls::Group::Ui;
+		box->addRow(
+			VideoStreamStarsLevel(box, colorings, state->chosen.value()),
+			st::boxRowPadding + QMargins(0, st::paidReactTitleSkip, 0, 0));
+	} else if (videoStreamSending) {
+		addTopReactors();
+	}
 
 	box->addRow(
 		object_ptr<FlatLabel>(
 			box,
-			tr::lng_paid_react_title(),
-			st::boostCenteredTitle),
-		st::boxRowPadding + QMargins(0, st::paidReactTitleSkip, 0, 0));
+			(videoStreamAdmin
+				? tr::lng_paid_admin_title()
+				: videoStreamChoosing
+				? tr::lng_paid_comment_title()
+				: videoStreamSending
+				? tr::lng_paid_reaction_title()
+				: tr::lng_paid_react_title()),
+			dark ? st::darkEditStarsCenteredTitle : st::boostCenteredTitle),
+		st::boxRowPadding + QMargins(0, st::paidReactTitleSkip, 0, 0),
+		style::al_top);
+
 	const auto labelWrap = box->addRow(
 		object_ptr<RpWidget>(box),
 		(st::boxRowPadding
 			+ QMargins(0, st::lineWidth, 0, st::boostBottomSkip)));
 	const auto label = CreateChild<FlatLabel>(
 		labelWrap,
-		(already
+		(videoStreamAdmin
+			? tr::lng_paid_admin_about(tr::marked)
+			: videoStream
+			? (videoStreamChoosing
+				? tr::lng_paid_comment_about
+				: tr::lng_paid_reaction_about)(
+					lt_name,
+					rpl::single(tr::bold(args.name)),
+					tr::rich)
+			: already
 			? tr::lng_paid_react_already(
 				lt_count,
 				rpl::single(already) | tr::to_count(),
-				Text::RichLangValue)
+				tr::rich)
 			: tr::lng_paid_react_about(
 				lt_channel,
-				rpl::single(Text::Bold(args.channel)),
-				Text::RichLangValue)),
-		st::boostText);
-	labelWrap->widthValue() | rpl::start_with_next([=](int width) {
+				rpl::single(tr::bold(args.name)),
+				tr::rich)),
+		dark ? st::darkEditStarsText : st::boostText);
+	label->setTryMakeSimilarLines(true);
+	labelWrap->widthValue() | rpl::on_next([=](int width) {
 		label->resizeToWidth(width);
 	}, label->lifetime());
-	label->heightValue() | rpl::start_with_next([=](int height) {
+	label->heightValue() | rpl::on_next([=](int height) {
 		const auto min = 2 * st::normalFont->height;
 		const auto skip = std::max((min - height) / 2, 0);
 		labelWrap->resize(labelWrap->width(), 2 * skip + height);
 		label->moveToLeft(0, skip);
 	}, label->lifetime());
 
-	FillTopReactors(
-		content,
-		std::move(args.top),
-		state->chosen.value(),
-		state->anonymous.value());
+	if (!videoStream) {
+		addTopReactors();
 
-	const auto named = box->addRow(object_ptr<CenterWrap<Checkbox>>(
-		box,
-		object_ptr<Checkbox>(
-			box,
-			tr::lng_paid_react_show_in_top(tr::now),
-			!state->anonymous.current())));
-	state->anonymous = named->entity()->checkedValue(
-	) | rpl::map(!rpl::mappers::_1);
+		const auto skip = st::defaultCheckbox.margin.bottom();
+		const auto named = box->addRow(
+			object_ptr<Checkbox>(
+				box,
+				tr::lng_paid_react_show_in_top(tr::now),
+				state->shownPeer.current() != 0,
+				st::paidReactBoxCheckbox),
+			st::boxRowPadding + QMargins(0, 0, 0, skip),
+			style::al_top);
+		named->checkedValue(
+		) | rpl::on_next([=](bool show) {
+			state->shownPeer = show ? state->savedShownPeer : 0;
+		}, named->lifetime());
+	}
+
+	AddSkip(content);
+	AddSkip(content);
+
+	AddDividerText(
+		content,
+		(videoStreamAdmin
+			? tr::lng_paid_react_admin_cant(tr::marked)
+			: tr::lng_paid_react_agree(
+				lt_link,
+				rpl::combine(
+					tr::lng_paid_react_agree_link(),
+					tr::lng_group_invite_subscription_about_url()
+				) | rpl::map([](const QString &text, const QString &url) {
+					return tr::link(text, url);
+				}),
+				tr::rich)),
+		st::defaultBoxDividerLabelPadding,
+		dark ? st::groupCallDividerLabel : st::defaultDividerLabel);
 
 	const auto button = box->addButton(rpl::single(QString()), [=] {
-		args.send(state->chosen.current(), !named->entity()->checked());
+		args.send(state->chosen.current(), state->shownPeer.current());
 	});
 
 	box->boxClosing() | rpl::filter([=] {
-		return state->anonymous.current() != initialAnonymous;
-	}) | rpl::start_with_next([=] {
-		args.send(0, state->anonymous.current());
+		return state->shownPeer.current() != initialShownPeer;
+	}) | rpl::on_next([=] {
+		args.send(0, state->shownPeer.current());
 	}, box->lifetime());
 
-	{
-		const auto buttonLabel = CreateChild<FlatLabel>(
-			button,
-			rpl::single(QString()),
-			st::creditsBoxButtonLabel);
-		args.submit(
-			state->chosen.value()
-		) | rpl::start_with_next([=](const TextWithContext &text) {
-			buttonLabel->setMarkedText(
-				text.text,
-				text.context);
-		}, buttonLabel->lifetime());
-		buttonLabel->setTextColorOverride(
-			box->getDelegate()->style().button.textFg->c);
-		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
-			buttonLabel->moveToLeft(
-				(size.width() - buttonLabel->width()) / 2,
-				(size.height() - buttonLabel->height()) / 2);
-		}, buttonLabel->lifetime());
-		buttonLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
-	}
+	button->setText(args.submit(state->chosen.value()));
 
-	box->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		const auto &padding = st::paidReactBox.buttonPadding;
-		button->resizeToWidth(width
-			- padding.left()
-			- padding.right());
-		button->moveToLeft(padding.left(), button->y());
-	}, button->lifetime());
-
-	{
-		const auto balance = Settings::AddBalanceWidget(
-			content,
-			std::move(args.balanceValue),
-			false);
-		rpl::combine(
-			balance->sizeValue(),
-			box->widthValue()
-		) | rpl::start_with_next([=] {
-			balance->moveToLeft(
-				st::creditsHistoryRightSkip * 2,
-				st::creditsHistoryRightSkip);
-			balance->update();
-		}, balance->lifetime());
-	}
+	AddStarSelectBalance(
+		box,
+		args.session,
+		std::move(args.balanceValue),
+		dark);
 }
 
 object_ptr<BoxContent> MakePaidReactionBox(PaidReactionBoxArgs &&args) {
 	return Box(PaidReactionsBox, std::move(args));
 }
 
+int MaxTopPaidDonorsShown() {
+	return kMaxTopPaidShown;
+}
+
+QImage GenerateSmallBadgeImage(
+		QString text,
+		const style::icon &icon,
+		QColor bg,
+		QColor fg,
+		const style::RoundCheckbox *borderSt) {
+	const auto length = st::chatSimilarBadgeFont->width(text);
+	const auto contents = st::chatSimilarLockedIconPosition.x()
+		+ icon.width()
+		+ st::paidReactTopStarSkip
+		+ length;
+	const auto badge = QRect(
+		st::chatSimilarBadgePadding.left(),
+		st::chatSimilarBadgePadding.top(),
+		contents,
+		st::chatSimilarBadgeFont->height);
+	const auto rect = badge.marginsAdded(st::chatSimilarBadgePadding);
+	const auto add = borderSt ? borderSt->width : 0;
+	const auto ratio = style::DevicePixelRatio();
+	auto result = QImage(
+		(rect + QMargins(add, add, add, add)).size() * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(ratio);
+	result.fill(Qt::transparent);
+	auto q = QPainter(&result);
+
+	const auto &font = st::chatSimilarBadgeFont;
+	const auto textTop = badge.y() + font->ascent;
+	const auto position = st::chatSimilarLockedIconPosition;
+
+	auto hq = PainterHighQualityEnabler(q);
+	q.translate(add, add);
+	q.setBrush(bg);
+	if (borderSt) {
+		q.setPen(QPen(borderSt->border->c, borderSt->width));
+	} else {
+		q.setPen(Qt::NoPen);
+	}
+	const auto radius = rect.height() / 2.;
+	const auto shift = add / 2.;
+	q.drawRoundedRect(
+		QRectF(rect) + QMarginsF(shift, shift, shift, shift),
+		radius,
+		radius);
+
+	auto textLeft = 0;
+	icon.paint(
+		q,
+		badge.x() + position.x(),
+		badge.y() + position.y(),
+		rect.width());
+	textLeft += position.x() + icon.width() + st::paidReactTopStarSkip;
+
+	q.setFont(font);
+	q.setPen(fg);
+	q.drawText(textLeft, textTop, text);
+	q.end();
+
+	return result;
+}
+
+StarSelectDiscreter StarSelectDiscreterForMax(int max) {
+	Expects(max >= 2);
+
+	// 1/8 of width is 1..10
+	// 1/3 of width is 1..100
+	// 2/3 of width is 1..1000
+
+	auto thresholds = base::flat_map<float64, int>();
+	thresholds.emplace(0., 1);
+	if (max <= 40) {
+		thresholds.emplace(1., max);
+	} else if (max <= 300) {
+		thresholds.emplace(1. / 4, 10);
+		thresholds.emplace(1., max);
+	} else if (max <= 600) {
+		thresholds.emplace(1. / 8, 10);
+		thresholds.emplace(1. / 2, 100);
+		thresholds.emplace(1., max);
+	} else if (max <= 1900) {
+		thresholds.emplace(1. / 8, 10);
+		thresholds.emplace(1. / 3, 100);
+		thresholds.emplace(1., max);
+	} else if (max <= 10000) {
+		thresholds.emplace(1. / 8, 10);
+		thresholds.emplace(1. / 3, 100);
+		thresholds.emplace(2. / 3, 1000);
+		thresholds.emplace(1., max);
+	} else {
+		thresholds.emplace(1. / 10, 10);
+		thresholds.emplace(1. / 6, 100);
+		thresholds.emplace(1. / 3, 1000);
+		thresholds.emplace(1., max);
+	}
+
+	const auto ratioToValue = [=](float64 ratio) {
+		ratio = std::clamp(ratio, 0., 1.);
+		const auto j = thresholds.lower_bound(ratio);
+		if (j == begin(thresholds)) {
+			return 1;
+		}
+		const auto i = j - 1;
+		const auto progress = (ratio - i->first) / (j->first - i->first);
+		const auto value = i->second + (j->second - i->second) * progress;
+		return int(base::SafeRound(value));
+	};
+	const auto valueToRatio = [=](int value) {
+		value = std::clamp(value, 1, max);
+		auto i = begin(thresholds);
+		auto j = i + 1;
+		while (j->second < value) {
+			i = j++;
+		}
+		const auto progress = (value - i->second)
+			/ float64(j->second - i->second);
+		return i->first + (j->first - i->first) * progress;
+	};
+	return {
+		.ratioToValue = ratioToValue,
+		.valueToRatio = valueToRatio,
+	};
+}
+
+void PaidReactionSlider(
+		not_null<VerticalLayout*> container,
+		const style::MediaSlider &st,
+		int min,
+		int explicitlyAllowed,
+		rpl::producer<int> current,
+		int max,
+		Fn<void(int)> changed,
+		Fn<QColor(int)> activeFgOverride) {
+	Expects(explicitlyAllowed <= max);
+
+	if (!explicitlyAllowed) {
+		explicitlyAllowed = min;
+	}
+	const auto slider = container->add(
+		object_ptr<MediaSlider>(container, st),
+		st::boxRowPadding + QMargins(0, st::paidReactSliderTop, 0, 0));
+	slider->resize(slider->width(), st::paidReactSlider.seekSize.height());
+
+	const auto update = [=](int count) {
+		if (activeFgOverride) {
+			const auto color = activeFgOverride(count);
+			slider->setColorOverrides({
+				.activeBg = color,
+				.activeBorder = color,
+				.seekFg = st::groupCallMembersFg->c,
+				.seekBorder = color,
+				.inactiveBorder = Qt::transparent,
+			});
+		}
+	};
+
+	const auto discreter = StarSelectDiscreterForMax(max);
+	slider->setAlwaysDisplayMarker(true);
+	slider->setDirection(ContinuousSlider::Direction::Horizontal);
+
+	const auto ratioToValue = [=](float64 ratio) {
+		const auto value = discreter.ratioToValue(ratio);
+		return (value <= explicitlyAllowed && explicitlyAllowed < min)
+			? explicitlyAllowed
+			: std::max(value, min);
+	};
+
+	std::move(current) | rpl::on_next([=](int value) {
+		value = std::clamp(value, 1, max);
+		if (discreter.ratioToValue(slider->value()) != value) {
+			slider->setValue(discreter.valueToRatio(value));
+			update(value);
+		}
+	}, slider->lifetime());
+
+	slider->setAdjustCallback([=](float64 ratio) {
+		return discreter.valueToRatio(ratioToValue(ratio));
+	});
+	const auto callback = [=](float64 ratio) {
+		const auto value = ratioToValue(ratio);
+		update(value);
+		changed(value);
+	};
+	slider->setChangeProgressCallback(callback);
+	slider->setChangeFinishedCallback(callback);
+
+
+
+	struct State {
+		StarParticles particles = StarParticles(
+			StarParticles::Type::Right,
+			200,
+			st::lineWidth * 7);
+		Ui::Animations::Basic animation;
+	};
+	const auto state = slider->lifetime().make_state<State>();
+
+	const auto stars = Ui::CreateChild<Ui::RpWidget>(slider->parentWidget());
+	stars->show();
+	stars->raise();
+	slider->geometryValue() | rpl::on_next([=](QRect rect) {
+		stars->setGeometry(rect);
+	}, stars->lifetime());
+
+	state->animation.init([=] { stars->update(); });
+	stars->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	const auto seekSize = st::paidReactSlider.seekSize.width();
+	const auto seekRadius = seekSize / 2.;
+	stars->paintRequest() | rpl::on_next([=] {
+		if (!state->animation.animating()) {
+			state->animation.start();
+		}
+		auto p = QPainter(stars);
+		auto hq = PainterHighQualityEnabler(p);
+		const auto progress = slider->value();
+		const auto rect = stars->rect();
+		const auto availableWidth = rect.width() - seekSize;
+		const auto seekCenter = seekRadius + availableWidth * progress;
+
+		state->particles.setSpeed(.1 + progress * .3);
+		state->particles.setVisible(.25 + .65 * progress);
+
+		auto fullPath = QPainterPath();
+		fullPath.addRoundedRect(QRectF(rect), seekRadius, seekRadius);
+		auto circlePath = QPainterPath();
+		circlePath.addEllipse(
+			QPointF(seekCenter, rect.height() / 2.),
+			seekRadius,
+			seekRadius);
+		auto rightRect = QPainterPath();
+		rightRect.addRect(
+			QRectF(seekCenter, 0, rect.width() - seekCenter, rect.height()));
+
+		p.setClipPath(fullPath.subtracted(circlePath));
+		state->particles.setColor(Qt::white);
+		state->particles.paint(p, rect, crl::now(), false);
+		p.setClipping(false);
+
+		p.setClipPath(fullPath.intersected(circlePath.united(rightRect)));
+		state->particles.setColor(activeFgOverride
+			? st::groupCallMemberInactiveIcon->c
+			: st::creditsBg3->c);
+		state->particles.paint(p, rect, crl::now(), false);
+	}, stars->lifetime());
+}
+
+void AddStarSelectBalance(
+		not_null<GenericBox*> box,
+		not_null<Main::Session*> session,
+		rpl::producer<CreditsAmount> balanceValue,
+		bool dark) {
+	const auto balance = Settings::AddBalanceWidget(
+		box->verticalLayout(),
+		session,
+		std::move(balanceValue),
+		false,
+		nullptr,
+		dark);
+	rpl::combine(
+		balance->sizeValue(),
+		box->widthValue()
+	) | rpl::on_next([=] {
+		balance->moveToLeft(
+			st::creditsHistoryRightSkip * 2,
+			st::creditsHistoryRightSkip);
+		balance->update();
+	}, balance->lifetime());
+}
+
+not_null<Premium::BubbleWidget*> AddStarSelectBubble(
+		not_null<VerticalLayout*> container,
+		rpl::producer<> showFinishes,
+		rpl::producer<int> value,
+		int max,
+		Fn<QColor(int)> activeFgOverride) {
+	const auto valueToRatio = StarSelectDiscreterForMax(max).valueToRatio;
+	auto bubbleRowState = rpl::duplicate(value) | rpl::map([=](int value) {
+		const auto full = st::boxWideWidth
+			- st::boxRowPadding.left()
+			- st::boxRowPadding.right();
+		const auto marker = st::paidReactSlider.seekSize.width();
+		const auto start = marker / 2;
+		const auto inner = full - marker;
+		const auto correct = start + inner * valueToRatio(value);
+		return Premium::BubbleRowState{
+			.counter = value,
+			.ratio = correct / full,
+		};
+	});
+
+	const auto bubble = Premium::AddBubbleRow(
+		container,
+		st::boostBubble,
+		std::move(showFinishes),
+		std::move(bubbleRowState),
+		Premium::BubbleType::Credits,
+		nullptr,
+		&st::paidReactBubbleIcon,
+		st::boxRowPadding);
+	bubble->show();
+	if (activeFgOverride) {
+		std::move(value) | rpl::on_next([=](int count) {
+			bubble->setBrushOverride(activeFgOverride(count));
+		}, bubble->lifetime());
+	}
+	return bubble;
+}
+
+object_ptr<RpWidget> MakeStarSelectInfoBlocks(
+		not_null<RpWidget*> parent,
+		std::vector<StarSelectInfoBlock> blocks,
+		Text::MarkedContext context,
+		bool dark) {
+	Expects(!blocks.empty());
+
+	auto result = object_ptr<RpWidget>(parent.get());
+	const auto raw = result.data();
+
+	struct State {
+		std::vector<not_null<RpWidget*>> blocks;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+
+	for (auto &info : blocks) {
+		state->blocks.push_back(MakeStarSelectInfoBlock(
+			raw,
+			std::move(info.title),
+			std::move(info.subtext),
+			std::move(info.click),
+			context,
+			dark));
+	}
+	raw->resize(raw->width(), state->blocks.front()->height());
+	raw->widthValue() | rpl::on_next([=](int width) {
+		const auto count = int(state->blocks.size());
+		const auto skip = (st::boxRowPadding.left() / 2);
+		const auto single = (width - skip * (count - 1)) / float64(count);
+		if (single < 1.) {
+			return;
+		}
+		auto x = 0.;
+		const auto w = int(base::SafeRound(single));
+		for (const auto &block : state->blocks) {
+			block->resizeToWidth(w);
+			block->moveToLeft(int(base::SafeRound(x)), 0);
+			x += single + skip;
+		}
+	}, raw->lifetime());
+
+	return result;
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/payments/ui/payments_reaction_box.h b/Telegram/SourceFiles/payments/ui/payments_reaction_box.h
index 8cd21f1cf0bb3f..3d3416ebfd10bb 100644
--- a/Telegram/SourceFiles/payments/ui/payments_reaction_box.h
+++ b/Telegram/SourceFiles/payments/ui/payments_reaction_box.h
@@ -8,36 +8,56 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "base/object_ptr.h"
+#include "calls/group/ui/calls_group_stars_coloring.h"
+
+namespace style {
+struct RoundCheckbox;
+struct MediaSlider;
+} // namespace style
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui::Premium {
+class BubbleWidget;
+} // namespace Ui::Premium
 
 namespace Ui {
 
+class AbstractButton;
 class BoxContent;
 class GenericBox;
 class DynamicImage;
-
-struct TextWithContext {
-	TextWithEntities text;
-	std::any context;
-};
+class VerticalLayout;
 
 struct PaidReactionTop {
 	QString name;
 	std::shared_ptr<DynamicImage> photo;
+	uint64 barePeerId = 0;
 	int count = 0;
 	Fn<void()> click;
 	bool my = false;
 };
 
 struct PaidReactionBoxArgs {
+	int min = 0;
+	int explicitlyAllowed = 0;
 	int chosen = 0;
 	int max = 0;
 
 	std::vector<PaidReactionTop> top;
 
-	QString channel;
-	Fn<rpl::producer<TextWithContext>(rpl::producer<int> amount)> submit;
-	rpl::producer<uint64> balanceValue;
-	Fn<void(int, bool)> send;
+	not_null<Main::Session*> session;
+	QString name;
+	Fn<rpl::producer<TextWithEntities>(rpl::producer<int> amount)> submit;
+	std::vector<Calls::Group::Ui::StarsColoring> colorings;
+	rpl::producer<CreditsAmount> balanceValue;
+	Fn<void(int, uint64)> send;
+	bool videoStreamChoosing = false;
+	bool videoStreamSending = false;
+	bool videoStreamAdmin = false;
+	bool dark = false;
 };
 
 void PaidReactionsBox(
@@ -47,4 +67,54 @@ void PaidReactionsBox(
 [[nodiscard]] object_ptr<BoxContent> MakePaidReactionBox(
 	PaidReactionBoxArgs &&args);
 
+[[nodiscard]] int MaxTopPaidDonorsShown();
+
+[[nodiscard]] QImage GenerateSmallBadgeImage(
+	QString text,
+	const style::icon &icon,
+	QColor bg,
+	QColor fg,
+	const style::RoundCheckbox *borderSt = nullptr);
+
+struct StarSelectDiscreter {
+	Fn<int(float64)> ratioToValue;
+	Fn<float64(int)> valueToRatio;
+};
+
+[[nodiscard]] StarSelectDiscreter StarSelectDiscreterForMax(int max);
+
+void PaidReactionSlider(
+	not_null<VerticalLayout*> container,
+	const style::MediaSlider &st,
+	int min,
+	int explicitlyAllowed,
+	rpl::producer<int> current,
+	int max,
+	Fn<void(int)> changed,
+	Fn<QColor(int)> activeFgOverride = nullptr);
+
+void AddStarSelectBalance(
+	not_null<GenericBox*> box,
+	not_null<Main::Session*> session,
+	rpl::producer<CreditsAmount> balanceValue,
+	bool dark = false);
+
+not_null<Premium::BubbleWidget*> AddStarSelectBubble(
+	not_null<VerticalLayout*> container,
+	rpl::producer<> showFinishes,
+	rpl::producer<int> value,
+	int max,
+	Fn<QColor(int)> activeFgOverride = nullptr);
+
+struct StarSelectInfoBlock {
+	rpl::producer<TextWithEntities> title;
+	rpl::producer<QString> subtext;
+	Fn<void()> click;
+};
+[[nodiscard]] object_ptr<RpWidget> MakeStarSelectInfoBlocks(
+	not_null<RpWidget*> parent,
+	std::vector<StarSelectInfoBlock> blocks,
+	Text::MarkedContext context,
+	bool dark = false);
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/platform/linux/current_geo_location_linux.cpp b/Telegram/SourceFiles/platform/linux/current_geo_location_linux.cpp
index f87c343d36e970..fe26b13df9e299 100644
--- a/Telegram/SourceFiles/platform/linux/current_geo_location_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/current_geo_location_linux.cpp
@@ -8,12 +8,93 @@ For license and copyright information please follow this link:
 #include "platform/linux/current_geo_location_linux.h"
 
 #include "core/current_geo_location.h"
+#include "base/platform/linux/base_linux_library.h"
+
+#include <gio/gio.h>
 
 namespace Platform {
+namespace {
+
+typedef struct _GClueSimple GClueSimple;
+typedef struct _GClueLocation GClueLocation;
+
+typedef enum {
+	GCLUE_ACCURACY_LEVEL_NONE = 0,
+	GCLUE_ACCURACY_LEVEL_COUNTRY = 1,
+	GCLUE_ACCURACY_LEVEL_CITY = 4,
+	GCLUE_ACCURACY_LEVEL_NEIGHBORHOOD = 5,
+	GCLUE_ACCURACY_LEVEL_STREET = 6,
+	GCLUE_ACCURACY_LEVEL_EXACT = 8,
+} GClueAccuracyLevel;
+
+void (*gclue_simple_new)(
+	const char *desktop_id,
+	GClueAccuracyLevel accuracy_level,
+	GCancellable *cancellable,
+	GAsyncReadyCallback callback,
+	gpointer user_data);
+
+GClueSimple *(*gclue_simple_new_finish)(GAsyncResult *result, GError **error);
+GClueLocation *(*gclue_simple_get_location)(GClueSimple *simple);
+
+gdouble (*gclue_location_get_latitude)(GClueLocation *loc);
+gdouble (*gclue_location_get_longitude)(GClueLocation *loc);
+
+} // namespace
 
 void ResolveCurrentExactLocation(Fn<void(Core::GeoLocation)> callback) {
-	callback({});
+	static const auto Inited = [] {
+		const auto lib = base::Platform::LoadLibrary(
+			"libgeoclue-2.so.0",
+			RTLD_NODELETE);
+		return lib
+			&& LOAD_LIBRARY_SYMBOL(lib, gclue_simple_new)
+			&& LOAD_LIBRARY_SYMBOL(lib, gclue_simple_new_finish)
+			&& LOAD_LIBRARY_SYMBOL(lib, gclue_simple_get_location)
+			&& LOAD_LIBRARY_SYMBOL(lib, gclue_location_get_latitude)
+			&& LOAD_LIBRARY_SYMBOL(lib, gclue_location_get_longitude);
+	}();
+
+	if (!Inited) {
+		callback({});
+		return;
+	}
+
+	gclue_simple_new(
+		QGuiApplication::desktopFileName().toUtf8().constData(),
+		GCLUE_ACCURACY_LEVEL_EXACT,
+		nullptr,
+		GAsyncReadyCallback(+[](
+				GObject *object,
+				GAsyncResult* res,
+				Fn<void(Core::GeoLocation)> *callback) {
+			const auto callbackGuard = gsl::finally([&] {
+				delete callback;
+			});
+
+			const auto simple = gclue_simple_new_finish(res, nullptr);
+			if (!simple) {
+				(*callback)({});
+				return;
+			}
+
+			const auto simpleGuard = gsl::finally([&] {
+				g_object_unref(simple);
+			});
+
+			const auto location = gclue_simple_get_location(simple);
+
+			(*callback)({
+				.point = {
+					gclue_location_get_latitude(location),
+					gclue_location_get_longitude(location),
+				},
+				.accuracy = Core::GeoLocationAccuracy::Exact,
+			});
+		}),
+		new Fn(callback));
 }
+
 void ResolveLocationAddress(
 		const Core::GeoLocation &location,
 		const QString &language,
diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 8a7db94ed4064c..d0a12b1d01f24b 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -10,50 +10,29 @@ For license and copyright information please follow this link:
 #include "platform/platform_integration.h"
 #include "base/platform/base_platform_info.h"
 #include "base/platform/linux/base_linux_xdp_utilities.h"
-#include "window/notifications_manager.h"
 #include "core/sandbox.h"
 #include "core/application.h"
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 #include "core/core_settings.h"
+#endif
 #include "base/random.h"
+#include "base/qt_connection.h"
 
 #include <QtCore/QAbstractEventDispatcher>
-#include <QtGui/QStyleHints>
 
 #include <gio/gio.hpp>
 #include <xdpinhibit/xdpinhibit.hpp>
 
+#ifdef __GLIBC__
+#include <malloc.h>
+#endif // __GLIBC__
+
 namespace Platform {
 namespace {
 
 using namespace gi::repository;
 namespace GObject = gi::repository::GObject;
 
-std::vector<std::any> AnyVectorFromVariant(GLib::Variant value) {
-	std::vector<std::any> result;
-
-	GLib::VariantIter iter;
-	iter.allocate_();
-	iter.init(value);
-
-	const auto uint64Type = GLib::VariantType::new_("t");
-	const auto int64Type = GLib::VariantType::new_("x");
-
-	while (auto value = iter.next_value()) {
-		value = value.get_variant();
-		if (value.is_of_type(uint64Type)) {
-			result.push_back(std::make_any<uint64>(value.get_uint64()));
-		} else if (value.is_of_type(int64Type)) {
-			result.push_back(std::make_any<int64>(value.get_int64()));
-		} else if (value.is_container()) {
-			result.push_back(
-				std::make_any<std::vector<std::any>>(
-					AnyVectorFromVariant(value)));
-		}
-	}
-
-	return result;
-}
-
 class Application : public Gio::impl::ApplicationImpl {
 public:
 	Application();
@@ -125,44 +104,6 @@ Application::Application()
 		});
 	});
 	actionMap.add_action(quitAction);
-
-	using Window::Notifications::Manager;
-	using NotificationId = Manager::NotificationId;
-
-	const auto notificationIdVariantType = GLib::VariantType::new_("av");
-
-	auto notificationActivateAction = Gio::SimpleAction::new_(
-		"notification-activate",
-		notificationIdVariantType);
-
-	notificationActivateAction.signal_activate().connect([](
-			Gio::SimpleAction,
-			GLib::Variant parameter) {
-		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-			Core::App().notifications().manager().notificationActivated(
-				NotificationId::FromAnyVector(
-					AnyVectorFromVariant(parameter)));
-		});
-	});
-
-	actionMap.add_action(notificationActivateAction);
-
-	auto notificationMarkAsReadAction = Gio::SimpleAction::new_(
-		"notification-mark-as-read",
-		notificationIdVariantType);
-
-	notificationMarkAsReadAction.signal_activate().connect([](
-			Gio::SimpleAction,
-			GLib::Variant parameter) {
-		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-			Core::App().notifications().manager().notificationReplied(
-				NotificationId::FromAnyVector(
-					AnyVectorFromVariant(parameter)),
-				{});
-		});
-	});
-
-	actionMap.add_action(notificationMarkAsReadAction);
 }
 
 gi::ref_ptr<Application> MakeApplication() {
@@ -190,30 +131,28 @@ class LinuxIntegration final : public Integration, public base::has_weak_ptr {
 
 	const gi::ref_ptr<Application> _application;
 	XdpInhibit::InhibitProxy _inhibitProxy;
-	rpl::variable<std::optional<bool>> _darkMode;
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 	base::Platform::XDP::SettingWatcher _darkModeWatcher;
-	rpl::lifetime _lifetime;
+#endif // Qt < 6.5.0
+#ifdef __GLIBC__
+	base::qt_connection _memoryTrim;
+	crl::time _memoryTrimmed = 0;
+#endif // __GLIBC__
 };
 
 LinuxIntegration::LinuxIntegration()
 : _application(MakeApplication())
-, _darkMode([]() -> std::optional<bool> {
-	if (auto value = base::Platform::XDP::ReadSetting(
-			"org.freedesktop.appearance",
-			"color-scheme")) {
-		return value->get_uint32() == 1;
-	}
-	return std::nullopt;
-})
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 , _darkModeWatcher(
 	"org.freedesktop.appearance",
 	"color-scheme",
-	[=](GLib::Variant value) {
+	[](GLib::Variant value) {
 		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-			_darkMode = value.get_uint32() == 1;
+			Core::App().settings().setSystemDarkMode(value.get_uint32() == 1);
 		});
-	}
-) {
+})
+#endif // Qt < 6.5.0
+{
 	LOG(("Icon theme: %1").arg(QIcon::themeName()));
 	LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
 
@@ -222,6 +161,18 @@ LinuxIntegration::LinuxIntegration()
 		g_warning("Qt is running without GLib event loop integration, "
 			"expect various functionality to not to work.");
 	}
+
+#ifdef __GLIBC__
+	_memoryTrim = QObject::connect(
+		QCoreApplication::eventDispatcher(),
+		&QAbstractEventDispatcher::aboutToBlock,
+		[=] {
+			if (crl::now() - _memoryTrimmed >= 10000) {
+				malloc_trim(0);
+				_memoryTrimmed = crl::now();
+			}
+		});
+#endif // __GLIBC__
 }
 
 void LinuxIntegration::init() {
@@ -237,30 +188,6 @@ void LinuxIntegration::init() {
 
 			initInhibit();
 		}));
-
-	_darkMode.value()
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
-	| rpl::filter([] {
-		return QGuiApplication::styleHints()->colorScheme()
-			== Qt::ColorScheme::Unknown;
-	})
-#endif // Qt >= 6.5.0
-	| rpl::start_with_next([](std::optional<bool> value) {
-		Core::App().settings().setSystemDarkMode(value);
-	}, _lifetime);
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
-	Core::App().settings().systemDarkModeValue(
-	) | rpl::filter([=](std::optional<bool> value) {
-		return !value && _darkMode.current();
-	}) | rpl::start_with_next([=] {
-		crl::on_main(this, [=] {
-			if (!Core::App().settings().systemDarkMode()) {
-				Core::App().settings().setSystemDarkMode(_darkMode.current());
-			}
-		});
-	}, _lifetime);
-#endif // Qt >= 6.5.0
 }
 
 void LinuxIntegration::initInhibit() {
diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
index 3c853c7cdd791c..d31f2838e5f294 100644
--- a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
@@ -12,14 +12,22 @@ For license and copyright information please follow this link:
 #include "webview/platform/linux/webview_linux_webkitgtk.h"
 
 #include <QtWidgets/QApplication>
+#include <ksandbox.h>
 #include <glib/glib.hpp>
 
+#ifdef __GLIBC__
+#include <malloc.h>
+#endif // __GLIBC__
+
 using namespace gi::repository;
 
 namespace Platform {
 
 Launcher::Launcher(int argc, char *argv[])
 : Core::Launcher(argc, argv) {
+#ifdef __GLIBC__
+	mallopt(M_ARENA_MAX, 1);
+#endif // __GLIBC__
 }
 
 int Launcher::exec() {
@@ -38,24 +46,23 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
 		return false;
 	}
 
-	const auto justRelaunch = action == UpdaterLaunch::JustRelaunch;
+	const auto justRelaunch = action == UpdaterLaunch::JustRelaunch
+		|| KSandbox::isInside();
+
 	if (action == UpdaterLaunch::PerformUpdate) {
 		_updating = true;
 	}
 
 	std::vector<std::string> argumentsList;
 
-	// What we are launching.
-	const auto launching = justRelaunch
-		? (cExeDir() + cExeName())
-		: cWriteProtected()
-		? GLib::find_program_in_path("run0")
-		? u"run0"_q
-		: u"pkexec"_q
-		: (cExeDir() + u"Updater"_q);
-	argumentsList.push_back(launching.toStdString());
-
-	if (justRelaunch) {
+	if (KSandbox::isFlatpak() && _updating) {
+		argumentsList.push_back("flatpak-spawn");
+		argumentsList.push_back("--latest-version");
+		argumentsList.push_back((cExeDir() + cExeName()).toStdString());
+	} else if (justRelaunch) {
+		// What we are launching.
+		const auto launching = (cExeDir() + cExeName());
+		argumentsList.push_back(launching.toStdString());
 		// argv[0] that is passed to what we are launching.
 		// It should be added explicitly in case of FILE_AND_ARGV_ZERO_.
 		const auto argv0 = !arguments().isEmpty()
@@ -63,9 +70,13 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
 			: launching;
 		argumentsList.push_back(argv0.toStdString());
 	} else if (cWriteProtected()) {
-		// Elevated process that run0/pkexec should launch.
-		const auto elevated = cWorkingDir() + u"tupdates/temp/Updater"_q;
-		argumentsList.push_back(elevated.toStdString());
+		argumentsList.push_back(GLib::find_program_in_path("run0")
+			? "run0"
+			: "pkexec");
+		argumentsList.push_back(
+			cWorkingDir().toStdString() + "tupdates/temp/Updater");
+	} else {
+		argumentsList.push_back(cExeDir().toStdString() + "Updater");
 	}
 
 	if (Logs::DebugEnabled()) {
@@ -115,7 +126,9 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
 			initialWorkingDir().toStdString(),
 			argumentsList,
 			{},
-			GLib::SpawnFlags::FILE_AND_ARGV_ZERO_,
+			KSandbox::isFlatpak() && _updating
+				? GLib::SpawnFlags::SEARCH_PATH_
+				: GLib::SpawnFlags::FILE_AND_ARGV_ZERO_,
 			nullptr,
 			nullptr,
 			nullptr);
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 7b17fcc77c5b05..3bee37bf739d1b 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -374,7 +374,6 @@ void MainWindow::createGlobalMenu() {
 		QKeySequence(Qt::ControlModifier | Qt::Key_Comma));
 
 	prefs->setMenuRole(QAction::PreferencesRole);
-	prefs->setShortcutContext(Qt::WidgetShortcut);
 
 	auto tools = psMainMenu->addMenu(tr::lng_linux_menu_tools(tr::now));
 
@@ -431,7 +430,7 @@ void MainWindow::createGlobalMenu() {
 			u"Telegram"_q),
 		[=] {
 			ensureWindowShown();
-			controller().show(Box<AboutBox>());
+			controller().show(Box(AboutBox));
 		});
 
 	about->setMenuRole(QAction::AboutQtRole);
@@ -539,4 +538,36 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *evt) {
 MainWindow::~MainWindow() {
 }
 
+int32 ScreenNameChecksum(const QString &name) {
+	return Window::DefaultScreenNameChecksum(name);
+}
+
+int32 ScreenNameChecksum(const QScreen *screen) {
+	return ScreenNameChecksum(screen->name());
+}
+
+QString ScreenDisplayLabel(const QScreen *screen) {
+	if (!screen) {
+		return QString();
+	}
+
+	const auto model = (screen->manufacturer()
+		+ ' '
+		+ screen->model()).simplified();
+
+	if (!model.isEmpty()) {
+		if (!screen->name().isEmpty()) {
+			return (model
+				+ ' '
+				+ QChar(8212)
+				+ ' '
+				+ screen->name()).simplified();
+		}
+
+		return model;
+	}
+
+	return screen->name();
+}
+
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.h b/Telegram/SourceFiles/platform/linux/main_window_linux.h
index 4ef98ba7735a1f..4a5ba8f7fa2246 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.h
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.h
@@ -63,8 +63,9 @@ class MainWindow : public Window::MainWindow {
 
 };
 
-[[nodiscard]] inline int32 ScreenNameChecksum(const QString &name) {
-	return Window::DefaultScreenNameChecksum(name);
-}
+[[nodiscard]] int32 ScreenNameChecksum(const QString &name);
+[[nodiscard]] int32 ScreenNameChecksum(const QScreen *screen);
+
+[[nodiscard]] QString ScreenDisplayLabel(const QScreen *screen);
 
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index f80d88c77308b9..44f5acdad50f55 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -11,13 +11,17 @@ For license and copyright information please follow this link:
 #include "base/options.h"
 #include "base/platform/base_platform_info.h"
 #include "base/platform/linux/base_linux_dbus_utilities.h"
+#include "platform/platform_specific.h"
 #include "core/application.h"
 #include "core/sandbox.h"
-#include "core/core_settings.h"
+#include "core/version.h"
 #include "data/data_forum_topic.h"
+#include "data/data_saved_sublist.h"
+#include "data/data_peer.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "main/main_session.h"
+#include "media/audio/media_audio_local_cache.h"
 #include "lang/lang_keys.h"
 #include "base/weak_ptr.h"
 #include "window/notifications_utilities.h"
@@ -26,6 +30,8 @@ For license and copyright information please follow this link:
 #include <QtCore/QVersionNumber>
 #include <QtGui/QGuiApplication>
 
+#include <ksandbox.h>
+
 #include <xdgnotifications/xdgnotifications.hpp>
 
 #include <dlfcn.h>
@@ -51,14 +57,20 @@ bool ServiceRegistered = false;
 ServerInformation CurrentServerInformation;
 std::vector<std::string> CurrentCapabilities;
 
+[[nodiscard]] const auto &OptionGNotification() {
+	static const auto &result = base::options::lookup<bool>(
+		Window::Notifications::kOptionGNotification);
+	return result;
+}
+
 [[nodiscard]] bool HasCapability(const char *value) {
 	return ranges::contains(CurrentCapabilities, value);
 }
 
-std::unique_ptr<base::Platform::DBus::ServiceWatcher> CreateServiceWatcher() {
+std::optional<base::Platform::DBus::ServiceWatcher> CreateServiceWatcher() {
 	auto connection = Gio::bus_get_sync(Gio::BusType::SESSION_, nullptr);
 	if (!connection) {
-		return nullptr;
+		return {};
 	}
 
 	const auto activatable = [&] {
@@ -73,7 +85,7 @@ std::unique_ptr<base::Platform::DBus::ServiceWatcher> CreateServiceWatcher() {
 		return ranges::contains(*names, kService);
 	}();
 
-	return std::make_unique<base::Platform::DBus::ServiceWatcher>(
+	return std::make_optional<base::Platform::DBus::ServiceWatcher>(
 		connection.gobj_(),
 		kService,
 		[=](
@@ -131,421 +143,13 @@ bool UseGNotification() {
 		return false;
 	}
 
-	if (Window::Notifications::OptionGNotification.value()) {
+	if (OptionGNotification().value()) {
 		return true;
 	}
 
 	return KSandbox::isFlatpak() && !ServiceRegistered;
 }
 
-GLib::Variant AnyVectorToVariant(const std::vector<std::any> &value) {
-	return GLib::Variant::new_array(
-		value | ranges::views::transform([](const std::any &value) {
-			try {
-				return GLib::Variant::new_variant(
-					GLib::Variant::new_uint64(std::any_cast<uint64>(value)));
-			} catch (...) {
-			}
-
-			try {
-				return GLib::Variant::new_variant(
-					GLib::Variant::new_int64(std::any_cast<int64>(value)));
-			} catch (...) {
-			}
-
-			try {
-				return GLib::Variant::new_variant(
-					AnyVectorToVariant(
-						std::any_cast<std::vector<std::any>>(value)));
-			} catch (...) {
-			}
-
-			return GLib::Variant(nullptr);
-		}) | ranges::to_vector);
-}
-
-class NotificationData final : public base::has_weak_ptr {
-public:
-	using NotificationId = Window::Notifications::Manager::NotificationId;
-
-	NotificationData(
-		not_null<Manager*> manager,
-		XdgNotifications::NotificationsProxy proxy,
-		NotificationId id);
-
-	[[nodiscard]] bool init(
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		Window::Notifications::Manager::DisplayOptions options);
-
-	NotificationData(const NotificationData &other) = delete;
-	NotificationData &operator=(const NotificationData &other) = delete;
-	NotificationData(NotificationData &&other) = delete;
-	NotificationData &operator=(NotificationData &&other) = delete;
-
-	~NotificationData();
-
-	void show();
-	void close();
-	void setImage(QImage image);
-
-private:
-	const not_null<Manager*> _manager;
-	NotificationId _id;
-
-	Gio::Application _application;
-	Gio::Notification _notification;
-	const std::string _guid;
-
-	XdgNotifications::NotificationsProxy _proxy;
-	XdgNotifications::Notifications _interface;
-	std::string _title;
-	std::string _body;
-	std::vector<std::string> _actions;
-	GLib::VariantDict _hints;
-	std::string _imageKey;
-
-	uint _notificationId = 0;
-	ulong _actionInvokedSignalId = 0;
-	ulong _activationTokenSignalId = 0;
-	ulong _notificationRepliedSignalId = 0;
-	ulong _notificationClosedSignalId = 0;
-
-};
-
-using Notification = std::unique_ptr<NotificationData>;
-
-NotificationData::NotificationData(
-	not_null<Manager*> manager,
-	XdgNotifications::NotificationsProxy proxy,
-	NotificationId id)
-: _manager(manager)
-, _id(id)
-, _application(UseGNotification()
-		? Gio::Application::get_default()
-		: nullptr)
-, _guid(_application ? std::string(Gio::dbus_generate_guid()) : std::string())
-, _proxy(proxy)
-, _interface(proxy)
-, _hints(GLib::VariantDict::new_())
-, _imageKey(GetImageKey()) {
-}
-
-bool NotificationData::init(
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		Window::Notifications::Manager::DisplayOptions options) {
-	if (_application) {
-		_notification = Gio::Notification::new_(
-			subtitle.isEmpty()
-				? title.toStdString()
-				: subtitle.toStdString() + " (" + title.toStdString() + ')');
-
-		_notification.set_body(msg.toStdString());
-
-		_notification.set_icon(
-			Gio::ThemedIcon::new_(base::IconName().toStdString()));
-
-		// for chat messages, according to
-		// https://docs.gtk.org/gio/enum.NotificationPriority.html
-		_notification.set_priority(Gio::NotificationPriority::HIGH_);
-
-		// glib 2.70+, we keep glib 2.56+ compatibility
-		static const auto set_category = [] {
-			// reset dlerror after dlsym call
-			const auto guard = gsl::finally([] { dlerror(); });
-			return reinterpret_cast<void(*)(GNotification*, const gchar*)>(
-				dlsym(RTLD_DEFAULT, "g_notification_set_category"));
-		}();
-
-		if (set_category) {
-			set_category(_notification.gobj_(), "im.received");
-		}
-
-		const auto idVariant = AnyVectorToVariant(_id.toAnyVector());
-
-		_notification.set_default_action_and_target(
-			"app.notification-activate",
-			idVariant);
-
-		if (!options.hideMarkAsRead) {
-			_notification.add_button_with_target(
-				tr::lng_context_mark_read(tr::now).toStdString(),
-				"app.notification-mark-as-read",
-				idVariant);
-		}
-
-		return true;
-	}
-
-	if (!_interface) {
-		return false;
-	}
-
-	if (HasCapability("body-markup")) {
-		_title = title.toStdString();
-
-		_body = subtitle.isEmpty()
-			? msg.toHtmlEscaped().toStdString()
-			: u"<b>%1</b>\n%2"_q.arg(
-				subtitle.toHtmlEscaped(),
-				msg.toHtmlEscaped()).toStdString();
-	} else {
-		_title = subtitle.isEmpty()
-			? title.toStdString()
-			: subtitle.toStdString() + " (" + title.toStdString() + ')';
-
-		_body = msg.toStdString();
-	}
-
-	if (HasCapability("actions")) {
-		_actions.push_back("default");
-		_actions.push_back(tr::lng_open_link(tr::now).toStdString());
-
-		if (!options.hideMarkAsRead) {
-			// icon name according to https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
-			_actions.push_back("mail-mark-read");
-			_actions.push_back(
-				tr::lng_context_mark_read(tr::now).toStdString());
-		}
-
-		if (HasCapability("inline-reply")
-				&& !options.hideReplyButton) {
-			_actions.push_back("inline-reply");
-			_actions.push_back(
-				tr::lng_notification_reply(tr::now).toStdString());
-
-			_notificationRepliedSignalId
-				= _interface.signal_notification_replied().connect([=](
-						XdgNotifications::Notifications,
-						uint id,
-						std::string text) {
-					Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-						if (id == _notificationId) {
-							_manager->notificationReplied(
-								_id,
-								{ QString::fromStdString(text), {} });
-						}
-					});
-				});
-		}
-
-		_actionInvokedSignalId = _interface.signal_action_invoked().connect(
-			[=](
-					XdgNotifications::Notifications,
-					uint id,
-					std::string actionName) {
-				Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-					if (id == _notificationId) {
-						if (actionName == "default") {
-							_manager->notificationActivated(_id);
-						} else if (actionName == "mail-mark-read") {
-							_manager->notificationReplied(_id, {});
-						}
-					}
-				});
-			});
-
-		_activationTokenSignalId
-			= _interface.signal_activation_token().connect([=](
-					XdgNotifications::Notifications,
-					uint id,
-					std::string token) {
-				if (id == _notificationId) {
-					GLib::setenv("XDG_ACTIVATION_TOKEN", token, true);
-				}
-			});
-	}
-
-	if (HasCapability("action-icons")) {
-		_hints.insert_value("action-icons", GLib::Variant::new_boolean(true));
-	}
-
-	// suppress system sound if telegram sound activated,
-	// otherwise use system sound
-	if (HasCapability("sound")) {
-		if (Core::App().settings().soundNotify()) {
-			_hints.insert_value(
-				"suppress-sound",
-				GLib::Variant::new_boolean(true));
-		} else {
-			// sound name according to http://0pointer.de/public/sound-naming-spec.html
-			_hints.insert_value(
-				"sound-name",
-				GLib::Variant::new_string("message-new-instant"));
-		}
-	}
-
-	if (HasCapability("x-canonical-append")) {
-		_hints.insert_value(
-			"x-canonical-append",
-			GLib::Variant::new_string("true"));
-	}
-
-	_hints.insert_value("category", GLib::Variant::new_string("im.received"));
-
-	_hints.insert_value("desktop-entry", GLib::Variant::new_string(
-		QGuiApplication::desktopFileName().toStdString()));
-
-	_notificationClosedSignalId =
-		_interface.signal_notification_closed().connect([=](
-				XdgNotifications::Notifications,
-				uint id,
-				uint reason) {
-			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-				/*
-				* From: https://specifications.freedesktop.org/notification-spec/latest/ar01s09.html
-				* The reason the notification was closed
-				* 1 - The notification expired.
-				* 2 - The notification was dismissed by the user.
-				* 3 - The notification was closed by a call to CloseNotification.
-				* 4 - Undefined/reserved reasons.
-				*
-				* If the notification was dismissed by the user (reason == 2), the notification is not kept in notification history.
-				* We do not need to send a "CloseNotification" call later to clear it from history.
-				* Therefore we can drop the notification reference now.
-				* In all other cases we keep the notification reference so that we may clear the notification later from history,
-				* if the message for that notification is read (e.g. chat is opened or read from another device).
-				*/
-				if (id == _notificationId && reason == 2) {
-					_manager->clearNotification(_id);
-				}
-			});
-		});
-
-	return true;
-}
-
-NotificationData::~NotificationData() {
-	if (_interface) {
-		if (_actionInvokedSignalId != 0) {
-			_interface.disconnect(_actionInvokedSignalId);
-		}
-
-		if (_activationTokenSignalId != 0) {
-			_interface.disconnect(_activationTokenSignalId);
-		}
-
-		if (_notificationRepliedSignalId != 0) {
-			_interface.disconnect(_notificationRepliedSignalId);
-		}
-
-		if (_notificationClosedSignalId != 0) {
-			_interface.disconnect(_notificationClosedSignalId);
-		}
-	}
-}
-
-void NotificationData::show() {
-	if (_application && _notification) {
-		_application.send_notification(_guid, _notification);
-		return;
-	}
-
-	// a hack for snap's activation restriction
-	const auto weak = base::make_weak(this);
-	StartServiceAsync(_proxy.get_connection(), crl::guard(weak, [=] {
-		const auto iconName = _imageKey.empty()
-			|| !_hints.lookup_value(_imageKey)
-				? base::IconName().toStdString()
-				: std::string();
-
-		auto actions = _actions
-			| ranges::views::transform(&std::string::c_str)
-			| ranges::to_vector;
-		actions.push_back(nullptr);
-
-		const auto callbackWrap = gi::unwrap(
-			Gio::AsyncReadyCallback(
-				crl::guard(weak, [=](GObject::Object, Gio::AsyncResult res) {
-					Core::Sandbox::Instance().customEnterFromEventLoop([&] {
-						const auto result = _interface.call_notify_finish(
-							res);
-
-						if (!result) {
-							Gio::DBusErrorNS_::strip_remote_error(
-								result.error());
-							LOG(("Native Notification Error: %1").arg(
-								result.error().message_().c_str()));
-							_manager->clearNotification(_id);
-							return;
-						}
-
-						_notificationId = std::get<1>(*result);
-					});
-				})),
-			gi::scope_async);
-
-		xdg_notifications_notifications_call_notify(
-			_interface.gobj_(),
-			AppName.data(),
-			0,
-			iconName.c_str(),
-			_title.c_str(),
-			_body.c_str(),
-			actions.data(),
-			_hints.end().gobj_(),
-			-1,
-			nullptr,
-			&callbackWrap->wrapper,
-			callbackWrap);
-	}));
-}
-
-void NotificationData::close() {
-	if (_application) {
-		_application.withdraw_notification(_guid);
-	} else {
-		_interface.call_close_notification(_notificationId, nullptr);
-	}
-	_manager->clearNotification(_id);
-}
-
-void NotificationData::setImage(QImage image) {
-	if (_notification) {
-		const auto imageData = std::make_shared<QByteArray>();
-		QBuffer buffer(imageData.get());
-		buffer.open(QIODevice::WriteOnly);
-		image.save(&buffer, "PNG");
-
-		_notification.set_icon(
-			Gio::BytesIcon::new_(
-				GLib::Bytes::new_with_free_func(
-					reinterpret_cast<const uchar*>(imageData->constData()),
-					imageData->size(),
-					[imageData] {})));
-
-		return;
-	}
-
-	if (_imageKey.empty()) {
-		return;
-	}
-
-	if (image.hasAlphaChannel()) {
-		image.convertTo(QImage::Format_RGBA8888);
-	} else {
-		image.convertTo(QImage::Format_RGB888);
-	}
-
-	_hints.insert_value(_imageKey, GLib::Variant::new_tuple({
-		GLib::Variant::new_int32(image.width()),
-		GLib::Variant::new_int32(image.height()),
-		GLib::Variant::new_int32(image.bytesPerLine()),
-		GLib::Variant::new_boolean(image.hasAlphaChannel()),
-		GLib::Variant::new_int32(8),
-		GLib::Variant::new_int32(image.hasAlphaChannel() ? 4 : 3),
-		GLib::Variant::new_from_data(
-			GLib::VariantType::new_("ay"),
-			reinterpret_cast<const uchar*>(image.constBits()),
-			image.sizeInBytes(),
-			true,
-			[image] {}),
-	}));
-}
-
 } // namespace
 
 class Manager::Private : public base::has_weak_ptr {
@@ -555,33 +159,33 @@ class Manager::Private : public base::has_weak_ptr {
 	void init(XdgNotifications::NotificationsProxy proxy);
 
 	void showNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options);
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView);
 	void clearAll();
 	void clearFromItem(not_null<HistoryItem*> item);
 	void clearFromTopic(not_null<Data::ForumTopic*> topic);
+	void clearFromSublist(not_null<Data::SavedSublist*> sublist);
 	void clearFromHistory(not_null<History*> history);
 	void clearFromSession(not_null<Main::Session*> session);
 	void clearNotification(NotificationId id);
 	void invokeIfNotInhibited(Fn<void()> callback);
 
-	~Private();
-
 private:
-	const not_null<Manager*> _manager;
+	struct NotificationData : public base::has_weak_ptr {
+		std::variant<v::null_t, uint, std::string> id;
+		rpl::lifetime lifetime;
+	};
+	using Notification = std::unique_ptr<NotificationData>;
 
+	const not_null<Manager*> _manager;
+	Gio::Application _application;
+	XdgNotifications::NotificationsProxy _proxy;
+	XdgNotifications::Notifications _interface;
+	Media::Audio::LocalDiskCache _sounds;
 	base::flat_map<
 		ContextId,
 		base::flat_map<MsgId, Notification>> _notifications;
-
-	XdgNotifications::NotificationsProxy _proxy;
-	XdgNotifications::Notifications _interface;
+	rpl::lifetime _lifetime;
 
 };
 
@@ -609,8 +213,7 @@ bool Enforced() {
 	// Wayland doesn't support positioning
 	// and custom notifications don't work here
 	return IsWayland()
-		|| (Gio::Application::get_default()
-			&& Window::Notifications::OptionGNotification.value());
+		|| (Gio::Application::get_default() && OptionGNotification().value());
 }
 
 bool ByDefault() {
@@ -628,33 +231,29 @@ bool ByDefault() {
 		"actions",
 		// To have quick reply
 		"inline-reply",
+	}, HasCapability) && ranges::any_of(std::array{
 		// To not to play sound with Don't Disturb activated
-		// (no, using sound capability is not a way)
+		"sound",
 		"inhibitions",
 	}, HasCapability);
 }
 
+bool VolumeSupported() {
+	return UseGNotification() || !HasCapability("sound");
+}
+
 void Create(Window::Notifications::System *system) {
 	static const auto ServiceWatcher = CreateServiceWatcher();
 
 	const auto managerSetter = [=](
 			XdgNotifications::NotificationsProxy proxy) {
-		using ManagerType = Window::Notifications::ManagerType;
-		if ((Core::App().settings().nativeNotifications() || Enforced())
-			&& Supported()) {
-			if (system->manager().type() != ManagerType::Native) {
+		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+			system->setManager([=] {
 				auto manager = std::make_unique<Manager>(system);
 				manager->_private->init(proxy);
-				system->setManager(std::move(manager));
-			}
-		} else if (Enforced()) {
-			if (system->manager().type() != ManagerType::Dummy) {
-				using DummyManager = Window::Notifications::DummyManager;
-				system->setManager(std::make_unique<DummyManager>(system));
-			}
-		} else if (system->manager().type() != ManagerType::Default) {
-			system->setManager(nullptr);
-		}
+				return manager;
+			});
+		});
 	};
 
 	const auto counter = std::make_shared<int>(2);
@@ -670,27 +269,26 @@ void Create(Window::Notifications::System *system) {
 		kService,
 		kObjectPath,
 		[=](GObject::Object, Gio::AsyncResult res) {
-			auto proxy =
-				XdgNotifications::NotificationsProxy::new_for_bus_finish(
-					res,
-					nullptr);
-
-			if (!proxy) {
+			auto result =
+				XdgNotifications::NotificationsProxy::new_for_bus_finish(res);
+
+			if (result) {
+				ServiceRegistered = bool(result->get_name_owner());
+			} else {
+				Gio::DBusErrorNS_::strip_remote_error(result.error());
+				LOG(("Native Notification Error: %1").arg(
+					result.error().message_().c_str()));
 				ServiceRegistered = false;
-				CurrentServerInformation = {};
-				CurrentCapabilities = {};
-				managerSetter(nullptr);
-				return;
 			}
 
-			ServiceRegistered = bool(proxy.get_name_owner());
 			if (!ServiceRegistered) {
 				CurrentServerInformation = {};
 				CurrentCapabilities = {};
-				managerSetter(proxy);
+				managerSetter({});
 				return;
 			}
 
+			auto proxy = *result;
 			auto interface = XdgNotifications::Notifications(proxy);
 
 			interface.call_get_server_information([=](
@@ -738,7 +336,9 @@ void Create(Window::Notifications::System *system) {
 }
 
 Manager::Private::Private(not_null<Manager*> manager)
-: _manager(manager) {
+: _manager(manager)
+, _application(Gio::Application::get_default())
+, _sounds(cWorkingDir() + u"tdata/audio_cache"_q) {
 	const auto &serverInformation = CurrentServerInformation;
 
 	if (!serverInformation.name.empty()) {
@@ -770,114 +370,475 @@ Manager::Private::Private(not_null<Manager*> manager)
 					return a + (a.empty() ? "" : ", ") + b;
 				}).c_str()));
 	}
+
+	if (auto actionMap = Gio::ActionMap(_application)) {
+		const auto dictToNotificationId = [](GLib::VariantDict dict) {
+			return NotificationId{
+				.contextId = ContextId{
+					.sessionId = dict.lookup_value("session").get_uint64(),
+					.peerId = PeerId(dict.lookup_value("peer").get_uint64()),
+					.topicRootId = MsgId(
+						dict.lookup_value("topic").get_int64()),
+					.monoforumPeerId = PeerId(dict.lookup_value(
+						"monoforumpeer").get_uint64()),
+				},
+				.msgId = dict.lookup_value("msgid").get_int64(),
+			};
+		};
+
+		const auto notificationIdVariantType = GLib::VariantType::new_(
+			"a{sv}");
+
+		auto activate = Gio::SimpleAction::new_(
+			"notification-activate",
+			notificationIdVariantType);
+
+		actionMap.add_action(activate);
+		_lifetime.add([=]() mutable {
+			actionMap.remove_action("notification-activate");
+		});
+
+		activate.signal_activate().connect([=](
+				Gio::SimpleAction,
+				GLib::Variant parameter) {
+			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+				_manager->notificationActivated(
+					dictToNotificationId(GLib::VariantDict::new_(parameter)));
+			});
+		});
+
+		auto markAsRead = Gio::SimpleAction::new_(
+			"notification-mark-as-read",
+			notificationIdVariantType);
+
+		actionMap.add_action(markAsRead);
+		_lifetime.add([=]() mutable {
+			actionMap.remove_action("notification-mark-as-read");
+		});
+
+		markAsRead.signal_activate().connect([=](
+				Gio::SimpleAction,
+				GLib::Variant parameter) {
+			Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+				_manager->notificationReplied(
+					dictToNotificationId(GLib::VariantDict::new_(parameter)),
+					{});
+			});
+		});
+	}
 }
 
 void Manager::Private::init(XdgNotifications::NotificationsProxy proxy) {
 	_proxy = proxy;
 	_interface = proxy;
+
+	if (!_interface) {
+		return;
+	}
+
+	_interface.signal_action_invoked().connect([=](
+			XdgNotifications::Notifications,
+			uint id,
+			std::string actionName) {
+		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+			for (const auto &[key, notifications] : _notifications) {
+				for (const auto &[msgId, notification] : notifications) {
+					const auto nid = std::get_if<uint>(&notification->id);
+					if (nid && id == *nid) {
+						if (actionName == "default") {
+							_manager->notificationActivated({ key, msgId });
+						} else if (actionName == "mail-mark-read") {
+							_manager->notificationReplied({ key, msgId }, {});
+						}
+						return;
+					}
+				}
+			}
+		});
+	});
+
+	_interface.signal_notification_replied().connect([=](
+			XdgNotifications::Notifications,
+			uint id,
+			std::string text) {
+		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+			for (const auto &[key, notifications] : _notifications) {
+				for (const auto &[msgId, notification] : notifications) {
+					const auto nid = std::get_if<uint>(&notification->id);
+					if (nid && id == *nid) {
+						_manager->notificationReplied(
+							{ key, msgId },
+							{ QString::fromStdString(text), {} });
+						return;
+					}
+				}
+			}
+		});
+	});
+
+	_interface.signal_activation_token().connect([=](
+			XdgNotifications::Notifications,
+			uint id,
+			std::string token) {
+		for (const auto &[key, notifications] : _notifications) {
+			for (const auto &[msgId, notification] : notifications) {
+				const auto nid = std::get_if<uint>(&notification->id);
+				if (nid && id == *nid) {
+					GLib::setenv("XDG_ACTIVATION_TOKEN", token, true);
+					return;
+				}
+			}
+		}
+	});
+
+	_interface.signal_notification_closed().connect([=](
+			XdgNotifications::Notifications,
+			uint id,
+			uint reason) {
+		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+			for (const auto &[key, notifications] : _notifications) {
+				for (const auto &[msgId, notification] : notifications) {
+					/*
+					* From: https://specifications.freedesktop.org/notification-spec/latest/ar01s09.html
+					* The reason the notification was closed
+					* 1 - The notification expired.
+					* 2 - The notification was dismissed by the user.
+					* 3 - The notification was closed by a call to CloseNotification.
+					* 4 - Undefined/reserved reasons.
+					*
+					* If the notification was dismissed by the user (reason == 2), the notification is not kept in notification history.
+					* We do not need to send a "CloseNotification" call later to clear it from history.
+					* Therefore we can drop the notification reference now.
+					* In all other cases we keep the notification reference so that we may clear the notification later from history,
+					* if the message for that notification is read (e.g. chat is opened or read from another device).
+					*/
+					const auto nid = std::get_if<uint>(&notification->id);
+					if (nid && id == *nid && reason == 2) {
+						clearNotification({ key, msgId });
+						return;
+					}
+				}
+			}
+		});
+	});
 }
 
 void Manager::Private::showNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options) {
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView) {
+	const auto peer = info.peer;
+	const auto options = info.options;
 	const auto key = ContextId{
 		.sessionId = peer->session().uniqueId(),
 		.peerId = peer->id,
-		.topicRootId = topicRootId,
+		.topicRootId = info.topicRootId,
+		.monoforumPeerId = info.monoforumPeerId,
 	};
 	const auto notificationId = NotificationId{
 		.contextId = key,
-		.msgId = msgId,
+		.msgId = info.itemId,
 	};
-	auto notification = std::make_unique<NotificationData>(
-		_manager,
-		_proxy,
-		notificationId);
-	const auto inited = notification->init(
-		title,
-		subtitle,
-		msg,
-		options);
-	if (!inited) {
-		return;
-	}
+	auto notification = UseGNotification()
+		? Gio::Notification::new_(info.title.toStdString())
+		: Gio::Notification();
+
+	std::vector<gi::cstring> actions;
+	auto hints = GLib::VariantDict::new_();
+	if (notification) {
+		notification.set_body(info.subtitle.isEmpty()
+			? info.message.toStdString()
+			: tr::lng_dialogs_text_with_from(
+				tr::now,
+				lt_from_part,
+				tr::lng_dialogs_text_from_wrapped(
+					tr::now,
+					lt_from,
+					info.subtitle),
+				lt_message,
+				info.message).toStdString());
+
+		notification.set_icon(
+			Gio::ThemedIcon::new_(ApplicationIconName().toStdString()));
 
-	if (!options.hideNameAndPhoto) {
-		notification->setImage(
-			Window::Notifications::GenerateUserpic(peer, userpicView));
+		// for chat messages, according to
+		// https://docs.gtk.org/gio/enum.NotificationPriority.html
+		notification.set_priority(Gio::NotificationPriority::HIGH_);
+
+		// glib 2.70+, we keep glib 2.56+ compatibility
+		static const auto set_category = [] {
+			// reset dlerror after dlsym call
+			const auto guard = gsl::finally([] { dlerror(); });
+			return reinterpret_cast<void(*)(GNotification*, const gchar*)>(
+				dlsym(RTLD_DEFAULT, "g_notification_set_category"));
+		}();
+
+		if (set_category) {
+			set_category(notification.gobj_(), "im.received");
+		}
+
+		const auto notificationVariant = GLib::Variant::new_array({
+			GLib::Variant::new_dict_entry(
+				GLib::Variant::new_string("session"),
+				GLib::Variant::new_variant(
+					GLib::Variant::new_uint64(peer->session().uniqueId()))),
+			GLib::Variant::new_dict_entry(
+				GLib::Variant::new_string("peer"),
+				GLib::Variant::new_variant(
+					GLib::Variant::new_uint64(peer->id.value))),
+			GLib::Variant::new_dict_entry(
+				GLib::Variant::new_string("peer"),
+				GLib::Variant::new_variant(
+					GLib::Variant::new_uint64(peer->id.value))),
+			GLib::Variant::new_dict_entry(
+				GLib::Variant::new_string("topic"),
+				GLib::Variant::new_variant(
+					GLib::Variant::new_int64(info.topicRootId.bare))),
+			GLib::Variant::new_dict_entry(
+				GLib::Variant::new_string("monoforumpeer"),
+				GLib::Variant::new_variant(
+					GLib::Variant::new_uint64(info.monoforumPeerId.value))),
+			GLib::Variant::new_dict_entry(
+				GLib::Variant::new_string("msgid"),
+				GLib::Variant::new_variant(
+					GLib::Variant::new_int64(info.itemId.bare))),
+		});
+
+		notification.set_default_action_and_target(
+			"app.notification-activate",
+			notificationVariant);
+
+		if (!options.hideMarkAsRead) {
+			notification.add_button_with_target(
+				tr::lng_context_mark_read(tr::now).toStdString(),
+				"app.notification-mark-as-read",
+				notificationVariant);
+		}
+	} else {
+		if (HasCapability("actions")) {
+			actions.push_back("default");
+			actions.push_back(tr::lng_open_link(tr::now).toStdString());
+
+			if (!options.hideMarkAsRead) {
+				// icon name according to https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
+				actions.push_back("mail-mark-read");
+				actions.push_back(
+					tr::lng_context_mark_read(tr::now).toStdString());
+			}
+
+			if (HasCapability("inline-reply")
+					&& !options.hideReplyButton) {
+				actions.push_back("inline-reply");
+				actions.push_back(
+					tr::lng_notification_reply(tr::now).toStdString());
+			}
+		}
+
+		actions.push_back({});
+
+		if (HasCapability("action-icons")) {
+			hints.insert_value(
+				"action-icons",
+				GLib::Variant::new_boolean(true));
+		}
+
+		if (HasCapability("sound")) {
+			const auto sound = info.sound
+				? info.sound()
+				: Media::Audio::LocalSound();
+
+			const auto path = sound
+				? _sounds.path(sound).toStdString()
+				: std::string();
+
+			if (!path.empty()) {
+				hints.insert_value(
+					"sound-file",
+					GLib::Variant::new_string(path));
+			} else {
+				hints.insert_value(
+					"suppress-sound",
+					GLib::Variant::new_boolean(true));
+			}
+		}
+
+		if (HasCapability("x-canonical-append")) {
+			hints.insert_value(
+				"x-canonical-append",
+				GLib::Variant::new_string("true"));
+		}
+
+		hints.insert_value(
+			"category",
+			GLib::Variant::new_string("im.received"));
+
+		hints.insert_value("desktop-entry", GLib::Variant::new_string(
+			QGuiApplication::desktopFileName().toStdString()));
 	}
 
-	auto i = _notifications.find(key);
-	if (i != end(_notifications)) {
-		auto j = i->second.find(msgId);
-		if (j != end(i->second)) {
-			auto oldNotification = std::move(j->second);
-			i->second.erase(j);
-			oldNotification->close();
-			i = _notifications.find(key);
+	const auto imageKey = GetImageKey();
+	if (!options.hideNameAndPhoto) {
+		if (notification) {
+			QByteArray imageData;
+			QBuffer buffer(&imageData);
+			buffer.open(QIODevice::WriteOnly);
+			Window::Notifications::GenerateUserpic(peer, userpicView).save(
+				&buffer,
+				"PNG");
+
+			notification.set_icon(
+				Gio::BytesIcon::new_(
+					GLib::Bytes::new_with_free_func(
+						reinterpret_cast<const uchar*>(imageData.constData()),
+						imageData.size(),
+						[imageData] {})));
+		} else if (!imageKey.empty()) {
+			const auto image = Window::Notifications::GenerateUserpic(
+				peer,
+				userpicView
+			).convertToFormat(QImage::Format_RGBA8888);
+
+			hints.insert_value(imageKey, GLib::Variant::new_tuple({
+				GLib::Variant::new_int32(image.width()),
+				GLib::Variant::new_int32(image.height()),
+				GLib::Variant::new_int32(image.bytesPerLine()),
+				GLib::Variant::new_boolean(true),
+				GLib::Variant::new_int32(8),
+				GLib::Variant::new_int32(4),
+				GLib::Variant::new_from_data(
+					GLib::VariantType::new_("ay"),
+					reinterpret_cast<const uchar*>(image.constBits()),
+					image.sizeInBytes(),
+					true,
+					[image] {}),
+			}));
 		}
 	}
-	if (i == end(_notifications)) {
-		i = _notifications.emplace(
-			key,
-			base::flat_map<MsgId, Notification>()).first;
+
+	const auto &data
+		= _notifications[key][info.itemId]
+			= std::make_unique<NotificationData>();
+	data->lifetime.add([=, notification = data.get()] {
+		v::match(notification->id, [&](const std::string &id) {
+			_application.withdraw_notification(id);
+		}, [&](uint id) {
+			_interface.call_close_notification(id, nullptr);
+		}, [](v::null_t) {});
+	});
+
+	if (notification) {
+		const auto id = Gio::dbus_generate_guid();
+		data->id = id;
+		_application.send_notification(id, notification);
+	} else {
+		// work around snap's activation restriction
+		const auto weak = base::make_weak(data);
+		StartServiceAsync(
+			_proxy.get_connection(),
+			crl::guard(weak, [=]() mutable {
+				const auto hasImage = !imageKey.empty()
+					&& hints.lookup_value(imageKey);
+
+				const auto callbackWrap = gi::unwrap(
+					Gio::AsyncReadyCallback(
+						crl::guard(this, [=](
+								GObject::Object,
+								Gio::AsyncResult res) {
+							auto &sandbox = Core::Sandbox::Instance();
+							sandbox.customEnterFromEventLoop([&] {
+								const auto result
+									= _interface.call_notify_finish(res);
+
+								if (!result) {
+									Gio::DBusErrorNS_::strip_remote_error(
+										result.error());
+									LOG(("Native Notification Error: %1").arg(
+										result.error().message_().c_str()));
+									clearNotification(notificationId);
+									return;
+								}
+
+								if (!weak) {
+									_interface.call_close_notification(
+										std::get<1>(*result),
+										nullptr);
+									return;
+								}
+
+								weak->id = std::get<1>(*result);
+							});
+						})),
+					gi::scope_async);
+
+				xdg_notifications_notifications_call_notify(
+					_interface.gobj_(),
+					AppName.data(),
+					0,
+					(!hasImage
+						? ApplicationIconName().toStdString()
+						: std::string()).c_str(),
+					info.title.toStdString().c_str(),
+					(HasCapability("body-markup")
+						? info.subtitle.isEmpty()
+							? info.message.toHtmlEscaped().toStdString()
+							: u"<b>%1</b>\n%2"_q.arg(
+								info.subtitle.toHtmlEscaped(),
+								info.message.toHtmlEscaped()).toStdString()
+						: info.subtitle.isEmpty()
+							? info.message.toStdString()
+							: tr::lng_dialogs_text_with_from(
+								tr::now,
+								lt_from_part,
+								tr::lng_dialogs_text_from_wrapped(
+									tr::now,
+									lt_from,
+									info.subtitle),
+								lt_message,
+								info.message).toStdString()).c_str(),
+					(actions
+						| ranges::views::transform(&gi::cstring::c_str)
+						| ranges::to_vector).data(),
+					hints.end().gobj_(),
+					-1,
+					nullptr,
+					&callbackWrap->wrapper,
+					callbackWrap);
+			}));
 	}
-	const auto j = i->second.emplace(
-		msgId,
-		std::move(notification)).first;
-	j->second->show();
 }
 
 void Manager::Private::clearAll() {
-	for (const auto &[key, notifications] : base::take(_notifications)) {
-		for (const auto &[msgId, notification] : notifications) {
-			notification->close();
-		}
-	}
+	_notifications.clear();
 }
 
 void Manager::Private::clearFromItem(not_null<HistoryItem*> item) {
-	const auto key = ContextId{
+	const auto i = _notifications.find(ContextId{
 		.sessionId = item->history()->session().uniqueId(),
 		.peerId = item->history()->peer->id,
 		.topicRootId = item->topicRootId(),
-	};
-	const auto i = _notifications.find(key);
-	if (i == _notifications.cend()) {
-		return;
-	}
-	const auto j = i->second.find(item->id);
-	if (j == i->second.end()) {
-		return;
-	}
-	const auto taken = base::take(j->second);
-	i->second.erase(j);
-	if (i->second.empty()) {
+		.monoforumPeerId = item->sublistPeerId(),
+	});
+	if (i != _notifications.cend()
+			&& i->second.remove(item->id)
+			&& i->second.empty()) {
 		_notifications.erase(i);
 	}
-	taken->close();
 }
 
 void Manager::Private::clearFromTopic(not_null<Data::ForumTopic*> topic) {
-	const auto key = ContextId{
+	_notifications.remove(ContextId{
 		.sessionId = topic->session().uniqueId(),
-		.peerId = topic->history()->peer->id
-	};
-	const auto i = _notifications.find(key);
-	if (i != _notifications.cend()) {
-		const auto temp = base::take(i->second);
-		_notifications.erase(i);
+		.peerId = topic->history()->peer->id,
+		.topicRootId = topic->rootId(),
+	});
+}
 
-		for (const auto &[msgId, notification] : temp) {
-			notification->close();
-		}
-	}
+void Manager::Private::clearFromSublist(
+		not_null<Data::SavedSublist*> sublist) {
+	_notifications.remove(ContextId{
+		.sessionId = sublist->session().uniqueId(),
+		.peerId = sublist->owningHistory()->peer->id,
+		.monoforumPeerId = sublist->sublistPeer()->id,
+	});
 }
 
 void Manager::Private::clearFromHistory(not_null<History*> history) {
@@ -890,12 +851,7 @@ void Manager::Private::clearFromHistory(not_null<History*> history) {
 	while (i != _notifications.cend()
 		&& i->first.sessionId == sessionId
 		&& i->first.peerId == peerId) {
-		const auto temp = base::take(i->second);
 		i = _notifications.erase(i);
-
-		for (const auto &[msgId, notification] : temp) {
-			notification->close();
-		}
 	}
 }
 
@@ -905,21 +861,16 @@ void Manager::Private::clearFromSession(not_null<Main::Session*> session) {
 		.sessionId = sessionId,
 	});
 	while (i != _notifications.cend() && i->first.sessionId == sessionId) {
-		const auto temp = base::take(i->second);
 		i = _notifications.erase(i);
-
-		for (const auto &[msgId, notification] : temp) {
-			notification->close();
-		}
 	}
 }
 
 void Manager::Private::clearNotification(NotificationId id) {
 	auto i = _notifications.find(id.contextId);
-	if (i != _notifications.cend()) {
-		if (i->second.remove(id.msgId) && i->second.empty()) {
-			_notifications.erase(i);
-		}
+	if (i != _notifications.cend()
+			&& i->second.remove(id.msgId)
+			&& i->second.empty()) {
+		_notifications.erase(i);
 	}
 }
 
@@ -929,39 +880,17 @@ void Manager::Private::invokeIfNotInhibited(Fn<void()> callback) {
 	}
 }
 
-Manager::Private::~Private() {
-	clearAll();
-}
-
 Manager::Manager(not_null<Window::Notifications::System*> system)
 : NativeManager(system)
 , _private(std::make_unique<Private>(this)) {
 }
 
-void Manager::clearNotification(NotificationId id) {
-	_private->clearNotification(id);
-}
-
 Manager::~Manager() = default;
 
 void Manager::doShowNativeNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options) {
-	_private->showNotification(
-		peer,
-		topicRootId,
-		userpicView,
-		msgId,
-		title,
-		subtitle,
-		msg,
-		options);
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView) {
+	_private->showNotification(std::move(info), userpicView);
 }
 
 void Manager::doClearAllFast() {
@@ -976,6 +905,10 @@ void Manager::doClearFromTopic(not_null<Data::ForumTopic*> topic) {
 	_private->clearFromTopic(topic);
 }
 
+void Manager::doClearFromSublist(not_null<Data::SavedSublist*> sublist) {
+	_private->clearFromSublist(sublist);
+}
+
 void Manager::doClearFromHistory(not_null<History*> history) {
 	_private->clearFromHistory(history);
 }
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h
index 95c77626bfe5c8..d2e740750f463a 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h
@@ -15,22 +15,16 @@ namespace Notifications {
 class Manager : public Window::Notifications::NativeManager {
 public:
 	Manager(not_null<Window::Notifications::System*> system);
-	void clearNotification(NotificationId id);
 	~Manager();
 
 protected:
 	void doShowNativeNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options) override;
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView) override;
 	void doClearAllFast() override;
 	void doClearFromItem(not_null<HistoryItem*> item) override;
 	void doClearFromTopic(not_null<Data::ForumTopic*> topic) override;
+	void doClearFromSublist(not_null<Data::SavedSublist*> sublist) override;
 	void doClearFromHistory(not_null<History*> history) override;
 	void doClearFromSession(not_null<Main::Session*> session) override;
 	bool doSkipToast() const override;
diff --git a/Telegram/SourceFiles/platform/linux/org.freedesktop.portal.Flatpak.xml b/Telegram/SourceFiles/platform/linux/org.freedesktop.portal.Flatpak.xml
new file mode 100644
index 00000000000000..4f2139355af455
--- /dev/null
+++ b/Telegram/SourceFiles/platform/linux/org.freedesktop.portal.Flatpak.xml
@@ -0,0 +1,583 @@
+<!DOCTYPE node PUBLIC
+"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+
+<!--
+ Copyright (C) 2018 Red Hat, Inc.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+
+ Author: Alexander Larsson <alexl@redhat.com>
+-->
+
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <!--
+      org.freedesktop.portal.Flatpak:
+      @short_description: Flatpak portal
+
+      The flatpak portal exposes some interactions with flatpak on the
+      host to the sandbox. For example, it allows you to restart the
+      applications or start a more sandboxed instance.
+
+      This portal is available on the D-Bus session bus under the
+      bus name org.freedesktop.portal.Flatpak and the object path
+      /org/freedesktop/portal/Flatpak.
+
+      This documentation describes version 8 of this interface.
+  -->
+  <interface name='org.freedesktop.portal.Flatpak'>
+    <property name="version" type="u" access="read"/>
+    <!--
+        supports:
+
+        Flags marking what optional features are available.
+         The following flags values are supported:
+         <variablelist>
+           <varlistentry>
+             <term>1 (FLATPAK_SPAWN_SUPPORT_FLAGS_EXPOSE_PIDS)</term>
+             <listitem><para>
+              Supports the expose sandbox pids flag of Spawn.
+              If the version of this interface is 5 or later, this also
+              indicates that the share sandbox pids flag is available.
+             </para></listitem>
+           </varlistentry>
+         </variablelist>
+
+         This was added in version 3 of this interface (available from flatpak 1.6.0 and later).
+        -->
+    <property name="supports" type="u" access="read"/>
+
+    <!--
+         Spawn:
+         @cwd_path: the working directory for the new process
+         @argv: the argv for the new process, starting with the executable to launch
+         @fds: an array of file descriptors to pass to the new process
+         @envs: an array of variable/value pairs for the environment of the new process
+         @flags: flags
+         @options: Vardict with optional further information
+         @pid: the PID of the new process
+
+         This method lets you start a new instance of your
+         application, optionally enabling a tighter sandbox.
+
+         The following flags values are supported:
+         <variablelist>
+           <varlistentry>
+             <term>1 (FLATPAK_SPAWN_FLAGS_CLEAR_ENV)</term>
+             <listitem><para>
+               Clear the environment.
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>2 (FLATPAK_SPAWN_FLAGS_LATEST_VERSION)</term>
+             <listitem><para>
+               Spawn the latest version of the app.
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>4 (FLATPAK_SPAWN_FLAGS_SANDBOX)</term>
+             <listitem><para>
+               Spawn in a sandbox (equivalent of the sandbox option of flatpak run).
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>8 (FLATPAK_SPAWN_FLAGS_NO_NETWORK)</term>
+             <listitem><para>
+               Spawn without network (equivalent of the unshare=network option of flatpak run).
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>16 (FLATPAK_SPAWN_FLAGS_WATCH_BUS)</term>
+             <listitem><para>
+               Kill the sandbox when the caller disappears from the session bus.
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>32 (FLATPAK_SPAWN_FLAGS_EXPOSE_PIDS)</term>
+             <listitem><para>
+               Expose the sandbox pids in the callers sandbox, only supported if using user namespaces for containers (not setuid), see the support property.
+               </para><para>
+               This was added in version 3 of this interface (available from flatpak 1.6.0 and later).
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>64 (FLATPAK_SPAWN_FLAGS_NOTIFY_START)</term>
+             <listitem><para>
+               Emit a SpawnStarted signal once the sandboxed process has been
+               fully started.
+               </para><para>
+               This was added in version 4 of this interface (available from flatpak 1.8.0 and later).
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>128 (FLATPAK_SPAWN_FLAGS_SHARE_PIDS)</term>
+             <listitem><para>
+              Expose the sandbox process IDs in the caller's sandbox and
+              the caller's process IDs in the new sandbox. Only supported
+              if using user namespaces for containers (not setuid), see the
+              support property.
+             </para><para>
+               This was added in version 5 of this interface (available from flatpak 1.10.0 and later).
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>256 (FLATPAK_SPAWN_FLAGS_EMPTY_APP)</term>
+             <listitem><para>
+               Don't provide app files at <filename>/app</filename> in the
+               new sandbox. Instead, <filename>/app</filename> will be an
+               empty directory. This flag and the <option>app-fd</option>
+               option are mutually exclusive.
+             </para><para>
+               As with the <option>app-fd</option> option, the caller's
+               Flatpak app files and extensions will be mounted on
+               <filename>/run/parent/app</filename>, with
+               filenames like <filename>/run/parent/app/bin/myapp</filename>.
+             </para><para>
+               This was added in version 6 of this interface (available from
+               flatpak 1.12.0 and later).
+             </para></listitem>
+           </varlistentry>
+         </variablelist>
+
+         Unknown (unsupported) flags are an error and will cause Spawn()
+         to fail.
+
+         Unknown (unsupported) options are ignored.
+         The following options are supported:
+         <variablelist>
+           <varlistentry>
+             <term>sandbox-expose as</term>
+             <listitem><para>
+               A list of filenames for files inside the sandbox that will be exposed
+               to the new sandbox, for reading and writing. Note that absolute paths
+               or subdirectories are not allowed.
+             </para><para>
+               The files must be in the <filename>sandbox</filename> subdirectory of
+               the instance directory (i.e. <filename>~/.var/app/$APP_ID/sandbox</filename>).
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>sandbox-expose-ro as</term>
+             <listitem><para>
+               A list of filenames for files inside the sandbox that will be exposed
+               to the new sandbox, readonly. Note that absolute paths or subdirectories
+               are not allowed.
+             </para><para>
+               The files must be in the <filename>sandbox</filename> subdirectory of
+               the instance directory (i.e. <filename>~/.var/app/$APP_ID/sandbox</filename>).
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>sandbox-expose-fd ah</term>
+             <listitem><para>
+               A list of file descriptor for files inside the sandbox that will be exposed
+               to the new sandbox, for reading and writing (if the caller has write access).
+               The file descriptors must be opened with O_PATH and O_NOFOLLOW and cannot be symlinks.
+             </para><para>
+               This was added in version 3 of this interface (available from flatpak 1.6.0 and later).
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>sandbox-expose-fd-ro ah</term>
+             <listitem><para>
+               A list of file descriptor for files inside the sandbox that will be exposed
+               to the new sandbox, readonly. The file descriptors must be opened with O_PATH and O_NOFOLLOW and cannot be symlinks.
+             </para><para>
+               This was added in version 3 of this interface (available from flatpak 1.6.0 and later).
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>sandbox-flags u</term>
+             <listitem><para>
+             Flags affecting the created sandbox. The following flags values are supported:
+             <variablelist>
+               <varlistentry>
+                 <term>1</term>
+                 <listitem><para>
+                   Share the display access (X11, wayland) with the caller.
+                 </para></listitem>
+               </varlistentry>
+               <varlistentry>
+                 <term>2</term>
+                 <listitem><para>
+                   Share the sound access (pulseaudio) with the caller.
+                 </para></listitem>
+               </varlistentry>
+               <varlistentry>
+                 <term>4</term>
+                 <listitem><para>
+                   Share the gpu access with the caller.
+                 </para></listitem>
+               </varlistentry>
+               <varlistentry>
+                 <term>8</term>
+                 <listitem><para>
+                   Allow sandbox access to (filtered) session bus.
+                 </para></listitem>
+               </varlistentry>
+               <varlistentry>
+                 <term>16</term>
+                 <listitem><para>
+                   Allow sandbox access to accessibility bus.
+                 </para></listitem>
+               </varlistentry>
+               <varlistentry>
+                 <term>32</term>
+                 <listitem><para>
+                   Allow sandbox access to input devices.
+                 </para></listitem>
+               </varlistentry>
+               <varlistentry>
+                 <term>64</term>
+                 <listitem><para>
+                   Allow sandbox access to USB devices.
+                 </para></listitem>
+               </varlistentry>
+               <varlistentry>
+                 <term>128</term>
+                 <listitem><para>
+                   Allow sandbox access to KVM.
+                 </para></listitem>
+               </varlistentry>
+               <varlistentry>
+                 <term>256</term>
+                 <listitem><para>
+                   Allow sandbox access to shared memory.
+                 </para></listitem>
+               </varlistentry>
+               <varlistentry>
+                 <term>512</term>
+                 <listitem><para>
+                   Allow sandbox access to all devices.
+                 </para></listitem>
+               </varlistentry>
+             </variablelist>
+
+             </para><para>
+             This was added in version 3 of this interface (available from flatpak 1.6.0 and later).
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>sandbox-a11y-own-names as</term>
+             <listitem><para>
+               An array of D-Bus names to be owned on the accessibility bus. The
+               names must have the app id as prefix.
+             </para><para>
+               Only applies when `sandbox-flags` contains access to the accessibility
+               bus as well.
+             </para><para>
+               This was added in version 7 of this interface (available from
+               flatpak 1.16.0 and later).
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>unset-env as</term>
+             <listitem><para>
+             A list of environment variables to unset (remove from the environment).
+             </para><para>
+             This was added in version 5 of this interface (available from flatpak 1.10.0 and later).
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>usr-fd h</term>
+             <listitem><para>
+               A file descriptor for the directory that will be used as
+               <filename>/usr</filename> in the new sandbox, instead of the
+               <filename>files</filename> directory
+               from the caller's Flatpak runtime.
+               The new sandbox's <filename>/etc</filename> will be based
+               on the <filename>etc</filename> subdirectory of the given
+               directory, and compatibility symlinks in its
+               root directory (<filename>/lib</filename>,
+               <filename>/bin</filename> and so on) will point into the
+               given directory. The caller's Flatpak runtime and its
+               extensions will be mounted on
+               <filename>/run/parent/usr</filename>, with filenames like
+               <filename>/run/parent/usr/bin/env</filename>,
+               and compatibility symlinks like
+               <filename>/run/parent/bin</filename> →
+               <filename>usr/bin</filename>.
+             </para><para>
+               The file descriptor must be opened with O_PATH and
+               O_NOFOLLOW and cannot be a symlink.
+             </para><para>
+               This was added in version 6 of this interface (available from
+               flatpak 1.12.0 and later).
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>app-fd h</term>
+             <listitem><para>
+               A file descriptor for the directory that will be used as
+               <filename>/app</filename> in the new sandbox, instead of the
+               <filename>files</filename> directory
+               from the caller's Flatpak app. The caller's Flatpak app
+               files and extensions will be
+               mounted on <filename>/run/parent/app</filename>, with
+               filenames like <filename>/run/parent/app/bin/myapp</filename>.
+             </para><para>
+               This option and the
+               <option>FLATPAK_SPAWN_FLAGS_EMPTY_APP</option>
+               flag are mutually exclusive.
+             </para><para>
+               The file descriptor must be opened with O_PATH and
+               O_NOFOLLOW and cannot be a symlink.
+             </para><para>
+               This was added in version 6 of this interface (available from
+               flatpak 1.12.0 and later).
+             </para></listitem>
+           </varlistentry>
+         </variablelist>
+
+    -->
+    <method name="Spawn">
+      <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
+      <arg type='ay' name='cwd_path' direction='in'/>
+      <arg type='aay' name='argv' direction='in'/>
+      <arg type='a{uh}' name='fds' direction='in'/>
+      <arg type='a{ss}' name='envs' direction='in'/>
+      <arg type='u' name='flags' direction='in'/>
+      <arg type="a{sv}" name="options" direction="in"/>
+      <arg type='u' name='pid' direction='out'/>
+    </method>
+
+    <!--
+        SpawnSignal:
+        @pid: the PID inside the container to signal
+        @signal: the signal to send (see <citerefentry><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>)
+        @to_process_group: whether to send the signal to the process group
+
+        This method lets you send a Unix signal to a process
+        that was started with org.freedesktop.portal.Flatpak.Spawn().
+        The @pid argument here should be the PID that is returned
+        by the Spawn() call: it is not necessarily valid in the caller's
+        PID namespace.
+      -->
+    <method name="SpawnSignal">
+      <arg type='u' name='pid' direction='in'/>
+      <arg type='u' name='signal' direction='in'/>
+      <arg type='b' name='to_process_group' direction='in'/>
+    </method>
+
+    <!--
+        SpawnStarted:
+        @pid: the PID of the process that has been started
+        @relpid: the PID of the process relative to the current namespace.
+        This is only non-zero if the expose PIDs flag (32) or the share
+        PIDs flag (128) was passed to
+        org.freedesktop.portal.Flatpak.Spawn(), and it may still be zero if
+        the process exits before its relative PID could be read.
+
+        Emitted when a process started by org.freedesktop.portal.Flatpak.Spawn()
+        has fully started. In other words, org.freedesktop.portal.Flatpak.Spawn() returns once the sandbox
+        has been started, and this signal is emitted once the process inside
+        itself is started.
+
+        Only emitted by version 4 of this interface (available from flatpak
+        1.8.0 and later) and if the notify start flag (64) was passed to
+        org.freedesktop.portal.Flatpak.Spawn().
+    -->
+    <signal name="SpawnStarted">
+      <arg type='u' name='pid' direction='out'/>
+      <arg type='u' name='relpid' direction='out'/>
+    </signal>
+
+    <!--
+        SpawnExited:
+        @pid: the PID of the process that has ended
+        @exit_status: the wait status (see <citerefentry><refentrytitle>waitpid</refentrytitle><manvolnum>2</manvolnum></citerefentry>)
+
+        Emitted when a process started by org.freedesktop.portal.Flatpak.Spawn()
+        exits.
+        Use g_spawn_check_exit_status(), or the macros such as
+        WIFEXITED documented in
+        <citerefentry><refentrytitle>waitpid</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
+        to interpret the @exit_status.
+
+        This signal is not emitted for processes that were not launched
+        directly by Spawn(), for example if a process launched by
+        Spawn() runs foreground or background child processes.
+    -->
+    <signal name="SpawnExited">
+      <arg type='u' name='pid' direction='out'/>
+      <arg type='u' name='exit_status' direction='out'/>
+    </signal>
+
+    <!--
+        CreateUpdateMonitor:
+        @options: Vardict with optional further information
+        @handle: Object path for the #org.freedesktop.portal.Flatpak.UpdateMonitor object
+
+        Creates an update monitor object that will emit
+        signals when an update for the caller becomes
+        available, and can be used to install it.
+
+        The handle will be of the form /org/freedesktop/portal/Flatpak/update_monitor/SENDER/TOKEN,
+        where SENDER is the caller's unique name, with the initial ':' removed and
+        all '.' replaced by '_', and TOKEN is a unique token that the caller can optionally provide
+        with the 'handle_token' key in the options vardict.
+
+        Currently, no other options are accepted.
+
+        This was added in version 2 of this interface (available from flatpak 1.5.0 and later).
+    -->
+    <method name="CreateUpdateMonitor">
+      <arg type="a{sv}" name="options" direction="in"/>
+      <arg type="o" name="handle" direction="out"/>
+    </method>
+  </interface>
+
+  <interface name="org.freedesktop.portal.Flatpak.UpdateMonitor">
+
+    <!--
+        Close:
+
+        Ends the update monitoring and cancels any ongoing
+        installation.
+    -->
+    <method name="Close">
+    </method>
+
+    <!--
+        UpdateAvailable:
+        @update_info: More information about the available update
+
+        Gets emitted when a new update is available. This is only
+        sent once with the same information, but can be sent many
+        times if new updates appear.
+
+        The following information may be included in the
+        @update_info dictionary:
+        <variablelist>
+          <varlistentry>
+            <term>running-commit s</term>
+            <listitem><para>
+              The commit of the currently running instance.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>local-commit s</term>
+            <listitem><para>
+              The commit that is currently installed. Restarting
+              the application will cause this commit to be used.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>remote-commit s</term>
+            <listitem><para>
+              The commit that is available as an update from the
+              remote. Updating the application will deploy this
+              commit.
+            </para></listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <signal name="UpdateAvailable">
+      <arg type="a{sv}" name="update_info" direction="out"/>
+    </signal>
+
+    <!--
+        Update:
+        @parent_window: Identifier for the application window,
+          see <link linkend="parent_window">Common Conventions</link>
+        @options: Vardict with optional further information
+
+        Asks to install an update of the calling app.
+        During the installation,
+        #org.freedesktop.portal.Flatpak.UpdateMonitor::Progress
+        signals will be emitted to communicate the status
+        and progress.
+
+        Note that updates are only allowed if the new version
+        has the same permissions (or less) than the currently installed
+        version. If the new version requires a new permission then the
+        operation will fail with the error org.freedesktop.DBus.Error.NotSupported
+        and updates has to be done with the system tools.
+
+        Currently, no options are accepted.
+    -->
+    <method name="Update">
+      <arg type="s" name="parent_window" direction="in"/>
+      <arg type="a{sv}" name="options" direction="in"/>
+    </method>
+
+    <!--
+      Progress:
+      @handle: the handle of the Request
+      @info: More information about the update progress
+
+      Gets emitted to indicate progress of the installation.  It's
+      undefined exactly how often this is sent, but it will be emitted
+      at least once at the end with non-zero status field. For each
+      successful operation in the update we're also guaranteed to send
+      one (and only one) signal with progress 100.
+
+      The following fields may be included in the info:
+         <variablelist>
+           <varlistentry>
+             <term>n_ops u</term>
+             <listitem><para>
+               The number of operations that the update
+               consists of.
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>op u</term>
+             <listitem><para>
+               The position of the currently active
+               operation.
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>progress u</term>
+             <listitem><para>
+               The progress of the currently active
+               operation, as a number between 0 and 100.
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>status u</term>
+             <listitem><para>
+               The overall status of the update.
+               <simplelist>
+                 <member>0: Running</member>
+                 <member>1: Empty. No update to install</member>
+                 <member>2: Done</member>
+                 <member>3: Failed</member>
+               </simplelist>
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>error s</term>
+             <listitem><para>
+               The error name, sent when status is Failed
+             </para></listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>error_message s</term>
+             <listitem><para>
+               The error message, sent when status is Failed
+             </para></listitem>
+           </varlistentry>
+         </variablelist>
+    -->
+    <signal name="Progress">
+      <arg type="a{sv}" name="info" direction="out"/>
+    </signal>
+
+  </interface>
+
+</node>
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index d4b438a4d4a255..0319d6231d4695 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -12,15 +12,14 @@ For license and copyright information please follow this link:
 #include "base/platform/base_platform_info.h"
 #include "base/platform/linux/base_linux_dbus_utilities.h"
 #include "base/platform/linux/base_linux_xdp_utilities.h"
-#include "ui/platform/ui_platform_window_title.h"
+#include "base/platform/linux/base_linux_app_launch_context.h"
 #include "lang/lang_keys.h"
-#include "mainwindow.h"
-#include "storage/localstorage.h"
 #include "core/launcher.h"
 #include "core/sandbox.h"
 #include "core/application.h"
-#include "core/core_settings.h"
 #include "core/update_checker.h"
+#include "core/version.h"
+#include "data/data_location.h"
 #include "window/window_controller.h"
 #include "webview/platform/linux/webview_linux_webkitgtk.h"
 
@@ -30,6 +29,7 @@ For license and copyright information please follow this link:
 
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QSystemTrayIcon>
+#include <QtGui/QDesktopServices>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QProcess>
 
@@ -38,6 +38,7 @@ For license and copyright information please follow this link:
 
 #include <xdgdbus/xdgdbus.hpp>
 #include <xdpbackground/xdpbackground.hpp>
+#include <xdpopenuri/xdpopenuri.hpp>
 #include <xdprequest/xdprequest.hpp>
 
 #include <sys/stat.h>
@@ -48,8 +49,6 @@ For license and copyright information please follow this link:
 #include <dirent.h>
 #include <pwd.h>
 
-#include <iostream>
-
 namespace {
 
 using namespace gi::repository;
@@ -262,7 +261,7 @@ bool GenerateDesktopFile(
 		-1,
 		GLib::KeyFileFlags::KEEP_COMMENTS_
 			| GLib::KeyFileFlags::KEEP_TRANSLATIONS_);
-	
+
 	if (!loaded) {
 		if (!silent) {
 			LOG(("App Error: %1").arg(loaded.error().message_().c_str()));
@@ -472,7 +471,10 @@ void InstallLauncher() {
 		"DESKTOPINTEGRATION");
 
 	// don't update desktop file for alpha version or if updater is disabled
-	if (cAlphaVersion() || Core::UpdaterDisabled() || DisabledByEnv) {
+	if (cAlphaVersion()
+			|| Core::UpdaterDisabled()
+			|| KSandbox::isInside()
+			|| DisabledByEnv) {
 		return;
 	}
 
@@ -485,29 +487,100 @@ void InstallLauncher() {
 	const auto icons = QStandardPaths::writableLocation(
 		QStandardPaths::GenericDataLocation) + u"/icons/"_q;
 
-	if (!QDir(icons).exists()) QDir().mkpath(icons);
+	const auto appIcons = icons + u"/hicolor/256x256/apps/"_q;
+	if (!QDir(appIcons).exists()) QDir().mkpath(appIcons);
 
-	const auto icon = icons + base::IconName() + u".png"_q;
+	const auto icon = appIcons + ApplicationIconName() + u".png"_q;
 	QFile::remove(icon);
+	QFile::remove(icons + u"telegram.png"_q);
 	if (QFile::copy(u":/gui/art/logo_256.png"_q, icon)) {
 		DEBUG_LOG(("App Info: Icon copied to '%1'").arg(icon));
 	}
 
+	const auto symbolicIcons = icons + u"/hicolor/symbolic/apps/"_q;
+	if (!QDir().exists(symbolicIcons)) QDir().mkpath(symbolicIcons);
+
+	const auto monochromeIcons = {
+		QString(),
+		u"attention"_q,
+		u"mute"_q,
+	};
+
+	for (const auto &icon : monochromeIcons) {
+		QFile::copy(
+			u":/gui/icons/tray/monochrome%1.svg"_q.arg(
+				!icon.isEmpty() ? u"_"_q + icon : QString()),
+			symbolicIcons
+				+ ApplicationIconName()
+				+ (!icon.isEmpty() ? u"-"_q + icon : QString())
+				+ u"-symbolic.svg"_q);
+	}
+
 	QProcess::execute("update-desktop-database", {
 		applicationsPath
 	});
 }
 
-[[nodiscard]] QByteArray HashForSocketPath(const QByteArray &data) {
+[[nodiscard]] QByteArray HashForSocketPath() {
 	constexpr auto kHashForSocketPathLength = 24;
 
-	const auto binary = openssl::Sha256(bytes::make_span(data));
+	const auto binary = openssl::Sha256(
+		bytes::make_span(Core::Launcher::Instance().instanceHash()));
 	const auto base64 = QByteArray(
 		reinterpret_cast<const char*>(binary.data()),
 		binary.size()).toBase64(QByteArray::Base64UrlEncoding);
 	return base64.mid(0, kHashForSocketPathLength);
 }
 
+void AppInfoCheckScheme(
+		const std::string &scheme,
+		Fn<void(Gio::AppInfo, Fn<void()>)> callback,
+		Fn<void()> fail) {
+	// TODO: use get_default_for_uri_scheme_async once we can use GLib 2.74
+	if (auto appInfo = Gio::AppInfo::get_default_for_uri_scheme(scheme)) {
+		callback(appInfo, fail);
+		return;
+	}
+	fail();
+}
+
+void PortalCheckScheme(
+		const std::string &scheme,
+		Fn<void(Fn<void()>)> callback,
+		Fn<void()> fail) {
+	XdpOpenURI::OpenURIProxy::new_for_bus(
+		Gio::BusType::SESSION_,
+		Gio::DBusProxyFlags::NONE_,
+		base::Platform::XDP::kService,
+		base::Platform::XDP::kObjectPath,
+		[=](GObject::Object, Gio::AsyncResult res) {
+			auto interface = XdpOpenURI::OpenURI(
+				XdpOpenURI::OpenURIProxy::new_for_bus_finish(res, nullptr));
+
+			if (!interface) {
+				fail();
+				return;
+			}
+
+			interface.call_scheme_supported(
+				scheme,
+				GLib::Variant::new_array(
+					GLib::VariantType::new_("{sv}"),
+					{}),
+				[=](GObject::Object, Gio::AsyncResult res) mutable {
+					const auto result
+						= interface.call_scheme_supported_finish(res);
+
+					if (!result || !std::get<1>(*result)) {
+						fail();
+						return;
+					}
+
+					callback(fail);
+				});
+		});
+}
+
 } // namespace
 
 namespace Platform {
@@ -536,7 +609,13 @@ QString SingleInstanceLocalServerName(const QString &hash) {
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 std::optional<bool> IsDarkMode() {
-	return std::nullopt;
+	auto result = base::Platform::XDP::ReadSetting(
+		"org.freedesktop.appearance",
+		"color-scheme");
+
+	return result.has_value()
+		? std::make_optional(result->get_uint32() == 1)
+		: std::nullopt;
 }
 #endif // Qt < 6.5.0
 
@@ -594,15 +673,6 @@ bool SkipTaskbarSupported() {
 	return false;
 }
 
-bool RunInBackground() {
-	using Ui::Platform::TitleControl;
-	const auto layout = Ui::Platform::TitleControlsLayout();
-	return (ranges::contains(layout.left, TitleControl::Close)
-		|| ranges::contains(layout.right, TitleControl::Close))
-		&& !ranges::contains(layout.left, TitleControl::Minimize)
-		&& !ranges::contains(layout.right, TitleControl::Minimize);
-}
-
 QString ExecutablePathForShortcuts() {
 	if (Core::UpdaterDisabled()) {
 		const auto &arguments = Core::Launcher::Instance().arguments();
@@ -660,10 +730,6 @@ int psFixPrevious() {
 namespace Platform {
 
 void start() {
-	const auto d = QFile::encodeName(QDir(cWorkingDir()).absolutePath());
-	char h[33] = { 0 };
-	hashMd5Hex(d.constData(), d.size(), h);
-
 	QGuiApplication::setDesktopFileName([&] {
 		if (KSandbox::isFlatpak()) {
 			return qEnvironmentVariable("FLATPAK_ID");
@@ -676,18 +742,8 @@ void start() {
 		}
 
 		if (!Core::UpdaterDisabled()) {
-			QByteArray md5Hash(h);
-			if (!Core::Launcher::Instance().customWorkingDir()) {
-				const auto exePath = QFile::encodeName(
-					cExeDir() + cExeName());
-
-				hashMd5Hex(
-					exePath.constData(),
-					exePath.size(),
-					md5Hash.data());
-			}
-
-			return u"org.telegram.desktop._%1"_q.arg(md5Hash.constData());
+			return u"org.telegram.desktop._%1"_q.arg(
+				Core::Launcher::Instance().instanceHash().constData());
 		}
 
 		return u"org.telegram.desktop"_q;
@@ -701,16 +757,17 @@ void start() {
 	}
 
 	qputenv("PULSE_PROP_application.name", AppName.utf8());
-	qputenv("PULSE_PROP_application.icon_name", base::IconName().toLatin1());
+	qputenv(
+		"PULSE_PROP_application.icon_name",
+		ApplicationIconName().toUtf8());
 
 	GLib::set_prgname(cExeName().toStdString());
 	GLib::set_application_name(AppName.data());
 
-	Webview::WebKitGTK::SetSocketPath(u"%1/%2-%3-webview-%4"_q.arg(
+	Webview::WebKitGTK::SetSocketPath(u"%1/%2-%3-webview-{}"_q.arg(
 		QDir::tempPath(),
-		HashForSocketPath(d),
-		u"TD"_q,//QCoreApplication::applicationName(), - make path smaller.
-		u"%1"_q).toStdString());
+		HashForSocketPath(),
+		u"TD"_q).toStdString());
 
 	InstallLauncher();
 }
@@ -754,16 +811,30 @@ bool OpenSystemSettings(SystemSettingsType type) {
 		add("pavucontrol");
 		add("alsamixergui");
 		return ranges::any_of(options, [](const Command &command) {
-			return QProcess::startDetached(
-				command.command,
-				command.arguments);
+			QProcess process;
+			if (KSandbox::isInside()) {
+				process.setProgram("which");
+				process.setArguments({command.command});
+				KSandbox::startHostProcess(process);
+				process.waitForFinished();
+				if (process.exitStatus() != QProcess::NormalExit
+						|| process.exitCode() != 0) {
+					return false;
+				}
+			}
+			process.setProgram(command.command);
+			process.setArguments(command.arguments);
+			const auto hostContext = KSandbox::makeHostContext(process);
+			process.setProgram(hostContext.program);
+			process.setArguments(hostContext.arguments);
+			return process.startDetached();
 		});
 	}
 	return true;
 }
 
 void NewVersionLaunched(int oldVersion) {
-	if (oldVersion <= 4001001 && cAutoStart()) {
+	if (oldVersion <= 5014003 && cAutoStart()) {
 		AutostartToggle(true);
 	}
 }
@@ -772,6 +843,37 @@ QImage DefaultApplicationIcon() {
 	return Window::Logo();
 }
 
+QString ApplicationIconName() {
+	static const auto Result = KSandbox::isSnap()
+		? u"snap.%1."_q.arg(qEnvironmentVariable("SNAP_INSTANCE_NAME"))
+		: QGuiApplication::desktopFileName().remove(
+		u"._"_q + Core::Launcher::Instance().instanceHash());
+	return Result;
+}
+
+void LaunchMaps(const Data::LocationPoint &point, Fn<void()> fail) {
+	const auto url = QUrl(
+		u"geo:%1,%2"_q.arg(point.latAsString(), point.lonAsString()));
+
+	AppInfoCheckScheme(url.scheme().toStdString(), [=](
+			Gio::AppInfo appInfo,
+			Fn<void()> fail) {
+		// TODO: use launch_uris_async once we can use GLib 2.60
+		if (!appInfo.launch_uris(
+				{ url.toString().toStdString() },
+				base::Platform::AppLaunchContext(),
+				nullptr)) {
+			fail();
+		}
+	}, [=] {
+		PortalCheckScheme(url.scheme().toStdString(), [=](Fn<void()> fail) {
+			if (!QDesktopServices::openUrl(url)) {
+				fail();
+			}
+		}, fail);
+	});
+}
+
 namespace ThirdParty {
 
 void start() {
@@ -829,7 +931,3 @@ bool linuxMoveFile(const char *from, const char *to) {
 
 	return true;
 }
-
-bool psLaunchMaps(const Data::LocationPoint &point) {
-	return false;
-}
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.h b/Telegram/SourceFiles/platform/linux/specific_linux.h
index e5e40cd2e1f8a2..ae3c4670c0cb99 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.h
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.h
@@ -9,10 +9,6 @@ For license and copyright information please follow this link:
 
 #include "platform/platform_specific.h"
 
-namespace Data {
-class LocationPoint;
-} // namespace Data
-
 namespace Platform {
 
 inline void IgnoreApplicationActivationRightNow() {
@@ -60,5 +56,3 @@ inline void psDownloadPathEnableAccess() {
 }
 
 bool linuxMoveFile(const char *from, const char *to);
-
-bool psLaunchMaps(const Data::LocationPoint &point);
diff --git a/Telegram/SourceFiles/platform/linux/text_recognition_linux.h b/Telegram/SourceFiles/platform/linux/text_recognition_linux.h
new file mode 100644
index 00000000000000..d2d05be5871f0e
--- /dev/null
+++ b/Telegram/SourceFiles/platform/linux/text_recognition_linux.h
@@ -0,0 +1,24 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "platform/platform_text_recognition.h"
+
+namespace Platform {
+namespace TextRecognition {
+
+inline bool IsAvailable() {
+	return false;
+}
+
+inline Result RecognizeText(const QImage &image) {
+	return {};
+}
+
+} // namespace TextRecognition
+} // namespace Platform
\ No newline at end of file
diff --git a/Telegram/SourceFiles/platform/linux/translate_provider_linux.cpp b/Telegram/SourceFiles/platform/linux/translate_provider_linux.cpp
new file mode 100644
index 00000000000000..acf8279100d273
--- /dev/null
+++ b/Telegram/SourceFiles/platform/linux/translate_provider_linux.cpp
@@ -0,0 +1,90 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "platform/linux/translate_provider_linux.h"
+
+#include "spellcheck/platform/platform_language.h"
+
+#include <QtCore/QStandardPaths>
+#include <QtCore/QProcess>
+#include <QtGui/QTextDocument>
+#include <ksandbox.h>
+
+namespace Platform {
+namespace {
+
+[[nodiscard]] QString Command() {
+	const auto commands = {
+		u"crow"_q,
+		u"org.kde.CrowTranslate"_q,
+	};
+	const auto it = ranges::find_if(commands, [](const auto &command) {
+		if (KSandbox::isInside()) {
+			QProcess process;
+			process.setProgram("which");
+			process.setArguments({command});
+			KSandbox::startHostProcess(process);
+			process.waitForFinished();
+			return process.exitStatus() == QProcess::NormalExit
+				&& process.exitCode() == 0;
+		}
+		return !QStandardPaths::findExecutable(command).isEmpty();
+	});
+	return it != end(commands) ? *it : QString();
+}
+
+class TranslateProvider final : public QObject, public Ui::TranslateProvider {
+public:
+	[[nodiscard]] bool supportsMessageId() const override {
+		return false;
+	}
+
+	void request(
+			Ui::TranslateProviderRequest request,
+			LanguageId to,
+			Fn<void(Ui::TranslateProviderResult)> done) override {
+		const auto from = Platform::Language::Recognize(request.text.text);
+		const auto process = QPointer(new QProcess(this));
+		process->setProgram(Command());
+		process->setArguments(
+			QStringList{ u"-i"_q, u"-b"_q, u"-t"_q, to.twoLetterCode() }
+				+ (from.known()
+					? QStringList{ u"-s"_q, from.twoLetterCode() }
+					: QStringList()));
+		connect(process, &QProcess::finished, this, [=] {
+			_document.setHtml(process->readAllStandardOutput());
+			const auto text = _document.toPlainText();
+			done(!text.isEmpty()
+				? Ui::TranslateProviderResult{
+					.text = TextWithEntities{ .text = text },
+				}
+				: Ui::TranslateProviderResult{
+					.error = Ui::TranslateProviderError::Unknown,
+				}
+			);
+			delete process;
+		});
+		KSandbox::startHostProcess(*process);
+		process->write(request.text.text.toUtf8());
+		process->closeWriteChannel();
+	}
+
+private:
+	QTextDocument _document;
+};
+
+} // namespace
+
+std::unique_ptr<Ui::TranslateProvider> CreateTranslateProvider() {
+	return std::make_unique<TranslateProvider>();
+}
+
+bool IsTranslateProviderAvailable() {
+	return !Command().isEmpty();
+}
+
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/translate_provider_linux.h b/Telegram/SourceFiles/platform/linux/translate_provider_linux.h
new file mode 100644
index 00000000000000..8e7ad9a263d9ec
--- /dev/null
+++ b/Telegram/SourceFiles/platform/linux/translate_provider_linux.h
@@ -0,0 +1,10 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "platform/platform_translate_provider.h"
diff --git a/Telegram/SourceFiles/platform/linux/tray_linux.cpp b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
index 2d0e23aecfb4b8..c12a573833f922 100644
--- a/Telegram/SourceFiles/platform/linux/tray_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 #include "base/platform/linux/base_linux_dbus_utilities.h"
 #include "core/application.h"
 #include "core/sandbox.h"
+#include "core/version.h"
 #include "platform/platform_specific.h"
 #include "ui/ui_utility.h"
 #include "ui/widgets/popup_menu.h"
@@ -30,11 +31,11 @@ namespace {
 using namespace gi::repository;
 
 [[nodiscard]] QString PanelIconName(int counter, bool muted) {
-	return (counter > 0)
+	return ApplicationIconName() + ((counter > 0)
 		? (muted
-			? u"telegram-mute-panel"_q
-			: u"telegram-attention-panel"_q)
-		: u"telegram-panel"_q;
+			? u"-mute"_q
+			: u"-attention"_q)
+		: QString()) + u"-symbolic"_q;
 }
 
 } // namespace
@@ -44,74 +45,58 @@ class IconGraphic final {
 	explicit IconGraphic();
 	~IconGraphic();
 
-	[[nodiscard]] bool isRefreshNeeded(
-		const QIcon &systemIcon,
-		const QString &iconThemeName,
-		int counter,
-		bool muted) const;
-	[[nodiscard]] QIcon systemIcon(
-		const QString &iconThemeName,
-		bool monochrome,
-		int counter,
-		bool muted) const;
-	[[nodiscard]] QIcon trayIcon(
-		const QIcon &systemIcon,
-		const QString &iconThemeName,
-		bool monochrome,
-		int counter,
-		bool muted);
+	void updateState();
+	[[nodiscard]] bool isRefreshNeeded() const;
+	[[nodiscard]] QIcon trayIcon();
 
 private:
+	struct State {
+		QIcon systemIcon;
+		QString iconThemeName;
+		bool monochrome = false;
+		int32 counter = 0;
+		bool muted = false;
+	};
+
+	[[nodiscard]] QIcon systemIcon() const;
+	[[nodiscard]] bool isCounterNeeded(const State &state) const;
 	[[nodiscard]] int counterSlice(int counter) const;
-	void updateIconRegenerationNeeded(
-		const QIcon &icon,
-		const QIcon &systemIcon,
-		const QString &iconThemeName,
-		bool monochrome,
-		int counter,
-		bool muted);
 	[[nodiscard]] QSize dprSize(const QImage &image) const;
 
 	const int _iconSizes[7];
 
-	bool _muted = true;
-	int32 _count = 0;
 	base::flat_map<int, QImage> _imageBack;
 	QIcon _trayIcon;
-	QIcon _systemIcon;
-	QString _themeName;
-	bool _monochrome;
+	State _current;
+	State _new;
 
 };
 
 IconGraphic::IconGraphic()
 : _iconSizes{ 16, 22, 32, 48, 64, 128, 256 } {
+	updateState();
 }
 
 IconGraphic::~IconGraphic() = default;
 
-QIcon IconGraphic::systemIcon(
-		const QString &iconThemeName,
-		bool monochrome,
-		int counter,
-		bool muted) const {
-	if (iconThemeName == _themeName
-		&& monochrome == _monochrome
-		&& (counter > 0) == (_count > 0)
-		&& muted == _muted) {
-		return _systemIcon;
+QIcon IconGraphic::systemIcon() const {
+	if (_new.iconThemeName == _current.iconThemeName
+		&& _new.monochrome == _current.monochrome
+		&& (_new.counter > 0) == (_current.counter > 0)
+		&& _new.muted == _current.muted) {
+		return _current.systemIcon;
 	}
 
 	const auto candidates = {
-		monochrome ? PanelIconName(counter, muted) : QString(),
-		base::IconName(),
+		_new.monochrome ? PanelIconName(_new.counter, _new.muted) : QString(),
+		ApplicationIconName(),
 	};
 
 	for (const auto &candidate : candidates) {
 		if (candidate.isEmpty()) {
 			continue;
 		}
-		const auto icon = QIcon::fromTheme(candidate);
+		const auto icon = QIcon::fromTheme(candidate, QIcon());
 		if (icon.name() == candidate) {
 			return icon;
 		}
@@ -120,80 +105,69 @@ QIcon IconGraphic::systemIcon(
 	return QIcon();
 }
 
+bool IconGraphic::isCounterNeeded(const State &state) const {
+	return state.systemIcon.name() != PanelIconName(
+		state.counter,
+		state.muted);
+}
 
 int IconGraphic::counterSlice(int counter) const {
-	return (counter >= 1000)
-		? (1000 + (counter % 100))
+	return (counter >= 100)
+		? (100 + (counter % 10))
 		: counter;
 }
 
-bool IconGraphic::isRefreshNeeded(
-		const QIcon &systemIcon,
-		const QString &iconThemeName,
-		int counter,
-		bool muted) const {
-	return _trayIcon.isNull()
-		|| iconThemeName != _themeName
-		|| systemIcon.name() != _systemIcon.name()
-		|| (systemIcon.name() != PanelIconName(counter, muted)
-			? muted != _muted || counterSlice(counter) != _count
-			: false);
+QSize IconGraphic::dprSize(const QImage &image) const {
+	return image.size() / image.devicePixelRatio();
 }
 
-void IconGraphic::updateIconRegenerationNeeded(
-		const QIcon &icon,
-		const QIcon &systemIcon,
-		const QString &iconThemeName,
-		bool monochrome,
-		int counter,
-		bool muted) {
-	_trayIcon = icon;
-	_systemIcon = systemIcon;
-	_themeName = iconThemeName;
-	_monochrome = monochrome;
-	_count = counterSlice(counter);
-	_muted = muted;
+void IconGraphic::updateState() {
+	_new.iconThemeName = QIcon::themeName();
+	_new.monochrome = Core::App().settings().trayIconMonochrome();
+	_new.counter = Core::App().unreadBadge();
+	_new.muted = Core::App().unreadBadgeMuted();
+	_new.systemIcon = systemIcon();
 }
 
-QSize IconGraphic::dprSize(const QImage &image) const {
-	return image.size() / image.devicePixelRatio();
+bool IconGraphic::isRefreshNeeded() const {
+	return _trayIcon.isNull()
+		|| _new.iconThemeName != _current.iconThemeName
+		|| _new.systemIcon.name() != _current.systemIcon.name()
+		|| (isCounterNeeded(_new)
+			? _new.muted != _current.muted
+				|| counterSlice(_new.counter) != counterSlice(
+						_current.counter)
+			: false);
 }
 
-QIcon IconGraphic::trayIcon(
-		const QIcon &systemIcon,
-		const QString &iconThemeName,
-		bool monochrome,
-		int counter,
-		bool muted) {
-	if (!isRefreshNeeded(systemIcon, iconThemeName, counter, muted)) {
+QIcon IconGraphic::trayIcon() {
+	if (!isRefreshNeeded()) {
 		return _trayIcon;
 	}
 
-	if (systemIcon.name() == PanelIconName(counter, muted)) {
-		updateIconRegenerationNeeded(
-			systemIcon,
-			systemIcon,
-			iconThemeName,
-			monochrome,
-			counter,
-			muted);
+	const auto guard = gsl::finally([&] {
+		_current = _new;
+	});
 
-		return systemIcon;
+	if (!isCounterNeeded(_new)) {
+		_trayIcon = _new.systemIcon;
+		return _trayIcon;
 	}
 
 	QIcon result;
-
 	for (const auto iconSize : _iconSizes) {
 		auto &currentImageBack = _imageBack[iconSize];
 		const auto desiredSize = QSize(iconSize, iconSize);
 
 		if (currentImageBack.isNull()
-			|| iconThemeName != _themeName
-			|| systemIcon.name() != _systemIcon.name()) {
-			if (!systemIcon.isNull()) {
+			|| _new.iconThemeName != _current.iconThemeName
+			|| _new.systemIcon.name() != _current.systemIcon.name()) {
+			currentImageBack = {};
+
+			if (!_new.systemIcon.isNull()) {
 				// We can't use QIcon::actualSize here
 				// since it works incorrectly with svg icon themes
-				currentImageBack = systemIcon
+				currentImageBack = _new.systemIcon
 					.pixmap(desiredSize)
 					.toImage();
 
@@ -202,7 +176,8 @@ QIcon IconGraphic::trayIcon(
 				// if current icon theme is not a svg one, Qt can return
 				// a pixmap that less in size even if there are a bigger one
 				if (firstAttemptSize.width() < desiredSize.width()) {
-					const auto availableSizes = systemIcon.availableSizes();
+					const auto availableSizes
+						= _new.systemIcon.availableSizes();
 
 					const auto biggestSize = ranges::max_element(
 						availableSizes,
@@ -210,12 +185,14 @@ QIcon IconGraphic::trayIcon(
 						&QSize::width);
 
 					if (biggestSize->width() > firstAttemptSize.width()) {
-						currentImageBack = systemIcon
+						currentImageBack = _new.systemIcon
 							.pixmap(*biggestSize)
 							.toImage();
 					}
 				}
-			} else {
+			}
+
+			if (currentImageBack.isNull()) {
 				currentImageBack = Window::Logo();
 			}
 
@@ -227,24 +204,17 @@ QIcon IconGraphic::trayIcon(
 			}
 		}
 
-		result.addPixmap(Ui::PixmapFromImage(counter > 0
+		result.addPixmap(Ui::PixmapFromImage(_new.counter > 0
 			? Window::WithSmallCounter(std::move(currentImageBack), {
 				.size = iconSize,
-				.count = counter,
-				.bg = muted ? st::trayCounterBgMute : st::trayCounterBg,
+				.count = _new.counter,
+				.bg = _new.muted ? st::trayCounterBgMute : st::trayCounterBg,
 				.fg = st::trayCounterFg,
 			}) : std::move(currentImageBack)));
 	}
 
-	updateIconRegenerationNeeded(
-		result,
-		systemIcon,
-		iconThemeName,
-		monochrome,
-		counter,
-		muted);
-
-	return result;
+	_trayIcon = result;
+	return _trayIcon;
 }
 
 class TrayEventFilter final : public QObject {
@@ -314,38 +284,24 @@ void Tray::createIcon() {
 			_iconGraphic = std::make_unique<IconGraphic>();
 		}
 
-		const auto showXEmbed = [=] {
+		const auto showCustom = [=] {
 			_aboutToShowRequests.fire({});
-			InvokeQueued(_menuXEmbed.get(), [=] {
-				_menuXEmbed->popup(QCursor::pos());
+			InvokeQueued(_menuCustom.get(), [=] {
+				_menuCustom->popup(QCursor::pos());
 			});
 		};
 
-		const auto iconThemeName = QIcon::themeName();
-		const auto monochrome = Core::App().settings().trayIconMonochrome();
-		const auto counter = Core::App().unreadBadge();
-		const auto muted = Core::App().unreadBadgeMuted();
-
 		_icon = base::make_unique_q<QSystemTrayIcon>(nullptr);
-		_icon->setIcon(_iconGraphic->trayIcon(
-			_iconGraphic->systemIcon(
-				iconThemeName,
-				monochrome,
-				counter,
-				muted),
-			iconThemeName,
-			monochrome,
-			counter,
-			muted));
+		_icon->setIcon(_iconGraphic->trayIcon());
 		_icon->setToolTip(AppName.utf16());
 
 		using Reason = QSystemTrayIcon::ActivationReason;
 		base::qt_signal_producer(
 			_icon.get(),
 			&QSystemTrayIcon::activated
-		) | rpl::start_with_next([=](Reason reason) {
+		) | rpl::on_next([=](Reason reason) {
 			if (reason == QSystemTrayIcon::Context) {
-				showXEmbed();
+				showCustom();
 			} else {
 				_iconClicks.fire({});
 			}
@@ -357,8 +313,8 @@ void Tray::createIcon() {
 			_eventFilter = base::make_unique_q<TrayEventFilter>(
 				QCoreApplication::instance());
 			_eventFilter->contextMenuFilters(
-			) | rpl::start_with_next([=] {
-				showXEmbed();
+			) | rpl::on_next([=] {
+				showCustom();
 			}, _lifetime);
 		}
 	}
@@ -375,27 +331,10 @@ void Tray::updateIcon() {
 	if (!_icon || !_iconGraphic) {
 		return;
 	}
-	const auto counter = Core::App().unreadBadge();
-	const auto muted = Core::App().unreadBadgeMuted();
-	const auto monochrome = Core::App().settings().trayIconMonochrome();
-	const auto iconThemeName = QIcon::themeName();
-	const auto systemIcon = _iconGraphic->systemIcon(
-		iconThemeName,
-		monochrome,
-		counter,
-		muted);
-
-	if (_iconGraphic->isRefreshNeeded(
-		systemIcon,
-		iconThemeName,
-		counter,
-		muted)) {
-		_icon->setIcon(_iconGraphic->trayIcon(
-			systemIcon,
-			iconThemeName,
-			monochrome,
-			counter,
-			muted));
+
+	_iconGraphic->updateState();
+	if (_iconGraphic->isRefreshNeeded()) {
+		_icon->setIcon(_iconGraphic->trayIcon());
 	}
 }
 
@@ -403,14 +342,14 @@ void Tray::createMenu() {
 	if (!_menu) {
 		_menu = base::make_unique_q<QMenu>(nullptr);
 	}
-	if (!_menuXEmbed) {
-		_menuXEmbed = base::make_unique_q<Ui::PopupMenu>(nullptr);
-		_menuXEmbed->deleteOnHide(false);
+	if (!_menuCustom) {
+		_menuCustom = base::make_unique_q<Ui::PopupMenu>(nullptr);
+		_menuCustom->deleteOnHide(false);
 	}
 }
 
 void Tray::destroyMenu() {
-	_menuXEmbed = nullptr;
+	_menuCustom = nullptr;
 	if (_menu) {
 		_menu->clear();
 	}
@@ -418,12 +357,12 @@ void Tray::destroyMenu() {
 }
 
 void Tray::addAction(rpl::producer<QString> text, Fn<void()> &&callback) {
-	if (_menuXEmbed) {
-		const auto XEAction = _menuXEmbed->addAction(QString(), callback);
+	if (_menuCustom) {
+		const auto action = _menuCustom->addAction(QString(), callback);
 		rpl::duplicate(
 			text
-		) | rpl::start_with_next([=](const QString &text) {
-			XEAction->setText(text);
+		) | rpl::on_next([=](const QString &text) {
+			action->setText(text);
 		}, _actionsLifetime);
 	}
 
@@ -431,7 +370,7 @@ void Tray::addAction(rpl::producer<QString> text, Fn<void()> &&callback) {
 		const auto action = _menu->addAction(QString(), std::move(callback));
 		std::move(
 			text
-		) | rpl::start_with_next([=](const QString &text) {
+		) | rpl::on_next([=](const QString &text) {
 			action->setText(text);
 		}, _actionsLifetime);
 	}
@@ -449,7 +388,7 @@ rpl::producer<> Tray::aboutToShowRequests() const {
 		_aboutToShowRequests.events(),
 		_menu
 			? base::qt_signal_producer(_menu.get(), &QMenu::aboutToShow)
-			: rpl::never<>() | rpl::type_erased());
+			: rpl::never<>() | rpl::type_erased);
 }
 
 rpl::producer<> Tray::showFromTrayRequests() const {
diff --git a/Telegram/SourceFiles/platform/linux/tray_linux.h b/Telegram/SourceFiles/platform/linux/tray_linux.h
index 712592777076aa..181de22b983710 100644
--- a/Telegram/SourceFiles/platform/linux/tray_linux.h
+++ b/Telegram/SourceFiles/platform/linux/tray_linux.h
@@ -60,7 +60,7 @@ class Tray final {
 
 	base::unique_qptr<QSystemTrayIcon> _icon;
 	base::unique_qptr<QMenu> _menu;
-	base::unique_qptr<Ui::PopupMenu> _menuXEmbed;
+	base::unique_qptr<Ui::PopupMenu> _menuCustom;
 
 	base::unique_qptr<TrayEventFilter> _eventFilter;
 
diff --git a/Telegram/SourceFiles/platform/linux/webauthn_linux.cpp b/Telegram/SourceFiles/platform/linux/webauthn_linux.cpp
new file mode 100644
index 00000000000000..470596117fc9c2
--- /dev/null
+++ b/Telegram/SourceFiles/platform/linux/webauthn_linux.cpp
@@ -0,0 +1,29 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+
+#include "platform/platform_webauthn.h"
+
+namespace Platform::WebAuthn {
+
+bool IsSupported() {
+	return false;
+}
+
+void RegisterKey(
+		const Data::Passkey::RegisterData &data,
+		Fn<void(RegisterResult result)> callback) {
+	callback({});
+}
+
+void Login(
+		const Data::Passkey::LoginData &data,
+		Fn<void(LoginResult result)> callback) {
+	callback({});
+}
+
+} // namespace Platform::WebAuthn
diff --git a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
index 1447454dec5624..e53481d4d2bba9 100644
--- a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
@@ -302,7 +302,6 @@ - (BOOL) panel:(id)sender shouldEnableURL:(NSURL *)url {
 	NSNumber *isDirectory;
 	if ([url getResourceValue:&isDirectory forKey:NSURLIsDirectoryKey error:nil] && isDirectory != nil && [isDirectory boolValue]) {
 		if (onlyRecommended) {
-			CFStringRef ext = CFURLCopyPathExtension((CFURLRef)url);
 			NSNumber *isPackage;
 			if ([url getResourceValue:&isPackage forKey:NSURLIsPackageKey error:nil] && isPackage != nil && [isPackage boolValue]) {
 				return [self isRecommended:url];
diff --git a/Telegram/SourceFiles/platform/mac/global_menu_mac.h b/Telegram/SourceFiles/platform/mac/global_menu_mac.h
new file mode 100644
index 00000000000000..4e946908a9bfe8
--- /dev/null
+++ b/Telegram/SourceFiles/platform/mac/global_menu_mac.h
@@ -0,0 +1,22 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+struct MarkdownEnabledState;
+} // namespace Ui
+
+namespace Platform {
+
+void CreateGlobalMenu();
+void DestroyGlobalMenu();
+void RequestUpdateGlobalMenu();
+
+[[nodiscard]] rpl::producer<Ui::MarkdownEnabledState> GlobalMenuMarkdownState();
+
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/global_menu_mac.mm b/Telegram/SourceFiles/platform/mac/global_menu_mac.mm
new file mode 100644
index 00000000000000..bafcca0e65562f
--- /dev/null
+++ b/Telegram/SourceFiles/platform/mac/global_menu_mac.mm
@@ -0,0 +1,674 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "platform/mac/global_menu_mac.h"
+
+#include "core/application.h"
+#include "core/sandbox.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "window/main_window.h"
+#include "main/main_session.h"
+#include "history/history_inner_widget.h"
+#include "boxes/peer_list_controllers.h"
+#include "boxes/about_box.h"
+#include "lang/lang_keys.h"
+#include "base/platform/base_platform_info.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/fields/input_field.h"
+#include "base/invoke_queued.h"
+
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QTextEdit>
+#include <QtGui/QAction>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QClipboard>
+
+#include <Cocoa/Cocoa.h>
+
+namespace Platform {
+namespace {
+
+struct ComputedState {
+	bool logoutDisabled = false;
+	bool undoDisabled = false;
+	bool redoDisabled = false;
+	bool cutDisabled = false;
+	bool copyDisabled = false;
+	bool pasteDisabled = false;
+	bool deleteDisabled = false;
+	bool selectAllDisabled = false;
+	bool contactsDisabled = false;
+	bool addContactDisabled = false;
+	bool newGroupDisabled = false;
+	bool newChannelDisabled = false;
+	bool showTelegramDisabled = false;
+	Ui::MarkdownEnabledState markdown;
+
+	friend inline bool operator==(
+		const ComputedState &,
+		const ComputedState &) = default;
+};
+
+class Manager final {
+public:
+	void create();
+	void destroy();
+	void requestUpdate();
+	[[nodiscard]] auto markdownStateChanges() const
+		-> rpl::producer<Ui::MarkdownEnabledState>;
+
+private:
+	void buildMenu();
+	void buildAppleMenu(QMenu *main);
+	void buildFileMenu(QMenu *file);
+	void buildEditMenu(QMenu *edit);
+	void buildWindowMenu(QMenu *window);
+	void retranslate();
+	void ensureLanguageBound();
+	void recomputeState();
+	[[nodiscard]] bool clipboardHasText();
+	[[nodiscard]] Window::Controller *resolveActiveWindow() const;
+
+	template <typename Callback>
+	void withActiveWindow(Callback callback) {
+		const auto window = resolveActiveWindow();
+		if (!window) {
+			return;
+		}
+		if (window->widget()->isHidden()) {
+			window->widget()->showFromTray();
+		} else {
+			window->activate();
+		}
+		callback(window);
+	}
+
+	std::unique_ptr<QMenuBar> _menuBar;
+	// Coalesces requestUpdate() bursts into one recomputeState() per Qt
+	// event-loop turn. Posted events drain on every CFRunLoop
+	// BeforeWaiting before the next NSEvent dispatches, so menu state
+	// is fresh by the time Cmd+C reaches AppKit's performKeyEquivalent.
+	std::unique_ptr<SingleQueuedInvokation> _scheduledUpdate;
+	QAction *_logout = nullptr;
+	QAction *_undo = nullptr;
+	QAction *_redo = nullptr;
+	QAction *_cut = nullptr;
+	QAction *_copy = nullptr;
+	QAction *_paste = nullptr;
+	QAction *_delete = nullptr;
+	QAction *_selectAll = nullptr;
+	QAction *_contacts = nullptr;
+	QAction *_addContact = nullptr;
+	QAction *_newGroup = nullptr;
+	QAction *_newChannel = nullptr;
+	QAction *_showTelegram = nullptr;
+	QAction *_fullScreen = nullptr;
+	QAction *_emoji = nullptr;
+	QAction *_bold = nullptr;
+	QAction *_italic = nullptr;
+	QAction *_underline = nullptr;
+	QAction *_strikeOut = nullptr;
+	QAction *_blockquote = nullptr;
+	QAction *_monospace = nullptr;
+	QAction *_clearFormat = nullptr;
+
+	NSPasteboard *_pasteboard = nullptr;
+	int _pasteboardChangeCount = -1;
+	bool _pasteboardHasText = false;
+
+	std::optional<ComputedState> _lastState;
+
+	rpl::event_stream<Ui::MarkdownEnabledState> _markdownChanges;
+	rpl::lifetime _lifetime;
+	bool _languageBound = false;
+
+};
+
+void SendKeySequence(
+		Qt::Key key,
+		Qt::KeyboardModifiers modifiers = Qt::NoModifier) {
+	const auto focused = QApplication::focusWidget();
+	if (qobject_cast<QLineEdit*>(focused)
+		|| qobject_cast<QTextEdit*>(focused)
+		|| qobject_cast<QLabel*>(focused)
+		|| dynamic_cast<HistoryInner*>(focused)) {
+		QApplication::postEvent(
+			focused,
+			new QKeyEvent(QEvent::KeyPress, key, modifiers));
+		QApplication::postEvent(
+			focused,
+			new QKeyEvent(QEvent::KeyRelease, key, modifiers));
+	}
+}
+
+void ForceDisabled(QAction *action, bool disabled) {
+	if (action->isEnabled()) {
+		if (disabled) action->setDisabled(true);
+	} else if (!disabled) {
+		action->setDisabled(false);
+	}
+}
+
+Window::Controller *Manager::resolveActiveWindow() const {
+	if (!Core::IsAppLaunched()) {
+		return nullptr;
+	}
+	const auto active = Core::App().activeWindow();
+	return active ? active : Core::App().activePrimaryWindow();
+}
+
+bool Manager::clipboardHasText() {
+	const auto current = static_cast<int>([_pasteboard changeCount]);
+	if (_pasteboardChangeCount != current) {
+		_pasteboardChangeCount = current;
+		_pasteboardHasText = !QGuiApplication::clipboard()->text().isEmpty();
+	}
+	return _pasteboardHasText;
+}
+
+void Manager::retranslate() {
+	if (_logout) {
+		_logout->setText(tr::lng_mac_menu_logout(tr::now));
+	}
+	if (_delete) {
+		_delete->setText(tr::lng_mac_menu_delete(tr::now));
+	}
+	if (_contacts) {
+		_contacts->setText(tr::lng_mac_menu_contacts(tr::now));
+	}
+	if (_addContact) {
+		_addContact->setText(tr::lng_mac_menu_add_contact(tr::now));
+	}
+	if (_newGroup) {
+		_newGroup->setText(tr::lng_mac_menu_new_group(tr::now));
+	}
+	if (_newChannel) {
+		_newChannel->setText(tr::lng_mac_menu_new_channel(tr::now));
+	}
+	if (_showTelegram) {
+		_showTelegram->setText(tr::lng_mac_menu_show(tr::now));
+	}
+	if (_fullScreen) {
+		_fullScreen->setText(tr::lng_mac_menu_fullscreen(tr::now));
+	}
+	if (_emoji) {
+		_emoji->setText(tr::lng_mac_menu_emoji_and_symbols(
+			tr::now,
+			Ui::Text::FixAmpersandInAction));
+	}
+	if (_bold) {
+		_bold->setText(tr::lng_menu_formatting_bold(tr::now));
+	}
+	if (_italic) {
+		_italic->setText(tr::lng_menu_formatting_italic(tr::now));
+	}
+	if (_underline) {
+		_underline->setText(tr::lng_menu_formatting_underline(tr::now));
+	}
+	if (_strikeOut) {
+		_strikeOut->setText(tr::lng_menu_formatting_strike_out(tr::now));
+	}
+	if (_blockquote) {
+		_blockquote->setText(tr::lng_menu_formatting_blockquote(tr::now));
+	}
+	if (_monospace) {
+		_monospace->setText(tr::lng_menu_formatting_monospace(tr::now));
+	}
+	if (_clearFormat) {
+		_clearFormat->setText(tr::lng_menu_formatting_clear(tr::now));
+	}
+}
+
+void Manager::ensureLanguageBound() {
+	if (_languageBound || !Core::IsAppLaunched()) {
+		return;
+	}
+	_languageBound = true;
+	retranslate();
+	Lang::Updated() | rpl::on_next([this] {
+		retranslate();
+	}, _lifetime);
+}
+
+void Manager::recomputeState() {
+	const auto window = resolveActiveWindow();
+	if (!window) {
+		return;
+	}
+	const auto widget = window->widget();
+	if (!widget->positionInited()) {
+		return;
+	}
+
+	const auto focused = QApplication::focusWidget();
+	auto canUndo = false;
+	auto canRedo = false;
+	auto canCut = false;
+	auto canCopy = false;
+	auto canPaste = false;
+	auto canDelete = false;
+	auto canSelectAll = false;
+	const auto clipboardHasText = this->clipboardHasText();
+	auto markdownState = Ui::MarkdownEnabledState();
+	if (const auto edit = qobject_cast<QLineEdit*>(focused)) {
+		canCut = canCopy = canDelete = edit->hasSelectedText();
+		canSelectAll = !edit->text().isEmpty();
+		canUndo = edit->isUndoAvailable();
+		canRedo = edit->isRedoAvailable();
+		canPaste = clipboardHasText;
+	} else if (const auto edit = qobject_cast<QTextEdit*>(focused)) {
+		canCut = canCopy = canDelete = edit->textCursor().hasSelection();
+		canSelectAll = !edit->document()->isEmpty();
+		canUndo = edit->document()->isUndoAvailable();
+		canRedo = edit->document()->isRedoAvailable();
+		canPaste = clipboardHasText;
+		if (canCopy) {
+			if (const auto inputField = dynamic_cast<Ui::InputField*>(
+					focused->parentWidget())) {
+				markdownState = inputField->markdownEnabledState();
+			}
+		}
+	} else if (const auto label = qobject_cast<QLabel*>(focused)) {
+		const auto flags = label->textInteractionFlags();
+		const auto selectable = flags
+			& (Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
+		if (selectable) {
+			canCopy = label->hasSelectedText();
+			canSelectAll = !label->text().isEmpty();
+		}
+	} else if (const auto list = dynamic_cast<HistoryInner*>(focused)) {
+		canCopy = list->canCopySelected();
+		canDelete = list->canDeleteSelected();
+	}
+
+	widget->updateIsActive();
+	const auto controller = window->sessionController();
+	const auto logged = (controller != nullptr);
+	const auto inactive = !logged || window->locked();
+	const auto support = logged && controller->session().supportMode();
+
+	auto next = ComputedState{
+		.logoutDisabled = !logged && !Core::App().passcodeLocked(),
+		.undoDisabled = !canUndo,
+		.redoDisabled = !canRedo,
+		.cutDisabled = !canCut,
+		.copyDisabled = !canCopy,
+		.pasteDisabled = !canPaste,
+		.deleteDisabled = !canDelete,
+		.selectAllDisabled = !canSelectAll,
+		.contactsDisabled = inactive || support,
+		.addContactDisabled = inactive,
+		.newGroupDisabled = inactive || support,
+		.newChannelDisabled = inactive || support,
+		.showTelegramDisabled = widget->isActive(),
+		.markdown = markdownState,
+	};
+	if (_lastState && *_lastState == next) {
+		return;
+	}
+	_lastState = next;
+
+	_markdownChanges.fire_copy(markdownState);
+
+	ForceDisabled(_logout, next.logoutDisabled);
+	ForceDisabled(_undo, next.undoDisabled);
+	ForceDisabled(_redo, next.redoDisabled);
+	ForceDisabled(_cut, next.cutDisabled);
+	ForceDisabled(_copy, next.copyDisabled);
+	ForceDisabled(_paste, next.pasteDisabled);
+	ForceDisabled(_delete, next.deleteDisabled);
+	ForceDisabled(_selectAll, next.selectAllDisabled);
+	ForceDisabled(_contacts, next.contactsDisabled);
+	ForceDisabled(_addContact, next.addContactDisabled);
+	ForceDisabled(_newGroup, next.newGroupDisabled);
+	ForceDisabled(_newChannel, next.newChannelDisabled);
+	ForceDisabled(_showTelegram, next.showTelegramDisabled);
+
+	const auto disabled = [&](const QString &tag) {
+		return !markdownState.enabledForTag(tag);
+	};
+	using Field = Ui::InputField;
+	ForceDisabled(_bold, disabled(Field::kTagBold));
+	ForceDisabled(_italic, disabled(Field::kTagItalic));
+	ForceDisabled(_underline, disabled(Field::kTagUnderline));
+	ForceDisabled(_strikeOut, disabled(Field::kTagStrikeOut));
+	ForceDisabled(_blockquote, disabled(Field::kTagBlockquote));
+	ForceDisabled(
+		_monospace,
+		disabled(Field::kTagPre) || disabled(Field::kTagCode));
+	ForceDisabled(_clearFormat, markdownState.disabled());
+}
+
+void Manager::buildAppleMenu(QMenu *main) {
+	{
+		auto callback = [this] {
+			withActiveWindow([](not_null<Window::Controller*> window) {
+				window->show(Box(AboutBox));
+			});
+		};
+		const auto about = main->addAction(
+			u"About Telegram"_q,
+			std::move(callback));
+		about->setMenuRole(QAction::AboutQtRole);
+	}
+
+	main->addSeparator();
+	{
+		auto callback = [this] {
+			withActiveWindow([](not_null<Window::Controller*> window) {
+				window->showSettings();
+			});
+		};
+		const auto preferences = main->addAction(
+			u"Preferences..."_q,
+			_menuBar.get(),
+			std::move(callback),
+			QKeySequence(Qt::ControlModifier | Qt::Key_Comma));
+		preferences->setMenuRole(QAction::PreferencesRole);
+		preferences->setShortcutContext(Qt::WidgetShortcut);
+	}
+}
+
+void Manager::buildFileMenu(QMenu *file) {
+	auto callback = [this] {
+		withActiveWindow([](not_null<Window::Controller*> window) {
+			window->showLogoutConfirmation();
+		});
+	};
+	_logout = file->addAction(
+		u"Log Out"_q,
+		_menuBar.get(),
+		std::move(callback));
+}
+
+void Manager::buildEditMenu(QMenu *edit) {
+	const auto receiver = _menuBar.get();
+	_undo = edit->addAction(
+		u"Undo"_q,
+		receiver,
+		[] { SendKeySequence(Qt::Key_Z, Qt::ControlModifier); },
+		QKeySequence::Undo);
+	_undo->setShortcutContext(Qt::WidgetShortcut);
+	_redo = edit->addAction(
+		u"Redo"_q,
+		receiver,
+		[] {
+			SendKeySequence(
+				Qt::Key_Z,
+				Qt::ControlModifier | Qt::ShiftModifier);
+		},
+		QKeySequence::Redo);
+	_redo->setShortcutContext(Qt::WidgetShortcut);
+	edit->addSeparator();
+	_cut = edit->addAction(
+		u"Cut"_q,
+		receiver,
+		[] { SendKeySequence(Qt::Key_X, Qt::ControlModifier); },
+		QKeySequence::Cut);
+	_cut->setShortcutContext(Qt::WidgetShortcut);
+	_copy = edit->addAction(
+		u"Copy"_q,
+		receiver,
+		[] { SendKeySequence(Qt::Key_C, Qt::ControlModifier); },
+		QKeySequence::Copy);
+	_copy->setShortcutContext(Qt::WidgetShortcut);
+	_paste = edit->addAction(
+		u"Paste"_q,
+		receiver,
+		[] { SendKeySequence(Qt::Key_V, Qt::ControlModifier); },
+		QKeySequence::Paste);
+	_paste->setShortcutContext(Qt::WidgetShortcut);
+	_delete = edit->addAction(
+		u"Delete"_q,
+		receiver,
+		[] { SendKeySequence(Qt::Key_Delete); },
+		QKeySequence(Qt::ControlModifier | Qt::Key_Backspace));
+	_delete->setShortcutContext(Qt::WidgetShortcut);
+
+	edit->addSeparator();
+	_bold = edit->addAction(
+		u"Bold"_q,
+		receiver,
+		[] { SendKeySequence(Qt::Key_B, Qt::ControlModifier); },
+		QKeySequence::Bold);
+	_bold->setShortcutContext(Qt::WidgetShortcut);
+	_italic = edit->addAction(
+		u"Italic"_q,
+		receiver,
+		[] { SendKeySequence(Qt::Key_I, Qt::ControlModifier); },
+		QKeySequence::Italic);
+	_italic->setShortcutContext(Qt::WidgetShortcut);
+	_underline = edit->addAction(
+		u"Underline"_q,
+		receiver,
+		[] { SendKeySequence(Qt::Key_U, Qt::ControlModifier); },
+		QKeySequence::Underline);
+	_underline->setShortcutContext(Qt::WidgetShortcut);
+	_strikeOut = edit->addAction(
+		u"Strikethrough"_q,
+		receiver,
+		[] {
+			SendKeySequence(
+				Qt::Key_X,
+				Qt::ControlModifier | Qt::ShiftModifier);
+		},
+		Ui::kStrikeOutSequence);
+	_strikeOut->setShortcutContext(Qt::WidgetShortcut);
+	_blockquote = edit->addAction(
+		u"Quote"_q,
+		receiver,
+		[] {
+			SendKeySequence(
+				Qt::Key_Period,
+				Qt::ControlModifier | Qt::ShiftModifier);
+		},
+		Ui::kBlockquoteSequence);
+	_blockquote->setShortcutContext(Qt::WidgetShortcut);
+	_monospace = edit->addAction(
+		u"Monospace"_q,
+		receiver,
+		[] {
+			SendKeySequence(
+				Qt::Key_M,
+				Qt::ControlModifier | Qt::ShiftModifier);
+		},
+		Ui::kMonospaceSequence);
+	_monospace->setShortcutContext(Qt::WidgetShortcut);
+	_clearFormat = edit->addAction(
+		u"Clear formatting"_q,
+		receiver,
+		[] {
+			SendKeySequence(
+				Qt::Key_N,
+				Qt::ControlModifier | Qt::ShiftModifier);
+		},
+		Ui::kClearFormatSequence);
+	_clearFormat->setShortcutContext(Qt::WidgetShortcut);
+
+	edit->addSeparator();
+	_selectAll = edit->addAction(
+		u"Select All"_q,
+		receiver,
+		[] { SendKeySequence(Qt::Key_A, Qt::ControlModifier); },
+		QKeySequence::SelectAll);
+	_selectAll->setShortcutContext(Qt::WidgetShortcut);
+
+	if (!Platform::IsMac26_0OrGreater()) {
+		edit->addSeparator();
+		_emoji = edit->addAction(
+			u"Emoji & Symbols"_q,
+			receiver,
+			[] { [NSApp orderFrontCharacterPalette:nil]; },
+			QKeySequence(Qt::MetaModifier
+				| Qt::ControlModifier
+				| Qt::Key_Space));
+		_emoji->setShortcutContext(Qt::WidgetShortcut);
+	}
+}
+
+void Manager::buildWindowMenu(QMenu *window) {
+	const auto receiver = _menuBar.get();
+	_fullScreen = window->addAction(
+		u"Toggle Full Screen"_q,
+		receiver,
+		[this] {
+			withActiveWindow([](not_null<Window::Controller*> w) {
+				const auto view = reinterpret_cast<NSView*>(
+					w->widget()->winId());
+				NSWindow *nsWindow = [view window];
+				[nsWindow toggleFullScreen:nsWindow];
+			});
+		},
+		QKeySequence(Qt::MetaModifier | Qt::ControlModifier | Qt::Key_F));
+	_fullScreen->setShortcutContext(Qt::WidgetShortcut);
+	window->addSeparator();
+
+	_contacts = window->addAction(u"Contacts"_q);
+	QObject::connect(_contacts, &QAction::triggered, _contacts, [this] {
+		withActiveWindow([](not_null<Window::Controller*> w) {
+			const auto sc = w->sessionController();
+			if (!sc || w->locked()) {
+				return;
+			}
+			sc->show(PrepareContactsBox(sc));
+		});
+	});
+	{
+		auto callback = [this] {
+			withActiveWindow([](not_null<Window::Controller*> w) {
+				const auto sc = w->sessionController();
+				if (!sc || w->locked()) {
+					return;
+				}
+				sc->showAddContact();
+			});
+		};
+		_addContact = window->addAction(
+			u"Add Contact"_q,
+			receiver,
+			std::move(callback));
+	}
+	window->addSeparator();
+	{
+		auto callback = [this] {
+			withActiveWindow([](not_null<Window::Controller*> w) {
+				const auto sc = w->sessionController();
+				if (!sc || w->locked()) {
+					return;
+				}
+				sc->showNewGroup();
+			});
+		};
+		_newGroup = window->addAction(
+			u"New Group"_q,
+			receiver,
+			std::move(callback));
+	}
+	{
+		auto callback = [this] {
+			withActiveWindow([](not_null<Window::Controller*> w) {
+				const auto sc = w->sessionController();
+				if (!sc || w->locked()) {
+					return;
+				}
+				sc->showNewChannel();
+			});
+		};
+		_newChannel = window->addAction(
+			u"New Channel"_q,
+			receiver,
+			std::move(callback));
+	}
+	window->addSeparator();
+	_showTelegram = window->addAction(
+		u"Show Telegram"_q,
+		receiver,
+		[this] {
+			if (const auto w = resolveActiveWindow()) {
+				w->widget()->showFromTray();
+			}
+		});
+}
+
+void Manager::buildMenu() {
+	buildAppleMenu(_menuBar->addMenu(u"Telegram"_q));
+	buildFileMenu(_menuBar->addMenu(u"File"_q));
+	buildEditMenu(_menuBar->addMenu(u"Edit"_q));
+	buildWindowMenu(_menuBar->addMenu(u"Window"_q));
+}
+
+void Manager::create() {
+	Expects(_menuBar == nullptr);
+
+	_pasteboard = [NSPasteboard generalPasteboard];
+	_menuBar = std::make_unique<QMenuBar>();
+
+	buildMenu();
+
+	_scheduledUpdate = std::make_unique<SingleQueuedInvokation>([this] {
+		if (!_menuBar) {
+			return;
+		}
+		recomputeState();
+	});
+}
+
+void Manager::destroy() {
+	_scheduledUpdate.reset();
+	_lifetime.destroy();
+	_menuBar.reset();
+	_languageBound = false;
+	_logout = _undo = _redo = _cut = _copy = _paste = _delete
+		= _selectAll = _contacts = _addContact = _newGroup
+		= _newChannel = _showTelegram = _fullScreen = _emoji
+		= _bold = _italic = _underline
+		= _strikeOut = _blockquote = _monospace = _clearFormat
+		= nullptr;
+	_pasteboard = nullptr;
+	_pasteboardChangeCount = -1;
+	_pasteboardHasText = false;
+	_lastState.reset();
+}
+
+void Manager::requestUpdate() {
+	if (!_menuBar) {
+		return;
+	}
+	ensureLanguageBound();
+	_scheduledUpdate->call();
+}
+
+auto Manager::markdownStateChanges() const
+-> rpl::producer<Ui::MarkdownEnabledState> {
+	return _markdownChanges.events();
+}
+
+Manager GlobalMenu;
+
+} // namespace
+
+void CreateGlobalMenu() {
+	GlobalMenu.create();
+}
+
+void DestroyGlobalMenu() {
+	GlobalMenu.destroy();
+}
+
+void RequestUpdateGlobalMenu() {
+	GlobalMenu.requestUpdate();
+}
+
+rpl::producer<Ui::MarkdownEnabledState> GlobalMenuMarkdownState() {
+	return GlobalMenu.markdownStateChanges();
+}
+
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h
index 63ed4009b30bf2..dcc064c34ff333 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.h
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h
@@ -11,7 +11,6 @@ For license and copyright information please follow this link:
 #include "platform/mac/specific_mac_p.h"
 #include "base/timer.h"
 
-#include <QtWidgets/QMenuBar>
 #include <QtCore/QTimer>
 
 namespace Platform {
@@ -41,10 +40,7 @@ class MainWindow : public Window::MainWindow {
 	void initHook() override;
 	void unreadCounterChangedHook() override;
 
-	void updateGlobalMenuHook() override;
-
 	void closeWithoutDestroy() override;
-	void createGlobalMenu() override;
 
 private:
 	friend class Private;
@@ -59,42 +55,19 @@ class MainWindow : public Window::MainWindow {
 
 	std::unique_ptr<Private> _private;
 
-	mutable bool psIdle;
 	mutable QTimer psIdleTimer;
 
 	base::Timer _hideAfterFullScreenTimer;
 
-	QMenuBar psMainMenu;
-	QAction *psLogout = nullptr;
-	QAction *psUndo = nullptr;
-	QAction *psRedo = nullptr;
-	QAction *psCut = nullptr;
-	QAction *psCopy = nullptr;
-	QAction *psPaste = nullptr;
-	QAction *psDelete = nullptr;
-	QAction *psSelectAll = nullptr;
-	QAction *psContacts = nullptr;
-	QAction *psAddContact = nullptr;
-	QAction *psNewGroup = nullptr;
-	QAction *psNewChannel = nullptr;
-	QAction *psShowTelegram = nullptr;
-
-	QAction *psBold = nullptr;
-	QAction *psItalic = nullptr;
-	QAction *psUnderline = nullptr;
-	QAction *psStrikeOut = nullptr;
-	QAction *psBlockquote = nullptr;
-	QAction *psMonospace = nullptr;
-	QAction *psClearFormat = nullptr;
-
 	rpl::event_stream<QPoint> _forceClicks;
 	int _customTitleHeight = 0;
 	int _lastPressureStage = 0;
 
 };
 
-[[nodiscard]] inline int32 ScreenNameChecksum(const QString &name) {
-	return Window::DefaultScreenNameChecksum(name);
-}
+[[nodiscard]] int32 ScreenNameChecksum(const QString &name);
+[[nodiscard]] int32 ScreenNameChecksum(const QScreen *screen);
+
+[[nodiscard]] QString ScreenDisplayLabel(const QScreen *screen);
 
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index 6d3514d3474970..161a80ecb96a20 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -18,8 +18,11 @@
 #include "media/player/media_player_instance.h"
 #include "media/audio/media_audio.h"
 #include "storage/localstorage.h"
-#include "window/window_session_controller.h"
+#include "ui/text/text_utilities.h"
 #include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "platform/mac/global_menu_mac.h"
+#include "platform/mac/native_event_mac.h"
 #include "platform/mac/touchbar/mac_touchbar_manager.h"
 #include "platform/platform_specific.h"
 #include "platform/platform_notifications_manager.h"
@@ -56,6 +59,7 @@ - (void) screenIsUnlocked:(NSNotification *)aNotification;
 @end // @interface MainWindowObserver
 
 namespace Platform {
+
 namespace {
 
 // When we close a window that is fullscreen we first leave the fullscreen
@@ -63,26 +67,6 @@ - (void) screenIsUnlocked:(NSNotification *)aNotification;
 // fullscreen mode, after that we'll hide the window no matter what.
 constexpr auto kHideAfterFullscreenTimeoutMs = 3000;
 
-[[nodiscard]] bool PossiblyTextTypingEvent(NSEvent *e) {
-	if ([e type] != NSEventTypeKeyDown) {
-		return false;
-	}
-	NSEventModifierFlags flags = [e modifierFlags]
-		& NSEventModifierFlagDeviceIndependentFlagsMask;
-	if ((flags & ~NSEventModifierFlagShift) != 0) {
-		return false;
-	}
-	NSString *text = [e characters];
-	const auto length = int([text length]);
-	for (auto i = 0; i != length; ++i) {
-		const auto utf16 = [text characterAtIndex:i];
-		if (utf16 >= 32) {
-			return true;
-		}
-	}
-	return false;
-}
-
 } // namespace
 
 class MainWindow::Private {
@@ -95,9 +79,10 @@ void initTouchBar(
 		not_null<Window::Controller*> controller);
 	void setWindowBadge(const QString &str);
 
-	void setMarkdownEnabledState(Ui::MarkdownEnabledState state);
+	void updateMarkdownState(Ui::MarkdownEnabledState state) {
+		_markdownState = state;
+	}
 
-	bool clipboardHasText();
 	~Private();
 
 private:
@@ -110,9 +95,6 @@ void initTouchBar(
 	NSView * __weak _nativeView = nil;
 
 	MainWindowObserver *_observer = nullptr;
-	NSPasteboard *_generalPasteboard = nullptr;
-	int _generalPasteboardChangeCount = -1;
-	bool _generalPasteboardHasText = false;
 
 };
 
@@ -158,30 +140,6 @@ - (void) screenIsUnlocked:(NSNotification *)aNotification {
 namespace Platform {
 namespace {
 
-void SendKeySequence(
-		Qt::Key key,
-		Qt::KeyboardModifiers modifiers = Qt::NoModifier) {
-	const auto focused = QApplication::focusWidget();
-	if (qobject_cast<QLineEdit*>(focused)
-		|| qobject_cast<QTextEdit*>(focused)
-		|| dynamic_cast<HistoryInner*>(focused)) {
-		QApplication::postEvent(
-			focused,
-			new QKeyEvent(QEvent::KeyPress, key, modifiers));
-		QApplication::postEvent(
-			focused,
-			new QKeyEvent(QEvent::KeyRelease, key, modifiers));
-	}
-}
-
-void ForceDisabled(QAction *action, bool disabled) {
-	if (action->isEnabled()) {
-		if (disabled) action->setDisabled(true);
-	} else if (!disabled) {
-		action->setDisabled(false);
-	}
-}
-
 #if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
 QString strNotificationAboutThemeChange() {
 	const uint32 letters[] = { 0x75E86256, 0xD03E11B1, 0x4D92201D, 0xA2144987, 0x99D5B34F, 0x037589C3, 0x38ED2A7C, 0xD2371ABC, 0xDC98BB02, 0x27964E1B, 0x01748AED, 0xE06679F8, 0x761C9580, 0x4F2595BF, 0x6B5FCBF4, 0xE4D9C24E, 0xBA2F6AB5, 0xE6E3FA71, 0xF2CFC255, 0x56A50C19, 0x43AE1239, 0x77CA4254, 0x7D189A89, 0xEA7663EE, 0x84CEB554, 0xA0ADF236, 0x886512D4, 0x7D3FBDAF, 0x85C4BE4F, 0x12C8255E, 0x9AD8BD41, 0xAC154683, 0xB117598B, 0xDFD9F947, 0x63F06C7B, 0x6340DCD6, 0x3AAE6B3E, 0x26CB125A };
@@ -204,8 +162,6 @@ QString strNotificationAboutScreenUnlocked() {
 MainWindow::Private::Private(not_null<MainWindow*> window)
 : _public(window)
 , _observer([[MainWindowObserver alloc] init:this]) {
-	_generalPasteboard = [NSPasteboard generalPasteboard];
-
 	@autoreleasepool {
 
 	[[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:_observer selector:@selector(activeSpaceDidChange:) name:NSWorkspaceActiveSpaceDidChangeNotification object:nil];
@@ -252,28 +208,13 @@ QString strNotificationAboutScreenUnlocked() {
 		waitUntilDone:true];
 }
 
-void MainWindow::Private::setMarkdownEnabledState(
-		Ui::MarkdownEnabledState state) {
-	_markdownState = state;
-}
-
-bool MainWindow::Private::clipboardHasText() {
-	auto currentChangeCount = static_cast<int>([_generalPasteboard changeCount]);
-	if (_generalPasteboardChangeCount != currentChangeCount) {
-		_generalPasteboardChangeCount = currentChangeCount;
-		_generalPasteboardHasText = !QGuiApplication::clipboard()->text().isEmpty();
-	}
-	return _generalPasteboardHasText;
-}
-
 MainWindow::Private::~Private() {
 	[_observer release];
 }
 
 MainWindow::MainWindow(not_null<Window::Controller*> controller)
 : Window::MainWindow(controller)
-, _private(std::make_unique<Private>(this))
-, psMainMenu(this) {
+, _private(std::make_unique<Private>(this)) {
 	_hideAfterFullScreenTimer.setCallback([this] { hideAndDeactivate(); });
 }
 
@@ -308,6 +249,11 @@ QString strNotificationAboutScreenUnlocked() {
 			}
 		}
 	}
+
+	Platform::GlobalMenuMarkdownState(
+	) | rpl::on_next([this](Ui::MarkdownEnabledState state) {
+		_private->updateMarkdownState(state);
+	}, lifetime());
 }
 
 void MainWindow::updateWindowIcon() {
@@ -357,296 +303,6 @@ QString strNotificationAboutScreenUnlocked() {
 	_private->setWindowBadge(string);
 }
 
-void MainWindow::createGlobalMenu() {
-	const auto ensureWindowShown = [=] {
-		if (isHidden()) {
-			showFromTray();
-		}
-	};
-
-	auto main = psMainMenu.addMenu(u"Telegram"_q);
-	{
-		auto callback = [=] {
-			ensureWindowShown();
-			controller().show(Box<AboutBox>());
-		};
-		main->addAction(
-			tr::lng_mac_menu_about_telegram(
-				tr::now,
-				lt_telegram,
-				u"Telegram"_q),
-			std::move(callback))
-		->setMenuRole(QAction::AboutQtRole);
-	}
-
-	main->addSeparator();
-	{
-		auto callback = [=] {
-			ensureWindowShown();
-			controller().showSettings();
-		};
-		auto prefs = main->addAction(
-			tr::lng_mac_menu_preferences(tr::now),
-			this,
-			std::move(callback),
-			QKeySequence(Qt::ControlModifier | Qt::Key_Comma));
-		prefs->setMenuRole(QAction::PreferencesRole);
-		prefs->setShortcutContext(Qt::WidgetShortcut);
-	}
-
-	QMenu *file = psMainMenu.addMenu(tr::lng_mac_menu_file(tr::now));
-	{
-		auto callback = [=] {
-			ensureWindowShown();
-			controller().showLogoutConfirmation();
-		};
-		psLogout = file->addAction(
-			tr::lng_mac_menu_logout(tr::now),
-			this,
-			std::move(callback));
-	}
-
-	QMenu *edit = psMainMenu.addMenu(tr::lng_mac_menu_edit(tr::now));
-	psUndo = edit->addAction(
-		tr::lng_mac_menu_undo(tr::now),
-		this,
-		[] { SendKeySequence(Qt::Key_Z, Qt::ControlModifier); },
-		QKeySequence::Undo);
-	psUndo->setShortcutContext(Qt::WidgetShortcut);
-	psRedo = edit->addAction(
-		tr::lng_mac_menu_redo(tr::now),
-		this,
-		[] {
-			SendKeySequence(
-				Qt::Key_Z,
-				Qt::ControlModifier | Qt::ShiftModifier);
-		},
-		QKeySequence::Redo);
-	psRedo->setShortcutContext(Qt::WidgetShortcut);
-	edit->addSeparator();
-	psCut = edit->addAction(
-		tr::lng_mac_menu_cut(tr::now),
-		this,
-		[] { SendKeySequence(Qt::Key_X, Qt::ControlModifier); },
-		QKeySequence::Cut);
-	psCut->setShortcutContext(Qt::WidgetShortcut);
-	psCopy = edit->addAction(
-		tr::lng_mac_menu_copy(tr::now),
-		this,
-		[] { SendKeySequence(Qt::Key_C, Qt::ControlModifier); },
-		QKeySequence::Copy);
-	psCopy->setShortcutContext(Qt::WidgetShortcut);
-	psPaste = edit->addAction(
-		tr::lng_mac_menu_paste(tr::now),
-		this,
-		[] { SendKeySequence(Qt::Key_V, Qt::ControlModifier); },
-		QKeySequence::Paste);
-	psPaste->setShortcutContext(Qt::WidgetShortcut);
-	psDelete = edit->addAction(
-		tr::lng_mac_menu_delete(tr::now),
-		this,
-		[] { SendKeySequence(Qt::Key_Delete); },
-		QKeySequence(Qt::ControlModifier | Qt::Key_Backspace));
-	psDelete->setShortcutContext(Qt::WidgetShortcut);
-
-	edit->addSeparator();
-	psBold = edit->addAction(
-		tr::lng_menu_formatting_bold(tr::now),
-		this,
-		[] { SendKeySequence(Qt::Key_B, Qt::ControlModifier); },
-		QKeySequence::Bold);
-	psBold->setShortcutContext(Qt::WidgetShortcut);
-	psItalic = edit->addAction(
-		tr::lng_menu_formatting_italic(tr::now),
-		this,
-		[] { SendKeySequence(Qt::Key_I, Qt::ControlModifier); },
-		QKeySequence::Italic);
-	psItalic->setShortcutContext(Qt::WidgetShortcut);
-	psUnderline = edit->addAction(
-		tr::lng_menu_formatting_underline(tr::now),
-		this,
-		[] { SendKeySequence(Qt::Key_U, Qt::ControlModifier); },
-		QKeySequence::Underline);
-	psUnderline->setShortcutContext(Qt::WidgetShortcut);
-	psStrikeOut = edit->addAction(
-		tr::lng_menu_formatting_strike_out(tr::now),
-		this,
-		[] {
-			SendKeySequence(
-				Qt::Key_X,
-				Qt::ControlModifier | Qt::ShiftModifier);
-		},
-		Ui::kStrikeOutSequence);
-	psStrikeOut->setShortcutContext(Qt::WidgetShortcut);
-	psBlockquote = edit->addAction(
-		tr::lng_menu_formatting_blockquote(tr::now),
-		this,
-		[] {
-			SendKeySequence(
-				Qt::Key_Period,
-				Qt::ControlModifier | Qt::ShiftModifier);
-		},
-		Ui::kBlockquoteSequence);
-	psBlockquote->setShortcutContext(Qt::WidgetShortcut);
-	psMonospace = edit->addAction(
-		tr::lng_menu_formatting_monospace(tr::now),
-		this,
-		[] {
-			SendKeySequence(
-				Qt::Key_M,
-				Qt::ControlModifier | Qt::ShiftModifier);
-		},
-		Ui::kMonospaceSequence);
-	psMonospace->setShortcutContext(Qt::WidgetShortcut);
-	psClearFormat = edit->addAction(
-		tr::lng_menu_formatting_clear(tr::now),
-		this,
-		[] {
-			SendKeySequence(
-				Qt::Key_N,
-				Qt::ControlModifier | Qt::ShiftModifier);
-		},
-		Ui::kClearFormatSequence);
-	psClearFormat->setShortcutContext(Qt::WidgetShortcut);
-
-	edit->addSeparator();
-	psSelectAll = edit->addAction(
-		tr::lng_mac_menu_select_all(tr::now),
-		this,
-		[] { SendKeySequence(Qt::Key_A, Qt::ControlModifier); },
-		QKeySequence::SelectAll);
-	psSelectAll->setShortcutContext(Qt::WidgetShortcut);
-
-	edit->addSeparator();
-	edit->addAction(
-		tr::lng_mac_menu_emoji_and_symbols(tr::now).replace('&', "&&"),
-		this,
-		[] { [NSApp orderFrontCharacterPalette:nil]; },
-		QKeySequence(Qt::MetaModifier | Qt::ControlModifier | Qt::Key_Space)
-	)->setShortcutContext(Qt::WidgetShortcut);
-
-	QMenu *window = psMainMenu.addMenu(tr::lng_mac_menu_window(tr::now));
-	psContacts = window->addAction(tr::lng_mac_menu_contacts(tr::now));
-	connect(psContacts, &QAction::triggered, psContacts, crl::guard(this, [=] {
-		Expects(sessionController() != nullptr && !controller().locked());
-
-		ensureWindowShown();
-		sessionController()->show(PrepareContactsBox(sessionController()));
-	}));
-	{
-		auto callback = [=] {
-			Expects(sessionController() != nullptr && !controller().locked());
-
-			ensureWindowShown();
-			sessionController()->showAddContact();
-		};
-		psAddContact = window->addAction(
-			tr::lng_mac_menu_add_contact(tr::now),
-			this,
-			std::move(callback));
-	}
-	window->addSeparator();
-	{
-		auto callback = [=] {
-			Expects(sessionController() != nullptr && !controller().locked());
-
-			ensureWindowShown();
-			sessionController()->showNewGroup();
-		};
-		psNewGroup = window->addAction(
-			tr::lng_mac_menu_new_group(tr::now),
-			this,
-			std::move(callback));
-	}
-	{
-		auto callback = [=] {
-			Expects(sessionController() != nullptr && !controller().locked());
-
-			ensureWindowShown();
-			sessionController()->showNewChannel();
-		};
-		psNewChannel = window->addAction(
-			tr::lng_mac_menu_new_channel(tr::now),
-			this,
-			std::move(callback));
-	}
-	window->addSeparator();
-	psShowTelegram = window->addAction(
-		tr::lng_mac_menu_show(tr::now),
-		this,
-		[=] { showFromTray(); });
-
-	updateGlobalMenu();
-}
-
-void MainWindow::updateGlobalMenuHook() {
-	if (!positionInited()) {
-		return;
-	}
-
-	auto focused = QApplication::focusWidget();
-	bool canUndo = false, canRedo = false, canCut = false, canCopy = false, canPaste = false, canDelete = false, canSelectAll = false;
-	auto clipboardHasText = _private->clipboardHasText();
-	auto markdownState = Ui::MarkdownEnabledState();
-	if (auto edit = qobject_cast<QLineEdit*>(focused)) {
-		canCut = canCopy = canDelete = edit->hasSelectedText();
-		canSelectAll = !edit->text().isEmpty();
-		canUndo = edit->isUndoAvailable();
-		canRedo = edit->isRedoAvailable();
-		canPaste = clipboardHasText;
-	} else if (auto edit = qobject_cast<QTextEdit*>(focused)) {
-		canCut = canCopy = canDelete = edit->textCursor().hasSelection();
-		canSelectAll = !edit->document()->isEmpty();
-		canUndo = edit->document()->isUndoAvailable();
-		canRedo = edit->document()->isRedoAvailable();
-		canPaste = clipboardHasText;
-		if (canCopy) {
-			if (const auto inputField = dynamic_cast<Ui::InputField*>(
-					focused->parentWidget())) {
-				markdownState = inputField->markdownEnabledState();
-			}
-		}
-	} else if (auto list = dynamic_cast<HistoryInner*>(focused)) {
-		canCopy = list->canCopySelected();
-		canDelete = list->canDeleteSelected();
-	}
-
-	_private->setMarkdownEnabledState(markdownState);
-
-	updateIsActive();
-	const auto logged = (sessionController() != nullptr);
-	const auto inactive = !logged || controller().locked();
-	const auto support = logged
-		&& sessionController()->session().supportMode();
-	ForceDisabled(psLogout, !logged && !Core::App().passcodeLocked());
-	ForceDisabled(psUndo, !canUndo);
-	ForceDisabled(psRedo, !canRedo);
-	ForceDisabled(psCut, !canCut);
-	ForceDisabled(psCopy, !canCopy);
-	ForceDisabled(psPaste, !canPaste);
-	ForceDisabled(psDelete, !canDelete);
-	ForceDisabled(psSelectAll, !canSelectAll);
-	ForceDisabled(psContacts, inactive || support);
-	ForceDisabled(psAddContact, inactive);
-	ForceDisabled(psNewGroup, inactive || support);
-	ForceDisabled(psNewChannel, inactive || support);
-	ForceDisabled(psShowTelegram, isActive());
-
-	const auto diabled = [=](const QString &tag) {
-		return !markdownState.enabledForTag(tag);
-	};
-	using Field = Ui::InputField;
-	ForceDisabled(psBold, diabled(Field::kTagBold));
-	ForceDisabled(psItalic, diabled(Field::kTagItalic));
-	ForceDisabled(psUnderline, diabled(Field::kTagUnderline));
-	ForceDisabled(psStrikeOut, diabled(Field::kTagStrikeOut));
-	ForceDisabled(psBlockquote, diabled(Field::kTagBlockquote));
-	ForceDisabled(
-		psMonospace,
-		diabled(Field::kTagPre) || diabled(Field::kTagCode));
-	ForceDisabled(psClearFormat, markdownState.disabled());
-}
-
 bool MainWindow::eventFilter(QObject *obj, QEvent *evt) {
 	QEvent::Type t = evt->type();
 	if (t == QEvent::FocusIn || t == QEvent::FocusOut) {
@@ -660,4 +316,16 @@ QString strNotificationAboutScreenUnlocked() {
 MainWindow::~MainWindow() {
 }
 
+int32 ScreenNameChecksum(const QString &name) {
+	return Window::DefaultScreenNameChecksum(name);
+}
+
+int32 ScreenNameChecksum(const QScreen *screen) {
+	return ScreenNameChecksum(screen->name());
+}
+
+QString ScreenDisplayLabel(const QScreen *screen) {
+	return screen ? screen->name() : QString();
+}
+
 } // namespace
diff --git a/Telegram/SourceFiles/platform/mac/native_event_mac.h b/Telegram/SourceFiles/platform/mac/native_event_mac.h
new file mode 100644
index 00000000000000..e2b85ef35018c9
--- /dev/null
+++ b/Telegram/SourceFiles/platform/mac/native_event_mac.h
@@ -0,0 +1,14 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Platform {
+
+[[nodiscard]] bool PossiblyTextTypingEvent(void *event);
+
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/native_event_mac.mm b/Telegram/SourceFiles/platform/mac/native_event_mac.mm
new file mode 100644
index 00000000000000..934afa2f94b357
--- /dev/null
+++ b/Telegram/SourceFiles/platform/mac/native_event_mac.mm
@@ -0,0 +1,35 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "platform/mac/native_event_mac.h"
+
+#include <Cocoa/Cocoa.h>
+
+namespace Platform {
+
+bool PossiblyTextTypingEvent(void *event) {
+	const auto e = static_cast<NSEvent*>(event);
+	if ([e type] != NSEventTypeKeyDown) {
+		return false;
+	}
+	NSEventModifierFlags flags = [e modifierFlags]
+		& NSEventModifierFlagDeviceIndependentFlagsMask;
+	if ((flags & ~NSEventModifierFlagShift) != 0) {
+		return false;
+	}
+	NSString *text = [e characters];
+	const auto length = int([text length]);
+	for (auto i = 0; i != length; ++i) {
+		const auto utf16 = [text characterAtIndex:i];
+		if (utf16 >= 32) {
+			return true;
+		}
+	}
+	return false;
+}
+
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h
index 161c1d30888f01..6af0292384ef85 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h
@@ -20,17 +20,12 @@ class Manager : public Window::Notifications::NativeManager, public base::has_we
 
 protected:
 	void doShowNativeNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options) override;
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView) override;
 	void doClearAllFast() override;
 	void doClearFromItem(not_null<HistoryItem*> item) override;
 	void doClearFromTopic(not_null<Data::ForumTopic*> topic) override;
+	void doClearFromSublist(not_null<Data::SavedSublist*> sublist) override;
 	void doClearFromHistory(not_null<History*> history) override;
 	void doClearFromSession(not_null<Main::Session*> session) override;
 	QString accountNameSeparator() override;
diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
index de288090772fc1..e0f0c495c78d66 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
@@ -7,18 +7,25 @@
 */
 #include "platform/mac/notifications_manager_mac.h"
 
-#include "core/application.h"
-#include "core/core_settings.h"
 #include "base/platform/base_platform_info.h"
-#include "platform/platform_specific.h"
+#include "base/options.h"
 #include "base/platform/mac/base_utilities_mac.h"
 #include "base/random.h"
+#include "base/unixtime.h"
+#include "core/application.h"
+#include "core/core_settings.h"
 #include "data/data_forum_topic.h"
-#include "history/history.h"
+#include "data/data_peer.h"
+#include "data/data_saved_sublist.h"
 #include "history/history_item.h"
-#include "ui/empty_userpic.h"
+#include "history/history.h"
+#include "lang/lang_cloud_manager.h"
+#include "lang/lang_instance.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "mainwindow.h"
+#include "platform/platform_specific.h"
+#include "ui/empty_userpic.h"
 #include "window/notifications_utilities.h"
 #include "styles/style_window.h"
 
@@ -28,6 +35,12 @@
 namespace {
 
 constexpr auto kQuerySettingsEachMs = crl::time(1000);
+constexpr auto kCacheExpirationWeeks = 5;
+constexpr auto kCacheExpirationSeconds = kCacheExpirationWeeks * 7 * 24 * 60 * 60;
+
+NSString *const kTelegramMarkAsReadText = @"TelegramMarkAsReadText";
+NSString *const kTelegramMarkAsReadTimestamp = @"TelegramMarkAsReadTimestamp";
+NSString *const kTelegramMarkAsReadLanguageCode = @"TelegramMarkAsReadLanguageCode";
 
 crl::time LastSettingsQueryMs/* = 0*/;
 bool DoNotDisturbEnabled/* = false*/;
@@ -131,6 +144,12 @@ - (void) userNotificationCenter:(NSUserNotificationCenter *)center didActivateNo
 		return;
 	}
 	const auto notificationTopicRootId = [topicObject longLongValue];
+	NSNumber *monoforumPeerObject = [notificationUserInfo objectForKey:@"monoforumpeer"];
+	if (!monoforumPeerObject) {
+		LOG(("App Error: A notification with unknown monoforum peer was received"));
+		return;
+	}
+	const auto notificationMonoforumPeerId = [monoforumPeerObject unsignedLongLongValue];
 
 	NSNumber *msgObject = [notificationUserInfo objectForKey:@"msgid"];
 	const auto notificationMsgId = msgObject ? [msgObject longLongValue] : 0LL;
@@ -140,6 +159,7 @@ - (void) userNotificationCenter:(NSUserNotificationCenter *)center didActivateNo
 			.sessionId = notificationSessionId,
 			.peerId = PeerId(notificationPeerId),
 			.topicRootId = MsgId(notificationTopicRootId),
+			.monoforumPeerId = PeerId(notificationMonoforumPeerId),
 		},
 		.msgId = notificationMsgId,
 	};
@@ -155,6 +175,24 @@ - (void) userNotificationCenter:(NSUserNotificationCenter *)center didActivateNo
 			manager->notificationActivated(my);
 		});
 	}
+	if (notification.activationType == NSUserNotificationActivationTypeAdditionalActionClicked
+		|| notification.activationType == NSUserNotificationActivationTypeActionButtonClicked) {
+		const auto manager = _manager;
+		NSString *actionId = nil;
+		if (notification.activationType == NSUserNotificationActivationTypeAdditionalActionClicked
+			&& [notification respondsToSelector:@selector(additionalActivationAction)]) {
+			actionId = notification.additionalActivationAction.identifier;
+		}
+		if (!actionId) {
+			actionId = [notificationUserInfo objectForKey:@"actionId"];
+		}
+		if (actionId) {
+			const auto actionStr = QString::fromNSString(actionId);
+			crl::on_main(manager, [=] {
+				manager->notificationActionActivated(my, actionStr);
+			});
+		}
+	}
 
 	[center removeDeliveredNotification: notification];
 }
@@ -196,12 +234,12 @@ bool ByDefault() {
 	return Supported();
 }
 
+bool VolumeSupported() {
+	return false;
+}
+
 void Create(Window::Notifications::System *system) {
-	if (Supported()) {
-		system->setManager(std::make_unique<Manager>(system));
-	} else {
-		system->setManager(nullptr);
-	}
+	system->setManager([=] { return std::make_unique<Manager>(system); });
 }
 
 class Manager::Private : public QObject {
@@ -209,23 +247,16 @@ void Create(Window::Notifications::System *system) {
 	Private(Manager *manager);
 
 	void showNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options);
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView);
 	void clearAll();
 	void clearFromItem(not_null<HistoryItem*> item);
 	void clearFromTopic(not_null<Data::ForumTopic*> topic);
+	void clearFromSublist(not_null<Data::SavedSublist*> sublist);
 	void clearFromHistory(not_null<History*> history);
 	void clearFromSession(not_null<Main::Session*> session);
 	void updateDelegate();
 
-	void invokeIfNotFocused(Fn<void()> callback);
-
 	~Private();
 
 private:
@@ -233,7 +264,7 @@ void showNotification(
 	void putClearTask(Task task);
 
 	void clearingThreadLoop();
-	void checkFocusState();
+	void initCachedMarkAsReadText();
 
 	const uint64 _managerId = 0;
 	QString _managerIdString;
@@ -250,6 +281,9 @@ void showNotification(
 	struct ClearFromTopic {
 		ContextId contextId;
 	};
+	struct ClearFromSublist {
+		ContextId contextId;
+	};
 	struct ClearFromHistory {
 		ContextId partialContextId;
 	};
@@ -263,56 +297,70 @@ void showNotification(
 	using ClearTask = std::variant<
 		ClearFromItem,
 		ClearFromTopic,
+		ClearFromSublist,
 		ClearFromHistory,
 		ClearFromSession,
 		ClearAll,
 		ClearFinish>;
 	std::vector<ClearTask> _clearingTasks;
 
-	QProcess _dnd;
-	QProcess _focus;
-	std::vector<Fn<void()>> _focusedCallbacks;
-	bool _waitingDnd = false;
-	bool _waitingFocus = false;
-	bool _focused = false;
-	bool _processesInited = false;
+	Media::Audio::LocalDiskCache _sounds;
+	NSString *_cachedMarkAsReadText = nil;
 
 	rpl::lifetime _lifetime;
 
 };
 
+[[nodiscard]] QString ResolveSoundsFolder() {
+	NSArray *paths = NSSearchPathForDirectoriesInDomains(
+		NSLibraryDirectory,
+		NSUserDomainMask,
+		YES);
+	NSString *library = [paths firstObject];
+	NSString *sounds = [library stringByAppendingPathComponent : @"Sounds"];
+	return NS2QString(sounds);
+}
+
+void AddActionIdToNotification(
+		NSUserNotification *notification,
+		NSString *actionId) {
+	NSMutableDictionary *mutableUserInfo
+		= [[notification userInfo] mutableCopy];
+	[mutableUserInfo setObject:actionId forKey:@"actionId"];
+	[notification setUserInfo:mutableUserInfo];
+	[mutableUserInfo release];
+}
+
 Manager::Private::Private(Manager *manager)
 : _managerId(base::RandomValue<uint64>())
 , _managerIdString(QString::number(_managerId))
-, _delegate([[NotificationDelegate alloc] initWithManager:manager managerId:_managerId]) {
+, _delegate([[NotificationDelegate alloc] initWithManager:manager managerId:_managerId])
+, _sounds(ResolveSoundsFolder()) {
 	Core::App().settings().workModeValue(
-	) | rpl::start_with_next([=](Core::Settings::WorkMode mode) {
+	) | rpl::on_next([=](Core::Settings::WorkMode mode) {
 		// We need to update the delegate _after_ the tray icon change was done in Qt.
 		// Because Qt resets the delegate.
 		crl::on_main(this, [=] {
 			updateDelegate();
 		});
 	}, _lifetime);
+
+	initCachedMarkAsReadText();
 }
 
 void Manager::Private::showNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options) {
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView) {
 	@autoreleasepool {
 
+	const auto peer = info.peer;
 	NSUserNotification *notification = [[[NSUserNotification alloc] init] autorelease];
 	if ([notification respondsToSelector:@selector(setIdentifier:)]) {
 		auto identifier = _managerIdString
 			+ '_'
 			+ QString::number(peer->id.value)
 			+ '_'
-			+ QString::number(msgId.bare);
+			+ QString::number(info.itemId.bare);
 		auto identifierValue = Q2NSString(identifier);
 		[notification setIdentifier:identifierValue];
 	}
@@ -322,30 +370,78 @@ void showNotification(
 			@"session",
 			[NSNumber numberWithUnsignedLongLong:peer->id.value],
 			@"peer",
-			[NSNumber numberWithLongLong:topicRootId.bare],
+			[NSNumber numberWithLongLong:info.topicRootId.bare],
 			@"topic",
-			[NSNumber numberWithLongLong:msgId.bare],
+			[NSNumber numberWithUnsignedLongLong:info.monoforumPeerId.value],
+			@"monoforumpeer",
+			[NSNumber numberWithLongLong:info.itemId.bare],
 			@"msgid",
 			[NSNumber numberWithUnsignedLongLong:_managerId],
 			@"manager",
 			nil]];
 
-	[notification setTitle:Q2NSString(title)];
-	[notification setSubtitle:Q2NSString(subtitle)];
-	[notification setInformativeText:Q2NSString(msg)];
-	if (!options.hideNameAndPhoto
+	[notification setTitle:Q2NSString(info.title)];
+	[notification setSubtitle:Q2NSString(info.subtitle)];
+	[notification setInformativeText:Q2NSString(info.message)];
+	if (!info.options.hideNameAndPhoto
 		&& [notification respondsToSelector:@selector(setContentImage:)]) {
 		NSImage *img = Q2NSImage(
 			Window::Notifications::GenerateUserpic(peer, userpicView));
 		[notification setContentImage:img];
 	}
 
-	if (!options.hideReplyButton
+	if (!info.actions.empty()
+		&& [notification respondsToSelector:@selector(setAdditionalActions:)]) {
+		NSMutableArray *actions = [NSMutableArray array];
+		if (!info.options.hideMarkAsRead) {
+			[actions addObject:[NSUserNotificationAction
+				actionWithIdentifier:@"markAsRead"
+				title:_cachedMarkAsReadText]];
+		}
+		for (const auto &action : info.actions) {
+			[actions addObject:[NSUserNotificationAction
+				actionWithIdentifier:Q2NSString(action.id)
+				title:Q2NSString(action.text)]];
+		}
+		if (!info.options.hideReplyButton
+			&& [notification respondsToSelector:@selector(setHasReplyButton:)]) {
+			[notification setHasReplyButton:YES];
+		}
+		[notification setAdditionalActions:actions];
+		AddActionIdToNotification(
+			notification,
+			[[actions firstObject] identifier]);
+	} else if (!info.options.hideReplyButton
+		&& !info.options.hideMarkAsRead
+		&& [notification respondsToSelector:@selector(setHasReplyButton:)]
+		&& [notification respondsToSelector:@selector(setAdditionalActions:)]) {
+		[notification setHasReplyButton:YES];
+
+		AddActionIdToNotification(notification, @"markAsRead");
+
+		[notification setAdditionalActions:@[
+			[NSUserNotificationAction
+				actionWithIdentifier:@"markAsRead"
+				title:_cachedMarkAsReadText]
+		]];
+	} else if (!info.options.hideReplyButton
 		&& [notification respondsToSelector:@selector(setHasReplyButton:)]) {
 		[notification setHasReplyButton:YES];
+	} else if (!info.options.hideMarkAsRead
+		&& [notification respondsToSelector:@selector(setHasActionButton:)]) {
+		[notification setHasActionButton:YES];
+		[notification
+			setActionButtonTitle:_cachedMarkAsReadText];
+
+		AddActionIdToNotification(notification, @"markAsRead");
 	}
 
-	[notification setSoundName:nil];
+	const auto sound = info.sound ? info.sound() : Media::Audio::LocalSound();
+	if (sound) {
+		[notification setSoundName:Q2NSString(_sounds.name(sound))];
+	} else {
+		[notification setSoundName:nil];
+	}
 
 	NSUserNotificationCenter *center = [NSUserNotificationCenter defaultUserNotificationCenter];
 	[center deliverNotification:notification];
@@ -359,6 +455,7 @@ void showNotification(
 		auto clearAll = false;
 		auto clearFromItems = base::flat_set<NotificationId>();
 		auto clearFromTopics = base::flat_set<ContextId>();
+		auto clearFromSublists = base::flat_set<ContextId>();
 		auto clearFromHistories = base::flat_set<ContextId>();
 		auto clearFromSessions = base::flat_set<uint64>();
 		{
@@ -376,6 +473,8 @@ void showNotification(
 					clearFromItems.emplace(value.id);
 				}, [&](const ClearFromTopic &value) {
 					clearFromTopics.emplace(value.contextId);
+				}, [&](const ClearFromSublist &value) {
+					clearFromSublists.emplace(value.contextId);
 				}, [&](const ClearFromHistory &value) {
 					clearFromHistories.emplace(value.partialContextId);
 				}, [&](const ClearFromSession &value) {
@@ -403,21 +502,35 @@ void showNotification(
 				return true;
 			}
 			const auto notificationTopicRootId = [topicObject longLongValue];
+			NSNumber *monoforumPeerObject = [notificationUserInfo objectForKey:@"monoforumpeer"];
+			if (!monoforumPeerObject) {
+				return true;
+			}
+			const auto notificationMonoforumPeerId = [monoforumPeerObject unsignedLongLongValue];
 			NSNumber *msgObject = [notificationUserInfo objectForKey:@"msgid"];
 			const auto msgId = msgObject ? [msgObject longLongValue] : 0LL;
 			const auto partialContextId = ContextId{
 				.sessionId = notificationSessionId,
 				.peerId = PeerId(notificationPeerId),
 			};
-			const auto contextId = ContextId{
+			const auto contextId = notificationTopicRootId
+			? ContextId{
 				.sessionId = notificationSessionId,
 				.peerId = PeerId(notificationPeerId),
 				.topicRootId = MsgId(notificationTopicRootId),
-			};
+			}
+			: notificationMonoforumPeerId
+			? ContextId{
+				.sessionId = notificationSessionId,
+				.peerId = PeerId(notificationPeerId),
+				.monoforumPeerId = PeerId(notificationMonoforumPeerId),
+			}
+			: partialContextId;
 			const auto id = NotificationId{ contextId, MsgId(msgId) };
 			return clearFromSessions.contains(notificationSessionId)
 				|| clearFromHistories.contains(partialContextId)
 				|| clearFromTopics.contains(contextId)
+				|| clearFromSublists.contains(contextId)
 				|| (msgId && clearFromItems.contains(id));
 		};
 
@@ -458,6 +571,7 @@ void showNotification(
 		.sessionId = item->history()->session().uniqueId(),
 		.peerId = item->history()->peer->id,
 		.topicRootId = item->topicRootId(),
+		.monoforumPeerId = item->sublistPeerId(),
 	}, item->id });
 }
 
@@ -469,6 +583,15 @@ void showNotification(
 	} });
 }
 
+void Manager::Private::clearFromSublist(
+		not_null<Data::SavedSublist*> sublist) {
+	putClearTask(ClearFromSublist{ ContextId{
+		.sessionId = sublist->session().uniqueId(),
+		.peerId = sublist->owningHistory()->peer->id,
+		.monoforumPeerId = sublist->sublistPeer()->id,
+	} });
+}
+
 void Manager::Private::clearFromHistory(not_null<History*> history) {
 	putClearTask(ClearFromHistory{ ContextId{
 		.sessionId = history->session().uniqueId(),
@@ -485,77 +608,66 @@ void showNotification(
 	[center setDelegate:_delegate];
 }
 
-void Manager::Private::invokeIfNotFocused(Fn<void()> callback) {
-	if (!Platform::IsMac11_0OrGreater()) {
-		queryDoNotDisturbState();
-		if (!DoNotDisturbEnabled) {
-			callback();
-		}
-	} else if (Platform::IsMacStoreBuild() || LibraryPath().isEmpty()) {
-		callback();
-	} else if (!_focusedCallbacks.empty()) {
-		_focusedCallbacks.push_back(std::move(callback));
-	} else if (!ShouldQuerySettings()) {
-		if (!_focused) {
-			callback();
-		}
+void Manager::Private::initCachedMarkAsReadText() {
+	const auto langId = Lang::GetInstance().id();
+
+	const auto preferredLang = [[NSLocale preferredLanguages] firstObject];
+	const auto languageCode
+		= [[NSLocale localeWithLocaleIdentifier:preferredLang] languageCode];
+
+	const auto defaults = [NSUserDefaults standardUserDefaults];
+	const auto cachedText = static_cast<NSString*>([defaults
+		stringForKey:kTelegramMarkAsReadText]);
+	const auto cachedTimestamp = static_cast<NSNumber*>([defaults
+		objectForKey:kTelegramMarkAsReadTimestamp]);
+	const auto cachedLanguageCode = static_cast<NSString*>([defaults
+		stringForKey:kTelegramMarkAsReadLanguageCode]);
+
+	const auto now = base::unixtime::now();
+	const auto shouldRefresh = !cachedTimestamp
+		|| (now - [cachedTimestamp longLongValue]) > kCacheExpirationSeconds
+		|| ![cachedLanguageCode isEqualToString:languageCode];
+
+	if (cachedText && !shouldRefresh) {
+		_cachedMarkAsReadText = [cachedText retain];
 	} else {
-		if (!_processesInited) {
-			_processesInited = true;
-			QObject::connect(&_dnd, &QProcess::finished, [=] {
-				_waitingDnd = false;
-				checkFocusState();
-			});
-			QObject::connect(&_focus, &QProcess::finished, [=] {
-				_waitingFocus = false;
-				checkFocusState();
-			});
-		}
-		const auto start = [](QProcess &process, QString keys) {
-			auto arguments = QStringList()
-				<< "-extract"
-				<< keys
-				<< "raw"
-				<< "-o"
-				<< "-"
-				<< "--"
-				<< (LibraryPath() + "/Preferences/com.apple.controlcenter.plist");
-			DEBUG_LOG(("Focus Check: Started %1.").arg(u"plutil"_q + arguments.join(' ')));
-			process.start(u"plutil"_q, arguments);
-		};
-		_focusedCallbacks.push_back(std::move(callback));
-		_waitingFocus = _waitingDnd = true;
-		start(_focus, u"NSStatusItem Visible FocusModes"_q);
-		start(_dnd, u"NSStatusItem Visible DoNotDisturb"_q);
+		_cachedMarkAsReadText
+			= [Q2NSString(tr::lng_context_mark_read(tr::now)) retain];
 	}
-}
 
-void Manager::Private::checkFocusState() {
-	if (_waitingFocus || _waitingDnd) {
-		return;
-	}
-	const auto istrue = [](QProcess &process) {
-		const auto output = process.readAllStandardOutput();
-		DEBUG_LOG(("Focus Check: %1").arg(output));
-		const auto result = (output.trimmed() == u"true"_q);
-		return result;
-	};
-	_focused = istrue(_focus) || istrue(_dnd);
-	auto callbacks = base::take(_focusedCallbacks);
-	if (!_focused) {
-		for (const auto &callback : callbacks) {
-			callback();
-		}
+	if (langId == NS2QString(languageCode)) {
+		[defaults
+			setObject:Q2NSString(tr::lng_context_mark_read(tr::now))
+			forKey:kTelegramMarkAsReadText];
+		[defaults
+			setObject:@(base::unixtime::now())
+			forKey:kTelegramMarkAsReadTimestamp];
+		[defaults
+			setObject:languageCode
+			forKey:kTelegramMarkAsReadLanguageCode];
+	} else if (shouldRefresh) {
+		Lang::CurrentCloudManager().getValueForLang(
+			u"lng_context_mark_read"_q,
+			NS2QString(languageCode),
+			[=](const QString &r) {
+				if (r != NS2QString(_cachedMarkAsReadText)) {
+					[_cachedMarkAsReadText release];
+					_cachedMarkAsReadText = [Q2NSString(r) retain];
+				}
+				[defaults
+					setObject:Q2NSString(r)
+					forKey:kTelegramMarkAsReadText];
+				[defaults
+					setObject:@(base::unixtime::now())
+					forKey:kTelegramMarkAsReadTimestamp];
+				[defaults
+					setObject:languageCode
+					forKey:kTelegramMarkAsReadLanguageCode];
+			});
 	}
 }
 
 Manager::Private::~Private() {
-	if (_waitingDnd) {
-		_dnd.kill();
-	}
-	if (_waitingFocus) {
-		_focus.kill();
-	}
 	if (_clearingThread.joinable()) {
 		putClearTask(ClearFinish());
 		_clearingThread.join();
@@ -563,6 +675,7 @@ void showNotification(
 	NSUserNotificationCenter *center = [NSUserNotificationCenter defaultUserNotificationCenter];
 	[center setDelegate:nil];
 	[_delegate release];
+	[_cachedMarkAsReadText release];
 }
 
 Manager::Manager(Window::Notifications::System *system) : NativeManager(system)
@@ -572,23 +685,9 @@ void showNotification(
 Manager::~Manager() = default;
 
 void Manager::doShowNativeNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options) {
-	_private->showNotification(
-		peer,
-		topicRootId,
-		userpicView,
-		msgId,
-		title,
-		subtitle,
-		msg,
-		options);
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView) {
+	_private->showNotification(std::move(info), userpicView);
 }
 
 void Manager::doClearAllFast() {
@@ -603,6 +702,10 @@ void showNotification(
 	_private->clearFromTopic(topic);
 }
 
+void Manager::doClearFromSublist(not_null<Data::SavedSublist*> sublist) {
+	_private->clearFromSublist(sublist);
+}
+
 void Manager::doClearFromHistory(not_null<History*> history) {
 	_private->clearFromHistory(history);
 }
@@ -620,11 +723,11 @@ void showNotification(
 }
 
 void Manager::doMaybePlaySound(Fn<void()> playSound) {
-	_private->invokeIfNotFocused(std::move(playSound));
+	playSound();
 }
 
 void Manager::doMaybeFlashBounce(Fn<void()> flashBounce) {
-	_private->invokeIfNotFocused(std::move(flashBounce));
+	flashBounce();
 }
 
 } // namespace Notifications
diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
index ef544803e9d03f..914525fe20bfee 100644
--- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm
@@ -93,6 +93,18 @@
 		? NSNormalWindowLevel
 		: NSPopUpMenuWindowLevel;
 	[window setLevel:level];
+
+	// Fullscreen overlay: follow the currently active Space on activation.
+	// Windowed overlay: behave like a normal tool panel, so the user can move
+	// it to another desktop and it stays there.
+	auto behavior = [window collectionBehavior];
+	if (fullscreen) {
+		behavior |= NSWindowCollectionBehaviorMoveToActiveSpace;
+	} else {
+		behavior &= ~NSWindowCollectionBehaviorMoveToActiveSpace;
+	}
+	[window setCollectionBehavior:behavior];
+
 	[window setHidesOnDeactivate:!_data->window->testAttribute(Qt::WA_MacAlwaysShowToolWindow)];
 	[window setTitleVisibility:NSWindowTitleHidden];
 	[window setTitlebarAppearsTransparent:YES];
@@ -182,12 +194,12 @@
 	rpl::merge(
 		_data->masterOpacity.changes() | rpl::to_empty,
 		_data->maximized.changes() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		raw->update();
 	}, raw->lifetime());
 
 	_data->clearStateRequests.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		raw->clearState();
 		raw->update();
 		state->over = raw->isOver();
@@ -273,7 +285,7 @@
 	};
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=, padding = info.padding] {
+	) | rpl::on_next([=, padding = info.padding] {
 		updateOver();
 		prepareFrame();
 
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h
index 013a59370b74af..3c14de2af479db 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.h
@@ -10,10 +10,6 @@ For license and copyright information please follow this link:
 #include "platform/platform_specific.h"
 #include "platform/mac/specific_mac_p.h"
 
-namespace Data {
-class LocationPoint;
-} // namespace Data
-
 namespace Platform {
 
 inline bool AutostartSupported() {
@@ -31,10 +27,6 @@ inline bool SkipTaskbarSupported() {
 	return false;
 }
 
-inline bool RunInBackground() {
-	return true;
-}
-
 void ActivateThisProcess();
 
 inline uint64 ActivationWindowId(not_null<QWidget*> window) {
@@ -44,6 +36,10 @@ inline uint64 ActivationWindowId(not_null<QWidget*> window) {
 inline void ActivateOtherProcess(uint64 processId, uint64 windowId) {
 }
 
+inline QString ApplicationIconName() {
+	return {};
+}
+
 inline QString ExecutablePathForShortcuts() {
 	return cExeDir() + cExeName();
 }
@@ -72,5 +68,3 @@ int psFixPrevious();
 void psDownloadPathEnableAccess();
 QByteArray psDownloadPathBookmark(const QString &path);
 QByteArray psPathBookmark(const QString &path);
-
-bool psLaunchMaps(const Data::LocationPoint &point);
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm
index 8a7e3c71378fa0..51a09b5b5f1976 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm
@@ -267,6 +267,15 @@ void ActivateThisProcess() {
 	objc_activateProgram(window ? window->widget()->winId() : 0);
 }
 
+void LaunchMaps(const Data::LocationPoint &point, Fn<void()> fail) {
+	if (!QDesktopServices::openUrl(
+		u"https://maps.apple.com/?q=Point&z=16&ll=%1,%2"_q.arg(
+			point.latAsString(),
+			point.lonAsString()))) {
+		fail();
+	}
+}
+
 } // namespace Platform
 
 void psSendToMenu(bool send, bool silent) {
@@ -279,7 +288,3 @@ void psDownloadPathEnableAccess() {
 QByteArray psDownloadPathBookmark(const QString &path) {
 	return objc_downloadPathBookmark(path);
 }
-
-bool psLaunchMaps(const Data::LocationPoint &point) {
-	return QDesktopServices::openUrl(u"https://maps.apple.com/?q=Point&z=16&ll=%1,%2"_q.arg(point.latAsString()).arg(point.lonAsString()));
-}
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
index 48c0cdab06232a..0d4d12fe471d30 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
@@ -13,20 +13,21 @@
 #include "core/sandbox.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "core/version.h"
 #include "core/crash_reports.h"
+#include "menu/menu_dock.h"
 #include "storage/localstorage.h"
 #include "media/audio/media_audio.h"
-#include "media/player/media_player_instance.h"
 #include "window/window_controller.h"
 #include "base/platform/mac/base_utilities_mac.h"
 #include "base/platform/base_platform_info.h"
-#include "lang/lang_keys.h"
 #include "base/timer.h"
 #include "styles/style_window.h"
 #include "platform/platform_specific.h"
 
 #include <QtGui/QWindow>
 #include <QtWidgets/QApplication>
+#include <QtWidgets/QMenu>
 #if __has_include(<QtCore/QOperatingSystemVersion>)
 #include <QtCore/QOperatingSystemVersion>
 #endif // __has_include(<QtCore/QOperatingSystemVersion>)
@@ -45,47 +46,16 @@
 
 constexpr auto kIgnoreActivationTimeoutMs = 500;
 
-NSMenuItem *CreateMenuItem(
-		QString title,
-		rpl::lifetime &lifetime,
-		Fn<void()> callback,
-		bool enabled = true) {
-	id block = [^{
-		Core::Sandbox::Instance().customEnterFromEventLoop(callback);
-	} copy];
-
-	NSMenuItem *item = [[NSMenuItem alloc]
-		initWithTitle:Q2NSString(title)
-		action:@selector(invoke)
-		keyEquivalent:@""];
-	[item setTarget:block];
-	[item setEnabled:enabled];
-
-	lifetime.add([=] {
-		[block release];
+void SetupDockMenu() {
+	static const auto DockMenu = std::make_unique<QMenu>();
+	QObject::connect(DockMenu.get(), &QMenu::aboutToShow, [] {
+		Menu::RefreshDockMenu(DockMenu.get());
 	});
-	return [item autorelease];
+	DockMenu->setAsDockMenu();
 }
 
 } // namespace
 
-@interface RpMenu : NSMenu {
-}
-
-- (rpl::lifetime &) lifetime;
-
-@end // @interface Menu
-
-@implementation RpMenu {
-	rpl::lifetime _lifetime;
-}
-
-- (rpl::lifetime &) lifetime {
-	return _lifetime;
-}
-
-@end // @implementation Menu
-
 @interface qVisualize : NSObject {
 }
 
@@ -140,8 +110,6 @@ - (void) receiveWakeNote:(NSNotification*)note;
 
 - (void) ignoreApplicationActivationRightNow;
 
-- (NSMenu *) applicationDockMenu:(NSApplication *)sender;
-
 @end // @interface ApplicationDelegate
 
 ApplicationDelegate *_sharedDelegate = nil;
@@ -216,49 +184,6 @@ - (void) ignoreApplicationActivationRightNow {
 	_ignoreActivationStop.callOnce(kIgnoreActivationTimeoutMs);
 }
 
-- (NSMenu *) applicationDockMenu:(NSApplication *)sender {
-	if (!Core::IsAppLaunched()) {
-		return nil;
-	}
-	RpMenu* dockMenu = [[[RpMenu alloc] initWithTitle: @""] autorelease];
-	[dockMenu setAutoenablesItems:false];
-
-	auto notifyCallback = [] {
-		auto &settings = Core::App().settings();
-		settings.setDesktopNotify(!settings.desktopNotify());
-	};
-	[dockMenu addItem:CreateMenuItem(
-		Core::App().settings().desktopNotify()
-			? tr::lng_disable_notifications_from_tray(tr::now)
-			: tr::lng_enable_notifications_from_tray(tr::now),
-		[dockMenu lifetime],
-		std::move(notifyCallback))];
-
-	using namespace Media::Player;
-	const auto state = instance()->getState(instance()->getActiveType());
-	if (!IsStoppedOrStopping(state.state)) {
-		[dockMenu addItem:[NSMenuItem separatorItem]];
-		[dockMenu addItem:CreateMenuItem(
-			tr::lng_mac_menu_player_previous(tr::now),
-			[dockMenu lifetime],
-			[] { instance()->previous(); },
-			instance()->previousAvailable(instance()->getActiveType()))];
-		[dockMenu addItem:CreateMenuItem(
-			IsPausedOrPausing(state.state)
-				? tr::lng_mac_menu_player_resume(tr::now)
-				: tr::lng_mac_menu_player_pause(tr::now),
-			[dockMenu lifetime],
-			[] { instance()->playPause(); })];
-		[dockMenu addItem:CreateMenuItem(
-			tr::lng_mac_menu_player_next(tr::now),
-			[dockMenu lifetime],
-			[] { instance()->next(); },
-			instance()->nextAvailable(instance()->getActiveType()))];
-	}
-
-	return dockMenu;
-}
-
 @end // @implementation ApplicationDelegate
 
 namespace Platform {
@@ -310,6 +235,8 @@ void objc_start() {
 		addObserver: _sharedDelegate
 		selector: @selector(receiveWakeNote:)
 		name: NSWorkspaceDidWakeNotification object: NULL];
+
+	crl::on_main([=] { SetupDockMenu(); });
 }
 
 void objc_ignoreApplicationActivationRightNow() {
diff --git a/Telegram/SourceFiles/platform/mac/text_recognition_mac.h b/Telegram/SourceFiles/platform/mac/text_recognition_mac.h
new file mode 100644
index 00000000000000..34db1906d51260
--- /dev/null
+++ b/Telegram/SourceFiles/platform/mac/text_recognition_mac.h
@@ -0,0 +1,8 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
\ No newline at end of file
diff --git a/Telegram/SourceFiles/platform/mac/text_recognition_mac.mm b/Telegram/SourceFiles/platform/mac/text_recognition_mac.mm
new file mode 100644
index 00000000000000..863fc5422b3c06
--- /dev/null
+++ b/Telegram/SourceFiles/platform/mac/text_recognition_mac.mm
@@ -0,0 +1,111 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "platform/platform_text_recognition.h"
+
+#include "base/platform/mac/base_utilities_mac.h"
+
+#import <Foundation/Foundation.h>
+#import <Vision/Vision.h>
+#import <CoreImage/CoreImage.h>
+
+namespace Platform {
+namespace TextRecognition {
+
+bool IsAvailable() {
+	if (@available(macOS 10.15, *)) {
+		return true;
+	}
+	return false;
+}
+
+Result RecognizeText(const QImage &image) {
+	auto result = Result();
+
+	if (!IsAvailable()) {
+		return result;
+	}
+
+	@autoreleasepool {
+		CGImageRef cgImage = image.toCGImage();
+		if (!cgImage) {
+			return result;
+		}
+		CIImage *image = [CIImage imageWithCGImage:cgImage];
+		CFRelease(cgImage);
+
+		if (!image) {
+			return result;
+		}
+
+		if (@available(macOS 10.15, *)) {
+			VNRecognizeTextRequest *request
+				= [[VNRecognizeTextRequest alloc] init];
+			request.recognitionLevel = VNRequestTextRecognitionLevelAccurate;
+
+			VNImageRequestHandler *handler = [[VNImageRequestHandler alloc]
+				initWithCIImage:image options:@{}];
+
+			NSError *error = nil;
+			const auto success
+				= [handler performRequests:@[request] error:&error];
+
+			if (success && !error) {
+				const auto imageSize = image.extent.size;
+				for (VNRecognizedTextObservation *obs in request.results) {
+					VNRecognizedText *recognizedText = [obs
+						topCandidates:1].firstObject;
+					if (recognizedText) {
+						const auto text = recognizedText.string;
+						const auto convert = [&](CGRect box) {
+							const auto x = box.origin.x * imageSize.width;
+							const auto y = (1.0 - box.origin.y
+								- box.size.height) * imageSize.height;
+							const auto width = box.size.width
+								* imageSize.width;
+							const auto height = box.size.height
+								* imageSize.height;
+							return QRect(
+								style::ConvertScale(x),
+								style::ConvertScale(y),
+								style::ConvertScale(width),
+								style::ConvertScale(height));
+						};
+						auto glyphs = std::vector<QRect>();
+						if (@available(macOS 11.0, *)) {
+							const auto length = NSInteger(text.length);
+							glyphs.reserve(length);
+							for (auto i = NSInteger(); i < length; ++i) {
+								NSError *rangeError = nil;
+								auto *box = [recognizedText
+									boundingBoxForRange:NSMakeRange(i, 1)
+									error:&rangeError];
+								glyphs.push_back((box && !rangeError)
+									? convert(box.boundingBox)
+									: QRect());
+							}
+						}
+						result.items.push_back({
+							NS2QString(text),
+							convert(obs.boundingBox),
+							std::move(glyphs)
+						});
+					}
+				}
+				result.success = true;
+			}
+
+			[request release];
+			[handler release];
+		}
+	}
+
+	return result;
+}
+
+} // namespace TextRecognition
+} // namespace Platform
\ No newline at end of file
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm
index ca4f88dadc0098..747ef0d4038e67 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm
@@ -428,7 +428,7 @@ - (void)processHorizontalReorder {
 	_gestures.events(
 	) | rpl::filter([=] {
 		return !(*waitForFinish);
-	}) | rpl::start_with_next([=](
+	}) | rpl::on_next([=](
 			not_null<NSPressGestureRecognizer*> gesture) {
 		const auto currentPosition = [gesture locationInView:self].x;
 
@@ -444,7 +444,7 @@ - (void)processHorizontalReorder {
 	}, _lifetime);
 
 	_session->data().pinnedDialogsOrderUpdated(
-	) | rpl::start_with_next(cancelCurrent, _lifetime);
+	) | rpl::on_next(cancelCurrent, _lifetime);
 
 	_lifetime.add([=] {
 		for (const auto &pin : _pins) {
@@ -477,7 +477,7 @@ - (id)init:(not_null<Main::Session*>)session
 	// manually, before it leads to crashes.
 	std::move(
 		touchBarSwitches
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_lifetime.destroy();
 	}, _lifetime);
 
@@ -503,7 +503,7 @@ - (id)init:(not_null<Main::Session*>)session
 			kCircleDiameter)];
 	};
 	lastDialogsCount->changes(
-	) | rpl::start_with_next(updatePanelSize, _lifetime);
+	) | rpl::on_next(updatePanelSize, _lifetime);
 	const auto singleUserpic = [=](const auto &pin) {
 		if (IsSelfPeer(pin->peer)) {
 			pin->userpic = _savedMessages;
@@ -537,7 +537,7 @@ - (id)init:(not_null<Main::Session*>)session
 	};
 	const auto listenToDownloaderFinished = [=] {
 		_session->downloaderTaskFinished(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto all = ranges::all_of(_pins, [=](const auto &pin) {
 				return (!pin->peer->hasUserpic())
 					|| (!Ui::PeerUserpicLoading(pin->userpicView));
@@ -578,7 +578,7 @@ - (id)init:(not_null<Main::Session*>)session
 				pin->peer,
 				UpdateFlag::OnlineStatus) | to_peer,
 			onlineChanges->events()
-		) | rpl::start_with_next([=](PeerData *peer) {
+		) | rpl::on_next([=](PeerData *peer) {
 			const auto it = ranges::find(_pins, peer, &Pin::peer);
 			if (it == end(_pins)) {
 				return;
@@ -644,7 +644,7 @@ - (id)init:(not_null<Main::Session*>)session
 			_session->changes().peerUpdates(
 				peer,
 				UpdateFlag::Photo
-			) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+			) | rpl::on_next([=](const Data::PeerUpdate &update) {
 				_pins[index]->userpicView = update.peer->createUserpicView();
 				listenToDownloaderFinished();
 			}, *peerChangedLifetime);
@@ -666,7 +666,7 @@ - (id)init:(not_null<Main::Session*>)session
 					peer,
 					UpdateFlag::Notifications
 				) | rpl::to_empty
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				updateBadge(_pins[index]);
 			}, *peerChangedLifetime);
 		}
@@ -676,7 +676,7 @@ - (id)init:(not_null<Main::Session*>)session
 
 	rpl::single(rpl::empty) | rpl::then(
 		_session->data().pinnedDialogsOrderUpdated()
-	) | rpl::start_with_next(updatePinnedChats, _lifetime);
+	) | rpl::on_next(updatePinnedChats, _lifetime);
 
 	const auto ArchiveId = Data::Folder::kId;
 	rpl::single(
@@ -685,7 +685,7 @@ - (id)init:(not_null<Main::Session*>)session
 		_session->data().chatsListChanges()
 	) | rpl::filter([](Data::Folder *folder) {
 		return folder && (folder->id() == ArchiveId);
-	}) | rpl::start_with_next([=](Data::Folder *folder) {
+	}) | rpl::on_next([=](Data::Folder *folder) {
 		_hasArchive = !folder->chatsList()->empty();
 		if (_archive.isNull()) {
 			_archive = ArchiveUserpic(folder);
@@ -706,7 +706,7 @@ - (id)init:(not_null<Main::Session*>)session
 	const auto localGuard = _lifetime.make_state<base::has_weak_ptr>();
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		crl::on_main(&(*localGuard), [=] {
 			updateOnlineColor();
 			if (const auto f = _session->data().folderLoaded(ArchiveId)) {
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm
index ac97db92d7cdb3..e3967ef1f52d29 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm
@@ -185,7 +185,9 @@ bool CanSendToActiveChat(
 		not_null<Window::Controller*> controller,
 		ChatRestriction right) {
 	if (const auto peer = ActiveChat(controller).peer()) {
-		return Data::RestrictionError(peer, right);
+		if (const auto error = Data::RestrictionError(peer, right)) {
+			return *error;
+		}
 	}
 	return std::nullopt;
 }
@@ -231,7 +233,6 @@ void AppendRecentStickers(
 		: 0;
 	if (cloudCount > 0) {
 		to.emplace_back(PickerScrubberItem(cloudIt->second->title));
-		auto count = 0;
 		for (const auto document : cloudIt->second->stickers) {
 			if (document->owner().stickers().isFaved(document)) {
 				continue;
@@ -580,7 +581,7 @@ - (id)init:(not_null<Window::Controller*>)controller
 				? Data::CanSend(topic, right)
 				: Data::CanSend(peer, right));
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		[self dismissPopover:nil];
 	}, _lifetime);
 
@@ -605,7 +606,7 @@ - (id)init:(not_null<Window::Controller*>)controller
 			Core::App().settings().recentEmojiUpdated(),
 			Ui::Emoji::Updated()
 		) | rpl::map_to(ScrubberItemType::Emoji)
-	) | rpl::start_with_next([=](ScrubberItemType type) {
+	) | rpl::on_next([=](ScrubberItemType type) {
 		_waitingForUpdate = type;
 	}, _lifetime);
 
@@ -627,7 +628,7 @@ - (NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
 			controller:_controller
 			items:_itemsDataSource] autorelease];
 		auto &lifetime = [item lifetime];
-		[item closeRequests] | rpl::start_with_next([=] {
+		[item closeRequests] | rpl::on_next([=] {
 			[self dismissPopover:nil];
 			[self updateStickers];
 		}, lifetime);
@@ -667,7 +668,7 @@ - (void)addDownloadHandler {
 	const auto isPerformedOnMain = loadingLifetime->make_state<bool>(true);
 	const auto localGuard = loadingLifetime->make_state<base::has_weak_ptr>();
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next(crl::guard(&(*localGuard), [=] {
+	) | rpl::on_next(crl::guard(&(*localGuard), [=] {
 		if (*isPerformedOnMain) {
 			crl::on_main(&(*localGuard), [=] {
 				for (auto &sticker : _itemsDataSource->stickers) {
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.mm
index 32dd548b3bdfcb..b20f59919b95f5 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.mm
@@ -118,7 +118,7 @@ - (NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
 				: mediaPlayer->previous(kSongType); });
 		rpl::duplicate(
 			_trackState
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto newValue = isNext
 				? mediaPlayer->nextAvailable(kSongType)
 				: mediaPlayer->previousAvailable(kSongType);
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h
index 1cc8c832f4c996..0df4a61368d0af 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h
@@ -16,7 +16,6 @@ struct TrackState;
 @class NSButton;
 @class NSCustomTouchBarItem;
 @class NSImage;
-@class NSSliderTouchBarItem;
 
 namespace TouchBar {
 
@@ -51,7 +50,7 @@ NSButton *CreateTouchBarButtonWithTwoStates(
 	rpl::producer<bool> stateChanged = rpl::never<bool>());
 
 [[nodiscard]] API_AVAILABLE(macos(10.12.2))
-NSSliderTouchBarItem *CreateTouchBarSlider(
+NSCustomTouchBarItem *CreateTouchBarSlider(
 	NSString *itemId,
 	rpl::lifetime &lifetime,
 	Fn<void(bool, double, double)> callback,
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm
index 3091701102f1b7..fe384385e10a27 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm
@@ -18,7 +18,6 @@
 #import <AppKit/NSImage.h>
 #import <AppKit/NSImageView.h>
 #import <AppKit/NSSlider.h>
-#import <AppKit/NSSliderTouchBarItem.h>
 
 using namespace TouchBar;
 
@@ -76,7 +75,7 @@ - (id)init:(rpl::producer< Media::Player::TrackState>)trackState {
 		) | rpl::map([](const auto &state) {
 			return state.length / 1000;
 		}) | rpl::distinct_until_changed()
-	) | rpl::start_with_next([=](int position, int length) {
+	) | rpl::on_next([=](int position, int length) {
 		[_text setString:[NSString stringWithFormat:@"%@ / %@",
 			FormatTime(position),
 			FormatTime(length)]];
@@ -86,7 +85,7 @@ - (id)init:(rpl::producer< Media::Player::TrackState>)trackState {
 	}, _lifetime);
 
 	textLength->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto size = [_text sizeWithAttributes:Attributes()];
 		_width = size.width + kPadding * 2;
 		_height = size.height;
@@ -182,7 +181,7 @@ - (void)dealloc {
 
 	std::move(
 		stateChanged
-	) | rpl::start_with_next([=](bool isChangedToFirstState) {
+	) | rpl::on_next([=](bool isChangedToFirstState) {
 		button.image = isChangedToFirstState ? icon1 : icon2;
 	}, lifetime);
 
@@ -208,17 +207,21 @@ - (void)dealloc {
 		std::move(stateChanged));
 }
 
-NSSliderTouchBarItem *CreateTouchBarSlider(
+NSCustomTouchBarItem *CreateTouchBarSlider(
 		NSString *itemId,
 		rpl::lifetime &lifetime,
 		Fn<void(bool, double, double)> callback,
 		rpl::producer<Media::Player::TrackState> stateChanged) {
 	const auto lastDurationMs = lifetime.make_state<crl::time>(0);
 
-	auto *seekBar = [[NSSliderTouchBarItem alloc] initWithIdentifier:itemId];
-	seekBar.slider.minValue = 0.0f;
-	seekBar.slider.maxValue = 1.0f;
-	seekBar.customizationLabel = @"Seek Bar";
+	auto *item = [[NSCustomTouchBarItem alloc] initWithIdentifier:itemId];
+	item.customizationLabel = @"Seek Bar";
+
+	auto *slider = [NSSlider sliderWithTarget:nil action:nil];
+	slider.minValue = 0.0f;
+	slider.maxValue = 1.0f;
+	slider.continuous = YES;
+	item.view = slider;
 
 	id block = [^{
 		// https://stackoverflow.com/a/45891017
@@ -227,16 +230,15 @@ - (void)dealloc {
 			touchesMatchingPhase:NSTouchPhaseEnded
 			inView:nil].count > 0;
 		Core::Sandbox::Instance().customEnterFromEventLoop([=] {
-			callback(touchUp, seekBar.slider.doubleValue, *lastDurationMs);
+			callback(touchUp, slider.doubleValue, *lastDurationMs);
 		});
 	} copy];
 
 	std::move(
 		stateChanged
-	) | rpl::start_with_next([=](const Media::Player::TrackState &state) {
+	) | rpl::on_next([=](const Media::Player::TrackState &state) {
 		const auto stop = Media::Player::IsStoppedOrStopping(state.state);
 		const auto duration = double(stop ? 0 : state.length);
-		auto slider = seekBar.slider;
 		if (duration <= 0) {
 			slider.enabled = false;
 			slider.doubleValue = 0;
@@ -252,13 +254,13 @@ - (void)dealloc {
 		}
 	}, lifetime);
 
-	seekBar.target = block;
-	seekBar.action = @selector(invoke);
+	slider.target = block;
+	slider.action = @selector(invoke);
 	lifetime.add([=] {
 		[block release];
 	});
 
-	return seekBar;
+	return item;
 }
 
 NSCustomTouchBarItem *CreateTouchBarTrackPosition(
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
index ea273dab7f7ae9..3732eefb803bf3 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
@@ -98,7 +98,7 @@ - (id)init:(rpl::producer<Ui::MarkdownEnabledState>)markdownState
 		rpl::single(false) | rpl::then(Core::App().passcodeLockChanges()),
 		rpl::single(false) | rpl::then(std::move(audioPlayer)),
 		rpl::single(false) | rpl::then(std::move(voiceRecording))
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			Main::Session *session,
 			bool lock,
 			bool audio,
@@ -148,7 +148,7 @@ - (NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
 					? Data::CanSendAnyOf(topic, rights)
 					: (peer && Data::CanSendAnyOf(peer, rights));
 			}) | rpl::distinct_until_changed()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				Ui::MarkdownEnabledState state,
 				bool hasActiveChat) {
 			item.groupTouchBar.defaultItemIdentifiers = @[
@@ -166,7 +166,7 @@ - (NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
 		auto *touchBar = [[[TouchBarAudioPlayer alloc] init]
 			autorelease];
 		item.groupTouchBar = touchBar;
-		[touchBar closeRequests] | rpl::start_with_next([=] {
+		[touchBar closeRequests] | rpl::on_next([=] {
 			Media::Player::instance()->stopAndClose();
 		}, [item lifetime]);
 		return [item autorelease];
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_media_view.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_media_view.h
index d7591a054e22b0..d40e3124df36aa 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_media_view.h
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_media_view.h
@@ -14,6 +14,7 @@ namespace TouchBar {
 
 void SetupMediaViewTouchBar(
 	WId winId,
+	const QString &matchTitle,
 	not_null<Media::View::PlaybackControls::Delegate*> controlsDelegate,
 	rpl::producer<Media::Player::TrackState> trackState,
 	rpl::producer<Media::View::OverlayWidget::TouchBarItemType> display,
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_media_view.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_media_view.mm
index 9d0869a07fe80e..97c49c66af9ec3 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_media_view.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_media_view.mm
@@ -7,6 +7,7 @@
 */
 #include "platform/mac/touchbar/mac_touchbar_media_view.h"
 
+#include "base/platform/mac/base_utilities_mac.h" // Q2NSString()
 #include "media/audio/media_audio.h"
 #include "platform/mac/touchbar/mac_touchbar_common.h"
 #include "platform/mac/touchbar/mac_touchbar_controls.h"
@@ -40,6 +41,7 @@ inline NSTouchBarItemIdentifier Format(NSString *s) {
 
 @interface MediaViewTouchBar : NSTouchBar
 - (id)init:(not_null<Delegate*>)controlsDelegate
+	matchTitle:(NSString *)matchTitle
 	trackState:(rpl::producer<Media::Player::TrackState>)trackState
 	display:(rpl::producer<ItemType>)display
 	fullscreenToggled:(rpl::producer<bool>)fullscreenToggled;
@@ -47,9 +49,11 @@ - (id)init:(not_null<Delegate*>)controlsDelegate
 
 @implementation MediaViewTouchBar {
 	rpl::lifetime _lifetime;
+	NSString *_matchTitle;
 }
 
 - (id)init:(not_null<Delegate*>)controlsDelegate
+		matchTitle:(NSString *)matchTitle
 		trackState:(rpl::producer<Media::Player::TrackState>)trackState
 		display:(rpl::producer<ItemType>)display
 		fullscreenToggled:(rpl::producer<bool>)fullscreenToggled {
@@ -57,6 +61,7 @@ - (id)init:(not_null<Delegate*>)controlsDelegate
 	if (!self) {
 		return self;
 	}
+	_matchTitle = [matchTitle copy];
 	const auto allocate = [](NSTouchBarItemIdentifier i) {
 		return [[NSCustomTouchBarItem alloc] initWithIdentifier:i];
 	};
@@ -161,29 +166,54 @@ - (id)init:(not_null<Delegate*>)controlsDelegate
 	std::move(
 		display
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](ItemType type) {
+	) | rpl::on_next([=](ItemType type) {
 		TouchBar::CustomEnterToCocoaEventLoop([=] {
 			self.defaultItemIdentifiers = items(type);
 		});
 	}, _lifetime);
 
+	[[NSNotificationCenter defaultCenter]
+		addObserver:self
+		selector:@selector(handleKeyWindowChanged:)
+		name:NSWindowDidBecomeKeyNotification
+		object:nil];
+
 	return self;
 }
 
+- (void)handleKeyWindowChanged:(NSNotification *)notification {
+	auto *window = (NSWindow *)notification.object;
+	if (!_matchTitle || ![[window title] isEqualToString:_matchTitle]) {
+		return;
+	}
+	if ([window touchBar] != self) {
+		[window setTouchBar:self];
+	}
+}
+
+- (void)dealloc {
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
+	[_matchTitle release];
+	[super dealloc];
+}
+
 @end // @implementation MediaViewTouchBar
 
 namespace TouchBar {
 
 void SetupMediaViewTouchBar(
 		WId winId,
+		const QString &matchTitle,
 		not_null<Delegate*> controlsDelegate,
 		rpl::producer<Media::Player::TrackState> trackState,
 		rpl::producer<ItemType> display,
 		rpl::producer<bool> fullscreenToggled) {
 	auto *window = [reinterpret_cast<NSView*>(winId) window];
+	auto *title = Platform::Q2NSString(matchTitle);
 	CustomEnterToCocoaEventLoop([=] {
 		[window setTouchBar:[[[MediaViewTouchBar alloc]
 			init:std::move(controlsDelegate)
+			matchTitle:title
 			trackState:std::move(trackState)
 			display:std::move(display)
 			fullscreenToggled:std::move(fullscreenToggled)
diff --git a/Telegram/SourceFiles/platform/mac/translate_provider_mac.h b/Telegram/SourceFiles/platform/mac/translate_provider_mac.h
new file mode 100644
index 00000000000000..996f5d484f7010
--- /dev/null
+++ b/Telegram/SourceFiles/platform/mac/translate_provider_mac.h
@@ -0,0 +1,18 @@
+// This file is part of Telegram Desktop,
+// the official desktop application for the Telegram messaging service.
+//
+// For license and copyright information please follow this link:
+// https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+//
+#pragma once
+
+#include "translate_provider.h"
+
+namespace Platform {
+
+[[nodiscard]] std::unique_ptr<Ui::TranslateProvider>
+CreateTranslateProvider();
+
+[[nodiscard]] bool IsTranslateProviderAvailable();
+
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/translate_provider_mac.mm b/Telegram/SourceFiles/platform/mac/translate_provider_mac.mm
new file mode 100644
index 00000000000000..ff85d63bb50c1a
--- /dev/null
+++ b/Telegram/SourceFiles/platform/mac/translate_provider_mac.mm
@@ -0,0 +1,122 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "platform/mac/translate_provider_mac.h"
+
+#ifndef TDESKTOP_DISABLE_SWIFT6
+
+#include "base/weak_ptr.h"
+#include "spellcheck/platform/platform_language.h"
+#include "translate_provider_mac_swift_bridge.h"
+
+namespace Platform {
+namespace {
+
+[[nodiscard]] Ui::TranslateProviderError ParseErrorCode(
+		const char *errorUtf8) {
+	return !std::strcmp(errorUtf8, "local-language-pack-missing")
+		? Ui::TranslateProviderError::LocalLanguagePackMissing
+		: Ui::TranslateProviderError::Unknown;
+}
+
+class TranslateProvider final : public Ui::TranslateProvider
+, public base::has_weak_ptr {
+public:
+	[[nodiscard]] bool supportsMessageId() const override {
+		return false;
+	}
+
+	void request(
+			Ui::TranslateProviderRequest request,
+			LanguageId to,
+			Fn<void(Ui::TranslateProviderResult)> done) override {
+		if (request.text.text.isEmpty()) {
+			done(Ui::TranslateProviderResult{
+				.error = Ui::TranslateProviderError::Unknown,
+			});
+			return;
+		}
+		const auto text = request.text.text.toUtf8();
+		const auto target = to.twoLetterCode().toUtf8();
+		if (target.isEmpty()) {
+			done(Ui::TranslateProviderResult{
+				.error = Ui::TranslateProviderError::Unknown,
+			});
+			return;
+		}
+		struct CallbackContext {
+			base::weak_ptr<TranslateProvider> provider;
+			Fn<void(Ui::TranslateProviderResult)> done;
+		};
+		auto ownedContext = std::make_unique<CallbackContext>(CallbackContext{
+			.provider = base::make_weak(this),
+			.done = std::move(done),
+		});
+		TranslateProviderMacSwiftTranslate(
+			text.constData(),
+			target.constData(),
+			ownedContext.release(),
+			[](void *context, const char *resultUtf8, const char *errorUtf8) {
+				auto guard = std::unique_ptr<CallbackContext>(
+					static_cast<CallbackContext*>(context));
+				auto done = std::move(guard->done);
+				const auto isAlive = (guard->provider.get() != nullptr);
+				auto result = Ui::TranslateProviderResult();
+				if (resultUtf8 != nullptr) {
+					result.text = TextWithEntities{
+						.text = QString::fromUtf8(resultUtf8),
+					};
+					std::free(const_cast<char*>(resultUtf8));
+				}
+				if (errorUtf8 != nullptr) {
+					result.error = ParseErrorCode(errorUtf8);
+					std::free(const_cast<char*>(errorUtf8));
+				} else if (!result.text.has_value()) {
+					result.error = Ui::TranslateProviderError::Unknown;
+				}
+				if (!isAlive) {
+					return;
+				}
+				crl::on_main([=,
+						done = std::move(done),
+						result = std::move(result)] {
+					done(std::move(result));
+				});
+			});
+	}
+
+};
+
+} // namespace
+
+std::unique_ptr<Ui::TranslateProvider> CreateTranslateProvider() {
+	if (TranslateProviderMacSwiftIsAvailable()) {
+		return std::make_unique<TranslateProvider>();
+	}
+	return nullptr;
+}
+
+bool IsTranslateProviderAvailable() {
+	return TranslateProviderMacSwiftIsAvailable();
+}
+
+#else // TDESKTOP_DISABLE_SWIFT6
+
+// Local on-device translation disabled (no Swift 6).
+namespace Platform {
+
+std::unique_ptr<Ui::TranslateProvider> CreateTranslateProvider() {
+	return nullptr;
+}
+
+bool IsTranslateProviderAvailable() {
+	return false;
+}
+
+#endif // TDESKTOP_DISABLE_SWIFT6
+
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/tray_mac.h b/Telegram/SourceFiles/platform/mac/tray_mac.h
index 6667d3cb12e0c1..1e472ce3b13903 100644
--- a/Telegram/SourceFiles/platform/mac/tray_mac.h
+++ b/Telegram/SourceFiles/platform/mac/tray_mac.h
@@ -12,6 +12,11 @@ For license and copyright information please follow this link:
 #include "base/unique_qptr.h"
 
 class QMenu;
+class QIcon;
+
+namespace Ui {
+class DynamicImage;
+} // namespace Ui
 
 namespace Platform {
 
@@ -38,6 +43,16 @@ class Tray final {
 	void destroyMenu();
 
 	void addAction(rpl::producer<QString> text, Fn<void()> &&callback);
+	void addAction(
+		rpl::producer<QString> text,
+		Fn<void()> &&callback,
+		const QIcon &icon);
+	void addAction(
+		rpl::producer<QString> text,
+		Fn<void()> &&callback,
+		std::shared_ptr<Ui::DynamicImage> icon,
+		int size);
+	void addSeparator();
 
 	void showTrayMessage() const;
 	[[nodiscard]] bool hasTrayMessageSupport() const;
diff --git a/Telegram/SourceFiles/platform/mac/tray_mac.mm b/Telegram/SourceFiles/platform/mac/tray_mac.mm
index beefa110055660..77b824cb39412c 100644
--- a/Telegram/SourceFiles/platform/mac/tray_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/tray_mac.mm
@@ -10,12 +10,15 @@
 #include "base/platform/mac/base_utilities_mac.h"
 #include "core/application.h"
 #include "core/sandbox.h"
+#include "core/version.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "ui/painter.h"
+#include "ui/dynamic_image.h"
 #include "styles/style_window.h"
 
 #include <QtWidgets/QMenu>
+#include <QtGui/QIcon>
 
 #import <AppKit/NSMenu.h>
 #import <AppKit/NSStatusItem.h>
@@ -82,6 +85,11 @@ - (void) observeValueForKeyPath:(NSString *)keyPath
 
 namespace {
 
+enum class TrayClickType {
+	Left,
+	Right,
+};
+
 [[nodiscard]] bool IsAnyActiveForTrayMenu() {
 	for (const NSWindow *w in [[NSApplication sharedApplication] windows]) {
 		if (w.isKeyWindow) {
@@ -233,14 +241,14 @@ void UpdateIcon(const NSStatusItem *status) {
 	void showMenu(not_null<QMenu*> menu);
 	void deactivateButton();
 
-	[[nodiscard]] rpl::producer<> clicks() const;
+	[[nodiscard]] rpl::producer<TrayClickType> clicks() const;
 	[[nodiscard]] rpl::producer<> aboutToShowRequests() const;
 
 private:
 	CommonDelegate *_delegate;
 	NSStatusItem *_status;
 
-	rpl::event_stream<> _clicks;
+	rpl::event_stream<TrayClickType> _clicks;
 
 	rpl::lifetime _lifetime;
 
@@ -260,11 +268,11 @@ void UpdateIcon(const NSStatusItem *status) {
 			| NSKeyValueObservingOptionInitial
 		context:nil];
 
-	[_delegate closes] | rpl::start_with_next([=] {
+	[_delegate closes] | rpl::on_next([=] {
 		_status.menu = nil;
 	}, _lifetime);
 
-	[_delegate appearanceChanges] | rpl::start_with_next([=] {
+	[_delegate appearanceChanges] | rpl::on_next([=] {
 		updateIcon();
 	}, _lifetime);
 
@@ -276,12 +284,17 @@ void UpdateIcon(const NSStatusItem *status) {
 	[_status.button sendActionOn:masks];
 
 	id buttonCallback = [^{
-		const auto type = NSApp.currentEvent.type;
+		const auto event = NSApp.currentEvent;
+		const auto type = event.type;
 
-		if ((type == NSEventTypeLeftMouseDown)
-			|| (type == NSEventTypeRightMouseDown)) {
+		if (type == NSEventTypeLeftMouseDown) {
+			Core::Sandbox::Instance().customEnterFromEventLoop([=] {
+				_clicks.fire(TrayClickType::Left);
+			});
+		} else if (type == NSEventTypeRightMouseDown
+			|| type == NSEventTypeRightMouseUp) {
 			Core::Sandbox::Instance().customEnterFromEventLoop([=] {
-				_clicks.fire({});
+				_clicks.fire(TrayClickType::Right);
 			});
 		}
 	} copy];
@@ -319,7 +332,7 @@ void UpdateIcon(const NSStatusItem *status) {
 	[_status.button highlight:false];
 }
 
-rpl::producer<> NativeIcon::clicks() const {
+rpl::producer<TrayClickType> NativeIcon::clicks() const {
 	return _clicks.events();
 }
 
@@ -336,8 +349,13 @@ void UpdateIcon(const NSStatusItem *status) {
 		// On macOS we are activating the window on click
 		// instead of showing the menu, when the window is not activated.
 		_nativeIcon->clicks(
-		) | rpl::start_with_next([=] {
-			if (IsAnyActiveForTrayMenu()) {
+		) | rpl::on_next([=](TrayClickType type) {
+			if (!_menu) {
+				return;
+			}
+			if (type == TrayClickType::Right) {
+				_nativeIcon->showMenu(_menu.get());
+			} else if (IsAnyActiveForTrayMenu()) {
 				_nativeIcon->showMenu(_menu.get());
 			} else {
 				_nativeIcon->deactivateButton();
@@ -372,18 +390,63 @@ void UpdateIcon(const NSStatusItem *status) {
 }
 
 void Tray::addAction(rpl::producer<QString> text, Fn<void()> &&callback) {
+	addAction(std::move(text), std::move(callback), QIcon());
+}
+
+void Tray::addAction(
+		rpl::producer<QString> text,
+		Fn<void()> &&callback,
+		const QIcon &icon) {
 	if (!_menu) {
 		return;
 	}
 
 	const auto action = _menu->addAction(QString(), std::move(callback));
+	action->setIcon(icon);
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		action->setText(text);
 	}, _actionsLifetime);
 }
 
+void Tray::addAction(
+		rpl::producer<QString> text,
+		Fn<void()> &&callback,
+		std::shared_ptr<Ui::DynamicImage> icon,
+		int size) {
+	if (!_menu) {
+		return;
+	}
+
+	const auto action = _menu->addAction(QString(), std::move(callback));
+	if (icon) {
+		const auto updateIcon = crl::guard(action, [=] {
+			action->setIcon(QIcon(QPixmap::fromImage(icon->image(size))));
+		});
+		icon->subscribeToUpdates([=] {
+			Core::Sandbox::Instance().customEnterFromEventLoop([=] {
+				updateIcon();
+			});
+		});
+		updateIcon();
+		_actionsLifetime.add([icon = std::move(icon)] {
+			icon->subscribeToUpdates(nullptr);
+		});
+	}
+	std::move(
+		text
+	) | rpl::on_next([=](const QString &text) {
+		action->setText(text);
+	}, _actionsLifetime);
+}
+
+void Tray::addSeparator() {
+	if (_menu) {
+		_menu->addSeparator();
+	}
+}
+
 void Tray::showTrayMessage() const {
 }
 
diff --git a/Telegram/SourceFiles/platform/mac/webauthn_mac.mm b/Telegram/SourceFiles/platform/mac/webauthn_mac.mm
new file mode 100644
index 00000000000000..47fd94f6dc1d10
--- /dev/null
+++ b/Telegram/SourceFiles/platform/mac/webauthn_mac.mm
@@ -0,0 +1,297 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+
+#include "platform/platform_webauthn.h"
+
+#if 0
+
+#include "data/data_passkey_deserialize.h"
+#include "base/options.h"
+
+#import <AuthenticationServices/AuthenticationServices.h>
+#import <Foundation/Foundation.h>
+
+@interface WebAuthnDelegate : NSObject<
+	ASAuthorizationControllerDelegate,
+	ASAuthorizationControllerPresentationContextProviding>
+@property (nonatomic, copy) void (^completionRegister)(
+	const Platform::WebAuthn::RegisterResult&);
+@property (nonatomic, copy) void (^completionLogin)(
+	const Platform::WebAuthn::LoginResult&);
+@property (nonatomic, strong) ASAuthorizationController *controller API_AVAILABLE(macos(10.15));
+@property (nonatomic, strong)
+	ASAuthorizationPlatformPublicKeyCredentialProvider *provider API_AVAILABLE(macos(12.0));
+@end
+
+@implementation WebAuthnDelegate
+
+- (void)authorizationController:(ASAuthorizationController *)controller
+	didCompleteWithAuthorization:(ASAuthorization *)authorization
+		API_AVAILABLE(macos(12.0)) {
+	if (self.completionRegister) {
+		if ([authorization.credential conformsToProtocol:
+				@protocol(ASAuthorizationPublicKeyCredentialRegistration)]) {
+			auto credential
+				= (id<ASAuthorizationPublicKeyCredentialRegistration>)
+					authorization.credential;
+			auto result = Platform::WebAuthn::RegisterResult();
+			result.success = true;
+			result.credentialId = QByteArray::fromNSData(
+				credential.credentialID);
+			result.attestationObject = QByteArray::fromNSData(
+				credential.rawAttestationObject);
+			result.clientDataJSON = QByteArray::fromNSData(
+				credential.rawClientDataJSON);
+			self.completionRegister(result);
+			self.completionRegister = nil;
+		}
+		self.controller = nil;
+		if (@available(macOS 12.0, *)) {
+			self.provider = nil;
+		}
+	} else if (self.completionLogin) {
+		if ([authorization.credential conformsToProtocol:
+				@protocol(ASAuthorizationPublicKeyCredentialAssertion)]) {
+			auto credential
+				= (id<ASAuthorizationPublicKeyCredentialAssertion>)
+					authorization.credential;
+			auto result = Platform::WebAuthn::LoginResult();
+			result.credentialId = QByteArray::fromNSData(
+				credential.credentialID);
+			result.authenticatorData = QByteArray::fromNSData(
+				credential.rawAuthenticatorData);
+			result.signature = QByteArray::fromNSData(
+				credential.signature);
+			result.clientDataJSON = QByteArray::fromNSData(
+				credential.rawClientDataJSON);
+			result.userHandle = QByteArray::fromNSData(credential.userID);
+			self.completionLogin(result);
+			self.completionLogin = nil;
+		}
+		self.controller = nil;
+		if (@available(macOS 12.0, *)) {
+			self.provider = nil;
+		}
+	}
+}
+
+- (void)authorizationController:(ASAuthorizationController *)controller
+			didCompleteWithError:(NSError *)error
+		API_AVAILABLE(macos(10.15)) {
+	const auto isCancelled = (error.code == ASAuthorizationErrorCanceled);
+	const auto isUnsigned = (error.code == 1004 || error.code == 1009);
+	if (!isCancelled) {
+		NSLog(@"WebAuthn error: %@ (code: %ld)",
+			error.localizedDescription, (long)error.code);
+	}
+	if (self.completionRegister) {
+		auto result = Platform::WebAuthn::RegisterResult();
+		result.success = false;
+		result.error = isUnsigned
+			? Platform::WebAuthn::Error::UnsignedBuild
+			: (isCancelled
+				? Platform::WebAuthn::Error::Cancelled
+				: Platform::WebAuthn::Error::Other);
+		self.completionRegister(result);
+		self.completionRegister = nil;
+	} else if (self.completionLogin) {
+		auto result = Platform::WebAuthn::LoginResult();
+		result.error = isUnsigned
+			? Platform::WebAuthn::Error::UnsignedBuild
+			: (isCancelled
+				? Platform::WebAuthn::Error::Cancelled
+				: Platform::WebAuthn::Error::Other);
+		self.completionLogin(result);
+		self.completionLogin = nil;
+	}
+	self.controller = nil;
+	if (@available(macOS 12.0, *)) {
+		self.provider = nil;
+	}
+}
+
+- (ASPresentationAnchor)presentationAnchorForAuthorizationController:
+		(ASAuthorizationController *)controller
+		API_AVAILABLE(macos(10.15)) {
+	return [NSApp mainWindow];
+}
+
+@end
+
+namespace {
+
+base::options::toggle WebAuthnMacOption({
+	.id = "webauthn-mac",
+	.name = "Enable Passkey on macOS",
+	.description = "Enable Passkey support on macOS 12.0+. Experimental feature that may cause crash.",
+	.defaultValue = false,
+	.scope = base::options::macos,
+});
+
+} // namespace
+
+namespace Platform::WebAuthn {
+
+bool IsSupported() {
+	if (!WebAuthnMacOption.value()) {
+		return false;
+	}
+	if (@available(macOS 12.0, *)) {
+		return true;
+	}
+	return false;
+}
+
+void RegisterKey(
+		const Data::Passkey::RegisterData &data,
+		Fn<void(RegisterResult result)> callback) {
+	if (@available(macOS 12.0, *)) {
+		auto rpId = data.rp.id.toNSString();
+		auto userName = data.user.name.toNSString();
+		auto userDisplayName = data.user.displayName.toNSString();
+		auto userId = [NSData dataWithBytes:data.user.id.constData()
+			length:data.user.id.size()];
+		auto challenge = [NSData dataWithBytes:data.challenge.constData()
+			length:data.challenge.size()];
+
+		if (!userId || !challenge) {
+			auto result = RegisterResult();
+			result.success = false;
+			callback(result);
+			return;
+		}
+
+		auto provider = [[ASAuthorizationPlatformPublicKeyCredentialProvider
+			alloc] initWithRelyingPartyIdentifier:rpId];
+
+		auto request = [provider
+			createCredentialRegistrationRequestWithChallenge:challenge
+			name:userName
+			userID:userId];
+
+		if (userDisplayName && userDisplayName.length > 0) {
+			request.displayName = userDisplayName;
+		}
+
+		if (@available(macOS 13.5, *)) {
+			request.attestationPreference =
+				ASAuthorizationPublicKeyCredentialAttestationKindNone;
+		}
+
+		auto controller = [[ASAuthorizationController alloc]
+			initWithAuthorizationRequests:@[request]];
+
+		auto delegate = [[WebAuthnDelegate alloc] init];
+		if (@available(macOS 12.0, *)) {
+			delegate.provider = provider;
+		}
+		delegate.controller = controller;
+		delegate.completionRegister = ^(const RegisterResult &result) {
+			callback(result);
+			[delegate release];
+		};
+
+		controller.delegate = delegate;
+		controller.presentationContextProvider = delegate;
+		[controller performRequests];
+	} else {
+		auto result = RegisterResult();
+		result.success = false;
+		callback(result);
+	}
+}
+
+void Login(
+		const Data::Passkey::LoginData &data,
+		Fn<void(LoginResult result)> callback) {
+	if (@available(macOS 12.0, *)) {
+		auto challenge = [NSData dataWithBytes:data.challenge.constData()
+			length:data.challenge.size()];
+
+		if (!challenge) {
+			auto result = LoginResult();
+			callback(result);
+			return;
+		}
+
+		auto provider = [[ASAuthorizationPlatformPublicKeyCredentialProvider
+			alloc] initWithRelyingPartyIdentifier:data.rpId.toNSString()];
+
+		auto request = [provider
+			createCredentialAssertionRequestWithChallenge:challenge];
+
+		if (!data.allowCredentials.empty()) {
+			NSMutableArray *credentialIds = [NSMutableArray array];
+			for (const auto &cred : data.allowCredentials) {
+				auto credId = [NSData dataWithBytes:cred.id.constData()
+					length:cred.id.size()];
+				if (credId) {
+					[credentialIds addObject:credId];
+				}
+			}
+			if (credentialIds.count > 0) {
+				request.allowedCredentials = credentialIds;
+			}
+		}
+
+		if (data.userVerification == "required") {
+			request.userVerificationPreference =
+				ASAuthorizationPublicKeyCredentialUserVerificationPreferenceRequired;
+		} else if (data.userVerification == "preferred") {
+			request.userVerificationPreference =
+				ASAuthorizationPublicKeyCredentialUserVerificationPreferencePreferred;
+		} else if (data.userVerification == "discouraged") {
+			request.userVerificationPreference =
+				ASAuthorizationPublicKeyCredentialUserVerificationPreferenceDiscouraged;
+		}
+
+		auto controller = [[ASAuthorizationController alloc]
+			initWithAuthorizationRequests:@[request]];
+
+		auto delegate = [[WebAuthnDelegate alloc] init];
+		if (@available(macOS 12.0, *)) {
+			delegate.provider = provider;
+		}
+		delegate.controller = controller;
+		delegate.completionLogin = ^(const LoginResult &result) {
+			callback(result);
+			[delegate release];
+		};
+
+		controller.delegate = delegate;
+		controller.presentationContextProvider = delegate;
+		[controller performRequests];
+	} else {
+		auto result = LoginResult();
+		callback(result);
+	}
+}
+
+} // namespace Platform::WebAuthn
+
+#endif
+
+namespace Platform::WebAuthn {
+
+
+bool IsSupported() {
+	return false;
+}
+
+
+void RegisterKey(
+		const Data::Passkey::RegisterData &data,
+		Fn<void(RegisterResult result)> callback) {
+}
+
+void Login(
+		const Data::Passkey::LoginData &data,
+		Fn<void(LoginResult result)> callback) {
+}
+
+} // namespace Platform::WebAuthn
diff --git a/Telegram/SourceFiles/platform/platform_notifications_manager.h b/Telegram/SourceFiles/platform/platform_notifications_manager.h
index 3ddb70a5406382..da41f6010ee720 100644
--- a/Telegram/SourceFiles/platform/platform_notifications_manager.h
+++ b/Telegram/SourceFiles/platform/platform_notifications_manager.h
@@ -20,6 +20,7 @@ void MaybeFlashBounceForCustom(Fn<void()> flashBounce);
 [[nodiscard]] bool Supported();
 [[nodiscard]] bool Enforced();
 [[nodiscard]] bool ByDefault();
+[[nodiscard]] bool VolumeSupported();
 void Create(Window::Notifications::System *system);
 
 } // namespace Notifications
diff --git a/Telegram/SourceFiles/platform/platform_overlay_widget.cpp b/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
index 63e1de58890a10..03fb75e3155758 100644
--- a/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
+++ b/Telegram/SourceFiles/platform/platform_overlay_widget.cpp
@@ -85,12 +85,12 @@ object_ptr<Ui::AbstractButton> DefaultOverlayWidgetHelper::Buttons::create(
 	rpl::merge(
 		_masterOpacity.changes() | rpl::to_empty,
 		_maximized.changes() | rpl::to_empty
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		raw->update();
 	}, raw->lifetime());
 
 	_clearStateRequests.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		raw->clearState();
 		raw->update();
 		state->over = raw->isOver();
@@ -152,7 +152,7 @@ object_ptr<Ui::AbstractButton> DefaultOverlayWidgetHelper::Buttons::create(
 	};
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateOver();
 		prepareFrame();
 
@@ -224,11 +224,9 @@ rpl::producer<> DefaultOverlayWidgetHelper::controlsActivations() {
 }
 
 rpl::producer<bool> DefaultOverlayWidgetHelper::controlsSideRightValue() {
-	using namespace Ui::Platform;
-
-	return TitleControlsLayoutValue(
-	) | rpl::map([=](const TitleControls::Layout &layout) {
-		return !TitleControlsOnLeft(layout);
+	return _controls->controls.layout().value(
+	) | rpl::map([=](const auto &layout) {
+		return !layout.onLeft();
 	}) | rpl::distinct_until_changed();
 }
 
diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h
index ce839beb16ccea..862e3c3a67f614 100644
--- a/Telegram/SourceFiles/platform/platform_specific.h
+++ b/Telegram/SourceFiles/platform/platform_specific.h
@@ -11,6 +11,10 @@ namespace Core {
 enum class QuitReason;
 } // namespace Core
 
+namespace Data {
+class LocationPoint;
+} // namespace Data
+
 namespace Platform {
 
 void start();
@@ -44,12 +48,13 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done = nullptr);
 [[nodiscard]] bool AutostartSkip();
 [[nodiscard]] bool TrayIconSupported();
 [[nodiscard]] bool SkipTaskbarSupported();
-[[nodiscard]] bool RunInBackground();
 void WriteCrashDumpDetails();
 void NewVersionLaunched(int oldVersion);
 [[nodiscard]] QImage DefaultApplicationIcon();
+[[nodiscard]] QString ApplicationIconName();
 [[nodiscard]] bool PreventsQuit(Core::QuitReason reason);
 [[nodiscard]] QString ExecutablePathForShortcuts();
+void LaunchMaps(const Data::LocationPoint &point, Fn<void()> fail);
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 [[nodiscard]] std::optional<bool> IsDarkMode();
diff --git a/Telegram/SourceFiles/platform/platform_text_recognition.h b/Telegram/SourceFiles/platform/platform_text_recognition.h
new file mode 100644
index 00000000000000..109c427a28d4ae
--- /dev/null
+++ b/Telegram/SourceFiles/platform/platform_text_recognition.h
@@ -0,0 +1,42 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Platform {
+namespace TextRecognition {
+
+struct RectWithText {
+	QString text;
+	QRect rect;
+	std::vector<QRect> glyphs;
+};
+
+struct Result {
+	std::vector<RectWithText> items;
+	bool success = false;
+
+	inline operator bool() const {
+		return success;
+	}
+};
+
+[[nodiscard]] bool IsAvailable();
+[[nodiscard]] Result RecognizeText(const QImage &image);
+
+} // namespace TextRecognition
+} // namespace Platform
+
+// Platform dependent implementations.
+
+#if defined Q_OS_WINRT || defined Q_OS_WIN
+#include "platform/win/text_recognition_win.h"
+#elif defined Q_OS_MAC // Q_OS_WINRT || Q_OS_WIN
+#include "platform/mac/text_recognition_mac.h"
+#else // Q_OS_WINRT || Q_OS_WIN || Q_OS_MAC
+#include "platform/linux/text_recognition_linux.h"
+#endif // else for Q_OS_WINRT || Q_OS_WIN || Q_OS_MAC
\ No newline at end of file
diff --git a/Telegram/SourceFiles/platform/platform_translate_provider.h b/Telegram/SourceFiles/platform/platform_translate_provider.h
new file mode 100644
index 00000000000000..a15b7a8e5c2657
--- /dev/null
+++ b/Telegram/SourceFiles/platform/platform_translate_provider.h
@@ -0,0 +1,25 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "translate_provider.h"
+
+namespace Platform {
+
+[[nodiscard]] bool IsTranslateProviderAvailable();
+[[nodiscard]] std::unique_ptr<Ui::TranslateProvider> CreateTranslateProvider();
+
+} // namespace Platform
+
+#if defined Q_OS_WINRT || defined Q_OS_WIN
+#include "platform/win/translate_provider_win.h"
+#elif defined Q_OS_MAC
+#include "platform/mac/translate_provider_mac.h"
+#else
+#include "platform/linux/translate_provider_linux.h"
+#endif
diff --git a/Telegram/SourceFiles/platform/platform_webauthn.h b/Telegram/SourceFiles/platform/platform_webauthn.h
new file mode 100644
index 00000000000000..16737910ce952b
--- /dev/null
+++ b/Telegram/SourceFiles/platform/platform_webauthn.h
@@ -0,0 +1,50 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+
+#pragma once
+
+namespace Data::Passkey {
+struct RegisterData;
+struct LoginData;
+} // namespace Data::Passkey
+
+namespace Platform::WebAuthn {
+
+enum class Error {
+	None,
+	Cancelled,
+	UnsignedBuild,
+	Other,
+};
+
+struct LoginResult {
+	QByteArray clientDataJSON;
+	QByteArray credentialId;
+	QByteArray authenticatorData;
+	QByteArray signature;
+	QByteArray userHandle;
+	Error error = Error::None;
+};
+
+struct RegisterResult {
+	QByteArray credentialId;
+	QByteArray attestationObject;
+	QByteArray clientDataJSON;
+	bool success = false;
+	Error error = Error::None;
+};
+
+[[nodiscard]] bool IsSupported();
+void RegisterKey(
+	const Data::Passkey::RegisterData &data,
+	Fn<void(RegisterResult result)> callback);
+void Login(
+	const Data::Passkey::LoginData &data,
+	Fn<void(LoginResult result)> callback);
+
+} // namespace Platform::WebAuthn
diff --git a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
index 5bf88365897ff6..f3cc6fb89745cc 100644
--- a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
+++ b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
@@ -117,6 +117,28 @@ HBITMAP IconToBitmap(LPWSTR icon, int iconindex) {
 	return (HBITMAP)CopyImage(result, IMAGE_BITMAP, 0, 0, LR_DEFAULTSIZE | LR_CREATEDIBSECTION);
 }
 
+bool ShouldSaveZoneInformation() {
+	// Check if the "Do not preserve zone information in file attachments" policy is enabled.
+	const auto keyName = L"Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Attachments";
+	const auto valueName = L"SaveZoneInformation";
+	auto key = HKEY();
+	auto result = RegOpenKeyEx(HKEY_CURRENT_USER, keyName, 0, KEY_READ, &key);
+	if (result != ERROR_SUCCESS) {
+		// If the registry key cannot be opened, assume the default behavior:
+		// Windows preserves zone information for downloaded files.
+		return true;
+	}
+
+	DWORD value = 0, type = 0, size = sizeof(value);
+	result = RegQueryValueEx(key, valueName, 0, &type, (LPBYTE)&value, &size);
+	RegCloseKey(key);
+
+	if (result != ERROR_SUCCESS || type != REG_DWORD) {
+		return true;
+	}
+
+	return (value != 1);
+}
 } // namespace
 
 void UnsafeOpenEmailLink(const QString &email) {
@@ -277,6 +299,11 @@ void UnsafeLaunch(const QString &filepath) {
 }
 
 void PostprocessDownloaded(const QString &filepath) {
+	// Mark file saved to the NTFS file system as originating from the Internet security zone
+	// unless this feature is disabled by Group Policy.
+	if (!ShouldSaveZoneInformation()) {
+		return;
+	}
 	auto wstringZoneFile = QDir::toNativeSeparators(filepath).toStdWString() + L":Zone.Identifier";
 	auto f = CreateFile(wstringZoneFile.c_str(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
 	if (f == INVALID_HANDLE_VALUE) { // :(
@@ -375,7 +402,9 @@ bool Get(
 		dialog.setFileMode(QFileDialog::AnyFile);
 		dialog.setAcceptMode(QFileDialog::AcceptSave);
 	}
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	dialog.show();
+#endif // Qt < 6.0.0
 
 	auto realLastPath = [=] {
 		// If we're given some non empty path containing a folder - use it.
diff --git a/Telegram/SourceFiles/platform/win/integration_win.cpp b/Telegram/SourceFiles/platform/win/integration_win.cpp
index 9a75a3a650e1dc..c0ffcef18cf455 100644
--- a/Telegram/SourceFiles/platform/win/integration_win.cpp
+++ b/Telegram/SourceFiles/platform/win/integration_win.cpp
@@ -13,10 +13,14 @@ For license and copyright information please follow this link:
 #include "core/sandbox.h"
 #include "lang/lang_keys.h"
 #include "platform/win/windows_app_user_model_id.h"
+#include "platform/win/windows_taskbar_buttons.h"
 #include "platform/win/tray_win.h"
 #include "platform/platform_integration.h"
 #include "platform/platform_specific.h"
+#include "mainwindow.h"
 #include "tray.h"
+#include "window/window_controller.h"
+
 #include "styles/style_window.h"
 
 #include <QtCore/QAbstractNativeEventFilter>
@@ -39,6 +43,8 @@ void WindowsIntegration::init() {
 	_taskbarCreatedMsgId = RegisterWindowMessage(L"TaskbarButtonCreated");
 }
 
+WindowsIntegration::~WindowsIntegration() = default;
+
 ITaskbarList3 *WindowsIntegration::taskbarList() const {
 	return _taskbarList.get();
 }
@@ -134,23 +140,49 @@ void WindowsIntegration::refreshCustomJumpList() {
 	added = true;
 }
 
+void WindowsIntegration::setupTaskbarButtons(HWND window) {
+	const auto controller = Core::App().activePrimaryWindow();
+	if (!controller
+		|| reinterpret_cast<HWND>(controller->widget()->winId()) != window) {
+		return;
+	}
+	if (!_taskbarButtons || _taskbarButtons->window() != window) {
+		_taskbarButtons = std::make_unique<TaskbarButtons>(
+			_taskbarList.get(),
+			window);
+	}
+	_taskbarButtons->buttonsCreated();
+}
+
 bool WindowsIntegration::processEvent(
 		HWND hWnd,
 		UINT msg,
 		WPARAM wParam,
 		LPARAM lParam,
 		LRESULT *result) {
-	if (msg && msg == _taskbarCreatedMsgId && !_taskbarList) {
-		_taskbarList = base::WinRT::TryCreateInstance<ITaskbarList3>(
-			CLSID_TaskbarList,
-			CLSCTX_ALL);
+	if (msg && msg == _taskbarCreatedMsgId) {
+		if (!_taskbarList) {
+			_taskbarList = base::WinRT::TryCreateInstance<ITaskbarList3>(
+				CLSID_TaskbarList,
+				CLSCTX_ALL);
+			if (_taskbarList) {
+				createCustomJumpList();
+			}
+		}
 		if (_taskbarList) {
-			createCustomJumpList();
+			setupTaskbarButtons(hWnd);
 		}
 	}
 
 	switch (msg) {
+	case WM_COMMAND:
+		if (HIWORD(wParam) == THBN_CLICKED && _taskbarButtons) {
+			_taskbarButtons->buttonClicked(LOWORD(wParam));
+		}
+		break;
+
 	case WM_ENDSESSION:
+		Core::Sandbox::NotifySystemShuttingDown();
 		Core::Quit();
 		break;
 
@@ -174,6 +206,9 @@ bool WindowsIntegration::processEvent(
 		Core::App().settings().setSystemDarkMode(Platform::IsDarkMode());
 #endif // Qt < 6.5.0
 		Core::App().tray().updateIconCounters();
+		if (_taskbarButtons) {
+			_taskbarButtons->refreshTheme();
+		}
 		if (_jumpList) {
 			refreshCustomJumpList();
 		}
diff --git a/Telegram/SourceFiles/platform/win/integration_win.h b/Telegram/SourceFiles/platform/win/integration_win.h
index c58a2846ceaf93..44229dc29d8fc4 100644
--- a/Telegram/SourceFiles/platform/win/integration_win.h
+++ b/Telegram/SourceFiles/platform/win/integration_win.h
@@ -15,10 +15,14 @@ For license and copyright information please follow this link:
 
 namespace Platform {
 
+class TaskbarButtons;
+
 class WindowsIntegration final
 	: public Integration
 	, public QAbstractNativeEventFilter {
 public:
+	~WindowsIntegration();
+
 	void init() override;
 
 	[[nodiscard]] ITaskbarList3 *taskbarList() const;
@@ -39,10 +43,12 @@ class WindowsIntegration final
 
 	void createCustomJumpList();
 	void refreshCustomJumpList();
+	void setupTaskbarButtons(HWND window);
 
 	uint32 _taskbarCreatedMsgId = 0;
 	winrt::com_ptr<ITaskbarList3> _taskbarList;
 	winrt::com_ptr<ICustomDestinationList> _jumpList;
+	std::unique_ptr<TaskbarButtons> _taskbarButtons;
 
 };
 
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp
index ede58134f488c1..159ca539cd3a9a 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.cpp
+++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp
@@ -240,6 +240,96 @@ bool EventFilter::mainWindowEvent(
 	return false;
 }
 
+[[nodiscard]] QString HumanReadableDisplayName(HMONITOR hMonitor) {
+	// https://github.com/qt/qtbase/commit/6136b92f540c15835e0c7eb7e01ab7b58fbea685
+	auto monitorInfo = MONITORINFOEX{};
+	monitorInfo.cbSize = sizeof(MONITORINFOEX);
+	if (!GetMonitorInfo(hMonitor, &monitorInfo)) {
+		return QString();
+	}
+
+	// Try Display Configuration API first (Windows 7+).
+	auto numPathArrayElements = UINT32(0);
+	auto numModeInfoArrayElements = UINT32(0);
+	if (GetDisplayConfigBufferSizes(
+			QDC_ONLY_ACTIVE_PATHS,
+			&numPathArrayElements,
+			&numModeInfoArrayElements) != ERROR_SUCCESS) {
+		return QString();
+	}
+
+	auto pathInfos = std::vector<DISPLAYCONFIG_PATH_INFO>(
+		numPathArrayElements);
+	auto modeInfos = std::vector<DISPLAYCONFIG_MODE_INFO>(
+		numModeInfoArrayElements);
+
+	if (QueryDisplayConfig(
+			QDC_ONLY_ACTIVE_PATHS,
+			&numPathArrayElements,
+			pathInfos.data(),
+			&numModeInfoArrayElements,
+			modeInfos.data(),
+			nullptr) != ERROR_SUCCESS) {
+		return QString();
+	}
+
+	// Find matching path.
+	for (const auto &path : pathInfos) {
+		auto deviceName = DISPLAYCONFIG_SOURCE_DEVICE_NAME{};
+		deviceName.header.type = static_cast<DISPLAYCONFIG_DEVICE_INFO_TYPE>(
+			DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME);
+		deviceName.header.size = sizeof(DISPLAYCONFIG_SOURCE_DEVICE_NAME);
+		deviceName.header.adapterId = path.sourceInfo.adapterId;
+		deviceName.header.id = path.sourceInfo.id;
+
+		if (DisplayConfigGetDeviceInfo(&deviceName.header) != ERROR_SUCCESS
+			|| wcscmp(
+				monitorInfo.szDevice,
+				deviceName.viewGdiDeviceName) != 0) {
+			continue;
+		}
+
+		auto targetName = DISPLAYCONFIG_TARGET_DEVICE_NAME{};
+		targetName.header.type = static_cast<DISPLAYCONFIG_DEVICE_INFO_TYPE>(
+			DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME);
+		targetName.header.size = sizeof(DISPLAYCONFIG_TARGET_DEVICE_NAME);
+		targetName.header.adapterId = path.targetInfo.adapterId;
+		targetName.header.id = path.targetInfo.id;
+
+		if (DisplayConfigGetDeviceInfo(&targetName.header) == ERROR_SUCCESS) {
+			const auto friendlyName = QString::fromWCharArray(
+				targetName.monitorFriendlyDeviceName);
+			if (!friendlyName.isEmpty()) {
+				return friendlyName;
+			}
+		}
+	}
+
+	// Fallback to legacy method.
+	auto displayDevice = DISPLAY_DEVICE{};
+	displayDevice.cb = sizeof(DISPLAY_DEVICE);
+	for (auto deviceIndex = DWORD(0);
+			EnumDisplayDevices(
+				monitorInfo.szDevice,
+				deviceIndex,
+				&displayDevice,
+				0);
+			deviceIndex++) {
+		if (!(displayDevice.StateFlags & DISPLAY_DEVICE_ACTIVE)) {
+			continue;
+		}
+		const auto deviceName = QString::fromWCharArray(
+			displayDevice.DeviceString);
+		if (!deviceName.isEmpty()
+			&& deviceName != u"Generic PnP Monitor"_q) {
+			return deviceName;
+		}
+		break;
+	}
+
+	return QString();
+}
+
 } // namespace
 
 struct MainWindow::Private {
@@ -303,7 +393,7 @@ MainWindow::MainWindow(not_null<Window::Controller*> controller)
 	using namespace rpl::mappers;
 	Core::App().appDeactivatedValue(
 	) | rpl::distinct_until_changed(
-	) | rpl::filter(_1) | rpl::start_with_next([=] {
+	) | rpl::filter(_1) | rpl::on_next([=] {
 		_lastDeactivateTime = crl::now();
 	}, lifetime());
 
@@ -312,7 +402,7 @@ MainWindow::MainWindow(not_null<Window::Controller*> controller)
 
 void MainWindow::setupPreviewPasscodeLock() {
 	Core::App().passcodeLockValue(
-	) | rpl::start_with_next([=](bool locked) {
+	) | rpl::on_next([=](bool locked) {
 		// Use iconic bitmap instead of the window content if passcoded.
 		BOOL fForceIconic = locked ? TRUE : FALSE;
 		BOOL fHasIconicBitmap = fForceIconic;
@@ -339,7 +429,7 @@ void MainWindow::setupNativeWindowFrame() {
 	rpl::combine(
 		std::move(nativeFrame),
 		Window::Theme::IsNightModeValue()
-	) | rpl::skip(1) | rpl::start_with_next([=](bool native, bool night) {
+	) | rpl::skip(1) | rpl::on_next([=](bool native, bool night) {
 		validateWindowTheme(native, night);
 	}, lifetime());
 }
@@ -724,4 +814,36 @@ int32 ScreenNameChecksum(const QString &name) {
 	return base::crc32(buffer, sizeof(buffer));
 }
 
+int32 ScreenNameChecksum(const QScreen *screen) {
+	return ScreenNameChecksum(screen->name());
+}
+
+QString ScreenDisplayLabel(const QScreen *screen) {
+	if (!screen) {
+		return QString();
+	}
+
+	const auto geometry = screen->geometry();
+	const auto hMonitor = MonitorFromPoint(
+		POINT{
+			geometry.x() + geometry.width() / 2,
+			geometry.y() + geometry.height() / 2,
+		},
+		MONITOR_DEFAULTTONEAREST);
+
+	const auto displayName = HumanReadableDisplayName(hMonitor);
+	if (!displayName.isEmpty()) {
+		return displayName;
+	}
+
+	const auto name = screen->name();
+	const auto genericName = u"\\\\.\\DISPLAY"_q;
+	if (name.startsWith(genericName)) {
+		const auto displayNum = name.mid(genericName.size());
+		return u"Display %1"_q.arg(displayNum);
+	}
+
+	return name;
+}
+
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.h b/Telegram/SourceFiles/platform/win/main_window_win.h
index 9f4884467ecf24..95f9d52da691c5 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.h
+++ b/Telegram/SourceFiles/platform/win/main_window_win.h
@@ -106,5 +106,8 @@ class MainWindow : public Window::MainWindow {
 };
 
 [[nodiscard]] int32 ScreenNameChecksum(const QString &name);
+[[nodiscard]] int32 ScreenNameChecksum(const QScreen *screen);
+
+[[nodiscard]] QString ScreenDisplayLabel(const QScreen *screen);
 
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
index 99cd1b9074485f..3efdb3bee9e8c7 100644
--- a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
+++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
@@ -20,6 +20,8 @@ For license and copyright information please follow this link:
 #include "platform/win/windows_dlls.h"
 #include "platform/win/specific_win.h"
 #include "data/data_forum_topic.h"
+#include "data/data_saved_sublist.h"
+#include "data/data_peer.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "core/application.h"
@@ -37,7 +39,6 @@ For license and copyright information please follow this link:
 #include <shellapi.h>
 #include <strsafe.h>
 
-#ifndef __MINGW32__
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Data.Xml.Dom.h>
 #include <winrt/Windows.UI.Notifications.h>
@@ -48,12 +49,9 @@ using namespace winrt::Windows::UI::Notifications;
 using namespace winrt::Windows::Data::Xml::Dom;
 using namespace winrt::Windows::Foundation;
 using winrt::com_ptr;
-#endif // !__MINGW32__
 
 namespace Platform {
 namespace Notifications {
-
-#ifndef __MINGW32__
 namespace {
 
 constexpr auto kQuerySettingsEachMs = 1000;
@@ -367,6 +365,7 @@ bool SkipSoundForCustom() {
 
 	return (UserNotificationState == QUNS_NOT_PRESENT)
 		|| (UserNotificationState == QUNS_PRESENTATION_MODE)
+		|| (FocusAssistBlocks && Core::App().settings().skipToastsInFocus())
 		|| Core::App().screenIsLocked();
 }
 
@@ -375,7 +374,6 @@ bool SkipFlashBounceForCustom() {
 }
 
 } // namespace
-#endif // !__MINGW32__
 
 void MaybePlaySoundForCustom(Fn<void()> playSound) {
 	if (!SkipSoundForCustom()) {
@@ -387,7 +385,8 @@ bool SkipToastForCustom() {
 	QuerySystemNotificationSettings();
 
 	return (UserNotificationState == QUNS_PRESENTATION_MODE)
-		|| (UserNotificationState == QUNS_RUNNING_D3D_FULL_SCREEN);
+		|| (UserNotificationState == QUNS_RUNNING_D3D_FULL_SCREEN)
+		|| (FocusAssistBlocks && Core::App().settings().skipToastsInFocus());
 }
 
 void MaybeFlashBounceForCustom(Fn<void()> flashBounce) {
@@ -403,15 +402,11 @@ bool WaitForInputForCustom() {
 }
 
 bool Supported() {
-#ifndef __MINGW32__
 	if (!Checked) {
 		Checked = true;
 		Check();
 	}
 	return InitSucceeded;
-#endif // !__MINGW32__
-
-	return false;
 }
 
 bool Enforced() {
@@ -422,37 +417,29 @@ bool ByDefault() {
 	return false;
 }
 
+bool VolumeSupported() {
+	return true;
+}
+
 void Create(Window::Notifications::System *system) {
-#ifndef __MINGW32__
-	if (Core::App().settings().nativeNotifications() && Supported()) {
+	system->setManager([=] {
 		auto result = std::make_unique<Manager>(system);
-		if (result->init()) {
-			system->setManager(std::move(result));
-			return;
-		}
-	}
-#endif // !__MINGW32__
-	system->setManager(nullptr);
+		return result->init() ? std::move(result) : nullptr;
+	});
 }
 
-#ifndef __MINGW32__
 class Manager::Private {
 public:
+	using Info = Window::Notifications::NativeManager::NotificationInfo;
+
 	explicit Private(Manager *instance);
 	bool init();
 
-	bool showNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options);
+	bool showNotification(Info &&info, Ui::PeerUserpicView &userpicView);
 	void clearAll();
 	void clearFromItem(not_null<HistoryItem*> item);
 	void clearFromTopic(not_null<Data::ForumTopic*> topic);
+	void clearFromSublist(not_null<Data::SavedSublist*> sublist);
 	void clearFromHistory(not_null<History*> history);
 	void clearFromSession(not_null<Main::Session*> session);
 	void beforeNotificationActivated(NotificationId id);
@@ -467,14 +454,8 @@ class Manager::Private {
 
 private:
 	bool showNotificationInTryCatch(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options);
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView);
 	void tryHide(const ToastNotification &notification);
 	[[nodiscard]] std::wstring ensureSendButtonIcon();
 
@@ -494,7 +475,7 @@ class Manager::Private {
 Manager::Private::Private(Manager *instance)
 : _guarded(std::make_shared<Manager*>(instance)) {
 	ToastActivations(
-	) | rpl::start_with_next([=](const ToastActivation &activation) {
+	) | rpl::on_next([=](const ToastActivation &activation) {
 		handleActivation(activation);
 	}, _lifetime);
 }
@@ -534,6 +515,7 @@ void Manager::Private::clearFromItem(not_null<HistoryItem*> item) {
 		.sessionId = item->history()->session().uniqueId(),
 		.peerId = item->history()->peer->id,
 		.topicRootId = item->topicRootId(),
+		.monoforumPeerId = item->sublistPeerId(),
 	});
 	if (i == _notifications.cend()) {
 		return;
@@ -570,6 +552,27 @@ void Manager::Private::clearFromTopic(not_null<Data::ForumTopic*> topic) {
 	}
 }
 
+void Manager::Private::clearFromSublist(
+		not_null<Data::SavedSublist*> sublist) {
+	if (!_notifier) {
+		return;
+	}
+
+	const auto i = _notifications.find(ContextId{
+		.sessionId = sublist->session().uniqueId(),
+		.peerId = sublist->owningHistory()->peer->id,
+		.monoforumPeerId = sublist->sublistPeer()->id,
+	});
+	if (i != _notifications.cend()) {
+		const auto temp = base::take(i->second);
+		_notifications.erase(i);
+
+		for (const auto &[msgId, notification] : temp) {
+			tryHide(notification);
+		}
+	}
+}
+
 void Manager::Private::clearFromHistory(not_null<History*> history) {
 	if (!_notifier) {
 		return;
@@ -652,7 +655,9 @@ void Manager::Private::handleActivation(const ToastActivation &activation) {
 		.contextId = ContextId{
 			.sessionId = parsed.value("session").toULongLong(),
 			.peerId = PeerId(parsed.value("peer").toULongLong()),
-			.topicRootId = MsgId(parsed.value("topic").toLongLong())
+			.topicRootId = MsgId(parsed.value("topic").toLongLong()),
+			.monoforumPeerId = PeerId(
+					parsed.value("monoforumpeer").toULongLong()),
 		},
 		.msgId = MsgId(parsed.value("msg").toLongLong()),
 	};
@@ -682,33 +687,21 @@ void Manager::Private::handleActivation(const ToastActivation &activation) {
 	} else if (action == "mark") {
 		manager->notificationReplied(id, TextWithTags());
 	} else {
-		manager->notificationActivated(id, text);
+		manager->notificationActivated(id, {
+			.draft = std::move(text),
+		});
 	}
 }
 
 bool Manager::Private::showNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options) {
+		Info &&info,
+		Ui::PeerUserpicView &userpicView) {
 	if (!_notifier) {
 		return false;
 	}
 
 	return base::WinRT::Try([&] {
-		return showNotificationInTryCatch(
-			peer,
-			topicRootId,
-			userpicView,
-			msgId,
-			title,
-			subtitle,
-			msg,
-			options);
+		return showNotificationInTryCatch(std::move(info), userpicView);
 	}).value_or(false);
 }
 
@@ -722,36 +715,33 @@ std::wstring Manager::Private::ensureSendButtonIcon() {
 }
 
 bool Manager::Private::showNotificationInTryCatch(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options) {
-	const auto withSubtitle = !subtitle.isEmpty();
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView) {
+	const auto withSubtitle = !info.subtitle.isEmpty();
+	const auto peer = info.peer;
 	auto toastXml = XmlDocument();
 
 	const auto key = ContextId{
 		.sessionId = peer->session().uniqueId(),
 		.peerId = peer->id,
-		.topicRootId = topicRootId,
+		.topicRootId = info.topicRootId,
+		.monoforumPeerId = info.monoforumPeerId,
 	};
 	const auto notificationId = NotificationId{
 		.contextId = key,
-		.msgId = msgId
+		.msgId = info.itemId,
 	};
-	const auto idString = u"pid=%1&session=%2&peer=%3&topic=%4&msg=%5"_q
+	const auto idString = u"pid=%1&session=%2&peer=%3&topic=%4&monoforumpeer=%5&msg=%6"_q
 		.arg(GetCurrentProcessId())
 		.arg(key.sessionId)
 		.arg(key.peerId.value)
-		.arg(topicRootId.bare)
-		.arg(msgId.bare);
+		.arg(info.topicRootId.bare)
+		.arg(info.monoforumPeerId.value)
+		.arg(info.itemId.bare);
 
 	const auto modern = Platform::IsWindows10OrGreater();
 	if (modern) {
-		toastXml.LoadXml(NotificationTemplate(idString, options));
+		toastXml.LoadXml(NotificationTemplate(idString, info.options));
 	} else {
 		toastXml = ToastNotificationManager::GetTemplateContent(
 			(withSubtitle
@@ -761,7 +751,7 @@ bool Manager::Private::showNotificationInTryCatch(
 		SetAction(toastXml, idString);
 	}
 
-	const auto userpicKey = options.hideNameAndPhoto
+	const auto userpicKey = info.options.hideNameAndPhoto
 		? InMemoryKey()
 		: peer->userpicUniqueKey(userpicView);
 	const auto userpicPath = _cachedUserpics.get(
@@ -770,13 +760,13 @@ bool Manager::Private::showNotificationInTryCatch(
 		userpicView);
 	const auto userpicPathWide = QDir::toNativeSeparators(
 		userpicPath).toStdWString();
-	if (modern && !options.hideReplyButton) {
+	if (modern && !info.options.hideReplyButton) {
 		SetReplyIconSrc(toastXml, ensureSendButtonIcon());
 		SetReplyPlaceholder(
 			toastXml,
 			tr::lng_message_ph(tr::now).toStdWString());
 	}
-	if (modern && !options.hideMarkAsRead) {
+	if (modern && !info.options.hideMarkAsRead) {
 		SetMarkAsReadText(
 			toastXml,
 			tr::lng_context_mark_read(tr::now).toStdWString());
@@ -789,17 +779,20 @@ bool Manager::Private::showNotificationInTryCatch(
 		return false;
 	}
 
-	SetNodeValueString(toastXml, nodeList.Item(0), title.toStdWString());
+	SetNodeValueString(
+		toastXml,
+		nodeList.Item(0),
+		info.title.toStdWString());
 	if (withSubtitle) {
 		SetNodeValueString(
 			toastXml,
 			nodeList.Item(1),
-			subtitle.toStdWString());
+			info.subtitle.toStdWString());
 	}
 	SetNodeValueString(
 		toastXml,
 		nodeList.Item(withSubtitle ? 2 : 1),
-		msg.toStdWString());
+		info.message.toStdWString());
 
 	const auto weak = std::weak_ptr(_guarded);
 	const auto performOnMainQueue = [=](FnMut<void(Manager *manager)> task) {
@@ -870,7 +863,7 @@ bool Manager::Private::showNotificationInTryCatch(
 
 	auto i = _notifications.find(key);
 	if (i != _notifications.cend()) {
-		auto j = i->second.find(msgId);
+		auto j = i->second.find(info.itemId);
 		if (j != i->second.end()) {
 			const auto existing = j->second;
 			i->second.erase(j);
@@ -890,7 +883,7 @@ bool Manager::Private::showNotificationInTryCatch(
 		}
 		return false;
 	}
-	i->second.emplace(msgId, toast);
+	i->second.emplace(info.itemId, toast);
 	return true;
 }
 
@@ -920,23 +913,9 @@ void Manager::handleActivation(const ToastActivation &activation) {
 Manager::~Manager() = default;
 
 void Manager::doShowNativeNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options) {
-	_private->showNotification(
-		peer,
-		topicRootId,
-		userpicView,
-		msgId,
-		title,
-		subtitle,
-		msg,
-		options);
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView) {
+	_private->showNotification(std::move(info), userpicView);
 }
 
 void Manager::doClearAllFast() {
@@ -951,6 +930,10 @@ void Manager::doClearFromTopic(not_null<Data::ForumTopic*> topic) {
 	_private->clearFromTopic(topic);
 }
 
+void Manager::doClearFromSublist(not_null<Data::SavedSublist*> sublist) {
+	_private->clearFromSublist(sublist);
+}
+
 void Manager::doClearFromHistory(not_null<History*> history) {
 	_private->clearFromHistory(history);
 }
@@ -990,7 +973,6 @@ void Manager::doMaybeFlashBounce(Fn<void()> flashBounce) {
 		flashBounce();
 	}
 }
-#endif // !__MINGW32__
 
 } // namespace Notifications
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.h b/Telegram/SourceFiles/platform/win/notifications_manager_win.h
index eba55717701095..7f9a6ce8ef1d1b 100644
--- a/Telegram/SourceFiles/platform/win/notifications_manager_win.h
+++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.h
@@ -14,8 +14,6 @@ struct ToastActivation;
 namespace Platform {
 namespace Notifications {
 
-#ifndef __MINGW32__
-
 class Manager : public Window::Notifications::NativeManager {
 public:
 	Manager(Window::Notifications::System *system);
@@ -28,17 +26,12 @@ class Manager : public Window::Notifications::NativeManager {
 
 protected:
 	void doShowNativeNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options) override;
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView) override;
 	void doClearAllFast() override;
 	void doClearFromItem(not_null<HistoryItem*> item) override;
 	void doClearFromTopic(not_null<Data::ForumTopic*> topic) override;
+	void doClearFromSublist(not_null<Data::SavedSublist*> sublist) override;
 	void doClearFromHistory(not_null<History*> history) override;
 	void doClearFromSession(not_null<Main::Session*> session) override;
 	void onBeforeNotificationActivated(NotificationId id) override;
@@ -54,7 +47,6 @@ class Manager : public Window::Notifications::NativeManager {
 	const std::unique_ptr<Private> _private;
 
 };
-#endif // !__MINGW32__
 
 } // namespace Notifications
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp
index 9b8b959e0d68b5..704b6eaf1b7022 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.cpp
+++ b/Telegram/SourceFiles/platform/win/specific_win.cpp
@@ -17,6 +17,7 @@ For license and copyright information please follow this link:
 #include "base/platform/win/base_windows_shlobj_h.h"
 #include "base/platform/win/base_windows_winrt.h"
 #include "base/call_delayed.h"
+#include "core/version.h"
 #include "ui/boxes/confirm_box.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
@@ -367,6 +368,9 @@ void start() {
 } // namespace ThirdParty
 
 void start() {
+	const auto supported = base::WinRT::Supported();
+	LOG(("WinRT Supported: %1").arg(Logs::b(supported)));
+
 	// https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/setlocale-wsetlocale#utf-8-support
 	setlocale(LC_ALL, ".UTF8");
 
@@ -399,6 +403,13 @@ std::optional<bool> IsDarkMode() {
 		return std::nullopt;
 	}
 
+	HIGHCONTRAST hcf = {};
+	hcf.cbSize = static_cast<UINT>(sizeof(HIGHCONTRAST));
+	if (SystemParametersInfo(SPI_GETHIGHCONTRAST, hcf.cbSize, &hcf, FALSE)
+			&& (hcf.dwFlags & HCF_HIGHCONTRASTON)) {
+		return std::nullopt;
+	}
+
 	const auto keyName = L""
 		"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
 	const auto valueName = L"AppsUseLightTheme";
@@ -660,42 +671,46 @@ QImage DefaultApplicationIcon() {
 	return Window::Logo();
 }
 
-} // namespace Platform
-
-void psSendToMenu(bool send, bool silent) {
-	ManageAppLink(
-		send,
-		silent,
-		FOLDERID_SendTo,
-		L"-sendpath",
-		L"Telegram send to link.\n"
-		"You can disable send to menu item in Telegram settings.");
-}
-
-bool psLaunchMaps(const Data::LocationPoint &point) {
+void LaunchMaps(const Data::LocationPoint &point, Fn<void()> fail) {
 	const auto aar = base::WinRT::TryCreateInstance<
 		IApplicationAssociationRegistration
 	>(CLSID_ApplicationAssociationRegistration);
 	if (!aar) {
-		return false;
+		fail();
+		return;
 	}
 
 	auto handler = base::CoTaskMemString();
 	const auto result = aar->QueryCurrentDefault(
-		L"bingmaps",
+		L"geo",
 		AT_URLPROTOCOL,
 		AL_EFFECTIVE,
 		handler.put());
 	if (FAILED(result)
 		|| !handler
 		|| !handler.data()
-		|| std::wstring(handler.data()) == L"bingmaps") {
-		return false;
+		|| std::wstring(handler.data()) == L"geo") {
+		fail();
+		return;
+	}
+
+	const auto url = u"geo:%1,%2"_q;
+	if (!QDesktopServices::openUrl(
+		url.arg(point.latAsString(), point.lonAsString()))) {
+		fail();
 	}
+}
+
+} // namespace Platform
 
-	const auto url = u"bingmaps:?lvl=16&collection=point.%1_%2_Point"_q;
-	return QDesktopServices::openUrl(
-		url.arg(point.latAsString()).arg(point.lonAsString()));
+void psSendToMenu(bool send, bool silent) {
+	ManageAppLink(
+		send,
+		silent,
+		FOLDERID_SendTo,
+		L"--",
+		L"Telegram send to link.\n"
+		"You can disable send to menu item in Telegram settings.");
 }
 
 // Stub while we still support Windows 7.
diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h
index cea6ec176ec897..39a4103e344676 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.h
+++ b/Telegram/SourceFiles/platform/win/specific_win.h
@@ -11,10 +11,6 @@ For license and copyright information please follow this link:
 
 #include <windows.h>
 
-namespace Data {
-class LocationPoint;
-} // namespace Data
-
 namespace Platform {
 
 inline void IgnoreApplicationActivationRightNow() {
@@ -28,10 +24,6 @@ inline bool SkipTaskbarSupported() {
 	return true;
 }
 
-inline bool RunInBackground() {
-	return false;
-}
-
 inline bool PreventsQuit(Core::QuitReason reason) {
 	return false;
 }
@@ -47,6 +39,10 @@ void SetWindowPriority(not_null<QWidget*> window, uint32 priority);
 // Activate window with windowId (if found) or the largest priority.
 void ActivateOtherProcess(uint64 processId, uint64 windowId);
 
+inline QString ApplicationIconName() {
+	return {};
+}
+
 inline QString ExecutablePathForShortcuts() {
 	return cExeDir() + cExeName();
 }
@@ -73,5 +69,3 @@ inline QByteArray psDownloadPathBookmark(const QString &path) {
 }
 inline void psDownloadPathEnableAccess() {
 }
-
-bool psLaunchMaps(const Data::LocationPoint &point);
diff --git a/Telegram/SourceFiles/platform/win/text_recognition_win.h b/Telegram/SourceFiles/platform/win/text_recognition_win.h
new file mode 100644
index 00000000000000..d2d05be5871f0e
--- /dev/null
+++ b/Telegram/SourceFiles/platform/win/text_recognition_win.h
@@ -0,0 +1,24 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "platform/platform_text_recognition.h"
+
+namespace Platform {
+namespace TextRecognition {
+
+inline bool IsAvailable() {
+	return false;
+}
+
+inline Result RecognizeText(const QImage &image) {
+	return {};
+}
+
+} // namespace TextRecognition
+} // namespace Platform
\ No newline at end of file
diff --git a/Telegram/SourceFiles/platform/win/translate_provider_win.h b/Telegram/SourceFiles/platform/win/translate_provider_win.h
new file mode 100644
index 00000000000000..8fed093cb4134c
--- /dev/null
+++ b/Telegram/SourceFiles/platform/win/translate_provider_win.h
@@ -0,0 +1,22 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "platform/platform_translate_provider.h"
+
+namespace Platform {
+
+inline bool IsTranslateProviderAvailable() {
+	return false;
+}
+
+inline std::unique_ptr<Ui::TranslateProvider> CreateTranslateProvider() {
+	return nullptr;
+}
+
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/win/tray_win.cpp b/Telegram/SourceFiles/platform/win/tray_win.cpp
index d2fa0af6979b9d..be1c10d54da454 100644
--- a/Telegram/SourceFiles/platform/win/tray_win.cpp
+++ b/Telegram/SourceFiles/platform/win/tray_win.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "base/invoke_queued.h"
 #include "base/qt_signal_producer.h"
 #include "core/application.h"
+#include "core/version.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "storage/localstorage.h"
@@ -57,30 +58,12 @@ bool DarkTasbarValueValid/* = false*/;
 	return (value == 0);
 }
 
-[[nodiscard]] std::optional<bool> IsDarkTaskbar() {
-	static const auto kSystemVersion = QOperatingSystemVersion::current();
-	static const auto kDarkModeAddedVersion = QOperatingSystemVersion(
-		QOperatingSystemVersion::Windows,
-		10,
-		0,
-		18282);
-	static const auto kSupported = (kSystemVersion >= kDarkModeAddedVersion);
-	if (!kSupported) {
-		return std::nullopt;
-	} else if (!DarkTasbarValueValid) {
-		DarkTasbarValueValid = true;
-		DarkTaskbar = ReadDarkTaskbarValue();
-	}
-	return DarkTaskbar;
-}
-
 [[nodiscard]] QImage MonochromeIconFor(int size, bool darkMode) {
 	Expects(size > 0);
 
 	static const auto Content = [&] {
 		auto f = QFile(u":/gui/icons/tray/monochrome.svg"_q);
-		f.open(QIODevice::ReadOnly);
-		return f.readAll();
+		return f.open(QIODevice::ReadOnly) ? f.readAll() : QByteArray();
 	}();
 	static auto Mask = QImage();
 	static auto Size = 0;
@@ -203,7 +186,7 @@ void Tray::createIcon() {
 			&QPlatformSystemTrayIcon::contextMenuRequested
 		) | rpl::filter([=] {
 			return _menu != nullptr;
-		}) | rpl::start_with_next([=](
+		}) | rpl::on_next([=](
 				QPoint globalNativePosition,
 				const QPlatformScreen *screen) {
 			_aboutToShowRequests.fire({});
@@ -271,15 +254,15 @@ void Tray::addAction(rpl::producer<QString> text, Fn<void()> &&callback) {
 	auto callbackLater = crl::guard(_menu.get(), [=] {
 		using namespace rpl::mappers;
 		_callbackFromTrayLifetime = _menu->shownValue(
-		) | rpl::filter(!_1) | rpl::take(1) | rpl::start_with_next([=] {
-			callback();
+		) | rpl::filter(!_1) | rpl::take(1) | rpl::on_next([=] {
+			crl::on_main([=] { callback(); });
 		});
 	});
 
 	const auto action = _menu->addAction(QString(), std::move(callbackLater));
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		action->setText(text);
 	}, _actionsLifetime);
 }
@@ -442,6 +425,23 @@ bool HasMonochromeSetting() {
 	return IsDarkTaskbar().has_value();
 }
 
+std::optional<bool> IsDarkTaskbar() {
+	static const auto kSystemVersion = QOperatingSystemVersion::current();
+	static const auto kDarkModeAddedVersion = QOperatingSystemVersion(
+		QOperatingSystemVersion::Windows,
+		10,
+		0,
+		18282);
+	static const auto kSupported = (kSystemVersion >= kDarkModeAddedVersion);
+	if (!kSupported) {
+		return std::nullopt;
+	} else if (!DarkTasbarValueValid) {
+		DarkTasbarValueValid = true;
+		DarkTaskbar = ReadDarkTaskbarValue();
+	}
+	return DarkTaskbar;
+}
+
 void RefreshTaskbarThemeValue() {
 	DarkTasbarValueValid = false;
 }
diff --git a/Telegram/SourceFiles/platform/win/tray_win.h b/Telegram/SourceFiles/platform/win/tray_win.h
index aed4cc6e3442dc..2618c73452e8cd 100644
--- a/Telegram/SourceFiles/platform/win/tray_win.h
+++ b/Telegram/SourceFiles/platform/win/tray_win.h
@@ -76,4 +76,6 @@ class Tray final {
 
 void RefreshTaskbarThemeValue();
 
+[[nodiscard]] std::optional<bool> IsDarkTaskbar();
+
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/win/webauthn_win.cpp b/Telegram/SourceFiles/platform/win/webauthn_win.cpp
new file mode 100644
index 00000000000000..a121a4df164d20
--- /dev/null
+++ b/Telegram/SourceFiles/platform/win/webauthn_win.cpp
@@ -0,0 +1,297 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+
+#include "platform/platform_webauthn.h"
+
+#include "base/platform/win/base_windows_safe_library.h"
+#include "data/data_passkey_deserialize.h"
+
+#include <windows.h>
+#include <combaseapi.h>
+#include <webauthn.h>
+
+#include <QWindow>
+#include <QGuiApplication>
+
+namespace Platform::WebAuthn {
+namespace {
+
+HRESULT(__stdcall *WebAuthNIsUserVerifyingPlatformAuthenticatorAvailable)(
+	BOOL *pbIsUserVerifyingPlatformAuthenticatorAvailable);
+HRESULT(__stdcall *WebAuthNAuthenticatorMakeCredential)(
+	HWND hWnd,
+	PCWEBAUTHN_RP_ENTITY_INFORMATION pRpInformation,
+	PCWEBAUTHN_USER_ENTITY_INFORMATION pUserInformation,
+	PCWEBAUTHN_COSE_CREDENTIAL_PARAMETERS pPubKeyCredParams,
+	PCWEBAUTHN_CLIENT_DATA pWebAuthNClientData,
+	PCWEBAUTHN_AUTHENTICATOR_MAKE_CREDENTIAL_OPTIONS
+		pWebAuthNCredentialOptions,
+	PWEBAUTHN_CREDENTIAL_ATTESTATION *ppWebAuthNCredentialAttestation);
+void(__stdcall *WebAuthNFreeCredentialAttestation)(
+	PWEBAUTHN_CREDENTIAL_ATTESTATION pWebAuthNCredentialAttestation);
+HRESULT(__stdcall *WebAuthNAuthenticatorGetAssertion)(
+	HWND hWnd,
+	LPCWSTR pwszRpId,
+	PCWEBAUTHN_CLIENT_DATA pWebAuthNClientData,
+	PCWEBAUTHN_AUTHENTICATOR_GET_ASSERTION_OPTIONS
+		pWebAuthNGetAssertionOptions,
+	PWEBAUTHN_ASSERTION *ppWebAuthNAssertion);
+void(__stdcall *WebAuthNFreeAssertion)(
+	PWEBAUTHN_ASSERTION pWebAuthNAssertion);
+
+[[nodiscard]] bool Resolve() {
+	const auto webauthn = base::Platform::SafeLoadLibrary(L"webauthn.dll");
+	if (!webauthn) {
+		return false;
+	}
+	auto total = 0, resolved = 0;
+#define LOAD_SYMBOL(name) \
+	++total; \
+	if (base::Platform::LoadMethod(webauthn, #name, name)) ++resolved;
+
+	LOAD_SYMBOL(WebAuthNIsUserVerifyingPlatformAuthenticatorAvailable);
+	LOAD_SYMBOL(WebAuthNAuthenticatorMakeCredential);
+	LOAD_SYMBOL(WebAuthNFreeCredentialAttestation);
+	LOAD_SYMBOL(WebAuthNAuthenticatorGetAssertion);
+	LOAD_SYMBOL(WebAuthNFreeAssertion);
+#undef LOAD_SYMBOL
+
+	return (total == resolved);
+}
+
+[[nodiscard]] bool Supported() {
+	static const auto Result = Resolve();
+	return Result;
+}
+
+} // namespace
+
+bool IsSupported() {
+	if (!Supported()) {
+		return false;
+	}
+	auto available = (BOOL)(FALSE);
+	return SUCCEEDED(
+		WebAuthNIsUserVerifyingPlatformAuthenticatorAvailable(&available))
+			&& available;
+}
+
+void RegisterKey(
+		const Data::Passkey::RegisterData &data,
+		Fn<void(RegisterResult result)> callback) {
+	if (!Supported()) {
+		callback({});
+		return;
+	}
+
+	auto rpId = data.rp.id.toStdWString();
+	auto rpName = data.rp.name.toStdWString();
+	auto userName = data.user.name.toStdWString();
+	auto userDisplayName = data.user.displayName.toStdWString();
+
+	auto rpInfo = WEBAUTHN_RP_ENTITY_INFORMATION();
+	memset(&rpInfo, 0, sizeof(rpInfo));
+	rpInfo.dwVersion =
+		WEBAUTHN_RP_ENTITY_INFORMATION_CURRENT_VERSION;
+	rpInfo.pwszId = rpId.c_str();
+	rpInfo.pwszName = rpName.c_str();
+
+	auto userInfo = WEBAUTHN_USER_ENTITY_INFORMATION();
+	memset(&userInfo, 0, sizeof(userInfo));
+	userInfo.dwVersion =
+		WEBAUTHN_USER_ENTITY_INFORMATION_CURRENT_VERSION;
+	userInfo.cbId = data.user.id.size();
+	userInfo.pbId = (PBYTE)data.user.id.data();
+	userInfo.pwszName = userName.c_str();
+	userInfo.pwszDisplayName = userDisplayName.c_str();
+
+	auto credParams = std::vector<WEBAUTHN_COSE_CREDENTIAL_PARAMETER>();
+	for (const auto &param : data.pubKeyCredParams) {
+		auto cp = WEBAUTHN_COSE_CREDENTIAL_PARAMETER{};
+		cp.dwVersion =
+			WEBAUTHN_COSE_CREDENTIAL_PARAMETER_CURRENT_VERSION;
+		auto type = param.type.toStdWString();
+		cp.pwszCredentialType = type == L"public-key"
+			? WEBAUTHN_CREDENTIAL_TYPE_PUBLIC_KEY
+			: L"";
+		cp.lAlg = param.alg;
+		credParams.push_back(cp);
+	}
+
+	auto credParamsList = WEBAUTHN_COSE_CREDENTIAL_PARAMETERS();
+	memset(&credParamsList, 0, sizeof(credParamsList));
+	credParamsList.cCredentialParameters = credParams.size();
+	credParamsList.pCredentialParameters = credParams.data();
+
+	auto clientDataJson = Data::Passkey::SerializeClientDataCreate(
+		data.challenge);
+	auto clientData = WEBAUTHN_CLIENT_DATA();
+	memset(&clientData, 0, sizeof(clientData));
+	clientData.dwVersion = WEBAUTHN_CLIENT_DATA_CURRENT_VERSION;
+	clientData.cbClientDataJSON = clientDataJson.size();
+	clientData.pbClientDataJSON = (PBYTE)clientDataJson.data();
+	clientData.pwszHashAlgId = WEBAUTHN_HASH_ALGORITHM_SHA_256;
+
+	auto cancellationId = GUID();
+	CoCreateGuid(&cancellationId);
+
+	auto options = WEBAUTHN_AUTHENTICATOR_MAKE_CREDENTIAL_OPTIONS();
+	memset(&options, 0, sizeof(options));
+	options.dwVersion =
+		WEBAUTHN_AUTHENTICATOR_MAKE_CREDENTIAL_OPTIONS_CURRENT_VERSION;
+	options.dwTimeoutMilliseconds = data.timeout;
+	options.dwAuthenticatorAttachment =
+		WEBAUTHN_AUTHENTICATOR_ATTACHMENT_ANY;
+	options.bRequireResidentKey = FALSE;
+	options.dwUserVerificationRequirement =
+		WEBAUTHN_USER_VERIFICATION_REQUIREMENT_PREFERRED;
+	options.dwAttestationConveyancePreference =
+		WEBAUTHN_ATTESTATION_CONVEYANCE_PREFERENCE_NONE;
+	options.pCancellationId = &cancellationId;
+
+#if defined(WEBAUTHN_AUTHENTICATOR_MAKE_CREDENTIAL_OPTIONS_VERSION_4) \
+	|| defined(WEBAUTHN_AUTHENTICATOR_MAKE_CREDENTIAL_OPTIONS_VERSION_5) \
+	|| defined(WEBAUTHN_AUTHENTICATOR_MAKE_CREDENTIAL_OPTIONS_VERSION_6) \
+	|| defined(WEBAUTHN_AUTHENTICATOR_MAKE_CREDENTIAL_OPTIONS_VERSION_7) \
+	|| defined(WEBAUTHN_AUTHENTICATOR_MAKE_CREDENTIAL_OPTIONS_VERSION_8) \
+	|| defined(WEBAUTHN_AUTHENTICATOR_MAKE_CREDENTIAL_OPTIONS_VERSION_9)
+	options.bPreferResidentKey = TRUE;
+#endif
+
+	auto hwnd = (HWND)(nullptr);
+	if (auto window = QGuiApplication::topLevelWindows().value(0)) {
+		hwnd = (HWND)window->winId();
+		if (hwnd) {
+			SetForegroundWindow(hwnd);
+			SetFocus(hwnd);
+		}
+	}
+
+	auto attestation = (PWEBAUTHN_CREDENTIAL_ATTESTATION)(nullptr);
+	auto hr = (HRESULT)(WebAuthNAuthenticatorMakeCredential)(
+		hwnd,
+		&rpInfo,
+		&userInfo,
+		&credParamsList,
+		&clientData,
+		&options,
+		&attestation);
+
+	if (SUCCEEDED(hr) && attestation) {
+		auto result = RegisterResult();
+		result.success = true;
+		result.credentialId = QByteArray(
+			(char*)attestation->pbCredentialId,
+			attestation->cbCredentialId);
+		result.attestationObject = QByteArray(
+			(char*)attestation->pbAttestationObject,
+			attestation->cbAttestationObject);
+		result.clientDataJSON = QByteArray::fromStdString(clientDataJson);
+		WebAuthNFreeCredentialAttestation(attestation);
+		callback(result);
+	} else {
+		callback({});
+	}
+}
+
+void Login(
+		const Data::Passkey::LoginData &data,
+		Fn<void(LoginResult result)> callback) {
+	if (!Supported()) {
+		callback({});
+		return;
+	}
+
+	auto rpId = data.rpId.toStdWString();
+	auto clientDataJson = Data::Passkey::SerializeClientDataGet(
+		data.challenge);
+
+	auto clientData = WEBAUTHN_CLIENT_DATA();
+	memset(&clientData, 0, sizeof(clientData));
+	clientData.dwVersion = WEBAUTHN_CLIENT_DATA_CURRENT_VERSION;
+	clientData.cbClientDataJSON = clientDataJson.size();
+	clientData.pbClientDataJSON = (PBYTE)clientDataJson.data();
+	clientData.pwszHashAlgId = WEBAUTHN_HASH_ALGORITHM_SHA_256;
+
+	auto allowCredentials = std::vector<WEBAUTHN_CREDENTIAL>();
+	auto credentialIds = std::vector<QByteArray>();
+	for (const auto &cred : data.allowCredentials) {
+		credentialIds.push_back(cred.id);
+		auto credential = WEBAUTHN_CREDENTIAL();
+		memset(&credential, 0, sizeof(credential));
+		credential.dwVersion = WEBAUTHN_CREDENTIAL_CURRENT_VERSION;
+		credential.cbId = cred.id.size();
+		credential.pbId = (PBYTE)credentialIds.back().data();
+		credential.pwszCredentialType = WEBAUTHN_CREDENTIAL_TYPE_PUBLIC_KEY;
+		allowCredentials.push_back(credential);
+	}
+
+	auto cancellationId = GUID();
+	CoCreateGuid(&cancellationId);
+
+	auto options = WEBAUTHN_AUTHENTICATOR_GET_ASSERTION_OPTIONS();
+	memset(&options, 0, sizeof(options));
+	options.dwVersion =
+		WEBAUTHN_AUTHENTICATOR_GET_ASSERTION_OPTIONS_CURRENT_VERSION;
+	options.dwTimeoutMilliseconds = data.timeout;
+	if (!allowCredentials.empty()) {
+		options.CredentialList.cCredentials = allowCredentials.size();
+		options.CredentialList.pCredentials = allowCredentials.data();
+	}
+	options.pCancellationId = &cancellationId;
+	if (data.userVerification == "required") {
+		options.dwUserVerificationRequirement =
+			WEBAUTHN_USER_VERIFICATION_REQUIREMENT_REQUIRED;
+	} else if (data.userVerification == "preferred") {
+		options.dwUserVerificationRequirement =
+			WEBAUTHN_USER_VERIFICATION_REQUIREMENT_PREFERRED;
+	} else {
+		options.dwUserVerificationRequirement =
+			WEBAUTHN_USER_VERIFICATION_REQUIREMENT_DISCOURAGED;
+	}
+
+	auto hwnd = (HWND)(nullptr);
+	if (auto window = QGuiApplication::topLevelWindows().value(0)) {
+		hwnd = (HWND)window->winId();
+		if (hwnd) {
+			SetForegroundWindow(hwnd);
+			SetFocus(hwnd);
+		}
+	}
+
+	auto assertion = (PWEBAUTHN_ASSERTION)(nullptr);
+	auto hr = (HRESULT)(WebAuthNAuthenticatorGetAssertion)(
+		hwnd,
+		rpId.c_str(),
+		&clientData,
+		&options,
+		&assertion);
+
+	if (SUCCEEDED(hr) && assertion) {
+		auto result = LoginResult();
+		result.clientDataJSON = QByteArray::fromStdString(clientDataJson);
+		result.credentialId = QByteArray(
+			(char*)assertion->Credential.pbId,
+			assertion->Credential.cbId);
+		result.authenticatorData = QByteArray(
+			(char*)assertion->pbAuthenticatorData,
+			assertion->cbAuthenticatorData);
+		result.signature = QByteArray(
+			(char*)assertion->pbSignature,
+			assertion->cbSignature);
+		result.userHandle = assertion->cbUserId > 0
+			? QByteArray((char*)assertion->pbUserId, assertion->cbUserId)
+			: QByteArray();
+		WebAuthNFreeAssertion(assertion);
+		callback(result);
+	} else {
+		callback({});
+	}
+}
+
+} // namespace Platform::WebAuthn
diff --git a/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp b/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp
index d18e3f99041b9d..3d051f4ce0afcf 100644
--- a/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp
+++ b/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp
@@ -493,14 +493,7 @@ const std::wstring &Id() {
 		return BaseId;
 	}
 	static const auto PortableId = [] {
-		std::string h(32, 0);
-		if (Core::Launcher::Instance().customWorkingDir()) {
-			const auto d = QFile::encodeName(QDir(cWorkingDir()).absolutePath());
-			hashMd5Hex(d.constData(), d.size(), h.data());
-		} else {
-			const auto exePath = QFile::encodeName(cExeDir() + cExeName());
-			hashMd5Hex(exePath.constData(), exePath.size(), h.data());
-		}
+		const auto h = Core::Launcher::Instance().instanceHash();
 		return BaseId + L'.' + std::wstring(h.begin(), h.end());
 	}();
 	return PortableId;
diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.h b/Telegram/SourceFiles/platform/win/windows_dlls.h
index 9ebed92fcdcb8a..6ed503c8d3b86e 100644
--- a/Telegram/SourceFiles/platform/win/windows_dlls.h
+++ b/Telegram/SourceFiles/platform/win/windows_dlls.h
@@ -16,10 +16,6 @@ For license and copyright information please follow this link:
 #include <RestartManager.h>
 #include <psapi.h>
 
-#ifdef __MINGW32__
-#define __in
-#endif
-
 namespace Platform {
 namespace Dlls {
 
diff --git a/Telegram/SourceFiles/platform/win/windows_taskbar_buttons.cpp b/Telegram/SourceFiles/platform/win/windows_taskbar_buttons.cpp
new file mode 100644
index 00000000000000..e369574ea1c0f9
--- /dev/null
+++ b/Telegram/SourceFiles/platform/win/windows_taskbar_buttons.cpp
@@ -0,0 +1,226 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "platform/win/windows_taskbar_buttons.h"
+
+#include "lang/lang_keys.h"
+#include "media/audio/media_audio.h"
+#include "media/player/media_player_instance.h"
+#include "platform/win/tray_win.h"
+#include "ui/ui_utility.h"
+#include "styles/style_window.h"
+
+// Defined in qtbase, converts a QPixmap to a native icon handle.
+HICON qt_pixmapToWinHICON(const QPixmap &);
+
+namespace Platform {
+namespace {
+
+enum class ButtonId : UINT {
+	Previous = 1,
+	PlayPause,
+	Next,
+};
+
+constexpr auto kButtonsCount = 3;
+
+[[nodiscard]] HICON CreateThumbIcon(const style::icon &icon, QColor color) {
+	const auto size = GetSystemMetrics(SM_CXSMICON);
+	auto source = icon.instance(color, 100);
+	auto scaled = (source.width() == size && source.height() == size)
+		? std::move(source)
+		: source.scaled(
+			size,
+			size,
+			Qt::KeepAspectRatio,
+			Qt::SmoothTransformation);
+	auto result = QImage(size, size, QImage::Format_ARGB32_Premultiplied);
+	result.fill(Qt::transparent);
+	{
+		auto p = QPainter(&result);
+		p.drawImage(
+			(size - scaled.width()) / 2,
+			(size - scaled.height()) / 2,
+			scaled);
+	}
+	return qt_pixmapToWinHICON(Ui::PixmapFromImage(std::move(result)));
+}
+
+void FillButton(
+		THUMBBUTTON &button,
+		ButtonId id,
+		HICON icon,
+		const QString &tooltip,
+		bool active,
+		bool enabled) {
+	button.dwMask = THUMBBUTTONMASK(THB_ICON | THB_TOOLTIP | THB_FLAGS);
+	button.iId = static_cast<UINT>(id);
+	button.hIcon = icon;
+	button.dwFlags = !active
+		? THBF_HIDDEN
+		: (enabled ? THBF_ENABLED : THBF_DISABLED);
+	const auto tip = tooltip.toStdWString();
+	const auto count = std::min(tip.size(), std::size(button.szTip) - 1);
+	std::copy(tip.begin(), tip.begin() + count, button.szTip);
+	button.szTip[count] = wchar_t(0);
+}
+
+} // namespace
+
+TaskbarButtons::TaskbarButtons(not_null<ITaskbarList3*> taskbar, HWND window)
+: _taskbar(taskbar)
+, _window(window) {
+	using namespace Media::Player;
+
+	refreshIcons();
+
+	const auto instance = Media::Player::instance();
+
+	instance->updatedNotifier(
+	) | rpl::filter([](const TrackState &state) {
+		const auto type = state.id.type();
+		return (type == AudioMsgId::Type::Song)
+			|| (type == AudioMsgId::Type::Voice);
+	}) | rpl::on_next([=](const TrackState &) {
+		updateFromPlayer();
+	}, _lifetime);
+
+	rpl::merge(
+		instance->stops(AudioMsgId::Type::Song),
+		instance->stops(AudioMsgId::Type::Voice),
+		instance->startsPlay(AudioMsgId::Type::Song),
+		instance->startsPlay(AudioMsgId::Type::Voice),
+		instance->playlistChanges(AudioMsgId::Type::Song),
+		instance->playlistChanges(AudioMsgId::Type::Voice)
+	) | rpl::on_next([=] {
+		updateFromPlayer();
+	}, _lifetime);
+}
+
+TaskbarButtons::~TaskbarButtons() {
+	destroyIcons();
+}
+
+void TaskbarButtons::buttonsCreated() {
+	refreshIcons();
+	_created = false;
+	apply(currentState(), true);
+}
+
+void TaskbarButtons::buttonClicked(int id) {
+	const auto instance = Media::Player::instance();
+	const auto type = instance->getActiveType();
+	switch (static_cast<ButtonId>(id)) {
+	case ButtonId::Previous: instance->previous(type); break;
+	case ButtonId::PlayPause: instance->playPause(type); break;
+	case ButtonId::Next: instance->next(type); break;
+	}
+}
+
+void TaskbarButtons::refreshTheme() {
+	refreshIcons();
+	if (_created) {
+		apply(currentState(), false);
+	}
+}
+
+TaskbarButtons::State TaskbarButtons::currentState() const {
+	using namespace Media::Player;
+
+	const auto instance = Media::Player::instance();
+	const auto type = instance->getActiveType();
+	const auto state = instance->getState(type);
+	auto result = State();
+	result.active = bool(state.id);
+	if (result.active) {
+		result.playing = ShowPauseIcon(state.state);
+		result.nextAvailable = instance->nextAvailable(type);
+		result.previousAvailable = instance->previousAvailable(type);
+	}
+	return result;
+}
+
+void TaskbarButtons::refreshIcons() {
+	const auto dark = IsDarkTaskbar();
+	if (_iconsDark == dark && _previousIcon) {
+		return;
+	}
+	destroyIcons();
+	_iconsDark = dark;
+	const auto color = dark.value_or(true)
+		? QColor(255, 255, 255)
+		: QColor(0, 0, 0);
+	_previousIcon = CreateThumbIcon(st::windowTaskbarThumbPrevious, color);
+	_playIcon = CreateThumbIcon(st::windowTaskbarThumbPlay, color);
+	_pauseIcon = CreateThumbIcon(st::windowTaskbarThumbPause, color);
+	_nextIcon = CreateThumbIcon(st::windowTaskbarThumbNext, color);
+}
+
+void TaskbarButtons::destroyIcons() {
+	const auto icons = { _previousIcon, _playIcon, _pauseIcon, _nextIcon };
+	for (const auto icon : icons) {
+		if (icon) {
+			DestroyIcon(icon);
+		}
+	}
+	_previousIcon = _playIcon = _pauseIcon = _nextIcon = nullptr;
+}
+
+void TaskbarButtons::updateFromPlayer() {
+	if (!_created) {
+		return;
+	}
+	const auto state = currentState();
+	if (state == _applied) {
+		return;
+	}
+	apply(state, false);
+}
+
+void TaskbarButtons::apply(State state, bool create) {
+	auto buttons = std::array<THUMBBUTTON, kButtonsCount>();
+
+	FillButton(
+		buttons[0],
+		ButtonId::Previous,
+		_previousIcon,
+		tr::lng_mac_menu_player_previous(tr::now),
+		state.active,
+		state.previousAvailable);
+	FillButton(
+		buttons[1],
+		ButtonId::PlayPause,
+		state.playing ? _pauseIcon : _playIcon,
+		(state.playing
+			? tr::lng_mac_menu_player_pause(tr::now)
+			: tr::lng_mac_menu_player_resume(tr::now)),
+		state.active,
+		true);
+	FillButton(
+		buttons[2],
+		ButtonId::Next,
+		_nextIcon,
+		tr::lng_mac_menu_player_next(tr::now),
+		state.active,
+		state.nextAvailable);
+
+	const auto result = create
+		? _taskbar->ThumbBarAddButtons(
+			_window,
+			UINT(kButtonsCount),
+			buttons.data())
+		: _taskbar->ThumbBarUpdateButtons(
+			_window,
+			UINT(kButtonsCount),
+			buttons.data());
+	if (create) {
+		_created = SUCCEEDED(result);
+	}
+	_applied = state;
+}
+
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/win/windows_taskbar_buttons.h b/Telegram/SourceFiles/platform/win/windows_taskbar_buttons.h
new file mode 100644
index 00000000000000..f0e83d64ceb88f
--- /dev/null
+++ b/Telegram/SourceFiles/platform/win/windows_taskbar_buttons.h
@@ -0,0 +1,59 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/platform/win/base_windows_shlobj_h.h"
+
+namespace Platform {
+
+class TaskbarButtons final {
+public:
+	TaskbarButtons(not_null<ITaskbarList3*> taskbar, HWND window);
+	~TaskbarButtons();
+
+	[[nodiscard]] HWND window() const {
+		return _window;
+	}
+
+	void buttonsCreated();
+	void buttonClicked(int id);
+	void refreshTheme();
+
+private:
+	struct State {
+		bool active = false;
+		bool playing = false;
+		bool nextAvailable = false;
+		bool previousAvailable = false;
+
+		friend bool operator==(const State &, const State &) = default;
+	};
+
+	[[nodiscard]] State currentState() const;
+	void refreshIcons();
+	void destroyIcons();
+	void apply(State state, bool create);
+	void updateFromPlayer();
+
+	const not_null<ITaskbarList3*> _taskbar;
+	const HWND _window;
+
+	HICON _previousIcon = nullptr;
+	HICON _playIcon = nullptr;
+	HICON _pauseIcon = nullptr;
+	HICON _nextIcon = nullptr;
+	std::optional<bool> _iconsDark;
+
+	State _applied;
+	bool _created = false;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Platform
diff --git a/Telegram/SourceFiles/poll/poll_link_box.cpp b/Telegram/SourceFiles/poll/poll_link_box.cpp
new file mode 100644
index 00000000000000..57c99afab4f5e9
--- /dev/null
+++ b/Telegram/SourceFiles/poll/poll_link_box.cpp
@@ -0,0 +1,66 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "poll/poll_link_box.h"
+
+#include "lang/lang_keys.h"
+#include "ui/layers/generic_box.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_layers.h"
+#include "styles/style_polls.h"
+#include "styles/style_widgets.h"
+
+namespace Poll {
+
+void AddPollOptionLinkBox(
+		not_null<Ui::GenericBox*> box,
+		const QString &initial,
+		Fn<void(QString)> callback) {
+	box->setTitle(tr::lng_polls_create_option_link_title());
+
+	const auto content = box->verticalLayout();
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_polls_create_option_link_description(),
+			st::defaultFlatLabel),
+		st::boxRowPadding);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	const auto field = content->add(
+		object_ptr<Ui::InputField>(
+			content,
+			st::createPollLinkUrlField,
+			Ui::InputField::Mode::SingleLine,
+			tr::lng_polls_create_option_link_placeholder(),
+			initial),
+		st::boxRowPadding);
+
+	const auto submit = [=] {
+		const auto url = field->getLastText().trimmed();
+		if (url.isEmpty()) {
+			field->showError();
+			return;
+		}
+		const auto weak = base::make_weak(box);
+		callback(url);
+		if (weak) {
+			box->closeBox();
+		}
+	};
+	field->submits(
+	) | rpl::on_next(submit, field->lifetime());
+
+	box->addButton(tr::lng_box_done(), submit);
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	box->setFocusCallback([=] { field->setFocusFast(); });
+}
+
+} // namespace Poll
diff --git a/Telegram/SourceFiles/poll/poll_link_box.h b/Telegram/SourceFiles/poll/poll_link_box.h
new file mode 100644
index 00000000000000..1accb9726ab61f
--- /dev/null
+++ b/Telegram/SourceFiles/poll/poll_link_box.h
@@ -0,0 +1,21 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+namespace Poll {
+
+void AddPollOptionLinkBox(
+	not_null<Ui::GenericBox*> box,
+	const QString &initial,
+	Fn<void(QString)> callback);
+
+} // namespace Poll
diff --git a/Telegram/SourceFiles/poll/poll_link_thumbnail.cpp b/Telegram/SourceFiles/poll/poll_link_thumbnail.cpp
new file mode 100644
index 00000000000000..007453e029fe2a
--- /dev/null
+++ b/Telegram/SourceFiles/poll/poll_link_thumbnail.cpp
@@ -0,0 +1,65 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "poll/poll_link_thumbnail.h"
+
+#include "ui/painter.h"
+#include "styles/style_polls.h"
+
+namespace Poll {
+namespace {
+
+class LinkThumbnail final : public Ui::DynamicImage {
+public:
+	std::shared_ptr<Ui::DynamicImage> clone() override {
+		return std::make_shared<LinkThumbnail>();
+	}
+	QImage image(int size) override {
+		const auto good = (_frame.width()
+			== size * _frame.devicePixelRatio());
+		const auto paletteVersion = style::PaletteVersion();
+		if (!good || _paletteVersion != paletteVersion) {
+			_paletteVersion = paletteVersion;
+			const auto ratio = style::DevicePixelRatio();
+			if (!good) {
+				_frame = QImage(
+					QSize(size, size) * ratio,
+					QImage::Format_ARGB32_Premultiplied);
+				_frame.setDevicePixelRatio(ratio);
+			}
+			_frame.fill(Qt::transparent);
+			auto p = Painter(&_frame);
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::windowBgOver);
+			const auto radius = size / 4.;
+			p.drawRoundedRect(QRect(0, 0, size, size), radius, radius);
+			st::historyPollLinkPlaceholderIcon.paintInCenter(
+				p,
+				QRect(0, 0, size, size));
+		}
+		return _frame;
+	}
+	void subscribeToUpdates(Fn<void()> callback) override {
+		if (!callback) {
+			_frame = {};
+		}
+	}
+
+private:
+	int _paletteVersion = 0;
+	QImage _frame;
+
+};
+
+} // namespace
+
+std::shared_ptr<Ui::DynamicImage> MakeLinkThumbnail() {
+	return std::make_shared<LinkThumbnail>();
+}
+
+} // namespace Poll
diff --git a/Telegram/SourceFiles/poll/poll_link_thumbnail.h b/Telegram/SourceFiles/poll/poll_link_thumbnail.h
new file mode 100644
index 00000000000000..f14a98e1d04e10
--- /dev/null
+++ b/Telegram/SourceFiles/poll/poll_link_thumbnail.h
@@ -0,0 +1,16 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/dynamic_image.h"
+
+namespace Poll {
+
+[[nodiscard]] std::shared_ptr<Ui::DynamicImage> MakeLinkThumbnail();
+
+} // namespace Poll
diff --git a/Telegram/SourceFiles/poll/poll_media_upload.cpp b/Telegram/SourceFiles/poll/poll_media_upload.cpp
new file mode 100644
index 00000000000000..3a118a45bc7b25
--- /dev/null
+++ b/Telegram/SourceFiles/poll/poll_media_upload.cpp
@@ -0,0 +1,1064 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "poll/poll_media_upload.h"
+
+#include "api/api_sending.h"
+#include "apiwrap.h"
+#include "base/event_filter.h"
+#include "core/file_utilities.h"
+#include "core/mime_type.h"
+#include "data/data_document.h"
+#include "data/data_peer.h"
+#include "data/data_photo.h"
+#include "data/data_session.h"
+#include "data/data_web_page.h"
+#include "lang/lang_keys.h"
+#include "layout/layout_document_generic_preview.h"
+#include "main/main_session.h"
+#include "platform/platform_file_utilities.h"
+#include "storage/file_upload.h"
+#include "storage/localimageloader.h"
+#include "storage/storage_media_prepare.h"
+#include "ui/chat/attach/attach_prepare.h"
+#include "ui/dynamic_thumbnails.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/widgets/fields/input_field.h"
+#include "styles/style_boxes.h"
+#include "styles/style_overview.h"
+#include "styles/style_polls.h"
+
+#include <QtCore/QMimeData>
+
+namespace PollMediaUpload {
+
+LocalImageThumbnail::LocalImageThumbnail(QImage original)
+: _original(std::move(original)) {
+}
+
+std::shared_ptr<Ui::DynamicImage> LocalImageThumbnail::clone() {
+	return std::make_shared<LocalImageThumbnail>(_original);
+}
+
+QImage LocalImageThumbnail::image(int size) {
+	return _original;
+}
+
+void LocalImageThumbnail::subscribeToUpdates(Fn<void()> callback) {
+}
+
+QImage GenerateDocumentFilePreview(
+		const QString &filename,
+		int size) {
+	const auto preview = Layout::DocumentGenericPreview::Create(filename);
+	const auto &color = preview.color;
+	const auto &ext = preview.ext;
+
+	const auto ratio = style::DevicePixelRatio();
+	auto result = QImage(
+		QSize(size, size) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	result.fill(Qt::transparent);
+	result.setDevicePixelRatio(ratio);
+
+	auto p = QPainter(&result);
+	PainterHighQualityEnabler hq(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(color);
+	p.drawRoundedRect(
+		QRect(0, 0, size, size),
+		st::pollAttachRadius,
+		st::pollAttachRadius);
+
+	if (!ext.isEmpty()) {
+		const auto refSize = st::overviewFileLayout.fileThumbSize;
+		const auto fontSize = std::max(
+			size * st::overviewFileExtFont->f.pixelSize() / refSize,
+			8);
+		const auto font = style::font(
+			fontSize,
+			st::overviewFileExtFont->flags(),
+			st::overviewFileExtFont->family());
+		const auto padding = size * st::overviewFileExtPadding / refSize;
+		const auto maxw = size - padding * 2;
+		auto extStr = ext;
+		auto extw = font->width(extStr);
+		if (extw > maxw) {
+			extStr = font->elided(extStr, maxw, Qt::ElideMiddle);
+			extw = font->width(extStr);
+		}
+		p.setFont(font);
+		p.setPen(st::overviewFileExtFg);
+		p.drawText(
+			(size - extw) / 2,
+			(size - font->height) / 2 + font->ascent,
+			extStr);
+	}
+	p.end();
+	return result;
+}
+
+bool ValidateFileDragData(not_null<const QMimeData*> data) {
+	if (data->hasImage()) {
+		return true;
+	}
+	const auto urls = Core::ReadMimeUrls(data);
+	return (urls.size() == 1) && urls.front().isLocalFile();
+}
+
+QVector<MTPDocumentAttribute> ExtractAudioAttributes(
+		const Ui::PreparedFile &file) {
+	auto result = QVector<MTPDocumentAttribute>();
+	if (!file.information) {
+		return result;
+	}
+	const auto song = std::get_if<Ui::PreparedFileInformation::Song>(
+		&file.information->media);
+	if (!song) {
+		return result;
+	}
+	const auto seconds = song->duration / 1000;
+	using Flag = MTPDdocumentAttributeAudio::Flag;
+	result.push_back(MTP_documentAttributeAudio(
+		MTP_flags(Flag::f_title | Flag::f_performer),
+		MTP_int(seconds),
+		MTP_string(song->title),
+		MTP_string(song->performer),
+		MTPstring()));
+	return result;
+}
+
+Ui::PreparedList FileListFromMimeData(
+		not_null<const QMimeData*> data,
+		bool premium) {
+	using Error = Ui::PreparedList::Error;
+	const auto urls = Core::ReadMimeUrls(data);
+	if (!urls.isEmpty()) {
+		return Storage::PrepareMediaList(
+			urls.mid(0, 1),
+			st::sendMediaPreviewSize,
+			premium);
+	} else if (auto read = Core::ReadMimeImage(data)) {
+		return Storage::PrepareMediaFromImage(
+			std::move(read.image),
+			std::move(read.content),
+			st::sendMediaPreviewSize);
+	}
+	return Ui::PreparedList(Error::EmptyFile, QString());
+}
+
+PollMediaButton::PollMediaButton(
+	not_null<QWidget*> parent,
+	const style::IconButton &st,
+	std::shared_ptr<PollMediaState> state)
+: Ui::RippleButton(parent, st.ripple)
+, _st(st)
+, _state(std::move(state))
+, _attach(Ui::MakeIconThumbnail(_st.icon))
+, _attachOver(_st.iconOver.empty()
+	? _attach
+	: Ui::MakeIconThumbnail(_st.iconOver))
+, _radial([=](crl::time now) { radialAnimationCallback(now); }) {
+	const auto weak = QPointer<PollMediaButton>(this);
+	_state->update = [=] {
+		if (weak) {
+			weak->updateMediaSubscription();
+			weak->update();
+		}
+	};
+	resize(_st.width, _st.height);
+	setPointerCursor(true);
+	updateMediaSubscription();
+}
+
+void PollMediaButton::setIconColorOverride(
+		std::optional<QColor> colorOverride) {
+	_iconColorOverride = colorOverride;
+	update();
+}
+
+void PollMediaButton::setRippleColorOverride(
+		std::optional<QColor> colorOverride) {
+	_rippleColorOverride = colorOverride;
+	update();
+}
+
+PollMediaButton::~PollMediaButton() {
+	if (_subscribed) {
+		_subscribed->subscribeToUpdates(nullptr);
+	}
+}
+
+void PollMediaButton::paintEvent(QPaintEvent *e) {
+	auto p = Painter(this);
+	paintRipple(
+		p,
+		_st.rippleAreaPosition,
+		_rippleColorOverride ? &*_rippleColorOverride : nullptr);
+	const auto isLinkWithPhoto = _state->media.webpage
+		&& _state->media.webpage->photo;
+	if (_state->thumbnail) {
+		const auto target = rippleRect();
+		paintCover(
+			p,
+			target,
+			_state->thumbnail->image(
+				std::max(target.width(), target.height())),
+			_state->rounded);
+		if (isLinkWithPhoto) {
+			p.save();
+			auto hq = PainterHighQualityEnabler(p);
+			auto path = QPainterPath();
+			path.addRoundedRect(
+				target,
+				st::pollAttachRadius,
+				st::pollAttachRadius);
+			p.setClipPath(path);
+			p.fillRect(target, st::songCoverOverlayFg);
+			const auto center = QPointF(rect::center(target));
+			p.translate(center);
+			p.rotate(-45.);
+			p.translate(-center);
+			st::pollAttachLink.paintInCenter(p, target);
+			p.restore();
+		}
+	} else if (_iconColorOverride) {
+		const auto &icon = (isOver() && !_st.iconOver.empty())
+			? _st.iconOver
+			: _st.icon;
+		auto position = _st.iconPosition;
+		if (position.x() < 0) {
+			position.setX((width() - icon.width()) / 2);
+		}
+		if (position.y() < 0) {
+			position.setY((height() - icon.height()) / 2);
+		}
+		icon.paint(p, position, width(), *_iconColorOverride);
+	} else if (const auto image = currentAttachThumbnail()) {
+		const auto target = iconRect();
+		p.drawImage(
+			target,
+			image->image(std::max(target.width(), target.height())));
+	}
+	if (_state->thumbnail && !_state->uploading && !isLinkWithPhoto) {
+		const auto viewOpacity = _viewShown.value(
+			(isOver() || isDown()) ? 1. : 0.);
+		if (viewOpacity > 0.) {
+			p.save();
+			p.setOpacity(viewOpacity);
+			auto path = QPainterPath();
+			path.addRoundedRect(
+				rippleRect(),
+				st::pollAttachRadius,
+				st::pollAttachRadius);
+			p.setClipPath(path);
+			p.fillRect(rippleRect(), st::songCoverOverlayFg);
+			st::pollAttachView.paintInCenter(p, rippleRect());
+			p.restore();
+		}
+	}
+	if (_state->uploading && !_radial.animating()) {
+		_radial.start(_state->progress);
+	}
+	if (_state->uploading || _radial.animating()) {
+		if (_state->thumbnail) {
+			p.save();
+			auto path = QPainterPath();
+			path.addRoundedRect(
+				rippleRect(),
+				st::pollAttachRadius,
+				st::pollAttachRadius);
+			p.setClipPath(path);
+			p.fillRect(rippleRect(), st::songCoverOverlayFg);
+			p.restore();
+		}
+		const auto cancelOpacity = _state->uploading
+			? _cancelShown.value(
+				(isOver() || isDown()) ? 1. : 0.)
+			: 0.;
+		const auto line = float64(st::lineWidth * 2);
+		const auto margin = float64(st::pollAttachProgressMargin);
+		const auto arc = QRectF(rippleRect()) - Margins(margin);
+		if (cancelOpacity > 0.) {
+			p.setOpacity(cancelOpacity);
+			st::pollAttachCancel.paintInCenter(p, rippleRect());
+			p.setOpacity(1.);
+		}
+		_radial.draw(p, arc, line, st::historyFileThumbRadialFg);
+	}
+}
+
+void PollMediaButton::onStateChanged(State was, StateChangeSource source) {
+	RippleButton::onStateChanged(was, source);
+	if (!_state->thumbnail) {
+		update();
+	}
+	const auto over = isOver() || isDown();
+	const auto wasOver = (was & StateFlag::Over)
+		|| (was & StateFlag::Down);
+	if (over != wasOver) {
+		if (_state->uploading) {
+			_cancelShown.start(
+				[=] { update(); },
+				over ? 0. : 1.,
+				over ? 1. : 0.,
+				st::universalDuration);
+		}
+		if (_state->thumbnail && !_state->uploading) {
+			_viewShown.start(
+				[=] { update(); },
+				over ? 0. : 1.,
+				over ? 1. : 0.,
+				st::universalDuration);
+		}
+	}
+}
+
+QImage PollMediaButton::prepareRippleMask() const {
+	return Ui::RippleAnimation::EllipseMask(QSize(
+		_st.rippleAreaSize,
+		_st.rippleAreaSize));
+}
+
+QPoint PollMediaButton::prepareRippleStartPosition() const {
+	auto result = mapFromGlobal(QCursor::pos())
+		- _st.rippleAreaPosition;
+	const auto rect = QRect(
+		QPoint(),
+		QSize(_st.rippleAreaSize, _st.rippleAreaSize));
+	return rect.contains(result)
+		? result
+		: DisabledRippleStartPosition();
+}
+
+void PollMediaButton::paintCover(
+		Painter &p,
+		QRect target,
+		QImage image,
+		bool rounded) const {
+	if (image.isNull() || target.isEmpty()) {
+		return;
+	}
+	const auto source = QRectF(0, 0, image.width(), image.height());
+	const auto kx = target.width() / source.width();
+	const auto ky = target.height() / source.height();
+	const auto scale = std::max(kx, ky);
+	const auto size = QSizeF(
+		source.width() * scale,
+		source.height() * scale);
+	const auto geometry = QRectF(
+		target.x() + (target.width() - size.width()) / 2.,
+		target.y() + (target.height() - size.height()) / 2.,
+		size.width(),
+		size.height());
+	p.save();
+	auto hq = PainterHighQualityEnabler(p);
+	if (rounded) {
+		auto path = QPainterPath();
+		path.addRoundedRect(
+			target,
+			st::pollAttachRadius,
+			st::pollAttachRadius);
+		p.setClipPath(path);
+	}
+	p.drawImage(geometry, image, source);
+	p.restore();
+}
+
+void PollMediaButton::radialAnimationCallback(crl::time now) {
+	const auto updated = _radial.update(
+		_state->progress,
+		!_state->uploading,
+		now);
+	if (!anim::Disabled() || updated || _radial.animating()) {
+		update(rippleRect());
+	}
+}
+
+QRect PollMediaButton::rippleRect() const {
+	return QRect(
+		_st.rippleAreaPosition,
+		QSize(_st.rippleAreaSize, _st.rippleAreaSize));
+}
+
+QRect PollMediaButton::iconRect() const {
+	const auto over = isOver() || isDown();
+	const auto &icon = over && !_st.iconOver.empty()
+		? _st.iconOver
+		: _st.icon;
+	auto position = _st.iconPosition;
+	if (position.x() < 0) {
+		position.setX((width() - icon.width()) / 2);
+	}
+	if (position.y() < 0) {
+		position.setY((height() - icon.height()) / 2);
+	}
+	return QRect(position, QSize(icon.width(), icon.height()));
+}
+
+std::shared_ptr<Ui::DynamicImage>
+PollMediaButton::currentAttachThumbnail() const {
+	return (isOver() || isDown()) ? _attachOver : _attach;
+}
+
+void PollMediaButton::updateMediaSubscription() {
+	if (_subscribed == _state->thumbnail) {
+		return;
+	}
+	if (_subscribed) {
+		_subscribed->subscribeToUpdates(nullptr);
+	}
+	_subscribed = _state->thumbnail;
+	if (!_subscribed) {
+		return;
+	}
+	const auto weak = QPointer<PollMediaButton>(this);
+	_subscribed->subscribeToUpdates([=] {
+		if (weak) {
+			weak->update();
+		}
+	});
+}
+
+PreparePollMediaTask::PreparePollMediaTask(
+	FileLoadTask::Args &&args,
+	Fn<void(std::shared_ptr<FilePrepareResult>)> done)
+: _task(std::move(args))
+, _done(std::move(done)) {
+}
+
+void PreparePollMediaTask::process() {
+	_task.process({ .generateGoodThumbnail = false });
+}
+
+void PreparePollMediaTask::finish() {
+	_done(_task.peekResult());
+}
+
+PollMediaUploader::PollMediaUploader(Args &&args)
+: _session(args.session)
+, _peer(args.peer)
+, _showError(std::move(args.showError))
+, _prepareQueue(std::make_unique<TaskQueue>()) {
+	subscribeToUploader();
+}
+
+PollMediaUploader::~PollMediaUploader() = default;
+
+void PollMediaUploader::subscribeToUploader() {
+	auto &uploader = _session->uploader();
+
+	uploader.photoReady(
+	) | rpl::on_next([=](const Storage::UploadedMedia &data) {
+		const auto context = _uploads.take(data.fullId);
+		if (!context) {
+			return;
+		}
+		const auto media = context->media.lock();
+		if (!media || (media->token != context->token)) {
+			return;
+		}
+		applyUploaded(media, context->token, data.fullId, data.info.file);
+	}, _lifetime);
+
+	uploader.photoProgress(
+	) | rpl::on_next([=](const FullMsgId &id) {
+		const auto i = _uploads.find(id);
+		if (i == _uploads.end()) {
+			return;
+		}
+		const auto &context = i->second;
+		const auto media = context.media.lock();
+		if (!media
+			|| (media->token != context.token)
+			|| !media->uploadDataId) {
+			return;
+		}
+		media->progress = _session->data().photo(
+			media->uploadDataId)->progress();
+		updateMedia(media);
+	}, _lifetime);
+
+	uploader.photoFailed(
+	) | rpl::on_next([=](const FullMsgId &id) {
+		const auto context = _uploads.take(id);
+		if (!context) {
+			return;
+		}
+		const auto media = context->media.lock();
+		if (!media || (media->token != context->token)) {
+			return;
+		}
+		setMedia(media, PollMedia(), nullptr, false);
+		_showError(tr::lng_attach_failed(tr::now));
+	}, _lifetime);
+
+	uploader.documentReady(
+	) | rpl::on_next([=](const Storage::UploadedMedia &data) {
+		const auto context = _uploads.take(data.fullId);
+		if (!context) {
+			return;
+		}
+		const auto media = context->media.lock();
+		if (!media || (media->token != context->token)) {
+			return;
+		}
+		applyUploadedDocument(
+			media,
+			context->token,
+			data.fullId,
+			data.info,
+			*context);
+	}, _lifetime);
+
+	uploader.documentProgress(
+	) | rpl::on_next([=](const FullMsgId &id) {
+		const auto i = _uploads.find(id);
+		if (i == _uploads.end()) {
+			return;
+		}
+		const auto &context = i->second;
+		const auto media = context.media.lock();
+		if (!media
+			|| (media->token != context.token)
+			|| !media->uploadDataId) {
+			return;
+		}
+		media->progress = _session->data().document(
+			media->uploadDataId)->progress();
+		updateMedia(media);
+	}, _lifetime);
+
+	uploader.documentFailed(
+	) | rpl::on_next([=](const FullMsgId &id) {
+		const auto context = _uploads.take(id);
+		if (!context) {
+			return;
+		}
+		const auto media = context->media.lock();
+		if (!media || (media->token != context->token)) {
+			return;
+		}
+		setMedia(media, PollMedia(), nullptr, false);
+		_showError(tr::lng_attach_failed(tr::now));
+	}, _lifetime);
+}
+
+void PollMediaUploader::updateMedia(
+		const std::shared_ptr<PollMediaState> &media) {
+	if (media->update) {
+		media->update();
+	}
+}
+
+void PollMediaUploader::setMedia(
+		const std::shared_ptr<PollMediaState> &media,
+		PollMedia value,
+		std::shared_ptr<Ui::DynamicImage> thumbnail,
+		bool rounded) {
+	const auto wasUploading = media->uploading;
+	media->token++;
+	media->media = value;
+	media->thumbnail = std::move(thumbnail);
+	media->rounded = rounded;
+	media->progress = (media->uploading && media->media)
+		? 1.
+		: 0.;
+	media->uploadDataId = 0;
+	media->uploading = false;
+	if (wasUploading && value) {
+		media->uploadedAt = crl::now();
+	} else {
+		media->uploadedAt = 0;
+		media->reupload = nullptr;
+	}
+	updateMedia(media);
+}
+
+auto PollMediaUploader::parseUploaded(
+		const MTPMessageMedia &result,
+		FullMsgId fullId) -> UploadedMedia {
+	auto parsed = UploadedMedia();
+	auto &owner = _session->data();
+	result.match([&](const MTPDmessageMediaPhoto &media) {
+		if (const auto photo = media.vphoto()) {
+			photo->match([&](const MTPDphoto &) {
+				parsed.input.photo = owner.processPhoto(*photo);
+				parsed.thumbnail = Ui::MakePhotoThumbnail(
+					parsed.input.photo,
+					fullId);
+			}, [](const auto &) {
+			});
+		}
+	}, [&](const MTPDmessageMediaDocument &media) {
+		if (const auto document = media.vdocument()) {
+			document->match([&](const MTPDdocument &) {
+				parsed.input.document = owner.processDocument(
+					*document);
+				parsed.thumbnail
+					= Ui::MakeDocumentFilePreviewThumbnail(
+						parsed.input.document,
+						fullId);
+			}, [](const auto &) {
+			});
+		}
+	}, [](const auto &) {
+	});
+	return parsed;
+}
+
+void PollMediaUploader::applyUploaded(
+		const std::shared_ptr<PollMediaState> &media,
+		uint64 token,
+		FullMsgId fullId,
+		const MTPInputFile &file) {
+	const auto uploaded = MTP_inputMediaUploadedPhoto(
+		MTP_flags(0),
+		file,
+		MTP_vector<MTPInputDocument>(QVector<MTPInputDocument>()),
+		MTPint(),
+		MTPInputDocument());
+	_session->api().request(MTPmessages_UploadMedia(
+		MTP_flags(0),
+		MTPstring(),
+		_peer->input(),
+		uploaded
+	)).done([=](const MTPMessageMedia &result) {
+		if (media->token != token) {
+			return;
+		}
+		auto parsed = parseUploaded(result, fullId);
+		if (!parsed.input) {
+			setMedia(media, PollMedia(), nullptr, false);
+			_showError(tr::lng_attach_failed(tr::now));
+			return;
+		}
+		setMedia(
+			media,
+			parsed.input,
+			media->thumbnail
+				? media->thumbnail
+				: std::move(parsed.thumbnail),
+			true);
+	}).fail([=](const MTP::Error &) {
+		if (media->token != token) {
+			return;
+		}
+		setMedia(media, PollMedia(), nullptr, false);
+		_showError(tr::lng_attach_failed(tr::now));
+	}).send();
+}
+
+void PollMediaUploader::applyUploadedDocument(
+		const std::shared_ptr<PollMediaState> &media,
+		uint64 token,
+		FullMsgId fullId,
+		const Api::RemoteFileInfo &info,
+		const UploadContext &context) {
+	using Flag = MTPDinputMediaUploadedDocument::Flag;
+	const auto flags = (context.forceFile ? Flag::f_force_file : Flag())
+		| (info.thumb ? Flag::f_thumb : Flag());
+	auto attributes = !context.attributes.isEmpty()
+		? context.attributes
+		: QVector<MTPDocumentAttribute>{
+			MTP_documentAttributeFilename(
+				MTP_string(context.filename)),
+		};
+	const auto uploaded = MTP_inputMediaUploadedDocument(
+		MTP_flags(flags),
+		info.file,
+		info.thumb.value_or(MTPInputFile()),
+		MTP_string(context.filemime),
+		MTP_vector<MTPDocumentAttribute>(std::move(attributes)),
+		MTP_vector<MTPInputDocument>(),
+		MTPInputPhoto(),
+		MTP_int(0),
+		MTP_int(0));
+	_session->api().request(MTPmessages_UploadMedia(
+		MTP_flags(0),
+		MTPstring(),
+		_peer->input(),
+		uploaded
+	)).done([=](const MTPMessageMedia &result) {
+		if (media->token != token) {
+			return;
+		}
+		auto parsed = parseUploaded(result, fullId);
+		if (!parsed.input) {
+			setMedia(media, PollMedia(), nullptr, false);
+			_showError(tr::lng_attach_failed(tr::now));
+			return;
+		}
+		const auto isVideo = parsed.input.document
+			&& parsed.input.document->isVideoFile();
+		setMedia(
+			media,
+			parsed.input,
+			isVideo
+				? (media->thumbnail
+					? media->thumbnail
+					: std::move(parsed.thumbnail))
+				: std::move(parsed.thumbnail),
+			isVideo);
+	}).fail([=](const MTP::Error &) {
+		if (media->token != token) {
+			return;
+		}
+		setMedia(media, PollMedia(), nullptr, false);
+		_showError(tr::lng_attach_failed(tr::now));
+	}).send();
+}
+
+void PollMediaUploader::startPhotoUpload(
+		std::shared_ptr<PollMediaState> media,
+		Ui::PreparedFile file) {
+	const auto token = ++media->token;
+	media->media = PollMedia();
+	media->thumbnail = std::make_shared<LocalImageThumbnail>(
+		std::move(file.preview));
+	media->rounded = true;
+	media->uploading = true;
+	media->progress = 0.;
+	media->uploadDataId = 0;
+	updateMedia(media);
+	_prepareQueue->addTask(std::make_unique<PreparePollMediaTask>(
+		FileLoadTask::Args{
+			.session = _session,
+			.filepath = file.path,
+			.content = file.content,
+			.information = std::move(file.information),
+			.videoCover = nullptr,
+			.type = SendMediaType::Photo,
+			.to = FileLoadTo(
+				_peer->id,
+				Api::SendOptions(),
+				FullReplyTo(),
+				MsgId()),
+			.caption = TextWithTags(),
+			.spoiler = false,
+			.album = nullptr,
+			.forceFile = false,
+			.idOverride = 0,
+			.displayName = file.displayName,
+		},
+		[=](std::shared_ptr<FilePrepareResult> prepared) {
+			if ((media->token != token)
+				|| !prepared
+				|| (prepared->type != SendMediaType::Photo)) {
+				if (media->token == token) {
+					setMedia(media, PollMedia(), nullptr, false);
+					_showError(tr::lng_attach_failed(tr::now));
+				}
+				return;
+			}
+			const auto uploadId = FullMsgId(
+				_peer->id,
+				_session->data().nextLocalMessageId());
+			_uploads.emplace(uploadId, UploadContext{
+				.media = media,
+				.token = token,
+			});
+			media->uploadDataId = prepared->id;
+			_session->uploader().upload(uploadId, prepared);
+		}));
+}
+
+void PollMediaUploader::startDocumentUpload(
+		std::shared_ptr<PollMediaState> media,
+		Ui::PreparedFile file) {
+	const auto displayName = file.displayName.isEmpty()
+		? QFileInfo(file.path).fileName()
+		: file.displayName;
+	auto audioAttributes = ExtractAudioAttributes(file);
+	const auto isAudio = !audioAttributes.isEmpty();
+	const auto token = ++media->token;
+	media->media = PollMedia();
+	media->thumbnail = std::make_shared<LocalImageThumbnail>(
+		GenerateDocumentFilePreview(
+			displayName,
+			st::pollAttach.rippleAreaSize));
+	media->rounded = false;
+	media->uploading = true;
+	media->progress = 0.;
+	media->uploadDataId = 0;
+	updateMedia(media);
+	_prepareQueue->addTask(std::make_unique<PreparePollMediaTask>(
+		FileLoadTask::Args{
+			.session = _session,
+			.filepath = file.path,
+			.content = file.content,
+			.information = std::move(file.information),
+			.videoCover = nullptr,
+			.type = SendMediaType::File,
+			.to = FileLoadTo(
+				_peer->id,
+				Api::SendOptions(),
+				FullReplyTo(),
+				MsgId()),
+			.caption = TextWithTags(),
+			.spoiler = false,
+			.album = nullptr,
+			.forceFile = !isAudio,
+			.idOverride = 0,
+			.displayName = displayName,
+		},
+		[=, attributes = std::move(audioAttributes)](
+				std::shared_ptr<FilePrepareResult> prepared) {
+			if ((media->token != token) || !prepared) {
+				if (media->token == token) {
+					setMedia(media, PollMedia(), nullptr, false);
+					_showError(tr::lng_attach_failed(tr::now));
+				}
+				return;
+			}
+			const auto uploadId = FullMsgId(
+				_peer->id,
+				_session->data().nextLocalMessageId());
+			_uploads.emplace(uploadId, UploadContext{
+				.media = media,
+				.token = token,
+				.filename = prepared->filename,
+				.filemime = prepared->filemime,
+				.attributes = attributes,
+				.forceFile = !isAudio,
+			});
+			media->uploadDataId = prepared->id;
+			_session->uploader().upload(uploadId, prepared);
+		}));
+}
+
+void PollMediaUploader::startVideoUpload(
+		std::shared_ptr<PollMediaState> media,
+		Ui::PreparedFile file) {
+	const auto token = ++media->token;
+	media->media = PollMedia();
+	media->thumbnail = std::make_shared<LocalImageThumbnail>(
+		std::move(file.preview));
+	media->rounded = true;
+	media->uploading = true;
+	media->progress = 0.;
+	media->uploadDataId = 0;
+	updateMedia(media);
+	_prepareQueue->addTask(std::make_unique<PreparePollMediaTask>(
+		FileLoadTask::Args{
+			.session = _session,
+			.filepath = file.path,
+			.content = file.content,
+			.information = std::move(file.information),
+			.videoCover = nullptr,
+			.type = SendMediaType::File,
+			.to = FileLoadTo(
+				_peer->id,
+				Api::SendOptions(),
+				FullReplyTo(),
+				MsgId()),
+			.caption = TextWithTags(),
+			.spoiler = false,
+			.album = nullptr,
+			.forceFile = false,
+			.idOverride = 0,
+			.displayName = file.displayName,
+		},
+		[=](std::shared_ptr<FilePrepareResult> prepared) {
+			if ((media->token != token) || !prepared) {
+				if (media->token == token) {
+					setMedia(media, PollMedia(), nullptr, false);
+					_showError(tr::lng_attach_failed(tr::now));
+				}
+				return;
+			}
+			auto attributes = QVector<MTPDocumentAttribute>();
+			prepared->document.match([&](const MTPDdocument &data) {
+				attributes = data.vattributes().v;
+			}, [](const auto &) {
+			});
+			const auto uploadId = FullMsgId(
+				_peer->id,
+				_session->data().nextLocalMessageId());
+			_uploads.emplace(uploadId, UploadContext{
+				.media = media,
+				.token = token,
+				.filename = prepared->filename,
+				.filemime = prepared->filemime,
+				.attributes = std::move(attributes),
+				.forceFile = false,
+			});
+			media->uploadDataId = prepared->id;
+			_session->uploader().upload(uploadId, prepared);
+		}));
+}
+
+bool PollMediaUploader::applyPreparedPhotoList(
+		std::shared_ptr<PollMediaState> media,
+		Ui::PreparedList &&list) {
+	if (list.error != Ui::PreparedList::Error::None
+		|| (list.files.size() != 1)
+		|| (list.files.front().type != Ui::PreparedFile::Type::Photo)) {
+		return false;
+	}
+	startPhotoUpload(media, std::move(list.files.front()));
+	return true;
+}
+
+void PollMediaUploader::clearMedia(std::shared_ptr<PollMediaState> media) {
+	auto toCancel = std::vector<FullMsgId>();
+	for (auto i = _uploads.begin(); i != _uploads.end();) {
+		if (i->second.media.lock() == media) {
+			toCancel.push_back(i->first);
+			i = _uploads.erase(i);
+		} else {
+			++i;
+		}
+	}
+	for (const auto &id : toCancel) {
+		_session->uploader().cancel(id);
+	}
+	setMedia(media, PollMedia(), nullptr, false);
+}
+
+void PollMediaUploader::choosePhotoOrVideo(
+		not_null<QWidget*> parent,
+		std::shared_ptr<PollMediaState> media) {
+	const auto weak = QPointer<QWidget>(parent.get());
+	const auto callback = crl::guard(parent.get(), [=](
+			FileDialog::OpenResult &&result) {
+		const auto checkResult = [&](const Ui::PreparedList &list) {
+			using namespace Ui;
+			if (list.files.size() != 1) {
+				return false;
+			}
+			const auto type = list.files.front().type;
+			return (type == PreparedFile::Type::Photo)
+				|| (type == PreparedFile::Type::Video);
+		};
+		const auto showError = [=](tr::phrase<> text) {
+			_showError(text(tr::now));
+		};
+		auto list = Storage::PreparedFileFromFilesDialog(
+			std::move(result),
+			checkResult,
+			showError,
+			st::sendMediaPreviewSize,
+			_session->premium());
+		if (!list) {
+			return;
+		}
+		auto &file = list->files.front();
+		if (file.type == Ui::PreparedFile::Type::Photo) {
+			applyPreparedPhotoList(media, std::move(*list));
+		} else {
+			startVideoUpload(media, std::move(file));
+		}
+	});
+	FileDialog::GetOpenPath(
+		QPointer<QWidget>(parent.get()),
+		tr::lng_attach_photo_or_video(tr::now),
+		FileDialog::PhotoVideoFilesFilter(),
+		callback);
+}
+
+void PollMediaUploader::chooseDocument(
+		not_null<QWidget*> parent,
+		std::shared_ptr<PollMediaState> media) {
+	const auto callback = crl::guard(parent.get(), [=](
+			FileDialog::OpenResult &&result) {
+		if (result.paths.isEmpty()) {
+			return;
+		}
+		auto list = Storage::PrepareMediaList(
+			result.paths.mid(0, 1),
+			st::sendMediaPreviewSize,
+			_session->premium());
+		if (list.error != Ui::PreparedList::Error::None
+			|| list.files.empty()) {
+			return;
+		}
+		startDocumentUpload(
+			media,
+			std::move(list.files.front()));
+	});
+	FileDialog::GetOpenPath(
+		QPointer<QWidget>(parent.get()),
+		tr::lng_attach_file(tr::now),
+		FileDialog::AllFilesFilter(),
+		callback);
+}
+
+void PollMediaUploader::installDropToWidget(
+		not_null<QWidget*> widget,
+		std::shared_ptr<PollMediaState> media,
+		bool allowDocuments) {
+	widget->setAcceptDrops(true);
+	base::install_event_filter(widget, [=](not_null<QEvent*> event) {
+		const auto type = event->type();
+		if (type != QEvent::DragEnter
+			&& type != QEvent::DragMove
+			&& type != QEvent::Drop) {
+			return base::EventFilterResult::Continue;
+		}
+		const auto drop = static_cast<QDropEvent*>(event.get());
+		const auto data = drop->mimeData();
+		if (!data || !ValidateFileDragData(data)) {
+			return base::EventFilterResult::Continue;
+		}
+		if (type == QEvent::Drop) {
+			auto list = FileListFromMimeData(data, _session->premium());
+			if (list.error != Ui::PreparedList::Error::None
+				|| list.files.empty()) {
+				return base::EventFilterResult::Continue;
+			}
+			auto &file = list.files.front();
+			if (file.type == Ui::PreparedFile::Type::Photo) {
+				startPhotoUpload(media, std::move(file));
+			} else if (file.type == Ui::PreparedFile::Type::Video) {
+				startVideoUpload(media, std::move(file));
+			} else if (allowDocuments) {
+				startDocumentUpload(media, std::move(file));
+			} else {
+				return base::EventFilterResult::Continue;
+			}
+		}
+		drop->acceptProposedAction();
+		return base::EventFilterResult::Cancel;
+	});
+}
+
+void PollMediaUploader::installDropToField(
+		not_null<Ui::InputField*> field,
+		std::shared_ptr<PollMediaState> media,
+		bool allowDocuments) {
+	field->setMimeDataHook([=](
+			not_null<const QMimeData*> data,
+			Ui::InputField::MimeAction action) {
+		if (action == Ui::InputField::MimeAction::Check) {
+			return ValidateFileDragData(data);
+		} else if (action == Ui::InputField::MimeAction::Insert) {
+			auto list = FileListFromMimeData(data, _session->premium());
+			if (list.error != Ui::PreparedList::Error::None
+				|| list.files.empty()) {
+				return false;
+			}
+			auto &file = list.files.front();
+			if (file.type == Ui::PreparedFile::Type::Photo) {
+				startPhotoUpload(media, std::move(file));
+				return true;
+			} else if (file.type == Ui::PreparedFile::Type::Video) {
+				startVideoUpload(media, std::move(file));
+				return true;
+			} else if (allowDocuments) {
+				startDocumentUpload(media, std::move(file));
+				return true;
+			}
+			return false;
+		}
+		Unexpected("Polls: action in MimeData hook.");
+	});
+}
+
+} // namespace PollMediaUpload
diff --git a/Telegram/SourceFiles/poll/poll_media_upload.h b/Telegram/SourceFiles/poll/poll_media_upload.h
new file mode 100644
index 00000000000000..c5a3bb0354dd75
--- /dev/null
+++ b/Telegram/SourceFiles/poll/poll_media_upload.h
@@ -0,0 +1,224 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "data/data_poll.h"
+#include "storage/localimageloader.h"
+#include "ui/dynamic_image.h"
+#include "ui/effects/radial_animation.h"
+#include "ui/widgets/buttons.h"
+
+struct FilePrepareResult;
+
+namespace Api {
+struct RemoteFileInfo;
+} // namespace Api
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Storage {
+struct UploadedMedia;
+} // namespace Storage
+
+namespace Ui {
+class InputField;
+struct PreparedFile;
+struct PreparedList;
+} // namespace Ui
+
+class PeerData;
+
+namespace PollMediaUpload {
+
+struct PollMediaState {
+	PollMedia media;
+	std::shared_ptr<Ui::DynamicImage> thumbnail;
+	bool rounded = false;
+	bool uploading = false;
+	float64 progress = 0.;
+	uint64 uploadDataId = 0;
+	uint64 token = 0;
+	crl::time uploadedAt = 0;
+	Fn<void()> update;
+	Fn<void()> reupload;
+};
+
+class LocalImageThumbnail final : public Ui::DynamicImage {
+public:
+	explicit LocalImageThumbnail(QImage original);
+
+	std::shared_ptr<Ui::DynamicImage> clone() override;
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	QImage _original;
+
+};
+
+[[nodiscard]] QImage GenerateDocumentFilePreview(
+	const QString &filename,
+	int size);
+
+[[nodiscard]] QVector<MTPDocumentAttribute> ExtractAudioAttributes(
+	const Ui::PreparedFile &file);
+
+[[nodiscard]] bool ValidateFileDragData(not_null<const QMimeData*> data);
+
+[[nodiscard]] Ui::PreparedList FileListFromMimeData(
+	not_null<const QMimeData*> data,
+	bool premium);
+
+class PollMediaButton final : public Ui::RippleButton {
+public:
+	PollMediaButton(
+		not_null<QWidget*> parent,
+		const style::IconButton &st,
+		std::shared_ptr<PollMediaState> state);
+	~PollMediaButton() override;
+
+	void setIconColorOverride(std::optional<QColor> colorOverride);
+	void setRippleColorOverride(std::optional<QColor> colorOverride);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void onStateChanged(State was, StateChangeSource source) override;
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+private:
+	void paintCover(
+		Painter &p,
+		QRect target,
+		QImage image,
+		bool rounded) const;
+	void radialAnimationCallback(crl::time now);
+	[[nodiscard]] QRect rippleRect() const;
+	[[nodiscard]] QRect iconRect() const;
+	std::shared_ptr<Ui::DynamicImage> currentAttachThumbnail() const;
+	void updateMediaSubscription();
+
+	const style::IconButton &_st;
+	const std::shared_ptr<PollMediaState> _state;
+	const std::shared_ptr<Ui::DynamicImage> _attach;
+	const std::shared_ptr<Ui::DynamicImage> _attachOver;
+	std::shared_ptr<Ui::DynamicImage> _subscribed;
+	Ui::RadialAnimation _radial;
+	Ui::Animations::Simple _cancelShown;
+	Ui::Animations::Simple _viewShown;
+	std::optional<QColor> _iconColorOverride;
+	std::optional<QColor> _rippleColorOverride;
+
+};
+
+class PreparePollMediaTask final : public Task {
+public:
+	PreparePollMediaTask(
+		FileLoadTask::Args &&args,
+		Fn<void(std::shared_ptr<FilePrepareResult>)> done);
+
+	void process() override;
+	void finish() override;
+
+private:
+	FileLoadTask _task;
+	Fn<void(std::shared_ptr<FilePrepareResult>)> _done;
+
+};
+
+struct UploadContext {
+	std::weak_ptr<PollMediaState> media;
+	uint64 token = 0;
+	QString filename;
+	QString filemime;
+	QVector<MTPDocumentAttribute> attributes;
+	bool forceFile = true;
+};
+
+class PollMediaUploader final {
+public:
+	struct Args {
+		not_null<Main::Session*> session;
+		not_null<PeerData*> peer;
+		Fn<void(const QString&)> showError;
+	};
+
+	explicit PollMediaUploader(Args &&args);
+	~PollMediaUploader();
+
+	void startPhotoUpload(
+		std::shared_ptr<PollMediaState> media,
+		Ui::PreparedFile file);
+	void startVideoUpload(
+		std::shared_ptr<PollMediaState> media,
+		Ui::PreparedFile file);
+	void startDocumentUpload(
+		std::shared_ptr<PollMediaState> media,
+		Ui::PreparedFile file);
+	bool applyPreparedPhotoList(
+		std::shared_ptr<PollMediaState> media,
+		Ui::PreparedList &&list);
+
+	void setMedia(
+		const std::shared_ptr<PollMediaState> &media,
+		PollMedia value,
+		std::shared_ptr<Ui::DynamicImage> thumbnail,
+		bool rounded);
+	void clearMedia(std::shared_ptr<PollMediaState> media);
+
+	void choosePhotoOrVideo(
+		not_null<QWidget*> parent,
+		std::shared_ptr<PollMediaState> media);
+	void chooseDocument(
+		not_null<QWidget*> parent,
+		std::shared_ptr<PollMediaState> media);
+
+	void installDropToWidget(
+		not_null<QWidget*> widget,
+		std::shared_ptr<PollMediaState> media,
+		bool allowDocuments);
+	void installDropToField(
+		not_null<Ui::InputField*> field,
+		std::shared_ptr<PollMediaState> media,
+		bool allowDocuments);
+
+private:
+	struct UploadedMedia {
+		PollMedia input;
+		std::shared_ptr<Ui::DynamicImage> thumbnail;
+	};
+
+	void updateMedia(const std::shared_ptr<PollMediaState> &media);
+	[[nodiscard]] UploadedMedia parseUploaded(
+		const MTPMessageMedia &result,
+		FullMsgId fullId);
+	void applyUploaded(
+		const std::shared_ptr<PollMediaState> &media,
+		uint64 token,
+		FullMsgId fullId,
+		const MTPInputFile &file);
+	void applyUploadedDocument(
+		const std::shared_ptr<PollMediaState> &media,
+		uint64 token,
+		FullMsgId fullId,
+		const Api::RemoteFileInfo &info,
+		const UploadContext &context);
+	void subscribeToUploader();
+
+	const not_null<Main::Session*> _session;
+	const not_null<PeerData*> _peer;
+	const Fn<void(const QString&)> _showError;
+	std::unique_ptr<TaskQueue> _prepareQueue;
+	base::flat_map<FullMsgId, UploadContext> _uploads;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace PollMediaUpload
diff --git a/Telegram/SourceFiles/profile/profile.style b/Telegram/SourceFiles/profile/profile.style
index b58d5f6d1b7153..0e535f334f8f38 100644
--- a/Telegram/SourceFiles/profile/profile.style
+++ b/Telegram/SourceFiles/profile/profile.style
@@ -30,13 +30,3 @@ profileBlockTitleHeight: 24px;
 profileBlockTitleFont: font(14px semibold);
 profileBlockTitleFg: windowBoldFg;
 profileBlockTitlePosition: point(24px, 0px);
-profileBlockTextPart: FlatLabel(defaultFlatLabel) {
-	minWidth: 180px;
-	margin: margins(5px, 5px, 5px, 5px);
-}
-profileBlockOneLineTextPart: FlatLabel(profileBlockTextPart) {
-	minWidth: 0px; // No need to set minWidth in one-line text.
-	maxHeight: 20px;
-}
-
-profileMemberNameFg: windowBoldFg;
diff --git a/Telegram/SourceFiles/profile/profile_back_button.cpp b/Telegram/SourceFiles/profile/profile_back_button.cpp
index 15b2f285824719..ecdfed7f2f28d0 100644
--- a/Telegram/SourceFiles/profile/profile_back_button.cpp
+++ b/Telegram/SourceFiles/profile/profile_back_button.cpp
@@ -7,63 +7,125 @@ For license and copyright information please follow this link:
 */
 #include "profile/profile_back_button.h"
 
-//#include "history/view/history_view_top_bar_widget.h"
-#include "main/main_session.h"
-#include "data/data_session.h"
-#include "ui/painter.h"
+#include "ui/text/text.h"
 #include "styles/style_widgets.h"
 #include "styles/style_window.h"
 #include "styles/style_profile.h"
 #include "styles/style_info.h"
+#include "styles/style_chat.h"
+#include "styles/style_dialogs.h"
+
+#include <QGraphicsOpacityEffect>
 
 namespace Profile {
 
-BackButton::BackButton(
-	QWidget *parent,
-	not_null<Main::Session*> session,
-	const QString &text,
-	rpl::producer<bool> oneColumnValue)
-: Ui::AbstractButton(parent)
-, _session(session)
-, _text(text) {
+BackButton::BackButton(QWidget *parent) : Ui::AbstractButton(parent) {
 	setCursor(style::cur_pointer);
-
-	std::move(
-		oneColumnValue
-	) | rpl::start_with_next([=](bool oneColumn) {
-		if (!oneColumn) {
-			_unreadBadgeLifetime.destroy();
-		} else if (!_unreadBadgeLifetime) {
-			_session->data().unreadBadgeChanges(
-			) | rpl::start_with_next([=] {
-				rtlupdate(
-					0,
-					0,
-					st::titleUnreadCounterRight,
-					st::titleUnreadCounterTop);
-			}, _unreadBadgeLifetime);
-		}
-	}, lifetime());
 }
 
 void BackButton::setText(const QString &text) {
-	_text = text;
+	_text.setText(st::semiboldTextStyle, text);
+	_cachedWidth = -1;
+	update();
+}
+
+void BackButton::setSubtext(const QString &subtext) {
+	_subtext.setText(st::defaultTextStyle, subtext);
+	_cachedWidth = -1;
+	update();
+}
+
+void BackButton::setWidget(not_null<Ui::RpWidget*> widget) {
+	_widget = widget;
+	_widget->setParent(this);
+	_widget->show();
+	_widget->move(
+		st::historyAdminLogTopBarLeft + st::historyAdminLogTopBarUserpicSkip,
+		(st::profileTopBarHeight - _widget->height()) / 2);
+	_cachedWidth = -1;
+	update();
+}
+
+void BackButton::setOpacity(float64 opacity) {
+	_opacity = opacity;
+	if (_widget) {
+		if (opacity < 1.) {
+			if (!_opacityEffect) {
+				_opacityEffect = Ui::CreateChild<QGraphicsOpacityEffect>(
+					_widget);
+				_widget->setGraphicsEffect(_opacityEffect);
+			}
+			_opacityEffect->setOpacity(opacity);
+		} else {
+			_widget->setGraphicsEffect(nullptr);
+			_opacityEffect = nullptr;
+		}
+	}
 	update();
 }
 
 int BackButton::resizeGetHeight(int newWidth) {
+	_cachedWidth = -1;
 	return st::profileTopBarHeight;
 }
 
+void BackButton::updateCache() {
+	if (_cachedWidth == width()) {
+		return;
+	}
+	_cachedWidth = width();
+	const auto widgetWidth = _widget
+		? _widget->width() + st::historyAdminLogTopBarUserpicSkip
+		: 0;
+	const auto availableWidth = width()
+		- st::historyAdminLogTopBarLeft
+		- widgetWidth;
+	_elisionWidth = availableWidth;
+}
+
 void BackButton::paintEvent(QPaintEvent *e) {
-	Painter p(this);
+	updateCache();
+
+	auto p = QPainter(this);
 
 	p.fillRect(e->rect(), st::profileBg);
-	st::topBarBack.paint(p, (st::topBarArrowPadding.left() - st::topBarBack.width()) / 2, (st::topBarHeight - st::topBarBack.height()) / 2, width());
+	st::topBarBack.paint(
+		p,
+		st::historyAdminLogTopBarLeft,
+		(st::topBarHeight - st::topBarBack.height()) / 2,
+		width());
+	p.setOpacity(_opacity);
+
+	const auto textHeight = st::semiboldFont->height;
+	const auto subtextHeight = st::dialogsTextFont->height;
+	const auto totalHeight = _subtext.isEmpty()
+		? textHeight
+		: textHeight + subtextHeight;
+	const auto startY = (height() - totalHeight) / 2 - st::lineWidth;
+	const auto widgetWidth = _widget
+		? _widget->width() + st::historyAdminLogTopBarUserpicSkip
+		: 0;
+	const auto textX = st::historyAdminLogTopBarLeft + widgetWidth;
 
-	p.setFont(st::topBarButton.style.font);
-	p.setPen(st::topBarButton.textFg);
-	p.drawTextLeft(st::topBarArrowPadding.left(), st::topBarButton.padding.top() + st::topBarButton.textTop, width(), _text);
+	const auto context = Ui::Text::PaintContext{
+		.position = QPoint{ textX, startY },
+		.outerWidth = width(),
+		.availableWidth = _elisionWidth,
+		.elisionLines = 1,
+	};
+	p.setPen(st::dialogsNameFg);
+	_text.draw(p, context);
+
+	if (!_subtext.isEmpty()) {
+		const auto subtextContext = Ui::Text::PaintContext{
+			.position = { textX, startY + textHeight + st::lineWidth * 2 },
+			.outerWidth = width(),
+			.availableWidth = _elisionWidth,
+			.elisionLines = 1,
+		};
+		p.setPen(st::historyStatusFg);
+		_subtext.draw(p, subtextContext);
+	}
 }
 
 void BackButton::onStateChanged(State was, StateChangeSource source) {
diff --git a/Telegram/SourceFiles/profile/profile_back_button.h b/Telegram/SourceFiles/profile/profile_back_button.h
index 4c3ca7ceabc35e..b55163294df9d1 100644
--- a/Telegram/SourceFiles/profile/profile_back_button.h
+++ b/Telegram/SourceFiles/profile/profile_back_button.h
@@ -8,22 +8,20 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "ui/abstract_button.h"
+#include "ui/text/text.h"
 
-namespace Main {
-class Session;
-} // namespace Main
+class QGraphicsOpacityEffect;
 
 namespace Profile {
 
 class BackButton final : public Ui::AbstractButton {
 public:
-	BackButton(
-		QWidget *parent,
-		not_null<Main::Session*> session,
-		const QString &text,
-		rpl::producer<bool> oneColumnValue);
+	BackButton(QWidget *parent);
 
 	void setText(const QString &text);
+	void setSubtext(const QString &subtext);
+	void setWidget(not_null<Ui::RpWidget*> widget);
+	void setOpacity(float64 opacity);
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
@@ -32,10 +30,18 @@ class BackButton final : public Ui::AbstractButton {
 	void onStateChanged(State was, StateChangeSource source) override;
 
 private:
-	const not_null<Main::Session*> _session;
+	void updateCache();
 
 	rpl::lifetime _unreadBadgeLifetime;
-	QString _text;
+	Ui::Text::String _text;
+	Ui::Text::String _subtext;
+	Ui::RpWidget *_widget = nullptr;
+
+	int _cachedWidth = -1;
+	int _elisionWidth = 0;
+
+	float64 _opacity = 1.0;
+	QGraphicsOpacityEffect *_opacityEffect = nullptr;
 
 };
 
diff --git a/Telegram/SourceFiles/profile/profile_block_group_members.cpp b/Telegram/SourceFiles/profile/profile_block_group_members.cpp
deleted file mode 100644
index e155a19f9845ee..00000000000000
--- a/Telegram/SourceFiles/profile/profile_block_group_members.cpp
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "profile/profile_block_group_members.h"
-
-#include "api/api_chat_participants.h"
-#include "styles/style_profile.h"
-#include "ui/widgets/labels.h"
-#include "ui/boxes/confirm_box.h"
-#include "boxes/peers/edit_participant_box.h"
-#include "boxes/peers/edit_participants_box.h"
-#include "base/unixtime.h"
-#include "ui/widgets/popup_menu.h"
-#include "mtproto/mtproto_config.h"
-#include "data/data_peer_values.h"
-#include "data/data_channel.h"
-#include "data/data_chat.h"
-#include "data/data_user.h"
-#include "data/data_changes.h"
-#include "mainwidget.h"
-#include "apiwrap.h"
-#include "main/main_session.h"
-#include "lang/lang_keys.h"
-#include "window/window_session_controller.h"
-
-namespace Profile {
-namespace {
-
-using UpdateFlag = Data::PeerUpdate::Flag;
-
-} // namespace
-
-GroupMembersWidget::Member::Member(not_null<UserData*> user) : Item(user) {
-}
-
-not_null<UserData*> GroupMembersWidget::Member::user() const {
-	return static_cast<UserData*>(peer.get());
-}
-
-GroupMembersWidget::GroupMembersWidget(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller,
-	not_null<PeerData*> peer,
-	const style::PeerListItem &st)
-: PeerListWidget(parent, peer, QString(), st, tr::lng_profile_kick(tr::now))
-, _controller(controller)
-, _updateOnlineTimer([=] { updateOnlineDisplay(); }) {
-	peer->session().changes().peerUpdates(
-		UpdateFlag::Admins
-		| UpdateFlag::Members
-		| UpdateFlag::OnlineStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}, lifetime());
-
-	setRemovedCallback([=](PeerData *selectedPeer) {
-		removePeer(selectedPeer);
-	});
-	setSelectedCallback([=](PeerData *selectedPeer) {
-		controller->showPeerInfo(selectedPeer);
-	});
-	setUpdateItemCallback([=](Item *item) {
-		updateItemStatusText(item);
-	});
-	setPreloadMoreCallback([=] {
-		preloadMore();
-	});
-
-	refreshMembers();
-}
-
-void GroupMembersWidget::removePeer(PeerData *selectedPeer) {
-	const auto user = selectedPeer->asUser();
-	Assert(user != nullptr);
-
-	const auto text = tr::lng_profile_sure_kick(
-		tr::now,
-		lt_user, user->firstName);
-	const auto currentRestrictedRights = [&]() -> ChatRestrictionsInfo {
-		if (auto channel = peer()->asMegagroup()) {
-			auto it = channel->mgInfo->lastRestricted.find(user);
-			if (it != channel->mgInfo->lastRestricted.cend()) {
-				return it->second.rights;
-			}
-		}
-		return ChatRestrictionsInfo();
-	}();
-
-	const auto peer = this->peer();
-	const auto callback = [=, controller = _controller] {
-		controller->hideLayer();
-		if (const auto chat = peer->asChat()) {
-			chat->session().api().chatParticipants().kick(chat, user);
-			controller->showPeerHistory(
-				chat->id,
-				Window::SectionShow::Way::ClearStack,
-				ShowAtTheEndMsgId);
-		} else if (const auto channel = peer->asChannel()) {
-			channel->session().api().chatParticipants().kick(
-				channel,
-				user,
-				currentRestrictedRights);
-		}
-	};
-	_controller->show(Ui::MakeConfirmBox({
-		.text = text,
-		.confirmed = crl::guard(&peer->session(), callback),
-		.confirmText = tr::lng_box_remove(),
-	}));
-}
-
-void GroupMembersWidget::notifyPeerUpdated(const Data::PeerUpdate &update) {
-	if (update.peer != peer()) {
-		if (update.flags & UpdateFlag::OnlineStatus) {
-			if (auto user = update.peer->asUser()) {
-				refreshUserOnline(user);
-			}
-		}
-		return;
-	}
-
-	if (update.flags & UpdateFlag::Members) {
-		refreshMembers();
-		contentSizeUpdated();
-	}
-	if (update.flags & UpdateFlag::Admins) {
-		if (const auto chat = peer()->asChat()) {
-			for (const auto item : items()) {
-				setItemFlags(getMember(item), chat);
-			}
-		} else if (const auto megagroup = peer()->asMegagroup()) {
-			for (const auto item : items()) {
-				setItemFlags(getMember(item), megagroup);
-			}
-		}
-	}
-	this->update();
-}
-
-void GroupMembersWidget::refreshUserOnline(UserData *user) {
-	auto it = _membersByUser.find(user);
-	if (it == _membersByUser.cend()) return;
-
-	_now = base::unixtime::now();
-
-	auto member = getMember(it->second);
-	member->lastseen = user->lastseen();
-	member->statusHasOnlineColor = Data::OnlineTextActive(user, _now);
-	member->onlineForSort = user->isSelf()
-		? std::numeric_limits<TimeId>::max()
-		: Data::SortByOnlineValue(user, _now);
-	member->statusText = QString();
-
-	sortMembers();
-	update();
-}
-
-void GroupMembersWidget::preloadMore() {
-	//
-	// This can cause a ddos, because lastParticipants may never reach members count.
-	//
-	//if (auto megagroup = peer()->asMegagroup()) {
-	//	auto &megagroupInfo = megagroup->mgInfo;
-	//	if (!megagroupInfo->lastParticipants.isEmpty() && megagroupInfo->lastParticipants.size() < megagroup->membersCount()) {
-	//		peer()->session().api().requestLast(megagroup, false);
-	//	}
-	//}
-}
-
-void GroupMembersWidget::updateItemStatusText(Item *item) {
-	auto member = getMember(item);
-	auto user = member->user();
-	if (member->statusText.isEmpty() || (member->onlineTextTill <= _now)) {
-		if (user->isBot()) {
-			const auto seesAllMessages = user->botInfo->readsAllHistory
-				|| member->rank.has_value();
-			member->statusText = seesAllMessages
-				? tr::lng_status_bot_reads_all(tr::now)
-				: tr::lng_status_bot_not_reads_all(tr::now);
-			member->onlineTextTill = _now + 86400;
-		} else {
-			member->statusHasOnlineColor = member->lastseen.isOnline(_now);
-			member->statusText = Data::OnlineText(member->lastseen, _now);
-			const auto changeInMs = Data::OnlineChangeTimeout(
-				member->lastseen,
-				_now);
-			member->onlineTextTill = _now + TimeId(changeInMs / 1000);
-		}
-	}
-	if (_updateOnlineAt <= _now || _updateOnlineAt > member->onlineTextTill) {
-		_updateOnlineAt = member->onlineTextTill;
-		_updateOnlineTimer.callOnce((_updateOnlineAt - _now + 1) * 1000);
-	}
-}
-
-void GroupMembersWidget::refreshMembers() {
-	_now = base::unixtime::now();
-	if (const auto chat = peer()->asChat()) {
-		checkSelfAdmin(chat);
-		if (chat->noParticipantInfo()) {
-			chat->session().api().requestFullPeer(chat);
-		}
-		fillChatMembers(chat);
-	} else if (const auto megagroup = peer()->asMegagroup()) {
-		if (megagroup->lastParticipantsRequestNeeded()) {
-			megagroup->session().api().chatParticipants().requestLast(
-				megagroup);
-		}
-		fillMegagroupMembers(megagroup);
-	}
-	sortMembers();
-
-	refreshVisibility();
-}
-
-void GroupMembersWidget::checkSelfAdmin(not_null<ChatData*> chat) {
-	if (chat->participants.empty()) {
-		return;
-	}
-
-	//const auto self = chat->session().user();
-	//if (chat->amAdmin() && !chat->admins.contains(self)) {
-	//	chat->admins.insert(self);
-	//} else if (!chat->amAdmin() && chat->admins.contains(self)) {
-	//	chat->admins.remove(self);
-	//}
-}
-
-void GroupMembersWidget::sortMembers() {
-	if (!_sortByOnline || !itemsCount()) return;
-
-	sortItems([this](Item *a, Item *b) {
-		return getMember(a)->onlineForSort > getMember(b)->onlineForSort;
-	});
-
-	updateOnlineCount();
-}
-
-void GroupMembersWidget::updateOnlineCount() {
-	bool onlyMe = true;
-	int newOnlineCount = 0;
-	for (const auto item : items()) {
-		auto member = getMember(item);
-		auto user = member->user();
-		auto isOnline = !user->isBot()
-			&& member->lastseen.isOnline(_now);
-		if (member->statusHasOnlineColor != isOnline) {
-			member->statusHasOnlineColor = isOnline;
-			member->statusText = QString();
-		}
-		if (member->statusHasOnlineColor) {
-			++newOnlineCount;
-			if (!user->isSelf()) {
-				onlyMe = false;
-			}
-		}
-	}
-	if (newOnlineCount == 1 && onlyMe) {
-		newOnlineCount = 0;
-	}
-	if (_onlineCount != newOnlineCount) {
-		_onlineCount = newOnlineCount;
-	}
-}
-
-auto GroupMembersWidget::addUser(
-	not_null<ChatData*> chat,
-	not_null<UserData*> user)
--> not_null<Member*> {
-	const auto member = computeMember(user);
-	setItemFlags(member, chat);
-	addItem(member);
-	return member;
-}
-
-void GroupMembersWidget::fillChatMembers(not_null<ChatData*> chat) {
-	if (chat->participants.empty()) {
-		return;
-	}
-
-	clearItems();
-	if (!chat->amIn()) {
-		return;
-	}
-
-	_sortByOnline = true;
-
-	reserveItemsForSize(chat->participants.size());
-	addUser(chat, chat->session().user())->onlineForSort
-		= std::numeric_limits<TimeId>::max();
-	for (const auto &user : chat->participants) {
-		if (!user->isSelf()) {
-			addUser(chat, user);
-		}
-	}
-}
-
-void GroupMembersWidget::setItemFlags(
-		not_null<Item*> item,
-		not_null<ChatData*> chat) {
-	const auto user = getMember(item)->user();
-	const auto isCreator = (peerFromUser(chat->creator) == item->peer->id);
-	const auto isAdmin = (item->peer->isSelf() && chat->hasAdminRights())
-		|| chat->admins.contains(user);
-	const auto rank = isCreator
-		? tr::lng_owner_badge(tr::now)
-		: isAdmin
-		? tr::lng_admin_badge(tr::now)
-		: std::optional<QString>();
-	item->rank = rank;
-	item->rankWidth = rank ? st::normalFont->width(*rank) : 0;
-	if (item->peer->id == chat->session().userPeerId()) {
-		item->hasRemoveLink = false;
-	} else if (chat->amCreator()
-		|| ((chat->adminRights() & ChatAdminRight::BanUsers)
-			&& !rank.has_value())) {
-		item->hasRemoveLink = true;
-	} else if (chat->invitedByMe.contains(user) && !rank.has_value()) {
-		item->hasRemoveLink = true;
-	} else {
-		item->hasRemoveLink = false;
-	}
-}
-
-auto GroupMembersWidget::addUser(
-	not_null<ChannelData*> megagroup,
-	not_null<UserData*> user)
--> not_null<Member*> {
-	const auto member = computeMember(user);
-	setItemFlags(member, megagroup);
-	addItem(member);
-	return member;
-}
-
-void GroupMembersWidget::fillMegagroupMembers(
-		not_null<ChannelData*> megagroup) {
-	Expects(megagroup->mgInfo != nullptr);
-
-	if (megagroup->mgInfo->lastParticipants.empty()) {
-		return;
-	} else if (!megagroup->canViewMembers()) {
-		clearItems();
-		return;
-	}
-
-	_sortByOnline = (megagroup->membersCount() > 0)
-		&& (megagroup->membersCount()
-			<= megagroup->session().serverConfig().chatSizeMax);
-
-	auto &membersList = megagroup->mgInfo->lastParticipants;
-	if (_sortByOnline) {
-		clearItems();
-		reserveItemsForSize(membersList.size());
-		if (megagroup->amIn()) {
-			addUser(megagroup, megagroup->session().user())->onlineForSort
-				= std::numeric_limits<TimeId>::max();
-		}
-	} else if (membersList.size() >= itemsCount()) {
-		if (addUsersToEnd(megagroup)) {
-			return;
-		}
-	}
-	if (!_sortByOnline) {
-		clearItems();
-		reserveItemsForSize(membersList.size());
-	}
-	for (const auto user : membersList) {
-		if (!_sortByOnline || !user->isSelf()) {
-			addUser(megagroup, user);
-		}
-	}
-}
-
-bool GroupMembersWidget::addUsersToEnd(not_null<ChannelData*> megagroup) {
-	auto &membersList = megagroup->mgInfo->lastParticipants;
-	auto &itemsList = items();
-	for (int i = 0, count = itemsList.size(); i < count; ++i) {
-		if (itemsList[i]->peer != membersList.at(i)) {
-			return false;
-		}
-	}
-	reserveItemsForSize(membersList.size());
-	for (int i = itemsCount(), count = membersList.size(); i < count; ++i) {
-		addUser(megagroup, membersList.at(i));
-	}
-	return true;
-}
-
-void GroupMembersWidget::setItemFlags(
-		not_null<Item*> item,
-		not_null<ChannelData*> megagroup) {
-	const auto amCreator = item->peer->isSelf() && megagroup->amCreator();
-	const auto amAdmin = item->peer->isSelf() && megagroup->hasAdminRights();
-	const auto user = getMember(item)->user();
-	const auto adminIt = megagroup->mgInfo->lastAdmins.find(user);
-	const auto isAdmin = (adminIt != megagroup->mgInfo->lastAdmins.cend());
-	const auto isCreator = (megagroup->mgInfo->creator == item->peer);
-	const auto rankIt = megagroup->mgInfo->admins.find(peerToUser(user->id));
-	const auto adminCanEdit = isAdmin && adminIt->second.canEdit;
-	const auto rank = (amCreator || isCreator)
-		? (!megagroup->mgInfo->creatorRank.isEmpty()
-			? megagroup->mgInfo->creatorRank
-			: tr::lng_owner_badge(tr::now))
-		: (amAdmin || isAdmin)
-		? ((rankIt != megagroup->mgInfo->admins.end()
-			&& !rankIt->second.isEmpty())
-			? rankIt->second
-			: tr::lng_admin_badge(tr::now))
-		: std::optional<QString>();
-	if (item->rank != rank) {
-		item->rank = rank;
-		item->rankWidth = rank ? st::normalFont->width(*rank) : 0;
-		auto user = item->peer->asUser();
-		Assert(user != nullptr);
-		if (user->isBot()) {
-			// Update "has access to messages" status.
-			item->statusText = QString();
-			updateItemStatusText(item);
-		}
-	}
-	if (item->peer->isSelf()) {
-		item->hasRemoveLink = false;
-	} else if (megagroup->amCreator()
-		|| (megagroup->canBanMembers()
-			&& (!rank.has_value() || adminCanEdit))) {
-		item->hasRemoveLink = true;
-	} else {
-		item->hasRemoveLink = false;
-	}
-}
-
-auto GroupMembersWidget::computeMember(not_null<UserData*> user)
--> not_null<Member*> {
-	auto it = _membersByUser.find(user);
-	if (it == _membersByUser.cend()) {
-		auto member = new Member(user);
-		it = _membersByUser.emplace(user, member).first;
-		member->lastseen = user->lastseen();
-		member->statusHasOnlineColor = !user->isBot()
-			&& member->lastseen.isOnline(_now);
-		member->onlineForSort = Data::SortByOnlineValue(user, _now);
-	}
-	return it->second;
-}
-
-void GroupMembersWidget::updateOnlineDisplay() {
-	if (_sortByOnline) {
-		_now = base::unixtime::now();
-
-		bool changed = false;
-		for (const auto item : items()) {
-			if (!item->statusHasOnlineColor) {
-				if (!item->peer->isSelf()) {
-					continue;
-				} else {
-					break;
-				}
-			}
-			auto member = getMember(item);
-			bool isOnline = !member->user()->isBot()
-				&& member->lastseen.isOnline(_now);
-			if (!isOnline) {
-				changed = true;
-			}
-		}
-		if (changed) {
-			updateOnlineCount();
-		}
-	}
-	update();
-}
-
-GroupMembersWidget::~GroupMembersWidget() {
-	auto members = base::take(_membersByUser);
-	for (const auto &[_, member] : members) {
-		delete member;
-	}
-}
-
-} // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_group_members.h b/Telegram/SourceFiles/profile/profile_block_group_members.h
deleted file mode 100644
index 89ae411594b830..00000000000000
--- a/Telegram/SourceFiles/profile/profile_block_group_members.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include "base/timer.h"
-#include "data/data_lastseen_status.h"
-#include "profile/profile_block_peer_list.h"
-
-namespace Ui {
-class FlatLabel;
-} // namespace Ui
-
-namespace Data {
-struct PeerUpdate;
-} // namespace Data
-
-namespace Window {
-class SessionController;
-} // namespace Window
-
-namespace Profile {
-
-class GroupMembersWidget : public PeerListWidget {
-
-public:
-	GroupMembersWidget(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		not_null<PeerData*> peer,
-		const style::PeerListItem &st);
-
-	int onlineCount() const {
-		return _onlineCount;
-	}
-
-	~GroupMembersWidget();
-
-private:
-	void updateOnlineDisplay();
-
-	// Observed notifications.
-	void notifyPeerUpdated(const Data::PeerUpdate &update);
-
-	void removePeer(PeerData *selectedPeer);
-	void refreshMembers();
-	void fillChatMembers(not_null<ChatData*> chat);
-	void fillMegagroupMembers(not_null<ChannelData*> megagroup);
-	void sortMembers();
-	void updateOnlineCount();
-	void checkSelfAdmin(not_null<ChatData*> chat);
-	void preloadMore();
-
-	void refreshUserOnline(UserData *user);
-
-	struct Member : public Item {
-		explicit Member(not_null<UserData*> user);
-		not_null<UserData*> user() const;
-
-		TimeId onlineTextTill = 0;
-		Data::LastseenStatus lastseen;
-		TimeId onlineForSort = 0;
-	};
-	Member *getMember(Item *item) {
-		return static_cast<Member*>(item);
-	}
-
-	void updateItemStatusText(Item *item);
-	not_null<Member*> computeMember(not_null<UserData*> user);
-	not_null<Member*> addUser(not_null<ChatData*> chat, not_null<UserData*> user);
-	not_null<Member*> addUser(not_null<ChannelData*> megagroup, not_null<UserData*> user);
-	void setItemFlags(not_null<Item*> item, not_null<ChatData*> chat);
-	void setItemFlags(
-		not_null<Item*> item,
-		not_null<ChannelData*> megagroup);
-	bool addUsersToEnd(not_null<ChannelData*> megagroup);
-
-	const not_null<Window::SessionController*> _controller;
-
-	base::flat_map<UserData*, Member*> _membersByUser;
-	bool _sortByOnline = false;
-	TimeId _now = 0;
-
-	int _onlineCount = 0;
-	TimeId _updateOnlineAt = 0;
-	base::Timer _updateOnlineTimer;
-
-};
-
-} // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_peer_list.cpp b/Telegram/SourceFiles/profile/profile_block_peer_list.cpp
deleted file mode 100644
index 130692e47487b7..00000000000000
--- a/Telegram/SourceFiles/profile/profile_block_peer_list.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "profile/profile_block_peer_list.h"
-
-#include "ui/effects/ripple_animation.h"
-#include "ui/text/text_options.h"
-#include "ui/painter.h"
-#include "data/data_peer.h"
-#include "data/data_cloud_file.h"
-#include "main/main_session.h"
-#include "styles/style_profile.h"
-#include "styles/style_widgets.h"
-
-namespace Profile {
-
-PeerListWidget::Item::Item(not_null<PeerData*> peer) : peer(peer) {
-}
-
-PeerListWidget::Item::~Item() = default;
-
-PeerListWidget::PeerListWidget(
-	QWidget *parent,
-	PeerData *peer,
-	const QString &title,
-	const style::PeerListItem &st,
-	const QString &removeText)
-: BlockWidget(parent, peer, title)
-, _st(st)
-, _removeText(removeText)
-, _removeWidth(st::normalFont->width(_removeText)) {
-	setMouseTracking(true);
-
-	peer->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
-		update();
-	}, lifetime());
-}
-
-int PeerListWidget::resizeGetHeight(int newWidth) {
-	auto newHeight = getListTop();
-
-	newHeight += _items.size() * _st.height;
-
-	return newHeight + _st.bottom;
-}
-
-void PeerListWidget::visibleTopBottomUpdated(int visibleTop, int visibleBottom) {
-	_visibleTop = visibleTop;
-	_visibleBottom = visibleBottom;
-
-	if (_preloadMoreCallback) {
-		if (_visibleTop + PreloadHeightsCount * (_visibleBottom - _visibleTop) > height()) {
-			_preloadMoreCallback();
-		}
-	}
-}
-
-void PeerListWidget::paintContents(Painter &p) {
-	auto left = getListLeft();
-	auto top = getListTop();
-
-	const auto count = int(_items.size());
-	auto from = floorclamp(_visibleTop - top, _st.height, 0, count);
-	auto to = ceilclamp(_visibleBottom - top, _st.height, 0, count);
-	for (auto i = from; i < to; ++i) {
-		auto y = top + i * _st.height;
-		auto selected = (_pressed >= 0) ? (i == _pressed) : (i == _selected);
-		auto selectedRemove = selected && _selectedRemove;
-		if (_pressed >= 0 && !_pressedRemove) {
-			selectedRemove = false;
-		}
-		paintItem(p, left, y, _items[i], selected, selectedRemove);
-	}
-}
-
-void PeerListWidget::paintItem(Painter &p, int x, int y, Item *item, bool selected, bool selectedKick) {
-	if (_updateItemCallback) {
-		_updateItemCallback(item);
-	}
-
-	auto memberRowWidth = rowWidth();
-	if (selected) {
-		paintItemRect(p, x, y, memberRowWidth, _st.height);
-	}
-	if (auto &ripple = item->ripple) {
-		ripple->paint(p, x, y, width());
-		if (ripple->empty()) {
-			ripple.reset();
-		}
-	}
-	int skip = _st.photoPosition.x();
-
-	item->peer->paintUserpicLeft(p, item->userpic, x + _st.photoPosition.x(), y + _st.photoPosition.y(), width(), _st.photoSize);
-
-	if (item->name.isEmpty()) {
-		item->name.setText(
-			st::semiboldTextStyle,
-			item->peer->name(),
-			Ui::NameTextOptions());
-	}
-	int nameLeft = x + _st.namePosition.x();
-	int nameTop = y + _st.namePosition.y();
-	int nameWidth = memberRowWidth - _st.namePosition.x() - skip;
-	if (item->hasRemoveLink && selected) {
-		p.setFont(selectedKick ? st::normalFont->underline() : st::normalFont);
-		p.setPen(st::windowActiveTextFg);
-		p.drawTextLeft(nameLeft + nameWidth - _removeWidth, nameTop, width(), _removeText, _removeWidth);
-		nameWidth -= _removeWidth + skip;
-	} else if (item->rank) {
-		p.setFont(st::normalFont);
-		p.setPen(st::windowActiveTextFg);
-		p.drawTextLeft(nameLeft + nameWidth - item->rankWidth, nameTop, width(), *item->rank, item->rankWidth);
-		nameWidth -= item->rankWidth + skip;
-	}
-	p.setPen(st::profileMemberNameFg);
-	item->name.drawLeftElided(p, nameLeft, nameTop, nameWidth, width());
-
-	if (item->statusHasOnlineColor) {
-		p.setPen(_st.statusFgActive);
-	} else {
-		p.setPen(selected ? _st.statusFgOver : _st.statusFg);
-	}
-	p.setFont(st::normalFont);
-	p.drawTextLeft(x + _st.statusPosition.x(), y + _st.statusPosition.y(), width(), item->statusText);
-}
-
-void PeerListWidget::paintItemRect(Painter &p, int x, int y, int w, int h) const {
-	p.fillRect(style::rtlrect(x, y, w, h, width()), _st.button.textBgOver);
-}
-
-void PeerListWidget::mouseMoveEvent(QMouseEvent *e) {
-	_mousePosition = e->globalPos();
-	updateSelection();
-}
-
-void PeerListWidget::mousePressEvent(QMouseEvent *e) {
-	_mousePosition = e->globalPos();
-	updateSelection();
-
-	_pressButton = e->button();
-	_pressed = _selected;
-	_pressedRemove = _selectedRemove;
-	if (_pressed >= 0 && !_pressedRemove) {
-		const auto item = _items[_pressed];
-		if (!item->ripple) {
-			auto memberRowWidth = rowWidth();
-			auto mask = Ui::RippleAnimation::RectMask(QSize(memberRowWidth, _st.height));
-			item->ripple = std::make_unique<Ui::RippleAnimation>(_st.button.ripple, std::move(mask), [this, index = _pressed] {
-				repaintRow(index);
-			});
-		}
-		auto left = getListLeft();
-		auto top = getListTop() + _st.height * _pressed;
-		item->ripple->add(e->pos() - QPoint(left, top));
-	}
-}
-
-void PeerListWidget::mouseReleaseEvent(QMouseEvent *e) {
-	mousePressReleased(e->button());
-}
-
-void PeerListWidget::mousePressReleased(Qt::MouseButton button) {
-	repaintRow(_pressed);
-	auto pressed = std::exchange(_pressed, -1);
-	auto pressedRemove = base::take(_pressedRemove);
-	if (pressed >= 0 && pressed < _items.size()) {
-		if (const auto &ripple = _items[pressed]->ripple) {
-			ripple->lastStop();
-		}
-		if (pressed == _selected && pressedRemove == _selectedRemove && button == Qt::LeftButton) {
-			InvokeQueued(this, [this, pressedRemove, peer = _items[pressed]->peer] {
-				if (auto &callback = (pressedRemove ? _removedCallback : _selectedCallback)) {
-					callback(peer);
-				}
-			});
-		}
-	}
-	setCursor(_selectedRemove ? style::cur_pointer : style::cur_default);
-	repaintSelectedRow();
-}
-
-void PeerListWidget::enterEventHook(QEnterEvent *e) {
-	_mousePosition = QCursor::pos();
-	updateSelection();
-}
-
-void PeerListWidget::leaveEventHook(QEvent *e) {
-	_mousePosition = QPoint(-1, -1);
-	updateSelection();
-}
-
-void PeerListWidget::updateSelection() {
-	auto selected = -1;
-	auto selectedKick = false;
-
-	auto mouse = mapFromGlobal(_mousePosition);
-	if (rtl()) mouse.setX(width() - mouse.x());
-	auto left = getListLeft();
-	auto top = getListTop();
-	auto memberRowWidth = rowWidth();
-	if (mouse.x() >= left && mouse.x() < left + memberRowWidth && mouse.y() >= top) {
-		selected = (mouse.y() - top) / _st.height;
-		if (selected >= _items.size()) {
-			selected = -1;
-		} else if (_items[selected]->hasRemoveLink) {
-			int skip = _st.photoPosition.x();
-			int nameLeft = left + _st.namePosition.x();
-			int nameTop = top + _selected * _st.height + _st.namePosition.y();
-			int nameWidth = memberRowWidth - _st.namePosition.x() - skip;
-			if (mouse.x() >= nameLeft + nameWidth - _removeWidth && mouse.x() < nameLeft + nameWidth) {
-				if (mouse.y() >= nameTop && mouse.y() < nameTop + st::normalFont->height) {
-					selectedKick = true;
-				}
-			}
-		}
-	}
-
-	setSelected(selected, selectedKick);
-}
-
-void PeerListWidget::setSelected(int selected, bool selectedRemove) {
-	if (_selected == selected && _selectedRemove == selectedRemove) {
-		return;
-	}
-
-	repaintSelectedRow();
-	if (_selectedRemove != selectedRemove) {
-		_selectedRemove = selectedRemove;
-		if (_pressed < 0) {
-			setCursor(_selectedRemove ? style::cur_pointer : style::cur_default);
-		}
-	}
-	if (_selected != selected) {
-		_selected = selected;
-		repaintSelectedRow();
-	}
-}
-
-void PeerListWidget::repaintSelectedRow() {
-	repaintRow(_selected);
-}
-
-void PeerListWidget::repaintRow(int index) {
-	if (index >= 0) {
-		auto left = getListLeft();
-		rtlupdate(left, getListTop() + index * _st.height, width() - left, _st.height);
-	}
-}
-
-int PeerListWidget::getListLeft() const {
-	return _st.left;
-}
-
-int PeerListWidget::rowWidth() const {
-	return _st.maximalWidth
-		? qMin(width() - getListLeft(), _st.maximalWidth)
-		: width() - getListLeft();
-}
-
-void PeerListWidget::preloadPhotos() {
-	int top = getListTop();
-	int preloadFor = (_visibleBottom - _visibleTop) * PreloadHeightsCount;
-	int from = floorclamp(_visibleTop - top, _st.height, 0, _items.size());
-	int to = ceilclamp(_visibleBottom + preloadFor - top, _st.height, 0, _items.size());
-	for (int i = from; i < to; ++i) {
-		_items[i]->peer->loadUserpic();
-	}
-}
-
-void PeerListWidget::refreshVisibility() {
-	setVisible(!_items.empty());
-}
-
-} // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_peer_list.h b/Telegram/SourceFiles/profile/profile_block_peer_list.h
deleted file mode 100644
index 94e6544964728b..00000000000000
--- a/Telegram/SourceFiles/profile/profile_block_peer_list.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include "profile/profile_block_widget.h"
-#include "ui/userpic_view.h"
-
-namespace Ui {
-class RippleAnimation;
-class PopupMenu;
-} // namespace Ui
-
-namespace style {
-struct PeerListItem;
-} // namespace style
-
-namespace Profile {
-
-class PeerListWidget : public BlockWidget {
-public:
-	PeerListWidget(QWidget *parent, PeerData *peer, const QString &title, const style::PeerListItem &st, const QString &removeText);
-
-	struct Item {
-		explicit Item(not_null<PeerData*> peer);
-		~Item();
-
-		const not_null<PeerData*> peer;
-		Ui::PeerUserpicView userpic;
-		Ui::Text::String name;
-		QString statusText;
-		bool statusHasOnlineColor = false;
-		std::optional<QString> rank;
-		int rankWidth = 0;
-		bool hasRemoveLink = false;
-		std::unique_ptr<Ui::RippleAnimation> ripple;
-	};
-	int getListTop() const {
-		return contentTop();
-	}
-
-	int getListLeft() const;
-
-	const std::vector<Item*> &items() const {
-		return _items;
-	}
-	int itemsCount() const {
-		return _items.size();
-	}
-
-	// Does not take ownership of item.
-	void addItem(Item *item) {
-		if (!item) return;
-		_items.push_back(item);
-	}
-	void clearItems() {
-		_items.clear();
-	}
-	void reserveItemsForSize(int size) {
-		_items.reserve(size);
-	}
-	template <typename Predicate>
-	void sortItems(Predicate predicate) {
-		std::sort(_items.begin(), _items.end(), std::move(predicate));
-	}
-
-	void setPreloadMoreCallback(Fn<void()> callback) {
-		_preloadMoreCallback = std::move(callback);
-	}
-	void setSelectedCallback(Fn<void(PeerData*)> callback) {
-		_selectedCallback = std::move(callback);
-	}
-	void setRemovedCallback(Fn<void(PeerData*)> callback) {
-		_removedCallback = std::move(callback);
-	}
-	void setUpdateItemCallback(Fn<void(Item*)> callback) {
-		_updateItemCallback = std::move(callback);
-	}
-
-protected:
-	int resizeGetHeight(int newWidth) override;
-	void visibleTopBottomUpdated(
-		int visibleTop,
-		int visibleBottom) override;
-
-	void paintItemRect(Painter &p, int x, int y, int w, int h) const;
-	void refreshVisibility();
-
-	void paintContents(Painter &p) override;
-
-	void mouseMoveEvent(QMouseEvent *e) override;
-	void mousePressEvent(QMouseEvent *e) override;
-	void mouseReleaseEvent(QMouseEvent *e) override;
-	void enterEventHook(QEnterEvent *e) override;
-	void enterFromChildEvent(QEvent *e, QWidget *child) override {
-		enterEventHook(nullptr);
-	}
-	void leaveEventHook(QEvent *e) override;
-	void leaveToChildEvent(QEvent *e, QWidget *child) override {
-		leaveEventHook(e);
-	}
-
-private:
-	void mousePressReleased(Qt::MouseButton button);
-	void updateSelection();
-	void setSelected(int selected, bool selectedRemove);
-	void repaintSelectedRow();
-	void repaintRow(int index);
-	void preloadPhotos();
-	int rowWidth() const;
-
-	void paintItem(Painter &p, int x, int y, Item *item, bool selected, bool selectedRemove);
-
-	const style::PeerListItem &_st;
-
-	Fn<void()> _preloadMoreCallback;
-	Fn<void(PeerData*)> _selectedCallback;
-	Fn<void(PeerData*)> _removedCallback;
-	Fn<void(Item*)> _updateItemCallback;
-
-	std::vector<Item*> _items;
-
-	int _visibleTop = 0;
-	int _visibleBottom = 0;
-
-	int _selected = -1;
-	int _pressed = -1;
-	Qt::MouseButton _pressButton = Qt::LeftButton;
-	bool _selectedRemove = false;
-	bool _pressedRemove = false;
-	QPoint _mousePosition;
-
-	QString _removeText;
-	int _removeWidth = 0;
-
-};
-
-} // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp b/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp
index 6b10b827a3ecb3..4f686130bf5e7b 100644
--- a/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp
+++ b/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp
@@ -12,7 +12,11 @@ For license and copyright information please follow this link:
 
 namespace Profile {
 
-CoverDropArea::CoverDropArea(QWidget *parent, const QString &title, const QString &subtitle) : TWidget(parent)
+CoverDropArea::CoverDropArea(
+	QWidget *parent,
+	const QString &title,
+	const QString &subtitle)
+: RpWidget(parent)
 , _title(title)
 , _subtitle(subtitle)
 , _titleWidth(st::profileDropAreaTitleFont->width(_title))
diff --git a/Telegram/SourceFiles/profile/profile_cover_drop_area.h b/Telegram/SourceFiles/profile/profile_cover_drop_area.h
index 156d53adea8506..ee5b45551884b3 100644
--- a/Telegram/SourceFiles/profile/profile_cover_drop_area.h
+++ b/Telegram/SourceFiles/profile/profile_cover_drop_area.h
@@ -12,7 +12,7 @@ For license and copyright information please follow this link:
 
 namespace Profile {
 
-class CoverDropArea : public TWidget {
+class CoverDropArea : public Ui::RpWidget {
 public:
 	CoverDropArea(QWidget *parent, const QString &title, const QString &subtitle);
 
diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp
index 4e2f6e878ea60b..a4e00d5710b421 100644
--- a/Telegram/SourceFiles/settings.cpp
+++ b/Telegram/SourceFiles/settings.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "settings.h"
 
+#include "core/version.h"
 #include "ui/emoji_config.h"
 
 Qt::LayoutDirection gLangDir = Qt::LeftToRight;
@@ -20,8 +21,7 @@ bool gManyInstance = false;
 QString gKeyFile;
 QString gWorkingDir;
 
-QStringList gSendPaths;
-QString gStartUrl;
+QList<QUrl> gStartUrls;
 
 QString gDialogLastPath, gDialogHelperPath; // optimize QFileDialog
 
@@ -50,8 +50,6 @@ RecentStickerPack gRecentStickers;
 
 RecentHashtagPack gRecentWriteHashtags, gRecentSearchHashtags;
 
-RecentInlineBots gRecentInlineBots;
-
 bool gPasswordRecovered = false;
 int32 gPasscodeBadTries = 0;
 crl::time gPasscodeLastTry = 0;
diff --git a/Telegram/SourceFiles/settings.h b/Telegram/SourceFiles/settings.h
index c0d6f1cbbb05cf..4a29e70d3ce238 100644
--- a/Telegram/SourceFiles/settings.h
+++ b/Telegram/SourceFiles/settings.h
@@ -99,17 +99,12 @@ typedef QList<QPair<QString, ushort>> RecentHashtagPack;
 DeclareRefSetting(RecentHashtagPack, RecentWriteHashtags);
 DeclareSetting(RecentHashtagPack, RecentSearchHashtags);
 
-class UserData;
-typedef QVector<UserData*> RecentInlineBots;
-DeclareRefSetting(RecentInlineBots, RecentInlineBots);
-
 DeclareSetting(bool, PasswordRecovered);
 
 DeclareSetting(int32, PasscodeBadTries);
 DeclareSetting(crl::time, PasscodeLastTry);
 
-DeclareSetting(QStringList, SendPaths);
-DeclareSetting(QString, StartUrl);
+DeclareRefSetting(QList<QUrl>, StartUrls);
 
 DeclareSetting(int, OtherOnline);
 
diff --git a/Telegram/SourceFiles/settings/business/settings_away_message.cpp b/Telegram/SourceFiles/settings/business/settings_away_message.cpp
index 58f3a61656338e..ea51876ac69e0e 100644
--- a/Telegram/SourceFiles/settings/business/settings_away_message.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_away_message.cpp
@@ -31,7 +31,7 @@ For license and copyright information please follow this link:
 namespace Settings {
 namespace {
 
-class AwayMessage final : public BusinessSection<AwayMessage> {
+class AwayMessage final : public Section<AwayMessage> {
 public:
 	AwayMessage(
 		QWidget *parent,
@@ -106,7 +106,7 @@ void AddAwayScheduleSelector(
 	const auto customInner = customWrap->entity();
 	customWrap->toggleOn(group->value() | rpl::map(_1 == Type::Custom));
 
-	group->changes() | rpl::start_with_next([=](Type value) {
+	group->changes() | rpl::on_next([=](Type value) {
 		auto copy = data->current();
 		copy.type = value;
 		*data = copy;
@@ -119,10 +119,10 @@ void AddAwayScheduleSelector(
 			Fn<TimeId()> max,
 			Fn<void(TimeId)> done) {
 		using namespace Ui;
-		const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
+		const auto box = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 		const auto save = [=](TimeId time) {
 			done(time);
-			if (const auto strong = box->data()) {
+			if (const auto strong = box->get()) {
 				strong->closeBox();
 			}
 		};
@@ -190,7 +190,7 @@ void AddAwayScheduleSelector(
 AwayMessage::AwayMessage(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: BusinessSection(parent, controller) {
+: Section(parent, controller) {
 	setupContent(controller);
 }
 
@@ -238,7 +238,7 @@ void AwayMessage::setupContent(
 		.lottieSize = st::settingsCloudPasswordIconSize,
 		.lottieMargins = st::peerAppearanceIconPadding,
 		.showFinished = showFinishes(),
-		.about = tr::lng_away_about(Ui::Text::WithEntities),
+		.about = tr::lng_away_about(tr::marked),
 		.aboutMargins = st::peerAppearanceCoverLabelMargin,
 	});
 
@@ -262,7 +262,7 @@ void AwayMessage::setupContent(
 	)));
 
 	_enabled = enabled->toggledValue();
-	_enabled.value() | rpl::filter(_1) | rpl::start_with_next([=] {
+	_enabled.value() | rpl::filter(_1) | rpl::on_next([=] {
 		if (!_canHave.current()) {
 			controller->showToast({
 				.text = { tr::lng_away_limit_reached(tr::now) },
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index 688a6940d26adf..76c02c8756f85b 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -119,7 +119,7 @@ class StickerPanel final {
 
 };
 
-class ChatIntro final : public BusinessSection<ChatIntro> {
+class ChatIntro final : public Section<ChatIntro> {
 public:
 	ChatIntro(
 		QWidget *parent,
@@ -175,7 +175,7 @@ rpl::producer<std::shared_ptr<StickerPlayer>> IconPlayerValue(
 	media->goodThumbnailWanted();
 
 	return rpl::single() | rpl::then(
-		sticker->owner().session().downloaderTaskFinished()
+		sticker->session().downloaderTaskFinished()
 	) | rpl::filter([=] {
 		return media->loaded();
 	}) | rpl::take(1) | rpl::map([=] {
@@ -231,20 +231,20 @@ rpl::producer<std::shared_ptr<StickerPlayer>> IconPlayerValue(
 	};
 	const auto state = right->lifetime().make_state<State>();
 	state->panel.someCustomChosen(
-	) | rpl::start_with_next([=](StickerPanel::CustomChosen chosen) {
+	) | rpl::on_next([=](StickerPanel::CustomChosen chosen) {
 		stickerChosen(chosen.sticker);
 	}, raw->lifetime());
 
 	std::move(
 		stickerValue
-	) | rpl::start_with_next([=](DocumentData *sticker) {
+	) | rpl::on_next([=](DocumentData *sticker) {
 		state->sticker = sticker;
 		if (sticker) {
 			right->resize(button.emojiWidth + button.added, right->height());
 			IconPlayerValue(
 				sticker,
 				[=] { right->update(); }
-			) | rpl::start_with_next([=](
+			) | rpl::on_next([=](
 					std::shared_ptr<StickerPlayer> player) {
 				state->player = std::move(player);
 				right->update();
@@ -260,14 +260,14 @@ rpl::producer<std::shared_ptr<StickerPlayer>> IconPlayerValue(
 	rpl::combine(
 		raw->sizeValue(),
 		right->widthValue()
-	) | rpl::start_with_next([=](QSize outer, int width) {
+	) | rpl::on_next([=](QSize outer, int width) {
 		right->resize(width, outer.height());
 		const auto skip = st::settingsButton.padding.right();
 		right->moveToRight(skip - button.added, 0, outer.width());
 	}, right->lifetime());
 
 	right->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(right);
 		const auto height = right->height();
 		if (state->player) {
@@ -303,9 +303,7 @@ rpl::producer<std::shared_ptr<StickerPlayer>> IconPlayerValue(
 	}, right->lifetime());
 
 	raw->setClickedCallback([=] {
-		const auto controller = show->resolveWindow(
-			ChatHelpers::WindowUsage::PremiumPromo);
-		if (controller) {
+		if (const auto controller = show->resolveWindow()) {
 			state->panel.show({
 				.controller = controller,
 				.button = right,
@@ -354,13 +352,13 @@ PreviewWrap::PreviewWrap(
 	_style->apply(_theme.get());
 
 	session->data().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const Element*> view) {
-		if (view == _view->view()) {
+	) | rpl::on_next([=](Data::RequestViewRepaint data) {
+		if (data.view == _view->view()) {
 			update();
 		}
 	}, lifetime());
 
-	session->downloaderTaskFinished() | rpl::start_with_next([=] {
+	session->downloaderTaskFinished() | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
@@ -376,7 +374,7 @@ void PreviewWrap::prepare(rpl::producer<Data::ChatIntro> value) {
 		_history.get(),
 		_delegate.get());
 
-	std::move(value) | rpl::start_with_next([=](Data::ChatIntro intro) {
+	std::move(value) | rpl::on_next([=](Data::ChatIntro intro) {
 		_view->make(std::move(intro), true);
 		if (width() >= st::msgMinWidth) {
 			resizeTo(width());
@@ -387,7 +385,7 @@ void PreviewWrap::prepare(rpl::producer<Data::ChatIntro> value) {
 	widthValue(
 	) | rpl::filter([=](int width) {
 		return width >= st::msgMinWidth;
-	}) | rpl::start_with_next([=](int width) {
+	}) | rpl::on_next([=](int width) {
 		resizeTo(width);
 	}, lifetime());
 }
@@ -418,6 +416,7 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 	auto context = _theme->preparePaintContext(
 		_style.get(),
 		rect(),
+		rect(),
 		e->rect(),
 		!window()->isActiveWindow());
 	p.translate(_position);
@@ -435,7 +434,7 @@ void StickerPanel::show(Descriptor &&descriptor) {
 		_panel->shownValue(
 		) | rpl::filter([=] {
 			return (_panelButton != nullptr);
-		}) | rpl::start_with_next([=](bool shown) {
+		}) | rpl::on_next([=](bool shown) {
 			if (shown) {
 				_panelButton->installEventFilter(_panel.get());
 			} else {
@@ -489,7 +488,7 @@ void StickerPanel::create(const Descriptor &descriptor) {
 	_panel->hide();
 
 	_panel->selector()->fileChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		_someCustomChosen.fire({ data.document });
 		_panel->hideAnimated();
 	}, _panel->lifetime());
@@ -498,7 +497,7 @@ void StickerPanel::create(const Descriptor &descriptor) {
 ChatIntro::ChatIntro(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: BusinessSection(parent, controller) {
+: Section(parent, controller) {
 	setupContent(controller);
 }
 
@@ -562,7 +561,7 @@ void ChatIntro::setupContent(
 			content,
 			session,
 			IntroWithRandomSticker(session, _intro.value())),
-		{});
+		style::margins());
 
 	const auto title = AddPartInput(
 		content,
@@ -587,13 +586,13 @@ void ChatIntro::setupContent(
 		}));
 	Ui::AddSkip(content);
 
-	title->changes() | rpl::start_with_next([=] {
+	title->changes() | rpl::on_next([=] {
 		change([&](Data::ChatIntro &intro) {
 			intro.title = title->getLastText();
 		});
 	}, title->lifetime());
 
-	description->changes() | rpl::start_with_next([=] {
+	description->changes() | rpl::on_next([=] {
 		change([&](Data::ChatIntro &intro) {
 			intro.description = description->getLastText();
 		});
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_links.cpp b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
index e0d35efca60ce6..7a53001f1afc1b 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp
@@ -31,6 +31,7 @@ For license and copyright information please follow this link:
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/emoji_button.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/popup_menu.h"
@@ -56,7 +57,7 @@ constexpr auto kChangesDebounceTimeout = crl::time(1000);
 
 using ChatLinkData = Api::ChatLink;
 
-class ChatLinks final : public BusinessSection<ChatLinks> {
+class ChatLinks final : public Section<ChatLinks> {
 public:
 	ChatLinks(
 		QWidget *parent,
@@ -164,10 +165,10 @@ Row::Row(not_null<RowDelegate*> delegate, const ChatLinkData &data)
 }
 
 void Row::updateStatus(const ChatLinkData &data) {
-	const auto context = Core::MarkedTextContext{
+	const auto context = Core::TextContext({
 		.session = _delegate->rowSession(),
-		.customEmojiRepaint = [=] { _delegate->rowUpdateRow(this); },
-	};
+		.repaint = [=] { _delegate->rowUpdateRow(this); },
+	});
 	_status.setMarkedText(
 		st::messageTextStyle,
 		data.message,
@@ -388,11 +389,11 @@ void EditChatLinkBox(
 	emojiPanel->hide();
 	emojiPanel->selector()->setCurrentPeer(peer);
 	emojiPanel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
 	}, field->lifetime());
 	emojiPanel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		Data::InsertCustomEmoji(field, data.document);
 	}, field->lifetime());
 
@@ -448,21 +449,21 @@ void EditChatLinkBox(
 	base::install_event_filter(emojiPanel, outer, filterCallback);
 
 	field->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		title->setFocus();
 	}, field->lifetime());
 	field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		box->closeBox();
 	}, field->lifetime());
 
 	title->submits(
-	) | rpl::start_with_next(save, title->lifetime());
+	) | rpl::on_next(save, title->lifetime());
 
 	rpl::combine(
 		box->sizeValue(),
 		field->geometryValue()
-	) | rpl::start_with_next([=](QSize outer, QRect inner) {
+	) | rpl::on_next([=](QSize outer, QRect inner) {
 		emojiToggle->moveToLeft(
 			inner.x() + inner.width() - emojiToggle->width(),
 			inner.y() + st::settingsChatLinkEmojiTop);
@@ -485,7 +486,7 @@ void EditChatLinkBox(
 		}
 	});
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		checkChangedTimer->callOnce(kChangesDebounceTimeout);
 		box->setCloseByOutsideClick(false);
 	}, field->lifetime());
@@ -525,12 +526,12 @@ LinksController::LinksController(
 : _window(window)
 , _session(&window->session()) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_icon = QImage();
 	}, _lifetime);
 
 	_session->api().chatLinks().updates(
-	) | rpl::start_with_next([=](const Api::ChatLinkUpdate &update) {
+	) | rpl::on_next([=](const Api::ChatLinkUpdate &update) {
 		if (!update.now) {
 			if (removeRow(update.was)) {
 				delegate()->peerListRefreshRows();
@@ -595,8 +596,11 @@ base::unique_qptr<Ui::PopupMenu> LinksController::createRowContextMenu(
 		st::popupMenuWithIcons);
 	result->addAction(tr::lng_group_invite_context_copy(tr::now), [=] {
 		QGuiApplication::clipboard()->setText(link);
-		delegate()->peerListUiShow()->showToast(
-			tr::lng_chat_link_copied(tr::now));
+		delegate()->peerListUiShow()->showToast({
+			.text = { tr::lng_chat_link_copied(tr::now) },
+			.iconLottie = u"toast/voip_invite"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	}, &st::menuIconCopy);
 	result->addAction(tr::lng_group_invite_context_share(tr::now), [=] {
 		delegate()->peerListUiShow()->showBox(ShareInviteLinkBox(
@@ -698,7 +702,7 @@ void LinksController::rowPaintIcon(
 ChatLinks::ChatLinks(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: BusinessSection(parent, controller)
+: Section(parent, controller)
 , _bottomSkipRounding(st::boxRadius, st::boxDividerBg) {
 	setupContent(controller);
 }
@@ -720,7 +724,7 @@ void ChatLinks::setupContent(
 		.lottieSize = st::settingsCloudPasswordIconSize,
 		.lottieMargins = st::peerAppearanceIconPadding,
 		.showFinished = showFinishes() | rpl::take(1),
-		.about = tr::lng_chat_links_about(Ui::Text::WithEntities),
+		.about = tr::lng_chat_links_about(tr::marked),
 		.aboutMargins = st::peerAppearanceCoverLabelMargin,
 	});
 
@@ -783,11 +787,11 @@ void ChatLinks::setupContent(
 			? tr::lng_chat_links_footer_both(
 				tr::now,
 				lt_username,
-				Ui::Text::Link(links[0], "https://" + links[0]),
+				tr::link(links[0], "https://" + links[0]),
 				lt_link,
-				Ui::Text::Link(links[1], "https://" + links[1]),
-				Ui::Text::WithEntities)
-			: Ui::Text::Link(links[0], "https://" + links[0]);
+				tr::link(links[1], "https://" + links[1]),
+				tr::marked)
+			: tr::link(links[0], "https://" + links[0]);
 	};
 	auto links = !username.isEmpty()
 		? make({ username, '+' + self->phone() })
@@ -797,17 +801,22 @@ void ChatLinks::setupContent(
 		tr::lng_chat_links_footer(
 			lt_links,
 			rpl::single(std::move(links)),
-			Ui::Text::WithEntities),
+			tr::marked),
 		st::boxDividerLabel);
 	label->setClickHandlerFilter([=](ClickHandlerPtr handler, auto) {
 		QGuiApplication::clipboard()->setText(handler->url());
-		controller->showToast(tr::lng_chat_link_copied(tr::now));
+		controller->showToast({
+			.text = { tr::lng_chat_link_copied(tr::now) },
+			.iconLottie = u"toast/voip_invite"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 		return false;
 	});
 	content->add(object_ptr<Ui::DividerLabel>(
 		content,
 		std::move(label),
 		st::settingsChatbotsBottomTextMargin,
+		st::defaultDividerBar,
 		RectPart::Top));
 
 	Ui::ResizeFitChild(this, content);
diff --git a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
index 3c75cf9baf8fdb..4deb5777f02332 100644
--- a/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chatbots.cpp
@@ -8,8 +8,10 @@ For license and copyright information please follow this link:
 #include "settings/business/settings_chatbots.h"
 
 #include "apiwrap.h"
+#include "boxes/peers/edit_peer_permissions_box.h"
 #include "boxes/peers/prepare_short_info_box.h"
 #include "boxes/peer_list_box.h"
+#include "config.h"
 #include "core/application.h"
 #include "data/business/data_business_chatbots.h"
 #include "data/data_session.h"
@@ -17,8 +19,10 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/business/settings_recipients_helper.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/slide_wrap.h"
@@ -27,6 +31,7 @@ For license and copyright information please follow this link:
 #include "ui/vertical_list.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
+#include "styles/style_chat.h"
 #include "styles/style_layers.h"
 #include "styles/style_settings.h"
 
@@ -34,6 +39,7 @@ namespace Settings {
 namespace {
 
 constexpr auto kDebounceTimeout = crl::time(400);
+constexpr auto kMaxSearchBots = 3;
 
 enum class LookupState {
 	Empty,
@@ -42,12 +48,22 @@ enum class LookupState {
 	Ready,
 };
 
-struct BotState {
-	UserData *bot = nullptr;
+struct BotSearchState {
+	std::vector<UserData*> bots;
 	LookupState state = LookupState::Empty;
+	bool exactUnsupported = false;
 };
 
-class Chatbots final : public BusinessSection<Chatbots> {
+enum class PreviewActionKind {
+	None,
+	Add,
+};
+
+[[nodiscard]] constexpr Data::ChatbotsPermissions Defaults() {
+	return Data::ChatbotsPermission::ViewMessages;
+}
+
+class Chatbots final : public Section<Chatbots> {
 public:
 	Chatbots(
 		QWidget *parent,
@@ -55,28 +71,42 @@ class Chatbots final : public BusinessSection<Chatbots> {
 	~Chatbots();
 
 	[[nodiscard]] bool closeByOutsideClick() const override;
+	void checkBeforeClose(Fn<void()> close) override;
 	[[nodiscard]] rpl::producer<QString> title() override;
+	void setInnerFocus() override;
 
-	const Ui::RoundRect *bottomSkipRounding() const override {
-		return &_bottomSkipRounding;
-	}
+	const Ui::RoundRect *bottomSkipRounding() const override;
 
 private:
-	void setupContent(not_null<Window::SessionController*> controller);
+	[[nodiscard]] bool shouldConfirmLeaveWithoutAddedBot() const;
+	void setupContent();
+	void refreshDetails();
 	void save();
 
 	Ui::RoundRect _bottomSkipRounding;
 
+	Ui::VerticalLayout *_detailsWrap = nullptr;
+	Ui::VerticalLayout *_permissionsWrap = nullptr;
+	Ui::SlideWrap<Ui::InputField> *_usernameWrap = nullptr;
+
 	rpl::variable<Data::BusinessRecipients> _recipients;
+	rpl::variable<UserData*> _committedBot;
+	Data::BusinessRecipients _committedRecipients;
+	Data::ChatbotsPermissions _committedPermissions = Defaults();
 	rpl::variable<QString> _usernameValue;
-	rpl::variable<BotState> _botValue;
-	rpl::variable<bool> _repliesAllowed = true;
+	rpl::variable<BotSearchState> _lookupState;
+	rpl::variable<bool> _chooserVisible = false;
+	rpl::variable<Data::ChatbotsPermissions> _permissions = Defaults();
+	Fn<Data::ChatbotsPermissions()> _resolvePermissions;
 
 };
 
 class PreviewController final : public PeerListController {
 public:
-	PreviewController(not_null<PeerData*> peer, Fn<void()> resetBot);
+	PreviewController(
+		std::vector<UserData*> bots,
+		UserData *committedBot,
+		Fn<void(UserData*)> addBot);
 
 	void prepare() override;
 	void loadMoreRows() override;
@@ -85,15 +115,16 @@ class PreviewController final : public PeerListController {
 	Main::Session &session() const override;
 
 private:
-	const not_null<PeerData*> _peer;
-	const Fn<void()> _resetBot;
+	const std::vector<UserData*> _bots;
+	UserData *const _committedBot = nullptr;
+	const Fn<void(UserData*)> _addBot;
 	rpl::lifetime _lifetime;
 
 };
 
 class PreviewRow final : public PeerListRow {
 public:
-	using PeerListRow::PeerListRow;
+	PreviewRow(not_null<PeerData*> peer, PreviewActionKind kind);
 
 	QSize rightActionSize() const override;
 	QMargins rightActionMargins() const override;
@@ -110,20 +141,50 @@ class PreviewRow final : public PeerListRow {
 	void rightActionStopLastRipple() override;
 
 private:
+	[[nodiscard]] QSize addPillSize() const;
+
+	PreviewActionKind _kind = PreviewActionKind::None;
+	QString _addText;
+	int _addTextWidth = 0;
 	std::unique_ptr<Ui::RippleAnimation> _actionRipple;
 
 };
 
+PreviewRow::PreviewRow(
+	not_null<PeerData*> peer,
+	PreviewActionKind kind)
+: PeerListRow(peer)
+, _kind(kind)
+, _addText((_kind == PreviewActionKind::Add)
+	? tr::lng_chatbots_add(tr::now)
+	: QString())
+, _addTextWidth((_kind == PreviewActionKind::Add)
+	? st::settingsChatbotsAddButton.style.font->width(_addText)
+	: 0) {
+	const auto username = peer->username();
+	if (!username.isEmpty()) {
+		setCustomStatus('@' + username);
+	}
+}
+
+QSize PreviewRow::addPillSize() const {
+	const auto &st = st::settingsChatbotsAddButton;
+	const auto width = _addTextWidth - st.width;
+	return QSize(std::max(width, st.height), st.height);
+}
+
 QSize PreviewRow::rightActionSize() const {
-	return QSize(
-		st::settingsChatbotsDeleteIcon.width(),
-		st::settingsChatbotsDeleteIcon.height()) * 2;
+	return (_kind == PreviewActionKind::Add) ? addPillSize() : QSize();
 }
 
 QMargins PreviewRow::rightActionMargins() const {
+	if (_kind == PreviewActionKind::None) {
+		return QMargins();
+	}
 	const auto itemHeight = st::peerListSingleRow.item.height;
-	const auto skip = (itemHeight - rightActionSize().height()) / 2;
-	return QMargins(0, skip, skip, 0);
+	const auto size = rightActionSize();
+	const auto skipV = (itemHeight - size.height()) / 2;
+	return QMargins(0, skipV, st::settingsChatbotsAddMargin, 0);
 }
 
 void PreviewRow::rightActionPaint(
@@ -133,29 +194,43 @@ void PreviewRow::rightActionPaint(
 		int outerWidth,
 		bool selected,
 		bool actionSelected) {
-	if (_actionRipple) {
-		_actionRipple->paint(
-			p,
-			x,
-			y,
-			outerWidth);
-		if (_actionRipple->empty()) {
-			_actionRipple.reset();
+	if (_kind == PreviewActionKind::None) {
+		return;
+	}
+	const auto size = rightActionSize();
+	if (_kind == PreviewActionKind::Add) {
+		const auto &st = st::settingsChatbotsAddButton;
+		const auto rect = QRect(QPoint(x, y), size);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(actionSelected ? st.textBgOver : st.textBg);
+		const auto radius = size.height() / 2.;
+		p.drawRoundedRect(rect, radius, radius);
+		if (_actionRipple) {
+			_actionRipple->paint(p, x, y, outerWidth);
+			if (_actionRipple->empty()) {
+				_actionRipple.reset();
+			}
 		}
+		p.setPen(actionSelected ? st.textFgOver : st.textFg);
+		p.setFont(st.style.font);
+		p.drawText(rect, Qt::AlignCenter, _addText);
 	}
-	const auto rect = QRect(QPoint(x, y), PreviewRow::rightActionSize());
-	(actionSelected
-		? st::settingsChatbotsDeleteIconOver
-		: st::settingsChatbotsDeleteIcon).paintInCenter(p, rect);
 }
 
 void PreviewRow::rightActionAddRipple(
-	QPoint point,
-	Fn<void()> updateCallback) {
+		QPoint point,
+		Fn<void()> updateCallback) {
+	if (_kind == PreviewActionKind::None) {
+		return;
+	}
 	if (!_actionRipple) {
-		auto mask = Ui::RippleAnimation::EllipseMask(rightActionSize());
+		const auto size = rightActionSize();
+		auto mask = Ui::RippleAnimation::RoundRectMask(
+			size,
+			size.height() / 2);
 		_actionRipple = std::make_unique<Ui::RippleAnimation>(
-			st::defaultRippleAnimation,
+			st::settingsChatbotsAddButton.ripple,
 			std::move(mask),
 			std::move(updateCallback));
 	}
@@ -169,14 +244,22 @@ void PreviewRow::rightActionStopLastRipple() {
 }
 
 PreviewController::PreviewController(
-	not_null<PeerData*> peer,
-	Fn<void()> resetBot)
-: _peer(peer)
-, _resetBot(std::move(resetBot)) {
+	std::vector<UserData*> bots,
+	UserData *committedBot,
+	Fn<void(UserData*)> addBot)
+: _bots(std::move(bots))
+, _committedBot(committedBot)
+, _addBot(std::move(addBot)) {
 }
 
 void PreviewController::prepare() {
-	delegate()->peerListAppendRow(std::make_unique<PreviewRow>(_peer));
+	for (const auto bot : _bots) {
+		const auto kind = (bot == _committedBot)
+			? PreviewActionKind::None
+			: PreviewActionKind::Add;
+		delegate()->peerListAppendRow(
+			std::make_unique<PreviewRow>(bot, kind));
+	}
 	delegate()->peerListRefreshRows();
 }
 
@@ -186,12 +269,16 @@ void PreviewController::loadMoreRows() {
 void PreviewController::rowClicked(not_null<PeerListRow*> row) {
 }
 
-void PreviewController::rowRightActionClicked(not_null<PeerListRow*> row) {
-	_resetBot();
+void PreviewController::rowRightActionClicked(
+		not_null<PeerListRow*> row) {
+	const auto user = row->peer()->asUser();
+	if (user && (user != _committedBot)) {
+		_addBot(user);
+	}
 }
 
 Main::Session &PreviewController::session() const {
-	return _peer->session();
+	return _bots.front()->session();
 }
 
 [[nodiscard]] rpl::producer<QString> DebouncedValue(
@@ -211,7 +298,7 @@ Main::Session &PreviewController::session() const {
 		state->timer.setCallback(push);
 		state->lastText = field->getLastText();
 		consumer.put_next_copy(field->getLastText());
-		field->changes() | rpl::start_with_next([=] {
+		field->changes() | rpl::on_next([=] {
 			const auto &text = field->getLastText();
 			const auto was = std::exchange(state->lastText, text);
 			if (std::abs(int(text.size()) - int(was.size())) == 1) {
@@ -224,81 +311,192 @@ Main::Session &PreviewController::session() const {
 	};
 }
 
-[[nodiscard]] QString ExtractUsername(QString text) {
+struct ParsedUsernameQuery {
+	QString value;
+	bool valid = false;
+};
+
+[[nodiscard]] ParsedUsernameQuery ParseUsernameQuery(QString text) {
 	text = text.trimmed();
-	static const auto expression = QRegularExpression(
-		"^(https://)?([a-zA-Z0-9\\.]+/)?([a-zA-Z0-9_\\.]+)");
-	const auto match = expression.match(text);
-	return match.hasMatch() ? match.captured(3) : text;
+	if (text.startsWith(QChar('@'))) {
+		text = text.mid(1);
+	} else {
+		static const auto extractExpression = QRegularExpression(
+			"^(https://)?([a-zA-Z0-9\\.]+/)?([a-zA-Z0-9_\\.]+)");
+		const auto match = extractExpression.match(text);
+		text = match.hasMatch() ? match.captured(3) : text;
+	}
+	static const auto validateExpression = QRegularExpression(
+		"^[a-zA-Z0-9_\\.]+$");
+	return {
+		.value = text,
+		.valid = !text.isEmpty()
+			&& validateExpression.match(text).hasMatch(),
+	};
+}
+
+[[nodiscard]] bool IsUsableBusinessBot(UserData *user) {
+	return user
+		&& user->isBot()
+		&& user->botInfo->supportsBusiness;
+}
+
+[[nodiscard]] UserData *FirstBot(const BotSearchState &state) {
+	return state.bots.empty() ? nullptr : state.bots.front();
+}
+
+[[nodiscard]] BotSearchState SingleBotState(UserData *bot) {
+	auto result = BotSearchState{
+		.state = bot ? LookupState::Ready : LookupState::Empty,
+	};
+	if (bot) {
+		result.bots.push_back(bot);
+	}
+	return result;
 }
 
-[[nodiscard]] rpl::producer<BotState> LookupBot(
+[[nodiscard]] std::pair<BotSearchState, UserData*> PreviewState(
+		BotSearchState lookupState,
+		UserData *committed,
+		bool chooserVisible,
+		const QString &usernameText) {
+	if (committed && !chooserVisible) {
+		return { SingleBotState(committed), committed };
+	}
+	if (chooserVisible && ParseUsernameQuery(usernameText).valid) {
+		return { std::move(lookupState), nullptr };
+	}
+	return { BotSearchState(), nullptr };
+}
+
+void AppendUniqueBot(
+		std::vector<UserData*> &bots,
+		UserData *user) {
+	if (!IsUsableBusinessBot(user)
+		|| ranges::contains(bots, user)
+		|| bots.size() >= kMaxSearchBots) {
+		return;
+	}
+	bots.push_back(user);
+}
+
+[[nodiscard]] UserData *UserFromPeer(
+		not_null<Main::Session*> session,
+		const MTPPeer &peer) {
+	return session->data().peer(peerFromMTP(peer))->asUser();
+}
+
+struct BotSearchRequest {
+	UserData *exact = nullptr;
+	std::vector<UserData*> my;
+	std::vector<UserData*> global;
+	mtpRequestId exactRequestId = 0;
+	mtpRequestId searchRequestId = 0;
+	bool exactUnsupported = false;
+	bool exactDone = false;
+	bool searchDone = false;
+};
+
+[[nodiscard]] BotSearchState MakeReadySearchState(
+		const BotSearchRequest &request) {
+	auto bots = std::vector<UserData*>();
+	AppendUniqueBot(bots, request.exact);
+	for (const auto user : request.my) {
+		AppendUniqueBot(bots, user);
+	}
+	for (const auto user : request.global) {
+		AppendUniqueBot(bots, user);
+	}
+	const auto unsupported = bots.empty()
+		&& request.exactUnsupported;
+	return {
+		.bots = std::move(bots),
+		.state = unsupported ? LookupState::Unsupported : LookupState::Ready,
+		.exactUnsupported = request.exactUnsupported,
+	};
+}
+
+void AppendUsersFromPeerList(
+		not_null<Main::Session*> session,
+		const MTPVector<MTPPeer> &list,
+		std::vector<UserData*> &users) {
+	users.reserve(users.size() + list.v.size());
+	for (const auto &mtpPeer : list.v) {
+		if (const auto user = UserFromPeer(session, mtpPeer)) {
+			users.push_back(user);
+		}
+	}
+}
+
+[[nodiscard]] rpl::producer<BotSearchState> LookupBots(
 		not_null<Main::Session*> session,
 		rpl::producer<QString> usernameChanges) {
-	using Cache = base::flat_map<QString, UserData*>;
-	const auto cache = std::make_shared<Cache>();
 	return std::move(
 		usernameChanges
-	) | rpl::map([=](const QString &username) -> rpl::producer<BotState> {
-		const auto extracted = ExtractUsername(username);
-		const auto owner = &session->data();
-		static const auto expression = QRegularExpression(
-			"^[a-zA-Z0-9_\\.]+$");
-		if (!expression.match(extracted).hasMatch()) {
-			return rpl::single(BotState());
-		} else if (const auto peer = owner->peerByUsername(extracted)) {
-			if (const auto user = peer->asUser(); user && user->isBot()) {
-				if (user->botInfo->supportsBusiness) {
-					return rpl::single(BotState{
-						.bot = user,
-						.state = LookupState::Ready,
-					});
-				}
-				return rpl::single(BotState{
-					.state = LookupState::Unsupported,
-				});
-			}
-			return rpl::single(BotState{
-				.state = LookupState::Ready,
-			});
-		} else if (const auto i = cache->find(extracted); i != end(*cache)) {
-			return rpl::single(BotState{
-				.bot = i->second,
-				.state = LookupState::Ready,
-			});
+	) | rpl::map([=](
+			const QString &username) -> rpl::producer<BotSearchState> {
+		const auto query = ParseUsernameQuery(username);
+		if (!query.valid) {
+			return rpl::single(BotSearchState());
 		}
+		const auto extracted = query.value;
 
 		return [=](auto consumer) {
 			auto result = rpl::lifetime();
 
-			const auto requestId = result.make_state<mtpRequestId>();
-			*requestId = session->api().request(MTPcontacts_ResolveUsername(
-				MTP_string(extracted)
+			const auto data = result.make_state<BotSearchRequest>();
+			const auto finish = [=] {
+				if (!data->exactDone || !data->searchDone) {
+					return;
+				}
+				consumer.put_next(MakeReadySearchState(*data));
+			};
+
+			consumer.put_next(BotSearchState{
+				.state = LookupState::Loading,
+			});
+
+			data->exactRequestId = session->api().request(MTPcontacts_ResolveUsername(
+				MTP_flags(0),
+				MTP_string(extracted),
+				MTP_string()
 			)).done([=](const MTPcontacts_ResolvedPeer &result) {
-				const auto &data = result.data();
-				session->data().processUsers(data.vusers());
-				session->data().processChats(data.vchats());
-				const auto peerId = peerFromMTP(data.vpeer());
-				const auto peer = session->data().peer(peerId);
-				if (const auto user = peer->asUser()) {
-					if (user->isBot()) {
-						cache->emplace(extracted, user);
-						consumer.put_next(BotState{
-							.bot = user,
-							.state = LookupState::Ready,
-						});
-						return;
+				const auto &resolved = result.data();
+				session->data().processUsers(resolved.vusers());
+				session->data().processChats(resolved.vchats());
+				if (const auto user = UserFromPeer(session, resolved.vpeer())) {
+					if (IsUsableBusinessBot(user)) {
+						data->exact = user;
+					} else if (user->isBot()) {
+						data->exactUnsupported = true;
 					}
 				}
-				cache->emplace(extracted, nullptr);
-				consumer.put_next(BotState{ .state = LookupState::Ready });
+				data->exactDone = true;
+				finish();
 			}).fail([=] {
-				cache->emplace(extracted, nullptr);
-				consumer.put_next(BotState{ .state = LookupState::Ready });
+				data->exactDone = true;
+				finish();
+			}).send();
+			data->searchRequestId = session->api().request(MTPcontacts_Search(
+				MTP_flags(0),
+				MTP_string(extracted),
+				MTP_int(SearchPeopleLimit)
+			)).done([=](const MTPcontacts_Found &result) {
+				const auto &found = result.data();
+				session->data().processUsers(found.vusers());
+				session->data().processChats(found.vchats());
+				AppendUsersFromPeerList(session, found.vmy_results(), data->my);
+				AppendUsersFromPeerList(session, found.vresults(), data->global);
+				data->searchDone = true;
+				finish();
+			}).fail([=] {
+				data->searchDone = true;
+				finish();
 			}).send();
 
 			result.add([=] {
-				session->api().request(*requestId).cancel();
+				session->api().request(data->exactRequestId).cancel();
+				session->api().request(data->searchRequestId).cancel();
 			});
 			return result;
 		};
@@ -307,8 +505,8 @@ Main::Session &PreviewController::session() const {
 
 [[nodiscard]] object_ptr<Ui::RpWidget> MakeBotPreview(
 		not_null<Ui::RpWidget*> parent,
-		rpl::producer<BotState> state,
-		Fn<void()> resetBot) {
+		rpl::producer<std::pair<BotSearchState, UserData*>> stateAndBot,
+		Fn<void(UserData*)> addBot) {
 	auto result = object_ptr<Ui::SlideWrap<>>(
 		parent.get(),
 		object_ptr<Ui::RpWidget>(parent.get()));
@@ -317,20 +515,22 @@ Main::Session &PreviewController::session() const {
 	raw->hide(anim::type::instant);
 
 	const auto child = inner->lifetime().make_state<Ui::RpWidget*>(nullptr);
-	std::move(state) | rpl::filter([=](BotState state) {
-		return state.state != LookupState::Loading;
-	}) | rpl::start_with_next([=](BotState state) {
-		raw->toggle(
-			(state.state == LookupState::Ready
-				|| state.state == LookupState::Unsupported),
-			anim::type::normal);
-		if (state.bot) {
+	std::move(stateAndBot) | rpl::on_next([=](
+			std::pair<BotSearchState, UserData*> pair) {
+		const auto &state = pair.first;
+		const auto committed = pair.second;
+		const auto hasBots = !state.bots.empty();
+		const auto hasLabel = !hasBots
+			&& (state.state == LookupState::Ready
+				|| state.state == LookupState::Unsupported);
+		raw->toggle(hasBots || hasLabel, anim::type::normal);
+		if (hasBots) {
 			const auto delegate = parent->lifetime().make_state<
 				PeerListContentDelegateSimple
 			>();
 			const auto controller = parent->lifetime().make_state<
 				PreviewController
-			>(state.bot, resetBot);
+			>(state.bots, committed, addBot);
 			controller->setStyleOverrides(&st::peerListSingleRow);
 			const auto content = Ui::CreateChild<PeerListContent>(
 				inner,
@@ -339,8 +539,7 @@ Main::Session &PreviewController::session() const {
 			controller->setDelegate(delegate);
 			delete base::take(*child);
 			*child = content;
-		} else if (state.state == LookupState::Ready
-			|| state.state == LookupState::Unsupported) {
+		} else if (hasLabel) {
 			const auto content = Ui::CreateChild<Ui::RpWidget>(inner);
 			const auto label = Ui::CreateChild<Ui::FlatLabel>(
 				content,
@@ -354,7 +553,7 @@ Main::Session &PreviewController::session() const {
 			rpl::combine(
 				content->sizeValue(),
 				label->sizeValue()
-			) | rpl::start_with_next([=](QSize size, QSize inner) {
+			) | rpl::on_next([=](QSize size, QSize inner) {
 				label->move(
 					(size.width() - inner.width()) / 2,
 					(size.height() - inner.height()) / 2);
@@ -362,17 +561,18 @@ Main::Session &PreviewController::session() const {
 			delete base::take(*child);
 			*child = content;
 		} else {
+			delete base::take(*child);
 			return;
 		}
 		(*child)->show();
 
-		inner->widthValue() | rpl::start_with_next([=](int width) {
+		inner->widthValue() | rpl::on_next([=](int width) {
 			(*child)->resizeToWidth(width);
 		}, (*child)->lifetime());
 
-		(*child)->heightValue() | rpl::start_with_next([=](int height) {
+		(*child)->heightValue() | rpl::on_next([=](int height) {
 			inner->resize(inner->width(), height + st::contactSkip);
-		}, inner->lifetime());
+		}, (*child)->lifetime());
 	}, inner->lifetime());
 
 	raw->finishAnimating();
@@ -382,9 +582,9 @@ Main::Session &PreviewController::session() const {
 Chatbots::Chatbots(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: BusinessSection(parent, controller)
+: Section(parent, controller)
 , _bottomSkipRounding(st::boxRadius, st::boxDividerBg) {
-	setupContent(controller);
+	setupContent();
 }
 
 Chatbots::~Chatbots() {
@@ -393,101 +593,274 @@ Chatbots::~Chatbots() {
 	}
 }
 
+bool Chatbots::shouldConfirmLeaveWithoutAddedBot() const {
+	if (!_chooserVisible.current() || _committedBot.current()) {
+		return false;
+	}
+	const auto parsed = ParseUsernameQuery(_usernameValue.current());
+	const auto &current = _lookupState.current();
+	return parsed.valid
+		&& !current.bots.empty();
+}
+
 bool Chatbots::closeByOutsideClick() const {
 	return false;
 }
 
+void Chatbots::checkBeforeClose(Fn<void()> close) {
+	if (!shouldConfirmLeaveWithoutAddedBot()) {
+		close();
+		return;
+	}
+	controller()->show(Ui::MakeConfirmBox({
+		.text = tr::lng_chatbots_leave_without_added_text(),
+		.confirmed = crl::guard(this, [=](Fn<void()> closeBox) {
+			closeBox();
+			close();
+		}),
+		.confirmText = tr::lng_box_leave(),
+		.cancelText = tr::lng_cancel(),
+		.title = tr::lng_chatbots_leave_without_added_title(),
+	}));
+}
+
 rpl::producer<QString> Chatbots::title() {
-	return tr::lng_chatbots_title();
+	return tr::lng_chat_automation_title();
+}
+
+void Chatbots::setInnerFocus() {
+	if (_chooserVisible.current()) {
+		_usernameWrap->entity()->setFocus();
+	} else {
+		AbstractSection::setInnerFocus();
+	}
+}
+
+const Ui::RoundRect *Chatbots::bottomSkipRounding() const {
+	return _permissionsWrap->count() ? nullptr : &_bottomSkipRounding;
 }
 
-void Chatbots::setupContent(
-		not_null<Window::SessionController*> controller) {
+void Chatbots::setupContent() {
 	using namespace rpl::mappers;
 
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-	const auto current = controller->session().data().chatbots().current();
+	const auto current = controller()->session().data().chatbots().current();
 
 	_recipients = Data::BusinessRecipients::MakeValid(current.recipients);
-	_repliesAllowed = current.repliesAllowed;
+	_permissions = current.permissions;
+	_committedBot = current.bot;
+	_committedRecipients = _recipients.current();
+	_committedPermissions = _permissions.current();
 
 	AddDividerTextWithLottie(content, {
-		.lottie = u"robot"_q,
+		.lottie = u"settings/chat_automation"_q,
 		.lottieSize = st::settingsCloudPasswordIconSize,
 		.lottieMargins = st::peerAppearanceIconPadding,
 		.showFinished = showFinishes(),
-		.about = tr::lng_chatbots_about(
-			lt_link,
-			tr::lng_chatbots_about_link(
-			) | Ui::Text::ToLink(tr::lng_chatbots_info_url(tr::now)),
-			Ui::Text::WithEntities),
+		.about = tr::lng_chat_automation_about(tr::marked),
 		.aboutMargins = st::peerAppearanceCoverLabelMargin,
 	});
 
-	const auto username = content->add(
-		object_ptr<Ui::InputField>(
+	const auto usernameWrap = content->add(
+		object_ptr<Ui::SlideWrap<Ui::InputField>>(
 			content,
-			st::settingsChatbotsUsername,
-			tr::lng_chatbots_placeholder(),
-			(current.bot
-				? current.bot->session().createInternalLink(
-					current.bot->username())
-				: QString())),
-		st::settingsChatbotsUsernameMargins);
-
-	_usernameValue = DebouncedValue(username);
-	_botValue = rpl::single(BotState{
-		current.bot,
-		current.bot ? LookupState::Ready : LookupState::Empty
-	}) | rpl::then(
-		LookupBot(&controller->session(), _usernameValue.changes())
+			object_ptr<Ui::InputField>(
+				content,
+				st::settingsChatbotsUsername,
+				tr::lng_chatbots_placeholder(),
+				QString()),
+			st::settingsChatbotsUsernameMargins),
+		QMargins(0, st::settingsChatbotsUsernameMargins.bottom(), 0, 0));
+	usernameWrap->setDuration(0);
+	_usernameWrap = usernameWrap;
+	_chooserVisible = !current.bot;
+	_usernameWrap->toggle(_chooserVisible.current(), anim::type::instant);
+	const auto username = usernameWrap->entity();
+
+	_usernameValue = rpl::single(
+		username->getLastText()
+	) | rpl::then(
+		username->changes() | rpl::map([=] {
+			return username->getLastText();
+		}));
+	_lookupState = LookupBots(&controller()->session(), DebouncedValue(username)
 	);
 
 	const auto resetBot = [=] {
 		username->setText(QString());
+		_committedBot = nullptr;
+		_recipients = Data::BusinessRecipients::MakeValid({});
+		_permissions = Defaults();
+		_committedRecipients = _recipients.current();
+		_committedPermissions = _permissions.current();
+		_chooserVisible = true;
+		_usernameWrap->toggle(true, anim::type::instant);
 		username->setFocus();
 	};
+	const auto addBot = [=](UserData *resolved) {
+		if (!resolved) {
+			return;
+		}
+		_committedRecipients = _recipients.current();
+		_committedPermissions = _resolvePermissions();
+		_permissions = _committedPermissions;
+		_committedBot = resolved;
+		_chooserVisible = false;
+		_usernameWrap->toggle(false, anim::type::instant);
+		controller()->showToast(Ui::Toast::Config{
+			.text = { tr::lng_chatbots_added_success(
+				tr::now,
+				lt_bot,
+				resolved->name()) },
+			.icon = &st::toastCheckIcon,
+		});
+	};
+	auto stateAndBot = rpl::combine(
+		_lookupState.value(),
+		_committedBot.value(),
+		_chooserVisible.value(),
+		_usernameValue.value()
+	) | rpl::map([](
+			BotSearchState lookupState,
+			UserData *committed,
+			bool chooserVisible,
+			const QString &usernameText) {
+		return PreviewState(
+			std::move(lookupState),
+			committed,
+			chooserVisible,
+			usernameText);
+	});
+
 	content->add(object_ptr<Ui::SlideWrap<Ui::RpWidget>>(
 		content,
-		MakeBotPreview(content, _botValue.value(), resetBot)));
+		MakeBotPreview(
+			content,
+			std::move(stateAndBot),
+			addBot)));
 
 	Ui::AddDividerText(
 		content,
-		tr::lng_chatbots_add_about(),
+		tr::lng_chat_automation_add_about(),
 		st::peerAppearanceDividerTextMargin);
 
-	AddBusinessRecipientsSelector(content, {
-		.controller = controller,
+	_detailsWrap = content->add(object_ptr<Ui::VerticalLayout>(content));
+
+	AddBusinessRecipientsSelector(_detailsWrap, {
+		.controller = controller(),
 		.title = tr::lng_chatbots_access_title(),
 		.data = &_recipients,
 		.type = Data::BusinessRecipientsType::Bots,
 	});
 
-	Ui::AddSkip(content, st::settingsChatbotsAccessSkip);
+	Ui::AddSkip(_detailsWrap, st::settingsChatbotsAccessSkip);
 	Ui::AddDividerText(
-		content,
+		_detailsWrap,
 		tr::lng_chatbots_exclude_about(),
-		st::peerAppearanceDividerTextMargin);
+		st::peerAppearanceDividerTextMargin,
+		st::defaultDividerLabel,
+		RectPart::Top);
+
+	_permissionsWrap = _detailsWrap->add(
+		object_ptr<Ui::VerticalLayout>(_detailsWrap));
+
+	const auto removeWrap = _detailsWrap->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			_detailsWrap,
+			object_ptr<Ui::VerticalLayout>(_detailsWrap)));
+	const auto removeInner = removeWrap->entity();
+	Ui::AddDivider(removeInner);
+	Ui::AddSkip(removeInner);
+	const auto remove = removeInner->add(
+		CreateButtonWithIcon(
+			removeInner,
+			tr::lng_chatbots_remove_bot(),
+			st::settingsChatbotsRemove,
+			{ &st::settingsChatbotsRemoveIcon }));
+	remove->setClickedCallback(resetBot);
+	removeWrap->toggleOn(
+		_committedBot.value() | rpl::map(_1 != nullptr),
+		anim::type::instant);
+	removeWrap->setDuration(0);
+
+	refreshDetails();
+	rpl::merge(
+		_chooserVisible.changes() | rpl::to_empty,
+		_committedBot.changes() | rpl::to_empty,
+		_lookupState.changes() | rpl::to_empty,
+		_usernameValue.changes() | rpl::to_empty
+	) | rpl::on_next([=] {
+		refreshDetails();
+	}, lifetime());
+
+	Ui::ResizeFitChild(this, content);
+}
+
+void Chatbots::refreshDetails() {
+	_resolvePermissions = [=] {
+		return Data::ChatbotsPermissions();
+	};
+	while (_permissionsWrap->count()) {
+		delete _permissionsWrap->widgetAt(0);
+	}
+
+	auto bot = _committedBot.current();
+	if (!bot && _chooserVisible.current()) {
+		const auto parsed = ParseUsernameQuery(_usernameValue.current());
+		if (parsed.valid) {
+			bot = FirstBot(_lookupState.current());
+		}
+	}
+	if (!bot) {
+		_permissionsWrap->resizeToWidth(width());
+		return;
+	}
 
+	const auto content = _permissionsWrap;
 	Ui::AddSkip(content);
 	Ui::AddSubsectionTitle(content, tr::lng_chatbots_permissions_title());
-	content->add(object_ptr<Ui::SettingsButton>(
-		content,
-		tr::lng_chatbots_reply(),
-		st::settingsButtonNoIcon
-	))->toggleOn(_repliesAllowed.value())->toggledChanges(
-	) | rpl::start_with_next([=](bool value) {
-		_repliesAllowed = value;
-	}, content->lifetime());
-	Ui::AddSkip(content);
 
-	Ui::AddDividerText(
+	auto permissions = CreateEditChatbotPermissions(
 		content,
-		tr::lng_chatbots_reply_about(),
-		st::settingsChatbotsBottomTextMargin,
-		RectPart::Top);
+		_permissions.current());
+	content->add(std::move(permissions.widget));
+	_resolvePermissions = permissions.value;
+
+	std::move(
+		permissions.changes
+	) | rpl::on_next([=](Data::ChatbotsPermissions now) {
+		const auto warn = [&](tr::phrase<lngtag_bot> text) {
+			controller()->show(Ui::MakeInformBox({
+				.text = text(
+					tr::now,
+					lt_bot,
+					tr::bold(bot->name()),
+					tr::rich),
+				.title = tr::lng_chatbots_warning_title(),
+			}));
+		};
 
-	Ui::ResizeFitChild(this, content);
+		const auto was = _permissions.current();
+		const auto diff = now ^ was;
+		const auto enabled = diff & now;
+		using Flag = Data::ChatbotsPermission;
+		if (enabled & (Flag::TransferGifts | Flag::SellGifts)) {
+			if (enabled & Flag::TransferStars) {
+				warn(tr::lng_chatbots_warning_both_text);
+			} else {
+				warn(tr::lng_chatbots_warning_gifts_text);
+			}
+		} else if (enabled & Flag::TransferStars) {
+			warn(tr::lng_chatbots_warning_stars_text);
+		} else if (enabled & Flag::EditUsername) {
+			warn(tr::lng_chatbots_warning_username_text);
+		}
+		_permissions = now;
+	}, lifetime());
+
+	Ui::AddSkip(content);
+
+	_permissionsWrap->resizeToWidth(width());
 }
 
 void Chatbots::save() {
@@ -499,10 +872,15 @@ void Chatbots::save() {
 			show->showToast(tr::lng_chatbots_not_supported(tr::now));
 		}
 	};
+	const auto bot = _committedBot.current();
+	if (bot) {
+		_committedRecipients = _recipients.current();
+		_committedPermissions = _resolvePermissions();
+	}
 	controller()->session().data().chatbots().save({
-		.bot = _botValue.current().bot,
-		.recipients = _recipients.current(),
-		.repliesAllowed = _repliesAllowed.current(),
+		.bot = bot,
+		.recipients = _committedRecipients,
+		.permissions = _committedPermissions,
 	}, [=] {
 	}, fail);
 }
diff --git a/Telegram/SourceFiles/settings/business/settings_greeting.cpp b/Telegram/SourceFiles/settings/business/settings_greeting.cpp
index 8437acc7c09dc3..1f96ca1a1f6ba0 100644
--- a/Telegram/SourceFiles/settings/business/settings_greeting.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_greeting.cpp
@@ -35,7 +35,7 @@ namespace {
 
 constexpr auto kDefaultNoActivityDays = 7;
 
-class Greeting : public BusinessSection<Greeting> {
+class Greeting : public Section<Greeting> {
 public:
 	Greeting(
 		QWidget *parent,
@@ -66,7 +66,7 @@ class Greeting : public BusinessSection<Greeting> {
 Greeting::Greeting(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: BusinessSection(parent, controller)
+: Section(parent, controller)
 , _bottomSkipRounding(st::boxRadius, st::boxDividerBg) {
 	setupContent(controller);
 }
@@ -89,9 +89,9 @@ void EditPeriodBox(
 	const auto take = TimePickerBox(box, values, phrases, days);
 
 	box->addButton(tr::lng_settings_save(), [=] {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		save(take());
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	});
@@ -135,7 +135,7 @@ void Greeting::setupContent(
 		.lottieSize = st::settingsCloudPasswordIconSize,
 		.lottieMargins = st::peerAppearanceIconPadding,
 		.showFinished = showFinishes(),
-		.about = tr::lng_greeting_about(Ui::Text::WithEntities),
+		.about = tr::lng_greeting_about(tr::marked),
 		.aboutMargins = st::peerAppearanceCoverLabelMargin,
 	});
 
@@ -159,7 +159,7 @@ void Greeting::setupContent(
 	)));
 
 	_enabled = enabled->toggledValue();
-	_enabled.value() | rpl::filter(_1) | rpl::start_with_next([=] {
+	_enabled.value() | rpl::filter(_1) | rpl::on_next([=] {
 		if (!_canHave.current()) {
 			controller->showToast({
 				.text = { tr::lng_greeting_limit_reached(tr::now) },
@@ -177,7 +177,7 @@ void Greeting::setupContent(
 			object_ptr<Ui::BoxContentDivider>(
 				content,
 				st::boxDividerHeight,
-				st::boxDividerBg,
+				st::defaultDividerBar,
 				RectPart::Top))
 	)->setDuration(0)->toggleOn(enabled->toggledValue() | rpl::map(!_1));
 	content->add(
@@ -256,6 +256,7 @@ void Greeting::setupContent(
 		inner,
 		tr::lng_greeting_period_about(),
 		st::settingsChatbotsBottomTextMargin,
+		st::defaultDividerLabel,
 		RectPart::Top);
 
 	wrap->toggleOn(enabled->toggledValue());
diff --git a/Telegram/SourceFiles/settings/business/settings_location.cpp b/Telegram/SourceFiles/settings/business/settings_location.cpp
index 6b659d0441d588..57098491a07924 100644
--- a/Telegram/SourceFiles/settings/business/settings_location.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_location.cpp
@@ -37,7 +37,7 @@ For license and copyright information please follow this link:
 namespace Settings {
 namespace {
 
-class Location : public BusinessSection<Location> {
+class Location : public Section<Location> {
 public:
 	Location(
 		QWidget *parent,
@@ -84,7 +84,7 @@ class Location : public BusinessSection<Location> {
 Location::Location(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: BusinessSection(parent, controller)
+: Section(parent, controller)
 , _config(ResolveBusinessMapsConfig(&controller->session()))
 , _bottomSkipRounding(st::boxRadius, st::boxDividerBg) {
 	setupContent(controller);
@@ -123,7 +123,7 @@ void Location::setupPicker(not_null<Ui::VerticalLayout*> content) {
 		.lottieSize = st::settingsCloudPasswordIconSize,
 		.lottieMargins = st::peerAppearanceIconPadding,
 		.showFinished = showFinishes(),
-		.about = tr::lng_location_about(Ui::Text::WithEntities),
+		.about = tr::lng_location_about(tr::marked),
 		.aboutMargins = st::peerAppearanceCoverLabelMargin,
 	});
 
@@ -137,11 +137,11 @@ void Location::setupPicker(not_null<Ui::VerticalLayout*> content) {
 		st::settingsChatbotsUsernameMargins);
 
 	_data.value(
-	) | rpl::start_with_next([=](const Data::BusinessLocation &location) {
+	) | rpl::on_next([=](const Data::BusinessLocation &location) {
 		address->setText(location.address);
 	}, address->lifetime());
 
-	address->changes() | rpl::start_with_next([=] {
+	address->changes() | rpl::on_next([=] {
 		auto copy = _data.current();
 		copy.address = address->getLastText();
 		_data = std::move(copy);
@@ -160,7 +160,7 @@ void Location::setupPicker(not_null<Ui::VerticalLayout*> content) {
 		return location.point.has_value();
 	}));
 
-	maptoggle->toggledValue() | rpl::start_with_next([=](bool toggled) {
+	maptoggle->toggledValue() | rpl::on_next([=](bool toggled) {
 		if (!toggled) {
 			auto copy = _data.current();
 			if (copy.point.has_value()) {
@@ -185,7 +185,7 @@ void Location::setupPicker(not_null<Ui::VerticalLayout*> content) {
 	map->resize(map->width(), st::locationSize.height());
 
 	_data.value(
-	) | rpl::start_with_next([=](const Data::BusinessLocation &location) {
+	) | rpl::on_next([=](const Data::BusinessLocation &location) {
 		const auto image = location.point.has_value()
 			? controller()->session().data().location(*location.point).get()
 			: nullptr;
@@ -197,7 +197,7 @@ void Location::setupPicker(not_null<Ui::VerticalLayout*> content) {
 		_map = image;
 	}, mapWrap->lifetime());
 
-	map->paintRequest() | rpl::start_with_next([=] {
+	map->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(map);
 
 		const auto left = (map->width() - st::locationSize.width()) / 2;
@@ -219,7 +219,7 @@ void Location::setupPicker(not_null<Ui::VerticalLayout*> content) {
 	}, map->lifetime());
 
 	controller()->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		map->update();
 	}, map->lifetime());
 
@@ -227,7 +227,7 @@ void Location::setupPicker(not_null<Ui::VerticalLayout*> content) {
 		chooseOnMap();
 	});
 
-	showFinishes() | rpl::start_with_next([=] {
+	showFinishes() | rpl::on_next([=] {
 		address->setFocus();
 	}, address->lifetime());
 }
@@ -273,7 +273,7 @@ void Location::setupUnsupported(not_null<Ui::VerticalLayout*> content) {
 		.lottieSize = st::settingsCloudPasswordIconSize,
 		.lottieMargins = st::peerAppearanceIconPadding,
 		.showFinished = showFinishes(),
-		.about = tr::lng_location_fallback(Ui::Text::WithEntities),
+		.about = tr::lng_location_fallback(tr::marked),
 		.aboutMargins = st::peerAppearanceCoverLabelMargin,
 		.parts = RectPart::Top,
 	});
diff --git a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
index e59ef7061d7020..3632174528c282 100644
--- a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
@@ -33,7 +33,7 @@ namespace {
 
 constexpr auto kShortcutLimit = 32;
 
-class QuickReplies : public BusinessSection<QuickReplies> {
+class QuickReplies : public Section<QuickReplies> {
 public:
 	QuickReplies(
 		QWidget *parent,
@@ -52,7 +52,7 @@ class QuickReplies : public BusinessSection<QuickReplies> {
 QuickReplies::QuickReplies(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: BusinessSection(parent, controller) {
+: Section(parent, controller) {
 	setupContent(controller);
 }
 
@@ -73,7 +73,7 @@ void QuickReplies::setupContent(
 		.lottieSize = st::settingsCloudPasswordIconSize,
 		.lottieMargins = st::peerAppearanceIconPadding,
 		.showFinished = showFinishes(),
-		.about = tr::lng_replies_about(Ui::Text::WithEntities),
+		.about = tr::lng_replies_about(tr::marked),
 		.aboutMargins = st::peerAppearanceCoverLabelMargin,
 	});
 	Ui::AddSkip(content);
@@ -87,7 +87,7 @@ void QuickReplies::setupContent(
 	rpl::combine(
 		_count.value(),
 		ShortcutsLimitValue(&controller->session())
-	) | rpl::start_with_next([=](int count, int limit) {
+	) | rpl::on_next([=](int count, int limit) {
 		while (addWrap->count()) {
 			delete addWrap->widgetAt(0);
 		}
@@ -130,7 +130,7 @@ void QuickReplies::setupContent(
 		object_ptr<Ui::VerticalLayout>(content));
 	rpl::single(rpl::empty) | rpl::then(
 		messages->shortcutsChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto old = inner->count();
 
 		const auto &shortcuts = messages->shortcuts();
@@ -220,15 +220,15 @@ void EditShortcutNameBox(
 		if (!ValidShortcutName(name)) {
 			field->showError();
 		} else {
-			submit(name, [weak = Ui::MakeWeak(box)] {
-				if (const auto strong = weak.data()) {
+			submit(name, [weak = base::make_weak(box)] {
+				if (const auto strong = weak.get()) {
 					strong->closeBox();
 				}
 			});
 		}
 	};
 	field->submits(
-	) | rpl::start_with_next(callback, field->lifetime());
+	) | rpl::on_next(callback, field->lifetime());
 	box->addButton(tr::lng_settings_save(), callback);
 	box->addButton(tr::lng_cancel(), [=] {
 		box->closeBox();
diff --git a/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp b/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp
index e80a0cff27024d..039a35417ec976 100644
--- a/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp
@@ -112,7 +112,7 @@ not_null<FilterChatsPreview*> SetupBusinessChatsPreview(
 		base::flat_set<not_null<History*>>(begin(peers), end(peers))));
 
 	preview->flagRemoved(
-	) | rpl::start_with_next([=](Flag flag) {
+	) | rpl::on_next([=](Flag flag) {
 		*locked = true;
 		*data = Data::BusinessChats{
 			data->current().types & ~FlagsToTypes(flag),
@@ -122,7 +122,7 @@ not_null<FilterChatsPreview*> SetupBusinessChatsPreview(
 	}, preview->lifetime());
 
 	preview->peerRemoved(
-	) | rpl::start_with_next([=](not_null<History*> history) {
+	) | rpl::on_next([=](not_null<History*> history) {
 		auto list = data->current().list;
 		list.erase(
 			ranges::remove(list, not_null(history->peer->asUser())),
@@ -139,7 +139,7 @@ not_null<FilterChatsPreview*> SetupBusinessChatsPreview(
 	data->changes(
 	) | rpl::filter([=] {
 		return !*locked;
-	}) | rpl::start_with_next([=](const Data::BusinessChats &rules) {
+	}) | rpl::on_next([=](const Data::BusinessChats &rules) {
 		auto &&peers = rules.list | ranges::views::transform([=](
 				not_null<UserData*> user) {
 			return user->owner().history(user);
@@ -245,11 +245,11 @@ void AddBusinessRecipientsSelector(
 		rpl::variable<Data::BusinessChats>
 	>(data->current().excluded);
 	data->changes(
-	) | rpl::start_with_next([=](const Data::BusinessRecipients &value) {
+	) | rpl::on_next([=](const Data::BusinessRecipients &value) {
 		*excluded = value.excluded;
 	}, lifetime);
 	excluded->changes(
-	) | rpl::start_with_next([=](Data::BusinessChats &&value) {
+	) | rpl::on_next([=](Data::BusinessChats &&value) {
 		change([&](Data::BusinessRecipients &data) {
 			data.excluded = std::move(value);
 		});
@@ -303,11 +303,11 @@ void AddBusinessRecipientsSelector(
 		rpl::variable<Data::BusinessChats>
 	>(data->current().included);
 	data->changes(
-	) | rpl::start_with_next([=](const Data::BusinessRecipients &value) {
+	) | rpl::on_next([=](const Data::BusinessRecipients &value) {
 		*included = value.included;
 	}, lifetime);
 	included->changes(
-	) | rpl::start_with_next([=](Data::BusinessChats &&value) {
+	) | rpl::on_next([=](Data::BusinessChats &&value) {
 		change([&](Data::BusinessRecipients &data) {
 			data.included = std::move(value);
 		});
@@ -315,7 +315,7 @@ void AddBusinessRecipientsSelector(
 
 	SetupBusinessChatsPreview(includeInner, included);
 	included->value(
-	) | rpl::start_with_next([=](const Data::BusinessChats &value) {
+	) | rpl::on_next([=](const Data::BusinessChats &value) {
 		if (value.empty() && group->current() == kSelectedOnly) {
 			group->setValue(kAllExcept);
 		}
diff --git a/Telegram/SourceFiles/settings/business/settings_recipients_helper.h b/Telegram/SourceFiles/settings/business/settings_recipients_helper.h
index 8be1d42dc57d0b..a5528dfa6947d6 100644
--- a/Telegram/SourceFiles/settings/business/settings_recipients_helper.h
+++ b/Telegram/SourceFiles/settings/business/settings_recipients_helper.h
@@ -23,33 +23,6 @@ class SessionController;
 
 namespace Settings {
 
-template <typename SectionType>
-class BusinessSection : public Section<SectionType> {
-public:
-	BusinessSection(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller)
-	: Section<SectionType>(parent)
-	, _controller(controller) {
-	}
-
-	[[nodiscard]] not_null<Window::SessionController*> controller() const {
-		return _controller;
-	}
-	[[nodiscard]] rpl::producer<> showFinishes() const {
-		return _showFinished.events();
-	}
-
-private:
-	void showFinished() override {
-		_showFinished.fire({});
-	}
-
-	const not_null<Window::SessionController*> _controller;
-	rpl::event_stream<> _showFinished;
-
-};
-
 struct BusinessChatsDescriptor {
 	Data::BusinessChats current;
 	Fn<void(const Data::BusinessChats&)> save;
@@ -74,30 +47,30 @@ void AddBusinessRecipientsSelector(
 	not_null<Ui::VerticalLayout*> container,
 	BusinessRecipientsSelectorDescriptor &&descriptor);
 
-[[nodiscard]] int ShortcutsCount(not_null<Main::Session*> session);
+[[nodiscard]] int ShortcutsCount(not_null<::Main::Session*> session);
 [[nodiscard]] rpl::producer<int> ShortcutsCountValue(
-	not_null<Main::Session*> session);
+	not_null<::Main::Session*> session);
 [[nodiscard]] int ShortcutMessagesCount(
-	not_null<Main::Session*> session,
+	not_null<::Main::Session*> session,
 	const QString &name);
 [[nodiscard]] rpl::producer<int> ShortcutMessagesCountValue(
-	not_null<Main::Session*> session,
+	not_null<::Main::Session*> session,
 	const QString &name);
 [[nodiscard]] bool ShortcutExists(
-	not_null<Main::Session*> session,
+	not_null<::Main::Session*> session,
 	const QString &name);
 [[nodiscard]] rpl::producer<bool> ShortcutExistsValue(
-	not_null<Main::Session*> session,
+	not_null<::Main::Session*> session,
 	const QString &name);
-[[nodiscard]] int ShortcutsLimit(not_null<Main::Session*> session);
+[[nodiscard]] int ShortcutsLimit(not_null<::Main::Session*> session);
 [[nodiscard]] rpl::producer<int> ShortcutsLimitValue(
-	not_null<Main::Session*> session);
-[[nodiscard]] int ShortcutMessagesLimit(not_null<Main::Session*> session);
+	not_null<::Main::Session*> session);
+[[nodiscard]] int ShortcutMessagesLimit(not_null<::Main::Session*> session);
 [[nodiscard]] rpl::producer<int> ShortcutMessagesLimitValue(
-	not_null<Main::Session*> session);
+	not_null<::Main::Session*> session);
 
 [[nodiscard]] BusinessShortcutId LookupShortcutId(
-	not_null<Main::Session*> session,
+	not_null<::Main::Session*> session,
 	const QString &name);
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index 1610aafee8d57a..767ee3264d5ca4 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -19,6 +19,8 @@ For license and copyright information please follow this link:
 #include "core/file_utilities.h"
 #include "core/mime_type.h"
 #include "data/business/data_shortcut_messages.h"
+#include "data/components/recent_inline_bots.h"
+#include "data/data_chat_participant_status.h"
 #include "data/data_message_reaction_id.h"
 #include "data/data_premium_limits.h"
 #include "data/data_session.h"
@@ -58,6 +60,7 @@ For license and copyright information please follow this link:
 #include "ui/painter.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
+#include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
@@ -91,6 +94,7 @@ class ShortcutMessages
 
 	[[nodiscard]] rpl::producer<QString> title() override;
 	[[nodiscard]] rpl::producer<> sectionShowBack() override;
+	bool processChosenSticker(ChatHelpers::FileChosen &&chosen) override;
 	void setInnerFocus() override;
 
 	rpl::producer<Info::SelectedItems> selectedListValue() override;
@@ -126,7 +130,8 @@ class ShortcutMessages
 	void listMarkContentsRead(
 		const base::flat_set<not_null<HistoryItem*>> &items) override;
 	MessagesBarData listMessagesBar(
-		const std::vector<not_null<Element*>> &elements) override;
+		const std::vector<not_null<Element*>> &elements,
+		bool markLastAsRead) override;
 	void listContentRefreshed() override;
 	void listUpdateDateLink(
 		ClickHandlerPtr &link,
@@ -177,7 +182,7 @@ class ShortcutMessages
 	bool cornerButtonsUnreadMayBeShown() override;
 	bool cornerButtonsHas(CornerButtonType type) override;
 
-	QPointer<Ui::RpWidget> createPinnedToBottom(
+	base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) override;
 	void setupComposeControls();
 	void processScroll();
@@ -193,9 +198,6 @@ class ShortcutMessages
 		QByteArray &&content,
 		std::optional<bool> overrideSendImagesAsPhotos = std::nullopt,
 		const QString &insertTextOnCancel = QString());
-	bool confirmSendingFiles(
-		const QStringList &files,
-		const QString &insertTextOnCancel);
 	bool confirmSendingFiles(
 		Ui::PreparedList &&list,
 		const QString &insertTextOnCancel = QString());
@@ -204,15 +206,11 @@ class ShortcutMessages
 		std::optional<bool> overrideSendImagesAsPhotos,
 		const QString &insertTextOnCancel = QString());
 	bool showSendingFilesError(const Ui::PreparedList &list) const;
-	bool showSendingFilesError(
-		const Ui::PreparedList &list,
-		std::optional<bool> compress) const;
+	bool showSendingFilesError(const Ui::PreparedBundle &bundle) const;
+
 	void sendingFilesConfirmed(
-		Ui::PreparedList &&list,
-		Ui::SendFilesWay way,
-		TextWithTags &&caption,
-		Api::SendOptions options,
-		bool ctrlShiftEnter);
+		std::shared_ptr<Ui::PreparedBundle> bundle,
+		Api::SendOptions options);
 
 	bool sendExistingDocument(
 		not_null<DocumentData*> document,
@@ -223,10 +221,10 @@ class ShortcutMessages
 		not_null<PhotoData*> photo,
 		Api::SendOptions options);
 	void sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot);
 	void sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot,
 		Api::SendOptions options,
 		std::optional<MsgId> localMessageId);
@@ -329,7 +327,7 @@ ShortcutMessages::ShortcutMessages(
 	not_null<Ui::ScrollArea*> scroll,
 	rpl::producer<Container> containerValue,
 	BusinessShortcutId shortcutId)
-: AbstractSection(parent)
+: AbstractSection(parent, controller)
 , WindowListDelegate(controller)
 , _controller(controller)
 , _session(&controller->session())
@@ -346,7 +344,7 @@ ShortcutMessages::ShortcutMessages(
 	const auto messages = &_session->data().shortcutMessages();
 
 	messages->shortcutIdChanged(
-	) | rpl::start_with_next([=](Data::ShortcutIdChange change) {
+	) | rpl::on_next([=](Data::ShortcutIdChange change) {
 		if (change.oldId == _shortcutId.current()) {
 			if (change.newId) {
 				_shortcutId = change.newId;
@@ -356,12 +354,12 @@ ShortcutMessages::ShortcutMessages(
 		}
 	}, lifetime());
 	messages->shortcutsChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_shortcut = messages->lookupShortcut(_shortcutId.current()).name;
 	}, lifetime());
 
 	controller->chatStyle()->paletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_scroll->updateBars();
 	}, _scroll->lifetime());
 
@@ -373,37 +371,39 @@ ShortcutMessages::ShortcutMessages(
 		this,
 		&controller->session(),
 		static_cast<ListDelegate*>(this));
-	_inner->overrideIsChatWide(false);
+	_inner->overrideChatMode(ElementChatMode::Default);
 
 	_scroll->sizeValue() | rpl::filter([](QSize size) {
 		return !size.isEmpty();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		outerResized();
 	}, lifetime());
 
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		processScroll();
 	}, lifetime());
 
-	_shortcut.value() | rpl::start_with_next([=] {
+	_shortcut.value() | rpl::on_next([=] {
 		refreshEmptyText();
 		_inner->update();
 	}, lifetime());
 
 	_inner->editMessageRequested(
-	) | rpl::start_with_next([=](auto fullId) {
+	) | rpl::on_next([=](auto fullId) {
 		if (const auto item = _session->data().message(fullId)) {
 			const auto media = item->media();
 			if (!media || media->webpage() || media->allowsEditCaption()) {
 				_composeControls->editMessage(
 					fullId,
 					_inner->getSelectedTextRange(item));
+			} else if (media->todolist()) {
+				Window::PeerMenuEditTodoList(_controller, item);
 			}
 		}
 	}, _inner->lifetime());
 
-	_inner->heightValue() | rpl::start_with_next([=](int height) {
+	_inner->heightValue() | rpl::on_next([=](int height) {
 		resize(width(), height);
 	}, lifetime());
 }
@@ -417,21 +417,21 @@ void ShortcutMessages::refreshEmptyText() {
 	auto text = away
 		? tr::lng_away_empty_title(
 			tr::now,
-			Ui::Text::Bold
+			tr::bold
 		).append("\n\n").append(tr::lng_away_empty_about(tr::now))
 		: greeting
 		? tr::lng_greeting_empty_title(
 			tr::now,
-			Ui::Text::Bold
+			tr::bold
 		).append("\n\n").append(tr::lng_greeting_empty_about(tr::now))
 		: tr::lng_replies_empty_title(
 			tr::now,
-			Ui::Text::Bold
+			tr::bold
 		).append("\n\n").append(tr::lng_replies_empty_about(
 			tr::now,
 			lt_shortcut,
-			Ui::Text::Bold('/' + shortcut),
-			Ui::Text::WithEntities));
+			tr::bold('/' + shortcut),
+			tr::marked));
 	_emptyIcon = away
 		? &st::awayEmptyIcon
 		: greeting
@@ -621,7 +621,7 @@ void ShortcutMessages::updateComposeControlsPosition() {
 }
 
 void ShortcutMessages::setupComposeControls() {
-	_shortcutId.value() | rpl::start_with_next([=](BusinessShortcutId id) {
+	_shortcutId.value() | rpl::on_next([=](BusinessShortcutId id) {
 		_composeControls->updateShortcutId(id);
 	}, lifetime());
 
@@ -629,6 +629,7 @@ void ShortcutMessages::setupComposeControls() {
 		.key = Dialogs::Key{ _history },
 		.section = Dialogs::EntryState::Section::ShortcutMessages,
 		.currentReplyTo = replyTo(),
+		.currentSuggest = SuggestOptions(),
 	};
 	_composeControls->setCurrentDialogsEntryState(state);
 
@@ -651,28 +652,28 @@ void ShortcutMessages::setupComposeControls() {
 	});
 
 	_composeControls->cancelRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		listCancelRequest();
 	}, lifetime());
 
 	_composeControls->sendRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		send();
 	}, lifetime());
 
 	_composeControls->sendVoiceRequests(
-	) | rpl::start_with_next([=](ComposeControls::VoiceToSend &&data) {
+	) | rpl::on_next([=](ComposeControls::VoiceToSend &&data) {
 		sendVoice(std::move(data));
 	}, lifetime());
 
 	_composeControls->sendCommandRequests(
-	) | rpl::start_with_next([=](const QString &command) {
+	) | rpl::on_next([=](const QString &command) {
 		listSendBotCommand(command, FullMsgId());
 	}, lifetime());
 
 	const auto saveEditMsgRequestId = lifetime().make_state<mtpRequestId>(0);
 	_composeControls->editRequests(
-	) | rpl::start_with_next([=](auto data) {
+	) | rpl::on_next([=](auto data) {
 		if (const auto item = _session->data().message(data.fullId)) {
 			if (item->isBusinessShortcut()) {
 				const auto spoiler = data.spoilered;
@@ -684,7 +685,7 @@ void ShortcutMessages::setupComposeControls() {
 	_composeControls->attachRequests(
 	) | rpl::filter([=] {
 		return !_choosingAttach;
-	}) | rpl::start_with_next([=](std::optional<bool> overrideCompress) {
+	}) | rpl::on_next([=](std::optional<bool> overrideCompress) {
 		_choosingAttach = true;
 		base::call_delayed(st::historyAttach.ripple.hideDuration, this, [=] {
 			_choosingAttach = false;
@@ -692,24 +693,30 @@ void ShortcutMessages::setupComposeControls() {
 		});
 	}, lifetime());
 
+	_composeControls->setSendAsFileConfirmed(crl::guard(this, [=](
+			std::shared_ptr<Ui::PreparedBundle> bundle,
+			Api::SendOptions options) {
+		sendingFilesConfirmed(std::move(bundle), options);
+	}));
+
 	_composeControls->fileChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		_controller->hideLayer(anim::type::normal);
 		sendExistingDocument(data.document, {}, std::nullopt);
 	}, lifetime());
 
 	_composeControls->photoChosen(
-	) | rpl::start_with_next([=](ChatHelpers::PhotoChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::PhotoChosen chosen) {
 		sendExistingPhoto(chosen.photo);
 	}, lifetime());
 
 	_composeControls->inlineResultChosen(
-	) | rpl::start_with_next([=](ChatHelpers::InlineChosen chosen) {
+	) | rpl::on_next([=](ChatHelpers::InlineChosen chosen) {
 		sendInlineResult(chosen.result, chosen.bot);
 	}, lifetime());
 
 	_composeControls->jumpToItemRequests(
-	) | rpl::start_with_next([=](FullReplyTo to) {
+	) | rpl::on_next([=](FullReplyTo to) {
 		if (const auto item = _session->data().message(to.messageId)) {
 			showAtPosition(item->position());
 		}
@@ -718,12 +725,12 @@ void ShortcutMessages::setupComposeControls() {
 	rpl::merge(
 		_composeControls->scrollKeyEvents(),
 		_inner->scrollKeyEvents()
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		_scroll->keyPressEvent(e);
 	}, lifetime());
 
 	_composeControls->editLastMessageRequests(
-	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+	) | rpl::on_next([=](not_null<QKeyEvent*> e) {
 		if (!_inner->lastMessageEditRequestNotify()) {
 			_scroll->keyPressEvent(e);
 		}
@@ -744,22 +751,22 @@ void ShortcutMessages::setupComposeControls() {
 	});
 
 	_composeControls->lockShowStarts(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_cornerButtons.updateJumpDownVisibility();
 		_cornerButtons.updateUnreadThingsVisibility();
 	}, lifetime());
 
 	_composeControls->viewportEvents(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		_scroll->viewportEvent(e);
 	}, lifetime());
 
-	_controlsWrap->widthValue() | rpl::start_with_next([=](int width) {
+	_controlsWrap->widthValue() | rpl::on_next([=](int width) {
 		_composeControls->resizeToWidth(width);
 	}, _controlsWrap->lifetime());
 
 	_composeControls->height(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		const auto wasMax = (_scroll->scrollTopMax() == _scroll->scrollTop());
 		_controlsWrap->resize(width(), height - st::boxRadius);
 		updateComposeControlsPosition();
@@ -769,7 +776,7 @@ void ShortcutMessages::setupComposeControls() {
 	}, lifetime());
 }
 
-QPointer<Ui::RpWidget> ShortcutMessages::createPinnedToBottom(
+base::weak_qptr<Ui::RpWidget> ShortcutMessages::createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) {
 	auto placeholder = rpl::deferred([=] {
 		return _shortcutId.value();
@@ -913,7 +920,8 @@ void ShortcutMessages::listMarkContentsRead(
 }
 
 MessagesBarData ShortcutMessages::listMessagesBar(
-		const std::vector<not_null<Element*>> &elements) {
+		const std::vector<not_null<Element*>> &elements,
+		bool markLastAsRead) {
 	return {};
 }
 
@@ -1139,40 +1147,21 @@ void ShortcutMessages::uploadFile(
 
 bool ShortcutMessages::showSendingFilesError(
 		const Ui::PreparedList &list) const {
-	return showSendingFilesError(list, std::nullopt);
+	if (showPremiumRequired()) {
+		return true;
+	}
+	const auto show = _controller->uiShow();
+	const auto peer = _controller->session().user();
+	return Data::ShowSendError(show, peer, list, std::nullopt, true);
 }
 
 bool ShortcutMessages::showSendingFilesError(
-		const Ui::PreparedList &list,
-		std::optional<bool> compress) const {
+		const Ui::PreparedBundle &bundle) const {
 	if (showPremiumRequired()) {
 		return true;
 	}
-	const auto text = [&] {
-		using Error = Ui::PreparedList::Error;
-		switch (list.error) {
-		case Error::None: return QString();
-		case Error::EmptyFile:
-		case Error::Directory:
-		case Error::NonLocalUrl: return tr::lng_send_image_empty(
-			tr::now,
-			lt_name,
-			list.errorData);
-		case Error::TooLargeFile: return u"(toolarge)"_q;
-		}
-		return tr::lng_forward_send_files_cant(tr::now);
-	}();
-	if (text.isEmpty()) {
-		return false;
-	} else if (text == u"(toolarge)"_q) {
-		const auto fileSize = list.files.back().size;
-		_controller->show(
-			Box(FileSizeLimitBox, _session, fileSize, nullptr));
-		return true;
-	}
-
-	_controller->showToast(text);
-	return true;
+	const auto peer = _controller->session().user();
+	return Data::ShowSendError(_controller->uiShow(), peer, bundle, true);
 }
 
 Api::SendAction ShortcutMessages::prepareSendAction(
@@ -1200,6 +1189,7 @@ void ShortcutMessages::sendVoice(ComposeControls::VoiceToSend &&data) {
 		data.bytes,
 		data.waveform,
 		data.duration,
+		data.video,
 		std::move(action));
 
 	_composeControls->cancelReplyMessage();
@@ -1240,19 +1230,20 @@ void ShortcutMessages::edit(
 	const auto hasMediaWithCaption = item
 		&& item->media()
 		&& item->media()->allowsEditCaption();
-	const auto maxCaptionSize = !hasMediaWithCaption
-		? MaxMessageSize
-		: Data::PremiumLimits(_session).captionLengthCurrent();
-	if (!TextUtilities::CutPart(sending, left, maxCaptionSize)
+	const auto limits = Data::PremiumLimits(_session);
+	const auto maxTextSize = hasMediaWithCaption
+		? limits.captionLengthCurrent()
+		: limits.messageLengthCurrent();
+	if (!TextUtilities::CutPart(sending, left, maxTextSize)
 		&& !hasMediaWithCaption) {
 		if (item) {
-			_controller->show(Box<DeleteMessagesBox>(item, false));
+			_controller->show(Box<DeleteMessagesBox>(item));
 		} else {
 			doSetInnerFocus();
 		}
 		return;
 	} else if (!left.text.isEmpty()) {
-		const auto remove = originalLeftSize - maxCaptionSize;
+		const auto remove = originalLeftSize - maxTextSize;
 		_controller->showToast(
 			tr::lng_edit_limit_reached(tr::now, lt_count, remove));
 		return;
@@ -1355,20 +1346,16 @@ bool ShortcutMessages::confirmSendingFiles(
 		SendMenu::Details());
 
 	box->setConfirmedCallback(crl::guard(this, [=](
-			Ui::PreparedList &&list,
-			Ui::SendFilesWay way,
-			TextWithTags &&caption,
+			std::shared_ptr<Ui::PreparedBundle> bundle,
 			Api::SendOptions options,
-			bool ctrlShiftEnter) {
-		sendingFilesConfirmed(
-			std::move(list),
-			way,
-			std::move(caption),
-			options,
-			ctrlShiftEnter);
+			FullReplyTo) {
+		sendingFilesConfirmed(std::move(bundle), options);
 	}));
 	box->setCancelledCallback(_composeControls->restoreTextCallback(
 		insertTextOnCancel));
+	box->takeTextWithTagsRequests() | rpl::on_next([=](TextWithTags &&text) {
+		_composeControls->setText(std::move(text));
+	}, box->lifetime());
 
 	//ActivateWindow(_controller);
 	_controller->show(std::move(box));
@@ -1394,41 +1381,21 @@ bool ShortcutMessages::confirmSendingFiles(
 }
 
 void ShortcutMessages::sendingFilesConfirmed(
-		Ui::PreparedList &&list,
-		Ui::SendFilesWay way,
-		TextWithTags &&caption,
-		Api::SendOptions options,
-		bool ctrlShiftEnter) {
-	Expects(list.filesToProcess.empty());
-
-	if (showSendingFilesError(list, way.sendImagesAsPhotos())) {
+		std::shared_ptr<Ui::PreparedBundle> bundle,
+		Api::SendOptions options) {
+	if (showSendingFilesError(*bundle)) {
 		return;
 	}
-	auto groups = DivideByGroups(
-		std::move(list),
-		way,
-		_history->peer->slowmodeApplied());
-	const auto type = way.sendImagesAsPhotos()
-		? SendMediaType::Photo
-		: SendMediaType::File;
+	const auto compress = bundle->way.sendImagesAsPhotos();
+	const auto type = compress ? SendMediaType::Photo : SendMediaType::File;
 	auto action = prepareSendAction(options);
 	action.clearDraft = false;
-	if ((groups.size() != 1 || !groups.front().sentWithCaption())
-		&& !caption.text.isEmpty()) {
-		auto message = Api::MessageToSend(action);
-		message.textWithTags = base::take(caption);
-		_session->api().sendMessage(std::move(message));
-	}
-	for (auto &group : groups) {
+	auto &api = _session->api();
+	for (auto &group : bundle->groups) {
 		const auto album = (group.type != Ui::AlbumType::None)
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
-		_session->api().sendFiles(
-			std::move(group.list),
-			type,
-			base::take(caption),
-			album,
-			action);
+		api.sendFiles(std::move(group.list), type, album, action);
 	}
 	if (_composeControls->replyingToMessage() == action.replyTo) {
 		_composeControls->cancelReplyMessage();
@@ -1483,6 +1450,14 @@ void ShortcutMessages::finishSending() {
 	showAtEnd();
 }
 
+bool ShortcutMessages::processChosenSticker(ChatHelpers::FileChosen &&chosen) {
+	if (!_composeControls) {
+		return false;
+	}
+	_composeControls->processChosenSticker(std::move(chosen));
+	return true;
+}
+
 void ShortcutMessages::showAtEnd() {
 	showAtPosition(Data::MaxMessagePosition);
 }
@@ -1533,21 +1508,19 @@ bool ShortcutMessages::sendExistingPhoto(
 }
 
 void ShortcutMessages::sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot) {
 	if (showPremiumRequired()) {
 		return;
-	}
-	const auto errorText = result->getErrorOnSend(_history);
-	if (!errorText.isEmpty()) {
-		_controller->showToast(errorText);
+	} else if (const auto error = result->getErrorOnSend(_history)) {
+		Data::ShowSendErrorToast(_controller, _history->peer, error);
 		return;
 	}
-	sendInlineResult(result, bot, {}, std::nullopt);
+	sendInlineResult(std::move(result), bot, {}, std::nullopt);
 }
 
 void ShortcutMessages::sendInlineResult(
-		not_null<InlineBots::Result*> result,
+		std::shared_ptr<InlineBots::Result> result,
 		not_null<UserData*> bot,
 		Api::SendOptions options,
 		std::optional<MsgId> localMessageId) {
@@ -1556,24 +1529,18 @@ void ShortcutMessages::sendInlineResult(
 	}
 	auto action = prepareSendAction(options);
 	action.generateLocal = true;
-	_session->api().sendInlineResult(bot, result, action, localMessageId);
+	_session->api().sendInlineResult(
+		bot,
+		result.get(),
+		action,
+		localMessageId);
 
 	_composeControls->clear();
 	//_saveDraftText = true;
 	//_saveDraftStart = crl::now();
 	//onDraftSave();
 
-	auto &bots = cRefRecentInlineBots();
-	const auto index = bots.indexOf(bot);
-	if (index) {
-		if (index > 0) {
-			bots.removeAt(index);
-		} else if (bots.size() >= RecentInlineBotsLimit) {
-			bots.resize(RecentInlineBotsLimit - 1);
-		}
-		bots.push_front(bot);
-		bot->session().local().writeRecentHashtagsAndBots();
-	}
+	bot->session().recentInlineBots().bump(bot);
 	finishSending();
 }
 
diff --git a/Telegram/SourceFiles/settings/business/settings_working_hours.cpp b/Telegram/SourceFiles/settings/business/settings_working_hours.cpp
index 6e0bf6f504eda5..c3e6dbfa28b83c 100644
--- a/Telegram/SourceFiles/settings/business/settings_working_hours.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_working_hours.cpp
@@ -35,10 +35,9 @@ namespace Settings {
 namespace {
 
 constexpr auto kDay = Data::WorkingInterval::kDay;
-constexpr auto kWeek = Data::WorkingInterval::kWeek;
 constexpr auto kInNextDayMax = Data::WorkingInterval::kInNextDayMax;
 
-class WorkingHours : public BusinessSection<WorkingHours> {
+class WorkingHours : public Section<WorkingHours> {
 public:
 	WorkingHours(
 		QWidget *parent,
@@ -143,31 +142,12 @@ void EditTimeBox(
 			int count,
 			int startIndex,
 			Fn<void(QPainter &p, QRectF rect, int index)> paint) {
-		auto paintCallback = [=](
-				QPainter &p,
-				int index,
-				float64 y,
-				float64 distanceFromCenter,
-				int outerWidth) {
-			const auto r = QRectF(0, y, outerWidth, itemHeight);
-			const auto progress = std::abs(distanceFromCenter);
-			const auto revProgress = 1. - progress;
-			p.save();
-			p.translate(r.center());
-			constexpr auto kMinYScale = 0.2;
-			const auto yScale = kMinYScale
-				+ (1. - kMinYScale) * anim::easeOutCubic(1., revProgress);
-			p.scale(1., yScale);
-			p.translate(-r.center());
-			p.setOpacity(revProgress);
-			p.setFont(font);
-			p.setPen(st::defaultFlatLabel.textFg);
-			paint(p, r, index);
-			p.restore();
-		};
 		return Ui::CreateChild<Ui::VerticalDrumPicker>(
 			content,
-			std::move(paintCallback),
+			Ui::VerticalDrumPicker::DefaultPaintCallback(
+				font,
+				itemHeight,
+				paint),
 			count,
 			itemHeight,
 			startIndex);
@@ -192,7 +172,7 @@ void EditTimeBox(
 	rpl::combine(
 		content->sizeValue(),
 		minutes->value()
-	) | rpl::start_with_next([=](QSize s, Ui::VerticalDrumPicker *minutes) {
+	) | rpl::on_next([=](QSize s, Ui::VerticalDrumPicker *minutes) {
 		const auto half = (s.width() - separatorWidth) / 2;
 		hours->setGeometry(0, 0, half, s.height());
 		if (minutes) {
@@ -203,7 +183,7 @@ void EditTimeBox(
 	Ui::SendPendingMoveResizeEvents(hours);
 
 	const auto minutesStart = content->lifetime().make_state<TimeId>();
-	hours->value() | rpl::start_with_next([=](int hoursIndex) {
+	hours->value() | rpl::on_next([=](int hoursIndex) {
 		const auto start = std::max(low, (hoursIndex + (low / 3600)) * 3600);
 		const auto end = std::min(high, ((start / 3600) * 60 + 59) * 60);
 		const auto minutesCount = (end - start + 60) / 60;
@@ -232,7 +212,7 @@ void EditTimeBox(
 	}, hours->lifetime());
 
 	content->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(content);
 
 		p.fillRect(r, Qt::transparent);
@@ -255,12 +235,12 @@ void EditTimeBox(
 	});
 
 	box->addButton(tr::lng_settings_save(), [=] {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		save(std::clamp(
 			((*minutesStart) / 60 + minutes->current()->index()) * 60,
 			low,
 			high));
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	});
@@ -372,7 +352,7 @@ void EditDayBox(
 	});
 
 	state->data.value(
-	) | rpl::start_with_next([=](const Data::WorkingIntervals &data) {
+	) | rpl::on_next([=](const Data::WorkingIntervals &data) {
 		const auto count = int(data.list.size());
 		for (auto i = 0; i != count; ++i) {
 			const auto min = (i == 0) ? 0 : (data.list[i - 1].end + 60);
@@ -398,9 +378,9 @@ void EditDayBox(
 	AddDividerText(container, tr::lng_hours_about_day());
 
 	box->addButton(tr::lng_settings_save(), [=] {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		save(state->data.current());
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	});
@@ -457,9 +437,9 @@ void ChooseTimezoneBox(
 		});
 	}
 	group->setChangedCallback([=](int index) {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		save(list[index].id);
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	});
@@ -543,13 +523,13 @@ void AddWeekButton(
 
 	const auto separator = Ui::CreateChild<Ui::RpWidget>(container.get());
 	separator->paintRequest(
-	) | rpl::start_with_next([=, bg = st.textBgOver] {
+	) | rpl::on_next([=, bg = st.textBgOver] {
 		auto p = QPainter(separator);
 		p.fillRect(separator->rect(), bg);
 	}, separator->lifetime());
 	const auto separatorHeight = st.height - 2 * st.toggle.border;
 	button->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		const auto w = st::rightsButtonToggleWidth;
 		toggleButton->setGeometry(
 			r.x() + r.width() - w,
@@ -566,12 +546,12 @@ void AddWeekButton(
 	const auto checkWidget = Ui::CreateChild<Ui::RpWidget>(toggleButton);
 	checkWidget->resize(checkView->getSize());
 	checkWidget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(checkWidget);
 		checkView->paint(p, 0, 0, checkWidget->width());
 	}, checkWidget->lifetime());
 	toggleButton->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		checkWidget->moveToRight(
 			st.toggleSkip,
 			(s.height() - checkWidget->height()) / 2);
@@ -594,7 +574,7 @@ void AddWeekButton(
 WorkingHours::WorkingHours(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: BusinessSection(parent, controller) {
+: Section(parent, controller) {
 	setupContent(controller);
 }
 
@@ -633,7 +613,7 @@ void WorkingHours::setupContent(
 		.lottieSize = st::settingsCloudPasswordIconSize,
 		.lottieMargins = st::peerAppearanceIconPadding,
 		.showFinished = showFinishes(),
-		.about = tr::lng_hours_about(Ui::Text::WithEntities),
+		.about = tr::lng_hours_about(tr::marked),
 		.aboutMargins = st::peerAppearanceCoverLabelMargin,
 	});
 
@@ -667,7 +647,7 @@ void WorkingHours::setupContent(
 	state->timezones.value(
 	) | rpl::filter([=](const Data::Timezones &value) {
 		return !value.list.empty();
-	}) | rpl::start_with_next([=](const Data::Timezones &value) {
+	}) | rpl::on_next([=](const Data::Timezones &value) {
 		const auto now = _hours.current().timezoneId;
 		if (!ranges::contains(value.list, now, &Data::Timezone::id)) {
 			auto copy = _hours.current();
@@ -716,7 +696,7 @@ void WorkingHours::setupContent(
 		state->timezones.value(
 		) | rpl::filter([](const Data::Timezones &value) {
 			return !value.list.empty();
-		}) | rpl::start_with_next([=](const Data::Timezones &value) {
+		}) | rpl::on_next([=](const Data::Timezones &value) {
 			if (state->timezoneEditPending) {
 				state->timezoneEditPending = false;
 				editTimezone(value.list);
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
index 0b627337921473..4418d6415a918c 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
@@ -7,28 +7,16 @@ For license and copyright information please follow this link:
 */
 #include "settings/cloud_password/settings_cloud_password_common.h"
 
-#include "apiwrap.h"
-#include "base/timer.h"
-#include "core/application.h"
 #include "lang/lang_keys.h"
 #include "lottie/lottie_icon.h"
-#include "main/main_session.h"
-#include "settings/cloud_password/settings_cloud_password_email.h"
-#include "settings/cloud_password/settings_cloud_password_email_confirm.h"
-#include "settings/cloud_password/settings_cloud_password_hint.h"
-#include "settings/cloud_password/settings_cloud_password_input.h"
-#include "settings/cloud_password/settings_cloud_password_manage.h"
-#include "settings/cloud_password/settings_cloud_password_start.h"
-#include "ui/boxes/confirm_box.h"
+#include "settings/settings_common.h"
+#include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/fields/password_input.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/vertical_layout.h"
-#include "ui/vertical_list.h"
-#include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
-#include "styles/style_layers.h"
 #include "styles/style_settings.h"
 
 namespace Settings::CloudPassword {
@@ -65,11 +53,11 @@ BottomButton CreateBottomDisableButton(
 
 	Ui::AddSkip(content);
 
-	content->add(object_ptr<Button>(
+	const auto button = content->add(object_ptr<Button>(
 		content,
 		std::move(buttonText),
-		st::settingsAttentionButton
-	))->addClickHandler(std::move(callback));
+		st::settingsAttentionButton));
+	button->addClickHandler(std::move(callback));
 
 	const auto divider = Ui::CreateChild<OneEdgeBoxContentDivider>(
 		parent.get());
@@ -78,7 +66,7 @@ BottomButton CreateBottomDisableButton(
 		std::move(sectionGeometryValue),
 		parent->geometryValue(),
 		content->geometryValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const QRect &r,
 			const QRect &parentRect,
 			const QRect &bottomRect) {
@@ -92,7 +80,8 @@ BottomButton CreateBottomDisableButton(
 	divider->show();
 
 	return {
-		.content = Ui::MakeWeak(not_null<Ui::RpWidget*>{ content }),
+		.content = base::make_weak(content),
+		.button = base::make_weak(button),
 		.isBottomFillerShown = divider->geometryValue(
 		) | rpl::map([](const QRect &r) {
 			return r.height() > 0;
@@ -100,12 +89,15 @@ BottomButton CreateBottomDisableButton(
 	};
 }
 
-void SetupAutoCloseTimer(rpl::lifetime &lifetime, Fn<void()> callback) {
+void SetupAutoCloseTimer(
+		rpl::lifetime &lifetime,
+		Fn<void()> callback,
+		Fn<crl::time()> lastNonIdleTime) {
 	constexpr auto kTimerCheck = crl::time(1000 * 60);
 	constexpr auto kAutoCloseTimeout = crl::time(1000 * 60 * 10);
 
 	const auto timer = lifetime.make_state<base::Timer>([=] {
-		const auto idle = crl::now() - Core::App().lastNonIdleTime();
+		const auto idle = crl::now() - lastNonIdleTime();
 		if (idle >= kAutoCloseTimeout) {
 			callback();
 		}
@@ -118,7 +110,7 @@ void SetupHeader(
 		const QString &lottie,
 		rpl::producer<> &&showFinished,
 		rpl::producer<QString> &&subtitle,
-		rpl::producer<QString> &&about) {
+		v::text::data &&about) {
 	if (!lottie.isEmpty()) {
 		const auto &size = st::settingsCloudPasswordIconSize;
 		auto icon = CreateLottieIcon(
@@ -128,31 +120,32 @@ void SetupHeader(
 		content->add(std::move(icon.widget));
 		std::move(
 			showFinished
-		) | rpl::start_with_next([animate = std::move(icon.animate)] {
+		) | rpl::on_next([animate = std::move(icon.animate)] {
 			animate(anim::repeat::once);
 		}, content->lifetime());
 	}
 	Ui::AddSkip(content);
 
 	content->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				std::move(subtitle),
-				st::changePhoneTitle)),
-		st::changePhoneTitlePadding);
+			std::move(subtitle),
+			st::changePhoneTitle),
+		st::changePhoneTitlePadding,
+		style::al_top);
 
 	{
 		const auto &st = st::settingLocalPasscodeDescription;
-		const auto wrap = content->add(
-			object_ptr<Ui::CenterWrap<>>(
+		const auto description = content->add(
+			object_ptr<Ui::FlatLabel>(
 				content,
-				object_ptr<Ui::FlatLabel>(content, std::move(about), st)),
-			st::changePhoneDescriptionPadding);
-		wrap->resize(
-			wrap->width(),
-			st::settingLocalPasscodeDescriptionHeight);
+				v::text::take_marked(std::move(about)),
+				st,
+				st::defaultPopupMenu),
+			st::changePhoneDescriptionPadding,
+			style::al_top);
+		description->setTryMakeSimilarLines(true);
+		description->setAttribute(Qt::WA_TransparentForMouseEvents);
 	}
 }
 
@@ -170,7 +163,7 @@ not_null<Ui::PasswordInput*> AddPasswordField(
 		text);
 
 	container->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		field->moveToLeft((r.width() - field->width()) / 2, 0);
 	}, container->lifetime());
 
@@ -178,34 +171,33 @@ not_null<Ui::PasswordInput*> AddPasswordField(
 	return field;
 }
 
-not_null<Ui::CenterWrap<Ui::InputField>*> AddWrappedField(
+not_null<Ui::InputField*> AddWrappedField(
 		not_null<Ui::VerticalLayout*> content,
 		rpl::producer<QString> &&placeholder,
 		const QString &text) {
-	return content->add(object_ptr<Ui::CenterWrap<Ui::InputField>>(
-		content,
+	return content->add(
 		object_ptr<Ui::InputField>(
 			content,
 			st::settingLocalPasscodeInputField,
 			std::move(placeholder),
-			text)));
+			text),
+		style::al_top);
 }
 
 not_null<Ui::LinkButton*> AddLinkButton(
-		not_null<Ui::CenterWrap<Ui::InputField>*> wrap,
+		not_null<Ui::InputField*> input,
 		rpl::producer<QString> &&text) {
 	const auto button = Ui::CreateChild<Ui::LinkButton>(
-		wrap->parentWidget(),
+		input->parentWidget(),
 		QString());
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &text) {
+	) | rpl::on_next([=](const QString &text) {
 		button->setText(text);
 	}, button->lifetime());
 
-	wrap->geometryValue(
-	) | rpl::start_with_next([=](QRect r) {
-		r.translate(wrap->entity()->pos().x(), 0);
+	input->geometryValue(
+	) | rpl::on_next([=](QRect r) {
 		button->moveToLeft(r.x(), r.y() + r.height() + st::passcodeTextLine);
 	}, button->lifetime());
 	return button;
@@ -215,14 +207,12 @@ not_null<Ui::FlatLabel*> AddError(
 		not_null<Ui::VerticalLayout*> content,
 		Ui::PasswordInput *input) {
 	const auto error = content->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				// Set any text to resize.
-				tr::lng_language_name(tr::now),
-				st::settingLocalPasscodeError)),
-		st::changePhoneDescriptionPadding)->entity();
+			QString(),
+			st::settingLocalPasscodeError),
+		st::changePhoneDescriptionPadding,
+		style::al_top);
 	error->hide();
 	if (input) {
 		QObject::connect(input, &Ui::MaskedInputField::changed, [=] {
@@ -236,14 +226,12 @@ not_null<Ui::RoundButton*> AddDoneButton(
 		not_null<Ui::VerticalLayout*> content,
 		rpl::producer<QString> &&text) {
 	const auto button = content->add(
-		object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+		object_ptr<Ui::RoundButton>(
 			content,
-			object_ptr<Ui::RoundButton>(
-				content,
-				std::move(text),
-				st::changePhoneButton)),
-		st::settingLocalPasscodeButtonPadding)->entity();
-	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+			std::move(text),
+			st::changePhoneButton),
+		st::settingLocalPasscodeButtonPadding,
+		style::al_top);
 	return button;
 }
 
@@ -261,105 +249,4 @@ void AddSkipInsteadOfError(not_null<Ui::VerticalLayout*> content) {
 	dummy = nullptr;
 }
 
-AbstractStep::AbstractStep(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller)
-: AbstractSection(parent)
-, _controller(controller) {
-}
-
-not_null<Window::SessionController*> AbstractStep::controller() const {
-	return _controller;
-}
-
-Api::CloudPassword &AbstractStep::cloudPassword() {
-	return _controller->session().api().cloudPassword();
-}
-
-rpl::producer<AbstractStep::Types> AbstractStep::removeTypes() {
-	return rpl::never<Types>();
-}
-
-void AbstractStep::showBack() {
-	_showBack.fire({});
-}
-
-void AbstractStep::showOther(Type type) {
-	_showOther.fire_copy(type);
-}
-
-void AbstractStep::setFocusCallback(Fn<void()> callback) {
-	_setInnerFocusCallback = callback;
-}
-
-rpl::producer<> AbstractStep::showFinishes() const {
-	return _showFinished.events();
-}
-
-void AbstractStep::showFinished() {
-	_showFinished.fire({});
-}
-
-void AbstractStep::setInnerFocus() {
-	if (_setInnerFocusCallback) {
-		_setInnerFocusCallback();
-	}
-}
-
-bool AbstractStep::isPasswordInvalidError(const QString &type) {
-	if (type == u"PASSWORD_HASH_INVALID"_q
-		|| type == u"SRP_PASSWORD_CHANGED"_q) {
-
-		// Most likely the cloud password has been changed on another device.
-		// Quit.
-		_quits.fire(AbstractStep::Types{
-			CloudPasswordStartId(),
-			CloudPasswordInputId(),
-			CloudPasswordHintId(),
-			CloudPasswordEmailId(),
-			CloudPasswordEmailConfirmId(),
-			CloudPasswordManageId(),
-		});
-		controller()->show(
-			Ui::MakeInformBox(tr::lng_cloud_password_expired()),
-			Ui::LayerOption::CloseOther);
-		setStepData(StepData());
-		showBack();
-		return true;
-	}
-	return false;
-}
-
-rpl::producer<Type> AbstractStep::sectionShowOther() {
-	return _showOther.events();
-}
-
-rpl::producer<> AbstractStep::sectionShowBack() {
-	return _showBack.events();
-}
-
-rpl::producer<std::vector<Type>> AbstractStep::removeFromStack() {
-	return rpl::merge(removeTypes(), _quits.events());
-}
-
-void AbstractStep::setStepDataReference(std::any &data) {
-	_stepData = &data;
-}
-
-StepData AbstractStep::stepData() const {
-	if (!_stepData || !_stepData->has_value()) {
-		StepData();
-	}
-	const auto my = std::any_cast<StepData>(_stepData);
-	return my ? (*my) : StepData();
-}
-
-void AbstractStep::setStepData(StepData data) {
-	if (_stepData) {
-		*_stepData = data;
-	}
-}
-
-AbstractStep::~AbstractStep() = default;
-
 } // namespace Settings::CloudPassword
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.h b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.h
index 95d8cca5d4f964..d45bb81c173700 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.h
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.h
@@ -7,12 +7,10 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "settings/settings_common_session.h"
+#include "ui/text/text_variant.h"
 #include "ui/widgets/box_content_divider.h"
 
 namespace Ui {
-template <typename Widget>
-class CenterWrap;
 class FlatLabel;
 class InputField;
 class LinkButton;
@@ -34,6 +32,7 @@ struct StepData {
 	QString email;
 	int unconfirmedEmailLengthCode;
 	bool setOnlyRecoveryEmail = false;
+	bool suggestionValidate = false;
 
 	struct ProcessRecover {
 		bool setNewPassword = false;
@@ -43,21 +42,24 @@ struct StepData {
 	ProcessRecover processRecover;
 };
 
-void SetupAutoCloseTimer(rpl::lifetime &lifetime, Fn<void()> callback);
+void SetupAutoCloseTimer(
+	rpl::lifetime &lifetime,
+	Fn<void()> callback,
+	Fn<crl::time()> lastNonIdleTime);
 
 void SetupHeader(
 	not_null<Ui::VerticalLayout*> content,
 	const QString &lottie,
 	rpl::producer<> &&showFinished,
 	rpl::producer<QString> &&subtitle,
-	rpl::producer<QString> &&about);
+	v::text::data &&about);
 
 [[nodiscard]] not_null<Ui::PasswordInput*> AddPasswordField(
 	not_null<Ui::VerticalLayout*> content,
 	rpl::producer<QString> &&placeholder,
 	const QString &text);
 
-[[nodiscard]] not_null<Ui::CenterWrap<Ui::InputField>*> AddWrappedField(
+[[nodiscard]] not_null<Ui::InputField*> AddWrappedField(
 	not_null<Ui::VerticalLayout*> content,
 	rpl::producer<QString> &&placeholder,
 	const QString &text);
@@ -71,14 +73,15 @@ void SetupHeader(
 	rpl::producer<QString> &&text);
 
 [[nodiscard]] not_null<Ui::LinkButton*> AddLinkButton(
-	not_null<Ui::CenterWrap<Ui::InputField>*> wrap,
+	not_null<Ui::InputField*> input,
 	rpl::producer<QString> &&text);
 
 void AddSkipInsteadOfField(not_null<Ui::VerticalLayout*> content);
 void AddSkipInsteadOfError(not_null<Ui::VerticalLayout*> content);
 
 struct BottomButton {
-	QPointer<Ui::RpWidget> content;
+	base::weak_qptr<Ui::RpWidget> content;
+	base::weak_qptr<Ui::RpWidget> button;
 	rpl::producer<bool> isBottomFillerShown;
 };
 
@@ -102,73 +105,5 @@ class OneEdgeBoxContentDivider : public Ui::BoxContentDivider {
 
 };
 
-class AbstractStep : public AbstractSection {
-public:
-	using Types = std::vector<Type>;
-	AbstractStep(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller);
-	~AbstractStep();
-
-	void showFinished() override final;
-	void setInnerFocus() override final;
-	[[nodiscard]] rpl::producer<Type> sectionShowOther() override final;
-	[[nodiscard]] rpl::producer<> sectionShowBack() override final;
-
-	[[nodiscard]] rpl::producer<Types> removeFromStack() override final;
-
-	void setStepDataReference(std::any &data) override;
-
-protected:
-	[[nodiscard]] not_null<Window::SessionController*> controller() const;
-	[[nodiscard]] Api::CloudPassword &cloudPassword();
-
-	[[nodiscard]] virtual rpl::producer<Types> removeTypes();
-
-	bool isPasswordInvalidError(const QString &type);
-
-	void showBack();
-	void showOther(Type type);
-
-	void setFocusCallback(Fn<void()> callback);
-
-	[[nodiscard]] rpl::producer<> showFinishes() const;
-
-	StepData stepData() const;
-	void setStepData(StepData data);
-
-private:
-	const not_null<Window::SessionController*> _controller;
-
-	Fn<void()> _setInnerFocusCallback;
-
-	rpl::event_stream<> _showFinished;
-	rpl::event_stream<Type> _showOther;
-	rpl::event_stream<> _showBack;
-	rpl::event_stream<Types> _quits;
-
-	std::any *_stepData;
-
-};
-
-template <typename SectionType>
-class TypedAbstractStep : public AbstractStep {
-public:
-	using AbstractStep::AbstractStep;
-
-	void setStepDataReference(std::any &data) override final {
-		AbstractStep::setStepDataReference(data);
-		static_cast<SectionType*>(this)->setupContent();
-	}
-
-	[[nodiscard]] static Type Id() {
-		return SectionFactory<SectionType>::Instance();
-	}
-	[[nodiscard]] Type id() const final override {
-		return Id();
-	}
-
-};
-
 } // namespace Settings::CloudPassword
 
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email.cpp
index aead318d0a296e..8406b213dfeb10 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email.cpp
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 #include "settings/cloud_password/settings_cloud_password_common.h"
 #include "settings/cloud_password/settings_cloud_password_email_confirm.h"
 #include "settings/cloud_password/settings_cloud_password_manage.h"
+#include "settings/cloud_password/settings_cloud_password_step.h"
 #include "ui/vertical_list.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/widgets/buttons.h"
@@ -83,14 +84,13 @@ void Email::setupContent() {
 
 	Ui::AddSkip(content, st::settingLocalPasscodeDescriptionBottomSkip);
 
-	const auto wrap = AddWrappedField(
+	const auto newInput = AddWrappedField(
 		content,
 		tr::lng_cloud_password_email(),
 		currentStepDataEmail);
-	const auto newInput = wrap->entity();
 	const auto error = AddError(content, nullptr);
 	newInput->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		error->hide();
 	}, newInput->lifetime());
 	AddSkipInsteadOfField(content);
@@ -108,7 +108,7 @@ void Email::setupContent() {
 				data.hint,
 				!data.email.isEmpty(),
 				data.email)
-		) | rpl::start_with_next_error_done([=](Api::CloudPassword::SetOk d) {
+		) | rpl::on_next_error_done([=](Api::CloudPassword::SetOk d) {
 			_requestLifetime.destroy();
 
 			auto data = stepData();
@@ -168,7 +168,7 @@ void Email::setupContent() {
 	};
 
 	const auto skip = AddLinkButton(
-		wrap,
+		newInput,
 		tr::lng_cloud_password_skip_email());
 	skip->setClickedCallback([=] {
 		confirm(QString());
@@ -189,7 +189,7 @@ void Email::setupContent() {
 	});
 
 	const auto submit = [=] { button->clicked({}, Qt::LeftButton); };
-	newInput->submits() | rpl::start_with_next(submit, newInput->lifetime());
+	newInput->submits() | rpl::on_next(submit, newInput->lifetime());
 
 	setFocusCallback([=] { newInput->setFocus(); });
 
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp
index b1879387e87c59..d5628d378e965e 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp
@@ -19,9 +19,11 @@ For license and copyright information please follow this link:
 #include "settings/cloud_password/settings_cloud_password_input.h"
 #include "settings/cloud_password/settings_cloud_password_manage.h"
 #include "settings/cloud_password/settings_cloud_password_start.h"
+#include "settings/cloud_password/settings_cloud_password_step.h"
 #include "ui/vertical_list.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/sent_code_field.h"
@@ -122,7 +124,7 @@ void EmailConfirm::setupContent() {
 		return;
 	}
 	cloudPassword().state(
-	) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
+	) | rpl::on_next([=](const Core::CloudPasswordState &state) {
 		if (!_requestLifetime
 			&& state.unconfirmedPattern.isEmpty()
 			&& recoverEmailPattern.isEmpty()) {
@@ -138,13 +140,14 @@ void EmailConfirm::setupContent() {
 		state->unconfirmedPattern.isEmpty()
 			? tr::lng_settings_cloud_password_email_recovery_subtitle()
 			: tr::lng_cloud_password_confirm(),
-		rpl::single(
-			tr::lng_cloud_password_waiting_code(
-				tr::now,
-				lt_email,
-				state->unconfirmedPattern.isEmpty()
-					? recoverEmailPattern
-					: state->unconfirmedPattern)));
+		tr::lng_cloud_password_waiting_code(
+			lt_email,
+			rpl::single(
+				Ui::Text::WrapEmailPattern(
+					state->unconfirmedPattern.isEmpty()
+						? recoverEmailPattern
+						: state->unconfirmedPattern)),
+			TextWithEntities::Simple));
 
 	Ui::AddSkip(content, st::settingLocalPasscodeDescriptionBottomSkip);
 
@@ -152,15 +155,13 @@ void EmailConfirm::setupContent() {
 		content,
 		st::settingLocalPasscodeInputField,
 		tr::lng_change_phone_code_title());
-	const auto newInput = objectInput.data();
-	const auto wrap = content->add(
-		object_ptr<Ui::CenterWrap<Ui::InputField>>(
-			content,
-			std::move(objectInput)));
+	const auto newInput = content->add(
+		std::move(objectInput),
+		style::al_top);
 
 	const auto error = AddError(content, nullptr);
 	newInput->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		error->hide();
 	}, newInput->lifetime());
 	AddSkipInsteadOfField(content);
@@ -171,23 +172,25 @@ void EmailConfirm::setupContent() {
 		st::changePhoneLabel);
 	resendInfo->hide();
 	error->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		resendInfo->setGeometry(r);
 	}, resendInfo->lifetime());
 	error->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		if (shown) {
 			resendInfo->hide();
 		}
 	}, resendInfo->lifetime());
 
-	const auto resend = AddLinkButton(wrap, tr::lng_cloud_password_resend());
+	const auto resend = AddLinkButton(
+		newInput,
+		tr::lng_cloud_password_resend());
 	resend->setClickedCallback([=] {
 		if (_requestLifetime) {
 			return;
 		}
 		_requestLifetime = cloudPassword().resendEmailCode(
-		) | rpl::start_with_error_done([=](const QString &type) {
+		) | rpl::on_error_done([=](const QString &type) {
 			_requestLifetime.destroy();
 
 			error->show();
@@ -210,7 +213,7 @@ void EmailConfirm::setupContent() {
 					return;
 				}
 				_requestLifetime = cloudPassword().resetPassword(
-				) | rpl::start_with_next_error_done([=](
+				) | rpl::on_next_error_done([=](
 						Api::CloudPassword::ResetRetryDate retryDate) {
 					_requestLifetime.destroy();
 					const auto left = std::max(
@@ -233,7 +236,7 @@ void EmailConfirm::setupContent() {
 						return s.pendingResetDate != 0;
 					}) | rpl::take(
 						1
-					) | rpl::start_with_next([=](const PasswordState &s) {
+					) | rpl::on_next([=](const PasswordState &s) {
 						const auto left = (s.pendingResetDate
 							- base::unixtime::now());
 						if (left > 0) {
@@ -273,7 +276,7 @@ void EmailConfirm::setupContent() {
 		} else if (!_requestLifetime && recoverEmailPattern.isEmpty()) {
 			_requestLifetime = cloudPassword().confirmEmail(
 				newText
-			) | rpl::start_with_error_done([=](const QString &type) {
+			) | rpl::on_error_done([=](const QString &type) {
 				_requestLifetime.destroy();
 
 				newInput->setFocus();
@@ -310,7 +313,7 @@ void EmailConfirm::setupContent() {
 		} else if (!_requestLifetime) {
 			_requestLifetime = cloudPassword().checkRecoveryEmailAddressCode(
 				newText
-			) | rpl::start_with_error_done([=](const QString &type) {
+			) | rpl::on_error_done([=](const QString &type) {
 				_requestLifetime.destroy();
 
 				newInput->setFocus();
@@ -350,7 +353,7 @@ void EmailConfirm::setupContent() {
 
 	const auto submit = [=] { button->clicked({}, Qt::LeftButton); };
 	newInput->setAutoSubmit(currentStepDataCodeLength, submit);
-	newInput->submits() | rpl::start_with_next(submit, newInput->lifetime());
+	newInput->submits() | rpl::on_next(submit, newInput->lifetime());
 
 	setFocusCallback([=] { newInput->setFocus(); });
 
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_hint.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_hint.cpp
index e690b99051ce9d..8f57cbf63282a5 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_hint.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_hint.cpp
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 #include "settings/cloud_password/settings_cloud_password_common.h"
 #include "settings/cloud_password/settings_cloud_password_email.h"
 #include "settings/cloud_password/settings_cloud_password_manage.h"
+#include "settings/cloud_password/settings_cloud_password_step.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/fields/input_field.h"
@@ -74,14 +75,13 @@ void Hint::setupContent() {
 
 	Ui::AddSkip(content, st::settingLocalPasscodeDescriptionBottomSkip);
 
-	const auto wrap = AddWrappedField(
+	const auto newInput = AddWrappedField(
 		content,
 		tr::lng_cloud_password_hint(),
 		currentStepDataHint);
-	const auto newInput = wrap->entity();
 	const auto error = AddError(content, nullptr);
 	newInput->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		error->hide();
 	}, newInput->lifetime());
 	AddSkipInsteadOfField(content);
@@ -95,7 +95,7 @@ void Hint::setupContent() {
 				currentStepData.processRecover.checkedCode,
 				currentStepData.password,
 				hint
-			) | rpl::start_with_error_done([=](const QString &type) {
+			) | rpl::on_error_done([=](const QString &type) {
 				_requestLifetime.destroy();
 
 				error->show();
@@ -121,7 +121,7 @@ void Hint::setupContent() {
 	};
 
 	AddLinkButton(
-		wrap,
+		newInput,
 		tr::lng_settings_cloud_password_skip_hint()
 	)->setClickedCallback([=] {
 		save(QString());
@@ -144,7 +144,7 @@ void Hint::setupContent() {
 	});
 
 	const auto submit = [=] { button->clicked({}, Qt::LeftButton); };
-	newInput->submits() | rpl::start_with_next(submit, newInput->lifetime());
+	newInput->submits() | rpl::on_next(submit, newInput->lifetime());
 
 	setFocusCallback([=] { newInput->setFocus(); });
 
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
index fc16b817998ace..ba1c7738aeabe1 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
@@ -12,19 +12,26 @@ For license and copyright information please follow this link:
 #include "base/timer.h"
 #include "base/unixtime.h"
 #include "core/core_cloud_password.h"
+#include "data/components/promo_suggestions.h"
 #include "lang/lang_keys.h"
 #include "lottie/lottie_icon.h"
+#include "main/main_session.h"
 #include "settings/cloud_password/settings_cloud_password_common.h"
 #include "settings/cloud_password/settings_cloud_password_email_confirm.h"
 #include "settings/cloud_password/settings_cloud_password_hint.h"
 #include "settings/cloud_password/settings_cloud_password_manage.h"
+#include "settings/cloud_password/settings_cloud_password_step.h"
+#include "settings/cloud_password/settings_cloud_password_validate_icon.h"
+#include "ui/boxes/boost_box.h" // Ui::StartFireworks.
 #include "ui/boxes/confirm_box.h"
+#include "ui/rect.h"
 #include "ui/text/format_values.h"
+#include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/fields/password_input.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/vertical_layout.h"
-#include "ui/vertical_list.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
@@ -52,6 +59,10 @@ Available actions for follow states.
 – Continue to RecreateResetHint.
 – Clear password and Back to Settings.
 – Back to Settings.
+
+ValidatePassword:
+- Submit to show good validate.
+- Back to Main Settings.
 */
 
 namespace Settings {
@@ -71,9 +82,7 @@ Icon CreateInteractiveLottieIcon(
 	const auto raw = object.data();
 
 	const auto width = descriptor.sizeOverride.width();
-	raw->resize(QRect(
-		QPoint(),
-		descriptor.sizeOverride).marginsAdded(padding).size());
+	raw->resize((Rect(descriptor.sizeOverride) + padding).size());
 
 	auto owned = Lottie::MakeIcon(std::move(descriptor));
 	const auto icon = owned.get();
@@ -81,7 +90,7 @@ Icon CreateInteractiveLottieIcon(
 	raw->lifetime().add([kept = std::move(owned)]{});
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		const auto left = (raw->width() - width) / 2;
 		icon->paint(p, left, padding.top());
@@ -101,7 +110,7 @@ Icon CreateInteractiveLottieIcon(
 	rpl::merge(
 		content->geometryValue(),
 		input->geometryValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto topLeft = input->mapTo(content, input->pos());
 		button->moveToLeft(
 			input->pos().x(),
@@ -117,7 +126,10 @@ class Input : public TypedAbstractStep<Input> {
 	using TypedAbstractStep::TypedAbstractStep;
 
 	[[nodiscard]] rpl::producer<QString> title() override;
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToTop(
+		not_null<QWidget*> parent) override;
 	void setupContent();
+	void setupValidateGood();
 
 protected:
 	[[nodiscard]] rpl::producer<std::vector<Type>> removeTypes() override;
@@ -129,6 +141,8 @@ class Input : public TypedAbstractStep<Input> {
 		not_null<Ui::FlatLabel*> info,
 		Fn<void()> recoverCallback);
 
+	QWidget *_parent = nullptr;
+
 	rpl::variable<std::vector<Type>> _removesFromStack;
 	rpl::lifetime _requestLifetime;
 
@@ -142,12 +156,55 @@ rpl::producer<QString> Input::title() {
 	return tr::lng_settings_cloud_password_password_title();
 }
 
+base::weak_qptr<Ui::RpWidget> Input::createPinnedToTop(
+		not_null<QWidget*> parent) {
+	_parent = parent;
+	return nullptr;
+}
+
+void Input::setupValidateGood() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	if (_parent) {
+		Ui::StartFireworks(_parent);
+	}
+
+	if (auto owned = CreateValidateGoodIcon(&controller()->session())) {
+		content->add(
+			std::move(owned),
+			QMargins(0, st::lineWidth * 75, 0, 0));
+	}
+
+	SetupHeader(
+		content,
+		QString(),
+		rpl::never<>(),
+		tr::lng_settings_suggestion_password_step_finish_title(),
+		tr::lng_settings_suggestion_password_step_finish_about());
+
+	const auto button = AddDoneButton(content, tr::lng_share_done());
+	button->setClickedCallback([=] {
+		showBack();
+	});
+
+	Ui::ToggleChildrenVisibility(this, true);
+	Ui::ResizeFitChild(this, content);
+	content->resizeToWidth(width());
+	Ui::SendPendingMoveResizeEvents(content);
+}
+
 void Input::setupContent() {
+	if (QWidget::children().count() > 0) {
+		return;
+	}
+
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
 	auto currentStepData = stepData();
 	const auto currentStepDataPassword = base::take(currentStepData.password);
 	const auto currentStepProcessRecover = base::take(
 		currentStepData.processRecover);
+	const auto currentStepValidate = base::take(
+		currentStepData.suggestionValidate);
 	setStepData(currentStepData);
 
 	const auto currentState = cloudPassword().stateCurrent();
@@ -166,11 +223,10 @@ void Input::setupContent() {
 	const auto icon = CreateInteractiveLottieIcon(
 		content,
 		{
-			.name = u"cloud_password/password_input"_q,
-			.sizeOverride = {
-				st::settingsCloudPasswordIconSize,
-				st::settingsCloudPasswordIconSize
-			},
+			.name = currentStepValidate
+				? u"cloud_password/validate"_q
+				: u"cloud_password/password_input"_q,
+			.sizeOverride = Size(st::settingsCloudPasswordIconSize),
 		},
 		st::settingLocalPasscodeIconPadding);
 
@@ -178,21 +234,27 @@ void Input::setupContent() {
 		content,
 		QString(),
 		rpl::never<>(),
-		isCheck
+		currentStepValidate
+			? tr::lng_settings_suggestion_password_step_input_title()
+			: isCheck
 			? tr::lng_settings_cloud_password_check_subtitle()
 			: hasPassword
 			? tr::lng_settings_cloud_password_manage_password_change()
 			: tr::lng_settings_cloud_password_password_subtitle(),
-		tr::lng_cloud_password_about());
+		currentStepValidate
+			? tr::lng_settings_suggestion_password_step_input_about()
+			: isCheck
+			? tr::lng_settings_cloud_password_manage_about1()
+			: tr::lng_cloud_password_about());
 
 	Ui::AddSkip(content, st::settingLocalPasscodeDescriptionBottomSkip);
 
 	const auto newInput = AddPasswordField(
 		content,
-		isCheck
+		(isCheck
 			? tr::lng_cloud_password_enter_old()
-			: tr::lng_cloud_password_enter_new(),
-			currentStepDataPassword);
+			: tr::lng_cloud_password_enter_new()),
+		currentStepDataPassword);
 	const auto reenterInput = isCheck
 		? (Ui::PasswordInput*)(nullptr)
 		: AddPasswordField(
@@ -215,12 +277,15 @@ void Input::setupContent() {
 			tr::lng_signin_hint(tr::now, lt_password_hint, hint),
 			st::defaultFlatLabel);
 		hintInfo->setVisible(!hint.isEmpty());
-		error->geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
-			hintInfo->setGeometry(r);
+		rpl::combine(
+			error->geometryValue(),
+			newInput->geometryValue()
+		) | rpl::on_next([=](QRect r, QRect input) {
+			hintInfo->resizeToWidth(input.width());
+			hintInfo->moveToLeft(input.x(), r.y());
 		}, hintInfo->lifetime());
 		error->shownValue(
-		) | rpl::start_with_next([=](bool shown) {
+		) | rpl::on_next([=](bool shown) {
 			if (shown) {
 				hintInfo->hide();
 			} else {
@@ -238,7 +303,7 @@ void Input::setupContent() {
 			}
 			if (state->hasRecovery) {
 				_requestLifetime = cloudPassword().requestPasswordRecovery(
-				) | rpl::start_with_next_error([=](const QString &pattern) {
+				) | rpl::on_next_error([=](const QString &pattern) {
 					_requestLifetime.destroy();
 
 					auto data = stepData();
@@ -263,7 +328,7 @@ void Input::setupContent() {
 					}
 					close();
 					_requestLifetime = cloudPassword().resetPassword(
-					) | rpl::start_with_next_error_done([=](
+					) | rpl::on_next_error_done([=](
 							Api::CloudPassword::ResetRetryDate retryDate) {
 						_requestLifetime.destroy();
 						const auto left = std::max(
@@ -296,7 +361,7 @@ void Input::setupContent() {
 			QString(),
 			st::boxDividerLabel);
 		recover->geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			resetInfo->moveToLeft(r.x(), r.y() + st::passcodeTextLine);
 		}, resetInfo->lifetime());
 
@@ -316,7 +381,7 @@ void Input::setupContent() {
 				currentStepProcessRecover.checkedCode,
 				QString(),
 				QString()
-			) | rpl::start_with_error_done([=](const QString &type) {
+			) | rpl::on_error_done([=](const QString &type) {
 				_requestLifetime.destroy();
 
 				error->show();
@@ -337,7 +402,9 @@ void Input::setupContent() {
 		Ui::AddSkip(content);
 	}
 
-	if (!newInput->text().isEmpty()) {
+	if (currentStepValidate) {
+		icon.icon->animate(icon.update, 0, icon.icon->framesCount() - 1);
+	} else if (!newInput->text().isEmpty()) {
 		icon.icon->jumpTo(icon.icon->framesCount() / 2, icon.update);
 	}
 
@@ -347,7 +414,7 @@ void Input::setupContent() {
 		}
 		_requestLifetime = cloudPassword().check(
 			pass
-		) | rpl::start_with_error_done([=](const QString &type) {
+		) | rpl::on_error_done([=](const QString &type) {
 			_requestLifetime.destroy();
 
 			newInput->setFocus();
@@ -369,14 +436,22 @@ void Input::setupContent() {
 				if (state->pendingResetDate > 0) {
 					auto lifetime = rpl::lifetime();
 					lifetime = cloudPassword().cancelResetPassword(
-					) | rpl::start_with_next([] {});
+					) | rpl::on_next([] {});
 				}
 			}
 
-			auto data = stepData();
-			data.currentPassword = pass;
-			setStepData(std::move(data));
-			showOther(CloudPasswordManageId());
+			if (currentStepValidate) {
+				controller()->session().promoSuggestions().dismiss(
+					Data::PromoSuggestions::SugValidatePassword());
+				setupValidateGood();
+				delete content;
+			} else {
+				auto data = stepData();
+				data.currentPassword = pass;
+				setStepData(std::move(data));
+				showOther(CloudPasswordManageId());
+			}
+
 		});
 	};
 
@@ -409,17 +484,19 @@ void Input::setupContent() {
 		}
 	});
 
-	base::qt_signal_producer(
-		newInput.get(),
-		&QLineEdit::textChanged // Covers Undo.
-	) | rpl::map([=] {
-		return newInput->text().isEmpty();
-	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool empty) {
-		const auto from = icon.icon->frameIndex();
-		const auto to = empty ? 0 : (icon.icon->framesCount() / 2 - 1);
-		icon.icon->animate(icon.update, from, to);
-	}, content->lifetime());
+	if (!currentStepValidate) {
+		base::qt_signal_producer(
+			newInput.get(),
+			&QLineEdit::textChanged // Covers Undo.
+		) | rpl::map([=] {
+			return newInput->text().isEmpty();
+		}) | rpl::distinct_until_changed(
+		) | rpl::on_next([=](bool empty) {
+			const auto from = icon.icon->frameIndex();
+			const auto to = empty ? 0 : (icon.icon->framesCount() / 2 - 1);
+			icon.icon->animate(icon.update, from, to);
+		}, content->lifetime());
+	}
 
 	const auto submit = [=] {
 		if (!reenterInput || reenterInput->hasFocus()) {
@@ -434,7 +511,7 @@ void Input::setupContent() {
 		QObject::connect(reenterInput, &MaskedInputField::submitted, submit);
 	}
 
-	setFocusCallback([=] {
+	setFocusCallback(crl::guard(content, [=] {
 		if (isCheck || newInput->text().isEmpty()) {
 			newInput->setFocus();
 		} else if (reenterInput->text().isEmpty()) {
@@ -442,7 +519,7 @@ void Input::setupContent() {
 		} else {
 			newInput->setFocus();
 		}
-	});
+	}));
 
 	Ui::ResizeFitChild(this, content);
 }
@@ -487,7 +564,7 @@ void Input::setupRecoverButton(
 	updateStatus();
 
 	state->status.value(
-	) | rpl::start_with_next([=](const Status &status) {
+	) | rpl::on_next([=](const Status &status) {
 		switch (status.suggest) {
 		case Status::SuggestAction::Recover: {
 			info->setText(QString());
@@ -510,7 +587,7 @@ void Input::setupRecoverButton(
 	}, container->lifetime());
 
 	cloudPassword().state(
-	) | rpl::start_with_next([=](const Core::CloudPasswordState &passState) {
+	) | rpl::on_next([=](const Core::CloudPasswordState &passState) {
 		updateStatus();
 		state->timer.cancel();
 		if (passState.pendingResetDate) {
@@ -534,7 +611,7 @@ void Input::setupRecoverButton(
 				}
 				close();
 				_requestLifetime = cloudPassword().cancelResetPassword(
-				) | rpl::start_with_error_done([=](const QString &error) {
+				) | rpl::on_error_done([=](const QString &error) {
 					_requestLifetime.destroy();
 				}, [=] {
 					_requestLifetime.destroy();
@@ -548,7 +625,7 @@ void Input::setupRecoverButton(
 			}));
 		} else if (suggest == Status::SuggestAction::Reset) {
 			_requestLifetime = cloudPassword().resetPassword(
-			) | rpl::start_with_next_error_done([=](
+			) | rpl::on_next_error_done([=](
 					Api::CloudPassword::ResetRetryDate retryDate) {
 				_requestLifetime.destroy();
 				const auto left = std::max(
@@ -571,7 +648,7 @@ void Input::setupRecoverButton(
 					return !s.hasPassword;
 				}) | rpl::take(
 					1
-				) | rpl::start_with_next([=](const PasswordState &s) {
+				) | rpl::on_next([=](const PasswordState &s) {
 					_requestLifetime.destroy();
 					controller()->show(Ui::MakeInformBox(
 						tr::lng_cloud_password_removed()));
@@ -583,10 +660,33 @@ void Input::setupRecoverButton(
 	});
 }
 
+class SuggestionInput : public Input {
+public:
+	SuggestionInput(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller)
+	: Input(parent, controller)
+	, _stepData(StepData{ .suggestionValidate = true }) {
+		setStepDataReference(_stepData);
+	}
+
+	[[nodiscard]] static Type Id() {
+		return SectionFactory<SuggestionInput>::Instance();
+	}
+
+private:
+	std::any _stepData;
+
+};
+
 } // namespace CloudPassword
 
 Type CloudPasswordInputId() {
 	return CloudPassword::Input::Id();
 }
 
+Type CloudPasswordSuggestionInputId() {
+	return CloudPassword::SuggestionInput::Id();
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.h b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.h
index 1103047df4e857..0c1ae4f89cd6bf 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.h
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.h
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 namespace Settings {
 
 Type CloudPasswordInputId();
+Type CloudPasswordSuggestionInputId();
 
 } // namespace Settings
 
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.cpp
new file mode 100644
index 00000000000000..e22f83cd7a4d40
--- /dev/null
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.cpp
@@ -0,0 +1,175 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/cloud_password/settings_cloud_password_login_email.h"
+
+#include "api/api_cloud_password.h"
+#include "core/core_cloud_password.h"
+#include "info/channel_statistics/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget.
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/cloud_password/settings_cloud_password_common.h"
+#include "settings/cloud_password/settings_cloud_password_login_email_confirm.h"
+#include "settings/cloud_password/settings_cloud_password_manage.h"
+#include "settings/cloud_password/settings_cloud_password_step.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_session_controller.h"
+#include "styles/style_giveaway.h"
+#include "styles/style_layers.h"
+#include "styles/style_settings.h"
+
+namespace Settings {
+namespace CloudPassword {
+
+class LoginEmail : public TypedAbstractStep<LoginEmail> {
+public:
+	using TypedAbstractStep::TypedAbstractStep;
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+	void setupContent();
+
+private:
+	rpl::lifetime _requestLifetime;
+	std::optional<MTP::Sender> _api;
+	rpl::variable<bool> _confirmButtonBusy = false;
+
+};
+
+rpl::producer<QString> LoginEmail::title() {
+	return tr::lng_settings_cloud_login_email_section_title();
+}
+
+void LoginEmail::setupContent() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	auto currentStepData = stepData();
+	const auto newEmail = base::take(currentStepData.email);
+	setStepData(currentStepData);
+
+	SetupHeader(
+		content,
+		u"cloud_password/email"_q,
+		showFinishes(),
+		tr::lng_settings_cloud_login_email_title(),
+		tr::lng_settings_cloud_login_email_about());
+
+	Ui::AddSkip(content, st::settingLocalPasscodeDescriptionBottomSkip);
+
+	const auto newInput = AddWrappedField(
+		content,
+		tr::lng_settings_cloud_login_email_placeholder(),
+		QString());
+	const auto error = AddError(content, nullptr);
+	newInput->changes() | rpl::on_next([=] {
+		error->hide();
+	}, newInput->lifetime());
+	newInput->setText(newEmail);
+	if (newInput->hasText()) {
+		newInput->selectAll();
+	}
+	AddSkipInsteadOfField(content);
+
+	const auto send = [=] {
+		Expects(_api == std::nullopt);
+
+		_confirmButtonBusy = true;
+		_api.emplace(&controller()->session().mtp());
+
+		const auto data = stepData();
+
+		const auto done = [=](int length, const QString &pattern) {
+			_api.reset();
+			_confirmButtonBusy = false;
+			auto data = stepData();
+			data.unconfirmedEmailLengthCode = length;
+			setStepData(std::move(data));
+			showOther(CloudLoginEmailConfirmId());
+		};
+		const auto fail = [=](const QString &type) {
+			_api.reset();
+			_confirmButtonBusy = false;
+
+			if (MTP::IsFloodError(type)) {
+				error->show();
+				error->setText(tr::lng_flood_error(tr::now));
+			} else if (AbstractStep::isPasswordInvalidError(type)) {
+			} else if (type == u"EMAIL_INVALID"_q) {
+				error->show();
+				error->setText(tr::lng_cloud_password_bad_email(tr::now));
+				newInput->setFocus();
+				newInput->showError();
+				newInput->selectAll();
+			} else if (type == u"EMAIL_NOT_SETUP"_q) {
+				error->show();
+				error->setText(Lang::Hard::ServerError());
+				newInput->setFocus();
+				newInput->showError();
+				newInput->selectAll();
+			}
+		};
+
+		Api::RequestLoginEmailCode(*_api, data.email, done, fail);
+	};
+
+	const auto confirm = [=](const QString &email) {
+		if (_confirmButtonBusy.current()) {
+			return;
+		}
+
+		auto data = stepData();
+		data.email = email;
+		setStepData(std::move(data));
+
+		if (!email.isEmpty()) {
+			send();
+			return;
+		}
+	};
+
+	const auto button = AddDoneButton(
+		content,
+		rpl::conditional(
+			_confirmButtonBusy.value(),
+			rpl::single(QString()),
+			tr::lng_settings_cloud_login_email_confirm()));
+	button->setClickedCallback([=] {
+		const auto newText = newInput->getLastText();
+		if (newText.isEmpty()) {
+			newInput->setFocus();
+			newInput->showError();
+		} else {
+			confirm(newText);
+		}
+	});
+	{
+		using namespace Info::Statistics;
+		const auto loadingAnimation = InfiniteRadialAnimationWidget(
+			button,
+			st::giveawayGiftCodeStartButton.height / 2);
+		AddChildToWidgetCenter(button, loadingAnimation);
+		loadingAnimation->showOn(_confirmButtonBusy.value());
+	}
+
+	const auto submit = [=] { button->clicked({}, Qt::LeftButton); };
+	newInput->submits() | rpl::on_next(submit, newInput->lifetime());
+
+	setFocusCallback([=] { newInput->setFocus(); });
+
+	Ui::ResizeFitChild(this, content);
+}
+
+} // namespace CloudPassword
+
+Type CloudLoginEmailId() {
+	return CloudPassword::LoginEmail::Id();
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_credits.h b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.h
similarity index 91%
rename from Telegram/SourceFiles/settings/settings_credits.h
rename to Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.h
index c0e32e1be5e6c3..4076096c145d16 100644
--- a/Telegram/SourceFiles/settings/settings_credits.h
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.h
@@ -11,7 +11,7 @@ For license and copyright information please follow this link:
 
 namespace Settings {
 
-[[nodiscard]] Type CreditsId();
+Type CloudLoginEmailId();
 
 } // namespace Settings
 
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp
new file mode 100644
index 00000000000000..03810ac365835d
--- /dev/null
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp
@@ -0,0 +1,179 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/cloud_password/settings_cloud_password_login_email_confirm.h"
+
+#include "api/api_cloud_password.h"
+#include "apiwrap.h"
+#include "base/unixtime.h"
+#include "core/core_cloud_password.h"
+#include "intro/intro_code_input.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "mainwidget.h"
+#include "settings/cloud_password/settings_cloud_password_common.h"
+#include "settings/cloud_password/settings_cloud_password_login_email.h"
+#include "settings/cloud_password/settings_cloud_password_step.h"
+#include "ui/boxes/boost_box.h" // Ui::StartFireworks.
+#include "ui/boxes/confirm_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/sent_code_field.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+
+/*
+Available actions for follow states.
+
+LoginEmailConfirm from LoginEmail:
+– Continue to Settings.
+– Back to LoginEmail.
+*/
+
+namespace Settings {
+namespace CloudPassword {
+
+class LoginEmailConfirm : public TypedAbstractStep<LoginEmailConfirm> {
+public:
+	using TypedAbstractStep::TypedAbstractStep;
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+	void setupContent();
+
+protected:
+	[[nodiscard]] rpl::producer<std::vector<Type>> removeTypes() override;
+
+private:
+	QString _collectedCode;
+	std::optional<MTP::Sender> _api;
+
+	rpl::event_stream<> _processFinishes;
+
+};
+
+rpl::producer<std::vector<Type>> LoginEmailConfirm::removeTypes() {
+	return _processFinishes.events() | rpl::map([] {
+		return std::vector<Type>{ CloudLoginEmailId() };
+	});
+}
+
+rpl::producer<QString> LoginEmailConfirm::title() {
+	return tr::lng_settings_cloud_login_email_section_title();
+}
+
+void LoginEmailConfirm::setupContent() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+	auto currentStepData = stepData();
+	const auto currentStepDataCodeLength = base::take(
+		currentStepData.unconfirmedEmailLengthCode);
+	const auto newEmail = currentStepData.email;
+	setStepData(currentStepData);
+
+	if (!currentStepDataCodeLength) {
+		setStepData(StepData());
+		showBack();
+		return;
+	}
+	cloudPassword().state(
+	) | rpl::on_next([=](const Core::CloudPasswordState &state) {
+		if (state.loginEmailPattern.isEmpty()) {
+			setStepData(StepData());
+			showBack();
+		}
+	}, lifetime());
+
+	SetupHeader(
+		content,
+		u"cloud_password/email"_q,
+		showFinishes(),
+		tr::lng_settings_cloud_login_email_code_title(),
+		tr::lng_settings_cloud_login_email_code_about(
+			lt_email,
+			rpl::single(Ui::Text::WrapEmailPattern(newEmail)),
+			TextWithEntities::Simple));
+
+	Ui::AddSkip(content, st::settingLocalPasscodeDescriptionBottomSkip);
+
+	const auto newInput = content->add(
+		object_ptr<Ui::CodeInput>(content),
+		style::al_top);
+	newInput->setDigitsCountMax(currentStepDataCodeLength);
+
+	Ui::AddSkip(content);
+	const auto error = AddError(content, nullptr);
+	AddSkipInsteadOfField(content);
+
+	const auto submit = [=] {
+		_api.emplace(&controller()->session().mtp());
+		const auto newText = _collectedCode;
+		if (newText.isEmpty()) {
+			newInput->setFocus();
+			newInput->showError();
+		} else {
+			const auto weak = base::make_weak(controller()->content());
+			const auto done = [=] {
+				_api.reset();
+				_processFinishes.fire({});
+				cloudPassword().reload();
+				setStepData(StepData());
+				showBack();
+				if (const auto strong = weak.get()) {
+					Ui::StartFireworks(strong);
+				}
+			};
+			const auto fail = [=](const QString &type) {
+				_api.reset();
+
+				newInput->setFocus();
+				newInput->showError();
+				error->show();
+
+				if (MTP::IsFloodError(type)) {
+					error->setText(tr::lng_flood_error(tr::now));
+				} else if (type == u"EMAIL_NOT_ALLOWED"_q) {
+					error->setText(
+						tr::lng_settings_error_email_not_alowed(tr::now));
+				} else if (type == u"CODE_INVALID"_q) {
+					error->setText(tr::lng_signin_wrong_code(tr::now));
+				} else if (type == u"EMAIL_HASH_EXPIRED"_q) {
+					// Show box?
+					error->setText(Lang::Hard::EmailConfirmationExpired());
+				} else {
+					error->setText(Lang::Hard::ServerError());
+				}
+			};
+			Api::VerifyLoginEmail(*_api, newText, done, fail);
+		}
+	};
+
+	newInput->codeCollected(
+	) | rpl::on_next([=](const QString &code) {
+		_collectedCode = code;
+		error->hide();
+		submit();
+	}, lifetime());
+
+	setFocusCallback([=] { newInput->setFocus(); });
+
+	Ui::ResizeFitChild(this, content);
+}
+
+} // namespace CloudPassword
+
+Type CloudLoginEmailConfirmId() {
+	return CloudPassword::LoginEmailConfirm::Id();
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.h b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.h
new file mode 100644
index 00000000000000..6acfb5322745ad
--- /dev/null
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.h
@@ -0,0 +1,17 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "settings/settings_type.h"
+
+namespace Settings {
+
+Type CloudLoginEmailConfirmId();
+
+} // namespace Settings
+
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
index 2d273895e6e6b5..b292086e1d06ef 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
@@ -8,14 +8,17 @@ For license and copyright information please follow this link:
 #include "settings/cloud_password/settings_cloud_password_manage.h"
 
 #include "api/api_cloud_password.h"
+#include "core/application.h"
 #include "core/core_cloud_password.h"
 #include "lang/lang_keys.h"
 #include "settings/cloud_password/settings_cloud_password_common.h"
+#include "settings/settings_common.h"
 #include "settings/cloud_password/settings_cloud_password_email_confirm.h"
 #include "settings/cloud_password/settings_cloud_password_email.h"
 #include "settings/cloud_password/settings_cloud_password_hint.h"
 #include "settings/cloud_password/settings_cloud_password_input.h"
 #include "settings/cloud_password/settings_cloud_password_start.h"
+#include "settings/cloud_password/settings_cloud_password_step.h"
 #include "ui/vertical_list.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/widgets/buttons.h"
@@ -51,7 +54,7 @@ class Manage : public TypedAbstractStep<Manage> {
 	[[nodiscard]] rpl::producer<QString> title() override;
 	void setupContent();
 
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToBottom(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) override;
 
 protected:
@@ -64,6 +67,10 @@ class Manage : public TypedAbstractStep<Manage> {
 
 	rpl::lifetime _requestLifetime;
 
+	QPointer<Ui::RpWidget> _changePasswordButton;
+	QPointer<Ui::RpWidget> _changeEmailButton;
+	QPointer<Ui::RpWidget> _disableButton;
+
 };
 
 rpl::producer<QString> Manage::title() {
@@ -97,7 +104,10 @@ void Manage::setupContent() {
 		showBack();
 	};
 
-	SetupAutoCloseTimer(content->lifetime(), quit);
+	SetupAutoCloseTimer(
+		content->lifetime(),
+		quit,
+		[] { return Core::App().lastNonIdleTime(); });
 
 	const auto state = cloudPassword().stateCurrent();
 	if (!state) {
@@ -105,7 +115,7 @@ void Manage::setupContent() {
 		return;
 	}
 	cloudPassword().state(
-	) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
+	) | rpl::on_next([=](const Core::CloudPasswordState &state) {
 		if (!_requestLifetime && !state.hasPassword) {
 			quit();
 		}
@@ -129,22 +139,24 @@ void Manage::setupContent() {
 	});
 
 	Ui::AddSkip(content);
-	AddButtonWithIcon(
+	const auto changePasswordButton = AddButtonWithIcon(
 		content,
 		tr::lng_settings_cloud_password_manage_password_change(),
 		st::settingsButton,
-		{ &st::menuIconPermissions }
-	)->setClickedCallback([=] {
+		{ &st::menuIconPermissions });
+	_changePasswordButton = changePasswordButton;
+	changePasswordButton->setClickedCallback([=] {
 		showOtherAndRememberPassword(CloudPasswordInputId());
 	});
-	AddButtonWithIcon(
+	const auto changeEmailButton = AddButtonWithIcon(
 		content,
 		state->hasRecovery
 			? tr::lng_settings_cloud_password_manage_email_change()
 			: tr::lng_settings_cloud_password_manage_email_new(),
 		st::settingsButton,
-		{ &st::menuIconRecoveryEmail }
-	)->setClickedCallback([=] {
+		{ &st::menuIconRecoveryEmail });
+	_changeEmailButton = changeEmailButton;
+	changeEmailButton->setClickedCallback([=] {
 		auto data = stepData();
 		data.setOnlyRecoveryEmail = true;
 		setStepData(std::move(data));
@@ -153,6 +165,16 @@ void Manage::setupContent() {
 	});
 	Ui::AddSkip(content);
 
+	showFinishes() | rpl::take(1) | rpl::on_next([=] {
+		controller()->checkHighlightControl(
+			u"2sv/change"_q,
+			_changePasswordButton);
+		controller()->checkHighlightControl(
+			u"2sv/change-email"_q,
+			_changeEmailButton);
+		controller()->checkHighlightControl("2sv/disable"_q, _disableButton);
+	}, lifetime());
+
 	using Divider = CloudPassword::OneEdgeBoxContentDivider;
 	const auto divider = Ui::CreateChild<Divider>(this);
 	divider->lower();
@@ -167,19 +189,19 @@ void Manage::setupContent() {
 	rpl::combine(
 		about->geometryValue(),
 		content->widthValue()
-	) | rpl::start_with_next([=](QRect r, int w) {
+	) | rpl::on_next([=](QRect r, int w) {
 		r.setWidth(w);
 		divider->setGeometry(r);
 	}, divider->lifetime());
 	_isBottomFillerShown.value(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		divider->skipEdge(Qt::BottomEdge, shown);
 	}, divider->lifetime());
 
 	Ui::ResizeFitChild(this, content);
 }
 
-QPointer<Ui::RpWidget> Manage::createPinnedToBottom(
+base::weak_qptr<Ui::RpWidget> Manage::createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) {
 
 	const auto disable = [=](Fn<void()> close) {
@@ -192,7 +214,7 @@ QPointer<Ui::RpWidget> Manage::createPinnedToBottom(
 			QString(),
 			false,
 			QString()
-		) | rpl::start_with_error_done([=](const QString &type) {
+		) | rpl::on_error_done([=](const QString &type) {
 			AbstractStep::isPasswordInvalidError(type);
 		}, [=] {
 			setStepData(StepData());
@@ -217,6 +239,7 @@ QPointer<Ui::RpWidget> Manage::createPinnedToBottom(
 		std::move(callback));
 
 	_isBottomFillerShown = base::take(bottomButton.isBottomFillerShown);
+	_disableButton = bottomButton.button.get();
 
 	return bottomButton.content;
 }
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_start.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_start.cpp
index 00fd0f240ce615..e882a3406bff8c 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_start.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_start.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "settings/cloud_password/settings_cloud_password_common.h"
 #include "settings/cloud_password/settings_cloud_password_input.h"
+#include "settings/cloud_password/settings_cloud_password_step.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/vertical_layout.h"
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_step.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_step.cpp
new file mode 100644
index 00000000000000..165c325a8515c5
--- /dev/null
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_step.cpp
@@ -0,0 +1,121 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/cloud_password/settings_cloud_password_step.h"
+
+#include "apiwrap.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/cloud_password/settings_cloud_password_common.h"
+#include "settings/cloud_password/settings_cloud_password_email.h"
+#include "settings/cloud_password/settings_cloud_password_email_confirm.h"
+#include "settings/cloud_password/settings_cloud_password_hint.h"
+#include "settings/cloud_password/settings_cloud_password_input.h"
+#include "settings/cloud_password/settings_cloud_password_manage.h"
+#include "settings/cloud_password/settings_cloud_password_start.h"
+#include "ui/boxes/confirm_box.h"
+#include "window/window_session_controller.h"
+
+namespace Settings::CloudPassword {
+
+AbstractStep::AbstractStep(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: AbstractSection(parent, controller) {
+}
+
+Api::CloudPassword &AbstractStep::cloudPassword() {
+	return controller()->session().api().cloudPassword();
+}
+
+rpl::producer<AbstractStep::Types> AbstractStep::removeTypes() {
+	return rpl::never<Types>();
+}
+
+void AbstractStep::showBack() {
+	_showBack.fire({});
+}
+
+void AbstractStep::showOther(Type type) {
+	_showOther.fire_copy(type);
+}
+
+void AbstractStep::setFocusCallback(Fn<void()> callback) {
+	_setInnerFocusCallback = callback;
+}
+
+rpl::producer<> AbstractStep::showFinishes() const {
+	return _showFinished.events();
+}
+
+void AbstractStep::showFinished() {
+	_showFinished.fire({});
+}
+
+void AbstractStep::setInnerFocus() {
+	if (_setInnerFocusCallback) {
+		_setInnerFocusCallback();
+	}
+}
+
+bool AbstractStep::isPasswordInvalidError(const QString &type) {
+	if (type == u"PASSWORD_HASH_INVALID"_q
+		|| type == u"SRP_PASSWORD_CHANGED"_q) {
+
+		// Most likely the cloud password has been changed on another device.
+		// Quit.
+		_quits.fire(AbstractStep::Types{
+			CloudPasswordStartId(),
+			CloudPasswordInputId(),
+			CloudPasswordHintId(),
+			CloudPasswordEmailId(),
+			CloudPasswordEmailConfirmId(),
+			CloudPasswordManageId(),
+		});
+		controller()->show(
+			Ui::MakeInformBox(tr::lng_cloud_password_expired()),
+			Ui::LayerOption::CloseOther);
+		setStepData(StepData());
+		showBack();
+		return true;
+	}
+	return false;
+}
+
+rpl::producer<Type> AbstractStep::sectionShowOther() {
+	return _showOther.events();
+}
+
+rpl::producer<> AbstractStep::sectionShowBack() {
+	return _showBack.events();
+}
+
+rpl::producer<std::vector<Type>> AbstractStep::removeFromStack() {
+	return rpl::merge(removeTypes(), _quits.events());
+}
+
+void AbstractStep::setStepDataReference(std::any &data) {
+	_stepData = &data;
+}
+
+StepData AbstractStep::stepData() const {
+	if (!_stepData || !_stepData->has_value()) {
+		StepData();
+	}
+	const auto my = std::any_cast<StepData>(_stepData);
+	return my ? (*my) : StepData();
+}
+
+void AbstractStep::setStepData(StepData data) {
+	if (_stepData) {
+		*_stepData = data;
+	}
+}
+
+AbstractStep::~AbstractStep() = default;
+
+} // namespace Settings::CloudPassword
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_step.h b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_step.h
new file mode 100644
index 00000000000000..6fe8332febd7a3
--- /dev/null
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_step.h
@@ -0,0 +1,86 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "settings/settings_common_session.h"
+
+namespace Api {
+class CloudPassword;
+} // namespace Api
+
+namespace Settings::CloudPassword {
+
+struct StepData;
+
+class AbstractStep : public AbstractSection {
+public:
+	using Types = std::vector<Type>;
+	AbstractStep(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+	~AbstractStep();
+
+	void showFinished() override final;
+	void setInnerFocus() override final;
+	[[nodiscard]] rpl::producer<Type> sectionShowOther() override final;
+	[[nodiscard]] rpl::producer<> sectionShowBack() override final;
+
+	[[nodiscard]] rpl::producer<Types> removeFromStack() override final;
+
+	void setStepDataReference(std::any &data) override;
+
+protected:
+	[[nodiscard]] Api::CloudPassword &cloudPassword();
+
+	[[nodiscard]] virtual rpl::producer<Types> removeTypes();
+
+	bool isPasswordInvalidError(const QString &type);
+
+	void showBack();
+	void showOther(Type type);
+
+	void setFocusCallback(Fn<void()> callback);
+
+	[[nodiscard]] rpl::producer<> showFinishes() const;
+
+	StepData stepData() const;
+	void setStepData(StepData data);
+
+private:
+	Fn<void()> _setInnerFocusCallback;
+
+	rpl::event_stream<> _showFinished;
+	rpl::event_stream<Type> _showOther;
+	rpl::event_stream<> _showBack;
+	rpl::event_stream<Types> _quits;
+
+	std::any *_stepData;
+
+};
+
+template <typename SectionType>
+class TypedAbstractStep : public AbstractStep {
+public:
+	using AbstractStep::AbstractStep;
+
+	void setStepDataReference(std::any &data) override final {
+		AbstractStep::setStepDataReference(data);
+		static_cast<SectionType*>(this)->setupContent();
+	}
+
+	[[nodiscard]] static Type Id() {
+		return SectionFactory<SectionType>::Instance();
+	}
+	[[nodiscard]] Type id() const final override {
+		return Id();
+	}
+
+};
+
+} // namespace Settings::CloudPassword
+
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.cpp
new file mode 100644
index 00000000000000..f189cda2d9ab43
--- /dev/null
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.cpp
@@ -0,0 +1,80 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/cloud_password/settings_cloud_password_validate_icon.h"
+
+#include "apiwrap.h"
+#include "base/object_ptr.h"
+#include "chat_helpers/stickers_emoji_pack.h"
+#include "data/data_session.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/stickers/data_stickers.h"
+#include "main/main_session.h"
+#include "ui/rect.h"
+#include "ui/rp_widget.h"
+#include "ui/text/text_custom_emoji.h"
+#include "styles/style_settings.h"
+
+namespace Settings {
+namespace {
+
+[[nodiscard]] DocumentData *EmojiValidateGood(
+		not_null<Main::Session*> session) {
+	auto emoji = TextWithEntities{
+		.text = (QString(QChar(0xD83D)) + QChar(0xDC4D)),
+	};
+	if (const auto e = Ui::Emoji::Find(emoji.text)) {
+		const auto sticker = session->emojiStickersPack().stickerForEmoji(e);
+		return sticker.document;
+	}
+	return nullptr;
+}
+
+} // namespace
+
+object_ptr<Ui::RpWidget> CreateValidateGoodIcon(
+		not_null<Main::Session*> session) {
+	const auto document = EmojiValidateGood(session);
+	if (!document) {
+		return nullptr;
+	}
+
+	auto owned = object_ptr<Ui::RpWidget>((QWidget*)nullptr);
+	const auto widget = owned.data();
+
+	struct State {
+		std::unique_ptr<Ui::Text::CustomEmoji> emoji;
+	};
+	const auto state = widget->lifetime().make_state<State>();
+	const auto size = st::settingsCloudPasswordIconSize;
+	const auto padding = st::settingLocalPasscodeIconPadding;
+	state->emoji = MakeWrappedEmoji<Ui::Text::LimitedLoopsEmoji>(
+		session->data().customEmojiManager().create(
+			document,
+			[=] { widget->update(); },
+			Data::CustomEmojiManager::SizeTag::Normal,
+			size),
+		1,
+		true);
+	widget->paintRequest() | rpl::on_next([=] {
+		if (!state->emoji) {
+			return;
+		}
+		auto p = QPainter(widget);
+		const auto left = (widget->width() - size) / 2;
+		state->emoji->paint(p, Ui::Text::CustomEmojiPaintContext{
+			.textColor = st::windowFg->c,
+			.now = crl::now(),
+			.position = QPoint(left, padding.top()),
+		});
+	}, widget->lifetime());
+	widget->resize((Rect(Size(size)) + padding).size());
+
+	return owned;
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.h b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.h
similarity index 52%
rename from Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.h
rename to Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.h
index f22e4e80199fa5..54280d7360ea0a 100644
--- a/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.h
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.h
@@ -7,8 +7,6 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "core/ui_integration.h" // Core::MarkedTextContext.
-
 template <typename Object>
 class object_ptr;
 
@@ -16,20 +14,14 @@ namespace Main {
 class Session;
 } // namespace Main
 
-namespace style {
-struct FlatLabel;
-} // namespace style
-
 namespace Ui {
-class FlatLabel;
+class RpWidget;
 } // namespace Ui
 
-namespace Ui {
+namespace Settings {
 
-[[nodiscard]] object_ptr<Ui::FlatLabel> CreateLabelWithCustomEmoji(
-	QWidget *parent,
-	rpl::producer<TextWithEntities> &&text,
-	Core::MarkedTextContext context,
-	const style::FlatLabel &st);
+[[nodiscard]] object_ptr<Ui::RpWidget> CreateValidateGoodIcon(
+	not_null<Main::Session*> session);
+
+} // namespace Settings
 
-} // namespace Ui
diff --git a/Telegram/SourceFiles/settings/detailed_settings_button.cpp b/Telegram/SourceFiles/settings/detailed_settings_button.cpp
new file mode 100644
index 00000000000000..ffaf8e19bb2eee
--- /dev/null
+++ b/Telegram/SourceFiles/settings/detailed_settings_button.cpp
@@ -0,0 +1,306 @@
+#include "settings/detailed_settings_button.h"
+
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "ui/wrap/vertical_layout.h"
+#include "styles/style_settings.h"
+
+DetailedSettingsButton::DetailedSettingsButton(
+	QWidget *parent,
+	rpl::producer<QString> title,
+	rpl::producer<QString> description,
+	Settings::IconDescriptor icon,
+	rpl::producer<bool> toggled,
+	const style::DetailedSettingsButtonStyle &rowStyle)
+: Ui::RippleButton(parent, rowStyle.button.ripple)
+, _style(rowStyle)
+, _title(0)
+, _description(0)
+, _toggle(std::make_unique<Ui::ToggleView>(
+	_style.button.toggle,
+	false,
+	[this] { rtlupdate(toggleRect()); }))
+, _iconForeground(icon.icon)
+, _iconBackground(icon.background)
+, _iconBackgroundBrush(std::move(icon.backgroundBrush)) {
+	std::move(
+		title
+	) | rpl::on_next([=](const QString &text) {
+		_title.setText(
+			_style.button.style,
+			text,
+			kDefaultTextOptions);
+		accessibilityNameChanged();
+		refreshLayout();
+	}, lifetime());
+	std::move(
+		description
+	) | rpl::on_next([=](const QString &text) {
+		_description.setText(
+			_style.description.style,
+			text,
+			kDefaultTextOptions);
+		refreshLayout();
+	}, lifetime());
+	addClickHandler([=] {
+		if (!_toggleLocked) {
+			_toggle->setChecked(!_toggle->checked(), anim::type::normal);
+		}
+	});
+	std::move(
+		toggled
+	) | rpl::on_next([=](bool checked) {
+		_toggle->setChecked(checked, anim::type::normal);
+	}, lifetime());
+	_toggle->checkedChanges() | rpl::on_next([=] {
+		accessibilityStateChanged({ .checked = true });
+	}, lifetime());
+	widthValue() | rpl::on_next([=](int width) {
+		if (width > 0) {
+			refreshLayout();
+		}
+	}, lifetime());
+}
+
+QString DetailedSettingsButton::accessibilityName() {
+	return _title.toString();
+}
+
+Ui::AccessibilityState DetailedSettingsButton::accessibilityState() const {
+	return { .checkable = true, .checked = _toggle->checked() };
+}
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+QAccessible::Role DetailedSettingsButton::accessibilityRole() {
+	return QAccessible::Role::Switch;
+}
+#endif
+
+bool DetailedSettingsButton::toggled() const {
+	return _toggle->checked();
+}
+
+rpl::producer<bool> DetailedSettingsButton::toggledChanges() const {
+	return _toggle->checkedChanges();
+}
+
+rpl::producer<not_null<QEvent*>>
+DetailedSettingsButton::clickAreaEvents() const {
+	return events();
+}
+
+void DetailedSettingsButton::setToggleLocked(bool locked) {
+	_toggleLocked = locked;
+	_toggle->setLocked(locked);
+}
+
+void DetailedSettingsButton::finishAnimating() {
+	_toggle->finishAnimating();
+}
+
+void DetailedSettingsButton::onStateChanged(
+		State was,
+		StateChangeSource source) {
+	const auto wasDisabled = !!(was & StateFlag::Disabled);
+	const auto nowDisabled = isDisabled();
+	if (!nowDisabled || !isDown()) {
+		RippleButton::onStateChanged(was, source);
+	}
+	_toggle->setStyle(
+		isOver()
+			? _style.button.toggleOver
+			: _style.button.toggle);
+	if (nowDisabled != wasDisabled) {
+		setPointerCursor(!nowDisabled);
+	}
+	update();
+}
+
+void DetailedSettingsButton::paintEvent(QPaintEvent *e) {
+	auto p = Painter(this);
+	const auto over = isOver() || isDown();
+	p.fillRect(
+		e->rect(),
+		over ? _style.button.textBgOver : _style.button.textBg);
+	paintRipple(p, 0, 0);
+
+	paintIcon(p);
+
+	p.setPen(over
+		? _style.button.textFgOver
+		: _style.button.textFg);
+	_title.drawLeftElided(
+		p,
+		_style.button.padding.left(),
+		titleTop(),
+		_titleWidth,
+		width());
+	p.setPen(_style.description.textFg);
+	if (_descriptionHeight > 0) {
+		_description.drawLeft(
+			p,
+			_style.button.padding.left(),
+			_descriptionTop,
+			_descriptionWidth,
+			width());
+	}
+
+	const auto toggle = toggleRect();
+	_toggle->paint(p, toggle.left(), toggle.top(), width());
+}
+
+int DetailedSettingsButton::resizeGetHeight(int newWidth) {
+	_titleWidth = textAvailableWidth(newWidth);
+	_descriptionWidth
+		= std::max(1, _titleWidth - _style.descriptionRightSkip);
+	_descriptionTop = descriptionTopValue();
+	_descriptionHeight = _description.countHeight(_descriptionWidth);
+	return _descriptionTop
+		+ _descriptionHeight
+		+ _style.descriptionBottomSkip;
+}
+
+void DetailedSettingsButton::refreshLayout() {
+	Ui::PostponeCall(crl::guard(this, [=] {
+		const auto current = widthNoMargins();
+		if (current > 0) {
+			resizeToWidth(current);
+		}
+		update();
+	}));
+}
+
+int DetailedSettingsButton::titleTop() const {
+	return _style.button.padding.top();
+}
+
+int DetailedSettingsButton::titleHeight() const {
+	return _style.button.height;
+}
+
+int DetailedSettingsButton::descriptionTopValue() const {
+	return titleTop() + titleHeight() + _style.descriptionTopSkip;
+}
+
+int DetailedSettingsButton::firstDescriptionLineBottom() const {
+	const auto top = (_descriptionTop > 0)
+		? _descriptionTop
+		: descriptionTopValue();
+	return top + qMax(
+		_style.description.style.lineHeight,
+		_style.description.style.font->height);
+}
+
+int DetailedSettingsButton::textAvailableWidth(int outerw) const {
+	const auto toggle = _toggle->getSize();
+	return std::max(
+		1,
+		outerw
+			- _style.button.padding.left()
+			- _style.button.padding.right()
+			- _style.button.toggleSkip
+			- toggle.width());
+}
+
+QRect DetailedSettingsButton::toggleRect() const {
+	const auto toggle = _toggle->getSize();
+	const auto anchorBottom = firstDescriptionLineBottom();
+	return QRect(
+		width() - _style.button.toggleSkip - toggle.width(),
+		(anchorBottom - toggle.height()) / 2,
+		toggle.width(),
+		toggle.height());
+}
+
+QRect DetailedSettingsButton::iconAreaRect() const {
+	const auto size = iconSize();
+	return QRect(
+		_style.button.iconLeft,
+		titleTop(),
+		size,
+		size);
+}
+
+QRect DetailedSettingsButton::iconRect() const {
+	const auto area = iconAreaRect();
+	const auto padding = _style.iconPadding;
+	const auto width = std::max(1, area.width() - (2 * padding));
+	const auto height = std::max(1, area.height() - (2 * padding));
+	return QRect(
+		area.x() + padding,
+		area.y() + padding,
+		width,
+		height);
+}
+
+QRect DetailedSettingsButton::iconForegroundRect(QRect iconRect) const {
+	const auto padding = _style.iconForegroundPadding;
+	const auto width = std::max(1, iconRect.width() - (2 * padding));
+	const auto height = std::max(1, iconRect.height() - (2 * padding));
+	return QRect(
+		iconRect.x() + padding,
+		iconRect.y() + padding,
+		width,
+		height);
+}
+
+int DetailedSettingsButton::iconSize() const {
+	const auto result = firstDescriptionLineBottom() - titleTop();
+	return std::max(1, result);
+}
+
+void DetailedSettingsButton::paintIcon(QPainter &p) const {
+	if (!_iconForeground && !_iconBackground && !_iconBackgroundBrush) {
+		return;
+	}
+	const auto rect = iconRect();
+	if (_iconBackground) {
+		p.setPen(Qt::NoPen);
+		p.setBrush(*_iconBackground);
+		{
+			auto hq = PainterHighQualityEnabler(p);
+			p.drawRoundedRect(rect, _style.iconRadius, _style.iconRadius);
+		}
+	} else if (_iconBackgroundBrush) {
+		p.setPen(Qt::NoPen);
+		p.setBrush(*_iconBackgroundBrush);
+		{
+			auto hq = PainterHighQualityEnabler(p);
+			p.drawRoundedRect(rect, _style.iconRadius, _style.iconRadius);
+		}
+	}
+	if (_iconForeground) {
+		const auto source = _iconForeground->size();
+		if (!source.isEmpty()) {
+			const auto foreground = iconForegroundRect(rect);
+			const auto scale = std::min(
+				double(foreground.width()) / source.width(),
+				double(foreground.height()) / source.height());
+			const auto shiftX = (foreground.width()
+				- (source.width() * scale)) / 2.;
+			const auto shiftY = (foreground.height()
+				- (source.height() * scale)) / 2.;
+			p.save();
+			p.translate(foreground.x() + shiftX, foreground.y() + shiftY);
+			p.scale(scale, scale);
+			_iconForeground->paint(p, 0, 0, source.width());
+			p.restore();
+		}
+	}
+}
+
+not_null<DetailedSettingsButton*> AddDetailedSettingsButton(
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<QString> title,
+		rpl::producer<QString> description,
+		Settings::IconDescriptor icon,
+		rpl::producer<bool> toggled,
+		const style::DetailedSettingsButtonStyle &rowStyle) {
+	return container->add(object_ptr<DetailedSettingsButton>(
+		container,
+		std::move(title),
+		std::move(description),
+		std::move(icon),
+		std::move(toggled),
+		rowStyle));
+}
diff --git a/Telegram/SourceFiles/settings/detailed_settings_button.h b/Telegram/SourceFiles/settings/detailed_settings_button.h
new file mode 100644
index 00000000000000..a5dfee47af97bc
--- /dev/null
+++ b/Telegram/SourceFiles/settings/detailed_settings_button.h
@@ -0,0 +1,78 @@
+#pragma once
+
+#include "settings/settings_common.h"
+#include "ui/text/text.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+
+namespace Ui {
+class VerticalLayout;
+} // namespace Ui
+
+namespace style {
+struct DetailedSettingsButtonStyle;
+} // namespace style
+
+class DetailedSettingsButton final : public Ui::RippleButton {
+public:
+	DetailedSettingsButton(
+		QWidget *parent,
+		rpl::producer<QString> title,
+		rpl::producer<QString> description,
+		Settings::IconDescriptor icon,
+		rpl::producer<bool> toggled,
+		const style::DetailedSettingsButtonStyle &rowStyle);
+
+	QString accessibilityName() override;
+	Ui::AccessibilityState accessibilityState() const override;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+	QAccessible::Role accessibilityRole() override;
+#endif
+
+	[[nodiscard]] bool toggled() const;
+	[[nodiscard]] rpl::producer<bool> toggledChanges() const;
+	[[nodiscard]] rpl::producer<not_null<QEvent*>> clickAreaEvents() const;
+	void setToggleLocked(bool locked);
+	void finishAnimating();
+
+protected:
+	void onStateChanged(State was, StateChangeSource source) override;
+	void paintEvent(QPaintEvent *e) override;
+	int resizeGetHeight(int newWidth) override;
+
+private:
+	void refreshLayout();
+	[[nodiscard]] int titleTop() const;
+	[[nodiscard]] int titleHeight() const;
+	[[nodiscard]] int descriptionTopValue() const;
+	[[nodiscard]] int firstDescriptionLineBottom() const;
+	[[nodiscard]] int textAvailableWidth(int outerw) const;
+	[[nodiscard]] QRect toggleRect() const;
+	[[nodiscard]] QRect iconAreaRect() const;
+	[[nodiscard]] QRect iconRect() const;
+	[[nodiscard]] QRect iconForegroundRect(QRect iconRect) const;
+	[[nodiscard]] int iconSize() const;
+	void paintIcon(QPainter &p) const;
+
+	const style::DetailedSettingsButtonStyle &_style;
+	Ui::Text::String _title;
+	Ui::Text::String _description;
+	std::unique_ptr<Ui::ToggleView> _toggle;
+	const style::icon *_iconForeground = nullptr;
+	const style::color *_iconBackground = nullptr;
+	const std::optional<QBrush> _iconBackgroundBrush;
+	int _titleWidth = 0;
+	int _descriptionWidth = 0;
+	int _descriptionTop = 0;
+	int _descriptionHeight = 0;
+	bool _toggleLocked = false;
+
+};
+
+[[nodiscard]] not_null<DetailedSettingsButton*> AddDetailedSettingsButton(
+	not_null<Ui::VerticalLayout*> container,
+	rpl::producer<QString> title,
+	rpl::producer<QString> description,
+	Settings::IconDescriptor icon,
+	rpl::producer<bool> toggled,
+	const style::DetailedSettingsButtonStyle &rowStyle);
diff --git a/Telegram/SourceFiles/boxes/sessions_box.cpp b/Telegram/SourceFiles/settings/sections/settings_active_sessions.cpp
similarity index 72%
rename from Telegram/SourceFiles/boxes/sessions_box.cpp
rename to Telegram/SourceFiles/settings/sections/settings_active_sessions.cpp
index 4328fc4431d4fe..bab18dca013e0d 100644
--- a/Telegram/SourceFiles/boxes/sessions_box.cpp
+++ b/Telegram/SourceFiles/settings/sections/settings_active_sessions.cpp
@@ -5,47 +5,54 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "boxes/sessions_box.h"
+#include "settings/sections/settings_active_sessions.h"
+
+#include "settings/settings_common_session.h"
 
-#include "apiwrap.h"
 #include "api/api_authorizations.h"
-#include "base/timer.h"
-#include "base/unixtime.h"
+#include "apiwrap.h"
 #include "base/algorithm.h"
 #include "base/platform/base_platform_info.h"
-#include "boxes/self_destruction_box.h"
+#include "base/timer.h"
+#include "base/unixtime.h"
 #include "boxes/peer_lists_box.h"
-#include "ui/boxes/confirm_box.h"
+#include "boxes/self_destruction_box.h"
+#include "core/application.h"
+#include "core/core_settings.h"
 #include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
 #include "main/main_session.h"
+#include "settings/sections/settings_privacy_security.h"
+#include "settings/settings_builder.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/scroll_area.h"
-#include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
-#include "ui/layers/generic_box.h"
-#include "ui/painter.h"
-#include "ui/vertical_list.h"
-#include "lottie/lottie_icon.h"
-#include "core/application.h"
-#include "core/core_settings.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
-#include "styles/style_settings.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
 
+namespace Settings {
 namespace {
 
+using namespace Builder;
+
 constexpr auto kShortPollTimeout = 60 * crl::time(1000);
 constexpr auto kMaxDeviceModelLength = 32;
 
 using EntryData = Api::Authorizations::Entry;
 
-enum class Type {
+enum class DeviceType {
 	Windows,
 	Mac,
 	Ubuntu,
@@ -107,7 +114,7 @@ class Row final : public PeerListRow {
 private:
 	const not_null<RowDelegate*> _delegate;
 	Ui::Text::String _location;
-	Type _type = Type::Other;
+	DeviceType _type = DeviceType::Other;
 	EntryData _data;
 	QImage _userpic;
 
@@ -145,7 +152,7 @@ void RenameBox(not_null<Ui::GenericBox*> box) {
 		Core::App().settings().setCustomDeviceModel(result);
 		Core::App().saveSettingsDelayed();
 	};
-	name->submits() | rpl::start_with_next(submit, name->lifetime());
+	name->submits() | rpl::on_next(submit, name->lifetime());
 	box->addButton(tr::lng_settings_save(), submit);
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
@@ -153,11 +160,11 @@ void RenameBox(not_null<Ui::GenericBox*> box) {
 [[nodiscard]] QString LocationAndDate(const EntryData &entry) {
 	return (entry.location.isEmpty() ? entry.ip : entry.location)
 		+ (entry.hash
-			? (QString::fromUtf8(" \xE2\x80\xA2 ") + entry.active)
+			? (' ' + Ui::kQBullet + ' ' + entry.active)
 			: QString());
 }
 
-[[nodiscard]] Type TypeFromEntry(const EntryData &entry) {
+[[nodiscard]] DeviceType TypeFromEntry(const EntryData &entry) {
 	const auto platform = entry.platform.toLower();
 	const auto device = entry.name.toLower();
 	const auto system = entry.system.toLower();
@@ -169,91 +176,85 @@ void RenameBox(not_null<Ui::GenericBox*> box) {
 	const auto kiOS = std::array{ 1, 7, 10840, 16352 };
 	const auto kWeb = std::array{ 2496, 739222, 1025907 };
 
-	const auto detectBrowser = [&]() -> std::optional<Type> {
+	const auto detectBrowser = [&]() -> std::optional<DeviceType> {
 		if (device.contains("edg/")
 			|| device.contains("edgios/")
 			|| device.contains("edga/")) {
-			return Type::Edge;
+			return DeviceType::Edge;
 		} else if (device.contains("chrome")) {
-			return Type::Chrome;
+			return DeviceType::Chrome;
 		} else if (device.contains("safari")) {
-			return Type::Safari;
+			return DeviceType::Safari;
 		} else if (device.contains("firefox")) {
-			return Type::Firefox;
+			return DeviceType::Firefox;
 		}
 		return {};
 	};
-	const auto detectDesktop = [&]() -> std::optional<Type> {
+	const auto detectDesktop = [&]() -> std::optional<DeviceType> {
 		if (platform.contains("windows") || system.contains("windows")) {
-			return Type::Windows;
+			return DeviceType::Windows;
 		} else if (platform.contains("macos") || system.contains("macos")) {
-			return Type::Mac;
+			return DeviceType::Mac;
 		} else if (platform.contains("ubuntu")
 			|| system.contains("ubuntu")
 			|| platform.contains("unity")
 			|| system.contains("unity")) {
-			return Type::Ubuntu;
+			return DeviceType::Ubuntu;
 		} else if (platform.contains("linux") || system.contains("linux")) {
-			return Type::Linux;
+			return DeviceType::Linux;
 		}
 		return {};
 	};
 
 	if (ranges::contains(kAndroid, apiId)) {
-		return Type::Android;
+		return DeviceType::Android;
 	} else if (ranges::contains(kDesktop, apiId)) {
-		return detectDesktop().value_or(Type::Linux);
+		return detectDesktop().value_or(DeviceType::Linux);
 	} else if (ranges::contains(kMac, apiId)) {
-		return Type::Mac;
+		return DeviceType::Mac;
 	} else if (ranges::contains(kWeb, apiId)) {
-		return detectBrowser().value_or(Type::Web);
+		return detectBrowser().value_or(DeviceType::Web);
 	} else if (device.contains("chromebook")) {
-		return Type::Other;
+		return DeviceType::Other;
 	} else if (const auto browser = detectBrowser()) {
 		return *browser;
 	} else if (device.contains("iphone")) {
-		return Type::iPhone;
+		return DeviceType::iPhone;
 	} else if (device.contains("ipad")) {
-		return Type::iPad;
+		return DeviceType::iPad;
 	} else if (ranges::contains(kiOS, apiId)) {
-		return Type::iPhone;
+		return DeviceType::iPhone;
 	} else if (const auto desktop = detectDesktop()) {
 		return *desktop;
 	} else if (platform.contains("android") || system.contains("android")) {
-		return Type::Android;
+		return DeviceType::Android;
 	} else if (platform.contains("ios") || system.contains("ios")) {
-		return Type::iPhone;
+		return DeviceType::iPhone;
 	}
-	return Type::Other;
+	return DeviceType::Other;
 }
 
-[[nodiscard]] QBrush GradientForType(Type type, int size) {
+[[nodiscard]] QBrush GradientForType(DeviceType type, int size) {
 	const auto colors = [&]() -> std::pair<style::color, style::color> {
 		switch (type) {
-		case Type::Windows:
-		case Type::Mac:
-		case Type::Other:
-			// Blue.
+		case DeviceType::Windows:
+		case DeviceType::Mac:
+		case DeviceType::Other:
 			return { st::historyPeer4UserpicBg, st::historyPeer4UserpicBg2 };
-		case Type::Ubuntu:
-			// Orange.
+		case DeviceType::Ubuntu:
 			return { st::historyPeer8UserpicBg, st::historyPeer8UserpicBg2 };
-		case Type::Linux:
-			// Purple.
+		case DeviceType::Linux:
 			return { st::historyPeer5UserpicBg, st::historyPeer5UserpicBg2 };
-		case Type::iPhone:
-		case Type::iPad:
-			// Sea.
+		case DeviceType::iPhone:
+		case DeviceType::iPad:
 			return { st::historyPeer7UserpicBg, st::historyPeer7UserpicBg2 };
-		case Type::Android:
-			// Green.
+		case DeviceType::Android:
 			return { st::historyPeer2UserpicBg, st::historyPeer2UserpicBg2 };
-		case Type::Web:
-		case Type::Chrome:
-		case Type::Edge:
-		case Type::Firefox:
-		case Type::Safari:
-			// Pink.
+		case DeviceType::Web:
+		case DeviceType::Chrome:
+		case DeviceType::Edge:
+		case DeviceType::Firefox:
+		case DeviceType::Safari:
 			return { st::historyPeer6UserpicBg, st::historyPeer6UserpicBg2 };
 		}
 		Unexpected("Type in GradientForType.");
@@ -266,50 +267,50 @@ void RenameBox(not_null<Ui::GenericBox*> box) {
 	return QBrush(std::move(gradient));
 }
 
-[[nodiscard]] const style::icon &IconForType(Type type) {
+[[nodiscard]] const style::icon &IconForType(DeviceType type) {
 	switch (type) {
-	case Type::Windows: return st::sessionIconWindows;
-	case Type::Mac: return st::sessionIconMac;
-	case Type::Ubuntu: return st::sessionIconUbuntu;
-	case Type::Linux: return st::sessionIconLinux;
-	case Type::iPhone: return st::sessionIconiPhone;
-	case Type::iPad: return st::sessionIconiPad;
-	case Type::Android: return st::sessionIconAndroid;
-	case Type::Web: return st::sessionIconWeb;
-	case Type::Chrome: return st::sessionIconChrome;
-	case Type::Edge: return st::sessionIconEdge;
-	case Type::Firefox: return st::sessionIconFirefox;
-	case Type::Safari: return st::sessionIconSafari;
-	case Type::Other: return st::sessionIconOther;
+	case DeviceType::Windows: return st::sessionIconWindows;
+	case DeviceType::Mac: return st::sessionIconMac;
+	case DeviceType::Ubuntu: return st::sessionIconUbuntu;
+	case DeviceType::Linux: return st::sessionIconLinux;
+	case DeviceType::iPhone: return st::sessionIconiPhone;
+	case DeviceType::iPad: return st::sessionIconiPad;
+	case DeviceType::Android: return st::sessionIconAndroid;
+	case DeviceType::Web: return st::sessionIconWeb;
+	case DeviceType::Chrome: return st::sessionIconChrome;
+	case DeviceType::Edge: return st::sessionIconEdge;
+	case DeviceType::Firefox: return st::sessionIconFirefox;
+	case DeviceType::Safari: return st::sessionIconSafari;
+	case DeviceType::Other: return st::sessionIconOther;
 	}
 	Unexpected("Type in IconForType.");
 }
 
-[[nodiscard]] const style::icon *IconBigForType(Type type) {
+[[nodiscard]] const style::icon *IconBigForType(DeviceType type) {
 	switch (type) {
-	case Type::Web: return &st::sessionBigIconWeb;
-	case Type::Other: return &st::sessionBigIconOther;
+	case DeviceType::Web: return &st::sessionBigIconWeb;
+	case DeviceType::Other: return &st::sessionBigIconOther;
 	}
 	return nullptr;
 }
 
-[[nodiscard]] std::unique_ptr<Lottie::Icon> LottieForType(Type type) {
+[[nodiscard]] std::unique_ptr<Lottie::Icon> LottieForType(DeviceType type) {
 	if (IconBigForType(type)) {
 		return nullptr;
 	}
 	const auto path = [&] {
 		switch (type) {
-		case Type::Windows: return "device_desktop_win";
-		case Type::Mac: return "device_desktop_mac";
-		case Type::Ubuntu: return "device_linux_ubuntu";
-		case Type::Linux: return "device_linux";
-		case Type::iPhone: return "device_phone_ios";
-		case Type::iPad: return "device_tablet_ios";
-		case Type::Android: return "device_phone_android";
-		case Type::Chrome: return "device_web_chrome";
-		case Type::Edge: return "device_web_edge";
-		case Type::Firefox: return "device_web_firefox";
-		case Type::Safari: return "device_web_safari";
+		case DeviceType::Windows: return "device_desktop_win";
+		case DeviceType::Mac: return "device_desktop_mac";
+		case DeviceType::Ubuntu: return "device_linux_ubuntu";
+		case DeviceType::Linux: return "device_linux";
+		case DeviceType::iPhone: return "device_phone_ios";
+		case DeviceType::iPad: return "device_tablet_ios";
+		case DeviceType::Android: return "device_phone_android";
+		case DeviceType::Chrome: return "device_web_chrome";
+		case DeviceType::Edge: return "device_web_edge";
+		case DeviceType::Firefox: return "device_web_firefox";
+		case DeviceType::Safari: return "device_web_safari";
 		}
 		Unexpected("Type in LottieForType.");
 	}();
@@ -320,7 +321,7 @@ void RenameBox(not_null<Ui::GenericBox*> box) {
 	});
 }
 
-[[nodiscard]] QImage GenerateUserpic(Type type) {
+[[nodiscard]] QImage GenerateUserpic(DeviceType type) {
 	const auto size = st::sessionListItem.photoSize;
 	const auto full = size * style::DevicePixelRatio();
 	const auto rect = QRect(0, 0, size, size);
@@ -343,7 +344,7 @@ void RenameBox(not_null<Ui::GenericBox*> box) {
 [[nodiscard]] not_null<Ui::RpWidget*> GenerateUserpicBig(
 		not_null<Ui::RpWidget*> parent,
 		rpl::producer<> shown,
-		Type type) {
+		DeviceType type) {
 	const auto size = st::sessionBigUserpicSize;
 	const auto full = size * style::DevicePixelRatio();
 	const auto rect = QRect(0, 0, size, size);
@@ -378,7 +379,7 @@ void RenameBox(not_null<Ui::GenericBox*> box) {
 	if ((state->lottie = LottieForType(type))) {
 		std::move(
 			shown
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			state->lottie->animate(
 				[=] { result->update(); },
 				0,
@@ -387,7 +388,7 @@ void RenameBox(not_null<Ui::GenericBox*> box) {
 	}
 
 	result->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(result);
 		p.drawImage(QPoint(0, 0), state->background);
 		if (state->lottie) {
@@ -418,50 +419,32 @@ void SessionInfoBox(
 		shown->fire({});
 	});
 
-	const auto userpicWrap = box->addRow(
-		object_ptr<Ui::FixedHeightWidget>(box, st::sessionBigUserpicSize),
-		st::sessionBigCoverPadding);
 	const auto big = GenerateUserpicBig(
-		userpicWrap,
+		box,
 		shown->events(),
 		TypeFromEntry(data));
-	userpicWrap->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
-		big->move((size.width() - big->width()) / 2, 0);
-	}, userpicWrap->lifetime());
+	big->setNaturalWidth(big->width());
+	box->addRow(
+		object_ptr<Ui::RpWidget>::fromRaw(big),
+		st::sessionBigCoverPadding,
+		style::al_top);
 
-	const auto nameWrap = box->addRow(
-		object_ptr<Ui::FixedHeightWidget>(
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			st::sessionBigName.maxHeight));
-	const auto name = Ui::CreateChild<Ui::FlatLabel>(
-		nameWrap,
-		rpl::single(data.name),
-		st::sessionBigName);
-	nameWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		name->resizeToWidth(width);
-		name->move((width - name->width()) / 2, 0);
-	}, name->lifetime());
-
-	const auto dateWrap = box->addRow(
-		object_ptr<Ui::FixedHeightWidget>(
+			rpl::single(data.name),
+			st::sessionBigName),
+		style::al_top);
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			st::sessionDateLabel.style.font->height),
-		style::margins(0, 0, 0, st::sessionDateSkip));
-	const auto date = Ui::CreateChild<Ui::FlatLabel>(
-		dateWrap,
-		rpl::single(
-			langDateTimeFull(base::unixtime::parse(data.activeTime))),
-		st::sessionDateLabel);
-	rpl::combine(
-		dateWrap->widthValue(),
-		date->widthValue()
-	) | rpl::start_with_next([=](int outer, int inner) {
-		date->move((outer - inner) / 2, 0);
-	}, date->lifetime());
+			rpl::single(
+				langDateTimeFull(base::unixtime::parse(data.activeTime))),
+			st::sessionDateLabel),
+		style::margins(0, 0, 0, st::sessionDateSkip),
+		style::al_top);
 
-	using namespace Settings;
 	const auto container = box->verticalLayout();
 	Ui::AddDivider(container);
 	Ui::AddSkip(container, st::sessionSubtitleSkip);
@@ -496,7 +479,7 @@ void SessionInfoBox(
 	box->addButton(tr::lng_about_done(), [=] { box->closeBox(); });
 	if (const auto hash = data.hash) {
 		box->addLeftButton(tr::lng_sessions_terminate(), [=] {
-			const auto weak = Ui::MakeWeak(box.get());
+			const auto weak = base::make_weak(box.get());
 			terminate(hash);
 			if (weak) {
 				box->closeBox();
@@ -624,6 +607,11 @@ class SessionsContent : public Ui::RpWidget {
 		not_null<Window::SessionController*> controller);
 
 	void setupContent();
+	[[nodiscard]] Ui::RpWidget *terminateAllButton() const;
+	[[nodiscard]] Ui::RpWidget *autoTerminateButton() const;
+	[[nodiscard]] Ui::RpWidget *currentHeader() const;
+	[[nodiscard]] Ui::RpWidget *incompleteHeader() const;
+	[[nodiscard]] Ui::RpWidget *otherHeader() const;
 
 protected:
 	void resizeEvent(QResizeEvent *e) override;
@@ -652,7 +640,7 @@ class SessionsContent : public Ui::RpWidget {
 	Full _data;
 
 	object_ptr<Inner> _inner;
-	QPointer<Ui::BoxContent> _terminateBox;
+	base::weak_qptr<Ui::BoxContent> _terminateBox;
 
 	base::Timer _shortPollTimer;
 
@@ -663,9 +651,9 @@ class SessionsContent::ListController final
 	, public RowDelegate
 	, public base::has_weak_ptr {
 public:
-	explicit ListController(not_null<Main::Session*> session);
+	explicit ListController(not_null<::Main::Session*> session);
 
-	Main::Session &session() const override;
+	::Main::Session &session() const override;
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
 	void rowElementClicked(not_null<PeerListRow*> row, int element) override;
@@ -679,11 +667,11 @@ class SessionsContent::ListController final
 
 	[[nodiscard]] static std::unique_ptr<ListController> Add(
 		not_null<Ui::VerticalLayout*> container,
-		not_null<Main::Session*> session,
+		not_null<::Main::Session*> session,
 		style::margins margins = {});
 
 private:
-	const not_null<Main::Session*> _session;
+	const not_null<::Main::Session*> _session;
 
 	rpl::event_stream<uint64> _terminateRequests;
 	rpl::event_stream<int> _itemsCount;
@@ -702,6 +690,11 @@ class SessionsContent::Inner : public Ui::RpWidget {
 	[[nodiscard]] rpl::producer<EntryData> showRequests() const;
 	[[nodiscard]] rpl::producer<uint64> terminateOne() const;
 	[[nodiscard]] rpl::producer<> terminateAll() const;
+	[[nodiscard]] Ui::RpWidget *terminateAllButton() const;
+	[[nodiscard]] Ui::RpWidget *autoTerminateButton() const;
+	[[nodiscard]] Ui::RpWidget *currentHeader() const;
+	[[nodiscard]] Ui::RpWidget *incompleteHeader() const;
+	[[nodiscard]] Ui::RpWidget *otherHeader() const;
 
 private:
 	void setupContent();
@@ -709,14 +702,16 @@ class SessionsContent::Inner : public Ui::RpWidget {
 	const not_null<Window::SessionController*> _controller;
 	std::unique_ptr<ListController> _current;
 	QPointer<Ui::SettingsButton> _terminateAll;
+	QPointer<Ui::SettingsButton> _autoTerminate;
+	QPointer<Ui::RpWidget> _currentHeader;
+	QPointer<Ui::RpWidget> _incompleteHeader;
+	QPointer<Ui::RpWidget> _otherHeader;
 	std::unique_ptr<ListController> _incomplete;
 	std::unique_ptr<ListController> _list;
 	rpl::variable<int> _ttlDays;
 
 };
 
-//, location(st::sessionInfoStyle, LocationAndDate(entry))
-
 SessionsContent::SessionsContent(
 	QWidget*,
 	not_null<Window::SessionController*> controller)
@@ -731,12 +726,12 @@ void SessionsContent::setupContent() {
 
 	_inner->heightValue(
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		resize(width(), height);
 	}, _inner->lifetime());
 
 	_inner->showRequests(
-	) | rpl::start_with_next([=](const EntryData &data) {
+	) | rpl::on_next([=](const EntryData &data) {
 		_controller->show(Box(
 			SessionInfoBox,
 			data,
@@ -744,22 +739,22 @@ void SessionsContent::setupContent() {
 	}, lifetime());
 
 	_inner->terminateOne(
-	) | rpl::start_with_next([=](uint64 hash) {
+	) | rpl::on_next([=](uint64 hash) {
 		terminateOne(hash);
 	}, lifetime());
 
 	_inner->terminateAll(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		terminateAll();
 	}, lifetime());
 
 	_loading.changes(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		_inner->setVisible(!value);
 	}, lifetime());
 
 	_authorizations->listValue(
-	) | rpl::start_with_next([=](const Api::Authorizations::List &list) {
+	) | rpl::on_next([=](const Api::Authorizations::List &list) {
 		parse(list);
 	}, lifetime());
 
@@ -843,12 +838,12 @@ void SessionsContent::terminate(Fn<void()> terminateRequest, QString message) {
 		.confirmText = tr::lng_settings_reset_button(),
 		.confirmStyle = &st::attentionBoxButton,
 	});
-	_terminateBox = Ui::MakeWeak(box.data());
+	_terminateBox = base::make_weak(box.data());
 	_controller->show(std::move(box));
 }
 
 void SessionsContent::terminateOne(uint64 hash) {
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	auto callback = [=] {
 		auto done = crl::guard(weak, [=](const MTPBool &result) {
 			if (mtpIsFalse(result)) {
@@ -877,7 +872,7 @@ void SessionsContent::terminateOne(uint64 hash) {
 }
 
 void SessionsContent::terminateAll() {
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	auto callback = [=] {
 		const auto reset = crl::guard(weak, [=] {
 			_authorizations->cancelCurrentRequest();
@@ -891,6 +886,26 @@ void SessionsContent::terminateAll() {
 	terminate(std::move(callback), tr::lng_settings_reset_sure(tr::now));
 }
 
+Ui::RpWidget *SessionsContent::terminateAllButton() const {
+	return _inner ? _inner->terminateAllButton() : nullptr;
+}
+
+Ui::RpWidget *SessionsContent::autoTerminateButton() const {
+	return _inner ? _inner->autoTerminateButton() : nullptr;
+}
+
+Ui::RpWidget *SessionsContent::currentHeader() const {
+	return _inner ? _inner->currentHeader() : nullptr;
+}
+
+Ui::RpWidget *SessionsContent::incompleteHeader() const {
+	return _inner ? _inner->incompleteHeader() : nullptr;
+}
+
+Ui::RpWidget *SessionsContent::otherHeader() const {
+	return _inner ? _inner->otherHeader() : nullptr;
+}
+
 SessionsContent::Inner::Inner(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
@@ -902,12 +917,11 @@ SessionsContent::Inner::Inner(
 }
 
 void SessionsContent::Inner::setupContent() {
-	using namespace Settings;
 	using namespace rpl::mappers;
 
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
 
-	const auto header = AddSubsectionTitle(
+	_currentHeader = AddSubsectionTitle(
 		content,
 		tr::lng_sessions_header());
 	const auto rename = Ui::CreateChild<Ui::LinkButton>(
@@ -916,8 +930,8 @@ void SessionsContent::Inner::setupContent() {
 		st::defaultLinkButton);
 	rpl::combine(
 		content->sizeValue(),
-		header->positionValue()
-	) | rpl::start_with_next([=](QSize outer, QPoint position) {
+		_currentHeader->positionValue()
+	) | rpl::on_next([=](QSize outer, QPoint position) {
 		const auto x = st::sessionTerminateSkip
 			+ st::sessionTerminate.iconPosition.x();
 		const auto y = st::defaultSubsectionTitlePadding.top()
@@ -954,7 +968,7 @@ void SessionsContent::Inner::setupContent() {
 			object_ptr<Ui::VerticalLayout>(content)))->setDuration(0);
 	const auto incompleteInner = incompleteWrap->entity();
 	AddSkip(incompleteInner, st::sessionSubtitleSkip);
-	AddSubsectionTitle(incompleteInner, tr::lng_sessions_incomplete());
+	_incompleteHeader = AddSubsectionTitle(incompleteInner, tr::lng_sessions_incomplete());
 	_incomplete = ListController::Add(incompleteInner, session);
 	AddSkip(incompleteInner);
 	AddDividerText(incompleteInner, tr::lng_sessions_incomplete_about());
@@ -965,7 +979,7 @@ void SessionsContent::Inner::setupContent() {
 			object_ptr<Ui::VerticalLayout>(content)))->setDuration(0);
 	const auto listInner = listWrap->entity();
 	AddSkip(listInner, st::sessionSubtitleSkip);
-	AddSubsectionTitle(listInner, tr::lng_sessions_other_header());
+	_otherHeader = AddSubsectionTitle(listInner, tr::lng_sessions_other_header());
 	_list = ListController::Add(listInner, session);
 	AddSkip(listInner);
 	AddDividerText(listInner, tr::lng_sessions_about_apps());
@@ -978,12 +992,12 @@ void SessionsContent::Inner::setupContent() {
 	AddSkip(ttlInner, st::sessionSubtitleSkip);
 	AddSubsectionTitle(ttlInner, tr::lng_settings_terminate_title());
 
-	AddButtonWithLabel(
+	_autoTerminate = AddButtonWithLabel(
 		ttlInner,
 		tr::lng_settings_terminate_if(),
 		_ttlDays.value() | rpl::map(SelfDestructionBox::DaysLabel),
-		st::settingsButtonNoIcon
-	)->addClickHandler([=] {
+		st::settingsButtonNoIcon);
+	_autoTerminate->addClickHandler([=] {
 		_controller->show(Box<SelfDestructionBox>(
 			&_controller->session(),
 			SelfDestructionBox::Type::Sessions,
@@ -1024,6 +1038,26 @@ rpl::producer<> SessionsContent::Inner::terminateAll() const {
 	return _terminateAll->clicks() | rpl::to_empty;
 }
 
+Ui::RpWidget *SessionsContent::Inner::terminateAllButton() const {
+	return _terminateAll.data();
+}
+
+Ui::RpWidget *SessionsContent::Inner::autoTerminateButton() const {
+	return _autoTerminate.data();
+}
+
+Ui::RpWidget *SessionsContent::Inner::currentHeader() const {
+	return _currentHeader.data();
+}
+
+Ui::RpWidget *SessionsContent::Inner::incompleteHeader() const {
+	return _incompleteHeader.data();
+}
+
+Ui::RpWidget *SessionsContent::Inner::otherHeader() const {
+	return _otherHeader.data();
+}
+
 rpl::producer<uint64> SessionsContent::Inner::terminateOne() const {
 	return rpl::merge(
 		_incomplete->terminateRequests(),
@@ -1038,11 +1072,11 @@ rpl::producer<EntryData> SessionsContent::Inner::showRequests() const {
 }
 
 SessionsContent::ListController::ListController(
-	not_null<Main::Session*> session)
+	not_null<::Main::Session*> session)
 : _session(session) {
 }
 
-Main::Session &SessionsContent::ListController::session() const {
+::Main::Session &SessionsContent::ListController::session() const {
 	return *_session;
 }
 
@@ -1115,7 +1149,7 @@ rpl::producer<EntryData> SessionsContent::ListController::showRequests() const {
 
 auto SessionsContent::ListController::Add(
 	not_null<Ui::VerticalLayout*> container,
-	not_null<Main::Session*> session,
+	not_null<::Main::Session*> session,
 	style::margins margins)
 -> std::unique_ptr<ListController> {
 	auto &lifetime = container->lifetime();
@@ -1134,31 +1168,158 @@ auto SessionsContent::ListController::Add(
 	return controller;
 }
 
-} // namespace
+void BuildSessionsSection(SectionBuilder &builder) {
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"sessions/current"_q,
+			.title = tr::lng_sessions_header(tr::now),
+			.keywords = { u"current"_q, u"device"_q, u"session"_q },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"sessions/terminate-all"_q,
+			.title = tr::lng_sessions_terminate_all(tr::now),
+			.keywords = { u"terminate"_q, u"logout"_q, u"sign out"_q },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"sessions/incomplete"_q,
+			.title = tr::lng_sessions_incomplete(tr::now),
+			.keywords = { u"incomplete"_q, u"unconfirmed"_q },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"sessions/other"_q,
+			.title = tr::lng_sessions_other_header(tr::now),
+			.keywords = { u"other"_q, u"active"_q, u"sessions"_q },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"sessions/auto-terminate"_q,
+			.title = tr::lng_settings_terminate_if(tr::now),
+			.keywords = { u"auto"_q, u"terminate"_q, u"inactive"_q, u"timeout"_q },
+		};
+	});
+}
 
-namespace Settings {
+class Sessions : public Section<Sessions> {
+public:
+	Sessions(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+	void showFinished() override;
+
+private:
+	void setupContent();
+
+	rpl::event_stream<> _showFinished;
+
+};
 
 Sessions::Sessions(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: Section(parent) {
-	setupContent(controller);
+: Section(parent, controller) {
+	setupContent();
 }
 
 rpl::producer<QString> Sessions::title() {
 	return tr::lng_settings_sessions_title();
 }
 
-void Sessions::setupContent(not_null<Window::SessionController*> controller) {
+void Sessions::showFinished() {
+	_showFinished.fire({});
+	Section::showFinished();
+}
+
+void Sessions::setupContent() {
 	const auto container = Ui::CreateChild<Ui::VerticalLayout>(this);
-	AddSkip(container, st::settingsPrivacySkip);
-	const auto content = container->add(
-		object_ptr<SessionsContent>(container, controller));
-	content->setupContent();
+
+	const SectionBuildMethod buildMethod = [](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		auto &lifetime = container->lifetime();
+		const auto highlights = lifetime.make_state<HighlightRegistry>();
+
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = Window::PausedIn(
+				controller,
+				Window::GifPauseReason::Layer),
+			.highlights = highlights,
+		});
+
+		builder.addSkip(st::settingsPrivacySkip);
+
+		builder.add([=](const WidgetContext &ctx) {
+			const auto content = ctx.container->add(
+				object_ptr<SessionsContent>(ctx.container, ctx.controller));
+			content->setupContent();
+
+			if (ctx.highlights) {
+				ctx.highlights->push_back({
+					u"sessions/current"_q,
+					{ content->currentHeader(), SubsectionTitleHighlight() },
+				});
+				ctx.highlights->push_back({
+					u"sessions/terminate-all"_q,
+					{ content->terminateAllButton() },
+				});
+				ctx.highlights->push_back({
+					u"sessions/incomplete"_q,
+					{ content->incompleteHeader(), SubsectionTitleHighlight() },
+				});
+				ctx.highlights->push_back({
+					u"sessions/other"_q,
+					{ content->otherHeader(), SubsectionTitleHighlight() },
+				});
+				ctx.highlights->push_back({
+					u"sessions/auto-terminate"_q,
+					{ content->autoTerminateButton() },
+				});
+			}
+
+			return SectionBuilder::WidgetToAdd{};
+		});
+
+		std::move(showFinished) | rpl::on_next([=] {
+			for (const auto &[id, entry] : *highlights) {
+				if (entry.widget) {
+					controller->checkHighlightControl(
+						id,
+						entry.widget,
+						base::duplicate(entry.args));
+				}
+			}
+		}, lifetime);
+	};
+
+	build(container, buildMethod);
 
 	Ui::ResizeFitChild(this, container);
 }
 
+const auto kMeta = BuildHelper({
+	.id = Sessions::Id(),
+	.parentId = PrivacySecurityId(),
+	.title = &tr::lng_settings_sessions_title,
+	.icon = &st::menuIconDevices,
+}, [](SectionBuilder &builder) {
+	BuildSessionsSection(builder);
+});
+
+} // namespace
+
 void AddSessionInfoRow(
 		not_null<Ui::VerticalLayout*> container,
 		rpl::producer<QString> label,
@@ -1186,14 +1347,18 @@ void AddSessionInfoRow(
 	const auto widget = Ui::CreateChild<Ui::RpWidget>(container.get());
 	widget->resize(icon.size());
 
-	text->topValue() | rpl::start_with_next([=](int top) {
+	text->topValue() | rpl::on_next([=](int top) {
 		widget->move(st::sessionValueIconPosition + QPoint(0, top));
 	}, widget->lifetime());
 
-	widget->paintRequest() | rpl::start_with_next([=, &icon] {
+	widget->paintRequest() | rpl::on_next([=, &icon] {
 		auto p = QPainter(widget);
 		icon.paintInCenter(p, widget->rect());
 	}, widget->lifetime());
 }
 
+Type SessionsId() {
+	return Sessions::Id();
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/boxes/sessions_box.h b/Telegram/SourceFiles/settings/sections/settings_active_sessions.h
similarity index 61%
rename from Telegram/SourceFiles/boxes/sessions_box.h
rename to Telegram/SourceFiles/settings/sections/settings_active_sessions.h
index bc45147f7b4974..f3a577385bd711 100644
--- a/Telegram/SourceFiles/boxes/sessions_box.h
+++ b/Telegram/SourceFiles/settings/sections/settings_active_sessions.h
@@ -7,26 +7,19 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "settings/settings_common_session.h"
+#include "settings/settings_type.h"
 
 namespace Ui {
 class VerticalLayout;
 } // namespace Ui
 
-namespace Settings {
-
-class Sessions : public Section<Sessions> {
-public:
-	Sessions(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller);
+namespace Window {
+class SessionController;
+} // namespace Window
 
-	[[nodiscard]] rpl::producer<QString> title() override;
-
-private:
-	void setupContent(not_null<Window::SessionController*> controller);
+namespace Settings {
 
-};
+[[nodiscard]] Type SessionsId();
 
 void AddSessionInfoRow(
 	not_null<Ui::VerticalLayout*> container,
diff --git a/Telegram/SourceFiles/settings/sections/settings_advanced.cpp b/Telegram/SourceFiles/settings/sections/settings_advanced.cpp
new file mode 100644
index 00000000000000..bd4b8b46ce5063
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_advanced.cpp
@@ -0,0 +1,1980 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/sections/settings_advanced.h"
+
+#include "settings/settings_common_session.h"
+
+#include "api/api_global_privacy.h"
+#include "apiwrap.h"
+#include "base/call_delayed.h"
+#include "base/platform/base_platform_custom_app_icon.h"
+#include "base/platform/base_platform_info.h"
+#include "base/screen_reader_state.h"
+#include "boxes/about_box.h"
+#include "boxes/auto_download_box.h"
+#include "boxes/connection_box.h"
+#include "boxes/download_path_box.h"
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "core/file_utilities.h"
+#include "core/launcher.h"
+#include "core/update_checker.h"
+#include "data/data_auto_download.h"
+#include "export/export_manager.h"
+#include "info/downloads/info_downloads_widget.h"
+#include "info/info_memento.h"
+#include "lang/lang_keys.h"
+#include "main/main_account.h"
+#include "main/main_domain.h"
+#include "main/main_session.h"
+#include "mtproto/facade.h"
+#include "mtproto/mtp_instance.h"
+#include "platform/platform_specific.h"
+#include "settings/settings_builder.h"
+#include "settings/sections/settings_local_storage.h"
+#include "settings/sections/settings_main.h"
+#include "settings/sections/settings_chat.h"
+#include "settings/settings_experimental.h"
+#include "settings/settings_power_saving.h"
+#include "settings/sections/settings_privacy_security.h"
+#include "storage/localstorage.h"
+#include "storage/storage_domain.h"
+#include "tray.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/boxes/single_choice_box.h"
+#include "ui/gl/gl_detection.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/platform/ui_platform_window.h"
+#include "ui/power_saving.h"
+#include "ui/rp_widget.h"
+#include "ui/screen_reader_mode.h"
+#include "ui/text/format_values.h"
+#include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+
+#ifdef Q_OS_MAC
+#include "base/platform/mac/base_confirm_quit.h"
+#endif // Q_OS_MAC
+
+#ifndef TDESKTOP_DISABLE_SPELLCHECK
+#include "boxes/dictionaries_manager.h"
+#include "chat_helpers/spellchecker_common.h"
+#include "spellcheck/platform/platform_spellcheck.h"
+#endif // !TDESKTOP_DISABLE_SPELLCHECK
+
+#include <ksandbox.h>
+
+namespace Settings {
+namespace {
+
+using namespace Builder;
+
+#if defined Q_OS_MAC && !defined OS_MAC_STORE
+[[nodiscard]] const QImage &IconMacRound() {
+	static const auto result = QImage(u":/gui/art/icon_round512@2x.png"_q);
+	return result;
+}
+#endif // Q_OS_MAC && !OS_MAC_STORE
+
+void BuildDataStorageSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto container = builder.container();
+	const auto session = builder.session();
+	const auto account = &session->account();
+
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"advanced/data_storage"_q,
+		.title = tr::lng_settings_data_storage(),
+		.keywords = { u"storage"_q, u"data"_q, u"download"_q, u"connection"_q },
+	});
+
+	const auto connectionType = [=] {
+		const auto transport = account->mtp().dctransport();
+		if (!Core::App().settings().proxy().isEnabled()) {
+			return transport.isEmpty()
+				? tr::lng_connection_auto_connecting(tr::now)
+				: tr::lng_connection_auto(tr::now, lt_transport, transport);
+		} else {
+			return transport.isEmpty()
+				? tr::lng_connection_proxy_connecting(tr::now)
+				: tr::lng_connection_proxy(tr::now, lt_transport, transport);
+		}
+	};
+
+	builder.addButton({
+		.id = u"advanced/connection_type"_q,
+		.title = tr::lng_settings_connection_type(),
+		.icon = { &st::menuIconNetwork },
+		.label = rpl::merge(
+			Core::App().settings().proxy().connectionTypeChanges(),
+			tr::lng_connection_auto_connecting() | rpl::to_empty
+		) | rpl::map(connectionType),
+		.onClick = [=] {
+			controller->window().show(
+				ProxiesBoxController::CreateOwningBox(account));
+		},
+		.keywords = { u"connection"_q, u"proxy"_q, u"network"_q, u"vpn"_q },
+	});
+
+	const auto showDownloadPath = container
+		? container->lifetime().make_state<rpl::variable<bool>>(
+			!Core::App().settings().askDownloadPath())
+		: nullptr;
+
+	auto downloadLabel = Core::App().settings().downloadPathValue(
+	) | rpl::map([](const QString &text) {
+		if (text.isEmpty()) {
+			return Core::App().canReadDefaultDownloadPath()
+				? tr::lng_download_path_default(tr::now)
+				: tr::lng_download_path_temp(tr::now);
+		} else if (text == FileDialog::Tmp()) {
+			return tr::lng_download_path_temp(tr::now);
+		}
+		return QDir::toNativeSeparators(text);
+	});
+
+	builder.addButton({
+		.id = u"advanced/download_path"_q,
+		.title = tr::lng_download_path(),
+		.icon = { &st::menuIconShowInFolder },
+		.label = std::move(downloadLabel),
+		.onClick = [=] {
+			controller->show(Box<DownloadPathBox>(controller));
+		},
+		.keywords = { u"download"_q, u"path"_q, u"folder"_q },
+		.shown = showDownloadPath
+			? showDownloadPath->value()
+			: rpl::single(true) | rpl::type_erased,
+	});
+
+	builder.addButton({
+		.id = u"advanced/storage"_q,
+		.title = tr::lng_settings_manage_local_storage(),
+		.icon = { &st::menuIconStorage },
+		.onClick = [=] {
+			controller->showSettings(LocalStorageId());
+		},
+		.keywords = { u"storage"_q, u"cache"_q, u"local"_q },
+	});
+
+	builder.addButton({
+		.id = u"advanced/downloads"_q,
+		.title = tr::lng_downloads_section(),
+		.icon = { &st::menuIconDownload },
+		.onClick = [=] {
+			if (controller) {
+				controller->showSection(
+					Info::Downloads::Make(controller->session().user()));
+			}
+		},
+		.keywords = { u"downloads"_q, u"files"_q },
+	});
+
+	const auto askDownloadPath = builder.addButton({
+		.id = u"advanced/ask_download"_q,
+		.title = tr::lng_download_path_ask(),
+		.st = &st::settingsButtonNoIcon,
+		.toggled = rpl::single(Core::App().settings().askDownloadPath()),
+		.keywords = { u"download"_q, u"path"_q, u"ask"_q },
+	});
+
+	if (askDownloadPath) {
+		askDownloadPath->toggledValue(
+		) | rpl::filter([](bool checked) {
+			return (checked != Core::App().settings().askDownloadPath());
+		}) | rpl::on_next([=](bool checked) {
+			Core::App().settings().setAskDownloadPath(checked);
+			Core::App().saveSettingsDelayed();
+			if (showDownloadPath) {
+				*showDownloadPath = !checked;
+			}
+		}, askDownloadPath->lifetime());
+	}
+
+	builder.addSkip(st::settingsCheckboxesSkip);
+}
+
+void BuildAutoDownloadSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto session = builder.session();
+	builder.addDivider();
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"advanced/auto_download"_q,
+		.title = tr::lng_media_auto_settings(),
+		.keywords = { u"auto"_q, u"download"_q, u"media"_q },
+	});
+
+	using Source = Data::AutoDownload::Source;
+
+	builder.addButton({
+		.id = u"advanced/auto_download_private"_q,
+		.title = tr::lng_media_auto_in_private(),
+		.icon = { &st::menuIconProfile },
+		.onClick = [=] {
+			controller->show(Box<AutoDownloadBox>(session, Source::User));
+		},
+		.keywords = { u"auto"_q, u"download"_q, u"private"_q, u"media"_q },
+	});
+
+	builder.addButton({
+		.id = u"advanced/auto_download_groups"_q,
+		.title = tr::lng_media_auto_in_groups(),
+		.icon = { &st::menuIconGroups },
+		.onClick = [=] {
+			controller->show(Box<AutoDownloadBox>(session, Source::Group));
+		},
+		.keywords = { u"auto"_q, u"download"_q, u"groups"_q, u"media"_q },
+	});
+
+	builder.addButton({
+		.id = u"advanced/auto_download_channels"_q,
+		.title = tr::lng_media_auto_in_channels(),
+		.icon = { &st::menuIconChannel },
+		.onClick = [=] {
+			controller->show(Box<AutoDownloadBox>(session, Source::Channel));
+		},
+		.keywords = { u"auto"_q, u"download"_q, u"channels"_q, u"media"_q },
+	});
+
+	builder.addSkip(st::settingsCheckboxesSkip);
+}
+
+void BuildWindowTitleSection(SectionBuilder &builder) {
+	const auto settings = &Core::App().settings();
+
+	builder.addDivider();
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"advanced/window_title"_q,
+		.title = tr::lng_settings_window_system(),
+		.keywords = { u"window"_q, u"title"_q, u"frame"_q },
+	});
+
+	const auto content = [=] {
+		return settings->windowTitleContent();
+	};
+
+	const auto showChatName = builder.addCheckbox({
+		.id = u"advanced/title_chat_name"_q,
+		.title = tr::lng_settings_title_chat_name(),
+		.checked = !content().hideChatName,
+		.keywords = { u"title"_q, u"chat"_q, u"name"_q },
+	});
+	if (showChatName) {
+		showChatName->checkedChanges(
+		) | rpl::filter([=](bool checked) {
+			return (checked == content().hideChatName);
+		}) | rpl::on_next([=](bool checked) {
+			auto updated = content();
+			updated.hideChatName = !checked;
+			settings->setWindowTitleContent(updated);
+			Core::App().saveSettingsDelayed();
+		}, showChatName->lifetime());
+	}
+
+	const auto showAccountName = (Core::App().domain().accountsAuthedCount() > 1)
+		? builder.addCheckbox({
+			.id = u"advanced/title_account_name"_q,
+			.title = tr::lng_settings_title_account_name(),
+			.checked = !content().hideAccountName,
+			.keywords = { u"title"_q, u"account"_q, u"name"_q },
+		})
+		: nullptr;
+	if (showAccountName) {
+		showAccountName->checkedChanges(
+		) | rpl::filter([=](bool checked) {
+			return (checked == content().hideAccountName);
+		}) | rpl::on_next([=](bool checked) {
+			auto updated = content();
+			updated.hideAccountName = !checked;
+			settings->setWindowTitleContent(updated);
+			Core::App().saveSettingsDelayed();
+		}, showAccountName->lifetime());
+	}
+
+	const auto showTotalUnread = builder.addCheckbox({
+		.id = u"advanced/title_total_unread"_q,
+		.title = tr::lng_settings_title_total_count(),
+		.checked = !content().hideTotalUnread,
+		.keywords = { u"title"_q, u"unread"_q, u"count"_q, u"badge"_q },
+	});
+	if (showTotalUnread) {
+		showTotalUnread->checkedChanges(
+		) | rpl::filter([=](bool checked) {
+			return (checked == content().hideTotalUnread);
+		}) | rpl::on_next([=](bool checked) {
+			auto updated = content();
+			updated.hideTotalUnread = !checked;
+			settings->setWindowTitleContent(updated);
+			Core::App().saveSettingsDelayed();
+		}, showTotalUnread->lifetime());
+	}
+
+	if (Ui::Platform::NativeWindowFrameSupported()) {
+		const auto nativeFrame = builder.addCheckbox({
+			.id = u"advanced/native_frame"_q,
+			.title = Platform::IsWayland()
+				? tr::lng_settings_qt_frame()
+				: tr::lng_settings_native_frame(),
+			.checked = settings->nativeWindowFrame(),
+			.keywords = { u"frame"_q, u"native"_q, u"window"_q, u"border"_q },
+		});
+		if (nativeFrame) {
+			nativeFrame->checkedChanges(
+			) | rpl::filter([](bool checked) {
+				return (checked != Core::App().settings().nativeWindowFrame());
+			}) | rpl::on_next([=](bool checked) {
+				Core::App().settings().setNativeWindowFrame(checked);
+				Core::App().saveSettingsDelayed();
+			}, nativeFrame->lifetime());
+		}
+	}
+
+	builder.addSkip();
+}
+
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
+void BuildWindowCloseBehaviorSection(SectionBuilder &builder) {
+	using Behavior = Core::Settings::CloseBehavior;
+
+	const auto settings = &Core::App().settings();
+	auto shown = Platform::TrayIconSupported()
+		? (Core::App().settings().workModeValue(
+			) | rpl::map([](Core::Settings::WorkMode mode) {
+				return (mode == Core::Settings::WorkMode::WindowOnly);
+			}) | rpl::distinct_until_changed() | rpl::type_erased)
+		: rpl::producer<bool>(nullptr);
+
+	builder.scope([&] {
+		builder.addDivider();
+		builder.addSkip();
+		builder.addSubsectionTitle({
+			.id = u"advanced/window_close"_q,
+			.title = tr::lng_settings_window_close(),
+			.keywords = { u"close"_q, u"window"_q, u"background"_q, u"quit"_q, u"taskbar"_q, u"minimize"_q },
+		});
+
+		builder.add([settings](const WidgetContext &ctx) {
+			const auto container = ctx.container.get();
+			auto wrap = object_ptr<Ui::VerticalLayout>(container);
+			const auto inner = wrap.data();
+
+			const auto group = std::make_shared<Ui::RadioenumGroup<Behavior>>(
+				settings->closeBehavior());
+			const auto addRadio = [&](Behavior value, const QString &label) {
+				inner->add(
+					object_ptr<Ui::Radioenum<Behavior>>(
+						inner,
+						group,
+						value,
+						label,
+						st::settingsSendType),
+					st::settingsSendTypePadding);
+			};
+
+			addRadio(
+				Behavior::RunInBackground,
+				tr::lng_settings_run_in_background(tr::now));
+			addRadio(
+				Behavior::CloseToTaskbar,
+				tr::lng_settings_close_to_taskbar(tr::now));
+			addRadio(
+				Behavior::Quit,
+				tr::lng_settings_quit_on_close(tr::now));
+
+			group->value() | rpl::filter([=](Behavior value) {
+				return (value != settings->closeBehavior());
+			}) | rpl::on_next([=](Behavior value) {
+				settings->setCloseBehavior(value);
+				Local::writeSettings();
+			}, inner->lifetime());
+
+			return SectionBuilder::WidgetToAdd{ .widget = std::move(wrap) };
+		});
+
+		builder.addSkip();
+	}, std::move(shown));
+}
+#endif // !Q_OS_WIN && !Q_OS_MAC
+
+void BuildSystemIntegrationSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto settings = &Core::App().settings();
+
+	builder.addDivider();
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"advanced/system_integration"_q,
+		.title = tr::lng_settings_system_integration(),
+		.keywords = { u"system"_q, u"tray"_q, u"startup"_q, u"autostart"_q },
+	});
+
+	using WorkMode = Core::Settings::WorkMode;
+
+	if (Platform::TrayIconSupported()) {
+		const auto trayEnabled = [=] {
+			const auto workMode = settings->workMode();
+			return (workMode == WorkMode::TrayOnly)
+				|| (workMode == WorkMode::WindowAndTray);
+		};
+		const auto tray = builder.addCheckbox({
+			.id = u"advanced/tray"_q,
+			.title = tr::lng_settings_workmode_tray(),
+			.checked = trayEnabled(),
+			.keywords = { u"tray"_q, u"icon"_q, u"system"_q },
+		});
+
+		const auto taskbarEnabled = [=] {
+			const auto workMode = settings->workMode();
+			return (workMode == WorkMode::WindowOnly)
+				|| (workMode == WorkMode::WindowAndTray);
+		};
+		const auto taskbar = Platform::SkipTaskbarSupported()
+			? builder.addCheckbox({
+				.id = u"advanced/taskbar"_q,
+				.title = tr::lng_settings_workmode_window(),
+				.checked = taskbarEnabled(),
+				.keywords = { u"taskbar"_q, u"window"_q },
+			})
+			: nullptr;
+
+		const auto monochrome = Platform::HasMonochromeSetting()
+			? builder.addCheckbox({
+				.id = u"advanced/monochrome_icon"_q,
+				.title = tr::lng_settings_monochrome_icon(),
+				.checked = settings->trayIconMonochrome(),
+				.keywords = { u"monochrome"_q, u"icon"_q, u"tray"_q },
+				.shown = tray
+					? tray->checkedValue()
+					: rpl::single(trayEnabled()),
+			})
+			: nullptr;
+
+		if (monochrome) {
+			monochrome->checkedChanges(
+			) | rpl::filter([=](bool value) {
+				return (value != settings->trayIconMonochrome());
+			}) | rpl::on_next([=](bool value) {
+				settings->setTrayIconMonochrome(value);
+				Core::App().saveSettingsDelayed();
+			}, monochrome->lifetime());
+		}
+
+		const auto updateWorkmode = [=] {
+			const auto newMode = (tray && tray->checked())
+				? ((!taskbar || taskbar->checked())
+					? WorkMode::WindowAndTray
+					: WorkMode::TrayOnly)
+				: WorkMode::WindowOnly;
+			if ((newMode == WorkMode::WindowAndTray
+				|| newMode == WorkMode::TrayOnly)
+				&& settings->workMode() != newMode) {
+				cSetSeenTrayTooltip(false);
+			}
+			settings->setWorkMode(newMode);
+			Core::App().saveSettingsDelayed();
+		};
+
+		if (tray) {
+			tray->checkedChanges(
+			) | rpl::filter([=](bool checked) {
+				return (checked != trayEnabled());
+			}) | rpl::on_next([=](bool checked) {
+				if (!checked && taskbar && !taskbar->checked()) {
+					taskbar->setChecked(true);
+				} else {
+					updateWorkmode();
+				}
+			}, tray->lifetime());
+		}
+
+		if (taskbar) {
+			taskbar->checkedChanges(
+			) | rpl::filter([=](bool checked) {
+				return (checked != taskbarEnabled());
+			}) | rpl::on_next([=](bool checked) {
+				if (!checked && tray && !tray->checked()) {
+					tray->setChecked(true);
+				} else {
+					updateWorkmode();
+				}
+			}, taskbar->lifetime());
+		}
+	}
+
+#ifdef Q_OS_MAC
+	const auto warnBeforeQuit = builder.addCheckbox({
+		.id = u"advanced/warn_before_quit"_q,
+		.title = tr::lng_settings_mac_warn_before_quit(
+			lt_text,
+			rpl::single(Platform::ConfirmQuit::QuitKeysString())),
+		.checked = settings->macWarnBeforeQuit(),
+		.keywords = { u"quit"_q, u"warn"_q, u"close"_q },
+	});
+	if (warnBeforeQuit) {
+		warnBeforeQuit->checkedChanges(
+		) | rpl::filter([=](bool checked) {
+			return (checked != settings->macWarnBeforeQuit());
+		}) | rpl::on_next([=](bool checked) {
+			settings->setMacWarnBeforeQuit(checked);
+			Core::App().saveSettingsDelayed();
+		}, warnBeforeQuit->lifetime());
+	}
+
+	const auto systemReplace = builder.addCheckbox({
+		.id = u"advanced/system_text_replace"_q,
+		.title = tr::lng_settings_system_text_replace(),
+		.checked = settings->systemTextReplace(),
+		.keywords = { u"text"_q, u"replace"_q, u"system"_q },
+	});
+	if (systemReplace) {
+		systemReplace->checkedChanges(
+		) | rpl::filter([=](bool checked) {
+			return (checked != settings->systemTextReplace());
+		}) | rpl::on_next([=](bool checked) {
+			settings->setSystemTextReplace(checked);
+			Core::App().saveSettingsDelayed();
+		}, systemReplace->lifetime());
+	}
+
+#ifndef OS_MAC_STORE
+	const auto roundIconEnabled = [=] {
+		const auto digest = base::Platform::CurrentCustomAppIconDigest();
+		return digest && (settings->macRoundIconDigest() == digest);
+	};
+	const auto roundIcon = builder.addCheckbox({
+		.id = u"advanced/round_icon"_q,
+		.title = tr::lng_settings_mac_round_icon(),
+		.checked = roundIconEnabled(),
+		.keywords = { u"icon"_q, u"round"_q, u"dock"_q },
+	});
+	if (roundIcon) {
+		roundIcon->checkedChanges(
+		) | rpl::filter([=](bool checked) {
+			return (checked != roundIconEnabled());
+		}) | rpl::on_next([=](bool checked) {
+			const auto digest = checked
+				? base::Platform::SetCustomAppIcon(IconMacRound())
+				: std::optional<uint64>();
+			if (!checked) {
+				base::Platform::ClearCustomAppIcon();
+			}
+			Window::OverrideApplicationIcon(checked ? IconMacRound() : QImage());
+			Core::App().refreshApplicationIcon();
+			settings->setMacRoundIconDigest(digest);
+			Core::App().saveSettings();
+		}, roundIcon->lifetime());
+	}
+#endif // OS_MAC_STORE
+#elif defined Q_OS_WIN // Q_OS_MAC
+	using Behavior = Core::Settings::CloseBehavior;
+
+	const auto container = builder.container();
+	const auto closeToTaskbarShown = container
+		? container->lifetime().make_state<rpl::variable<bool>>(
+			!Core::App().tray().has())
+		: nullptr;
+
+	if (closeToTaskbarShown) {
+		settings->workModeValue(
+		) | rpl::on_next([=](WorkMode) {
+			*closeToTaskbarShown = !Core::App().tray().has();
+		}, container->lifetime());
+	}
+
+	const auto closeToTaskbar = builder.addCheckbox({
+		.id = u"advanced/close_to_taskbar"_q,
+		.title = tr::lng_settings_close_to_taskbar(),
+		.checked = settings->closeBehavior() == Behavior::CloseToTaskbar,
+		.keywords = { u"close"_q, u"taskbar"_q, u"minimize"_q },
+		.shown = closeToTaskbarShown
+			? closeToTaskbarShown->value()
+			: rpl::single(false),
+	});
+	if (closeToTaskbar) {
+		closeToTaskbar->checkedChanges(
+		) | rpl::map([=](bool checked) {
+			return checked ? Behavior::CloseToTaskbar : Behavior::Quit;
+		}) | rpl::filter([=](Behavior value) {
+			return (settings->closeBehavior() != value);
+		}) | rpl::on_next([=](Behavior value) {
+			settings->setCloseBehavior(value);
+			Local::writeSettings();
+		}, closeToTaskbar->lifetime());
+	}
+#endif // Q_OS_MAC || Q_OS_WIN
+
+	if (Platform::AutostartSupported()) {
+		const auto minimizedToggled = [=] {
+			return cStartMinimized()
+				&& controller
+				&& !controller->session().domain().local().hasLocalPasscode();
+		};
+
+		const auto autostart = builder.addCheckbox({
+			.id = u"advanced/autostart"_q,
+			.title = tr::lng_settings_auto_start(),
+			.checked = cAutoStart(),
+			.keywords = { u"autostart"_q, u"startup"_q, u"boot"_q },
+		});
+
+		const auto minimized = builder.addCheckbox({
+			.id = u"advanced/start_minimized"_q,
+			.title = tr::lng_settings_start_min(),
+			.checked = minimizedToggled(),
+			.keywords = { u"minimized"_q, u"startup"_q, u"hidden"_q },
+			.shown = autostart
+				? autostart->checkedValue()
+				: rpl::single(cAutoStart()),
+		});
+
+		if (autostart) {
+			autostart->checkedChanges(
+			) | rpl::filter([](bool checked) {
+				return (checked != cAutoStart());
+			}) | rpl::on_next([=](bool checked) {
+				const auto weak = base::make_weak(controller);
+				cSetAutoStart(checked);
+				Platform::AutostartToggle(checked, crl::guard(autostart, [=](
+						bool enabled) {
+					if (checked && !enabled && weak) {
+						weak->window().showToast(
+							Lang::Hard::AutostartEnableError());
+					}
+					Ui::PostponeCall(autostart, [=] {
+						autostart->setChecked(enabled);
+					});
+					if (enabled || !minimized || !minimized->checked()) {
+						Local::writeSettings();
+					} else if (minimized) {
+						minimized->setChecked(false);
+					}
+				}));
+			}, autostart->lifetime());
+
+			if (controller) {
+				Platform::AutostartRequestStateFromSystem(crl::guard(
+					controller,
+					[=](bool enabled) { autostart->setChecked(enabled); }));
+			}
+		}
+
+		if (minimized && controller) {
+			minimized->checkedChanges(
+			) | rpl::filter([=](bool checked) {
+				return (checked != minimizedToggled());
+			}) | rpl::on_next([=](bool checked) {
+				if (controller->session().domain().local().hasLocalPasscode()) {
+					minimized->setChecked(false);
+					controller->show(Ui::MakeInformBox(
+						tr::lng_error_start_minimized_passcoded()));
+				} else {
+					cSetStartMinimized(checked);
+					Local::writeSettings();
+				}
+			}, minimized->lifetime());
+
+			controller->session().domain().local().localPasscodeChanged(
+			) | rpl::on_next([=] {
+				minimized->setChecked(minimizedToggled());
+			}, minimized->lifetime());
+		}
+	}
+
+	if (Platform::IsWindows() && !Platform::IsWindowsStoreBuild()) {
+		const auto sendto = builder.addCheckbox({
+			.id = u"advanced/sendto"_q,
+			.title = tr::lng_settings_add_sendto(),
+			.checked = cSendToMenu(),
+			.keywords = { u"sendto"_q, u"send"_q, u"menu"_q, u"context"_q },
+		});
+		if (sendto) {
+			sendto->checkedChanges(
+			) | rpl::filter([](bool checked) {
+				return (checked != cSendToMenu());
+			}) | rpl::on_next([](bool checked) {
+				cSetSendToMenu(checked);
+				psSendToMenu(checked);
+				Local::writeSettings();
+			}, sendto->lifetime());
+		}
+	}
+
+	builder.addSkip();
+}
+
+#ifdef DESKTOP_APP_USE_ANGLE
+void BuildANGLEOption(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	using ANGLE = Ui::GL::ANGLE;
+
+	const auto options = std::vector{
+		tr::lng_settings_angle_backend_auto(tr::now),
+		tr::lng_settings_angle_backend_d3d11(tr::now),
+		tr::lng_settings_angle_backend_d3d9(tr::now),
+		tr::lng_settings_angle_backend_d3d11on12(tr::now),
+		tr::lng_settings_angle_backend_disabled(tr::now),
+	};
+	const auto disabled = int(options.size()) - 1;
+	const auto backendIndex = [=] {
+		if (Core::App().settings().disableOpenGL()) {
+			return disabled;
+		} else switch (Ui::GL::CurrentANGLE()) {
+		case ANGLE::Auto: return 0;
+		case ANGLE::D3D11: return 1;
+		case ANGLE::D3D9: return 2;
+		case ANGLE::D3D11on12: return 3;
+		}
+		Unexpected("Ui::GL::CurrentANGLE value in BuildANGLEOption.");
+	}();
+
+	builder.addButton({
+		.id = u"advanced/angle_backend"_q,
+		.title = tr::lng_settings_angle_backend(),
+		.st = &st::settingsButtonNoIcon,
+		.label = rpl::single(options[backendIndex]),
+		.onClick = [=] {
+			controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+				const auto save = [=](int index) {
+					if (index == backendIndex) {
+						return;
+					}
+					const auto confirmed = [=] {
+						const auto nowDisabled = (index == disabled);
+						if (!nowDisabled) {
+							Ui::GL::ChangeANGLE([&] {
+								switch (index) {
+								case 0: return ANGLE::Auto;
+								case 1: return ANGLE::D3D11;
+								case 2: return ANGLE::D3D9;
+								case 3: return ANGLE::D3D11on12;
+								}
+								Unexpected("Index in BuildANGLEOption.");
+							}());
+						}
+						const auto wasDisabled = (backendIndex == disabled);
+						if (nowDisabled != wasDisabled) {
+							Core::App().settings().setDisableOpenGL(nowDisabled);
+							Local::writeSettings();
+						}
+						Core::Restart();
+					};
+					controller->show(Ui::MakeConfirmBox({
+						.text = tr::lng_settings_need_restart(),
+						.confirmed = confirmed,
+						.confirmText = tr::lng_settings_restart_now(),
+					}));
+				};
+				SingleChoiceBox(box, {
+					.title = tr::lng_settings_angle_backend(),
+					.options = options,
+					.initialSelection = backendIndex,
+					.callback = save,
+				});
+			}));
+		},
+		.keywords = { u"angle"_q, u"opengl"_q, u"d3d"_q, u"graphics"_q },
+	});
+}
+#else
+void BuildOpenGLOption(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto opengl = builder.addButton({
+		.id = u"advanced/opengl"_q,
+		.title = tr::lng_settings_enable_opengl(),
+		.st = &st::settingsButtonNoIcon,
+		.toggled = rpl::single(!Core::App().settings().disableOpenGL()),
+		.keywords = { u"opengl"_q, u"graphics"_q, u"gpu"_q },
+	});
+
+	if (opengl) {
+		opengl->toggledValue(
+		) | rpl::filter([](bool enabled) {
+			return (enabled == Core::App().settings().disableOpenGL());
+		}) | rpl::on_next([=](bool enabled) {
+			const auto confirmed = crl::guard(opengl, [=] {
+				Core::App().settings().setDisableOpenGL(!enabled);
+				Local::writeSettings();
+				Core::Restart();
+			});
+			controller->show(Ui::MakeConfirmBox({
+				.text = tr::lng_settings_need_restart(),
+				.confirmed = confirmed,
+				.confirmText = tr::lng_settings_restart_now(),
+			}));
+		}, opengl->lifetime());
+	}
+}
+#endif
+
+void BuildPerformanceSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	builder.addDivider();
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"advanced/performance"_q,
+		.title = tr::lng_settings_performance(),
+		.keywords = { u"performance"_q, u"power"_q, u"graphics"_q, u"hardware"_q },
+	});
+
+	builder.addButton({
+		.id = u"advanced/power_saving"_q,
+		.title = tr::lng_settings_power_menu(),
+		.st = &st::settingsButtonNoIcon,
+		.onClick = [=] {
+			controller->window().show(Box(PowerSavingBox, PowerSaving::Flags()));
+		},
+		.keywords = { u"power"_q, u"saving"_q, u"battery"_q, u"animation"_q },
+	});
+
+	const auto hwAccel = builder.addButton({
+		.id = u"advanced/hw_accel"_q,
+		.title = tr::lng_settings_enable_hwaccel(),
+		.st = &st::settingsButtonNoIcon,
+		.toggled = rpl::single(
+			Core::App().settings().hardwareAcceleratedVideo()),
+		.keywords = { u"hardware"_q, u"acceleration"_q, u"video"_q },
+	});
+
+	if (hwAccel) {
+		hwAccel->toggledValue(
+		) | rpl::filter([](bool enabled) {
+			return (enabled !=
+				Core::App().settings().hardwareAcceleratedVideo());
+		}) | rpl::on_next([=](bool enabled) {
+			Core::App().settings().setHardwareAcceleratedVideo(enabled);
+			Core::App().saveSettingsDelayed();
+		}, hwAccel->lifetime());
+	}
+
+#ifdef DESKTOP_APP_USE_ANGLE
+	BuildANGLEOption(builder);
+#else
+	if constexpr (!Platform::IsMac()) {
+		BuildOpenGLOption(builder);
+	}
+#endif
+
+	builder.addSkip();
+}
+
+void BuildSpellcheckerSection(SectionBuilder &builder) {
+#ifndef TDESKTOP_DISABLE_SPELLCHECK
+	const auto controller = builder.controller();
+	const auto session = builder.session();
+	const auto settings = &Core::App().settings();
+	const auto isSystem = Platform::Spellchecker::IsSystemSpellchecker();
+
+	builder.addDivider();
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"advanced/spellchecker"_q,
+		.title = tr::lng_settings_spellchecker(),
+		.keywords = { u"spellcheck"_q, u"spelling"_q, u"dictionary"_q },
+	});
+
+	const auto spellchecker = builder.addButton({
+		.id = u"advanced/spellchecker_toggle"_q,
+		.title = isSystem
+			? tr::lng_settings_system_spellchecker()
+			: tr::lng_settings_custom_spellchecker(),
+		.st = &st::settingsButtonNoIcon,
+		.toggled = rpl::single(settings->spellcheckerEnabled()),
+		.keywords = { u"spellcheck"_q, u"spelling"_q, u"dictionary"_q },
+	});
+
+	if (spellchecker) {
+		spellchecker->toggledValue(
+		) | rpl::filter([=](bool enabled) {
+			return (enabled != settings->spellcheckerEnabled());
+		}) | rpl::on_next([=](bool enabled) {
+			settings->setSpellcheckerEnabled(enabled);
+			Core::App().saveSettingsDelayed();
+		}, spellchecker->lifetime());
+	}
+
+	if (!isSystem) {
+		builder.scope([&] {
+			const auto autoDownload = builder.addButton({
+				.id = u"advanced/auto_download_dictionaries"_q,
+				.title = tr::lng_settings_auto_download_dictionaries(),
+				.st = &st::settingsButtonNoIcon,
+				.toggled = rpl::single(settings->autoDownloadDictionaries()),
+				.keywords = { u"dictionary"_q, u"download"_q, u"spellcheck"_q },
+			});
+
+			if (autoDownload) {
+				autoDownload->toggledValue(
+				) | rpl::filter([=](bool enabled) {
+					return (enabled != settings->autoDownloadDictionaries());
+				}) | rpl::on_next([=](bool enabled) {
+					settings->setAutoDownloadDictionaries(enabled);
+					Core::App().saveSettingsDelayed();
+				}, autoDownload->lifetime());
+			}
+
+			builder.addButton({
+				.id = u"advanced/manage_dictionaries"_q,
+				.title = tr::lng_settings_manage_dictionaries(),
+				.st = &st::settingsButtonNoIcon,
+				.label = Spellchecker::ButtonManageDictsState(session),
+				.onClick = [=] {
+					controller->show(Box<Ui::ManageDictionariesBox>(session));
+				},
+				.keywords = { u"dictionary"_q, u"manage"_q, u"spellcheck"_q },
+			});
+		}, spellchecker ? spellchecker->toggledValue() : nullptr);
+	}
+
+	builder.addSkip();
+#endif // !TDESKTOP_DISABLE_SPELLCHECK
+}
+
+void BuildUpdateSection(SectionBuilder &builder, bool atTop) {
+	if (!HasUpdate()) {
+		return;
+	}
+	const auto container = builder.container();
+
+	if (!atTop) {
+		builder.addDivider();
+	}
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"advanced/version"_q,
+		.title = tr::lng_settings_version_info(),
+		.keywords = { u"version"_q, u"update"_q, u"check"_q },
+	});
+
+	const auto version = tr::lng_settings_current_version(
+		tr::now,
+		lt_version,
+		currentVersionText());
+
+	const auto texts = container
+		? Ui::CreateChild<rpl::event_stream<QString>>(container)
+		: nullptr;
+	const auto downloading = container
+		? Ui::CreateChild<rpl::event_stream<bool>>(container)
+		: nullptr;
+
+	const auto toggle = builder.addButton({
+		.id = u"advanced/auto_update"_q,
+		.title = tr::lng_settings_update_automatically(),
+		.st = &st::settingsUpdateToggle,
+		.toggled = rpl::single(cAutoUpdate()),
+		.keywords = { u"update"_q, u"automatic"_q, u"version"_q },
+	});
+
+	if (toggle) {
+		const auto label = Ui::CreateChild<Ui::FlatLabel>(
+			toggle,
+			texts->events(),
+			st::settingsUpdateState);
+
+		rpl::combine(
+			toggle->widthValue(),
+			label->widthValue()
+		) | rpl::on_next([=] {
+			label->moveToLeft(
+				st::settingsUpdateStatePosition.x(),
+				st::settingsUpdateStatePosition.y());
+		}, label->lifetime());
+		label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
+
+	auto optionsShown = rpl::producer<bool>(nullptr);
+	if (toggle) {
+		Core::UpdateChecker checker;
+		optionsShown = rpl::combine(
+			toggle->toggledValue(),
+			downloading->events_starting_with(
+				checker.state() == Core::UpdateChecker::State::Download)
+		) | rpl::map([](bool check, bool downloading) {
+			return check && !downloading;
+		});
+	}
+	auto options = (Ui::SlideWrap<Ui::VerticalLayout>*)nullptr;
+	auto install = (Ui::SettingsButton*)nullptr;
+	auto check = (Ui::SettingsButton*)nullptr;
+	builder.scope([&] {
+		install = (cAlphaVersion() || KSandbox::isInside())
+			? nullptr
+			: builder.addButton({
+				.id = u"advanced/install_beta"_q,
+				.title = tr::lng_settings_install_beta(),
+				.st = &st::settingsButtonNoIcon,
+				.toggled = rpl::single(cInstallBetaVersion()),
+				.keywords = { u"beta"_q, u"update"_q, u"version"_q },
+			});
+
+		check = builder.addButton({
+			.id = u"advanced/check_update"_q,
+			.title = tr::lng_settings_check_now(),
+			.st = &st::settingsButtonNoIcon,
+			.onClick = [] {
+				Core::UpdateChecker checker;
+				cSetLastUpdateCheck(0);
+				checker.start();
+			},
+			.keywords = { u"check"_q, u"update"_q, u"version"_q },
+		});
+	}, std::move(optionsShown), [&](auto wrap) {
+		options = wrap;
+	});
+
+	if (check && container) {
+		const auto update = Ui::CreateChild<Ui::SettingsButton>(
+			check,
+			tr::lng_update_telegram(),
+			st::settingsUpdate);
+		update->hide();
+		check->widthValue() | rpl::on_next([=](int width) {
+			update->resizeToWidth(width);
+			update->moveToLeft(0, 0);
+		}, update->lifetime());
+
+		const auto showDownloadProgress = [=](
+				int64 ready,
+				int64 total,
+				bool preferPercent) {
+			const auto formatted = [&] {
+				if (!preferPercent) {
+					return Ui::FormatDownloadText(ready, total);
+				}
+				const auto percent = (total > 0)
+					? std::clamp((ready * 100) / float64(total), 0., 100.)
+					: 0.;
+				auto result = QString::number(percent, 'f', 2);
+				if (result.contains('.')) {
+					while (result.endsWith('0')) {
+						result.chop(1);
+					}
+					if (result.endsWith('.')) {
+						result.chop(1);
+					}
+				}
+				return result + '%';
+			}();
+			texts->fire(tr::lng_settings_downloading_update(
+				tr::now,
+				lt_progress,
+				formatted));
+			downloading->fire(true);
+		};
+		const auto setDefaultStatus = [=](
+				const Core::UpdateChecker &checker) {
+			using State = Core::UpdateChecker::State;
+			const auto state = checker.state();
+			switch (state) {
+			case State::Download:
+				showDownloadProgress(
+					checker.already(),
+					checker.size(),
+					checker.percent());
+				break;
+			case State::Ready:
+				texts->fire(tr::lng_settings_update_ready(tr::now));
+				update->show();
+				break;
+			default:
+				texts->fire_copy(version);
+				break;
+			}
+		};
+
+		toggle->toggledValue(
+		) | rpl::filter([](bool toggled) {
+			return (toggled != cAutoUpdate());
+		}) | rpl::on_next([=](bool toggled) {
+			cSetAutoUpdate(toggled);
+			Local::writeSettings();
+			Core::UpdateChecker checker;
+			if (cAutoUpdate()) {
+				checker.start();
+			} else {
+				checker.stop();
+				setDefaultStatus(checker);
+			}
+		}, toggle->lifetime());
+
+		if (install) {
+			install->toggledValue(
+			) | rpl::filter([](bool toggled) {
+				return (toggled != cInstallBetaVersion());
+			}) | rpl::on_next([=](bool toggled) {
+				cSetInstallBetaVersion(toggled);
+				Core::Launcher::Instance().writeInstallBetaVersionsSetting();
+				Core::UpdateChecker checker;
+				checker.stop();
+				if (toggled) {
+					cSetLastUpdateCheck(0);
+				}
+				checker.start();
+			}, toggle->lifetime());
+		}
+
+		Core::UpdateChecker checker;
+
+		checker.checking() | rpl::on_next([=] {
+			options->setAttribute(Qt::WA_TransparentForMouseEvents);
+			texts->fire(tr::lng_settings_update_checking(tr::now));
+			downloading->fire(false);
+		}, options->lifetime());
+		checker.isLatest() | rpl::on_next([=] {
+			options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
+			texts->fire(tr::lng_settings_latest_installed(tr::now));
+			downloading->fire(false);
+		}, options->lifetime());
+		checker.progress(
+		) | rpl::on_next([=](Core::UpdateChecker::Progress progress) {
+			showDownloadProgress(
+				progress.already,
+				progress.size,
+				progress.percent);
+		}, options->lifetime());
+		checker.failed() | rpl::on_next([=] {
+			options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
+			texts->fire(tr::lng_settings_update_fail(tr::now));
+			downloading->fire(false);
+		}, options->lifetime());
+		checker.ready() | rpl::on_next([=] {
+			options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
+			texts->fire(tr::lng_settings_update_ready(tr::now));
+			update->show();
+			downloading->fire(false);
+		}, options->lifetime());
+
+		setDefaultStatus(checker);
+
+		update->setClickedCallback([] {
+			if (!Core::UpdaterDisabled()) {
+				Core::checkReadyUpdate();
+			}
+			Core::Restart();
+		});
+	}
+
+	builder.addSkip();
+	if (atTop) {
+		builder.addDivider();
+	}
+}
+
+void BuildExportSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto session = builder.session();
+	const auto showOther = builder.showOther();
+	builder.addSkip();
+	builder.addDivider();
+	builder.addSkip();
+
+	builder.addButton({
+		.id = u"advanced/export"_q,
+		.title = tr::lng_settings_export_data(),
+		.icon = { &st::menuIconExport },
+		.onClick = [=] {
+			controller->window().hideSettingsAndLayer();
+			base::call_delayed(
+				st::boxDuration,
+				session,
+				[=] { Core::App().exportManager().start(session); });
+		},
+		.keywords = { u"export"_q, u"data"_q, u"backup"_q },
+	});
+
+	builder.addButton({
+		.id = u"advanced/experimental"_q,
+		.title = tr::lng_settings_experimental(),
+		.icon = { &st::menuIconExperimental },
+		.onClick = [showOther] { showOther(Experimental::Id()); },
+		.keywords = { u"experimental"_q, u"beta"_q, u"features"_q },
+	});
+}
+
+void BuildScreenReaderSection(SectionBuilder &builder) {
+	const auto detected = base::ScreenReaderState::Instance()->active();
+	const auto disabled = Ui::ScreenReaderModeDisabled();
+	if (!detected || !disabled) {
+		return;
+	}
+
+	builder.addDivider();
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"advanced/screen_reader"_q,
+		.title = tr::lng_screen_reader_settings_title(),
+		.keywords = { u"screen reader"_q, u"accessibility"_q, u"voiceover"_q },
+	});
+
+	const auto toggle = builder.addButton({
+		.id = u"advanced/screen_reader_disable"_q,
+		.title = tr::lng_screen_reader_settings_disable(),
+		.st = &st::settingsButtonNoIcon,
+		.toggled = rpl::single(disabled),
+		.keywords = { u"screen reader"_q, u"accessibility"_q },
+	});
+
+	if (toggle) {
+		toggle->toggledValue(
+		) | rpl::filter([=](bool value) {
+			return (value != Ui::ScreenReaderModeDisabled());
+		}) | rpl::on_next([=](bool value) {
+			Core::App().settings().writePref<bool>(
+				Core::kScreenReaderModeDisabledKey,
+				value);
+			Core::App().saveSettingsDelayed();
+			Ui::SetScreenReaderModeDisabled(value);
+		}, toggle->lifetime());
+	}
+
+	builder.addSkip();
+}
+
+class Advanced : public Section<Advanced> {
+public:
+	Advanced(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+private:
+	void setupContent();
+
+};
+
+const auto kMeta = BuildHelper({
+	.id = Advanced::Id(),
+	.parentId = MainId(),
+	.title = &tr::lng_settings_advanced,
+	.icon = &st::menuIconManage,
+}, [](SectionBuilder &builder) {
+	const auto autoUpdate = cAutoUpdate();
+
+	if (!autoUpdate) {
+		BuildUpdateSection(builder, true);
+	}
+	BuildDataStorageSection(builder);
+	BuildAutoDownloadSection(builder);
+	BuildWindowTitleSection(builder);
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
+	BuildWindowCloseBehaviorSection(builder);
+#endif
+	BuildSystemIntegrationSection(builder);
+	BuildPerformanceSection(builder);
+	BuildSpellcheckerSection(builder);
+	BuildScreenReaderSection(builder);
+	if (autoUpdate) {
+		BuildUpdateSection(builder, false);
+	}
+	BuildExportSection(builder);
+});
+
+const SectionBuildMethod kAdvancedSection = kMeta.build;
+
+Advanced::Advanced(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: Section(parent, controller) {
+	setupContent();
+}
+
+rpl::producer<QString> Advanced::title() {
+	return tr::lng_settings_advanced();
+}
+
+void Advanced::setupContent() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	build(content, kAdvancedSection);
+
+	Ui::ResizeFitChild(this, content);
+}
+
+} // namespace
+
+void SetupConnectionType(
+		not_null<Window::Controller*> controller,
+		not_null<::Main::Account*> account,
+		not_null<Ui::VerticalLayout*> container) {
+	const auto connectionType = [=] {
+		const auto transport = account->mtp().dctransport();
+		if (!Core::App().settings().proxy().isEnabled()) {
+			return transport.isEmpty()
+				? tr::lng_connection_auto_connecting(tr::now)
+				: tr::lng_connection_auto(tr::now, lt_transport, transport);
+		} else {
+			return transport.isEmpty()
+				? tr::lng_connection_proxy_connecting(tr::now)
+				: tr::lng_connection_proxy(tr::now, lt_transport, transport);
+		}
+	};
+	const auto button = AddButtonWithLabel(
+		container,
+		tr::lng_settings_connection_type(),
+		rpl::merge(
+			Core::App().settings().proxy().connectionTypeChanges(),
+			tr::lng_connection_auto_connecting() | rpl::to_empty
+		) | rpl::map([=] { return connectionType(); }),
+		st::settingsButton,
+		{ &st::menuIconNetwork });
+	button->addClickHandler([=] {
+		controller->show(ProxiesBoxController::CreateOwningBox(account));
+	});
+}
+
+bool HasUpdate() {
+	return !Core::UpdaterDisabled();
+}
+
+void SetupUpdate(not_null<Ui::VerticalLayout*> container) {
+	if (!HasUpdate()) {
+		return;
+	}
+
+	const auto texts = Ui::CreateChild<rpl::event_stream<QString>>(
+		container.get());
+	const auto downloading = Ui::CreateChild<rpl::event_stream<bool>>(
+		container.get());
+	const auto version = tr::lng_settings_current_version(
+		tr::now,
+		lt_version,
+		currentVersionText());
+	const auto toggle = container->add(object_ptr<Button>(
+		container,
+		tr::lng_settings_update_automatically(),
+		st::settingsUpdateToggle));
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		toggle,
+		texts->events(),
+		st::settingsUpdateState);
+
+	const auto options = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto inner = options->entity();
+	const auto install = (cAlphaVersion() || KSandbox::isInside())
+		? nullptr
+		: inner->add(object_ptr<Button>(
+			inner,
+			tr::lng_settings_install_beta(),
+			st::settingsButtonNoIcon));
+
+	const auto check = inner->add(object_ptr<Button>(
+		inner,
+		tr::lng_settings_check_now(),
+		st::settingsButtonNoIcon));
+	const auto update = Ui::CreateChild<Button>(
+		check,
+		tr::lng_update_telegram(),
+		st::settingsUpdate);
+	update->hide();
+	check->widthValue() | rpl::on_next([=](int width) {
+		update->resizeToWidth(width);
+		update->moveToLeft(0, 0);
+	}, update->lifetime());
+
+	rpl::combine(
+		toggle->widthValue(),
+		label->widthValue()
+	) | rpl::on_next([=] {
+		label->moveToLeft(
+			st::settingsUpdateStatePosition.x(),
+			st::settingsUpdateStatePosition.y());
+	}, label->lifetime());
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	const auto showDownloadProgress = [=](
+			int64 ready,
+			int64 total,
+			bool preferPercent) {
+		const auto formatted = [&] {
+			if (!preferPercent) {
+				return Ui::FormatDownloadText(ready, total);
+			}
+			const auto percent = (total > 0)
+				? std::clamp((ready * 100) / float64(total), 0., 100.)
+				: 0.;
+			auto result = QString::number(percent, 'f', 2);
+			if (result.contains('.')) {
+				while (result.endsWith('0')) {
+					result.chop(1);
+				}
+				if (result.endsWith('.')) {
+					result.chop(1);
+				}
+			}
+			return result + '%';
+		}();
+		texts->fire(tr::lng_settings_downloading_update(
+			tr::now,
+			lt_progress,
+			formatted));
+		downloading->fire(true);
+	};
+	const auto setDefaultStatus = [=](const Core::UpdateChecker &checker) {
+		using State = Core::UpdateChecker::State;
+		const auto state = checker.state();
+		switch (state) {
+		case State::Download:
+			showDownloadProgress(
+				checker.already(),
+				checker.size(),
+				checker.percent());
+			break;
+		case State::Ready:
+			texts->fire(tr::lng_settings_update_ready(tr::now));
+			update->show();
+			break;
+		default:
+			texts->fire_copy(version);
+			break;
+		}
+	};
+
+	toggle->toggleOn(rpl::single(cAutoUpdate()));
+	toggle->toggledValue(
+	) | rpl::filter([](bool toggled) {
+		return (toggled != cAutoUpdate());
+	}) | rpl::on_next([=](bool toggled) {
+		cSetAutoUpdate(toggled);
+
+		Local::writeSettings();
+		Core::UpdateChecker checker;
+		if (cAutoUpdate()) {
+			checker.start();
+		} else {
+			checker.stop();
+			setDefaultStatus(checker);
+		}
+	}, toggle->lifetime());
+
+	if (install) {
+		install->toggleOn(rpl::single(cInstallBetaVersion()));
+		install->toggledValue(
+		) | rpl::filter([](bool toggled) {
+			return (toggled != cInstallBetaVersion());
+		}) | rpl::on_next([=](bool toggled) {
+			cSetInstallBetaVersion(toggled);
+			Core::Launcher::Instance().writeInstallBetaVersionsSetting();
+
+			Core::UpdateChecker checker;
+			checker.stop();
+			if (toggled) {
+				cSetLastUpdateCheck(0);
+			}
+			checker.start();
+		}, toggle->lifetime());
+	}
+
+	Core::UpdateChecker checker;
+	options->toggleOn(rpl::combine(
+		toggle->toggledValue(),
+		downloading->events_starting_with(
+			checker.state() == Core::UpdateChecker::State::Download)
+	) | rpl::map([](bool check, bool downloading) {
+		return check && !downloading;
+	}));
+
+	checker.checking() | rpl::on_next([=] {
+		options->setAttribute(Qt::WA_TransparentForMouseEvents);
+		texts->fire(tr::lng_settings_update_checking(tr::now));
+		downloading->fire(false);
+	}, options->lifetime());
+	checker.isLatest() | rpl::on_next([=] {
+		options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
+		texts->fire(tr::lng_settings_latest_installed(tr::now));
+		downloading->fire(false);
+	}, options->lifetime());
+	checker.progress(
+	) | rpl::on_next([=](Core::UpdateChecker::Progress progress) {
+		showDownloadProgress(
+			progress.already,
+			progress.size,
+			progress.percent);
+	}, options->lifetime());
+	checker.failed() | rpl::on_next([=] {
+		options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
+		texts->fire(tr::lng_settings_update_fail(tr::now));
+		downloading->fire(false);
+	}, options->lifetime());
+	checker.ready() | rpl::on_next([=] {
+		options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
+		texts->fire(tr::lng_settings_update_ready(tr::now));
+		update->show();
+		downloading->fire(false);
+	}, options->lifetime());
+
+	setDefaultStatus(checker);
+
+	check->addClickHandler([] {
+		Core::UpdateChecker checker;
+
+		cSetLastUpdateCheck(0);
+		checker.start();
+	});
+	update->addClickHandler([] {
+		if (!Core::UpdaterDisabled()) {
+			Core::checkReadyUpdate();
+		}
+		Core::Restart();
+	});
+}
+
+void SetupWindowTitleContent(
+		Window::SessionController *controller,
+		not_null<Ui::VerticalLayout*> container) {
+	const auto checkbox = [&](rpl::producer<QString> &&label, bool checked) {
+		return object_ptr<Ui::Checkbox>(
+			container,
+			std::move(label),
+			checked,
+			st::settingsCheckbox);
+	};
+	const auto addCheckbox = [&](
+			rpl::producer<QString> &&label,
+			bool checked) {
+		return container->add(
+			checkbox(std::move(label), checked),
+			st::settingsCheckboxPadding);
+	};
+	const auto settings = &Core::App().settings();
+	if (controller) {
+		const auto content = [=] {
+			return settings->windowTitleContent();
+		};
+		const auto showChatName = addCheckbox(
+			tr::lng_settings_title_chat_name(),
+			!content().hideChatName);
+		showChatName->checkedChanges(
+		) | rpl::filter([=](bool checked) {
+			return (checked == content().hideChatName);
+		}) | rpl::on_next([=](bool checked) {
+			auto updated = content();
+			updated.hideChatName = !checked;
+			settings->setWindowTitleContent(updated);
+			Core::App().saveSettingsDelayed();
+		}, showChatName->lifetime());
+
+		if (Core::App().domain().accountsAuthedCount() > 1) {
+			const auto showAccountName = addCheckbox(
+				tr::lng_settings_title_account_name(),
+				!content().hideAccountName);
+			showAccountName->checkedChanges(
+			) | rpl::filter([=](bool checked) {
+				return (checked == content().hideAccountName);
+			}) | rpl::on_next([=](bool checked) {
+				auto updated = content();
+				updated.hideAccountName = !checked;
+				settings->setWindowTitleContent(updated);
+				Core::App().saveSettingsDelayed();
+			}, showAccountName->lifetime());
+		}
+
+		const auto showTotalUnread = addCheckbox(
+			tr::lng_settings_title_total_count(),
+			!content().hideTotalUnread);
+		showTotalUnread->checkedChanges(
+		) | rpl::filter([=](bool checked) {
+			return (checked == content().hideTotalUnread);
+		}) | rpl::on_next([=](bool checked) {
+			auto updated = content();
+			updated.hideTotalUnread = !checked;
+			settings->setWindowTitleContent(updated);
+			Core::App().saveSettingsDelayed();
+		}, showTotalUnread->lifetime());
+	}
+
+	if (Ui::Platform::NativeWindowFrameSupported()) {
+		const auto nativeFrame = addCheckbox(
+			Platform::IsWayland()
+				? tr::lng_settings_qt_frame()
+				: tr::lng_settings_native_frame(),
+			Core::App().settings().nativeWindowFrame());
+
+		nativeFrame->checkedChanges(
+		) | rpl::filter([](bool checked) {
+			return (checked != Core::App().settings().nativeWindowFrame());
+		}) | rpl::on_next([=](bool checked) {
+			Core::App().settings().setNativeWindowFrame(checked);
+			Core::App().saveSettingsDelayed();
+		}, nativeFrame->lifetime());
+	}
+}
+
+void SetupSystemIntegrationContent(
+		Window::SessionController *controller,
+		not_null<Ui::VerticalLayout*> container) {
+	using WorkMode = Core::Settings::WorkMode;
+
+	const auto checkbox = [&](rpl::producer<QString> &&label, bool checked) {
+		return object_ptr<Ui::Checkbox>(
+			container,
+			std::move(label),
+			checked,
+			st::settingsCheckbox);
+	};
+	const auto addCheckbox = [&](
+			rpl::producer<QString> &&label,
+			bool checked) {
+		return container->add(
+			checkbox(std::move(label), checked),
+			st::settingsCheckboxPadding);
+	};
+	const auto addSlidingCheckbox = [&](
+			rpl::producer<QString> &&label,
+			bool checked) {
+		return container->add(
+			object_ptr<Ui::SlideWrap<Ui::Checkbox>>(
+				container,
+				checkbox(std::move(label), checked),
+				st::settingsCheckboxPadding));
+	};
+
+	const auto settings = &Core::App().settings();
+	if (Platform::TrayIconSupported()) {
+		const auto trayEnabled = [=] {
+			const auto workMode = settings->workMode();
+			return (workMode == WorkMode::TrayOnly)
+				|| (workMode == WorkMode::WindowAndTray);
+		};
+		const auto tray = addCheckbox(
+			tr::lng_settings_workmode_tray(),
+			trayEnabled());
+		const auto monochrome = Platform::HasMonochromeSetting()
+			? addSlidingCheckbox(
+				tr::lng_settings_monochrome_icon(),
+				settings->trayIconMonochrome())
+			: nullptr;
+		if (monochrome) {
+			monochrome->toggle(tray->checked(), anim::type::instant);
+
+			monochrome->entity()->checkedChanges(
+			) | rpl::filter([=](bool value) {
+				return (value != settings->trayIconMonochrome());
+			}) | rpl::on_next([=](bool value) {
+				settings->setTrayIconMonochrome(value);
+				Core::App().saveSettingsDelayed();
+			}, monochrome->lifetime());
+		}
+
+		const auto taskbarEnabled = [=] {
+			const auto workMode = settings->workMode();
+			return (workMode == WorkMode::WindowOnly)
+				|| (workMode == WorkMode::WindowAndTray);
+		};
+		const auto taskbar = Platform::SkipTaskbarSupported()
+			? addCheckbox(
+				tr::lng_settings_workmode_window(),
+				taskbarEnabled())
+			: nullptr;
+
+		const auto updateWorkmode = [=] {
+			const auto newMode = tray->checked()
+				? ((!taskbar || taskbar->checked())
+					? WorkMode::WindowAndTray
+					: WorkMode::TrayOnly)
+				: WorkMode::WindowOnly;
+			if ((newMode == WorkMode::WindowAndTray
+				|| newMode == WorkMode::TrayOnly)
+				&& settings->workMode() != newMode) {
+				cSetSeenTrayTooltip(false);
+			}
+			settings->setWorkMode(newMode);
+			Core::App().saveSettingsDelayed();
+		};
+
+		tray->checkedChanges(
+		) | rpl::filter([=](bool checked) {
+			return (checked != trayEnabled());
+		}) | rpl::on_next([=](bool checked) {
+			if (!checked && taskbar && !taskbar->checked()) {
+				taskbar->setChecked(true);
+			} else {
+				updateWorkmode();
+			}
+			if (monochrome) {
+				monochrome->toggle(checked, anim::type::normal);
+			}
+		}, tray->lifetime());
+
+		if (taskbar) {
+			taskbar->checkedChanges(
+			) | rpl::filter([=](bool checked) {
+				return (checked != taskbarEnabled());
+			}) | rpl::on_next([=](bool checked) {
+				if (!checked && !tray->checked()) {
+					tray->setChecked(true);
+				} else {
+					updateWorkmode();
+				}
+			}, taskbar->lifetime());
+		}
+	}
+
+#ifdef Q_OS_MAC
+	const auto warnBeforeQuit = addCheckbox(
+		tr::lng_settings_mac_warn_before_quit(
+			lt_text,
+			rpl::single(Platform::ConfirmQuit::QuitKeysString())),
+		settings->macWarnBeforeQuit());
+	warnBeforeQuit->checkedChanges(
+	) | rpl::filter([=](bool checked) {
+		return (checked != settings->macWarnBeforeQuit());
+	}) | rpl::on_next([=](bool checked) {
+		settings->setMacWarnBeforeQuit(checked);
+		Core::App().saveSettingsDelayed();
+	}, warnBeforeQuit->lifetime());
+
+#ifndef OS_MAC_STORE
+	const auto enabled = [=] {
+		const auto digest = base::Platform::CurrentCustomAppIconDigest();
+		return digest && (settings->macRoundIconDigest() == digest);
+	};
+	const auto roundIcon = addCheckbox(
+		tr::lng_settings_mac_round_icon(),
+		enabled());
+	roundIcon->checkedChanges(
+	) | rpl::filter([=](bool checked) {
+		return (checked != enabled());
+	}) | rpl::on_next([=](bool checked) {
+		const auto digest = checked
+			? base::Platform::SetCustomAppIcon(IconMacRound())
+			: std::optional<uint64>();
+		if (!checked) {
+			base::Platform::ClearCustomAppIcon();
+		}
+		Window::OverrideApplicationIcon(checked ? IconMacRound() : QImage());
+		Core::App().refreshApplicationIcon();
+		settings->setMacRoundIconDigest(digest);
+		Core::App().saveSettings();
+	}, roundIcon->lifetime());
+#endif // OS_MAC_STORE
+#elif defined Q_OS_WIN // Q_OS_MAC
+	using Behavior = Core::Settings::CloseBehavior;
+	const auto closeToTaskbar = addSlidingCheckbox(
+		tr::lng_settings_close_to_taskbar(),
+		settings->closeBehavior() == Behavior::CloseToTaskbar);
+
+	const auto closeToTaskbarShown = std::make_shared<
+		rpl::variable<bool>
+	>(false);
+	settings->workModeValue(
+	) | rpl::on_next([=](WorkMode workMode) {
+		*closeToTaskbarShown = !Core::App().tray().has();
+	}, closeToTaskbar->lifetime());
+
+	closeToTaskbar->toggleOn(closeToTaskbarShown->value());
+	closeToTaskbar->entity()->checkedChanges(
+	) | rpl::map([=](bool checked) {
+		return checked ? Behavior::CloseToTaskbar : Behavior::Quit;
+	}) | rpl::filter([=](Behavior value) {
+		return (settings->closeBehavior() != value);
+	}) | rpl::on_next([=](Behavior value) {
+		settings->setCloseBehavior(value);
+		Local::writeSettings();
+	}, closeToTaskbar->lifetime());
+#endif // Q_OS_MAC || Q_OS_WIN
+
+	if (Platform::AutostartSupported() && controller) {
+		const auto minimizedToggled = [=] {
+			return cStartMinimized()
+				&& !controller->session().domain().local().hasLocalPasscode();
+		};
+
+		const auto autostart = addCheckbox(
+			tr::lng_settings_auto_start(),
+			cAutoStart());
+		const auto minimized = addSlidingCheckbox(
+			tr::lng_settings_start_min(),
+			minimizedToggled());
+
+		autostart->checkedChanges(
+		) | rpl::filter([](bool checked) {
+			return (checked != cAutoStart());
+		}) | rpl::on_next([=](bool checked) {
+			const auto weak = base::make_weak(controller);
+			cSetAutoStart(checked);
+			Platform::AutostartToggle(checked, crl::guard(autostart, [=](
+					bool enabled) {
+				if (checked && !enabled && weak) {
+					weak->window().showToast(
+						Lang::Hard::AutostartEnableError());
+				}
+				Ui::PostponeCall(autostart, [=] {
+					autostart->setChecked(enabled);
+				});
+				if (enabled || !minimized->entity()->checked()) {
+					Local::writeSettings();
+				} else {
+					minimized->entity()->setChecked(false);
+				}
+			}));
+		}, autostart->lifetime());
+
+		Platform::AutostartRequestStateFromSystem(crl::guard(
+			controller,
+			[=](bool enabled) { autostart->setChecked(enabled); }));
+
+		minimized->toggleOn(autostart->checkedValue());
+		minimized->entity()->checkedChanges(
+		) | rpl::filter([=](bool checked) {
+			return (checked != minimizedToggled());
+		}) | rpl::on_next([=](bool checked) {
+			if (controller->session().domain().local().hasLocalPasscode()) {
+				minimized->entity()->setChecked(false);
+				controller->show(Ui::MakeInformBox(
+					tr::lng_error_start_minimized_passcoded()));
+			} else {
+				cSetStartMinimized(checked);
+				Local::writeSettings();
+			}
+		}, minimized->lifetime());
+
+		controller->session().domain().local().localPasscodeChanged(
+		) | rpl::on_next([=] {
+			minimized->entity()->setChecked(minimizedToggled());
+		}, minimized->lifetime());
+	}
+
+	if (Platform::IsWindows() && !Platform::IsWindowsStoreBuild()) {
+		const auto sendto = addCheckbox(
+			tr::lng_settings_add_sendto(),
+			cSendToMenu());
+
+		sendto->checkedChanges(
+		) | rpl::filter([](bool checked) {
+			return (checked != cSendToMenu());
+		}) | rpl::on_next([](bool checked) {
+			cSetSendToMenu(checked);
+			psSendToMenu(checked);
+			Local::writeSettings();
+		}, sendto->lifetime());
+	}
+}
+
+void SetupAnimations(
+		not_null<Window::Controller*> window,
+		not_null<Ui::VerticalLayout*> container) {
+	container->add(object_ptr<Button>(
+		container,
+		tr::lng_settings_power_menu(),
+		st::settingsButtonNoIcon
+	))->setClickedCallback([=] {
+		window->show(Box(PowerSavingBox, PowerSaving::Flags()));
+	});
+}
+
+void ArchiveSettingsBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> controller) {
+	box->setTitle(tr::lng_settings_archive_title());
+	box->setWidth(st::boxWideWidth);
+
+	box->addButton(tr::lng_about_done(), [=] { box->closeBox(); });
+
+	PreloadArchiveSettings(&controller->session());
+
+	struct State {
+		Ui::SlideWrap<Ui::VerticalLayout> *foldersWrap = nullptr;
+		Ui::SettingsButton *folders = nullptr;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	const auto privacy = &controller->session().api().globalPrivacy();
+
+	const auto container = box->verticalLayout();
+	AddSkip(container);
+	AddSubsectionTitle(container, tr::lng_settings_unmuted_chats());
+
+	using Unarchive = Api::UnarchiveOnNewMessage;
+	container->add(object_ptr<Button>(
+		container,
+		tr::lng_settings_always_in_archive(),
+		st::settingsButtonNoIcon
+	))->toggleOn(privacy->unarchiveOnNewMessage(
+	) | rpl::map(
+		rpl::mappers::_1 == Unarchive::None
+	))->toggledChanges(
+	) | rpl::filter([=](bool toggled) {
+		const auto current = privacy->unarchiveOnNewMessageCurrent();
+		state->foldersWrap->toggle(!toggled, anim::type::normal);
+		return toggled != (current == Unarchive::None);
+	}) | rpl::on_next([=](bool toggled) {
+		privacy->updateUnarchiveOnNewMessage(toggled
+			? Unarchive::None
+			: state->folders->toggled()
+			? Unarchive::NotInFoldersUnmuted
+			: Unarchive::AnyUnmuted);
+	}, container->lifetime());
+
+	AddSkip(container);
+	AddDividerText(container, tr::lng_settings_unmuted_chats_about());
+
+	state->foldersWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto inner = state->foldersWrap->entity();
+	AddSkip(inner);
+	AddSubsectionTitle(inner, tr::lng_settings_chats_from_folders());
+
+	state->folders = inner->add(object_ptr<Button>(
+		inner,
+		tr::lng_settings_always_in_archive(),
+		st::settingsButtonNoIcon
+	))->toggleOn(privacy->unarchiveOnNewMessage(
+	) | rpl::map(
+		rpl::mappers::_1 != Unarchive::AnyUnmuted
+	));
+	state->folders->toggledChanges(
+	) | rpl::filter([=](bool toggled) {
+		const auto current = privacy->unarchiveOnNewMessageCurrent();
+		return toggled != (current != Unarchive::AnyUnmuted);
+	}) | rpl::on_next([=](bool toggled) {
+		const auto current = privacy->unarchiveOnNewMessageCurrent();
+		privacy->updateUnarchiveOnNewMessage(!toggled
+			? Unarchive::AnyUnmuted
+			: (current == Unarchive::AnyUnmuted)
+			? Unarchive::NotInFoldersUnmuted
+			: current);
+	}, inner->lifetime());
+
+	AddSkip(inner);
+	AddDividerText(inner, tr::lng_settings_chats_from_folders_about());
+
+	state->foldersWrap->toggle(
+		privacy->unarchiveOnNewMessageCurrent() != Unarchive::None,
+		anim::type::instant);
+
+	SetupArchiveAndMute(controller, box->verticalLayout());
+}
+
+void PreloadArchiveSettings(not_null<::Main::Session*> session) {
+	session->api().globalPrivacy().reload();
+}
+
+Type AdvancedId() {
+	return Advanced::Id();
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_advanced.h b/Telegram/SourceFiles/settings/sections/settings_advanced.h
similarity index 79%
rename from Telegram/SourceFiles/settings/settings_advanced.h
rename to Telegram/SourceFiles/settings/sections/settings_advanced.h
index 1d46797b47d99c..ceed08440fb2f8 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.h
+++ b/Telegram/SourceFiles/settings/sections/settings_advanced.h
@@ -7,7 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "settings/settings_common_session.h"
+#include "settings/settings_type.h"
 
 namespace Main {
 class Account;
@@ -16,6 +16,7 @@ class Session;
 
 namespace Ui {
 class GenericBox;
+class VerticalLayout;
 } // namespace Ui
 
 namespace Window {
@@ -25,6 +26,8 @@ class SessionController;
 
 namespace Settings {
 
+[[nodiscard]] Type AdvancedId();
+
 void SetupConnectionType(
 	not_null<Window::Controller*> controller,
 	not_null<::Main::Account*> account,
@@ -46,17 +49,4 @@ void ArchiveSettingsBox(
 	not_null<Window::SessionController*> controller);
 void PreloadArchiveSettings(not_null<::Main::Session*> session);
 
-class Advanced : public Section<Advanced> {
-public:
-	Advanced(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller);
-
-	[[nodiscard]] rpl::producer<QString> title() override;
-
-private:
-	void setupContent(not_null<Window::SessionController*> controller);
-
-};
-
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp b/Telegram/SourceFiles/settings/sections/settings_blocked_peers.cpp
similarity index 56%
rename from Telegram/SourceFiles/settings/settings_blocked_peers.cpp
rename to Telegram/SourceFiles/settings/sections/settings_blocked_peers.cpp
index c0b2a47463d3e5..f06bb447090fd1 100644
--- a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
+++ b/Telegram/SourceFiles/settings/sections/settings_blocked_peers.cpp
@@ -5,7 +5,9 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_blocked_peers.h"
+#include "settings/sections/settings_blocked_peers.h"
+
+#include "settings/settings_common_session.h"
 
 #include "api/api_blocked_peers.h"
 #include "apiwrap.h"
@@ -14,6 +16,9 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "lottie/lottie_icon.h"
 #include "main/main_session.h"
+#include "settings/sections/settings_privacy_security.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common.h"
 #include "settings/settings_privacy_controllers.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/padding_wrap.h"
@@ -27,12 +32,56 @@ For license and copyright information please follow this link:
 #include "styles/style_menu_icons.h"
 
 namespace Settings {
+namespace {
+
+using namespace Builder;
+
+void BuildBlockedSection(SectionBuilder &builder) {
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"blocked/block-user"_q,
+			.title = tr::lng_blocked_list_add(tr::now),
+			.keywords = { u"block"_q, u"ban"_q, u"add"_q },
+		};
+	});
+}
+
+class Blocked : public Section<Blocked> {
+public:
+	Blocked(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	void showFinished() override;
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToTop(
+		not_null<QWidget*> parent) override;
+
+private:
+	void setupContent();
+	void checkTotal(int total);
+
+	void visibleTopBottomUpdated(int visibleTop, int visibleBottom) override;
+
+	const not_null<Ui::VerticalLayout*> _container;
+
+	base::unique_qptr<Ui::RpWidget> _loading;
+
+	rpl::variable<int> _countBlocked;
+
+	rpl::event_stream<> _showFinished;
+	rpl::event_stream<bool> _emptinessChanges;
+
+	QPointer<Ui::RpWidget> _blockUserButton;
+
+};
 
 Blocked::Blocked(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: Section(parent)
-, _controller(controller)
+: Section(parent, controller)
 , _container(Ui::CreateChild<Ui::VerticalLayout>(this)) {
 
 	setupContent();
@@ -40,29 +89,28 @@ Blocked::Blocked(
 	{
 		auto padding = st::changePhoneIconPadding;
 		padding.setBottom(padding.top());
-		_loading = base::make_unique_q<Ui::CenterWrap<>>(
+		_loading = base::make_unique_q<Ui::PaddingWrap<>>(
 			this,
-			object_ptr<Ui::PaddingWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				this,
-				object_ptr<Ui::FlatLabel>(
-					this,
-					tr::lng_contacts_loading(),
-					st::changePhoneDescription),
-				std::move(padding)));
+				tr::lng_contacts_loading(),
+				st::changePhoneDescription),
+			std::move(padding));
 		Ui::ResizeFitChild(
 			this,
 			_loading.get(),
 			st::settingsBlockedHeightMin);
 	}
 
-	_controller->session().api().blockedPeers().slice(
-	) | rpl::start_with_next([=](const Api::BlockedPeers::Slice &slice) {
+	controller->session().api().blockedPeers().slice(
+	) | rpl::on_next([=](const Api::BlockedPeers::Slice &slice) {
+		_countBlocked = slice.total;
 		checkTotal(slice.total);
 	}, lifetime());
 
-	_controller->session().changes().peerUpdates(
+	controller->session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::IsBlocked
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		if (update.peer->isBlocked()) {
 			checkTotal(1);
 		}
@@ -73,18 +121,20 @@ rpl::producer<QString> Blocked::title() {
 	return tr::lng_settings_blocked_users();
 }
 
-QPointer<Ui::RpWidget> Blocked::createPinnedToTop(not_null<QWidget*> parent) {
+base::weak_qptr<Ui::RpWidget> Blocked::createPinnedToTop(
+		not_null<QWidget*> parent) {
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(parent.get());
 
 	Ui::AddSkip(content);
 
-	AddButtonWithIcon(
+	const auto blockButton = AddButtonWithIcon(
 		content,
 		tr::lng_blocked_list_add(),
 		st::settingsButtonActive,
-		{ &st::menuIconBlockSettings }
-	)->addClickHandler([=] {
-		BlockedBoxController::BlockNewPeer(_controller);
+		{ &st::menuIconBlockSettings });
+	_blockUserButton = blockButton;
+	blockButton->addClickHandler([=] {
+		BlockedBoxController::BlockNewPeer(controller());
 	});
 
 	Ui::AddSkip(content);
@@ -110,15 +160,14 @@ QPointer<Ui::RpWidget> Blocked::createPinnedToTop(not_null<QWidget*> parent) {
 				_countBlocked.value() | rpl::map(rpl::mappers::_1 > 0)
 			) | rpl::distinct_until_changed());
 
-		// Workaround.
 		std::move(
 			subtitleText
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			subtitle->entity()->resizeToWidth(content->width());
 		}, subtitle->lifetime());
 	}
 
-	return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
 }
 
 void Blocked::setupContent() {
@@ -138,7 +187,8 @@ void Blocked::setupContent() {
 			std::unique_ptr<PeerListContentDelegateSimple> delegate;
 		};
 
-		auto controller = std::make_unique<BlockedBoxController>(_controller);
+		auto controller = std::make_unique<BlockedBoxController>(
+			this->controller());
 		controller->setStyleOverrides(&st::settingsBlockedList);
 		const auto content = listWrap->entity()->add(
 			object_ptr<PeerListContent>(this, controller.get()));
@@ -149,13 +199,6 @@ void Blocked::setupContent() {
 
 		state->delegate->setContent(content);
 		state->controller->setDelegate(state->delegate.get());
-
-		state->controller->rowsCountChanges(
-		) | rpl::start_with_next([=](int total) {
-			_countBlocked = total;
-			checkTotal(total);
-		}, content->lifetime());
-		_countBlocked = content->fullRowsCount();
 	}
 
 	const auto emptyWrap = _container->add(
@@ -172,53 +215,44 @@ void Blocked::setupContent() {
 			content,
 			{
 				.name = u"blocked_peers_empty"_q,
-				.sizeOverride = {
-					st::changePhoneIconSize,
-					st::changePhoneIconSize,
-				},
+				.sizeOverride = st::normalBoxLottieSize,
 			},
 			st::settingsBlockedListIconPadding);
 		content->add(std::move(icon.widget));
 
 		_showFinished.events(
-		) | rpl::start_with_next([animate = std::move(icon.animate)] {
+		) | rpl::on_next([animate = std::move(icon.animate)] {
 			animate(anim::repeat::once);
 		}, content->lifetime());
 
 		content->add(
-			object_ptr<Ui::CenterWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				content,
-				object_ptr<Ui::FlatLabel>(
-					content,
-					tr::lng_blocked_list_empty_title(),
-					st::changePhoneTitle)),
-			st::changePhoneTitlePadding);
+				tr::lng_blocked_list_empty_title(),
+				st::changePhoneTitle),
+			st::changePhoneTitlePadding,
+			style::al_top);
 
 		content->add(
-			object_ptr<Ui::CenterWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				content,
-				object_ptr<Ui::FlatLabel>(
-					content,
-					tr::lng_blocked_list_empty_description(),
-					st::changePhoneDescription)),
-			st::changePhoneDescriptionPadding);
+				tr::lng_blocked_list_empty_description(),
+				st::changePhoneDescription),
+			st::changePhoneDescriptionPadding,
+			style::al_top);
 
 		Ui::AddSkip(content, st::settingsBlockedListIconPadding.top());
 	}
 
-	// We want minimal height to be the same no matter if subtitle
-	// is visible or not, so minimal height isn't a constant here.
-//	Ui::ResizeFitChild(this, _container, st::settingsBlockedHeightMin);
-
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_container->resizeToWidth(width);
 	}, _container->lifetime());
 
 	rpl::combine(
 		_container->heightValue(),
 		_emptinessChanges.events_starting_with(true)
-	) | rpl::start_with_next([=](int height, bool empty) {
+	) | rpl::on_next([=](int height, bool empty) {
 		const auto subtitled = !empty || (_countBlocked.current() > 0);
 		const auto total = st::settingsBlockedHeightMin;
 		const auto padding = st::defaultSubsectionTitlePadding
@@ -230,6 +264,40 @@ void Blocked::setupContent() {
 		const auto min = total - (subtitled ? subtitle : 0);
 		resize(width(), std::max(height, min));
 	}, _container->lifetime());
+
+	const SectionBuildMethod buildMethod = [](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		auto &lifetime = container->lifetime();
+		const auto highlights = lifetime.make_state<HighlightRegistry>();
+
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = Window::PausedIn(
+				controller,
+				Window::GifPauseReason::Layer),
+			.highlights = highlights,
+		});
+
+		BuildBlockedSection(builder);
+
+		std::move(showFinished) | rpl::on_next([=] {
+			for (const auto &[id, entry] : *highlights) {
+				if (entry.widget) {
+					controller->checkHighlightControl(
+						id,
+						entry.widget,
+						base::duplicate(entry.args));
+				}
+			}
+		}, lifetime);
+	};
+
+	build(_container, buildMethod);
 }
 
 void Blocked::checkTotal(int total) {
@@ -242,7 +310,26 @@ void Blocked::visibleTopBottomUpdated(int visibleTop, int visibleBottom) {
 }
 
 void Blocked::showFinished() {
+	Section::showFinished();
 	_showFinished.fire({});
+	controller()->checkHighlightControl(
+		u"blocked/block-user"_q,
+		_blockUserButton);
+}
+
+const auto kMeta = BuildHelper({
+	.id = Blocked::Id(),
+	.parentId = PrivacySecurityId(),
+	.title = &tr::lng_settings_blocked_users,
+	.icon = &st::menuIconBlock,
+}, [](SectionBuilder &builder) {
+	BuildBlockedSection(builder);
+});
+
+} // namespace
+
+Type BlockedPeersId() {
+	return Blocked::Id();
 }
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_blocked_peers.h b/Telegram/SourceFiles/settings/sections/settings_blocked_peers.h
new file mode 100644
index 00000000000000..d520ced1687a5e
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_blocked_peers.h
@@ -0,0 +1,20 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "settings/settings_type.h"
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Settings {
+
+[[nodiscard]] Type BlockedPeersId();
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_business.cpp b/Telegram/SourceFiles/settings/sections/settings_business.cpp
similarity index 52%
rename from Telegram/SourceFiles/settings/settings_business.cpp
rename to Telegram/SourceFiles/settings/sections/settings_business.cpp
index 66b707c5fcc144..50365b657b29ec 100644
--- a/Telegram/SourceFiles/settings/settings_business.cpp
+++ b/Telegram/SourceFiles/settings/sections/settings_business.cpp
@@ -5,21 +5,25 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_business.h"
+#include "settings/sections/settings_business.h"
 
 #include "api/api_chat_links.h"
+#include "api/api_premium.h"
+#include "apiwrap.h"
+#include "base/call_delayed.h"
 #include "boxes/premium_preview_box.h"
 #include "core/click_handler_types.h"
-#include "data/business/data_business_info.h"
+#include "core/ui_integration.h"
 #include "data/business/data_business_chatbots.h"
+#include "data/business/data_business_info.h"
 #include "data/business/data_shortcut_messages.h"
-#include "data/stickers/data_custom_emoji.h"
 #include "data/data_changes.h"
-#include "data/data_peer_values.h" // AmPremiumValue.
+#include "data/data_peer_values.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
-#include "info/info_wrap_widget.h" // Info::Wrap.
-#include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
+#include "data/stickers/data_custom_emoji.h"
+#include "info/info_wrap_widget.h"
+#include "info/settings/info_settings_widget.h"
 #include "lang/lang_keys.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
@@ -31,34 +35,39 @@ For license and copyright information please follow this link:
 #include "settings/business/settings_location.h"
 #include "settings/business/settings_quick_replies.h"
 #include "settings/business/settings_working_hours.h"
+#include "settings/sections/settings_main.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common.h"
 #include "settings/settings_common_session.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
+#include "ui/controls/swipe_handler.h"
+#include "ui/controls/swipe_handler_data.h"
 #include "ui/effects/gradient.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_top_bar.h"
 #include "ui/layers/generic_box.h"
+#include "ui/new_badges.h"
 #include "ui/text/text_utilities.h"
-#include "ui/widgets/checkbox.h" // Ui::RadiobuttonGroup.
+#include "ui/vertical_list.h"
+#include "ui/widgets/checkbox.h"
 #include "ui/widgets/gradient_round_button.h"
-#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
-#include "ui/new_badges.h"
-#include "ui/vertical_list.h"
 #include "window/window_session_controller.h"
-#include "apiwrap.h"
-#include "api/api_premium.h"
-#include "styles/style_premium.h"
+#include "styles/style_channel_earn.h"
+#include "styles/style_chat.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_premium.h"
 #include "styles/style_settings.h"
-#include "styles/style_chat.h"
-#include "styles/style_channel_earn.h"
 
 namespace Settings {
 namespace {
 
+using namespace Builder;
+
 struct Entry {
 	const style::icon *icon;
 	rpl::producer<QString> title;
@@ -67,6 +76,12 @@ struct Entry {
 	bool newBadge = false;
 };
 
+struct BusinessState {
+	Fn<void(bool)> setPaused;
+	QPointer<Ui::SettingsButton> sponsoredButton;
+	base::flat_map<PremiumFeature, QPointer<Ui::SettingsButton>> featureButtons;
+};
+
 using Order = std::vector<QString>;
 
 [[nodiscard]] Order FallbackOrder() {
@@ -76,9 +91,10 @@ using Order = std::vector<QString>;
 		u"quick_replies"_q,
 		u"business_hours"_q,
 		u"business_location"_q,
-		u"business_bots"_q,
-		u"business_intro"_q,
 		u"business_links"_q,
+		u"business_intro"_q,
+		u"business_bots"_q,
+		u"folder_tags"_q,
 	};
 }
 
@@ -136,7 +152,6 @@ using Order = std::vector<QString>;
 				tr::lng_business_subtitle_chatbots(),
 				tr::lng_business_about_chatbots(),
 				PremiumFeature::BusinessBots,
-				true
 			},
 		},
 		{
@@ -146,7 +161,6 @@ using Order = std::vector<QString>;
 				tr::lng_business_subtitle_chat_intro(),
 				tr::lng_business_about_chat_intro(),
 				PremiumFeature::ChatIntro,
-				true
 			},
 		},
 		{
@@ -156,7 +170,15 @@ using Order = std::vector<QString>;
 				tr::lng_business_subtitle_chat_links(),
 				tr::lng_business_about_chat_links(),
 				PremiumFeature::ChatLinks,
-				true
+			},
+		},
+		{
+			u"folder_tags"_q,
+			Entry{
+				&st::settingsPremiumIconTags,
+				tr::lng_premium_summary_subtitle_filter_tags(),
+				tr::lng_premium_summary_about_filter_tags(),
+				PremiumFeature::FilterTags,
 			},
 		},
 	};
@@ -165,6 +187,7 @@ using Order = std::vector<QString>;
 void AddBusinessSummary(
 		not_null<Ui::VerticalLayout*> content,
 		not_null<Window::SessionController*> controller,
+		std::shared_ptr<BusinessState> state,
 		Fn<void(PremiumFeature)> buttonCallback) {
 	const auto &stDefault = st::settingsButton;
 	const auto &stLabel = st::defaultFlatLabel;
@@ -185,7 +208,7 @@ void AddBusinessSummary(
 		const auto label = content->add(
 			object_ptr<Ui::FlatLabel>(
 				content,
-				std::move(entry.title) | Ui::Text::ToBold(),
+				std::move(entry.title) | rpl::map(tr::bold),
 				stLabel),
 			titlePadding);
 		label->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -204,12 +227,12 @@ void AddBusinessSummary(
 		dummy->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 		content->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			dummy->resize(s.width(), iconSize.height());
 		}, dummy->lifetime());
 
 		label->geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			dummy->moveToLeft(0, r.y() + (r.height() - labelAscent));
 		}, dummy->lifetime());
 
@@ -217,7 +240,7 @@ void AddBusinessSummary(
 			content->widthValue(),
 			label->heightValue(),
 			description->heightValue()
-		) | rpl::start_with_next([=,
+		) | rpl::on_next([=,
 			topPadding = titlePadding,
 			bottomPadding = descriptionPadding](
 				int width,
@@ -233,7 +256,7 @@ void AddBusinessSummary(
 					+ bottomPadding.bottom());
 		}, button->lifetime());
 		label->topValue(
-		) | rpl::start_with_next([=, padding = titlePadding.top()](int top) {
+		) | rpl::on_next([=, padding = titlePadding.top()](int top) {
 			button->moveToLeft(0, top - padding);
 		}, button->lifetime());
 		const auto arrow = Ui::CreateChild<Ui::IconButton>(
@@ -244,7 +267,7 @@ void AddBusinessSummary(
 			&st::settingsPremiumArrowOver);
 		arrow->setAttribute(Qt::WA_TransparentForMouseEvents);
 		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			const auto &point = st::settingsPremiumArrowShift;
 			arrow->moveToRight(
 				-point.x(),
@@ -254,6 +277,10 @@ void AddBusinessSummary(
 		const auto feature = entry.feature;
 		button->setClickedCallback([=] { buttonCallback(feature); });
 
+		if (state) {
+			state->featureButtons[feature] = button;
+		}
+
 		iconContainers.push_back(dummy);
 	};
 
@@ -280,7 +307,6 @@ void AddBusinessSummary(
 
 	content->resizeToWidth(content->height());
 
-	// Icons.
 	Assert(iconContainers.size() > 2);
 	const auto from = iconContainers.front()->y();
 	const auto to = iconContainers.back()->y() + iconSize.height();
@@ -315,6 +341,300 @@ void AddBusinessSummary(
 	Ui::AddSkip(content, descriptionPadding.bottom());
 }
 
+[[nodiscard]] QString FeatureSearchId(PremiumFeature feature) {
+	switch (feature) {
+	case PremiumFeature::GreetingMessage: return u"business/greeting"_q;
+	case PremiumFeature::AwayMessage: return u"business/away"_q;
+	case PremiumFeature::QuickReplies: return u"business/replies"_q;
+	case PremiumFeature::BusinessHours: return u"business/hours"_q;
+	case PremiumFeature::BusinessLocation: return u"business/location"_q;
+	case PremiumFeature::ChatLinks: return u"business/links"_q;
+	case PremiumFeature::ChatIntro: return u"business/intro"_q;
+	case PremiumFeature::BusinessBots: return u"business/bots"_q;
+	case PremiumFeature::FilterTags: return u"business/tags"_q;
+	default: return QString();
+	}
+}
+
+[[nodiscard]] QString FeatureSearchTitle(PremiumFeature feature) {
+	switch (feature) {
+	case PremiumFeature::GreetingMessage:
+		return tr::lng_business_subtitle_greeting_messages(tr::now);
+	case PremiumFeature::AwayMessage:
+		return tr::lng_business_subtitle_away_messages(tr::now);
+	case PremiumFeature::QuickReplies:
+		return tr::lng_business_subtitle_quick_replies(tr::now);
+	case PremiumFeature::BusinessHours:
+		return tr::lng_business_subtitle_opening_hours(tr::now);
+	case PremiumFeature::BusinessLocation:
+		return tr::lng_business_subtitle_location(tr::now);
+	case PremiumFeature::ChatLinks:
+		return tr::lng_business_subtitle_chat_links(tr::now);
+	case PremiumFeature::ChatIntro:
+		return tr::lng_business_subtitle_chat_intro(tr::now);
+	case PremiumFeature::BusinessBots:
+		return tr::lng_business_subtitle_chatbots(tr::now);
+	case PremiumFeature::FilterTags:
+		return tr::lng_premium_summary_subtitle_filter_tags(tr::now);
+	default: return QString();
+	}
+}
+
+void BuildBusinessFeatures(SectionBuilder &builder) {
+	const auto session = builder.session();
+	const auto mtpOrder = session->appConfig().get<Order>(
+		"business_promo_order",
+		FallbackOrder());
+
+	const auto entryMap = EntryMap();
+	for (const auto &key : mtpOrder) {
+		const auto it = entryMap.find(key);
+		if (it == end(entryMap)) {
+			continue;
+		}
+		const auto feature = it->second.feature;
+		const auto id = FeatureSearchId(feature);
+		if (id.isEmpty()) {
+			continue;
+		}
+		builder.add(nullptr, [feature, id] {
+			return SearchEntry{
+				.id = id,
+				.title = FeatureSearchTitle(feature),
+				.keywords = { u"business"_q },
+			};
+		});
+	}
+}
+
+void BuildSponsoredSection(
+		SectionBuilder &builder,
+		std::shared_ptr<BusinessState> state) {
+	const auto controller = builder.controller();
+	const auto session = builder.session();
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"business/sponsored"_q,
+			.title = tr::lng_business_button_sponsored(tr::now),
+			.keywords = { u"ads"_q, u"advertising"_q },
+		};
+	});
+
+	if (!controller) {
+		return;
+	}
+
+	builder.add([controller, session, state](const WidgetContext &ctx) {
+		const auto content = ctx.container;
+		const auto sponsoredWrap = content->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				content,
+				object_ptr<Ui::VerticalLayout>(content)));
+
+		const auto fillSponsoredWrap = [=] {
+			while (sponsoredWrap->entity()->count()) {
+				delete sponsoredWrap->entity()->widgetAt(0);
+			}
+			Ui::AddDivider(sponsoredWrap->entity());
+			const auto loading = sponsoredWrap->entity()->add(
+				object_ptr<Ui::SlideWrap<Ui::FlatLabel>>(
+					sponsoredWrap->entity(),
+					object_ptr<Ui::FlatLabel>(
+						sponsoredWrap->entity(),
+						tr::lng_contacts_loading())),
+				st::boxRowPadding);
+			loading->entity()->setTextColorOverride(st::windowSubTextFg->c);
+
+			const auto wrap = sponsoredWrap->entity()->add(
+				object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+					sponsoredWrap->entity(),
+					object_ptr<Ui::VerticalLayout>(sponsoredWrap->entity())));
+			wrap->toggle(false, anim::type::instant);
+			const auto inner = wrap->entity();
+			Ui::AddSkip(inner);
+			Ui::AddSubsectionTitle(
+				inner,
+				tr::lng_business_subtitle_sponsored());
+			const auto button = inner->add(object_ptr<Ui::SettingsButton>(
+				inner,
+				tr::lng_business_button_sponsored()));
+			if (state) {
+				state->sponsoredButton = button;
+			}
+			Ui::AddSkip(inner);
+
+			{
+				inner->add(object_ptr<Ui::DividerLabel>(
+					inner,
+					object_ptr<Ui::FlatLabel>(
+						inner,
+						tr::lng_business_about_sponsored(
+							lt_link,
+							rpl::combine(
+								tr::lng_business_about_sponsored_link(
+									lt_emoji,
+									rpl::single(Ui::Text::IconEmoji(
+										&st::textMoreIconEmoji)),
+									tr::rich),
+								tr::lng_business_about_sponsored_url()
+							) | rpl::map([](TextWithEntities text, QString url) {
+								return tr::link(text, url);
+							}),
+							tr::rich),
+						st::boxDividerLabel),
+					st::defaultBoxDividerLabelPadding));
+			}
+
+			const auto api = inner->lifetime().make_state<Api::SponsoredToggle>(
+				session);
+
+			api->toggled(
+			) | rpl::on_next([=](bool enabled) {
+				button->toggleOn(rpl::single(enabled));
+				wrap->toggle(true, anim::type::instant);
+				loading->toggle(false, anim::type::instant);
+
+				button->toggledChanges(
+				) | rpl::on_next([=](bool toggled) {
+					api->setToggled(
+						toggled
+					) | rpl::on_error_done([=](const QString &error) {
+						controller->showToast(error);
+					}, [] {
+					}, button->lifetime());
+				}, button->lifetime());
+			}, inner->lifetime());
+
+			Ui::ToggleChildrenVisibility(sponsoredWrap->entity(), true);
+			sponsoredWrap->entity()->resizeToWidth(content->width());
+		};
+
+		Data::AmPremiumValue(session) | rpl::on_next([=](bool isPremium) {
+			sponsoredWrap->toggle(isPremium, anim::type::normal);
+			if (isPremium) {
+				fillSponsoredWrap();
+			}
+		}, content->lifetime());
+
+		return SectionBuilder::WidgetToAdd{};
+	});
+}
+
+void BuildBusinessSectionContent(
+		SectionBuilder &builder,
+		std::shared_ptr<BusinessState> state) {
+	const auto controller = builder.controller();
+	const auto session = builder.session();
+
+	if (controller) {
+		const auto owner = &session->data();
+		owner->chatbots().preload();
+		owner->businessInfo().preload();
+		owner->shortcutMessages().preloadShortcuts();
+		owner->session().api().chatLinks().preload();
+	}
+
+	builder.addSkip(st::settingsFromFileTop);
+
+	BuildBusinessFeatures(builder);
+
+	if (controller) {
+		builder.add([controller, session, state](const WidgetContext &ctx) {
+			const auto content = ctx.container;
+			const auto owner = &session->data();
+			const auto showOther = ctx.showOther;
+
+			auto waitingToShow = content->lifetime().make_state<PremiumFeature>(
+				PremiumFeature::Business);
+
+			const auto showFeature = [=](PremiumFeature feature) {
+				if (feature == PremiumFeature::FilterTags) {
+					ShowPremiumPreviewToBuy(controller, feature);
+					return;
+				}
+				showOther([&] {
+					switch (feature) {
+					case PremiumFeature::AwayMessage: return AwayMessageId();
+					case PremiumFeature::BusinessHours: return WorkingHoursId();
+					case PremiumFeature::BusinessLocation: return LocationId();
+					case PremiumFeature::GreetingMessage: return GreetingId();
+					case PremiumFeature::QuickReplies: return QuickRepliesId();
+					case PremiumFeature::BusinessBots: return ChatbotsId();
+					case PremiumFeature::ChatIntro: return ChatIntroId();
+					case PremiumFeature::ChatLinks: return ChatLinksId();
+					}
+					Unexpected("Feature in showFeature.");
+				}());
+			};
+
+			const auto isReady = [=](PremiumFeature feature) {
+				switch (feature) {
+				case PremiumFeature::AwayMessage:
+					return owner->businessInfo().awaySettingsLoaded()
+						&& owner->shortcutMessages().shortcutsLoaded();
+				case PremiumFeature::BusinessHours:
+					return owner->session().user()->isFullLoaded()
+						&& owner->businessInfo().timezonesLoaded();
+				case PremiumFeature::BusinessLocation:
+					return owner->session().user()->isFullLoaded();
+				case PremiumFeature::GreetingMessage:
+					return owner->businessInfo().greetingSettingsLoaded()
+						&& owner->shortcutMessages().shortcutsLoaded();
+				case PremiumFeature::QuickReplies:
+					return owner->shortcutMessages().shortcutsLoaded();
+				case PremiumFeature::BusinessBots:
+					return owner->chatbots().loaded();
+				case PremiumFeature::ChatIntro:
+					return owner->session().user()->isFullLoaded();
+				case PremiumFeature::ChatLinks:
+					return owner->session().api().chatLinks().loaded();
+				case PremiumFeature::FilterTags:
+					return true;
+				}
+				Unexpected("Feature in isReady.");
+			};
+
+			const auto check = [=] {
+				if (*waitingToShow != PremiumFeature::Business
+					&& isReady(*waitingToShow)) {
+					showFeature(
+						std::exchange(*waitingToShow, PremiumFeature::Business));
+				}
+			};
+
+			rpl::merge(
+				owner->businessInfo().awaySettingsChanged(),
+				owner->businessInfo().greetingSettingsChanged(),
+				owner->businessInfo().timezonesValue() | rpl::to_empty,
+				owner->shortcutMessages().shortcutsChanged(),
+				owner->chatbots().changes() | rpl::to_empty,
+				owner->session().changes().peerUpdates(
+					owner->session().user(),
+					Data::PeerUpdate::Flag::FullInfo) | rpl::to_empty,
+				owner->session().api().chatLinks().loadedUpdates()
+			) | rpl::on_next(check, content->lifetime());
+
+			AddBusinessSummary(content, controller, state, [=](PremiumFeature feature) {
+				const auto alwaysAvailable
+					= (feature == PremiumFeature::BusinessBots);
+				if (!alwaysAvailable && !session->premium()) {
+					ShowPremiumPreviewToBuy(controller, feature, nullptr);
+					return;
+				} else if (!isReady(feature)) {
+					*waitingToShow = feature;
+				} else {
+					showFeature(feature);
+				}
+			});
+
+			return SectionBuilder::WidgetToAdd{};
+		});
+	}
+
+	BuildSponsoredSection(builder, state);
+}
+
 class Business : public Section<Business> {
 public:
 	Business(
@@ -323,9 +643,9 @@ class Business : public Section<Business> {
 
 	[[nodiscard]] rpl::producer<QString> title() override;
 
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToTop(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToTop(
 		not_null<QWidget*> parent) override;
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToBottom(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) override;
 
 	void showFinished() override;
@@ -338,33 +658,31 @@ class Business : public Section<Business> {
 
 private:
 	void setupContent();
+	void setupSwipeBack();
 
-	const not_null<Window::SessionController*> _controller;
-
+	std::shared_ptr<BusinessState> _state;
 	QPointer<Ui::GradientButton> _subscribe;
 	base::unique_qptr<Ui::FadeWrap<Ui::IconButton>> _back;
 	base::unique_qptr<Ui::IconButton> _close;
 	rpl::variable<bool> _backToggles;
 	rpl::variable<Info::Wrap> _wrap;
-	Fn<void(bool)> _setPaused;
 	std::shared_ptr<Ui::RadiobuttonGroup> _radioGroup;
 
 	rpl::event_stream<> _showBack;
 	rpl::event_stream<> _showFinished;
 	rpl::variable<QString> _buttonText;
 
-	PremiumFeature _waitingToShow = PremiumFeature::Business;
-
 };
 
 Business::Business(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: Section(parent)
-, _controller(controller)
+: Section(parent, controller)
+, _state(std::make_shared<BusinessState>())
 , _radioGroup(std::make_shared<Ui::RadiobuttonGroup>()) {
 	setupContent();
-	_controller->session().api().premium().reload();
+	setupSwipeBack();
+	controller->session().api().premium().reload();
 }
 
 rpl::producer<QString> Business::title() {
@@ -390,200 +708,85 @@ void Business::setStepDataReference(std::any &data) {
 	}
 }
 
-void Business::setupContent() {
-	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-
-	const auto owner = &_controller->session().data();
-	owner->chatbots().preload();
-	owner->businessInfo().preload();
-	owner->shortcutMessages().preloadShortcuts();
-	owner->session().api().chatLinks().preload();
-
-	Ui::AddSkip(content, st::settingsFromFileTop);
-
-	const auto showFeature = [=](PremiumFeature feature) {
-		showOther([&] {
-			switch (feature) {
-			case PremiumFeature::AwayMessage: return AwayMessageId();
-			case PremiumFeature::BusinessHours: return WorkingHoursId();
-			case PremiumFeature::BusinessLocation: return LocationId();
-			case PremiumFeature::GreetingMessage: return GreetingId();
-			case PremiumFeature::QuickReplies: return QuickRepliesId();
-			case PremiumFeature::BusinessBots: return ChatbotsId();
-			case PremiumFeature::ChatIntro: return ChatIntroId();
-			case PremiumFeature::ChatLinks: return ChatLinksId();
+void Business::setupSwipeBack() {
+	using namespace Ui::Controls;
+
+	auto swipeBackData = lifetime().make_state<SwipeBackResult>();
+
+	auto update = [=](SwipeContextData data) {
+		if (data.translation > 0) {
+			if (!swipeBackData->callback) {
+				(*swipeBackData) = SetupSwipeBack(
+					this,
+					[]() -> std::pair<QColor, QColor> {
+						return {
+							st::historyForwardChooseBg->c,
+							st::historyForwardChooseFg->c,
+						};
+					});
 			}
-			Unexpected("Feature in showFeature.");
-		}());
-	};
-	const auto isReady = [=](PremiumFeature feature) {
-		switch (feature) {
-		case PremiumFeature::AwayMessage:
-			return owner->businessInfo().awaySettingsLoaded()
-				&& owner->shortcutMessages().shortcutsLoaded();
-		case PremiumFeature::BusinessHours:
-			return owner->session().user()->isFullLoaded()
-				&& owner->businessInfo().timezonesLoaded();
-		case PremiumFeature::BusinessLocation:
-			return owner->session().user()->isFullLoaded();
-		case PremiumFeature::GreetingMessage:
-			return owner->businessInfo().greetingSettingsLoaded()
-				&& owner->shortcutMessages().shortcutsLoaded();
-		case PremiumFeature::QuickReplies:
-			return owner->shortcutMessages().shortcutsLoaded();
-		case PremiumFeature::BusinessBots:
-			return owner->chatbots().loaded();
-		case PremiumFeature::ChatIntro:
-			return owner->session().user()->isFullLoaded();
-		case PremiumFeature::ChatLinks:
-			return owner->session().api().chatLinks().loaded();
+			swipeBackData->callback(data);
+			return;
+		} else if (swipeBackData->lifetime) {
+			(*swipeBackData) = {};
 		}
-		Unexpected("Feature in isReady.");
 	};
-	const auto check = [=] {
-		if (_waitingToShow != PremiumFeature::Business
-			&& isReady(_waitingToShow)) {
-			showFeature(
-				std::exchange(_waitingToShow, PremiumFeature::Business));
-		}
+
+	auto init = [=](Ui::Controls::SwipeHandlerInitData data) {
+		return (data.direction == Qt::RightToLeft)
+			? DefaultSwipeBackHandlerFinishData([=] {
+				_showBack.fire({});
+			})
+			: SwipeHandlerFinishData();
 	};
 
-	rpl::merge(
-		owner->businessInfo().awaySettingsChanged(),
-		owner->businessInfo().greetingSettingsChanged(),
-		owner->businessInfo().timezonesValue() | rpl::to_empty,
-		owner->shortcutMessages().shortcutsChanged(),
-		owner->chatbots().changes() | rpl::to_empty,
-		owner->session().changes().peerUpdates(
-			owner->session().user(),
-			Data::PeerUpdate::Flag::FullInfo) | rpl::to_empty,
-		owner->session().api().chatLinks().loadedUpdates()
-	) | rpl::start_with_next(check, content->lifetime());
-
-	AddBusinessSummary(content, _controller, [=](PremiumFeature feature) {
-		if (!_controller->session().premium()) {
-			_setPaused(true);
-			const auto hidden = crl::guard(this, [=] { _setPaused(false); });
-
-			ShowPremiumPreviewToBuy(_controller, feature, hidden);
-			return;
-		} else if (!isReady(feature)) {
-			_waitingToShow = feature;
-		} else {
-			showFeature(feature);
-		}
+	SetupSwipeHandler({
+		.widget = this,
+		.scroll = v::null,
+		.update = std::move(update),
+		.init = std::move(init),
 	});
+}
 
-	const auto sponsoredWrap = content->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			content,
-			object_ptr<Ui::VerticalLayout>(content)));
-	const auto fillSponsoredWrap = [=] {
-		while (sponsoredWrap->entity()->count()) {
-			delete sponsoredWrap->entity()->widgetAt(0);
-		}
-		Ui::AddDivider(sponsoredWrap->entity());
-		const auto loading = sponsoredWrap->entity()->add(
-			object_ptr<Ui::SlideWrap<Ui::FlatLabel>>(
-				sponsoredWrap->entity(),
-				object_ptr<Ui::FlatLabel>(
-					sponsoredWrap->entity(),
-					tr::lng_contacts_loading())),
-			st::boxRowPadding);
-		loading->entity()->setTextColorOverride(st::windowSubTextFg->c);
-
-		const auto wrap = sponsoredWrap->entity()->add(
-			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-				sponsoredWrap->entity(),
-				object_ptr<Ui::VerticalLayout>(sponsoredWrap->entity())));
-		wrap->toggle(false, anim::type::instant);
-		const auto inner = wrap->entity();
-		Ui::AddSkip(inner);
-		Ui::AddSubsectionTitle(
-			inner,
-			tr::lng_business_subtitle_sponsored());
-		const auto button = inner->add(object_ptr<Ui::SettingsButton>(
-			inner,
-			tr::lng_business_button_sponsored()));
-		Ui::AddSkip(inner);
-
-		const auto session = &_controller->session();
-		{
-			const auto arrow = Ui::Text::SingleCustomEmoji(
-				session->data().customEmojiManager().registerInternalEmoji(
-					st::topicButtonArrow,
-					st::channelEarnLearnArrowMargins,
-					false));
-			inner->add(object_ptr<Ui::DividerLabel>(
-				inner,
-				Ui::CreateLabelWithCustomEmoji(
-					inner,
-					tr::lng_business_about_sponsored(
-						lt_link,
-						rpl::combine(
-							tr::lng_business_about_sponsored_link(
-								lt_emoji,
-								rpl::single(arrow),
-								Ui::Text::RichLangValue),
-							tr::lng_business_about_sponsored_url()
-						) | rpl::map([](TextWithEntities text, QString url) {
-							return Ui::Text::Link(text, url);
-						}),
-						Ui::Text::RichLangValue),
-					{ .session = session },
-					st::boxDividerLabel),
-				st::defaultBoxDividerLabelPadding,
-				RectPart::Top | RectPart::Bottom));
-		}
-
-		const auto api = inner->lifetime().make_state<Api::SponsoredToggle>(
-			session);
-
-		api->toggled(
-		) | rpl::start_with_next([=](bool enabled) {
-			button->toggleOn(rpl::single(enabled));
-			wrap->toggle(true, anim::type::instant);
-			loading->toggle(false, anim::type::instant);
-
-			button->toggledChanges(
-			) | rpl::start_with_next([=](bool toggled) {
-				api->setToggled(
-					toggled
-				) | rpl::start_with_error_done([=](const QString &error) {
-					_controller->showToast(error);
-				}, [] {
-				}, button->lifetime());
-			}, button->lifetime());
-		}, inner->lifetime());
+void Business::setupContent() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+	const auto state = _state;
+
+	const SectionBuildMethod buildMethod = [state](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		const auto isPaused = Window::PausedIn(
+			controller,
+			Window::GifPauseReason::Layer);
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = isPaused,
+		});
 
-		Ui::ToggleChildrenVisibility(sponsoredWrap->entity(), true);
-		sponsoredWrap->entity()->resizeToWidth(content->width());
+		BuildBusinessSectionContent(builder, state);
 	};
-	Data::AmPremiumValue(
-		&_controller->session()
-	) | rpl::start_with_next([=](bool isPremium) {
-		sponsoredWrap->toggle(isPremium, anim::type::normal);
-		if (isPremium) {
-			fillSponsoredWrap();
-		}
-	}, content->lifetime());
+
+	build(content, buildMethod);
 
 	Ui::ResizeFitChild(this, content);
 }
 
-QPointer<Ui::RpWidget> Business::createPinnedToTop(
+base::weak_qptr<Ui::RpWidget> Business::createPinnedToTop(
 		not_null<QWidget*> parent) {
 	auto title = tr::lng_business_title();
 	auto about = [&]() -> rpl::producer<TextWithEntities> {
 		return rpl::conditional(
-			Data::AmPremiumValue(&_controller->session()),
-			tr::lng_business_unlocked(),
-			tr::lng_business_about()
-		) | Ui::Text::ToWithEntities();
+			Data::AmPremiumValue(&controller()->session()),
+			tr::lng_business_unlocked(tr::marked),
+			tr::lng_business_about(tr::marked));
 	}();
 
 	const auto content = [&]() -> Ui::Premium::TopBarAbstract* {
-		const auto weak = base::make_weak(_controller);
+		const auto weak = base::make_weak(controller());
 		const auto clickContextOther = [=] {
 			return QVariant::fromValue(ClickHandlerContext{
 				.sessionWindow = weak,
@@ -598,40 +801,32 @@ QPointer<Ui::RpWidget> Business::createPinnedToTop(
 				.logo = u"dollar"_q,
 				.title = std::move(title),
 				.about = std::move(about),
+				.use3dCoin = true,
 			});
 	}();
-	_setPaused = [=](bool paused) {
+	_state->setPaused = [=](bool paused) {
 		content->setPaused(paused);
 		if (_subscribe) {
 			_subscribe->setGlarePaused(paused);
 		}
 	};
+	controller()->boxShownValue(
+	) | rpl::on_next([=](bool shown) {
+		_state->setPaused(shown);
+	}, content->lifetime());
 
 	_wrap.value(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		content->setRoundEdges(wrap == Info::Wrap::Layer);
 	}, content->lifetime());
 
-	const auto calculateMaximumHeight = [=] {
-		return st::settingsPremiumTopHeight;
-	};
-
-	content->setMaximumHeight(calculateMaximumHeight());
-	content->setMinimumHeight(st::settingsPremiumTopHeight);// st::infoLayerTopBarHeight);
+	content->setMaximumHeight(st::settingsPremiumTopHeight);
+	content->setMinimumHeight(st::settingsPremiumTopHeight);
 
 	content->resize(content->width(), content->maximumHeight());
-	//content->additionalHeight(
-	//) | rpl::start_with_next([=](int additionalHeight) {
-	//	const auto wasMax = (content->height() == content->maximumHeight());
-	//	content->setMaximumHeight(calculateMaximumHeight()
-	//		+ additionalHeight);
-	//	if (wasMax) {
-	//		content->resize(content->width(), content->maximumHeight());
-	//	}
-	//}, content->lifetime());
 
 	_wrap.value(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		const auto isLayer = (wrap == Info::Wrap::Layer);
 		_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
 			content,
@@ -643,13 +838,13 @@ QPointer<Ui::RpWidget> Business::createPinnedToTop(
 			st::infoTopBarScale);
 		_back->setDuration(0);
 		_back->toggleOn(isLayer
-			? _backToggles.value() | rpl::type_erased()
+			? _backToggles.value() | rpl::type_erased
 			: rpl::single(true));
 		_back->entity()->addClickHandler([=] {
 			_showBack.fire({});
 		});
 		_back->toggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			const auto &st = isLayer ? st::infoLayerTopBar : st::infoTopBar;
 			content->setTextPosition(
 				toggled ? st.back.width : st.titlePosition.x(),
@@ -663,33 +858,44 @@ QPointer<Ui::RpWidget> Business::createPinnedToTop(
 				content,
 				st::settingsPremiumTopBarClose);
 			_close->addClickHandler([=] {
-				_controller->parentController()->hideLayer();
-				_controller->parentController()->hideSpecialLayer();
+				controller()->parentController()->hideLayer();
+				controller()->parentController()->hideSpecialLayer();
 			});
 			content->widthValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_close->moveToRight(0, 0);
 			}, _close->lifetime());
 		}
 	}, content->lifetime());
 
-	return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
 }
 
 void Business::showFinished() {
 	_showFinished.fire({});
+	crl::on_main(this, [=] {
+		for (const auto &[feature, button] : _state->featureButtons) {
+			const auto id = FeatureSearchId(feature);
+			if (!id.isEmpty()) {
+				controller()->checkHighlightControl(id, button);
+			}
+		}
+		controller()->checkHighlightControl(
+			u"business/sponsored"_q,
+			_state->sponsoredButton);
+	});
 }
 
-QPointer<Ui::RpWidget> Business::createPinnedToBottom(
+base::weak_qptr<Ui::RpWidget> Business::createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) {
 	const auto content = Ui::CreateChild<Ui::RpWidget>(parent.get());
 
-	const auto session = &_controller->session();
+	const auto session = &controller()->session();
 
 	auto buttonText = _buttonText.value();
 
 	_subscribe = CreateSubscribeButton({
-		_controller,
+		controller(),
 		content,
 		[] { return u"business"_q; },
 		std::move(buttonText),
@@ -703,7 +909,7 @@ QPointer<Ui::RpWidget> Business::createPinnedToBottom(
 	});
 	{
 		const auto callback = [=](int value) {
-			auto &api = _controller->session().api();
+			auto &api = controller()->session().api();
 			const auto options = api.premium().subscriptionOptions();
 			if (options.empty()) {
 				return;
@@ -720,12 +926,12 @@ QPointer<Ui::RpWidget> Business::createPinnedToBottom(
 	}
 
 	_showFinished.events(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		_subscribe->startGlareAnimation();
 	}, _subscribe->lifetime());
 
 	content->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto padding = st::settingsPremiumButtonPadding;
 		_subscribe->resizeToWidth(width - padding.left() - padding.right());
 	}, _subscribe->lifetime());
@@ -734,7 +940,7 @@ QPointer<Ui::RpWidget> Business::createPinnedToBottom(
 		_subscribe->heightValue(),
 		Data::AmPremiumValue(session),
 		session->premiumPossibleValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int buttonHeight,
 			bool premium,
 			bool premiumPossible) {
@@ -749,9 +955,18 @@ QPointer<Ui::RpWidget> Business::createPinnedToBottom(
 		_subscribe->setVisible(!premium && premiumPossible);
 	}, _subscribe->lifetime());
 
-	return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
 }
 
+const auto kMeta = BuildHelper({
+	.id = Business::Id(),
+	.parentId = MainId(),
+	.title = &tr::lng_business_title,
+	.icon = &st::menuIconShop,
+}, [](SectionBuilder &builder) {
+	BuildBusinessSectionContent(builder, nullptr);
+});
+
 } // namespace
 
 template <>
@@ -804,12 +1019,14 @@ std::vector<PremiumFeature> BusinessFeaturesOrder(
 			return PremiumFeature::BusinessHours;
 		} else if (s == u"business_location"_q) {
 			return PremiumFeature::BusinessLocation;
-		} else if (s == u"business_bots"_q) {
-			return PremiumFeature::BusinessBots;
+		} else if (s == u"business_links"_q) {
+			return PremiumFeature::ChatLinks;
 		} else if (s == u"business_intro"_q) {
 			return PremiumFeature::ChatIntro;
-		} else if (s == "business_links"_q) {
-			return PremiumFeature::ChatLinks;
+		} else if (s == u"business_bots"_q) {
+			return PremiumFeature::BusinessBots;
+		} else if (s == u"folder_tags"_q) {
+			return PremiumFeature::FilterTags;
 		}
 		return PremiumFeature::kCount;
 	}) | ranges::views::filter([](PremiumFeature feature) {
@@ -817,4 +1034,9 @@ std::vector<PremiumFeature> BusinessFeaturesOrder(
 	}) | ranges::to_vector;
 }
 
+namespace Builder {
+
+SectionBuildMethod BusinessSection = kMeta.build;
+
+} // namespace Builder
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_business.h b/Telegram/SourceFiles/settings/sections/settings_business.h
similarity index 94%
rename from Telegram/SourceFiles/settings/settings_business.h
rename to Telegram/SourceFiles/settings/sections/settings_business.h
index 6bd077af04ee9c..2ed90195c3c423 100644
--- a/Telegram/SourceFiles/settings/settings_business.h
+++ b/Telegram/SourceFiles/settings/sections/settings_business.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "settings/settings_common.h"
 #include "settings/settings_type.h"
 
 enum class PremiumFeature;
diff --git a/Telegram/SourceFiles/settings/settings_calls.cpp b/Telegram/SourceFiles/settings/sections/settings_calls.cpp
similarity index 58%
rename from Telegram/SourceFiles/settings/settings_calls.cpp
rename to Telegram/SourceFiles/settings/sections/settings_calls.cpp
index de7c34e3eb8196..99ce45c03b9ade 100644
--- a/Telegram/SourceFiles/settings/settings_calls.cpp
+++ b/Telegram/SourceFiles/settings/sections/settings_calls.cpp
@@ -5,41 +5,54 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_calls.h"
+#include "settings/sections/settings_calls.h"
 
-#include "ui/wrap/vertical_layout.h"
-#include "ui/wrap/slide_wrap.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/level_meter.h"
-#include "ui/widgets/buttons.h"
-#include "ui/boxes/single_choice_box.h"
-#include "ui/boxes/confirm_box.h"
-#include "ui/vertical_list.h"
-#include "platform/platform_specific.h"
-#include "main/main_session.h"
-#include "lang/lang_keys.h"
-#include "styles/style_settings.h"
-#include "ui/widgets/continuous_sliders.h"
-#include "window/window_session_controller.h"
-#include "core/application.h"
-#include "core/core_settings.h"
+#include "api/api_authorizations.h"
+#include "apiwrap.h"
+#include "base/timer.h"
 #include "calls/calls_call.h"
 #include "calls/calls_instance.h"
 #include "calls/calls_video_bubble.h"
-#include "apiwrap.h"
-#include "api/api_authorizations.h"
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "platform/platform_specific.h"
+#include "settings/sections/settings_main.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common_session.h"
+#include "tgcalls/VideoCaptureInterface.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/boxes/single_choice_box.h"
+#include "ui/effects/animations.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/level_meter.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "webrtc/webrtc_audio_input_tester.h"
+#include "webrtc/webrtc_create_adm.h"
 #include "webrtc/webrtc_environment.h"
 #include "webrtc/webrtc_video_track.h"
-#include "webrtc/webrtc_audio_input_tester.h"
-#include "webrtc/webrtc_create_adm.h" // Webrtc::Backend.
-#include "tgcalls/VideoCaptureInterface.h"
+#include "window/window_session_controller.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
 
 namespace Settings {
+
+Webrtc::VideoTrack *AddCameraSubsection(
+	std::shared_ptr<Ui::Show> show,
+	not_null<Ui::VerticalLayout*> content,
+	bool saveToSettings);
+
 namespace {
 
 using namespace Webrtc;
+using namespace Builder;
 
 [[nodiscard]] rpl::producer<QString> DeviceNameValue(
 		DeviceType type,
@@ -56,275 +69,8 @@ using namespace Webrtc;
 	}) | rpl::flatten_latest();
 }
 
-} // namespace
-
-Calls::Calls(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller)
-: Section(parent)
-, _controller(controller) {
-	// Request valid value of calls disabled flag.
-	controller->session().api().authorizations().reload();
-
-	setupContent();
-	requestPermissionAndStartTestingMicrophone();
-}
-
-Calls::~Calls() = default;
-
-rpl::producer<QString> Calls::title() {
-	return tr::lng_settings_section_devices();
-}
-
-Webrtc::VideoTrack *Calls::AddCameraSubsection(
-		std::shared_ptr<Ui::Show> show,
-		not_null<Ui::VerticalLayout*> content,
-		bool saveToSettings) {
-	auto &lifetime = content->lifetime();
-
-	const auto hasCall = (Core::App().calls().currentCall() != nullptr);
-
-	auto capturerOwner = lifetime.make_state<
-		std::shared_ptr<tgcalls::VideoCaptureInterface>
-	>();
-
-	const auto track = lifetime.make_state<VideoTrack>(
-		(hasCall
-			? VideoState::Inactive
-			: VideoState::Active));
-
-	const auto deviceId = lifetime.make_state<rpl::variable<QString>>(
-		Core::App().settings().cameraDeviceId());
-	auto resolvedId = rpl::deferred([=] {
-		return DeviceIdOrDefault(deviceId->value());
-	});
-	AddButtonWithLabel(
-		content,
-		tr::lng_settings_call_input_device(),
-		CameraDeviceNameValue(rpl::duplicate(resolvedId)),
-		st::settingsButtonNoIcon
-	)->addClickHandler([=] {
-		show->show(ChooseCameraDeviceBox(
-			rpl::duplicate(resolvedId),
-			[=](const QString &id) {
-				*deviceId = id;
-				if (saveToSettings) {
-					Core::App().settings().setCameraDeviceId(id);
-					Core::App().saveSettingsDelayed();
-				}
-				if (*capturerOwner) {
-					(*capturerOwner)->switchToDevice(
-						id.toStdString(),
-						false);
-				}
-		}));
-	});
-	const auto bubbleWrap = content->add(object_ptr<Ui::RpWidget>(content));
-	const auto bubble = lifetime.make_state<::Calls::VideoBubble>(
-		bubbleWrap,
-		track);
-	const auto padding = st::settingsButtonNoIcon.padding.left();
-	const auto top = st::boxRoundShadow.extend.top();
-	const auto bottom = st::boxRoundShadow.extend.bottom();
-
-	auto frameSize = track->renderNextFrame(
-	) | rpl::map([=] {
-		return track->frameSize();
-	}) | rpl::filter([=](QSize size) {
-		return !size.isEmpty()
-			&& !Core::App().calls().currentCall()
-			&& !Core::App().calls().currentGroupCall();
-	});
-	auto bubbleWidth = bubbleWrap->widthValue(
-	) | rpl::filter([=](int width) {
-		return width > 2 * padding + 1;
-	});
-	rpl::combine(
-		std::move(bubbleWidth),
-		std::move(frameSize)
-	) | rpl::start_with_next([=](int width, QSize frame) {
-		const auto useWidth = (width - 2 * padding);
-		const auto useHeight = std::min(
-			((useWidth * frame.height()) / frame.width()),
-			(useWidth * 480) / 640);
-		bubbleWrap->resize(width, top + useHeight + bottom);
-		bubble->updateGeometry(
-			::Calls::VideoBubble::DragMode::None,
-			QRect(padding, top, useWidth, useHeight));
-		bubbleWrap->update();
-	}, bubbleWrap->lifetime());
-
-	using namespace rpl::mappers;
-	const auto checkCapturer = [=] {
-		if (*capturerOwner
-			|| Core::App().calls().currentCall()
-			|| Core::App().calls().currentGroupCall()) {
-			return;
-		}
-		*capturerOwner = Core::App().calls().getVideoCapture(
-			Core::App().settings().cameraDeviceId(),
-			false);
-		(*capturerOwner)->setPreferredAspectRatio(0.);
-		track->setState(VideoState::Active);
-		(*capturerOwner)->setState(tgcalls::VideoState::Active);
-		(*capturerOwner)->setOutput(track->sink());
-	};
-	rpl::combine(
-		Core::App().calls().currentCallValue(),
-		Core::App().calls().currentGroupCallValue(),
-		_1 || _2
-	) | rpl::start_with_next([=](bool has) {
-		if (has) {
-			track->setState(VideoState::Inactive);
-			bubbleWrap->resize(bubbleWrap->width(), 0);
-			*capturerOwner = nullptr;
-		} else {
-			crl::on_main(content, checkCapturer);
-		}
-	}, lifetime);
-
-	return track;
-}
-
-void Calls::sectionSaveChanges(FnMut<void()> done) {
-	_testingMicrophone = false;
-	done();
-}
-
-void Calls::setupContent() {
-	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-	const auto settings = &Core::App().settings();
-
-	Ui::AddSkip(content);
-	Ui::AddSubsectionTitle(content, tr::lng_settings_call_section_output());
-
-	initPlaybackButton(
-		content,
-		tr::lng_settings_call_output_device(),
-		rpl::deferred([=] {
-			return DeviceIdOrDefault(settings->playbackDeviceIdValue());
-		}),
-		[=](const QString &id) { settings->setPlaybackDeviceId(id); });
-
-	Ui::AddSkip(content);
-	Ui::AddDivider(content);
-	Ui::AddSkip(content);
-	Ui::AddSubsectionTitle(content, tr::lng_settings_call_section_input());
-	initCaptureButton(
-		content,
-		tr::lng_settings_call_input_device(),
-		rpl::deferred([=] {
-			return DeviceIdOrDefault(settings->captureDeviceIdValue());
-		}),
-		[=](const QString &id) { settings->setCaptureDeviceId(id); });
-
-	Ui::AddSkip(content);
-	Ui::AddDivider(content);
-
-	Ui::AddSkip(content);
-	Ui::AddSubsectionTitle(content, tr::lng_settings_devices_calls());
-	const auto orDefault = [](const QString &value) {
-		return value.isEmpty() ? kDefaultDeviceId : value;
-	};
-	const auto same = content->add(object_ptr<Ui::SettingsButton>(
-		content,
-		tr::lng_settings_devices_calls_same(),
-		st::settingsButtonNoIcon));
-	same->toggleOn(rpl::combine(
-		settings->callPlaybackDeviceIdValue(),
-		settings->callCaptureDeviceIdValue()
-	) | rpl::map([](const QString &playback, const QString &capture) {
-		return playback.isEmpty() && capture.isEmpty();
-	}));
-	same->toggledValue() | rpl::filter([=](bool toggled) {
-		const auto empty = settings->callPlaybackDeviceId().isEmpty()
-			&& settings->callCaptureDeviceId().isEmpty();
-		return (empty != toggled);
-	}) | rpl::start_with_next([=](bool toggled) {
-		if (toggled) {
-			settings->setCallPlaybackDeviceId(QString());
-			settings->setCallCaptureDeviceId(QString());
-		} else {
-			settings->setCallPlaybackDeviceId(
-				orDefault(settings->playbackDeviceId()));
-			settings->setCallCaptureDeviceId(
-				orDefault(settings->captureDeviceId()));
-		}
-		Core::App().saveSettingsDelayed();
-	}, same->lifetime());
-	const auto different = content->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			content,
-			object_ptr<Ui::VerticalLayout>(content)));
-	const auto calls = different->entity();
-	initPlaybackButton(
-		calls,
-		tr::lng_group_call_speakers(),
-		rpl::deferred([=] {
-			return DeviceIdValueWithFallback(
-				settings->callPlaybackDeviceIdValue(),
-				settings->playbackDeviceIdValue());
-		}),
-		[=](const QString &id) { settings->setCallPlaybackDeviceId(id); });
-	initCaptureButton(
-		calls,
-		tr::lng_group_call_microphone(),
-		rpl::deferred([=] {
-			return DeviceIdValueWithFallback(
-				settings->callCaptureDeviceIdValue(),
-				settings->captureDeviceIdValue());
-		}),
-		[=](const QString &id) { settings->setCallCaptureDeviceId(id); });
-	different->toggleOn(same->toggledValue() | rpl::map(!rpl::mappers::_1));
-	Ui::AddSkip(content);
-	Ui::AddDivider(content);
-
-	if (!Core::App().mediaDevices().defaultId(
-			Webrtc::DeviceType::Camera).isEmpty()) {
-		Ui::AddSkip(content);
-		Ui::AddSubsectionTitle(content, tr::lng_settings_call_camera());
-		AddCameraSubsection(_controller->uiShow(), content, true);
-		Ui::AddSkip(content);
-		Ui::AddDivider(content);
-	}
-
-	Ui::AddSkip(content);
-	Ui::AddSubsectionTitle(content, tr::lng_settings_call_section_other());
-
-	const auto api = &_controller->session().api();
-	content->add(object_ptr<Ui::SettingsButton>(
-		content,
-		tr::lng_settings_call_accept_calls(),
-		st::settingsButtonNoIcon
-	))->toggleOn(
-		api->authorizations().callsDisabledHereValue(
-		) | rpl::map(!rpl::mappers::_1)
-	)->toggledChanges(
-	) | rpl::filter([=](bool value) {
-		return (value == api->authorizations().callsDisabledHere());
-	}) | start_with_next([=](bool value) {
-		api->authorizations().toggleCallsDisabledHere(!value);
-	}, content->lifetime());
-
-	content->add(object_ptr<Ui::SettingsButton>(
-		content,
-		tr::lng_settings_call_open_system_prefs(),
-		st::settingsButtonNoIcon
-	))->addClickHandler([=] {
-		using namespace ::Platform;
-		const auto opened = OpenSystemSettings(SystemSettingsType::Audio);
-		if (!opened) {
-			_controller->show(
-				Ui::MakeInformBox(tr::lng_linux_no_audio_prefs()));
-		}
-	});
-
-	Ui::AddSkip(content);
-
-	Ui::ResizeFitChild(this, content);
-}
-
-void Calls::initPlaybackButton(
+void InitPlaybackButton(
+		not_null<Window::SessionController*> controller,
 		not_null<Ui::VerticalLayout*> container,
 		rpl::producer<QString> text,
 		rpl::producer<QString> resolvedId,
@@ -335,28 +81,29 @@ void Calls::initPlaybackButton(
 		PlaybackDeviceNameValue(rpl::duplicate(resolvedId)),
 		st::settingsButtonNoIcon
 	)->addClickHandler([=] {
-		_controller->show(ChoosePlaybackDeviceBox(
+		controller->show(ChoosePlaybackDeviceBox(
 			rpl::duplicate(resolvedId),
 			[=](const QString &id) {
 				set(id);
 				Core::App().saveSettingsDelayed();
 			}));
 	});
-
 }
 
-void Calls::initCaptureButton(
+void InitCaptureButton(
+		not_null<Window::SessionController*> controller,
 		not_null<Ui::VerticalLayout*> container,
 		rpl::producer<QString> text,
 		rpl::producer<QString> resolvedId,
-		Fn<void(QString)> set) {
+		Fn<void(QString)> set,
+		rpl::variable<bool> *testingMicrophone) {
 	AddButtonWithLabel(
 		container,
 		tr::lng_settings_call_input_device(),
 		CaptureDeviceNameValue(rpl::duplicate(resolvedId)),
 		st::settingsButtonNoIcon
 	)->addClickHandler([=] {
-		_controller->show(ChooseCaptureDeviceBox(
+		controller->show(ChooseCaptureDeviceBox(
 			rpl::duplicate(resolvedId),
 			[=](const QString &id) {
 				set(id);
@@ -386,7 +133,7 @@ void Calls::initCaptureButton(
 			level->setValue(state->animation.value(state->level));
 		}, was, state->level, kMicTestAnimationDuration);
 	});
-	_testingMicrophone.value() | rpl::start_with_next([=](bool testing) {
+	testingMicrophone->value() | rpl::on_next([=](bool testing) {
 		if (testing) {
 			state->deviceId = std::make_unique<Webrtc::DeviceResolver>(
 				&Core::App().mediaDevices(),
@@ -404,49 +151,290 @@ void Calls::initCaptureButton(
 	}, level->lifetime());
 }
 
-void Calls::requestPermissionAndStartTestingMicrophone() {
-	using namespace ::Platform;
-	const auto status = GetPermissionStatus(
-		PermissionType::Microphone);
-	if (status == PermissionStatus::Granted) {
-		_testingMicrophone = true;
-	} else if (status == PermissionStatus::CanRequest) {
-		const auto startTestingChecked = crl::guard(this, [=](
-				PermissionStatus status) {
-			if (status == PermissionStatus::Granted) {
-				crl::on_main(crl::guard(this, [=] {
-					_testingMicrophone = true;
-				}));
+void BuildOutputSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	if (!controller) {
+		return;
+	}
+	const auto settings = &Core::App().settings();
+
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"calls/output"_q,
+		.title = tr::lng_settings_call_section_output(),
+		.keywords = { u"speakers"_q, u"output"_q, u"audio"_q },
+	});
+
+	builder.add([controller, settings](const WidgetContext &ctx) {
+		InitPlaybackButton(
+			controller,
+			ctx.container,
+			tr::lng_settings_call_output_device(),
+			rpl::deferred([=] {
+				return DeviceIdOrDefault(settings->playbackDeviceIdValue());
+			}),
+			[=](const QString &id) { settings->setPlaybackDeviceId(id); });
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"calls/output/device"_q,
+			.title = tr::lng_settings_call_output_device(tr::now),
+			.keywords = { u"speakers"_q, u"output"_q, u"playback"_q },
+		};
+	});
+}
+
+void BuildInputSection(
+		SectionBuilder &builder,
+		rpl::variable<bool> *testingMicrophone) {
+	const auto controller = builder.controller();
+	if (!controller) {
+		return;
+	}
+	const auto settings = &Core::App().settings();
+
+	builder.addSkip();
+	builder.addDivider();
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"calls/input"_q,
+		.title = tr::lng_settings_call_section_input(),
+		.keywords = { u"microphone"_q, u"input"_q, u"audio"_q },
+	});
+
+	builder.add([controller, settings, testingMicrophone](const WidgetContext &ctx) {
+		InitCaptureButton(
+			controller,
+			ctx.container,
+			tr::lng_settings_call_input_device(),
+			rpl::deferred([=] {
+				return DeviceIdOrDefault(settings->captureDeviceIdValue());
+			}),
+			[=](const QString &id) { settings->setCaptureDeviceId(id); },
+			testingMicrophone);
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"calls/input/device"_q,
+			.title = tr::lng_settings_call_input_device(tr::now),
+			.keywords = { u"microphone"_q, u"input"_q, u"capture"_q },
+		};
+	});
+}
+
+void BuildCallDevicesSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	if (!controller) {
+		return;
+	}
+	const auto settings = &Core::App().settings();
+
+	builder.addSkip();
+	builder.addDivider();
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"calls/devices"_q,
+		.title = tr::lng_settings_devices_calls(),
+		.keywords = { u"calls"_q, u"devices"_q, u"same"_q },
+	});
+
+	const auto orDefault = [](const QString &value) {
+		return value.isEmpty() ? kDefaultDeviceId : value;
+	};
+
+	const auto same = builder.addButton({
+		.id = u"calls/same-devices"_q,
+		.title = tr::lng_settings_devices_calls_same(),
+		.st = &st::settingsButtonNoIcon,
+		.toggled = rpl::combine(
+			settings->callPlaybackDeviceIdValue(),
+			settings->callCaptureDeviceIdValue()
+		) | rpl::map([](const QString &playback, const QString &capture) {
+			return playback.isEmpty() && capture.isEmpty();
+		}),
+		.keywords = { u"same"_q, u"separate"_q, u"devices"_q },
+	});
+
+	if (same) {
+		same->toggledValue() | rpl::filter([=](bool toggled) {
+			const auto empty = settings->callPlaybackDeviceId().isEmpty()
+				&& settings->callCaptureDeviceId().isEmpty();
+			return (empty != toggled);
+		}) | rpl::on_next([=](bool toggled) {
+			if (toggled) {
+				settings->setCallPlaybackDeviceId(QString());
+				settings->setCallCaptureDeviceId(QString());
+			} else {
+				settings->setCallPlaybackDeviceId(
+					orDefault(settings->playbackDeviceId()));
+				settings->setCallCaptureDeviceId(
+					orDefault(settings->captureDeviceId()));
 			}
+			Core::App().saveSettingsDelayed();
+		}, same->lifetime());
+	}
+
+	builder.add([controller, settings, same](const WidgetContext &ctx) {
+		const auto container = ctx.container.get();
+		const auto different = container->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				container,
+				object_ptr<Ui::VerticalLayout>(container)));
+		const auto calls = different->entity();
+
+		InitPlaybackButton(
+			controller,
+			calls,
+			tr::lng_group_call_speakers(),
+			rpl::deferred([=] {
+				return DeviceIdValueWithFallback(
+					settings->callPlaybackDeviceIdValue(),
+					settings->playbackDeviceIdValue());
+			}),
+			[=](const QString &id) { settings->setCallPlaybackDeviceId(id); });
+
+		struct LevelStateStub {
+			std::unique_ptr<Webrtc::DeviceResolver> deviceId;
+			std::unique_ptr<Webrtc::AudioInputTester> tester;
+			base::Timer timer;
+			Ui::Animations::Simple animation;
+			float level = 0.;
+		};
+		const auto captureId = rpl::deferred([=] {
+			return DeviceIdValueWithFallback(
+				settings->callCaptureDeviceIdValue(),
+				settings->captureDeviceIdValue());
 		});
-		RequestPermission(
-			PermissionType::Microphone,
-			startTestingChecked);
-	} else {
-		const auto showSystemSettings = [controller = _controller] {
-			OpenSystemSettingsForPermission(
-				PermissionType::Microphone);
-			controller->hideLayer();
+		AddButtonWithLabel(
+			calls,
+			tr::lng_group_call_microphone(),
+			CaptureDeviceNameValue(rpl::duplicate(captureId)),
+			st::settingsButtonNoIcon
+		)->addClickHandler([=] {
+			controller->show(ChooseCaptureDeviceBox(
+				rpl::duplicate(captureId),
+				[=](const QString &id) {
+					settings->setCallCaptureDeviceId(id);
+					Core::App().saveSettingsDelayed();
+				}));
+		});
+
+		if (same) {
+			different->toggleOn(
+				same->toggledValue() | rpl::map(!rpl::mappers::_1));
+		}
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"calls/call-speakers"_q,
+			.title = tr::lng_group_call_speakers(tr::now),
+			.keywords = { u"speakers"_q, u"calls"_q },
 		};
-		_controller->show(Ui::MakeConfirmBox({
-			.text = tr::lng_no_mic_permission(),
-			.confirmed = showSystemSettings,
-			.confirmText = tr::lng_menu_settings(),
-		}));
-	}
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"calls/call-microphone"_q,
+			.title = tr::lng_group_call_microphone(tr::now),
+			.keywords = { u"microphone"_q, u"calls"_q },
+		};
+	});
 }
 
-rpl::producer<QString> PlaybackDeviceNameValue(rpl::producer<QString> id) {
-	return DeviceNameValue(DeviceType::Playback, std::move(id));
+void BuildCameraSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	if (!controller) {
+		return;
+	}
+
+	if (Core::App().mediaDevices().defaultId(
+			Webrtc::DeviceType::Camera).isEmpty()) {
+		return;
+	}
+
+	builder.addSkip();
+	builder.addDivider();
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"calls/camera"_q,
+		.title = tr::lng_settings_call_camera(),
+		.keywords = { u"camera"_q, u"video"_q, u"webcam"_q },
+	});
+
+	builder.add([controller](const WidgetContext &ctx) {
+		AddCameraSubsection(controller->uiShow(), ctx.container, true);
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"calls/camera/device"_q,
+			.title = tr::lng_settings_call_input_device(tr::now),
+			.keywords = { u"camera"_q, u"video"_q, u"webcam"_q },
+		};
+	});
 }
 
-rpl::producer<QString> CaptureDeviceNameValue(rpl::producer<QString> id) {
-	return DeviceNameValue(DeviceType::Capture, std::move(id));
+void BuildOtherSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto session = builder.session();
+
+	builder.addSkip();
+	builder.addDivider();
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"calls/other"_q,
+		.title = tr::lng_settings_call_section_other(),
+		.keywords = { u"calls"_q, u"accept"_q, u"system"_q },
+	});
+
+	const auto api = &session->api();
+	const auto authorizations = &api->authorizations();
+	authorizations->reload();
+
+	const auto acceptCalls = builder.addButton({
+		.id = u"calls/accept"_q,
+		.title = tr::lng_settings_call_accept_calls(),
+		.st = &st::settingsButtonNoIcon,
+		.toggled = authorizations->callsDisabledHereValue()
+			| rpl::map(!rpl::mappers::_1),
+		.keywords = { u"accept"_q, u"receive"_q, u"incoming"_q },
+		.highlight = { .rippleShape = true },
+	});
+
+	if (acceptCalls) {
+		acceptCalls->toggledChanges(
+		) | rpl::filter([=](bool value) {
+			return (value == authorizations->callsDisabledHere());
+		}) | rpl::on_next([=](bool value) {
+			authorizations->toggleCallsDisabledHere(!value);
+		}, acceptCalls->lifetime());
+	}
+
+	builder.addButton({
+		.id = u"calls/system-prefs"_q,
+		.title = tr::lng_settings_call_open_system_prefs(),
+		.st = &st::settingsButtonNoIcon,
+		.onClick = [controller] {
+			using namespace ::Platform;
+			const auto opened = OpenSystemSettings(SystemSettingsType::Audio);
+			if (!opened) {
+				controller->show(
+					Ui::MakeInformBox(tr::lng_linux_no_audio_prefs()));
+			}
+		},
+		.keywords = { u"system"_q, u"preferences"_q, u"audio"_q },
+		.highlight = { .rippleShape = true },
+	});
+
+	builder.addSkip();
 }
 
-rpl::producer<QString> CameraDeviceNameValue(
-		rpl::producer<QString> id) {
-	return DeviceNameValue(DeviceType::Camera, std::move(id));
+void BuildCallsSectionContent(
+		SectionBuilder &builder,
+		rpl::variable<bool> *testingMicrophone = nullptr) {
+	BuildOutputSection(builder);
+	BuildInputSection(builder, testingMicrophone);
+	BuildCallDevicesSection(builder);
+	BuildCameraSection(builder);
+	BuildOtherSection(builder);
 }
 
 void ChooseMediaDeviceBox(
@@ -482,7 +470,7 @@ void ChooseMediaDeviceBox(
 	state->currentId = std::move(currentId);
 
 	const auto choose = [=](const QString &id) {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		chosen(id);
 		if (weak) {
 			box->closeBox();
@@ -510,7 +498,7 @@ void ChooseMediaDeviceBox(
 	def->clicks(
 	) | rpl::filter([=] {
 		return !group->value();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		choose(kDefaultDeviceId);
 	}, def->lifetime());
 	const auto showUnavailable = [=](QString text) {
@@ -574,7 +562,7 @@ void ChooseMediaDeviceBox(
 
 	std::move(
 		devicesValue
-	) | rpl::start_with_next([=](std::vector<DeviceInfo> &&list) {
+	) | rpl::on_next([=](std::vector<DeviceInfo> &&list) {
 		auto count = buttons->count();
 		auto index = 1;
 		state->ids.clear();
@@ -608,7 +596,7 @@ void ChooseMediaDeviceBox(
 			button->clicks(
 			) | rpl::filter([=] {
 				return (group->current() == index);
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				choose(id);
 			}, button->lifetime());
 
@@ -629,7 +617,7 @@ void ChooseMediaDeviceBox(
 	}, box->lifetime());
 
 	state->currentId.changes(
-	) | rpl::start_with_next(selectCurrent, box->lifetime());
+	) | rpl::on_next(selectCurrent, box->lifetime());
 
 	def->finishAnimating();
 
@@ -642,6 +630,239 @@ void ChooseMediaDeviceBox(
 	});
 }
 
+class Calls : public Section<Calls> {
+public:
+	Calls(QWidget *parent, not_null<Window::SessionController*> controller);
+	~Calls();
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+	void sectionSaveChanges(FnMut<void()> done) override;
+
+private:
+	void setupContent();
+	void requestPermissionAndStartTestingMicrophone();
+
+	rpl::variable<bool> _testingMicrophone;
+
+};
+
+Calls::Calls(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: Section(parent, controller) {
+	controller->session().api().authorizations().reload();
+
+	setupContent();
+	requestPermissionAndStartTestingMicrophone();
+}
+
+Calls::~Calls() = default;
+
+rpl::producer<QString> Calls::title() {
+	return tr::lng_settings_section_devices();
+}
+
+void Calls::sectionSaveChanges(FnMut<void()> done) {
+	_testingMicrophone = false;
+	done();
+}
+
+void Calls::setupContent() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	const auto testingMicrophone = &_testingMicrophone;
+	const SectionBuildMethod buildMethod = [testingMicrophone](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		const auto isPaused = Window::PausedIn(
+			controller,
+			Window::GifPauseReason::Layer);
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = isPaused,
+		});
+		BuildCallsSectionContent(builder, testingMicrophone);
+	};
+
+	build(content, buildMethod);
+	Ui::ResizeFitChild(this, content);
+}
+
+void Calls::requestPermissionAndStartTestingMicrophone() {
+	using PermissionType = ::Platform::PermissionType;
+	using PermissionStatus = ::Platform::PermissionStatus;
+	const auto status = GetPermissionStatus(
+		PermissionType::Microphone);
+	if (status == PermissionStatus::Granted) {
+		_testingMicrophone = true;
+	} else if (status == PermissionStatus::CanRequest) {
+		const auto startTestingChecked = crl::guard(this, [=](
+				PermissionStatus status) {
+			if (status == PermissionStatus::Granted) {
+				crl::on_main(crl::guard(this, [=] {
+					_testingMicrophone = true;
+				}));
+			}
+		});
+		RequestPermission(
+			PermissionType::Microphone,
+			startTestingChecked);
+	} else {
+		const auto showSystemSettings = [controller = controller()] {
+			OpenSystemSettingsForPermission(
+				PermissionType::Microphone);
+			controller->hideLayer();
+		};
+		controller()->show(Ui::MakeConfirmBox({
+			.text = tr::lng_no_mic_permission(),
+			.confirmed = showSystemSettings,
+			.confirmText = tr::lng_menu_settings(),
+		}));
+	}
+}
+
+const auto kMeta = BuildHelper({
+	.id = Calls::Id(),
+	.parentId = MainId(),
+	.title = &tr::lng_settings_section_devices,
+	.icon = &st::menuIconUnmute,
+}, [](SectionBuilder &builder) {
+	BuildCallsSectionContent(builder);
+});
+
+} // namespace
+
+Type CallsId() {
+	return Calls::Id();
+}
+
+Webrtc::VideoTrack *AddCameraSubsection(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Ui::VerticalLayout*> content,
+		bool saveToSettings) {
+	auto &lifetime = content->lifetime();
+
+	const auto hasCall = (Core::App().calls().currentCall() != nullptr);
+
+	auto capturerOwner = lifetime.make_state<
+		std::shared_ptr<tgcalls::VideoCaptureInterface>
+	>();
+
+	const auto track = lifetime.make_state<VideoTrack>(
+		(hasCall
+			? VideoState::Inactive
+			: VideoState::Active));
+
+	const auto deviceId = lifetime.make_state<rpl::variable<QString>>(
+		Core::App().settings().cameraDeviceId());
+	auto resolvedId = rpl::deferred([=] {
+		return DeviceIdOrDefault(deviceId->value());
+	});
+	AddButtonWithLabel(
+		content,
+		tr::lng_settings_call_input_device(),
+		CameraDeviceNameValue(rpl::duplicate(resolvedId)),
+		st::settingsButtonNoIcon
+	)->addClickHandler([=] {
+		show->show(ChooseCameraDeviceBox(
+			rpl::duplicate(resolvedId),
+			[=](const QString &id) {
+				*deviceId = id;
+				if (saveToSettings) {
+					Core::App().settings().setCameraDeviceId(id);
+					Core::App().saveSettingsDelayed();
+				}
+				if (*capturerOwner) {
+					(*capturerOwner)->switchToDevice(
+						id.toStdString(),
+						false);
+				}
+		}));
+	});
+	const auto bubbleWrap = content->add(object_ptr<Ui::RpWidget>(content));
+	const auto bubble = lifetime.make_state<::Calls::VideoBubble>(
+		bubbleWrap,
+		track);
+	const auto padding = st::settingsButtonNoIcon.padding.left();
+	const auto top = st::boxRoundShadow.extend.top();
+	const auto bottom = st::boxRoundShadow.extend.bottom();
+
+	auto frameSize = track->renderNextFrame(
+	) | rpl::map([=] {
+		return track->frameSize();
+	}) | rpl::filter([=](QSize size) {
+		return !size.isEmpty()
+			&& !Core::App().calls().currentCall()
+			&& !Core::App().calls().currentGroupCall();
+	});
+	auto bubbleWidth = bubbleWrap->widthValue(
+	) | rpl::filter([=](int width) {
+		return width > 2 * padding + 1;
+	});
+	rpl::combine(
+		std::move(bubbleWidth),
+		std::move(frameSize)
+	) | rpl::on_next([=](int width, QSize frame) {
+		const auto useWidth = (width - 2 * padding);
+		const auto useHeight = std::min(
+			((useWidth * frame.height()) / frame.width()),
+			(useWidth * 480) / 640);
+		bubbleWrap->resize(width, top + useHeight + bottom);
+		bubble->updateGeometry(
+			::Calls::VideoBubble::DragMode::None,
+			QRect(padding, top, useWidth, useHeight));
+		bubbleWrap->update();
+	}, bubbleWrap->lifetime());
+
+	using namespace rpl::mappers;
+	const auto checkCapturer = [=] {
+		if (*capturerOwner
+			|| Core::App().calls().currentCall()
+			|| Core::App().calls().currentGroupCall()) {
+			return;
+		}
+		*capturerOwner = Core::App().calls().getVideoCapture(
+			Core::App().settings().cameraDeviceId(),
+			false);
+		(*capturerOwner)->setPreferredAspectRatio(0.);
+		track->setState(VideoState::Active);
+		(*capturerOwner)->setState(tgcalls::VideoState::Active);
+		(*capturerOwner)->setOutput(track->sink());
+	};
+	rpl::combine(
+		Core::App().calls().currentCallValue(),
+		Core::App().calls().currentGroupCallValue(),
+		_1 || _2
+	) | rpl::on_next([=](bool has) {
+		if (has) {
+			track->setState(VideoState::Inactive);
+			bubbleWrap->resize(bubbleWrap->width(), 0);
+			*capturerOwner = nullptr;
+		} else {
+			crl::on_main(content, checkCapturer);
+		}
+	}, lifetime);
+
+	return track;
+}
+
+rpl::producer<QString> PlaybackDeviceNameValue(rpl::producer<QString> id) {
+	return DeviceNameValue(DeviceType::Playback, std::move(id));
+}
+
+rpl::producer<QString> CaptureDeviceNameValue(rpl::producer<QString> id) {
+	return DeviceNameValue(DeviceType::Capture, std::move(id));
+}
+
+rpl::producer<QString> CameraDeviceNameValue(
+		rpl::producer<QString> id) {
+	return DeviceNameValue(DeviceType::Camera, std::move(id));
+}
+
 object_ptr<Ui::GenericBox> ChoosePlaybackDeviceBox(
 		rpl::producer<QString> currentId,
 		Fn<void(QString id)> chosen,
@@ -679,7 +900,7 @@ object_ptr<Ui::GenericBox> ChooseCameraDeviceBox(
 		const style::Radio *radioSt) {
 	return Box(
 		ChooseMediaDeviceBox,
-		tr::lng_settings_call_device_default(),
+		tr::lng_settings_call_camera(),
 		Core::App().mediaDevices().devicesValue(DeviceType::Camera),
 		std::move(currentId),
 		std::move(chosen),
@@ -687,5 +908,9 @@ object_ptr<Ui::GenericBox> ChooseCameraDeviceBox(
 		radioSt);
 }
 
-} // namespace Settings
+namespace Builder {
+
+SectionBuildMethod CallsSection = kMeta.build;
 
+} // namespace Builder
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_calls.h b/Telegram/SourceFiles/settings/sections/settings_calls.h
similarity index 57%
rename from Telegram/SourceFiles/settings/settings_calls.h
rename to Telegram/SourceFiles/settings/sections/settings_calls.h
index efdf95f81fb2fc..686dddae0a1d9e 100644
--- a/Telegram/SourceFiles/settings/settings_calls.h
+++ b/Telegram/SourceFiles/settings/sections/settings_calls.h
@@ -7,66 +7,35 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "settings/settings_common_session.h"
-#include "ui/effects/animations.h"
-#include "base/timer.h"
+#include "settings/settings_type.h"
 
 namespace style {
 struct Checkbox;
 struct Radio;
 } // namespace style
 
-namespace Calls {
-class Call;
-} // namespace Calls
+namespace Webrtc {
+class VideoTrack;
+} // namespace Webrtc
 
 namespace Ui {
-class LevelMeter;
 class GenericBox;
 class Show;
+class VerticalLayout;
 } // namespace Ui
 
-namespace Webrtc {
-class AudioInputTester;
-class VideoTrack;
-} // namespace Webrtc
+namespace Window {
+class SessionController;
+} // namespace Window
 
 namespace Settings {
 
-class Calls : public Section<Calls> {
-public:
-	Calls(QWidget *parent, not_null<Window::SessionController*> controller);
-	~Calls();
-
-	[[nodiscard]] rpl::producer<QString> title() override;
+[[nodiscard]] Type CallsId();
 
-	void sectionSaveChanges(FnMut<void()> done) override;
-
-	static Webrtc::VideoTrack *AddCameraSubsection(
-		std::shared_ptr<Ui::Show> show,
-		not_null<Ui::VerticalLayout*> content,
-		bool saveToSettings);
-
-private:
-	void setupContent();
-	void requestPermissionAndStartTestingMicrophone();
-
-	void initPlaybackButton(
-		not_null<Ui::VerticalLayout*> container,
-		rpl::producer<QString> text,
-		rpl::producer<QString> resolvedId,
-		Fn<void(QString)> set);
-	void initCaptureButton(
-		not_null<Ui::VerticalLayout*> container,
-		rpl::producer<QString> text,
-		rpl::producer<QString> resolvedId,
-		Fn<void(QString)> set);
-
-	const not_null<Window::SessionController*> _controller;
-	rpl::event_stream<QString> _cameraNameStream;
-	rpl::variable<bool> _testingMicrophone;
-
-};
+Webrtc::VideoTrack *AddCameraSubsection(
+	std::shared_ptr<Ui::Show> show,
+	not_null<Ui::VerticalLayout*> content,
+	bool saveToSettings);
 
 inline constexpr auto kMicTestUpdateInterval = crl::time(100);
 inline constexpr auto kMicTestAnimationDuration = crl::time(200);
@@ -94,4 +63,3 @@ inline constexpr auto kMicTestAnimationDuration = crl::time(200);
 	const style::Radio *radioSt = nullptr);
 
 } // namespace Settings
-
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/sections/settings_chat.cpp
similarity index 57%
rename from Telegram/SourceFiles/settings/settings_chat.cpp
rename to Telegram/SourceFiles/settings/sections/settings_chat.cpp
index a45a8787a877aa..6ab0a4d2b7f78f 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/sections/settings_chat.cpp
@@ -5,12 +5,18 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_chat.h"
+#include "settings/sections/settings_chat.h"
+
+#include "settings/settings_common_session.h"
 
 #include "base/timer_rpl.h"
-#include "settings/settings_advanced.h"
-#include "settings/settings_privacy_security.h"
+#include "settings/settings_builder.h"
+#include "settings/sections/settings_advanced.h"
+#include "settings/sections/settings_local_storage.h"
+#include "settings/sections/settings_main.h"
+#include "settings/sections/settings_privacy_security.h"
 #include "settings/settings_experimental.h"
+#include "settings/sections/settings_shortcuts.h"
 #include "boxes/abstract_box.h"
 #include "boxes/peers/edit_peer_color_box.h"
 #include "boxes/connection_box.h"
@@ -21,14 +27,16 @@ For license and copyright information please follow this link:
 #include "boxes/background_box.h"
 #include "boxes/background_preview_box.h"
 #include "boxes/download_path_box.h"
-#include "boxes/local_storage_box.h"
+#include "dialogs/ui/dialogs_quick_action_context.h"
+#include "dialogs/dialogs_quick_action.h"
 #include "ui/boxes/choose_font_box.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/color_editor.h"
-#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
 #include "ui/chat/attach/attach_extensions.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
@@ -38,11 +46,13 @@ For license and copyright information please follow this link:
 #include "ui/toast/toast.h"
 #include "ui/image/image.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/vertical_list.h"
 #include "ui/ui_utility.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
 #include "history/view/history_view_quick_action.h"
 #include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
 #include "export/export_manager.h"
 #include "window/themes/window_theme.h"
 #include "window/themes/window_themes_embedded.h"
@@ -56,6 +66,7 @@ For license and copyright information please follow this link:
 #include "storage/localstorage.h"
 #include "core/file_utilities.h"
 #include "core/application.h"
+#include "core/core_settings.h"
 #include "data/data_session.h"
 #include "data/data_cloud_themes.h"
 #include "data/data_file_origin.h"
@@ -75,13 +86,22 @@ For license and copyright information please follow this link:
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
 #include "styles/style_window.h"
+#include "styles/style_dialogs.h"
+
+#include <QAction>
 
 namespace Settings {
 namespace {
 
+using namespace Builder;
+
 const auto kSchemesList = Window::Theme::EmbeddedThemes();
 constexpr auto kCustomColorButtonParts = 7;
 
+[[nodiscard]] bool IsSystemAccentColorSupported() {
+	return Window::Theme::SystemAccentColor().has_value();
+}
+
 class ColorsPalette final {
 public:
 	using Type = Window::Theme::EmbeddedType;
@@ -91,6 +111,7 @@ class ColorsPalette final {
 
 	void show(Type type);
 
+	[[nodiscard]] Ui::RpWidget *editButton() const;
 	rpl::producer<QColor> selected() const;
 
 private:
@@ -106,6 +127,7 @@ class ColorsPalette final {
 		rpl::producer<> clicks() const;
 		bool selected() const;
 		QColor color() const;
+		Ui::RpWidget *widget() const;
 
 	private:
 		void paint();
@@ -170,7 +192,7 @@ ColorsPalette::Button::Button(
 	_widget.show();
 	_widget.resize(st::settingsAccentColorSize, st::settingsAccentColorSize);
 	_widget.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		paint();
 	}, _widget.lifetime());
 }
@@ -210,6 +232,10 @@ QColor ColorsPalette::Button::color() const {
 	return _colors.front();
 }
 
+Ui::RpWidget *ColorsPalette::Button::widget() const {
+	return const_cast<Ui::AbstractButton*>(&_widget);
+}
+
 void ColorsPalette::Button::paint() {
 	auto p = QPainter(&_widget);
 	PainterHighQualityEnabler hq(p);
@@ -234,11 +260,15 @@ ColorsPalette::ColorsPalette(not_null<Ui::VerticalLayout*> container)
 
 	const auto inner = _outer->entity();
 	inner->widthValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateInnerGeometry();
 	}, inner->lifetime());
 }
 
+Ui::RpWidget *ColorsPalette::editButton() const {
+	return _buttons.empty() ? nullptr : _buttons.back()->widget();
+}
+
 void ColorsPalette::show(Type type) {
 	const auto scheme = ranges::find(kSchemesList, type, &Scheme::type);
 	if (scheme == end(kSchemesList)) {
@@ -251,8 +281,12 @@ void ColorsPalette::show(Type type) {
 		return;
 	}
 	list.insert(list.begin(), scheme->accentColor);
-	const auto color = Core::App().settings().themesAccentColors().get(type);
-	const auto current = color.value_or(scheme->accentColor);
+	const auto &settings = Core::App().settings();
+	const auto color = settings.themesAccentColors().get(type);
+	const auto current = (settings.systemAccentColorEnabled()
+		? Window::Theme::SystemAccentColor()
+		: std::optional<QColor>()).value_or(
+			color.value_or(scheme->accentColor));
 	const auto i = ranges::find(list, current);
 	if (i == end(list)) {
 		list.back() = current;
@@ -305,7 +339,7 @@ void ColorsPalette::show(
 				clicks
 			) | rpl::map([=] {
 				return _buttons[index - 1]->color();
-			}) | rpl::start_with_next([=](QColor color) {
+			}) | rpl::on_next([=](QColor color) {
 				_selected.fire_copy(color);
 			}, inner->lifetime());
 		}
@@ -315,7 +349,7 @@ void ColorsPalette::show(
 	if (clicks) {
 		std::move(
 			clicks
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			selectCustom(scheme);
 		}, inner->lifetime());
 	}
@@ -339,7 +373,7 @@ void ColorsPalette::selectCustom(not_null<const Scheme*> scheme) {
 			box->closeBox();
 		});
 		editor->submitRequests(
-		) | rpl::start_with_next(save, editor->lifetime());
+		) | rpl::on_next(save, editor->lifetime());
 		editor->setLightnessLimits(
 			colorizer.lightnessMin,
 			colorizer.lightnessMax);
@@ -359,48 +393,25 @@ rpl::producer<QColor> ColorsPalette::selected() const {
 }
 
 void ColorsPalette::updateInnerGeometry() {
-	if (_buttons.size() < 2) {
+	const auto count = int(_buttons.size());
+	if (count < 2) {
 		return;
 	}
 	const auto inner = _outer->entity();
 	const auto size = st::settingsAccentColorSize;
 	const auto padding = st::settingsButtonNoIcon.padding;
 	const auto width = inner->width() - padding.left() - padding.right();
-	const auto skip = (width - size * _buttons.size())
-		/ float64(_buttons.size() - 1);
+	if (width < size * count) {
+		return;
+	}
+	const auto skip = (width - size * count) / float64(count - 1);
 	const auto y = st::defaultVerticalListSkip * 2;
 	auto x = float64(padding.left());
 	for (const auto &button : _buttons) {
 		button->moveToLeft(int(base::SafeRound(x)), y);
 		x += size + skip;
 	}
-	inner->resize(inner->width(), y + size);
-}
-
-} // namespace
-
-void PaintRoundColorButton(
-		QPainter &p,
-		int size,
-		QBrush brush,
-		float64 selected) {
-	const auto rect = QRect(0, 0, size, size);
-
-	p.setBrush(brush);
-	p.setPen(Qt::NoPen);
-	p.drawEllipse(rect);
-
-	if (selected > 0.) {
-		const auto startSkip = -st::settingsAccentColorLine / 2.;
-		const auto endSkip = float64(st::settingsAccentColorSkip);
-		const auto skip = startSkip + (endSkip - startSkip) * selected;
-		auto pen = st::boxBg->p;
-		pen.setWidth(st::settingsAccentColorLine);
-		p.setBrush(Qt::NoBrush);
-		p.setPen(pen);
-		p.setOpacity(selected);
-		p.drawEllipse(QRectF(rect).marginsRemoved({ skip, skip, skip, skip }));
-	}
+	inner->resize(inner->width(), y + size + st::defaultVerticalListSkip);
 }
 
 class BackgroundRow : public Ui::RpWidget {
@@ -409,6 +420,9 @@ class BackgroundRow : public Ui::RpWidget {
 		QWidget *parent,
 		not_null<Window::SessionController*> controller);
 
+	[[nodiscard]] Ui::LinkButton *chooseFromGallery() const;
+	[[nodiscard]] Ui::LinkButton *chooseFromFile() const;
+
 protected:
 	void paintEvent(QPaintEvent *e) override;
 
@@ -463,7 +477,7 @@ BackgroundRow::BackgroundRow(
 		return (update.type == Update::Type::New
 			|| update.type == Update::Type::Start
 			|| update.type == Update::Type::Changed);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateImage();
 	}, lifetime());
 }
@@ -535,6 +549,14 @@ int BackgroundRow::resizeGetHeight(int newWidth) {
 	return st::settingsBackgroundThumb;
 }
 
+Ui::LinkButton *BackgroundRow::chooseFromGallery() const {
+	return _chooseFromGallery.data();
+}
+
+Ui::LinkButton *BackgroundRow::chooseFromFile() const {
+	return _chooseFromFile.data();
+}
+
 float64 BackgroundRow::radialProgress() const {
 	return _controller->content()->chatBackgroundProgress();
 }
@@ -670,45 +692,715 @@ void ChooseFromFile(
 			return;
 		}
 
-		if (!result.paths.isEmpty()) {
-			const auto filePath = result.paths.front();
-			const auto hasExtension = [&](QLatin1String extension) {
-				return filePath.endsWith(extension, Qt::CaseInsensitive);
-			};
-			if (hasExtension(qstr(".tdesktop-theme"))
-				|| hasExtension(qstr(".tdesktop-palette"))) {
-				Window::Theme::Apply(filePath);
-				return;
-			}
-		}
+		if (!result.paths.isEmpty()) {
+			const auto filePath = result.paths.front();
+			const auto hasExtension = [&](QLatin1String extension) {
+				return filePath.endsWith(extension, Qt::CaseInsensitive);
+			};
+			if (hasExtension(qstr(".tdesktop-theme"))
+				|| hasExtension(qstr(".tdesktop-palette"))) {
+				Window::Theme::Apply(filePath);
+				return;
+			}
+		}
+
+		auto image = Images::Read({
+			.path = result.paths.isEmpty() ? QString() : result.paths.front(),
+			.content = result.remoteContent,
+			.forceOpaque = true,
+		}).image;
+		if (image.isNull() || image.width() <= 0 || image.height() <= 0) {
+			return;
+		}
+		auto local = Data::CustomWallPaper();
+		local.setLocalImageAsThumbnail(std::make_shared<Image>(
+			std::move(image)));
+		controller->show(Box<BackgroundPreviewBox>(controller, local));
+	});
+	FileDialog::GetOpenPath(
+		parent.get(),
+		tr::lng_choose_image(tr::now),
+		filters.join(u";;"_q),
+		crl::guard(parent, callback));
+}
+
+void SetupSupportSwitchSettings(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container) {
+	using SwitchType = Support::SwitchSettings;
+	const auto group = std::make_shared<Ui::RadioenumGroup<SwitchType>>(
+		controller->session().settings().supportSwitch());
+	const auto add = [&](SwitchType value, const QString &label) {
+		container->add(
+			object_ptr<Ui::Radioenum<SwitchType>>(
+				container,
+				group,
+				value,
+				label,
+				st::settingsSendType),
+			st::settingsSendTypePadding);
+	};
+	add(SwitchType::None, "Just send the reply");
+	add(SwitchType::Next, "Send and switch to next");
+	add(SwitchType::Previous, "Send and switch to previous");
+	group->setChangedCallback([=](SwitchType value) {
+		controller->session().settings().setSupportSwitch(value);
+		controller->session().saveSettingsDelayed();
+	});
+}
+
+void SetupSupportChatsLimitSlice(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container) {
+	constexpr auto kDayDuration = 24 * 60 * 60;
+	struct Option {
+		int days = 0;
+		QString label;
+	};
+	const auto options = std::vector<Option>{
+		{ 1, "1 day" },
+		{ 7, "1 week" },
+		{ 30, "1 month" },
+		{ 365, "1 year" },
+		{ 0, "All of them" },
+	};
+	const auto current = controller->session().settings().supportChatsTimeSlice();
+	const auto days = current / kDayDuration;
+	const auto best = ranges::min_element(
+		options,
+		std::less<>(),
+		[&](const Option &option) { return std::abs(option.days - days); });
+
+	const auto group = std::make_shared<Ui::RadiobuttonGroup>(best->days);
+	for (const auto &option : options) {
+		container->add(
+			object_ptr<Ui::Radiobutton>(
+				container,
+				group,
+				option.days,
+				option.label,
+				st::settingsSendType),
+			st::settingsSendTypePadding);
+	}
+	group->setChangedCallback([=](int days) {
+		controller->session().settings().setSupportChatsTimeSlice(
+			days * kDayDuration);
+		controller->session().saveSettingsDelayed();
+	});
+}
+
+void BuildThemeOptionsSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto highlights = builder.highlights();
+
+	builder.add([controller, highlights](const WidgetContext &ctx) {
+		SetupThemeOptions(controller, ctx.container.get(), highlights);
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"chat/themes"_q,
+			.title = tr::lng_settings_themes(tr::now),
+			.keywords = { u"themes"_q, u"appearance"_q, u"dark"_q, u"light"_q },
+			.icon = { &st::menuIconPalette },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/themes-edit"_q,
+			.title = tr::lng_settings_theme_accent_title(tr::now),
+			.keywords = { u"accent"_q, u"color"_q, u"customize"_q },
+		};
+	});
+
+	if (IsSystemAccentColorSupported()) {
+		builder.add(nullptr, [] {
+			return SearchEntry{
+				.id = u"chat/themes-system-accent"_q,
+				.title = tr::lng_settings_theme_system_accent_color(tr::now),
+				.keywords = {
+					u"system"_q,
+					u"accent"_q,
+					u"color"_q,
+					u"theme"_q,
+					u"os"_q,
+				},
+			};
+		});
+	}
+}
+
+void BuildThemeSettingsSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+
+	builder.add([controller](const WidgetContext &ctx) {
+		SetupThemeSettings(controller, ctx.container.get(), ctx.highlights);
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"chat/peer-color"_q,
+			.title = tr::lng_settings_theme_settings(tr::now),
+			.keywords = { u"color"_q, u"profile"_q, u"name"_q },
+			.icon = { &st::menuIconChangeColors },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/auto-night-mode"_q,
+			.title = tr::lng_settings_auto_night_mode(tr::now),
+			.keywords = { u"night"_q, u"dark"_q, u"auto"_q, u"system"_q },
+			.icon = { &st::menuIconNightMode },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/font"_q,
+			.title = tr::lng_settings_font_family(tr::now),
+			.keywords = { u"font"_q, u"family"_q, u"text"_q },
+			.icon = { &st::menuIconFont },
+		};
+	});
+}
+
+void BuildCloudThemesSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto highlights = builder.highlights();
+
+	builder.add([controller, highlights](const WidgetContext &ctx) {
+		SetupCloudThemes(controller, ctx.container.get(), highlights);
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"chat/cloud-themes"_q,
+			.title = tr::lng_settings_bg_cloud_themes(tr::now),
+			.keywords = { u"cloud"_q, u"themes"_q, u"online"_q },
+		};
+	});
+}
+
+void BuildChatBackgroundSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto highlights = builder.highlights();
+
+	builder.add([controller, highlights](const WidgetContext &ctx) {
+		SetupChatBackground(controller, ctx.container.get(), highlights);
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"chat/wallpapers"_q,
+			.title = tr::lng_settings_section_background(tr::now),
+			.keywords = { u"background"_q, u"wallpaper"_q, u"image"_q },
+			.icon = { &st::menuIconPhoto },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/wallpapers-set"_q,
+			.title = tr::lng_settings_bg_from_gallery(tr::now),
+			.keywords = { u"gallery"_q, u"wallpaper"_q },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/wallpapers-choose-photo"_q,
+			.title = tr::lng_settings_bg_from_file(tr::now),
+			.keywords = { u"file"_q, u"photo"_q, u"upload"_q },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/adaptive-layout"_q,
+			.title = tr::lng_settings_adaptive_wide(tr::now),
+			.keywords = { u"adaptive"_q, u"wide"_q, u"layout"_q },
+			.checkIcon = Core::App().settings().adaptiveForWide()
+				? SearchEntryCheckIcon::Checked
+				: SearchEntryCheckIcon::Unchecked,
+		};
+	});
+}
+
+void BuildChatListQuickActionSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+
+	builder.add([controller](const WidgetContext &ctx) {
+		SetupChatListQuickAction(controller, ctx.container.get(), ctx.highlights);
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"chat/quick-dialog-action"_q,
+			.title = tr::lng_settings_quick_dialog_action_title(tr::now),
+			.keywords = { u"swipe"_q, u"quick"_q, u"action"_q, u"dialog"_q },
+		};
+	});
+}
+
+void BuildStickersEmojiSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto highlights = builder.highlights();
+
+	builder.add([controller, highlights](const WidgetContext &ctx) {
+		SetupStickersEmoji(controller, ctx.container.get(), highlights);
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"chat/stickers-emoji"_q,
+			.title = tr::lng_settings_stickers_emoji(tr::now),
+			.keywords = { u"stickers"_q, u"emoji"_q },
+			.icon = { &st::menuIconStickers },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/large-emoji"_q,
+			.title = tr::lng_settings_large_emoji(tr::now),
+			.keywords = { u"large"_q, u"emoji"_q, u"big"_q },
+			.checkIcon = Core::App().settings().largeEmoji()
+				? SearchEntryCheckIcon::Checked
+				: SearchEntryCheckIcon::Unchecked,
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/replace-emoji"_q,
+			.title = tr::lng_settings_replace_emojis(tr::now),
+			.keywords = { u"replace"_q, u"emoji"_q, u"convert"_q },
+			.checkIcon = Core::App().settings().replaceEmoji()
+				? SearchEntryCheckIcon::Checked
+				: SearchEntryCheckIcon::Unchecked,
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/suggest-emoji"_q,
+			.title = tr::lng_settings_suggest_emoji(tr::now),
+			.keywords = { u"suggest"_q, u"emoji"_q, u"autocomplete"_q },
+			.checkIcon = Core::App().settings().suggestEmoji()
+				? SearchEntryCheckIcon::Checked
+				: SearchEntryCheckIcon::Unchecked,
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/suggest-animated-emoji"_q,
+			.title = tr::lng_settings_suggest_animated_emoji(tr::now),
+			.keywords = { u"animated"_q, u"emoji"_q, u"premium"_q },
+			.checkIcon = Core::App().settings().suggestAnimatedEmoji()
+				? SearchEntryCheckIcon::Checked
+				: SearchEntryCheckIcon::Unchecked,
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/suggest-by-emoji"_q,
+			.title = tr::lng_settings_suggest_by_emoji(tr::now),
+			.keywords = { u"suggest"_q, u"stickers"_q, u"emoji"_q },
+			.checkIcon = Core::App().settings().suggestStickersByEmoji()
+				? SearchEntryCheckIcon::Checked
+				: SearchEntryCheckIcon::Unchecked,
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/loop-stickers"_q,
+			.title = tr::lng_settings_loop_stickers(tr::now),
+			.keywords = { u"loop"_q, u"stickers"_q, u"animated"_q },
+			.checkIcon = Core::App().settings().loopAnimatedStickers()
+				? SearchEntryCheckIcon::Checked
+				: SearchEntryCheckIcon::Unchecked,
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/my-stickers"_q,
+			.title = tr::lng_stickers_you_have(tr::now),
+			.keywords = { u"stickers"_q, u"manage"_q, u"installed"_q },
+			.icon = { &st::menuIconStickers },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/emoji-sets"_q,
+			.title = tr::lng_emoji_manage_sets(tr::now),
+			.keywords = { u"emoji"_q, u"sets"_q, u"manage"_q },
+			.icon = { &st::menuIconEmoji },
+		};
+	});
+}
+
+void BuildMessagesSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto highlights = builder.highlights();
+
+	builder.add([controller, highlights](const WidgetContext &ctx) {
+		SetupMessages(controller, ctx.container.get(), highlights);
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"chat/messages"_q,
+			.title = tr::lng_settings_messages(tr::now),
+			.keywords = { u"messages"_q, u"send"_q, u"enter"_q },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/send-enter"_q,
+			.title = tr::lng_settings_send_enter(tr::now),
+			.keywords = { u"send"_q, u"enter"_q, u"keyboard"_q },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/quick-reaction"_q,
+			.title = tr::lng_settings_chat_quick_action_react(tr::now),
+			.keywords = { u"quick"_q, u"reaction"_q, u"double"_q, u"click"_q },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/corner-reply"_q,
+			.title = tr::lng_settings_chat_corner_reply(tr::now),
+			.keywords = { u"corner"_q, u"reply"_q },
+			.checkIcon = Core::App().settings().cornerReply()
+				? SearchEntryCheckIcon::Checked
+				: SearchEntryCheckIcon::Unchecked,
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"chat/corner-reaction"_q,
+			.title = tr::lng_settings_chat_corner_reaction(tr::now),
+			.keywords = { u"corner"_q, u"reaction"_q },
+			.checkIcon = Core::App().settings().cornerReaction()
+				? SearchEntryCheckIcon::Checked
+				: SearchEntryCheckIcon::Unchecked,
+		};
+	});
+}
+
+void BuildSensitiveContentSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto highlights = builder.highlights();
+
+	builder.add([controller, highlights](const WidgetContext &ctx) {
+		auto updateOnTick = rpl::single(
+		) | rpl::then(base::timer_each(60 * crl::time(1000)));
+		Ui::AddDivider(ctx.container.get());
+		SetupSensitiveContent(
+			controller,
+			ctx.container.get(),
+			std::move(updateOnTick),
+			highlights);
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"chat/sensitive-content"_q,
+			.title = tr::lng_settings_sensitive_title(tr::now),
+			.keywords = { u"sensitive"_q, u"content"_q, u"nsfw"_q, u"adult"_q },
+		};
+	});
+}
+
+void BuildArchiveSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto showOther = builder.showOther();
+	const auto session = builder.session();
+
+	builder.addSkip();
+
+	builder.addSectionButton({
+		.title = tr::lng_settings_shortcuts(),
+		.targetSection = ShortcutsId(),
+		.icon = { &st::menuIconShortcut },
+		.keywords = { u"shortcuts"_q, u"keyboard"_q, u"hotkeys"_q },
+	});
+
+	if (controller) {
+		PreloadArchiveSettings(session);
+	}
+
+	builder.addButton({
+		.id = u"chat/archive-settings"_q,
+		.title = tr::lng_context_archive_settings(),
+		.icon = { &st::menuIconArchive },
+		.onClick = [=] {
+			if (controller) {
+				controller->show(
+					Box<Ui::GenericBox>(ArchiveSettingsBox, controller));
+			}
+		},
+		.keywords = { u"archive"_q, u"settings"_q, u"folder"_q },
+	});
+}
+
+void BuildSupportSection(SectionBuilder &builder) {
+	const auto session = builder.session();
+	if (!session->supportMode()) {
+		return;
+	}
+	const auto controller = builder.controller();
+
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"chat/support"_q,
+		.title = rpl::single(u"Support settings"_q),
+		.keywords = { u"support"_q },
+	});
+	builder.addSkip(st::settingsSendTypeSkip);
+
+	using SwitchType = Support::SwitchSettings;
+
+	builder.add([controller](const WidgetContext &ctx) {
+		const auto container = ctx.container.get();
+		auto wrap = object_ptr<Ui::VerticalLayout>(container);
+		const auto inner = wrap.data();
+
+		const auto group = std::make_shared<Ui::RadioenumGroup<SwitchType>>(
+			controller->session().settings().supportSwitch());
+
+		const auto addRadio = [&](SwitchType value, const QString &label) {
+			inner->add(
+				object_ptr<Ui::Radioenum<SwitchType>>(
+					inner,
+					group,
+					value,
+					label,
+					st::settingsSendType),
+				st::settingsSendTypePadding);
+		};
+		addRadio(SwitchType::None, "Just send the reply");
+		addRadio(SwitchType::Next, "Send and switch to next");
+		addRadio(SwitchType::Previous, "Send and switch to previous");
+
+		group->setChangedCallback([=](SwitchType value) {
+			controller->session().settings().setSupportSwitch(value);
+			controller->session().saveSettingsDelayed();
+		});
+
+		return SectionBuilder::WidgetToAdd{ .widget = std::move(wrap) };
+	}, [] {
+		return SearchEntry{
+			.id = u"chat/support/switch"_q,
+			.title = u"Send and switch behavior"_q,
+			.keywords = { u"switch"_q, u"next"_q, u"previous"_q, u"reply"_q },
+		};
+	});
+
+	builder.addSkip(st::settingsCheckboxesSkip);
+
+	const auto templatesAutocomplete = builder.addCheckbox({
+		.id = u"chat/support/templates"_q,
+		.title = rpl::single(u"Enable templates autocomplete"_q),
+		.checked = session->settings().supportTemplatesAutocomplete(),
+		.keywords = { u"templates"_q, u"autocomplete"_q },
+	});
+	if (templatesAutocomplete) {
+		templatesAutocomplete->checkedChanges(
+		) | rpl::on_next([=](bool checked) {
+			controller->session().settings().setSupportTemplatesAutocomplete(
+				checked);
+			controller->session().saveSettingsDelayed();
+		}, templatesAutocomplete->lifetime());
+	}
+
+	const auto allSilent = builder.addCheckbox({
+		.id = u"chat/support/silent"_q,
+		.title = rpl::single(u"Send all messages without sound"_q),
+		.checked = session->settings().supportAllSilent(),
+		.keywords = { u"silent"_q, u"sound"_q, u"mute"_q },
+	});
+	if (allSilent) {
+		allSilent->checkedChanges(
+		) | rpl::on_next([=](bool checked) {
+			controller->session().settings().setSupportAllSilent(checked);
+			controller->session().saveSettingsDelayed();
+		}, allSilent->lifetime());
+	}
+
+	builder.addSkip(st::settingsCheckboxesSkip);
+	builder.addSubsectionTitle({
+		.id = u"chat/support/chats-period"_q,
+		.title = rpl::single(u"Load chats for a period"_q),
+		.keywords = { u"period"_q, u"days"_q },
+	});
+
+	builder.add([controller](const WidgetContext &ctx) {
+		constexpr auto kDayDuration = 24 * 60 * 60;
+		struct Option {
+			int days = 0;
+			QString label;
+		};
+		const auto options = std::vector<Option>{
+			{ 1, "1 day" },
+			{ 7, "1 week" },
+			{ 30, "1 month" },
+			{ 365, "1 year" },
+			{ 0, "All of them" },
+		};
+		const auto current = controller->session().settings().supportChatsTimeSlice();
+		const auto days = current / kDayDuration;
+		const auto best = ranges::min_element(
+			options,
+			std::less<>(),
+			[&](const Option &option) { return std::abs(option.days - days); });
+
+		const auto container = ctx.container.get();
+		auto wrap = object_ptr<Ui::VerticalLayout>(container);
+		const auto inner = wrap.data();
+
+		const auto group = std::make_shared<Ui::RadiobuttonGroup>(best->days);
+		for (const auto &option : options) {
+			inner->add(
+				object_ptr<Ui::Radiobutton>(
+					inner,
+					group,
+					option.days,
+					option.label,
+					st::settingsSendType),
+				st::settingsSendTypePadding);
+		}
+		group->setChangedCallback([=](int days) {
+			controller->session().settings().setSupportChatsTimeSlice(
+				days * kDayDuration);
+			controller->session().saveSettingsDelayed();
+		});
+
+		return SectionBuilder::WidgetToAdd{ .widget = std::move(wrap) };
+	}, [] {
+		return SearchEntry{
+			.id = u"chat/support/chats-period/options"_q,
+			.title = u"Chat loading period options"_q,
+			.keywords = { u"week"_q, u"month"_q, u"year"_q },
+		};
+	});
+
+	builder.addSkip(st::settingsCheckboxesSkip);
+	builder.addSkip();
+}
+
+void BuildChatSectionContent(SectionBuilder &builder) {
+	BuildThemeOptionsSection(builder);
+	BuildThemeSettingsSection(builder);
+	BuildCloudThemesSection(builder);
+	BuildChatBackgroundSection(builder);
+	BuildChatListQuickActionSection(builder);
+	BuildStickersEmojiSection(builder);
+	BuildMessagesSection(builder);
+	BuildSensitiveContentSection(builder);
+	BuildArchiveSection(builder);
+	BuildSupportSection(builder);
+}
+
+class Chat : public Section<Chat> {
+public:
+	Chat(QWidget *parent, not_null<Window::SessionController*> controller);
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+	void fillTopBarMenu(
+		const Ui::Menu::MenuCallback &addAction) override;
+
+private:
+	void setupContent();
+
+};
+
+const auto kMeta = BuildHelper({
+	.id = Chat::Id(),
+	.parentId = MainId(),
+	.title = &tr::lng_settings_section_chat_settings,
+	.icon = &st::menuIconChatBubble,
+}, [](SectionBuilder &builder) {
+	BuildChatSectionContent(builder);
+});
+
+const SectionBuildMethod kChatSection = kMeta.build;
+
+Chat::Chat(QWidget *parent, not_null<Window::SessionController*> controller)
+: Section(parent, controller) {
+	setupContent();
+}
+
+rpl::producer<QString> Chat::title() {
+	return tr::lng_settings_section_chat_settings();
+}
+
+void Chat::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
+	const auto window = &controller()->window();
+	const auto createTheme = addAction(
+		tr::lng_settings_bg_theme_create(tr::now),
+		[=] { window->show(Box(Window::Theme::CreateBox, window)); },
+		&st::menuIconChangeColors);
+	createTheme->setProperty(
+		"highlight-control-id",
+		u"chat/themes-create"_q);
+}
+
+void Chat::setupContent() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	build(content, kChatSection);
+
+	Ui::ResizeFitChild(this, content);
+}
+
+} // namespace
+
+void PaintRoundColorButton(
+		QPainter &p,
+		int size,
+		QBrush brush,
+		float64 selected) {
+	const auto rect = QRect(0, 0, size, size);
+
+	p.setBrush(brush);
+	p.setPen(Qt::NoPen);
+	p.drawEllipse(rect);
 
-		auto image = Images::Read({
-			.path = result.paths.isEmpty() ? QString() : result.paths.front(),
-			.content = result.remoteContent,
-			.forceOpaque = true,
-		}).image;
-		if (image.isNull() || image.width() <= 0 || image.height() <= 0) {
-			return;
-		}
-		auto local = Data::CustomWallPaper();
-		local.setLocalImageAsThumbnail(std::make_shared<Image>(
-			std::move(image)));
-		controller->show(Box<BackgroundPreviewBox>(controller, local));
-	});
-	FileDialog::GetOpenPath(
-		parent.get(),
-		tr::lng_choose_image(tr::now),
-		filters.join(u";;"_q),
-		crl::guard(parent, callback));
+	if (selected > 0.) {
+		const auto startSkip = -st::settingsAccentColorLine / 2.;
+		const auto endSkip = float64(st::settingsAccentColorSkip);
+		const auto skip = startSkip + (endSkip - startSkip) * selected;
+		auto pen = st::boxBg->p;
+		pen.setWidth(st::settingsAccentColorLine);
+		p.setBrush(Qt::NoBrush);
+		p.setPen(pen);
+		p.setOpacity(selected);
+		p.drawEllipse(QRectF(rect).marginsRemoved({ skip, skip, skip, skip }));
+	}
 }
 
 void SetupStickersEmoji(
 		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	Ui::AddDivider(container);
+		not_null<Ui::VerticalLayout*> container,
+		HighlightRegistry *highlights) {
 	Ui::AddSkip(container);
 
-	Ui::AddSubsectionTitle(container, tr::lng_settings_stickers_emoji());
+	const auto title = Ui::AddSubsectionTitle(
+		container,
+		tr::lng_settings_stickers_emoji());
+	if (highlights) {
+		highlights->push_back({ u"chat/stickers-emoji"_q, {
+			title.get(),
+			SubsectionTitleHighlight(),
+		} });
+	}
 
 	const auto session = &controller->session();
 
@@ -726,51 +1418,68 @@ void SetupStickersEmoji(
 			checked,
 			st::settingsCheckbox);
 	};
-	const auto add = [&](const QString &label, bool checked, auto &&handle) {
-		inner->add(
+	const auto addWithReturn = [&](
+			const QString &label,
+			bool checked,
+			auto &&handle) {
+		const auto result = inner->add(
 			checkbox(label, checked),
-			st::settingsCheckboxPadding
-		)->checkedChanges(
-		) | rpl::start_with_next(
+			st::settingsCheckboxPadding);
+		result->checkedChanges(
+		) | rpl::on_next(
 			std::move(handle),
 			inner->lifetime());
+		return result;
 	};
 	const auto addSliding = [&](
 			const QString &label,
 			bool checked,
 			auto &&handle,
 			rpl::producer<bool> shown) {
-		inner->add(
+		const auto wrap = inner->add(
 			object_ptr<Ui::SlideWrap<Ui::Checkbox>>(
 				inner,
 				checkbox(label, checked),
-				st::settingsCheckboxPadding)
-		)->setDuration(0)->toggleOn(std::move(shown))->entity()->checkedChanges(
-		) | rpl::start_with_next(
+				st::settingsCheckboxPadding));
+		wrap->setDuration(0)->toggleOn(std::move(shown))->entity()->checkedChanges(
+		) | rpl::on_next(
 			std::move(handle),
 			inner->lifetime());
+		return wrap->entity();
 	};
 
-	add(
+	const auto largeEmoji = addWithReturn(
 		tr::lng_settings_large_emoji(tr::now),
 		Core::App().settings().largeEmoji(),
 		[=](bool checked) {
 			Core::App().settings().setLargeEmoji(checked);
 			Core::App().saveSettingsDelayed();
 		});
+	if (highlights) {
+		highlights->push_back({ u"chat/large-emoji"_q, {
+			largeEmoji,
+			{ .radius = st::boxRadius }
+		} });
+	}
 
-	add(
+	const auto replaceEmoji = addWithReturn(
 		tr::lng_settings_replace_emojis(tr::now),
 		Core::App().settings().replaceEmoji(),
 		[=](bool checked) {
 			Core::App().settings().setReplaceEmoji(checked);
 			Core::App().saveSettingsDelayed();
 		});
+	if (highlights) {
+		highlights->push_back({ u"chat/replace-emoji"_q, {
+			replaceEmoji,
+			{ .radius = st::boxRadius },
+		} });
+	}
 
 	const auto suggestEmoji = inner->lifetime().make_state<
 		rpl::variable<bool>
 	>(Core::App().settings().suggestEmoji());
-	add(
+	const auto suggestEmojiCheckbox = addWithReturn(
 		tr::lng_settings_suggest_emoji(tr::now),
 		Core::App().settings().suggestEmoji(),
 		[=](bool checked) {
@@ -778,9 +1487,15 @@ void SetupStickersEmoji(
 			Core::App().settings().setSuggestEmoji(checked);
 			Core::App().saveSettingsDelayed();
 		});
+	if (highlights) {
+		highlights->push_back({ u"chat/suggest-emoji"_q, {
+			suggestEmojiCheckbox,
+			{ .radius = st::boxRadius },
+		} });
+	}
 
 	using namespace rpl::mappers;
-	addSliding(
+	const auto suggestAnimated = addSliding(
 		tr::lng_settings_suggest_animated_emoji(tr::now),
 		Core::App().settings().suggestAnimatedEmoji(),
 		[=](bool checked) {
@@ -791,53 +1506,92 @@ void SetupStickersEmoji(
 			Data::AmPremiumValue(session),
 			suggestEmoji->value(),
 			_1 && _2));
+	if (highlights) {
+		highlights->push_back({ u"chat/suggest-animated-emoji"_q, {
+			suggestAnimated,
+			{ .radius = st::boxRadius }
+		} });
+	}
 
-	add(
+	const auto suggestByEmoji = addWithReturn(
 		tr::lng_settings_suggest_by_emoji(tr::now),
 		Core::App().settings().suggestStickersByEmoji(),
 		[=](bool checked) {
 			Core::App().settings().setSuggestStickersByEmoji(checked);
 			Core::App().saveSettingsDelayed();
 		});
+	if (highlights) {
+		highlights->push_back({ u"chat/suggest-by-emoji"_q, {
+			suggestByEmoji,
+			{ .radius = st::boxRadius },
+		} });
+	}
 
-	add(
+	const auto loopStickers = addWithReturn(
 		tr::lng_settings_loop_stickers(tr::now),
 		Core::App().settings().loopAnimatedStickers(),
 		[=](bool checked) {
 			Core::App().settings().setLoopAnimatedStickers(checked);
 			Core::App().saveSettingsDelayed();
 		});
+	if (highlights) {
+		highlights->push_back({ u"chat/loop-stickers"_q, {
+			loopStickers,
+			{ .radius = st::boxRadius },
+		} });
+	}
 
-	AddButtonWithIcon(
+	const auto stickersButton = AddButtonWithIcon(
 		container,
 		tr::lng_stickers_you_have(),
 		st::settingsButton,
-		{ &st::menuIconStickers }
-	)->addClickHandler([=] {
+		{ &st::menuIconStickers });
+	stickersButton->addClickHandler([=] {
 		controller->show(Box<StickersBox>(
 			controller->uiShow(),
 			StickersBox::Section::Installed));
 	});
+	if (highlights) {
+		highlights->push_back({ u"chat/my-stickers"_q, {
+			stickersButton.get(),
+			{ .rippleShape = true },
+		} });
+	}
 
-	AddButtonWithIcon(
+	const auto emojiSetsButton = AddButtonWithIcon(
 		container,
 		tr::lng_emoji_manage_sets(),
 		st::settingsButton,
-		{ &st::menuIconEmoji }
-	)->addClickHandler([=] {
+		{ &st::menuIconEmoji });
+	emojiSetsButton->addClickHandler([=] {
 		controller->show(Box<Ui::Emoji::ManageSetsBox>(session));
 	});
+	if (highlights) {
+		highlights->push_back({ u"chat/emoji-sets"_q, {
+			emojiSetsButton.get(),
+			{ .rippleShape = true },
+		} });
+	}
 
 	Ui::AddSkip(container, st::settingsCheckboxesSkip);
 }
 
 void SetupMessages(
 		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
+		not_null<Ui::VerticalLayout*> container,
+		HighlightRegistry *highlights) {
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
 
-	Ui::AddSubsectionTitle(container, tr::lng_settings_messages());
+	const auto title = Ui::AddSubsectionTitle(
+		container,
+		tr::lng_settings_messages());
+	if (highlights) {
+		highlights->push_back({ u"chat/messages"_q, {
+			title.get(),
+			SubsectionTitleHighlight(),
+		} });
+	}
 
 	Ui::AddSkip(container, st::settingsSendTypeSkip);
 
@@ -856,7 +1610,7 @@ void SetupMessages(
 	const auto groupSend = std::make_shared<Ui::RadioenumGroup<SendByType>>(
 		Core::App().settings().sendSubmitWay());
 	const auto addSend = [&](SendByType value, const QString &text) {
-		inner->add(
+		return inner->add(
 			object_ptr<Ui::Radioenum<SendByType>>(
 				inner,
 				groupSend,
@@ -865,7 +1619,15 @@ void SetupMessages(
 				st::settingsSendType),
 			st::settingsSendTypePadding);
 	};
-	addSend(SendByType::Enter, tr::lng_settings_send_enter(tr::now));
+	const auto sendEnter = addSend(
+		SendByType::Enter,
+		tr::lng_settings_send_enter(tr::now));
+	if (highlights) {
+		highlights->push_back({ u"chat/send-enter"_q, {
+			sendEnter,
+			{ .radius = st::boxRadius },
+		} });
+	}
 	addSend(
 		SendByType::CtrlEnter,
 		(Platform::IsMac()
@@ -895,25 +1657,17 @@ void SetupMessages(
 	const auto react = addQuick(
 		Quick::React,
 		tr::lng_settings_chat_quick_action_react(tr::now));
+	if (highlights) {
+		highlights->push_back({ u"chat/quick-reaction"_q, {
+			react,
+			{ .radius = st::boxRadius },
+		} });
+	}
 
-	class EmptyButton final : public Ui::IconButton {
-	public:
-		EmptyButton(not_null<Ui::RpWidget*> p, const style::IconButton &st)
-		: Ui::IconButton(p, st)
-		, _rippleAreaPosition(st.rippleAreaPosition) {
-		}
-	protected:
-		void paintEvent(QPaintEvent *e) override {
-			auto p = QPainter(this);
-
-			paintRipple(p, _rippleAreaPosition, nullptr);
-		}
-	private:
-		const QPoint _rippleAreaPosition;
-	};
-	const auto buttonRight = Ui::CreateChild<EmptyButton>(
+	const auto buttonRight = Ui::CreateSimpleCircleButton(
 		inner,
-		st::stickersRemove);
+		st::stickersRemove.ripple);
+	buttonRight->resize(st::stickersRemove.width, st::stickersRemove.height);
 	const auto toggleButtonRight = [=](bool value) {
 		buttonRight->setAttribute(Qt::WA_TransparentForMouseEvents, !value);
 	};
@@ -941,7 +1695,7 @@ void SetupMessages(
 	auto selected = rpl::duplicate(idValue);
 	std::move(
 		selected
-	) | rpl::start_with_next([=, idValue = std::move(idValue)](
+	) | rpl::on_next([=, idValue = std::move(idValue)](
 			const Data::ReactionId &id) {
 		const auto index = state->icons.flag ? 1 : 0;
 		const auto iconSize = st::settingsReactionRightIcon;
@@ -986,7 +1740,7 @@ void SetupMessages(
 	}, buttonRight->lifetime());
 
 	react->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		const auto rightSize = buttonRight->size();
 		buttonRight->moveToRight(
 			st::settingsButtonRightSkip,
@@ -1001,30 +1755,71 @@ void SetupMessages(
 	buttonRight->setClickedCallback([=, show = controller->uiShow()] {
 		show->showBox(Box(ReactionsSettingsBox, controller));
 	});
+	if (highlights) {
+		highlights->push_back({ u"chat/quick-reaction-choose"_q, {
+			buttonRight.get(),
+			{ .shape = HighlightShape::Ellipse },
+		} });
+	}
 
 	Ui::AddSkip(inner, st::settingsSendTypeSkip);
 
-	inner->add(
+	const auto cornerReply = inner->add(
+		object_ptr<Ui::Checkbox>(
+			inner,
+			tr::lng_settings_chat_corner_reply(tr::now),
+			Core::App().settings().cornerReply(),
+			st::settingsCheckbox),
+		st::settingsCheckboxPadding);
+	cornerReply->checkedChanges(
+	) | rpl::on_next([=](bool checked) {
+		Core::App().settings().setCornerReply(checked);
+		Core::App().saveSettingsDelayed();
+	}, inner->lifetime());
+	if (highlights) {
+		highlights->push_back({ u"chat/corner-reply"_q, {
+			cornerReply,
+			{ .radius = st::boxRadius },
+		} });
+	}
+
+	const auto cornerReaction = inner->add(
 		object_ptr<Ui::Checkbox>(
 			inner,
 			tr::lng_settings_chat_corner_reaction(tr::now),
 			Core::App().settings().cornerReaction(),
 			st::settingsCheckbox),
-		st::settingsCheckboxPadding
-	)->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+		st::settingsCheckboxPadding);
+	cornerReaction->checkedChanges(
+	) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setCornerReaction(checked);
 		Core::App().saveSettingsDelayed();
 	}, inner->lifetime());
+	if (highlights) {
+		highlights->push_back({ u"chat/corner-reaction"_q, {
+			cornerReaction,
+			{ .radius = st::boxRadius },
+		} });
+	}
 
-	Ui::AddSkip(inner, st::settingsCheckboxesSkip);
+	Ui::AddSkip(inner);
 }
 
 void SetupArchive(
 		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
+		not_null<Ui::VerticalLayout*> container,
+		Fn<void(Type)> showOther) {
 	Ui::AddSkip(container);
 
+	AddButtonWithIcon(
+		container,
+		tr::lng_settings_shortcuts(),
+		st::settingsButton,
+		{ &st::menuIconShortcut }
+	)->addClickHandler([=] {
+		showOther(ShortcutsId());
+	});
+
 	PreloadArchiveSettings(&controller->session());
 	AddButtonWithIcon(
 		container,
@@ -1073,7 +1868,7 @@ void SetupLocalStorage(
 		st::settingsButton,
 		{ &st::menuIconStorage }
 	)->addClickHandler([=] {
-		LocalStorageBox::Show(&controller->session());
+		controller->showSettings(LocalStorageId());
 	});
 }
 
@@ -1145,7 +1940,7 @@ void SetupDataStorage(
 	ask->toggledValue(
 	) | rpl::filter([](bool checked) {
 		return (checked != Core::App().settings().askDownloadPath());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setAskDownloadPath(checked);
 		Core::App().saveSettingsDelayed();
 
@@ -1203,16 +1998,34 @@ void SetupAutoDownload(
 
 void SetupChatBackground(
 		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
+		not_null<Ui::VerticalLayout*> container,
+		HighlightRegistry *highlights) {
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
 
-	Ui::AddSubsectionTitle(container, tr::lng_settings_section_background());
+	const auto title = Ui::AddSubsectionTitle(
+		container,
+		tr::lng_settings_section_background());
 
-	container->add(
+	const auto row = container->add(
 		object_ptr<BackgroundRow>(container, controller),
 		st::settingsBackgroundPadding);
 
+	if (highlights) {
+		highlights->push_back({ u"chat/wallpapers"_q, {
+			title.get(),
+			SubsectionTitleHighlight(),
+		} });
+		highlights->push_back({ u"chat/wallpapers-set"_q, {
+			row->chooseFromGallery(),
+			SubsectionTitleHighlight(),
+		} });
+		highlights->push_back({ u"chat/wallpapers-choose-photo"_q, {
+			row->chooseFromFile(),
+			SubsectionTitleHighlight(),
+		} });
+	}
+
 	const auto skipTop = st::settingsCheckbox.margin.top();
 	const auto skipBottom = st::settingsCheckbox.margin.bottom();
 	auto wrap = object_ptr<Ui::VerticalLayout>(container);
@@ -1246,7 +2059,7 @@ void SetupChatBackground(
 			st::settingsSendTypePadding));
 
 	tile->entity()->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		background->setTile(checked);
 	}, tile->lifetime());
 
@@ -1261,7 +2074,7 @@ void SetupChatBackground(
 	) | rpl::filter([](const Update &update) {
 		return (update.type == Update::Type::Changed)
 			|| (update.type == Update::Type::New);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		tile->entity()->setChecked(background->tile());
 		tile->toggle(shown(), anim::type::instant);
 	}, tile->lifetime());
@@ -1272,15 +2085,257 @@ void SetupChatBackground(
 	}));
 
 	adaptive->entity()->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setAdaptiveForWide(checked);
 		Core::App().saveSettingsDelayed();
 	}, adaptive->lifetime());
+	if (highlights) {
+		highlights->push_back({ u"chat/adaptive-layout"_q, {
+			adaptive->entity(),
+			{ .radius = st::boxRadius },
+		} });
+	}
+}
+
+void SetupChatListQuickAction(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container,
+		HighlightRegistry *highlights) {
+	Ui::AddDivider(container);
+	Ui::AddSkip(container);
+	Ui::AddSubsectionTitle(
+		container,
+		tr::lng_settings_quick_dialog_action_title());
+
+	using Type = Dialogs::Ui::QuickDialogAction;
+	using LabelType = Dialogs::Ui::QuickDialogActionLabel;
+	const auto group = std::make_shared<Ui::RadioenumGroup<Type>>(
+		Core::App().settings().quickDialogAction());
+	group->setChangedCallback([=](Type value) {
+		Core::App().settings().setQuickDialogAction(value);
+		Core::App().saveSettings();
+	});
+
+	const auto actionToLabel = [](Type value) {
+		switch (value) {
+		case Type::Mute: return LabelType::Mute;
+		case Type::Pin: return LabelType::Pin;
+		case Type::Read: return LabelType::Read;
+		case Type::Archive: return LabelType::Archive;
+		case Type::Delete: return LabelType::Delete;
+		default: return LabelType::Disabled;
+		}
+	};
+	static constexpr auto kDisabledIconRatio = 1.25;
+
+	const auto addPreview = [=](not_null<Ui::VerticalLayout*> container) {
+		const auto widget = container->add(
+			object_ptr<Ui::RpWidget>(container));
+		widget->resize(0, st::dialogsRowHeight);
+		struct State {
+			std::unique_ptr<Lottie::Icon> icon;
+		};
+		const auto state = widget->lifetime().make_state<State>();
+		group->value() | rpl::on_next([=](Type value) {
+			const auto label = actionToLabel(value);
+			state->icon = Lottie::MakeIcon({
+				.name = Dialogs::ResolveQuickDialogLottieIconName(label),
+				.sizeOverride = Size((label == LabelType::Disabled)
+					? int(st::dialogsQuickActionSize * kDisabledIconRatio)
+					: st::dialogsQuickActionSize),
+			});
+			state->icon->animate(
+				[=] { widget->update(); },
+				0,
+				state->icon->framesCount() - 1);
+			widget->update();
+		}, widget->lifetime());
+		widget->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(widget);
+			auto hq = PainterHighQualityEnabler(p);
+
+			const auto height = st::dialogsRowHeight;
+			const auto actionWidth = st::dialogsQuickActionRippleSize * 0.75;
+			const auto rightOffset = st::dialogsQuickActionRippleSize
+				+ st::dialogsQuickActionSize;
+			const auto rect = QRect(
+				widget->width()
+					- actionWidth
+					- st::boxRowPadding.right()
+					- rightOffset,
+				0,
+				actionWidth,
+				height);
+
+	        auto path = QPainterPath();
+	        path.addRoundedRect(
+	        	QRect(
+	        		-actionWidth,
+	        		0,
+	        		rect::right(rect) + actionWidth,
+	        		height),
+	        	st::roundRadiusLarge,
+	        	st::roundRadiusLarge);
+	        p.setClipPath(path);
+
+			const auto label = actionToLabel(group->current());
+			const auto isDisabled = (label == LabelType::Disabled);
+
+			p.fillRect(
+				QRect(0, 0, rect::right(rect), st::lineWidth),
+				st::windowBgOver);
+			p.fillRect(
+				QRect(
+					0,
+					rect::bottom(rect) - st::lineWidth,
+					rect::right(rect),
+					st::lineWidth),
+				st::windowBgOver);
+			p.fillRect(rect, Dialogs::ResolveQuickActionBg(label));
+			if (state->icon) {
+				Dialogs::DrawQuickAction(
+					p,
+					rect,
+					state->icon.get(),
+					label,
+					isDisabled ? kDisabledIconRatio : 1.,
+					isDisabled);
+			}
+			p.translate(-height / 2, 0);
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::windowBgOver);
+			p.drawEllipse(Rect(Size(height)) - Margins(height / 6));
+
+			const auto h = st::normalFont->ascent / 1.5;
+			p.drawRoundedRect(
+				height,
+				height / 2 - h * 1.5,
+				st::dialogsQuickActionRippleSize * 0.6,
+				h,
+				h / 2,
+				h / 2);
+			p.drawRoundedRect(
+				height,
+				height / 2 + h,
+				st::dialogsQuickActionRippleSize * 1.0,
+				h,
+				h / 2,
+				h / 2);
+
+			p.setClipping(false);
+			p.resetTransform();
+			p.setFont(st::settingsQuickDialogActionsTriggerFont);
+			p.setPen(st::windowSubTextFg);
+			p.drawText(
+				QRect(
+					widget->width()
+						- st::dialogsQuickActionRippleSize
+						- st::boxRowPadding.right(),
+					0,
+					st::dialogsQuickActionRippleSize,
+					height),
+				isDisabled
+					? tr::lng_settings_quick_dialog_action_swipe(tr::now)
+					: tr::lng_settings_quick_dialog_action_both(tr::now),
+				style::al_center);
+		}, widget->lifetime());
+	};
+
+	const auto &st = st::settingsButton;
+	const auto button = container->add(
+		object_ptr<Ui::SettingsButton>(
+			container,
+			group->value() | rpl::map([](Type value) {
+				return ((value == Dialogs::Ui::QuickDialogAction::Mute)
+					? tr::lng_settings_quick_dialog_action_mute
+					: (value == Dialogs::Ui::QuickDialogAction::Pin)
+					? tr::lng_settings_quick_dialog_action_pin
+					: (value == Dialogs::Ui::QuickDialogAction::Read)
+					? tr::lng_settings_quick_dialog_action_read
+					: (value == Dialogs::Ui::QuickDialogAction::Archive)
+					? tr::lng_settings_quick_dialog_action_archive
+					: tr::lng_settings_quick_dialog_action_disabled)();
+			}) | rpl::flatten_latest(),
+			st));
+
+	{
+		const auto icon = button->lifetime().make_state<Ui::RpWidget>(button);
+		icon->setAttribute(Qt::WA_TransparentForMouseEvents);
+		icon->resize(st::menuIconArchive.size());
+		icon->show();
+		button->sizeValue(
+		) | rpl::on_next([=, left = st.iconLeft](QSize size) {
+			icon->moveToLeft(
+				left,
+				(size.height() - icon->height()) / 2,
+				size.width());
+		}, icon->lifetime());
+		icon->paintRequest(
+		) | rpl::on_next([=] {
+			auto p = QPainter(icon);
+			const auto value = group->current();
+			((value == Dialogs::Ui::QuickDialogAction::Mute)
+				? st::menuIconMute
+				: (value == Dialogs::Ui::QuickDialogAction::Pin)
+				? st::menuIconPin
+				: (value == Dialogs::Ui::QuickDialogAction::Read)
+				? st::menuIconMarkRead
+				: (value == Dialogs::Ui::QuickDialogAction::Delete)
+				? st::menuIconDelete
+				: (value == Dialogs::Ui::QuickDialogAction::Archive)
+				? st::menuIconArchive
+				: st::menuIconShowInFolder).paintInCenter(p, icon->rect());
+		}, icon->lifetime());
+	}
+
+	button->setClickedCallback([=] {
+		controller->uiShow()->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+			box->setTitle(tr::lng_settings_quick_dialog_action_title());
+			const auto addRadio = [&](Type value, tr::phrase<> phrase) {
+				box->verticalLayout()->add(
+					object_ptr<Ui::Radioenum<Type>>(
+						box->verticalLayout(),
+						group,
+						value,
+						phrase(tr::now),
+						st::settingsSendType),
+					st::settingsSendTypePadding);
+			};
+			addPreview(box->verticalLayout());
+			Ui::AddSkip(box->verticalLayout());
+			Ui::AddSkip(box->verticalLayout());
+			addRadio(Type::Mute, tr::lng_settings_quick_dialog_action_mute);
+			addRadio(Type::Pin, tr::lng_settings_quick_dialog_action_pin);
+			addRadio(Type::Read, tr::lng_settings_quick_dialog_action_read);
+			addRadio(
+				Type::Archive,
+				tr::lng_settings_quick_dialog_action_archive);
+			addRadio(
+				Type::Delete,
+				tr::lng_settings_quick_dialog_action_delete);
+			addRadio(
+				Type::Disabled,
+				tr::lng_settings_quick_dialog_action_disabled);
+			box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); });
+		}));
+	});
+	if (highlights) {
+		highlights->push_back({
+			u"chat/quick-dialog-action"_q,
+			{ button, { .rippleShape = true } },
+		});
+	}
+	Ui::AddSkip(container);
+	Ui::AddDividerText(
+		container,
+		tr::lng_settings_quick_dialog_action_about());
+	Ui::AddSkip(container);
 }
 
 void SetupDefaultThemes(
 		not_null<Window::Controller*> window,
-		not_null<Ui::VerticalLayout*> container) {
+		not_null<Ui::VerticalLayout*> container,
+		HighlightRegistry *highlights) {
 	using Type = Window::Theme::EmbeddedType;
 	using Scheme = Window::Theme::EmbeddedScheme;
 	using Check = Window::Theme::CloudListCheck;
@@ -1291,6 +2346,16 @@ void SetupDefaultThemes(
 	const auto palette = Ui::CreateChild<ColorsPalette>(
 		container.get(),
 		container.get());
+	const auto systemAccentWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::Checkbox>>(
+			container,
+			object_ptr<Ui::Checkbox>(
+				container,
+				tr::lng_settings_theme_system_accent_color(tr::now),
+				Core::App().settings().systemAccentColorEnabled(),
+				st::settingsCheckbox)),
+		st::settingsCheckboxPadding);
+	systemAccentWrap->setDuration(0);
 
 	const auto chosen = [] {
 		const auto &object = Background()->themeObject();
@@ -1350,7 +2415,7 @@ void SetupDefaultThemes(
 			std::move(check));
 		rpl::duplicate(
 			scheme.name
-		) | rpl::start_with_next([=](const QString &themeName) {
+		) | rpl::on_next([=](const QString &themeName) {
 			result->setText(themeName);
 		}, result->lifetime());
 		result->addClickHandler([=] {
@@ -1366,14 +2431,17 @@ void SetupDefaultThemes(
 			palette->show(type);
 		}
 
-		const auto &colors = Core::App().settings().themesAccentColors();
+		const auto &settings = Core::App().settings();
 		const auto i = checks.find(type);
 		const auto scheme = ranges::find(kSchemesList, type, &Scheme::type);
 		if (scheme == end(kSchemesList)) {
 			return;
 		}
+		const auto color = settings.systemAccentColorEnabled()
+			? Window::Theme::SystemAccentColor()
+			: settings.themesAccentColors().get(type);
 		if (i != end(checks)) {
-			if (const auto color = colors.get(type)) {
+			if (color) {
 				const auto colorizer = ColorizerFrom(*scheme, *color);
 				i->second->setColors(ColorsFromScheme(*scheme, colorizer));
 			} else {
@@ -1381,20 +2449,67 @@ void SetupDefaultThemes(
 			}
 		}
 	};
+	const auto refreshSystemAccentVisibility = [=](Type type) {
+		systemAccentWrap->toggle(
+			IsSystemAccentColorSupported() && (type != Type(-1)),
+			anim::type::instant);
+	};
 	group->setChangedCallback([=](Type type) {
-		group->setValue(chosen());
+		const auto scheme = ranges::find(
+			kSchemesList,
+			type,
+			&Scheme::type);
+		if (scheme != end(kSchemesList)) {
+			apply(*scheme);
+		} else {
+			group->setValue(chosen());
+		}
 	});
 	for (const auto &scheme : kSchemesList) {
 		refreshColorizer(scheme.type);
 	}
+	refreshSystemAccentVisibility(chosen());
+	systemAccentWrap->entity()->checkedChanges(
+	) | rpl::on_next([=](bool checked) {
+		auto &settings = Core::App().settings();
+		if (settings.systemAccentColorEnabled() == checked) {
+			return;
+		}
+		settings.setSystemAccentColorEnabled(checked);
+		Local::writeSettings();
+
+		const auto type = chosen();
+		const auto scheme = ranges::find(kSchemesList, type, &Scheme::type);
+		if (scheme != end(kSchemesList)) {
+			apply(*scheme);
+		}
+	}, container->lifetime());
+
+	if (highlights) {
+		const auto add = st::roundRadiusSmall;
+		highlights->push_back({ u"chat/themes-edit"_q, {
+			palette->editButton(),
+			{
+				.margin = { -add, -add, -add, -add },
+				.shape = HighlightShape::Ellipse,
+			},
+		} });
+		if (IsSystemAccentColorSupported()) {
+			highlights->push_back({ u"chat/themes-system-accent"_q, {
+				systemAccentWrap->entity(),
+				{ .radius = st::boxRadius }
+			} });
+		}
+	}
 
 	Background()->updates(
 	) | rpl::filter([](const BackgroundUpdate &update) {
 		return (update.type == BackgroundUpdate::Type::ApplyingTheme);
 	}) | rpl::map([=] {
 		return chosen();
-	}) | rpl::start_with_next([=](Type type) {
+	}) | rpl::on_next([=](Type type) {
 		refreshColorizer(type);
+		refreshSystemAccentVisibility(type);
 		group->setValue(type);
 	}, container->lifetime());
 
@@ -1404,7 +2519,7 @@ void SetupDefaultThemes(
 	}
 	block->resize(block->width(), buttons[0]->height());
 	block->widthValue(
-	) | rpl::start_with_next([buttons = std::move(buttons)](int width) {
+	) | rpl::on_next([buttons = std::move(buttons)](int width) {
 		Expects(!buttons.empty());
 
 		const auto padding = st::settingsButtonNoIcon.padding;
@@ -1433,12 +2548,8 @@ void SetupDefaultThemes(
 	}, block->lifetime());
 
 	palette->selected(
-	) | rpl::start_with_next([=](QColor color) {
+	) | rpl::on_next([=](QColor color) {
 		if (Background()->editingTheme()) {
-			// We don't remember old accent color to revert it properly
-			// in Window::Theme::Revert which is called by Editor.
-			//
-			// So we check here, before we change the saved accent color.
 			window->show(Ui::MakeInformBox(
 				tr::lng_theme_editor_cant_change_theme()));
 			return;
@@ -1448,9 +2559,19 @@ void SetupDefaultThemes(
 		if (scheme == end(kSchemesList)) {
 			return;
 		}
-		auto &colors = Core::App().settings().themesAccentColors();
+		auto &settings = Core::App().settings();
+		auto changed = false;
+		if (settings.systemAccentColorEnabled()) {
+			settings.setSystemAccentColorEnabled(false);
+			systemAccentWrap->entity()->setChecked(false);
+			changed = true;
+		}
+		auto &colors = settings.themesAccentColors();
 		if (colors.get(type) != color) {
 			colors.set(type, color);
+			changed = true;
+		}
+		if (changed) {
 			Local::writeSettings();
 		}
 		apply(*scheme);
@@ -1461,21 +2582,31 @@ void SetupDefaultThemes(
 
 void SetupThemeOptions(
 		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
+		not_null<Ui::VerticalLayout*> container,
+		HighlightRegistry *highlights) {
 	using namespace Window::Theme;
 
 	Ui::AddSkip(container, st::settingsPrivacySkip);
 
-	Ui::AddSubsectionTitle(container, tr::lng_settings_themes());
+	const auto title = Ui::AddSubsectionTitle(
+		container,
+		tr::lng_settings_themes());
+	if (highlights) {
+		highlights->push_back({ u"chat/themes"_q, {
+			title.get(),
+			SubsectionTitleHighlight(),
+		} });
+	}
 
 	Ui::AddSkip(container, st::settingsThemesTopSkip);
-	SetupDefaultThemes(&controller->window(), container);
+	SetupDefaultThemes(&controller->window(), container, highlights);
 	Ui::AddSkip(container);
 }
 
 void SetupCloudThemes(
 		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
+		not_null<Ui::VerticalLayout*> container,
+		HighlightRegistry *highlights) {
 	using namespace Window::Theme;
 	using namespace rpl::mappers;
 
@@ -1492,6 +2623,12 @@ void SetupCloudThemes(
 	const auto title = AddSubsectionTitle(
 		inner,
 		tr::lng_settings_bg_cloud_themes());
+	if (highlights) {
+		highlights->push_back({ u"chat/cloud-themes"_q, {
+			title.get(),
+			SubsectionTitleHighlight(),
+		} });
+	}
 	const auto showAll = Ui::CreateChild<Ui::LinkButton>(
 		inner,
 		tr::lng_settings_bg_show_all(tr::now));
@@ -1500,7 +2637,7 @@ void SetupCloudThemes(
 		title->topValue(),
 		inner->widthValue(),
 		showAll->widthValue()
-	) | rpl::start_with_next([=](int top, int outerWidth, int width) {
+	) | rpl::on_next([=](int top, int outerWidth, int width) {
 		showAll->moveToRight(
 			st::defaultSubsectionTitlePadding.left(),
 			top,
@@ -1521,7 +2658,7 @@ void SetupCloudThemes(
 			0));
 
 	list->allShown(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		showAll->setVisible(!shown);
 	}, showAll->lifetime());
 
@@ -1567,11 +2704,20 @@ void SetupCloudThemes(
 
 void SetupThemeSettings(
 		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
+		not_null<Ui::VerticalLayout*> container,
+		HighlightRegistry *highlights) {
 	Ui::AddDivider(container);
 	Ui::AddSkip(container, st::settingsPrivacySkip);
 
-	Ui::AddSubsectionTitle(container, tr::lng_settings_theme_settings());
+	const auto title = Ui::AddSubsectionTitle(
+		container,
+		tr::lng_settings_theme_settings());
+	if (highlights) {
+		highlights->push_back({ u"chat/peer-color"_q, {
+			title.get(),
+			SubsectionTitleHighlight(),
+		} });
+	}
 
 	AddPeerColorButton(
 		container,
@@ -1587,13 +2733,13 @@ void SetupThemeSettings(
 				? tr::lng_settings_auto_night_mode_on()
 				: tr::lng_settings_auto_night_mode_off();
 		}) | rpl::flatten_latest();
-		AddButtonWithLabel(
+		const auto button = AddButtonWithLabel(
 			container,
 			tr::lng_settings_auto_night_mode(),
 			std::move(label),
 			st::settingsButton,
-			{ &st::menuIconNightMode }
-		)->setClickedCallback([=] {
+			{ &st::menuIconNightMode });
+		button->setClickedCallback([=] {
 			const auto now = !settings->systemDarkModeEnabled();
 			if (now && Window::Theme::Background()->editingTheme()) {
 				controller->show(Ui::MakeInformBox(
@@ -1603,6 +2749,12 @@ void SetupThemeSettings(
 				Core::App().saveSettingsDelayed();
 			}
 		});
+		if (highlights) {
+			highlights->push_back({
+				u"chat/auto-night-mode"_q,
+				{ button.get(), { .rippleShape = true } },
+			});
+		}
 	}
 
 	const auto family = container->lifetime().make_state<
@@ -1615,13 +2767,13 @@ void SetupThemeSettings(
 			? tr::lng_font_system(tr::now)
 			: family;
 	});
-	AddButtonWithLabel(
+	const auto fontButton = AddButtonWithLabel(
 		container,
 		tr::lng_settings_font_family(),
 		std::move(label),
 		st::settingsButton,
-		{ &st::menuIconFont }
-	)->setClickedCallback([=] {
+		{ &st::menuIconFont });
+	fontButton->setClickedCallback([=] {
 		const auto save = [=](QString chosen) {
 			*family = chosen;
 			settings->setCustomFontFamily(chosen);
@@ -1650,75 +2802,16 @@ void SetupThemeSettings(
 		controller->show(
 			Box(Ui::ChooseFontBox, generateBg, family->current(), save));
 	});
+	if (highlights) {
+		highlights->push_back({
+			u"chat/font"_q,
+			{ fontButton.get(), { .rippleShape = true } },
+		});
+	}
 
 	Ui::AddSkip(container, st::settingsCheckboxesSkip);
 }
 
-void SetupSupportSwitchSettings(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	using SwitchType = Support::SwitchSettings;
-	const auto group = std::make_shared<Ui::RadioenumGroup<SwitchType>>(
-		controller->session().settings().supportSwitch());
-	const auto add = [&](SwitchType value, const QString &label) {
-		container->add(
-			object_ptr<Ui::Radioenum<SwitchType>>(
-				container,
-				group,
-				value,
-				label,
-				st::settingsSendType),
-			st::settingsSendTypePadding);
-	};
-	add(SwitchType::None, "Just send the reply");
-	add(SwitchType::Next, "Send and switch to next");
-	add(SwitchType::Previous, "Send and switch to previous");
-	group->setChangedCallback([=](SwitchType value) {
-		controller->session().settings().setSupportSwitch(value);
-		controller->session().saveSettingsDelayed();
-	});
-}
-
-void SetupSupportChatsLimitSlice(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	constexpr auto kDayDuration = 24 * 60 * 60;
-	struct Option {
-		int days = 0;
-		QString label;
-	};
-	const auto options = std::vector<Option>{
-		{ 1, "1 day" },
-		{ 7, "1 week" },
-		{ 30, "1 month" },
-		{ 365, "1 year" },
-		{ 0, "All of them" },
-	};
-	const auto current = controller->session().settings().supportChatsTimeSlice();
-	const auto days = current / kDayDuration;
-	const auto best = ranges::min_element(
-		options,
-		std::less<>(),
-		[&](const Option &option) { return std::abs(option.days - days); });
-
-	const auto group = std::make_shared<Ui::RadiobuttonGroup>(best->days);
-	for (const auto &option : options) {
-		container->add(
-			object_ptr<Ui::Radiobutton>(
-				container,
-				group,
-				option.days,
-				option.label,
-				st::settingsSendType),
-			st::settingsSendTypePadding);
-	}
-	group->setChangedCallback([=](int days) {
-		controller->session().settings().setSupportChatsTimeSlice(
-			days * kDayDuration);
-		controller->session().saveSettingsDelayed();
-	});
-}
-
 void SetupSupport(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::VerticalLayout*> container) {
@@ -1749,7 +2842,7 @@ void SetupSupport(
 			st::settingsCheckbox),
 		st::settingsSendTypePadding
 	)->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		controller->session().settings().setSupportTemplatesAutocomplete(
 			checked);
 		controller->session().saveSettingsDelayed();
@@ -1763,7 +2856,7 @@ void SetupSupport(
 			st::settingsCheckbox),
 		st::settingsSendTypePadding
 	)->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		controller->session().settings().setSupportAllSilent(
 			checked);
 		controller->session().saveSettingsDelayed();
@@ -1780,41 +2873,8 @@ void SetupSupport(
 	Ui::AddSkip(inner);
 }
 
-Chat::Chat(QWidget *parent, not_null<Window::SessionController*> controller)
-: Section(parent)
-, _controller(controller) {
-	setupContent(controller);
-}
-
-rpl::producer<QString> Chat::title() {
-	return tr::lng_settings_section_chat_settings();
-}
-
-void Chat::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
-	const auto window = &_controller->window();
-	addAction(
-		tr::lng_settings_bg_theme_create(tr::now),
-		[=] { window->show(Box(Window::Theme::CreateBox, window)); },
-		&st::menuIconChangeColors);
-}
-
-void Chat::setupContent(not_null<Window::SessionController*> controller) {
-	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-
-	auto updateOnTick = rpl::single(
-	) | rpl::then(base::timer_each(60 * crl::time(1000)));
-
-	SetupThemeOptions(controller, content);
-	SetupThemeSettings(controller, content);
-	SetupCloudThemes(controller, content);
-	SetupChatBackground(controller, content);
-	SetupStickersEmoji(controller, content);
-	SetupMessages(controller, content);
-	Ui::AddDivider(content);
-	SetupSensitiveContent(controller, content, std::move(updateOnTick));
-	SetupArchive(controller, content);
-
-	Ui::ResizeFitChild(this, content);
+Type ChatId() {
+	return Chat::Id();
 }
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_chat.h b/Telegram/SourceFiles/settings/sections/settings_chat.h
new file mode 100644
index 00000000000000..e7ff6f1cf013e6
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_chat.h
@@ -0,0 +1,98 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "settings/settings_common.h"
+
+class QPainter;
+class QBrush;
+
+namespace Window {
+class Controller;
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+class VerticalLayout;
+} // namespace Ui
+
+namespace Settings {
+
+[[nodiscard]] Type ChatId();
+
+void SetupDataStorage(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container);
+void SetupAutoDownload(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container);
+void SetupDefaultThemes(
+	not_null<Window::Controller*> window,
+	not_null<Ui::VerticalLayout*> container,
+	HighlightRegistry *highlights = nullptr);
+void SetupSupport(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container);
+void SetupExport(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	Fn<void(Type)> showOther);
+
+void PaintRoundColorButton(
+	QPainter &p,
+	int size,
+	QBrush brush,
+	float64 selected);
+
+void SetupThemeOptions(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	HighlightRegistry *highlights = nullptr);
+
+void SetupThemeSettings(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	HighlightRegistry *highlights = nullptr);
+
+void SetupCloudThemes(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	HighlightRegistry *highlights = nullptr);
+
+void SetupChatBackground(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	HighlightRegistry *highlights = nullptr);
+
+void SetupChatListQuickAction(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	HighlightRegistry *highlights = nullptr);
+
+void SetupStickersEmoji(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	HighlightRegistry *highlights = nullptr);
+
+void SetupMessages(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	HighlightRegistry *highlights = nullptr);
+
+void SetupArchive(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	Fn<void(Type)> showOther);
+
+void SetupSensitiveContent(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	rpl::producer<> updateTrigger,
+	HighlightRegistry *highlights = nullptr);
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_credits.cpp b/Telegram/SourceFiles/settings/sections/settings_credits.cpp
new file mode 100644
index 00000000000000..3c57dd0dd64e78
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_credits.cpp
@@ -0,0 +1,1170 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/sections/settings_credits.h"
+
+#include "api/api_credits.h"
+#include "api/api_earn.h"
+#include "api/api_statistics.h"
+#include "base/call_delayed.h"
+#include "boxes/gift_credits_box.h"
+#include "boxes/gift_premium_box.h"
+#include "boxes/star_gift_box.h"
+#include "chat_helpers/stickers_gift_box_pack.h"
+#include "core/click_handler_types.h"
+#include "data/components/credits.h"
+#include "data/data_file_origin.h"
+#include "data/data_photo_media.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "info/bot/earn/info_bot_earn_widget.h"
+#include "info/bot/starref/info_bot_starref_common.h"
+#include "info/bot/starref/info_bot_starref_join_widget.h"
+#include "info/channel_statistics/boosts/giveaway/boost_badge.h"
+#include "info/channel_statistics/earn/earn_format.h"
+#include "info/channel_statistics/earn/earn_icons.h"
+#include "info/channel_statistics/earn/info_channel_earn_list.h"
+#include "info/info_memento.h"
+#include "info/settings/info_settings_widget.h"
+#include "info/statistics/info_statistics_list_controllers.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/sections/settings_main.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common.h"
+#include "settings/settings_common_session.h"
+#include "settings/settings_credits_graphics.h"
+#include "statistics/widgets/chart_header_widget.h"
+#include "ui/boxes/boost_box.h"
+#include "ui/controls/swipe_handler.h"
+#include "ui/controls/swipe_handler_data.h"
+#include "ui/effects/animation_value_f.h"
+#include "ui/effects/credits_graphics.h"
+#include "ui/effects/premium_graphics.h"
+#include "ui/effects/premium_top_bar.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/text/custom_emoji_instance.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_custom_emoji.h"
+#include "ui/text/text_utilities.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/slider_natural_width.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h"
+#include "styles/style_giveaway.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
+#include "styles/style_statistics.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_channel_earn.h"
+
+namespace Settings {
+namespace {
+
+using namespace Builder;
+
+void BuildCurrencyWithdrawalSection(
+	not_null<Ui::VerticalLayout*> content,
+	not_null<Window::SessionController*> controller);
+
+void BuildCreditsButtons(
+	SectionBuilder &builder,
+	bool isCurrency,
+	QPointer<Ui::SettingsButton> *statsButton,
+	QPointer<Ui::SettingsButton> *giftButton,
+	QPointer<Ui::SettingsButton> *earnButton);
+
+void BuildCreditsSectionContent(
+	SectionBuilder &builder,
+	bool isCurrency,
+	QPointer<Ui::SettingsButton> *statsButton,
+	QPointer<Ui::SettingsButton> *giftButton,
+	QPointer<Ui::SettingsButton> *earnButton,
+	Fn<void(not_null<Ui::VerticalLayout*>)> setupSubscriptions,
+	Fn<void(not_null<Ui::VerticalLayout*>)> setupHistory);
+
+class Credits : public Section<Credits> {
+public:
+	Credits(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller,
+		CreditsType type);
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToTop(
+		not_null<QWidget*> parent) override;
+
+	void showFinished() override;
+
+	[[nodiscard]] bool hasFlexibleTopBar() const override;
+
+	void setStepDataReference(std::any &data) override;
+
+	[[nodiscard]] rpl::producer<> sectionShowBack() override final;
+
+private:
+	void setupContent();
+	void setupSwipeBack();
+	void setupHistory(not_null<Ui::VerticalLayout*> container);
+	void setupSubscriptions(not_null<Ui::VerticalLayout*> container);
+
+	void visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) override;
+
+	const CreditsType _creditsType;
+	Ui::VerticalLayout *_content = nullptr;
+
+	QWidget *_parent = nullptr;
+
+	QImage _star;
+	QImage _balanceStar;
+
+	base::unique_qptr<Ui::FadeWrap<Ui::IconButton>> _back;
+	base::unique_qptr<Ui::IconButton> _close;
+	rpl::variable<bool> _backToggles;
+	rpl::variable<Info::Wrap> _wrap;
+
+	rpl::event_stream<> _showBack;
+	rpl::event_stream<> _showFinished;
+	rpl::variable<QString> _buttonText;
+
+	QPointer<Ui::SettingsButton> _statsButton;
+	QPointer<Ui::SettingsButton> _giftButton;
+	QPointer<Ui::SettingsButton> _earnButton;
+
+};
+
+Credits::Credits(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller,
+	CreditsType type)
+: Section(parent, controller)
+, _creditsType(type)
+, _star(Ui::GenerateStars(st::creditsTopupButton.height, 1))
+, _balanceStar((_creditsType == CreditsType::Ton)
+		? Ui::Earn::IconCurrencyColored(
+			st::tonFieldIconSize,
+			st::currencyFg->c)
+		: Ui::GenerateStars(st::creditsBalanceStarHeight, 1)) {
+	controller->session().giftBoxStickersPacks().tonLoad();
+	setupContent();
+	setupSwipeBack();
+
+	controller->session().premiumPossibleValue(
+	) | rpl::on_next([=](bool premiumPossible) {
+		if (!premiumPossible) {
+			_showBack.fire({});
+		}
+	}, lifetime());
+}
+
+rpl::producer<QString> Credits::title() {
+	if (_creditsType == CreditsType::Ton) {
+		return tr::lng_credits_currency_summary_title();
+	}
+	return tr::lng_credits_summary_title();
+}
+
+bool Credits::hasFlexibleTopBar() const {
+	return true;
+}
+
+rpl::producer<> Credits::sectionShowBack() {
+	return _showBack.events();
+}
+
+void Credits::setStepDataReference(std::any &data) {
+	using SectionCustomTopBarData = Info::Settings::SectionCustomTopBarData;
+	const auto my = std::any_cast<SectionCustomTopBarData>(&data);
+	if (my) {
+		_backToggles = std::move(
+			my->backButtonEnables
+		) | rpl::map_to(true);
+		_wrap = std::move(my->wrapValue);
+	}
+}
+
+void Credits::setupSubscriptions(not_null<Ui::VerticalLayout*> container) {
+	const auto history = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto content = history->entity();
+	const auto self = controller()->session().user();
+
+	const auto fill = [=](const Data::CreditsStatusSlice &fullSlice) {
+		const auto inner = content;
+		if (fullSlice.subscriptions.empty()) {
+			return;
+		}
+		Ui::AddSkip(inner);
+		Ui::AddSubsectionTitle(
+			inner,
+			tr::lng_credits_subscription_section(),
+			{ 0, 0, 0, -st::settingsPremiumOptionsPadding.bottom() });
+
+		const auto fullWrap = inner->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				inner,
+				object_ptr<Ui::VerticalLayout>(inner)));
+
+		const auto window = controller()->parentController();
+		const auto entryClicked = [=](
+				const Data::CreditsHistoryEntry &e,
+				const Data::SubscriptionEntry &s) {
+			window->uiShow()->show(
+				Box(ReceiptCreditsBox, window, e, s));
+		};
+
+		Info::Statistics::AddCreditsHistoryList(
+			window->uiShow(),
+			fullSlice,
+			fullWrap->entity(),
+			entryClicked,
+			self,
+			true,
+			true,
+			true);
+
+		Ui::AddSkip(inner);
+		Ui::AddSkip(inner);
+		Ui::AddDivider(inner);
+
+		inner->resizeToWidth(container->width());
+	};
+
+	const auto apiLifetime = content->lifetime().make_state<rpl::lifetime>();
+	{
+		using Api = Api::CreditsHistory;
+		const auto apiFull = apiLifetime->make_state<Api>(self, true, true);
+		apiFull->requestSubscriptions({}, [=](Data::CreditsStatusSlice d) {
+			fill(std::move(d));
+		});
+	}
+	{
+		using Rebuilder = Data::Session::CreditsSubsRebuilder;
+		using RebuilderPtr = std::shared_ptr<Rebuilder>;
+		const auto rebuilder = content->lifetime().make_state<RebuilderPtr>(
+			self->owner().createCreditsSubsRebuilder());
+		rebuilder->get()->events(
+		) | rpl::on_next([=](Data::CreditsStatusSlice slice) {
+			while (content->count()) {
+				delete content->widgetAt(0);
+			}
+			fill(std::move(slice));
+		}, content->lifetime());
+	}
+}
+
+void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
+	const auto history = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto content = history->entity();
+	const auto self = controller()->session().user();
+
+	Ui::AddSkip(content, st::lineWidth * 6);
+
+	const auto fill = [=](
+			not_null<PeerData*> premiumBot,
+			const Data::CreditsStatusSlice &fullSlice,
+			const Data::CreditsStatusSlice &inSlice,
+			const Data::CreditsStatusSlice &outSlice) {
+		const auto inner = content;
+		if (fullSlice.list.empty()) {
+			return;
+		}
+		const auto hasOneTab = inSlice.list.empty() && outSlice.list.empty();
+		const auto hasIn = !inSlice.list.empty();
+		const auto hasOut = !outSlice.list.empty();
+		const auto fullTabText = tr::lng_credits_summary_history_tab_full(
+			tr::now);
+		const auto inTabText = tr::lng_credits_summary_history_tab_in(
+			tr::now);
+		const auto outTabText = tr::lng_credits_summary_history_tab_out(
+			tr::now);
+		if (hasOneTab) {
+			Ui::AddSubsectionTitle(
+				inner,
+				tr::lng_credits_summary_history_tab_full(),
+				{ 0, 0, 0, -st::defaultSubsectionTitlePadding.bottom() });
+		}
+
+		const auto slider = inner->add(
+			object_ptr<Ui::SlideWrap<Ui::CustomWidthSlider>>(
+				inner,
+				object_ptr<Ui::CustomWidthSlider>(
+					inner,
+					st::creditsHistoryTabsSlider)),
+			st::creditsHistoryTabsSliderPadding);
+		slider->toggle(!hasOneTab, anim::type::instant);
+		if (!hasOneTab) {
+			const auto shadow = Ui::CreateChild<Ui::RpWidget>(inner);
+			shadow->paintRequest() | rpl::on_next([=] {
+				auto p = QPainter(shadow);
+				p.fillRect(shadow->rect(), st::shadowFg);
+			}, shadow->lifetime());
+			slider->geometryValue(
+			) | rpl::on_next([=](const QRect &r) {
+				shadow->setGeometry(
+					inner->x(),
+					rect::bottom(slider) - st::lineWidth,
+					inner->width(),
+					st::lineWidth);
+				shadow->show();
+				shadow->raise();
+			}, shadow->lifetime());
+		}
+
+		slider->entity()->addSection(fullTabText);
+		if (hasIn) {
+			slider->entity()->addSection(inTabText);
+		}
+		if (hasOut) {
+			slider->entity()->addSection(outTabText);
+		}
+
+		{
+			const auto &st = st::creditsHistoryTabsSlider;
+			slider->entity()->setNaturalWidth(0
+				+ st.labelStyle.font->width(fullTabText)
+				+ (hasIn ? st.labelStyle.font->width(inTabText) : 0)
+				+ (hasOut ? st.labelStyle.font->width(outTabText) : 0)
+				+ rect::m::sum::h(st::creditsHistoryTabsSliderPadding));
+		}
+
+		const auto fullWrap = inner->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				inner,
+				object_ptr<Ui::VerticalLayout>(inner)));
+		const auto inWrap = inner->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				inner,
+				object_ptr<Ui::VerticalLayout>(inner)));
+		const auto outWrap = inner->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				inner,
+				object_ptr<Ui::VerticalLayout>(inner)));
+
+		rpl::single(0) | rpl::then(
+			slider->entity()->sectionActivated()
+		) | rpl::on_next([=](int index) {
+			if (index == 0) {
+				fullWrap->toggle(true, anim::type::instant);
+				inWrap->toggle(false, anim::type::instant);
+				outWrap->toggle(false, anim::type::instant);
+			} else if (index == 1) {
+				inWrap->toggle(true, anim::type::instant);
+				fullWrap->toggle(false, anim::type::instant);
+				outWrap->toggle(false, anim::type::instant);
+			} else {
+				outWrap->toggle(true, anim::type::instant);
+				fullWrap->toggle(false, anim::type::instant);
+				inWrap->toggle(false, anim::type::instant);
+			}
+		}, inner->lifetime());
+
+		const auto window = controller()->parentController();
+		const auto entryClicked = [=](
+				const Data::CreditsHistoryEntry &e,
+				const Data::SubscriptionEntry &s) {
+			window->uiShow()->show(Box(
+				ReceiptCreditsBox,
+				window,
+				e,
+				s));
+		};
+
+		Info::Statistics::AddCreditsHistoryList(
+			window->uiShow(),
+			fullSlice,
+			fullWrap->entity(),
+			entryClicked,
+			self,
+			true,
+			true);
+		Info::Statistics::AddCreditsHistoryList(
+			window->uiShow(),
+			inSlice,
+			inWrap->entity(),
+			entryClicked,
+			self,
+			true,
+			false);
+		Info::Statistics::AddCreditsHistoryList(
+			window->uiShow(),
+			outSlice,
+			outWrap->entity(),
+			std::move(entryClicked),
+			self,
+			false,
+			true);
+
+		Ui::AddSkip(inner);
+		Ui::AddSkip(inner);
+
+		inner->resizeToWidth(container->width());
+	};
+
+	const auto apiLifetime = content->lifetime().make_state<rpl::lifetime>();
+	{
+		using Api = Api::CreditsHistory;
+		constexpr auto kFirstPageLimit = 20;
+		const auto c = (_creditsType == CreditsType::Ton);
+		const auto apiFull = apiLifetime->make_state<Api>(self, true, true, c);
+		const auto apiIn = apiLifetime->make_state<Api>(self, true, false, c);
+		const auto apiOut = apiLifetime->make_state<Api>(self, false, true, c);
+		apiFull->request({}, [=](Data::CreditsStatusSlice fullSlice) {
+			apiIn->request({}, [=](Data::CreditsStatusSlice inSlice) {
+				apiOut->request({}, [=](Data::CreditsStatusSlice outSlice) {
+					::Api::PremiumPeerBot(
+						&controller()->session()
+					) | rpl::on_next([=](not_null<PeerData*> bot) {
+						fill(bot, fullSlice, inSlice, outSlice);
+						apiLifetime->destroy();
+					}, *apiLifetime);
+				}, kFirstPageLimit);
+			}, kFirstPageLimit);
+		}, kFirstPageLimit);
+	}
+}
+
+void Credits::setupSwipeBack() {
+	using namespace Ui::Controls;
+
+	auto swipeBackData = lifetime().make_state<SwipeBackResult>();
+
+	auto update = [=](SwipeContextData data) {
+		if (data.translation > 0) {
+			if (!swipeBackData->callback) {
+				(*swipeBackData) = SetupSwipeBack(
+					this,
+					[]() -> std::pair<QColor, QColor> {
+						return {
+							st::historyForwardChooseBg->c,
+							st::historyForwardChooseFg->c,
+						};
+					});
+			}
+			swipeBackData->callback(data);
+			return;
+		} else if (swipeBackData->lifetime) {
+			(*swipeBackData) = {};
+		}
+	};
+
+	auto init = [=](Ui::Controls::SwipeHandlerInitData data) {
+		return (data.direction == Qt::RightToLeft)
+			? DefaultSwipeBackHandlerFinishData([=] {
+				_showBack.fire({});
+			})
+			: SwipeHandlerFinishData();
+	};
+
+	SetupSwipeHandler({
+		.widget = this,
+		.scroll = v::null,
+		.update = std::move(update),
+		.init = std::move(init),
+	});
+}
+
+void Credits::setupContent() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+	_content = content;
+	const auto isCurrency = _creditsType == CreditsType::Ton;
+	const auto statsButton = &_statsButton;
+	const auto giftButton = &_giftButton;
+	const auto earnButton = &_earnButton;
+
+	struct State final {
+		BuyStarsHandler buyStars;
+	};
+	const auto state = content->lifetime().make_state<State>();
+
+	{
+		const auto button = content->add(
+			object_ptr<Ui::RoundButton>(
+				content,
+				nullptr,
+				st::creditsSettingsBigBalanceButton),
+			st::boxRowPadding,
+			style::al_top);
+		button->setContext([&]() -> Ui::Text::MarkedContext {
+			auto customEmojiFactory = [=](const auto &...) {
+				const auto &icon = st::settingsIconAdd;
+				auto image = QImage(
+					(icon.size() + QSize(st::lineWidth * 4, 0))
+						* style::DevicePixelRatio(),
+					QImage::Format_ARGB32_Premultiplied);
+				const auto r = Rect(icon.size()) - Margins(st::lineWidth * 2);
+				image.setDevicePixelRatio(style::DevicePixelRatio());
+				image.fill(Qt::transparent);
+				{
+					auto p = QPainter(&image);
+					auto hq = PainterHighQualityEnabler(p);
+					p.setPen(Qt::NoPen);
+					p.setBrush(st::activeButtonFg);
+					p.drawEllipse(r);
+					icon.paintInCenter(p, r, st::windowBgActive->c);
+				}
+				return std::make_unique<Ui::CustomEmoji::Internal>(
+					u"topup_button"_q,
+					std::move(image));
+			};
+			return { .customEmojiFactory = std::move(customEmojiFactory) };
+		}());
+		button->setText(
+			rpl::conditional(
+				state->buyStars.loadingValue(),
+				rpl::single(TextWithEntities()),
+				isCurrency
+					? tr::lng_credits_currency_summary_in_button(
+						tr::marked)
+					: tr::lng_credits_topup_button(
+						lt_emoji,
+						rpl::single(Ui::Text::SingleCustomEmoji(u"+"_q)),
+						tr::marked)));
+		const auto show = controller()->uiShow();
+		if (isCurrency) {
+			const auto url = tr::lng_suggest_low_ton_fragment_url(tr::now);
+			button->setClickedCallback([=] { UrlClickHandler::Open(url); });
+		} else {
+			const auto paid = [parent = QPointer<QWidget>(_parent)] {
+				if (parent) {
+					Ui::StartFireworks(parent);
+				}
+			};
+			button->setClickedCallback(state->buyStars.handler(show, paid));
+		}
+		{
+			using namespace Info::Statistics;
+			const auto loadingAnimation = InfiniteRadialAnimationWidget(
+				button,
+				button->height() / 2);
+			AddChildToWidgetCenter(button, loadingAnimation);
+			loadingAnimation->showOn(state->buyStars.loadingValue());
+		}
+	}
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content, st::lineWidth);
+
+	const auto &textSt = st::creditsPremiumCover.about;
+	auto context = [&]() -> Ui::Text::MarkedContext {
+		const auto height = textSt.style.font->height;
+		auto customEmojiFactory = [=](const auto &...) {
+			return Ui::Text::MakeWrappedEmoji<Ui::Text::ShiftedEmoji>(
+				isCurrency
+					? std::make_unique<Ui::CustomEmoji::Internal>(
+						u"currency_icon:%1"_q.arg(height),
+						Ui::Earn::IconCurrencyColored(
+							st::tonFieldIconSize,
+							st::currencyFg->c))
+					: Ui::MakeCreditsIconEmoji(height, 1),
+				isCurrency
+					? QPoint(0, st::lineWidth * 2)
+					: QPoint(-st::lineWidth, st::lineWidth));
+		};
+		return { .customEmojiFactory = std::move(customEmojiFactory) };
+	}();
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_credits_balance_me_count(
+				lt_emoji,
+				rpl::single(Ui::MakeCreditsIconEntity()),
+				lt_amount,
+				(isCurrency
+					? controller()->session().credits().tonBalanceValue()
+					: controller()->session().credits().balanceValue()
+				) | rpl::map(
+					Lang::FormatCreditsAmountDecimal
+				) | rpl::map(tr::bold),
+				tr::marked),
+			textSt,
+			st::defaultPopupMenu,
+			std::move(context)),
+		style::al_top);
+	if (isCurrency) {
+		const auto rate = controller()->session().credits().usdRate();
+		const auto wrap = content->add(
+			object_ptr<Ui::SlideWrap<>>(
+				content,
+				object_ptr<Ui::FlatLabel>(
+					content,
+					controller()->session().credits().tonBalanceValue(
+					) | rpl::map([=](CreditsAmount value) {
+						using namespace Info::ChannelEarn;
+						return value ? ToUsd(value, rate, 3) : QString();
+					}),
+					st::channelEarnOverviewSubMinorLabel)),
+			style::al_top);
+		wrap->toggleOn(controller()->session().credits().tonBalanceValue(
+			) | rpl::map(rpl::mappers::_1 > CreditsAmount(0)));
+		wrap->finishAnimating();
+	}
+	Ui::AddSkip(content, st::lineWidth);
+	Ui::AddSkip(content, st::lineWidth);
+	Ui::AddSkip(content);
+
+	Ui::AddSkip(content);
+	if (isCurrency) {
+		Ui::AddDividerText(
+			content,
+			tr::lng_credits_currency_summary_in_subtitle());
+	} else {
+		Ui::AddDivider(content);
+	}
+	Ui::AddSkip(content, st::lineWidth * 4);
+
+	const auto setupSubs = [=](not_null<Ui::VerticalLayout*> container) {
+		setupSubscriptions(container);
+	};
+	const auto setupHist = [=](not_null<Ui::VerticalLayout*> container) {
+		setupHistory(container);
+	};
+
+	const SectionBuildMethod buildMethod = [=](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		const auto isPaused = Window::PausedIn(
+			controller,
+			Window::GifPauseReason::Layer);
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = isPaused,
+		});
+
+		BuildCreditsSectionContent(
+			builder,
+			isCurrency,
+			statsButton,
+			giftButton,
+			earnButton,
+			setupSubs,
+			setupHist);
+	};
+
+	build(content, buildMethod);
+
+	Ui::ResizeFitChild(this, content);
+}
+
+base::weak_qptr<Ui::RpWidget> Credits::createPinnedToTop(
+		not_null<QWidget*> parent) {
+	_parent = parent;
+	const auto isCurrency = _creditsType == CreditsType::Ton;
+
+	const auto content = [&]() -> Ui::Premium::TopBarAbstract* {
+		const auto weak = base::make_weak(controller());
+		const auto clickContextOther = [=] {
+			return QVariant::fromValue(ClickHandlerContext{
+				.sessionWindow = weak,
+				.botStartAutoSubmit = true,
+			});
+		};
+		return Ui::CreateChild<Ui::Premium::TopBar>(
+			parent.get(),
+			st::creditsPremiumCover,
+			Ui::Premium::TopBarDescriptor{
+				.clickContextOther = clickContextOther,
+				.logo = isCurrency ? u"diamond"_q : QString(),
+				.title = title(),
+				.about = (isCurrency
+					? tr::lng_credits_currency_summary_about
+					: tr::lng_credits_summary_about)(
+						TextWithEntities::Simple),
+				.light = true,
+				.use3dStar = !isCurrency,
+				.star3dGolden = !isCurrency,
+				.use3dDiamond = isCurrency,
+				.gradientStops = Ui::Premium::CreditsIconGradientStops(),
+				.showFinished = _showFinished.events(),
+			});
+	}();
+	controller()->boxShownValue(
+	) | rpl::on_next([=](bool shown) {
+		content->setPaused(shown);
+	}, content->lifetime());
+
+	_wrap.value(
+	) | rpl::on_next([=](Info::Wrap wrap) {
+		content->setRoundEdges(wrap == Info::Wrap::Layer);
+	}, content->lifetime());
+
+	content->setMaximumHeight(st::settingsPremiumTopHeight);
+	content->setMinimumHeight(st::infoLayerTopBarHeight);
+
+	content->resize(content->width(), content->maximumHeight());
+	content->additionalHeight(
+	) | rpl::on_next([=](int additionalHeight) {
+		const auto wasMax = (content->height() == content->maximumHeight());
+		content->setMaximumHeight(st::settingsPremiumTopHeight
+			+ additionalHeight);
+		if (wasMax) {
+			content->resize(content->width(), content->maximumHeight());
+		}
+	}, content->lifetime());
+
+	{
+		const auto balance = AddBalanceWidget(
+			content,
+			&controller()->session(),
+			isCurrency
+				? controller()->session().credits().tonBalanceValue()
+				: controller()->session().credits().balanceValue(),
+			true,
+			content->heightValue() | rpl::map([=](int height) {
+				const auto ratio = float64(height - content->minimumHeight())
+					/ (content->maximumHeight() - content->minimumHeight());
+				return (1. - ratio / 0.35);
+			}));
+		controller()->session().credits().load(true);
+		rpl::combine(
+			balance->sizeValue(),
+			content->sizeValue()
+		) | rpl::on_next([=](const QSize &, const QSize &) {
+			balance->moveToRight(
+				(_close
+					? _close->width() + st::creditsHistoryRightSkip
+					: st::creditsHistoryRightSkip * 2),
+				st::creditsHistoryRightSkip);
+			balance->update();
+		}, balance->lifetime());
+	}
+
+	_wrap.value(
+	) | rpl::on_next([=](Info::Wrap wrap) {
+		const auto isLayer = (wrap == Info::Wrap::Layer);
+		_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
+			content,
+			object_ptr<Ui::IconButton>(
+				content,
+				(isLayer ? st::infoTopBarBack : st::infoLayerTopBarBack)),
+			st::infoTopBarScale);
+		_back->setDuration(0);
+		_back->toggleOn(isLayer
+			? _backToggles.value() | rpl::type_erased
+			: rpl::single(true));
+		_back->entity()->addClickHandler([=] {
+			_showBack.fire({});
+		});
+		_back->toggledValue(
+		) | rpl::on_next([=](bool toggled) {
+			const auto &st = isLayer ? st::infoLayerTopBar : st::infoTopBar;
+			content->setTextPosition(
+				toggled ? st.back.width : st.titlePosition.x(),
+				st.titlePosition.y());
+		}, _back->lifetime());
+
+		if (!isLayer) {
+			_close = nullptr;
+		} else {
+			_close = base::make_unique_q<Ui::IconButton>(
+				content,
+				st::infoTopBarClose);
+			_close->addClickHandler([=] {
+				controller()->parentController()->hideLayer();
+				controller()->parentController()->hideSpecialLayer();
+			});
+			content->widthValue(
+			) | rpl::on_next([=] {
+				_close->moveToRight(0, 0);
+			}, _close->lifetime());
+		}
+	}, content->lifetime());
+
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
+}
+
+void Credits::showFinished() {
+	_showFinished.fire({});
+	controller()->checkHighlightControl(u"stars/stats"_q, _statsButton);
+	controller()->checkHighlightControl(u"stars/gift"_q, _giftButton);
+	controller()->checkHighlightControl(u"stars/earn"_q, _earnButton);
+}
+
+void Credits::visibleTopBottomUpdated(int visibleTop, int visibleBottom) {
+	setChildVisibleTopBottom(_content, visibleTop, visibleBottom);
+}
+
+class Currency {
+};
+
+void BuildCurrencyWithdrawalSection(
+		not_null<Ui::VerticalLayout*> content,
+		not_null<Window::SessionController*> controller) {
+	using namespace Info::ChannelEarn;
+	const auto self = controller->session().user();
+
+	const auto fill = [=](
+			not_null<Ui::VerticalLayout*> container,
+			CreditsAmount value,
+			float64 multiplier) {
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+
+		const auto labels = container->add(
+			object_ptr<Ui::RpWidget>(container),
+			style::al_top);
+
+		const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
+			labels,
+			st::channelEarnBalanceMajorLabel);
+		{
+			const auto &m = st::channelEarnCurrencyCommonMargins;
+			const auto p = QMargins(
+				m.left(),
+				-m.top(),
+				m.right(),
+				m.bottom());
+			AddEmojiToMajor(majorLabel, rpl::single(value), {}, p);
+		}
+		majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+		const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
+			labels,
+			MinorPart(value),
+			st::channelEarnBalanceMinorLabel);
+		minorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+		rpl::combine(
+			majorLabel->sizeValue(),
+			minorLabel->sizeValue()
+		) | rpl::on_next([=](
+				const QSize &majorSize,
+				const QSize &minorSize) {
+			labels->resize(
+				majorSize.width() + minorSize.width(),
+				majorSize.height());
+			labels->setNaturalWidth(
+				majorSize.width() + minorSize.width());
+			majorLabel->moveToLeft(0, 0);
+			minorLabel->moveToRight(
+				0,
+				st::channelEarnBalanceMinorLabelSkip);
+		}, labels->lifetime());
+		Ui::ToggleChildrenVisibility(labels, true);
+
+		Ui::AddSkip(container);
+		container->add(
+			object_ptr<Ui::FlatLabel>(
+				container,
+				ToUsd(value, multiplier, 0),
+				st::channelEarnOverviewSubMinorLabel),
+			style::al_top);
+
+		Ui::AddSkip(container);
+
+		const auto &stButton = st::creditsSettingsBigBalanceButton;
+		const auto button = container->add(
+			object_ptr<Ui::RoundButton>(
+				container,
+				rpl::never<QString>(),
+				stButton),
+			st::boxRowPadding,
+			style::al_top);
+		button->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
+
+		const auto label = Ui::CreateChild<Ui::FlatLabel>(
+			button,
+			tr::lng_channel_earn_balance_button(tr::now),
+			st::channelEarnSemiboldLabel);
+		label->setTextColorOverride(stButton.textFg->c);
+		label->setAttribute(Qt::WA_TransparentForMouseEvents);
+		rpl::combine(
+			button->sizeValue(),
+			label->sizeValue()
+		) | rpl::on_next([=](const QSize &b, const QSize &l) {
+			label->moveToLeft(
+				(b.width() - l.width()) / 2,
+				(b.height() - l.height()) / 2);
+		}, label->lifetime());
+
+		const auto colorText = [=](float64 v) {
+			label->setTextColorOverride(
+				anim::with_alpha(
+					stButton.textFg->c,
+					anim::interpolateF(.5, 1., v)));
+		};
+		const auto withdrawalEnabled = true;
+		colorText(withdrawalEnabled ? 1. : 0.);
+		button->setAttribute(
+			Qt::WA_TransparentForMouseEvents,
+			!withdrawalEnabled);
+
+		Api::HandleWithdrawalButton(
+			{ .currencyReceiver = self },
+			button,
+			controller->uiShow());
+		Ui::ToggleChildrenVisibility(button, true);
+
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		Ui::AddSkip(container);
+		Ui::AddDividerText(
+			container,
+			tr::lng_credits_currency_summary_subtitle());
+		Ui::AddSkip(container);
+	};
+
+	const auto wrap = content->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			content,
+			object_ptr<Ui::VerticalLayout>(content)));
+	const auto apiLifetime = wrap->lifetime().make_state<rpl::lifetime>();
+	const auto api = apiLifetime->make_state<Api::EarnStatistics>(self);
+	wrap->toggle(false, anim::type::instant);
+	api->request() | rpl::on_error_done([] {
+	}, [=] {
+		if (!api->data().availableBalance.empty()) {
+			wrap->toggle(true, anim::type::normal);
+			fill(
+				wrap->entity(),
+				api->data().availableBalance,
+				api->data().usdRate);
+			content->resizeToWidth(content->width());
+		}
+	}, *apiLifetime);
+}
+
+void BuildCreditsButtons(
+		SectionBuilder &builder,
+		bool isCurrency,
+		QPointer<Ui::SettingsButton> *statsButton,
+		QPointer<Ui::SettingsButton> *giftButton,
+		QPointer<Ui::SettingsButton> *earnButton) {
+	const auto session = builder.session();
+	const auto controller = builder.controller();
+	const auto self = session->user();
+
+	if (!isCurrency) {
+		auto statsShown = session->credits().loadedValue(
+		) | rpl::map([session] {
+			return session->credits().statsEnabled();
+		});
+		const auto stats = builder.addButton({
+			.id = u"stars/stats"_q,
+			.title = tr::lng_credits_stats_button(),
+			.st = &st::settingsCreditsButton,
+			.icon = { &st::menuIconStats },
+			.onClick = [controller, self] {
+				controller->parentController()->showSection(
+					Info::BotEarn::Make(self));
+			},
+			.keywords = { u"statistics"_q },
+			.shown = std::move(statsShown),
+		});
+		if (statsButton) {
+			*statsButton = stats;
+		}
+	}
+
+	if (!isCurrency) {
+		const auto gift = builder.addButton({
+			.id = u"stars/gift"_q,
+			.title = tr::lng_credits_gift_button(),
+			.st = &st::settingsCreditsButton,
+			.icon = { &st::settingsButtonIconGift },
+			.onClick = [controller] {
+				const auto window = controller->parentController();
+				Ui::ShowGiftCreditsBox(window, nullptr);
+			},
+			.keywords = { u"send"_q, u"stars"_q },
+		});
+		if (giftButton) {
+			*giftButton = gift;
+		}
+	}
+
+	if (!isCurrency && Info::BotStarRef::Join::Allowed(self)) {
+		const auto earn = builder.addButton({
+			.id = u"stars/earn"_q,
+			.title = tr::lng_credits_earn_button(),
+			.st = &st::settingsCreditsButton,
+			.icon = { &st::settingsButtonIconEarn },
+			.onClick = [controller, self] {
+				controller->parentController()->showSection(
+					Info::BotStarRef::Join::Make(self));
+			},
+			.keywords = { u"affiliate"_q, u"referral"_q },
+		});
+		if (earnButton) {
+			*earnButton = earn;
+		}
+	}
+}
+
+void BuildCreditsSectionContent(
+		SectionBuilder &builder,
+		bool isCurrency,
+		QPointer<Ui::SettingsButton> *statsButton,
+		QPointer<Ui::SettingsButton> *giftButton,
+		QPointer<Ui::SettingsButton> *earnButton,
+		Fn<void(not_null<Ui::VerticalLayout*>)> setupSubscriptions,
+		Fn<void(not_null<Ui::VerticalLayout*>)> setupHistory) {
+	BuildCreditsButtons(builder, isCurrency, statsButton, giftButton, earnButton);
+
+	if (isCurrency) {
+		builder.add([](const WidgetContext &ctx) {
+			BuildCurrencyWithdrawalSection(ctx.container, ctx.controller);
+			return SectionBuilder::WidgetToAdd{};
+		});
+	}
+
+	if (!isCurrency) {
+		builder.add([=](const WidgetContext &ctx) {
+			Ui::AddSkip(ctx.container, st::lineWidth * 4);
+			Ui::AddDivider(ctx.container);
+			setupSubscriptions(ctx.container);
+			return SectionBuilder::WidgetToAdd{};
+		});
+	}
+
+	builder.add([=](const WidgetContext &ctx) {
+		setupHistory(ctx.container);
+		return SectionBuilder::WidgetToAdd{};
+	});
+}
+
+const auto kCreditsBuilderMeta = BuildHelper({
+	.id = Credits::Id(),
+	.parentId = MainId(),
+	.title = &tr::lng_credits_summary_title,
+	.icon = &st::menuIconPremium,
+}, [](SectionBuilder &builder) {
+	BuildCreditsButtons(builder, false, nullptr, nullptr, nullptr);
+});
+
+} // namespace
+
+template <>
+struct SectionFactory<Credits> : AbstractSectionFactory {
+	object_ptr<AbstractSection> create(
+		not_null<QWidget*> parent,
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::ScrollArea*> scroll,
+		rpl::producer<Container> containerValue
+	) const final override {
+		return object_ptr<Credits>(parent, controller, CreditsType::Stars);
+	}
+	bool hasCustomTopBar() const final override {
+		return true;
+	}
+
+	[[nodiscard]] static const std::shared_ptr<SectionFactory> &Instance() {
+		static const auto result = std::make_shared<SectionFactory>();
+		return result;
+	}
+};
+
+template <>
+struct SectionFactory<Currency> : AbstractSectionFactory {
+	object_ptr<AbstractSection> create(
+		not_null<QWidget*> parent,
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::ScrollArea*> scroll,
+		rpl::producer<Container> containerValue
+	) const final override {
+		return object_ptr<Credits>(parent, controller, CreditsType::Ton);
+	}
+	bool hasCustomTopBar() const final override {
+		return true;
+	}
+
+	[[nodiscard]] static const std::shared_ptr<SectionFactory> &Instance() {
+		static const auto result = std::make_shared<SectionFactory>();
+		return result;
+	}
+};
+
+Type CreditsId() {
+	return Credits::Id();
+}
+
+Type CurrencyId() {
+	return SectionFactory<Currency>::Instance();
+}
+
+BuyStarsHandler::BuyStarsHandler() = default;
+
+BuyStarsHandler::~BuyStarsHandler() = default;
+
+Fn<void()> BuyStarsHandler::handler(
+		std::shared_ptr<::Main::SessionShow> show,
+		Fn<void()> paid) {
+	const auto optionsBox = [=](not_null<Ui::GenericBox*> box) {
+		box->setStyle(st::giveawayGiftCodeBox);
+		box->setWidth(st::boxWideWidth);
+		box->setTitle(tr::lng_credits_summary_options_subtitle());
+		const auto inner = box->verticalLayout();
+		const auto self = show->session().user();
+		const auto options = _api
+			? _api->options()
+			: Data::CreditTopupOptions();
+		const auto amount = CreditsAmount();
+		const auto weak = base::make_weak(box);
+		FillCreditOptions(show, inner, self, amount, [=] {
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+			if (const auto onstack = paid) {
+				onstack();
+			}
+		}, box->showFinishes(), nullptr, options);
+
+		box->addButton(tr::lng_close(), [=] {
+			box->closeBox();
+		});
+	};
+	return crl::guard(this, [=] {
+		if (_api && !_api->options().empty()) {
+			_loading = false;
+			show->show(Box(crl::guard(this, optionsBox)));
+		} else {
+			_loading = true;
+			const auto user = show->session().user();
+			_api = std::make_unique<Api::CreditsTopupOptions>(user);
+			_api->request(
+			) | rpl::on_error_done([=](const QString &error) {
+				_loading = false;
+				show->showToast(error);
+			}, [=] {
+				_loading = false;
+				show->show(Box(crl::guard(this, optionsBox)));
+			}, _lifetime);
+		}
+	});
+}
+
+rpl::producer<bool> BuyStarsHandler::loadingValue() const {
+	return _loading.value();
+}
+
+namespace Builder {
+
+SectionBuildMethod CreditsSection = kCreditsBuilderMeta.build;
+
+} // namespace Builder
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_credits.h b/Telegram/SourceFiles/settings/sections/settings_credits.h
new file mode 100644
index 00000000000000..56c88e68b16b4c
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_credits.h
@@ -0,0 +1,43 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/weak_ptr.h"
+#include "settings/settings_type.h"
+
+namespace Api {
+class CreditsTopupOptions;
+} // namespace Api
+
+namespace Main {
+class SessionShow;
+} // namespace Main
+
+namespace Settings {
+
+[[nodiscard]] Type CreditsId();
+[[nodiscard]] Type CurrencyId();
+
+class BuyStarsHandler final : public base::has_weak_ptr {
+public:
+	BuyStarsHandler();
+	~BuyStarsHandler();
+
+	[[nodiscard]] Fn<void()> handler(
+		std::shared_ptr<::Main::SessionShow> show,
+		Fn<void()> paid = nullptr);
+	[[nodiscard]] rpl::producer<bool> loadingValue() const;
+
+private:
+	std::unique_ptr<Api::CreditsTopupOptions> _api;
+	rpl::variable<bool> _loading;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/sections/settings_folders.cpp
similarity index 57%
rename from Telegram/SourceFiles/settings/settings_folders.cpp
rename to Telegram/SourceFiles/settings/sections/settings_folders.cpp
index 7d9c3707ae63c9..3ea34301bc5d15 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/sections/settings_folders.cpp
@@ -5,45 +5,56 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_folders.h"
+#include "settings/sections/settings_folders.h"
 
+#include "api/api_chat_filters.h"
 #include "apiwrap.h"
-#include "api/api_chat_filters.h" // ProcessFilterRemove.
-#include "boxes/premium_limits_box.h"
 #include "boxes/filters/edit_filter_box.h"
+#include "boxes/premium_limits_box.h"
+#include "boxes/premium_preview_box.h"
 #include "core/application.h"
+#include "core/ui_integration.h"
 #include "data/data_chat_filters.h"
 #include "data/data_folder.h"
 #include "data/data_peer.h"
-#include "data/data_peer_values.h" // Data::AmPremiumValue.
-#include "data/data_session.h"
+#include "data/data_peer_values.h"
 #include "data/data_premium_limits.h"
+#include "data/data_session.h"
 #include "history/history.h"
 #include "lang/lang_keys.h"
 #include "lottie/lottie_icon.h"
 #include "main/main_session.h"
+#include "settings/sections/settings_main.h"
+#include "settings/sections/settings_premium.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common_session.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/empty_userpic.h"
 #include "ui/filter_icons.h"
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
-#include "ui/vertical_list.h"
+#include "ui/rect.h"
 #include "ui/text/text_utilities.h"
+#include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
 #include "ui/widgets/box_content_divider.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/slide_wrap.h"
-#include "ui/ui_utility.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
-#include "styles/style_settings.h"
-#include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
 
 namespace Settings {
 namespace {
 
+using namespace Builder;
 using Flag = Data::ChatFilter::Flag;
 using Flags = Data::ChatFilter::Flags;
 
@@ -51,21 +62,22 @@ class FilterRowButton final : public Ui::RippleButton {
 public:
 	FilterRowButton(
 		not_null<QWidget*> parent,
-		not_null<Main::Session*> session,
-		const Data::ChatFilter &filter);
-	FilterRowButton(
-		not_null<QWidget*> parent,
+		not_null<::Main::Session*> session,
 		const Data::ChatFilter &filter,
-		const QString &description);
+		const QString &description = {});
 
 	void setRemoved(bool removed);
-	void updateData(const Data::ChatFilter &filter);
+	void updateData(
+		const Data::ChatFilter &filter,
+		bool ignoreCount = false);
 	void updateCount(const Data::ChatFilter &filter);
 
 	[[nodiscard]] rpl::producer<> removeRequests() const;
 	[[nodiscard]] rpl::producer<> restoreRequests() const;
 	[[nodiscard]] rpl::producer<> addRequests() const;
 
+	void setColorIndexProgress(float64 progress);
+
 private:
 	enum class State {
 		Suggested,
@@ -73,20 +85,13 @@ class FilterRowButton final : public Ui::RippleButton {
 		Normal,
 	};
 
-	FilterRowButton(
-		not_null<QWidget*> parent,
-		Main::Session *session,
-		const Data::ChatFilter &filter,
-		const QString &description,
-		State state);
-
 	void paintEvent(QPaintEvent *e) override;
 
 	void setup(const Data::ChatFilter &filter, const QString &status);
 	void setState(State state, bool force = false);
 	void updateButtonsVisibility();
 
-	Main::Session *_session = nullptr;
+	const not_null<::Main::Session*> _session;
 
 	Ui::IconButton _remove;
 	Ui::RoundButton _restore;
@@ -95,6 +100,8 @@ class FilterRowButton final : public Ui::RippleButton {
 	Ui::Text::String _title;
 	QString _status;
 	Ui::FilterIcon _icon = Ui::FilterIcon();
+	std::optional<uint8> _colorIndex;
+	float64 _colorIndexProgress = 1.;
 
 	State _state = State::Normal;
 
@@ -112,7 +119,7 @@ struct FilterRow {
 };
 
 [[nodiscard]] int CountFilterChats(
-		not_null<Main::Session*> session,
+		not_null<::Main::Session*> session,
 		const Data::ChatFilter &filter) {
 	auto result = 0;
 	const auto addList = [&](not_null<Dialogs::MainList*> list) {
@@ -133,7 +140,7 @@ struct FilterRow {
 }
 
 [[nodiscard]] int ComputeCount(
-		not_null<Main::Session*> session,
+		not_null<::Main::Session*> session,
 		const Data::ChatFilter &filter,
 		bool check = false) {
 	const auto &list = session->data().chatsFilters().list();
@@ -151,7 +158,7 @@ struct FilterRow {
 }
 
 [[nodiscard]] QString ComputeCountString(
-		not_null<Main::Session*> session,
+		not_null<::Main::Session*> session,
 		const Data::ChatFilter &filter,
 		bool check = false) {
 	const auto count = ComputeCount(session, filter, check);
@@ -160,57 +167,56 @@ struct FilterRow {
 		: tr::lng_filters_no_chats(tr::now);
 	return filter.chatlist()
 		? (result
-			+ QString::fromUtf8(" \xE2\x80\xA2 ")
+			+ (' ' + Ui::kQBullet + ' ')
 			+ tr::lng_filters_shareable_status(tr::now))
 		: result;
 }
 
 FilterRowButton::FilterRowButton(
 	not_null<QWidget*> parent,
-	not_null<Main::Session*> session,
-	const Data::ChatFilter &filter)
-: FilterRowButton(
-	parent,
-	session,
-	filter,
-	ComputeCountString(session, filter),
-	State::Normal) {
-}
-
-FilterRowButton::FilterRowButton(
-	not_null<QWidget*> parent,
+	not_null<::Main::Session*> session,
 	const Data::ChatFilter &filter,
 	const QString &description)
-: FilterRowButton(parent, nullptr, filter, description, State::Suggested) {
-}
-
-FilterRowButton::FilterRowButton(
-	not_null<QWidget*> parent,
-	Main::Session *session,
-	const Data::ChatFilter &filter,
-	const QString &status,
-	State state)
 : RippleButton(parent, st::defaultRippleAnimation)
 , _session(session)
 , _remove(this, st::filtersRemove)
-, _restore(this, tr::lng_filters_restore(), st::stickersUndoRemove)
-, _add(this, tr::lng_filters_recommended_add(), st::stickersTrendingAdd)
-, _state(state) {
-	_restore.setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-	_add.setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-	setup(filter, status);
+, _restore(this, tr::lng_filters_restore(), st::settingsFilterAddRecommended)
+, _add(
+	this,
+	tr::lng_filters_recommended_add(),
+	st::settingsFilterAddRecommended)
+, _state(description.isEmpty() ? State::Normal : State::Suggested) {
+	_restore.setFullRadius(true);
+	_add.setFullRadius(true);
+	setup(filter, description.isEmpty()
+		? ComputeCountString(session, filter)
+		: description);
 }
 
 void FilterRowButton::setRemoved(bool removed) {
 	setState(removed ? State::Removed : State::Normal);
 }
 
-void FilterRowButton::updateData(const Data::ChatFilter &filter) {
+void FilterRowButton::updateData(
+		const Data::ChatFilter &filter,
+		bool ignoreCount) {
 	Expects(_session != nullptr);
 
-	_title.setText(st::contactsNameStyle, filter.title());
+	const auto title = filter.title();
+	_title.setMarkedText(
+		st::contactsNameStyle,
+		title.text,
+		kMarkupTextOptions,
+		Core::TextContext({
+			.session = _session,
+			.repaint = [=] { update(); },
+			.customEmojiLoopLimit = title.isStatic ? -1 : 0,
+		}));
 	_icon = Ui::ComputeFilterIcon(filter);
-	updateCount(filter);
+	_colorIndex = filter.colorIndex();
+	if (!ignoreCount) {
+		updateCount(filter);
+	}
 }
 
 void FilterRowButton::updateCount(const Data::ChatFilter &filter) {
@@ -234,14 +240,11 @@ void FilterRowButton::setup(
 		const QString &status) {
 	resize(width(), st::defaultPeerListItem.height);
 
-	_title.setText(st::contactsNameStyle, filter.title());
 	_status = status;
-	_icon = Ui::ComputeFilterIcon(filter);
-
+	updateData(filter, true);
 	setState(_state, true);
 
-	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	sizeValue() | rpl::on_next([=](QSize size) {
 		const auto right = st::contactsPadding.right()
 			+ st::contactsCheckPosition.x();
 		const auto width = size.width();
@@ -271,6 +274,13 @@ rpl::producer<> FilterRowButton::addRequests() const {
 	return _add.clicks() | rpl::to_empty;
 }
 
+void FilterRowButton::setColorIndexProgress(float64 progress) {
+	_colorIndexProgress = progress;
+	if (_colorIndex) {
+		update();
+	}
+}
+
 void FilterRowButton::paintEvent(QPaintEvent *e) {
 	auto p = Painter(this);
 
@@ -280,6 +290,19 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			p.fillRect(e->rect(), st::windowBgOver);
 		}
 		RippleButton::paintRipple(p, 0, 0);
+
+		if (_colorIndex) {
+			p.setPen(Qt::NoPen);
+			p.setBrush(Ui::EmptyUserpic::UserpicColor(*_colorIndex).color2);
+			const auto w = height() / 3;
+			const auto rect = QRect(
+				_remove.x() - w - st::contactsCheckPosition.x(),
+				(height() - w) / 2,
+				w,
+				w);
+			auto hq = PainterHighQualityEnabler(p);
+			p.drawEllipse(rect - Margins((1. - _colorIndexProgress) * w / 2));
+		}
 	} else if (_state == State::Removed) {
 		p.setOpacity(st::stickersRowDisabledOpacity);
 	}
@@ -311,7 +334,6 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 	if (_state != State::Suggested) {
 		const auto icon = Ui::LookupFilterIcon(_icon).normal;
 
-		// For now.
 		auto hq = PainterHighQualityEnabler(p);
 		const auto iconWidth = icon->width() - style::ConvertScale(9);
 		const auto scale = st::settingsIconAdd.width() / float64(iconWidth);
@@ -332,27 +354,26 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 	}
 }
 
-[[nodiscard]] Fn<void()> SetupFoldersContent(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	auto &lifetime = container->lifetime();
+struct FoldersState {
+	std::vector<FilterRow> rows;
+	rpl::variable<int> count;
+	rpl::variable<int> suggested;
+	Fn<void(const FilterRowButton*, Fn<void(Data::ChatFilter)>)> save;
+	Ui::Animations::Simple tagsEnabledAnimation;
+	rpl::event_stream<bool> tagsButtonEnabled;
+};
 
-	const auto weak = Ui::MakeWeak(container);
+not_null<Ui::VerticalLayout*> SetupFoldersList(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container,
+		not_null<FoldersState*> state,
+		HighlightRegistry *highlights) {
+	const auto weak = base::make_weak(container);
 	const auto session = &controller->session();
 	const auto limit = [=] {
 		return Data::PremiumLimits(session).dialogFiltersCurrent();
 	};
-	Ui::AddSkip(container, st::defaultVerticalListSkip);
-	Ui::AddSubsectionTitle(container, tr::lng_filters_subtitle());
-
-	struct State {
-		std::vector<FilterRow> rows;
-		rpl::variable<int> count;
-		rpl::variable<int> suggested;
-		Fn<void(const FilterRowButton*, Fn<void(Data::ChatFilter)>)> save;
-	};
 
-	const auto state = lifetime.make_state<State>();
 	const auto find = [=](not_null<FilterRowButton*> button) {
 		const auto i = ranges::find(state->rows, button, &FilterRow::button);
 		Assert(i != end(state->rows));
@@ -446,11 +467,11 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		const auto button = wrap->add(
 			object_ptr<FilterRowButton>(wrap, session, filter));
 		button->removeRequests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			remove(button);
 		}, button->lifetime());
 		button->restoreRequests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (showLimitReached()) {
 				return;
 			}
@@ -486,7 +507,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		const auto id = filter.id();
 		if (ranges::contains(filters->list(), id, &Data::ChatFilter::id)) {
 			filters->chatsList(id)->fullSize().changes(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				const auto found = find(button);
 				if (found->postponedCountUpdate) {
 					return;
@@ -526,7 +547,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 	}
 
 	session->data().chatsFilters().isChatlistChanged(
-	) | rpl::start_with_next([=](FilterId id) {
+	) | rpl::on_next([=](FilterId id) {
 		const auto filters = &session->data().chatsFilters();
 		const auto &list = filters->list();
 		const auto i = ranges::find(list, id, &Data::ChatFilter::id);
@@ -540,12 +561,15 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		j->button->updateCount(j->filter);
 	}, container->lifetime());
 
-	AddButtonWithIcon(
+	const auto createButton = AddButtonWithIcon(
 		container,
 		tr::lng_filters_create(),
 		st::settingsButtonActive,
-		{ &st::settingsIconAdd, IconType::Round, &st::windowBgActive }
-	)->setClickedCallback([=] {
+		{ &st::settingsIconAdd, IconType::Round, &st::windowBgActive });
+	if (highlights) {
+		highlights->push_back({ u"folders/create"_q, { createButton.get() } });
+	}
+	createButton->setClickedCallback([=] {
 		if (showLimitReached()) {
 			return;
 		}
@@ -571,59 +595,6 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			crl::guard(container, doneCallback),
 			crl::guard(container, saveAnd)));
 	});
-	Ui::AddSkip(container);
-	const auto nonEmptyAbout = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container))
-	)->setDuration(0);
-	const auto aboutRows = nonEmptyAbout->entity();
-	Ui::AddDivider(aboutRows);
-	Ui::AddSkip(aboutRows);
-	Ui::AddSubsectionTitle(aboutRows, tr::lng_filters_recommended());
-
-	rpl::single(rpl::empty) | rpl::then(
-		session->data().chatsFilters().suggestedUpdated()
-	) | rpl::map([=] {
-		return session->data().chatsFilters().suggestedFilters();
-	}) | rpl::filter([=](const std::vector<Data::SuggestedFilter> &list) {
-		return !list.empty();
-	}) | rpl::take(
-		1
-	) | rpl::start_with_next([=](
-			const std::vector<Data::SuggestedFilter> &suggestions) {
-		for (const auto &suggestion : suggestions) {
-			const auto &filter = suggestion.filter;
-			if (ranges::contains(state->rows, filter, &FilterRow::filter)) {
-				continue;
-			}
-			state->suggested = state->suggested.current() + 1;
-			const auto button = aboutRows->add(object_ptr<FilterRowButton>(
-				aboutRows,
-				filter,
-				suggestion.description));
-			button->addRequests(
-				) | rpl::start_with_next([=] {
-				if (showLimitReached()) {
-					return;
-				}
-				addFilter(filter);
-				state->suggested = state->suggested.current() - 1;
-				delete button;
-			}, button->lifetime());
-		}
-		aboutRows->resizeToWidth(container->width());
-		Ui::AddSkip(aboutRows, st::defaultVerticalListSkip);
-	}, aboutRows->lifetime());
-
-	auto showSuggestions = rpl::combine(
-		state->suggested.value(),
-		state->count.value(),
-		Data::AmPremiumValue(session)
-	) | rpl::map([limit](int suggested, int count, bool) {
-		return suggested > 0 && count < limit();
-	});
-	nonEmptyAbout->toggleOn(std::move(showSuggestions));
 
 	const auto prepareGoodIdsForNewFilters = [=] {
 		const auto &list = session->data().chatsFilters().list();
@@ -696,7 +667,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 				auto inputs = ranges::views::all(
 					row.removePeers
 				) | ranges::views::transform([](not_null<PeerData*> peer) {
-					return MTPInputPeer(peer->input);
+					return MTPInputPeer(peer->input());
 				}) | ranges::to<QVector<MTPInputPeer>>();
 				removeChatlistRequests.push_back(
 					MTPchatlists_LeaveChatlist(
@@ -737,7 +708,6 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			order.insert(order.begin() + position, FilterId(0));
 		}
 		if (next) {
-			// We're not closing the layer yet, so delete removed rows.
 			for (auto i = state->rows.begin(); i != state->rows.end();) {
 				if (i->removed) {
 					const auto button = i->button;
@@ -798,63 +768,430 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 			checkFinished();
 		});
 	};
-	return [copy = state->save] {
-		copy(nullptr, nullptr);
+
+	return wrap;
+}
+
+void SetupRecommendedSection(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container,
+		not_null<FoldersState*> state,
+		HighlightRegistry *highlights,
+		not_null<Ui::VerticalLayout*> filtersWrap) {
+	const auto session = &controller->session();
+	const auto limit = [=] {
+		return Data::PremiumLimits(session).dialogFiltersCurrent();
+	};
+
+	const auto showLimitReached = [=] {
+		const auto removed = ranges::count_if(
+			state->rows,
+			&FilterRow::removed);
+		const auto count = int(state->rows.size() - removed);
+		if (count < limit()) {
+			return false;
+		}
+		controller->show(Box(FiltersLimitBox, session, count));
+		return true;
+	};
+
+	const auto find = [=](not_null<FilterRowButton*> button) {
+		const auto i = ranges::find(state->rows, button, &FilterRow::button);
+		Assert(i != end(state->rows));
+		return &*i;
 	};
+
+	const auto addFilter = [=](const Data::ChatFilter &filter) {
+		const auto button = filtersWrap->add(
+			object_ptr<FilterRowButton>(filtersWrap, session, filter));
+		button->removeRequests(
+		) | rpl::on_next([=] {
+			const auto row = find(button);
+			row->removed = true;
+			button->setRemoved(true);
+		}, button->lifetime());
+		button->restoreRequests(
+		) | rpl::on_next([=] {
+			if (showLimitReached()) {
+				return;
+			}
+			button->setRemoved(false);
+			find(button)->removed = false;
+		}, button->lifetime());
+		button->setClickedCallback([=] {
+			const auto found = find(button);
+			if (found->removed) {
+				return;
+			}
+			const auto doneCallback = [=](const Data::ChatFilter &result) {
+				find(button)->filter = result;
+				button->updateData(result);
+			};
+			const auto saveAnd = [=](
+					const Data::ChatFilter &data,
+					Fn<void(Data::ChatFilter)> next) {
+				doneCallback(data);
+				state->save(button, next);
+			};
+			controller->window().show(Box(
+				EditFilterBox,
+				controller,
+				found->filter,
+				crl::guard(button, doneCallback),
+				crl::guard(button, saveAnd)));
+		});
+		state->rows.push_back({ button, filter });
+		state->count = state->rows.size();
+
+		filtersWrap->resizeToWidth(container->width());
+		return button;
+	};
+
+	Ui::AddSkip(container);
+	const auto nonEmptyAbout = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container))
+	)->setDuration(0);
+	const auto aboutRows = nonEmptyAbout->entity();
+	Ui::AddDivider(aboutRows);
+	Ui::AddSkip(aboutRows);
+	const auto recommendedTitle = Ui::AddSubsectionTitle(
+		aboutRows,
+		tr::lng_filters_recommended());
+	if (highlights) {
+		highlights->push_back({
+			u"folders/add-recommended"_q,
+			{ recommendedTitle.get(), SubsectionTitleHighlight() },
+		});
+	}
+
+	const auto setTagsProgress = [=](float64 value) {
+		for (const auto &row : state->rows) {
+			row.button->setColorIndexProgress(value);
+		}
+	};
+	state->tagsButtonEnabled.events() | rpl::distinct_until_changed(
+	) | rpl::on_next([=](bool value) {
+		state->tagsEnabledAnimation.stop();
+		state->tagsEnabledAnimation.start(
+			setTagsProgress,
+			value ? .0 : 1.,
+			value ? 1. : .0,
+			st::universalDuration);
+	}, container->lifetime());
+	setTagsProgress(session->data().chatsFilters().tagsEnabled());
+
+	rpl::single(rpl::empty) | rpl::then(
+		session->data().chatsFilters().suggestedUpdated()
+	) | rpl::map([=] {
+		return session->data().chatsFilters().suggestedFilters();
+	}) | rpl::filter([=](const std::vector<Data::SuggestedFilter> &list) {
+		return !list.empty();
+	}) | rpl::take(
+		1
+	) | rpl::on_next([=](
+			const std::vector<Data::SuggestedFilter> &suggestions) {
+		for (const auto &suggestion : suggestions) {
+			const auto &filter = suggestion.filter;
+			if (ranges::contains(state->rows, filter, &FilterRow::filter)) {
+				continue;
+			}
+			state->suggested = state->suggested.current() + 1;
+			const auto button = aboutRows->add(object_ptr<FilterRowButton>(
+				aboutRows,
+				session,
+				filter,
+				suggestion.description));
+			button->addRequests(
+				) | rpl::on_next([=] {
+				if (showLimitReached()) {
+					return;
+				}
+				addFilter(filter);
+				state->suggested = state->suggested.current() - 1;
+				delete button;
+			}, button->lifetime());
+		}
+		aboutRows->resizeToWidth(container->width());
+		Ui::AddSkip(aboutRows, st::defaultVerticalListSkip);
+	}, aboutRows->lifetime());
+
+	auto showSuggestions = rpl::combine(
+		state->suggested.value(),
+		state->count.value(),
+		Data::AmPremiumValue(session)
+	) | rpl::map([limit](int suggested, int count, bool) {
+		return suggested > 0 && count < limit();
+	});
+	nonEmptyAbout->toggleOn(std::move(showSuggestions));
 }
 
-void SetupTopContent(
-		not_null<Ui::VerticalLayout*> parent,
-		rpl::producer<> showFinished) {
-	const auto divider = Ui::CreateChild<Ui::BoxContentDivider>(parent.get());
-	const auto verticalLayout = parent->add(
-		object_ptr<Ui::VerticalLayout>(parent.get()));
-
-	auto icon = CreateLottieIcon(
-		verticalLayout,
-		{
-			.name = u"filters"_q,
-			.sizeOverride = {
-				st::settingsFilterIconSize,
-				st::settingsFilterIconSize,
-			},
-		},
-		st::settingsFilterIconPadding);
-	std::move(
-		showFinished
-	) | rpl::start_with_next([animate = std::move(icon.animate)] {
-		animate(anim::repeat::once);
-	}, verticalLayout->lifetime());
-	verticalLayout->add(std::move(icon.widget));
-
-	verticalLayout->add(
-		object_ptr<Ui::CenterWrap<>>(
+void BuildTopContent(SectionBuilder &builder, rpl::producer<> showFinished) {
+	builder.add([showFinished = std::move(showFinished)](
+			const WidgetContext &ctx) mutable {
+		const auto parent = ctx.container;
+		const auto divider = Ui::CreateChild<Ui::BoxContentDivider>(
+			parent.get());
+		const auto verticalLayout = parent->add(
+			object_ptr<Ui::VerticalLayout>(parent.get()));
+
+		auto icon = CreateLottieIcon(
 			verticalLayout,
+			{
+				.name = u"filters"_q,
+				.sizeOverride = {
+					st::settingsFilterIconSize,
+					st::settingsFilterIconSize,
+				},
+			},
+			st::settingsFilterIconPadding);
+		std::move(
+			showFinished
+		) | rpl::on_next([animate = std::move(icon.animate)] {
+			animate(anim::repeat::once);
+		}, verticalLayout->lifetime());
+		verticalLayout->add(std::move(icon.widget));
+
+		verticalLayout->add(
 			object_ptr<Ui::FlatLabel>(
 				verticalLayout,
 				tr::lng_filters_about(),
-				st::settingsFilterDividerLabel)),
-		st::settingsFilterDividerLabelPadding);
+				st::settingsFilterDividerLabel),
+			st::settingsFilterDividerLabelPadding,
+			style::al_top)->setTryMakeSimilarLines(true);
 
-	verticalLayout->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
-		divider->setGeometry(r);
-	}, divider->lifetime());
+		verticalLayout->geometryValue(
+		) | rpl::on_next([=](const QRect &r) {
+			divider->setGeometry(r);
+		}, divider->lifetime());
 
+		return SectionBuilder::WidgetToAdd{};
+	});
 }
 
-} // namespace
+void BuildFoldersListSection(
+		SectionBuilder &builder,
+		not_null<FoldersState*> state) {
+	builder.addSkip();
+	builder.addSubsectionTitle(tr::lng_filters_subtitle());
+
+	builder.add([=](const WidgetContext &ctx) {
+		const auto wrap = SetupFoldersList(
+			ctx.controller,
+			ctx.container,
+			state,
+			ctx.highlights);
+		SetupRecommendedSection(
+			ctx.controller,
+			ctx.container,
+			state,
+			ctx.highlights,
+			wrap);
+		return SectionBuilder::WidgetToAdd{};
+	});
+}
+
+void BuildTagsSection(SectionBuilder &builder, not_null<FoldersState*> state) {
+	if (!builder.session()->premiumPossible()) {
+		return;
+	}
+
+	builder.addDivider();
+	builder.addSkip();
+
+	const auto session = builder.session();
+
+	builder.add([=](const WidgetContext &ctx) {
+		const auto controller = ctx.controller;
+		const auto content = ctx.container;
+
+		struct TagsState final {
+			rpl::event_stream<bool> tagsTurnOff;
+			base::Timer requestTimer;
+			Fn<void()> sendCallback;
+		};
+
+		auto premium = Data::AmPremiumValue(session);
+		const auto tagsButton = content->add(
+			object_ptr<Ui::SettingsButton>(
+				content,
+				tr::lng_filters_enable_tags(),
+				st::settingsButtonNoIconLocked));
+		if (ctx.highlights) {
+			ctx.highlights->push_back({ u"folders/show-tags"_q, { tagsButton } });
+		}
+		const auto tagsState = tagsButton->lifetime().make_state<TagsState>();
+		tagsButton->toggleOn(rpl::merge(
+			rpl::combine(
+				session->data().chatsFilters().tagsEnabledValue(),
+				rpl::duplicate(premium),
+				rpl::mappers::_1 && rpl::mappers::_2),
+			tagsState->tagsTurnOff.events()));
+		rpl::duplicate(premium) | rpl::on_next([=](bool value) {
+			tagsButton->setToggleLocked(!value);
+		}, tagsButton->lifetime());
+
+		const auto send = [=,
+				weak = base::make_weak(tagsButton)](bool checked) {
+			session->data().chatsFilters().requestToggleTags(checked, [=] {
+				if ([[maybe_unused]] const auto strong = weak.get()) {
+					tagsState->tagsTurnOff.fire(!checked);
+				}
+			});
+		};
+
+		tagsButton->toggledValue(
+		) | rpl::filter([=](bool checked) {
+			const auto premium = session->premium();
+			if (checked && !premium) {
+				ShowPremiumPreviewToBuy(controller, PremiumFeature::FilterTags);
+				tagsState->tagsTurnOff.fire(false);
+			}
+			if (!premium) {
+				state->tagsButtonEnabled.fire(false);
+			} else {
+				state->tagsButtonEnabled.fire_copy(checked);
+			}
+			const auto proceed = premium
+				&& (checked != session->data().chatsFilters().tagsEnabled());
+			if (!proceed) {
+				tagsState->requestTimer.cancel();
+			}
+			return proceed;
+		}) | rpl::on_next([=](bool v) {
+			tagsState->sendCallback = [=] { send(v); };
+			tagsState->requestTimer.cancel();
+			tagsState->requestTimer.setCallback([=] { send(v); });
+			tagsState->requestTimer.callOnce(500);
+		}, tagsButton->lifetime());
+
+		tagsButton->lifetime().add([=] {
+			if (tagsState->requestTimer.isActive()) {
+				if (tagsState->sendCallback) {
+					tagsState->sendCallback();
+				}
+			}
+		});
+
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"folders/show-tags"_q,
+			.title = tr::lng_filters_enable_tags(tr::now),
+			.keywords = { u"tags"_q, u"colors"_q, u"premium"_q },
+		};
+	});
+
+	builder.addSkip();
+
+	builder.add([=](const WidgetContext &ctx) {
+		auto premium = Data::AmPremiumValue(session);
+		const auto about = Ui::AddDividerText(
+			ctx.container,
+			rpl::conditional(
+				rpl::duplicate(premium),
+				tr::lng_filters_enable_tags_about(tr::rich),
+				tr::lng_filters_enable_tags_about_premium(
+					lt_link,
+					tr::lng_effect_premium_link() | rpl::map([](QString t) {
+						return tr::link(std::move(t), u"internal:"_q);
+					}),
+					tr::rich)));
+		about->setClickHandlerFilter([=](const auto &...) {
+			Settings::ShowPremium(ctx.controller, u"folder_tags"_q);
+			return true;
+		});
+		return SectionBuilder::WidgetToAdd{};
+	});
+}
+
+void BuildViewSection(SectionBuilder &builder) {
+	builder.add([](const WidgetContext &ctx) {
+		const auto controller = ctx.controller;
+		const auto parent = ctx.container;
+
+		const auto wrap = parent->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				parent,
+				object_ptr<Ui::VerticalLayout>(parent)));
+		wrap->toggleOn(controller->enoughSpaceForFiltersValue());
+		const auto content = wrap->entity();
+
+		Ui::AddDivider(content);
+		Ui::AddSkip(content);
+		const auto title = Ui::AddSubsectionTitle(
+			content,
+			tr::lng_filters_view_subtitle());
+		if (ctx.highlights) {
+			ctx.highlights->push_back({
+				u"folders/tab-view"_q,
+				{ title.get(), SubsectionTitleHighlight() },
+			});
+		}
+
+		const auto group = std::make_shared<Ui::RadioenumGroup<bool>>(
+			Core::App().settings().chatFiltersHorizontal());
+		const auto addSend = [&](bool value, const QString &text) {
+			content->add(
+				object_ptr<Ui::Radioenum<bool>>(
+					content,
+					group,
+					value,
+					text,
+					st::settingsSendType),
+				st::settingsSendTypePadding);
+		};
+		addSend(false, tr::lng_filters_vertical(tr::now));
+		addSend(true, tr::lng_filters_horizontal(tr::now));
+
+		group->setChangedCallback([=](bool value) {
+			Core::App().settings().setChatFiltersHorizontal(value);
+			Core::App().saveSettingsDelayed();
+		});
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"folders/tab-view"_q,
+			.title = tr::lng_filters_view_subtitle(tr::now),
+			.keywords = { u"view"_q, u"layout"_q, u"tabs"_q },
+		};
+	});
+}
+
+class Folders : public Section<Folders> {
+public:
+	Folders(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+	~Folders();
+
+	void showFinished() override;
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+private:
+	void setupContent();
+
+	std::shared_ptr<FoldersState> _state;
+	rpl::event_stream<> _showFinished;
+
+};
 
 Folders::Folders(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: Section(parent) {
-	setupContent(controller);
+: Section(parent, controller)
+, _state(std::make_shared<FoldersState>()) {
+	setupContent();
 }
 
 Folders::~Folders() {
-	if (!Core::Quitting()) {
-		_save();
+	if (!Core::Quitting() && _state->save) {
+		_state->save(nullptr, nullptr);
 	}
 }
 
@@ -862,20 +1199,108 @@ rpl::producer<QString> Folders::title() {
 	return tr::lng_filters_title();
 }
 
-void Folders::setupContent(not_null<Window::SessionController*> controller) {
-	controller->session().data().chatsFilters().requestSuggested();
+void Folders::setupContent() {
+	controller()->session().data().chatsFilters().requestSuggested();
 
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+	const auto state = _state;
+
+	const SectionBuildMethod buildMethod = [state](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		auto &lifetime = container->lifetime();
+		const auto highlights = lifetime.make_state<HighlightRegistry>();
+		const auto isPaused = Window::PausedIn(
+			controller,
+			Window::GifPauseReason::Layer);
+		auto showFinishedDup = rpl::duplicate(showFinished);
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = isPaused,
+			.highlights = highlights,
+		});
 
-	SetupTopContent(content, _showFinished.events());
+		BuildTopContent(builder, std::move(showFinishedDup));
+		BuildFoldersListSection(builder, state.get());
+		BuildTagsSection(builder, state.get());
+		BuildViewSection(builder);
 
-	_save = SetupFoldersContent(controller, content);
+		std::move(showFinished) | rpl::on_next([=] {
+			for (const auto &[id, entry] : *highlights) {
+				if (entry.widget) {
+					controller->checkHighlightControl(
+						id,
+						entry.widget,
+						base::duplicate(entry.args));
+				}
+			}
+		}, lifetime);
+	};
+
+	build(content, buildMethod);
 
 	Ui::ResizeFitChild(this, content);
 }
 
 void Folders::showFinished() {
 	_showFinished.fire({});
+	Section<Folders>::showFinished();
+}
+
+const auto kMeta = BuildHelper({
+	.id = Folders::Id(),
+	.parentId = MainId(),
+	.title = &tr::lng_filters_title,
+	.icon = &st::menuIconShowInFolder,
+}, [](SectionBuilder &builder) {
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"folders/create"_q,
+			.title = tr::lng_filters_create(tr::now),
+			.keywords = { u"folder"_q, u"filter"_q, u"new"_q, u"add"_q },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"folders/add-recommended"_q,
+			.title = tr::lng_filters_recommended(tr::now),
+			.keywords = { u"suggested"_q, u"recommended"_q },
+		};
+	});
+
+	if (builder.session()->premiumPossible()) {
+		builder.add(nullptr, [] {
+			return SearchEntry{
+				.id = u"folders/show-tags"_q,
+				.title = tr::lng_filters_enable_tags(tr::now),
+				.keywords = { u"tags"_q, u"colors"_q, u"premium"_q },
+			};
+		});
+	}
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"folders/tab-view"_q,
+			.title = tr::lng_filters_view_subtitle(tr::now),
+			.keywords = { u"view"_q, u"layout"_q, u"tabs"_q },
+		};
+	});
+});
+
+} // namespace
+
+Type FoldersId() {
+	return Folders::Id();
 }
 
+namespace Builder {
+
+SectionBuildMethod FoldersSection = kMeta.build;
+
+} // namespace Builder
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_folders.h b/Telegram/SourceFiles/settings/sections/settings_folders.h
new file mode 100644
index 00000000000000..8a2984febbf975
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_folders.h
@@ -0,0 +1,20 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "settings/settings_type.h"
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Settings {
+
+[[nodiscard]] Type FoldersId();
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_global_ttl.cpp b/Telegram/SourceFiles/settings/sections/settings_global_ttl.cpp
new file mode 100644
index 00000000000000..db2d1240d4cd7c
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_global_ttl.cpp
@@ -0,0 +1,586 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/sections/settings_global_ttl.h"
+
+#include "api/api_self_destruct.h"
+#include "apiwrap.h"
+#include "boxes/peer_list_controllers.h"
+#include "data/data_changes.h"
+#include "data/data_chat.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "history/history.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_session.h"
+#include "menu/menu_ttl_validator.h"
+#include "settings/sections/settings_privacy_security.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common.h"
+#include "settings/settings_common_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/painter.h"
+#include "ui/vertical_list.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+#include "styles/style_calls.h"
+
+namespace Settings {
+namespace {
+
+using namespace Builder;
+
+class TTLRow : public ChatsListBoxController::Row {
+public:
+	using ChatsListBoxController::Row::Row;
+
+	void paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int availableWidth,
+		int outerWidth,
+		bool selected) override;
+
+};
+
+void TTLRow::paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int availableWidth,
+		int outerWidth,
+		bool selected) {
+	auto icon = history()->peer->messagesTTL()
+		? &st::settingsTTLChatsOn
+		: &st::settingsTTLChatsOff;
+	icon->paint(
+		p,
+		x + st::callArrowPosition.x(),
+		y + st::callArrowPosition.y(),
+		outerWidth);
+	auto shift = st::callArrowPosition.x()
+		+ icon->width()
+		+ st::callArrowSkip;
+	x += shift;
+	availableWidth -= shift;
+
+	PeerListRow::paintStatusText(
+		p,
+		st,
+		x,
+		y,
+		availableWidth,
+		outerWidth,
+		selected);
+}
+
+class TTLChatsBoxController : public ChatsListBoxController {
+public:
+
+	TTLChatsBoxController(not_null<::Main::Session*> session);
+
+	::Main::Session &session() const override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+
+protected:
+	void prepareViewHook() override;
+	std::unique_ptr<Row> createRow(not_null<History*> history) override;
+
+private:
+	const not_null<::Main::Session*> _session;
+
+	rpl::lifetime _lifetime;
+
+};
+
+TTLChatsBoxController::TTLChatsBoxController(not_null<::Main::Session*> session)
+: ChatsListBoxController(session)
+, _session(session) {
+}
+
+::Main::Session &TTLChatsBoxController::session() const {
+	return *_session;
+}
+
+void TTLChatsBoxController::prepareViewHook() {
+	delegate()->peerListSetTitle(tr::lng_settings_ttl_title());
+}
+
+void TTLChatsBoxController::rowClicked(not_null<PeerListRow*> row) {
+	if (!TTLMenu::TTLValidator(nullptr, row->peer()).can()) {
+		delegate()->peerListUiShow()->showToast(
+			{ tr::lng_settings_ttl_select_chats_sorry(tr::now) });
+		return;
+	}
+	delegate()->peerListSetRowChecked(row, !row->checked());
+}
+
+std::unique_ptr<TTLChatsBoxController::Row> TTLChatsBoxController::createRow(
+		not_null<History*> history) {
+	const auto peer = history->peer;
+	if (peer->isSelf() || peer->isRepliesChat() || peer->isVerifyCodes()) {
+		return nullptr;
+	} else if (peer->isChat() && peer->asChat()->amIn()) {
+	} else if (peer->isMegagroup()) {
+	} else if (!TTLMenu::TTLValidator(nullptr, peer).can()) {
+		return nullptr;
+	}
+	if (session().data().contactsNoChatsList()->contains({ history })) {
+		return nullptr;
+	}
+	auto result = std::make_unique<TTLRow>(history);
+	const auto applyStatus = [=, raw = result.get()] {
+		const auto ttl = peer->messagesTTL();
+		raw->setCustomStatus(
+			ttl
+				? tr::lng_settings_ttl_select_chats_status(
+					tr::now,
+					lt_after_duration,
+					Ui::FormatTTLAfter(ttl))
+				: tr::lng_settings_ttl_select_chats_status_disabled(tr::now),
+			ttl);
+	};
+	applyStatus();
+	return result;
+}
+
+struct GlobalTTLState {
+	std::shared_ptr<Ui::RadiobuttonGroup> group;
+	std::shared_ptr<::Main::SessionShow> show;
+	not_null<Ui::VerticalLayout*> buttons;
+	QPointer<Ui::SettingsButton> customButton;
+	rpl::lifetime requestLifetime;
+};
+
+void BuildTopContent(SectionBuilder &builder, rpl::producer<> showFinished) {
+	builder.add([showFinished = std::move(showFinished)](
+			const WidgetContext &ctx) mutable {
+		const auto parent = ctx.container;
+		const auto divider = Ui::CreateChild<Ui::BoxContentDivider>(
+			parent.get());
+		const auto verticalLayout = parent->add(
+			object_ptr<Ui::VerticalLayout>(parent.get()));
+
+		auto icon = CreateLottieIcon(
+			verticalLayout,
+			{
+				.name = u"ttl"_q,
+				.sizeOverride = {
+					st::settingsCloudPasswordIconSize,
+					st::settingsCloudPasswordIconSize,
+				},
+			},
+			st::settingsFilterIconPadding);
+		std::move(
+			showFinished
+		) | rpl::on_next([animate = std::move(icon.animate)] {
+			animate(anim::repeat::loop);
+		}, verticalLayout->lifetime());
+		verticalLayout->add(std::move(icon.widget));
+
+		verticalLayout->geometryValue(
+		) | rpl::on_next([=](const QRect &r) {
+			divider->setGeometry(r);
+		}, divider->lifetime());
+
+		return SectionBuilder::WidgetToAdd{};
+	});
+}
+
+void RebuildButtons(
+		not_null<GlobalTTLState*> state,
+		not_null<Window::SessionController*> controller,
+		TimeId currentTTL) {
+	auto ttls = std::vector<TimeId>{
+		0,
+		3600 * 24,
+		3600 * 24 * 7,
+		3600 * 24 * 31,
+	};
+	if (!ranges::contains(ttls, currentTTL)) {
+		ttls.push_back(currentTTL);
+		ranges::sort(ttls);
+	}
+	if (state->buttons->count() > int(ttls.size())) {
+		return;
+	}
+
+	const auto request = [=](TimeId ttl) {
+		controller->session().api().selfDestruct().updateDefaultHistoryTTL(ttl);
+	};
+
+	const auto showSure = [=](TimeId ttl, bool rebuild) {
+		const auto ttlText = Ui::FormatTTLAfter(ttl);
+		const auto confirmed = [=] {
+			if (rebuild) {
+				RebuildButtons(state, controller, ttl);
+			}
+			state->group->setChangedCallback([=](int value) {
+				state->group->setChangedCallback(nullptr);
+				state->show->showToast(tr::lng_settings_ttl_after_toast(
+					tr::now,
+					lt_after_duration,
+					{ .text = ttlText },
+					tr::marked));
+				state->show->hideLayer();
+			});
+			request(ttl);
+		};
+		if (state->group->value()) {
+			confirmed();
+			return;
+		}
+		state->show->showBox(Ui::MakeConfirmBox({
+			.text = tr::lng_settings_ttl_after_sure(
+				lt_after_duration,
+				rpl::single(ttlText)),
+			.confirmed = confirmed,
+			.cancelled = [=](Fn<void()> &&close) {
+				state->group->setChangedCallback(nullptr);
+				close();
+			},
+			.confirmText = tr::lng_sure_enable(),
+		}));
+	};
+
+	state->buttons->clear();
+	for (const auto &ttl : ttls) {
+		const auto ttlText = Ui::FormatTTLAfter(ttl);
+		const auto button = state->buttons->add(object_ptr<Ui::SettingsButton>(
+			state->buttons,
+			(!ttl)
+				? tr::lng_settings_ttl_after_off()
+				: tr::lng_settings_ttl_after(
+					lt_after_duration,
+					rpl::single(ttlText)),
+			st::settingsButtonNoIcon));
+		button->setClickedCallback([=] {
+			if (state->group->current() == ttl) {
+				return;
+			}
+			if (!ttl) {
+				state->group->setChangedCallback(nullptr);
+				request(ttl);
+				return;
+			}
+			showSure(ttl, false);
+		});
+		const auto radio = Ui::CreateChild<Ui::Radiobutton>(
+			button,
+			state->group,
+			ttl,
+			QString());
+		radio->setAttribute(Qt::WA_TransparentForMouseEvents);
+		radio->show();
+		const auto padding = button->st().padding;
+		button->sizeValue(
+		) | rpl::on_next([=](QSize s) {
+			radio->moveToLeft(
+				s.width() - radio->checkRect().width() - padding.left(),
+				radio->checkRect().top());
+		}, radio->lifetime());
+	}
+	state->buttons->resizeToWidth(state->buttons->width());
+}
+
+void BuildTTLOptions(
+		SectionBuilder &builder,
+		not_null<GlobalTTLState*> state) {
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"auto-delete/period"_q,
+		.title = tr::lng_settings_ttl_after_subtitle(),
+		.keywords = { u"ttl"_q, u"auto-delete"_q, u"timer"_q },
+	});
+
+	builder.add([=](const WidgetContext &ctx) {
+		const auto controller = ctx.controller;
+		ctx.container->add(
+			object_ptr<Ui::VerticalLayout>::fromRaw(state->buttons.get()));
+
+		const auto &apiTTL = controller->session().api().selfDestruct();
+		const auto rebuild = [=](TimeId period) {
+			RebuildButtons(state, controller, period);
+			state->group->setValue(period);
+		};
+		rebuild(apiTTL.periodDefaultHistoryTTLCurrent());
+		apiTTL.periodDefaultHistoryTTL(
+		) | rpl::on_next(rebuild, ctx.container->lifetime());
+
+		return SectionBuilder::WidgetToAdd{};
+	});
+}
+
+void BuildCustomButton(
+		SectionBuilder &builder,
+		not_null<GlobalTTLState*> state) {
+	builder.add([=](const WidgetContext &ctx) {
+		const auto controller = ctx.controller;
+		const auto show = controller->uiShow();
+
+		const auto showSure = [=](TimeId ttl, bool rebuild) {
+			const auto ttlText = Ui::FormatTTLAfter(ttl);
+			const auto confirmed = [=] {
+				if (rebuild) {
+					RebuildButtons(state, controller, ttl);
+				}
+				state->group->setChangedCallback([=](int value) {
+					state->group->setChangedCallback(nullptr);
+					state->show->showToast(tr::lng_settings_ttl_after_toast(
+						tr::now,
+						lt_after_duration,
+						{ .text = ttlText },
+						tr::marked));
+					state->show->hideLayer();
+				});
+				controller->session().api().selfDestruct().updateDefaultHistoryTTL(ttl);
+			};
+			if (state->group->value()) {
+				confirmed();
+				return;
+			}
+			state->show->showBox(Ui::MakeConfirmBox({
+				.text = tr::lng_settings_ttl_after_sure(
+					lt_after_duration,
+					rpl::single(ttlText)),
+				.confirmed = confirmed,
+				.cancelled = [=](Fn<void()> &&close) {
+					state->group->setChangedCallback(nullptr);
+					close();
+				},
+				.confirmText = tr::lng_sure_enable(),
+			}));
+		};
+
+		state->customButton = ctx.container->add(object_ptr<Ui::SettingsButton>(
+			ctx.container,
+			tr::lng_settings_ttl_after_custom(),
+			st::settingsButtonNoIcon));
+		state->customButton->setClickedCallback([=] {
+			show->showBox(Box(TTLMenu::TTLBox, TTLMenu::Args{
+				.show = show,
+				.startTtl = state->group->current(),
+				.callback = [=](TimeId ttl, Fn<void()>) { showSure(ttl, true); },
+				.hideDisable = true,
+			}));
+		});
+		if (ctx.highlights) {
+			ctx.highlights->push_back({
+				u"auto-delete/set-custom"_q,
+				{ state->customButton.data(), { .rippleShape = true } },
+			});
+		}
+
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"auto-delete/set-custom"_q,
+			.title = tr::lng_settings_ttl_after_custom(tr::now),
+			.keywords = { u"custom"_q, u"ttl"_q, u"period"_q },
+		};
+	});
+}
+
+void BuildApplyToExisting(
+		SectionBuilder &builder,
+		not_null<GlobalTTLState*> state) {
+	builder.addSkip();
+
+	builder.add([=](const WidgetContext &ctx) {
+		const auto controller = ctx.controller;
+		const auto session = &controller->session();
+
+		auto footer = object_ptr<Ui::FlatLabel>(
+			ctx.container,
+			tr::lng_settings_ttl_after_about(
+				lt_link,
+				tr::lng_settings_ttl_after_about_link(
+				) | rpl::map([](QString s) { return tr::link(s, 1); }),
+				tr::marked),
+			st::boxDividerLabel);
+		footer->setLink(1, std::make_shared<LambdaClickHandler>([=] {
+			auto boxController = std::make_unique<TTLChatsBoxController>(session);
+			auto initBox = [=, ctrl = boxController.get()](
+					not_null<PeerListBox*> box) {
+				box->addButton(tr::lng_settings_apply(), [=] {
+					const auto &peers = box->collectSelectedRows();
+					if (peers.empty()) {
+						return;
+					}
+					const auto &apiTTL = session->api().selfDestruct();
+					const auto ttl = apiTTL.periodDefaultHistoryTTLCurrent();
+					for (const auto &peer : peers) {
+						peer->session().api().request(MTPmessages_SetHistoryTTL(
+							peer->input(),
+							MTP_int(ttl)
+						)).done([=](const MTPUpdates &result) {
+							peer->session().api().applyUpdates(result);
+						}).send();
+					}
+					box->showToast(ttl
+						? tr::lng_settings_ttl_select_chats_toast(
+							tr::now,
+							lt_count,
+							peers.size(),
+							lt_duration,
+							{ .text = Ui::FormatTTL(ttl) },
+							tr::marked)
+						: tr::lng_settings_ttl_select_chats_disabled_toast(
+							tr::now,
+							lt_count,
+							peers.size(),
+							tr::marked));
+					box->closeBox();
+				});
+				box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+			};
+			controller->show(
+				Box<PeerListBox>(std::move(boxController), std::move(initBox)));
+		}));
+		ctx.container->add(object_ptr<Ui::DividerLabel>(
+			ctx.container,
+			std::move(footer),
+			st::defaultBoxDividerLabelPadding));
+
+		return SectionBuilder::WidgetToAdd{};
+	});
+}
+
+class GlobalTTL : public Section<GlobalTTL> {
+public:
+	GlobalTTL(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+	void showFinished() override;
+
+private:
+	void setupContent();
+
+	std::shared_ptr<GlobalTTLState> _state;
+	rpl::event_stream<> _showFinished;
+
+};
+
+GlobalTTL::GlobalTTL(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: Section(parent, controller)
+, _state(std::make_shared<GlobalTTLState>(GlobalTTLState{
+	.group = std::make_shared<Ui::RadiobuttonGroup>(0),
+	.show = controller->uiShow(),
+	.buttons = Ui::CreateChild<Ui::VerticalLayout>(this),
+})) {
+	setupContent();
+}
+
+rpl::producer<QString> GlobalTTL::title() {
+	return tr::lng_settings_ttl_title();
+}
+
+void GlobalTTL::setupContent() {
+	setFocusPolicy(Qt::StrongFocus);
+	setFocus();
+
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+	const auto state = _state;
+
+	const SectionBuildMethod buildMethod = [state](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		auto &lifetime = container->lifetime();
+		const auto highlights = lifetime.make_state<HighlightRegistry>();
+		const auto isPaused = Window::PausedIn(
+			controller,
+			Window::GifPauseReason::Layer);
+		auto showFinishedDup = rpl::duplicate(showFinished);
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = isPaused,
+			.highlights = highlights,
+		});
+
+		BuildTopContent(builder, std::move(showFinishedDup));
+		BuildTTLOptions(builder, state.get());
+		BuildCustomButton(builder, state.get());
+		BuildApplyToExisting(builder, state.get());
+
+		std::move(showFinished) | rpl::on_next([=] {
+			for (const auto &[id, entry] : *highlights) {
+				if (entry.widget) {
+					controller->checkHighlightControl(
+						id,
+						entry.widget,
+						base::duplicate(entry.args));
+				}
+			}
+		}, lifetime);
+	};
+
+	build(content, buildMethod);
+
+	Ui::ResizeFitChild(this, content);
+}
+
+void GlobalTTL::showFinished() {
+	_showFinished.fire({});
+	Section<GlobalTTL>::showFinished();
+}
+
+const auto kMeta = BuildHelper({
+	.id = GlobalTTL::Id(),
+	.parentId = PrivacySecurityId(),
+	.title = &tr::lng_settings_ttl_title,
+	.icon = &st::menuIconTTL,
+}, [](SectionBuilder &builder) {
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"auto-delete/period"_q,
+			.title = tr::lng_settings_ttl_after_subtitle(tr::now),
+			.keywords = { u"ttl"_q, u"auto-delete"_q, u"timer"_q },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"auto-delete/set-custom"_q,
+			.title = tr::lng_settings_ttl_after_custom(tr::now),
+			.keywords = { u"custom"_q, u"ttl"_q, u"period"_q },
+		};
+	});
+});
+
+} // namespace
+
+Type GlobalTTLId() {
+	return GlobalTTL::Id();
+}
+
+namespace Builder {
+
+SectionBuildMethod GlobalTTLSection = kMeta.build;
+
+} // namespace Builder
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_global_ttl.h b/Telegram/SourceFiles/settings/sections/settings_global_ttl.h
similarity index 77%
rename from Telegram/SourceFiles/settings/settings_global_ttl.h
rename to Telegram/SourceFiles/settings/sections/settings_global_ttl.h
index a97c7491b6787b..6484c81b829bb5 100644
--- a/Telegram/SourceFiles/settings/settings_global_ttl.h
+++ b/Telegram/SourceFiles/settings/sections/settings_global_ttl.h
@@ -9,9 +9,12 @@ For license and copyright information please follow this link:
 
 #include "settings/settings_type.h"
 
+namespace Window {
+class SessionController;
+} // namespace Window
+
 namespace Settings {
 
-Type GlobalTTLId();
+[[nodiscard]] Type GlobalTTLId();
 
 } // namespace Settings
-
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/sections/settings_information.cpp
similarity index 63%
rename from Telegram/SourceFiles/settings/settings_information.cpp
rename to Telegram/SourceFiles/settings/sections/settings_information.cpp
index 97fe68bd94ae2b..cbb785d5b897d9 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/sections/settings_information.cpp
@@ -5,8 +5,12 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_information.h"
+#include "settings/sections/settings_information.h"
 
+#include "settings/sections/settings_main.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common_session.h"
+#include "settings/business/settings_chatbots.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/vertical_layout_reorder.h"
 #include "ui/wrap/padding_wrap.h"
@@ -19,6 +23,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/new_badges.h"
 #include "ui/text/text_utilities.h"
 #include "ui/delayed_activation.h"
 #include "ui/painter.h"
@@ -32,6 +37,8 @@ For license and copyright information please follow this link:
 #include "boxes/add_contact_box.h"
 #include "boxes/premium_limits_box.h"
 #include "boxes/username_box.h"
+#include "boxes/peers/edit_peer_color_box.h"
+#include "data/business/data_business_chatbots.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_peer_values.h"
@@ -40,6 +47,7 @@ For license and copyright information please follow this link:
 #include "data/data_premium_limits.h"
 #include "info/profile/info_profile_values.h"
 #include "info/profile/info_profile_badge.h"
+#include "info/profile/info_profile_phone_menu.h"
 #include "lang/lang_keys.h"
 #include "main/main_account.h"
 #include "main/main_session.h"
@@ -69,6 +77,22 @@ For license and copyright information please follow this link:
 namespace Settings {
 namespace {
 
+using namespace Builder;
+
+struct InformationHighlightTargets {
+	QPointer<Ui::RpWidget> photo;
+	QPointer<Ui::RpWidget> uploadPhoto;
+	QPointer<Ui::RpWidget> bio;
+	QPointer<Ui::RpWidget> colorButton;
+	QPointer<Ui::RpWidget> channelButton;
+	QPointer<Ui::RpWidget> addAccount;
+	QPointer<Ui::RpWidget> name;
+	QPointer<Ui::RpWidget> phone;
+	QPointer<Ui::RpWidget> username;
+	QPointer<Ui::RpWidget> birthday;
+	QPointer<Ui::RpWidget> chatAutomation;
+};
+
 constexpr auto kSaveBioTimeout = 1000;
 constexpr auto kPlayStatusLimit = 2;
 
@@ -77,7 +101,7 @@ class ComposedBadge final : public Ui::RpWidget {
 	ComposedBadge(
 		not_null<Ui::RpWidget*> parent,
 		not_null<Ui::SettingsButton*> button,
-		not_null<Main::Session*> session,
+		not_null<::Main::Session*> session,
 		rpl::producer<QString> &&text,
 		bool hasUnread,
 		Fn<bool()> animationPaused);
@@ -95,7 +119,7 @@ class ComposedBadge final : public Ui::RpWidget {
 ComposedBadge::ComposedBadge(
 	not_null<Ui::RpWidget*> parent,
 	not_null<Ui::SettingsButton*> button,
-	not_null<Main::Session*> session,
+	not_null<::Main::Session*> session,
 	rpl::producer<QString> &&text,
 	bool hasUnread,
 	Fn<bool()> animationPaused)
@@ -104,21 +128,22 @@ ComposedBadge::ComposedBadge(
 , _badge(
 		this,
 		st::settingsInfoPeerBadge,
-		session->user(),
+		session,
+		Info::Profile::BadgeContentForPeer(session->user()),
 		nullptr,
 		std::move(animationPaused),
 		kPlayStatusLimit,
 		Info::Profile::BadgeType::Premium) {
 	if (hasUnread) {
-		_unread = CreateUnread(this, rpl::single(
+		_unread = Badge::CreateUnread(this, rpl::single(
 			rpl::empty
 		) | rpl::then(
 			session->data().unreadBadgeChanges()
 		) | rpl::map([=] {
 			auto &owner = session->data();
 			return Badge::UnreadBadge{
-				owner.unreadBadge(),
-				owner.unreadBadgeMuted(),
+				owner.unreadWithMentionsBadge(),
+				owner.unreadWithMentionsBadgeMuted(),
 			};
 		}));
 		rpl::combine(
@@ -130,7 +155,7 @@ ComposedBadge::ComposedBadge(
 	}
 
 	_badge.updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto button = _badge.widget()) {
 			button->widthValue(
 			) | rpl::start_to_stream(_premiumWidth, button->lifetime());
@@ -149,7 +174,7 @@ ComposedBadge::ComposedBadge(
 			: 0),
 		std::move(textWidth),
 		button->sizeValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int unreadWidth,
 			int premiumWidth,
 			int textWidth,
@@ -189,6 +214,7 @@ class AccountsList final {
 		not_null<Window::SessionController*> controller);
 
 	[[nodiscard]] rpl::producer<> closeRequests() const;
+	[[nodiscard]] Ui::RpWidget *addAccountButton() const;
 
 private:
 	void setup();
@@ -202,7 +228,7 @@ class AccountsList final {
 
 	Ui::SlideWrap<Ui::SettingsButton> *_addAccount = nullptr;
 	base::flat_map<
-		not_null<Main::Account*>,
+		not_null<::Main::Account*>,
 		base::unique_qptr<Ui::SettingsButton>> _watched;
 
 	base::unique_qptr<Ui::PopupMenu> _contextMenu;
@@ -223,15 +249,15 @@ class AccountsList final {
 		const auto push = [=] {
 			const auto now = base::unixtime::now();
 			consumer.put_next(Data::OnlineTextActive(user, now)
-				? Ui::Text::Link(Data::OnlineText(user, now))
-				: Ui::Text::WithEntities(Data::OnlineText(user, now)));
+				? tr::link(Data::OnlineText(user, now))
+				: tr::marked(Data::OnlineText(user, now)));
 			timer->callOnce(Data::OnlineChangeTimeout(user, now));
 		};
 		timer->setCallback(push);
 		user->session().changes().peerFlagsValue(
 			user,
 			Data::PeerUpdate::Flag::OnlineStatus
-		) | rpl::start_with_next(push, lifetime);
+		) | rpl::on_next(push, lifetime);
 		return lifetime;
 	};
 }
@@ -239,7 +265,8 @@ class AccountsList final {
 void SetupPhoto(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller,
-		not_null<UserData*> self) {
+		not_null<UserData*> self,
+		InformationHighlightTargets *targets) {
 	const auto wrap = container->add(object_ptr<Ui::FixedHeightWidget>(
 		container,
 		st::settingsInfoPhotoHeight));
@@ -251,12 +278,17 @@ void SetupPhoto(
 		Ui::UserpicButton::Source::PeerPhoto,
 		st::settingsInfoPhoto);
 	const auto upload = CreateUploadSubButton(wrap, controller);
+	if (targets) {
+		targets->photo = photo;
+		targets->uploadPhoto = upload;
+	}
 
 	upload->chosenImages(
-	) | rpl::start_with_next([=](Ui::UserpicButton::ChosenImage &&chosen) {
+	) | rpl::on_next([=](Ui::UserpicButton::ChosenImage &&chosen) {
 		auto &image = chosen.image;
 		UpdatePhotoLocally(self, image);
 		photo->showCustom(base::duplicate(image));
+		const auto isMarkup = (chosen.markup.documentId != 0);
 		self->session().api().peerPhoto().upload(
 			self,
 			{
@@ -264,6 +296,9 @@ void SetupPhoto(
 				chosen.markup.documentId,
 				chosen.markup.colors,
 			});
+		if (!isMarkup) {
+			photo->showUploadProgress();
+		}
 	}, upload->lifetime());
 
 	const auto name = Ui::CreateChild<Ui::FlatLabel>(
@@ -280,7 +315,7 @@ void SetupPhoto(
 		photo->widthValue(),
 		Info::Profile::NameValue(self),
 		status->widthValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int max,
 			int photoWidth,
 			const QString&,
@@ -308,59 +343,81 @@ void SetupPhoto(
 void ShowMenu(
 		QWidget *parent,
 		const QString &copyButton,
-		const QString &text) {
-	const auto menu = Ui::CreateChild<Ui::PopupMenu>(parent);
+		const QString &text,
+		const style::icon *copyIcon = nullptr,
+		Fn<void(not_null<Ui::PopupMenu*>)> extend = nullptr) {
+	const auto menu = Ui::CreateChild<Ui::PopupMenu>(
+		parent,
+		extend ? st::popupMenuWithIcons : st::defaultPopupMenu);
 
 	menu->addAction(copyButton, [=] {
 		QGuiApplication::clipboard()->setText(text);
-	});
+	}, copyIcon);
+	if (extend) {
+		extend(menu);
+	}
 	menu->popup(QCursor::pos());
 }
 
-void AddRow(
+not_null<Ui::SettingsButton*> AddRow(
 		not_null<Ui::VerticalLayout*> container,
 		rpl::producer<QString> label,
 		rpl::producer<TextWithEntities> value,
 		const QString &copyButton,
 		Fn<void()> edit,
-		IconDescriptor &&descriptor) {
-	const auto wrap = AddButtonWithLabel(
-		container,
-		std::move(label),
-		std::move(value) | rpl::map([](const auto &t) { return t.text; }),
-		st::settingsButton,
-		std::move(descriptor));
+		IconDescriptor &&descriptor,
+		bool markedValue = false,
+		Fn<void(not_null<Ui::PopupMenu*>)> menuExtender = nullptr,
+		const style::icon *copyIcon = nullptr) {
+	const auto wrap = markedValue
+		? AddButtonWithIcon(
+			container,
+			rpl::duplicate(label),
+			st::settingsButton,
+			std::move(descriptor))
+		: AddButtonWithLabel(
+			container,
+			rpl::duplicate(label),
+			rpl::duplicate(value) | rpl::map([](const auto &t) {
+				return t.text;
+			}),
+			st::settingsButton,
+			std::move(descriptor));
+	if (markedValue) {
+		CreateRightLabel(
+			wrap,
+			rpl::duplicate(value),
+			st::settingsButton,
+			rpl::duplicate(label));
+	}
 	const auto forcopy = Ui::CreateChild<QString>(wrap.get());
 	wrap->setAcceptBoth();
 	wrap->clicks(
 	) | rpl::filter([=] {
 		return !wrap->isDisabled();
-	}) | rpl::start_with_next([=](Qt::MouseButton button) {
+	}) | rpl::on_next([=](Qt::MouseButton button) {
 		if (button == Qt::LeftButton) {
 			edit();
 		} else if (!forcopy->isEmpty()) {
-			ShowMenu(wrap, copyButton, *forcopy);
+			ShowMenu(wrap, copyButton, *forcopy, copyIcon, menuExtender);
 		}
 	}, wrap->lifetime());
 
-	auto existing = base::duplicate(
-		value
-	) | rpl::map([](const TextWithEntities &text) {
-		return text.entities.isEmpty();
-	});
-	base::duplicate(
+	std::move(
 		value
-	) | rpl::filter([](const TextWithEntities &text) {
-		return text.entities.isEmpty();
-	}) | rpl::start_with_next([=](const TextWithEntities &text) {
+	) | rpl::filter([=](const TextWithEntities &text) {
+		return markedValue || text.entities.isEmpty();
+	}) | rpl::on_next([=](const TextWithEntities &text) {
 		*forcopy = text.text;
 	}, wrap->lifetime());
+	return wrap;
 }
 
 void SetupBirthday(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller,
-		not_null<UserData*> self) {
+		not_null<UserData*> self,
+		InformationHighlightTargets *targets) {
 	const auto session = &self->session();
 
 	Ui::AddSkip(container);
@@ -379,13 +436,16 @@ void SetupBirthday(
 				.sessionWindow = base::make_weak(controller),
 			}));
 	};
-	AddRow(
+	const auto birthdayButton = AddRow(
 		container,
 		tr::lng_settings_birthday_label(),
 		std::move(value),
 		tr::lng_mediaview_copy(tr::now),
 		edit,
 		{ &st::menuIconGiftPremium });
+	if (targets) {
+		targets->birthday = birthdayButton;
+	}
 
 	const auto key = Api::UserPrivacy::Key::Birthday;
 	session->api().userPrivacy().reload(key);
@@ -404,19 +464,83 @@ void SetupBirthday(
 		tr::lng_settings_birthday_contacts(
 			lt_link,
 			tr::lng_settings_birthday_contacts_link(
-			) | Ui::Text::ToLink(u"internal:edit_privacy_birthday"_q),
-			Ui::Text::WithEntities),
+				tr::url(u"internal:edit_privacy_birthday"_q)),
+			tr::marked),
 		tr::lng_settings_birthday_about(
 			lt_link,
 			tr::lng_settings_birthday_about_link(
-			) | Ui::Text::ToLink(u"internal:edit_privacy_birthday"_q),
-			Ui::Text::WithEntities)));
+				tr::url(u"internal:edit_privacy_birthday"_q)),
+			tr::marked)));
+}
+
+void SetupChatAutomation(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Window::SessionController*> controller,
+		not_null<UserData*> self,
+		InformationHighlightTargets *targets) {
+	const auto session = &self->session();
+	session->data().chatbots().preload();
+
+	auto label = session->data().chatbots().value(
+	) | rpl::map([](const Data::ChatbotsSettings &value) {
+		if (!value.bot) {
+			return tr::lng_settings_chat_automation_off(tr::now);
+		}
+		const auto username = value.bot->username();
+		return username.isEmpty()
+			? value.bot->name()
+			: ('@' + username);
+	});
+
+	const auto &st = st::settingsButton;
+	auto title = tr::lng_settings_chat_automation_label();
+	const auto button = AddButtonWithLabel(
+		container,
+		rpl::duplicate(title),
+		std::move(label),
+		st,
+		{ &st::settingsIconChatAutomation });
+
+	button->setClickedCallback([=] {
+		controller->showSettings(Settings::ChatbotsId());
+	});
+
+	{
+		const auto badge = Ui::NewBadge::CreateNewBadge(
+			button,
+			tr::lng_premium_summary_new_badge()).get();
+		rpl::combine(
+			std::move(title),
+			button->widthValue()
+		) | rpl::on_next([=, &st](
+				const QString &text,
+				int width) {
+			const auto space = st.style.font->spacew;
+			const auto left = st.padding.left()
+				+ st.style.font->width(text)
+				+ space;
+			const auto available = width - left - st.padding.right();
+			badge->setVisible(available >= badge->width());
+			if (!badge->isHidden()) {
+				const auto top = st.padding.top()
+					+ st.style.font->ascent
+					- st::settingsPremiumNewBadge.style.font->ascent
+					- st::settingsPremiumNewBadgePadding.top();
+				badge->moveToLeft(left, top, width);
+			}
+		}, badge->lifetime());
+	}
+
+	if (targets) {
+		targets->chatAutomation = button;
+	}
 }
 
 void SetupPersonalChannel(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller,
-		not_null<UserData*> self) {
+		not_null<UserData*> self,
+		InformationHighlightTargets *targets) {
 	Ui::AddSkip(container);
 
 	auto value = rpl::combine(
@@ -432,7 +556,7 @@ void SetupPersonalChannel(
 				.sessionWindow = base::make_weak(controller),
 			}));
 	};
-	AddRow(
+	const auto channelButton = AddRow(
 		container,
 		tr::lng_settings_channel_label(),
 		std::move(value),
@@ -440,6 +564,18 @@ void SetupPersonalChannel(
 		edit,
 		{ &st::menuIconChannel });
 
+	SetupChatAutomation(container, controller, self, targets);
+
+	const auto colorButton = AddPeerColorButton(
+		container,
+		controller->uiShow(),
+		self,
+		st::settingsColorButton);
+	if (targets) {
+		targets->channelButton = channelButton;
+		targets->colorButton = colorButton;
+	}
+
 	Ui::AddSkip(container);
 	Ui::AddDivider(container);
 }
@@ -447,31 +583,51 @@ void SetupPersonalChannel(
 void SetupRows(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller,
-		not_null<UserData*> self) {
+		not_null<UserData*> self,
+		InformationHighlightTargets *targets) {
 	const auto session = &self->session();
 
 	Ui::AddSkip(container);
 
-	AddRow(
+	const auto showEditName = [=] {
+		if (controller->showFrozenError()) {
+			return;
+		}
+		controller->show(Box<EditNameBox>(self));
+	};
+	const auto nameButton = AddRow(
 		container,
 		tr::lng_settings_name_label(),
-		Info::Profile::NameValue(self) | Ui::Text::ToWithEntities(),
+		Info::Profile::NameValue(self) | rpl::map(tr::marked),
 		tr::lng_profile_copy_fullname(tr::now),
-		[=] { controller->show(Box<EditNameBox>(self)); },
+		showEditName,
 		{ &st::menuIconProfile });
+	if (targets) {
+		targets->name = nameButton;
+	}
 
 	const auto showChangePhone = [=] {
 		controller->show(
 			Ui::MakeInformBox(tr::lng_change_phone_error()));
 		controller->window().activate();
 	};
-	AddRow(
+	const auto phoneButton = AddRow(
 		container,
 		tr::lng_settings_phone_label(),
-		Info::Profile::PhoneValue(self),
+		Info::Profile::PhoneWithSpoilerValue(
+			self,
+			Info::Profile::PhoneValue(self)),
 		tr::lng_profile_copy_phone(tr::now),
 		showChangePhone,
-		{ &st::menuIconPhone });
+		{ &st::menuIconPhone },
+		true,
+		[=](not_null<Ui::PopupMenu*> menu) {
+			Info::Profile::AddPhoneSpoilerMenu(menu, self);
+		},
+		&st::menuIconCopy);
+	if (targets) {
+		targets->phone = phoneButton;
+	}
 
 	auto username = Info::Profile::UsernameValue(self);
 	auto empty = base::duplicate(
@@ -485,7 +641,7 @@ void SetupRows(
 	) | rpl::map([](const QString &label, bool empty) {
 		return empty ? "t.me/username" : label;
 	});
-	auto value = rpl::combine(
+	auto usernameValue = rpl::combine(
 		std::move(username),
 		tr::lng_settings_username_add()
 	) | rpl::map([](const TextWithEntities &username, const QString &add) {
@@ -501,20 +657,26 @@ void SetupRows(
 		return result;
 	});
 	session->api().usernames().requestToCache(session->user());
-	AddRow(
+	const auto usernameButton = AddRow(
 		container,
 		std::move(label),
-		std::move(value),
+		std::move(usernameValue),
 		tr::lng_context_copy_mention(tr::now),
 		[=] {
+			if (controller->showFrozenError()) {
+				return;
+			}
 			const auto box = controller->show(
 				Box(UsernamesBox, session->user()));
 			box->boxClosing(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				session->api().usernames().requestToCache(session->user());
 			}, box->lifetime());
 		},
 		{ &st::menuIconUsername });
+	if (targets) {
+		targets->username = usernameButton;
+	}
 
 	Ui::AddSkip(container);
 	Ui::AddDividerText(container, tr::lng_settings_username_about());
@@ -522,7 +684,8 @@ void SetupRows(
 
 void SetupBio(
 		not_null<Ui::VerticalLayout*> container,
-		not_null<UserData*> self) {
+		not_null<UserData*> self,
+		InformationHighlightTargets *targets) {
 	const auto limits = Data::PremiumLimits(&self->session());
 	const auto defaultLimit = limits.aboutLengthDefault();
 	const auto premiumLimit = limits.aboutLengthPremium();
@@ -544,6 +707,9 @@ void SetupBio(
 			tr::lng_bio_placeholder(),
 			*current),
 		st::settingsBioMargins);
+	if (targets) {
+		targets->bio = bio;
+	}
 
 	const auto countdown = Ui::CreateChild<Ui::FlatLabel>(
 		container.get(),
@@ -553,7 +719,7 @@ void SetupBio(
 	rpl::combine(
 		bio->geometryValue(),
 		countdown->widthValue()
-	) | rpl::start_with_next([=](QRect geometry, int width) {
+	) | rpl::on_next([=](QRect geometry, int width) {
 		countdown->move(
 			geometry.x() + geometry.width() - width,
 			geometry.y() + style->textMargins.top());
@@ -586,7 +752,7 @@ void SetupBio(
 
 	Info::Profile::AboutValue(
 		self
-	) | rpl::start_with_next([=](const TextWithEntities &text) {
+	) | rpl::on_next([=](const TextWithEntities &text) {
 		const auto wasChanged = (*current != bio->getLastText());
 		*current = text.text;
 		if (wasChanged) {
@@ -599,7 +765,7 @@ void SetupBio(
 
 	const auto generation = Ui::CreateChild<int>(bio);
 	changed->events(
-	) | rpl::start_with_next([=](bool changed) {
+	) | rpl::on_next([=](bool changed) {
 		if (changed) {
 			const auto saved = *generation = std::abs(*generation) + 1;
 			base::call_delayed(kSaveBioTimeout, bio, [=] {
@@ -613,8 +779,6 @@ void SetupBio(
 		}
 	}, bio->lifetime());
 
-	// We need 'bio' to still exist here as InputField, so we add this
-	// to 'container' lifetime, not to the 'bio' lifetime.
 	container->lifetime().add([=] {
 		if (*generation > 0) {
 			save();
@@ -626,11 +790,12 @@ void SetupBio(
 	auto cursor = bio->textCursor();
 	cursor.setPosition(bio->getLastText().size());
 	bio->setTextCursor(cursor);
-	bio->submits() | rpl::start_with_next([=] { save(); }, bio->lifetime());
-	bio->changes() | rpl::start_with_next(updated, bio->lifetime());
+	bio->submits() | rpl::on_next([=] { save(); }, bio->lifetime());
+	bio->changes() | rpl::on_next(updated, bio->lifetime());
 	bio->setInstantReplaces(Ui::InstantReplaces::Default());
 	bio->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+		Core::App().settings().replaceEmojiValue(),
+		Core::App().settings().systemTextReplaceValue());
 	Ui::Emoji::SuggestionsController::Init(
 		container->window(),
 		bio,
@@ -642,10 +807,14 @@ void SetupBio(
 
 void SetupAccountsWrap(
 		not_null<Ui::VerticalLayout*> container,
-		not_null<Window::SessionController*> controller) {
+		not_null<Window::SessionController*> controller,
+		InformationHighlightTargets *targets) {
 	Ui::AddSkip(container);
 
-	SetupAccounts(container, controller);
+	auto events = SetupAccounts(container, controller);
+	if (targets) {
+		targets->addAccount = events.addAccountButton;
+	}
 }
 
 [[nodiscard]] bool IsAltShift(Qt::KeyboardModifiers modifiers) {
@@ -655,7 +824,7 @@ void SetupAccountsWrap(
 [[nodiscard]] object_ptr<Ui::SettingsButton> MakeAccountButton(
 		QWidget *parent,
 		not_null<Window::SessionController*> window,
-		not_null<Main::Account*> account,
+		not_null<::Main::Account*> account,
 		Fn<void(Qt::KeyboardModifiers)> callback,
 		bool locked) {
 	const auto active = (account == &window->session().account());
@@ -676,7 +845,7 @@ void SetupAccountsWrap(
 	const auto raw = result.data();
 
 	{
-		const auto container = Badge::AddRight(raw);
+		const auto container = Badge::AddRight(raw, st::mainMenuAccountLine);
 		const auto composedBadge = Ui::CreateChild<ComposedBadge>(
 			container.get(),
 			raw,
@@ -686,7 +855,7 @@ void SetupAccountsWrap(
 			[=] { return window->isGifPausedAtLeastFor(
 				Window::GifPauseReason::Layer); });
 		composedBadge->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			container->resize(s);
 		}, container->lifetime());
 	}
@@ -706,7 +875,7 @@ void SetupAccountsWrap(
 	const auto userpicSize = st::mainMenuAccountSize
 		+ userpicSkip * 2;
 	raw->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		const auto left = st::mainMenuAddAccountButton.iconLeft
 			+ (st::settingsIconAdd.width() - userpicSize) / 2;
 		const auto top = (height - userpicSize) / 2;
@@ -714,7 +883,7 @@ void SetupAccountsWrap(
 	}, state->userpic.lifetime());
 
 	state->userpic.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(&state->userpic);
 		const auto size = st::mainMenuAccountSize;
 		const auto line = st::mainMenuAccountLine;
@@ -736,7 +905,7 @@ void SetupAccountsWrap(
 
 	raw->setAcceptBoth(true);
 	raw->clicks(
-	) | rpl::start_with_next([=](Qt::MouseButton which) {
+	) | rpl::on_next([=](Qt::MouseButton which) {
 		if (which == Qt::LeftButton) {
 			callback(raw->clickModifiers());
 			return;
@@ -746,62 +915,62 @@ void SetupAccountsWrap(
 		} else if (which != Qt::RightButton) {
 			return;
 		}
-		if (!state->menu && IsAltShift(raw->clickModifiers()) && !locked) {
-			state->menu = base::make_unique_q<Ui::PopupMenu>(
-				raw,
-				st::popupMenuWithIcons);
-			Window::MenuAddMarkAsReadAllChatsAction(
-				window,
-				Ui::Menu::CreateAddActionCallback(state->menu));
-			state->menu->popup(QCursor::pos());
-			return;
-		}
-		if (session == &window->session() || state->menu) {
+		if (state->menu) {
 			return;
 		}
+		const auto isActive = session == &window->session();
 		state->menu = base::make_unique_q<Ui::PopupMenu>(
 			raw,
 			st::popupMenuExpandedSeparator);
 		const auto addAction = Ui::Menu::CreateAddActionCallback(
 			state->menu);
-		addAction(tr::lng_context_new_window(tr::now), [=] {
-			Ui::PreventDelayedActivation();
-			callback(Qt::ControlModifier);
-		}, &st::menuIconNewWindow);
-		Window::AddSeparatorAndShiftUp(addAction);
+		if (!isActive) {
+			addAction(tr::lng_context_new_window(tr::now), [=] {
+				Ui::PreventDelayedActivation();
+				callback(Qt::ControlModifier);
+			}, &st::menuIconNewWindow);
+			Window::AddSeparatorAndShiftUp(addAction);
+		}
 
 		addAction(tr::lng_profile_copy_phone(tr::now), [=] {
-			const auto phone = rpl::variable<TextWithEntities>(
+			Info::Profile::CopyPhoneToClipboard(
 				Info::Profile::PhoneValue(session->user()));
-			QGuiApplication::clipboard()->setText(phone.current().text);
 		}, &st::menuIconCopy);
 
 		if (!locked) {
-			addAction(tr::lng_menu_activate(tr::now), [=] {
-				callback({});
-			}, &st::menuIconProfile);
+			if (!isActive) {
+				addAction(tr::lng_menu_activate(tr::now), [=] {
+					callback({});
+				}, &st::menuIconProfile);
+			}
+			Window::MenuAddMarkAsReadAllChatsAction(
+				session,
+				window->uiShow(),
+				addAction);
 		}
 
-		auto logoutCallback = [=] {
-			const auto callback = [=](Fn<void()> &&close) {
-				close();
-				Core::App().logoutWithChecks(&session->account());
+		if (!isActive) {
+			auto logoutCallback = [=] {
+				const auto callback = [=](Fn<void()> &&close) {
+					close();
+					Core::App().logoutWithChecks(&session->account());
+				};
+				window->show(
+					Ui::MakeConfirmBox({
+						.text = tr::lng_sure_logout(),
+						.confirmed = crl::guard(session, callback),
+						.confirmText = tr::lng_settings_logout(),
+						.confirmStyle = &st::attentionBoxButton,
+					}),
+					Ui::LayerOption::CloseOther);
 			};
-			window->show(
-				Ui::MakeConfirmBox({
-					.text = tr::lng_sure_logout(),
-					.confirmed = crl::guard(session, callback),
-					.confirmText = tr::lng_settings_logout(),
-					.confirmStyle = &st::attentionBoxButton,
-				}),
-				Ui::LayerOption::CloseOther);
-		};
-		addAction({
-			.text = tr::lng_settings_logout(tr::now),
-			.handler = std::move(logoutCallback),
-			.icon = &st::menuIconLeaveAttention,
-			.isAttention = true,
-		});
+			addAction({
+				.text = tr::lng_settings_logout(tr::now),
+				.handler = std::move(logoutCallback),
+				.icon = &st::menuIconLeaveAttention,
+				.isAttention = true,
+			});
+		}
 		state->menu->popup(QCursor::pos());
 	}, raw->lifetime());
 
@@ -821,14 +990,18 @@ rpl::producer<> AccountsList::closeRequests() const {
 	return _closeRequests.events();
 }
 
+Ui::RpWidget *AccountsList::addAccountButton() const {
+	return _addAccount ? _addAccount->entity() : nullptr;
+}
+
 void AccountsList::setup() {
 	_addAccount = setupAdd();
 
 	rpl::single(rpl::empty) | rpl::then(
 		Core::App().domain().accountsChanges()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto &list = Core::App().domain().accounts();
-		const auto exists = [&](not_null<Main::Account*> account) {
+		const auto exists = [&](not_null<::Main::Account*> account) {
 			for (const auto &[index, existing] : list) {
 				if (account == existing.get()) {
 					return true;
@@ -846,7 +1019,7 @@ void AccountsList::setup() {
 		for (const auto &[index, account] : list) {
 			if (_watched.emplace(account.get()).second) {
 				account->sessionChanges(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					rebuild();
 				}, _outer->lifetime());
 			}
@@ -855,8 +1028,7 @@ void AccountsList::setup() {
 	}, _outer->lifetime());
 
 	Core::App().domain().maxAccountsChanges(
-	) | rpl::start_with_next([=] {
-		// Full rebuild.
+	) | rpl::on_next([=] {
 		for (auto i = _watched.begin(); i != _watched.end(); i++) {
 			i->second = nullptr;
 		}
@@ -883,6 +1055,8 @@ not_null<Ui::SlideWrap<Ui::SettingsButton>*> AccountsList::setupAdd() {
 	using Environment = MTP::Environment;
 	const auto add = [=](Environment environment, bool newWindow = false) {
 		auto &domain = _controller->session().domain();
+		domain.removeRedundantAccounts();
+
 		auto found = false;
 		for (const auto &[index, account] : domain.accounts()) {
 			const auto raw = account.get();
@@ -898,6 +1072,7 @@ not_null<Ui::SlideWrap<Ui::SettingsButton>*> AccountsList::setupAdd() {
 			domain.addActivated(environment, true);
 		} else {
 			_controller->window().preventOrInvoke([=] {
+				Core::App().setActivePrimaryWindow(&_controller->window());
 				_controller->session().domain().addActivated(environment);
 			});
 		}
@@ -905,7 +1080,7 @@ not_null<Ui::SlideWrap<Ui::SettingsButton>*> AccountsList::setupAdd() {
 
 	button->setAcceptBoth(true);
 	button->clicks(
-	) | rpl::start_with_next([=](Qt::MouseButton which) {
+	) | rpl::on_next([=](Qt::MouseButton which) {
 		if (which == Qt::LeftButton) {
 			const auto modifiers = button->clickModifiers();
 			const auto newWindow = (modifiers & Qt::ControlModifier);
@@ -913,7 +1088,13 @@ not_null<Ui::SlideWrap<Ui::SettingsButton>*> AccountsList::setupAdd() {
 			return;
 		} else if (which != Qt::RightButton
 			|| !IsAltShift(button->clickModifiers())) {
+#ifdef _DEBUG
+			if (which != Qt::RightButton) {
+				return;
+			}
+#else // _DEBUG
 			return;
+#endif // !_DEBUG
 		}
 		_contextMenu = base::make_unique_q<Ui::PopupMenu>(_outer);
 		_contextMenu->addAction("Production Server", [=] {
@@ -935,7 +1116,7 @@ void AccountsList::rebuild() {
 
 	_reorder = std::make_unique<Ui::VerticalLayoutReorder>(inner);
 	_reorder->updates(
-	) | rpl::start_with_next([=](Ui::VerticalLayoutReorder::Single data) {
+	) | rpl::on_next([=](Ui::VerticalLayoutReorder::Single data) {
 		using State = Ui::VerticalLayoutReorder::State;
 		if (data.state == State::Started) {
 			++_reordering;
@@ -1017,40 +1198,282 @@ void AccountsList::rebuild() {
 		std::max(1, count - premiumLimit));
 
 	_addAccount->toggle(
-		(count < Main::Domain::kPremiumMaxAccounts),
+		(count < ::Main::Domain::kPremiumMaxAccounts),
 		anim::type::instant);
 
 	_reorder->start();
 }
 
-} // namespace
+void BuildInformationSection(SectionBuilder &builder) {
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"edit/bio"_q,
+			.title = tr::lng_bio_placeholder(tr::now),
+			.keywords = { u"bio"_q, u"about"_q, u"description"_q },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"edit/name"_q,
+			.title = tr::lng_settings_name_label(tr::now),
+			.keywords = { u"name"_q, u"first"_q, u"last"_q },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"edit/phone"_q,
+			.title = tr::lng_settings_phone_label(tr::now),
+			.keywords = { u"phone"_q, u"number"_q, u"mobile"_q },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"edit/username"_q,
+			.title = tr::lng_settings_username_label(tr::now),
+			.keywords = { u"username"_q, u"link"_q, u"t.me"_q },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"edit/your-color"_q,
+			.title = tr::lng_settings_theme_name_color(tr::now),
+			.keywords = { u"color"_q, u"theme"_q, u"name"_q },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"edit/channel"_q,
+			.title = tr::lng_settings_channel_label(tr::now),
+			.keywords = { u"channel"_q, u"personal"_q },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"edit/birthday"_q,
+			.title = tr::lng_settings_birthday_label(tr::now),
+			.keywords = { u"birthday"_q, u"date"_q, u"birth"_q },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"edit/chat-automation"_q,
+			.title = tr::lng_settings_chat_automation_label(tr::now),
+			.keywords = {
+				u"chat"_q,
+				u"automation"_q,
+				u"bot"_q,
+				u"chatbot"_q,
+				u"chatbots"_q,
+			},
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"edit/add-account"_q,
+			.title = tr::lng_menu_add_account(tr::now),
+			.keywords = { u"account"_q, u"add"_q, u"switch"_q, u"multiple"_q },
+		};
+	});
+}
+
+class Information : public Section<Information> {
+public:
+	Information(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+	void showFinished() override;
+
+private:
+	void setupContent();
+
+	QPointer<Ui::RpWidget> _photo;
+	QPointer<Ui::RpWidget> _uploadPhoto;
+	QPointer<Ui::RpWidget> _bio;
+	QPointer<Ui::RpWidget> _colorButton;
+	QPointer<Ui::RpWidget> _channelButton;
+	QPointer<Ui::RpWidget> _addAccount;
+	QPointer<Ui::RpWidget> _name;
+	QPointer<Ui::RpWidget> _phone;
+	QPointer<Ui::RpWidget> _username;
+	QPointer<Ui::RpWidget> _birthday;
+	QPointer<Ui::RpWidget> _chatAutomation;
+
+};
 
 Information::Information(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: Section(parent) {
-	setupContent(controller);
+: Section(parent, controller) {
+	setupContent();
 }
 
 rpl::producer<QString> Information::title() {
 	return tr::lng_settings_section_info();
 }
 
-void Information::setupContent(
-		not_null<Window::SessionController*> controller) {
+void Information::showFinished() {
+	Section<Information>::showFinished();
+}
+
+void Information::setupContent() {
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
 
-	const auto self = controller->session().user();
-	SetupPhoto(content, controller, self);
-	SetupBio(content, self);
-	SetupRows(content, controller, self);
-	SetupPersonalChannel(content, controller, self);
-	SetupBirthday(content, controller, self);
-	SetupAccountsWrap(content, controller);
+	const SectionBuildMethod buildMethod = [
+		photo = &_photo,
+		uploadPhoto = &_uploadPhoto,
+		bio = &_bio,
+		colorButton = &_colorButton,
+		channelButton = &_channelButton,
+		addAccount = &_addAccount,
+		name = &_name,
+		phone = &_phone,
+		username = &_username,
+		birthday = &_birthday,
+		chatAutomation = &_chatAutomation
+	](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		auto &lifetime = container->lifetime();
+		const auto highlights = lifetime.make_state<HighlightRegistry>();
+		const auto isPaused = Window::PausedIn(
+			controller,
+			Window::GifPauseReason::Layer);
+
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = isPaused,
+			.highlights = highlights,
+		});
+
+		const auto self = controller->session().user();
+		auto targets = InformationHighlightTargets();
+
+		SetupPhoto(container, controller, self, &targets);
+		SetupBio(container, self, &targets);
+		SetupRows(container, controller, self, &targets);
+		SetupPersonalChannel(container, controller, self, &targets);
+		SetupBirthday(container, controller, self, &targets);
+		SetupAccountsWrap(container, controller, &targets);
+
+		*photo = targets.photo;
+		*uploadPhoto = targets.uploadPhoto;
+		*bio = targets.bio;
+		*colorButton = targets.colorButton;
+		*channelButton = targets.channelButton;
+		*addAccount = targets.addAccount;
+		*name = targets.name;
+		*phone = targets.phone;
+		*username = targets.username;
+		*birthday = targets.birthday;
+		*chatAutomation = targets.chatAutomation;
+
+		if (highlights) {
+			if (*photo) {
+				highlights->push_back({
+					u"profile-photo"_q,
+					{ photo->data(), { .shape = HighlightShape::Ellipse } },
+				});
+			}
+			if (*uploadPhoto) {
+				highlights->push_back({
+					u"profile-photo/use-emoji"_q,
+					{ uploadPhoto->data(), { .shape = HighlightShape::Ellipse } },
+				});
+			}
+			if (*bio) {
+				highlights->push_back({
+					u"edit/bio"_q,
+					{ bio->data(), { .margin = st::settingsBioHighlightMargin } },
+				});
+			}
+			if (*colorButton) {
+				highlights->push_back({
+					u"edit/your-color"_q,
+					{ colorButton->data(), { .rippleShape = true } },
+				});
+			}
+			if (*channelButton) {
+				highlights->push_back({
+					u"edit/channel"_q,
+					{ channelButton->data(), { .rippleShape = true } },
+				});
+			}
+			if (*addAccount) {
+				highlights->push_back({
+					u"edit/add-account"_q,
+					{ addAccount->data(), { .rippleShape = true } },
+				});
+			}
+			if (*name) {
+				highlights->push_back({
+					u"edit/name"_q,
+					{ name->data(), { .rippleShape = true } },
+				});
+			}
+			if (*phone) {
+				highlights->push_back({
+					u"edit/phone"_q,
+					{ phone->data(), { .rippleShape = true } },
+				});
+			}
+			if (*username) {
+				highlights->push_back({
+					u"edit/username"_q,
+					{ username->data(), { .rippleShape = true } },
+				});
+			}
+			if (*birthday) {
+				highlights->push_back({
+					u"edit/birthday"_q,
+					{ birthday->data(), { .rippleShape = true } },
+				});
+			}
+			if (*chatAutomation) {
+				highlights->push_back({
+					u"edit/chat-automation"_q,
+					{ chatAutomation->data(), { .rippleShape = true } },
+				});
+			}
+		}
+
+		std::move(showFinished) | rpl::on_next([=] {
+			for (const auto &[id, entry] : *highlights) {
+				if (entry.widget) {
+					controller->checkHighlightControl(
+						id,
+						entry.widget,
+						base::duplicate(entry.args));
+				}
+			}
+		}, lifetime);
+	};
+
+	build(content, buildMethod);
 
 	Ui::ResizeFitChild(this, content);
 }
 
+const auto kMeta = BuildHelper({
+	.id = Information::Id(),
+	.parentId = MainId(),
+	.title = &tr::lng_settings_section_info,
+	.icon = &st::menuIconProfile,
+}, [](SectionBuilder &builder) {
+	BuildInformationSection(builder);
+});
+
+} // namespace
+
+Type InformationId() {
+	return Information::Id();
+}
+
 AccountsEvents SetupAccounts(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller) {
@@ -1059,6 +1482,7 @@ AccountsEvents SetupAccounts(
 		controller);
 	return {
 		.closeRequests = list->closeRequests(),
+		.addAccountButton = list->addAccountButton(),
 	};
 }
 
@@ -1086,21 +1510,22 @@ Ui::UnreadBadgeStyle Style() {
 }
 
 not_null<Ui::RpWidget*> AddRight(
-		not_null<Ui::SettingsButton*> button) {
+		not_null<Ui::SettingsButton*> button,
+		int rightPadding) {
 	const auto widget = Ui::CreateChild<Ui::RpWidget>(button.get());
 
 	rpl::combine(
 		button->sizeValue(),
 		widget->sizeValue(),
 		widget->shownValue()
-	) | rpl::start_with_next([=](QSize outer, QSize inner, bool shown) {
+	) | rpl::on_next([=](QSize outer, QSize inner, bool shown) {
 		auto padding = button->st().padding;
 		if (shown) {
 			widget->moveToRight(
-				padding.right(),
+				padding.right() + rightPadding,
 				(outer.height() - inner.height()) / 2,
 				outer.width());
-			padding.setRight(padding.right() + inner.width());
+			padding.setRight(padding.right() + inner.width() + rightPadding);
 		}
 		button->setPaddingOverride(padding);
 		button->update();
@@ -1126,7 +1551,7 @@ not_null<Ui::RpWidget*> CreateUnread(
 
 	std::move(
 		value
-	) | rpl::start_with_next([=](UnreadBadge badge) {
+	) | rpl::on_next([=](UnreadBadge badge) {
 		state->st.muted = badge.muted;
 		state->count = badge.count;
 		if (!state->count) {
@@ -1141,7 +1566,7 @@ not_null<Ui::RpWidget*> CreateUnread(
 	}, state->widget.lifetime());
 
 	state->widget.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(&state->widget);
 		Ui::PaintUnreadBadge(
 			p,
@@ -1160,10 +1585,16 @@ void AddUnread(
 	const auto container = AddRight(button);
 	const auto badge = CreateUnread(container, std::move(value));
 	badge->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		container->resize(s);
 	}, container->lifetime());
 }
 
 } // namespace Badge
+
+namespace Builder {
+
+SectionBuildMethod InformationSection = kMeta.build;
+
+} // namespace Builder
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_information.h b/Telegram/SourceFiles/settings/sections/settings_information.h
similarity index 74%
rename from Telegram/SourceFiles/settings/settings_information.h
rename to Telegram/SourceFiles/settings/sections/settings_information.h
index 3489d5ca1d2de4..54435faa2f1a8d 100644
--- a/Telegram/SourceFiles/settings/settings_information.h
+++ b/Telegram/SourceFiles/settings/sections/settings_information.h
@@ -7,11 +7,14 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "settings/settings_common_session.h"
+#include "settings/settings_type.h"
 
 class UserData;
 
 namespace Ui {
+class RpWidget;
+class SettingsButton;
+class VerticalLayout;
 struct UnreadBadgeStyle;
 } // namespace Ui
 
@@ -19,23 +22,17 @@ namespace Main {
 class Account;
 } // namespace Main
 
-namespace Settings {
-
-class Information : public Section<Information> {
-public:
-	Information(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller);
-
-	[[nodiscard]] rpl::producer<QString> title() override;
+namespace Window {
+class SessionController;
+} // namespace Window
 
-private:
-	void setupContent(not_null<Window::SessionController*> controller);
+namespace Settings {
 
-};
+[[nodiscard]] Type InformationId();
 
 struct AccountsEvents {
 	rpl::producer<> closeRequests;
+	QPointer<Ui::RpWidget> addAccountButton;
 };
 AccountsEvents SetupAccounts(
 	not_null<Ui::VerticalLayout*> container,
@@ -52,7 +49,8 @@ struct UnreadBadge {
 	bool muted = false;
 };
 [[nodiscard]] not_null<Ui::RpWidget*> AddRight(
-	not_null<Ui::SettingsButton*> button);
+	not_null<Ui::SettingsButton*> button,
+	int rightPadding = 0);
 [[nodiscard]] not_null<Ui::RpWidget*> CreateUnread(
 	not_null<Ui::RpWidget*> container,
 	rpl::producer<UnreadBadge> value);
diff --git a/Telegram/SourceFiles/settings/settings_local_passcode.cpp b/Telegram/SourceFiles/settings/sections/settings_local_passcode.cpp
similarity index 59%
rename from Telegram/SourceFiles/settings/settings_local_passcode.cpp
rename to Telegram/SourceFiles/settings/sections/settings_local_passcode.cpp
index 193445caf3dff5..ac204ade072991 100644
--- a/Telegram/SourceFiles/settings/settings_local_passcode.cpp
+++ b/Telegram/SourceFiles/settings/sections/settings_local_passcode.cpp
@@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_local_passcode.h"
+#include "settings/sections/settings_local_passcode.h"
 
 #include "base/platform/base_platform_last_input.h"
 #include "base/platform/base_platform_info.h"
@@ -18,6 +18,9 @@ For license and copyright information please follow this link:
 #include "main/main_domain.h"
 #include "main/main_session.h"
 #include "settings/cloud_password/settings_cloud_password_common.h"
+#include "settings/cloud_password/settings_cloud_password_step.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common.h"
 #include "storage/storage_domain.h"
 #include "ui/vertical_list.h"
 #include "ui/boxes/confirm_box.h"
@@ -35,6 +38,8 @@ For license and copyright information please follow this link:
 namespace Settings {
 namespace {
 
+using namespace Builder;
+
 void SetPasscode(
 		not_null<Window::SessionController*> controller,
 		const QString &pass) {
@@ -73,9 +78,6 @@ class LocalPasscodeEnter : public AbstractSection {
 	[[nodiscard]] virtual EnterType enterType() const = 0;
 
 private:
-
-	const not_null<Window::SessionController*> _controller;
-
 	rpl::event_stream<> _showFinished;
 	rpl::event_stream<> _setInnerFocus;
 	rpl::event_stream<Type> _showOther;
@@ -87,8 +89,7 @@ class LocalPasscodeEnter : public AbstractSection {
 LocalPasscodeEnter::LocalPasscodeEnter(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: AbstractSection(parent)
-, _controller(controller) {
+: AbstractSection(parent, controller) {
 }
 
 rpl::producer<QString> LocalPasscodeEnter::title() {
@@ -100,7 +101,7 @@ void LocalPasscodeEnter::setupContent() {
 
 	base::SystemUnlockStatus(
 		true
-	) | rpl::start_with_next([=](base::SystemUnlockAvailability status) {
+	) | rpl::on_next([=](base::SystemUnlockAvailability status) {
 		_systemUnlockWithBiometric = status.available
 			&& status.withBiometrics;
 	}, lifetime());
@@ -113,46 +114,43 @@ void LocalPasscodeEnter::setupContent() {
 		content,
 		{
 			.name = u"local_passcode_enter"_q,
-			.sizeOverride = {
-				st::changePhoneIconSize,
-				st::changePhoneIconSize,
-			},
+			.sizeOverride = st::normalBoxLottieSize,
 		},
 		st::settingLocalPasscodeIconPadding);
 	content->add(std::move(icon.widget));
 	_showFinished.events(
-	) | rpl::start_with_next([animate = std::move(icon.animate)] {
+	) | rpl::on_next([animate = std::move(icon.animate)] {
 		animate(anim::repeat::once);
 	}, content->lifetime());
 
 	if (isChange) {
 		CloudPassword::SetupAutoCloseTimer(
 			content->lifetime(),
-			[=] { _showBack.fire({}); });
+			[=] { _showBack.fire({}); },
+			[] { return Core::App().lastNonIdleTime(); });
 	}
 
 	Ui::AddSkip(content);
 
 	content->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				isCreate
-					? tr::lng_passcode_create_title()
-					: isCheck
-					? tr::lng_passcode_check_title()
-					: tr::lng_passcode_change_title(),
-				st::changePhoneTitle)),
-		st::changePhoneTitlePadding);
+			isCreate
+				? tr::lng_passcode_create_title()
+				: isCheck
+				? tr::lng_passcode_check_title()
+				: tr::lng_passcode_change_title(),
+			st::changePhoneTitle),
+		st::changePhoneTitlePadding,
+		style::al_top);
 
 	const auto addDescription = [&](rpl::producer<QString> &&text) {
 		const auto &st = st::settingLocalPasscodeDescription;
 		content->add(
-			object_ptr<Ui::CenterWrap<>>(
-				content,
-				object_ptr<Ui::FlatLabel>(content, std::move(text), st)),
-			st::changePhoneDescriptionPadding);
+			object_ptr<Ui::FlatLabel>(content, std::move(text), st),
+			st::changePhoneDescriptionPadding,
+			style::al_top
+		)->setTryMakeSimilarLines(true);
 	};
 
 	addDescription(tr::lng_passcode_about1());
@@ -171,7 +169,7 @@ void LocalPasscodeEnter::setupContent() {
 			std::move(text));
 
 		container->geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			field->moveToLeft((r.width() - field->width()) / 2, 0);
 		}, container->lifetime());
 
@@ -181,14 +179,12 @@ void LocalPasscodeEnter::setupContent() {
 
 	const auto addError = [&](not_null<Ui::PasswordInput*> input) {
 		const auto error = content->add(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				content,
-				object_ptr<Ui::FlatLabel>(
-					content,
-					// Set any text to resize.
-					tr::lng_language_name(tr::now),
-					st::settingLocalPasscodeError)),
-			st::changePhoneDescriptionPadding)->entity();
+				tr::lng_language_name(tr::now),
+				st::settingLocalPasscodeError),
+			st::changePhoneDescriptionPadding,
+			style::al_top);
 		error->hide();
 		QObject::connect(input.get(), &Ui::MaskedInputField::changed, [=] {
 			error->hide();
@@ -206,18 +202,16 @@ void LocalPasscodeEnter::setupContent() {
 	const auto error = addError(isCheck ? newPasscode : reenterPasscode);
 
 	const auto button = content->add(
-		object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+		object_ptr<Ui::RoundButton>(
 			content,
-			object_ptr<Ui::RoundButton>(
-				content,
-				(isCreate
-					? tr::lng_passcode_create_button()
-					: isCheck
-					? tr::lng_passcode_check_button()
-					: tr::lng_passcode_change_button()),
-				st::changePhoneButton)),
-		st::settingLocalPasscodeButtonPadding)->entity();
-	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+			(isCreate
+				? tr::lng_passcode_create_button()
+				: isCheck
+				? tr::lng_passcode_check_button()
+				: tr::lng_passcode_change_button()),
+			st::changePhoneButton),
+		st::settingLocalPasscodeButtonPadding,
+		style::al_top);
 	button->setClickedCallback([=] {
 		const auto newText = newPasscode->text();
 		const auto reenterText = reenterPasscode
@@ -238,7 +232,7 @@ void LocalPasscodeEnter::setupContent() {
 				error->setText(tr::lng_passcode_differ(tr::now));
 			} else {
 				if (isChange) {
-					const auto &domain = _controller->session().domain();
+					const auto &domain = controller()->session().domain();
 					if (domain.local().checkPasscode(newText.toUtf8())) {
 						newPasscode->setFocus();
 						newPasscode->showError();
@@ -248,7 +242,7 @@ void LocalPasscodeEnter::setupContent() {
 						return;
 					}
 				}
-				SetPasscode(_controller, newText);
+				SetPasscode(controller(), newText);
 				if (isCreate) {
 					if (Platform::IsWindows() || _systemUnlockWithBiometric) {
 						Core::App().settings().setSystemUnlockEnabled(true);
@@ -267,7 +261,7 @@ void LocalPasscodeEnter::setupContent() {
 				error->setText(tr::lng_flood_error(tr::now));
 				return;
 			}
-			const auto &domain = _controller->session().domain();
+			const auto &domain = controller()->session().domain();
 			if (domain.local().checkPasscode(newText.toUtf8())) {
 				cSetPasscodeBadTries(0);
 				_showOther.fire(LocalPasscodeManageId());
@@ -297,7 +291,7 @@ void LocalPasscodeEnter::setupContent() {
 	}
 
 	_setInnerFocus.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (newPasscode->text().isEmpty()) {
 			newPasscode->setFocus();
 		} else if (reenterPasscode && reenterPasscode->text().isEmpty()) {
@@ -388,6 +382,206 @@ class LocalPasscodeChange final
 
 };
 
+namespace {
+
+enum class UnlockType {
+	None,
+	Default,
+	Biometrics,
+	Companion,
+};
+
+void BuildManageContent(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	if (!controller) {
+		return;
+	}
+
+	const auto container = builder.container();
+
+	struct State {
+		rpl::event_stream<> autoLockBoxClosing;
+	};
+	const auto state = container->lifetime().make_state<State>();
+
+	builder.addSkip();
+
+	builder.addButton({
+		.id = u"passcode/change"_q,
+		.title = tr::lng_passcode_change(),
+		.icon = { &st::menuIconLock },
+		.onClick = [=] {
+			builder.showOther()(LocalPasscodeChange::Id());
+		},
+		.keywords = { u"password"_q, u"code"_q },
+	});
+
+	auto autolockLabel = state->autoLockBoxClosing.events_starting_with(
+		{}
+	) | rpl::map([] {
+		const auto autolock = Core::App().settings().autoLock();
+		const auto hours = autolock / 3600;
+		const auto minutes = (autolock - (hours * 3600)) / 60;
+
+		return (hours && minutes)
+			? tr::lng_passcode_autolock_hours_minutes(
+				tr::now,
+				lt_hours_count,
+				QString::number(hours),
+				lt_minutes_count,
+				QString::number(minutes))
+			: minutes
+			? tr::lng_minutes(tr::now, lt_count, minutes)
+			: tr::lng_hours(tr::now, lt_count, hours);
+	});
+
+	const auto autoLockButton = builder.addButton({
+		.id = u"passcode/auto-lock"_q,
+		.title = base::Platform::LastUserInputTimeSupported()
+			? tr::lng_passcode_autolock_away()
+			: tr::lng_passcode_autolock_inactive(),
+		.icon = { &st::menuIconTimer },
+		.label = std::move(autolockLabel),
+		.keywords = { u"timeout"_q, u"lock"_q, u"time"_q },
+	});
+	if (autoLockButton) {
+		autoLockButton->addClickHandler([=] {
+			const auto box = controller->show(Box<AutoLockBox>());
+			box->boxClosing(
+			) | rpl::start_to_stream(state->autoLockBoxClosing, box->lifetime());
+		});
+	}
+
+	builder.addSkip();
+
+	using Divider = CloudPassword::OneEdgeBoxContentDivider;
+	builder.add([](const WidgetContext &ctx) {
+		const auto divider = Ui::CreateChild<Divider>(ctx.container.get());
+		divider->lower();
+		const auto about = ctx.container->add(
+			object_ptr<Ui::PaddingWrap<>>(
+				ctx.container,
+				object_ptr<Ui::FlatLabel>(
+					ctx.container,
+					rpl::combine(
+						tr::lng_passcode_about1(),
+						tr::lng_passcode_about3()
+					) | rpl::map([](const QString &s1, const QString &s2) {
+						return s1 + "\n\n" + s2;
+					}),
+					st::boxDividerLabel),
+			st::defaultBoxDividerLabelPadding));
+		about->geometryValue(
+		) | rpl::on_next([=](const QRect &r) {
+			divider->setGeometry(r);
+		}, divider->lifetime());
+		return SectionBuilder::WidgetToAdd{};
+	});
+
+	builder.add([](const WidgetContext &ctx) {
+		const auto systemUnlockWrap = ctx.container->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				ctx.container,
+				object_ptr<Ui::VerticalLayout>(ctx.container))
+		)->setDuration(0);
+		const auto systemUnlockContent = systemUnlockWrap->entity();
+
+		const auto unlockType = systemUnlockContent->lifetime().make_state<
+			rpl::variable<UnlockType>
+		>(base::SystemUnlockStatus(
+			true
+		) | rpl::map([](base::SystemUnlockAvailability status) {
+			return status.withBiometrics
+				? UnlockType::Biometrics
+				: status.withCompanion
+				? UnlockType::Companion
+				: status.available
+				? UnlockType::Default
+				: UnlockType::None;
+		}));
+
+		const auto highlights = ctx.highlights;
+
+		unlockType->value(
+		) | rpl::on_next([=](UnlockType type) {
+			while (systemUnlockContent->count()) {
+				delete systemUnlockContent->widgetAt(0);
+			}
+
+			Ui::AddSkip(systemUnlockContent);
+
+			const auto biometricsButton = AddButtonWithIcon(
+				systemUnlockContent,
+				(Platform::IsWindows()
+					? tr::lng_settings_use_winhello()
+					: (type == UnlockType::Biometrics)
+					? tr::lng_settings_use_touchid()
+					: (type == UnlockType::Companion)
+					? tr::lng_settings_use_applewatch()
+					: tr::lng_settings_use_systempwd()),
+				st::settingsButton,
+				{ Platform::IsWindows()
+					? &st::menuIconWinHello
+					: (type == UnlockType::Biometrics)
+					? &st::menuIconTouchID
+					: (type == UnlockType::Companion)
+					? &st::menuIconAppleWatch
+					: &st::menuIconSystemPwd });
+			biometricsButton->toggleOn(
+				rpl::single(Core::App().settings().systemUnlockEnabled())
+			)->toggledChanges(
+			) | rpl::filter([=](bool value) {
+				return value != Core::App().settings().systemUnlockEnabled();
+			}) | rpl::on_next([=](bool value) {
+				Core::App().settings().setSystemUnlockEnabled(value);
+				Core::App().saveSettingsDelayed();
+			}, systemUnlockContent->lifetime());
+
+			if (highlights) {
+				highlights->push_back({
+					u"passcode/biometrics"_q,
+					{ biometricsButton.get() },
+				});
+			}
+
+			Ui::AddSkip(systemUnlockContent);
+
+			Ui::AddDividerText(
+				systemUnlockContent,
+				(Platform::IsWindows()
+					? tr::lng_settings_use_winhello_about()
+					: (type == UnlockType::Biometrics)
+					? tr::lng_settings_use_touchid_about()
+					: (type == UnlockType::Companion)
+					? tr::lng_settings_use_applewatch_about()
+					: tr::lng_settings_use_systempwd_about()));
+
+		}, systemUnlockContent->lifetime());
+
+		systemUnlockWrap->toggleOn(unlockType->value(
+		) | rpl::map(rpl::mappers::_1 != UnlockType::None));
+
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"passcode/biometrics"_q,
+			.title = Platform::IsWindows()
+				? tr::lng_settings_use_winhello(tr::now)
+				: tr::lng_settings_use_touchid(tr::now),
+			.keywords = { u"biometrics"_q, u"touchid"_q, u"faceid"_q,
+				u"winhello"_q, u"fingerprint"_q },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"passcode/disable"_q,
+			.title = tr::lng_settings_passcode_disable(tr::now),
+			.keywords = { u"disable"_q, u"remove"_q, u"turn off"_q },
+		};
+	});
+}
+
 class LocalPasscodeManage : public Section<LocalPasscodeManage> {
 public:
 	LocalPasscodeManage(
@@ -402,26 +596,22 @@ class LocalPasscodeManage : public Section<LocalPasscodeManage> {
 
 	[[nodiscard]] rpl::producer<std::vector<Type>> removeFromStack() override;
 
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToBottom(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) override;
 
 private:
 	void setupContent();
 
-	const not_null<Window::SessionController*> _controller;
-
 	rpl::variable<bool> _isBottomFillerShown;
-
-	rpl::event_stream<> _showFinished;
 	rpl::event_stream<> _showBack;
+	QPointer<Ui::RpWidget> _disableButton;
 
 };
 
 LocalPasscodeManage::LocalPasscodeManage(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: Section(parent)
-, _controller(controller) {
+: Section(parent, controller) {
 	setupContent();
 }
 
@@ -441,181 +631,67 @@ rpl::producer<std::vector<Type>> LocalPasscodeManage::removeFromStack() {
 void LocalPasscodeManage::setupContent() {
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
 
-	struct State {
-		rpl::event_stream<> autoLockBoxClosing;
-	};
-	const auto state = content->lifetime().make_state<State>();
-
 	CloudPassword::SetupAutoCloseTimer(
 		content->lifetime(),
-		[=] { _showBack.fire({}); });
-
-	Ui::AddSkip(content);
-
-	AddButtonWithIcon(
-		content,
-		tr::lng_passcode_change(),
-		st::settingsButton,
-		{ &st::menuIconLock }
-	)->addClickHandler([=] {
-		showOther(LocalPasscodeChange::Id());
-	});
-
-	auto autolockLabel = state->autoLockBoxClosing.events_starting_with(
-		{}
-	) | rpl::map([] {
-		const auto autolock = Core::App().settings().autoLock();
-		const auto hours = autolock / 3600;
-		const auto minutes = (autolock - (hours * 3600)) / 60;
-
-		return (hours && minutes)
-			? tr::lng_passcode_autolock_hours_minutes(
-				tr::now,
-				lt_hours_count,
-				QString::number(hours),
-				lt_minutes_count,
-				QString::number(minutes))
-			: minutes
-			? tr::lng_minutes(tr::now, lt_count, minutes)
-			: tr::lng_hours(tr::now, lt_count, hours);
-	});
-
-	AddButtonWithLabel(
-		content,
-		(base::Platform::LastUserInputTimeSupported()
-			? tr::lng_passcode_autolock_away
-			: tr::lng_passcode_autolock_inactive)(),
-		std::move(autolockLabel),
-		st::settingsButton,
-		{ &st::menuIconTimer }
-	)->addClickHandler([=] {
-		const auto box = _controller->show(Box<AutoLockBox>());
-		box->boxClosing(
-		) | rpl::start_to_stream(state->autoLockBoxClosing, box->lifetime());
-	});
-
-	Ui::AddSkip(content);
-
-	using Divider = CloudPassword::OneEdgeBoxContentDivider;
-	const auto divider = Ui::CreateChild<Divider>(this);
-	divider->lower();
-	const auto about = content->add(
-		object_ptr<Ui::PaddingWrap<>>(
-			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				rpl::combine(
-					tr::lng_passcode_about1(),
-					tr::lng_passcode_about3()
-				) | rpl::map([](const QString &s1, const QString &s2) {
-					return s1 + "\n\n" + s2;
-				}),
-				st::boxDividerLabel),
-		st::defaultBoxDividerLabelPadding));
-	about->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
-		divider->setGeometry(r);
-	}, divider->lifetime());
-	_isBottomFillerShown.value(
-	) | rpl::start_with_next([=](bool shown) {
-		divider->skipEdge(Qt::BottomEdge, shown);
-	}, divider->lifetime());
-
-	const auto systemUnlockWrap = content->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			content,
-			object_ptr<Ui::VerticalLayout>(content))
-	)->setDuration(0);
-	const auto systemUnlockContent = systemUnlockWrap->entity();
-
-	enum class UnlockType {
-		None,
-		Default,
-		Biometrics,
-		Companion,
+		[=] { _showBack.fire({}); },
+		[] { return Core::App().lastNonIdleTime(); });
+
+	const SectionBuildMethod buildMethod = [](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		auto &lifetime = container->lifetime();
+		const auto highlights = lifetime.make_state<HighlightRegistry>();
+
+		const auto isPaused = Window::PausedIn(
+			controller,
+			Window::GifPauseReason::Layer);
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = isPaused,
+			.highlights = highlights,
+		});
+		BuildManageContent(builder);
+
+		std::move(showFinished) | rpl::on_next([=] {
+			for (const auto &[id, entry] : *highlights) {
+				if (entry.widget) {
+					controller->checkHighlightControl(
+						id,
+						entry.widget,
+						base::duplicate(entry.args));
+				}
+			}
+		}, lifetime);
 	};
-	const auto unlockType = systemUnlockContent->lifetime().make_state<
-		rpl::variable<UnlockType>
-	>(base::SystemUnlockStatus(
-		true
-	) | rpl::map([](base::SystemUnlockAvailability status) {
-		return status.withBiometrics
-			? UnlockType::Biometrics
-			: status.withCompanion
-			? UnlockType::Companion
-			: status.available
-			? UnlockType::Default
-			: UnlockType::None;
-	}));
-
-	unlockType->value(
-	) | rpl::start_with_next([=](UnlockType type) {
-		while (systemUnlockContent->count()) {
-			delete systemUnlockContent->widgetAt(0);
-		}
-
-		Ui::AddSkip(systemUnlockContent);
-
-		AddButtonWithIcon(
-			systemUnlockContent,
-			(Platform::IsWindows()
-				? tr::lng_settings_use_winhello()
-				: (type == UnlockType::Biometrics)
-				? tr::lng_settings_use_touchid()
-				: (type == UnlockType::Companion)
-				? tr::lng_settings_use_applewatch()
-				: tr::lng_settings_use_systempwd()),
-			st::settingsButton,
-			{ Platform::IsWindows()
-				? &st::menuIconWinHello
-				: (type == UnlockType::Biometrics)
-				? &st::menuIconTouchID
-				: (type == UnlockType::Companion)
-				? &st::menuIconAppleWatch
-				: &st::menuIconSystemPwd }
-		)->toggleOn(
-			rpl::single(Core::App().settings().systemUnlockEnabled())
-		)->toggledChanges(
-		) | rpl::filter([=](bool value) {
-			return value != Core::App().settings().systemUnlockEnabled();
-		}) | rpl::start_with_next([=](bool value) {
-			Core::App().settings().setSystemUnlockEnabled(value);
-			Core::App().saveSettingsDelayed();
-		}, systemUnlockContent->lifetime());
-
-		Ui::AddSkip(systemUnlockContent);
-
-		Ui::AddDividerText(
-			systemUnlockContent,
-			(Platform::IsWindows()
-				? tr::lng_settings_use_winhello_about()
-				: (type == UnlockType::Biometrics)
-				? tr::lng_settings_use_touchid_about()
-				: (type == UnlockType::Companion)
-				? tr::lng_settings_use_applewatch_about()
-				: tr::lng_settings_use_systempwd_about()));
-
-	}, systemUnlockContent->lifetime());
 
-	systemUnlockWrap->toggleOn(unlockType->value(
-	) | rpl::map(rpl::mappers::_1 != UnlockType::None));
+	build(content, buildMethod);
 
 	Ui::ResizeFitChild(this, content);
 }
 
-QPointer<Ui::RpWidget> LocalPasscodeManage::createPinnedToBottom(
+base::weak_qptr<Ui::RpWidget> LocalPasscodeManage::createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) {
+	const auto weak = base::make_weak(this);
 	auto callback = [=] {
-		_controller->show(
+		controller()->show(
 			Ui::MakeConfirmBox({
 				.text = tr::lng_settings_passcode_disable_sure(),
 				.confirmed = [=](Fn<void()> &&close) {
-					SetPasscode(_controller, QString());
+					SetPasscode(controller(), QString());
 					Core::App().settings().setSystemUnlockEnabled(false);
 					Core::App().saveSettingsDelayed();
 
 					close();
-					_showBack.fire({});
+					if (weak) {
+						_showBack.fire({});
+					}
+					if (weak) {
+						controller()->hideSpecialLayer();
+					}
 				},
 				.confirmText = tr::lng_settings_auto_night_disable(),
 				.confirmStyle = &st::attentionBoxButton,
@@ -628,12 +704,16 @@ QPointer<Ui::RpWidget> LocalPasscodeManage::createPinnedToBottom(
 		std::move(callback));
 
 	_isBottomFillerShown = base::take(bottomButton.isBottomFillerShown);
+	_disableButton = bottomButton.button.get();
 
 	return bottomButton.content;
 }
 
 void LocalPasscodeManage::showFinished() {
-	_showFinished.fire({});
+	Section<LocalPasscodeManage>::showFinished();
+	controller()->checkHighlightControl(
+		u"passcode/disable"_q,
+		_disableButton);
 }
 
 rpl::producer<> LocalPasscodeManage::sectionShowBack() {
@@ -642,6 +722,17 @@ rpl::producer<> LocalPasscodeManage::sectionShowBack() {
 
 LocalPasscodeManage::~LocalPasscodeManage() = default;
 
+const auto kMeta = BuildHelper({
+	.id = LocalPasscodeManage::Id(),
+	.parentId = nullptr,
+	.title = &tr::lng_settings_passcode_title,
+	.icon = &st::menuIconLock,
+}, [](SectionBuilder &builder) {
+	BuildManageContent(builder);
+});
+
+} // namespace
+
 Type LocalPasscodeCreateId() {
 	return LocalPasscodeCreate::Id();
 }
diff --git a/Telegram/SourceFiles/settings/settings_local_passcode.h b/Telegram/SourceFiles/settings/sections/settings_local_passcode.h
similarity index 99%
rename from Telegram/SourceFiles/settings/settings_local_passcode.h
rename to Telegram/SourceFiles/settings/sections/settings_local_passcode.h
index 1f307189c57c2c..b0292c43e503bc 100644
--- a/Telegram/SourceFiles/settings/settings_local_passcode.h
+++ b/Telegram/SourceFiles/settings/sections/settings_local_passcode.h
@@ -16,4 +16,3 @@ Type LocalPasscodeCheckId();
 Type LocalPasscodeManageId();
 
 } // namespace Settings
-
diff --git a/Telegram/SourceFiles/settings/sections/settings_local_storage.cpp b/Telegram/SourceFiles/settings/sections/settings_local_storage.cpp
new file mode 100644
index 00000000000000..7363a3c63ecafc
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_local_storage.cpp
@@ -0,0 +1,2243 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/sections/settings_local_storage.h"
+
+#include "settings.h"
+#include "settings/settings_common.h"
+#include "data/data_session.h"
+#include "lottie/lottie_icon.h"
+#include "base/call_delayed.h"
+#include "base/random.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "statistics/view/stack_linear_chart_common.h"
+#include "storage/storage_account.h"
+#include "storage/cache/storage_cache_database.h"
+#include "ui/text/format_values.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/effects/animated_string.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/effects/shake_animation.h"
+#include "ui/emoji_config.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/text/text_entity.h"
+#include "ui/text/text_utilities.h"
+#include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/tooltip.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+
+#include <QtCore/QStorageInfo>
+
+namespace Settings {
+namespace {
+
+constexpr auto kMegabyte = int64(1024 * 1024);
+constexpr auto kTotalSizeLimitsCount = 18;
+constexpr auto kMediaSizeLimitsCount = 18;
+constexpr auto kMinimalSizeLimit = 100 * kMegabyte;
+constexpr auto kTimeLimitsCount = 16;
+constexpr auto kMaxTimeLimitValue = std::numeric_limits<size_type>::max();
+constexpr auto kFakeMediaCacheTag = uint16(0xFFFF);
+constexpr auto kClearingMinDuration = crl::time(1200);
+constexpr auto kCompleteParticlesCount = 25;
+
+constexpr auto kChartTags = std::array<uint16, kChartPartsCount>{ {
+	Data::kImageCacheTag,
+	Data::kStickerCacheTag,
+	Data::kVoiceMessageCacheTag,
+	Data::kVideoMessageCacheTag,
+	Data::kAnimationCacheTag,
+	kFakeMediaCacheTag,
+} };
+
+int ChartIndexForTag(uint16 tag) {
+	for (auto i = 0; i != kChartPartsCount; ++i) {
+		if (kChartTags[i] == tag) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+int64 TotalSizeLimitInMB(int index) {
+	if (index < 8) {
+		return int64(index + 2) * 100;
+	}
+	return int64(index - 7) * 1024;
+}
+
+int64 TotalSizeLimit(int index) {
+	return TotalSizeLimitInMB(index) * kMegabyte;
+}
+
+int64 MediaSizeLimitInMB(int index) {
+	if (index < 9) {
+		return int64(index + 1) * 100;
+	}
+	return int64(index - 8) * 1024;
+}
+
+int64 MediaSizeLimit(int index) {
+	return MediaSizeLimitInMB(index) * kMegabyte;
+}
+
+QString SizeLimitText(int64 limit) {
+	const auto mb = (limit / (1024 * 1024));
+	const auto gb = (mb / 1024);
+	return (gb > 0)
+		? (QString::number(gb) + " GB")
+		: (QString::number(mb) + " MB");
+}
+
+size_type TimeLimitInDays(int index) {
+	if (index < 3) {
+		const auto weeks = (index + 1);
+		return size_type(weeks) * 7;
+	} else if (index < 15) {
+		const auto month = (index - 2);
+		return (size_type(month) * 30)
+			+ ((month >= 12) ? 5 :
+				(month >= 10) ? 4 :
+				(month >= 8) ? 3 :
+				(month >= 7) ? 2 :
+				(month >= 5) ? 1 :
+				(month >= 3) ? 0 :
+				(month >= 2) ? -1 :
+				(month >= 1) ? 1 : 0);
+	}
+	return 0;
+}
+
+size_type TimeLimit(int index) {
+	const auto days = TimeLimitInDays(index);
+	return days
+		? (days * 24 * 60 * 60)
+		: kMaxTimeLimitValue;
+}
+
+QString TimeLimitText(size_type limit) {
+	const auto days = (limit / (24 * 60 * 60));
+	const auto weeks = (days / 7);
+	const auto months = (days / 29);
+	return (months > 0)
+		? tr::lng_months(tr::now, lt_count, months)
+		: (limit > 0)
+		? tr::lng_weeks(tr::now, lt_count, weeks)
+		: tr::lng_local_storage_limit_never(tr::now);
+}
+
+size_type LimitToValue(size_type timeLimit) {
+	return timeLimit ? timeLimit : kMaxTimeLimitValue;
+}
+
+size_type ValueToLimit(size_type timeLimit) {
+	return (timeLimit != kMaxTimeLimitValue) ? timeLimit : 0;
+}
+
+constexpr auto kChartSeparator = 2.;
+constexpr auto kChartMinFraction = 0.02;
+constexpr auto kChartMorphDuration = crl::time(650);
+constexpr auto kChartCompleteDuration = crl::time(650);
+constexpr auto kChartAppearDuration = crl::time(750);
+constexpr auto kChartSelectDuration = crl::time(200);
+constexpr auto kChartPercentFadeDuration = crl::time(200);
+
+QColor PartColor(int index) {
+	switch (index) {
+	case 0: return st::statisticsChartLineLightblue->c;
+	case 1: return st::statisticsChartLineOrange->c;
+	case 2: return st::statisticsChartLineLightgreen->c;
+	case 3: return st::statisticsChartLinePurple->c;
+	case 4: return st::statisticsChartLineGreen->c;
+	case 5: return st::statisticsChartLineBlue->c;
+	}
+	return st::statisticsChartLineCyan->c;
+}
+
+QString PartTitle(int index, size_type count) {
+	switch (index) {
+	case 0: return tr::lng_local_storage_image(tr::now, lt_count, count);
+	case 1: return tr::lng_local_storage_sticker(tr::now, lt_count, count);
+	case 2: return tr::lng_local_storage_voice(tr::now, lt_count, count);
+	case 3: return tr::lng_local_storage_round(tr::now, lt_count, count);
+	case 4: return tr::lng_local_storage_animation(tr::now, lt_count, count);
+	case 5: return tr::lng_local_storage_media_title(tr::now);
+	}
+	return QString();
+}
+
+QString PartName(int index) {
+	switch (index) {
+	case 0: return tr::lng_local_storage_image_title(tr::now);
+	case 1: return tr::lng_local_storage_sticker_title(tr::now);
+	case 2: return tr::lng_local_storage_voice_title(tr::now);
+	case 3: return tr::lng_local_storage_round_title(tr::now);
+	case 4: return tr::lng_local_storage_animation_title(tr::now);
+	case 5: return tr::lng_local_storage_media_title(tr::now);
+	}
+	return QString();
+}
+
+const style::icon &ParticleIcon(int index) {
+	switch (index) {
+	case 0: return st::localStorageParticlePhotos;
+	case 1: return st::localStorageParticleStickers;
+	case 2: return st::localStorageParticleMusic;
+	case 3: return st::localStorageParticleVideos;
+	case 4: return st::localStorageParticleVideos;
+	case 5: return st::localStorageParticleDocuments;
+	}
+	return st::localStorageParticleDocuments;
+}
+
+const QImage &ParticleImage(int index) {
+	static auto images = std::array<QImage, kChartPartsCount>();
+	auto &image = images[index];
+	if (image.isNull()) {
+		image = ParticleIcon(index).instance(Qt::white);
+	}
+	return image;
+}
+
+not_null<Ui::VerticalLayout*> AddIsland(
+		not_null<Ui::VerticalLayout*> parent,
+		bool topSkip = true) {
+	const auto island = parent->add(
+		object_ptr<Ui::VerticalLayout>(parent),
+		st::localStorageIslandMargin);
+	island->paintRequest(
+	) | rpl::on_next([=] {
+		auto p = QPainter(island);
+		auto hq = PainterHighQualityEnabler(p);
+		const auto radius = st::localStorageIslandRadius;
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::boxBg);
+		p.drawRoundedRect(island->rect(), radius, radius);
+	}, island->lifetime());
+	if (topSkip) {
+		Ui::AddSkip(island, st::localStorageIslandPadding);
+	}
+	return island;
+}
+
+not_null<Ui::SlideWrap<Ui::VerticalLayout>*> AddIslandWrap(
+		not_null<Ui::VerticalLayout*> parent) {
+	const auto wrap = parent->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			parent,
+			object_ptr<Ui::VerticalLayout>(parent),
+			st::localStorageIslandMargin));
+	const auto island = wrap->entity();
+	island->paintRequest(
+	) | rpl::on_next([=] {
+		auto p = QPainter(island);
+		auto hq = PainterHighQualityEnabler(p);
+		const auto radius = st::localStorageIslandRadius;
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::boxBg);
+		p.drawRoundedRect(island->rect(), radius, radius);
+	}, island->lifetime());
+	return wrap;
+}
+
+[[nodiscard]] QString FormatStoragePercent(int64 part, int64 whole) {
+	if (whole <= 0) {
+		return u"0%"_q;
+	}
+	const auto ratio = part / float64(whole);
+	if (ratio < 0.001) {
+		return u"<0.1%"_q;
+	}
+	const auto percent = int(base::SafeRound(ratio * 100.));
+	return (percent <= 0)
+		? u"<1%"_q
+		: (QString::number(percent) + '%');
+}
+
+[[nodiscard]] QString FormatStorageSize(int64 size) {
+	constexpr auto kGigabyte = int64(1024) * 1024 * 1024;
+	if (size < kGigabyte) {
+		return Ui::FormatSizeText(size);
+	}
+	const auto tenthGb = size * 10 / kGigabyte;
+	return QString::number(tenthGb / 10)
+		+ '.'
+		+ QString::number(tenthGb % 10)
+		+ u" GB"_q;
+}
+
+[[nodiscard]] QImage GenerateCompleteStar(int size, float64 k) {
+	const auto ratio = style::DevicePixelRatio();
+	auto image = QImage(
+		size * ratio,
+		size * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(ratio);
+	image.fill(Qt::transparent);
+
+	auto p = QPainter(&image);
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(Qt::white);
+
+	const auto half = size / 2.;
+	const auto mid = half * k;
+	auto path = QPainterPath();
+	path.moveTo(0, half);
+	path.lineTo(mid, mid);
+	path.lineTo(half, 0);
+	path.lineTo(size - mid, mid);
+	path.lineTo(size, half);
+	path.lineTo(size - mid, size - mid);
+	path.lineTo(half, size);
+	path.lineTo(mid, size - mid);
+	path.closeSubpath();
+	p.drawPath(path);
+
+	return image;
+}
+
+class CompleteParticles final {
+public:
+	void paint(
+		QPainter &p,
+		QRect rect,
+		QPointF center,
+		float64 alpha,
+		crl::time now,
+		bool paused);
+
+private:
+	struct Particle {
+		float64 x = 0.;
+		float64 y = 0.;
+		float64 vecX = 0.;
+		float64 vecY = 0.;
+		float64 inProgress = 0.;
+		float64 baseAlpha = 0.;
+		crl::time lifeTime = 0;
+		int starIndex = 0;
+	};
+
+	void regenerate(Particle &particle, QPointF center, crl::time now);
+	[[nodiscard]] const QImage &star(int index);
+
+	std::vector<Particle> _particles;
+	std::array<QImage, 3> _stars;
+	QImage _layer;
+	std::array<float64, 3> _angle = { { 0., 0., 0. } };
+	crl::time _prevTime = 0;
+	crl::time _pausedAt = 0;
+	crl::time _pauseOffset = 0;
+
+};
+
+const QImage &CompleteParticles::star(int index) {
+	auto &image = _stars[index];
+	if (image.isNull()) {
+		const int sizes[] = {
+			st::localStorageCompleteStar1,
+			st::localStorageCompleteStar2,
+			st::localStorageCompleteStar3,
+		};
+		image = GenerateCompleteStar(sizes[index], 0.85);
+	}
+	return image;
+}
+
+void CompleteParticles::regenerate(
+		Particle &particle,
+		QPointF center,
+		crl::time now) {
+	auto bytes = std::array<uchar, 8>();
+	base::RandomFill(bytes.data(), bytes.size());
+	auto index = 0;
+	const auto next = [&] { return bytes[index++] / 255.; };
+
+	particle.starIndex = std::min(2, int(next() * 3.));
+	particle.lifeTime = now + 2000 + crl::time(next() * 1000.);
+
+	const auto field = float64(st::localStorageCompleteField);
+	const auto exclude = float64(st::localStorageCompleteExclude);
+	const auto radius = next() * (field - exclude) + exclude;
+	const auto angle = next() * 2. * M_PI;
+	particle.x = center.x() + radius * std::sin(angle);
+	particle.y = center.y() + radius * std::cos(angle);
+
+	const auto direction = std::atan2(
+		particle.y - center.y(),
+		particle.x - center.x());
+	particle.vecX = std::cos(direction);
+	particle.vecY = std::sin(direction);
+	particle.baseAlpha = (50 + int(next() * 50.)) / 100.;
+	particle.inProgress = 0.;
+}
+
+void CompleteParticles::paint(
+		QPainter &p,
+		QRect rect,
+		QPointF center,
+		float64 alpha,
+		crl::time now,
+		bool paused) {
+	if (alpha <= 0.) {
+		return;
+	} else if (_particles.empty()) {
+		_particles.resize(kCompleteParticlesCount);
+	}
+
+	if (paused) {
+		if (!_pausedAt) {
+			_pausedAt = now;
+		}
+		now = _pausedAt - _pauseOffset;
+	} else {
+		if (_pausedAt) {
+			_pauseOffset += now - _pausedAt;
+			_pausedAt = 0;
+		}
+		now -= _pauseOffset;
+	}
+
+	if (!_prevTime) {
+		_prevTime = now;
+		for (auto &particle : _particles) {
+			regenerate(particle, center, now);
+		}
+	}
+	const auto diff = std::clamp(
+		now - _prevTime,
+		crl::time(4),
+		crl::time(50));
+	_prevTime = now;
+
+	if (!paused) {
+		_angle[0] += 360. * (diff / 40000.);
+		_angle[1] += 360. * (diff / 50000.);
+		_angle[2] += 360. * (diff / 60000.);
+	}
+
+	const auto ratio = style::DevicePixelRatio();
+	const auto pixelSize = rect.size() * ratio;
+	if (_layer.size() != pixelSize) {
+		_layer = QImage(pixelSize, QImage::Format_ARGB32_Premultiplied);
+		_layer.setDevicePixelRatio(ratio);
+	}
+	_layer.fill(Qt::transparent);
+
+	auto lp = QPainter(&_layer);
+	auto hq = PainterHighQualityEnabler(lp);
+	const auto speed = st::localStorageCompleteSpeed * (diff / 660.);
+	for (auto &particle : _particles) {
+		const auto radians = _angle[particle.starIndex] * M_PI / 180.;
+		const auto cosA = std::cos(radians);
+		const auto sinA = std::sin(radians);
+		const auto dx = particle.x - center.x();
+		const auto dy = particle.y - center.y();
+		const auto drawX = center.x() + dx * cosA - dy * sinA;
+		const auto drawY = center.y() + dx * sinA + dy * cosA;
+
+		auto outProgress = 0.;
+		if (particle.lifeTime - now < 200) {
+			outProgress = std::clamp(
+				1. - (particle.lifeTime - now) / 150.,
+				0.,
+				1.);
+		}
+		const auto t = particle.inProgress - 1.;
+		const auto scale = t * t * (3. * t + 2.) + 1.;
+		const auto &image = star(particle.starIndex);
+		const auto side = image.width() / float64(ratio);
+
+		lp.save();
+		lp.setOpacity(particle.baseAlpha * (1. - outProgress));
+		lp.translate(drawX - rect.x(), drawY - rect.y());
+		lp.scale(scale, scale);
+		lp.drawImage(QPointF(-side / 2., -side / 2.), image);
+		lp.restore();
+
+		if (!paused) {
+			particle.x += particle.vecX * speed;
+			particle.y += particle.vecY * speed;
+			if (particle.inProgress < 1.) {
+				particle.inProgress = std::min(
+					particle.inProgress + diff / 200.,
+					1.);
+			}
+		}
+		if (now > particle.lifeTime
+			|| !rect.contains(QPoint(int(drawX), int(drawY)))) {
+			regenerate(particle, center, now);
+		}
+	}
+	lp.setOpacity(1.);
+	lp.setCompositionMode(QPainter::CompositionMode_SourceIn);
+	auto gradient = QLinearGradient(
+		QPointF(0, 0),
+		QPointF(0, rect.height()));
+	gradient.setColorAt(0., QColor(0x6e, 0xd5, 0x56, 0));
+	gradient.setColorAt(0.07, QColor(0x6e, 0xd5, 0x56));
+	gradient.setColorAt(0.93, QColor(0x41, 0xba, 0x71));
+	gradient.setColorAt(1., QColor(0x41, 0xba, 0x71, 0));
+	lp.fillRect(QRect(QPoint(), rect.size()), gradient);
+	lp.end();
+
+	p.setOpacity(alpha);
+	p.drawImage(rect.topLeft(), _layer);
+	p.setOpacity(1.);
+}
+
+} // namespace
+
+class LocalStorage::Chart final : public Ui::RpWidget {
+public:
+	Chart(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	void setParts(std::array<int64, kChartPartsCount> sizes, int64 total);
+	void setPartInfo(Fn<TextWithEntities(int)> info);
+	void setLoaded();
+	[[nodiscard]] int partPercent(int index) const {
+		return _percent[index];
+	}
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+	void paintEvent(QPaintEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+
+private:
+	struct Geometry {
+		float64 center = 0.;
+		float64 half = 0.;
+	};
+
+	void computeTargets();
+	[[nodiscard]] bool paused() const;
+	[[nodiscard]] std::array<Geometry, kChartPartsCount> shown() const;
+	void setSelected(int index);
+	[[nodiscard]] int segmentAt(QPointF pos) const;
+	[[nodiscard]] QPointF partCenter(int index) const;
+	void showTooltip(int index);
+	void hideTooltip();
+	[[nodiscard]] QPointF radialPoint(
+		QPointF center,
+		float64 radius,
+		float64 angle) const;
+	void drawParticles(
+		QPainter &p,
+		QPointF center,
+		int index,
+		float64 from,
+		float64 to,
+		float64 innerRadius,
+		float64 outerRadius,
+		float64 alpha);
+
+	std::array<int64, kChartPartsCount> _sizes = { { 0 } };
+	std::array<Geometry, kChartPartsCount> _from;
+	std::array<Geometry, kChartPartsCount> _to;
+	std::array<int, kChartPartsCount> _percent = { { 0 } };
+	std::array<bool, kChartPartsCount> _showPercent = { { false } };
+	std::array<float64, kChartPartsCount> _percentTarget = { { 0. } };
+	std::array<Ui::Animations::Simple, kChartPartsCount> _percentAlpha;
+	int64 _total = 0;
+
+	Ui::Animations::Simple _morph;
+	Ui::Animations::Simple _appear;
+	bool _appeared = false;
+	bool _loaded = false;
+	bool _complete = false;
+	Ui::Animations::Simple _completeAnimation;
+	CompleteParticles _completeParticles;
+
+	int _selected = -1;
+	std::array<Ui::Animations::Simple, kChartPartsCount> _selectAnimations;
+
+	const not_null<Window::SessionController*> _controller;
+	Ui::Animations::Basic _particles;
+	crl::time _particlesStart = 0;
+	crl::time _particlesPausedAt = 0;
+	bool _shown = false;
+
+	Fn<TextWithEntities(int)> _partInfo;
+	std::unique_ptr<Ui::ImportantTooltip> _tooltip;
+	int _tooltipPart = -1;
+
+};
+
+LocalStorage::Chart::Chart(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: RpWidget(parent)
+, _controller(controller) {
+	setMouseTracking(true);
+
+	_particlesStart = crl::now();
+	_particles.init([=](crl::time) {
+		update();
+		return true;
+	});
+	const auto refresh = [=] {
+		if (_shown && !paused()) {
+			if (_particlesPausedAt) {
+				_particlesStart += crl::now() - _particlesPausedAt;
+				_particlesPausedAt = 0;
+			}
+			if (!_particles.animating()) {
+				_particles.start();
+			}
+		} else {
+			if (!_particlesPausedAt) {
+				_particlesPausedAt = crl::now();
+			}
+			_particles.stop();
+		}
+	};
+	shownValue() | rpl::on_next([=](bool shown) {
+		_shown = shown;
+		refresh();
+	}, lifetime());
+	_controller->gifPauseLevelChanged(
+	) | rpl::on_next(refresh, lifetime());
+}
+
+bool LocalStorage::Chart::paused() const {
+	return anim::Disabled()
+		|| _controller->isGifPausedAtLeastFor(Window::GifPauseReason::Layer);
+}
+
+void LocalStorage::Chart::drawParticles(
+		QPainter &p,
+		QPointF center,
+		int index,
+		float64 from,
+		float64 to,
+		float64 innerRadius,
+		float64 outerRadius,
+		float64 alpha) {
+	if (alpha <= 0. || anim::Disabled()) {
+		return;
+	}
+	const auto &image = ParticleImage(index);
+	const auto size = float64(st::localStorageChartParticle);
+	const auto sqrt2 = std::sqrt(2.);
+	const auto reference = _particlesPausedAt ? _particlesPausedAt : crl::now();
+	const auto time = (reference - _particlesStart) / 10000.;
+	const auto step = 7.;
+	const auto fromStep = int(std::floor(from / step));
+	const auto toStep = int(std::ceil(to / step));
+	const auto rFrom = innerRadius - size * sqrt2;
+	const auto rTo = outerRadius + size * sqrt2;
+	for (auto k = fromStep; k <= toStep; ++k) {
+		const auto angle = k * step;
+		const auto t = std::fmod(
+			(time + 100.) * (1. + (std::sin(angle * 2000.) + 1.) * 0.25),
+			1.);
+		const auto radius = rFrom + (rTo - rFrom) * t;
+		const auto point = radialPoint(center, radius, angle);
+		const auto distance = std::hypot(
+			point.x() - center.x(),
+			point.y() - center.y());
+		const auto centerFade = std::min(distance / 64., 1.);
+		auto particleAlpha = 0.45
+			* alpha
+			* (-1.75 * std::abs(t - 0.5) + 1.)
+			* (0.25 * (std::sin(t * M_PI) - 1.) + 1.)
+			* centerFade;
+		particleAlpha = std::clamp(particleAlpha, 0., 1.);
+		if (particleAlpha <= 0.) {
+			continue;
+		}
+		const auto scale = 0.75
+			* (0.25 * (std::sin(t * M_PI) - 1.) + 1.)
+			* (0.8 + (std::sin(angle) + 1.) * 0.25);
+		const auto side = size * scale;
+		p.setOpacity(particleAlpha);
+		p.drawImage(
+			Rect(point.x() - side / 2., point.y() - side / 2., Size(side)),
+			image);
+	}
+}
+
+void LocalStorage::Chart::setLoaded() {
+	_loaded = true;
+}
+
+void LocalStorage::Chart::setParts(
+		std::array<int64, kChartPartsCount> sizes,
+		int64 total) {
+	const auto complete = _loaded && (total <= 0);
+	if (_complete != complete) {
+		_complete = complete;
+		if (_appeared) {
+			_completeAnimation.start(
+				[=] { update(); },
+				complete ? 0. : 1.,
+				complete ? 1. : 0.,
+				kChartCompleteDuration,
+				anim::easeOutQuint);
+		} else {
+			_completeAnimation.stop();
+		}
+	}
+	if (_sizes == sizes && _total == total) {
+		update();
+		return;
+	}
+	hideTooltip();
+	_from = shown();
+	_sizes = sizes;
+	_total = total;
+	computeTargets();
+
+	for (auto i = 0; i != kChartPartsCount; ++i) {
+		const auto target = _showPercent[i] ? 1. : 0.;
+		if (_percentTarget[i] != target) {
+			const auto from = _percentAlpha[i].value(_percentTarget[i]);
+			_percentTarget[i] = target;
+			_percentAlpha[i].start(
+				[=] { update(); },
+				from,
+				target,
+				kChartPercentFadeDuration);
+		}
+	}
+
+	_morph.stop();
+	_morph.start(
+		[=] { update(); },
+		0.,
+		1.,
+		kChartMorphDuration,
+		anim::easeOutQuint);
+	if (!_appeared && total > 0) {
+		_appeared = true;
+		_appear.start(
+			[=] { update(); },
+			0.,
+			1.,
+			kChartAppearDuration,
+			anim::easeOutQuint);
+	}
+	update();
+}
+
+void LocalStorage::Chart::computeTargets() {
+	auto sum = int64();
+	auto count = 0;
+	for (auto i = 0; i != kChartPartsCount; ++i) {
+		if (_sizes[i] > 0) {
+			sum += _sizes[i];
+			++count;
+		}
+	}
+	_to = std::array<Geometry, kChartPartsCount>();
+	_percent = { { 0 } };
+	_showPercent = { { false } };
+	if (sum <= 0) {
+		for (auto i = 0; i != kChartPartsCount; ++i) {
+			_to[i].center = _from[i].center;
+		}
+		return;
+	}
+
+	auto under = 0;
+	auto minus = 0.;
+	for (auto i = 0; i != kChartPartsCount; ++i) {
+		const auto fraction = _sizes[i] / float64(sum);
+		if (fraction > 0. && fraction < kChartMinFraction) {
+			++under;
+			minus += fraction;
+		}
+	}
+
+	auto values = std::vector<float64>(kChartPartsCount);
+	for (auto i = 0; i != kChartPartsCount; ++i) {
+		values[i] = float64(_sizes[i]);
+	}
+	const auto percentage = Statistic::PiePartsPercentage(
+		values,
+		float64(sum),
+		true);
+
+	const auto separators = (count >= 2) ? count : 0;
+	const auto sweep = 360. - kChartSeparator * separators;
+	auto start = 0.;
+	auto drawn = 0;
+	for (auto i = 0; i != kChartPartsCount; ++i) {
+		const auto from = start + drawn * kChartSeparator;
+		const auto fraction = _sizes[i] / float64(sum);
+		if (fraction <= 0.) {
+			_to[i].center = from;
+			_to[i].half = 0.;
+			continue;
+		}
+		_percent[i] = int(base::SafeRound(
+			percentage.parts[i].roundedPercentage * 100.));
+		_showPercent[i] = (fraction > 0.05) && (fraction < 1.);
+		auto adjusted = fraction;
+		if (adjusted < kChartMinFraction) {
+			adjusted = kChartMinFraction;
+		} else {
+			adjusted *= 1. - (kChartMinFraction * under - minus);
+		}
+		const auto to = from + adjusted * sweep;
+		_to[i].center = (from + to) / 2.;
+		_to[i].half = (to - from) / 2.;
+		start += adjusted * sweep;
+		++drawn;
+	}
+}
+
+auto LocalStorage::Chart::shown() const
+-> std::array<Geometry, kChartPartsCount> {
+	const auto progress = _morph.value(1.);
+	auto result = std::array<Geometry, kChartPartsCount>();
+	for (auto i = 0; i != kChartPartsCount; ++i) {
+		result[i].center = _from[i].center
+			+ (_to[i].center - _from[i].center) * progress;
+		result[i].half = _from[i].half
+			+ (_to[i].half - _from[i].half) * progress;
+	}
+	return result;
+}
+
+QPointF LocalStorage::Chart::radialPoint(
+		QPointF center,
+		float64 radius,
+		float64 angle) const {
+	const auto radians = angle * M_PI / 180.;
+	return QPointF(
+		center.x() + radius * std::cos(radians),
+		center.y() + radius * std::sin(radians));
+}
+
+void LocalStorage::Chart::setSelected(int index) {
+	if (_selected == index) {
+		return;
+	}
+	const auto previous = _selected;
+	_selected = index;
+	const auto animate = [&](int i, float64 to) {
+		_selectAnimations[i].start(
+			[=] { update(); },
+			1. - to,
+			to,
+			kChartSelectDuration,
+			anim::easeOutQuint);
+	};
+	if (previous >= 0) {
+		animate(previous, 0.);
+	}
+	if (index >= 0) {
+		animate(index, 1.);
+	}
+	setCursor(index >= 0 ? style::cur_pointer : style::cur_default);
+	update();
+}
+
+int LocalStorage::Chart::resizeGetHeight(int newWidth) {
+	return st::localStorageChartHeight;
+}
+
+int LocalStorage::Chart::segmentAt(QPointF pos) const {
+	const auto center = QPointF(width() / 2., height() / 2.);
+	const auto outer = st::localStorageChartDiameter / 2.;
+	const auto thickness = st::localStorageChartThickness;
+	const auto inner = outer - thickness;
+	const auto dx = pos.x() - center.x();
+	const auto dy = pos.y() - center.y();
+	const auto distance = std::hypot(dx, dy);
+	if (distance < inner - st::localStorageChartSelectGrow
+		|| distance > outer + st::localStorageChartSelectGrow) {
+		return -1;
+	}
+	auto angle = std::atan2(dy, dx) * 180. / M_PI;
+	if (angle < 0.) {
+		angle += 360.;
+	}
+	const auto geometry = shown();
+	for (auto i = 0; i != kChartPartsCount; ++i) {
+		if (geometry[i].half <= 0.) {
+			continue;
+		}
+		auto delta = std::fmod(std::abs(angle - geometry[i].center), 360.);
+		if (delta > 180.) {
+			delta = 360. - delta;
+		}
+		if (delta <= geometry[i].half) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+void LocalStorage::Chart::mouseMoveEvent(QMouseEvent *e) {
+	setSelected(segmentAt(e->pos()));
+}
+
+void LocalStorage::Chart::mousePressEvent(QMouseEvent *e) {
+	const auto index = segmentAt(e->pos());
+	if (index < 0 || index == _tooltipPart) {
+		hideTooltip();
+	} else {
+		showTooltip(index);
+	}
+}
+
+QPointF LocalStorage::Chart::partCenter(int index) const {
+	const auto center = QPointF(width() / 2., height() / 2.);
+	const auto outer = st::localStorageChartDiameter / 2.;
+	const auto thickness = float64(st::localStorageChartThickness);
+	const auto midRadius = outer - thickness / 2.;
+	const auto geometry = shown();
+	return radialPoint(center, midRadius, geometry[index].center);
+}
+
+void LocalStorage::Chart::setPartInfo(Fn<TextWithEntities(int)> info) {
+	_partInfo = std::move(info);
+}
+
+void LocalStorage::Chart::showTooltip(int index) {
+	hideTooltip();
+	const auto parent = window();
+	if (!parent || !_partInfo || index < 0) {
+		return;
+	}
+	_tooltipPart = index;
+	_tooltip = std::make_unique<Ui::ImportantTooltip>(
+		parent,
+		Ui::MakeNiceTooltipLabel(
+			parent,
+			rpl::single(_partInfo(index)),
+			st::localStorageUsageTooltipMaxWidth,
+			st::defaultImportantTooltipLabel),
+		st::defaultImportantTooltip);
+	const auto tooltip = _tooltip.get();
+	const auto weak = base::make_weak(tooltip);
+	tooltip->setAttribute(Qt::WA_TransparentForMouseEvents);
+	tooltip->setHiddenCallback([=] { delete weak.get(); });
+	const auto local = partCenter(index);
+	const auto upper = (local.y() < height() / 2.);
+	auto area = QRect(local.toPoint(), QSize());
+	area.translate(0, upper
+		? -st::localStorageUsageTooltipSkip
+		: st::localStorageUsageTooltipSkip);
+	area = Ui::MapFrom(parent, this, area);
+	tooltip->pointAt(area, upper ? RectPart::Top : RectPart::Bottom);
+	tooltip->toggleAnimated(true);
+}
+
+void LocalStorage::Chart::hideTooltip() {
+	_tooltipPart = -1;
+	if (const auto tooltip = _tooltip.release()) {
+		tooltip->toggleAnimated(false);
+	}
+}
+
+void LocalStorage::Chart::leaveEventHook(QEvent *e) {
+	setSelected(-1);
+}
+
+void LocalStorage::Chart::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	auto hq = PainterHighQualityEnabler(p);
+
+	const auto appear = (_total <= 0)
+		? 1.
+		: (_appeared ? _appear.value(1.) : 0.);
+	const auto complete = _completeAnimation.value(_complete ? 1. : 0.);
+	const auto segmentAppear = appear * (1. - complete);
+	const auto center = QPointF(width() / 2., height() / 2.);
+	const auto outer = st::localStorageChartDiameter / 2.;
+	const auto thin = float64(st::localStorageChartThicknessThin);
+	const auto full = float64(st::localStorageChartThickness);
+	const auto thickness = thin + (full - thin) * segmentAppear;
+	const auto rotation = (1. - appear) * -120.;
+	const auto midRadius = outer - thickness / 2.;
+
+	p.setOpacity(appear);
+
+	auto background = QPen(st::windowBgOver->c);
+	background.setWidthF(thickness);
+	background.setCapStyle(Qt::FlatCap);
+	p.setPen(background);
+	p.setBrush(Qt::NoBrush);
+	p.drawEllipse(center, midRadius, midRadius);
+
+	p.setOpacity(segmentAppear);
+	const auto geometry = shown();
+	for (auto i = 0; i != kChartPartsCount; ++i) {
+		if (geometry[i].half <= 0.1) {
+			continue;
+		}
+		const auto selected = _selectAnimations[i].value(
+			(_selected == i) ? 1. : 0.);
+		const auto grow = selected * st::localStorageChartSelectGrow;
+		const auto segmentThickness = thickness + grow;
+		const auto segmentMid = midRadius + grow / 2.;
+		const auto segmentOuter = outer + grow;
+		const auto base = PartColor(i);
+
+		auto gradient = QRadialGradient(center, segmentOuter);
+		gradient.setColorAt(
+			0.3,
+			anim::color(base, QColor(255, 255, 255), 0.30));
+		gradient.setColorAt(1., base);
+
+		auto pen = QPen(QBrush(gradient), segmentThickness);
+		pen.setCapStyle(Qt::FlatCap);
+		p.setPen(pen);
+
+		const auto from = geometry[i].center - geometry[i].half + rotation;
+		const auto to = geometry[i].center + geometry[i].half + rotation;
+		const auto rect = Rect(
+			center.x() - segmentMid,
+			center.y() - segmentMid,
+			Size(segmentMid * 2.));
+		const auto startAngle = qRound(-from * 16.);
+		const auto spanAngle = -qRound((to - from) * 16.);
+		p.drawArc(rect, startAngle, spanAngle);
+
+		const auto innerRadius = segmentOuter - segmentThickness;
+		const auto outerRect = Rect(
+			center.x() - segmentOuter,
+			center.y() - segmentOuter,
+			Size(segmentOuter * 2.));
+		const auto innerRect = Rect(
+			center.x() - innerRadius,
+			center.y() - innerRadius,
+			Size(innerRadius * 2.));
+		auto sector = QPainterPath();
+		sector.arcMoveTo(outerRect, startAngle / 16.);
+		sector.arcTo(outerRect, startAngle / 16., spanAngle / 16.);
+		sector.arcTo(
+			innerRect,
+			(startAngle + spanAngle) / 16.,
+			-spanAngle / 16.);
+		sector.closeSubpath();
+		p.save();
+		p.setClipPath(sector);
+		drawParticles(
+			p,
+			center,
+			i,
+			from,
+			to,
+			innerRadius,
+			segmentOuter,
+			segmentAppear);
+		p.restore();
+		p.setOpacity(segmentAppear);
+	}
+
+	p.setFont(st::localStorageChartPercentFont);
+	const auto percentFont = st::localStorageChartPercentFont;
+	for (auto i = 0; i != kChartPartsCount; ++i) {
+		const auto labelAlpha = _percentAlpha[i].value(_percentTarget[i]);
+		if (labelAlpha <= 0. || geometry[i].half <= 0.1) {
+			continue;
+		}
+		const auto selected = _selectAnimations[i].value(
+			(_selected == i) ? 1. : 0.);
+		const auto point = radialPoint(
+			center,
+			midRadius + selected * st::localStorageChartSelectGrow / 2.,
+			geometry[i].center + rotation);
+		const auto text = QString::number(_percent[i]) + '%';
+		const auto twidth = percentFont->width(text);
+		p.setOpacity(appear * labelAlpha);
+		p.setPen(QColor(255, 255, 255));
+		p.save();
+		p.translate(point);
+		const auto scale = 1. + selected * 0.1;
+		p.scale(scale, scale);
+		p.drawText(
+			QRectF(
+				-twidth,
+				-percentFont->height,
+				twidth * 2.,
+				percentFont->height * 2.),
+			text,
+			QTextOption(Qt::AlignCenter));
+		p.restore();
+	}
+	p.setOpacity(1.);
+
+	const auto number = QString::number(
+		(_total + kMegabyte - 1) / kMegabyte);
+	const auto unit = u"MB"_q;
+	const auto sizeFont = st::localStorageChartSizeFont;
+	const auto unitFont = st::localStorageChartUnitFont;
+	const auto blockHeight = sizeFont->height + unitFont->height;
+	const auto top = (st::localStorageChartHeight - blockHeight) / 2;
+
+	p.setOpacity(segmentAppear);
+	p.save();
+	const auto scale = 0.6 + 0.4 * appear;
+	p.translate(center);
+	p.scale(scale, scale);
+	p.translate(-center);
+	p.setFont(sizeFont);
+	p.setPen(st::windowBoldFg);
+	p.drawText(
+		QRect(0, top, width(), sizeFont->height),
+		number,
+		style::al_top);
+	p.setFont(unitFont);
+	p.setPen(st::windowSubTextFg);
+	p.drawText(
+		QRect(0, top + sizeFont->height, width(), unitFont->height),
+		unit,
+		style::al_top);
+	p.restore();
+
+	if (complete > 0.) {
+		_completeParticles.paint(
+			p,
+			rect(),
+			center,
+			complete,
+			crl::now(),
+			paused());
+
+		auto gradient = QLinearGradient(
+			QPointF(center.x(), center.y() - outer),
+			QPointF(center.x(), center.y() + outer));
+		gradient.setColorAt(0., QColor(0x6e, 0xd5, 0x56));
+		gradient.setColorAt(1., QColor(0x41, 0xba, 0x71));
+		const auto brush = QBrush(gradient);
+		p.setOpacity(complete);
+		p.setBrush(Qt::NoBrush);
+
+		auto ring = QPen(brush, thickness);
+		ring.setCapStyle(Qt::FlatCap);
+		p.setPen(ring);
+		p.drawEllipse(center, midRadius, midRadius);
+
+		const auto boxLeft = center.x() - outer;
+		const auto boxTop = center.y() - outer;
+		const auto diameter = outer * 2.;
+		auto check = QPainterPath();
+		check.moveTo(boxLeft + diameter * 0.348, boxTop + diameter * 0.538);
+		check.lineTo(boxLeft + diameter * 0.447, boxTop + diameter * 0.636);
+		check.lineTo(boxLeft + diameter * 0.678, boxTop + diameter * 0.402);
+		auto checkPen = QPen(brush, thin);
+		checkPen.setCapStyle(Qt::RoundCap);
+		checkPen.setJoinStyle(Qt::RoundJoin);
+		p.setPen(checkPen);
+		p.drawPath(check);
+	}
+	p.setOpacity(1.);
+}
+
+class LocalStorage::DeviceBar final : public Ui::RpWidget {
+public:
+	explicit DeviceBar(QWidget *parent);
+
+	void setCache(int64 cache);
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+	void paintEvent(QPaintEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+
+private:
+	void refresh();
+	void apply();
+	[[nodiscard]] QRect barRect() const;
+	[[nodiscard]] TextWithEntities tooltipText() const;
+	void showTooltip();
+	void hideTooltip();
+
+	object_ptr<Ui::FlatLabel> _subtitle;
+	std::unique_ptr<Ui::ImportantTooltip> _tooltip;
+	int64 _reported = 0;
+	int64 _cache = 0;
+	int64 _total = 0;
+	int64 _free = 0;
+
+};
+
+LocalStorage::DeviceBar::DeviceBar(QWidget *parent)
+: RpWidget(parent)
+, _subtitle(this, QString(), st::localStorageUsageSubtitle) {
+	_subtitle->setAttribute(Qt::WA_TransparentForMouseEvents);
+	setMouseTracking(true);
+	refresh();
+}
+
+void LocalStorage::DeviceBar::refresh() {
+	const auto weak = base::make_weak(this);
+	const auto dir = cWorkingDir();
+	crl::async([=] {
+		const auto info = QStorageInfo(dir);
+		const auto total = info.isValid() ? info.bytesTotal() : int64();
+		const auto free = info.isValid() ? info.bytesAvailable() : int64();
+		crl::on_main(weak, [=] {
+			_total = total;
+			_free = (free > total) ? total : free;
+			apply();
+		});
+	});
+}
+
+void LocalStorage::DeviceBar::apply() {
+	const auto used = std::max(_total - _free, int64());
+	_cache = std::min(_reported, used);
+	_subtitle->setText(tr::lng_local_storage_device_usage(
+		tr::now,
+		lt_percent,
+		FormatStoragePercent(_cache, _total)));
+	resizeToWidth(width());
+	update();
+}
+
+void LocalStorage::DeviceBar::setCache(int64 cache) {
+	_reported = cache;
+	apply();
+	refresh();
+}
+
+QRect LocalStorage::DeviceBar::barRect() const {
+	const auto width = std::min(st::localStorageUsageBarWidth, QWidget::width());
+	const auto top = st::localStorageUsageTopSkip
+		+ _subtitle->height()
+		+ st::localStorageUsageBarSkip;
+	return QRect(
+		(QWidget::width() - width) / 2,
+		top,
+		width,
+		st::localStorageUsageBarHeight);
+}
+
+int LocalStorage::DeviceBar::resizeGetHeight(int newWidth) {
+	_subtitle->resizeToWidth(newWidth);
+	_subtitle->moveToLeft(0, st::localStorageUsageTopSkip, newWidth);
+	return st::localStorageUsageTopSkip
+		+ _subtitle->height()
+		+ st::localStorageUsageBarSkip
+		+ st::localStorageUsageBarHeight
+		+ st::localStorageUsageBottomSkip;
+}
+
+void LocalStorage::DeviceBar::paintEvent(QPaintEvent *e) {
+	if (_total <= 0) {
+		return;
+	}
+	auto p = QPainter(this);
+	auto hq = PainterHighQualityEnabler(p);
+
+	const auto bar = QRectF(barRect());
+	const auto radius = bar.height() / 2.;
+	const auto used = _total - _free;
+	const auto cacheColor = st::activeButtonBg->c;
+	const auto usedColor = st::scrollBg->c;
+	const auto freeColor = st::windowBgRipple->c;
+
+	auto path = QPainterPath();
+	path.addRoundedRect(bar, radius, radius);
+	p.setClipPath(path);
+	p.fillRect(bar, freeColor);
+
+	const auto fill = [&](int64 from, int64 size, QColor color) {
+		if (size <= 0) {
+			return;
+		}
+		const auto x1 = bar.x() + bar.width() * (from / float64(_total));
+		const auto x2 = bar.x()
+			+ bar.width() * ((from + size) / float64(_total));
+		p.fillRect(QRectF(x1, bar.y(), x2 - x1, bar.height()), color);
+	};
+	fill(0, used, usedColor);
+	fill(0, _cache, cacheColor);
+}
+
+void LocalStorage::DeviceBar::mouseMoveEvent(QMouseEvent *e) {
+	if (_total > 0 && barRect().marginsAdded(st::localStorageUsageBarMargin)
+			.contains(e->pos())) {
+		showTooltip();
+	} else {
+		hideTooltip();
+	}
+}
+
+void LocalStorage::DeviceBar::leaveEventHook(QEvent *e) {
+	hideTooltip();
+}
+
+TextWithEntities LocalStorage::DeviceBar::tooltipText() const {
+	const auto used = _total - _free;
+	const auto other = std::max(used - _cache, int64());
+	auto result = TextWithEntities();
+	const auto line = [&](const QString &label, int64 size) {
+		if (!result.text.isEmpty()) {
+			result.append('\n');
+		}
+		result.append(label).append(u": "_q).append(
+			Ui::Text::Bold(FormatStorageSize(size)));
+	};
+	line(tr::lng_local_storage_device_telegram(tr::now), _cache);
+	line(tr::lng_local_storage_device_other(tr::now), other);
+	line(tr::lng_local_storage_device_free(tr::now), _free);
+	line(tr::lng_local_storage_device_total(tr::now), _total);
+	return result;
+}
+
+void LocalStorage::DeviceBar::showTooltip() {
+	if (_tooltip || _total <= 0) {
+		return;
+	}
+	const auto parent = window();
+	if (!parent) {
+		return;
+	}
+	_tooltip = std::make_unique<Ui::ImportantTooltip>(
+		parent,
+		Ui::MakeNiceTooltipLabel(
+			parent,
+			rpl::single(tooltipText()),
+			st::localStorageUsageTooltipMaxWidth,
+			st::defaultImportantTooltipLabel),
+		st::defaultImportantTooltip);
+	const auto tooltip = _tooltip.get();
+	const auto weak = base::make_weak(tooltip);
+	tooltip->setAttribute(Qt::WA_TransparentForMouseEvents);
+	tooltip->setHiddenCallback([=] { delete weak.get(); });
+	auto area = Ui::MapFrom(parent, this, barRect());
+	area.translate(0, -st::localStorageUsageTooltipSkip);
+	tooltip->pointAt(area, RectPart::Top);
+	tooltip->toggleAnimated(true);
+}
+
+void LocalStorage::DeviceBar::hideTooltip() {
+	if (const auto tooltip = _tooltip.release()) {
+		tooltip->toggleAnimated(false);
+	}
+}
+
+class LocalStorage::ClearButton final : public Ui::RippleButton {
+public:
+	explicit ClearButton(QWidget *parent);
+
+	void setText(const QString &label, const QString &amount);
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+	void paintEvent(QPaintEvent *e) override;
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+private:
+	Ui::AnimatedString _label;
+	Ui::AnimatedString _amount;
+
+};
+
+LocalStorage::ClearButton::ClearButton(QWidget *parent)
+: RippleButton(parent, st::defaultRippleAnimation)
+, _label(st::localStorageClearFont, [=] { update(); }, {
+	.splitByWords = true,
+	.preserveIndex = true,
+	.startFromEnd = true,
+	.moveAmplitude = 0.25,
+	.duration = crl::time(300),
+})
+, _amount(st::localStorageClearFont, [=] { update(); }, {
+	.splitByWords = true,
+	.preserveIndex = true,
+	.startFromEnd = true,
+	.moveAmplitude = 0.25,
+	.duration = crl::time(300),
+}) {
+}
+
+void LocalStorage::ClearButton::setText(
+		const QString &label,
+		const QString &amount) {
+	_label.setText(label);
+	_amount.setText(amount);
+}
+
+int LocalStorage::ClearButton::resizeGetHeight(int newWidth) {
+	return st::localStorageClearHeight;
+}
+
+void LocalStorage::ClearButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	auto hq = PainterHighQualityEnabler(p);
+
+	const auto disabled = isDisabled();
+	const auto radius = height() / 2.;
+	p.setPen(Qt::NoPen);
+	p.setBrush(disabled ? st::windowBgRipple : st::activeButtonBg);
+	p.drawRoundedRect(rect(), radius, radius);
+
+	if (!disabled) {
+		const auto ripple = st::activeButtonBgRipple->c;
+		paintRipple(p, 0, 0, &ripple);
+	}
+
+	const auto font = st::localStorageClearFont;
+	const auto labelWidth = _label.currentWidth();
+	const auto amountWidth = _amount.currentWidth();
+	const auto skip = (amountWidth > 0.) ? st::localStorageClearSkip : 0;
+	const auto left = (width() - labelWidth - skip - amountWidth) / 2.;
+	const auto top = (height() - font->height) / 2;
+	const auto fg = disabled ? st::windowSubTextFg->c : st::activeButtonFg->c;
+	_label.draw(p, int(base::SafeRound(left)), top, fg);
+	_amount.draw(p, int(base::SafeRound(left + labelWidth + skip)), top, fg, 0.6);
+}
+
+QImage LocalStorage::ClearButton::prepareRippleMask() const {
+	return Ui::RippleAnimation::RoundRectMask(size(), height() / 2);
+}
+
+QPoint LocalStorage::ClearButton::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos());
+}
+
+class LocalStorage::Row final : public Ui::RippleButton {
+public:
+	Row(
+		QWidget *parent,
+		const QString &title,
+		int chartIndex,
+		bool checked,
+		const Database::TaggedSummary &data);
+
+	void update(const Database::TaggedSummary &data);
+	void setPercent(int percent);
+	void setRoundedTop(bool rounded);
+
+	[[nodiscard]] bool checked() const;
+	[[nodiscard]] rpl::producer<bool> checkedChanges() const;
+	void setChecked(bool checked);
+	void shake();
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+	void paintEvent(QPaintEvent *e) override;
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+private:
+	QString sizeText(const Database::TaggedSummary &data) const;
+	void toggle();
+
+	style::complex_color _checkColor;
+	style::Check _checkStyle;
+	Ui::RoundCheckView _check;
+	object_ptr<Ui::FlatLabel> _percent;
+	object_ptr<Ui::FlatLabel> _name;
+	object_ptr<Ui::FlatLabel> _size;
+	rpl::event_stream<bool> _checkedChanges;
+	Ui::Animations::Simple _shake;
+	bool _roundedTop = false;
+	bool _hasPercent = false;
+
+};
+
+LocalStorage::Row::Row(
+	QWidget *parent,
+	const QString &title,
+	int chartIndex,
+	bool checked,
+	const Database::TaggedSummary &data)
+: RippleButton(parent, st::defaultRippleAnimation)
+, _checkColor([=] { return PartColor(chartIndex); })
+, _checkStyle(st::localStorageCategoryCheck)
+, _check(_checkStyle, checked, [=] { Ui::RpWidget::update(); })
+, _percent(this, QString(), st::localStorageCategoryPercent)
+, _name(this, title, st::localStorageCategoryName)
+, _size(this, sizeText(data), st::localStorageCategorySize) {
+	_checkStyle.toggledFg = _checkColor.color();
+	_percent->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_name->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_size->setAttribute(Qt::WA_TransparentForMouseEvents);
+	setClickedCallback([=] { toggle(); });
+}
+
+void LocalStorage::Row::toggle() {
+	const auto value = !_check.checked();
+	_check.setChecked(value, anim::type::normal);
+	_checkedChanges.fire_copy(value);
+}
+
+bool LocalStorage::Row::checked() const {
+	return _check.checked();
+}
+
+rpl::producer<bool> LocalStorage::Row::checkedChanges() const {
+	return _checkedChanges.events();
+}
+
+void LocalStorage::Row::setChecked(bool checked) {
+	_check.setChecked(checked, anim::type::normal);
+}
+
+void LocalStorage::Row::shake() {
+	_shake.stop();
+	_shake.start(
+		Ui::DefaultShakeCallback([=](int shift) { move(shift, y()); }),
+		0.,
+		1.,
+		st::shakeDuration);
+}
+
+void LocalStorage::Row::setRoundedTop(bool rounded) {
+	_roundedTop = rounded;
+}
+
+void LocalStorage::Row::update(const Database::TaggedSummary &data) {
+	_size->setText(sizeText(data));
+	resizeToWidth(width());
+}
+
+void LocalStorage::Row::setPercent(int percent) {
+	_hasPercent = (percent > 0);
+	_percent->setText(_hasPercent
+		? (QString::number(percent) + '%')
+		: QString());
+	resizeToWidth(width());
+}
+
+int LocalStorage::Row::resizeGetHeight(int newWidth) {
+	const auto height = st::localStorageCategoryHeight;
+	const auto pad = st::localStorageCategoryPadding;
+	const auto checkSize = _check.getSize();
+	const auto left = pad.left()
+		+ checkSize.width()
+		+ st::localStorageCategoryCheckSkip;
+
+	_size->resizeToWidth(std::min(_size->textMaxWidth(), newWidth));
+	_size->moveToRight(pad.right(), (height - _size->height()) / 2, newWidth);
+
+	_percent->resizeToWidth(_percent->textMaxWidth());
+	_percent->setVisible(_hasPercent);
+	const auto percentWidth = _hasPercent
+		? (st::localStorageCategoryPercentSkip + _percent->width())
+		: 0;
+	const auto nameAvailable = std::max(
+		_size->x() - st::localStorageCategoryPercentSkip - percentWidth - left,
+		0);
+	_name->resizeToWidth(std::min(_name->textMaxWidth(), nameAvailable));
+	_name->moveToLeft(left, (height - _name->height()) / 2, newWidth);
+	if (_hasPercent) {
+		_percent->moveToLeft(
+			left + _name->width() + st::localStorageCategoryPercentSkip,
+			(height - _percent->height()) / 2,
+			newWidth);
+	}
+	return height;
+}
+
+void LocalStorage::Row::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	paintRipple(p, 0, 0);
+	const auto pad = st::localStorageCategoryPadding;
+	const auto checkSize = _check.getSize();
+	_check.paint(
+		p,
+		pad.left(),
+		(height() - checkSize.height()) / 2,
+		width());
+}
+
+QImage LocalStorage::Row::prepareRippleMask() const {
+	if (!_roundedTop) {
+		return Ui::RippleAnimation::RectMask(size());
+	}
+	const auto radius = st::localStorageIslandRadius;
+	return Ui::RippleAnimation::MaskByDrawer(size(), false, [&](QPainter &p) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(Qt::white);
+		p.drawRoundedRect(
+			Rect(QSize(width(), height() + radius)),
+			radius,
+			radius);
+	});
+}
+
+QPoint LocalStorage::Row::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos());
+}
+
+QString LocalStorage::Row::sizeText(
+		const Database::TaggedSummary &data) const {
+	return data.totalSize
+		? Ui::FormatSizeText(data.totalSize)
+		: tr::lng_local_storage_empty(tr::now);
+}
+
+LocalStorage::LocalStorage(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: Section(parent, controller)
+, _session(&controller->session())
+, _db(&_session->data().cache())
+, _dbBig(&_session->data().cacheBigFile())
+, _bottomSkipRounding(st::boxRadius, st::windowBgOver) {
+	const auto &settings = _session->local().cacheSettings();
+	const auto &settingsBig = _session->local().cacheBigFileSettings();
+	_totalSizeLimit = settings.totalSizeLimit + settingsBig.totalSizeLimit;
+	_mediaSizeLimit = settingsBig.totalSizeLimit;
+	_timeLimit = settings.totalTimeLimit;
+
+	setupContent();
+}
+
+rpl::producer<QString> LocalStorage::title() {
+	return tr::lng_local_storage_title();
+}
+
+bool LocalStorage::paintOuter(
+		not_null<QWidget*> outer,
+		int maxVisibleHeight,
+		QRect clip) {
+	QPainter(outer.get()).fillRect(clip, st::windowBgOver);
+	return true;
+}
+
+void LocalStorage::showFinished() {
+	Section::showFinished();
+
+	if (_clearButton) {
+		controller()->checkHighlightControl(
+			u"storage/clear-cache"_q,
+			_clearButton,
+			{ .rippleShape = true });
+	}
+	if (_totalSlider) {
+		const auto add = st::roundRadiusSmall;
+		controller()->checkHighlightControl(
+			u"storage/max-cache"_q,
+			_totalSlider,
+			{ .margin = Margins(-add), .radius = add });
+	}
+}
+
+void LocalStorage::updateRow(
+		not_null<Ui::SlideWrap<Row>*> row,
+		const Database::TaggedSummary *data) {
+	const auto shown = (data && data->count && data->totalSize);
+	if (shown) {
+		row->entity()->update(*data);
+	}
+	row->toggle(shown, anim::type::normal);
+}
+
+void LocalStorage::update(
+		Database::Stats &&stats,
+		Database::Stats &&statsBig) {
+	_stats = std::move(stats);
+	_statsBig = std::move(statsBig);
+	for (const auto &entry : _rows) {
+		if (entry.first == kFakeMediaCacheTag) {
+			updateRow(entry.second, &_statsBig.full);
+		} else if (entry.first) {
+			const auto i = _stats.tagged.find(entry.first);
+			updateRow(
+				entry.second,
+				(i != end(_stats.tagged)) ? &i->second : nullptr);
+		}
+	}
+	updateRowCorners();
+	if (_chart) {
+		_chart->setLoaded();
+	}
+	updateChart();
+	updateDeviceBar();
+	updateClearButton();
+	updateCategoriesWrap();
+	finishClearing();
+}
+
+void LocalStorage::updateCategoriesWrap() {
+	if (!_categoriesWrap) {
+		return;
+	}
+	_categoriesWrap->toggle(
+		summary().totalSize > 0,
+		_categoriesInited ? anim::type::normal : anim::type::instant);
+	_categoriesInited = true;
+}
+
+void LocalStorage::toggleSelected(
+		int chartIndex,
+		bool selected,
+		not_null<Row*> row) {
+	if (!selected) {
+		const auto sizes = chartedSizes();
+		auto count = 0;
+		for (auto i = 0; i != kChartPartsCount; ++i) {
+			if (_selected[i] && sizes[i] > 0) {
+				++count;
+			}
+		}
+		if (count <= 1) {
+			row->setChecked(true);
+			row->shake();
+			return;
+		}
+	}
+	_selected[chartIndex] = selected;
+	auto all = true;
+	for (const auto value : _selected) {
+		if (!value) {
+			all = false;
+			break;
+		}
+	}
+	_allSelected = all;
+	updateChart();
+	updateClearButton();
+}
+
+std::array<int64, kChartPartsCount> LocalStorage::chartedSizes() const {
+	auto result = std::array<int64, kChartPartsCount>();
+	for (auto i = 0; i != kChartPartsCount; ++i) {
+		const auto tag = kChartTags[i];
+		if (tag == kFakeMediaCacheTag) {
+			result[i] = _statsBig.full.totalSize;
+		} else {
+			const auto j = _stats.tagged.find(uint8(tag));
+			result[i] = (j != end(_stats.tagged))
+				? j->second.totalSize
+				: int64();
+		}
+	}
+	return result;
+}
+
+void LocalStorage::updateChart() {
+	if (!_chart) {
+		return;
+	}
+	auto sizes = chartedSizes();
+	auto total = int64();
+	for (auto i = 0; i != kChartPartsCount; ++i) {
+		if (_selected[i]) {
+			total += sizes[i];
+		} else {
+			sizes[i] = 0;
+		}
+	}
+	_chart->setParts(sizes, total);
+	updateCategoryPercents();
+}
+
+void LocalStorage::updateCategoryPercents() {
+	for (const auto &[tag, row] : _rows) {
+		const auto index = ChartIndexForTag(tag);
+		if (index < 0) {
+			continue;
+		}
+		row->entity()->setPercent(_chart->partPercent(index));
+	}
+}
+
+void LocalStorage::updateRowCorners() {
+	auto first = true;
+	for (const auto &[tag, wrap] : _rows) {
+		const auto shown = wrap->toggled();
+		wrap->entity()->setRoundedTop(shown && first);
+		if (shown) {
+			first = false;
+		}
+	}
+}
+
+void LocalStorage::updateDeviceBar() {
+	if (_deviceBar) {
+		_deviceBar->setCache(summary().totalSize);
+	}
+}
+
+void LocalStorage::updateClearButton() {
+	if (!_clearButton) {
+		return;
+	}
+	const auto all = _allSelected.current();
+	auto freed = int64();
+	if (all) {
+		freed = summary().totalSize;
+	} else {
+		const auto sizes = chartedSizes();
+		for (auto i = 0; i != kChartPartsCount; ++i) {
+			if (_selected[i]) {
+				freed += sizes[i];
+			}
+		}
+	}
+	_clearButton->setText(
+		(all
+			? tr::lng_local_storage_clear(tr::now)
+			: tr::lng_local_storage_clear_selected(tr::now)),
+		(freed > 0) ? Ui::FormatSizeText(freed) : QString());
+	_clearButton->setDisabled(freed <= 0);
+}
+
+void LocalStorage::showClearingBox() {
+	if (_clearingBox) {
+		return;
+	}
+	auto box = Box([=](not_null<Ui::GenericBox*> box) {
+		box->setWidth(st::boxWidth);
+		box->setCloseByOutsideClick(false);
+		box->boxClosing(
+		) | rpl::on_next(crl::guard(this, [=] {
+			if (!_clearingStarted) {
+				_clearRequested = false;
+				_minDurationPassed = false;
+			}
+		}), box->lifetime());
+		auto icon = CreateLottieIcon(
+			box->verticalLayout(),
+			{
+				.name = u"cleaning_cache"_q,
+				.sizeOverride = st::localStorageClearingLottieSize,
+			},
+			st::localStorageClearingSpinnerPadding);
+		const auto animate = std::move(icon.animate);
+		box->addRow(std::move(icon.widget));
+		box->setShowFinishedCallback(crl::guard(this, [=] {
+			animate(anim::repeat::loop);
+			if (_clearingStarted) {
+				return;
+			}
+			_clearingStarted = true;
+			startClearing();
+			base::call_delayed(kClearingMinDuration, this, [=] {
+				_minDurationPassed = true;
+				finishClearing();
+			});
+		}));
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_local_storage_clearing(),
+				st::changePhoneTitle),
+			st::changePhoneTitlePadding,
+			style::al_top);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_local_storage_clearing_about(),
+				st::changePhoneDescription),
+			st::changePhoneDescriptionPadding,
+			style::al_top);
+	});
+	const auto raw = box.data();
+	_clearingBox = base::make_weak(raw);
+	controller()->show(std::move(box));
+}
+
+auto LocalStorage::summary() const -> Database::TaggedSummary {
+	auto result = _stats.full;
+	result.count += _statsBig.full.count;
+	result.totalSize += _statsBig.full.totalSize;
+	return result;
+}
+
+void LocalStorage::clearSelected() {
+	if (_clearRequested) {
+		return;
+	}
+	_clearRequested = true;
+	_clearingStarted = false;
+	_minDurationPassed = false;
+	if (_allSelected.current()) {
+		_clearFreedBase = summary().totalSize;
+	} else {
+		const auto sizes = chartedSizes();
+		auto freed = int64();
+		for (auto i = 0; i != kChartPartsCount; ++i) {
+			if (_selected[i]) {
+				freed += sizes[i];
+			}
+		}
+		_clearFreedBase = freed;
+	}
+	showClearingBox();
+}
+
+void LocalStorage::startClearing() {
+	if (_allSelected.current()) {
+		_db->clear();
+		_dbBig->clear();
+		Ui::Emoji::ClearIrrelevantCache();
+		return;
+	}
+	for (auto i = 0; i != kChartPartsCount; ++i) {
+		if (!_selected[i]) {
+			continue;
+		}
+		const auto tag = kChartTags[i];
+		if (tag == kFakeMediaCacheTag) {
+			_dbBig->clear();
+		} else {
+			_db->clearByTag(uint8(tag));
+		}
+	}
+}
+
+void LocalStorage::finishClearing() {
+	if (!_clearRequested
+		|| !_clearingStarted
+		|| !_minDurationPassed
+		|| _stats.clearing
+		|| _statsBig.clearing) {
+		return;
+	}
+	_clearRequested = false;
+	const auto freed = std::max(
+		_clearFreedBase - summary().totalSize,
+		int64());
+	_selected.fill(true);
+	_allSelected = true;
+	for (const auto &[tag, row] : _rows) {
+		row->entity()->setChecked(true);
+	}
+	if (const auto strong = _clearingBox.get()) {
+		strong->closeBox();
+	}
+	if (freed > 0) {
+		controller()->showToast(tr::lng_local_storage_cleared(
+			tr::now,
+			lt_size,
+			Ui::FormatSizeText(freed)));
+	}
+	updateChart();
+	updateClearButton();
+	updateCategoriesWrap();
+}
+
+void LocalStorage::setupContent() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	content->paintRequest(
+	) | rpl::on_next([=](QRect clip) {
+		QPainter(content).fillRect(clip, st::windowBgOver);
+	}, content->lifetime());
+
+	setupControls(content);
+
+	rpl::combine(
+		_db->statsOnMain(),
+		_dbBig->statsOnMain()
+	) | rpl::on_next([=](
+			Database::Stats &&stats,
+			Database::Stats &&statsBig) {
+		update(std::move(stats), std::move(statsBig));
+	}, content->lifetime());
+
+	Ui::ResizeFitChild(this, content);
+}
+
+void LocalStorage::setupControls(not_null<Ui::VerticalLayout*> container) {
+	const auto createRow = [&](
+			not_null<Ui::VerticalLayout*> into,
+			uint16 tag,
+			const Database::TaggedSummary &data) {
+		const auto chartIndex = ChartIndexForTag(tag);
+		const auto checked = _selected[chartIndex];
+		auto result = into->add(object_ptr<Ui::SlideWrap<Row>>(
+			into,
+			object_ptr<Row>(
+				into,
+				PartName(chartIndex),
+				chartIndex,
+				checked,
+				data)));
+		const auto shown = (data.count && data.totalSize);
+		result->toggle(shown, anim::type::instant);
+		const auto entity = result->entity();
+		entity->checkedChanges(
+		) | rpl::on_next([=](bool checked) {
+			toggleSelected(chartIndex, checked, entity);
+		}, result->lifetime());
+		_rows.emplace(tag, result);
+		return result;
+	};
+	const auto createTagRow = [&](
+			not_null<Ui::VerticalLayout*> into,
+			uint8 tag) {
+		static const auto empty = Database::TaggedSummary();
+		const auto i = _stats.tagged.find(tag);
+		createRow(into, tag, (i != end(_stats.tagged)) ? i->second : empty);
+	};
+
+	_chart = container->add(object_ptr<Chart>(container, controller()));
+	_chart->setPartInfo([this](int index) -> TextWithEntities {
+		const auto sizes = chartedSizes();
+		auto total = int64();
+		for (auto i = 0; i != kChartPartsCount; ++i) {
+			if (_selected[i]) {
+				total += sizes[i];
+			}
+		}
+		const auto count = [&] {
+			const auto tagged = [&](uint8 tag) {
+				const auto i = _stats.tagged.find(tag);
+				return (i != end(_stats.tagged)) ? i->second.count : size_type();
+			};
+			switch (index) {
+			case 0: return tagged(Data::kImageCacheTag);
+			case 1: return tagged(Data::kStickerCacheTag);
+			case 2: return tagged(Data::kVoiceMessageCacheTag);
+			case 3: return tagged(Data::kVideoMessageCacheTag);
+			case 4: return tagged(Data::kAnimationCacheTag);
+			case 5: return _statsBig.full.count;
+			}
+			return size_type();
+		}();
+		auto result = TextWithEntities();
+		result.append(Ui::Text::Bold(PartTitle(index, count)));
+		result.append('\n');
+		result.append(FormatStorageSize(sizes[index]));
+		if (total > 0) {
+			const auto percent = int(base::SafeRound(
+				sizes[index] / float64(total) * 100.));
+			if (percent > 0) {
+				result.append(u" · "_q).append(QString::number(percent) + '%');
+			}
+		}
+		return result;
+	});
+
+	_deviceBar = container->add(object_ptr<DeviceBar>(container));
+
+	_categoriesWrap = AddIslandWrap(container);
+	const auto categoriesIsland = _categoriesWrap->entity();
+	createTagRow(categoriesIsland, Data::kImageCacheTag);
+	createTagRow(categoriesIsland, Data::kStickerCacheTag);
+	createTagRow(categoriesIsland, Data::kVoiceMessageCacheTag);
+	createTagRow(categoriesIsland, Data::kVideoMessageCacheTag);
+	createTagRow(categoriesIsland, Data::kAnimationCacheTag);
+	createRow(categoriesIsland, kFakeMediaCacheTag, _statsBig.full);
+
+	_clearButton = categoriesIsland->add(
+		object_ptr<ClearButton>(categoriesIsland),
+		st::localStorageClearMargin);
+	_clearButton->setClickedCallback([=] { clearSelected(); });
+	Ui::AddSkip(categoriesIsland, st::localStorageIslandPadding);
+
+	const auto addAbout = [&](rpl::producer<QString> text) {
+		const auto label = container->add(
+			object_ptr<Ui::FlatLabel>(
+				container,
+				std::move(text),
+				st::localStorageAbout),
+			st::localStorageAboutMargin);
+		label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	};
+
+	addAbout(tr::lng_local_storage_about());
+
+	const auto settingsIsland = AddIsland(container);
+	setupLimits(settingsIsland);
+	Ui::AddSkip(settingsIsland, st::localStorageIslandPadding);
+
+	addAbout(tr::lng_local_storage_max_size_about());
+
+	updateRowCorners();
+	updateChart();
+	updateDeviceBar();
+	updateClearButton();
+
+	Ui::AddSkip(container, st::localStorageBottomSkip);
+}
+
+template <
+	typename Value,
+	typename Convert,
+	typename Callback,
+	typename>
+not_null<Ui::MediaSlider*> LocalStorage::createLimitsSlider(
+		not_null<Ui::VerticalLayout*> container,
+		int valuesCount,
+		const QString &name,
+		Convert &&convert,
+		Value currentValue,
+		Callback &&callback) {
+	const auto row = container->add(
+		object_ptr<Ui::FixedHeightWidget>(
+			container,
+			st::localStorageLimitLabel.font->height),
+		st::localStorageLimitLabelMargin);
+	const auto title = Ui::CreateChild<Ui::LabelSimple>(
+		row,
+		st::localStorageLimitLabel,
+		name);
+	const auto label = Ui::CreateChild<Ui::LabelSimple>(
+		row,
+		st::localStorageLimitValue);
+	rpl::combine(
+		row->widthValue(),
+		label->widthValue()
+	) | rpl::on_next([=](int width, int) {
+		title->moveToLeft(0, 0, width);
+		label->moveToRight(0, 0, width);
+	}, row->lifetime());
+	callback(label, currentValue);
+	const auto slider = container->add(
+		object_ptr<Ui::MediaSlider>(container, st::localStorageLimitSlider),
+		st::localStorageLimitMargin);
+	slider->resize(st::localStorageLimitSlider.seekSize);
+	slider->setPseudoDiscrete(
+		valuesCount,
+		std::forward<Convert>(convert),
+		currentValue,
+		[=, callback = std::forward<Callback>(callback)](Value value) {
+			callback(label, value);
+		});
+	return slider;
+}
+
+void LocalStorage::updateMediaLimit() {
+	const auto good = [&](int64 mediaLimit) {
+		return (_totalSizeLimit - mediaLimit >= kMinimalSizeLimit);
+	};
+	if (good(_mediaSizeLimit) || !_mediaSlider || !_mediaLabel) {
+		return;
+	}
+	auto index = 1;
+	while ((index < kMediaSizeLimitsCount)
+		&& (MediaSizeLimit(index) * 2 <= _totalSizeLimit)) {
+		++index;
+	}
+	--index;
+	_mediaSizeLimit = MediaSizeLimit(index);
+	_mediaSlider->setValue(index / float64(kMediaSizeLimitsCount - 1));
+	updateMediaLabel();
+
+	Ensures(good(_mediaSizeLimit));
+}
+
+void LocalStorage::updateTotalLimit() {
+	const auto good = [&](int64 totalLimit) {
+		return (totalLimit - _mediaSizeLimit >= kMinimalSizeLimit);
+	};
+	if (good(_totalSizeLimit) || !_totalSlider || !_totalLabel) {
+		return;
+	}
+	auto index = kTotalSizeLimitsCount - 1;
+	while ((index > 0)
+		&& (TotalSizeLimit(index - 1) >= 2 * _mediaSizeLimit)) {
+		--index;
+	}
+	_totalSizeLimit = TotalSizeLimit(index);
+	_totalSlider->setValue(index / float64(kTotalSizeLimitsCount - 1));
+	updateTotalLabel();
+
+	Ensures(good(_totalSizeLimit));
+}
+
+void LocalStorage::updateTotalLabel() {
+	Expects(_totalLabel != nullptr);
+
+	_totalLabel->setText(SizeLimitText(_totalSizeLimit));
+}
+
+void LocalStorage::updateMediaLabel() {
+	Expects(_mediaLabel != nullptr);
+
+	_mediaLabel->setText(SizeLimitText(_mediaSizeLimit));
+}
+
+void LocalStorage::setupLimits(not_null<Ui::VerticalLayout*> container) {
+	Ui::AddSubsectionTitle(
+		container,
+		tr::lng_local_storage_manage_title());
+
+	_totalSlider = createLimitsSlider(
+		container,
+		kTotalSizeLimitsCount,
+		tr::lng_local_storage_size_limit_title(tr::now),
+		TotalSizeLimit,
+		_totalSizeLimit,
+		[=](not_null<Ui::LabelSimple*> label, int64 limit) {
+			_totalSizeLimit = limit;
+			_totalLabel = label;
+			updateTotalLabel();
+			updateMediaLimit();
+			applyLimits();
+		});
+
+	_mediaSlider = createLimitsSlider(
+		container,
+		kMediaSizeLimitsCount,
+		tr::lng_local_storage_media_limit_title(tr::now),
+		MediaSizeLimit,
+		_mediaSizeLimit,
+		[=](not_null<Ui::LabelSimple*> label, int64 limit) {
+			_mediaSizeLimit = limit;
+			_mediaLabel = label;
+			updateMediaLabel();
+			updateTotalLimit();
+			applyLimits();
+		});
+
+	createLimitsSlider(
+		container,
+		kTimeLimitsCount,
+		tr::lng_local_storage_time_limit_title(tr::now),
+		TimeLimit,
+		LimitToValue(_timeLimit),
+		[=](not_null<Ui::LabelSimple*> label, size_type limit) {
+			_timeLimit = ValueToLimit(limit);
+			label->setText(TimeLimitText(_timeLimit));
+			applyLimits();
+		});
+}
+
+void LocalStorage::applyLimits() {
+	const auto &settings = _session->local().cacheSettings();
+	const auto &settingsBig = _session->local().cacheBigFileSettings();
+	const auto sizeLimit = _totalSizeLimit - _mediaSizeLimit;
+	const auto changed = (settings.totalSizeLimit != sizeLimit)
+		|| (settingsBig.totalSizeLimit != _mediaSizeLimit)
+		|| (settings.totalTimeLimit != _timeLimit)
+		|| (settingsBig.totalTimeLimit != _timeLimit);
+	if (!changed) {
+		return;
+	}
+	auto update = Storage::Cache::Database::SettingsUpdate();
+	update.totalSizeLimit = sizeLimit;
+	update.totalTimeLimit = _timeLimit;
+	auto updateBig = Storage::Cache::Database::SettingsUpdate();
+	updateBig.totalSizeLimit = _mediaSizeLimit;
+	updateBig.totalTimeLimit = _timeLimit;
+	_session->local().updateCacheSettings(update, updateBig);
+	_session->data().cache().updateSettings(update);
+}
+
+Type LocalStorageId() {
+	return LocalStorage::Id();
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/boxes/local_storage_box.h b/Telegram/SourceFiles/settings/sections/settings_local_storage.h
similarity index 51%
rename from Telegram/SourceFiles/boxes/local_storage_box.h
rename to Telegram/SourceFiles/settings/sections/settings_local_storage.h
index e78f1073801e14..0ddb7592e70cc5 100644
--- a/Telegram/SourceFiles/boxes/local_storage_box.h
+++ b/Telegram/SourceFiles/settings/sections/settings_local_storage.h
@@ -7,13 +7,18 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "ui/layers/box_content.h"
+#include "settings/settings_common_session.h"
 #include "storage/cache/storage_cache_database.h"
+#include "ui/round_rect.h"
 
 namespace Main {
 class Session;
 } // namespace Main
 
+namespace Window {
+class SessionController;
+} // namespace Window
+
 namespace Storage {
 namespace Cache {
 class Database;
@@ -26,43 +31,65 @@ template <typename Widget>
 class SlideWrap;
 class LabelSimple;
 class MediaSlider;
+class BoxContent;
 } // namespace Ui
 
-class LocalStorageBox : public Ui::BoxContent {
-	struct CreateTag {
-	};
+namespace Settings {
+
+inline constexpr auto kChartPartsCount = 6;
 
+[[nodiscard]] Type LocalStorageId();
+
+class LocalStorage : public Section<LocalStorage> {
 public:
 	using Database = Storage::Cache::Database;
 
-	LocalStorageBox(
-		QWidget*,
-		not_null<Main::Session*> session,
-		CreateTag);
-
-	static void Show(not_null<Main::Session*> session);
+	LocalStorage(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
 
-protected:
-	void prepare() override;
+	[[nodiscard]] rpl::producer<QString> title() override;
+	void showFinished() override;
+	bool paintOuter(
+		not_null<QWidget*> outer,
+		int maxVisibleHeight,
+		QRect clip) override;
+	const Ui::RoundRect *bottomSkipRounding() const override {
+		return &_bottomSkipRounding;
+	}
 
 private:
 	class Row;
-
-	void clearByTag(uint16 tag);
+	class Chart;
+	class DeviceBar;
+	class ClearButton;
+
+	void setupContent();
+	void updateChart();
+	void updateCategoryPercents();
+	void updateRowCorners();
+	void updateDeviceBar();
+	void updateClearButton();
+	void updateCategoriesWrap();
+	void showClearingBox();
+	void clearSelected();
+	void startClearing();
+	void finishClearing();
+	void toggleSelected(int chartIndex, bool selected, not_null<Row*> row);
+	[[nodiscard]] std::array<int64, kChartPartsCount> chartedSizes() const;
 	void update(Database::Stats &&stats, Database::Stats &&statsBig);
 	void updateRow(
 		not_null<Ui::SlideWrap<Row>*> row,
 		const Database::TaggedSummary *data);
-	void setupControls();
+	void setupControls(not_null<Ui::VerticalLayout*> container);
 	void setupLimits(not_null<Ui::VerticalLayout*> container);
 	void updateMediaLimit();
 	void updateTotalLimit();
 	void updateTotalLabel();
 	void updateMediaLabel();
-	void limitsChanged();
-	void save();
+	void applyLimits();
 
-	Database::TaggedSummary summary() const;
+	[[nodiscard]] Database::TaggedSummary summary() const;
 
 	template <
 		typename Value,
@@ -77,6 +104,7 @@ class LocalStorageBox : public Ui::BoxContent {
 	not_null<Ui::MediaSlider*> createLimitsSlider(
 		not_null<Ui::VerticalLayout*> container,
 		int valuesCount,
+		const QString &name,
 		Convert &&convert,
 		Value currentValue,
 		Callback &&callback);
@@ -89,14 +117,31 @@ class LocalStorageBox : public Ui::BoxContent {
 	Database::Stats _statsBig;
 
 	base::flat_map<uint16, not_null<Ui::SlideWrap<Row>*>> _rows;
+	std::array<bool, kChartPartsCount> _selected
+		= { { true, true, true, true, true, true } };
+	rpl::variable<bool> _allSelected = true;
+	Chart *_chart = nullptr;
+	Ui::SlideWrap<Ui::VerticalLayout> *_categoriesWrap = nullptr;
+	bool _categoriesInited = false;
+	ClearButton *_clearButton = nullptr;
+	DeviceBar *_deviceBar = nullptr;
 	Ui::MediaSlider *_totalSlider = nullptr;
 	Ui::LabelSimple *_totalLabel = nullptr;
 	Ui::MediaSlider *_mediaSlider = nullptr;
 	Ui::LabelSimple *_mediaLabel = nullptr;
 
+	Ui::RoundRect _bottomSkipRounding;
+
 	int64 _totalSizeLimit = 0;
 	int64 _mediaSizeLimit = 0;
 	size_type _timeLimit = 0;
-	bool _limitsChanged = false;
+
+	bool _clearRequested = false;
+	int64 _clearFreedBase = 0;
+	bool _minDurationPassed = false;
+	bool _clearingStarted = false;
+	base::weak_qptr<Ui::BoxContent> _clearingBox;
 
 };
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_main.cpp b/Telegram/SourceFiles/settings/sections/settings_main.cpp
new file mode 100644
index 00000000000000..ea0e360fcb1f83
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_main.cpp
@@ -0,0 +1,1218 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/sections/settings_main.h"
+
+#include "settings/settings_common_session.h"
+
+#include "api/api_cloud_password.h"
+#include "api/api_credits.h"
+#include "api/api_global_privacy.h"
+#include "api/api_peer_photo.h"
+#include "api/api_premium.h"
+#include "api/api_sensitive_content.h"
+#include "apiwrap.h"
+#include "base/call_delayed.h"
+#include "base/platform/base_platform_info.h"
+#include "boxes/language_box.h"
+#include "boxes/star_gift_box.h"
+#include "boxes/username_box.h"
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "data/components/credits.h"
+#include "data/components/promo_suggestions.h"
+#include "data/data_chat_filters.h"
+#include "data/data_cloud_themes.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "info/profile/info_profile_badge.h"
+#include "info/profile/info_profile_emoji_status_panel.h"
+#include "info/profile/info_profile_phone_menu.h"
+#include "info/profile/info_profile_values.h"
+#include "lang/lang_cloud_manager.h"
+#include "lang/lang_instance.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "menu/menu_checked_action.h"
+#include "main/main_account.h"
+#include "main/main_app_config.h"
+#include "main/main_domain.h"
+#include "main/main_session.h"
+#include "main/main_session_settings.h"
+#include "settings/settings_builder.h"
+#include "settings/cloud_password/settings_cloud_password_input.h"
+#include "settings/sections/settings_advanced.h"
+#include "settings/sections/settings_business.h"
+#include "settings/sections/settings_calls.h"
+#include "settings/sections/settings_chat.h"
+#include "settings/settings_codes.h"
+#include "settings/settings_faq_suggestions.h"
+#include "settings/sections/settings_credits.h"
+#include "settings/sections/settings_folders.h"
+#include "settings/sections/settings_information.h"
+#include "settings/sections/settings_notifications.h"
+#include "settings/settings_power_saving.h"
+#include "settings/sections/settings_premium.h"
+#include "settings/sections/settings_privacy_security.h"
+#include "settings/settings_scale_preview.h"
+#include "storage/localstorage.h"
+#include "ui/basic_click_handlers.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/boxes/peer_qr_box.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/layers/generic_box.h"
+#include "ui/new_badges.h"
+#include "ui/power_saving.h"
+#include "ui/rect.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_item_base.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/wrap/slide_wrap.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+
+#include <QtGui/QClipboard>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QWindow>
+
+namespace Settings {
+namespace {
+
+using namespace Builder;
+
+constexpr auto kSugValidatePhone = "VALIDATE_PHONE_NUMBER"_cs;
+
+class Cover final : public Ui::FixedHeightWidget {
+public:
+	Cover(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller,
+		not_null<UserData*> user);
+	~Cover();
+
+	[[nodiscard]] not_null<Ui::UserpicButton*> userpic() const {
+		return _userpic.data();
+	}
+
+private:
+	void setupChildGeometry();
+	void initViewers();
+	void updatePhoneText();
+	void refreshNameGeometry(int newWidth);
+	void refreshPhoneGeometry(int newWidth);
+	void refreshUsernameGeometry(int newWidth);
+	void refreshQrButtonGeometry(int newWidth);
+
+	const not_null<Window::SessionController*> _controller;
+	const not_null<UserData*> _user;
+	Info::Profile::EmojiStatusPanel _emojiStatusPanel;
+	Info::Profile::Badge _badge;
+
+	object_ptr<Ui::UserpicButton> _userpic;
+	object_ptr<Ui::FlatLabel> _name = { nullptr };
+	object_ptr<Ui::FlatLabel> _phone = { nullptr };
+	QString _phoneText;
+	object_ptr<Ui::FlatLabel> _username = { nullptr };
+	object_ptr<Ui::IconButton> _qrButton = { nullptr };
+
+};
+
+Cover::Cover(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller,
+	not_null<UserData*> user)
+: FixedHeightWidget(
+	parent,
+	st::settingsPhotoTop
+		+ st::infoProfileCover.photo.size.height()
+		+ st::settingsPhotoBottom)
+, _controller(controller)
+, _user(user)
+, _badge(
+	this,
+	st::settingsCoverBadge,
+	&user->session(),
+	Info::Profile::BadgeContentForPeer(user),
+	&_emojiStatusPanel,
+	[=] {
+		return controller->isGifPausedAtLeastFor(
+			Window::GifPauseReason::Layer);
+	},
+	0, // customStatusLoopsLimit
+	Info::Profile::BadgeType::Premium)
+, _userpic(
+	this,
+	controller,
+	_user,
+	Ui::UserpicButton::Role::OpenPhoto,
+	Ui::UserpicButton::Source::PeerPhoto,
+	st::infoProfileCover.photo)
+, _name(this, st::infoProfileCover.name)
+, _phone(this, st::defaultFlatLabel, st::popupMenuWithIcons)
+, _username(this, st::infoProfileMegagroupCover.status) {
+	_user->updateFull();
+
+	_name->setSelectable(true);
+	_name->setContextCopyText(tr::lng_profile_copy_fullname(tr::now));
+
+	_phone->setSelectable(true);
+	_phone->setContextCopyText(tr::lng_profile_copy_phone(tr::now));
+	const auto hook = [=](Ui::FlatLabel::ContextMenuRequest request) {
+		if (request.selection.empty()) {
+			const auto callback = [=] {
+				Info::Profile::CopyPhoneToClipboard(
+					Info::Profile::PhoneValue(_user));
+			};
+			request.menu->addAction(
+				tr::lng_profile_copy_phone(tr::now),
+				callback,
+				&st::menuIconCopy);
+		} else {
+			_phone->fillContextMenu(request);
+		}
+		Info::Profile::AddPhoneSpoilerMenu(request.menu, _user);
+	};
+	_phone->setContextMenuHook(hook);
+
+	initViewers();
+	setupChildGeometry();
+
+	_userpic->switchChangePhotoOverlay(_user->isSelf(), [=](
+			Ui::UserpicButton::ChosenImage chosen) {
+		auto &image = chosen.image;
+		_userpic->showCustom(base::duplicate(image));
+		const auto isMarkup = (chosen.markup.documentId != 0);
+		_user->session().api().peerPhoto().upload(
+			_user,
+			{
+				std::move(image),
+				chosen.markup.documentId,
+				chosen.markup.colors,
+			});
+		if (!isMarkup) {
+			_userpic->showUploadProgress();
+		}
+	});
+
+	_badge.setPremiumClickCallback([=] {
+		_emojiStatusPanel.show(
+			_controller,
+			_badge.widget(),
+			_badge.sizeTag());
+	});
+	_badge.updated() | rpl::on_next([=] {
+		refreshNameGeometry(width());
+	}, _name->lifetime());
+
+	_qrButton.create(this, st::infoProfileLabeledButtonQr);
+	_qrButton->setAccessibleName(tr::lng_group_invite_context_qr(tr::now));
+	_qrButton->setClickedCallback([=, show = controller->uiShow()] {
+		Ui::DefaultShowFillPeerQrBoxCallback(show, _user);
+	});
+	Info::Profile::UsernamesValue(
+		_user
+	) | rpl::on_next([=](const auto &usernames) {
+		_qrButton->setVisible(!usernames.empty());
+		refreshNameGeometry(width());
+		refreshQrButtonGeometry(width());
+	}, _qrButton->lifetime());
+}
+
+Cover::~Cover() = default;
+
+void Cover::setupChildGeometry() {
+	using namespace rpl::mappers;
+	widthValue(
+	) | rpl::on_next([=](int newWidth) {
+		_userpic->moveToLeft(
+			st::settingsPhotoLeft,
+			st::settingsPhotoTop,
+			newWidth);
+		refreshNameGeometry(newWidth);
+		refreshPhoneGeometry(newWidth);
+		refreshUsernameGeometry(newWidth);
+		refreshQrButtonGeometry(newWidth);
+	}, lifetime());
+}
+
+void Cover::initViewers() {
+	Info::Profile::NameValue(
+		_user
+	) | rpl::on_next([=](const QString &name) {
+		_name->setText(name);
+		refreshNameGeometry(width());
+	}, lifetime());
+
+	Info::Profile::PhoneValue(
+		_user
+	) | rpl::on_next([=](const TextWithEntities &value) {
+		_phoneText = value.text;
+		updatePhoneText();
+	}, lifetime());
+
+	_user->session().settings().phoneNumberHiddenValue(
+	) | rpl::on_next([=] {
+		updatePhoneText();
+	}, lifetime());
+
+	Info::Profile::UsernameValue(
+		_user
+	) | rpl::on_next([=](const TextWithEntities &value) {
+		_username->setMarkedText(tr::link(value.text.isEmpty()
+			? tr::lng_settings_username_add(tr::now)
+			: value.text));
+		refreshUsernameGeometry(width());
+	}, lifetime());
+
+	_username->overrideLinkClickHandler([=] {
+		if (_controller->showFrozenError()) {
+			return;
+		}
+		const auto username = _user->username();
+		if (username.isEmpty()) {
+			_controller->show(Box(UsernamesBox, _user));
+		} else {
+			QGuiApplication::clipboard()->setText(
+				_user->session().createInternalLinkFull(username));
+			_controller->showToast({
+				.text = { tr::lng_username_copied(tr::now) },
+				.iconLottie = u"toast/voip_invite"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		}
+	});
+}
+
+void Cover::refreshNameGeometry(int newWidth) {
+	const auto nameLeft = st::settingsNameLeft;
+	const auto nameTop = st::settingsNameTop;
+	const auto qrButtonWidth = (_qrButton && !_qrButton->isHidden())
+		? (_qrButton->width() + st::infoProfileCover.rightSkip)
+		: 0;
+	auto nameWidth = newWidth
+		- nameLeft
+		- st::infoProfileCover.rightSkip
+		- qrButtonWidth;
+	if (const auto width = _badge.widget() ? _badge.widget()->width() : 0) {
+		nameWidth -= st::infoVerifiedCheckPosition.x() + width;
+	}
+	_name->resizeToNaturalWidth(nameWidth);
+	_name->moveToLeft(nameLeft, nameTop, newWidth);
+	const auto badgeLeft = nameLeft + _name->width();
+	const auto badgeTop = nameTop;
+	const auto badgeBottom = nameTop + _name->height();
+	_badge.move(badgeLeft, badgeTop, badgeBottom);
+}
+
+void Cover::updatePhoneText() {
+	if (_user->session().settings().phoneNumberHidden()) {
+		_phone->setMarkedText(
+			Ui::Text::Wrapped({ _phoneText }, EntityType::Spoiler));
+	} else {
+		_phone->setText(_phoneText);
+	}
+	refreshPhoneGeometry(width());
+}
+
+void Cover::refreshPhoneGeometry(int newWidth) {
+	const auto phoneLeft = st::settingsPhoneLeft;
+	const auto phoneTop = st::settingsPhoneTop;
+	const auto phoneWidth = newWidth
+		- phoneLeft
+		- st::infoProfileCover.rightSkip;
+	_phone->resizeToWidth(phoneWidth);
+	_phone->moveToLeft(phoneLeft, phoneTop, newWidth);
+}
+
+void Cover::refreshUsernameGeometry(int newWidth) {
+	const auto usernameLeft = st::settingsUsernameLeft;
+	const auto usernameTop = st::settingsUsernameTop;
+	const auto usernameRight = st::infoProfileCover.rightSkip;
+	const auto usernameWidth = newWidth - usernameLeft - usernameRight;
+	_username->resizeToWidth(usernameWidth);
+	_username->moveToLeft(usernameLeft, usernameTop, newWidth);
+}
+
+void Cover::refreshQrButtonGeometry(int newWidth) {
+	if (!_qrButton) {
+		return;
+	}
+	const auto buttonTop = (height() - _qrButton->height()) / 2;
+	const auto buttonRight = st::infoProfileCover.rightSkip;
+	const auto inset = st::infoProfileLabeledButtonQrInset;
+	_qrButton->moveToRight(buttonRight - inset, buttonTop, newWidth);
+}
+
+void BuildSectionButtons(SectionBuilder &builder) {
+	const auto session = builder.session();
+	const auto controller = builder.controller();
+	const auto showOther = builder.showOther();
+
+	if (!session->supportMode()) {
+		builder.addSectionButton({
+			.title = tr::lng_settings_my_account(),
+			.targetSection = InformationId(),
+			.icon = { &st::menuIconProfile },
+			.keywords = { u"profile"_q, u"edit"_q, u"information"_q },
+		});
+	}
+
+	builder.addSectionButton({
+		.title = tr::lng_settings_section_notify(),
+		.targetSection = NotificationsId(),
+		.icon = { &st::menuIconNotifications },
+		.keywords = { u"alerts"_q, u"sounds"_q, u"badge"_q },
+	});
+
+	builder.addSectionButton({
+		.title = tr::lng_settings_section_privacy(),
+		.targetSection = PrivacySecurityId(),
+		.icon = { &st::menuIconLock },
+		.keywords = { u"security"_q, u"passcode"_q, u"password"_q, u"2fa"_q },
+	});
+
+	builder.addSectionButton({
+		.title = tr::lng_settings_section_chat_settings(),
+		.targetSection = ChatId(),
+		.icon = { &st::menuIconChatBubble },
+		.keywords = { u"themes"_q, u"appearance"_q, u"stickers"_q },
+	});
+
+	{ // Folders
+		const auto preload = [=] {
+			session->data().chatsFilters().requestSuggested();
+		};
+		const auto hasFilters = session->data().chatsFilters().has()
+			|| session->settings().dialogsFiltersEnabled();
+
+		auto shownProducer = hasFilters
+			? rpl::single(true) | rpl::type_erased
+			: (rpl::single(rpl::empty) | rpl::then(
+				session->appConfig().refreshed()
+			) | rpl::map([=] {
+			const auto enabled = session->appConfig().get<bool>(
+				u"dialog_filters_enabled"_q,
+				false);
+			if (enabled) {
+				preload();
+			}
+			return enabled;
+		}));
+
+		if (hasFilters) {
+			preload();
+		}
+
+		builder.addButton({
+			.title = tr::lng_settings_section_filters(),
+			.icon = { &st::menuIconShowInFolder },
+			.onClick = [=] { showOther(FoldersId()); },
+			.keywords = { u"filters"_q, u"tabs"_q },
+			.shown = std::move(shownProducer),
+		});
+	}
+
+	builder.addSectionButton({
+		.title = tr::lng_settings_advanced(),
+		.targetSection = AdvancedId(),
+		.icon = { &st::menuIconManage },
+		.keywords = { u"performance"_q, u"proxy"_q, u"experimental"_q },
+	});
+
+	builder.addSectionButton({
+		.title = tr::lng_settings_section_devices(),
+		.targetSection = CallsId(),
+		.icon = { &st::menuIconUnmute },
+		.keywords = { u"sessions"_q, u"calls"_q },
+	});
+
+	builder.addButton({
+		.id = u"main/power"_q,
+		.title = tr::lng_settings_power_menu(),
+		.icon = { &st::menuIconPowerUsage },
+		.onClick = [=] {
+			controller->show(Box(PowerSavingBox, PowerSaving::Flags()));
+		},
+		.keywords = { u"battery"_q, u"animations"_q, u"power"_q, u"saving"_q },
+	});
+
+	builder.addButton({
+		.id = u"main/language"_q,
+		.title = tr::lng_settings_language(),
+		.icon = { &st::menuIconTranslate },
+		.label = rpl::single(
+			Lang::GetInstance().id()
+		) | rpl::then(
+			Lang::GetInstance().idChanges()
+		) | rpl::map([] { return Lang::GetInstance().nativeName(); }),
+		.onClick = [=] {
+			static auto Guard = base::binary_guard();
+			Guard = LanguageBox::Show(controller);
+		},
+		.keywords = { u"translate"_q, u"localization"_q, u"language"_q },
+	});
+}
+
+void BuildInterfaceScale(SectionBuilder &builder) {
+	if (!HasInterfaceScale()) {
+		return;
+	}
+
+	builder.addDivider();
+	builder.addSkip();
+
+	builder.add([](const WidgetContext &ctx) {
+		const auto window = &ctx.controller->window();
+		auto wrap = object_ptr<Ui::VerticalLayout>(ctx.container);
+		SetupInterfaceScale(window, wrap.data());
+		return SectionBuilder::WidgetToAdd{ .widget = std::move(wrap) };
+	}, [] {
+		return SearchEntry{
+			.id = u"main/scale"_q,
+			.title = tr::lng_settings_default_scale(tr::now),
+			.keywords = { u"zoom"_q, u"size"_q, u"interface"_q, u"ui"_q },
+		};
+	});
+
+	builder.addSkip();
+}
+
+void BuildPremiumSection(SectionBuilder &builder) {
+	const auto session = builder.session();
+	const auto controller = builder.controller();
+	const auto showOther = builder.showOther();
+
+	if (!session->premiumPossible()) {
+		return;
+	}
+
+	builder.addDivider();
+	builder.addSkip();
+
+	builder.addPremiumButton({
+		.id = u"main/premium"_q,
+		.title = tr::lng_premium_summary_title(),
+		.onClick = [=] {
+			controller->setPremiumRef("settings");
+			showOther(PremiumId());
+		},
+		.keywords = { u"subscription"_q },
+	});
+
+	session->credits().load();
+	builder.addPremiumButton({
+		.id = u"main/credits"_q,
+		.title = tr::lng_settings_credits(),
+		.label = session->credits().balanceValue(
+		) | rpl::map([](CreditsAmount c) {
+			return c
+				? Lang::FormatCreditsAmountToShort(c).string
+				: QString();
+		}),
+		.credits = true,
+		.onClick = [=] {
+			controller->setPremiumRef("settings");
+			showOther(CreditsId());
+		},
+		.keywords = { u"stars"_q, u"balance"_q },
+	});
+
+	session->credits().tonLoad();
+	builder.addButton({
+		.id = u"main/currency"_q,
+		.title = tr::lng_settings_currency(),
+		.icon = { &st::menuIconTon },
+		.label = session->credits().tonBalanceValue(
+		) | rpl::map([](CreditsAmount c) {
+			return c ? Lang::FormatCreditsAmountToShort(c).string : u""_q;
+		}),
+		.onClick = [=] {
+			controller->setPremiumRef("settings");
+			showOther(CurrencyId());
+		},
+		.keywords = { u"ton"_q, u"crypto"_q, u"wallet"_q },
+		.shown = session->credits().tonBalanceValue(
+		) | rpl::map([](CreditsAmount c) { return !c.empty(); }),
+	});
+
+	builder.addButton({
+		.id = u"main/business"_q,
+		.title = tr::lng_business_title(),
+		.icon = { .icon = &st::menuIconShop },
+		.onClick = [=] { showOther(BusinessId()); },
+		.keywords = { u"work"_q, u"company"_q },
+	});
+
+	if (session->premiumCanBuy()) {
+		builder.addButton({
+			.id = u"main/send-gift"_q,
+			.title = tr::lng_settings_gift_premium(),
+			.icon = { .icon = &st::menuIconGiftPremium, .newBadge = true },
+			.onClick = [=] { Ui::ChooseStarGiftRecipient(controller); },
+			.keywords = { u"present"_q, u"send"_q },
+		});
+	}
+
+	builder.addSkip();
+}
+
+void BuildHelpSection(SectionBuilder &builder) {
+	builder.addDivider();
+	builder.addSkip();
+
+	const auto controller = builder.controller();
+	builder.addButton({
+		.id = u"main/faq"_q,
+		.title = tr::lng_settings_faq(),
+		.icon = { &st::menuIconFaq },
+		.onClick = [=] { OpenFaq(controller); },
+		.keywords = { u"help"_q, u"support"_q, u"questions"_q },
+	});
+
+	builder.addButton({
+		.id = u"main/features"_q,
+		.title = tr::lng_settings_features(),
+		.icon = { &st::menuIconEmojiObjects },
+		.onClick = [] {
+			UrlClickHandler::Open(tr::lng_telegram_features_url(tr::now));
+		},
+		.keywords = { u"tips"_q, u"tutorial"_q },
+	});
+
+	builder.addButton({
+		.id = u"main/ask-question"_q,
+		.title = tr::lng_settings_ask_question(),
+		.icon = { &st::menuIconDiscussion },
+		.onClick = [=] { OpenAskQuestionConfirm(controller); },
+		.keywords = { u"contact"_q, u"feedback"_q },
+	});
+
+	builder.addSkip();
+}
+
+void BuildValidationSuggestions(SectionBuilder &builder) {
+	builder.add([](const WidgetContext &ctx) {
+		const auto controller = ctx.controller.get();
+		const auto showOther = ctx.showOther;
+		auto wrap = object_ptr<Ui::VerticalLayout>(ctx.container);
+		SetupValidatePhoneNumberSuggestion(controller, wrap.data(), showOther);
+		return SectionBuilder::WidgetToAdd{ .widget = std::move(wrap) };
+	});
+
+	builder.add([](const WidgetContext &ctx) {
+		const auto controller = ctx.controller.get();
+		const auto showOther = ctx.showOther;
+		auto wrap = object_ptr<Ui::VerticalLayout>(ctx.container);
+		SetupValidatePasswordSuggestion(controller, wrap.data(), showOther);
+		return SectionBuilder::WidgetToAdd{ .widget = std::move(wrap) };
+	});
+}
+
+class Main final : public Section<Main> {
+public:
+	Main(QWidget *parent, not_null<Window::SessionController*> controller);
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+	void fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) override;
+	void showFinished() override;
+
+protected:
+	void keyPressEvent(QKeyEvent *e) override;
+
+private:
+	void setupContent();
+
+	QPointer<Ui::UserpicButton> _userpic;
+
+};
+
+Main::Main(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: Section(parent, controller) {
+	setupContent();
+}
+
+rpl::producer<QString> Main::title() {
+	return tr::lng_menu_settings();
+}
+
+void Main::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
+	const auto &list = Core::App().domain().accounts();
+	if (list.size() < Core::App().domain().maxAccounts()) {
+		addAction(tr::lng_menu_add_account(tr::now), [=] {
+			Core::App().setActivePrimaryWindow(&controller()->window());
+			Core::App().domain().addActivated(MTP::Environment{});
+		}, &st::menuIconAddAccount);
+	}
+	if (!controller()->session().supportMode()) {
+		addAction(
+			tr::lng_settings_information(tr::now),
+			[=] { showOther(InformationId()); },
+			&st::menuIconEdit);
+	}
+	const auto window = &controller()->window();
+	const auto logout = addAction({
+		.text = tr::lng_settings_logout(tr::now),
+		.handler = [=] { window->showLogoutConfirmation(); },
+		.icon = &st::menuIconLeaveAttention,
+		.isAttention = true,
+	});
+	logout->setProperty("highlight-control-id", u"settings/log-out"_q);
+}
+
+void Main::keyPressEvent(QKeyEvent *e) {
+	crl::on_main(this, [=, text = e->text()]{
+		CodesFeedString(controller(), text);
+	});
+	return Section::keyPressEvent(e);
+}
+
+void Main::setupContent() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	const auto window = controller();
+	const auto session = &window->session();
+	const auto cover = content->add(object_ptr<Cover>(
+		content,
+		window,
+		session->user()));
+	_userpic = cover->userpic();
+
+	const SectionBuildMethod buildMethod = [](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		auto &lifetime = container->lifetime();
+		const auto highlights = lifetime.make_state<HighlightRegistry>();
+		const auto isPaused = Window::PausedIn(
+			controller,
+			Window::GifPauseReason::Layer);
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = isPaused,
+			.highlights = highlights,
+		});
+		builder.addDivider();
+		builder.addSkip();
+		BuildValidationSuggestions(builder);
+		BuildSectionButtons(builder);
+		builder.addSkip();
+		BuildInterfaceScale(builder);
+		BuildPremiumSection(builder);
+		BuildHelpSection(builder);
+
+		std::move(showFinished) | rpl::on_next([=] {
+			for (const auto &[id, entry] : *highlights) {
+				if (entry.widget) {
+					controller->checkHighlightControl(
+						id,
+						entry.widget,
+						base::duplicate(entry.args));
+				}
+			}
+		}, lifetime);
+	};
+	build(content, buildMethod);
+
+	Ui::ResizeFitChild(this, content);
+
+	session->api().cloudPassword().reload();
+	session->api().reloadContactSignupSilent();
+	session->api().sensitiveContent().reload();
+	session->api().globalPrivacy().reload();
+	session->api().premium().reload();
+	session->data().cloudThemes().refresh();
+	session->faqSuggestions().request();
+}
+
+void Main::showFinished() {
+	controller()->checkHighlightControl(u"profile-photo"_q, _userpic.data(), {
+		.margin = st::settingsPhotoHighlightMargin,
+		.shape = HighlightShape::Ellipse,
+	});
+	const auto emojiId = u"profile-photo/use-emoji"_q;
+	if (controller()->takeHighlightControlId(emojiId)) {
+		if (const auto popupMenu = _userpic->showChangePhotoMenu()) {
+			const auto menu = popupMenu->menu();
+			for (const auto &action : menu->actions()) {
+				const auto controlId = "highlight-control-id";
+				if (action->property(controlId).toString() == emojiId) {
+					if (const auto item = menu->itemForAction(action)) {
+						HighlightWidget(item);
+					}
+					break;
+				}
+			}
+		}
+	}
+	Section<Main>::showFinished();
+}
+
+const auto kMeta = BuildHelper({
+	.id = Main::Id(),
+	.parentId = nullptr,
+	.title = &tr::lng_menu_settings,
+	.icon = &st::menuIconSettings,
+}, [](SectionBuilder &builder) {
+	builder.addDivider();
+	builder.addSkip();
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"main/profile-photo"_q,
+			.title = tr::lng_profile_set_photo_for(tr::now),
+			.keywords = { u"photo"_q, u"avatar"_q, u"picture"_q, u"profile"_q },
+			.icon = { &st::menuIconProfile },
+			.deeplink = u"tg://settings/profile-photo"_q,
+		};
+	});
+
+	BuildValidationSuggestions(builder);
+	BuildSectionButtons(builder);
+
+	builder.addSkip();
+
+	BuildInterfaceScale(builder);
+	BuildPremiumSection(builder);
+	BuildHelpSection(builder);
+});
+
+} // namespace
+
+void SetupLanguageButton(
+		not_null<Window::Controller*> window,
+		not_null<Ui::VerticalLayout*> container) {
+	const auto button = AddButtonWithLabel(
+		container,
+		tr::lng_settings_language(),
+		rpl::single(
+			Lang::GetInstance().id()
+		) | rpl::then(
+			Lang::GetInstance().idChanges()
+		) | rpl::map([] { return Lang::GetInstance().nativeName(); }),
+		st::settingsButton,
+		{ &st::menuIconTranslate });
+	const auto guard = Ui::CreateChild<base::binary_guard>(button.get());
+	button->addClickHandler([=] {
+		const auto m = button->clickModifiers();
+		if ((m & Qt::ShiftModifier) && (m & Qt::AltModifier)) {
+			Lang::CurrentCloudManager().switchToLanguage({ u"#custom"_q });
+		} else {
+			*guard = LanguageBox::Show(window->sessionController());
+		}
+	});
+}
+
+void SetupValidatePhoneNumberSuggestion(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container,
+		Fn<void(Type)> showOther) {
+	if (!controller->session().promoSuggestions().current(
+			kSugValidatePhone.utf8())) {
+		return;
+	}
+	const auto mainWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto content = mainWrap->entity();
+	Ui::AddSubsectionTitle(
+		content,
+		tr::lng_settings_suggestion_phone_number_title(
+			lt_phone,
+			rpl::single(
+				Ui::FormatPhone(controller->session().user()->phone()))),
+		QMargins(
+			st::boxRowPadding.left()
+				- st::defaultSubsectionTitlePadding.left(),
+			0,
+			0,
+			0));
+	const auto label = content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_settings_suggestion_phone_number_about(
+				lt_link,
+				tr::lng_collectible_learn_more(tr::url(
+					tr::lng_settings_suggestion_phone_number_about_link(
+						tr::now))),
+				tr::marked),
+			st::boxLabel),
+		st::boxRowPadding);
+	label->setClickHandlerFilter([=, weak = base::make_weak(controller)](
+			const auto &...) {
+		UrlClickHandler::Open(
+			tr::lng_settings_suggestion_phone_number_about_link(tr::now),
+			QVariant::fromValue(ClickHandlerContext{
+				.sessionWindow = weak,
+			}));
+		return false;
+	});
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	const auto wrap = content->add(
+		object_ptr<Ui::FixedHeightWidget>(
+			content,
+			st::inviteLinkButton.height),
+		st::inviteLinkButtonsPadding);
+	const auto yes = Ui::CreateChild<Ui::RoundButton>(
+		wrap,
+		tr::lng_box_yes(),
+		st::inviteLinkButton);
+	yes->setFullRadius(true);
+	yes->setClickedCallback([=] {
+		controller->session().promoSuggestions().dismiss(
+			kSugValidatePhone.utf8());
+		mainWrap->toggle(false, anim::type::normal);
+	});
+	const auto no = Ui::CreateChild<Ui::RoundButton>(
+		wrap,
+		tr::lng_box_no(),
+		st::inviteLinkButton);
+	no->setFullRadius(true);
+	no->setClickedCallback([=] {
+		const auto sharedLabel = std::make_shared<base::weak_qptr<Ui::FlatLabel>>();
+		const auto height = st::boxLabel.style.font->height;
+		const auto customEmojiFactory = [=](
+			QStringView data,
+			const Ui::Text::MarkedContext &context
+		) -> std::unique_ptr<Ui::Text::CustomEmoji> {
+			auto repaint = [=] {
+				if (*sharedLabel) {
+					(*sharedLabel)->update();
+				}
+			};
+			return Lottie::MakeEmoji(
+				{ .name = u"change_number"_q, .sizeOverride = Size(height) },
+				std::move(repaint));
+		};
+
+		controller->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
+			box->addButton(tr::lng_box_ok(), [=] { box->closeBox(); });
+			*sharedLabel = box->verticalLayout()->add(
+				object_ptr<Ui::FlatLabel>(
+					box->verticalLayout(),
+					tr::lng_settings_suggestion_phone_number_change(
+						lt_emoji,
+						rpl::single(Ui::Text::SingleCustomEmoji(u"@"_q)),
+						tr::marked),
+					st::boxLabel,
+					st::defaultPopupMenu,
+					Ui::Text::MarkedContext{
+						.customEmojiFactory = customEmojiFactory,
+					}),
+				st::boxPadding);
+		}));
+	});
+
+	wrap->widthValue() | rpl::on_next([=](int width) {
+		const auto buttonWidth = (width - st::inviteLinkButtonsSkip) / 2;
+		yes->setFullWidth(buttonWidth);
+		no->setFullWidth(buttonWidth);
+		yes->moveToLeft(0, 0, width);
+		no->moveToRight(0, 0, width);
+	}, wrap->lifetime());
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddDivider(content);
+	Ui::AddSkip(content);
+}
+
+void SetupValidatePasswordSuggestion(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container,
+		Fn<void(Type)> showOther) {
+	if (!controller->session().promoSuggestions().current(
+			Data::PromoSuggestions::SugValidatePassword())
+		|| controller->session().promoSuggestions().current(
+			kSugValidatePhone.utf8())) {
+		return;
+	}
+	const auto mainWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto content = mainWrap->entity();
+	Ui::AddSubsectionTitle(
+		content,
+		tr::lng_settings_suggestion_password_title(),
+		QMargins(
+			st::boxRowPadding.left()
+				- st::defaultSubsectionTitlePadding.left(),
+			0,
+			0,
+			0));
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_settings_suggestion_password_about(),
+			st::boxLabel),
+		st::boxRowPadding);
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	const auto wrap = content->add(
+		object_ptr<Ui::FixedHeightWidget>(
+			content,
+			st::inviteLinkButton.height),
+		st::inviteLinkButtonsPadding);
+	const auto yes = Ui::CreateChild<Ui::RoundButton>(
+		wrap,
+		tr::lng_settings_suggestion_password_yes(),
+		st::inviteLinkButton);
+	yes->setFullRadius(true);
+	yes->setClickedCallback([=] {
+		controller->session().promoSuggestions().dismiss(
+			Data::PromoSuggestions::SugValidatePassword());
+		mainWrap->toggle(false, anim::type::normal);
+	});
+	const auto no = Ui::CreateChild<Ui::RoundButton>(
+		wrap,
+		tr::lng_settings_suggestion_password_no(),
+		st::inviteLinkButton);
+	no->setFullRadius(true);
+	no->setClickedCallback([=] {
+		showOther(Settings::CloudPasswordSuggestionInputId());
+	});
+
+	wrap->widthValue() | rpl::on_next([=](int width) {
+		const auto buttonWidth = (width - st::inviteLinkButtonsSkip) / 2;
+		yes->setFullWidth(buttonWidth);
+		no->setFullWidth(buttonWidth);
+		yes->moveToLeft(0, 0, width);
+		no->moveToRight(0, 0, width);
+	}, wrap->lifetime());
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddDivider(content);
+	Ui::AddSkip(content);
+}
+
+bool HasInterfaceScale() {
+	return true;
+}
+
+void SetupInterfaceScale(
+		not_null<Window::Controller*> window,
+		not_null<Ui::VerticalLayout*> container,
+		bool icon) {
+	if (!HasInterfaceScale()) {
+		return;
+	}
+
+	const auto toggled = Ui::CreateChild<rpl::event_stream<bool>>(
+		container.get());
+
+	const auto switched = (cConfigScale() == style::kScaleAuto);
+	const auto button = AddButtonWithIcon(
+		container,
+		tr::lng_settings_default_scale(),
+		icon ? st::settingsButton : st::settingsButtonNoIcon,
+		{ icon ? &st::menuIconShowInChat : nullptr }
+	)->toggleOn(toggled->events_starting_with_copy(switched));
+
+	const auto ratio = style::DevicePixelRatio();
+	const auto scaleMin = style::kScaleMin;
+	const auto scaleMax = style::MaxScaleForRatio(ratio);
+	const auto scaleConfig = cConfigScale();
+	const auto step = 5;
+	Assert(!((scaleMax - scaleMin) % step));
+	auto values = std::vector<int>();
+	for (auto i = scaleMin; i != scaleMax; i += step) {
+		values.push_back(i);
+		if (scaleConfig > i && scaleConfig < i + step) {
+			values.push_back(scaleConfig);
+		}
+	}
+	values.push_back(scaleMax);
+	const auto valuesCount = int(values.size());
+
+	const auto valueFromScale = [=](int scale) {
+		scale = cEvalScale(scale);
+		auto result = 0;
+		for (const auto value : values) {
+			if (scale == value) {
+				break;
+			}
+			++result;
+		}
+		return ((result == valuesCount) ? (result - 1) : result)
+			/ float64(valuesCount - 1);
+	};
+	auto sliderWithLabel = MakeSliderWithLabel(
+		container,
+		st::settingsScale,
+		st::settingsScaleLabel,
+		st::normalFont->spacew * 2,
+		st::settingsScaleLabel.style.font->width("300%"),
+		true);
+	container->add(
+		std::move(sliderWithLabel.widget),
+		icon ? st::settingsScalePadding : st::settingsBigScalePadding);
+	const auto slider = sliderWithLabel.slider;
+	const auto label = sliderWithLabel.label;
+	slider->setAccessibleName(tr::lng_settings_scale(tr::now));
+
+	const auto updateLabel = [=](int scale) {
+		const auto labelText = [&](int scale) {
+			if constexpr (Platform::IsMac()) {
+				return QString::number(scale) + '%';
+			} else {
+				const auto handle = window->widget()->windowHandle();
+				const auto ratio = handle->devicePixelRatio();
+				return QString::number(base::SafeRound(scale * ratio)) + '%';
+			}
+		};
+		label->setText(labelText(cEvalScale(scale)));
+	};
+	updateLabel(cConfigScale());
+
+	const auto inSetScale = container->lifetime().make_state<bool>();
+	const auto setScale = [=](int scale, const auto &repeatSetScale) -> void {
+		if (*inSetScale) {
+			return;
+		}
+		*inSetScale = true;
+		const auto guard = gsl::finally([=] { *inSetScale = false; });
+
+		updateLabel(scale);
+		toggled->fire(scale == style::kScaleAuto);
+		slider->setValue(valueFromScale(scale));
+		if (cEvalScale(scale) != cEvalScale(cConfigScale())) {
+			const auto confirmed = crl::guard(button, [=] {
+				cSetConfigScale(scale);
+				Local::writeSettings();
+				Core::Restart();
+			});
+			const auto cancelled = crl::guard(button, [=](Fn<void()> close) {
+				base::call_delayed(
+					st::defaultSettingsSlider.duration,
+					button,
+					[=] { repeatSetScale(cConfigScale(), repeatSetScale); });
+				close();
+			});
+			window->show(Ui::MakeConfirmBox({
+				.text = tr::lng_settings_need_restart(),
+				.confirmed = confirmed,
+				.cancelled = cancelled,
+				.confirmText = tr::lng_settings_restart_now(),
+			}));
+		} else if (scale != cConfigScale()) {
+			cSetConfigScale(scale);
+			Local::writeSettings();
+		}
+	};
+
+	const auto shown = container->lifetime().make_state<bool>();
+	const auto togglePreview = SetupScalePreview(window, slider);
+	const auto toggleForScale = [=](int scale) {
+		scale = cEvalScale(scale);
+		const auto show = *shown
+			? ScalePreviewShow::Update
+			: ScalePreviewShow::Show;
+		*shown = true;
+		for (auto i = 0; i != valuesCount; ++i) {
+			if (values[i] <= scale
+				&& (i + 1 == valuesCount || values[i + 1] > scale)) {
+				const auto x = (slider->width() * i) / (valuesCount - 1);
+				togglePreview(show, scale, x);
+				return;
+			}
+		}
+		togglePreview(show, scale, slider->width() / 2);
+	};
+	const auto toggleHidePreview = [=] {
+		togglePreview(ScalePreviewShow::Hide, 0, 0);
+		*shown = false;
+	};
+
+	slider->setPseudoDiscrete(
+		valuesCount,
+		[=](int index) { return values[index]; },
+		cConfigScale(),
+		[=](int scale) { updateLabel(scale); toggleForScale(scale); },
+		[=](int scale) { toggleHidePreview(); setScale(scale, setScale); });
+
+	button->toggledValue(
+	) | rpl::map([](bool checked) {
+		return checked ? style::kScaleAuto : cEvalScale(cConfigScale());
+	}) | rpl::on_next([=](int scale) {
+		setScale(scale, setScale);
+	}, button->lifetime());
+
+	if (!icon) {
+		Ui::AddSkip(container, st::settingsThumbSkip);
+	}
+}
+
+Type MainId() {
+	return Main::Id();
+}
+
+void OpenFaq(base::weak_ptr<Window::SessionController> weak) {
+	UrlClickHandler::Open(
+		tr::lng_settings_faq_link(tr::now),
+		QVariant::fromValue(ClickHandlerContext{
+			.sessionWindow = weak,
+		}));
+}
+
+void OpenAskQuestionConfirm(not_null<Window::SessionController*> window) {
+	const auto requestId = std::make_shared<mtpRequestId>();
+	const auto sure = [=](Fn<void()> close) {
+		if (*requestId) {
+			return;
+		}
+		*requestId = window->session().api().request(
+			MTPhelp_GetSupport()
+		).done(crl::guard(window, [=](const MTPhelp_Support &result) {
+			*requestId = 0;
+			result.match([&](const MTPDhelp_support &data) {
+				auto &owner = window->session().data();
+				if (const auto user = owner.processUser(data.vuser())) {
+					window->showPeerHistory(user);
+				}
+			});
+			close();
+		})).fail([=] {
+			*requestId = 0;
+			close();
+		}).send();
+	};
+	window->show(Ui::MakeConfirmBox({
+		.text = tr::lng_settings_ask_sure(),
+		.confirmed = sure,
+		.cancelled = [=](Fn<void()> close) {
+			OpenFaq(window);
+			close();
+		},
+		.confirmText = tr::lng_settings_ask_ok(),
+		.cancelText = tr::lng_settings_faq_button(),
+		.strictCancel = true,
+	}));
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_main.h b/Telegram/SourceFiles/settings/sections/settings_main.h
similarity index 60%
rename from Telegram/SourceFiles/settings/settings_main.h
rename to Telegram/SourceFiles/settings/sections/settings_main.h
index a0f7e15ca6266c..c06b499e59d5dd 100644
--- a/Telegram/SourceFiles/settings/settings_main.h
+++ b/Telegram/SourceFiles/settings/sections/settings_main.h
@@ -7,7 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "settings/settings_common_session.h"
+#include "settings/settings_type.h"
 
 namespace Window {
 class Controller;
@@ -20,6 +20,8 @@ class VerticalLayout;
 
 namespace Settings {
 
+[[nodiscard]] Type MainId();
+
 void SetupLanguageButton(
 	not_null<Window::Controller*> window,
 	not_null<Ui::VerticalLayout*> container);
@@ -29,25 +31,16 @@ void SetupInterfaceScale(
 	not_null<Ui::VerticalLayout*> container,
 	bool icon = true);
 
-void OpenFaq(base::weak_ptr<Window::SessionController> weak);
-
-class Main : public Section<Main> {
-public:
-	Main(QWidget *parent, not_null<Window::SessionController*> controller);
-
-	[[nodiscard]] rpl::producer<QString> title() override;
-
-	void fillTopBarMenu(
-		const Ui::Menu::MenuCallback &addAction) override;
-
-protected:
-	void keyPressEvent(QKeyEvent *e) override;
-
-private:
-	void setupContent(not_null<Window::SessionController*> controller);
-
-	const not_null<Window::SessionController*> _controller;
+void SetupValidatePhoneNumberSuggestion(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	Fn<void(Type)> showOther);
+void SetupValidatePasswordSuggestion(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	Fn<void(Type)> showOther);
 
-};
+void OpenFaq(base::weak_ptr<Window::SessionController> weak);
+void OpenAskQuestionConfirm(not_null<Window::SessionController*> window);
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/sections/settings_notifications.cpp
similarity index 50%
rename from Telegram/SourceFiles/settings/settings_notifications.cpp
rename to Telegram/SourceFiles/settings/sections/settings_notifications.cpp
index cf3c759afd900f..8463612eb93838 100644
--- a/Telegram/SourceFiles/settings/settings_notifications.cpp
+++ b/Telegram/SourceFiles/settings/sections/settings_notifications.cpp
@@ -5,119 +5,74 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_notifications.h"
+#include "settings/sections/settings_notifications.h"
 
-#include "settings/settings_notifications_type.h"
+#include "settings/settings_common_session.h"
+
+#include "api/api_authorizations.h"
+#include "api/api_reactions_notify_settings.h"
+#include "api/api_ringtones.h"
+#include "apiwrap.h"
+#include "base/platform/base_platform_info.h"
+#include "boxes/ringtones_box.h"
+#include "core/application.h"
+#include "core/version.h"
+#include "data/data_chat_filters.h"
+#include "data/data_session.h"
+#include "data/notify/data_notify_settings.h"
+#include "data/notify/data_peer_notify_volume.h"
+#include "lang/lang_keys.h"
+#include "main/main_account.h"
+#include "main/main_domain.h"
+#include "main/main_session.h"
+#include "mainwindow.h"
+#include "platform/platform_notifications_manager.h"
+#include "platform/platform_specific.h"
+#include "settings/settings_builder.h"
+#include "settings/sections/settings_main.h"
+#include "settings/settings_notifications_common.h"
+#include "settings/sections/settings_notifications_reactions.h"
+#include "settings/sections/settings_notifications_type.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/chat/chat_theme.h"
 #include "ui/controls/chat_service_checkbox.h"
 #include "ui/effects/animations.h"
-#include "ui/text/text_utilities.h"
-#include "ui/wrap/vertical_layout.h"
-#include "ui/wrap/slide_wrap.h"
-#include "ui/widgets/box_content_divider.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/discrete_sliders.h"
 #include "ui/painter.h"
-#include "ui/vertical_list.h"
 #include "ui/ui_utility.h"
-#include "lang/lang_keys.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/discrete_sliders.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
 #include "window/notifications_manager.h"
-#include "window/window_session_controller.h"
 #include "window/section_widget.h"
-#include "platform/platform_specific.h"
-#include "platform/platform_notifications_manager.h"
-#include "base/platform/base_platform_info.h"
-#include "mainwindow.h"
-#include "core/application.h"
-#include "main/main_session.h"
-#include "main/main_account.h"
-#include "main/main_domain.h"
-#include "api/api_authorizations.h"
-#include "api/api_ringtones.h"
-#include "data/data_chat_filters.h"
-#include "data/data_session.h"
-#include "data/data_document.h"
-#include "data/notify/data_notify_settings.h"
-#include "boxes/ringtones_box.h"
-#include "apiwrap.h"
-#include "styles/style_settings.h"
+#include "window/themes/window_theme.h"
+#include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
+#include "styles/style_chat.h"
+#include "styles/style_dialogs.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
-#include "styles/style_chat.h"
+#include "styles/style_settings.h"
 #include "styles/style_window.h"
-#include "styles/style_dialogs.h"
 
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
 #include <QSvgRenderer>
 
 namespace Settings {
-namespace {
 
-constexpr auto kMaxNotificationsCount = 5;
+using ChangeType = Window::Notifications::ChangeType;
 
-[[nodiscard]] int CurrentCount() {
+int CurrentNotificationsCount() {
 	return std::clamp(
 		Core::App().settings().notificationsCount(),
 		1,
 		kMaxNotificationsCount);
 }
 
-using ChangeType = Window::Notifications::ChangeType;
-
-class NotificationsCount : public Ui::RpWidget {
-public:
-	NotificationsCount(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller);
-
-	void setCount(int count);
-
-	~NotificationsCount();
-
-protected:
-	void paintEvent(QPaintEvent *e) override;
-	void mousePressEvent(QMouseEvent *e) override;
-	void mouseMoveEvent(QMouseEvent *e) override;
-	void leaveEventHook(QEvent *e) override;
-	void mouseReleaseEvent(QMouseEvent *e) override;
-
-	int resizeGetHeight(int newWidth) override;
-
-private:
-	using ScreenCorner = Core::Settings::ScreenCorner;
-	void setOverCorner(ScreenCorner corner);
-	void clearOverCorner();
-
-	class SampleWidget;
-	void removeSample(SampleWidget *widget);
-
-	QRect getScreenRect() const;
-	QRect getScreenRect(int width) const;
-	int getContentLeft() const;
-	void prepareNotificationSampleSmall();
-	void prepareNotificationSampleLarge();
-	void prepareNotificationSampleUserpic();
-
-	const not_null<Window::SessionController*> _controller;
-
-	QPixmap _notificationSampleUserpic;
-	QPixmap _notificationSampleSmall;
-	QPixmap _notificationSampleLarge;
-	ScreenCorner _chosenCorner;
-	std::vector<Ui::Animations::Simple> _sampleOpacities;
-
-	bool _isOverCorner = false;
-	ScreenCorner _overCorner = ScreenCorner::TopLeft;
-	bool _isDownCorner = false;
-	ScreenCorner _downCorner = ScreenCorner::TopLeft;
-
-	int _oldCount;
-
-	std::vector<SampleWidget*> _cornerSamples[4];
-
-};
-
 class NotificationsCount::SampleWidget : public QWidget {
 public:
 	SampleWidget(NotificationsCount *owner, const QPixmap &cache);
@@ -140,7 +95,79 @@ class NotificationsCount::SampleWidget : public QWidget {
 
 };
 
-void AddTypeButton(
+SplitToggle SetupSplitToggle(
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<QString> title,
+		const style::icon *icon,
+		bool checked,
+		rpl::producer<QString> details) {
+	const auto button = AddButtonWithIcon(
+		container,
+		std::move(title),
+		st::settingsNotificationType,
+		{ icon });
+
+	const auto &st = st::settingsNotificationType;
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		button.get(),
+		std::move(details),
+		st::settingsNotificationTypeDetails);
+	label->show();
+	label->moveToLeft(
+		st.padding.left(),
+		st.padding.top() + st.height - label->height());
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	const auto toggle = Ui::CreateChild<Ui::SettingsButton>(
+		container.get(),
+		nullptr,
+		st);
+	const auto checkView = button->lifetime().make_state<Ui::ToggleView>(
+		st.toggle,
+		checked,
+		[=] { toggle->update(); });
+
+	const auto separator = Ui::CreateChild<Ui::RpWidget>(container.get());
+	separator->paintRequest(
+	) | rpl::on_next([=, bg = st.textBgOver] {
+		auto p = QPainter(separator);
+		p.fillRect(separator->rect(), bg);
+	}, separator->lifetime());
+	const auto separatorHeight = st.height - 2 * st.toggle.border;
+	button->geometryValue(
+	) | rpl::on_next([=](const QRect &r) {
+		const auto w = st::rightsButtonToggleWidth;
+		toggle->setGeometry(
+			r.x() + r.width() - w,
+			r.y(),
+			w,
+			r.height());
+		separator->setGeometry(
+			toggle->x() - st::lineWidth,
+			r.y() + (r.height() - separatorHeight) / 2,
+			st::lineWidth,
+			separatorHeight);
+	}, toggle->lifetime());
+
+	const auto checkWidget = Ui::CreateChild<Ui::RpWidget>(toggle);
+	checkWidget->resize(checkView->getSize());
+	checkWidget->paintRequest(
+	) | rpl::on_next([=] {
+		auto p = QPainter(checkWidget);
+		checkView->paint(p, 0, 0, checkWidget->width());
+	}, checkWidget->lifetime());
+	toggle->sizeValue(
+	) | rpl::on_next([=](const QSize &s) {
+		checkWidget->moveToRight(
+			st.toggleSkip,
+			(s.height() - checkWidget->height()) / 2);
+	}, toggle->lifetime());
+
+	return { button, toggle, checkView };
+}
+
+[[nodiscard]] not_null<Ui::SettingsButton*> AddTypeButton(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller,
 		Data::DefaultNotify type,
@@ -162,18 +189,9 @@ void AddTypeButton(
 		}
 		Unexpected("Type value in AddTypeButton.");
 	}();
-	const auto button = AddButtonWithIcon(
-		container,
-		std::move(label),
-		st::settingsNotificationType,
-		{ icon });
-	button->setClickedCallback([=] {
-		showOther(NotificationsType::Id(type));
-	});
 
 	const auto session = &controller->session();
 	const auto settings = &session->data().notifySettings();
-	const auto &st = st::settingsNotificationType;
 	auto status = rpl::combine(
 		NotificationsEnabledForTypeValue(session, type),
 		rpl::single(
@@ -192,60 +210,16 @@ void AddTypeButton(
 						lt_count,
 						rpl::single(float64(count))));
 	}) | rpl::flatten_latest();
-	const auto details = Ui::CreateChild<Ui::FlatLabel>(
-		button.get(),
-		std::move(status),
-		st::settingsNotificationTypeDetails);
-	details->show();
-	details->moveToLeft(
-		st.padding.left(),
-		st.padding.top() + st.height - details->height());
-	details->setAttribute(Qt::WA_TransparentForMouseEvents);
 
-	const auto toggleButton = Ui::CreateChild<Ui::SettingsButton>(
-		container.get(),
-		nullptr,
-		st);
-	const auto checkView = button->lifetime().make_state<Ui::ToggleView>(
-		st.toggle,
+	const auto [button, toggleButton, checkView] = SetupSplitToggle(
+		container,
+		std::move(label),
+		icon,
 		NotificationsEnabledForType(session, type),
-		[=] { toggleButton->update(); });
-
-	const auto separator = Ui::CreateChild<Ui::RpWidget>(container.get());
-	separator->paintRequest(
-	) | rpl::start_with_next([=, bg = st.textBgOver] {
-		auto p = QPainter(separator);
-		p.fillRect(separator->rect(), bg);
-	}, separator->lifetime());
-	const auto separatorHeight = st.height - 2 * st.toggle.border;
-	button->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
-		const auto w = st::rightsButtonToggleWidth;
-		toggleButton->setGeometry(
-			r.x() + r.width() - w,
-			r.y(),
-			w,
-			r.height());
-		separator->setGeometry(
-			toggleButton->x() - st::lineWidth,
-			r.y() + (r.height() - separatorHeight) / 2,
-			st::lineWidth,
-			separatorHeight);
-	}, toggleButton->lifetime());
-
-	const auto checkWidget = Ui::CreateChild<Ui::RpWidget>(toggleButton);
-	checkWidget->resize(checkView->getSize());
-	checkWidget->paintRequest(
-	) | rpl::start_with_next([=] {
-		auto p = QPainter(checkWidget);
-		checkView->paint(p, 0, 0, checkWidget->width());
-	}, checkWidget->lifetime());
-	toggleButton->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
-		checkWidget->moveToRight(
-			st.toggleSkip,
-			(s.height() - checkWidget->height()) / 2);
-	}, toggleButton->lifetime());
+		std::move(status));
+	button->setClickedCallback([=] {
+		showOther(NotificationsType::Id(type));
+	});
 
 	const auto toggle = crl::guard(toggleButton, [=] {
 		const auto enabled = !checkView->checked();
@@ -256,7 +230,7 @@ void AddTypeButton(
 		});
 	});
 	toggleButton->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto count = int(settings->exceptions(type).size());
 		if (!count) {
 			toggle();
@@ -277,7 +251,7 @@ void AddTypeButton(
 					.text = phrase(
 						lt_count,
 						rpl::single(float64(count)),
-						Ui::Text::RichLangValue),
+						tr::rich),
 					.confirmed = [=](auto close) { toggle(); close(); },
 					.confirmText = tr::lng_box_ok(),
 					.title = tr::lng_notification_exceptions_title(),
@@ -292,6 +266,58 @@ void AddTypeButton(
 			}));
 		}
 	}, toggleButton->lifetime());
+	return button;
+}
+
+[[nodiscard]] not_null<Ui::SettingsButton*> AddReactionsButton(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Window::SessionController*> controller,
+		Fn<void(Type)> showOther) {
+	const auto session = &controller->session();
+	auto &rs = session->api().reactionsNotifySettings();
+	rs.reload();
+
+	using From = Api::ReactionsNotifyFrom;
+	auto status = rpl::combine(
+		rs.messagesFrom(),
+		rs.pollVotesFrom()
+	) | rpl::map([](From messages, From pollVotes) {
+		auto parts = QStringList();
+		if (messages != From::None) {
+			parts.push_back(
+				tr::lng_notification_reactions_messages(tr::now));
+		}
+		if (pollVotes != From::None) {
+			parts.push_back(
+				tr::lng_notification_reactions_poll_votes(tr::now));
+		}
+		return parts.isEmpty()
+			? tr::lng_notification_click_to_change(tr::now)
+			: parts.join(u", "_q);
+	});
+
+	const auto [button, toggleButton, checkView] = SetupSplitToggle(
+		container,
+		tr::lng_notification_reactions(),
+		&st::menuIconGroupReactions,
+		rs.enabledCurrent(),
+		std::move(status));
+	button->setClickedCallback([=] {
+		showOther(NotificationsReactions::Id());
+	});
+
+	rs.enabled(
+	) | rpl::on_next([=](bool enabled) {
+		checkView->setChecked(enabled, anim::type::normal);
+	}, button->lifetime());
+
+	toggleButton->clicks(
+	) | rpl::on_next([=] {
+		const auto enabled = !checkView->checked();
+		const auto from = enabled ? From::All : From::None;
+		session->api().reactionsNotifySettings().setAllFrom(from);
+	}, toggleButton->lifetime());
+	return button;
 }
 
 NotificationsCount::NotificationsCount(
@@ -299,7 +325,7 @@ NotificationsCount::NotificationsCount(
 	not_null<Window::SessionController*> controller)
 : _controller(controller)
 , _chosenCorner(Core::App().settings().notificationsCorner())
-, _oldCount(CurrentCount()) {
+, _oldCount(CurrentNotificationsCount()) {
 	setMouseTracking(true);
 
 	_sampleOpacities.resize(kMaxNotificationsCount);
@@ -540,7 +566,8 @@ void NotificationsCount::setOverCorner(ScreenCorner corner) {
 		samples[i]->showFast();
 	}
 	if (samplesNeeded > samplesLeave) {
-		auto r = _controller->widget()->desktopRect();
+		const auto r = Window::Notifications::NotificationDisplayRect(
+			&_controller->window());
 		auto isLeft = Core::Settings::IsLeftCorner(_overCorner);
 		auto isTop = Core::Settings::IsTopCorner(_overCorner);
 		auto sampleLeft = (isLeft == rtl()) ? (r.x() + r.width() - st::notifyWidth - st::notifyDeltaX) : (r.x() + st::notifyDeltaX);
@@ -772,12 +799,6 @@ void NotifyPreview::paint(Painter &p, int x, int y) {
 		2);
 }
 
-struct NotifyViewCheckboxes {
-	not_null<Ui::SlideWrap<>*> wrap;
-	not_null<Ui::Checkbox*> name;
-	not_null<Ui::Checkbox*> preview;
-};
-
 NotifyViewCheckboxes SetupNotifyViewOptions(
 		not_null<Window::SessionController*> controller,
 		not_null<Ui::VerticalLayout*> container,
@@ -808,10 +829,13 @@ NotifyViewCheckboxes SetupNotifyViewOptions(
 	const auto view = widget->lifetime().make_state<NotifyPreview>(
 		nameShown,
 		previewShown);
+	using ThemePtr = std::unique_ptr<Ui::ChatTheme>;
+	const auto theme = widget->lifetime().make_state<ThemePtr>(
+		Window::Theme::DefaultChatThemeOn(widget->lifetime()));
 	widget->widthValue(
 	) | rpl::filter(
 		_1 >= (st::historyMinimalWidth / 2)
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto margins = st::notifyPreviewMargins;
 		const auto bubblew = width - margins.left() - margins.right();
 		const auto bubbleh = view->resizeGetHeight(bubblew);
@@ -828,14 +852,15 @@ NotifyViewCheckboxes SetupNotifyViewOptions(
 	}, widget->lifetime());
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
+		Painter p(widget);
+		p.setClipRect(rect);
 		Window::SectionWidget::PaintBackground(
-			controller,
-			controller->defaultChatTheme().get(), // #TODO themes
-			widget,
+			p,
+			theme->get(),
+			QSize(widget->width(), widget->window()->height()),
 			rect);
 
-		Painter p(widget);
 		view->paint(
 			p,
 			st::notifyPreviewMargins.left(),
@@ -843,13 +868,13 @@ NotifyViewCheckboxes SetupNotifyViewOptions(
 	}, widget->lifetime());
 
 	name->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		view->setNameShown(checked);
 		widget->update();
 	}, name->lifetime());
 
 	preview->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		view->setPreviewShown(checked);
 		widget->update();
 	}, preview->lifetime());
@@ -861,442 +886,769 @@ NotifyViewCheckboxes SetupNotifyViewOptions(
 	};
 }
 
-void SetupAdvancedNotifications(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	Ui::AddSkip(container, st::settingsCheckboxesSkip);
-	Ui::AddDivider(container);
-	Ui::AddSkip(container, st::settingsCheckboxesSkip);
-	Ui::AddSubsectionTitle(
-		container,
-		tr::lng_settings_notifications_position());
-	Ui::AddSkip(container, st::settingsCheckboxesSkip);
+namespace {
 
-	const auto position = container->add(
-		object_ptr<NotificationsCount>(container, controller));
+using namespace Builder;
 
-	Ui::AddSkip(container, st::settingsCheckboxesSkip);
-	Ui::AddSubsectionTitle(container, tr::lng_settings_notifications_count());
+constexpr auto kDefaultDisplayIndex = -1;
 
-	const auto count = container->add(
-		object_ptr<Ui::SettingsSlider>(container, st::settingsSlider),
-		st::settingsBigScalePadding);
-	for (int i = 0; i != kMaxNotificationsCount; ++i) {
-		count->addSection(QString::number(i + 1));
-	}
-	count->setActiveSectionFast(CurrentCount() - 1);
-	count->sectionActivated(
-	) | rpl::start_with_next([=](int section) {
-		position->setCount(section + 1);
-	}, count->lifetime());
-	Ui::AddSkip(container, st::settingsCheckboxesSkip);
-}
+using NotifyView = Core::Settings::NotifyView;
 
-void SetupMultiAccountNotifications(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
+void BuildMultiAccountSection(SectionBuilder &builder) {
 	if (Core::App().domain().accounts().size() < 2) {
 		return;
 	}
-	Ui::AddSubsectionTitle(container, tr::lng_settings_show_from());
 
-	const auto fromAll = container->add(object_ptr<Button>(
-		container,
-		tr::lng_settings_notify_all(),
-		st::settingsButtonNoIcon
-	))->toggleOn(rpl::single(Core::App().settings().notifyFromAll()));
-	fromAll->toggledChanges(
-	) | rpl::filter([](bool checked) {
-		return (checked != Core::App().settings().notifyFromAll());
-	}) | rpl::start_with_next([=](bool checked) {
-		Core::App().settings().setNotifyFromAll(checked);
-		Core::App().saveSettingsDelayed();
-		if (!checked) {
-			auto &notifications = Core::App().notifications();
-			const auto &list = Core::App().domain().accounts();
-			for (const auto &[index, account] : list) {
-				if (account.get() == &Core::App().domain().active()) {
-					continue;
-				} else if (const auto session = account->maybeSession()) {
-					notifications.clearFromSession(session);
+	builder.addSubsectionTitle({
+		.id = u"notifications/multi-account"_q,
+		.title = tr::lng_settings_show_from(),
+		.keywords = { u"accounts"_q, u"multiple"_q },
+	});
+
+	const auto fromAll = builder.addButton({
+		.id = u"notifications/accounts"_q,
+		.title = tr::lng_settings_notify_all(),
+		.st = &st::settingsButtonNoIcon,
+		.toggled = rpl::single(Core::App().settings().notifyFromAll()),
+		.keywords = { u"all accounts"_q, u"multiple"_q },
+	});
+
+	if (fromAll) {
+		fromAll->toggledChanges(
+		) | rpl::filter([](bool checked) {
+			return (checked != Core::App().settings().notifyFromAll());
+		}) | rpl::on_next([=](bool checked) {
+			Core::App().settings().setNotifyFromAll(checked);
+			Core::App().saveSettingsDelayed();
+			if (!checked) {
+				auto &notifications = Core::App().notifications();
+				const auto &list = Core::App().domain().accounts();
+				for (const auto &[index, account] : list) {
+					if (account.get() == &Core::App().domain().active()) {
+						continue;
+					} else if (const auto session = account->maybeSession()) {
+						notifications.clearFromSession(session);
+					}
 				}
 			}
-		}
-	}, fromAll->lifetime());
+		}, fromAll->lifetime());
+	}
 
-	Ui::AddSkip(container);
-	Ui::AddDividerText(container, tr::lng_settings_notify_all_about());
-	Ui::AddSkip(container);
+	builder.addSkip();
+	builder.addDividerText(tr::lng_settings_notify_all_about());
+	builder.addSkip();
 }
 
-void SetupNotificationsContent(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		Fn<void(Type)> showOther) {
-	using namespace rpl::mappers;
-
-	Ui::AddSkip(container, st::settingsPrivacySkip);
+void BuildGlobalNotificationsSection(SectionBuilder &builder) {
+	builder.addSubsectionTitle({
+		.id = u"notifications/global"_q,
+		.title = tr::lng_settings_notify_global(),
+		.keywords = { u"global"_q, u"desktop"_q, u"sound"_q },
+	});
 
-	using NotifyView = Core::Settings::NotifyView;
-	SetupMultiAccountNotifications(controller, container);
+	const auto container = builder.container();
+	const auto session = builder.session();
+	const auto &settings = Core::App().settings();
 
-	AddSubsectionTitle(container, tr::lng_settings_notify_global());
+	const auto desktopToggles = container
+		? container->lifetime().make_state<rpl::event_stream<bool>>()
+		: nullptr;
+	const auto desktop = builder.addButton({
+		.id = u"notifications/desktop"_q,
+		.title = tr::lng_settings_desktop_notify(),
+		.icon = { &st::menuIconNotifications },
+		.toggled = desktopToggles
+			? desktopToggles->events_starting_with(settings.desktopNotify())
+			: rpl::single(settings.desktopNotify()) | rpl::type_erased,
+		.keywords = { u"desktop"_q, u"popup"_q, u"show"_q },
+	});
 
-	const auto session = &controller->session();
-	const auto checkbox = [&](
-			rpl::producer<QString> label,
-			IconDescriptor &&descriptor,
-			rpl::producer<bool> checked) {
-		auto result = CreateButtonWithIcon(
-			container,
-			std::move(label),
-			st::settingsButton,
-			std::move(descriptor)
-		);
-		result->toggleOn(std::move(checked));
-		return result;
-	};
-	const auto addCheckbox = [&](
-			rpl::producer<QString> label,
-			IconDescriptor &&descriptor,
-			rpl::producer<bool> checked) {
-		return container->add(
-			checkbox(
-				std::move(label),
-				std::move(descriptor),
-				std::move(checked)));
-	};
-	const auto &settings = Core::App().settings();
-	const auto desktopToggles = container->lifetime(
-	).make_state<rpl::event_stream<bool>>();
-	const auto desktop = addCheckbox(
-		tr::lng_settings_desktop_notify(),
-		{ &st::menuIconNotifications },
-		desktopToggles->events_starting_with(settings.desktopNotify()));
-
-	const auto flashbounceToggles = container->lifetime(
-	).make_state<rpl::event_stream<bool>>();
-	const auto flashbounce = addCheckbox(
-		(Platform::IsWindows()
+	const auto flashbounceToggles = container
+		? container->lifetime().make_state<rpl::event_stream<bool>>()
+		: nullptr;
+	const auto flashbounce = builder.addButton({
+		.id = u"notifications/flash"_q,
+		.title = (Platform::IsWindows()
 			? tr::lng_settings_alert_windows
 			: Platform::IsMac()
 			? tr::lng_settings_alert_mac
 			: tr::lng_settings_alert_linux)(),
-		{ &st::menuIconDockBounce },
-		flashbounceToggles->events_starting_with(
-			settings.flashBounceNotify()));
+		.icon = { &st::menuIconDockBounce },
+		.toggled = flashbounceToggles
+			? flashbounceToggles->events_starting_with(settings.flashBounceNotify())
+			: rpl::single(settings.flashBounceNotify()) | rpl::type_erased,
+		.keywords = { u"flash"_q, u"bounce"_q, u"taskbar"_q },
+	});
 
-	const auto soundAllowed = container->lifetime(
-	).make_state<rpl::event_stream<bool>>();
+	const auto soundAllowed = container
+		? container->lifetime().make_state<rpl::event_stream<bool>>()
+		: nullptr;
 	const auto allowed = [=] {
 		return Core::App().settings().soundNotify();
 	};
-	const auto sound = addCheckbox(
-		tr::lng_settings_sound_allowed(),
-		{ &st::menuIconUnmute },
-		soundAllowed->events_starting_with(allowed()));
+	const auto sound = builder.addButton({
+		.id = u"notifications/sound"_q,
+		.title = tr::lng_settings_sound_allowed(),
+		.icon = { &st::menuIconUnmute },
+		.toggled = soundAllowed
+			? soundAllowed->events_starting_with(allowed())
+			: rpl::single(allowed()) | rpl::type_erased,
+		.keywords = { u"sound"_q, u"audio"_q, u"mute"_q },
+	});
 
-	Ui::AddSkip(container);
+	builder.add([session](const WidgetContext &ctx) {
+		Ui::AddRingtonesVolumeSlider(
+			ctx.container,
+			rpl::single(true),
+			tr::lng_settings_master_volume_notifications(),
+			Data::VolumeController{
+				.volume = []() -> ushort {
+					const auto volume
+						= Core::App().settings().notificationsVolume();
+					return volume ? volume : 100;
+				},
+				.saveVolume = [=](ushort volume) {
+					Core::App().notifications().playSound(
+						session,
+						0,
+						volume / 100.);
+					Core::App().settings().setNotificationsVolume(volume);
+					Core::App().saveSettingsDelayed();
+				}});
+		return SectionBuilder::WidgetToAdd{};
+	});
 
-	const auto checkboxes = SetupNotifyViewOptions(
-		controller,
-		container,
-		(settings.notifyView() <= NotifyView::ShowName),
-		(settings.notifyView() <= NotifyView::ShowPreview));
-	const auto name = checkboxes.name;
-	const auto preview = checkboxes.preview;
-	const auto previewWrap = checkboxes.wrap;
-	const auto previewDivider = container->add(
-		object_ptr<Ui::SlideWrap<Ui::BoxContentDivider>>(
+	builder.addSkip();
+
+	if (desktop) {
+		const auto changed = [=](ChangeType change) {
+			Core::App().saveSettingsDelayed();
+			Core::App().notifications().notifySettingsChanged(change);
+		};
+
+		desktop->toggledChanges(
+		) | rpl::filter([](bool checked) {
+			return (checked != Core::App().settings().desktopNotify());
+		}) | rpl::on_next([=](bool checked) {
+			Core::App().settings().setDesktopNotify(checked);
+			changed(ChangeType::DesktopEnabled);
+		}, desktop->lifetime());
+
+		if (sound) {
+			sound->toggledChanges(
+			) | rpl::filter([](bool checked) {
+				return (checked != Core::App().settings().soundNotify());
+			}) | rpl::on_next([=](bool checked) {
+				Core::App().settings().setSoundNotify(checked);
+				changed(ChangeType::SoundEnabled);
+			}, sound->lifetime());
+		}
+
+		if (flashbounce) {
+			flashbounce->toggledChanges(
+			) | rpl::filter([](bool checked) {
+				return (checked != Core::App().settings().flashBounceNotify());
+			}) | rpl::on_next([=](bool checked) {
+				Core::App().settings().setFlashBounceNotify(checked);
+				changed(ChangeType::FlashBounceEnabled);
+			}, flashbounce->lifetime());
+		}
+
+		Core::App().notifications().settingsChanged(
+		) | rpl::on_next([=](ChangeType change) {
+			if (change == ChangeType::DesktopEnabled) {
+				desktopToggles->fire(Core::App().settings().desktopNotify());
+			} else if (change == ChangeType::SoundEnabled) {
+				soundAllowed->fire(allowed());
+			} else if (change == ChangeType::FlashBounceEnabled) {
+				flashbounceToggles->fire(
+					Core::App().settings().flashBounceNotify());
+			}
+		}, desktop->lifetime());
+	}
+}
+
+void BuildNotifyViewSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	if (!controller) {
+		return;
+	}
+
+	builder.add([controller](const WidgetContext &ctx) {
+		const auto container = ctx.container.get();
+		const auto &settings = Core::App().settings();
+		const auto checkboxes = SetupNotifyViewOptions(
+			controller,
 			container,
-			object_ptr<Ui::BoxContentDivider>(container)));
-	previewWrap->toggle(settings.desktopNotify(), anim::type::instant);
-	previewDivider->toggle(!settings.desktopNotify(), anim::type::instant);
+			(settings.notifyView() <= NotifyView::ShowName),
+			(settings.notifyView() <= NotifyView::ShowPreview));
+		const auto name = checkboxes.name;
+		const auto preview = checkboxes.preview;
+		const auto previewWrap = checkboxes.wrap;
+
+		const auto previewDivider = container->add(
+			object_ptr<Ui::SlideWrap<Ui::BoxContentDivider>>(
+				container,
+				object_ptr<Ui::BoxContentDivider>(container)));
+		previewWrap->toggle(settings.desktopNotify(), anim::type::instant);
+		previewDivider->toggle(!settings.desktopNotify(), anim::type::instant);
 
-	controller->session().data().notifySettings().loadExceptions();
+		const auto changed = [=](ChangeType change) {
+			Core::App().saveSettingsDelayed();
+			Core::App().notifications().notifySettingsChanged(change);
+		};
+
+		name->checkedChanges(
+		) | rpl::map([=](bool checked) {
+			if (!checked) {
+				preview->setChecked(false);
+				return NotifyView::ShowNothing;
+			} else if (!preview->checked()) {
+				return NotifyView::ShowName;
+			}
+			return NotifyView::ShowPreview;
+		}) | rpl::filter([=](NotifyView value) {
+			return (value != Core::App().settings().notifyView());
+		}) | rpl::on_next([=](NotifyView value) {
+			Core::App().settings().setNotifyView(value);
+			changed(ChangeType::ViewParams);
+		}, name->lifetime());
+
+		preview->checkedChanges(
+		) | rpl::map([=](bool checked) {
+			if (checked) {
+				name->setChecked(true);
+				return NotifyView::ShowPreview;
+			} else if (name->checked()) {
+				return NotifyView::ShowName;
+			}
+			return NotifyView::ShowNothing;
+		}) | rpl::filter([=](NotifyView value) {
+			return (value != Core::App().settings().notifyView());
+		}) | rpl::on_next([=](NotifyView value) {
+			Core::App().settings().setNotifyView(value);
+			changed(ChangeType::ViewParams);
+		}, preview->lifetime());
+
+		Core::App().notifications().settingsChanged(
+		) | rpl::on_next([=](ChangeType change) {
+			if (change == ChangeType::DesktopEnabled) {
+				previewWrap->toggle(
+					Core::App().settings().desktopNotify(),
+					anim::type::normal);
+				previewDivider->toggle(
+					!Core::App().settings().desktopNotify(),
+					anim::type::normal);
+			}
+		}, container->lifetime());
 
-	Ui::AddSkip(container, st::notifyPreviewBottomSkip);
-	Ui::AddSubsectionTitle(container, tr::lng_settings_notify_title());
-	const auto addType = [&](Data::DefaultNotify type) {
-		AddTypeButton(container, controller, type, showOther);
-	};
-	addType(Data::DefaultNotify::User);
-	addType(Data::DefaultNotify::Group);
-	addType(Data::DefaultNotify::Broadcast);
+		return SectionBuilder::WidgetToAdd{};
+	});
+}
+
+void BuildNotifyTypeSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto showOther = builder.showOther();
+
+	builder.addSkip(st::notifyPreviewBottomSkip);
+	builder.addSubsectionTitle({
+		.id = u"notifications/types"_q,
+		.title = tr::lng_settings_notify_title(),
+		.keywords = { u"private"_q, u"groups"_q, u"channels"_q },
+	});
+
+	if (controller) {
+		controller->session().data().notifySettings().loadExceptions();
+	}
+
+	builder.add([controller, showOther](const WidgetContext &ctx) {
+		const auto privateChats = AddTypeButton(
+			ctx.container,
+			controller,
+			Data::DefaultNotify::User,
+			showOther);
+		const auto groups = AddTypeButton(
+			ctx.container,
+			controller,
+			Data::DefaultNotify::Group,
+			showOther);
+		const auto channels = AddTypeButton(
+			ctx.container,
+			controller,
+			Data::DefaultNotify::Broadcast,
+			showOther);
+		const auto reactions = AddReactionsButton(
+			ctx.container,
+			controller,
+			showOther);
+		if (ctx.highlights) {
+			ctx.highlights->push_back({
+				u"notifications/private"_q,
+				{ privateChats.get(), { .rippleShape = true } },
+			});
+			ctx.highlights->push_back({
+				u"notifications/groups"_q,
+				{ groups.get(), { .rippleShape = true } },
+			});
+			ctx.highlights->push_back({
+				u"notifications/channels"_q,
+				{ channels.get(), { .rippleShape = true } },
+			});
+			ctx.highlights->push_back({
+				u"notifications/reactions"_q,
+				{ reactions.get(), { .rippleShape = true } },
+			});
+		}
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"notifications/private"_q,
+			.title = tr::lng_notification_private_chats(tr::now),
+			.keywords = { u"private"_q, u"chats"_q, u"direct"_q },
+			.icon = { &st::menuIconProfile },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"notifications/groups"_q,
+			.title = tr::lng_notification_groups(tr::now),
+			.keywords = { u"groups"_q, u"chats"_q },
+			.icon = { &st::menuIconGroups },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"notifications/channels"_q,
+			.title = tr::lng_notification_channels(tr::now),
+			.keywords = { u"channels"_q, u"broadcast"_q },
+			.icon = { &st::menuIconChannel },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"notifications/reactions"_q,
+			.title = tr::lng_notification_reactions(tr::now),
+			.keywords = { u"reactions"_q },
+			.icon = { &st::menuIconGroupReactions },
+		};
+	});
+}
+
+void BuildEventNotificationsSection(SectionBuilder &builder) {
+	builder.addSkip(st::settingsCheckboxesSkip);
+	builder.addDivider();
+	builder.addSkip(st::settingsCheckboxesSkip);
+	builder.addSubsectionTitle({
+		.id = u"notifications/events"_q,
+		.title = tr::lng_settings_events_title(),
+		.keywords = { u"events"_q, u"joined"_q, u"pinned"_q },
+	});
 
-	Ui::AddSkip(container, st::settingsCheckboxesSkip);
-	Ui::AddDivider(container);
-	Ui::AddSkip(container, st::settingsCheckboxesSkip);
-	Ui::AddSubsectionTitle(container, tr::lng_settings_events_title());
+	const auto session = builder.session();
+	const auto &settings = Core::App().settings();
 
 	auto joinSilent = rpl::single(
 		session->api().contactSignupSilentCurrent().value_or(false)
 	) | rpl::then(session->api().contactSignupSilent());
-	const auto joined = addCheckbox(
-		tr::lng_settings_events_joined(),
-		{ &st::menuIconInvite },
-		std::move(joinSilent) | rpl::map(!_1));
-	joined->toggledChanges(
-	) | rpl::filter([=](bool enabled) {
-		const auto silent = session->api().contactSignupSilentCurrent();
-		return (enabled == silent.value_or(false));
-	}) | rpl::start_with_next([=](bool enabled) {
-		session->api().saveContactSignupSilent(!enabled);
-	}, joined->lifetime());
-
-	const auto pinned = addCheckbox(
-		tr::lng_settings_events_pinned(),
-		{ &st::menuIconPin },
-		rpl::single(
+
+	const auto joined = builder.addButton({
+		.id = u"notifications/events/joined"_q,
+		.title = tr::lng_settings_events_joined(),
+		.icon = { &st::menuIconInvite },
+		.toggled = std::move(joinSilent) | rpl::map([](bool s) { return !s; }),
+		.keywords = { u"joined"_q, u"contacts"_q, u"signup"_q },
+	});
+	if (joined) {
+		joined->toggledChanges(
+		) | rpl::filter([=](bool enabled) {
+			const auto silent = session->api().contactSignupSilentCurrent();
+			return (enabled == silent.value_or(false));
+		}) | rpl::on_next([=](bool enabled) {
+			session->api().saveContactSignupSilent(!enabled);
+		}, joined->lifetime());
+	}
+
+	const auto pinned = builder.addButton({
+		.id = u"notifications/events/pinned"_q,
+		.title = tr::lng_settings_events_pinned(),
+		.icon = { &st::menuIconPin },
+		.toggled = rpl::single(
 			settings.notifyAboutPinned()
-		) | rpl::then(settings.notifyAboutPinnedChanges()));
-	pinned->toggledChanges(
-	) | rpl::filter([=](bool notify) {
-		return (notify != Core::App().settings().notifyAboutPinned());
-	}) | rpl::start_with_next([=](bool notify) {
-		Core::App().settings().setNotifyAboutPinned(notify);
-		Core::App().saveSettingsDelayed();
-	}, joined->lifetime());
+		) | rpl::then(settings.notifyAboutPinnedChanges()),
+		.keywords = { u"pinned"_q, u"message"_q },
+	});
+	if (pinned) {
+		pinned->toggledChanges(
+		) | rpl::filter([=](bool notify) {
+			return (notify != Core::App().settings().notifyAboutPinned());
+		}) | rpl::on_next([=](bool notify) {
+			Core::App().settings().setNotifyAboutPinned(notify);
+			Core::App().saveSettingsDelayed();
+		}, pinned->lifetime());
+	}
+}
 
-	Ui::AddSkip(container, st::settingsCheckboxesSkip);
-	Ui::AddDivider(container);
-	Ui::AddSkip(container, st::settingsCheckboxesSkip);
-	Ui::AddSubsectionTitle(
-		container,
-		tr::lng_settings_notifications_calls_title());
+void BuildCallNotificationsSection(SectionBuilder &builder) {
+	builder.addSkip(st::settingsCheckboxesSkip);
+	builder.addDivider();
+	builder.addSkip(st::settingsCheckboxesSkip);
+	builder.addSubsectionTitle({
+		.id = u"notifications/calls"_q,
+		.title = tr::lng_settings_notifications_calls_title(),
+		.keywords = { u"calls"_q, u"incoming"_q, u"receive"_q },
+	});
+
+	const auto session = builder.session();
 	const auto authorizations = &session->api().authorizations();
-	const auto acceptCalls = addCheckbox(
-		tr::lng_settings_call_accept_calls(),
-		{ &st::menuIconCallsReceive },
-		authorizations->callsDisabledHereValue() | rpl::map(!_1));
-	acceptCalls->toggledChanges(
-	) | rpl::filter([=](bool toggled) {
-		return (toggled == authorizations->callsDisabledHere());
-	}) | rpl::start_with_next([=](bool toggled) {
-		authorizations->toggleCallsDisabledHere(!toggled);
-	}, container->lifetime());
-
-	Ui::AddSkip(container, st::settingsCheckboxesSkip);
-	Ui::AddDivider(container);
-	Ui::AddSkip(container, st::settingsCheckboxesSkip);
-	Ui::AddSubsectionTitle(container, tr::lng_settings_badge_title());
-
-	const auto muted = container->add(object_ptr<Button>(
-		container,
-		tr::lng_settings_include_muted(),
-		st::settingsButtonNoIcon));
-	muted->toggleOn(rpl::single(settings.includeMutedCounter()));
-	const auto mutedFolders = session->data().chatsFilters().has()
-		? container->add(object_ptr<Button>(
-			container,
-			tr::lng_settings_include_muted_folders(),
-			st::settingsButtonNoIcon))
-		: nullptr;
-	if (mutedFolders) {
-		mutedFolders->toggleOn(
-			rpl::single(settings.includeMutedCounterFolders()));
+	authorizations->reload();
+
+	const auto acceptCalls = builder.addButton({
+		.id = u"notifications/calls/accept"_q,
+		.title = tr::lng_settings_call_accept_calls(),
+		.icon = { &st::menuIconCallsReceive },
+		.toggled = authorizations->callsDisabledHereValue()
+			| rpl::map([](bool disabled) { return !disabled; }),
+		.keywords = { u"calls"_q, u"receive"_q, u"incoming"_q },
+	});
+	if (acceptCalls) {
+		acceptCalls->toggledChanges(
+		) | rpl::filter([=](bool toggled) {
+			return (toggled == authorizations->callsDisabledHere());
+		}) | rpl::on_next([=](bool toggled) {
+			authorizations->toggleCallsDisabledHere(!toggled);
+		}, acceptCalls->lifetime());
 	}
-	const auto count = container->add(object_ptr<Button>(
-		container,
-		tr::lng_settings_count_unread(),
-		st::settingsButtonNoIcon));
-	count->toggleOn(rpl::single(settings.countUnreadMessages()));
+}
 
-	auto nativeText = [&] {
-		if (!Platform::Notifications::Supported()
-			|| Platform::Notifications::Enforced()) {
-			return rpl::producer<QString>();
-		} else if (Platform::IsWindows()) {
-			return tr::lng_settings_use_windows();
-		}
-		return tr::lng_settings_use_native_notifications();
-	}();
-	const auto native = [&]() -> Ui::SettingsButton* {
-		if (!nativeText) {
-			return nullptr;
-		}
+void BuildBadgeCounterSection(SectionBuilder &builder) {
+	builder.addSkip(st::settingsCheckboxesSkip);
+	builder.addDivider();
+	builder.addSkip(st::settingsCheckboxesSkip);
+	builder.addSubsectionTitle({
+		.id = u"notifications/badge"_q,
+		.title = tr::lng_settings_badge_title(),
+		.keywords = { u"badge"_q, u"counter"_q, u"unread"_q },
+	});
 
-		Ui::AddSkip(container, st::settingsCheckboxesSkip);
-		Ui::AddDivider(container);
-		Ui::AddSkip(container, st::settingsCheckboxesSkip);
-		Ui::AddSubsectionTitle(container, tr::lng_settings_native_title());
-		return container->add(object_ptr<Button>(
-			container,
-			std::move(nativeText),
-			st::settingsButtonNoIcon
-		))->toggleOn(rpl::single(settings.nativeNotifications()));
-	}();
+	const auto session = builder.session();
+	const auto &settings = Core::App().settings();
 
-	const auto advancedSlide = !Platform::Notifications::Enforced()
-		? container->add(
-			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-				container,
-				object_ptr<Ui::VerticalLayout>(container)))
-		: nullptr;
-	const auto advancedWrap = advancedSlide
-		? advancedSlide->entity()
-		: nullptr;
-	if (advancedWrap) {
-		SetupAdvancedNotifications(controller, advancedWrap);
-	}
+	const auto muted = builder.addButton({
+		.id = u"notifications/include-muted-chats"_q,
+		.title = tr::lng_settings_include_muted(),
+		.st = &st::settingsButtonNoIcon,
+		.toggled = rpl::single(settings.includeMutedCounter()),
+		.keywords = { u"muted"_q, u"badge"_q, u"counter"_q },
+	});
 
-	if (native && advancedSlide && settings.nativeNotifications()) {
-		advancedSlide->hide(anim::type::instant);
-	}
+	const auto hasFolders = session->data().chatsFilters().has();
+	const auto mutedFolders = hasFolders ? builder.addButton({
+		.id = u"notifications/badge/muted_folders"_q,
+		.title = tr::lng_settings_include_muted_folders(),
+		.st = &st::settingsButtonNoIcon,
+		.toggled = rpl::single(settings.includeMutedCounterFolders()),
+		.keywords = { u"muted"_q, u"folders"_q },
+	}) : nullptr;
+
+	const auto count = builder.addButton({
+		.id = u"notifications/count-unread-messages"_q,
+		.title = tr::lng_settings_count_unread(),
+		.st = &st::settingsButtonNoIcon,
+		.toggled = rpl::single(settings.countUnreadMessages()),
+		.keywords = { u"unread"_q, u"messages"_q, u"count"_q },
+	});
 
-	using Change = Window::Notifications::ChangeType;
-	const auto changed = [=](Change change) {
+	const auto changed = [=](ChangeType change) {
 		Core::App().saveSettingsDelayed();
 		Core::App().notifications().notifySettingsChanged(change);
 	};
-	desktop->toggledChanges(
-	) | rpl::filter([](bool checked) {
-		return (checked != Core::App().settings().desktopNotify());
-	}) | rpl::start_with_next([=](bool checked) {
-		Core::App().settings().setDesktopNotify(checked);
-		changed(Change::DesktopEnabled);
-	}, desktop->lifetime());
-
-	sound->toggledChanges(
-	) | rpl::filter([](bool checked) {
-		return (checked != Core::App().settings().soundNotify());
-	}) | rpl::start_with_next([=](bool checked) {
-		Core::App().settings().setSoundNotify(checked);
-		changed(Change::SoundEnabled);
-	}, sound->lifetime());
 
-	name->checkedChanges(
-	) | rpl::map([=](bool checked) {
-		if (!checked) {
-			preview->setChecked(false);
-			return NotifyView::ShowNothing;
-		} else if (!preview->checked()) {
-			return NotifyView::ShowName;
-		}
-		return NotifyView::ShowPreview;
-	}) | rpl::filter([=](NotifyView value) {
-		return (value != Core::App().settings().notifyView());
-	}) | rpl::start_with_next([=](NotifyView value) {
-		Core::App().settings().setNotifyView(value);
-		changed(Change::ViewParams);
-	}, name->lifetime());
-
-	preview->checkedChanges(
-	) | rpl::map([=](bool checked) {
-		if (checked) {
-			name->setChecked(true);
-			return NotifyView::ShowPreview;
-		} else if (name->checked()) {
-			return NotifyView::ShowName;
-		}
-		return NotifyView::ShowNothing;
-	}) | rpl::filter([=](NotifyView value) {
-		return (value != Core::App().settings().notifyView());
-	}) | rpl::start_with_next([=](NotifyView value) {
-		Core::App().settings().setNotifyView(value);
-		changed(Change::ViewParams);
-	}, preview->lifetime());
-
-	flashbounce->toggledChanges(
-	) | rpl::filter([](bool checked) {
-		return (checked != Core::App().settings().flashBounceNotify());
-	}) | rpl::start_with_next([=](bool checked) {
-		Core::App().settings().setFlashBounceNotify(checked);
-		changed(Change::FlashBounceEnabled);
-	}, flashbounce->lifetime());
-
-	muted->toggledChanges(
-	) | rpl::filter([=](bool checked) {
-		return (checked != Core::App().settings().includeMutedCounter());
-	}) | rpl::start_with_next([=](bool checked) {
-		Core::App().settings().setIncludeMutedCounter(checked);
-		changed(Change::IncludeMuted);
-	}, muted->lifetime());
+	if (muted) {
+		muted->toggledChanges(
+		) | rpl::filter([=](bool checked) {
+			return (checked != Core::App().settings().includeMutedCounter());
+		}) | rpl::on_next([=](bool checked) {
+			Core::App().settings().setIncludeMutedCounter(checked);
+			changed(ChangeType::IncludeMuted);
+		}, muted->lifetime());
+	}
 
 	if (mutedFolders) {
 		mutedFolders->toggledChanges(
 		) | rpl::filter([=](bool checked) {
 			return (checked
 				!= Core::App().settings().includeMutedCounterFolders());
-		}) | rpl::start_with_next([=](bool checked) {
+		}) | rpl::on_next([=](bool checked) {
 			Core::App().settings().setIncludeMutedCounterFolders(checked);
-			changed(Change::IncludeMuted);
+			changed(ChangeType::IncludeMuted);
 		}, mutedFolders->lifetime());
 	}
 
-	count->toggledChanges(
-	) | rpl::filter([=](bool checked) {
-		return (checked != Core::App().settings().countUnreadMessages());
-	}) | rpl::start_with_next([=](bool checked) {
-		Core::App().settings().setCountUnreadMessages(checked);
-		changed(Change::CountMessages);
-	}, count->lifetime());
-
-	Core::App().notifications().settingsChanged(
-	) | rpl::start_with_next([=](Change change) {
-		if (change == Change::DesktopEnabled) {
-			desktopToggles->fire(Core::App().settings().desktopNotify());
-			previewWrap->toggle(
-				Core::App().settings().desktopNotify(),
-				anim::type::normal);
-			previewDivider->toggle(
-				!Core::App().settings().desktopNotify(),
-				anim::type::normal);
-		} else if (change == Change::ViewParams) {
-			//
-		} else if (change == Change::SoundEnabled) {
-			soundAllowed->fire(allowed());
-		} else if (change == Change::FlashBounceEnabled) {
-			flashbounceToggles->fire(
-				Core::App().settings().flashBounceNotify());
+	if (count) {
+		count->toggledChanges(
+		) | rpl::filter([=](bool checked) {
+			return (checked != Core::App().settings().countUnreadMessages());
+		}) | rpl::on_next([=](bool checked) {
+			Core::App().settings().setCountUnreadMessages(checked);
+			changed(ChangeType::CountMessages);
+		}, count->lifetime());
+	}
+}
+
+void BuildSystemIntegrationAndAdvancedSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+
+	auto nativeText = [&]() -> rpl::producer<QString> {
+		if (!Platform::Notifications::Supported()
+			|| Core::App().notifications().nativeEnforced()) {
+			return rpl::producer<QString>();
+		} else if (Platform::IsWindows()) {
+			return tr::lng_settings_use_windows();
 		}
-	}, desktop->lifetime());
+		return tr::lng_settings_use_native_notifications();
+	}();
 
-	if (native) {
-		native->toggledChanges(
-		) | rpl::filter([](bool checked) {
-			return (checked != Core::App().settings().nativeNotifications());
-		}) | rpl::start_with_next([=](bool checked) {
-			Core::App().settings().setNativeNotifications(checked);
-			Core::App().saveSettingsDelayed();
-			Core::App().notifications().createManager();
+	if (nativeText) {
+		builder.addSkip(st::settingsCheckboxesSkip);
+		builder.addDivider();
+		builder.addSkip(st::settingsCheckboxesSkip);
+		builder.addSubsectionTitle({
+			.id = u"notifications/native"_q,
+			.title = tr::lng_settings_native_title(),
+			.keywords = { u"native"_q, u"system"_q, u"windows"_q },
+		});
+	}
 
-			if (advancedSlide) {
-				advancedSlide->toggle(
-					!Core::App().settings().nativeNotifications(),
-					anim::type::normal);
-			}
-		}, native->lifetime());
+	const auto &settings = Core::App().settings();
+	const auto native = nativeText ? builder.addButton({
+		.id = u"notifications/use-native"_q,
+		.title = std::move(nativeText),
+		.st = &st::settingsButtonNoIcon,
+		.toggled = rpl::single(settings.nativeNotifications()),
+		.keywords = { u"native"_q, u"system"_q, u"windows"_q },
+	}) : nullptr;
+
+	if (Core::App().notifications().nativeEnforced()) {
+		return;
 	}
+	if (!controller) {
+		return;
+	}
+
+	builder.add([native, controller](const WidgetContext &ctx) {
+		const auto container = ctx.container.get();
+		const auto advancedSlide = container->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				container,
+				object_ptr<Ui::VerticalLayout>(container)));
+		const auto advancedWrap = advancedSlide->entity();
+
+		if (native) {
+			native->toggledChanges(
+			) | rpl::filter([](bool checked) {
+				return (checked != Core::App().settings().nativeNotifications());
+			}) | rpl::on_next([=](bool checked) {
+				Core::App().settings().setNativeNotifications(checked);
+				Core::App().saveSettingsDelayed();
+				Core::App().notifications().createManager();
+				advancedSlide->toggle(!checked, anim::type::normal);
+			}, native->lifetime());
+		}
+
+		if (Platform::IsWindows()) {
+			const auto skipInFocus = advancedWrap->add(object_ptr<Ui::SettingsButton>(
+				advancedWrap,
+				tr::lng_settings_skip_in_focus(),
+				st::settingsButtonNoIcon
+			))->toggleOn(rpl::single(Core::App().settings().skipToastsInFocus()));
+
+			skipInFocus->toggledChanges(
+			) | rpl::filter([](bool checked) {
+				return (checked != Core::App().settings().skipToastsInFocus());
+			}) | rpl::on_next([=](bool checked) {
+				Core::App().settings().setSkipToastsInFocus(checked);
+				Core::App().saveSettingsDelayed();
+				if (checked && Platform::Notifications::SkipToastForCustom()) {
+					Core::App().notifications().notifySettingsChanged(
+						ChangeType::DesktopEnabled);
+				}
+			}, skipInFocus->lifetime());
+		}
+
+		const auto screens = QGuiApplication::screens();
+		if (screens.size() > 1) {
+			Ui::AddSkip(advancedWrap, st::settingsCheckboxesSkip);
+			Ui::AddDivider(advancedWrap);
+			Ui::AddSkip(advancedWrap, st::settingsCheckboxesSkip);
+			Ui::AddSubsectionTitle(
+				advancedWrap,
+				tr::lng_settings_notifications_display());
+
+			const auto currentChecksum
+				= Core::App().settings().notificationsDisplayChecksum();
+			auto currentIndex = (currentChecksum == 0)
+				? kDefaultDisplayIndex
+				: 0;
+			for (auto i = 0; i < screens.size(); ++i) {
+				if (Platform::ScreenNameChecksum(screens[i]) == currentChecksum) {
+					currentIndex = i;
+					break;
+				}
+			}
+
+			const auto group = std::make_shared<Ui::RadiobuttonGroup>(
+				currentIndex);
+
+			advancedWrap->add(
+				object_ptr<Ui::Radiobutton>(
+					advancedWrap,
+					group,
+					kDefaultDisplayIndex,
+					tr::lng_settings_notifications_display_default(tr::now),
+					st::settingsSendType),
+				st::settingsSendTypePadding);
+
+			for (auto i = 0; i < screens.size(); ++i) {
+				const auto &screen = screens[i];
+				const auto name = Platform::ScreenDisplayLabel(screen);
+				const auto geometry = screen->geometry();
+				const auto resolution = QString::number(geometry.width())
+					+ QChar(0x00D7)
+					+ QString::number(geometry.height());
+				const auto label = name.isEmpty()
+					? QString("Display (%1)").arg(resolution)
+					: QString("%1 (%2)").arg(name).arg(resolution);
+				advancedWrap->add(
+					object_ptr<Ui::Radiobutton>(
+						advancedWrap,
+						group,
+						i,
+						label,
+						st::settingsSendType),
+					st::settingsSendTypePadding);
+			}
+			group->setChangedCallback([=](int selectedIndex) {
+				if (selectedIndex == kDefaultDisplayIndex) {
+					Core::App().settings().setNotificationsDisplayChecksum(0);
+					Core::App().saveSettings();
+					Core::App().notifications().notifySettingsChanged(
+						ChangeType::Corner);
+				} else {
+					const auto screens = QGuiApplication::screens();
+					if (selectedIndex >= 0 && selectedIndex < screens.size()) {
+						const auto checksum = Platform::ScreenNameChecksum(
+							screens[selectedIndex]);
+						Core::App().settings().setNotificationsDisplayChecksum(
+							checksum);
+						Core::App().saveSettings();
+						Core::App().notifications().notifySettingsChanged(
+							ChangeType::Corner);
+					}
+				}
+			});
+		}
+
+		Ui::AddSkip(advancedWrap, st::settingsCheckboxesSkip);
+		Ui::AddDivider(advancedWrap);
+		Ui::AddSkip(advancedWrap, st::settingsCheckboxesSkip);
+		Ui::AddSubsectionTitle(
+			advancedWrap,
+			tr::lng_settings_notifications_position());
+		Ui::AddSkip(advancedWrap, st::settingsCheckboxesSkip);
+
+		const auto position = advancedWrap->add(
+			object_ptr<NotificationsCount>(advancedWrap, controller));
+
+		Ui::AddSkip(advancedWrap, st::settingsCheckboxesSkip);
+		Ui::AddSubsectionTitle(advancedWrap, tr::lng_settings_notifications_count());
+
+		const auto countSlider = advancedWrap->add(
+			object_ptr<Ui::SettingsSlider>(advancedWrap, st::settingsSlider),
+			st::settingsBigScalePadding);
+		for (int i = 0; i != kMaxNotificationsCount; ++i) {
+			countSlider->addSection(QString::number(i + 1));
+		}
+		countSlider->setActiveSectionFast(CurrentNotificationsCount() - 1);
+		countSlider->sectionActivated(
+		) | rpl::on_next([=](int section) {
+			position->setCount(section + 1);
+		}, countSlider->lifetime());
+		Ui::AddSkip(advancedWrap, st::settingsCheckboxesSkip);
+
+		if (Core::App().settings().nativeNotifications()) {
+			advancedSlide->hide(anim::type::instant);
+		}
+
+		Core::App().notifications().settingsChanged(
+		) | rpl::on_next([=](ChangeType change) {
+			if (change == ChangeType::DesktopEnabled) {
+				const auto native = Core::App().settings().nativeNotifications();
+				advancedSlide->toggle(!native, anim::type::normal);
+			}
+		}, advancedSlide->lifetime());
+
+		return SectionBuilder::WidgetToAdd{};
+	});
 }
 
-void SetupNotifications(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		Fn<void(Type)> showOther) {
-	SetupNotificationsContent(controller, container, std::move(showOther));
+void BuildNotificationsSectionContent(SectionBuilder &builder) {
+	builder.addSkip(st::settingsPrivacySkip);
+
+	BuildMultiAccountSection(builder);
+	BuildGlobalNotificationsSection(builder);
+	BuildNotifyViewSection(builder);
+	BuildNotifyTypeSection(builder);
+	BuildEventNotificationsSection(builder);
+	BuildCallNotificationsSection(builder);
+	BuildBadgeCounterSection(builder);
+	BuildSystemIntegrationAndAdvancedSection(builder);
 }
 
-} // namespace
+class Notifications : public Section<Notifications> {
+public:
+	Notifications(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+private:
+	void setupContent();
+
+};
+
+const auto kMeta = BuildHelper({
+	.id = Notifications::Id(),
+	.parentId = MainId(),
+	.title = &tr::lng_settings_section_notify,
+	.icon = &st::menuIconNotifications,
+}, [](SectionBuilder &builder) {
+	BuildNotificationsSectionContent(builder);
+});
+
+const SectionBuildMethod kNotificationsSection = kMeta.build;
 
 Notifications::Notifications(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: Section(parent) {
-	setupContent(controller);
+: Section(parent, controller) {
+	setupContent();
 }
 
 rpl::producer<QString> Notifications::title() {
 	return tr::lng_settings_section_notify();
 }
 
-void Notifications::setupContent(
-		not_null<Window::SessionController*> controller) {
+void Notifications::setupContent() {
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+	build(content, kNotificationsSection);
+	Ui::ResizeFitChild(this, content);
+}
 
-	SetupNotifications(controller, content, showOtherMethod());
+} // namespace
 
-	Ui::ResizeFitChild(this, content);
+Type NotificationsId() {
+	return Notifications::Id();
 }
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_notifications.h b/Telegram/SourceFiles/settings/sections/settings_notifications.h
new file mode 100644
index 00000000000000..b55fabd4d8ba98
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_notifications.h
@@ -0,0 +1,16 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "settings/settings_type.h"
+
+namespace Settings {
+
+[[nodiscard]] Type NotificationsId();
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_notifications_reactions.cpp b/Telegram/SourceFiles/settings/sections/settings_notifications_reactions.cpp
new file mode 100644
index 00000000000000..535cc4bbe24cb7
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_notifications_reactions.cpp
@@ -0,0 +1,292 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/sections/settings_notifications_reactions.h"
+
+#include "api/api_reactions_notify_settings.h"
+#include "apiwrap.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/sections/settings_notifications.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common.h"
+#include "settings/settings_notifications_common.h"
+#include "ui/layers/generic_box.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+
+namespace Settings {
+namespace {
+
+using NotifyFrom = Api::ReactionsNotifyFrom;
+using namespace Builder;
+
+[[nodiscard]] rpl::producer<QString> FromLabel(NotifyFrom from) {
+	switch (from) {
+	case NotifyFrom::None:
+		return tr::lng_notification_reactions_from_nobody();
+	case NotifyFrom::Contacts:
+		return tr::lng_notification_reactions_from_contacts();
+	case NotifyFrom::All:
+		return tr::lng_notification_reactions_from_all();
+	}
+	Unexpected("Value in FromLabel.");
+}
+
+void ShowFromBox(
+		not_null<Window::SessionController*> controller,
+		NotifyFrom current,
+		Fn<void(NotifyFrom)> done) {
+	controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(tr::lng_notification_reactions_from());
+
+		const auto initial = (current == NotifyFrom::None)
+			? int(NotifyFrom::All)
+			: int(current);
+		const auto group = std::make_shared<Ui::RadiobuttonGroup>(initial);
+
+		const auto addOption = [&](NotifyFrom value, const QString &label) {
+			box->addRow(
+				object_ptr<Ui::Radiobutton>(
+					box,
+					group,
+					int(value),
+					label,
+					st::defaultBoxCheckbox),
+				st::boxOptionListPadding
+					+ QMargins(
+						st::boxPadding.left(),
+						0,
+						st::boxPadding.right(),
+						st::boxOptionListSkip));
+		};
+		addOption(
+			NotifyFrom::All,
+			tr::lng_notification_reactions_from_all(tr::now));
+		addOption(
+			NotifyFrom::Contacts,
+			tr::lng_notification_reactions_from_contacts(tr::now));
+		box->addButton(tr::lng_box_ok(), [=] {
+			done(NotifyFrom(group->current()));
+			box->closeBox();
+		});
+		box->addButton(tr::lng_cancel(), [=] {
+			box->closeBox();
+		});
+	}));
+}
+
+void AddToggleRow(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Window::SessionController*> controller,
+		rpl::producer<QString> title,
+		const style::icon *icon,
+		rpl::producer<NotifyFrom> fromValue,
+		Fn<NotifyFrom()> fromCurrent,
+		Fn<void(NotifyFrom)> updateFrom) {
+	auto forToggle = rpl::duplicate(fromValue);
+	auto status = std::move(
+		fromValue
+	) | rpl::map([](NotifyFrom from) {
+		return FromLabel(from);
+	}) | rpl::flatten_latest();
+
+	const auto [button, toggleButton, checkView] = SetupSplitToggle(
+		container,
+		std::move(title),
+		icon,
+		fromCurrent() != NotifyFrom::None,
+		std::move(status));
+
+	std::move(
+		forToggle
+	) | rpl::on_next([=](NotifyFrom from) {
+		checkView->setChecked(
+			from != NotifyFrom::None,
+			anim::type::normal);
+	}, button->lifetime());
+
+	toggleButton->clicks(
+	) | rpl::on_next([=] {
+		const auto enabled = !checkView->checked();
+		updateFrom(enabled ? NotifyFrom::All : NotifyFrom::None);
+	}, toggleButton->lifetime());
+
+	button->setClickedCallback([=] {
+		if (fromCurrent() == NotifyFrom::None) {
+			updateFrom(NotifyFrom::All);
+			return;
+		}
+		ShowFromBox(controller, fromCurrent(), [=](NotifyFrom from) {
+			updateFrom(from);
+		});
+	});
+}
+
+void BuildNotificationsReactionsContent(SectionBuilder &builder) {
+	builder.addSkip(st::settingsCheckboxesSkip);
+	builder.addSubsectionTitle({
+		.id = u"notifications/reactions/about"_q,
+		.title = tr::lng_notification_reactions_notify_about(),
+	});
+
+	builder.add([](const WidgetContext &ctx) {
+		const auto session = &ctx.controller->session();
+		auto &rs = session->api().reactionsNotifySettings();
+
+		AddToggleRow(
+			ctx.container,
+			ctx.controller,
+			tr::lng_notification_reactions_messages_full(),
+			&st::menuIconMarkUnread,
+			rs.messagesFrom(),
+			[session] {
+				return session->api().reactionsNotifySettings()
+					.messagesFromCurrent();
+			},
+			[session](NotifyFrom from) {
+				session->api().reactionsNotifySettings()
+					.updateMessagesFrom(from);
+			});
+
+		AddToggleRow(
+			ctx.container,
+			ctx.controller,
+			tr::lng_notification_reactions_poll_votes_full(),
+			&st::menuIconCreatePoll,
+			rs.pollVotesFrom(),
+			[session] {
+				return session->api().reactionsNotifySettings()
+					.pollVotesFromCurrent();
+			},
+			[session](NotifyFrom from) {
+				session->api().reactionsNotifySettings()
+					.updatePollVotesFrom(from);
+			});
+
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"notifications/reactions/messages"_q,
+			.title = tr::lng_notification_reactions_messages_full(tr::now),
+			.keywords = { u"reactions"_q, u"messages"_q },
+		};
+	});
+
+	builder.addSkip(st::settingsCheckboxesSkip);
+	builder.addDivider();
+	builder.addSkip(st::settingsCheckboxesSkip);
+	builder.addSubsectionTitle({
+		.id = u"notifications/reactions/settings"_q,
+		.title = tr::lng_notification_reactions_settings(),
+	});
+
+	builder.add([](const WidgetContext &ctx) {
+		const auto session = &ctx.controller->session();
+		auto &rs = session->api().reactionsNotifySettings();
+
+		const auto showSender = AddButtonWithIcon(
+			ctx.container,
+			tr::lng_notification_reactions_show_sender(),
+			st::settingsButtonNoIcon
+		)->toggleOn(rs.showPreviews());
+
+		showSender->toggledChanges(
+		) | rpl::filter([session](bool checked) {
+			return (checked
+				!= session->api().reactionsNotifySettings()
+					.showPreviewsCurrent());
+		}) | rpl::on_next([session](bool checked) {
+			session->api().reactionsNotifySettings()
+				.updateShowPreviews(checked);
+		}, showSender->lifetime());
+
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"notifications/reactions/preview"_q,
+			.title = tr::lng_notification_reactions_show_sender(tr::now),
+			.keywords = { u"sender"_q, u"preview"_q },
+		};
+	});
+}
+
+const auto kMeta = BuildHelper({
+	.id = NotificationsReactions::Id(),
+	.parentId = NotificationsId(),
+	.title = &tr::lng_notification_reactions,
+	.icon = &st::menuIconGroupReactions,
+}, [](SectionBuilder &builder) {
+	BuildNotificationsReactionsContent(builder);
+});
+
+} // namespace
+
+NotificationsReactions::NotificationsReactions(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: Section(parent, controller) {
+	setupContent(controller);
+}
+
+rpl::producer<QString> NotificationsReactions::title() {
+	return tr::lng_notification_reactions_title();
+}
+
+void NotificationsReactions::setupContent(
+		not_null<Window::SessionController*> controller) {
+	const auto container = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	const SectionBuildMethod buildMethod = [](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		auto &lifetime = container->lifetime();
+		const auto highlights
+			= lifetime.make_state<HighlightRegistry>();
+
+		const auto session = &controller->session();
+		auto &rs = session->api().reactionsNotifySettings();
+		rs.reload();
+
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = Window::PausedIn(
+				controller,
+				Window::GifPauseReason::Layer),
+			.highlights = highlights,
+		});
+		BuildNotificationsReactionsContent(builder);
+
+		std::move(showFinished) | rpl::on_next([=] {
+			for (const auto &[id, entry] : *highlights) {
+				if (entry.widget) {
+					controller->checkHighlightControl(
+						id,
+						entry.widget,
+						base::duplicate(entry.args));
+				}
+			}
+		}, lifetime);
+	};
+
+	build(container, buildMethod);
+
+	Ui::ResizeFitChild(this, container);
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_notifications.h b/Telegram/SourceFiles/settings/sections/settings_notifications_reactions.h
similarity index 85%
rename from Telegram/SourceFiles/settings/settings_notifications.h
rename to Telegram/SourceFiles/settings/sections/settings_notifications_reactions.h
index f6df4d2e57574a..21a661dce7c379 100644
--- a/Telegram/SourceFiles/settings/settings_notifications.h
+++ b/Telegram/SourceFiles/settings/sections/settings_notifications_reactions.h
@@ -11,9 +11,9 @@ For license and copyright information please follow this link:
 
 namespace Settings {
 
-class Notifications : public Section<Notifications> {
+class NotificationsReactions : public Section<NotificationsReactions> {
 public:
-	Notifications(
+	NotificationsReactions(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller);
 
diff --git a/Telegram/SourceFiles/settings/settings_notifications_type.cpp b/Telegram/SourceFiles/settings/sections/settings_notifications_type.cpp
similarity index 72%
rename from Telegram/SourceFiles/settings/settings_notifications_type.cpp
rename to Telegram/SourceFiles/settings/sections/settings_notifications_type.cpp
index df18b65ee19556..91c391eec2491f 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_type.cpp
+++ b/Telegram/SourceFiles/settings/sections/settings_notifications_type.cpp
@@ -5,13 +5,15 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_notifications_type.h"
+#include "settings/sections/settings_notifications_type.h"
 
 #include "api/api_ringtones.h"
 #include "apiwrap.h"
 #include "base/unixtime.h"
 #include "boxes/ringtones_box.h"
 #include "boxes/peer_list_box.h"
+#include "core/application.h"
+#include "data/notify/data_peer_notify_volume.h"
 #include "boxes/peer_list_controllers.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_changes.h"
@@ -21,6 +23,10 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "menu/menu_mute.h"
+#include "platform/platform_notifications_manager.h"
+#include "settings/sections/settings_notifications.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
@@ -36,6 +42,7 @@ namespace Settings {
 namespace {
 
 using Notify = Data::DefaultNotify;
+using namespace Builder;
 
 struct Factory : AbstractSectionFactory {
 	explicit Factory(Notify type) : type(type) {
@@ -58,11 +65,11 @@ class AddExceptionBoxController final
 	, public base::has_weak_ptr {
 public:
 	AddExceptionBoxController(
-		not_null<Main::Session*> session,
+		not_null<::Main::Session*> session,
 		Notify type,
 		Fn<void(not_null<PeerData*>)> done);
 
-	Main::Session &session() const override;
+	::Main::Session &session() const override;
 	void rowClicked(not_null<PeerListRow*> row) override;
 	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
 		QWidget *parent,
@@ -72,7 +79,7 @@ class AddExceptionBoxController final
 	void prepareViewHook() override;
 	std::unique_ptr<Row> createRow(not_null<History*> history) override;
 
-	const not_null<Main::Session*> _session;
+	const not_null<::Main::Session*> _session;
 	const Notify _type;
 	const Fn<void(not_null<PeerData*>)> _done;
 
@@ -89,7 +96,7 @@ class ExceptionsController final : public PeerListController {
 		not_null<Window::SessionController*> window,
 		Notify type);
 
-	Main::Session &session() const override;
+	::Main::Session &session() const override;
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
 	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
@@ -125,7 +132,7 @@ class ExceptionsController final : public PeerListController {
 };
 
 AddExceptionBoxController::AddExceptionBoxController(
-	not_null<Main::Session*> session,
+	not_null<::Main::Session*> session,
 	Notify type,
 	Fn<void(not_null<PeerData*>)> done)
 : ChatsListBoxController(session)
@@ -134,7 +141,7 @@ AddExceptionBoxController::AddExceptionBoxController(
 , _done(std::move(done)) {
 }
 
-Main::Session &AddExceptionBoxController::session() const {
+::Main::Session &AddExceptionBoxController::session() const {
 	return *_session;
 }
 
@@ -145,7 +152,7 @@ void AddExceptionBoxController::prepareViewHook() {
 		Data::PeerUpdate::Flag::Notifications
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return update.peer == _lastClickedPeer;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (const auto onstack = _done) {
 			onstack(_lastClickedPeer);
 		}
@@ -169,11 +176,8 @@ base::unique_qptr<Ui::PopupMenu> AddExceptionBoxController::rowContextMenu(
 		peer->owner().history(peer),
 		delegate()->peerListUiShow());
 
-	// First clear _menu value, so that we don't check row positions yet.
 	base::take(_menu);
 
-	// Here unique_qptr is used like a shared pointer, where
-	// not the last destroyed pointer destroys the object, but the first.
 	_menu = base::unique_qptr<Ui::PopupMenu>(result.get());
 	_menu->setDestroyedCallback(crl::guard(this, [=] {
 		_lastClickedPeer = nullptr;
@@ -202,7 +206,7 @@ ExceptionsController::ExceptionsController(
 , _type(type) {
 }
 
-Main::Session &ExceptionsController::session() const {
+::Main::Session &ExceptionsController::session() const {
 	return _window->session();
 }
 
@@ -210,13 +214,13 @@ void ExceptionsController::prepare() {
 	refreshRows();
 
 	session().data().notifySettings().exceptionsUpdates(
-	) | rpl::filter(rpl::mappers::_1 == _type) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1 == _type) | rpl::on_next([=] {
 		refreshRows();
 	}, lifetime());
 
 	session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::Notifications
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto peer = update.peer;
 		if (const auto row = delegate()->peerListFindRow(peer->id.value)) {
 			if (peer->notify().muteUntil().has_value()) {
@@ -310,11 +314,8 @@ base::unique_qptr<Ui::PopupMenu> ExceptionsController::rowContextMenu(
 		peer->owner().history(peer),
 		_window->uiShow());
 
-	// First clear _menu value, so that we don't check row positions yet.
 	base::take(_menu);
 
-	// Here unique_qptr is used like a shared pointer, where
-	// not the last destroyed pointer destroys the object, but the first.
 	_menu = base::unique_qptr<Ui::PopupMenu>(result.get());
 
 	return result;
@@ -379,10 +380,31 @@ void ExceptionsController::sort() {
 	Unexpected("Type in Title.");
 }
 
+[[nodiscard]] rpl::producer<QString> VolumeSubtitle(Notify type) {
+	switch (type) {
+	case Notify::User: return tr::lng_notification_volume_private_chats();
+	case Notify::Group: return tr::lng_notification_volume_groups();
+	case Notify::Broadcast: return tr::lng_notification_volume_channel();
+	}
+	Unexpected("Type in VolumeSubtitle.");
+}
+
+struct ChecksWidgets {
+	Ui::SettingsButton *enabled = nullptr;
+	Ui::SettingsButton *sound = nullptr;
+	Ui::SettingsButton *tone = nullptr;
+};
+
+struct ExceptionsWidgets {
+	Ui::SettingsButton *add = nullptr;
+	Ui::SettingsButton *deleteAll = nullptr;
+};
+
 void SetupChecks(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller,
-		Notify type) {
+		Notify type,
+		ChecksWidgets *widgets) {
 	Ui::AddSubsectionTitle(container, Title(type));
 
 	const auto session = &controller->session();
@@ -398,6 +420,10 @@ void SetupChecks(
 		NotificationsEnabledForTypeValue(session, type),
 		true);
 
+	if (widgets) {
+		widgets->enabled = enabled;
+	}
+
 	enabled->setAcceptBoth();
 	MuteMenu::SetupMuteMenu(
 		enabled,
@@ -439,6 +465,10 @@ void SetupChecks(
 		type
 	) | rpl::map([=] { return soundValue(); })));
 
+	if (widgets) {
+		widgets->sound = sound;
+	}
+
 	const auto toneWrap = soundInner->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			container,
@@ -461,11 +491,11 @@ void SetupChecks(
 	};
 	settings->defaultUpdates(
 		Notify::User
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		toneLabel->fire(label());
 	}, toneInner->lifetime());
 	session->api().ringtones().listUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		toneLabel->fire(label());
 	}, toneInner->lifetime());
 
@@ -476,10 +506,32 @@ void SetupChecks(
 		st::settingsButton,
 		{ &st::menuIconSoundOn });
 
+	if (widgets) {
+		widgets->tone = tone;
+	}
+
+	{
+		auto controller = DefaultRingtonesVolumeController(session, type);
+		Ui::AddRingtonesVolumeSlider(
+			toneInner,
+			rpl::single(true),
+			VolumeSubtitle(type),
+			Data::VolumeController{
+				.volume = base::take(controller.volume),
+				.saveVolume = [=](ushort volume) {
+					Core::App().notifications().playSound(
+						session,
+						toneValue().id,
+						0.01 * volume);
+					controller.saveVolume(volume);
+				},
+			});
+	}
+
 	enabled->toggledValue(
 	) | rpl::filter([=](bool value) {
 		return (value != NotificationsEnabledForType(session, type));
-	}) | rpl::start_with_next([=](bool value) {
+	}) | rpl::on_next([=](bool value) {
 		settings->defaultUpdate(type, Data::MuteValue{
 			.unmute = value,
 			.forever = !value,
@@ -490,7 +542,7 @@ void SetupChecks(
 	) | rpl::filter([=](bool enabled) {
 		const auto sound = settings->defaultSettings(type).sound();
 		return (!sound || !sound->none) != enabled;
-	}) | rpl::start_with_next([=](bool enabled) {
+	}) | rpl::on_next([=](bool enabled) {
 		const auto value = Data::NotifySound{ .none = !enabled };
 		settings->defaultUpdate(type, {}, {}, value);
 	}, sound->lifetime());
@@ -499,6 +551,8 @@ void SetupChecks(
 		controller->show(Box(RingtonesBox, session, toneValue(), [=](
 				Data::NotifySound sound) {
 			settings->defaultUpdate(type, {}, {}, sound);
+		}, Data::VolumeController{
+			DefaultRingtonesVolumeController(session, type).volume,
 		}));
 	});
 }
@@ -506,12 +560,16 @@ void SetupChecks(
 void SetupExceptions(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> window,
-		Notify type) {
+		Notify type,
+		ExceptionsWidgets *widgets) {
 	const auto add = AddButtonWithIcon(
 		container,
 		tr::lng_notification_exceptions_add(),
 		st::settingsButtonActive,
 		{ &st::menuIconInviteSettings });
+	if (widgets) {
+		widgets->add = add;
+	}
 
 	auto controller = std::make_unique<ExceptionsController>(window, type);
 	controller->setStyleOverrides(&st::settingsBlockedList);
@@ -530,7 +588,7 @@ void SetupExceptions(
 	state->controller->setDelegate(state->delegate.get());
 
 	add->setClickedCallback([=] {
-		const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
+		const auto box = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 		const auto done = [=](not_null<PeerData*> peer) {
 			state->controller->bringToTop(peer);
 			if (*box) {
@@ -556,6 +614,9 @@ void SetupExceptions(
 				tr::lng_notification_exceptions_clear(),
 				st::settingsAttentionButtonWithIcon,
 				{ &st::menuIconDeleteAttention })));
+	if (widgets) {
+		widgets->deleteAll = wrap->entity();
+	}
 	wrap->entity()->setClickedCallback([=] {
 		const auto clear = [=](Fn<void()> close) {
 			window->session().data().notifySettings().clearExceptions(type);
@@ -574,13 +635,112 @@ void SetupExceptions(
 		anim::type::instant);
 }
 
+void BuildNotificationsTypeContent(SectionBuilder &builder, Notify type) {
+	builder.addSkip(st::settingsPrivacySkip);
+
+	builder.add([=](const WidgetContext &ctx) {
+		ChecksWidgets widgets;
+		SetupChecks(ctx.container, ctx.controller, type, &widgets);
+		if (ctx.highlights) {
+			if (widgets.enabled) {
+				ctx.highlights->push_back({
+					u"notifications/type/show"_q,
+					{ widgets.enabled, { .rippleShape = true } },
+				});
+			}
+			if (widgets.sound) {
+				ctx.highlights->push_back({
+					u"notifications/type/sound"_q,
+					{ widgets.sound, { .rippleShape = true } },
+				});
+			}
+			if (widgets.tone) {
+				ctx.highlights->push_back({
+					u"notifications/type/tone"_q,
+					{ widgets.tone, { .rippleShape = true } },
+				});
+			}
+		}
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"notifications/type/show"_q,
+			.title = tr::lng_notification_enable(tr::now),
+			.keywords = { u"enable"_q, u"notifications"_q, u"mute"_q },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"notifications/type/sound"_q,
+			.title = tr::lng_notification_sound(tr::now),
+			.keywords = { u"sound"_q, u"audio"_q, u"tone"_q },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"notifications/type/tone"_q,
+			.title = tr::lng_notification_tone(tr::now),
+			.keywords = { u"tone"_q, u"ringtone"_q, u"notification"_q },
+		};
+	});
+
+	builder.addSkip();
+	builder.addDivider();
+	builder.addSkip();
+
+	builder.add([=](const WidgetContext &ctx) {
+		ExceptionsWidgets widgets;
+		SetupExceptions(ctx.container, ctx.controller, type, &widgets);
+		if (ctx.highlights) {
+			if (widgets.add) {
+				ctx.highlights->push_back({
+					u"notifications/type/add-exception"_q,
+					{ widgets.add, { .rippleShape = true } },
+				});
+			}
+			if (widgets.deleteAll) {
+				ctx.highlights->push_back({
+					u"notifications/type/delete-exceptions"_q,
+					{ widgets.deleteAll, { .rippleShape = true } },
+				});
+			}
+		}
+		return SectionBuilder::WidgetToAdd{};
+	}, [] {
+		return SearchEntry{
+			.id = u"notifications/type/add-exception"_q,
+			.title = tr::lng_notification_exceptions_add(tr::now),
+			.keywords = { u"exception"_q, u"add"_q, u"exclude"_q },
+		};
+	});
+
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"notifications/type/delete-exceptions"_q,
+			.title = tr::lng_notification_exceptions_clear(tr::now),
+			.keywords = { u"clear"_q, u"delete"_q, u"exceptions"_q },
+		};
+	});
+}
+
+const auto kMeta = BuildHelper({
+	.id = NotificationsType::Id(Notify::User),
+	.parentId = NotificationsId(),
+	.title = &tr::lng_notification_private_chats,
+	.icon = &st::menuIconProfile,
+}, [](SectionBuilder &builder) {
+	BuildNotificationsTypeContent(builder, Notify::User);
+});
+
 } // namespace
 
 NotificationsType::NotificationsType(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
 	Notify type)
-: AbstractSection(parent)
+: AbstractSection(parent, controller)
 , _type(type) {
 	setupContent(controller);
 }
@@ -594,6 +754,10 @@ rpl::producer<QString> NotificationsType::title() {
 	Unexpected("Type in NotificationsType.");
 }
 
+void NotificationsType::showFinished() {
+	AbstractSection::showFinished();
+}
+
 Type NotificationsType::Id(Notify type) {
 	return std::make_shared<Factory>(type);
 }
@@ -602,20 +766,45 @@ void NotificationsType::setupContent(
 		not_null<Window::SessionController*> controller) {
 	const auto container = Ui::CreateChild<Ui::VerticalLayout>(this);
 
-	Ui::AddSkip(container, st::settingsPrivacySkip);
-	SetupChecks(container, controller, _type);
-
-	Ui::AddSkip(container);
-	Ui::AddDivider(container);
-	Ui::AddSkip(container);
+	const auto type = _type;
+	const SectionBuildMethod buildMethod = [type](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		auto &lifetime = container->lifetime();
+		const auto highlights = lifetime.make_state<HighlightRegistry>();
+
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = Window::PausedIn(
+				controller,
+				Window::GifPauseReason::Layer),
+			.highlights = highlights,
+		});
+		BuildNotificationsTypeContent(builder, type);
+
+		std::move(showFinished) | rpl::on_next([=] {
+			for (const auto &[id, entry] : *highlights) {
+				if (entry.widget) {
+					controller->checkHighlightControl(
+						id,
+						entry.widget,
+						base::duplicate(entry.args));
+				}
+			}
+		}, lifetime);
+	};
 
-	SetupExceptions(container, controller, _type);
+	build(container, buildMethod);
 
 	Ui::ResizeFitChild(this, container);
 }
 
 bool NotificationsEnabledForType(
-		not_null<Main::Session*> session,
+		not_null<::Main::Session*> session,
 		Notify type) {
 	const auto settings = &session->data().notifySettings();
 	const auto until = settings->defaultSettings(type).muteUntil();
@@ -623,7 +812,7 @@ bool NotificationsEnabledForType(
 }
 
 rpl::producer<bool> NotificationsEnabledForTypeValue(
-		not_null<Main::Session*> session,
+		not_null<::Main::Session*> session,
 		Notify type) {
 	const auto settings = &session->data().notifySettings();
 	return rpl::single(
diff --git a/Telegram/SourceFiles/settings/settings_notifications_type.h b/Telegram/SourceFiles/settings/sections/settings_notifications_type.h
similarity index 88%
rename from Telegram/SourceFiles/settings/settings_notifications_type.h
rename to Telegram/SourceFiles/settings/sections/settings_notifications_type.h
index bf4af8222c836b..5c0c3632b7366e 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_type.h
+++ b/Telegram/SourceFiles/settings/sections/settings_notifications_type.h
@@ -10,10 +10,6 @@ For license and copyright information please follow this link:
 #include "settings/settings_common_session.h"
 #include "data/notify/data_notify_settings.h"
 
-namespace Data {
-enum class DefaultNotify;
-} // namespace Data
-
 namespace Settings {
 
 class NotificationsType : public AbstractSection {
@@ -31,6 +27,8 @@ class NotificationsType : public AbstractSection {
 		return Id(_type);
 	}
 
+	void showFinished() override;
+
 private:
 	void setupContent(not_null<Window::SessionController*> controller);
 
@@ -39,11 +37,11 @@ class NotificationsType : public AbstractSection {
 };
 
 [[nodiscard]] bool NotificationsEnabledForType(
-	not_null<Main::Session*> session,
+	not_null<::Main::Session*> session,
 	Data::DefaultNotify type);
 
 [[nodiscard]] rpl::producer<bool> NotificationsEnabledForTypeValue(
-	not_null<Main::Session*> session,
+	not_null<::Main::Session*> session,
 	Data::DefaultNotify type);
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_passkeys.cpp b/Telegram/SourceFiles/settings/sections/settings_passkeys.cpp
new file mode 100644
index 00000000000000..9d0f52dd8acfd5
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_passkeys.cpp
@@ -0,0 +1,514 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/sections/settings_passkeys.h"
+
+#include "base/unixtime.h"
+#include "core/application.h"
+#include "data/components/passkeys.h"
+#include "data/data_session.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_session.h"
+#include "platform/platform_webauthn.h"
+#include "settings/cloud_password/settings_cloud_password_common.h"
+#include "settings/sections/settings_privacy_security.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common.h"
+#include "settings/settings_common_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/text/custom_emoji_instance.h"
+#include "ui/text/text_utilities.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_channel_earn.h"
+#include "styles/style_chat.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
+
+namespace Settings {
+namespace {
+
+using namespace Builder;
+
+class Passkeys : public Section<Passkeys> {
+public:
+	Passkeys(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	void showFinished() override;
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+	const Ui::RoundRect *bottomSkipRounding() const override {
+		return &_bottomSkipRounding;
+	}
+
+private:
+	void setupContent();
+
+	const not_null<Ui::VerticalLayout*> _container;
+
+	QPointer<Ui::SettingsButton> _addButton;
+	Ui::RoundRect _bottomSkipRounding;
+
+	rpl::event_stream<> _showFinished;
+
+};
+
+void BuildPasskeysSection(
+		SectionBuilder &builder,
+		QPointer<Ui::SettingsButton> *addButton,
+		Fn<void(not_null<Ui::VerticalLayout*>)> setupList) {
+	const auto session = builder.session();
+	const auto controller = builder.controller();
+
+	builder.add([=](const WidgetContext &ctx) {
+		setupList(ctx.container);
+		return SectionBuilder::WidgetToAdd{};
+	});
+
+	auto buttonShown = session->passkeys().requestList(
+	) | rpl::map([session] { return session->passkeys().canRegister(); });
+
+	const auto button = builder.addButton({
+		.id = u"passkeys/create"_q,
+		.title = tr::lng_settings_passkeys_button(),
+		.st = &st::settingsButtonActive,
+		.icon = { &st::settingsIconPasskeys },
+		.onClick = [controller, session] {
+			controller->show(Box(PasskeysNoneBox, session));
+		},
+		.keywords = { u"add"_q, u"register"_q, u"create"_q },
+		.highlight = { .rippleShape = true },
+		.shown = std::move(buttonShown),
+	});
+	if (addButton) {
+		*addButton = button;
+	}
+
+	builder.addSkip();
+	builder.add([=](const WidgetContext &ctx) {
+		const auto label = Ui::AddDividerText(
+			ctx.container,
+			tr::lng_settings_passkeys_button_about(
+				lt_link,
+				tr::lng_channel_earn_about_link(
+					lt_emoji,
+					rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+					tr::rich
+				) | rpl::map([](TextWithEntities text) {
+					return tr::link(std::move(text), u"internal"_q);
+				}),
+				tr::rich
+			));
+		label->setClickHandlerFilter([controller, session](const auto &...) {
+			controller->show(Box(PasskeysNoneBox, session));
+			return false;
+		});
+		return SectionBuilder::WidgetToAdd{};
+	});
+}
+
+const auto kMeta = BuildHelper({
+	.id = Passkeys::Id(),
+	.parentId = PrivacySecurityId(),
+	.title = &tr::lng_settings_passkeys_title,
+	.icon = &st::menuIconPermissions,
+}, [](SectionBuilder &builder) {
+	BuildPasskeysSection(builder, nullptr, [](not_null<Ui::VerticalLayout*>) {});
+});
+
+Passkeys::Passkeys(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: Section(parent, controller)
+, _container(Ui::CreateChild<Ui::VerticalLayout>(this))
+, _bottomSkipRounding(st::boxRadius, st::boxDividerBg) {
+	setupContent();
+}
+
+void Passkeys::showFinished() {
+	Section::showFinished();
+	_showFinished.fire({});
+	if (_addButton) {
+		controller()->checkHighlightControl(
+			u"passkeys/create"_q,
+			_addButton,
+			{ .rippleShape = true });
+	}
+}
+
+rpl::producer<QString> Passkeys::title() {
+	return tr::lng_settings_passkeys_title();
+}
+
+void Passkeys::setupContent() {
+	const auto session = &controller()->session();
+	const auto addButton = &_addButton;
+
+	CloudPassword::SetupHeader(
+		_container,
+		u"passkeys"_q,
+		_showFinished.events(),
+		rpl::single(QString()),
+		tr::lng_settings_passkeys_about());
+
+	Ui::AddSkip(_container);
+
+	const auto setupList = [=](not_null<Ui::VerticalLayout*> container) {
+		const auto passkeysListContainer = container->add(
+			object_ptr<Ui::VerticalLayout>(container));
+
+		const auto &st = st::peerListBoxItem;
+		const auto nameStyle = &st.nameStyle;
+		const auto ctrl = controller();
+		const auto rebuild = [=] {
+			while (passkeysListContainer->count()) {
+				delete passkeysListContainer->widgetAt(0);
+			}
+			for (const auto &passkey : session->passkeys().list()) {
+				const auto button = passkeysListContainer->add(
+					object_ptr<Ui::AbstractButton>(passkeysListContainer));
+				button->resize(button->width(), st.height);
+				const auto menu = Ui::CreateChild<Ui::IconButton>(
+					button,
+					st::themesMenuToggle);
+				menu->setClickedCallback([=] {
+					const auto popup = Ui::CreateChild<Ui::PopupMenu>(
+						menu,
+						st::popupMenuWithIcons);
+					const auto handler = [=, id = passkey.id] {
+						ctrl->show(Ui::MakeConfirmBox({
+							.text = rpl::combine(
+								tr::lng_settings_passkeys_delete_sure_about(),
+								tr::lng_settings_passkeys_delete_sure_about2()
+							) | rpl::map([](QString a, QString b) {
+								return a + "\n\n" + b;
+							}),
+							.confirmed = [=](Fn<void()> close) {
+								session->passkeys().deletePasskey(
+									id,
+									close,
+									[](QString) {});
+							},
+							.confirmText = tr::lng_box_delete(),
+							.confirmStyle = &st::attentionBoxButton,
+							.title
+								= tr::lng_settings_passkeys_delete_sure_title(),
+						}));
+					};
+					Ui::Menu::CreateAddActionCallback(popup)({
+						.text = tr::lng_proxy_menu_delete(tr::now),
+						.handler = handler,
+						.icon = &st::menuIconDeleteAttention,
+						.isAttention = true,
+					});
+					popup->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
+					const auto menuGlobal = menu->mapToGlobal(
+						QPoint(menu->width(), menu->height()));
+					popup->popup(menuGlobal);
+				});
+				button->widthValue() | rpl::on_next([=](int width) {
+					menu->moveToRight(0, (st.height - menu->height()) / 2, width);
+				}, button->lifetime());
+				const auto iconSize = st::settingsIconPasskeys.width();
+				const auto emoji = iconSize;
+				const auto iconLeft = st::settingsButton.iconLeft;
+				auto emojiInstance = passkey.softwareEmojiId
+					? session->data().customEmojiManager().create(
+						passkey.softwareEmojiId,
+						[=] { button->update(); },
+						Data::CustomEmojiSizeTag::Large,
+						emoji)
+					: nullptr;
+				const auto emojiPtr = emojiInstance.get();
+				button->lifetime().add([emoji = std::move(emojiInstance)] {});
+				const auto formatDateTime = [](TimeId timestamp) {
+					const auto dt = base::unixtime::parse(timestamp);
+					return tr::lng_mediaview_date_time(
+						tr::now,
+						lt_date,
+						langDayOfMonthFull(dt.date()),
+						lt_time,
+						QLocale().toString(dt.time(), QLocale::ShortFormat));
+				};
+				const auto date = (passkey.lastUsageDate > 0)
+					? tr::lng_settings_passkeys_last_used(
+						tr::now,
+						lt_date,
+						formatDateTime(passkey.lastUsageDate))
+					: tr::lng_settings_passkeys_created(
+						tr::now,
+						lt_date,
+						formatDateTime(passkey.date));
+				const auto nameText = button->lifetime().make_state<
+					Ui::Text::String>(
+						*nameStyle,
+						passkey.name.isEmpty()
+							? tr::lng_settings_passkey_unknown(tr::now)
+							: passkey.name);
+				const auto dateText = button->lifetime().make_state<
+					Ui::Text::String>(st::defaultTextStyle, date);
+				button->paintOn([=](QPainter &p) {
+					const auto iconTop = (st.height - iconSize) / 2;
+					if (emojiPtr) {
+						emojiPtr->paint(p, {
+							.textColor = st.nameFg->c,
+							.now = crl::now(),
+							.position = QPoint(iconLeft, iconTop),
+						});
+					} else {
+						const auto w = button->width();
+						st::settingsIconPasskeys.paint(p, iconLeft, iconTop, w);
+					}
+					const auto textLeft = st::settingsButton.padding.left();
+					const auto textWidth = button->width() - textLeft
+						- st::settingsButton.padding.right();
+					p.setPen(st.nameFg);
+					nameText->draw(p, {
+						.position = { textLeft, st.namePosition.y() },
+						.outerWidth = button->width(),
+						.availableWidth = textWidth,
+						.elisionLines = 1,
+					});
+					p.setPen(st.statusFg);
+					dateText->draw(p, {
+						.position = { textLeft, st.statusPosition.y() },
+						.outerWidth = button->width(),
+						.availableWidth = textWidth,
+						.elisionLines = 1,
+					});
+				});
+				button->showChildren();
+			}
+			passkeysListContainer->showChildren();
+			passkeysListContainer->resizeToWidth(container->width());
+		};
+
+		session->passkeys().requestList(
+		) | rpl::on_next(rebuild, container->lifetime());
+		rebuild();
+	};
+
+	const SectionBuildMethod buildMethod = [=](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		const auto isPaused = Window::PausedIn(
+			controller,
+			Window::GifPauseReason::Layer);
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = isPaused,
+		});
+
+		BuildPasskeysSection(builder, addButton, setupList);
+	};
+
+	build(_container, buildMethod);
+
+	widthValue(
+	) | rpl::on_next([=](int width) {
+		_container->resizeToWidth(width);
+	}, _container->lifetime());
+
+	_container->heightValue(
+	) | rpl::on_next([=](int height) {
+		resize(width(), height);
+	}, _container->lifetime());
+}
+
+} // namespace
+
+void PasskeysNoneBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<::Main::Session*> session) {
+	box->setWidth(st::boxWideWidth);
+	box->setNoContentMargin(true);
+	box->setCloseByEscape(true);
+	box->addTopButton(st::boxTitleClose, [=] { box->closeBox(); });
+
+	const auto content = box->verticalLayout().get();
+
+	Ui::AddSkip(content);
+	{
+		const auto &size = st::settingsCloudPasswordIconSize;
+		auto icon = CreateLottieIcon(
+			content,
+			{ .name = u"passkeys"_q, .sizeOverride = { size, size } },
+			st::settingLocalPasscodeIconPadding);
+		const auto animate = std::move(icon.animate);
+		box->addRow(std::move(icon.widget), style::al_top);
+		box->showFinishes() | rpl::take(1) | rpl::on_next([=] {
+			animate(anim::repeat::once);
+		}, content->lifetime());
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_settings_passkeys_none_title(),
+			st::boxTitle),
+		style::al_top);
+	Ui::AddSkip(content);
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_settings_passkeys_none_about(),
+			st::channelEarnLearnDescription),
+		style::al_top);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto padding = QMargins(
+			st::settingsButton.padding.left(),
+			st::boxRowPadding.top(),
+			st::boxRowPadding.right(),
+			st::boxRowPadding.bottom());
+		const auto iconLeft = st::settingsButton.iconLeft;
+		const auto addEntry = [&](
+				rpl::producer<QString> title,
+				rpl::producer<QString> about,
+				const style::icon &icon) {
+			const auto top = content->add(
+				object_ptr<Ui::FlatLabel>(
+					content,
+					std::move(title),
+					st::channelEarnSemiboldLabel),
+				padding);
+			Ui::AddSkip(content, st::channelEarnHistoryThreeSkip);
+			content->add(
+				object_ptr<Ui::FlatLabel>(
+					content,
+					std::move(about),
+					st::channelEarnHistoryRecipientLabel),
+				padding);
+			const auto left = Ui::CreateChild<Ui::RpWidget>(
+				box->verticalLayout().get());
+			left->paintRequest(
+			) | rpl::on_next([=] {
+				auto p = Painter(left);
+				icon.paint(p, 0, 0, left->width());
+			}, left->lifetime());
+			left->resize(icon.size());
+			top->geometryValue(
+			) | rpl::on_next([=](const QRect &g) {
+				left->moveToLeft(
+					iconLeft,
+					g.top() + st::channelEarnHistoryThreeSkip);
+			}, left->lifetime());
+		};
+		addEntry(
+			tr::lng_settings_passkeys_none_info1_title(),
+			tr::lng_settings_passkeys_none_info1_about(),
+			st::settingsIconPasskeysAboutIcon1);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+		addEntry(
+			tr::lng_settings_passkeys_none_info2_title(),
+			tr::lng_settings_passkeys_none_info2_about(),
+			st::settingsIconPasskeysAboutIcon2);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+		addEntry(
+			tr::lng_settings_passkeys_none_info3_title(),
+			tr::lng_settings_passkeys_none_info3_about(),
+			st::settingsIconPasskeysAboutIcon3);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto &st = st::premiumPreviewDoubledLimitsBox;
+		const auto canRegister = session->passkeys().canRegister();
+		box->setStyle(st);
+		auto button = object_ptr<Ui::RoundButton>(
+			box,
+			canRegister
+				? tr::lng_settings_passkeys_none_button()
+				: tr::lng_settings_passkeys_none_button_unsupported(),
+			st::defaultActiveButton);
+		const auto createButton = button.data();
+		button->resizeToWidth(box->width()
+			- st.buttonPadding.left()
+			- st.buttonPadding.left());
+		button->setClickedCallback([=] {
+			session->passkeys().initRegistration([=](
+					const Data::Passkey::RegisterData &data) {
+				Platform::WebAuthn::RegisterKey(data, [=](
+						Platform::WebAuthn::RegisterResult result) {
+					if (!result.success) {
+						using Error = Platform::WebAuthn::Error;
+						if (result.error == Error::UnsignedBuild) {
+							box->uiShow()->showToast(
+								tr::lng_settings_passkeys_unsigned_error(
+									tr::now));
+						}
+						return;
+					}
+					session->passkeys().registerPasskey(result, [=] {
+						box->closeBox();
+					});
+				});
+			});
+		});
+		if (!canRegister) {
+			button->setAttribute(Qt::WA_TransparentForMouseEvents);
+			button->setTextFgOverride(
+				anim::with_alpha(button->st().textFg->c, 0.5));
+		}
+		box->addButton(std::move(button));
+
+		box->showFinishes(
+		) | rpl::take(1) | rpl::on_next([=] {
+			if (const auto window = Core::App().findWindow(box)) {
+				window->checkHighlightControl(
+					u"passkeys/create"_q,
+					createButton,
+					{
+						.color = &st::activeButtonFg,
+						.opacity = 0.6,
+						.rippleShape = true,
+						.scroll = false,
+					});
+			}
+		}, box->lifetime());
+	}
+}
+
+Type PasskeysId() {
+	return Passkeys::Id();
+}
+
+namespace Builder {
+
+SectionBuildMethod PasskeysSection = kMeta.build;
+
+} // namespace Builder
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_passkeys.h b/Telegram/SourceFiles/settings/sections/settings_passkeys.h
new file mode 100644
index 00000000000000..612d507ab0d070
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_passkeys.h
@@ -0,0 +1,28 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "settings/settings_type.h"
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Settings {
+
+void PasskeysNoneBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<::Main::Session*> session);
+
+Type PasskeysId();
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/sections/settings_premium.cpp
similarity index 68%
rename from Telegram/SourceFiles/settings/settings_premium.cpp
rename to Telegram/SourceFiles/settings/sections/settings_premium.cpp
index 6c239c49e27f37..6a1bd1a935d503 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/sections/settings_premium.cpp
@@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 
 #include "boxes/premium_preview_box.h"
 #include "boxes/sticker_set_box.h"
@@ -13,9 +13,10 @@ For license and copyright information please follow this link:
 #include "core/application.h"
 #include "core/click_handler_types.h"
 #include "core/local_url_handlers.h" // Core::TryConvertUrlToLocal.
-#include "core/ui_integration.h" // MarkedTextContext.
+#include "core/ui_integration.h" // TextContext.
 #include "data/data_document.h"
 #include "data/data_document_media.h"
+#include "data/data_emoji_statuses.h"
 #include "data/data_peer_values.h"
 #include "data/data_session.h"
 #include "data/stickers/data_custom_emoji.h" // SerializeCustomEmojiId.
@@ -28,6 +29,8 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
+#include "settings/sections/settings_main.h"
+#include "settings/settings_builder.h"
 #include "settings/settings_common_session.h"
 #include "ui/abstract_button.h"
 #include "ui/basic_click_handlers.h"
@@ -35,6 +38,8 @@ For license and copyright information please follow this link:
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_stars_colored.h"
 #include "ui/effects/premium_top_bar.h"
+#include "ui/controls/swipe_handler.h"
+#include "ui/controls/swipe_handler_data.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
@@ -57,38 +62,45 @@ For license and copyright information please follow this link:
 #include "apiwrap.h"
 #include "api/api_premium.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_premium.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_settings.h"
+#include "styles/style_widgets.h"
 
 namespace Settings {
 namespace {
 
+using namespace Builder;
+
 using SectionCustomTopBarData = Info::Settings::SectionCustomTopBarData;
 
 [[nodiscard]] Data::PremiumSubscriptionOptions SubscriptionOptionsForRows(
 		Data::PremiumSubscriptionOptions result) {
 	for (auto &option : result) {
-		const auto total = option.costTotal;
+		const auto perYear = option.costPerYear;
 		const auto perMonth = option.costPerMonth;
 
-		option.costTotal = tr::lng_premium_gift_per(
+		option.costPerYear = tr::lng_premium_gift_per(
 			tr::now,
 			lt_cost,
 			perMonth);
 		option.costPerMonth = tr::lng_premium_subscribe_total(
 			tr::now,
 			lt_cost,
-			total);
+			perYear);
 
 		if (option.duration == tr::lng_months(tr::now, lt_count, 1)) {
 			option.costPerMonth = QString();
+			option.costNoDiscount = QString();
 			option.duration = tr::lng_premium_subscribe_months_1(tr::now);
 		} else if (option.duration == tr::lng_months(tr::now, lt_count, 6)) {
 			option.duration = tr::lng_premium_subscribe_months_6(tr::now);
 		} else if (option.duration == tr::lng_years(tr::now, lt_count, 1)) {
 			option.duration = tr::lng_premium_subscribe_months_12(tr::now);
+		} else if (option.duration == tr::lng_years(tr::now, lt_count, 2)) {
+			option.duration = tr::lng_premium_subscribe_months_24(tr::now);
 		}
 	}
 	return result;
@@ -104,7 +116,7 @@ namespace Gift {
 
 struct Data {
 	PeerId peerId;
-	int months = 0;
+	int days = 0;
 	bool me = false;
 
 	explicit operator bool() const {
@@ -115,7 +127,7 @@ struct Data {
 [[nodiscard]] QString Serialize(const Data &gift) {
 	return QString::number(gift.peerId.value)
 		+ ':'
-		+ QString::number(gift.months)
+		+ QString::number(gift.days)
 		+ ':'
 		+ QString::number(gift.me ? 1 : 0);
 }
@@ -127,7 +139,7 @@ struct Data {
 	}
 	return {
 		.peerId = PeerId(components[0].toULongLong()),
-		.months = components[1].toInt(),
+		.days = components[1].toInt(),
 		.me = (components[2].toInt() == 1),
 	};
 }
@@ -162,6 +174,45 @@ struct Data {
 }
 
 } // namespace EmojiStatus
+
+namespace PremiumGift {
+
+struct Data {
+	DocumentId documentId = 0;
+	int perUserTotal = 0;
+
+	explicit operator bool() const {
+		return documentId != 0;
+	}
+};
+
+[[nodiscard]] QString Serialize(const Data &gift) {
+	return u"premiumgift_:%1,peruser_:%2"_q
+		.arg(gift.documentId)
+		.arg(gift.perUserTotal);
+}
+
+[[nodiscard]] Data Parse(QStringView data) {
+	if (data.startsWith(u"premiumgift_:"_q)) {
+		const auto components = data.split(',');
+		if (components.size() != 2) {
+			return {};
+		}
+		const auto first = components[0].split(':');
+		const auto second = components[1].split(':');
+		if (first.size() != 2 || second.size() != 2) {
+			return {};
+		}
+		return {
+			.documentId = DocumentId(first[1].toULongLong()),
+			.perUserTotal = second[1].toInt(),
+		};
+	}
+	return {};
+}
+
+} // namespace PremiumGift
+
 } // namespace Ref
 
 struct Entry {
@@ -172,6 +223,14 @@ struct Entry {
 	bool newBadge = false;
 };
 
+struct PremiumState {
+	QString ref;
+	Fn<void(bool)> setPaused;
+	std::shared_ptr<Ui::RadiobuttonGroup> radioGroup;
+	base::flat_map<QString, QPointer<Ui::AbstractButton>> featureButtons;
+
+};
+
 using Order = std::vector<QString>;
 
 [[nodiscard]] Order FallbackOrder() {
@@ -198,6 +257,7 @@ using Order = std::vector<QString>;
 		u"premium_stickers"_q,
 		u"business"_q,
 		u"effects"_q,
+		u"ai_compose"_q,
 	};
 }
 
@@ -210,7 +270,6 @@ using Order = std::vector<QString>;
 				tr::lng_premium_summary_subtitle_tags_for_messages(),
 				tr::lng_premium_summary_about_tags_for_messages(),
 				PremiumFeature::TagsForMessages,
-				true,
 			},
 		},
 		{
@@ -220,7 +279,6 @@ using Order = std::vector<QString>;
 				tr::lng_premium_summary_subtitle_last_seen(),
 				tr::lng_premium_summary_about_last_seen(),
 				PremiumFeature::LastSeen,
-				true,
 			},
 		},
 		{
@@ -230,7 +288,6 @@ using Order = std::vector<QString>;
 				tr::lng_premium_summary_subtitle_message_privacy(),
 				tr::lng_premium_summary_about_message_privacy(),
 				PremiumFeature::MessagePrivacy,
-				true,
 			},
 		},
 		{
@@ -242,6 +299,15 @@ using Order = std::vector<QString>;
 				PremiumFeature::Wallpapers,
 			},
 		},
+		{
+			u"peer_colors"_q,
+			Entry{
+				&st::settingsPremiumIconPeerColors,
+				tr::lng_premium_summary_subtitle_peer_colors(),
+				tr::lng_premium_summary_about_peer_colors(),
+				PremiumFeature::PeerColors,
+			},
+		},
 		{
 			u"stories"_q,
 			Entry{
@@ -375,7 +441,6 @@ using Order = std::vector<QString>;
 				tr::lng_premium_summary_subtitle_business(),
 				tr::lng_premium_summary_about_business(),
 				PremiumFeature::Business,
-				true,
 			},
 		},
 		{
@@ -385,6 +450,33 @@ using Order = std::vector<QString>;
 				tr::lng_premium_summary_subtitle_effects(),
 				tr::lng_premium_summary_about_effects(),
 				PremiumFeature::Effects,
+			},
+		},
+		{
+			u"todo"_q,
+			Entry{
+				&st::settingsPremiumIconChecklist,
+				tr::lng_premium_summary_subtitle_todo_lists(),
+				tr::lng_premium_summary_about_todo_lists(),
+				PremiumFeature::TodoLists,
+			},
+		},
+		{
+			u"no_forwards"_q,
+			Entry{
+				&st::settingsPremiumIconNoForwards,
+				tr::lng_premium_summary_subtitle_no_forwards(),
+				tr::lng_premium_summary_about_no_forwards(),
+				PremiumFeature::NoForwards,
+			},
+		},
+		{
+			u"ai_compose"_q,
+			Entry{
+				&st::settingsPremiumIconAiCompose,
+				tr::lng_premium_summary_subtitle_ai_compose(),
+				tr::lng_premium_summary_about_ai_compose(),
+				PremiumFeature::AiCompose,
 				true,
 			},
 		},
@@ -392,7 +484,7 @@ using Order = std::vector<QString>;
 }
 
 void SendAppLog(
-		not_null<Main::Session*> session,
+		not_null<::Main::Session*> session,
 		const QString &type,
 		const MTPJSONValue &data) {
 	const auto now = double(base::unixtime::now())
@@ -476,7 +568,7 @@ EmojiStatusTopBar::EmojiStatusTopBar(
 
 	rpl::single() | rpl::then(
 		document->owner().session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_media->loaded()) {
 			return;
 		}
@@ -535,13 +627,30 @@ void EmojiStatusTopBar::paint(QPainter &p) {
 	}
 }
 
-class TopBarUser final : public Ui::Premium::TopBarAbstract {
+enum class TopBarWithStickerType {
+	EmojiStatus,
+	PremiumGift,
+};
+
+struct TopBarWithStickerArgs {
+	rpl::producer<DocumentData*> stickerValue;
+	rpl::producer<QString> nameValue;
+	rpl::producer<TextWithEntities> aboutValue;
+	TopBarWithStickerType type = TopBarWithStickerType::EmojiStatus;
+};
+
+class TopBarWithSticker final : public Ui::Premium::TopBarAbstract {
 public:
-	TopBarUser(
+	TopBarWithSticker(
 		not_null<QWidget*> parent,
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer,
 		rpl::producer<> showFinished);
+	TopBarWithSticker(
+		not_null<QWidget*> parent,
+		not_null<Window::SessionController*> controller,
+		TopBarWithStickerArgs args,
+		rpl::producer<> showFinished);
 
 	void setPaused(bool paused) override;
 	void setTextPosition(int x, int y) override;
@@ -555,10 +664,13 @@ class TopBarUser final : public Ui::Premium::TopBarAbstract {
 private:
 	void updateTitle(
 		DocumentData *document,
-		TextWithEntities name,
+		const TextWithEntities &name,
 		not_null<Window::SessionController*> controller);
-	void updateAbout(DocumentData *document) const;
+	void updateAbout(
+		DocumentData *document,
+		const TextWithEntities &about) const;
 
+	TopBarWithStickerType _type = TopBarWithStickerType::EmojiStatus;
 	object_ptr<Ui::RpWidget> _content;
 	object_ptr<Ui::FlatLabel> _title;
 	object_ptr<Ui::FlatLabel> _about;
@@ -579,12 +691,35 @@ class TopBarUser final : public Ui::Premium::TopBarAbstract {
 
 };
 
-TopBarUser::TopBarUser(
+TopBarWithSticker::TopBarWithSticker(
 	not_null<QWidget*> parent,
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer,
 	rpl::producer<> showFinished)
+: TopBarWithSticker(parent, controller, {
+	.stickerValue = Info::Profile::EmojiStatusIdValue(
+		peer
+	) | rpl::map([=](EmojiStatusId id) -> DocumentData* {
+		const auto documentId = id.collectible
+			? id.collectible->documentId
+			: id.documentId;
+		const auto document = documentId
+			? controller->session().data().document(documentId).get()
+			: nullptr;
+		return (document && document->sticker()) ? document : nullptr;
+	}),
+	.nameValue = Info::Profile::NameValue(peer),
+	.type = TopBarWithStickerType::EmojiStatus,
+}, std::move(showFinished)) {
+}
+
+TopBarWithSticker::TopBarWithSticker(
+	not_null<QWidget*> parent,
+	not_null<Window::SessionController*> controller,
+	TopBarWithStickerArgs args,
+	rpl::producer<> showFinished)
 : TopBarAbstract(parent, st::userPremiumCover)
+, _type(args.type)
 , _content(this)
 , _title(_content, st::settingsPremiumUserTitle)
 , _about(_content, st::userPremiumCover.about)
@@ -597,28 +732,31 @@ TopBarUser::TopBarUser(
 }) {
 	_starRect = TopBarAbstract::starRect(1., 1.);
 
+	if (_type == TopBarWithStickerType::PremiumGift) {
+		_ministars.setColorOverride(Ui::Premium::CreditsIconGradientStops());
+	}
+
 	rpl::single() | rpl::then(
 		style::PaletteChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		TopBarAbstract::computeIsDark();
 		update();
 	}, lifetime());
 
-	auto documentValue = Info::Profile::EmojiStatusIdValue(
-		peer
-	) | rpl::map([=](DocumentId id) -> DocumentData* {
-		const auto document = id
-			? controller->session().data().document(id).get()
-			: nullptr;
-		return (document && document->sticker()) ? document : nullptr;
-	});
-
 	rpl::combine(
-		std::move(documentValue),
-		Info::Profile::NameValue(peer)
-	) | rpl::start_with_next([=](
+		(args.stickerValue
+			? std::move(args.stickerValue)
+			: rpl::single((DocumentData*)nullptr)),
+		(args.nameValue
+			? std::move(args.nameValue)
+			: rpl::single(QString())),
+		(args.aboutValue
+			? std::move(args.aboutValue)
+			: rpl::single(TextWithEntities()))
+	) | rpl::on_next([=](
 			DocumentData *document,
-			const QString &name) {
+			const QString &name,
+			const TextWithEntities &about) {
 		if (document) {
 			_emojiStatus = std::make_unique<EmojiStatusTopBar>(
 				document,
@@ -631,18 +769,26 @@ TopBarUser::TopBarUser(
 		}
 
 		updateTitle(document, { name }, controller);
-		updateAbout(document);
+		updateAbout(document, about);
 
 		auto event = QResizeEvent(size(), size());
 		resizeEvent(&event);
 		update();
 	}, lifetime());
 
+	_title->naturalWidthValue() | rpl::on_next([=] {
+		_title->resizeToNaturalWidth(st::settingsPremiumUserTitle.minWidth);
+	}, _title->lifetime());
+
+	_about->naturalWidthValue() | rpl::on_next([=] {
+		_about->resizeToNaturalWidth(st::userPremiumCover.about.minWidth);
+	}, _about->lifetime());
+
 	rpl::combine(
 		_title->sizeValue(),
 		_about->sizeValue(),
 		_content->sizeValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const QSize &titleSize,
 			const QSize &aboutSize,
 			const QSize &size) {
@@ -681,7 +827,7 @@ TopBarUser::TopBarUser(
 			false
 		) | rpl::then(std::move(showFinished) | rpl::map_to(true)),
 		sizeValue()
-	) | rpl::start_with_next([=](bool showFinished, const QSize &size) {
+	) | rpl::on_next([=](bool showFinished, const QSize &size) {
 		_content->resize(size.width(), maximumHeight());
 		const auto skip = TopTransitionSkip();
 		_content->moveToLeft(0, size.height() - _content->height() - skip);
@@ -709,7 +855,7 @@ TopBarUser::TopBarUser(
 	}, lifetime());
 
 	_smallTop.widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(_smallTop.widget);
 
 		p.setOpacity(_smallTop.animation.value(_smallTop.shown ? 1. : 0.));
@@ -725,7 +871,7 @@ TopBarUser::TopBarUser(
 	}, lifetime());
 
 	_content->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_content);
 
 		_ministars.paint(p);
@@ -736,20 +882,21 @@ TopBarUser::TopBarUser(
 			p.drawImage(_starRect.topLeft(), _imageStar);
 		}
 	}, lifetime());
-
 }
 
-void TopBarUser::updateTitle(
+void TopBarWithSticker::updateTitle(
 		DocumentData *document,
-		TextWithEntities name,
+		const TextWithEntities &name,
 		not_null<Window::SessionController*> controller) {
-	if (!document) {
+	if (_type == TopBarWithStickerType::PremiumGift) {
+		return _title->setMarkedText(name);
+	} else if (!document) {
 		return _title->setMarkedText(
 			tr::lng_premium_summary_user_title(
 				tr::now,
 				lt_user,
 				std::move(name),
-				Ui::Text::WithEntities));
+				tr::marked));
 	}
 	const auto stickerInfo = document->sticker();
 	if (!stickerInfo) {
@@ -772,26 +919,24 @@ void TopBarUser::updateTitle(
 		set->thumbnailDocumentId);
 	const auto entities = EntitiesInText{
 		{ EntityType::CustomEmoji, 0, 1, entityEmojiData },
-		Ui::Text::Link(text, linkIndex).entities.front(),
+		tr::link(text, linkIndex).entities.front(),
 	};
 	auto title = (setId == coloredId)
 		? tr::lng_premium_emoji_status_title_colored(
 			tr::now,
 			lt_user,
 			std::move(name),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: tr::lng_premium_emoji_status_title(
 			tr::now,
 			lt_user,
 			std::move(name),
 			lt_link,
 			{ .text = text, .entities = entities, },
-			Ui::Text::WithEntities);
-	const auto context = Core::MarkedTextContext{
-		.session = &controller->session(),
-		.customEmojiRepaint = [=] { _title->update(); },
-	};
-	_title->setMarkedText(std::move(title), context);
+			tr::marked);
+	_title->setMarkedText(
+		std::move(title),
+		Core::TextContext({ .session = &controller->session() }));
 	auto link = std::make_shared<LambdaClickHandler>([=,
 			stickerSetIdentifier = stickerInfo->set] {
 		setPaused(true);
@@ -801,43 +946,47 @@ void TopBarUser::updateTitle(
 			Data::StickersType::Emoji));
 
 		box->boxClosing(
-		) | rpl::start_with_next(crl::guard(this, [=] {
+		) | rpl::on_next(crl::guard(this, [=] {
 			setPaused(false);
 		}), box->lifetime());
 	});
 	_title->setLink(linkIndex, std::move(link));
 }
 
-void TopBarUser::updateAbout(DocumentData *document) const {
-	_about->setMarkedText((document
-		? tr::lng_premium_emoji_status_about
-		: tr::lng_premium_summary_user_about)(
-			tr::now,
-			Ui::Text::RichLangValue));
+void TopBarWithSticker::updateAbout(
+		DocumentData *document,
+		const TextWithEntities &about) const {
+	_about->setMarkedText((_type == TopBarWithStickerType::PremiumGift)
+		? about
+		: (document
+			? tr::lng_premium_emoji_status_about
+			: tr::lng_premium_summary_user_about)(
+				tr::now,
+				tr::rich));
 }
 
-void TopBarUser::setPaused(bool paused) {
+void TopBarWithSticker::setPaused(bool paused) {
 	_ministars.setPaused(paused);
 	if (_emojiStatus) {
 		_emojiStatus->setPaused(paused);
 	}
 }
 
-void TopBarUser::setTextPosition(int x, int y) {
+void TopBarWithSticker::setTextPosition(int x, int y) {
 	_smallTop.position = { x, y };
 }
 
-rpl::producer<int> TopBarUser::additionalHeight() const {
+rpl::producer<int> TopBarWithSticker::additionalHeight() const {
 	return rpl::never<int>();
 }
 
-void TopBarUser::paintEvent(QPaintEvent *e) {
+void TopBarWithSticker::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
 	TopBarAbstract::paintEdges(p);
 }
 
-void TopBarUser::resizeEvent(QResizeEvent *e) {
+void TopBarWithSticker::resizeEvent(QResizeEvent *e) {
 	_starRect = TopBarAbstract::starRect(1., 1.);
 
 	_ministars.setCenter(_starRect.toRect());
@@ -847,6 +996,326 @@ void TopBarUser::resizeEvent(QResizeEvent *e) {
 	}
 }
 
+[[nodiscard]] QString GetFeatureTitle(const QString &key) {
+	if (key == u"saved_tags"_q) {
+		return tr::lng_premium_summary_subtitle_tags_for_messages(tr::now);
+	} else if (key == u"last_seen"_q) {
+		return tr::lng_premium_summary_subtitle_last_seen(tr::now);
+	} else if (key == u"message_privacy"_q) {
+		return tr::lng_premium_summary_subtitle_message_privacy(tr::now);
+	} else if (key == u"wallpapers"_q) {
+		return tr::lng_premium_summary_subtitle_wallpapers(tr::now);
+	} else if (key == u"peer_colors"_q) {
+		return tr::lng_premium_summary_subtitle_peer_colors(tr::now);
+	} else if (key == u"stories"_q) {
+		return tr::lng_premium_summary_subtitle_stories(tr::now);
+	} else if (key == u"double_limits"_q) {
+		return tr::lng_premium_summary_subtitle_double_limits(tr::now);
+	} else if (key == u"more_upload"_q) {
+		return tr::lng_premium_summary_subtitle_more_upload(tr::now);
+	} else if (key == u"faster_download"_q) {
+		return tr::lng_premium_summary_subtitle_faster_download(tr::now);
+	} else if (key == u"voice_to_text"_q) {
+		return tr::lng_premium_summary_subtitle_voice_to_text(tr::now);
+	} else if (key == u"no_ads"_q) {
+		return tr::lng_premium_summary_subtitle_no_ads(tr::now);
+	} else if (key == u"emoji_status"_q) {
+		return tr::lng_premium_summary_subtitle_emoji_status(tr::now);
+	} else if (key == u"infinite_reactions"_q) {
+		return tr::lng_premium_summary_subtitle_infinite_reactions(tr::now);
+	} else if (key == u"premium_stickers"_q) {
+		return tr::lng_premium_summary_subtitle_premium_stickers(tr::now);
+	} else if (key == u"animated_emoji"_q) {
+		return tr::lng_premium_summary_subtitle_animated_emoji(tr::now);
+	} else if (key == u"advanced_chat_management"_q) {
+		return tr::lng_premium_summary_subtitle_advanced_chat_management(tr::now);
+	} else if (key == u"profile_badge"_q) {
+		return tr::lng_premium_summary_subtitle_profile_badge(tr::now);
+	} else if (key == u"animated_userpics"_q) {
+		return tr::lng_premium_summary_subtitle_animated_userpics(tr::now);
+	} else if (key == u"translations"_q) {
+		return tr::lng_premium_summary_subtitle_translation(tr::now);
+	} else if (key == u"business"_q) {
+		return tr::lng_premium_summary_subtitle_business(tr::now);
+	} else if (key == u"effects"_q) {
+		return tr::lng_premium_summary_subtitle_effects(tr::now);
+	} else if (key == u"todo"_q) {
+		return tr::lng_premium_summary_subtitle_todo_lists(tr::now);
+	} else if (key == u"no_forwards"_q) {
+		return tr::lng_premium_summary_subtitle_no_forwards(tr::now);
+	} else if (key == u"ai_compose"_q) {
+		return tr::lng_premium_summary_subtitle_ai_compose(tr::now);
+	}
+	return QString();
+}
+
+void BuildPremiumFeatures(SectionBuilder &builder) {
+	const auto session = builder.session();
+	const auto mtpOrder = session->appConfig().get<Order>(
+		"premium_promo_order",
+		FallbackOrder());
+
+	for (const auto &key : mtpOrder) {
+		const auto title = GetFeatureTitle(key);
+		if (title.isEmpty()) {
+			continue;
+		}
+		builder.add(nullptr, [key, title] {
+			return SearchEntry{
+				.id = u"premium/"_q + key,
+				.title = title,
+			};
+		});
+	}
+}
+
+void SetupSubscriptionOptions(
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Window::SessionController*> controller,
+		const QString &ref,
+		std::shared_ptr<Ui::RadiobuttonGroup> radioGroup) {
+	const auto isEmojiStatus = (!!Ref::EmojiStatus::Parse(ref));
+	const auto isGift = (!!Ref::Gift::Parse(ref));
+
+	const auto options = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto skip = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto content = options->entity();
+
+	Ui::AddSkip(content, st::settingsPremiumOptionsPadding.top());
+
+	const auto apiPremium = &controller->session().api().premium();
+	Ui::Premium::AddGiftOptions(
+		content,
+		radioGroup,
+		SubscriptionOptionsForRows(apiPremium->subscriptionOptions()),
+		st::premiumSubscriptionOption,
+		true);
+
+	Ui::AddSkip(content, st::settingsPremiumOptionsPadding.bottom());
+	Ui::AddDivider(content);
+
+	const auto lastSkip = TopTransitionSkip() * (isEmojiStatus ? 1 : 2);
+
+	Ui::AddSkip(content, lastSkip - st::defaultVerticalListSkip);
+	Ui::AddSkip(skip->entity(), lastSkip);
+
+	if (isEmojiStatus || isGift) {
+		options->toggle(false, anim::type::instant);
+		skip->toggle(true, anim::type::instant);
+		return;
+	}
+	auto toggleOn = rpl::combine(
+		Data::AmPremiumValue(&controller->session()),
+		apiPremium->statusTextValue(
+		) | rpl::map([=] {
+			return apiPremium->subscriptionOptions().size() < 2;
+		})
+	) | rpl::map([=](bool premium, bool noOptions) {
+		return !premium && !noOptions;
+	});
+	options->toggleOn(rpl::duplicate(toggleOn), anim::type::instant);
+	skip->toggleOn(std::move(
+		toggleOn
+	) | rpl::map([](bool value) { return !value; }), anim::type::instant);
+}
+
+void AddSummaryPremium(
+		not_null<Ui::VerticalLayout*> content,
+		not_null<Window::SessionController*> controller,
+		const QString &ref,
+		Fn<void(PremiumFeature)> buttonCallback,
+		std::shared_ptr<PremiumState> state) {
+	const auto &stDefault = st::settingsButton;
+	const auto &stLabel = st::defaultFlatLabel;
+	const auto iconSize = st::settingsPremiumIconDouble.size();
+	const auto &titlePadding = st::settingsPremiumRowTitlePadding;
+	const auto &descriptionPadding = st::settingsPremiumRowAboutPadding;
+
+	auto entryMap = EntryMap();
+	auto iconContainers = std::vector<Ui::AbstractButton*>();
+	iconContainers.reserve(int(entryMap.size()));
+
+	const auto addRow = [&](const QString &key, Entry &entry) {
+		const auto labelAscent = stLabel.style.font->ascent;
+		const auto button = Ui::CreateChild<Ui::SettingsButton>(
+			content.get(),
+			rpl::single(QString()));
+
+		const auto label = content->add(
+			object_ptr<Ui::FlatLabel>(
+				content,
+				std::move(entry.title) | rpl::map(tr::bold),
+				stLabel),
+			titlePadding);
+		label->setAttribute(Qt::WA_TransparentForMouseEvents);
+		const auto description = content->add(
+			object_ptr<Ui::FlatLabel>(
+				content,
+				std::move(entry.description),
+				st::boxDividerLabel),
+			descriptionPadding);
+		description->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+		if (entry.newBadge) {
+			Ui::NewBadge::AddAfterLabel(content, label);
+		}
+		const auto dummy = Ui::CreateChild<Ui::AbstractButton>(content.get());
+		dummy->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+		content->sizeValue(
+		) | rpl::on_next([=](const QSize &s) {
+			dummy->resize(s.width(), iconSize.height());
+		}, dummy->lifetime());
+
+		label->geometryValue(
+		) | rpl::on_next([=](const QRect &r) {
+			dummy->moveToLeft(0, r.y() + (r.height() - labelAscent));
+		}, dummy->lifetime());
+
+		rpl::combine(
+			content->widthValue(),
+			label->heightValue(),
+			description->heightValue()
+		) | rpl::on_next([=,
+			topPadding = titlePadding,
+			bottomPadding = descriptionPadding](
+				int width,
+				int topHeight,
+				int bottomHeight) {
+			button->resize(
+				width,
+				topPadding.top()
+					+ topHeight
+					+ topPadding.bottom()
+					+ bottomPadding.top()
+					+ bottomHeight
+					+ bottomPadding.bottom());
+		}, button->lifetime());
+		label->topValue(
+		) | rpl::on_next([=, padding = titlePadding.top()](int top) {
+			button->moveToLeft(0, top - padding);
+		}, button->lifetime());
+		const auto arrow = Ui::CreateChild<Ui::IconButton>(
+			button,
+			st::backButton);
+		arrow->setIconOverride(
+			&st::settingsPremiumArrow,
+			&st::settingsPremiumArrowOver);
+		arrow->setAttribute(Qt::WA_TransparentForMouseEvents);
+		button->sizeValue(
+		) | rpl::on_next([=](const QSize &s) {
+			const auto &point = st::settingsPremiumArrowShift;
+			arrow->moveToRight(
+				-point.x(),
+				point.y() + (s.height() - arrow->height()) / 2);
+		}, arrow->lifetime());
+
+		const auto section = entry.section;
+		button->setClickedCallback([=] { buttonCallback(section); });
+
+		if (state) {
+			state->featureButtons[key] = button;
+		}
+
+		iconContainers.push_back(dummy);
+	};
+
+	auto icons = std::vector<const style::icon *>();
+	icons.reserve(int(entryMap.size()));
+	{
+		const auto session = &controller->session();
+		const auto mtpOrder = session->appConfig().get<Order>(
+			"premium_promo_order",
+			FallbackOrder());
+		const auto processEntry = [&](const QString &key, Entry &entry) {
+			icons.push_back(entry.icon);
+			addRow(key, entry);
+		};
+
+		for (const auto &key : mtpOrder) {
+			auto it = entryMap.find(key);
+			if (it == end(entryMap)) {
+				continue;
+			}
+			processEntry(key, it->second);
+		}
+
+		SendScreenShow(controller, mtpOrder, ref);
+	}
+
+	content->resizeToWidth(content->height());
+
+	// Icons.
+	Assert(iconContainers.size() > 2);
+	const auto from = iconContainers.front()->y();
+	const auto to = iconContainers.back()->y() + iconSize.height();
+	auto gradient = QLinearGradient(0, 0, 0, to - from);
+	gradient.setStops(Ui::Premium::FullHeightGradientStops());
+	for (auto i = 0; i < int(icons.size()); i++) {
+		const auto &iconContainer = iconContainers[i];
+
+		const auto pointTop = iconContainer->y() - from;
+		const auto pointBottom = pointTop + iconContainer->height();
+		const auto ratioTop = pointTop / float64(to - from);
+		const auto ratioBottom = pointBottom / float64(to - from);
+
+		auto resultGradient = QLinearGradient(
+			QPointF(),
+			QPointF(0, pointBottom - pointTop));
+
+		resultGradient.setColorAt(
+			.0,
+			anim::gradient_color_at(gradient, ratioTop));
+		resultGradient.setColorAt(
+			.1,
+			anim::gradient_color_at(gradient, ratioBottom));
+
+		const auto brush = QBrush(resultGradient);
+		AddButtonIcon(
+			iconContainer,
+			stDefault,
+			{ .icon = icons[i], .backgroundBrush = brush });
+	}
+
+	Ui::AddSkip(content, descriptionPadding.bottom());
+}
+
+void BuildPremiumSectionContent(
+		SectionBuilder &builder,
+		std::shared_ptr<PremiumState> state) {
+	const auto controller = builder.controller();
+
+	if (controller && state) {
+		builder.add([controller, state](const WidgetContext &ctx) {
+			SetupSubscriptionOptions(
+				ctx.container,
+				controller,
+				state->ref,
+				state->radioGroup);
+
+			auto buttonCallback = [controller](PremiumFeature section) {
+				ShowPremiumPreviewToBuy(controller, section, nullptr);
+			};
+			AddSummaryPremium(
+				ctx.container,
+				controller,
+				state->ref,
+				std::move(buttonCallback),
+				state);
+
+			return SectionBuilder::WidgetToAdd{};
+		});
+	}
+
+	BuildPremiumFeatures(builder);
+}
+
 class Premium : public Section<Premium> {
 public:
 	Premium(
@@ -855,9 +1324,9 @@ class Premium : public Section<Premium> {
 
 	[[nodiscard]] rpl::producer<QString> title() override;
 
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToTop(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToTop(
 		not_null<QWidget*> parent) override;
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToBottom(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) override;
 
 	void showFinished() override;
@@ -870,19 +1339,15 @@ class Premium : public Section<Premium> {
 
 private:
 	void setupContent();
-	void setupSubscriptionOptions(not_null<Ui::VerticalLayout*> container);
+	void setupSwipeBack();
 
-	const not_null<Window::SessionController*> _controller;
-	const QString _ref;
+	std::shared_ptr<PremiumState> _state;
 
 	QPointer<Ui::GradientButton> _subscribe;
 	base::unique_qptr<Ui::FadeWrap<Ui::IconButton>> _back;
 	base::unique_qptr<Ui::IconButton> _close;
 	rpl::variable<bool> _backToggles;
 	rpl::variable<Info::Wrap> _wrap;
-	Fn<void(bool)> _setPaused;
-
-	std::shared_ptr<Ui::RadiobuttonGroup> _radioGroup;
 
 	rpl::event_stream<> _showBack;
 	rpl::event_stream<> _showFinished;
@@ -893,12 +1358,14 @@ class Premium : public Section<Premium> {
 Premium::Premium(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: Section(parent)
-, _controller(controller)
-, _ref(ResolveRef(controller->premiumRef()))
-, _radioGroup(std::make_shared<Ui::RadiobuttonGroup>()) {
+: Section(parent, controller)
+, _state(std::make_shared<PremiumState>(PremiumState{
+	.ref = ResolveRef(controller->premiumRef()),
+	.radioGroup = std::make_shared<Ui::RadiobuttonGroup>(),
+})) {
 	setupContent();
-	_controller->session().api().premium().reload();
+	setupSwipeBack();
+	controller->session().api().premium().reload();
 }
 
 rpl::producer<QString> Premium::title() {
@@ -923,149 +1390,153 @@ void Premium::setStepDataReference(std::any &data) {
 	}
 }
 
-void Premium::setupSubscriptionOptions(
-		not_null<Ui::VerticalLayout*> container) {
-	const auto isEmojiStatus = (!!Ref::EmojiStatus::Parse(_ref));
-	const auto isGift = (!!Ref::Gift::Parse(_ref));
-
-	const auto options = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-	const auto skip = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-	const auto content = options->entity();
-
-	Ui::AddSkip(content, st::settingsPremiumOptionsPadding.top());
-
-	const auto apiPremium = &_controller->session().api().premium();
-	Ui::Premium::AddGiftOptions(
-		content,
-		_radioGroup,
-		SubscriptionOptionsForRows(apiPremium->subscriptionOptions()),
-		st::premiumSubscriptionOption,
-		true);
-
-	Ui::AddSkip(content, st::settingsPremiumOptionsPadding.bottom());
-	Ui::AddDivider(content);
-
-	const auto lastSkip = TopTransitionSkip() * (isEmojiStatus ? 1 : 2);
+void Premium::setupSwipeBack() {
+	using namespace Ui::Controls;
+
+	auto swipeBackData = lifetime().make_state<SwipeBackResult>();
+
+	auto update = [=](SwipeContextData data) {
+		if (data.translation > 0) {
+			if (!swipeBackData->callback) {
+				(*swipeBackData) = SetupSwipeBack(
+					this,
+					[]() -> std::pair<QColor, QColor> {
+						return {
+							st::historyForwardChooseBg->c,
+							st::historyForwardChooseFg->c,
+						};
+					});
+			}
+			swipeBackData->callback(data);
+			return;
+		} else if (swipeBackData->lifetime) {
+			(*swipeBackData) = {};
+		}
+	};
 
-	Ui::AddSkip(content, lastSkip - st::defaultVerticalListSkip);
-	Ui::AddSkip(skip->entity(), lastSkip);
+	auto init = [=](Ui::Controls::SwipeHandlerInitData data) {
+		return (data.direction == Qt::RightToLeft)
+			? DefaultSwipeBackHandlerFinishData([=] {
+				_showBack.fire({});
+			})
+			: SwipeHandlerFinishData();
+	};
 
-	if (isEmojiStatus || isGift) {
-		options->toggle(false, anim::type::instant);
-		skip->toggle(true, anim::type::instant);
-		return;
-	}
-	auto toggleOn = rpl::combine(
-		Data::AmPremiumValue(&_controller->session()),
-		apiPremium->statusTextValue(
-		) | rpl::map([=] {
-			return apiPremium->subscriptionOptions().size() < 2;
-		})
-	) | rpl::map([=](bool premium, bool noOptions) {
-		return !premium && !noOptions;
+	SetupSwipeHandler({
+		.widget = this,
+		.scroll = v::null,
+		.update = std::move(update),
+		.init = std::move(init),
 	});
-	options->toggleOn(rpl::duplicate(toggleOn), anim::type::instant);
-	skip->toggleOn(std::move(
-		toggleOn
-	) | rpl::map([](bool value) { return !value; }), anim::type::instant);
 }
 
 void Premium::setupContent() {
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+	const auto state = _state;
+
+	const SectionBuildMethod buildMethod = [state](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		const auto isPaused = Window::PausedIn(
+			controller,
+			Window::GifPauseReason::Layer);
+
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = isPaused,
+		});
 
-	setupSubscriptionOptions(content);
-
-	auto buttonCallback = [=](PremiumFeature section) {
-		_setPaused(true);
-		const auto hidden = crl::guard(this, [=] { _setPaused(false); });
-
-		ShowPremiumPreviewToBuy(_controller, section, hidden);
+		BuildPremiumSectionContent(builder, state);
 	};
-	AddSummaryPremium(content, _controller, _ref, std::move(buttonCallback));
-#if 0
-	Ui::AddSkip(content);
-	Ui::AddDivider(content);
-	Ui::AddSkip(content);
 
-	content->add(
-		object_ptr<Ui::FlatLabel>(
-			content,
-			tr::lng_premium_summary_bottom_subtitle(
-			) | Ui::Text::ToBold(),
-			stLabel),
-		st::defaultSubsectionTitlePadding);
-	content->add(
-		object_ptr<Ui::FlatLabel>(
-			content,
-			tr::lng_premium_summary_bottom_about(Ui::Text::RichLangValue),
-			st::aboutLabel),
-		st::boxRowPadding);
-	Ui::AddSkip(
-		content,
-		stDefault.padding.top() + stDefault.padding.bottom());
-#endif
+	build(content, buildMethod);
 
 	Ui::ResizeFitChild(this, content);
-
 }
 
-QPointer<Ui::RpWidget> Premium::createPinnedToTop(
+base::weak_qptr<Ui::RpWidget> Premium::createPinnedToTop(
 		not_null<QWidget*> parent) {
-	auto title = _controller->session().premium()
+	auto title = controller()->session().premium()
 		? tr::lng_premium_summary_title()
 		: rpl::conditional(
-			Data::AmPremiumValue(&_controller->session()),
+			Data::AmPremiumValue(&controller()->session()),
 			tr::lng_premium_summary_title_subscribed(),
 			tr::lng_premium_summary_title());
 	auto about = [&]() -> rpl::producer<TextWithEntities> {
-		const auto gift = Ref::Gift::Parse(_ref);
+		const auto gift = Ref::Gift::Parse(_state->ref);
 		if (gift) {
-			auto &data = _controller->session().data();
+			auto &data = controller()->session().data();
 			if (const auto peer = data.peer(gift.peerId)) {
+				const auto months = gift.days / 30;
 				return (gift.me
-					? tr::lng_premium_summary_subtitle_gift_me
-					: tr::lng_premium_summary_subtitle_gift)(
+					? (months
+						? tr::lng_premium_summary_subtitle_gift_me
+						: tr::lng_premium_summary_subtitle_gift_days_me)
+					: (months
+						? tr::lng_premium_summary_subtitle_gift
+						: tr::lng_premium_summary_subtitle_gift_days))(
 						lt_count,
-						rpl::single(float64(gift.months)),
+						rpl::single(float64(months ? months : gift.days)),
 						lt_user,
-						rpl::single(Ui::Text::Bold(peer->name())),
-						Ui::Text::RichLangValue);
+						rpl::single(tr::bold(peer->name())),
+						tr::rich);
 			}
 		}
 		return rpl::conditional(
-			Data::AmPremiumValue(&_controller->session()),
-			_controller->session().api().premium().statusTextValue(),
-			tr::lng_premium_summary_top_about(Ui::Text::RichLangValue));
+			Data::AmPremiumValue(&controller()->session()),
+			controller()->session().api().premium().statusTextValue(),
+			tr::lng_premium_summary_top_about(tr::rich));
 	}();
 
-	const auto emojiStatusData = Ref::EmojiStatus::Parse(_ref);
+	const auto emojiStatusData = Ref::EmojiStatus::Parse(_state->ref);
+	const auto premiumGiftData = Ref::PremiumGift::Parse(_state->ref);
 	const auto isEmojiStatus = (!!emojiStatusData);
+	const auto isPremiumGift = (!!premiumGiftData);
 
 	auto peerWithPremium = [&]() -> PeerData* {
 		if (isEmojiStatus) {
-			auto &data = _controller->session().data();
+			auto &data = controller()->session().data();
 			if (const auto peer = data.peer(emojiStatusData.peerId)) {
 				return peer;
 			}
 		}
 		return nullptr;
 	}();
+	auto premiumGift = [&]() -> DocumentData* {
+		if (isPremiumGift) {
+			auto &data = controller()->session().data();
+			return data.document(premiumGiftData.documentId);
+		}
+		return nullptr;
+	}();
 
 	const auto content = [&]() -> Ui::Premium::TopBarAbstract* {
 		if (peerWithPremium) {
-			return Ui::CreateChild<TopBarUser>(
+			return Ui::CreateChild<TopBarWithSticker>(
 				parent.get(),
-				_controller,
+				controller(),
 				peerWithPremium,
 				_showFinished.events());
+		} else if (premiumGift) {
+			return Ui::CreateChild<TopBarWithSticker>(
+				parent.get(),
+				controller(),
+				TopBarWithStickerArgs{
+					.stickerValue = rpl::single(premiumGift),
+					.nameValue = tr::lng_gift_premium_title(),
+					.aboutValue = tr::lng_gift_premium_text(
+						lt_count,
+						rpl::single(premiumGiftData.perUserTotal * 1.),
+						tr::rich),
+					.type = TopBarWithStickerType::PremiumGift,
+				},
+				_showFinished.events());
 		}
-		const auto weak = base::make_weak(_controller);
+		const auto weak = base::make_weak(controller());
 		const auto clickContextOther = [=] {
 			return QVariant::fromValue(ClickHandlerContext{
 				.sessionWindow = weak,
@@ -1079,22 +1550,28 @@ QPointer<Ui::RpWidget> Premium::createPinnedToTop(
 				.clickContextOther = clickContextOther,
 				.title = std::move(title),
 				.about = std::move(about),
+				.use3dStar = true,
+				.showFinished = _showFinished.events(),
 			});
 	}();
-	_setPaused = [=](bool paused) {
+	_state->setPaused = [=](bool paused) {
 		content->setPaused(paused);
 		if (_subscribe) {
 			_subscribe->setGlarePaused(paused);
 		}
 	};
+	controller()->boxShownValue(
+	) | rpl::on_next([=](bool shown) {
+		_state->setPaused(shown);
+	}, content->lifetime());
 
 	_wrap.value(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		content->setRoundEdges(wrap == Info::Wrap::Layer);
 	}, content->lifetime());
 
 	const auto calculateMaximumHeight = [=] {
-		return isEmojiStatus
+		return (isEmojiStatus || isPremiumGift)
 			? st::settingsPremiumUserHeight + TopTransitionSkip()
 			: st::settingsPremiumTopHeight;
 	};
@@ -1104,7 +1581,7 @@ QPointer<Ui::RpWidget> Premium::createPinnedToTop(
 
 	content->resize(content->width(), content->maximumHeight());
 	content->additionalHeight(
-	) | rpl::start_with_next([=](int additionalHeight) {
+	) | rpl::on_next([=](int additionalHeight) {
 		const auto wasMax = (content->height() == content->maximumHeight());
 		content->setMaximumHeight(calculateMaximumHeight()
 			+ additionalHeight);
@@ -1114,7 +1591,7 @@ QPointer<Ui::RpWidget> Premium::createPinnedToTop(
 	}, content->lifetime());
 
 	_wrap.value(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
+	) | rpl::on_next([=](Info::Wrap wrap) {
 		const auto isLayer = (wrap == Info::Wrap::Layer);
 		_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
 			content,
@@ -1128,13 +1605,13 @@ QPointer<Ui::RpWidget> Premium::createPinnedToTop(
 			st::infoTopBarScale);
 		_back->setDuration(0);
 		_back->toggleOn(isLayer
-			? _backToggles.value() | rpl::type_erased()
+			? _backToggles.value() | rpl::type_erased
 			: rpl::single(true));
 		_back->entity()->addClickHandler([=] {
 			_showBack.fire({});
 		});
 		_back->toggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			const auto &st = isLayer ? st::infoLayerTopBar : st::infoTopBar;
 			content->setTextPosition(
 				toggled ? st.back.width : st.titlePosition.x(),
@@ -1150,33 +1627,39 @@ QPointer<Ui::RpWidget> Premium::createPinnedToTop(
 					? st::infoTopBarClose
 					: st::settingsPremiumTopBarClose);
 			_close->addClickHandler([=] {
-				_controller->parentController()->hideLayer();
-				_controller->parentController()->hideSpecialLayer();
+				controller()->parentController()->hideLayer();
+				controller()->parentController()->hideSpecialLayer();
 			});
 			content->widthValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_close->moveToRight(0, 0);
 			}, _close->lifetime());
 		}
 	}, content->lifetime());
 
-	return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
 }
 
 void Premium::showFinished() {
 	_showFinished.fire({});
+	crl::on_main(this, [=] {
+		for (const auto &[key, button] : _state->featureButtons) {
+			const auto id = u"premium/"_q + key;
+			controller()->checkHighlightControl(id, button);
+		}
+	});
 }
 
-QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
+base::weak_qptr<Ui::RpWidget> Premium::createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) {
 	const auto content = Ui::CreateChild<Ui::RpWidget>(parent.get());
 
-	if (Ref::Gift::Parse(_ref)) {
+	if (Ref::Gift::Parse(_state->ref)) {
 		return nullptr;
 	}
 
-	const auto emojiStatusData = Ref::EmojiStatus::Parse(_ref);
-	const auto session = &_controller->session();
+	const auto emojiStatusData = Ref::EmojiStatus::Parse(_state->ref);
+	const auto session = &controller()->session();
 
 	auto buttonText = [&]() -> std::optional<rpl::producer<QString>> {
 		if (emojiStatusData) {
@@ -1184,7 +1667,7 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
 			if (const auto peer = data.peer(emojiStatusData.peerId)) {
 				return Info::Profile::EmojiStatusIdValue(
 					peer
-				) | rpl::map([=](DocumentId id) {
+				) | rpl::map([=](EmojiStatusId id) {
 					return id
 						? tr::lng_premium_emoji_status_button()
 						: _buttonText.value();
@@ -1196,13 +1679,13 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
 	}();
 
 	_subscribe = CreateSubscribeButton({
-		_controller,
+		controller(),
 		content,
-		[ref = _ref] { return ref; },
+		[ref = _state->ref] { return ref; },
 		std::move(buttonText),
 		std::nullopt,
 		[=, options = session->api().premium().subscriptionOptions()] {
-			const auto value = _radioGroup->current();
+			const auto value = _state->radioGroup->current();
 			return (value < options.size() && value >= 0)
 				? options[value].botUrl
 				: QString();
@@ -1216,15 +1699,15 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
 		// we should replace the ref explicitly.
 		_subscribe->setClickedCallback([=] {
 			const auto ref = _ref;
-			const auto controller = _controller;
-			ShowPremium(controller, QString());
-			controller->setPremiumRef(ref);
+			const auto window = controller();
+			ShowPremium(window, QString());
+			window->setPremiumRef(ref);
 		});
 	} else {
 #endif
 	{
 		const auto callback = [=](int value) {
-			auto &api = _controller->session().api();
+			auto &api = controller()->session().api();
 			const auto options = api.premium().subscriptionOptions();
 			if (options.empty()) {
 				return;
@@ -1236,17 +1719,17 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
 				options[value].costPerMonth);
 			_buttonText = std::move(text);
 		};
-		_radioGroup->setChangedCallback(callback);
+		_state->radioGroup->setChangedCallback(callback);
 		callback(0);
 	}
 
 	_showFinished.events(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		_subscribe->startGlareAnimation();
 	}, _subscribe->lifetime());
 
 	content->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto padding = st::settingsPremiumButtonPadding;
 		_subscribe->resizeToWidth(width - padding.left() - padding.right());
 	}, _subscribe->lifetime());
@@ -1255,7 +1738,7 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
 		_subscribe->heightValue(),
 		Data::AmPremiumValue(session),
 		session->premiumPossibleValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int buttonHeight,
 			bool premium,
 			bool premiumPossible) {
@@ -1270,9 +1753,18 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
 		_subscribe->setVisible(!premium && premiumPossible);
 	}, _subscribe->lifetime());
 
-	return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
 }
 
+const auto kMeta = BuildHelper({
+	.id = Premium::Id(),
+	.parentId = MainId(),
+	.title = &tr::lng_premium_summary_title,
+	.icon = &st::menuIconPremium,
+}, [](SectionBuilder &builder) {
+	BuildPremiumSectionContent(builder, nullptr);
+});
+
 } // namespace
 
 template <>
@@ -1299,7 +1791,7 @@ Type PremiumId() {
 	return Premium::Id();
 }
 
-void ShowPremium(not_null<Main::Session*> session, const QString &ref) {
+void ShowPremium(not_null<::Main::Session*> session, const QString &ref) {
 	const auto active = Core::App().activeWindow();
 	const auto controller = (active && active->isPrimary())
 		? active->sessionController()
@@ -1329,15 +1821,28 @@ void ShowPremium(
 void ShowGiftPremium(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer,
-		int months,
+		int days,
 		bool me) {
-	ShowPremium(controller, Ref::Gift::Serialize({ peer->id, months, me }));
+	ShowPremium(controller, Ref::Gift::Serialize({ peer->id, days, me }));
 }
 
 void ShowEmojiStatusPremium(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer) {
-	ShowPremium(controller, Ref::EmojiStatus::Serialize({ peer->id }));
+	if (const auto unique = peer->emojiStatusId().collectible.get()) {
+		Core::ResolveAndShowUniqueGift(controller->uiShow(), unique->slug);
+	} else {
+		ShowPremium(controller, Ref::EmojiStatus::Serialize({ peer->id }));
+	}
+}
+
+void ShowPremiumGiftPremium(
+		not_null<Window::SessionController*> controller,
+		const Data::StarGift &gift) {
+	ShowPremium(controller, Ref::PremiumGift::Serialize({
+		.documentId = gift.document->id,
+		.perUserTotal = gift.perUserTotal,
+	}));
 }
 
 void StartPremiumPayment(
@@ -1376,19 +1881,17 @@ void ShowPremiumPromoToast(
 		TextWithEntities textWithLink,
 		const QString &ref) {
 	ShowPremiumPromoToast(show, [=](
-			not_null<Main::Session*> session,
-			ChatHelpers::WindowUsage usage) {
+			not_null<::Main::Session*> session) {
 		Expects(&show->session() == session);
 
-		return show->resolveWindow(usage);
+		return show->resolveWindow();
 	}, std::move(textWithLink), ref);
 }
 
 void ShowPremiumPromoToast(
-		std::shared_ptr<Main::SessionShow> show,
+		std::shared_ptr<::Main::SessionShow> show,
 		Fn<Window::SessionController*(
-			not_null<Main::Session*>,
-			ChatHelpers::WindowUsage)> resolveWindow,
+			not_null<::Main::Session*>)> resolveWindow,
 		TextWithEntities textWithLink,
 		const QString &ref) {
 	using WeakToast = base::weak_ptr<Ui::Toast::Instance>;
@@ -1396,22 +1899,30 @@ void ShowPremiumPromoToast(
 	(*toast) = show->showToast({
 		.text = std::move(textWithLink),
 		.filter = crl::guard(&show->session(), [=](
-				const ClickHandlerPtr &,
+				const ClickHandlerPtr &handler,
 				Qt::MouseButton button) {
-			if (button == Qt::LeftButton) {
+			if (button != Qt::LeftButton) {
+				return false;
+			}
+			const auto url = handler ? handler->url() : QString();
+			if (!url.isEmpty() && !url.startsWith(u"internal:"_q)) {
 				if (const auto strong = toast->get()) {
 					strong->hideAnimated();
 					(*toast) = nullptr;
-					if (const auto controller = resolveWindow(
-							&show->session(),
-							ChatHelpers::WindowUsage::PremiumPromo)) {
-						Settings::ShowPremium(controller, ref);
-					}
-					return true;
+				}
+				return true;
+			}
+			if (const auto strong = toast->get()) {
+				strong->hideAnimated();
+				(*toast) = nullptr;
+				if (const auto controller = resolveWindow(
+						&show->session())) {
+					Settings::ShowPremium(controller, ref);
 				}
 			}
-			return false;
+			return true;
 		}),
+		.icon = &st::settingsToastStarIcon,
 		.adaptive = true,
 		.duration = Ui::Toast::kDefaultDuration * 2,
 	});
@@ -1441,7 +1952,7 @@ not_null<Ui::RoundButton*> CreateLockedButton(
 	const auto icon = Ui::CreateChild<Ui::RpWidget>(result);
 	icon->setAttribute(Qt::WA_TransparentForMouseEvents);
 	icon->resize(st::stickersPremiumLock.size());
-	icon->paintRequest() | rpl::start_with_next([=] {
+	icon->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(icon);
 		st::stickersPremiumLock.paint(p, 0, 0, icon->width());
 	}, icon->lifetime());
@@ -1450,7 +1961,7 @@ not_null<Ui::RoundButton*> CreateLockedButton(
 		result->widthValue(),
 		label->widthValue(),
 		std::move(locked)
-	) | rpl::start_with_next([=](int outer, int inner, bool locked) {
+	) | rpl::on_next([=](int outer, int inner, bool locked) {
 		if (locked) {
 			icon->show();
 			inner += icon->width();
@@ -1476,12 +1987,10 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 	Expects(args.show || args.controller);
 
 	auto show = args.show ? std::move(args.show) : args.controller->uiShow();
-	auto resolve = [show](
-			not_null<Main::Session*> session,
-			ChatHelpers::WindowUsage usage) {
+	auto resolve = [show](not_null<::Main::Session*> session) {
 		Expects(session == &show->session());
 
-		return show->resolveWindow(usage);
+		return show->resolveWindow();
 	};
 	return CreateSubscribeButton(
 		std::move(show),
@@ -1492,8 +2001,7 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 not_null<Ui::GradientButton*> CreateSubscribeButton(
 		std::shared_ptr<::Main::SessionShow> show,
 		Fn<Window::SessionController*(
-			not_null<::Main::Session*>,
-			ChatHelpers::WindowUsage)> resolveWindow,
+			not_null<::Main::Session*>)> resolveWindow,
 		SubscribeButtonArgs &&args) {
 	const auto result = Ui::CreateChild<Ui::GradientButton>(
 		args.parent.get(),
@@ -1508,8 +2016,7 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 			computeRef = args.computeRef,
 			computeBotUrl = args.computeBotUrl] {
 		const auto window = resolveWindow(
-			&show->session(),
-			ChatHelpers::WindowUsage::PremiumPromo);
+			&show->session());
 		if (!window) {
 			return;
 		} else if (promo) {
@@ -1560,7 +2067,7 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 	rpl::combine(
 		result->widthValue(),
 		label->widthValue()
-	) | rpl::start_with_next([=](int outer, int width) {
+	) | rpl::on_next([=](int outer, int width) {
 		label->moveToLeft(
 			(outer - width) / 2,
 			st::premiumPreviewBox.button.textTop,
@@ -1571,7 +2078,7 @@ not_null<Ui::GradientButton*> CreateSubscribeButton(
 }
 
 std::vector<PremiumFeature> PremiumFeaturesOrder(
-		not_null<Main::Session*> session) {
+		not_null<::Main::Session*> session) {
 	const auto mtpOrder = session->appConfig().get<Order>(
 		"premium_promo_order",
 		FallbackOrder());
@@ -1612,6 +2119,16 @@ std::vector<PremiumFeature> PremiumFeaturesOrder(
 			return PremiumFeature::Wallpapers;
 		} else if (s == u"effects"_q) {
 			return PremiumFeature::Effects;
+		} else if (s == u"todo"_q) {
+			return PremiumFeature::TodoLists;
+		} else if (s == u"peer_colors"_q) {
+			return PremiumFeature::PeerColors;
+		} else if (s == u"gifts"_q) {
+			return PremiumFeature::Gifts;
+		} else if (s == u"no_forwards"_q) {
+			return PremiumFeature::NoForwards;
+		} else if (s == u"ai_compose"_q) {
+			return PremiumFeature::AiCompose;
 		}
 		return PremiumFeature::kCount;
 	}) | ranges::views::filter([](PremiumFeature type) {
@@ -1619,161 +2136,27 @@ std::vector<PremiumFeature> PremiumFeaturesOrder(
 	}) | ranges::to_vector;
 }
 
-void AddSummaryPremium(
-		not_null<Ui::VerticalLayout*> content,
-		not_null<Window::SessionController*> controller,
-		const QString &ref,
-		Fn<void(PremiumFeature)> buttonCallback) {
-	const auto &stDefault = st::settingsButton;
-	const auto &stLabel = st::defaultFlatLabel;
-	const auto iconSize = st::settingsPremiumIconDouble.size();
-	const auto &titlePadding = st::settingsPremiumRowTitlePadding;
-	const auto &descriptionPadding = st::settingsPremiumRowAboutPadding;
-
-	auto entryMap = EntryMap();
-	auto iconContainers = std::vector<Ui::AbstractButton*>();
-	iconContainers.reserve(int(entryMap.size()));
-
-	const auto addRow = [&](Entry &entry) {
-		const auto labelAscent = stLabel.style.font->ascent;
-		const auto button = Ui::CreateChild<Ui::SettingsButton>(
-			content.get(),
-			rpl::single(QString()));
-
-		const auto label = content->add(
-			object_ptr<Ui::FlatLabel>(
-				content,
-				std::move(entry.title) | Ui::Text::ToBold(),
-				stLabel),
-			titlePadding);
-		label->setAttribute(Qt::WA_TransparentForMouseEvents);
-		const auto description = content->add(
-			object_ptr<Ui::FlatLabel>(
-				content,
-				std::move(entry.description),
-				st::boxDividerLabel),
-			descriptionPadding);
-		description->setAttribute(Qt::WA_TransparentForMouseEvents);
-
-		if (entry.newBadge) {
-			Ui::NewBadge::AddAfterLabel(content, label);
-		}
-		const auto dummy = Ui::CreateChild<Ui::AbstractButton>(content.get());
-		dummy->setAttribute(Qt::WA_TransparentForMouseEvents);
-
-		content->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
-			dummy->resize(s.width(), iconSize.height());
-		}, dummy->lifetime());
-
-		label->geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
-			dummy->moveToLeft(0, r.y() + (r.height() - labelAscent));
-		}, dummy->lifetime());
-
-		rpl::combine(
-			content->widthValue(),
-			label->heightValue(),
-			description->heightValue()
-		) | rpl::start_with_next([=,
-			topPadding = titlePadding,
-			bottomPadding = descriptionPadding](
-				int width,
-				int topHeight,
-				int bottomHeight) {
-			button->resize(
-				width,
-				topPadding.top()
-					+ topHeight
-					+ topPadding.bottom()
-					+ bottomPadding.top()
-					+ bottomHeight
-					+ bottomPadding.bottom());
-		}, button->lifetime());
-		label->topValue(
-		) | rpl::start_with_next([=, padding = titlePadding.top()](int top) {
-			button->moveToLeft(0, top - padding);
-		}, button->lifetime());
-		const auto arrow = Ui::CreateChild<Ui::IconButton>(
-			button,
-			st::backButton);
-		arrow->setIconOverride(
-			&st::settingsPremiumArrow,
-			&st::settingsPremiumArrowOver);
-		arrow->setAttribute(Qt::WA_TransparentForMouseEvents);
-		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
-			const auto &point = st::settingsPremiumArrowShift;
-			arrow->moveToRight(
-				-point.x(),
-				point.y() + (s.height() - arrow->height()) / 2);
-		}, arrow->lifetime());
-
-		const auto section = entry.section;
-		button->setClickedCallback([=] { buttonCallback(section); });
-
-		iconContainers.push_back(dummy);
-	};
-
-	auto icons = std::vector<const style::icon *>();
-	icons.reserve(int(entryMap.size()));
-	{
-		const auto session = &controller->session();
-		const auto mtpOrder = session->appConfig().get<Order>(
-			"premium_promo_order",
-			FallbackOrder());
-		const auto processEntry = [&](Entry &entry) {
-			icons.push_back(entry.icon);
-			addRow(entry);
-		};
-
-		for (const auto &key : mtpOrder) {
-			auto it = entryMap.find(key);
-			if (it == end(entryMap)) {
-				continue;
-			}
-			processEntry(it->second);
-		}
-
-		SendScreenShow(controller, mtpOrder, ref);
-	}
-
-	content->resizeToWidth(content->height());
-
-	// Icons.
-	Assert(iconContainers.size() > 2);
-	const auto from = iconContainers.front()->y();
-	const auto to = iconContainers.back()->y() + iconSize.height();
-	auto gradient = QLinearGradient(0, 0, 0, to - from);
-	gradient.setStops(Ui::Premium::FullHeightGradientStops());
-	for (auto i = 0; i < int(icons.size()); i++) {
-		const auto &iconContainer = iconContainers[i];
-
-		const auto pointTop = iconContainer->y() - from;
-		const auto pointBottom = pointTop + iconContainer->height();
-		const auto ratioTop = pointTop / float64(to - from);
-		const auto ratioBottom = pointBottom / float64(to - from);
-
-		auto resultGradient = QLinearGradient(
-			QPointF(),
-			QPointF(0, pointBottom - pointTop));
-
-		resultGradient.setColorAt(
-			.0,
-			anim::gradient_color_at(gradient, ratioTop));
-		resultGradient.setColorAt(
-			.1,
-			anim::gradient_color_at(gradient, ratioBottom));
-
-		const auto brush = QBrush(resultGradient);
-		AddButtonIcon(
-			iconContainer,
-			stDefault,
-			{ .icon = icons[i], .backgroundBrush = brush });
-	}
-
-	Ui::AddSkip(content, descriptionPadding.bottom());
+std::unique_ptr<Ui::RpWidget> MakeEmojiStatusPreview(
+		not_null<QWidget*> parent,
+		not_null<DocumentData*> document) {
+	auto result = std::make_unique<Ui::RpWidget>(parent);
+
+	const auto raw = result.get();
+	const auto size = HistoryView::Sticker::EmojiSize();
+	const auto emoji = raw->lifetime().make_state<EmojiStatusTopBar>(
+		document,
+		[=](QRect r) { raw->update(std::move(r)); },
+		size);
+	raw->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(raw);
+		emoji->paint(p);
+	}, raw->lifetime());
+
+	raw->sizeValue() | rpl::on_next([=](QSize size) {
+		emoji->setCenter(QPointF(size.width() / 2., size.height() / 2.));
+	}, raw->lifetime());
 
+	return result;
 }
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_premium.h b/Telegram/SourceFiles/settings/sections/settings_premium.h
similarity index 84%
rename from Telegram/SourceFiles/settings/settings_premium.h
rename to Telegram/SourceFiles/settings/sections/settings_premium.h
index 65d7d18dad5180..894e07c352a941 100644
--- a/Telegram/SourceFiles/settings/settings_premium.h
+++ b/Telegram/SourceFiles/settings/sections/settings_premium.h
@@ -7,8 +7,10 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "settings/settings_common.h"
 #include "settings/settings_type.h"
 
+class DocumentData;
 enum class PremiumFeature;
 
 namespace style {
@@ -17,9 +19,12 @@ struct RoundButton;
 
 namespace ChatHelpers {
 class Show;
-enum class WindowUsage;
 } // namespace ChatHelpers
 
+namespace Data {
+struct StarGift;
+} // namespace Data
+
 namespace Ui {
 class RpWidget;
 class RoundButton;
@@ -47,11 +52,14 @@ void ShowPremium(
 void ShowGiftPremium(
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer,
-	int months,
+	int days,
 	bool me);
 void ShowEmojiStatusPremium(
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer);
+void ShowPremiumGiftPremium(
+	not_null<Window::SessionController*> controller,
+	const Data::StarGift &gift);
 
 void StartPremiumPayment(
 	not_null<Window::SessionController*> controller,
@@ -65,9 +73,7 @@ void ShowPremiumPromoToast(
 	const QString &ref);
 void ShowPremiumPromoToast(
 	std::shared_ptr<::Main::SessionShow> show,
-	Fn<Window::SessionController*(
-		not_null<::Main::Session*>,
-		ChatHelpers::WindowUsage)> resolveWindow,
+	Fn<Window::SessionController*(not_null<::Main::Session*>)> resolveWindow,
 	TextWithEntities textWithLink,
 	const QString &ref);
 
@@ -94,19 +100,14 @@ struct SubscribeButtonArgs final {
 
 [[nodiscard]] not_null<Ui::GradientButton*> CreateSubscribeButton(
 	std::shared_ptr<::Main::SessionShow> show,
-	Fn<Window::SessionController*(
-		not_null<::Main::Session*>,
-		ChatHelpers::WindowUsage)> resolveWindow,
+	Fn<Window::SessionController*(not_null<::Main::Session*>)> resolveWindow,
 	SubscribeButtonArgs &&args);
 
 [[nodiscard]] std::vector<PremiumFeature> PremiumFeaturesOrder(
 	not_null<::Main::Session*> session);
 
-void AddSummaryPremium(
-	not_null<Ui::VerticalLayout*> content,
-	not_null<Window::SessionController*> controller,
-	const QString &ref,
-	Fn<void(PremiumFeature)> buttonCallback);
+[[nodiscard]] std::unique_ptr<Ui::RpWidget> MakeEmojiStatusPreview(
+	not_null<QWidget*> parent,
+	not_null<DocumentData*> document);
 
 } // namespace Settings
-
diff --git a/Telegram/SourceFiles/settings/sections/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/sections/settings_privacy_security.cpp
new file mode 100644
index 00000000000000..2aab5fc974e7db
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_privacy_security.cpp
@@ -0,0 +1,1222 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/sections/settings_privacy_security.h"
+
+#include "settings/settings_common_session.h"
+
+#include "api/api_authorizations.h"
+#include "api/api_blocked_peers.h"
+#include "api/api_cloud_password.h"
+#include "api/api_global_privacy.h"
+#include "api/api_self_destruct.h"
+#include "api/api_sensitive_content.h"
+#include "api/api_websites.h"
+#include "apiwrap.h"
+#include "base/system_unlock.h"
+#include "base/timer_rpl.h"
+#include "boxes/edit_privacy_box.h"
+#include "boxes/passcode_box.h"
+#include "boxes/self_destruction_box.h"
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "core/core_cloud_password.h"
+#include "core/core_settings.h"
+#include "core/update_checker.h"
+#include "data/components/passkeys.h"
+#include "data/components/top_peers.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_peer_values.h"
+#include "data/data_session.h"
+#include "history/view/media/history_view_media_common.h"
+#include "ui/chat/chat_style.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_domain.h"
+#include "main/main_session.h"
+#include "platform/platform_webauthn.h"
+#include "settings/settings_builder.h"
+#include "settings/cloud_password/settings_cloud_password_email_confirm.h"
+#include "settings/cloud_password/settings_cloud_password_input.h"
+#include "settings/cloud_password/settings_cloud_password_start.h"
+#include "settings/sections/settings_main.h"
+#include "settings/sections/settings_active_sessions.h"
+#include "settings/sections/settings_blocked_peers.h"
+#include "settings/sections/settings_global_ttl.h"
+#include "settings/sections/settings_local_passcode.h"
+#include "settings/sections/settings_passkeys.h"
+#include "settings/sections/settings_premium.h"
+#include "settings/settings_privacy_controllers.h"
+#include "settings/sections/settings_websites.h"
+#include "storage/storage_domain.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/effects/premium_graphics.h"
+#include "ui/layers/generic_box.h"
+#include "ui/rect.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_session_controller.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+
+#include <QtGui/QGuiApplication>
+#include <QtSvg/QSvgRenderer>
+
+namespace Settings {
+namespace {
+
+constexpr auto kUpdateTimeout = 60 * crl::time(1000);
+
+using Privacy = Api::UserPrivacy;
+
+QString PrivacyBase(Privacy::Key key, const Privacy::Rule &rule) {
+	using Key = Privacy::Key;
+	using Option = Privacy::Option;
+	switch (key) {
+	case Key::CallsPeer2Peer:
+		switch (rule.option) {
+		case Option::Everyone:
+			return tr::lng_edit_privacy_calls_p2p_everyone(tr::now);
+		case Option::Contacts:
+			return tr::lng_edit_privacy_calls_p2p_contacts(tr::now);
+		case Option::Nobody:
+			return tr::lng_edit_privacy_calls_p2p_nobody(tr::now);
+		}
+		[[fallthrough]];
+	default:
+		switch (rule.option) {
+		case Option::Everyone:
+			return rule.never.miniapps
+				? tr::lng_edit_privacy_no_miniapps(tr::now)
+				: tr::lng_edit_privacy_everyone(tr::now);
+		case Option::Contacts:
+			return rule.always.premiums
+				? tr::lng_edit_privacy_contacts_and_premium(tr::now)
+				: rule.always.miniapps
+				? tr::lng_edit_privacy_contacts_and_miniapps(tr::now)
+				: tr::lng_edit_privacy_contacts(tr::now);
+		case Option::CloseFriends:
+			return tr::lng_edit_privacy_close_friends(tr::now);
+		case Option::Nobody:
+			return rule.always.premiums
+				? tr::lng_edit_privacy_premium(tr::now)
+				: rule.always.miniapps
+				? tr::lng_edit_privacy_miniapps(tr::now)
+				: tr::lng_edit_privacy_nobody(tr::now);
+		}
+		Unexpected("Value in Privacy::Option.");
+	}
+}
+
+rpl::producer<QString> PrivacyString(
+		not_null<::Main::Session*> session,
+		Privacy::Key key) {
+	session->api().userPrivacy().reload(key);
+	return session->api().userPrivacy().value(
+		key
+	) | rpl::map([=](const Privacy::Rule &value) {
+		auto add = QStringList();
+		if (const auto never = ExceptionUsersCount(value.never.peers)) {
+			add.push_back("-" + QString::number(never));
+		}
+		if (const auto always = ExceptionUsersCount(value.always.peers)) {
+			add.push_back("+" + QString::number(always));
+		}
+		if (!add.isEmpty()) {
+			return PrivacyBase(key, value)
+				+ " (" + add.join(", ") + ")";
+		} else {
+			return PrivacyBase(key, value);
+		}
+	});
+}
+
+void ClearPaymentInfoBoxBuilder(
+		not_null<Ui::GenericBox*> box,
+		not_null<::Main::Session*> session) {
+	box->setTitle(tr::lng_clear_payment_info_title());
+
+	const auto checkboxPadding = style::margins(
+		st::boxRowPadding.left(),
+		st::boxRowPadding.left(),
+		st::boxRowPadding.right(),
+		st::boxRowPadding.bottom());
+	const auto label = box->addRow(object_ptr<Ui::FlatLabel>(
+		box,
+		tr::lng_clear_payment_info_sure(),
+		st::boxLabel));
+	const auto shipping = box->addRow(
+		object_ptr<Ui::Checkbox>(
+			box,
+			tr::lng_clear_payment_info_shipping(tr::now),
+			true,
+			st::defaultBoxCheckbox),
+		checkboxPadding);
+	const auto payment = box->addRow(
+		object_ptr<Ui::Checkbox>(
+			box,
+			tr::lng_clear_payment_info_payment(tr::now),
+			true,
+			st::defaultBoxCheckbox),
+		checkboxPadding);
+
+	using Flags = MTPpayments_ClearSavedInfo::Flags;
+	const auto flags = box->lifetime().make_state<Flags>();
+
+	box->addButton(tr::lng_clear_payment_info_clear(), [=] {
+		using Flag = Flags::Enum;
+		*flags = (shipping->checked() ? Flag::f_info : Flag(0))
+			| (payment->checked() ? Flag::f_credentials : Flag(0));
+		delete label;
+		delete shipping;
+		delete payment;
+		box->addRow(object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_clear_payment_info_confirm(),
+			st::boxLabel));
+		box->clearButtons();
+		box->addButton(tr::lng_clear_payment_info_clear(), [=] {
+			session->api().request(MTPpayments_ClearSavedInfo(
+				MTP_flags(*flags)
+			)).send();
+			box->closeBox();
+		}, st::attentionBoxButton);
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	}, st::attentionBoxButton);
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+}
+
+} // namespace
+
+rpl::producer<QString> PrivacyButtonLabel(
+		not_null<::Main::Session*> session,
+		Privacy::Key key) {
+	return PrivacyString(session, key);
+}
+
+void AddPrivacyPremiumStar(
+		not_null<Ui::SettingsButton*> button,
+		not_null<::Main::Session*> session,
+		rpl::producer<QString> label,
+		const QMargins &padding) {
+	const auto badge = Ui::CreateChild<Ui::RpWidget>(button.get());
+	badge->showOn(Data::AmPremiumValue(session));
+	const auto sampleLeft = st::settingsColorSamplePadding.left();
+	const auto badgeLeft = padding.left() + sampleLeft;
+
+	const auto factor = style::DevicePixelRatio();
+	const auto size = Size(st::settingsButtonNoIcon.style.font->ascent);
+	auto starImage = QImage(
+		size * factor,
+		QImage::Format_ARGB32_Premultiplied);
+	starImage.setDevicePixelRatio(factor);
+	starImage.fill(Qt::transparent);
+	{
+		auto p = QPainter(&starImage);
+		auto star = QSvgRenderer(
+			Ui::Premium::ColorizedSvg(Ui::Premium::ButtonGradientStops()));
+		star.render(&p, Rect(size));
+	}
+
+	badge->resize(starImage.size() / style::DevicePixelRatio());
+	badge->paintRequest(
+	) | rpl::on_next([=, star = std::move(starImage)] {
+		auto p = QPainter(badge);
+		p.drawImage(0, 0, star);
+	}, badge->lifetime());
+
+	rpl::combine(
+		button->sizeValue(),
+		std::move(label)
+	) | rpl::on_next([=](const QSize &s, const QString &) {
+		if (s.isNull()) {
+			return;
+		}
+		badge->moveToLeft(
+			button->fullTextWidth() + badgeLeft,
+			(s.height() - badge->height()) / 2);
+	}, badge->lifetime());
+}
+
+object_ptr<Ui::BoxContent> ClearPaymentInfoBox(not_null<::Main::Session*> session) {
+	return Box(ClearPaymentInfoBoxBuilder, session);
+}
+
+void SetupSensitiveContent(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<> updateTrigger,
+		HighlightRegistry *highlights) {
+	using namespace rpl::mappers;
+
+	const auto wrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto inner = wrap->entity();
+
+	Ui::AddSkip(inner);
+	Ui::AddSubsectionTitle(inner, tr::lng_settings_sensitive_title());
+
+	const auto show = controller->uiShow();
+	const auto session = &controller->session();
+	const auto disable = inner->lifetime().make_state<rpl::event_stream<>>();
+
+	std::move(
+		updateTrigger
+	) | rpl::on_next([=] {
+		session->api().sensitiveContent().reload();
+	}, container->lifetime());
+	const auto button = inner->add(object_ptr<Button>(
+		inner,
+		tr::lng_settings_sensitive_disable_filtering(),
+		st::settingsButtonNoIcon));
+	button->toggleOn(rpl::merge(
+		session->api().sensitiveContent().enabled(),
+		disable->events() | rpl::map_to(false)
+	))->toggledChanges(
+	) | rpl::filter([=](bool toggled) {
+		return toggled != session->api().sensitiveContent().enabledCurrent();
+	}) | rpl::on_next([=](bool toggled) {
+		if (toggled && session->appConfig().ageVerifyNeeded()) {
+			disable->fire({});
+
+			HistoryView::ShowAgeVerificationRequired(
+				show,
+				session,
+				[] {});
+		} else {
+			session->api().sensitiveContent().update(toggled);
+		}
+	}, container->lifetime());
+
+	if (highlights) {
+		highlights->push_back({ u"chat/show-18-content"_q, { button } });
+	}
+
+	Ui::AddSkip(inner);
+	Ui::AddDividerText(inner, tr::lng_settings_sensitive_about());
+
+	wrap->toggleOn(session->api().sensitiveContent().canChange());
+}
+
+int ExceptionUsersCount(const std::vector<not_null<PeerData*>> &exceptions) {
+	const auto add = [](int already, not_null<PeerData*> peer) {
+		if (const auto chat = peer->asChat()) {
+			return already + chat->count;
+		} else if (const auto channel = peer->asChannel()) {
+			return already + channel->membersCount();
+		}
+		return already + 1;
+	};
+	return ranges::accumulate(exceptions, 0, add);
+}
+
+bool CheckEditCloudPassword(not_null<::Main::Session*> session) {
+	const auto current = session->api().cloudPassword().stateCurrent();
+	Assert(current.has_value());
+
+	return !current->outdatedClient;
+}
+
+object_ptr<Ui::BoxContent> EditCloudPasswordBox(not_null<::Main::Session*> session) {
+	const auto current = session->api().cloudPassword().stateCurrent();
+	Assert(current.has_value());
+
+	auto result = Box<PasscodeBox>(
+		session,
+		PasscodeBox::CloudFields::From(*current));
+	const auto box = result.data();
+
+	rpl::merge(
+		box->newPasswordSet() | rpl::to_empty,
+		box->passwordReloadNeeded()
+	) | rpl::on_next([=] {
+		session->api().cloudPassword().reload();
+	}, box->lifetime());
+
+	box->clearUnconfirmedPassword(
+	) | rpl::on_next([=] {
+		session->api().cloudPassword().clearUnconfirmedPassword();
+	}, box->lifetime());
+
+	return result;
+}
+
+void OpenFileConfirmationsBox(not_null<Ui::GenericBox*> box) {
+	box->setTitle(tr::lng_settings_file_confirmations());
+
+	const auto settings = &Core::App().settings();
+	const auto &list = settings->noWarningExtensions();
+	const auto text = QStringList(begin(list), end(list)).join(' ');
+	const auto layout = box->verticalLayout();
+	const auto extensions = box->addRow(
+		object_ptr<Ui::InputField>(
+			box,
+			st::defaultInputField,
+			Ui::InputField::Mode::MultiLine,
+			tr::lng_settings_edit_extensions(),
+			TextWithTags{ text }),
+		st::boxRowPadding + QMargins(0, 0, 0, st::settingsPrivacySkip));
+	Ui::AddDividerText(layout, tr::lng_settings_edit_extensions_about());
+	Ui::AddSkip(layout);
+	const auto ip = layout->add(object_ptr<Ui::SettingsButton>(
+		box,
+		tr::lng_settings_edit_ip_confirm(),
+		st::settingsButtonNoIcon
+	))->toggleOn(rpl::single(settings->ipRevealWarning()));
+	Ui::AddSkip(layout);
+	Ui::AddDividerText(layout, tr::lng_settings_edit_ip_confirm_about());
+
+	box->setFocusCallback([=] {
+		extensions->setFocusFast();
+	});
+
+	box->addButton(tr::lng_settings_save(), [=] {
+		const auto extensionsList = extensions->getLastText()
+			.mid(0, 10240)
+			.split(' ', Qt::SkipEmptyParts)
+			.mid(0, 1024);
+		auto extensionsSet = base::flat_set<QString>(
+			extensionsList.begin(),
+			extensionsList.end());
+		const auto ipRevealWarning = ip->toggled();
+		if (extensionsSet != settings->noWarningExtensions()
+			|| ipRevealWarning != settings->ipRevealWarning()) {
+			settings->setNoWarningExtensions(std::move(extensionsSet));
+			settings->setIpRevealWarning(ipRevealWarning);
+			Core::App().saveSettingsDelayed();
+		}
+		box->closeBox();
+
+	});
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+}
+
+void RemoveCloudPassword(not_null<Window::SessionController*> controller) {
+	const auto session = &controller->session();
+	const auto current = session->api().cloudPassword().stateCurrent();
+	Assert(current.has_value());
+
+	if (!current->hasPassword) {
+		session->api().cloudPassword().clearUnconfirmedPassword();
+		return;
+	}
+	auto fields = PasscodeBox::CloudFields::From(*current);
+	fields.turningOff = true;
+	auto box = Box<PasscodeBox>(session, fields);
+
+	rpl::merge(
+		box->newPasswordSet() | rpl::to_empty,
+		box->passwordReloadNeeded()
+	) | rpl::on_next([=] {
+		session->api().cloudPassword().reload();
+	}, box->lifetime());
+
+	box->clearUnconfirmedPassword(
+	) | rpl::on_next([=] {
+		session->api().cloudPassword().clearUnconfirmedPassword();
+	}, box->lifetime());
+
+	controller->show(std::move(box));
+}
+
+object_ptr<Ui::BoxContent> CloudPasswordAppOutdatedBox() {
+	const auto callback = [=](Fn<void()> &&close) {
+		Core::UpdateApplication();
+		close();
+	};
+	return Ui::MakeConfirmBox({
+		.text = tr::lng_passport_app_out_of_date(),
+		.confirmed = callback,
+		.confirmText = tr::lng_menu_update(),
+	});
+}
+
+not_null<Ui::SettingsButton*> AddPrivacyButton(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<QString> label,
+		IconDescriptor &&descriptor,
+		Privacy::Key key,
+		Fn<std::unique_ptr<EditPrivacyController>()> controllerFactory,
+		const style::SettingsButton *stOverride) {
+	const auto shower = Ui::CreateChild<rpl::lifetime>(container.get());
+	const auto session = &controller->session();
+	const auto button = AddButtonWithLabel(
+		container,
+		std::move(label),
+		PrivacyString(session, key),
+		stOverride ? *stOverride : st::settingsButtonNoIcon,
+		std::move(descriptor));
+	button->addClickHandler([=] {
+		*shower = session->api().userPrivacy().value(
+			key
+		) | rpl::take(
+			1
+		) | rpl::on_next(crl::guard(controller, [=](
+				const Privacy::Rule &value) {
+			controller->show(Box<EditPrivacyBox>(
+				controller,
+				controllerFactory(),
+				value));
+		}));
+	});
+	return button;
+}
+
+void SetupArchiveAndMute(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> container,
+		HighlightRegistry *highlights) {
+	using namespace rpl::mappers;
+
+	const auto wrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto inner = wrap->entity();
+
+	Ui::AddSkip(inner);
+	Ui::AddSubsectionTitle(inner, tr::lng_settings_new_unknown());
+
+	const auto session = &controller->session();
+
+	const auto privacy = &session->api().globalPrivacy();
+	privacy->reload();
+	const auto button = inner->add(object_ptr<Button>(
+		inner,
+		tr::lng_settings_auto_archive(),
+		st::settingsButtonNoIcon
+	));
+	button->toggleOn(
+		privacy->archiveAndMute()
+	)->toggledChanges(
+	) | rpl::filter([=](bool toggled) {
+		return toggled != privacy->archiveAndMuteCurrent();
+	}) | rpl::on_next([=](bool toggled) {
+		privacy->updateArchiveAndMute(toggled);
+	}, container->lifetime());
+
+	if (highlights) {
+		highlights->push_back({ u"privacy/archive_and_mute"_q, { button } });
+	}
+
+	Ui::AddSkip(inner);
+	Ui::AddDividerText(inner, tr::lng_settings_auto_archive_about());
+
+	auto shown = rpl::single(
+		false
+	) | rpl::then(session->api().globalPrivacy().showArchiveAndMute(
+	) | rpl::filter(_1) | rpl::take(1));
+	auto premium = Data::AmPremiumValue(&controller->session());
+
+	using namespace rpl::mappers;
+	wrap->toggleOn(rpl::combine(
+		std::move(shown),
+		std::move(premium),
+		_1 || _2));
+}
+
+namespace {
+
+using namespace Builder;
+
+void BuildSecuritySection(
+		SectionBuilder &builder,
+		rpl::producer<> updateTrigger) {
+	const auto controller = builder.controller();
+	const auto showOther = builder.showOther();
+	const auto session = builder.session();
+
+	builder.addSkip(st::settingsPrivacySkip);
+	builder.addSubsectionTitle({
+		.id = u"security/section"_q,
+		.title = tr::lng_settings_security(),
+		.keywords = { u"security"_q, u"password"_q, u"passcode"_q },
+	});
+
+	using State = Core::CloudPasswordState;
+	enum class PasswordState {
+		Loading,
+		On,
+		Off,
+		Unconfirmed,
+	};
+	auto passwordState = rpl::single(
+		PasswordState::Loading
+	) | rpl::then(session->api().cloudPassword().state(
+	) | rpl::map([](const State &state) {
+		return (!state.unconfirmedPattern.isEmpty())
+			? PasswordState::Unconfirmed
+			: state.hasPassword
+			? PasswordState::On
+			: PasswordState::Off;
+	})) | rpl::distinct_until_changed();
+
+	auto cloudPasswordLabel = rpl::duplicate(
+		passwordState
+	) | rpl::map([=](PasswordState state) {
+		return (state == PasswordState::Loading)
+			? tr::lng_profile_loading(tr::now)
+			: (state == PasswordState::On)
+			? tr::lng_settings_cloud_password_on(tr::now)
+			: tr::lng_settings_cloud_password_off(tr::now);
+	});
+
+	builder.addButton({
+		.id = u"security/cloud_password"_q,
+		.title = tr::lng_settings_cloud_password_start_title(),
+		.icon = { &st::menuIcon2SV },
+		.label = std::move(cloudPasswordLabel),
+		.onClick = [=, passwordState = base::duplicate(passwordState)] {
+			const auto state = rpl::variable<PasswordState>(
+				base::duplicate(passwordState)).current();
+			if (state == PasswordState::Loading) {
+				return;
+			} else if (state == PasswordState::On) {
+				showOther(CloudPasswordInputId());
+			} else if (state == PasswordState::Off) {
+				showOther(CloudPasswordStartId());
+			} else if (state == PasswordState::Unconfirmed) {
+				showOther(CloudPasswordEmailConfirmId());
+			}
+		},
+		.keywords = { u"password"_q, u"2fa"_q, u"two-factor"_q },
+	});
+
+	session->api().cloudPassword().reload();
+
+	auto ttlLabel = rpl::combine(
+		session->api().selfDestruct().periodDefaultHistoryTTL(),
+		tr::lng_settings_ttl_after_off()
+	) | rpl::map([](int ttl, const QString &none) {
+		return ttl ? Ui::FormatTTL(ttl) : none;
+	});
+
+	builder.addButton({
+		.id = u"security/ttl"_q,
+		.title = tr::lng_settings_ttl_title(),
+		.icon = { &st::menuIconTTL },
+		.label = std::move(ttlLabel),
+		.onClick = [showOther] {
+			showOther(GlobalTTLId());
+		},
+		.keywords = { u"ttl"_q, u"auto-delete"_q, u"timer"_q },
+	});
+
+	builder.add([session, updateTrigger = rpl::duplicate(updateTrigger)](const WidgetContext &ctx) mutable {
+		std::move(updateTrigger) | rpl::on_next([=] {
+			session->api().selfDestruct().reload();
+		}, ctx.container->lifetime());
+		return SectionBuilder::WidgetToAdd{};
+	});
+
+	auto passcodeHas = rpl::single(rpl::empty) | rpl::then(
+		session->domain().local().localPasscodeChanged()
+	) | rpl::map([=] {
+		return session->domain().local().hasLocalPasscode();
+	});
+	auto passcodeLabel = rpl::combine(
+		tr::lng_settings_cloud_password_on(),
+		tr::lng_settings_cloud_password_off(),
+		rpl::duplicate(passcodeHas)
+	) | rpl::map([](const QString &on, const QString &off, bool has) {
+		return has ? on : off;
+	});
+
+	builder.addButton({
+		.id = u"security/passcode"_q,
+		.title = tr::lng_settings_passcode_title(),
+		.icon = { &st::menuIconLock },
+		.label = std::move(passcodeLabel),
+		.onClick = [=, passcodeHas = std::move(passcodeHas)]() mutable {
+			if (rpl::variable<bool>(std::move(passcodeHas)).current()) {
+				showOther(LocalPasscodeCheckId());
+			} else {
+				showOther(LocalPasscodeCreateId());
+			}
+		},
+		.keywords = { u"passcode"_q, u"lock"_q, u"pin"_q },
+	});
+
+	if (session->passkeys().possible()) {
+		auto passkeysLabel = rpl::combine(
+			tr::lng_profile_loading(),
+			(rpl::single(rpl::empty_value())
+				| rpl::then(session->passkeys().requestList())) | rpl::map([=] {
+				return session->passkeys().list().size();
+			})
+		) | rpl::map([=](const QString &loading, int count) {
+			return !session->passkeys().listKnown()
+				? loading
+				: count == 1
+				? session->passkeys().list().front().name
+				: count
+				? QString::number(count)
+				: tr::lng_settings_cloud_password_off(tr::now);
+		});
+
+		auto passkeysShown = (rpl::single(rpl::empty_value())
+			| rpl::then(session->passkeys().requestList())) | rpl::map([=] {
+			return Platform::WebAuthn::IsSupported()
+				|| !session->passkeys().list().empty();
+		});
+
+		builder.addButton({
+			.id = u"security/passkeys"_q,
+			.title = tr::lng_settings_passkeys_title(),
+			.icon = { &st::menuIconPermissions },
+			.label = std::move(passkeysLabel),
+			.onClick = [=] {
+				if (!session->passkeys().listKnown()) {
+					return;
+				}
+				const auto count = session->passkeys().list().size();
+				if (count == 0) {
+					controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+						PasskeysNoneBox(box, session);
+						box->boxClosing() | rpl::on_next([=] {
+							if (session->passkeys().list().size()) {
+								controller->showSettings(PasskeysId());
+							}
+						}, box->lifetime());
+					}));
+				} else {
+					controller->showSettings(PasskeysId());
+				}
+			},
+			.keywords = { u"passkeys"_q, u"biometric"_q },
+			.shown = std::move(passkeysShown),
+		});
+	}
+
+	{
+		auto loginEmailShown = session->api().cloudPassword().state(
+		) | rpl::map([](const Core::CloudPasswordState &state) {
+			return !state.loginEmailPattern.isEmpty();
+		}) | rpl::distinct_until_changed();
+
+		auto loginEmailLabel = session->api().cloudPassword().state(
+		) | rpl::map([](const Core::CloudPasswordState &state) {
+			auto email = state.loginEmailPattern;
+			if (email.contains(' ')) {
+				return tr::lng_settings_cloud_password_off(tr::now);
+			}
+			return Ui::Text::WrapEmailPattern(
+				email.replace(QRegularExpression("\\*{4,}"), "****")).text;
+		});
+
+		builder.addButton({
+			.id = u"security/login_email"_q,
+			.title = tr::lng_settings_cloud_login_email_section_title(),
+			.st = &st::settingsButtonRightLabelSpoiler,
+			.icon = { &st::menuIconRecoveryEmail },
+			.label = std::move(loginEmailLabel),
+			.onClick = [=] {
+				UrlClickHandler::Open(u"tg://settings/login_email"_q);
+			},
+			.keywords = { u"email"_q, u"login"_q },
+			.shown = std::move(loginEmailShown),
+		});
+	}
+
+	auto blockedCount = rpl::combine(
+		session->api().blockedPeers().slice(
+		) | rpl::map([](const Api::BlockedPeers::Slice &data) {
+			return data.total;
+		}),
+		tr::lng_settings_no_blocked_users()
+	) | rpl::map([](int count, const QString &none) {
+		return count ? QString::number(count) : none;
+	});
+
+	builder.addButton({
+		.id = u"security/blocked"_q,
+		.title = tr::lng_settings_blocked_users(),
+		.icon = { &st::menuIconBlock },
+		.label = std::move(blockedCount),
+		.onClick = [=] {
+			showOther(BlockedPeersId());
+		},
+		.keywords = { u"blocked"_q, u"ban"_q },
+	});
+
+	builder.add([session, updateTrigger = rpl::duplicate(updateTrigger)](const WidgetContext &ctx) mutable {
+		std::move(updateTrigger) | rpl::on_next([=] {
+			session->api().blockedPeers().reload();
+		}, ctx.container->lifetime());
+		return SectionBuilder::WidgetToAdd{};
+	});
+
+	auto websitesCount = session->api().websites().totalValue();
+	auto websitesShown = rpl::duplicate(websitesCount) | rpl::map(
+		rpl::mappers::_1 > 0);
+	auto websitesLabel = rpl::duplicate(
+		websitesCount
+	) | rpl::filter(rpl::mappers::_1 > 0) | rpl::map([](int count) {
+		return QString::number(count);
+	});
+
+	builder.addButton({
+		.id = u"security/websites"_q,
+		.title = tr::lng_settings_logged_in(),
+		.icon = { &st::menuIconIpAddress },
+		.label = std::move(websitesLabel),
+		.onClick = [=] {
+			showOther(WebsitesId());
+		},
+		.keywords = { u"websites"_q, u"bots"_q, u"logged"_q },
+		.shown = std::move(websitesShown),
+	});
+
+	builder.add([session, updateTrigger = rpl::duplicate(updateTrigger)](const WidgetContext &ctx) mutable {
+		std::move(updateTrigger) | rpl::on_next([=] {
+			session->api().websites().reload();
+		}, ctx.container->lifetime());
+		return SectionBuilder::WidgetToAdd{};
+	});
+
+	auto sessionsCount = session->api().authorizations().totalValue(
+	) | rpl::map([](int count) {
+		return count ? QString::number(count) : QString();
+	});
+
+	builder.addButton({
+		.id = u"security/sessions"_q,
+		.title = tr::lng_settings_show_sessions(),
+		.icon = { &st::menuIconDevices },
+		.label = std::move(sessionsCount),
+		.onClick = [=] {
+			showOther(SessionsId());
+		},
+		.keywords = { u"sessions"_q, u"devices"_q, u"active"_q },
+	});
+
+	builder.add([session, updateTrigger = std::move(updateTrigger)](const WidgetContext &ctx) mutable {
+		std::move(updateTrigger) | rpl::on_next([=] {
+			session->api().authorizations().reload();
+		}, ctx.container->lifetime());
+		return SectionBuilder::WidgetToAdd{};
+	});
+
+	builder.addSkip();
+	builder.addDividerText(tr::lng_settings_sessions_about());
+}
+
+void BuildPrivacySection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto session = builder.session();
+
+	builder.addSkip(st::settingsPrivacySkip);
+	builder.addSubsectionTitle({
+		.id = u"privacy/section"_q,
+		.title = tr::lng_settings_privacy_title(),
+		.keywords = { u"privacy"_q, u"visibility"_q },
+	});
+
+	using Key = Privacy::Key;
+
+	builder.addPrivacyButton({
+		.id = u"privacy/phone_number"_q,
+		.title = tr::lng_settings_phone_number_privacy(),
+		.key = Key::PhoneNumber,
+		.controllerFactory = [=] {
+			return std::make_unique<PhoneNumberPrivacyController>(controller);
+		},
+		.keywords = { u"phone"_q, u"number"_q },
+	});
+
+	builder.addPrivacyButton({
+		.id = u"privacy/last_seen"_q,
+		.title = tr::lng_settings_last_seen(),
+		.key = Key::LastSeen,
+		.controllerFactory = [=] {
+			return std::make_unique<LastSeenPrivacyController>(session);
+		},
+		.keywords = { u"last seen"_q, u"online"_q },
+	});
+
+	builder.addPrivacyButton({
+		.id = u"privacy/profile_photo"_q,
+		.title = tr::lng_settings_profile_photo_privacy(),
+		.key = Key::ProfilePhoto,
+		.controllerFactory = [] {
+			return std::make_unique<ProfilePhotoPrivacyController>();
+		},
+		.keywords = { u"photo"_q, u"avatar"_q },
+	});
+
+	builder.addPrivacyButton({
+		.id = u"privacy/forwards"_q,
+		.title = tr::lng_settings_forwards_privacy(),
+		.key = Key::Forwards,
+		.controllerFactory = [=] {
+			return std::make_unique<ForwardsPrivacyController>(controller);
+		},
+		.keywords = { u"forwards"_q, u"link"_q },
+	});
+
+	builder.addPrivacyButton({
+		.id = u"privacy/calls"_q,
+		.title = tr::lng_settings_calls(),
+		.key = Key::Calls,
+		.controllerFactory = [] {
+			return std::make_unique<CallsPrivacyController>();
+		},
+		.keywords = { u"calls"_q, u"voice"_q },
+	});
+
+	builder.addPrivacyButton({
+		.id = u"privacy/voices"_q,
+		.title = tr::lng_settings_voices_privacy(),
+		.key = Key::Voices,
+		.controllerFactory = [=] {
+			return std::make_unique<VoicesPrivacyController>(session);
+		},
+		.premium = true,
+		.keywords = { u"voice"_q, u"messages"_q },
+	});
+
+	const auto privacy = &session->api().globalPrivacy();
+	auto messagesLabel = rpl::combine(
+		privacy->newRequirePremium(),
+		privacy->newChargeStars()
+	) | rpl::map([=](bool requirePremium, int chargeStars) {
+		return chargeStars
+			? tr::lng_edit_privacy_paid()
+			: requirePremium
+			? tr::lng_edit_privacy_contacts_and_premium()
+			: tr::lng_edit_privacy_everyone();
+	}) | rpl::flatten_latest();
+
+	const auto messagesPremium = !session->appConfig().newRequirePremiumFree();
+	const auto messagesButton = builder.addButton({
+		.id = u"privacy/messages"_q,
+		.title = tr::lng_settings_messages_privacy(),
+		.st = &st::settingsButtonNoIcon,
+		.label = rpl::duplicate(messagesLabel),
+		.onClick = [=] {
+			controller->show(Box(EditMessagesPrivacyBox, controller, QString()));
+		},
+		.keywords = { u"messages"_q, u"new"_q, u"unknown"_q },
+	});
+	if (messagesPremium && messagesButton) {
+		AddPrivacyPremiumStar(
+			messagesButton,
+			session,
+			std::move(messagesLabel),
+			st::settingsButtonNoIcon.padding);
+	}
+
+	builder.addPrivacyButton({
+		.id = u"privacy/birthday"_q,
+		.title = tr::lng_settings_birthday_privacy(),
+		.key = Key::Birthday,
+		.controllerFactory = [] {
+			return std::make_unique<BirthdayPrivacyController>();
+		},
+		.keywords = { u"birthday"_q, u"age"_q },
+	});
+
+	builder.addPrivacyButton({
+		.id = u"privacy/gifts"_q,
+		.title = tr::lng_settings_gifts_privacy(),
+		.key = Key::GiftsAutoSave,
+		.controllerFactory = [] {
+			return std::make_unique<GiftsAutoSavePrivacyController>();
+		},
+		.keywords = { u"gifts"_q },
+	});
+
+	builder.addPrivacyButton({
+		.id = u"privacy/bio"_q,
+		.title = tr::lng_settings_bio_privacy(),
+		.key = Key::About,
+		.controllerFactory = [] {
+			return std::make_unique<AboutPrivacyController>();
+		},
+		.keywords = { u"bio"_q, u"about"_q },
+	});
+
+	builder.addPrivacyButton({
+		.id = u"privacy/saved_music"_q,
+		.title = tr::lng_settings_saved_music_privacy(),
+		.key = Key::SavedMusic,
+		.controllerFactory = [] {
+			return std::make_unique<SavedMusicPrivacyController>();
+		},
+		.keywords = { u"music"_q, u"saved"_q },
+	});
+
+	builder.addPrivacyButton({
+		.id = u"privacy/groups"_q,
+		.title = tr::lng_settings_groups_invite(),
+		.key = Key::Invites,
+		.controllerFactory = [] {
+			return std::make_unique<GroupsInvitePrivacyController>();
+		},
+		.keywords = { u"groups"_q, u"invite"_q },
+	});
+
+	session->api().userPrivacy().reload(Privacy::Key::AddedByPhone);
+
+	builder.addSkip(st::settingsPrivacySecurityPadding);
+	builder.addDivider();
+}
+
+void BuildArchiveAndMuteSection(SectionBuilder &builder) {
+	const auto session = builder.session();
+	const auto privacy = &session->api().globalPrivacy();
+
+	privacy->reload();
+
+	auto shown = rpl::single(
+		false
+	) | rpl::then(privacy->showArchiveAndMute(
+	) | rpl::filter(rpl::mappers::_1) | rpl::take(1));
+	auto premium = Data::AmPremiumValue(session);
+
+	builder.scope([&] {
+		builder.addSkip();
+		builder.addSubsectionTitle({
+			.id = u"privacy/new_unknown"_q,
+			.title = tr::lng_settings_new_unknown(),
+			.keywords = { u"unknown"_q, u"archive"_q, u"mute"_q },
+		});
+
+		const auto toggle = builder.addButton({
+			.id = u"privacy/archive_and_mute"_q,
+			.title = tr::lng_settings_auto_archive(),
+			.st = &st::settingsButtonNoIcon,
+			.toggled = privacy->archiveAndMute(),
+			.keywords = { u"archive"_q, u"mute"_q, u"unknown"_q },
+		});
+
+		if (toggle) {
+			toggle->toggledChanges(
+			) | rpl::filter([=](bool toggled) {
+				return toggled != privacy->archiveAndMuteCurrent();
+			}) | rpl::on_next([=](bool toggled) {
+				privacy->updateArchiveAndMute(toggled);
+			}, toggle->lifetime());
+		}
+
+		builder.addSkip();
+		builder.addDividerText(tr::lng_settings_auto_archive_about());
+	}, rpl::combine(
+		std::move(shown),
+		std::move(premium),
+		rpl::mappers::_1 || rpl::mappers::_2));
+}
+
+void BuildBotsAndWebsitesSection(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto session = builder.session();
+
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"privacy/bots"_q,
+		.title = tr::lng_settings_security_bots(),
+		.keywords = { u"bots"_q, u"payment"_q, u"websites"_q },
+	});
+
+	builder.addButton({
+		.id = u"privacy/bots_payment"_q,
+		.title = tr::lng_settings_clear_payment_info(),
+		.st = &st::settingsButtonNoIcon,
+		.onClick = [=] {
+			controller->show(ClearPaymentInfoBox(session));
+		},
+		.keywords = { u"payment"_q, u"bots"_q, u"clear"_q },
+	});
+
+	builder.addSkip();
+	builder.addDivider();
+}
+
+void BuildTopPeersSection(SectionBuilder &builder) {
+	const auto session = builder.session();
+
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"privacy/top_peers"_q,
+		.title = tr::lng_settings_top_peers_title(),
+		.keywords = { u"suggest"_q, u"contacts"_q, u"frequent"_q },
+	});
+
+	const auto toggle = builder.addButton({
+		.id = u"privacy/top_peers_toggle"_q,
+		.title = tr::lng_settings_top_peers_suggest(),
+		.st = &st::settingsButtonNoIcon,
+		.toggled = rpl::single(
+			rpl::empty
+		) | rpl::then(
+			session->topPeers().updates()
+		) | rpl::map([=] {
+			return !session->topPeers().disabled();
+		}),
+		.keywords = { u"suggest"_q, u"contacts"_q },
+	});
+
+	if (toggle) {
+		toggle->toggledChanges(
+		) | rpl::filter([=](bool enabled) {
+			return enabled == session->topPeers().disabled();
+		}) | rpl::on_next([=](bool enabled) {
+			session->topPeers().toggleDisabled(!enabled);
+		}, toggle->lifetime());
+	}
+
+	builder.addSkip();
+	builder.addDividerText(tr::lng_settings_top_peers_about());
+}
+
+void BuildSelfDestructionSection(
+		SectionBuilder &builder,
+		rpl::producer<> updateTrigger) {
+	const auto controller = builder.controller();
+	const auto session = builder.session();
+
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"privacy/self_destruct"_q,
+		.title = tr::lng_settings_destroy_title(),
+		.keywords = { u"delete"_q, u"destroy"_q, u"inactive"_q, u"account"_q },
+	});
+
+	builder.add([session, updateTrigger = std::move(updateTrigger)](const WidgetContext &ctx) mutable {
+		std::move(updateTrigger) | rpl::on_next([=] {
+			session->api().selfDestruct().reload();
+		}, ctx.container->lifetime());
+		return SectionBuilder::WidgetToAdd{};
+	});
+
+	auto label = session->api().selfDestruct().daysAccountTTL(
+	) | rpl::map(SelfDestructionBox::DaysLabel);
+
+	builder.addButton({
+		.id = u"privacy/self_destruct_button"_q,
+		.title = tr::lng_settings_destroy_if(),
+		.st = &st::settingsButtonNoIcon,
+		.label = std::move(label),
+		.onClick = [=] {
+			controller->show(Box<SelfDestructionBox>(
+				session,
+				SelfDestructionBox::Type::Account,
+				session->api().selfDestruct().daysAccountTTL()));
+		},
+		.keywords = { u"delete"_q, u"destroy"_q, u"inactive"_q },
+	});
+
+	builder.addSkip();
+}
+
+void BuildConfirmationExtensions(SectionBuilder &builder) {
+	const auto controller = builder.controller();
+	const auto hasExtensions = !Core::App().settings().noWarningExtensions().empty()
+		|| !Core::App().settings().ipRevealWarning();
+
+	if (!hasExtensions) {
+		return;
+	}
+
+	builder.addSkip();
+	builder.addSubsectionTitle({
+		.id = u"privacy/file_confirmations"_q,
+		.title = tr::lng_settings_file_confirmations(),
+		.keywords = { u"extensions"_q, u"files"_q, u"confirmations"_q },
+	});
+
+	builder.addButton({
+		.id = u"privacy/file_confirmations_button"_q,
+		.title = tr::lng_settings_edit_extensions(),
+		.st = &st::settingsButtonNoIcon,
+		.onClick = [=] {
+			controller->show(Box(OpenFileConfirmationsBox));
+		},
+		.keywords = { u"extensions"_q, u"files"_q, u"confirmations"_q },
+	});
+
+	builder.addSkip();
+	builder.addDividerText(tr::lng_settings_edit_extensions_about());
+}
+
+void BuildPrivacySecuritySectionContent(SectionBuilder &builder) {
+	auto updateOnTick = rpl::single(
+	) | rpl::then(base::timer_each(kUpdateTimeout));
+	const auto trigger = [&] {
+		return rpl::duplicate(updateOnTick);
+	};
+
+	BuildSecuritySection(builder, trigger());
+	BuildPrivacySection(builder);
+	BuildArchiveAndMuteSection(builder);
+	BuildBotsAndWebsitesSection(builder);
+	BuildConfirmationExtensions(builder);
+	BuildTopPeersSection(builder);
+	BuildSelfDestructionSection(builder, trigger());
+}
+
+class PrivacySecurity : public Section<PrivacySecurity> {
+public:
+	PrivacySecurity(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+private:
+	void setupContent();
+
+};
+
+const auto kMeta = BuildHelper({
+	.id = PrivacySecurity::Id(),
+	.parentId = MainId(),
+	.title = &tr::lng_settings_section_privacy,
+	.icon = &st::menuIconLock,
+}, [](SectionBuilder &builder) {
+	BuildPrivacySecuritySectionContent(builder);
+});
+
+const SectionBuildMethod kPrivacySecuritySection = kMeta.build;
+
+PrivacySecurity::PrivacySecurity(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: Section(parent, controller) {
+	setupContent();
+	[[maybe_unused]] auto preload = base::SystemUnlockStatus();
+}
+
+rpl::producer<QString> PrivacySecurity::title() {
+	return tr::lng_settings_section_privacy();
+}
+
+void PrivacySecurity::setupContent() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+	build(content, kPrivacySecuritySection);
+	Ui::ResizeFitChild(this, content);
+}
+
+} // namespace
+
+Type PrivacySecurityId() {
+	return PrivacySecurity::Id();
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.h b/Telegram/SourceFiles/settings/sections/settings_privacy_security.h
similarity index 68%
rename from Telegram/SourceFiles/settings/settings_privacy_security.h
rename to Telegram/SourceFiles/settings/sections/settings_privacy_security.h
index 21933c05132a76..10b799c02aaf12 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.h
+++ b/Telegram/SourceFiles/settings/sections/settings_privacy_security.h
@@ -7,27 +7,28 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-#include "settings/settings_common_session.h"
+#include "settings/settings_common.h"
 #include "api/api_user_privacy.h"
 
 class EditPrivacyController;
 
 namespace Ui {
 class BoxContent;
+class GenericBox;
 } // namespace Ui
 
 namespace Settings {
 
-void SetupSensitiveContent(
-	not_null<Window::SessionController*> controller,
-	not_null<Ui::VerticalLayout*> container,
-	rpl::producer<> updateTrigger);
+[[nodiscard]] Type PrivacySecurityId();
 
 int ExceptionUsersCount(const std::vector<not_null<PeerData*>> &exceptions);
 
 bool CheckEditCloudPassword(not_null<::Main::Session*> session);
 object_ptr<Ui::BoxContent> EditCloudPasswordBox(
 	not_null<::Main::Session*> session);
+object_ptr<Ui::BoxContent> ClearPaymentInfoBox(
+	not_null<::Main::Session*> session);
+void OpenFileConfirmationsBox(not_null<Ui::GenericBox*> box);
 void RemoveCloudPassword(not_null<Window::SessionController*> session);
 object_ptr<Ui::BoxContent> CloudPasswordAppOutdatedBox();
 
@@ -40,21 +41,19 @@ not_null<Ui::SettingsButton*> AddPrivacyButton(
 	Fn<std::unique_ptr<EditPrivacyController>()> controllerFactory,
 	const style::SettingsButton *stOverride = nullptr);
 
-void SetupArchiveAndMute(
-	not_null<Window::SessionController*> controller,
-	not_null<Ui::VerticalLayout*> container);
-
-class PrivacySecurity : public Section<PrivacySecurity> {
-public:
-	PrivacySecurity(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller);
+[[nodiscard]] rpl::producer<QString> PrivacyButtonLabel(
+	not_null<::Main::Session*> session,
+	Api::UserPrivacy::Key key);
 
-	[[nodiscard]] rpl::producer<QString> title() override;
-
-private:
-	void setupContent(not_null<Window::SessionController*> controller);
+void AddPrivacyPremiumStar(
+	not_null<Ui::SettingsButton*> button,
+	not_null<::Main::Session*> session,
+	rpl::producer<QString> label,
+	const QMargins &padding);
 
-};
+void SetupArchiveAndMute(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	HighlightRegistry *highlights = nullptr);
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_shortcuts.cpp b/Telegram/SourceFiles/settings/sections/settings_shortcuts.cpp
new file mode 100644
index 00000000000000..10debef78db8b5
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_shortcuts.cpp
@@ -0,0 +1,640 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/sections/settings_shortcuts.h"
+
+#include "base/event_filter.h"
+#include "core/application.h"
+#include "core/shortcuts.h"
+#include "lang/lang_keys.h"
+#include "settings/sections/settings_chat.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common_session.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/vertical_list.h"
+#include "window/window_session_controller.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+
+#include <private/qkeymapper_p.h>
+
+namespace Settings {
+namespace {
+
+namespace S = ::Shortcuts;
+
+using namespace Builder;
+
+struct Labeled {
+	S::Command command = {};
+	rpl::producer<QString> label;
+};
+
+[[nodiscard]] std::vector<Labeled> Entries() {
+	using C = S::Command;
+	const auto pinned = [](int index) {
+		return tr::lng_shortcuts_chat_pinned_n(
+			lt_index,
+			rpl::single(QString::number(index)));
+	};
+	const auto account = [](int index) {
+		return tr::lng_shortcuts_show_account_n(
+			lt_index,
+			rpl::single(QString::number(index)));
+	};
+	const auto folder = [](int index) {
+		return tr::lng_shortcuts_show_folder_n(
+			lt_index,
+			rpl::single(QString::number(index)));
+	};
+	const auto separator = Labeled{ C(), nullptr };
+	return {
+		{ C::Close, tr::lng_shortcuts_close() },
+		{ C::Lock, tr::lng_shortcuts_lock() },
+		{ C::Minimize, tr::lng_shortcuts_minimize() },
+		{ C::Quit, tr::lng_shortcuts_quit() },
+		separator,
+		{ C::Search, tr::lng_shortcuts_search() },
+		separator,
+		{ C::ChatPrevious, tr::lng_shortcuts_chat_previous() },
+		{ C::ChatNext, tr::lng_shortcuts_chat_next() },
+		{ C::ChatFirst, tr::lng_shortcuts_chat_first() },
+		{ C::ChatLast, tr::lng_shortcuts_chat_last() },
+		{ C::ChatSelf, tr::lng_shortcuts_chat_self() },
+		separator,
+		{ C::ChatPinned1, pinned(1) },
+		{ C::ChatPinned2, pinned(2) },
+		{ C::ChatPinned3, pinned(3) },
+		{ C::ChatPinned4, pinned(4) },
+		{ C::ChatPinned5, pinned(5) },
+		{ C::ChatPinned6, pinned(6) },
+		{ C::ChatPinned7, pinned(7) },
+		{ C::ChatPinned8, pinned(8) },
+		separator,
+		{ C::ShowAccount1, account(1) },
+		{ C::ShowAccount2, account(2) },
+		{ C::ShowAccount3, account(3) },
+		{ C::ShowAccount4, account(4) },
+		{ C::ShowAccount5, account(5) },
+		{ C::ShowAccount6, account(6) },
+		separator,
+		{ C::ShowAllChats, tr::lng_shortcuts_show_all_chats() },
+		{ C::ShowFolder1, folder(1) },
+		{ C::ShowFolder2, folder(2) },
+		{ C::ShowFolder3, folder(3) },
+		{ C::ShowFolder4, folder(4) },
+		{ C::ShowFolder5, folder(5) },
+		{ C::ShowFolder6, folder(6) },
+		{ C::ShowFolderLast, tr::lng_shortcuts_show_folder_last() },
+		{ C::FolderNext, tr::lng_shortcuts_folder_next() },
+		{ C::FolderPrevious, tr::lng_shortcuts_folder_previous() },
+		{ C::ShowArchive, tr::lng_shortcuts_archive() },
+		{ C::ShowContacts, tr::lng_shortcuts_contacts() },
+		separator,
+		{ C::ReadChat, tr::lng_shortcuts_read_chat() },
+		{ C::ArchiveChat, tr::lng_shortcuts_archive_chat() },
+		{ C::ShowScheduled, tr::lng_shortcuts_scheduled() },
+		{ C::ShowChatMenu, tr::lng_shortcuts_show_chat_menu() },
+		{ C::ShowChatPreview, tr::lng_shortcuts_show_chat_preview() },
+		separator,
+		{ C::JustSendMessage, tr::lng_shortcuts_just_send() },
+		{ C::SendSilentMessage, tr::lng_shortcuts_silent_send() },
+		{ C::ScheduleMessage, tr::lng_shortcuts_schedule() },
+		separator,
+		{ C::ComposeAiApplyInPlace, tr::lng_shortcuts_ai_compose_apply() },
+		{ C::ToggleWebPagePreview, tr::lng_shortcuts_toggle_link_preview() },
+		separator,
+		{ C::RecordVoice, tr::lng_shortcuts_record_voice_message() },
+		{ C::RecordRound, tr::lng_shortcuts_record_round_message() },
+		separator,
+		{ C::ShowAdminLog, tr::lng_shortcuts_admin_log() },
+		separator,
+		{ C::MediaViewerFullscreen, tr::lng_shortcuts_media_fullscreen() },
+		separator,
+		{ C::MediaPlay, tr::lng_shortcuts_media_play() },
+		{ C::MediaPause, tr::lng_shortcuts_media_pause() },
+		{ C::MediaPlayPause, tr::lng_shortcuts_media_play_pause() },
+		{ C::MediaStop, tr::lng_shortcuts_media_stop() },
+		{ C::MediaPrevious, tr::lng_shortcuts_media_previous() },
+		{ C::MediaNext, tr::lng_shortcuts_media_next() },
+	};
+}
+
+[[nodiscard]] QString ToString(const QKeySequence &key) {
+	auto result = key.toString();
+#ifdef Q_OS_MAC
+	result = result.replace(u"Ctrl+"_q, QString() + QChar(0x2318));
+	result = result.replace(u"Meta+"_q, QString() + QChar(0x2303));
+	result = result.replace(u"Alt+"_q, QString() + QChar(0x2325));
+	result = result.replace(u"Shift+"_q, QString() + QChar(0x21E7));
+#endif // Q_OS_MAC
+	return result;
+}
+
+struct SetupShortcutsResult {
+	Fn<void()> save;
+	QPointer<Ui::RpWidget> resetButton;
+};
+
+[[nodiscard]] SetupShortcutsResult SetupShortcutsContent(
+		not_null<Window::SessionController*> controller,
+		not_null<Ui::VerticalLayout*> content,
+		HighlightRegistry *highlights) {
+	const auto &defaults = S::KeysDefaults();
+	const auto &currents = S::KeysCurrents();
+
+	struct Button {
+		S::Command command;
+		std::unique_ptr<Ui::SettingsButton> widget;
+		rpl::variable<QKeySequence> key;
+		rpl::variable<bool> removed;
+	};
+	struct Entry {
+		S::Command command;
+		rpl::producer<QString> label;
+		std::vector<QKeySequence> original;
+		std::vector<QKeySequence> now;
+		Ui::VerticalLayout *wrap = nullptr;
+		std::vector<std::unique_ptr<Button>> buttons;
+	};
+	struct State {
+		std::vector<Entry> entries;
+		rpl::variable<bool> modified;
+		rpl::variable<Button*> recording;
+		rpl::variable<QKeySequence> lastKey;
+		Fn<void(S::Command command)> showMenuFor;
+	};
+	const auto state = content->lifetime().make_state<State>();
+	const auto labeled = Entries();
+	auto &entries = state->entries = ranges::views::all(
+		labeled
+	) | ranges::views::transform([](Labeled labeled) {
+		return Entry{ labeled.command, std::move(labeled.label) };
+	}) | ranges::to_vector;
+
+	for (const auto &[keys, commands] : defaults) {
+		for (const auto command : commands) {
+			const auto i = ranges::find(entries, command, &Entry::command);
+			if (i != end(entries)) {
+				i->original.push_back(keys);
+			}
+		}
+	}
+
+	for (const auto &[keys, commands] : currents) {
+		for (const auto command : commands) {
+			const auto i = ranges::find(entries, command, &Entry::command);
+			if (i != end(entries)) {
+				i->now.push_back(keys);
+			}
+		}
+	}
+
+	const auto checkModified = [=] {
+		for (const auto &entry : state->entries) {
+			auto original = entry.original;
+			auto now = entry.now;
+			ranges::sort(original);
+			ranges::sort(now);
+			if (original != now) {
+				state->modified = true;
+				return;
+			}
+		}
+		state->modified = false;
+	};
+	checkModified();
+
+	const auto menu = std::make_shared<base::weak_qptr<Ui::PopupMenu>>();
+	const auto fill = [=](Entry &entry) {
+		auto index = 0;
+		if (entry.original.empty()) {
+			entry.original.push_back(QKeySequence());
+		}
+		if (entry.now.empty()) {
+			entry.now.push_back(QKeySequence());
+		}
+		for (const auto &now : entry.now) {
+			if (index < entry.buttons.size()) {
+				entry.buttons[index]->key = now;
+				entry.buttons[index]->removed = false;
+			} else {
+				auto button = std::make_unique<Button>(Button{
+					.command = entry.command,
+					.key = now,
+				});
+				const auto raw = button.get();
+				const auto widget = entry.wrap->add(
+					object_ptr<Ui::SettingsButton>(
+						entry.wrap,
+						rpl::duplicate(entry.label),
+						st::settingsButtonNoIcon));
+				if (highlights && index == 0) {
+					const auto id = ShortcutsHighlightId(entry.command);
+					if (!id.isEmpty()) {
+						highlights->push_back({
+							id,
+							{ widget, { .rippleShape = true } },
+						});
+					}
+				}
+				const auto keys = Ui::CreateChild<Ui::FlatLabel>(
+					widget,
+					st::settingsButtonNoIcon.rightLabel);
+				keys->show();
+				rpl::combine(
+					widget->widthValue(),
+					rpl::duplicate(entry.label),
+					button->key.value(),
+					state->recording.value(),
+					button->removed.value()
+				) | rpl::on_next([=](
+						int width,
+						const QString &button,
+						const QKeySequence &key,
+						Button *recording,
+						bool removed) {
+					const auto &st = st::settingsButtonNoIcon;
+					const auto available = width
+						- st.padding.left()
+						- st.padding.right()
+						- st.style.font->width(button)
+						- st::settingsButtonRightSkip;
+					keys->setMarkedText((recording == raw)
+						? tr::italic(
+							tr::lng_shortcuts_recording(tr::now))
+						: key.isEmpty()
+						? TextWithEntities()
+						: removed
+						? Ui::Text::Wrapped(
+							TextWithEntities{ ToString(key) },
+							EntityType::StrikeOut)
+						: TextWithEntities{ ToString(key) });
+					keys->setTextColorOverride((recording == raw)
+						? st::boxTextFgGood->c
+						: removed
+						? st::attentionButtonFg->c
+						: std::optional<QColor>());
+					keys->resizeToNaturalWidth(available);
+					keys->moveToRight(
+						st::settingsButtonRightSkip,
+						st.padding.top());
+				}, keys->lifetime());
+				keys->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+				widget->setAcceptBoth(true);
+				widget->clicks(
+				) | rpl::on_next([=](Qt::MouseButton button) {
+					if (const auto strong = *menu) {
+						strong->hideMenu();
+						return;
+					}
+					if (button == Qt::RightButton) {
+						state->showMenuFor(raw->command);
+					} else {
+						S::Pause();
+						state->recording = raw;
+					}
+				}, widget->lifetime());
+
+				button->widget.reset(widget);
+				entry.buttons.push_back(std::move(button));
+			}
+			++index;
+		}
+		while (entry.wrap->count() > index) {
+			entry.buttons.pop_back();
+		}
+	};
+	state->showMenuFor = [=](S::Command command) {
+		*menu = Ui::CreateChild<Ui::PopupMenu>(
+			content,
+			st::popupMenuWithIcons);
+		(*menu)->addAction(tr::lng_shortcuts_add_another(tr::now), [=] {
+			const auto i = ranges::find(
+				state->entries,
+				command,
+				&Entry::command);
+			if (i != end(state->entries)) {
+				S::Pause();
+				const auto j = ranges::find(i->now, QKeySequence());
+				if (j != end(i->now)) {
+					state->recording = i->buttons[j - begin(i->now)].get();
+				} else {
+					i->now.push_back(QKeySequence());
+					fill(*i);
+					state->recording = i->buttons.back().get();
+				}
+			}
+		}, &st::menuIconTopics);
+		(*menu)->popup(QCursor::pos());
+	};
+
+	const auto stopRecording = [=](std::optional<QKeySequence> result = {}) {
+		const auto button = state->recording.current();
+		if (!button) {
+			return;
+		}
+		state->recording = nullptr;
+		InvokeQueued(content, [=] {
+			InvokeQueued(content, [=] {
+				S::Unpause();
+			});
+		});
+		auto was = button->key.current();
+		const auto now = result.value_or(was);
+		if (now == was) {
+			if (!now.isEmpty() && (!result || !button->removed.current())) {
+				return;
+			}
+			was = QKeySequence();
+			button->removed = false;
+		}
+
+		auto changed = false;
+		const auto command = button->command;
+		for (auto &entry : state->entries) {
+			const auto i = ranges::find(
+				entry.buttons,
+				button,
+				&std::unique_ptr<Button>::get);
+			if (i != end(entry.buttons)) {
+				const auto index = i - begin(entry.buttons);
+				if (now.isEmpty()) {
+					entry.now.erase(begin(entry.now) + index);
+				} else {
+					const auto i = ranges::find(entry.now, now);
+					if (i == end(entry.now)) {
+						entry.now[index] = now;
+					} else if (i != begin(entry.now) + index) {
+						std::swap(entry.now[index], *i);
+						entry.now.erase(i);
+					}
+				}
+				fill(entry);
+				checkModified();
+			} else if (now != was) {
+				const auto i = now.isEmpty()
+					? end(entry.now)
+					: ranges::find(entry.now, now);
+				if (i != end(entry.now)) {
+					entry.buttons[i - begin(entry.now)]->removed = true;
+				}
+				const auto j = was.isEmpty()
+					? end(entry.now)
+					: ranges::find(entry.now, was);
+				if (j != end(entry.now)) {
+					entry.buttons[j - begin(entry.now)]->removed = false;
+					S::Change(was, now, command, entry.command);
+					was = QKeySequence();
+					changed = true;
+				}
+			}
+		}
+		if (!changed) {
+			S::Change(was, now, command);
+		}
+	};
+	base::install_event_filter(content, qApp, [=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type == QEvent::ShortcutOverride && state->recording.current()) {
+			if (!content->window()->isActiveWindow()) {
+				return base::EventFilterResult::Continue;
+			}
+			const auto key = static_cast<QKeyEvent*>(e.get());
+			const auto m = key->modifiers();
+			const auto k = key->key();
+			const auto clear = !m
+				&& (k == Qt::Key_Backspace || k == Qt::Key_Delete);
+			if (k == Qt::Key_Control
+				|| k == Qt::Key_Shift
+				|| k == Qt::Key_Alt
+				|| k == Qt::Key_Meta) {
+				return base::EventFilterResult::Cancel;
+			} else if (!m && !clear && !S::AllowWithoutModifiers(k)) {
+				if (k != Qt::Key_Escape) {
+					stopRecording();
+				}
+				return base::EventFilterResult::Cancel;
+			}
+			const auto r = [&] {
+				auto result = int(k);
+				if (m & Qt::ShiftModifier) {
+					const auto keys = QKeyMapper::possibleKeys(key);
+					for (const auto &possible : keys) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+						if (possible.keyboardModifiers() == m) {
+							return int(possible.key());
+						}
+#else // Qt >= 6.7.0
+						if (possible > int(m)) {
+							return possible - int(m);
+						}
+#endif // Qt < 6.7.0
+					}
+				}
+				return result;
+			}();
+			stopRecording(clear ? QKeySequence() : QKeySequence(r | m));
+			return base::EventFilterResult::Cancel;
+		} else if (type == QEvent::KeyPress && state->recording.current()) {
+			if (!content->window()->isActiveWindow()) {
+				return base::EventFilterResult::Continue;
+			}
+			if (static_cast<QKeyEvent*>(e.get())->key() == Qt::Key_Escape) {
+				stopRecording();
+				return base::EventFilterResult::Cancel;
+			}
+		}
+		return base::EventFilterResult::Continue;
+	});
+
+	const auto modifiedWrap = content->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			content,
+			object_ptr<Ui::VerticalLayout>(content)));
+	const auto modifiedInner = modifiedWrap->entity();
+	AddDivider(modifiedInner);
+	AddSkip(modifiedInner);
+	const auto reset = modifiedInner->add(object_ptr<Ui::SettingsButton>(
+		modifiedInner,
+		tr::lng_shortcuts_reset(),
+		st::settingsButtonNoIcon));
+	reset->setClickedCallback([=] {
+		stopRecording();
+		for (auto &entry : state->entries) {
+			if (entry.now != entry.original) {
+				entry.now = entry.original;
+				fill(entry);
+			}
+		}
+		checkModified();
+		S::ResetToDefaults();
+	});
+	AddSkip(modifiedInner);
+	AddDivider(modifiedInner);
+	modifiedWrap->toggleOn(state->modified.value());
+
+	AddSkip(content);
+	for (auto &entry : entries) {
+		if (!entry.label) {
+			AddSkip(content);
+			AddDivider(content);
+			AddSkip(content);
+			continue;
+		}
+		entry.wrap = content->add(object_ptr<Ui::VerticalLayout>(content));
+		fill(entry);
+	}
+
+	return {
+		.save = [=] {},
+		.resetButton = reset,
+	};
+}
+
+void BuildShortcutsSection(SectionBuilder &builder) {
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"shortcuts/reset"_q,
+			.title = tr::lng_shortcuts_reset(tr::now),
+			.keywords = { u"reset"_q, u"defaults"_q, u"restore"_q },
+		};
+	});
+}
+
+class Shortcuts : public Section<Shortcuts> {
+public:
+	Shortcuts(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+	~Shortcuts();
+
+	void showFinished() override;
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+private:
+	void setupContent();
+
+	Fn<void()> _save;
+	QPointer<Ui::RpWidget> _resetButton;
+
+};
+
+Shortcuts::Shortcuts(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: Section(parent, controller) {
+	setupContent();
+}
+
+Shortcuts::~Shortcuts() {
+	if (!Core::Quitting()) {
+		_save();
+	}
+}
+
+rpl::producer<QString> Shortcuts::title() {
+	return tr::lng_settings_shortcuts();
+}
+
+void Shortcuts::setupContent() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	const SectionBuildMethod buildMethod = [
+		resetButton = &_resetButton,
+		save = &_save
+	](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		auto &lifetime = container->lifetime();
+		const auto highlights = lifetime.make_state<HighlightRegistry>();
+		const auto isPaused = Window::PausedIn(
+			controller,
+			Window::GifPauseReason::Layer);
+
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = isPaused,
+			.highlights = highlights,
+		});
+
+		auto result = SetupShortcutsContent(
+			controller,
+			container,
+			highlights);
+		*save = std::move(result.save);
+		*resetButton = result.resetButton;
+
+		if (highlights && *resetButton) {
+			highlights->push_back({
+				u"shortcuts/reset"_q,
+				{ resetButton->data(), { .rippleShape = true } },
+			});
+		}
+
+		std::move(showFinished) | rpl::on_next([=] {
+			for (const auto &[id, entry] : *highlights) {
+				if (entry.widget) {
+					controller->checkHighlightControl(
+						id,
+						entry.widget,
+						base::duplicate(entry.args));
+				}
+			}
+		}, lifetime);
+	};
+
+	build(content, buildMethod);
+
+	Ui::ResizeFitChild(this, content);
+}
+
+void Shortcuts::showFinished() {
+	Section<Shortcuts>::showFinished();
+}
+
+const auto kMeta = BuildHelper({
+	.id = Shortcuts::Id(),
+	.parentId = ChatId(),
+	.title = &tr::lng_settings_shortcuts,
+	.icon = &st::menuIconShortcut,
+}, [](SectionBuilder &builder) {
+	BuildShortcutsSection(builder);
+});
+
+} // namespace
+
+Type ShortcutsId() {
+	return Shortcuts::Id();
+}
+
+QString ShortcutsHighlightId(::Shortcuts::Command command) {
+	switch (command) {
+	case ::Shortcuts::Command::ComposeAiApplyInPlace:
+		return u"shortcuts/ai_compose_apply"_q;
+	default:
+		return {};
+	}
+}
+
+namespace Builder {
+
+SectionBuildMethod ShortcutsSection = kMeta.build;
+
+} // namespace Builder
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_shortcuts.h b/Telegram/SourceFiles/settings/sections/settings_shortcuts.h
new file mode 100644
index 00000000000000..9740e0a5abed4e
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_shortcuts.h
@@ -0,0 +1,25 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "settings/settings_type.h"
+
+namespace Shortcuts {
+enum class Command;
+} // namespace Shortcuts
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Settings {
+
+[[nodiscard]] Type ShortcutsId();
+[[nodiscard]] QString ShortcutsHighlightId(::Shortcuts::Command command);
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_websites.cpp b/Telegram/SourceFiles/settings/sections/settings_websites.cpp
similarity index 79%
rename from Telegram/SourceFiles/settings/settings_websites.cpp
rename to Telegram/SourceFiles/settings/sections/settings_websites.cpp
index 55bf911dab592e..0d7dced4529eba 100644
--- a/Telegram/SourceFiles/settings/settings_websites.cpp
+++ b/Telegram/SourceFiles/settings/sections/settings_websites.cpp
@@ -5,16 +5,19 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "settings/settings_websites.h"
+#include "settings/sections/settings_websites.h"
 
 #include "api/api_websites.h"
+#include "settings/settings_common_session.h"
 #include "apiwrap.h"
 #include "boxes/peer_list_box.h"
-#include "boxes/sessions_box.h"
 #include "data/data_user.h"
-#include "ui/boxes/confirm_box.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "settings/sections/settings_active_sessions.h"
+#include "settings/sections/settings_privacy_security.h"
+#include "settings/settings_builder.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/wrap/slide_wrap.h"
@@ -29,8 +32,11 @@ For license and copyright information please follow this link:
 #include "styles/style_settings.h"
 #include "styles/style_menu_icons.h"
 
+namespace Settings {
 namespace {
 
+using namespace Builder;
+
 constexpr auto kShortPollTimeout = 60 * crl::time(1000);
 
 using EntryData = Api::Websites::Entry;
@@ -96,7 +102,7 @@ class Row final : public PeerListRow {
 [[nodiscard]] QString LocationAndDate(const EntryData &entry) {
 	return (entry.location.isEmpty() ? entry.ip : entry.location)
 		+ (entry.hash
-			? (QString::fromUtf8(" \xE2\x80\xA2 ") + entry.active)
+			? ((' ' + Ui::kQBullet + ' ') + entry.active)
 			: QString());
 }
 
@@ -112,47 +118,30 @@ void InfoBox(
 	});
 
 	const auto userpic = box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::UserpicButton>>(
+		object_ptr<Ui::UserpicButton>(
 			box,
-			object_ptr<Ui::UserpicButton>(
-				box,
-				data.bot,
-				st::websiteBigUserpic)),
-		st::sessionBigCoverPadding)->entity();
-	userpic->forceForumShape(true);
+			data.bot,
+			st::websiteBigUserpic),
+		st::sessionBigCoverPadding,
+		style::al_top);
+	userpic->overrideShape(Ui::PeerUserpicShape::Forum);
 	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
 
-	const auto nameWrap = box->addRow(
-		object_ptr<Ui::FixedHeightWidget>(
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			st::sessionBigName.maxHeight));
-	const auto name = Ui::CreateChild<Ui::FlatLabel>(
-		nameWrap,
-		rpl::single(data.bot->name()),
-		st::sessionBigName);
-	nameWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		name->resizeToWidth(width);
-		name->move((width - name->width()) / 2, 0);
-	}, name->lifetime());
-
-	const auto domainWrap = box->addRow(
-		object_ptr<Ui::FixedHeightWidget>(
+			rpl::single(data.bot->name()),
+			st::sessionBigName),
+		style::al_top);
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			st::sessionDateLabel.style.font->height),
-		style::margins(0, 0, 0, st::sessionDateSkip));
-	const auto domain = Ui::CreateChild<Ui::FlatLabel>(
-		domainWrap,
-		rpl::single(data.domain),
-		st::sessionDateLabel);
-	rpl::combine(
-		domainWrap->widthValue(),
-		domain->widthValue()
-	) | rpl::start_with_next([=](int outer, int inner) {
-		domain->move((outer - inner) / 2, 0);
-	}, domain->lifetime());
-
-	using namespace Settings;
+			rpl::single(data.domain),
+			st::sessionDateLabel),
+		style::margins(0, 0, 0, st::sessionDateSkip),
+		style::al_top);
+
 	const auto container = box->verticalLayout();
 	Ui::AddDivider(container);
 	Ui::AddSkip(container, st::sessionSubtitleSkip);
@@ -182,7 +171,7 @@ void InfoBox(
 	box->addButton(tr::lng_about_done(), [=] { box->closeBox(); });
 	if (const auto hash = data.hash) {
 		box->addLeftButton(tr::lng_settings_disconnect(), [=] {
-			const auto weak = Ui::MakeWeak(box.get());
+			const auto weak = base::make_weak(box.get());
 			terminate(hash);
 			if (weak) {
 				box->closeBox();
@@ -224,25 +213,11 @@ PaintRoundImageCallback Row::generatePaintUserpicCallback(bool forceRound) {
 	const auto peer = _data.bot;
 	auto userpic = _userpic = peer->createUserpicView();
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
-		const auto ratio = style::DevicePixelRatio();
-		if (const auto cloud = peer->userpicCloudImage(userpic)) {
-			Ui::ValidateUserpicCache(
-				userpic,
-				cloud,
-				nullptr,
-				size * ratio,
-				true);
-			p.drawImage(QRect(x, y, size, size), userpic.cached);
-		} else {
-			if (_emptyUserpic.isNull()) {
-				_emptyUserpic = PeerData::GenerateUserpicImage(
-					peer,
-					_userpic,
-					size * ratio,
-					size * ratio * Ui::ForumUserpicRadiusMultiplier());
-			}
-			p.drawImage(QRect(x, y, size, size), _emptyUserpic);
-		}
+		peer->paintUserpic(p, _userpic, {
+			.position = QPoint(x, y),
+			.size = size,
+			.shape = Ui::PeerUserpicShape::Forum,
+		});
 	};
 }
 
@@ -321,6 +296,7 @@ class Content : public Ui::RpWidget {
 		not_null<Window::SessionController*> controller);
 
 	void setupContent();
+	[[nodiscard]] Ui::RpWidget *terminateAllButton() const;
 
 protected:
 	void resizeEvent(QResizeEvent *e) override;
@@ -348,7 +324,7 @@ class Content : public Ui::RpWidget {
 	Api::Websites::List _data;
 
 	object_ptr<Inner> _inner;
-	QPointer<Ui::BoxContent> _terminateBox;
+	base::weak_qptr<Ui::BoxContent> _terminateBox;
 
 	base::Timer _shortPollTimer;
 
@@ -359,9 +335,9 @@ class Content::ListController final
 	, public RowDelegate
 	, public base::has_weak_ptr {
 public:
-	explicit ListController(not_null<Main::Session*> session);
+	explicit ListController(not_null<::Main::Session*> session);
 
-	Main::Session &session() const override;
+	::Main::Session &session() const override;
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
 	void rowElementClicked(not_null<PeerListRow*> row, int element) override;
@@ -375,11 +351,11 @@ class Content::ListController final
 
 	[[nodiscard]] static std::unique_ptr<ListController> Add(
 		not_null<Ui::VerticalLayout*> container,
-		not_null<Main::Session*> session,
+		not_null<::Main::Session*> session,
 		style::margins margins = {});
 
 private:
-	const not_null<Main::Session*> _session;
+	const not_null<::Main::Session*> _session;
 
 	rpl::event_stream<uint64> _terminateRequests;
 	rpl::event_stream<int> _itemsCount;
@@ -397,6 +373,7 @@ class Content::Inner : public Ui::RpWidget {
 	[[nodiscard]] rpl::producer<EntryData> showRequests() const;
 	[[nodiscard]] rpl::producer<uint64> terminateOne() const;
 	[[nodiscard]] rpl::producer<> terminateAll() const;
+	[[nodiscard]] Ui::RpWidget *terminateAllButton() const;
 
 private:
 	void setupContent();
@@ -419,12 +396,12 @@ Content::Content(
 void Content::setupContent() {
 	_inner->heightValue(
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		resize(width(), height);
 	}, _inner->lifetime());
 
 	_inner->showRequests(
-	) | rpl::start_with_next([=](const EntryData &data) {
+	) | rpl::on_next([=](const EntryData &data) {
 		_controller->show(Box(
 			InfoBox,
 			data,
@@ -432,22 +409,22 @@ void Content::setupContent() {
 	}, lifetime());
 
 	_inner->terminateOne(
-	) | rpl::start_with_next([=](uint64 hash) {
+	) | rpl::on_next([=](uint64 hash) {
 		terminateOne(hash);
 	}, lifetime());
 
 	_inner->terminateAll(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		terminateAll();
 	}, lifetime());
 
 	_loading.changes(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		_inner->setVisible(!value);
 	}, lifetime());
 
 	_websites->listValue(
-	) | rpl::start_with_next([=](const Api::Websites::List &list) {
+	) | rpl::on_next([=](const Api::Websites::List &list) {
 		parse(list);
 	}, lifetime());
 
@@ -506,7 +483,7 @@ void Content::terminate(
 		rpl::producer<QString> title,
 		rpl::producer<QString> text,
 		QString blockText) {
-	if (const auto strong = _terminateBox.data()) {
+	if (const auto strong = _terminateBox.get()) {
 		strong->deleteLater();
 	}
 	auto box = Box([=](not_null<Ui::GenericBox*> box) {
@@ -531,12 +508,12 @@ void Content::terminate(
 			*block = box->addRow(object_ptr<Ui::Checkbox>(box, blockText));
 		}
 	});
-	_terminateBox = Ui::MakeWeak(box.data());
+	_terminateBox = base::make_weak(box.data());
 	_controller->show(std::move(box));
 }
 
 void Content::terminateOne(uint64 hash) {
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto i = ranges::find(_data, hash, &EntryData::hash);
 	if (i == end(_data)) {
 		return;
@@ -566,7 +543,7 @@ void Content::terminateOne(uint64 hash) {
 }
 
 void Content::terminateAll() {
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	auto callback = [=](bool block) {
 		const auto reset = crl::guard(weak, [=] {
 			_websites->cancelCurrentRequest();
@@ -583,6 +560,10 @@ void Content::terminateAll() {
 		tr::lng_settings_disconnect_all_sure());
 }
 
+Ui::RpWidget *Content::terminateAllButton() const {
+	return _inner ? _inner->terminateAllButton() : nullptr;
+}
+
 Content::Inner::Inner(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
@@ -593,7 +574,6 @@ Content::Inner::Inner(
 }
 
 void Content::Inner::setupContent() {
-	using namespace Settings;
 	using namespace rpl::mappers;
 
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
@@ -659,12 +639,16 @@ rpl::producer<EntryData> Content::Inner::showRequests() const {
 	return _list->showRequests();
 }
 
+Ui::RpWidget *Content::Inner::terminateAllButton() const {
+	return _terminateAll.data();
+}
+
 Content::ListController::ListController(
-	not_null<Main::Session*> session)
+	not_null<::Main::Session*> session)
 : _session(session) {
 }
 
-Main::Session &Content::ListController::session() const {
+::Main::Session &Content::ListController::session() const {
 	return *_session;
 }
 
@@ -737,7 +721,7 @@ rpl::producer<EntryData> Content::ListController::showRequests() const {
 
 auto Content::ListController::Add(
 	not_null<Ui::VerticalLayout*> container,
-	not_null<Main::Session*> session,
+	not_null<::Main::Session*> session,
 	style::margins margins)
 -> std::unique_ptr<ListController> {
 	auto &lifetime = container->lifetime();
@@ -756,29 +740,123 @@ auto Content::ListController::Add(
 	return controller;
 }
 
-} // namespace
+void BuildWebsitesSection(SectionBuilder &builder) {
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"websites/disconnect-all"_q,
+			.title = tr::lng_settings_disconnect_all(tr::now),
+			.keywords = { u"disconnect"_q, u"terminate"_q, u"logout"_q },
+		};
+	});
+	builder.add(nullptr, [] {
+		return SearchEntry{
+			.id = u"websites/list"_q,
+			.title = tr::lng_settings_logged_in_title(tr::now),
+			.keywords = { u"websites"_q, u"bots"_q, u"logged"_q },
+		};
+	});
+}
 
-namespace Settings {
+class Websites : public Section<Websites> {
+public:
+	Websites(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+	void showFinished() override;
+
+private:
+	void setupContent();
+
+	rpl::event_stream<> _showFinished;
+
+};
 
 Websites::Websites(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: Section(parent) {
-	setupContent(controller);
+: Section(parent, controller) {
+	setupContent();
 }
 
 rpl::producer<QString> Websites::title() {
 	return tr::lng_settings_connected_title();
 }
 
-void Websites::setupContent(not_null<Window::SessionController*> controller) {
+void Websites::showFinished() {
+	_showFinished.fire({});
+	Section::showFinished();
+}
+
+void Websites::setupContent() {
 	const auto container = Ui::CreateChild<Ui::VerticalLayout>(this);
-	Ui::AddSkip(container);
-	const auto content = container->add(
-		object_ptr<Content>(container, controller));
-	content->setupContent();
+
+	const SectionBuildMethod buildMethod = [](
+			not_null<Ui::VerticalLayout*> container,
+			not_null<Window::SessionController*> controller,
+			Fn<void(Type)> showOther,
+			rpl::producer<> showFinished) {
+		auto &lifetime = container->lifetime();
+		const auto highlights = lifetime.make_state<HighlightRegistry>();
+
+		auto builder = SectionBuilder(WidgetContext{
+			.container = container,
+			.controller = controller,
+			.showOther = std::move(showOther),
+			.isPaused = Window::PausedIn(
+				controller,
+				Window::GifPauseReason::Layer),
+			.highlights = highlights,
+		});
+
+		builder.addSkip();
+
+		builder.add([=](const WidgetContext &ctx) {
+			const auto content = ctx.container->add(
+				object_ptr<Content>(ctx.container, ctx.controller));
+			content->setupContent();
+
+			if (ctx.highlights) {
+				ctx.highlights->push_back({
+					u"websites/disconnect-all"_q,
+					{ content->terminateAllButton() },
+				});
+			}
+
+			return SectionBuilder::WidgetToAdd{};
+		});
+
+		std::move(showFinished) | rpl::on_next([=] {
+			for (const auto &[id, entry] : *highlights) {
+				if (entry.widget) {
+					controller->checkHighlightControl(
+						id,
+						entry.widget,
+						base::duplicate(entry.args));
+				}
+			}
+		}, lifetime);
+	};
+
+	build(container, buildMethod);
 
 	Ui::ResizeFitChild(this, container);
 }
 
+const auto kMeta = BuildHelper({
+	.id = Websites::Id(),
+	.parentId = PrivacySecurityId(),
+	.title = &tr::lng_settings_connected_title,
+	.icon = &st::menuIconIpAddress,
+}, [](SectionBuilder &builder) {
+	BuildWebsitesSection(builder);
+});
+
+} // namespace
+
+Type WebsitesId() {
+	return Websites::Id();
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/sections/settings_websites.h b/Telegram/SourceFiles/settings/sections/settings_websites.h
new file mode 100644
index 00000000000000..1258765db969fd
--- /dev/null
+++ b/Telegram/SourceFiles/settings/sections/settings_websites.h
@@ -0,0 +1,20 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "settings/settings_type.h"
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Settings {
+
+[[nodiscard]] Type WebsitesId();
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index cff0d7f38aac6f..461ba25b77eb94 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -15,6 +15,13 @@ settingsButton: SettingsButton(infoProfileButton) {
 	padding: margins(60px, 10px, 22px, 10px);
 	iconLeft: 20px;
 }
+settingsButtonRightLabelSpoiler: SettingsButton(settingsButton) {
+	rightLabel: FlatLabel(defaultSettingsRightLabel) {
+		palette: TextPalette(defaultTextPalette) {
+			spoilerFg: windowActiveTextFg;
+		}
+	}
+}
 settingsButtonNoIcon: SettingsButton(settingsButton) {
 	padding: margins(22px, 10px, 22px, 8px);
 }
@@ -24,7 +31,7 @@ settingsButtonLight: SettingsButton(settingsButton) {
 }
 settingsButtonLightNoIcon: SettingsButton(settingsButtonLight, settingsButtonNoIcon) {
 }
-settingsButtonNoIconLocked : SettingsButton(settingsButtonNoIcon) {
+settingsButtonNoIconLocked: SettingsButton(settingsButtonNoIcon) {
 	toggle: Toggle(infoProfileToggle) {
 		lockIcon: icon {{ "info/info_rights_lock", menuIconFg }};
 	}
@@ -96,6 +103,22 @@ settingsPremiumIconLastSeen: icon {{ "settings/premium/lastseen", settingsIconFg
 settingsPremiumIconPrivacy: icon {{ "settings/premium/privacy", settingsIconFg }};
 settingsPremiumIconBusiness: icon {{ "settings/premium/market", settingsIconFg }};
 settingsPremiumIconEffects: icon {{ "settings/premium/effects", settingsIconFg }};
+settingsPremiumIconChecklist: icon {{ "settings/premium/checklist", settingsIconFg }};
+settingsPremiumIconPeerColors: icon {{ "settings/premium/peer_colors-24x24", settingsIconFg }};
+settingsPremiumIconNoForwards: icon {{ "menu/share_off-24x24", settingsIconFg }};
+settingsPremiumIconAiCompose: icon{
+	{ size(24px, 24px), transparent },
+	{ "chat/ai_letters-20x20", settingsIconFg, point(2px, 2px) },
+	{ "chat/ai_star1-20x20", settingsIconFg, point(2px, 2px) },
+	{ "chat/ai_star2-20x20", settingsIconFg, point(2px, 2px) },
+};
+
+settingsIconChatAutomation: icon {
+	{ size(24px, 24px), transparent },
+	{ "chat/ai_letters-20x20", menuIconColor, point(2px, 2px) },
+	{ "chat/ai_star1-20x20", menuIconColor, point(2px, 2px) },
+	{ "chat/ai_star2-20x20", menuIconColor, point(2px, 2px) },
+};
 
 settingsStoriesIconOrder: icon {{ "settings/premium/stories_order", premiumButtonBg1 }};
 settingsStoriesIconStealth: icon {{ "menu/stealth", premiumButtonBg1 }};
@@ -123,6 +146,8 @@ settingsBusinessPromoChatbots: icon {{ "settings/premium/promo/business_chatbot"
 settingsBusinessPromoChatIntro: icon {{ "settings/premium/promo/business_intro", premiumButtonBg1 }};
 settingsBusinessPromoChatLinks: icon {{ "settings/premium/promo/business_chatlink", premiumButtonBg1 }};
 
+settingsStarRefEarnStars: icon {{ "settings/premium/business/earn_stars", settingsIconFg }};
+
 settingsPremiumNewBadge: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(semiboldTextStyle) {
 		font: font(10px semibold);
@@ -164,10 +189,6 @@ settingsPrivacySkip: 14px;
 settingsPrivacySkipTop: 4px;
 settingsPrivacyPremium: icon{{ "profile_premium", premiumButtonFg }};
 
-settingsPrivacyAddBirthday: FlatLabel(defaultFlatLabel) {
-	minWidth: 256px;
-}
-
 settingsCloudPasswordIconSize: 100px;
 
 settingLocalPasscodeInputField: InputField(defaultInputField) {
@@ -176,7 +197,6 @@ settingLocalPasscodeInputField: InputField(defaultInputField) {
 settingLocalPasscodeDescription: FlatLabel(changePhoneDescription) {
 	minWidth: 256px;
 }
-settingLocalPasscodeDescriptionHeight: 53px;
 settingLocalPasscodeError: FlatLabel(changePhoneError) {
 	minWidth: 256px;
 }
@@ -184,21 +204,28 @@ settingLocalPasscodeDescriptionBottomSkip: 15px;
 settingLocalPasscodeIconPadding: margins(0px, 19px, 0px, 5px);
 settingLocalPasscodeButtonPadding: margins(0px, 19px, 0px, 35px);
 
-settingsInfoPhotoHeight: 161px;
+settingsInfoPhotoHeight: 162px;
 settingsInfoPhotoSize: 100px;
 settingsInfoPhoto: UserpicButton(defaultUserpicButton) {
 	size: size(settingsInfoPhotoSize, settingsInfoPhotoSize);
 	photoSize: settingsInfoPhotoSize;
 }
-settingsInfoPhotoTop: 0px;
+settingsInfoPhotoTop: 2px;
 settingsInfoPhotoSkip: 7px;
 settingsInfoNameSkip: -1px;
 settingsInfoUploadLeft: 6px;
 settingsInfoPeerBadge: InfoPeerBadge {
+	verified: icon {
+		{ "dialogs/dialogs_verified_star", dialogsVerifiedIconBg },
+		{ "dialogs/dialogs_verified_check", dialogsVerifiedIconFg },
+	};
 	premium: icon {{ "dialogs/dialogs_premium", dialogsVerifiedIconBg }};
 	premiumFg: dialogsVerifiedIconBg;
 	sizeTag: 0; // Normal
 }
+settingsCoverBadge: InfoPeerBadge(infoPeerBadge) {
+	position: point(4px, 2px);
+}
 
 settingsBio: InputField(defaultInputField) {
 	textBg: transparent;
@@ -218,6 +245,7 @@ settingsBio: InputField(defaultInputField) {
 }
 
 settingsBioMargins: margins(22px, 6px, 22px, 4px);
+settingsBioHighlightMargin: margins(-22px, 0px, -22px, 0px);
 settingsBioCountdown: FlatLabel(defaultFlatLabel) {
 	style: boxTextStyle;
 	textFg: windowSubTextFg;
@@ -272,6 +300,7 @@ chatThemeEntryMargin: margins(16px, 10px, 16px, 8px);
 chatThemeEmptyPreviewTop: 16px;
 chatThemeEmojiBottom: 12px;
 chatThemeButtonMargin: margins(10px, 0px, 10px, 8px);
+chatThemeGiftTaken: icon {{ "mediaview/mini_repost", msgFileInBg }};
 
 autoDownloadLimitButton: SettingsButton(settingsButtonNoIcon) {
 	padding: margins(22px, 10px, 22px, 0px);
@@ -288,7 +317,7 @@ settingsAccentColorSkip: 4px;
 settingsAccentColorLine: 3px;
 
 settingsFilterDividerLabel: FlatLabel(boxDividerLabel) {
-	minWidth: 258px;
+	minWidth: 200px;
 	maxHeight: 0px;
 	align: align(top);
 }
@@ -296,6 +325,14 @@ settingsFilterDividerLabelPadding: margins(0px, 16px, 0px, 22px);
 settingsFilterIconSize: 74px;
 settingsFilterIconPadding: margins(0px, 17px, 0px, 5px);
 
+settingsFilterTagPreviewSkip: 14px;
+
+settingsFilterAddRecommended: RoundButton(defaultActiveButton) {
+	width: -32px;
+	height: 26px;
+	textTop: 4px;
+}
+
 settingsDeviceName: InputField(defaultInputField) {
 	textBg: transparent;
 	textMargins: margins(1px, 3px, 1px, 4px);
@@ -316,8 +353,6 @@ dictionariesSectionButton: SettingsButton(settingsUpdateToggle) {
 	}
 }
 
-sessionsScroll: boxScroll;
-sessionsHeight: 350px;
 sessionLocationTop: 54px;
 sessionCurrentSkip: 8px;
 sessionSubtitleSkip: 14px;
@@ -409,6 +444,7 @@ websiteBigUserpic: UserpicButton(defaultUserpicButton) {
 settingsPhotoLeft: 22px;
 settingsPhotoTop: 8px;
 settingsPhotoBottom: 16px;
+settingsPhotoHighlightMargin: margins(-4px, -4px, -4px, -4px);
 settingsNameLeft: 112px;
 settingsNameTop: 12px;
 settingsPhoneLeft: settingsNameLeft;
@@ -484,8 +520,8 @@ settingsPremiumArrow: icon{{ "settings/premium/arrow", menuIconFg }};
 settingsPremiumArrowOver: icon{{ "settings/premium/arrow", menuIconFgOver }};
 
 settingsPremiumOptionsPadding: margins(0px, 9px, 0px, 2px);
-settingsPremiumTopHeight: 220px;
-settingsPremiumUserHeight: 223px;
+settingsPremiumTopHeight: 202px;
+settingsPremiumUserHeight: 205px;
 settingsPremiumUserTitlePadding: margins(0px, 16px, 0px, 6px);
 settingsPremiumUserTitle: FlatLabel(boxTitle) {
 	style: TextStyle(defaultTextStyle) {
@@ -497,9 +533,6 @@ settingsPremiumUserTitle: FlatLabel(boxTitle) {
 	align: align(top);
 }
 
-settingsPremiumLock: icon{{ "emoji/premium_lock", windowActiveTextFg, point(0px, 1px) }};
-settingsPremiumLockSkip: 3px;
-
 settingsBlockedListSubtitleAddPadding: margins(0px, 1px, 0px, -4px);
 settingsBlockedListIconPadding: margins(0px, 24px, 0px, 5px);
 settingsBlockedList: PeerList(peerListBox) {
@@ -515,6 +548,21 @@ settingsNotificationTypeDetails: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
 }
 
+settingsSearchResult: SettingsButton(settingsButton) {
+	height: 40px;
+	padding: margins(60px, 4px, 22px, 4px);
+}
+settingsSearchResultNoIcon: SettingsButton(settingsSearchResult) {
+	padding: margins(22px, 4px, 22px, 4px);
+}
+settingsSearchResultDetails: FlatLabel(settingsNotificationTypeDetails) {
+}
+settingsSearchNoResults: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	align: align(center);
+}
+settingsSearchNoResultsPadding: margins(22px, 32px, 22px, 32px);
+
 powerSavingButton: SettingsButton(settingsButton) {
 	style: boxTextStyle;
 	padding: margins(57px, 8px, 22px, 8px);
@@ -572,6 +620,8 @@ filterLinkChatsList: PeerList(peerListBox) {
 	padding: margins(0px, 0px, 0px, membersMarginBottom);
 }
 
+settingsColorSampleCutout: 3px;
+settingsColorProfileSampleShift: 5px;
 settingsColorSampleSize: 20px;
 settingsColorSampleCenter: 6px;
 settingsColorSampleCenterRadius: 2px;
@@ -583,8 +633,11 @@ settingsColorButton: SettingsButton(settingsButton) {
 settingsColorRadioMargin: 17px;
 settingsColorRadioSkip: 13px;
 settingsColorRadioStroke: 2px;
-settingsLevelBadgeLock: icon {{ "chat/mini_lock", premiumButtonFg }};
-settingsLevelBadgeLockSkip: 4px;
+settingsLevelBadgeLock: IconEmoji{
+	icon: icon {{ "chat/mini_lock", premiumButtonFg }};
+	padding: margins(0px, 4px, 0px, 0px);
+	useIconColor: true;
+}
 
 messagePrivacyTopSkip: 8px;
 messagePrivacyRadioSkip: 6px;
@@ -613,13 +666,17 @@ settingsChatbotsAccess: Checkbox(defaultCheckbox) {
 }
 settingsLocationAddress: InputField(defaultMultiSelectSearchField) {
 }
-settingsChatbotsUsernameMargins: margins(20px, 8px, 20px, 8px);
+settingsChatbotsUsernameMargins: margins(20px, 0px, 20px, 8px);
 settingsChatbotsAccessMargins: margins(22px, 5px, 22px, 9px);
 settingsChatbotsAccessSkip: 4px;
 settingsChatbotsBottomTextMargin: margins(22px, 8px, 22px, 3px);
 settingsChatbotsAdd: SettingsButton(settingsButton) {
 	iconLeft: 22px;
 }
+settingsChatbotsRemove: SettingsButton(settingsAttentionButtonWithIcon, settingsChatbotsAdd) {
+	iconLeft: 16px;
+}
+settingsChatbotsRemoveIcon: infoIconDeleteRed;
 settingsWorkingHoursWeek: SettingsButton(settingsButtonNoIcon) {
 	height: 40px;
 	padding: margins(22px, 4px, 22px, 4px);
@@ -649,8 +706,12 @@ settingsChatbotsNotFound: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
 	align: align(top);
 }
-settingsChatbotsDeleteIcon: icon {{ "dialogs/dialogs_cancel_search", dialogsMenuIconFg }};
-settingsChatbotsDeleteIconOver: icon {{ "dialogs/dialogs_cancel_search", dialogsMenuIconFgOver }};
+settingsChatbotsAddButton: RoundButton(defaultActiveButton) {
+	width: -16px;
+	height: 26px;
+	textTop: 4px;
+}
+settingsChatbotsAddMargin: 14px;
 
 settingsChatIntroField: InputField(defaultMultiSelectSearchField) {
 	textMargins: margins(2px, 0px, 32px, 0px);
@@ -676,3 +737,68 @@ settingsChatLinkField: InputField(defaultInputField) {
 
 	style: defaultTextStyle;
 }
+
+settingsQuickDialogActionsTriggerFont: font(11px);
+
+settingsGiftIconEmoji: IconEmoji {
+	icon: icon{{ "settings/mini_gift", windowFg }};
+	padding: margins(1px, 2px, 1px, 0px);
+}
+
+settingsCreditsButton: SettingsButton(settingsButton) {
+	padding: margins(62px, 8px, 22px, 8px);
+}
+settingsButtonIconGift: icon {{ "settings/gift", menuIconColor }};
+settingsButtonIconEarn: icon {{ "settings/earn", menuIconColor }};
+
+settingsIconPasskeys: icon {{ "menu/permissions", windowBgActive }};
+settingsIconPasskeysAboutIcon1: icon {{ "menu/permissions", boxTextFg }};
+settingsIconPasskeysAboutIcon2: icon {{ "menu/passcode_winhello", boxTextFg }};
+settingsIconPasskeysAboutIcon3: icon {{ "menu/lock", boxTextFg }};
+
+settingsAgeVerifyBox: Box(filterInviteBox) {
+	buttonPadding: margins(24px, 24px, 24px, 24px);
+}
+settingsAgeVerifyText: FlatLabel(defaultFlatLabel) {
+	minWidth: 200px;
+	align: align(top);
+}
+settingsAgeVerifyMargin: margins(0px, 6px, 0px, 6px);
+settingsAgeVerifyTitle: FlatLabel(boxTitle) {
+	align: align(top);
+}
+settingsAgeVerifyIcon: icon {{ "settings/filled_verify_age-48x48", windowFgActive }};
+settingsAgeVerifyIconPadding: margins(16px, 16px, 16px, 16px);
+settingsAgeVerifyIconMargin: margins(0px, 24px, 0px, 14px);
+
+DetailedSettingsButtonStyle {
+	button: SettingsButton;
+	description: FlatLabel;
+	iconRadius: pixels;
+	iconPadding: pixels;
+	iconForegroundPadding: pixels;
+	descriptionTopSkip: pixels;
+	descriptionBottomSkip: pixels;
+	descriptionRightSkip: pixels;
+}
+
+detailedSettingsButtonStyle: DetailedSettingsButtonStyle {
+	button: SettingsButton(settingsButtonNoIconLocked) {
+		style: defaultTextStyle;
+		textBg: transparent;
+		textBgOver: transparent;
+		padding: margins(68px, 8px, 22px, 8px);
+		iconLeft: 17px;
+	}
+	description: FlatLabel(defaultFlatLabel) {
+		textFg: windowSubTextFg;
+	}
+	iconRadius: 10px;
+	iconPadding: 6px;
+	iconForegroundPadding: 3px;
+	descriptionTopSkip: 0px;
+	descriptionBottomSkip: 8px;
+	descriptionRightSkip: 4px;
+}
+
+settingsToastStarIcon: icon {{ "toast/star", toastFg }};
diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp
deleted file mode 100644
index fcd2438cf9c0a2..00000000000000
--- a/Telegram/SourceFiles/settings/settings_advanced.cpp
+++ /dev/null
@@ -1,1038 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "settings/settings_advanced.h"
-
-#include "api/api_global_privacy.h"
-#include "apiwrap.h"
-#include "settings/settings_chat.h"
-#include "settings/settings_power_saving.h"
-#include "settings/settings_privacy_security.h"
-#include "ui/wrap/vertical_layout.h"
-#include "ui/wrap/slide_wrap.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/buttons.h"
-#include "ui/gl/gl_detection.h"
-#include "ui/layers/generic_box.h"
-#include "ui/text/format_values.h"
-#include "ui/boxes/single_choice_box.h"
-#include "ui/painter.h"
-#include "ui/vertical_list.h"
-#include "ui/ui_utility.h"
-#include "boxes/connection_box.h"
-#include "boxes/about_box.h"
-#include "ui/boxes/confirm_box.h"
-#include "platform/platform_specific.h"
-#include "ui/platform/ui_platform_window.h"
-#include "base/platform/base_platform_custom_app_icon.h"
-#include "base/platform/base_platform_info.h"
-#include "window/window_controller.h"
-#include "window/window_session_controller.h"
-#include "lang/lang_keys.h"
-#include "core/update_checker.h"
-#include "core/launcher.h"
-#include "core/application.h"
-#include "tray.h"
-#include "storage/localstorage.h"
-#include "storage/storage_domain.h"
-#include "data/data_session.h"
-#include "main/main_account.h"
-#include "main/main_domain.h"
-#include "main/main_session.h"
-#include "mtproto/facade.h"
-#include "styles/style_layers.h"
-#include "styles/style_menu_icons.h"
-#include "styles/style_settings.h"
-
-#ifdef Q_OS_MAC
-#include "base/platform/mac/base_confirm_quit.h"
-#endif // Q_OS_MAC
-
-#ifndef TDESKTOP_DISABLE_SPELLCHECK
-#include "boxes/dictionaries_manager.h"
-#include "chat_helpers/spellchecker_common.h"
-#include "spellcheck/platform/platform_spellcheck.h"
-#endif // !TDESKTOP_DISABLE_SPELLCHECK
-
-namespace Settings {
-namespace {
-
-#if defined Q_OS_MAC && !defined OS_MAC_STORE
-[[nodiscard]] const QImage &IconMacRound() {
-	static const auto result = QImage(u":/gui/art/icon_round512@2x.png"_q);
-	return result;
-}
-#endif // Q_OS_MAC && !OS_MAC_STORE
-
-} // namespace
-
-void SetupConnectionType(
-		not_null<Window::Controller*> controller,
-		not_null<Main::Account*> account,
-		not_null<Ui::VerticalLayout*> container) {
-	const auto connectionType = [=] {
-		const auto transport = account->mtp().dctransport();
-		if (!Core::App().settings().proxy().isEnabled()) {
-			return transport.isEmpty()
-				? tr::lng_connection_auto_connecting(tr::now)
-				: tr::lng_connection_auto(tr::now, lt_transport, transport);
-		} else {
-			return transport.isEmpty()
-				? tr::lng_connection_proxy_connecting(tr::now)
-				: tr::lng_connection_proxy(tr::now, lt_transport, transport);
-		}
-	};
-	const auto button = AddButtonWithLabel(
-		container,
-		tr::lng_settings_connection_type(),
-		rpl::merge(
-			Core::App().settings().proxy().connectionTypeChanges(),
-			// Handle language switch.
-			tr::lng_connection_auto_connecting() | rpl::to_empty
-		) | rpl::map(connectionType),
-		st::settingsButton,
-		{ &st::menuIconNetwork });
-	button->addClickHandler([=] {
-		controller->show(ProxiesBoxController::CreateOwningBox(account));
-	});
-}
-
-bool HasUpdate() {
-	return !Core::UpdaterDisabled();
-}
-
-void SetupUpdate(not_null<Ui::VerticalLayout*> container) {
-	if (!HasUpdate()) {
-		return;
-	}
-
-	const auto texts = Ui::CreateChild<rpl::event_stream<QString>>(
-		container.get());
-	const auto downloading = Ui::CreateChild<rpl::event_stream<bool>>(
-		container.get());
-	const auto version = tr::lng_settings_current_version(
-		tr::now,
-		lt_version,
-		currentVersionText());
-	const auto toggle = container->add(object_ptr<Button>(
-		container,
-		tr::lng_settings_update_automatically(),
-		st::settingsUpdateToggle));
-	const auto label = Ui::CreateChild<Ui::FlatLabel>(
-		toggle,
-		texts->events(),
-		st::settingsUpdateState);
-
-	const auto options = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-	const auto inner = options->entity();
-	const auto install = cAlphaVersion()
-		? nullptr
-		: inner->add(object_ptr<Button>(
-			inner,
-			tr::lng_settings_install_beta(),
-			st::settingsButtonNoIcon));
-
-	const auto check = inner->add(object_ptr<Button>(
-		inner,
-		tr::lng_settings_check_now(),
-		st::settingsButtonNoIcon));
-	const auto update = Ui::CreateChild<Button>(
-		check,
-		tr::lng_update_telegram(),
-		st::settingsUpdate);
-	update->hide();
-	check->widthValue() | rpl::start_with_next([=](int width) {
-		update->resizeToWidth(width);
-		update->moveToLeft(0, 0);
-	}, update->lifetime());
-
-	rpl::combine(
-		toggle->widthValue(),
-		label->widthValue()
-	) | rpl::start_with_next([=] {
-		label->moveToLeft(
-			st::settingsUpdateStatePosition.x(),
-			st::settingsUpdateStatePosition.y());
-	}, label->lifetime());
-	label->setAttribute(Qt::WA_TransparentForMouseEvents);
-
-	const auto showDownloadProgress = [=](int64 ready, int64 total) {
-		texts->fire(tr::lng_settings_downloading_update(
-			tr::now,
-			lt_progress,
-			Ui::FormatDownloadText(ready, total)));
-		downloading->fire(true);
-	};
-	const auto setDefaultStatus = [=](const Core::UpdateChecker &checker) {
-		using State = Core::UpdateChecker::State;
-		const auto state = checker.state();
-		switch (state) {
-		case State::Download:
-			showDownloadProgress(checker.already(), checker.size());
-			break;
-		case State::Ready:
-			texts->fire(tr::lng_settings_update_ready(tr::now));
-			update->show();
-			break;
-		default:
-			texts->fire_copy(version);
-			break;
-		}
-	};
-
-	toggle->toggleOn(rpl::single(cAutoUpdate()));
-	toggle->toggledValue(
-	) | rpl::filter([](bool toggled) {
-		return (toggled != cAutoUpdate());
-	}) | rpl::start_with_next([=](bool toggled) {
-		cSetAutoUpdate(toggled);
-
-		Local::writeSettings();
-		Core::UpdateChecker checker;
-		if (cAutoUpdate()) {
-			checker.start();
-		} else {
-			checker.stop();
-			setDefaultStatus(checker);
-		}
-	}, toggle->lifetime());
-
-	if (install) {
-		install->toggleOn(rpl::single(cInstallBetaVersion()));
-		install->toggledValue(
-		) | rpl::filter([](bool toggled) {
-			return (toggled != cInstallBetaVersion());
-		}) | rpl::start_with_next([=](bool toggled) {
-			cSetInstallBetaVersion(toggled);
-			Core::Launcher::Instance().writeInstallBetaVersionsSetting();
-
-			Core::UpdateChecker checker;
-			checker.stop();
-			if (toggled) {
-				cSetLastUpdateCheck(0);
-			}
-			checker.start();
-		}, toggle->lifetime());
-	}
-
-	Core::UpdateChecker checker;
-	options->toggleOn(rpl::combine(
-		toggle->toggledValue(),
-		downloading->events_starting_with(
-			checker.state() == Core::UpdateChecker::State::Download)
-	) | rpl::map([](bool check, bool downloading) {
-		return check && !downloading;
-	}));
-
-	checker.checking() | rpl::start_with_next([=] {
-		options->setAttribute(Qt::WA_TransparentForMouseEvents);
-		texts->fire(tr::lng_settings_update_checking(tr::now));
-		downloading->fire(false);
-	}, options->lifetime());
-	checker.isLatest() | rpl::start_with_next([=] {
-		options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
-		texts->fire(tr::lng_settings_latest_installed(tr::now));
-		downloading->fire(false);
-	}, options->lifetime());
-	checker.progress(
-	) | rpl::start_with_next([=](Core::UpdateChecker::Progress progress) {
-		showDownloadProgress(progress.already, progress.size);
-	}, options->lifetime());
-	checker.failed() | rpl::start_with_next([=] {
-		options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
-		texts->fire(tr::lng_settings_update_fail(tr::now));
-		downloading->fire(false);
-	}, options->lifetime());
-	checker.ready() | rpl::start_with_next([=] {
-		options->setAttribute(Qt::WA_TransparentForMouseEvents, false);
-		texts->fire(tr::lng_settings_update_ready(tr::now));
-		update->show();
-		downloading->fire(false);
-	}, options->lifetime());
-
-	setDefaultStatus(checker);
-
-	check->addClickHandler([] {
-		Core::UpdateChecker checker;
-
-		cSetLastUpdateCheck(0);
-		checker.start();
-	});
-	update->addClickHandler([] {
-		if (!Core::UpdaterDisabled()) {
-			Core::checkReadyUpdate();
-		}
-		Core::Restart();
-	});
-}
-
-bool HasSystemSpellchecker() {
-#ifdef TDESKTOP_DISABLE_SPELLCHECK
-	return false;
-#endif // TDESKTOP_DISABLE_SPELLCHECK
-	return true;
-}
-
-void SetupSpellchecker(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-#ifndef TDESKTOP_DISABLE_SPELLCHECK
-	const auto session = &controller->session();
-	const auto settings = &Core::App().settings();
-	const auto isSystem = Platform::Spellchecker::IsSystemSpellchecker();
-	const auto button = container->add(object_ptr<Button>(
-		container,
-		isSystem
-			? tr::lng_settings_system_spellchecker()
-			: tr::lng_settings_custom_spellchecker(),
-		st::settingsButtonNoIcon
-	))->toggleOn(
-		rpl::single(settings->spellcheckerEnabled())
-	);
-
-	button->toggledValue(
-	) | rpl::filter([=](bool enabled) {
-		return (enabled != settings->spellcheckerEnabled());
-	}) | rpl::start_with_next([=](bool enabled) {
-		settings->setSpellcheckerEnabled(enabled);
-		Core::App().saveSettingsDelayed();
-	}, container->lifetime());
-
-	if (isSystem) {
-		return;
-	}
-
-	const auto sliding = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-
-	sliding->entity()->add(object_ptr<Button>(
-		sliding->entity(),
-		tr::lng_settings_auto_download_dictionaries(),
-		st::settingsButtonNoIcon
-	))->toggleOn(
-		rpl::single(settings->autoDownloadDictionaries())
-	)->toggledValue(
-	) | rpl::filter([=](bool enabled) {
-		return (enabled != settings->autoDownloadDictionaries());
-	}) | rpl::start_with_next([=](bool enabled) {
-		settings->setAutoDownloadDictionaries(enabled);
-		Core::App().saveSettingsDelayed();
-	}, sliding->entity()->lifetime());
-
-	AddButtonWithLabel(
-		sliding->entity(),
-		tr::lng_settings_manage_dictionaries(),
-		Spellchecker::ButtonManageDictsState(session),
-		st::settingsButtonNoIcon
-	)->addClickHandler([=] {
-		controller->show(
-			Box<Ui::ManageDictionariesBox>(&controller->session()));
-	});
-
-	button->toggledValue(
-	) | rpl::start_with_next([=](bool enabled) {
-		sliding->toggle(enabled, anim::type::normal);
-	}, container->lifetime());
-#endif // !TDESKTOP_DISABLE_SPELLCHECK
-}
-
-void SetupWindowTitleContent(
-		Window::SessionController *controller,
-		not_null<Ui::VerticalLayout*> container) {
-	const auto checkbox = [&](rpl::producer<QString> &&label, bool checked) {
-		return object_ptr<Ui::Checkbox>(
-			container,
-			std::move(label),
-			checked,
-			st::settingsCheckbox);
-	};
-	const auto addCheckbox = [&](
-			rpl::producer<QString> &&label,
-			bool checked) {
-		return container->add(
-			checkbox(std::move(label), checked),
-			st::settingsCheckboxPadding);
-	};
-	const auto settings = &Core::App().settings();
-	if (controller) {
-		const auto content = [=] {
-			return settings->windowTitleContent();
-		};
-		const auto showChatName = addCheckbox(
-			tr::lng_settings_title_chat_name(),
-			!content().hideChatName);
-		showChatName->checkedChanges(
-		) | rpl::filter([=](bool checked) {
-			return (checked == content().hideChatName);
-		}) | rpl::start_with_next([=](bool checked) {
-			auto updated = content();
-			updated.hideChatName = !checked;
-			settings->setWindowTitleContent(updated);
-			Core::App().saveSettingsDelayed();
-		}, showChatName->lifetime());
-
-		if (Core::App().domain().accountsAuthedCount() > 1) {
-			const auto showAccountName = addCheckbox(
-				tr::lng_settings_title_account_name(),
-				!content().hideAccountName);
-			showAccountName->checkedChanges(
-			) | rpl::filter([=](bool checked) {
-				return (checked == content().hideAccountName);
-			}) | rpl::start_with_next([=](bool checked) {
-				auto updated = content();
-				updated.hideAccountName = !checked;
-				settings->setWindowTitleContent(updated);
-				Core::App().saveSettingsDelayed();
-			}, showAccountName->lifetime());
-		}
-
-		const auto showTotalUnread = addCheckbox(
-			tr::lng_settings_title_total_count(),
-			!content().hideTotalUnread);
-		showTotalUnread->checkedChanges(
-		) | rpl::filter([=](bool checked) {
-			return (checked == content().hideTotalUnread);
-		}) | rpl::start_with_next([=](bool checked) {
-			auto updated = content();
-			updated.hideTotalUnread = !checked;
-			settings->setWindowTitleContent(updated);
-			Core::App().saveSettingsDelayed();
-		}, showTotalUnread->lifetime());
-	}
-
-	if (Ui::Platform::NativeWindowFrameSupported()) {
-		const auto nativeFrame = addCheckbox(
-			Platform::IsWayland()
-				? tr::lng_settings_qt_frame()
-				: tr::lng_settings_native_frame(),
-			Core::App().settings().nativeWindowFrame());
-
-		nativeFrame->checkedChanges(
-		) | rpl::filter([](bool checked) {
-			return (checked != Core::App().settings().nativeWindowFrame());
-		}) | rpl::start_with_next([=](bool checked) {
-			Core::App().settings().setNativeWindowFrame(checked);
-			Core::App().saveSettingsDelayed();
-		}, nativeFrame->lifetime());
-	}
-}
-
-void SetupSystemIntegrationContent(
-		Window::SessionController *controller,
-		not_null<Ui::VerticalLayout*> container) {
-	using WorkMode = Core::Settings::WorkMode;
-
-	const auto checkbox = [&](rpl::producer<QString> &&label, bool checked) {
-		return object_ptr<Ui::Checkbox>(
-			container,
-			std::move(label),
-			checked,
-			st::settingsCheckbox);
-	};
-	const auto addCheckbox = [&](
-			rpl::producer<QString> &&label,
-			bool checked) {
-		return container->add(
-			checkbox(std::move(label), checked),
-			st::settingsCheckboxPadding);
-	};
-	const auto addSlidingCheckbox = [&](
-			rpl::producer<QString> &&label,
-			bool checked) {
-		return container->add(
-			object_ptr<Ui::SlideWrap<Ui::Checkbox>>(
-				container,
-				checkbox(std::move(label), checked),
-				st::settingsCheckboxPadding));
-	};
-
-	const auto settings = &Core::App().settings();
-	if (Platform::TrayIconSupported()) {
-		const auto trayEnabled = [=] {
-			const auto workMode = settings->workMode();
-			return (workMode == WorkMode::TrayOnly)
-				|| (workMode == WorkMode::WindowAndTray);
-		};
-		const auto tray = addCheckbox(
-			tr::lng_settings_workmode_tray(),
-			trayEnabled());
-		const auto monochrome = Platform::HasMonochromeSetting()
-			? addSlidingCheckbox(
-				tr::lng_settings_monochrome_icon(),
-				settings->trayIconMonochrome())
-			: nullptr;
-		if (monochrome) {
-			monochrome->toggle(tray->checked(), anim::type::instant);
-
-			monochrome->entity()->checkedChanges(
-			) | rpl::filter([=](bool value) {
-				return (value != settings->trayIconMonochrome());
-			}) | rpl::start_with_next([=](bool value) {
-				settings->setTrayIconMonochrome(value);
-				Core::App().saveSettingsDelayed();
-			}, monochrome->lifetime());
-		}
-
-		const auto taskbarEnabled = [=] {
-			const auto workMode = settings->workMode();
-			return (workMode == WorkMode::WindowOnly)
-				|| (workMode == WorkMode::WindowAndTray);
-		};
-		const auto taskbar = Platform::SkipTaskbarSupported()
-			? addCheckbox(
-				tr::lng_settings_workmode_window(),
-				taskbarEnabled())
-			: nullptr;
-
-		const auto updateWorkmode = [=] {
-			const auto newMode = tray->checked()
-				? ((!taskbar || taskbar->checked())
-					? WorkMode::WindowAndTray
-					: WorkMode::TrayOnly)
-				: WorkMode::WindowOnly;
-			if ((newMode == WorkMode::WindowAndTray
-				|| newMode == WorkMode::TrayOnly)
-				&& settings->workMode() != newMode) {
-				cSetSeenTrayTooltip(false);
-			}
-			settings->setWorkMode(newMode);
-			Core::App().saveSettingsDelayed();
-		};
-
-		tray->checkedChanges(
-		) | rpl::filter([=](bool checked) {
-			return (checked != trayEnabled());
-		}) | rpl::start_with_next([=](bool checked) {
-			if (!checked && taskbar && !taskbar->checked()) {
-				taskbar->setChecked(true);
-			} else {
-				updateWorkmode();
-			}
-			if (monochrome) {
-				monochrome->toggle(checked, anim::type::normal);
-			}
-		}, tray->lifetime());
-
-		if (taskbar) {
-			taskbar->checkedChanges(
-			) | rpl::filter([=](bool checked) {
-				return (checked != taskbarEnabled());
-			}) | rpl::start_with_next([=](bool checked) {
-				if (!checked && !tray->checked()) {
-					tray->setChecked(true);
-				} else {
-					updateWorkmode();
-				}
-			}, taskbar->lifetime());
-		}
-	}
-
-#ifdef Q_OS_MAC
-	const auto warnBeforeQuit = addCheckbox(
-		tr::lng_settings_mac_warn_before_quit(
-			lt_text,
-			rpl::single(Platform::ConfirmQuit::QuitKeysString())),
-		settings->macWarnBeforeQuit());
-	warnBeforeQuit->checkedChanges(
-	) | rpl::filter([=](bool checked) {
-		return (checked != settings->macWarnBeforeQuit());
-	}) | rpl::start_with_next([=](bool checked) {
-		settings->setMacWarnBeforeQuit(checked);
-		Core::App().saveSettingsDelayed();
-	}, warnBeforeQuit->lifetime());
-
-#ifndef OS_MAC_STORE
-	const auto enabled = [=] {
-		const auto digest = base::Platform::CurrentCustomAppIconDigest();
-		return digest && (settings->macRoundIconDigest() == digest);
-	};
-	const auto roundIcon = addCheckbox(
-		tr::lng_settings_mac_round_icon(),
-		enabled());
-	roundIcon->checkedChanges(
-	) | rpl::filter([=](bool checked) {
-		return (checked != enabled());
-	}) | rpl::start_with_next([=](bool checked) {
-		const auto digest = checked
-			? base::Platform::SetCustomAppIcon(IconMacRound())
-			: std::optional<uint64>();
-		if (!checked) {
-			base::Platform::ClearCustomAppIcon();
-		}
-		Window::OverrideApplicationIcon(checked ? IconMacRound() : QImage());
-		Core::App().refreshApplicationIcon();
-		settings->setMacRoundIconDigest(digest);
-		Core::App().saveSettings();
-	}, roundIcon->lifetime());
-#endif // OS_MAC_STORE
-#endif // Q_OS_MAC
-
-	if (!Platform::RunInBackground()) {
-		const auto closeToTaskbar = addSlidingCheckbox(
-			tr::lng_settings_close_to_taskbar(),
-			settings->closeToTaskbar());
-
-		const auto closeToTaskbarShown = std::make_shared<rpl::variable<bool>>(false);
-		settings->workModeValue(
-		) | rpl::start_with_next([=](WorkMode workMode) {
-			*closeToTaskbarShown = !Core::App().tray().has();
-		}, closeToTaskbar->lifetime());
-
-		closeToTaskbar->toggleOn(closeToTaskbarShown->value());
-		closeToTaskbar->entity()->checkedChanges(
-		) | rpl::filter([=](bool checked) {
-			return (checked != settings->closeToTaskbar());
-		}) | rpl::start_with_next([=](bool checked) {
-			settings->setCloseToTaskbar(checked);
-			Local::writeSettings();
-		}, closeToTaskbar->lifetime());
-	}
-
-	if (Platform::AutostartSupported() && controller) {
-		const auto minimizedToggled = [=] {
-			return cStartMinimized()
-				&& !controller->session().domain().local().hasLocalPasscode();
-		};
-
-		const auto autostart = addCheckbox(
-			tr::lng_settings_auto_start(),
-			cAutoStart());
-		const auto minimized = addSlidingCheckbox(
-			tr::lng_settings_start_min(),
-			minimizedToggled());
-
-		autostart->checkedChanges(
-		) | rpl::filter([](bool checked) {
-			return (checked != cAutoStart());
-		}) | rpl::start_with_next([=](bool checked) {
-			const auto weak = base::make_weak(controller);
-			cSetAutoStart(checked);
-			Platform::AutostartToggle(checked, crl::guard(autostart, [=](
-					bool enabled) {
-				if (checked && !enabled && weak) {
-					weak->window().showToast(
-						Lang::Hard::AutostartEnableError());
-				}
-				Ui::PostponeCall(autostart, [=] {
-					autostart->setChecked(enabled);
-				});
-				if (enabled || !minimized->entity()->checked()) {
-					Local::writeSettings();
-				} else {
-					minimized->entity()->setChecked(false);
-				}
-			}));
-		}, autostart->lifetime());
-
-		Platform::AutostartRequestStateFromSystem(crl::guard(
-			controller,
-			[=](bool enabled) { autostart->setChecked(enabled); }));
-
-		minimized->toggleOn(autostart->checkedValue());
-		minimized->entity()->checkedChanges(
-		) | rpl::filter([=](bool checked) {
-			return (checked != minimizedToggled());
-		}) | rpl::start_with_next([=](bool checked) {
-			if (controller->session().domain().local().hasLocalPasscode()) {
-				minimized->entity()->setChecked(false);
-				controller->show(Ui::MakeInformBox(
-					tr::lng_error_start_minimized_passcoded()));
-			} else {
-				cSetStartMinimized(checked);
-				Local::writeSettings();
-			}
-		}, minimized->lifetime());
-
-		controller->session().domain().local().localPasscodeChanged(
-		) | rpl::start_with_next([=] {
-			minimized->entity()->setChecked(minimizedToggled());
-		}, minimized->lifetime());
-	}
-
-	if (Platform::IsWindows() && !Platform::IsWindowsStoreBuild()) {
-		const auto sendto = addCheckbox(
-			tr::lng_settings_add_sendto(),
-			cSendToMenu());
-
-		sendto->checkedChanges(
-		) | rpl::filter([](bool checked) {
-			return (checked != cSendToMenu());
-		}) | rpl::start_with_next([](bool checked) {
-			cSetSendToMenu(checked);
-			psSendToMenu(checked);
-			Local::writeSettings();
-		}, sendto->lifetime());
-	}
-}
-
-template <typename Fill>
-void CheckNonEmptyOptions(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		Fill fill) {
-	auto wrap = object_ptr<Ui::VerticalLayout>(container);
-	fill(controller, wrap.data());
-	if (wrap->count() > 0) {
-		container->add(object_ptr<Ui::OverrideMargins>(
-			container,
-			std::move(wrap)));
-		Ui::AddSkip(container, st::settingsCheckboxesSkip);
-	}
-}
-
-void SetupSystemIntegrationOptions(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	CheckNonEmptyOptions(
-		controller,
-		container,
-		SetupSystemIntegrationContent);
-}
-
-void SetupWindowTitleOptions(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	CheckNonEmptyOptions(
-		controller,
-		container,
-		SetupWindowTitleContent);
-}
-
-void SetupAnimations(
-		not_null<Window::Controller*> window,
-		not_null<Ui::VerticalLayout*> container) {
-	container->add(object_ptr<Button>(
-		container,
-		tr::lng_settings_power_menu(),
-		st::settingsButtonNoIcon
-	))->setClickedCallback([=] { window->show(Box(PowerSavingBox)); });
-}
-
-void ArchiveSettingsBox(
-		not_null<Ui::GenericBox*> box,
-		not_null<Window::SessionController*> controller) {
-	box->setTitle(tr::lng_settings_archive_title());
-	box->setWidth(st::boxWideWidth);
-
-	box->addButton(tr::lng_about_done(), [=] { box->closeBox(); });
-
-	PreloadArchiveSettings(&controller->session());
-
-	struct State {
-		Ui::SlideWrap<Ui::VerticalLayout> *foldersWrap = nullptr;
-		Ui::SettingsButton *folders = nullptr;
-	};
-	const auto state = box->lifetime().make_state<State>();
-	const auto privacy = &controller->session().api().globalPrivacy();
-
-	const auto container = box->verticalLayout();
-	AddSkip(container);
-	AddSubsectionTitle(container, tr::lng_settings_unmuted_chats());
-
-	using Unarchive = Api::UnarchiveOnNewMessage;
-	container->add(object_ptr<Button>(
-		container,
-		tr::lng_settings_always_in_archive(),
-		st::settingsButtonNoIcon
-	))->toggleOn(privacy->unarchiveOnNewMessage(
-	) | rpl::map(
-		rpl::mappers::_1 == Unarchive::None
-	))->toggledChanges(
-	) | rpl::filter([=](bool toggled) {
-		const auto current = privacy->unarchiveOnNewMessageCurrent();
-		state->foldersWrap->toggle(!toggled, anim::type::normal);
-		return toggled != (current == Unarchive::None);
-	}) | rpl::start_with_next([=](bool toggled) {
-		privacy->updateUnarchiveOnNewMessage(toggled
-			? Unarchive::None
-			: state->folders->toggled()
-			? Unarchive::NotInFoldersUnmuted
-			: Unarchive::AnyUnmuted);
-	}, container->lifetime());
-
-	AddSkip(container);
-	AddDividerText(container, tr::lng_settings_unmuted_chats_about());
-
-	state->foldersWrap = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-	const auto inner = state->foldersWrap->entity();
-	AddSkip(inner);
-	AddSubsectionTitle(inner, tr::lng_settings_chats_from_folders());
-
-	state->folders = inner->add(object_ptr<Button>(
-		inner,
-		tr::lng_settings_always_in_archive(),
-		st::settingsButtonNoIcon
-	))->toggleOn(privacy->unarchiveOnNewMessage(
-	) | rpl::map(
-		rpl::mappers::_1 != Unarchive::AnyUnmuted
-	));
-	state->folders->toggledChanges(
-	) | rpl::filter([=](bool toggled) {
-		const auto current = privacy->unarchiveOnNewMessageCurrent();
-		return toggled != (current != Unarchive::AnyUnmuted);
-	}) | rpl::start_with_next([=](bool toggled) {
-		const auto current = privacy->unarchiveOnNewMessageCurrent();
-		privacy->updateUnarchiveOnNewMessage(!toggled
-			? Unarchive::AnyUnmuted
-			: (current == Unarchive::AnyUnmuted)
-			? Unarchive::NotInFoldersUnmuted
-			: current);
-	}, inner->lifetime());
-
-	AddSkip(inner);
-	AddDividerText(inner, tr::lng_settings_chats_from_folders_about());
-
-	state->foldersWrap->toggle(
-		privacy->unarchiveOnNewMessageCurrent() != Unarchive::None,
-		anim::type::instant);
-
-	SetupArchiveAndMute(controller, box->verticalLayout());
-}
-
-void PreloadArchiveSettings(not_null<::Main::Session*> session) {
-	session->api().globalPrivacy().reload();
-}
-
-void SetupHardwareAcceleration(not_null<Ui::VerticalLayout*> container) {
-	const auto settings = &Core::App().settings();
-	container->add(object_ptr<Button>(
-		container,
-		tr::lng_settings_enable_hwaccel(),
-		st::settingsButtonNoIcon
-	))->toggleOn(
-		rpl::single(settings->hardwareAcceleratedVideo())
-	)->toggledValue(
-	) | rpl::filter([=](bool enabled) {
-		return (enabled != settings->hardwareAcceleratedVideo());
-	}) | rpl::start_with_next([=](bool enabled) {
-		settings->setHardwareAcceleratedVideo(enabled);
-		Core::App().saveSettingsDelayed();
-	}, container->lifetime());
-}
-
-#ifdef DESKTOP_APP_USE_ANGLE
-void SetupANGLE(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	using ANGLE = Ui::GL::ANGLE;
-	const auto options = std::vector{
-		tr::lng_settings_angle_backend_auto(tr::now),
-		tr::lng_settings_angle_backend_d3d11(tr::now),
-		tr::lng_settings_angle_backend_d3d9(tr::now),
-		tr::lng_settings_angle_backend_d3d11on12(tr::now),
-		//tr::lng_settings_angle_backend_opengl(tr::now),
-		tr::lng_settings_angle_backend_disabled(tr::now),
-	};
-	const auto disabled = int(options.size()) - 1;
-	const auto backendIndex = [=] {
-		if (Core::App().settings().disableOpenGL()) {
-			return disabled;
-		} else switch (Ui::GL::CurrentANGLE()) {
-		case ANGLE::Auto: return 0;
-		case ANGLE::D3D11: return 1;
-		case ANGLE::D3D9: return 2;
-		case ANGLE::D3D11on12: return 3;
-		//case ANGLE::OpenGL: return 4;
-		}
-		Unexpected("Ui::GL::CurrentANGLE value in SetupANGLE.");
-	}();
-	const auto button = AddButtonWithLabel(
-		container,
-		tr::lng_settings_angle_backend(),
-		rpl::single(options[backendIndex]),
-		st::settingsButtonNoIcon);
-	button->addClickHandler([=] {
-		controller->show(Box([=](not_null<Ui::GenericBox*> box) {
-			const auto save = [=](int index) {
-				if (index == backendIndex) {
-					return;
-				}
-				const auto confirmed = crl::guard(button, [=] {
-					const auto nowDisabled = (index == disabled);
-					if (!nowDisabled) {
-						Ui::GL::ChangeANGLE([&] {
-							switch (index) {
-							case 0: return ANGLE::Auto;
-							case 1: return ANGLE::D3D11;
-							case 2: return ANGLE::D3D9;
-							case 3: return ANGLE::D3D11on12;
-							//case 4: return ANGLE::OpenGL;
-							}
-							Unexpected("Index in SetupANGLE.");
-						}());
-					}
-					const auto wasDisabled = (backendIndex == disabled);
-					if (nowDisabled != wasDisabled) {
-						Core::App().settings().setDisableOpenGL(nowDisabled);
-						Local::writeSettings();
-					}
-					Core::Restart();
-				});
-				controller->show(Ui::MakeConfirmBox({
-					.text = tr::lng_settings_need_restart(),
-					.confirmed = confirmed,
-					.confirmText = tr::lng_settings_restart_now(),
-				}));
-			};
-			SingleChoiceBox(box, {
-				.title = tr::lng_settings_angle_backend(),
-				.options = options,
-				.initialSelection = backendIndex,
-				.callback = save,
-			});
-		}));
-	});
-}
-#endif // DESKTOP_APP_USE_ANGLE
-
-void SetupOpenGL(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	const auto toggles = container->lifetime().make_state<
-		rpl::event_stream<bool>
-	>();
-	const auto button = container->add(object_ptr<Button>(
-		container,
-		tr::lng_settings_enable_opengl(),
-		st::settingsButtonNoIcon
-	))->toggleOn(
-		toggles->events_starting_with_copy(
-			!Core::App().settings().disableOpenGL())
-	);
-	button->toggledValue(
-	) | rpl::filter([](bool enabled) {
-		return (enabled == Core::App().settings().disableOpenGL());
-	}) | rpl::start_with_next([=](bool enabled) {
-		const auto confirmed = crl::guard(button, [=] {
-			Core::App().settings().setDisableOpenGL(!enabled);
-			Local::writeSettings();
-			Core::Restart();
-		});
-		const auto cancelled = crl::guard(button, [=](Fn<void()> close) {
-			toggles->fire(!enabled);
-			close();
-		});
-		controller->show(Ui::MakeConfirmBox({
-			.text = tr::lng_settings_need_restart(),
-			.confirmed = confirmed,
-			.cancelled = cancelled,
-			.confirmText = tr::lng_settings_restart_now(),
-		}));
-	}, container->lifetime());
-}
-
-void SetupPerformance(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	SetupAnimations(&controller->window(), container);
-	SetupHardwareAcceleration(container);
-#ifdef DESKTOP_APP_USE_ANGLE
-	SetupANGLE(controller, container);
-#else // DESKTOP_APP_USE_ANGLE
-	if constexpr (!Platform::IsMac()) {
-		SetupOpenGL(controller, container);
-	}
-#endif // DESKTOP_APP_USE_ANGLE
-}
-
-void SetupWindowTitle(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	AddDivider(container);
-	AddSkip(container);
-	AddSubsectionTitle(container, tr::lng_settings_window_system());
-	SetupWindowTitleOptions(controller, container);
-	AddSkip(container);
-}
-
-void SetupSystemIntegration(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	AddDivider(container);
-	AddSkip(container);
-	AddSubsectionTitle(container, tr::lng_settings_system_integration());
-	SetupSystemIntegrationOptions(controller, container);
-	AddSkip(container);
-}
-
-Advanced::Advanced(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller)
-: Section(parent) {
-	setupContent(controller);
-}
-
-rpl::producer<QString> Advanced::title() {
-	return tr::lng_settings_advanced();
-}
-
-void Advanced::setupContent(not_null<Window::SessionController*> controller) {
-	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-
-	auto empty = true;
-	const auto addDivider = [&] {
-		if (empty) {
-			empty = false;
-		} else {
-			AddDivider(content);
-		}
-	};
-	const auto addUpdate = [&] {
-		if (HasUpdate()) {
-			addDivider();
-			AddSkip(content);
-			AddSubsectionTitle(content, tr::lng_settings_version_info());
-			SetupUpdate(content);
-			AddSkip(content);
-		}
-	};
-	if (!cAutoUpdate()) {
-		addUpdate();
-	}
-	addDivider();
-	SetupDataStorage(controller, content);
-	SetupAutoDownload(controller, content);
-	SetupWindowTitle(controller, content);
-	SetupSystemIntegration(controller, content);
-	empty = false;
-
-	AddDivider(content);
-	AddSkip(content);
-	AddSubsectionTitle(content, tr::lng_settings_performance());
-	SetupPerformance(controller, content);
-	AddSkip(content);
-
-	if (HasSystemSpellchecker()) {
-		AddDivider(content);
-		AddSkip(content);
-		AddSubsectionTitle(content, tr::lng_settings_spellchecker());
-		SetupSpellchecker(controller, content);
-		AddSkip(content);
-	}
-
-	if (cAutoUpdate()) {
-		addUpdate();
-	}
-
-	AddSkip(content);
-	AddDivider(content);
-	AddSkip(content);
-	SetupExport(controller, content, showOtherMethod());
-
-	Ui::ResizeFitChild(this, content);
-}
-
-} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_blocked_peers.h b/Telegram/SourceFiles/settings/settings_blocked_peers.h
deleted file mode 100644
index b534cd87ecfd3f..00000000000000
--- a/Telegram/SourceFiles/settings/settings_blocked_peers.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include "settings/settings_common_session.h"
-
-namespace Ui {
-class VerticalLayout;
-} // namespace Ui
-
-namespace Window {
-class Controller;
-} // namespace Window
-
-namespace Settings {
-
-class Blocked : public Section<Blocked> {
-public:
-	Blocked(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller);
-
-	void showFinished() override;
-
-	[[nodiscard]] rpl::producer<QString> title() override;
-
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToTop(
-		not_null<QWidget*> parent) override;
-
-private:
-	void setupContent();
-	void checkTotal(int total);
-
-	void visibleTopBottomUpdated(int visibleTop, int visibleBottom) override;
-
-	const not_null<Window::SessionController*> _controller;
-	const not_null<Ui::VerticalLayout*> _container;
-
-	base::unique_qptr<Ui::RpWidget> _loading;
-
-	rpl::variable<int> _countBlocked;
-
-	rpl::event_stream<> _showFinished;
-	rpl::event_stream<bool> _emptinessChanges;
-
-};
-
-} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_builder.cpp b/Telegram/SourceFiles/settings/settings_builder.cpp
new file mode 100644
index 00000000000000..20b6e6dad9c927
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_builder.cpp
@@ -0,0 +1,494 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/settings_builder.h"
+
+#include "apiwrap.h"
+#include "lang/lang_keys.h"
+#include "api/api_user_privacy.h"
+#include "boxes/edit_privacy_box.h"
+#include "main/main_session.h"
+#include "settings/settings_common.h"
+#include "settings/sections/settings_privacy_security.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_session_controller.h"
+#include "styles/style_settings.h"
+
+namespace Settings::Builder {
+namespace {
+
+[[nodiscard]] QString ResolveTitle(rpl::producer<QString> title) {
+	auto result = QString();
+	auto lifetime = rpl::lifetime();
+	std::move(title).start(
+		[&](QString value) { result = std::move(value); },
+		[](auto&&) {},
+		[] {},
+		lifetime);
+	return result;
+}
+
+} // namespace
+
+BuildHelper::BuildHelper(
+	SectionMeta &&meta,
+	FnMut<void(SectionBuilder&)> method)
+: build([=](
+		not_null<Ui::VerticalLayout*> container,
+		not_null<Window::SessionController*> controller,
+		Fn<void(Type)> showOther,
+		rpl::producer<> showFinished) {
+	auto &lifetime = container->lifetime();
+	const auto highlights = lifetime.make_state<HighlightRegistry>();
+	const auto isPaused = Window::PausedIn(
+		controller,
+		Window::GifPauseReason::Layer);
+	auto builder = SectionBuilder(WidgetContext{
+		.container = static_cast<Ui::VerticalLayout*>(
+			container->add(object_ptr<Ui::OverrideMargins>(
+				container,
+				object_ptr<Ui::VerticalLayout>(container)))->entity()),
+		.controller = controller,
+		.showOther = std::move(showOther),
+		.isPaused = isPaused,
+		.highlights = highlights,
+	});
+	_method(builder);
+
+	std::move(showFinished) | rpl::on_next([=] {
+		for (const auto &[id, entry] : *highlights) {
+			if (entry.widget) {
+				controller->checkHighlightControl(
+					id,
+					entry.widget,
+					base::duplicate(entry.args));
+			}
+		}
+	}, lifetime);
+})
+, _meta(std::move(meta))
+, _method(std::move(method)) {
+	Expects(_method != nullptr);
+
+	SearchRegistry::Instance().add(
+		&_meta,
+		[=](not_null<::Main::Session*> session) { return index(session); });
+}
+
+SearchRegistry &SearchRegistry::Instance() {
+	static SearchRegistry instance;
+	return instance;
+}
+
+void SearchRegistry::add(
+		not_null<const SectionMeta*> meta,
+		SearchEntriesIndexer indexer) {
+	_sections[meta->id] = meta;
+	_indexers.push_back({ meta->id, std::move(indexer) });
+}
+
+std::vector<SearchEntry> SearchRegistry::collectAll(
+		not_null<Main::Session*> session) const {
+	auto result = std::vector<SearchEntry>();
+	for (const auto &[sectionId, meta] : _sections) {
+		if (meta->parentId) {
+			result.push_back({
+				.title = (*meta->title)(tr::now),
+				.section = sectionId,
+				.icon = { meta->icon },
+			});
+		}
+	}
+	for (const auto &entry : _indexers) {
+		auto entries = entry.indexer(session);
+		result.insert(result.end(), entries.begin(), entries.end());
+	}
+	return result;
+}
+
+QString SearchRegistry::sectionTitle(Type sectionId) const {
+	const auto it = _sections.find(sectionId);
+	return (it != _sections.end()) ? (*it->second->title)(tr::now) : QString();
+}
+
+QString SearchRegistry::sectionPath(Type sectionId, bool parentsOnly) const {
+	auto parts = QStringList();
+	auto current = sectionId;
+	while (current) {
+		if (const auto title = sectionTitle(current); !title.isEmpty()) {
+			parts.prepend(title);
+		}
+		const auto it = _sections.find(current);
+		current = (it != _sections.end()) ? it->second->parentId : nullptr;
+	}
+	if (parts.size() > 1 && parentsOnly) {
+		parts.pop_back();
+	}
+	return parts.join(u" > "_q);
+}
+
+std::vector<SearchEntry> BuildHelper::index(
+		not_null<Main::Session*> session) const {
+	auto entries = std::vector<SearchEntry>();
+	auto builder = SectionBuilder(SearchContext{
+		.sectionId = _meta.id,
+		.session = session,
+		.entries = &entries,
+	});
+	_method(builder);
+	for (auto &entry : entries) {
+		if (!entry.section) {
+			entry.section = _meta.id;
+		}
+	}
+	return entries;
+}
+
+SectionBuilder::SectionBuilder(BuildContext context)
+: _context(std::move(context)) {
+}
+
+void SectionBuilder::add(FnMut<void(const BuildContext &ctx)> method) {
+	Expects(method != nullptr);
+
+	method(_context);
+}
+
+Ui::VerticalLayout *SectionBuilder::scope(
+		FnMut<void()> method,
+		rpl::producer<bool> shown,
+		FnMut<void(ToggledScopePtr)> hook) {
+	auto result = (Ui::VerticalLayout*)nullptr;
+	v::match(_context, [&](WidgetContext &wctx) {
+		const auto outer = wctx.container;
+		const auto toggled = (shown || hook);
+		const auto wrap = toggled
+			? outer->add(
+				object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+					outer,
+					object_ptr<Ui::VerticalLayout>(outer)))
+			: nullptr;
+		const auto inner = wrap
+			? wrap->entity()
+			: outer->add(object_ptr<Ui::VerticalLayout>(outer));
+		wctx.container = inner;
+		method();
+		if (shown) {
+			wrap->toggleOn(std::move(shown));
+			wrap->finishAnimating();
+		}
+		if (hook) {
+			hook(wrap);
+		}
+		wctx.container = outer;
+		result = inner;
+	}, [&](const SearchContext &sctx) {
+		method();
+	});
+	return result;
+}
+
+Ui::RpWidget *SectionBuilder::add(
+		FnMut<WidgetToAdd(const WidgetContext &ctx)> widget,
+		FnMut<SearchEntry()> search) {
+	auto result = (Ui::RpWidget*)nullptr;
+	add([&](const BuildContext &ctx) {
+		v::match(ctx, [&](const WidgetContext &wctx) {
+			if (auto w = widget ? widget(wctx) : WidgetToAdd()) {
+				result = w.widget.data();
+				wctx.container->add(std::move(w.widget), w.margin, w.align);
+
+				if (auto entry = search ? search() : SearchEntry()) {
+					if (wctx.highlights) {
+						wctx.highlights->push_back({
+							std::move(entry.id),
+							{ result, std::move(w.highlight) },
+						});
+					}
+				}
+			}
+		}, [&](const SearchContext &sctx) {
+			if (auto entry = search ? search() : SearchEntry()) {
+				entry.section = sctx.sectionId;
+				sctx.entries->push_back(std::move(entry));
+			}
+		});
+	});
+	return result;
+}
+
+Ui::RpWidget *SectionBuilder::addControl(ControlArgs &&args) {
+	if (auto shown = base::take(args.shown)) {
+		auto result = (Ui::RpWidget*)nullptr;
+		scope([&] {
+			result = addControl(std::move(args));
+		}, std::move(shown));
+		return result;
+	}
+	return add([&](const WidgetContext &ctx) {
+		return WidgetToAdd{
+			.widget = args.factory ? args.factory(ctx.container) : nullptr,
+			.margin = args.margin,
+			.align = args.align,
+			.highlight = std::move(args.highlight),
+		};
+	}, [&]() mutable {
+		return SearchEntry{
+			.id = std::move(args.id),
+			.title = ResolveTitle(std::move(args.title)),
+			.keywords = std::move(args.keywords),
+			.icon = std::move(args.searchIcon),
+			.checkIcon = args.searchCheckIcon,
+		};
+	});
+}
+
+Ui::SettingsButton *SectionBuilder::addButton(ButtonArgs &&args) {
+	const auto &st = args.st ? *args.st : st::settingsButton;
+	auto iconForSearch = IconDescriptor{ args.icon.icon };
+	const auto factory = [&](not_null<Ui::VerticalLayout*> container) {
+		auto button = CreateButtonWithIcon(
+			args.container ? args.container : container.get(),
+			rpl::duplicate(args.title),
+			st,
+			std::move(args.icon));
+		if (button && args.onClick) {
+			button->addClickHandler(std::move(args.onClick));
+		}
+		if (args.label) {
+			CreateRightLabel(
+				button.data(),
+				std::move(args.label),
+				st,
+				rpl::duplicate(args.title));
+		}
+		if (args.toggled) {
+			button->toggleOn(std::move(args.toggled));
+		}
+		return button;
+	};
+	return static_cast<Ui::SettingsButton*>(addControl({
+		.factory = factory,
+		.id = std::move(args.id),
+		.title = rpl::duplicate(args.title),
+		.highlight = std::move(args.highlight),
+		.shown = std::move(args.shown),
+
+		.keywords = std::move(args.keywords),
+		.searchIcon = std::move(iconForSearch),
+	}));
+}
+
+Ui::SettingsButton *SectionBuilder::addSectionButton(SectionArgs &&args) {
+	const auto wctx = std::get_if<WidgetContext>(&_context);
+	const auto showOther = wctx ? wctx->showOther : nullptr;
+	const auto target = args.targetSection;
+	return addButton({
+		.title = std::move(args.title),
+		.icon = std::move(args.icon),
+		.onClick = [=] { showOther(target); },
+		.keywords = std::move(args.keywords),
+	});
+}
+
+void SectionBuilder::addDivider() {
+	v::match(_context, [&](const WidgetContext &ctx) {
+		Ui::AddDivider(ctx.container);
+	}, [](const SearchContext &) {
+	});
+}
+
+void SectionBuilder::addSkip() {
+	v::match(_context, [&](const WidgetContext &ctx) {
+		Ui::AddSkip(ctx.container);
+	}, [](const SearchContext &) {
+	});
+}
+
+void SectionBuilder::addSkip(int height) {
+	v::match(_context, [&](const WidgetContext &ctx) {
+		Ui::AddSkip(ctx.container, height);
+	}, [](const SearchContext &) {
+	});
+}
+
+void SectionBuilder::addDividerText(rpl::producer<QString> text) {
+	v::match(_context, [&](const WidgetContext &ctx) {
+		Ui::AddDividerText(ctx.container, std::move(text));
+	}, [](const SearchContext &) {
+	});
+}
+
+Ui::SettingsButton *SectionBuilder::addPremiumButton(PremiumButtonArgs &&args) {
+	const auto result = addButton({
+		.id = std::move(args.id),
+		.title = std::move(args.title),
+		.label = std::move(args.label),
+		.onClick = std::move(args.onClick),
+		.keywords = std::move(args.keywords),
+	});
+	if (result) {
+		AddPremiumStar(
+			result,
+			args.credits,
+			v::get<WidgetContext>(_context).isPaused);
+	}
+	return result;
+}
+
+Ui::SettingsButton *SectionBuilder::addPrivacyButton(PrivacyButtonArgs &&args) {
+	const auto controller = this->controller();
+	const auto session = this->session();
+
+	const auto button = addButton({
+		.id = args.id,
+		.title = rpl::duplicate(args.title),
+		.st = &st::settingsButtonNoIcon,
+		.label = PrivacyButtonLabel(session, args.key),
+		.keywords = args.keywords,
+	});
+	if (button) {
+		const auto id = args.id;
+		const auto premium = args.premium;
+		const auto shower = Ui::CreateChild<rpl::lifetime>(button);
+		const auto factory = args.controllerFactory;
+		button->addClickHandler([=, key = args.key] {
+			*shower = session->api().userPrivacy().value(
+				key
+			) | rpl::take(
+				1
+			) | rpl::on_next(crl::guard(controller, [=](
+					const Api::UserPrivacy::Rule &value) {
+				controller->show(Box<EditPrivacyBox>(
+					controller,
+					factory(),
+					value));
+			}));
+		});
+		if (premium) {
+			AddPrivacyPremiumStar(
+				button,
+				session,
+				std::move(args.title),
+				st::settingsButtonNoIcon.padding);
+		}
+	}
+	return button;
+}
+
+Ui::Checkbox *SectionBuilder::addCheckbox(CheckboxArgs &&args) {
+	const auto factory = [&](not_null<Ui::VerticalLayout*> container) {
+		return object_ptr<Ui::Checkbox>(
+			container,
+			ResolveTitle(rpl::duplicate(args.title)),
+			args.checked,
+			st::settingsCheckbox);
+	};
+	return static_cast<Ui::Checkbox*>(addControl({
+		.factory = factory,
+		.id = std::move(args.id),
+		.title = rpl::duplicate(args.title),
+		.margin = st::settingsCheckboxPadding,
+		.highlight = std::move(args.highlight),
+		.shown = std::move(args.shown),
+		.keywords = std::move(args.keywords),
+		.searchCheckIcon = (args.checked
+			? SearchEntryCheckIcon::Checked
+			: SearchEntryCheckIcon::Unchecked),
+	}));
+}
+
+void SectionBuilder::addSubsectionTitle(SubsectionTitleArgs &&args) {
+	v::match(_context, [&](const WidgetContext &ctx) {
+		const auto title = AddSubsectionTitle(
+			ctx.container,
+			rpl::duplicate(args.title));
+		if (!args.id.isEmpty() && ctx.highlights) {
+			ctx.highlights->push_back({
+				args.id,
+				{ title.get(), SubsectionTitleHighlight() },
+			});
+		}
+	}, [&](const SearchContext &ctx) {
+		if (!args.id.isEmpty()) {
+			ctx.entries->push_back({
+				.id = std::move(args.id),
+				.title = ResolveTitle(std::move(args.title)),
+				.keywords = std::move(args.keywords),
+				.section = ctx.sectionId,
+			});
+		}
+	});
+}
+
+void SectionBuilder::addSubsectionTitle(rpl::producer<QString> text) {
+	v::match(_context, [&](const WidgetContext &ctx) {
+		AddSubsectionTitle(ctx.container, std::move(text));
+	}, [](const SearchContext &) {
+	});
+}
+
+Ui::VerticalLayout *SectionBuilder::container() const {
+	return v::match(_context, [](const WidgetContext &ctx) {
+		return ctx.container.get();
+	}, [](const SearchContext &) -> Ui::VerticalLayout* {
+		return nullptr;
+	});
+}
+
+Window::SessionController *SectionBuilder::controller() const {
+	return v::match(_context, [](const WidgetContext &ctx) {
+		return ctx.controller.get();
+	}, [](const SearchContext &) -> Window::SessionController* {
+		return nullptr;
+	});
+}
+
+not_null<Main::Session*> SectionBuilder::session() const {
+	return v::match(_context, [](const WidgetContext &ctx) {
+		return &ctx.controller->session();
+	}, [](const SearchContext &ctx) {
+		return ctx.session.get();
+	});
+}
+
+Fn<void(Type)> SectionBuilder::showOther() const {
+	return v::match(_context, [](const WidgetContext &ctx) {
+		return ctx.showOther;
+	}, [](const SearchContext &) -> Fn<void(Type)> {
+		return nullptr;
+	});
+}
+
+HighlightRegistry *SectionBuilder::highlights() const {
+	return v::match(_context, [](const WidgetContext &ctx) {
+		return ctx.highlights;
+	}, [](const SearchContext &) -> HighlightRegistry* {
+		return nullptr;
+	});
+}
+
+void SectionBuilder::registerHighlight(
+		QString id,
+		QWidget *widget,
+		HighlightArgs &&args) {
+	v::match(_context, [&](const WidgetContext &ctx) {
+		if (ctx.highlights && widget) {
+			ctx.highlights->push_back({
+				std::move(id),
+				{ widget, std::move(args) },
+			});
+		}
+	}, [](const SearchContext &) {
+	});
+}
+
+} // namespace Settings::Builder
diff --git a/Telegram/SourceFiles/settings/settings_builder.h b/Telegram/SourceFiles/settings/settings_builder.h
new file mode 100644
index 00000000000000..3ac0a93b0826aa
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_builder.h
@@ -0,0 +1,268 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "api/api_user_privacy.h"
+#include "base/object_ptr.h"
+#include "settings/settings_common.h"
+#include "settings/settings_type.h"
+
+#include <variant>
+#include <vector>
+
+class EditPrivacyController;
+
+namespace Ui {
+class RpWidget;
+class VerticalLayout;
+class SettingsButton;
+class Checkbox;
+} // namespace Ui
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace style {
+struct SettingsButton;
+} // namespace style
+
+namespace st {
+extern const int &boxRadius;
+} // namespace st
+
+namespace Ui {
+template <typename Widget>
+class SlideWrap;
+} // namespace Ui
+
+namespace tr {
+template <typename ...Tags>
+struct phrase;
+} // namespace tr
+
+namespace Settings::Builder {
+
+class SectionBuilder;
+
+enum class SearchEntryCheckIcon {
+	None,
+	Checked,
+	Unchecked,
+};
+struct SearchEntry {
+	QString id;
+	QString title;
+	QStringList keywords;
+	Type section;
+	IconDescriptor icon;
+	SearchEntryCheckIcon checkIcon = SearchEntryCheckIcon::None;
+	QString deeplink;
+
+	explicit operator bool() const {
+		return !id.isEmpty();
+	}
+};
+
+using SearchEntriesIndexer = Fn<std::vector<SearchEntry>(
+	not_null<::Main::Session*> session)>;
+
+struct SearchIndexerEntry {
+	Type sectionId;
+	SearchEntriesIndexer indexer;
+};
+
+struct SectionMeta {
+	Type id;
+	Type parentId;
+	not_null<const tr::phrase<>*> title;
+	not_null<const style::icon*> icon;
+};
+
+class SearchRegistry {
+public:
+	static SearchRegistry &Instance();
+
+	void add(
+		not_null<const SectionMeta*> meta,
+		SearchEntriesIndexer indexer);
+
+	[[nodiscard]] std::vector<SearchEntry> collectAll(
+		not_null<::Main::Session*> session) const;
+
+	[[nodiscard]] QString sectionTitle(Type sectionId) const;
+	[[nodiscard]] QString sectionPath(
+		Type sectionId,
+		bool parentsOnly = false) const;
+
+private:
+	std::vector<SearchIndexerEntry> _indexers;
+	base::flat_map<Type, const SectionMeta*> _sections;
+
+};
+
+
+class BuildHelper {
+public:
+	BuildHelper(SectionMeta &&meta, FnMut<void(SectionBuilder&)> method);
+
+	const SectionBuildMethod build;
+
+	[[nodiscard]] std::vector<SearchEntry> index(
+		not_null<::Main::Session*> session) const;
+
+private:
+	const SectionMeta _meta;
+	mutable FnMut<void(SectionBuilder &)> _method;
+
+};
+
+struct WidgetContext {
+	not_null<Ui::VerticalLayout*> container;
+	not_null<Window::SessionController*> controller;
+	Fn<void(Type)> showOther;
+	Fn<bool()> isPaused;
+	HighlightRegistry *highlights = nullptr;
+};
+
+struct SearchContext {
+	Type sectionId;
+	not_null<::Main::Session*> session;
+	not_null<std::vector<SearchEntry>*> entries;
+};
+
+using BuildContext = std::variant<WidgetContext, SearchContext>;
+
+class SectionBuilder {
+public:
+	explicit SectionBuilder(BuildContext context);
+
+	void add(FnMut<void(const BuildContext &ctx)> method);
+
+	using ToggledScopePtr = not_null<Ui::SlideWrap<Ui::VerticalLayout>*>;
+	Ui::VerticalLayout *scope(
+		FnMut<void()> method,
+		rpl::producer<bool> shown = nullptr,
+		FnMut<void(ToggledScopePtr)> hook = nullptr);
+
+	struct WidgetToAdd {
+		object_ptr<Ui::RpWidget> widget = { nullptr };
+		QMargins margin;
+		style::align align = style::al_left;
+		HighlightArgs highlight;
+
+		explicit operator bool() const {
+			return widget != nullptr;
+		}
+	};
+	Ui::RpWidget *add(
+		FnMut<WidgetToAdd(const WidgetContext &ctx)> widget,
+		FnMut<SearchEntry()> search = nullptr);
+
+	struct ControlArgs {
+		Fn<object_ptr<Ui::RpWidget>(not_null<Ui::VerticalLayout*>)> factory;
+		QString id;
+		rpl::producer<QString> title;
+		style::margins margin;
+		style::align align = style::al_left;
+		HighlightArgs highlight;
+		rpl::producer<bool> shown;
+
+		QStringList keywords;
+		IconDescriptor searchIcon;
+		SearchEntryCheckIcon searchCheckIcon = SearchEntryCheckIcon::None;
+	};
+	Ui::RpWidget *addControl(ControlArgs &&args);
+
+	struct ButtonArgs {
+		QString id;
+		rpl::producer<QString> title;
+		const style::SettingsButton *st = nullptr;
+		IconDescriptor icon;
+		Ui::VerticalLayout *container = nullptr;
+		rpl::producer<QString> label;
+		rpl::producer<bool> toggled;
+		Fn<void()> onClick;
+		QStringList keywords;
+		HighlightArgs highlight;
+		rpl::producer<bool> shown;
+	};
+	Ui::SettingsButton *addButton(ButtonArgs &&args);
+
+	struct SectionArgs {
+		//QString id; // Sections should register themselves in search.
+		rpl::producer<QString> title;
+		Type targetSection;
+		IconDescriptor icon;
+		QStringList keywords;
+	};
+	Ui::SettingsButton *addSectionButton(SectionArgs &&args);
+
+	struct PremiumButtonArgs {
+		QString id;
+		rpl::producer<QString> title;
+		rpl::producer<QString> label;
+		bool credits = false;
+		Fn<void()> onClick;
+		QStringList keywords;
+	};
+	Ui::SettingsButton *addPremiumButton(PremiumButtonArgs &&args);
+
+	struct PrivacyButtonArgs {
+		QString id;
+		rpl::producer<QString> title;
+		Api::UserPrivacy::Key key;
+		Fn<std::unique_ptr<EditPrivacyController>()> controllerFactory;
+		bool premium = false;
+		QStringList keywords;
+	};
+	Ui::SettingsButton *addPrivacyButton(PrivacyButtonArgs &&args);
+
+	struct CheckboxArgs {
+		QString id;
+		rpl::producer<QString> title;
+		bool checked = false;
+		QStringList keywords;
+		HighlightArgs highlight = { .radius = st::boxRadius };
+		rpl::producer<bool> shown;
+	};
+	Ui::Checkbox *addCheckbox(CheckboxArgs &&args);
+
+	struct SubsectionTitleArgs {
+		QString id;
+		rpl::producer<QString> title;
+		QStringList keywords;
+	};
+	void addSubsectionTitle(SubsectionTitleArgs &&args);
+	void addSubsectionTitle(rpl::producer<QString> text);
+	void addDivider();
+	void addDividerText(rpl::producer<QString> text);
+	void addSkip();
+	void addSkip(int height);
+
+	[[nodiscard]] Ui::VerticalLayout *container() const;
+	[[nodiscard]] Window::SessionController *controller() const;
+	[[nodiscard]] not_null<::Main::Session*> session() const;
+	[[nodiscard]] Fn<void(Type)> showOther() const;
+	[[nodiscard]] HighlightRegistry *highlights() const;
+
+private:
+	void registerHighlight(
+		QString id,
+		QWidget *widget,
+		HighlightArgs &&args);
+
+	BuildContext _context;
+
+};
+
+} // namespace Settings::Builder
diff --git a/Telegram/SourceFiles/settings/settings_chat.h b/Telegram/SourceFiles/settings/settings_chat.h
deleted file mode 100644
index 70724ea2ba71ec..00000000000000
--- a/Telegram/SourceFiles/settings/settings_chat.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include "settings/settings_common_session.h"
-
-namespace Window {
-class Controller;
-} // namespace Window
-
-namespace Settings {
-
-void SetupDataStorage(
-	not_null<Window::SessionController*> controller,
-	not_null<Ui::VerticalLayout*> container);
-void SetupAutoDownload(
-	not_null<Window::SessionController*> controller,
-	not_null<Ui::VerticalLayout*> container);
-void SetupDefaultThemes(
-	not_null<Window::Controller*> window,
-	not_null<Ui::VerticalLayout*> container);
-void SetupSupport(
-	not_null<Window::SessionController*> controller,
-	not_null<Ui::VerticalLayout*> container);
-void SetupExport(
-	not_null<Window::SessionController*> controller,
-	not_null<Ui::VerticalLayout*> container,
-	Fn<void(Type)> showOther);
-
-void PaintRoundColorButton(
-	QPainter &p,
-	int size,
-	QBrush brush,
-	float64 selected);
-
-class Chat : public Section<Chat> {
-public:
-	Chat(QWidget *parent, not_null<Window::SessionController*> controller);
-
-	[[nodiscard]] rpl::producer<QString> title() override;
-
-	void fillTopBarMenu(
-		const Ui::Menu::MenuCallback &addAction) override;
-
-private:
-	void setupContent(not_null<Window::SessionController*> controller);
-
-	const not_null<Window::SessionController*> _controller;
-
-};
-
-} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_codes.cpp b/Telegram/SourceFiles/settings/settings_codes.cpp
index 28f49589765f60..68d0c112a743ec 100644
--- a/Telegram/SourceFiles/settings/settings_codes.cpp
+++ b/Telegram/SourceFiles/settings/settings_codes.cpp
@@ -12,6 +12,7 @@ For license and copyright information please follow this link:
 #include "mainwindow.h"
 #include "data/data_session.h"
 #include "data/data_cloud_themes.h"
+#include "history/history_item_components.h"
 #include "main/main_session.h"
 #include "main/main_account.h"
 #include "main/main_domain.h"
@@ -27,10 +28,12 @@ For license and copyright information please follow this link:
 #include "window/themes/window_theme_editor.h"
 #include "window/window_session_controller.h"
 #include "media/audio/media_audio_track.h"
-#include "settings/settings_folders.h"
+#include "settings/sections/settings_folders.h"
+#include "storage/storage_account.h"
 #include "api/api_updates.h"
 #include "base/qt/qt_common_adapters.h"
 #include "base/custom_app_icon.h"
+#include "base/options.h"
 #include "boxes/abstract_box.h" // Ui::show().
 
 #include <zlib.h>
@@ -158,13 +161,22 @@ auto GenerateCodes() {
 	});
 	codes.emplace(u"folders"_q, [](SessionController *window) {
 		if (window) {
-			window->showSettings(Settings::Folders::Id());
+			window->showSettings(Settings::FoldersId());
 		}
 	});
 	codes.emplace(u"registertg"_q, [](SessionController *window) {
 		Core::Application::RegisterUrlScheme();
 		Ui::Toast::Show("Forced custom scheme register.");
 	});
+	codes.emplace(u"numberbuttons"_q, [](SessionController *window) {
+		using namespace base::options;
+		auto &option = lookup<bool>(kOptionFastButtonsMode);
+		const auto now = !option.value();
+		option.set(now);
+		Ui::Toast::Show(now
+			? u"Fast buttons mode enabled."_q
+			: u"Fast buttons mode disabled."_q);
+	});
 
 	auto audioFilters = u"Audio files (*.wav *.mp3);;"_q + FileDialog::AllFilesFilter();
 	auto audioKeys = {
diff --git a/Telegram/SourceFiles/settings/settings_common.cpp b/Telegram/SourceFiles/settings/settings_common.cpp
index 77cdd80470426d..866acc33f1b418 100644
--- a/Telegram/SourceFiles/settings/settings_common.cpp
+++ b/Telegram/SourceFiles/settings/settings_common.cpp
@@ -7,17 +7,313 @@ For license and copyright information please follow this link:
 */
 #include "settings/settings_common.h"
 
+#include "base/timer.h"
 #include "lottie/lottie_icon.h"
+#include "menu/menu_send_details.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/premium_graphics.h"
+#include "ui/effects/premium_top_bar.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/elastic_scroll.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/scroll_area.h"
 #include "ui/wrap/vertical_layout.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_settings.h"
+#include "styles/style_widgets.h"
 
 #include <QAction>
 
 namespace Settings {
+namespace {
+
+[[nodiscard]] HighlightArgs MaybeFillFromRipple(
+		not_null<QWidget*> target,
+		HighlightArgs args) {
+	if (!args.rippleShape) {
+		return args;
+	}
+	const auto widget = target.get();
+	if (const auto icon = dynamic_cast<Ui::IconButton*>(widget)) {
+		const auto &st = icon->st();
+		args.shape = HighlightShape::Ellipse;
+		args.margin = QMargins(
+			st.rippleAreaPosition.x(),
+			st.rippleAreaPosition.y(),
+			st.width - st.rippleAreaPosition.x() - st.rippleAreaSize,
+			st.height - st.rippleAreaPosition.y() - st.rippleAreaSize);
+	} else if (const auto round = dynamic_cast<Ui::RoundButton*>(widget)) {
+		const auto &st = round->st();
+		args.shape = HighlightShape::Rect;
+		args.radius = st.radius ? st.radius : st::buttonRadius;
+	}
+	return args;
+}
+
+class HighlightOverlay final : public Ui::RpWidget {
+public:
+	HighlightOverlay(not_null<QWidget*> target, HighlightArgs &&args);
+
+protected:
+	bool eventFilter(QObject *o, QEvent *e) override;
+
+private:
+	enum class Phase {
+		Wait,
+		FadeIn,
+		Shown,
+		FadeOut,
+	};
+
+	void updateGeometryFromTarget();
+	void updateZOrder();
+	void startFadeIn();
+	void startFadeOut();
+	void nextPhase();
+	void nextPhaseIn(crl::time delay);
+	void finish();
+
+	const QPointer<QWidget> _target;
+	const HighlightArgs _args;
+	const style::color &_color;
+
+	Ui::Animations::Simple _animation;
+	base::Timer _phaseTimer;
+	Phase _phase = Phase::Wait;
+	bool _finishing = false;
+
+};
+
+HighlightOverlay::HighlightOverlay(
+	not_null<QWidget*> target,
+	HighlightArgs &&args)
+: RpWidget(target->parentWidget())
+, _target(target.get())
+, _args(MaybeFillFromRipple(target, std::move(args)))
+, _color(_args.color ? *_args.color : st::windowBgActive)
+, _phaseTimer([=] { nextPhase(); }) {
+	setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	target->installEventFilter(this);
+
+	QObject::connect(
+		target.get(),
+		&QObject::destroyed,
+		this,
+		[this] { finish(); });
+
+	updateGeometryFromTarget();
+	updateZOrder();
+
+	paintRequest() | rpl::on_next([=](QRect clip) {
+		auto p = QPainter(this);
+
+		const auto progress = _animation.value(
+			(_phase == Phase::Wait || _phase == Phase::FadeOut) ? 0. : 1.);
+		const auto alpha = _args.opacity * progress;
+
+		auto color = _color->c;
+		color.setAlphaF(color.alphaF() * alpha);
+
+		p.setPen(Qt::NoPen);
+		p.setBrush(color);
+
+		const auto r = rect();
+		switch (_args.shape) {
+		case HighlightShape::Rect:
+			if (_args.radius > 0) {
+				PainterHighQualityEnabler hq(p);
+				p.drawRoundedRect(r, _args.radius, _args.radius);
+			} else {
+				p.drawRect(r);
+			}
+			break;
+		case HighlightShape::Ellipse:
+			PainterHighQualityEnabler hq(p);
+			p.drawEllipse(r);
+			break;
+		}
+	}, lifetime());
+
+	hide();
+	nextPhaseIn(_args.showDelay);
+}
+
+bool HighlightOverlay::eventFilter(QObject *o, QEvent *e) {
+	if (o != _target.data()) {
+		return false;
+	}
+	switch (e->type()) {
+	case QEvent::Move:
+	case QEvent::Resize:
+		updateGeometryFromTarget();
+		break;
+	case QEvent::ZOrderChange:
+		updateZOrder();
+		break;
+	case QEvent::Show:
+	case QEvent::Hide:
+		setVisible(!_target->isHidden());
+		break;
+	default:
+		break;
+	}
+	return false;
+}
+
+void HighlightOverlay::updateGeometryFromTarget() {
+	if (_target) {
+		setGeometry(_target->geometry().marginsRemoved(_args.margin));
+	}
+}
+
+void HighlightOverlay::updateZOrder() {
+	if (!_target) {
+		return;
+	}
+	if (_args.below) {
+		stackUnder(_target);
+	} else {
+		const auto parent = _target->parentWidget();
+		const auto siblings = parent ? parent->children() : QObjectList();
+		const auto it = ranges::find(siblings, _target.data());
+		const auto next = (it != siblings.end()) ? (it + 1) : it;
+		if (next != siblings.end()) {
+			if (const auto widget = qobject_cast<QWidget*>(*next)) {
+				stackUnder(widget);
+				return;
+			}
+		}
+		raise();
+	}
+}
+
+void HighlightOverlay::startFadeIn() {
+	show();
+
+	_phase = Phase::FadeIn;
+	_animation.start([=] {
+		update();
+		if (!_animation.animating()) {
+			_phase = Phase::Shown;
+			nextPhaseIn(_args.shownDuration);
+		}
+	}, 0., 1., _args.showDuration, anim::easeOutCubic);
+}
+
+void HighlightOverlay::startFadeOut() {
+	_phase = Phase::FadeOut;
+	_animation.start([=] {
+		update();
+		if (!_animation.animating()) {
+			finish();
+		}
+	}, 1., 0., _args.hideDuration, anim::easeInCubic);
+}
+
+void HighlightOverlay::nextPhase() {
+	switch (_phase) {
+	case Phase::Wait:
+		startFadeIn();
+		break;
+	case Phase::Shown:
+		startFadeOut();
+		break;
+	default:
+		Unexpected("Next phase called during Fade phase.");
+	}
+}
+
+void HighlightOverlay::nextPhaseIn(crl::time delay) {
+	if (!delay) {
+		_phaseTimer.cancel();
+		nextPhase();
+	} else {
+		_phaseTimer.callOnce(delay);
+	}
+}
+
+void HighlightOverlay::finish() {
+	if (_finishing) {
+		return;
+	}
+	_finishing = true;
+	_phaseTimer.cancel();
+	_animation.stop();
+	deleteLater();
+}
+
+} // namespace
+
+void HighlightWidget(QWidget *target, HighlightArgs &&args) {
+	if (!target) {
+		return;
+	}
+	if (args.scroll) {
+		ScrollToWidget(target);
+	}
+	new HighlightOverlay(target, std::move(args));
+}
+
+void ScrollToWidget(not_null<QWidget*> target) {
+	const auto scrollIn = [&](auto &&scroll) {
+		if (const auto inner = scroll->widget()) {
+			const auto globalPosition = target->mapToGlobal(QPoint(0, 0));
+			const auto localPosition = inner->mapFromGlobal(globalPosition);
+			const auto localTop = localPosition.y();
+			const auto targetHeight = target->height();
+			const auto scrollHeight = scroll->height();
+			const auto centered = localTop - (scrollHeight - targetHeight) / 2;
+			const auto top = std::clamp(centered, 0, scroll->scrollTopMax());
+			scroll->scrollToY(top);
+		}
+	};
+	for (auto parent = target->parentWidget()
+		; parent
+		; parent = parent->parentWidget()) {
+		if (const auto scroll = dynamic_cast<Ui::ScrollArea*>(parent)) {
+			scrollIn(scroll);
+			return;
+		}
+		if (const auto scroll = dynamic_cast<Ui::ElasticScroll*>(parent)) {
+			scrollIn(scroll);
+			return;
+		}
+	}
+}
+
+HighlightArgs SubsectionTitleHighlight() {
+	const auto radius = st::roundRadiusSmall;
+	return { .margin = { -radius, 0, -radius, 0 }, .radius = radius };
+}
+
+AbstractSection::AbstractSection(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: _controller(controller) {
+}
+
+SendMenu::Details AbstractSection::sendMenuDetails() const {
+	return {};
+}
+
+bool AbstractSection::processChosenSticker(ChatHelpers::FileChosen &&) {
+	return false;
+}
+
+void AbstractSection::build(
+		not_null<Ui::VerticalLayout*> container,
+		SectionBuildMethod method) {
+	method(
+		container,
+		_controller,
+		showOtherMethod(),
+		_showFinished.events());
+}
 
 Icon::Icon(IconDescriptor descriptor) : _icon(descriptor.icon) {
 	const auto background = [&]() -> const style::color* {
@@ -89,15 +385,16 @@ void AddButtonIcon(
 		std::move(descriptor));
 	icon->widget.setAttribute(Qt::WA_TransparentForMouseEvents);
 	icon->widget.resize(icon->icon.size());
+	icon->widget.show();
 	button->sizeValue(
-	) | rpl::start_with_next([=, left = st.iconLeft](QSize size) {
+	) | rpl::on_next([=, left = st.iconLeft](QSize size) {
 		icon->widget.moveToLeft(
 			left,
 			(size.height() - icon->widget.height()) / 2,
 			size.width());
 	}, icon->widget.lifetime());
 	icon->widget.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(&icon->widget);
 		icon->icon.paint(p, 0, 0);
 	}, icon->widget.lifetime());
@@ -122,35 +419,60 @@ not_null<Button*> AddButtonWithIcon(
 		const style::SettingsButton &st,
 		IconDescriptor &&descriptor) {
 	return container->add(
-		CreateButtonWithIcon(container, std::move(text), st, std::move(descriptor)));
+		CreateButtonWithIcon(
+			container,
+			std::move(text),
+			st,
+			std::move(descriptor)));
 }
 
 void CreateRightLabel(
 		not_null<Button*> button,
-		rpl::producer<QString> label,
+		v::text::data &&label,
 		const style::SettingsButton &st,
-		rpl::producer<QString> buttonText) {
+		rpl::producer<QString> buttonText,
+		Ui::Text::MarkedContext context) {
 	const auto name = Ui::CreateChild<Ui::FlatLabel>(
 		button.get(),
 		st.rightLabel);
 	name->show();
-	rpl::combine(
-		button->widthValue(),
-		std::move(buttonText),
-		std::move(label)
-	) | rpl::start_with_next([=, &st](
-			int width,
-			const QString &button,
-			const QString &text) {
-		const auto available = width
-			- st.padding.left()
-			- st.padding.right()
-			- st.style.font->width(button)
-			- st::settingsButtonRightSkip;
-		name->setText(text);
-		name->resizeToNaturalWidth(available);
-		name->moveToRight(st::settingsButtonRightSkip, st.padding.top());
-	}, name->lifetime());
+	if (v::text::is_plain(label)) {
+		rpl::combine(
+			button->widthValue(),
+			std::move(buttonText),
+			v::text::take_plain(std::move(label))
+		) | rpl::on_next([=, &st](
+				int width,
+				const QString &button,
+				const QString &text) {
+			const auto available = width
+				- st.padding.left()
+				- st.padding.right()
+				- st.style.font->width(button)
+				- st::settingsButtonRightSkip;
+			name->setText(text);
+			name->resizeToNaturalWidth(available);
+			name->moveToRight(st::settingsButtonRightSkip, st.padding.top());
+		}, name->lifetime());
+	} else if (v::text::is_marked(label)) {
+		rpl::combine(
+			button->widthValue(),
+			std::move(buttonText),
+			v::text::take_marked(std::move(label))
+		) | rpl::on_next([=, &st](
+				int width,
+				const QString &button,
+				const TextWithEntities &text) {
+			const auto available = width
+				- st.padding.left()
+				- st.padding.right()
+				- st.style.font->width(button)
+				- st::settingsButtonRightSkip;
+			name->setMarkedText(text, context);
+			name->resizeToNaturalWidth(available);
+			name->moveToRight(st::settingsButtonRightSkip, st.padding.top());
+		}, name->lifetime());
+	}
 	name->setAttribute(Qt::WA_TransparentForMouseEvents);
 }
 
@@ -175,7 +497,7 @@ void AddDividerTextWithLottie(
 	const auto divider = Ui::CreateChild<Ui::BoxContentDivider>(
 		container.get(),
 		0,
-		st::boxDividerBg,
+		st::defaultDividerBar,
 		descriptor.parts);
 	const auto verticalLayout = container->add(
 		object_ptr<Ui::VerticalLayout>(container.get()));
@@ -193,7 +515,7 @@ void AddDividerTextWithLottie(
 			anim::repeat::once);
 		std::move(
 			descriptor.showFinished
-		) | rpl::start_with_next([animate = std::move(icon.animate), repeat] {
+		) | rpl::on_next([animate = std::move(icon.animate), repeat] {
 			animate(repeat);
 		}, verticalLayout->lifetime());
 	}
@@ -201,18 +523,17 @@ void AddDividerTextWithLottie(
 
 	if (descriptor.about) {
 		verticalLayout->add(
-			object_ptr<Ui::CenterWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				verticalLayout,
-				object_ptr<Ui::FlatLabel>(
-					verticalLayout,
-					std::move(descriptor.about),
-					st::settingsFilterDividerLabel)),
+				std::move(descriptor.about),
+				st::settingsFilterDividerLabel),
 			descriptor.aboutMargins.value_or(
-				st::settingsFilterDividerLabelPadding));
+				st::settingsFilterDividerLabelPadding),
+			style::al_top)->setTryMakeSimilarLines(true);
 	}
 
 	verticalLayout->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		divider->setGeometry(r);
 	}, divider->lifetime());
 }
@@ -220,7 +541,8 @@ void AddDividerTextWithLottie(
 LottieIcon CreateLottieIcon(
 		not_null<QWidget*> parent,
 		Lottie::IconDescriptor &&descriptor,
-		style::margins padding) {
+		style::margins padding,
+		Fn<QColor()> colorOverride) {
 	Expects(!descriptor.frame); // I'm not sure it considers limitFps.
 
 	descriptor.limitFps = true;
@@ -240,17 +562,21 @@ LottieIcon CreateLottieIcon(
 	const auto looped = raw->lifetime().make_state<bool>(true);
 
 	const auto start = [=] {
-		icon->animate([=] { raw->update(); }, 0, icon->framesCount() - 1);
+		icon->animate([=] {
+			raw->update();
+		}, 0, icon->framesCount() - 1);
 	};
 	const auto animate = [=](anim::repeat repeat) {
 		*looped = (repeat == anim::repeat::loop);
 		start();
 	};
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		const auto left = (raw->width() - width) / 2;
-		icon->paint(p, left, padding.top());
+		icon->paint(p, left, padding.top(), colorOverride
+			? colorOverride()
+			: std::optional<QColor>());
 		if (!icon->animating() && icon->frameIndex() > 0 && *looped) {
 			start();
 		}
@@ -281,7 +607,7 @@ SliderWithLabel MakeSliderWithLabel(
 	rpl::combine(
 		raw->sizeValue(),
 		label->sizeValue()
-	) | rpl::start_with_next([=](QSize outer, QSize size) {
+	) | rpl::on_next([=](QSize outer, QSize size) {
 		const auto right = std::max(size.width(), minLabelWidth) + skip;
 		label->moveToRight(0, (outer.height() - size.height()) / 2);
 		const auto width = std::max(
@@ -297,4 +623,108 @@ SliderWithLabel MakeSliderWithLabel(
 	};
 }
 
+void AddLottieIconWithCircle(
+		not_null<Ui::VerticalLayout*> layout,
+		object_ptr<Ui::RpWidget> icon,
+		QMargins iconPadding,
+		QSize circleSize) {
+	const auto iconRow = layout->add(
+		std::move(icon),
+		iconPadding,
+		style::al_top);
+
+	const auto circle = Ui::CreateChild<Ui::RpWidget>(
+		iconRow->parentWidget());
+	circle->lower();
+	circle->paintOn([=](QPainter &p) {
+		auto hq = PainterHighQualityEnabler(p);
+		const auto left = (circle->width() - circleSize.width()) / 2;
+		const auto top = (circle->height() - circleSize.height()) / 2;
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::activeButtonBg);
+		p.drawEllipse(QRect(QPoint(left, top), circleSize));
+	});
+
+	iconRow->geometryValue() | rpl::on_next([=](const QRect &g) {
+		circle->setGeometry(g);
+	}, circle->lifetime());
+}
+
+void AddPremiumStar(
+		not_null<Button*> button,
+		bool credits,
+		Fn<bool()> isPaused) {
+	const auto stops = credits
+		? Ui::Premium::CreditsIconGradientStops()
+		: Ui::Premium::ButtonGradientStops();
+
+	const auto ministarsContainer = Ui::CreateChild<Ui::RpWidget>(button);
+	const auto &buttonSt = button->st();
+	const auto fullHeight = buttonSt.height
+		+ rect::m::sum::v(buttonSt.padding);
+	using MiniStars = Ui::Premium::ColoredMiniStars;
+	const auto ministars = button->lifetime().make_state<MiniStars>(
+		ministarsContainer,
+		false);
+	ministars->setColorOverride(stops);
+
+	const auto isPausedValue
+		= button->lifetime().make_state<rpl::variable<bool>>(isPaused());
+	isPausedValue->value() | rpl::on_next([=](bool value) {
+		ministars->setPaused(value);
+	}, ministarsContainer->lifetime());
+
+	ministarsContainer->paintRequest(
+	) | rpl::on_next([=] {
+		(*isPausedValue) = isPaused();
+		auto p = QPainter(ministarsContainer);
+		{
+			constexpr auto kScale = 0.35;
+			const auto r = ministarsContainer->rect();
+			p.translate(r.center());
+			p.scale(kScale, kScale);
+			p.translate(-r.center());
+		}
+		ministars->paint(p);
+	}, ministarsContainer->lifetime());
+
+	const auto badge = Ui::CreateChild<Ui::RpWidget>(button.get());
+
+	auto star = [&] {
+		const auto factor = style::DevicePixelRatio();
+		const auto size = Size(st::settingsButtonNoIcon.style.font->ascent);
+		auto image = QImage(
+			size * factor,
+			QImage::Format_ARGB32_Premultiplied);
+		image.setDevicePixelRatio(factor);
+		image.fill(Qt::transparent);
+		{
+			auto p = QPainter(&image);
+			auto star = QSvgRenderer(Ui::Premium::ColorizedSvg(stops));
+			star.render(&p, Rect(size));
+		}
+		return image;
+	}();
+	badge->resize(star.size() / style::DevicePixelRatio());
+	badge->paintRequest(
+	) | rpl::on_next([=] {
+		auto p = QPainter(badge);
+		p.drawImage(0, 0, star);
+	}, badge->lifetime());
+
+	button->sizeValue(
+	) | rpl::on_next([=](const QSize &s) {
+		badge->moveToLeft(
+			button->st().iconLeft
+				+ (st::menuIconShop.width() - badge->width()) / 2,
+			(s.height() - badge->height()) / 2);
+		ministarsContainer->moveToLeft(
+			badge->x() - (fullHeight - badge->height()) / 2,
+			0);
+	}, badge->lifetime());
+
+	ministarsContainer->resize(fullHeight, fullHeight);
+	ministars->setCenter(ministarsContainer->rect());
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_common.h b/Telegram/SourceFiles/settings/settings_common.h
index d3492b96f3d7fc..3999fe934388ea 100644
--- a/Telegram/SourceFiles/settings/settings_common.h
+++ b/Telegram/SourceFiles/settings/settings_common.h
@@ -13,6 +13,8 @@ For license and copyright information please follow this link:
 #include "base/object_ptr.h"
 #include "settings/settings_type.h"
 
+#include <any>
+
 namespace anim {
 enum class repeat : uchar;
 } // namespace anim
@@ -22,6 +24,14 @@ struct SelectedItems;
 enum class SelectionAction;
 } // namespace Info
 
+namespace ChatHelpers {
+struct FileChosen;
+} // namespace ChatHelpers
+
+namespace SendMenu {
+struct Details;
+} // namespace SendMenu
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -56,13 +66,57 @@ namespace Settings {
 
 using Button = Ui::SettingsButton;
 
+enum class HighlightShape {
+	Rect,
+	Ellipse,
+};
+
+struct HighlightArgs {
+	style::margins margin;
+	HighlightShape shape = HighlightShape::Rect;
+	int radius = 0;
+	const style::color *color = nullptr;
+	float64 opacity = 0.4;
+	bool below = false;
+	bool rippleShape = false;
+	bool scroll = true;
+	crl::time showDelay = 400;
+	crl::time showDuration = 600;
+	crl::time shownDuration = 400;
+	crl::time hideDuration = 600;
+};
+
+void HighlightWidget(QWidget *target, HighlightArgs &&args = {});
+void ScrollToWidget(not_null<QWidget*> target);
+
+[[nodiscard]] HighlightArgs SubsectionTitleHighlight();
+
+struct HighlightEntry {
+	QPointer<QWidget> widget;
+	HighlightArgs args;
+};
+
+using HighlightRegistry = std::vector<std::pair<QString, HighlightEntry>>;
+
+using SectionBuildMethod = Fn<void(
+	not_null<Ui::VerticalLayout*> container,
+	not_null<Window::SessionController*> controller,
+	Fn<void(Type)> showOther,
+	rpl::producer<> showFinished)>;
+
 class AbstractSection : public Ui::RpWidget {
 public:
-	using RpWidget::RpWidget;
+	AbstractSection(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	[[nodiscard]] not_null<Window::SessionController*> controller() const {
+		return _controller;
+	}
 
 	[[nodiscard]] virtual Type id() const = 0;
 	[[nodiscard]] virtual rpl::producer<Type> sectionShowOther() {
-		return nullptr;
+		return _showOtherRequests.events();
 	}
 	[[nodiscard]] virtual rpl::producer<> sectionShowBack() {
 		return nullptr;
@@ -80,7 +134,10 @@ class AbstractSection : public Ui::RpWidget {
 	virtual void sectionSaveChanges(FnMut<void()> done) {
 		done();
 	}
+	virtual SendMenu::Details sendMenuDetails() const;
+	virtual bool processChosenSticker(ChatHelpers::FileChosen &&chosen);
 	virtual void showFinished() {
+		_showFinished.fire({});
 	}
 	virtual void setInnerFocus() {
 		setFocus();
@@ -88,11 +145,11 @@ class AbstractSection : public Ui::RpWidget {
 	[[nodiscard]] virtual const Ui::RoundRect *bottomSkipRounding() const {
 		return nullptr;
 	}
-	[[nodiscard]] virtual QPointer<Ui::RpWidget> createPinnedToTop(
+	[[nodiscard]] virtual base::weak_qptr<Ui::RpWidget> createPinnedToTop(
 			not_null<QWidget*> parent) {
 		return nullptr;
 	}
-	[[nodiscard]] virtual QPointer<Ui::RpWidget> createPinnedToBottom(
+	[[nodiscard]] virtual base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
 			not_null<Ui::RpWidget*> parent) {
 		return nullptr;
 	}
@@ -101,6 +158,10 @@ class AbstractSection : public Ui::RpWidget {
 	}
 	virtual void setStepDataReference(std::any &data) {
 	}
+	virtual void sectionSaveState(std::any &state) {
+	}
+	virtual void sectionRestoreState(const std::any &state) {
+	}
 
 	[[nodiscard]] virtual auto selectedListValue()
 	-> rpl::producer<Info::SelectedItems> {
@@ -118,6 +179,30 @@ class AbstractSection : public Ui::RpWidget {
 			QRect clip) {
 		return false;
 	}
+
+	[[nodiscard]] rpl::producer<> showFinishes() const {
+		return _showFinished.events();
+	}
+
+	void showOther(Type type) {
+		_showOtherRequests.fire_copy(type);
+	}
+	[[nodiscard]] Fn<void(Type)> showOtherMethod() {
+		return crl::guard(this, [=](Type type) {
+			showOther(type);
+		});
+	}
+
+protected:
+	void build(
+		not_null<Ui::VerticalLayout*> container,
+		SectionBuildMethod method);
+
+private:
+	const not_null<Window::SessionController*> _controller;
+	rpl::event_stream<Type> _showOtherRequests;
+	rpl::event_stream<> _showFinished;
+
 };
 
 enum class IconType {
@@ -131,6 +216,7 @@ struct IconDescriptor {
 	IconType type = IconType::Rounded;
 	const style::color *background = nullptr;
 	std::optional<QBrush> backgroundBrush; // Can be useful for gradients.
+	bool newBadge = false;
 
 	explicit operator bool() const {
 		return (icon != nullptr);
@@ -177,9 +263,10 @@ not_null<Button*> AddButtonWithLabel(
 	IconDescriptor &&descriptor = {});
 void CreateRightLabel(
 	not_null<Button*> button,
-	rpl::producer<QString> label,
+	v::text::data &&label,
 	const style::SettingsButton &st,
-	rpl::producer<QString> buttonText);
+	rpl::producer<QString> buttonText,
+	Ui::Text::MarkedContext context = {});
 
 struct DividerWithLottieDescriptor {
 	QString lottie;
@@ -202,7 +289,8 @@ struct LottieIcon {
 [[nodiscard]] LottieIcon CreateLottieIcon(
 	not_null<QWidget*> parent,
 	Lottie::IconDescriptor &&descriptor,
-	style::margins padding = {});
+	style::margins padding = {},
+	Fn<QColor()> colorOverride = nullptr);
 
 struct SliderWithLabel {
 	object_ptr<Ui::RpWidget> widget;
@@ -217,4 +305,15 @@ struct SliderWithLabel {
 	int minLabelWidth = 0,
 	bool ignoreWheel = false);
 
+void AddLottieIconWithCircle(
+	not_null<Ui::VerticalLayout*>,
+	object_ptr<Ui::RpWidget> icon,
+	QMargins iconPadding,
+	QSize circleSize);
+
+void AddPremiumStar(
+	not_null<Button*> button,
+	bool credits,
+	Fn<bool()> isPaused);
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_common_session.cpp b/Telegram/SourceFiles/settings/settings_common_session.cpp
index d72c74d077fe4f..dc6ea9f3386341 100644
--- a/Telegram/SourceFiles/settings/settings_common_session.cpp
+++ b/Telegram/SourceFiles/settings/settings_common_session.cpp
@@ -8,15 +8,17 @@ For license and copyright information please follow this link:
 #include "settings/settings_common_session.h"
 
 #include "settings/cloud_password/settings_cloud_password_email_confirm.h"
-#include "settings/settings_chat.h"
-#include "settings/settings_main.h"
+#include "settings/settings_experimental.h"
+#include "settings/sections/settings_chat.h"
+#include "settings/sections/settings_main.h"
 
 namespace Settings {
 
 bool HasMenu(Type type) {
 	return (type == ::Settings::CloudPasswordEmailConfirmId())
-		|| (type == Main::Id())
-		|| (type == Chat::Id());
+		|| (type == MainId())
+		|| (type == ChatId())
+		|| (type == Experimental::Id());
 }
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_common_session.h b/Telegram/SourceFiles/settings/settings_common_session.h
index 8bea347a021e4e..22546d124088f5 100644
--- a/Telegram/SourceFiles/settings/settings_common_session.h
+++ b/Telegram/SourceFiles/settings/settings_common_session.h
@@ -14,6 +14,7 @@ For license and copyright information please follow this link:
 
 namespace Ui {
 class ScrollArea;
+class VerticalLayout;
 } // namespace Ui
 
 namespace Ui::Menu {
@@ -76,21 +77,6 @@ class Section : public AbstractSection {
 		return Id();
 	}
 
-	[[nodiscard]] rpl::producer<Type> sectionShowOther() final override {
-		return _showOtherRequests.events();
-	}
-	void showOther(Type type) {
-		_showOtherRequests.fire_copy(type);
-	}
-	[[nodiscard]] Fn<void(Type)> showOtherMethod() {
-		return crl::guard(this, [=](Type type) {
-			showOther(type);
-		});
-	}
-
-private:
-	rpl::event_stream<Type> _showOtherRequests;
-
 };
 
 bool HasMenu(Type type);
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
deleted file mode 100644
index b36f1df0fc7884..00000000000000
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "settings/settings_credits.h"
-
-#include "api/api_credits.h"
-#include "boxes/star_gift_box.h"
-#include "boxes/gift_credits_box.h"
-#include "boxes/gift_premium_box.h"
-#include "core/click_handler_types.h"
-#include "data/components/credits.h"
-#include "data/data_file_origin.h"
-#include "data/data_photo_media.h"
-#include "data/data_session.h"
-#include "data/data_user.h"
-#include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
-#include "info/statistics/info_statistics_list_controllers.h"
-#include "lang/lang_keys.h"
-#include "main/main_session.h"
-#include "settings/settings_common_session.h"
-#include "settings/settings_credits_graphics.h"
-#include "statistics/widgets/chart_header_widget.h"
-#include "ui/boxes/boost_box.h" // Ui::StartFireworks.
-#include "ui/effects/credits_graphics.h"
-#include "ui/effects/premium_graphics.h"
-#include "ui/effects/premium_top_bar.h"
-#include "ui/layers/generic_box.h"
-#include "ui/painter.h"
-#include "ui/rect.h"
-#include "ui/text/text_utilities.h"
-#include "ui/vertical_list.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/slider_natural_width.h"
-#include "ui/wrap/fade_wrap.h"
-#include "ui/wrap/slide_wrap.h"
-#include "ui/wrap/vertical_layout.h"
-#include "window/window_session_controller.h"
-#include "styles/style_credits.h"
-#include "styles/style_info.h"
-#include "styles/style_layers.h"
-#include "styles/style_premium.h"
-#include "styles/style_settings.h"
-#include "styles/style_statistics.h"
-
-namespace Settings {
-namespace {
-
-class Credits : public Section<Credits> {
-public:
-	Credits(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller);
-
-	[[nodiscard]] rpl::producer<QString> title() override;
-
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToTop(
-		not_null<QWidget*> parent) override;
-
-	void showFinished() override;
-
-	[[nodiscard]] bool hasFlexibleTopBar() const override;
-
-	void setStepDataReference(std::any &data) override;
-
-	[[nodiscard]] rpl::producer<> sectionShowBack() override final;
-
-private:
-	void setupContent();
-	void setupHistory(not_null<Ui::VerticalLayout*> container);
-	void setupSubscriptions(not_null<Ui::VerticalLayout*> container);
-
-	const not_null<Window::SessionController*> _controller;
-
-	QWidget *_parent = nullptr;
-
-	QImage _star;
-	QImage _balanceStar;
-
-	base::unique_qptr<Ui::FadeWrap<Ui::IconButton>> _back;
-	base::unique_qptr<Ui::IconButton> _close;
-	rpl::variable<bool> _backToggles;
-	rpl::variable<Info::Wrap> _wrap;
-	Fn<void(bool)> _setPaused;
-
-	rpl::event_stream<> _showBack;
-	rpl::event_stream<> _showFinished;
-	rpl::variable<QString> _buttonText;
-
-};
-
-Credits::Credits(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller)
-: Section(parent)
-, _controller(controller)
-, _star(Ui::GenerateStars(st::creditsTopupButton.height, 1))
-, _balanceStar(Ui::GenerateStars(st::creditsBalanceStarHeight, 1)) {
-	setupContent();
-}
-
-rpl::producer<QString> Credits::title() {
-	return tr::lng_premium_summary_title();
-}
-
-bool Credits::hasFlexibleTopBar() const {
-	return true;
-}
-
-rpl::producer<> Credits::sectionShowBack() {
-	return _showBack.events();
-}
-
-void Credits::setStepDataReference(std::any &data) {
-	using SectionCustomTopBarData = Info::Settings::SectionCustomTopBarData;
-	const auto my = std::any_cast<SectionCustomTopBarData>(&data);
-	if (my) {
-		_backToggles = std::move(
-			my->backButtonEnables
-		) | rpl::map_to(true);
-		_wrap = std::move(my->wrapValue);
-	}
-}
-
-void Credits::setupSubscriptions(not_null<Ui::VerticalLayout*> container) {
-	const auto history = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-	const auto content = history->entity();
-	const auto self = _controller->session().user();
-
-	const auto fill = [=](const Data::CreditsStatusSlice &fullSlice) {
-		const auto inner = content;
-		if (fullSlice.subscriptions.empty()) {
-			return;
-		}
-		Ui::AddSkip(inner);
-		Ui::AddSubsectionTitle(
-			inner,
-			tr::lng_credits_subscription_section(),
-			{ 0, 0, 0, -st::settingsPremiumOptionsPadding.bottom() });
-
-		const auto fullWrap = inner->add(
-			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-				inner,
-				object_ptr<Ui::VerticalLayout>(inner)));
-
-		const auto controller = _controller->parentController();
-		const auto entryClicked = [=](
-				const Data::CreditsHistoryEntry &e,
-				const Data::SubscriptionEntry &s) {
-			controller->uiShow()->show(
-				Box(ReceiptCreditsBox, controller, e, s));
-		};
-
-		Info::Statistics::AddCreditsHistoryList(
-			controller->uiShow(),
-			fullSlice,
-			fullWrap->entity(),
-			entryClicked,
-			self,
-			true,
-			true,
-			true);
-
-		Ui::AddSkip(inner);
-		Ui::AddSkip(inner);
-		Ui::AddDivider(inner);
-
-		inner->resizeToWidth(container->width());
-	};
-
-	const auto apiLifetime = content->lifetime().make_state<rpl::lifetime>();
-	{
-		using Api = Api::CreditsHistory;
-		const auto apiFull = apiLifetime->make_state<Api>(self, true, true);
-		apiFull->requestSubscriptions({}, [=](Data::CreditsStatusSlice d) {
-			fill(std::move(d));
-		});
-	}
-}
-
-void Credits::setupHistory(not_null<Ui::VerticalLayout*> container) {
-	const auto history = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-	const auto content = history->entity();
-	const auto self = _controller->session().user();
-
-	Ui::AddSkip(content);
-
-	const auto fill = [=](
-			not_null<PeerData*> premiumBot,
-			const Data::CreditsStatusSlice &fullSlice,
-			const Data::CreditsStatusSlice &inSlice,
-			const Data::CreditsStatusSlice &outSlice) {
-		const auto inner = content;
-		if (fullSlice.list.empty()) {
-			return;
-		}
-		const auto hasOneTab = inSlice.list.empty() && outSlice.list.empty();
-		const auto hasIn = !inSlice.list.empty();
-		const auto hasOut = !outSlice.list.empty();
-		const auto fullTabText = tr::lng_credits_summary_history_tab_full(
-			tr::now);
-		const auto inTabText = tr::lng_credits_summary_history_tab_in(
-			tr::now);
-		const auto outTabText = tr::lng_credits_summary_history_tab_out(
-			tr::now);
-		if (hasOneTab) {
-			Ui::AddSkip(inner);
-			const auto header = inner->add(
-				object_ptr<Statistic::Header>(inner),
-				st::statisticsLayerMargins
-					+ st::boostsChartHeaderPadding);
-			header->resizeToWidth(header->width());
-			header->setTitle(fullTabText);
-			header->setSubTitle({});
-		}
-
-		const auto slider = inner->add(
-			object_ptr<Ui::SlideWrap<Ui::CustomWidthSlider>>(
-				inner,
-				object_ptr<Ui::CustomWidthSlider>(
-					inner,
-					st::defaultTabsSlider)),
-			st::boxRowPadding);
-		slider->toggle(!hasOneTab, anim::type::instant);
-
-		slider->entity()->addSection(fullTabText);
-		if (hasIn) {
-			slider->entity()->addSection(inTabText);
-		}
-		if (hasOut) {
-			slider->entity()->addSection(outTabText);
-		}
-
-		{
-			const auto &st = st::defaultTabsSlider;
-			slider->entity()->setNaturalWidth(0
-				+ st.labelStyle.font->width(fullTabText)
-				+ (hasIn ? st.labelStyle.font->width(inTabText) : 0)
-				+ (hasOut ? st.labelStyle.font->width(outTabText) : 0)
-				+ rect::m::sum::h(st::boxRowPadding));
-		}
-
-		const auto fullWrap = inner->add(
-			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-				inner,
-				object_ptr<Ui::VerticalLayout>(inner)));
-		const auto inWrap = inner->add(
-			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-				inner,
-				object_ptr<Ui::VerticalLayout>(inner)));
-		const auto outWrap = inner->add(
-			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-				inner,
-				object_ptr<Ui::VerticalLayout>(inner)));
-
-		rpl::single(0) | rpl::then(
-			slider->entity()->sectionActivated()
-		) | rpl::start_with_next([=](int index) {
-			if (index == 0) {
-				fullWrap->toggle(true, anim::type::instant);
-				inWrap->toggle(false, anim::type::instant);
-				outWrap->toggle(false, anim::type::instant);
-			} else if (index == 1) {
-				inWrap->toggle(true, anim::type::instant);
-				fullWrap->toggle(false, anim::type::instant);
-				outWrap->toggle(false, anim::type::instant);
-			} else {
-				outWrap->toggle(true, anim::type::instant);
-				fullWrap->toggle(false, anim::type::instant);
-				inWrap->toggle(false, anim::type::instant);
-			}
-		}, inner->lifetime());
-
-		const auto controller = _controller->parentController();
-		const auto entryClicked = [=](
-				const Data::CreditsHistoryEntry &e,
-				const Data::SubscriptionEntry &s) {
-			controller->uiShow()->show(Box(
-				ReceiptCreditsBox,
-				controller,
-				e,
-				s));
-		};
-
-		Info::Statistics::AddCreditsHistoryList(
-			controller->uiShow(),
-			fullSlice,
-			fullWrap->entity(),
-			entryClicked,
-			self,
-			true,
-			true);
-		Info::Statistics::AddCreditsHistoryList(
-			controller->uiShow(),
-			inSlice,
-			inWrap->entity(),
-			entryClicked,
-			self,
-			true,
-			false);
-		Info::Statistics::AddCreditsHistoryList(
-			controller->uiShow(),
-			outSlice,
-			outWrap->entity(),
-			std::move(entryClicked),
-			self,
-			false,
-			true);
-
-		Ui::AddSkip(inner);
-		Ui::AddSkip(inner);
-
-		inner->resizeToWidth(container->width());
-	};
-
-	const auto apiLifetime = content->lifetime().make_state<rpl::lifetime>();
-	{
-		using Api = Api::CreditsHistory;
-		const auto apiFull = apiLifetime->make_state<Api>(self, true, true);
-		const auto apiIn = apiLifetime->make_state<Api>(self, true, false);
-		const auto apiOut = apiLifetime->make_state<Api>(self, false, true);
-		apiFull->request({}, [=](Data::CreditsStatusSlice fullSlice) {
-			apiIn->request({}, [=](Data::CreditsStatusSlice inSlice) {
-				apiOut->request({}, [=](Data::CreditsStatusSlice outSlice) {
-					::Api::PremiumPeerBot(
-						&_controller->session()
-					) | rpl::start_with_next([=](not_null<PeerData*> bot) {
-						fill(bot, fullSlice, inSlice, outSlice);
-						apiLifetime->destroy();
-					}, *apiLifetime);
-				});
-			});
-		});
-	}
-}
-
-void Credits::setupContent() {
-	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-	const auto paid = [=] {
-		if (_parent) {
-			Ui::StartFireworks(_parent);
-		}
-	};
-	const auto self = _controller->session().user();
-	FillCreditOptions(_controller->uiShow(), content, self, 0, paid);
-	{
-		Ui::AddSkip(content);
-		const auto giftButton = AddButtonWithIcon(
-			content,
-			tr::lng_credits_gift_button(),
-			st::settingsButtonLightNoIcon);
-		Ui::AddSkip(content);
-		Ui::AddDivider(content);
-		giftButton->setClickedCallback([=] {
-			Ui::ShowGiftCreditsBox(_controller, paid);
-		});
-	}
-
-	setupSubscriptions(content);
-	setupHistory(content);
-
-	Ui::ResizeFitChild(this, content);
-}
-
-QPointer<Ui::RpWidget> Credits::createPinnedToTop(
-		not_null<QWidget*> parent) {
-	_parent = parent;
-
-	const auto content = [&]() -> Ui::Premium::TopBarAbstract* {
-		const auto weak = base::make_weak(_controller);
-		const auto clickContextOther = [=] {
-			return QVariant::fromValue(ClickHandlerContext{
-				.sessionWindow = weak,
-				.botStartAutoSubmit = true,
-			});
-		};
-		return Ui::CreateChild<Ui::Premium::TopBar>(
-			parent.get(),
-			st::creditsPremiumCover,
-			Ui::Premium::TopBarDescriptor{
-				.clickContextOther = clickContextOther,
-				.title = tr::lng_credits_summary_title(),
-				.about = tr::lng_credits_summary_about(
-					TextWithEntities::Simple),
-				.light = true,
-				.gradientStops = Ui::Premium::CreditsIconGradientStops(),
-			});
-	}();
-	_setPaused = [=](bool paused) {
-		content->setPaused(paused);
-	};
-
-	_wrap.value(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
-		content->setRoundEdges(wrap == Info::Wrap::Layer);
-	}, content->lifetime());
-
-	content->setMaximumHeight(st::settingsPremiumTopHeight);
-	content->setMinimumHeight(st::infoLayerTopBarHeight);
-
-	content->resize(content->width(), content->maximumHeight());
-	content->additionalHeight(
-	) | rpl::start_with_next([=](int additionalHeight) {
-		const auto wasMax = (content->height() == content->maximumHeight());
-		content->setMaximumHeight(st::settingsPremiumTopHeight
-			+ additionalHeight);
-		if (wasMax) {
-			content->resize(content->width(), content->maximumHeight());
-		}
-	}, content->lifetime());
-
-	{
-		const auto balance = AddBalanceWidget(
-			content,
-			_controller->session().credits().balanceValue(),
-			true);
-		_controller->session().credits().load(true);
-		rpl::combine(
-			balance->sizeValue(),
-			content->sizeValue()
-		) | rpl::start_with_next([=](const QSize &, const QSize &) {
-			balance->moveToRight(
-				(_close
-					? _close->width() + st::creditsHistoryRightSkip
-					: st::creditsHistoryRightSkip * 2),
-				st::creditsHistoryRightSkip);
-			balance->update();
-		}, balance->lifetime());
-	}
-
-	_wrap.value(
-	) | rpl::start_with_next([=](Info::Wrap wrap) {
-		const auto isLayer = (wrap == Info::Wrap::Layer);
-		_back = base::make_unique_q<Ui::FadeWrap<Ui::IconButton>>(
-			content,
-			object_ptr<Ui::IconButton>(
-				content,
-				(isLayer ? st::infoTopBarBack : st::infoLayerTopBarBack)),
-			st::infoTopBarScale);
-		_back->setDuration(0);
-		_back->toggleOn(isLayer
-			? _backToggles.value() | rpl::type_erased()
-			: rpl::single(true));
-		_back->entity()->addClickHandler([=] {
-			_showBack.fire({});
-		});
-		_back->toggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
-			const auto &st = isLayer ? st::infoLayerTopBar : st::infoTopBar;
-			content->setTextPosition(
-				toggled ? st.back.width : st.titlePosition.x(),
-				st.titlePosition.y());
-		}, _back->lifetime());
-
-		if (!isLayer) {
-			_close = nullptr;
-		} else {
-			_close = base::make_unique_q<Ui::IconButton>(
-				content,
-				st::infoTopBarClose);
-			_close->addClickHandler([=] {
-				_controller->parentController()->hideLayer();
-				_controller->parentController()->hideSpecialLayer();
-			});
-			content->widthValue(
-			) | rpl::start_with_next([=] {
-				_close->moveToRight(0, 0);
-			}, _close->lifetime());
-		}
-	}, content->lifetime());
-
-	return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
-}
-
-void Credits::showFinished() {
-	_showFinished.fire({});
-}
-
-} // namespace
-
-template <>
-struct SectionFactory<Credits> : AbstractSectionFactory {
-	object_ptr<AbstractSection> create(
-		not_null<QWidget*> parent,
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::ScrollArea*> scroll,
-		rpl::producer<Container> containerValue
-	) const final override {
-		return object_ptr<Credits>(parent, controller);
-	}
-	bool hasCustomTopBar() const final override {
-		return true;
-	}
-
-	[[nodiscard]] static const std::shared_ptr<SectionFactory> &Instance() {
-		static const auto result = std::make_shared<SectionFactory>();
-		return result;
-	}
-};
-
-Type CreditsId() {
-	return Credits::Id();
-}
-
-} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 1e92b697ba5f51..517b59a18a631f 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -12,9 +12,15 @@ For license and copyright information please follow this link:
 #include "api/api_earn.h"
 #include "api/api_premium.h"
 #include "apiwrap.h"
+#include "base/random.h"
 #include "base/timer_rpl.h"
 #include "base/unixtime.h"
 #include "boxes/gift_premium_box.h"
+#include "boxes/share_box.h"
+#include "boxes/star_gift_box.h"
+#include "boxes/star_gift_craft_box.h"
+#include "boxes/star_gift_resale_box.h"
+#include "boxes/transfer_gift_box.h"
 #include "chat_helpers/stickers_gift_box_pack.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "core/application.h"
@@ -22,10 +28,12 @@ For license and copyright information please follow this link:
 #include "core/click_handler_types.h" // UrlClickHandler
 #include "core/ui_integration.h"
 #include "data/components/credits.h"
+#include "data/components/recent_shared_media_gifts.h"
 #include "data/data_boosts.h"
 #include "data/data_channel.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
+#include "data/data_emoji_statuses.h"
 #include "data/data_file_origin.h"
 #include "data/data_photo_media.h"
 #include "data/data_session.h"
@@ -35,7 +43,13 @@ For license and copyright information please follow this link:
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_components.h" // HistoryServicePaymentRefund.
+#include "info/bot/starref/info_bot_starref_common.h"
 #include "info/channel_statistics/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget.
+#include "info/channel_statistics/earn/info_channel_earn_widget.h" // Info::ChannelEarn::Make.
+#include "info/channel_statistics/earn/earn_format.h"
+#include "info/channel_statistics/earn/earn_icons.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
+#include "info/peer_gifts/info_peer_gifts_widget.h"
 #include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
 #include "info/statistics/info_statistics_list_controllers.h"
 #include "info/info_controller.h"
@@ -47,19 +61,27 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "payments/payments_checkout_process.h"
 #include "payments/payments_form.h"
+#include "payments/payments_non_panel_process.h"
 #include "settings/settings_common_session.h"
-#include "settings/settings_credits.h"
+#include "settings/sections/settings_credits.h"
 #include "statistics/widgets/chart_header_widget.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/controls/button_labels.h"
+#include "ui/controls/ton_common.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
 #include "ui/effects/credits_graphics.h"
+#include "ui/effects/loading_element.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_stars_colored.h"
 #include "ui/effects/premium_top_bar.h"
+#include "ui/effects/toggle_arrow.h"
 #include "ui/image/image_prepare.h"
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
@@ -67,7 +89,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/discrete_sliders.h"
 #include "ui/widgets/fields/number_input.h"
-#include "ui/widgets/label_with_custom_emoji.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/tooltip.h"
 #include "ui/wrap/fade_wrap.h"
@@ -76,12 +98,16 @@ For license and copyright information please follow this link:
 #include "ui/wrap/vertical_layout.h"
 #include "ui/ui_utility.h"
 #include "window/window_session_controller.h"
+#include "styles/style_calls.h"
 #include "styles/style_channel_earn.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_credits.h"
 #include "styles/style_giveaway.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
+#include "styles/style_media_view.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_premium.h"
 #include "styles/style_settings.h"
 #include "styles/style_statistics.h"
@@ -115,8 +141,8 @@ const auto kTopUpPrefix = "cloud_lng_topup_purpose_";
 	const auto phrase = Lang::GetNonDefaultValue(
 		kTopUpPrefix + purpose.toUtf8());
 	return phrase.isEmpty()
-		? tr::lng_credits_small_balance_fallback(Ui::Text::RichLangValue)
-		: rpl::single(Ui::Text::RichLangValue(phrase));
+		? tr::lng_credits_small_balance_fallback(tr::rich)
+		: rpl::single(tr::rich(phrase));
 }
 
 class Balance final
@@ -125,13 +151,13 @@ class Balance final
 public:
 	using Ui::RpWidget::RpWidget;
 
-	void setBalance(uint64 balance) {
+	void setBalance(CreditsAmount balance) {
 		_balance = balance;
-		_tooltip = Lang::FormatCountDecimal(balance);
+		_tooltip = Lang::FormatCreditsAmountDecimal(balance);
 	}
 
 	void enterEventHook(QEnterEvent *e) override {
-		if (_balance >= 10'000) {
+		if (_balance >= CreditsAmount(10'000)) {
 			Ui::Tooltip::Show(1000, this);
 		}
 	}
@@ -154,50 +180,69 @@ class Balance final
 
 private:
 	QString _tooltip;
-	uint64 _balance = 0;
+	CreditsAmount _balance;
 
 };
 
 void ToggleStarGiftSaved(
-		not_null<Window::SessionController*> window,
-		not_null<UserData*> sender,
-		MsgId itemId,
+		std::shared_ptr<ChatHelpers::Show> show,
+		Data::SavedStarGiftId savedId,
 		bool save,
-		Fn<void(bool)> done) {
+		Fn<void(bool)> done = nullptr) {
 	using Flag = MTPpayments_SaveStarGift::Flag;
-	const auto api = &window->session().api();
-	const auto weak = base::make_weak(window);
+	const auto api = &show->session().api();
+	const auto channelGift = savedId.chat();
 	api->request(MTPpayments_SaveStarGift(
 		MTP_flags(save ? Flag(0) : Flag::f_unsave),
-		sender->inputUser,
-		MTP_int(itemId.bare)
+		Api::InputSavedStarGiftId(savedId)
 	)).done([=] {
-		if (const auto strong = weak.get()) {
-			strong->showToast((save
-				? tr::lng_gift_display_done
-				: tr::lng_gift_display_done_hide)(tr::now));
+		using GiftAction = Data::GiftUpdate::Action;
+		show->session().data().notifyGiftUpdate({
+			.id = savedId,
+			.action = (save ? GiftAction::Save : GiftAction::Unsave),
+		});
+
+		if (const auto onstack = done) {
+			onstack(true);
 		}
-		done(true);
+		show->showToast((save
+			? (channelGift
+				? tr::lng_gift_display_done_channel
+				: tr::lng_gift_display_done)
+			: (channelGift
+				? tr::lng_gift_display_done_hide_channel
+				: tr::lng_gift_display_done_hide))(tr::now));
 	}).fail([=](const MTP::Error &error) {
-		if (const auto strong = weak.get()) {
-			strong->showToast(error.type());
+		if (const auto onstack = done) {
+			onstack(false);
+		}
+		if (!Ui::ShowGiftErrorToast(show, error)) {
+			show->showToast(error.type());
 		}
-		done(false);
 	}).send();
 }
 
 void ConfirmConvertStarGift(
 		std::shared_ptr<Ui::Show> show,
-		QString name,
+		rpl::producer<TextWithEntities> confirmText,
 		int stars,
+		int daysLeft,
 		Fn<void()> convert) {
-	show->show(Ui::MakeConfirmBox({
-		.text = tr::lng_gift_convert_sure_text(
+	auto text = rpl::combine(
+		std::move(confirmText),
+		tr::lng_gift_convert_sure_limit(
 			lt_count,
-			rpl::single(stars * 1.),
-			lt_user,
-			rpl::single(Ui::Text::Bold(name)),
-			Ui::Text::RichLangValue),
+			rpl::single(daysLeft * 1.),
+			tr::rich),
+		tr::lng_gift_convert_sure_caution(tr::rich)
+	) | rpl::map([](
+			TextWithEntities &&a,
+			TextWithEntities &&b,
+			TextWithEntities &&c) {
+		return a.append("\n\n").append(b).append("\n\n").append(c);
+	});
+	show->show(Ui::MakeConfirmBox({
+		.text = std::move(text),
 		.confirmed = [=](Fn<void()> close) { close(); convert(); },
 		.confirmText = tr::lng_gift_convert_sure(),
 		.title = tr::lng_gift_convert_sure_title(),
@@ -205,29 +250,32 @@ void ConfirmConvertStarGift(
 }
 
 void ConvertStarGift(
-		not_null<Window::SessionController*> window,
-		not_null<UserData*> sender,
-		MsgId itemId,
+		std::shared_ptr<ChatHelpers::Show> show,
+		Data::SavedStarGiftId savedId,
 		int stars,
 		Fn<void(bool)> done) {
-	const auto api = &window->session().api();
-	const auto weak = base::make_weak(window);
+	const auto api = &show->session().api();
 	api->request(MTPpayments_ConvertStarGift(
-		sender->inputUser,
-		MTP_int(itemId)
+		Api::InputSavedStarGiftId(savedId)
 	)).done([=] {
-		if (const auto strong = weak.get()) {
-			strong->showSettings(Settings::CreditsId());
-			strong->showToast(tr::lng_gift_got_stars(
+		if (const auto window = show->resolveWindow()) {
+			if (const auto channel = savedId.chat()) {
+				window->showSection(Info::ChannelEarn::Make(channel));
+			} else {
+				window->showSettings(Settings::CreditsId());
+			}
+		}
+		show->showToast((savedId.chat()
+			? tr::lng_gift_channel_got
+			: tr::lng_gift_got_stars)(
 				tr::now,
 				lt_count,
 				stars,
-				Ui::Text::RichLangValue));
-		}
+				tr::rich));
 		done(true);
 	}).fail([=](const MTP::Error &error) {
-		if (const auto strong = weak.get()) {
-			strong->showToast(error.type());
+		if (!Ui::ShowGiftErrorToast(show, error)) {
+			show->showToast(error.type());
 		}
 		done(false);
 	}).send();
@@ -235,7 +283,7 @@ void ConvertStarGift(
 
 void AddViewMediaHandler(
 		not_null<Ui::RpWidget*> thumb,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		const Data::CreditsHistoryEntry &e) {
 	if (e.extended.empty()) {
 		return;
@@ -254,7 +302,7 @@ void AddViewMediaHandler(
 		bool over = false;
 	};
 	const auto state = thumb->lifetime().make_state<State>();
-	const auto session = &controller->session();
+	const auto session = &show->session();
 	const auto owner = &session->data();
 	const auto peerId = e.barePeerId
 		? PeerId(e.barePeerId)
@@ -275,41 +323,45 @@ void AddViewMediaHandler(
 				owner->photo(item.id),
 				false)); // spoiler
 		} else {
-			fake.push_back(std::make_unique<Data::MediaFile>(
-				state->item,
-				owner->document(item.id),
-				true, // skipPremiumEffect
-				false, // spoiler
-				0)); // ttlSeconds
+			const auto document = owner->document(item.id);
+			const auto item = state->item;
+			using MediaFile = Data::MediaFile;
+			using Args = MediaFile::Args;
+			fake.push_back(std::make_unique<MediaFile>(item, document, Args{
+				.skipPremiumEffect = true,
+			}));
 		}
 	}
 	state->item->overrideMedia(std::make_unique<Data::MediaInvoice>(
 		state->item,
 		Data::Invoice{
-			.amount = uint64(std::abs(int64(e.credits))),
+			.amount = uint64(e.credits.abs().whole()),
 			.currency = Ui::kCreditsCurrency,
 			.extendedMedia = std::move(fake),
 			.isPaidMedia = true,
 		}));
-	const auto showMedia = crl::guard(controller, [=] {
-		if (const auto media = state->item->media()) {
+	const auto showMedia = [=] {
+		const auto window = show->resolveWindow();
+		if (!window) {
+			return;
+		} else if (const auto media = state->item->media()) {
 			if (const auto invoice = media->invoice()) {
 				if (!invoice->extendedMedia.empty()) {
 					const auto first = invoice->extendedMedia[0].get();
 					if (const auto photo = first->photo()) {
-						controller->openPhoto(photo, {
+						window->openPhoto(photo, {
 							.id = state->item->fullId(),
 						});
 					} else if (const auto document = first->document()) {
-						controller->openDocument(document, true, {
+						window->openDocument(document, true, {
 							.id = state->item->fullId(),
 						});
 					}
 				}
 			}
 		}
-	});
-	thumb->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+	};
+	thumb->events() | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonPress) {
 			const auto mouse = static_cast<QMouseEvent*>(e.get());
 			if (mouse->button() == Qt::LeftButton) {
@@ -330,22 +382,48 @@ void AddViewMediaHandler(
 
 } // namespace
 
+void AddMiniStars(
+		not_null<Ui::VerticalLayout*> content,
+		not_null<Ui::RpWidget*> widget,
+		int photoSize,
+		int boxWidth,
+		float64 heightRatio) {
+	using ColoredMiniStars = Ui::Premium::ColoredMiniStars;
+	const auto stars = widget->lifetime().make_state<ColoredMiniStars>(
+		widget,
+		false,
+		Ui::Premium::MiniStarsType::BiStars);
+	stars->setColorOverride(Ui::Premium::CreditsIconGradientStops());
+	widget->resize(boxWidth - photoSize, photoSize * heightRatio);
+	content->sizeValue(
+	) | rpl::on_next([=](const QSize &size) {
+		widget->moveToLeft(photoSize / 2, 0);
+		const auto starsRect = Rect(widget->size());
+		stars->setPosition(starsRect.topLeft());
+		stars->setSize(starsRect.size());
+		widget->lower();
+	}, widget->lifetime());
+	widget->paintRequest(
+	) | rpl::on_next([=](const QRect &r) {
+		auto p = QPainter(widget);
+		p.fillRect(r, Qt::transparent);
+		stars->paint(p);
+	}, widget->lifetime());
+}
+
 SubscriptionRightLabel PaintSubscriptionRightLabelCallback(
 		not_null<Main::Session*> session,
 		const style::PeerListItem &st,
 		int amount) {
+	auto helper = Ui::Text::CustomEmojiHelper();
+	auto starIcon = helper.paletteDependent(
+		Ui::Earn::IconCreditsEmoji());
 	const auto text = std::make_shared<Ui::Text::String>();
 	text->setMarkedText(
 		st::semiboldTextStyle,
-		TextWithEntities()
-			.append(session->data().customEmojiManager().creditsEmoji())
-			.append(QChar::Space)
-			.append(Lang::FormatCountDecimal(amount)),
+		starIcon.append(' ').append(Lang::FormatCountDecimal(amount)),
 		kMarkupTextOptions,
-		Core::MarkedTextContext{
-			.session = session,
-			.customEmojiRepaint = [] {},
-		});
+		helper.context());
 	const auto &font = text->style()->font;
 	const auto &statusFont = st::contactsStatusFont;
 	const auto status = tr::lng_group_invite_joined_right(tr::now);
@@ -379,45 +457,156 @@ void FillCreditOptions(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<Ui::VerticalLayout*> container,
 		not_null<PeerData*> peer,
-		int minimumCredits,
-		Fn<void()> paid) {
+		CreditsAmount minimumCredits,
+		Fn<void()> paid,
+		rpl::producer<> showFinishes,
+		rpl::producer<QString> subtitle,
+		std::vector<Data::CreditTopupOption> preloadedTopupOptions,
+		bool dark,
+		PeerId spendPurposePeerId) {
 	const auto options = container->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			container,
 			object_ptr<Ui::VerticalLayout>(container)));
 	const auto content = options->entity();
 
-	Ui::AddSkip(content, st::settingsPremiumOptionsPadding.top());
-
 	const auto singleStarWidth = Ui::GenerateStars(
 		st::creditsTopupButton.height,
 		1).width() / style::DevicePixelRatio();
 
+	struct StarsState {
+		base::flat_map<int, QImage> cache;
+		rpl::variable<bool> ready = false;
+	};
+	const auto starsState = content->lifetime().make_state<StarsState>();
+	const auto weak = base::make_weak(content);
+	crl::async([=]() mutable {
+		constexpr auto kPreloadCount = 10;
+		auto cache = base::flat_map<int, QImage>();
+		for (auto i = 1; i <= kPreloadCount; ++i) {
+			cache[i] = Ui::GenerateStars(st::creditsTopupButton.height, i);
+		}
+		crl::on_main(weak, [=, result = std::move(cache)]() mutable {
+			starsState->cache = std::move(result);
+			starsState->ready = true;
+		});
+	});
+
+	const auto loadingContainer = content->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			content,
+			object_ptr<Ui::VerticalLayout>(content)));
+	loadingContainer->toggle(true, anim::type::instant);
+	const auto fillLoading = [=] {
+		Ui::AddSkip(content, st::settingsPremiumOptionsPadding.top());
+		if (subtitle) {
+			Ui::AddSubsectionTitle(
+				content,
+				std::move(subtitle),
+				{},
+				dark ? &st::groupCallSubsectionTitle : nullptr);
+		}
+		const auto &st = dark
+			? st::videoStreamTopupButton
+			: st::creditsTopupButton;
+		const auto loadingList = content;
+		const auto isRtl = QLocale().textDirection() == Qt::RightToLeft;
+		using WidgetPtr = object_ptr<Ui::RpWidget>;
+		for (auto i = 0; i < 4; i++) {
+			auto owned = object_ptr<Ui::SettingsButton>(
+				loadingList,
+				rpl::never<QString>(),
+				st);
+			owned->setAttribute(Qt::WA_TransparentForMouseEvents);
+			auto loadingLeft = Ui::CreateLoadingTextWidget(
+				owned,
+				st.style,
+				1,
+				rpl::single(isRtl));
+			content->widthValue(
+			) | rpl::on_next([=, raw = loadingLeft.get()](int w) {
+				if (w > 0) {
+					const auto availableWidth = w
+						- st.iconLeft
+						- st::boxRowPadding.right();
+					raw->resize(availableWidth, st.style.font->height);
+				}
+			}, loadingLeft->lifetime());
+			loadingLeft->moveToLeft(
+				st.iconLeft,
+				st.padding.top() - st::lineWidth * 2);
+			owned->lifetime().make_state<WidgetPtr>(std::move(loadingLeft));
+			Ui::ToggleChildrenVisibility(owned, true);
+			loadingList->add(std::move(owned));
+		}
+		content->resizeToWidth(container->width());
+	};
+
 	const auto fill = [=](Data::CreditTopupOptions options) {
 		while (content->count()) {
 			delete content->widgetAt(0);
 		}
-		Ui::AddSubsectionTitle(
-			content,
-			tr::lng_credits_summary_options_subtitle());
-		const auto &st = st::creditsTopupButton;
+		Ui::AddSkip(content, st::settingsPremiumOptionsPadding.top());
+		if (subtitle) {
+			Ui::AddSubsectionTitle(
+				content,
+				std::move(subtitle),
+				{},
+				dark ? &st::groupCallSubsectionTitle : nullptr);
+		}
+
+		const auto buttons = content->add(
+			object_ptr<Ui::VerticalLayout>(content));
+
+		const auto showMoreWrap = content->add(
+			object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+				content,
+				object_ptr<Ui::SettingsButton>(
+					content,
+					tr::lng_credits_more_options(),
+					(dark
+						? st::videoStreamShowMoreButton
+						: st::statisticsShowMoreButton))));
+		const auto showMore = showMoreWrap->entity();
+		showMore->setClickedCallback([=] {
+			showMoreWrap->toggle(false, anim::type::instant);
+		});
+		Ui::AddToggleUpDownArrowToMoreButton(showMore);
+
+		const auto &st = dark
+			? st::videoStreamTopupButton
+			: st::creditsTopupButton;
 		const auto diffBetweenTextAndStar = st.padding.left()
 			- st.iconLeft
 			- int(singleStarWidth * 1.5);
 		const auto buttonHeight = st.height + rect::m::sum::v(st.padding);
 		const auto minCredits = (!options.empty()
-				&& (minimumCredits > options.back().credits))
-			? 0
+				&& (minimumCredits > CreditsAmount(options.back().credits)))
+			? CreditsAmount()
 			: minimumCredits;
 		for (auto i = 0; i < options.size(); i++) {
 			const auto &option = options[i];
-			if (option.credits < minCredits) {
+			if (CreditsAmount(option.credits) < minCredits) {
 				continue;
 			}
-			const auto button = content->add(object_ptr<Ui::SettingsButton>(
-				content,
-				rpl::never<QString>(),
-				st));
+			const auto button = [&] {
+				auto owned = object_ptr<Ui::SettingsButton>(
+					buttons,
+					rpl::never<QString>(),
+					st);
+				if (!option.extended) {
+					return buttons->add(std::move(owned));
+				}
+				const auto wrap = buttons->add(
+					object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+						buttons,
+						std::move(owned)));
+				wrap->toggle(false, anim::type::instant);
+				showMore->clicks() | rpl::on_next([=] {
+					wrap->toggle(true, anim::type::normal);
+				}, wrap->lifetime());
+				return wrap->entity();
+			}();
 			const auto text = button->lifetime().make_state<Ui::Text::String>(
 				st.style,
 				tr::lng_credits_summary_options_credits(
@@ -427,13 +616,20 @@ void FillCreditOptions(
 			const auto price = Ui::CreateChild<Ui::FlatLabel>(
 				button,
 				Ui::FillAmountAndCurrency(option.amount, option.currency),
-				st::creditsTopupPrice);
+				dark ? st::videoStreamTopupPrice : st::creditsTopupPrice);
 			const auto inner = Ui::CreateChild<Ui::RpWidget>(button);
-			const auto stars = Ui::GenerateStars(st.height, (i + 1));
+			const auto getStars = [=] {
+				const auto starIndex = i + 1;
+				if (starsState->cache.contains(starIndex)) {
+					return starsState->cache[starIndex];
+				}
+				return Ui::GenerateStars(st.height, starIndex);
+			};
+			const auto stars = getStars();
 			const auto textLeft = diffBetweenTextAndStar
 				+ stars.width() / style::DevicePixelRatio();
 			inner->paintRequest(
-			) | rpl::start_with_next([=](const QRect &rect) {
+			) | rpl::on_next([=](const QRect &rect) {
 				auto p = QPainter(inner);
 				p.drawImage(0, 0, stars);
 				p.setPen(st.textFg);
@@ -444,7 +640,7 @@ void FillCreditOptions(
 				});
 			}, inner->lifetime());
 			button->widthValue(
-			) | rpl::start_with_next([=](int width) {
+			) | rpl::on_next([=](int width) {
 				price->moveToRight(st.padding.right(), st.padding.top());
 				inner->moveToLeft(st.iconLeft, st.padding.top());
 				inner->resize(
@@ -461,15 +657,16 @@ void FillCreditOptions(
 					.amount = option.amount,
 					.extended = option.extended,
 					.giftPeerId = PeerId(option.giftBarePeerId),
+					.spendPurposePeerId = spendPurposePeerId,
 				};
 
-				const auto weak = Ui::MakeWeak(button);
+				const auto weak = base::make_weak(button);
 				const auto done = [=](Payments::CheckoutResult result) {
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->window()->setFocus();
 						if (result == Payments::CheckoutResult::Paid) {
-							if (paid) {
-								paid();
+							if (const auto onstack = paid) {
+								onstack();
 							}
 						}
 					}
@@ -488,11 +685,15 @@ void FillCreditOptions(
 					tr::lng_credits_summary_options_about_link(),
 					tr::lng_credits_summary_options_about_url()
 				) | rpl::map([](const QString &text, const QString &url) {
-					return Ui::Text::Link(text, url);
+					return tr::link(text, url);
 				}),
-				Ui::Text::RichLangValue);
+				tr::rich);
 			Ui::AddSkip(content);
-			Ui::AddDividerText(content, std::move(text));
+			Ui::AddDividerText(
+				content,
+				std::move(text),
+				st::defaultBoxDividerLabelPadding,
+				dark ? st::groupCallDividerLabel : st::defaultDividerLabel);
 		}
 
 		content->resizeToWidth(container->width());
@@ -502,83 +703,118 @@ void FillCreditOptions(
 	const auto apiCredits = content->lifetime().make_state<ApiOptions>(peer);
 
 	if (show->session().premiumPossible()) {
-		apiCredits->request(
-		) | rpl::start_with_error_done([=](const QString &error) {
-			show->showToast(error);
-		}, [=] {
-			fill(apiCredits->options());
-		}, content->lifetime());
+		if (preloadedTopupOptions.empty()) {
+			fillLoading();
+			std::move(showFinishes) | rpl::on_next([=] {
+				apiCredits->request(
+				) | rpl::on_error_done([=](const QString &error) {
+					show->showToast(error);
+				}, [=] {
+					starsState->ready.value() | rpl::filter(
+						rpl::mappers::_1
+					) | rpl::on_next([=] {
+						fill(apiCredits->options());
+					}, content->lifetime());
+				}, content->lifetime());
+			}, content->lifetime());
+		} else {
+			fill(std::move(preloadedTopupOptions));
+		}
 	}
 
 	show->session().premiumPossibleValue(
-	) | rpl::start_with_next([=](bool premiumPossible) {
+	) | rpl::on_next([=](bool premiumPossible) {
 		if (!premiumPossible) {
 			fill({});
 		}
 	}, content->lifetime());
 }
 
+[[nodiscard]] object_ptr<Ui::FlatLabel> CreateCreditsTermsLabel(
+		not_null<Ui::GenericBox*> box) {
+	return object_ptr<Ui::FlatLabel>(
+		box,
+		tr::lng_credits_box_out_about(
+			lt_link,
+			tr::lng_payments_terms_link(
+				tr::url(tr::lng_credits_box_out_about_link(tr::now))),
+			tr::marked),
+		st::creditsBoxAboutDivider);
+}
+
 not_null<Ui::RpWidget*> AddBalanceWidget(
 		not_null<Ui::RpWidget*> parent,
-		rpl::producer<uint64> balanceValue,
-		bool rightAlign) {
+		not_null<Main::Session*> session,
+		rpl::producer<CreditsAmount> balanceValue,
+		bool rightAlign,
+		rpl::producer<float64> opacityValue,
+		bool dark) {
+	struct State final {
+		float64 opacity = 1.0;
+		Ui::Text::String label;
+		Ui::Text::String count;
+	};
 	const auto balance = Ui::CreateChild<Balance>(parent);
-	const auto balanceStar = balance->lifetime().make_state<QImage>(
-		Ui::GenerateStars(st::creditsBalanceStarHeight, 1));
-	const auto starSize = balanceStar->size() / style::DevicePixelRatio();
-	const auto label = balance->lifetime().make_state<Ui::Text::String>(
+	const auto state = balance->lifetime().make_state<State>();
+	state->label = Ui::Text::String(
 		st::defaultTextStyle,
 		tr::lng_credits_summary_balance(tr::now));
-	const auto count = balance->lifetime().make_state<Ui::Text::String>(
+	state->count = Ui::Text::String(
 		st::semiboldTextStyle,
 		tr::lng_contacts_loading(tr::now));
-	const auto diffBetweenStarAndCount = count->style()->font->spacew;
+	if (opacityValue) {
+		std::move(opacityValue) | rpl::on_next([=](float64 value) {
+			state->opacity = value;
+		}, balance->lifetime());
+	}
 	const auto resize = [=] {
 		balance->resize(
-			std::max(
-				label->maxWidth(),
-				count->maxWidth()
-					+ starSize.width()
-					+ diffBetweenStarAndCount),
-			label->style()->font->height + starSize.height());
+			std::max(state->label.maxWidth(), state->count.maxWidth()),
+			(state->label.style()->font->height
+				+ state->count.style()->font->height));
 	};
-	std::move(balanceValue) | rpl::start_with_next([=](uint64 value) {
-		count->setText(
+	std::move(
+		balanceValue
+	) | rpl::on_next([=](CreditsAmount value) {
+		auto text = TextWithEntities();
+		auto helper = Ui::Text::CustomEmojiHelper();
+		if (value.ton()) {
+			text.append(
+				helper.paletteDependent(Ui::Earn::IconCurrencyEmoji())
+			).append(' ').append(Lang::FormatCreditsAmountDecimal(value));
+		} else {
+			text.append(
+				helper.paletteDependent(Ui::Earn::IconCreditsEmoji())
+			).append(' ').append(
+				Lang::FormatCreditsAmountToShort(value).string);
+		}
+		state->count.setMarkedText(
 			st::semiboldTextStyle,
-			Lang::FormatCountToShort(value).string);
+			text,
+			kMarkupTextOptions,
+			helper.context([=] { balance->update(); }));
 		balance->setBalance(value);
 		resize();
 	}, balance->lifetime());
 	balance->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(balance);
 
-		p.setPen(st::boxTextFg);
+		p.setOpacity(state->opacity);
+		p.setPen(dark ? st::groupCallMembersFg : st::boxTextFg);
 
-		label->draw(p, {
+		state->label.draw(p, {
 			.position = QPoint(
-				rightAlign ? (balance->width() - label->maxWidth()) : 0,
+				rightAlign ? (balance->width() - state->label.maxWidth()) : 0,
 				0),
 			.availableWidth = balance->width(),
 		});
-		count->draw(p, {
+		state->count.draw(p, {
 			.position = QPoint(
-				(rightAlign
-					? (balance->width() - count->maxWidth())
-					: (starSize.width() + diffBetweenStarAndCount)),
-				label->minHeight()
-					+ (starSize.height() - count->minHeight()) / 2),
+				rightAlign ? (balance->width() - state->count.maxWidth()) : 0,
+				state->label.minHeight()),
 			.availableWidth = balance->width(),
 		});
-		p.drawImage(
-			(rightAlign
-				? (balance->width()
-					- count->maxWidth()
-					- starSize.width()
-					- diffBetweenStarAndCount)
-				: 0),
-			label->minHeight(),
-			*balanceStar);
 	}, balance->lifetime());
 	return balance;
 }
@@ -591,36 +827,16 @@ void BoostCreditsBox(
 	box->setNoContentMargin(true);
 
 	const auto content = box->verticalLayout();
-	const auto session = &controller->session();
 	Ui::AddSkip(content);
 	{
 		const auto &stUser = st::premiumGiftsUserpicButton;
 		const auto widget = content->add(object_ptr<Ui::RpWidget>(content));
-		using ColoredMiniStars = Ui::Premium::ColoredMiniStars;
-		const auto stars = widget->lifetime().make_state<ColoredMiniStars>(
-			widget,
-			false,
-			Ui::Premium::MiniStars::Type::BiStars);
-		stars->setColorOverride(Ui::Premium::CreditsIconGradientStops());
-		widget->resize(
-			st::boxWidth - stUser.photoSize,
-			stUser.photoSize * 1.3);
+		AddMiniStars(content, widget, stUser.photoSize, st::boxWidth, 1.3);
 		const auto svg = std::make_shared<QSvgRenderer>(
 			Ui::Premium::ColorizedSvg(
 				Ui::Premium::CreditsIconGradientStops()));
-		content->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
-			widget->moveToLeft(stUser.photoSize / 2, 0);
-			const auto starsRect = Rect(widget->size());
-			stars->setPosition(starsRect.topLeft());
-			stars->setSize(starsRect.size());
-			widget->lower();
-		}, widget->lifetime());
-		widget->paintRequest(
-		) | rpl::start_with_next([=](const QRect &r) {
+		widget->paintRequest() | rpl::on_next([=](const QRect &r) {
 			auto p = QPainter(widget);
-			p.fillRect(r, Qt::transparent);
-			stars->paint(p);
 			svg->render(
 				&p,
 				QRectF(
@@ -631,14 +847,13 @@ void BoostCreditsBox(
 		}, widget->lifetime());
 	}
 	content->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				tr::lng_gift_stars_title(
-					lt_count,
-					rpl::single(float64(b.credits))),
-				st::boxTitle)));
+			tr::lng_gift_stars_title(
+				lt_count,
+				rpl::single(float64(b.credits))),
+			st::boxTitle),
+		style::al_top);
 	Ui::AddSkip(content);
 	if (b.multiplier) {
 		const auto &st = st::statisticsDetailsBottomCaptionStyle;
@@ -650,23 +865,18 @@ void BoostCreditsBox(
 				- st::boxRowPadding.right());
 		auto textWithEntities = TextWithEntities();
 		textWithEntities.append(
-			Ui::Text::SingleCustomEmoji(
-				session->data().customEmojiManager().registerInternalEmoji(
-					st::boostsListMiniIcon,
-					{ st.font->descent * 2, st.font->descent / 2, 0, 0 },
-					true)));
-		textWithEntities.append(
+			Ui::Text::IconEmoji(&st::boostsListEntryIcon)
+		).append(
 			tr::lng_boosts_list_title(tr::now, lt_count, b.multiplier));
 		text->setMarkedText(
 			st,
 			std::move(textWithEntities),
 			kMarkupTextOptions,
-			Core::MarkedTextContext{
-				.session = session,
-				.customEmojiRepaint = [=] { badge->update(); },
+			Ui::Text::MarkedContext{
+				.repaint = [=] { badge->update(); },
 			});
 		badge->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(badge);
 			auto hq = PainterHighQualityEnabler(p);
 			const auto radius = badge->height() / 2;
@@ -694,88 +904,519 @@ void BoostCreditsBox(
 
 		Ui::AddSkip(content);
 	}
-	AddCreditsBoostTable(controller, content, b);
+	AddCreditsBoostTable(controller->uiShow(), content, {}, b);
 	Ui::AddSkip(content);
 
-	box->addRow(object_ptr<Ui::CenterWrap<>>(
-		box,
-		object_ptr<Ui::FlatLabel>(
-			box,
-			tr::lng_credits_box_out_about(
-				lt_link,
-				tr::lng_payments_terms_link(
-				) | Ui::Text::ToLink(
-					tr::lng_credits_box_out_about_link(tr::now)),
-				Ui::Text::WithEntities),
-			st::creditsBoxAboutDivider)));
+	box->addRow(CreateCreditsTermsLabel(box), style::al_top);
 	Ui::AddSkip(content);
 
-	const auto button = box->addButton(tr::lng_box_ok(), [=] {
+	box->addButton(tr::lng_box_ok(), [=] {
 		box->closeBox();
 	});
-	const auto buttonWidth = st::boxWidth
-		- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
-	button->widthValue() | rpl::filter([=] {
-		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
-		button->resizeToWidth(buttonWidth);
-	}, button->lifetime());
 }
 
-void ReceiptCreditsBox(
+void ProcessReceivedSubscriptions(
+		base::weak_qptr<Ui::GenericBox> weak,
+		not_null<Main::Session*> session) {
+	const auto rebuilder = session->data().activeCreditsSubsRebuilder();
+	if (const auto strong = weak.get()) {
+		if (!rebuilder) {
+			return strong->closeBox();
+		}
+		const auto api
+			= strong->lifetime().make_state<Api::CreditsHistory>(
+				session->user(),
+				true,
+				true);
+		api->requestSubscriptions({}, [=](Data::CreditsStatusSlice first) {
+			rebuilder->fire(std::move(first));
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		});
+	}
+}
+
+[[nodiscard]] bool ShowResellButton(
+		not_null<Main::Session*> session,
+		const Data::CreditsHistoryEntry &e) {
+	const auto unique = e.uniqueGift.get();
+	const auto host = (unique && unique->hostId)
+		? session->data().peer(unique->hostId).get()
+		: (unique && unique->ownerId)
+		? session->data().peer(unique->ownerId).get()
+		: nullptr;
+	return !host
+		? false
+		: host->isSelf()
+		? e.in
+		: false;
+	// Currently we're not reselling channel gifts.
+	// (host->isChannel() && host->asChannel()->canTransferGifts());
+}
+
+[[nodiscard]] bool CanResellGift(
+		not_null<Main::Session*> session,
+		const Data::CreditsHistoryEntry &e) {
+	const auto unique = e.uniqueGift.get();
+	const auto owner = (unique && unique->ownerId)
+		? session->data().peer(unique->ownerId).get()
+		: nullptr;
+	return !owner
+		? false
+		: owner->isSelf()
+		? e.in
+		: false;
+	// Currently we're not reselling channel gifts.
+	// (owner->isChannel() && owner->asChannel()->canTransferGifts());
+}
+
+[[nodiscard]] bool CanCraftGift(
+		not_null<Main::Session*> session,
+		const Data::CreditsHistoryEntry &e) {
+	const auto unique = e.uniqueGift.get();
+	if (!unique || !unique->craftChancePermille) {
+		return false;
+	}
+	const auto owner = (unique && unique->ownerId)
+		? session->data().peer(unique->ownerId).get()
+		: nullptr;
+	return !owner
+		? false
+		: owner->isSelf()
+		? e.in
+		: false;
+	// Currently we're not crafting channel gifts.
+	// (owner->isChannel() && owner->asChannel()->canTransferGifts());
+}
+
+[[nodiscard]] bool ShowOfferBuyButton(
+		not_null<Main::Session*> session,
+		const Data::CreditsHistoryEntry &e) {
+	const auto unique = e.uniqueGift.get();
+	const auto owner = (unique && unique->ownerId)
+		? session->data().peer(unique->ownerId).get()
+		: nullptr;
+	return owner
+		&& owner->isUser()
+		&& !owner->isSelf()
+		&& (unique->starsMinOffer >= 0);
+	// Currently we're not making offers for channel gifts.
+	// (owner->isChannel() && !owner->asChannel()->canTransferGifts());
+}
+
+void FillUniqueGiftMenu(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<Ui::PopupMenu*> menu,
+		const Data::CreditsHistoryEntry &e,
+		SavedStarGiftMenuType type,
+		CreditsEntryBoxStyleOverrides st) {
+	const auto session = &show->session();
+	const auto savedId = EntryToSavedStarGiftId(session, e);
+	const auto giftChannel = savedId.chat();
+	const auto canToggle = savedId
+		&& e.id.isEmpty()
+		&& (e.in || (giftChannel && giftChannel->canManageGifts()))
+		&& !e.giftTransferred
+		&& !e.giftRefunded
+		&& !e.converted;
+
+	const auto unique = e.uniqueGift;
+	if (unique
+		&& canToggle
+		&& e.savedToProfile
+		&& e.pinnedSavedGifts) {
+		const auto pinned = e.pinnedSavedGifts;
+		const auto ids = [session](
+				const std::vector<Data::CreditsHistoryEntry> &pinned) {
+			auto result = std::vector<Data::SavedStarGiftId>();
+			result.reserve(pinned.size());
+			for (const auto &entry : pinned) {
+				result.push_back(EntryToSavedStarGiftId(session, entry));
+			}
+			return result;
+		};
+		if (e.giftPinned) {
+			menu->addAction(tr::lng_context_unpin_from_top(tr::now), [=] {
+				session->recentSharedGifts().togglePinned(
+					show,
+					giftChannel ? giftChannel : session->user(),
+					savedId,
+					false,
+					unique);
+			}, st.unpin ? st.unpin : &st::menuIconUnpin);
+		} else {
+			menu->addAction(tr::lng_context_pin_to_top(tr::now), [=] {
+				const auto list = pinned();
+				const auto &appConfig = show->session().appConfig();
+				const auto limit = appConfig.pinnedGiftsLimit();
+				auto already = ids(list);
+				if (list.size() >= limit) {
+					Info::PeerGifts::SelectGiftToUnpin(show, list, [=](
+							Data::SavedStarGiftId id) {
+						auto copy = already;
+						const auto i = ranges::find(copy, id);
+						const auto replaced = (i != end(copy))
+							? list[i - begin(copy)].uniqueGift
+							: nullptr;
+						if (i != end(copy)) {
+							copy.erase(i);
+						}
+
+						using GiftAction = Data::GiftUpdate::Action;
+						show->session().data().notifyGiftUpdate({
+							.id = id,
+							.action = GiftAction::Unpin,
+						});
+
+						session->recentSharedGifts().togglePinned(
+							show,
+							giftChannel ? giftChannel : session->user(),
+							savedId,
+							true,
+							unique,
+							replaced);
+					});
+				} else {
+					session->recentSharedGifts().togglePinned(
+						show,
+						giftChannel ? giftChannel : session->user(),
+						savedId,
+						true,
+						unique);
+				}
+			}, st.pin ? st.pin : &st::menuIconPin);
+		}
+	}
+	if (unique) {
+		const auto local = u"nft/"_q + unique->slug;
+		const auto url = show->session().createInternalLinkFull(local);
+		menu->addAction(tr::lng_context_copy_link(tr::now), [=] {
+			TextUtilities::SetClipboardText({ url });
+			show->showToast({
+				.text = { tr::lng_channel_public_link_copied(tr::now) },
+				.iconLottie = u"toast/voip_invite"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		}, st.link ? st.link : &st::menuIconLink);
+
+		const auto shareBoxSt = st.shareBox;
+		menu->addAction(tr::lng_chat_link_share(tr::now), [=] {
+			FastShareLink(
+				show,
+				url,
+				shareBoxSt ? *shareBoxSt : ShareBoxStyleOverrides());
+		}, st.share ? st.share : &st::menuIconShare);
+	}
+
+	if (canToggle && type == SavedStarGiftMenuType::List) {
+		if (e.savedToProfile) {
+			menu->addAction(tr::lng_gift_menu_hide(tr::now), [=] {
+				ToggleStarGiftSaved(show, savedId, false);
+			}, st.hide ? st.hide : &st::menuIconStealth);
+		} else {
+			menu->addAction(tr::lng_gift_menu_show(tr::now), [=] {
+				ToggleStarGiftSaved(show, savedId, true);
+			}, st.show ? st.show : &st::menuIconShowInChat);
+		}
+	}
+
+	if (!unique) {
+		return;
+	}
+	if (unique->canBeTheme) {
+		menu->addAction(tr::lng_gift_transfer_set_theme(tr::now), [=] {
+			if (const auto window = show->resolveWindow()) {
+				SetThemeFromUniqueGift(window, unique);
+			}
+		}, st.theme ? st.theme : &st::menuIconChangeColors);
+	}
+	const auto owner = unique->ownerId
+		? show->session().data().peer(unique->ownerId).get()
+		: (PeerData*)nullptr;
+	const auto host = unique->hostId
+		? show->session().data().peer(unique->hostId).get()
+		: owner;
+	if (!host) {
+		return;
+	}
+	if (CanCraftGift(&show->session(), e)) {
+		menu->addAction(tr::lng_gift_craft_menu_button(tr::now), [=] {
+			const auto unique = e.uniqueGift;
+			if (Ui::ShowCraftLaterError(show, unique)) {
+				return;
+			}
+			if (Ui::ShowCraftAddressError(show, unique)) {
+				return;
+			}
+			const auto savedId = EntryToSavedStarGiftId(&show->session(), e);
+			if (const auto window = show->resolveWindow()) {
+				Ui::ShowGiftCraftInfoBox(window, unique, savedId);
+			}
+		}, st.craft ? st.craft : &st::menuIconCraft);
+	}
+	const auto transfer = savedId
+		&& (savedId.isUser() ? e.in : savedId.chat()->canTransferGifts())
+		&& (unique->starsForTransfer >= 0);
+	if (transfer) {
+		menu->addAction(tr::lng_gift_transfer_button(tr::now), [=] {
+			if (!owner) {
+				ShowActionLocked(show, unique->slug);
+			} else if (const auto window = show->resolveWindow()) {
+				ShowTransferGiftBox(window, unique, savedId);
+			}
+		}, st.transfer ? st.transfer : &st::menuIconReplace);
+	}
+	const auto wear = host->isSelf()
+		? e.in
+		: (host->isChannel() && host->asChannel()->canEditEmoji());
+	if (wear) {
+		const auto name = UniqueGiftName(*unique);
+		const auto now = host->emojiStatusId().collectible;
+		if (now && unique->slug == now->slug) {
+			menu->addAction(tr::lng_gift_transfer_take_off(tr::now), [=] {
+				show->session().data().emojiStatuses().set(host, {});
+			}, st.takeoff ? st.takeoff : &st::menuIconNftTakeOff);
+		} else {
+			menu->addAction(tr::lng_gift_transfer_wear(tr::now), [=] {
+				ShowUniqueGiftWearBox(show, host, *unique, st.giftWearBox
+					? *st.giftWearBox
+					: GiftWearBoxStyleOverride());
+			}, st.wear ? st.wear : &st::menuIconNftWear);
+		}
+	}
+	if (ShowResellButton(&show->session(), e)) {
+		const auto can = CanResellGift(&show->session(), e);
+		const auto inResale = (unique->starsForResale > 0);
+		const auto editPrice = (inResale
+			? tr::lng_gift_transfer_update
+			: tr::lng_gift_transfer_sell)(tr::now);
+		menu->addAction(editPrice, [=] {
+			if (!can) {
+				ShowActionLocked(show, unique->slug);
+			} else {
+				const auto style = st.giftWearBox
+					? *st.giftWearBox
+					: GiftWearBoxStyleOverride();
+				ShowUniqueGiftSellBox(show, unique, savedId, style);
+			}
+		}, st.resell ? st.resell : &st::menuIconTagSell);
+		if (inResale) {
+			menu->addAction(tr::lng_gift_transfer_unlist(tr::now), [=] {
+				const auto name = UniqueGiftName(*unique);
+				const auto confirm = [=](Fn<void()> close) {
+					close();
+					Ui::UpdateGiftSellPrice(show, unique, savedId, {});
+				};
+				show->show(Ui::MakeConfirmBox({
+					.text = tr::lng_gift_sell_unlist_sure(),
+					.confirmed = confirm,
+					.confirmText = tr::lng_gift_transfer_unlist(),
+					.title = tr::lng_gift_sell_unlist_title(
+						lt_name,
+						rpl::single(name)),
+				}));
+			}, st.unlist ? st.unlist : &st::menuIconTagRemove);
+		}
+	} else if (ShowOfferBuyButton(&show->session(), e)) {
+		menu->addAction(tr::lng_gift_offer_button(tr::now), [=] {
+			ShowOfferBuyBox(show, unique);
+		}, st.offer ? st.offer : &st::menuIconEarn);
+	}
+}
+
+GiftWearBoxStyleOverride DarkGiftWearBoxStyle() {
+	return {
+		.box = &st::darkUpgradeGiftBox,
+		.close = &st::darkGiftBoxClose,
+		.title = &st::darkUpgradeGiftTitle,
+		.subtitle = &st::darkUpgradeGiftSubtitle,
+		.radiantIcon = &st::darkUpgradeGiftRadiant,
+		.profileIcon = &st::darkUpgradeGiftProfile,
+		.proofIcon = &st::darkUpgradeGiftProof,
+		.infoTitle = &st::darkUpgradeGiftInfoTitle,
+		.infoAbout = &st::darkUpgradeGiftInfoAbout,
+	};
+}
+
+CreditsEntryBoxStyleOverrides DarkCreditsEntryBoxStyle() {
+	return {
+		.box = &st::darkGiftCodeBox,
+		.menu = &st::mediaviewPopupMenu,
+		.table = &st::darkGiftTable,
+		.tableValueMultiline = &st::darkGiftTableValueMultiline,
+		.tableValueMessage = &st::darkGiftTableMessage,
+		.link = &st::darkGiftLink,
+		.share = &st::darkGiftShare,
+		.theme = &st::darkGiftTheme,
+		.transfer = &st::darkGiftTransfer,
+		.craft = &st::darkGiftCraft,
+		.wear = &st::darkGiftNftWear,
+		.takeoff = &st::darkGiftNftTakeOff,
+		.resell = &st::darkGiftNftResell,
+		.unlist = &st::darkGiftNftUnlist,
+		.show = &st::darkGiftShow,
+		.hide = &st::darkGiftHide,
+		.pin = &st::darkGiftPin,
+		.unpin = &st::darkGiftUnpin,
+		.offer = &st::darkGiftOffer,
+		.shareBox = std::make_shared<ShareBoxStyleOverrides>(
+			DarkShareBoxStyle()),
+		.giftWearBox = std::make_shared<GiftWearBoxStyleOverride>(
+			DarkGiftWearBoxStyle()),
+	};
+}
+
+rpl::producer<CreditsAmount> UniqueGiftResalePrice(
+		std::shared_ptr<Data::UniqueGift> unique,
+		bool forceTon) {
+	const auto slug = unique->slug;
+	return rpl::single(
+		rpl::empty
+	) | rpl::then(unique->model.document->owner().giftUpdates(
+	) | rpl::filter([=](const Data::GiftUpdate &update) {
+		return (update.action == Data::GiftUpdate::Action::ResaleChange)
+			&& (update.slug == slug);
+	}) | rpl::to_empty) | rpl::map([=] {
+		const auto result = forceTon
+			? Data::UniqueGiftResaleTon(*unique)
+			: Data::UniqueGiftResaleAsked(*unique);
+		return (result.value() < 0) ? CreditsAmount() : result;
+	});
+}
+
+bool UniqueGiftCanRemoveDetails(const Data::CreditsHistoryEntry &entry) {
+	return entry.uniqueGift && (entry.starsForDetailsRemove > 0);
+}
+
+Fn<void(Fn<void()> removed)> UniqueGiftRemoveDetailsHandler(
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::CreditsHistoryEntry &entry) {
+	return [=](Fn<void()> removed) {
+		const auto session = &show->session();
+		const auto unique = entry.uniqueGift;
+		const auto savedId = EntryToSavedStarGiftId(session, entry);
+		auto done = [=](
+				Payments::CheckoutResult result,
+				const MTPUpdates *updates) {
+			if (result == Payments::CheckoutResult::Paid) {
+				removed();
+
+				const auto name = Data::UniqueGiftName(*unique);
+				show->showToast(tr::lng_gift_unique_info_removed(
+					tr::now,
+					lt_name,
+					tr::bold(name),
+					tr::marked));
+				unique->originalDetails = Data::UniqueGiftOriginalDetails();
+			}
+		};
+		RequestStarsFormAndSubmit(
+			show,
+			MTP_inputInvoiceStarGiftDropOriginalDetails(
+				Api::InputSavedStarGiftId(savedId, unique)),
+			std::move(done));
+	};
+}
+
+void GenericCreditsEntryCover(
 		not_null<Ui::GenericBox*> box,
-		not_null<Window::SessionController*> controller,
+		std::shared_ptr<ChatHelpers::Show> show,
 		const Data::CreditsHistoryEntry &e,
-		const Data::SubscriptionEntry &s) {
-	const auto item = controller->session().data().message(
-		PeerId(e.barePeerId), MsgId(e.bareMsgId));
-	const auto isStarGift = (e.convertStars > 0);
-	const auto creditsHistoryStarGift = isStarGift && !e.id.isEmpty();
-	const auto sentStarGift = creditsHistoryStarGift && !e.in;
-	const auto convertedStarGift = creditsHistoryStarGift && e.converted;
-	const auto gotStarGift = isStarGift && !creditsHistoryStarGift && e.in;
-	const auto starGiftSender = (isStarGift && item)
-		? item->history()->peer->asUser()
-		: (isStarGift && e.in)
-		? controller->session().data().peer(PeerId(e.barePeerId))->asUser()
-		: nullptr;
-	const auto canConvert = gotStarGift && !e.converted && starGiftSender;
+		const Data::SubscriptionEntry &s,
+		CreditsEntryBoxStyleOverrides st = {}) {
+	const auto session = &show->session();
+	const auto owner = &session->data();
+	const auto isStarGift = e.stargift || e.soldOutInfo;
+	const auto uniqueGift = e.uniqueGift.get();
 
-	box->setStyle(canConvert ? st::starGiftBox : st::giveawayGiftCodeBox);
+	box->setStyle(st.box ? *st.box : st::giveawayGiftCodeBox);
+	box->setWidth(st::boxWideWidth);
 	box->setNoContentMargin(true);
 
 	const auto content = box->verticalLayout();
-	Ui::AddSkip(content);
-	Ui::AddSkip(content);
-	Ui::AddSkip(content);
-
-	using Type = Data::CreditsHistoryEntry::PeerType;
+	if (!uniqueGift) {
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+	}
 
 	const auto &stUser = st::boostReplaceUserpic;
-	const auto session = &controller->session();
 	const auto isPrize = e.bareGiveawayMsgId > 0;
 	const auto starGiftSticker = (isStarGift && e.bareGiftStickerId)
-		? session->data().document(e.bareGiftStickerId).get()
+		? owner->document(e.bareGiftStickerId).get()
 		: nullptr;
 	const auto peer = isPrize
 		? nullptr
 		: (s.barePeerId)
-		? session->data().peer(PeerId(s.barePeerId)).get()
-		: (e.peerType == Type::PremiumBot)
+		? owner->peer(PeerId(s.barePeerId)).get()
+		: (e.peerType == Data::CreditsHistoryEntry::PeerType::PremiumBot)
 		? nullptr
+		: e.bareActorId
+		? owner->peer(PeerId(e.bareActorId)).get()
 		: e.barePeerId
-		? session->data().peer(PeerId(e.barePeerId)).get()
+		? owner->peer(PeerId(e.barePeerId)).get()
 		: nullptr;
-	if (const auto callback = Ui::PaintPreviewCallback(session, e)) {
-		const auto thumb = content->add(object_ptr<Ui::CenterWrap<>>(
-			content,
-			GenericEntryPhoto(content, callback, stUser.photoSize)));
-		AddViewMediaHandler(thumb->entity(), controller, e);
-	} else if (peer && !e.gift) {
-		content->add(object_ptr<Ui::CenterWrap<>>(
-			content,
-			object_ptr<Ui::UserpicButton>(content, peer, stUser)));
-	} else if (e.gift || isPrize) {
+	if (uniqueGift) {
+		const auto forceTon = e.giftResaleForceTon;
+		const auto cover = Ui::UniqueGiftCover{ *uniqueGift };
+		const auto wearSt = st.giftWearBox
+			? *st.giftWearBox
+			: GiftWearBoxStyleOverride();
+		const auto savedId = EntryToSavedStarGiftId(session, e);
+		const auto resaleClick = CanResellGift(session, e)
+			? [=] {
+				ShowUniqueGiftSellBox(show, e.uniqueGift, savedId, wearSt);
+			}
+			: Fn<void()>();
+		AddUniqueGiftCover(content, rpl::single(cover), {
+			.numberText = (uniqueGift->number > 0)
+				? rpl::single(u"#"_q + Lang::FormatCountDecimal(uniqueGift->number))
+				: rpl::producer<QString>(),
+			.resalePrice = UniqueGiftResalePrice(e.uniqueGift, forceTon),
+			.resaleClick = resaleClick,
+		});
+		if (e.bareGiftOwnerId == session->userPeerId().value) {
+			if (const auto fromId = PeerId(e.barePeerId)) {
+				const auto from = session->data().peer(fromId);
+				const auto crafted = uniqueGift->crafted;
+				AttachGiftSenderBadge(box, show, from, e.date, crafted);
+			}
+		}
+	} else if (const auto callback = Ui::PaintPreviewCallback(session, e)) {
+		const auto thumb = content->add(
+			GenericEntryPhoto(content, callback, stUser.photoSize),
+			style::al_top);
+		AddViewMediaHandler(thumb, show, e);
+	} else if (s.photoId || (e.photoId && !e.subscriptionUntil.isNull())) {
+		if (!(s.cancelled || s.expired || s.cancelledByBot)) {
+			const auto widget = Ui::CreateChild<Ui::RpWidget>(content);
+			const auto photoSize = stUser.photoSize;
+			AddMiniStars(content, widget, photoSize, st::boxWideWidth, 1.5);
+		}
+		const auto photoId = s.photoId ? s.photoId : e.photoId;
+		const auto callback = [=](Fn<void()> update) {
+			return Ui::GenerateCreditsPaintEntryCallback(
+				owner->photo(photoId),
+				std::move(update));
+		};
+		content->add(
+			GenericEntryPhoto(content, callback, stUser.photoSize),
+			style::al_top);
+	} else if (peer
+		&& !e.gift
+		&& !e.premiumMonthsForStars
+		&& !e.postsSearch) {
+		if (e.subscriptionUntil.isNull() && s.until.isNull()) {
+			content->add(
+				object_ptr<Ui::UserpicButton>(content, peer, stUser),
+				style::al_top);
+		} else {
+			content->add(
+				SubscriptionUserpic(content, peer, stUser.photoSize),
+				style::al_top);
+		}
+	} else if (e.gift || isPrize || e.premiumMonthsForStars) {
 		struct State final {
 			DocumentData *sticker = nullptr;
 			std::shared_ptr<Data::DocumentMedia> media;
@@ -793,30 +1434,40 @@ void ReceiptCreditsBox(
 		auto &packs = session->giftBoxStickersPacks();
 		const auto document = starGiftSticker
 			? starGiftSticker
-			: packs.lookup(packs.monthsForStars(e.credits));
+			: e.credits.ton()
+			? packs.tonLookup(e.credits.whole())
+			: packs.lookup(
+				e.premiumMonthsForStars
+					? e.premiumMonthsForStars
+					: packs.monthsForStars(e.credits.whole()));
 		if (document && document->sticker()) {
+			const auto origin = starGiftSticker
+				? starGiftSticker->stickerOrGifOrigin()
+				: e.credits.ton()
+				? packs.tonOrigin()
+				: packs.origin();
 			state->sticker = document;
 			state->media = document->createMediaView();
-			state->media->thumbnailWanted(packs.origin());
-			state->media->automaticLoad(packs.origin(), nullptr);
+			state->media->thumbnailWanted(origin);
+			state->media->automaticLoad(origin, nullptr);
 			rpl::single() | rpl::then(
 				session->downloaderTaskFinished()
 			) | rpl::filter([=] {
 				return state->media->loaded();
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				state->lottie = ChatHelpers::LottiePlayerFromDocument(
 					state->media.get(),
 					ChatHelpers::StickerLottieSize::MessageHistory,
 					icon->size(),
 					Lottie::Quality::High);
-				state->lottie->updates() | rpl::start_with_next([=] {
+				state->lottie->updates() | rpl::on_next([=] {
 					icon->update();
 				}, icon->lifetime());
 				state->downloadLifetime.destroy();
 			}, state->downloadLifetime);
 		}
 		icon->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = Painter(icon);
 			const auto &lottie = state->lottie;
 			const auto factor = style::DevicePixelRatio();
@@ -836,61 +1487,232 @@ void ReceiptCreditsBox(
 			}
 		}, icon->lifetime());
 		content->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
+		) | rpl::on_next([=](const QSize &size) {
 			icon->move((size.width() - icon->width()) / 2, isStarGift
 				? st::creditsHistoryEntryStarGiftSkip
 				: st::creditsHistoryEntryGiftStickerSkip);
 		}, icon->lifetime());
-	} else {
+	} else if (!e.postsSearch) {
 		const auto widget = content->add(
-			object_ptr<Ui::CenterWrap<>>(
-				content,
-				object_ptr<Ui::RpWidget>(content)))->entity();
+			object_ptr<Ui::RpWidget>(content),
+			style::al_top);
 		using Draw = Fn<void(Painter &, int, int, int, int)>;
 		const auto draw = widget->lifetime().make_state<Draw>(
 			Ui::GenerateCreditsPaintUserpicCallback(e));
 		widget->resize(Size(stUser.photoSize));
+		widget->setNaturalWidth(stUser.photoSize);
 		widget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = Painter(widget);
 			(*draw)(p, 0, 0, stUser.photoSize, stUser.photoSize);
 		}, widget->lifetime());
 	}
+}
 
-	Ui::AddSkip(content);
-	Ui::AddSkip(content);
+void GenericCreditsEntryBox(
+		not_null<Ui::GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::CreditsHistoryEntry &e,
+		const Data::SubscriptionEntry &s,
+		CreditsEntryBoxStyleOverrides st) {
+	GenericCreditsEntryCover(box, show, e, s, st);
+	GenericCreditsEntryBody(box, show, e, s, nullptr, st);
+}
 
-	box->addRow(object_ptr<Ui::CenterWrap<>>(
-		box,
-		object_ptr<Ui::FlatLabel>(
-			box,
-			rpl::single(!s.until.isNull()
-				? tr::lng_credits_box_subscription_title(tr::now)
-				: isPrize
-				? tr::lng_credits_box_history_entry_giveaway_name(tr::now)
-				: !e.subscriptionUntil.isNull()
-				? tr::lng_credits_box_history_entry_subscription(tr::now)
-				: !e.title.isEmpty()
-				? e.title
-				: sentStarGift
-				? tr::lng_credits_box_history_entry_gift_sent(tr::now)
-				: convertedStarGift
-				? tr::lng_credits_box_history_entry_gift_converted(tr::now)
-				: (isStarGift && !gotStarGift)
-				? tr::lng_gift_link_label_gift(tr::now)
-				: e.gift
-				? tr::lng_credits_box_history_entry_gift_name(tr::now)
-				: (peer && !e.reaction)
-				? peer->name()
-				: Ui::GenerateEntryName(e).text),
-			st::creditsBoxAboutTitle)));
+void GenericCreditsEntryBody(
+		not_null<Ui::GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::CreditsHistoryEntry &e) {
+	GenericCreditsEntryBody(box, std::move(show), e, {}, nullptr, {});
+}
 
-	Ui::AddSkip(content);
+void GenericCreditsEntryBody(
+		not_null<Ui::GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::CreditsHistoryEntry &e,
+		const Data::SubscriptionEntry &s,
+		std::shared_ptr<Data::GiftUpgradeSpinner> upgradeSpinner,
+		CreditsEntryBoxStyleOverrides st) {
+	const auto session = &show->session();
+	const auto selfPeerId = session->userPeerId().value;
+	const auto owner = &session->data();
+	const auto item = owner->message(
+		PeerId(e.barePeerId),
+		MsgId(e.bareMsgId));
+	const auto isStarGift = e.stargift || e.soldOutInfo;
+	const auto creditsHistoryStarGift = isStarGift && !e.id.isEmpty();
+	const auto sentStarGift = creditsHistoryStarGift && !e.in;
+	const auto giftToSelf = isStarGift
+		&& (e.barePeerId == selfPeerId)
+		&& (e.in || e.bareGiftOwnerId == selfPeerId);
+	const auto giftChannel = (isStarGift && e.giftChannelSavedId)
+		? session->data().peer(
+			PeerId(e.bareEntryOwnerId))->asChannel()
+		: nullptr;
+	const auto giftToChannel = (giftChannel != nullptr);
+	const auto giftToChannelCanManage = giftToChannel
+		&& giftChannel->canManageGifts();
+	const auto giftToChannelCanTransfer = giftToChannel
+		&& giftChannel->canTransferGifts();
+	const auto starGiftCanManage = isStarGift
+		&& !creditsHistoryStarGift
+		&& (e.in || giftToChannelCanManage)
+		&& !e.fromGiftSlug
+		&& !e.converted;
+	const auto starGiftCanTransfer = isStarGift
+		&& !creditsHistoryStarGift
+		&& (e.in || giftToChannelCanTransfer);
+	const auto starGiftSender = (isStarGift && item)
+		? item->history()->peer->asUser()
+		: (isStarGift && e.in)
+		? owner->peer(PeerId(e.barePeerId))->asUser()
+		: (isStarGift && e.bareActorId)
+		? owner->peer(PeerId(e.bareActorId)).get()
+		: nullptr;
+	const auto convertLast = base::unixtime::serialize(e.date)
+		+ session->appConfig().stargiftConvertPeriodMax();
+	const auto timeLeft = int64(convertLast) - int64(base::unixtime::now());
+	const auto timeExceeded = (timeLeft <= 0);
+	const auto uniqueGift = e.uniqueGift.get();
+	const auto forConvert = starGiftCanTransfer
+		&& e.starsConverted
+		&& !e.converted
+		&& starGiftSender;
+	const auto canConvert = forConvert && !timeExceeded;
+	const auto inResale = uniqueGift && (uniqueGift->starsForResale > 0);
+	const auto canBuyResold = inResale && (e.bareGiftOwnerId != selfPeerId);
+	const auto &stUser = st::boostReplaceUserpic;
+	const auto isPrize = e.bareGiveawayMsgId > 0;
+	const auto starGiftSticker = (isStarGift && e.bareGiftStickerId)
+		? owner->document(e.bareGiftStickerId).get()
+		: nullptr;
+	const auto peer = isPrize
+		? nullptr
+		: (s.barePeerId)
+		? owner->peer(PeerId(s.barePeerId)).get()
+		: (e.peerType == Data::CreditsHistoryEntry::PeerType::PremiumBot)
+		? nullptr
+		: e.bareActorId
+		? owner->peer(PeerId(e.bareActorId)).get()
+		: e.barePeerId
+		? owner->peer(PeerId(e.barePeerId)).get()
+		: nullptr;
 
-	{
+	if (auto savedId = EntryToSavedStarGiftId(session, e)) {
+		session->data().giftUpdates(
+		) | rpl::on_next([=](const Data::GiftUpdate &update) {
+			if (update.id == savedId
+				&& update.action != Data::GiftUpdate::Action::ResaleChange) {
+				box->closeBox();
+			}
+		}, box->lifetime());
+	}
+
+	const auto content = box->verticalLayout();
+	if (uniqueGift) {
+		AddSkip(content, st::defaultVerticalListSkip * 2);
+
+		const auto canCraft = CanCraftGift(session, e);
+		const auto craft = canCraft ? [=] {
+			const auto unique = e.uniqueGift;
+			if (Ui::ShowCraftLaterError(show, unique)) {
+				return;
+			}
+			if (Ui::ShowCraftAddressError(show, unique)) {
+				return;
+			}
+			const auto savedId = EntryToSavedStarGiftId(&show->session(), e);
+			if (const auto window = show->resolveWindow()) {
+				Ui::ShowGiftCraftInfoBox(window, unique, savedId);
+			}
+		} : Fn<void()>();
+		AddUniqueCloseMoreButton(box, st, [=](not_null<Ui::PopupMenu*> menu) {
+			const auto type = SavedStarGiftMenuType::View;
+			FillUniqueGiftMenu(show, menu, e, type, st);
+		}, craft);
+
+		if (CanResellGift(session, e)) {
+			Ui::PreloadUniqueGiftResellPrices(session);
+		}
+	} else {
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				rpl::single(!s.title.isEmpty()
+					? s.title
+					: !s.until.isNull()
+					? tr::lng_credits_box_subscription_title(tr::now)
+					: isPrize
+					? tr::lng_credits_box_history_entry_giveaway_name(tr::now)
+					: (!e.subscriptionUntil.isNull() && e.title.isEmpty())
+					? tr::lng_credits_box_history_entry_subscription(tr::now)
+					: e.isLiveStoryReaction()
+					? tr::lng_credits_paid_messages_fee_live_reaction(tr::now)
+					: e.paidMessagesCount
+					? tr::lng_credits_paid_messages_fee(
+						tr::now,
+						lt_count,
+						e.paidMessagesCount)
+					: e.postsSearch
+					? tr::lng_credits_box_history_entry_posts_search(tr::now)
+					: e.premiumMonthsForStars
+					? tr::lng_premium_summary_title(tr::now)
+					: e.giftOffer
+					? tr::lng_credits_box_history_entry_gift_offer(tr::now)
+					: !e.title.isEmpty()
+					? e.title
+					: e.starrefCommission
+					? tr::lng_credits_commission(
+						tr::now,
+						lt_amount,
+						Info::BotStarRef::FormatCommission(e.starrefCommission))
+					: e.soldOutInfo
+					? tr::lng_credits_box_history_entry_gift_unavailable(tr::now)
+					: sentStarGift
+					? tr::lng_credits_box_history_entry_gift_sent(tr::now)
+					: e.converted
+					? tr::lng_credits_box_history_entry_gift_converted(tr::now)
+					: (e.giftNumber && !e.giftTitle.isEmpty())
+					? Data::UniqueGiftName(e.giftTitle, e.giftNumber)
+					: (isStarGift && !starGiftCanManage)
+					? tr::lng_gift_link_label_gift(tr::now)
+					: giftToSelf
+					? ((uniqueGift && uniqueGift->crafted)
+						? tr::lng_action_gift_crafted_subtitle(tr::now)
+						: tr::lng_action_gift_self_subtitle(tr::now))
+					: e.gift
+					? tr::lng_credits_box_history_entry_gift_name(tr::now)
+					: (peer && !e.reaction)
+					? peer->name()
+					: Ui::GenerateEntryName(e).text),
+				st::creditsBoxAboutTitle),
+			style::al_top);
+
+		Ui::AddSkip(content);
+	}
+	if (e.bareGiftReleasedById && !e.uniqueGift) {
+		const auto peer = owner->peer(PeerId(e.bareGiftReleasedById));
+		const auto released = content->add(
+			object_ptr<Ui::FlatLabel>(
+				content,
+				tr::lng_credits_box_history_entry_gift_released(
+					lt_name,
+					rpl::single(tr::link('@' + peer->username())),
+					tr::marked),
+				st::creditsReleasedByLabel),
+			style::al_top);
+		released->setClickHandlerFilter([=](const auto &...) {
+			Ui::GiftReleasedByHandler(peer);
+			return false;
+		});
+	} else if (!isStarGift || creditsHistoryStarGift || e.soldOutInfo) {
 		constexpr auto kMinus = QChar(0x2212);
 		auto &lifetime = content->lifetime();
 		const auto text = lifetime.make_state<Ui::Text::String>();
+		auto minorText = (Ui::Text::String*)(nullptr);
 		const auto roundedText = e.refunded
 			? tr::lng_channel_earn_history_return(tr::now)
 			: e.pending
@@ -908,37 +1730,60 @@ void ReceiptCreditsBox(
 			object_ptr<Ui::FixedHeightWidget>(
 				content,
 				st::defaultTextStyle.font->height));
-		const auto context = Core::MarkedTextContext{
-			.session = session,
-			.customEmojiRepaint = [=] { amount->update(); },
-		};
-		if (s) {
+		auto helper = Ui::Text::CustomEmojiHelper();
+		const auto starEmoji = helper.paletteDependent(
+			Ui::Earn::IconCreditsEmoji());
+		if (e.soldOutInfo) {
+			text->setText(
+				st::defaultTextStyle,
+				tr::lng_credits_box_history_entry_gift_sold_out(tr::now));
+		} else if (s) {
 			text->setMarkedText(
 				st::defaultTextStyle,
 				tr::lng_credits_subscription_subtitle(
 					tr::now,
 					lt_emoji,
-					session->data().customEmojiManager().creditsEmoji(),
+					starEmoji,
 					lt_cost,
 					{ QString::number(s.subscription.credits) },
-					Ui::Text::WithEntities),
+					tr::marked),
 				kMarkupTextOptions,
-				context);
-		} else {
+				helper.context([=] { amount->update(); }));
+		} else if (e.credits.stars()) {
 			auto t = TextWithEntities()
 				.append((e.in && (creditsHistoryStarGift || !isStarGift))
-					? u"+"_q
+					? QChar('+')
 					: (e.gift && !creditsHistoryStarGift)
-					? QString()
-					: QString(kMinus))
-				.append(Lang::FormatCountDecimal(std::abs(int64(e.credits))))
+					? QChar()
+					: kMinus)
+				.append(Lang::FormatCreditsAmountDecimal(e.credits.abs()))
 				.append(QChar(' '))
-				.append(session->data().customEmojiManager().creditsEmoji());
+				.append(starEmoji);
 			text->setMarkedText(
 				st::semiboldTextStyle,
 				std::move(t),
 				kMarkupTextOptions,
-				context);
+				helper.context([=] { amount->update(); }));
+		} else if (e.credits.ton()) {
+			auto t = TextWithEntities()
+				.append((e.in ? QChar('+') : kMinus))
+				.append(Info::ChannelEarn::MajorPart(e.credits.abs()));
+			text->setMarkedText(
+				st::channelEarnHistoryMajorLabel.style,
+				std::move(t),
+				kMarkupTextOptions,
+				helper.context([=] { amount->update(); }));
+
+			auto minor = TextWithEntities()
+				.append(Info::ChannelEarn::MinorPart(e.credits.abs()))
+				.append(QChar(' '))
+				.append(Ui::Text::IconEmoji(&st::tonIconEmojiInSmall));
+			minorText = lifetime.make_state<Ui::Text::String>();
+			minorText->setMarkedText(
+				st::channelEarnHistoryMinorLabel.style,
+				std::move(minor),
+				kMarkupTextOptions,
+				helper.context([=] { amount->update(); }));
 		}
 		const auto font = text->style()->font;
 		const auto roundedFont = st::defaultTextStyle.font;
@@ -948,11 +1793,15 @@ void ReceiptCreditsBox(
 				+ roundedSkip
 				+ roundedFont->height
 			: 0;
-		const auto fullWidth = text->maxWidth() + roundedWidth;
+		const auto fullWidth = text->maxWidth()
+			+ roundedWidth
+			+ (minorText ? minorText->maxWidth() : 0);
 		amount->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = Painter(amount);
-			p.setPen(s
+			p.setPen(e.soldOutInfo
+				? st::menuIconAttentionColor
+				: s
 				? st::windowSubTextFg
 				: e.pending
 				? st::creditsStroke
@@ -962,13 +1811,21 @@ void ReceiptCreditsBox(
 				? st::windowBoldFg
 				: st::menuIconAttentionColor);
 			const auto x = (amount->width() - fullWidth) / 2;
+			const auto y = (amount->height() - font->height) / 2;
 			text->draw(p, Ui::Text::PaintContext{
-				.position = QPoint(
-					x,
-					(amount->height() - font->height) / 2),
+				.position = QPoint(x, y),
 				.outerWidth = amount->width(),
 				.availableWidth = amount->width(),
 			});
+			if (minorText) {
+				minorText->draw(p, Ui::Text::PaintContext{
+					.position = QPoint(
+						x + text->maxWidth(),
+						y + st::lineWidth * 2),
+					.outerWidth = amount->width(),
+					.availableWidth = amount->width(),
+				});
+			}
 
 			if (rounded) {
 				const auto roundedLeft = fullWidth
@@ -1004,58 +1861,90 @@ void ReceiptCreditsBox(
 
 	if (!isStarGift && !e.description.empty()) {
 		Ui::AddSkip(content);
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
+		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				rpl::single(e.description),
-				st::creditsBoxAbout)));
+				st::creditsBoxAbout),
+			style::al_top);
 	}
-	if (gotStarGift) {
+
+	const auto arrow = Ui::Text::IconEmoji(&st::textMoreIconEmoji);
+	if (!uniqueGift && (starGiftCanManage || e.converted)) {
 		Ui::AddSkip(content);
 		const auto about = box->addRow(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				box,
-				object_ptr<Ui::FlatLabel>(
-					box,
-					rpl::combine(
-						(canConvert
-							? tr::lng_action_gift_got_stars_text
-							: tr::lng_gift_got_stars)(
-								lt_count,
-								rpl::single(e.convertStars * 1.),
-								Ui::Text::RichLangValue),
-						tr::lng_paid_about_link()
-					) | rpl::map([](TextWithEntities text, QString link) {
-						return text.append(' ').append(Ui::Text::Link(link));
-					}),
-					st::creditsBoxAbout)))->entity();
+				(e.giftRefunded
+					? tr::lng_action_gift_refunded(
+						tr::rich)
+					: e.starsUpgradedBySender
+					? tr::lng_action_gift_got_upgradable_text(
+						tr::rich)
+					: (e.starsToUpgrade
+						&& giftToSelf
+						&& !e.giftTransferred)
+					? tr::lng_action_gift_self_about_unique(
+						tr::marked)
+					: (e.starsToUpgrade
+						&& giftToChannelCanManage
+						&& !e.giftTransferred)
+					? tr::lng_action_gift_channel_about_unique(
+						tr::marked)
+					: ((canConvert || e.converted)
+						? rpl::combine(
+							(canConvert
+								? (giftToSelf
+									? tr::lng_action_gift_self_about
+									: giftToChannelCanTransfer
+									? tr::lng_action_gift_channel_about
+									: tr::lng_action_gift_got_stars_text)
+								: (giftToChannel
+									? tr::lng_gift_channel_got
+									: tr::lng_gift_got_stars))(
+									lt_count,
+									rpl::single(e.starsConverted * 1.),
+									tr::rich),
+							tr::lng_paid_about_link()
+						) | rpl::map([](
+								TextWithEntities text,
+								QString link) {
+							return text.append(' ').append(
+								tr::link(link));
+						})
+						: (e.savedToProfile
+							? (giftToChannel
+								? tr::lng_action_gift_can_remove_channel
+								: tr::lng_action_gift_can_remove_text)
+							: (giftToChannel
+								? tr::lng_action_gift_got_gift_channel
+								: tr::lng_action_gift_got_gift_text))(
+									tr::marked))),
+				st::creditsBoxAbout),
+			style::al_top);
 		about->setClickHandlerFilter([=](const auto &...) {
 			Core::App().iv().openWithIvPreferred(
 				session,
 				tr::lng_paid_about_link_url(tr::now));
 			return false;
 		});
+		if (e.giftRefunded) {
+			about->setTextColorOverride(st::menuIconAttentionColor->c);
+		}
 	} else if (isStarGift) {
-	} else if (e.gift || isPrize) {
+	} else if ((e.gift || isPrize) && e.credits.stars()) {
 		Ui::AddSkip(content);
-		const auto arrow = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				st::topicButtonArrow,
-				st::channelEarnLearnArrowMargins,
-				false));
 		auto link = tr::lng_credits_box_history_entry_gift_about_link(
 			lt_emoji,
 			rpl::single(arrow),
-			Ui::Text::RichLangValue
+			tr::rich
 		) | rpl::map([](TextWithEntities text) {
-			return Ui::Text::Link(
+			return tr::link(
 				std::move(text),
 				u"internal:stars_examples"_q);
 		});
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
-			Ui::CreateLabelWithCustomEmoji(
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
 				box,
 				(!e.in && peer)
 					? tr::lng_credits_box_history_entry_gift_out_about(
@@ -1063,296 +1952,722 @@ void ReceiptCreditsBox(
 						rpl::single(TextWithEntities{ peer->shortName() }),
 						lt_link,
 						std::move(link),
-						Ui::Text::RichLangValue)
+						tr::rich)
 					: tr::lng_credits_box_history_entry_gift_in_about(
 						lt_link,
 						std::move(link),
-						Ui::Text::RichLangValue),
-				{ .session = session },
-				st::creditsBoxAbout)));
+						tr::rich),
+				st::creditsBoxAbout),
+			style::al_top);
+	} else if (e.paidMessagesCommission && e.barePeerId) {
+		Ui::AddSkip(content);
+		auto link = tr::lng_credits_paid_messages_fee_about_link(
+			lt_emoji,
+			rpl::single(arrow),
+			tr::rich
+		) | rpl::map([id = e.barePeerId](TextWithEntities text) {
+			return tr::link(
+				std::move(text),
+				u"internal:edit_paid_messages_fee/"_q + QString::number(id));
+		});
+		const auto percent = 100. - (e.paidMessagesCommission / 10.);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_credits_paid_messages_fee_about(
+					lt_percent,
+					rpl::single(
+						tr::bold(QString::number(percent) + '%')),
+					lt_link,
+					std::move(link),
+					tr::rich),
+				st::creditsBoxAbout),
+			style::al_top);
 	}
 
 	Ui::AddSkip(content);
+
+	const auto addGiftLinkTON = [&] {
+		if (!uniqueGift) {
+			return;
+		}
+		const auto address = !uniqueGift->giftAddress.isEmpty()
+			? uniqueGift->giftAddress
+			: uniqueGift->ownerAddress;
+		if (address.isEmpty()) {
+			return;
+		}
+		const auto label = box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_gift_in_blockchain(
+					lt_link,
+					tr::lng_gift_in_blockchain_link_arrow(
+						lt_arrow,
+						rpl::single(arrow),
+						tr::link),
+					tr::marked),
+				st::creditsBoxAboutDivider),
+			style::al_top);
+		label->setClickHandlerFilter([=](const auto &...) {
+			UrlClickHandler::Open(TonAddressUrl(session, address));
+			return false;
+		});
+	};
+
+	if (starGiftCanManage) {
+		addGiftLinkTON();
+	}
+
 	Ui::AddSkip(content);
 
+	struct State final {
+		rpl::variable<bool> confirmButtonBusy;
+		rpl::variable<bool> convertButtonBusy;
+	};
+	const auto state = box->lifetime().make_state<State>();
+
+	const auto canToggle = starGiftCanManage
+		&& !e.giftTransferred
+		&& !e.giftRefunded
+		&& !e.converted;
+	const auto toggleVisibility = [=, weak = base::make_weak(box)](bool save) {
+		const auto showSection = !e.fromGiftsList;
+		const auto savedId = EntryToSavedStarGiftId(&show->session(), e);
+		const auto done = [=](bool ok) {
+			if (ok && showSection) {
+				if (const auto window = show->resolveWindow()) {
+					window->showSection(
+						Info::PeerGifts::Make(window->session().user()));
+				}
+			}
+			if (const auto strong = weak.get()) {
+				if (ok) {
+					strong->closeBox();
+				} else {
+					state->confirmButtonBusy = false;
+				}
+			}
+		};
+		ToggleStarGiftSaved(show, savedId, save, done);
+	};
+
+	const auto canUpgrade = e.stargiftId
+		&& e.canUpgradeGift
+		&& (e.in || giftToSelf || giftToChannelCanManage)
+		&& !e.uniqueGift;
+	const auto canUpgradeFree = canUpgrade && (e.starsUpgradedBySender > 0);
+	const auto canGiftUpgrade = !e.uniqueGift
+		&& !e.in
+		&& !e.giftPrepayUpgradeHash.isEmpty();
+	const auto canRemoveDetails = UniqueGiftCanRemoveDetails(e);
+	const auto removeDetails = UniqueGiftRemoveDetailsHandler(show, e);
+	const auto upgradeGuard = std::make_shared<bool>();
+	const auto upgrade = [=] {
+		const auto window = show->resolveWindow();
+		if (!window || *upgradeGuard || !starGiftSticker) {
+			return;
+		}
+		*upgradeGuard = true;
+		const auto savedId = EntryToSavedStarGiftId(&window->session(), e);
+		const auto openWhenDone = (giftToChannel || canGiftUpgrade)
+			? window->session().data().peer(PeerId(e.bareGiftOwnerId)).get()
+			: starGiftSender;
+		using namespace Ui;
+		ShowStarGiftUpgradeBox({
+			.controller = window,
+			.stargift = Data::StarGift{
+				.id = e.stargiftId,
+				.unique = e.uniqueGift,
+				.stars = e.credits.ton() ? 0 : int(e.credits.whole()),
+				.document = starGiftSticker,
+				.limitedLeft = e.limitedLeft,
+				.limitedCount = e.limitedCount,
+			},
+			.ready = [=](bool) { *upgradeGuard = false; },
+			.upgraded = crl::guard(box, [=] { box->closeBox(); }),
+			.peer = openWhenDone,
+			.savedId = savedId,
+			.giftPrepayUpgradeHash = e.giftPrepayUpgradeHash,
+			.cost = e.starsUpgradedBySender ? 0 : e.starsToUpgrade,
+			.canAddSender = !giftToSelf && !e.anonymous,
+			.canAddComment = (!giftToSelf
+				&& !e.anonymous
+				&& e.hasGiftComment),
+			.canAddMyComment = (giftToSelf && e.hasGiftComment),
+			.addDetailsDefault = (giftToSelf
+				|| (e.starsUpgradedBySender
+					&& !e.giftUpgradeSeparate
+					&& !e.anonymous)),
+		});
+	};
+
 	if (isStarGift && e.id.isEmpty()) {
-		AddStarGiftTable(controller, content, e);
+		const auto convert = [=, weak = base::make_weak(box)] {
+			const auto stars = e.starsConverted;
+			const auto days = canConvert ? ((timeLeft + 86399) / 86400) : 0;
+			auto text = giftToChannelCanManage
+				? tr::lng_gift_convert_sure_confirm_channel(
+					lt_count,
+					rpl::single(stars * 1.),
+					lt_channel,
+					rpl::single(tr::bold(giftChannel->name())),
+					tr::rich)
+				: tr::lng_gift_convert_sure_confirm(
+					lt_count,
+					rpl::single(stars * 1.),
+					lt_user,
+					rpl::single(tr::bold(starGiftSender->shortName())),
+					tr::rich);
+			ConfirmConvertStarGift(show, std::move(text), stars, days, [=] {
+				if (state->convertButtonBusy.current()
+					|| state->confirmButtonBusy.current()) {
+					return;
+				}
+				state->convertButtonBusy = true;
+				const auto savedId = EntryToSavedStarGiftId(
+					&show->session(),
+					e);
+				if (stars) {
+					const auto done = [=](bool ok) {
+						if (ok) {
+							using GiftAction = Data::GiftUpdate::Action;
+							show->session().data().notifyGiftUpdate({
+								.id = savedId,
+								.action = GiftAction::Convert,
+							});
+						}
+						if (const auto strong = weak.get()) {
+							if (ok) {
+								strong->closeBox();
+							} else {
+								state->convertButtonBusy = false;
+							}
+						}
+					};
+					ConvertStarGift(show, savedId, stars, done);
+				}
+			});
+		};
+		AddStarGiftTable(
+			show,
+			content,
+			st,
+			e,
+			upgradeSpinner,
+			canConvert ? convert : Fn<void()>(),
+			canUpgrade,
+			canRemoveDetails ? removeDetails : Fn<void(Fn<void()>)>());
 	} else {
-		AddCreditsHistoryEntryTable(controller, content, e);
-		AddSubscriptionEntryTable(controller, content, s);
+		AddCreditsHistoryEntryTable(show, content, st, e);
+		AddSubscriptionEntryTable(show, content, st, s);
 	}
 
 	Ui::AddSkip(content);
 
-	if (!isStarGift) {
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				tr::lng_credits_box_out_about(
-					lt_link,
-					tr::lng_payments_terms_link(
-					) | Ui::Text::ToLink(
-						tr::lng_credits_box_out_about_link(tr::now)),
-					Ui::Text::WithEntities),
-				st::creditsBoxAboutDivider)));
-	} else if (gotStarGift && e.fromGiftsList) {
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				(e.savedToProfile
-					? tr::lng_gift_visible_hint()
-					: tr::lng_gift_hidden_hint()),
-				st::creditsBoxAboutDivider)));
-	} else if (gotStarGift && e.anonymous) {
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
+	const auto showNextToUpgrade = e.nextToUpgradeShow;
+	if (!isStarGift && e.credits.stars() && e.credits.value()) {
+		box->addRow(CreateCreditsTermsLabel(box), style::al_top);
+	} else if (starGiftCanManage) {
+		const auto hiddenPhrase = giftToChannelCanManage
+			? tr::lng_gift_hidden_hint_channel
+			: uniqueGift
+			? tr::lng_gift_hidden_unique
+			: tr::lng_gift_hidden_hint;
+		const auto visiblePhrase = giftToChannelCanManage
+			? tr::lng_gift_visible_hint_channel
+			: tr::lng_gift_visible_hint;
+		auto withShow = rpl::combine(
+			hiddenPhrase(),
+			tr::lng_gift_visible_show_arrow(
+				lt_arrow,
+				rpl::single(arrow),
+				tr::marked)
+		) | rpl::map([=](QString &&hint, const TextWithEntities &hide) {
+			return TextWithEntities{ std::move(hint) }.append(' ').append(
+				tr::link(hide));
+		});
+		auto withHide = rpl::combine(
+			visiblePhrase(),
+			tr::lng_gift_visible_hide_arrow(
+				lt_arrow,
+				rpl::single(arrow),
+				tr::marked)
+		) | rpl::map([](QString &&hint, const TextWithEntities &hide) {
+			return TextWithEntities{ std::move(hint) }.append(' ').append(
+				tr::link(hide));
+		});
+		auto text = (!e.savedToProfile
+			&& canToggle
+			&& (canUpgrade || showNextToUpgrade))
+			? std::move(withShow)
+			: !e.savedToProfile
+			? hiddenPhrase(tr::marked)
+			: canToggle
+			? std::move(withHide)
+			: visiblePhrase(tr::marked);
+		if (e.anonymous && e.barePeerId && !uniqueGift) {
+			text = rpl::combine(
+				std::move(text),
+				(giftToChannelCanManage
+					? tr::lng_gift_anonymous_hint_channel
+					: tr::lng_gift_anonymous_hint)()
+			) | rpl::map([](TextWithEntities &&a, QString &&b) {
+				return a.append("\n\n").append(b);
+			});
+		}
+		const auto label = box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
-				tr::lng_gift_anonymous_hint(),
-				st::creditsBoxAboutDivider)));
+				std::move(text),
+				st::creditsBoxAboutDivider),
+			style::al_top);
+		label->setClickHandlerFilter([=](const auto &...) {
+			toggleVisibility(!e.savedToProfile);
+			return false;
+		});
+	} else if (e.credits.stars() && e.credits.value()) {
+		box->addRow(CreateCreditsTermsLabel(box), style::al_top);
+	} else {
+		addGiftLinkTON();
 	}
 	if (s) {
+		const auto user = peer ? peer->asUser() : nullptr;
+		const auto bot = (user && !user->isSelf()) ? user : nullptr;
+		const auto toCancel = !s.expired && !s.cancelled && !s.cancelledByBot;
+		if (toCancel) {
+			Ui::AddSkip(content);
+		}
 		Ui::AddSkip(content);
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
+		auto label = object_ptr<Ui::FlatLabel>(
 			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				s.cancelled
-					? tr::lng_credits_subscription_off_about()
-					: tr::lng_credits_subscription_on_about(
-						lt_date,
-						rpl::single(langDayOfMonthFull(s.until.date()))),
-				st::creditsBoxAboutDivider)));
+			((s.cancelledByBot && bot)
+				? tr::lng_credits_subscription_off_by_bot_about(
+					lt_bot,
+					rpl::single(bot->name()))
+				: toCancel
+				? tr::lng_credits_subscription_on_button()
+				: s.cancelled
+				? tr::lng_credits_subscription_off_about()
+				: tr::lng_credits_subscription_on_about(
+					lt_date,
+					rpl::single(langDayOfMonthFull(s.until.date())))),
+			st::creditsBoxAboutDivider);
+		if (toCancel) {
+			label->setClickHandlerFilter([=](
+					const auto &,
+					Qt::MouseButton button) {
+				if (button != Qt::LeftButton) {
+					return false;
+				}
+				const auto done = [=, weak = base::make_weak(box)] {
+					ProcessReceivedSubscriptions(weak, session);
+				};
+				const auto fail = [=, s = box->uiShow()](const QString &e) {
+					s->showToast(e);
+				};
+				Api::EditCreditsSubscription(session, s.id, true, done, fail);
+				return true;
+			});
+			label->setMarkedText(
+				tr::link(
+					tr::lng_credits_subscription_on_button(tr::now),
+					u"internal:"_q));
+		} else if (s.cancelled || s.cancelledByBot) {
+			label->setTextColorOverride(st::menuIconAttentionColor->c);
+		}
+		box->addRow(std::move(label), style::al_top);
 	}
 
 	Ui::AddSkip(content);
 
 	if (e.peerType == Data::CreditsHistoryEntry::PeerType::PremiumBot) {
 		const auto widget = Ui::CreateChild<Ui::RpWidget>(content);
-		using ColoredMiniStars = Ui::Premium::ColoredMiniStars;
-		const auto stars = widget->lifetime().make_state<ColoredMiniStars>(
-			widget,
-			false,
-			Ui::Premium::MiniStars::Type::BiStars);
-		stars->setColorOverride(Ui::Premium::CreditsIconGradientStops());
-		widget->resize(
-			st::boxWidth - stUser.photoSize,
-			stUser.photoSize * 2);
-		content->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
-			widget->moveToLeft(stUser.photoSize / 2, 0);
-			const auto starsRect = Rect(widget->size());
-			stars->setPosition(starsRect.topLeft());
-			stars->setSize(starsRect.size());
-			widget->lower();
-		}, widget->lifetime());
-		widget->paintRequest(
-		) | rpl::start_with_next([=](const QRect &r) {
-			auto p = QPainter(widget);
-			p.fillRect(r, Qt::transparent);
-			stars->paint(p);
-		}, widget->lifetime());
+		AddMiniStars(content, widget, stUser.photoSize, st::boxWideWidth, 2);
 	}
 
+	const auto rejoinByApi = base::unixtime::serialize(s.until)
+		> base::unixtime::now();
+	const auto rejoinByInvite = !s.inviteHash.isEmpty();
+	const auto rejoinBySlug = !s.slug.isEmpty();
 	const auto toRenew = (s.cancelled || s.expired)
-		&& !s.inviteHash.isEmpty();
-	const auto toCancel = !toRenew && s;
-	struct State final {
-		rpl::variable<bool> confirmButtonBusy;
-		rpl::variable<bool> convertButtonBusy;
-	};
-	const auto state = box->lifetime().make_state<State>();
+		&& (rejoinByApi || rejoinByInvite)
+		&& !s.cancelledByBot;
+	const auto toRejoin = (s.cancelled || s.expired)
+		&& rejoinBySlug
+		&& !s.cancelledByBot;
+	//const auto suggestUpgradeNext = uniqueGift
+	//	&& canToggle
+	//	&& e.savedToProfile;
 	auto confirmText = rpl::conditional(
 		state->confirmButtonBusy.value(),
 		rpl::single(QString()),
 		(toRenew
 			? tr::lng_credits_subscription_off_button()
-			: toCancel
-			? tr::lng_credits_subscription_on_button()
-			: canConvert
-			? (e.savedToProfile
-				? tr::lng_gift_display_on_page_hide()
-				: tr::lng_gift_display_on_page())
+			: toRejoin
+			? tr::lng_credits_subscription_off_rejoin_button()
+			: e.craftAnotherCallback
+			? tr::lng_gift_craft_another_button()
+			: canUpgradeFree
+			? tr::lng_gift_upgrade_free()
+			: canUpgrade
+			? tr::lng_gift_unique_upgrade()
+			: canGiftUpgrade
+			? tr::lng_gift_unique_gift_upgrade()
+			: (canToggle && !e.savedToProfile)
+			? (e.giftChannelSavedId
+				? tr::lng_gift_show_on_channel
+				: tr::lng_gift_show_on_page)()
 			: tr::lng_box_ok()));
-	const auto weakWindow = base::make_weak(controller);
-	const auto send = [=, weak = Ui::MakeWeak(box)] {
-		if (canConvert) {
-			const auto save = !e.savedToProfile;
-			const auto window = weakWindow.get();
-			const auto showSection = !e.fromGiftsList;
-			const auto itemId = MsgId(e.bareMsgId);
-			if (window) {
-				const auto done = [=](bool ok) {
-					if (const auto window = weakWindow.get()) {
-						if (ok) {
-							using GiftAction = Data::GiftUpdate::Action;
-							window->session().data().notifyGiftUpdate({
-								.itemId = FullMsgId(
-									starGiftSender->id,
-									itemId),
-								.action = (save
-									? GiftAction::Save
-									: GiftAction::Unsave),
-							});
-							if (showSection) {
-								window->showSection(
-									std::make_shared<Info::Memento>(
-										window->session().user(),
-										Info::Section::Type::PeerGifts));
-							}
-						}
-					}
-					if (const auto strong = weak.data()) {
-						if (ok) {
-							strong->closeBox();
-						} else {
-							state->confirmButtonBusy = false;
-						}
-					}
+	const auto send = [=, weak = base::make_weak(box)] {
+		if (toRejoin && !toRenew) {
+			if (const auto window = show->resolveWindow()) {
+				const auto finish = [=](Payments::CheckoutResult&&) {
+					ProcessReceivedSubscriptions(weak, session);
 				};
-				ToggleStarGiftSaved(
-					window,
-					starGiftSender,
-					itemId,
-					save,
-					done);
+				Payments::CheckoutProcess::Start(
+					&window->session(),
+					s.slug,
+					[](auto) {},
+					Payments::ProcessNonPanelPaymentFormFactory(
+						window,
+						finish));
 			}
 		} else if (toRenew && s.expired) {
-			Api::CheckChatInvite(controller, s.inviteHash, nullptr, [=] {
-				if (const auto strong = weak.data()) {
-					strong->closeBox();
-				}
-			});
+			if (const auto window = show->resolveWindow()) {
+				Api::CheckChatInvite(window, s.inviteHash, nullptr, [=] {
+					ProcessReceivedSubscriptions(weak, session);
+				});
+			}
 		} else {
-			using Flag = MTPpayments_ChangeStarsSubscription::Flag;
-			session->api().request(
-				MTPpayments_ChangeStarsSubscription(
-					MTP_flags(Flag::f_canceled),
-					MTP_inputPeerSelf(),
-					MTP_string(s.id),
-					MTP_bool(toCancel)
-			)).done([=] {
-				if (const auto strong = weak.data()) {
-					strong->closeBox();
-				}
-			}).fail([=, show = box->uiShow()](const MTP::Error &error) {
-				if (const auto strong = weak.data()) {
+			const auto done = [=] {
+				ProcessReceivedSubscriptions(weak, session);
+			};
+			const auto fail = [=, show = box->uiShow()](const QString &e) {
+				if ([[maybe_unused]] const auto strong = weak.get()) {
 					state->confirmButtonBusy = false;
 				}
-				show->showToast(error.type());
-			}).send();
+				show->showToast(e);
+			};
+			Api::EditCreditsSubscription(session, s.id, false, done, fail);
 		}
 	};
 
-	const auto button = box->addButton(std::move(confirmText), [=] {
-		if (state->confirmButtonBusy.current()
-			|| state->convertButtonBusy.current()) {
-			return;
+	const auto willBusy = toRejoin || (peer && toRenew);
+	if (willBusy) {
+		const auto close = Ui::CreateChild<Ui::IconButton>(
+			content,
+			st::boxTitleClose);
+		close->setClickedCallback([=] { box->closeBox(); });
+		content->widthValue() | rpl::on_next([=](int) {
+			close->moveToRight(0, 0);
+		}, content->lifetime());
+	}
+
+	const auto initButtons = [=] {
+		box->clearButtons();
+		const auto button = box->addButton(std::move(confirmText), [=] {
+			if (showNextToUpgrade) {
+				const auto close = crl::guard(box, [=] { box->closeBox(); });
+				showNextToUpgrade();
+				close();
+				return;
+			} else if (e.craftAnotherCallback) {
+				e.craftAnotherCallback();
+				return;
+			} else if (state->confirmButtonBusy.current()
+				|| state->convertButtonBusy.current()) {
+				return;
+			}
+			if (willBusy) {
+				state->confirmButtonBusy = true;
+				send();
+			} else if (canBuyResold) {
+				const auto to = e.bareGiftResaleRecipientId
+					? show->session().data().peer(
+						PeerId(e.bareGiftResaleRecipientId))
+					: show->session().user();
+				ShowBuyResaleGiftBox(
+					show,
+					e.uniqueGift,
+					e.giftResaleForceTon,
+					to,
+					crl::guard(box, [=](bool) { box->closeBox(); }));
+			} else if (canUpgrade || canGiftUpgrade) {
+				upgrade();
+			} else if (canToggle && !e.savedToProfile) {
+				toggleVisibility(true);
+			} else {
+				box->closeBox();
+			}
+		}, showNextToUpgrade
+			? st::giveawayGiftCodeBoxUpgradeNext
+			: st::giveawayGiftCodeBox.button);
+		if (canBuyResold) {
+			if (uniqueGift->onlyAcceptTon || e.giftResaleForceTon) {
+				button->setText(rpl::single(QString()));
+				Ui::SetButtonTwoLabels(
+					button,
+					tr::lng_gift_buy_resale_button(
+						lt_cost,
+						rpl::single(Data::FormatGiftResaleTon(*uniqueGift)),
+						tr::marked),
+					tr::lng_gift_buy_resale_equals(
+						lt_cost,
+						rpl::single(Ui::Text::IconEmoji(
+							&st::starIconEmojiSmall
+						).append(Lang::FormatCountDecimal(
+							uniqueGift->starsForResale))),
+						tr::marked),
+					st::resaleButtonTitle,
+					st::resaleButtonSubtitle);
+			} else {
+				button->setText(tr::lng_gift_buy_resale_button(
+					lt_cost,
+					rpl::single(Ui::Text::IconEmoji(&st::starIconEmoji).append(
+						Lang::FormatCountDecimal(uniqueGift->starsForResale))),
+					tr::marked));
+			}
+		} else if (showNextToUpgrade) {
+			const auto session = &show->session();
+			const auto sticker = e.nextToUpgradeStickerId
+				? session->data().document(e.nextToUpgradeStickerId).get()
+				: nullptr;
+			const auto document = (sticker && sticker->sticker())
+				? sticker
+				: nullptr;
+			button->setContext(Core::TextContext({ .session = session }));
+			button->setText(tr::lng_gift_unique_upgrade_next(
+			) | rpl::map([=](const QString &text) {
+				auto result = TextWithEntities{ text };
+				if (document) {
+					result.append(' ').append(Data::SingleCustomEmoji(document));
+				}
+				return result;
+			}));
 		}
-		state->confirmButtonBusy = true;
-		if ((toRenew || toCancel || canConvert) && peer) {
-			send();
-		} else {
-			box->closeBox();
+		{
+			using namespace Info::Statistics;
+			const auto loadingAnimation = InfiniteRadialAnimationWidget(
+				button,
+				button->height() / 2);
+			AddChildToWidgetCenter(button, loadingAnimation);
+			loadingAnimation->showOn(state->confirmButtonBusy.value());
 		}
-	});
-	{
-		using namespace Info::Statistics;
-		const auto loadingAnimation = InfiniteRadialAnimationWidget(
-			button,
-			button->height() / 2);
-		AddChildToWidgetCenter(button, loadingAnimation);
-		loadingAnimation->showOn(state->confirmButtonBusy.value());
+	};
+	if (upgradeSpinner) {
+		using SpinnerState = Data::GiftUpgradeSpinner::State;
+		box->clearButtons();
+		const auto button = box->addButton(tr::lng_create_group_skip(), [=] {
+			initButtons();
+			upgradeSpinner->state = SpinnerState::FinishedModel;
+		});
+
+		upgradeSpinner->state.value(
+		) | rpl::on_next([=](SpinnerState state) {
+			if (state >= SpinnerState::Finished) {
+				crl::on_main(button, initButtons);
+			}
+		}, button->lifetime());
+	} else {
+		initButtons();
 	}
-	const auto buttonWidth = st::boxWidth
-		- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
+}
 
-	button->widthValue() | rpl::filter([=] {
-		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
-		button->resizeToWidth(buttonWidth);
-	}, button->lifetime());
+void UniqueGiftValueBox(
+		not_null<Ui::GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::CreditsHistoryEntry &e,
+		CreditsEntryBoxStyleOverrides st) {
+	box->setStyle(st.box ? *st.box : st::giveawayGiftCodeBox);
+	box->setWidth(st::boxWideWidth);
+	box->setNoContentMargin(true);
 
-	if (canConvert) {
-		using namespace Ui;
-		auto convertText = rpl::conditional(
-			state->convertButtonBusy.value(),
-			rpl::single(QString()),
-			tr::lng_gift_convert_to_stars(
-				lt_count,
-				rpl::single(e.convertStars * 1.)));
-		const auto convert = CreateChild<RoundButton>(
-			button->parentWidget(),
-			std::move(convertText),
-			st::defaultLightButton);
-		convert->setTextTransform(RoundButton::TextTransform::NoTransform);
-		convert->widthValue() | rpl::filter([=] {
-			return convert->widthNoMargins() != buttonWidth;
-		}) | rpl::start_with_next([=] {
-			convert->resizeToWidth(buttonWidth);
-		}, convert->lifetime());
-		button->positionValue(
-		) | rpl::start_with_next([=](QPoint position) {
-			convert->move(
-				position.x(),
-				(position.y()
-					+ st::starGiftBox.buttonHeight
-					+ st::starGiftBox.buttonPadding.bottom()
-					- st::starGiftBox.buttonPadding.top()
-					- convert->height()));
-		}, convert->lifetime());
-		convert->setClickedCallback([=, weak = Ui::MakeWeak(box)] {
-			const auto stars = e.convertStars;
-			const auto name = starGiftSender->shortName();
-			ConfirmConvertStarGift(box->uiShow(), name, stars, [=] {
-				if (state->convertButtonBusy.current()
-					|| state->confirmButtonBusy.current()) {
-					return;
-				}
-				state->convertButtonBusy = true;
-				const auto window = weakWindow.get();
-				const auto itemId = MsgId(e.bareMsgId);
-				if (window && stars) {
-					const auto done = [=](bool ok) {
-						if (const auto window = weakWindow.get()) {
-							if (ok) {
-								using GiftAction = Data::GiftUpdate::Action;
-								window->session().data().notifyGiftUpdate({
-									.itemId = FullMsgId(
-										starGiftSender->id,
-										itemId),
-									.action = GiftAction::Convert,
-								});
-							}
-						}
-						if (const auto strong = weak.data()) {
-							if (ok) {
-								strong->closeBox();
-							} else {
-								state->convertButtonBusy = false;
-							}
-						}
-					};
-					ConvertStarGift(
-						window,
-						starGiftSender,
-						itemId,
-						stars,
-						done);
-				}
-			});
-		});
+	const auto unique = e.uniqueGift;
+	const auto value = unique ? unique->value : nullptr;
+	Assert(unique && value);
+
+	const auto showLastPrice = (value->lastSalePrice > value->averagePrice);
+
+	const auto content = box->verticalLayout();
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	struct State final {
+		DocumentData *sticker = nullptr;
+		std::shared_ptr<Data::DocumentMedia> media;
+		std::unique_ptr<Lottie::SinglePlayer> lottie;
+		rpl::lifetime downloadLifetime;
+		rpl::lifetime buyLifetime;
+	};
+	Ui::AddSkip(content, st::creditsHistoryEntryStarGiftSpace);
+
+	const auto icon = Ui::CreateChild<Ui::RpWidget>(content);
+	icon->resize(Size(st::creditsHistoryEntryStarGiftSize));
+	const auto state = icon->lifetime().make_state<State>();
+	const auto document = unique->model.document;
+	if (document && document->sticker()) {
+		const auto origin = document->stickerOrGifOrigin();
+		state->sticker = document;
+		state->media = document->createMediaView();
+		state->media->thumbnailWanted(origin);
+		state->media->automaticLoad(origin, nullptr);
+		rpl::single() | rpl::then(
+			document->session().downloaderTaskFinished()
+		) | rpl::filter([=] {
+			return state->media->loaded();
+		}) | rpl::on_next([=] {
+			state->lottie = ChatHelpers::LottiePlayerFromDocument(
+				state->media.get(),
+				ChatHelpers::StickerLottieSize::MessageHistory,
+				icon->size(),
+				Lottie::Quality::High);
+			state->lottie->updates() | rpl::on_next([=] {
+				icon->update();
+			}, icon->lifetime());
+			state->downloadLifetime.destroy();
+		}, state->downloadLifetime);
+	}
+	icon->paintRequest(
+	) | rpl::on_next([=] {
+		auto p = Painter(icon);
+		const auto &lottie = state->lottie;
+		const auto factor = style::DevicePixelRatio();
+		const auto request = Lottie::FrameRequest{
+			.box = icon->size() * factor,
+		};
+		const auto frame = (lottie && lottie->ready())
+			? lottie->frameInfo(request)
+			: Lottie::Animation::FrameInfo();
+		if (!frame.image.isNull()) {
+			p.drawImage(
+				QRect(QPoint(), frame.image.size() / factor),
+				frame.image);
+			if (lottie->frameIndex() < lottie->framesCount() - 1) {
+				lottie->markFrameShown();
+			}
+		}
+	}, icon->lifetime());
+	content->sizeValue(
+	) | rpl::on_next([=](const QSize &size) {
+		icon->move(
+			(size.width() - icon->width()) / 2,
+			st::creditsHistoryEntryStarGiftSkip);
+	}, icon->lifetime());
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	const auto bubble = box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			rpl::single(
+				Ui::FillAmountAndCurrency(value->valuePrice, value->currency)),
+			st::uniqueGiftValuePrice),
+		style::al_top);
+	bubble->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(bubble);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(st::windowBgActive);
+		p.setPen(Qt::NoPen);
+		const auto rect = bubble->rect();
+		const auto radius = std::min(rect.width(), rect.height()) / 2.;
+		p.drawRoundedRect(rect, radius, radius);
+	}, bubble->lifetime());
+
+	Ui::AddSkip(content);
+
+	const auto arrow = Ui::Text::IconEmoji(&st::textMoreIconEmoji);
+	Ui::AddSkip(content);
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			(showLastPrice
+				? tr::lng_gift_value_about_last(
+					lt_gift,
+					rpl::single(tr::bold(
+						Data::UniqueGiftName(*unique))),
+					lt_platform,
+					(value->lastSaleFragment
+						? tr::lng_gift_value_fragment
+						: tr::lng_gift_value_telegram)(
+							tr::marked),
+					tr::rich)
+				: tr::lng_gift_value_about_average(
+					lt_gift,
+					rpl::single(tr::bold(unique->title)),
+					tr::rich)),
+			st::uniqueGiftValueAbout)
+	)->setTryMakeSimilarLines(true);
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	AddUniqueGiftValueTable(show, content, st, e);
+
+	Ui::AddSkip(content);
+
+	const auto addAvailability = [&](int count, tr::phrase<> platform) {
+		return box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_gift_value_availability(
+					lt_count_decimal,
+					rpl::single(count * 1.),
+					lt_emoji,
+					rpl::single(Data::SingleCustomEmoji(document)),
+					lt_platform,
+					platform(tr::marked),
+					lt_arrow,
+					rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+					tr::link),
+				st::uniqueGiftValueAvailableLink,
+				st::defaultPopupMenu,
+				Core::TextContext({ .session = &show->session() })),
+			st::boxRowPadding + st::uniqueGiftValueAvailableMargin,
+			style::al_top);
+	};
 
-		using namespace Info::Statistics;
-		const auto loadingAnimation = InfiniteRadialAnimationWidget(
-			convert,
-			convert->height() / 2,
-			&st::starConvertButtonLoading);
-		AddChildToWidgetCenter(convert, loadingAnimation);
-		loadingAnimation->showOn(state->convertButtonBusy.value());
+	if (const auto count = value->forSaleOnTelegram; count > 0) {
+		addAvailability(
+			count,
+			tr::lng_gift_value_telegram
+		)->setClickHandlerFilter([=](const auto &...) {
+			if (const auto window = show->resolveWindow()) {
+				state->buyLifetime = Ui::ShowStarGiftResale(
+					window,
+					window->session().user(),
+					unique->initialGiftId,
+					unique->title,
+					crl::guard(box, [=] { state->buyLifetime.destroy(); }));
+			}
+			return false;
+		});
+	}
+	if (const auto count = value->forSaleOnFragment; count > 0) {
+		const auto url = value->fragmentUrl;
+		addAvailability(
+			count,
+			tr::lng_gift_value_fragment
+		)->setClickHandlerFilter([=](const auto &...) {
+			UrlClickHandler::Open(url);
+			return false;
+		});
 	}
+
+	box->addButton(tr::lng_box_ok(), [=] {
+		box->closeBox();
+	});
+}
+
+void ReceiptCreditsBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionController*> controller,
+		const Data::CreditsHistoryEntry &e,
+		const Data::SubscriptionEntry &s) {
+	GenericCreditsEntryBox(box, controller->uiShow(), e, s);
 }
 
 void GiftedCreditsBox(
@@ -1372,7 +2687,7 @@ void GiftedCreditsBox(
 			? tr::lng_credits_box_history_entry_gift_name
 			: tr::lng_credits_box_history_entry_gift_sent)(tr::now),
 		.date = base::unixtime::parse(date),
-		.credits = uint64(count),
+		.credits = CreditsAmount(count),
 		.bareMsgId = uint64(),
 		.barePeerId = (anonymous ? uint64() : peer->id.value),
 		.peerType = (anonymous ? PeerType::Fragment : PeerType::Peer),
@@ -1395,7 +2710,7 @@ void CreditsPrizeBox(
 			.title = QString(),
 			.description = TextWithEntities(),
 			.date = base::unixtime::parse(date),
-			.credits = uint64(data.count),
+			.credits = CreditsAmount(data.count),
 			.barePeerId = data.channel
 				? data.channel->id.value
 				: 0,
@@ -1406,63 +2721,241 @@ void CreditsPrizeBox(
 		Data::SubscriptionEntry());
 }
 
-void UserStarGiftBox(
+void GlobalStarGiftBox(
 		not_null<Ui::GenericBox*> box,
-		not_null<Window::SessionController*> controller,
-		const Api::UserStarGift &data) {
-	Settings::ReceiptCreditsBox(
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::StarGift &data,
+		StarGiftResaleInfo resale,
+		CreditsEntryBoxStyleOverrides st) {
+	const auto selfId = show->session().userPeerId();
+	const auto ownerId = data.unique ? data.unique->ownerId.value : 0;
+	const auto hostId = data.unique ? data.unique->hostId.value : 0;
+	Settings::GenericCreditsEntryBox(
 		box,
-		controller,
+		show,
 		Data::CreditsHistoryEntry{
-			.description = data.message,
-			.date = base::unixtime::parse(data.date),
-			.credits = uint64(data.gift.stars),
-			.bareMsgId = uint64(data.messageId.bare),
-			.barePeerId = data.fromId.value,
-			.bareGiftStickerId = (data.gift.document
-				? data.gift.document->id
+			.credits = CreditsAmount(data.stars),
+			.bareGiftStickerId = data.document->id,
+			.bareGiftOwnerId = ownerId,
+			.bareGiftHostId = hostId,
+			.bareGiftResaleRecipientId = ((resale.recipientId != selfId)
+				? resale.recipientId.value
 				: 0),
+			.stargiftId = data.id,
+			.uniqueGift = data.unique,
 			.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
-			.limitedCount = data.gift.limitedCount,
-			.limitedLeft = data.gift.limitedLeft,
-			.convertStars = int(data.gift.convertStars),
-			.converted = false,
-			.anonymous = data.anonymous,
-			.savedToProfile = !data.hidden,
-			.fromGiftsList = true,
-			.in = data.mine,
+			.limitedCount = data.limitedCount,
+			.limitedLeft = data.limitedLeft,
+			.stargift = true,
+			.giftResaleForceTon = resale.forceTon,
+			.fromGiftSlug = true,
+			.in = (ownerId == show->session().userPeerId().value),
 			.gift = true,
 		},
-		Data::SubscriptionEntry());
+		Data::SubscriptionEntry(),
+		st);
 }
 
-void StarGiftViewBox(
-		not_null<Ui::GenericBox*> box,
+Data::CreditsHistoryEntry SavedStarGiftEntry(
+		not_null<PeerData*> owner,
+		const Data::SavedStarGift &data) {
+	const auto chatGiftPeer = data.manageId.chat();
+	const auto ownerId = data.info.unique
+		? data.info.unique->ownerId
+		: owner->id;
+	const auto hostId = data.info.unique
+		? data.info.unique->hostId
+		: PeerId();
+	return {
+		.description = data.message,
+		.date = base::unixtime::parse(data.date),
+		.credits = CreditsAmount(data.info.stars),
+		.bareMsgId = uint64(data.manageId.userMessageId().bare),
+		.barePeerId = data.fromId.value,
+		.bareGiftStickerId = data.info.document->id,
+		.bareGiftOwnerId = ownerId.value,
+		.bareGiftHostId = hostId.value,
+		.bareActorId = data.fromId.value,
+		.bareEntryOwnerId = chatGiftPeer ? chatGiftPeer->id.value : 0,
+		.giftChannelSavedId = data.manageId.chatSavedId(),
+		.stargiftId = data.info.id,
+		.giftPrepayUpgradeHash = data.giftPrepayUpgradeHash,
+		.giftTitle = data.info.resellTitle,
+		.uniqueGift = data.info.unique,
+		.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
+		.limitedCount = data.info.limitedCount,
+		.limitedLeft = data.info.limitedLeft,
+		.starsConverted = int(data.starsConverted),
+		.starsToUpgrade = int(data.info.starsToUpgrade),
+		.starsUpgradedBySender = int(data.starsUpgradedBySender),
+		.starsForDetailsRemove = int(data.starsForDetailsRemove),
+		.giftNumber = data.giftNum,
+		.converted = false,
+		.anonymous = data.anonymous,
+		.stargift = true,
+		.giftUpgradeSeparate = data.upgradeSeparate,
+		.giftPinned = data.pinned,
+		.savedToProfile = !data.hidden,
+		.fromGiftsList = true,
+		.canUpgradeGift = data.upgradable,
+		.in = data.mine,
+		.gift = true,
+	};
+}
+
+Data::SavedStarGiftId EntryToSavedStarGiftId(
+		not_null<Main::Session*> session,
+		const Data::CreditsHistoryEntry &entry) {
+	return (!entry.stargift || (!entry.in && !entry.giftChannelSavedId))
+		? Data::SavedStarGiftId()
+		: (entry.bareEntryOwnerId && entry.giftChannelSavedId)
+		? Data::SavedStarGiftId::Chat(
+			session->data().peer(PeerId(entry.bareEntryOwnerId)),
+			entry.giftChannelSavedId)
+		: Data::SavedStarGiftId::User(MsgId(entry.bareMsgId));
+}
+
+void ShowSavedStarGiftBox(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> owner,
+		const Data::SavedStarGift &data,
+		Fn<std::vector<Data::CreditsHistoryEntry>()> pinned) {
+	controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+		auto entry = SavedStarGiftEntry(owner, data);
+		entry.pinnedSavedGifts = std::move(pinned);
+		Settings::ReceiptCreditsBox(
+			box,
+			controller,
+			std::move(entry),
+			Data::SubscriptionEntry());
+	}));
+}
+
+void FillSavedStarGiftMenu(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<Ui::PopupMenu*> menu,
+		const Data::CreditsHistoryEntry &e,
+		SavedStarGiftMenuType type,
+		CreditsEntryBoxStyleOverrides st) {
+	FillUniqueGiftMenu(show, menu, e, type, st);
+}
+
+void ShowStarGiftViewBox(
 		not_null<Window::SessionController*> controller,
 		const Data::GiftCode &data,
-		not_null<HistoryItem*> item) {
-	Settings::ReceiptCreditsBox(
-		box,
+		FullMsgId itemId,
+		std::optional<Data::SavedStarGift> upgradeNext) {
+	const auto item = controller->session().data().message(itemId);
+	if (!item) {
+		return;
+	}
+	const auto peer = item->history()->peer;
+	const auto toChannel = peer->isServiceUser() && data.channel;
+	const auto incoming = !toChannel
+		&& !data.auctionTo
+		&& ((data.upgrade ? item->out() : !item->out())
+			|| peer->isSelf());
+	const auto fromId = incoming ? peer->id : peer->session().userPeerId();
+	const auto toId = incoming
+		? peer->session().userPeerId()
+		: data.auctionTo
+		? data.auctionTo->id
+		: peer->id;
+	const auto ownerId = data.unique ? data.unique->ownerId : toId;
+	const auto hostId = data.unique ? data.unique->hostId : PeerId();
+	const auto nextToUpgradeStickerId = upgradeNext
+		? upgradeNext->info.document->id
+		: uint64();
+	const auto nextToUpgradeShow = upgradeNext
+		? [=] { ShowSavedStarGiftBox(
+			controller,
+			controller->session().data().peer(ownerId),
+			*upgradeNext); }
+		: Fn<void()>();
+	const auto entry = Data::CreditsHistoryEntry{
+		.id = data.slug,
+		.description = data.message,
+		.date = base::unixtime::parse(item->date()),
+		.credits = CreditsAmount(data.count),
+		.bareMsgId = uint64(data.realGiftMsgId
+			? data.realGiftMsgId.bare
+			: item->id.bare),
+		.barePeerId = fromId.value,
+		.bareGiftStickerId = data.document ? data.document->id : 0,
+		.bareGiftOwnerId = ownerId.value,
+		.bareGiftHostId = hostId.value,
+		.bareGiftReleasedById = (data.stargiftReleasedBy
+			? data.stargiftReleasedBy->id.value
+			: 0),
+		.bareActorId = (toChannel ? data.channelFrom->id.value : 0),
+		.bareEntryOwnerId = (toChannel ? data.channel->id.value : 0),
+		.giftChannelSavedId = data.channelSavedId,
+		.stargiftId = data.stargiftId,
+		.giftPrepayUpgradeHash = data.giftPrepayUpgradeHash,
+		.giftTitle = data.giftTitle,
+		.uniqueGift = data.unique,
+		.nextToUpgradeStickerId = nextToUpgradeStickerId,
+		.nextToUpgradeShow = std::move(nextToUpgradeShow),
+		.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
+		.limitedCount = data.limitedCount,
+		.limitedLeft = data.limitedLeft,
+		.starsConverted = data.starsConverted,
+		.starsToUpgrade = data.starsToUpgrade,
+		.starsUpgradedBySender = data.starsUpgradedBySender,
+		.starsForDetailsRemove = data.starsForDetailsRemove,
+		.giftNumber = data.giftNum,
+		.converted = data.converted,
+		.anonymous = data.anonymous,
+		.stargift = true,
+		.auction = (data.auctionTo != nullptr),
+		.giftTransferred = data.transferred,
+		.giftRefunded = data.refunded,
+		.giftUpgradeSeparate = data.upgradeSeparate,
+		.giftUpgradeGifted = data.upgradeGifted,
+		.savedToProfile = data.saved,
+		.canUpgradeGift = data.upgradable,
+		.hasGiftComment = !data.message.empty(),
+		.in = incoming,
+		.gift = true,
+	};
+	controller->show(Box(
+		Settings::ReceiptCreditsBox,
 		controller,
-		Data::CreditsHistoryEntry{
-			.id = data.slug,
-			.description = data.message,
-			.date = base::unixtime::parse(item->date()),
-			.credits = uint64(data.count),
-			.bareMsgId = uint64(item->id.bare),
-			.barePeerId = item->history()->peer->id.value,
-			.bareGiftStickerId = data.document ? data.document->id : 0,
-			.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
-			.limitedCount = data.limitedCount,
-			.limitedLeft = data.limitedLeft,
-			.convertStars = data.convertStars,
-			.converted = data.converted,
-			.anonymous = data.anonymous,
-			.savedToProfile = data.saved,
-			.in = true,
-			.gift = true,
-		},
-		Data::SubscriptionEntry());
+		entry,
+		Data::SubscriptionEntry()));
+}
+
+void ShowStarGiftViewBox(
+		not_null<Window::SessionController*> controller,
+		const Data::GiftCode &data,
+		FullMsgId itemId) {
+	// Now we suggest upgrading next gift after a gift upgrade.
+	// No need to suggest it every gift open from a chat.
+	//
+	//const auto item = controller->session().data().message(itemId);
+	//if (!item) {
+	//	return;
+	//}
+	//const auto peer = item->history()->peer;
+	//const auto toChannel = peer->isServiceUser() && data.channel;
+	//const auto incoming = !toChannel
+	//	&& (data.upgrade ? item->out() : !item->out());
+	//const auto toId = incoming ? peer->session().userPeerId() : peer->id;
+	//const auto ownerId = data.unique ? data.unique->ownerId : toId;
+	//const auto owner = peer->owner().peer(ownerId);
+	//if (data.unique && owner->canManageGifts()) {
+	//	const auto weak = base::make_weak(controller);
+	//	owner->owner().nextForUpgradeGiftRequest(owner, crl::guard(weak, [=](
+	//			std::optional<Data::SavedStarGift> nextToUpgrade) {
+	//		ShowStarGiftViewBox(
+	//			controller,
+	//			data,
+	//			itemId,
+	//			std::move(nextToUpgrade));
+	//	}));
+	//} else {
+		ShowStarGiftViewBox(controller, data, itemId, std::nullopt);
+	//}
 }
 
 void ShowRefundInfoBox(
@@ -1480,7 +2973,7 @@ void ShowRefundInfoBox(
 	auto info = Data::CreditsHistoryEntry();
 	info.id = refund->transactionId;
 	info.date = base::unixtime::parse(item->date());
-	info.credits = refund->amount;
+	info.credits = CreditsAmount(refund->amount);
 	info.barePeerId = refund->peer->id.value;
 	info.peerType = Data::CreditsHistoryEntry::PeerType::Peer;
 	info.refunded = true;
@@ -1499,11 +2992,12 @@ object_ptr<Ui::RpWidget> GenericEntryPhoto(
 	auto owned = object_ptr<Ui::RpWidget>(parent);
 	const auto widget = owned.data();
 	widget->resize(Size(photoSize));
+	widget->setNaturalWidth(photoSize);
 
 	const auto draw = callback(
 		crl::guard(widget, [=] { widget->update(); }));
 	widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(widget);
 		draw(p, 0, 0, photoSize, photoSize);
 	}, widget->lifetime());
@@ -1541,14 +3035,46 @@ object_ptr<Ui::RpWidget> PaidMediaThumbnail(
 		photoSize);
 }
 
+object_ptr<Ui::RpWidget> SubscriptionUserpic(
+		not_null<Ui::RpWidget*> parent,
+		not_null<PeerData*> peer,
+		int photoSize) {
+	auto widget = object_ptr<Ui::RpWidget>(parent);
+	const auto raw = widget.data();
+	widget->resize(photoSize, photoSize);
+	widget->setNaturalWidth(photoSize);
+	const auto userpicMedia = Ui::MakeUserpicThumbnail(peer, false);
+	userpicMedia->subscribeToUpdates([=] { raw->update(); });
+	const auto creditsIconSize = photoSize / 3;
+	const auto creditsIconCallback =
+		Ui::PaintOutlinedColoredCreditsIconCallback(
+			creditsIconSize,
+			1.5);
+	widget->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(raw);
+		p.fillRect(Rect(Size(photoSize)), Qt::transparent);
+		auto image = userpicMedia->image(photoSize);
+		{
+			auto q = QPainter(&image);
+			q.translate(photoSize, photoSize);
+			q.translate(-creditsIconSize, -creditsIconSize);
+			creditsIconCallback(q);
+		}
+		p.drawImage(0, 0, image);
+	}, widget->lifetime());
+	return widget;
+}
+
 void SmallBalanceBox(
 		not_null<Ui::GenericBox*> box,
 		std::shared_ptr<Main::SessionShow> show,
-		uint64 credits,
+		uint64 wholeCredits,
 		SmallBalanceSource source,
 		Fn<void()> paid) {
 	Expects(show->session().credits().loaded());
 
+	auto credits = CreditsAmount(wholeCredits);
+
 	box->setWidth(st::boxWideWidth);
 	box->addButton(tr::lng_close(), [=] { box->closeBox(); });
 	const auto done = [=] {
@@ -1556,6 +3082,7 @@ void SmallBalanceBox(
 		paid();
 	};
 
+	auto dark = false;
 	const auto owner = &show->session().data();
 	const auto name = v::match(source, [&](SmallBalanceBot value) {
 		return value.botId
@@ -1563,71 +3090,154 @@ void SmallBalanceBox(
 			: QString();
 	}, [&](SmallBalanceReaction value) {
 		return owner->peer(peerFromChannel(value.channelId))->name();
+	}, [&](SmallBalanceVideoStream value) {
+		dark = true;
+		return owner->peer(value.streamerId)->name();
 	}, [](SmallBalanceSubscription value) {
 		return value.name;
-	}, [](SmallBalanceDeepLink value) {
+	}, [](SmallBalanceDeepLink) {
 		return QString();
 	}, [&](SmallBalanceStarGift value) {
-		return owner->peer(peerFromUser(value.userId))->shortName();
+		return owner->peer(value.recipientId)->shortName();
+	}, [&](SmallBalanceForMessage value) {
+		return value.recipientId
+			? owner->peer(value.recipientId)->shortName()
+			: QString();
+	}, [&](SmallBalanceForSuggest value) {
+		return value.recipientId
+			? owner->peer(value.recipientId)->shortName()
+			: QString();
+	}, [](SmallBalanceForOffer) {
+		return QString();
+	}, [](SmallBalanceForSearch) {
+		return QString();
 	});
 
 	auto needed = show->session().credits().balanceValue(
-	) | rpl::map([=](uint64 balance) {
-		return (balance < credits) ? (credits - balance) : 0;
+	) | rpl::map([=](CreditsAmount balance) {
+		return (balance < credits) ? (credits - balance) : CreditsAmount();
 	});
 	const auto content = [&]() -> Ui::Premium::TopBarAbstract* {
 		return box->setPinnedToTopContent(object_ptr<Ui::Premium::TopBar>(
 			box,
-			st::creditsLowBalancePremiumCover,
+			(dark
+				? st::videoStreamStarsCover
+				: st::creditsLowBalancePremiumCover),
 			Ui::Premium::TopBarDescriptor{
 				.title = tr::lng_credits_small_balance_title(
 					lt_count,
 					rpl::duplicate(
 						needed
-					) | rpl::filter(rpl::mappers::_1 > 0) | tr::to_count()),
+					) | rpl::filter(
+						rpl::mappers::_1 > CreditsAmount(0)
+					) | rpl::map([](CreditsAmount amount) {
+						return amount.value();
+					})),
 				.about = (v::is<SmallBalanceSubscription>(source)
 					? tr::lng_credits_small_balance_subscribe(
 						lt_channel,
-						rpl::single(Ui::Text::Bold(name)),
-						Ui::Text::RichLangValue)
+						rpl::single(tr::bold(name)),
+						tr::rich)
 					: v::is<SmallBalanceReaction>(source)
 					? tr::lng_credits_small_balance_reaction(
 						lt_channel,
-						rpl::single(Ui::Text::Bold(name)),
-						Ui::Text::RichLangValue)
+						rpl::single(tr::bold(name)),
+						tr::rich)
+					: v::is<SmallBalanceVideoStream>(source)
+					? tr::lng_credits_small_balance_video_stream(
+						lt_name,
+						rpl::single(tr::bold(name)),
+						tr::rich)
 					: v::is<SmallBalanceDeepLink>(source)
 					? DeepLinkBalanceAbout(
 						v::get<SmallBalanceDeepLink>(source).purpose)
 					: v::is<SmallBalanceStarGift>(source)
 					? tr::lng_credits_small_balance_star_gift(
 						lt_user,
-						rpl::single(Ui::Text::Bold(name)),
-						Ui::Text::RichLangValue)
+						rpl::single(tr::bold(name)),
+						tr::rich)
+					: v::is<SmallBalanceForMessage>(source)
+					? (name.isEmpty()
+						? tr::lng_credits_small_balance_for_messages(
+							tr::rich)
+						: tr::lng_credits_small_balance_for_message(
+							lt_user,
+							rpl::single(tr::bold(name)),
+							tr::rich))
+					: v::is<SmallBalanceForSuggest>(source)
+					? tr::lng_credits_small_balance_for_suggest(
+						lt_channel,
+						rpl::single(tr::bold(name)),
+						tr::rich)
+					: v::is<SmallBalanceForOffer>(source)
+					? tr::lng_credits_small_balance_for_offer(tr::rich)
+					: v::is<SmallBalanceForSearch>(source)
+					? tr::lng_credits_small_balance_for_search(
+						tr::rich)
 					: name.isEmpty()
 					? tr::lng_credits_small_balance_fallback(
-						Ui::Text::RichLangValue)
+						tr::rich)
 					: tr::lng_credits_small_balance_about(
 						lt_bot,
 						rpl::single(TextWithEntities{ name }),
-						Ui::Text::RichLangValue)),
+						tr::rich)),
 				.light = true,
 				.gradientStops = Ui::Premium::CreditsIconGradientStops(),
 			}));
 	}();
 
+	const auto peerIfBotOrChannel = [owner](PeerId id) -> PeerId {
+		if (!id) {
+			return PeerId();
+		}
+		const auto peer = owner->peer(id);
+		if (const auto broadcast = peer->monoforumBroadcast()) {
+			return broadcast->id;
+		} else if (!peer->isBot() && !peer->isChannel()) {
+			return PeerId();
+		}
+		return id;
+	};
+	const auto purposePeerId = v::match(source, [](SmallBalanceBot value) {
+		return value.botId ? peerFromUser(value.botId) : PeerId();
+	}, [](SmallBalanceReaction value) {
+		return value.channelId ? peerFromChannel(value.channelId) : PeerId();
+	}, [=](SmallBalanceVideoStream value) {
+		return peerIfBotOrChannel(value.streamerId);
+	}, [](SmallBalanceSubscription) {
+		return PeerId();
+	}, [](SmallBalanceDeepLink) {
+		return PeerId();
+	}, [](SmallBalanceStarGift) {
+		return PeerId();
+	}, [=](SmallBalanceForMessage value) {
+		return peerIfBotOrChannel(value.recipientId);
+	}, [=](SmallBalanceForSuggest value) {
+		return peerIfBotOrChannel(value.recipientId);
+	}, [](SmallBalanceForOffer) {
+		return PeerId();
+	}, [](SmallBalanceForSearch) {
+		return PeerId();
+	});
+
 	FillCreditOptions(
 		show,
 		box->verticalLayout(),
 		show->session().user(),
 		credits - show->session().credits().balance(),
-		[=] { show->session().credits().load(true); });
+		[=] { show->session().credits().load(true); },
+		box->showFinishes(),
+		tr::lng_credits_summary_options_subtitle(),
+		{},
+		dark,
+		purposePeerId);
 
 	content->setMaximumHeight(st::creditsLowBalancePremiumCoverHeight);
 	content->setMinimumHeight(st::infoLayerTopBarHeight);
 
 	content->resize(content->width(), content->maximumHeight());
 	content->additionalHeight(
-	) | rpl::start_with_next([=](int additionalHeight) {
+	) | rpl::on_next([=](int additionalHeight) {
 		const auto wasMax = (content->height() == content->maximumHeight());
 		content->setMaximumHeight(st::creditsLowBalancePremiumCoverHeight
 			+ additionalHeight);
@@ -1639,14 +3249,17 @@ void SmallBalanceBox(
 	{
 		const auto balance = AddBalanceWidget(
 			content,
+			&show->session(),
 			show->session().credits().balanceValue(),
-			true);
+			true,
+			nullptr,
+			dark);
 		show->session().credits().load(true);
 
 		rpl::combine(
 			balance->sizeValue(),
 			content->sizeValue()
-		) | rpl::start_with_next([=](const QSize &, const QSize &) {
+		) | rpl::on_next([=](const QSize &, const QSize &) {
 			balance->moveToRight(
 				st::creditsHistoryRightSkip * 2,
 				st::creditsHistoryRightSkip);
@@ -1658,7 +3271,7 @@ void SmallBalanceBox(
 		needed
 	) | rpl::filter(
 		!rpl::mappers::_1
-	) | rpl::start_with_next(done, content->lifetime());
+	) | rpl::on_next(done, content->lifetime());
 }
 
 void AddWithdrawalWidget(
@@ -1666,21 +3279,22 @@ void AddWithdrawalWidget(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer,
 		rpl::producer<QString> secondButtonUrl,
-		rpl::producer<uint64> availableBalanceValue,
+		rpl::producer<CreditsAmount> availableBalanceValue,
 		rpl::producer<QDateTime> dateValue,
-		rpl::producer<bool> lockedValue,
+		bool withdrawalEnabled,
 		rpl::producer<QString> usdValue) {
 	Ui::AddSkip(container);
 
 	const auto labels = container->add(
-		object_ptr<Ui::CenterWrap<Ui::RpWidget>>(
-			container,
-			object_ptr<Ui::RpWidget>(container)))->entity();
+		object_ptr<Ui::RpWidget>(container),
+		style::al_top);
 
 	const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 		labels,
-		rpl::duplicate(availableBalanceValue) | rpl::map([](uint64 v) {
-			return Lang::FormatCountDecimal(v);
+		rpl::duplicate(
+			availableBalanceValue
+		) | rpl::map([](CreditsAmount v) {
+			return Lang::FormatCreditsAmountDecimal(v);
 		}),
 		st::channelEarnBalanceMajorLabel);
 	const auto icon = Ui::CreateSingleStarWidget(
@@ -1688,57 +3302,99 @@ void AddWithdrawalWidget(
 		majorLabel->height());
 	majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 	majorLabel->sizeValue(
-	) | rpl::start_with_next([=](const QSize &majorSize) {
+	) | rpl::on_next([=](const QSize &majorSize) {
 		const auto skip = st::channelEarnBalanceMinorLabelSkip;
 		labels->resize(
 			majorSize.width() + icon->width() + skip,
 			majorSize.height());
+		labels->setNaturalWidth(majorSize.width() + icon->width() + skip);
 		majorLabel->moveToLeft(icon->width() + skip, 0);
 	}, labels->lifetime());
 	Ui::ToggleChildrenVisibility(labels, true);
 
 	Ui::AddSkip(container);
 	container->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			container,
-			object_ptr<Ui::FlatLabel>(
-				container,
-				std::move(usdValue),
-				st::channelEarnOverviewSubMinorLabel)));
+			std::move(usdValue),
+			st::channelEarnOverviewSubMinorLabel),
+		style::al_top);
 
 	Ui::AddSkip(container);
 
+	const auto withdrawalWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto starsWithdrawMax = CreditsAmount(
+		controller->session().appConfig().starsWithdrawMax());
 	const auto input = Ui::AddInputFieldForCredits(
-		container,
-		rpl::duplicate(availableBalanceValue));
+		withdrawalWrap->entity(),
+		rpl::duplicate(
+			availableBalanceValue
+		) | rpl::map([=](CreditsAmount amount) {
+			return (amount > starsWithdrawMax) ? starsWithdrawMax : amount;
+		}));
 
-	Ui::AddSkip(container);
-	Ui::AddSkip(container);
+	Ui::AddSkip(withdrawalWrap->entity());
+	Ui::AddSkip(withdrawalWrap->entity());
 
 	const auto &stButton = st::defaultActiveButton;
-	const auto buttonsContainer = container->add(
-		Ui::CreateSkipWidget(container, stButton.height),
+	const auto buttonsContainer = withdrawalWrap->entity()->add(
+		Ui::CreateSkipWidget(withdrawalWrap->entity(), stButton.height),
 		st::boxRowPadding);
 
 	const auto button = Ui::CreateChild<Ui::RoundButton>(
 		buttonsContainer,
 		rpl::never<QString>(),
 		stButton);
+	button->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
 
 	const auto buttonCredits = Ui::CreateChild<Ui::RoundButton>(
 		buttonsContainer,
 		tr::lng_bot_earn_balance_button_buy_ads(),
 		stButton);
-	buttonCredits->setTextTransform(
-		Ui::RoundButton::TextTransform::NoTransform);
+	{
+		const auto icon = Ui::CreateChild<Ui::RpWidget>(buttonCredits);
+		const auto &st = st::msgBotKbUrlIcon;
+		icon->resize(st.width(), st.height());
+		icon->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(icon);
+			st.paint(p, { 0, 0 }, icon->width(), stButton.textFg->c);
+		}, icon->lifetime());
+		buttonCredits->sizeValue(
+		) | rpl::on_next([=, padding = st::msgBotKbIconPadding] {
+			icon->moveToRight(padding, padding);
+		}, icon->lifetime());
+		icon->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
 
 	Ui::ToggleChildrenVisibility(buttonsContainer, true);
 
+	const auto updateButtonState = [=](bool disabled) {
+		button->setBrushOverride(disabled
+			? std::optional(st::windowSubTextFg)
+			: std::nullopt);
+		button->setAttribute(Qt::WA_TransparentForMouseEvents, disabled);
+	};
+
+	struct UrlState {
+		QString url;
+		base::unique_qptr<Ui::PopupMenu> menu;
+	};
+	const auto urlState = buttonsContainer->lifetime().make_state<UrlState>();
+
 	rpl::combine(
 		std::move(secondButtonUrl),
 		buttonsContainer->sizeValue()
-	) | rpl::start_with_next([=](const QString &url, const QSize &size) {
-		if (url.isEmpty()) {
+	) | rpl::on_next([=](const QString &url, const QSize &size) {
+		const auto secondVisible = !url.isEmpty();
+		urlState->url = url;
+		withdrawalWrap->toggle(
+			withdrawalEnabled || secondVisible,
+			anim::type::instant);
+		updateButtonState(!withdrawalEnabled);
+		if (!secondVisible) {
 			button->resize(size.width(), size.height());
 			buttonCredits->resize(0, 0);
 		} else {
@@ -1749,13 +3405,45 @@ void AddWithdrawalWidget(
 			buttonCredits->setClickedCallback([=] {
 				UrlClickHandler::Open(url);
 			});
+			buttonCredits->events(
+			) | rpl::filter([](not_null<QEvent*> e) {
+				return e->type() == QEvent::ContextMenu;
+			}) | rpl::on_next([=](not_null<QEvent*> e) {
+				if (urlState->url.isEmpty()) {
+					return;
+				}
+				urlState->menu = base::make_unique_q<Ui::PopupMenu>(
+					buttonCredits,
+					st::popupMenuWithIcons);
+				urlState->menu->addAction(
+					tr::lng_context_copy_link(tr::now),
+					[=, show = controller->uiShow()] {
+						TextUtilities::SetClipboardText({ urlState->url });
+						show->showToast({
+							.text = {
+								tr::lng_channel_public_link_copied(tr::now),
+							},
+							.iconLottie = u"toast/voip_invite"_q,
+							.iconLottieSize = st::toastLottieIconSize,
+						});
+					},
+					&st::menuIconCopy);
+				urlState->menu->popup(QCursor::pos());
+				e->accept();
+			}, buttonCredits->lifetime());
 		}
 	}, buttonsContainer->lifetime());
 
+	auto lockedValue = rpl::duplicate(
+		dateValue
+	) | rpl::map([](const QDateTime &dt) { return !dt.isNull(); });
+
 	rpl::duplicate(
 		lockedValue
-	) | rpl::start_with_next([=](bool v) {
-		button->setAttribute(Qt::WA_TransparentForMouseEvents, v);
+	) | rpl::on_next([=](bool v) {
+		if (withdrawalEnabled) {
+			updateButtonState(v);
+		}
 	}, button->lifetime());
 
 	const auto session = &controller->session();
@@ -1765,21 +3453,12 @@ void AddWithdrawalWidget(
 		tr::lng_channel_earn_balance_button(tr::now),
 		st::channelEarnSemiboldLabel);
 	const auto processInputChange = [&] {
-		const auto buttonEmoji = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				st::settingsPremiumIconStar,
-				{ 0, -st::moderateBoxExpandInnerSkip, 0, 0 },
-				true));
-		const auto context = Core::MarkedTextContext{
-			.session = session,
-			.customEmojiRepaint = [=] { label->update(); },
-		};
-		using Balance = rpl::variable<uint64>;
+		using Balance = rpl::variable<CreditsAmount>;
 		const auto currentBalance = input->lifetime().make_state<Balance>(
 			rpl::duplicate(availableBalanceValue));
 		const auto process = [=] {
 			const auto amount = input->getLastText().toDouble();
-			if (amount >= currentBalance->current()) {
+			if (amount >= currentBalance->current().value()) {
 				label->setText(
 					tr::lng_bot_earn_balance_button_all(tr::now));
 			} else {
@@ -1789,9 +3468,8 @@ void AddWithdrawalWidget(
 						lt_count,
 						amount,
 						lt_emoji,
-						buttonEmoji,
-						Ui::Text::RichLangValue),
-					context);
+						Ui::Text::IconEmoji(&st::starIconEmojiLarge),
+						tr::rich));
 			}
 		};
 		QObject::connect(input, &Ui::MaskedInputField::changed, process);
@@ -1804,72 +3482,71 @@ void AddWithdrawalWidget(
 		rpl::duplicate(lockedValue),
 		button->sizeValue(),
 		label->sizeValue()
-	) | rpl::start_with_next([=](bool v, const QSize &b, const QSize &l) {
+	) | rpl::on_next([=](bool v, const QSize &b, const QSize &l) {
 		label->moveToLeft(
 			(b.width() - l.width()) / 2,
 			(v ? -10 : 1) * (b.height() - l.height()) / 2);
 	}, label->lifetime());
 
 	const auto lockedColor = anim::with_alpha(stButton.textFg->c, .5);
-	const auto lockedLabelTop = Ui::CreateChild<Ui::FlatLabel>(
-		button,
-		tr::lng_bot_earn_balance_button_locked(),
-		st::botEarnLockedButtonLabel);
-	lockedLabelTop->setTextColorOverride(lockedColor);
-	lockedLabelTop->setAttribute(Qt::WA_TransparentForMouseEvents);
-	const auto lockedLabelBottom = Ui::CreateChild<Ui::FlatLabel>(
-		button,
-		QString(),
-		st::botEarnLockedButtonLabel);
-	lockedLabelBottom->setTextColorOverride(lockedColor);
-	lockedLabelBottom->setAttribute(Qt::WA_TransparentForMouseEvents);
+	const auto lockedLabel = Ui::CreateChild<Ui::RpWidget>(button);
+	lockedLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+	struct LockedState final {
+		Ui::Text::String text;
+		bool locked = false;
+		bool dateIsNull = false;
+		rpl::lifetime dateUpdateLifetime;
+	};
+	const auto state = lockedLabel->lifetime().make_state<LockedState>();
 	rpl::combine(
 		rpl::duplicate(lockedValue),
-		button->sizeValue(),
-		lockedLabelTop->sizeValue(),
-		lockedLabelBottom->sizeValue()
-	) | rpl::start_with_next([=](
-			bool locked,
-			const QSize &b,
-			const QSize &top,
-			const QSize &bottom) {
-		const auto factor = locked ? 1 : -10;
-		const auto sumHeight = top.height() + bottom.height();
-		lockedLabelTop->moveToLeft(
-			(b.width() - top.width()) / 2,
-			factor * (b.height() - sumHeight) / 2);
-		lockedLabelBottom->moveToLeft(
-			(b.width() - bottom.width()) / 2,
-			factor * ((b.height() - sumHeight) / 2 + top.height()));
-	}, lockedLabelTop->lifetime());
-
-	const auto dateUpdateLifetime
-		= lockedLabelBottom->lifetime().make_state<rpl::lifetime>();
+		button->sizeValue()
+	) | rpl::on_next([=](bool locked, const QSize &s) {
+		state->locked = locked;
+		lockedLabel->resize(s);
+	}, lockedLabel->lifetime());
+	lockedLabel->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(lockedLabel);
+		p.setPen(state->locked ? QPen(lockedColor) : stButton.textFg->p);
+		if (state->dateIsNull && state->locked) {
+			p.setFont(st::channelEarnSemiboldLabel.style.font);
+			p.drawText(
+				lockedLabel->rect(),
+				style::al_center,
+				tr::lng_bot_earn_balance_button_locked(tr::now));
+			return;
+		}
+		state->text.draw(p, {
+			.position = QPoint(
+				0,
+				(lockedLabel->height() - state->text.minHeight()) / 2),
+			.outerWidth = lockedLabel->width(),
+			.availableWidth = lockedLabel->width(),
+			.align = style::al_center,
+		});
+	}, lockedLabel->lifetime());
+
 	std::move(
 		dateValue
-	) | rpl::start_with_next([=](const QDateTime &dt) {
-		dateUpdateLifetime->destroy();
+	) | rpl::on_next([=](const QDateTime &dt) {
+		state->dateUpdateLifetime.destroy();
+		state->dateIsNull = dt.isNull();
 		if (dt.isNull()) {
 			return;
 		}
 		constexpr auto kDateUpdateInterval = crl::time(250);
 		const auto was = base::unixtime::serialize(dt);
 
-		const auto context = Core::MarkedTextContext{
-			.session = session,
-			.customEmojiRepaint = [=] { lockedLabelBottom->update(); },
+		const auto context = Ui::Text::MarkedContext{
+			.repaint = [=] { lockedLabel->update(); },
 		};
-		const auto emoji = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				st::chatSimilarLockedIcon,
-				st::botEarnButtonLockMargins,
-				true));
+		const auto emoji = Ui::Text::IconEmoji(&st::botEarnButtonLock);
 
 		rpl::single(
 			rpl::empty
 		) | rpl::then(
 			base::timer_each(kDateUpdateInterval)
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto secondsDifference = std::max(
 				was - base::unixtime::now() - 1,
 				0);
@@ -1885,11 +3562,18 @@ void AddWithdrawalWidget(
 				: (u"%1:%2"_q)
 					.arg(minutes, 2, 10, kZero)
 					.arg(seconds, 2, 10, kZero);
-			lockedLabelBottom->setMarkedText(
-				base::duplicate(emoji).append(formatted),
+			state->text.setMarkedText(
+				st::botEarnLockedButtonLabel.style,
+				TextWithEntities()
+					.append(tr::lng_bot_earn_balance_button_locked(tr::now))
+					.append('\n')
+					.append(emoji)
+					.append(formatted),
+				kMarkupTextOptions,
 				context);
-		}, *dateUpdateLifetime);
-	}, lockedLabelBottom->lifetime());
+			lockedLabel->update();
+		}, state->dateUpdateLifetime);
+	}, lockedLabel->lifetime());
 
 	Api::HandleWithdrawalButton(
 		Api::RewardReceiver{
@@ -1901,13 +3585,13 @@ void AddWithdrawalWidget(
 					auto text = tr::lng_bot_earn_credits_out_minimal(
 						tr::now,
 						lt_link,
-						Ui::Text::Link(
+						tr::link(
 							tr::lng_bot_earn_credits_out_minimal_link(
 								tr::now,
 								lt_count,
 								min),
 							u"internal:"_q),
-						Ui::Text::RichLangValue);
+						tr::rich);
 					show->showToast(Ui::Toast::Config{
 						.text = std::move(text),
 						.filter = [=](const auto ...) {
@@ -1928,33 +3612,28 @@ void AddWithdrawalWidget(
 	Ui::AddSkip(container);
 	Ui::AddSkip(container);
 
-	const auto arrow = Ui::Text::SingleCustomEmoji(
-		session->data().customEmojiManager().registerInternalEmoji(
-			st::topicButtonArrow,
-			st::channelEarnLearnArrowMargins,
-			false));
-	auto about = Ui::CreateLabelWithCustomEmoji(
+	auto about = object_ptr<Ui::FlatLabel>(
 		container,
-		tr::lng_bot_earn_learn_credits_out_about(
-			lt_link,
-			tr::lng_channel_earn_about_link(
-				lt_emoji,
-				rpl::single(arrow),
-				Ui::Text::RichLangValue
-			) | rpl::map([](TextWithEntities text) {
-				return Ui::Text::Link(
-					std::move(text),
-					tr::lng_bot_earn_balance_about_url(tr::now));
-			}),
-			Ui::Text::RichLangValue),
-		{ .session = session },
+		(peer->isSelf()
+			? tr::lng_self_earn_learn_credits_out_about
+			: tr::lng_bot_earn_learn_credits_out_about)(
+				lt_link,
+				tr::lng_channel_earn_about_link(
+					lt_emoji,
+					rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+					tr::rich
+				) | rpl::map([](TextWithEntities text) {
+					return tr::link(
+						std::move(text),
+						tr::lng_bot_earn_balance_about_url(tr::now));
+				}),
+			tr::rich),
 		st::boxDividerLabel);
 	Ui::AddSkip(container);
 	container->add(object_ptr<Ui::DividerLabel>(
 		container,
 		std::move(about),
-		st::defaultBoxDividerLabelPadding,
-		RectPart::Top | RectPart::Bottom));
+		st::defaultBoxDividerLabelPadding));
 
 	Ui::AddSkip(container);
 }
@@ -1973,11 +3652,11 @@ void MaybeRequestBalanceIncrease(
 	const auto session = &show->session();
 	session->credits().load();
 	session->credits().loadedValue(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		state->lifetime.destroy();
 
 		const auto balance = session->credits().balance();
-		if (credits <= balance) {
+		if (CreditsAmount(credits) <= balance) {
 			if (const auto onstack = done) {
 				onstack(SmallBalanceResult::Already);
 			}
@@ -1994,7 +3673,7 @@ void MaybeRequestBalanceIncrease(
 				credits,
 				source,
 				success));
-			box->boxClosing() | rpl::start_with_next([=] {
+			box->boxClosing() | rpl::on_next([=] {
 				crl::on_main([=] {
 					if (!state->success) {
 						if (const auto onstack = done) {
@@ -2013,4 +3692,69 @@ void MaybeRequestBalanceIncrease(
 	}, state->lifetime);
 }
 
+void AddUniqueCloseMoreButton(
+		not_null<Ui::GenericBox*> box,
+		Settings::CreditsEntryBoxStyleOverrides st,
+		Fn<void(not_null<Ui::PopupMenu*>)> fillMenu,
+		Fn<void()> launchCraft) {
+	const auto close = Ui::CreateChild<Ui::IconButton>(
+		box,
+		st::uniqueCloseButton);
+	const auto menu = fillMenu
+		? Ui::CreateChild<Ui::IconButton>(box, st::uniqueMenuButton)
+		: nullptr;
+	const auto craft = launchCraft
+		? Ui::CreateChild<Ui::IconButton>(box, st::uniqueCraftButton)
+		: nullptr;
+	close->show();
+	close->raise();
+	if (menu) {
+		menu->show();
+		menu->raise();
+	}
+	if (craft) {
+		craft->show();
+		craft->raise();
+	}
+	box->widthValue() | rpl::on_next([=](int width) {
+		auto right = 0;
+		close->moveToRight(right, 0, width);
+		close->raise();
+		right += close->width();
+		if (menu) {
+			menu->moveToRight(right, 0, width);
+			menu->raise();
+			right += menu->width();
+		}
+		if (craft) {
+			craft->moveToRight(right, 0, width);
+			craft->raise();
+		}
+	}, close->lifetime());
+	close->setClickedCallback([=] {
+		box->closeBox();
+	});
+	if (menu) {
+		const auto state = menu->lifetime().make_state<
+			base::unique_qptr<Ui::PopupMenu>
+		>();
+		menu->setClickedCallback([=] {
+			if (*state) {
+				*state = nullptr;
+				return;
+			}
+			*state = base::make_unique_q<Ui::PopupMenu>(
+				menu,
+				st.menu ? *st.menu : st::popupMenuWithIcons);
+			fillMenu(state->get());
+			if (!(*state)->empty()) {
+				(*state)->popup(QCursor::pos());
+			}
+		});
+	}
+	if (craft) {
+		craft->setClickedCallback(std::move(launchCraft));
+	}
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h
index bfc266e3ebe432..f517eb4c853586 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.h
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h
@@ -11,18 +11,29 @@ template <typename Object>
 class object_ptr;
 
 class PeerData;
+struct ShareBoxStyleOverrides;
 
-namespace Api {
-struct UserStarGift;
-} // namespace Api
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
 
 namespace Data {
 struct Boost;
 struct CreditsHistoryEntry;
 struct SubscriptionEntry;
 struct GiftCode;
+struct CreditTopupOption;
+struct SavedStarGift;
+class SavedStarGiftId;
+struct StarGift;
+struct UniqueGift;
+struct GiftUpgradeSpinner;
 } // namespace Data
 
+namespace HistoryView {
+struct ScheduleBoxStyleArgs;
+} // namespace HistoryView
+
 namespace Main {
 class Session;
 class SessionShow;
@@ -33,6 +44,11 @@ class SessionController;
 } // namespace Window
 
 namespace style {
+struct Box;
+struct Table;
+struct FlatLabel;
+struct PopupMenu;
+struct IconButton;
 struct PeerListItem;
 } // namespace style
 
@@ -40,6 +56,7 @@ namespace Ui {
 class GenericBox;
 class RpWidget;
 class VerticalLayout;
+class PopupMenu;
 } // namespace Ui
 
 namespace Settings {
@@ -49,32 +66,109 @@ struct SubscriptionRightLabel {
 	QSize size;
 };
 SubscriptionRightLabel PaintSubscriptionRightLabelCallback(
-	not_null<Main::Session*> session,
+	not_null<::Main::Session*> session,
 	const style::PeerListItem &st,
 	int amount);
 
 void FillCreditOptions(
-	std::shared_ptr<Main::SessionShow> show,
+	std::shared_ptr<::Main::SessionShow> show,
 	not_null<Ui::VerticalLayout*> container,
 	not_null<PeerData*> peer,
-	int minCredits,
-	Fn<void()> paid);
+	CreditsAmount minCredits,
+	Fn<void()> paid,
+	rpl::producer<> showFinishes,
+	rpl::producer<QString> subtitle,
+	std::vector<Data::CreditTopupOption> preloadedTopupOptions,
+	bool dark = false,
+	PeerId spendPurposePeerId = PeerId(0));
 
 [[nodiscard]] not_null<Ui::RpWidget*> AddBalanceWidget(
 	not_null<Ui::RpWidget*> parent,
-	rpl::producer<uint64> balanceValue,
-	bool rightAlign);
+	not_null<::Main::Session*> session,
+	rpl::producer<CreditsAmount> balanceValue,
+	bool rightAlign,
+	rpl::producer<float64> opacityValue = nullptr,
+	bool dark = false);
 
 void AddWithdrawalWidget(
 	not_null<Ui::VerticalLayout*> container,
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer,
 	rpl::producer<QString> secondButtonUrl,
-	rpl::producer<uint64> availableBalanceValue,
+	rpl::producer<CreditsAmount> availableBalanceValue,
 	rpl::producer<QDateTime> dateValue,
-	rpl::producer<bool> lockedValue,
+	bool withdrawalEnabled,
 	rpl::producer<QString> usdValue);
 
+struct GiftWearBoxStyleOverride {
+	const style::Box *box = nullptr;
+	const style::IconButton *close = nullptr;
+	const style::FlatLabel *title = nullptr;
+	const style::FlatLabel *subtitle = nullptr;
+	const style::icon *radiantIcon = nullptr;
+	const style::icon *profileIcon = nullptr;
+	const style::icon *proofIcon = nullptr;
+	const style::FlatLabel *infoTitle = nullptr;
+	const style::FlatLabel *infoAbout = nullptr;
+};
+[[nodiscard]] GiftWearBoxStyleOverride DarkGiftWearBoxStyle();
+
+struct CreditsEntryBoxStyleOverrides {
+	const style::Box *box = nullptr;
+	const style::PopupMenu *menu = nullptr;
+	const style::Table *table = nullptr;
+	const style::FlatLabel *tableValueMultiline = nullptr;
+	const style::FlatLabel *tableValueMessage = nullptr;
+	const style::icon *link = nullptr;
+	const style::icon *share = nullptr;
+	const style::icon *theme = nullptr;
+	const style::icon *transfer = nullptr;
+	const style::icon *craft = nullptr;
+	const style::icon *wear = nullptr;
+	const style::icon *takeoff = nullptr;
+	const style::icon *resell = nullptr;
+	const style::icon *unlist = nullptr;
+	const style::icon *show = nullptr;
+	const style::icon *hide = nullptr;
+	const style::icon *pin = nullptr;
+	const style::icon *unpin = nullptr;
+	const style::icon *offer = nullptr;
+	std::shared_ptr<ShareBoxStyleOverrides> shareBox;
+	std::shared_ptr<GiftWearBoxStyleOverride> giftWearBox;
+};
+[[nodiscard]] CreditsEntryBoxStyleOverrides DarkCreditsEntryBoxStyle();
+
+[[nodiscard]] rpl::producer<CreditsAmount> UniqueGiftResalePrice(
+	std::shared_ptr<Data::UniqueGift> unique,
+	bool forceTon = false);
+[[nodiscard]] bool UniqueGiftCanRemoveDetails(
+	const Data::CreditsHistoryEntry &entry);
+[[nodiscard]] Fn<void(Fn<void()> removed)> UniqueGiftRemoveDetailsHandler(
+	std::shared_ptr<ChatHelpers::Show> show,
+	const Data::CreditsHistoryEntry &entry);
+
+void GenericCreditsEntryBox(
+	not_null<Ui::GenericBox*> box,
+	std::shared_ptr<ChatHelpers::Show> show,
+	const Data::CreditsHistoryEntry &e,
+	const Data::SubscriptionEntry &s,
+	CreditsEntryBoxStyleOverrides st = {});
+void GenericCreditsEntryBody(
+	not_null<Ui::GenericBox*> box,
+	std::shared_ptr<ChatHelpers::Show> show,
+	const Data::CreditsHistoryEntry &e);
+void GenericCreditsEntryBody(
+	not_null<Ui::GenericBox*> box,
+	std::shared_ptr<ChatHelpers::Show> show,
+	const Data::CreditsHistoryEntry &e,
+	const Data::SubscriptionEntry &s,
+	std::shared_ptr<Data::GiftUpgradeSpinner> upgradeSpinner,
+	CreditsEntryBoxStyleOverrides st = {});
+void UniqueGiftValueBox(
+	not_null<Ui::GenericBox*> box,
+	std::shared_ptr<ChatHelpers::Show> show,
+	const Data::CreditsHistoryEntry &e,
+	CreditsEntryBoxStyleOverrides st = {});
 void ReceiptCreditsBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Window::SessionController*> controller,
@@ -96,15 +190,44 @@ void CreditsPrizeBox(
 	not_null<Window::SessionController*> controller,
 	const Data::GiftCode &data,
 	TimeId date);
-void UserStarGiftBox(
+
+struct StarGiftResaleInfo {
+	PeerId recipientId;
+	bool forceTon = false;
+};
+void GlobalStarGiftBox(
 	not_null<Ui::GenericBox*> box,
+	std::shared_ptr<ChatHelpers::Show> show,
+	const Data::StarGift &data,
+	StarGiftResaleInfo resale,
+	CreditsEntryBoxStyleOverrides st = {});
+
+[[nodiscard]] Data::CreditsHistoryEntry SavedStarGiftEntry(
+	not_null<PeerData*> owner,
+	const Data::SavedStarGift &data);
+[[nodiscard]] Data::SavedStarGiftId EntryToSavedStarGiftId(
+	not_null<::Main::Session*> session,
+	const Data::CreditsHistoryEntry &entry);
+void ShowSavedStarGiftBox(
 	not_null<Window::SessionController*> controller,
-	const Api::UserStarGift &data);
-void StarGiftViewBox(
-	not_null<Ui::GenericBox*> box,
+	not_null<PeerData*> owner,
+	const Data::SavedStarGift &data,
+	Fn<std::vector<Data::CreditsHistoryEntry>()> pinned = nullptr);
+enum class SavedStarGiftMenuType {
+	List,
+	View,
+};
+void FillSavedStarGiftMenu(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<Ui::PopupMenu*> menu,
+	const Data::CreditsHistoryEntry &e,
+	SavedStarGiftMenuType type,
+	CreditsEntryBoxStyleOverrides st = {});
+
+void ShowStarGiftViewBox(
 	not_null<Window::SessionController*> controller,
 	const Data::GiftCode &data,
-	not_null<HistoryItem*> item);
+	FullMsgId itemId);
 void ShowRefundInfoBox(
 	not_null<Window::SessionController*> controller,
 	FullMsgId refundItemId);
@@ -126,12 +249,20 @@ void ShowRefundInfoBox(
 	int totalCount,
 	int photoSize);
 
+[[nodiscard]] object_ptr<Ui::RpWidget> SubscriptionUserpic(
+	not_null<Ui::RpWidget*> parent,
+	not_null<PeerData*> peer,
+	int photoSize);
+
 struct SmallBalanceBot {
 	UserId botId = 0;
 };
 struct SmallBalanceReaction {
 	ChannelId channelId = 0;
 };
+struct SmallBalanceVideoStream {
+	PeerId streamerId = 0;
+};
 struct SmallBalanceSubscription {
 	QString name;
 };
@@ -139,21 +270,36 @@ struct SmallBalanceDeepLink {
 	QString purpose;
 };
 struct SmallBalanceStarGift {
-	UserId userId = 0;
+	PeerId recipientId;
+};
+struct SmallBalanceForMessage {
+	PeerId recipientId;
+};
+struct SmallBalanceForSuggest {
+	PeerId recipientId;
+};
+struct SmallBalanceForOffer {
+};
+struct SmallBalanceForSearch {
 };
 struct SmallBalanceSource : std::variant<
 	SmallBalanceBot,
 	SmallBalanceReaction,
+	SmallBalanceVideoStream,
 	SmallBalanceSubscription,
 	SmallBalanceDeepLink,
-	SmallBalanceStarGift> {
+	SmallBalanceStarGift,
+	SmallBalanceForMessage,
+	SmallBalanceForSuggest,
+	SmallBalanceForOffer,
+	SmallBalanceForSearch> {
 	using variant::variant;
 };
 
 void SmallBalanceBox(
 	not_null<Ui::GenericBox*> box,
-	std::shared_ptr<Main::SessionShow> show,
-	uint64 credits,
+	std::shared_ptr<::Main::SessionShow> show,
+	uint64 wholeCredits,
 	SmallBalanceSource source,
 	Fn<void()> paid);
 
@@ -165,10 +311,22 @@ enum class SmallBalanceResult {
 };
 
 void MaybeRequestBalanceIncrease(
-	std::shared_ptr<Main::SessionShow> show,
+	std::shared_ptr<::Main::SessionShow> show,
 	uint64 credits,
 	SmallBalanceSource source,
 	Fn<void(SmallBalanceResult)> done);
 
-} // namespace Settings
+void AddMiniStars(
+	not_null<Ui::VerticalLayout*> content,
+	not_null<Ui::RpWidget*> widget,
+	int photoSize,
+	int boxWidth,
+	float64 heightRatio);
+
+void AddUniqueCloseMoreButton(
+	not_null<Ui::GenericBox*> box,
+	Settings::CreditsEntryBoxStyleOverrides st,
+	Fn<void(not_null<Ui::PopupMenu*>)> fillMenu = nullptr,
+	Fn<void()> launchCraft = nullptr);
 
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_experimental.cpp b/Telegram/SourceFiles/settings/settings_experimental.cpp
index 983497e8a14de0..13ecca0b426cae 100644
--- a/Telegram/SourceFiles/settings/settings_experimental.cpp
+++ b/Telegram/SourceFiles/settings/settings_experimental.cpp
@@ -7,59 +7,168 @@ For license and copyright information please follow this link:
 */
 #include "settings/settings_experimental.h"
 
+#include "data/components/passkeys.h"
+#include "main/main_session.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/search_field_controller.h"
+#include "ui/text/text_entity.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/vertical_list.h"
 #include "ui/gl/gl_detection.h"
 #include "ui/chat/chat_style_radius.h"
+#include "ui/controls/compose_ai_button_factory.h"
 #include "base/options.h"
+#include "boxes/moderate_messages_box.h"
 #include "core/application.h"
 #include "core/launcher.h"
+#include "core/sandbox.h"
 #include "chat_helpers/tabbed_panel.h"
+#include "dialogs/dialogs_entry.h"
 #include "dialogs/dialogs_widget.h"
+#include "dialogs/ui/dialogs_layout.h"
+#include "ffmpeg/ffmpeg_utility.h"
+#include "history/history_item_components.h"
+#include "history/view/controls/compose_controls_common.h"
+#include "history/view/history_view_message.h"
 #include "info/profile/info_profile_actions.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
+#include "mainwidget.h"
 #include "media/player/media_player_instance.h"
+#include "mtproto/session_private.h"
 #include "webview/webview_embed.h"
 #include "window/main_window.h"
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
 #include "window/window_controller.h"
 #include "window/notifications_manager.h"
-#include "storage/localimageloader.h"
-#include "data/data_document_resolver.h"
+#include "info/info_flexible_scroll.h"
+#include "chat_helpers/stickers_list_widget.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_info.h"
 #include "styles/style_settings.h"
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+
+#include <QtCore/QJsonDocument>
+#include <QtGui/QGuiApplication>
 
 namespace Settings {
 namespace {
 
+const auto kOptionsClipboardPrefix = u"tdesktop-flags:"_q;
+
+struct DecodeOptionsResult {
+	bool ok = false;
+	QString json;
+};
+
+[[nodiscard]] QString EncodeOptionsToText(const QString &json) {
+	const auto flags = QByteArray::Base64UrlEncoding
+		| QByteArray::OmitTrailingEquals;
+	return kOptionsClipboardPrefix
+		+ qs(qCompress(json.toLatin1(), 9).toBase64(flags));
+}
+
+[[nodiscard]] DecodeOptionsResult DecodeOptionsFromText(const QString &text) {
+	auto result = DecodeOptionsResult();
+	if (!text.startsWith(kOptionsClipboardPrefix)) {
+		return result;
+	}
+	auto encoded = QStringView(text).mid(
+		kOptionsClipboardPrefix.size()).toLatin1();
+	const auto compressed = QByteArray::fromBase64Encoding(
+		std::move(encoded),
+		QByteArray::Base64UrlEncoding
+			| QByteArray::AbortOnBase64DecodingErrors);
+	if (!compressed || (*compressed).isEmpty()) {
+		return result;
+	}
+	const auto decoded = qUncompress(*compressed);
+	if (decoded.isEmpty()) {
+		return result;
+	}
+
+	auto error = QJsonParseError();
+	const auto parsed = QJsonDocument::fromJson(decoded, &error);
+	if ((error.error != QJsonParseError::NoError) || !parsed.isObject()) {
+		return result;
+	}
+	result.ok = true;
+	result.json = QString::fromUtf8(decoded);
+	return result;
+}
+
 void AddOption(
 		not_null<Window::Controller*> window,
 		not_null<Ui::VerticalLayout*> container,
 		base::options::option<bool> &option,
-		rpl::producer<> resetClicks) {
-	auto &lifetime = container->lifetime();
+		rpl::producer<> resetClicks,
+		rpl::producer<> reloadOptionsRequests,
+		rpl::producer<QString> query,
+		Fn<void(const QString&, not_null<QWidget*>)> registerHighlight) {
 	const auto name = option.name().isEmpty() ? option.id() : option.name();
+	const auto &description = option.description();
+
+	const auto wrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto inner = wrap->entity();
+
+	auto &lifetime = inner->lifetime();
 	const auto toggles = lifetime.make_state<rpl::event_stream<bool>>();
 	std::move(
 		resetClicks
 	) | rpl::map_to(
 		option.defaultValue()
 	) | rpl::start_to_stream(*toggles, lifetime);
+	std::move(reloadOptionsRequests) | rpl::on_next([=, &option] {
+		toggles->fire_copy(option.value());
+	}, lifetime);
 
-	const auto button = container->add(object_ptr<Button>(
-		container,
+	const auto button = inner->add(object_ptr<Button>(
+		inner,
 		rpl::single(name),
 		(option.relevant()
 			? st::settingsButtonNoIcon
 			: st::settingsOptionDisabled)
 	))->toggleOn(toggles->events_starting_with(option.value()));
 
+	if (registerHighlight) {
+		registerHighlight(u"experimental/"_q + option.id(), button);
+	}
+
+	const auto link = u"tg://settings/experimental/"_q + option.id();
+	const auto menu
+		= button->lifetime().make_state<base::unique_qptr<Ui::PopupMenu>>();
+	button->events(
+	) | rpl::filter([](not_null<QEvent*> e) {
+		return e->type() == QEvent::ContextMenu;
+	}) | rpl::on_next([=](not_null<QEvent*> e) {
+		*menu = base::make_unique_q<Ui::PopupMenu>(
+			button,
+			st::popupMenuWithIcons);
+		(*menu)->addAction(u"Copy deep link"_q, [=] {
+			TextUtilities::SetClipboardText({ link });
+			window->showToast({
+				.text = { u"Deep link copied to clipboard."_q },
+				.iconLottie = u"toast/voip_invite"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		}, &st::menuIconCopy);
+		(*menu)->popup(QCursor::pos());
+		e->accept();
+	}, button->lifetime());
+
 	const auto restarter = (option.relevant() && option.restartRequired())
 		? button->lifetime().make_state<base::Timer>()
 		: nullptr;
@@ -74,7 +183,7 @@ void AddOption(
 		});
 	}
 	button->toggledChanges(
-	) | rpl::start_with_next([=, &option](bool toggled) {
+	) | rpl::on_next([=, &option](bool toggled) {
 		if (!option.relevant() && toggled != option.defaultValue()) {
 			toggles->fire_copy(option.defaultValue());
 			window->showToast(
@@ -85,34 +194,52 @@ void AddOption(
 		if (restarter) {
 			restarter->callOnce(st::settingsButtonNoIcon.toggle.duration);
 		}
-	}, container->lifetime());
+	}, inner->lifetime());
 
-	const auto &description = option.description();
 	if (!description.isEmpty()) {
-		Ui::AddSkip(container, st::settingsCheckboxesSkip);
-		Ui::AddDividerText(container, rpl::single(description));
-		Ui::AddSkip(container, st::settingsCheckboxesSkip);
+		Ui::AddSkip(inner, st::settingsCheckboxesSkip);
+		Ui::AddDividerText(inner, rpl::single(description));
+		Ui::AddSkip(inner, st::settingsCheckboxesSkip);
 	}
+
+	std::move(
+		query
+	) | rpl::on_next([=](const QString &text) {
+		const auto trimmed = text.trimmed();
+		const auto matches = trimmed.isEmpty()
+			|| name.contains(trimmed, Qt::CaseInsensitive)
+			|| description.contains(trimmed, Qt::CaseInsensitive);
+		wrap->toggle(matches, anim::type::instant);
+	}, wrap->lifetime());
 }
 
 void SetupExperimental(
 		not_null<Window::Controller*> window,
-		not_null<Ui::VerticalLayout*> container) {
-	Ui::AddSkip(container, st::settingsCheckboxesSkip);
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<> reloadOptionsRequests,
+		rpl::producer<QString> query,
+		Fn<void(const QString&, not_null<QWidget*>)> registerHighlight) {
+	const auto headerWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto header = headerWrap->entity();
+
+	Ui::AddSkip(header, st::settingsCheckboxesSkip);
 
-	container->add(
+	header->add(
 		object_ptr<Ui::FlatLabel>(
-			container,
+			header,
 			tr::lng_settings_experimental_about(),
 			st::boxLabel),
 		st::defaultBoxDividerLabelPadding);
 
 	auto reset = (Button*)nullptr;
 	if (base::options::changed()) {
-		const auto wrap = container->add(
+		const auto wrap = header->add(
 			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-				container,
-				object_ptr<Ui::VerticalLayout>(container)));
+				header,
+				object_ptr<Ui::VerticalLayout>(header)));
 		const auto inner = wrap->entity();
 		Ui::AddDivider(inner);
 		Ui::AddSkip(inner, st::settingsCheckboxesSkip);
@@ -127,8 +254,14 @@ void SetupExperimental(
 		Ui::AddSkip(inner, st::settingsCheckboxesSkip);
 	}
 
-	Ui::AddDivider(container);
-	Ui::AddSkip(container, st::settingsCheckboxesSkip);
+	Ui::AddDivider(header);
+	Ui::AddSkip(header, st::settingsCheckboxesSkip);
+
+	rpl::duplicate(
+		query
+	) | rpl::on_next([=](const QString &text) {
+		headerWrap->toggle(text.trimmed().isEmpty(), anim::type::instant);
+	}, headerWrap->lifetime());
 
 	const auto addToggle = [&](const char name[]) {
 		AddOption(
@@ -137,26 +270,49 @@ void SetupExperimental(
 			base::options::lookup<bool>(name),
 			(reset
 				? (reset->clicks() | rpl::to_empty)
-				: rpl::producer<>()));
+				: rpl::producer<>()),
+			rpl::duplicate(reloadOptionsRequests),
+			rpl::duplicate(query),
+			registerHighlight);
 	};
 
 	addToggle(ChatHelpers::kOptionTabbedPanelShowOnClick);
 	addToggle(Dialogs::kOptionForumHideChatsList);
+	addToggle(Dialogs::kOptionDialogsUnreadOnTop);
+	addToggle(Dialogs::Ui::kOptionDialogsMuteIcon);
 	addToggle(Core::kOptionFractionalScalingEnabled);
+	addToggle(Core::kOptionHighDpiDownscale);
+	addToggle(Ui::GL::kOptionUseQtRhi);
 	addToggle(Window::kOptionViewProfileInChatsListContextMenu);
 	addToggle(Info::Profile::kOptionShowPeerIdBelowAbout);
+	addToggle(Info::Profile::kOptionShowChannelJoinedBelowAbout);
 	addToggle(Ui::kOptionUseSmallMsgBubbleRadius);
 	addToggle(Media::Player::kOptionDisableAutoplayNext);
-	addToggle(kOptionSendLargePhotos);
 	addToggle(Webview::kOptionWebviewDebugEnabled);
 	addToggle(Webview::kOptionWebviewLegacyEdge);
 	addToggle(kOptionAutoScrollInactiveChat);
+	addToggle(Window::Notifications::kOptionHideReplyButton);
+	addToggle(Window::Notifications::kOptionCustomNotification);
 	addToggle(Window::Notifications::kOptionGNotification);
 	addToggle(Core::kOptionFreeType);
 	addToggle(Core::kOptionSkipUrlSchemeRegister);
-	addToggle(Data::kOptionExternalVideoPlayer);
+	addToggle(Core::kOptionDeadlockDetector);
+	addToggle(Window::kOptionExternalMediaViewer);
 	addToggle(Window::kOptionNewWindowsSizeAsFirst);
+	addToggle(MTP::details::kOptionPreferIPv6);
+	if (base::options::lookup<bool>(kOptionFastButtonsMode).value()) {
+		addToggle(kOptionFastButtonsMode);
+	}
 	addToggle(Window::kOptionDisableTouchbar);
+	addToggle(Info::kClassicProfileScroll);
+	addToggle(kModerateCommonGroups);
+	addToggle(kForceComposeSearchOneColumn);
+	addToggle(ChatHelpers::kOptionUnlimitedRecentStickers);
+	addToggle(Ui::kOptionHideAiButton);
+	addToggle(HistoryView::kOptionUnlimitedMessageWidth);
+	addToggle(HistoryView::Controls::kOptionMacCmdReplyImmediately);
+	addToggle(Ui::kOptionQScroller);
+	addToggle(FFmpeg::kOptionFFmpegMultiThread);
 }
 
 } // namespace
@@ -164,19 +320,113 @@ void SetupExperimental(
 Experimental::Experimental(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
-: Section(parent) {
-	setupContent(controller);
+: Section(parent, controller) {
+	setupContent();
 }
 
+Experimental::~Experimental() = default;
+
 rpl::producer<QString> Experimental::title() {
 	return tr::lng_settings_experimental();
 }
 
-void Experimental::setupContent(
-		not_null<Window::SessionController*> controller) {
+void Experimental::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
+	const auto window = &controller()->window();
+	addAction(
+		u"Export"_q,
+		[=] {
+			TextUtilities::SetClipboardText(
+				{ EncodeOptionsToText(base::options::serialize()) });
+			window->showToast({
+				.text = { u"Experimental settings code copied to clipboard."_q },
+				.iconLottie = u"toast/copy"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
+		},
+		&st::menuIconCopy);
+	if (!DecodeOptionsFromText(QGuiApplication::clipboard()->text()).ok) {
+		return;
+	}
+	addAction(
+		u"Import"_q,
+		[=] {
+			const auto decoded = DecodeOptionsFromText(
+				QGuiApplication::clipboard()->text());
+			if (!decoded.ok) {
+				window->showToast(u"Clipboard does not contain "
+					"a valid experimental settings code."_q);
+				return;
+			}
+			if (!base::options::deserialize(decoded.json)) {
+				window->showToast(u"Experimental settings code is valid"
+					", but data format is not supported."_q);
+				return;
+			}
+			_reloadOptionsRequests.fire({});
+			window->showToast(u"Experimental settings imported "
+				"from code in clipboard."_q);
+		},
+		&st::menuIconImportTheme);
+}
+
+void Experimental::setInnerFocus() {
+	if (_searchField) {
+		_searchField->setFocus();
+	} else {
+		setFocus();
+	}
+}
+
+void Experimental::showFinished() {
+	AbstractSection::showFinished();
+	for (const auto &[id, widget] : _highlights) {
+		if (widget) {
+			controller()->checkHighlightControl(id, widget);
+		}
+	}
+}
+
+base::weak_qptr<Ui::RpWidget> Experimental::createPinnedToTop(
+		not_null<QWidget*> parent) {
+	_searchController = std::make_unique<Ui::SearchFieldController>(
+		_query.current());
+	auto rowView = _searchController->createRowView(
+		parent,
+		st::infoLayerMediaSearch);
+	_searchField = rowView.field;
+
+	const auto searchContainer = Ui::CreateChild<Ui::FixedHeightWidget>(
+		parent.get(),
+		st::infoLayerMediaSearch.height);
+	const auto wrap = rowView.wrap.release();
+	wrap->setParent(searchContainer);
+	wrap->show();
+
+	searchContainer->widthValue(
+	) | rpl::on_next([=](int width) {
+		wrap->resizeToWidth(width);
+		wrap->moveToLeft(0, 0);
+	}, searchContainer->lifetime());
+
+	_searchController->queryValue(
+	) | rpl::on_next([=](QString text) {
+		_query = std::move(text);
+	}, searchContainer->lifetime());
+
+	return base::make_weak(not_null<Ui::RpWidget*>{ searchContainer });
+}
+
+void Experimental::setupContent() {
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
 
-	SetupExperimental(&controller->window(), content);
+	SetupExperimental(
+		&controller()->window(),
+		content,
+		_reloadOptionsRequests.events(),
+		_query.value(),
+		[this](const QString &id, not_null<QWidget*> widget) {
+			_highlights.push_back({ id, widget.get() });
+		});
 
 	Ui::ResizeFitChild(this, content);
 }
diff --git a/Telegram/SourceFiles/settings/settings_experimental.h b/Telegram/SourceFiles/settings/settings_experimental.h
index bb43a42e5dd16d..c1b4c4bb96ec37 100644
--- a/Telegram/SourceFiles/settings/settings_experimental.h
+++ b/Telegram/SourceFiles/settings/settings_experimental.h
@@ -9,6 +9,11 @@ For license and copyright information please follow this link:
 
 #include "settings/settings_common_session.h"
 
+namespace Ui {
+class InputField;
+class SearchFieldController;
+} // namespace Ui
+
 namespace Settings {
 
 class Experimental : public Section<Experimental> {
@@ -16,11 +21,23 @@ class Experimental : public Section<Experimental> {
 	Experimental(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller);
+	~Experimental();
 
 	[[nodiscard]] rpl::producer<QString> title() override;
+	void fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) override;
+	void setInnerFocus() override;
+	void showFinished() override;
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToTop(
+		not_null<QWidget*> parent) override;
 
 private:
-	void setupContent(not_null<Window::SessionController*> controller);
+	void setupContent();
+
+	rpl::event_stream<> _reloadOptionsRequests;
+	rpl::variable<QString> _query;
+	std::unique_ptr<Ui::SearchFieldController> _searchController;
+	QPointer<Ui::InputField> _searchField;
+	std::vector<std::pair<QString, QPointer<QWidget>>> _highlights;
 
 };
 
diff --git a/Telegram/SourceFiles/settings/settings_faq_suggestions.cpp b/Telegram/SourceFiles/settings/settings_faq_suggestions.cpp
new file mode 100644
index 00000000000000..d7a9b3ce48fb04
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_faq_suggestions.cpp
@@ -0,0 +1,161 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/settings_faq_suggestions.h"
+
+#include "apiwrap.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+
+namespace Settings {
+namespace {
+
+[[nodiscard]] QString ExtractPlainText(const MTPRichText &text) {
+	return text.match([&](const MTPDtextPlain &data) {
+		return qs(data.vtext());
+	}, [&](const MTPDtextConcat &data) {
+		auto result = QString();
+		for (const auto &part : data.vtexts().v) {
+			result += ExtractPlainText(part);
+		}
+		return result;
+	}, [&](const MTPDtextBold &data) {
+		return ExtractPlainText(data.vtext());
+	}, [&](const MTPDtextItalic &data) {
+		return ExtractPlainText(data.vtext());
+	}, [&](const MTPDtextUrl &data) {
+		return ExtractPlainText(data.vtext());
+	}, [&](const auto &) {
+		return QString();
+	});
+}
+
+struct TocTextUrl {
+	QString title;
+	QString url;
+};
+
+[[nodiscard]] std::optional<TocTextUrl> ExtractTextUrl(
+		const MTPRichText &text,
+		const QString &baseUrl) {
+	return text.match([&](const MTPDtextUrl &data) -> std::optional<TocTextUrl> {
+		const auto url = qs(data.vurl());
+		if (!url.startsWith(baseUrl + '#')) {
+			return std::nullopt;
+		}
+		return TocTextUrl{
+			.title = ExtractPlainText(data.vtext()),
+			.url = url,
+		};
+	}, [&](const auto &) -> std::optional<TocTextUrl> {
+		return std::nullopt;
+	});
+}
+
+[[nodiscard]] std::optional<QString> ExtractBoldSection(
+		const MTPRichText &text) {
+	return text.match([&](const MTPDtextBold &data) -> std::optional<QString> {
+		return ExtractPlainText(data.vtext());
+	}, [&](const auto &) -> std::optional<QString> {
+		return std::nullopt;
+	});
+}
+
+} // namespace
+
+FaqSuggestions::FaqSuggestions(not_null<Main::Session*> session)
+: _session(session) {
+}
+
+FaqSuggestions::~FaqSuggestions() {
+	if (_requestId) {
+		_session->api().request(_requestId).cancel();
+	}
+}
+
+void FaqSuggestions::request() {
+	if (_loaded.current() || _requestId) {
+		return;
+	}
+	auto link = tr::lng_settings_faq_link(tr::now);
+	const auto hash = link.indexOf('#');
+	const auto url = (hash > 0) ? link.mid(0, hash) : link;
+
+	_requestId = _session->api().request(MTPmessages_GetWebPage(
+		MTP_string(url),
+		MTP_int(0)
+	)).done([=](const MTPmessages_WebPage &result) {
+		_requestId = 0;
+		result.data().vwebpage().match([&](const MTPDwebPage &data) {
+			parse(data);
+		}, [&](const auto &) {});
+		_loaded = true;
+	}).fail([=] {
+		_requestId = 0;
+		_loaded = true;
+	}).send();
+}
+
+bool FaqSuggestions::loaded() const {
+	return _loaded.current();
+}
+
+rpl::producer<bool> FaqSuggestions::loadedValue() const {
+	return _loaded.value();
+}
+
+const std::vector<FaqEntry> &FaqSuggestions::entries() const {
+	return _entries;
+}
+
+void FaqSuggestions::parse(const MTPDwebPage &page) {
+	const auto cachedPage = page.vcached_page();
+	if (!cachedPage) {
+		return;
+	}
+	const auto baseUrl = qs(page.vurl());
+	const auto &data = cachedPage->data();
+
+	auto currentSection = QString();
+	auto inToc = false;
+
+	for (const auto &block : data.vblocks().v) {
+		block.match([&](const MTPDpageBlockParagraph &data) {
+			if (const auto section = ExtractBoldSection(data.vtext())) {
+				currentSection = *section;
+				inToc = true;
+			} else {
+				inToc = false;
+			}
+		}, [&](const MTPDpageBlockList &data) {
+			if (!inToc || currentSection.isEmpty()) {
+				return;
+			}
+			for (const auto &item : data.vitems().v) {
+				item.match([&](const MTPDpageListItemText &data) {
+					if (auto entry = ExtractTextUrl(data.vtext(), baseUrl)) {
+						_entries.push_back({
+							.section = currentSection,
+							.title = std::move(entry->title),
+							.url = std::move(entry->url),
+						});
+					}
+				}, [&](const auto &) {});
+			}
+		}, [&](const MTPDpageBlockDivider &) {
+			inToc = false;
+		}, [&](const MTPDpageBlockHeader &) {
+			inToc = false;
+		}, [&](const auto &) {});
+
+		if (!inToc && !_entries.empty()) {
+			break;
+		}
+	}
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_faq_suggestions.h b/Telegram/SourceFiles/settings/settings_faq_suggestions.h
new file mode 100644
index 00000000000000..dcd1c1239978e7
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_faq_suggestions.h
@@ -0,0 +1,43 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Settings {
+
+struct FaqEntry {
+	QString section;
+	QString title;
+	QString url;
+};
+
+class FaqSuggestions final {
+public:
+	explicit FaqSuggestions(not_null<Main::Session*> session);
+	~FaqSuggestions();
+
+	void request();
+	[[nodiscard]] bool loaded() const;
+	[[nodiscard]] rpl::producer<bool> loadedValue() const;
+	[[nodiscard]] const std::vector<FaqEntry> &entries() const;
+
+private:
+	void parse(const MTPDwebPage &page);
+
+	const not_null<Main::Session*> _session;
+
+	std::vector<FaqEntry> _entries;
+	rpl::variable<bool> _loaded = false;
+	mtpRequestId _requestId = 0;
+
+};
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_folders.h b/Telegram/SourceFiles/settings/settings_folders.h
deleted file mode 100644
index 4598d22ae03a41..00000000000000
--- a/Telegram/SourceFiles/settings/settings_folders.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include "settings/settings_common_session.h"
-
-namespace Settings {
-
-class Folders : public Section<Folders> {
-public:
-	Folders(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller);
-	~Folders();
-
-	void showFinished() override;
-
-	[[nodiscard]] rpl::producer<QString> title() override;
-
-private:
-	void setupContent(not_null<Window::SessionController*> controller);
-
-	Fn<void()> _save;
-
-	rpl::event_stream<> _showFinished;
-
-};
-
-} // namespace Settings
-
diff --git a/Telegram/SourceFiles/settings/settings_global_ttl.cpp b/Telegram/SourceFiles/settings/settings_global_ttl.cpp
deleted file mode 100644
index 0e5d3387df54fa..00000000000000
--- a/Telegram/SourceFiles/settings/settings_global_ttl.cpp
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "settings/settings_global_ttl.h"
-
-#include "api/api_self_destruct.h"
-#include "apiwrap.h"
-#include "boxes/peer_list_controllers.h"
-#include "data/data_changes.h"
-#include "data/data_chat.h"
-#include "data/data_peer.h"
-#include "data/data_session.h"
-#include "history/history.h"
-#include "lang/lang_keys.h"
-#include "lottie/lottie_icon.h"
-#include "main/main_session.h"
-#include "menu/menu_ttl_validator.h"
-#include "settings/settings_common_session.h"
-#include "ui/boxes/confirm_box.h"
-#include "ui/painter.h"
-#include "ui/vertical_list.h"
-#include "ui/text/format_values.h"
-#include "ui/text/text_utilities.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/labels.h"
-#include "ui/wrap/vertical_layout.h"
-#include "window/window_session_controller.h"
-#include "styles/style_boxes.h"
-#include "styles/style_layers.h"
-#include "styles/style_settings.h"
-#include "styles/style_calls.h"
-
-namespace Settings {
-namespace {
-
-class TTLRow : public ChatsListBoxController::Row {
-public:
-	using ChatsListBoxController::Row::Row;
-
-	void paintStatusText(
-		Painter &p,
-		const style::PeerListItem &st,
-		int x,
-		int y,
-		int availableWidth,
-		int outerWidth,
-		bool selected) override;
-
-};
-
-void TTLRow::paintStatusText(
-		Painter &p,
-		const style::PeerListItem &st,
-		int x,
-		int y,
-		int availableWidth,
-		int outerWidth,
-		bool selected) {
-	auto icon = history()->peer->messagesTTL()
-		? &st::settingsTTLChatsOn
-		: &st::settingsTTLChatsOff;
-	icon->paint(
-		p,
-		x + st::callArrowPosition.x(),
-		y + st::callArrowPosition.y(),
-		outerWidth);
-	auto shift = st::callArrowPosition.x()
-		+ icon->width()
-		+ st::callArrowSkip;
-	x += shift;
-	availableWidth -= shift;
-
-	PeerListRow::paintStatusText(
-		p,
-		st,
-		x,
-		y,
-		availableWidth,
-		outerWidth,
-		selected);
-}
-
-class TTLChatsBoxController : public ChatsListBoxController {
-public:
-
-	TTLChatsBoxController(not_null<Main::Session*> session);
-
-	Main::Session &session() const override;
-	void rowClicked(not_null<PeerListRow*> row) override;
-
-protected:
-	void prepareViewHook() override;
-	std::unique_ptr<Row> createRow(not_null<History*> history) override;
-
-private:
-	const not_null<Main::Session*> _session;
-
-	rpl::lifetime _lifetime;
-
-};
-
-TTLChatsBoxController::TTLChatsBoxController(not_null<Main::Session*> session)
-: ChatsListBoxController(session)
-, _session(session) {
-}
-
-Main::Session &TTLChatsBoxController::session() const {
-	return *_session;
-}
-
-void TTLChatsBoxController::prepareViewHook() {
-	delegate()->peerListSetTitle(tr::lng_settings_ttl_title());
-}
-
-void TTLChatsBoxController::rowClicked(not_null<PeerListRow*> row) {
-	if (!TTLMenu::TTLValidator(nullptr, row->peer()).can()) {
-		delegate()->peerListUiShow()->showToast(
-			{ tr::lng_settings_ttl_select_chats_sorry(tr::now) });
-		return;
-	}
-	delegate()->peerListSetRowChecked(row, !row->checked());
-}
-
-std::unique_ptr<TTLChatsBoxController::Row> TTLChatsBoxController::createRow(
-		not_null<History*> history) {
-	const auto peer = history->peer;
-	if (peer->isSelf() || peer->isRepliesChat() || peer->isVerifyCodes()) {
-		return nullptr;
-	} else if (peer->isChat() && peer->asChat()->amIn()) {
-	} else if (peer->isMegagroup()) {
-	} else if (!TTLMenu::TTLValidator(nullptr, peer).can()) {
-		return nullptr;
-	}
-	if (session().data().contactsNoChatsList()->contains({ history })) {
-		return nullptr;
-	}
-	auto result = std::make_unique<TTLRow>(history);
-	const auto applyStatus = [=, raw = result.get()] {
-		const auto ttl = peer->messagesTTL();
-		raw->setCustomStatus(
-			ttl
-				? tr::lng_settings_ttl_select_chats_status(
-					tr::now,
-					lt_after_duration,
-					Ui::FormatTTLAfter(ttl))
-				: tr::lng_settings_ttl_select_chats_status_disabled(tr::now),
-			ttl);
-	};
-	applyStatus();
-	return result;
-}
-
-void SetupTopContent(
-		not_null<Ui::VerticalLayout*> parent,
-		rpl::producer<> showFinished) {
-	const auto divider = Ui::CreateChild<Ui::BoxContentDivider>(parent.get());
-	const auto verticalLayout = parent->add(
-		object_ptr<Ui::VerticalLayout>(parent.get()));
-
-	auto icon = CreateLottieIcon(
-		verticalLayout,
-		{
-			.name = u"ttl"_q,
-			.sizeOverride = {
-				st::settingsCloudPasswordIconSize,
-				st::settingsCloudPasswordIconSize,
-			},
-		},
-		st::settingsFilterIconPadding);
-	std::move(
-		showFinished
-	) | rpl::start_with_next([animate = std::move(icon.animate)] {
-		animate(anim::repeat::loop);
-	}, verticalLayout->lifetime());
-	verticalLayout->add(std::move(icon.widget));
-
-	verticalLayout->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
-		divider->setGeometry(r);
-	}, divider->lifetime());
-
-}
-
-} // namespace
-
-class GlobalTTL : public Section<GlobalTTL> {
-public:
-	GlobalTTL(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller);
-
-	[[nodiscard]] rpl::producer<QString> title() override;
-	void setupContent();
-
-	void showFinished() override final;
-
-private:
-	void rebuildButtons(TimeId currentTTL) const;
-	void showSure(TimeId ttl, bool rebuild) const;
-
-	void request(TimeId ttl) const;
-
-	const not_null<Window::SessionController*> _controller;
-	const std::shared_ptr<Ui::RadiobuttonGroup> _group;
-	const std::shared_ptr<Main::SessionShow> _show;
-
-	not_null<Ui::VerticalLayout*> _buttons;
-
-	rpl::event_stream<> _showFinished;
-	rpl::lifetime _requestLifetime;
-
-};
-
-GlobalTTL::GlobalTTL(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller)
-: Section(parent)
-, _controller(controller)
-, _group(std::make_shared<Ui::RadiobuttonGroup>(0))
-, _show(controller->uiShow())
-, _buttons(Ui::CreateChild<Ui::VerticalLayout>(this)) {
-	setupContent();
-}
-
-rpl::producer<QString> GlobalTTL::title() {
-	return tr::lng_settings_ttl_title();
-}
-
-void GlobalTTL::request(TimeId ttl) const {
-	_controller->session().api().selfDestruct().updateDefaultHistoryTTL(ttl);
-}
-
-void GlobalTTL::showSure(TimeId ttl, bool rebuild) const {
-	const auto ttlText = Ui::FormatTTLAfter(ttl);
-	const auto confirmed = [=] {
-		if (rebuild) {
-			rebuildButtons(ttl);
-		}
-		_group->setChangedCallback([=](int value) {
-			_group->setChangedCallback(nullptr);
-			_show->showToast(tr::lng_settings_ttl_after_toast(
-				tr::now,
-				lt_after_duration,
-				{ .text = ttlText },
-				Ui::Text::WithEntities));
-			_show->hideLayer(); // Don't use close().
-		});
-		request(ttl);
-	};
-	if (_group->value()) {
-		confirmed();
-		return;
-	}
-	_show->showBox(Ui::MakeConfirmBox({
-		.text = tr::lng_settings_ttl_after_sure(
-			lt_after_duration,
-			rpl::single(ttlText)),
-		.confirmed = confirmed,
-		.cancelled = [=](Fn<void()> &&close) {
-			_group->setChangedCallback(nullptr);
-			close();
-		},
-		.confirmText = tr::lng_sure_enable(),
-	}));
-}
-
-void GlobalTTL::rebuildButtons(TimeId currentTTL) const {
-	auto ttls = std::vector<TimeId>{
-		0,
-		3600 * 24,
-		3600 * 24 * 7,
-		3600 * 24 * 31,
-	};
-	if (!ranges::contains(ttls, currentTTL)) {
-		ttls.push_back(currentTTL);
-		ranges::sort(ttls);
-	}
-	if (_buttons->count() > ttls.size()) {
-		return;
-	}
-	_buttons->clear();
-	for (const auto &ttl : ttls) {
-		const auto ttlText = Ui::FormatTTLAfter(ttl);
-		const auto button = _buttons->add(object_ptr<Ui::SettingsButton>(
-			_buttons,
-			(!ttl)
-				? tr::lng_settings_ttl_after_off()
-				: tr::lng_settings_ttl_after(
-					lt_after_duration,
-					rpl::single(ttlText)),
-			st::settingsButtonNoIcon));
-		button->setClickedCallback([=] {
-			if (_group->current() == ttl) {
-				return;
-			}
-			if (!ttl) {
-				_group->setChangedCallback(nullptr);
-				request(ttl);
-				return;
-			}
-			showSure(ttl, false);
-		});
-		const auto radio = Ui::CreateChild<Ui::Radiobutton>(
-			button,
-			_group,
-			ttl,
-			QString());
-		radio->setAttribute(Qt::WA_TransparentForMouseEvents);
-		radio->show();
-		button->sizeValue(
-		) | rpl::start_with_next([=] {
-			radio->moveToRight(0, radio->checkRect().top());
-		}, radio->lifetime());
-	}
-	_buttons->resizeToWidth(width());
-}
-
-void GlobalTTL::setupContent() {
-	setFocusPolicy(Qt::StrongFocus);
-	setFocus();
-
-	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-
-	SetupTopContent(content, _showFinished.events());
-
-	Ui::AddSkip(content);
-	Ui::AddSubsectionTitle(content, tr::lng_settings_ttl_after_subtitle());
-
-	content->add(object_ptr<Ui::VerticalLayout>::fromRaw(_buttons));
-
-	{
-		const auto &apiTTL = _controller->session().api().selfDestruct();
-		const auto rebuild = [=](TimeId period) {
-			rebuildButtons(period);
-			_group->setValue(period);
-		};
-		rebuild(apiTTL.periodDefaultHistoryTTLCurrent());
-		apiTTL.periodDefaultHistoryTTL(
-		) | rpl::start_with_next(rebuild, content->lifetime());
-	}
-
-	const auto show = _controller->uiShow();
-	content->add(object_ptr<Ui::SettingsButton>(
-		content,
-		tr::lng_settings_ttl_after_custom(),
-		st::settingsButtonNoIcon))->setClickedCallback([=] {
-		struct Args {
-			std::shared_ptr<Ui::Show> show;
-			TimeId startTtl;
-			rpl::producer<QString> about;
-			Fn<void(TimeId)> callback;
-		};
-
-		show->showBox(Box(TTLMenu::TTLBox, TTLMenu::Args{
-			.show = show,
-			.startTtl = _group->current(),
-			.callback = [=](TimeId ttl, Fn<void()>) { showSure(ttl, true); },
-			.hideDisable = true,
-		}));
-	});
-
-	Ui::AddSkip(content);
-
-	auto footer = object_ptr<Ui::FlatLabel>(
-		content,
-		tr::lng_settings_ttl_after_about(
-			lt_link,
-			tr::lng_settings_ttl_after_about_link(
-			) | rpl::map([](QString s) { return Ui::Text::Link(s, 1); }),
-			Ui::Text::WithEntities),
-		st::boxDividerLabel);
-	footer->setLink(1, std::make_shared<LambdaClickHandler>([=] {
-		const auto session = &_controller->session();
-		auto controller = std::make_unique<TTLChatsBoxController>(session);
-		auto initBox = [=, controller = controller.get()](
-				not_null<PeerListBox*> box) {
-			box->addButton(tr::lng_settings_apply(), crl::guard(this, [=] {
-				const auto &peers = box->collectSelectedRows();
-				if (peers.empty()) {
-					return;
-				}
-				const auto &apiTTL = session->api().selfDestruct();
-				const auto ttl = apiTTL.periodDefaultHistoryTTLCurrent();
-				for (const auto &peer : peers) {
-					peer->session().api().request(MTPmessages_SetHistoryTTL(
-						peer->input,
-						MTP_int(ttl)
-					)).done([=](const MTPUpdates &result) {
-						peer->session().api().applyUpdates(result);
-					}).send();
-				}
-				box->showToast(ttl
-					? tr::lng_settings_ttl_select_chats_toast(
-						tr::now,
-						lt_count,
-						peers.size(),
-						lt_duration,
-						{ .text = Ui::FormatTTL(ttl) },
-						Ui::Text::WithEntities)
-					: tr::lng_settings_ttl_select_chats_disabled_toast(
-						tr::now,
-						lt_count,
-						peers.size(),
-						Ui::Text::WithEntities));
-				box->closeBox();
-			}));
-			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
-		};
-		_controller->show(
-			Box<PeerListBox>(std::move(controller), std::move(initBox)));
-	}));
-	content->add(object_ptr<Ui::DividerLabel>(
-		content,
-		std::move(footer),
-		st::defaultBoxDividerLabelPadding));
-
-	Ui::ResizeFitChild(this, content);
-}
-
-void GlobalTTL::showFinished() {
-	_showFinished.fire({});
-}
-
-Type GlobalTTLId() {
-	return GlobalTTL::Id();
-}
-
-} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_intro.cpp b/Telegram/SourceFiles/settings/settings_intro.cpp
index 6ddb33f7507486..b0425bc69e45db 100644
--- a/Telegram/SourceFiles/settings/settings_intro.cpp
+++ b/Telegram/SourceFiles/settings/settings_intro.cpp
@@ -7,9 +7,9 @@ For license and copyright information please follow this link:
 */
 #include "settings/settings_intro.h"
 
-#include "settings/settings_advanced.h"
-#include "settings/settings_main.h"
-#include "settings/settings_chat.h"
+#include "settings/sections/settings_advanced.h"
+#include "settings/sections/settings_main.h"
+#include "settings/sections/settings_chat.h"
 #include "settings/settings_codes.h"
 #include "ui/basic_click_handlers.h"
 #include "ui/wrap/fade_wrap.h"
@@ -137,7 +137,7 @@ Ui::RpWidget *TopBar::pushButton(base::unique_qptr<Ui::RpWidget> button) {
 	auto weak = wrapped.get();
 	_buttons.push_back(std::move(wrapped));
 	weak->widthValue(
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		updateControlsGeometry(width());
 	}, lifetime());
 	return weak;
@@ -178,6 +178,11 @@ class IntroWidget : public Ui::RpWidget {
 		QWidget *parent,
 		not_null<Window::Controller*> window);
 
+	QAccessible::Role accessibilityRole() override {
+		return QAccessible::Dialog;
+	}
+	QString accessibilityName() override;
+
 	void forceContentRepaint();
 
 	rpl::producer<int> desiredHeightValue() const override;
@@ -226,13 +231,13 @@ IntroWidget::IntroWidget(
 , _topShadow(this) {
 	_wrap->setAttribute(Qt::WA_OpaquePaintEvent);
 	_wrap->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(_wrap.data());
 		p.fillRect(clip, st::boxBg);
 	}, _wrap->lifetime());
 
 	_scrollTopSkip.changes(
-	) | rpl::start_with_next([this] {
+	) | rpl::on_next([this] {
 		updateControlsGeometry();
 	}, lifetime());
 
@@ -245,6 +250,10 @@ IntroWidget::IntroWidget(
 		}));
 }
 
+QString IntroWidget::accessibilityName() {
+	return tr::lng_menu_settings(tr::now);
+}
+
 void IntroWidget::updateControlsGeometry() {
 	if (!_innerWrap) {
 		return;
@@ -290,6 +299,7 @@ void IntroWidget::createTopBar(not_null<Window::Controller*> window) {
 		base::make_unique_q<Ui::IconButton>(
 			_topBar,
 			st::infoLayerTopBarClose));
+	close->setAccessibleName(tr::lng_close(tr::now));
 	close->addClickHandler([=] {
 		window->hideSettingsAndLayer();
 	});
@@ -312,7 +322,7 @@ void IntroWidget::setInnerWidget(object_ptr<Ui::RpWidget> content) {
 		_scroll->scrollTopValue(),
 		_scroll->heightValue(),
 		_innerWrap->entity()->desiredHeightValue()
-	) | rpl::start_with_next([this](
+	) | rpl::on_next([this](
 			int top,
 			int height,
 			int desired) {
@@ -341,6 +351,14 @@ void IntroWidget::showContent(not_null<Window::Controller*> window) {
 }
 
 void IntroWidget::setInnerFocus() {
+	for (const auto childObject : _innerWrap->entity()->children()) {
+		const auto childWidget = static_cast<QWidget*>(childObject);
+		if (childObject->isWidgetType() && childWidget->focusPolicy() != Qt::NoFocus) {
+			childWidget->setFocus(Qt::OtherFocusReason);
+			return;
+		}
+	}
+
 	setFocus();
 }
 
@@ -419,11 +437,11 @@ void LayerWidget::setupHeightConsumers() {
 	_content->scrollTillBottomChanges(
 	) | rpl::filter([this] {
 		return !_inResize;
-	}) | rpl::start_with_next([this] {
+	}) | rpl::on_next([this] {
 		resizeToWidth(width());
 	}, lifetime());
 	_content->desiredHeightValue(
-	) | rpl::start_with_next([this](int height) {
+	) | rpl::on_next([this](int height) {
 		accumulate_max(_desiredHeight, height);
 		if (_content && !_inResize) {
 			resizeToWidth(width());
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
deleted file mode 100644
index 685f3ae574a7e1..00000000000000
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ /dev/null
@@ -1,840 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "settings/settings_main.h"
-
-#include "api/api_credits.h"
-#include "core/application.h"
-#include "core/click_handler_types.h"
-#include "settings/settings_advanced.h"
-#include "settings/settings_business.h"
-#include "settings/settings_calls.h"
-#include "settings/settings_chat.h"
-#include "settings/settings_codes.h"
-#include "settings/settings_credits.h"
-#include "settings/settings_folders.h"
-#include "settings/settings_information.h"
-#include "settings/settings_notifications.h"
-#include "settings/settings_power_saving.h"
-#include "settings/settings_premium.h"
-#include "settings/settings_privacy_security.h"
-#include "settings/settings_scale_preview.h"
-#include "boxes/language_box.h"
-#include "boxes/username_box.h"
-#include "boxes/about_box.h"
-#include "boxes/star_gift_box.h"
-#include "ui/basic_click_handlers.h"
-#include "ui/boxes/confirm_box.h"
-#include "ui/controls/userpic_button.h"
-#include "ui/effects/premium_graphics.h"
-#include "ui/effects/premium_top_bar.h" // Ui::Premium::ColorizedSvg.
-#include "ui/wrap/slide_wrap.h"
-#include "ui/widgets/menu/menu_add_action_callback.h"
-#include "ui/widgets/continuous_sliders.h"
-#include "ui/text/text_utilities.h"
-#include "ui/toast/toast.h"
-#include "ui/new_badges.h"
-#include "ui/rect.h"
-#include "ui/vertical_list.h"
-#include "info/profile/info_profile_badge.h"
-#include "info/profile/info_profile_emoji_status_panel.h"
-#include "data/components/credits.h"
-#include "data/data_user.h"
-#include "data/data_session.h"
-#include "data/data_cloud_themes.h"
-#include "data/data_chat_filters.h"
-#include "lang/lang_cloud_manager.h"
-#include "lang/lang_instance.h"
-#include "storage/localstorage.h"
-#include "main/main_session.h"
-#include "main/main_session_settings.h"
-#include "main/main_account.h"
-#include "main/main_domain.h"
-#include "main/main_app_config.h"
-#include "apiwrap.h"
-#include "api/api_peer_photo.h"
-#include "api/api_cloud_password.h"
-#include "api/api_global_privacy.h"
-#include "api/api_sensitive_content.h"
-#include "api/api_premium.h"
-#include "info/profile/info_profile_values.h"
-#include "window/window_controller.h"
-#include "window/window_session_controller.h"
-#include "base/call_delayed.h"
-#include "base/platform/base_platform_info.h"
-#include "styles/style_settings.h"
-#include "styles/style_info.h"
-#include "styles/style_menu_icons.h"
-
-#include <QtGui/QGuiApplication>
-#include <QtGui/QClipboard>
-#include <QtGui/QWindow>
-
-namespace Settings {
-namespace {
-
-class Cover final : public Ui::FixedHeightWidget {
-public:
-	Cover(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		not_null<UserData*> user);
-	~Cover();
-
-private:
-	void setupChildGeometry();
-	void initViewers();
-	void refreshStatusText();
-	void refreshNameGeometry(int newWidth);
-	void refreshPhoneGeometry(int newWidth);
-	void refreshUsernameGeometry(int newWidth);
-
-	const not_null<Window::SessionController*> _controller;
-	const not_null<UserData*> _user;
-	Info::Profile::EmojiStatusPanel _emojiStatusPanel;
-	Info::Profile::Badge _badge;
-
-	object_ptr<Ui::UserpicButton> _userpic;
-	object_ptr<Ui::FlatLabel> _name = { nullptr };
-	object_ptr<Ui::FlatLabel> _phone = { nullptr };
-	object_ptr<Ui::FlatLabel> _username = { nullptr };
-
-};
-
-Cover::Cover(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller,
-	not_null<UserData*> user)
-: FixedHeightWidget(
-	parent,
-	st::settingsPhotoTop
-		+ st::infoProfileCover.photo.size.height()
-		+ st::settingsPhotoBottom)
-, _controller(controller)
-, _user(user)
-, _badge(
-	this,
-	st::infoPeerBadge,
-	user,
-	&_emojiStatusPanel,
-	[=] {
-		return controller->isGifPausedAtLeastFor(
-			Window::GifPauseReason::Layer);
-	},
-	0, // customStatusLoopsLimit
-	Info::Profile::BadgeType::Premium)
-, _userpic(
-	this,
-	controller,
-	_user,
-	Ui::UserpicButton::Role::OpenPhoto,
-	Ui::UserpicButton::Source::PeerPhoto,
-	st::infoProfileCover.photo)
-, _name(this, st::infoProfileCover.name)
-, _phone(this, st::defaultFlatLabel)
-, _username(this, st::infoProfileMegagroupCover.status) {
-	_user->updateFull();
-
-	_name->setSelectable(true);
-	_name->setContextCopyText(tr::lng_profile_copy_fullname(tr::now));
-
-	_phone->setSelectable(true);
-	_phone->setContextCopyText(tr::lng_profile_copy_phone(tr::now));
-
-	initViewers();
-	setupChildGeometry();
-
-	_userpic->switchChangePhotoOverlay(_user->isSelf(), [=](
-			Ui::UserpicButton::ChosenImage chosen) {
-		auto &image = chosen.image;
-		_userpic->showCustom(base::duplicate(image));
-		_user->session().api().peerPhoto().upload(
-			_user,
-			{
-				std::move(image),
-				chosen.markup.documentId,
-				chosen.markup.colors,
-			});
-	});
-
-	_badge.setPremiumClickCallback([=] {
-		_emojiStatusPanel.show(
-			_controller,
-			_badge.widget(),
-			_badge.sizeTag());
-	});
-	_badge.updated() | rpl::start_with_next([=] {
-		refreshNameGeometry(width());
-	}, _name->lifetime());
-}
-
-Cover::~Cover() = default;
-
-void Cover::setupChildGeometry() {
-	using namespace rpl::mappers;
-	widthValue(
-	) | rpl::start_with_next([=](int newWidth) {
-		_userpic->moveToLeft(
-			st::settingsPhotoLeft,
-			st::settingsPhotoTop,
-			newWidth);
-		refreshNameGeometry(newWidth);
-		refreshPhoneGeometry(newWidth);
-		refreshUsernameGeometry(newWidth);
-	}, lifetime());
-}
-
-void Cover::initViewers() {
-	Info::Profile::NameValue(
-		_user
-	) | rpl::start_with_next([=](const QString &name) {
-		_name->setText(name);
-		refreshNameGeometry(width());
-	}, lifetime());
-
-	Info::Profile::PhoneValue(
-		_user
-	) | rpl::start_with_next([=](const TextWithEntities &value) {
-		_phone->setText(value.text);
-		refreshPhoneGeometry(width());
-	}, lifetime());
-
-	Info::Profile::UsernameValue(
-		_user
-	) | rpl::start_with_next([=](const TextWithEntities &value) {
-		_username->setMarkedText(Ui::Text::Link(value.text.isEmpty()
-			? tr::lng_settings_username_add(tr::now)
-			: value.text));
-		refreshUsernameGeometry(width());
-	}, lifetime());
-
-	_username->overrideLinkClickHandler([=] {
-		const auto username = _user->username();
-		if (username.isEmpty()) {
-			_controller->show(Box(UsernamesBox, _user));
-		} else {
-			QGuiApplication::clipboard()->setText(
-				_user->session().createInternalLinkFull(username));
-			_controller->showToast(tr::lng_username_copied(tr::now));
-		}
-	});
-}
-
-void Cover::refreshNameGeometry(int newWidth) {
-	const auto nameLeft = st::settingsNameLeft;
-	const auto nameTop = st::settingsNameTop;
-	auto nameWidth = newWidth
-		- nameLeft
-		- st::infoProfileCover.rightSkip;
-	if (const auto width = _badge.widget() ? _badge.widget()->width() : 0) {
-		nameWidth -= st::infoVerifiedCheckPosition.x() + width;
-	}
-	_name->resizeToNaturalWidth(nameWidth);
-	_name->moveToLeft(nameLeft, nameTop, newWidth);
-	const auto badgeLeft = nameLeft + _name->width();
-	const auto badgeTop = nameTop;
-	const auto badgeBottom = nameTop + _name->height();
-	_badge.move(badgeLeft, badgeTop, badgeBottom);
-}
-
-void Cover::refreshPhoneGeometry(int newWidth) {
-	const auto phoneLeft = st::settingsPhoneLeft;
-	const auto phoneTop = st::settingsPhoneTop;
-	const auto phoneWidth = newWidth
-		- phoneLeft
-		- st::infoProfileCover.rightSkip;
-	_phone->resizeToWidth(phoneWidth);
-	_phone->moveToLeft(phoneLeft, phoneTop, newWidth);
-}
-
-void Cover::refreshUsernameGeometry(int newWidth) {
-	const auto usernameLeft = st::settingsUsernameLeft;
-	const auto usernameTop = st::settingsUsernameTop;
-	const auto usernameRight = st::infoProfileCover.rightSkip;
-	const auto usernameWidth = newWidth - usernameLeft - usernameRight;
-	_username->resizeToWidth(usernameWidth);
-	_username->moveToLeft(usernameLeft, usernameTop, newWidth);
-}
-
-[[nodiscard]] not_null<Ui::SettingsButton*> AddPremiumStar(
-		not_null<Ui::SettingsButton*> button,
-		bool credits) {
-	const auto stops = credits
-		? Ui::Premium::CreditsIconGradientStops()
-		: Ui::Premium::ButtonGradientStops();
-
-	const auto ministarsContainer = Ui::CreateChild<Ui::RpWidget>(button);
-	const auto &buttonSt = button->st();
-	const auto fullHeight = buttonSt.height
-		+ rect::m::sum::v(buttonSt.padding);
-	using MiniStars = Ui::Premium::ColoredMiniStars;
-	const auto ministars = button->lifetime().make_state<MiniStars>(
-		ministarsContainer,
-		false);
-	ministars->setColorOverride(stops);
-
-	ministarsContainer->paintRequest(
-	) | rpl::start_with_next([=] {
-		auto p = QPainter(ministarsContainer);
-		{
-			constexpr auto kScale = 0.35;
-			const auto r = ministarsContainer->rect();
-			p.translate(r.center());
-			p.scale(kScale, kScale);
-			p.translate(-r.center());
-		}
-		ministars->paint(p);
-	}, ministarsContainer->lifetime());
-
-	const auto badge = Ui::CreateChild<Ui::RpWidget>(button.get());
-
-	auto star = [&] {
-		const auto factor = style::DevicePixelRatio();
-		const auto size = Size(st::settingsButtonNoIcon.style.font->ascent);
-		auto image = QImage(
-			size * factor,
-			QImage::Format_ARGB32_Premultiplied);
-		image.setDevicePixelRatio(factor);
-		image.fill(Qt::transparent);
-		{
-			auto p = QPainter(&image);
-			auto star = QSvgRenderer(Ui::Premium::ColorizedSvg(stops));
-			star.render(&p, Rect(size));
-		}
-		return image;
-	}();
-	badge->resize(star.size() / style::DevicePixelRatio());
-	badge->paintRequest(
-	) | rpl::start_with_next([=] {
-		auto p = QPainter(badge);
-		p.drawImage(0, 0, star);
-	}, badge->lifetime());
-
-	button->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
-		badge->moveToLeft(
-			button->st().iconLeft
-				+ (st::menuIconShop.width() - badge->width()) / 2,
-			(s.height() - badge->height()) / 2);
-		ministarsContainer->moveToLeft(
-			badge->x() - (fullHeight - badge->height()) / 2,
-			0);
-	}, badge->lifetime());
-
-	ministarsContainer->resize(fullHeight, fullHeight);
-	ministars->setCenter(ministarsContainer->rect());
-
-	return button;
-}
-
-} // namespace
-
-void SetupPowerSavingButton(
-		not_null<Window::Controller*> window,
-		not_null<Ui::VerticalLayout*> container) {
-	const auto button = AddButtonWithIcon(
-		container,
-		tr::lng_settings_power_menu(),
-		st::settingsButton,
-		{ &st::menuIconPowerUsage });
-	button->setClickedCallback([=] {
-		window->show(Box(PowerSavingBox));
-	});
-}
-
-void SetupLanguageButton(
-		not_null<Window::Controller*> window,
-		not_null<Ui::VerticalLayout*> container) {
-	const auto button = AddButtonWithLabel(
-		container,
-		tr::lng_settings_language(),
-		rpl::single(
-			Lang::GetInstance().id()
-		) | rpl::then(
-			Lang::GetInstance().idChanges()
-		) | rpl::map([] { return Lang::GetInstance().nativeName(); }),
-		st::settingsButton,
-		{ &st::menuIconTranslate });
-	const auto guard = Ui::CreateChild<base::binary_guard>(button.get());
-	button->addClickHandler([=] {
-		const auto m = button->clickModifiers();
-		if ((m & Qt::ShiftModifier) && (m & Qt::AltModifier)) {
-			Lang::CurrentCloudManager().switchToLanguage({ u"#custom"_q });
-		} else {
-			*guard = LanguageBox::Show(window->sessionController());
-		}
-	});
-}
-
-void SetupSections(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		Fn<void(Type)> showOther) {
-	Ui::AddDivider(container);
-	Ui::AddSkip(container);
-
-	const auto addSection = [&](
-			rpl::producer<QString> label,
-			Type type,
-			IconDescriptor &&descriptor) {
-		AddButtonWithIcon(
-			container,
-			std::move(label),
-			st::settingsButton,
-			std::move(descriptor)
-		)->addClickHandler([=] {
-			showOther(type);
-		});
-	};
-	if (controller->session().supportMode()) {
-		SetupSupport(controller, container);
-
-		Ui::AddDivider(container);
-		Ui::AddSkip(container);
-	} else {
-		addSection(
-			tr::lng_settings_my_account(),
-			Information::Id(),
-			{ &st::menuIconProfile });
-	}
-
-	addSection(
-		tr::lng_settings_section_notify(),
-		Notifications::Id(),
-		{ &st::menuIconNotifications });
-	addSection(
-		tr::lng_settings_section_privacy(),
-		PrivacySecurity::Id(),
-		{ &st::menuIconLock });
-	addSection(
-		tr::lng_settings_section_chat_settings(),
-		Chat::Id(),
-		{ &st::menuIconChatBubble });
-
-	const auto preload = [=] {
-		controller->session().data().chatsFilters().requestSuggested();
-	};
-	const auto account = &controller->session().account();
-	const auto slided = container->add(
-		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
-			container,
-			CreateButtonWithIcon(
-				container,
-				tr::lng_settings_section_filters(),
-				st::settingsButton,
-				{ &st::menuIconShowInFolder }))
-	)->setDuration(0);
-	if (controller->session().data().chatsFilters().has()
-		|| controller->session().settings().dialogsFiltersEnabled()) {
-		slided->show(anim::type::instant);
-		preload();
-	} else {
-		const auto enabled = [=] {
-			const auto result = account->appConfig().get<bool>(
-				u"dialog_filters_enabled"_q,
-				false);
-			if (result) {
-				preload();
-			}
-			return result;
-		};
-		const auto preloadIfEnabled = [=](bool enabled) {
-			if (enabled) {
-				preload();
-			}
-		};
-		slided->toggleOn(
-			rpl::single(rpl::empty) | rpl::then(
-				account->appConfig().refreshed()
-			) | rpl::map(
-				enabled
-			) | rpl::before_next(preloadIfEnabled));
-	}
-	slided->entity()->setClickedCallback([=] {
-		showOther(Folders::Id());
-	});
-
-	addSection(
-		tr::lng_settings_advanced(),
-		Advanced::Id(),
-		{ &st::menuIconManage });
-	addSection(
-		tr::lng_settings_section_devices(),
-		Calls::Id(),
-		{ &st::menuIconUnmute });
-
-	SetupPowerSavingButton(&controller->window(), container);
-	SetupLanguageButton(&controller->window(), container);
-
-	Ui::AddSkip(container);
-}
-
-void SetupPremium(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		Fn<void(Type)> showOther) {
-	if (!controller->session().premiumPossible()) {
-		return;
-	}
-	Ui::AddDivider(container);
-	Ui::AddSkip(container);
-
-	AddPremiumStar(
-		AddButtonWithIcon(
-			container,
-			tr::lng_premium_summary_title(),
-			st::settingsButton),
-		false
-	)->addClickHandler([=] {
-		controller->setPremiumRef("settings");
-		showOther(PremiumId());
-	});
-	{
-		controller->session().credits().load();
-		AddPremiumStar(
-			AddButtonWithLabel(
-				container,
-				tr::lng_settings_credits(),
-				controller->session().credits().balanceValue(
-				) | rpl::map([=](uint64 c) {
-					return c ? Lang::FormatCountToShort(c).string : QString{};
-				}),
-				st::settingsButton),
-			true
-		)->addClickHandler([=] {
-			controller->setPremiumRef("settings");
-			showOther(CreditsId());
-		});
-	}
-	const auto button = AddButtonWithIcon(
-		container,
-		tr::lng_business_title(),
-		st::settingsButton,
-		{ .icon = &st::menuIconShop });
-	button->addClickHandler([=] {
-		showOther(BusinessId());
-	});
-	Ui::NewBadge::AddToRight(button);
-
-	if (controller->session().premiumCanBuy()) {
-		const auto button = AddButtonWithIcon(
-			container,
-			tr::lng_settings_gift_premium(),
-			st::settingsButton,
-			{ .icon = &st::menuIconGiftPremium }
-		);
-		button->addClickHandler([=] {
-			Ui::ChooseStarGiftRecipient(controller);
-		});
-	}
-	Ui::AddSkip(container);
-}
-
-bool HasInterfaceScale() {
-	return true;
-}
-
-void SetupInterfaceScale(
-		not_null<Window::Controller*> window,
-		not_null<Ui::VerticalLayout*> container,
-		bool icon) {
-	if (!HasInterfaceScale()) {
-		return;
-	}
-
-	const auto toggled = Ui::CreateChild<rpl::event_stream<bool>>(
-		container.get());
-
-	const auto switched = (cConfigScale() == style::kScaleAuto);
-	const auto button = AddButtonWithIcon(
-		container,
-		tr::lng_settings_default_scale(),
-		icon ? st::settingsButton : st::settingsButtonNoIcon,
-		{ icon ? &st::menuIconShowInChat : nullptr }
-	)->toggleOn(toggled->events_starting_with_copy(switched));
-
-	const auto ratio = style::DevicePixelRatio();
-	const auto scaleMin = style::kScaleMin;
-	const auto scaleMax = style::MaxScaleForRatio(ratio);
-	const auto scaleConfig = cConfigScale();
-	const auto step = 5;
-	Assert(!((scaleMax - scaleMin) % step));
-	auto values = std::vector<int>();
-	for (auto i = scaleMin; i != scaleMax; i += step) {
-		values.push_back(i);
-		if (scaleConfig > i && scaleConfig < i + step) {
-			values.push_back(scaleConfig);
-		}
-	}
-	values.push_back(scaleMax);
-	const auto valuesCount = int(values.size());
-
-	const auto valueFromScale = [=](int scale) {
-		scale = cEvalScale(scale);
-		auto result = 0;
-		for (const auto value : values) {
-			if (scale == value) {
-				break;
-			}
-			++result;
-		}
-		return ((result == valuesCount) ? (result - 1) : result)
-			/ float64(valuesCount - 1);
-	};
-	auto sliderWithLabel = MakeSliderWithLabel(
-		container,
-		st::settingsScale,
-		st::settingsScaleLabel,
-		st::normalFont->spacew * 2,
-		st::settingsScaleLabel.style.font->width("300%"),
-		true);
-	container->add(
-		std::move(sliderWithLabel.widget),
-		icon ? st::settingsScalePadding : st::settingsBigScalePadding);
-	const auto slider = sliderWithLabel.slider;
-	const auto label = sliderWithLabel.label;
-
-	const auto updateLabel = [=](int scale) {
-		const auto labelText = [&](int scale) {
-			if constexpr (Platform::IsMac()) {
-				return QString::number(scale) + '%';
-			} else {
-				const auto handle = window->widget()->windowHandle();
-				const auto ratio = handle->devicePixelRatio();
-				return QString::number(base::SafeRound(scale * ratio)) + '%';
-			}
-		};
-		label->setText(labelText(cEvalScale(scale)));
-	};
-	updateLabel(cConfigScale());
-
-	const auto inSetScale = container->lifetime().make_state<bool>();
-	const auto setScale = [=](int scale, const auto &repeatSetScale) -> void {
-		if (*inSetScale) {
-			return;
-		}
-		*inSetScale = true;
-		const auto guard = gsl::finally([=] { *inSetScale = false; });
-
-		updateLabel(scale);
-		toggled->fire(scale == style::kScaleAuto);
-		slider->setValue(valueFromScale(scale));
-		if (cEvalScale(scale) != cEvalScale(cConfigScale())) {
-			const auto confirmed = crl::guard(button, [=] {
-				cSetConfigScale(scale);
-				Local::writeSettings();
-				Core::Restart();
-			});
-			const auto cancelled = crl::guard(button, [=](Fn<void()> close) {
-				base::call_delayed(
-					st::defaultSettingsSlider.duration,
-					button,
-					[=] { repeatSetScale(cConfigScale(), repeatSetScale); });
-				close();
-			});
-			window->show(Ui::MakeConfirmBox({
-				.text = tr::lng_settings_need_restart(),
-				.confirmed = confirmed,
-				.cancelled = cancelled,
-				.confirmText = tr::lng_settings_restart_now(),
-			}));
-		} else if (scale != cConfigScale()) {
-			cSetConfigScale(scale);
-			Local::writeSettings();
-		}
-	};
-
-	const auto shown = container->lifetime().make_state<bool>();
-	const auto togglePreview = SetupScalePreview(window, slider);
-	const auto toggleForScale = [=](int scale) {
-		scale = cEvalScale(scale);
-		const auto show = *shown
-			? ScalePreviewShow::Update
-			: ScalePreviewShow::Show;
-		*shown = true;
-		for (auto i = 0; i != valuesCount; ++i) {
-			if (values[i] <= scale
-				&& (i + 1 == valuesCount || values[i + 1] > scale)) {
-				const auto x = (slider->width() * i) / (valuesCount - 1);
-				togglePreview(show, scale, x);
-				return;
-			}
-		}
-		togglePreview(show, scale, slider->width() / 2);
-	};
-	const auto toggleHidePreview = [=] {
-		togglePreview(ScalePreviewShow::Hide, 0, 0);
-		*shown = false;
-	};
-
-	slider->setPseudoDiscrete(
-		valuesCount,
-		[=](int index) { return values[index]; },
-		cConfigScale(),
-		[=](int scale) { updateLabel(scale); toggleForScale(scale); },
-		[=](int scale) { toggleHidePreview(); setScale(scale, setScale); });
-
-	button->toggledValue(
-	) | rpl::map([](bool checked) {
-		return checked ? style::kScaleAuto : cEvalScale(cConfigScale());
-	}) | rpl::start_with_next([=](int scale) {
-		setScale(scale, setScale);
-	}, button->lifetime());
-
-	if (!icon) {
-		Ui::AddSkip(container, st::settingsThumbSkip);
-	}
-}
-
-void SetupHelp(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	Ui::AddDivider(container);
-	Ui::AddSkip(container);
-
-	AddButtonWithIcon(
-		container,
-		tr::lng_settings_faq(),
-		st::settingsButton,
-		{ &st::menuIconFaq }
-	)->addClickHandler([=] {
-		OpenFaq(controller);
-	});
-
-	AddButtonWithIcon(
-		container,
-		tr::lng_settings_features(),
-		st::settingsButton,
-		{ &st::menuIconEmojiObjects }
-	)->setClickedCallback([=] {
-		UrlClickHandler::Open(tr::lng_telegram_features_url(tr::now));
-	});
-
-	const auto button = AddButtonWithIcon(
-		container,
-		tr::lng_settings_ask_question(),
-		st::settingsButton,
-		{ &st::menuIconDiscussion });
-	const auto requestId = button->lifetime().make_state<mtpRequestId>();
-	button->lifetime().add([=] {
-		if (*requestId) {
-			controller->session().api().request(*requestId).cancel();
-		}
-	});
-	button->addClickHandler([=] {
-		const auto sure = crl::guard(button, [=] {
-			if (*requestId) {
-				return;
-			}
-			*requestId = controller->session().api().request(
-				MTPhelp_GetSupport()
-			).done([=](const MTPhelp_Support &result) {
-				*requestId = 0;
-				result.match([&](const MTPDhelp_support &data) {
-					auto &owner = controller->session().data();
-					if (const auto user = owner.processUser(data.vuser())) {
-						controller->showPeerHistory(user);
-					}
-				});
-			}).fail([=] {
-				*requestId = 0;
-			}).send();
-		});
-		auto box = Ui::MakeConfirmBox({
-			.text = tr::lng_settings_ask_sure(),
-			.confirmed = sure,
-			.cancelled = [=](Fn<void()> close) {
-				OpenFaq(controller);
-				close();
-			},
-			.confirmText = tr::lng_settings_ask_ok(),
-			.cancelText = tr::lng_settings_faq_button(),
-			.strictCancel = true,
-		});
-		controller->show(std::move(box));
-	});
-}
-
-Main::Main(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller)
-: Section(parent)
-, _controller(controller) {
-	setupContent(controller);
-	_controller->session().api().premium().reload();
-}
-
-rpl::producer<QString> Main::title() {
-	return tr::lng_menu_settings();
-}
-
-void Main::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
-	const auto &list = Core::App().domain().accounts();
-	if (list.size() < Core::App().domain().maxAccounts()) {
-		addAction(tr::lng_menu_add_account(tr::now), [=] {
-			Core::App().domain().addActivated(MTP::Environment{});
-		}, &st::menuIconAddAccount);
-	}
-	if (!_controller->session().supportMode()) {
-		addAction(
-			tr::lng_settings_information(tr::now),
-			[=] { showOther(Information::Id()); },
-			&st::menuIconInfo);
-	}
-	const auto window = &_controller->window();
-	addAction({
-		.text = tr::lng_settings_logout(tr::now),
-		.handler = [=] { window->showLogoutConfirmation(); },
-		.icon = &st::menuIconLeaveAttention,
-		.isAttention = true,
-	});
-}
-
-void Main::keyPressEvent(QKeyEvent *e) {
-	crl::on_main(this, [=, text = e->text()]{
-		CodesFeedString(_controller, text);
-	});
-	return Section::keyPressEvent(e);
-}
-
-void Main::setupContent(not_null<Window::SessionController*> controller) {
-	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-
-	content->add(object_ptr<Cover>(
-		content,
-		controller,
-		controller->session().user()));
-
-	SetupSections(controller, content, showOtherMethod());
-	if (HasInterfaceScale()) {
-		Ui::AddDivider(content);
-		Ui::AddSkip(content);
-		SetupInterfaceScale(&controller->window(), content);
-		Ui::AddSkip(content);
-	}
-	SetupPremium(controller, content, showOtherMethod());
-	SetupHelp(controller, content);
-
-	Ui::ResizeFitChild(this, content);
-
-	// If we load this in advance it won't jump when we open its' section.
-	controller->session().api().cloudPassword().reload();
-	controller->session().api().reloadContactSignupSilent();
-	controller->session().api().sensitiveContent().reload();
-	controller->session().api().globalPrivacy().reload();
-	controller->session().data().cloudThemes().refresh();
-}
-
-void OpenFaq(base::weak_ptr<Window::SessionController> weak) {
-	UrlClickHandler::Open(
-		tr::lng_settings_faq_link(tr::now),
-		QVariant::fromValue(ClickHandlerContext{
-			.sessionWindow = weak,
-		}));
-}
-
-} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_notifications_common.h b/Telegram/SourceFiles/settings/settings_notifications_common.h
new file mode 100644
index 00000000000000..a994906ba063ca
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_notifications_common.h
@@ -0,0 +1,125 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include <cstdint>
+
+#include "base/object_ptr.h"
+#include "core/core_settings.h"
+#include "settings/settings_type.h"
+#include "ui/effects/animations.h"
+#include "ui/rp_widget.h"
+
+namespace Ui {
+class Checkbox;
+class SettingsButton;
+class ToggleView;
+class VerticalLayout;
+template <typename Widget>
+class SlideWrap;
+} // namespace Ui
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Data {
+enum class DefaultNotify : uint8_t;
+} // namespace Data
+
+namespace Settings {
+
+constexpr auto kMaxNotificationsCount = 5;
+
+[[nodiscard]] int CurrentNotificationsCount();
+
+class NotificationsCount : public Ui::RpWidget {
+public:
+	NotificationsCount(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller);
+
+	void setCount(int count);
+
+	~NotificationsCount();
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+
+	int resizeGetHeight(int newWidth) override;
+
+private:
+	using ScreenCorner = Core::Settings::ScreenCorner;
+	void setOverCorner(ScreenCorner corner);
+	void clearOverCorner();
+
+	class SampleWidget;
+	void removeSample(SampleWidget *widget);
+
+	QRect getScreenRect() const;
+	QRect getScreenRect(int width) const;
+	int getContentLeft() const;
+	void prepareNotificationSampleSmall();
+	void prepareNotificationSampleLarge();
+	void prepareNotificationSampleUserpic();
+
+	const not_null<Window::SessionController*> _controller;
+
+	QPixmap _notificationSampleUserpic;
+	QPixmap _notificationSampleSmall;
+	QPixmap _notificationSampleLarge;
+	ScreenCorner _chosenCorner;
+	std::vector<Ui::Animations::Simple> _sampleOpacities;
+
+	bool _isOverCorner = false;
+	ScreenCorner _overCorner = ScreenCorner::TopLeft;
+	bool _isDownCorner = false;
+	ScreenCorner _downCorner = ScreenCorner::TopLeft;
+
+	int _oldCount;
+
+	std::vector<SampleWidget*> _cornerSamples[4];
+
+};
+
+struct NotifyViewCheckboxes {
+	not_null<Ui::SlideWrap<Ui::RpWidget>*> wrap;
+	not_null<Ui::Checkbox*> name;
+	not_null<Ui::Checkbox*> preview;
+};
+
+[[nodiscard]] NotifyViewCheckboxes SetupNotifyViewOptions(
+	not_null<Window::SessionController*> controller,
+	not_null<Ui::VerticalLayout*> container,
+	bool nameShown,
+	bool previewShown);
+
+struct SplitToggle {
+	not_null<Ui::SettingsButton*> button;
+	not_null<Ui::SettingsButton*> toggle;
+	not_null<Ui::ToggleView*> checkView;
+};
+
+[[nodiscard]] SplitToggle SetupSplitToggle(
+	not_null<Ui::VerticalLayout*> container,
+	rpl::producer<QString> title,
+	const style::icon *icon,
+	bool checked,
+	rpl::producer<QString> details);
+
+[[nodiscard]] not_null<Ui::SettingsButton*> AddTypeButton(
+	not_null<Ui::VerticalLayout*> container,
+	not_null<Window::SessionController*> controller,
+	Data::DefaultNotify type,
+	Fn<void(Type)> showOther);
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_power_saving.cpp b/Telegram/SourceFiles/settings/settings_power_saving.cpp
index beaf46613426e3..d026fb9231912e 100644
--- a/Telegram/SourceFiles/settings/settings_power_saving.cpp
+++ b/Telegram/SourceFiles/settings/settings_power_saving.cpp
@@ -16,6 +16,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/buttons.h"
 #include "ui/power_saving.h"
 #include "ui/vertical_list.h"
+#include "settings/settings_common.h"
 #include "styles/style_menu_icons.h"
 #include "styles/style_layers.h"
 #include "styles/style_settings.h"
@@ -27,7 +28,9 @@ constexpr auto kForceDisableTooltipDuration = 3 * crl::time(1000);
 
 } // namespace
 
-void PowerSavingBox(not_null<Ui::GenericBox*> box) {
+void PowerSavingBox(
+		not_null<Ui::GenericBox*> box,
+		PowerSaving::Flags highlightFlags) {
 	box->setStyle(st::layerBox);
 	box->setTitle(tr::lng_settings_power_title());
 	box->setWidth(st::boxWideWidth);
@@ -53,13 +56,15 @@ void PowerSavingBox(not_null<Ui::GenericBox*> box) {
 		? tr::lng_settings_power_turn_off(tr::now)
 		: QString();
 
-	auto [checkboxes, getResult, changes] = CreateEditPowerSaving(
+	auto [checkboxes, getResult, changes, highlightWidget] = CreateEditPowerSaving(
 		box,
 		PowerSaving::kAll & ~PowerSaving::Current(),
-		state->forceDisabledMessage.value());
+		state->forceDisabledMessage.value(),
+		highlightFlags);
 
 	const auto controlsRaw = checkboxes.data();
-	box->addRow(std::move(checkboxes), {});
+	const auto highlightWidgetRaw = highlightWidget.data();
+	box->addRow(std::move(checkboxes), style::margins());
 
 	auto automatic = (Ui::SettingsButton*)nullptr;
 	if (batterySaving.has_value()) {
@@ -91,7 +96,7 @@ void PowerSavingBox(not_null<Ui::GenericBox*> box) {
 				tr::lng_settings_power_turn_off(tr::now),
 				kForceDisableTooltipDuration);
 		});
-		disabler->paintRequest() | rpl::start_with_next([=](QRect clip) {
+		disabler->paintRequest() | rpl::on_next([=](QRect clip) {
 			auto color = st::boxBg->c;
 			color.setAlpha(96);
 			QPainter(disabler).fillRect(clip, color);
@@ -99,7 +104,7 @@ void PowerSavingBox(not_null<Ui::GenericBox*> box) {
 		rpl::combine(
 			subtitle->geometryValue(),
 			controlsRaw->geometryValue()
-		) | rpl::start_with_next([=](QRect subtitle, QRect controls) {
+		) | rpl::on_next([=](QRect subtitle, QRect controls) {
 			disabler->setGeometry(subtitle.united(controls));
 		}, disabler->lifetime());
 		disabler->showOn(state->forceDisabledMessage.value(
@@ -121,6 +126,13 @@ void PowerSavingBox(not_null<Ui::GenericBox*> box) {
 		box->closeBox();
 	});
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+
+	if (highlightWidgetRaw) {
+		box->showFinishes(
+		) | rpl::take(1) | rpl::on_next([=] {
+			HighlightWidget(highlightWidgetRaw);
+		}, box->lifetime());
+	}
 }
 
 EditFlagsDescriptor<PowerSaving::Flags> PowerSavingLabels() {
diff --git a/Telegram/SourceFiles/settings/settings_power_saving.h b/Telegram/SourceFiles/settings/settings_power_saving.h
index 22d559b568db1c..b618abe7be595c 100644
--- a/Telegram/SourceFiles/settings/settings_power_saving.h
+++ b/Telegram/SourceFiles/settings/settings_power_saving.h
@@ -19,12 +19,15 @@ using Flags = base::flags<Flag>;
 
 namespace Ui {
 class GenericBox;
+class RpWidget;
 } // namespace Ui
 
 namespace Settings {
 
-void PowerSavingBox(not_null<Ui::GenericBox*> box);
+void PowerSavingBox(
+	not_null<Ui::GenericBox*> box,
+	PowerSaving::Flags highlightFlags = PowerSaving::Flags());
 
 [[nodiscard]] EditFlagsDescriptor<PowerSaving::Flags> PowerSavingLabels();
 
-} // namespace PowerSaving
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index dc9a7bcc34864c..60a94103b5ff41 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -34,8 +34,8 @@ For license and copyright information please follow this link:
 #include "history/view/history_view_message.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "settings/settings_premium.h"
-#include "settings/settings_privacy_security.h"
+#include "settings/sections/settings_premium.h"
+#include "settings/sections/settings_privacy_security.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
@@ -111,7 +111,7 @@ void BlockPeerBoxController::prepareViewHook() {
 	delegate()->peerListSetTitle(tr::lng_blocked_list_add_title());
 	session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::IsBlocked
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		if (auto row = delegate()->peerListFindRow(update.peer->id.value)) {
 			updateIsBlocked(row, update.peer);
 			delegate()->peerListUpdateRow(row);
@@ -168,6 +168,7 @@ AdminLog::OwnedItem GenerateForwardedItem(
 		MTP_int(0), // Not used (would've been trimmed to 32 bits).
 		peerToMTP(history->peer->id),
 		MTPint(), // from_boosts_applied
+		MTPstring(), // from_rank
 		peerToMTP(history->peer->id),
 		MTPPeer(), // saved_peer_id
 		MTP_messageFwdHeader(
@@ -185,6 +186,7 @@ AdminLog::OwnedItem GenerateForwardedItem(
 			MTPstring()), // psa_type
 		MTPlong(), // via_bot_id
 		MTPlong(), // via_business_bot_id
+		MTPPeer(), // guestchat_via_from
 		MTPMessageReplyHeader(),
 		MTP_int(base::unixtime::now()), // date
 		MTP_string(text),
@@ -202,7 +204,13 @@ AdminLog::OwnedItem GenerateForwardedItem(
 		MTPint(), // ttl_period
 		MTPint(), // quick_reply_shortcut_id
 		MTPlong(), // effect
-		MTPFactCheck()
+		MTPFactCheck(),
+		MTPint(), // report_delivery_until_date
+		MTPlong(), // paid_message_stars
+		MTPSuggestedPost(),
+		MTPint(), // schedule_repeat_period
+		MTPstring(), // summary_from_language
+		MTPRichMessage()
 	).match([&](const MTPDmessage &data) {
 		return history->makeMessage(
 			history->nextNonHistoryEntryId(),
@@ -346,14 +354,14 @@ void BlockedBoxController::prepare() {
 
 	session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::IsBlocked
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		handleBlockedEvent(update.peer);
 	}, lifetime());
 
 	session().api().blockedPeers().slice(
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=](const Api::BlockedPeers::Slice &result) {
+	) | rpl::on_next([=](const Api::BlockedPeers::Slice &result) {
 		setDescriptionText(tr::lng_blocked_list_about(tr::now));
 		applySlice(result);
 		loadMoreRows();
@@ -380,11 +388,13 @@ void BlockedBoxController::rowClicked(not_null<PeerListRow*> row) {
 	});
 }
 
-void BlockedBoxController::rowRightActionClicked(not_null<PeerListRow*> row) {
+void BlockedBoxController::rowRightActionClicked(
+		not_null<PeerListRow*> row) {
 	session().api().blockedPeers().unblock(row->peer());
 }
 
-void BlockedBoxController::applySlice(const Api::BlockedPeers::Slice &slice) {
+void BlockedBoxController::applySlice(
+		const Api::BlockedPeers::Slice &slice) {
 	if (slice.list.empty()) {
 		_allLoaded = true;
 	}
@@ -487,7 +497,8 @@ rpl::producer<QString> PhoneNumberPrivacyController::title() const {
 	return tr::lng_edit_privacy_phone_number_title();
 }
 
-rpl::producer<QString> PhoneNumberPrivacyController::optionsTitleKey() const {
+auto PhoneNumberPrivacyController::optionsTitleKey() const
+-> rpl::producer<QString> {
 	return tr::lng_edit_privacy_phone_number_header();
 }
 
@@ -502,7 +513,7 @@ auto PhoneNumberPrivacyController::warning() const
 	) | rpl::map([=](bool onlyContactsSee) {
 		return onlyContactsSee
 			? tr::lng_edit_privacy_phone_number_contacts(
-				Ui::Text::WithEntities)
+				tr::marked)
 			: rpl::combine(
 				tr::lng_edit_privacy_phone_number_warning(),
 				tr::lng_username_link()
@@ -511,7 +522,7 @@ auto PhoneNumberPrivacyController::warning() const
 					warning + "\n\n" + added + "\n",
 				};
 				const auto link = PublicLinkByPhone(self);
-				return base.append(Ui::Text::Link(link, link));
+				return base.append(tr::link(link, link));
 			});
 	}) | rpl::flatten_latest();
 }
@@ -521,8 +532,11 @@ void PhoneNumberPrivacyController::prepareWarningLabel(
 	warning->overrideLinkClickHandler([=] {
 		QGuiApplication::clipboard()->setText(PublicLinkByPhone(
 			_controller->session().user()));
-		_controller->window().showToast(
-			tr::lng_username_copied(tr::now));
+		_controller->window().showToast({
+			.text = { tr::lng_username_copied(tr::now) },
+			.iconLottie = u"toast/voip_invite"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	});
 }
 
@@ -581,7 +595,7 @@ object_ptr<Ui::RpWidget> PhoneNumberPrivacyController::setupMiddleWidget(
 		key
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=](const PrivacyRule &value) {
+	) | rpl::on_next([=](const PrivacyRule &value) {
 		group->setValue(value.option);
 	}, widget->lifetime());
 
@@ -611,8 +625,8 @@ object_ptr<Ui::RpWidget> PhoneNumberPrivacyController::setupMiddleWidget(
 }
 
 void PhoneNumberPrivacyController::saveAdditional() {
-	if (_saveAdditional) {
-		_saveAdditional();
+	if (const auto onstack = _saveAdditional) {
+		onstack();
 	}
 }
 
@@ -635,7 +649,7 @@ rpl::producer<QString> LastSeenPrivacyController::optionsTitleKey() const {
 
 auto LastSeenPrivacyController::warning() const
 -> rpl::producer<TextWithEntities> {
-	return tr::lng_edit_privacy_lastseen_warning(Ui::Text::WithEntities);
+	return tr::lng_edit_privacy_lastseen_warning(tr::marked);
 }
 
 rpl::producer<QString> LastSeenPrivacyController::exceptionButtonTextKey(
@@ -684,12 +698,14 @@ object_ptr<Ui::RpWidget> LastSeenPrivacyController::setupBelowWidget(
 	Ui::AddSkip(content);
 
 	const auto privacy = &controller->session().api().globalPrivacy();
-	content->add(object_ptr<Ui::SettingsButton>(
+	const auto hideReadTimeButton = content->add(object_ptr<Ui::SettingsButton>(
 		content,
 		tr::lng_edit_lastseen_hide_read_time(),
 		st::settingsButtonNoIcon
-	))->toggleOn(privacy->hideReadTime())->toggledValue(
-	) | rpl::start_with_next([=](bool value) {
+	));
+	_hideReadTimeButton = hideReadTimeButton;
+	hideReadTimeButton->toggleOn(privacy->hideReadTime())->toggledValue(
+	) | rpl::on_next([=](bool value) {
 		_hideReadTime = value;
 	}, content->lifetime());
 
@@ -731,7 +747,9 @@ void LastSeenPrivacyController::handleExceptionsChange(
 void LastSeenPrivacyController::confirmSave(
 		bool someAreDisallowed,
 		Fn<void()> saveCallback) {
-	if (someAreDisallowed && !Core::App().settings().lastSeenWarningSeen()) {
+	if (someAreDisallowed
+		&& !_session->premium()
+		&& !Core::App().settings().lastSeenWarningSeen()) {
 		auto callback = [
 			=,
 			saveCallback = std::move(saveCallback)
@@ -763,6 +781,13 @@ void LastSeenPrivacyController::saveAdditional() {
 	}
 }
 
+void LastSeenPrivacyController::checkHighlightControls(
+		not_null<Window::SessionController*> controller) {
+	controller->checkHighlightControl(
+		u"privacy/hide-read-time"_q,
+		_hideReadTimeButton.data());
+}
+
 UserPrivacy::Key GroupsInvitePrivacyController::key() const {
 	return Key::Invites;
 }
@@ -776,11 +801,14 @@ rpl::producer<QString> GroupsInvitePrivacyController::optionsTitleKey(
 	return tr::lng_edit_privacy_groups_header();
 }
 
-rpl::producer<QString> GroupsInvitePrivacyController::exceptionButtonTextKey(
-		Exception exception) const {
+auto GroupsInvitePrivacyController::exceptionButtonTextKey(
+	Exception exception) const
+-> rpl::producer<QString> {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_groups_always_empty();
-	case Exception::Never: return tr::lng_edit_privacy_groups_never_empty();
+	case Exception::Always:
+		return tr::lng_edit_privacy_groups_always_empty();
+	case Exception::Never:
+		return tr::lng_edit_privacy_groups_never_empty();
 	}
 	Unexpected("Invalid exception value.");
 }
@@ -788,8 +816,10 @@ rpl::producer<QString> GroupsInvitePrivacyController::exceptionButtonTextKey(
 rpl::producer<QString> GroupsInvitePrivacyController::exceptionBoxTitle(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_groups_always_title();
-	case Exception::Never: return tr::lng_edit_privacy_groups_never_title();
+	case Exception::Always:
+		return tr::lng_edit_privacy_groups_always_title();
+	case Exception::Never:
+		return tr::lng_edit_privacy_groups_never_title();
 	}
 	Unexpected("Invalid exception value.");
 }
@@ -819,8 +849,10 @@ rpl::producer<QString> CallsPrivacyController::optionsTitleKey() const {
 rpl::producer<QString> CallsPrivacyController::exceptionButtonTextKey(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_calls_always_empty();
-	case Exception::Never: return tr::lng_edit_privacy_calls_never_empty();
+	case Exception::Always:
+		return tr::lng_edit_privacy_calls_always_empty();
+	case Exception::Never:
+		return tr::lng_edit_privacy_calls_never_empty();
 	}
 	Unexpected("Invalid exception value.");
 }
@@ -828,7 +860,8 @@ rpl::producer<QString> CallsPrivacyController::exceptionButtonTextKey(
 rpl::producer<QString> CallsPrivacyController::exceptionBoxTitle(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_calls_always_title();
+	case Exception::Always:
+		return tr::lng_edit_privacy_calls_always_title();
 	case Exception::Never: return tr::lng_edit_privacy_calls_never_title();
 	}
 	Unexpected("Invalid exception value.");
@@ -871,7 +904,8 @@ rpl::producer<QString> CallsPeer2PeerPrivacyController::title() const {
 	return tr::lng_edit_privacy_calls_p2p_title();
 }
 
-rpl::producer<QString> CallsPeer2PeerPrivacyController::optionsTitleKey() const {
+auto CallsPeer2PeerPrivacyController::optionsTitleKey() const
+-> rpl::producer<QString> {
 	return tr::lng_edit_privacy_calls_p2p_header();
 }
 
@@ -892,11 +926,12 @@ QString CallsPeer2PeerPrivacyController::optionLabel(
 
 auto CallsPeer2PeerPrivacyController::warning() const
 -> rpl::producer<TextWithEntities> {
-	return tr::lng_settings_peer_to_peer_about(Ui::Text::WithEntities);
+	return tr::lng_settings_peer_to_peer_about(tr::marked);
 }
 
-rpl::producer<QString> CallsPeer2PeerPrivacyController::exceptionButtonTextKey(
-		Exception exception) const {
+auto CallsPeer2PeerPrivacyController::exceptionButtonTextKey(
+	Exception exception) const
+-> rpl::producer<QString> {
 	switch (exception) {
 	case Exception::Always: {
 		return tr::lng_edit_privacy_calls_p2p_always_empty();
@@ -950,7 +985,7 @@ rpl::producer<QString> ForwardsPrivacyController::optionsTitleKey() const {
 
 auto ForwardsPrivacyController::warning() const
 -> rpl::producer<TextWithEntities> {
-	return tr::lng_edit_privacy_forwards_warning(Ui::Text::WithEntities);
+	return tr::lng_edit_privacy_forwards_warning(tr::marked);
 }
 
 rpl::producer<QString> ForwardsPrivacyController::exceptionButtonTextKey(
@@ -1019,7 +1054,7 @@ object_ptr<Ui::RpWidget> ForwardsPrivacyController::setupAboveWidget(
 	state->item = std::move(message);
 	state->tooltip = base::make_unique_q<Ui::RpWidget>(outerContainer);
 	state->tooltip->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (state->info.paint) {
 			auto p = QPainter(state->tooltip.get());
 			state->info.paint(p);
@@ -1061,7 +1096,7 @@ object_ptr<Ui::RpWidget> ForwardsPrivacyController::setupAboveWidget(
 	widget->widthValue(
 	) | rpl::filter(
 		_1 >= (st::historyMinimalWidth / 2)
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto height = view->resizeGetHeight(width);
 		const auto top = view->marginTop();
 		const auto bottom = view->marginBottom();
@@ -1072,7 +1107,7 @@ object_ptr<Ui::RpWidget> ForwardsPrivacyController::setupAboveWidget(
 	rpl::combine(
 		widget->widthValue(),
 		std::move(optionValue)
-	) | rpl::start_with_next([=](int width, Option value) {
+	) | rpl::on_next([=](int width, Option value) {
 		state->info = PrepareForwardedTooltip(view, value);
 		state->tooltip->resize(state->info.geometry.size());
 		state->refreshGeometry();
@@ -1080,7 +1115,7 @@ object_ptr<Ui::RpWidget> ForwardsPrivacyController::setupAboveWidget(
 	}, state->tooltip->lifetime());
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		// #TODO themes
 		Window::SectionWidget::PaintBackground(
 			controller,
@@ -1094,6 +1129,7 @@ object_ptr<Ui::RpWidget> ForwardsPrivacyController::setupAboveWidget(
 			_chatStyle.get(),
 			widget->rect(),
 			widget->rect(),
+			widget->rect(),
 			controller->isGifPausedAtLeastFor(
 				Window::GifPauseReason::Layer));
 		p.translate(padding / 2, padding + view->marginBottom());
@@ -1121,7 +1157,8 @@ rpl::producer<QString> ProfilePhotoPrivacyController::title() const {
 	return tr::lng_edit_privacy_profile_photo_title();
 }
 
-rpl::producer<QString> ProfilePhotoPrivacyController::optionsTitleKey() const {
+auto ProfilePhotoPrivacyController::optionsTitleKey() const
+-> rpl::producer<QString> {
 	return tr::lng_edit_privacy_profile_photo_header();
 }
 
@@ -1180,6 +1217,7 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupMiddleWidget(
 		state->setUserpicButtonText.value(),
 		st::settingsButtonLight,
 		{ &st::menuBlueIconPhotoSet });
+	_setPublicButton = setUserpicButton;
 	const auto &stRemoveButton = st::settingsAttentionButtonWithIcon;
 	const auto removeButton = container->add(
 		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
@@ -1188,6 +1226,7 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupMiddleWidget(
 				parent,
 				tr::lng_edit_privacy_profile_photo_public_remove(),
 				stRemoveButton)));
+	_removePublicButton = removeButton->entity();
 	Ui::AddSkip(container);
 	Ui::AddDividerText(
 		container,
@@ -1197,7 +1236,7 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupMiddleWidget(
 		removeButton->entity());
 	userpic->resize(state->userpicSize);
 	userpic->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(userpic);
 		p.fillRect(r, Qt::transparent);
 		if (!state->localPhoto.isNull()) {
@@ -1207,7 +1246,7 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupMiddleWidget(
 		}
 	}, userpic->lifetime());
 	removeButton->entity()->heightValue(
-	) | rpl::start_with_next([=,
+	) | rpl::on_next([=,
 			left = stRemoveButton.iconLeft,
 			width = st::menuBlueIconPhotoSet.width()](int height) {
 		userpic->moveToLeft(
@@ -1221,7 +1260,7 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupMiddleWidget(
 
 	(
 		PrepareShortInfoFallbackUserpic(self, st::shortInfoCover).value
-	) | rpl::start_with_next([=](PeerShortInfoUserpic info) {
+	) | rpl::on_next([=](PeerShortInfoUserpic info) {
 		state->updatePhoto(base::take(info.photo), false);
 		userpic->update();
 	}, userpic->lifetime());
@@ -1234,7 +1273,8 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupMiddleWidget(
 					container,
 					&controller->window(),
 					{
-						.confirm = tr::lng_profile_set_photo_button(tr::now),
+						.confirm = tr::lng_profile_set_photo_button(
+							tr::now),
 						.cropType = EditorData::CropType::Ellipse,
 						.keepAspectRatio = true,
 					},
@@ -1278,13 +1318,27 @@ object_ptr<Ui::RpWidget> ProfilePhotoPrivacyController::setupMiddleWidget(
 }
 
 void ProfilePhotoPrivacyController::saveAdditional() {
-	if (_saveAdditional) {
-		_saveAdditional();
+	if (const auto onstack = _saveAdditional) {
+		onstack();
 	}
 }
 
-rpl::producer<QString> ProfilePhotoPrivacyController::exceptionButtonTextKey(
-		Exception exception) const {
+void ProfilePhotoPrivacyController::checkHighlightControls(
+		not_null<Window::SessionController*> controller) {
+	controller->checkHighlightControl(
+		u"privacy/set-public"_q,
+		_setPublicButton.data());
+	controller->checkHighlightControl(
+		u"privacy/update-public"_q,
+		_setPublicButton.data());
+	controller->checkHighlightControl(
+		u"privacy/remove-public"_q,
+		_removePublicButton.data());
+}
+
+auto ProfilePhotoPrivacyController::exceptionButtonTextKey(
+	Exception exception) const
+-> rpl::producer<QString> {
 	switch (exception) {
 	case Exception::Always: {
 		return tr::lng_edit_privacy_profile_photo_always_empty();
@@ -1339,7 +1393,7 @@ VoicesPrivacyController::VoicesPrivacyController(
 		not_null<::Main::Session*> session) {
 	Data::AmPremiumValue(
 		session
-	) | rpl::start_with_next([=](bool premium) {
+	) | rpl::on_next([=](bool premium) {
 		if (!premium) {
 			if (const auto box = view()) {
 				box->closeBox();
@@ -1363,8 +1417,10 @@ rpl::producer<QString> VoicesPrivacyController::optionsTitleKey() const {
 rpl::producer<QString> VoicesPrivacyController::exceptionButtonTextKey(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_voices_always_empty();
-	case Exception::Never: return tr::lng_edit_privacy_voices_never_empty();
+	case Exception::Always:
+		return tr::lng_edit_privacy_voices_always_empty();
+	case Exception::Never:
+		return tr::lng_edit_privacy_voices_never_empty();
 	}
 	Unexpected("Invalid exception value.");
 }
@@ -1372,7 +1428,8 @@ rpl::producer<QString> VoicesPrivacyController::exceptionButtonTextKey(
 rpl::producer<QString> VoicesPrivacyController::exceptionBoxTitle(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_voices_always_title();
+	case Exception::Always:
+		return tr::lng_edit_privacy_voices_always_title();
 	case Exception::Never: return tr::lng_edit_privacy_voices_never_title();
 	}
 	Unexpected("Invalid exception value.");
@@ -1422,15 +1479,15 @@ Fn<void()> VoicesPrivacyController::premiumClickedCallback(
 		return nullptr;
 	}
 	const auto showToast = [=] {
-		auto link = Ui::Text::Link(
-			Ui::Text::Semibold(
+		auto link = tr::link(
+			tr::semibold(
 				tr::lng_settings_privacy_premium_link(tr::now)));
 		_toastInstance = controller->showToast({
 			.text = tr::lng_settings_privacy_premium(
 				tr::now,
 				lt_link,
 				link,
-				Ui::Text::WithEntities),
+				tr::marked),
 			.filter = crl::guard(&controller->session(), [=](
 					const ClickHandlerPtr &,
 					Qt::MouseButton button) {
@@ -1468,7 +1525,8 @@ rpl::producer<QString> AboutPrivacyController::optionsTitleKey() const {
 rpl::producer<QString> AboutPrivacyController::exceptionButtonTextKey(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_about_always_empty();
+	case Exception::Always:
+		return tr::lng_edit_privacy_about_always_empty();
 	case Exception::Never: return tr::lng_edit_privacy_about_never_empty();
 	}
 	Unexpected("Invalid exception value.");
@@ -1477,7 +1535,8 @@ rpl::producer<QString> AboutPrivacyController::exceptionButtonTextKey(
 rpl::producer<QString> AboutPrivacyController::exceptionBoxTitle(
 		Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_about_always_title();
+	case Exception::Always:
+		return tr::lng_edit_privacy_about_always_title();
 	case Exception::Never: return tr::lng_edit_privacy_about_never_title();
 	}
 	Unexpected("Invalid exception value.");
@@ -1485,7 +1544,7 @@ rpl::producer<QString> AboutPrivacyController::exceptionBoxTitle(
 
 auto AboutPrivacyController::exceptionsDescription() const
 -> rpl::producer<QString> {
-	return tr::lng_edit_privacy_birthday_exceptions();
+	return tr::lng_edit_privacy_about_exceptions();
 }
 
 UserPrivacy::Key BirthdayPrivacyController::key() const {
@@ -1503,8 +1562,10 @@ rpl::producer<QString> BirthdayPrivacyController::optionsTitleKey() const {
 rpl::producer<QString> BirthdayPrivacyController::exceptionButtonTextKey(
 	Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_birthday_always_empty();
-	case Exception::Never: return tr::lng_edit_privacy_birthday_never_empty();
+	case Exception::Always:
+		return tr::lng_edit_privacy_birthday_always_empty();
+	case Exception::Never:
+		return tr::lng_edit_privacy_birthday_never_empty();
 	}
 	Unexpected("Invalid exception value.");
 }
@@ -1512,8 +1573,10 @@ rpl::producer<QString> BirthdayPrivacyController::exceptionButtonTextKey(
 rpl::producer<QString> BirthdayPrivacyController::exceptionBoxTitle(
 	Exception exception) const {
 	switch (exception) {
-	case Exception::Always: return tr::lng_edit_privacy_birthday_always_title();
-	case Exception::Never: return tr::lng_edit_privacy_birthday_never_title();
+	case Exception::Always:
+		return tr::lng_edit_privacy_birthday_always_title();
+	case Exception::Never:
+		return tr::lng_edit_privacy_birthday_never_title();
 	}
 	Unexpected("Invalid exception value.");
 }
@@ -1539,8 +1602,8 @@ object_ptr<Ui::RpWidget> BirthdayPrivacyController::setupAboveWidget(
 				tr::lng_edit_privacy_birthday_yet(
 					lt_link,
 					tr::lng_edit_privacy_birthday_yet_link(
-					) | Ui::Text::ToLink("internal:edit_birthday"),
-					Ui::Text::WithEntities),
+						tr::url(u"internal:edit_birthday"_q)),
+					tr::marked),
 				st::boxDividerLabel),
 			st::defaultBoxDividerLabelPadding));
 	result->toggleOn(session->changes().peerFlagsValue(
@@ -1553,4 +1616,250 @@ object_ptr<Ui::RpWidget> BirthdayPrivacyController::setupAboveWidget(
 	return result;
 }
 
+struct GiftsAutoSavePrivacyController::AdditionalState {
+	Api::DisallowedGiftTypes disallowed;
+	rpl::event_stream<> disables;
+	Fn<void()> promo;
+	Fn<void()> save;
+};
+
+UserPrivacy::Key GiftsAutoSavePrivacyController::key() const {
+	return Key::GiftsAutoSave;
+}
+
+rpl::producer<QString> GiftsAutoSavePrivacyController::title() const {
+	return tr::lng_edit_privacy_gifts_title();
+}
+
+auto GiftsAutoSavePrivacyController::optionsTitleKey() const
+-> rpl::producer<QString> {
+	return tr::lng_edit_privacy_gifts_header();
+}
+
+auto GiftsAutoSavePrivacyController::exceptionButtonTextKey(
+	Exception exception) const
+-> rpl::producer<QString> {
+	switch (exception) {
+	case Exception::Always:
+		return tr::lng_edit_privacy_gifts_always_empty();
+	case Exception::Never:
+		return tr::lng_edit_privacy_gifts_never_empty();
+	}
+	Unexpected("Invalid exception value.");
+}
+
+rpl::producer<QString> GiftsAutoSavePrivacyController::exceptionBoxTitle(
+		Exception exception) const {
+	switch (exception) {
+	case Exception::Always:
+		return tr::lng_edit_privacy_gifts_always_title();
+	case Exception::Never: return tr::lng_edit_privacy_gifts_never_title();
+	}
+	Unexpected("Invalid exception value.");
+}
+
+auto GiftsAutoSavePrivacyController::exceptionsDescription() const
+-> rpl::producer<QString> {
+	return tr::lng_edit_privacy_lastseen_exceptions();
+}
+
+bool GiftsAutoSavePrivacyController::allowMiniAppsToggle(
+		Exception exception) const {
+	return true;
+}
+
+void GiftsAutoSavePrivacyController::ensureAdditionalState(
+		not_null<Window::SessionController*> controller,
+		rpl::lifetime &on) {
+	if (_state) {
+		return;
+	}
+	const auto session = &controller->session();
+	const auto globalPrivacy = &session->api().globalPrivacy();
+
+	_state = on.make_state<AdditionalState>();
+	_state->disallowed = globalPrivacy->disallowedGiftTypesCurrent();
+	_state->promo = [=] {
+		_state->disables.fire({});
+		const auto link = tr::bold(
+			tr::lng_settings_generic_subscribe_link(tr::now));
+		Settings::ShowPremiumPromoToast(
+			controller->uiShow(),
+			tr::lng_settings_generic_subscribe(
+				tr::now,
+				lt_link,
+				tr::link(link),
+				tr::marked),
+			u"gifts_privacy"_q);
+	};
+	_state->save = [=] {
+		const auto now = _state->disallowed;
+		if (!session->premium()) {
+			return;
+		} else if (globalPrivacy->disallowedGiftTypesCurrent() == now) {
+			return;
+		} else {
+			globalPrivacy->updateDisallowedGiftTypes(now);
+		}
+	};
+}
+
+object_ptr<Ui::RpWidget> GiftsAutoSavePrivacyController::setupAboveWidget(
+		not_null<Window::SessionController*> controller,
+		not_null<QWidget*> parent,
+		rpl::producer<Option> optionValue,
+		not_null<QWidget*> outerContainer) {
+	auto result = object_ptr<Ui::VerticalLayout>(parent);
+	const auto content = result.data();
+
+	ensureAdditionalState(controller, content->lifetime());
+	using Type = Api::DisallowedGiftType;
+
+	const auto session = &controller->session();
+	const auto icon = content->add(object_ptr<Ui::SettingsButton>(
+		content,
+		tr::lng_edit_privacy_gifts_show_icon(),
+		st::settingsButtonNoIconLocked));
+	_showIconButton = icon;
+	icon->toggleOn(rpl::single(
+		session->premium() && (_state->disallowed & Type::SendHide)
+	) | rpl::then(_state->disables.events() | rpl::map([=] {
+		return false;
+	})));
+	Data::AmPremiumValue(session) | rpl::on_next([=](bool value) {
+		icon->setToggleLocked(!value);
+		if (!value) {
+			_state->disables.fire({});
+		}
+	}, icon->lifetime());
+	icon->toggledValue() | rpl::on_next([=](bool enable) {
+		if (!enable) {
+			_state->disallowed &= ~Type::SendHide;
+		} else if (!session->premium()) {
+			_state->promo();
+		} else {
+			_state->disallowed |= Type::SendHide;
+		}
+	}, icon->lifetime());
+	Ui::AddSkip(content);
+	Ui::AddDividerText(
+		content,
+		tr::lng_edit_privacy_gifts_show_icon_about(
+			lt_emoji,
+			rpl::single(Ui::Text::IconEmoji(&st::settingsGiftIconEmoji)),
+			tr::marked));
+
+	return result;
+}
+
+object_ptr<Ui::RpWidget> GiftsAutoSavePrivacyController::setupBelowWidget(
+		not_null<Window::SessionController*> controller,
+		not_null<QWidget*> parent,
+		rpl::producer<Option> option) {
+	auto result = object_ptr<Ui::VerticalLayout>(parent);
+	const auto content = result.data();
+
+	ensureAdditionalState(controller, content->lifetime());
+	using Type = Api::DisallowedGiftType;
+
+	const auto session = &controller->session();
+	auto premium = Data::AmPremiumValue(session);
+
+	Ui::AddSkip(content, st::settingsPeerToPeerSkip);
+	const auto typesTitle = Ui::AddSubsectionTitle(
+		content,
+		tr::lng_edit_privacy_gifts_types());
+	_acceptedTypesTitle = typesTitle;
+	const auto types = base::flat_map<Type, rpl::producer<QString>>{
+		{ Type::Limited, tr::lng_edit_privacy_gifts_limited() },
+		{ Type::Unlimited, tr::lng_edit_privacy_gifts_unlimited() },
+		{ Type::Unique, tr::lng_edit_privacy_gifts_unique() },
+		{ Type::FromChannels, tr::lng_edit_privacy_gifts_channels() },
+		{ Type::Premium, tr::lng_edit_privacy_gifts_premium() },
+	};
+	for (const auto &[type, title] : types) {
+		const auto button = content->add(object_ptr<Ui::SettingsButton>(
+			content,
+			rpl::duplicate(title),
+			st::settingsButtonNoIconLocked));
+		button->toggleOn(rpl::single(
+			!session->premium() || !(_state->disallowed & type)
+		) | rpl::then(_state->disables.events() | rpl::map([=] {
+			return true;
+		})));
+		rpl::duplicate(premium) | rpl::on_next([=](bool value) {
+			button->setToggleLocked(!value);
+		}, button->lifetime());
+		button->toggledValue() | rpl::on_next([=](bool enable) {
+			if (enable) {
+				_state->disallowed &= ~type;
+			} else if (!session->premium()) {
+				_state->promo();
+			} else {
+				_state->disallowed |= type;
+			}
+		}, button->lifetime());
+	}
+	Ui::AddSkip(content);
+	Ui::AddDividerText(content, tr::lng_edit_privacy_gifts_types_about());
+
+	return result;
+}
+
+void GiftsAutoSavePrivacyController::saveAdditional() {
+	if (const auto onstack = _state->save) {
+		onstack();
+	}
+}
+
+void GiftsAutoSavePrivacyController::checkHighlightControls(
+		not_null<Window::SessionController*> controller) {
+	controller->checkHighlightControl(
+		u"privacy/show-icon"_q,
+		_showIconButton.data());
+	controller->checkHighlightControl(
+		u"privacy/accepted-types"_q,
+		_acceptedTypesTitle.data(),
+		SubsectionTitleHighlight());
+}
+
+UserPrivacy::Key SavedMusicPrivacyController::key() const {
+	return Key::SavedMusic;
+}
+
+rpl::producer<QString> SavedMusicPrivacyController::title() const {
+	return tr::lng_edit_privacy_saved_music_title();
+}
+
+rpl::producer<QString> SavedMusicPrivacyController::optionsTitleKey() const {
+	return tr::lng_edit_privacy_saved_music_header();
+}
+
+rpl::producer<QString> SavedMusicPrivacyController::exceptionButtonTextKey(
+		Exception exception) const {
+	switch (exception) {
+	case Exception::Always:
+		return tr::lng_edit_privacy_saved_music_always_empty();
+	case Exception::Never:
+		return tr::lng_edit_privacy_saved_music_never_empty();
+	}
+	Unexpected("Invalid exception value.");
+}
+
+rpl::producer<QString> SavedMusicPrivacyController::exceptionBoxTitle(
+		Exception exception) const {
+	switch (exception) {
+	case Exception::Always:
+		return tr::lng_edit_privacy_saved_music_always_title();
+	case Exception::Never:
+		return tr::lng_edit_privacy_saved_music_never_title();
+	}
+	Unexpected("Invalid exception value.");
+}
+
+auto SavedMusicPrivacyController::exceptionsDescription() const
+-> rpl::producer<QString> {
+	return tr::lng_edit_privacy_saved_music_exceptions();
+}
+
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.h b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
index d058649d25e8e8..57ad9a89f78815 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.h
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
@@ -127,11 +127,15 @@ class LastSeenPrivacyController final : public EditPrivacyController {
 
 	void saveAdditional() override;
 
+	void checkHighlightControls(
+		not_null<Window::SessionController*> controller) override;
+
 private:
 	const not_null<::Main::Session*> _session;
 	rpl::variable<Option> _option;
 	rpl::variable<int> _exceptionsNever;
 	bool _hideReadTime = false;
+	QPointer<QWidget> _hideReadTimeButton;
 
 };
 
@@ -194,7 +198,7 @@ class CallsPeer2PeerPrivacyController final : public EditPrivacyController {
 
 };
 
-class ForwardsPrivacyController
+class ForwardsPrivacyController final
 	: public EditPrivacyController
 	, private HistoryView::SimpleElementDelegate {
 public:
@@ -263,10 +267,15 @@ class ProfilePhotoPrivacyController final : public EditPrivacyController {
 
 	void saveAdditional() override;
 
+	void checkHighlightControls(
+		not_null<Window::SessionController*> controller) override;
+
 private:
 	Fn<void()> _saveAdditional;
 	rpl::variable<Option> _option;
 	rpl::variable<int> _exceptionsNever;
+	QPointer<QWidget> _setPublicButton;
+	QPointer<QWidget> _removePublicButton;
 
 };
 
@@ -317,7 +326,30 @@ class AboutPrivacyController final : public EditPrivacyController {
 
 };
 
-class BirthdayPrivacyController final : public EditPrivacyController {
+class BirthdayPrivacyController : public EditPrivacyController {
+public:
+	using Option = EditPrivacyBox::Option;
+	using Exception = EditPrivacyBox::Exception;
+
+	Key key() const override;
+
+	rpl::producer<QString> title() const override;
+	rpl::producer<QString> optionsTitleKey() const override;
+	rpl::producer<QString> exceptionButtonTextKey(
+		Exception exception) const override;
+	rpl::producer<QString> exceptionBoxTitle(
+		Exception exception) const override;
+	rpl::producer<QString> exceptionsDescription() const override;
+
+	object_ptr<Ui::RpWidget> setupAboveWidget(
+		not_null<Window::SessionController*> controller,
+		not_null<QWidget*> parent,
+		rpl::producer<Option> optionValue,
+		not_null<QWidget*> outerContainer) override;
+
+};
+
+class GiftsAutoSavePrivacyController final : public EditPrivacyController {
 public:
 	using Option = EditPrivacyBox::Option;
 	using Exception = EditPrivacyBox::Exception;
@@ -331,12 +363,50 @@ class BirthdayPrivacyController final : public EditPrivacyController {
 	rpl::producer<QString> exceptionBoxTitle(
 		Exception exception) const override;
 	rpl::producer<QString> exceptionsDescription() const override;
+	bool allowMiniAppsToggle(Exception exception) const override;
 
 	object_ptr<Ui::RpWidget> setupAboveWidget(
 		not_null<Window::SessionController*> controller,
 		not_null<QWidget*> parent,
 		rpl::producer<Option> optionValue,
 		not_null<QWidget*> outerContainer) override;
+	object_ptr<Ui::RpWidget> setupBelowWidget(
+		not_null<Window::SessionController*> controller,
+		not_null<QWidget*> parent,
+		rpl::producer<Option> option) override;
+
+	void saveAdditional() override;
+
+	void checkHighlightControls(
+		not_null<Window::SessionController*> controller) override;
+
+private:
+	struct AdditionalState;
+
+	void ensureAdditionalState(
+		not_null<Window::SessionController*> controller,
+		rpl::lifetime &on);
+
+	AdditionalState *_state = nullptr;
+	QPointer<QWidget> _showIconButton;
+	QPointer<QWidget> _acceptedTypesTitle;
+
+};
+
+class SavedMusicPrivacyController final : public EditPrivacyController {
+public:
+	using Option = EditPrivacyBox::Option;
+	using Exception = EditPrivacyBox::Exception;
+
+	Key key() const override;
+
+	rpl::producer<QString> title() const override;
+	rpl::producer<QString> optionsTitleKey() const override;
+	rpl::producer<QString> exceptionButtonTextKey(
+		Exception exception) const override;
+	rpl::producer<QString> exceptionBoxTitle(
+		Exception exception) const override;
+	rpl::producer<QString> exceptionsDescription() const override;
 
 };
 
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
deleted file mode 100644
index f71134c3c5a928..00000000000000
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ /dev/null
@@ -1,1110 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "settings/settings_privacy_security.h"
-
-#include "api/api_authorizations.h"
-#include "api/api_cloud_password.h"
-#include "api/api_self_destruct.h"
-#include "api/api_sensitive_content.h"
-#include "api/api_global_privacy.h"
-#include "api/api_websites.h"
-#include "settings/cloud_password/settings_cloud_password_email_confirm.h"
-#include "settings/cloud_password/settings_cloud_password_input.h"
-#include "settings/cloud_password/settings_cloud_password_start.h"
-#include "settings/settings_blocked_peers.h"
-#include "settings/settings_global_ttl.h"
-#include "settings/settings_local_passcode.h"
-#include "settings/settings_premium.h" // Settings::ShowPremium.
-#include "settings/settings_privacy_controllers.h"
-#include "settings/settings_websites.h"
-#include "base/system_unlock.h"
-#include "base/timer_rpl.h"
-#include "boxes/passcode_box.h"
-#include "boxes/sessions_box.h"
-#include "ui/boxes/confirm_box.h"
-#include "boxes/self_destruction_box.h"
-#include "core/application.h"
-#include "core/core_settings.h"
-#include "ui/chat/chat_style.h"
-#include "ui/effects/premium_graphics.h"
-#include "ui/effects/premium_top_bar.h"
-#include "ui/text/format_values.h"
-#include "ui/text/text_utilities.h"
-#include "ui/toast/toast.h"
-#include "ui/wrap/slide_wrap.h"
-#include "ui/wrap/fade_wrap.h"
-#include "ui/widgets/fields/input_field.h"
-#include "ui/widgets/shadow.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/vertical_list.h"
-#include "ui/rect.h"
-#include "calls/calls_instance.h"
-#include "core/update_checker.h"
-#include "lang/lang_keys.h"
-#include "data/components/top_peers.h"
-#include "data/data_session.h"
-#include "data/data_chat.h"
-#include "data/data_channel.h"
-#include "data/data_peer_values.h"
-#include "main/main_app_config.h"
-#include "main/main_domain.h"
-#include "main/main_session.h"
-#include "storage/storage_domain.h"
-#include "window/window_session_controller.h"
-#include "apiwrap.h"
-#include "styles/style_settings.h"
-#include "styles/style_menu_icons.h"
-#include "styles/style_layers.h"
-
-#include <QtGui/QGuiApplication>
-#include <QtSvg/QSvgRenderer>
-
-namespace Settings {
-namespace {
-
-constexpr auto kUpdateTimeout = 60 * crl::time(1000);
-
-using Privacy = Api::UserPrivacy;
-
-[[nodiscard]] QImage PremiumStar() {
-	const auto factor = style::DevicePixelRatio();
-	const auto size = Size(st::settingsButtonNoIcon.style.font->ascent);
-	auto image = QImage(
-		size * factor,
-		QImage::Format_ARGB32_Premultiplied);
-	image.setDevicePixelRatio(factor);
-	image.fill(Qt::transparent);
-	{
-		auto p = QPainter(&image);
-		auto star = QSvgRenderer(
-			Ui::Premium::ColorizedSvg(Ui::Premium::ButtonGradientStops()));
-		star.render(&p, Rect(size));
-	}
-	return image;
-}
-
-void AddPremiumStar(
-		not_null<Ui::SettingsButton*> button,
-		not_null<Main::Session*> session,
-		rpl::producer<QString> label,
-		const QMargins &padding) {
-	const auto badge = Ui::CreateChild<Ui::RpWidget>(button.get());
-	badge->showOn(Data::AmPremiumValue(session));
-	const auto sampleLeft = st::settingsColorSamplePadding.left();
-	const auto badgeLeft = padding.left() + sampleLeft;
-
-	auto star = PremiumStar();
-	badge->resize(star.size() / style::DevicePixelRatio());
-	badge->paintRequest(
-	) | rpl::start_with_next([=] {
-		auto p = QPainter(badge);
-		p.drawImage(0, 0, star);
-	}, badge->lifetime());
-
-	rpl::combine(
-		button->sizeValue(),
-		std::move(label)
-	) | rpl::start_with_next([=](const QSize &s, const QString &) {
-		if (s.isNull()) {
-			return;
-		}
-		badge->moveToLeft(
-			button->fullTextWidth() + badgeLeft,
-			(s.height() - badge->height()) / 2);
-	}, badge->lifetime());
-}
-
-void OpenFileConfirmationsBox(not_null<Ui::GenericBox*> box) {
-	box->setTitle(tr::lng_settings_file_confirmations());
-
-	const auto settings = &Core::App().settings();
-	const auto &list = settings->noWarningExtensions();
-	const auto text = QStringList(begin(list), end(list)).join(' ');
-	const auto layout = box->verticalLayout();
-	const auto extensions = box->addRow(
-		object_ptr<Ui::InputField>(
-			box,
-			st::defaultInputField,
-			Ui::InputField::Mode::MultiLine,
-			tr::lng_settings_edit_extensions(),
-			TextWithTags{ text }),
-		st::boxRowPadding + QMargins(0, 0, 0, st::settingsPrivacySkip));
-	Ui::AddDividerText(layout, tr::lng_settings_edit_extensions_about());
-	Ui::AddSkip(layout);
-	const auto ip = layout->add(object_ptr<Ui::SettingsButton>(
-		box,
-		tr::lng_settings_edit_ip_confirm(),
-		st::settingsButtonNoIcon
-	))->toggleOn(rpl::single(settings->ipRevealWarning()));
-	Ui::AddSkip(layout);
-	Ui::AddDividerText(layout, tr::lng_settings_edit_ip_confirm_about());
-
-	box->setFocusCallback([=] {
-		extensions->setFocusFast();
-	});
-
-	box->addButton(tr::lng_settings_save(), [=] {
-		const auto extensionsList = extensions->getLastText()
-			.mid(0, 10240)
-			.split(' ', Qt::SkipEmptyParts)
-			.mid(0, 1024);
-		auto extensions = base::flat_set<QString>(
-			extensionsList.begin(),
-			extensionsList.end());
-		const auto ipRevealWarning = ip->toggled();
-		if (extensions != settings->noWarningExtensions()
-			|| ipRevealWarning != settings->ipRevealWarning()) {
-			settings->setNoWarningExtensions(std::move(extensions));
-			settings->setIpRevealWarning(ipRevealWarning);
-			Core::App().saveSettingsDelayed();
-		}
-		box->closeBox();
-
-	});
-	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
-}
-
-QString PrivacyBase(Privacy::Key key, const Privacy::Rule &rule) {
-	using Key = Privacy::Key;
-	using Option = Privacy::Option;
-	switch (key) {
-	case Key::CallsPeer2Peer:
-		switch (rule.option) {
-		case Option::Everyone:
-			return tr::lng_edit_privacy_calls_p2p_everyone(tr::now);
-		case Option::Contacts:
-			return tr::lng_edit_privacy_calls_p2p_contacts(tr::now);
-		case Option::Nobody:
-			return tr::lng_edit_privacy_calls_p2p_nobody(tr::now);
-		}
-		[[fallthrough]];
-	default:
-		switch (rule.option) {
-		case Option::Everyone: return tr::lng_edit_privacy_everyone(tr::now);
-		case Option::Contacts:
-			return rule.always.premiums
-				? tr::lng_edit_privacy_contacts_and_premium(tr::now)
-				: tr::lng_edit_privacy_contacts(tr::now);
-		case Option::CloseFriends:
-			return tr::lng_edit_privacy_close_friends(tr::now);
-		case Option::Nobody:
-			return rule.always.premiums
-				? tr::lng_edit_privacy_premium(tr::now)
-				: tr::lng_edit_privacy_nobody(tr::now);
-		}
-		Unexpected("Value in Privacy::Option.");
-	}
-}
-
-rpl::producer<QString> PrivacyString(
-		not_null<::Main::Session*> session,
-		Privacy::Key key) {
-	session->api().userPrivacy().reload(key);
-	return session->api().userPrivacy().value(
-		key
-	) | rpl::map([=](const Privacy::Rule &value) {
-		auto add = QStringList();
-		if (const auto never = ExceptionUsersCount(value.never.peers)) {
-			add.push_back("-" + QString::number(never));
-		}
-		if (const auto always = ExceptionUsersCount(value.always.peers)) {
-			add.push_back("+" + QString::number(always));
-		}
-		if (!add.isEmpty()) {
-			return PrivacyBase(key, value)
-				+ " (" + add.join(", ") + ")";
-		} else {
-			return PrivacyBase(key, value);
-		}
-	});
-}
-
-#if 0 // Dead code.
-void AddPremiumPrivacyButton(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		rpl::producer<QString> label,
-		Privacy::Key key,
-		Fn<std::unique_ptr<EditPrivacyController>()> controllerFactory) {
-	const auto shower = Ui::CreateChild<rpl::lifetime>(container.get());
-	const auto session = &controller->session();
-	const auto &st = st::settingsButtonNoIcon;
-	const auto button = container->add(object_ptr<Button>(
-		container,
-		rpl::duplicate(label),
-		st));
-
-	AddPremiumStar(button, session, rpl::duplicate(label), st.padding);
-
-	struct State {
-		State(QWidget *parent) : widget(parent) {
-			widget.setAttribute(Qt::WA_TransparentForMouseEvents);
-		}
-		Ui::RpWidget widget;
-	};
-	const auto state = button->lifetime().make_state<State>(button);
-	using WeakToast = base::weak_ptr<Ui::Toast::Instance>;
-	const auto toast = std::make_shared<WeakToast>();
-
-	{
-		const auto rightLabel = Ui::CreateChild<Ui::FlatLabel>(
-			button,
-			st.rightLabel);
-
-		state->widget.resize(st::settingsPremiumLock.size());
-		state->widget.paintRequest(
-		) | rpl::filter([=]() -> bool {
-			return state->widget.x();
-		}) | rpl::start_with_next([=] {
-			auto p = QPainter(&state->widget);
-			st::settingsPremiumLock.paint(p, 0, 0, state->widget.width());
-		}, state->widget.lifetime());
-
-		rpl::combine(
-			button->sizeValue(),
-			std::move(label),
-			PrivacyString(session, key),
-			Data::AmPremiumValue(session)
-		) | rpl::start_with_next([=, &st](
-				const QSize &buttonSize,
-				const QString &button,
-				const QString &text,
-				bool premium) {
-			const auto locked = !premium;
-			const auto rightSkip = st::settingsButtonRightSkip;
-			const auto lockSkip = st::settingsPremiumLockSkip;
-			const auto available = buttonSize.width()
-				- st.padding.left()
-				- st.padding.right()
-				- st.style.font->width(button)
-				- rightSkip
-				- (locked ? state->widget.width() + lockSkip : 0);
-			rightLabel->setText(text);
-			rightLabel->resizeToNaturalWidth(available);
-			rightLabel->moveToRight(
-				rightSkip,
-				st.padding.top());
-			state->widget.moveToRight(
-				rightSkip + rightLabel->width() + lockSkip,
-				(buttonSize.height() - state->widget.height()) / 2);
-			state->widget.setVisible(locked);
-		}, rightLabel->lifetime());
-		rightLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
-	}
-
-	const auto showToast = [=] {
-		auto link = Ui::Text::Link(
-			Ui::Text::Semibold(
-				tr::lng_settings_privacy_premium_link(tr::now)));
-		(*toast) = controller->showToast({
-			.text = tr::lng_settings_privacy_premium(
-				tr::now,
-				lt_link,
-				link,
-				Ui::Text::WithEntities),
-			.duration = Ui::Toast::kDefaultDuration * 2,
-			.filter = crl::guard(&controller->session(), [=](
-					const ClickHandlerPtr &,
-					Qt::MouseButton button) {
-				if (button == Qt::LeftButton) {
-					if (const auto strong = toast->get()) {
-						strong->hideAnimated();
-						(*toast) = nullptr;
-						Settings::ShowPremium(controller, QString());
-						return true;
-					}
-				}
-				return false;
-			}),
-		});
-	};
-	button->addClickHandler([=] {
-		if (!session->premium()) {
-			if (toast->empty()) {
-				showToast();
-			}
-			return;
-		}
-		*shower = session->api().userPrivacy().value(
-			key
-		) | rpl::take(
-			1
-		) | rpl::start_with_next([=](const Privacy::Rule &value) {
-			controller->show(Box<EditPrivacyBox>(
-				controller,
-				controllerFactory(),
-				value));
-		});
-	});
-}
-#endif
-
-void AddMessagesPrivacyButton(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	const auto session = &controller->session();
-	const auto privacy = &session->api().globalPrivacy();
-	auto label = rpl::conditional(
-		privacy->newRequirePremium(),
-		tr::lng_edit_privacy_contacts_and_premium(),
-		tr::lng_edit_privacy_everyone());
-	const auto &st = st::settingsButtonNoIcon;
-	const auto button = AddButtonWithLabel(
-		container,
-		tr::lng_settings_messages_privacy(),
-		rpl::duplicate(label),
-		st,
-		{});
-	button->addClickHandler([=] {
-		controller->show(Box(EditMessagesPrivacyBox, controller));
-	});
-	if (!session->appConfig().newRequirePremiumFree()) {
-		AddPremiumStar(button, session, rpl::duplicate(label), st.padding);
-	}
-}
-
-rpl::producer<int> BlockedPeersCount(not_null<::Main::Session*> session) {
-	return session->api().blockedPeers().slice(
-	) | rpl::map([](const Api::BlockedPeers::Slice &data) {
-		return data.total;
-	});
-}
-
-void SetupPrivacy(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		rpl::producer<> updateTrigger) {
-	Ui::AddSkip(container, st::settingsPrivacySkip);
-	Ui::AddSubsectionTitle(container, tr::lng_settings_privacy_title());
-
-	const auto session = &controller->session();
-
-	using Key = Privacy::Key;
-	const auto add = [&](
-			rpl::producer<QString> label,
-			Key key,
-			auto controllerFactory) {
-		return AddPrivacyButton(
-			controller,
-			container,
-			std::move(label),
-			{},
-			key,
-			controllerFactory);
-	};
-	add(
-		tr::lng_settings_phone_number_privacy(),
-		Key::PhoneNumber,
-		[=] { return std::make_unique<PhoneNumberPrivacyController>(
-			controller); });
-	add(
-		tr::lng_settings_last_seen(),
-		Key::LastSeen,
-		[=] { return std::make_unique<LastSeenPrivacyController>(session); });
-	add(
-		tr::lng_settings_profile_photo_privacy(),
-		Key::ProfilePhoto,
-		[] { return std::make_unique<ProfilePhotoPrivacyController>(); });
-	add(
-		tr::lng_settings_bio_privacy(),
-		Key::About,
-		[] { return std::make_unique<AboutPrivacyController>(); });
-	add(
-		tr::lng_settings_birthday_privacy(),
-		Key::Birthday,
-		[] { return std::make_unique<BirthdayPrivacyController>(); });
-	add(
-		tr::lng_settings_forwards_privacy(),
-		Key::Forwards,
-		[=] { return std::make_unique<ForwardsPrivacyController>(
-			controller); });
-	add(
-		tr::lng_settings_calls(),
-		Key::Calls,
-		[] { return std::make_unique<CallsPrivacyController>(); });
-	add(
-		tr::lng_settings_groups_invite(),
-		Key::Invites,
-		[] { return std::make_unique<GroupsInvitePrivacyController>(); });
-	{
-		const auto &phrase = tr::lng_settings_voices_privacy;
-		const auto &st = st::settingsButtonNoIcon;
-		auto callback = [=] {
-			return std::make_unique<VoicesPrivacyController>(session);
-		};
-		const auto voices = add(phrase(), Key::Voices, std::move(callback));
-		AddPremiumStar(voices, session, phrase(), st.padding);
-	}
-	AddMessagesPrivacyButton(controller, container);
-
-	session->api().userPrivacy().reload(Api::UserPrivacy::Key::AddedByPhone);
-
-	Ui::AddSkip(container, st::settingsPrivacySecurityPadding);
-	Ui::AddDivider(container);
-}
-
-void SetupLocalPasscode(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		Fn<void(Type)> showOther) {
-	auto has = rpl::single(rpl::empty) | rpl::then(
-		controller->session().domain().local().localPasscodeChanged()
-	) | rpl::map([=] {
-		return controller->session().domain().local().hasLocalPasscode();
-	});
-	auto label = rpl::combine(
-		tr::lng_settings_cloud_password_on(),
-		tr::lng_settings_cloud_password_off(),
-		std::move(has),
-		[](const QString &on, const QString &off, bool has) {
-			return has ? on : off;
-		});
-	AddButtonWithLabel(
-		container,
-		tr::lng_settings_passcode_title(),
-		std::move(label),
-		st::settingsButton,
-		{ &st::menuIconLock }
-	)->addClickHandler([=] {
-		if (controller->session().domain().local().hasLocalPasscode()) {
-			showOther(LocalPasscodeCheckId());
-		} else {
-			showOther(LocalPasscodeCreateId());
-		}
-	});
-}
-
-void SetupCloudPassword(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		Fn<void(Type)> showOther) {
-	using namespace rpl::mappers;
-	using State = Core::CloudPasswordState;
-
-	enum class PasswordState {
-		Loading,
-		On,
-		Off,
-		Unconfirmed,
-	};
-	const auto session = &controller->session();
-	auto passwordState = rpl::single(
-		PasswordState::Loading
-	) | rpl::then(session->api().cloudPassword().state(
-	) | rpl::map([](const State &state) {
-		return (!state.unconfirmedPattern.isEmpty())
-			? PasswordState::Unconfirmed
-			: state.hasPassword
-			? PasswordState::On
-			: PasswordState::Off;
-	})) | rpl::distinct_until_changed();
-
-	auto label = rpl::duplicate(
-		passwordState
-	) | rpl::map([=](PasswordState state) {
-		return (state == PasswordState::Loading)
-			? tr::lng_profile_loading(tr::now)
-			: (state == PasswordState::On)
-			? tr::lng_settings_cloud_password_on(tr::now)
-			: tr::lng_settings_cloud_password_off(tr::now);
-	});
-
-	AddButtonWithLabel(
-		container,
-		tr::lng_settings_cloud_password_start_title(),
-		std::move(label),
-		st::settingsButton,
-		{ &st::menuIconPermissions }
-	)->addClickHandler([=, passwordState = base::duplicate(passwordState)] {
-		const auto state = rpl::variable<PasswordState>(
-			base::duplicate(passwordState)).current();
-		if (state == PasswordState::Loading) {
-			return;
-		} else if (state == PasswordState::On) {
-			showOther(CloudPasswordInputId());
-		} else if (state == PasswordState::Off) {
-			showOther(CloudPasswordStartId());
-		} else if (state == PasswordState::Unconfirmed) {
-			showOther(CloudPasswordEmailConfirmId());
-		}
-	});
-
-	const auto reloadOnActivation = [=](Qt::ApplicationState state) {
-		if (/*label->toggled() && */state == Qt::ApplicationActive) {
-			controller->session().api().cloudPassword().reload();
-		}
-	};
-	QObject::connect(
-		static_cast<QGuiApplication*>(QCoreApplication::instance()),
-		&QGuiApplication::applicationStateChanged,
-		container,
-		reloadOnActivation);
-
-	session->api().cloudPassword().reload();
-}
-
-void SetupTopPeers(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	Ui::AddSkip(container);
-	Ui::AddSubsectionTitle(container, tr::lng_settings_top_peers_title());
-
-	const auto session = &controller->session();
-
-	container->add(object_ptr<Button>(
-		container,
-		tr::lng_settings_top_peers_suggest(),
-		st::settingsButtonNoIcon
-	))->toggleOn(rpl::single(
-		rpl::empty
-	) | rpl::then(
-		session->topPeers().updates()
-	) | rpl::map([=] {
-		return !session->topPeers().disabled();
-	}))->toggledChanges(
-	) | rpl::filter([=](bool enabled) {
-		return enabled == session->topPeers().disabled();
-	}) | rpl::start_with_next([=](bool enabled) {
-		session->topPeers().toggleDisabled(!enabled);
-	}, container->lifetime());
-
-	Ui::AddSkip(container);
-	Ui::AddDividerText(container, tr::lng_settings_top_peers_about());
-}
-
-void SetupSelfDestruction(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		rpl::producer<> updateTrigger) {
-	Ui::AddSkip(container);
-	Ui::AddSubsectionTitle(container, tr::lng_settings_destroy_title());
-
-	const auto session = &controller->session();
-
-	std::move(
-		updateTrigger
-	) | rpl::start_with_next([=] {
-		session->api().selfDestruct().reload();
-	}, container->lifetime());
-	const auto label = [&] {
-		return session->api().selfDestruct().daysAccountTTL(
-		) | rpl::map(SelfDestructionBox::DaysLabel);
-	};
-
-	AddButtonWithLabel(
-		container,
-		tr::lng_settings_destroy_if(),
-		label(),
-		st::settingsButtonNoIcon
-	)->addClickHandler([=] {
-		controller->show(Box<SelfDestructionBox>(
-			session,
-			SelfDestructionBox::Type::Account,
-			session->api().selfDestruct().daysAccountTTL()));
-	});
-
-	Ui::AddSkip(container);
-}
-
-void ClearPaymentInfoBoxBuilder(
-		not_null<Ui::GenericBox*> box,
-		not_null<Main::Session*> session) {
-	box->setTitle(tr::lng_clear_payment_info_title());
-
-	const auto checkboxPadding = style::margins(
-		st::boxRowPadding.left(),
-		st::boxRowPadding.left(),
-		st::boxRowPadding.right(),
-		st::boxRowPadding.bottom());
-	const auto label = box->addRow(object_ptr<Ui::FlatLabel>(
-		box,
-		tr::lng_clear_payment_info_sure(),
-		st::boxLabel));
-	const auto shipping = box->addRow(
-		object_ptr<Ui::Checkbox>(
-			box,
-			tr::lng_clear_payment_info_shipping(tr::now),
-			true,
-			st::defaultBoxCheckbox),
-		checkboxPadding);
-	const auto payment = box->addRow(
-		object_ptr<Ui::Checkbox>(
-			box,
-			tr::lng_clear_payment_info_payment(tr::now),
-			true,
-			st::defaultBoxCheckbox),
-		checkboxPadding);
-
-	using Flags = MTPpayments_ClearSavedInfo::Flags;
-	const auto flags = box->lifetime().make_state<Flags>();
-
-	box->addButton(tr::lng_clear_payment_info_clear(), [=] {
-		using Flag = Flags::Enum;
-		*flags = (shipping->checked() ? Flag::f_info : Flag(0))
-			| (payment->checked() ? Flag::f_credentials : Flag(0));
-		delete label;
-		delete shipping;
-		delete payment;
-		box->addRow(object_ptr<Ui::FlatLabel>(
-			box,
-			tr::lng_clear_payment_info_confirm(),
-			st::boxLabel));
-		box->clearButtons();
-		box->addButton(tr::lng_clear_payment_info_clear(), [=] {
-			session->api().request(MTPpayments_ClearSavedInfo(
-				MTP_flags(*flags)
-			)).send();
-			box->closeBox();
-		}, st::attentionBoxButton);
-		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
-	}, st::attentionBoxButton);
-	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
-}
-
-auto ClearPaymentInfoBox(not_null<Main::Session*> session) {
-	return Box(ClearPaymentInfoBoxBuilder, session);
-}
-
-void SetupBotsAndWebsites(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	Ui::AddSkip(container);
-	Ui::AddSubsectionTitle(container, tr::lng_settings_security_bots());
-
-	const auto session = &controller->session();
-	container->add(object_ptr<Button>(
-		container,
-		tr::lng_settings_clear_payment_info(),
-		st::settingsButtonNoIcon
-	))->addClickHandler([=] {
-		controller->show(ClearPaymentInfoBox(session));
-	});
-
-	Ui::AddSkip(container);
-	Ui::AddDivider(container);
-}
-
-void SetupConfirmationExtensions(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	if (Core::App().settings().noWarningExtensions().empty()
-		&& Core::App().settings().ipRevealWarning()) {
-		return;
-	}
-
-	Ui::AddSkip(container);
-	Ui::AddSubsectionTitle(container, tr::lng_settings_file_confirmations());
-
-	container->add(object_ptr<Button>(
-		container,
-		tr::lng_settings_edit_extensions(),
-		st::settingsButtonNoIcon
-	))->addClickHandler([=] {
-		controller->show(Box(OpenFileConfirmationsBox));
-	});
-
-	Ui::AddSkip(container);
-	Ui::AddDividerText(container, tr::lng_settings_edit_extensions_about());
-}
-
-void SetupBlockedList(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		rpl::producer<> updateTrigger,
-		Fn<void(Type)> showOther) {
-	const auto session = &controller->session();
-	auto blockedCount = rpl::combine(
-		BlockedPeersCount(session),
-		tr::lng_settings_no_blocked_users()
-	) | rpl::map([](int count, const QString &none) {
-		return count ? QString::number(count) : none;
-	});
-	const auto blockedPeers = AddButtonWithLabel(
-		container,
-		tr::lng_settings_blocked_users(),
-		std::move(blockedCount),
-		st::settingsButton,
-		{ &st::menuIconBlock });
-	blockedPeers->addClickHandler([=] {
-		showOther(Blocked::Id());
-	});
-	std::move(
-		updateTrigger
-	) | rpl::start_with_next([=] {
-		session->api().blockedPeers().reload();
-	}, blockedPeers->lifetime());
-}
-
-void SetupWebsitesList(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		rpl::producer<> updateTrigger,
-		Fn<void(Type)> showOther) {
-	std::move(
-		updateTrigger
-	) | rpl::start_with_next([=] {
-		controller->session().api().websites().reload();
-	}, container->lifetime());
-
-	auto count = controller->session().api().websites().totalValue();
-	auto countText = rpl::duplicate(
-		count
-	) | rpl::filter(rpl::mappers::_1 > 0) | rpl::map([](int count) {
-		return QString::number(count);
-	});
-
-	const auto wrap = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-	const auto inner = wrap->entity();
-
-	AddButtonWithLabel(
-		inner,
-		tr::lng_settings_logged_in(),
-		std::move(countText),
-		st::settingsButton,
-		{ &st::menuIconIpAddress }
-	)->addClickHandler([=] {
-		showOther(Websites::Id());
-	});
-
-	wrap->toggleOn(std::move(count) | rpl::map(rpl::mappers::_1 > 0));
-	wrap->finishAnimating();
-}
-
-void SetupSessionsList(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		rpl::producer<> updateTrigger,
-		Fn<void(Type)> showOther) {
-	std::move(
-		updateTrigger
-	) | rpl::start_with_next([=] {
-		controller->session().api().authorizations().reload();
-	}, container->lifetime());
-
-	auto count = controller->session().api().authorizations().totalValue(
-	) | rpl::map([](int count) {
-		return count ? QString::number(count) : QString();
-	});
-
-	AddButtonWithLabel(
-		container,
-		tr::lng_settings_show_sessions(),
-		std::move(count),
-		st::settingsButton,
-		{ &st::menuIconDevices }
-	)->addClickHandler([=] {
-		showOther(Sessions::Id());
-	});
-
-	Ui::AddSkip(container);
-	Ui::AddDividerText(container, tr::lng_settings_sessions_about());
-}
-
-void SetupGlobalTTLList(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		rpl::producer<> updateTrigger,
-		Fn<void(Type)> showOther) {
-	const auto session = &controller->session();
-	auto ttlLabel = rpl::combine(
-		session->api().selfDestruct().periodDefaultHistoryTTL(),
-		tr::lng_settings_ttl_after_off()
-	) | rpl::map([](int ttl, const QString &none) {
-		return ttl ? Ui::FormatTTL(ttl) : none;
-	});
-	const auto globalTTLButton = AddButtonWithLabel(
-		container,
-		tr::lng_settings_ttl_title(),
-		std::move(ttlLabel),
-		st::settingsButton,
-		{ &st::menuIconTTL });
-	globalTTLButton->addClickHandler([=] {
-		showOther(GlobalTTLId());
-	});
-	std::move(
-		updateTrigger
-	) | rpl::start_with_next([=] {
-		session->api().selfDestruct().reload();
-	}, container->lifetime());
-}
-
-void SetupSecurity(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		rpl::producer<> updateTrigger,
-		Fn<void(Type)> showOther) {
-	Ui::AddSkip(container, st::settingsPrivacySkip);
-	Ui::AddSubsectionTitle(container, tr::lng_settings_security());
-
-	SetupCloudPassword(controller, container, showOther);
-	SetupGlobalTTLList(
-		controller,
-		container,
-		rpl::duplicate(updateTrigger),
-		showOther);
-	SetupLocalPasscode(controller, container, showOther);
-	SetupBlockedList(
-		controller,
-		container,
-		rpl::duplicate(updateTrigger),
-		showOther);
-	SetupWebsitesList(
-		controller,
-		container,
-		rpl::duplicate(updateTrigger),
-		showOther);
-	SetupSessionsList(
-		controller,
-		container,
-		rpl::duplicate(updateTrigger),
-		showOther);
-}
-
-} // namespace
-
-void SetupSensitiveContent(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		rpl::producer<> updateTrigger) {
-	using namespace rpl::mappers;
-
-	const auto wrap = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-	const auto inner = wrap->entity();
-
-	Ui::AddSkip(inner);
-	Ui::AddSubsectionTitle(inner, tr::lng_settings_sensitive_title());
-
-	const auto session = &controller->session();
-
-	std::move(
-		updateTrigger
-	) | rpl::start_with_next([=] {
-		session->api().sensitiveContent().reload();
-	}, container->lifetime());
-	inner->add(object_ptr<Button>(
-		inner,
-		tr::lng_settings_sensitive_disable_filtering(),
-		st::settingsButtonNoIcon
-	))->toggleOn(
-		session->api().sensitiveContent().enabled()
-	)->toggledChanges(
-	) | rpl::filter([=](bool toggled) {
-		return toggled != session->api().sensitiveContent().enabledCurrent();
-	}) | rpl::start_with_next([=](bool toggled) {
-		session->api().sensitiveContent().update(toggled);
-	}, container->lifetime());
-
-	Ui::AddSkip(inner);
-	Ui::AddDividerText(inner, tr::lng_settings_sensitive_about());
-
-	wrap->toggleOn(session->api().sensitiveContent().canChange());
-}
-
-int ExceptionUsersCount(const std::vector<not_null<PeerData*>> &exceptions) {
-	const auto add = [](int already, not_null<PeerData*> peer) {
-		if (const auto chat = peer->asChat()) {
-			return already + chat->count;
-		} else if (const auto channel = peer->asChannel()) {
-			return already + channel->membersCount();
-		}
-		return already + 1;
-	};
-	return ranges::accumulate(exceptions, 0, add);
-}
-
-bool CheckEditCloudPassword(not_null<::Main::Session*> session) {
-	const auto current = session->api().cloudPassword().stateCurrent();
-	Assert(current.has_value());
-
-	return !current->outdatedClient;
-}
-
-object_ptr<Ui::BoxContent> EditCloudPasswordBox(not_null<Main::Session*> session) {
-	const auto current = session->api().cloudPassword().stateCurrent();
-	Assert(current.has_value());
-
-	auto result = Box<PasscodeBox>(
-		session,
-		PasscodeBox::CloudFields::From(*current));
-	const auto box = result.data();
-
-	rpl::merge(
-		box->newPasswordSet() | rpl::to_empty,
-		box->passwordReloadNeeded()
-	) | rpl::start_with_next([=] {
-		session->api().cloudPassword().reload();
-	}, box->lifetime());
-
-	box->clearUnconfirmedPassword(
-	) | rpl::start_with_next([=] {
-		session->api().cloudPassword().clearUnconfirmedPassword();
-	}, box->lifetime());
-
-	return result;
-}
-
-void RemoveCloudPassword(not_null<Window::SessionController*> controller) {
-	const auto session = &controller->session();
-	const auto current = session->api().cloudPassword().stateCurrent();
-	Assert(current.has_value());
-
-	if (!current->hasPassword) {
-		session->api().cloudPassword().clearUnconfirmedPassword();
-		return;
-	}
-	auto fields = PasscodeBox::CloudFields::From(*current);
-	fields.turningOff = true;
-	auto box = Box<PasscodeBox>(session, fields);
-
-	rpl::merge(
-		box->newPasswordSet() | rpl::to_empty,
-		box->passwordReloadNeeded()
-	) | rpl::start_with_next([=] {
-		session->api().cloudPassword().reload();
-	}, box->lifetime());
-
-	box->clearUnconfirmedPassword(
-	) | rpl::start_with_next([=] {
-		session->api().cloudPassword().clearUnconfirmedPassword();
-	}, box->lifetime());
-
-	controller->show(std::move(box));
-}
-
-object_ptr<Ui::BoxContent> CloudPasswordAppOutdatedBox() {
-	const auto callback = [=](Fn<void()> &&close) {
-		Core::UpdateApplication();
-		close();
-	};
-	return Ui::MakeConfirmBox({
-		.text = tr::lng_passport_app_out_of_date(),
-		.confirmed = callback,
-		.confirmText = tr::lng_menu_update(),
-	});
-}
-
-not_null<Ui::SettingsButton*> AddPrivacyButton(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container,
-		rpl::producer<QString> label,
-		IconDescriptor &&descriptor,
-		Privacy::Key key,
-		Fn<std::unique_ptr<EditPrivacyController>()> controllerFactory,
-		const style::SettingsButton *stOverride) {
-	const auto shower = Ui::CreateChild<rpl::lifetime>(container.get());
-	const auto session = &controller->session();
-	const auto button = AddButtonWithLabel(
-		container,
-		std::move(label),
-		PrivacyString(session, key),
-		stOverride ? *stOverride : st::settingsButtonNoIcon,
-		std::move(descriptor)
-	);
-	button->addClickHandler([=] {
-		*shower = session->api().userPrivacy().value(
-			key
-		) | rpl::take(
-			1
-		) | rpl::start_with_next([=](const Privacy::Rule &value) {
-			controller->show(Box<EditPrivacyBox>(
-				controller,
-				controllerFactory(),
-				value));
-		});
-	});
-	return button;
-}
-
-void SetupArchiveAndMute(
-		not_null<Window::SessionController*> controller,
-		not_null<Ui::VerticalLayout*> container) {
-	using namespace rpl::mappers;
-
-	const auto wrap = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-	const auto inner = wrap->entity();
-
-	Ui::AddSkip(inner);
-	Ui::AddSubsectionTitle(inner, tr::lng_settings_new_unknown());
-
-	const auto session = &controller->session();
-
-	const auto privacy = &session->api().globalPrivacy();
-	privacy->reload();
-	inner->add(object_ptr<Button>(
-		inner,
-		tr::lng_settings_auto_archive(),
-		st::settingsButtonNoIcon
-	))->toggleOn(
-		privacy->archiveAndMute()
-	)->toggledChanges(
-	) | rpl::filter([=](bool toggled) {
-		return toggled != privacy->archiveAndMuteCurrent();
-	}) | rpl::start_with_next([=](bool toggled) {
-		privacy->updateArchiveAndMute(toggled);
-	}, container->lifetime());
-
-	Ui::AddSkip(inner);
-	Ui::AddDividerText(inner, tr::lng_settings_auto_archive_about());
-
-	auto shown = rpl::single(
-		false
-	) | rpl::then(session->api().globalPrivacy().showArchiveAndMute(
-	) | rpl::filter(_1) | rpl::take(1));
-	auto premium = Data::AmPremiumValue(&controller->session());
-
-	using namespace rpl::mappers;
-	wrap->toggleOn(rpl::combine(
-		std::move(shown),
-		std::move(premium),
-		_1 || _2));
-}
-
-PrivacySecurity::PrivacySecurity(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller)
-: Section(parent) {
-	setupContent(controller);
-
-	[[maybe_unused]] auto preload = base::SystemUnlockStatus();
-}
-
-rpl::producer<QString> PrivacySecurity::title() {
-	return tr::lng_settings_section_privacy();
-}
-
-void PrivacySecurity::setupContent(
-		not_null<Window::SessionController*> controller) {
-	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-
-	auto updateOnTick = rpl::single(
-	) | rpl::then(base::timer_each(kUpdateTimeout));
-	const auto trigger = [=] {
-		return rpl::duplicate(updateOnTick);
-	};
-
-	SetupSecurity(controller, content, trigger(), showOtherMethod());
-	SetupPrivacy(controller, content, trigger());
-	SetupTopPeers(controller, content);
-	SetupArchiveAndMute(controller, content);
-	SetupConfirmationExtensions(controller, content);
-	SetupBotsAndWebsites(controller, content);
-	SetupSelfDestruction(controller, content, trigger());
-
-	Ui::ResizeFitChild(this, content);
-}
-
-} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_recent_searches.cpp b/Telegram/SourceFiles/settings/settings_recent_searches.cpp
new file mode 100644
index 00000000000000..546bfb807395db
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_recent_searches.cpp
@@ -0,0 +1,109 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/settings_recent_searches.h"
+
+#include "core/version.h"
+#include "main/main_session.h"
+#include "storage/serialize_common.h"
+#include "storage/storage_account.h"
+
+namespace Settings {
+namespace {
+
+constexpr auto kLimit = 32;
+
+} // namespace
+
+RecentSearches::RecentSearches(not_null<Main::Session*> session)
+: _session(session) {
+}
+
+RecentSearches::~RecentSearches() = default;
+
+const std::vector<QString> &RecentSearches::list() const {
+	_session->local().readSearchSuggestions();
+
+	return _list;
+}
+
+void RecentSearches::bump(const QString &entryId) {
+	if (entryId.isEmpty()) {
+		return;
+	}
+	_session->local().readSearchSuggestions();
+
+	if (!_list.empty() && _list.front() == entryId) {
+		return;
+	}
+	auto i = ranges::find(_list, entryId);
+	if (i == end(_list)) {
+		if (int(_list.size()) >= kLimit) {
+			_list.pop_back();
+		}
+		_list.push_back(entryId);
+		i = end(_list) - 1;
+	}
+	ranges::rotate(begin(_list), i, i + 1);
+
+	_session->local().writeSearchSuggestionsDelayed();
+}
+
+void RecentSearches::remove(const QString &entryId) {
+	const auto i = ranges::find(_list, entryId);
+	if (i != end(_list)) {
+		_list.erase(i);
+	}
+	_session->local().writeSearchSuggestionsDelayed();
+}
+
+QByteArray RecentSearches::serialize() const {
+	_session->local().readSearchSuggestions();
+
+	if (_list.empty()) {
+		return {};
+	}
+	const auto count = std::min(int(_list.size()), kLimit);
+	auto size = 2 * int(sizeof(quint32));
+	for (auto i = 0; i < count; ++i) {
+		size += Serialize::stringSize(_list[i]);
+	}
+	auto stream = Serialize::ByteArrayWriter(size);
+	stream
+		<< quint32(AppVersion)
+		<< quint32(count);
+	for (auto i = 0; i < count; ++i) {
+		stream << _list[i];
+	}
+	return std::move(stream).result();
+}
+
+void RecentSearches::applyLocal(QByteArray serialized) {
+	_list.clear();
+	if (serialized.isEmpty()) {
+		return;
+	}
+	auto stream = Serialize::ByteArrayReader(serialized);
+	auto version = quint32();
+	auto count = quint32();
+	stream >> version >> count;
+	if (!stream.ok()) {
+		return;
+	}
+	_list.reserve(count);
+	for (auto i = quint32(0); i < count; ++i) {
+		auto value = QString();
+		stream >> value;
+		if (!stream.ok()) {
+			_list.clear();
+			return;
+		}
+		_list.push_back(value);
+	}
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_recent_searches.h b/Telegram/SourceFiles/settings/settings_recent_searches.h
new file mode 100644
index 00000000000000..6a3ab9a3e9944f
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_recent_searches.h
@@ -0,0 +1,36 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Settings {
+
+class RecentSearches final {
+public:
+	explicit RecentSearches(not_null<Main::Session*> session);
+	~RecentSearches();
+
+	[[nodiscard]] const std::vector<QString> &list() const;
+
+	void bump(const QString &entryId);
+	void remove(const QString &entryId);
+
+	[[nodiscard]] QByteArray serialize() const;
+	void applyLocal(QByteArray serialized);
+
+private:
+	const not_null<Main::Session*> _session;
+
+	std::vector<QString> _list;
+
+};
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_scale_preview.cpp b/Telegram/SourceFiles/settings/settings_scale_preview.cpp
index d42007aae83bcf..4492762e5d8663 100644
--- a/Telegram/SourceFiles/settings/settings_scale_preview.cpp
+++ b/Telegram/SourceFiles/settings/settings_scale_preview.cpp
@@ -138,7 +138,7 @@ Preview::Preview(QWidget *slider, rpl::producer<QImage> userpic)
 , _slider(slider)
 , _ratio(style::DevicePixelRatio())
 , _window(Ui::Platform::TranslucentWindowsSupported()) {
-	std::move(userpic) | rpl::start_with_next([=](QImage &&userpic) {
+	std::move(userpic) | rpl::on_next([=](QImage &&userpic) {
 		_userpicOriginal = std::move(userpic);
 		if (!_userpicImage.isNull()) {
 			_userpicImage = {};
@@ -282,13 +282,13 @@ void Preview::init() {
 	});
 
 	_widget.paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = Painter(&_widget);
 		paint(p, clip);
 	}, _widget.lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_bubbleCorners = {};
 		_bubbleTail = {};
 		_bubbleShadowBottomRight = {};
diff --git a/Telegram/SourceFiles/settings/settings_search.cpp b/Telegram/SourceFiles/settings/settings_search.cpp
new file mode 100644
index 00000000000000..161f1b95efce23
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_search.cpp
@@ -0,0 +1,763 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "settings/settings_search.h"
+
+#include "base/event_filter.h"
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "core/deep_links/deep_links_settings.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common.h"
+#include "settings/settings_faq_suggestions.h"
+#include "settings/settings_recent_searches.h"
+#include "ui/painter.h"
+#include "ui/text/text_entity.h"
+#include "ui/toast/toast.h"
+#include "ui/search_field_controller.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/elastic_scroll.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
+#include "styles/style_widgets.h"
+
+namespace Settings {
+namespace {
+
+struct SearchResultItem {
+	int index = 0;
+	int matchCount = 0;
+};
+
+[[nodiscard]] QStringList PrepareEntryWords(const Builder::SearchEntry &entry) {
+	auto combined = entry.title;
+	for (const auto &keyword : entry.keywords) {
+		combined += ' ' + keyword;
+	}
+	return TextUtilities::PrepareSearchWords(combined);
+}
+
+[[nodiscard]] int CalculateDepth(
+		Type sectionId,
+		const Builder::SearchRegistry &registry) {
+	const auto path = registry.sectionPath(sectionId);
+	if (path.isEmpty()) {
+		return 0;
+	}
+	return path.count(u" > "_q) + 1;
+}
+
+void SetupCheckIcon(
+		not_null<Ui::SettingsButton*> button,
+		Builder::SearchEntryCheckIcon checkIcon,
+		const style::SettingsButton &st) {
+	struct CheckWidget {
+		CheckWidget(QWidget *parent, bool checked)
+		: widget(parent)
+		, view(st::defaultCheck, checked) {
+			view.finishAnimating();
+		}
+		Ui::RpWidget widget;
+		Ui::CheckView view;
+	};
+	const auto checked = (checkIcon == Builder::SearchEntryCheckIcon::Checked);
+	const auto check = button->lifetime().make_state<CheckWidget>(
+		button,
+		checked);
+	check->widget.setAttribute(Qt::WA_TransparentForMouseEvents);
+	check->widget.resize(check->view.getSize());
+	check->widget.show();
+
+	button->sizeValue(
+	) | rpl::on_next([=, left = st.iconLeft](QSize size) {
+		check->widget.moveToLeft(
+			left,
+			(size.height() - check->widget.height()) / 2,
+			size.width());
+	}, check->widget.lifetime());
+
+	check->widget.paintRequest(
+	) | rpl::on_next([=](QRect clip) {
+		auto p = QPainter(&check->widget);
+		check->view.paint(p, 0, 0, check->widget.width());
+		p.setOpacity(0.5);
+		p.fillRect(clip, st::boxBg);
+	}, check->widget.lifetime());
+}
+
+[[nodiscard]] not_null<Ui::SettingsButton*> CreateSearchResultButtonRaw(
+		not_null<QWidget*> parent,
+		const QString &title,
+		const QString &subtitle,
+		const style::SettingsButton &st,
+		IconDescriptor &&icon,
+		Builder::SearchEntryCheckIcon checkIcon) {
+	auto buttonObj = CreateButtonWithIcon(
+		parent,
+		rpl::single(title),
+		st,
+		std::move(icon));
+	const auto button = buttonObj.release();
+	button->setPointerCursor(false);
+	if (checkIcon != Builder::SearchEntryCheckIcon::None) {
+		SetupCheckIcon(button, checkIcon, st);
+	}
+	const auto details = Ui::CreateChild<Ui::FlatLabel>(
+		button,
+		subtitle,
+		st::settingsSearchResultDetails);
+	details->show();
+	details->moveToLeft(
+		st.padding.left(),
+		st.padding.top() + st.height - details->height());
+	details->setAttribute(Qt::WA_TransparentForMouseEvents);
+	return button;
+}
+
+} // namespace
+
+Search::Search(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: Section(parent, controller) {
+	setupContent();
+}
+
+rpl::producer<QString> Search::title() {
+	return tr::lng_dlg_filter();
+}
+
+void Search::setInnerFocus() {
+	if (_searchField) {
+		_searchField->setFocus();
+	}
+}
+
+base::weak_qptr<Ui::RpWidget> Search::createPinnedToTop(
+		not_null<QWidget*> parent) {
+	_searchController = std::make_unique<Ui::SearchFieldController>("");
+	auto rowView = _searchController->createRowView(
+		parent,
+		st::infoLayerMediaSearch);
+	_searchField = rowView.field;
+	_searchField->customUpDown(true);
+
+	const auto searchContainer = Ui::CreateChild<Ui::FixedHeightWidget>(
+		parent.get(),
+		st::infoLayerMediaSearch.height);
+	const auto wrap = rowView.wrap.release();
+	wrap->setParent(searchContainer);
+	wrap->show();
+
+	searchContainer->widthValue(
+	) | rpl::on_next([=](int width) {
+		wrap->resizeToWidth(width);
+		wrap->moveToLeft(0, 0);
+	}, searchContainer->lifetime());
+
+	_searchController->queryChanges() | rpl::on_next([=](QString &&query) {
+		rebuildResults(std::move(query));
+	}, searchContainer->lifetime());
+
+	_searchField->submits(
+	) | rpl::on_next([=](Qt::KeyboardModifiers) {
+		const auto index = (_selected >= 0) ? _selected : 0;
+		if (index < int(_visibleButtons.size())) {
+			_visibleButtons[index]->clicked(
+				Qt::NoModifier,
+				Qt::LeftButton);
+		}
+	}, searchContainer->lifetime());
+
+	base::install_event_filter(_searchField, [=](not_null<QEvent*> e) {
+		if (e->type() != QEvent::KeyPress) {
+			return base::EventFilterResult::Continue;
+		}
+		const auto key = static_cast<QKeyEvent*>(e.get())->key();
+		if (key == Qt::Key_Up
+			|| key == Qt::Key_Down
+			|| key == Qt::Key_PageUp
+			|| key == Qt::Key_PageDown) {
+			handleKeyNavigation(key);
+			return base::EventFilterResult::Cancel;
+		}
+		return base::EventFilterResult::Continue;
+	}, lifetime());
+
+	if (!_pendingQuery.isEmpty()) {
+		_searchField->setText(base::take(_pendingQuery));
+	}
+
+	return base::make_weak(not_null<Ui::RpWidget*>{ searchContainer });
+}
+
+void Search::setupContent() {
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	_list = content->add(object_ptr<Ui::VerticalLayout>(content));
+
+	setupCustomizations();
+	buildIndex();
+	rebuildResults(QString());
+
+	controller()->session().faqSuggestions().loadedValue(
+	) | rpl::filter([](bool loaded) {
+		return loaded;
+	}) | rpl::take(1) | rpl::on_next([=] {
+		for (auto i = _faqStartIndex; i < int(_entries.size()); ++i) {
+			const auto it = _buttonCache.find(i);
+			if (it != _buttonCache.end()) {
+				_trackedButtons.remove(it->second);
+				delete it->second;
+				_buttonCache.erase(it);
+			}
+		}
+		buildIndex();
+		const auto query = _searchController
+			? _searchController->query()
+			: QString();
+		rebuildResults(query);
+	}, lifetime());
+
+	Ui::ResizeFitChild(this, content);
+}
+
+void Search::setupCustomizations() {
+	const auto isPaused = Window::PausedIn(
+		controller(),
+		Window::GifPauseReason::Layer);
+	const auto add = [&](const QString &id, ResultCustomization value) {
+		_customizations[id] = std::move(value);
+	};
+
+	add(u"main/credits"_q, {
+		.hook = [=](not_null<Ui::SettingsButton*> b) {
+			AddPremiumStar(b, true, isPaused);
+		},
+		.st = &st::settingsSearchResult,
+	});
+	add(u"main/premium"_q, {
+		.hook = [=](not_null<Ui::SettingsButton*> b) {
+			AddPremiumStar(b, false, isPaused);
+		},
+		.st = &st::settingsSearchResult,
+	});
+}
+
+void Search::buildIndex() {
+	_entries.clear();
+	_firstLetterIndex.clear();
+	_entryIdToIndex.clear();
+
+	const auto &registry = Builder::SearchRegistry::Instance();
+	const auto rawEntries = registry.collectAll(&controller()->session());
+
+	_entries.reserve(rawEntries.size());
+	for (const auto &entry : rawEntries) {
+		const auto index = int(_entries.size());
+		auto indexed = IndexedEntry{
+			.entry = entry,
+			.terms = PrepareEntryWords(entry),
+			.depth = CalculateDepth(entry.section, registry),
+		};
+		if (!entry.id.isEmpty()) {
+			_entryIdToIndex[entry.id] = index;
+		}
+		_entries.push_back(std::move(indexed));
+	}
+
+	_faqStartIndex = int(_entries.size());
+
+	const auto &faq = controller()->session().faqSuggestions();
+	for (const auto &faqEntry : faq.entries()) {
+		auto entry = Builder::SearchEntry{
+			.title = faqEntry.title,
+		};
+		auto indexed = IndexedEntry{
+			.entry = std::move(entry),
+			.terms = TextUtilities::PrepareSearchWords(faqEntry.title),
+			.depth = 1000,
+			.faqUrl = faqEntry.url,
+			.faqSection = faqEntry.section,
+		};
+		_entries.push_back(std::move(indexed));
+	}
+
+	for (auto i = 0; i < int(_entries.size()); ++i) {
+		for (const auto &term : _entries[i].terms) {
+			if (!term.isEmpty()) {
+				_firstLetterIndex[term[0]].insert(i);
+			}
+		}
+	}
+}
+
+void Search::clearSelection() {
+	if (_selected >= 0 && _selected < int(_visibleButtons.size())) {
+		_visibleButtons[_selected]->setSynteticOver(false);
+	}
+	_selected = -1;
+}
+
+void Search::scrollToButton(not_null<Ui::SettingsButton*> button) {
+	const auto scrollIn = [&](auto &&scroll) {
+		if (const auto inner = scroll->widget()) {
+			const auto globalPos = button->mapToGlobal(QPoint(0, 0));
+			const auto localPos = inner->mapFromGlobal(globalPos);
+			scroll->scrollToY(
+				localPos.y(),
+				localPos.y() + button->height());
+		}
+	};
+	for (auto widget = button->parentWidget()
+		; widget
+		; widget = widget->parentWidget()) {
+		if (const auto scroll = dynamic_cast<Ui::ScrollArea*>(widget)) {
+			scrollIn(scroll);
+			return;
+		}
+		if (const auto scroll = dynamic_cast<Ui::ElasticScroll*>(widget)) {
+			scrollIn(scroll);
+			return;
+		}
+	}
+}
+
+void Search::selectByKeyboard(int newSelected) {
+	const auto count = int(_visibleButtons.size());
+	if (!count) {
+		return;
+	}
+	newSelected = std::clamp(newSelected, 0, count - 1);
+	if (newSelected == _selected) {
+		return;
+	}
+	const auto applySelection = [&] {
+		for (auto i = 0; i < count; ++i) {
+			if (i != newSelected && _visibleButtons[i]->isOver()) {
+				_visibleButtons[i]->setSynteticOver(false);
+			}
+		}
+		_selected = newSelected;
+		_visibleButtons[_selected]->setSynteticOver(true);
+	};
+	applySelection();
+	scrollToButton(_visibleButtons[_selected]);
+	applySelection();
+}
+
+void Search::setupButtonMouseTracking(
+		not_null<Ui::SettingsButton*> button) {
+	if (!_trackedButtons.emplace(button).second) {
+		return;
+	}
+	button->events(
+	) | rpl::filter([](not_null<QEvent*> e) {
+		return e->type() == QEvent::Enter;
+	}) | rpl::on_next([=] {
+		if (_selected >= 0) {
+			clearSelection();
+		}
+	}, button->lifetime());
+}
+
+void Search::handleKeyNavigation(int key) {
+	constexpr auto kPageSkip = 5;
+	const auto startIndex = [&] {
+		if (_selected >= 0) {
+			return _selected;
+		}
+		for (auto i = 0; i < int(_visibleButtons.size()); ++i) {
+			if (_visibleButtons[i]->isOver()) {
+				return i;
+			}
+		}
+		return -1;
+	}();
+
+	if (key == Qt::Key_Down) {
+		selectByKeyboard((startIndex < 0) ? 0 : (startIndex + 1));
+	} else if (key == Qt::Key_Up) {
+		if (startIndex > 0) {
+			selectByKeyboard(startIndex - 1);
+		} else if (startIndex == 0) {
+			clearSelection();
+		}
+	} else if (key == Qt::Key_PageDown) {
+		selectByKeyboard((startIndex < 0) ? 0 : (startIndex + kPageSkip));
+	} else if (key == Qt::Key_PageUp) {
+		if (startIndex > 0) {
+			selectByKeyboard(startIndex - kPageSkip);
+		} else if (startIndex == 0) {
+			clearSelection();
+		}
+	}
+}
+
+not_null<Ui::SettingsButton*> Search::createEntryButton(
+		int entryIndex,
+		const QString &subtitle) {
+	const auto &indexed = _entries[entryIndex];
+	const auto &entry = indexed.entry;
+	const auto hasIcon = entry.icon.icon != nullptr;
+	const auto hasCheckIcon = !hasIcon
+		&& (entry.checkIcon != Builder::SearchEntryCheckIcon::None);
+
+	const auto it = _customizations.find(entry.id);
+	const auto custom = (it != _customizations.end())
+		? &it->second
+		: nullptr;
+
+	const auto &st = custom && custom->st
+		? *custom->st
+		: (hasIcon || hasCheckIcon)
+		? st::settingsSearchResult
+		: st::settingsSearchResultNoIcon;
+
+	const auto button = CreateSearchResultButtonRaw(
+		this,
+		entry.title,
+		subtitle,
+		st,
+		IconDescriptor{ entry.icon.icon },
+		(hasCheckIcon
+			? entry.checkIcon
+			: Builder::SearchEntryCheckIcon::None));
+
+	if (custom && custom->hook) {
+		custom->hook(button);
+	}
+
+	const auto controlId = entry.id;
+	const auto targetSection = entry.section;
+	const auto deeplink = entry.deeplink;
+	if (!deeplink.isEmpty() || targetSection || !controlId.isEmpty()) {
+		button->addClickHandler([=] {
+			bumpRecentEntry(controlId);
+			if (!deeplink.isEmpty()) {
+				Core::App().openLocalUrl(
+					deeplink,
+					QVariant::fromValue(ClickHandlerContext{
+						.sessionWindow = base::make_weak(controller()),
+					}));
+			} else {
+				if (!controlId.isEmpty()) {
+					controller()->setHighlightControlId(controlId);
+				}
+				showOtherMethod()(targetSection);
+			}
+		});
+	}
+	const auto copyLink = !deeplink.isEmpty()
+		? deeplink
+		: Core::DeepLinks::SettingsDeepLink(targetSection, controlId);
+	if (!copyLink.isEmpty() || !controlId.isEmpty()) {
+		base::install_event_filter(button, [=](not_null<QEvent*> e) {
+			if (e->type() != QEvent::ContextMenu) {
+				return base::EventFilterResult::Continue;
+			}
+			const auto inRecent = !controlId.isEmpty()
+				&& ranges::contains(
+					controller()->session().recentSettingsSearches().list(),
+					controlId);
+			if (copyLink.isEmpty() && !inRecent) {
+				return base::EventFilterResult::Continue;
+			}
+			_contextMenu = base::make_unique_q<Ui::PopupMenu>(
+				button,
+				st::popupMenuWithIcons);
+			if (!copyLink.isEmpty()) {
+				_contextMenu->addAction(
+					tr::lng_context_copy_link(tr::now),
+					[=] {
+						TextUtilities::SetClipboardText(
+							TextForMimeData::Simple(copyLink));
+						controller()->showToast({
+							.text = {
+								tr::lng_channel_public_link_copied(tr::now),
+							},
+							.iconLottie = u"toast/voip_invite"_q,
+							.iconLottieSize = st::toastLottieIconSize,
+						});
+					},
+					&st::menuIconLink);
+			}
+			if (inRecent) {
+				_contextMenu->addAction(
+					tr::lng_recent_remove(tr::now),
+					[=] {
+						controller()->session().recentSettingsSearches().remove(
+							controlId);
+						const auto query = _searchController
+							? _searchController->query()
+							: QString();
+						rebuildResults(query);
+					},
+					&st::menuIconDelete);
+			}
+			_contextMenu->popup(QCursor::pos());
+			return base::EventFilterResult::Cancel;
+		}, button->lifetime());
+	}
+
+	_buttonCache.emplace(entryIndex, button);
+	return button;
+}
+
+void Search::rebuildResults(const QString &query) {
+	for (auto i = 0, count = _list->count(); i != count; ++i) {
+		_list->widgetAt(i)->hide();
+	}
+	_list->clear();
+	clearSelection();
+	_visibleButtons.clear();
+
+	const auto queryWords = TextUtilities::PrepareSearchWords(query);
+
+	if (queryWords.isEmpty()) {
+		rebuildRecentResults();
+		rebuildFaqResults();
+		_list->resizeToWidth(_list->width());
+		return;
+	}
+
+	auto results = std::vector<SearchResultItem>();
+	{
+		auto toFilter = (const base::flat_set<int>*)nullptr;
+		for (const auto &word : queryWords) {
+			if (word.isEmpty()) {
+				continue;
+			}
+			const auto it = _firstLetterIndex.find(word[0]);
+			if (it == _firstLetterIndex.end() || it->second.empty()) {
+				toFilter = nullptr;
+				break;
+			} else if (!toFilter || it->second.size() < toFilter->size()) {
+				toFilter = &it->second;
+			}
+		}
+
+		if (toFilter) {
+			for (const auto entryIndex : *toFilter) {
+				const auto &indexed = _entries[entryIndex];
+				auto matched = 0;
+				for (const auto &queryWord : queryWords) {
+					for (const auto &term : indexed.terms) {
+						if (term.startsWith(queryWord)) {
+							++matched;
+							break;
+						}
+					}
+				}
+				if (matched > 0) {
+					results.push_back({
+						.index = entryIndex,
+						.matchCount = matched,
+					});
+				}
+			}
+
+			ranges::sort(results, [&](const auto &a, const auto &b) {
+				if (a.matchCount != b.matchCount) {
+					return a.matchCount > b.matchCount;
+				}
+				const auto &entryA = _entries[a.index];
+				const auto &entryB = _entries[b.index];
+				if (entryA.depth != entryB.depth) {
+					return entryA.depth < entryB.depth;
+				}
+				return entryA.entry.title < entryB.entry.title;
+			});
+		}
+	}
+
+	if (results.empty() && !queryWords.isEmpty()) {
+		_list->add(
+			object_ptr<Ui::FlatLabel>(
+				_list,
+				tr::lng_search_tab_no_results(),
+				st::settingsSearchNoResults),
+			st::settingsSearchNoResultsPadding);
+	} else {
+		const auto &registry = Builder::SearchRegistry::Instance();
+		const auto faqSubtitle = tr::lng_settings_faq_subtitle(tr::now);
+		const auto weak = base::make_weak(controller());
+
+		for (const auto &result : results) {
+			const auto entryIndex = result.index;
+			const auto &indexed = _entries[entryIndex];
+			const auto &entry = indexed.entry;
+			const auto isFaq = !indexed.faqUrl.isEmpty();
+
+			const auto cached = _buttonCache.find(entryIndex);
+			if (cached != _buttonCache.end()) {
+				addButton(cached->second);
+				continue;
+			}
+
+			if (isFaq) {
+				const auto subtitle = faqSubtitle
+					+ u" > "_q
+					+ indexed.faqSection;
+				const auto button = CreateSearchResultButtonRaw(
+					this,
+					entry.title,
+					subtitle,
+					st::settingsSearchResultNoIcon,
+					IconDescriptor{},
+					Builder::SearchEntryCheckIcon::None);
+
+				const auto url = indexed.faqUrl;
+				button->addClickHandler([=] {
+					UrlClickHandler::Open(
+						url,
+						QVariant::fromValue(ClickHandlerContext{
+							.sessionWindow = weak,
+						}));
+				});
+
+				_buttonCache.emplace(entryIndex, button);
+				addButton(button);
+			} else {
+				const auto parentsOnly = entry.id.isEmpty();
+				const auto subtitle = registry.sectionPath(
+					entry.section,
+					parentsOnly);
+				addButton(createEntryButton(entryIndex, subtitle));
+			}
+		}
+	}
+
+	_list->resizeToWidth(_list->width());
+}
+
+void Search::sectionSaveState(std::any &state) {
+	const auto query = _searchController
+		? _searchController->query()
+		: _pendingQuery;
+	if (!query.isEmpty()) {
+		state = SearchSectionState{ query };
+	}
+}
+
+void Search::sectionRestoreState(const std::any &state) {
+	const auto saved = std::any_cast<SearchSectionState>(&state);
+	if (saved && !saved->query.isEmpty()) {
+		if (_searchField) {
+			_searchField->setText(saved->query);
+		} else {
+			_pendingQuery = saved->query;
+		}
+	}
+}
+
+void Search::bumpRecentEntry(const QString &entryId) {
+	if (!entryId.isEmpty()) {
+		controller()->session().recentSettingsSearches().bump(entryId);
+	}
+}
+
+void Search::rebuildRecentResults() {
+	const auto &recentIds
+		= controller()->session().recentSettingsSearches().list();
+	if (recentIds.empty()) {
+		return;
+	}
+
+	const auto &registry = Builder::SearchRegistry::Instance();
+
+	auto added = false;
+	for (const auto &entryId : recentIds) {
+		const auto it = _entryIdToIndex.find(entryId);
+		if (it == _entryIdToIndex.end()) {
+			continue;
+		}
+		if (!added) {
+			Ui::AddSubsectionTitle(_list, tr::lng_recent_title());
+			added = true;
+		}
+		const auto entryIndex = it->second;
+		const auto cached = _buttonCache.find(entryIndex);
+		if (cached != _buttonCache.end()) {
+			addButton(cached->second);
+			continue;
+		}
+		const auto &entry = _entries[entryIndex].entry;
+		const auto parentsOnly = entry.id.isEmpty();
+		const auto subtitle = registry.sectionPath(
+			entry.section,
+			parentsOnly);
+		addButton(createEntryButton(entryIndex, subtitle));
+	}
+}
+
+void Search::rebuildFaqResults() {
+	if (_faqStartIndex >= int(_entries.size())) {
+		return;
+	}
+
+	if (!_visibleButtons.empty()) {
+		Ui::AddSubsectionTitle(_list, tr::lng_settings_faq());
+	}
+
+	const auto faqSubtitle = tr::lng_settings_faq_subtitle(tr::now);
+	const auto weak = base::make_weak(controller());
+
+	for (auto i = _faqStartIndex; i < int(_entries.size()); ++i) {
+		const auto &indexed = _entries[i];
+
+		const auto cached = _buttonCache.find(i);
+		if (cached != _buttonCache.end()) {
+			addButton(cached->second);
+			continue;
+		}
+
+		const auto subtitle = faqSubtitle + u" > "_q + indexed.faqSection;
+		const auto button = CreateSearchResultButtonRaw(
+			this,
+			indexed.entry.title,
+			subtitle,
+			st::settingsSearchResultNoIcon,
+			IconDescriptor{},
+			Builder::SearchEntryCheckIcon::None);
+
+		const auto url = indexed.faqUrl;
+		button->addClickHandler([=] {
+			UrlClickHandler::Open(
+				url,
+				QVariant::fromValue(ClickHandlerContext{
+					.sessionWindow = weak,
+				}));
+		});
+
+		_buttonCache.emplace(i, button);
+		addButton(button);
+	}
+}
+
+void Search::addButton(not_null<Ui::SettingsButton*> button) {
+	button->show();
+	_list->add(object_ptr<Ui::SettingsButton>::fromRaw(button));
+	_visibleButtons.push_back(button);
+	setupButtonMouseTracking(button);
+}
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_search.h b/Telegram/SourceFiles/settings/settings_search.h
new file mode 100644
index 00000000000000..2f3afcd68987e7
--- /dev/null
+++ b/Telegram/SourceFiles/settings/settings_search.h
@@ -0,0 +1,94 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include <any>
+
+#include "base/flat_map.h"
+#include "settings/settings_builder.h"
+#include "settings/settings_common_session.h"
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+class InputField;
+class PopupMenu;
+class RpWidget;
+class SearchFieldController;
+class VerticalLayout;
+} // namespace Ui
+
+namespace Settings {
+
+struct SearchSectionState {
+	QString query;
+};
+
+class Search : public Section<Search> {
+public:
+	Search(QWidget *parent, not_null<Window::SessionController*> controller);
+
+	[[nodiscard]] rpl::producer<QString> title() override;
+
+	void setInnerFocus() override;
+	void sectionSaveState(std::any &state) override;
+	void sectionRestoreState(const std::any &state) override;
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToTop(
+		not_null<QWidget*> parent) override;
+
+private:
+	struct IndexedEntry {
+		Builder::SearchEntry entry;
+		QStringList terms;
+		int depth = 0;
+		QString faqUrl;
+		QString faqSection;
+	};
+
+	struct ResultCustomization {
+		Fn<void(not_null<Ui::SettingsButton*>)> hook;
+		const style::SettingsButton *st = nullptr;
+	};
+
+	void setupContent();
+	void setupCustomizations();
+	void buildIndex();
+	void rebuildResults(const QString &query);
+	void rebuildRecentResults();
+	void rebuildFaqResults();
+	void bumpRecentEntry(const QString &entryId);
+	[[nodiscard]] not_null<Ui::SettingsButton*> createEntryButton(
+		int entryIndex,
+		const QString &subtitle);
+	void selectByKeyboard(int newSelected);
+	void clearSelection();
+	void handleKeyNavigation(int key);
+	void scrollToButton(not_null<Ui::SettingsButton*> button);
+	void setupButtonMouseTracking(not_null<Ui::SettingsButton*> button);
+	void addButton(not_null<Ui::SettingsButton*> button);
+
+	std::unique_ptr<Ui::SearchFieldController> _searchController;
+	Ui::InputField *_searchField = nullptr;
+	Ui::VerticalLayout *_list = nullptr;
+	base::flat_map<QString, ResultCustomization> _customizations;
+	base::flat_map<QString, int> _entryIdToIndex;
+	QString _pendingQuery;
+	std::vector<IndexedEntry> _entries;
+	base::flat_map<QChar, base::flat_set<int>> _firstLetterIndex;
+	base::flat_map<int, Ui::SettingsButton*> _buttonCache;
+	int _faqStartIndex = 0;
+	std::vector<Ui::SettingsButton*> _visibleButtons;
+	base::flat_set<not_null<Ui::SettingsButton*>> _trackedButtons;
+	base::unique_qptr<Ui::PopupMenu> _contextMenu;
+	int _selected = -1;
+
+};
+
+} // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_websites.h b/Telegram/SourceFiles/settings/settings_websites.h
deleted file mode 100644
index 649a8820569005..00000000000000
--- a/Telegram/SourceFiles/settings/settings_websites.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include "settings/settings_common_session.h"
-
-namespace Settings {
-
-class Websites : public Section<Websites> {
-public:
-	Websites(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller);
-
-	[[nodiscard]] rpl::producer<QString> title() override;
-
-private:
-	void setupContent(not_null<Window::SessionController*> controller);
-
-};
-
-} // namespace Settings
diff --git a/Telegram/SourceFiles/statistics/chart_rulers_data.cpp b/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
index 4f9471c8ce8678..c559a23684fbf2 100644
--- a/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
+++ b/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
@@ -9,6 +9,8 @@ For license and copyright information please follow this link:
 
 #include "lang/lang_tag.h"
 
+#include <QLocale>
+
 namespace Statistic {
 namespace {
 
@@ -22,10 +24,10 @@ constexpr auto kStep = 5.;
 }
 
 [[nodiscard]] QString Format(ChartValue absoluteValue) {
-	constexpr auto kTooMuch = ChartValue(10'000);
+	static constexpr auto kTooMuch = ChartValue(10'000);
 	return (absoluteValue >= kTooMuch)
 		? Lang::FormatCountToShort(absoluteValue).string
-		: QString::number(absoluteValue);
+		: QLocale().toString(absoluteValue);
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/statistics/chart_widget.cpp b/Telegram/SourceFiles/statistics/chart_widget.cpp
index 4e7534d9a3f19a..600299e1683fbd 100644
--- a/Telegram/SourceFiles/statistics/chart_widget.cpp
+++ b/Telegram/SourceFiles/statistics/chart_widget.cpp
@@ -280,7 +280,7 @@ ChartWidget::Footer::Footer(not_null<Ui::RpWidget*> parent)
 	Qt::SolidLine,
 	Qt::RoundCap) {
 	sizeValue(
-	) | rpl::take(2) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::take(2) | rpl::on_next([=](const QSize &s) {
 		const auto current = xPercentageLimits();
 		if (current.min == current.max) {
 			setXPercentageLimits({ 0., 1. });
@@ -288,7 +288,7 @@ ChartWidget::Footer::Footer(not_null<Ui::RpWidget*> parent)
 	}, lifetime());
 
 	mouseStateChanged(
-	) | rpl::start_with_next([=](const RpMouseWidget::State &state) {
+	) | rpl::on_next([=](const RpMouseWidget::State &state) {
 		if (_moveCenterAnimation.animating()) {
 			return;
 		}
@@ -839,7 +839,7 @@ ChartWidget::ChartWidget(not_null<Ui::RpWidget*> parent)
 	}
 }) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_chartData) {
 			FillLineColorsByKey(_chartData);
 		}
@@ -928,7 +928,7 @@ QRect ChartWidget::chartAreaRect() const {
 
 void ChartWidget::setupChartArea() {
 	_chartArea->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(_chartArea.get());
 
 		const auto now = crl::now();
@@ -1112,7 +1112,7 @@ void ChartWidget::setupFooter() {
 	});
 
 	_animationController.addRulerRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_rulersView.add(
 			_animationController.finalHeightLimits(),
 			true);
@@ -1120,7 +1120,7 @@ void ChartWidget::setupFooter() {
 	}, _footer->lifetime());
 
 	_footer->xPercentageLimitsChange(
-	) | rpl::start_with_next([=](Limits xPercentageLimits) {
+	) | rpl::on_next([=](Limits xPercentageLimits) {
 		if (!_chartView) {
 			return;
 		}
@@ -1176,14 +1176,14 @@ void ChartWidget::setupDetails() {
 	});
 
 	_details.widget->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		if (shown && _details.widget->xIndex() < 0) {
 			_details.widget->hide();
 		}
 	}, _details.widget->lifetime());
 
 	_chartArea->mouseStateChanged(
-	) | rpl::start_with_next([=](const RpMouseWidget::State &state) {
+	) | rpl::on_next([=](const RpMouseWidget::State &state) {
 		if (_animationController.animating()) {
 			return;
 		}
@@ -1275,12 +1275,16 @@ void ChartWidget::processLocalZoom(int xIndex) {
 	if (_footer->isHidden()) {
 		return;
 	}
+	_localZoomLifetime.destroy();
 	const auto wasZoom = _footer->xPercentageLimits();
 
-	const auto header = Ui::CreateChild<Header>(this);
+	const auto headerOwned
+		= _localZoomLifetime.make_state<base::unique_qptr<Header>>(
+			base::make_unique_q<Header>(this));
+	const auto header = headerOwned->get();
 	header->show();
 	_header->geometryValue(
-	) | rpl::start_with_next([=](const QRect &g) {
+	) | rpl::on_next([=](const QRect &g) {
 		header->setGeometry(g);
 	}, header->lifetime());
 	header->setTitle(_header->title());
@@ -1290,7 +1294,8 @@ void ChartWidget::processLocalZoom(int xIndex) {
 		setAttribute(Qt::WA_TransparentForMouseEvents, !value);
 	};
 
-	const auto mouseTrackingLifetime = std::make_shared<rpl::lifetime>();
+	const auto mouseTrackingLifetime
+		= _localZoomLifetime.make_state<rpl::lifetime>();
 	_chartView->setUpdateCallback([=] { _chartArea->update(); });
 	const auto createMouseTracking = [=] {
 		_chartArea->setMouseTracking(true);
@@ -1298,7 +1303,7 @@ void ChartWidget::processLocalZoom(int xIndex) {
 		) | rpl::filter([](not_null<QEvent*> event) {
 			return (event->type() == QEvent::MouseMove)
 				|| (event->type() == QEvent::Leave);
-		}) | rpl::start_with_next([=](not_null<QEvent*> event) {
+		}) | rpl::on_next([=](not_null<QEvent*> event) {
 			auto pos = QPoint();
 			if (event->type() == QEvent::MouseMove) {
 				const auto e = static_cast<QMouseEvent*>(event.get());
@@ -1319,10 +1324,8 @@ void ChartWidget::processLocalZoom(int xIndex) {
 		0,
 		(header->height() - zoomOutButton->height()) / 2);
 	zoomOutButton->show();
-	zoomOutButton->setTextTransform(
-		Ui::RoundButton::TextTransform::NoTransform);
 	zoomOutButton->setClickedCallback([=] {
-		auto lifetime = std::make_shared<rpl::lifetime>();
+		auto lifetime = _localZoomLifetime.make_state<rpl::lifetime>();
 		const auto animation = lifetime->make_state<Ui::Animations::Simple>();
 		const auto currentXPercentage = _footer->xPercentageLimits();
 		animation->start([=](float64 value) {
@@ -1354,7 +1357,7 @@ void ChartWidget::processLocalZoom(int xIndex) {
 	const auto finish = [=](const Limits &zoomLimitIndices) {
 		createMouseTracking();
 		_footer->xPercentageLimitsChange(
-		) | rpl::start_with_next([=](const Limits &l) {
+		) | rpl::on_next([=](const Limits &l) {
 			const auto r = FindStackXIndicesFromRawXPercentages(
 				_chartData,
 				l,
@@ -1365,7 +1368,7 @@ void ChartWidget::processLocalZoom(int xIndex) {
 	};
 
 	{
-		auto lifetime = std::make_shared<rpl::lifetime>();
+		auto lifetime = _localZoomLifetime.make_state<rpl::lifetime>();
 		const auto animation = lifetime->make_state<Ui::Animations::Simple>();
 		_chartView->maybeLocalZoom({ _chartData, Type::Prepare });
 		animation->start([=](float64 value) {
@@ -1420,7 +1423,7 @@ void ChartWidget::setupFilterButtons() {
 	}
 
 	_filterButtons->buttonEnabledChanges(
-	) | rpl::start_with_next([=](const ChartLinesFilterWidget::Entry &e) {
+	) | rpl::on_next([=](const ChartLinesFilterWidget::Entry &e) {
 		const auto now = crl::now();
 		_linesFilterController->setEnabled(e.id, e.enabled, now);
 
@@ -1438,7 +1441,7 @@ void ChartWidget::setChartData(
 		ChartViewType type) {
 	if (width() < st::statisticsChartHeight) {
 		sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			if (s.width() > st::statisticsChartHeight) {
 				setChartData(chartData, type);
 				_waitingSizeLifetime.destroy();
@@ -1489,7 +1492,7 @@ void ChartWidget::setChartData(
 void ChartWidget::setTitle(rpl::producer<QString> &&title) {
 	std::move(
 		title
-	) | rpl::start_with_next([=](QString t) {
+	) | rpl::on_next([=](QString t) {
 		_header->setTitle(std::move(t));
 		_header->update();
 	}, _header->lifetime());
@@ -1502,7 +1505,7 @@ void ChartWidget::setZoomedChartData(
 	_zoomedChartWidget = base::make_unique_q<ChartWidget>(
 		dynamic_cast<Ui::RpWidget*>(parentWidget()));
 	geometryValue(
-	) | rpl::start_with_next([=](const QRect &geometry) {
+	) | rpl::on_next([=](const QRect &geometry) {
 		_zoomedChartWidget->moveToLeft(geometry.x(), geometry.y());
 	}, _zoomedChartWidget->lifetime());
 	_zoomedChartWidget->show();
@@ -1529,14 +1532,12 @@ void ChartWidget::setZoomedChartData(
 		customHeader,
 		tr::lng_stats_zoom_out(),
 		st::statisticsHeaderButton);
-	zoomOutButton->setTextTransform(
-		Ui::RoundButton::TextTransform::NoTransform);
 	zoomOutButton->moveToRight(
 		0,
 		(customHeader->height() - zoomOutButton->height()) / 2);
 	zoomOutButton->setClickedCallback([=] {
 		shownValue(
-		) | rpl::start_with_next([=](bool shown) {
+		) | rpl::on_next([=](bool shown) {
 			if (shown) {
 				_zoomedChartWidget = nullptr;
 			}
@@ -1555,4 +1556,12 @@ rpl::producer<float64> ChartWidget::zoomRequests() {
 	return _zoomRequests.events();
 }
 
+void FixCacheForHighDPIChartWidget(not_null<Ui::RpWidget*> container) {
+	if (style::DevicePixelRatio() != 1) {
+		container->paintRequest() | rpl::take(2) | rpl::on_next([=] {
+			container->update();
+		}, container->lifetime());
+	}
+}
+
 } // namespace Statistic
diff --git a/Telegram/SourceFiles/statistics/chart_widget.h b/Telegram/SourceFiles/statistics/chart_widget.h
index 5021603fff9168..488628a584f905 100644
--- a/Telegram/SourceFiles/statistics/chart_widget.h
+++ b/Telegram/SourceFiles/statistics/chart_widget.h
@@ -175,7 +175,10 @@ class ChartWidget : public Ui::RpWidget {
 	rpl::event_stream<float64> _zoomRequests;
 
 	rpl::lifetime _waitingSizeLifetime;
+	rpl::lifetime _localZoomLifetime;
 
 };
 
+void FixCacheForHighDPIChartWidget(not_null<Ui::RpWidget*> container);
+
 } // namespace Statistic
diff --git a/Telegram/SourceFiles/statistics/statistics.style b/Telegram/SourceFiles/statistics/statistics.style
index 882623394b8848..97b2180d27617d 100644
--- a/Telegram/SourceFiles/statistics/statistics.style
+++ b/Telegram/SourceFiles/statistics/statistics.style
@@ -59,7 +59,7 @@ statisticsPieChartPartOffset: 8px;
 statisticsChartHeaderHeight: 36px;
 statisticsChartHeaderPadding: margins(2px, 0px, 0px, 10px);
 statisticsHeaderTitleTextStyle: TextStyle(defaultTextStyle) {
-	font: font(13px);
+	font: font(boxFontSize semibold);
 }
 statisticsHeaderDatesTextStyle: TextStyle(defaultTextStyle) {
 	font: font(11px);
@@ -99,7 +99,6 @@ statisticsOverviewSubtext: FlatLabel(boxLabel) {
 statisticsOverviewMidSkip: 50px;
 statisticsOverviewRightSkip: 14px;
 
-statisticsRecentPostRowHeight: 40px;
 statisticsRecentPostButton: SettingsButton(defaultSettingsButton) {
 	height: 56px;
 	padding: margins(7px, 0px, 24px, 0px);
@@ -145,10 +144,6 @@ boostsListBox: PeerList(defaultPeerList) {
 }
 boostsLinkSkip: 5px;
 boostsLinkFieldPadding: margins(22px, 7px, 22px, 12px);
-boostsButton: SettingsButton(defaultSettingsButton) {
-	textFg: lightButtonFg;
-	textFgOver: lightButtonFgOver;
-}
 
 getBoostsButton: SettingsButton(reportReasonButton) {
 	textFg: lightButtonFg;
@@ -159,6 +154,10 @@ getBoostsButtonIcon: icon {{ "menu/gift_premium", lightButtonFg }};
 boostsListMiniIcon: icon{{ "boosts/boost_mini2", premiumButtonFg }};
 boostsListMiniIconPadding: margins(1px, 0px, 0px, 0px);
 boostsListMiniIconSkip: 1px;
+boostsListEntryIcon: IconEmoji {
+	icon: boostsListMiniIcon;
+	padding: margins(6px, 2px, 0px, 0px);
+}
 boostsListBadgeTextPadding: margins(16px, 1px, 6px, 0px);
 boostsListBadgePadding: margins(4px, 1px, 4px, 0px);
 boostsListBadgeHeight: 16px;
@@ -174,6 +173,5 @@ boostsListGiftMiniIcon: icon{{ "boosts/mini_gift", historyPeer8UserpicBg2 }};
 boostsListGiveawayMiniIcon: icon{{ "boosts/mini_giveaway", historyPeer4UserpicBg2 }};
 boostsListUnclaimedIcon: icon{{ "boosts/boost_unclaimed", premiumButtonFg }};
 boostsListUnknownIcon: icon{{ "boosts/boost_unknown", premiumButtonFg }};
-boostsListCreditsIconSize: 13px;
 
 statisticsCurrencyIcon: icon {{ "statistics/mini_currency_graph", windowSubTextFg }};
diff --git a/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp b/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
index 4e37805295bd97..10a77ade051bda 100644
--- a/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
+++ b/Telegram/SourceFiles/statistics/statistics_data_deserialize.cpp
@@ -8,7 +8,6 @@ For license and copyright information please follow this link:
 #include "statistics/statistics_data_deserialize.h"
 
 #include "base/debug_log.h"
-#include "data/data_channel_earn.h" // kEarnMultiplier.
 #include "data/data_statistics_chart.h"
 #include "statistics/statistics_types.h"
 #include "ui/text/format_values.h" // kCreditsCurrency.
@@ -64,9 +63,9 @@ Data::StatisticalChart StatisticalChartFromJSON(const QByteArray &json) {
 		const auto columnId = array.first().toString();
 		if (columnId == u"x"_q) {
 			const auto length = array.size() - 1;
-			result.x.resize(length);
+			result.x.reserve(length);
 			for (auto i = 0; i < length; i++) {
-				result.x[i] = array.at(i + 1).toDouble();
+				result.x.push_back(array.at(i + 1).toDouble());
 			}
 		} else {
 			auto line = Data::StatisticalChart::Line();
@@ -76,10 +75,7 @@ Data::StatisticalChart StatisticalChartFromJSON(const QByteArray &json) {
 			line.isHiddenOnStart = ranges::contains(hiddenLines, columnId);
 			line.y.resize(length);
 			for (auto i = 0; i < length; i++) {
-				using Currency = Data::StatisticalCurrency;
-				const auto multiplier = (result.currency == Currency::Credits)
-					? Data::kEarnMultiplier
-					: 1;
+				const auto multiplier = 1;
 				const auto value = ChartValue(
 						base::SafeRound(array.at(i + 1).toDouble()))
 					* multiplier;
@@ -94,7 +90,7 @@ Data::StatisticalChart StatisticalChartFromJSON(const QByteArray &json) {
 			result.lines.push_back(std::move(line));
 		}
 		if (result.x.size() > 1) {
-			result.timeStep = result.x[1] - result.x[0];
+			result.timeStep = std::max(1., result.x[1] - result.x[0]);
 		} else {
 			constexpr auto kOneDay = 3600 * 24 * 1000;
 			result.timeStep = kOneDay;
diff --git a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
index ac9dc4582ab5fe..9034ed1d26c169 100644
--- a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
+++ b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
@@ -7,7 +7,6 @@ For license and copyright information please follow this link:
 */
 #include "statistics/view/chart_rulers_view.h"
 
-#include "data/data_channel_earn.h" // Data::kEarnMultiplier.
 #include "info/channel_statistics/earn/earn_format.h"
 #include "lang/lang_keys.h"
 #include "statistics/chart_lines_filter_controller.h"
@@ -16,14 +15,19 @@ For license and copyright information please follow this link:
 #include "styles/style_basic.h"
 #include "styles/style_statistics.h"
 
+#include <QtCore/QLocale>
+
 namespace Statistic {
 namespace {
 
 [[nodiscard]] QString FormatF(float64 absoluteValue) {
-	constexpr auto kTooMuch = int(10'000);
-	return (absoluteValue >= kTooMuch)
+	static constexpr auto kTooMuch = int(10'000);
+	static constexpr auto kTooSmall = 1e-9;
+	return (std::abs(absoluteValue) <= kTooSmall)
+		? u"0"_q
+		: (absoluteValue >= kTooMuch)
 		? Lang::FormatCountToShort(absoluteValue).string
-		: QString::number(absoluteValue);
+		: QLocale().toString(absoluteValue);
 }
 
 } // namespace
@@ -39,12 +43,21 @@ void ChartRulersView::setChartData(
 		|| chartData.currencyRate;
 	if (chartData.currencyRate) {
 		_currencyIcon = ChartCurrencyIcon(chartData, {});
-		_leftCustomCaption = [=](float64 value) {
-			return FormatF(value / float64(Data::kEarnMultiplier));
-		};
-		_rightCustomCaption = [=, rate = chartData.currencyRate](float64 v) {
-			return Info::ChannelEarn::ToUsd(v, rate);
-		};
+		if (chartData.currency == Data::StatisticalCurrency::Ton) {
+			_leftCustomCaption = [=](float64 value) {
+				return FormatF(value / float64(kOneStarInNano));
+			};
+			_rightCustomCaption = [=, rate = chartData.currencyRate](float64 v) {
+				return Info::ChannelEarn::ToUsd(v / float64(kOneStarInNano), rate, 0);
+			};
+		} else {
+			_leftCustomCaption = [=](float64 value) {
+				return FormatF(value);
+			};
+			_rightCustomCaption = [=, rate = chartData.currencyRate](float64 v) {
+				return Info::ChannelEarn::ToUsd(v, rate, 0);
+			};
+		}
 		_rightPen = QPen(st::windowSubTextFg);
 	}
 	if (_isDouble && (chartData.lines.size() == 2)) {
diff --git a/Telegram/SourceFiles/statistics/view/linear_chart_view.cpp b/Telegram/SourceFiles/statistics/view/linear_chart_view.cpp
index de0c882f28f9d5..a13067aa1876de 100644
--- a/Telegram/SourceFiles/statistics/view/linear_chart_view.cpp
+++ b/Telegram/SourceFiles/statistics/view/linear_chart_view.cpp
@@ -204,6 +204,9 @@ int LinearChartView::findXIndexByPosition(
 		: ((*nearest) < xPercentageLimits.min)
 		? (nearest + 1)
 		: nearest;
+	if (resultXPercentageIt == end(chartData.xPercentage)) {
+		return chartData.xPercentage.size() - 1;
+	}
 	return std::distance(begin(chartData.xPercentage), resultXPercentageIt);
 }
 
diff --git a/Telegram/SourceFiles/statistics/view/stack_linear_chart_common.cpp b/Telegram/SourceFiles/statistics/view/stack_linear_chart_common.cpp
index b7727bd714ee8a..50b86284f15a44 100644
--- a/Telegram/SourceFiles/statistics/view/stack_linear_chart_common.cpp
+++ b/Telegram/SourceFiles/statistics/view/stack_linear_chart_common.cpp
@@ -83,6 +83,8 @@ PiePartData PiePartsPercentageByIndices(
 	for (const auto &line : chartData.lines) {
 		auto sum = ChartValue(0);
 		for (auto i = xIndices.min; i <= xIndices.max; i++) {
+			const auto index = int(base::SafeRound(i));
+			Assert(index >= 0 && index < line.y.size());
 			sum += line.y[i];
 		}
 		if (linesFilter) {
diff --git a/Telegram/SourceFiles/statistics/widgets/chart_header_widget.cpp b/Telegram/SourceFiles/statistics/widgets/chart_header_widget.cpp
index f22cffcee4bbd0..b8754ceb6388ac 100644
--- a/Telegram/SourceFiles/statistics/widgets/chart_header_widget.cpp
+++ b/Telegram/SourceFiles/statistics/widgets/chart_header_widget.cpp
@@ -43,7 +43,7 @@ void Header::paintEvent(QPaintEvent *e) {
 
 	p.fillRect(rect(), st::boxBg);
 
-	p.setPen(st::boxTextFg);
+	p.setPen(st::windowActiveTextFg);
 	_title.drawLeftElided(p, 0, 0, width(), width());
 
 	p.setPen(st::windowSubTextFg);
diff --git a/Telegram/SourceFiles/statistics/widgets/chart_lines_filter_widget.cpp b/Telegram/SourceFiles/statistics/widgets/chart_lines_filter_widget.cpp
index a6dfa45c23acdb..4b5c0a7208cf22 100644
--- a/Telegram/SourceFiles/statistics/widgets/chart_lines_filter_widget.cpp
+++ b/Telegram/SourceFiles/statistics/widgets/chart_lines_filter_widget.cpp
@@ -25,6 +25,7 @@ class ChartLinesFilterWidget::FlatCheckbox final : public Ui::AbstractButton {
 		const QString &text,
 		QColor activeColor);
 
+	void setOuterWidth(int outerWidth);
 	void shake();
 	void setChecked(bool value, bool animated);
 	[[nodiscard]] bool checked() const;
@@ -45,6 +46,7 @@ class ChartLinesFilterWidget::FlatCheckbox final : public Ui::AbstractButton {
 		int shift = 0;
 	} _shake;
 
+	int _naturalWidth = 0;
 	bool _checked = true;
 
 };
@@ -60,13 +62,19 @@ ChartLinesFilterWidget::FlatCheckbox::FlatCheckbox(
 , _text(st::statisticsDetailsPopupStyle, text) {
 	const auto &margins = st::statisticsChartFlatCheckboxMargins;
 	const auto h = _text.minHeight() + rect::m::sum::v(margins) * 2;
-	resize(
-		_text.maxWidth()
-			+ rect::m::sum::h(margins)
-			+ h
-			+ st::statisticsChartFlatCheckboxCheckWidth * 3
-			- st::statisticsChartFlatCheckboxShrinkkWidth,
-		h);
+	_naturalWidth = _text.maxWidth()
+		+ rect::m::sum::h(margins)
+		+ h
+		+ st::statisticsChartFlatCheckboxCheckWidth * 3
+		- st::statisticsChartFlatCheckboxShrinkkWidth;
+	resize(_naturalWidth, h);
+}
+
+void ChartLinesFilterWidget::FlatCheckbox::setOuterWidth(int outerWidth) {
+	const auto newWidth = std::max(std::min(_naturalWidth, outerWidth), 1);
+	if (width() != newWidth) {
+		resize(newWidth, height());
+	}
 }
 
 void ChartLinesFilterWidget::FlatCheckbox::setChecked(
@@ -108,12 +116,19 @@ void ChartLinesFilterWidget::FlatCheckbox::paintEvent(QPaintEvent *e) {
 
 	const auto checkWidth = st::statisticsChartFlatCheckboxCheckWidth;
 	const auto r = rect() - st::statisticsChartFlatCheckboxMargins;
-	const auto heightHalf = r.height() / 2.;
-	const auto textX = anim::interpolate(
-		r.center().x() - _text.maxWidth() / 2.,
-		r.x() + heightHalf + checkWidth * 5,
-		progress);
+	const auto heightHalf = r.height() / 2;
+	const auto constrained = (width() < _naturalWidth);
+	const auto checkedTextX = r.x() + heightHalf + checkWidth * 5;
+	const auto textX = constrained
+		? checkedTextX
+		: anim::interpolate(
+			r.center().x() - _text.maxWidth() / 2.,
+			checkedTextX,
+			progress);
 	const auto textY = (r - st::statisticsChartFlatCheckboxMargins).y();
+	const auto textWidth = constrained
+		? std::max(r.width() - (textX - r.x()) - heightHalf, 0)
+		: width();
 	p.fillRect(r, Qt::transparent);
 
 	constexpr auto kCheckPartProgress = 0.5;
@@ -136,7 +151,8 @@ void ChartLinesFilterWidget::FlatCheckbox::paintEvent(QPaintEvent *e) {
 	p.setPen(textColor);
 	const auto textContext = Ui::Text::PaintContext{
 		.position = QPoint(textX, textY),
-		.availableWidth = width(),
+		.availableWidth = textWidth,
+		.elisionLines = constrained ? 1 : 0,
 	};
 	_text.draw(p, textContext);
 
@@ -162,6 +178,7 @@ void ChartLinesFilterWidget::resizeToWidth(int outerWidth) {
 	auto maxRight = 0;
 	for (auto i = 0; i < _buttons.size(); i++) {
 		const auto raw = _buttons[i].get();
+		raw->setOuterWidth(outerWidth);
 		if (!i) {
 			raw->move(0, 0);
 		} else {
diff --git a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
index dc0668e9aab93b..b0cc6ba8abeed2 100644
--- a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
+++ b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
@@ -7,7 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "statistics/widgets/point_details_widget.h"
 
-#include "data/data_channel_earn.h" // Data::kEarnMultiplier.
+#include "base/debug_log.h"
 #include "info/channel_statistics/earn/earn_format.h"
 #include "lang/lang_keys.h"
 #include "statistics/statistics_common.h"
@@ -139,7 +139,7 @@ PointDetailsWidget::PointDetailsWidget(
 	if (zoomEnabled) {
 		rpl::single(rpl::empty_value()) | rpl::then(
 			style::PaletteChanged()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto w = st::statisticsDetailsArrowShift;
 			const auto stroke = style::ConvertScaleExact(
 				st::statisticsDetailsArrowStroke);
@@ -179,14 +179,17 @@ PointDetailsWidget::PointDetailsWidget(
 	const auto maxValueTextWidth = [&] {
 		if (hasUsdLine) {
 			auto maxValueWidth = 0;
-			const auto multiplier = float64(Data::kEarnMultiplier);
+			const auto multiplier = float64(kOneStarInNano);
 			for (const auto &value : _chartData.lines.front().y) {
 				const auto valueText = Ui::Text::String(
 					_textStyle,
-					QString::number(value / multiplier));
+					Lang::FormatExactCountDecimal(value / multiplier));
 				const auto usdText = Ui::Text::String(
 					_textStyle,
-					Info::ChannelEarn::ToUsd(value, _chartData.currencyRate));
+					Info::ChannelEarn::ToUsd(
+						value / multiplier,
+						_chartData.currencyRate,
+						0));
 				const auto width = std::max(
 					usdText.maxWidth(),
 					valueText.maxWidth());
@@ -211,6 +214,8 @@ PointDetailsWidget::PointDetailsWidget(
 
 	const auto calculatedWidth = [&]{
 		auto maxNameTextWidth = 0;
+		const auto isCredits
+			= _chartData.currency == Data::StatisticalCurrency::Credits;
 		for (const auto &dataLine : _chartData.lines) {
 			const auto maxNameText = Ui::Text::String(
 				_textStyle,
@@ -219,10 +224,12 @@ PointDetailsWidget::PointDetailsWidget(
 				maxNameText.maxWidth(),
 				maxNameTextWidth);
 			if (hasUsdLine) {
+				const auto text = isCredits
+					? tr::lng_channel_earn_chart_overriden_detail_credits
+					: tr::lng_channel_earn_chart_overriden_detail_currency;
 				const auto currency = Ui::Text::String(
 					_textStyle,
-					tr::lng_channel_earn_chart_overriden_detail_currency(
-						tr::now));
+					text(tr::now));
 				const auto usd = Ui::Text::String(
 					_textStyle,
 					tr::lng_channel_earn_chart_overriden_detail_usd(
@@ -254,7 +261,7 @@ PointDetailsWidget::PointDetailsWidget(
 			+ _maxPercentageWidth;
 	}();
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		const auto fullRect = s.isNull()
 			? Rect(Size(calculatedWidth))
 			: Rect(s);
@@ -297,6 +304,12 @@ void PointDetailsWidget::setXIndex(int xIndex) {
 	if (xIndex < 0) {
 		return;
 	}
+	if (xIndex >= _chartData.x.size()) {
+		LOG((u"xIndex out of bounds: %1, max: %2"_q)
+			.arg(xIndex)
+			.arg(_chartData.x.size() - 1));
+		xIndex = _chartData.x.size() - 1;
+	}
 	{
 		constexpr auto kOneDay = 3600 * 24 * 1000;
 		const auto timestamp = _chartData.x[xIndex];
@@ -318,9 +331,11 @@ void PointDetailsWidget::setXIndex(int xIndex) {
 			nullptr,
 			{ float64(xIndex), float64(xIndex) }).parts
 		: std::vector<PiePartData::Part>();
-	const auto multiplier = float64(Data::kEarnMultiplier);
+	const auto isCredits
+		= (_chartData.currency == Data::StatisticalCurrency::Credits);
 	for (auto i = 0; i < _chartData.lines.size(); i++) {
 		const auto &dataLine = _chartData.lines[i];
+		Assert(xIndex < dataLine.y.size());
 		auto textLine = Line();
 		textLine.id = dataLine.id;
 		if (_maxPercentageWidth) {
@@ -338,20 +353,27 @@ void PointDetailsWidget::setXIndex(int xIndex) {
 			copy.valueColor = QColor(dataLine.color);
 			copy.name.setText(
 				_textStyle,
-				tr::lng_channel_earn_chart_overriden_detail_currency(
-					tr::now));
+				(isCredits
+					? tr::lng_channel_earn_chart_overriden_detail_credits
+					: tr::lng_channel_earn_chart_overriden_detail_currency)(
+						tr::now));
+			const auto provided = dataLine.y[xIndex];
+			const auto value = isCredits
+				? CreditsAmount(provided, CreditsType::Stars)
+				: CreditsAmount(
+					provided / kOneStarInNano,
+					provided % kOneStarInNano,
+					CreditsType::Ton);
 			copy.value.setText(
 				_textStyle,
-				QString::number(dataLine.y[xIndex] / multiplier));
+				Lang::FormatCreditsAmountDecimal(value));
 			_lines.push_back(std::move(copy));
 			textLine.name.setText(
 				_textStyle,
 				tr::lng_channel_earn_chart_overriden_detail_usd(tr::now));
 			textLine.value.setText(
 				_textStyle,
-				Info::ChannelEarn::ToUsd(
-					dataLine.y[xIndex],
-					_chartData.currencyRate));
+				Info::ChannelEarn::ToUsd(value, _chartData.currencyRate, 0));
 		}
 		_lines.push_back(std::move(textLine));
 	}
@@ -460,7 +482,7 @@ void PointDetailsWidget::paintEvent(QPaintEvent *e) {
 				p.drawImage(
 					valueContext.position.x()
 						- _valueIcon.width() / style::DevicePixelRatio(),
-					lineY,
+					lineY + st::lineWidth,
 					_valueIcon);
 			}
 			const auto nameContext = Ui::Text::PaintContext{
diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h
index 92db569f15ffa2..252ab2c2aa698e 100644
--- a/Telegram/SourceFiles/stdafx.h
+++ b/Telegram/SourceFiles/stdafx.h
@@ -111,6 +111,7 @@ For license and copyright information please follow this link:
 
 #include "base/algorithm.h"
 #include "base/basic_types.h"
+#include "base/const_string.h"
 #include "base/debug_destroy_informer.h" // _DEBUG only.
 #include "base/flat_set.h"
 #include "base/flat_map.h"
@@ -118,6 +119,7 @@ For license and copyright information please follow this link:
 #include "base/optional.h"
 #include "base/variant.h"
 #include "base/weak_ptr.h"
+#include "base/weak_qptr.h"
 
 #include "scheme.h"
 #include "mtproto/type_utils.h"
@@ -128,11 +130,12 @@ For license and copyright information please follow this link:
 #include "ui/arc_angles.h"
 #include "ui/emoji_config.h"
 #include "ui/qt_object_factory.h"
-#include "ui/qt_weak_factory.h"
+#include "ui/ui_rpl_filter.h"
 
 #include "styles/palette.h"
 #include "styles/style_basic.h"
 
+#include "core/credits_amount.h"
 #include "core/utils.h"
 #include "logs.h"
 #include "config.h"
diff --git a/Telegram/SourceFiles/storage/details/storage_file_utilities.cpp b/Telegram/SourceFiles/storage/details/storage_file_utilities.cpp
index b4338484f8f52d..ab80afbc475d7d 100644
--- a/Telegram/SourceFiles/storage/details/storage_file_utilities.cpp
+++ b/Telegram/SourceFiles/storage/details/storage_file_utilities.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "storage/details/storage_file_utilities.h"
 
+#include "core/version.h"
 #include "mtproto/mtproto_auth_key.h"
 #include "base/platform/base_platform_file_utilities.h"
 #include "base/openssl_help.h"
diff --git a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
index 695f8f58aa2cfc..1d6796c20ce285 100644
--- a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
+++ b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
@@ -487,9 +487,9 @@ bool ReadSetting(
 		proxySettings.setSettings(proxy
 			? MTP::ProxyData::Settings::Enabled
 			: MTP::ProxyData::Settings::System);
-		proxySettings.list() = proxy
-			? std::vector<MTP::ProxyData>{ 1, proxy }
-			: std::vector<MTP::ProxyData>{};
+		proxySettings.setList(proxy
+			? std::vector<MTP::ProxyData>{ proxy }
+			: std::vector<MTP::ProxyData>{});
 		Core::App().refreshGlobalProxy();
 		context.legacyRead = true;
 	} break;
@@ -562,16 +562,16 @@ bool ReadSetting(
 			if (!CheckStreamStatus(stream)) {
 				return false;
 			}
-			proxySettings.list() = list;
+			proxySettings.setList(std::move(list));
 			if (connectionType == dbictProxiesListOld) {
 				settings = static_cast<qint32>(
-					(index > 0 && index <= list.size()
+					(index > 0 && index <= proxySettings.list().size()
 						? MTP::ProxyData::Settings::Enabled
 						: MTP::ProxyData::Settings::System));
 				index = std::abs(index);
 			}
-			proxySettings.setSelected((index > 0 && index <= list.size())
-				? list[index - 1]
+			proxySettings.setSelected((index > 0 && index <= proxySettings.list().size())
+				? proxySettings.list()[index - 1]
 				: MTP::ProxyData());
 
 			const auto unchecked = static_cast<MTP::ProxyData::Settings>(settings);
@@ -596,14 +596,14 @@ bool ReadSetting(
 				return false;
 			}
 			if (proxy) {
-				proxySettings.list() = { 1, proxy };
+				proxySettings.setList({ proxy });
 				proxySettings.setSelected(proxy);
 				proxySettings.setSettings((connectionType == dbictTcpProxy
 					|| connectionType == dbictHttpProxy)
 						? MTP::ProxyData::Settings::Enabled
 						: MTP::ProxyData::Settings::System);
 			} else {
-				proxySettings.list() = {};
+				proxySettings.setList({});
 				proxySettings.setSelected(MTP::ProxyData());
 				proxySettings.setSettings(MTP::ProxyData::Settings::System);
 			}
@@ -1059,9 +1059,7 @@ bool ReadSetting(
 			auto id = Ui::Emoji::IdFromOldKey(static_cast<uint64>(i.key()));
 			if (!id.isEmpty()) {
 				auto index = Ui::Emoji::ColorIndexFromOldKey(i.value());
-				if (index >= 0) {
-					variants.insert(id, index);
-				}
+				variants.insert(id, index);
 			}
 		}
 		Core::App().settings().setLegacyEmojiVariants(std::move(variants));
@@ -1086,6 +1084,7 @@ bool ReadSetting(
 			context.sessionSettings().setHiddenPinnedMessageId(
 				DeserializePeerId(i.key()),
 				MsgId(0), // topicRootId
+				PeerId(0), // monoforumPeerId
 				MsgId(i.value()));
 		}
 		context.legacyRead = true;
@@ -1124,6 +1123,7 @@ bool ReadSetting(
 
 		if (v == 2) {
 			Core::App().settings().setVoicePlaybackSpeed(2.);
+			Core::App().settings().setAudioPlaybackSpeed(2.);
 		}
 		context.legacyRead = true;
 	} break;
diff --git a/Telegram/SourceFiles/storage/download_manager_mtproto.cpp b/Telegram/SourceFiles/storage/download_manager_mtproto.cpp
index b74eb772185b12..0c8ae83721033c 100644
--- a/Telegram/SourceFiles/storage/download_manager_mtproto.cpp
+++ b/Telegram/SourceFiles/storage/download_manager_mtproto.cpp
@@ -124,7 +124,7 @@ DownloadManagerMtproto::DownloadManagerMtproto(not_null<ApiWrap*> api)
 	_api->instance().restartsByTimeout(
 	) | rpl::filter([](MTP::ShiftedDcId shiftedDcId) {
 		return MTP::isDownloadDcId(shiftedDcId);
-	}) | rpl::start_with_next([=](MTP::ShiftedDcId shiftedDcId) {
+	}) | rpl::on_next([=](MTP::ShiftedDcId shiftedDcId) {
 		sessionTimedOut(
 			MTP::BareDcId(shiftedDcId),
 			MTP::GetDcIdShift(shiftedDcId));
@@ -824,7 +824,7 @@ void DownloadMtprotoTask::subscribeToNonPremiumLimit() {
 		return;
 	}
 	_owner->api().instance().nonPremiumDelayedRequests(
-	) | rpl::start_with_next([=](mtpRequestId id) {
+	) | rpl::on_next([=](mtpRequestId id) {
 		if (_sentRequests.contains(id)) {
 			if (const auto documentId = objectId()) {
 				const auto type = v::get<StorageFileLocation>(
diff --git a/Telegram/SourceFiles/storage/file_download_web.cpp b/Telegram/SourceFiles/storage/file_download_web.cpp
index 33dda245f72f70..a0525d5786522f 100644
--- a/Telegram/SourceFiles/storage/file_download_web.cpp
+++ b/Telegram/SourceFiles/storage/file_download_web.cpp
@@ -18,6 +18,7 @@ namespace {
 constexpr auto kMaxWebFileQueries = 8;
 constexpr auto kMaxHttpRedirects = 5;
 constexpr auto kResetDownloadPrioritiesTimeout = crl::time(200);
+constexpr auto kMaxWebFile = 4000 * int64(1024 * 1024);
 
 std::weak_ptr<WebLoadManager> GlobalLoadManager;
 
@@ -41,6 +42,7 @@ enum class Error {
 struct Progress {
 	qint64 ready = 0;
 	qint64 total = 0;
+	QByteArray streamed;
 };
 
 using Update = std::variant<Progress, QByteArray, Error>;
@@ -67,10 +69,12 @@ class WebLoadManager final : public base::has_weak_ptr {
 	struct Enqueued {
 		int id = 0;
 		QString url;
+		bool stream = false;
 	};
 	struct Sent {
 		QString url;
 		not_null<QNetworkReply*> reply;
+		bool stream = false;
 		QByteArray data;
 		int64 ready = 0;
 		int64 total = 0;
@@ -81,7 +85,7 @@ class WebLoadManager final : public base::has_weak_ptr {
 	void handleNetworkErrors();
 
 	// Worker thread.
-	void enqueue(int id, const QString &url);
+	void enqueue(int id, const QString &url, bool stream);
 	void remove(int id);
 	void resetGeneration();
 	void checkSendNext();
@@ -107,7 +111,11 @@ class WebLoadManager final : public base::has_weak_ptr {
 	void failed(int id, not_null<QNetworkReply*> reply);
 	void finished(int id, not_null<QNetworkReply*> reply);
 	void deleteDeferred(not_null<QNetworkReply*> reply);
-	void queueProgressUpdate(int id, int64 ready, int64 total);
+	void queueProgressUpdate(
+		int id,
+		int64 ready,
+		int64 total,
+		QByteArray streamed);
 	void queueFailedUpdate(int id);
 	void queueFinishedUpdate(int id, const QByteArray &data);
 	void clear();
@@ -187,8 +195,9 @@ void WebLoadManager::enqueue(not_null<webFileLoader*> loader) {
 			: _ids.emplace(loader, ++_autoincrement).first->second;
 	}();
 	const auto url = loader->url();
+	const auto stream = loader->streamLoading();
 	InvokeQueued(_network.get(), [=] {
-		enqueue(id, url);
+		enqueue(id, url, stream);
 	});
 }
 
@@ -204,7 +213,7 @@ void WebLoadManager::remove(not_null<webFileLoader*> loader) {
 	});
 }
 
-void WebLoadManager::enqueue(int id, const QString &url) {
+void WebLoadManager::enqueue(int id, const QString &url, bool stream) {
 	const auto i = ranges::find(_queue, id, &Enqueued::id);
 	if (i != end(_queue)) {
 		return;
@@ -212,7 +221,7 @@ void WebLoadManager::enqueue(int id, const QString &url) {
 	_previousGeneration.erase(
 		ranges::remove(_previousGeneration, id, &Enqueued::id),
 		end(_previousGeneration));
-	_queue.push_back(Enqueued{ id, url });
+	_queue.push_back(Enqueued{ id, url, stream });
 	if (!_resetGenerationTimer.isActive()) {
 		_resetGenerationTimer.callOnce(kResetDownloadPrioritiesTimeout);
 	}
@@ -253,7 +262,7 @@ void WebLoadManager::checkSendNext() {
 void WebLoadManager::send(const Enqueued &entry) {
 	const auto id = entry.id;
 	const auto url = entry.url;
-	_sent.emplace(id, Sent{ url, send(id, url) });
+	_sent.emplace(id, Sent{ url, send(id, url), entry.stream });
 }
 
 void WebLoadManager::removeSent(int id) {
@@ -294,6 +303,13 @@ void WebLoadManager::progress(
 		not_null<QNetworkReply*> reply,
 		int64 ready,
 		int64 total) {
+	if (total <= 0) {
+		const auto originalContentLength = reply->attribute(
+			QNetworkRequest::OriginalContentLengthAttribute);
+		if (originalContentLength.isValid()) {
+			total = originalContentLength.toLongLong();
+		}
+	}
 	const auto statusCode = reply->attribute(
 		QNetworkRequest::HttpStatusCodeAttribute);
 	const auto status = statusCode.isValid() ? statusCode.toInt() : 200;
@@ -305,7 +321,7 @@ void WebLoadManager::progress(
 			).arg(status));
 		failed(id, reply);
 	} else {
-		notify(id, reply, ready, total);
+		notify(id, reply, ready, std::max(ready, total));
 	}
 }
 
@@ -338,10 +354,7 @@ void WebLoadManager::notify(
 	if (const auto sent = findSent(id, reply)) {
 		sent->ready = ready;
 		sent->total = std::max(total, int64(0));
-		sent->data.append(reply->readAll());
-		if (total == 0
-			|| total > Storage::kMaxFileInMemory
-			|| sent->data.size() > Storage::kMaxFileInMemory) {
+		if (total <= 0) {
 			LOG(("Network Error: "
 				"Bad size received for HTTP download progress "
 				"in WebLoadManager::onProgress(): %1 / %2 (bytes %3)"
@@ -349,10 +362,43 @@ void WebLoadManager::notify(
 				).arg(total
 				).arg(sent->data.size()));
 			failed(id, reply);
-		} else if (total > 0 && ready >= total) {
-			finished(id, reply);
+			return;
+		}
+		auto bytes = reply->readAll();
+		if (sent->stream) {
+			if (total > kMaxWebFile) {
+				LOG(("Network Error: "
+					"Bad size received for HTTP download progress "
+					"in WebLoadManager::onProgress(): %1 / %2"
+					).arg(ready
+					).arg(total));
+				failed(id, reply);
+			} else {
+				queueProgressUpdate(
+					id,
+					sent->ready,
+					sent->total,
+					std::move(bytes));
+				if (ready >= total) {
+					finished(id, reply);
+				}
+			}
 		} else {
-			queueProgressUpdate(id, sent->ready, sent->total);
+			sent->data.append(std::move(bytes));
+			if (total > Storage::kMaxFileInMemory
+				|| sent->data.size() > Storage::kMaxFileInMemory) {
+				LOG(("Network Error: "
+					"Bad size received for HTTP download progress "
+					"in WebLoadManager::onProgress(): %1 / %2 (bytes %3)"
+					).arg(ready
+					).arg(total
+					).arg(sent->data.size()));
+				failed(id, reply);
+			} else if (ready >= total) {
+				finished(id, reply);
+			} else {
+				queueProgressUpdate(id, sent->ready, sent->total, {});
+			}
 		}
 	}
 }
@@ -372,7 +418,7 @@ void WebLoadManager::failed(
 }
 
 void WebLoadManager::failed(int id, not_null<QNetworkReply*> reply) {
-	if (const auto sent = findSent(id, reply)) {
+	if ([[maybe_unused]] const auto sent = findSent(id, reply)) {
 		removeSent(id);
 		queueFailedUpdate(id);
 	}
@@ -406,9 +452,13 @@ void WebLoadManager::clear() {
 	}
 }
 
-void WebLoadManager::queueProgressUpdate(int id, int64 ready, int64 total) {
-	crl::on_main(this, [=] {
-		sendUpdate(id, Progress{ ready, total });
+void WebLoadManager::queueProgressUpdate(
+		int id,
+		int64 ready,
+		int64 total,
+		QByteArray streamed) {
+	crl::on_main(this, [=, bytes = std::move(streamed)]() mutable {
+		sendUpdate(id, Progress{ ready, total, std::move(bytes) });
 	});
 }
 
@@ -458,6 +508,25 @@ webFileLoader::webFileLoader(
 , _url(url) {
 }
 
+webFileLoader::webFileLoader(
+	not_null<Main::Session*> session,
+	const QString &url,
+	const QString &path,
+	WebRequestType type)
+: FileLoader(
+	session,
+	path,
+	0,
+	0,
+	UnknownFileLocation,
+	LoadToFileOnly,
+	LoadFromCloudOrLocal,
+	false,
+	0)
+, _url(url)
+, _requestType(type) {
+}
+
 webFileLoader::~webFileLoader() {
 	if (!_finished) {
 		cancel();
@@ -468,6 +537,14 @@ QString webFileLoader::url() const {
 	return _url;
 }
 
+WebRequestType webFileLoader::requestType() const {
+	return _requestType;
+}
+
+bool webFileLoader::streamLoading() const {
+	return (_toCache == LoadToFileOnly);
+}
+
 void webFileLoader::startLoading() {
 	if (_finished) {
 		return;
@@ -475,9 +552,12 @@ void webFileLoader::startLoading() {
 		_manager = GetManager();
 		_manager->updates(
 			this
-		) | rpl::start_with_next([=](const Update &data) {
+		) | rpl::on_next([=](const Update &data) {
 			if (const auto progress = std::get_if<Progress>(&data)) {
-				loadProgress(progress->ready, progress->total);
+				loadProgress(
+					progress->ready,
+					progress->total,
+					progress->streamed);
 			} else if (const auto bytes = std::get_if<QByteArray>(&data)) {
 				loadFinished(*bytes);
 			} else {
@@ -492,10 +572,19 @@ int64 webFileLoader::currentOffset() const {
 	return _ready;
 }
 
-void webFileLoader::loadProgress(qint64 ready, qint64 total) {
+void webFileLoader::loadProgress(
+		qint64 ready,
+		qint64 total,
+		const QByteArray &streamed) {
 	_fullSize = _loadSize = total;
 	_ready = ready;
-	notifyAboutProgress();
+	if (!streamed.isEmpty()
+		&& !writeResultPart(_streamedOffset, bytes::make_span(streamed))) {
+		loadFailed();
+	} else {
+		_streamedOffset += streamed.size();
+		notifyAboutProgress();
+	}
 }
 
 void webFileLoader::loadFinished(const QByteArray &data) {
diff --git a/Telegram/SourceFiles/storage/file_download_web.h b/Telegram/SourceFiles/storage/file_download_web.h
index efa6f6b8368d1b..bc5367ca182f19 100644
--- a/Telegram/SourceFiles/storage/file_download_web.h
+++ b/Telegram/SourceFiles/storage/file_download_web.h
@@ -11,6 +11,11 @@ For license and copyright information please follow this link:
 
 class WebLoadManager;
 
+enum class WebRequestType {
+	FullLoad,
+	OnlySize,
+};
+
 class webFileLoader final : public FileLoader {
 public:
 	webFileLoader(
@@ -20,9 +25,16 @@ class webFileLoader final : public FileLoader {
 		LoadFromCloudSetting fromCloud,
 		bool autoLoading,
 		uint8 cacheTag);
+	webFileLoader(
+		not_null<Main::Session*> session,
+		const QString &url,
+		const QString &path,
+		WebRequestType type);
 	~webFileLoader();
 
 	[[nodiscard]] QString url() const;
+	[[nodiscard]] WebRequestType requestType() const;
+	[[nodiscard]] bool streamLoading() const;
 
 	int64 currentOffset() const override;
 
@@ -33,12 +45,17 @@ class webFileLoader final : public FileLoader {
 	Storage::Cache::Key cacheKey() const override;
 	std::optional<MediaKey> fileLocationKey() const override;
 
-	void loadProgress(qint64 ready, qint64 size);
+	void loadProgress(
+		qint64 ready,
+		qint64 size,
+		const QByteArray &streamed);
 	void loadFinished(const QByteArray &data);
 	void loadFailed();
 
 	const QString _url;
 	int64 _ready = 0;
+	int64 _streamedOffset = 0;
+	WebRequestType _requestType = {};
 
 	std::shared_ptr<WebLoadManager> _manager;
 	rpl::lifetime _managerLifetime;
diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index 95c4b0a1b1cab5..d3c484debccf3c 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -19,8 +19,10 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "history/history.h"
 #include "core/file_location.h"
+#include "core/application.h"
 #include "core/mime_type.h"
 #include "main/main_session.h"
+#include "storage/storage_account.h"
 #include "apiwrap.h"
 
 namespace Storage {
@@ -124,7 +126,8 @@ Uploader::Entry::Entry(
 		: file->thumbId) {
 	if (file->type == SendMediaType::File
 		|| file->type == SendMediaType::ThemeFile
-		|| file->type == SendMediaType::Audio) {
+		|| file->type == SendMediaType::Audio
+		|| file->type == SendMediaType::Round) {
 		setDocSize(file->filesize);
 	}
 }
@@ -156,7 +159,7 @@ Uploader::Uploader(not_null<ApiWrap*> api)
 , _stopSessionsTimer([=] { stopSessions(); }) {
 	const auto session = &_api->session();
 	photoReady(
-	) | rpl::start_with_next([=](UploadedMedia &&data) {
+	) | rpl::on_next([=](UploadedMedia &&data) {
 		if (data.edit) {
 			const auto item = session->data().message(data.fullId);
 			Api::EditMessageWithUploadedPhoto(
@@ -172,7 +175,7 @@ Uploader::Uploader(not_null<ApiWrap*> api)
 	}, _lifetime);
 
 	documentReady(
-	) | rpl::start_with_next([=](UploadedMedia &&data) {
+	) | rpl::on_next([=](UploadedMedia &&data) {
 		if (data.edit) {
 			const auto item = session->data().message(data.fullId);
 			Api::EditMessageWithUploadedDocument(
@@ -188,27 +191,27 @@ Uploader::Uploader(not_null<ApiWrap*> api)
 	}, _lifetime);
 
 	photoProgress(
-	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+	) | rpl::on_next([=](const FullMsgId &fullId) {
 		processPhotoProgress(fullId);
 	}, _lifetime);
 
 	photoFailed(
-	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+	) | rpl::on_next([=](const FullMsgId &fullId) {
 		processPhotoFailed(fullId);
 	}, _lifetime);
 
 	documentProgress(
-	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+	) | rpl::on_next([=](const FullMsgId &fullId) {
 		processDocumentProgress(fullId);
 	}, _lifetime);
 
 	documentFailed(
-	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+	) | rpl::on_next([=](const FullMsgId &fullId) {
 		processDocumentFailed(fullId);
 	}, _lifetime);
 
 	_api->instance().nonPremiumDelayedRequests(
-	) | rpl::start_with_next([=](mtpRequestId id) {
+	) | rpl::on_next([=](mtpRequestId id) {
 		const auto i = _requests.find(id);
 		if (i != end(_requests)) {
 			i->second.nonPremiumDelayed = true;
@@ -228,6 +231,8 @@ void Uploader::processDocumentProgress(FullMsgId itemId) {
 		const auto document = media ? media->document() : nullptr;
 		const auto sendAction = (document && document->isVoiceMessage())
 			? Api::SendProgressType::UploadVoice
+			: (document && document->isVideoMessage())
+			? Api::SendProgressType::UploadRound
 			: Api::SendProgressType::UploadFile;
 		const auto progress = (document && document->uploading())
 			? ((document->uploadingData->offset * 100)
@@ -249,6 +254,8 @@ void Uploader::processDocumentFailed(FullMsgId itemId) {
 		const auto document = media ? media->document() : nullptr;
 		const auto sendAction = (document && document->isVoiceMessage())
 			? Api::SendProgressType::UploadVoice
+			: (document && document->isVideoMessage())
+			? Api::SendProgressType::UploadRound
 			: Api::SendProgressType::UploadFile;
 		sendProgressUpdate(item, sendAction, -1);
 	}
@@ -294,7 +301,8 @@ void Uploader::upload(
 			file->partssize);
 	} else if (file->type == SendMediaType::File
 		|| file->type == SendMediaType::ThemeFile
-		|| file->type == SendMediaType::Audio) {
+		|| file->type == SendMediaType::Audio
+		|| file->type == SendMediaType::Round) {
 		const auto document = file->thumb.isNull()
 			? session().data().processDocument(file->document)
 			: session().data().processDocument(
@@ -325,10 +333,31 @@ void Uploader::upload(
 		}
 		if (!file->filepath.isEmpty()) {
 			document->setLocation(Core::FileLocation(file->filepath));
+		} else if (!file->content.isEmpty()
+			&& !document->saveToCache()
+			&& !document->useStreamingLoader()
+			&& Core::App().canSaveFileWithoutAskingForPath()) {
+			const auto path = DocumentFileNameForSave(document);
+			if (!path.isEmpty()) {
+				auto f = QFile(path);
+				if (f.open(QIODevice::WriteOnly)
+					&& f.write(file->content) == file->content.size()) {
+					f.close();
+					document->setLocation(Core::FileLocation(path));
+					session().local().writeFileLocation(
+						document->mediaKey(),
+						Core::FileLocation(path));
+				}
+			}
 		}
 		if (file->type == SendMediaType::ThemeFile) {
 			document->checkWallPaperProperties();
 		}
+		if (file->videoCover) {
+			session().data().processPhoto(
+				file->videoCover->photo,
+				file->videoCover->photoThumbs);
+		}
 	}
 	_queue.push_back({ itemId, file });
 	if (!_nextTimer.isActive()) {
@@ -342,9 +371,26 @@ void Uploader::failed(FullMsgId itemId) {
 		const auto entry = std::move(*i);
 		_queue.erase(i);
 		notifyFailed(entry);
+	} else if (const auto coverId = _videoIdToCoverId.take(itemId)) {
+		if (const auto video = _videoWaitingCover.take(*coverId)) {
+			const auto document = session().data().document(video->id);
+			if (document->uploading()) {
+				document->status = FileUploadFailed;
+			}
+			_documentFailed.fire_copy(video->fullId);
+		}
+		failed(*coverId);
+	} else if (const auto video = _videoWaitingCover.take(itemId)) {
+		_videoIdToCoverId.remove(video->fullId);
+		const auto document = session().data().document(video->id);
+		if (document->uploading()) {
+			document->status = FileUploadFailed;
+		}
+		_documentFailed.fire_copy(video->fullId);
 	}
 	cancelRequests(itemId);
 	maybeFinishFront();
+
 	crl::on_main(this, [=] {
 		maybeSend();
 	});
@@ -356,7 +402,8 @@ void Uploader::notifyFailed(const Entry &entry) {
 		_photoFailed.fire_copy(entry.itemId);
 	} else if (type == SendMediaType::File
 		|| type == SendMediaType::ThemeFile
-		|| type == SendMediaType::Audio) {
+		|| type == SendMediaType::Audio
+		|| type == SendMediaType::Round) {
 		const auto document = session().data().document(entry.file->id);
 		if (document->uploading()) {
 			document->status = FileUploadFailed;
@@ -385,7 +432,8 @@ QByteArray Uploader::readDocPart(not_null<Entry*> entry) {
 	const auto checked = [&](QByteArray result) {
 		if ((entry->file->type == SendMediaType::File
 			|| entry->file->type == SendMediaType::ThemeFile
-			|| entry->file->type == SendMediaType::Audio)
+			|| entry->file->type == SendMediaType::Audio
+			|| entry->file->type == SendMediaType::Round)
 			&& entry->docSize <= kUseBigFilesFrom) {
 			entry->md5Hash.feed(result.data(), result.size());
 		}
@@ -756,7 +804,8 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 		_photoProgress.fire_copy(itemId);
 	} else if (entry.file->type == SendMediaType::File
 		|| entry.file->type == SendMediaType::ThemeFile
-		|| entry.file->type == SendMediaType::Audio) {
+		|| entry.file->type == SendMediaType::Audio
+		|| entry.file->type == SendMediaType::Round) {
 		const auto document = session().data().document(entry.file->id);
 		if (document->uploading()) {
 			document->uploadingData->offset = std::min(
@@ -845,7 +894,8 @@ void Uploader::finishFront() {
 			MTP_int(entry.parts->size()),
 			MTP_string(photoFilename),
 			MTP_bytes(md5));
-		_photoReady.fire({
+		auto ready = UploadedMedia{
+			.id = entry.file->id,
 			.fullId = entry.itemId,
 			.info = {
 				.file = file,
@@ -853,10 +903,17 @@ void Uploader::finishFront() {
 			},
 			.options = options,
 			.edit = edit,
-		});
+		};
+		const auto i = _videoWaitingCover.find(entry.itemId);
+		if (i != end(_videoWaitingCover)) {
+			uploadCoverAsPhoto(i->second.fullId, std::move(ready));
+		} else {
+			_photoReady.fire(std::move(ready));
+		}
 	} else if (entry.file->type == SendMediaType::File
 		|| entry.file->type == SendMediaType::ThemeFile
-		|| entry.file->type == SendMediaType::Audio) {
+		|| entry.file->type == SendMediaType::Audio
+		|| entry.file->type == SendMediaType::Round) {
 		QByteArray docMd5(32, Qt::Uninitialized);
 		hashMd5Hex(entry.md5Hash.result(), docMd5.data());
 
@@ -882,16 +939,23 @@ void Uploader::finishFront() {
 				MTP_string(thumbFilename),
 				MTP_bytes(thumbMd5));
 		}();
-		_documentReady.fire({
+		auto ready = UploadedMedia{
+			.id = entry.file->id,
 			.fullId = entry.itemId,
 			.info = {
 				.file = file,
 				.thumb = thumb,
 				.attachedStickers = attachedStickers,
+				.forceFile = entry.file->forceFile,
 			},
 			.options = options,
 			.edit = edit,
-		});
+		};
+		if (entry.file->videoCover) {
+			uploadVideoCover(std::move(ready), entry.file->videoCover);
+		} else {
+			_documentReady.fire(std::move(ready));
+		}
 	} else if (entry.file->type == SendMediaType::Secure) {
 		_secureReady.fire({
 			entry.itemId,
@@ -906,4 +970,55 @@ void Uploader::partFailed(const MTP::Error &error, mtpRequestId requestId) {
 	failed(request.itemId);
 }
 
+void Uploader::uploadVideoCover(
+		UploadedMedia &&video,
+		std::shared_ptr<FilePrepareResult> videoCover) {
+	const auto coverId = FullMsgId(
+		videoCover->to.peer,
+		session().data().nextLocalMessageId());
+	_videoIdToCoverId.emplace(video.fullId, coverId);
+	_videoWaitingCover.emplace(coverId, std::move(video));
+
+	upload(coverId, videoCover);
+}
+
+void Uploader::uploadCoverAsPhoto(
+		FullMsgId videoId,
+		UploadedMedia &&cover) {
+	const auto coverId = cover.fullId;
+	_api->request(MTPmessages_UploadMedia(
+		MTP_flags(0),
+		MTPstring(), // business_connection_id
+		session().data().peer(videoId.peer)->input(),
+		MTP_inputMediaUploadedPhoto(
+			MTP_flags(0),
+			cover.info.file,
+			MTP_vector<MTPInputDocument>(0),
+			MTP_int(0),
+			MTPInputDocument()) // video
+	)).done([=](const MTPMessageMedia &result) {
+		result.match([&](const MTPDmessageMediaPhoto &data) {
+			const auto photo = data.vphoto();
+			if (!photo || photo->type() != mtpc_photo) {
+				failed(coverId);
+				return;
+			}
+			const auto &fields = photo->c_photo();
+			if (const auto coverId = _videoIdToCoverId.take(videoId)) {
+				if (auto video = _videoWaitingCover.take(*coverId)) {
+					video->info.videoCover = MTP_inputPhoto(
+						fields.vid(),
+						fields.vaccess_hash(),
+						fields.vfile_reference());
+					_documentReady.fire(std::move(*video));
+				}
+			}
+		}, [&](const auto &) {
+			failed(coverId);
+		});
+	}).fail([=] {
+		failed(coverId);
+	}).send();
+}
+
 } // namespace Storage
diff --git a/Telegram/SourceFiles/storage/file_upload.h b/Telegram/SourceFiles/storage/file_upload.h
index 6f87f6a564db44..c4e5c93019fc40 100644
--- a/Telegram/SourceFiles/storage/file_upload.h
+++ b/Telegram/SourceFiles/storage/file_upload.h
@@ -25,10 +25,11 @@ class Session;
 
 namespace Storage {
 
-// MTP big files methods used for files greater than 10mb.
-constexpr auto kUseBigFilesFrom = 10 * 1024 * 1024;
+// MTP big files methods used for files greater than 30mb.
+constexpr auto kUseBigFilesFrom = 30 * 1024 * 1024;
 
 struct UploadedMedia {
+	uint64 id = 0;
 	FullMsgId fullId;
 	Api::RemoteFileInfo info;
 	Api::SendOptions options;
@@ -134,6 +135,11 @@ class Uploader final : public base::has_weak_ptr {
 	void partFailed(const MTP::Error &error, mtpRequestId requestId);
 	Request finishRequest(mtpRequestId requestId);
 
+	void uploadVideoCover(
+		UploadedMedia &&video,
+		std::shared_ptr<FilePrepareResult> videoCover);
+	void uploadCoverAsPhoto(FullMsgId videoId, UploadedMedia &&cover);
+
 	void processPhotoProgress(FullMsgId itemId);
 	void processPhotoFailed(FullMsgId itemId);
 	void processDocumentProgress(FullMsgId itemId);
@@ -163,6 +169,9 @@ class Uploader final : public base::has_weak_ptr {
 	crl::time _latestDcIndexRemoved = 0;
 	std::vector<Request> _pendingFromRemovedDcIndices;
 
+	base::flat_map<FullMsgId, FullMsgId> _videoIdToCoverId;
+	base::flat_map<FullMsgId, UploadedMedia> _videoWaitingCover;
+
 	FullMsgId _pausedId;
 	base::Timer _nextTimer, _stopSessionsTimer;
 
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 79c4af40114349..970899da55fce6 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -12,9 +12,10 @@ For license and copyright information please follow this link:
 #include "data/data_document.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "core/application.h"
+#include "core/core_settings.h"
 #include "core/file_utilities.h"
 #include "core/mime_type.h"
-#include "base/options.h"
 #include "base/unixtime.h"
 #include "base/random.h"
 #include "editor/scene/scene_item_sticker.h"
@@ -51,13 +52,6 @@ constexpr auto kRecompressAfterBpp = 4;
 
 using Ui::ValidateThumbDimensions;
 
-base::options::toggle SendLargePhotos({
-	.id = kOptionSendLargePhotos,
-	.name = "Send large photos",
-	.description = "Increase the side limit on compressed images to 2560px.",
-});
-std::atomic<bool> SendLargePhotosAtomic/* = false*/;
-
 struct PreparedFileThumbnail {
 	uint64 id = 0;
 	QString name;
@@ -206,20 +200,15 @@ struct PreparedFileThumbnail {
 	return result;
 }
 
-[[nodiscard]] int PhotoSideLimit(bool large) {
-	return large ? 2560 : 1280;
-}
-
-[[nodiscard]] int PhotoSideLimitAtomic() {
-	return PhotoSideLimit(SendLargePhotosAtomic.load());
-}
-
 } // namespace
 
-const char kOptionSendLargePhotos[] = "send-large-photos";
+int PhotoSideLimit(bool large) {
+	return large ? 2560 : 1280;
+}
 
 int PhotoSideLimit() {
-	return PhotoSideLimit(SendLargePhotos.value());
+	return PhotoSideLimit(
+		Core::App().settings().sendFilesWay().sendLargePhotos());
 }
 
 TaskQueue::TaskQueue(crl::time stopTimeoutMs) {
@@ -404,12 +393,15 @@ void SendingAlbum::removeItem(not_null<HistoryItem*> item) {
 	Assert(i != end(items));
 	items.erase(i);
 	if (moveCaption) {
-		const auto caption = item->originalText();
+		auto caption = item->originalText();
 		const auto firstId = items.front().msgId;
 		if (const auto first = item->history()->owner().message(firstId)) {
 			// We don't need to finishEdition() here, because the whole
 			// album will be rebuilt after one item was removed from it.
-			first->setText(caption);
+			auto firstCaption = first->originalText();
+			first->setText(firstCaption.text.isEmpty()
+				? std::move(caption)
+				: firstCaption.append('\n').append(std::move(caption)));
 			refreshMediaCaption(first);
 		}
 	}
@@ -463,52 +455,38 @@ std::shared_ptr<FilePrepareResult> MakePreparedFile(
 	return std::make_shared<FilePrepareResult>(std::move(descriptor));
 }
 
-FileLoadTask::FileLoadTask(
-	not_null<Main::Session*> session,
-	const QString &filepath,
-	const QByteArray &content,
-	std::unique_ptr<Ui::PreparedFileInformation> information,
-	SendMediaType type,
-	const FileLoadTo &to,
-	const TextWithTags &caption,
-	bool spoiler,
-	std::shared_ptr<SendingAlbum> album,
-	uint64 idOverride)
-: _id(idOverride ? idOverride : base::RandomValue<uint64>())
-, _session(session)
-, _dcId(session->mainDcId())
-, _to(to)
-, _album(std::move(album))
-, _filepath(filepath)
-, _content(content)
-, _information(std::move(information))
-, _type(type)
-, _caption(caption)
-, _spoiler(spoiler) {
-	Expects(to.options.scheduled
-		|| to.options.shortcutId
-		|| !to.replaceMediaOf
-		|| IsServerMsgId(to.replaceMediaOf));
-
-	SendLargePhotosAtomic = SendLargePhotos.value();
+FileLoadTask::FileLoadTask(Args &&args)
+: _id(args.idOverride ? args.idOverride : base::RandomValue<uint64>())
+, _session(args.session)
+, _dcId(args.session->mainDcId())
+, _to(std::move(args.to))
+, _album(std::move(args.album))
+, _filepath(std::move(args.filepath))
+, _displayName(std::move(args.displayName))
+, _content(std::move(args.content))
+, _videoCover(std::move(args.videoCover))
+, _information(std::move(args.information))
+, _type(args.type)
+, _caption(std::move(args.caption))
+, _spoiler(args.spoiler)
+, _forceFile(args.forceFile)
+, _sendLargePhotos(args.sendLargePhotos) {
+	Expects(_to.options.scheduled
+		|| _to.options.shortcutId
+		|| !_to.replaceMediaOf
+		|| IsServerMsgId(_to.replaceMediaOf));
 }
 
-FileLoadTask::FileLoadTask(
-	not_null<Main::Session*> session,
-	const QByteArray &voice,
-	crl::time duration,
-	const VoiceWaveform &waveform,
-	const FileLoadTo &to,
-	const TextWithTags &caption)
+FileLoadTask::FileLoadTask(VoiceArgs &&args)
 : _id(base::RandomValue<uint64>())
-, _session(session)
-, _dcId(session->mainDcId())
-, _to(to)
-, _content(voice)
-, _duration(duration)
-, _waveform(waveform)
-, _type(SendMediaType::Audio)
-, _caption(caption) {
+, _session(args.session)
+, _dcId(args.session->mainDcId())
+, _to(std::move(args.to))
+, _content(std::move(args.voice))
+, _duration(args.duration)
+, _waveform(std::move(args.waveform))
+, _type(args.video ? SendMediaType::Round : SendMediaType::Audio)
+, _caption(std::move(args.caption)) {
 }
 
 FileLoadTask::~FileLoadTask() = default;
@@ -678,7 +656,7 @@ bool FileLoadTask::FillImageInformation(
 	return true;
 }
 
-void FileLoadTask::process(Args &&args) {
+void FileLoadTask::process(ProcessArgs &&args) {
 	_result = MakePreparedFile({
 		.taskId = id(),
 		.id = _id,
@@ -687,6 +665,15 @@ void FileLoadTask::process(Args &&args) {
 		.spoiler = _spoiler,
 		.album = _album,
 	});
+	if (const auto cover = _videoCover.get()) {
+		cover->process();
+		if (const auto &result = cover->peekResult()) {
+			if (result->type == SendMediaType::Photo
+				&& !result->fileparts.empty()) {
+				_result->videoCover = result;
+			}
+		}
+	}
 
 	QString filename, filemime;
 	qint64 filesize = 0;
@@ -696,6 +683,7 @@ void FileLoadTask::process(Args &&args) {
 	auto isSong = false;
 	auto isVideo = false;
 	auto isVoice = (_type == SendMediaType::Audio);
+	auto isRound = (_type == SendMediaType::Round);
 	auto isSticker = false;
 
 	auto fullimage = QImage();
@@ -711,7 +699,7 @@ void FileLoadTask::process(Args &&args) {
 		// Voice sending is supported only from memory for now.
 		// Because for voice we force mime type and don't read MediaInformation.
 		// For a real file we always read mime type and read MediaInformation.
-		Assert(!isVoice);
+		Assert(!isVoice && !isRound);
 
 		filesize = info.size();
 		filename = info.fileName();
@@ -736,6 +724,9 @@ void FileLoadTask::process(Args &&args) {
 		if (isVoice) {
 			filename = filedialogDefaultName(u"audio"_q, u".ogg"_q, QString(), true);
 			filemime = "audio/ogg";
+		} else if (isRound) {
+			filename = filedialogDefaultName(u"round"_q, u".mp4"_q, QString(), true);
+			filemime = "video/mp4";
 		} else {
 			if (_information) {
 				if (auto image = std::get_if<Ui::PreparedFileInformation::Image>(
@@ -808,34 +799,29 @@ void FileLoadTask::process(Args &&args) {
 	QImage goodThumbnail;
 	QByteArray goodThumbnailBytes;
 
-	QVector<MTPDocumentAttribute> attributes(1, MTP_documentAttributeFilename(MTP_string(filename)));
+	auto attributes = QVector<MTPDocumentAttribute>(
+		1,
+		MTP_documentAttributeFilename(MTP_string(_displayName.isEmpty()
+			? filename
+			: _displayName)));
 
 	auto thumbnail = PreparedFileThumbnail();
 
 	auto photo = MTP_photoEmpty(MTP_long(0));
 	auto document = MTP_documentEmpty(MTP_long(0));
 
-	if (!isVoice) {
-		if (!_information) {
-			_information = readMediaInformation(filemime);
-			filemime = _information->filemime;
-		}
-		if (auto song = std::get_if<Ui::PreparedFileInformation::Song>(
-				&_information->media)) {
-			isSong = true;
-			const auto seconds = song->duration / 1000;
-			auto flags = MTPDdocumentAttributeAudio::Flag::f_title | MTPDdocumentAttributeAudio::Flag::f_performer;
-			attributes.push_back(MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(seconds), MTP_string(song->title), MTP_string(song->performer), MTPstring()));
-			thumbnail = PrepareFileThumbnail(std::move(song->cover));
-		} else if (auto video = std::get_if<Ui::PreparedFileInformation::Video>(
-				&_information->media)) {
+	if (isRound) {
+		_information = readMediaInformation(u"video/mp4"_q);
+		if (auto video = std::get_if<Ui::PreparedFileInformation::Video>(
+			&_information->media)) {
 			isVideo = true;
 			auto coverWidth = video->thumbnail.width();
 			auto coverHeight = video->thumbnail.height();
 			if (video->isGifv && !_album) {
 				attributes.push_back(MTP_documentAttributeAnimated());
 			}
-			auto flags = MTPDdocumentAttributeVideo::Flags(0);
+			auto flags = MTPDdocumentAttributeVideo::Flags(
+				MTPDdocumentAttributeVideo::Flag::f_round_message);
 			if (video->supportsStreaming) {
 				flags |= MTPDdocumentAttributeVideo::Flag::f_supports_streaming;
 			}
@@ -849,6 +835,51 @@ void FileLoadTask::process(Args &&args) {
 				MTPdouble(), // video_start_ts
 				MTPstring())); // video_codec
 
+			if (args.generateGoodThumbnail) {
+				goodThumbnail = video->thumbnail;
+				{
+					QBuffer buffer(&goodThumbnailBytes);
+					goodThumbnail.save(&buffer, "JPG", kThumbnailQuality);
+				}
+			}
+			thumbnail = PrepareFileThumbnail(std::move(video->thumbnail));
+		}
+	} else if (!isVoice) {
+		if (!_information) {
+			_information = readMediaInformation(filemime);
+			filemime = _information->filemime;
+		}
+		if (auto song = std::get_if<Ui::PreparedFileInformation::Song>(
+				&_information->media)) {
+			isSong = true;
+			const auto seconds = song->duration / 1000;
+			auto flags = MTPDdocumentAttributeAudio::Flag::f_title | MTPDdocumentAttributeAudio::Flag::f_performer;
+			attributes.push_back(MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(seconds), MTP_string(song->title), MTP_string(song->performer), MTPstring()));
+			thumbnail = PrepareFileThumbnail(std::move(song->cover));
+		} else if (auto video = std::get_if<Ui::PreparedFileInformation::Video>(
+				&_information->media)) {
+			isVideo = true;
+			auto coverWidth = video->thumbnail.width();
+			auto coverHeight = video->thumbnail.height();
+			if (!_forceFile) {
+				if (video->isGifv && !_album) {
+					attributes.push_back(MTP_documentAttributeAnimated());
+				}
+				auto flags = MTPDdocumentAttributeVideo::Flags(0);
+				if (video->supportsStreaming) {
+					flags |= MTPDdocumentAttributeVideo::Flag::f_supports_streaming;
+				}
+				const auto realSeconds = video->duration / 1000.;
+				attributes.push_back(MTP_documentAttributeVideo(
+					MTP_flags(flags),
+					MTP_double(realSeconds),
+					MTP_int(coverWidth),
+					MTP_int(coverHeight),
+					MTPint(),
+					MTPdouble(),
+					MTPstring()));
+			}
+
 			if (args.generateGoodThumbnail) {
 				goodThumbnail = video->thumbnail;
 				{
@@ -869,7 +900,7 @@ void FileLoadTask::process(Args &&args) {
 		}
 	}
 
-	if (!fullimage.isNull() && fullimage.width() > 0 && !isSong && !isVideo && !isVoice) {
+	if (!fullimage.isNull() && fullimage.width() > 0 && !isSong && !isVideo && !isVoice && !isRound) {
 		auto w = fullimage.width(), h = fullimage.height();
 		attributes.push_back(MTP_documentAttributeImageSize(MTP_int(w), MTP_int(h)));
 
@@ -901,7 +932,7 @@ void FileLoadTask::process(Args &&args) {
 				}
 				auto medium = (w > 320 || h > 320) ? fullimage.scaled(320, 320, Qt::KeepAspectRatio, Qt::SmoothTransformation) : fullimage;
 
-				const auto limit = PhotoSideLimitAtomic();
+				const auto limit = PhotoSideLimit(_sendLargePhotos);
 				const auto downscaled = (w > limit || h > limit);
 				auto full = downscaled ? fullimage.scaled(limit, limit, Qt::KeepAspectRatio, Qt::SmoothTransformation) : fullimage;
 				if (downscaled) {
@@ -975,7 +1006,7 @@ void FileLoadTask::process(Args &&args) {
 			MTPVector<MTPVideoSize>(),
 			MTP_int(_dcId),
 			MTP_vector<MTPDocumentAttribute>(attributes));
-		_type = SendMediaType::File;
+		_type = isRound ? SendMediaType::Round : SendMediaType::File;
 	}
 
 	if (_information) {
@@ -1009,6 +1040,7 @@ void FileLoadTask::process(Args &&args) {
 	_result->photo = photo;
 	_result->document = document;
 	_result->photoThumbs = photoThumbs;
+	_result->forceFile = _forceFile;
 }
 
 void FileLoadTask::finish() {
@@ -1034,8 +1066,8 @@ void FileLoadTask::finish() {
 	}
 }
 
-FilePrepareResult *FileLoadTask::peekResult() const {
-	return _result.get();
+const std::shared_ptr<FilePrepareResult> &FileLoadTask::peekResult() const {
+	return _result;
 }
 
 std::unique_ptr<Ui::PreparedFileInformation> FileLoadTask::readMediaInformation(
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index d4e99177fef5c7..af90953b44b324 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -24,13 +24,13 @@ constexpr auto kFileSizeLimit = 2'000 * int64(1024 * 1024);
 // Load files up to 4'000 MB.
 constexpr auto kFileSizePremiumLimit = 4'000 * int64(1024 * 1024);
 
-extern const char kOptionSendLargePhotos[];
-
+[[nodiscard]] int PhotoSideLimit(bool large);
 [[nodiscard]] int PhotoSideLimit();
 
 enum class SendMediaType {
 	Photo,
 	Audio,
+	Round,
 	File,
 	ThemeFile,
 	Secure,
@@ -127,6 +127,7 @@ struct SendingAlbum {
 	uint64 groupId = 0;
 	std::vector<Item> items;
 	Api::SendOptions options;
+	bool sent = false;
 
 };
 
@@ -191,9 +192,12 @@ struct FilePrepareResult {
 	PreparedPhotoThumbs photoThumbs;
 	TextWithTags caption;
 	bool spoiler = false;
+	bool forceFile = false;
 
 	std::vector<MTPInputDocument> attachedStickers;
 
+	std::shared_ptr<FilePrepareResult> videoCover;
+
 	void setFileData(const QByteArray &filedata);
 	void setThumbData(const QByteArray &thumbdata);
 
@@ -215,41 +219,53 @@ class FileLoadTask final : public Task {
 		QByteArray content = {},
 		QByteArray format = {});
 
-	FileLoadTask(
-		not_null<Main::Session*> session,
-		const QString &filepath,
-		const QByteArray &content,
-		std::unique_ptr<Ui::PreparedFileInformation> information,
-		SendMediaType type,
-		const FileLoadTo &to,
-		const TextWithTags &caption,
-		bool spoiler,
-		std::shared_ptr<SendingAlbum> album = nullptr,
-		uint64 idOverride = 0);
-	FileLoadTask(
-		not_null<Main::Session*> session,
-		const QByteArray &voice,
-		crl::time duration,
-		const VoiceWaveform &waveform,
-		const FileLoadTo &to,
-		const TextWithTags &caption);
+	struct Args {
+		not_null<Main::Session*> session;
+		QString filepath;
+		QByteArray content;
+		std::unique_ptr<Ui::PreparedFileInformation> information;
+		std::unique_ptr<FileLoadTask> videoCover;
+		SendMediaType type;
+		FileLoadTo to;
+		TextWithTags caption;
+		bool spoiler = false;
+		std::shared_ptr<SendingAlbum> album;
+		bool forceFile = false;
+		bool sendLargePhotos = false;
+		uint64 idOverride = 0;
+		QString displayName;
+	};
+
+	struct VoiceArgs {
+		not_null<Main::Session*> session;
+		QByteArray voice;
+		crl::time duration = 0;
+		VoiceWaveform waveform;
+		bool video = false;
+		FileLoadTo to;
+		TextWithTags caption;
+	};
+
+	explicit FileLoadTask(Args &&args);
+	explicit FileLoadTask(VoiceArgs &&args);
 	~FileLoadTask();
 
 	uint64 fileid() const {
 		return _id;
 	}
 
-	struct Args {
+	struct ProcessArgs {
 		bool generateGoodThumbnail = true;
 	};
-	void process(Args &&args);
+	void process(ProcessArgs &&args);
 
 	void process() override {
 		process({});
 	}
 	void finish() override;
 
-	FilePrepareResult *peekResult() const;
+	[[nodiscard]] auto peekResult() const
+		-> const std::shared_ptr<FilePrepareResult> &;
 
 private:
 	static bool CheckForSong(
@@ -277,13 +293,17 @@ class FileLoadTask final : public Task {
 	FileLoadTo _to;
 	const std::shared_ptr<SendingAlbum> _album;
 	QString _filepath;
+	QString _displayName;
 	QByteArray _content;
+	std::unique_ptr<FileLoadTask> _videoCover;
 	std::unique_ptr<Ui::PreparedFileInformation> _information;
 	crl::time _duration = 0;
 	VoiceWaveform _waveform;
 	SendMediaType _type;
 	TextWithTags _caption;
 	bool _spoiler = false;
+	bool _forceFile = false;
+	bool _sendLargePhotos = false;
 
 	std::shared_ptr<FilePrepareResult> _result;
 
diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp
index 2958024b5ebd8f..814e5de90d294f 100644
--- a/Telegram/SourceFiles/storage/localstorage.cpp
+++ b/Telegram/SourceFiles/storage/localstorage.cpp
@@ -21,6 +21,7 @@ For license and copyright information please follow this link:
 #include "core/file_location.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "core/version.h"
 #include "media/audio/media_audio.h"
 #include "mtproto/mtproto_config.h"
 #include "mtproto/mtproto_dc_options.h"
diff --git a/Telegram/SourceFiles/storage/serialize_document.cpp b/Telegram/SourceFiles/storage/serialize_document.cpp
index e13a587cfbc03a..89b335ce4708de 100644
--- a/Telegram/SourceFiles/storage/serialize_document.cpp
+++ b/Telegram/SourceFiles/storage/serialize_document.cpp
@@ -137,7 +137,8 @@ DocumentData *Document::readFromStreamHelper(
 				|| info->setId == Data::Stickers::CloudRecentSetId
 				|| info->setId == Data::Stickers::CloudRecentAttachedSetId
 				|| info->setId == Data::Stickers::FavedSetId
-				|| info->setId == Data::Stickers::CustomSetId) {
+				|| info->setId == Data::Stickers::CustomSetId
+				|| info->setId == Data::Stickers::CollectibleSetId) {
 				typeOfSet = StickerSetTypeEmpty;
 			}
 
diff --git a/Telegram/SourceFiles/storage/serialize_peer.cpp b/Telegram/SourceFiles/storage/serialize_peer.cpp
index 96e9daec05c7bc..021923844b17e1 100644
--- a/Telegram/SourceFiles/storage/serialize_peer.cpp
+++ b/Telegram/SourceFiles/storage/serialize_peer.cpp
@@ -21,7 +21,7 @@ namespace {
 
 constexpr auto kModernImageLocationTag = std::numeric_limits<qint32>::min();
 constexpr auto kVersionTag = uint64(0x77FF'FFFF'FFFF'FFFFULL);
-constexpr auto kVersion = 2;
+constexpr auto kVersion = 3;
 
 } // namespace
 
@@ -130,7 +130,8 @@ uint32 peerSize(not_null<PeerData*> peer) {
 			+ stringSize(botInlinePlaceholder)
 			+ sizeof(quint32) // lastseen
 			+ sizeof(qint32) // contact
-			+ sizeof(qint32); // botInfoVersion
+			+ sizeof(qint32) // botInfoVersion
+			+ sizeof(qint32); // supportsGuestChat
 	} else if (const auto chat = peer->asChat()) {
 		result += stringSize(chat->name())
 			+ sizeof(qint32) // count
@@ -174,7 +175,10 @@ void writePeer(QDataStream &stream, not_null<PeerData*> peer) {
 			<< botInlinePlaceholder
 			<< quint32(user->lastseen().serialize())
 			<< qint32(user->isContact() ? 1 : 0)
-			<< qint32(user->isBot() ? user->botInfo->version : -1);
+			<< qint32(user->isBot() ? user->botInfo->version : -1)
+			<< qint32(user->isBot()
+				&& user->botInfo
+				&& user->botInfo->supportsGuestChat);
 	} else if (const auto chat = peer->asChat()) {
 		auto field1 = qint32(uint32(chat->creator.bare & 0xFFFFFFFFULL));
 		auto field2 = qint32(uint32(chat->creator.bare >> 32) << 8);
@@ -190,7 +194,7 @@ void writePeer(QDataStream &stream, not_null<PeerData*> peer) {
 	} else if (const auto channel = peer->asChannel()) {
 		stream
 			<< channel->name()
-			<< quint64(channel->access)
+			<< quint64(channel->accessHash())
 			<< qint32(channel->date)
 			<< qint32(0) // legacy - version
 			<< qint32(0)
@@ -237,7 +241,7 @@ PeerData *readPeer(
 	if (const auto user = result->asUser()) {
 		QString first, last, phone, username, inlinePlaceholder;
 		quint64 access;
-		qint32 flags = 0, contact, botInfoVersion;
+		qint32 flags = 0, contact, botInfoVersion, supportsGuestChat = 0;
 		quint32 lastseen;
 		stream >> first >> last >> phone >> username >> access;
 		if (streamAppVersion >= 9012) {
@@ -247,6 +251,9 @@ PeerData *readPeer(
 			stream >> inlinePlaceholder;
 		}
 		stream >> lastseen >> contact >> botInfoVersion;
+		if (version > 2) {
+			stream >> supportsGuestChat;
+		}
 
 		userpicAccessHash = access;
 
@@ -295,17 +302,12 @@ PeerData *readPeer(
 				: Data::LastseenStatus::FromLegacy(lastseen));
 			user->setIsContact(contact == 1);
 			user->setBotInfoVersion(botInfoVersion);
+			if (user->isBot() && user->botInfo) {
+				user->botInfo->supportsGuestChat = (supportsGuestChat == 1);
+			}
 			if (!inlinePlaceholder.isEmpty() && user->isBot()) {
 				user->botInfo->inlinePlaceholder = inlinePlaceholder;
 			}
-
-			if (user->id == selfId) {
-				user->input = MTP_inputPeerSelf();
-				user->inputUser = MTP_inputUserSelf();
-			} else {
-				user->input = MTP_inputPeerUser(MTP_long(peerToUser(user->id).bare), MTP_long(user->accessHash()));
-				user->inputUser = MTP_inputUser(MTP_long(peerToUser(user->id).bare), MTP_long(user->accessHash()));
-			}
 		}
 	} else if (const auto chat = result->asChat()) {
 		QString name, inviteLink;
@@ -373,8 +375,6 @@ PeerData *readPeer(
 
 			chat->creator = creator;
 			chat->setInviteLink(inviteLink);
-
-			chat->input = MTP_inputPeerChat(MTP_long(peerToChat(chat->id).bare));
 		}
 	} else if (const auto channel = result->asChannel()) {
 		QString name, inviteLink;
@@ -394,7 +394,7 @@ PeerData *readPeer(
 
 		if (apply) {
 			channel->setName(name, QString());
-			channel->access = access;
+			channel->setAccessHash(access);
 			channel->date = date;
 
 			if (streamAppVersion >= 2008007) {
@@ -440,9 +440,6 @@ PeerData *readPeer(
 			}
 
 			channel->setInviteLink(inviteLink);
-
-			channel->input = MTP_inputPeerChannel(MTP_long(peerToChannel(channel->id).bare), MTP_long(access));
-			channel->inputChannel = MTP_inputChannel(MTP_long(peerToChannel(channel->id).bare), MTP_long(access));
 		}
 	}
 	if (apply) {
diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp
index a24a6e6fc0be49..16151e63e32177 100644
--- a/Telegram/SourceFiles/storage/storage_account.cpp
+++ b/Telegram/SourceFiles/storage/storage_account.cpp
@@ -28,7 +28,10 @@ For license and copyright information please follow this link:
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "core/file_location.h"
+#include "core/version.h"
+#include "data/components/recent_inline_bots.h"
 #include "data/components/recent_peers.h"
+#include "settings/settings_recent_searches.h"
 #include "data/components/top_peers.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_session.h"
@@ -47,6 +50,7 @@ using Database = Cache::Database;
 
 constexpr auto kDelayedWriteTimeout = crl::time(1000);
 constexpr auto kWriteSearchSuggestionsDelay = 5 * crl::time(1000);
+constexpr auto kMaxSavedPlaybackPositions = 256;
 
 constexpr auto kStickersVersionTag = quint32(-1);
 constexpr auto kStickersSerializeVersion = 4;
@@ -66,6 +70,7 @@ constexpr auto kMultiDraftCursorsTagOld = quint64(0xFFFF'FFFF'FFFF'FF02ULL);
 constexpr auto kMultiDraftTag = quint64(0xFFFF'FFFF'FFFF'FF03ULL);
 constexpr auto kMultiDraftCursorsTag = quint64(0xFFFF'FFFF'FFFF'FF04ULL);
 constexpr auto kRichDraftsTag = quint64(0xFFFF'FFFF'FFFF'FF05ULL);
+constexpr auto kDraftsTag2 = quint64(0xFFFF'FFFF'FFFF'FF06ULL);
 
 enum { // Local Storage Keys
 	lskUserMap = 0x00,
@@ -85,7 +90,7 @@ enum { // Local Storage Keys
 	lskSavedGifsOld = 0x0e, // no data
 	lskSavedGifs = 0x0f, // no data
 	lskStickersKeys = 0x10, // no data
-	lskTrustedBots = 0x11, // no data
+	lskTrustedPeers = 0x11, // no data
 	lskFavedStickers = 0x12, // no data
 	lskExportSettings = 0x13, // no data
 	lskBackgroundOld = 0x14, // no data
@@ -94,6 +99,11 @@ enum { // Local Storage Keys
 	lskCustomEmojiKeys = 0x17, // no data
 	lskSearchSuggestions = 0x18, // no data
 	lskWebviewTokens = 0x19, // data: QByteArray bots, QByteArray other
+	lskRoundPlaceholder = 0x1a, // no data
+	lskInlineBotsDownloads = 0x1b, // no data
+	lskMediaLastPlaybackPositions = 0x1c, // no data
+	lskBotStorages = 0x1d, // data: PeerId botId
+	lskPrefs = 0x1e, // no data
 };
 
 auto EmptyMessageDraftSources()
@@ -130,6 +140,33 @@ auto EmptyMessageDraftSources()
 	return cWorkingDir() + u"tdata/tdld/"_q;
 }
 
+[[nodiscard]] std::pair<quint64, quint64> SerializeSuggest(
+		SuggestOptions options) {
+	return {
+		((quint64(options.exists) << 63)
+			| (quint64(quint32(options.date)))),
+		((quint64(options.ton) << 63)
+			| (quint64(options.priceWhole) << 32)
+			| (quint64(options.priceNano))),
+	};
+}
+
+[[nodiscard]] SuggestOptions DeserializeSuggest(
+		std::pair<quint64, quint64> suggest) {
+	const auto exists = (suggest.first >> 63) ? 1 : 0;
+	const auto date = TimeId(uint32(suggest.first & 0xFFFF'FFFFULL));
+	const auto ton = (suggest.second >> 63) ? 1 : 0;
+	const auto priceWhole = uint32((suggest.second >> 32) & 0x7FFF'FFFFULL);
+	const auto priceNano = uint32(suggest.second & 0xFFFF'FFFFULL);
+	return {
+		.exists = uint32(exists),
+		.priceWhole = priceWhole,
+		.priceNano = priceNano,
+		.ton = uint32(ton),
+		.date = date,
+	};
+}
+
 } // namespace
 
 Account::Account(not_null<Main::Account*> owner, const QString &dataName)
@@ -144,6 +181,7 @@ Account::Account(not_null<Main::Account*> owner, const QString &dataName)
 , _cacheTotalTimeLimit(Database::Settings().totalTimeLimit)
 , _cacheBigFileTotalTimeLimit(Database::Settings().totalTimeLimit)
 , _writeMapTimer([=] { writeMap(); })
+, _writePrefsTimer([=] { writePrefs(); })
 , _writeLocationsTimer([=] { writeLocations(); })
 , _writeSearchSuggestionsTimer([=] { writeSearchSuggestions(); }) {
 }
@@ -151,8 +189,13 @@ Account::Account(not_null<Main::Account*> owner, const QString &dataName)
 Account::~Account() {
 	Expects(!_writeSearchSuggestionsTimer.isActive());
 
-	if (_localKey && _mapChanged) {
-		writeMap();
+	if (_localKey) {
+		if (_prefsChanged) {
+			writePrefs();
+		}
+		if (_mapChanged) {
+			writeMap();
+		}
 	}
 }
 
@@ -160,6 +203,10 @@ QString Account::tempDirectory() const {
 	return _tempPath;
 }
 
+QString Account::supportModePath() const {
+	return _databasePath + u"support"_q;
+}
+
 StartResult Account::legacyStart(const QByteArray &passcode) {
 	const auto result = readMapWith(MTP::AuthKeyPtr(), passcode);
 	if (result == ReadMapResult::Failed) {
@@ -199,6 +246,7 @@ void Account::clearLegacyFiles() {
 
 base::flat_set<QString> Account::collectGoodNames() const {
 	const auto keys = {
+		_prefsKey,
 		_locationsKey,
 		_settingsKey,
 		_installedStickersKey,
@@ -212,7 +260,7 @@ base::flat_set<QString> Account::collectGoodNames() const {
 		_legacyBackgroundKeyDay,
 		_recentHashtagsAndBotsKey,
 		_exportSettingsKey,
-		_trustedBotsKey,
+		_trustedPeersKey,
 		_installedMasksKey,
 		_recentMasksKey,
 		_archivedMasksKey,
@@ -220,6 +268,9 @@ base::flat_set<QString> Account::collectGoodNames() const {
 		_featuredCustomEmojiKey,
 		_archivedCustomEmojiKey,
 		_searchSuggestionsKey,
+		_roundPlaceholderKey,
+		_inlineBotsDownloadsKey,
+		_mediaLastPlaybackPositionsKey,
 	};
 	auto result = base::flat_set<QString>{
 		"map0",
@@ -244,6 +295,9 @@ base::flat_set<QString> Account::collectGoodNames() const {
 	for (const auto &[key, value] : _draftCursorsMap) {
 		push(value);
 	}
+	for (const auto &[key, value] : _botStoragesMap) {
+		push(value);
+	}
 	for (const auto &value : keys) {
 		push(value);
 	}
@@ -297,7 +351,9 @@ Account::ReadMapResult Account::readMapWith(
 	base::flat_map<PeerId, FileKey> draftsMap;
 	base::flat_map<PeerId, FileKey> draftCursorsMap;
 	base::flat_map<PeerId, bool> draftsNotReadMap;
-	quint64 locationsKey = 0, reportSpamStatusesKey = 0, trustedBotsKey = 0;
+	base::flat_map<PeerId, FileKey> botStoragesMap;
+	base::flat_map<PeerId, bool> botStoragesNotReadMap;
+	quint64 prefsKey = 0, locationsKey = 0, reportSpamStatusesKey = 0, trustedPeersKey = 0;
 	quint64 recentStickersKeyOld = 0;
 	quint64 installedStickersKey = 0, featuredStickersKey = 0, recentStickersKey = 0, favedStickersKey = 0, archivedStickersKey = 0;
 	quint64 installedMasksKey = 0, recentMasksKey = 0, archivedMasksKey = 0;
@@ -306,6 +362,9 @@ Account::ReadMapResult Account::readMapWith(
 	quint64 legacyBackgroundKeyDay = 0, legacyBackgroundKeyNight = 0;
 	quint64 userSettingsKey = 0, recentHashtagsAndBotsKey = 0, exportSettingsKey = 0;
 	quint64 searchSuggestionsKey = 0;
+	quint64 roundPlaceholderKey = 0;
+	quint64 inlineBotsDownloadsKey = 0;
+	quint64 mediaLastPlaybackPositionsKey = 0;
 	QByteArray webviewStorageTokenBots, webviewStorageTokenOther;
 	while (!map.stream.atEnd()) {
 		quint32 keyType;
@@ -350,6 +409,9 @@ Account::ReadMapResult Account::readMapWith(
 				// Just ignore the key, it will be removed as a leaked one.
 			}
 		} break;
+		case lskPrefs: {
+			map.stream >> prefsKey;
+		} break;
 		case lskLocations: {
 			map.stream >> locationsKey;
 		} break;
@@ -357,8 +419,8 @@ Account::ReadMapResult Account::readMapWith(
 			map.stream >> reportSpamStatusesKey;
 			ClearKey(reportSpamStatusesKey, _basePath);
 		} break;
-		case lskTrustedBots: {
-			map.stream >> trustedBotsKey;
+		case lskTrustedPeers: {
+			map.stream >> trustedPeersKey;
 		} break;
 		case lskRecentStickersOld: {
 			map.stream >> recentStickersKeyOld;
@@ -415,11 +477,32 @@ Account::ReadMapResult Account::readMapWith(
 		case lskSearchSuggestions: {
 			map.stream >> searchSuggestionsKey;
 		} break;
+		case lskRoundPlaceholder: {
+			map.stream >> roundPlaceholderKey;
+		} break;
+		case lskInlineBotsDownloads: {
+			map.stream >> inlineBotsDownloadsKey;
+		} break;
+		case lskMediaLastPlaybackPositions: {
+			map.stream >> mediaLastPlaybackPositionsKey;
+		} break;
 		case lskWebviewTokens: {
 			map.stream
 				>> webviewStorageTokenBots
 				>> webviewStorageTokenOther;
 		} break;
+		case lskBotStorages: {
+			quint32 count = 0;
+			map.stream >> count;
+			for (quint32 i = 0; i < count; ++i) {
+				FileKey key;
+				quint64 peerIdSerialized;
+				map.stream >> key >> peerIdSerialized;
+				const auto peerId = DeserializePeerId(peerIdSerialized);
+				botStoragesMap.emplace(peerId, key);
+				botStoragesNotReadMap.emplace(peerId, true);
+			}
+		} break;
 		default:
 			LOG(("App Error: unknown key type in encrypted map: %1").arg(keyType));
 			return ReadMapResult::Failed;
@@ -434,9 +517,12 @@ Account::ReadMapResult Account::readMapWith(
 	_draftsMap = draftsMap;
 	_draftCursorsMap = draftCursorsMap;
 	_draftsNotReadMap = draftsNotReadMap;
+	_botStoragesMap = botStoragesMap;
+	_botStoragesNotReadMap = botStoragesNotReadMap;
 
+	_prefsKey = prefsKey;
 	_locationsKey = locationsKey;
-	_trustedBotsKey = trustedBotsKey;
+	_trustedPeersKey = trustedPeersKey;
 	_recentStickersKeyOld = recentStickersKeyOld;
 	_installedStickersKey = installedStickersKey;
 	_featuredStickersKey = featuredStickersKey;
@@ -456,6 +542,9 @@ Account::ReadMapResult Account::readMapWith(
 	_recentHashtagsAndBotsKey = recentHashtagsAndBotsKey;
 	_exportSettingsKey = exportSettingsKey;
 	_searchSuggestionsKey = searchSuggestionsKey;
+	_roundPlaceholderKey = roundPlaceholderKey;
+	_inlineBotsDownloadsKey = inlineBotsDownloadsKey;
+	_mediaLastPlaybackPositionsKey = mediaLastPlaybackPositionsKey;
 	_oldMapVersion = mapData.version;
 	_webviewStorageIdBots.token = webviewStorageTokenBots;
 	_webviewStorageIdOther.token = webviewStorageTokenOther;
@@ -466,6 +555,9 @@ Account::ReadMapResult Account::readMapWith(
 		_mapChanged = false;
 	}
 
+	if (_prefsKey) {
+		readPrefs();
+	}
 	if (_locationsKey) {
 		readLocations();
 	}
@@ -546,8 +638,9 @@ void Account::writeMap() {
 	if (!self.isEmpty()) mapSize += sizeof(quint32) + Serialize::bytearraySize(self);
 	if (!_draftsMap.empty()) mapSize += sizeof(quint32) * 2 + _draftsMap.size() * sizeof(quint64) * 2;
 	if (!_draftCursorsMap.empty()) mapSize += sizeof(quint32) * 2 + _draftCursorsMap.size() * sizeof(quint64) * 2;
+	if (_prefsKey) mapSize += sizeof(quint32) + sizeof(quint64);
 	if (_locationsKey) mapSize += sizeof(quint32) + sizeof(quint64);
-	if (_trustedBotsKey) mapSize += sizeof(quint32) + sizeof(quint64);
+	if (_trustedPeersKey) mapSize += sizeof(quint32) + sizeof(quint64);
 	if (_recentStickersKeyOld) mapSize += sizeof(quint32) + sizeof(quint64);
 	if (_installedStickersKey || _featuredStickersKey || _recentStickersKey || _archivedStickersKey) {
 		mapSize += sizeof(quint32) + 4 * sizeof(quint64);
@@ -570,6 +663,10 @@ void Account::writeMap() {
 			+ Serialize::bytearraySize(_webviewStorageIdBots.token)
 			+ Serialize::bytearraySize(_webviewStorageIdOther.token);
 	}
+	if (_roundPlaceholderKey) mapSize += sizeof(quint32) + sizeof(quint64);
+	if (_inlineBotsDownloadsKey) mapSize += sizeof(quint32) + sizeof(quint64);
+	if (_mediaLastPlaybackPositionsKey) mapSize += sizeof(quint32) + sizeof(quint64);
+	if (!_botStoragesMap.empty()) mapSize += sizeof(quint32) * 2 + _botStoragesMap.size() * sizeof(quint64) * 2;
 
 	EncryptedDescriptor mapData(mapSize);
 	if (!self.isEmpty()) {
@@ -587,11 +684,14 @@ void Account::writeMap() {
 			mapData.stream << quint64(value) << SerializePeerId(key);
 		}
 	}
+	if (_prefsKey) {
+		mapData.stream << quint32(lskPrefs) << quint64(_prefsKey);
+	}
 	if (_locationsKey) {
 		mapData.stream << quint32(lskLocations) << quint64(_locationsKey);
 	}
-	if (_trustedBotsKey) {
-		mapData.stream << quint32(lskTrustedBots) << quint64(_trustedBotsKey);
+	if (_trustedPeersKey) {
+		mapData.stream << quint32(lskTrustedPeers) << quint64(_trustedPeersKey);
 	}
 	if (_recentStickersKeyOld) {
 		mapData.stream << quint32(lskRecentStickersOld) << quint64(_recentStickersKeyOld);
@@ -640,6 +740,24 @@ void Account::writeMap() {
 			<< _webviewStorageIdBots.token
 			<< _webviewStorageIdOther.token;
 	}
+	if (_roundPlaceholderKey) {
+		mapData.stream << quint32(lskRoundPlaceholder);
+		mapData.stream << quint64(_roundPlaceholderKey);
+	}
+	if (_inlineBotsDownloadsKey) {
+		mapData.stream << quint32(lskInlineBotsDownloads);
+		mapData.stream << quint64(_inlineBotsDownloadsKey);
+	}
+	if (_mediaLastPlaybackPositionsKey) {
+		mapData.stream << quint32(lskMediaLastPlaybackPositions);
+		mapData.stream << quint64(_mediaLastPlaybackPositionsKey);
+	}
+	if (!_botStoragesMap.empty()) {
+		mapData.stream << quint32(lskBotStorages) << quint32(_botStoragesMap.size());
+		for (const auto &[key, value] : _botStoragesMap) {
+			mapData.stream << quint64(value) << SerializePeerId(key);
+		}
+	}
 	map.writeEncrypted(mapData, _localKey);
 
 	_mapChanged = false;
@@ -652,7 +770,9 @@ void Account::reset() {
 	_draftsMap.clear();
 	_draftCursorsMap.clear();
 	_draftsNotReadMap.clear();
-	_locationsKey = _trustedBotsKey = 0;
+	_botStoragesMap.clear();
+	_botStoragesNotReadMap.clear();
+	_prefsKey = _locationsKey = _trustedPeersKey = 0;
 	_recentStickersKeyOld = 0;
 	_installedStickersKey = 0;
 	_featuredStickersKey = 0;
@@ -669,6 +789,9 @@ void Account::reset() {
 	_legacyBackgroundKeyDay = _legacyBackgroundKeyNight = 0;
 	_settingsKey = _recentHashtagsAndBotsKey = _exportSettingsKey = 0;
 	_searchSuggestionsKey = 0;
+	_roundPlaceholderKey = 0;
+	_inlineBotsDownloadsKey = 0;
+	_mediaLastPlaybackPositionsKey = 0;
 	_oldMapVersion = 0;
 	_fileLocations.clear();
 	_fileLocationPairs.clear();
@@ -679,6 +802,7 @@ void Account::reset() {
 	_cacheTotalTimeLimit = Database::Settings().totalTimeLimit;
 	_cacheBigFileTotalSizeLimit = Database::Settings().totalSizeLimit;
 	_cacheBigFileTotalTimeLimit = Database::Settings().totalTimeLimit;
+	_mediaLastPlaybackPosition.clear();
 
 	const auto wvbots = _webviewStorageIdBots.path;
 	const auto wvother = _webviewStorageIdOther.path;
@@ -1102,7 +1226,9 @@ void EnumerateDrafts(
 		} else if (key.isLocal()
 			&& (!supportMode || key.topicRootId())) {
 			const auto i = map.find(
-				Data::DraftKey::Cloud(key.topicRootId()));
+				Data::DraftKey::Cloud(
+					key.topicRootId(),
+					key.monoforumPeerId()));
 			const auto cloud = (i != end(map)) ? i->second.get() : nullptr;
 			if (Data::DraftsAreEqual(draft.get(), cloud)) {
 				continue;
@@ -1111,6 +1237,7 @@ void EnumerateDrafts(
 		callback(
 			key,
 			draft->reply,
+			draft->suggest,
 			draft->textWithTags,
 			draft->webpage,
 			draft->cursor);
@@ -1124,6 +1251,7 @@ void EnumerateDrafts(
 			callback(
 				key,
 				draft.reply,
+				draft.suggest,
 				draft.textWithTags,
 				draft.webpage,
 				cursor);
@@ -1189,6 +1317,7 @@ void Account::writeDrafts(not_null<History*> history) {
 	const auto sizeCallback = [&](
 			auto&&, // key
 			const FullReplyTo &reply,
+			SuggestOptions suggest,
 			const TextWithTags &text,
 			const Data::WebPageDraft &webpage,
 			auto&&) { // cursor
@@ -1196,6 +1325,7 @@ void Account::writeDrafts(not_null<History*> history) {
 			+ Serialize::stringSize(text.text)
 			+ TextUtilities::SerializeTagsSize(text.tags)
 			+ sizeof(qint64) + sizeof(qint64) // messageId
+			+ (sizeof(quint64) * 2) // suggest
 			+ Serialize::stringSize(webpage.url)
 			+ sizeof(qint32) // webpage.forceLargeMedia
 			+ sizeof(qint32) // webpage.forceSmallMedia
@@ -1211,22 +1341,26 @@ void Account::writeDrafts(not_null<History*> history) {
 
 	EncryptedDescriptor data(size);
 	data.stream
-		<< quint64(kRichDraftsTag)
+		<< quint64(kDraftsTag2)
 		<< SerializePeerId(peerId)
 		<< quint32(count);
 
 	const auto writeCallback = [&](
 			const Data::DraftKey &key,
 			const FullReplyTo &reply,
+			SuggestOptions suggest,
 			const TextWithTags &text,
 			const Data::WebPageDraft &webpage,
 			auto&&) { // cursor
+		const auto serialized = SerializeSuggest(suggest);
 		data.stream
 			<< key.serialize()
 			<< text.text
 			<< TextUtilities::SerializeTags(text.tags)
 			<< qint64(reply.messageId.peer.value)
 			<< qint64(reply.messageId.msg.bare)
+			<< serialized.first
+			<< serialized.second
 			<< webpage.url
 			<< qint32(webpage.forceLargeMedia ? 1 : 0)
 			<< qint32(webpage.forceSmallMedia ? 1 : 0)
@@ -1283,6 +1417,7 @@ void Account::writeDraftCursors(not_null<History*> history) {
 	const auto writeCallback = [&](
 			const Data::DraftKey &key,
 			auto&&, // reply
+			auto&&, // suggest
 			auto&&, // text
 			auto&&, // webpage
 			const MessageCursor &cursor) { // cursor
@@ -1352,7 +1487,7 @@ void Account::readDraftCursors(PeerId peerId, Data::HistoryDrafts &map) {
 			? Data::DraftKey::FromSerialized(keyValue)
 			: keysOld
 			? Data::DraftKey::FromSerializedOld(keyValueOld)
-			: Data::DraftKey::Local(0);
+			: Data::DraftKey::Local(MsgId(), PeerId());
 		qint32 position = 0, anchor = 0, scroll = Ui::kQFixedMax;
 		draft.stream >> position >> anchor >> scroll;
 		if (const auto i = map.find(key); i != end(map)) {
@@ -1379,13 +1514,14 @@ void Account::readDraftCursorsLegacy(
 		return;
 	}
 
-	if (const auto i = map.find(Data::DraftKey::Local({})); i != end(map)) {
+	if (const auto i = map.find(Data::DraftKey::Local(MsgId(), PeerId()))
+		; i != end(map)) {
 		i->second->cursor = MessageCursor(
 			localPosition,
 			localAnchor,
 			localScroll);
 	}
-	if (const auto i = map.find(Data::DraftKey::LocalEdit({}))
+	if (const auto i = map.find(Data::DraftKey::LocalEdit(MsgId(), PeerId()))
 		; i != end(map)) {
 		i->second->cursor = MessageCursor(
 			editPosition,
@@ -1398,7 +1534,7 @@ void Account::readDraftsWithCursors(not_null<History*> history) {
 	const auto guard = gsl::finally([&] {
 		if (const auto migrated = history->migrateFrom()) {
 			readDraftsWithCursors(migrated);
-			migrated->clearLocalEditDraft({});
+			migrated->clearLocalEditDraft(MsgId(), PeerId());
 			history->takeLocalDraft(migrated);
 		}
 	});
@@ -1442,12 +1578,14 @@ void Account::readDraftsWithCursors(not_null<History*> history) {
 	}
 	auto map = Data::HistoryDrafts();
 	const auto keysOld = (tag == kMultiDraftTagOld);
-	const auto rich = (tag == kRichDraftsTag);
+	const auto withSuggest = (tag == kDraftsTag2);
+	const auto rich = (tag == kRichDraftsTag) || withSuggest;
 	for (auto i = 0; i != count; ++i) {
 		TextWithTags text;
 		QByteArray textTagsSerialized;
 		qint64 keyValue = 0;
 		qint64 messageIdPeer = 0, messageIdMsg = 0;
+		std::pair<quint64, quint64> suggestSerialized;
 		qint32 keyValueOld = 0;
 		QString webpageUrl;
 		qint32 webpageForceLargeMedia = 0;
@@ -1481,7 +1619,13 @@ void Account::readDraftsWithCursors(not_null<History*> history) {
 				>> text.text
 				>> textTagsSerialized
 				>> messageIdPeer
-				>> messageIdMsg
+				>> messageIdMsg;
+			if (withSuggest) {
+				draft.stream
+					>> suggestSerialized.first
+					>> suggestSerialized.second;
+			}
+			draft.stream
 				>> webpageUrl
 				>> webpageForceLargeMedia
 				>> webpageForceSmallMedia
@@ -1504,6 +1648,7 @@ void Account::readDraftsWithCursors(not_null<History*> history) {
 						MsgId(messageIdMsg)),
 					.topicRootId = key.topicRootId(),
 				},
+				DeserializeSuggest(suggestSerialized),
 				MessageCursor(),
 				Data::WebPageDraft{
 					.url = webpageUrl,
@@ -1569,13 +1714,15 @@ void Account::readDraftsWithCursorsLegacy(
 		editData.text.size());
 
 	const auto topicRootId = MsgId();
+	const auto monoforumPeerId = PeerId();
 	auto map = base::flat_map<Data::DraftKey, std::unique_ptr<Data::Draft>>();
 	if (!msgData.text.isEmpty() || msgReplyTo) {
 		map.emplace(
-			Data::DraftKey::Local(topicRootId),
+			Data::DraftKey::Local(topicRootId, monoforumPeerId),
 			std::make_unique<Data::Draft>(
 				msgData,
 				FullReplyTo{ FullMsgId(peerId, MsgId(msgReplyTo)) },
+				SuggestOptions(),
 				MessageCursor(),
 				Data::WebPageDraft{
 					.removed = (msgPreviewCancelled == 1),
@@ -1583,10 +1730,11 @@ void Account::readDraftsWithCursorsLegacy(
 	}
 	if (editMsgId) {
 		map.emplace(
-			Data::DraftKey::LocalEdit(topicRootId),
+			Data::DraftKey::LocalEdit(topicRootId, monoforumPeerId),
 			std::make_unique<Data::Draft>(
 				editData,
 				FullReplyTo{ FullMsgId(peerId, editMsgId) },
+				SuggestOptions(),
 				MessageCursor(),
 				Data::WebPageDraft{
 					.removed = (editPreviewCancelled == 1),
@@ -1899,6 +2047,10 @@ void Account::readStickerSets(
 		Data::StickersSetFlags readingFlags) {
 	using SetFlag = Data::StickersSetFlag;
 
+	if (!stickersKey) {
+		return;
+	}
+
 	FileReadDescriptor stickers;
 	if (!ReadEncryptedFile(stickers, stickersKey, _basePath, _localKey)) {
 		ClearKey(stickersKey, _basePath);
@@ -2167,7 +2319,8 @@ void Account::writeInstalledStickers() {
 	writeStickerSets(_installedStickersKey, [](const Data::StickersSet &set) {
 		if (set.id == Data::Stickers::CloudRecentSetId
 			|| set.id == Data::Stickers::FavedSetId
-			|| set.id == Data::Stickers::CloudRecentAttachedSetId) {
+			|| set.id == Data::Stickers::CloudRecentAttachedSetId
+			|| set.id == Data::Stickers::CollectibleSetId) {
 			// separate files for them
 			return StickerSetCheckResult::Skip;
 		} else if (set.flags & SetFlag::Special) {
@@ -2194,7 +2347,8 @@ void Account::writeFeaturedStickers() {
 	writeStickerSets(_featuredStickersKey, [](const Data::StickersSet &set) {
 		if (set.id == Data::Stickers::CloudRecentSetId
 			|| set.id == Data::Stickers::FavedSetId
-			|| set.id == Data::Stickers::CloudRecentAttachedSetId) {
+			|| set.id == Data::Stickers::CloudRecentAttachedSetId
+			|| set.id == Data::Stickers::CollectibleSetId) {
 			// separate files for them
 			return StickerSetCheckResult::Skip;
 		} else if ((set.flags & SetFlag::Special)
@@ -2434,6 +2588,8 @@ void Account::importOldRecentStickers() {
 }
 
 void Account::readInstalledStickers() {
+	DEBUG_LOG(("Init: Read installed sticker sets."));
+
 	if (!_installedStickersKey) {
 		return importOldRecentStickers();
 	}
@@ -2446,6 +2602,8 @@ void Account::readInstalledStickers() {
 }
 
 void Account::readFeaturedStickers() {
+	DEBUG_LOG(("Init: Read featured sticker sets."));
+
 	readStickerSets(
 		_featuredStickersKey,
 		&_owner->session().data().stickers().featuredSetsOrderRef(),
@@ -2465,6 +2623,8 @@ void Account::readFeaturedStickers() {
 }
 
 void Account::readFeaturedCustomEmoji() {
+	DEBUG_LOG(("Init: Read featured emoji sets."));
+
 	readStickerSets(
 		_featuredCustomEmojiKey,
 		&_owner->session().data().stickers().featuredEmojiSetsOrderRef(),
@@ -2472,18 +2632,26 @@ void Account::readFeaturedCustomEmoji() {
 }
 
 void Account::readRecentStickers() {
+	DEBUG_LOG(("Init: Read recent stickers."));
+
 	readStickerSets(_recentStickersKey);
 }
 
 void Account::readRecentMasks() {
+	DEBUG_LOG(("Init: Read recent masks."));
+
 	readStickerSets(_recentMasksKey);
 }
 
 void Account::readFavedStickers() {
+	DEBUG_LOG(("Init: Read faved masks."));
+
 	readStickerSets(_favedStickersKey);
 }
 
 void Account::readArchivedStickers() {
+	DEBUG_LOG(("Init: Read archived stickers."));
+
 	// TODO: refactor to support for multiple accounts.
 	static bool archivedStickersRead = false;
 	if (!archivedStickersRead) {
@@ -2495,6 +2663,8 @@ void Account::readArchivedStickers() {
 }
 
 void Account::readArchivedMasks() {
+	DEBUG_LOG(("Init: Read archived masks."));
+
 	// TODO: refactor to support for multiple accounts.
 	static bool archivedMasksRead = false;
 	if (!archivedMasksRead) {
@@ -2506,6 +2676,8 @@ void Account::readArchivedMasks() {
 }
 
 void Account::readInstalledMasks() {
+	DEBUG_LOG(("Init: Read installed masks."));
+
 	readStickerSets(
 		_installedMasksKey,
 		&_owner->session().data().stickers().maskSetsOrderRef(),
@@ -2513,6 +2685,8 @@ void Account::readInstalledMasks() {
 }
 
 void Account::readInstalledCustomEmoji() {
+	DEBUG_LOG(("Init: Read installed emoji sets."));
+
 	readStickerSets(
 		_installedCustomEmojiKey,
 		&_owner->session().data().stickers().emojiSetsOrderRef(),
@@ -2548,7 +2722,11 @@ void Account::writeSavedGifs() {
 }
 
 void Account::readSavedGifs() {
-	if (!_savedGifsKey) return;
+	DEBUG_LOG(("Init: Read saved GIFs."));
+
+	if (!_savedGifsKey) {
+		return;
+	}
 
 	FileReadDescriptor gifs;
 	if (!ReadEncryptedFile(gifs, _savedGifsKey, _basePath, _localKey)) {
@@ -2591,12 +2769,12 @@ void Account::readSavedGifs() {
 void Account::writeRecentHashtagsAndBots() {
 	const auto &write = cRecentWriteHashtags();
 	const auto &search = cRecentSearchHashtags();
-	const auto &bots = cRecentInlineBots();
+	const auto &bots = _owner->session().recentInlineBots().list();
 
-	if (write.isEmpty() && search.isEmpty() && bots.isEmpty()) {
+	if (write.isEmpty() && search.isEmpty() && bots.empty()) {
 		readRecentHashtagsAndBots();
 	}
-	if (write.isEmpty() && search.isEmpty() && bots.isEmpty()) {
+	if (write.isEmpty() && search.isEmpty() && bots.empty()) {
 		if (_recentHashtagsAndBotsKey) {
 			ClearKey(_recentHashtagsAndBotsKey, _basePath);
 			_recentHashtagsAndBotsKey = 0;
@@ -2608,7 +2786,7 @@ void Account::writeRecentHashtagsAndBots() {
 		_recentHashtagsAndBotsKey = GenerateKey(_basePath);
 		writeMapQueued();
 	}
-	quint32 size = sizeof(quint32) * 3, writeCnt = 0, searchCnt = 0, botsCnt = cRecentInlineBots().size();
+	quint32 size = sizeof(quint32) * 3, writeCnt = 0, searchCnt = 0, botsCnt = bots.size();
 	for (auto i = write.cbegin(), e = write.cend(); i != e; ++i) {
 		if (!i->first.isEmpty()) {
 			size += Serialize::stringSize(i->first) + sizeof(quint16);
@@ -2662,7 +2840,7 @@ void Account::readRecentHashtagsAndBots() {
 	quint16 count;
 
 	RecentHashtagPack write, search;
-	RecentInlineBots bots;
+	std::vector<not_null<UserData*>> bots;
 	if (writeCount) {
 		write.reserve(writeCount);
 		for (uint32 i = 0; i < writeCount; ++i) {
@@ -2695,11 +2873,14 @@ void Account::readRecentHashtagsAndBots() {
 					&& peer->asUser()->isBot()
 					&& !peer->asUser()->botInfo->inlinePlaceholder.isEmpty()
 					&& !peer->asUser()->username().isEmpty()) {
-					bots.push_back(peer->asUser());
+					const auto user = peer->asUser();
+					if (ranges::find(bots, not_null{ user }) == end(bots)) {
+						bots.push_back(user);
+					}
 				}
 			}
 		}
-		cSetRecentInlineBots(bots);
+		_owner->session().recentInlineBots().applyLocal(std::move(bots));
 	}
 }
 
@@ -2709,7 +2890,9 @@ std::optional<RecentHashtagPack> Account::saveRecentHashtags(
 	auto found = false;
 	auto m = QRegularExpressionMatch();
 	auto recent = getPack();
-	for (auto i = 0, next = 0; (m = TextUtilities::RegExpHashtag(false).match(text, i)).hasMatch(); i = next) {
+	for (auto i = 0, next = 0
+		; (m = TextUtilities::RegExpHashtag(false).match(text, i)).hasMatch()
+		; i = next) {
 		i = m.capturedStart();
 		next = m.capturedEnd();
 		if (m.hasMatch()) {
@@ -2789,7 +2972,7 @@ void Account::writeExportSettings(const Export::Settings &settings) {
 		<< quint32(settings.format)
 		<< settings.path
 		<< quint32(settings.availableAt);
-	settings.singlePeer.match([&](const MTPDinputPeerUser & user) {
+	settings.singlePeer.match([&](const MTPDinputPeerUser &user) {
 		data.stream
 			<< kSinglePeerTypeUser
 			<< quint64(user.vuser_id().v)
@@ -2818,12 +3001,16 @@ void Account::writeExportSettings(const Export::Settings &settings) {
 }
 
 Export::Settings Account::readExportSettings() {
+	if (!_exportSettingsKey) {
+		return {};
+	}
+
 	FileReadDescriptor file;
 	if (!ReadEncryptedFile(file, _exportSettingsKey, _basePath, _localKey)) {
 		ClearKey(_exportSettingsKey, _basePath);
 		_exportSettingsKey = 0;
 		writeMapDelayed();
-		return Export::Settings();
+		return {};
 	}
 
 	quint32 types = 0, fullChats = 0;
@@ -2909,6 +3096,96 @@ Export::Settings Account::readExportSettings() {
 		: Export::Settings();
 }
 
+void Account::setMediaLastPlaybackPosition(DocumentId id, crl::time time) {
+	auto &map = _mediaLastPlaybackPosition;
+	const auto i = ranges::find(
+		map,
+		id,
+		&std::pair<DocumentId, crl::time>::first);
+	if (i != map.end()) {
+		if (time > 0) {
+			if (i->second == time) {
+				return;
+			}
+			i->second = time;
+			std::rotate(i, i + 1, map.end());
+		} else {
+			map.erase(i);
+		}
+	} else if (time > 0) {
+		if (map.size() >= kMaxSavedPlaybackPositions) {
+			map.erase(map.begin());
+		}
+		map.emplace_back(id, time);
+	}
+	writeMediaLastPlaybackPositions();
+}
+
+crl::time Account::mediaLastPlaybackPosition(DocumentId id) const {
+	const_cast<Account*>(this)->readMediaLastPlaybackPositions();
+	const auto i = ranges::find(
+		_mediaLastPlaybackPosition,
+		id,
+		&std::pair<DocumentId, crl::time>::first);
+	return (i != _mediaLastPlaybackPosition.end()) ? i->second : 0;
+}
+
+void Account::writeMediaLastPlaybackPositions() {
+	if (_mediaLastPlaybackPosition.empty()) {
+		if (_mediaLastPlaybackPositionsKey) {
+			ClearKey(_mediaLastPlaybackPositionsKey, _basePath);
+			_mediaLastPlaybackPositionsKey = 0;
+			writeMapDelayed();
+		}
+		return;
+	}
+	if (!_mediaLastPlaybackPositionsKey) {
+		_mediaLastPlaybackPositionsKey = GenerateKey(_basePath);
+		writeMapQueued();
+	}
+	quint32 size = sizeof(quint32)
+		+ _mediaLastPlaybackPosition.size() * sizeof(quint64) * 2;
+	EncryptedDescriptor data(size);
+	data.stream << quint32(_mediaLastPlaybackPosition.size());
+	for (const auto &[id, time] : _mediaLastPlaybackPosition) {
+		data.stream << quint64(id) << qint64(time);
+	}
+
+	FileWriteDescriptor file(_mediaLastPlaybackPositionsKey, _basePath);
+	file.writeEncrypted(data, _localKey);
+}
+
+void Account::readMediaLastPlaybackPositions() {
+	if (_mediaLastPlaybackPositionsRead) {
+		return;
+	}
+	_mediaLastPlaybackPositionsRead = true;
+	if (!_mediaLastPlaybackPositionsKey) {
+		return;
+	}
+
+	FileReadDescriptor file;
+	if (!ReadEncryptedFile(
+			file,
+			_mediaLastPlaybackPositionsKey,
+			_basePath,
+			_localKey)) {
+		ClearKey(_mediaLastPlaybackPositionsKey, _basePath);
+		_mediaLastPlaybackPositionsKey = 0;
+		writeMapDelayed();
+		return;
+	}
+
+	quint32 size = 0;
+	file.stream >> size;
+	for (auto i = 0; i < size; ++i) {
+		quint64 id = 0;
+		qint64 time = 0;
+		file.stream >> id >> time;
+		_mediaLastPlaybackPosition.emplace_back(DocumentId(id), time);
+	}
+}
+
 void Account::writeSearchSuggestionsDelayed() {
 	Expects(_owner->sessionExists());
 
@@ -2929,7 +3206,14 @@ void Account::writeSearchSuggestions() {
 
 	const auto top = _owner->session().topPeers().serialize();
 	const auto recent = _owner->session().recentPeers().serialize();
-	if (top.isEmpty() && recent.isEmpty()) {
+	const auto settingsSearches
+		= _owner->session().recentSettingsSearches().serialize();
+	const auto guestChatBots
+		= _owner->session().topGuestChatBots().serialize();
+	if (top.isEmpty()
+		&& recent.isEmpty()
+		&& settingsSearches.isEmpty()
+		&& guestChatBots.isEmpty()) {
 		if (_searchSuggestionsKey) {
 			ClearKey(_searchSuggestionsKey, _basePath);
 			_searchSuggestionsKey = 0;
@@ -2942,9 +3226,11 @@ void Account::writeSearchSuggestions() {
 		writeMapQueued();
 	}
 	quint32 size = Serialize::bytearraySize(top)
-		+ Serialize::bytearraySize(recent);
+		+ Serialize::bytearraySize(recent)
+		+ Serialize::bytearraySize(settingsSearches)
+		+ Serialize::bytearraySize(guestChatBots);
 	EncryptedDescriptor data(size);
-	data.stream << top << recent;
+	data.stream << top << recent << settingsSearches << guestChatBots;
 
 	FileWriteDescriptor file(_searchSuggestionsKey, _basePath);
 	file.writeEncrypted(data, _localKey);
@@ -2971,10 +3257,21 @@ void Account::readSearchSuggestions() {
 
 	auto top = QByteArray();
 	auto recent = QByteArray();
+	auto settingsSearches = QByteArray();
+	auto guestChatBots = QByteArray();
 	suggestions.stream >> top >> recent;
+	if (!suggestions.stream.atEnd()) {
+		suggestions.stream >> settingsSearches;
+	}
+	if (!suggestions.stream.atEnd()) {
+		suggestions.stream >> guestChatBots;
+	}
 	if (CheckStreamStatus(suggestions.stream)) {
 		_owner->session().topPeers().applyLocal(top);
 		_owner->session().recentPeers().applyLocal(recent);
+		_owner->session().recentSettingsSearches().applyLocal(
+			settingsSearches);
+		_owner->session().topGuestChatBots().applyLocal(guestChatBots);
 	} else {
 		DEBUG_LOG(("Suggestions: Could not read content."));
 	}
@@ -3008,126 +3305,198 @@ void Account::readSelf(
 	}
 }
 
-void Account::writeTrustedBots() {
-	if (_trustedBots.empty()) {
-		if (_trustedBotsKey) {
-			ClearKey(_trustedBotsKey, _basePath);
-			_trustedBotsKey = 0;
+void Account::writeTrustedPeers() {
+	if (_trustedPeers.empty() && _trustedPayPerMessage.empty()) {
+		if (_trustedPeersKey) {
+			ClearKey(_trustedPeersKey, _basePath);
+			_trustedPeersKey = 0;
 			writeMapDelayed();
 		}
 		return;
 	}
-	if (!_trustedBotsKey) {
-		_trustedBotsKey = GenerateKey(_basePath);
+	if (!_trustedPeersKey) {
+		_trustedPeersKey = GenerateKey(_basePath);
 		writeMapQueued();
 	}
-	quint32 size = sizeof(qint32) + _trustedBots.size() * sizeof(quint64);
+	quint32 size = sizeof(qint32)
+		+ _trustedPeers.size() * sizeof(quint64)
+		+ sizeof(qint32)
+		+ _trustedPayPerMessage.size() * (sizeof(quint64) + sizeof(qint32));
 	EncryptedDescriptor data(size);
-	data.stream << qint32(_trustedBots.size());
-	for (const auto &[peerId, mask] : _trustedBots) {
-		// value: 8 bit mask, 56 bit bot peer_id.
+	data.stream << qint32(_trustedPeers.size());
+	for (const auto &[peerId, mask] : _trustedPeers) {
+		// value: 8 bit mask, 56 bit peer_id.
 		auto value = SerializePeerId(peerId);
 		Assert((value >> 56) == 0);
 		value |= (quint64(mask) << 56);
 		data.stream << value;
 	}
+	data.stream << qint32(_trustedPayPerMessage.size());
+	for (const auto &[peerId, stars] : _trustedPayPerMessage) {
+		data.stream << SerializePeerId(peerId) << qint32(stars);
+	}
 
-	FileWriteDescriptor file(_trustedBotsKey, _basePath);
+	FileWriteDescriptor file(_trustedPeersKey, _basePath);
 	file.writeEncrypted(data, _localKey);
 }
 
-void Account::readTrustedBots() {
-	if (_trustedBotsRead) {
+void Account::readTrustedPeers() {
+	if (_trustedPeersRead) {
 		return;
 	}
-	_trustedBotsRead = true;
-	if (!_trustedBotsKey) {
+	_trustedPeersRead = true;
+	if (!_trustedPeersKey) {
 		return;
 	}
 
 	FileReadDescriptor trusted;
-	if (!ReadEncryptedFile(trusted, _trustedBotsKey, _basePath, _localKey)) {
-		ClearKey(_trustedBotsKey, _basePath);
-		_trustedBotsKey = 0;
+	if (!ReadEncryptedFile(trusted, _trustedPeersKey, _basePath, _localKey)) {
+		ClearKey(_trustedPeersKey, _basePath);
+		_trustedPeersKey = 0;
 		writeMapDelayed();
 		return;
 	}
 
-	qint32 size = 0;
-	trusted.stream >> size;
-	for (int i = 0; i < size; ++i) {
+	qint32 trustedCount = 0;
+	trusted.stream >> trustedCount;
+	for (int i = 0; i < trustedCount; ++i) {
 		auto value = quint64();
 		trusted.stream >> value;
-		const auto mask = base::flags<BotTrustFlag>::from_raw(
+		const auto mask = base::flags<PeerTrustFlag>::from_raw(
 			uchar(value >> 56));
 		const auto peerIdSerialized = value & ~(0xFFULL << 56);
 		const auto peerId = DeserializePeerId(peerIdSerialized);
-		_trustedBots.emplace(peerId, mask);
+		_trustedPeers.emplace(peerId, mask);
 	}
+	if (trusted.stream.atEnd()) {
+		return;
+	}
+	qint32 payPerMessageCount = 0;
+	trusted.stream >> payPerMessageCount;
+	const auto owner = _owner->sessionExists()
+		? &_owner->session().data()
+		: nullptr;
+	for (int i = 0; i < payPerMessageCount; ++i) {
+		auto value = quint64();
+		auto stars = qint32();
+		trusted.stream >> value >> stars;
+		const auto peerId = DeserializePeerId(value);
+		const auto peer = owner ? owner->peerLoaded(peerId) : nullptr;
+		const auto now = peer ? peer->starsPerMessage() : stars;
+		if (now > 0 && now <= stars) {
+			_trustedPayPerMessage.emplace(peerId, stars);
+		}
+	}
+	if (_trustedPayPerMessage.size() != payPerMessageCount) {
+		writeTrustedPeers();
+	}
+}
+
+void Account::markPeerTrustedOpenGame(PeerId peerId) {
+	if (isPeerTrustedOpenGame(peerId)) {
+		return;
+	}
+	const auto i = _trustedPeers.find(peerId);
+	if (i == end(_trustedPeers)) {
+		_trustedPeers.emplace(peerId, PeerTrustFlag());
+	} else {
+		i->second &= ~PeerTrustFlag::NoOpenGame;
+	}
+	writeTrustedPeers();
+}
+
+bool Account::isPeerTrustedOpenGame(PeerId peerId) {
+	readTrustedPeers();
+	const auto i = _trustedPeers.find(peerId);
+	return (i != end(_trustedPeers))
+		&& ((i->second & PeerTrustFlag::NoOpenGame) == 0);
 }
 
-void Account::markBotTrustedOpenGame(PeerId botId) {
-	if (isBotTrustedOpenGame(botId)) {
+void Account::markPeerTrustedPayment(PeerId peerId) {
+	if (isPeerTrustedPayment(peerId)) {
 		return;
 	}
-	const auto i = _trustedBots.find(botId);
-	if (i == end(_trustedBots)) {
-		_trustedBots.emplace(botId, BotTrustFlag());
+	const auto i = _trustedPeers.find(peerId);
+	if (i == end(_trustedPeers)) {
+		_trustedPeers.emplace(
+			peerId,
+			PeerTrustFlag::NoOpenGame | PeerTrustFlag::Payment);
 	} else {
-		i->second &= ~BotTrustFlag::NoOpenGame;
+		i->second |= PeerTrustFlag::Payment;
 	}
-	writeTrustedBots();
+	writeTrustedPeers();
 }
 
-bool Account::isBotTrustedOpenGame(PeerId botId) {
-	readTrustedBots();
-	const auto i = _trustedBots.find(botId);
-	return (i != end(_trustedBots))
-		&& ((i->second & BotTrustFlag::NoOpenGame) == 0);
+bool Account::isPeerTrustedPayment(PeerId peerId) {
+	readTrustedPeers();
+	const auto i = _trustedPeers.find(peerId);
+	return (i != end(_trustedPeers))
+		&& ((i->second & PeerTrustFlag::Payment) != 0);
 }
 
-void Account::markBotTrustedPayment(PeerId botId) {
-	if (isBotTrustedPayment(botId)) {
+void Account::markPeerTrustedOpenWebView(PeerId peerId) {
+	if (isPeerTrustedOpenWebView(peerId)) {
 		return;
 	}
-	const auto i = _trustedBots.find(botId);
-	if (i == end(_trustedBots)) {
-		_trustedBots.emplace(
-			botId,
-			BotTrustFlag::NoOpenGame | BotTrustFlag::Payment);
+	const auto i = _trustedPeers.find(peerId);
+	if (i == end(_trustedPeers)) {
+		_trustedPeers.emplace(
+			peerId,
+			PeerTrustFlag::NoOpenGame | PeerTrustFlag::OpenWebView);
 	} else {
-		i->second |= BotTrustFlag::Payment;
+		i->second |= PeerTrustFlag::OpenWebView;
 	}
-	writeTrustedBots();
+	writeTrustedPeers();
 }
 
-bool Account::isBotTrustedPayment(PeerId botId) {
-	readTrustedBots();
-	const auto i = _trustedBots.find(botId);
-	return (i != end(_trustedBots))
-		&& ((i->second & BotTrustFlag::Payment) != 0);
+bool Account::isPeerTrustedOpenWebView(PeerId peerId) {
+	readTrustedPeers();
+	const auto i = _trustedPeers.find(peerId);
+	return (i != end(_trustedPeers))
+		&& ((i->second & PeerTrustFlag::OpenWebView) != 0);
 }
 
-void Account::markBotTrustedOpenWebView(PeerId botId) {
-	if (isBotTrustedOpenWebView(botId)) {
+void Account::markPeerTrustedPayForMessage(
+		PeerId peerId,
+		int starsPerMessage) {
+	if (isPeerTrustedPayForMessage(peerId, starsPerMessage)) {
 		return;
 	}
-	const auto i = _trustedBots.find(botId);
-	if (i == end(_trustedBots)) {
-		_trustedBots.emplace(
-			botId,
-			BotTrustFlag::NoOpenGame | BotTrustFlag::OpenWebView);
+	const auto i = _trustedPayPerMessage.find(peerId);
+	if (i == end(_trustedPayPerMessage)) {
+		_trustedPayPerMessage.emplace(peerId, starsPerMessage);
 	} else {
-		i->second |= BotTrustFlag::OpenWebView;
+		i->second = starsPerMessage;
+	}
+	writeTrustedPeers();
+}
+
+bool Account::isPeerTrustedPayForMessage(
+		PeerId peerId,
+		int starsPerMessage) {
+	if (starsPerMessage <= 0) {
+		return true;
 	}
-	writeTrustedBots();
+	readTrustedPeers();
+	const auto i = _trustedPayPerMessage.find(peerId);
+	return (i != end(_trustedPayPerMessage))
+		&& (i->second >= starsPerMessage);
+}
+
+bool Account::peerTrustedPayForMessageRead() const {
+	return _trustedPeersRead;
+}
+
+bool Account::hasPeerTrustedPayForMessageEntry(PeerId peerId) const {
+	return _trustedPayPerMessage.contains(peerId);
 }
 
-bool Account::isBotTrustedOpenWebView(PeerId botId) {
-	readTrustedBots();
-	const auto i = _trustedBots.find(botId);
-	return (i != end(_trustedBots))
-		&& ((i->second & BotTrustFlag::OpenWebView) != 0);
+void Account::clearPeerTrustedPayForMessage(PeerId peerId) {
+	const auto i = _trustedPayPerMessage.find(peerId);
+	if (i != end(_trustedPayPerMessage)) {
+		_trustedPayPerMessage.erase(i);
+		writeTrustedPeers();
+	}
 }
 
 void Account::enforceModernStorageIdBots() {
@@ -3178,6 +3547,147 @@ Webview::StorageId Account::resolveStorageIdOther() {
 	return _webviewStorageIdOther;
 }
 
+QImage Account::readRoundPlaceholder() {
+	if (!_roundPlaceholder.isNull()) {
+		return _roundPlaceholder;
+	} else if (!_roundPlaceholderKey) {
+		return QImage();
+	}
+
+	FileReadDescriptor placeholder;
+	if (!ReadEncryptedFile(
+			placeholder,
+			_roundPlaceholderKey,
+			_basePath,
+			_localKey)) {
+		ClearKey(_roundPlaceholderKey, _basePath);
+		_roundPlaceholderKey = 0;
+		writeMapDelayed();
+		return QImage();
+	}
+
+	auto bytes = QByteArray();
+	placeholder.stream >> bytes;
+	_roundPlaceholder = Images::Read({ .content = bytes }).image;
+	return _roundPlaceholder;
+}
+
+void Account::writeRoundPlaceholder(const QImage &placeholder) {
+	if (placeholder.isNull()) {
+		return;
+	}
+	_roundPlaceholder = placeholder;
+
+	auto bytes = QByteArray();
+	auto buffer = QBuffer(&bytes);
+	placeholder.save(&buffer, "JPG", 87);
+
+	quint32 size = Serialize::bytearraySize(bytes);
+	if (!_roundPlaceholderKey) {
+		_roundPlaceholderKey = GenerateKey(_basePath);
+		writeMapQueued();
+	}
+	EncryptedDescriptor data(size);
+	data.stream << bytes;
+	FileWriteDescriptor file(_roundPlaceholderKey, _basePath);
+	file.writeEncrypted(data, _localKey);
+}
+
+QByteArray Account::readInlineBotsDownloads() {
+	if (_inlineBotsDownloadsRead) {
+		return QByteArray();
+	}
+	_inlineBotsDownloadsRead = true;
+	if (!_inlineBotsDownloadsKey) {
+		return QByteArray();
+	}
+
+	FileReadDescriptor inlineBotsDownloads;
+	if (!ReadEncryptedFile(
+			inlineBotsDownloads,
+			_inlineBotsDownloadsKey,
+			_basePath,
+			_localKey)) {
+		ClearKey(_inlineBotsDownloadsKey, _basePath);
+		_inlineBotsDownloadsKey = 0;
+		writeMapDelayed();
+		return QByteArray();
+	}
+
+	auto bytes = QByteArray();
+	inlineBotsDownloads.stream >> bytes;
+	return bytes;
+}
+
+void Account::writeInlineBotsDownloads(const QByteArray &bytes) {
+	if (!_inlineBotsDownloadsKey) {
+		_inlineBotsDownloadsKey = GenerateKey(_basePath);
+		writeMapQueued();
+	}
+	quint32 size = Serialize::bytearraySize(bytes);
+	EncryptedDescriptor data(size);
+	data.stream << bytes;
+	FileWriteDescriptor file(_inlineBotsDownloadsKey, _basePath);
+	file.writeEncrypted(data, _localKey);
+}
+
+void Account::writeBotStorage(PeerId botId, const QByteArray &serialized) {
+	if (serialized.isEmpty()) {
+		auto i = _botStoragesMap.find(botId);
+		if (i != _botStoragesMap.cend()) {
+			ClearKey(i->second, _basePath);
+			_botStoragesMap.erase(i);
+			writeMapDelayed();
+		}
+		_botStoragesNotReadMap.remove(botId);
+		return;
+	}
+
+	auto i = _botStoragesMap.find(botId);
+	if (i == _botStoragesMap.cend()) {
+		i = _botStoragesMap.emplace(botId, GenerateKey(_basePath)).first;
+		writeMapQueued();
+	}
+
+	auto size = Serialize::bytearraySize(serialized);
+
+	EncryptedDescriptor data(size);
+	data.stream << serialized;
+
+	FileWriteDescriptor file(i->second, _basePath);
+	file.writeEncrypted(data, _localKey);
+
+	_botStoragesNotReadMap.remove(botId);
+}
+
+QByteArray Account::readBotStorage(PeerId botId) {
+	if (!_botStoragesNotReadMap.remove(botId)) {
+		return {};
+	}
+
+	const auto j = _botStoragesMap.find(botId);
+	if (j == _botStoragesMap.cend()) {
+		return {};
+	}
+	FileReadDescriptor storage;
+	if (!ReadEncryptedFile(storage, j->second, _basePath, _localKey)) {
+		ClearKey(j->second, _basePath);
+		_botStoragesMap.erase(j);
+		writeMapDelayed();
+		return {};
+	}
+
+	auto result = QByteArray();
+	storage.stream >> result;
+	if (storage.stream.status() != QDataStream::Ok) {
+		ClearKey(j->second, _basePath);
+		_botStoragesMap.erase(j);
+		writeMapDelayed();
+		return {};
+	}
+	return result;
+}
+
 bool Account::encrypt(
 		const void *src,
 		void *dst,
@@ -3216,4 +3726,119 @@ Webview::StorageId TonSiteStorageId() {
 	return result;
 }
 
+void Account::clearPref(std::string_view key) {
+	const auto i = _prefs.find(QByteArray(key.data(), key.size()));
+	if (i == end(_prefs)) {
+		return;
+	}
+	_prefs.erase(i);
+	writePrefsDelayed();
+}
+
+void Account::writePrefGeneric(
+		std::string_view key,
+		const QByteArray &value) {
+	const auto raw = QByteArray(key.data(), key.size());
+	if (const auto i = _prefs.find(raw); i != end(_prefs)) {
+		if (i->second == value) {
+			return;
+		}
+		i->second = value;
+	} else {
+		_prefs.emplace(raw, value);
+	}
+	writePrefsDelayed();
+}
+
+std::optional<QByteArray> Account::readPrefGeneric(std::string_view key) {
+	const auto i = _prefs.find(QByteArray(key.data(), key.size()));
+	return (i != end(_prefs)) ? i->second : std::optional<QByteArray>();
+}
+
+void Account::writePrefsDelayed() {
+	_prefsChanged = true;
+	_writePrefsTimer.callOnce(kDelayedWriteTimeout);
+}
+
+void Account::writePrefs() {
+	_writePrefsTimer.cancel();
+	if (!_prefsChanged) {
+		return;
+	}
+	_prefsChanged = false;
+
+	if (_prefs.empty()) {
+		if (_prefsKey) {
+			ClearKey(_prefsKey, _basePath);
+			_prefsKey = 0;
+			writeMapDelayed();
+		}
+	} else {
+		if (!_prefsKey) {
+			_prefsKey = GenerateKey(_basePath);
+			writeMapQueued();
+		}
+		quint32 size = sizeof(quint32);
+		for (const auto &[key, value] : _prefs) {
+			size += 2 * sizeof(quint32) + key.size() + value.size();
+		}
+
+		EncryptedDescriptor data(size);
+		data.stream << quint32(_prefs.size());
+		for (const auto &[key, value] : _prefs) {
+			data.stream << quint32(key.size()) << quint32(value.size());
+			data.stream.writeRawData(key.constData(), key.size());
+			data.stream.writeRawData(value.constData(), value.size());
+		}
+
+		FileWriteDescriptor file(_prefsKey, _basePath);
+		file.writeEncrypted(data, _localKey);
+	}
+}
+
+void Account::readPrefs() {
+	FileReadDescriptor prefs;
+	if (!ReadEncryptedFile(prefs, _prefsKey, _basePath, _localKey)) {
+		ClearKey(_prefsKey, _basePath);
+		_prefsKey = 0;
+		writeMapDelayed();
+		return;
+	}
+
+	auto count = quint32();
+	prefs.stream >> count;
+	if (prefs.stream.status() != QDataStream::Ok) {
+		return;
+	}
+	auto map = base::flat_map<QByteArray, QByteArray>();
+	map.reserve(count);
+	for (auto i = quint32(); i != count; ++i) {
+		auto keySize = quint32(), valueSize = quint32();
+		prefs.stream >> keySize >> valueSize;
+		auto key = QByteArray(keySize, Qt::Uninitialized);
+		auto value = QByteArray(valueSize, Qt::Uninitialized);
+		prefs.stream.readRawData(key.data(), keySize);
+		prefs.stream.readRawData(value.data(), valueSize);
+		if (prefs.stream.status() != QDataStream::Ok) {
+			return;
+		}
+		map.emplace(std::move(key), std::move(value));
+	}
+	_prefs = std::move(map);
+}
+
+// Define your own pref types in the similar way.
+template <>
+std::optional<bool> Account::readPrefImpl<bool>(std::string_view key) {
+	if (const auto data = readPrefGeneric(key)) {
+		return !data->isEmpty();
+	}
+	return {};
+}
+
+template <>
+void Account::writePrefImpl<bool>(std::string_view key, bool value) {
+	writePrefGeneric(key, value ? "\x1"_q : QByteArray());
+}
+
 } // namespace Storage
diff --git a/Telegram/SourceFiles/storage/storage_account.h b/Telegram/SourceFiles/storage/storage_account.h
index 84533f93d556d1..a35dcacd62ae88 100644
--- a/Telegram/SourceFiles/storage/storage_account.h
+++ b/Telegram/SourceFiles/storage/storage_account.h
@@ -53,6 +53,7 @@ enum class StartResult : uchar;
 
 struct MessageDraft {
 	FullReplyTo reply;
+	SuggestOptions suggest;
 	TextWithTags textWithTags;
 	Data::WebPageDraft webpage;
 };
@@ -76,6 +77,7 @@ class Account final {
 	}
 
 	[[nodiscard]] QString tempDirectory() const;
+	[[nodiscard]] QString supportModePath() const;
 
 	[[nodiscard]] MTP::AuthKeyPtr peekLegacyLocalKey() const {
 		return _localKey;
@@ -149,6 +151,9 @@ class Account final {
 	void writeExportSettings(const Export::Settings &settings);
 	[[nodiscard]] Export::Settings readExportSettings();
 
+	void setMediaLastPlaybackPosition(DocumentId id, crl::time time);
+	[[nodiscard]] crl::time mediaLastPlaybackPosition(DocumentId id) const;
+
 	void writeSearchSuggestionsDelayed();
 	void writeSearchSuggestionsIfNeeded();
 	void writeSearchSuggestions();
@@ -163,17 +168,46 @@ class Account final {
 		const QByteArray& serialized,
 		int32 streamVersion);
 
-	void markBotTrustedOpenGame(PeerId botId);
-	[[nodiscard]] bool isBotTrustedOpenGame(PeerId botId);
-	void markBotTrustedPayment(PeerId botId);
-	[[nodiscard]] bool isBotTrustedPayment(PeerId botId);
-	void markBotTrustedOpenWebView(PeerId botId);
-	[[nodiscard]] bool isBotTrustedOpenWebView(PeerId botId);
+	void markPeerTrustedOpenGame(PeerId peerId);
+	[[nodiscard]] bool isPeerTrustedOpenGame(PeerId peerId);
+	void markPeerTrustedPayment(PeerId peerId);
+	[[nodiscard]] bool isPeerTrustedPayment(PeerId peerId);
+	void markPeerTrustedOpenWebView(PeerId peerId);
+	[[nodiscard]] bool isPeerTrustedOpenWebView(PeerId peerId);
+	void markPeerTrustedPayForMessage(PeerId peerId, int starsPerMessage);
+	[[nodiscard]] bool isPeerTrustedPayForMessage(
+		PeerId peerId,
+		int starsPerMessage);
+	[[nodiscard]] bool peerTrustedPayForMessageRead() const;
+	[[nodiscard]] bool hasPeerTrustedPayForMessageEntry(PeerId peerId) const;
+	void clearPeerTrustedPayForMessage(PeerId peerId);
+
+	template <typename Type, typename Other>
+	void writePref(std::string_view key, Other &&value) {
+		writePrefImpl<Type>(key, std::forward<Other>(value));
+	}
+	void clearPref(std::string_view key);
+
+	template <typename Type, typename Other = Type>
+	[[nodiscard]] Type readPref(
+			std::string_view key,
+			Other &&fallback = Type()) {
+		return readPrefImpl<Type>(key).value_or(std::forward<Other>(fallback));
+	}
 
 	void enforceModernStorageIdBots();
 	[[nodiscard]] Webview::StorageId resolveStorageIdBots();
 	[[nodiscard]] Webview::StorageId resolveStorageIdOther();
 
+	[[nodiscard]] QImage readRoundPlaceholder();
+	void writeRoundPlaceholder(const QImage &placeholder);
+
+	[[nodiscard]] QByteArray readInlineBotsDownloads();
+	void writeInlineBotsDownloads(const QByteArray &bytes);
+
+	void writeBotStorage(PeerId botId, const QByteArray &serialized);
+	[[nodiscard]] QByteArray readBotStorage(PeerId botId);
+
 	[[nodiscard]] bool encrypt(
 		const void *src,
 		void *dst,
@@ -193,12 +227,12 @@ class Account final {
 		IncorrectPasscode,
 		Failed,
 	};
-	enum class BotTrustFlag : uchar {
+	enum class PeerTrustFlag : uchar {
 		NoOpenGame        = (1 << 0),
 		Payment           = (1 << 1),
 		OpenWebView       = (1 << 2),
 	};
-	friend inline constexpr bool is_flag_type(BotTrustFlag) { return true; };
+	friend inline constexpr bool is_flag_type(PeerTrustFlag) { return true; };
 
 	[[nodiscard]] base::flat_set<QString> collectGoodNames() const;
 	[[nodiscard]] auto prepareReadSettingsContext() const
@@ -217,6 +251,10 @@ class Account final {
 	void writeLocationsQueued();
 	void writeLocationsDelayed();
 
+	void readPrefs();
+	void writePrefs();
+	void writePrefsDelayed();
+
 	std::unique_ptr<Main::SessionSettings> readSessionSettings();
 	void writeSessionSettings(Main::SessionSettings *stored);
 
@@ -251,13 +289,26 @@ class Account final {
 		Data::StickersSetFlags readingFlags = 0);
 	void importOldRecentStickers();
 
-	void readTrustedBots();
-	void writeTrustedBots();
+	void readTrustedPeers();
+	void writeTrustedPeers();
+
+	void readMediaLastPlaybackPositions();
+	void writeMediaLastPlaybackPositions();
 
 	std::optional<RecentHashtagPack> saveRecentHashtags(
 		Fn<RecentHashtagPack()> getPack,
 		const QString &text);
 
+	template <typename Type>
+	void writePrefImpl(std::string_view key, Type value);
+
+	template <typename Type>
+	[[nodiscard]] std::optional<Type> readPrefImpl(std::string_view key);
+
+	void writePrefGeneric(std::string_view key, const QByteArray &value);
+	[[nodiscard]] std::optional<QByteArray> readPrefGeneric(
+		std::string_view key);
+
 	const not_null<Main::Account*> _owner;
 	const QString _dataName;
 	const FileKey _dataNameKey = 0;
@@ -273,6 +324,8 @@ class Account final {
 	base::flat_map<
 		not_null<History*>,
 		base::flat_map<Data::DraftKey, MessageDraftSource>> _draftSources;
+	base::flat_map<PeerId, FileKey> _botStoragesMap;
+	base::flat_map<PeerId, bool> _botStoragesNotReadMap;
 
 	QMultiMap<MediaKey, Core::FileLocation> _fileLocations;
 	QMap<QString, QPair<MediaKey, Core::FileLocation>> _fileLocationPairs;
@@ -281,8 +334,9 @@ class Account final {
 	QByteArray _downloadsSerialized;
 	Fn<std::optional<QByteArray>()> _downloadsSerialize;
 
+	FileKey _prefsKey = 0;
 	FileKey _locationsKey = 0;
-	FileKey _trustedBotsKey = 0;
+	FileKey _trustedPeersKey = 0;
 	FileKey _installedStickersKey = 0;
 	FileKey _featuredStickersKey = 0;
 	FileKey _recentStickersKey = 0;
@@ -302,29 +356,43 @@ class Account final {
 	FileKey _featuredCustomEmojiKey = 0;
 	FileKey _archivedCustomEmojiKey = 0;
 	FileKey _searchSuggestionsKey = 0;
+	FileKey _roundPlaceholderKey = 0;
+	FileKey _inlineBotsDownloadsKey = 0;
+	FileKey _mediaLastPlaybackPositionsKey = 0;
 
 	qint64 _cacheTotalSizeLimit = 0;
 	qint64 _cacheBigFileTotalSizeLimit = 0;
 	qint32 _cacheTotalTimeLimit = 0;
 	qint32 _cacheBigFileTotalTimeLimit = 0;
 
-	base::flat_map<PeerId, base::flags<BotTrustFlag>> _trustedBots;
-	bool _trustedBotsRead = false;
+	base::flat_map<PeerId, base::flags<PeerTrustFlag>> _trustedPeers;
+	base::flat_map<PeerId, int> _trustedPayPerMessage;
+	bool _trustedPeersRead = false;
 	bool _readingUserSettings = false;
 	bool _recentHashtagsAndBotsWereRead = false;
 	bool _searchSuggestionsRead = false;
+	bool _inlineBotsDownloadsRead = false;
+	bool _mediaLastPlaybackPositionsRead = false;
+
+	std::vector<std::pair<DocumentId, crl::time>> _mediaLastPlaybackPosition;
 
 	Webview::StorageId _webviewStorageIdBots;
 	Webview::StorageId _webviewStorageIdOther;
 
+	base::flat_map<QByteArray, QByteArray> _prefs;
+
 	int _oldMapVersion = 0;
 
 	base::Timer _writeMapTimer;
+	base::Timer _writePrefsTimer;
 	base::Timer _writeLocationsTimer;
 	base::Timer _writeSearchSuggestionsTimer;
 	bool _mapChanged = false;
+	bool _prefsChanged = false;
 	bool _locationsChanged = false;
 
+	QImage _roundPlaceholder;
+
 };
 
 [[nodiscard]] Webview::StorageId TonSiteStorageId();
diff --git a/Telegram/SourceFiles/storage/storage_cloud_blob.cpp b/Telegram/SourceFiles/storage/storage_cloud_blob.cpp
index d3c454688b3833..338ee69dc35cf5 100644
--- a/Telegram/SourceFiles/storage/storage_cloud_blob.cpp
+++ b/Telegram/SourceFiles/storage/storage_cloud_blob.cpp
@@ -51,10 +51,15 @@ bool UnpackBlob(
 	if (zip.goToFirstFile() != UNZ_OK) {
 		return false;
 	}
+	const auto cleanFolder = QDir::cleanPath(folder);
 	do {
 		const auto name = zip.getCurrentFileName();
 		const auto path = folder + '/' + name;
-		if (checkNameCallback(name) && !ExtractZipFile(zip, path)) {
+		const auto cleanPath = QDir::cleanPath(path);
+		const auto inside = (cleanPath == cleanFolder)
+			|| cleanPath.startsWith(cleanFolder + '/');
+		if (checkNameCallback(name)
+			&& (!inside || !ExtractZipFile(zip, path))) {
 			return false;
 		}
 
@@ -131,12 +136,12 @@ void BlobLoader::setImplementation(
 		return BlobState(state);
 	});
 	_implementation->failed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		fail();
 	}, _implementation->lifetime());
 
 	_implementation->ready(
-	) | rpl::start_with_next([=](const QString &filepath) {
+	) | rpl::on_next([=](const QString &filepath) {
 		unpack(filepath);
 	}, _implementation->lifetime());
 
diff --git a/Telegram/SourceFiles/storage/storage_domain.cpp b/Telegram/SourceFiles/storage/storage_domain.cpp
index c46594f0e7771f..7b4c29a203e5ad 100644
--- a/Telegram/SourceFiles/storage/storage_domain.cpp
+++ b/Telegram/SourceFiles/storage/storage_domain.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "storage/storage_domain.h"
 
+#include "core/version.h"
 #include "storage/details/storage_file_utilities.h"
 #include "storage/serialize_common.h"
 #include "mtproto/mtproto_config.h"
diff --git a/Telegram/SourceFiles/storage/storage_facade.cpp b/Telegram/SourceFiles/storage/storage_facade.cpp
index dfd44294f3677a..6fe42c1c329bf5 100644
--- a/Telegram/SourceFiles/storage/storage_facade.cpp
+++ b/Telegram/SourceFiles/storage/storage_facade.cpp
@@ -34,6 +34,7 @@ class Facade::Impl {
 	void add(UserPhotosAddSlice &&query);
 	void remove(UserPhotosRemoveOne &&query);
 	void remove(UserPhotosRemoveAfter &&query);
+	void replace(UserPhotosReplace &&query);
 	rpl::producer<UserPhotosResult> query(UserPhotosQuery &&query) const;
 	rpl::producer<UserPhotosSliceUpdate> userPhotosSliceUpdated() const;
 
@@ -119,6 +120,10 @@ void Facade::Impl::remove(UserPhotosRemoveAfter &&query) {
 	return _userPhotos.remove(std::move(query));
 }
 
+void Facade::Impl::replace(UserPhotosReplace &&query) {
+	return _userPhotos.replace(std::move(query));
+}
+
 rpl::producer<UserPhotosResult> Facade::Impl::query(UserPhotosQuery &&query) const {
 	return _userPhotos.query(std::move(query));
 }
@@ -206,6 +211,10 @@ void Facade::remove(UserPhotosRemoveAfter &&query) {
 	return _impl->remove(std::move(query));
 }
 
+void Facade::replace(UserPhotosReplace &&query) {
+	return _impl->replace(std::move(query));
+}
+
 rpl::producer<UserPhotosResult> Facade::query(UserPhotosQuery &&query) const {
 	return _impl->query(std::move(query));
 }
diff --git a/Telegram/SourceFiles/storage/storage_facade.h b/Telegram/SourceFiles/storage/storage_facade.h
index 05e9604e077739..60e3a5fd5b4b2a 100644
--- a/Telegram/SourceFiles/storage/storage_facade.h
+++ b/Telegram/SourceFiles/storage/storage_facade.h
@@ -35,6 +35,7 @@ struct UserPhotosAddNew;
 struct UserPhotosAddSlice;
 struct UserPhotosRemoveOne;
 struct UserPhotosRemoveAfter;
+struct UserPhotosReplace;
 struct UserPhotosQuery;
 struct UserPhotosResult;
 struct UserPhotosSliceUpdate;
@@ -64,6 +65,7 @@ class Facade {
 	void add(UserPhotosAddSlice &&query);
 	void remove(UserPhotosRemoveOne &&query);
 	void remove(UserPhotosRemoveAfter &&query);
+	void replace(UserPhotosReplace &&query);
 
 	rpl::producer<UserPhotosResult> query(UserPhotosQuery &&query) const;
 	rpl::producer<UserPhotosSliceUpdate> userPhotosSliceUpdated() const;
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index 5e3421b4817024..dfb03616e39d76 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -133,6 +133,7 @@ MimeDataState ComputeMimeDataState(const QMimeData *data) {
 	}
 
 	auto allAreSmallImages = true;
+	auto allAreMedia = true;
 	for (const auto &url : urls) {
 		if (!url.isLocalFile()) {
 			return MimeDataState::None;
@@ -162,9 +163,17 @@ MimeDataState ComputeMimeDataState(const QMimeData *data) {
 				}
 			}
 		}
+		if (allAreMedia) {
+			const auto type = DetectNameType(file);
+			if (type != NameType::Image && type != NameType::Video) {
+				allAreMedia = false;
+			}
+		}
 	}
 	return allAreSmallImages
 		? MimeDataState::PhotoFiles
+		: allAreMedia
+		? MimeDataState::MediaFiles
 		: MimeDataState::Files;
 }
 
@@ -319,7 +328,7 @@ void PrepareDetails(PreparedFile &file, int previewWidth, int sideLimit) {
 			file.preview.setDevicePixelRatio(style::DevicePixelRatio());
 			file.type = PreparedFile::Type::Video;
 		}
-	} else if (const auto song = std::get_if<Song>(&file.information->media)) {
+	} else if (v::is<Song>(file.information->media)) {
 		file.type = PreparedFile::Type::Music;
 	}
 }
@@ -362,10 +371,22 @@ void UpdateImageDetails(
 
 bool ApplyModifications(PreparedList &list) {
 	auto applied = false;
-	for (auto &file : list.files) {
+	const auto apply = [&](PreparedFile &file, QSize strictSize = {}) {
 		const auto image = std::get_if<Image>(&file.information->media);
+		const auto guard = gsl::finally([&] {
+			if (!image || strictSize.isEmpty()) {
+				return;
+			}
+			applied = true;
+			file.path = QString();
+			file.content = QByteArray();
+			image->data = image->data.scaled(
+				strictSize,
+				Qt::IgnoreAspectRatio,
+				Qt::SmoothTransformation);
+		});
 		if (!image || !image->modifications) {
-			continue;
+			return;
 		}
 		applied = true;
 		file.path = QString();
@@ -373,6 +394,16 @@ bool ApplyModifications(PreparedList &list) {
 		image->data = Editor::ImageModified(
 			std::move(image->data),
 			image->modifications);
+	};
+	for (auto &file : list.files) {
+		apply(file);
+		if (const auto cover = file.videoCover.get()) {
+			const auto video = file.information
+				? std::get_if<Ui::PreparedFileInformation::Video>(
+					&file.information->media)
+				: nullptr;
+			apply(*cover, video ? video->thumbnail.size() : QSize());
+		}
 	}
 	return applied;
 }
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.h b/Telegram/SourceFiles/storage/storage_media_prepare.h
index d806fa47d3e099..15b94c904e133d 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.h
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.h
@@ -27,6 +27,7 @@ enum class MimeDataState {
 	None,
 	Files,
 	PhotoFiles,
+	MediaFiles,
 	//PremiumFile,
 	Image,
 };
diff --git a/Telegram/SourceFiles/storage/storage_shared_media.cpp b/Telegram/SourceFiles/storage/storage_shared_media.cpp
index 0326ad35664817..89ce8f6d3bf77a 100644
--- a/Telegram/SourceFiles/storage/storage_shared_media.cpp
+++ b/Telegram/SourceFiles/storage/storage_shared_media.cpp
@@ -27,6 +27,7 @@ auto SharedMedia::enforceLists(Key key)
 			return SharedMediaSliceUpdate(
 				key.peerId,
 				key.topicRootId,
+				key.monoforumPeerId,
 				type,
 				update);
 		}) | rpl::start_to_stream(_sliceUpdated, _lifetime);
@@ -50,10 +51,20 @@ void SharedMedia::add(SharedMediaAddNew &&query) {
 	if (topicIt != end(_lists)) {
 		addByIt(topicIt);
 	}
+	const auto monoforumPeerIt = query.monoforumPeerId
+		? _lists.find({ query.peerId, MsgId(), query.monoforumPeerId })
+		: end(_lists);
+	if (monoforumPeerIt != end(_lists)) {
+		addByIt(monoforumPeerIt);
+	}
 }
 
 void SharedMedia::add(SharedMediaAddExisting &&query) {
-	auto peerIt = enforceLists({ query.peerId, query.topicRootId });
+	auto peerIt = enforceLists({
+		query.peerId,
+		query.topicRootId,
+		query.monoforumPeerId,
+	});
 	for (auto index = 0; index != kSharedMediaTypeCount; ++index) {
 		auto type = static_cast<SharedMediaType>(index);
 		if (query.types.test(type)) {
@@ -67,7 +78,11 @@ void SharedMedia::add(SharedMediaAddExisting &&query) {
 void SharedMedia::add(SharedMediaAddSlice &&query) {
 	Expects(IsValidSharedMediaType(query.type));
 
-	auto peerIt = enforceLists({ query.peerId, query.topicRootId });
+	auto peerIt = enforceLists({
+		query.peerId,
+		query.topicRootId,
+		query.monoforumPeerId,
+	});
 	auto index = static_cast<int>(query.type);
 	peerIt->second[index].addSlice(
 		std::move(query.messageIds),
@@ -90,11 +105,17 @@ void SharedMedia::remove(SharedMediaRemoveOne &&query) {
 }
 
 void SharedMedia::remove(SharedMediaRemoveAll &&query) {
-	auto peerIt = _lists.lower_bound({ query.peerId, query.topicRootId });
+	auto peerIt = _lists.lower_bound({
+		query.peerId,
+		query.topicRootId,
+		query.monoforumPeerId,
+	});
 	while (peerIt != end(_lists)
 		&& peerIt->first.peerId == query.peerId
 		&& (!query.topicRootId
-			|| peerIt->first.topicRootId == query.topicRootId)) {
+			|| peerIt->first.topicRootId == query.topicRootId)
+		&& (!query.monoforumPeerId
+			|| peerIt->first.monoforumPeerId == query.monoforumPeerId)) {
 		for (auto index = 0; index != kSharedMediaTypeCount; ++index) {
 			auto type = static_cast<SharedMediaType>(index);
 			if (query.types.test(type)) {
@@ -118,13 +139,17 @@ void SharedMedia::invalidate(SharedMediaInvalidateBottom &&query) {
 }
 
 void SharedMedia::unload(SharedMediaUnloadThread &&query) {
-	_lists.erase({ query.peerId, query.topicRootId });
+	_lists.erase({ query.peerId, query.topicRootId, query.monoforumPeerId });
 }
 
 rpl::producer<SharedMediaResult> SharedMedia::query(SharedMediaQuery &&query) const {
 	Expects(IsValidSharedMediaType(query.key.type));
 
-	auto peerIt = _lists.find({ query.key.peerId, query.key.topicRootId });
+	auto peerIt = _lists.find({
+		query.key.peerId,
+		query.key.topicRootId,
+		query.key.monoforumPeerId,
+	});
 	if (peerIt != _lists.end()) {
 		auto index = static_cast<int>(query.key.type);
 		return peerIt->second[index].query(SparseIdsListQuery(
@@ -141,7 +166,11 @@ rpl::producer<SharedMediaResult> SharedMedia::query(SharedMediaQuery &&query) co
 SharedMediaResult SharedMedia::snapshot(const SharedMediaQuery &query) const {
 	Expects(IsValidSharedMediaType(query.key.type));
 
-	auto peerIt = _lists.find({ query.key.peerId, query.key.topicRootId });
+	auto peerIt = _lists.find({
+		query.key.peerId,
+		query.key.topicRootId,
+		query.key.monoforumPeerId,
+	});
 	if (peerIt != _lists.end()) {
 		auto index = static_cast<int>(query.key.type);
 		return peerIt->second[index].snapshot(SparseIdsListQuery(
@@ -155,7 +184,11 @@ SharedMediaResult SharedMedia::snapshot(const SharedMediaQuery &query) const {
 bool SharedMedia::empty(const SharedMediaKey &key) const {
 	Expects(IsValidSharedMediaType(key.type));
 
-	auto peerIt = _lists.find({ key.peerId, key.topicRootId });
+	auto peerIt = _lists.find({
+		key.peerId,
+		key.topicRootId,
+		key.monoforumPeerId,
+	});
 	if (peerIt != _lists.end()) {
 		auto index = static_cast<int>(key.type);
 		return peerIt->second[index].empty();
diff --git a/Telegram/SourceFiles/storage/storage_shared_media.h b/Telegram/SourceFiles/storage/storage_shared_media.h
index 697bd284c39a3d..c04ccf96a1d734 100644
--- a/Telegram/SourceFiles/storage/storage_shared_media.h
+++ b/Telegram/SourceFiles/storage/storage_shared_media.h
@@ -27,6 +27,7 @@ enum class SharedMediaType : signed char {
 	GIF,
 	RoundFile,
 	Pinned,
+	Poll,
 
 	kCount,
 };
@@ -42,16 +43,19 @@ struct SharedMediaAddNew {
 	SharedMediaAddNew(
 		PeerId peerId,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		SharedMediaTypesMask types,
 		MsgId messageId)
 	: peerId(peerId)
 	, topicRootId(topicRootId)
+	, monoforumPeerId(monoforumPeerId)
 	, messageId(messageId)
 	, types(types) {
 	}
 
 	PeerId peerId = 0;
 	MsgId topicRootId = 0;
+	PeerId monoforumPeerId = 0;
 	MsgId messageId = 0;
 	SharedMediaTypesMask types;
 
@@ -61,11 +65,13 @@ struct SharedMediaAddExisting {
 	SharedMediaAddExisting(
 		PeerId peerId,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		SharedMediaTypesMask types,
 		MsgId messageId,
 		MsgRange noSkipRange)
 	: peerId(peerId)
 	, topicRootId(topicRootId)
+	, monoforumPeerId(monoforumPeerId)
 	, messageId(messageId)
 	, noSkipRange(noSkipRange)
 	, types(types) {
@@ -73,6 +79,7 @@ struct SharedMediaAddExisting {
 
 	PeerId peerId = 0;
 	MsgId topicRootId = 0;
+	PeerId monoforumPeerId = 0;
 	MsgId messageId = 0;
 	MsgRange noSkipRange;
 	SharedMediaTypesMask types;
@@ -83,12 +90,14 @@ struct SharedMediaAddSlice {
 	SharedMediaAddSlice(
 		PeerId peerId,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		SharedMediaType type,
 		std::vector<MsgId> &&messageIds,
 		MsgRange noSkipRange,
 		std::optional<int> count = std::nullopt)
 	: peerId(peerId)
 	, topicRootId(topicRootId)
+	, monoforumPeerId(monoforumPeerId)
 	, messageIds(std::move(messageIds))
 	, noSkipRange(noSkipRange)
 	, type(type)
@@ -97,6 +106,7 @@ struct SharedMediaAddSlice {
 
 	PeerId peerId = 0;
 	MsgId topicRootId = 0;
+	PeerId monoforumPeerId = 0;
 	std::vector<MsgId> messageIds;
 	MsgRange noSkipRange;
 	SharedMediaType type = SharedMediaType::kCount;
@@ -135,9 +145,18 @@ struct SharedMediaRemoveAll {
 	, topicRootId(topicRootId)
 	, types(types) {
 	}
+	SharedMediaRemoveAll(
+		PeerId peerId,
+		PeerId monoforumPeerId,
+		SharedMediaTypesMask types = SharedMediaTypesMask::All())
+	: peerId(peerId)
+	, monoforumPeerId(monoforumPeerId)
+	, types(types) {
+	}
 
 	PeerId peerId = 0;
 	MsgId topicRootId = 0;
+	PeerId monoforumPeerId = 0;
 	SharedMediaTypesMask types;
 
 };
@@ -154,10 +173,12 @@ struct SharedMediaKey {
 	SharedMediaKey(
 		PeerId peerId,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		SharedMediaType type,
 		MsgId messageId)
 	: peerId(peerId)
 	, topicRootId(topicRootId)
+	, monoforumPeerId(monoforumPeerId)
 	, type(type)
 	, messageId(messageId) {
 	}
@@ -168,6 +189,7 @@ struct SharedMediaKey {
 
 	PeerId peerId = 0;
 	MsgId topicRootId = 0;
+	PeerId monoforumPeerId = 0;
 	SharedMediaType type = SharedMediaType::kCount;
 	MsgId messageId = 0;
 
@@ -195,16 +217,19 @@ struct SharedMediaSliceUpdate {
 	SharedMediaSliceUpdate(
 		PeerId peerId,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		SharedMediaType type,
 		const SparseIdsSliceUpdate &data)
 	: peerId(peerId)
 	, topicRootId(topicRootId)
+	, monoforumPeerId(monoforumPeerId)
 	, type(type)
 	, data(data) {
 	}
 
 	PeerId peerId = 0;
 	MsgId topicRootId = 0;
+	PeerId monoforumPeerId = 0;
 	SharedMediaType type = SharedMediaType::kCount;
 	SparseIdsSliceUpdate data;
 };
@@ -212,13 +237,16 @@ struct SharedMediaSliceUpdate {
 struct SharedMediaUnloadThread {
 	SharedMediaUnloadThread(
 		PeerId peerId,
-		MsgId topicRootId)
+		MsgId topicRootId,
+		PeerId monoforumPeerId)
 	: peerId(peerId)
-	, topicRootId(topicRootId) {
+	, topicRootId(topicRootId)
+	, monoforumPeerId(monoforumPeerId) {
 	}
 
 	PeerId peerId = 0;
 	MsgId topicRootId = 0;
+	PeerId monoforumPeerId = 0;
 };
 
 class SharedMedia {
@@ -245,6 +273,7 @@ class SharedMedia {
 	struct Key {
 		PeerId peerId = 0;
 		MsgId topicRootId = 0;
+		PeerId monoforumPeerId = 0;
 
 		friend inline constexpr auto operator<=>(Key, Key) = default;
 	};
diff --git a/Telegram/SourceFiles/storage/storage_user_photos.cpp b/Telegram/SourceFiles/storage/storage_user_photos.cpp
index 5ecb6bceeb3e5f..11f2eb1354aa27 100644
--- a/Telegram/SourceFiles/storage/storage_user_photos.cpp
+++ b/Telegram/SourceFiles/storage/storage_user_photos.cpp
@@ -90,6 +90,17 @@ void UserPhotos::List::removeAfter(PhotoId photoId) {
 	sendUpdate();
 }
 
+void UserPhotos::List::replace(PhotoId oldPhotoId, PhotoId newPhotoId) {
+	auto position = ranges::find(_photoIds, oldPhotoId);
+	if (position != _photoIds.end()) {
+		*position = newPhotoId;
+	}
+	if (_backPhotoId == oldPhotoId) {
+		_backPhotoId = newPhotoId;
+	}
+	sendUpdate();
+}
+
 void UserPhotos::List::sendUpdate() {
 	auto update = SliceUpdate();
 	update.photoIds = &_photoIds;
@@ -147,7 +158,7 @@ std::map<UserId, UserPhotos::List>::iterator UserPhotos::enforceLists(
 	}
 	result = _lists.emplace(user, List {}).first;
 	result->second.sliceUpdated(
-	) | rpl::start_with_next([this, user](
+	) | rpl::on_next([this, user](
 			const SliceUpdate &update) {
 		_sliceUpdated.fire(UserPhotosSliceUpdate(
 			user,
@@ -188,6 +199,13 @@ void UserPhotos::remove(UserPhotosRemoveAfter &&query) {
 	}
 }
 
+void UserPhotos::replace(UserPhotosReplace &&query) {
+	auto userIt = _lists.find(query.userId);
+	if (userIt != _lists.end()) {
+		userIt->second.replace(query.oldPhotoId, query.newPhotoId);
+	}
+}
+
 rpl::producer<UserPhotosResult> UserPhotos::query(
 		UserPhotosQuery &&query) const {
 	auto userIt = _lists.find(query.key.userId);
diff --git a/Telegram/SourceFiles/storage/storage_user_photos.h b/Telegram/SourceFiles/storage/storage_user_photos.h
index 323d818c2e6418..e5cfa1cb24c3da 100644
--- a/Telegram/SourceFiles/storage/storage_user_photos.h
+++ b/Telegram/SourceFiles/storage/storage_user_photos.h
@@ -74,6 +74,22 @@ struct UserPhotosRemoveAfter {
 
 };
 
+struct UserPhotosReplace {
+	UserPhotosReplace(
+		UserId userId,
+		PhotoId oldPhotoId,
+		PhotoId newPhotoId)
+		: userId(userId)
+		, oldPhotoId(oldPhotoId)
+		, newPhotoId(newPhotoId) {
+	}
+
+	UserId userId = 0;
+	PhotoId oldPhotoId = 0;
+	PhotoId newPhotoId = 0;
+
+};
+
 struct UserPhotosKey {
 	UserPhotosKey(
 		UserId userId,
@@ -144,6 +160,7 @@ class UserPhotos {
 	void add(UserPhotosAddSlice &&query);
 	void remove(UserPhotosRemoveOne &&query);
 	void remove(UserPhotosRemoveAfter &&query);
+	void replace(UserPhotosReplace &&query);
 
 	rpl::producer<UserPhotosResult> query(UserPhotosQuery &&query) const;
 	rpl::producer<UserPhotosSliceUpdate> sliceUpdated() const;
@@ -158,6 +175,7 @@ class UserPhotos {
 			int count);
 		void removeOne(PhotoId photoId);
 		void removeAfter(PhotoId photoId);
+		void replace(PhotoId oldPhotoId, PhotoId newPhotoId);
 		rpl::producer<UserPhotosResult> query(UserPhotosQuery &&query) const;
 
 		struct SliceUpdate {
diff --git a/Telegram/SourceFiles/storage/streamed_file_downloader.cpp b/Telegram/SourceFiles/storage/streamed_file_downloader.cpp
index 990e0fd5a43806..e03d91e96952f9 100644
--- a/Telegram/SourceFiles/storage/streamed_file_downloader.cpp
+++ b/Telegram/SourceFiles/storage/streamed_file_downloader.cpp
@@ -57,7 +57,7 @@ StreamedFileDownloader::StreamedFileDownloader(
 	_partIsSaved.resize(_partsCount, false);
 
 	_reader->partsForDownloader(
-	) | rpl::start_with_next([=](const LoadedPart &part) {
+	) | rpl::on_next([=](const LoadedPart &part) {
 		if (part.offset == LoadedPart::kFailedOffset) {
 			cancel(FailureReason::OtherFailure);
 		} else {
diff --git a/Telegram/SourceFiles/support/support_autocomplete.cpp b/Telegram/SourceFiles/support/support_autocomplete.cpp
index 45ad83eddeca29..615e73c41efc71 100644
--- a/Telegram/SourceFiles/support/support_autocomplete.cpp
+++ b/Telegram/SourceFiles/support/support_autocomplete.cpp
@@ -397,9 +397,9 @@ void Autocomplete::setupContent() {
 		scroll->scrollToY(0);
 	};
 
-	inner->activated() | rpl::start_with_next(submit, lifetime());
+	inner->activated() | rpl::on_next(submit, lifetime());
 	input->focusedChanges(
-	) | rpl::filter(!rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(!rpl::mappers::_1) | rpl::on_next([=] {
 		base::call_delayed(10, this, [=] {
 			if (!input->hasFocus()) {
 				deactivate();
@@ -407,11 +407,11 @@ void Autocomplete::setupContent() {
 		});
 	}, input->lifetime());
 	input->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		deactivate();
 	}, input->lifetime());
-	input->changes() | rpl::start_with_next(refresh, input->lifetime());
-	input->submits() | rpl::start_with_next(submit, input->lifetime());
+	input->changes() | rpl::on_next(refresh, input->lifetime());
+	input->submits() | rpl::on_next(submit, input->lifetime());
 	input->customUpDown(true);
 
 	_activate = [=] {
@@ -430,7 +430,7 @@ void Autocomplete::setupContent() {
 	};
 
 	paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter p(this);
 		p.fillRect(
 			clip.intersected(QRect(0, st::lineWidth, width(), height())),
@@ -441,7 +441,7 @@ void Autocomplete::setupContent() {
 	}, lifetime());
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		inputWrap->resizeToWidth(size.width());
 		inputWrap->moveToLeft(0, st::lineWidth, size.width());
 		scroll->setGeometry(
@@ -495,7 +495,7 @@ ConfirmContactBox::ConfirmContactBox(
 }
 
 void ConfirmContactBox::prepare() {
-	setTitle(rpl::single(u"Confirmation"_q)); // #TODO hard_lang
+	setTitle(u"Confirmation"_q); // #TODO hard_lang
 
 	auto maxWidth = 0;
 	if (_comment) {
@@ -520,7 +520,7 @@ void ConfirmContactBox::prepare() {
 	_contact->initDimensions();
 
 	_submit = [=, original = std::move(_submit)](Qt::KeyboardModifiers m) {
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		original(m);
 		if (weak) {
 			closeBox();
@@ -529,7 +529,7 @@ void ConfirmContactBox::prepare() {
 
 	const auto button = addButton(tr::lng_send_button(), [] {});
 	button->clicks(
-	) | rpl::start_with_next([=](Qt::MouseButton which) {
+	) | rpl::on_next([=](Qt::MouseButton which) {
 		_submit((which == Qt::RightButton)
 			? SkipSwitchModifiers()
 			: button->clickModifiers());
@@ -557,6 +557,7 @@ void ConfirmContactBox::paintEvent(QPaintEvent *e) {
 		_chatStyle.get(),
 		rect(),
 		rect(),
+		rect(),
 		controller()->isGifPausedAtLeastFor(Window::GifPauseReason::Layer));
 	p.translate(st::boxPadding.left(), 0);
 	if (_comment) {
diff --git a/Telegram/SourceFiles/support/support_helper.cpp b/Telegram/SourceFiles/support/support_helper.cpp
index 286f1fc6c8e29d..e31e770866007e 100644
--- a/Telegram/SourceFiles/support/support_helper.cpp
+++ b/Telegram/SourceFiles/support/support_helper.cpp
@@ -17,27 +17,33 @@ For license and copyright information please follow this link:
 #include "api/api_text_entities.h"
 #include "history/history.h"
 #include "boxes/abstract_box.h"
-#include "ui/toast/toast.h"
-#include "ui/widgets/fields/input_field.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_entity.h"
 #include "ui/text/text_options.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/fields/input_field.h"
 #include "chat_helpers/message_field.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "base/unixtime.h"
 #include "lang/lang_keys.h"
 #include "window/window_session_controller.h"
+#include "storage/storage_account.h"
 #include "storage/storage_media_prepare.h"
 #include "storage/localimageloader.h"
 #include "core/launcher.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "main/main_account.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -47,8 +53,9 @@ namespace {
 
 constexpr auto kOccupyFor = TimeId(60);
 constexpr auto kReoccupyEach = 30 * crl::time(1000);
-constexpr auto kMaxSupportInfoLength = MaxMessageSize * 4;
+constexpr auto kMaxSupportInfoLength = 16 * 1024;
 constexpr auto kTopicRootId = MsgId(0);
+constexpr auto kMonoforumPeerId = PeerId(0);
 
 class EditInfoBox : public Ui::BoxContent {
 public:
@@ -87,14 +94,15 @@ EditInfoBox::EditInfoBox(
 		Core::App().settings().sendSubmitWay());
 	_field->setInstantReplaces(Ui::InstantReplaces::Default());
 	_field->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+		Core::App().settings().replaceEmojiValue(),
+		Core::App().settings().systemTextReplaceValue());
 	_field->setMarkdownReplacesEnabled(true);
 	_field->setEditLinkCallback(
 		DefaultEditLinkCallback(controller->uiShow(), _field));
 }
 
 void EditInfoBox::prepare() {
-	setTitle(rpl::single(u"Edit support information"_q)); // #TODO hard_lang
+	setTitle(u"Edit support information"_q); // #TODO hard_lang
 
 	const auto save = [=] {
 		const auto done = crl::guard(this, [=](bool success) {
@@ -109,9 +117,9 @@ void EditInfoBox::prepare() {
 	addButton(tr::lng_settings_save(), save);
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
 
-	_field->submits() | rpl::start_with_next(save, _field->lifetime());
+	_field->submits() | rpl::on_next(save, _field->lifetime());
 	_field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeBox();
 	}, _field->lifetime());
 	Ui::Emoji::SuggestionsController::Init(
@@ -124,14 +132,14 @@ void EditInfoBox::prepare() {
 	_field->setTextCursor(cursor);
 
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_field->resizeToWidth(
 			width - st::boxPadding.left() - st::boxPadding.right());
 		_field->moveToLeft(st::boxPadding.left(), st::boxPadding.bottom());
 	}, _field->lifetime());
 
 	_field->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(
 			st::boxWideWidth,
 			st::boxPadding.bottom() + height + st::boxPadding.bottom());
@@ -160,6 +168,7 @@ Data::Draft OccupiedDraft(const QString &normalizedName) {
 			+ ";n:"
 			+ normalizedName },
 		FullReplyTo(),
+		SuggestOptions(),
 		MessageCursor(),
 		Data::WebPageDraft()
 	};
@@ -178,7 +187,7 @@ uint32 ParseOccupationTag(History *history) {
 	if (!TrackHistoryOccupation(history)) {
 		return 0;
 	}
-	const auto draft = history->cloudDraft(kTopicRootId);
+	const auto draft = history->cloudDraft(kTopicRootId, kMonoforumPeerId);
 	if (!draft) {
 		return 0;
 	}
@@ -204,7 +213,7 @@ QString ParseOccupationName(History *history) {
 	if (!TrackHistoryOccupation(history)) {
 		return QString();
 	}
-	const auto draft = history->cloudDraft(kTopicRootId);
+	const auto draft = history->cloudDraft(kTopicRootId, kMonoforumPeerId);
 	if (!draft) {
 		return QString();
 	}
@@ -230,7 +239,7 @@ TimeId OccupiedBySomeoneTill(History *history) {
 	if (!TrackHistoryOccupation(history)) {
 		return 0;
 	}
-	const auto draft = history->cloudDraft(kTopicRootId);
+	const auto draft = history->cloudDraft(kTopicRootId, kMonoforumPeerId);
 	if (!draft) {
 		return 0;
 	}
@@ -256,6 +265,12 @@ TimeId OccupiedBySomeoneTill(History *history) {
 	return valid ? result : 0;
 }
 
+QString FastButtonModeIdsPath(not_null<Main::Session*> session) {
+	const auto base = session->account().local().supportModePath();
+	QDir().mkpath(base);
+	return base + u"/fast_button_mode_ids.json"_q;
+}
+
 } // namespace
 
 Helper::Helper(not_null<Main::Session*> session)
@@ -279,8 +294,32 @@ Helper::Helper(not_null<Main::Session*> session)
 
 std::unique_ptr<Helper> Helper::Create(not_null<Main::Session*> session) {
 	//return std::make_unique<Helper>(session); AssertIsDebug();
-	const auto valid = session->user()->phone().startsWith(u"424"_q);
-	return valid ? std::make_unique<Helper>(session) : nullptr;
+	return ShouldUse(session) ? std::make_unique<Helper>(session) : nullptr;
+}
+
+void Helper::CheckIfLost(not_null<Window::SessionController*> controller) {
+	static auto Checked = false;
+	if (Checked) {
+		return;
+	}
+	Checked = true;
+
+	const auto session = &controller->session();
+	if (!ShouldUse(session) || session->supportMode()) {
+		return;
+	}
+	session->local().writeSelf();
+	controller->show(Ui::MakeConfirmBox({
+		.text = u"This account should have support mode, "
+			"but it seems it was lost. Restart?"_q,
+		.confirmed = [=] { Core::Restart(); },
+		.confirmText = u"Restart"_q,
+		.title = u"Support Mode Lost"_q,
+	}));
+}
+
+bool Helper::ShouldUse(not_null<Main::Session*> session) {
+	return session->user()->phone().startsWith(u"424"_q);
 }
 
 void Helper::registerWindow(not_null<Window::SessionController*> controller) {
@@ -289,7 +328,7 @@ void Helper::registerWindow(not_null<Window::SessionController*> controller) {
 		const auto history = key.history();
 		return TrackHistoryOccupation(history) ? history : nullptr;
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](History *history) {
+	) | rpl::on_next([=](History *history) {
 		updateOccupiedHistory(controller, history);
 	}, controller->lifetime());
 }
@@ -342,7 +381,7 @@ void Helper::updateOccupiedHistory(
 		not_null<Window::SessionController*> controller,
 		History *history) {
 	if (isOccupiedByMe(_occupiedHistory)) {
-		_occupiedHistory->clearCloudDraft(kTopicRootId);
+		_occupiedHistory->clearCloudDraft(kTopicRootId, kMonoforumPeerId);
 		_session->api().saveDraftToCloudDelayed(_occupiedHistory);
 	}
 	_occupiedHistory = history;
@@ -366,7 +405,10 @@ void Helper::occupyInDraft() {
 		&& !isOccupiedBySomeone(_occupiedHistory)
 		&& !_supportName.isEmpty()) {
 		const auto draft = OccupiedDraft(_supportNameNormalized);
-		_occupiedHistory->createCloudDraft(kTopicRootId, &draft);
+		_occupiedHistory->createCloudDraft(
+			kTopicRootId,
+			kMonoforumPeerId,
+			&draft);
 		_session->api().saveDraftToCloudDelayed(_occupiedHistory);
 		_reoccupyTimer.callEach(kReoccupyEach);
 	}
@@ -375,7 +417,10 @@ void Helper::occupyInDraft() {
 void Helper::reoccupy() {
 	if (isOccupiedByMe(_occupiedHistory)) {
 		const auto draft = OccupiedDraft(_supportNameNormalized);
-		_occupiedHistory->createCloudDraft(kTopicRootId, &draft);
+		_occupiedHistory->createCloudDraft(
+			kTopicRootId,
+			kMonoforumPeerId,
+			&draft);
 		_session->api().saveDraftToCloudDelayed(_occupiedHistory);
 	}
 }
@@ -396,7 +441,7 @@ bool Helper::isOccupiedBySomeone(History *history) const {
 
 void Helper::refreshInfo(not_null<UserData*> user) {
 	_api.request(MTPhelp_GetUserInfo(
-		user->inputUser
+		user->inputUser()
 	)).done([=](const MTPhelp_UserInfo &result) {
 		applyInfo(user, result);
 		if (const auto controller = _userInfoEditPending.take(user)) {
@@ -525,7 +570,7 @@ void Helper::saveInfo(
 		text.entities,
 		Api::ConvertOption::SkipLocal);
 	_userInfoSaving[user].requestId = _api.request(MTPhelp_EditUserInfo(
-		user->inputUser,
+		user->inputUser(),
 		MTP_string(text.text),
 		entities
 	)).done([=](const MTPhelp_UserInfo &result) {
@@ -540,6 +585,83 @@ Templates &Helper::templates() {
 	return _templates;
 }
 
+FastButtonsBots::FastButtonsBots(not_null<Main::Session*> session)
+: _session(session) {
+}
+
+bool FastButtonsBots::enabled(not_null<PeerData*> peer) const {
+	if (!_read) {
+		const_cast<FastButtonsBots*>(this)->read();
+	}
+	return _bots.contains(peer->id);
+}
+
+rpl::producer<bool> FastButtonsBots::enabledValue(
+		not_null<PeerData*> peer) const {
+	return rpl::single(
+		enabled(peer)
+	) | rpl::then(_changes.events(
+	) | rpl::filter([=](PeerId id) {
+		return (peer->id == id);
+	}) | rpl::map([=] {
+		return enabled(peer);
+	}));
+}
+
+void FastButtonsBots::setEnabled(not_null<PeerData*> peer, bool value) {
+	if (value == enabled(peer)) {
+		return;
+	} else if (value) {
+		_bots.emplace(peer->id);
+	} else {
+		_bots.remove(peer->id);
+	}
+	if (_bots.empty()) {
+		QFile(FastButtonModeIdsPath(_session)).remove();
+	} else {
+		write();
+	}
+	_changes.fire_copy(peer->id);
+	if (const auto history = peer->owner().history(peer)) {
+		if (const auto item = history->lastMessage()) {
+			history->owner().requestItemRepaint(item);
+		}
+	}
+}
+
+void FastButtonsBots::write() {
+	auto array = QJsonArray();
+	for (const auto &id : _bots) {
+		array.append(QString::number(id.value));
+	}
+	auto object = QJsonObject();
+	object[u"ids"_q] = array;
+	auto f = QFile(FastButtonModeIdsPath(_session));
+	if (f.open(QIODevice::WriteOnly)) {
+		f.write(QJsonDocument(object).toJson(QJsonDocument::Indented));
+	}
+}
+
+void FastButtonsBots::read() {
+	_read = true;
+
+	auto f = QFile(FastButtonModeIdsPath(_session));
+	if (!f.open(QIODevice::ReadOnly)) {
+		return;
+	}
+	const auto data = f.readAll();
+	const auto json = QJsonDocument::fromJson(data);
+	if (!json.isObject()) {
+		return;
+	}
+	const auto object = json.object();
+	const auto array = object.value(u"ids"_q).toArray();
+	for (const auto &value : array) {
+		const auto bareId = value.toString().toULongLong();
+		_bots.emplace(PeerId(bareId));
+	}
+}
+
 QString ChatOccupiedString(not_null<History*> history) {
 	const auto hand = QString::fromUtf8("\xe2\x9c\x8b\xef\xb8\x8f");
 	const auto name = ParseOccupationName(history);
@@ -598,15 +720,18 @@ QString InterpretSendPath(
 	const auto sendTo = [=](not_null<Data::Thread*> thread) {
 		window->showThread(thread);
 		const auto premium = thread->session().user()->isPremium();
-		thread->session().api().sendFiles(
-			Storage::PrepareMediaList(
-				QStringList(filePath),
-				st::sendMediaPreviewSize,
-				premium),
-			SendMediaType::File,
-			{ caption },
-			nullptr,
-			Api::SendAction(thread));
+		auto list = Storage::PrepareMediaList(
+			QStringList(filePath),
+			st::sendMediaPreviewSize,
+			premium);
+		if (!list.files.empty()) {
+			list.files.back().caption.text = caption;
+			thread->session().api().sendFiles(
+				std::move(list),
+				SendMediaType::File,
+				nullptr,
+				Api::SendAction(thread));
+		}
 	};
 	if (!history) {
 		return "App Error: Could not find channel with id: "
diff --git a/Telegram/SourceFiles/support/support_helper.h b/Telegram/SourceFiles/support/support_helper.h
index fd46acd38a6add..4094d0aa62e60e 100644
--- a/Telegram/SourceFiles/support/support_helper.h
+++ b/Telegram/SourceFiles/support/support_helper.h
@@ -44,21 +44,24 @@ class Helper final {
 	explicit Helper(not_null<Main::Session*> session);
 
 	static std::unique_ptr<Helper> Create(not_null<Main::Session*> session);
+	static void CheckIfLost(not_null<Window::SessionController*> controller);
 
 	void registerWindow(not_null<Window::SessionController*> controller);
 	void cloudDraftChanged(not_null<History*> history);
 
 	void chatOccupiedUpdated(not_null<History*> history);
 
-	bool isOccupiedByMe(History *history) const;
-	bool isOccupiedBySomeone(History *history) const;
+	[[nodiscard]] bool isOccupiedByMe(History *history) const;
+	[[nodiscard]] bool isOccupiedBySomeone(History *history) const;
 
 	void refreshInfo(not_null<UserData*> user);
-	rpl::producer<UserInfo> infoValue(not_null<UserData*> user) const;
-	rpl::producer<QString> infoLabelValue(not_null<UserData*> user) const;
-	rpl::producer<TextWithEntities> infoTextValue(
+	[[nodiscard]] rpl::producer<UserInfo> infoValue(
 		not_null<UserData*> user) const;
-	UserInfo infoCurrent(not_null<UserData*> user) const;
+	[[nodiscard]] rpl::producer<QString> infoLabelValue(
+		not_null<UserData*> user) const;
+	[[nodiscard]] rpl::producer<TextWithEntities> infoTextValue(
+		not_null<UserData*> user) const;
+	[[nodiscard]] UserInfo infoCurrent(not_null<UserData*> user) const;
 	void editInfo(
 		not_null<Window::SessionController*> controller,
 		not_null<UserData*> user);
@@ -90,7 +93,9 @@ class Helper final {
 		TextWithEntities text,
 		Fn<void(bool success)> done);
 
-	not_null<Main::Session*> _session;
+	static bool ShouldUse(not_null<Main::Session*> session);
+
+	const not_null<Main::Session*> _session;
 	MTP::Sender _api;
 	Templates _templates;
 	QString _supportName;
@@ -111,6 +116,27 @@ class Helper final {
 
 };
 
+class FastButtonsBots final {
+public:
+	explicit FastButtonsBots(not_null<Main::Session*> session);
+
+	[[nodiscard]] bool enabled(not_null<PeerData*> peer) const;
+	[[nodiscard]] rpl::producer<bool> enabledValue(
+		not_null<PeerData*> peer) const;
+	void setEnabled(not_null<PeerData*> peer, bool value);
+
+private:
+	void write();
+	void read();
+
+	const not_null<Main::Session*> _session;
+
+	base::flat_set<PeerId> _bots;
+	rpl::event_stream<PeerId> _changes;
+	bool _read = false;
+
+};
+
 QString ChatOccupiedString(not_null<History*> history);
 
 QString InterpretSendPath(
diff --git a/Telegram/SourceFiles/support/support_preload.cpp b/Telegram/SourceFiles/support/support_preload.cpp
index 046bc9182a07fa..91bf3536266956 100644
--- a/Telegram/SourceFiles/support/support_preload.cpp
+++ b/Telegram/SourceFiles/support/support_preload.cpp
@@ -38,7 +38,7 @@ int SendPreloadRequest(not_null<History*> history, Fn<void()> retry) {
 	auto &histories = history->owner().histories();
 	return histories.sendRequest(history, type, [=](Fn<void()> finish) {
 		return history->session().api().request(MTPmessages_GetHistory(
-			history->peer->input,
+			history->peer->input(),
 			MTP_int(offsetId),
 			MTP_int(offsetDate),
 			MTP_int(offset),
diff --git a/Telegram/SourceFiles/support/support_templates.cpp b/Telegram/SourceFiles/support/support_templates.cpp
index cb1515ee30eab4..f4687dfad87a06 100644
--- a/Telegram/SourceFiles/support/support_templates.cpp
+++ b/Telegram/SourceFiles/support/support_templates.cpp
@@ -450,7 +450,7 @@ struct Templates::Updates {
 Templates::Templates(not_null<Main::Session*> session) : _session(session) {
 	load();
 	Shortcuts::Requests(
-	) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+	) | rpl::on_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(
 			Command::SupportReloadTemplates
@@ -463,7 +463,7 @@ Templates::Templates(not_null<Main::Session*> session) : _session(session) {
 
 void Templates::reload() {
 	_reloadToastSubscription = errors(
-	) | rpl::start_with_next([=](QStringList errors) {
+	) | rpl::on_next([=](QStringList errors) {
 		Ui::Toast::Show(errors.isEmpty()
 			? "Templates reloaded!"
 			: ("Errors:\n\n" + errors.join("\n\n")));
diff --git a/Telegram/SourceFiles/tde2e/tde2e_api.cpp b/Telegram/SourceFiles/tde2e/tde2e_api.cpp
new file mode 100644
index 00000000000000..fb7cbbb9863609
--- /dev/null
+++ b/Telegram/SourceFiles/tde2e/tde2e_api.cpp
@@ -0,0 +1,526 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "tde2e/tde2e_api.h"
+
+#include "base/assertion.h"
+#include "base/debug_log.h"
+
+#include <td/e2e/e2e_api.h>
+
+#define LOG_ERROR(error) \
+	LOG(("TdE2E Error %1: %2").arg(int(error.code)).arg(error.message.c_str()))
+
+#define LOG_AND_FAIL(error, reason) \
+	LOG_ERROR(error); \
+	fail(reason)
+
+#define LOG_APPLY(subchain, slice) \
+	DEBUG_LOG(("TdE2E Apply[%1]: %2").arg(subchain).arg(WrapForLog(slice)))
+
+namespace TdE2E {
+namespace {
+
+constexpr auto kPermissionAdd = 1;
+constexpr auto kPermissionRemove = 2;
+constexpr auto kShortPollChainBlocksTimeout = 5 * crl::time(1000);
+constexpr auto kShortPollChainBlocksWaitFor = crl::time(1000);
+
+[[nodiscard]] tde2e_api::Slice Slice(const QByteArray &data) {
+	return {
+		data.constData(),
+		std::string_view::size_type(data.size())
+	};
+}
+
+[[nodiscard]] tde2e_api::Slice Slice(const std::vector<uint8_t> &data) {
+	return {
+		reinterpret_cast<const char*>(data.data()),
+		std::string_view::size_type(data.size()),
+	};
+}
+
+[[nodiscard]] ParticipantsSet ParseParticipantsSet(
+		const tde2e_api::CallState &state) {
+	auto result = ParticipantsSet();
+	const auto &list = state.participants;
+	result.list.reserve(list.size());
+	for (const auto &entry : list) {
+		result.list.emplace(UserId{ uint64(entry.user_id) });
+	}
+	return result;
+}
+
+[[nodiscard]] QString WrapForLog(std::string_view v) {
+	auto result = QString();
+	const auto count = std::min(int(v.size()), 16);
+	result.reserve(count * 3 + 2);
+	for (auto i = 0; i != count; ++i) {
+		const auto byte = uint8(v[i]);
+		result += QString::number(byte, 16).rightJustified(2, '0');
+		if (i + 1 != count) {
+			result += ' ';
+		}
+	}
+	if (v.size() > count) {
+		result += "...";
+	}
+	return result.toUpper();
+}
+
+} // namespace
+
+auto EncryptDecrypt::callback()
+-> Fn<EncryptionBuffer(const EncryptionBuffer&, int64_t, bool, int32_t)> {
+	return [that = shared_from_this()](
+			const EncryptionBuffer &data,
+			int64_t userId,
+			bool encrypt,
+			int32_t unencryptedPrefixSize) -> EncryptionBuffer {
+		const auto libId = that->_id.load();
+		if (!libId) {
+			return {};
+		}
+		const auto channelId = tde2e_api::CallChannelId(0);
+		const auto slice = Slice(data);
+		const auto result = encrypt
+			? tde2e_api::call_encrypt(
+				libId,
+				channelId,
+				slice,
+				size_t(unencryptedPrefixSize))
+			: tde2e_api::call_decrypt(libId, userId, channelId, slice);
+		if (!result.is_ok()) {
+			return {};
+		}
+		const auto &value = result.value();
+		const auto start = reinterpret_cast<const uint8_t*>(value.data());
+		const auto end = start + value.size();
+		return { start, end };
+	};
+}
+
+void EncryptDecrypt::setCallId(CallId id) {
+	Expects(id.v != 0);
+
+	_id.store(id.v);
+}
+
+void EncryptDecrypt::clearCallId(CallId fromId) {
+	Expects(fromId.v != 0);
+
+	_id.compare_exchange_strong(fromId.v, 0);
+}
+
+Call::Call(UserId myUserId)
+: _myUserId(myUserId) {
+	const auto id = tde2e_api::key_generate_temporary_private_key();
+	Assert(id.is_ok());
+	_myKeyId = { .v = uint64(id.value()) };
+
+	const auto key = tde2e_api::key_to_public_key(_myKeyId.v);
+	Assert(key.is_ok());
+	Assert(key.value().size() == sizeof(_myKey));
+	memcpy(&_myKey, key.value().data(), sizeof(_myKey));
+}
+
+Call::~Call() {
+	if (const auto id = libId()) {
+		if (const auto raw = _encryptDecrypt.get()) {
+			raw->clearCallId(_id);
+		}
+		tde2e_api::call_destroy(id);
+	}
+}
+
+void Call::fail(CallFailure reason) {
+	_emojiHash = QByteArray();
+	_failure = reason;
+	_failures.fire_copy(reason);
+}
+
+PublicKey Call::myKey() const {
+	return _myKey;
+}
+
+bool Call::hasLastBlock0() const {
+	return _lastBlock0.has_value();
+}
+
+void Call::refreshLastBlock0(std::optional<Block> block) {
+	_lastBlock0 = std::move(block);
+}
+
+Block Call::makeJoinBlock() {
+	if (failed()) {
+		return {};
+	}
+
+	const auto publicKeyView = std::string_view{
+		reinterpret_cast<const char*>(&_myKey),
+		sizeof(_myKey),
+	};
+	const auto publicKeyId = tde2e_api::key_from_public_key(publicKeyView);
+	Assert(publicKeyId.is_ok());
+
+	const auto myKeyId = std::int64_t(_myKeyId.v);
+	const auto myParticipant = tde2e_api::CallParticipant{
+		.user_id = std::int64_t(_myUserId.v),
+		.public_key_id = publicKeyId.value(),
+		.permissions = kPermissionAdd | kPermissionRemove,
+	};
+
+	const auto result = _lastBlock0
+		? tde2e_api::call_create_self_add_block(
+			myKeyId,
+			Slice(_lastBlock0->data),
+			myParticipant)
+		: tde2e_api::call_create_zero_block(myKeyId, {
+			.height = 0,
+			.participants = { myParticipant },
+		});
+	if (!result.is_ok()) {
+		LOG_AND_FAIL(result.error(), CallFailure::Unknown);
+		return {};
+	}
+
+	return {
+		.data = QByteArray::fromStdString(result.value()),
+	};
+}
+
+Block Call::makeRemoveBlock(const base::flat_set<UserId> &ids) {
+	if (failed() || !_id) {
+		return {};
+	}
+
+	auto state = tde2e_api::call_get_state(libId());
+	if (!state.is_ok()) {
+		LOG_AND_FAIL(state.error(), CallFailure::Unknown);
+		return {};
+	}
+	auto found = false;
+	auto updated = state.value();
+	auto &list = updated.participants;
+	for (auto i = begin(list); i != end(list);) {
+		const auto userId = UserId{ uint64(i->user_id) };
+		if (userId != _myUserId && ids.contains(userId)) {
+			i = list.erase(i);
+			found = true;
+		} else {
+			++i;
+		}
+	}
+	if (!found) {
+		return {};
+	}
+	const auto result = tde2e_api::call_create_change_state_block(
+		libId(),
+		updated);
+	if (!result.is_ok()) {
+		LOG_AND_FAIL(result.error(), CallFailure::Unknown);
+		return {};
+	}
+	return {
+		.data = QByteArray::fromStdString(result.value()),
+	};
+}
+
+rpl::producer<ParticipantsSet> Call::participantsSetValue() const {
+	return _participantsSet.value();
+}
+
+void Call::joined() {
+	if (!_id) {
+		LOG(("TdE2E Error: Call::joined() without id."));
+		_failure = CallFailure::Unknown;
+		return;
+	}
+	shortPoll(0);
+	shortPoll(1);
+}
+
+void Call::apply(int subchain, const Block &last) {
+	Expects(_id || !subchain);
+
+	auto verification = std::optional<tde2e_api::CallVerificationState>();
+	const auto guard = gsl::finally([&] {
+		if (failed() || !_id) {
+			return;
+		} else if (!verification) {
+			const auto id = libId();
+			auto result = tde2e_api::call_get_verification_state(id);
+			if (!result.is_ok()) {
+				LOG_AND_FAIL(result.error(), CallFailure::Unknown);
+				return;
+			}
+			verification = std::move(result.value());
+		}
+		_emojiHash = verification->emoji_hash.has_value()
+			? QByteArray::fromStdString(*verification->emoji_hash)
+			: QByteArray();
+		checkForOutboundMessages();
+	});
+
+	if (subchain) {
+		LOG_APPLY(1, Slice(last.data));
+		auto result = tde2e_api::call_receive_inbound_message(
+			libId(),
+			Slice(last.data));
+		if (!result.is_ok()) {
+			LOG_AND_FAIL(result.error(), CallFailure::Unknown);
+		} else {
+			verification = std::move(result.value());
+		}
+		return;
+	} else if (_id) {
+		LOG_APPLY(0, Slice(last.data));
+		const auto result = tde2e_api::call_apply_block(
+			libId(),
+			Slice(last.data));
+		if (!result.is_ok()) {
+			LOG_AND_FAIL(result.error(), CallFailure::Unknown);
+		} else {
+			_participantsSet = ParseParticipantsSet(result.value());
+		}
+		return;
+	}
+	LOG_APPLY(-1, Slice(last.data));
+	const auto id = tde2e_api::call_create(
+		std::int64_t(_myUserId.v),
+		std::int64_t(_myKeyId.v),
+		Slice(last.data));
+	if (!id.is_ok()) {
+		LOG_AND_FAIL(id.error(), CallFailure::Unknown);
+		return;
+	}
+	setId({ uint64(id.value()) });
+
+	for (auto i = 0; i != kSubChainsCount; ++i) {
+		auto &entry = _subchains[i];
+		entry.waitingTimer.setCallback([=] {
+			checkWaitingBlocks(i, true);
+		});
+		entry.shortPollTimer.setCallback([=] {
+			shortPoll(i);
+		});
+		if (!entry.waitingTimer.isActive()) {
+			entry.shortPollTimer.callOnce(kShortPollChainBlocksTimeout);
+		}
+	}
+
+	const auto state = tde2e_api::call_get_state(libId());
+	if (!state.is_ok()) {
+		LOG_AND_FAIL(state.error(), CallFailure::Unknown);
+		return;
+	}
+	_participantsSet = ParseParticipantsSet(state.value());
+}
+
+void Call::setId(CallId id) {
+	Expects(!_id);
+
+	_id = id;
+	if (const auto raw = _encryptDecrypt.get()) {
+		raw->setCallId(id);
+	}
+}
+
+void Call::checkForOutboundMessages() {
+	Expects(_id);
+
+	const auto result = tde2e_api::call_pull_outbound_messages(libId());
+	if (!result.is_ok()) {
+		LOG_AND_FAIL(result.error(), CallFailure::Unknown);
+		return;
+	} else if (!result.value().empty()) {
+		_outboundBlocks.fire(
+			QByteArray::fromStdString(result.value().back()));
+	}
+}
+
+void Call::apply(
+		int subchain,
+		int indexAfterLast,
+		const std::vector<Block> &blocks,
+		bool fromShortPoll) {
+	Expects(subchain >= 0 && subchain < kSubChainsCount);
+
+	if (!subchain && !blocks.empty() && indexAfterLast > _lastBlock0Height) {
+		_lastBlock0 = blocks.back();
+		_lastBlock0Height = indexAfterLast;
+	}
+
+	auto &entry = _subchains[subchain];
+	if (fromShortPoll) {
+		auto i = begin(entry.waiting);
+		while (i != end(entry.waiting) && i->first < indexAfterLast) {
+			++i;
+		}
+		entry.waiting.erase(begin(entry.waiting), i);
+
+		if (subchain && !_id && !blocks.empty()) {
+			LOG(("TdE2E Error: Broadcast shortpoll block without id."));
+			fail(CallFailure::Unknown);
+			return;
+		}
+	} else {
+		entry.lastUpdate = crl::now();
+	}
+	if (failed()) {
+		return;
+	}
+
+	auto index = indexAfterLast - int(blocks.size());
+	if (!fromShortPoll && (index > entry.height || (!_id && subchain))) {
+		for (const auto &block : blocks) {
+			entry.waiting.emplace(index++, block);
+		}
+	} else {
+		for (const auto &block : blocks) {
+			if (!_id || (entry.height == index)) {
+				apply(subchain, block);
+			}
+			entry.height = std::max(entry.height, ++index);
+		}
+		entry.height = std::max(entry.height, indexAfterLast);
+	}
+	checkWaitingBlocks(subchain);
+}
+
+void Call::checkWaitingBlocks(int subchain, bool waited) {
+	Expects(subchain >= 0 && subchain < kSubChainsCount);
+
+	if (failed()) {
+		return;
+	}
+
+	auto &entry = _subchains[subchain];
+	if (!_id) {
+		entry.waitingTimer.callOnce(kShortPollChainBlocksWaitFor);
+		return;
+	} else if (entry.shortPolling) {
+		return;
+	}
+	auto &waiting = entry.waiting;
+	entry.shortPollTimer.cancel();
+	while (!waiting.empty()) {
+		const auto index = waiting.begin()->first;
+		if (index > entry.height) {
+			if (waited) {
+				shortPoll(subchain);
+			} else {
+				entry.waitingTimer.callOnce(kShortPollChainBlocksWaitFor);
+			}
+			return;
+		} else if (index == entry.height) {
+			const auto slice = Slice(waiting.begin()->second.data);
+			if (subchain) {
+				LOG_APPLY(1, slice);
+				auto result = tde2e_api::call_receive_inbound_message(
+					libId(),
+					slice);
+				if (!result.is_ok()) {
+					LOG_AND_FAIL(result.error(), CallFailure::Unknown);
+					return;
+				}
+				_emojiHash = result.value().emoji_hash.has_value()
+					? QByteArray::fromStdString(*result.value().emoji_hash)
+					: QByteArray();
+				checkForOutboundMessages();
+			} else {
+				LOG_APPLY(0, slice);
+				const auto result = tde2e_api::call_apply_block(
+					libId(),
+					slice);
+				if (!result.is_ok()) {
+					LOG_AND_FAIL(result.error(), CallFailure::Unknown);
+					return;
+				}
+				_participantsSet = ParseParticipantsSet(result.value());
+			}
+			entry.height = std::max(entry.height, index + 1);
+		}
+		waiting.erase(waiting.begin());
+	}
+	entry.waitingTimer.cancel();
+	entry.shortPollTimer.callOnce(kShortPollChainBlocksTimeout);
+}
+
+void Call::shortPoll(int subchain) {
+	Expects(subchain >= 0 && subchain < kSubChainsCount);
+
+	auto &entry = _subchains[subchain];
+	entry.waitingTimer.cancel();
+	entry.shortPollTimer.cancel();
+	if (subchain && !_id) {
+		// Not ready.
+		entry.waitingTimer.callOnce(kShortPollChainBlocksWaitFor);
+		return;
+	}
+	entry.shortPolling = true;
+	_subchainRequests.fire({ subchain, entry.height });
+}
+
+std::int64_t Call::libId() const {
+	return std::int64_t(_id.v);
+}
+
+rpl::producer<Call::SubchainRequest> Call::subchainRequests() const {
+	return _subchainRequests.events();
+}
+
+void Call::subchainBlocksRequestFinished(int subchain) {
+	Expects(subchain >= 0 && subchain < kSubChainsCount);
+
+	if (failed()) {
+		return;
+	}
+
+	auto &entry = _subchains[subchain];
+	entry.shortPolling = false;
+	checkWaitingBlocks(subchain);
+}
+
+rpl::producer<QByteArray> Call::sendOutboundBlock() const {
+	return _outboundBlocks.events();
+}
+
+std::optional<CallFailure> Call::failed() const {
+	return _failure;
+}
+
+rpl::producer<CallFailure> Call::failures() const {
+	if (_failure) {
+		return rpl::single(*_failure);
+	}
+	return _failures.events();
+}
+
+QByteArray Call::emojiHash() const {
+	return _emojiHash.current();
+}
+
+rpl::producer<QByteArray> Call::emojiHashValue() const {
+	return _emojiHash.value();
+}
+
+void Call::registerEncryptDecrypt(std::shared_ptr<EncryptDecrypt> object) {
+	Expects(object != nullptr);
+	Expects(_encryptDecrypt == nullptr);
+
+	_encryptDecrypt = std::move(object);
+	if (_id) {
+		_encryptDecrypt->setCallId(_id);
+	}
+}
+
+rpl::lifetime &Call::lifetime() {
+	return _lifetime;
+}
+
+} // namespace TdE2E
diff --git a/Telegram/SourceFiles/tde2e/tde2e_api.h b/Telegram/SourceFiles/tde2e/tde2e_api.h
new file mode 100644
index 00000000000000..8d538a47a31af4
--- /dev/null
+++ b/Telegram/SourceFiles/tde2e/tde2e_api.h
@@ -0,0 +1,171 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/basic_types.h"
+#include "base/flat_set.h"
+#include "base/timer.h"
+
+#include <rpl/event_stream.h>
+#include <rpl/lifetime.h>
+#include <rpl/producer.h>
+#include <rpl/variable.h>
+
+#include <crl/crl_time.h>
+
+namespace TdE2E {
+
+struct UserId {
+	uint64 v = 0;
+
+	friend inline constexpr auto operator<=>(UserId, UserId) = default;
+	friend inline constexpr bool operator==(UserId, UserId) = default;
+};
+
+struct PrivateKeyId {
+	uint64 v = 0;
+};
+
+struct CallId {
+	uint64 v = 0;
+
+	explicit operator bool() const {
+		return v != 0;
+	}
+};
+
+struct PublicKey {
+	uint64 a = 0;
+	uint64 b = 0;
+	uint64 c = 0;
+	uint64 d = 0;
+};
+
+struct ParticipantState {
+	UserId id;
+	PublicKey key;
+};
+
+struct ParticipantsSet {
+	base::flat_set<UserId> list;
+
+	friend inline bool operator==(
+		const ParticipantsSet &,
+		const ParticipantsSet &) = default;
+};
+
+struct Block {
+	QByteArray data;
+};
+
+enum class CallFailure {
+	Unknown,
+};
+
+using EncryptionBuffer = std::vector<uint8_t>;
+
+class EncryptDecrypt final
+	: public std::enable_shared_from_this<EncryptDecrypt> {
+public:
+	[[nodiscard]] auto callback()
+	-> Fn<EncryptionBuffer(const EncryptionBuffer&, int64_t, bool, int32_t)>;
+
+	void setCallId(CallId id);
+	void clearCallId(CallId fromId);
+
+private:
+	std::atomic<uint64> _id = 0;
+
+};
+
+class Call final {
+public:
+	explicit Call(UserId myUserId);
+	~Call();
+
+	[[nodiscard]] PublicKey myKey() const;
+
+	void joined();
+	void apply(
+		int subchain,
+		int indexAfterLast,
+		const std::vector<Block> &blocks,
+		bool fromShortPoll);
+
+	struct SubchainRequest {
+		int subchain = 0;
+		int height = 0;
+	};
+	[[nodiscard]] rpl::producer<SubchainRequest> subchainRequests() const;
+	void subchainBlocksRequestFinished(int subchain);
+
+	[[nodiscard]] rpl::producer<QByteArray> sendOutboundBlock() const;
+
+	[[nodiscard]] std::optional<CallFailure> failed() const;
+	[[nodiscard]] rpl::producer<CallFailure> failures() const;
+
+	[[nodiscard]] QByteArray emojiHash() const;
+	[[nodiscard]] rpl::producer<QByteArray> emojiHashValue() const;
+
+	[[nodiscard]] bool hasLastBlock0() const;
+	void refreshLastBlock0(std::optional<Block> block);
+	[[nodiscard]] Block makeJoinBlock();
+	[[nodiscard]] Block makeRemoveBlock(const base::flat_set<UserId> &ids);
+
+	[[nodiscard]] auto participantsSetValue() const
+		-> rpl::producer<ParticipantsSet>;
+
+	void registerEncryptDecrypt(std::shared_ptr<EncryptDecrypt> object);
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
+private:
+	static constexpr int kSubChainsCount = 2;
+
+	struct SubChainState {
+		base::Timer shortPollTimer;
+		base::Timer waitingTimer;
+		crl::time lastUpdate = 0;
+		base::flat_map<int, Block> waiting;
+		bool shortPolling = true;
+		int height = 0;
+	};
+
+	void setId(CallId id);
+	void apply(int subchain, const Block &last);
+	void fail(CallFailure reason);
+
+	void checkForOutboundMessages();
+	void checkWaitingBlocks(int subchain, bool waited = false);
+	void shortPoll(int subchain);
+
+	[[nodiscard]] std::int64_t libId() const;
+
+	CallId _id;
+	UserId _myUserId;
+	PrivateKeyId _myKeyId;
+	PublicKey _myKey;
+	std::optional<CallFailure> _failure;
+	rpl::event_stream<CallFailure> _failures;
+	std::shared_ptr<EncryptDecrypt> _encryptDecrypt;
+
+	SubChainState _subchains[kSubChainsCount];
+	rpl::event_stream<SubchainRequest> _subchainRequests;
+	rpl::event_stream<QByteArray> _outboundBlocks;
+
+	std::optional<Block> _lastBlock0;
+	int _lastBlock0Height = 0;
+
+	rpl::variable<ParticipantsSet> _participantsSet;
+	rpl::variable<QByteArray> _emojiHash;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace TdE2E
diff --git a/Telegram/SourceFiles/tde2e/tde2e_integration.cpp b/Telegram/SourceFiles/tde2e/tde2e_integration.cpp
new file mode 100644
index 00000000000000..3f63917d5fc76e
--- /dev/null
+++ b/Telegram/SourceFiles/tde2e/tde2e_integration.cpp
@@ -0,0 +1,27 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "tde2e/tde2e_integration.h"
+
+#include "data/data_user.h"
+#include "tde2e/tde2e_api.h"
+
+namespace TdE2E {
+
+UserId MakeUserId(not_null<UserData*> user) {
+	return MakeUserId(peerToUser(user->id));
+}
+
+UserId MakeUserId(::UserId id) {
+	return { .v = id.bare };
+}
+
+MTPint256 PublicKeyToMTP(const PublicKey &key) {
+	return MTP_int256(MTP_int128(key.a, key.b), MTP_int128(key.c, key.d));
+}
+
+} // namespace TdE2E
diff --git a/Telegram/SourceFiles/tde2e/tde2e_integration.h b/Telegram/SourceFiles/tde2e/tde2e_integration.h
new file mode 100644
index 00000000000000..4715743859f9a1
--- /dev/null
+++ b/Telegram/SourceFiles/tde2e/tde2e_integration.h
@@ -0,0 +1,20 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace TdE2E {
+
+struct UserId;
+struct PublicKey;
+
+[[nodiscard]] UserId MakeUserId(not_null<UserData*> user);
+[[nodiscard]] UserId MakeUserId(::UserId id);
+
+[[nodiscard]] MTPint256 PublicKeyToMTP(const PublicKey &key);
+
+} // namespace TdE2E
diff --git a/Telegram/SourceFiles/tests/test_main.cpp b/Telegram/SourceFiles/tests/test_main.cpp
index cd57022c4da992..77315ac0814626 100644
--- a/Telegram/SourceFiles/tests/test_main.cpp
+++ b/Telegram/SourceFiles/tests/test_main.cpp
@@ -19,19 +19,12 @@ For license and copyright information please follow this link:
 #include <QScreen>
 #include <QThread>
 #include <QDir>
+#include <QtCore/qmath.h>
 
 #include <qpa/qplatformscreen.h>
 
 namespace Test {
 
-bool App::notifyOrInvoke(QObject *receiver, QEvent *e) {
-	if (e->type() == base::InvokeQueuedEvent::Type()) {
-		static_cast<base::InvokeQueuedEvent*>(e)->invoke();
-		return true;
-	}
-	return QApplication::notify(receiver, e);
-}
-
 bool App::nativeEventFilter(
 		const QByteArray &eventType,
 		void *message,
@@ -108,7 +101,7 @@ void App::registerEnterFromEventLoop() {
 
 bool App::notify(QObject *receiver, QEvent *e) {
 	if (QThread::currentThreadId() != _mainThreadId) {
-		return notifyOrInvoke(receiver, e);
+		return QApplication::notify(receiver, e);
 	}
 
 	const auto wrap = createEventNestingLevel();
@@ -119,7 +112,7 @@ bool App::notify(QObject *receiver, QEvent *e) {
 			return true;
 		}
 	}
-	return notifyOrInvoke(receiver, e);
+	return QApplication::notify(receiver, e);
 }
 
 rpl::producer<> App::widgetUpdateRequests() const {
@@ -162,6 +155,14 @@ QString UiIntegration::angleBackendFilePath() {
 	return QDir().currentPath() + "/test/" + name() + "/angle";
 }
 
+void UiIntegration::touchCounterIncrement() {
+	++_touchCounter;
+}
+
+int UiIntegration::touchCounterNow() {
+	return _touchCounter;
+}
+
 } // namespace Test
 
 int main(int argc, char *argv[]) {
diff --git a/Telegram/SourceFiles/tests/test_main.h b/Telegram/SourceFiles/tests/test_main.h
index b0bbafb2f572cf..0652a460d926ec 100644
--- a/Telegram/SourceFiles/tests/test_main.h
+++ b/Telegram/SourceFiles/tests/test_main.h
@@ -67,7 +67,6 @@ class App final : public QApplication, public QAbstractNativeEventFilter {
 	void decrementEventNestingLevel();
 	void registerEnterFromEventLoop();
 
-	bool notifyOrInvoke(QObject *receiver, QEvent *e);
 	bool notify(QObject *receiver, QEvent *e) override;
 	bool nativeEventFilter(
 		const QByteArray &eventType,
@@ -105,6 +104,11 @@ class UiIntegration final : public Ui::Integration {
 	QString emojiCacheFolder();
 	QString openglCheckFilePath();
 	QString angleBackendFilePath();
+	void touchCounterIncrement();
+	int touchCounterNow();
+
+private:
+	int _touchCounter = 0;
 };
 
 } // namespace Test
diff --git a/Telegram/SourceFiles/tests/test_text.cpp b/Telegram/SourceFiles/tests/test_text.cpp
index 688041cf5e1513..68bb4aac248c4b 100644
--- a/Telegram/SourceFiles/tests/test_text.cpp
+++ b/Telegram/SourceFiles/tests/test_text.cpp
@@ -10,103 +10,797 @@ For license and copyright information please follow this link:
 #include "base/invoke_queued.h"
 #include "base/integration.h"
 #include "ui/effects/animations.h"
+#include "ui/ui_utility.h"
+#include "ui/style/style_core.h"
 #include "ui/text/text.h"
+#include "ui/text/text_custom_emoji.h"
 #include "ui/text/text_utilities.h"
+#include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/rp_window.h"
 #include "ui/painter.h"
+#include "styles/style_widgets.h"
 
 #include <QApplication>
 #include <QAbstractNativeEventFilter>
 #include <QThread>
 #include <QDir>
+#include <QImage>
+
+#include <algorithm>
+#include <memory>
+#include <span>
+#include <utility>
 
 namespace Test {
 
+namespace {
+
+[[nodiscard]] bool HasEntityType(
+		const EntitiesInText &entities,
+		EntityType type) {
+	for (const auto &entity : entities) {
+		if (entity.type() == type) {
+			return true;
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] QImage MakeObjectImage(
+		QSize size,
+		QColor background,
+		const QString &label) {
+	auto image = QImage(size, QImage::Format_ARGB32_Premultiplied);
+	image.fill(Qt::transparent);
+	auto painter = QPainter(&image);
+	auto hq = PainterHighQualityEnabler(painter);
+	painter.setPen(Qt::NoPen);
+	painter.setBrush(background);
+	painter.drawRoundedRect(
+		QRect(QPoint(), size),
+		scale(6),
+		scale(6));
+	painter.setPen(Qt::black);
+	painter.drawText(QRect(QPoint(), size), Qt::AlignCenter, label);
+	return image;
+}
+
+[[nodiscard]] int RenderTextPadding() {
+	return scale(6);
+}
+
+[[nodiscard]] QImage RenderTextOffscreen(
+		const Ui::Text::String &text,
+		int availableWidth,
+		std::optional<TextSelection> selection = std::nullopt,
+		std::span<Ui::Text::SpecialColor> colors = {},
+		std::optional<QPen> pen = std::nullopt) {
+	const auto padding = RenderTextPadding();
+	const auto image = QImage(
+		QSize(
+			std::max(text.maxWidth(), availableWidth) + (2 * padding),
+			std::max(text.countHeight(availableWidth), text.minHeight())
+				+ (2 * padding)),
+		QImage::Format_ARGB32_Premultiplied);
+	auto result = image;
+	result.fill(Qt::transparent);
+	auto painter = QPainter(&result);
+	if (pen) {
+		painter.setPen(*pen);
+	}
+	text.draw(painter, {
+		.position = QPoint(padding, padding),
+		.availableWidth = availableWidth,
+		.colors = colors,
+		.selection = selection.value_or(TextSelection()),
+	});
+	return result;
+}
+
+[[nodiscard]] std::optional<QRect> ChangedBoundsInRect(
+		const QImage &first,
+		const QImage &second,
+		QRect rect) {
+	if (first.size() != second.size()) {
+		return std::nullopt;
+	}
+	rect = rect.intersected(QRect(QPoint(), first.size()));
+	if (rect.isEmpty()) {
+		return std::nullopt;
+	}
+	auto left = rect.right();
+	auto top = rect.bottom();
+	auto right = rect.left() - 1;
+	auto bottom = rect.top() - 1;
+	for (auto y = rect.top(); y <= rect.bottom(); ++y) {
+		for (auto x = rect.left(); x <= rect.right(); ++x) {
+			if (first.pixel(x, y) == second.pixel(x, y)) {
+				continue;
+			}
+			left = std::min(left, x);
+			top = std::min(top, y);
+			right = std::max(right, x);
+			bottom = std::max(bottom, y);
+		}
+	}
+	return (right >= left) && (bottom >= top)
+		? std::make_optional(QRect(QPoint(left, top), QPoint(right, bottom)))
+		: std::nullopt;
+}
+
+[[nodiscard]] std::optional<QRect> SymbolHitBounds(
+		const Ui::Text::String &text,
+		int availableWidth,
+		int offset) {
+	if ((availableWidth <= 0) || (offset < 0)) {
+		return std::nullopt;
+	}
+	const auto padding = RenderTextPadding();
+	const auto height = std::max(
+		text.countHeight(availableWidth),
+		text.minHeight());
+	auto flags = Ui::Text::StateRequest::Flags();
+	flags |= Ui::Text::StateRequest::Flag::LookupSymbol;
+	auto request = Ui::Text::StateRequest();
+	request.flags = flags;
+	auto left = padding + availableWidth;
+	auto top = padding + height;
+	auto right = -1;
+	auto bottom = -1;
+	for (auto y = 0; y != height; ++y) {
+		for (auto x = 0; x != availableWidth; ++x) {
+			const auto hit = text.getState(QPoint(x, y), availableWidth, request);
+			if (!hit.uponSymbol || (int(hit.symbol) != offset)) {
+				continue;
+			}
+			left = std::min(left, x + padding);
+			top = std::min(top, y + padding);
+			right = std::max(right, x + padding);
+			bottom = std::max(bottom, y + padding);
+		}
+	}
+	return (right >= left) && (bottom >= top)
+		? std::make_optional(QRect(QPoint(left, top), QPoint(right, bottom)))
+		: std::nullopt;
+}
+
+[[nodiscard]] std::optional<QRect> SymbolRangeHitBounds(
+		const Ui::Text::String &text,
+		int availableWidth,
+		int offset,
+		int length) {
+	if ((availableWidth <= 0) || (offset < 0) || (length <= 0)) {
+		return std::nullopt;
+	}
+	const auto padding = RenderTextPadding();
+	const auto height = std::max(
+		text.countHeight(availableWidth),
+		text.minHeight());
+	auto flags = Ui::Text::StateRequest::Flags();
+	flags |= Ui::Text::StateRequest::Flag::LookupSymbol;
+	auto request = Ui::Text::StateRequest();
+	request.flags = flags;
+	auto left = padding + availableWidth;
+	auto top = padding + height;
+	auto right = -1;
+	auto bottom = -1;
+	const auto end = offset + length;
+	for (auto y = 0; y != height; ++y) {
+		for (auto x = 0; x != availableWidth; ++x) {
+			const auto hit = text.getState(QPoint(x, y), availableWidth, request);
+			if (!hit.uponSymbol) {
+				continue;
+			}
+			const auto symbol = int(hit.symbol);
+			if ((symbol < offset) || (symbol >= end)) {
+				continue;
+			}
+			left = std::min(left, x + padding);
+			top = std::min(top, y + padding);
+			right = std::max(right, x + padding);
+			bottom = std::max(bottom, y + padding);
+		}
+	}
+	return (right >= left) && (bottom >= top)
+		? std::make_optional(QRect(QPoint(left, top), QPoint(right, bottom)))
+		: std::nullopt;
+}
+
+[[nodiscard]] bool ImagesEqualInRect(
+		const QImage &first,
+		const QImage &second,
+		QRect rect) {
+	return !ChangedBoundsInRect(first, second, rect).has_value();
+}
+
+[[nodiscard]] bool HasPixelColorInRect(
+		const QImage &image,
+		QRect rect,
+		QRgb color) {
+	rect = rect.intersected(QRect(QPoint(), image.size()));
+	if (rect.isEmpty()) {
+		return false;
+	}
+	for (auto y = rect.top(); y <= rect.bottom(); ++y) {
+		for (auto x = rect.left(); x <= rect.right(); ++x) {
+			if (image.pixel(x, y) == color) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] bool HasPaintedPixels(const QImage &image) {
+	const auto bits = image.constBits();
+	if (!bits) {
+		return false;
+	}
+	const auto count = image.sizeInBytes();
+	for (auto i = qsizetype(0); i != count; ++i) {
+		if (bits[i] != 0) {
+			return true;
+		}
+	}
+	return false;
+}
+
+[[nodiscard]] std::optional<QPoint> FirstPaintedPoint(
+		const QImage &image,
+		QRect rect = QRect()) {
+	if (rect.isNull()) {
+		rect = QRect(QPoint(), image.size());
+	}
+	rect = rect.intersected(QRect(QPoint(), image.size()));
+	if (rect.isEmpty()) {
+		return std::nullopt;
+	}
+	const auto background = image.pixel(rect.topLeft());
+	for (auto y = rect.top(); y <= rect.bottom(); ++y) {
+		for (auto x = rect.left(); x <= rect.right(); ++x) {
+			if (image.pixel(x, y) != background) {
+				return QPoint(x, y);
+			}
+		}
+	}
+	return std::nullopt;
+}
+
+[[nodiscard]] QRect ScaleRect(QRect rect, qreal ratio) {
+	return QRect(
+		QPoint(
+			qRound(rect.x() * ratio),
+			qRound(rect.y() * ratio)),
+		QSize(
+			qRound(rect.width() * ratio),
+			qRound(rect.height() * ratio)));
+}
+
+class FormulaLikeObject final : public Ui::Text::CustomEmoji {
+public:
+	FormulaLikeObject(QString entityData, QString replacementText, QImage image);
+
+	int width() override;
+	QString entityData() override;
+	std::optional<Ui::Text::CustomEmojiVerticalMetrics> vertical(
+		const style::TextStyle &) override;
+	QString replacementText() override;
+	Ui::Text::CustomEmojiSemantics semantics() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	QString _entityData;
+	QString _replacementText;
+	QImage _image;
+
+};
+
+FormulaLikeObject::FormulaLikeObject(
+	QString entityData,
+	QString replacementText,
+	QImage image)
+: _entityData(std::move(entityData))
+, _replacementText(std::move(replacementText))
+, _image(std::move(image)) {
+}
+
+int FormulaLikeObject::width() {
+	return _image.width();
+}
+
+QString FormulaLikeObject::entityData() {
+	return _entityData;
+}
+
+std::optional<Ui::Text::CustomEmojiVerticalMetrics>
+FormulaLikeObject::vertical(const style::TextStyle &) {
+	const auto height = _image.height();
+	const auto descent = std::max(height / 5, 1);
+	return Ui::Text::CustomEmojiVerticalMetrics{
+		.ascent = height - descent,
+		.descent = descent,
+	};
+}
+
+QString FormulaLikeObject::replacementText() {
+	return _replacementText;
+}
+
+Ui::Text::CustomEmojiSemantics FormulaLikeObject::semantics() {
+	return {
+		.isEmoji = false,
+		.isRealCustomEmoji = false,
+		.exportEntity = false,
+		.unloadPersistentAnimation = false,
+		.allowCustomEmojiClick = false,
+	};
+}
+
+void FormulaLikeObject::paint(QPainter &p, const Context &context) {
+	p.drawImage(context.position, _image);
+}
+
+void FormulaLikeObject::unload() {
+}
+
+bool FormulaLikeObject::ready() {
+	return true;
+}
+
+bool FormulaLikeObject::readyInDefaultState() {
+	return true;
+}
+
+} // namespace
+
 QString name() {
 	return u"text"_q;
 }
 
 void test(not_null<Ui::RpWindow*> window, not_null<Ui::RpWidget*> body) {
-	auto text = new Ui::Text::String(scale(64));
-
-	const auto like = QString::fromUtf8("\xf0\x9f\x91\x8d");
-	const auto dislike = QString::fromUtf8("\xf0\x9f\x91\x8e");
-	const auto hebrew = QString() + QChar(1506) + QChar(1460) + QChar(1489);
-
-	auto data = TextWithEntities();
-	data.append(
-		u"Lorem ipsu7m dolor sit amet, "_q
-	).append(Ui::Text::Bold(
-		u"consectetur adipiscing: "_q
-		+ hebrew
-		+ u" elit, sed do eiusmod tempor incididunt test"_q
-	)).append(Ui::Text::Wrapped(Ui::Text::Bold(
-		u". ut labore et dolore magna aliqua."_q
-		+ like
-		+ dislike
-		+ u"Ut enim ad minim veniam"_q
-	), EntityType::Italic)).append(
-		u", quis nostrud exercitation ullamco laboris nisi ut aliquip ex \
-ea commodo consequat. Duis aute irure dolor in reprehenderit in \
-voluptate velit esse cillum dolore eu fugiat nulla pariatur. \
-Excepteur sint occaecat cupidatat non proident, sunt in culpa \
-qui officia deserunt mollit anim id est laborum."_q
-).append(u"\n\n"_q).append(hebrew).append("\n\n").append(
-		"Duisauteiruredolorinreprehenderitinvoluptatevelitessecillumdoloreeu\
-fugiatnullapariaturExcepteursintoccaecatcupidatatnonproident, sunt in culpa \
-qui officia deserunt mollit anim id est laborum. \
-Duisauteiruredolorinreprehenderitinvoluptate.");
-	data.append(data);
-	//data.append("hi\n\nguys");
-	text->setMarkedText(st::defaultTextStyle, data);
-
-	body->paintRequest() | rpl::start_with_next([=](QRect clip) {
-		auto p = QPainter(body);
-		auto hq = PainterHighQualityEnabler(p);
+	(void)window;
 
-		const auto width = body->width();
-		const auto height = body->height();
+	const auto formulaEntityData = u"test-formula-like-object"_q;
+	const auto formulaReplacementText = u"$\\frac{a}{b}$"_q;
+	const auto controlEntityData = u"test-custom-emoji"_q;
+	const auto formulaImage = MakeObjectImage(
+		QSize(scale(64), scale(28)),
+		QColor(32, 96, 192, 48),
+		u"a / b"_q);
+	const auto controlImage = MakeObjectImage(
+		QSize(scale(24), scale(24)),
+		QColor(224, 176, 32, 160),
+		u"*"_q);
 
-		p.fillRect(clip, QColor(255, 255, 255));
+	auto context = Ui::Text::MarkedContext();
+	context.customEmojiFactory = [
+		formulaEntityData,
+		formulaReplacementText,
+		formulaImage,
+		controlImage
+	](QStringView data, const Ui::Text::MarkedContext &)
+	-> std::unique_ptr<Ui::Text::CustomEmoji> {
+		if (data == formulaEntityData) {
+			return std::make_unique<FormulaLikeObject>(
+				data.toString(),
+				formulaReplacementText,
+				formulaImage);
+		}
+		if (data == u"test-custom-emoji"_q) {
+			return std::make_unique<Ui::Text::PaletteDependentCustomEmoji>(
+				[controlImage] {
+					return controlImage;
+				},
+				data.toString());
+		}
+		return std::unique_ptr<Ui::Text::CustomEmoji>();
+	};
+
+	auto formulaData = TextWithEntities();
+	formulaData.append(u"Alpha "_q);
+	const auto formulaPosition = formulaData.text.size();
+	formulaData.append(QChar::ObjectReplacementCharacter);
+	formulaData.entities.push_back(EntityInText(
+		EntityType::CustomEmoji,
+		formulaPosition,
+		1,
+		formulaEntityData));
+	formulaData.append(u" omega"_q);
+
+	const auto formulaText = new Ui::Text::String(scale(64));
+	formulaText->setMarkedText(
+		st::defaultTextStyle,
+		formulaData,
+		kMarkupTextOptions,
+		context);
 
-		const auto border = QColor(0, 128, 0, 16);
-		auto skip = scale(20);
-		p.fillRect(0, 0, skip, height, border);
-		p.fillRect(skip, 0, width - skip, skip, border);
-		p.fillRect(skip, height - skip, width - skip, skip, border);
-		p.fillRect(width - skip, skip, skip, height - skip * 2, border);
-
-		const auto inner = body->rect().marginsRemoved(
-			{ skip, skip, skip, skip });
-
-		p.fillRect(QRect{
-			inner.x(),
-			inner.y(),
-			inner.width(),
-			text->countHeight(inner.width())
-		}, QColor(128, 0, 0, 16));
-
-		auto widths = text->countLineWidths(inner.width());
-		auto top = 0;
-		for (const auto width : widths) {
-			p.fillRect(QRect{
-				inner.x(),
-				inner.y() + top,
-				width,
-				st::defaultTextStyle.font->height
-			}, QColor(0, 0, 128, 16));
-			top += st::defaultTextStyle.font->height;
+	const auto formulaCollapsedText = Ui::Text::String(
+		st::defaultTextStyle,
+		u"Alpha   omega"_q,
+		kMarkupTextOptions,
+		scale(64));
+	const auto objectPlaceholderWidth = st::defaultTextStyle.font->width(u" "_q);
+	Expects(
+		formulaText->maxWidth()
+			>= formulaCollapsedText.maxWidth()
+				- objectPlaceholderWidth
+				+ formulaImage.width());
+
+	const auto expectedFormulaExport = u"Alpha $\\frac{a}{b}$ omega"_q;
+	Expects(formulaText->toString() == expectedFormulaExport);
+	const auto formulaMime = formulaText->toTextForMimeData();
+	Expects(formulaMime.expanded == expectedFormulaExport);
+	Expects(formulaMime.rich.text == expectedFormulaExport);
+	Expects(!HasEntityType(formulaMime.rich.entities, EntityType::CustomEmoji));
+	const auto formulaRich = formulaText->toTextWithEntities();
+	Expects(formulaRich.text == expectedFormulaExport);
+	Expects(!HasEntityType(formulaRich.entities, EntityType::CustomEmoji));
+	Expects(
+		formulaText->adjustSelection(
+			TextSelection(uint16(formulaPosition), uint16(formulaPosition)),
+			TextSelectType::Words)
+		== TextSelection(
+			uint16(formulaPosition),
+			uint16(formulaPosition + 1)));
+	Expects(
+		formulaText->adjustSelection(
+			TextSelection(uint16(formulaPosition), uint16(formulaPosition + 1)),
+			TextSelectType::Paragraphs)
+		== TextSelection(
+			uint16(formulaPosition),
+			uint16(formulaPosition + 1)));
+	Expects(!formulaText->hasCustomEmoji());
+	Expects(!formulaText->isOnlyCustomEmoji());
+	Expects(!formulaText->isIsolatedEmoji());
+
+	auto controlData = TextWithEntities();
+	controlData.append(QChar::ObjectReplacementCharacter);
+	controlData.entities.push_back(EntityInText(
+		EntityType::CustomEmoji,
+		0,
+		1,
+		controlEntityData));
+
+	const auto controlText = new Ui::Text::String(scale(64));
+	controlText->setMarkedText(
+		st::defaultTextStyle,
+		controlData,
+		kMarkupTextOptions,
+		context);
+	Expects(controlText->hasCustomEmoji());
+	Expects(controlText->isOnlyCustomEmoji());
+	Expects(controlText->isIsolatedEmoji());
+	Expects(
+		HasEntityType(
+			controlText->toTextWithEntities().entities,
+			EntityType::CustomEmoji));
+	const auto controlProbeText = u"a / b"_q;
+	const auto controlLineSource = u"Alpha a / b omega"_q;
+	const auto controlProbePosition = controlLineSource.indexOf(controlProbeText);
+	Expects(controlProbePosition >= 0);
+	const auto controlLineText = Ui::Text::String(
+		st::defaultTextStyle,
+		controlLineSource,
+		kMarkupTextOptions,
+		scale(64));
+	const auto selectionWidth = std::max(
+		formulaText->maxWidth(),
+		controlLineText.maxWidth());
+	const auto formulaLinesGeometry = formulaText->countLinesGeometry(
+		selectionWidth);
+	const auto controlLinesGeometry = controlLineText.countLinesGeometry(
+		selectionWidth);
+	Expects(formulaLinesGeometry.size() == 1);
+	Expects(controlLinesGeometry.size() == 1);
+	if ((formulaLinesGeometry.size() == 1)
+		&& (controlLinesGeometry.size() == 1)) {
+		const auto &formulaLine = formulaLinesGeometry.front();
+		const auto &controlLine = controlLinesGeometry.front();
+		Expects(formulaLine.baseline > controlLine.baseline);
+		Expects(formulaLine.baseline < formulaLine.bottom);
+		Expects(controlLine.baseline < controlLine.bottom);
+	}
+	{
+		auto fieldStyle = st::defaultMultiSelectSearchField;
+		fieldStyle.textMargins = QMargins(0, 0, 0, 0);
+		fieldStyle.placeholderMargins = QMargins(0, 0, 0, 0);
+		const auto placeholderText = u"bot query"_q;
+		const auto longPlaceholderText = u"bot query placeholder placeholder placeholder placeholder placeholder"_q;
+		const auto inlineBotPrefix = u"@bot "_q;
+		const auto field = std::make_unique<Ui::InputField>(
+			body,
+			fieldStyle,
+			Ui::InputField::Mode::MultiLine,
+			rpl::single(placeholderText),
+			QString());
+		field->resize(scale(320), fieldStyle.heightMin);
+		field->show();
+		field->setDocumentMargin(4.);
+		field->setAdditionalMargin(style::ConvertScale(4) - 4);
+		field->finishAnimating();
+		field->setPlaceholderHidden(true);
+		field->finishAnimating();
+		const auto emptyFieldImage = Ui::GrabWidgetToImage(field.get());
+		field->setPlaceholderHidden(false);
+		field->finishAnimating();
+		const auto placeholderImage = Ui::GrabWidgetToImage(field.get());
+		const auto placeholderPoint = FirstPaintedPoint(placeholderImage);
+		const auto placeholderBounds = ChangedBoundsInRect(
+			emptyFieldImage,
+			placeholderImage,
+			QRect(QPoint(), placeholderImage.size()));
+		Expects(placeholderPoint.has_value());
+		Expects(placeholderBounds.has_value());
+		field->setText(placeholderText);
+		field->finishAnimating();
+		const auto liveTextImage = Ui::GrabWidgetToImage(field.get());
+		const auto liveTextPoint = FirstPaintedPoint(liveTextImage);
+		const auto liveTextBounds = ChangedBoundsInRect(
+			emptyFieldImage,
+			liveTextImage,
+			QRect(QPoint(), liveTextImage.size()));
+		Expects(liveTextPoint.has_value());
+		Expects(liveTextBounds.has_value());
+		if (placeholderPoint && liveTextPoint) {
+			Expects(placeholderPoint->y() == liveTextPoint->y());
+			Expects(placeholderPoint->x() == liveTextPoint->x());
+		}
+		const auto expectedTextRect = ScaleRect(
+			field->rect().marginsRemoved(field->fullTextMargins()),
+			placeholderImage.devicePixelRatio());
+		field->clear();
+		field->setPlaceholder(rpl::single(longPlaceholderText));
+		field->finishAnimating();
+		const auto longPlaceholderImage = Ui::GrabWidgetToImage(field.get());
+		const auto longPlaceholderBounds = ChangedBoundsInRect(
+			emptyFieldImage,
+			longPlaceholderImage,
+			QRect(QPoint(), longPlaceholderImage.size()));
+		Expects(longPlaceholderBounds.has_value());
+		if (longPlaceholderBounds) {
+			Expects(expectedTextRect.contains(*longPlaceholderBounds));
+		}
+		field->clear();
+		field->setPlaceholder(
+			rpl::single(placeholderText),
+			inlineBotPrefix.size());
+		field->setText(inlineBotPrefix);
+		field->finishAnimating();
+		const auto inlinePlaceholderImage = Ui::GrabWidgetToImage(field.get());
+		const auto inlineSkipWidth = qRound(
+			fieldStyle.style.font->width(inlineBotPrefix)
+				* inlinePlaceholderImage.devicePixelRatio());
+		const auto inlineScanLeft = placeholderPoint
+			? std::min(
+				placeholderPoint->x() + inlineSkipWidth,
+				inlinePlaceholderImage.width() - 1)
+			: 0;
+		const auto inlinePlaceholderPoint = FirstPaintedPoint(
+			inlinePlaceholderImage,
+			QRect(
+				inlineScanLeft,
+				0,
+				inlinePlaceholderImage.width() - inlineScanLeft,
+				inlinePlaceholderImage.height()));
+		Expects(inlinePlaceholderPoint.has_value());
+		if (placeholderPoint && inlinePlaceholderPoint) {
+			Expects(placeholderPoint->y() == inlinePlaceholderPoint->y());
 		}
+	}
+	const auto formulaSelection = TextSelection(
+		0,
+		uint16(formulaData.text.size()));
+	const auto formulaUnselected = RenderTextOffscreen(
+		*formulaText,
+		selectionWidth);
+	const auto formulaSelected = RenderTextOffscreen(
+		*formulaText,
+		selectionWidth,
+		formulaSelection);
+	const auto formulaHitBounds = SymbolHitBounds(
+		*formulaText,
+		selectionWidth,
+		formulaPosition);
+	Expects(formulaHitBounds.has_value());
+	const auto controlSelection = TextSelection(
+		0,
+		uint16(controlLineSource.size()));
+	const auto controlUnselected = RenderTextOffscreen(
+		controlLineText,
+		selectionWidth);
+	const auto controlSelected = RenderTextOffscreen(
+		controlLineText,
+		selectionWidth,
+		controlSelection);
+	const auto controlHitBounds = SymbolRangeHitBounds(
+		controlLineText,
+		selectionWidth,
+		controlProbePosition,
+		controlProbeText.size());
+	Expects(controlHitBounds.has_value());
+	if (formulaHitBounds && controlHitBounds) {
+		const auto formulaChangedBounds = ChangedBoundsInRect(
+			formulaUnselected,
+			formulaSelected,
+			QRect(
+				formulaHitBounds->x(),
+				0,
+				formulaHitBounds->width(),
+				formulaSelected.height()));
+		const auto controlChangedBounds = ChangedBoundsInRect(
+			controlUnselected,
+			controlSelected,
+			QRect(
+				controlHitBounds->x(),
+				0,
+				controlHitBounds->width(),
+				controlSelected.height()));
+		Expects(formulaChangedBounds.has_value());
+		Expects(controlChangedBounds.has_value());
+		if (formulaChangedBounds && controlChangedBounds) {
+			Expects(
+				formulaChangedBounds->top()
+					<= controlChangedBounds->top());
+			Expects(
+				formulaChangedBounds->bottom()
+					>= controlChangedBounds->bottom());
+			Expects(
+				(formulaChangedBounds->top()
+					< controlChangedBounds->top())
+				|| (formulaChangedBounds->bottom()
+					> controlChangedBounds->bottom()));
+		}
+	}
 
-		text->draw(p, {
-			.position = inner.topLeft(),
-			.availableWidth = inner.width(),
-		});
+	auto leadingFormulaData = TextWithEntities();
+	leadingFormulaData.append(QChar::ObjectReplacementCharacter);
+	leadingFormulaData.entities.push_back(EntityInText(
+		EntityType::CustomEmoji,
+		0,
+		1,
+		formulaEntityData));
+	const auto leadingFormulaText = Ui::Text::String(
+		st::defaultTextStyle,
+		leadingFormulaData,
+		kMarkupTextOptions,
+		scale(32),
+		context);
+	const auto leadingFormulaRender = RenderTextOffscreen(
+		leadingFormulaText,
+		std::max(formulaImage.width() / 2, 1));
+	Expects(HasPaintedPixels(leadingFormulaRender));
+
+	auto skipOnlyText = Ui::Text::String(
+		st::defaultTextStyle,
+		u""_q,
+		kDefaultTextOptions,
+		scale(32));
+	const auto skipBlockWidth = scale(36);
+	const auto skipBlockHeight = scale(7);
+	Expects(skipOnlyText.updateSkipBlock(skipBlockWidth, skipBlockHeight));
+	Expects(skipOnlyText.countHeight(skipBlockWidth * 2) == skipBlockHeight);
+	Expects(
+		skipOnlyText.countDimensions(Ui::Text::SimpleGeometry(
+			skipBlockWidth * 2,
+			0,
+			0,
+			false)).height == skipBlockHeight);
+
+	const auto colorizedText = u"Colorized link span"_q;
+	const auto colorizedWidth = scale(280);
+	const auto plainColorizedText = Ui::Text::String(
+		st::defaultTextStyle,
+		colorizedText,
+		kMarkupTextOptions,
+		scale(96));
+	const auto emptyColorizedText = Ui::Text::String(
+		st::defaultTextStyle,
+		Ui::Text::Colorized(colorizedText),
+		kMarkupTextOptions,
+		scale(96));
+	const auto emptyColorizedRender = RenderTextOffscreen(
+		emptyColorizedText,
+		colorizedWidth);
+	const auto colorizedBoundsRect = QRect(
+		QPoint(),
+		emptyColorizedRender.size());
+	const auto linkPenRender = RenderTextOffscreen(
+		plainColorizedText,
+		colorizedWidth,
+		std::nullopt,
+		{},
+		st::defaultTextPalette.linkFg->p);
+	const auto plainColorizedRender = RenderTextOffscreen(
+		plainColorizedText,
+		colorizedWidth);
+	Expects(ImagesEqualInRect(
+		emptyColorizedRender,
+		linkPenRender,
+		colorizedBoundsRect));
+	Expects(!ImagesEqualInRect(
+		emptyColorizedRender,
+		plainColorizedRender,
+		colorizedBoundsRect));
+
+	const auto &specialFg = st::defaultTextPalette.linkFg;
+	const auto &specialBg = st::defaultTextPalette.markBg;
+	auto specialColors = std::vector<Ui::Text::SpecialColor>{
+		Ui::Text::SpecialColor{
+			&specialFg->p,
+			&specialFg->p,
+			&specialBg->b,
+			&specialBg->b },
+	};
+	const auto explicitColorizedNoBgText = Ui::Text::String(
+		st::defaultTextStyle,
+		Ui::Text::Colorized(colorizedText, 1, 0),
+		kMarkupTextOptions,
+		scale(96));
+	const auto explicitColorizedBgText = Ui::Text::String(
+		st::defaultTextStyle,
+		Ui::Text::Colorized(colorizedText, 1, 1),
+		kMarkupTextOptions,
+		scale(96));
+	const auto explicitColorizedNoBgRender = RenderTextOffscreen(
+		explicitColorizedNoBgText,
+		colorizedWidth,
+		std::nullopt,
+		specialColors);
+	const auto explicitColorizedBgRender = RenderTextOffscreen(
+		explicitColorizedBgText,
+		colorizedWidth,
+		std::nullopt,
+		specialColors);
+	const auto specialPenRender = RenderTextOffscreen(
+		plainColorizedText,
+		colorizedWidth,
+		std::nullopt,
+		{},
+		specialFg->p);
+	const auto colorizedSymbolBounds = SymbolRangeHitBounds(
+		explicitColorizedBgText,
+		colorizedWidth,
+		0,
+		colorizedText.size());
+	Expects(ImagesEqualInRect(
+		explicitColorizedNoBgRender,
+		specialPenRender,
+		colorizedBoundsRect));
+	Expects(colorizedSymbolBounds.has_value());
+	if (colorizedSymbolBounds) {
+		Expects(!ImagesEqualInRect(
+			explicitColorizedBgRender,
+			explicitColorizedNoBgRender,
+			*colorizedSymbolBounds));
+		Expects(HasPixelColorInRect(
+			explicitColorizedBgRender,
+			*colorizedSymbolBounds,
+			specialBg->c.rgba()));
+		Expects(!HasPixelColorInRect(
+			explicitColorizedNoBgRender,
+			*colorizedSymbolBounds,
+			specialBg->c.rgba()));
+	}
 
-		//const auto to = QRectF(
-		//	inner.marginsRemoved({ 0, inner.height() / 2, 0, 0 }));
-		//const auto t = u"hi\n\nguys"_q;
-		//p.drawText(to, t);
+	body->paintRequest() | rpl::on_next([=](QRect clip) {
+		auto p = QPainter(body);
+		p.fillRect(clip, QColor(255, 255, 255));
+		const auto left = scale(24);
+		const auto top = scale(24);
+		const auto width = body->width() - (2 * left);
+		formulaText->draw(p, {
+			.position = QPoint(left, top),
+			.availableWidth = width,
+		});
+		controlText->draw(p, {
+			.position = QPoint(
+				left,
+				top + formulaText->countHeight(width) + scale(20)),
+			.availableWidth = width,
+		});
 	}, body->lifetime());
 }
 
diff --git a/Telegram/SourceFiles/tray.cpp b/Telegram/SourceFiles/tray.cpp
index 235bf0601d01b7..f6a62148000130 100644
--- a/Telegram/SourceFiles/tray.cpp
+++ b/Telegram/SourceFiles/tray.cpp
@@ -6,6 +6,7 @@ For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "tray.h"
+#include "tray_accounts_menu.h"
 
 #include "core/application.h"
 #include "core/core_settings.h"
@@ -29,7 +30,7 @@ void Tray::create() {
 
 	Core::App().settings().workModeValue(
 	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](WorkMode previous, WorkMode state) {
+	) | rpl::on_next([=](WorkMode previous, WorkMode state) {
 		const auto wasHasIcon = (previous != WorkMode::WindowOnly);
 		const auto nowHasIcon = (state != WorkMode::WindowOnly);
 		if (wasHasIcon != nowHasIcon) {
@@ -42,17 +43,21 @@ void Tray::create() {
 	}, _tray.lifetime());
 
 	Core::App().settings().trayIconMonochromeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateIconCounters();
 	}, _tray.lifetime());
 
 	Core::App().passcodeLockChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuildMenu();
 	}, _tray.lifetime());
 
+	TrayAccountsMenu::SetupChangesSubscription(
+		[=] { rebuildMenu(); },
+		_tray.lifetime());
+
 	_tray.iconClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto skipTrayClick = (_lastTrayClickTime > 0)
 			&& (crl::now() - _lastTrayClickTime
 				< QApplication::doubleClickInterval());
@@ -97,6 +102,8 @@ void Tray::rebuildMenu() {
 
 	_tray.addAction(tr::lng_quit_from_tray(), [] { Core::Quit(); });
 
+	TrayAccountsMenu::Fill(_tray);
+
 	updateMenuText();
 }
 
diff --git a/Telegram/SourceFiles/tray_accounts_menu.cpp b/Telegram/SourceFiles/tray_accounts_menu.cpp
new file mode 100644
index 00000000000000..f247df09c7164e
--- /dev/null
+++ b/Telegram/SourceFiles/tray_accounts_menu.cpp
@@ -0,0 +1,84 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "tray_accounts_menu.h"
+
+#include "base/weak_ptr.h"
+#include "base/qt/qt_key_modifiers.h"
+#include "core/application.h"
+#include "data/data_peer.h"
+#include "data/data_user.h"
+#include "info/profile/info_profile_values.h"
+#include "main/main_account.h"
+#include "main/main_domain.h"
+#include "main/main_session.h"
+#include "styles/style_window.h"
+#include "ui/dynamic_thumbnails.h"
+
+namespace Core::TrayAccountsMenu {
+
+void SetupChangesSubscription(Fn<void()> callback, rpl::lifetime &lifetime) {
+	const auto accountSessionsLifetime = lifetime.make_state<rpl::lifetime>();
+	const auto watchAccountSessions = [=] {
+		accountSessionsLifetime->destroy();
+		for (const auto &[index, account] : Core::App().domain().accounts()) {
+			account->sessionChanges(
+			) | rpl::on_next([=](Main::Session*) {
+				callback();
+			}, *accountSessionsLifetime);
+		}
+	};
+	Core::App().domain().accountsChanges() | rpl::on_next([=] {
+		watchAccountSessions();
+		callback();
+	}, lifetime);
+	watchAccountSessions();
+}
+
+void Fill(Platform::Tray &tray) {
+	if (Core::App().passcodeLocked()) {
+		return;
+	}
+	auto accounts = std::vector<not_null<Main::Account*>>();
+	for (const auto &account : Core::App().domain().orderedAccounts()) {
+		if (account->sessionExists()) {
+			accounts.push_back(account);
+		}
+	}
+	if (accounts.size() <= 1) {
+		return;
+	}
+	tray.addSeparator();
+	constexpr auto kMaxLength = 30;
+	for (const auto account : accounts) {
+		const auto user = account->session().user();
+		const auto weak = base::make_weak(account);
+		tray.addAction(
+			Info::Profile::NameValue(
+				user
+			) | rpl::map([=](const QString &name) {
+				return (name.size() > kMaxLength)
+					? (name.mid(0, kMaxLength) + Ui::kQEllipsis)
+					: name;
+			}),
+			[weak] {
+				const auto strong = weak.get();
+				if (!strong || !strong->sessionExists()) {
+					return;
+				}
+				if (base::IsCtrlPressed()) {
+					Core::App().ensureSeparateWindowFor({ strong });
+				} else {
+					Core::App().domain().maybeActivate(strong);
+				}
+			},
+			Ui::MakeUserpicThumbnail(user, true),
+			st::notifyMacPhotoSize);
+	}
+}
+
+} // namespace Core::TrayAccountsMenu
diff --git a/Telegram/SourceFiles/tray_accounts_menu.h b/Telegram/SourceFiles/tray_accounts_menu.h
new file mode 100644
index 00000000000000..2d24931dfb2390
--- /dev/null
+++ b/Telegram/SourceFiles/tray_accounts_menu.h
@@ -0,0 +1,19 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "platform/platform_tray.h"
+
+namespace Core::TrayAccountsMenu {
+
+void SetupChangesSubscription(
+	Fn<void()> callback,
+	rpl::lifetime &lifetime);
+void Fill(Platform::Tray &tray);
+
+} // namespace Core::TrayAccountsMenu
diff --git a/Telegram/SourceFiles/tray_accounts_menu_dummy.cpp b/Telegram/SourceFiles/tray_accounts_menu_dummy.cpp
new file mode 100644
index 00000000000000..1e135ed6fc92cb
--- /dev/null
+++ b/Telegram/SourceFiles/tray_accounts_menu_dummy.cpp
@@ -0,0 +1,20 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "tray_accounts_menu.h"
+
+namespace Core::TrayAccountsMenu {
+
+void SetupChangesSubscription(
+		[[maybe_unused]] Fn<void()> callback,
+		[[maybe_unused]] rpl::lifetime &lifetime) {
+}
+
+void Fill([[maybe_unused]] Platform::Tray &tray) {
+}
+
+} // namespace Core::TrayAccountsMenu
diff --git a/Telegram/SourceFiles/ui/boxes/about_cocoon_box.cpp b/Telegram/SourceFiles/ui/boxes/about_cocoon_box.cpp
new file mode 100644
index 00000000000000..2e18360744c6cd
--- /dev/null
+++ b/Telegram/SourceFiles/ui/boxes/about_cocoon_box.cpp
@@ -0,0 +1,288 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/boxes/about_cocoon_box.h"
+
+#include "lang/lang_keys.h"
+#include "ui/controls/feature_list.h"
+#include "ui/effects/ministar_particles.h"
+#include "ui/layers/generic_box.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/text/text_utilities.h"
+#include "ui/top_background_gradient.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
+#include "styles/style_chat.h"
+#include "styles/style_credits.h"
+#include "styles/style_info.h" // infoStarsUnderstood
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+
+namespace Ui {
+namespace {
+
+void AddCocoonBoxCover(not_null<Ui::VerticalLayout*> container) {
+	const auto cover = container->add(object_ptr<Ui::RpWidget>(container));
+
+	static const auto gradientEdge = QColor(0x06, 0x11, 0x29);
+	static const auto gradientCenter = QColor(0x09, 0x16, 0x43);
+
+	static const auto gradientLeft = QColor(0x68, 0xc9, 0xff);
+	static const auto gradientRight = QColor(0xcb, 0x57, 0xff);
+
+	static const auto textColor = QColor(0xb8, 0xc9, 0xef);
+	static const auto boldColor = QColor(0xff, 0xff, 0xff);
+
+	const auto logoTop = st::cocoonLogoTop;
+	const auto logoSize = st::cocoonLogoSize;
+	const auto ratio = style::DevicePixelRatio();
+	auto logo = QImage(u":/gui/art/cocoon.webp"_q).scaled(
+		QSize(logoSize, logoSize) * ratio,
+		Qt::IgnoreAspectRatio,
+		Qt::SmoothTransformation);
+	logo.setDevicePixelRatio(ratio);
+	const auto titleTop = logoTop + logoSize + st::cocoonTitleTop;
+	const auto subtitleTop = titleTop
+		+ st::cocoonTitleFont->height
+		+ st::cocoonSubtitleTop;
+
+	const auto boldToColorized = [](QString text) {
+		auto result = tr::rich(text);
+		auto &entities = result.entities;
+		for (auto i = entities.begin(); i != entities.end(); ++i) {
+			if (i->type() == EntityType::Bold) {
+				i = entities.insert(
+					i,
+					EntityInText(
+						EntityType::Colorized,
+						i->offset(),
+						i->length()));
+				++i;
+			}
+		}
+		return result;
+	};
+
+	struct State {
+		QImage gradient;
+		Ui::Animations::Basic animation;
+		std::optional<Ui::StarParticles> particles;
+		style::owned_color subtitleFg = style::owned_color{ textColor };
+		style::owned_color subtitleBoldFg = style::owned_color{ boldColor };
+		style::FlatLabel subtitleSt = st::cocoonSubtitle;
+	};
+	const auto state = cover->lifetime().make_state<State>();
+	state->subtitleSt.textFg = state->subtitleFg.color();
+	state->subtitleSt.palette.linkFg = state->subtitleBoldFg.color();
+	state->animation.init([=] {
+		cover->update();
+		if (anim::Disabled()) {
+			state->animation.stop();
+		}
+	});
+
+	constexpr auto kParticlesCount = 50;
+	state->particles.emplace(
+		Ui::StarParticles::Type::RadialInside,
+		kParticlesCount,
+		st::cocoonLogoSize / 12);
+	state->particles->setSpeed(0.05);
+	auto particleColors = std::vector<QColor>();
+	constexpr auto kParticleColors = 12;
+	particleColors.reserve(kParticleColors);
+	for (auto i = 0; i != kParticleColors; ++i) {
+		particleColors.push_back(anim::color(
+			gradientLeft,
+			gradientRight,
+			float64(i) / (kParticleColors - 1)));
+	}
+	state->particles->setColors(std::move(particleColors));
+
+	const auto subtitle = CreateChild<Ui::FlatLabel>(
+		cover,
+		tr::lng_translate_cocoon_subtitle(
+			lt_text,
+			tr::lng_translate_cocoon_explain(boldToColorized),
+			tr::rich),
+		state->subtitleSt);
+	subtitle->setTryMakeSimilarLines(true);
+
+	cover->widthValue() | rpl::on_next([=](int width) {
+		const auto available = width
+			- st::boxRowPadding.left()
+			- st::boxRowPadding.right();
+		subtitle->resizeToWidth(available);
+		subtitle->moveToLeft(st::boxRowPadding.left(), subtitleTop);
+
+		const auto bottom = st::cocoonSubtitleBottom;
+		cover->resize(width, subtitle->y() + subtitle->height() + bottom);
+	}, cover->lifetime());
+
+	cover->paintRequest() | rpl::on_next([=] {
+		auto p = Painter(cover);
+
+		const auto width = cover->width();
+		const auto ratio = style::DevicePixelRatio();
+		if (state->gradient.size() != cover->size() * ratio) {
+			state->gradient = Ui::CreateTopBgGradient(
+				cover->size(),
+				gradientCenter,
+				gradientEdge);
+
+			auto font = st::cocoonTitleFont->f;
+			font.setWeight(QFont::Bold);
+			auto metrics = QFontMetrics(font);
+
+			const auto text = tr::lng_translate_cocoon_title(tr::now);
+			const auto textw = metrics.horizontalAdvance(text);
+			const auto left = (width - textw) / 2;
+
+			auto q = QPainter(&state->gradient);
+			auto hq = PainterHighQualityEnabler(q);
+
+			auto gradient = QLinearGradient(left, 0, left + textw, 0);
+			gradient.setStops({
+				{ 0., gradientLeft },
+				{ 1., gradientRight },
+			});
+			auto pen = QPen(QBrush(gradient), 1.);
+			q.setPen(pen);
+			q.setFont(font);
+			q.setBrush(Qt::NoBrush);
+
+			q.drawText(left, titleTop + metrics.ascent(), text);
+		}
+		p.drawImage(0, 0, state->gradient);
+
+		const auto logoRect = QRect(
+			(width - logoSize) / 2,
+			logoTop,
+			logoSize,
+			logoSize);
+		const auto paddingAdd = int(base::SafeRound(logoTop * 1.2));
+		const auto particlesRect = logoRect.marginsAdded(
+			{ paddingAdd, paddingAdd, paddingAdd, paddingAdd });
+
+		state->particles->paint(p, particlesRect, crl::now(), false);
+		if (!anim::Disabled() && !state->animation.animating()) {
+			state->animation.start();
+		}
+		p.drawImage(logoRect, logo);
+	}, cover->lifetime());
+}
+
+struct CocoonLinkInfo {
+	QString text;
+	QString link;
+};
+
+[[nodiscard]] CocoonLinkInfo CocoonMention() {
+	const auto mention = tr::lng_translate_cocoon_private_mention(tr::now);
+	const auto username = QString(mention).replace('@', QString());
+	const auto link = u"tg://resolve?domain="_q + username;
+	return { mention, link };
+}
+
+[[nodiscard]] CocoonLinkInfo CocoonDomain() {
+	const auto domain = tr::lng_translate_cocoon_everyone_domain(tr::now);
+	const auto link = u"https://"_q + domain;
+	return { domain, link };
+}
+
+[[nodiscard]] CocoonLinkInfo CocoonDirect() {
+	const auto text = tr::lng_translate_cocoon_text_link(tr::now);
+	const auto link = u"https://"_q + text;
+	return { text, link };
+}
+
+} // namespace
+
+void AboutCocoonBox(not_null<Ui::GenericBox*> box) {
+	box->setWidth(st::boxWideWidth);
+	box->setStyle(st::stakeBox);
+	box->setNoContentMargin(true);
+
+	const auto container = box->verticalLayout();
+	AddCocoonBoxCover(container);
+
+	AddUniqueCloseButton(box);
+
+	const auto mention = CocoonMention();
+	const auto domain = CocoonDomain();
+	const auto direct = CocoonDirect();
+	const auto features = std::vector<Ui::FeatureListEntry>{
+		{
+			st::menuIconLock,
+			tr::lng_translate_cocoon_private_title(tr::now),
+			tr::lng_translate_cocoon_private_text(
+				tr::now,
+				lt_mention,
+				tr::link(mention.text, mention.link),
+				tr::rich),
+		},
+		{
+			st::menuIconStats,
+			tr::lng_translate_cocoon_efficient_title(tr::now),
+			tr::lng_translate_cocoon_efficient_text(tr::now, tr::rich),
+		},
+		{
+			st::menuIconGiftPremium,
+			tr::lng_translate_cocoon_everyone_title(tr::now),
+			tr::lng_translate_cocoon_everyone_text(
+				tr::now,
+				lt_domain,
+				tr::link(domain.text, domain.link),
+				tr::rich),
+		},
+	};
+	auto margin = QMargins(0, st::defaultVerticalListSkip, 0, 0);
+	for (const auto &feature : features) {
+		box->addRow(
+			MakeFeatureListEntry(box, feature),
+			st::boxRowPadding + margin);
+		margin = {};
+	}
+
+	box->addRow(
+		object_ptr<Ui::PlainShadow>(box),
+		st::cocoonJoinSeparatorPadding);
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_translate_cocoon_text(
+				lt_link,
+				rpl::single(tr::link(direct.text, direct.link)),
+				tr::rich),
+			st::cocoonJoinLabel),
+		style::al_top);
+
+	box->addButton(rpl::single(QString()), [=] {
+		box->closeBox();
+	})->setText(rpl::single(Ui::Text::IconEmoji(
+		&st::infoStarsUnderstood
+	).append(' ').append(tr::lng_translate_cocoon_done(tr::now))));
+}
+
+void AddUniqueCloseButton(not_null<GenericBox*> box) {
+	const auto close = Ui::CreateChild<IconButton>(
+		box,
+		st::uniqueCloseButton);
+	close->show();
+	close->raise();
+	box->widthValue() | rpl::on_next([=](int width) {
+		close->moveToRight(0, 0, width);
+		close->raise();
+	}, close->lifetime());
+	close->setClickedCallback([=] {
+		box->closeBox();
+	});
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/about_cocoon_box.h b/Telegram/SourceFiles/ui/boxes/about_cocoon_box.h
new file mode 100644
index 00000000000000..1399ca6a9997f7
--- /dev/null
+++ b/Telegram/SourceFiles/ui/boxes/about_cocoon_box.h
@@ -0,0 +1,17 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+
+class GenericBox;
+
+void AboutCocoonBox(not_null<Ui::GenericBox*> box);
+void AddUniqueCloseButton(not_null<GenericBox*> box);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/auto_delete_settings.cpp b/Telegram/SourceFiles/ui/boxes/auto_delete_settings.cpp
index 33be631695dafc..e735f4d8123eb2 100644
--- a/Telegram/SourceFiles/ui/boxes/auto_delete_settings.cpp
+++ b/Telegram/SourceFiles/ui/boxes/auto_delete_settings.cpp
@@ -51,7 +51,7 @@ object_ptr<Ui::RpWidget> CreateSliderForTTL(
 	state->points.resize(count, 0);
 
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		for (auto i = 0; i != count; ++i) {
 			state->points[i] = (width * i) / (count - 1);
 		}
@@ -59,7 +59,7 @@ object_ptr<Ui::RpWidget> CreateSliderForTTL(
 	}, lifetime);
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 
 		p.setFont(st->font);
@@ -80,7 +80,7 @@ object_ptr<Ui::RpWidget> CreateSliderForTTL(
 	}, lifetime);
 
 	slider->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(slider);
 		auto hq = PainterHighQualityEnabler(p);
 
@@ -171,7 +171,7 @@ object_ptr<Ui::RpWidget> CreateSliderForTTL(
 			return static_cast<QMouseEvent*>(e.get())->pos();
 		}));
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](QPoint position) {
+	) | rpl::on_next([=](QPoint position) {
 		state->selected = std::clamp(
 			(position.x() + (state->points[1] / 2)) / state->points[1],
 			0,
diff --git a/Telegram/SourceFiles/ui/boxes/boost_box.cpp b/Telegram/SourceFiles/ui/boxes/boost_box.cpp
index 500748ac2fa6d7..19cc0e793a0be0 100644
--- a/Telegram/SourceFiles/ui/boxes/boost_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/boost_box.cpp
@@ -15,9 +15,12 @@ For license and copyright information please follow this link:
 #include "ui/effects/premium_graphics.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_giveaway.h"
 #include "styles/style_layers.h"
 #include "styles/style_premium.h"
@@ -81,7 +84,7 @@ namespace {
 		rpl::duplicate(title),
 		state->repeated->shownValue(),
 		state->repeated->widthValue()
-	) | rpl::start_with_next([=](int outer, auto&&, bool shown, int badge) {
+	) | rpl::on_next([=](int outer, auto&&, bool shown, int badge) {
 		const auto repeated = shown ? badge : 0;
 		const auto skip = st::boostTitleBadgeSkip;
 		const auto available = outer - repeated - skip;
@@ -97,7 +100,7 @@ namespace {
 	}, result->lifetime());
 
 	const auto badge = state->repeated;
-	badge->paintRequest() | rpl::start_with_next([=] {
+	badge->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(badge);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto radius = std::min(badge->width(), badge->height()) / 2;
@@ -140,9 +143,10 @@ void AddFeaturesList(
 			st,
 			st::boostFeatureIconPosition);
 	};
-	const auto proj = &Ui::Text::RichLangValue;
 	const auto lowMax = std::max({
 		features.linkLogoLevel,
+		features.profileIconLevel,
+		features.autotranslateLevel,
 		features.transcribeLevel,
 		features.emojiPackLevel,
 		features.emojiStatusLevel,
@@ -154,32 +158,64 @@ void AddFeaturesList(
 		(features.linkStylesByLevel.empty()
 			? 0
 			: features.linkStylesByLevel.back().first),
+		(features.profileColorsByLevel.empty()
+			? 0
+			: features.profileColorsByLevel.back().first),
 	});
 	const auto highMax = std::max(lowMax, features.sponsoredLevel);
 	auto nameColors = 0;
 	auto linkStyles = 0;
+	auto profileColors = 0;
 	for (auto i = std::max(startFromLevel, 1); i <= highMax; ++i) {
 		if ((i > lowMax) && (i < highMax)) {
 			continue;
 		}
 		const auto unlocks = (i == startFromLevel);
-		container->add(
-			MakeFeaturesBadge(
-				container,
-				(unlocks
-					? tr::lng_boost_level_unlocks
-					: tr::lng_boost_level)(
-						lt_count,
-						rpl::single(float64(i)))),
-			st::boostLevelBadgePadding);
+		{
+			const auto badge = container->add(
+				MakeFeaturesBadge(
+					container,
+					(unlocks
+						? tr::lng_boost_level_unlocks
+						: tr::lng_boost_level)(
+							lt_count,
+							rpl::single(float64(i)))),
+				st::boostLevelBadgePadding,
+				style::al_top);
+			const auto padding = st::boxRowPadding;
+			const auto line = Ui::CreateChild<Ui::RpWidget>(container);
+			badge->geometryValue() | rpl::on_next([=](const QRect &r) {
+				line->setGeometry(
+					padding.left(),
+					r.y(),
+					container->width() - rect::m::sum::h(padding),
+					r.height());
+			}, line->lifetime());
+			const auto shift = st::lineWidth * 10;
+			line->paintRequest() | rpl::on_next([=] {
+				auto p = QPainter(line);
+				p.setPen(st::windowSubTextFg);
+				const auto y = line->height() / 2;
+				const auto left = badge->x() - shift - padding.left();
+				const auto right = left + badge->width() + shift * 2;
+				if (left > 0) {
+					p.drawLine(0, y, left, y);
+				}
+				if (right < line->width()) {
+					p.drawLine(right, y, line->width(), y);
+				}
+			}, line->lifetime());
+		}
 		if (i >= features.sponsoredLevel) {
-			add(tr::lng_channel_earn_off(proj), st::boostFeatureOffSponsored);
+			add(
+				tr::lng_channel_earn_off(tr::rich),
+				st::boostFeatureOffSponsored);
 		}
 		if (i >= features.customWallpaperLevel) {
 			add(
 				(group
 					? tr::lng_feature_custom_background_group
-					: tr::lng_feature_custom_background_channel)(proj),
+					: tr::lng_feature_custom_background_channel)(tr::rich),
 				st::boostFeatureCustomBackground);
 		}
 		if (i >= features.wallpaperLevel) {
@@ -189,23 +225,33 @@ void AddFeaturesList(
 					: tr::lng_feature_backgrounds_channel)(
 						lt_count,
 						rpl::single(float64(features.wallpapersCount)),
-						proj),
+						tr::rich),
 				st::boostFeatureBackground);
 		}
 		if (i >= features.emojiStatusLevel) {
 			add(
-				tr::lng_feature_emoji_status(proj),
+				tr::lng_feature_emoji_status(tr::rich),
 				st::boostFeatureEmojiStatus);
 		}
-		if (group && i >= features.transcribeLevel) {
-			add(
-				tr::lng_feature_transcribe(proj),
-				st::boostFeatureTranscribe);
+		if (const auto j = features.profileColorsByLevel.find(i)
+			; j != end(features.profileColorsByLevel)) {
+			profileColors += j->second;
 		}
-		if (group && i >= features.emojiPackLevel) {
+		if (i >= features.profileIconLevel) {
 			add(
-				tr::lng_feature_custom_emoji_pack(proj),
-				st::boostFeatureCustomEmoji);
+				(group
+					? tr::lng_feature_profile_icon_group
+					: tr::lng_feature_profile_icon_channel)(tr::rich),
+				st::boostFeatureProfileIcon);
+		}
+		if (profileColors > 0) {
+			add((group
+				? tr::lng_feature_profile_color_group
+				: tr::lng_feature_profile_color_channel)(
+					lt_count,
+					rpl::single(float64(profileColors)),
+					tr::rich
+				), st::boostFeatureProfileColor);
 		}
 		if (!group) {
 			if (const auto j = features.linkStylesByLevel.find(i)
@@ -214,14 +260,14 @@ void AddFeaturesList(
 			}
 			if (i >= features.linkLogoLevel) {
 				add(
-					tr::lng_feature_link_emoji(proj),
+					tr::lng_feature_link_emoji(tr::rich),
 					st::boostFeatureCustomLink);
 			}
 			if (linkStyles > 0) {
 				add(tr::lng_feature_link_style_channel(
 					lt_count,
 					rpl::single(float64(linkStyles)),
-					proj
+					tr::rich
 				), st::boostFeatureLink);
 			}
 			if (const auto j = features.nameColorsByLevel.find(i)
@@ -232,18 +278,33 @@ void AddFeaturesList(
 				add(tr::lng_feature_name_color_channel(
 					lt_count,
 					rpl::single(float64(nameColors)),
-					proj
+					tr::rich
 				), st::boostFeatureName);
 			}
 			add(tr::lng_feature_reactions(
 				lt_count,
 				rpl::single(float64(i)),
-				proj
+				tr::rich
 			), st::boostFeatureCustomReactions);
 		}
 		add(
-			tr::lng_feature_stories(lt_count, rpl::single(float64(i)), proj),
+			tr::lng_feature_stories(lt_count, rpl::single(1. * i), tr::rich),
 			st::boostFeatureStories);
+		if (!group && i >= features.autotranslateLevel) {
+			add(
+				tr::lng_feature_autotranslate(tr::rich),
+				st::boostFeatureAutoTranslate);
+		}
+		if (group && i >= features.transcribeLevel) {
+			add(
+				tr::lng_feature_transcribe(tr::rich),
+				st::boostFeatureTranscribe);
+		}
+		if (group && i >= features.emojiPackLevel) {
+			add(
+				tr::lng_feature_custom_emoji_pack(tr::rich),
+				st::boostFeatureCustomEmoji);
+		}
 	}
 }
 
@@ -259,7 +320,7 @@ void StartFireworks(not_null<QWidget*> parent) {
 	const auto animation = lifetime.make_state<FireworksAnimation>([=] {
 		result->update();
 	});
-	result->paintRequest() | rpl::start_with_next([=] {
+	result->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(result);
 		if (!animation->paint(p, result->rect())) {
 			crl::on_main(result, [=] { delete result; });
@@ -325,9 +386,15 @@ void BoostBox(
 		return (counters.mine > 1) ? u"x%1"_q.arg(counters.mine) : u""_q;
 	});
 
+	const auto wasMine = state->data.current().mine;
+	const auto wasLifting = data.lifting;
 	auto text = state->data.value(
 	) | rpl::map([=](BoostCounters counters) {
-		const auto bold = Ui::Text::Bold(name);
+		const auto lifting = wasLifting
+			? (wasLifting
+				- std::clamp(counters.mine - wasMine, 0, wasLifting - 1))
+			: 0;
+		const auto bold = tr::bold(name);
 		const auto now = counters.boosts;
 		const auto full = !counters.nextLevelBoosts;
 		const auto left = (counters.nextLevelBoosts > now)
@@ -336,20 +403,27 @@ void BoostBox(
 		auto post = tr::lng_boost_channel_post_stories(
 			lt_count,
 			rpl::single(float64(counters.level + (left ? 1 : 0))),
-			Ui::Text::RichLangValue);
-		return (counters.mine || full)
+			tr::rich);
+		return (lifting > 1)
+			? tr::lng_boost_group_lift_restrictions_many(
+				lt_count,
+				rpl::single(float64(lifting)),
+				tr::rich)
+			: lifting
+			? tr::lng_boost_group_lift_restrictions(tr::rich)
+			: (counters.mine || full)
 			? (left
 				? tr::lng_boost_channel_needs_unlock(
 					lt_count,
 					rpl::single(float64(left)),
 					lt_channel,
 					rpl::single(bold),
-					Ui::Text::RichLangValue)
+					tr::rich)
 				: (!counters.level
 					? (data.group
 						? tr::lng_boost_channel_reached_first_group
 						: tr::lng_boost_channel_reached_first)(
-							Ui::Text::RichLangValue)
+							tr::rich)
 					: (data.group
 						? tr::lng_boost_channel_reached_more_group
 						: tr::lng_boost_channel_reached_more)(
@@ -357,14 +431,22 @@ void BoostBox(
 							rpl::single(float64(counters.level)),
 							lt_post,
 							std::move(post),
-							Ui::Text::RichLangValue)))
+							tr::rich)))
 			: tr::lng_boost_channel_needs_unlock(
 				lt_count,
 				rpl::single(float64(left)),
 				lt_channel,
 				rpl::single(bold),
-				Ui::Text::RichLangValue);
+				tr::rich);
 	}) | rpl::flatten_latest();
+	if (wasLifting) {
+		state->data.value(
+		) | rpl::on_next([=](BoostCounters counters) {
+			if (counters.mine - wasMine >= wasLifting) {
+				box->closeBox();
+			}
+		}, box->lifetime());
+	}
 
 	auto faded = object_ptr<Ui::FadeWrap<>>(
 		close->parentWidget(),
@@ -405,7 +487,7 @@ void BoostBox(
 			+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)));
 
 	const auto current = state->data.current();
-	box->setTitle(rpl::single(QString()));
+	box->setTitle(QString());
 	AddFeaturesList(
 		box->verticalLayout(),
 		data.features,
@@ -424,7 +506,7 @@ void BoostBox(
 			: tr::lng_boost_channel_button();
 	}) | rpl::flatten_latest();
 
-	const auto button = box->addButton(rpl::duplicate(submit), [=] {
+	box->addButton(rpl::duplicate(submit), [=] {
 		if (state->submitted) {
 			return;
 		} else if (state->data.current().nextLevelBoosts > 0
@@ -492,17 +574,6 @@ void BoostBox(
 			box->closeBox();
 		}
 	});
-
-	rpl::combine(
-		std::move(submit),
-		box->widthValue()
-	) | rpl::start_with_next([=](const QString &, int width) {
-		const auto &padding = st::boostBox.buttonPadding;
-		button->resizeToWidth(width
-			- padding.left()
-			- padding.right());
-		button->moveToLeft(padding.left(), button->y());
-	}, button->lifetime());
 }
 
 object_ptr<Ui::RpWidget> MakeLinkLabel(
@@ -546,7 +617,7 @@ object_ptr<Ui::RpWidget> MakeLinkLabel(
 	rpl::combine(
 		raw->widthValue(),
 		std::move(text)
-	) | rpl::start_with_next([=](int outer, const auto&) {
+	) | rpl::on_next([=](int outer, const auto&) {
 		const auto textWidth = state->label.textMaxWidth();
 		const auto skipLeft = st::giveawayGiftCodeLink.margin.left();
 		const auto skipRight = rawRight
@@ -564,7 +635,7 @@ object_ptr<Ui::RpWidget> MakeLinkLabel(
 		state->label.moveToLeft(x, st::giveawayGiftCodeLink.margin.top());
 	}, raw->lifetime());
 
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		state->bg.paint(p, raw->rect());
 	}, raw->lifetime());
@@ -573,13 +644,17 @@ object_ptr<Ui::RpWidget> MakeLinkLabel(
 
 	raw->resize(raw->width(), st::giveawayGiftCodeLinkHeight);
 	if (rawRight) {
-		raw->widthValue() | rpl::start_with_next([=](int width) {
+		raw->widthValue() | rpl::on_next([=](int width) {
 			rawRight->move(width - rawRight->width(), 0);
 		}, raw->lifetime());
 	}
 	raw->setClickedCallback([=] {
 		QGuiApplication::clipboard()->setText(state->link.current());
-		show->showToast(tr::lng_username_copied(tr::now));
+		show->showToast({
+			.text = { tr::lng_username_copied(tr::now) },
+			.iconLottie = u"toast/voip_invite"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	});
 
 	return result;
@@ -589,7 +664,7 @@ void BoostBoxAlready(not_null<GenericBox*> box, bool group) {
 	ConfirmBox(box, {
 		.text = (group
 			? tr::lng_boost_error_already_text_group
-			: tr::lng_boost_error_already_text)(Text::RichLangValue),
+			: tr::lng_boost_error_already_text)(tr::rich),
 		.title = tr::lng_boost_error_already_title(),
 		.inform = true,
 	});
@@ -608,7 +683,7 @@ void GiftForBoostsBox(
 				rpl::single(receive) | tr::to_count(),
 				lt_channel,
 				rpl::single(TextWithEntities{ channel }),
-				Text::RichLangValue),
+				tr::rich),
 		.title = tr::lng_boost_need_more(),
 		.inform = true,
 	});
@@ -618,7 +693,7 @@ void GiftedNoBoostsBox(not_null<GenericBox*> box, bool group) {
 	InformBox(box, {
 		.text = (group
 			? tr::lng_boost_error_gifted_text_group
-			: tr::lng_boost_error_gifted_text)(Text::RichLangValue),
+			: tr::lng_boost_error_gifted_text)(tr::rich),
 		.title = tr::lng_boost_error_gifted_title(),
 	});
 }
@@ -630,7 +705,7 @@ void PremiumForBoostsBox(
 	ConfirmBox(box, {
 		.text = (group
 			? tr::lng_boost_error_premium_text_group
-			: tr::lng_boost_error_premium_text)(Text::RichLangValue),
+			: tr::lng_boost_error_premium_text)(tr::rich),
 		.confirmed = buyPremium,
 		.confirmText = tr::lng_boost_error_premium_yes(),
 		.title = tr::lng_boost_error_premium_title(),
@@ -644,6 +719,8 @@ void AskBoostBox(
 		Fn<void()> startGiveaway) {
 	box->setWidth(st::boxWideWidth);
 	box->setStyle(st::boostBox);
+	box->setNoContentMargin(true);
+	box->addSkip(st::boxRowPadding.left());
 
 	FillBoostLimit(
 		BoxShowFinishes(box),
@@ -655,6 +732,8 @@ void AskBoostBox(
 
 	auto title = v::match(data.reason.data, [](AskBoostChannelColor) {
 		return tr::lng_boost_channel_title_color();
+	}, [](AskBoostAutotranslate) {
+		return tr::lng_boost_channel_title_autotranslate();
 	}, [](AskBoostWallpaper) {
 		return tr::lng_boost_channel_title_wallpaper();
 	}, [](AskBoostEmojiStatus) {
@@ -665,48 +744,65 @@ void AskBoostBox(
 		return tr::lng_boost_channel_title_reactions();
 	}, [](AskBoostCpm) {
 		return tr::lng_boost_channel_title_cpm();
+	}, [](AskBoostWearCollectible) {
+		return tr::lng_boost_channel_title_wear();
 	});
+	auto isGroup = false;
 	auto reasonText = v::match(data.reason.data, [&](
 			AskBoostChannelColor data) {
 		return tr::lng_boost_channel_needs_level_color(
 			lt_count,
 			rpl::single(float64(data.requiredLevel)),
-			Ui::Text::RichLangValue);
+			tr::rich);
+	}, [&](AskBoostAutotranslate data) {
+		return tr::lng_boost_channel_needs_level_autotranslate(
+			lt_count,
+			rpl::single(float64(data.requiredLevel)),
+			tr::rich);
 	}, [&](AskBoostWallpaper data) {
+		isGroup = data.group;
 		return (data.group
 			? tr::lng_boost_group_needs_level_wallpaper
 			: tr::lng_boost_channel_needs_level_wallpaper)(
 				lt_count,
 				rpl::single(float64(data.requiredLevel)),
-				Ui::Text::RichLangValue);
+				tr::rich);
 	}, [&](AskBoostEmojiStatus data) {
+		isGroup = data.group;
 		return (data.group
 			? tr::lng_boost_group_needs_level_status
 			: tr::lng_boost_channel_needs_level_status)(
 				lt_count,
 				rpl::single(float64(data.requiredLevel)),
-				Ui::Text::RichLangValue);
+				tr::rich);
 	}, [&](AskBoostEmojiPack data) {
+		isGroup = true;
 		return tr::lng_boost_group_needs_level_emoji(
 			lt_count,
 			rpl::single(float64(data.requiredLevel)),
-			Ui::Text::RichLangValue);
+			tr::rich);
 	}, [&](AskBoostCustomReactions data) {
 		return tr::lng_boost_channel_needs_level_reactions(
 			lt_count,
 			rpl::single(float64(data.count)),
 			lt_same_count,
 			rpl::single(TextWithEntities{ QString::number(data.count) }),
-			Ui::Text::RichLangValue);
+			tr::rich);
 	}, [&](AskBoostCpm data) {
 		return tr::lng_boost_channel_needs_level_cpm(
 			lt_count,
 			rpl::single(float64(data.requiredLevel)),
-			Ui::Text::RichLangValue);
+			tr::rich);
+	}, [&](AskBoostWearCollectible data) {
+		return tr::lng_boost_channel_needs_level_wear(
+			lt_count,
+			rpl::single(float64(data.requiredLevel)),
+			tr::rich);
 	});
 	auto text = rpl::combine(
 		std::move(reasonText),
-		tr::lng_boost_channel_ask(Ui::Text::RichLangValue)
+		(isGroup ? tr::lng_boost_group_ask : tr::lng_boost_channel_ask)(
+			tr::rich)
 	) | rpl::map([](TextWithEntities &&text, TextWithEntities &&ask) {
 		return text.append(u"\n\n"_q).append(std::move(ask));
 	});
@@ -715,14 +811,16 @@ void AskBoostBox(
 			box,
 			std::move(title),
 			st::boostCenteredTitle),
-		st::boxRowPadding + QMargins(0, st::boostTitleSkip, 0, 0));
+		st::boxRowPadding + QMargins(0, st::boostTitleSkip, 0, 0),
+		style::al_top);
 	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			std::move(text),
 			st::boostText),
 		(st::boxRowPadding
-			+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)));
+			+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)),
+		style::al_top);
 
 	auto stats = object_ptr<Ui::IconButton>(box, st::boostLinkStatsButton);
 	stats->setClickedCallback(openStatistics);
@@ -733,21 +831,21 @@ void AskBoostBox(
 		box->uiShow(),
 		std::move(stats)));
 
+	AddFeaturesList(
+		box->verticalLayout(),
+		data.features,
+		data.boost.level + (data.boost.nextLevelBoosts ? 1 : 0),
+		data.group);
+
 	auto submit = tr::lng_boost_channel_ask_button();
-	const auto button = box->addButton(rpl::duplicate(submit), [=] {
+	box->addButton(rpl::duplicate(submit), [=] {
 		QGuiApplication::clipboard()->setText(data.link);
-		box->uiShow()->showToast(tr::lng_username_copied(tr::now));
+		box->uiShow()->showToast({
+			.text = { tr::lng_username_copied(tr::now) },
+			.iconLottie = u"toast/voip_invite"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	});
-	rpl::combine(
-		std::move(submit),
-		box->widthValue()
-	) | rpl::start_with_next([=](const QString &, int width) {
-		const auto &padding = st::boostBox.buttonPadding;
-		button->resizeToWidth(width
-			- padding.left()
-			- padding.right());
-		button->moveToLeft(padding.left(), button->y());
-	}, button->lifetime());
 }
 
 void FillBoostLimit(
@@ -862,7 +960,7 @@ object_ptr<Ui::FlatLabel> MakeBoostFeaturesBadge(
 	const auto label = result.data();
 
 	label->show();
-	label->paintRequest() | rpl::start_with_next([=] {
+	label->paintRequest() | rpl::on_next([=] {
 		const auto size = label->textMaxWidth();
 		const auto rect = QRect(
 			(label->width() - size) / 2,
diff --git a/Telegram/SourceFiles/ui/boxes/boost_box.h b/Telegram/SourceFiles/ui/boxes/boost_box.h
index 4ecd58bf2388d7..17353faacd6c88 100644
--- a/Telegram/SourceFiles/ui/boxes/boost_box.h
+++ b/Telegram/SourceFiles/ui/boxes/boost_box.h
@@ -34,7 +34,10 @@ struct BoostCounters {
 struct BoostFeatures {
 	base::flat_map<int, int> nameColorsByLevel;
 	base::flat_map<int, int> linkStylesByLevel;
+	base::flat_map<int, int> profileColorsByLevel;
 	int linkLogoLevel = 0;
+	int profileIconLevel = 0;
+	int autotranslateLevel = 0;
 	int transcribeLevel = 0;
 	int emojiPackLevel = 0;
 	int emojiStatusLevel = 0;
@@ -48,6 +51,7 @@ struct BoostBoxData {
 	QString name;
 	BoostCounters boost;
 	BoostFeatures features;
+	int lifting = 0;
 	bool allowMulti = false;
 	bool group = false;
 };
@@ -73,6 +77,10 @@ struct AskBoostChannelColor {
 	int requiredLevel = 0;
 };
 
+struct AskBoostAutotranslate {
+	int requiredLevel = 0;
+};
+
 struct AskBoostWallpaper {
 	int requiredLevel = 0;
 	bool group = false;
@@ -95,20 +103,28 @@ struct AskBoostCpm {
 	int requiredLevel = 0;
 };
 
+struct AskBoostWearCollectible {
+	int requiredLevel = 0;
+};
+
 struct AskBoostReason {
 	std::variant<
 		AskBoostChannelColor,
+		AskBoostAutotranslate,
 		AskBoostWallpaper,
 		AskBoostEmojiStatus,
 		AskBoostEmojiPack,
 		AskBoostCustomReactions,
-		AskBoostCpm> data;
+		AskBoostCpm,
+		AskBoostWearCollectible> data;
 };
 
 struct AskBoostBoxData {
 	QString link;
 	BoostCounters boost;
+	BoostFeatures features;
 	AskBoostReason reason;
+	bool group = false;
 };
 
 void AskBoostBox(
diff --git a/Telegram/SourceFiles/ui/boxes/calendar_box.cpp b/Telegram/SourceFiles/ui/boxes/calendar_box.cpp
index 5c46fbff4cf31d..b63bd5930adbca 100644
--- a/Telegram/SourceFiles/ui/boxes/calendar_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/calendar_box.cpp
@@ -9,14 +9,24 @@ For license and copyright information please follow this link:
 
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
+#include "ui/widgets/vertical_drum_picker.h"
 #include "ui/effects/ripple_animation.h"
+#include "ui/effects/animations.h"
 #include "ui/chat/chat_style.h"
 #include "ui/ui_utility.h"
 #include "ui/painter.h"
 #include "ui/cached_round_corners.h"
+#include "ui/layers/generic_box.h"
+#include "ui/dynamic_image.h"
+#include "ui/image/image_prepare.h"
 #include "lang/lang_keys.h"
+#include "base/flat_map.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
+#include "styles/style_settings.h"
+#include "styles/style_layers.h"
+
+#include <QtCore/QLocale>
 
 namespace Ui {
 namespace {
@@ -25,6 +35,158 @@ constexpr auto kDaysInWeek = 7;
 constexpr auto kTooltipDelay = crl::time(1000);
 constexpr auto kJumpDelay = 2 * crl::time(1000);
 
+// QDate -> 0..6
+[[nodiscard]] int DayOfWeekIndex(const QDate &date, int firstDayOfWeek) {
+	return (kDaysInWeek + date.dayOfWeek() - firstDayOfWeek) % kDaysInWeek;
+}
+
+void FillMonthYearPicker(
+		not_null<GenericBox*> box,
+		QDate current,
+		QDate minDate,
+		QDate maxDate,
+		const style::CalendarSizes &st,
+		Fn<void(QDate)> done) {
+	box->setWidth(st::boxWideWidth);
+	const auto content = box->addRow(
+		object_ptr<FixedHeightWidget>(box, st::settingsWorkingHoursPicker));
+
+	const auto font = st::boxTextFont;
+	const auto itemHeight = st::settingsWorkingHoursPickerItemHeight;
+	const auto picker = [=](
+			int count,
+			int startIndex,
+			Fn<void(QPainter&, QRectF, int)> paint) {
+		const auto result = CreateChild<VerticalDrumPicker>(
+			content,
+			VerticalDrumPicker::DefaultPaintCallback(
+				font,
+				itemHeight,
+				paint),
+			count,
+			itemHeight,
+			startIndex);
+		result->show();
+		return result;
+	};
+
+	const auto effectiveMaxDate = maxDate.isValid()
+		? maxDate
+		: QDate::currentDate().addDays(365);
+	const auto minYear = minDate.isValid() ? minDate.year() : 2013;
+	const auto maxYear = effectiveMaxDate.year();
+	const auto yearsCount = maxYear - minYear + 1;
+	const auto yearsStartIndex = current.year() - minYear;
+	const auto yearsPaint = [=](QPainter &p, QRectF rect, int index) {
+		p.drawText(rect, QString::number(minYear + index), style::al_center);
+	};
+	const auto years = picker(yearsCount, yearsStartIndex, yearsPaint);
+
+	const auto monthsRange = [=](int year) {
+		auto minMonth = 1;
+		auto maxMonth = 12;
+		if (minDate.isValid() && minDate.year() == year) {
+			minMonth = minDate.month();
+		}
+		if (maxDate.isValid() && maxDate.year() == year) {
+			maxMonth = maxDate.month();
+		}
+		return std::make_pair(minMonth, maxMonth);
+	};
+
+	struct State {
+		base::unique_qptr<VerticalDrumPicker> months;
+		int currentMinMonth = 0;
+		int currentMaxMonth = 0;
+	};
+	const auto state = box->lifetime().make_state<State>();
+
+	const auto [minMonth, maxMonth] = monthsRange(current.year());
+	const auto monthsCount = maxMonth - minMonth + 1;
+	const auto monthsStartIndex = current.month() - minMonth;
+	const auto monthsPaint = [=, minMonth = minMonth](
+			QPainter &p,
+			QRectF rect,
+			int index) {
+		p.drawText(
+			rect,
+			Lang::Month(minMonth + index)(tr::now),
+			style::al_center);
+	};
+	state->months = base::unique_qptr<VerticalDrumPicker>(
+			picker(monthsCount, monthsStartIndex, monthsPaint));
+	state->currentMinMonth = minMonth;
+	state->currentMaxMonth = maxMonth;
+
+	years->value(
+	) | rpl::skip(1) | rpl::on_next([=](int yearIndex) {
+		const auto year = minYear + yearIndex;
+		const auto [newMinMonth, newMaxMonth] = monthsRange(year);
+
+		if (newMinMonth != state->currentMinMonth
+			|| newMaxMonth != state->currentMaxMonth) {
+			const auto newMonthsCount = newMaxMonth - newMinMonth + 1;
+			const auto oldMonth = state->currentMinMonth
+				+ state->months->index();
+			const auto clampedMonth = std::clamp(
+				oldMonth - newMinMonth,
+				0,
+				newMonthsCount - 1);
+			const auto newMonthsPaint = [=, minMonth = newMinMonth](
+					QPainter &p,
+					QRectF rect,
+					int index) {
+				p.drawText(
+					rect,
+					Lang::Month(minMonth + index)(tr::now),
+					style::al_center);
+			};
+			state->months = base::unique_qptr<VerticalDrumPicker>(
+					picker(newMonthsCount, clampedMonth, newMonthsPaint));
+			state->currentMinMonth = newMinMonth;
+			state->currentMaxMonth = newMaxMonth;
+			const auto s = content->size();
+			if (s.isValid()) {
+				const auto half = s.width() / 2;
+				state->months->setGeometry(0, 0, half, s.height());
+			}
+		}
+	}, box->lifetime());
+
+	content->sizeValue(
+	) | rpl::on_next([=](QSize s) {
+		const auto half = s.width() / 2;
+		state->months->setGeometry(0, 0, half, s.height());
+		years->setGeometry(half, 0, half, s.height());
+	}, content->lifetime());
+
+	content->paintRequest(
+	) | rpl::on_next([=](const QRect &r) {
+		auto p = QPainter(content);
+		p.fillRect(r, Qt::transparent);
+		const auto lineRect = QRect(
+			0,
+			content->height() / 2,
+			content->width(),
+			st::defaultInputField.borderActive);
+		p.fillRect(
+			lineRect.translated(0, itemHeight / 2),
+			st::activeLineFg);
+		p.fillRect(
+			lineRect.translated(0, -itemHeight / 2),
+			st::activeLineFg);
+	}, content->lifetime());
+
+	box->addButton(tr::lng_gift_menu_show(), [=] {
+		const auto year = minYear + years->index();
+		const auto [minMonth, maxMonth] = monthsRange(year);
+		const auto month = minMonth + state->months->index();
+		done(QDate(year, month, 1));
+		box->closeBox();
+	});
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+}
+
 } // namespace
 
 class CalendarBox::Context {
@@ -75,6 +237,9 @@ class CalendarBox::Context {
 	[[nodiscard]] rpl::producer<QDate> monthValue() const {
 		return _month.value();
 	}
+	[[nodiscard]] int firstDayOfWeek() const {
+		return _firstDayOfWeek;
+	}
 
 	[[nodiscard]] QDate dateFromIndex(int index) const;
 	[[nodiscard]] QString labelFromIndex(int index) const;
@@ -97,9 +262,17 @@ class CalendarBox::Context {
 	};
 	void applyMonth(const QDate &month, bool forced = false);
 
-	static int DaysShiftForMonth(QDate month, QDate min);
-	static int RowsCountForMonth(QDate month, QDate min, QDate max);
+	static int DaysShiftForMonth(
+		const QDate &month,
+		QDate min,
+		int firstDayOfWeek);
+	static int RowsCountForMonth(
+		const QDate &month,
+		QDate min,
+		QDate max,
+		int firstDayOfWeek);
 
+	const int _firstDayOfWeek = 0;
 	bool _allowsSelection = false;
 
 	rpl::variable<QDate> _month;
@@ -124,7 +297,8 @@ class CalendarBox::Context {
 };
 
 CalendarBox::Context::Context(QDate month, QDate highlighted)
-: _highlighted(highlighted) {
+: _firstDayOfWeek(static_cast<int>(QLocale().firstDayOfWeek())) // 1..7
+, _highlighted(highlighted) {
 	showMonth(month);
 }
 
@@ -157,8 +331,8 @@ bool CalendarBox::Context::showsMonthOf(QDate date) const {
 void CalendarBox::Context::applyMonth(const QDate &month, bool forced) {
 	const auto was = _month.current();
 	_daysCount = month.daysInMonth();
-	_daysShift = DaysShiftForMonth(month, _min);
-	_rowsCount = RowsCountForMonth(month, _min, _max);
+	_daysShift = DaysShiftForMonth(month, _min, _firstDayOfWeek);
+	_rowsCount = RowsCountForMonth(month, _min, _max, _firstDayOfWeek);
 	_highlightedIndex = month.daysTo(_highlighted);
 	_minDayIndex = _min.isNull() ? INT_MIN : month.daysTo(_min);
 	_maxDayIndex = _max.isNull() ? INT_MAX : month.daysTo(_max);
@@ -197,12 +371,15 @@ void CalendarBox::Context::skipMonth(int skip) {
 	showMonth(QDate(year, month, 1));
 }
 
-int CalendarBox::Context::DaysShiftForMonth(QDate month, QDate min) {
+int CalendarBox::Context::DaysShiftForMonth(
+		const QDate &month,
+		QDate min,
+		int firstDayOfWeek) {
 	Expects(!month.isNull());
 
 	constexpr auto kMaxRows = 6;
 	const auto inMonthIndex = month.day() - 1;
-	const auto inWeekIndex = month.dayOfWeek() - 1;
+	const auto inWeekIndex = DayOfWeekIndex(month, firstDayOfWeek);
 	const auto from = ((kMaxRows * kDaysInWeek) + inWeekIndex - inMonthIndex)
 		% kDaysInWeek;
 	if (min.isNull()) {
@@ -213,17 +390,20 @@ int CalendarBox::Context::DaysShiftForMonth(QDate month, QDate min) {
 	if (min.day() != 1) {
 		min = QDate(min.year(), min.month(), 1);
 	}
-	const auto add = min.daysTo(month) - inWeekIndex + (min.dayOfWeek() - 1);
+	const auto add = min.daysTo(month)
+		- inWeekIndex
+		+ DayOfWeekIndex(min, firstDayOfWeek);
 	return from + add;
 }
 
 int CalendarBox::Context::RowsCountForMonth(
-		QDate month,
+		const QDate &month,
 		QDate min,
-		QDate max) {
+		QDate max,
+		int firstDayOfWeek) {
 	Expects(!month.isNull());
 
-	const auto daysShift = DaysShiftForMonth(month, min);
+	const auto daysShift = DaysShiftForMonth(month, min, firstDayOfWeek);
 	const auto daysCount = month.daysInMonth();
 	const auto cellsCount = daysShift + daysCount;
 	auto result = (cellsCount / kDaysInWeek);
@@ -240,7 +420,7 @@ int CalendarBox::Context::RowsCountForMonth(
 		max = QDate(max.year(), max.month(), 1);
 	}
 	max = max.addMonths(1);
-	max = max.addDays(1 - max.dayOfWeek());
+	max = max.addDays(-DayOfWeekIndex(max, firstDayOfWeek));
 	const auto cellsFull = daysShift + (month.day() - 1) + month.daysTo(max);
 	return cellsFull / kDaysInWeek;
 }
@@ -346,10 +526,13 @@ class CalendarBox::Inner final : public RpWidget {
 		QWidget *parent,
 		not_null<Context*> context,
 		const style::CalendarSizes &st,
-		const style::CalendarColors &styleColors);
+		const style::CalendarColors &styleColors,
+		Fn<void(QDate, CalendarImageSetter)> dynamicImageForDate);
 
 	[[nodiscard]] int countMaxHeight() const;
 	void setDateChosenCallback(Fn<void(QDate)> callback);
+	void setDynamicImage(QDate date, std::shared_ptr<DynamicImage> image);
+	void setRequireImage(bool require);
 
 	~Inner();
 
@@ -363,6 +546,7 @@ class CalendarBox::Inner final : public RpWidget {
 	void monthChanged(QDate month);
 	void setSelected(int selected);
 	void setPressed(int pressed);
+	void loadDynamicImages();
 
 	int rowsLeft() const;
 	int rowsTop() const;
@@ -373,8 +557,24 @@ class CalendarBox::Inner final : public RpWidget {
 	const style::CalendarColors &_styleColors;
 	const not_null<Context*> _context;
 	bool _twoPressSelectionStarted = false;
+	bool _requireImage = false;
+	Fn<void(QDate, CalendarImageSetter)> _dynamicImageForDate;
+
+	struct DynamicImageState {
+		std::shared_ptr<DynamicImage> image;
+		bool requested = false;
+		bool animationFinished = false;
+		anim::value animation;
+		crl::time animationStart = 0;
+
+		[[nodiscard]] bool animating() const {
+			return animationStart > 0;
+		}
+	};
 
 	std::map<int, std::unique_ptr<RippleAnimation>> _ripples;
+	base::flat_map<QDate, DynamicImageState> _dynamicImageStates;
+	Ui::Animations::Basic _animation;
 
 	Fn<void(QDate)> _dateChosenCallback;
 
@@ -418,7 +618,7 @@ CalendarBox::FloatingDate::FloatingDate(
 		HistoryServiceMsgRadius(),
 		st::roundedBg)) {
 	_context->monthValue(
-	) | rpl::start_with_next([=](QDate month) {
+	) | rpl::on_next([=](QDate month) {
 		_text = langMonthOfYearFull(month.month(), month.year());
 		const auto width = st::msgServiceFont->width(_text);
 		const auto rect = QRect(0, 0, width, st::msgServiceFont->height);
@@ -427,7 +627,7 @@ CalendarBox::FloatingDate::FloatingDate(
 	}, _widget.lifetime());
 
 	_widget.paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		paint();
 	}, _widget.lifetime());
 
@@ -464,20 +664,43 @@ CalendarBox::Inner::Inner(
 	QWidget *parent,
 	not_null<Context*> context,
 	const style::CalendarSizes &st,
-	const style::CalendarColors &styleColors)
+	const style::CalendarColors &styleColors,
+	Fn<void(QDate, CalendarImageSetter)> dynamicImageForDate)
 : RpWidget(parent)
 , _st(st)
 , _styleColors(styleColors)
-, _context(context) {
+, _context(context)
+, _dynamicImageForDate(std::move(dynamicImageForDate))
+, _animation([=](crl::time now) {
+	auto animating = false;
+	for (auto &[date, state] : _dynamicImageStates) {
+		if (!state.animating()) {
+			continue;
+		}
+		const auto dt = std::clamp(
+			(now - state.animationStart) / float64(st::fadeWrapDuration),
+			0.,
+			1.);
+		state.animation.update(dt, anim::linear);
+		if (dt >= 1.) {
+			state.animationStart = 0;
+			state.animationFinished = true;
+		} else {
+			animating = true;
+		}
+	}
+	update();
+	return animating;
+}) {
 	setMouseTracking(true);
 
 	context->monthValue(
-	) | rpl::start_with_next([=](QDate month) {
+	) | rpl::on_next([=](QDate month) {
 		monthChanged(month);
 	}, lifetime());
 
 	context->selectionUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 }
@@ -485,11 +708,47 @@ CalendarBox::Inner::Inner(
 void CalendarBox::Inner::monthChanged(QDate month) {
 	setSelected(kEmptySelection);
 	_ripples.clear();
+	for (auto &[date, state] : _dynamicImageStates) {
+		state.requested = false;
+	}
+	loadDynamicImages();
 	resizeToCurrent();
 	update();
 	SendSynteticMouseEvent(this, QEvent::MouseMove, Qt::NoButton);
 }
 
+void CalendarBox::Inner::loadDynamicImages() {
+	if (!_dynamicImageForDate) {
+		return;
+	}
+	const auto currentMonth = _context->month();
+	const auto prevMonth = currentMonth.addMonths(-1);
+	const auto nextMonth = currentMonth.addMonths(1);
+
+	const auto matchesMonth = [&](const QDate &d, const QDate &month) {
+		return d.year() == month.year() && d.month() == month.month();
+	};
+	const auto from = -_context->daysShift();
+	const auto till = from + _context->rowsCount() * kDaysInWeek;
+	for (auto i = from; i != till; ++i) {
+		const auto date = _context->dateFromIndex(i);
+		if (matchesMonth(date, currentMonth)
+			|| matchesMonth(date, prevMonth)
+			|| matchesMonth(date, nextMonth)) {
+			auto &state = _dynamicImageStates[date];
+			if (state.image || state.requested) {
+				continue;
+			}
+			state.requested = true;
+			_dynamicImageForDate(
+				date,
+				[=](QDate imageDate, std::shared_ptr<DynamicImage> image) {
+					setDynamicImage(imageDate, std::move(image));
+				});
+		}
+	}
+}
+
 void CalendarBox::Inner::resizeToCurrent() {
 	const auto height = _context->rowsCount() * _st.cellSize.height();
 	resize(_st.width, _st.padding.top() + height + _st.padding.bottom());
@@ -566,6 +825,46 @@ void CalendarBox::Inner::paintRows(QPainter &p, QRect clip) {
 			const auto enabled = _context->isEnabled(index);
 			const auto innerLeft = x + innerSkipLeft;
 			const auto innerTop = y + innerSkipTop;
+			const auto date = _context->dateFromIndex(index);
+			auto dynamicImageProgress = -1.;
+			if (const auto it = _dynamicImageStates.find(date);
+					it != end(_dynamicImageStates)) {
+				auto &state = it->second;
+				if (state.image) {
+					if (!state.animating() && !state.animationFinished) {
+						state.animation = anim::value(0., 1.);
+						state.animationStart = crl::now();
+						if (!_animation.animating()) {
+							_animation.start();
+						}
+					}
+					auto image = state.image->image(_st.cellInner);
+					if (!image.isNull()) {
+						const auto opacity = grayedOut ? 0.5 : 1.;
+						const auto alpha = state.animating()
+							? state.animation.current()
+							: 1.;
+						dynamicImageProgress = alpha;
+						if (alpha > 0.) {
+							auto hq = PainterHighQualityEnabler(p);
+							p.setOpacity(alpha * opacity);
+							const auto imgRect = myrtlrect(
+								innerLeft,
+								innerTop,
+								_st.cellInner,
+								_st.cellInner);
+							p.drawImage(
+								imgRect,
+								Images::Circle(std::move(image)));
+							p.setPen(Qt::NoPen);
+							p.setBrush(st::songCoverOverlayFg);
+							p.drawEllipse(imgRect);
+							p.setBrush(Qt::NoBrush);
+							p.setOpacity(1.);
+						}
+					}
+				}
+			}
 			if (highlighted) {
 				auto hq = PainterHighQualityEnabler(p);
 				p.setPen(Qt::NoPen);
@@ -575,7 +874,9 @@ void CalendarBox::Inner::paintRows(QPainter &p, QRect clip) {
 			}
 			const auto it = _ripples.find(index);
 			if (it != _ripples.cend() && !selectionMode) {
-				const auto colorOverride = (!highlighted
+				const auto colorOverride = ((dynamicImageProgress != -1)
+					? st::shadowFg
+					: !highlighted
 					? _styleColors.rippleColor
 					: grayedOut
 					? _styleColors.rippleGrayedOutColor
@@ -596,6 +897,15 @@ void CalendarBox::Inner::paintRows(QPainter &p, QRect clip) {
 					? _styleColors.dayTextGrayedOutColor
 					: _styleColors.dayTextColor)
 				: st::windowSubTextFg);
+			if (dynamicImageProgress != -1) {
+				auto pen = p.pen();
+				pen.setColor(
+					anim::color(
+						pen.color(),
+						st::activeButtonFg->c,
+						dynamicImageProgress));
+				p.setPen(std::move(pen));
+			}
 			p.drawText(rect, _context->labelFromIndex(index), style::al_center);
 		}
 	}
@@ -641,6 +951,13 @@ void CalendarBox::Inner::setSelected(int selected) {
 	if (selected != kEmptySelection && !_context->isEnabled(selected)) {
 		selected = kEmptySelection;
 	}
+	if (selected != kEmptySelection && _requireImage) {
+		const auto date = _context->dateFromIndex(selected);
+		const auto it = _dynamicImageStates.find(date);
+		if (it == end(_dynamicImageStates) || !it->second.image) {
+			selected = kEmptySelection;
+		}
+	}
 	_selected = selected;
 	const auto pointer = (_selected != kEmptySelection);
 	const auto force = (_mouseMoved && _cursorSetWithoutMouseMove);
@@ -728,9 +1045,26 @@ void CalendarBox::Inner::setDateChosenCallback(Fn<void(QDate)> callback) {
 	_dateChosenCallback = std::move(callback);
 }
 
+void CalendarBox::Inner::setDynamicImage(
+		QDate date,
+		std::shared_ptr<DynamicImage> image) {
+	auto &state = _dynamicImageStates[date];
+	if (image) {
+		state.image = std::move(image);
+		state.image->subscribeToUpdates([=] { update(); });
+	} else {
+		_dynamicImageStates.remove(date);
+	}
+	update();
+}
+
+void CalendarBox::Inner::setRequireImage(bool require) {
+	_requireImage = require;
+}
+
 CalendarBox::Inner::~Inner() = default;
 
-class CalendarBox::Title final : public RpWidget {
+class CalendarBox::Title final : public AbstractButton {
 public:
 	Title(
 		QWidget *parent,
@@ -761,7 +1095,7 @@ CalendarBox::Title::Title(
 	not_null<Context*> context,
 	const style::CalendarSizes &st,
 	const style::CalendarColors &styleColors)
-: RpWidget(parent)
+: AbstractButton(parent)
 , _st(st)
 , _styleColors(styleColors)
 , _context(context) {
@@ -771,21 +1105,26 @@ CalendarBox::Title::Title(
 	_context->monthValue(
 	) | rpl::filter([=] {
 		return !_context->selectionMode();
-	}) | rpl::start_with_next([=](QDate date) {
+	}) | rpl::on_next([=](QDate date) {
 		setTextFromMonth(date);
 	}, lifetime());
 
 	_context->selectionUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_context->selectionMode()) {
 			setTextFromMonth(_context->month());
-		} else if (!_context->selectedMin()) {
-			setText(tr::lng_calendar_select_days(tr::now));
+			setAttribute(Qt::WA_TransparentForMouseEvents, false);
 		} else {
-			setText(tr::lng_calendar_days(
-				tr::now,
-				lt_count,
-				(1 + *_context->selectedMax() - *_context->selectedMin())));
+			setAttribute(Qt::WA_TransparentForMouseEvents, true);
+			if (!_context->selectedMin()) {
+				setText(tr::lng_calendar_select_days(tr::now));
+			} else {
+				setText(tr::lng_calendar_days(
+					tr::now,
+					lt_count,
+					(1 + *_context->selectedMax()
+						- *_context->selectedMin())));
+			}
 		}
 	}, lifetime());
 }
@@ -805,10 +1144,24 @@ void CalendarBox::Title::paintEvent(QPaintEvent *e) {
 
 	const auto clip = e->rect();
 
+	const auto triangleSize = st::lineWidth * 6;
+	const auto triangleX = _textLeft;
+	const auto triangleY = (st::calendarTitleHeight
+		- st::calendarTitleFont->height) / 2
+		+ st::calendarTitleFont->height / 2;
+	auto triangle = QPainterPath();
+	triangle.moveTo(triangleX, triangleY - triangleSize / 2);
+	triangle.lineTo(triangleX + triangleSize, triangleY);
+	triangle.lineTo(triangleX, triangleY + triangleSize / 2);
+	triangle.closeSubpath();
+	p.setPen(Qt::NoPen);
+	p.setBrush(st::windowSubTextFg);
+	p.drawPath(triangle);
+
 	p.setFont(st::calendarTitleFont);
 	p.setPen(_styleColors.titleTextColor);
 	p.drawTextLeft(
-		_textLeft,
+		_textLeft + triangleSize * 2,
 		(st::calendarTitleHeight - st::calendarTitleFont->height) / 2,
 		width(),
 		_text,
@@ -825,12 +1178,14 @@ void CalendarBox::Title::paintDayNames(Painter &p, QRect clip) {
 	if (!myrtlrect(x, y, _st.cellSize.width() * kDaysInWeek, _st.daysHeight).intersects(clip)) {
 		return;
 	}
-	for (auto i = 0; i != kDaysInWeek; ++i, x += _st.cellSize.width()) {
+	const auto from = _context->firstDayOfWeek();
+	const auto to = from + kDaysInWeek;
+	for (auto i = from; i != to; ++i, x += _st.cellSize.width()) {
 		auto rect = myrtlrect(x, y, _st.cellSize.width(), _st.daysHeight);
 		if (!rect.intersects(clip)) {
 			continue;
 		}
-		p.drawText(rect, langDayOfWeek(i + 1), style::al_top);
+		p.drawText(rect, langDayOfWeek(((i - 1) % 7) + 1), style::al_top);
 	}
 }
 
@@ -844,7 +1199,8 @@ CalendarBox::CalendarBox(QWidget*, CalendarBoxArgs &&args)
 	this,
 	_context.get(),
 	_st,
-	_styleColors)))
+	_styleColors,
+	std::move(args.dynamicImageForDate))))
 , _title(this, _context.get(), _st, _styleColors)
 , _previous(this, _styleColors.iconButtonPrevious)
 , _next(this, _styleColors.iconButtonNext)
@@ -852,15 +1208,33 @@ CalendarBox::CalendarBox(QWidget*, CalendarBoxArgs &&args)
 , _finalize(std::move(args.finalize))
 , _jumpTimer([=] { jump(_jumpButton); })
 , _selectionChanged(std::move(args.selectionChanged)) {
-	_title->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_inner->setRequireImage(args.requireImage);
 	_context->setAllowsSelection(args.allowsSelection);
 	_context->setMinDate(args.minDate);
 	_context->setMaxDate(args.maxDate);
 
+	_title->setClickedCallback([=,
+			minDate = args.minDate,
+			maxDate = args.maxDate] {
+		BoxContent::uiShow()->show(Box([=](not_null<GenericBox*> box) {
+			FillMonthYearPicker(
+				box,
+				_context->month(),
+				minDate,
+				maxDate,
+				_st,
+				[=](QDate date) {
+					_watchScroll = false;
+					_context->showMonth(date);
+					setExactScroll();
+				});
+		}), LayerOption::KeepOther);
+	});
+
 	_scroll->scrolls(
 	) | rpl::filter([=] {
 		return _watchScroll;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		processScroll();
 	}, lifetime());
 
@@ -870,7 +1244,7 @@ CalendarBox::CalendarBox(QWidget*, CalendarBoxArgs &&args)
 		button->events(
 		) | rpl::filter([=] {
 			return *enabled;
-		}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		}) | rpl::on_next([=](not_null<QEvent*> e) {
 			const auto type = e->type();
 			if (type == QEvent::MouseMove
 				&& !(static_cast<QMouseEvent*>(e.get())->buttons()
@@ -893,7 +1267,7 @@ CalendarBox::CalendarBox(QWidget*, CalendarBoxArgs &&args)
 	setupJumps(_next.data(), &_nextEnabled);
 
 	_context->selectionUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_context->selectionMode()) {
 			_floatingDate = nullptr;
 		} else if (!_floatingDate) {
@@ -903,7 +1277,7 @@ CalendarBox::CalendarBox(QWidget*, CalendarBoxArgs &&args)
 			rpl::combine(
 				_scroll->geometryValue(),
 				_floatingDate->widthValue()
-			) | rpl::start_with_next([=](QRect scroll, int width) {
+			) | rpl::on_next([=](QRect scroll, int width) {
 				const auto shift = _st.daysHeight
 					- _st.padding.top()
 					- st::calendarDaysFont->height;
@@ -931,6 +1305,12 @@ QDate CalendarBox::selectedLastDate() const {
 	return max.has_value() ? _context->dateFromIndex(*max) : QDate();
 }
 
+void CalendarBox::setDynamicImage(
+		QDate date,
+		std::shared_ptr<DynamicImage> image) {
+	_inner->setDynamicImage(date, std::move(image));
+}
+
 void CalendarBox::showJumpTooltip(not_null<IconButton*> button) {
 	_tooltipButton = button;
 	Ui::Tooltip::Show(kTooltipDelay, this);
@@ -961,16 +1341,19 @@ void CalendarBox::prepare() {
 	_previous->setClickedCallback([=] { goPreviousMonth(); });
 	_next->setClickedCallback([=] { goNextMonth(); });
 
-	_inner->setDateChosenCallback(std::move(_callback));
+	_inner->setDateChosenCallback([=, c = std::move(_callback)](
+			const QDate &date) {
+		c(date, crl::guard(this, [=] { closeBox(); }));
+	});
 
 	_context->monthValue(
-	) | rpl::start_with_next([=](QDate month) {
+	) | rpl::on_next([=](QDate month) {
 		monthChanged(month);
 	}, lifetime());
 	setExactScroll();
 
 	_context->selectionUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_selectionMode = _context->selectionMode();
 		if (_selectionChanged) {
 			const auto count = !_selectionMode
diff --git a/Telegram/SourceFiles/ui/boxes/calendar_box.h b/Telegram/SourceFiles/ui/boxes/calendar_box.h
index 3cfdbf622109ff..cf65aee6f68320 100644
--- a/Telegram/SourceFiles/ui/boxes/calendar_box.h
+++ b/Telegram/SourceFiles/ui/boxes/calendar_box.h
@@ -29,6 +29,10 @@ namespace Ui {
 class IconButton;
 class ScrollArea;
 class CalendarBox;
+class DynamicImage;
+
+using CalendarImageSetter = Fn<void(QDate, std::shared_ptr<DynamicImage>)>;
+using JumpCallback = Fn<void(QDate date, Fn<void()> close)>;
 
 struct CalendarBoxArgs {
 	template <typename T>
@@ -36,7 +40,7 @@ struct CalendarBoxArgs {
 
 	required<QDate> month;
 	required<QDate> highlighted;
-	required<Fn<void(QDate date)>> callback;
+	required<JumpCallback> callback;
 	FnMut<void(not_null<CalendarBox*>)> finalize;
 	const style::CalendarSizes &st = st::defaultCalendarSizes;
 	QDate minDate;
@@ -46,6 +50,8 @@ struct CalendarBoxArgs {
 		not_null<Ui::CalendarBox*>,
 		std::optional<int>)> selectionChanged;
 	const style::CalendarColors &stColors = st::defaultCalendarColors;
+	Fn<void(QDate, CalendarImageSetter)> dynamicImageForDate;
+	bool requireImage = false;
 };
 
 class CalendarBox final : public BoxContent, private AbstractTooltipShower {
@@ -58,6 +64,8 @@ class CalendarBox final : public BoxContent, private AbstractTooltipShower {
 	[[nodiscard]] QDate selectedFirstDate() const;
 	[[nodiscard]] QDate selectedLastDate() const;
 
+	void setDynamicImage(QDate date, std::shared_ptr<DynamicImage> image);
+
 protected:
 	void prepare() override;
 
@@ -105,7 +113,7 @@ class CalendarBox final : public BoxContent, private AbstractTooltipShower {
 	bool _previousEnabled = false;
 	bool _nextEnabled = false;
 
-	Fn<void(QDate date)> _callback;
+	JumpCallback _callback;
 	FnMut<void(not_null<CalendarBox*>)> _finalize;
 	bool _watchScroll = false;
 
diff --git a/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp b/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp
index 8651b5b01071ec..9b3619ee0cfcf3 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp
@@ -10,8 +10,14 @@ For license and copyright information please follow this link:
 #include "base/unixtime.h"
 #include "base/event_filter.h"
 #include "ui/boxes/calendar_box.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/painter.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
 #include "ui/widgets/time_input.h"
 #include "ui/ui_utility.h"
 #include "lang/lang_keys.h"
@@ -26,12 +32,19 @@ namespace {
 constexpr auto kMinimalSchedule = TimeId(10);
 
 QString DayString(const QDate &date) {
-	return tr::lng_month_day(
-		tr::now,
-		lt_month,
-		Lang::MonthDay(date.month())(tr::now),
-		lt_day,
-		QString::number(date.day()));
+	const auto month = Lang::MonthDay(date.month())(tr::now);
+	const auto day = QString::number(date.day());
+	if (date.year() != QDate::currentDate().year()) {
+		return tr::lng_month_day_year(
+			tr::now,
+			lt_month,
+			month,
+			lt_day,
+			day,
+			lt_year,
+			QString::number(date.year()));
+	}
+	return tr::lng_month_day(tr::now, lt_month, month, lt_day, day);
 }
 
 QString TimeString(QTime time) {
@@ -40,6 +53,62 @@ QString TimeString(QTime time) {
 	).arg(time.minute(), 2, 10, QLatin1Char('0'));
 }
 
+class RepeatButton final : public Ui::RippleButton {
+public:
+	explicit RepeatButton(not_null<QWidget*> parent);
+
+	void setMarkedText(TextWithEntities text);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+	QImage prepareRippleMask() const override;
+
+private:
+	const not_null<Ui::FlatLabel*> _label;
+
+};
+
+RepeatButton::RepeatButton(not_null<QWidget*> parent)
+: RippleButton(parent, st::defaultRippleAnimation)
+, _label(Ui::CreateChild<Ui::FlatLabel>(this, st::scheduleRepeatLabel)) {
+	_label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	setPointerCursor(true);
+
+	_label->naturalWidthValue() | rpl::on_next([=](int natural) {
+		_label->resizeToWidth(natural);
+	}, lifetime());
+
+	_label->sizeValue() | rpl::on_next([=](QSize size) {
+		const auto padding = st::scheduleRepeatTextPadding;
+		const auto height = st::scheduleRepeatHeight;
+		resize(size.width() + 2 * padding, height);
+		_label->moveToLeft(padding, (height - size.height()) / 2);
+	}, lifetime());
+}
+
+void RepeatButton::setMarkedText(TextWithEntities text) {
+	_label->setMarkedText(std::move(text));
+}
+
+void RepeatButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	const auto radius = st::scheduleRepeatRadius;
+	{
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::windowBgOver);
+		p.drawRoundedRect(rect(), radius, radius);
+	}
+	paintRipple(p, QPoint());
+}
+
+QImage RepeatButton::prepareRippleMask() const {
+	return Ui::RippleAnimation::RoundRectMask(
+		size(),
+		st::scheduleRepeatRadius);
+}
+
 } // namespace
 
 ChooseDateTimeStyleArgs::ChooseDateTimeStyleArgs()
@@ -56,6 +125,7 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 		ChooseDateTimeBoxArgs &&args) {
 	struct State {
 		rpl::variable<QDate> date;
+		rpl::variable<int> width;
 		not_null<InputField*> day;
 		not_null<TimeInput*> time;
 		not_null<FlatLabel*> at;
@@ -64,14 +134,23 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 	box->setWidth(st::boxWideWidth);
 
 	const auto content = box->addRow(
-		object_ptr<FixedHeightWidget>(box, st::scheduleHeight));
+		object_ptr<FixedHeightWidget>(box, st::scheduleHeight),
+		style::al_top);
 	if (args.description) {
 		box->addRow(object_ptr<FlatLabel>(
 			box,
 			std::move(args.description),
 			*args.style.labelStyle));
 	}
-	const auto parsed = base::unixtime::parse(args.time);
+	const auto min = args.min ? args.min : [] {
+		return base::unixtime::now() + kMinimalSchedule;
+	};
+	const auto max = args.max ? args.max : [] {
+		return base::unixtime::serialize(
+			QDateTime::currentDateTime().addYears(1)) - 1;
+	};
+	const auto parsed = base::unixtime::parse(
+		std::clamp(args.time, min(), max()));
 	const auto state = box->lifetime().make_state<State>(State{
 		.date = parsed.date(),
 		.day = CreateChild<InputField>(
@@ -90,19 +169,16 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 			*args.style.atStyle),
 	});
 
+	const auto dayEdit = state->day->rawTextEdit().get();
+	const auto dayAlign = args.style.dateFieldStyle->textAlign;
+
 	state->date.value(
-	) | rpl::start_with_next([=](QDate date) {
+	) | rpl::on_next([=](QDate date) {
 		state->day->setText(DayString(date));
+		dayEdit->setAlignment(dayAlign);
 		state->time->setFocusFast();
 	}, state->day->lifetime());
 
-	const auto min = args.min ? args.min : [] {
-		return base::unixtime::now() + kMinimalSchedule;
-	};
-	const auto max = args.max ? args.max : [] {
-		return base::unixtime::serialize(
-			QDateTime::currentDateTime().addYears(1)) - 1;
-	};
 	const auto minDate = [=] {
 		return base::unixtime::parse(min()).date();
 	};
@@ -125,8 +201,18 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 		return base::EventFilterResult::Continue;
 	});
 
+	state->at->widthValue() | rpl::on_next([=](int width) {
+		const auto full = st::scheduleDateWidth
+			+ st::scheduleAtSkip
+			+ width
+			+ st::scheduleAtSkip
+			+ st::scheduleTimeWidth;
+		content->setNaturalWidth(full);
+		state->width = full;
+	}, state->at->lifetime());
+
 	content->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto paddings = width
 			- state->at->width()
 			- 2 * st::scheduleAtSkip
@@ -147,10 +233,10 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 	}, content->lifetime());
 
 	const auto calendar
-		= content->lifetime().make_state<QPointer<CalendarBox>>();
+		= content->lifetime().make_state<base::weak_qptr<CalendarBox>>();
 	const auto calendarStyle = args.style.calendarStyle;
 	state->day->focusedChanges(
-	) | rpl::start_with_next([=](bool focused) {
+	) | rpl::on_next([=](bool focused) {
 		if (*calendar || !focused) {
 			return;
 		}
@@ -158,16 +244,18 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 			Box<CalendarBox>(Ui::CalendarBoxArgs{
 				.month = state->date.current(),
 				.highlighted = state->date.current(),
-				.callback = crl::guard(box, [=](QDate chosen) {
+				.callback = crl::guard(box, [=](
+						QDate chosen,
+						Fn<void()> close) {
 					state->date = chosen;
-					(*calendar)->closeBox();
+					close();
 				}),
 				.minDate = minDate(),
 				.maxDate = maxDate(),
 				.stColors = *calendarStyle,
 			}));
 		(*calendar)->boxClosing(
-		) | rpl::start_with_next(crl::guard(state->time, [=] {
+		) | rpl::on_next(crl::guard(state->time, [=] {
 			state->time->setFocusFast();
 		}), (*calendar)->lifetime());
 	}, state->day->lifetime());
@@ -196,10 +284,11 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 		}
 	};
 	state->time->submitRequests(
-	) | rpl::start_with_next(save, state->time->lifetime());
+	) | rpl::on_next(save, state->time->lifetime());
 
 	auto result = ChooseDateTimeBoxDescriptor();
 	box->setFocusCallback([=] { state->time->setFocusFast(); });
+	result.width = state->width.value();
 	result.submit = box->addButton(std::move(args.submit), save);
 	result.collect = [=] {
 		if (const auto result = collect()) {
@@ -217,4 +306,115 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 	return result;
 }
 
+object_ptr<Ui::RpWidget> ChooseRepeatPeriod(
+		not_null<Ui::RpWidget*> parent,
+		ChooseRepeatPeriodArgs &&args) {
+	auto result = object_ptr<Ui::RpWidget>(parent.get());
+	const auto raw = result.data();
+
+	struct Entry {
+		TimeId value = 0;
+		QString text;
+	};
+	auto map = std::vector<Entry>{
+		{ 0, tr::lng_schedule_repeat_never(tr::now) },
+		{ 24 * 60 * 60, tr::lng_schedule_repeat_daily(tr::now) },
+		{ 7 * 24 * 60 * 60, tr::lng_schedule_repeat_weekly(tr::now) },
+		{ 14 * 24 * 60 * 60, tr::lng_schedule_repeat_biweekly(tr::now) },
+		{ 30 * 24 * 60 * 60, tr::lng_schedule_repeat_monthly(tr::now) },
+		{
+			91 * 24 * 60 * 60,
+			tr::lng_schedule_repeat_every_month(tr::now, lt_count, 3)
+		},
+		{
+			182 * 24 * 60 * 60,
+			tr::lng_schedule_repeat_every_month(tr::now, lt_count, 6)
+		},
+		{ 365 * 24 * 60 * 60, tr::lng_schedule_repeat_yearly(tr::now) },
+	};
+	if (args.test) {
+		map.insert(begin(map) + 1, Entry{ 300, u"Every 5 minutes"_q });
+		map.insert(begin(map) + 1, Entry{ 60, u"Every minute"_q });
+	}
+
+	const auto button = Ui::CreateChild<RepeatButton>(raw);
+	rpl::combine(
+		raw->widthValue(),
+		button->sizeValue()
+	) | rpl::on_next([=](int outer, QSize size) {
+		raw->resize(outer, size.height());
+		button->moveToLeft((outer - size.width()) / 2, 0, outer);
+	}, raw->lifetime());
+
+	struct State {
+		rpl::variable<TimeId> value;
+		rpl::variable<bool> locked;
+		std::unique_ptr<Ui::PopupMenu> menu;
+	};
+	const auto state = raw->lifetime().make_state<State>(State{
+		.value = args.value,
+		.locked = std::move(args.locked),
+	});
+
+	rpl::combine(
+		state->value.value(),
+		state->locked.value()
+	) | rpl::on_next([=](TimeId value, bool locked) {
+		auto result = tr::lng_schedule_repeat_label(
+			tr::now,
+			tr::marked);
+
+		const auto text = [&] {
+			const auto i = ranges::lower_bound(
+				map,
+				value,
+				ranges::less{},
+				&Entry::value);
+			return (i != end(map)) ? i->text : map.back().text;
+		}();
+
+		button->setMarkedText(result.append(' ').append(
+			tr::bold(text).append(
+				Ui::Text::IconEmoji(locked
+					? &st::scheduleRepeatDropdownLock
+					: &st::scheduleRepeatDropdownArrow))));
+		return result;
+	}, button->lifetime());
+
+	button->setClickedCallback([=] {
+		if (args.filter && args.filter()) {
+			return;
+		}
+		const auto changed = args.changed;
+
+		state->menu = std::make_unique<Ui::PopupMenu>(button);
+		const auto menu = state->menu.get();
+
+		menu->setDestroyedCallback(crl::guard(button, [=] {
+			if (state->menu.get() == menu) {
+				state->menu.release();
+			}
+		}));
+		for (const auto &entry : map) {
+			const auto value = entry.value;
+			menu->addAction(entry.text, [=] {
+				state->value = value;
+				changed(value);
+			});
+		}
+		menu->setForcedOrigin(Ui::PanelAnimation::Origin::BottomLeft);
+		const auto anchor = button->mapToGlobal(
+			QPoint(button->width() / 2, 0));
+		if (menu->prepareGeometryFor(anchor)) {
+			menu->move(
+				anchor.x() - menu->width() / 2,
+				menu->y()
+					- Ui::BoxShadow::ExtendFor(menu->st().shadow).bottom());
+			menu->popupPrepared();
+		}
+	});
+
+	return result;
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/choose_date_time.h b/Telegram/SourceFiles/ui/boxes/choose_date_time.h
index 1a12c7ffa1d4be..da2eac33d5ca3e 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_date_time.h
+++ b/Telegram/SourceFiles/ui/boxes/choose_date_time.h
@@ -23,6 +23,7 @@ struct ChooseDateTimeBoxDescriptor {
 	QPointer<RoundButton> submit;
 	Fn<TimeId()> collect;
 	rpl::producer<TimeId> values;
+	rpl::producer<int> width;
 };
 
 struct ChooseDateTimeStyleArgs {
@@ -50,4 +51,16 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 	not_null<GenericBox*> box,
 	ChooseDateTimeBoxArgs &&args);
 
+struct ChooseRepeatPeriodArgs {
+	TimeId value = 0;
+	rpl::variable<bool> locked;
+	Fn<bool()> filter;
+	Fn<void(TimeId)> changed;
+	bool test = false;
+};
+
+[[nodiscard]] object_ptr<Ui::RpWidget> ChooseRepeatPeriod(
+	not_null<Ui::RpWidget*> parent,
+	ChooseRepeatPeriodArgs &&args);
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
index becdc96265c70a..bc1cbb69b0a23f 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
@@ -32,8 +32,6 @@ namespace Ui {
 namespace {
 
 constexpr auto kMinTextWidth = 120;
-constexpr auto kMaxTextWidth = 320;
-constexpr auto kMaxTextLines = 3;
 
 struct PreviewRequest {
 	QString family;
@@ -179,13 +177,13 @@ Selector::Selector(
 , _rowHeight(_st.height + _st.padding.top() + _st.padding.bottom()) {
 	setMouseTracking(true);
 
-	std::move(filter) | rpl::start_with_next([=](const QString &query) {
+	std::move(filter) | rpl::on_next([=](const QString &query) {
 		applyFilter(query);
 	}, _lifetime);
 
 	std::move(
 		submits
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_selected >= 0) {
 			choose(shownRowAt(_selected));
 		} else if (searching() && !_filtered.empty()) {
@@ -488,7 +486,7 @@ void Selector::mousePressEvent(QMouseEvent *e) {
 void Selector::mouseReleaseEvent(QMouseEvent *e) {
 	const auto pressed = _pressed;
 	updatePressed(-1);
-	if (pressed == _selected) {
+	if (pressed >= 0 && pressed == _selected) {
 		choose(shownRowAt(pressed));
 	}
 }
@@ -585,7 +583,7 @@ PreviewPainter::PreviewPainter(const QImage &bg, PreviewRequest request)
 : _request(request)
 , _msgBg(_request.msgBg)
 , _msgShadow(_request.msgShadow)
-, _nameFontOwned(_request.family, style::FontFlag::Semibold, st::fsize)
+, _nameFontOwned(_request.family, style::FontFlag::Bold, st::fsize)
 , _nameFont(_nameFontOwned.font())
 , _nameStyle(st::semiboldTextStyle)
 , _textFontOwned(_request.family, 0, st::fsize)
@@ -803,14 +801,14 @@ void PreviewPainter::layout() {
 	const auto state = raw->lifetime().make_state<State>();
 
 	state->bg = generatePreviewBg();
-	style::PaletteChanged() | rpl::start_with_next([=] {
+	style::PaletteChanged() | rpl::on_next([=] {
 		state->bg = generatePreviewBg();
 	}, raw->lifetime());
 
 	rpl::combine(
 		rpl::single(rpl::empty) | rpl::then(style::PaletteChanged()),
 		std::move(family)
-	) | rpl::start_with_next([=](const auto &, QString family) {
+	) | rpl::on_next([=](const auto &, QString family) {
 		state->family = family;
 		if (state->preview.isNull()) {
 			state->preview = GeneratePreview(
@@ -819,7 +817,7 @@ void PreviewPainter::layout() {
 			const auto ratio = state->preview.devicePixelRatio();
 			raw->resize(state->preview.size() / int(ratio));
 		} else {
-			const auto weak = Ui::MakeWeak(raw);
+			const auto weak = base::make_weak(raw);
 			const auto request = PrepareRequest(family);
 			crl::async([=, bg = state->bg] {
 				crl::on_main([
@@ -827,7 +825,7 @@ void PreviewPainter::layout() {
 					state,
 					preview = GeneratePreview(bg, request)
 				]() mutable {
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						state->preview = std::move(preview);
 						const auto ratio = state->preview.devicePixelRatio();
 						strong->resize(
@@ -840,7 +838,7 @@ void PreviewPainter::layout() {
 		}
 	}, raw->lifetime());
 
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(raw).drawImage(0, 0, state->preview);
 	}, raw->lifetime());
 
@@ -922,7 +920,7 @@ void ChooseFontBox(
 	rpl::combine(
 		box->heightValue(),
 		top->heightValue()
-	) | rpl::start_with_next([=](int box, int top) {
+	) | rpl::on_next([=](int box, int top) {
 		selector->setMinHeight(box - top);
 	}, selector->lifetime());
 
@@ -953,7 +951,7 @@ void ChooseFontBox(
 		});
 	};
 	state->family.value(
-	) | rpl::start_with_next(refreshButtons, box->lifetime());
+	) | rpl::on_next(refreshButtons, box->lifetime());
 
 	box->setFocusCallback([=] {
 		filter->setInnerFocus();
diff --git a/Telegram/SourceFiles/ui/boxes/choose_language_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_language_box.cpp
index ef7604fcb19524..40212beb138dbc 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_language_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_language_box.cpp
@@ -320,7 +320,7 @@ void ChooseLanguageBox(
 			})));
 
 			button->entity()->toggledChanges(
-			) | rpl::start_with_next([=](bool value) {
+			) | rpl::on_next([=](bool value) {
 				if (toggleCheck && !toggleCheck(id)) {
 					state->toggles.fire({ .id = id, .selected = !value });
 				}
@@ -349,7 +349,7 @@ void ChooseLanguageBox(
 			tr::lng_languages_none(),
 			st::membersAbout);
 		box->verticalLayout()->geometryValue(
-		) | rpl::start_with_next([=](const QRect &geometry) {
+		) | rpl::on_next([=](const QRect &geometry) {
 			const auto shown = (geometry.height() <= 0);
 			label->setVisible(shown);
 			if (shown) {
diff --git a/Telegram/SourceFiles/ui/boxes/choose_time.cpp b/Telegram/SourceFiles/ui/boxes/choose_time.cpp
index 488c1c0d3b14f4..251d979af6054c 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_time.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_time.cpp
@@ -18,7 +18,8 @@ namespace Ui {
 
 ChooseTimeResult ChooseTimeWidget(
 		not_null<RpWidget*> parent,
-		TimeId startSeconds) {
+		TimeId startSeconds,
+		bool hiddenDaysInput) {
 	using TimeField = Ui::TimePartWithPlaceholder;
 	const auto putNext = [](not_null<TimeField*> field, QChar ch) {
 		field->setCursorPosition(0);
@@ -75,43 +76,50 @@ ChooseTimeResult ChooseTimeWidget(
 			QString::number(startMinutes)),
 	});
 
-	const auto day = Ui::MakeWeak(state->day);
-	const auto hour = Ui::MakeWeak(state->hour);
-	const auto minute = Ui::MakeWeak(state->minute);
+	const auto day = base::make_weak(state->day);
+	const auto hour = base::make_weak(state->hour);
+	const auto minute = base::make_weak(state->minute);
+
+	if (hiddenDaysInput) {
+		day->setVisible(false);
+	}
 
 	day->setPhrase(tr::lng_days);
 	day->setMaxValue(31);
 	day->setWheelStep(1);
-	day->putNext() | rpl::start_with_next([=](QChar ch) {
-		putNext(hour, ch);
+	day->putNext() | rpl::on_next([=](QChar ch) {
+		putNext(hour.get(), ch);
 	}, content->lifetime());
 
 	hour->setPhrase(tr::lng_hours);
 	hour->setMaxValue(23);
 	hour->setWheelStep(1);
-	hour->putNext() | rpl::start_with_next([=](QChar ch) {
-		putNext(minute, ch);
+	hour->putNext() | rpl::on_next([=](QChar ch) {
+		putNext(minute.get(), ch);
 	}, content->lifetime());
-	hour->erasePrevious() | rpl::start_with_next([=] {
-		erasePrevious(day);
+	hour->erasePrevious() | rpl::on_next([=] {
+		erasePrevious(day.get());
 	}, content->lifetime());
 
 	minute->setPhrase(tr::lng_minutes);
 	minute->setMaxValue(59);
 	minute->setWheelStep(10);
-	minute->erasePrevious() | rpl::start_with_next([=] {
-		erasePrevious(hour);
+	minute->erasePrevious() | rpl::on_next([=] {
+		erasePrevious(hour.get());
 	}, content->lifetime());
 
 	content->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
-		const auto inputWidth = s.width() / 3;
+	) | rpl::on_next([=](const QSize &s) {
+		const auto inputWidth = s.width() / (hiddenDaysInput ? 2 : 3);
 		auto rect = QRect(
 			0,
 			(s.height() - day->height()) / 2,
 			inputWidth,
 			day->height());
 		for (const auto &input : { day, hour, minute }) {
+			if (input->isHidden()) {
+				continue;
+			}
 			input->setGeometry(rect - st::muteBoxTimeFieldPadding);
 			rect.translate(inputWidth, 0);
 		}
@@ -119,10 +127,10 @@ ChooseTimeResult ChooseTimeWidget(
 
 	rpl::merge(
 		rpl::single(rpl::empty),
-		base::qt_signal_producer(day.data(), &MaskedInputField::changed),
-		base::qt_signal_producer(hour.data(), &MaskedInputField::changed),
-		base::qt_signal_producer(minute.data(), &MaskedInputField::changed)
-	) | rpl::start_with_next([=] {
+		base::qt_signal_producer(day.get(), &MaskedInputField::changed),
+		base::qt_signal_producer(hour.get(), &MaskedInputField::changed),
+		base::qt_signal_producer(minute.get(), &MaskedInputField::changed)
+	) | rpl::on_next([=] {
 		state->valueInSeconds = 0
 			+ day->getLastText().toUInt() * 3600 * 24
 			+ hour->getLastText().toUInt() * 3600
diff --git a/Telegram/SourceFiles/ui/boxes/choose_time.h b/Telegram/SourceFiles/ui/boxes/choose_time.h
index ca25710cf2aa55..d2f7f1ee763e3e 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_time.h
+++ b/Telegram/SourceFiles/ui/boxes/choose_time.h
@@ -20,6 +20,7 @@ struct ChooseTimeResult {
 
 ChooseTimeResult ChooseTimeWidget(
 	not_null<RpWidget*> parent,
-	TimeId startSeconds);
+	TimeId startSeconds,
+	bool hiddenDaysInput = false);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp b/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
index d76d6802d56272..f9f5698addc01b 100644
--- a/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
@@ -15,12 +15,15 @@ For license and copyright information please follow this link:
 #include "ui/layers/generic_box.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/dynamic_image.h"
 #include "ui/painter.h"
 #include "settings/settings_common.h"
 #include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h"
 #include "styles/style_layers.h"
 
 #include <QtCore/QRegularExpression>
@@ -29,8 +32,6 @@ For license and copyright information please follow this link:
 namespace Ui {
 namespace {
 
-constexpr auto kTonMultiplier = uint64(1000000000);
-
 [[nodiscard]] QString FormatEntity(CollectibleType type, QString entity) {
 	switch (type) {
 	case CollectibleType::Phone: {
@@ -47,16 +48,14 @@ constexpr auto kTonMultiplier = uint64(1000000000);
 	return langDateTime(base::unixtime::parse(date));
 }
 
-[[nodiscard]] TextWithEntities FormatPrice(
-		const CollectibleInfo &info,
-		const CollectibleDetails &details) {
+[[nodiscard]] TextWithEntities FormatPrice(const CollectibleInfo &info) {
 	auto minor = Info::ChannelEarn::MinorPart(info.cryptoAmount);
 	if (minor.size() == 1 && minor.at(0) == '.') {
 		minor += '0';
 	}
 	auto price = (info.cryptoCurrency == u"TON"_q)
-		? base::duplicate(
-			details.tonEmoji
+		? Ui::Text::IconEmoji(
+			&st::tonIconEmoji
 		).append(
 			Info::ChannelEarn::MajorPart(info.cryptoAmount)
 		).append(minor)
@@ -83,7 +82,7 @@ constexpr auto kTonMultiplier = uint64(1000000000);
 	const auto nameWidth = st->style.font->width(name);
 	const auto added = size + st->padding.left() + st->padding.right();
 	const auto subscribed = std::make_shared<bool>(false);
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		const auto use = std::min(nameWidth + added, raw->width());
 		const auto x = (raw->width() - use) / 2;
 		if (const auto available = use - added; available > 0) {
@@ -123,8 +122,7 @@ CollectibleType DetectCollectibleType(const QString &entity) {
 
 void CollectibleInfoBox(
 		not_null<Ui::GenericBox*> box,
-		CollectibleInfo info,
-		CollectibleDetails details) {
+		CollectibleInfo info) {
 	box->setWidth(st::boxWideWidth);
 	box->setStyle(st::collectibleBox);
 
@@ -134,7 +132,7 @@ void CollectibleInfoBox(
 		object_ptr<Ui::FixedHeightWidget>(box, st::collectibleIconDiameter),
 		st::collectibleIconPadding);
 	icon->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		const auto size = icon->height();
 		const auto inner = QRect(
 			(icon->width() - size) / 2,
@@ -162,11 +160,11 @@ void CollectibleInfoBox(
 		},
 		QMargins());
 	box->showFinishes(
-	) | rpl::start_with_next([animate = std::move(lottie.animate)] {
+	) | rpl::on_next([animate = std::move(lottie.animate)] {
 		animate(anim::repeat::once);
 	}, box->lifetime());
 	const auto animation = lottie.widget.release();
-	icon->sizeValue() | rpl::start_with_next([=](QSize size) {
+	icon->sizeValue() | rpl::on_next([=](QSize size) {
 		const auto skip = (type == CollectibleType::Phone)
 			? style::ConvertScale(2)
 			: 0;
@@ -180,30 +178,38 @@ void CollectibleInfoBox(
 		? tr::lng_collectible_phone_title(
 			tr::now,
 			lt_phone,
-			Ui::Text::Link(formatted),
-			Ui::Text::WithEntities)
+			tr::link(formatted),
+			tr::marked)
 		: tr::lng_collectible_username_title(
 			tr::now,
 			lt_username,
-			Ui::Text::Link(formatted),
-			Ui::Text::WithEntities);
+			tr::link(formatted),
+			tr::marked);
 	const auto copyCallback = [box, type, formatted, text = info.copyText](
 			bool copyLink) {
 		QGuiApplication::clipboard()->setText((text.isEmpty() || !copyLink)
 			? formatted
 			: text);
-		box->uiShow()->showToast((type == CollectibleType::Phone)
-			? tr::lng_collectible_phone_copied(tr::now)
-			: copyLink
-			? tr::lng_username_copied(tr::now)
-			: tr::lng_username_text_copied(tr::now));
+		const auto link = (type != CollectibleType::Phone) && copyLink;
+		box->uiShow()->showToast({
+			.text = { (type == CollectibleType::Phone)
+				? tr::lng_collectible_phone_copied(tr::now)
+				: copyLink
+				? tr::lng_username_copied(tr::now)
+				: tr::lng_username_text_copied(tr::now) },
+			.iconLottie = link
+				? u"toast/voip_invite"_q
+				: u"toast/copy"_q,
+			.iconLottieSize = st::toastLottieIconSize,
+		});
 	};
 	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			rpl::single(header),
 			st::collectibleHeader),
-		st::collectibleHeaderPadding
+		st::collectibleHeaderPadding,
+		style::al_top
 	)->setClickHandlerFilter([copyCallback](const auto &...) {
 		copyCallback(false);
 		return false;
@@ -218,13 +224,14 @@ void CollectibleInfoBox(
 			lt_date,
 			TextWithEntities{ FormatDate(info.date) },
 			lt_price,
-			FormatPrice(info, details),
-			Ui::Text::RichLangValue);
+			FormatPrice(info),
+			tr::rich);
 	const auto label = box->addRow(
 		object_ptr<Ui::FlatLabel>(box, st::collectibleInfo),
-		st::collectibleInfoPadding);
+		st::collectibleInfoPadding,
+		style::al_top);
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
-	label->setMarkedText(text, details.tonEmojiContext());
+	label->setMarkedText(text);
 
 	const auto more = box->addRow(
 		object_ptr<Ui::RoundButton>(
@@ -232,7 +239,6 @@ void CollectibleInfoBox(
 			tr::lng_collectible_learn_more(),
 			st::collectibleMore),
 		st::collectibleMorePadding);
-	more->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	more->setClickedCallback([url = info.url] {
 		File::OpenUrl(url);
 	});
@@ -245,7 +251,6 @@ void CollectibleInfoBox(
 		phrase(),
 		st::collectibleCopy);
 	const auto copy = owned.data();
-	copy->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	copy->setClickedCallback([copyCallback] {
 		copyCallback(true);
 	});
@@ -260,11 +265,11 @@ void CollectibleInfoBox(
 		box->closeBox();
 	});
 	box->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		close->moveToRight(0, 0);
 	}, box->lifetime());
 
-	box->widthValue() | rpl::start_with_next([=](int width) {
+	box->widthValue() | rpl::on_next([=](int width) {
 		more->setFullWidth(width
 			- st::collectibleMorePadding.left()
 			- st::collectibleMorePadding.right());
diff --git a/Telegram/SourceFiles/ui/boxes/collectible_info_box.h b/Telegram/SourceFiles/ui/boxes/collectible_info_box.h
index 8b80b9650beabc..2fc94dfc556f15 100644
--- a/Telegram/SourceFiles/ui/boxes/collectible_info_box.h
+++ b/Telegram/SourceFiles/ui/boxes/collectible_info_box.h
@@ -32,14 +32,6 @@ struct CollectibleInfo {
 	TimeId date = 0;
 };
 
-struct CollectibleDetails {
-	TextWithEntities tonEmoji;
-	Fn<std::any()> tonEmojiContext;
-};
-
-void CollectibleInfoBox(
-	not_null<Ui::GenericBox*> box,
-	CollectibleInfo info,
-	CollectibleDetails details);
+void CollectibleInfoBox(not_null<Ui::GenericBox*> box, CollectibleInfo info);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/confirm_box.cpp b/Telegram/SourceFiles/ui/boxes/confirm_box.cpp
index cfe7d237064a8e..6e017fe3b59b9c 100644
--- a/Telegram/SourceFiles/ui/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/confirm_box.cpp
@@ -15,7 +15,7 @@ For license and copyright information please follow this link:
 namespace Ui {
 
 void ConfirmBox(not_null<Ui::GenericBox*> box, ConfirmBoxArgs &&args) {
-	const auto weak = Ui::MakeWeak(box);
+	const auto weak = base::make_weak(box);
 	const auto lifetime = box->lifetime().make_state<rpl::lifetime>();
 
 	const auto withTitle = !v::is_null(args.title);
@@ -58,16 +58,27 @@ void ConfirmBox(not_null<Ui::GenericBox*> box, ConfirmBoxArgs &&args) {
 	};
 
 	const auto &defaultButtonStyle = box->getDelegate()->style().button;
-
+	const auto confirmTextPlain = v::is_null(args.confirmText)
+		|| v::is<rpl::producer<QString>>(args.confirmText)
+		|| v::is<QString>(args.confirmText);
 	const auto confirmButton = box->addButton(
-		v::text::take_plain(std::move(args.confirmText), tr::lng_box_ok()),
+		(confirmTextPlain
+			? v::text::take_plain(
+				std::move(args.confirmText),
+				tr::lng_box_ok())
+			: rpl::single(QString())),
 		[=, c = prepareCallback(args.confirmed)]() {
 			lifetime->destroy();
 			c();
 		},
 		args.confirmStyle ? *args.confirmStyle : defaultButtonStyle);
+	if (!confirmTextPlain) {
+		confirmButton->setText(
+			v::text::take_marked(std::move(args.confirmText)));
+	}
+
 	box->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if ((e->type() != QEvent::KeyPress) || !confirmButton) {
 			return;
 		}
@@ -87,7 +98,7 @@ void ConfirmBox(not_null<Ui::GenericBox*> box, ConfirmBoxArgs &&args) {
 			args.cancelStyle ? *args.cancelStyle : defaultButtonStyle);
 
 		box->boxClosing(
-		) | rpl::start_with_next(crl::guard(cancelButton, [=] {
+		) | rpl::on_next(crl::guard(cancelButton, [=] {
 			cancelButton->clicked(Qt::KeyboardModifiers(), Qt::LeftButton);
 		}), *lifetime);
 	}
@@ -116,12 +127,12 @@ void IconWithTitle(
 	}
 
 	icon->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		line->resize(line->width(), height);
 	}, icon->lifetime());
 
 	line->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		icon->moveToLeft(0, 0);
 		const auto skip = st::defaultBoxCheckbox.textPosition.x();
 		title->resizeToWidth(width - rect::right(icon) - skip);
diff --git a/Telegram/SourceFiles/ui/boxes/confirm_phone_box.cpp b/Telegram/SourceFiles/ui/boxes/confirm_phone_box.cpp
index e69cd3e5f3fcc3..6d8526f92a9eba 100644
--- a/Telegram/SourceFiles/ui/boxes/confirm_phone_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/confirm_phone_box.cpp
@@ -34,8 +34,6 @@ ConfirmPhoneBox::ConfirmPhoneBox(
 			tr::lng_intro_fragment_button(),
 			st::fragmentBoxButton);
 		_fragment->setClickedCallback([=] { File::OpenUrl(openUrl); });
-		_fragment->setTextTransform(
-			Ui::RoundButton::TextTransform::NoTransform);
 	}
 	if (timeout) {
 		_call.setStatus({ Ui::SentCodeCall::State::Waiting, *timeout });
@@ -51,8 +49,8 @@ void ConfirmPhoneBox::prepare() {
 		this,
 		tr::lng_confirm_phone_about(
 			lt_phone,
-			rpl::single(Ui::Text::Bold(Ui::FormatPhone(_phone))),
-			Ui::Text::WithEntities),
+			rpl::single(tr::bold(Ui::FormatPhone(_phone))),
+			tr::marked),
 		st::confirmPhoneAboutLabel);
 
 	_code.create(this, st::confirmPhoneCodeField, tr::lng_code_ph());
@@ -74,7 +72,7 @@ void ConfirmPhoneBox::prepare() {
 			+ (_fragment ? (_fragment->height() + fragmentSkip()) : 0));
 
 	_code->submits(
-	) | rpl::start_with_next([=] { sendCode(); }, _code->lifetime());
+	) | rpl::on_next([=] { sendCode(); }, _code->lifetime());
 
 	showChildren();
 }
diff --git a/Telegram/SourceFiles/ui/boxes/country_select_box.cpp b/Telegram/SourceFiles/ui/boxes/country_select_box.cpp
index bb7cc70bf50fc6..064b3d64f96fd5 100644
--- a/Telegram/SourceFiles/ui/boxes/country_select_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/country_select_box.cpp
@@ -7,15 +7,19 @@ For license and copyright information please follow this link:
 */
 #include "ui/boxes/country_select_box.h"
 
+#include "base/event_filter.h"
+#include "base/invoke_queued.h"
+#include "countries/countries_instance.h"
 #include "lang/lang_keys.h"
-#include "ui/widgets/scroll_area.h"
-#include "ui/widgets/multi_select.h"
+#include "ui/accessible/ui_accessible_item.h"
 #include "ui/effects/ripple_animation.h"
+#include "ui/widgets/multi_select.h"
+#include "ui/widgets/scroll_area.h"
 #include "ui/painter.h"
-#include "countries/countries_instance.h"
-#include "styles/style_layers.h"
+#include "ui/screen_reader_mode.h"
 #include "styles/style_boxes.h"
 #include "styles/style_intro.h"
+#include "styles/style_layers.h"
 
 #include <QtCore/QRegularExpression>
 
@@ -48,8 +52,22 @@ class CountrySelectBox::Inner : public RpWidget {
 		return _mustScrollTo.events();
 	}
 
+	QAccessible::Role accessibilityRole() override;
+	Qt::FocusPolicy accessibilityFocusPolicy() override;
+	QAccessible::Role accessibilityChildRole() const override;
+	QAccessible::State accessibilityChildState(int index) const override;
+	int accessibilityChildCount() const override;
+	QString accessibilityChildName(int index) const override;
+	QRect accessibilityChildRect(int index) const override;
+	int accessibilityChildColumnCount(int row) const override;
+	QAccessible::Role accessibilityChildSubItemRole() const override;
+	QString accessibilityChildSubItemName(int row, int column) const override;
+	QString accessibilityChildSubItemValue(int row, int column) const override;
+
 protected:
+	void focusInEvent(QFocusEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
+	void keyPressEvent(QKeyEvent *e) override;
 	void enterEventHook(QEnterEvent *e) override;
 	void leaveEventHook(QEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
@@ -65,6 +83,12 @@ class CountrySelectBox::Inner : public RpWidget {
 	void updateSelectedRow();
 	void updateRow(int index);
 	void setPressed(int pressed);
+	enum class Announce {
+		No,
+		OnChange,
+		Always,
+	};
+	void setSelected(int index, Announce announce);
 	const std::vector<Entry> &current() const;
 
 	Type _type = Type::Phones;
@@ -87,6 +111,28 @@ class CountrySelectBox::Inner : public RpWidget {
 
 };
 
+namespace {
+
+[[nodiscard]] bool ForwardListNavigation(
+		not_null<QKeyEvent*> e,
+		not_null<CountrySelectBox::Inner*> inner,
+		int pageHeight) {
+	if (e->key() == Qt::Key_Down) {
+		inner->selectSkip(1);
+	} else if (e->key() == Qt::Key_Up) {
+		inner->selectSkip(-1);
+	} else if (e->key() == Qt::Key_PageDown) {
+		inner->selectSkipPage(pageHeight, 1);
+	} else if (e->key() == Qt::Key_PageUp) {
+		inner->selectSkipPage(pageHeight, -1);
+	} else {
+		return false;
+	}
+	return true;
+}
+
+} // namespace
+
 CountrySelectBox::CountrySelectBox(QWidget*)
 : CountrySelectBox(nullptr, QString(), Type::Phones) {
 }
@@ -135,9 +181,20 @@ void CountrySelectBox::prepare() {
 	setDimensions(st::boxWidth, st::boxMaxListHeight);
 
 	_inner->mustScrollTo(
-	) | rpl::start_with_next([=](ScrollToRequest request) {
+	) | rpl::on_next([=](ScrollToRequest request) {
 		scrollToY(request.ymin, request.ymax);
 	}, lifetime());
+
+	base::install_event_filter(_select.data(), [=](not_null<QEvent*> e) {
+		if (e->type() != QEvent::KeyPress) {
+			return base::EventFilterResult::Continue;
+		}
+		const auto key = static_cast<QKeyEvent*>(e.get());
+		const auto pageHeight = height() - _select->height();
+		return ForwardListNavigation(key, _inner.data(), pageHeight)
+			? base::EventFilterResult::Cancel
+			: base::EventFilterResult::Continue;
+	});
 }
 
 void CountrySelectBox::submit() {
@@ -145,15 +202,8 @@ void CountrySelectBox::submit() {
 }
 
 void CountrySelectBox::keyPressEvent(QKeyEvent *e) {
-	if (e->key() == Qt::Key_Down) {
-		_inner->selectSkip(1);
-	} else if (e->key() == Qt::Key_Up) {
-		_inner->selectSkip(-1);
-	} else if (e->key() == Qt::Key_PageDown) {
-		_inner->selectSkipPage(height() - _select->height(), 1);
-	} else if (e->key() == Qt::Key_PageUp) {
-		_inner->selectSkipPage(height() - _select->height(), -1);
-	} else {
+	const auto pageHeight = height() - _select->height();
+	if (!ForwardListNavigation(e, _inner.data(), pageHeight)) {
 		BoxContent::keyPressEvent(e);
 	}
 }
@@ -194,7 +244,7 @@ CountrySelectBox::Inner::Inner(
 	rpl::single(
 	) | rpl::then(
 		Countries::Instance().updated()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_mustScrollTo.fire(ScrollToRequest(0, 0));
 		_list.clear();
 		_namesList.clear();
@@ -203,6 +253,8 @@ CountrySelectBox::Inner::Inner(
 		_filter = u"a"_q;
 		updateFilter(filter);
 	}, lifetime());
+
+	setAccessibleName(tr::lng_country_select(tr::now));
 }
 
 void CountrySelectBox::Inner::init() {
@@ -262,6 +314,36 @@ void CountrySelectBox::Inner::init() {
 	}
 }
 
+void CountrySelectBox::Inner::setSelected(int index, Announce announce) {
+	const auto changed = (_selected != index);
+	if (changed) {
+		updateSelectedRow();
+		_selected = index;
+		updateSelectedRow();
+	}
+	const auto shouldAnnounce = (announce == Announce::Always)
+		|| (announce == Announce::OnChange && changed);
+	if (shouldAnnounce && _selected >= 0) {
+		accessibilityChildNameChanged(_selected);
+		accessibilityChildFocused(_selected);
+	}
+}
+
+void CountrySelectBox::Inner::focusInEvent(QFocusEvent *e) {
+	if (_selected < 0 && !current().empty()) {
+		setSelected(0, Announce::No);
+	}
+	RpWidget::focusInEvent(e);
+	if (_selected >= 0) {
+		const auto index = _selected;
+		InvokeQueued(this, [=] {
+			if (_selected == index && hasFocus()) {
+				accessibilityChildFocused(index);
+			}
+		});
+	}
+}
+
 void CountrySelectBox::Inner::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 	QRect r(e->rect());
@@ -316,6 +398,32 @@ void CountrySelectBox::Inner::paintEvent(QPaintEvent *e) {
 	}
 }
 
+void CountrySelectBox::Inner::keyPressEvent(QKeyEvent *e) {
+	const auto pageHeight = parentWidget()->height();
+	if (ForwardListNavigation(e, this, pageHeight)) {
+		return;
+	}
+	const auto &list = current();
+	if (e->key() == Qt::Key_Home && !list.empty()) {
+		setSelected(0, Announce::Always);
+		_mustScrollTo.fire(ScrollToRequest(
+			st::countriesSkip,
+			st::countriesSkip + _rowHeight));
+	} else if (e->key() == Qt::Key_End && !list.empty()) {
+		const auto last = int(list.size()) - 1;
+		setSelected(last, Announce::Always);
+		_mustScrollTo.fire(ScrollToRequest(
+			st::countriesSkip + last * _rowHeight,
+			st::countriesSkip + (last + 1) * _rowHeight));
+	} else if (!e->isAutoRepeat()
+		&& (e->key() == Qt::Key_Return
+			|| e->key() == Qt::Key_Enter)) {
+		chooseCountry();
+	} else {
+		RpWidget::keyPressEvent(e);
+	}
+}
+
 void CountrySelectBox::Inner::enterEventHook(QEnterEvent *e) {
 	setMouseTracking(true);
 }
@@ -413,13 +521,12 @@ void CountrySelectBox::Inner::selectSkip(int32 dir) {
 	const auto &list = current();
 	int cur = (_selected >= 0) ? _selected : -1;
 	cur += dir;
-	if (cur <= 0) {
-		_selected = list.empty() ? -1 : 0;
-	} else if (cur >= list.size()) {
-		_selected = -1;
-	} else {
-		_selected = cur;
-	}
+	const auto next = (cur <= 0)
+		? (list.empty() ? -1 : 0)
+		: (cur >= int(list.size()))
+			? -1
+			: cur;
+	setSelected(next, Announce::Always);
 	if (_selected >= 0) {
 		_mustScrollTo.fire(ScrollToRequest(
 			st::countriesSkip + _selected * _rowHeight,
@@ -447,17 +554,18 @@ void CountrySelectBox::Inner::refresh() {
 }
 
 void CountrySelectBox::Inner::updateSelected(QPoint localPos) {
-	if (!_mouseSelection) return;
-
-	auto in = parentWidget()->rect().contains(parentWidget()->mapFromGlobal(QCursor::pos()));
-
-	const auto &list = current();
-	auto selected = (in && localPos.y() >= st::countriesSkip && localPos.y() < st::countriesSkip + list.size() * _rowHeight) ? ((localPos.y() - st::countriesSkip) / _rowHeight) : -1;
-	if (_selected != selected) {
-		updateSelectedRow();
-		_selected = selected;
-		updateSelectedRow();
+	if (!_mouseSelection) {
+		return;
 	}
+	const auto in = parentWidget()->rect().contains(
+		parentWidget()->mapFromGlobal(QCursor::pos()));
+	const auto &list = current();
+	const auto selected = (in
+		&& localPos.y() >= st::countriesSkip
+		&& localPos.y() < st::countriesSkip + int(list.size()) * _rowHeight)
+			? ((localPos.y() - st::countriesSkip) / _rowHeight)
+			: -1;
+	setSelected(selected, Announce::OnChange);
 }
 
 auto CountrySelectBox::Inner::current() const
@@ -484,4 +592,94 @@ void CountrySelectBox::Inner::setPressed(int pressed) {
 
 CountrySelectBox::Inner::~Inner() = default;
 
+QAccessible::Role CountrySelectBox::Inner::accessibilityRole() {
+	return QAccessible::List;
+}
+
+Qt::FocusPolicy CountrySelectBox::Inner::accessibilityFocusPolicy() {
+	return Qt::TabFocus;
+}
+
+QAccessible::Role CountrySelectBox::Inner::accessibilityChildRole() const {
+	return QAccessible::ListItem;
+}
+
+QAccessible::State CountrySelectBox::Inner::accessibilityChildState(
+		int index) const {
+	QAccessible::State state;
+	state.selectable = true;
+	if (Ui::ScreenReaderModeActive()) {
+		state.focusable = true;
+	}
+	if (index == _selected) {
+		state.selected = true;
+		state.active = true;
+		if (hasFocus()) {
+			state.focused = true;
+		}
+	}
+	return state;
+}
+
+int CountrySelectBox::Inner::accessibilityChildCount() const {
+	return int(current().size());
+}
+
+QString CountrySelectBox::Inner::accessibilityChildName(int index) const {
+	const auto &list = current();
+	if (index < 0 || index >= int(list.size())) {
+		return {};
+	}
+	if (_type == Type::Phones) {
+		return list[index].country + u", +"_q + list[index].code;
+	}
+	return list[index].country;
+}
+
+QRect CountrySelectBox::Inner::accessibilityChildRect(int index) const {
+	const auto &list = current();
+	if (index < 0 || index >= int(list.size())) {
+		return {};
+	}
+	return QRect(
+		0,
+		st::countriesSkip + index * _rowHeight,
+		width(),
+		_rowHeight);
+}
+
+int CountrySelectBox::Inner::accessibilityChildColumnCount(int row) const {
+	return (_type == Type::Phones) ? 2 : 1;
+}
+
+QAccessible::Role CountrySelectBox::Inner::accessibilityChildSubItemRole() const {
+	return QAccessible::Cell;
+}
+
+QString CountrySelectBox::Inner::accessibilityChildSubItemName(
+		int row,
+		int column) const {
+	if (column == 0) {
+		return tr::lng_sr_country_column_name(tr::now);
+	} else if (column == 1 && _type == Type::Phones) {
+		return tr::lng_country_code(tr::now);
+	}
+	return {};
+}
+
+QString CountrySelectBox::Inner::accessibilityChildSubItemValue(
+		int row,
+		int column) const {
+	const auto &list = current();
+	if (row < 0 || row >= int(list.size())) {
+		return {};
+	}
+	if (column == 0) {
+		return list[row].country;
+	} else if (column == 1 && _type == Type::Phones) {
+		return u"+"_q + list[row].code;
+	}
+	return {};
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/country_select_box.h b/Telegram/SourceFiles/ui/boxes/country_select_box.h
index 553fd39e2789be..779a9f970bc7ad 100644
--- a/Telegram/SourceFiles/ui/boxes/country_select_box.h
+++ b/Telegram/SourceFiles/ui/boxes/country_select_box.h
@@ -20,6 +20,7 @@ class RippleAnimation;
 
 class CountrySelectBox : public BoxContent {
 public:
+	class Inner;
 	enum class Type {
 		Phones,
 		Countries,
@@ -50,7 +51,6 @@ class CountrySelectBox : public BoxContent {
 
 	object_ptr<MultiSelect> _select;
 
-	class Inner;
 	object_ptr<Inner> _ownedInner;
 	QPointer<Inner> _inner;
 
diff --git a/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp b/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp
index 94d63e6fe6b121..d37a183ba5c10d 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp
@@ -25,7 +25,11 @@ class GenericBox;
 void EditBirthdayBox(
 		not_null<Ui::GenericBox*> box,
 		Data::Birthday current,
-		Fn<void(Data::Birthday)> save) {
+		Fn<void(Data::Birthday)> save,
+		EditBirthdayType type) {
+	if (type != EditBirthdayType::Suggest) {
+		box->setTitle(tr::lng_settings_birthday_title());
+	}
 	box->setWidth(st::boxWideWidth);
 	const auto content = box->addRow(object_ptr<Ui::FixedHeightWidget>(
 		box,
@@ -37,31 +41,12 @@ void EditBirthdayBox(
 			int count,
 			int startIndex,
 			Fn<void(QPainter &p, QRectF rect, int index)> paint) {
-		auto paintCallback = [=](
-				QPainter &p,
-				int index,
-				float64 y,
-				float64 distanceFromCenter,
-				int outerWidth) {
-			const auto r = QRectF(0, y, outerWidth, itemHeight);
-			const auto progress = std::abs(distanceFromCenter);
-			const auto revProgress = 1. - progress;
-			p.save();
-			p.translate(r.center());
-			constexpr auto kMinYScale = 0.2;
-			const auto yScale = kMinYScale
-				+ (1. - kMinYScale) * anim::easeOutCubic(1., revProgress);
-			p.scale(1., yScale);
-			p.translate(-r.center());
-			p.setOpacity(revProgress);
-			p.setFont(font);
-			p.setPen(st::defaultFlatLabel.textFg);
-			paint(p, r, index);
-			p.restore();
-		};
 		return Ui::CreateChild<Ui::VerticalDrumPicker>(
 			content,
-			std::move(paintCallback),
+			Ui::VerticalDrumPicker::DefaultPaintCallback(
+				font,
+				itemHeight,
+				paint),
 			count,
 			itemHeight,
 			startIndex);
@@ -100,7 +85,7 @@ void EditBirthdayBox(
 		content->sizeValue(),
 		state->months.value(),
 		state->days.value()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			QSize s,
 			Ui::VerticalDrumPicker *months,
 			Ui::VerticalDrumPicker *days) {
@@ -116,7 +101,7 @@ void EditBirthdayBox(
 
 	Ui::SendPendingMoveResizeEvents(years);
 
-	years->value() | rpl::start_with_next([=](int yearsIndex) {
+	years->value() | rpl::on_next([=](int yearsIndex) {
 		const auto year = (yearsIndex == yearsCount - 1)
 			? 0
 			: minYear + yearsIndex;
@@ -152,7 +137,7 @@ void EditBirthdayBox(
 		return picker ? picker->value() : rpl::single(current.month()
 			? (current.month() - 1)
 			: (now.month() - 1));
-	}) | rpl::flatten_latest() | rpl::start_with_next([=](int monthIndex) {
+	}) | rpl::flatten_latest() | rpl::on_next([=](int monthIndex) {
 		const auto month = monthIndex + 1;
 		const auto yearsIndex = years->index();
 		const auto year = (yearsIndex == yearsCount - 1)
@@ -161,7 +146,7 @@ void EditBirthdayBox(
 		const auto daysCount = (year == maxYear && month == max.month())
 			? max.day()
 			: (month == 2)
-			? ((!year || ((year % 4) && (!(year % 100) || (year % 400))))
+			? ((!year || (!(year % 4) && ((year % 100) || !(year % 400))))
 				? 29
 				: 28)
 			: ((month == 4) || (month == 6) || (month == 9) || (month == 11))
@@ -188,7 +173,7 @@ void EditBirthdayBox(
 	}, years->lifetime());
 
 	content->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(content);
 
 		p.fillRect(r, Qt::transparent);
@@ -209,7 +194,10 @@ void EditBirthdayBox(
 		return base::EventFilterResult::Continue;
 	});
 
-	box->addButton(tr::lng_settings_save(), [=] {
+	auto confirmText = (type == EditBirthdayType::Suggest)
+		? tr::lng_suggest_birthday_box_confirm()
+		: tr::lng_settings_save();
+	box->addButton(std::move(confirmText), [=] {
 		const auto result = Data::Birthday(
 			state->days.current()->index() + 1,
 			state->months.current()->index() + 1,
@@ -222,7 +210,7 @@ void EditBirthdayBox(
 	box->addButton(tr::lng_cancel(), [=] {
 		box->closeBox();
 	});
-	if (current) {
+	if (current && type == EditBirthdayType::Edit) {
 		box->addLeftButton(tr::lng_settings_birthday_reset(), [=] {
 			box->closeBox();
 			save(Data::Birthday());
diff --git a/Telegram/SourceFiles/ui/boxes/edit_birthday_box.h b/Telegram/SourceFiles/ui/boxes/edit_birthday_box.h
index bc96f8e0de414f..4d33fc262b8efc 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_birthday_box.h
+++ b/Telegram/SourceFiles/ui/boxes/edit_birthday_box.h
@@ -15,9 +15,16 @@ namespace Ui {
 
 class GenericBox;
 
+enum class EditBirthdayType {
+	Edit,
+	Suggest,
+	ConfirmSuggestion,
+};
+
 void EditBirthdayBox(
 	not_null<Ui::GenericBox*> box,
 	Data::Birthday current,
-	Fn<void(Data::Birthday)> save);
+	Fn<void(Data::Birthday)> save,
+	EditBirthdayType type = EditBirthdayType::Edit);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
index 2c371da40d3334..2265e89e753bbf 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/edit_factcheck_box.cpp
@@ -39,7 +39,7 @@ void EditFactcheckBox(
 	};
 	const auto state = box->lifetime().make_state<rpl::variable<State>>(
 		State::Initial);
-	field->changes() | rpl::start_with_next([=] {
+	field->changes() | rpl::on_next([=] {
 		const auto now = field->getLastText().trimmed();
 		*state = !now.isEmpty()
 			? State::Changed
@@ -48,7 +48,7 @@ void EditFactcheckBox(
 			: State::Removed;
 	}, field->lifetime());
 
-	state->value() | rpl::start_with_next([=](State state) {
+	state->value() | rpl::on_next([=](State state) {
 		box->clearButtons();
 		if (state == State::Removed) {
 			box->addButton(tr::lng_box_remove(), [=] {
diff --git a/Telegram/SourceFiles/ui/boxes/edit_invite_link.cpp b/Telegram/SourceFiles/ui/boxes/edit_invite_link.cpp
index 49905b87e26f03..4d72f26f3be74d 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_invite_link.cpp
+++ b/Telegram/SourceFiles/ui/boxes/edit_invite_link.cpp
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 #include "ui/layers/generic_box.h"
 #include "ui/vertical_list.h"
 #include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/fields/input_field.h"
 #include "ui/widgets/fields/number_input.h"
@@ -43,6 +44,39 @@ constexpr auto kMaxLabelLength = 32;
 	}
 }
 
+[[nodiscard]] TextWithEntities RequestApprovalAbout(
+		bool enabled,
+		bool locked,
+		bool isGroup,
+		const QString &guardBotUsername,
+		const QString &guardBotLink) {
+	if (locked) {
+		return TextWithEntities{
+			(isGroup
+				? tr::lng_group_invite_about_approve_disabled
+				: tr::lng_group_invite_about_approve_disabled_channel)(
+					tr::now)
+		};
+	} else if (enabled && !guardBotUsername.isEmpty()) {
+		return (isGroup
+			? tr::lng_group_invite_about_approve_managed
+			: tr::lng_group_invite_about_approve_managed_channel)(
+				tr::now,
+				lt_bot,
+				tr::link('@' + guardBotUsername, guardBotLink),
+				tr::marked);
+	}
+	return TextWithEntities{
+		enabled
+			? (isGroup
+				? tr::lng_group_invite_about_approve
+				: tr::lng_group_invite_about_approve_channel)(tr::now)
+			: (isGroup
+				? tr::lng_group_invite_about_no_approve
+				: tr::lng_group_invite_about_no_approve_channel)(tr::now)
+	};
+}
+
 } // namespace
 
 void EditInviteLinkBox(
@@ -55,7 +89,11 @@ void EditInviteLinkBox(
 	const auto link = data.link;
 	const auto isGroup = data.isGroup;
 	const auto isPublic = data.isPublic;
+	const auto globalRequestApproval = data.globalRequestApproval;
+	const auto guardBotUsername = data.guardBotUsername;
+	const auto guardBotLink = data.guardBotLink;
 	const auto subscriptionLocked = data.subscriptionCredits > 0;
+	const auto requestApprovalLocked = isPublic && !globalRequestApproval;
 	box->setTitle(link.isEmpty()
 		? tr::lng_group_invite_new_title()
 		: tr::lng_group_invite_edit_title());
@@ -86,6 +124,20 @@ void EditInviteLinkBox(
 				st::defaultBoxDividerLabelPadding),
 			margins);
 	};
+	const auto addRichDivider = [&](
+			not_null<VerticalLayout*> container,
+			rpl::producer<TextWithEntities> text,
+			style::margins margins = style::margins()) {
+		container->add(
+			object_ptr<DividerLabel>(
+				container,
+				object_ptr<FlatLabel>(
+					container,
+					std::move(text),
+					st::boxDividerLabel),
+				st::defaultBoxDividerLabelPadding),
+			margins);
+	};
 
 	const auto now = base::unixtime::now();
 	const auto expire = data.expireDate ? data.expireDate : kMaxLimit;
@@ -105,33 +157,10 @@ void EditInviteLinkBox(
 	const auto state = box->lifetime().make_state<State>(State{
 		.expireValue = expire,
 		.usageValue = usage,
-		.requestApproval = (data.requestApproval && !isPublic),
+		.requestApproval = data.requestApproval,
 		.subscription = false,
 	});
 
-	const auto requestApproval = (isPublic || subscriptionLocked)
-		? nullptr
-		: container->add(
-			object_ptr<SettingsButton>(
-				container,
-				tr::lng_group_invite_request_approve(),
-				st::settingsButtonNoIcon),
-			style::margins{ 0, 0, 0, st::defaultVerticalListSkip });
-	if (requestApproval) {
-		requestApproval->toggleOn(state->requestApproval.value(), true);
-		requestApproval->setClickedCallback([=] {
-			state->requestApproval.force_assign(!requestApproval->toggled());
-			state->subscription.force_assign(false);
-		});
-		addDivider(container, rpl::conditional(
-			state->requestApproval.value(),
-			(isGroup
-				? tr::lng_group_invite_about_approve()
-				: tr::lng_group_invite_about_approve_channel()),
-			(isGroup
-				? tr::lng_group_invite_about_no_approve()
-				: tr::lng_group_invite_about_no_approve_channel())));
-	}
 	auto credits = (Ui::NumberInput*)(nullptr);
 	if (!isPublic && fillSubscription) {
 		Ui::AddSkip(container);
@@ -157,49 +186,57 @@ void EditInviteLinkBox(
 		});
 	}
 
-	const auto labelField = container->add(
-		object_ptr<Ui::InputField>(
-			container,
-			st::defaultInputField,
-			tr::lng_group_invite_label_header(),
-			data.label),
-		style::margins(
-			st::defaultSubsectionTitlePadding.left(),
-			st::defaultVerticalListSkip,
-			st::defaultSubsectionTitlePadding.right(),
-			st::defaultVerticalListSkip * 2));
-	labelField->setMaxLength(kMaxLabelLength);
-	addDivider(container, tr::lng_group_invite_label_about());
-
-	const auto &saveLabel = link.isEmpty()
-		? tr::lng_formatting_link_create
-		: tr::lng_settings_save;
-	box->addButton(saveLabel(), [=] {
-		const auto label = labelField->getLastText();
-		const auto expireDate = (state->expireValue == kMaxLimit)
-			? 0
-			: (state->expireValue < 0)
-			? (base::unixtime::now() - state->expireValue)
-			: state->expireValue;
-		const auto usageLimit = (state->usageValue == kMaxLimit)
-			? 0
-			: state->usageValue;
-		done(InviteLinkFields{
-			.link = link,
-			.label = label,
-			.expireDate = expireDate,
-			.usageLimit = usageLimit,
-			.subscriptionCredits = credits
-				? credits->getLastText().toInt()
-				: 0,
-			.requestApproval = state->requestApproval.current(),
-			.isGroup = isGroup,
-			.isPublic = isPublic,
+	const auto addLabelField = [=] {
+		const auto result = container->add(
+			object_ptr<Ui::InputField>(
+				container,
+				st::defaultInputField,
+				tr::lng_group_invite_label_header(),
+				data.label),
+			style::margins(
+				st::defaultSubsectionTitlePadding.left(),
+				st::defaultVerticalListSkip,
+				st::defaultSubsectionTitlePadding.right(),
+				st::defaultVerticalListSkip * 2));
+		result->setMaxLength(kMaxLabelLength);
+		addDivider(container, tr::lng_group_invite_label_about());
+		return result;
+	};
+	const auto addSaveButtons = [=](not_null<Ui::InputField*> labelField) {
+		const auto &saveLabel = link.isEmpty()
+			? tr::lng_formatting_link_create
+			: tr::lng_settings_save;
+		box->addButton(saveLabel(), [=] {
+			const auto label = labelField->getLastText();
+			const auto expireDate = (state->expireValue == kMaxLimit)
+				? 0
+				: (state->expireValue < 0)
+				? (base::unixtime::now() - state->expireValue)
+				: state->expireValue;
+			const auto usageLimit = (state->usageValue == kMaxLimit)
+				? 0
+				: state->usageValue;
+			done(InviteLinkFields{
+				.link = link,
+				.label = label,
+				.expireDate = expireDate,
+				.usageLimit = usageLimit,
+				.subscriptionCredits = credits
+					? credits->getLastText().toInt()
+					: 0,
+				.requestApproval = state->requestApproval.current(),
+				.isGroup = isGroup,
+				.isPublic = isPublic,
+				.globalRequestApproval = globalRequestApproval,
+				.guardBotUsername = guardBotUsername,
+				.guardBotLink = guardBotLink,
+			});
 		});
-	});
-	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	};
 
 	if (subscriptionLocked) {
+		addSaveButtons(addLabelField());
 		return;
 	}
 	addTitle(container, tr::lng_group_invite_expire_title());
@@ -286,7 +323,7 @@ void EditInviteLinkBox(
 		}
 	};
 
-	const auto guard = MakeWeak(box);
+	const auto guard = base::make_weak(box);
 	expireGroup->setChangedCallback([=](int value) {
 		if (value) {
 			state->expireValue = value;
@@ -343,7 +380,7 @@ void EditInviteLinkBox(
 					: QString::number(state->usageValue)),
 				200'000);
 			wrap->widthValue(
-			) | rpl::start_with_next([=](int width) {
+			) | rpl::on_next([=](int width) {
 				input->resize(width, input->height());
 				input->moveToLeft(0, st::boxPadding.bottom());
 			}, input->lifetime());
@@ -373,6 +410,39 @@ void EditInviteLinkBox(
 
 	usagesSlide->toggleOn(state->requestApproval.value() | rpl::map(!_1));
 	usagesSlide->finishAnimating();
+
+	const auto skip = st::defaultVerticalListSkip;
+	const auto requestApproval = container->add(
+		object_ptr<SettingsButton>(
+			container,
+			(isGroup
+				? tr::lng_group_invite_request_approve
+				: tr::lng_group_invite_request_approve_channel)(),
+			st::settingsButtonNoIcon),
+		style::margins{ 0, skip, 0, skip });
+	requestApproval->toggleOn(state->requestApproval.value(), true);
+	requestApproval->setToggleLocked(requestApprovalLocked);
+	requestApproval->finishAnimating();
+	requestApproval->setClickedCallback([=] {
+		if (requestApprovalLocked) {
+			return;
+		}
+		state->requestApproval.force_assign(!requestApproval->toggled());
+		state->subscription.force_assign(false);
+	});
+	addRichDivider(
+		container,
+		state->requestApproval.value(
+		) | rpl::map([=](bool enabled) {
+			return RequestApprovalAbout(
+				enabled,
+				requestApprovalLocked,
+				isGroup,
+				guardBotUsername,
+				guardBotLink);
+		}));
+
+	addSaveButtons(addLabelField());
 }
 
 void CreateInviteLinkBox(
@@ -380,11 +450,20 @@ void CreateInviteLinkBox(
 		Fn<InviteLinkSubscriptionToggle()> fillSubscription,
 		bool isGroup,
 		bool isPublic,
+		bool globalRequestApproval,
+		const QString &guardBotUsername,
+		const QString &guardBotLink,
 		Fn<void(InviteLinkFields)> done) {
 	EditInviteLinkBox(
 		box,
 		std::move(fillSubscription),
-		InviteLinkFields{ .isGroup = isGroup, .isPublic = isPublic },
+		InviteLinkFields{
+			.isGroup = isGroup,
+			.isPublic = isPublic,
+			.globalRequestApproval = globalRequestApproval,
+			.guardBotUsername = guardBotUsername,
+			.guardBotLink = guardBotLink,
+		},
 		std::move(done));
 }
 
diff --git a/Telegram/SourceFiles/ui/boxes/edit_invite_link.h b/Telegram/SourceFiles/ui/boxes/edit_invite_link.h
index 0b9805cd69243a..dfe35f5e1ff8a9 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_invite_link.h
+++ b/Telegram/SourceFiles/ui/boxes/edit_invite_link.h
@@ -22,6 +22,9 @@ struct InviteLinkFields {
 	bool requestApproval = false;
 	bool isGroup = false;
 	bool isPublic = false;
+	bool globalRequestApproval = false;
+	QString guardBotUsername;
+	QString guardBotLink;
 };
 
 struct InviteLinkSubscriptionToggle final {
@@ -40,6 +43,9 @@ void CreateInviteLinkBox(
 	Fn<InviteLinkSubscriptionToggle()> fillSubscription,
 	bool isGroup,
 	bool isPublic,
+	bool globalRequestApproval,
+	const QString &guardBotUsername,
+	const QString &guardBotLink,
 	Fn<void(InviteLinkFields)> done);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/edit_invite_link_session.cpp b/Telegram/SourceFiles/ui/boxes/edit_invite_link_session.cpp
index 7bd6ee08fc91ef..e1ae66cc329752 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_invite_link_session.cpp
+++ b/Telegram/SourceFiles/ui/boxes/edit_invite_link_session.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "ui/boxes/edit_invite_link_session.h"
 
+#include "core/ui_integration.h" // TextContext
 #include "data/components/credits.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
@@ -23,7 +24,6 @@ For license and copyright information please follow this link:
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/fields/number_input.h"
-#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
@@ -74,7 +74,7 @@ InviteLinkSubscriptionToggle FillCreateInviteLinkSubscriptionToggle(
 		tr::lng_group_invite_subscription_ph(),
 		QString(),
 		std::pow(QString::number(maxCredits).size(), 10));
-	wrap->toggledValue() | rpl::start_with_next([=](bool shown) {
+	wrap->toggledValue() | rpl::on_next([=](bool shown) {
 		if (shown) {
 			input->setFocus();
 		}
@@ -85,7 +85,7 @@ InviteLinkSubscriptionToggle FillCreateInviteLinkSubscriptionToggle(
 	const auto priceOverlay = Ui::CreateChild<Ui::RpWidget>(inputContainer);
 	priceOverlay->setAttribute(Qt::WA_TransparentForMouseEvents);
 	inputContainer->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		input->resize(
 			size.width() - rect::m::sum::h(st::boxRowPadding),
 			st.heightMin);
@@ -104,7 +104,7 @@ InviteLinkSubscriptionToggle FillCreateInviteLinkSubscriptionToggle(
 		priceOverlay->update();
 	});
 	priceOverlay->paintRequest(
-	) | rpl::start_with_next([=, right = st::boxRowPadding.right()] {
+	) | rpl::on_next([=, right = st::boxRowPadding.right()] {
 		if (state->usdRate.current() <= 0) {
 			return;
 		}
@@ -128,34 +128,27 @@ InviteLinkSubscriptionToggle FillCreateInviteLinkSubscriptionToggle(
 
 	state->usdRate = peer->session().credits().rateValue(peer);
 
-	const auto arrow = Ui::Text::SingleCustomEmoji(
-		peer->owner().customEmojiManager().registerInternalEmoji(
-			st::topicButtonArrow,
-			st::channelEarnLearnArrowMargins,
-			false));
-	auto about = Ui::CreateLabelWithCustomEmoji(
+	auto about = object_ptr<Ui::FlatLabel>(
 		container,
 		tr::lng_group_invite_subscription_about(
 			lt_link,
 			tr::lng_group_invite_subscription_about_link(
 				lt_emoji,
-				rpl::single(arrow),
-				Ui::Text::RichLangValue
+				rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+				tr::rich
 			) | rpl::map([](TextWithEntities text) {
-				return Ui::Text::Link(
+				return tr::link(
 					std::move(text),
 					tr::lng_group_invite_subscription_about_url(tr::now));
 			}),
-			Ui::Text::RichLangValue),
-		{ .session = &peer->session() },
+			tr::rich),
 		st::boxDividerLabel);
 	Ui::AddSkip(wrap->entity());
 	Ui::AddSkip(wrap->entity());
 	container->add(object_ptr<Ui::DividerLabel>(
 		container,
 		std::move(about),
-		st::defaultBoxDividerLabelPadding,
-		RectPart::Top | RectPart::Bottom));
+		st::defaultBoxDividerLabelPadding));
 	return { toggle, input };
 }
 
diff --git a/Telegram/SourceFiles/ui/boxes/emoji_stake_box.cpp b/Telegram/SourceFiles/ui/boxes/emoji_stake_box.cpp
new file mode 100644
index 00000000000000..86a13a1c2c08fa
--- /dev/null
+++ b/Telegram/SourceFiles/ui/boxes/emoji_stake_box.cpp
@@ -0,0 +1,654 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/boxes/emoji_stake_box.h"
+
+#include "base/event_filter.h"
+#include "base/object_ptr.h"
+#include "chat_helpers/stickers_lottie.h"
+#include "data/components/credits.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_document.h"
+#include "data/data_session.h"
+#include "info/channel_statistics/earn/earn_format.h"
+#include "info/channel_statistics/earn/earn_icons.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
+#include "settings/settings_common.h" // CreateLottieIcon
+#include "settings/settings_credits_graphics.h" // AddBalanceWidget
+#include "ui/controls/ton_common.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "ui/text/custom_emoji_text_badge.h"
+#include "ui/text/text_custom_emoji.h"
+#include "ui/text/text_lottie_custom_emoji.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/fields/number_input.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/basic_click_handlers.h" // UrlClickHandler
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/vertical_list.h"
+#include "styles/style_boxes.h"
+#include "styles/style_calls.h" // confcallLinkFooterOr
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h" // creditsHistoryRightSkip
+#include "styles/style_layers.h"
+#include "styles/style_settings.h" // settingsCloudPasswordIconSize
+#include "styles/style_widgets.h"
+
+#include <QtSvg/QSvgRenderer>
+
+namespace Ui {
+namespace {
+
+[[nodiscard]] not_null<RpWidget*> AddMoneyInputIcon(
+		not_null<QWidget*> parent,
+		Text::PaletteDependentEmoji emoji) {
+	auto helper = Text::CustomEmojiHelper();
+	auto text = helper.paletteDependent(std::move(emoji));
+	return CreateChild<FlatLabel>(
+		parent,
+		rpl::single(std::move(text)),
+		st::defaultFlatLabel,
+		st::defaultPopupMenu,
+		helper.context());
+}
+
+[[nodiscard]] QImage MakeEmojiFrame(int index, int size) {
+	const auto path = u":/gui/dice/dice%1.svg"_q.arg(index);
+
+	const auto ratio = style::DevicePixelRatio();
+	auto svg = QSvgRenderer(path);
+	auto result = QImage(
+		QSize(size, size) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(ratio);
+	result.fill(Qt::transparent);
+
+	auto p = QPainter(&result);
+	svg.render(&p, QRect(0, 0, size, size));
+	p.end();
+
+	return result;
+}
+
+[[nodiscard]] object_ptr<RpWidget> MakeLogo(not_null<GenericBox*> box) {
+	const auto &size = st::settingsCloudPasswordIconSize;
+	auto icon = Settings::CreateLottieIcon(
+		box->verticalLayout(),
+		{ .name = u"dice_6"_q, .sizeOverride = { size, size } },
+		QMargins());
+	const auto animate = std::move(icon.animate);
+	box->showFinishes() | rpl::take(1) | rpl::on_next([=] {
+		animate(anim::repeat::once);
+	}, box->lifetime());
+	return std::move(icon.widget);
+}
+
+[[nodiscard]] object_ptr<RpWidget> MakeTable(
+		not_null<RpWidget*> parent,
+		const EmojiGameStakeArgs &args) {
+	auto result = object_ptr<RpWidget>(parent);
+	const auto raw = result.data();
+
+	struct State {
+		std::array<QImage, 6> dices;
+		std::array<Text::String, 7> multiplicators;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+	const auto serialize = [&](int milliReward) {
+		return QString(QChar(0xD7)) + QString::number(milliReward / 1000.);
+	};
+	const auto esize = st::stakeEmojiSize;
+	for (auto i = 0; i != 6; ++i) {
+		state->dices[i] = MakeEmojiFrame(i + 1, esize);
+
+		const auto value = (i < args.milliRewards.size())
+			? args.milliRewards[i]
+			: 0;
+		state->multiplicators[i].setText(
+			st::semiboldTextStyle,
+			serialize(value));
+	}
+	state->multiplicators[6].setText(
+		st::semiboldTextStyle,
+		serialize(args.jackpotMilliReward));
+
+	raw->paintOn([=](QPainter &p) {
+		auto path = QPainterPath();
+		const auto &st = st::defaultTable;
+		const auto border = st.border;
+		const auto half = border / 2.;
+		const auto add = QMargins(border, border, border, border);
+		const auto inner = raw->rect().marginsRemoved(add);
+		path.addRoundedRect(inner, st.radius, st.radius);
+		{
+			const auto y = border + inner.height() / 2.;
+			path.moveTo(border + half, y);
+			path.lineTo(border + inner.width() - half, y);
+		}
+		{
+			const auto x = border + inner.width() / 2.;
+			path.moveTo(x, border + half);
+			path.lineTo(x, border + inner.height() - half);
+		}
+		{
+			const auto x = border + (inner.width() - border) / 4.;
+			path.moveTo(x, border + half);
+			path.lineTo(x, border + inner.height() - half);
+		}
+		{
+			const auto x = border
+				+ (inner.width() / 2.)
+				+ (inner.width() - border) / 4.;
+			path.moveTo(x, border + half);
+			path.lineTo(x, border + (inner.height() / 2.) - half);
+		}
+		auto pen = st.borderFg->p;
+		pen.setWidth(st.border);
+		p.setPen(pen);
+		p.setBrush(Qt::NoBrush);
+
+		auto hq = PainterHighQualityEnabler(p);
+		p.drawPath(path);
+
+		const auto etop = st::stakeEmojiTop;
+		const auto ttop = etop + esize;
+		{
+			auto left = border + half;
+			const auto width = (inner.width() - 3 * border) / 4.;
+			auto top = border + half;
+			for (auto i = 0; i != 7; ++i, left += width + border) {
+				if (i == 4) {
+					left -= 4 * (width + border);
+					top += border + half + inner.height() / 2.;
+				}
+				const auto x = int(base::SafeRound(left));
+				const auto y = int(base::SafeRound(top));
+				const auto right = (i < 6)
+					? int(base::SafeRound(left + width))
+					: int(base::SafeRound(left + 2 * width + border));
+				const auto w = (right - x);
+
+				if (i < 6) {
+					p.drawImage(
+						x + (w - esize) / 2,
+						y + etop,
+						state->dices[i]);
+				} else {
+					const auto &last = state->dices.back();
+					for (auto j = 0; j != 3; ++j) {
+						p.drawImage(
+							x + (w - 3 * esize) / 2 + (esize * j),
+							y + etop,
+							last);
+					}
+				}
+
+				p.setPen(st::windowBoldFg);
+				const auto &mul = state->multiplicators[i];
+				mul.draw(p, {
+					.position = { x + (w - mul.maxWidth()) / 2, y + ttop },
+				});
+			}
+		}
+	});
+	raw->widthValue() | rpl::on_next([=](int width) {
+		raw->resize(width, width / 3);
+	}, raw->lifetime());
+	return result;
+}
+
+} // namespace
+
+not_null<NumberInput*> AddStarsInputField(
+		not_null<VerticalLayout*> container,
+		StarsInputFieldArgs &&args) {
+	const auto wrap = container->add(
+		object_ptr<FixedHeightWidget>(
+			container,
+			st::editTagField.heightMin),
+		st::boxRowPadding);
+	const auto result = CreateChild<NumberInput>(
+		wrap,
+		st::editTagField,
+		rpl::single(u"0"_q),
+		args.value ? QString::number(*args.value) : QString(),
+		args.max ? args.max : std::numeric_limits<int>::max());
+	const auto icon = AddMoneyInputIcon(
+		result,
+		Earn::IconCreditsEmoji());
+
+	wrap->widthValue() | rpl::on_next([=](int width) {
+		icon->move(st::starsFieldIconPosition);
+		result->move(0, 0);
+		result->resize(width, result->height());
+		wrap->resize(width, result->height());
+	}, wrap->lifetime());
+
+	return result;
+}
+
+not_null<InputField*> AddTonInputField(
+		not_null<VerticalLayout*> container,
+		TonInputFieldArgs &&args) {
+	const auto wrap = container->add(
+		object_ptr<FixedHeightWidget>(
+			container,
+			st::editTagField.heightMin),
+		st::boxRowPadding);
+	const auto result = CreateTonAmountInput(
+		wrap,
+		rpl::single('0' + TonAmountSeparator() + '0'),
+		args.value);
+	const auto icon = AddMoneyInputIcon(
+		result,
+		Earn::IconCurrencyEmoji());
+
+	wrap->widthValue() | rpl::on_next([=](int width) {
+		icon->move(st::tonFieldIconPosition);
+		result->move(0, 0);
+		result->resize(width, result->height());
+		wrap->resize(width, result->height());
+	}, wrap->lifetime());
+
+	return result;
+}
+
+void AddApproximateUsd(
+		not_null<QWidget*> field,
+		not_null<Main::Session*> session,
+		rpl::producer<CreditsAmount> price) {
+	auto value = std::move(price) | rpl::map([=](CreditsAmount amount) {
+		if (!amount) {
+			return QString();
+		}
+		const auto appConfig = &session->appConfig();
+		const auto rate = amount.ton()
+			? appConfig->currencySellRate()
+			: (appConfig->starsSellRate() / 100.);
+		return Info::ChannelEarn::ToUsd(amount, rate, 2);
+	});
+	const auto usd = Ui::CreateChild<Ui::FlatLabel>(
+		field,
+		std::move(value),
+		st::suggestPriceEstimate);
+	const auto move = [=] {
+		usd->moveToRight(0, st::suggestPriceEstimateTop);
+	};
+	base::install_event_filter(field, [=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::Resize) {
+			move();
+		}
+		return base::EventFilterResult::Continue;
+	});
+	usd->widthValue() | rpl::on_next(move, usd->lifetime());
+}
+
+void InsufficientTonBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Main::Session*> session,
+		CreditsAmount required) {
+	box->setStyle(st::suggestPriceBox);
+	box->addTopButton(st::boxTitleClose, [=] {
+		box->closeBox();
+	});
+
+	auto icon = Settings::CreateLottieIcon(
+		box->verticalLayout(),
+		{
+			.name = u"diamond"_q,
+			.sizeOverride = st::normalBoxLottieSize,
+		},
+		{});
+	box->setShowFinishedCallback([animate = std::move(icon.animate)] {
+		animate(anim::repeat::loop);
+	});
+	box->addRow(std::move(icon.widget), st::lowTonIconPadding);
+	const auto add = required - session->credits().tonBalance();
+	const auto nano = add.whole() * Ui::kNanosInOne + add.nano();
+	const auto amount = Ui::FormatTonAmount(nano).full;
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_suggest_low_ton_title(tr::now, lt_amount, amount),
+			st::boxTitle),
+		st::boxRowPadding + st::lowTonTitlePadding,
+		style::al_top);
+	const auto label = box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_suggest_low_ton_text(tr::rich),
+			st::lowTonText),
+		st::boxRowPadding + st::lowTonTextPadding,
+		style::al_top);
+	label->setTryMakeSimilarLines(true);
+	label->resizeToWidth(
+		st::boxWidth - st::boxRowPadding.left() - st::boxRowPadding.right());
+
+	const auto url = tr::lng_suggest_low_ton_fragment_url(tr::now);
+	const auto button = box->addButton(
+		tr::lng_suggest_low_ton_fragment(),
+		[=] { UrlClickHandler::Open(url); });
+	const auto buttonWidth = st::boxWidth
+		- rect::m::sum::h(st::suggestPriceBox.buttonPadding);
+	button->widthValue() | rpl::filter([=] {
+		return (button->widthNoMargins() != buttonWidth);
+	}) | rpl::on_next([=] {
+		button->resizeToWidth(buttonWidth);
+	}, button->lifetime());
+}
+
+void AddStakePresets(
+		not_null<VerticalLayout*> container,
+		not_null<Main::Session*> session,
+		Fn<void(int64)> callback) {
+	const auto presets = session->appConfig().stakeDiceNanoTonSuggested();
+	if (presets.empty()) {
+		return;
+	}
+	constexpr auto kPerRow = 4;
+	const auto count = int(presets.size());
+	const auto rows = (count + kPerRow - 1) / kPerRow;
+	const auto smallrow = count / rows;
+	const auto bigrow = smallrow + 1;
+	const auto bigrows = count % rows;
+	struct State {
+		std::vector<std::vector<not_null<RoundButton*>>> buttons;
+	};
+	const auto wrap = container->add(
+		object_ptr<FixedHeightWidget>(
+			container,
+			(rows * st::stakePresetButton.height
+				+ (rows - 1) * st::stakePresetButtonSkip.y())),
+		(st::boxRowPadding
+			+ QMargins(0, st::stakeBox.buttonPadding.top(), 0, 0)));
+	const auto diamond = QString::fromUtf8(" \xf0\x9f\x92\x8e");
+	const auto state = wrap->lifetime().make_state<State>();
+	for (auto i = 0; i != rows; ++i) {
+		const auto big = (i < bigrows);
+		const auto cols = big ? bigrow : smallrow;
+		auto &row = state->buttons.emplace_back();
+		row.reserve(cols);
+		for (auto j = 0; j != cols; ++j) {
+			const auto index = i * bigrow + j - std::max(0, i - bigrows);
+			const auto nanoTon = presets[index];
+			const auto button = CreateChild<RoundButton>(
+				wrap,
+				rpl::single(FormatTonAmount(nanoTon).full + diamond),
+				st::stakePresetButton);
+			button->setTextTransform(RoundButtonTextTransform::ToUpper);
+			button->setClickedCallback([=] {
+				callback(nanoTon);
+			});
+			row.push_back(button);
+		}
+	}
+	wrap->widthValue() | rpl::on_next([=](int width) {
+		auto y = 0;
+		const auto xskip = st::stakePresetButtonSkip.x();
+		const auto yskip = st::stakePresetButtonSkip.y();
+		for (auto i = 0; i != state->buttons.size(); ++i) {
+			const auto &row = state->buttons[i];
+			const auto cols = int(row.size());
+			const auto singlew = (width - (cols - 1) * xskip) / cols;
+			auto x = 0;
+			for (const auto &button : row) {
+				button->setFullWidth(singlew);
+				button->move(x, y);
+				x += singlew + xskip;
+			}
+			y += st::stakePresetButton.height + yskip;
+		}
+	}, wrap->lifetime());
+}
+
+void EmojiGameStakeBox(
+		not_null<GenericBox*> box,
+		EmojiGameStakeArgs &&args) {
+	box->setStyle(st::stakeBox);
+	box->setWidth(st::boxWideWidth);
+	box->setNoContentMargin(true);
+	const auto container = box->verticalLayout();
+
+	const auto skip = st::confcallLinkHeaderIconPadding.bottom();
+	box->addRow(
+		MakeLogo(box),
+		st::boxRowPadding + QMargins(0, 0, 0, skip),
+		style::al_top);
+
+	auto helper = Text::CustomEmojiHelper();
+	const auto beta = helper.paletteDependent(
+		Text::CustomEmojiTextBadge(
+			tr::lng_stake_game_beta(tr::now).toUpper(),
+			st::customEmojiTextBadge));
+	const auto sixText = helper.image({
+		.image = MakeEmojiFrame(6, st::emojiSize),
+		.textColor = false,
+	});
+	auto title = tr::lng_stake_game_title(
+		tr::marked
+	) | rpl::map([=](TextWithEntities &&text) {
+		return text.append(' ').append(beta);
+	});
+	box->addRow(
+		object_ptr<FlatLabel>(
+			box,
+			std::move(title),
+			st::boxTitle,
+			st::defaultPopupMenu,
+			helper.context()),
+		st::boxRowPadding + st::confcallLinkTitlePadding,
+		style::al_top);
+	box->addRow(
+		object_ptr<FlatLabel>(
+			box,
+			tr::lng_stake_game_about(tr::rich),
+			st::confcallLinkCenteredText),
+		st::boxRowPadding + QMargins(0, 0, 0, skip),
+		style::al_top
+	)->setTryMakeSimilarLines(true);
+
+	const auto sub = st::boxRowPadding - st::defaultSubsectionTitlePadding;
+	const auto subtitlePadding = QMargins(sub.left(), 0, sub.right(), 0);
+	AddSubsectionTitle(
+		container,
+		tr::lng_stake_game_results(),
+		subtitlePadding);
+
+	const auto half = (st::defaultTable.border + 1) / 2;
+	box->addRow(
+		MakeTable(box, args),
+		st::boxRowPadding + QMargins(-half, 0, -half, skip / 2),
+		style::al_top);
+
+	const auto sixContext = helper.context();
+	const auto factory = [=](
+			QStringView data,
+			const Text::MarkedContext &context)
+	-> std::unique_ptr<Text::CustomEmoji> {
+		if (auto result = sixContext.customEmojiFactory(data, context)) {
+			return MakeWrappedEmoji<Text::LimitedLoopsEmoji>(
+				std::move(result),
+				0,
+				true);
+		}
+		return nullptr;
+	};
+	const auto context = Text::MarkedContext{
+		.customEmojiFactory = factory,
+	};
+	const auto resets = box->addRow(
+		object_ptr<FlatLabel>(
+			box,
+			tr::lng_stake_game_resets(
+				lt_emoji,
+				rpl::single(sixText),
+				tr::rich),
+			st::confcallLinkFooterOr,
+			st::defaultPopupMenu,
+			context),
+		st::boxRowPadding,
+		style::al_top);
+	resets->setTryMakeSimilarLines(true);
+	resets->setAnimationsPausedCallback([=] {
+		return FlatLabel::WhichAnimationsPaused::All;
+	});
+
+	AddSubsectionTitle(
+		container,
+		tr::lng_stake_game_your(),
+		subtitlePadding + QMargins(0, skip, 0, sub.bottom()));
+	const auto field = AddTonInputField(container, {
+		.value = args.currentStake,
+	});
+	box->setFocusCallback([=] {
+		field->setFocusFast();
+	});
+
+	const auto fromNanoTon = [](int64 nanoton) {
+		return CreditsAmount(
+			nanoton / Ui::kNanosInOne,
+			nanoton % Ui::kNanosInOne,
+			CreditsType::Ton);
+	};
+	const auto price = field->lifetime().make_state<
+		rpl::variable<CreditsAmount>
+	>(rpl::single(
+		args.currentStake
+	) | rpl::then(field->changes() | rpl::map([=] {
+		return Ui::ParseTonAmountString(field->getLastText()).value_or(0);
+	})) | rpl::map(fromNanoTon));
+	AddApproximateUsd(
+		field,
+		args.session,
+		price->value());
+
+	AddStakePresets(container, args.session, [=](int64 nanoTon) {
+		field->setText(Ui::FormatTonAmount(nanoTon).full);
+	});
+
+	const auto submit = args.submit;
+	const auto callback = [=] {
+		const auto text = field->getLastText();
+		const auto now = price->current();
+		const auto credits = &args.session->credits();
+		const auto appConfig = &args.session->appConfig();
+		const auto min = fromNanoTon(appConfig->stakeDiceNanoTonMin());
+		const auto max = fromNanoTon(appConfig->stakeDiceNanoTonMax());
+		if (!now || now < min || now > max) {
+			field->showError();
+		} else if (credits->tonBalance() < now) {
+			box->uiShow()->show(Box(InsufficientTonBox, args.session, now));
+		} else {
+			box->closeBox();
+			submit(now.whole() * Ui::kNanosInOne + now.nano());
+		}
+	};
+	field->submits() | rpl::on_next(callback, field->lifetime());
+	const auto button = box->addButton(rpl::single(QString()), callback);
+
+	button->setText(tr::lng_stake_game_save_and_roll(
+	) | rpl::map([=](QString text) {
+		return Text::IconEmoji(
+			&st::stakeEmojiIcon,
+			QString::fromUtf8("\xf0\x9f\x8e\xb2")
+		).append(' ').append(text);
+	}));
+
+	const auto close = CreateChild<IconButton>(
+		container,
+		st::boxTitleClose);
+	close->setClickedCallback([=] { box->closeBox(); });
+	container->widthValue() | rpl::on_next([=](int) {
+		close->moveToRight(0, 0);
+	}, close->lifetime());
+
+	const auto session = args.session;
+	session->credits().tonLoad(true);
+	const auto balance = Settings::AddBalanceWidget(
+		container,
+		session,
+		session->credits().tonBalanceValue(),
+		false);
+	rpl::combine(
+		balance->sizeValue(),
+		container->sizeValue()
+	) | rpl::on_next([=](const QSize &, const QSize &) {
+		balance->moveToLeft(
+			st::creditsHistoryRightSkip * 2,
+			st::creditsHistoryRightSkip);
+		balance->update();
+	}, balance->lifetime());
+}
+
+Toast::Config MakeEmojiGameStakeToast(
+		std::shared_ptr<Show> show,
+		EmojiGameStakeArgs &&args) {
+	auto config = Toast::Config{
+		.st = &st::historyDiceToast,
+		.duration = Ui::Toast::kDefaultDuration * 2,
+	};
+	auto helper = Text::CustomEmojiHelper();
+	static const auto makeBg = [] {
+		auto result = st::mediaviewTextLinkFg->c;
+		result.setAlphaF(0.12);
+		return result;
+	};
+	struct State {
+		State() : bg(makeBg), badge(st::stakeChangeBadge) {
+			badge.textBg = badge.textBgOver = bg.color();
+		}
+
+		style::complex_color bg;
+		style::RoundButton badge;
+	};
+	auto state = std::make_shared<State>();
+	const auto badge = helper.paletteDependent(
+		Ui::Text::CustomEmojiTextBadge(
+			tr::lng_about_random_stake_change(tr::now),
+			state->badge,
+			st::stateChangeBadgeMargin));
+	const auto diamond = QString::fromUtf8("\xf0\x9f\x92\x8e");
+	config.text.append(
+		tr::lng_about_random_stake(
+			tr::now,
+			lt_amount,
+			tr::bold(diamond + Ui::FormatTonAmount(args.currentStake).full),
+			tr::marked)
+	).append(' ').append(
+		tr::link(badge, u"internal:stake_change"_q)
+	).append(u" "_q.repeated(10)).append(tr::link(
+		tr::semibold(tr::lng_about_random_send(tr::now)),
+		u"internal:stake_send"_q));
+	config.textContext = helper.context();
+
+	config.filter = [=, state = std::move(state)](
+			const ClickHandlerPtr &handler,
+			Qt::MouseButton button) {
+		if (button == Qt::LeftButton) {
+			const auto url = handler ? handler->url() : QString();
+			if (url == u"internal:stake_change"_q) {
+				show->show(Ui::MakeEmojiGameStakeBox(base::duplicate(args)));
+			} else if (url == u"internal:stake_send"_q) {
+				args.submit(args.currentStake);
+			}
+		}
+		return false;
+	};
+
+	return config;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/emoji_stake_box.h b/Telegram/SourceFiles/ui/boxes/emoji_stake_box.h
new file mode 100644
index 00000000000000..71451ac10ba12e
--- /dev/null
+++ b/Telegram/SourceFiles/ui/boxes/emoji_stake_box.h
@@ -0,0 +1,69 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/layers/generic_box.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui::Toast {
+struct Config;
+} // namespace Ui::Toast
+
+namespace Ui {
+
+class Show;
+class InputField;
+class NumberInput;
+class VerticalLayout;
+
+struct StarsInputFieldArgs {
+	std::optional<int64> value;
+	int64 max = 0;
+};
+[[nodiscard]] not_null<NumberInput*> AddStarsInputField(
+	not_null<VerticalLayout*> container,
+	StarsInputFieldArgs &&args);
+
+struct TonInputFieldArgs {
+	int64 value = 0;
+};
+[[nodiscard]] not_null<InputField*> AddTonInputField(
+	not_null<VerticalLayout*> container,
+	TonInputFieldArgs &&args);
+
+void AddApproximateUsd(
+	not_null<QWidget*> field,
+	not_null<Main::Session*> session,
+	rpl::producer<CreditsAmount> price);
+
+void InsufficientTonBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Main::Session*> session,
+	CreditsAmount required);
+
+struct EmojiGameStakeArgs {
+	not_null<Main::Session*> session;
+	int64 currentStake = 0;
+	std::array<int, 6> milliRewards;
+	int jackpotMilliReward = 0;
+	Fn<void(int64)> submit;
+};
+void EmojiGameStakeBox(not_null<GenericBox*> box, EmojiGameStakeArgs &&args);
+[[nodiscard]] inline object_ptr<GenericBox> MakeEmojiGameStakeBox(
+		EmojiGameStakeArgs &&args) {
+	return Box(EmojiGameStakeBox, std::move(args));
+}
+
+[[nodiscard]] Toast::Config MakeEmojiGameStakeToast(
+	std::shared_ptr<Show> show,
+	EmojiGameStakeArgs &&args);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp b/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
index 426f9705fdb332..05192a56a0554f 100644
--- a/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
@@ -17,6 +17,7 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "qr/qr_generate.h"
+#include "settings/settings_common.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/dynamic_image.h"
 #include "ui/dynamic_thumbnails.h"
@@ -25,6 +26,7 @@ For license and copyright information please follow this link:
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/toast/toast.h"
 #include "ui/ui_utility.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/box_content_divider.h"
@@ -34,6 +36,7 @@ For license and copyright information please follow this link:
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_giveaway.h"
 #include "styles/style_credits.h"
 #include "styles/style_intro.h"
@@ -195,7 +198,7 @@ void Paint(
 
 not_null<Ui::RpWidget*> PrepareQrWidget(
 		not_null<Ui::VerticalLayout*> container,
-		not_null<Ui::RpWidget*> topWidget,
+		std::shared_ptr<Ui::DynamicImage> userpicMedia,
 		rpl::producer<int> fontSizeValue,
 		rpl::producer<bool> userpicToggled,
 		rpl::producer<bool> backgroundToggled,
@@ -222,10 +225,11 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 		bool backgroundToggled = false;
 	};
 	const auto result = Ui::CreateChild<Ui::RpWidget>(divider);
-	topWidget->setParent(result);
-	topWidget->setAttribute(Qt::WA_TransparentForMouseEvents);
 	const auto state = result->lifetime().make_state<State>(
 		[=] { result->update(); });
+	userpicMedia->subscribeToUpdates(crl::guard(result, [=] {
+		result->update();
+	}));
 	const auto qrMaxSize = st::boxWideWidth
 		- rect::m::sum::h(st::boxRowPadding)
 		- rect::m::sum::h(st::profileQrBackgroundMargins);
@@ -241,7 +245,7 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 		std::move(links),
 		std::move(about),
 		rpl::single(rpl::empty) | rpl::then(style::PaletteChanged())
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int fontSize,
 			bool userpicToggled,
 			bool backgroundToggled,
@@ -261,7 +265,7 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 		state->backgroundColors = backgroundColors;
 		state->text = username.toUpper();
 		state->textWidth = state->font->width(state->text);
-		{
+		if (!link.isEmpty()) {
 			const auto remainder = qrMaxSize % st::introQrPixel;
 			const auto downTo = remainder
 				? qrMaxSize - remainder
@@ -274,6 +278,13 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 					Size(qrMaxSize * style::DevicePixelRatio()),
 					Qt::IgnoreAspectRatio,
 					Qt::SmoothTransformation);
+		} else {
+			auto image = QImage(
+				Size(qrMaxSize * style::DevicePixelRatio()),
+				QImage::Format_ARGB32_Premultiplied);
+			image.fill(Qt::white);
+			image.setDevicePixelRatio(style::DevicePixelRatio());
+			state->qrImage = std::move(image);
 		}
 		const auto resultWidth = qrMaxSize
 			+ rect::m::sum::h(state->backgroundMargins);
@@ -301,9 +312,6 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 
 		divider->resize(container->width(), result->height());
 		result->moveToLeft((container->width() - result->width()) / 2, 0);
-		topWidget->setVisible(userpicToggled);
-		topWidget->moveToLeft(0, -std::numeric_limits<int>::min());
-		topWidget->raise();
 
 		aboutLabel->raise();
 		aboutLabel->moveToLeft(
@@ -313,7 +321,7 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 				- st::defaultBoxDividerLabelPadding.top());
 	}, container->lifetime());
 	result->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(result);
 		const auto size = (state->qrImage.size() / style::DevicePixelRatio());
 		const auto qrRect = Rect(
@@ -341,14 +349,14 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 			return;
 		}
 		const auto photoSize = state->photoSize;
-		const auto top = Ui::GrabWidget(
-			topWidget,
-			QRect(),
-			Qt::transparent).scaled(
-				Size(photoSize * style::DevicePixelRatio()),
-				Qt::IgnoreAspectRatio,
-				Qt::SmoothTransformation);
-		p.drawPixmap((result->width() - photoSize) / 2, -photoSize / 2, top);
+		const auto pixelSize = photoSize * style::DevicePixelRatio();
+		p.drawImage(
+			QRect(
+				(result->width() - photoSize) / 2,
+				-photoSize / 2,
+				photoSize,
+				photoSize),
+			userpicMedia->image(pixelSize));
 	}, result->lifetime());
 	return result;
 }
@@ -375,7 +383,7 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 		const auto dot = smallDots.back();
 		dot->resize(smallSize);
 		dot->setAttribute(Qt::WA_TransparentForMouseEvents);
-		dot->paintRequest() | rpl::start_with_next([=] {
+		dot->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(dot);
 			const auto fg = (slider->value() > (i / float64(count - 1)))
 				? st.activeFg
@@ -386,7 +394,7 @@ not_null<Ui::RpWidget*> PrepareQrWidget(
 	const auto bigDot = Ui::CreateChild<Ui::RpWidget>(slider->parentWidget());
 	bigDot->resize(st.seekSize);
 	bigDot->setAttribute(Qt::WA_TransparentForMouseEvents);
-	bigDot->paintRequest() | rpl::start_with_next([=] {
+	bigDot->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(bigDot);
 		auto hq = PainterHighQualityEnabler(p);
 		auto pen = st::boxBg->p;
@@ -450,7 +458,7 @@ void FillPeerQrBox(
 
 	const auto usernameValue = [=] {
 		return (customLink || !peer)
-			? (rpl::single(QString()) | rpl::type_erased())
+			? (rpl::single(QString()) | rpl::type_erased)
 			: Info::Profile::UsernameValue(peer, true) | rpl::map(
 				[](const auto &username) { return username.text; });
 	};
@@ -460,25 +468,25 @@ void FillPeerQrBox(
 			: peer
 			? Info::Profile::LinkValue(peer, true) | rpl::map(
 				[](const auto &link) { return link.text; })
-			: (rpl::single(QString()) | rpl::type_erased());
+			: (rpl::single(QString()) | rpl::type_erased);
 	};
 
-	const auto userpic = Ui::CreateChild<Ui::RpWidget>(box);
-	const auto userpicSize = st::defaultUserpicButton.photoSize;
-	userpic->resize(Size(userpicSize));
 	const auto userpicMedia = Ui::MakeUserpicThumbnail(peer
 		? peer
 		: controller->session().user().get());
-	userpicMedia->subscribeToUpdates([=] { userpic->update(); });
-	userpic->paintRequest() | rpl::start_with_next([=] {
-		auto p = QPainter(userpic);
-		p.drawImage(0, 0, userpicMedia->image(userpicSize));
-	}, userpic->lifetime());
 
-	userpic->setVisible(peer != nullptr);
+	linkValue() | rpl::on_next([=](const QString &link) {
+		if (link.isEmpty()) {
+			box->showFinishes() | rpl::on_next([=] {
+				box->closeBox();
+			}, box->lifetime());
+			box->closeBox();
+		}
+	}, box->lifetime());
+
 	PrepareQrWidget(
 		box->verticalLayout(),
-		userpic,
+		userpicMedia,
 		state->fontSizeValue.value(),
 		state->userpicToggled.value(),
 		state->backgroundToggled.value(),
@@ -584,7 +592,7 @@ void FillPeerQrBox(
 			state->chosen.value() | rpl::combine_previous(
 			) | rpl::filter([=](int i, int k) {
 				return i == counter || k == counter;
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				widget->update();
 			}, widget->lifetime());
 			widget->resize(size, size);
@@ -592,20 +600,25 @@ void FillPeerQrBox(
 				spacing + ((counter % kMaxInRow) * (size + spacing)),
 				0);
 			widget->show();
+
+			const auto cornersMask = Images::CornersMask(
+				st::roundRadiusLarge * style::DevicePixelRatio());
 			const auto back = [&] {
-				auto result = Images::Round(
-					Images::GenerateGradient(
-						Size(size - activewidth * 5),
-						colors,
-						0,
-						0),
-					ImageRoundRadius::Large);
+				auto gradient = Images::GenerateGradient(
+					Size(size - activewidth * 5) * style::DevicePixelRatio(),
+					colors,
+					0,
+					0);
+				gradient.setDevicePixelRatio(style::DevicePixelRatio());
+				auto result = Images::Round(std::move(gradient), cornersMask);
+				const auto rect = Rect(
+					result.size() / style::DevicePixelRatio());
 				auto colored = result;
 				colored.fill(Qt::transparent);
 				{
 					auto p = QPainter(&colored);
 					auto hq = PainterHighQualityEnabler(p);
-					st::profileQrIcon.paintInCenter(p, result.rect());
+					st::profileQrIcon.paintInCenter(p, rect);
 					p.setCompositionMode(QPainter::CompositionMode_SourceIn);
 					p.drawImage(0, 0, result);
 				}
@@ -617,8 +630,8 @@ void FillPeerQrBox(
 					p.setPen(st::premiumButtonFg);
 					p.setBrush(st::premiumButtonFg);
 					const auto size = st::profileQrIcon.width() * 1.5;
-					const auto margins = Margins((result.width() - size) / 2);
-					const auto inner = result.rect() - margins;
+					const auto margins = Margins((rect.width() - size) / 2);
+					const auto inner = rect - margins;
 					p.drawRoundedRect(
 						inner,
 						st::roundRadiusLarge,
@@ -631,7 +644,7 @@ void FillPeerQrBox(
 				}
 				return result;
 			}();
-			widget->paintRequest() | rpl::start_with_next([=] {
+			widget->paintRequest() | rpl::on_next([=] {
 				auto p = QPainter(widget);
 				const auto rect = widget->rect() - Margins(activewidth * 2.5);
 				p.drawImage(rect.x(), rect.y(), back);
@@ -662,7 +675,7 @@ void FillPeerQrBox(
 	} else {
 		themes->refreshChatThemes();
 		themes->chatThemesUpdated(
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			fill(themes->chatThemes());
 		}, box->lifetime());
 	}
@@ -696,7 +709,7 @@ void FillPeerQrBox(
 			tr::lng_qr_box_quality3(),
 			labelSt);
 		labels->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
+		) | rpl::on_next([=](const QSize &size) {
 			left->moveToLeft(0, 0);
 			middle->moveToLeft((size.width() - middle->width()) / 2, 0);
 			right->moveToRight(0, 0);
@@ -730,7 +743,7 @@ void FillPeerQrBox(
 			st::settingsScale,
 			kMaxQualities);
 		slider->geometryValue(
-		) | rpl::start_with_next([=](const QRect &rect) {
+		) | rpl::on_next([=](const QRect &rect) {
 			updateGeometry(int(slider->value() * (kMaxQualities - 1)));
 		}, box->lifetime());
 
@@ -749,7 +762,7 @@ void FillPeerQrBox(
 			},
 			[](int) {});
 	}
-	{
+	if (peer && !customLink) {
 		Ui::AddSkip(box->verticalLayout());
 		Ui::AddSkip(box->verticalLayout());
 		Ui::AddSubsectionTitle(
@@ -764,9 +777,9 @@ void FillPeerQrBox(
 				st::settingsScale),
 			st::boxRowPadding);
 		slider->resize(slider->width(), seekSize);
-		const auto kSizeAmount = 8;
-		const auto kMinSize = 20;
-		const auto kMaxSize = 36;
+		const auto kSizeAmount = 15;
+		const auto kMinSize = 14;
+		const auto kMaxSize = 44;
 		const auto kStep = (kMaxSize - kMinSize) / (kSizeAmount - 1);
 		const auto updateGeometry = AddDotsToSlider(
 			slider,
@@ -778,8 +791,27 @@ void FillPeerQrBox(
 		const auto indexToFontSize = [=](int index) {
 			return kMinSize + index * kStep;
 		};
+		{
+			const auto username = peer->username();
+			if (!username.isEmpty()) {
+				const auto measured = ('@' + username).toUpper();
+				const auto qrMaxSize = st::boxWideWidth
+					- rect::m::sum::h(st::boxRowPadding)
+					- rect::m::sum::h(st::profileQrBackgroundMargins);
+				auto picked = kMinSize;
+				for (auto i = kSizeAmount - 1; i >= 0; --i) {
+					const auto size = indexToFontSize(i);
+					const auto font = CreateFont(size, style::Scale());
+					if (font->width(measured) <= qrMaxSize) {
+						picked = size;
+						break;
+					}
+				}
+				state->fontSizeValue = picked;
+			}
+		}
 		slider->geometryValue(
-		) | rpl::start_with_next([=](const QRect &rect) {
+		) | rpl::on_next([=](const QRect &rect) {
 			updateGeometry(fontSizeToIndex(state->fontSizeValue.current()));
 		}, box->lifetime());
 
@@ -838,19 +870,12 @@ void FillPeerQrBox(
 		if (state->saveButtonBusy.current()) {
 			return;
 		}
-		const auto buttonWidth = state->saveButton
-			? state->saveButton->width()
-			: 0;
 		state->saveButtonBusy = true;
-		if (state->saveButton) {
-			state->saveButton->resizeToWidth(buttonWidth);
-		}
-
 		const auto userpicToggled = state->userpicToggled.current();
 		const auto backgroundToggled = state->backgroundToggled.current();
 		const auto scale = style::kScaleDefault
 			* (kMaxQualities + int(state->scaleValue.current() * 2));
-		const auto divider = std::max(1, style::Scale())
+		const auto divider = std::max(100, style::Scale())
 			/ style::kScaleDefault;
 		const auto profileQrBackgroundRadius = style::ConvertScale(
 			st::profileQrBackgroundRadius / divider,
@@ -892,7 +917,7 @@ void FillPeerQrBox(
 		const auto top = photoSize
 			? userpicMedia->image(photoSize)
 			: QImage();
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 
 		crl::async([=] {
 			const auto qrImage = TelegramQr(
@@ -954,7 +979,11 @@ void FillPeerQrBox(
 				auto mime = std::make_unique<QMimeData>();
 				mime->setImageData(std::move(image));
 				QGuiApplication::clipboard()->setMimeData(mime.release());
-				show->showToast(tr::lng_group_invite_qr_copied(tr::now));
+				show->showToast({
+					.text = { tr::lng_group_invite_qr_copied(tr::now) },
+					.iconLottie = u"toast/copy"_q,
+					.iconLottieSize = st::toastLottieIconSize,
+				});
 			});
 		});
 	});
@@ -966,16 +995,32 @@ void FillPeerQrBox(
 			saveButton->height() / 2);
 		AddChildToWidgetCenter(saveButton, loadingAnimation);
 		loadingAnimation->showOn(state->saveButtonBusy.value());
+
+		box->showFinishes(
+		) | rpl::take(1) | rpl::on_next([=] {
+			if (const auto window = Core::App().findWindow(box)) {
+				window->checkHighlightControl(
+					u"self-qr-code/copy"_q,
+					saveButton,
+					{
+						.color = &st::activeButtonFg,
+						.opacity = 0.6,
+						.rippleShape = true,
+						.scroll = false,
+					});
+			}
+		}, box->lifetime());
 	}
 
-	const auto buttonWidth = box->width()
-		- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
-	state->saveButton->widthValue() | rpl::filter([=] {
-		return (state->saveButton->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
-		state->saveButton->resizeToWidth(buttonWidth);
-	}, state->saveButton->lifetime());
 	box->addTopButton(st::boxTitleClose, [=] { box->closeBox(); });
 }
 
+void DefaultShowFillPeerQrBoxCallback(
+		std::shared_ptr<Ui::Show> show,
+		PeerData *peer) {
+	if (peer && !peer->username().isEmpty()) {
+		show->show(Box(Ui::FillPeerQrBox, peer, std::nullopt, nullptr));
+	}
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/boxes/peer_qr_box.h b/Telegram/SourceFiles/ui/boxes/peer_qr_box.h
index 043447ce4a539b..54d0e36b14ee65 100644
--- a/Telegram/SourceFiles/ui/boxes/peer_qr_box.h
+++ b/Telegram/SourceFiles/ui/boxes/peer_qr_box.h
@@ -12,6 +12,11 @@ class PeerData;
 namespace Ui {
 
 class GenericBox;
+class Show;
+
+void DefaultShowFillPeerQrBoxCallback(
+	std::shared_ptr<Ui::Show> show,
+	PeerData *peer);
 
 void FillPeerQrBox(
 	not_null<Ui::GenericBox*> box,
diff --git a/Telegram/SourceFiles/ui/boxes/rate_call_box.cpp b/Telegram/SourceFiles/ui/boxes/rate_call_box.cpp
index d56889f0b81d43..fa41cd1e898c1d 100644
--- a/Telegram/SourceFiles/ui/boxes/rate_call_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/rate_call_box.cpp
@@ -93,13 +93,13 @@ void RateCallBox::ratingChanged(int value) {
 
 			updateMaxHeight();
 			_comment->heightChanges(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				commentResized();
 			}, _comment->lifetime());
 			_comment->submits(
-			) | rpl::start_with_next([=] { send(); }, _comment->lifetime());
+			) | rpl::on_next([=] { send(); }, _comment->lifetime());
 			_comment->cancelled(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				closeBox();
 			}, _comment->lifetime());
 		}
diff --git a/Telegram/SourceFiles/ui/boxes/report_box_graphics.cpp b/Telegram/SourceFiles/ui/boxes/report_box_graphics.cpp
index 483e61ceae117d..0c2111a467f4d1 100644
--- a/Telegram/SourceFiles/ui/boxes/report_box_graphics.cpp
+++ b/Telegram/SourceFiles/ui/boxes/report_box_graphics.cpp
@@ -159,7 +159,7 @@ void ReportDetailsBox(
 		const auto text = details->getLastText();
 		done(text);
 	};
-	details->submits() | rpl::start_with_next(submit, details->lifetime());
+	details->submits() | rpl::on_next(submit, details->lifetime());
 	box->addButton(tr::lng_report_button(), submit);
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
@@ -183,11 +183,11 @@ not_null<Ui::AbstractButton*> AddReportOptionButton(
 	label->setTextColorOverride(textFg);
 	const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
 	icon->resize(st::settingsPremiumArrow.size());
-	icon->paintRequest() | rpl::start_with_next([=, w = icon->width()] {
+	icon->paintRequest() | rpl::on_next([=, w = icon->width()] {
 		auto p = Painter(icon);
 		st::settingsPremiumArrow.paint(p, 0, 0, w, textFg);
 	}, icon->lifetime());
-	button->sizeValue() | rpl::start_with_next([=](const QSize &size) {
+	button->sizeValue() | rpl::on_next([=](const QSize &size) {
 		const auto left = button->st().padding.left();
 		const auto right = button->st().padding.right();
 		icon->moveToRight(right, (size.height() - icon->height()) / 2);
@@ -211,7 +211,7 @@ void AddReportDetailsIconButton(not_null<GenericBox*> box) {
 		box->verticalLayout(),
 		{
 			.name = u"blocked_peers_empty"_q,
-			.sizeOverride = Size(st::changePhoneIconSize),
+			.sizeOverride = st::normalBoxLottieSize,
 		},
 		{});
 	box->setShowFinishedCallback([animate = std::move(icon.animate)] {
diff --git a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
index e44a172f11bd43..fd1fb8ecfc57eb 100644
--- a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
@@ -9,6 +9,8 @@ For license and copyright information please follow this link:
 
 #include "base/object_ptr.h"
 #include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "settings/settings_common.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
@@ -16,42 +18,18 @@ For license and copyright information please follow this link:
 #include "ui/widgets/gradient_round_button.h"
 #include "ui/widgets/labels.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/vertical_list.h"
 #include "styles/style_layers.h"
 #include "styles/style_premium.h"
+#include "styles/style_boxes.h"
+#include "styles/style_settings.h"
 
 namespace Ui {
 namespace {
 
 constexpr auto kShowOrLineOpacity = 0.3;
 
-[[nodiscard]] object_ptr<RpWidget> MakeShowOrPremiumIcon(
-		not_null<RpWidget*> parent,
-		not_null<const style::icon*> icon) {
-	const auto margin = st::showOrIconMargin;
-	const auto padding = st::showOrIconPadding;
-	const auto inner = padding.top() + icon->height() + padding.bottom();
-	const auto full = margin.top() + inner + margin.bottom();
-	auto result = object_ptr<FixedHeightWidget>(parent, full);
-	const auto raw = result.data();
-
-	raw->resize(st::boxWideWidth, full);
-	raw->paintRequest(
-	) | rpl::start_with_next([=] {
-		auto p = QPainter(raw);
-		auto hq = PainterHighQualityEnabler(p);
-		const auto width = raw->width();
-		const auto position = QPoint((width - inner) / 2, margin.top());
-		const auto rect = QRect(position, QSize(inner, inner));
-		const auto shift = QPoint(padding.left(), padding.top());
-		p.setPen(Qt::NoPen);
-		p.setBrush(st::showOrIconBg);
-		p.drawEllipse(rect);
-		icon->paint(p, position + shift, width);
-	}, raw->lifetime());
-
-	return result;
-}
-
 } // namespace
 
 object_ptr<RpWidget> MakeShowOrLabel(
@@ -64,12 +42,12 @@ object_ptr<RpWidget> MakeShowOrLabel(
 	const auto raw = result.data();
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 
 		const auto full = st::showOrLineWidth;
 		const auto left = (raw->width() - full) / 2;
-		const auto text = raw->textMaxWidth() + 2 * st::showOrLabelSkip;
+		const auto text = raw->naturalWidth() + 2 * st::showOrLabelSkip;
 		const auto fill = (full - text) / 2;
 		const auto stroke = st::lineWidth;
 		const auto top = st::showOrLineTop;
@@ -97,7 +75,7 @@ void ShowOrPremiumBox(
 		rpl::producer<TextWithEntities> premiumAbout;
 		rpl::producer<QString> premiumButton;
 		QString toast;
-		const style::icon *icon = nullptr;
+		QString lottie;
 	};
 	auto skin = (type == ShowOrPremium::LastSeen)
 		? Skin{
@@ -105,37 +83,35 @@ void ShowOrPremiumBox(
 			tr::lng_lastseen_show_about(
 				lt_user,
 				rpl::single(TextWithEntities{ shortName }),
-				Text::RichLangValue),
+				tr::rich),
 			tr::lng_lastseen_show_button(),
 			tr::lng_lastseen_or(),
 			tr::lng_lastseen_premium_title(),
 			tr::lng_lastseen_premium_about(
 				lt_user,
 				rpl::single(TextWithEntities{ shortName }),
-				Text::RichLangValue),
+				tr::rich),
 			tr::lng_lastseen_premium_button(),
 			tr::lng_lastseen_shown_toast(tr::now),
-			&st::showOrIconLastSeen,
+			u"show_or_premium_lastseen"_q,
 		}
-		: (type == ShowOrPremium::ReadTime)
-		? Skin{
+		: Skin{
 			tr::lng_readtime_show_title(),
 			tr::lng_readtime_show_about(
 				lt_user,
 				rpl::single(TextWithEntities{ shortName }),
-				Text::RichLangValue),
+				tr::rich),
 			tr::lng_readtime_show_button(),
 			tr::lng_readtime_or(),
 			tr::lng_readtime_premium_title(),
 			tr::lng_readtime_premium_about(
 				lt_user,
 				rpl::single(TextWithEntities{ shortName }),
-				Text::RichLangValue),
+				tr::rich),
 			tr::lng_readtime_premium_button(),
 			tr::lng_readtime_shown_toast(tr::now),
-			&st::showOrIconReadTime,
-		}
-		: Skin();
+			u"show_or_premium_readtime"_q,
+		};
 
 	box->setStyle(st::showOrBox);
 	box->setWidth(st::boxWideWidth);
@@ -148,41 +124,59 @@ void ShowOrPremiumBox(
 		0,
 		st::showOrBox.buttonPadding.right(),
 		0);
-	box->addRow(MakeShowOrPremiumIcon(box, skin.icon));
+
+	auto icon = Settings::CreateLottieIcon(
+		box,
+		{
+			.name = skin.lottie,
+			.sizeOverride = st::normalBoxLottieSize
+				- Size(st::showOrTitleIconMargin * 2),
+		},
+		{ 0, st::showOrTitleIconMargin, 0, st::showOrTitleIconMargin });
+	Settings::AddLottieIconWithCircle(
+		box->verticalLayout(),
+		std::move(icon.widget),
+		st::settingsBlockedListIconPadding,
+		st::normalBoxLottieSize);
+	Ui::AddSkip(box->verticalLayout());
 	box->addRow(
 		object_ptr<FlatLabel>(
 			box,
 			std::move(skin.showTitle),
 			st::boostCenteredTitle),
-		st::showOrTitlePadding + buttonPadding);
+		st::showOrTitlePadding + buttonPadding,
+		style::al_top);
 	box->addRow(
 		object_ptr<FlatLabel>(
 			box,
 			std::move(skin.showAbout),
 			st::boostText),
-		st::showOrAboutPadding + buttonPadding);
+		st::showOrAboutPadding + buttonPadding,
+		style::al_top);
 	const auto show = box->addRow(
 		object_ptr<RoundButton>(
 			box,
 			std::move(skin.showButton),
 			st::showOrShowButton),
 		buttonPadding);
-	show->setTextTransform(RoundButton::TextTransform::NoTransform);
 	box->addRow(
 		MakeShowOrLabel(box, std::move(skin.orPremium)),
-		st::showOrLabelPadding + buttonPadding);
+		st::showOrLabelPadding + buttonPadding,
+		style::al_justify);
 	box->addRow(
 		object_ptr<FlatLabel>(
 			box,
 			std::move(skin.premiumTitle),
 			st::boostCenteredTitle),
-		st::showOrTitlePadding + buttonPadding);
+		st::showOrTitlePadding + buttonPadding,
+		style::al_top);
 	box->addRow(
 		object_ptr<FlatLabel>(
 			box,
 			std::move(skin.premiumAbout),
 			st::boostText),
-		st::showOrPremiumAboutPadding + buttonPadding);
+		st::showOrPremiumAboutPadding + buttonPadding,
+		style::al_top);
 
 	const auto premium = CreateChild<GradientButton>(
 		box.get(),
@@ -198,15 +192,16 @@ void ShowOrPremiumBox(
 	rpl::combine(
 		premium->widthValue(),
 		label->widthValue()
-	) | rpl::start_with_next([=](int outer, int width) {
+	) | rpl::on_next([=](int outer, int width) {
 		label->moveToLeft(
 			(outer - width) / 2,
 			st::premiumPreviewBox.button.textTop,
 			outer);
 	}, label->lifetime());
 
-	box->setShowFinishedCallback([=] {
+	box->setShowFinishedCallback([=, animate = std::move(icon.animate)] {
 		premium->startGlareAnimation();
+		animate(anim::repeat::once);
 	});
 
 	box->addButton(
diff --git a/Telegram/SourceFiles/ui/boxes/single_choice_box.cpp b/Telegram/SourceFiles/ui/boxes/single_choice_box.cpp
index 2083a0f483d95f..10303d64a960d3 100644
--- a/Telegram/SourceFiles/ui/boxes/single_choice_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/single_choice_box.cpp
@@ -46,7 +46,7 @@ void SingleChoiceBox(
 	}
 	const auto callback = args.callback.value();
 	group->setChangedCallback([=](int value) {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		callback(value);
 		if (weak) {
 			box->closeBox();
diff --git a/Telegram/SourceFiles/ui/boxes/time_picker_box.cpp b/Telegram/SourceFiles/ui/boxes/time_picker_box.cpp
index 0cf0d5121d9023..f79a12f1fa17aa 100644
--- a/Telegram/SourceFiles/ui/boxes/time_picker_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/time_picker_box.cpp
@@ -18,12 +18,6 @@ For license and copyright information please follow this link:
 
 namespace Ui {
 
-namespace {
-
-constexpr auto kMinYScale = 0.2;
-
-} // namespace
-
 std::vector<TimeId> DefaultTimePickerValues() {
 	return {
 		(60 * 15),
@@ -81,27 +75,12 @@ Fn<TimeId()> TimePickerBox(
 		return std::ceil(mf.horizontalAdvance(*maxPhrase));
 	}();
 	const auto itemHeight = st::historyMessagesTTLPickerItemHeight;
-	auto paintCallback = [=](
-			QPainter &p,
-			int index,
-			float64 y,
-			float64 distanceFromCenter,
-			int outerWidth) {
-		const auto r = QRectF(0, y, outerWidth, itemHeight);
-		const auto progress = std::abs(distanceFromCenter);
-		const auto revProgress = 1. - progress;
-		p.save();
-		p.translate(r.center());
-		const auto yScale = kMinYScale
-			+ (1. - kMinYScale) * anim::easeOutCubic(1., revProgress);
-		p.scale(1., yScale);
-		p.translate(-r.center());
-		p.setOpacity(revProgress);
-		p.setFont(font);
-		p.setPen(st::defaultFlatLabel.textFg);
-		p.drawText(r, phrases[index], style::al_center);
-		p.restore();
-	};
+	auto paintCallback = Ui::VerticalDrumPicker::DefaultPaintCallback(
+		font,
+		itemHeight,
+		[=](QPainter &p, QRectF r, int index) {
+			p.drawText(r, phrases[index], style::al_center);
+		});
 
 	const auto picker = Ui::CreateChild<Ui::VerticalDrumPicker>(
 		content,
@@ -111,13 +90,13 @@ Fn<TimeId()> TimePickerBox(
 		startIndex);
 
 	content->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		picker->resize(maxPhraseWidth, s.height());
 		picker->moveToLeft((s.width() - picker->width()) / 2, 0);
 	}, content->lifetime());
 
 	content->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(content);
 
 		p.fillRect(r, Qt::transparent);
diff --git a/Telegram/SourceFiles/ui/cached_round_corners.cpp b/Telegram/SourceFiles/ui/cached_round_corners.cpp
index 4aba838513dcb0..7da69a2299a1fc 100644
--- a/Telegram/SourceFiles/ui/cached_round_corners.cpp
+++ b/Telegram/SourceFiles/ui/cached_round_corners.cpp
@@ -76,7 +76,7 @@ void CreateMaskCorners() {
 }
 
 void CreatePaletteCorners() {
-	PrepareCorners(MenuCorners, st::roundRadiusSmall, st::menuBg);
+	PrepareCorners(MenuCorners, st::innerDropdownRadius, st::menuBg);
 	PrepareCorners(BoxCorners, st::boxRadius, st::boxBg);
 	PrepareCorners(DateCorners, st::dateRadius, st::msgDateImgBg);
 	PrepareCorners(OverviewVideoCorners, st::overviewVideoStatusRadius, st::msgDateImgBg);
@@ -100,7 +100,7 @@ void StartCachedCorners() {
 	CreatePaletteCorners();
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		CreatePaletteCorners();
 	}, PaletteChangedLifetime);
 }
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp
index 78148f84cc2f3c..76ea640353231f 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp
@@ -22,12 +22,26 @@ namespace Ui {
 AbstractSingleFilePreview::AbstractSingleFilePreview(
 	QWidget *parent,
 	const style::ComposeControls &st,
-	AttachControls::Type type)
+	AttachControls::Type type,
+	const Text::MarkedContext &captionContext)
 : AbstractSinglePreview(parent)
 , _st(st)
 , _type(type)
+, _captionContext(captionContext)
 , _editMedia(this, _st.files.buttonFile)
 , _deleteMedia(this, _st.files.buttonFile) {
+	const auto repaint = _captionContext.repaint;
+	_captionContext.repaint = [=] {
+		if (repaint) {
+			repaint();
+		}
+		const auto rect = captionRect();
+		if (rect.isEmpty()) {
+			update();
+		} else {
+			update(rect);
+		}
+	};
 
 	_editMedia->setIconOverride(&_st.files.buttonFileEdit);
 	_deleteMedia->setIconOverride(&_st.files.buttonFileDelete);
@@ -42,6 +56,7 @@ AbstractSingleFilePreview::AbstractSingleFilePreview(
 		_deleteMedia->hide();
 		_editMedia->hide();
 	}
+	setMouseTracking(true);
 }
 
 AbstractSingleFilePreview::~AbstractSingleFilePreview() = default;
@@ -52,6 +67,10 @@ rpl::producer<> AbstractSingleFilePreview::editRequests() const {
 	}) | rpl::flatten_latest();
 }
 
+rpl::producer<> AbstractSingleFilePreview::renameRequests() const {
+	return _renameRequests.events();
+}
+
 rpl::producer<> AbstractSingleFilePreview::deleteRequests() const {
 	return _deleteMedia->clicks() | rpl::to_empty;
 }
@@ -60,6 +79,40 @@ rpl::producer<> AbstractSingleFilePreview::modifyRequests() const {
 	return rpl::never<>();
 }
 
+void AbstractSingleFilePreview::setRenameEnabled(bool enabled) {
+	if (_renameEnabled == enabled) {
+		return;
+	}
+	_renameEnabled = enabled;
+	if (!_renameEnabled) {
+		_namePressed = false;
+		applyCursor(style::cur_default);
+	}
+}
+
+void AbstractSingleFilePreview::setDisplayName(const QString &displayName) {
+	_data.name = displayName;
+	updateTextWidthFor(_data);
+	updateDataGeometry();
+	update();
+}
+
+void AbstractSingleFilePreview::setCaption(const TextWithTags &caption) {
+	auto marked = TextWithEntities{
+		caption.text,
+		TextUtilities::ConvertTextTagsToEntities(caption.tags),
+	};
+	marked = TextUtilities::SingleLine(marked);
+	_data.caption.setMarkedText(
+		st::defaultTextStyle,
+		marked,
+		kMarkupTextOptions,
+		_captionContext);
+	updateTextWidthFor(_data);
+	updateDataGeometry();
+	update();
+}
+
 void AbstractSingleFilePreview::prepareThumbFor(
 		Data &data,
 		const QImage &preview) {
@@ -136,6 +189,23 @@ void AbstractSingleFilePreview::paintEvent(QPaintEvent *e) {
 		width(),
 		_data.statusText,
 		_data.statusWidth);
+	if (!_data.caption.isEmpty()) {
+		p.setPen(_st.files.nameFg);
+		const auto captionTop = y
+			+ st.thumbSize
+			+ st::attachPreviewCaptionTopOffset;
+		_data.caption.draw(p, {
+			.position = {
+				x,
+				captionTop,
+			},
+			.outerWidth = width(),
+			.availableWidth = _data.captionAvailableWidth,
+			.align = style::al_left,
+			.elisionLines = 1,
+			.elisionBreakEverywhere = true,
+		});
+	}
 }
 
 void AbstractSingleFilePreview::resizeEvent(QResizeEvent *e) {
@@ -152,7 +222,7 @@ void AbstractSingleFilePreview::resizeEvent(QResizeEvent *e) {
 	_editMedia->moveToRight(right, top);
 }
 
-bool AbstractSingleFilePreview::isThumbedLayout(Data &data) const {
+bool AbstractSingleFilePreview::isThumbedLayout(const Data &data) const {
 	return (!data.fileThumb.isNull() && !data.fileIsAudio);
 }
 
@@ -172,6 +242,10 @@ void AbstractSingleFilePreview::updateTextWidthFor(Data &data) {
 		- _st.files.buttonFile.width * buttonsCount
 		- st::sendBoxAlbumGroupEditInternalSkip * buttonsCount
 		- st::sendBoxAlbumGroupSkipRight;
+	const auto availableCaptionWidth = st::sendMediaPreviewSize
+		- _st.files.buttonFile.width * buttonsCount
+		- st::sendBoxAlbumGroupEditInternalSkip * buttonsCount
+		- st::sendBoxAlbumGroupSkipRight;
 	data.nameWidth = st::semiboldFont->width(data.name);
 	if (data.nameWidth > availableFileWidth) {
 		data.name = st::semiboldFont->elided(
@@ -181,17 +255,93 @@ void AbstractSingleFilePreview::updateTextWidthFor(Data &data) {
 		data.nameWidth = st::semiboldFont->width(data.name);
 	}
 	data.statusWidth = st::normalFont->width(data.statusText);
+	data.captionAvailableWidth = availableCaptionWidth;
 }
 
-void AbstractSingleFilePreview::setData(const Data &data) {
-	_data = data;
+void AbstractSingleFilePreview::updateDataGeometry() {
+	const auto &st = !isThumbedLayout(_data)
+		? st::attachPreviewLayout
+		: st::attachPreviewThumbLayout;
+	const auto height = st.thumbSize + (_data.caption.isEmpty()
+		? 0
+		: (st::attachPreviewCaptionTopOffset + _data.caption.lineHeight()));
+	resize(width(), height);
+}
 
+QRect AbstractSingleFilePreview::captionRect() const {
+	if (_data.caption.isEmpty()) {
+		return {};
+	}
+	const auto w = width()
+		- st::boxPhotoPadding.left()
+		- st::boxPhotoPadding.right();
+	const auto &st = !isThumbedLayout(_data)
+		? st::attachPreviewLayout
+		: st::attachPreviewThumbLayout;
+	const auto x = (width() - w) / 2;
+	const auto captionLineHeight = _data.caption.lineHeight();
+	const auto top = st.thumbSize
+		+ st::attachPreviewCaptionTopOffset;
+	return QRect(
+		x,
+		top,
+		_data.captionAvailableWidth,
+		captionLineHeight) + st::attachPreviewCaptionRepaintMargin;
+}
+
+void AbstractSingleFilePreview::setData(Data data) {
+	_data = std::move(data);
 	updateTextWidthFor(_data);
+	updateDataGeometry();
+}
 
+void AbstractSingleFilePreview::mousePressEvent(QMouseEvent *e) {
+	if (isOverName(e->pos())) {
+		_namePressed = true;
+	}
+}
+
+void AbstractSingleFilePreview::mouseMoveEvent(QMouseEvent *e) {
+	applyCursor(isOverName(e->pos())
+		? style::cur_pointer
+		: style::cur_default);
+}
+
+void AbstractSingleFilePreview::mouseReleaseEvent(QMouseEvent *e) {
+	if (base::take(_namePressed)
+		&& (e->button() == Qt::LeftButton)
+		&& isOverName(e->pos())) {
+		_renameRequests.fire({});
+	}
+}
+
+QRect AbstractSingleFilePreview::nameRect() const {
+	const auto w = width()
+		- st::boxPhotoPadding.left()
+		- st::boxPhotoPadding.right();
 	const auto &st = !isThumbedLayout(_data)
 		? st::attachPreviewLayout
 		: st::attachPreviewThumbLayout;
-	resize(width(), st.thumbSize);
+	const auto nameleft = st.thumbSize + st.thumbSkip;
+	const auto nametop = st.nameTop;
+	const auto x = (width() - w) / 2, y = 0;
+	return style::rtlrect(
+		x + nameleft,
+		y + nametop,
+		_data.nameWidth,
+		st::semiboldFont->height,
+		width());
+}
+
+bool AbstractSingleFilePreview::isOverName(QPoint point) const {
+	return _renameEnabled && nameRect().contains(point);
+}
+
+void AbstractSingleFilePreview::applyCursor(style::cursor cursor) {
+	if (_cursor != cursor) {
+		_cursor = cursor;
+		setCursor(_cursor);
+	}
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.h
index f149921428b793..11b7356f0f9372 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.h
@@ -24,42 +24,66 @@ class AbstractSingleFilePreview : public AbstractSinglePreview {
 	AbstractSingleFilePreview(
 		QWidget *parent,
 		const style::ComposeControls &st,
-		AttachControls::Type type);
+		AttachControls::Type type,
+		const Text::MarkedContext &captionContext);
 	~AbstractSingleFilePreview();
 
 	[[nodiscard]] rpl::producer<> deleteRequests() const override;
 	[[nodiscard]] rpl::producer<> editRequests() const override;
+	[[nodiscard]] rpl::producer<> renameRequests() const;
 	[[nodiscard]] rpl::producer<> modifyRequests() const override;
+	void setRenameEnabled(bool enabled);
+	virtual void setDisplayName(const QString &displayName);
+	virtual void setCaption(const TextWithTags &caption);
 
 protected:
 	struct Data {
 		QPixmap fileThumb;
 		QString name;
 		QString statusText;
+		Text::String caption;
 		int nameWidth = 0;
 		int statusWidth = 0;
+		int captionAvailableWidth = 0;
 		bool fileIsAudio = false;
 		bool fileIsImage = false;
 	};
 
 	void prepareThumbFor(Data &data, const QImage &preview);
-	bool isThumbedLayout(Data &data) const;
+	bool isThumbedLayout(const Data &data) const;
+	[[nodiscard]] const Text::MarkedContext &captionContext() const {
+		return _captionContext;
+	}
 
-	void setData(const Data &data);
+	void setData(Data data);
 
 private:
 	void paintEvent(QPaintEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
 
 	void updateTextWidthFor(Data &data);
+	void updateDataGeometry();
+	[[nodiscard]] QRect captionRect() const;
+	[[nodiscard]] QRect nameRect() const;
+	[[nodiscard]] bool isOverName(QPoint point) const;
+	void applyCursor(style::cursor cursor);
 
 	const style::ComposeControls &_st;
 	const AttachControls::Type _type;
+	Text::MarkedContext _captionContext;
 
 	Data _data;
 
 	object_ptr<IconButton> _editMedia = { nullptr };
 	object_ptr<IconButton> _deleteMedia = { nullptr };
+	rpl::event_stream<> _renameRequests;
+
+	style::cursor _cursor = style::cur_default;
+	bool _namePressed = false;
+	bool _renameEnabled = false;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp
index 3275c8a5a8d38c..5a088922513966 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp
@@ -8,7 +8,6 @@ For license and copyright information please follow this link:
 #include "ui/chat/attach/attach_abstract_single_media_preview.h"
 
 #include "editor/photo_editor_common.h"
-#include "lang/lang_keys.h"
 #include "ui/chat/attach/attach_controls.h"
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/effects/spoiler_mess.h"
@@ -16,12 +15,10 @@ For license and copyright information please follow this link:
 #include "ui/painter.h"
 #include "ui/power_saving.h"
 #include "ui/ui_utility.h"
-#include "ui/widgets/popup_menu.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
-#include "styles/style_menu_icons.h"
 
 namespace Ui {
 namespace {
@@ -33,11 +30,9 @@ constexpr auto kMinPreviewWidth = 20;
 AbstractSingleMediaPreview::AbstractSingleMediaPreview(
 	QWidget *parent,
 	const style::ComposeControls &st,
-	AttachControls::Type type,
-	Fn<bool()> canToggleSpoiler)
+	AttachControls::Type type)
 : AbstractSinglePreview(parent)
 , _st(st)
-, _canToggleSpoiler(std::move(canToggleSpoiler))
 , _minThumbH(st::sendBoxAlbumGroupSize.height()
 	+ st::sendBoxAlbumGroupSkipTop * 2)
 , _controls(base::make_unique_q<AttachControlsWidget>(this, type)) {
@@ -73,6 +68,11 @@ void AbstractSingleMediaPreview::setSpoiler(bool spoiler) {
 	update();
 }
 
+void AbstractSingleMediaPreview::setCanShowHighQualityBadge(bool value) {
+	_canShowHighQualityBadge = value;
+	update();
+}
+
 bool AbstractSingleMediaPreview::hasSpoiler() const {
 	return _spoiler != nullptr;
 }
@@ -81,10 +81,6 @@ bool AbstractSingleMediaPreview::canHaveSpoiler() const {
 	return supportsSpoilers();
 }
 
-rpl::producer<bool> AbstractSingleMediaPreview::spoileredChanges() const {
-	return _spoileredChanges.events();
-}
-
 QImage AbstractSingleMediaPreview::generatePriceTagBackground() const {
 	return (_previewBlurred.isNull() ? _preview : _previewBlurred).toImage();
 }
@@ -112,7 +108,7 @@ void AbstractSingleMediaPreview::preparePreview(QImage preview) {
 		preview = Images::Prepare(
 			std::move(preview),
 			QSize(maxW, maxH) * ratio,
-			{ .options = Images::Option::Blur, .outer = { maxW, maxH } });
+			{ .outer = { maxW, maxH } });
 	}
 	auto originalWidth = preview.width();
 	auto originalHeight = preview.height();
@@ -179,8 +175,19 @@ void AbstractSingleMediaPreview::paintEvent(QPaintEvent *e) {
 		}
 	});
 
+	auto hq = std::optional<PainterHighQualityEnabler>();
 	if (drawBackground()) {
 		const auto &padding = st::boxPhotoPadding;
+		const auto bgRect = QRect(
+			padding.left(),
+			0,
+			width() - padding.left() - padding.right(),
+			height());
+		const auto radius = st::bubbleRadiusSmall;
+		auto clipPath = QPainterPath();
+		clipPath.addRoundedRect(bgRect, radius, radius);
+		hq.emplace(p);
+		p.setClipPath(clipPath);
 		if (_previewLeft > padding.left()) {
 			p.fillRect(
 				padding.left(),
@@ -241,6 +248,12 @@ void AbstractSingleMediaPreview::paintEvent(QPaintEvent *e) {
 		auto icon = &st::historyFileInPlay;
 		icon->paintInCenter(p, inner);
 	}
+	if (_canShowHighQualityBadge && _sendWay.sendLargePhotos()) {
+		PaintHighQualityBadge(
+			p,
+			_st,
+			QRect(_previewLeft, _previewTop, _previewWidth, _previewHeight));
+	}
 }
 
 void AbstractSingleMediaPreview::mousePressEvent(QMouseEvent *e) {
@@ -257,9 +270,7 @@ void AbstractSingleMediaPreview::mouseMoveEvent(QMouseEvent *e) {
 
 void AbstractSingleMediaPreview::mouseReleaseEvent(QMouseEvent *e) {
 	if (base::take(_pressed) && isOverPreview(e->pos())) {
-		if (e->button() == Qt::RightButton) {
-			showContextMenu(e->globalPos());
-		} else if (isPhoto()) {
+		if (e->button() == Qt::LeftButton && isPhoto()) {
 			_photoEditorRequests.fire({});
 		}
 	}
@@ -272,32 +283,6 @@ void AbstractSingleMediaPreview::applyCursor(style::cursor cursor) {
 	}
 }
 
-void AbstractSingleMediaPreview::showContextMenu(QPoint position) {
-	if (!_canToggleSpoiler()
-		|| !_sendWay.sendImagesAsPhotos()
-		|| !supportsSpoilers()) {
-		return;
-	}
-	_menu = base::make_unique_q<Ui::PopupMenu>(
-		this,
-		_st.tabbed.menu);
-
-	const auto &icons = _st.tabbed.icons;
-	const auto spoilered = hasSpoiler();
-	_menu->addAction(spoilered
-		? tr::lng_context_disable_spoiler(tr::now)
-		: tr::lng_context_spoiler_effect(tr::now), [=] {
-		setSpoiler(!spoilered);
-		_spoileredChanges.fire_copy(!spoilered);
-	}, spoilered ? &icons.menuSpoilerOff : &icons.menuSpoiler);
-
-	if (_menu->empty()) {
-		_menu = nullptr;
-	} else {
-		_menu->popup(position);
-	}
-}
-
 int AbstractSingleMediaPreview::previewLeft() const {
 	return _previewLeft;
 }
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.h
index ba9595f289e69d..e4b223fdc76929 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.h
@@ -19,15 +19,12 @@ struct ComposeControls;
 
 namespace Ui {
 
-class PopupMenu;
-
 class AbstractSingleMediaPreview : public AbstractSinglePreview {
 public:
 	AbstractSingleMediaPreview(
 		QWidget *parent,
 		const style::ComposeControls &st,
-		AttachControls::Type type,
-		Fn<bool()> canToggleSpoiler);
+		AttachControls::Type type);
 	~AbstractSingleMediaPreview();
 
 	void setSendWay(SendFilesWay way);
@@ -40,9 +37,9 @@ class AbstractSingleMediaPreview : public AbstractSinglePreview {
 	[[nodiscard]] bool isPhoto() const;
 
 	void setSpoiler(bool spoiler);
+	void setCanShowHighQualityBadge(bool value);
 	[[nodiscard]] bool hasSpoiler() const;
 	[[nodiscard]] bool canHaveSpoiler() const;
-	[[nodiscard]] rpl::producer<bool> spoileredChanges() const;
 
 	[[nodiscard]] QImage generatePriceTagBackground() const;
 
@@ -70,11 +67,9 @@ class AbstractSingleMediaPreview : public AbstractSinglePreview {
 
 	[[nodiscard]] bool isOverPreview(QPoint position) const;
 	void applyCursor(style::cursor cursor);
-	void showContextMenu(QPoint position);
 
 	const style::ComposeControls &_st;
 	SendFilesWay _sendWay;
-	Fn<bool()> _canToggleSpoiler;
 	bool _animated = false;
 	QPixmap _preview;
 	QPixmap _previewBlurred;
@@ -84,7 +79,7 @@ class AbstractSingleMediaPreview : public AbstractSinglePreview {
 	int _previewHeight = 0;
 
 	std::unique_ptr<SpoilerAnimation> _spoiler;
-	rpl::event_stream<bool> _spoileredChanges;
+	bool _canShowHighQualityBadge = false;
 
 	const int _minThumbH;
 	const base::unique_qptr<AttachControlsWidget> _controls;
@@ -93,8 +88,6 @@ class AbstractSingleMediaPreview : public AbstractSinglePreview {
 	style::cursor _cursor = style::cur_default;
 	bool _pressed = false;
 
-	base::unique_qptr<PopupMenu> _menu;
-
 	rpl::event_stream<> _modifyRequests;
 
 };
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
index b02409084427ff..6082a4bb24b910 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
@@ -10,13 +10,10 @@ For license and copyright information please follow this link:
 #include "ui/chat/attach/attach_album_thumbnail.h"
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/effects/spoiler_mess.h"
-#include "ui/widgets/popup_menu.h"
 #include "ui/painter.h"
-#include "lang/lang_keys.h"
 #include "styles/style_chat.h"
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
-#include "styles/style_menu_icons.h"
 
 #include <QtWidgets/QApplication>
 
@@ -37,12 +34,12 @@ AlbumPreview::AlbumPreview(
 	QWidget *parent,
 	const style::ComposeControls &st,
 	gsl::span<Ui::PreparedFile> items,
-	SendFilesWay way,
-	Fn<bool()> canToggleSpoiler)
+	const Text::MarkedContext &captionContext,
+	SendFilesWay way)
 : RpWidget(parent)
 , _st(st)
+, _captionContext(captionContext)
 , _sendWay(way)
-, _canToggleSpoiler(std::move(canToggleSpoiler))
 , _dragTimer([=] { switchToDrag(); }) {
 	setMouseTracking(true);
 	prepareThumbs(items);
@@ -62,6 +59,37 @@ void AlbumPreview::setSendWay(SendFilesWay way) {
 	update();
 }
 
+void AlbumPreview::setCaption(int index, const TextWithTags &caption) {
+	if (index < 0 || index >= _thumbs.size()) {
+		return;
+	}
+	const auto realIndex = _order[index];
+	const auto oldHeight = _thumbs[realIndex]->fileHeight();
+	_thumbs[realIndex]->setCaption(caption);
+	const auto newHeight = _thumbs[realIndex]->fileHeight();
+	if (oldHeight == newHeight) {
+		return;
+	}
+	const auto firstFileHeight = _thumbs.front()->fileHeight();
+	_hasMixedFileHeights = ranges::any_of(
+		_thumbs,
+		[=](const auto &thumb) {
+			return thumb->fileHeight() != firstFileHeight;
+		});
+	_filesHeight = ranges::accumulate(ranges::views::all(
+		_thumbs
+	) | ranges::views::transform([](const auto &thumb) {
+		return thumb->fileHeight();
+	}), 0) + (int(_thumbs.size()) - 1) * st::sendMediaRowSkip;
+	updateSize();
+	updateFileRows();
+}
+
+int AlbumPreview::indexFromPoint(QPoint position) const {
+	const auto thumb = findThumb(position);
+	return thumb ? orderIndex(thumb) : -1;
+}
+
 void AlbumPreview::updateFileRows() {
 	Expects(_order.size() == _thumbs.size());
 
@@ -148,9 +176,11 @@ void AlbumPreview::prepareThumbs(gsl::span<Ui::PreparedFile> items) {
 		_thumbs.push_back(std::make_unique<AlbumThumbnail>(
 			_st,
 			items[i],
+			_captionContext,
 			layout[i],
 			this,
 			[=] { update(); },
+			[=](QRect rect) { update(rect); },
 			[=] { changeThumbByIndex(orderIndex(thumbUnderCursor())); },
 			[=] { deleteThumbByIndex(orderIndex(thumbUnderCursor())); }));
 		if (_thumbs.back()->isCompressedSticker()) {
@@ -164,16 +194,17 @@ void AlbumPreview::prepareThumbs(gsl::span<Ui::PreparedFile> items) {
 		return thumb->photoHeight();
 	}), 0) + (count - 1) * st::sendMediaRowSkip;
 
-	if (!_hasMixedFileHeights) {
-		_filesHeight = count * _thumbs.front()->fileHeight()
-			+ (count - 1) * st::sendMediaRowSkip;
-	} else {
-		_filesHeight = ranges::accumulate(ranges::views::all(
-			_thumbs
-		) | ranges::views::transform([](const auto &thumb) {
-			return thumb->fileHeight();
-		}), 0) + (count - 1) * st::sendMediaRowSkip;
-	}
+	const auto firstFileHeight = _thumbs.front()->fileHeight();
+	_hasMixedFileHeights = _hasMixedFileHeights || ranges::any_of(
+		_thumbs,
+		[=](const auto &thumb) {
+			return thumb->fileHeight() != firstFileHeight;
+		});
+	_filesHeight = ranges::accumulate(ranges::views::all(
+		_thumbs
+	) | ranges::views::transform([](const auto &thumb) {
+		return thumb->fileHeight();
+	}), 0) + (count - 1) * st::sendMediaRowSkip;
 }
 
 int AlbumPreview::contentLeft() const {
@@ -345,11 +376,23 @@ void AlbumPreview::paintAlbum(Painter &p) const {
 	const auto top = contentTop();
 	for (const auto &thumb : _thumbs) {
 		if (thumb.get() != _paintedAbove) {
-			thumb->paintInAlbum(p, left, top, shrink, moveProgress);
+			thumb->paintInAlbum(
+				p,
+				left,
+				top,
+				shrink,
+				moveProgress,
+				_sendWay.sendLargePhotos());
 		}
 	}
 	if (_paintedAbove) {
-		_paintedAbove->paintInAlbum(p, left, top, shrink, moveProgress);
+		_paintedAbove->paintInAlbum(
+			p,
+			left,
+			top,
+			shrink,
+			moveProgress,
+			_sendWay.sendLargePhotos());
 	}
 }
 
@@ -367,7 +410,12 @@ void AlbumPreview::paintPhotos(Painter &p, QRect clip) const {
 		} else if (bottom <= clip.y()) {
 			continue;
 		}
-		thumb->paintPhoto(p, left, top, outerWidth);
+		thumb->paintPhoto(
+			p,
+			left,
+			top,
+			outerWidth,
+			_sendWay.sendLargePhotos());
 	}
 }
 
@@ -375,7 +423,7 @@ void AlbumPreview::paintFiles(Painter &p, QRect clip) const {
 	const auto left = (st::boxWideWidth - st::sendMediaPreviewSize) / 2;
 	const auto outerWidth = width();
 	if (!_hasMixedFileHeights) {
-		const auto fileHeight = st::attachPreviewThumbLayout.thumbSize
+		const auto fileHeight = _thumbs.front()->fileHeight()
 			+ st::sendMediaRowSkip;
 		const auto bottom = clip.y() + clip.height();
 		const auto from = std::clamp(
@@ -570,39 +618,13 @@ void AlbumPreview::mouseReleaseEvent(QMouseEvent *e) {
 	} else if (const auto thumb = base::take(_pressedThumb)) {
 		const auto was = _pressedButtonType;
 		const auto now = thumb->buttonTypeFromPoint(e->pos());
-		if (e->button() == Qt::RightButton) {
-			showContextMenu(thumb, e->globalPos());
-		} else if (was == now) {
+		if (e->button() == Qt::LeftButton && was == now) {
 			thumbButtonsCallback(thumb, now);
 		}
 	}
 	_pressedButtonType = AttachButtonType::None;
 }
 
-void AlbumPreview::showContextMenu(
-		not_null<AlbumThumbnail*> thumb,
-		QPoint position) {
-	if (!_canToggleSpoiler() || !_sendWay.sendImagesAsPhotos()) {
-		return;
-	}
-	_menu = base::make_unique_q<Ui::PopupMenu>(
-		this,
-		st::popupMenuWithIcons);
-
-	const auto spoilered = thumb->hasSpoiler();
-	_menu->addAction(spoilered
-		? tr::lng_context_disable_spoiler(tr::now)
-		: tr::lng_context_spoiler_effect(tr::now), [=] {
-		thumb->setSpoiler(!spoilered);
-	}, spoilered ? &st::menuIconSpoilerOff : &st::menuIconSpoiler);
-
-	if (_menu->empty()) {
-		_menu = nullptr;
-	} else {
-		_menu->popup(position);
-	}
-}
-
 void AlbumPreview::switchToDrag() {
 	_paintedAbove
 		= _suggestedThumb
@@ -650,7 +672,7 @@ QImage AlbumPreview::generatePriceTagBackground() const {
 		p.translate(geometry.center());
 		p.scale(wscale, hscale);
 		p.translate(-geometry.center());
-		thumb->paintInAlbum(p, 0, 0, 1., 1.);
+		thumb->paintInAlbum(p, 0, 0, 1., 1., _sendWay.sendLargePhotos());
 		p.restore();
 	}
 	p.end();
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
index 9f1c9969d82a0f..e8950c0126393f 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "ui/rp_widget.h"
 #include "ui/chat/attach/attach_send_files_way.h"
+#include "ui/text/text.h"
 #include "base/timer.h"
 
 namespace style {
@@ -20,7 +21,6 @@ namespace Ui {
 struct PreparedFile;
 struct GroupMediaLayout;
 class AlbumThumbnail;
-class PopupMenu;
 
 class AlbumPreview final : public RpWidget {
 public:
@@ -28,11 +28,13 @@ class AlbumPreview final : public RpWidget {
 		QWidget *parent,
 		const style::ComposeControls &st,
 		gsl::span<Ui::PreparedFile> items,
-		SendFilesWay way,
-		Fn<bool()> canToggleSpoiler);
+		const Text::MarkedContext &captionContext,
+		SendFilesWay way);
 	~AlbumPreview();
 
 	void setSendWay(SendFilesWay way);
+	void setCaption(int index, const TextWithTags &caption);
+	[[nodiscard]] int indexFromPoint(QPoint position) const;
 
 	[[nodiscard]] base::flat_set<int> collectSpoileredIndices();
 	[[nodiscard]] bool canHaveSpoiler(int index) const;
@@ -42,15 +44,12 @@ class AlbumPreview final : public RpWidget {
 	[[nodiscard]] rpl::producer<int> thumbDeleted() const {
 		return _thumbDeleted.events();
 	}
-
 	[[nodiscard]] rpl::producer<int> thumbChanged() const {
 		return _thumbChanged.events();
 	}
-
 	[[nodiscard]] rpl::producer<int> thumbModified() const {
 		return _thumbModified.events();
 	}
-
 	[[nodiscard]] rpl::producer<> orderUpdated() const {
 		return _orderUpdated.events();
 	}
@@ -97,11 +96,9 @@ class AlbumPreview final : public RpWidget {
 	void cancelDrag();
 	void finishDrag();
 
-	void showContextMenu(not_null<AlbumThumbnail*> thumb, QPoint position);
-
 	const style::ComposeControls &_st;
+	const Text::MarkedContext _captionContext;
 	SendFilesWay _sendWay;
-	Fn<bool()> _canToggleSpoiler;
 	style::cursor _cursor = style::cur_default;
 	std::vector<int> _order;
 	std::vector<QSize> _itemsShownDimensions;
@@ -126,8 +123,6 @@ class AlbumPreview final : public RpWidget {
 	rpl::event_stream<int> _thumbModified;
 	rpl::event_stream<> _orderUpdated;
 
-	base::unique_qptr<PopupMenu> _menu;
-
 	mutable Animations::Simple _thumbsHeightAnimation;
 	mutable Animations::Simple _shrinkAnimation;
 	mutable Animations::Simple _finishDragAnimation;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
index 92025e3cc683e7..8b7186d8841f6f 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/image/image_prepare.h"
 #include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
 #include "ui/effects/spoiler_mess.h"
 #include "ui/ui_utility.h"
@@ -28,19 +29,23 @@ namespace Ui {
 AlbumThumbnail::AlbumThumbnail(
 	const style::ComposeControls &st,
 	const PreparedFile &file,
+	const Text::MarkedContext &captionContext,
 	const GroupMediaLayout &layout,
 	QWidget *parent,
 	Fn<void()> repaint,
+	Fn<void(QRect)> repaintRect,
 	Fn<void()> editCallback,
 	Fn<void()> deleteCallback)
 : _st(st)
 , _layout(layout)
-, _fullPreview(file.preview)
+, _fullPreview(file.videoCover ? file.videoCover->preview : file.preview)
 , _shrinkSize(int(std::ceil(st::roundRadiusLarge / 1.4)))
 , _isPhoto(file.type == PreparedFile::Type::Photo)
 , _isVideo(file.type == PreparedFile::Type::Video)
+, _canShowHighQualityBadge(file.canUseHighQualityPhoto())
 , _isCompressedSticker(Core::IsMimeSticker(file.information->filemime))
-, _repaint(std::move(repaint)) {
+, _repaint(std::move(repaint))
+, _repaintRect(std::move(repaintRect)) {
 	Expects(!_fullPreview.isNull());
 
 	moveToLayout(layout);
@@ -82,13 +87,22 @@ AlbumThumbnail::AlbumThumbnail(
 		- st::sendBoxAlbumGroupButtonFile.width * 2
 		- st::sendBoxAlbumGroupEditInternalSkip * 2
 		- st::sendBoxAlbumGroupSkipRight;
+	const auto availableCaptionWidth = st::sendMediaPreviewSize
+		- st::sendBoxAlbumGroupButtonFile.width * 2
+		- st::sendBoxAlbumGroupEditInternalSkip * 2
+		- st::sendBoxAlbumGroupSkipRight;
+	_captionAvailableWidth = availableCaptionWidth;
 	const auto filepath = file.path;
 	if (filepath.isEmpty()) {
-		_name = "image.png";
+		_name = file.displayName.isEmpty()
+			? "image.png"
+			: file.displayName;
 		_status = FormatImageSizeText(file.originalDimensions);
 	} else {
 		auto fileinfo = QFileInfo(filepath);
-		_name = fileinfo.fileName();
+		_name = file.displayName.isEmpty()
+			? fileinfo.fileName()
+			: file.displayName;
 		_status = FormatSizeText(fileinfo.size());
 	}
 	_nameWidth = st::semiboldFont->width(_name);
@@ -100,6 +114,29 @@ AlbumThumbnail::AlbumThumbnail(
 		_nameWidth = st::semiboldFont->width(_name);
 	}
 	_statusWidth = st::normalFont->width(_status);
+	auto caption = TextWithEntities{
+		file.caption.text,
+		TextUtilities::ConvertTextTagsToEntities(file.caption.tags),
+	};
+	caption = TextUtilities::SingleLine(caption);
+	auto context = captionContext;
+	const auto repaintCaption = context.repaint;
+	context.repaint = [=] {
+		if (repaintCaption) {
+			repaintCaption();
+		}
+		if (!_lastRectOfCaption.isEmpty() && _repaintRect) {
+			_repaintRect(_lastRectOfCaption);
+		} else {
+			_repaint();
+		}
+	};
+	_captionContext = context;
+	_caption.setMarkedText(
+		st::defaultTextStyle,
+		caption,
+		kMarkupTextOptions,
+		_captionContext);
 
 	_editMedia.create(parent, _st.files.buttonFile);
 	_deleteMedia.create(parent, _st.files.buttonFile);
@@ -126,6 +163,20 @@ void AlbumThumbnail::setSpoiler(bool spoiler) {
 	_repaint();
 }
 
+void AlbumThumbnail::setCaption(const TextWithTags &caption) {
+	auto marked = TextWithEntities{
+		caption.text,
+		TextUtilities::ConvertTextTagsToEntities(caption.tags),
+	};
+	marked = TextUtilities::SingleLine(marked);
+	_caption.setMarkedText(
+		st::defaultTextStyle,
+		marked,
+		kMarkupTextOptions,
+		_captionContext);
+	_repaint();
+}
+
 bool AlbumThumbnail::hasSpoiler() const {
 	return _spoiler != nullptr;
 }
@@ -186,7 +237,9 @@ int AlbumThumbnail::photoHeight() const {
 int AlbumThumbnail::fileHeight() const {
 	return _isCompressedSticker
 		? photoHeight()
-		: st::attachPreviewThumbLayout.thumbSize;
+		: st::attachPreviewThumbLayout.thumbSize + (_caption.isEmpty()
+			? 0
+			: (st::attachPreviewCaptionTopOffset + _caption.lineHeight()));
 }
 
 bool AlbumThumbnail::isCompressedSticker() const {
@@ -198,7 +251,8 @@ void AlbumThumbnail::paintInAlbum(
 		int left,
 		int top,
 		float64 shrinkProgress,
-		float64 moveProgress) {
+		float64 moveProgress,
+		bool showHighQualityBadge) {
 	const auto shrink = anim::interpolate(0, _shrinkSize, shrinkProgress);
 	_lastShrinkValue = shrink;
 	const auto geometry = countCurrentGeometry(
@@ -262,6 +316,9 @@ void AlbumThumbnail::paintInAlbum(
 		geometry,
 		shrinkProgress);
 	_lastRectOfModify = geometry;
+	if (showHighQualityBadge && _canShowHighQualityBadge) {
+		PaintHighQualityBadge(p, _st, paintedTo);
+	}
 }
 
 void AlbumThumbnail::paintPlayVideo(QPainter &p, QRect geometry) {
@@ -424,7 +481,12 @@ void AlbumThumbnail::drawSimpleFrame(QPainter &p, QRect to, QSize size) const {
 	}
 }
 
-void AlbumThumbnail::paintPhoto(Painter &p, int left, int top, int outerWidth) {
+void AlbumThumbnail::paintPhoto(
+		Painter &p,
+		int left,
+		int top,
+		int outerWidth,
+		bool showHighQualityBadge) {
 	const auto size = _photo.size() / style::DevicePixelRatio();
 	if (_spoiler && _photoBlurred.isNull()) {
 		_photoBlurred = BlurredPreviewFromPixmap(
@@ -463,6 +525,9 @@ void AlbumThumbnail::paintPhoto(Painter &p, int left, int top, int outerWidth) {
 		0);
 
 	_lastRectOfModify = QRect(topLeft, size);
+	if (showHighQualityBadge && _canShowHighQualityBadge) {
+		PaintHighQualityBadge(p, _st, rect);
+	}
 }
 
 void AlbumThumbnail::paintFile(
@@ -473,7 +538,7 @@ void AlbumThumbnail::paintFile(
 
 	if (isCompressedSticker()) {
 		auto spoiler = base::take(_spoiler);
-		paintPhoto(p, left, top, outerWidth);
+		paintPhoto(p, left, top, outerWidth, false);
 		_spoiler = base::take(spoiler);
 		return;
 	}
@@ -497,6 +562,28 @@ void AlbumThumbnail::paintFile(
 		outerWidth,
 		_status,
 		_statusWidth);
+	if (!_caption.isEmpty()) {
+		p.setPen(_st.files.nameFg);
+		const auto captionLineHeight = _caption.lineHeight();
+		const auto captionTop = top
+			+ st.thumbSize
+			+ st::attachPreviewCaptionTopOffset;
+		_lastRectOfCaption = QRect(
+			left,
+			captionTop,
+			_captionAvailableWidth,
+			captionLineHeight) + st::attachPreviewCaptionRepaintMargin;
+		_caption.draw(p, {
+			.position = { left, captionTop },
+			.outerWidth = outerWidth,
+			.availableWidth = _captionAvailableWidth,
+			.align = style::al_left,
+			.elisionLines = 1,
+			.elisionBreakEverywhere = true,
+		});
+	} else {
+		_lastRectOfCaption = {};
+	}
 
 	_lastRectOfModify = QRect(
 		QPoint(left, top),
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
index 209f864cde1934..655596b8f8b107 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
@@ -29,9 +29,11 @@ class AlbumThumbnail final {
 	AlbumThumbnail(
 		const style::ComposeControls &st,
 		const PreparedFile &file,
+		const Text::MarkedContext &captionContext,
 		const GroupMediaLayout &layout,
 		QWidget *parent,
 		Fn<void()> repaint,
+		Fn<void(QRect)> repaintRect,
 		Fn<void()> editCallback,
 		Fn<void()> deleteCallback);
 
@@ -40,6 +42,7 @@ class AlbumThumbnail final {
 	void resetLayoutAnimation();
 
 	void setSpoiler(bool spoiler);
+	void setCaption(const TextWithTags &caption);
 	[[nodiscard]] bool hasSpoiler() const;
 
 	[[nodiscard]] int photoHeight() const;
@@ -50,8 +53,14 @@ class AlbumThumbnail final {
 		int left,
 		int top,
 		float64 shrinkProgress,
-		float64 moveProgress);
-	void paintPhoto(Painter &p, int left, int top, int outerWidth);
+		float64 moveProgress,
+		bool showHighQualityBadge);
+	void paintPhoto(
+		Painter &p,
+		int left,
+		int top,
+		int outerWidth,
+		bool showHighQualityBadge);
 	void paintFile(Painter &p, int left, int top, int outerWidth);
 
 	[[nodiscard]] QRect geometry() const;
@@ -91,6 +100,7 @@ class AlbumThumbnail final {
 	const int _shrinkSize;
 	const bool _isPhoto;
 	const bool _isVideo;
+	const bool _canShowHighQualityBadge;
 	QPixmap _albumImage;
 	QPixmap _albumImageBlurred;
 	QImage _albumCache;
@@ -101,8 +111,11 @@ class AlbumThumbnail final {
 	QPixmap _fileThumb;
 	QString _name;
 	QString _status;
+	Text::String _caption;
+	Text::MarkedContext _captionContext;
 	int _nameWidth = 0;
 	int _statusWidth = 0;
+	int _captionAvailableWidth = 0;
 	float64 _suggestedMove = 0.;
 	Animations::Simple _suggestedMoveAnimation;
 	int _lastShrinkValue = 0;
@@ -112,9 +125,11 @@ class AlbumThumbnail final {
 	std::unique_ptr<SpoilerAnimation> _spoiler;
 	QImage _cornerCache;
 	Fn<void()> _repaint;
+	Fn<void(QRect)> _repaintRect;
 
 	QRect _lastRectOfModify;
 	QRect _lastRectOfButtons;
+	QRect _lastRectOfCaption;
 
 	object_ptr<IconButton> _editMedia = { nullptr };
 	object_ptr<IconButton> _deleteMedia = { nullptr };
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp
new file mode 100644
index 00000000000000..037b3a4c911d9b
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.cpp
@@ -0,0 +1,268 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/attach/attach_bot_downloads.h"
+
+#include "lang/lang_keys.h"
+#include "ui/widgets/menu/menu_item_base.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
+#include "ui/painter.h"
+#include "styles/style_chat.h"
+
+namespace Ui::BotWebView {
+namespace {
+
+class Action final : public Menu::ItemBase {
+public:
+	Action(
+		not_null<Ui::Menu::Menu*> parent,
+		const DownloadsEntry &entry,
+		Fn<void(DownloadsAction)> callback);
+
+	bool isEnabled() const override;
+	not_null<QAction*> action() const override { return _dummyAction; }
+	void handleKeyPress(not_null<QKeyEvent*> e) override;
+
+	void refresh(const DownloadsEntry &entry);
+
+private:
+	QPoint prepareRippleStartPosition() const override {
+		return mapFromGlobal(QCursor::pos());
+	}
+	QImage prepareRippleMask() const override {
+		return Ui::RippleAnimation::RectMask(size());
+	}
+	int contentHeight() const override { return _height; }
+
+	void prepare();
+	void paint(Painter &p);
+
+	const not_null<QAction*> _dummyAction;
+	const style::Menu &_st = st::defaultMenu;
+
+	DownloadsEntry _entry;
+	Text::String _name;
+	FlatLabel _progress;
+	IconButton _cancel;
+	int _textWidth = 0;
+	const int _height;
+};
+
+Action::Action(
+	not_null<Ui::Menu::Menu*> parent,
+	const DownloadsEntry &entry,
+	Fn<void(DownloadsAction)> callback)
+: ItemBase(parent, st::defaultMenu)
+, _dummyAction(new QAction(parent))
+, _progress(this, st::botDownloadProgress)
+, _cancel(this, st::botDownloadCancel)
+, _height(st::ttlItemPadding.top()
+	+ _st.itemStyle.font->height
+	+ st::ttlItemTimerFont->height
+	+ st::ttlItemPadding.bottom()) {
+	setAcceptBoth(true);
+	fitToMenuWidth();
+	setActionTriggered([=] {
+		if (isEnabled()) {
+			callback(DownloadsAction::Open);
+		}
+	});
+	_cancel.setClickedCallback([=] {
+		callback(DownloadsAction::Cancel);
+	});
+
+	paintRequest(
+	) | rpl::on_next([=] {
+		Painter p(this);
+		paint(p);
+	}, lifetime());
+
+	widthValue() | rpl::on_next([=](int width) {
+		_progress.moveToLeft(
+			_st.itemPadding.left(),
+			st::ttlItemPadding.top() + _st.itemStyle.font->height,
+			width);
+
+		_cancel.moveToRight(
+			_st.itemPadding.right(),
+			(_height - _cancel.height()) / 2,
+			width);
+	}, lifetime());
+
+	_progress.setClickHandlerFilter([=](const auto &...) {
+		callback(DownloadsAction::Retry);
+		return false;
+	});
+
+	enableMouseSelecting();
+	refresh(entry);
+}
+
+void Action::paint(Painter &p) {
+	const auto selected = isSelected();
+	if (selected && _st.itemBgOver->c.alpha() < 255) {
+		p.fillRect(0, 0, width(), _height, _st.itemBg);
+	}
+	p.fillRect(0, 0, width(), _height, selected ? _st.itemBgOver : _st.itemBg);
+	if (isEnabled()) {
+		paintRipple(p, 0, 0);
+	}
+
+	p.setPen(selected ? _st.itemFgOver : _st.itemFg);
+	_name.drawLeftElided(
+		p,
+		_st.itemPadding.left(),
+		st::ttlItemPadding.top(),
+		_textWidth,
+		width());
+
+	_progress.setTextColorOverride(
+		selected ? _st.itemFgShortcutOver->c : _st.itemFgShortcut->c);
+}
+
+void Action::prepare() {
+	const auto filenameWidth = _name.maxWidth();
+	const auto progressWidth = _progress.textMaxWidth();
+	const auto &padding = _st.itemPadding;
+
+	const auto goodWidth = std::max(filenameWidth, progressWidth);
+
+	// Example max width: "4000 / 4000 MB"
+	const auto countWidth = [&](const QString &text) {
+		return st::ttlItemTimerFont->width(text);
+	};
+	const auto maxProgressWidth = countWidth(tr::lng_media_save_progress(
+		tr::now,
+		lt_ready,
+		"0000",
+		lt_total,
+		"0000",
+		lt_mb,
+		"MB"));
+	const auto maxStartingWidth = countWidth(
+		tr::lng_bot_download_starting(tr::now));
+	const auto maxFailedWidth = countWidth(tr::lng_bot_download_failed(
+		tr::now,
+		lt_retry,
+		tr::lng_bot_download_retry(tr::now)));
+
+	const auto cancel = _cancel.width() + padding.right();
+	const auto paddings = padding.left() + padding.right() + cancel;
+	const auto w = std::clamp(
+		paddings + std::max({
+			goodWidth,
+			maxProgressWidth,
+			maxStartingWidth,
+			maxFailedWidth,
+		}),
+		_st.widthMin,
+		_st.widthMax);
+	_textWidth = w - paddings;
+	_progress.resizeToWidth(_textWidth);
+	setMinWidth(w);
+	update();
+}
+
+bool Action::isEnabled() const {
+	return _entry.total > 0 && _entry.ready == _entry.total;
+}
+
+void Action::handleKeyPress(not_null<QKeyEvent*> e) {
+	if (!isSelected()) {
+		return;
+	}
+	const auto key = e->key();
+	if (key == Qt::Key_Enter || key == Qt::Key_Return) {
+		setClicked(Menu::TriggeredSource::Keyboard);
+	}
+}
+
+void Action::refresh(const DownloadsEntry &entry) {
+	_entry = entry;
+	const auto filename = entry.path.split('/').last();
+	_name.setMarkedText(_st.itemStyle, { filename }, kDefaultTextOptions);
+
+	const auto progressText = (entry.total && entry.total == entry.ready)
+		? TextWithEntities{ FormatSizeText(entry.total) }
+		: entry.loading
+		? (entry.total
+			? TextWithEntities{
+				FormatProgressText(entry.ready, entry.total),
+			}
+			: tr::lng_bot_download_starting(tr::now, tr::marked))
+		: tr::lng_bot_download_failed(
+			tr::now,
+			lt_retry,
+			Text::Link(tr::lng_bot_download_retry(tr::now)),
+			tr::marked);
+	_progress.setMarkedText(progressText);
+
+	const auto enabled = isEnabled();
+	setCursor(enabled ? style::cur_pointer : style::cur_default);
+	_cancel.setVisible(!enabled && _entry.loading);
+	_progress.setAttribute(Qt::WA_TransparentForMouseEvents, enabled);
+
+	prepare();
+}
+
+} // namespace
+
+FnMut<void(not_null<PopupMenu*>)> FillAttachBotDownloadsSubmenu(
+		rpl::producer<std::vector<DownloadsEntry>> content,
+		Fn<void(uint32, DownloadsAction)> callback) {
+	return [callback, moved = std::move(content)](
+			not_null<PopupMenu*> menu) mutable {
+		struct Row {
+			not_null<Action*> action;
+			uint32 id = 0;
+		};
+		struct State {
+			std::vector<Row> rows;
+		};
+		const auto state = menu->lifetime().make_state<State>();
+		std::move(
+			moved
+		) | rpl::on_next([=](
+			const std::vector<DownloadsEntry> &entries) {
+			auto found = base::flat_set<uint32>();
+			for (const auto &entry : entries | ranges::views::reverse) {
+				const auto id = entry.id;
+				const auto path = entry.path;
+				const auto i = ranges::find(state->rows, id, &Row::id);
+				found.emplace(id);
+
+				if (i != end(state->rows)) {
+					i->action->refresh(entry);
+				} else {
+					auto action = base::make_unique_q<Action>(
+						menu->menu(),
+						entry,
+						[=](DownloadsAction type) { callback(id, type); });
+					state->rows.push_back({
+						.action = action.get(),
+						.id = id,
+						});
+					menu->addAction(std::move(action));
+				}
+			}
+			for (auto i = begin(state->rows); i != end(state->rows);) {
+				if (!found.contains(i->id)) {
+					menu->removeAction(i - begin(state->rows));
+					i = state->rows.erase(i);
+				} else {
+					++i;
+				}
+			}
+		}, menu->lifetime());
+	};
+}
+
+} // namespace Ui::BotWebView
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.h
new file mode 100644
index 00000000000000..4e85e5e16866b1
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_downloads.h
@@ -0,0 +1,47 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
+namespace Ui::BotWebView {
+
+struct DownloadsProgress {
+	uint64 ready = 0;
+	uint64 total : 63 = 0;
+	uint64 loading : 1 = 0;
+
+	friend inline bool operator==(
+		const DownloadsProgress &a,
+		const DownloadsProgress &b) = default;
+};
+
+struct DownloadsEntry {
+	uint32 id = 0;
+	QString url;
+	QString path;
+	uint64 ready : 63 = 0;
+	uint64 loading : 1 = 0;
+	uint64 total : 63 = 0;
+	uint64 failed : 1 = 0;
+};
+
+enum class DownloadsAction {
+	Open,
+	Retry,
+	Cancel,
+};
+
+[[nodiscard]] auto FillAttachBotDownloadsSubmenu(
+	rpl::producer<std::vector<DownloadsEntry>> content,
+	Fn<void(uint32, DownloadsAction)> callback)
+-> FnMut<void(not_null<PopupMenu*>)>;
+
+} // namespace Ui::BotWebView
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index fafb8d4b53fef7..9ac93f3162a631 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -7,54 +7,157 @@ For license and copyright information please follow this link:
 */
 #include "ui/chat/attach/attach_bot_webview.h"
 
-#include "core/file_utilities.h"
+#include "ui/chat/attach/attach_bot_downloads.h"
+#include "ui/chat/attach/attach_bot_webview_linux_shell.h"
 #include "ui/effects/radial_animation.h"
 #include "ui/effects/ripple_animation.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/layers/box_content.h"
+#include "ui/layers/standalone_layer_stack.h"
+#include "ui/platform/ui_platform_utility.h"
+#include "ui/round_rect.h"
+#include "ui/style/style_core_palette.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/separate_panel.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
-#include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/padding_wrap.h"
 #include "ui/integration.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
 #include "ui/ui_utility.h"
 #include "lang/lang_keys.h"
+#include "core/file_utilities.h"
 #include "webview/webview_embed.h"
 #include "webview/webview_dialog.h"
 #include "webview/webview_interface.h"
 #include "base/debug_log.h"
 #include "base/invoke_queued.h"
+#include "base/platform/base_platform_info.h"
 #include "base/qt_signal_producer.h"
+#include "base/random.h"
+#include "styles/style_chat.h"
+#include "styles/style_info.h"
 #include "styles/style_payments.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
 
+#include <QtCore/QBuffer>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
+#include <QtCore/QUrl>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
 #include <QtGui/QWindow>
+#include <QtGui/QScreen>
+#include <QtGui/qpa/qplatformscreen.h>
+
+#include <algorithm>
+#include <memory>
 
 namespace Ui::BotWebView {
+
 namespace {
 
-constexpr auto kProcessClickTimeout = crl::time(1000);
+constexpr auto kClipboardReadTimeout = crl::time(10000);
 constexpr auto kProgressDuration = crl::time(200);
 constexpr auto kProgressOpacity = 0.3;
 constexpr auto kLightnessThreshold = 128;
 constexpr auto kLightnessDelta = 32;
+constexpr auto kExternalShellButtonIconSize = 20;
+constexpr auto kMaxNativeMessageBytes = 1024 * 1024;
+constexpr auto kExternalMessageType = "tdesktop_external_bot_webapp";
+
+enum class NativeMessageSource {
+	LegacyWebApp,
+	ExternalWebApp,
+	ExternalShell,
+};
 
-struct ButtonArgs {
-	bool isActive = false;
-	bool isVisible = false;
-	bool isProgressVisible = false;
-	QString text;
+struct NativeMessage {
+	NativeMessageSource source = NativeMessageSource::LegacyWebApp;
+	QString origin;
+	QString command;
+	QJsonObject arguments;
 };
 
+[[nodiscard]] QString GenerateExternalShellToken() {
+	auto bytes = QByteArray();
+	bytes.resize(32);
+	base::RandomFill(bytes.data(), bytes.size());
+	return QString::fromLatin1(bytes.toHex());
+}
+
+[[nodiscard]] QString ExternalShellTopUrl() {
+	return u"https://web.telegram.org:443/blank.html"_q;
+}
+
+[[nodiscard]] TextWithEntities WebviewErrorText(
+		const QString &text,
+		const Webview::Available &information) {
+	Expects(information.error != Webview::Available::Error::None);
+
+	return TextWithEntities{ text }.append("\n\n").append(
+		ErrorText(information));
+}
+
+[[nodiscard]] bool IsExternalShellOrigin(const QString &origin) {
+	const auto url = QUrl(origin);
+	return url.isValid()
+		&& url.scheme() == u"https"_q
+		&& url.host() == u"web.telegram.org"_q
+		&& url.port(443) == 443
+		&& url.userInfo().isEmpty()
+		&& url.path().isEmpty()
+		&& url.query().isEmpty()
+		&& url.fragment().isEmpty();
+}
+
+[[nodiscard]] int EffectivePort(const QUrl &url) {
+	const auto explicitPort = url.port(-1);
+	if (explicitPort >= 0) {
+		return explicitPort;
+	}
+	const auto scheme = url.scheme().toLower();
+	if (scheme == u"http"_q) {
+		return 80;
+	} else if (scheme == u"https"_q) {
+		return 443;
+	}
+	return -1;
+}
+
+[[nodiscard]] QString OriginFromUrl(const QString &url) {
+	const auto parsed = QUrl(url);
+	if (!parsed.isValid()) {
+		return {};
+	}
+	const auto scheme = parsed.scheme().toLower();
+	auto host = parsed.host().toLower();
+	const auto port = EffectivePort(parsed);
+	if (scheme.isEmpty() || host.isEmpty() || port < 0) {
+		return {};
+	}
+	if (host.contains(':') && !host.startsWith('[')) {
+		host = u"["_q + host + u"]"_q;
+	}
+	return u"%1://%2:%3"_q.arg(scheme, host, QString::number(port));
+}
+
+[[nodiscard]] bool OriginsMatch(const QString &a, const QString &b) {
+	if (a.isEmpty() || b.isEmpty()) {
+		return false;
+	}
+	const auto normalizedA = OriginFromUrl(a);
+	const auto normalizedB = OriginFromUrl(b);
+	return !normalizedA.isEmpty()
+		&& !normalizedB.isEmpty()
+		&& normalizedA == normalizedB;
+}
+
 [[nodiscard]] RectPart ParsePosition(const QString &position) {
 	if (position == u"left"_q) {
 		return RectPart::Left;
@@ -68,17 +171,689 @@ struct ButtonArgs {
 	return RectPart::Left;
 }
 
-[[nodiscard]] QJsonObject ParseMethodArgs(const QString &json) {
-	if (json.isEmpty()) {
+[[nodiscard]] bool IsNoArgumentsSentinel(const QString &string) {
+	return string.isEmpty() || string == u"\"\""_q;
+}
+
+[[nodiscard]] bool CanParseArguments(QJsonValue value) {
+	if (value.isObject()) {
+		return true;
+	} else if (!value.isString()) {
+		return false;
+	} else if (IsNoArgumentsSentinel(value.toString())) {
+		return true;
+	}
+	auto error = QJsonParseError();
+	const auto document = QJsonDocument::fromJson(
+		value.toString().toUtf8(),
+		&error);
+	return (error.error == QJsonParseError::NoError) && document.isObject();
+}
+
+[[nodiscard]] QJsonObject ParseArguments(QJsonValue value) {
+	if (value.isObject()) {
+		return value.toObject();
+	} else if (!value.isString()) {
+		return {};
+	}
+	auto error = QJsonParseError();
+	const auto document = QJsonDocument::fromJson(
+		value.toString().toUtf8(),
+		&error);
+	return (error.error == QJsonParseError::NoError && document.isObject())
+		? document.object()
+		: QJsonObject();
+}
+
+[[nodiscard]] bool IsShellNamespaceCommand(const QString &command) {
+	return command.startsWith(u"shell_"_q)
+		|| command.startsWith(u"tdesktop_shell_"_q);
+}
+
+[[nodiscard]] QString SafeCommandForLog(const QString &command) {
+	if (command.isEmpty() || command.size() > 80) {
+		return {};
+	}
+	if (!command.startsWith(u"web_app_"_q)
+		&& !command.startsWith(u"shell_"_q)
+		&& !command.startsWith(u"tdesktop_shell_"_q)
+		&& command != u"share_score"_q) {
 		return {};
 	}
+	const auto safe = std::all_of(
+		command.begin(),
+		command.end(),
+		[](QChar ch) {
+			return ch.isLetterOrNumber() || ch == QChar('_');
+		});
+	return safe ? command : QString();
+}
+
+void LogNativeMessageRejected(
+		const QString &reason,
+		quint64 bytes,
+		const QString &command = QString()) {
+	const auto safeCommand = SafeCommandForLog(command);
+	if (safeCommand.isEmpty()) {
+		LOG(("BotWebView Error: Native message rejected: %1 (%2 bytes)."
+			).arg(reason, QString::number(bytes)));
+	} else {
+		LOG(("BotWebView Error: Native message rejected: %1 "
+			"(%2 bytes, command: %3)."
+			).arg(reason, QString::number(bytes), safeCommand));
+	}
+}
+
+[[nodiscard]] std::optional<NativeMessage> ParseNativeMessage(
+		const QByteArray &bytes,
+		const QString &sourceUrl,
+		bool externalShell,
+		const QString &shellToken) {
+	const auto byteCount = quint64(bytes.size());
+	if (bytes.size() > kMaxNativeMessageBytes) {
+		LogNativeMessageRejected(u"payload too large"_q, byteCount);
+		return std::nullopt;
+	}
 	auto error = QJsonParseError();
-	const auto dictionary = QJsonDocument::fromJson(json.toUtf8(), &error);
+	const auto document = QJsonDocument::fromJson(bytes, &error);
 	if (error.error != QJsonParseError::NoError) {
-		LOG(("BotWebView Error: Could not parse \"%1\".").arg(json));
+		LogNativeMessageRejected(u"invalid json"_q, byteCount);
+		return std::nullopt;
+	}
+	if (externalShell) {
+		if (!document.isObject()) {
+			LogNativeMessageRejected(
+				u"external payload is not an object"_q,
+				byteCount);
+			return std::nullopt;
+		}
+		const auto object = document.object();
+		const auto command = object.value(u"eventType"_q).toString();
+		const auto reject = [&](const QString &reason) {
+			LogNativeMessageRejected(reason, byteCount, command);
+			return std::optional<NativeMessage>();
+		};
+		if (object.value(u"type"_q).toString()
+			!= QString::fromLatin1(kExternalMessageType)) {
+			return reject(u"bad external type"_q);
+		}
+		const auto sourceText = object.value(u"source"_q).toString();
+		auto source = NativeMessageSource::ExternalWebApp;
+		if (sourceText == u"webapp"_q) {
+			source = NativeMessageSource::ExternalWebApp;
+		} else if (sourceText == u"shell"_q) {
+			source = NativeMessageSource::ExternalShell;
+		} else {
+			return reject(u"bad external source"_q);
+		}
+		const auto token = object.value(u"token"_q);
+		if (!token.isString()
+			|| shellToken.isEmpty()
+			|| token.toString() != shellToken) {
+			return reject(u"bad external token"_q);
+		}
+		const auto origin = object.value(u"origin"_q);
+		if (source == NativeMessageSource::ExternalShell) {
+			if (!origin.isString()
+				|| !IsExternalShellOrigin(origin.toString())) {
+				return reject(u"bad shell origin"_q);
+			}
+		}
+		if (!object.value(u"eventType"_q).isString() || command.isEmpty()) {
+			return reject(u"bad command"_q);
+		}
+		const auto data = object.value(u"eventData"_q);
+		if (!CanParseArguments(data)) {
+			return reject(u"bad arguments"_q);
+		}
+		const auto arguments = ParseArguments(data);
+		const auto shellCommand = IsShellNamespaceCommand(command);
+		if (source == NativeMessageSource::ExternalShell) {
+			if (!shellCommand) {
+				return reject(u"non-shell command from shell"_q);
+			}
+		} else if (shellCommand) {
+			return reject(u"shell command from webapp"_q);
+		}
+		return NativeMessage{
+			.source = source,
+			.origin = (source == NativeMessageSource::ExternalWebApp)
+				? origin.toString()
+				: QString(),
+			.command = command,
+			.arguments = arguments,
+		};
+	}
+	if (!document.isArray()) {
+		LogNativeMessageRejected(
+			u"legacy payload is not an array"_q,
+			byteCount);
+		return std::nullopt;
+	}
+	const auto list = document.array();
+	const auto command = list.at(0).toString();
+	const auto reject = [&](const QString &reason) {
+		LogNativeMessageRejected(reason, byteCount, command);
+		return std::optional<NativeMessage>();
+	};
+	if (!list.at(0).isString() || command.isEmpty()) {
+		return reject(u"bad command"_q);
+	} else if (IsShellNamespaceCommand(command)) {
+		return reject(u"shell command from legacy"_q);
+	}
+	auto arguments = QJsonObject();
+	if (list.size() > 1) {
+		const auto value = list.at(1);
+		if (!value.isNull()
+			&& !value.isUndefined()
+			&& !CanParseArguments(value)) {
+			return reject(u"bad arguments"_q);
+		}
+		arguments = ParseArguments(value);
+	}
+	return NativeMessage{
+		.source = NativeMessageSource::LegacyWebApp,
+		.origin = OriginFromUrl(sourceUrl),
+		.command = command,
+		.arguments = arguments,
+	};
+}
+
+[[nodiscard]] bool UseExternalBotWebApps() {
+	return ::Platform::IsLinux();
+}
+
+[[nodiscard]] QColor ResolveExternalShellThemeColor(QColor color) {
+	return (color.alpha() == 255) ? color : st::windowBg->c;
+}
+
+[[nodiscard]] QJsonObject ThemeChangedPayload(
+		const Webview::ThemeParams &params) {
+	const auto parsed = QJsonDocument::fromJson(params.json);
+	return { { u"theme_params"_q, parsed.object() } };
+}
+
+[[nodiscard]] Platform::ForeignParent CompatibleForeignParent(
+		Platform::ForeignParent parent) {
+	switch (parent.type) {
+	case Platform::ForeignParent::Type::None:
 		return {};
+	case Platform::ForeignParent::Type::X11:
+		return ::Platform::IsX11() ? parent : Platform::ForeignParent();
+	case Platform::ForeignParent::Type::Wayland:
+		return ::Platform::IsWayland() ? parent : Platform::ForeignParent();
+	}
+	return {};
+}
+
+enum class SharedPanelMenuAction {
+	None,
+	Settings,
+	OpenBot,
+	Reload,
+	ShareGame,
+	Terms,
+	Privacy,
+	RemoveFromMenu,
+	RemoveFromMainMenu,
+	DownloadOpen,
+	DownloadRetry,
+	DownloadCancel,
+};
+
+struct SharedPanelMenuItem {
+	QString id;
+	QString text;
+	QString subtitle;
+	QString actionLabel;
+	QString iconKey;
+	const style::icon *icon = nullptr;
+	bool isSeparator = false;
+	bool isAttention = false;
+	bool isEnabled = true;
+	std::vector<SharedPanelMenuItem> children;
+};
+
+struct SharedPanelMenuBuildArgs {
+	const std::vector<DownloadsEntry> *downloads = nullptr;
+	bool hasSettings = false;
+	MenuButtons buttons = {};
+};
+
+struct SharedPanelMenuDispatchArgs {
+	Fn<void()> settings;
+	Fn<void()> reload;
+	Fn<void()> terms;
+	Fn<void()> privacy;
+	Fn<void(MenuButton)> menuButton;
+	Fn<void(uint32, DownloadsAction)> download;
+};
+
+[[nodiscard]] QString SharedPanelMenuActionId(SharedPanelMenuAction action) {
+	switch (action) {
+	case SharedPanelMenuAction::Settings:
+		return u"settings"_q;
+	case SharedPanelMenuAction::OpenBot:
+		return u"open_bot"_q;
+	case SharedPanelMenuAction::Reload:
+		return u"reload"_q;
+	case SharedPanelMenuAction::ShareGame:
+		return u"share_game"_q;
+	case SharedPanelMenuAction::Terms:
+		return u"terms"_q;
+	case SharedPanelMenuAction::Privacy:
+		return u"privacy"_q;
+	case SharedPanelMenuAction::RemoveFromMenu:
+		return u"remove_from_menu"_q;
+	case SharedPanelMenuAction::RemoveFromMainMenu:
+		return u"remove_from_main_menu"_q;
+	case SharedPanelMenuAction::None:
+	case SharedPanelMenuAction::DownloadOpen:
+	case SharedPanelMenuAction::DownloadRetry:
+	case SharedPanelMenuAction::DownloadCancel:
+		break;
+	}
+	return QString();
+}
+
+[[nodiscard]] QString DownloadPanelMenuActionId(
+		uint32 id,
+		DownloadsAction action) {
+	auto type = QString();
+	switch (action) {
+	case DownloadsAction::Open:
+		type = u"open"_q;
+		break;
+	case DownloadsAction::Retry:
+		type = u"retry"_q;
+		break;
+	case DownloadsAction::Cancel:
+		type = u"cancel"_q;
+		break;
+	}
+	return u"download:%1:%2"_q.arg(id).arg(type);
+}
+
+[[nodiscard]] SharedPanelMenuAction ParseSharedPanelMenuActionType(
+		const QString &type) {
+	if (type == u"open"_q) {
+		return SharedPanelMenuAction::DownloadOpen;
+	} else if (type == u"retry"_q) {
+		return SharedPanelMenuAction::DownloadRetry;
+	} else if (type == u"cancel"_q) {
+		return SharedPanelMenuAction::DownloadCancel;
+	}
+	return SharedPanelMenuAction::None;
+}
+
+struct ParsedSharedPanelMenuAction {
+	SharedPanelMenuAction action = SharedPanelMenuAction::None;
+	uint32 downloadId = 0;
+};
+
+[[nodiscard]] ParsedSharedPanelMenuAction ParseSharedPanelMenuAction(
+		const QString &id) {
+	if (id == u"settings"_q) {
+		return { SharedPanelMenuAction::Settings };
+	} else if (id == u"open_bot"_q) {
+		return { SharedPanelMenuAction::OpenBot };
+	} else if (id == u"reload"_q) {
+		return { SharedPanelMenuAction::Reload };
+	} else if (id == u"share_game"_q) {
+		return { SharedPanelMenuAction::ShareGame };
+	} else if (id == u"terms"_q) {
+		return { SharedPanelMenuAction::Terms };
+	} else if (id == u"privacy"_q) {
+		return { SharedPanelMenuAction::Privacy };
+	} else if (id == u"remove_from_menu"_q) {
+		return { SharedPanelMenuAction::RemoveFromMenu };
+	} else if (id == u"remove_from_main_menu"_q) {
+		return { SharedPanelMenuAction::RemoveFromMainMenu };
+	} else if (id.startsWith(u"download:"_q)) {
+		const auto parts = id.split(u':');
+		const auto downloadId = (parts.size() == 3)
+			? parts[1].toUInt()
+			: 0;
+		return {
+			.action = (parts.size() == 3)
+				? ParseSharedPanelMenuActionType(parts[2])
+				: SharedPanelMenuAction::None,
+			.downloadId = downloadId,
+		};
 	}
-	return dictionary.object();
+	return {};
+}
+
+void DispatchSharedPanelMenuAction(
+		const QString &id,
+		const SharedPanelMenuDispatchArgs &dispatch) {
+	const auto parsed = ParseSharedPanelMenuAction(id);
+	switch (parsed.action) {
+	case SharedPanelMenuAction::Settings:
+		if (dispatch.settings) {
+			dispatch.settings();
+		}
+		break;
+	case SharedPanelMenuAction::OpenBot:
+		if (dispatch.menuButton) {
+			dispatch.menuButton(MenuButton::OpenBot);
+		}
+		break;
+	case SharedPanelMenuAction::Reload:
+		if (dispatch.reload) {
+			dispatch.reload();
+		}
+		break;
+	case SharedPanelMenuAction::ShareGame:
+		if (dispatch.menuButton) {
+			dispatch.menuButton(MenuButton::ShareGame);
+		}
+		break;
+	case SharedPanelMenuAction::Terms:
+		if (dispatch.terms) {
+			dispatch.terms();
+		}
+		break;
+	case SharedPanelMenuAction::Privacy:
+		if (dispatch.privacy) {
+			dispatch.privacy();
+		}
+		break;
+	case SharedPanelMenuAction::RemoveFromMenu:
+		if (dispatch.menuButton) {
+			dispatch.menuButton(MenuButton::RemoveFromMenu);
+		}
+		break;
+	case SharedPanelMenuAction::RemoveFromMainMenu:
+		if (dispatch.menuButton) {
+			dispatch.menuButton(MenuButton::RemoveFromMainMenu);
+		}
+		break;
+	case SharedPanelMenuAction::DownloadOpen:
+		if (dispatch.download) {
+			dispatch.download(parsed.downloadId, DownloadsAction::Open);
+		}
+		break;
+	case SharedPanelMenuAction::DownloadRetry:
+		if (dispatch.download) {
+			dispatch.download(parsed.downloadId, DownloadsAction::Retry);
+		}
+		break;
+	case SharedPanelMenuAction::DownloadCancel:
+		if (dispatch.download) {
+			dispatch.download(parsed.downloadId, DownloadsAction::Cancel);
+		}
+		break;
+	case SharedPanelMenuAction::None:
+		break;
+	}
+}
+
+[[nodiscard]] SharedPanelMenuItem BuildDownloadPanelMenuItem(
+		const DownloadsEntry &entry) {
+	auto item = SharedPanelMenuItem();
+	item.text = entry.path.section(u'/', -1);
+	if (item.text.isEmpty()) {
+		item.text = entry.path;
+	}
+	if (item.text.isEmpty()) {
+		item.text = entry.url;
+	}
+	if (entry.total && (entry.total == entry.ready)) {
+		item.id = DownloadPanelMenuActionId(entry.id, DownloadsAction::Open);
+		item.subtitle = FormatSizeText(entry.total);
+	} else if (entry.loading) {
+		item.id = DownloadPanelMenuActionId(entry.id, DownloadsAction::Cancel);
+		item.subtitle = entry.total
+			? FormatProgressText(entry.ready, entry.total)
+			: tr::lng_bot_download_starting(tr::now);
+		item.actionLabel = tr::lng_cancel(tr::now);
+	} else {
+		item.id = DownloadPanelMenuActionId(entry.id, DownloadsAction::Retry);
+		item.subtitle = tr::lng_bot_download_failed(
+			tr::now,
+			lt_retry,
+			tr::lng_bot_download_retry(tr::now));
+		item.actionLabel = tr::lng_bot_download_retry(tr::now);
+	}
+	item.isEnabled = !item.id.isEmpty();
+	return item;
+}
+
+[[nodiscard]] std::vector<SharedPanelMenuItem> BuildSharedPanelMenuItems(
+		const SharedPanelMenuBuildArgs &args) {
+	auto result = std::vector<SharedPanelMenuItem>();
+	if (args.downloads && !args.downloads->empty()) {
+		auto children = std::vector<SharedPanelMenuItem>();
+		children.reserve(args.downloads->size());
+		for (const auto &entry : *args.downloads | ranges::views::reverse) {
+			children.push_back(BuildDownloadPanelMenuItem(entry));
+		}
+		result.push_back({
+			.id = u"downloads"_q,
+			.text = tr::lng_downloads_section(tr::now),
+			.iconKey = u"downloads"_q,
+			.icon = &st::menuIconDownload,
+			.children = std::move(children),
+		});
+		result.push_back({
+			.isSeparator = true,
+		});
+	}
+	if (args.hasSettings) {
+		result.push_back({
+			.id = SharedPanelMenuActionId(SharedPanelMenuAction::Settings),
+			.text = tr::lng_bot_settings(tr::now),
+			.iconKey = u"settings"_q,
+			.icon = &st::menuIconSettings,
+		});
+	}
+	if (args.buttons & MenuButton::OpenBot) {
+		result.push_back({
+			.id = SharedPanelMenuActionId(SharedPanelMenuAction::OpenBot),
+			.text = tr::lng_bot_open(tr::now),
+			.iconKey = u"open_bot"_q,
+			.icon = &st::menuIconLeave,
+		});
+	}
+	result.push_back({
+		.id = SharedPanelMenuActionId(SharedPanelMenuAction::Reload),
+		.text = tr::lng_bot_reload_page(tr::now),
+		.iconKey = u"reload"_q,
+		.icon = &st::menuIconRestore,
+	});
+	if (args.buttons & MenuButton::ShareGame) {
+		result.push_back({
+			.id = SharedPanelMenuActionId(SharedPanelMenuAction::ShareGame),
+			.text = tr::lng_iv_share(tr::now),
+			.iconKey = u"share_game"_q,
+			.icon = &st::menuIconShare,
+		});
+	} else {
+		result.push_back({
+			.id = SharedPanelMenuActionId(SharedPanelMenuAction::Terms),
+			.text = tr::lng_bot_terms(tr::now),
+			.iconKey = u"terms"_q,
+			.icon = &st::menuIconGroupLog,
+		});
+		result.push_back({
+			.id = SharedPanelMenuActionId(SharedPanelMenuAction::Privacy),
+			.text = tr::lng_bot_privacy(tr::now),
+			.iconKey = u"privacy"_q,
+			.icon = &st::menuIconAntispam,
+		});
+	}
+	if (args.buttons & MenuButton::RemoveFromMainMenu) {
+		result.push_back({
+			.id = SharedPanelMenuActionId(
+				SharedPanelMenuAction::RemoveFromMainMenu),
+			.text = tr::lng_bot_remove_from_side_menu(tr::now),
+			.iconKey = u"remove"_q,
+			.icon = &st::menuIconDeleteAttention,
+			.isAttention = true,
+		});
+	} else if (args.buttons & MenuButton::RemoveFromMenu) {
+		result.push_back({
+			.id = SharedPanelMenuActionId(
+				SharedPanelMenuAction::RemoveFromMenu),
+			.text = tr::lng_bot_remove_from_menu(tr::now),
+			.iconKey = u"remove"_q,
+			.icon = &st::menuIconDeleteAttention,
+			.isAttention = true,
+		});
+	}
+	return result;
+}
+
+void FillNativeSharedPanelMenu(
+		const Ui::Menu::MenuCallback &callback,
+		const std::vector<SharedPanelMenuItem> &items,
+		Fn<rpl::producer<std::vector<DownloadsEntry>>()> makeDownloads,
+		const SharedPanelMenuDispatchArgs &dispatch) {
+	for (const auto &item : items) {
+		if (item.isSeparator) {
+			callback({
+				.separatorSt = &st::expandedMenuSeparator,
+				.isSeparator = true,
+			});
+		} else if (!item.children.empty()) {
+			callback(Ui::Menu::MenuCallback::Args{
+				.text = item.text,
+				.icon = item.icon,
+				.fillSubmenu = FillAttachBotDownloadsSubmenu(
+					makeDownloads(),
+					[download = dispatch.download](
+							uint32 id,
+							DownloadsAction type) {
+						if (download) {
+							download(id, type);
+						}
+					}),
+			});
+		} else {
+			callback(Ui::Menu::MenuCallback::Args{
+				.text = item.text,
+				.handler = [=] {
+					DispatchSharedPanelMenuAction(item.id, dispatch);
+				},
+				.icon = item.icon,
+				.isAttention = item.isAttention,
+			});
+		}
+	}
+}
+
+[[nodiscard]] QImage RasterizeStyleIcon(const style::icon &icon) {
+	const auto size = icon.size();
+	const auto ratio = style::DevicePixelRatio();
+	auto image = QImage(size * ratio, QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(ratio);
+	image.fill(Qt::transparent);
+	auto painter = Painter(&image);
+	icon.paintInCenter(painter, QRect(QPoint(), size));
+	return image;
+}
+
+[[nodiscard]] QImage RasterizeVerifiedBadge() {
+	const auto size = st::infoVerifiedStar.size() + QSize(0, st::lineWidth);
+	const auto ratio = style::DevicePixelRatio();
+	auto image = QImage(size * ratio, QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(ratio);
+	image.fill(Qt::transparent);
+	auto painter = Painter(&image);
+	const auto width = size.width();
+	st::infoVerifiedStar.paint(painter, st::lineWidth, 0, width);
+	st::infoPeerBadge.verifiedCheck.paint(painter, st::lineWidth, 0, width);
+	return image;
+}
+
+[[nodiscard]] QString PngDataUrl(const QImage &image) {
+	auto bytes = QByteArray();
+	auto buffer = QBuffer(&bytes);
+	buffer.open(QIODevice::WriteOnly);
+	image.save(&buffer, "PNG");
+	return u"data:image/png;base64,"_q + QString::fromLatin1(bytes.toBase64());
+}
+
+[[nodiscard]] QJsonObject SerializeRasterAsset(
+		const QImage &image,
+		QSize size,
+		QString alt = QString()) {
+	auto result = QJsonObject{
+		{ u"url"_q, PngDataUrl(image) },
+		{ u"width"_q, size.width() },
+		{ u"height"_q, size.height() },
+	};
+	if (!alt.isEmpty()) {
+		result.insert(u"alt"_q, alt);
+	}
+	return result;
+}
+
+[[nodiscard]] QJsonObject SerializeStyleIconAsset(const style::icon &icon) {
+	return SerializeRasterAsset(RasterizeStyleIcon(icon), icon.size());
+}
+
+[[nodiscard]] QJsonObject SerializeVerifiedBadgeAsset() {
+	const auto size = st::infoVerifiedStar.size() + QSize(0, st::lineWidth);
+	return SerializeRasterAsset(
+		RasterizeVerifiedBadge(),
+		size,
+		tr::lng_sr_verified_badge(tr::now));
+}
+
+void CollectSharedPanelMenuIcons(
+		const std::vector<SharedPanelMenuItem> &items,
+		QJsonObject &result) {
+	for (const auto &item : items) {
+		if (!item.iconKey.isEmpty()
+			&& item.icon
+			&& !result.contains(item.iconKey)) {
+			result.insert(item.iconKey, SerializeStyleIconAsset(*item.icon));
+		}
+		if (!item.children.empty()) {
+			CollectSharedPanelMenuIcons(item.children, result);
+		}
+	}
+}
+
+[[nodiscard]] QJsonObject SerializeSharedPanelMenuItem(
+		const SharedPanelMenuItem &item) {
+	if (item.isSeparator) {
+		return { { u"separator"_q, true } };
+	}
+	auto result = QJsonObject{
+		{ u"id"_q, item.id },
+		{ u"text"_q, item.text },
+		{ u"attention"_q, item.isAttention },
+		{ u"enabled"_q, item.isEnabled },
+	};
+	if (!item.subtitle.isEmpty()) {
+		result.insert(u"subtitle"_q, item.subtitle);
+	}
+	if (!item.actionLabel.isEmpty()) {
+		result.insert(u"actionLabel"_q, item.actionLabel);
+	}
+	if (!item.iconKey.isEmpty()) {
+		result.insert(u"icon"_q, item.iconKey);
+	}
+	if (!item.children.empty()) {
+		auto children = QJsonArray();
+		for (const auto &child : item.children) {
+			children.push_back(SerializeSharedPanelMenuItem(child));
+		}
+		result.insert(u"children"_q, children);
+	}
+	return result;
+}
+
+[[nodiscard]] QJsonArray SerializeSharedPanelMenu(
+		const std::vector<SharedPanelMenuItem> &items) {
+	auto result = QJsonArray();
+	for (const auto &item : items) {
+		result.push_back(SerializeSharedPanelMenuItem(item));
+	}
+	return result;
 }
 
 [[nodiscard]] std::optional<QColor> ParseColor(const QString &text) {
@@ -132,7 +907,10 @@ struct ButtonArgs {
 
 class Panel::Button final : public RippleButton {
 public:
-	Button(QWidget *parent, const style::RoundButton &st);
+	Button(
+		QWidget *parent,
+		const style::RoundButton &st,
+		Text::MarkedContext textContext);
 	~Button();
 
 	void updateBg(QColor bg);
@@ -140,7 +918,7 @@ class Panel::Button final : public RippleButton {
 	void updateFg(QColor fg);
 	void updateFg(not_null<const style::color*> paletteFg);
 
-	void updateArgs(ButtonArgs &&args);
+	void updateArgs(Panel::ButtonArgs &&args);
 
 private:
 	void paintEvent(QPaintEvent *e) override;
@@ -150,11 +928,12 @@ class Panel::Button final : public RippleButton {
 
 	void toggleProgress(bool shown);
 	void setupProgressGeometry();
+	void updateText(uint64 iconCustomEmojiId, const QString &text);
 
 	std::unique_ptr<Progress> _progress;
-	rpl::variable<QString> _textFull;
 	Ui::Text::String _text;
 
+	Text::MarkedContext _textContext;
 	const style::RoundButton &_st;
 	QColor _fg;
 	style::owned_color _bg;
@@ -181,21 +960,20 @@ struct Panel::WebviewWithLifetime {
 		Webview::WindowConfig config = Webview::WindowConfig());
 
 	Webview::Window window;
-	QPointer<RpWidget> lastHidingBox;
+	std::vector<QPointer<RpWidget>> boxes;
+	rpl::lifetime boxesLifetime;
 	rpl::lifetime lifetime;
 };
 
-Panel::Button::Button(QWidget *parent, const style::RoundButton &st)
+Panel::Button::Button(
+	QWidget *parent,
+	const style::RoundButton &st,
+	Text::MarkedContext textContext)
 : RippleButton(parent, st.ripple)
+, _textContext(std::move(textContext))
 , _st(st)
 , _bg(st::windowBgActive->c)
 , _roundRect(st::callRadius, st::windowBgActive) {
-	_textFull.value(
-	) | rpl::start_with_next([=](const QString &text) {
-		_text.setText(st::semiboldTextStyle, text);
-		update();
-	}, lifetime());
-
 	resize(
 		_st.padding.left() + _text.maxWidth() + _st.padding.right(),
 		_st.padding.top() + _st.height + _st.padding.bottom());
@@ -203,6 +981,27 @@ Panel::Button::Button(QWidget *parent, const style::RoundButton &st)
 
 Panel::Button::~Button() = default;
 
+void Panel::Button::updateText(
+		uint64 iconCustomEmojiId,
+		const QString &text) {
+	if (iconCustomEmojiId) {
+		auto result = Text::SingleCustomEmoji(
+			QString::number(iconCustomEmojiId));
+		if (!text.isEmpty()) {
+			result.append(' ').append(text);
+		}
+		auto context = _textContext;
+		context.repaint = [=] { update(); };
+		_text.setMarkedText(
+			st::semiboldTextStyle,
+			result,
+			kMarkupTextOptions,
+			context);
+	} else {
+		_text.setText(st::semiboldTextStyle, text);
+	}
+}
+
 void Panel::Button::updateBg(QColor bg) {
 	_bg.update(bg);
 	_roundRect.setColor(_bg.color());
@@ -213,7 +1012,7 @@ void Panel::Button::updateBg(QColor bg) {
 void Panel::Button::updateBg(not_null<const style::color*> paletteBg) {
 	updateBg((*paletteBg)->c);
 	_bgLifetime = style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateBg((*paletteBg)->c);
 	});
 }
@@ -227,13 +1026,13 @@ void Panel::Button::updateFg(QColor fg) {
 void Panel::Button::updateFg(not_null<const style::color*> paletteFg) {
 	updateFg((*paletteFg)->c);
 	_fgLifetime = style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateFg((*paletteFg)->c);
 	});
 }
 
-void Panel::Button::updateArgs(ButtonArgs &&args) {
-	_textFull = std::move(args.text);
+void Panel::Button::updateArgs(Panel::ButtonArgs &&args) {
+	updateText(args.iconCustomEmojiId, args.text);
 	setDisabled(!args.isActive);
 	setPointerCursor(false);
 	setCursor(args.isActive ? style::cur_pointer : Qt::ForbiddenCursor);
@@ -251,7 +1050,7 @@ void Panel::Button::toggleProgress(bool shown) {
 			this,
 			[=] { return _progress->widget.rect(); });
 		_progress->widget.paintRequest(
-		) | rpl::start_with_next([=](QRect clip) {
+		) | rpl::on_next([=](QRect clip) {
 			auto p = QPainter(&_progress->widget);
 			p.setOpacity(
 				_progress->shownAnimation.value(_progress->shown ? 1. : 0.));
@@ -296,7 +1095,7 @@ void Panel::Button::setupProgressGeometry() {
 	}
 	_progress->geometryLifetime.destroy();
 	sizeValue(
-	) | rpl::start_with_next([=](QSize outer) {
+	) | rpl::on_next([=](QSize outer) {
 		const auto height = outer.height();
 		const auto size = st::paymentsLoading.size;
 		const auto skip = (height - size.height()) / 2;
@@ -330,13 +1129,18 @@ void Panel::Button::paintEvent(QPaintEvent *e) {
 
 	const auto height = rect().height();
 	const auto progress = st::paymentsLoading.size;
-	const auto skip = (height - progress.height()) / 2;
-	const auto padding = skip + progress.width() + skip;
-
-	const auto space = width() - padding * 2;
-	const auto textWidth = std::min(space, _text.maxWidth());
+	const auto minPad = (height - progress.height()) / 2;
+	const auto rightReserved = _progress
+		? (minPad + progress.width() + minPad)
+		: minPad;
+	const auto maxTextEnd = width() - rightReserved;
+	const auto maxSpace = std::max(maxTextEnd - minPad, 0);
+	const auto textWidth = std::min(_text.maxWidth(), maxSpace);
+	const auto centered = (width() - textWidth) / 2;
+	const auto textLeft = std::max(
+		std::min(centered, maxTextEnd - textWidth),
+		minPad);
 	const auto textTop = _st.padding.top() + _st.textTop;
-	const auto textLeft = padding + (space - textWidth) / 2;
 	p.setPen(_fg);
 	_text.drawLeftElided(p, textLeft, textTop, textWidth, width());
 }
@@ -363,23 +1167,78 @@ Panel::Progress::Progress(QWidget *parent, Fn<QRect()> rect)
 	st::paymentsLoading) {
 }
 
-Panel::Panel(
-	const Webview::StorageId &storageId,
-	rpl::producer<QString> title,
-	object_ptr<Ui::RpWidget> titleBadge,
-	not_null<Delegate*> delegate,
-	MenuButtons menuButtons,
-	bool allowClipboardRead)
-: _storageId(storageId)
-, _delegate(delegate)
-, _menuButtons(menuButtons)
-, _widget(std::make_unique<SeparatePanel>())
-, _allowClipboardRead(allowClipboardRead) {
+Panel::Panel(Args &&args)
+: _storageId(args.storageId)
+, _delegate(args.delegate)
+, _externalShell(UseExternalBotWebApps())
+, _menuButtons(args.menuButtons)
+, _externalPanelParent(_externalShell ? std::make_unique<RpWidget>() : nullptr)
+, _widget(std::make_unique<SeparatePanel>(Ui::SeparatePanelArgs{
+			.parent = _externalPanelParent.get(),
+			.menuSt = &st::botWebViewMenu,
+		}))
+, _externalLayer(_externalShell
+	? std::make_unique<StandaloneLayerStack>()
+	: nullptr)
+, _fullscreen(args.fullscreen)
+, _allowClipboardRead(args.allowClipboardRead)
+, _sameOrigin(args.sameOrigin) {
+	if (_externalShell) {
+		_widget->setAttribute(Qt::WA_DontShowOnScreen);
+		_externalLayer->boxAdded(
+		) | rpl::on_next([=] {
+			setExternalShellBlocked(true);
+		}, _widget->lifetime());
+		_externalLayer->boxClosed(
+		) | rpl::on_next([=] {
+			setExternalShellBlocked(false);
+		}, _widget->lifetime());
+	}
 	_widget->setWindowFlag(Qt::WindowStaysOnTopHint, false);
 	_widget->setInnerSize(st::botWebViewPanelSize, true);
 
+	const auto panel = _widget.get();
+	rpl::duplicate(
+		args.title
+	) | rpl::on_next([=](const QString &title) {
+		const auto value = tr::lng_credits_box_history_entry_miniapp(tr::now)
+			+ u": "_q
+			+ title;
+		panel->window()->setWindowTitle(value);
+	}, panel->lifetime());
+
+	const auto params = _delegate->botThemeParams();
+	updateColorOverrides(params);
+
+	_fullscreen.value(
+	) | rpl::on_next([=](bool fullscreen) {
+		if (_externalShell) {
+			if (!_webview) {
+				return;
+			}
+			applyExternalShellFullscreen(fullscreen);
+			sendFullScreen();
+			sendSafeArea();
+			sendContentSafeArea();
+			sendViewport();
+			return;
+		}
+		_widget->toggleFullScreen(fullscreen);
+		layoutButtons();
+		sendFullScreen();
+		sendSafeArea();
+		sendContentSafeArea();
+	}, _widget->lifetime());
+
+	_widget->fullScreenValue(
+	) | rpl::on_next([=](bool fullscreen) {
+		if (!_externalShell) {
+			_fullscreen = fullscreen;
+		}
+	}, _widget->lifetime());
+
 	_widget->closeRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_closeNeedConfirmation) {
 			scheduleCloseWithConfirmation();
 		} else {
@@ -390,12 +1249,12 @@ Panel::Panel(
 	_widget->closeEvents(
 	) | rpl::filter([=] {
 		return !_hiddenForPayment;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_delegate->botClose();
 	}, _widget->lifetime());
 
 	_widget->backRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		postEvent("back_button_pressed");
 	}, _widget->lifetime());
 
@@ -404,7 +1263,7 @@ Panel::Panel(
 		_themeUpdateForced.events()
 	) | rpl::filter([=] {
 		return !_themeUpdateScheduled;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_themeUpdateScheduled = true;
 		crl::on_main(_widget.get(), [=] {
 			_themeUpdateScheduled = false;
@@ -412,17 +1271,148 @@ Panel::Panel(
 		});
 	}, _widget->lifetime());
 
-	setTitle(std::move(title));
-	_widget->setTitleBadge(std::move(titleBadge));
+	setTitle(std::move(args.title));
+	_bottomText.value() | rpl::on_next([=](const QString &text) {
+		if (_externalShell) {
+			return;
+		}
+	}, _widget->lifetime());
+	_externalTitleBadgeVisible = (args.titleBadge.paint != nullptr);
+	_widget->setTitleBadge(std::move(args.titleBadge));
+
+	if (!showWebview(std::move(args), params)) {
+		if (_externalShell && _externalLayer) {
+			const auto available = Webview::Availability();
+			if (available.error != Webview::Available::Error::None) {
+				showExternalShellError(WebviewErrorText(
+					tr::lng_bot_no_webview(tr::now),
+					available));
+			} else {
+				showExternalShellError({ tr::lng_bot_webview_failed(tr::now) });
+			}
+		} else {
+			_externalShell = false;
+			const auto available = Webview::Availability();
+			if (available.error != Webview::Available::Error::None) {
+				showWebviewError(tr::lng_bot_no_webview(tr::now), available);
+			} else {
+				showCriticalError({ tr::lng_bot_webview_failed(tr::now) });
+			}
+		}
+	}
 }
 
 Panel::~Panel() {
 	base::take(_webview);
 	_progress = nullptr;
+	_externalLayer = nullptr;
+	_externalWebviewParent = nullptr;
 	_widget = nullptr;
+	_externalPanelParent = nullptr;
+}
+
+void Panel::setupDownloadsProgress(
+		not_null<RpWidget*> button,
+		rpl::producer<DownloadsProgress> progress,
+		bool fullscreen) {
+	const auto widget = Ui::CreateChild<RpWidget>(button.get());
+	widget->show();
+	widget->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	button->sizeValue() | rpl::on_next([=](QSize size) {
+		widget->setGeometry(QRect(QPoint(), size));
+	}, widget->lifetime());
+
+	struct State {
+		State(QWidget *parent)
+		: animation([=](crl::time now) {
+			const auto total = progress.total;
+			const auto current = total
+				? (progress.ready / float64(total))
+				: 0.;
+			const auto updated = animation.update(current, false, now);
+			if (!anim::Disabled() || updated) {
+				parent->update();
+			}
+		}) {
+		}
+
+		DownloadsProgress progress;
+		RadialAnimation animation;
+		Animations::Simple fade;
+		bool shown = false;
+	};
+	const auto state = widget->lifetime().make_state<State>(widget);
+	std::move(
+		progress
+	) | rpl::on_next([=](DownloadsProgress progress) {
+		const auto toggle = [&](bool shown) {
+			if (state->shown == shown) {
+				return;
+			}
+			state->shown = shown;
+			if (shown && !state->fade.animating()) {
+				return;
+			}
+			state->fade.start([=] {
+				widget->update();
+				if (!state->shown
+					&& !state->fade.animating()
+					&& (!state->progress.total
+						|| (state->progress.ready
+							== state->progress.total))) {
+					state->animation.stop();
+				}
+			}, shown ? 0. : 2., shown ? 2. : 0., st::radialDuration * 2);
+		};
+		if (!state->shown && progress.loading) {
+			if (!state->animation.animating()) {
+				state->animation.start(0.);
+			}
+			toggle(true);
+		} else if (state->shown && !progress.loading) {
+			state->animation.update(1., false, crl::now());
+			toggle(false);
+		}
+		state->progress = progress;
+	}, widget->lifetime());
+
+	widget->paintRequest() | rpl::on_next([=] {
+		const auto opacity = std::clamp(
+			state->fade.value(state->shown ? 2. : 0.) - 1.,
+			0.,
+			1.);
+		if (!opacity) {
+			return;
+		}
+		auto p = QPainter(widget);
+		p.setOpacity(opacity);
+		const auto palette = _widget->titleOverridePalette();
+		const auto color = fullscreen
+			? st::radialFg
+			: palette
+			? palette->boxTitleCloseFg()
+			: st::paymentsLoading.color;
+		const auto &st = fullscreen
+			? st::fullScreenPanelMenu
+			: st::separatePanelMenu;
+		const auto size = st.rippleAreaSize;
+		const auto rect = QRect(st.rippleAreaPosition, QSize(size, size));
+		const auto stroke = st::botWebViewRadialStroke;
+		const auto shift = stroke * 1.5;
+		const auto inner = QRectF(rect).marginsRemoved(
+			QMarginsF{ shift, shift, shift, shift });
+		state->animation.draw(p, inner, stroke, color);
+	}, widget->lifetime());
 }
 
 void Panel::requestActivate() {
+	if (_externalShell) {
+		if (_webview) {
+			_webview->window.focus();
+		}
+		return;
+	}
 	_widget->showAndActivate();
 	if (const auto widget = _webview ? _webview->window.widget() : nullptr) {
 		InvokeQueued(widget, [=] {
@@ -434,6 +1424,10 @@ void Panel::requestActivate() {
 }
 
 void Panel::toggleProgress(bool shown) {
+	if (_externalShell) {
+		sendExternalShellMethod("setProgress", { { u"shown"_q, shown } });
+		return;
+	}
 	if (!_progress) {
 		if (!shown) {
 			return;
@@ -442,7 +1436,7 @@ void Panel::toggleProgress(bool shown) {
 			_widget.get(),
 			[=] { return progressRect(); });
 		_progress->widget.paintRequest(
-		) | rpl::start_with_next([=](QRect clip) {
+		) | rpl::on_next([=](QRect clip) {
 			auto p = QPainter(&_progress->widget);
 			p.setOpacity(
 				_progress->shownAnimation.value(_progress->shown ? 1. : 0.));
@@ -509,7 +1503,7 @@ void Panel::setupProgressGeometry() {
 	_progress->geometryLifetime.destroy();
 	if (_webviewBottom) {
 		_webviewBottom->geometryValue(
-		) | rpl::start_with_next([=](QRect bottom) {
+		) | rpl::on_next([=](QRect bottom) {
 			const auto height = bottom.height();
 			const auto size = st::paymentsLoading.size;
 			const auto skip = (height - size.height()) / 2;
@@ -549,32 +1543,50 @@ void Panel::hideWebviewProgress() {
 	toggleProgress(false);
 }
 
-bool Panel::showWebview(
-		const QString &url,
-		const Webview::ThemeParams &params,
-		rpl::producer<QString> bottomText) {
-	_bottomText = std::move(bottomText);
+bool Panel::showWebview(Args &&args, const Webview::ThemeParams &params) {
+	_bottomText = std::move(args.bottom);
+	_externalUrl = args.url;
+	_sameOrigin = args.sameOrigin;
+	_initialOrigin = OriginFromUrl(args.url);
+	_currentOrigin = _initialOrigin;
+	if (_externalShell && !_webview) {
+		resetExternalShellIdentity();
+	}
 	if (!_webview && !createWebview(params)) {
 		return false;
 	}
 	const auto allowBack = false;
 	showWebviewProgress();
-	_widget->hideLayer(anim::type::instant);
+	if (!_externalShell) {
+		_widget->hideLayer(anim::type::instant);
+	}
 	updateThemeParams(params);
-	_webview->window.navigate(url);
-	_widget->setBackAllowed(allowBack);
-	_widget->setMenuAllowed([=](const Ui::Menu::MenuCallback &callback) {
-		if (_webview && _webview->window.widget() && _hasSettingsButton) {
-			callback(tr::lng_bot_settings(tr::now), [=] {
-				postEvent("settings_button_pressed");
-			}, &st::menuIconSettings);
-		}
-		if (_menuButtons & MenuButton::OpenBot) {
-			callback(tr::lng_bot_open(tr::now), [=] {
-				_delegate->botHandleMenuButton(MenuButton::OpenBot);
-			}, &st::menuIconLeave);
-		}
-		callback(tr::lng_bot_reload_page(tr::now), [=] {
+	const auto url = args.url;
+	if (_externalShell) {
+		_externalShellBootstrapped = false;
+		_webview->window.navigate(ExternalShellTopUrl());
+	} else {
+		_webview->window.navigate(url);
+		_widget->setBackAllowed(allowBack);
+	}
+
+	rpl::duplicate(args.downloadsProgress) | rpl::on_next([=] {
+		_downloadsUpdated.fire({});
+		if (_externalShell && _externalShellBootstrapped) {
+			sendExternalShellAssets();
+			sendExternalShellMenu();
+		}
+	}, lifetime());
+
+	if (_externalShell) {
+		return true;
+	}
+
+	const auto dispatch = SharedPanelMenuDispatchArgs{
+		.settings = [=] {
+			postEvent("settings_button_pressed");
+		},
+		.reload = [=] {
 			if (_webview && _webview->window.widget()) {
 				_webview->window.reload();
 			} else if (const auto params = _delegate->botThemeParams()
@@ -583,56 +1595,494 @@ bool Panel::showWebview(
 				updateThemeParams(params);
 				_webview->window.navigate(url);
 			}
-		}, &st::menuIconRestore);
-		if (_menuButtons & MenuButton::ShareGame) {
-			callback(tr::lng_iv_share(tr::now), [=] {
-				_delegate->botHandleMenuButton(MenuButton::ShareGame);
-			}, &st::menuIconShare);
-		} else {
-			callback(tr::lng_bot_terms(tr::now), [=] {
-				File::OpenUrl(tr::lng_mini_apps_tos_url(tr::now));
-			}, &st::menuIconGroupLog);
-			callback(tr::lng_profile_bot_privacy(tr::now), [=] {
-				_delegate->botOpenPrivacyPolicy();
-			}, &st::menuIconAntispam);
-		}
-		const auto main = (_menuButtons & MenuButton::RemoveFromMainMenu);
-		if (main || (_menuButtons & MenuButton::RemoveFromMenu)) {
-			const auto handler = [=] {
-				_delegate->botHandleMenuButton(main
-					? MenuButton::RemoveFromMainMenu
-					: MenuButton::RemoveFromMenu);
-			};
-			callback({
-				.text = (main
-					? tr::lng_bot_remove_from_side_menu
-					: tr::lng_bot_remove_from_menu)(tr::now),
-				.handler = handler,
-				.icon = &st::menuIconDeleteAttention,
-				.isAttention = true,
-			});
-		}
+		},
+		.terms = [=] {
+			File::OpenUrl(tr::lng_mini_apps_tos_url(tr::now));
+		},
+		.privacy = [=] {
+			_delegate->botOpenPrivacyPolicy();
+		},
+		.menuButton = [=](MenuButton button) {
+			_delegate->botHandleMenuButton(button);
+		},
+		.download = [=](uint32 id, DownloadsAction type) {
+			_delegate->botDownloadsAction(id, type);
+		},
+	};
+	_widget->setMenuAllowed([=](
+			const Ui::Menu::MenuCallback &callback) {
+		const auto &downloads = _delegate->botDownloads(true);
+		const auto items = BuildSharedPanelMenuItems({
+			.downloads = &downloads,
+			.hasSettings = _webview
+				&& _webview->window.widget()
+				&& _hasSettingsButton,
+			.buttons = _menuButtons,
+		});
+		FillNativeSharedPanelMenu(
+			callback,
+			items,
+			[=] {
+				return rpl::single(_delegate->botDownloads(true))
+					| rpl::then(_downloadsUpdated.events(
+					) | rpl::map([=] {
+						return _delegate->botDownloads();
+					}));
+			},
+			dispatch);
+	}, [=, progress = std::move(args.downloadsProgress)](
+			not_null<RpWidget*> button,
+			bool fullscreen) {
+		setupDownloadsProgress(
+			button,
+			rpl::duplicate(progress),
+			fullscreen);
 	});
+
 	return true;
 }
 
+void Panel::setExternalShellTitleColor(std::optional<QColor> color) {
+	_externalShellColorState.titleUsesTheme = !color.has_value();
+	_externalShellColorState.title = std::move(color);
+}
+
+void Panel::setExternalShellBodyColor(std::optional<QColor> color) {
+	_externalShellColorState.bodyUsesTheme = !color.has_value();
+	_externalShellColorState.body = std::move(color);
+}
+
+void Panel::setExternalShellBottomColor(std::optional<QColor> color) {
+	_externalShellColorState.bottomUsesTheme = !color.has_value();
+	_externalShellColorState.bottom = std::move(color);
+}
+
+LinuxShell::ResolvedColors Panel::externalShellColors(
+		const Webview::ThemeParams &params) const {
+	const auto body = _externalShellColorState.bodyUsesTheme
+		? ResolveExternalShellThemeColor(params.bodyBg)
+		: _externalShellColorState.body.value_or(params.bodyBg);
+	return {
+		.titleBg = _externalShellColorState.titleUsesTheme
+			? ResolveExternalShellThemeColor(params.titleBg)
+			: _externalShellColorState.title.value_or(params.titleBg),
+		.bodyBg = body,
+		.bottomBg = _externalShellColorState.bottomUsesTheme
+			? body
+			: _externalShellColorState.bottom.value_or(body),
+	};
+}
+
+void Panel::sendExternalShellColors(const Webview::ThemeParams &params) {
+	sendExternalShellMethod(
+		"setColors",
+		LinuxShell::ColorPayload(externalShellColors(params)));
+}
+
+void Panel::resetExternalShellIdentity() {
+	_externalShellToken = GenerateExternalShellToken();
+	++_externalShellGeneration;
+	_externalShellBootstrapped = false;
+}
+
+void Panel::invalidateExternalShellSession() {
+	const auto wasActive = _externalShellBootstrapped
+		|| !_externalShellToken.isEmpty();
+	_externalShellBootstrapped = false;
+	_externalShellToken.clear();
+	if (wasActive) {
+		++_externalShellGeneration;
+	}
+}
+
+void Panel::installExternalShellDocument() {
+	if (!_externalShell
+		|| !_externalShellBootstrapped
+		|| !_webview
+		|| _externalShellToken.isEmpty()) {
+		return;
+	}
+	_webview->window.eval(LinuxShell::InstallScript(_externalShellToken));
+}
+
+void Panel::sendExternalShellBootstrap() {
+	const auto params = _delegate->botThemeParams();
+	sendExternalShellMethod("bootstrap", {
+		{ u"url"_q, _externalUrl },
+		{ u"sameOrigin"_q, bool(_sameOrigin) },
+		{ u"initialOrigin"_q, _initialOrigin },
+		{ u"title"_q, _externalTitle },
+		{ u"metrics"_q, LinuxShell::Metrics() },
+		{ u"colors"_q, LinuxShell::ColorPayload(externalShellColors(params)) },
+		{ u"bottomText"_q, QString() },
+		{ u"backVisible"_q, _externalBackVisible },
+		{ u"menuVisible"_q, true },
+		{ u"badgeVisible"_q, _externalTitleBadgeVisible },
+	});
+	sendExternalShellAssets();
+	sendExternalShellMenu();
+	postEvent("theme_changed", ThemeChangedPayload(params));
+	sendFullScreen();
+	sendSafeArea();
+	sendContentSafeArea();
+}
+
+void Panel::sendExternalShellMethod(
+		const QByteArray &method,
+		const QJsonObject &data) {
+	if (!_externalShell
+		|| !_externalShellBootstrapped
+		|| !_webview
+		|| _externalShellToken.isEmpty()) {
+		return;
+	}
+	_webview->window.eval(
+		LinuxShell::MethodCallScript(method, data, _externalShellToken));
+}
+
+void Panel::sendExternalShellEvent(
+		const QString &event,
+		const QJsonObject &data) {
+	if (!_externalShell
+		|| !_externalShellBootstrapped
+		|| !_webview
+		|| _externalShellToken.isEmpty()) {
+		return;
+	}
+	_webview->window.eval(
+		LinuxShell::EventScript(event, data, _externalShellToken));
+}
+
+void Panel::sendExternalShellButton(
+		const char *name,
+		const QJsonObject &args) {
+	auto &state = (name[0] == 'm')
+		? _externalMainButton
+		: _externalSecondaryButton;
+	const auto text = args["text"].toString();
+	const auto trimmed = text.trimmed();
+	const auto iconCustomEmojiId
+		= args["icon_custom_emoji_id"].toString().toULongLong();
+	const auto color = ParseColor(args["color"].toString()).value_or(
+		st::windowBgActive->c);
+	const auto textColor = ParseColor(args["text_color"].toString()).value_or(
+		st::windowFgActive->c);
+	const auto iconAffectingChanged
+		= (state.args.iconCustomEmojiId != iconCustomEmojiId)
+		|| (iconCustomEmojiId && state.textColor != textColor);
+	state.args = {
+		.isActive = args["is_active"].toBool(),
+		.isVisible = args["is_visible"].toBool()
+			&& (!trimmed.isEmpty() || iconCustomEmojiId),
+		.isProgressVisible = args["is_progress_visible"].toBool(),
+		.iconCustomEmojiId = iconCustomEmojiId,
+		.text = text,
+	};
+	state.color = color;
+	state.textColor = textColor;
+	state.position = args["position"].toString();
+	if (iconAffectingChanged) {
+		++state.iconGeneration;
+	}
+	const auto visible = state.args.isVisible;
+	sendExternalShellMethod("setButton", {
+		{ u"name"_q, QString::fromLatin1(name) },
+		{ u"visible"_q, visible },
+		{ u"active"_q, state.args.isActive },
+		{ u"progress"_q, state.args.isProgressVisible },
+		{ u"text"_q, state.args.text },
+		{ u"color"_q, state.color.name(QColor::HexRgb) },
+		{ u"textColor"_q, state.textColor.name(QColor::HexRgb) },
+		{ u"position"_q, state.position },
+		{ u"iconCustomEmojiId"_q, state.args.iconCustomEmojiId
+			? QString::number(state.args.iconCustomEmojiId)
+			: QString() },
+		{ u"iconGeneration"_q, QString::number(state.iconGeneration) },
+	});
+}
+
+void Panel::applyExternalShellFullscreen(bool fullscreen) {
+	if (!_externalShell || !_webview) {
+		return;
+	}
+	_webview->window.setFullscreen(fullscreen);
+}
+
+void Panel::requestExternalShellButtonEmoji(const QString &name) {
+	auto *state = (name == u"main"_q)
+		? &_externalMainButton
+		: (name == u"secondary"_q)
+		? &_externalSecondaryButton
+		: nullptr;
+	if (!state || !_externalShell) {
+		return;
+	}
+	const auto generation = state->iconGeneration;
+	const auto responseName = name;
+	const auto weak = base::make_weak(this);
+	auto send = [=](QImage image = QImage()) {
+		const auto panel = weak.get();
+		if (!panel) {
+			return;
+		}
+		const auto *current = (responseName == u"main"_q)
+			? &panel->_externalMainButton
+			: &panel->_externalSecondaryButton;
+		if (current->iconGeneration != generation) {
+			return;
+		}
+		auto data = QJsonObject{
+			{ u"name"_q, responseName },
+			{ u"generation"_q, QString::number(generation) },
+		};
+		if (!image.isNull()) {
+			data.insert(
+				u"icon"_q,
+				SerializeRasterAsset(
+					image,
+					QSize(
+						kExternalShellButtonIconSize,
+						kExternalShellButtonIconSize)));
+		}
+		panel->sendExternalShellMethod("setButtonIcon", data);
+	};
+	if (!state->args.isVisible || !state->args.iconCustomEmojiId) {
+		send();
+		return;
+	}
+	_delegate->botResolveButtonEmoji({
+		.customEmojiId = state->args.iconCustomEmojiId,
+		.textColor = state->textColor,
+		.size = kExternalShellButtonIconSize,
+		.callback = std::move(send),
+	});
+}
+
+void Panel::sendExternalShellMenu() {
+	const auto &downloads = _delegate->botDownloads(true);
+	const auto items = BuildSharedPanelMenuItems({
+		.downloads = &downloads,
+		.hasSettings = _webview && _webview->window.widget() && _hasSettingsButton,
+		.buttons = _menuButtons,
+	});
+	sendExternalShellMethod("setMenu", {
+		{ u"items"_q, SerializeSharedPanelMenu(items) },
+	});
+}
+
+void Panel::sendExternalShellAssets() {
+	const auto &downloads = _delegate->botDownloads(true);
+	const auto items = BuildSharedPanelMenuItems({
+		.downloads = &downloads,
+		.hasSettings = _webview && _webview->window.widget() && _hasSettingsButton,
+		.buttons = _menuButtons,
+	});
+	auto icons = QJsonObject();
+	CollectSharedPanelMenuIcons(items, icons);
+	sendExternalShellMethod("setAssets", {
+		{ u"icons"_q, icons },
+		{ u"titleMenuIcon"_q,
+			SerializeStyleIconAsset(st::separatePanelMenu.icon) },
+		{ u"verifiedBadge"_q, SerializeVerifiedBadgeAsset() },
+		{ u"menuPalette"_q, LinuxShell::MenuPalette() },
+	});
+}
+
+void Panel::handleExternalShellMenuAction(const QString &id) {
+	DispatchSharedPanelMenuAction(id, {
+		.settings = [=] {
+			postEvent("settings_button_pressed");
+		},
+		.reload = [=] {
+			if (_webview && _webview->window.widget()) {
+				sendExternalShellMethod("reloadFrame", {});
+			} else {
+				const auto params = _delegate->botThemeParams();
+				resetExternalShellIdentity();
+				if (!createWebview(params)) {
+					return;
+				}
+				showWebviewProgress();
+				updateThemeParams(params);
+				_webview->window.navigate(ExternalShellTopUrl());
+			}
+		},
+		.terms = [=] {
+			File::OpenUrl(tr::lng_mini_apps_tos_url(tr::now));
+		},
+		.privacy = [=] {
+			_delegate->botOpenPrivacyPolicy();
+		},
+		.menuButton = [=](MenuButton button) {
+			_delegate->botHandleMenuButton(button);
+		},
+		.download = [=](uint32 downloadId, DownloadsAction type) {
+			_delegate->botDownloadsAction(downloadId, type);
+		},
+	});
+}
+
+void Panel::sendExternalShellChrome() {
+	sendExternalShellMethod("setChrome", {
+		{ u"backVisible"_q, _externalBackVisible },
+		{ u"menuVisible"_q, true },
+		{ u"badgeVisible"_q, _externalTitleBadgeVisible },
+	});
+}
+
+void Panel::setExternalShellBlocked(bool blocked) {
+	if (!_externalShell) {
+		return;
+	}
+	const auto was = (_externalBlockCount > 0);
+	if (blocked) {
+		++_externalBlockCount;
+	} else if (_externalBlockCount > 0) {
+		--_externalBlockCount;
+	}
+	const auto now = (_externalBlockCount > 0);
+	if (was != now) {
+		sendExternalShellMethod("setBlocked", { { u"blocked"_q, now } });
+	}
+}
+
+void Panel::closeExternalShellLayer() {
+	if (!_externalShell) {
+		return;
+	}
+	if (_externalLayer) {
+		_externalLayer->hideLayers(anim::type::normal);
+	}
+	Webview::CloseBlockingPopup();
+}
+
+void Panel::showExternalShellError(TextWithEntities text) {
+	const auto anchor = externalShellAnchor();
+	invalidateExternalShellSession();
+	_progress = nullptr;
+	_webviewProgress = false;
+	base::take(_webview);
+	_externalWebviewParent = nullptr;
+	_webviewParent = nullptr;
+	Webview::CloseBlockingPopup();
+	if (!_externalLayer) {
+		showCriticalError(text);
+		return;
+	}
+	_externalLayer->setAnchor(
+		anchor.anchorGeometry,
+		anchor.outerSize,
+		anchor.transientParent);
+	const auto weak = base::make_weak(this);
+	const auto botClosed = std::make_shared<bool>(false);
+	const auto closeBot = [=] {
+		if (*botClosed) {
+			return;
+		}
+		*botClosed = true;
+		if (const auto panel = weak.get()) {
+			panel->_delegate->botClose();
+		}
+	};
+	auto box = Ui::MakeInformBox({
+		.text = std::move(text),
+		.confirmed = [=](Fn<void()> close) {
+			close();
+			closeBot();
+		},
+	});
+	box->boxClosing() | rpl::on_next(closeBot, box->lifetime());
+	_externalLayer->showBox(
+		std::move(box),
+		LayerOption::CloseOther,
+		anim::type::normal);
+}
+
+Panel::ExternalShellAnchor Panel::externalShellAnchor() const {
+	if (!_webview) {
+		return {};
+	}
+	auto popupAnchor = _webview->window.popupAnchor();
+	auto result = ExternalShellAnchor{
+		.outerSize = std::move(popupAnchor.outerSize),
+		.transientParent = CompatibleForeignParent(
+			std::move(popupAnchor.transientParent)),
+	};
+	switch (result.transientParent.type) {
+	case Ui::Platform::ForeignParent::Type::X11:
+		result.anchorGeometry = Ui::Platform::ForeignWindowGeometry(
+			result.transientParent);
+		if (result.anchorGeometry) {
+			result.outerSize = std::nullopt;
+		}
+		break;
+	case Ui::Platform::ForeignParent::Type::None:
+	case Ui::Platform::ForeignParent::Type::Wayland:
+		result.anchorGeometry = std::move(popupAnchor.geometry);
+		break;
+	}
+	if (!result.transientParent
+		&& !result.anchorGeometry
+		&& !result.outerSize) {
+		return {};
+	}
+	return result;
+}
+
+QWidget *Panel::webviewWindowForPopup() const {
+	const auto widget = _webview ? _webview->window.widget() : nullptr;
+	return widget ? widget->window() : nullptr;
+}
+
+void Panel::showPopup(
+		Webview::PopupArgs &&args,
+		Fn<void(Webview::PopupResult)> done) {
+	if (!_externalShell) {
+		auto result = Webview::ShowBlockingPopup(std::move(args));
+		if (done) {
+			done(std::move(result));
+		}
+		return;
+	}
+	const auto anchor = externalShellAnchor();
+	args.anchorGeometry = anchor.anchorGeometry;
+	args.transientParent = anchor.transientParent;
+	args.parent = nullptr;
+	setExternalShellBlocked(true);
+	const auto weak = base::make_weak(this);
+	Webview::ShowPopupAsync(
+		std::move(args),
+		[=, done = std::move(done)](
+				Webview::PopupResult result) mutable {
+			if (weak) {
+				weak->setExternalShellBlocked(false);
+			}
+			if (done) {
+				done(std::move(result));
+			}
+		},
+		false);
+}
+
 void Panel::createWebviewBottom() {
 	_webviewBottom = std::make_unique<RpWidget>(_widget.get());
 	const auto bottom = _webviewBottom.get();
-	bottom->show();
+	bottom->setVisible(!_fullscreen.current());
 
 	const auto &padding = st::paymentsPanelPadding;
 	const auto label = CreateChild<FlatLabel>(
 		_webviewBottom.get(),
 		_bottomText.value(),
 		st::paymentsWebviewBottom);
+	_webviewBottomLabel = label;
+
 	const auto height = padding.top()
 		+ label->heightNoMargins()
 		+ padding.bottom();
 	rpl::combine(
 		_webviewBottom->widthValue(),
 		label->widthValue()
-	) | rpl::start_with_next([=](int outerWidth, int width) {
+	) | rpl::on_next([=](int outerWidth, int width) {
 		label->move((outerWidth - width) / 2, padding.top());
 	}, label->lifetime());
 	label->show();
@@ -643,7 +2093,7 @@ void Panel::createWebviewBottom() {
 			return _widget->innerGeometry();
 		}),
 		bottom->heightValue()
-	) | rpl::start_with_next([=](QRect inner, int height) {
+	) | rpl::on_next([=](QRect inner, int height) {
 		bottom->move(inner.x(), inner.y() + inner.height() - height);
 		bottom->resizeToWidth(inner.width());
 		layoutButtons();
@@ -651,25 +2101,59 @@ void Panel::createWebviewBottom() {
 }
 
 bool Panel::createWebview(const Webview::ThemeParams &params) {
-	auto outer = base::make_unique_q<RpWidget>(_widget.get());
-	const auto container = outer.get();
-	_widget->showInner(std::move(outer));
+	RpWidget *container = nullptr;
+	if (_externalShell) {
+		_externalWebviewParent = std::make_unique<RpWidget>();
+		container = _externalWebviewParent.get();
+	} else {
+		auto outer = base::make_unique_q<RpWidget>(_widget.get());
+		container = outer.get();
+		_widget->showInner(std::move(outer));
+	}
 	_webviewParent = container;
 
-	createWebviewBottom();
+	_headerColorReceived = false;
+	_bodyColorReceived = false;
+	_bottomColorReceived = false;
+	updateColorOverrides(params);
+	if (!_externalShell) {
+		createWebviewBottom();
+	}
 
-	container->show();
+	if (!_externalShell) {
+		container->show();
+	}
+	_externalWindowCloseRequested = false;
 	_webview = std::make_unique<WebviewWithLifetime>(
 		container,
 		Webview::WindowConfig{
-			.opaqueBg = params.opaqueBg,
+			.opaqueBg = params.bodyBg,
 			.storageId = _storageId,
+			.mode = _externalShell
+				? Webview::WindowMode::External
+				: Webview::WindowMode::Embedded,
+			.windowStyle = _externalShell
+				? Webview::WindowStyle::Frameless
+				: Webview::WindowStyle::Default,
+			.windowMargins = _externalShell
+				? st::botWebViewShellShadowPadding
+				: QMargins(),
+			.initialSize = _externalShell
+				? LinuxShell::WindowSize(st::botWebViewPanelSize)
+				: QSize(),
+			.shellMessageToken = _externalShell
+				? _externalShellToken
+				: QString(),
 		});
 	const auto raw = &_webview->window;
 
 	const auto bottom = _webviewBottom.get();
 	QObject::connect(container, &QObject::destroyed, [=] {
 		if (_webview && &_webview->window == raw) {
+			if (_externalShell) {
+				_externalShellBootstrapped = false;
+				++_externalShellGeneration;
+			}
 			base::take(_webview);
 			if (_webviewProgress) {
 				hideWebviewProgress();
@@ -679,6 +2163,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			}
 		}
 		if (_webviewBottom.get() == bottom) {
+			_webviewBottomLabel = nullptr;
 			_webviewBottom = nullptr;
 			_secondaryButton = nullptr;
 			_mainButton = nullptr;
@@ -688,43 +2173,130 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 	if (!raw->widget()) {
 		return false;
 	}
+
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
+	if (!_externalShell) {
+		_widget->allowChildFullScreenControls(
+			!raw->widget()->inherits("QWindowContainer"));
+	}
+#endif // !Q_OS_WIN && !Q_OS_MAC
+
+	raw->setInteractionHandler([=] {
+		_lastWebviewInteraction = crl::now();
+	});
+	raw->setExternalWindowCloseHandler([=] {
+		if (!_externalShell
+			|| !_webview
+			|| &_webview->window != raw) {
+			return;
+		}
+		_externalWindowCloseRequested = true;
+		invalidateExternalShellSession();
+		_delegate->botClose();
+	});
+
 	QObject::connect(raw->widget(), &QObject::destroyed, [=] {
 		const auto parent = _webviewParent.data();
 		if (!_webview
 			|| &_webview->window != raw
-			|| !parent
-			|| _widget->inner() != parent) {
+			|| (_externalShell && _externalWindowCloseRequested)
+			|| (!_externalShell
+				&& (!parent || _widget->inner() != parent))) {
 			// If we destroyed _webview ourselves,
 			// or if we changed _widget->inner ourselves,
 			// we don't show any message, nothing crashed.
 			return;
 		}
+		if (_externalShell) {
+			invalidateExternalShellSession();
+		}
 		crl::on_main(this, [=] {
-			showCriticalError({ "Error: WebView has crashed." });
+			if (!_webview || &_webview->window != raw) {
+				return;
+			}
+			if (_externalShell) {
+				showExternalShellError({ tr::lng_bot_webview_crashed(tr::now) });
+			} else {
+				showCriticalError({ tr::lng_bot_webview_crashed(tr::now) });
+			}
 		});
 	});
 
-	rpl::combine(
-		container->geometryValue(),
-		_footerHeight.value()
-	) | rpl::start_with_next([=](QRect geometry, int footer) {
-		if (const auto view = raw->widget()) {
-			view->setGeometry(geometry.marginsRemoved({ 0, 0, 0, footer }));
-			crl::on_main(view, [=] {
-				sendViewport();
-			});
+	if (_externalShell) {
+		applyExternalShellFullscreen(_fullscreen.current());
+	} else {
+		rpl::combine(
+			container->geometryValue(),
+			_footerHeight.value()
+		) | rpl::on_next([=](QRect geometry, int footer) {
+			if (const auto view = raw->widget()) {
+				view->setGeometry(geometry.marginsRemoved({ 0, 0, 0, footer }));
+				crl::on_main(view, [=] {
+					sendViewport();
+					InvokeQueued(view, [=] { sendViewport(); });
+				});
+			}
+		}, _webview->lifetime);
+	}
+
+	raw->setMessageHandler([=](Webview::Message message) {
+		if (message.text.size() > size_t(kMaxNativeMessageBytes)) {
+			LogNativeMessageRejected(
+				u"payload too large"_q,
+				quint64(message.text.size()));
+			return;
+		}
+		const auto bytes = QByteArray::fromRawData(
+			message.text.data(),
+			int(message.text.size()));
+		const auto parsed = ParseNativeMessage(
+			bytes,
+			QString::fromStdString(message.sourceUrl),
+			_externalShell,
+			_externalShellToken);
+		if (!parsed) {
+			return;
 		}
-	}, _webview->lifetime);
-
-	raw->setMessageHandler([=](const QJsonDocument &message) {
-		if (!message.isArray()) {
-			LOG(("BotWebView Error: "
-				"Not an array received in buy_callback arguments."));
+		if (_sameOrigin
+			&& parsed->source != NativeMessageSource::ExternalShell
+			&& !OriginsMatch(parsed->origin, _initialOrigin)) {
+			LogNativeMessageRejected(
+				u"bad webapp origin"_q,
+				quint64(message.text.size()),
+				parsed->command);
+			return;
+		}
+		const auto &command = parsed->command;
+		const auto &arguments = parsed->arguments;
+		if (parsed->source == NativeMessageSource::ExternalShell) {
+			if (!_externalShell || !_externalShellBootstrapped) {
+				return;
+			}
+			if (command == "shell_close") {
+				if (_closeNeedConfirmation) {
+					scheduleCloseWithConfirmation();
+				} else {
+					_delegate->botClose();
+				}
+			} else if (command == "shell_menu_request") {
+				if (_externalBlockCount <= 0) {
+					sendExternalShellAssets();
+					sendExternalShellMenu();
+				}
+			} else if (command == "shell_menu_action") {
+				if (_externalBlockCount <= 0) {
+					handleExternalShellMenuAction(arguments["id"].toString());
+				}
+			} else if (command == "shell_request_button_icon") {
+				const auto name = arguments["name"];
+				if (name.isString()) {
+					requestExternalShellButtonEmoji(name.toString());
+				}
+			} else if (command == "shell_close_layer") {
+				closeExternalShellLayer();
+			}
 			return;
 		}
-		const auto list = message.array();
-		const auto command = list.at(0).toString();
-		const auto arguments = ParseMethodArgs(list.at(1).toString());
 		if (command == "web_app_close") {
 			_delegate->botClose();
 		} else if (command == "web_app_data_send") {
@@ -743,6 +2315,52 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			_themeUpdateForced.fire({});
 		} else if (command == "web_app_request_viewport") {
 			sendViewport();
+		} else if (command == "web_app_request_safe_area") {
+			sendSafeArea();
+		} else if (command == "web_app_request_content_safe_area") {
+			sendContentSafeArea();
+		} else if (command == "web_app_request_fullscreen") {
+			if (!_fullscreen.current()) {
+				_fullscreen = true;
+			} else {
+				sendFullScreen();
+			}
+		} else if (command == "web_app_request_file_download") {
+			processDownloadRequest(arguments);
+		} else if (command == "web_app_exit_fullscreen") {
+			if (_fullscreen.current()) {
+				_fullscreen = false;
+			} else {
+				sendFullScreen();
+			}
+		} else if (command == "web_app_check_home_screen") {
+			postEvent("home_screen_checked", QJsonObject{
+				{ u"status"_q, u"unsupported"_q },
+			});
+		} else if (command == "web_app_start_accelerometer") {
+			postEvent("accelerometer_failed", QJsonObject{
+				{ u"error"_q, u"UNSUPPORTED"_q },
+			});
+		} else if (command == "web_app_start_device_orientation") {
+			postEvent("device_orientation_failed", QJsonObject{
+				{ u"error"_q, u"UNSUPPORTED"_q },
+			});
+		} else if (command == "web_app_start_gyroscope") {
+			postEvent("gyroscope_failed", QJsonObject{
+				{ u"error"_q, u"UNSUPPORTED"_q },
+			});
+		} else if (command == "web_app_check_location") {
+			postEvent("location_checked", QJsonObject{
+				{ u"available"_q, false },
+			});
+		} else if (command == "web_app_request_location") {
+			postEvent("location_requested", QJsonObject{
+				{ u"available"_q, false },
+			});
+		} else if (command == "web_app_biometry_get_info") {
+			postEvent("biometry_info_received", QJsonObject{
+				{ u"available"_q, false },
+			});
 		} else if (command == "web_app_open_tg_link") {
 			openTgLink(arguments);
 		} else if (command == "web_app_open_link") {
@@ -767,8 +2385,42 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			requestClipboardText(arguments);
 		} else if (command == "web_app_set_header_color") {
 			processHeaderColor(arguments);
+		} else if (command == "web_app_set_background_color") {
+			processBackgroundColor(arguments);
 		} else if (command == "web_app_set_bottom_bar_color") {
 			processBottomBarColor(arguments);
+		} else if (command == "web_app_send_prepared_message") {
+			processSendMessageRequest(arguments);
+		} else if (command == "web_app_request_chat") {
+			processRequestChat(arguments);
+		} else if (command == "web_app_set_emoji_status") {
+			processEmojiStatusRequest(arguments);
+		} else if (command == "web_app_request_emoji_status_access") {
+			processEmojiStatusAccessRequest();
+		} else if (command == "web_app_device_storage_save_key") {
+			processStorageSaveKey(arguments);
+		} else if (command == "web_app_device_storage_get_key") {
+			processStorageGetKey(arguments);
+		} else if (command == "web_app_device_storage_clear") {
+			processStorageClear(arguments);
+		} else if (command == "web_app_secure_storage_save_key") {
+			secureStorageFailed(arguments);
+		} else if (command == "web_app_secure_storage_get_key") {
+			secureStorageFailed(arguments);
+		} else if (command == "web_app_secure_storage_restore_key") {
+			secureStorageFailed(arguments);
+		} else if (command == "web_app_secure_storage_clear") {
+			secureStorageFailed(arguments);
+		} else if (command == "web_app_verify_age") {
+			const auto passed = arguments["passed"];
+			const auto detected = arguments["age"];
+			const auto valid = passed.isBool()
+				&& passed.toBool()
+				&& detected.isDouble();
+			const auto age = valid
+				? int(std::floor(detected.toDouble()))
+				: 0;
+			_delegate->botVerifyAge(age);
 		} else if (command == "share_score") {
 			_delegate->botHandleMenuButton(MenuButton::ShareGame);
 		}
@@ -780,14 +2432,68 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 		} else if (newWindow) {
 			return true;
 		}
+		_currentOrigin = OriginFromUrl(uri);
 		showWebviewProgress();
 		return true;
 	});
 	raw->setNavigationDoneHandler([=](bool success) {
 		hideWebviewProgress();
+		if (_externalShell && !_externalShellBootstrapped) {
+			if (!success) {
+				invalidateExternalShellSession();
+				crl::on_main(this, [=] {
+					if (_externalShell && _webview && &_webview->window == raw) {
+						showExternalShellError({
+							tr::lng_bot_webview_failed(tr::now),
+						});
+					}
+				});
+				return;
+			}
+			_externalShellBootstrapped = true;
+			installExternalShellDocument();
+			sendExternalShellBootstrap();
+		}
 	});
+	if (_externalShell) {
+		raw->setDialogHandler([=](Webview::DialogArgs args) {
+			const auto anchor = externalShellAnchor();
+			args.anchorGeometry = anchor.anchorGeometry;
+			args.transientParent = anchor.transientParent;
+			args.parent = nullptr;
+			setExternalShellBlocked(true);
+			const auto weak = base::make_weak(this);
+			const auto guard = gsl::finally([=] {
+				if (weak) {
+					weak->setExternalShellBlocked(false);
+				}
+			});
+			return Webview::DefaultDialogHandler(std::move(args));
+		});
+		raw->setAsyncDialogHandler([=](
+				Webview::DialogArgs args,
+				std::function<void(Webview::DialogResult)> done) {
+			const auto anchor = externalShellAnchor();
+			args.anchorGeometry = anchor.anchorGeometry;
+			args.transientParent = anchor.transientParent;
+			args.parent = nullptr;
+			setExternalShellBlocked(true);
+			const auto weak = base::make_weak(this);
+			Webview::DefaultDialogHandlerAsync(
+				std::move(args),
+				[=, done = std::move(done)](
+						Webview::DialogResult result) mutable {
+					if (weak) {
+						weak->setExternalShellBlocked(false);
+					}
+					done(std::move(result));
+				},
+				false);
+			return true;
+		});
+	}
 
-	raw->init(R"(
+	auto initScript = QByteArray(R"(
 window.TelegramWebviewProxy = {
 postEvent: function(eventType, eventData) {
 	if (window.external && window.external.invoke) {
@@ -795,13 +2501,16 @@ postEvent: function(eventType, eventData) {
 	}
 }
 };)");
+		raw->init(initScript);
 
 	if (!_webview) {
 		return false;
 	}
 
-	layoutButtons();
-	setupProgressGeometry();
+	if (!_externalShell) {
+		layoutButtons();
+		setupProgressGeometry();
+	}
 
 	base::qt_signal_producer(
 		qApp,
@@ -813,7 +2522,7 @@ postEvent: function(eventType, eventData) {
 			&& !widget->isHidden()
 			&& handle
 			&& (focused == handle);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_webview->window.focus();
 	}, _webview->lifetime);
 
@@ -821,14 +2530,63 @@ postEvent: function(eventType, eventData) {
 }
 
 void Panel::sendViewport() {
+	if (_externalShell) {
+		sendExternalShellMethod("sendViewport", {});
+		return;
+	}
 	postEvent("viewport_changed", "{ "
 		"height: window.innerHeight, "
 		"is_state_stable: true, "
 		"is_expanded: true }");
 }
 
+void Panel::sendFullScreen() {
+	postEvent("fullscreen_changed", QJsonObject{
+		{ u"is_fullscreen"_q, _fullscreen.current() },
+	});
+}
+
+void Panel::sendSafeArea() {
+	postEvent("safe_area_changed", QJsonObject{
+		{ u"top"_q, 0 },
+		{ u"right"_q, 0 },
+		{ u"bottom"_q, 0 },
+		{ u"left"_q, 0 },
+	});
+}
+
+void Panel::sendContentSafeArea() {
+	const auto shift = st::separatePanelClose.rippleAreaPosition.y();
+	const auto top = _fullscreen.current()
+		? (shift + st::fullScreenPanelClose.height + (shift / 2))
+		: 0;
+	const auto scaled = top * style::DevicePixelRatio();
+	auto report = 0;
+	if (const auto screen = QGuiApplication::primaryScreen()) {
+		const auto dpi = screen->logicalDotsPerInch();
+		const auto ratio = screen->devicePixelRatio();
+		const auto basePair = screen->handle()->logicalBaseDpi();
+		const auto base = (basePair.first + basePair.second) * 0.5;
+		const auto systemScreenScale = dpi * ratio / base;
+		report = int(base::SafeRound(scaled / systemScreenScale));
+	}
+	postEvent("content_safe_area_changed", QJsonObject{
+		{ u"top"_q, report },
+		{ u"right"_q, 0 },
+		{ u"bottom"_q, 0 },
+		{ u"left"_q, 0 },
+	});
+}
+
 void Panel::setTitle(rpl::producer<QString> title) {
-	_widget->setTitle(std::move(title));
+	if (!_externalShell) {
+		_widget->setTitle(std::move(title));
+		return;
+	}
+	std::move(title) | rpl::on_next([=](const QString &title) {
+		_externalTitle = title;
+		sendExternalShellMethod("setTitle", { { u"title"_q, title } });
+	}, _widget->lifetime());
 }
 
 void Panel::sendDataMessage(const QJsonObject &args) {
@@ -849,13 +2607,12 @@ void Panel::switchInlineQueryMessage(const QJsonObject &args) {
 	if (args.isEmpty()) {
 		_delegate->botClose();
 		return;
-	}
-	const auto query = args["query"].toString();
-	if (query.isEmpty()) {
-		LOG(("BotWebView Error: Bad 'query' in switchInlineQueryMessage."));
+	} else if (!args.contains("query")) {
+		LOG(("BotWebView Error: No 'query' in switchInlineQueryMessage."));
 		_delegate->botClose();
 		return;
 	}
+	const auto query = args["query"].toString();
 	const auto valid = base::flat_set<QString>{
 		u"users"_q,
 		u"bots"_q,
@@ -878,6 +2635,155 @@ void Panel::switchInlineQueryMessage(const QJsonObject &args) {
 	_delegate->botSwitchInlineQuery(types, query);
 }
 
+void Panel::processSendMessageRequest(const QJsonObject &args) {
+	if (args.isEmpty()) {
+		_delegate->botClose();
+		return;
+	}
+	const auto id = args["id"].toString();
+	auto callback = crl::guard(this, [=](QString error) {
+		if (error.isEmpty()) {
+			postEvent("prepared_message_sent");
+		} else {
+			postEvent("prepared_message_failed", QJsonObject{
+				{ u"error"_q, error },
+			});
+		}
+	});
+	_delegate->botSendPreparedMessage({
+		.id = id,
+		.callback = std::move(callback),
+	});
+}
+
+void Panel::processRequestChat(const QJsonObject &args) {
+	if (args.isEmpty()) {
+		_delegate->botClose();
+		return;
+	}
+	const auto requestId = args["req_id"].toString();
+	if (requestId.isEmpty()) {
+		return;
+	}
+	auto callback = crl::guard(this, [=](QString error) {
+		if (error.isEmpty()) {
+			postEvent("requested_chat_sent", QJsonObject{
+				{ u"req_id"_q, requestId },
+			});
+		} else {
+			postEvent("requested_chat_failed", QJsonObject{
+				{ u"req_id"_q, requestId },
+				{ u"error"_q, error },
+			});
+		}
+	});
+	_delegate->botRequestChat({
+		.requestId = requestId,
+		.callback = std::move(callback),
+	});
+}
+
+void Panel::processEmojiStatusRequest(const QJsonObject &args) {
+	if (args.isEmpty()) {
+		_delegate->botClose();
+		return;
+	}
+	const auto emojiId = args["custom_emoji_id"].toString().toULongLong();
+	const auto duration = TimeId(base::SafeRound(
+		args["duration"].toDouble()));
+	if (!emojiId) {
+		postEvent("emoji_status_failed", QJsonObject{
+			{ u"error"_q, u"SUGGESTED_EMOJI_INVALID"_q },
+		});
+		return;
+	} else if (duration < 0) {
+		postEvent("emoji_status_failed", QJsonObject{
+			{ u"error"_q, u"DURATION_INVALID"_q },
+		});
+		return;
+	}
+	auto callback = crl::guard(this, [=](QString error) {
+		if (error.isEmpty()) {
+			postEvent("emoji_status_set");
+		} else {
+			postEvent("emoji_status_failed", QJsonObject{
+				{ u"error"_q, error },
+			});
+		}
+	});
+	_delegate->botSetEmojiStatus({
+		.customEmojiId = emojiId,
+		.duration = duration,
+		.callback = std::move(callback),
+	});
+}
+
+void Panel::processEmojiStatusAccessRequest() {
+	auto callback = crl::guard(this, [=](bool allowed) {
+		postEvent("emoji_status_access_requested", QJsonObject{
+			{ u"status"_q, allowed ? u"allowed"_q : u"cancelled"_q },
+		});
+	});
+	_delegate->botRequestEmojiStatusAccess(std::move(callback));
+}
+
+void Panel::processStorageSaveKey(const QJsonObject &args) {
+	const auto keyObject = args["key"];
+	const auto valueObject = args["value"];
+	const auto key = keyObject.toString();
+	if (!keyObject.isString()) {
+		deviceStorageFailed(args, u"KEY_INVALID"_q);
+	} else if (valueObject.isNull()) {
+		_delegate->botStorageWrite(key, std::nullopt);
+		replyDeviceStorage(args, u"device_storage_key_saved"_q, {});
+	} else if (!valueObject.isString()) {
+		deviceStorageFailed(args, u"VALUE_INVALID"_q);
+	} else if (_delegate->botStorageWrite(key, valueObject.toString())) {
+		replyDeviceStorage(args, u"device_storage_key_saved"_q, {});
+	} else {
+		deviceStorageFailed(args, u"QUOTA_EXCEEDED"_q);
+	}
+}
+
+void Panel::processStorageGetKey(const QJsonObject &args) {
+	const auto keyObject = args["key"];
+	const auto key = keyObject.toString();
+	if (!keyObject.isString()) {
+		deviceStorageFailed(args, u"KEY_INVALID"_q);
+	} else {
+		const auto value = _delegate->botStorageRead(key);
+		replyDeviceStorage(args, u"device_storage_key_received"_q, {
+			{ u"value"_q, value ? QJsonValue(*value) : QJsonValue::Null },
+		});
+	}
+}
+
+void Panel::processStorageClear(const QJsonObject &args) {
+	_delegate->botStorageClear();
+	replyDeviceStorage(args, u"device_storage_cleared"_q, {});
+}
+
+void Panel::replyDeviceStorage(
+		const QJsonObject &args,
+		const QString &event,
+		QJsonObject response) {
+	response[u"req_id"_q] = args[u"req_id"_q];
+	postEvent(event, response);
+}
+
+void Panel::deviceStorageFailed(const QJsonObject &args, QString error) {
+	replyDeviceStorage(args, u"device_storage_failed"_q, {
+		{ u"error"_q, error },
+	});
+}
+
+void Panel::secureStorageFailed(const QJsonObject &args) {
+	postEvent(u"secure_storage_failed"_q, QJsonObject{
+		{ u"req_id"_q, args["req_id"] },
+		{ u"error"_q, u"UNSUPPORTED"_q },
+	});
+}
+
 void Panel::openTgLink(const QJsonObject &args) {
 	if (args.isEmpty()) {
 		LOG(("BotWebView Error: Bad arguments in 'web_app_open_tg_link'."));
@@ -967,45 +2873,44 @@ void Panel::openPopup(const QJsonObject &args) {
 		_delegate->botClose();
 		return;
 	}
-	const auto widget = _webview->window.widget();
 	const auto weak = base::make_weak(this);
-	const auto result = Webview::ShowBlockingPopup({
-		.parent = widget ? widget->window() : nullptr,
+	showPopup({
+		.parent = webviewWindowForPopup(),
 		.title = args["title"].toString(),
 		.text = message,
 		.buttons = std::move(buttons),
-	});
-	if (weak) {
+	}, [=](Webview::PopupResult result) {
+		if (!weak) {
+			return;
+		}
 		postEvent("popup_closed", result.id
 			? QJsonObject{ { u"button_id"_q, *result.id } }
 			: EventData());
-	}
+	});
 }
 
 void Panel::openScanQrPopup(const QJsonObject &args) {
-	const auto widget = _webview->window.widget();
-	[[maybe_unused]] const auto ok = Webview::ShowBlockingPopup({
-		.parent = widget ? widget->window() : nullptr,
+	showPopup({
+		.parent = webviewWindowForPopup(),
 		.text = tr::lng_bot_no_scan_qr(tr::now),
 		.buttons = { {
 			.id = "ok",
 			.text = tr::lng_box_ok(tr::now),
 			.type = Webview::PopupArgs::Button::Type::Ok,
 		}},
-	});
+	}, [](Webview::PopupResult) {});
 }
 
 void Panel::openShareStory(const QJsonObject &args) {
-	const auto widget = _webview->window.widget();
-	[[maybe_unused]] const auto ok = Webview::ShowBlockingPopup({
-		.parent = widget ? widget->window() : nullptr,
+	showPopup({
+		.parent = webviewWindowForPopup(),
 		.text = tr::lng_bot_no_share_story(tr::now),
 		.buttons = { {
 			.id = "ok",
 			.text = tr::lng_box_ok(tr::now),
 			.type = Webview::PopupArgs::Button::Type::Ok,
 		}},
-	});
+	}, [](Webview::PopupResult) {});
 }
 
 void Panel::requestWriteAccess() {
@@ -1027,10 +2932,13 @@ void Panel::requestWriteAccess() {
 			return;
 		}
 		using Button = Webview::PopupArgs::Button;
-		const auto widget = _webview->window.widget();
+		if (!_webview) {
+			_inBlockingRequest = false;
+			return;
+		}
 		const auto integration = &Ui::Integration::Instance();
-		const auto result = Webview::ShowBlockingPopup({
-			.parent = widget ? widget->window() : nullptr,
+		showPopup({
+			.parent = webviewWindowForPopup(),
 			.title = integration->phraseBotAllowWriteTitle(),
 			.text = integration->phraseBotAllowWrite(),
 			.buttons = {
@@ -1040,14 +2948,15 @@ void Panel::requestWriteAccess() {
 				},
 				{ .id = "cancel", .type = Button::Type::Cancel },
 			},
+		}, [=](Webview::PopupResult result) {
+			if (!weak) {
+				return;
+			} else if (result.id == "allow") {
+				_delegate->botAllowWriteAccess(crl::guard(this, finish));
+			} else {
+				finish(false);
+			}
 		});
-		if (!weak) {
-			return;
-		} else if (result.id == "allow") {
-			_delegate->botAllowWriteAccess(crl::guard(this, finish));
-		} else {
-			finish(false);
-		}
 	});
 }
 
@@ -1068,11 +2977,14 @@ void Panel::requestPhone() {
 		replyRequestPhone(shared);
 	};
 	using Button = Webview::PopupArgs::Button;
-	const auto widget = _webview->window.widget();
 	const auto weak = base::make_weak(this);
+	if (!_webview) {
+		_inBlockingRequest = false;
+		return;
+	}
 	const auto integration = &Ui::Integration::Instance();
-	const auto result = Webview::ShowBlockingPopup({
-		.parent = widget ? widget->window() : nullptr,
+	showPopup({
+		.parent = webviewWindowForPopup(),
 		.title = integration->phraseBotSharePhoneTitle(),
 		.text = integration->phraseBotSharePhone(),
 		.buttons = {
@@ -1082,14 +2994,15 @@ void Panel::requestPhone() {
 			},
 			{ .id = "cancel", .type = Button::Type::Cancel },
 		},
+	}, [=](Webview::PopupResult result) {
+		if (!weak) {
+			return;
+		} else if (result.id == "share") {
+			_delegate->botSharePhone(crl::guard(this, finish));
+		} else {
+			finish(false);
+		}
 	});
-	if (!weak) {
-		return;
-	} else if (result.id == "share") {
-		_delegate->botSharePhone(crl::guard(this, finish));
-	} else {
-		finish(false);
-	}
 }
 
 void Panel::replyRequestPhone(bool shared) {
@@ -1165,29 +3078,36 @@ bool Panel::allowClipboardQuery() const {
 	if (!_allowClipboardRead) {
 		return false;
 	}
-	//const auto now = crl::now();
-	//if (_mainButtonLastClick
-	//	&& _mainButtonLastClick + kProcessClickTimeout >= now) {
-	//	_mainButtonLastClick = 0;
-	//	return true;
-	//}
-	return true;
+	const auto now = crl::now();
+	return _lastWebviewInteraction
+		&& (_lastWebviewInteraction + kClipboardReadTimeout >= now);
 }
 
 void Panel::scheduleCloseWithConfirmation() {
 	if (!_closeWithConfirmationScheduled) {
 		_closeWithConfirmationScheduled = true;
-		InvokeQueued(_widget.get(), [=] { closeWithConfirmation(); });
+		const auto generation = _externalShellGeneration;
+		InvokeQueued(_widget.get(), [=] {
+			if (_externalShell && generation != _externalShellGeneration) {
+				_closeWithConfirmationScheduled = false;
+				return;
+			}
+			closeWithConfirmation();
+		});
 	}
 }
 
 void Panel::closeWithConfirmation() {
+	if (!_webview) {
+		_closeWithConfirmationScheduled = false;
+		_delegate->botClose();
+		return;
+	}
 	using Button = Webview::PopupArgs::Button;
-	const auto widget = _webview->window.widget();
 	const auto weak = base::make_weak(this);
 	const auto integration = &Ui::Integration::Instance();
-	const auto result = Webview::ShowBlockingPopup({
-		.parent = widget ? widget->window() : nullptr,
+	showPopup({
+		.parent = webviewWindowForPopup(),
 		.title = integration->phrasePanelCloseWarning(),
 		.text = integration->phrasePanelCloseUnsaved(),
 		.buttons = {
@@ -1199,14 +3119,15 @@ void Panel::closeWithConfirmation() {
 			{ .id = "cancel", .type = Button::Type::Cancel },
 		},
 		.ignoreFloodCheck = true,
+	}, [=](Webview::PopupResult result) {
+		if (!weak) {
+			return;
+		} else if (result.id == "close") {
+			_delegate->botClose();
+		} else {
+			_closeWithConfirmationScheduled = false;
+		}
 	});
-	if (!weak) {
-		return;
-	} else if (result.id == "close") {
-		_delegate->botClose();
-	} else {
-		_closeWithConfirmationScheduled = false;
-	}
 }
 
 void Panel::setupClosingBehaviour(const QJsonObject &args) {
@@ -1220,6 +3141,13 @@ void Panel::processButtonMessage(
 		_delegate->botClose();
 		return;
 	}
+	if (_externalShell) {
+		sendExternalShellButton(
+			(&button == &_mainButton) ? "main" : "secondary",
+			args);
+		sendViewport();
+		return;
+	}
 
 	const auto shown = [&] {
 		return button && !button->isHidden();
@@ -1234,7 +3162,10 @@ void Panel::processButtonMessage(
 	});
 
 	const auto text = args["text"].toString().trimmed();
-	const auto visible = args["is_visible"].toBool() && !text.isEmpty();
+	const auto iconCustomEmojiId
+		= args["icon_custom_emoji_id"].toString().toULongLong();
+	const auto visible = args["is_visible"].toBool()
+		&& (!text.isEmpty() || iconCustomEmojiId);
 	if (!button) {
 		if (visible) {
 			createButton(button);
@@ -1260,6 +3191,7 @@ void Panel::processButtonMessage(
 		.isActive = args["is_active"].toBool(),
 		.isVisible = visible,
 		.isProgressVisible = args["is_progress_visible"].toBool(),
+		.iconCustomEmojiId = iconCustomEmojiId,
 		.text = args["text"].toString(),
 	});
 	if (button.get() == _secondaryButton.get()) {
@@ -1272,60 +3204,172 @@ void Panel::processButtonMessage(
 }
 
 void Panel::processBackButtonMessage(const QJsonObject &args) {
+	if (_externalShell) {
+		_externalBackVisible = args["is_visible"].toBool();
+		sendExternalShellChrome();
+		return;
+	}
 	_widget->setBackAllowed(args["is_visible"].toBool());
 }
 
 void Panel::processSettingsButtonMessage(const QJsonObject &args) {
 	_hasSettingsButton = args["is_visible"].toBool();
+	if (_externalShell) {
+		sendExternalShellChrome();
+		sendExternalShellAssets();
+		sendExternalShellMenu();
+	}
 }
 
 void Panel::processHeaderColor(const QJsonObject &args) {
+	_headerColorReceived = true;
+	const auto apply = [&](std::optional<QColor> color) {
+		if (_externalShell) {
+			setExternalShellTitleColor(color);
+			sendExternalShellColors(_delegate->botThemeParams());
+		} else {
+			_widget->overrideTitleColor(color);
+		}
+	};
 	if (const auto color = ParseColor(args["color"].toString())) {
-		_widget->overrideTitleColor(color);
+		apply(*color);
 		_headerColorLifetime.destroy();
 	} else if (const auto color = LookupNamedColor(
 			args["color_key"].toString())) {
-		_widget->overrideTitleColor((*color)->c);
+		apply((*color)->c);
 		_headerColorLifetime = style::PaletteChanged(
-		) | rpl::start_with_next([=] {
-			_widget->overrideTitleColor((*color)->c);
+		) | rpl::on_next([=] {
+			apply((*color)->c);
 		});
 	} else {
-		_widget->overrideTitleColor(std::nullopt);
+		apply(std::nullopt);
 		_headerColorLifetime.destroy();
 	}
 }
 
-void Panel::processBottomBarColor(const QJsonObject &args) {
+void Panel::overrideBodyColor(std::optional<QColor> color) {
+	if (_externalShell) {
+		if (_bodyColorReceived) {
+			setExternalShellBodyColor(color);
+		}
+		sendExternalShellColors(_delegate->botThemeParams());
+		return;
+	}
+	_widget->overrideBodyColor(color);
+	const auto raw = _webviewBottomLabel.data();
+	if (!raw) {
+		return;
+	} else if (!color) {
+		raw->setTextColorOverride(std::nullopt);
+		return;
+	}
+	const auto contrast = 2.5;
+	const auto luminance = 0.2126 * color->redF()
+		+ 0.7152 * color->greenF()
+		+ 0.0722 * color->blueF();
+	const auto textColor = (luminance > 0.5)
+		? QColor(0, 0, 0)
+		: QColor(255, 255, 255);
+	const auto textLuminance = (luminance > 0.5) ? 0 : 1;
+	const auto adaptiveOpacity = (luminance - textLuminance + contrast)
+		/ contrast;
+	const auto opacity = std::clamp(adaptiveOpacity, 0.5, 0.64);
+	auto buttonColor = textColor;
+	buttonColor.setAlphaF(opacity);
+	raw->setTextColorOverride(buttonColor);
+}
+
+void Panel::processBackgroundColor(const QJsonObject &args) {
+	_bodyColorReceived = true;
 	if (const auto color = ParseColor(args["color"].toString())) {
-		_widget->overrideBottomBarColor(color);
+		overrideBodyColor(*color);
+		_bodyColorLifetime.destroy();
+	} else if (const auto color = LookupNamedColor(
+			args["color_key"].toString())) {
+		overrideBodyColor((*color)->c);
+		_bodyColorLifetime = style::PaletteChanged(
+		) | rpl::on_next([=] {
+			overrideBodyColor((*color)->c);
+		});
+	} else {
+		overrideBodyColor(std::nullopt);
+		_bodyColorLifetime.destroy();
+	}
+	if (const auto raw = _bottomButtonsBg.get()) {
+		raw->update();
+	}
+	if (const auto raw = _webviewBottom.get()) {
+		raw->update();
+	}
+}
+
+void Panel::processBottomBarColor(const QJsonObject &args) {
+	_bottomColorReceived = true;
+	const auto apply = [&](std::optional<QColor> color) {
 		_bottomBarColor = color;
+		if (_externalShell) {
+			setExternalShellBottomColor(color);
+			sendExternalShellColors(_delegate->botThemeParams());
+		} else {
+			_widget->overrideBottomBarColor(color);
+		}
+	};
+	if (const auto color = ParseColor(args["color"].toString())) {
+		apply(*color);
 		_bottomBarColorLifetime.destroy();
 	} else if (const auto color = LookupNamedColor(
 			args["color_key"].toString())) {
-		_widget->overrideBottomBarColor((*color)->c);
-		_bottomBarColor = (*color)->c;
-		_headerColorLifetime = style::PaletteChanged(
-		) | rpl::start_with_next([=] {
-			_widget->overrideBottomBarColor((*color)->c);
-			_bottomBarColor = (*color)->c;
+		apply((*color)->c);
+		_bottomBarColorLifetime = style::PaletteChanged(
+		) | rpl::on_next([=] {
+			apply((*color)->c);
 		});
 	} else {
-		_widget->overrideBottomBarColor(std::nullopt);
-		_bottomBarColor = std::nullopt;
-		_headerColorLifetime.destroy();
+		apply(std::nullopt);
+		_bottomBarColorLifetime.destroy();
+	}
+	if (_externalShell) {
+		return;
 	}
 	if (const auto raw = _bottomButtonsBg.get()) {
 		raw->update();
 	}
 }
 
+void Panel::processDownloadRequest(const QJsonObject &args) {
+	if (args.isEmpty()) {
+		_delegate->botClose();
+		return;
+	}
+	const auto url = args["url"].toString();
+	const auto name = args["file_name"].toString();
+	if (url.isEmpty()) {
+		LOG(("BotWebView Error: Bad 'url' in download request."));
+		_delegate->botClose();
+		return;
+	} else if (name.isEmpty()) {
+		LOG(("BotWebView Error: Bad 'file_name' in download request."));
+		_delegate->botClose();
+		return;
+	}
+	const auto done = crl::guard(this, [=](bool started) {
+		postEvent("file_download_requested", QJsonObject{
+			{ u"status"_q, started ? u"downloading"_q : u"cancelled"_q },
+		});
+	});
+	_delegate->botDownloadFile({
+		.url = url,
+		.name = name,
+		.callback = done,
+	});
+}
+
 void Panel::createButton(std::unique_ptr<Button> &button) {
 	if (!_bottomButtonsBg) {
 		_bottomButtonsBg = std::make_unique<RpWidget>(_widget.get());
 
 		const auto raw = _bottomButtonsBg.get();
-		raw->paintRequest() | rpl::start_with_next([=] {
+		raw->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(raw);
 			auto hq = PainterHighQualityEnabler(p);
 			p.setPen(Qt::NoPen);
@@ -1338,7 +3382,8 @@ void Panel::createButton(std::unique_ptr<Button> &button) {
 	}
 	button = std::make_unique<Button>(
 		_bottomButtonsBg.get(),
-		st::botWebViewBottomButton);
+		st::botWebViewBottomButton,
+		_delegate->botTextContext());
 	const auto raw = button.get();
 
 	raw->setClickedCallback([=] {
@@ -1355,20 +3400,25 @@ void Panel::createButton(std::unique_ptr<Button> &button) {
 	rpl::combine(
 		raw->shownValue(),
 		raw->heightValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		layoutButtons();
 	}, raw->lifetime());
 }
 
 void Panel::layoutButtons() {
+	if (!_webviewBottom) {
+		return;
+	}
 	const auto inner = _widget->innerGeometry();
 	const auto shown = [](std::unique_ptr<Button> &button) {
 		return button && !button->isHidden();
 	};
 	const auto any = shown(_mainButton) || shown(_secondaryButton);
-	_webviewBottom->setVisible(!any);
+	_webviewBottom->setVisible(!any
+		&& !_fullscreen.current()
+		&& !_layerShown);
 	if (any) {
-		_bottomButtonsBg->show();
+		_bottomButtonsBg->setVisible(!_layerShown);
 
 		const auto one = shown(_mainButton)
 			? _mainButton.get()
@@ -1434,9 +3484,15 @@ void Panel::layoutButtons() {
 	} else if (_bottomButtonsBg) {
 		_bottomButtonsBg->hide();
 	}
-	_footerHeight = any
+	const auto footer = _layerShown
+		? 0
+		: any
 		? _bottomButtonsBg->height()
+		: _fullscreen.current()
+		? 0
 		: _webviewBottom->height();
+	_widget->setBottomBarHeight((!_layerShown && any) ? footer : 0);
+	_footerHeight = footer;
 }
 
 void Panel::showBox(object_ptr<BoxContent> box) {
@@ -1447,26 +3503,44 @@ void Panel::showBox(
 		object_ptr<BoxContent> box,
 		LayerOptions options,
 		anim::type animated) {
+	if (_externalShell) {
+		const auto anchor = externalShellAnchor();
+		_externalLayer->setAnchor(
+			anchor.anchorGeometry,
+			anchor.outerSize,
+			anchor.transientParent);
+		_externalLayer->showBox(std::move(box), options, animated);
+		return;
+	}
 	if (const auto widget = _webview ? _webview->window.widget() : nullptr) {
+		_layerShown = true;
 		const auto hideNow = !widget->isHidden();
-		if (hideNow || _webview->lastHidingBox) {
-			const auto raw = _webview->lastHidingBox = box.data();
-			box->boxClosing(
-			) | rpl::start_with_next([=] {
+		const auto raw = box.data();
+		_webview->boxes.push_back(raw);
+		raw->boxClosing(
+		) | rpl::filter([=] {
+			return _webview != nullptr;
+		}) | rpl::on_next([=] {
+			auto &list = _webview->boxes;
+			list.erase(ranges::remove_if(list, [&](QPointer<RpWidget> b) {
+				return !b || (b == raw);
+			}), end(list));
+			if (list.empty()) {
+				_webview->boxesLifetime.destroy();
+				_layerShown = false;
 				const auto widget = _webview
 					? _webview->window.widget()
 					: nullptr;
-				if (widget
-					&& widget->isHidden()
-					&& _webview->lastHidingBox == raw) {
+				if (widget && widget->isHidden()) {
 					widget->show();
-					_webviewBottom->show();
+					layoutButtons();
 				}
-			}, _webview->lifetime);
-			if (hideNow) {
-				widget->hide();
-				_webviewBottom->hide();
 			}
+		}, _webview->boxesLifetime);
+
+		if (hideNow) {
+			widget->hide();
+			layoutButtons();
 		}
 	}
 	const auto raw = box.data();
@@ -1505,16 +3579,23 @@ not_null<QWidget*> Panel::toastParent() const {
 }
 
 void Panel::hideLayer(anim::type animated) {
+	if (_externalShell && _externalLayer) {
+		_externalLayer->hideLayers(animated);
+		return;
+	}
 	_widget->hideLayer(animated);
 }
 
 void Panel::showCriticalError(const TextWithEntities &text) {
 	_progress = nullptr;
 	_webviewProgress = false;
-	auto error = base::make_unique_q<PaddingWrap<FlatLabel>>(
-		_widget.get(),
+	auto wrap = base::make_unique_q<RpWidget>(_widget.get());
+	const auto raw = wrap.get();
+
+	const auto error = CreateChild<PaddingWrap<FlatLabel>>(
+		raw,
 		object_ptr<FlatLabel>(
-			_widget.get(),
+			raw,
 			rpl::single(text),
 			st::paymentsCriticalError),
 		st::paymentsCriticalErrorPadding);
@@ -1528,15 +3609,34 @@ void Panel::showCriticalError(const TextWithEntities &text) {
 		File::OpenUrl(entity.data);
 		return false;
 	});
-	_widget->showInner(std::move(error));
+
+	raw->widthValue() | rpl::on_next([=](int width) {
+		error->resizeToWidth(width);
+		raw->resize(width, error->height());
+	}, raw->lifetime());
+
+	_widget->showInner(std::move(wrap));
 }
 
 void Panel::updateThemeParams(const Webview::ThemeParams &params) {
+	updateColorOverrides(params);
 	if (!_webview || !_webview->window.widget()) {
 		return;
 	}
+	if (_externalShell) {
+		_webview->window.updateTheme(
+			params.bodyBg,
+			params.scrollBg,
+			params.scrollBgOver,
+			params.scrollBarBg,
+			params.scrollBarBgOver);
+		sendExternalShellColors(params);
+		sendExternalShellAssets();
+		postEvent("theme_changed", ThemeChangedPayload(params));
+		return;
+	}
 	_webview->window.updateTheme(
-		params.opaqueBg,
+		params.bodyBg,
 		params.scrollBg,
 		params.scrollBgOver,
 		params.scrollBarBg,
@@ -1544,6 +3644,19 @@ void Panel::updateThemeParams(const Webview::ThemeParams &params) {
 	postEvent("theme_changed", "{\"theme_params\": " + params.json + "}");
 }
 
+void Panel::updateColorOverrides(const Webview::ThemeParams &params) {
+	if (!_headerColorReceived && params.titleBg.alpha() == 255) {
+		if (_externalShell) {
+			sendExternalShellColors(params);
+		} else {
+			_widget->overrideTitleColor(params.titleBg);
+		}
+	}
+	if (!_bodyColorReceived && params.bodyBg.alpha() == 255) {
+		overrideBodyColor(params.bodyBg);
+	}
+}
+
 void Panel::invoiceClosed(const QString &slug, const QString &status) {
 	if (!_webview || !_webview->window.widget()) {
 		return;
@@ -1554,13 +3667,21 @@ void Panel::invoiceClosed(const QString &slug, const QString &status) {
 	});
 	if (_hiddenForPayment) {
 		_hiddenForPayment = false;
-		_widget->showAndActivate();
+		if (_externalShell) {
+			setExternalShellBlocked(false);
+		} else {
+			_widget->showAndActivate();
+		}
 	}
 }
 
 void Panel::hideForPayment() {
 	_hiddenForPayment = true;
-	_widget->hideGetDuration();
+	if (_externalShell) {
+		setExternalShellBlocked(true);
+	} else {
+		_widget->hideGetDuration();
+	}
 }
 
 void Panel::postEvent(const QString &event) {
@@ -1573,13 +3694,27 @@ void Panel::postEvent(const QString &event, EventData data) {
 			).arg(event));
 		return;
 	}
+	if (_externalShell) {
+		if (v::is<QJsonObject>(data)) {
+			sendExternalShellEvent(event, v::get<QJsonObject>(data));
+		} else if (v::get<QString>(data).isEmpty()) {
+			sendExternalShellEvent(event, {});
+		} else {
+			LOG(("BotWebView Error: Drop raw external event \"%1\"."
+				).arg(event));
+		}
+		return;
+	}
+	if (_sameOrigin && !OriginsMatch(_currentOrigin, _initialOrigin)) {
+		return;
+	}
 	auto written = v::is<QString>(data)
 		? v::get<QString>(data).toUtf8()
 		: QJsonDocument(
 			v::get<QJsonObject>(data)).toJson(QJsonDocument::Compact);
 	_webview->window.eval(R"(
 if (window.TelegramGameProxy) {
-	window.TelegramGameProxy.receiveEvent(
+window.TelegramGameProxy.receiveEvent(
 		")"
 		+ event.toUtf8()
 		+ '"' + (written.isEmpty() ? QByteArray() : ", " + written)
@@ -1600,7 +3735,7 @@ TextWithEntities ErrorText(const Webview::Available &info) {
 			Text::Link(
 				"Microsoft Edge WebView2 Runtime",
 				"https://go.microsoft.com/fwlink/p/?LinkId=2124703"),
-			Ui::Text::WithEntities);
+			tr::marked);
 	case Error::NoWebKitGTK:
 		return { tr::lng_payments_webview_install_webkit(tr::now) };
 	case Error::OldWindows:
@@ -1613,9 +3748,7 @@ TextWithEntities ErrorText(const Webview::Available &info) {
 void Panel::showWebviewError(
 		const QString &text,
 		const Webview::Available &information) {
-	showCriticalError(TextWithEntities{ text }.append(
-		"\n\n"
-	).append(ErrorText(information)));
+	showCriticalError(WebviewErrorText(text, information));
 }
 
 rpl::lifetime &Panel::lifetime() {
@@ -1623,26 +3756,7 @@ rpl::lifetime &Panel::lifetime() {
 }
 
 std::unique_ptr<Panel> Show(Args &&args) {
-	auto result = std::make_unique<Panel>(
-		args.storageId,
-		std::move(args.title),
-		std::move(args.titleBadge),
-		args.delegate,
-		args.menuButtons,
-		args.allowClipboardRead);
-	const auto params = args.delegate->botThemeParams();
-	if (!result->showWebview(args.url, params, std::move(args.bottom))) {
-		const auto available = Webview::Availability();
-		if (available.error != Webview::Available::Error::None) {
-			result->showWebviewError(
-				tr::lng_bot_no_webview(tr::now),
-				available);
-		} else {
-			result->showCriticalError({
-				"Error: Could not initialize WebView." });
-		}
-	}
-	return result;
+	return std::make_unique<Panel>(std::move(args));
 }
 
 } // namespace Ui::BotWebView
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index f03dcdc3456965..9a216947dd92a3 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -11,27 +11,48 @@ For license and copyright information please follow this link:
 #include "base/object_ptr.h"
 #include "base/weak_ptr.h"
 #include "base/flags.h"
+#include "ui/platform/ui_platform_utility.h"
 #include "ui/rect_part.h"
-#include "ui/round_rect.h"
+#include "ui/widgets/separate_panel.h"
 #include "webview/webview_common.h"
+#include <crl/crl_time.h>
+#include <QtCore/QRect>
+#include <QtCore/QSize>
+#include <QtGui/QColor>
+#include <QtGui/QImage>
 
 class QJsonObject;
 class QJsonValue;
 
 namespace Ui {
+class FlatLabel;
 class BoxContent;
 class RpWidget;
-class SeparatePanel;
+class StandaloneLayerStack;
 enum class LayerOption;
 using LayerOptions = base::flags<LayerOption>;
 } // namespace Ui
 
 namespace Webview {
 struct Available;
+struct PopupArgs;
+struct PopupResult;
 } // namespace Webview
 
+namespace Ui::Text {
+struct MarkedContext;
+} // namespace Ui::Text
+
+namespace Ui::BotWebView::LinuxShell {
+struct ResolvedColors;
+} // namespace Ui::BotWebView::LinuxShell
+
 namespace Ui::BotWebView {
 
+struct DownloadsProgress;
+struct DownloadsEntry;
+enum class DownloadsAction;
+
 [[nodiscard]] TextWithEntities ErrorText(const Webview::Available &info);
 
 enum class MenuButton {
@@ -51,9 +72,42 @@ struct CustomMethodRequest {
 	Fn<void(CustomMethodResult)> callback;
 };
 
+struct SetEmojiStatusRequest {
+	uint64 customEmojiId = 0;
+	TimeId duration = 0;
+	Fn<void(QString)> callback;
+};
+
+struct DownloadFileRequest {
+	QString url;
+	QString name;
+	Fn<void(bool)> callback;
+};
+
+struct ResolveButtonEmojiRequest {
+	uint64 customEmojiId = 0;
+	QColor textColor;
+	int size = 0;
+	Fn<void(QImage)> callback;
+};
+
+struct SendPreparedMessageRequest {
+	QString id = 0;
+	Fn<void(QString)> callback;
+};
+
+struct RequestChatRequest {
+	QString requestId;
+	Fn<void(QString)> callback;
+};
+
 class Delegate {
 public:
-	virtual Webview::ThemeParams botThemeParams() = 0;
+	[[nodiscard]] virtual Webview::ThemeParams botThemeParams() = 0;
+	[[nodiscard]] virtual Ui::Text::MarkedContext botTextContext() = 0;
+	[[nodiscard]] virtual auto botDownloads(bool forceCheck = false)
+		-> const std::vector<DownloadsEntry> & = 0;
+	virtual void botDownloadsAction(uint32 id, DownloadsAction type) = 0;
 	virtual bool botHandleLocalUri(QString uri, bool keepOpen) = 0;
 	virtual void botHandleInvoice(QString slug) = 0;
 	virtual void botHandleMenuButton(MenuButton button) = 0;
@@ -65,31 +119,49 @@ class Delegate {
 		QString query) = 0;
 	virtual void botCheckWriteAccess(Fn<void(bool allowed)> callback) = 0;
 	virtual void botAllowWriteAccess(Fn<void(bool allowed)> callback) = 0;
+	virtual bool botStorageWrite(
+		QString key,
+		std::optional<QString> value) = 0;
+	[[nodiscard]] virtual std::optional<QString> botStorageRead(
+		QString key) = 0;
+	virtual void botStorageClear() = 0;
+	virtual void botRequestEmojiStatusAccess(
+		Fn<void(bool allowed)> callback) = 0;
 	virtual void botSharePhone(Fn<void(bool shared)> callback) = 0;
 	virtual void botInvokeCustomMethod(CustomMethodRequest request) = 0;
+	virtual void botSetEmojiStatus(SetEmojiStatusRequest request) = 0;
+	virtual void botDownloadFile(DownloadFileRequest request) = 0;
+	virtual void botResolveButtonEmoji(ResolveButtonEmojiRequest request) = 0;
+	virtual void botSendPreparedMessage(
+		SendPreparedMessageRequest request) = 0;
+	virtual void botRequestChat(RequestChatRequest request) = 0;
+	virtual void botVerifyAge(int age) = 0;
 	virtual void botOpenPrivacyPolicy() = 0;
 	virtual void botClose() = 0;
 };
 
+struct Args {
+	QString url;
+	Webview::StorageId storageId;
+	rpl::producer<QString> title;
+	Ui::TitleBadgeDescriptor titleBadge;
+	rpl::producer<QString> bottom;
+	not_null<Delegate*> delegate;
+	MenuButtons menuButtons;
+	bool fullscreen = false;
+	bool sameOrigin = false;
+	bool allowClipboardRead = false;
+	rpl::producer<DownloadsProgress> downloadsProgress;
+};
+
 class Panel final : public base::has_weak_ptr {
 public:
-	Panel(
-		const Webview::StorageId &storageId,
-		rpl::producer<QString> title,
-		object_ptr<Ui::RpWidget> titleBadge,
-		not_null<Delegate*> delegate,
-		MenuButtons menuButtons,
-		bool allowClipboardRead);
+	explicit Panel(Args &&args);
 	~Panel();
 
 	void requestActivate();
 	void toggleProgress(bool shown);
 
-	bool showWebview(
-		const QString &url,
-		const Webview::ThemeParams &params,
-		rpl::producer<QString> bottomText);
-
 	void showBox(object_ptr<BoxContent> box);
 	void showBox(
 		object_ptr<BoxContent> box,
@@ -111,24 +183,99 @@ class Panel final : public base::has_weak_ptr {
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
+	struct ButtonArgs {
+		bool isActive = false;
+		bool isVisible = false;
+		bool isProgressVisible = false;
+		uint64 iconCustomEmojiId = 0;
+		QString text;
+	};
+	struct ExternalButtonState {
+		ButtonArgs args;
+		QColor color;
+		QColor textColor;
+		QString position;
+		uint64 iconGeneration = 0;
+	};
+	struct ExternalShellColorState {
+		bool titleUsesTheme = true;
+		bool bodyUsesTheme = true;
+		bool bottomUsesTheme = true;
+		std::optional<QColor> title;
+		std::optional<QColor> body;
+		std::optional<QColor> bottom;
+	};
+	struct ExternalShellAnchor {
+		std::optional<QRect> anchorGeometry;
+		std::optional<QSize> outerSize;
+		Platform::ForeignParent transientParent;
+	};
 	class Button;
 	struct Progress;
 	struct WebviewWithLifetime;
 
+	bool showWebview(Args &&args, const Webview::ThemeParams &params);
+	void invalidateExternalShellSession();
+	void showExternalShellError(TextWithEntities text);
+
 	bool createWebview(const Webview::ThemeParams &params);
+	void resetExternalShellIdentity();
+	[[nodiscard]] QWidget *webviewWindowForPopup() const;
+	void installExternalShellDocument();
+	void sendExternalShellBootstrap();
+	void sendExternalShellMethod(
+		const QByteArray &method,
+		const QJsonObject &data);
+	void sendExternalShellEvent(
+		const QString &event,
+		const QJsonObject &data);
+	void sendExternalShellButton(
+		const char *name,
+		const QJsonObject &args);
+	void sendExternalShellMenu();
+	void sendExternalShellAssets();
+	void handleExternalShellMenuAction(const QString &id);
+	void requestExternalShellButtonEmoji(const QString &name);
+	void applyExternalShellFullscreen(bool fullscreen);
+	void sendExternalShellChrome();
+	void setExternalShellBlocked(bool blocked);
+	void closeExternalShellLayer();
+	[[nodiscard]] ExternalShellAnchor externalShellAnchor() const;
+	void showPopup(
+		Webview::PopupArgs &&args,
+		Fn<void(Webview::PopupResult)> done);
 	void createWebviewBottom();
 	void showWebviewProgress();
 	void hideWebviewProgress();
+	void setupDownloadsProgress(
+		not_null<RpWidget*> button,
+		rpl::producer<DownloadsProgress> progress,
+		bool fullscreen);
 	void setTitle(rpl::producer<QString> title);
 	void sendDataMessage(const QJsonObject &args);
 	void switchInlineQueryMessage(const QJsonObject &args);
+	void processSendMessageRequest(const QJsonObject &args);
+	void processRequestChat(const QJsonObject &args);
+	void processEmojiStatusRequest(const QJsonObject &args);
+	void processEmojiStatusAccessRequest();
+	void processStorageSaveKey(const QJsonObject &args);
+	void processStorageGetKey(const QJsonObject &args);
+	void processStorageClear(const QJsonObject &args);
 	void processButtonMessage(
 		std::unique_ptr<Button> &button,
 		const QJsonObject &args);
 	void processBackButtonMessage(const QJsonObject &args);
 	void processSettingsButtonMessage(const QJsonObject &args);
 	void processHeaderColor(const QJsonObject &args);
+	void processBackgroundColor(const QJsonObject &args);
 	void processBottomBarColor(const QJsonObject &args);
+	void setExternalShellTitleColor(std::optional<QColor> color);
+	void setExternalShellBodyColor(std::optional<QColor> color);
+	void setExternalShellBottomColor(std::optional<QColor> color);
+	[[nodiscard]] LinuxShell::ResolvedColors externalShellColors(
+		const Webview::ThemeParams &params) const;
+	void sendExternalShellColors(const Webview::ThemeParams &params);
+	void processDownloadRequest(const QJsonObject &args);
 	void openTgLink(const QJsonObject &args);
 	void openExternalLink(const QJsonObject &args);
 	void openInvoice(const QJsonObject &args);
@@ -143,10 +290,22 @@ class Panel final : public base::has_weak_ptr {
 	void replyCustomMethod(QJsonValue requestId, QJsonObject response);
 	void requestClipboardText(const QJsonObject &args);
 	void setupClosingBehaviour(const QJsonObject &args);
+	void replyDeviceStorage(
+		const QJsonObject &args,
+		const QString &event,
+		QJsonObject response);
+	void deviceStorageFailed(const QJsonObject &args, QString error);
+	void secureStorageFailed(const QJsonObject &args);
 	void createButton(std::unique_ptr<Button> &button);
 	void scheduleCloseWithConfirmation();
 	void closeWithConfirmation();
 	void sendViewport();
+	void sendSafeArea();
+	void sendContentSafeArea();
+	void sendFullScreen();
+
+	void updateColorOverrides(const Webview::ThemeParams &params);
+	void overrideBodyColor(std::optional<QColor> color);
 
 	using EventData = std::variant<QString, QJsonObject>;
 	void postEvent(const QString &event);
@@ -161,12 +320,31 @@ class Panel final : public base::has_weak_ptr {
 
 	Webview::StorageId _storageId;
 	const not_null<Delegate*> _delegate;
+	QString _externalUrl;
+	QString _externalTitle;
+	int _externalBlockCount = 0;
 	bool _closeNeedConfirmation = false;
 	bool _hasSettingsButton = false;
+	bool _externalTitleBadgeVisible = false;
+	bool _externalShell = false;
+	bool _externalShellBootstrapped = false;
+	bool _externalWindowCloseRequested = false;
+	QString _externalShellToken;
+	QString _initialOrigin;
+	QString _currentOrigin;
+	uint64 _externalShellGeneration = 0;
+	bool _externalBackVisible = false;
+	ExternalShellColorState _externalShellColorState;
 	MenuButtons _menuButtons = {};
+	ExternalButtonState _externalMainButton;
+	ExternalButtonState _externalSecondaryButton;
+	std::unique_ptr<RpWidget> _externalPanelParent;
 	std::unique_ptr<SeparatePanel> _widget;
 	std::unique_ptr<WebviewWithLifetime> _webview;
+	std::unique_ptr<StandaloneLayerStack> _externalLayer;
+	std::unique_ptr<RpWidget> _externalWebviewParent;
 	std::unique_ptr<RpWidget> _webviewBottom;
+	QPointer<FlatLabel> _webviewBottomLabel;
 	rpl::variable<QString> _bottomText;
 	QPointer<RpWidget> _webviewParent;
 	std::unique_ptr<RpWidget> _bottomButtonsBg;
@@ -178,26 +356,25 @@ class Panel final : public base::has_weak_ptr {
 	rpl::event_stream<> _themeUpdateForced;
 	std::optional<QColor> _bottomBarColor;
 	rpl::lifetime _headerColorLifetime;
+	rpl::lifetime _bodyColorLifetime;
 	rpl::lifetime _bottomBarColorLifetime;
-	bool _webviewProgress = false;
-	bool _themeUpdateScheduled = false;
-	bool _hiddenForPayment = false;
-	bool _closeWithConfirmationScheduled = false;
-	bool _allowClipboardRead = false;
-	bool _inBlockingRequest = false;
+	rpl::event_stream<> _downloadsUpdated;
+	rpl::variable<bool> _fullscreen = false;
+	crl::time _lastWebviewInteraction = 0;
+	bool _layerShown : 1 = false;
+	bool _webviewProgress : 1 = false;
+	bool _themeUpdateScheduled : 1 = false;
+	bool _hiddenForPayment : 1 = false;
+	bool _closeWithConfirmationScheduled : 1 = false;
+	bool _allowClipboardRead : 1 = false;
+	bool _sameOrigin : 1 = false;
+	bool _inBlockingRequest : 1 = false;
+	bool _headerColorReceived : 1 = false;
+	bool _bodyColorReceived : 1 = false;
+	bool _bottomColorReceived : 1 = false;
 
 };
 
-struct Args {
-	QString url;
-	Webview::StorageId storageId;
-	rpl::producer<QString> title;
-	object_ptr<Ui::RpWidget> titleBadge = { nullptr };
-	rpl::producer<QString> bottom;
-	not_null<Delegate*> delegate;
-	MenuButtons menuButtons;
-	bool allowClipboardRead = false;
-};
 [[nodiscard]] std::unique_ptr<Panel> Show(Args &&args);
 
 } // namespace Ui::BotWebView
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview_linux_shell.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview_linux_shell.cpp
new file mode 100644
index 00000000000000..1a5813a27fc3c3
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview_linux_shell.cpp
@@ -0,0 +1,224 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/attach/attach_bot_webview_linux_shell.h"
+
+#include "ui/style/style_core_palette.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_payments.h"
+
+#include <QtCore/QFile>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
+
+namespace Ui::BotWebView::LinuxShell {
+namespace {
+
+[[nodiscard]] QByteArray JsonValue(QJsonValue value) {
+	auto array = QJsonArray();
+	array.push_back(std::move(value));
+	auto result = QJsonDocument(array).toJson(QJsonDocument::Compact);
+	return result.mid(1, result.size() - 2);
+}
+
+[[nodiscard]] QByteArray JsonObject(QJsonObject object) {
+	return QJsonDocument(std::move(object)).toJson(QJsonDocument::Compact);
+}
+
+[[nodiscard]] QJsonValue ColorValue(QColor color) {
+	return color.isValid()
+		? QJsonValue(color.name(QColor::HexRgb))
+		: QJsonValue();
+}
+
+[[nodiscard]] QByteArray ReadResource(const QString &name) {
+	auto file = QFile(name);
+	return file.open(QIODevice::ReadOnly) ? file.readAll() : QByteArray();
+}
+
+[[nodiscard]] const QByteArray &PageCss() {
+	static const auto result = ReadResource(u":/bot_webview_shell/page.css"_q);
+	return result;
+}
+
+[[nodiscard]] const QByteArray &PageJs() {
+	static const auto result = ReadResource(u":/bot_webview_shell/page.js"_q);
+	return result;
+}
+
+[[nodiscard]] const QByteArray &BodyHtml() {
+	static const auto result = ReadResource(u":/bot_webview_shell/body.html"_q);
+	return result;
+}
+
+} // namespace
+
+QByteArray InstallScript(const QString &shellToken) {
+	const auto css = QString::fromUtf8(PageCss());
+	const auto body = QString::fromUtf8(BodyHtml());
+	auto pageJs = PageJs();
+	pageJs.replace(
+		QByteArray("TDESKTOP_SHELL_TOKEN_PLACEHOLDER"),
+		JsonValue(shellToken));
+
+	auto script = QByteArray();
+	script += "if (window === window.top"
+		" && !window.TelegramDesktopShell"
+		" && !window.TelegramDesktopShellInstalling) {"
+		"window.TelegramDesktopShellInstalling = true;"
+		"try {"
+		"if (!document.head) {"
+		"document.documentElement.insertBefore("
+		"document.createElement('head'),"
+		"document.documentElement.firstChild);"
+		"}"
+		"if (!document.body) {"
+		"document.documentElement.appendChild("
+		"document.createElement('body'));"
+		"}"
+		"document.title = 'Telegram';"
+		"const metaRobots = document.createElement('meta');"
+		"metaRobots.name = 'robots';"
+		"metaRobots.content = 'noindex, nofollow';"
+		"document.head.appendChild(metaRobots);"
+		"const metaViewport = document.createElement('meta');"
+		"metaViewport.name = 'viewport';"
+		"metaViewport.content = 'width=device-width, initial-scale=1.0';"
+		"document.head.appendChild(metaViewport);"
+		"const style = document.createElement('style');"
+		"style.textContent = ";
+	script += JsonValue(css);
+	script += ";"
+		"document.head.appendChild(style);"
+		"document.body.insertAdjacentHTML('beforeend', ";
+	script += JsonValue(body);
+	script += ");";
+	script += pageJs;
+	script += "} finally {"
+		"window.TelegramDesktopShellInstalling = false;"
+		"}"
+		"}";
+	return script;
+}
+
+QByteArray MethodCallScript(
+		const QByteArray &method,
+		const QJsonObject &data,
+		const QString &shellToken) {
+	const auto payload = JsonObject(data);
+	const auto token = JsonValue(shellToken);
+	auto script = QByteArray();
+	script.reserve(method.size() * 2 + payload.size() + token.size() + 98);
+	script += "if (window.TelegramDesktopShell"
+		" && window.TelegramDesktopShell.";
+	script += method;
+	script += ") { window.TelegramDesktopShell.";
+	script += method;
+	script += "(";
+	script += payload;
+	script += ", ";
+	script += token;
+	script += "); }";
+	return script;
+}
+
+QByteArray EventScript(
+		const QString &event,
+		const QJsonObject &data,
+		const QString &shellToken) {
+	const auto eventValue = JsonValue(event);
+	const auto payload = JsonObject(data);
+	const auto token = JsonValue(shellToken);
+	auto script = QByteArray();
+	script += "if (window.TelegramDesktopShell) {"
+		"window.TelegramDesktopShell.nativeEvent(";
+	script += eventValue;
+	script += ", ";
+	script += payload;
+	script += ", ";
+	script += token;
+	script += "); }";
+	return script;
+}
+
+QJsonObject Metrics() {
+	const auto &shellPadding = st::botWebViewShellPadding;
+	const auto &shadowPadding = st::botWebViewShellShadowPadding;
+	const auto &titlePadding = st::botWebViewShellTitlePadding;
+	const auto &menuButtonSize = st::botWebViewShellMenuButtonSize;
+	const auto fullscreenButtonSize = QSize(
+		st::fullScreenPanelClose.width,
+		st::fullScreenPanelClose.height);
+	const auto fullscreenControlShift
+		= st::separatePanelClose.rippleAreaPosition;
+	return {
+		{ u"shellRadius"_q, st::botWebViewShellRadius },
+		{ u"shellPaddingTop"_q, shellPadding.top() },
+		{ u"shellPaddingRight"_q, shellPadding.right() },
+		{ u"shellPaddingBottom"_q, shellPadding.bottom() },
+		{ u"shellPaddingLeft"_q, shellPadding.left() },
+		{ u"shadowPaddingTop"_q, shadowPadding.top() },
+		{ u"shadowPaddingRight"_q, shadowPadding.right() },
+		{ u"shadowPaddingBottom"_q, shadowPadding.bottom() },
+		{ u"shadowPaddingLeft"_q, shadowPadding.left() },
+		{ u"headerHeight"_q, st::botWebViewShellHeaderHeight },
+		{ u"titlePaddingTop"_q, titlePadding.top() },
+		{ u"titlePaddingRight"_q, titlePadding.right() },
+		{ u"titlePaddingBottom"_q, titlePadding.bottom() },
+		{ u"titlePaddingLeft"_q, titlePadding.left() },
+		{ u"badgeSkip"_q, st::botWebViewShellBadgeSkip },
+		{ u"frameRadius"_q, st::botWebViewShellFrameRadius },
+		{ u"controlWidth"_q, menuButtonSize.width() },
+		{ u"controlHeight"_q, menuButtonSize.height() },
+		{ u"buttonHeight"_q, st::botWebViewBottomButton.height },
+		{ u"buttonGapX"_q, st::botWebViewBottomSkip.x() },
+		{ u"buttonGapY"_q, st::botWebViewBottomSkip.y() },
+		{ u"disclosureSkip"_q, st::botWebViewShellDisclosureSkip },
+		{ u"footerButtonSkip"_q, st::botWebViewShellFooterButtonSkip },
+		{ u"fullscreenControlWidth"_q, fullscreenButtonSize.width() },
+		{ u"fullscreenControlHeight"_q, fullscreenButtonSize.height() },
+		{ u"fullscreenControlTop"_q, fullscreenControlShift.y() },
+		{ u"fullscreenControlRight"_q, fullscreenControlShift.x() },
+		{ u"fullscreenControlGap"_q, fullscreenControlShift.x() },
+	};
+}
+
+QSize WindowSize(QSize contentSize) {
+	const auto &shadowPadding = st::botWebViewShellShadowPadding;
+	return contentSize + QSize(
+		shadowPadding.left() + shadowPadding.right(),
+		shadowPadding.top()
+			+ st::botWebViewShellHeaderHeight
+			+ shadowPadding.bottom());
+}
+
+QJsonObject MenuPalette() {
+	return {
+		{ u"bg"_q, st::windowBg->c.name(QColor::HexRgb) },
+		{ u"fg"_q, st::windowFg->c.name(QColor::HexRgb) },
+		{ u"hoverBg"_q, st::windowBgOver->c.name(QColor::HexRgb) },
+		{ u"ripple"_q, st::windowBgRipple->c.name(QColor::HexRgb) },
+		{ u"separator"_q, st::menuSeparatorFg->c.name(QColor::HexRgb) },
+		{ u"attention"_q,
+			st::menuIconAttentionColor->c.name(QColor::HexRgb) },
+	};
+}
+
+QJsonObject ColorPayload(const ResolvedColors &colors) {
+	return {
+		{ u"bodyBg"_q, ColorValue(colors.bodyBg) },
+		{ u"titleBg"_q, ColorValue(colors.titleBg) },
+		{ u"bottomBg"_q, ColorValue(colors.bottomBg) },
+	};
+}
+
+} // namespace Ui::BotWebView::LinuxShell
+
+#endif // !Q_OS_WIN && !Q_OS_MAC
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview_linux_shell.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview_linux_shell.h
new file mode 100644
index 00000000000000..fe2892cf5df507
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview_linux_shell.h
@@ -0,0 +1,79 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include <QtCore/QByteArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QSize>
+#include <QtCore/QString>
+#include <QtGui/QColor>
+
+namespace Ui::BotWebView::LinuxShell {
+
+struct ResolvedColors {
+	QColor titleBg;
+	QColor bodyBg;
+	QColor bottomBg;
+};
+
+#if !defined Q_OS_WIN && !defined Q_OS_MAC
+
+[[nodiscard]] QByteArray InstallScript(const QString &shellToken);
+[[nodiscard]] QByteArray MethodCallScript(
+	const QByteArray &method,
+	const QJsonObject &data,
+	const QString &shellToken);
+[[nodiscard]] QByteArray EventScript(
+	const QString &event,
+	const QJsonObject &data,
+	const QString &shellToken);
+[[nodiscard]] QJsonObject Metrics();
+[[nodiscard]] QSize WindowSize(QSize contentSize);
+[[nodiscard]] QJsonObject MenuPalette();
+[[nodiscard]] QJsonObject ColorPayload(const ResolvedColors &colors);
+
+#else // !Q_OS_WIN && !Q_OS_MAC
+
+[[nodiscard]] inline QByteArray InstallScript(const QString &) {
+	return {};
+}
+
+[[nodiscard]] inline QByteArray MethodCallScript(
+		const QByteArray &,
+		const QJsonObject &,
+		const QString &) {
+	return {};
+}
+
+[[nodiscard]] inline QByteArray EventScript(
+		const QString &,
+		const QJsonObject &,
+		const QString &) {
+	return {};
+}
+
+[[nodiscard]] inline QJsonObject Metrics() {
+	return {};
+}
+
+[[nodiscard]] inline QSize WindowSize(QSize contentSize) {
+	return contentSize;
+}
+
+[[nodiscard]] inline QJsonObject MenuPalette() {
+	return {};
+}
+
+[[nodiscard]] inline QJsonObject ColorPayload(
+		const ResolvedColors &) {
+	return {};
+}
+
+#endif // Q_OS_WIN || Q_OS_MAC
+
+} // namespace Ui::BotWebView::LinuxShell
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp
index 775218a873f10a..bf29895e9aa380 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_controls.cpp
@@ -7,21 +7,36 @@ For license and copyright information please follow this link:
 */
 #include "ui/chat/attach/attach_controls.h"
 
+#include "ui/painter.h"
 #include "styles/style_chat_helpers.h"
 
 namespace Ui {
 
-AttachControls::AttachControls()
-: _rect(st::sendBoxAlbumGroupRadius, st::roundedBg) {
-}
-
 void AttachControls::paint(QPainter &p, int x, int y) {
 	const auto groupWidth = width();
 	const auto groupHeight = height();
 	const auto full = (_type == Type::Full);
 
-	QRect groupRect(x, y, groupWidth, groupHeight);
-	_rect.paint(p, groupRect);
+	const auto groupRect = QRect(x, y, groupWidth, groupHeight);
+	{
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::roundedBg);
+		if (_type == Type::EditOnly) {
+			const auto desired = st::sendBoxAlbumSmallGroupCircleSize;
+			const auto available = std::min(groupWidth, groupHeight);
+			const auto side = std::min(desired, available);
+			const auto circleRect = QRect(
+				x + ((groupWidth - side) / 2),
+				y + ((groupHeight - side) / 2),
+				side,
+				side);
+			p.drawEllipse(circleRect);
+		} else {
+			const auto radius = std::min(groupWidth, groupHeight) / 2.;
+			p.drawRoundedRect(groupRect, radius, radius);
+		}
+	}
 
 	if (full) {
 		const auto groupHalfWidth = groupWidth / 2;
@@ -29,13 +44,13 @@ void AttachControls::paint(QPainter &p, int x, int y) {
 		const auto editRect = _vertical
 			? QRect(x, y, groupWidth, groupHalfHeight)
 			: QRect(x, y, groupHalfWidth, groupHeight);
-		st::sendBoxAlbumGroupButtonMediaEdit.paintInCenter(p, editRect);
+		st::sendBoxAlbumGroupButtonMediaMore.paintInCenter(p, editRect);
 		const auto deleteRect = _vertical
 			? QRect(x, y + groupHalfHeight, groupWidth, groupHalfHeight)
 			: QRect(x + groupHalfWidth, y, groupHalfWidth, groupHeight);
 		st::sendBoxAlbumGroupButtonMediaDelete.paintInCenter(p, deleteRect);
 	} else if (_type == Type::EditOnly) {
-		st::sendBoxAlbumButtonMediaEdit.paintInCenter(p, groupRect);
+		st::sendBoxAlbumButtonMediaMore.paintInCenter(p, groupRect);
 	}
 }
 
@@ -45,7 +60,10 @@ int AttachControls::width() const {
 			? st::sendBoxAlbumGroupSizeVertical.width()
 			: st::sendBoxAlbumGroupSize.width())
 		: (_type == Type::EditOnly)
-		? st::sendBoxAlbumSmallGroupSize.width()
+		? ((st::sendBoxAlbumSmallGroupSize.width()
+			> st::sendBoxAlbumSmallGroupCircleSize)
+			? st::sendBoxAlbumSmallGroupSize.width()
+			: st::sendBoxAlbumSmallGroupCircleSize)
 		: 0;
 }
 
@@ -55,7 +73,10 @@ int AttachControls::height() const {
 			? st::sendBoxAlbumGroupSizeVertical.height()
 			: st::sendBoxAlbumGroupSize.height())
 		: (_type == Type::EditOnly)
-		? st::sendBoxAlbumSmallGroupSize.height()
+		? ((st::sendBoxAlbumSmallGroupSize.height()
+			> st::sendBoxAlbumSmallGroupCircleSize)
+			? st::sendBoxAlbumSmallGroupSize.height()
+			: st::sendBoxAlbumSmallGroupCircleSize)
 		: 0;
 }
 
@@ -86,21 +107,20 @@ AttachControlsWidget::AttachControlsWidget(
 	_controls.setType(type);
 
 	const auto w = _controls.width();
-	resize(w, _controls.height());
+	const auto h = _controls.height();
+	resize(w, h);
 
 	if (type == AttachControls::Type::Full) {
-		_edit->resize(w / 2, _controls.height());
-		_delete->resize(w / 2, _controls.height());
-
-		_edit->moveToLeft(0, 0, w);
-		_delete->moveToRight(0, 0, w);
+		const auto leftWidth = w / 2;
+		const auto rightWidth = w - leftWidth;
+		_edit->setGeometryToLeft(0, 0, leftWidth, h, w);
+		_delete->setGeometryToLeft(leftWidth, 0, rightWidth, h, w);
 	} else if (type == AttachControls::Type::EditOnly) {
-		_edit->resize(w, _controls.height());
-		_edit->moveToLeft(0, 0, w);
+		_edit->setGeometryToLeft(0, 0, w, h, w);
 	}
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(this);
 		_controls.paint(p, 0, 0);
 	}, lifetime());
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_controls.h b/Telegram/SourceFiles/ui/chat/attach/attach_controls.h
index bf6992774584e7..3f3d2c31088b7f 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_controls.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_controls.h
@@ -8,7 +8,6 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "ui/abstract_button.h"
-#include "ui/round_rect.h"
 #include "ui/rp_widget.h"
 
 namespace Ui {
@@ -21,8 +20,6 @@ class AttachControls final {
 		None,
 	};
 
-	AttachControls();
-
 	void paint(QPainter &p, int x, int y);
 	void setType(Type type);
 	void setVertical(bool vertical);
@@ -33,7 +30,6 @@ class AttachControls final {
 	[[nodiscard]] bool vertical() const;
 
 private:
-	RoundRect _rect;
 	Type _type = Type::Full;
 	bool _vertical = false;
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.cpp
index 1c235c96bf1f52..8e60e74bfe4eaa 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.cpp
@@ -40,7 +40,7 @@ ItemSingleFilePreview::ItemSingleFilePreview(
 	const style::ComposeControls &st,
 	not_null<HistoryItem*> item,
 	AttachControls::Type type)
-: AbstractSingleFilePreview(parent, st, CheckControlsType(item, type)) {
+: AbstractSingleFilePreview(parent, st, CheckControlsType(item, type), {}) {
 	const auto media = item->media();
 	Assert(media != nullptr);
 	const auto document = media->document();
@@ -51,7 +51,7 @@ ItemSingleFilePreview::ItemSingleFilePreview(
 
 	rpl::single(rpl::empty) | rpl::then(
 		document->session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_documentMedia->thumbnail()) {
 			_lifetimeDownload.destroy();
 		}
@@ -109,7 +109,7 @@ void ItemSingleFilePreview::preparePreview(not_null<DocumentData*> document) {
 	}
 	data.statusText = FormatSizeText(document->size);
 
-	setData(data);
+	setData(std::move(data));
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp
index d180059ddd6d38..5ba4f683597192 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp
@@ -36,7 +36,7 @@ ItemSingleMediaPreview::ItemSingleMediaPreview(
 	Fn<bool()> gifPaused,
 	not_null<HistoryItem*> item,
 	AttachControls::Type type)
-: AbstractSingleMediaPreview(parent, st, type, [] { return true; })
+: AbstractSingleMediaPreview(parent, st, type)
 , _gifPaused(std::move(gifPaused))
 , _fullId(item->fullId()) {
 	const auto media = item->media();
@@ -85,7 +85,7 @@ ItemSingleMediaPreview::ItemSingleMediaPreview(
 
 	rpl::single(rpl::empty) | rpl::then(
 		session->downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto computed = computeThumbInfo();
 		if (!computed.image) {
 			if (_documentMedia && !_documentMedia->owner()->hasThumbnail()) {
@@ -135,7 +135,7 @@ void ItemSingleMediaPreview::setupStreamedPreview(
 		[=] { update(); });
 	_streamed->lockPlayer();
 	_streamed->player().updates(
-	) | rpl::start_with_next_error([=](Update &&update) {
+	) | rpl::on_next_error([=](Update &&update) {
 		handleStreamingUpdate(std::move(update));
 	}, [=](Error &&error) {
 		handleStreamingError(std::move(error));
@@ -150,14 +150,15 @@ void ItemSingleMediaPreview::setupStreamedPreview(
 void ItemSingleMediaPreview::handleStreamingUpdate(Update &&update) {
 	v::match(update.data, [&](Information &update) {
 		streamingReady(std::move(update));
-	}, [&](const PreloadedVideo &update) {
-	}, [&](const UpdateVideo &update) {
+	}, [](PreloadedVideo) {
+	}, [&](UpdateVideo) {
 		this->update();
-	}, [&](const PreloadedAudio &update) {
-	}, [&](const UpdateAudio &update) {
-	}, [&](const WaitingForData &update) {
-	}, [&](MutedByOther) {
-	}, [&](Finished) {
+	}, [](PreloadedAudio) {
+	}, [](UpdateAudio) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
+	}, [](Finished) {
 	});
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index 505fa455bd20c3..8939f6d32e1f89 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -12,17 +12,157 @@ For license and copyright information please follow this link:
 
 #include "ui/chat/attach/attach_send_files_way.h"
 #include "ui/image/image_prepare.h"
+#include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "core/mime_type.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_media_player.h"
+
+#include <QFileInfo>
 
 namespace Ui {
 namespace {
 
 constexpr auto kMaxAlbumCount = 10;
+constexpr auto kStandardPhotoSideLimit = 1280;
+
+struct GroupRange {
+	int from = 0;
+	int till = 0;
+	AlbumType type = AlbumType::None;
+
+	[[nodiscard]] int size() const {
+		return till - from;
+	}
+};
+
+struct HighQualityBadgeCache {
+	QRgb bg = 0;
+	QRgb fg = 0;
+	qreal ratio = 0.;
+	int width = 0;
+	int height = 0;
+	QImage image;
+};
+
+[[nodiscard]] const QImage &HighQualityBadgeImage(
+		const style::ComposeControls &st) {
+	static auto cache = HighQualityBadgeCache();
+	const auto text = u"HD"_q;
+	const auto &font = st::mediaPlayerSpeedButton.font;
+	const auto xpadding = style::ConvertScale(2.);
+	const auto ypadding = 0;
+	const auto stroke = style::ConvertScaleExact(1.);
+	const auto width = font->width(text);
+	const auto height = font->height;
+	const auto ratio = style::DevicePixelRatio();
+	const auto bg = st::roundedBg->c.rgba();
+	const auto fg = st::roundedFg->c.rgba();
+	if (cache.image.isNull()
+		|| (cache.bg != bg)
+		|| (cache.fg != fg)
+		|| (cache.ratio != ratio)
+		|| (cache.width != width)
+		|| (cache.height != height)) {
+		cache.bg = bg;
+		cache.fg = fg;
+		cache.ratio = ratio;
+		cache.width = width;
+		cache.height = height;
+		cache.image = QImage(
+			(width + 2 * xpadding + stroke) * ratio,
+			(height + 2 * ypadding + stroke) * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		cache.image.setDevicePixelRatio(ratio);
+		cache.image.fill(Qt::transparent);
+		auto painter = QPainter(&cache.image);
+		auto hq = PainterHighQualityEnabler(painter);
+		painter.setCompositionMode(QPainter::CompositionMode_Source);
+		painter.setPen(QPen(Qt::transparent, stroke));
+		painter.setBrush(st::roundedBg);
+		painter.setFont(font);
+		painter.drawRoundedRect(
+			QRectF(
+				0,
+				0,
+				width + 2 * xpadding + stroke,
+				height + 2 * ypadding + stroke),
+			height / 3.,
+			height / 3.);
+		painter.setPen(st::roundedFg);
+		painter.drawText(
+			QPointF(
+				xpadding + stroke / 2.,
+				ypadding + font->ascent + stroke / 2.),
+			text);
+	}
+	return cache.image;
+}
+
+[[nodiscard]] AlbumType GroupTypeForFile(
+		PreparedFile::Type type,
+		bool groupFiles,
+		bool sendImagesAsPhotos) {
+	using Type = PreparedFile::Type;
+	return (type == Type::Music)
+		? (groupFiles ? AlbumType::Music : AlbumType::None)
+		: (type == Type::Video || type == Type::Photo)
+		? ((groupFiles && sendImagesAsPhotos)
+			? AlbumType::PhotoVideo
+			: (groupFiles && !sendImagesAsPhotos)
+			? AlbumType::File
+			: AlbumType::None)
+		: (type == Type::File)
+		? (groupFiles ? AlbumType::File : AlbumType::None)
+		: AlbumType::None;
+}
+
+[[nodiscard]] std::vector<GroupRange> GroupRanges(
+		const std::vector<PreparedFile> &files,
+		SendFilesWay way,
+		bool slowmode) {
+	const auto sendImagesAsPhotos = way.sendImagesAsPhotos();
+	const auto groupFiles = way.groupFiles() || slowmode;
+
+	auto result = std::vector<GroupRange>();
+	if (files.empty()) {
+		return result;
+	}
+	auto from = 0;
+	auto groupType = AlbumType::None;
+	for (auto i = 0; i != int(files.size()); ++i) {
+		const auto fileGroupType = GroupTypeForFile(
+			files[i].type,
+			groupFiles,
+			sendImagesAsPhotos);
+		const auto count = (i - from);
+		if ((i > from && groupType != fileGroupType)
+			|| ((groupType != AlbumType::None) && (count == kMaxAlbumCount))) {
+			result.push_back(GroupRange{
+				.from = from,
+				.till = i,
+				.type = (count > 1) ? groupType : AlbumType::None,
+			});
+			from = i;
+		}
+		groupType = fileGroupType;
+	}
+	const auto till = int(files.size());
+	const auto count = (till - from);
+	result.push_back(GroupRange{
+		.from = from,
+		.till = till,
+		.type = (count > 1) ? groupType : AlbumType::None,
+	});
+	return result;
+}
 
 } // namespace
 
 PreparedFile::PreparedFile(const QString &path) : path(path) {
+	const auto fileInfo = QFileInfo(path);
+	displayName = fileInfo.fileName();
 }
 
 PreparedFile::PreparedFile(PreparedFile &&other) = default;
@@ -42,6 +182,15 @@ bool PreparedFile::isSticker() const {
 		&& Core::IsMimeSticker(information->filemime);
 }
 
+bool PreparedFile::isVideoFile() const {
+	Expects(information != nullptr);
+
+	using Video = Ui::PreparedFileInformation::Video;
+	return (type == PreparedFile::Type::Video)
+		&& v::is<Video>(information->media)
+		&& !v::get<Video>(information->media).isGifv;
+}
+
 bool PreparedFile::isGifv() const {
 	Expects(information != nullptr);
 
@@ -51,6 +200,14 @@ bool PreparedFile::isGifv() const {
 		&& v::get<Video>(information->media).isGifv;
 }
 
+bool PreparedFile::canUseHighQualityPhoto() const {
+	return (type == PreparedFile::Type::Photo)
+		&& (information != nullptr)
+		&& !isSticker()
+		&& ((originalDimensions.width() > kStandardPhotoSideLimit)
+			|| (originalDimensions.height() > kStandardPhotoSideLimit));
+}
+
 AlbumType PreparedFile::albumType(bool sendImagesAsPhotos) const {
 	switch (type) {
 	case Type::Photo:
@@ -77,7 +234,9 @@ bool CanBeInAlbumType(PreparedFile::Type type, AlbumType album) {
 	case AlbumType::Music:
 		return (type == Type::Music);
 	case AlbumType::File:
-		return (type == Type::Photo) || (type == Type::File);
+		return (type == Type::Photo)
+			|| (type == Type::Video)
+			|| (type == Type::File);
 	}
 	Unexpected("AlbumType in CanBeInAlbumType.");
 }
@@ -158,45 +317,33 @@ bool PreparedList::canBeSentInSlowmodeWith(const PreparedList &other) const {
 	return !hasNonGrouping && (!hasFiles || !hasVideos);
 }
 
-bool PreparedList::canAddCaption(bool sendingAlbum, bool compress) const {
-	if (!filesToProcess.empty()
-		|| files.empty()
-		|| files.size() > kMaxAlbumCount) {
-		return false;
-	}
-	if (files.size() == 1) {
-		Assert(files.front().information != nullptr);
-		const auto isSticker = (!compress
-				&& Core::IsMimeSticker(files.front().information->filemime))
-			|| files.front().path.endsWith(u".tgs"_q, Qt::CaseInsensitive);
-		return !isSticker;
-	} else if (!sendingAlbum) {
+bool PreparedList::canAddCaption(bool compress) const {
+	if (files.empty()) {
 		return false;
 	}
-	const auto hasFiles = ranges::contains(
-		files,
-		PreparedFile::Type::File,
-		&PreparedFile::type);
-	const auto hasMusic = ranges::contains(
-		files,
-		PreparedFile::Type::Music,
-		&PreparedFile::type);
-	const auto hasNotGrouped = ranges::contains(
-		files,
-		PreparedFile::Type::None,
-		&PreparedFile::type);
-	return !hasFiles && !hasMusic && !hasNotGrouped;
+	const auto &last = files.back();
+	const auto isSticker = last.path.endsWith(u".tgs"_q, Qt::CaseInsensitive)
+		|| (!compress
+			&& last.information
+			&& Core::IsMimeSticker(last.information->filemime));
+	return !isSticker;
 }
 
 bool PreparedList::canMoveCaption(bool sendingAlbum, bool compress) const {
-	if (!canAddCaption(sendingAlbum, compress)) {
+	if (!canAddCaption(compress)) {
 		return false;
-	} else if (files.size() != 1) {
-		return true;
+	} else if (files.size() > kMaxAlbumCount) {
+		return false;
+	} else if (!sendingAlbum || !compress) {
+		return (files.size() == 1);
+	}
+	for (const auto &file : files) {
+		if (file.type != PreparedFile::Type::Photo
+			&& file.type != PreparedFile::Type::Video) {
+			return false;
+		}
 	}
-	const auto &file = files.front();
-	return (file.type == PreparedFile::Type::Video)
-		|| (file.type == PreparedFile::Type::Photo && compress);
+	return true;
 }
 
 bool PreparedList::canChangePrice(bool sendingAlbum, bool compress) const {
@@ -226,9 +373,13 @@ bool PreparedList::hasGroupOption(bool slowmode) const {
 
 bool PreparedList::hasSendImagesAsPhotosOption(bool slowmode) const {
 	using Type = PreparedFile::Type;
-	return slowmode
-		? ((files.size() == 1) && (files.front().type == Type::Photo))
-		: ranges::contains(files, Type::Photo, &PreparedFile::type);
+	if (slowmode) {
+		const auto t = files.front().type;
+		return (files.size() == 1)
+			&& (t == Type::Photo || t == Type::Video);
+	}
+	return ranges::contains(files, Type::Photo, &PreparedFile::type)
+		|| ranges::contains(files, Type::Video, &PreparedFile::type);
 }
 
 bool PreparedList::canHaveEditorHintLabel() const {
@@ -257,6 +408,27 @@ bool PreparedList::hasSpoilerMenu(bool compress) const {
 	return allAreVideo || (allAreMedia && compress);
 }
 
+bool PreparedList::hasSendLargePhotosOption(bool compress) const {
+	return compress
+		&& ranges::any_of(files, &PreparedFile::canUseHighQualityPhoto);
+}
+
+std::shared_ptr<PreparedBundle> PrepareFilesBundle(
+		std::vector<PreparedGroup> groups,
+		SendFilesWay way,
+		bool ctrlShiftEnter) {
+	auto totalCount = 0;
+	for (const auto &group : groups) {
+		totalCount += group.list.files.size();
+	}
+	return std::make_shared<PreparedBundle>(PreparedBundle{
+		.groups = std::move(groups),
+		.way = way,
+		.totalCount = totalCount,
+		.ctrlShiftEnter = ctrlShiftEnter,
+	});
+}
+
 int MaxAlbumItems() {
 	return kMaxAlbumCount;
 }
@@ -272,49 +444,19 @@ std::vector<PreparedGroup> DivideByGroups(
 		PreparedList &&list,
 		SendFilesWay way,
 		bool slowmode) {
-	const auto sendImagesAsPhotos = way.sendImagesAsPhotos();
-	const auto groupFiles = way.groupFiles() || slowmode;
-
-	auto group = Ui::PreparedList();
-
-	using Type = Ui::PreparedFile::Type;
-	auto groupType = AlbumType::None;
-
+	const auto ranges = GroupRanges(list.files, way, slowmode);
 	auto result = std::vector<PreparedGroup>();
-	auto pushGroup = [&] {
-		const auto type = (group.files.size() > 1)
-			? groupType
-			: AlbumType::None;
+	result.reserve(ranges.size());
+	for (const auto &range : ranges) {
+		auto grouped = Ui::PreparedList();
+		grouped.files.reserve(range.size());
+		for (auto i = range.from; i != range.till; ++i) {
+			grouped.files.push_back(std::move(list.files[i]));
+		}
 		result.push_back(PreparedGroup{
-			.list = base::take(group),
-			.type = type,
+			.list = std::move(grouped),
+			.type = range.type,
 		});
-	};
-	for (auto i = 0; i != list.files.size(); ++i) {
-		auto &file = list.files[i];
-		const auto fileGroupType = (file.type == Type::Music)
-			? (groupFiles ? AlbumType::Music : AlbumType::None)
-			: (file.type == Type::Video)
-			? (groupFiles ? AlbumType::PhotoVideo : AlbumType::None)
-			: (file.type == Type::Photo)
-			? ((groupFiles && sendImagesAsPhotos)
-				? AlbumType::PhotoVideo
-				: (groupFiles && !sendImagesAsPhotos)
-				? AlbumType::File
-				: AlbumType::None)
-			: (file.type == Type::File)
-			? (groupFiles ? AlbumType::File : AlbumType::None)
-			: AlbumType::None;
-		if ((!group.files.empty() && groupType != fileGroupType)
-			|| ((groupType != AlbumType::None)
-				&& (group.files.size() == Ui::MaxAlbumItems()))) {
-			pushGroup();
-		}
-		group.files.push_back(std::move(file));
-		groupType = fileGroupType;
-	}
-	if (!group.files.empty()) {
-		pushGroup();
 	}
 	return result;
 }
@@ -357,4 +499,25 @@ QPixmap BlurredPreviewFromPixmap(QPixmap pixmap, RectParts corners) {
 		{ .options = RoundOptions(ImageRoundRadius::Large, corners) }));
 }
 
+void PaintHighQualityBadge(
+		QPainter &p,
+		const style::ComposeControls &st,
+		QRect rect,
+		RectPart origin) {
+	const auto outerSkip = st.photoQualityBadgeOuterSkip;
+	const auto &badge = HighQualityBadgeImage(st);
+	const auto size = badge.size() / badge.devicePixelRatio();
+	const auto left = (origin == RectPart::TopLeft)
+		|| (origin == RectPart::BottomLeft);
+	const auto top = (origin == RectPart::TopLeft)
+		|| (origin == RectPart::TopRight);
+	const auto x = left
+		? (rect.x() + outerSkip)
+		: (rect.x() + rect.width() - size.width() - outerSkip);
+	const auto y = top
+		? (rect.y() + outerSkip)
+		: (rect.y() + rect.height() - size.height() - outerSkip);
+	p.drawImage(QPointF(x, y), badge);
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index c1fb3a379312d7..b4089055b4e877 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -8,11 +8,18 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "editor/photo_editor_common.h"
+#include "ui/chat/attach/attach_send_files_way.h"
 #include "ui/rect_part.h"
 
 #include <QtCore/QSemaphore>
 #include <deque>
 
+class QPainter;
+
+namespace style {
+struct ComposeControls;
+} // namespace style
+
 namespace Ui {
 
 class RpWidget;
@@ -74,17 +81,23 @@ struct PreparedFile {
 	[[nodiscard]] bool canBeInAlbumType(AlbumType album) const;
 	[[nodiscard]] AlbumType albumType(bool sendImagesAsPhotos) const;
 	[[nodiscard]] bool isSticker() const;
+	[[nodiscard]] bool isVideoFile() const;
 	[[nodiscard]] bool isGifv() const;
+	[[nodiscard]] bool canUseHighQualityPhoto() const;
 
 	QString path;
+	QString displayName;
+	TextWithTags caption;
 	QByteArray content;
 	int64 size = 0;
-	std::unique_ptr<Ui::PreparedFileInformation> information;
+	std::unique_ptr<PreparedFileInformation> information;
+	std::unique_ptr<PreparedFile> videoCover;
 	QImage preview;
 	QSize shownDimensions;
 	QSize originalDimensions;
 	Type type = Type::File;
 	bool spoiler = false;
+	bool sendLargePhotos = false;
 };
 
 [[nodiscard]] bool CanBeInAlbumType(PreparedFile::Type type, AlbumType album);
@@ -112,7 +125,7 @@ struct PreparedList {
 		std::vector<int> order);
 	void mergeToEnd(PreparedList &&other, bool cutToAlbumSize = false);
 
-	[[nodiscard]] bool canAddCaption(bool sendingAlbum, bool compress) const;
+	[[nodiscard]] bool canAddCaption(bool compress) const;
 	[[nodiscard]] bool canMoveCaption(
 		bool sendingAlbum,
 		bool compress) const;
@@ -128,6 +141,7 @@ struct PreparedList {
 	[[nodiscard]] bool canHaveEditorHintLabel() const;
 	[[nodiscard]] bool hasSticker() const;
 	[[nodiscard]] bool hasSpoilerMenu(bool compress) const;
+	[[nodiscard]] bool hasSendLargePhotosOption(bool compress) const;
 
 	Error error = Error::None;
 	QString errorData;
@@ -139,11 +153,6 @@ struct PreparedList {
 struct PreparedGroup {
 	PreparedList list;
 	AlbumType type = AlbumType::None;
-
-	[[nodiscard]] bool sentWithCaption() const {
-		return (list.files.size() == 1)
-			|| (type == AlbumType::PhotoVideo);
-	}
 };
 
 [[nodiscard]] std::vector<PreparedGroup> DivideByGroups(
@@ -151,6 +160,17 @@ struct PreparedGroup {
 	SendFilesWay way,
 	bool slowmode);
 
+struct PreparedBundle {
+	std::vector<PreparedGroup> groups;
+	SendFilesWay way;
+	int totalCount = 0;
+	bool ctrlShiftEnter = false;
+};
+[[nodiscard]] std::shared_ptr<PreparedBundle> PrepareFilesBundle(
+	std::vector<PreparedGroup> groups,
+	SendFilesWay way,
+	bool ctrlShiftEnter);
+
 [[nodiscard]] int MaxAlbumItems();
 [[nodiscard]] bool ValidateThumbDimensions(int width, int height);
 
@@ -160,4 +180,10 @@ struct PreparedGroup {
 	QPixmap pixmap,
 	RectParts corners);
 
+void PaintHighQualityBadge(
+	QPainter &p,
+	const style::ComposeControls &st,
+	QRect rect,
+	RectPart origin = RectPart::BottomLeft);
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.cpp
index 13f2f086f469c6..abd8a36ed2afa4 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.cpp
@@ -8,6 +8,11 @@ For license and copyright information please follow this link:
 #include "ui/chat/attach/attach_send_files_way.h"
 
 namespace Ui {
+namespace {
+
+constexpr auto kSerializedSendLargePhotos = int32(4);
+
+} // namespace
 
 void SendFilesWay::setSendImagesAsPhotos(bool value) {
 	if (value) {
@@ -31,6 +36,14 @@ void SendFilesWay::setGroupFiles(bool value) {
 	}
 }
 
+void SendFilesWay::setSendLargePhotos(bool value) {
+	if (value) {
+		_flags |= Flag::SendLargePhotos;
+	} else {
+		_flags &= ~Flag::SendLargePhotos;
+	}
+}
+
 void SendFilesWay::setHasCompressedStickers(bool value) {
 	if (value) {
 		_flags |= Flag::HasCompressedStickers;
@@ -53,16 +66,22 @@ int32 SendFilesWay::serialize() const {
 		: groupFiles()
 		? int32(3)
 		: int32(2);
+	if (sendLargePhotos()) {
+		result |= kSerializedSendLargePhotos;
+	}
 	return result;
 }
 
 std::optional<SendFilesWay> SendFilesWay::FromSerialized(int32 value) {
-	if (value < 0 || value > 3) {
+	if (value < 0 || value > 7) {
 		return std::nullopt;
 	}
+	const auto sendLargePhotos = (value & kSerializedSendLargePhotos) != 0;
+	value &= ~kSerializedSendLargePhotos;
 	auto result = SendFilesWay();
 	result.setGroupFiles((value == 0) || (value == 3));
 	result.setSendImagesAsPhotos((value == 0) || (value == 1));
+	result.setSendLargePhotos(sendLargePhotos);
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h
index 1fb6c9c8739823..ba758ae69b21a9 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h
@@ -26,8 +26,12 @@ class SendFilesWay final {
 	[[nodiscard]] bool sendImagesAsPhotos() const {
 		return (_flags & Flag::SendImagesAsPhotos) != 0;
 	}
+	[[nodiscard]] bool sendLargePhotos() const {
+		return (_flags & Flag::SendLargePhotos) != 0;
+	}
 	void setGroupFiles(bool value);
 	void setSendImagesAsPhotos(bool value);
+	void setSendLargePhotos(bool value);
 	void setHasCompressedStickers(bool value);
 
 	[[nodiscard]] inline bool operator<(const SendFilesWay &other) const {
@@ -62,6 +66,7 @@ class SendFilesWay final {
 		GroupFiles = (1 << 0),
 		SendImagesAsPhotos = (1 << 1),
 		HasCompressedStickers = (1 << 2),
+		SendLargePhotos = (1 << 3),
 
 		Default = GroupFiles | SendImagesAsPhotos,
 	};
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
index 344b30dd2c7653..2ccba7412ab50b 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
@@ -10,6 +10,7 @@ For license and copyright information please follow this link:
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/text/format_song_name.h"
 #include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
 #include "ui/ui_utility.h"
 #include "core/mime_type.h"
 #include "styles/style_chat.h"
@@ -22,18 +23,35 @@ SingleFilePreview::SingleFilePreview(
 	QWidget *parent,
 	const style::ComposeControls &st,
 	const PreparedFile &file,
+	const Text::MarkedContext &captionContext,
 	AttachControls::Type type)
-: AbstractSingleFilePreview(parent, st, type) {
+: AbstractSingleFilePreview(parent, st, type, captionContext) {
 	preparePreview(file);
 }
 
+SingleFilePreview::SingleFilePreview(
+	QWidget *parent,
+	const style::ComposeControls &st,
+	const PreparedFile &file,
+	AttachControls::Type type)
+: SingleFilePreview(parent, st, file, {}, type) {
+}
+
+void SingleFilePreview::setDisplayName(const QString &displayName) {
+	AbstractSingleFilePreview::setDisplayName(displayName);
+}
+
+void SingleFilePreview::setCaption(const TextWithTags &caption) {
+	AbstractSingleFilePreview::setCaption(caption);
+}
+
 void SingleFilePreview::preparePreview(const PreparedFile &file) {
 	AbstractSingleFilePreview::Data data;
 
 	auto preview = QImage();
 	if (const auto image = std::get_if<PreparedFileInformation::Image>(
 		&file.information->media)) {
-		preview = image->data;
+		preview = file.preview.isNull() ? image->data : file.preview;
 	} else if (const auto video = std::get_if<PreparedFileInformation::Video>(
 		&file.information->media)) {
 		preview = video->thumbnail;
@@ -41,13 +59,23 @@ void SingleFilePreview::preparePreview(const PreparedFile &file) {
 	prepareThumbFor(data, preview);
 	const auto filepath = file.path;
 	if (filepath.isEmpty()) {
-		auto filename = "image.png";
-		data.name = filename;
-		data.statusText = FormatImageSizeText(file.originalDimensions);
-		data.fileIsImage = true;
+		const auto fallbackName = u"image.png"_q;
+		const auto displayName = file.displayName.isEmpty()
+			? fallbackName
+			: file.displayName;
+		data.name = displayName;
+		if (file.originalDimensions.isValid()) {
+			data.statusText = FormatImageSizeText(file.originalDimensions);
+			data.fileIsImage = true;
+		} else {
+			data.statusText = FormatSizeText(file.size);
+			data.fileIsImage = false;
+		}
 	} else {
 		auto fileinfo = QFileInfo(filepath);
-		auto filename = fileinfo.fileName();
+		auto filename = file.displayName.isEmpty()
+			? fileinfo.fileName()
+			: file.displayName;
 		data.fileIsImage = Core::FileIsImage(
 			filename,
 			Core::MimeTypeForFile(fileinfo).name());
@@ -73,8 +101,18 @@ void SingleFilePreview::preparePreview(const PreparedFile &file) {
 			.string();
 		data.statusText = FormatSizeText(fileinfo.size());
 	}
+	auto caption = TextWithEntities{
+		file.caption.text,
+		TextUtilities::ConvertTextTagsToEntities(file.caption.tags),
+	};
+	caption = TextUtilities::SingleLine(caption);
+	data.caption.setMarkedText(
+		st::defaultTextStyle,
+		caption,
+		kMarkupTextOptions,
+		captionContext());
 
-	setData(data);
+	setData(std::move(data));
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
index 24647c91740b16..a388c0473e95e9 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
@@ -19,7 +19,15 @@ class SingleFilePreview final : public AbstractSingleFilePreview {
 		QWidget *parent,
 		const style::ComposeControls &st,
 		const PreparedFile &file,
+		const Text::MarkedContext &captionContext,
 		AttachControls::Type type = AttachControls::Type::Full);
+	SingleFilePreview(
+		QWidget *parent,
+		const style::ComposeControls &st,
+		const PreparedFile &file,
+		AttachControls::Type type = AttachControls::Type::Full);
+	void setDisplayName(const QString &displayName) override;
+	void setCaption(const TextWithTags &caption) override;
 
 private:
 	void preparePreview(const PreparedFile &file);
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
index cb80676cd50f90..4f92ebd02ddc3e 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
@@ -19,7 +19,6 @@ SingleMediaPreview *SingleMediaPreview::Create(
 		const style::ComposeControls &st,
 		Fn<bool()> gifPaused,
 		const PreparedFile &file,
-		Fn<bool()> canToggleSpoiler,
 		AttachControls::Type type) {
 	auto preview = QImage();
 	auto animated = false;
@@ -32,7 +31,9 @@ SingleMediaPreview *SingleMediaPreview::Create(
 		hasModifications = !image->modifications.empty();
 	} else if (const auto video = std::get_if<PreparedFileInformation::Video>(
 			&file.information->media)) {
-		preview = video->thumbnail;
+		preview = file.videoCover
+			? file.videoCover->preview
+			: video->thumbnail;
 		animated = true;
 		animationPreview = video->isGifv;
 	}
@@ -43,7 +44,7 @@ SingleMediaPreview *SingleMediaPreview::Create(
 		&& !hasModifications) {
 		return nullptr;
 	}
-	return CreateChild<SingleMediaPreview>(
+	const auto result = CreateChild<SingleMediaPreview>(
 		parent,
 		st,
 		std::move(gifPaused),
@@ -52,8 +53,9 @@ SingleMediaPreview *SingleMediaPreview::Create(
 		Core::IsMimeSticker(file.information->filemime),
 		file.spoiler,
 		animationPreview ? file.path : QString(),
-		type,
-		std::move(canToggleSpoiler));
+		type);
+	result->setCanShowHighQualityBadge(file.canUseHighQualityPhoto());
+	return result;
 }
 
 SingleMediaPreview::SingleMediaPreview(
@@ -65,9 +67,8 @@ SingleMediaPreview::SingleMediaPreview(
 	bool sticker,
 	bool spoiler,
 	const QString &animatedPreviewPath,
-	AttachControls::Type type,
-	Fn<bool()> canToggleSpoiler)
-: AbstractSingleMediaPreview(parent, st, type, std::move(canToggleSpoiler))
+	AttachControls::Type type)
+: AbstractSingleMediaPreview(parent, st, type)
 , _gifPaused(std::move(gifPaused))
 , _sticker(sticker) {
 	Expects(!preview.isNull());
@@ -124,7 +125,7 @@ void SingleMediaPreview::prepareAnimatedPreview(
 			Lottie::ReadContent(QByteArray(), animatedPreviewPath),
 			Lottie::FrameRequest{ box });
 		_lottiePreview->updates(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			update();
 		}, lifetime());
 	} else if (!animatedPreviewPath.isEmpty()) {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
index d57ccd3663df9f..ac5d4f84f447e9 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
@@ -25,7 +25,6 @@ class SingleMediaPreview final : public AbstractSingleMediaPreview {
 		const style::ComposeControls &st,
 		Fn<bool()> gifPaused,
 		const PreparedFile &file,
-		Fn<bool()> canToggleSpoiler,
 		AttachControls::Type type = AttachControls::Type::Full);
 
 	SingleMediaPreview(
@@ -37,8 +36,7 @@ class SingleMediaPreview final : public AbstractSingleMediaPreview {
 		bool sticker,
 		bool spoiler,
 		const QString &animatedPreviewPath,
-		AttachControls::Type type,
-		Fn<bool()> canToggleSpoiler);
+		AttachControls::Type type);
 
 protected:
 	bool supportsSpoilers() const override;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index cb30fdf4768001..09f6960d4c1499 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -23,24 +23,64 @@ msgMinWidth: 160px;
 msgPhotoSize: 33px;
 msgPhotoSkip: 40px;
 msgPadding: margins(11px, 8px, 11px, 8px);
+msgTagBadgePadding: margins(5px, -1px, 5px, 0px);
+msgTagBadgeBoostSkip: 2px;
+
+tagInfoIcon: icon {{ "chat/large_user_tag-48x48", windowFgActive }};
+tagInfoIconPadding: margins(8px, 8px, 8px, 8px);
+tagInfoPreviewHeight: 80px;
+tagInfoPreviewGap: 8px;
+tagInfoPreviewBubbleRadius: 8px;
+tagInfoPreviewLineHeight: 6px;
+tagInfoPreviewLineSpacing: 4px;
+tagInfoPreviewBubblePadding: margins(10px, 8px, 10px, 8px);
+tagInfoPreviewRadius: 8px;
+tagInfoPreviewBubbleRightMargin: 10px;
+tagInfoPreviewFadeWidth: 24px;
+tagInfoPreviewBadgeTop: 6px;
+tagInfoPreviewPadding: margins(0px, 16px, 0px, 0px);
+tagInfoAdminsOnlyPadding: margins(0px, 8px, 0px, 0px);
+tagInfoAdminsOnlyLabel: FlatLabel(defaultFlatLabel) {
+	align: align(top);
+	minWidth: 40px;
+	textFg: windowSubTextFg;
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+}
+
 msgMargin: margins(16px, 6px, 56px, 2px);
 msgMarginTopAttached: 0px;
 msgShadow: 2px;
 msgSelectionOffset: 30px;
+msgSelectionBottomSkip: 5px;
+
+itemRevealDuration: 150;
+textRevealGradient: 24px;
+middleClickAutoscrollSpeedScale: 30px;
+middleClickAutoscrollMaxSpeed: 7200px;
 
 historyReplyTop: 2px;
 historyReplyBottom: 2px;
 historyReplyPreview: 32px;
 historyReplyPreviewMargin: margins(7px, 4px, 4px, 4px);
 historyReplyPadding: margins(11px, 2px, 6px, 2px);
-historyReplyUser: icon {{ "chat/reply_type_user", windowFg }};
-historyReplyUserPadding: margins(0px, 4px, 4px, 0px);
-historyReplyGroup: icon {{ "chat/reply_type_group", windowFg }};
-historyReplyGroupPadding: margins(0px, 4px, 4px, 0px);
-historyReplyChannel: icon {{ "chat/reply_type_channel", windowFg }};
-historyReplyChannelPadding: margins(0px, 5px, 4px, 0px);
-historyReplyForward: icon {{ "mini_forward", windowFg }};
-historyReplyForwardPadding: margins(0px, 2px, 2px, 0px);
+historyReplyUser: IconEmoji {
+	icon: icon {{ "chat/reply_type_user", windowFg }};
+	padding: margins(0px, 4px, 4px, 0px);
+}
+historyReplyGroup: IconEmoji {
+	icon: icon {{ "chat/reply_type_group", windowFg }};
+	padding: margins(0px, 4px, 4px, 0px);
+}
+historyReplyChannel: IconEmoji {
+	icon: icon {{ "chat/reply_type_channel", windowFg }};
+	padding: margins(0px, 5px, 4px, 0px);
+}
+historyReplyForward: IconEmoji {
+	icon: icon {{ "mini_forward", windowFg }};
+	padding: margins(0px, 2px, 2px, 0px);
+}
 
 msgReplyPadding: margins(6px, 6px, 11px, 6px);
 msgReplyBarPos: point(1px, 0px);
@@ -48,6 +88,7 @@ msgReplyBarSize: size(2px, 36px);
 msgReplyBarSkip: 10px;
 msgServicePadding: margins(12px, 3px, 12px, 4px);
 msgServiceMargin: margins(10px, 10px, 10px, 2px);
+monoforumBarUserpicSkip: 2px;
 
 msgDateSpace: 12px;
 msgDateDelta: point(2px, 5px);
@@ -111,6 +152,10 @@ priceTagTextPalette: TextPalette(defaultTextPalette) {
 	linkFg: creditsBg1;
 }
 fwdTextUserpicPadding: margins(0px, 1px, 3px, 0px);
+nameRippleRadius: 4px;
+nameRipplePadding: margins(3px, 1px, 3px, 1px);
+linkRippleRadius: 3px;
+linkRipplePadding: margins(3px, 0px, 3px, 0px);
 fwdTextStyle: TextStyle(semiboldTextStyle) {
 	linkUnderline: kLinkUnderlineNever;
 }
@@ -177,9 +222,6 @@ maxWallPaperWidth: 160px;
 maxWallPaperHeight: 240px;
 historyThemeSize: size(272px, 176px);
 
-extendedPreviewButtonPadding: margins(20px, 10px, 20px, 10px);
-extendedPreviewButtonMargin: 20px;
-
 historyMinimalWidth: 380px;
 
 reactionMenu: PopupMenu(defaultPopupMenu) {
@@ -237,7 +279,6 @@ membersInnerDropdown: InnerDropdown(defaultInnerDropdown) {
 	scrollMargin: margins(0px, 5px, 0px, 5px);
 	scrollPadding: margins(0px, 3px, 0px, 3px);
 }
-membersInnerItem: defaultPeerListItem;
 
 historyFileOutImage: icon {{ "history_file_image", historyFileOutIconFg }};
 historyFileOutImageSelected: icon {{ "history_file_image", historyFileOutIconFgSelected }};
@@ -309,9 +350,14 @@ historyPinInSelectedIcon: icon {{ "history_pin", msgInDateFgSelected }};
 historyPinOutIcon: icon {{ "history_pin", historyOutIconFg }};
 historyPinOutSelectedIcon: icon {{ "history_pin", historyOutIconFgSelected }};
 historyPinInvertedIcon: icon {{ "history_pin", historySendingInvertedIconFg }};
+historySilentWidth: 12px;
+historySilentTop: -13px;
+historySilentInIcon: icon {{ "dialogs/dialogs_mute", msgInDateFg }};
+historySilentInSelectedIcon: icon {{ "dialogs/dialogs_mute", msgInDateFgSelected }};
+historySilentOutIcon: icon {{ "dialogs/dialogs_mute", historyOutIconFg }};
+historySilentOutSelectedIcon: icon {{ "dialogs/dialogs_mute", historyOutIconFgSelected }};
+historySilentInvertedIcon: icon {{ "dialogs/dialogs_mute", historySendingInvertedIconFg }};
 
-historySendPadding: 9px;
-historySendRight: 2px;
 historyBotMenuSkip: 8px;
 historyBotMenuMaxWidth: 160px;
 historyBotMenuButton: RoundButton(defaultActiveButton) {
@@ -326,6 +372,15 @@ topicButtonArrowSkip: 8px;
 topicButtonArrowPosition: point(3px, 3px);
 topicButtonArrow: icon{{ "dialogs/dialogs_topic_arrow", historyReplyIconFg }};
 
+textMoreIconEmoji: IconEmoji {
+	icon: topicButtonArrow;
+	padding: margins(-2px, 5px, 0px, 0px);
+}
+textBackIconEmoji: IconEmoji {
+	icon: icon{{ "dialogs/dialogs_topic_arrow-flip_horizontal", historyReplyIconFg }};
+	padding: margins(0px, 5px, -2px, 0px);
+}
+
 msgBotKbIconPadding: 4px;
 msgBotKbUrlIcon: icon {{ "inline_button_url", msgBotKbIconFg }};
 msgBotKbSwitchPmIcon: icon {{ "inline_button_switch", msgBotKbIconFg }};
@@ -374,10 +429,9 @@ historyDiceToast: Toast(defaultToast) {
 historyInfoToast: Toast(defaultToast) {
 	minWidth: msgMinWidth;
 	maxWidth: 380px;
-	padding: margins(54px, 13px, 19px, 12px);
-	icon: icon {{ "toast_info", toastFg }};
-	iconPosition: point(13px, 13px);
+	padding: margins(13px, 13px, 19px, 12px);
 }
+historyInfoToastIcon: icon {{ "toast/info", toastFg }};
 
 bubbleRadiusSmall: roundRadiusLarge;
 bubbleRadiusLarge: 16px;
@@ -431,6 +485,10 @@ historyCallCameraInIcon: icon {{ "calls/call_camera_active", msgFileInBg }};
 historyCallCameraInIconSelected: icon {{ "calls/call_camera_active", msgFileInBgSelected }};
 historyCallCameraOutIcon: icon {{ "calls/call_camera_active", msgFileOutBg }};
 historyCallCameraOutIconSelected: icon {{ "calls/call_camera_active", msgFileOutBgSelected }};
+historyCallGroupInIcon: icon {{ "calls/call_group", msgFileInBg }};
+historyCallGroupInIconSelected: icon {{ "calls/call_group", msgFileInBgSelected }};
+historyCallGroupOutIcon: icon {{ "calls/call_group", msgFileOutBg }};
+historyCallGroupOutIconSelected: icon {{ "calls/call_group", msgFileOutBgSelected }};
 historyCallIconPosition: point(12px, 10px);
 historyCallLeft: 16px;
 historyCallTop: 9px;
@@ -489,6 +547,8 @@ attachPreviewThumbLayout: HistoryFileLayout {
 	thumbSize: 64px;
 	thumbSkip: 10px;
 }
+attachPreviewCaptionTopOffset: 6px;
+attachPreviewCaptionRepaintMargin: margins(0px, 2px, 0px, 2px);
 
 msgFileMinWidth: 268px;
 msgFileTopMinus: 6px;
@@ -501,6 +561,11 @@ msgWaveformSkip: 1px;
 msgWaveformMin: 3px;
 msgWaveformMax: 17px;
 
+msgVoicePlaybackMinorBlobMinRadius: 25px;
+msgVoicePlaybackMinorBlobMaxRadius: 28px;
+msgVoicePlaybackMajorBlobMinRadius: 26px;
+msgVoicePlaybackMajorBlobMaxRadius: 29px;
+
 historyVoiceMessageInTTL: icon {{ "chat/mini_media_once", historyFileInIconFg }};
 historyVoiceMessageInTTLSelected: icon {{ "chat/mini_media_once", historyFileInIconFgSelected }};
 historyVoiceMessageOutTTL: icon {{ "chat/mini_media_once", historyFileOutIconFg }};
@@ -509,6 +574,7 @@ historyVoiceMessageOutTTLSelected: icon {{ "chat/mini_media_once", historyFileOu
 historyTranscribeSkip: 10px;
 historyTranscribeSize: size(28px, 22px);
 historyTranscribeRadius: 4px;
+historyTranscribeLoadingSize: 24px;
 historyTranscribeInIcon: icon {{ "chat/voice_to_text", msgFileInBg }};
 historyTranscribeInIconSelected: icon {{ "chat/voice_to_text", msgFileInBgSelected }};
 historyTranscribeOutIcon: icon {{ "chat/voice_to_text", msgFileOutBg }};
@@ -524,11 +590,21 @@ historyTranscribeOutLockSelected: icon {{ "chat/mini_lock", msgFileOutBgSelected
 historyTranscribeLockPos: point(17px, 9px);
 historyTranscribeLockOverlayPos: point(19px, 11px);
 historyTranscribeLockOverlaySize: size(5px, 10px);
+historyTranscribeRadialAnimation: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) {
+	linearPeriod: 700;
+	sinePeriod: 2400;
+	sineDuration: 700;
+	sineShift: 1100;
+	arcMin: 0.0625;
+	arcMax: 0.35;
+}
 
 historyVideoMessageMute: icon {{ "volume_mute", historyFileThumbIconFg }};
 historyVideoMessageMuteSelected: icon {{ "volume_mute", historyFileThumbIconFgSelected }};
 historyVideoMessageMuteSize: 25px;
 historyVideoMessageProgressOpacity: 0.72;
+historyVideoMessageSeekInset: 12px;
+historyVideoMessageSeekDotSize: 13px;
 historyVideoMessageTtlIcon: icon {{ "chat/audio_once", historyFileThumbIconFg }};
 historyVideoMessageTtlIconSelected: icon {{ "chat/audio_once", historyFileThumbIconFgSelected }};
 
@@ -550,14 +626,18 @@ historyAdminLogCancelSearch: CrossButton {
 
 	duration: 150;
 	loadingPeriod: 1000;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 historyAdminLogSearchTop: 11px;
 historyAdminLogSearchSlideDuration: 150;
+historyAdminLogTopBarLeft: 17px;
+historyAdminLogTopBarUserpicSkip: 35px;
+historyAdminLogWhatIsThis: IconButton(historyAttach) {
+	icon: icon {{ "menu/faq", windowActiveTextFg }};
+	iconOver: icon {{ "menu/faq", windowActiveTextFg }};
+}
 
-historyFastShareSize: 31px;
+historyFastShareSize: topPeersSelectorUserpicSize;
 historyFastShareLeft: 13px;
 historyFastShareBottom: 5px;
 historyFastShareIcon: icon {{ "fast_share", msgServiceFg }};
@@ -565,10 +645,11 @@ historyGoToOriginalIcon: icon {{ "filled_go_to_message", msgServiceFg, point(0px
 historyFastCommentsIcon: icon {{ "fast_comments", msgServiceFg }};
 historyFastCloseSize: 30px;
 historyFastCloseIcon: icon {{ "box_button_close", msgServiceFg }};
-historyFastMoreIcon: icon {{ "title_menu_dots", msgServiceFg, point(0px, -2px)  }};
+historyFastMoreIcon: icon {{ "title_menu_dots", msgServiceFg, point(0px, -2px) }};
 historyFastTranscribeIcon: icon {{ "chat/voice_to_text", msgServiceFg }};
 historyFastTranscribeLock: icon {{ "chat/mini_lock", msgServiceFg }};
 historyFastTranscribeLockPos: point(18px, 13px);
+historyFastSummaryLockPos: point(13px, 13px);
 historyFastTranscribeLockOverlayPos: point(21px, 13px);
 historyFastTranscribeLockOverlaySize: size(6px, 10px);
 
@@ -585,6 +666,18 @@ historyGroupRadialLine: 3px;
 historyMapPoint: icon {{ "map_point", mapPointDrop }};
 historyMapPointInner: icon {{ "map_point_inner", mapPointDot }};
 
+historyMapPinRadius: 28px;
+historyMapPinUserpicSize: 52px;
+historyMapPinTailHeight: 12px;
+historyMapPinTailHalfWidth: 12px;
+historyMapPinDotRadius: 4px;
+historyMapPinDotStroke: 2px;
+historyMapPinShadow: BoxShadow {
+	blurRadius: 6px;
+	offset: point(0px, 2px);
+	opacity: 0.29;
+}
+
 historyPsaForwardPalette: TextPalette(defaultTextPalette) {
 	linkFg: boxTextFgGood;
 }
@@ -595,58 +688,13 @@ webPageSponsoredHintFont: font(10px);
 webPageDescriptionFont: normalFont;
 webPageDescriptionStyle: defaultTextStyle;
 webPagePhotoDelta: 8px;
+webPageAuctionTimerPadding: margins(8px, 4px, 8px, 4px);
+webPageAuctionTimeFont: font(11px);
+webPageAuctionPreviewPadding: margins(10px, 30px, 10px, 5px);
 
-historyPollQuestionFont: semiboldFont;
-historyPollQuestionStyle: TextStyle(defaultTextStyle) {
-	font: historyPollQuestionFont;
-}
-historyPollAnswerStyle: defaultTextStyle;
-historyPollQuestionTop: 7px;
-historyPollSubtitleSkip: 4px;
-historyPollAnswerPadding: margins(32px, 10px, 0px, 10px);
-historyPollAnswersSkip: 2px;
-historyPollPercentFont: semiboldFont;
-historyPollPercentSkip: 5px;
-historyPollPercentTop: 0px;
-historyPollTotalVotesSkip: 5px;
-historyPollFillingMin: 4px;
-historyPollFillingHeight: 4px;
-historyPollFillingRadius: 1px;
-historyPollFillingBottom: 2px;
-historyPollFillingRight: 4px;
-historyPollRadio: Radio(defaultRadio) {
-	bg: transparent;
-	untoggledFg: checkboxFg;
-	toggledFg: windowBgActive;
-	diameter: 18px;
-	thickness: 2px;
-	skip: 65px; // * 0.1
-	duration: universalDuration;
-	rippleAreaPadding: 8px;
-}
-historyPollRadioOpacity: 0.7;
-historyPollRadioOpacityOver: 1.;
-historyPollDuration: 300;
-historyPollRadialAnimation: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) {
-	thickness: 2px;
-	size: size(18px, 18px);
-}
-historyPollRippleOpacity: 0.3;
-historyPollRecentVotersSkip: 4px;
-historyPollRecentVoterSize: 18px;
-historyPollRecentVoterSkip: 13px;
-historyPollBottomButtonSkip: 15px;
-historyPollBottomButtonTop: 4px;
-historyPollChoiceRight: icon {{ "poll_choice_right", activeButtonFg }};
-historyPollChoiceWrong: icon {{ "poll_choice_wrong", activeButtonFg }};
-historyPollOutChoiceRight: icon {{ "poll_choice_right", historyFileOutIconFg }};
-historyPollOutChoiceRightSelected: icon {{ "poll_choice_right", historyFileOutIconFgSelected }};
-historyPollInChoiceRight: icon {{ "poll_choice_right", historyFileInIconFg }};
-historyPollInChoiceRightSelected: icon {{ "poll_choice_right", historyFileInIconFgSelected }};
-historyPollOutChosen: icon {{ "poll_select_check", historyFileOutIconFg }};
-historyPollOutChosenSelected: icon {{ "poll_select_check", historyFileOutIconFgSelected }};
-historyPollInChosen: icon {{ "poll_select_check", historyFileInIconFg }};
-historyPollInChosenSelected: icon {{ "poll_select_check", historyFileInIconFgSelected }};
+historyChecklistTaskPadding: margins(32px, 12px, 0px, 12px);
+historyChecklistCheckedTop: 4px;
+historyChecklistBottomTop: -4px;
 
 historyViewButtonHeight: 48px;
 historyViewButtonMargins: margins(10px, 5px, 10px, 10px);
@@ -687,6 +735,7 @@ historyVideoCancelSelected: icon {{ "player/playlist_cancel", historyFileThumbIc
 historyVideoDownload: icon {{ "player/playlist_download", historyFileThumbIconFg }};
 historyVideoDownloadSelected: icon {{ "player/playlist_download", historyFileThumbIconFgSelected }};
 historyVideoRadialLine: msgFileRadialLine;
+historyVideoTimestampProgressLine: 4px;
 
 historyAudioDownloadSize: 20px;
 historyAudioRadialLine: 2px;
@@ -781,6 +830,8 @@ popupMenuExpandedSeparator: PopupMenu(popupMenuWithIcons) {
 	}
 }
 
+menuTimecodeFont: font(7px semibold);
+
 whoReadMenu: PopupMenu(popupMenuExpandedSeparator) {
 	scrollPadding: margins(0px, 6px, 0px, 4px);
 	maxHeight: 400px;
@@ -809,6 +860,10 @@ whoReadPlayedDisabled: icon {{ "menu/read_audio", menuFgDisabled }};
 whoReadReactions: icon{{ "menu/read_reactions", windowBoldFg }};
 whoReadReactionsOver: icon{{ "menu/read_reactions", windowBoldFg }};
 whoReadReactionsDisabled: icon{{ "menu/read_reactions", menuFgDisabled }};
+whenEdited: icon {{ "menu/edited_status", windowBoldFg }};
+whenEditedOver: icon {{ "menu/edited_status", windowBoldFg }};
+whenOriginal: icon {{ "menu/forwarded_status", windowBoldFg }};
+whenOriginalOver: icon {{ "menu/forwarded_status", windowBoldFg }};
 
 reactionsTabAll: icon {{ "menu/read_reactions", windowFg }};
 reactionsTabAllSelected: icon {{ "menu/read_reactions", activeButtonFg }};
@@ -821,31 +876,6 @@ reactionsTabs: MultiSelect(defaultMultiSelect) {
 }
 reactionsTabIconSkip: 3px;
 
-SendAsButton {
-	width: pixels;
-	height: pixels;
-	size: pixels;
-	activeBg: color;
-	activeFg: color;
-	cross: CrossAnimation;
-	duration: int;
-}
-
-sendAsButton: SendAsButton {
-	width: 44px;
-	height: 46px;
-	size: 28px;
-	activeBg: activeButtonBg;
-	activeFg: activeButtonFg;
-	cross: CrossAnimation {
-		size: 28px;
-		skip: 10px;
-		stroke: 1.5;
-		minScale: 0.3;
-	}
-	duration: 150;
-}
-
 reactionInlinePadding: margins(5px, 2px, 7px, 2px);
 reactionInlineSize: 18px;
 reactionInlineImage: 32px;
@@ -856,6 +886,7 @@ reactionInlineTagRightRadius: 3px;
 reactionInlineTagArrow: 5px;
 reactionInlineTagDot: 5px;
 reactionInlineTagDotSkip: 2px;
+reactionInlineEmptySkip: 2px;
 reactionInlineTagFont: font(12px);
 reactionInlineTagNamePosition: point(26px, 2px);
 reactionInlineTagPromoPosition: point(20px, 2px);
@@ -870,9 +901,7 @@ reactionInlineUserpics: GroupCallUserpics {
 }
 
 reactionInfoSize: 15px;
-reactionInfoImage: 30px;
 reactionInfoSkip: 3px;
-reactionInfoDigitSkip: 6px;
 reactionInfoBetween: 3px;
 
 reactionCornerSize: size(36px, 32px);
@@ -892,6 +921,11 @@ reactionMainAppearShift: 20px;
 reactionCollapseFadeThreshold: 40px;
 reactionFlyUp: 50px;
 
+replyCornerHeight: 20px;
+replyCornerShadow: margins(4px, 8px, 4px, 8px);
+replyCornerCenter: point(7px, -2px);
+replyCornerTextPadding: margins(6px, 0px, 6px, 0px);
+
 effectInfoImage: 12px;
 
 searchInChatMultiSelectItem: MultiSelectItem(defaultMultiSelectItem) {
@@ -908,15 +942,23 @@ searchInChatPeerList: PeerList(defaultPeerList) {
 }
 searchInChatTagsPadding: margins(6px, 0px, 6px, 0px);
 
+msgServiceGiftPreview: 172px;
 msgServiceGiftBoxSize: size(236px, 231px); // Plus msgServiceGiftBoxTopSkip.
 msgServiceGiftBoxRadius: 20px;
 msgServiceGiftBoxTopSkip: 4px;
-msgServiceGiftBoxButtonHeight: 32px;
-msgServiceGiftBoxButtonPadding: margins(2px, 0px, 2px, 0px);
-msgServiceGiftBoxButtonMargins: margins(0px, 13px, 0px, 17px);
-msgServiceGiftBoxTitlePadding: margins(0px, 5px, 0px, 2px);
+msgServiceGiftBoxButtonHeight: 30px;
+msgServiceGiftBoxButtonPadding: margins(1px, 0px, 1px, 0px);
+msgServiceGiftBoxButtonMargins: margins(0px, 10px, 0px, 20px);
+msgServiceGiftBoxTitlePadding: margins(0px, 24px, 0px, 7px);
+msgServiceGiftBoxBadgeFont: font(11px semibold);
+msgServiceGiftBoxBadgePadding: margins(3px, 2px, 3px, 2px);
 msgServiceGiftBoxStickerTop: -19px;
 msgServiceGiftBoxStickerSize: 140px;
+msgServiceStarGiftBoxWidth: 224px;
+msgServiceStarGiftStickerTop: 24px;
+msgServiceStarGiftStickerSize: 100px;
+msgServiceGiftThemeStickerSize: 64px;
+msgServiceGiftThemeStickerPadding: margins(18px, 18px, 18px, 18px);
 
 historySponsorInfoItem: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(defaultTextStyle) {
@@ -925,6 +967,9 @@ historySponsorInfoItem: FlatLabel(defaultFlatLabel) {
 	minWidth: 136px;
 	maxHeight: 120px;
 }
+historySponsorInfoItemDark: FlatLabel(historySponsorInfoItem) {
+	textFg: mediaviewControlFg;
+}
 historyHasCustomEmoji: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(defaultTextStyle) {
 		font: font(11px);
@@ -932,6 +977,7 @@ historyHasCustomEmoji: FlatLabel(defaultFlatLabel) {
 	minWidth: 80px;
 }
 historyHasCustomEmojiPosition: point(12px, 4px);
+historyBankCardMenuMultilinePosition: point(18px, 4px);
 
 historyTranslateLabel: FlatLabel(defaultFlatLabel) {
 	style: semiboldTextStyle;
@@ -952,6 +998,32 @@ historyTranslateSettings: IconButton(defaultIconButton) {
 	}
 }
 historyTranslateMenuPosition: point(-6px, 30px);
+historyTranslateCocoonLabel: FlatLabel(historyHasCustomEmoji) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+	margin: margins(4px, 8px, 4px, 8px);
+}
+
+cocoonLogoTop: 32px;
+cocoonLogoSize: 96px;
+cocoonTitleFont: font(36px semibold);
+cocoonTitleTop: 12px;
+cocoonSubtitle: FlatLabel(defaultFlatLabel) {
+	minWidth: 120px;
+	align: align(top);
+}
+cocoonSubtitleTop: 8px;
+cocoonSubtitleBottom: 16px;
+cocoonJoinSeparatorPadding: margins(24px, 4px, 24px, 12px);
+cocoonJoinLabel: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+	textFg: windowSubTextFg;
+	minWidth: 120px;
+	align: align(top);
+}
 
 historySponsoredAboutMenuLabelPosition: point(54px, 4px);
 
@@ -976,9 +1048,7 @@ backgroundSwitchToDark: IconButton(defaultIconButton) {
 
 	rippleAreaPosition: point(4px, 4px);
 	rippleAreaSize: 40px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 backgroundSwitchToLight: IconButton(backgroundSwitchToDark) {
 	icon: icon {{ "menu/header_mode_day", boxTitleCloseFg }};
@@ -993,11 +1063,10 @@ storyMentionReadStrokeTwice: 3px;
 storyMentionButtonSkip: 5px;
 
 chatGiveawayWidth: 292px;
-chatGiveawayStickerTop: -16px;
 chatGiveawayStickerPadding: margins(14px, -2px, 14px, 14px);
 chatGiveawayWinnersTopSkip: 25px;
 chatGiveawayBadgeFont: font(12px bold);
-chatGiveawayBadgeTop: 106px;
+chatGiveawayBadgeTop: 118px;
 chatGiveawayBadgePadding: margins(7px, 1px, 5px, 3px);
 chatGiveawayBadgeStroke: 2px;
 chatGiveawayPrizesTitleMargin: margins(11px, 16px, 11px, 4px);
@@ -1013,7 +1082,6 @@ chatGiveawayPeerPadding: margins(5px, 7px, 12px, 0px);
 chatGiveawayPeerSkip: 8px;
 chatGiveawayCreditsIconHeight: 19px;
 
-chatSimilarRadius: 12px;
 chatSimilarArrowSize: 6px;
 chatSimilarTitle: semiboldFont;
 chatSimilarTitlePosition: point(15px, 9px);
@@ -1035,9 +1103,32 @@ chatSimilarName: TextStyle(defaultTextStyle) {
 chatSimilarWidthMax: 424px;
 chatSimilarSkip: 12px;
 
+chatSuggestWidth: 236px;
+chatSuggestInfoWidth: 272px;
+chatSuggestInfoTitleMargin: margins(16px, 16px, 16px, 6px);
+chatSuggestInfoMiddleMargin: margins(16px, 4px, 16px, 4px);
+chatSuggestInfoLastMargin: margins(16px, 4px, 16px, 16px);
+chatSuggestBulletLeftExtra: 16px;
+chatSuggestTableMiddleMargin: margins(8px, 4px, 8px, 4px);
+chatSuggestTableLastMargin: margins(8px, 4px, 8px, 16px);
+chatSuggestInfoFullMargin: margins(16px, 16px, 16px, 16px);
+chatSuggestAcceptIcon: IconEmoji {
+	icon: icon{{ "chat/paid_approve", windowFg }};
+	padding: margins(0px, -2px, 0px, 0px);
+}
+chatSuggestDeclineIcon: IconEmoji {
+	icon: icon{{ "chat/paid_decline", windowFg }};
+	padding: margins(0px, -2px, 0px, 0px);
+}
+chatSuggestChangeIcon: IconEmoji {
+	icon: icon{{ "chat/paid_edit", windowFg }};
+	padding: margins(0px, -2px, 0px, 0px);
+}
+
 premiumRequiredWidth: 186px;
 premiumRequiredIcon: icon{{ "chat/large_lockedchat", msgServiceFg }};
-premiumRequiredCircle: 60px;
+directMessagesIcon: icon{{ "chat/large_messages", msgServiceFg }};
+starsPerMessageWidth: 226px;
 
 repliesEmptyIcon: icon{{ "chat/large_quickreply", msgServiceFg }};
 greetingEmptyIcon: icon{{ "chat/large_greeting", msgServiceFg }};
@@ -1049,19 +1140,25 @@ repliesComposeControls: ComposeControls(defaultComposeControls) {
 	tabbedHeightMin: 220px;
 }
 
-boostMessageIcon: icon {{ "stories/boost_mini", windowFg }};
-boostMessageIconPadding: margins(0px, 2px, 0px, 0px);
-boostsMessageIcon: icon {{ "stories/boosts_mini", windowFg }};
-boostsMessageIconPadding: margins(0px, 2px, 0px, 0px);
-
-historyIvIcon: icon{{ "boosts/boost_mini2", windowFg }};
-historyIvIconPadding: margins(2px, 2px, 2px, 0px);
+boostMessageIcon: IconEmoji {
+	icon: icon {{ "stories/boost_mini", windowFg }};
+	padding: margins(0px, 2px, 0px, 0px);
+}
+boostsMessageIcon: IconEmoji {
+	icon: icon {{ "stories/boosts_mini", windowFg }};
+	padding: margins(0px, 2px, 0px, 0px);
+}
+historyIvIcon: IconEmoji {
+	icon: icon {{ "boosts/boost_mini2", windowFg }};
+	padding: margins(2px, 2px, 2px, 0px);
+}
 
 chatIntroStickerSize: 96px;
 chatIntroWidth: 224px;
 chatIntroTitleMargin: margins(11px, 16px, 11px, 4px);
 chatIntroMargin: margins(11px, 0px, 11px, 0px);
 chatIntroStickerPadding: margins(10px, 8px, 10px, 16px);
+chatGiftPreviewWidth: 224px;
 
 liveLocationLongInIcon: icon {{ "chat/live_location_long", msgInServiceFg }};
 liveLocationLongInIconSelected: icon {{ "chat/live_location_long", msgInServiceFgSelected }};
@@ -1077,10 +1174,6 @@ previewMenu: PopupMenu(defaultPopupMenu) {
 	}
 	maxHeight: 420px;
 	radius: boxRadius;
-	shadow: boxRoundShadow;
-	animation: PanelAnimation(defaultPanelAnimation) {
-		shadow: boxRoundShadow;
-	}
 }
 previewTop: PeerListItem(defaultPeerListItem) {
 	height: 52px;
@@ -1154,3 +1247,299 @@ purchasedTagPadding: margins(3px, 2px, 6px, 2px);
 msgSelectionCheck: RoundCheckbox(defaultPeerListCheck) {
 	bgActive: boxTextFgGood;
 }
+
+sponsoredMessageBarMaxHeight: 156px;
+
+botEmojiStatusPreviewHeight: 148px;
+botEmojiStatusTitle: FlatLabel(boxTitle) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(16px semibold);
+		lineHeight: 20px;
+	}
+	minWidth: 256px;
+	maxHeight: 0px;
+	align: align(top);
+}
+botEmojiStatusText: FlatLabel(defaultFlatLabel) {
+	style: boxTextStyle;
+	minWidth: 256px;
+	maxHeight: 0px;
+	align: align(top);
+}
+botEmojiStatusUserpic: UserpicButton(defaultUserpicButton) {
+	size: size(chatGiveawayPeerSize, chatGiveawayPeerSize);
+	photoSize: chatGiveawayPeerSize;
+}
+botEmojiStatusName: FlatLabel(defaultFlatLabel) {
+	minWidth: 32px;
+	maxHeight: 20px;
+}
+botEmojiStatusEmoji: FlatLabel(botEmojiStatusName) {
+	margin: margins(4px, 4px, 4px, 4px);
+	textFg: profileVerifiedCheckBg;
+}
+
+botDownloadLabel: boxLabel;
+botDownloadProgress: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	style: TextStyle(defaultTextStyle) {
+		font: ttlItemTimerFont;
+	}
+}
+botDownloadCancel: IconButton {
+	width: 20px;
+	height: 20px;
+
+	icon: smallCloseIcon;
+	iconOver: smallCloseIconOver;
+	iconPosition: point(-1px, -1px);
+
+	rippleAreaPosition: point(0px, 0px);
+	rippleAreaSize: 20px;
+	ripple: defaultRippleAnimationBgOver;
+}
+chatUniqueGiftBorder: 4px;
+chatUniqueGiftBadgePadding: margins(12px, 0px, 12px, 2px);
+
+chatUniqueStickerPadding: margins(10px, 40px, 10px, 9px);
+chatUniquePreviewPadding: margins(10px, 30px, 10px, 32px);
+chatUniqueTitle: TextStyle(defaultTextStyle) {
+	font: font(15px semibold);
+}
+chatUniqueTitlePadding: margins(12px, 8px, 12px, 0px);
+chatUniqueTextPadding: margins(12px, 2px, 12px, 7px);
+chatUniqueTextStyle: TextStyle(defaultTextStyle) {
+	font: font(12px);
+}
+chatUniqueAuthorSkip: 6px;
+chatUniqueTableSkip: 9px;
+chatUniqueRowSkip: 2px;
+chatUniqueButtonPadding: margins(12px, 5px, 12px, 26px);
+
+markupWebview: icon {{ "chat/markup_webview", windowFg }};
+
+newPeerTitleMargin: margins(11px, 16px, 11px, 6px);
+newPeerSubtitleMargin: margins(11px, 0px, 11px, 16px);
+newPeerNonOfficial: IconEmoji {
+	icon: icon{{ "chat/mini_info_alert", windowFg }};
+	padding: margins(0px, 2px, 0px, 0px);
+}
+newPeerUserpics: GroupCallUserpics {
+	size: 16px;
+	shift: 5px;
+	stroke: 1px;
+	align: align(left);
+}
+newPeerUserpicsPadding: margins(0px, 3px, 0px, 0px);
+newPeerWidth: 320px;
+
+swipeBackSize: 150px;
+
+chatTabsToggle: IconButton(defaultIconButton) {
+	width: 64px;
+	height: 36px;
+	icon: icon {{ "top_bar_profile-flip_horizontal", menuIconFg }};
+	iconOver: icon {{ "top_bar_profile-flip_horizontal", menuIconFgOver }};
+	ripple: emptyRippleAnimation;
+}
+chatTabsToggleIconTop: icon {{ "chat/menu_sidebar2-24x24", menuIconFg }};
+chatTabsToggleIconTopOver: icon {{ "chat/menu_sidebar2-24x24", menuIconFgOver }};
+chatTabsToggleIconLeft: icon {{ "chat/menu_sidebar3-24x24", menuIconFg }};
+chatTabsToggleIconLeftOver: icon {{ "chat/menu_sidebar3-24x24", menuIconFgOver }};
+chatTabsToggleIconBottom: icon {{ "chat/menu_sidebar1-24x24", menuIconFg }};
+chatTabsToggleIconBottomOver: icon {{ "chat/menu_sidebar1-24x24", menuIconFgOver }};
+chatTabsScroll: ScrollArea(defaultScrollArea) {
+	barHidden: true;
+}
+chatTabsSlider: SettingsSlider(defaultSettingsSlider) {
+	padding: 0px;
+	height: 36px;
+	barTop: 33px;
+	barSkip: 0px;
+	barStroke: 6px;
+	barRadius: 2px;
+	barFg: transparent;
+	barSnapToLabel: true;
+	strictSkip: 18px;
+	labelTop: 9px;
+	labelStyle: semiboldTextStyle;
+	labelFg: windowSubTextFg;
+	labelFgActive: lightButtonFg;
+	rippleBottomSkip: 1px;
+	rippleBg: windowBgOver;
+	rippleBgActive: lightButtonBgOver;
+	ripple: defaultRippleAnimation;
+}
+
+ChatTabsOutline {
+	radius: pixels;
+	stroke: pixels;
+	fg: color;
+	skip: pixels;
+}
+
+ChatTabsVertical {
+	barStroke: pixels;
+	barRadius: pixels;
+	barFg: color;
+	nameStyle: TextStyle;
+	nameWidth: pixels;
+	nameTop: pixels;
+	nameFg: color;
+	nameFgActive: color;
+	userpicTop: pixels;
+	userpicSize: pixels;
+	baseHeight: pixels;
+	width: pixels;
+	ripple: RippleAnimation;
+	rippleBg: color;
+	rippleBgActive: color;
+	duration: int;
+}
+
+chatTabsVertical: ChatTabsVertical {
+	barStroke: 8px;
+	barRadius: 4px;
+	barFg: sliderBgActive;
+	nameStyle: TextStyle(defaultTextStyle) {
+		font: font(10px);
+	}
+	nameWidth: 54px;
+	nameTop: 42px;
+	nameFg: windowSubTextFg;
+	nameFgActive: lightButtonFg;
+	userpicTop: 8px;
+	userpicSize: 28px;
+	baseHeight: 50px;
+	width: 64px;
+	ripple: defaultRippleAnimation;
+	rippleBg: windowBgOver;
+	rippleBgActive: lightButtonBgOver;
+	duration: 150;
+}
+
+chatTabsOutlineHorizontal: ChatTabsOutline {
+	stroke: 8px;
+	radius: 4px;
+	fg: sliderBgActive;
+	skip: 8px;
+}
+
+chatTabsOutlineVertical: ChatTabsOutline(chatTabsOutlineHorizontal) {
+}
+
+messageSendingAnimationTextFromOffset: point(-6px, 9px);
+
+suggestPriceBox: Box(defaultBox) {
+	buttonPadding: margins(22px, 22px, 22px, 22px);
+	buttonHeight: 42px;
+	button: RoundButton(defaultActiveButton) {
+		height: 42px;
+		textTop: 12px;
+		style: semiboldTextStyle;
+	}
+	shadowIgnoreTopSkip: true;
+}
+suggestPriceEstimate: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+}
+suggestPriceEstimateTop: 12px;
+starsFieldIconPosition: point(0px, 10px);
+tonFieldIconSize: 16px;
+tonFieldIconPosition: point(2px, 11px);
+
+suggestBarTonIconSize: 14px;
+suggestBarTonIconMargins: margins(0px, 3px, 0px, 0px);
+
+lowTonIconPadding: margins(12px, 20px, 12px, 0px);
+lowTonTitlePadding: margins(0px, 12px, 0px, 12px);
+lowTonTextPadding: margins(0px, 0px, 0px, 8px);
+lowTonText: FlatLabel(defaultFlatLabel) {
+	minWidth: 100px;
+	align: align(top);
+}
+
+groupMembersWidgetList: PeerList(defaultPeerList) {
+	item: PeerListItem(defaultPeerListItem) {
+		photoPosition: point(12px, 6px);
+		namePosition: point(68px, 11px);
+		statusPosition: point(68px, 31px);
+		checkbox: RoundImageCheckbox(defaultPeerListCheckbox) {
+			selectExtendTwice: 1px;
+			imageRadius: 21px;
+			imageSmallRadius: 19px;
+			check: RoundCheckbox(defaultPeerListCheck) {
+				size: 0px;
+			}
+		}
+		nameFgChecked: contactsNameFg;
+	}
+}
+
+saveMusicInfoMenu: Menu(defaultMenu) {
+	itemBgOver: windowBg;
+	itemFgOver: windowFg;
+	itemPadding: margins(17px, 4px, 17px, 3px);
+}
+
+newBotThreadDown: icon {{ "history_down_arrow", msgServiceFg }};
+newBotThreadTopSkip: 24px;
+
+birthdaySuggestStickerWidth: 236px;
+birthdaySuggestStickerSize: 96px;
+birthdaySuggestStickerPadding: margins(10px, 16px, 10px, 4px);
+birthdaySuggestTextPadding: margins(10px, 4px, 10px, 8px);
+birthdaySuggestTablePadding: margins(2px, 4px, 2px, 12px);
+birthdaySuggestTableLastPadding: margins(2px, 4px, 2px, 24px);
+birthdaySuggestTableSkip: 2px;
+
+messageGiftIconSkip: 30px;
+
+newChatIcon: icon{{ "chat/new_topic", windowFgActive }};
+newChatIconPadding: margins(2px, 2px, 2px, 2px);
+
+newThreadAboutMaxWidth: 180px;
+newThreadAboutIconSkip: chatIntroTitleMargin.top;
+newThreadAboutIconOuter: 60px;
+newThreadAboutIcon: icon{{ "chat/new_thread-40x40", windowFgActive }};
+
+managedBotCodeIcon: icon{{ "chat/code_tags", windowFg }};
+managedBotImageWidth: 280px;
+managedBotImageHeight: 140px;
+
+stakeBox: Box(defaultBox) {
+	buttonPadding: margins(24px, 12px, 24px, 24px);
+	buttonHeight: 42px;
+	buttonWide: true;
+	button: RoundButton(defaultActiveButton) {
+		height: 42px;
+		textTop: 12px;
+		style: semiboldTextStyle;
+	}
+	shadowIgnoreTopSkip: true;
+}
+stakeEmojiSize: 20px;
+stakeEmojiTop: 8px;
+stakeEmojiIcon: IconEmoji {
+	icon: icon{{ "chat/mini_roll-18x18", activeButtonFg }};
+	padding: margins(1px, 2px, 1px, 0px);
+}
+stakeIconEmojiSize: 12px;
+stakeIconEmojiTop: 3px;
+stakePresetButton: RoundButton(defaultLightButton) {
+	textBg: lightButtonBgOver;
+}
+stakePresetButtonSkip: point(8px, 8px);
+stakeChangeBadge: RoundButton(defaultTableSmallButton) {
+	textFg: mediaviewTextLinkFg;
+	textFgOver: mediaviewTextLinkFg;
+}
+stateChangeBadgeMargin: margins(0px, 1px, 0px, 0px);
+
+historySummaryHeaderIconSize: 30px;
+historySummaryHeaderIconSizeInner: 5px;
+
+toastCheckIcon: icon {{ "toast/check-36x36", toastFg }};
+
+historySummaryStars: icon {{ "chat/summary_stars-24x24", msgServiceFg }};
+historySummaryArrows: icon {{ "chat/summary_arrows-24x24", msgServiceFg }};
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.cpp b/Telegram/SourceFiles/ui/chat/chat_style.cpp
index a18889258ef2cc..2d20ec0700c688 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_style.cpp
@@ -15,6 +15,7 @@ For license and copyright information please follow this link:
 #include "ui/ui_utility.h"
 #include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
+#include "styles/style_polls.h"
 #include "styles/style_widgets.h"
 
 namespace Ui {
@@ -76,11 +77,15 @@ not_null<const MessageImageStyle*> ChatPaintContext::imageStyle() const {
 }
 
 not_null<Text::QuotePaintCache*> ChatPaintContext::quoteCache(
+		const std::shared_ptr<ColorCollectible> &colorCollectible,
 		uint8 colorIndex) const {
-	return !outbg
-		? st->coloredQuoteCache(selected(), colorIndex).get()
-		: messageStyle()->quoteCache[
-			st->colorPatternIndex(colorIndex)].get();
+	return outbg
+		? messageStyle()->quoteCache[colorCollectible
+			? 2
+			: st->colorPatternIndex(colorIndex)].get()
+		: colorCollectible
+		? st->collectibleQuoteCache(selected(), colorCollectible).get()
+		: st->coloredQuoteCache(selected(), colorIndex).get();
 }
 
 int HistoryServiceMsgRadius() {
@@ -132,6 +137,24 @@ ColorIndexValues SimpleColorIndexValues(QColor color, int patternIndex) {
 	return result;
 }
 
+std::vector<Text::SpecialColor> SyntaxHighlightColors(
+		not_null<const style::palette*> palette) {
+	auto result = std::vector<Text::SpecialColor>();
+	result.reserve(8);
+	const auto push = [&](const style::color &color) {
+		result.push_back({ &color->p, &color->p });
+	};
+	push(palette->statisticsChartLineLightblue());
+	push(palette->statisticsChartLineRed());
+	push(palette->statisticsChartLineRed());
+	push(palette->statisticsChartLineOrange());
+	push(palette->statisticsChartLineRed());
+	push(palette->statisticsChartLineBlue());
+	push(palette->statisticsChartLinePurple());
+	push(palette->statisticsChartLineGreen());
+	return result;
+}
+
 int BackgroundEmojiData::CacheIndex(
 		bool selected,
 		bool outbg,
@@ -158,11 +181,32 @@ int ColorPatternIndex(
 	return colors[2] ? 2 : colors[1] ? 1 : 0;
 }
 
+ChatStyle::ColoredPalette::ColoredPalette() = default;
+ChatStyle::ColoredPalette::ColoredPalette(const ColoredPalette &other)
+: linkFg(other.linkFg)
+, data(other.data) {
+	if (linkFg) {
+		data.linkFg = linkFg->color();
+		data.selectLinkFg = data.linkFg;
+	}
+}
+
+ChatStyle::ColoredPalette &ChatStyle::ColoredPalette::operator=(
+		const ColoredPalette &other) {
+	linkFg = other.linkFg;
+	data = other.data;
+	if (linkFg) {
+		data.linkFg = linkFg->color();
+		data.selectLinkFg = data.linkFg;
+	}
+	return *this;
+}
+
 ChatStyle::ChatStyle(rpl::producer<ColorIndicesCompressed> colorIndices) {
 	if (colorIndices) {
 		_colorIndicesLifetime = std::move(
 			colorIndices
-		) | rpl::start_with_next([=](ColorIndicesCompressed &&indices) {
+		) | rpl::on_next([=](ColorIndicesCompressed &&indices) {
 			_colorIndices = std::move(indices);
 		});
 	}
@@ -179,6 +223,7 @@ ChatStyle::ChatStyle(rpl::producer<ColorIndicesCompressed> colorIndices) {
 		_historyViewsSendingInvertedIcon,
 		st::historyViewsSendingInvertedIcon);
 	make(_historyPinInvertedIcon, st::historyPinInvertedIcon);
+	make(_historySilentInvertedIcon, st::historySilentInvertedIcon);
 	make(_historySendingIcon, st::historySendingIcon);
 	make(_historySendingInvertedIcon, st::historySendingInvertedIcon);
 	make(_historySentInvertedIcon, st::historySentInvertedIcon);
@@ -303,6 +348,12 @@ ChatStyle::ChatStyle(rpl::producer<ColorIndicesCompressed> colorIndices) {
 		st::inReplyTextPaletteSelected,
 		st::outReplyTextPalette,
 		st::outReplyTextPaletteSelected);
+	make(
+		&MessageStyle::richPageStyle,
+		st::messageMarkdown,
+		st::messageMarkdownSelected,
+		st::messageMarkdownOut,
+		st::messageMarkdownOutSelected);
 	make(
 		&MessageStyle::tailLeft,
 		st::historyBubbleTailInLeft,
@@ -333,6 +384,12 @@ ChatStyle::ChatStyle(rpl::producer<ColorIndicesCompressed> colorIndices) {
 		st::historyPinInSelectedIcon,
 		st::historyPinOutIcon,
 		st::historyPinOutSelectedIcon);
+	make(
+		&MessageStyle::historySilentIcon,
+		st::historySilentInIcon,
+		st::historySilentInSelectedIcon,
+		st::historySilentOutIcon,
+		st::historySilentOutSelectedIcon);
 	make(
 		&MessageStyle::historySentIcon,
 		st::historySentIcon,
@@ -387,6 +444,12 @@ ChatStyle::ChatStyle(rpl::producer<ColorIndicesCompressed> colorIndices) {
 		st::historyCallCameraInIconSelected,
 		st::historyCallCameraOutIcon,
 		st::historyCallCameraOutIconSelected);
+	make(
+		&MessageStyle::historyCallGroupIcon,
+		st::historyCallGroupInIcon,
+		st::historyCallGroupInIconSelected,
+		st::historyCallGroupOutIcon,
+		st::historyCallGroupOutIconSelected);
 	make(
 		&MessageStyle::historyFilePlay,
 		st::historyFileInPlay,
@@ -570,7 +633,11 @@ void ChatStyle::updateDarkValue() {
 	const auto withBg = [&](const QColor &color) {
 		return CountContrast(windowBg()->c, color);
 	};
-	_dark = (withBg({ 0, 0, 0 }) < withBg({ 255, 255, 255 }));
+	const auto dark = (withBg({ 0, 0, 0 }) < withBg({ 255, 255, 255 }));
+	if (_dark != dark) {
+		_dark = dark;
+		_collectibleCaches.clear();
+	}
 }
 
 void ChatStyle::applyCustomPalette(const style::palette *palette) {
@@ -579,7 +646,7 @@ void ChatStyle::applyCustomPalette(const style::palette *palette) {
 		_defaultPaletteChangeLifetime.destroy();
 	} else {
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			assignPalette(style::main_palette::get());
 		}, _defaultPaletteChangeLifetime);
 	}
@@ -593,35 +660,7 @@ void ChatStyle::applyAdjustedServiceBg(QColor serviceBg) {
 
 std::span<Text::SpecialColor> ChatStyle::highlightColors() const {
 	if (_highlightColors.empty()) {
-		const auto push = [&](const style::color &color) {
-			_highlightColors.push_back({ &color->p, &color->p });
-		};
-
-		// comment, block-comment, prolog, doctype, cdata
-		push(statisticsChartLineLightblue());
-
-		// punctuation
-		push(statisticsChartLineRed());
-
-		// property, tag, boolean, number,
-		// constant, symbol, deleted
-		push(statisticsChartLineRed());
-
-		// selector, attr-name, string, char, builtin, inserted
-		push(statisticsChartLineOrange());
-
-		// operator, entity, url
-		push(statisticsChartLineRed());
-
-		// atrule, attr-value, keyword, function
-		push(statisticsChartLineBlue());
-
-		// class-name
-		push(statisticsChartLinePurple());
-
-		//push(statisticsChartLineLightgreen());
-		//push(statisticsChartLineGreen());
-		//push(statisticsChartLineGolden());
+		_highlightColors = SyntaxHighlightColors(this);
 	}
 	return _highlightColors;
 }
@@ -661,6 +700,9 @@ void ChatStyle::assignPalette(not_null<const style::palette*> palette) {
 		style.textPalette.linkAlwaysActive
 			= style.semiboldPalette.linkAlwaysActive
 			= (style.textPalette.linkFg->c == style.historyTextFg->c);
+		style.richPageStyle.textPalette.linkAlwaysActive
+			= (style.richPageStyle.textPalette.linkFg->c
+				== style.richPageStyle.textColor->c);
 	}
 	for (auto &style : _imageStyles) {
 		style.msgDateImgBgCorners = {};
@@ -677,6 +719,7 @@ void ChatStyle::assignPalette(not_null<const style::palette*> palette) {
 		corners = {};
 	}
 	updateDarkValue();
+	++_paletteVersion;
 
 	_paletteChanged.fire({});
 }
@@ -771,6 +814,14 @@ int ChatStyle::colorPatternIndex(uint8 colorIndex) const {
 	return colors[2] ? 2 : colors[1] ? 1 : 0;
 }
 
+int ChatStyle::collectiblePatternIndex(
+		const std::shared_ptr<ColorCollectible> &collectible) const {
+	const auto &strip = (_dark && !collectible->darkStrip.empty())
+		? collectible->darkStrip
+		: collectible->strip;
+	return std::clamp(int(strip.size()), 1, 3) - 1;
+}
+
 ColorIndexValues ChatStyle::computeColorIndexValues(
 		bool selected,
 		uint8 colorIndex) const {
@@ -818,9 +869,7 @@ ColorIndexValues ChatStyle::computeColorIndexValues(
 	}
 	const auto color = [&](int index) {
 		const auto v = colors[index];
-		return v
-			? QColor((v >> 16) & 0xFF, (v >> 8) & 0xFF, v & 0xFF)
-			: QColor(0, 0, 0, 0);
+		return v ? Ui::ColorFromSerialized(v) : QColor(0, 0, 0, 0);
 	};
 	auto result = ColorIndexValues{
 		.outlines = { color(0), color(1), color(2) }
@@ -864,6 +913,13 @@ const ColorIndexValues &ChatStyle::coloredValues(
 	return *result;
 }
 
+QColor ChatStyle::collectibleNameColor(
+		const std::shared_ptr<ColorCollectible> &collectible) const {
+	return (_dark && collectible->darkAccentColor.alpha() > 0)
+		? collectible->darkAccentColor
+		: collectible->accentColor;
+}
+
 const style::TextPalette &ChatStyle::coloredTextPalette(
 		bool selected,
 		uint8 colorIndex) const {
@@ -884,8 +940,28 @@ const style::TextPalette &ChatStyle::coloredTextPalette(
 	return result.data;
 }
 
+const style::TextPalette &ChatStyle::collectibleTextPalette(
+		bool selected,
+		const std::shared_ptr<ColorCollectible> &collectible) const {
+	auto &entry = resolveCollectibleCaches(collectible);
+	auto &result = selected ? entry.paletteSelected : entry.palette;
+	if (!result.linkFg) {
+		result.linkFg.emplace(collectibleNameColor(collectible));
+		make(
+			result.data,
+			(selected
+				? st::inReplyTextPaletteSelected
+				: st::inReplyTextPalette));
+		result.data.linkFg = result.linkFg->color();
+		result.data.selectLinkFg = result.data.linkFg;
+	}
+	return result.data;
+}
+
 not_null<BackgroundEmojiData*> ChatStyle::backgroundEmojiData(
-		uint64 id) const {
+		uint64 emojiId,
+		const std::shared_ptr<ColorCollectible> &collectible) const {
+	const auto id = collectible ? collectible->collectibleId : emojiId;
 	return &_backgroundEmojis[id];
 }
 
@@ -901,6 +977,24 @@ not_null<Text::QuotePaintCache*> ChatStyle::coloredReplyCache(
 	return coloredCache(_coloredReplyCaches, selected, colorIndex);
 }
 
+not_null<Text::QuotePaintCache*> ChatStyle::collectibleQuoteCache(
+		bool selected,
+		const std::shared_ptr<ColorCollectible> &collectible) const {
+	auto &entry = resolveCollectibleCaches(collectible);
+	return collectibleCache(
+		selected ? entry.quoteSelected : entry.quote,
+		collectible);
+}
+
+not_null<Text::QuotePaintCache*> ChatStyle::collectibleReplyCache(
+		bool selected,
+		const std::shared_ptr<ColorCollectible> &collectible) const {
+	auto &entry = resolveCollectibleCaches(collectible);
+	return collectibleCache(
+		selected ? entry.replySelected : entry.reply,
+		collectible);
+}
+
 not_null<Text::QuotePaintCache*> ChatStyle::coloredCache(
 		ColoredQuotePaintCaches &caches,
 		bool selected,
@@ -915,6 +1009,46 @@ not_null<Text::QuotePaintCache*> ChatStyle::coloredCache(
 	return cache.get();
 }
 
+not_null<Text::QuotePaintCache*> ChatStyle::collectibleCache(
+		std::unique_ptr<Text::QuotePaintCache> &cache,
+		const std::shared_ptr<ColorCollectible> &collectible) const {
+	EnsureBlockquoteCache(cache, [&] {
+		const auto name = collectibleNameColor(collectible);
+		auto bg = name;
+		bg.setAlpha(kDefaultBgOpacity * 255);
+
+		const auto &strip = (_dark && !collectible->darkStrip.empty())
+			? collectible->darkStrip
+			: collectible->strip;
+		return ColorIndexValues{
+			.outlines = {
+				strip.empty() ? name : strip[0],
+				(strip.size() < 2) ? QColor(0, 0, 0, 0) : strip[1],
+				(strip.size() < 3) ? QColor(0, 0, 0, 0) : strip[2],
+			},
+			.name = name,
+			.bg = bg,
+		};
+	});
+	return cache.get();
+}
+
+ChatStyle::CollectibleColors &ChatStyle::resolveCollectibleCaches(
+		const std::shared_ptr<ColorCollectible> &collectible) const {
+	const auto i = _collectibleCaches.find(collectible);
+	if (i != end(_collectibleCaches)) {
+		return i->second;
+	}
+	for (auto i = begin(_collectibleCaches); i != end(_collectibleCaches);) {
+		if (i->first.expired()) {
+			i = _collectibleCaches.erase(i);
+		} else {
+			++i;
+		}
+	}
+	return _collectibleCaches.emplace(collectible).first->second;
+}
+
 const CornersPixmaps &ChatStyle::msgBotKbOverBgAddCornersSmall() const {
 	EnsureCorners(
 		_msgBotKbOverBgAddCornersSmall,
@@ -989,6 +1123,7 @@ void ChatStyle::make(
 	my.linkAlwaysActive = original.linkAlwaysActive;
 	make(my.linkFg, original.linkFg);
 	make(my.monoFg, original.monoFg);
+	make(my.markBg, original.markBg);
 	make(my.spoilerFg, original.spoilerFg);
 	make(my.selectBg, original.selectBg);
 	make(my.selectFg, original.selectFg);
@@ -998,6 +1133,167 @@ void ChatStyle::make(
 	make(my.selectOverlay, original.selectOverlay);
 }
 
+void ChatStyle::make(
+		style::QuoteStyle &my,
+		const style::QuoteStyle &original) const {
+	my = original;
+	make(my.icon, original.icon);
+	make(my.expand, original.expand);
+	make(my.collapse, original.collapse);
+}
+
+void ChatStyle::make(
+		style::TextStyle &my,
+		const style::TextStyle &original) const {
+	my = original;
+	make(my.blockquote, original.blockquote);
+	make(my.pre, original.pre);
+}
+
+void ChatStyle::make(
+		style::FlatLabel &my,
+		const style::FlatLabel &original) const {
+	my = original;
+	make(my.textFg, original.textFg);
+	make(my.style, original.style);
+	make(my.palette, original.palette);
+}
+
+void ChatStyle::make(style::Check &my, const style::Check &original) const {
+	my = original;
+	make(my.bg, original.bg);
+	make(my.untoggledFg, original.untoggledFg);
+	make(my.toggledFg, original.toggledFg);
+	make(my.icon, original.icon);
+}
+
+void ChatStyle::make(
+		style::MarkdownList &my,
+		const style::MarkdownList &original) const {
+	my = original;
+	make(my.bulletFg, original.bulletFg);
+	make(my.taskCheck, original.taskCheck);
+}
+
+void ChatStyle::make(
+		style::MarkdownQuotePaintColors &my,
+		const style::MarkdownQuotePaintColors &original) const {
+	my = original;
+	make(my.blockquote, original.blockquote);
+	make(my.pre, original.pre);
+	make(my.preBg, original.preBg);
+}
+
+void ChatStyle::make(
+		style::MarkdownRule &my,
+		const style::MarkdownRule &original) const {
+	my = original;
+	make(my.fg, original.fg);
+}
+
+void ChatStyle::make(
+		style::MarkdownDisplayMath &my,
+		const style::MarkdownDisplayMath &original) const {
+	my = original;
+	make(my.fg, original.fg);
+	make(my.fallbackStyle, original.fallbackStyle);
+	make(my.fallbackBg, original.fallbackBg);
+	make(my.overflowFg, original.overflowFg);
+}
+
+void ChatStyle::make(
+		style::MarkdownTable &my,
+		const style::MarkdownTable &original) const {
+	my = original;
+	make(my.borderFg, original.borderFg);
+	make(my.headerBg, original.headerBg);
+	make(my.headerStyle, original.headerStyle);
+	make(my.bodyStyle, original.bodyStyle);
+	make(my.overflowFg, original.overflowFg);
+}
+
+void ChatStyle::make(
+		style::MarkdownDetails &my,
+		const style::MarkdownDetails &original) const {
+	my = original;
+	make(my.borderFg, original.borderFg);
+	make(my.headerBg, original.headerBg);
+	make(my.bodyBg, original.bodyBg);
+	make(my.summaryFg, original.summaryFg);
+	make(my.summaryStyle, original.summaryStyle);
+	make(my.icon, original.icon);
+}
+
+void ChatStyle::make(
+		style::MarkdownPhoto &my,
+		const style::MarkdownPhoto &original) const {
+	my = original;
+	make(my.progressBg, original.progressBg);
+	make(my.progressFg, original.progressFg);
+	make(my.fallbackBg, original.fallbackBg);
+	make(my.fallbackFg, original.fallbackFg);
+}
+
+void ChatStyle::make(
+		style::MarkdownAudio &my,
+		const style::MarkdownAudio &original) const {
+	my = original;
+	make(my.borderFg, original.borderFg);
+	make(my.bg, original.bg);
+	make(my.titleStyle, original.titleStyle);
+	make(my.titleFg, original.titleFg);
+	make(my.subtitleStyle, original.subtitleStyle);
+	make(my.subtitleFg, original.subtitleFg);
+}
+
+void ChatStyle::make(
+		style::MarkdownGroupedMedia &my,
+		const style::MarkdownGroupedMedia &original) const {
+	my = original;
+	make(my.fallbackBg, original.fallbackBg);
+	make(my.fallbackFg, original.fallbackFg);
+	make(my.navButtonBg, original.navButtonBg);
+	make(my.navButtonBgOver, original.navButtonBgOver);
+	make(my.navPreviousIcon, original.navPreviousIcon);
+	make(my.navPreviousIconOver, original.navPreviousIconOver);
+	make(my.navNextIcon, original.navNextIcon);
+	make(my.navNextIconOver, original.navNextIconOver);
+}
+
+void ChatStyle::make(
+		style::MarkdownFailure &my,
+		const style::MarkdownFailure &original) const {
+	my = original;
+	make(my.label, original.label);
+}
+
+void ChatStyle::make(
+		style::Markdown &my,
+		const style::Markdown &original) const {
+	my = original;
+	make(my.textPalette, original.textPalette);
+	make(my.textColor, original.textColor);
+	make(my.supplementaryTextColor, original.supplementaryTextColor);
+	make(my.body, original.body);
+	make(my.heading1, original.heading1);
+	make(my.heading2, original.heading2);
+	make(my.heading3, original.heading3);
+	make(my.heading4, original.heading4);
+	make(my.heading5, original.heading5);
+	make(my.heading6, original.heading6);
+	make(my.code, original.code);
+	make(my.list, original.list);
+	make(my.quotePaintColors, original.quotePaintColors);
+	make(my.rule, original.rule);
+	make(my.displayMath, original.displayMath);
+	make(my.table, original.table);
+	make(my.details, original.details);
+	make(my.photo, original.photo);
+	make(my.audio, original.audio);
+	make(my.groupedMedia, original.groupedMedia);
+	make(my.failure, original.failure);
+}
+
 void ChatStyle::make(
 		style::TwoIconButton &my,
 		const style::TwoIconButton &original) const {
@@ -1056,8 +1352,13 @@ uint8 ColorIndexToPaletteIndex(uint8 colorIndex) {
 QColor FromNameFg(
 		not_null<const ChatStyle*> st,
 		bool selected,
-		uint8 colorIndex) {
-	return st->coloredValues(selected, colorIndex).name;
+		uint8 colorIndex,
+		const std::shared_ptr<Ui::ColorCollectible> &colorCollectible) {
+	return !colorCollectible
+		? st->coloredValues(selected, colorIndex).name
+		: (st->dark() && (colorCollectible->darkAccentColor.alpha() > 0))
+		? colorCollectible->darkAccentColor
+		: colorCollectible->accentColor;
 }
 
 void FillComplexOverlayRect(
diff --git a/Telegram/SourceFiles/ui/chat/chat_style.h b/Telegram/SourceFiles/ui/chat/chat_style.h
index 6247d3879ecb98..d2057476987ac2 100644
--- a/Telegram/SourceFiles/ui/chat/chat_style.h
+++ b/Telegram/SourceFiles/ui/chat/chat_style.h
@@ -10,13 +10,20 @@ For license and copyright information please follow this link:
 #include "ui/cached_round_corners.h"
 #include "ui/chat/message_bubble.h"
 #include "ui/chat/chat_style_radius.h"
+#include "ui/controls/swipe_handler_data.h"
 #include "ui/style/style_core_palette.h"
-#include "history/history_view_swipe_data.h"
 #include "layout/layout_selection.h"
+#include "styles/style_iv.h"
 #include "styles/style_basic.h"
 
+#include <vector>
+
 enum class ImageRoundRadius;
 
+namespace HistoryView {
+struct MessageSelection;
+} // namespace HistoryView
+
 namespace style {
 struct TwoIconButton;
 struct ScrollArea;
@@ -62,11 +69,13 @@ struct MessageStyle {
 	style::TextPalette semiboldPalette;
 	style::TextPalette fwdTextPalette;
 	style::TextPalette replyTextPalette;
+	style::Markdown richPageStyle;
 	style::icon tailLeft = { Qt::Uninitialized };
 	style::icon tailRight = { Qt::Uninitialized };
 	style::icon historyRepliesIcon = { Qt::Uninitialized };
 	style::icon historyViewsIcon = { Qt::Uninitialized };
 	style::icon historyPinIcon = { Qt::Uninitialized };
+	style::icon historySilentIcon = { Qt::Uninitialized };
 	style::icon historySentIcon = { Qt::Uninitialized };
 	style::icon historyReceivedIcon = { Qt::Uninitialized };
 	style::icon historyPsaIcon = { Qt::Uninitialized };
@@ -76,6 +85,7 @@ struct MessageStyle {
 	style::icon historyCallArrowMissed = { Qt::Uninitialized };
 	style::icon historyCallIcon = { Qt::Uninitialized };
 	style::icon historyCallCameraIcon = { Qt::Uninitialized };
+	style::icon historyCallGroupIcon = { Qt::Uninitialized };
 	style::icon historyFilePlay = { Qt::Uninitialized };
 	style::icon historyFileWaiting = { Qt::Uninitialized };
 	style::icon historyFileDownload = { Qt::Uninitialized };
@@ -125,6 +135,28 @@ struct MessageImageStyle {
 	style::icon historyPageEnlarge = { Qt::Uninitialized };
 };
 
+struct ColorCollectible {
+	uint64 collectibleId = 0;
+	uint64 giftEmojiId = 0;
+	uint64 backgroundEmojiId = 0;
+	QColor accentColor;
+	std::vector<QColor> strip;
+	QColor darkAccentColor;
+	std::vector<QColor> darkStrip;
+
+	friend inline bool operator==(
+		const ColorCollectible &,
+		const ColorCollectible &) = default;
+};
+
+struct ColorCollectiblePtrCompare {
+	bool operator()(
+			const std::weak_ptr<ColorCollectible> &a,
+			const std::weak_ptr<ColorCollectible> &b) const {
+		return a.owner_before(b);
+	}
+};
+
 struct ReactionPaintInfo {
 	QPoint position;
 	QPoint effectOffset;
@@ -139,7 +171,13 @@ struct BackgroundEmojiCache {
 struct BackgroundEmojiData {
 	std::unique_ptr<Text::CustomEmoji> emoji;
 	QImage firstFrameMask;
-	std::array<BackgroundEmojiCache, 2 * (3 + kColorIndexCount)> caches;
+	base::flat_map<int, BackgroundEmojiCache> caches;
+	base::flat_map<
+		std::weak_ptr<ColorCollectible>,
+		BackgroundEmojiCache,
+		ColorCollectiblePtrCompare> collectibleCaches;
+	std::unique_ptr<Text::CustomEmoji> gift;
+	QImage firstGiftFrame;
 
 	[[nodiscard]] static int CacheIndex(
 		bool selected,
@@ -152,6 +190,8 @@ struct ChatPaintHighlight {
 	float64 opacity = 0.;
 	float64 collapsion = 0.;
 	TextSelection range;
+	int todoItemId = 0;
+	QByteArray pollOption;
 };
 
 struct ChatPaintContext {
@@ -159,16 +199,20 @@ struct ChatPaintContext {
 	const BubblePattern *bubblesPattern = nullptr;
 	ReactionPaintInfo *reactionInfo = nullptr;
 	QRect viewport;
+	QRect area;
 	QRect clip;
 	TextSelection selection;
+	bool fullMessageSelected = false;
+	const HistoryView::MessageSelection *messageSelection = nullptr;
 	ChatPaintHighlight highlight;
 	QPainterPath *highlightPathCache = nullptr;
 	mutable QRect highlightInterpolateTo;
 	crl::time now = 0;
-	HistoryView::ChatPaintGestureHorizontalData gestureHorizontal;
+	Ui::Controls::SwipeContextData gestureHorizontal;
 
 	void translate(int x, int y) {
 		viewport.translate(x, y);
+		area.translate(x, y);
 		clip.translate(x, y);
 		highlightInterpolateTo.translate(x, y);
 	}
@@ -177,11 +221,12 @@ struct ChatPaintContext {
 	}
 
 	[[nodiscard]] bool selected() const {
-		return (selection == FullSelection);
+		return fullMessageSelected;
 	}
 	[[nodiscard]] not_null<const MessageStyle*> messageStyle() const;
 	[[nodiscard]] not_null<const MessageImageStyle*> imageStyle() const;
 	[[nodiscard]] not_null<Text::QuotePaintCache*> quoteCache(
+		const std::shared_ptr<ColorCollectible> &colorCollectible,
 		uint8 colorIndex) const;
 
 	[[nodiscard]] ChatPaintContext translated(int x, int y) const {
@@ -194,8 +239,19 @@ struct ChatPaintContext {
 	}
 	[[nodiscard]] ChatPaintContext withSelection(
 			TextSelection selection) const {
+		return withSelectionState(
+			selection,
+			(selection == FullSelection),
+			nullptr);
+	}
+	[[nodiscard]] ChatPaintContext withSelectionState(
+			TextSelection selection,
+			bool fullMessageSelected,
+			const HistoryView::MessageSelection *messageSelection) const {
 		auto result = *this;
 		result.selection = selection;
+		result.fullMessageSelected = fullMessageSelected;
+		result.messageSelection = messageSelection;
 		return result;
 	}
 	[[nodiscard]] auto computeHighlightCache() const
@@ -212,14 +268,16 @@ struct ChatPaintContext {
 	};
 
 
-	// This is supported only in unwrapped media for now.
+	// This is supported only in unwrapped media and text messages for now.
 	enum class SkipDrawingParts {
 		None,
 		Content,
 		Surrounding,
+		Bubble,
 	};
 	SkipDrawingParts skipDrawingParts = SkipDrawingParts::None;
 
+	bool skipSelectionCheck = false;
 	bool outbg = false;
 	bool paused = false;
 
@@ -231,6 +289,7 @@ struct ChatPaintContextArgs {
 	QPoint visibleAreaPositionGlobal;
 	int visibleAreaTop = 0;
 	int visibleAreaWidth = 0;
+	int visibleAreaHeight = 0;
 };
 
 [[nodiscard]] int HistoryServiceMsgRadius();
@@ -264,6 +323,8 @@ struct ColorIndexValues {
 [[nodiscard]] ColorIndexValues SimpleColorIndexValues(
 	QColor color,
 	int patternIndex);
+[[nodiscard]] std::vector<Text::SpecialColor> SyntaxHighlightColors(
+	not_null<const style::palette*> palette);
 
 class ChatStyle final : public style::palette {
 public:
@@ -286,6 +347,9 @@ class ChatStyle final : public style::palette {
 	[[nodiscard]] rpl::producer<> paletteChanged() const {
 		return _paletteChanged.events();
 	}
+	[[nodiscard]] int paletteVersion() const {
+		return _paletteVersion;
+	}
 
 	template <typename Type>
 	[[nodiscard]] Type value(const Type &original) const {
@@ -312,6 +376,8 @@ class ChatStyle final : public style::palette {
 	[[nodiscard]] const MessageImageStyle &imageStyle(bool selected) const;
 
 	[[nodiscard]] int colorPatternIndex(uint8 colorIndex) const;
+	[[nodiscard]] int collectiblePatternIndex(
+		const std::shared_ptr<ColorCollectible> &collectible) const;
 	[[nodiscard]] ColorIndexValues computeColorIndexValues(
 		bool selected,
 		uint8 colorIndex) const;
@@ -323,19 +389,31 @@ class ChatStyle final : public style::palette {
 	[[nodiscard]] const ColorIndexValues &coloredValues(
 		bool selected,
 		uint8 colorIndex) const;
+	[[nodiscard]] QColor collectibleNameColor(
+		const std::shared_ptr<ColorCollectible> &collectible) const;
 	[[nodiscard]] not_null<Text::QuotePaintCache*> coloredQuoteCache(
 		bool selected,
 		uint8 colorIndex) const;
 	[[nodiscard]] not_null<Text::QuotePaintCache*> coloredReplyCache(
 		bool selected,
 		uint8 colorIndex) const;
+	[[nodiscard]] not_null<Text::QuotePaintCache*> collectibleQuoteCache(
+		bool selected,
+		const std::shared_ptr<ColorCollectible> &collectible) const;
+	[[nodiscard]] not_null<Text::QuotePaintCache*> collectibleReplyCache(
+		bool selected,
+		const std::shared_ptr<ColorCollectible> &collectible) const;
 
 	[[nodiscard]] const style::TextPalette &coloredTextPalette(
 		bool selected,
 		uint8 colorIndex) const;
+	[[nodiscard]] const style::TextPalette &collectibleTextPalette(
+		bool selected,
+		const std::shared_ptr<ColorCollectible> &collectible) const;
 
 	[[nodiscard]] not_null<BackgroundEmojiData*> backgroundEmojiData(
-		uint64 id) const;
+		uint64 emojiId,
+		const std::shared_ptr<ColorCollectible> &collectible) const;
 
 	[[nodiscard]] const CornersPixmaps &msgBotKbOverBgAddCornersSmall() const;
 	[[nodiscard]] const CornersPixmaps &msgBotKbOverBgAddCornersLarge() const;
@@ -369,6 +447,9 @@ class ChatStyle final : public style::palette {
 	[[nodiscard]] const style::icon &historyPinInvertedIcon() const {
 		return _historyPinInvertedIcon;
 	}
+	[[nodiscard]] const style::icon &historySilentInvertedIcon() const {
+		return _historySilentInvertedIcon;
+	}
 	[[nodiscard]] const style::icon &historySendingIcon() const {
 		return _historySendingIcon;
 	}
@@ -442,10 +523,23 @@ class ChatStyle final : public style::palette {
 		kColorIndexCount * 2>;
 
 	struct ColoredPalette {
+		ColoredPalette();
+		ColoredPalette(const ColoredPalette &other);
+		ColoredPalette &operator=(const ColoredPalette &other);
+
 		std::optional<style::owned_color> linkFg;
 		style::TextPalette data;
 	};
 
+	struct CollectibleColors {
+		std::unique_ptr<Text::QuotePaintCache> quote;
+		std::unique_ptr<Text::QuotePaintCache> quoteSelected;
+		std::unique_ptr<Text::QuotePaintCache> reply;
+		std::unique_ptr<Text::QuotePaintCache> replySelected;
+		ColoredPalette palette;
+		ColoredPalette paletteSelected;
+	};
+
 	void assignPalette(not_null<const style::palette*> palette);
 	void clearColorIndexCaches();
 	void updateDarkValue();
@@ -454,12 +548,58 @@ class ChatStyle final : public style::palette {
 		ColoredQuotePaintCaches &caches,
 		bool selected,
 		uint8 colorIndex) const;
+	[[nodiscard]] not_null<Text::QuotePaintCache*> collectibleCache(
+		std::unique_ptr<Text::QuotePaintCache> &cache,
+		const std::shared_ptr<ColorCollectible> &collectible) const;
+	[[nodiscard]] CollectibleColors &resolveCollectibleCaches(
+		const std::shared_ptr<ColorCollectible> &collectible) const;
 
 	void make(style::color &my, const style::color &original) const;
 	void make(style::icon &my, const style::icon &original) const;
 	void make(
 		style::TextPalette &my,
 		const style::TextPalette &original) const;
+	void make(
+		style::QuoteStyle &my,
+		const style::QuoteStyle &original) const;
+	void make(
+		style::TextStyle &my,
+		const style::TextStyle &original) const;
+	void make(
+		style::FlatLabel &my,
+		const style::FlatLabel &original) const;
+	void make(style::Check &my, const style::Check &original) const;
+	void make(
+		style::MarkdownList &my,
+		const style::MarkdownList &original) const;
+	void make(
+		style::MarkdownQuotePaintColors &my,
+		const style::MarkdownQuotePaintColors &original) const;
+	void make(
+		style::MarkdownRule &my,
+		const style::MarkdownRule &original) const;
+	void make(
+		style::MarkdownDisplayMath &my,
+		const style::MarkdownDisplayMath &original) const;
+	void make(
+		style::MarkdownTable &my,
+		const style::MarkdownTable &original) const;
+	void make(
+		style::MarkdownDetails &my,
+		const style::MarkdownDetails &original) const;
+	void make(
+		style::MarkdownPhoto &my,
+		const style::MarkdownPhoto &original) const;
+	void make(
+		style::MarkdownAudio &my,
+		const style::MarkdownAudio &original) const;
+	void make(
+		style::MarkdownGroupedMedia &my,
+		const style::MarkdownGroupedMedia &original) const;
+	void make(
+		style::MarkdownFailure &my,
+		const style::MarkdownFailure &original) const;
+	void make(style::Markdown &my, const style::Markdown &original) const;
 	void make(
 		style::TwoIconButton &my,
 		const style::TwoIconButton &original) const;
@@ -519,6 +659,10 @@ class ChatStyle final : public style::palette {
 	mutable std::array<
 		ColoredPalette,
 		2 * kColorIndexCount> _coloredTextPalettes;
+	mutable base::flat_map<
+		std::weak_ptr<ColorCollectible>,
+		CollectibleColors,
+		ColorCollectiblePtrCompare> _collectibleCaches;
 	mutable base::flat_map<uint64, BackgroundEmojiData> _backgroundEmojis;
 
 	style::TextPalette _historyPsaForwardPalette;
@@ -530,6 +674,7 @@ class ChatStyle final : public style::palette {
 	style::icon _historyViewsSendingIcon = { Qt::Uninitialized };
 	style::icon _historyViewsSendingInvertedIcon = { Qt::Uninitialized };
 	style::icon _historyPinInvertedIcon = { Qt::Uninitialized };
+	style::icon _historySilentInvertedIcon = { Qt::Uninitialized };
 	style::icon _historySendingIcon = { Qt::Uninitialized };
 	style::icon _historySendingInvertedIcon = { Qt::Uninitialized };
 	style::icon _historySentInvertedIcon = { Qt::Uninitialized };
@@ -556,6 +701,7 @@ class ChatStyle final : public style::palette {
 	ColorIndicesCompressed _colorIndices;
 
 	bool _dark = false;
+	int _paletteVersion = 0;
 
 	rpl::event_stream<> _paletteChanged;
 
@@ -570,12 +716,20 @@ class ChatStyle final : public style::palette {
 [[nodiscard]] QColor FromNameFg(
 	not_null<const ChatStyle*> st,
 	bool selected,
-	uint8 colorIndex);
+	uint8 colorIndex,
+	const std::shared_ptr<Ui::ColorCollectible> &colorCollectible);
 
 [[nodiscard]] inline QColor FromNameFg(
 		const ChatPaintContext &context,
-		uint8 colorIndex) {
-	return FromNameFg(context.st, context.selected(), colorIndex);
+		uint8 colorIndex,
+		const std::shared_ptr<Ui::ColorCollectible> &colorCollectible) {
+	return context.outbg
+		? context.messageStyle()->msgServiceFg->c
+		: FromNameFg(
+			context.st,
+			context.selected(),
+			colorIndex,
+			colorCollectible);
 }
 
 void FillComplexOverlayRect(
diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.cpp b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
index 4979e5c4ad7d76..436ecd9980ad33 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
@@ -7,12 +7,15 @@ For license and copyright information please follow this link:
 */
 #include "ui/chat/chat_theme.h"
 
-#include "ui/image/image_prepare.h"
+#include "ui/color_contrast.h"
+#include "ui/emoji_config.h"
+#include "ui/painter.h"
 #include "ui/power_saving.h"
 #include "ui/ui_utility.h"
 #include "ui/chat/message_bubble.h"
 #include "ui/chat/chat_style.h"
-#include "ui/color_contrast.h"
+#include "ui/image/image_prepare.h"
+#include "ui/text/text_custom_emoji.h"
 #include "ui/style/style_core_palette.h"
 #include "ui/style/style_palette_colorizer.h"
 
@@ -53,6 +56,27 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 	return (doubled % 2) ? 0.5 : 1.;
 }
 
+[[nodiscard]] int ChooseGiftSymbolSkip(
+		const std::vector<ChatThemeGiftSymbol> &symbols) {
+	if (symbols.empty()) {
+		return -1;
+	}
+	auto maxIndex = -1;
+	auto maxValue = 0.;
+	for (auto i = 0, count = int(symbols.size()); i != count; ++i) {
+		const auto &symbol = symbols[i];
+		const auto center = symbol.area.center();
+		const auto value = std::min(center.x(), 1. - center.x())
+			* std::min(center.y(), 1. - center.y())
+			* std::min(symbol.area.width(), symbol.area.height());
+		if (maxIndex < 0 || maxValue < value) {
+			maxIndex = i;
+			maxValue = value;
+		}
+	}
+	return maxIndex;
+}
+
 [[nodiscard]] CacheBackgroundResult CacheBackgroundByRequest(
 		const CacheBackgroundRequest &request) {
 	Expects(!request.area.isEmpty());
@@ -79,18 +103,23 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 				Qt::IgnoreAspectRatio,
 				Qt::SmoothTransformation);
 		result.setDevicePixelRatio(ratio);
+		auto giftArea = QRect();
+		float64 giftRotation = 0.;
 		if (!request.background.prepared.isNull()) {
 			QPainter p(&result);
 			if (!gradient.isNull()) {
 				if (request.background.patternOpacity >= 0.) {
-					p.setCompositionMode(QPainter::CompositionMode_SoftLight);
+					p.setCompositionMode(
+						QPainter::CompositionMode_SoftLight);
 					p.setOpacity(request.background.patternOpacity);
 				} else {
 					p.setCompositionMode(
 						QPainter::CompositionMode_DestinationIn);
 				}
 			}
-			const auto tiled = request.background.isPattern
+			const auto hasGiftSymbols = request.background.isPattern
+				&& !request.background.giftSymbols.empty();
+			auto tiled = request.background.isPattern
 				? request.background.prepared.scaled(
 					request.area.height() * ratio,
 					request.area.height() * ratio,
@@ -99,6 +128,47 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 				: request.background.preparedForTiled;
 			const auto w = tiled.width() / float(ratio);
 			const auto h = tiled.height() / float(ratio);
+
+			const auto &giftSymbols = request.background.giftSymbols;
+			const auto giftSymbolsCount = int(giftSymbols.size());
+			const auto giftSymbolSkip = ChooseGiftSymbolSkip(giftSymbols);
+			const auto &giftSymbolFrame = request.background.giftSymbolFrame;
+			const auto giftSymbolRect = [&](const QRectF &symbol) {
+				return QRectF(
+					symbol.x() * w,
+					symbol.y() * h,
+					symbol.width() * w,
+					symbol.height() * h);
+			};
+			const auto giftSymbolPaint = [&](
+					QPainter &p,
+					ChatThemeGiftSymbol symbol) {
+				const auto rect = giftSymbolRect(symbol.area);
+
+				const auto esize = Ui::Emoji::GetSizeLarge() / ratio;
+				const auto custom = Ui::Text::AdjustCustomEmojiSize(esize);
+				const auto coef = rect.width() / float64(custom);
+
+				p.save();
+				p.translate(rect.center());
+				p.rotate(symbol.rotation);
+				p.translate(-rect.center());
+				p.translate(rect.topLeft());
+				p.scale(coef, coef);
+				p.translate(-rect.topLeft());
+				p.drawImage(rect.topLeft(), giftSymbolFrame);
+				p.restore();
+			};
+			if (hasGiftSymbols) {
+				auto q = QPainter(&tiled);
+				auto hq = PainterHighQualityEnabler(q);
+				q.setOpacity(0.8);
+				for (auto i = 0; i != giftSymbolsCount; ++i) {
+					if (i != giftSymbolSkip) {
+						giftSymbolPaint(q, giftSymbols[i]);
+					}
+				}
+			}
 			const auto cx = int(std::ceil(request.area.width() / w));
 			const auto cy = int(std::ceil(request.area.height() / h));
 			const auto rows = cy;
@@ -109,9 +179,33 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 				? (request.area.width() * ratio - cols * tiled.width()) / 2
 				: 0;
 			const auto useshift = xshift / float(ratio);
+			const auto drawTile = [&](int x, int y) {
+				const auto position = QPointF(useshift + x * w, y * h);
+				p.drawImage(position, tiled);
+			};
+
+			// Skip a symbol in the center for the gift itself.
+			drawTile(cols / 2, 0);
+			if (hasGiftSymbols) {
+				const auto &gift = giftSymbols[giftSymbolSkip];
+				auto q = QPainter(&tiled);
+				auto hq = PainterHighQualityEnabler(q);
+				q.setOpacity(0.8);
+				giftSymbolPaint(q, gift);
+				const auto exact = giftSymbolRect(gift.area);
+				giftArea = QRect(
+					useshift + (cols / 2) * w + exact.x(),
+					exact.y(),
+					exact.width(),
+					exact.height());
+				giftRotation = gift.rotation;
+			}
+
 			for (auto y = 0; y != rows; ++y) {
 				for (auto x = 0; x != cols; ++x) {
-					p.drawImage(QPointF(useshift + x * w, y * h), tiled);
+					if (y || x != (cols / 2)) {
+						drawTile(x, y);
+					}
 				}
 			}
 			if (!gradient.isNull()
@@ -127,6 +221,8 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 				QImage::Format_ARGB32_Premultiplied),
 			.gradient = gradient,
 			.area = request.area,
+			.giftArea = giftArea,
+			.giftRotation = giftRotation,
 			.waitingForNegativePattern
 				= request.background.waitingForNegativePattern()
 		};
@@ -199,6 +295,8 @@ CachedBackground::CachedBackground(CacheBackgroundResult &&result)
 , area(result.area)
 , x(result.x)
 , y(result.y)
+, giftArea(result.giftArea)
+, giftRotation(result.giftRotation)
 , waitingForNegativePattern(result.waitingForNegativePattern) {
 }
 
@@ -415,6 +513,8 @@ void ChatTheme::setBackground(ChatThemeBackground &&background) {
 void ChatTheme::updateBackgroundImageFrom(ChatThemeBackground &&background) {
 	_mutableBackground.key = background.key;
 	_mutableBackground.prepared = std::move(background.prepared);
+	_mutableBackground.giftSymbols = std::move(background.giftSymbols);
+	_mutableBackground.giftId = background.giftId;
 	_mutableBackground.preparedForTiled = std::move(
 		background.preparedForTiled);
 	if (!_backgroundState.now.pixmap.isNull()) {
@@ -467,19 +567,21 @@ void ChatTheme::finishCreateOnMain() {
 ChatPaintContext ChatTheme::preparePaintContext(
 		not_null<const ChatStyle*> st,
 		QRect viewport,
+		QRect area,
 		QRect clip,
 		bool paused) {
-	const auto area = viewport.size();
+	const auto size = viewport.size();
 	const auto now = crl::now();
 	if (!_bubblesBackgroundPrepared.isNull()
-		&& _bubblesBackground.area != area) {
+		&& !size.isEmpty()
+		&& _bubblesBackground.area != size) {
 		if (!_cacheBubblesTimer) {
 			_cacheBubblesTimer.emplace([=] { cacheBubbles(); });
 		}
-		if (_cacheBubblesArea != area
+		if (_cacheBubblesArea != size
 			|| (!_cacheBubblesTimer->isActive()
 				&& !_bubblesCachingRequest)) {
-			_cacheBubblesArea = area;
+			_cacheBubblesArea = size;
 			_lastBubblesAreaChangeTime = now;
 			_cacheBubblesTimer->callOnce(kCacheBackgroundFastTimeout);
 		}
@@ -488,6 +590,7 @@ ChatPaintContext ChatTheme::preparePaintContext(
 		.st = st,
 		.bubblesPattern = _bubblesBackgroundPattern.get(),
 		.viewport = viewport,
+		.area = area,
 		.clip = clip,
 		.now = now,
 		.paused = paused,
@@ -499,6 +602,9 @@ const BackgroundState &ChatTheme::backgroundState(QSize area) {
 		_cacheBackgroundTimer.emplace([=] { cacheBackground(); });
 	}
 	_backgroundState.shown = _backgroundFade.value(1.);
+	if (area.isEmpty()) {
+		return _backgroundState;
+	}
 	if (_backgroundState.now.pixmap.isNull()
 		&& !background().gradientForFill.isNull()) {
 		// We don't support direct painting of patterned gradients.
@@ -534,7 +640,8 @@ bool ChatTheme::readyForBackgroundRotation() const {
 }
 
 void ChatTheme::generateNextBackgroundRotation() {
-	if (_backgroundCachingRequest
+	if (_nextCachingRequest
+		|| _backgroundCachingRequest
 		|| !_backgroundNext.image.isNull()
 		|| !readyForBackgroundRotation()
 		|| background().colors.size() < 3) {
@@ -547,8 +654,9 @@ void ChatTheme::generateNextBackgroundRotation() {
 	if (!request) {
 		return;
 	}
+	_nextCachingRequest = request;
 	cacheBackgroundAsync(request, [=](CacheBackgroundResult &&result) {
-		const auto forRequest = base::take(_backgroundCachingRequest);
+		const auto forRequest = base::take(_nextCachingRequest);
 		if (!readyForBackgroundRotation()) {
 			return;
 		}
@@ -600,7 +708,9 @@ void ChatTheme::cacheBackgroundNow() {
 void ChatTheme::cacheBackgroundAsync(
 		const CacheBackgroundRequest &request,
 		Fn<void(CacheBackgroundResult&&)> done) {
-	_backgroundCachingRequest = request;
+	if (!done) {
+		_backgroundCachingRequest = request;
+	}
 	const auto weak = base::make_weak(this);
 	crl::async([=] {
 		if (!weak) {
@@ -772,6 +882,7 @@ ChatBackgroundRects ComputeChatBackgroundRects(
 }
 
 QColor CountAverageColor(const QImage &image) {
+	Expects(!image.isNull());
 	Expects(image.format() == QImage::Format_ARGB32_Premultiplied
 		|| image.format() == QImage::Format_RGB32);
 
@@ -905,19 +1016,90 @@ QImage PrepareImageForTiled(const QImage &prepared) {
 	return result;
 }
 
-[[nodiscard]] QImage ReadBackgroundImage(
+std::vector<ChatThemeGiftSymbol> ParseGiftSymbols(
+		const QByteArray &rects,
+		QSize size,
+		float64 scale) {
+	if (size.isEmpty()) {
+		return {};
+	}
+
+	auto result = std::vector<ChatThemeGiftSymbol>();
+	auto offset = 0;
+	const auto jumpPast = [&](const QByteArray &what) {
+		const auto pos = rects.indexOf(what, offset);
+		if (pos < 0) {
+			return false;
+		}
+		offset = pos + what.size();
+		return true;
+	};
+	const auto takeDouble = [&](float64 &value, char finish = '"') {
+		const auto end = rects.indexOf(finish, offset);
+		if (end < 0) {
+			return false;
+		}
+		value = rects.mid(offset, end - offset).toDouble();
+		offset = end + 1;
+		return true;
+	};
+	const auto maybeTakeRotation = [&](float64 &value) {
+		const auto end = rects.indexOf("/>"_q, offset);
+		const auto pos = rects.indexOf("rotate("_q, offset);
+		if (pos > offset && end > offset && pos < end) {
+			offset = pos + 7;
+			return takeDouble(value, ')');
+		}
+		return true;
+	};
+	const auto cw = scale / float64(size.width());
+	const auto ch = scale / float64(size.height());
+	while (true) {
+		auto x = float64(), y = float64(), w = float64(), h = float64();
+		auto rotation = float64();
+		if (!jumpPast("<rect "_q)
+			|| !jumpPast("x=\""_q)
+			|| !takeDouble(x)
+			|| !jumpPast("y=\""_q)
+			|| !takeDouble(y)
+			|| !jumpPast("width=\""_q)
+			|| !takeDouble(w)
+			|| !jumpPast("height=\""_q)
+			|| !takeDouble(h)
+			|| !maybeTakeRotation(rotation)
+			|| !jumpPast("/>"_q)) {
+			break;
+		}
+		result.push_back({ .area = {
+			x * cw,
+			y * ch,
+			w * cw,
+			h * ch,
+		}, .rotation = rotation });
+	}
+	return result;
+}
+
+BackgroundImageFields ReadBackgroundImage(
 		const QString &path,
 		const QByteArray &content,
-		bool gzipSvg) {
-	auto result = Images::Read({
+		bool gzipSvg,
+		bool findGiftSymbols) {
+	auto read = Images::Read({
 		.path = path,
 		.content = content,
+		.svgCutOutId = findGiftSymbols ? "GiftPatterns"_q : QByteArray(),
 		.maxSize = QSize(kMaxSize, kMaxSize),
 		.gzipSvg = gzipSvg,
-	}).image;
-	if (result.isNull()) {
-		result = QImage(1, 1, QImage::Format_ARGB32_Premultiplied);
-		result.fill(Qt::black);
+	});
+	auto result = BackgroundImageFields{
+		.image = std::move(read.image),
+	};
+	if (const auto &rects = read.svgCutOutContent; !rects.isEmpty()) {
+		result.giftSymbols = ParseGiftSymbols(
+			rects,
+			result.image.size(),
+			read.scale);
 	}
 	return result;
 }
@@ -1022,9 +1204,16 @@ QImage GenerateDitheredGradient(
 
 ChatThemeBackground PrepareBackgroundImage(
 		const ChatThemeBackgroundData &data) {
-	auto prepared = (data.isPattern || data.colors.empty())
-		? PreprocessBackgroundImage(
-			ReadBackgroundImage(data.path, data.bytes, data.gzipSvg))
+	const auto needBackground = (data.isPattern || data.colors.empty());
+	auto read = needBackground
+		? ReadBackgroundImage(
+			data.path,
+			data.bytes,
+			data.gzipSvg,
+			!data.giftSymbolFrame.isNull())
+		: BackgroundImageFields();
+	auto prepared = needBackground
+		? PreprocessBackgroundImage(std::move(read.image))
 		: QImage();
 	if (data.isPattern && !prepared.isNull()) {
 		if (data.colors.size() < 2) {
@@ -1070,10 +1259,33 @@ ChatThemeBackground PrepareBackgroundImage(
 			? std::nullopt
 			: std::make_optional(data.colors.front())),
 		.colors = data.colors,
+		.giftSymbols = std::move(read.giftSymbols),
+		.giftSymbolFrame = data.giftSymbolFrame,
+		.giftId = data.giftId,
 		.patternOpacity = data.patternOpacity,
 		.gradientRotation = data.generateGradient ? data.gradientRotation : 0,
 		.isPattern = data.isPattern,
 	};
 }
 
+[[nodiscard]] QImage PrepareGiftSymbol(
+		const std::unique_ptr<Text::CustomEmoji> &emoji) {
+	if (!emoji || !emoji->ready()) {
+		return QImage();
+	}
+	const auto ratio = style::DevicePixelRatio();
+	const auto esize = Ui::Emoji::GetSizeLarge() / ratio;
+	const auto customSize = Ui::Text::AdjustCustomEmojiSize(esize);
+	auto result = QImage(
+		QSize(customSize, customSize) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(ratio);
+	result.fill(Qt::transparent);
+	auto p = QPainter(&result);
+	emoji->paint(p, {
+		.textColor = QColor(0, 0, 0),
+	});
+	return result;
+}
+
 } // namespace Window::Theme
diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.h b/Telegram/SourceFiles/ui/chat/chat_theme.h
index 91c2599e7865cb..0f328e410adfe8 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.h
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.h
@@ -16,12 +16,21 @@ class palette;
 struct colorizer;
 } // namespace style
 
+namespace Ui::Text {
+class CustomEmoji;
+} // namespace Ui::Text
+
 namespace Ui {
 
 class ChatStyle;
 struct ChatPaintContext;
 struct BubblePattern;
 
+struct ChatThemeGiftSymbol {
+	QRectF area;
+	float64 rotation = 0.;
+};
+
 struct ChatThemeBackground {
 	QString key;
 	QImage prepared;
@@ -29,6 +38,9 @@ struct ChatThemeBackground {
 	QImage gradientForFill;
 	std::optional<QColor> colorForFill;
 	std::vector<QColor> colors;
+	std::vector<ChatThemeGiftSymbol> giftSymbols;
+	QImage giftSymbolFrame;
+	uint64_t giftId = 0;
 	float64 patternOpacity = 1.;
 	int gradientRotation = 0;
 	bool isPattern = false;
@@ -46,6 +58,8 @@ struct ChatThemeBackgroundData {
 	QString key;
 	QString path;
 	QByteArray bytes;
+	QImage giftSymbolFrame;
+	uint64 giftId = 0;
 	bool gzipSvg = false;
 	std::vector<QColor> colors;
 	bool isPattern = false;
@@ -69,8 +83,9 @@ struct CacheBackgroundRequest {
 	float64 gradientProgress = 1.;
 
 	explicit operator bool() const {
-		return !background.prepared.isNull()
-			|| !background.gradientForFill.isNull();
+		return !area.isEmpty()
+			&& (!background.prepared.isNull()
+				|| !background.gradientForFill.isNull());
 	}
 };
 
@@ -87,6 +102,8 @@ struct CacheBackgroundResult {
 	QSize area;
 	int x = 0;
 	int y = 0;
+	QRect giftArea;
+	float64 giftRotation = 0;
 	bool waitingForNegativePattern = false;
 };
 
@@ -101,6 +118,9 @@ struct CachedBackground {
 	QSize area;
 	int x = 0;
 	int y = 0;
+	QRect giftArea;
+	float64 giftRotation = 0.;
+	mutable std::unique_ptr<Text::CustomEmoji> gift;
 	bool waitingForNegativePattern = false;
 };
 
@@ -159,6 +179,7 @@ class ChatTheme final : public base::has_weak_ptr {
 	[[nodiscard]] ChatPaintContext preparePaintContext(
 		not_null<const ChatStyle*> st,
 		QRect viewport,
+		QRect area,
 		QRect clip,
 		bool paused);
 	[[nodiscard]] const BackgroundState &backgroundState(QSize area);
@@ -200,6 +221,7 @@ class ChatTheme final : public base::has_weak_ptr {
 	BackgroundState _backgroundState;
 	Animations::Simple _backgroundFade;
 	CacheBackgroundRequest _backgroundCachingRequest;
+	CacheBackgroundRequest _nextCachingRequest;
 	CacheBackgroundResult _backgroundNext;
 	QSize _cacheBackgroundArea;
 	crl::time _lastBackgroundAreaChangeTime = 0;
@@ -238,10 +260,15 @@ struct ChatBackgroundRects {
 	const QImage &image);
 [[nodiscard]] QImage PrepareImageForTiled(const QImage &prepared);
 
-[[nodiscard]] QImage ReadBackgroundImage(
+struct BackgroundImageFields {
+	QImage image;
+	std::vector<ChatThemeGiftSymbol> giftSymbols;
+};
+[[nodiscard]] BackgroundImageFields ReadBackgroundImage(
 	const QString &path,
 	const QByteArray &content,
-	bool gzipSvg);
+	bool gzipSvg,
+	bool findGiftSymbols = false);
 [[nodiscard]] QImage GenerateBackgroundImage(
 	QSize size,
 	const std::vector<QColor> &bg,
@@ -260,5 +287,7 @@ struct ChatBackgroundRects {
 	int rotation);
 [[nodiscard]] ChatThemeBackground PrepareBackgroundImage(
 	const ChatThemeBackgroundData &data);
+[[nodiscard]] QImage PrepareGiftSymbol(
+	const std::unique_ptr<Text::CustomEmoji> &emoji);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/chats_filter_tag.cpp b/Telegram/SourceFiles/ui/chat/chats_filter_tag.cpp
new file mode 100644
index 00000000000000..737b642d467c26
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/chats_filter_tag.cpp
@@ -0,0 +1,288 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/chats_filter_tag.h"
+
+#include "ui/text/text_custom_emoji.h"
+#include "ui/emoji_config.h"
+#include "ui/integration.h"
+#include "ui/painter.h"
+#include "styles/style_dialogs.h"
+
+namespace Ui {
+namespace {
+
+class ScaledSimpleEmoji final : public Ui::Text::CustomEmoji {
+public:
+	ScaledSimpleEmoji(EmojiPtr emoji);
+
+	int width() override;
+	QString entityData() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	const EmojiPtr _emoji;
+	QImage _frame;
+	QPoint _shift;
+
+};
+
+class ScaledCustomEmoji final : public Ui::Text::CustomEmoji {
+public:
+	ScaledCustomEmoji(std::unique_ptr<Ui::Text::CustomEmoji> wrapped);
+
+	int width() override;
+	QString entityData() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	const std::unique_ptr<Ui::Text::CustomEmoji> _wrapped;
+	QImage _frame;
+	QPoint _shift;
+
+};
+
+[[nodiscard]] int ScaledSize() {
+	return st::dialogRowFilterTagStyle.font->height - 2 * st::lineWidth;
+}
+
+ScaledSimpleEmoji::ScaledSimpleEmoji(EmojiPtr emoji)
+: _emoji(emoji) {
+}
+
+int ScaledSimpleEmoji::width() {
+	return ScaledSize();
+}
+
+QString ScaledSimpleEmoji::entityData() {
+	return u"scaled-simple:"_q + _emoji->text();
+}
+
+void ScaledSimpleEmoji::paint(QPainter &p, const Context &context) {
+	if (_frame.isNull()) {
+		const auto adjusted = Text::AdjustCustomEmojiSize(st::emojiSize);
+		const auto xskip = (st::emojiSize - adjusted) / 2;
+		const auto yskip = xskip + (width() - st::emojiSize) / 2;
+		_shift = { xskip, yskip };
+
+		const auto ratio = style::DevicePixelRatio();
+		const auto large = Emoji::GetSizeLarge();
+		const auto size = QSize(large, large);
+		_frame = QImage(size, QImage::Format_ARGB32_Premultiplied);
+		_frame.setDevicePixelRatio(ratio);
+		_frame.fill(Qt::transparent);
+
+		auto p = QPainter(&_frame);
+		Emoji::Draw(p, _emoji, large, 0, 0);
+		p.end();
+
+		_frame = _frame.scaled(
+			QSize(width(), width()) * ratio,
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation);
+	}
+
+	p.drawImage(context.position - _shift, _frame);
+}
+
+void ScaledSimpleEmoji::unload() {
+}
+
+bool ScaledSimpleEmoji::ready() {
+	return true;
+}
+
+bool ScaledSimpleEmoji::readyInDefaultState() {
+	return true;
+}
+
+ScaledCustomEmoji::ScaledCustomEmoji(
+	std::unique_ptr<Ui::Text::CustomEmoji> wrapped)
+: _wrapped(std::move(wrapped)) {
+}
+
+int ScaledCustomEmoji::width() {
+	return ScaledSize();
+}
+
+QString ScaledCustomEmoji::entityData() {
+	return u"scaled-custom:"_q + _wrapped->entityData();
+}
+
+void ScaledCustomEmoji::paint(QPainter &p, const Context &context) {
+	if (_frame.isNull()) {
+		if (!_wrapped->ready()) {
+			return;
+		}
+		const auto ratio = style::DevicePixelRatio();
+		const auto large = Emoji::GetSizeLarge();
+		const auto largeadjust = Text::AdjustCustomEmojiSize(large / ratio);
+		const auto size = QSize(largeadjust, largeadjust) * ratio;
+		_frame = QImage(size, QImage::Format_ARGB32_Premultiplied);
+		_frame.setDevicePixelRatio(ratio);
+		_frame.fill(Qt::transparent);
+
+		auto p = QPainter(&_frame);
+		p.translate(-context.position);
+		const auto was = context.internal.forceFirstFrame;
+		context.internal.forceFirstFrame = true;
+		_wrapped->paint(p, context);
+		context.internal.forceFirstFrame = was;
+		p.end();
+
+		const auto smalladjust = Text::AdjustCustomEmojiSize(width());
+		_frame = _frame.scaled(
+			QSize(smalladjust, smalladjust) * ratio,
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation);
+		_wrapped->unload();
+
+		const auto adjusted = Text::AdjustCustomEmojiSize(st::emojiSize);
+		const auto xskip = (st::emojiSize - adjusted) / 2;
+		const auto yskip = xskip + (width() - st::emojiSize) / 2;
+
+		const auto add = (width() - smalladjust) / 2;
+		_shift = QPoint(xskip, yskip) - QPoint(add, add);
+	}
+	p.drawImage(context.position - _shift, _frame);
+}
+
+void ScaledCustomEmoji::unload() {
+	_wrapped->unload();
+}
+
+bool ScaledCustomEmoji::ready() {
+	return !_frame.isNull() || _wrapped->ready();
+}
+
+bool ScaledCustomEmoji::readyInDefaultState() {
+	return !_frame.isNull() || _wrapped->ready();
+}
+
+[[nodiscard]] TextWithEntities PrepareSmallEmojiText(
+		TextWithEntities text,
+		ChatsFilterTagContext &context) {
+	auto i = text.entities.begin();
+	auto ch = text.text.constData();
+	context.loading = false;
+	const auto end = text.text.constData() + text.text.size();
+	const auto adjust = [&](EntityInText &entity) {
+		if (entity.type() != EntityType::CustomEmoji) {
+			return;
+		}
+		const auto data = entity.data();
+		if (data.startsWith(u"scaled-simple:"_q)) {
+			return;
+		}
+		auto &emoji = context.emoji[data];
+		if (!emoji) {
+			emoji = Text::MakeCustomEmoji(data, context.textContext);
+		}
+		if (!emoji->ready()) {
+			context.loading = true;
+		}
+		entity = EntityInText(
+			entity.type(),
+			entity.offset(),
+			entity.length(),
+			u"scaled-custom:"_q + entity.data());
+	};
+	const auto till = [](EntityInText &entity) {
+		return entity.offset() + entity.length();
+	};
+	while (ch != end) {
+		auto emojiLength = 0;
+		if (const auto emoji = Ui::Emoji::Find(ch, end, &emojiLength)) {
+			const auto f = int(ch - text.text.constData());
+			const auto l = f + emojiLength;
+			while (i != text.entities.end() && till(*i) <= f) {
+				adjust(*i);
+				++i;
+			}
+
+			ch += emojiLength;
+			if (i != text.entities.end() && i->offset() < l) {
+				continue;
+			}
+			i = text.entities.insert(i, EntityInText{
+				EntityType::CustomEmoji,
+				f,
+				emojiLength,
+				u"scaled-simple:"_q + emoji->text(),
+			});
+		} else {
+			++ch;
+		}
+	}
+	for (; i != text.entities.end(); ++i) {
+		adjust(*i);
+	}
+	return text;
+}
+
+} // namespace
+
+QImage ChatsFilterTag(
+		const TextWithEntities &text,
+		ChatsFilterTagContext &context) {
+	const auto &roundedFont = st::dialogRowFilterTagStyle.font;
+	const auto additionalWidth = roundedFont->spacew * 3;
+	auto rich = Text::String(
+		st::dialogRowFilterTagStyle,
+		PrepareSmallEmojiText(text, context),
+		kMarkupTextOptions,
+		kQFixedMax,
+		context.textContext);
+	const auto roundedWidth = rich.maxWidth() + additionalWidth;
+	const auto rect = QRect(0, 0, roundedWidth, roundedFont->height);
+	auto cache = QImage(
+		rect.size() * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	cache.setDevicePixelRatio(style::DevicePixelRatio());
+	cache.fill(Qt::transparent);
+	{
+		auto p = QPainter(&cache);
+		const auto pen = QPen(context.active
+			? st::dialogsBgActive->c
+			: context.color);
+		p.setPen(Qt::NoPen);
+		p.setBrush(context.active
+			? st::dialogsTextFgActive->c
+			: anim::with_alpha(pen.color(), .15));
+		{
+			auto hq = PainterHighQualityEnabler(p);
+			const auto radius = roundedFont->height / 3.;
+			p.drawRoundedRect(rect, radius, radius);
+		}
+		p.setPen(pen);
+		p.setFont(roundedFont);
+		const auto dx = (rect.width() - rich.maxWidth()) / 2;
+		const auto dy = (rect.height() - roundedFont->height) / 2;
+		rich.draw(p, {
+			.position = rect.topLeft() + QPoint(dx, dy),
+			.availableWidth = rich.maxWidth(),
+		});
+	}
+	return cache;
+}
+
+std::unique_ptr<Text::CustomEmoji> MakeScaledSimpleEmoji(EmojiPtr emoji) {
+	return std::make_unique<ScaledSimpleEmoji>(emoji);
+}
+
+std::unique_ptr<Text::CustomEmoji> MakeScaledCustomEmoji(
+		std::unique_ptr<Text::CustomEmoji> wrapped) {
+	return MakeWrappedEmoji<ScaledCustomEmoji>(std::move(wrapped));
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/chats_filter_tag.h b/Telegram/SourceFiles/ui/chat/chats_filter_tag.h
new file mode 100644
index 00000000000000..8291b5e335e2d0
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/chats_filter_tag.h
@@ -0,0 +1,33 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "emoji.h"
+#include "ui/text/text.h"
+
+namespace Ui {
+
+struct ChatsFilterTagContext {
+	base::flat_map<QString, std::unique_ptr<Text::CustomEmoji>> emoji;
+	Text::MarkedContext textContext;
+	QColor color;
+	bool active = false;
+	bool loading = false;
+};
+
+[[nodiscard]] QImage ChatsFilterTag(
+	const TextWithEntities &text,
+	ChatsFilterTagContext &context);
+
+[[nodiscard]] std::unique_ptr<Text::CustomEmoji> MakeScaledSimpleEmoji(
+	EmojiPtr emoji);
+
+[[nodiscard]] std::unique_ptr<Text::CustomEmoji> MakeScaledCustomEmoji(
+	std::unique_ptr<Text::CustomEmoji> wrapped);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/choose_send_as.cpp b/Telegram/SourceFiles/ui/chat/choose_send_as.cpp
index d7c7f08ab33ebd..4544b347efa9d1 100644
--- a/Telegram/SourceFiles/ui/chat/choose_send_as.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_send_as.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "ui/chat/choose_send_as.h"
 
 #include "boxes/peer_list_box.h"
+#include "data/data_group_call.h"
 #include "data/data_peer.h"
 #include "data/data_channel.h"
 #include "data/data_peer_values.h"
@@ -19,9 +20,8 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "main/session/send_as_peers.h"
 #include "lang/lang_keys.h"
-#include "settings/settings_premium.h"
+#include "settings/sections/settings_premium.h"
 #include "styles/style_calls.h"
-#include "styles/style_boxes.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 
@@ -111,7 +111,7 @@ ListController::ListController(
 , _selected(selected) {
 	Data::AmPremiumValue(
 		&selected->session()
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		const auto count = delegate()->peerListFullRowsCount();
 		for (auto i = 0; i != count; ++i) {
 			delegate()->peerListUpdateRow(
@@ -171,6 +171,7 @@ rpl::producer<not_null<PeerData*>> ListController::clicked() const {
 
 void ChooseSendAsBox(
 		not_null<GenericBox*> box,
+		const style::ChooseSendAs &st,
 		std::vector<Main::SendAsPeer> list,
 		not_null<PeerData*> chosen,
 		Fn<bool(not_null<PeerData*>)> done) {
@@ -179,11 +180,10 @@ void ChooseSendAsBox(
 
 	box->setWidth(st::groupCallJoinAsWidth);
 	box->setTitle(tr::lng_send_as_title());
-	const auto &labelSt = st::confirmPhoneAboutLabel;
 	box->addRow(object_ptr<Ui::FlatLabel>(
 		box,
 		tr::lng_group_call_join_as_about(),
-		labelSt));
+		st.label));
 
 	auto &lifetime = box->lifetime();
 	const auto delegate = lifetime.make_state<
@@ -192,13 +192,11 @@ void ChooseSendAsBox(
 	const auto controller = lifetime.make_state<ListController>(
 		list,
 		chosen);
-	controller->setStyleOverrides(
-		&st::peerListJoinAsList,
-		nullptr);
+	controller->setStyleOverrides(&st.list, nullptr);
 
 	controller->clicked(
-	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
-		const auto weak = MakeWeak(box);
+	) | rpl::on_next([=](not_null<PeerData*> peer) {
+		const auto weak = base::make_weak(box);
 		if (done(peer) && weak) {
 			box->closeBox();
 		}
@@ -214,19 +212,21 @@ void ChooseSendAsBox(
 
 void SetupSendAsButton(
 		not_null<SendAsButton*> button,
+		const style::ChooseSendAs &st,
 		rpl::producer<PeerData*> active,
-		not_null<Window::SessionController*> window) {
+		std::shared_ptr<ChatHelpers::Show> show) {
 	using namespace rpl::mappers;
 	const auto current = button->lifetime().make_state<
 		rpl::variable<PeerData*>
 	>(std::move(active));
-	button->setClickedCallback([=] {
+	button->setClickedCallback([=, &st] {
 		const auto peer = current->current();
 		if (!peer) {
 			return;
 		}
+		const auto key = Main::SendAsKey{ peer, Main::SendAsType::Message };
 		const auto session = &peer->session();
-		const auto &list = session->sendAsPeers().list(peer);
+		const auto &list = session->sendAsPeers().list(key);
 		if (list.size() < 2) {
 			return;
 		}
@@ -239,28 +239,30 @@ void SetupSendAsButton(
 				&& i->premiumRequired
 				&& !sendAs->session().premium()) {
 				Settings::ShowPremiumPromoToast(
-					window->uiShow(),
+					show,
 					tr::lng_send_as_premium_required(
 						tr::now,
 						lt_link,
-						Ui::Text::Link(
-							Ui::Text::Bold(
+						tr::link(
+							tr::bold(
 								tr::lng_send_as_premium_required_link(
 									tr::now))),
-						Ui::Text::WithEntities),
+						tr::marked),
 					u"send_as"_q);
 				return false;
 			}
 			session->sendAsPeers().saveChosen(peer, sendAs);
 			return true;
 		};
-		window->show(Box(
+		show->show(Box(
 			Ui::ChooseSendAsBox,
+			st,
 			list,
 			session->sendAsPeers().resolveChosen(peer),
 			done));
 	});
 
+	const auto size = st.button.size;
 	auto userpic = current->value(
 	) | rpl::filter([=](PeerData *peer) {
 		return peer && peer->isChannel();
@@ -271,7 +273,7 @@ void SetupSendAsButton(
 			rpl::empty
 		) | rpl::then(channel->session().sendAsPeers().updated(
 		) | rpl::filter(
-			_1 == channel
+			_1 == Main::SendAsKey(channel, Main::SendAsType::Message)
 		) | rpl::to_empty);
 
 		return rpl::combine(
@@ -283,25 +285,68 @@ void SetupSendAsButton(
 		) | rpl::map([=](not_null<PeerData*> chosen) {
 			return Data::PeerUserpicImageValue(
 				chosen,
-				st::sendAsButton.size * style::DevicePixelRatio());
+				size * style::DevicePixelRatio());
 		}) | rpl::flatten_latest();
 	}) | rpl::flatten_latest();
 
 	std::move(
 		userpic
-	) | rpl::start_with_next([=](QImage &&userpic) {
+	) | rpl::on_next([=](QImage &&userpic) {
+		button->setUserpic(std::move(userpic));
+	}, button->lifetime());
+}
+
+void SetupSendAsButton(
+		not_null<SendAsButton*> button,
+		const style::ChooseSendAs &st,
+		std::shared_ptr<Data::GroupCall> videoStream,
+		std::shared_ptr<ChatHelpers::Show> show) {
+	const auto peer = videoStream->peer();
+	const auto type = Main::SendAsType::VideoStream;
+	const auto key = Main::SendAsKey{ peer, type };
+	button->setClickedCallback([=, &st] {
+		const auto session = &peer->session();
+		const auto &list = session->sendAsPeers().list(key);
+		if (list.size() < 2) {
+			return;
+		}
+		const auto done = [=](not_null<PeerData*> sendAs) {
+			videoStream->saveSendAs(sendAs);
+			return true;
+		};
+		show->show(Box(
+			Ui::ChooseSendAsBox,
+			st,
+			list,
+			videoStream->resolveSendAs(),
+			done));
+	});
+
+	const auto size = st.button.size;
+	auto userpic = videoStream->sendAsValue(
+	) | rpl::distinct_until_changed(
+	) | rpl::map([=](not_null<PeerData*> chosen) {
+		return Data::PeerUserpicImageValue(
+			chosen,
+			size * style::DevicePixelRatio());
+	}) | rpl::flatten_latest();
+
+	std::move(
+		userpic
+	) | rpl::on_next([=](QImage &&userpic) {
 		button->setUserpic(std::move(userpic));
 	}, button->lifetime());
 }
 
 void SetupSendAsButton(
 		not_null<SendAsButton*> button,
+		const style::ChooseSendAs &st,
 		not_null<Window::SessionController*> window) {
 	auto active = window->activeChatValue(
 	) | rpl::map([=](Dialogs::Key key) {
 		return key.history() ? key.history()->peer.get() : nullptr;
 	});
-	SetupSendAsButton(button, std::move(active), window);
+	SetupSendAsButton(button, st, std::move(active), window->uiShow());
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/choose_send_as.h b/Telegram/SourceFiles/ui/chat/choose_send_as.h
index f994b071d1608d..cce11a1c940768 100644
--- a/Telegram/SourceFiles/ui/chat/choose_send_as.h
+++ b/Telegram/SourceFiles/ui/chat/choose_send_as.h
@@ -12,6 +12,18 @@ For license and copyright information please follow this link:
 
 class PeerData;
 
+namespace style {
+struct ChooseSendAs;
+} // namespace style
+
+namespace Data {
+class GroupCall;
+} // namespace Data
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
 namespace Main {
 struct SendAsPeer;
 } // namespace Main
@@ -26,17 +38,26 @@ class SendAsButton;
 
 void ChooseSendAsBox(
 	not_null<GenericBox*> box,
+	const style::ChooseSendAs &st,
 	std::vector<Main::SendAsPeer> list,
 	not_null<PeerData*> chosen,
 	Fn<bool(not_null<PeerData*>)> done);
 
 void SetupSendAsButton(
 	not_null<SendAsButton*> button,
+	const style::ChooseSendAs &st,
 	rpl::producer<PeerData*> active,
-	not_null<Window::SessionController*> window);
+	std::shared_ptr<ChatHelpers::Show> show);
+
+void SetupSendAsButton(
+	not_null<SendAsButton*> button,
+	const style::ChooseSendAs &st,
+	std::shared_ptr<Data::GroupCall> videoStream,
+	std::shared_ptr<ChatHelpers::Show> show);
 
 void SetupSendAsButton(
 	not_null<SendAsButton*> button,
+	const style::ChooseSendAs &st,
 	not_null<Window::SessionController*> window);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index 4314f48f207199..68d3770400ab8b 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -8,17 +8,24 @@ For license and copyright information please follow this link:
 #include "ui/chat/choose_theme_controller.h"
 
 #include "boxes/background_box.h"
+#include "boxes/transfer_gift_box.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
 #include "ui/rp_widget.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/chat/message_bubble.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/buttons.h"
-#include "ui/chat/chat_theme.h"
-#include "ui/chat/message_bubble.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/painter.h"
 #include "main/main_session.h"
 #include "window/window_session_controller.h"
 #include "window/themes/window_theme.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_session.h"
 #include "data/data_peer.h"
 #include "data/data_cloud_themes.h"
@@ -38,7 +45,14 @@ namespace {
 
 const auto kDisableElement = [] { return u"disable"_q; };
 
-[[nodiscard]] QImage GeneratePreview(not_null<Ui::ChatTheme*> theme) {
+struct Preview {
+	QImage preview;
+	QRect userpic;
+};
+
+[[nodiscard]] Preview GeneratePreview(
+		not_null<Ui::ChatTheme*> theme,
+		const std::shared_ptr<Ui::DynamicImage> &takenUserpic) {
 	const auto &background = theme->background();
 	const auto &colors = background.colors;
 	const auto size = st::chatThemePreviewSize;
@@ -71,6 +85,7 @@ const auto kDisableElement = [] { return u"disable"_q; };
 			QRect(QPoint(), size * style::DevicePixelRatio()),
 			small);
 	};
+	auto userpic = QRect();
 	const auto fullsize = size * style::DevicePixelRatio();
 	auto result = background.waitingForNegativePattern()
 		? QImage(
@@ -118,8 +133,28 @@ const auto kDisableElement = [] { return u"disable"_q; };
 		}
 		p.setBrush(theme->palette()->msgInBg()->c);
 		p.drawRoundedRect(received, radius, radius);
+
+		if (takenUserpic) {
+			const auto border = 2 * st::lineWidth;
+			const auto inner = received.marginsRemoved(
+				{ border, border, border, border });
+			userpic = inner;
+			userpic.setWidth(userpic.height());
+
+			st::chatThemeGiftTaken.paintInCenter(
+				p,
+				QRect(
+					inner.x() + inner.width() - inner.height() - border,
+					inner.y(),
+					inner.height(),
+					inner.height()),
+				theme->palette()->msgFileInBg()->c);
+		}
 	}
-	return Images::Round(std::move(result), ImageRoundRadius::Large);
+	return {
+		.preview = Images::Round(std::move(result), ImageRoundRadius::Large),
+		.userpic = userpic,
+	};
 }
 
 [[nodiscard]] QImage GenerateEmptyPreview() {
@@ -146,11 +181,16 @@ const auto kDisableElement = [] { return u"disable"_q; };
 } // namespace
 
 struct ChooseThemeController::Entry {
+	QString token;
 	Ui::ChatThemeKey key;
 	std::shared_ptr<Ui::ChatTheme> theme;
 	std::shared_ptr<Data::DocumentMedia> media;
-	QImage preview;
+	std::shared_ptr<Data::UniqueGift> gift;
+	std::shared_ptr<Ui::DynamicImage> takenUserpic;
+	std::unique_ptr<Ui::Text::CustomEmoji> custom;
 	EmojiPtr emoji = nullptr;
+	QImage preview;
+	QRect userpic;
 	QRect geometry;
 	bool chosen = false;
 };
@@ -178,13 +218,17 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 	using namespace rpl::mappers;
 
 	const auto themes = &_controller->session().data().cloudThemes();
+	if (themes->myGiftThemesTokens().empty()) {
+		themes->myGiftThemesLoadMore();
+	}
+
 	const auto &list = themes->chatThemes();
 	if (!list.empty()) {
 		fill(list);
 	} else {
 		themes->refreshChatThemes();
 		themes->chatThemesUpdated(
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			fill(themes->chatThemes());
 		}, lifetime());
 	}
@@ -200,7 +244,7 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 		tr::lng_chat_theme_title(),
 		st::boxTitle);
 	_wrap->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(_wrap.get()).fillRect(clip, st::windowBg);
 	}, lifetime());
 
@@ -211,7 +255,7 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 	rpl::combine(
 		_wrap->widthValue(),
 		titleWrap->positionValue()
-	) | rpl::start_with_next([=](int width, QPoint position) {
+	) | rpl::on_next([=](int width, QPoint position) {
 		close->moveToRight(0, 0, width);
 	}, close->lifetime());
 
@@ -219,13 +263,13 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 	initList();
 
 	_inner->positionValue(
-	) | rpl::start_with_next([=](QPoint position) {
+	) | rpl::on_next([=](QPoint position) {
 		title->move(std::max(position.x(), 0), 0);
 	}, title->lifetime());
 
 	std::move(
 		outer
-	) | rpl::start_with_next([=](QSize outer) {
+	) | rpl::on_next([=](QSize outer) {
 		_wrap->resizeToWidth(outer.width());
 		_wrap->move(0, outer.height() - _wrap->height());
 		const auto line = st::lineWidth;
@@ -236,7 +280,7 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 		_shouldBeShown.value(),
 		_forceHidden.value(),
 		_1 && !_2
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		_wrap->setVisible(shown);
 		_topShadow->setVisible(shown);
 	}, lifetime());
@@ -248,12 +292,10 @@ void ChooseThemeController::initButtons() {
 		controls,
 		tr::lng_chat_theme_apply(),
 		st::defaultLightButton);
-	apply->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	const auto choose = CreateChild<RoundButton>(
 		controls,
 		tr::lng_chat_theme_change_wallpaper(),
 		st::defaultLightButton);
-	choose->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 
 	const auto &margin = st::chatThemeButtonMargin;
 	controls->resize(
@@ -264,12 +306,12 @@ void ChooseThemeController::initButtons() {
 		apply->widthValue(),
 		choose->widthValue(),
 		_chosen.value()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int outer,
 			int applyWidth,
 			int chooseWidth,
 			QString chosen) {
-		const auto was = _peer->themeEmoji();
+		const auto was = _peer->themeToken();
 		const auto now = (chosen == kDisableElement()) ? QString() : chosen;
 		const auto changed = (now != was);
 		apply->setVisible(changed);
@@ -281,40 +323,50 @@ void ChooseThemeController::initButtons() {
 		shown->moveToLeft(left, margin.top());
 	}, controls->lifetime());
 
+	const auto setTheme = crl::guard(apply, [=](
+			const QString &token,
+			const std::shared_ptr<Ui::ChatTheme> &theme) {
+		SetPeerTheme(_controller, _peer, token, theme);
+		_controller->toggleChooseChatTheme(_peer);
+	});
+	const auto confirmTakeGiftTheme = crl::guard(apply, [=](
+			const QString &token,
+			const std::shared_ptr<Ui::ChatTheme> &theme,
+			not_null<PeerData*> nowHasTheme) {
+		_controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+			const auto confirmed = [=](Fn<void()> close) {
+				setTheme(token, theme);
+				close();
+			};
+			Ui::ConfirmBox(box, {
+				.text = tr::lng_chat_theme_gift_replace(
+					lt_name,
+					rpl::single(tr::bold(nowHasTheme->shortName())),
+					tr::marked),
+				.confirmed = confirmed,
+				.confirmText = tr::lng_box_yes(),
+			});
+		}));
+	});
 	apply->setClickedCallback([=] {
 		if (const auto chosen = findChosen()) {
-			const auto was = _peer->themeEmoji();
+			const auto was = _peer->themeToken();
 			const auto now = chosen->key ? _chosen.current() : QString();
+			const auto user = chosen->gift
+				? chosen->gift->themeUser
+				: nullptr;
 			if (was != now) {
-				_peer->setThemeEmoji(now);
-				const auto dropWallPaper = (_peer->wallPaper() != nullptr);
-				if (dropWallPaper) {
-					_peer->setWallPaper({});
-				}
-
-				if (chosen->theme) {
-					// Remember while changes propagate through event loop.
-					_controller->pushLastUsedChatTheme(chosen->theme);
+				if (!user || user == _peer) {
+					setTheme(now, chosen->theme);
+				} else {
+					confirmTakeGiftTheme(now, chosen->theme, user);
 				}
-				const auto api = &_peer->session().api();
-				api->request(MTPmessages_SetChatWallPaper(
-					MTP_flags(0),
-					_peer->input,
-					MTPInputWallPaper(),
-					MTPWallPaperSettings(),
-					MTPint()
-				)).afterDelay(10).done([=](const MTPUpdates &result) {
-					api->applyUpdates(result);
-				}).send();
-				api->request(MTPmessages_SetChatTheme(
-					_peer->input,
-					MTP_string(now)
-				)).done([=](const MTPUpdates &result) {
-					api->applyUpdates(result);
-				}).send();
+			} else {
+				_controller->toggleChooseChatTheme(_peer);
 			}
+		} else {
+			_controller->toggleChooseChatTheme(_peer);
 		}
-		_controller->toggleChooseChatTheme(_peer);
 	});
 	choose->setClickedCallback([=] {
 		_controller->show(Box<BackgroundBox>(_controller, _peer));
@@ -324,16 +376,34 @@ void ChooseThemeController::initButtons() {
 void ChooseThemeController::paintEntry(QPainter &p, const Entry &entry) {
 	const auto geometry = entry.geometry;
 	p.drawImage(geometry, entry.preview);
+	if (const auto userpic = entry.takenUserpic.get()) {
+		userpic->subscribeToUpdates([=] {
+			_inner->update();
+		});
+		p.drawImage(
+			entry.userpic.translated(geometry.topLeft()),
+			userpic->image(entry.userpic.height()));
+	}
 
 	const auto size = Ui::Emoji::GetSizeLarge();
 	const auto factor = style::DevicePixelRatio();
-	const auto emojiLeft = geometry.x()
-		+ (geometry.width() - (size / factor)) / 2;
+	const auto esize = size / factor;
+	const auto emojiLeft = geometry.x() + (geometry.width() - esize) / 2;
 	const auto emojiTop = geometry.y()
 		+ geometry.height()
-		- (size / factor)
+		- esize
 		- st::chatThemeEmojiBottom;
-	Ui::Emoji::Draw(p, entry.emoji, size, emojiLeft, emojiTop);
+	const auto customSize = Ui::Text::AdjustCustomEmojiSize(esize);
+	const auto customSkip = (esize - customSize) / 2;
+
+	if (const auto emoji = entry.emoji) {
+		Ui::Emoji::Draw(p, emoji, size, emojiLeft, emojiTop);
+	} else if (const auto custom = entry.custom.get()) {
+		custom->paint(p, {
+			.textColor = st::windowFg->c,
+			.position = { emojiLeft + customSkip, emojiTop + customSkip },
+		});
+	}
 
 	if (entry.chosen) {
 		auto hq = PainterHighQualityEnabler(p);
@@ -358,7 +428,7 @@ void ChooseThemeController::initList() {
 	_inner->setMouseTracking(true);
 
 	_inner->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(_inner.get());
 		for (const auto &entry : _entries) {
 			if (entry.preview.isNull() || !clip.intersects(entry.geometry)) {
@@ -379,13 +449,13 @@ void ChooseThemeController::initList() {
 		if (!entry) {
 			return QString();
 		} else if (entry->key) {
-			return entry->emoji->text();
+			return entry->token;
 		} else {
 			return kDisableElement();
 		}
 	};
 	_inner->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> event) {
+	) | rpl::on_next([=](not_null<QEvent*> event) {
 		const auto type = event->type();
 		if (type == QEvent::MouseMove) {
 			const auto mouse = static_cast<QMouseEvent*>(event.get());
@@ -429,7 +499,7 @@ void ChooseThemeController::initList() {
 					_controller->overridePeerTheme(
 						_peer,
 						entry->theme,
-						entry->emoji);
+						entry->token);
 				}
 				_inner->update();
 			}
@@ -450,7 +520,7 @@ void ChooseThemeController::initList() {
 	}, lifetime());
 
 	_content->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> event) {
+	) | rpl::on_next([=](not_null<QEvent*> event) {
 		const auto type = event->type();
 		if (type == QEvent::KeyPress) {
 			const auto key = static_cast<QKeyEvent*>(event.get());
@@ -463,7 +533,7 @@ void ChooseThemeController::initList() {
 	rpl::combine(
 		_content->widthValue(),
 		_inner->widthValue()
-	) | rpl::start_with_next([=](int content, int inner) {
+	) | rpl::on_next([=](int content, int inner) {
 		if (!content || !inner) {
 			return;
 		} else if (!_entries.empty() && !_initialInnerLeftApplied) {
@@ -488,11 +558,15 @@ void ChooseThemeController::updateInnerLeft(int now) {
 		? (skip / 2)
 		: std::clamp(now, skip, 0);
 	_inner->move(clamped, 0);
+	const auto visibleTill = -clamped + _content->width();
+	if (_giftsFinishAt - visibleTill < _content->width()) {
+		_peer->owner().cloudThemes().myGiftThemesLoadMore();
+	}
 }
 
 void ChooseThemeController::close() {
 	if (const auto chosen = findChosen()) {
-		if (Ui::Emoji::Find(_peer->themeEmoji()) != chosen->emoji) {
+		if (_peer->themeToken() != chosen->token) {
 			clearCurrentBackgroundState();
 		}
 	}
@@ -515,7 +589,7 @@ auto ChooseThemeController::findChosen() -> Entry* {
 	for (auto &entry : _entries) {
 		if (!entry.key && chosen == kDisableElement()) {
 			return &entry;
-		} else if (chosen == entry.emoji->text()) {
+		} else if (chosen == entry.token) {
 			return &entry;
 		}
 	}
@@ -531,42 +605,41 @@ void ChooseThemeController::fill(
 	if (themes.empty()) {
 		return;
 	}
-	const auto count = int(themes.size()) + 1;
 	const auto single = st::chatThemePreviewSize;
 	const auto skip = st::chatThemeEntrySkip;
 	const auto &margin = st::chatThemeEntryMargin;
-	const auto full = margin.left()
-		+ single.width() * count
-		+ skip * (count - 1)
-		+ margin.right();
-	_inner->resize(
-		full,
-		margin.top() + single.height() + margin.bottom());
-
-	const auto initial = Ui::Emoji::Find(_peer->themeEmoji());
-	if (!initial) {
+	const auto initial = _peer->themeToken();
+	if (initial.isEmpty()) {
 		_chosen = kDisableElement();
 	}
 
-	_dark.value(
-	) | rpl::start_with_next([=](bool dark) {
+	const auto cloudThemes = &_controller->session().data().cloudThemes();
+	rpl::combine(
+		_dark.value(),
+		rpl::single(
+			rpl::empty
+		) | rpl::then(cloudThemes->myGiftThemesUpdated())
+	) | rpl::on_next([=](bool dark, auto) {
+		if (!cloudThemes->myGiftThemesReady()) {
+			return;
+		}
 		clearCurrentBackgroundState();
-		if (_chosen.current().isEmpty() && initial) {
-			_chosen = initial->text();
+		if (_chosen.current().isEmpty() && !initial.isEmpty()) {
+			_chosen = initial;
 		}
 
 		_cachingLifetime.destroy();
 		const auto old = base::take(_entries);
 		auto x = margin.left();
 		_entries.push_back({
-			.preview = GenerateEmptyPreview(),
 			.emoji = _disabledEmoji,
+			.preview = GenerateEmptyPreview(),
 			.geometry = QRect(QPoint(x, margin.top()), single),
 			.chosen = (_chosen.current() == kDisableElement()),
 		});
 		Assert(_entries.front().emoji != nullptr);
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_entries.front().preview = GenerateEmptyPreview();
 		}, _cachingLifetime);
 
@@ -575,16 +648,36 @@ void ChooseThemeController::fill(
 			: Data::CloudThemeType::Light;
 
 		x += single.width() + skip;
-		for (const auto &theme : themes) {
-			const auto emoji = Ui::Emoji::Find(theme.emoticon);
-			if (!emoji || !theme.settings.contains(type)) {
-				continue;
+
+		const auto owner = &_controller->session().data();
+		const auto manager = &owner->customEmojiManager();
+		const auto push = [&](
+				const Data::CloudTheme &theme,
+				const QString &token) {
+			if (token.isEmpty() || !theme.settings.contains(type)) {
+				return;
 			}
 			const auto key = ChatThemeKey{ theme.id, dark };
-			const auto isChosen = (_chosen.current() == emoji->text());
+			const auto isChosen = (_chosen.current() == token);
+			const auto themeUser = theme.unique
+				? theme.unique->themeUser
+				: nullptr;
 			_entries.push_back({
+				.token = token,
 				.key = key,
-				.emoji = emoji,
+				.gift = theme.unique,
+				.takenUserpic = (themeUser
+					? Ui::MakeUserpicThumbnail(themeUser, true)
+					: nullptr),
+				.custom = (theme.unique
+					? manager->create(
+						theme.unique->model.document,
+						[=] { _inner->update(); },
+						Data::CustomEmojiSizeTag::Large)
+					: nullptr),
+				.emoji = (theme.emoticon.isEmpty()
+					? nullptr
+					: Ui::Emoji::Find(theme.emoticon)),
 				.geometry = QRect(QPoint(x, skip), single),
 				.chosen = isChosen,
 			});
@@ -596,20 +689,20 @@ void ChooseThemeController::fill(
 				return data && (data->key() == key);
 			}) | rpl::take(
 				1
-			) | rpl::start_with_next([=](std::shared_ptr<ChatTheme> &&data) {
+			) | rpl::on_next([=](std::shared_ptr<ChatTheme> &&data) {
 				const auto key = data->key();
 				const auto i = ranges::find(_entries, key, &Entry::key);
 				if (i == end(_entries)) {
 					return;
 				}
 				const auto theme = data.get();
+				const auto token = i->token;
 				i->theme = std::move(data);
-				i->preview = GeneratePreview(theme);
-				if (_chosen.current() == i->emoji->text()) {
-					_controller->overridePeerTheme(
-						_peer,
-						i->theme,
-						i->emoji);
+				auto generated = GeneratePreview(theme, i->takenUserpic);
+				i->preview = std::move(generated.preview);
+				i->userpic = generated.userpic;
+				if (_chosen.current() == token) {
+					_controller->overridePeerTheme(_peer, i->theme, token);
 				}
 				_inner->update();
 
@@ -626,7 +719,7 @@ void ChooseThemeController::fill(
 						&Entry::key);
 					return (i == end(_entries))
 						|| !i->theme->background().prepared.isNull();
-				}) | rpl::take(1) | rpl::start_with_next([=] {
+				}) | rpl::take(1) | rpl::on_next([=] {
 					const auto i = ranges::find(
 						_entries,
 						key,
@@ -634,13 +727,41 @@ void ChooseThemeController::fill(
 					if (i == end(_entries)) {
 						return;
 					}
-					i->preview = GeneratePreview(theme);
+					auto generated = GeneratePreview(theme, i->takenUserpic);
+					i->preview = std::move(generated.preview);
+					i->userpic = generated.userpic;
 					_inner->update();
 				}, _cachingLifetime);
 			}, _cachingLifetime);
 			x += single.width() + skip;
+		};
+
+		_giftsFinishAt = 0;
+		if (const auto now = cloudThemes->themeForToken(initial)) {
+			push(*now, initial);
+		}
+		for (const auto &token : cloudThemes->myGiftThemesTokens()) {
+			if (const auto found = cloudThemes->themeForToken(token)) {
+				if (token != initial) {
+					push(*found, token);
+					_giftsFinishAt = x;
+				}
+			}
+		}
+		for (const auto &theme : themes) {
+			if (const auto emoji = Ui::Emoji::Find(theme.emoticon)) {
+				const auto token = emoji->text();
+				if (token != initial) {
+					push(theme, token);
+				}
+			}
 		}
 
+		const auto full = x - skip + margin.right();
+		_inner->resize(
+			full,
+			margin.top() + single.height() + margin.bottom());
+
 		if (!_initialInnerLeftApplied && _content->width() > 0) {
 			applyInitialInnerLeft();
 		}
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.h b/Telegram/SourceFiles/ui/chat/choose_theme_controller.h
index 603c57839a72cf..3a824ddcdf9e35 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.h
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.h
@@ -73,6 +73,7 @@ class ChooseThemeController final {
 	std::optional<QPoint> _pressPosition;
 	std::optional<QPoint> _dragStartPosition;
 	int _dragStartInnerLeft = 0;
+	int _giftsFinishAt = 0;
 	bool _initialInnerLeftApplied = false;
 
 	rpl::variable<bool> _shouldBeShown = false;
diff --git a/Telegram/SourceFiles/ui/chat/forward_options_box.cpp b/Telegram/SourceFiles/ui/chat/forward_options_box.cpp
index f6174968e57cb6..65f24c2946d8fa 100644
--- a/Telegram/SourceFiles/ui/chat/forward_options_box.cpp
+++ b/Telegram/SourceFiles/ui/chat/forward_options_box.cpp
@@ -46,7 +46,7 @@ void FillForwardOptions(
 		});
 	};
 	names->checkedChanges(
-	) | rpl::start_with_next([=](bool showNames) {
+	) | rpl::on_next([=](bool showNames) {
 		if (showNames && captions && !captions->checked()) {
 			captions->setChecked(true, anim::type::normal);
 		} else {
@@ -55,7 +55,7 @@ void FillForwardOptions(
 	}, lifetime);
 	if (captions) {
 		captions->checkedChanges(
-		) | rpl::start_with_next([=](bool showCaptions) {
+		) | rpl::on_next([=](bool showCaptions) {
 			if (!showCaptions && names->checked()) {
 				names->setChecked(false, anim::type::normal);
 			} else {
@@ -65,72 +65,4 @@ void FillForwardOptions(
 	}
 }
 
-void ForwardOptionsBox(
-		not_null<GenericBox*> box,
-		int count,
-		ForwardOptions options,
-		Fn<void(ForwardOptions)> optionsChanged,
-		Fn<void()> changeRecipient) {
-	Expects(optionsChanged != nullptr);
-	Expects(changeRecipient != nullptr);
-
-	box->setTitle((count == 1)
-		? tr::lng_forward_title()
-		: tr::lng_forward_many_title(
-			lt_count,
-			rpl::single(count) | tr::to_count()));
-	box->addButton(tr::lng_box_done(), [=] {
-		box->closeBox();
-	});
-
-	box->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
-		if (e->type() == QEvent::KeyPress) {
-			const auto k = static_cast<QKeyEvent*>(e.get());
-			if (k->key() == Qt::Key_Enter || k->key() == Qt::Key_Return) {
-				box->closeBox();
-			}
-		}
-	}, box->lifetime());
-
-	box->addRow(
-		object_ptr<Ui::FlatLabel>(
-			box.get(),
-			(count == 1
-				? tr::lng_forward_about()
-				: tr::lng_forward_many_about()),
-			st::boxLabel),
-		st::boxRowPadding);
-	const auto checkboxPadding = style::margins(
-		st::boxRowPadding.left(),
-		st::boxRowPadding.left(),
-		st::boxRowPadding.right(),
-		st::boxRowPadding.bottom());
-
-	auto createView = [&](rpl::producer<QString> &&text, bool checked) {
-		return box->addRow(
-			object_ptr<Ui::Checkbox>(
-				box.get(),
-				std::move(text),
-				checked,
-				st::defaultBoxCheckbox),
-			checkboxPadding)->checkView();
-	};
-	FillForwardOptions(
-		std::move(createView),
-		options,
-		std::move(optionsChanged),
-		box->lifetime());
-
-	box->addRow(
-		object_ptr<Ui::LinkButton>(
-			box.get(),
-			tr::lng_forward_change_recipient(tr::now)),
-		checkboxPadding
-	)->setClickedCallback([=] {
-		box->closeBox();
-		changeRecipient();
-	});
-}
-
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/forward_options_box.h b/Telegram/SourceFiles/ui/chat/forward_options_box.h
index 9d8cfd97faf2f6..65db5fbe067e34 100644
--- a/Telegram/SourceFiles/ui/chat/forward_options_box.h
+++ b/Telegram/SourceFiles/ui/chat/forward_options_box.h
@@ -28,11 +28,4 @@ void FillForwardOptions(
 	Fn<void(ForwardOptions)> optionsChanged,
 	rpl::lifetime &lifetime);
 
-void ForwardOptionsBox(
-	not_null<GenericBox*> box,
-	int count,
-	ForwardOptions options,
-	Fn<void(ForwardOptions)> optionsChanged,
-	Fn<void()> changeRecipient);
-
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
index 239028b1fe8b73..13481b99dda559 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -31,7 +31,7 @@ GroupCallScheduledLeft::GroupCallScheduledLeft(TimeId date)
 , _timer([=] { update(); }) {
 	update();
 	base::unixtime::updates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		restart();
 	}, _lifetime);
 }
@@ -120,7 +120,7 @@ GroupCallBar::GroupCallBar(
 	_shadow->hide();
 
 	_wrap.entity()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(_wrap.entity()).fillRect(clip, st::historyPinnedBg);
 	}, lifetime());
 	_wrap.setAttribute(Qt::WA_OpaquePaintEvent);
@@ -131,7 +131,7 @@ GroupCallBar::GroupCallBar(
 
 	rpl::duplicate(
 		copy
-	) | rpl::start_with_next([=](GroupCallBarContent &&content) {
+	) | rpl::on_next([=](GroupCallBarContent &&content) {
 		_content = content;
 		_userpics->update(_content.users, !_wrap.isHidden());
 		_inner->update();
@@ -145,7 +145,7 @@ GroupCallBar::GroupCallBar(
 		copy
 	) | rpl::map([=](const GroupCallBarContent &content) {
 		return !content.shown;
-	}) | rpl::start_with_next_done([=](bool hidden) {
+	}) | rpl::on_next_done([=](bool hidden) {
 		_shouldBeShown = !hidden;
 		if (!_forceHidden) {
 			_wrap.toggle(_shouldBeShown, anim::type::normal);
@@ -200,9 +200,10 @@ void GroupCallBar::refreshScheduledProcess() {
 			_inner.get(),
 			_scheduledProcess->text(GroupCallScheduledLeft::Negative::Show),
 			st::groupCallTopBarOpen);
+		_open->setTextTransform(RoundButtonTextTransform::ToUpper);
 		setupRightButton(_open.get());
 		_open->widthValue(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshOpenBrush();
 		}, _open->lifetime());
 	} else {
@@ -213,7 +214,7 @@ void GroupCallBar::refreshScheduledProcess() {
 void GroupCallBar::setupInner() {
 	_inner->resize(0, st::historyReplyHeight);
 	_inner->paintRequest(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		auto p = Painter(_inner);
 		paint(p);
 	}, _inner->lifetime());
@@ -237,7 +238,7 @@ void GroupCallBar::setupInner() {
 	) | rpl::to_empty | rpl::start_to_stream(_barClicks, _inner->lifetime());
 
 	_wrap.geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		updateShadowGeometry(rect);
 		updateControlsGeometry(rect);
 	}, _inner->lifetime());
@@ -248,7 +249,7 @@ void GroupCallBar::setupRightButton(not_null<RoundButton*> button) {
 	rpl::combine(
 		_inner->widthValue(),
 		button->widthValue()
-	) | rpl::start_with_next([=](int outerWidth, int buttonWidth) {
+	) | rpl::on_next([=](int outerWidth, int buttonWidth) {
 		// Skip shadow of the bar above.
 		const auto top = (st::historyReplyHeight
 			- st::lineWidth
diff --git a/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp b/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
index 4044c7d26febce..24ca26169704bd 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_userpics.cpp
@@ -95,7 +95,7 @@ GroupCallUserpics::GroupCallUserpics(
 	_maxWidth = 2 * single + (limit - 1) * (single - shift);
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &userpic : _list) {
 			userpic.cache = QImage();
 		}
@@ -120,7 +120,7 @@ GroupCallUserpics::GroupCallUserpics(
 	rpl::combine(
 		PowerSaving::OnValue(PowerSaving::kCalls),
 		std::move(hideBlobs)
-	) | rpl::start_with_next([=](bool disabled, bool deactivated) {
+	) | rpl::on_next([=](bool disabled, bool deactivated) {
 		const auto hide = disabled || deactivated;
 
 		if (!(hide && _speakingAnimationHideLastTime)) {
@@ -241,7 +241,7 @@ void GroupCallUserpics::sendRandomLevels() {
 	for (auto &userpic : _list) {
 		if (const auto blobs = userpic.blobsAnimation.get()) {
 			const auto value = 30 + base::RandomIndex(70);
-			userpic.blobsAnimation->blobs.setLevel(float64(value) / 100.);
+			blobs->blobs.setLevel(float64(value) / 100.);
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/ui/chat/message_bar.cpp b/Telegram/SourceFiles/ui/chat/message_bar.cpp
index 7699445668990e..0efe8eaa97d36b 100644
--- a/Telegram/SourceFiles/ui/chat/message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/message_bar.cpp
@@ -56,7 +56,7 @@ MessageBar::MessageBar(
 	setup();
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_topBarGradient = _bottomBarGradient = QPixmap();
 	}, _widget.lifetime());
 }
@@ -72,7 +72,7 @@ void MessageBar::customEmojiRepaint() {
 void MessageBar::setup() {
 	_widget.resize(0, st::historyReplyHeight);
 	_widget.paintRequest(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		auto p = Painter(&_widget);
 		p.setInactive(_customEmojiPaused());
 		_customEmojiRepaintScheduled = false;
@@ -89,7 +89,7 @@ void MessageBar::set(rpl::producer<MessageBarContent> content) {
 	_contentLifetime.destroy();
 	std::move(
 		content
-	) | rpl::start_with_next([=](MessageBarContent &&content) {
+	) | rpl::on_next([=](MessageBarContent &&content) {
 		tweenTo(std::move(content));
 	}, _contentLifetime);
 }
diff --git a/Telegram/SourceFiles/ui/chat/message_bar.h b/Telegram/SourceFiles/ui/chat/message_bar.h
index 36b96658e4ee28..6132ae446b42c3 100644
--- a/Telegram/SourceFiles/ui/chat/message_bar.h
+++ b/Telegram/SourceFiles/ui/chat/message_bar.h
@@ -26,7 +26,7 @@ struct MessageBarContent {
 	int count = 1;
 	QString title;
 	TextWithEntities text;
-	std::any context;
+	Text::MarkedContext context;
 	QImage preview;
 	Fn<void()> spoilerRepaint;
 	style::margins margins;
diff --git a/Telegram/SourceFiles/ui/chat/message_bubble.cpp b/Telegram/SourceFiles/ui/chat/message_bubble.cpp
index 8d398e51c5be36..8f6fa311799038 100644
--- a/Telegram/SourceFiles/ui/chat/message_bubble.cpp
+++ b/Telegram/SourceFiles/ui/chat/message_bubble.cpp
@@ -156,7 +156,8 @@ void PaintBubbleGeneric(
 }
 
 void PaintPatternBubble(QPainter &p, const SimpleBubble &args) {
-	const auto opacity = args.st->msgOutBg()->c.alphaF();
+	const auto wasOpacity = p.opacity();
+	const auto opacity = args.st->msgOutBg()->c.alphaF() * wasOpacity;
 	const auto shadowOpacity = opacity * args.st->msgOutShadow()->c.alphaF();
 	const auto pattern = args.pattern;
 	const auto &tail = (args.rounding.bottomRight == Corner::Tail)
@@ -214,7 +215,7 @@ void PaintPatternBubble(QPainter &p, const SimpleBubble &args) {
 
 	p.setOpacity(opacity);
 	PaintBubbleGeneric(args, fillBg, fillSh, fillCorner, paintTail);
-	p.setOpacity(1.);
+	p.setOpacity(wasOpacity);
 }
 
 void PaintSolidBubble(QPainter &p, const SimpleBubble &args) {
diff --git a/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp b/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp
index d78a60696f6300..be658165bee559 100644
--- a/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/more_chats_bar.cpp
@@ -28,7 +28,7 @@ MoreChatsBar::MoreChatsBar(
 	_shadow->hide();
 
 	_wrap.entity()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(_wrap.entity()).fillRect(clip, st::historyPinnedBg);
 	}, lifetime());
 	_wrap.setAttribute(Qt::WA_OpaquePaintEvent);
@@ -39,7 +39,7 @@ MoreChatsBar::MoreChatsBar(
 
 	rpl::duplicate(
 		copy
-	) | rpl::start_with_next([=](MoreChatsBarContent &&content) {
+	) | rpl::on_next([=](MoreChatsBarContent &&content) {
 		_content = content;
 		if (_content.count > 0) {
 			_text.setText(
@@ -64,7 +64,7 @@ MoreChatsBar::MoreChatsBar(
 		copy
 	) | rpl::map([=](const MoreChatsBarContent &content) {
 		return !content.count;
-	}) | rpl::start_with_next_done([=](bool hidden) {
+	}) | rpl::on_next_done([=](bool hidden) {
 		_shouldBeShown = !hidden;
 		if (!_forceHidden) {
 			_wrap.toggle(_shouldBeShown, anim::type::normal);
@@ -82,7 +82,7 @@ MoreChatsBar::~MoreChatsBar() = default;
 void MoreChatsBar::setupInner() {
 	_inner->resize(0, st::moreChatsBarHeight);
 	_inner->paintRequest(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		auto p = Painter(_inner);
 		paint(p);
 	}, _inner->lifetime());
@@ -104,7 +104,7 @@ void MoreChatsBar::setupInner() {
 	) | rpl::to_empty | rpl::start_to_stream(_barClicks, _inner->lifetime());
 
 	_wrap.geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		updateShadowGeometry(rect);
 		updateControlsGeometry(rect);
 	}, _inner->lifetime());
diff --git a/Telegram/SourceFiles/ui/chat/pinned_bar.cpp b/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
index eb2cf01d17dbd5..7983fee85611c4 100644
--- a/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
@@ -38,7 +38,7 @@ PinnedBar::PinnedBar(
 	}));
 
 	_wrap.entity()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(_wrap.entity()).fillRect(clip, st::historyPinnedBg);
 	}, lifetime());
 	_wrap.setAttribute(Qt::WA_OpaquePaintEvent);
@@ -46,7 +46,7 @@ PinnedBar::PinnedBar(
 	if (customEmojiPausedChanges) {
 		std::move(
 			customEmojiPausedChanges
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_wrap.entity()->update();
 		}, lifetime());
 	}
@@ -67,7 +67,7 @@ void PinnedBar::setContent(rpl::producer<Ui::MessageBarContent> content) {
 		copy
 	) | rpl::filter([=](const MessageBarContent &content) {
 		return !content.title.isEmpty() || !content.text.text.isEmpty();
-	}) | rpl::start_with_next([=](MessageBarContent &&content) {
+	}) | rpl::on_next([=](MessageBarContent &&content) {
 		const auto creating = !_bar;
 		if (creating) {
 			createControls();
@@ -88,7 +88,7 @@ void PinnedBar::setContent(rpl::producer<Ui::MessageBarContent> content) {
 		copy
 	) | rpl::map([=](const MessageBarContent &content) {
 		return content.title.isEmpty() || content.text.text.isEmpty();
-	}) | rpl::start_with_next_done([=](bool hidden) {
+	}) | rpl::on_next_done([=](bool hidden) {
 		_shouldBeShown = !hidden;
 		if (!_forceHidden) {
 			_wrap.toggle(_shouldBeShown, anim::type::normal);
@@ -106,7 +106,7 @@ void PinnedBar::setRightButton(object_ptr<Ui::RpWidget> button) {
 	if (auto previous = _right.button.release()) {
 		using Unique = base::unique_qptr<Ui::FadeWrapScaled<Ui::RpWidget>>;
 		_right.previousButtonLifetime = previous->shownValue(
-		) | rpl::filter(!rpl::mappers::_1) | rpl::start_with_next([=] {
+		) | rpl::filter(!rpl::mappers::_1) | rpl::on_next([=] {
 			_right.previousButtonLifetime.destroy();
 		});
 		previous->hide(anim::type::normal);
@@ -164,23 +164,29 @@ void PinnedBar::createControls() {
 
 	// Clicks.
 	_bar->widget()->setCursor(style::cur_pointer);
-	_bar->widget()->events(
-	) | rpl::filter([=](not_null<QEvent*> event) {
-		return (event->type() == QEvent::MouseButtonPress)
-			&& (static_cast<QMouseEvent*>(event.get())->button()
-					== Qt::LeftButton);
-	}) | rpl::map([=] {
-		return _bar->widget()->events(
-		) | rpl::filter([](not_null<QEvent*> event) {
-			return (event->type() == QEvent::MouseButtonRelease);
-		}) | rpl::take(1) | rpl::filter([=](not_null<QEvent*> event) {
-			return _bar->widget()->rect().contains(
-				static_cast<QMouseEvent*>(event.get())->pos());
-		});
-	}) | rpl::flatten_latest(
-	) | rpl::to_empty | rpl::start_to_stream(
-		_barClicks,
-		_bar->widget()->lifetime());
+	const auto fillClicks = [=](
+			Qt::MouseButton button,
+			rpl::event_stream<> &stream) {
+		_bar->widget()->events(
+		) | rpl::filter([=](not_null<QEvent*> event) {
+			return (event->type() == QEvent::MouseButtonPress)
+				&& (static_cast<QMouseEvent*>(event.get())->button()
+						== button);
+		}) | rpl::map([=] {
+			return _bar->widget()->events(
+			) | rpl::filter([](not_null<QEvent*> event) {
+				return (event->type() == QEvent::MouseButtonRelease);
+			}) | rpl::take(1) | rpl::filter([=](not_null<QEvent*> event) {
+				return _bar->widget()->rect().contains(
+					static_cast<QMouseEvent*>(event.get())->pos());
+			});
+		}) | rpl::flatten_latest(
+		) | rpl::to_empty | rpl::start_to_stream(
+			stream,
+			_bar->widget()->lifetime());
+	};
+	fillClicks(Qt::LeftButton, _barClicks);
+	fillClicks(Qt::RightButton, _barRightClicks);
 
 	_bar->widget()->move(0, 0);
 	_bar->widget()->show();
@@ -189,7 +195,7 @@ void PinnedBar::createControls() {
 		_bar->widget()->height());
 
 	_wrap.geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		updateShadowGeometry(rect);
 		updateControlsGeometry(rect);
 	}, _bar->widget()->lifetime());
@@ -199,7 +205,7 @@ void PinnedBar::createControls() {
 		1
 	) | rpl::filter([=](bool shown) {
 		return !shown && !_forceHidden;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_bar = nullptr;
 	}, _bar->widget()->lifetime());
 
@@ -247,6 +253,9 @@ void PinnedBar::move(int x, int y) {
 
 void PinnedBar::resizeToWidth(int width) {
 	_wrap.entity()->resizeToWidth(width);
+	if (!_wrap.width()) {
+		_wrap.resizeToWidth(width);
+	}
 }
 
 int PinnedBar::height() const {
@@ -265,6 +274,10 @@ rpl::producer<> PinnedBar::barClicks() const {
 	return _barClicks.events();
 }
 
+rpl::producer<> PinnedBar::barRightClicks() const {
+	return _barRightClicks.events();
+}
+
 rpl::producer<> PinnedBar::contextMenuRequested() const {
 	return _wrap.entity()->paintRequest(
 	) | rpl::filter([=] {
diff --git a/Telegram/SourceFiles/ui/chat/pinned_bar.h b/Telegram/SourceFiles/ui/chat/pinned_bar.h
index fa9917eedddbc6..6505d181117f54 100644
--- a/Telegram/SourceFiles/ui/chat/pinned_bar.h
+++ b/Telegram/SourceFiles/ui/chat/pinned_bar.h
@@ -44,6 +44,7 @@ class PinnedBar final {
 	[[nodiscard]] int height() const;
 	[[nodiscard]] rpl::producer<int> heightValue() const;
 	[[nodiscard]] rpl::producer<> barClicks() const;
+	[[nodiscard]] rpl::producer<> barRightClicks() const;
 	[[nodiscard]] rpl::producer<> contextMenuRequested() const;
 
 	[[nodiscard]] rpl::lifetime &lifetime() {
@@ -67,6 +68,7 @@ class PinnedBar final {
 	std::unique_ptr<Ui::PlainShadow> _shadow;
 	Fn<bool()> _customEmojiPaused;
 	rpl::event_stream<> _barClicks;
+	rpl::event_stream<> _barRightClicks;
 	rpl::event_stream<> _contextMenuRequested;
 	Fn<QRect(QRect)> _shadowGeometryPostprocess;
 	bool _shouldBeShown = false;
diff --git a/Telegram/SourceFiles/ui/chat/requests_bar.cpp b/Telegram/SourceFiles/ui/chat/requests_bar.cpp
index c8841f5791af0e..0b14c18fd5a79e 100644
--- a/Telegram/SourceFiles/ui/chat/requests_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/requests_bar.cpp
@@ -36,7 +36,7 @@ RequestsBar::RequestsBar(
 	_shadow->hide();
 
 	_wrap.entity()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		QPainter(_wrap.entity()).fillRect(clip, st::historyPinnedBg);
 	}, lifetime());
 	_wrap.setAttribute(Qt::WA_OpaquePaintEvent);
@@ -47,7 +47,7 @@ RequestsBar::RequestsBar(
 
 	rpl::duplicate(
 		copy
-	) | rpl::start_with_next([=](RequestsBarContent &&content) {
+	) | rpl::on_next([=](RequestsBarContent &&content) {
 		_content = content;
 		if (_content.count > 0) {
 			if (_content.count == 1 && !_content.nameFull.isEmpty()) {
@@ -84,7 +84,7 @@ RequestsBar::RequestsBar(
 		copy
 	) | rpl::map([=](const RequestsBarContent &content) {
 		return !content.count;
-	}) | rpl::start_with_next_done([=](bool hidden) {
+	}) | rpl::on_next_done([=](bool hidden) {
 		_shouldBeShown = !hidden;
 		if (!_forceHidden) {
 			_wrap.toggle(_shouldBeShown, anim::type::normal);
@@ -95,7 +95,7 @@ RequestsBar::RequestsBar(
 	}, lifetime());
 
 	_userpics->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_userpicsWidth = width;
 	}, lifetime());
 
@@ -107,7 +107,7 @@ RequestsBar::~RequestsBar() = default;
 void RequestsBar::setupInner() {
 	_inner->resize(0, st::historyRequestsHeight);
 	_inner->paintRequest(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		auto p = Painter(_inner);
 		paint(p);
 	}, _inner->lifetime());
@@ -129,7 +129,7 @@ void RequestsBar::setupInner() {
 	) | rpl::to_empty | rpl::start_to_stream(_barClicks, _inner->lifetime());
 
 	_wrap.geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
+	) | rpl::on_next([=](QRect rect) {
 		updateShadowGeometry(rect);
 		updateControlsGeometry(rect);
 	}, _inner->lifetime());
diff --git a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
new file mode 100644
index 00000000000000..4218ae0063fcd5
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.cpp
@@ -0,0 +1,427 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/sponsored_message_bar.h"
+
+#include "core/application.h"
+#include "core/click_handler_types.h"
+#include "core/ui_integration.h" // TextContext
+#include "data/components/sponsored_messages.h"
+#include "data/data_session.h"
+#include "history/history_item_helpers.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "menu/menu_sponsored.h"
+#include "ui/chat/chat_style.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
+#include "ui/effects/animation_value.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/image/image_prepare.h"
+#include "ui/power_saving.h"
+#include "ui/rect.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/shadow.h"
+#include "window/section_widget.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_color_indices.h"
+#include "styles/style_dialogs.h"
+
+namespace Ui {
+namespace {
+
+struct Colors final {
+	QColor bg;
+	QColor fg;
+};
+
+using ColorFactory = Fn<Colors()>;
+
+class BadgeButton final : public Ui::RippleButton {
+public:
+	BadgeButton(
+		not_null<Ui::RpWidget*> parent,
+		tr::phrase<> text,
+		ColorFactory cache)
+	: Ui::RippleButton(parent, st::defaultRippleAnimation) {
+		text(
+		) | rpl::on_next([this](const QString &t) {
+			const auto height = st::stickersHeaderBadgeFont->height;
+			resize(
+				st::stickersHeaderBadgeFont->width(t) + height,
+				height);
+			update();
+		}, lifetime());
+		paintRequest() | rpl::on_next([this, cache, text] {
+			auto p = QPainter(this);
+			const auto colors = cache();
+			const auto r = rect();
+			const auto rippleColor = anim::with_alpha(colors.fg, .15);
+			Ui::RippleButton::paintRipple(
+				p,
+				QPoint(),
+				&rippleColor);
+			p.setBrush(colors.bg);
+			p.setPen(Qt::NoPen);
+			p.drawRoundedRect(r, r.height() / 2, r.height() / 2);
+			p.setFont(st::stickersHeaderBadgeFont);
+			p.setPen(colors.fg);
+			p.drawText(r, text(tr::now), style::al_center);
+		}, lifetime());
+	}
+
+	QImage prepareRippleMask() const override {
+		return Ui::RippleAnimation::RoundRectMask(size(), height() / 2);
+	}
+
+};
+
+[[nodiscard]] Window::SessionController *FindSessionController(
+		not_null<RpWidget*> widget) {
+	const auto window = Core::App().findWindow(widget);
+	return window ? window->sessionController() : nullptr;
+}
+
+[[nodiscard]] ColorFactory GenerateReplyColorCallback(
+		not_null<Window::SessionController*> controller,
+		not_null<RpWidget*> widget,
+		FullMsgId fullId,
+		int colorIndex) {
+	const auto peer = controller->session().data().peer(fullId.peer);
+	struct State final {
+		std::shared_ptr<Ui::ChatTheme> theme;
+	};
+	const auto state = widget->lifetime().make_state<State>();
+	Window::ChatThemeValueFromPeer(
+		controller,
+		peer
+	) | rpl::on_next([=](std::shared_ptr<Ui::ChatTheme> &&theme) {
+		state->theme = std::move(theme);
+	}, widget->lifetime());
+
+	return [=]() -> Colors {
+		if (!state->theme) {
+			return {
+				anim::with_alpha(st::windowBgActive->c, .15),
+				st::windowActiveTextFg->c,
+			};
+		}
+		const auto context = controller->preparePaintContext({
+			.theme = state->theme.get(),
+		});
+		const auto selected = false;
+		const auto cache = context.st->coloredReplyCache(
+			selected,
+			colorIndex);
+		return { cache->bg, cache->icon };
+	};
+}
+
+[[nodiscard]] ColorFactory GenerateReplyColorCallback(
+		not_null<RpWidget*> widget,
+		FullMsgId fullId,
+		int colorIndex) {
+	if (const auto window = FindSessionController(widget)) {
+		return GenerateReplyColorCallback(window, widget, fullId, colorIndex);
+	}
+	const auto window
+		= widget->lifetime().make_state<Window::SessionController*>();
+	const auto callback = widget->lifetime().make_state<ColorFactory>();
+	return [=, color = colorIndex]() -> Colors {
+		if (*callback) {
+			return (*callback)();
+		}
+		*window = FindSessionController(widget);
+		if (const auto w = (*window)) {
+			*callback = GenerateReplyColorCallback(w, widget, fullId, color);
+			return (*callback)();
+		} else {
+			return {
+				anim::with_alpha(st::windowBgActive->c, .15),
+				st::windowActiveTextFg->c,
+			};
+		}
+	};
+}
+
+} // namespace
+
+void FillSponsoredMessageBar(
+		not_null<RpWidget*> container,
+		not_null<Main::Session*> session,
+		FullMsgId fullId,
+		Data::SponsoredFrom from,
+		const TextWithEntities &textWithEntities) {
+	const auto widget = CreateSimpleRectButton(
+		container,
+		st::defaultRippleAnimationBgOver);
+	widget->show();
+	container->sizeValue() | rpl::on_next([=](const QSize &s) {
+		widget->resize(s);
+	}, widget->lifetime());
+	widget->setAcceptBoth();
+
+	widget->addClickHandler([=](Qt::MouseButton button) {
+		if (button == Qt::RightButton) {
+			if (const auto controller = FindSessionController(widget)) {
+				::Menu::ShowSponsored(widget, controller->uiShow(), fullId);
+			}
+		} else if (button == Qt::LeftButton) {
+			session->sponsoredMessages().clicked(fullId, false, false);
+			UrlClickHandler::Open(from.link);
+		}
+	});
+
+	struct State final {
+		Ui::Text::String title;
+		Ui::Text::String contentTitle;
+		Ui::Text::String contentText;
+		rpl::variable<int> lastPaintedContentLineAmount = 0;
+		rpl::variable<int> lastPaintedContentTop = 0;
+
+		std::shared_ptr<Ui::DynamicImage> rightPhoto;
+		QImage rightPhotoImage;
+	};
+	const auto state = widget->lifetime().make_state<State>();
+	const auto &titleSt = st::semiboldTextStyle;
+	const auto &contentTitleSt = st::semiboldTextStyle;
+	const auto &contentTextSt = st::defaultTextStyle;
+	state->title.setText(
+		titleSt,
+		from.isRecommended
+			? tr::lng_recommended_message_title(tr::now)
+			: tr::lng_sponsored_message_title(tr::now));
+	state->contentTitle.setText(contentTitleSt, from.title);
+	state->contentText.setMarkedText(
+		contentTextSt,
+		textWithEntities,
+		kMarkupTextOptions,
+		Core::TextContext({
+			.session = session,
+			.repaint = [=] { widget->update(); },
+		}));
+	const auto hostedClick = [=](ClickHandlerPtr handler) {
+		return [=] {
+			if (const auto controller = FindSessionController(widget)) {
+				ActivateClickHandler(widget, handler, {
+					.other = QVariant::fromValue(ClickHandlerContext{
+						.itemId = fullId,
+						.sessionWindow = base::make_weak(controller),
+						.show = controller->uiShow(),
+					})
+				});
+			}
+		};
+	};
+	const auto paused = [=]() -> Fn<bool()> {
+		if (const auto c = FindSessionController(widget)) {
+			using Gif = Window::GifPauseReason;
+			return [=] { return c->isGifPausedAtLeastFor(Gif::Any); };
+		}
+		return [] { return false; };
+	};
+	const auto kLinesForPhoto = 3;
+	const auto rightPhotoSize = titleSt.font->ascent * kLinesForPhoto;
+	const auto rightPhotoPlaceholder = titleSt.font->height * kLinesForPhoto;
+	const auto hasRightPhoto = from.photoId > 0;
+	if (hasRightPhoto) {
+		state->rightPhoto = Ui::MakePhotoThumbnail(
+			session->data().photo(from.photoId),
+			fullId);
+		const auto callback = [=] {
+			state->rightPhotoImage = Images::Round(
+				state->rightPhoto->image(rightPhotoSize),
+				ImageRoundRadius::Small);
+			widget->update();
+		};
+		state->rightPhoto->subscribeToUpdates(callback);
+		callback();
+	}
+	const auto rightHide = hasRightPhoto
+		? nullptr
+		: Ui::CreateChild<Ui::IconButton>(
+			container,
+			st::dialogsCancelSearchInPeer);
+	if (rightHide) {
+		container->sizeValue(
+		) | rpl::on_next([=](const QSize &s) {
+			rightHide->moveToRight(st::buttonRadius, st::lineWidth);
+		}, rightHide->lifetime());
+		rightHide->setClickedCallback(
+			hostedClick(HideSponsoredClickHandler()));
+	}
+	const auto badgeButton = Ui::CreateChild<BadgeButton>(
+		widget,
+		from.canReport
+			? tr::lng_sponsored_message_revenue_button
+			: tr::lng_sponsored_top_bar_hide,
+		GenerateReplyColorCallback(
+			widget,
+			fullId,
+			from.colorIndex ? from.colorIndex : st::colorIndexBlue));
+	badgeButton->setClickedCallback(
+		hostedClick(from.canReport
+			? AboutSponsoredClickHandler()
+			: HideSponsoredClickHandler()));
+	badgeButton->show();
+
+	const auto draw = [=](QPainter &p) {
+		const auto r = widget->rect();
+		p.fillRect(r, st::historyPinnedBg);
+		widget->paintRipple(p, 0, 0);
+		const auto leftPadding = st::msgReplyBarSkip + st::msgReplyBarSkip;
+		const auto rightPadding = st::msgReplyBarSkip;
+		const auto topPadding = st::msgReplyPadding.top();
+		const auto availableWidthNoPhoto = r.width()
+			- leftPadding
+			- rightPadding;
+		const auto availableWidth = availableWidthNoPhoto
+			- (hasRightPhoto ? (rightPadding + rightPhotoSize) : 0)
+			- (rightHide ? rightHide->width() : 0);
+		const auto titleRight = leftPadding
+			+ state->title.maxWidth()
+			+ titleSt.font->spacew * 2;
+		const auto hasSecondLineTitle = (titleRight
+			> (availableWidth
+				- state->contentTitle.maxWidth()
+				- badgeButton->width()));
+		p.setPen(st::windowActiveTextFg);
+		state->title.draw(p, {
+			.position = QPoint(leftPadding, topPadding),
+			.outerWidth = availableWidth,
+			.availableWidth = availableWidth,
+		});
+		badgeButton->moveToLeft(
+			hasSecondLineTitle
+				? titleRight
+				: std::min(
+					titleRight
+						+ state->contentTitle.maxWidth()
+						+ titleSt.font->spacew * 2,
+					r.width()
+						- (hasRightPhoto
+							? (rightPadding + rightPhotoSize)
+							: 0)
+						- (rightHide ? rightHide->width() : 0)
+						- rightPadding),
+			topPadding
+				+ (titleSt.font->height - badgeButton->height()) / 2);
+		p.setPen(st::windowFg);
+		{
+			const auto left = hasSecondLineTitle ? leftPadding : titleRight;
+			const auto top = hasSecondLineTitle
+				? (topPadding + titleSt.font->height)
+				: topPadding;
+			state->contentTitle.draw(p, {
+				.position = QPoint(left, top),
+				.outerWidth = hasSecondLineTitle
+					? availableWidth
+					: (availableWidth - titleRight),
+				.availableWidth = availableWidth,
+				.elisionLines = 1,
+			});
+		}
+		{
+			const auto left = leftPadding;
+			const auto top = hasSecondLineTitle
+				? (topPadding
+					+ titleSt.font->height
+					+ contentTitleSt.font->height)
+				: topPadding + titleSt.font->height;
+			auto lastContentLineAmount = 0;
+			const auto lineHeight = contentTextSt.font->height;
+			const auto lineLayout = [&](int line) -> Ui::Text::LineGeometry {
+				line++;
+				lastContentLineAmount = line;
+				const auto diff = (st::sponsoredMessageBarMaxHeight)
+					- line * lineHeight;
+				if (diff < 3 * lineHeight) {
+					return {
+						.width = availableWidthNoPhoto,
+						.elided = true,
+					};
+				} else if (diff < 2 * lineHeight) {
+					return {};
+				}
+				line += (hasSecondLineTitle ? 2 : 1)
+					+ (hasRightPhoto ? 0 : 1);
+				return {
+					.width = (line > kLinesForPhoto)
+						? availableWidthNoPhoto
+						: availableWidth,
+				};
+			};
+			state->contentText.draw(p, {
+				.position = QPoint(left, top),
+				.outerWidth = availableWidth,
+				.availableWidth = availableWidth,
+				.geometry = Ui::Text::GeometryDescriptor{
+					.layout = std::move(lineLayout),
+				},
+				.pausedEmoji = On(PowerSaving::kEmojiChat) || paused(),
+				.pausedSpoiler = On(PowerSaving::kChatSpoiler) || paused(),
+			});
+			state->lastPaintedContentTop = top;
+			state->lastPaintedContentLineAmount = lastContentLineAmount;
+		}
+		if (hasRightPhoto) {
+			p.drawImage(
+				r.width() - rightPadding - rightPhotoSize,
+				topPadding + (rightPhotoPlaceholder - rightPhotoSize) / 2,
+				state->rightPhotoImage);
+		}
+	};
+	widget->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(widget);
+		draw(p);
+	}, widget->lifetime());
+	rpl::combine(
+		state->lastPaintedContentTop.value(),
+		state->lastPaintedContentLineAmount.value()
+	) | rpl::distinct_until_changed() | rpl::on_next([=](
+			int lastTop,
+			int lastLines) {
+		const auto bottomPadding = st::msgReplyPadding.top();
+		const auto desiredHeight = lastTop
+			+ (lastLines * contentTextSt.font->height)
+			+ bottomPadding;
+		const auto minHeight = hasRightPhoto
+			? (rightPhotoPlaceholder + bottomPadding * 2)
+			: desiredHeight;
+		container->resize(
+			widget->width(),
+			std::clamp(
+				desiredHeight,
+				minHeight,
+				st::sponsoredMessageBarMaxHeight));
+	}, widget->lifetime());
+	{ // Calculate a good size for container.
+		auto dummy = QImage(1, 1, QImage::Format_ARGB32);
+		auto p = QPainter(&dummy);
+		draw(p);
+	}
+
+	{
+		const auto top = Ui::CreateChild<PlainShadow>(widget);
+		const auto bottom = Ui::CreateChild<PlainShadow>(widget);
+		widget->sizeValue() | rpl::on_next([=] (const QSize &s) {
+			top->show();
+			top->raise();
+			top->resizeToWidth(s.width());
+			bottom->show();
+			bottom->raise();
+			bottom->resizeToWidth(s.width());
+			bottom->moveToLeft(0, s.height() - bottom->height());
+		}, top->lifetime());
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/sponsored_message_bar.h b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.h
new file mode 100644
index 00000000000000..e127fb1e4eab14
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/sponsored_message_bar.h
@@ -0,0 +1,29 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+struct SponsoredFrom;
+} // namespace Data
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+
+class RpWidget;
+
+void FillSponsoredMessageBar(
+	not_null<RpWidget*> container,
+	not_null<Main::Session*> session,
+	FullMsgId fullId,
+	Data::SponsoredFrom from,
+	const TextWithEntities &textWithEntities);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/color_indices.style b/Telegram/SourceFiles/ui/color_indices.style
new file mode 100644
index 00000000000000..59e80ec9657db4
--- /dev/null
+++ b/Telegram/SourceFiles/ui/color_indices.style
@@ -0,0 +1,16 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+
+colorIndexRed: 0; // [[maybe_unused]]
+colorIndexOrange: 1; // [[maybe_unused]]
+colorIndexGreen: 2; // [[maybe_unused]]
+colorIndexSea: 3; // [[maybe_unused]]
+colorIndexBlue: 4; // [[maybe_unused]]
+colorIndexPurple: 5; // [[maybe_unused]]
+colorIndexPink: 6; // [[maybe_unused]]
+colorIndexYellow: 7; // [[maybe_unused]]
diff --git a/Telegram/SourceFiles/ui/color_int_conversion.cpp b/Telegram/SourceFiles/ui/color_int_conversion.cpp
index 5c9c57f0738150..b5df1c1c5d87d1 100644
--- a/Telegram/SourceFiles/ui/color_int_conversion.cpp
+++ b/Telegram/SourceFiles/ui/color_int_conversion.cpp
@@ -24,10 +24,10 @@ std::optional<QColor> MaybeColorFromSerialized(quint32 serialized) {
 
 QColor Color32FromSerialized(quint32 serialized) {
 	return QColor(
-		int((serialized >> 24) & 0xFFU),
-		int((serialized >> 16) & 0xFFU),
+		int(serialized & 0xFFU),
 		int((serialized >> 8) & 0xFFU),
-		int(serialized & 0xFFU));
+		int((serialized >> 16) & 0xFFU),
+		int((serialized >> 24) & 0xFFU));
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/button_labels.cpp b/Telegram/SourceFiles/ui/controls/button_labels.cpp
new file mode 100644
index 00000000000000..f720d3e2b14c5f
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/button_labels.cpp
@@ -0,0 +1,91 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/button_labels.h"
+
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+
+namespace Ui {
+
+void SetButtonTwoLabels(
+		not_null<Ui::RoundButton*> button,
+		rpl::producer<TextWithEntities> title,
+		rpl::producer<TextWithEntities> subtitle,
+		const style::FlatLabel &st,
+		const style::FlatLabel &subst,
+		const style::color *textFg) {
+	SetButtonTwoLabels(
+		button,
+		button->st().textTop,
+		std::move(title),
+		std::move(subtitle),
+		st,
+		subst,
+		textFg);
+}
+
+void SetButtonTwoLabels(
+		not_null<Ui::RpWidget*> button,
+		int singleLineTextTop,
+		rpl::producer<TextWithEntities> title,
+		rpl::producer<TextWithEntities> subtitle,
+		const style::FlatLabel &st,
+		const style::FlatLabel &subst,
+		const style::color *textFg) {
+	const auto buttonTitle = Ui::CreateChild<Ui::FlatLabel>(
+		button,
+		std::move(title),
+		st);
+	buttonTitle->show();
+	const auto buttonSubtitle = Ui::CreateChild<Ui::FlatLabel>(
+		button,
+		rpl::duplicate(
+			subtitle
+		) | rpl::filter([](const TextWithEntities &text) {
+			return !text.empty();
+		}),
+		subst);
+	buttonSubtitle->setOpacity(0.6);
+	if (textFg) {
+		buttonTitle->setTextColorOverride((*textFg)->c);
+		buttonSubtitle->setTextColorOverride((*textFg)->c);
+		style::PaletteChanged() | rpl::on_next([=] {
+			buttonTitle->setTextColorOverride((*textFg)->c);
+			buttonSubtitle->setTextColorOverride((*textFg)->c);
+		}, buttonTitle->lifetime());
+	}
+	rpl::combine(
+		button->sizeValue(),
+		buttonTitle->sizeValue(),
+		buttonSubtitle->sizeValue(),
+		std::move(subtitle)
+	) | rpl::on_next([=](
+			QSize outer,
+			QSize title,
+			QSize subtitle,
+			const TextWithEntities &subtitleText) {
+		const auto withSubtitle = !subtitleText.empty();
+		buttonSubtitle->setVisible(withSubtitle);
+
+		const auto two = title.height() + subtitle.height();
+		const auto titleTop = withSubtitle
+			? (outer.height() - two) / 2
+			: singleLineTextTop;
+		const auto subtitleTop = titleTop + title.height();
+		buttonTitle->moveToLeft(
+			(outer.width() - title.width()) / 2,
+			titleTop);
+		buttonSubtitle->moveToLeft(
+			(outer.width() - subtitle.width()) / 2,
+			subtitleTop);
+	}, buttonTitle->lifetime());
+	buttonTitle->setAttribute(Qt::WA_TransparentForMouseEvents);
+	buttonSubtitle->setAttribute(Qt::WA_TransparentForMouseEvents);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/button_labels.h b/Telegram/SourceFiles/ui/controls/button_labels.h
new file mode 100644
index 00000000000000..b2c663f5a9bcc3
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/button_labels.h
@@ -0,0 +1,36 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace style {
+struct FlatLabel;
+} // namespace style
+
+namespace Ui {
+
+class RoundButton;
+class RpWidget;
+
+void SetButtonTwoLabels(
+    not_null<Ui::RoundButton*> button,
+    rpl::producer<TextWithEntities> title,
+    rpl::producer<TextWithEntities> subtitle,
+    const style::FlatLabel &st,
+    const style::FlatLabel &subst,
+    const style::color *textFg = nullptr);
+
+void SetButtonTwoLabels(
+    not_null<Ui::RpWidget*> button,
+    int singleLineTextTop,
+    rpl::producer<TextWithEntities> title,
+    rpl::producer<TextWithEntities> subtitle,
+    const style::FlatLabel &st,
+    const style::FlatLabel &subst,
+    const style::color *textFg = nullptr);
+
+} // namespace Ui
\ No newline at end of file
diff --git a/Telegram/SourceFiles/ui/controls/call_mute_button.cpp b/Telegram/SourceFiles/ui/controls/call_mute_button.cpp
index b142eb7ea04806..b623beb1d1daa7 100644
--- a/Telegram/SourceFiles/ui/controls/call_mute_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/call_mute_button.cpp
@@ -75,7 +75,8 @@ constexpr auto kOverlapProgressRadialHide = 1.2;
 constexpr auto kRadialFinishArcShift = 1200;
 
 [[nodiscard]] CallMuteButtonType TypeForIcon(CallMuteButtonType type) {
-	return (type == CallMuteButtonType::Connecting)
+	return (type == CallMuteButtonType::Connecting
+		|| type == CallMuteButtonType::ConferenceForceMuted)
 		? CallMuteButtonType::Muted
 		: (type == CallMuteButtonType::RaisedHand)
 		? CallMuteButtonType::ForceMuted
@@ -157,6 +158,7 @@ auto Colors() {
 	const auto forceMutedTypes = {
 		CallMuteButtonType::ForceMuted,
 		CallMuteButtonType::RaisedHand,
+		CallMuteButtonType::ConferenceForceMuted,
 		CallMuteButtonType::ScheduledCanStart,
 		CallMuteButtonType::ScheduledNotify,
 		CallMuteButtonType::ScheduledSilent,
@@ -198,6 +200,7 @@ class AnimatedLabel final : public RpWidget {
 		const style::FlatLabel &st = st::defaultFlatLabel);
 
 	int contentHeight() const;
+	void setMaxWidth(int width);
 
 private:
 	void setText(const QString &text);
@@ -210,6 +213,8 @@ class AnimatedLabel final : public RpWidget {
 	Text::String _text;
 	Text::String _previousText;
 
+	int _maxLabelWidth = 0;
+
 	Animations::Simple _animation;
 
 };
@@ -227,12 +232,12 @@ AnimatedLabel::AnimatedLabel(
 , _options({ 0, 0, 0, Qt::LayoutDirectionAuto }) {
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &value) {
+	) | rpl::on_next([=](const QString &value) {
 		setText(value);
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		const auto progress = _animation.value(1.);
 
@@ -246,28 +251,36 @@ AnimatedLabel::AnimatedLabel(
 
 		p.setOpacity(1. - progress);
 		if (p.opacity()) {
-			_previousText.draw(
+			_previousText.drawElided(
 				p,
 				0,
 				anim::interpolate(center, diffHeight, progress),
 				width(),
+				1,
 				style::al_center);
 		}
 
 		p.setOpacity(progress);
 		if (p.opacity()) {
-			_text.draw(
+			_text.drawElided(
 				p,
 				0,
 				anim::interpolate(0, center, progress),
 				width(),
+				1,
 				style::al_center);
 		}
 	}, lifetime());
 }
 
 int AnimatedLabel::contentHeight() const {
-	return _st.style.font->height;
+	const auto lineHeight = _st.style.font->height;
+	if (!_maxLabelWidth) {
+		return lineHeight;
+	}
+	const auto textHeight = _text.countHeight(_maxLabelWidth);
+	const auto previousHeight = _previousText.countHeight(_maxLabelWidth);
+	return std::min(std::max(textHeight, previousHeight), lineHeight * 2);
 }
 
 void AnimatedLabel::setText(const QString &text) {
@@ -277,9 +290,11 @@ void AnimatedLabel::setText(const QString &text) {
 	_previousText = std::move(_text);
 	_text = Ui::Text::String(_st.style, text, _options);
 
-	const auto width = std::max(
-		_st.style.font->width(_text.toString()),
-		_st.style.font->width(_previousText.toString()));
+	const auto width = _maxLabelWidth
+		? _maxLabelWidth
+		: std::max(
+			_st.style.font->width(_text.toString()),
+			_st.style.font->width(_previousText.toString()));
 	resize(
 		width + _additionalHeight,
 		contentHeight() + _additionalHeight * 2);
@@ -288,6 +303,16 @@ void AnimatedLabel::setText(const QString &text) {
 	_animation.start([=] { update(); }, 0., 1., _duration);
 }
 
+void AnimatedLabel::setMaxWidth(int width) {
+	_maxLabelWidth = width;
+	if (!_text.isEmpty()) {
+		resize(
+			_maxLabelWidth + _additionalHeight,
+			contentHeight() + _additionalHeight * 2);
+		update();
+	}
+}
+
 class BlobsWidget final : public RpWidget {
 public:
 	BlobsWidget(
@@ -345,7 +370,7 @@ BlobsWidget::BlobsWidget(
 
 	std::move(
 		hideBlobs
-	) | rpl::start_with_next([=](bool hide) {
+	) | rpl::on_next([=](bool hide) {
 		if (_hideBlobs != hide) {
 			const auto now = crl::now();
 			if ((now - _blobsScaleLastTime) >= kBlobsScaleEnterDuration) {
@@ -398,13 +423,13 @@ void BlobsWidget::init(int diameter) {
 	setDiameter(diameter);
 
 	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		_center = size.width() / 2;
 		computeCircleRect();
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		PainterHighQualityEnabler hq(p);
 
@@ -488,7 +513,7 @@ void BlobsWidget::init(int diameter) {
 		return true;
 	});
 	shownValue(
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		if (shown) {
 			_animation.start();
 		} else {
@@ -590,7 +615,7 @@ void CallMuteButton::refreshLabels() {
 	rpl::combine(
 		_content->geometryValue(),
 		_label->sizeValue()
-	) | rpl::start_with_next([=](QRect my, QSize size) {
+	) | rpl::on_next([=](QRect my, QSize size) {
 		updateLabelGeometry(my, size);
 	}, _label->lifetime());
 	_label->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -599,7 +624,7 @@ void CallMuteButton::refreshLabels() {
 	rpl::combine(
 		_content->geometryValue(),
 		_sublabel->sizeValue()
-	) | rpl::start_with_next([=](QRect my, QSize size) {
+	) | rpl::on_next([=](QRect my, QSize size) {
 		updateSublabelGeometry(my, size);
 	}, _sublabel->lifetime());
 	_sublabel->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -608,10 +633,20 @@ void CallMuteButton::refreshLabels() {
 	rpl::combine(
 		_content->geometryValue(),
 		_centerLabel->sizeValue()
-	) | rpl::start_with_next([=](QRect my, QSize size) {
+	) | rpl::on_next([=](QRect my, QSize size) {
 		updateCenterLabelGeometry(my, size);
 	}, _centerLabel->lifetime());
 	_centerLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	_content->sizeValue(
+	) | rpl::map([](QSize size) {
+		return size.width();
+	}) | rpl::distinct_until_changed(
+	) | rpl::on_next([=](int w) {
+		_centerLabel->setMaxWidth(w);
+		_label->setMaxWidth(w);
+		_sublabel->setMaxWidth(w);
+	}, _centerLabel->lifetime());
 }
 
 void CallMuteButton::refreshIcons() {
@@ -719,7 +754,7 @@ void CallMuteButton::init() {
 	_content->resize(button.width, button.height);
 
 	_content->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseMove) {
 			if (!_state.current().tooltip.isEmpty()) {
 				Ui::Tooltip::Show(1000, this);
@@ -732,7 +767,7 @@ void CallMuteButton::init() {
 	rpl::combine(
 		_radialInfo.rawShowProgress.value(),
 		anim::Disables()
-	) | rpl::start_with_next([=](float64 value, bool disabled) {
+	) | rpl::on_next([=](float64 value, bool disabled) {
 		auto &info = _radialInfo;
 		info.realShowProgress = (1. - value) / kRadialEndPartAnimation;
 
@@ -779,7 +814,7 @@ void CallMuteButton::init() {
 	_state.value(
 	) | rpl::map([](const CallMuteButtonState &state) {
 		return state.type;
-	}) | rpl::start_with_next([=](CallMuteButtonType type) {
+	}) | rpl::on_next([=](CallMuteButtonType type) {
 		const auto previous = *previousType;
 		*previousType = type;
 
@@ -837,7 +872,7 @@ void CallMuteButton::init() {
 
 	// Icon rect.
 	_content->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto icon = _lottieSize;
 		_muteIconRect = QRect(
 			(size.width() - icon.width()) / 2,
@@ -848,7 +883,7 @@ void CallMuteButton::init() {
 
 	// Paint.
 	_content->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		Painter p(_content);
 
 		const auto expand = _state.current().expandType;
@@ -1040,6 +1075,7 @@ CallMuteButton::HandleMouseState CallMuteButton::HandleMouseStateFromType(
 	case CallMuteButtonType::ScheduledCanStart:
 	case CallMuteButtonType::ScheduledNotify:
 	case CallMuteButtonType::ScheduledSilent:
+	case CallMuteButtonType::ConferenceForceMuted:
 	case CallMuteButtonType::ForceMuted:
 	case CallMuteButtonType::RaisedHand:
 		return HandleMouseState::Enabled;
diff --git a/Telegram/SourceFiles/ui/controls/call_mute_button.h b/Telegram/SourceFiles/ui/controls/call_mute_button.h
index 455c9448515df7..b61fd392d12f96 100644
--- a/Telegram/SourceFiles/ui/controls/call_mute_button.h
+++ b/Telegram/SourceFiles/ui/controls/call_mute_button.h
@@ -39,6 +39,7 @@ enum class CallMuteButtonType {
 	Muted,
 	ForceMuted,
 	RaisedHand,
+	ConferenceForceMuted,
 	ScheduledCanStart,
 	ScheduledSilent,
 	ScheduledNotify,
diff --git a/Telegram/SourceFiles/ui/controls/chat_service_checkbox.cpp b/Telegram/SourceFiles/ui/controls/chat_service_checkbox.cpp
index b8e80c5c95bcf2..5230a26f200732 100644
--- a/Telegram/SourceFiles/ui/controls/chat_service_checkbox.cpp
+++ b/Telegram/SourceFiles/ui/controls/chat_service_checkbox.cpp
@@ -78,7 +78,7 @@ class ServiceCheck final : public AbstractCheckView {
 
 ServiceCheck::Generator::Generator() {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		invalidate();
 	}, _lifetime);
 }
@@ -249,7 +249,7 @@ void SetupBackground(not_null<Checkbox*> checkbox, Fn<QColor()> bg) {
 		bg ? bg : [] { return st::msgServiceBg->c; }
 	) | rpl::filter([=](const QColor &color) {
 		return color.alpha() > 0;
-	}) | rpl::start_with_next([=](const QColor &color) {
+	}) | rpl::on_next([=](const QColor &color) {
 		auto p = QPainter(checkbox);
 		PainterHighQualityEnabler hq(p);
 		p.setPen(Qt::NoPen);
diff --git a/Telegram/SourceFiles/ui/controls/compose_ai_button_factory.cpp b/Telegram/SourceFiles/ui/controls/compose_ai_button_factory.cpp
new file mode 100644
index 00000000000000..6cea602d92e83f
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/compose_ai_button_factory.cpp
@@ -0,0 +1,192 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/compose_ai_button_factory.h"
+
+#include "base/options.h"
+#include "boxes/compose_ai_box.h"
+#include "core/mime_type.h"
+#include "data/data_ai_compose_tones.h"
+#include "data/data_premium_limits.h"
+#include "data/data_session.h"
+#include "history/view/controls/history_view_compose_ai_button.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/chat/attach/attach_prepare.h"
+#include "ui/text/text.h"
+#include "ui/text/text_entity.h"
+#include "ui/widgets/fields/input_field.h"
+
+#include "styles/style_chat_helpers.h"
+
+namespace Ui {
+
+const char kOptionHideAiButton[] = "hide-ai-button";
+
+base::options::toggle HideAiButtonOption({
+	.id = kOptionHideAiButton,
+	.name = "Hide AI button",
+	.description = "Hide the AI Tools button in message compose fields.",
+});
+
+bool HasEnoughLinesForAi(
+		not_null<Main::Session*> session,
+		not_null<Ui::InputField*> field) {
+	if (HideAiButtonOption.value()
+		|| session->data().aiComposeTones().list().empty()) {
+		return false;
+	}
+	const auto &style = field->st().style;
+	const auto lineHeight = style.lineHeight
+		? style.lineHeight
+		: style.font->height;
+	const auto margins = field->fullTextMargins();
+	const auto contentHeight = field->height()
+		- margins.top()
+		- margins.bottom();
+	if (contentHeight < (3 * lineHeight)) {
+		return false;
+	}
+	const auto &text = field->getLastText();
+	if (text.size() > Data::PremiumLimits(session).messageLengthCurrent()) {
+		return false;
+	}
+	for (const auto &ch : text) {
+		if (!Text::IsTrimmed(ch) && !Text::IsReplacedBySpace(ch)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+PreparedList PrepareTextAsFile(const QString &text) {
+	auto content = text.toUtf8();
+	auto result = PreparedList();
+	auto file = PreparedFile(QString());
+	file.content = content;
+	file.displayName = u"message.txt"_q;
+	file.size = content.size();
+	file.information = std::make_unique<PreparedFileInformation>();
+	file.information->filemime = u"text/plain"_q;
+	result.files.push_back(std::move(file));
+	return result;
+}
+
+constexpr auto kSendAsFilePasteMultiplier = 8;
+
+int SendAsFilePasteThreshold(not_null<Main::Session*> session) {
+	return kSendAsFilePasteMultiplier
+		* Data::PremiumLimits(session).messageLengthCurrent();
+}
+
+LargeTextPasteResult CheckLargeTextPaste(
+		not_null<Main::Session*> session,
+		not_null<Ui::InputField*> field,
+		not_null<const QMimeData*> data) {
+	if (data->hasImage()) {
+		return {};
+	}
+	const auto pasteText = Core::ReadMimeText(data);
+	if (pasteText.isEmpty()) {
+		return {};
+	}
+	const auto cursor = field->textCursor();
+	const auto currentText = field->getLastText();
+	const auto selStart = cursor.selectionStart();
+	const auto selEnd = cursor.selectionEnd();
+	const auto resultingSize = currentText.size()
+		- (selEnd - selStart)
+		+ pasteText.size();
+	if (resultingSize < SendAsFilePasteThreshold(session)) {
+		return {};
+	}
+	return {
+		.exceeds = true,
+		.resultingText = currentText.mid(0, selStart)
+			+ pasteText
+			+ currentText.mid(selEnd),
+	};
+}
+
+void UpdateCaptionAiButtonGeometry(
+		not_null<HistoryView::Controls::ComposeAiButton*> button,
+		not_null<Ui::InputField*> field) {
+	if (button->isHidden()) {
+		return;
+	}
+	const auto &pos = st::boxAiComposeButtonPosition;
+	const auto x = field->x()
+		+ field->width()
+		- button->width()
+		+ pos.x();
+	const auto y = field->y()
+		+ field->height()
+		- button->height()
+		+ pos.y();
+	button->moveToLeft(x, y);
+}
+
+auto SetupCaptionAiButton(SetupCaptionAiButtonArgs &&args)
+-> not_null<HistoryView::Controls::ComposeAiButton*> {
+	const auto button = Ui::CreateChild<
+		HistoryView::Controls::ComposeAiButton
+	>(args.parent.get(), st::historyAiComposeButton);
+	const auto field = args.field;
+	const auto session = args.session;
+	const auto show = std::move(args.show);
+	const auto chatStyle = std::move(args.chatStyle);
+
+	button->hide();
+	button->setAccessibleName(tr::lng_ai_compose_title(tr::now));
+
+	button->setClickedCallback(crl::guard(field, [=] {
+		const auto textWithTags = field->getTextWithAppliedMarkdown();
+		if (textWithTags.text.isEmpty()) {
+			return;
+		}
+		auto text = TextWithEntities{
+			textWithTags.text,
+			TextUtilities::ConvertTextTagsToEntities(textWithTags.tags),
+		};
+		HistoryView::Controls::ShowComposeAiBox(show, {
+			.session = session,
+			.text = std::move(text),
+			.chatStyle = chatStyle,
+			.apply = crl::guard(field, [=](TextWithEntities result) {
+				field->setTextWithTags(
+					{
+						result.text,
+						TextUtilities::ConvertEntitiesToTextTags(
+							result.entities),
+					},
+					Ui::InputField::HistoryAction::NewEntry);
+			}),
+		});
+	}));
+
+	const auto updateVisibility = [=] {
+		const auto visible = !field->isHidden()
+			&& HasEnoughLinesForAi(session, field);
+		button->setVisible(visible);
+		if (visible) {
+			UpdateCaptionAiButtonGeometry(button, field);
+			button->raise();
+		}
+	};
+
+	rpl::merge(
+		field->heightChanges() | rpl::to_empty,
+		field->changes() | rpl::to_empty,
+		field->shownValue() | rpl::to_empty
+	) | rpl::on_next([=] {
+		updateVisibility();
+	}, button->lifetime());
+
+	return button;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/compose_ai_button_factory.h b/Telegram/SourceFiles/ui/controls/compose_ai_button_factory.h
new file mode 100644
index 00000000000000..73768fee6abbfc
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/compose_ai_button_factory.h
@@ -0,0 +1,63 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class QMimeData;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class ChatStyle;
+class InputField;
+class Show;
+} // namespace Ui
+
+namespace HistoryView::Controls {
+class ComposeAiButton;
+} // namespace HistoryView::Controls
+
+namespace Ui {
+
+struct PreparedList;
+
+extern const char kOptionHideAiButton[];
+
+[[nodiscard]] bool HasEnoughLinesForAi(
+	not_null<Main::Session*> session,
+	not_null<Ui::InputField*> field);
+
+struct SetupCaptionAiButtonArgs {
+	not_null<QWidget*> parent;
+	not_null<Ui::InputField*> field;
+	not_null<Main::Session*> session;
+	std::shared_ptr<Ui::Show> show;
+	std::shared_ptr<Ui::ChatStyle> chatStyle;
+};
+
+[[nodiscard]] auto SetupCaptionAiButton(SetupCaptionAiButtonArgs &&args)
+-> not_null<HistoryView::Controls::ComposeAiButton*>;
+
+void UpdateCaptionAiButtonGeometry(
+	not_null<HistoryView::Controls::ComposeAiButton*> button,
+	not_null<Ui::InputField*> field);
+
+[[nodiscard]] PreparedList PrepareTextAsFile(const QString &text);
+
+struct LargeTextPasteResult {
+	bool exceeds = false;
+	QString resultingText;
+};
+
+[[nodiscard]] LargeTextPasteResult CheckLargeTextPaste(
+	not_null<Main::Session*> session,
+	not_null<Ui::InputField*> field,
+	not_null<const QMimeData*> data);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/custom_emoji_toast_icon.cpp b/Telegram/SourceFiles/ui/controls/custom_emoji_toast_icon.cpp
new file mode 100644
index 00000000000000..dd24b43d56346c
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/custom_emoji_toast_icon.cpp
@@ -0,0 +1,57 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/custom_emoji_toast_icon.h"
+
+#include "data/stickers/data_custom_emoji.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+#include "ui/text/text_custom_emoji.h"
+#include "ui/rp_widget.h"
+
+#include "styles/style_widgets.h"
+
+#include <QtGui/QPainter>
+
+namespace Ui {
+
+object_ptr<RpWidget> MakeCustomEmojiToastIcon(
+		not_null<Main::Session*> session,
+		DocumentId emojiId,
+		QSize size) {
+	auto result = object_ptr<RpWidget>((QWidget*)nullptr);
+	const auto raw = result.data();
+	raw->resize(size);
+	raw->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	struct State {
+		std::unique_ptr<Text::CustomEmoji> emoji;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+	state->emoji = session->data().customEmojiManager().create(
+		emojiId,
+		[=] { raw->update(); },
+		Data::CustomEmojiManager::SizeTag::Large);
+
+	raw->paintRequest(
+	) | rpl::on_next([=] {
+		auto p = QPainter(raw);
+		const auto esize = Emoji::GetCustomSizeLarge();
+		const auto position = QPoint(
+			(raw->width() - esize) / 2,
+			(raw->height() - esize) / 2);
+		state->emoji->paint(p, {
+			.textColor = st::toastFg->c,
+			.now = crl::now(),
+			.position = position,
+		});
+	}, raw->lifetime());
+
+	return result;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/custom_emoji_toast_icon.h b/Telegram/SourceFiles/ui/controls/custom_emoji_toast_icon.h
new file mode 100644
index 00000000000000..844f1937e3e1d5
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/custom_emoji_toast_icon.h
@@ -0,0 +1,27 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Ui {
+
+[[nodiscard]] object_ptr<RpWidget> MakeCustomEmojiToastIcon(
+	not_null<Main::Session*> session,
+	DocumentId emojiId,
+	QSize size);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp b/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp
index 2c4bca985a0445..9cecf76e105014 100644
--- a/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp
+++ b/Telegram/SourceFiles/ui/controls/delete_message_context_action.cpp
@@ -23,7 +23,7 @@ namespace {
 class ActionWithTimer final : public Menu::ItemBase {
 public:
 	ActionWithTimer(
-		not_null<RpWidget*> parent,
+		not_null<Menu::Menu*> parent,
 		const style::Menu &st,
 		TimeId destroyAt,
 		Fn<void()> callback,
@@ -66,7 +66,7 @@ TextParseOptions MenuTextOptions = {
 };
 
 ActionWithTimer::ActionWithTimer(
-	not_null<RpWidget*> parent,
+	not_null<Menu::Menu*> parent,
 	const style::Menu &st,
 	TimeId destroyAt,
 	Fn<void()> callback,
@@ -83,11 +83,11 @@ ActionWithTimer::ActionWithTimer(
 		+ st::ttlItemTimerFont->height
 		+ st::ttlItemPadding.bottom()) {
 	setAcceptBoth(true);
-	initResizeHook(parent->sizeValue());
-	setClickedCallback(std::move(callback));
+	fitToMenuWidth();
+	setActionTriggered(std::move(callback));
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
diff --git a/Telegram/SourceFiles/ui/controls/download_bar.cpp b/Telegram/SourceFiles/ui/controls/download_bar.cpp
index 3b3db11f9be680..6c24385a6207fb 100644
--- a/Telegram/SourceFiles/ui/controls/download_bar.cpp
+++ b/Telegram/SourceFiles/ui/controls/download_bar.cpp
@@ -45,19 +45,19 @@ DownloadBar::DownloadBar(
 	_button.setDirectionUp(false);
 	_button.entity()->resize(0, st::downloadBarHeight);
 	_button.entity()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = Painter(_button.entity());
 		paint(p, clip);
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshIcon();
 	}, lifetime());
 	refreshIcon();
 
 	_progress.value(
-	) | rpl::start_with_next([=](const DownloadBarProgress &progress) {
+	) | rpl::on_next([=](const DownloadBarProgress &progress) {
 		refreshInfo(progress);
 	}, lifetime());
 }
@@ -86,7 +86,7 @@ void DownloadBar::show(DownloadBarContent &&content) {
 	_title.setMarkedText(
 		st::defaultTextStyle,
 		(content.count > 1
-			? Ui::Text::Bold(
+			? tr::bold(
 				tr::lng_profile_files(tr::now, lt_count, content.count))
 			: content.singleName));
 	refreshInfo(_progress.current());
@@ -139,7 +139,7 @@ void DownloadBar::refreshInfo(const DownloadBarProgress &progress) {
 	_info.setMarkedText(
 		st::downloadInfoStyle,
 		(progress.ready < progress.total
-			? Text::WithEntities(
+			? tr::marked(
 				FormatDownloadText(progress.ready, progress.total))
 			: Text::Link((_content.count > 1)
 				? tr::lng_downloads_view_in_section(tr::now)
diff --git a/Telegram/SourceFiles/ui/controls/dynamic_images_strip.cpp b/Telegram/SourceFiles/ui/controls/dynamic_images_strip.cpp
new file mode 100644
index 00000000000000..69661990604916
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/dynamic_images_strip.cpp
@@ -0,0 +1,242 @@
+// This file is part of Telegram Desktop,
+// the official desktop application for the Telegram messaging service.
+//
+// For license and copyright information please follow this link:
+// https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+//
+#include "ui/controls/dynamic_images_strip.h"
+
+#include "ui/dynamic_image.h"
+#include "ui/painter.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_widgets.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kDimmedAlpha = 0.6;
+constexpr auto kHoverScaleIncrease = st::topPeersSelectorUserpicExpand;
+
+} // namespace
+
+DynamicImagesStrip::DynamicImagesStrip(
+	QWidget *parent,
+	std::vector<std::shared_ptr<DynamicImage>> thumbnails,
+	int userpicSize,
+	int gap)
+: RpWidget(parent)
+, _thumbnails(std::move(thumbnails))
+, _userpicSize(userpicSize)
+, _gap(gap)
+, _scales(_thumbnails.size(), 0.)
+, _alphas(_thumbnails.size(), 1.)
+, _scaleTargets(_thumbnails.size(), 0.)
+, _alphaTargets(_thumbnails.size(), 1.)
+, _animation([=](crl::time now) {
+	const auto dt = (now - _animation.started())
+		/ float64(st::universalDuration);
+	auto finished = true;
+	for (auto i = 0; i < int(_thumbnails.size()); ++i) {
+		const auto progress = std::clamp(dt, 0., 1.);
+		_scales[i] += (_scaleTargets[i] - _scales[i]) * progress;
+		_alphas[i] += (_alphaTargets[i] - _alphas[i]) * progress;
+		if (std::abs(_scales[i] - _scaleTargets[i]) > 0.01
+			|| std::abs(_alphas[i] - _alphaTargets[i]) > 0.01) {
+			finished = false;
+		}
+	}
+	update();
+	return !finished;
+}) {
+	for (const auto &thumbnail : _thumbnails) {
+		thumbnail->subscribeToUpdates([=] { update(); });
+	}
+	setMouseTracking(true);
+}
+
+void DynamicImagesStrip::setProgress(float64 progress) {
+	_progress = progress;
+	update();
+}
+
+void DynamicImagesStrip::setClickCallback(Fn<void(int)> callback) {
+	_clickCallback = std::move(callback);
+}
+
+bool DynamicImagesStrip::hasMouseMoved() const {
+	return _motions > 6;
+}
+
+void DynamicImagesStrip::mouseMoved() {
+	_motions++;
+}
+
+rpl::producer<HoveredItemInfo> DynamicImagesStrip::hoveredItemValue() const {
+	return _hoveredItem.events();
+}
+
+void DynamicImagesStrip::handleKeyPressEvent(QKeyEvent *e) {
+	keyPressEvent(e);
+}
+
+void DynamicImagesStrip::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	{
+		const auto shift = (height() - _userpicSize) / 2;
+		p.translate(shift, shift);
+	}
+	auto x = 0;
+	const auto count = int(_thumbnails.size());
+	const auto duration = 0.25;
+	const auto overlap = 0.15;
+	auto hq = PainterHighQualityEnabler(p);
+	for (auto i = 0; i < count; ++i) {
+		const auto center = count / 2;
+		const auto offset = (i <= center)
+			? (center - i)
+			: (i - center);
+		const auto start = offset * (duration - overlap);
+		const auto scale = std::clamp(
+			(_progress - start) / duration,
+			0.,
+			1.);
+		if (scale > 0.) {
+			const auto hoverScale = 1. + kHoverScaleIncrease * _scales[i];
+			const auto alpha = _alphas[i];
+			const auto cx = x + _userpicSize / 2;
+			const auto cy = height() / 2;
+			p.save();
+			p.setOpacity(alpha);
+			p.translate(cx, cy);
+			p.scale(scale * hoverScale, scale * hoverScale);
+			p.translate(-cx, -cy);
+			const auto image = _thumbnails[i]->image(_userpicSize);
+			p.drawImage(x, 0, image);
+			p.restore();
+		}
+		x += _userpicSize + _gap;
+	}
+}
+
+void DynamicImagesStrip::mouseMoveEvent(QMouseEvent *e) {
+	mouseMoved();
+	if (!hasMouseMoved()) {
+		return;
+	}
+	const auto pos = e->pos().x();
+	const auto step = _userpicSize + _gap;
+	const auto count = int(_thumbnails.size());
+	auto newIndex = -1;
+	for (auto i = 0; i < count; ++i) {
+		const auto start = i * step;
+		const auto end = start + _userpicSize + _gap / 2;
+		if (pos >= start && pos < end) {
+			newIndex = i;
+			break;
+		}
+	}
+	setSelectedIndex(newIndex);
+}
+
+void DynamicImagesStrip::mousePressEvent(QMouseEvent *e) {
+	if (!hasMouseMoved()) {
+		return;
+	}
+	_pressed = true;
+	if (_hoveredIndex >= 0 && _clickCallback) {
+		_clickCallback(_hoveredIndex);
+	}
+}
+
+void DynamicImagesStrip::mouseReleaseEvent(QMouseEvent *e) {
+	if (!hasMouseMoved()) {
+		return;
+	}
+	if (!_pressed && _hoveredIndex >= 0 && _clickCallback) {
+		_clickCallback(_hoveredIndex);
+	}
+}
+
+void DynamicImagesStrip::leaveEventHook(QEvent *e) {
+	setSelectedIndex(-1);
+}
+
+void DynamicImagesStrip::startAnimation() {
+	if (!_animation.animating()) {
+		_animation.start();
+	}
+}
+
+void DynamicImagesStrip::updateHoveredItem(int index) {
+	if (index < 0) {
+		_hoveredItem.fire({ .index = -1, .globalPos = {} });
+		return;
+	}
+	const auto step = _userpicSize + _gap;
+	const auto shift = (height() - _userpicSize) / 2;
+	const auto x = index * step + shift;
+	const auto avatarRect = QRect(x, shift, _userpicSize, _userpicSize);
+	const auto globalRect = QRect(
+		mapToGlobal(avatarRect.topLeft()),
+		avatarRect.size());
+	_hoveredItem.fire({
+		.index = index,
+		.globalPos = globalRect.center(),
+	});
+}
+
+void DynamicImagesStrip::keyPressEvent(QKeyEvent *e) {
+	const auto count = int(_thumbnails.size());
+	if (count == 0) {
+		return;
+	}
+	const auto key = e->key();
+	if (key == Qt::Key_Left || key == Qt::Key_Up) {
+		const auto newIndex = (_hoveredIndex < 0)
+			? (count - 1)
+			: ((_hoveredIndex - 1 + count) % count);
+		setSelectedIndex(newIndex);
+	} else if (key == Qt::Key_Right || key == Qt::Key_Down) {
+		const auto newIndex = (_hoveredIndex < 0)
+			? 0
+			: ((_hoveredIndex + 1) % count);
+		setSelectedIndex(newIndex);
+	} else if ((key == Qt::Key_Return
+			|| key == Qt::Key_Enter
+			|| key == Qt::Key_Space)
+		&& _hoveredIndex >= 0 && _clickCallback) {
+		_clickCallback(_hoveredIndex);
+	}
+}
+
+void DynamicImagesStrip::setSelectedIndex(int index) {
+	if (_hoveredIndex == index) {
+		return;
+	}
+	const auto prev = _hoveredIndex;
+	const auto count = int(_thumbnails.size());
+	_hoveredIndex = index;
+	if (prev >= 0) {
+		_scaleTargets[prev] = 0.;
+		_alphaTargets[prev] = kDimmedAlpha;
+	}
+	if (index >= 0) {
+		_scaleTargets[index] = 1.;
+		_alphaTargets[index] = 1.;
+		for (auto i = 0; i < count; ++i) {
+			if (i != index && _alphaTargets[i] > kDimmedAlpha) {
+				_alphaTargets[i] = kDimmedAlpha;
+			}
+		}
+		updateHoveredItem(index);
+	} else {
+		for (auto i = 0; i < count; ++i) {
+			_scaleTargets[i] = 0.;
+			_alphaTargets[i] = 1.;
+		}
+		updateHoveredItem(-1);
+	}
+	startAnimation();
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/dynamic_images_strip.h b/Telegram/SourceFiles/ui/controls/dynamic_images_strip.h
new file mode 100644
index 00000000000000..363f3ba946bd40
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/dynamic_images_strip.h
@@ -0,0 +1,68 @@
+// This file is part of Telegram Desktop,
+// the official desktop application for the Telegram messaging service.
+//
+// For license and copyright information please follow this link:
+// https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/effects/animations.h"
+
+namespace Ui {
+
+class DynamicImage;
+
+struct HoveredItemInfo {
+	int index = -1;
+	QPoint globalPos;
+};
+
+class DynamicImagesStrip final : public RpWidget {
+public:
+	DynamicImagesStrip(
+		QWidget *parent,
+		std::vector<std::shared_ptr<DynamicImage>> thumbnails,
+		int userpicSize,
+		int gap);
+
+	void setProgress(float64 progress);
+	void setClickCallback(Fn<void(int)> callback);
+	[[nodiscard]] rpl::producer<HoveredItemInfo> hoveredItemValue() const;
+
+	void handleKeyPressEvent(QKeyEvent *e);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+	void keyPressEvent(QKeyEvent *e) override;
+
+private:
+	void startAnimation();
+	void updateHoveredItem(int index);
+	void setSelectedIndex(int index);
+
+	[[nodiscard]] bool hasMouseMoved() const;
+	void mouseMoved();
+
+	std::vector<std::shared_ptr<DynamicImage>> _thumbnails;
+	int _userpicSize = 0;
+	int _gap = 0;
+	float64 _progress = 0.;
+	int _hoveredIndex = -1;
+	int _motions = 0;
+	std::vector<float64> _scales;
+	std::vector<float64> _alphas;
+	std::vector<float64> _scaleTargets;
+	std::vector<float64> _alphaTargets;
+	Animations::Basic _animation;
+	Fn<void(int)> _clickCallback;
+	rpl::event_stream<HoveredItemInfo> _hoveredItem;
+	bool _pressed = false;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/emoji_button_factory.cpp b/Telegram/SourceFiles/ui/controls/emoji_button_factory.cpp
index a62c2444cc29e3..0ad74dcd0fdcb4 100644
--- a/Telegram/SourceFiles/ui/controls/emoji_button_factory.cpp
+++ b/Telegram/SourceFiles/ui/controls/emoji_button_factory.cpp
@@ -28,7 +28,8 @@ namespace Ui {
 		not_null<Ui::BoxContent*> box,
 		not_null<Window::SessionController*> controller,
 		not_null<ChatHelpers::TabbedPanel*> emojiPanel,
-		QPoint shift) {
+		QPoint shift,
+		bool fadeOnFocusChange) {
 	const auto emojiToggle = Ui::CreateChild<Ui::EmojiButton>(
 		field->parentWidget(),
 		st::defaultComposeFiles.emoji);
@@ -40,22 +41,26 @@ namespace Ui {
 		const auto fadeTarget = Ui::CreateChild<Ui::RpWidget>(emojiToggle);
 		fadeTarget->resize(emojiToggle->size());
 		fadeTarget->paintRequest(
-		) | rpl::start_with_next([=](const QRect &rect) {
+		) | rpl::on_next([=](const QRect &rect) {
 			auto p = QPainter(fadeTarget);
 			if (fade->animating()) {
 				p.fillRect(fadeTarget->rect(), st::boxBg);
 			}
 			fade->paint(p);
 		}, fadeTarget->lifetime());
-		rpl::single(false) | rpl::then(
-			field->focusedChanges()
-		) | rpl::start_with_next([=](bool shown) {
-			if (shown) {
-				fade->fadeIn(st::universalDuration);
-			} else {
-				fade->fadeOut(st::universalDuration);
-			}
-		}, emojiToggle->lifetime());
+		if (fadeOnFocusChange) {
+			rpl::single(false) | rpl::then(
+				field->focusedChanges()
+			) | rpl::on_next([=](bool shown) {
+				crl::on_main(emojiToggle, [=] {
+					if (shown) {
+						fade->fadeIn(st::universalDuration);
+					} else if (emojiToggle->isVisible()) {
+						fade->fadeOut(st::universalDuration);
+					}
+				});
+			}, emojiToggle->lifetime());
+		}
 		fade->fadeOut(1);
 		fade->finish();
 	}
@@ -94,7 +99,7 @@ namespace Ui {
 	rpl::combine(
 		box->sizeValue(),
 		field->geometryValue()
-	) | rpl::start_with_next([=](QSize outer, QRect inner) {
+	) | rpl::on_next([=](QSize outer, QRect inner) {
 		emojiToggle->moveToLeft(
 			rect::right(inner) + shift.x(),
 			inner.y() + shift.y());
diff --git a/Telegram/SourceFiles/ui/controls/emoji_button_factory.h b/Telegram/SourceFiles/ui/controls/emoji_button_factory.h
index 3fa3dc728c4d5e..18eb6347f5499e 100644
--- a/Telegram/SourceFiles/ui/controls/emoji_button_factory.h
+++ b/Telegram/SourceFiles/ui/controls/emoji_button_factory.h
@@ -26,6 +26,7 @@ class InputField;
 	not_null<Ui::BoxContent*> box,
 	not_null<Window::SessionController*> controller,
 	not_null<ChatHelpers::TabbedPanel*> emojiPanel,
-	QPoint shift);
+	QPoint shift,
+	bool fadeOnFocusChange = true);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/feature_list.cpp b/Telegram/SourceFiles/ui/controls/feature_list.cpp
new file mode 100644
index 00000000000000..dcb31ce8df1a4a
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/feature_list.cpp
@@ -0,0 +1,62 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/feature_list.h"
+
+#include "base/object_ptr.h"
+#include "info/profile/info_profile_icon.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_info.h"
+
+namespace Ui {
+
+object_ptr<RpWidget> MakeFeatureListEntry(
+		QWidget *parent,
+		FeatureListEntry feature,
+		const Text::MarkedContext &context,
+		const style::FlatLabel &stTitle,
+		const style::FlatLabel &stAbout) {
+	auto result = object_ptr<PaddingWrap<>>(
+		parent,
+		object_ptr<RpWidget>(parent),
+		st::infoStarsFeatureMargin);
+	const auto widget = result->entity();
+	const auto icon = CreateChild<Info::Profile::FloatingIcon>(
+		widget,
+		feature.icon,
+		st::infoStarsFeatureIconPosition);
+	const auto title = CreateChild<FlatLabel>(
+		widget,
+		feature.title,
+		stTitle);
+	const auto about = CreateChild<FlatLabel>(
+		widget,
+		rpl::single(feature.about),
+		stAbout,
+		st::defaultPopupMenu,
+		context);
+	icon->show();
+	title->show();
+	about->show();
+	about->setLinksTrusted();
+	widget->widthValue(
+	) | rpl::on_next([=](int width) {
+		const auto left = st::infoStarsFeatureLabelLeft;
+		const auto available = width - left;
+		title->resizeToWidth(available);
+		about->resizeToWidth(available);
+		auto top = 0;
+		title->move(left, top);
+		top += title->height() + st::infoStarsFeatureSkip;
+		about->move(left, top);
+		top += about->height();
+		widget->resize(width, top);
+	}, widget->lifetime());
+	return result;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/feature_list.h b/Telegram/SourceFiles/ui/controls/feature_list.h
new file mode 100644
index 00000000000000..573d8e53eb3a65
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/feature_list.h
@@ -0,0 +1,40 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace style {
+struct FlatLabel;
+} // namespace style
+
+namespace st {
+extern const style::FlatLabel &infoStarsFeatureTitle;
+extern const style::FlatLabel &infoStarsFeatureAbout;
+} // namespace st
+
+namespace Ui::Text {
+struct MarkedContext;
+} // namespace Ui::Text
+
+namespace Ui {
+
+class RpWidget;
+
+struct FeatureListEntry {
+	const style::icon &icon;
+	QString title;
+	TextWithEntities about;
+};
+
+[[nodiscard]] object_ptr<RpWidget> MakeFeatureListEntry(
+	QWidget *parent,
+	FeatureListEntry feature,
+	const Text::MarkedContext &context = {},
+	const style::FlatLabel &stTitle = st::infoStarsFeatureTitle,
+	const style::FlatLabel &stAbout = st::infoStarsFeatureAbout);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/filter_link_header.cpp b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
index 0d69c0efdfd81c..2d2c8b9fe1a528 100644
--- a/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
+++ b/Telegram/SourceFiles/ui/controls/filter_link_header.cpp
@@ -8,11 +8,16 @@ For license and copyright information please follow this link:
 #include "ui/controls/filter_link_header.h"
 
 #include "lang/lang_keys.h"
+#include "ui/image/image_prepare.h"
+#include "ui/text/text_utilities.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
-#include "ui/image/image_prepare.h"
+#include "ui/ui_utility.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/chat_filters_tabs_slider.h"
 #include "ui/widgets/labels.h"
+#include "styles/style_chat_helpers.h" // defaultEmojiSuggestions
+#include "styles/style_dialogs.h" // dialogsSearchTabs
 #include "styles/style_filter_icons.h"
 #include "styles/style_layers.h"
 #include "styles/style_settings.h"
@@ -24,6 +29,11 @@ namespace {
 constexpr auto kBodyAnimationPart = 0.90;
 constexpr auto kTitleAdditionalScale = 0.05;
 
+struct PreviewState {
+	Fn<QImage()> frame;
+	rpl::lifetime lifetime;
+};
+
 class Widget final : public RpWidget {
 public:
 	Widget(
@@ -57,7 +67,7 @@ class Widget final : public RpWidget {
 	} _progress;
 
 	rpl::variable<int> _badge;
-	QImage _preview;
+	PreviewState _preview;
 	QRectF _previewRect;
 
 	QString _titleText;
@@ -66,8 +76,10 @@ class Widget final : public RpWidget {
 	QPoint _titlePosition;
 	QPainterPath _titlePath;
 
-	QString _folderTitle;
+	TextWithEntities _folderTitle;
+	Text::MarkedContext _aboutContext;
 	not_null<const style::icon*> _folderIcon;
+	bool _horizontalFilters = false;
 
 	int _maxHeight = 0;
 
@@ -75,15 +87,94 @@ class Widget final : public RpWidget {
 
 };
 
-[[nodiscard]] QImage GeneratePreview(
-		const QString &title,
+[[nodiscard]] PreviewState GeneratePreview(
+		not_null<Ui::RpWidget*> parent,
+		const TextWithEntities &title,
+		Text::MarkedContext aboutContext,
+		int badge) {
+	using Tabs = Ui::ChatsFiltersTabs;
+	auto preview = PreviewState();
+
+	struct State {
+		State(not_null<Ui::RpWidget*> parent)
+		: tabs(parent, st::dialogsSearchTabs) {
+		}
+
+		Tabs tabs;
+		QImage cache;
+		bool dirty = true;
+	};
+	const auto state = preview.lifetime.make_state<State>(parent);
+	preview.frame = [=] {
+		if (state->dirty) {
+			const auto raw = &state->tabs;
+			state->cache.fill(st::windowBg->c);
+
+			auto p = QPainter(&state->cache);
+			Ui::RenderWidget(p, raw, QPoint(), raw->rect());
+
+			const auto &r = st::defaultEmojiSuggestions.fadeRight;
+			const auto &l = st::defaultEmojiSuggestions.fadeLeft;
+			const auto padding = st::filterLinkSubsectionTitlePadding.top();
+			const auto w = raw->width();
+			const auto h = raw->height();
+			r.fill(p, QRect(w - r.width() - padding, 0, r.width(), h));
+			l.fill(p, QRect(padding, 0, l.width(), h));
+			p.fillRect(0, 0, padding, h, st::windowBg);
+			p.fillRect(w - padding, 0, padding, raw->height(), st::windowBg);
+		}
+		return state->cache;
+	};
+	const auto raw = &state->tabs;
+	const auto repaint = [=] { state->dirty = true; };
+	auto context = aboutContext;
+	context.repaint = repaint;
+	raw->setSections({
+		TextWithEntities{ tr::lng_filters_name_people(tr::now) },
+		title,
+		TextWithEntities{ tr::lng_filters_name_unread(tr::now) },
+	}, context);
+	raw->fitWidthToSections();
+	raw->setActiveSectionFast(1);
+	raw->stopAnimation();
+
+	auto &result = state->cache;
+	result = QImage(
+		raw->size() * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(style::DevicePixelRatio());
+	raw->hide();
+
+	style::PaletteChanged(
+	) | rpl::on_next(repaint, preview.lifetime);
+
+	return preview;
+}
+
+[[nodiscard]] PreviewState GeneratePreview(
+		const TextWithEntities &title,
+		Text::MarkedContext context,
 		not_null<const style::icon*> icon,
 		int badge) {
+	auto preview = PreviewState();
+
+	struct State {
+		QImage bg;
+		QImage composed;
+		Ui::Text::String string;
+		bool dirty = true;
+	};
+	const auto state = preview.lifetime.make_state<State>();
+	context.repaint = [=] {
+		state->dirty = true;
+	};
+
 	const auto size = st::filterLinkPreview;
 	const auto ratio = style::DevicePixelRatio();
 	const auto radius = st::filterLinkPreviewRadius;
 	const auto full = QSize(size, size) * ratio;
-	auto result = QImage(full, QImage::Format_ARGB32_Premultiplied);
+	auto &result = state->bg;
+	result = QImage(full, QImage::Format_ARGB32_Premultiplied);
 	result.setDevicePixelRatio(ratio);
 	result.fill(st::windowBg->c);
 
@@ -104,16 +195,19 @@ class Widget final : public RpWidget {
 	const auto myIconTop = st::filterLinkPreviewMyBottom - iconHeight;
 	icon->paint(p, iconLeft, myIconTop, size);
 
-	const auto paintName = [&](const QString &text, int top) {
-		auto string = Ui::Text::String(
-			st.style,
+	const auto fillName = [=](const TextWithEntities &text) {
+		state->string = Ui::Text::String(
+			st::windowFiltersButton.style,
 			text,
-			kDefaultTextOptions,
-			available);
-		string.draw(p, {
+			kMarkupTextOptions,
+			available,
+			context);
+	};
+	const auto paintName = [=](QPainter &p, int top) {
+		state->string.draw(p, {
 			.position = QPoint(
 				std::max(
-					(column - string.maxWidth()) / 2,
+					(column - state->string.maxWidth()) / 2,
 					skip),
 				top),
 			.outerWidth = available,
@@ -124,9 +218,9 @@ class Widget final : public RpWidget {
 	};
 	p.setFont(st.style.font);
 	p.setPen(st.textFg);
-	paintName(tr::lng_filters_all(tr::now), st::filterLinkPreviewAllTop);
-	p.setPen(st.textFgActive);
-	paintName(title, st::filterLinkPreviewMyTop);
+	fillName({ tr::lng_filters_all(tr::now) });
+	paintName(p, st::filterLinkPreviewAllTop);
+	fillName(title);
 
 	auto hq = PainterHighQualityEnabler(p);
 
@@ -181,7 +275,19 @@ class Widget final : public RpWidget {
 	p.drawRoundedRect(0, 0, size, size, radius, radius);
 	p.end();
 
-	return Images::Round(std::move(result), Images::CornersMask(radius));
+	result = Images::Round(std::move(result), Images::CornersMask(radius));
+
+	preview.frame = [=] {
+		if (state->dirty) {
+			state->composed = state->bg;
+			auto p = QPainter(&state->composed);
+			p.setPen(st.textFgActive);
+			paintName(p, st::filterLinkPreviewMyTop);
+		}
+		return state->composed;
+	};
+
+	return preview;
 }
 
 Widget::Widget(
@@ -191,7 +297,9 @@ Widget::Widget(
 , _about(CreateChild<FlatLabel>(
 	this,
 	rpl::single(descriptor.about.value()),
-	st::filterLinkAbout))
+	st::filterLinkAbout,
+	st::defaultPopupMenu,
+	descriptor.aboutContext))
 , _close(CreateChild<IconButton>(this, st::boxTitleClose))
 , _aboutPadding(st::boxRowPadding)
 , _badge(std::move(descriptor.badge))
@@ -199,18 +307,15 @@ Widget::Widget(
 , _titleFont(st::boxTitle.style.font)
 , _titlePadding(st::filterLinkTitlePadding)
 , _folderTitle(descriptor.folderTitle)
-, _folderIcon(descriptor.folderIcon) {
+, _aboutContext(descriptor.aboutContext)
+, _folderIcon(descriptor.folderIcon)
+, _horizontalFilters(descriptor.horizontalFilters) {
 	setMinimumHeight(st::boxTitleHeight);
 	refreshTitleText();
 	setTitlePosition(st::boxTitlePosition.x(), st::boxTitlePosition.y());
 
-	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
-		_preview = QImage();
-	}, lifetime());
-
-	_badge.changes() | rpl::start_with_next([=] {
-		_preview = QImage();
+	_badge.changes() | rpl::on_next([this] {
+		_preview = PreviewState();
 		update();
 	}, lifetime());
 }
@@ -242,7 +347,9 @@ void Widget::resizeEvent(QResizeEvent *e) {
 	_about->resizeToWidth(availableWidth);
 
 	const auto minHeight = minimumHeight();
-	const auto maxHeight = st::filterLinkAboutTop
+	const auto maxHeight = (_horizontalFilters
+			? (st::filterLinkAboutTop * 0.8)
+			: st::filterLinkAboutTop)
 		+ _about->height()
 		+ st::filterLinkAboutBottom;
 	if (maxHeight <= minHeight) {
@@ -283,12 +390,23 @@ void Widget::resizeEvent(QResizeEvent *e) {
 QRectF Widget::previewRect(
 		float64 topProgress,
 		float64 sizeProgress) const {
-	const auto size = st::filterLinkPreview * sizeProgress;
-	return QRectF(
-		(width() - size) / 2.,
-		st::filterLinkPreviewTop * topProgress,
-		size,
-		size);
+	if (_horizontalFilters) {
+		const auto size = (_preview.frame
+			? (_preview.frame().size() / style::DevicePixelRatio())
+			: QSize()) * sizeProgress;
+		return QRectF(
+			(width() - size.width()) / 2.,
+			st::filterLinkPreviewTop * 1.5 * topProgress,
+			size.width(),
+			size.height());
+	} else {
+		const auto size = st::filterLinkPreview * sizeProgress;
+		return QRectF(
+			(width() - size) / 2.,
+			st::filterLinkPreviewTop * topProgress,
+			size,
+			size);
+	}
 };
 
 void Widget::paintEvent(QPaintEvent *e) {
@@ -297,13 +415,31 @@ void Widget::paintEvent(QPaintEvent *e) {
 	p.setOpacity(_progress.body);
 	if (_progress.top) {
 		auto hq = PainterHighQualityEnabler(p);
-		if (_preview.isNull()) {
-			_preview = GeneratePreview(
-				_folderTitle,
-				_folderIcon,
-				_badge.current());
+		if (!_preview.frame) {
+			const auto badge = _badge.current();
+			auto context = _aboutContext;
+			context.repaint = [this, copy = context.repaint] {
+				if (const auto &repaint = copy) {
+					repaint();
+				}
+				update();
+			};
+			if (_horizontalFilters) {
+				_preview = GeneratePreview(
+					this,
+					_folderTitle,
+					context,
+					badge);
+				Widget::resizeEvent(nullptr);
+			} else {
+				_preview = GeneratePreview(
+					_folderTitle,
+					context,
+					_folderIcon,
+					badge);
+			}
 		}
-		p.drawImage(_previewRect, _preview);
+		p.drawImage(_previewRect, _preview.frame());
 	}
 	p.resetTransform();
 
@@ -353,14 +489,16 @@ void Widget::wheelEvent(QWheelEvent *e) {
 object_ptr<RoundButton> FilterLinkProcessButton(
 		not_null<QWidget*> parent,
 		FilterLinkHeaderType type,
-		const QString &title,
+		TextWithEntities title,
+		Text::MarkedContext context,
 		rpl::producer<int> badge) {
 	const auto st = &st::filterInviteBox.button;
 	const auto badgeSt = &st::filterInviteButtonBadgeStyle;
 	auto result = object_ptr<RoundButton>(parent, rpl::single(u""_q), *st);
+	result->setTextTransform(RoundButtonTextTransform::ToUpper);
 
 	struct Data {
-		QString text;
+		TextWithEntities text;
 		QString badge;
 	};
 	auto data = std::move(
@@ -368,32 +506,41 @@ object_ptr<RoundButton> FilterLinkProcessButton(
 	) | rpl::map([=](int count) {
 		const auto badge = count ? QString::number(count) : QString();
 		const auto with = [&](QString badge) {
-			return rpl::map([=](QString text) {
+			return rpl::map([=](TextWithEntities text) {
 				return Data{ text, badge };
 			});
 		};
 		switch (type) {
 		case FilterLinkHeaderType::AddingFilter:
 			return badge.isEmpty()
-				? tr::lng_filters_by_link_add_no() | with(QString())
+				? tr::lng_filters_by_link_add_no(
+					tr::marked
+				) | with(QString())
 				: tr::lng_filters_by_link_add_button(
 					lt_folder,
-					rpl::single(title)
+					rpl::single(title),
+					tr::marked
 				) | with(badge);
 		case FilterLinkHeaderType::AddingChats:
 			return badge.isEmpty()
-				? tr::lng_filters_by_link_join_no() | with(QString())
+				? tr::lng_filters_by_link_join_no(
+					tr::marked
+				) | with(QString())
 				: tr::lng_filters_by_link_and_join_button(
 					lt_count,
-					rpl::single(float64(count))) | with(badge);
+					rpl::single(float64(count)),
+					tr::marked) | with(badge);
 		case FilterLinkHeaderType::AllAdded:
-			return tr::lng_box_ok() | with(QString());
+			return tr::lng_box_ok(tr::marked) | with(QString());
 		case FilterLinkHeaderType::Removing:
 			return badge.isEmpty()
-				? tr::lng_filters_by_link_remove_button() | with(QString())
+				? tr::lng_filters_by_link_remove_button(
+					tr::marked
+				) | with(QString())
 				: tr::lng_filters_by_link_and_quit_button(
 					lt_count,
-					rpl::single(float64(count))) | with(badge);
+					rpl::single(float64(count)),
+					tr::marked) | with(badge);
 		}
 		Unexpected("Type in FilterLinkProcessButton.");
 	}) | rpl::flatten_latest();
@@ -406,14 +553,14 @@ object_ptr<RoundButton> FilterLinkProcessButton(
 	};
 	const auto label = result->lifetime().make_state<Label>(result.data());
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
-	result->sizeValue() | rpl::start_with_next([=](QSize size) {
+	result->sizeValue() | rpl::on_next([=](QSize size) {
 		const auto xskip = st->style.font->spacew;
 		const auto yskip = xskip / 2;
 		label->setGeometry(QRect(QPoint(), size).marginsRemoved(
 			{ xskip, yskip, xskip, yskip }));
 	}, label->lifetime());
 	label->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = Painter(label);
 		const auto width = label->width();
 		const auto hasBadge = !label->badge.isEmpty();
@@ -458,8 +605,13 @@ object_ptr<RoundButton> FilterLinkProcessButton(
 		}
 	}, label->lifetime());
 
-	std::move(data) | rpl::start_with_next([=](Data data) {
-		label->text.setText(st::filterInviteButtonStyle, data.text);
+	context.repaint = [=] { label->update(); };
+	std::move(data) | rpl::on_next([=](Data data) {
+		label->text.setMarkedText(
+			st::filterInviteButtonStyle,
+			data.text,
+			kMarkupTextOptions,
+			context);
 		label->badge.setText(st::filterInviteButtonBadgeStyle, data.badge);
 		label->update();
 	}, label->lifetime());
diff --git a/Telegram/SourceFiles/ui/controls/filter_link_header.h b/Telegram/SourceFiles/ui/controls/filter_link_header.h
index 8769bf0699e31d..a530de23af0014 100644
--- a/Telegram/SourceFiles/ui/controls/filter_link_header.h
+++ b/Telegram/SourceFiles/ui/controls/filter_link_header.h
@@ -26,9 +26,11 @@ struct FilterLinkHeaderDescriptor {
 	base::required<FilterLinkHeaderType> type;
 	base::required<QString> title;
 	base::required<TextWithEntities> about;
-	base::required<QString> folderTitle;
+	Text::MarkedContext aboutContext;
+	base::required<TextWithEntities> folderTitle;
 	not_null<const style::icon*> folderIcon;
 	rpl::producer<int> badge;
+	bool horizontalFilters = false;
 };
 
 struct FilterLinkHeader {
@@ -44,7 +46,8 @@ struct FilterLinkHeader {
 [[nodiscard]] object_ptr<RoundButton> FilterLinkProcessButton(
 	not_null<QWidget*> parent,
 	FilterLinkHeaderType type,
-	const QString &title,
+	TextWithEntities title,
+	Text::MarkedContext context,
 	rpl::producer<int> badge);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp b/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp
index ac13cab1731c71..b7984659654ac6 100644
--- a/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp
+++ b/Telegram/SourceFiles/ui/controls/invite_link_buttons.cpp
@@ -42,17 +42,15 @@ void AddCopyShareLinkButtons(
 		wrap,
 		tr::lng_group_invite_copy(),
 		st::inviteLinkCopy);
-	copy->setTextTransform(RoundButton::TextTransform::NoTransform);
 	copy->setClickedCallback(copyLink);
 	const auto share = CreateChild<RoundButton>(
 		wrap,
 		tr::lng_group_invite_share(),
 		st::inviteLinkShare);
-	share->setTextTransform(RoundButton::TextTransform::NoTransform);
 	share->setClickedCallback(shareLink);
 
 	wrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto buttonWidth = (width - st::inviteLinkButtonsSkip) / 2;
 		copy->setFullWidth(buttonWidth);
 		share->setFullWidth(buttonWidth);
@@ -71,7 +69,6 @@ void AddReactivateLinkButton(
 			tr::lng_group_invite_reactivate(),
 			st::inviteLinkReactivate),
 		st::inviteLinkButtonsPadding);
-	button->setTextTransform(RoundButton::TextTransform::NoTransform);
 	button->setClickedCallback(editLink);
 }
 
@@ -84,7 +81,6 @@ void AddDeleteLinkButton(
 			tr::lng_group_invite_delete(),
 			st::inviteLinkDelete),
 		st::inviteLinkButtonsPadding);
-	button->setTextTransform(RoundButton::TextTransform::NoTransform);
 	button->setClickedCallback(deleteLink);
 }
 
@@ -109,7 +105,7 @@ not_null<AbstractButton*> AddJoinedCountButton(
 	const auto state = result->lifetime().make_state<State>();
 	std::move(
 		content
-	) | rpl::start_with_next([=](JoinedCountContent &&content) {
+	) | rpl::on_next([=](JoinedCountContent &&content) {
 		state->content = std::move(content);
 		wrap->toggle(state->content.count > 0, anim::type::instant);
 		if (state->content.count <= 0) {
@@ -143,7 +139,7 @@ not_null<AbstractButton*> AddJoinedCountButton(
 	}, result->lifetime());
 
 	result->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(result);
 		if (!state->content.userpics.isNull()) {
 			p.drawImage(0, 0, state->content.userpics);
@@ -161,7 +157,7 @@ not_null<AbstractButton*> AddJoinedCountButton(
 	}, result->lifetime());
 
 	wrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		result->move((width - result->width()) / 2, 0);
 	}, wrap->lifetime());
 
diff --git a/Telegram/SourceFiles/ui/controls/invite_link_label.cpp b/Telegram/SourceFiles/ui/controls/invite_link_label.cpp
index 80d58be9a6954f..d5eabacae0bf95 100644
--- a/Telegram/SourceFiles/ui/controls/invite_link_label.cpp
+++ b/Telegram/SourceFiles/ui/controls/invite_link_label.cpp
@@ -33,7 +33,7 @@ InviteLinkLabel::InviteLinkLabel(
 		: (IconButton*)(nullptr);
 
 	_outer->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto margin = st::inviteLinkFieldMargin;
 		const auto labelWidth = width - margin.left() - margin.right();
 		label->resizeToWidth(labelWidth);
@@ -48,7 +48,7 @@ InviteLinkLabel::InviteLinkLabel(
 	}, _outer->lifetime());
 
 	_outer->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_outer.get());
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::filterInputInactiveBg);
@@ -72,7 +72,7 @@ InviteLinkLabel::InviteLinkLabel(
 					&& (static_cast<QMouseEvent*>(event.get())->button()
 						== Qt::RightButton);
 			}) | rpl::to_empty
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (_menu) {
 				_menu = nullptr;
 			} else if ((_menu = createMenu())) {
diff --git a/Telegram/SourceFiles/ui/controls/labeled_emoji_tabs.cpp b/Telegram/SourceFiles/ui/controls/labeled_emoji_tabs.cpp
new file mode 100644
index 00000000000000..1054eeb2272260
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/labeled_emoji_tabs.cpp
@@ -0,0 +1,699 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/labeled_emoji_tabs.h"
+
+#include "base/object_ptr.h"
+#include "ui/abstract_button.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/painter.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/scroll_area.h"
+#include "styles/style_basic.h"
+#include "styles/style_boxes.h"
+
+#include <algorithm>
+#include <cmath>
+
+#include <QtGui/QContextMenuEvent>
+#include <QtGui/QMouseEvent>
+#include <QtWidgets/QApplication>
+
+namespace Ui {
+namespace {
+
+[[nodiscard]] QColor ColorWithAlpha(
+		const style::color &color,
+		float64 alpha) {
+	auto result = color->c;
+	result.setAlphaF(result.alphaF() * alpha);
+	return result;
+}
+
+[[nodiscard]] QColor ActiveBackgroundColor(const style::color &color) {
+	return ColorWithAlpha(color, st::aiComposeButtonBgActiveOpacity);
+}
+
+[[nodiscard]] QColor RippleColor(
+		const style::RippleAnimation &ripple,
+		float64 opacity) {
+	return ColorWithAlpha(ripple.color, opacity);
+}
+
+[[nodiscard]] qreal TabsRadius() {
+	return st::aiComposeStyleTabsRadius;
+}
+
+} // namespace
+
+class LabeledEmojiTabs::Button final : public RippleButton {
+public:
+	Button(
+		QWidget *parent,
+		LabeledEmojiTab descriptor,
+		Text::CustomEmojiFactory factory);
+
+	void setSelected(bool selected);
+	void setExtraPadding(int extra);
+	void setContextMenuCallback(Fn<void(QPoint)> callback);
+	[[nodiscard]] const QString &id() const;
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void contextMenuEvent(QContextMenuEvent *e) override;
+	[[nodiscard]] QImage prepareRippleMask() const override;
+
+private:
+	const LabeledEmojiTab _descriptor;
+	std::unique_ptr<Text::CustomEmoji> _custom;
+	Fn<void(QPoint)> _contextMenuCallback;
+	bool _selected = false;
+	int _extraPadding = 0;
+
+};
+
+class LabeledEmojiScrollTabs::DragScroll final : public QObject {
+public:
+	DragScroll(
+		not_null<QObject*> parent,
+		not_null<ScrollArea*> scroll,
+		Fn<void()> beforeScroll);
+
+	void add(not_null<LabeledEmojiTabs::Button*> button);
+
+protected:
+	bool eventFilter(QObject *watched, QEvent *event) override;
+
+private:
+	const not_null<ScrollArea*> _scroll;
+	const Fn<void()> _beforeScroll;
+	QPointer<LabeledEmojiTabs::Button> _pressed;
+	QPoint _pressGlobal;
+	int _scrollStart = 0;
+	bool _dragging = false;
+
+};
+
+LabeledEmojiTabs::Button::Button(
+	QWidget *parent,
+	LabeledEmojiTab descriptor,
+	Text::CustomEmojiFactory factory)
+: RippleButton(parent, st::aiComposeButtonRippleInactive)
+, _descriptor(std::move(descriptor))
+, _custom(!_descriptor.customEmojiData.isEmpty() && factory
+	? factory(
+		_descriptor.customEmojiData,
+		{ .repaint = [this] { update(); } })
+	: nullptr) {
+	setCursor(style::cur_pointer);
+	setAccessibleName(_descriptor.label);
+	setNaturalWidth([&] {
+		const auto padding = st::aiComposeStyleButtonPadding;
+		const auto labelWidth = st::aiComposeStyleLabelFont->width(
+			_descriptor.label);
+		const auto emojiWidth = (_custom || _descriptor.emoji || _descriptor.icon)
+			? (Emoji::GetSizeLarge() / style::DevicePixelRatio())
+			: 0;
+		return padding.left()
+			+ std::max(labelWidth, emojiWidth)
+			+ padding.right();
+	}());
+	setExtraPadding(0);
+}
+
+void LabeledEmojiTabs::Button::setSelected(bool selected) {
+	if (_selected == selected) {
+		return;
+	}
+	_selected = selected;
+	update();
+}
+
+void LabeledEmojiTabs::Button::setExtraPadding(int extra) {
+	_extraPadding = extra;
+	resize(naturalWidth() + 2 * extra, height());
+}
+
+const QString &LabeledEmojiTabs::Button::id() const {
+	return _descriptor.id;
+}
+
+void LabeledEmojiTabs::Button::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	PainterHighQualityEnabler hq(p);
+
+	const auto radius = TabsRadius();
+	if (_selected) {
+		p.setPen(Qt::NoPen);
+		p.setBrush(ActiveBackgroundColor(st::aiComposeStyleButtonBgActive));
+		p.drawRoundedRect(rect(), radius, radius);
+	}
+	const auto ripple = RippleColor(
+		_selected
+			? st::aiComposeButtonRippleActive
+			: st::aiComposeButtonRippleInactive,
+		_selected
+			? st::aiComposeButtonRippleActiveOpacity
+			: st::aiComposeButtonRippleInactiveOpacity);
+	paintRipple(p, 0, 0, &ripple);
+
+	if (_custom) {
+		const auto size = Emoji::GetSizeLarge() / style::DevicePixelRatio();
+		const auto adjusted = Text::AdjustCustomEmojiSize(size);
+		const auto skip = (size - adjusted) / 2;
+		const auto left = (width() - size) / 2;
+		_custom->paint(p, {
+			.textColor = (_selected
+				? st::aiComposeStyleLabelFgActive
+				: st::aiComposeStyleLabelFg)->c,
+			.now = crl::now(),
+			.position = {
+				left + skip,
+				st::aiComposeStyleEmojiTop + skip,
+			},
+			.paused = !window()->isActiveWindow(),
+		});
+	} else if (_descriptor.emoji) {
+		const auto size = Emoji::GetSizeLarge() / style::DevicePixelRatio();
+		const auto left = (width() - size) / 2;
+		Emoji::Draw(
+			p,
+			_descriptor.emoji,
+			Emoji::GetSizeLarge(),
+			left,
+			st::aiComposeStyleEmojiTop);
+	} else if (_descriptor.icon) {
+		const auto &icon = _selected
+			? *_descriptor.iconActive
+			: *_descriptor.icon;
+		icon.paintInCenter(
+			p,
+			QRect(0, 0, width(), st::aiComposeStyleLabelTop));
+	}
+
+	p.setPen(_selected
+		? st::aiComposeStyleLabelFgActive
+		: st::aiComposeStyleLabelFg);
+	p.setFont(st::aiComposeStyleLabelFont);
+	p.drawText(
+		QRect(
+			0,
+			st::aiComposeStyleLabelTop,
+			width(),
+			height() - st::aiComposeStyleLabelTop),
+		Qt::AlignHCenter | Qt::AlignTop,
+		_descriptor.label);
+}
+
+QImage LabeledEmojiTabs::Button::prepareRippleMask() const {
+	return RippleAnimation::MaskByDrawer(size(), false, [&](QPainter &p) {
+		p.setPen(Qt::NoPen);
+		p.setBrush(Qt::white);
+		const auto radius = TabsRadius();
+		p.drawRoundedRect(rect(), radius, radius);
+	});
+}
+
+void LabeledEmojiTabs::Button::setContextMenuCallback(
+		Fn<void(QPoint)> callback) {
+	_contextMenuCallback = std::move(callback);
+}
+
+void LabeledEmojiTabs::Button::contextMenuEvent(QContextMenuEvent *e) {
+	if (_contextMenuCallback) {
+		_contextMenuCallback(e->globalPos());
+	}
+}
+
+LabeledEmojiScrollTabs::DragScroll::DragScroll(
+	not_null<QObject*> parent,
+	not_null<ScrollArea*> scroll,
+	Fn<void()> beforeScroll)
+: QObject(parent)
+, _scroll(scroll)
+, _beforeScroll(std::move(beforeScroll)) {
+}
+
+void LabeledEmojiScrollTabs::DragScroll::add(
+		not_null<LabeledEmojiTabs::Button*> button) {
+	button->installEventFilter(this);
+}
+
+bool LabeledEmojiScrollTabs::DragScroll::eventFilter(
+		QObject *watched,
+		QEvent *event) {
+	const auto button = dynamic_cast<LabeledEmojiTabs::Button*>(watched);
+	if (!button) {
+		return QObject::eventFilter(watched, event);
+	}
+	switch (event->type()) {
+	case QEvent::MouseButtonPress: {
+		const auto mouse = static_cast<QMouseEvent*>(event);
+		if (mouse->button() != Qt::LeftButton) {
+			break;
+		}
+		_pressed = button;
+		_pressGlobal = mouse->globalPos();
+		_scrollStart = _scroll->scrollLeft();
+		_dragging = false;
+		break;
+	}
+	case QEvent::MouseMove: {
+		const auto mouse = static_cast<QMouseEvent*>(event);
+		if (_pressed != button || !(mouse->buttons() & Qt::LeftButton)) {
+			break;
+		}
+		const auto delta = mouse->globalPos() - _pressGlobal;
+		if (!_dragging) {
+			if (!_scroll->scrollLeftMax()) {
+				break;
+			}
+			if (std::abs(delta.x()) < QApplication::startDragDistance()) {
+				break;
+			}
+			if (std::abs(delta.x()) <= std::abs(delta.y())) {
+				break;
+			}
+			_dragging = true;
+			button->setSynteticOver(false);
+		}
+		if (_beforeScroll) {
+			_beforeScroll();
+		}
+		button->setSynteticOver(false);
+		_scroll->scrollToX(_scrollStart - delta.x());
+		return true;
+	}
+	case QEvent::MouseButtonRelease: {
+		const auto mouse = static_cast<QMouseEvent*>(event);
+		if (_pressed != button || mouse->button() != Qt::LeftButton) {
+			break;
+		}
+		const auto dragging = std::exchange(_dragging, false);
+		_pressed = nullptr;
+		if (dragging) {
+			button->setSynteticOver(false);
+		}
+		break;
+	}
+	case QEvent::Hide:
+		if (_pressed == button) {
+			_pressed = nullptr;
+			_dragging = false;
+		}
+		break;
+	default:
+		break;
+	}
+	return QObject::eventFilter(watched, event);
+}
+
+LabeledEmojiTabs::LabeledEmojiTabs(
+	QWidget *parent,
+	std::vector<LabeledEmojiTab> descriptors,
+	Text::CustomEmojiFactory factory)
+: RpWidget(parent) {
+	_buttons.reserve(descriptors.size());
+	for (auto &descriptor : descriptors) {
+		const auto button = CreateChild<Button>(
+			this,
+			std::move(descriptor),
+			factory);
+		button->setClickedCallback([=] {
+			const auto i = ranges::find(_buttons, not_null(button));
+			const auto index = int(i - begin(_buttons));
+			if (index == _buttons.size()) {
+				return;
+			}
+			setActive(index);
+			_requestShown.fire({
+				_buttons[index]->x(),
+				_buttons[index]->x() + _buttons[index]->width(),
+			});
+			if (_changed) {
+				_changed(index);
+			}
+		});
+		_buttons.push_back(button);
+	}
+	setNaturalWidth([&] {
+		const auto padding = st::aiComposeStyleTabsPadding;
+		const auto skip = st::aiComposeStyleTabsSkip;
+		auto total = padding.left();
+		for (const auto &button : _buttons) {
+			total += button->naturalWidth() + skip;
+		}
+		return total - (_buttons.empty() ? 0 : skip) + padding.right();
+	}());
+	setActive(-1);
+}
+
+void LabeledEmojiTabs::setChangedCallback(Fn<void(int)> callback) {
+	_changed = std::move(callback);
+}
+
+void LabeledEmojiTabs::setContextMenuCallback(
+		Fn<void(int, QPoint)> callback) {
+	_contextMenu = std::move(callback);
+	for (auto i = 0; i != int(_buttons.size()); ++i) {
+		_buttons[i]->setContextMenuCallback([=](QPoint globalPos) {
+			if (_contextMenu) {
+				_contextMenu(i, globalPos);
+			}
+		});
+	}
+}
+
+void LabeledEmojiTabs::setActive(int index) {
+	if (index < -1 || index >= int(_buttons.size())) {
+		return;
+	}
+	_active = index;
+	for (auto i = 0; i != int(_buttons.size()); ++i) {
+		_buttons[i]->setSelected(i == index);
+	}
+}
+
+void LabeledEmojiTabs::resizeForOuterWidth(int outerWidth) {
+	const auto count = int(_buttons.size());
+	const auto padding = st::aiComposeStyleTabsPadding;
+	const auto skip = st::aiComposeStyleTabsSkip;
+	const auto buttonHeight = st::aiComposeStyleTabsHeight
+		- padding.top()
+		- padding.bottom();
+	const auto height = st::aiComposeStyleTabsHeight;
+	auto left = padding.left();
+	const auto guard = gsl::finally([&] {
+		resize(left - (count ? skip : 0) + padding.right(), height);
+	});
+	if (!count) {
+		return;
+	}
+	const auto setExtraPaddingFor = [&](not_null<Button*> button, int value) {
+		button->setExtraPadding(value);
+		const auto width = button->width();
+		button->setGeometry(left, padding.top(), width, buttonHeight);
+		left += width + skip;
+	};
+	const auto diff = naturalWidth() - outerWidth;
+	if (diff > 0) {
+		auto total = left;
+		for (auto fit = 0; fit != count;) {
+			const auto width = _buttons[fit]->naturalWidth();
+			const auto tooLarge = (total + (width / 2) > outerWidth);
+			if (!tooLarge) {
+				++fit;
+				total += width + skip;
+			}
+			if (tooLarge || (fit == count)) {
+				if (fit > 0) {
+					const auto width = _buttons[fit - 1]->naturalWidth();
+					const auto desired = total - skip - (width / 2);
+					const auto add = outerWidth - desired;
+					const auto extra = add / ((fit - 1) * 2 + 1);
+					for (const auto &button : _buttons) {
+						setExtraPaddingFor(button, extra);
+					}
+				} else {
+					for (const auto &button : _buttons) {
+						setExtraPaddingFor(button, 0);
+					}
+				}
+				return;
+			}
+		}
+		Unexpected("Tabs width inconsistency.");
+	} else {
+		const auto add = -diff / 2;
+		const auto each = add / _buttons.size();
+		const auto more = add - (each * _buttons.size());
+		for (auto i = 0; i < more; ++i) {
+			setExtraPaddingFor(_buttons[i], each + 1);
+		}
+		for (auto i = more; i < count; ++i) {
+			setExtraPaddingFor(_buttons[i], each);
+		}
+	}
+}
+
+QString LabeledEmojiTabs::currentId() const {
+	return (_active >= 0 && _active < int(_buttons.size()))
+		? _buttons[_active]->id()
+		: QString();
+}
+
+int LabeledEmojiTabs::buttonCount() const {
+	return int(_buttons.size());
+}
+
+rpl::producer<ScrollToRequest> LabeledEmojiTabs::requestShown() const {
+	return _requestShown.events();
+}
+
+void LabeledEmojiTabs::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	PainterHighQualityEnabler hq(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(st::aiComposeStyleTabsBg);
+	const auto radius = TabsRadius();
+	p.drawRoundedRect(rect(), radius, radius);
+}
+
+LabeledEmojiScrollTabs::LabeledEmojiScrollTabs(
+	QWidget *parent,
+	std::vector<LabeledEmojiTab> descriptors,
+	Text::CustomEmojiFactory factory)
+: RpWidget(parent)
+, _scroll(CreateChild<ScrollArea>(this, st::aiComposeStyleTabsScroll))
+, _inner(_scroll->setOwnedWidget(
+	object_ptr<LabeledEmojiTabs>(
+		this,
+		std::move(descriptors),
+		std::move(factory))))
+, _fadeLeft(CreateChild<RpWidget>(this))
+, _fadeRight(CreateChild<RpWidget>(this))
+, _cornerLeft(CreateChild<RpWidget>(this))
+, _cornerRight(CreateChild<RpWidget>(this))
+, _dragScroll(std::make_unique<DragScroll>(
+	this,
+	_scroll,
+	[=] { _scrollAnimation.stop(); })) {
+	for (const auto &button : _inner->_buttons) {
+		_dragScroll->add(button);
+	}
+	_scroll->setCustomWheelProcess([=](not_null<QWheelEvent*> e) {
+		const auto pixelDelta = e->pixelDelta();
+		const auto angleDelta = e->angleDelta();
+		if (std::abs(pixelDelta.x()) + std::abs(angleDelta.x())) {
+			return false;
+		}
+		const auto y = pixelDelta.y() ? pixelDelta.y() : angleDelta.y();
+		_scrollAnimation.stop();
+		_scroll->scrollToX(_scroll->scrollLeft() - y);
+		return true;
+	});
+
+	const auto setupFade = [&](not_null<RpWidget*> fade, bool left) {
+		fade->setAttribute(Qt::WA_TransparentForMouseEvents);
+		fade->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(fade);
+			const auto width = fade->width();
+			const auto bg = st::aiComposeStyleTabsBg->c;
+			auto transparent = bg;
+			transparent.setAlpha(0);
+			auto gradient = QLinearGradient(0, 0, width, 0);
+			if (left) {
+				gradient.setColorAt(0., bg);
+				gradient.setColorAt(1., transparent);
+			} else {
+				gradient.setColorAt(0., transparent);
+				gradient.setColorAt(1., bg);
+			}
+			p.fillRect(fade->rect(), gradient);
+		}, fade->lifetime());
+		fade->hide();
+	};
+	setupFade(_fadeLeft, true);
+	setupFade(_fadeRight, false);
+
+	const auto setupCorner = [&](not_null<RpWidget*> corner, bool left) {
+		corner->setAttribute(Qt::WA_TransparentForMouseEvents);
+		corner->paintRequest() | rpl::on_next([=] {
+			auto p = QPainter(corner);
+			PainterHighQualityEnabler hq(p);
+			const auto width = corner->width();
+			const auto height = corner->height();
+			auto mask = QPainterPath();
+			mask.addRect(0, 0, width, height);
+			auto rounded = QPainterPath();
+			if (left) {
+				rounded.addRoundedRect(0, 0, width * 2, height, width, width);
+			} else {
+				rounded.addRoundedRect(-width, 0, width * 2, height, width, width);
+			}
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::boxDividerBg);
+			p.drawPath(mask.subtracted(rounded));
+		}, corner->lifetime());
+	};
+	setupCorner(_cornerLeft, true);
+	setupCorner(_cornerRight, false);
+
+	_scroll->scrolls() | rpl::on_next([=] {
+		updateFades();
+	}, lifetime());
+
+	rpl::combine(
+		widthValue(),
+		_scroll->widthValue(),
+		_inner->widthValue()
+	) | rpl::on_next([=] {
+		updateFades();
+	}, lifetime());
+
+	_inner->requestShown() | rpl::on_next([=](ScrollToRequest request) {
+		scrollToButton(request.ymin, request.ymax, true);
+	}, lifetime());
+}
+
+LabeledEmojiScrollTabs::~LabeledEmojiScrollTabs() = default;
+
+void LabeledEmojiScrollTabs::setChangedCallback(Fn<void(int)> callback) {
+	_inner->setChangedCallback(std::move(callback));
+}
+
+void LabeledEmojiScrollTabs::setContextMenuCallback(
+		Fn<void(int, QPoint)> callback) {
+	_inner->setContextMenuCallback(std::move(callback));
+}
+
+void LabeledEmojiScrollTabs::setActive(int index) {
+	_inner->setActive(index);
+}
+
+void LabeledEmojiScrollTabs::setPaintOuterCorners(bool paint) {
+	if (_paintOuterCorners == paint) {
+		return;
+	}
+	_paintOuterCorners = paint;
+	_cornerLeft->setVisible(paint);
+	_cornerRight->setVisible(paint);
+}
+
+void LabeledEmojiScrollTabs::scrollToActive() {
+	const auto index = _inner->_active;
+	if (index < 0 || index >= int(_inner->_buttons.size())) {
+		_scrollToActivePending = false;
+		_pendingScrollLeft.reset();
+		return;
+	}
+	const auto button = _inner->_buttons[index];
+	if (_scroll->width() <= 0 || button->width() <= 0) {
+		_scrollToActivePending = true;
+		return;
+	}
+	_scrollToActivePending = false;
+	_pendingScrollLeft.reset();
+	scrollToButton(button->x(), button->x() + button->width(), false);
+}
+
+int LabeledEmojiScrollTabs::scrollLeft() const {
+	return _scroll->scrollLeft();
+}
+
+void LabeledEmojiScrollTabs::setScrollLeft(int value) {
+	if (_scroll->width() <= 0) {
+		_pendingScrollLeft = value;
+		return;
+	}
+	_pendingScrollLeft.reset();
+	_scroll->scrollToX(std::max(0, value));
+}
+
+QString LabeledEmojiScrollTabs::currentId() const {
+	return _inner->currentId();
+}
+
+int LabeledEmojiScrollTabs::buttonCount() const {
+	return _inner->buttonCount();
+}
+
+rpl::producer<ScrollToRequest> LabeledEmojiScrollTabs::requestShown() const {
+	return _inner->requestShown();
+}
+
+int LabeledEmojiScrollTabs::resizeGetHeight(int newWidth) {
+	_scroll->setGeometry(0, 0, newWidth, st::aiComposeStyleTabsHeight);
+	_inner->resizeForOuterWidth(newWidth);
+
+	const auto fadeWidth = st::aiComposeStyleFadeWidth;
+	const auto fadeHeight = st::aiComposeStyleTabsHeight;
+	_fadeLeft->setGeometry(0, 0, fadeWidth, fadeHeight);
+	_fadeRight->setGeometry(newWidth - fadeWidth, 0, fadeWidth, fadeHeight);
+	_fadeLeft->raise();
+	_fadeRight->raise();
+
+	const auto radius = st::aiComposeStyleTabsRadius;
+	if (_paintOuterCorners) {
+		_cornerLeft->setGeometry(0, 0, radius, fadeHeight);
+		_cornerRight->setGeometry(newWidth - radius, 0, radius, fadeHeight);
+		_cornerLeft->raise();
+		_cornerRight->raise();
+		_cornerLeft->show();
+		_cornerRight->show();
+	} else {
+		_cornerLeft->hide();
+		_cornerRight->hide();
+	}
+	if (_scrollToActivePending) {
+		scrollToActive();
+	} else if (_pendingScrollLeft) {
+		setScrollLeft(*_pendingScrollLeft);
+	}
+
+	updateFades();
+	return st::aiComposeStyleTabsHeight;
+}
+
+void LabeledEmojiScrollTabs::updateFades() {
+	const auto scrollLeft = _scroll->scrollLeft();
+	const auto scrollMax = _scroll->scrollLeftMax();
+	_fadeLeft->setVisible(scrollLeft > 0);
+	_fadeRight->setVisible(scrollLeft < scrollMax);
+}
+
+void LabeledEmojiScrollTabs::scrollToButton(
+		int buttonLeft,
+		int buttonRight,
+		bool animated) {
+	const auto full = _scroll->width();
+	const auto tab = buttonRight - buttonLeft;
+	if (tab < full) {
+		const auto add = std::min(full - tab, tab) / 2;
+		buttonRight += add;
+		buttonLeft -= add;
+	}
+	const auto scrollLeft = _scroll->scrollLeft();
+	const auto needed = (buttonLeft < scrollLeft)
+		|| (buttonRight > scrollLeft + full);
+	if (!needed) {
+		return;
+	}
+	const auto target = (buttonLeft < scrollLeft)
+		? buttonLeft
+		: std::min(buttonLeft, buttonRight - full);
+	_scrollAnimation.stop();
+	if (!animated) {
+		_scroll->scrollToX(target);
+		return;
+	}
+	_scrollAnimation.start([=] {
+		_scroll->scrollToX(qRound(_scrollAnimation.value(target)));
+	}, scrollLeft, target, st::slideDuration, anim::sineInOut);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/labeled_emoji_tabs.h b/Telegram/SourceFiles/ui/controls/labeled_emoji_tabs.h
new file mode 100644
index 00000000000000..dbff4f5bdcad66
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/labeled_emoji_tabs.h
@@ -0,0 +1,108 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/emoji_config.h"
+#include "ui/rp_widget.h"
+#include "ui/text/text_custom_emoji.h"
+
+#include <memory>
+#include <optional>
+#include <vector>
+
+namespace Ui {
+
+class RpWidget;
+class ScrollArea;
+struct ScrollToRequest;
+
+struct LabeledEmojiTab {
+	QString id;
+	QString label;
+	EmojiPtr emoji = nullptr;
+	QString customEmojiData;
+	const style::icon *icon = nullptr;
+	const style::icon *iconActive = nullptr;
+};
+
+class LabeledEmojiScrollTabs;
+
+class LabeledEmojiTabs final : public RpWidget {
+	friend class LabeledEmojiScrollTabs;
+
+public:
+	LabeledEmojiTabs(
+		QWidget *parent,
+		std::vector<LabeledEmojiTab> descriptors,
+		Text::CustomEmojiFactory factory);
+
+	void setChangedCallback(Fn<void(int)> callback);
+	void setContextMenuCallback(Fn<void(int, QPoint)> callback);
+	void setActive(int index);
+	void resizeForOuterWidth(int outerWidth);
+	[[nodiscard]] QString currentId() const;
+	[[nodiscard]] int buttonCount() const;
+	[[nodiscard]] rpl::producer<ScrollToRequest> requestShown() const;
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	class Button;
+
+	std::vector<not_null<Button*>> _buttons;
+	Fn<void(int)> _changed;
+	Fn<void(int, QPoint)> _contextMenu;
+	int _active = -1;
+	rpl::event_stream<ScrollToRequest> _requestShown;
+
+};
+
+class LabeledEmojiScrollTabs final : public RpWidget {
+public:
+	LabeledEmojiScrollTabs(
+		QWidget *parent,
+		std::vector<LabeledEmojiTab> descriptors,
+		Text::CustomEmojiFactory factory);
+	~LabeledEmojiScrollTabs();
+
+	void setChangedCallback(Fn<void(int)> callback);
+	void setContextMenuCallback(Fn<void(int, QPoint)> callback);
+	void setActive(int index);
+	void setPaintOuterCorners(bool paint);
+	void scrollToActive();
+	[[nodiscard]] int scrollLeft() const;
+	void setScrollLeft(int value);
+	[[nodiscard]] QString currentId() const;
+	[[nodiscard]] int buttonCount() const;
+	[[nodiscard]] rpl::producer<ScrollToRequest> requestShown() const;
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+
+private:
+	class DragScroll;
+
+	void updateFades();
+	void scrollToButton(int buttonLeft, int buttonRight, bool animated);
+
+	const not_null<ScrollArea*> _scroll;
+	const not_null<LabeledEmojiTabs*> _inner;
+	const not_null<RpWidget*> _fadeLeft;
+	const not_null<RpWidget*> _fadeRight;
+	const not_null<RpWidget*> _cornerLeft;
+	const not_null<RpWidget*> _cornerRight;
+	Animations::Simple _scrollAnimation;
+	std::unique_ptr<DragScroll> _dragScroll;
+	bool _paintOuterCorners = true;
+	bool _scrollToActivePending = false;
+	std::optional<int> _pendingScrollLeft;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/location_picker.cpp b/Telegram/SourceFiles/ui/controls/location_picker.cpp
index 71b3c6f42ad5d0..722ab13af1a7f2 100644
--- a/Telegram/SourceFiles/ui/controls/location_picker.cpp
+++ b/Telegram/SourceFiles/ui/controls/location_picker.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "base/platform/base_platform_info.h"
 #include "boxes/peer_list_box.h"
 #include "core/current_geo_location.h"
+#include "core/file_utilities.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_file_origin.h"
@@ -24,12 +25,15 @@ For license and copyright information please follow this link:
 #include "main/session/session_show.h"
 #include "main/main_session.h"
 #include "mtproto/mtproto_config.h"
+#include "ui/chat/attach/attach_bot_webview.h"
 #include "ui/effects/radial_animation.h"
 #include "ui/text/text_utilities.h"
+#include "ui/widgets/labels.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/separate_panel.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/buttons.h"
+#include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/painter.h"
@@ -38,9 +42,11 @@ For license and copyright information please follow this link:
 #include "webview/webview_data_stream_memory.h"
 #include "webview/webview_embed.h"
 #include "webview/webview_interface.h"
+#include "core/cached_webview_availability.h"
 #include "window/themes/window_theme.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_dialogs.h"
+#include "styles/style_payments.h" // paymentsCriticalError
 #include "styles/style_window.h"
 #include "styles/style_settings.h" // settingsCloudPasswordIconSize
 #include "styles/style_layers.h" // boxDividerHeight
@@ -58,12 +64,6 @@ namespace {
 constexpr auto kResolveAddressDelay = 3 * crl::time(1000);
 constexpr auto kSearchDebounceDelay = crl::time(900);
 
-#ifdef Q_OS_MAC
-const auto kProtocolOverride = "mapboxapihelper";
-#else // Q_OS_MAC
-const auto kProtocolOverride = "";
-#endif // Q_OS_MAC
-
 Core::GeoLocation LastExactLocation;
 
 using VenueData = Data::InputVenue;
@@ -192,10 +192,10 @@ class VenuesController final
 	const auto raw = result.data();
 	raw->resize(0, skip + st::pickLocationPromoHeight);
 	const auto shadow = CreateChild<PlainShadow>(raw);
-	raw->widthValue() | rpl::start_with_next([=](int width) {
+	raw->widthValue() | rpl::on_next([=](int width) {
 		shadow->setGeometry(0, skip, width, st::lineWidth);
 	}, raw->lifetime());
-	raw->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	raw->paintRequest() | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(raw);
 		p.fillRect(clip, st::windowBg);
 		p.setPen(st::windowSubTextFg);
@@ -219,7 +219,7 @@ VenuesController::VenuesController(
 
 void VenuesController::prepare() {
 	_rows.value(
-	) | rpl::start_with_next([=](const std::vector<VenueData> &rows) {
+	) | rpl::on_next([=](const std::vector<VenueData> &rows) {
 		rebuild(rows);
 	}, _lifetime);
 }
@@ -453,7 +453,7 @@ void VenuesController::rowPaintIcon(
 		st->photoPosition.y(),
 		st->photoSize,
 		st->photoSize);
-	icon->paintRequest() | rpl::start_with_next([=] {
+	icon->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(icon);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setPen(Qt::NoPen);
@@ -490,7 +490,7 @@ void VenuesController::rowPaintIcon(
 	rpl::combine(
 		result->widthValue(),
 		std::move(statusText)
-	) | rpl::start_with_next([=](int width, const QString &statusText) {
+	) | rpl::on_next([=](int width, const QString &statusText) {
 		const auto available = width
 			- st->namePosition.x()
 			- st->button.padding.right();
@@ -552,7 +552,7 @@ void SetupEmptyView(
 		(query ? Icon::NoResults : Icon::Search),
 		(query
 			? tr::lng_maps_no_places
-			: tr::lng_maps_choose_to_search)(Text::WithEntities));
+			: tr::lng_maps_choose_to_search)(tr::marked));
 	view->setMinimalHeight(st::recentPeersEmptyHeightMin);
 	view->show();
 
@@ -572,7 +572,7 @@ void SetupVenues(
 	const auto other = otherWrap->entity();
 	rpl::duplicate(
 		value
-	) | rpl::start_with_next([=](const PickerVenueState &state) {
+	) | rpl::on_next([=](const PickerVenueState &state) {
 		while (!other->children().isEmpty()) {
 			delete other->children()[0];
 		}
@@ -609,7 +609,7 @@ void SetupVenues(
 	delegate->setContent(content);
 	controller->setDelegate(delegate);
 
-	show->session().downloaderTaskFinished() | rpl::start_with_next([=] {
+	show->session().downloaderTaskFinished() | rpl::on_next([=] {
 		content->update();
 	}, content->lifetime());
 }
@@ -665,7 +665,7 @@ not_null<RpWidget*> SetupMapPlaceholder(
 	icon->lifetime().add([kept = std::move(ownedLottie)] {});
 
 	icon->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(icon);
 		const auto left = (icon->width() - iconSize) / 2;
 		const auto scale = icon->height() / float64(iconSize);
@@ -693,10 +693,9 @@ not_null<RpWidget*> SetupMapPlaceholder(
 		tr::lng_maps_select_on_map(),
 		st::pickLocationChooseOnMap);
 	button->setFullRadius(true);
-	button->setTextTransform(RoundButton::TextTransform::NoTransform);
 	button->setClickedCallback(choose);
 
-	parent->sizeValue() | rpl::start_with_next([=](QSize size) {
+	parent->sizeValue() | rpl::on_next([=](QSize size) {
 		result->setGeometry(QRect(QPoint(), size));
 
 		const auto width = size.width();
@@ -765,7 +764,7 @@ LocationPicker::LocationPicker(Descriptor &&descriptor)
 , _venueRecipient(descriptor.recipient) {
 	std::move(
 		descriptor.closeRequests
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_window = nullptr;
 		delete this;
 	}, _lifetime);
@@ -778,8 +777,13 @@ std::shared_ptr<Main::SessionShow> LocationPicker::uiShow() {
 }
 
 bool LocationPicker::Available(const LocationPickerConfig &config) {
-	static const auto Supported = Webview::NavigateToDataSupported();
-	return Supported && !config.mapsToken.isEmpty();
+#ifdef _DEBUG
+	return true;
+#endif
+	const auto &availability = Core::CachedWebviewAvailability();
+	return availability.customSchemeRequests
+		&& availability.customReferer
+		&& !config.mapsToken.isEmpty();
 }
 
 void LocationPicker::setup(const Descriptor &descriptor) {
@@ -803,7 +807,7 @@ void LocationPicker::setupWindow(const Descriptor &descriptor) {
 	const auto window = _window.get();
 
 	window->setWindowFlag(Qt::WindowStaysOnTopHint, false);
-	window->closeRequests() | rpl::start_with_next([=] {
+	window->closeRequests() | rpl::on_next([=] {
 		close();
 	}, _lifetime);
 
@@ -851,7 +855,7 @@ void LocationPicker::setupWindow(const Descriptor &descriptor) {
 		_body->sizeValue(),
 		_scroll->scrollTopValue(),
 		_venuesSearchShown.value()
-	) | rpl::start_with_next([=](QSize size, int scrollTop, bool search) {
+	) | rpl::on_next([=](QSize size, int scrollTop, bool search) {
 		const auto width = size.width();
 		const auto height = size.height();
 		const auto sub = std::min(
@@ -868,7 +872,7 @@ void LocationPicker::setupWindow(const Descriptor &descriptor) {
 		toppad->resize(width, sub);
 	}, _container->lifetime());
 
-	_container->paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_container->paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(_container).fillRect(clip, st::windowBg);
 	}, _container->lifetime());
 
@@ -883,6 +887,25 @@ void LocationPicker::setupWebview() {
 
 	delete base::take(_mapPlaceholder);
 
+	const auto window = _window.get();
+	_webview = std::make_unique<Webview::Window>(
+		_container,
+		Webview::WindowConfig{
+			.opaqueBg = st::windowBg->c,
+			.storageId = _webviewStorageId,
+			.safe = true,
+		});
+	const auto raw = _webview.get();
+	if (!raw->widget()) {
+		_webview = nullptr;
+		showWebviewError();
+		return;
+	}
+
+	window->lifetime().add([=] {
+		_webview = nullptr;
+	});
+
 	const auto mapControls = _mapControlsWrap->entity();
 	mapControls->insert(
 		1,
@@ -906,29 +929,15 @@ void LocationPicker::setupWebview() {
 
 	_mapLoading = CreateChild<RpWidget>(_body.get());
 
-	_container->geometryValue() | rpl::start_with_next([=](QRect rect) {
+	_container->geometryValue() | rpl::on_next([=](QRect rect) {
 		_mapLoading->setGeometry(rect);
 	}, _mapLoading->lifetime());
 
 	SetupLoadingView(_mapLoading);
 	_mapLoading->show();
 
-	const auto window = _window.get();
-	_webview = std::make_unique<Webview::Window>(
-		_container,
-		Webview::WindowConfig{
-			.opaqueBg = st::windowBg->c,
-			.storageId = _webviewStorageId,
-			.dataProtocolOverride = kProtocolOverride,
-		});
-	const auto raw = _webview.get();
-
-	window->lifetime().add([=] {
-		_webview = nullptr;
-	});
-
 	window->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::Close) {
 			close();
 		} else if (e->type() == QEvent::KeyPress) {
@@ -941,7 +950,7 @@ void LocationPicker::setupWebview() {
 	raw->widget()->show();
 
 	_container->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		raw->widget()->setGeometry(QRect(QPoint(), size));
 	}, _container->lifetime());
 
@@ -1029,7 +1038,7 @@ void LocationPicker::setupWebview() {
 			rpl::merge(
 				Lang::Updated(),
 				style::PaletteChanged()
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_updateStyles.call();
 			}, _webview->lifetime());
 		}
@@ -1058,6 +1067,45 @@ void LocationPicker::setupWebview() {
 	raw->navigateToData("location/picker.html");
 }
 
+void LocationPicker::showWebviewError() {
+	delete base::take(_mapPlaceholder);
+
+	const auto wrap = CreateChild<RpWidget>(_container);
+
+	const auto available = Webview::Availability();
+	auto text = (available.error != Webview::Available::Error::None)
+		? BotWebView::ErrorText(available)
+		: TextWithEntities{ u"Error: Could not initialize WebView."_q };
+
+	const auto error = CreateChild<PaddingWrap<FlatLabel>>(
+		wrap,
+		object_ptr<FlatLabel>(
+			wrap,
+			rpl::single(std::move(text)),
+			st::paymentsCriticalError),
+		st::paymentsCriticalErrorPadding);
+	error->entity()->setClickHandlerFilter([=](
+			const ClickHandlerPtr &handler,
+			Qt::MouseButton) {
+		const auto entity = handler->getTextEntity();
+		if (entity.type != EntityType::CustomUrl) {
+			return true;
+		}
+		File::OpenUrl(entity.data);
+		return false;
+	});
+	wrap->show();
+
+	wrap->widthValue() | rpl::on_next([=](int width) {
+		error->resizeToWidth(width);
+		wrap->resize(width, error->height());
+	}, wrap->lifetime());
+
+	_container->sizeValue() | rpl::on_next([=](QSize size) {
+		wrap->setGeometry(0, 0, size.width(), size.height());
+	}, wrap->lifetime());
+}
+
 void LocationPicker::resolveAddressByTimer() {
 	if (const auto location = base::take(_geocoderResolvePostponed)) {
 		resolveAddress(location);
@@ -1100,13 +1148,9 @@ void LocationPicker::mapReady() {
 	const auto token = _config.mapsToken.toUtf8();
 	const auto center = DefaultCenter(_initialProvided);
 	const auto bounds = DefaultBounds();
-	const auto protocol = *kProtocolOverride
-		? "'"_q + kProtocolOverride + "'"
-		: "null";
 	const auto params = "token: '" + token + "'"
 		+ ", center: " + center
-		+ ", bounds: " + bounds
-		+ ", protocol: " + protocol;
+		+ ", bounds: " + bounds;
 	_webview->eval("LocationPicker.init({ " + params + " });");
 
 	const auto handle = _window->window()->windowHandle();
@@ -1155,7 +1199,9 @@ void LocationPicker::venuesRequest(
 	}
 	const auto username = _session->serverConfig().venueSearchUsername;
 	_venuesBotRequestId = _api.request(MTPcontacts_ResolveUsername(
-		MTP_string(username)
+		MTP_flags(0),
+		MTP_string(username),
+		MTP_string()
 	)).done([=](const MTPcontacts_ResolvedPeer &result) {
 		auto &data = result.data();
 		_session->data().processUsers(data.vusers());
@@ -1182,8 +1228,8 @@ void LocationPicker::venuesSendRequest() {
 	}
 	_venuesRequestId = _api.request(MTPmessages_GetInlineBotResults(
 		MTP_flags(MTPmessages_GetInlineBotResults::Flag::f_geo_point),
-		_venuesBot->inputUser,
-		(_venueRecipient ? _venueRecipient->input : MTP_inputPeerEmpty()),
+		_venuesBot->inputUser(),
+		(_venueRecipient ? _venueRecipient->input() : MTP_inputPeerEmpty()),
 		MTP_inputGeoPoint(
 			MTP_flags(0),
 			MTP_double(_venuesRequestLocation.point.x()),
diff --git a/Telegram/SourceFiles/ui/controls/location_picker.h b/Telegram/SourceFiles/ui/controls/location_picker.h
index 943e7ac75f82d8..f9d79b9426bfca 100644
--- a/Telegram/SourceFiles/ui/controls/location_picker.h
+++ b/Telegram/SourceFiles/ui/controls/location_picker.h
@@ -112,6 +112,7 @@ class LocationPicker final : public base::has_weak_ptr {
 	void setup(const Descriptor &descriptor);
 	void setupWindow(const Descriptor &descriptor);
 	void setupWebview();
+	void showWebviewError();
 	void processKey(const QString &key, const QString &modifier);
 	void resolveCurrentLocation();
 	void resolveAddressByTimer();
diff --git a/Telegram/SourceFiles/ui/controls/popup_selector.cpp b/Telegram/SourceFiles/ui/controls/popup_selector.cpp
new file mode 100644
index 00000000000000..a80823ddb38c52
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/popup_selector.cpp
@@ -0,0 +1,307 @@
+// This file is part of Telegram Desktop,
+// the official desktop application for the Telegram messaging service.
+//
+// For license and copyright information please follow this link:
+// https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+//
+#include "ui/controls/popup_selector.h"
+
+#include "ui/painter.h"
+#include "ui/style/style_core.h"
+#include "ui/effects/animation_value.h"
+#include "ui/platform/ui_platform_utility.h"
+#include "styles/style_chat.h"
+#include "styles/style_widgets.h"
+
+#include <QtGui/QScreen>
+#include <QtWidgets/QApplication>
+#include <private/qapplication_p.h>
+
+namespace Ui {
+
+PopupSelector::PopupSelector(
+	not_null<QWidget*> parent,
+	QSize size,
+	PopupAppearType appearType)
+: RpWidget(parent)
+, _innerSize(size)
+, _cachedRound(
+	size,
+	st::reactionCornerShadow,
+	std::min(size.width(), size.height()))
+, _appearType(appearType) {
+	_useTransparency = Platform::TranslucentWindowsSupported();
+	const auto margins = marginsForShadow();
+	resize(size + QSize(
+		margins.left() + margins.right(),
+		margins.top() + margins.bottom()));
+
+	setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint)
+		| Qt::BypassWindowManagerHint
+		| Qt::Popup
+		| Qt::NoDropShadowWindowHint);
+	setMouseTracking(true);
+	setAttribute(Qt::WA_NoSystemBackground, true);
+
+	if (_useTransparency) {
+		setAttribute(Qt::WA_TranslucentBackground, true);
+	} else {
+		setAttribute(Qt::WA_TranslucentBackground, false);
+		setAttribute(Qt::WA_OpaquePaintEvent, true);
+	}
+
+	installEventFilter(this);
+
+	hide();
+}
+
+void PopupSelector::popup(const QPoint &p) {
+	const auto screen = QGuiApplication::screenAt(p);
+	createWinId();
+	windowHandle()->removeEventFilter(this);
+	windowHandle()->installEventFilter(this);
+	if (screen) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+		setScreen(screen);
+#else
+		windowHandle()->setScreen(screen);
+#endif
+	}
+
+	auto w = p;
+	const auto r = screen ? screen->availableGeometry() : QRect();
+	if (!r.isNull()) {
+		if (w.x() + width() > r.x() + r.width()) {
+			w.setX(r.x() + r.width() - width());
+		}
+		if (w.x() < r.x()) {
+			w.setX(r.x());
+		}
+		if (w.y() + height() > r.y() + r.height()) {
+			w.setY(r.y() + r.height() - height());
+		}
+		if (w.y() < r.y()) {
+			w.setY(r.y());
+		}
+	}
+	move(w);
+	show();
+	Platform::ShowOverAll(this);
+	raise();
+	activateWindow();
+}
+
+QMargins PopupSelector::marginsForShadow() const {
+	const auto line = st::lineWidth;
+	return _useTransparency
+		? st::reactionCornerShadow
+		: QMargins(line, line, line, line);
+}
+
+void PopupSelector::updateShowState(
+		float64 progress,
+		float64 opacity,
+		bool appearing) {
+	if (_appearing && !appearing && !_paintBuffer.isNull()) {
+		paintBackgroundToBuffer();
+	}
+	_appearing = appearing;
+	_appearProgress = progress;
+	_appearOpacity = opacity;
+	if (_appearing && isHidden()) {
+		show();
+	} else if (!_appearing && _appearOpacity == 0. && !isHidden()) {
+		hide();
+	}
+	update();
+}
+
+void PopupSelector::hideAnimated() {
+	if (/*!isHidden() && */!_hiding) {
+		_hiding = true;
+		_hideAnimation.start([=] {
+			const auto progress = 1. - _hideAnimation.value(0.);
+			updateShowState(progress, progress, false);
+			if (!_hideAnimation.animating()) {
+				_hiding = false;
+				if (_hideFinishedCallback) {
+					_hideFinishedCallback();
+				}
+			}
+		}, _appearProgress, 0., st::defaultPopupMenu.duration);
+	}
+}
+
+void PopupSelector::setHideFinishedCallback(Fn<void()> callback) {
+	_hideFinishedCallback = std::move(callback);
+}
+
+void PopupSelector::paintBackgroundToBuffer() {
+	const auto factor = style::DevicePixelRatio();
+	if (_paintBuffer.size() != size() * factor) {
+		_paintBuffer = _cachedRound.PrepareImage(size());
+	}
+	_paintBuffer.fill(Qt::transparent);
+
+	_cachedRound.setBackgroundColor(st::boxBg->c);
+	_cachedRound.setShadowColor(st::shadowFg->c);
+
+	auto p = QPainter(&_paintBuffer);
+	const auto radius = std::min(_innerSize.width(), _innerSize.height()) / 2.;
+	const auto frame = _cachedRound.validateFrame(0, 1., radius);
+	const auto fill = _cachedRound.FillWithImage(p, rect(), frame);
+	if (!fill.isEmpty()) {
+		p.fillRect(fill, st::boxBg);
+	}
+}
+
+void PopupSelector::paintAppearing(QPainter &p) {
+	p.setOpacity(_appearOpacity);
+	const auto factor = style::DevicePixelRatio();
+	if (_paintBuffer.size() != size() * factor) {
+		_paintBuffer = _cachedRound.PrepareImage(size());
+	}
+	_paintBuffer.fill(st::boxBg->c);
+
+	auto q = QPainter(&_paintBuffer);
+	const auto margins = marginsForShadow();
+
+	if (_appearType == PopupAppearType::CenterExpand) {
+		const auto appearedWidth = anim::interpolate(
+			_innerSize.height(),
+			_innerSize.width(),
+			_appearProgress);
+		const auto fullWidth = margins.left() + appearedWidth + margins.right();
+		const auto drawSize = QSize(fullWidth, height());
+		const auto offsetX = (width() - fullWidth) / 2;
+
+		_cachedRound.setBackgroundColor(st::boxBg->c);
+		_cachedRound.setShadowColor(st::shadowFg->c);
+		const auto radius
+			= std::min(_innerSize.width(), _innerSize.height()) / 2.;
+		_cachedRound.overlayExpandedBorder(
+			q,
+			drawSize,
+			_appearProgress,
+			radius,
+			radius,
+			1.);
+		q.end();
+
+		p.drawImage(
+			QRect(QPoint(offsetX, 0), drawSize),
+			_paintBuffer,
+			QRect(QPoint(), drawSize * factor));
+	} else if (_appearType == PopupAppearType::RightToLeft) {
+		const auto appearedWidth = anim::interpolate(
+			_innerSize.height(),
+			_innerSize.width(),
+			_appearProgress);
+		const auto fullWidth = margins.left()
+			+ appearedWidth
+			+ margins.right();
+		const auto drawSize = QSize(fullWidth, height());
+		const auto offsetX = width() - fullWidth;
+
+		_cachedRound.setBackgroundColor(st::boxBg->c);
+		_cachedRound.setShadowColor(st::shadowFg->c);
+		const auto radius
+			= std::min(_innerSize.width(), _innerSize.height()) / 2.;
+		_cachedRound.overlayExpandedBorder(
+			q,
+			drawSize,
+			_appearProgress,
+			radius,
+			radius,
+			1.);
+		q.end();
+
+		p.drawImage(
+			QRect(QPoint(offsetX, 0), drawSize),
+			_paintBuffer,
+			QRect(QPoint(), drawSize * factor));
+	} else {
+		const auto appearedWidth = anim::interpolate(
+			_innerSize.height(),
+			_innerSize.width(),
+			_appearProgress);
+		const auto fullWidth = margins.left() + appearedWidth + margins.right();
+		const auto drawSize = QSize(fullWidth, height());
+
+		_cachedRound.setBackgroundColor(st::boxBg->c);
+		_cachedRound.setShadowColor(st::shadowFg->c);
+		const auto radius
+			= std::min(_innerSize.width(), _innerSize.height()) / 2.;
+		_cachedRound.overlayExpandedBorder(
+			q,
+			drawSize,
+			_appearProgress,
+			radius,
+			radius,
+			1.);
+		q.end();
+
+	}
+}
+
+void PopupSelector::paintCollapsed(QPainter &p) {
+	if (_paintBuffer.isNull()) {
+		paintBackgroundToBuffer();
+	}
+	p.drawImage(0, 0, _paintBuffer);
+}
+
+void PopupSelector::paintEvent(QPaintEvent *e) {
+	auto p = Painter(this);
+	if (!_useTransparency) {
+		p.fillRect(rect(), st::boxBg);
+	}
+	if (_appearing) {
+		paintAppearing(p);
+	} else {
+		paintCollapsed(p);
+	}
+}
+
+bool PopupSelector::eventFilter(QObject *obj, QEvent *e) {
+	const auto type = e->type();
+	if (type == QEvent::TouchBegin
+		|| type == QEvent::TouchUpdate
+		|| type == QEvent::TouchEnd) {
+		if (obj == windowHandle() && isActiveWindow()) {
+			const auto event = static_cast<QTouchEvent*>(e);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+			e->setAccepted(
+				QApplicationPrivate::translateRawTouchEvent(
+					this,
+					event->device(),
+					event->touchPoints(),
+					event->timestamp()));
+#elif QT_VERSION < QT_VERSION_CHECK(6, 2, 0)
+			e->setAccepted(
+				QApplicationPrivate::translateRawTouchEvent(
+					this,
+					event->pointingDevice(),
+					const_cast<QList<QEventPoint> &>(event->points()),
+					event->timestamp()));
+#else
+			e->setAccepted(
+				QApplicationPrivate::translateRawTouchEvent(this, event));
+#endif
+			return e->isAccepted();
+		}
+	}
+	return RpWidget::eventFilter(obj, e);
+}
+
+void PopupSelector::mousePressEvent(QMouseEvent *e) {
+	if (!rect().contains(e->pos())) {
+		hideAnimated();
+	}
+}
+
+void PopupSelector::focusOutEvent(QFocusEvent *e) {
+	hideAnimated();
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/popup_selector.h b/Telegram/SourceFiles/ui/controls/popup_selector.h
new file mode 100644
index 00000000000000..8ea2d3aa6fa187
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/popup_selector.h
@@ -0,0 +1,64 @@
+// This file is part of Telegram Desktop,
+// the official desktop application for the Telegram messaging service.
+//
+// For license and copyright information please follow this link:
+// https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/round_area_with_shadow.h"
+
+namespace Ui {
+
+enum class PopupAppearType {
+	LeftToRight,
+	RightToLeft,
+	CenterExpand,
+};
+
+class PopupSelector final : public RpWidget {
+public:
+	PopupSelector(
+		not_null<QWidget*> parent,
+		QSize size,
+		PopupAppearType appearType = PopupAppearType::CenterExpand);
+
+	void updateShowState(
+		float64 progress,
+		float64 opacity,
+		bool appearing);
+	void hideAnimated();
+	void popup(const QPoint &p);
+	void setHideFinishedCallback(Fn<void()> callback);
+
+	[[nodiscard]] QMargins marginsForShadow() const;
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	bool eventFilter(QObject *obj, QEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void focusOutEvent(QFocusEvent *e) override;
+
+private:
+	void paintBackgroundToBuffer();
+	void paintAppearing(QPainter &p);
+	void paintCollapsed(QPainter &p);
+
+	const QSize _innerSize;
+	RoundAreaWithShadow _cachedRound;
+	QImage _paintBuffer;
+	PopupAppearType _appearType = PopupAppearType::CenterExpand;
+
+	float64 _appearProgress = 0.;
+	float64 _appearOpacity = 0.;
+	bool _appearing = false;
+	bool _useTransparency = false;
+	bool _hiding = false;
+	Animations::Simple _hideAnimation;
+	Fn<void()> _hideFinishedCallback;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
new file mode 100644
index 00000000000000..26743e07bfe675
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.cpp
@@ -0,0 +1,1518 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/round_video_recorder.h"
+
+#include "base/concurrent_timer.h"
+#include "base/debug_log.h"
+#include "ffmpeg/ffmpeg_bytes_io_wrap.h"
+#include "ffmpeg/ffmpeg_utility.h"
+#include "media/audio/media_audio_capture.h"
+#include "ui/controls/round_video_recorder_data.h"
+#include "ui/image/image_prepare.h"
+#include "ui/arc_angles.h"
+#include "ui/dynamic_image.h"
+#include "ui/painter.h"
+#include "ui/rp_widget.h"
+#include "webrtc/webrtc_video_track.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kSide = 400;
+constexpr auto kUpdateEach = crl::time(100);
+constexpr auto kAudioFrequency = 48'000;
+constexpr auto kAudioBitRate = 64 * 1024;
+constexpr auto kVideoBitRate = 2 * 1024 * 1024;
+constexpr auto kMinDuration = crl::time(200);
+constexpr auto kMaxDuration = 60 * crl::time(1000);
+constexpr auto kInitTimeout = 5 * crl::time(1000);
+constexpr auto kBlurredSize = 64;
+constexpr auto kMinithumbsPerSecond = 5;
+constexpr auto kMinithumbsInRow = 16;
+constexpr auto kFadeDuration = crl::time(150);
+constexpr auto kSkipFrames = 8;
+constexpr auto kMinScale = 0.7;
+constexpr auto &kPlainLogoFrames = RoundVideoData::kLogoFrames;
+constexpr auto kLogoSize = RoundVideoData::kLogoSize;
+constexpr auto kLogoXShift = -10;
+constexpr auto kLogoYShift = 10;
+constexpr auto kOverlayOpacity = 0.1;
+constexpr auto kOverlayOpaque = 1. - kOverlayOpacity;
+constexpr auto kOverlayUVOpaque = 128 * kOverlayOpaque;
+
+using namespace FFmpeg;
+
+[[nodiscard]] int MinithumbSize() {
+	const auto full = st::historySendSize.height();
+	const auto margin = st::historyRecordWaveformBgMargins;
+	const auto outer = full - margin.top() - margin.bottom();
+	const auto inner = outer - 2 * st::msgWaveformMin;
+	return inner * style::DevicePixelRatio();
+}
+
+[[nodiscard]] QImage CircularTextImage(
+		const QString &text,
+		int width,
+		int height,
+		int radius,
+		float64 startAngle = 0.0,
+		float64 endAngle = 360.0,
+		const QColor &textColor = Qt::black,
+		const QColor &bgColor = Qt::white,
+		const QFont &font = QFont(),
+		bool reverseDirection = false) {
+	auto image = QImage(width, height, QImage::Format_ARGB32);
+	image.fill(bgColor);
+
+	auto painter = QPainter(&image);
+	painter.setRenderHint(QPainter::Antialiasing, true);
+	painter.setPen(textColor);
+	painter.setFont(font);
+
+	auto center = QPoint(width / 2, height / 2);
+	painter.translate(center);
+
+	if (endAngle < startAngle) {
+		std::swap(startAngle, endAngle);
+	}
+
+	const auto startRad = float64(startAngle - 90) * M_PI / 180.0;
+	const auto endRad = float64(endAngle - 90) * M_PI / 180.0;
+	const auto angleRange = float64(endRad) - float64(startRad);
+
+	const auto &metrics = QFontMetrics(font);
+
+	for (auto i = 0; i < text.length(); ++i) {
+		const auto ratio = (text.length() <= 1)
+			? 0.5
+			: reverseDirection
+			? 1.0 - static_cast<float64>(i) / (text.length() - 1)
+			: static_cast<float64>(i) / (text.length() - 1);
+
+		const auto angle = startRad + ratio * angleRange;
+
+		const auto x = radius * std::cos(angle);
+		const auto y = radius * std::sin(angle);
+
+		const auto degrees = (angle * 180.0 / M_PI) - 90;
+		painter.save();
+		painter.translate(x, y);
+		painter.rotate(degrees);
+		const auto offset = (i == text.length() - 1) ? 2. : 0.;
+		painter.drawText(
+			-metrics.horizontalAdvance(text[i]) / 2 + offset,
+			metrics.ascent() / 2,
+			QString(text[i]));
+		painter.restore();
+	}
+
+	return image;
+}
+
+using PrecomputedLogo = std::array<std::array<float, kLogoSize>, kLogoSize>;
+[[nodiscard]] const std::vector<PrecomputedLogo> &PrecomputedLogos() {
+	static std::vector<PrecomputedLogo> precomputedLogos;
+
+	if (!precomputedLogos.empty()) {
+		return precomputedLogos;
+	}
+	constexpr auto kAntialiasRadius = 0.4;
+	precomputedLogos.resize(kPlainLogoFrames.size());
+	const auto antialiasFactor = 1.0
+		/ (2. * kAntialiasRadius * kAntialiasRadius);
+
+	for (auto index = size_t(0); index < kPlainLogoFrames.size(); ++index) {
+		uint8_t logoFrame[kLogoSize][kLogoSize] = {{ 0 }};
+		RoundVideoData::DecompressLogoRLEFrame(
+			kPlainLogoFrames[index],
+			logoFrame);
+
+		for (auto y = 0; y < kLogoSize; ++y) {
+			for (auto x = 0; x < kLogoSize; ++x) {
+				auto blendedValue = 0.;
+				auto weightSum = 0.;
+
+				const auto minY = std::max(0, y - 1);
+				const auto maxY = std::min(kLogoSize - 1, y + 1);
+				const auto minX = std::max(0, x - 1);
+				const auto maxX = std::min(kLogoSize - 1, x + 1);
+
+				for (auto sampleY = minY; sampleY <= maxY; ++sampleY) {
+					const auto dy = sampleY - y;
+					for (auto sampleX = minX; sampleX <= maxX; ++sampleX) {
+						const auto dx = sampleX - x;
+						const auto distanceSq = dx * dx + dy * dy;
+						const auto weight
+							= std::exp(-distanceSq * antialiasFactor);
+
+						blendedValue += logoFrame[sampleY][sampleX] * weight;
+						weightSum += weight;
+					}
+				}
+
+				precomputedLogos[index][y][x] = (weightSum > 0)
+					? (blendedValue / weightSum)
+					: 0;
+			}
+		}
+	}
+	return precomputedLogos;
+}
+
+} // namespace
+
+class RoundVideoRecorder::Private final {
+public:
+	Private(crl::weak_on_queue<Private> weak, int minithumbSize);
+	~Private();
+
+	void push(int64 mcstimestamp, const QImage &frame);
+	void push(const Media::Capture::Chunk &chunk);
+
+	using Update = Media::Capture::Update;
+	[[nodiscard]] rpl::producer<Update, Error> updated() const;
+
+	[[nodiscard]] RoundVideoResult finish();
+	void restart(RoundVideoPartial partial);
+
+private:
+	static constexpr auto kMaxStreams = 2;
+
+	struct CopyContext {
+		CopyContext();
+
+		std::array<int64, kMaxStreams> lastPts = { 0 };
+		std::array<int64, kMaxStreams> lastDts = { 0 };
+	};
+
+	void initEncoding();
+	void initCircleMask();
+	void initCircularTextImage();
+	void initMinithumbsCanvas();
+	void maybeSaveMinithumb(
+		not_null<AVFrame*> frame,
+		const QImage &original,
+		QRect crop);
+
+	bool initVideo();
+	bool initAudio();
+	void notifyFinished();
+	void deinitEncoding();
+	void finishEncoding();
+	void fail(Error error);
+	void timeout();
+
+	void encodeVideoFrame(int64 mcstimestamp, const QImage &frame);
+	void encodeAudioFrame(const Media::Capture::Chunk &chunk);
+	bool writeFrame(
+		const FramePointer &frame,
+		const CodecPointer &codec,
+		AVStream *stream);
+
+	void updateMaxLevel(const Media::Capture::Chunk &chunk);
+	void updateResultDuration(int64 pts, AVRational timeBase);
+
+	void mirrorYUV420P(not_null<AVFrame*> frame);
+	void drawLogoOnYUV420P(not_null<AVFrame*> frame);
+
+	[[nodiscard]] RoundVideoResult appendToPrevious(RoundVideoResult video);
+	[[nodiscard]] static FormatPointer OpenInputContext(
+		not_null<const QByteArray*> data,
+		not_null<ReadBytesWrap*> wrap);
+	[[nodiscard]] bool copyPackets(
+		not_null<AVFormatContext*> input,
+		not_null<AVFormatContext*> output,
+		CopyContext &context,
+		crl::time offset = 0);
+
+	const crl::weak_on_queue<Private> _weak;
+
+	FormatPointer _format;
+
+	AVStream *_videoStream = nullptr;
+	CodecPointer _videoCodec;
+	FramePointer _videoFrame;
+	SwscalePointer _swsContext;
+	int64_t _videoPts = 0;
+
+	// This is the first recorded frame timestamp in microseconds.
+	int64_t _videoFirstTimestamp = -1;
+
+	// Audio-related members
+	AVStream *_audioStream = nullptr;
+	CodecPointer _audioCodec;
+	FramePointer _audioFrame;
+	SwresamplePointer _swrContext;
+	QByteArray _audioTail;
+	int64_t _audioPts = 0;
+	int _audioChannels = 0;
+
+	// Those timestamps are in 'ms' used for sync between audio and video.
+	crl::time _firstAudioChunkFinished = 0;
+	crl::time _firstVideoFrameTime = 0;
+
+	WriteBytesWrap _result;
+	crl::time _resultDuration = 0;
+	bool _finished = false;
+
+	ushort _maxLevelSinceLastUpdate = 0;
+	crl::time _lastUpdateDuration = 0;
+	rpl::event_stream<Update, Error> _updates;
+
+	crl::time _minithumbNextTimestamp = 0;
+	const int _minithumbSize = 0;
+	int _minithumbsCount = 0;
+	QImage _minithumbs;
+
+	crl::time _maxDuration = 0;
+	RoundVideoResult _previous;
+
+	ReadBytesWrap _forConcat1, _forConcat2;
+
+	uint8_t _logoFrameCounter = 0;
+	QImage _circularTextImage;
+
+	std::vector<bool> _circleMask; // Always nice to use vector<bool>! :D
+
+	base::ConcurrentTimer _timeoutTimer;
+
+};
+
+RoundVideoRecorder::Private::CopyContext::CopyContext() {
+	ranges::fill(lastPts, std::numeric_limits<int64>::min());
+	ranges::fill(lastDts, std::numeric_limits<int64>::min());
+}
+
+RoundVideoRecorder::Private::Private(
+	crl::weak_on_queue<Private> weak,
+	int minithumbSize)
+: _weak(std::move(weak))
+, _minithumbSize(minithumbSize)
+, _maxDuration(kMaxDuration)
+, _timeoutTimer(_weak, [=] { timeout(); }) {
+	initEncoding();
+	initCircleMask();
+	initCircularTextImage();
+	initMinithumbsCanvas();
+
+	_timeoutTimer.callOnce(kInitTimeout);
+}
+
+RoundVideoRecorder::Private::~Private() {
+	finishEncoding();
+}
+
+void RoundVideoRecorder::Private::initEncoding() {
+	_format = MakeWriteFormatPointer(
+		static_cast<void*>(&_result),
+		nullptr,
+		&WriteBytesWrap::Write,
+		&WriteBytesWrap::Seek,
+		"mp4"_q);
+
+	if (!initVideo()) {
+		fail(Error::VideoInit);
+		return;
+	} else if (!initAudio()) {
+		fail(Error::AudioInit);
+		return;
+	}
+
+	const auto error = AvErrorWrap(avformat_write_header(
+		_format.get(),
+		nullptr));
+	if (error) {
+		LogError("avformat_write_header", error);
+		fail(Error::Encoding);
+	}
+}
+
+bool RoundVideoRecorder::Private::initVideo() {
+	if (!_format) {
+		return false;
+	}
+
+	auto videoCodec = avcodec_find_encoder_by_name("libopenh264");
+	if (!videoCodec) {
+		videoCodec = avcodec_find_encoder(AV_CODEC_ID_H264);
+		if (!videoCodec) {
+			LogError("avcodec_find_encoder", "AV_CODEC_ID_H264");
+			return false;
+		}
+	}
+
+	_videoStream = avformat_new_stream(_format.get(), videoCodec);
+	if (!_videoStream) {
+		LogError("avformat_new_stream", "libopenh264");
+		return false;
+	}
+
+	_videoCodec = CodecPointer(avcodec_alloc_context3(videoCodec));
+	if (!_videoCodec) {
+		LogError("avcodec_alloc_context3", "libopenh264");
+		return false;
+	}
+
+	_videoCodec->codec_id = videoCodec->id;
+	_videoCodec->codec_type = AVMEDIA_TYPE_VIDEO;
+	_videoCodec->width = kSide;
+	_videoCodec->height = kSide;
+	_videoCodec->time_base = AVRational{ 1, 1'000'000 }; // Microseconds.
+	_videoCodec->framerate = AVRational{ 0, 1 }; // Variable frame rate.
+	_videoCodec->pix_fmt = AV_PIX_FMT_YUV420P;
+	_videoCodec->bit_rate = kVideoBitRate;
+
+	auto error = AvErrorWrap(avcodec_open2(
+		_videoCodec.get(),
+		videoCodec,
+		nullptr));
+	if (error) {
+		LogError("avcodec_open2", error, "libopenh264");
+		return false;
+	}
+
+	error = AvErrorWrap(avcodec_parameters_from_context(
+		_videoStream->codecpar,
+		_videoCodec.get()));
+	if (error) {
+		LogError("avcodec_parameters_from_context", error, "libopenh264");
+		return false;
+	}
+
+	_videoFrame = MakeFramePointer();
+	if (!_videoFrame) {
+		return false;
+	}
+
+	_videoFrame->format = _videoCodec->pix_fmt;
+	_videoFrame->width = _videoCodec->width;
+	_videoFrame->height = _videoCodec->height;
+
+	error = AvErrorWrap(av_frame_get_buffer(_videoFrame.get(), 0));
+	if (error) {
+		LogError("av_frame_get_buffer", error, "libopenh264");
+		return false;
+	}
+
+	return true;
+}
+
+bool RoundVideoRecorder::Private::initAudio() {
+	if (!_format) {
+		return false;
+	}
+
+	const auto audioCodec = avcodec_find_encoder(AV_CODEC_ID_AAC);
+	if (!audioCodec) {
+		LogError("avcodec_find_encoder", "AAC");
+		return false;
+	}
+
+	_audioStream = avformat_new_stream(_format.get(), audioCodec);
+	if (!_audioStream) {
+		LogError("avformat_new_stream", "AAC");
+		return false;
+	}
+
+	_audioCodec = CodecPointer(avcodec_alloc_context3(audioCodec));
+	if (!_audioCodec) {
+		LogError("avcodec_alloc_context3", "AAC");
+		return false;
+	}
+
+	_audioChannels = 1;
+	_audioCodec->sample_fmt = AV_SAMPLE_FMT_FLTP;
+	_audioCodec->bit_rate = kAudioBitRate;
+	_audioCodec->sample_rate = kAudioFrequency;
+	_audioCodec->ch_layout = AV_CHANNEL_LAYOUT_MONO;
+
+	auto error = AvErrorWrap(avcodec_open2(
+		_audioCodec.get(),
+		audioCodec,
+		nullptr));
+	if (error) {
+		LogError("avcodec_open2", error, "AAC");
+		return false;
+	}
+
+	error = AvErrorWrap(avcodec_parameters_from_context(
+		_audioStream->codecpar,
+		_audioCodec.get()));
+	if (error) {
+		LogError("avcodec_parameters_from_context", error, "AAC");
+		return false;
+	}
+
+	_swrContext = MakeSwresamplePointer(
+		&_audioCodec->ch_layout,
+		AV_SAMPLE_FMT_S16,
+		_audioCodec->sample_rate,
+		&_audioCodec->ch_layout,
+		_audioCodec->sample_fmt,
+		_audioCodec->sample_rate,
+		&_swrContext);
+	if (!_swrContext) {
+		return false;
+	}
+
+	_audioFrame = MakeFramePointer();
+	if (!_audioFrame) {
+		return false;
+	}
+
+	_audioFrame->nb_samples = _audioCodec->frame_size;
+	_audioFrame->format = _audioCodec->sample_fmt;
+	_audioFrame->sample_rate = _audioCodec->sample_rate;
+	av_channel_layout_copy(&_audioFrame->ch_layout, &_audioCodec->ch_layout);
+
+	error = AvErrorWrap(av_frame_get_buffer(_audioFrame.get(), 0));
+	if (error) {
+		LogError("av_frame_get_buffer", error, "AAC");
+		return false;
+	}
+
+	return true;
+}
+
+void RoundVideoRecorder::Private::finishEncoding() {
+	if (_format
+		&& writeFrame(nullptr, _videoCodec, _videoStream)
+		&& writeFrame(nullptr, _audioCodec, _audioStream)) {
+		const auto error = AvErrorWrap(av_write_trailer(_format.get()));
+		if (error) {
+			LogError("av_write_trailer", error);
+			fail(Error::Encoding);
+		}
+	}
+	deinitEncoding();
+}
+
+auto RoundVideoRecorder::Private::updated() const
+-> rpl::producer<Update, Error> {
+	return _updates.events();
+}
+
+RoundVideoResult RoundVideoRecorder::Private::finish() {
+	if (!_format) {
+		return {};
+	}
+	finishEncoding();
+	auto result = appendToPrevious({
+		.content = base::take(_result.content),
+		.duration = base::take(_resultDuration),
+		//.waveform = {},
+		.minithumbs = base::take(_minithumbs),
+		.minithumbsCount = base::take(_minithumbsCount),
+		.minithumbSize = _minithumbSize,
+	});
+	if (result.duration < kMinDuration) {
+		return {};
+	}
+	return result;
+}
+
+RoundVideoResult RoundVideoRecorder::Private::appendToPrevious(
+		RoundVideoResult video) {
+	if (!_previous.duration) {
+		return video;
+	}
+	const auto cleanup = gsl::finally([&] {
+		_forConcat1 = {};
+		_forConcat2 = {};
+		deinitEncoding();
+	});
+
+	auto input1 = OpenInputContext(&_previous.content, &_forConcat1);
+	auto input2 = OpenInputContext(&video.content, &_forConcat2);
+	if (!input1 || !input2) {
+		return video;
+	}
+
+	auto output = MakeWriteFormatPointer(
+		static_cast<void*>(&_result),
+		nullptr,
+		&WriteBytesWrap::Write,
+		&WriteBytesWrap::Seek,
+		"mp4"_q);
+
+	for (auto i = 0; i != input1->nb_streams; ++i) {
+		AVStream *inStream = input1->streams[i];
+		AVStream *outStream = avformat_new_stream(output.get(), nullptr);
+		if (!outStream) {
+			LogError("avformat_new_stream");
+			fail(Error::Encoding);
+			return {};
+		}
+		const auto error = AvErrorWrap(avcodec_parameters_copy(
+			outStream->codecpar,
+			inStream->codecpar));
+		if (error) {
+			LogError("avcodec_parameters_copy", error);
+			fail(Error::Encoding);
+			return {};
+		}
+		outStream->time_base = inStream->time_base;
+	}
+
+	const auto offset = _previous.duration;
+	auto context = CopyContext();
+	auto error = AvErrorWrap(avformat_write_header(
+		output.get(),
+		nullptr));
+	if (error) {
+		LogError("avformat_write_header", error);
+		fail(Error::Encoding);
+		return {};
+	} else if (!copyPackets(input1.get(), output.get(), context)
+		|| !copyPackets(input2.get(), output.get(), context, offset)) {
+		return {};
+	}
+	error = AvErrorWrap(av_write_trailer(output.get()));
+	if (error) {
+		LogError("av_write_trailer", error);
+		fail(Error::Encoding);
+		return {};
+	}
+	video.content = base::take(_result.content);
+	video.duration += _previous.duration;
+	return video;
+}
+
+FormatPointer RoundVideoRecorder::Private::OpenInputContext(
+		not_null<const QByteArray*> data,
+		not_null<ReadBytesWrap*> wrap) {
+	*wrap = ReadBytesWrap{
+		.size = data->size(),
+		.data = reinterpret_cast<const uchar*>(data->constData()),
+	};
+	return MakeFormatPointer(
+		wrap.get(),
+		&ReadBytesWrap::Read,
+		nullptr,
+		&ReadBytesWrap::Seek);
+}
+
+bool RoundVideoRecorder::Private::copyPackets(
+		not_null<AVFormatContext*> input,
+		not_null<AVFormatContext*> output,
+		CopyContext &context,
+		crl::time offset) {
+	AVPacket packet;
+	av_init_packet(&packet);
+
+	auto offsets = std::array<int64, kMaxStreams>{ 0 };
+	while (av_read_frame(input, &packet) >= 0) {
+		const auto index = packet.stream_index;
+		Assert(index >= 0 && index < kMaxStreams);
+		Assert(index < output->nb_streams);
+
+		if (offset) {
+			auto &scaled = offsets[index];
+			if (!scaled) {
+				scaled = av_rescale_q(
+					offset,
+					AVRational{ 1, 1000 },
+					input->streams[index]->time_base);
+			}
+			if (packet.pts != AV_NOPTS_VALUE) {
+				packet.pts += scaled;
+			}
+			if (packet.dts != AV_NOPTS_VALUE) {
+				packet.dts += scaled;
+			}
+		}
+
+		if (packet.pts <= context.lastPts[index]) {
+			packet.pts = context.lastPts[index] + 1;
+		}
+		context.lastPts[index] = packet.pts;
+
+		if (packet.dts <= context.lastDts[index]) {
+			packet.dts = context.lastDts[index] + 1;
+		}
+		context.lastDts[index] = packet.dts;
+
+		const auto error = AvErrorWrap(av_interleaved_write_frame(
+			output,
+			&packet));
+		if (error) {
+			LogError("av_interleaved_write_frame", error);
+			av_packet_unref(&packet);
+			return false;
+		}
+		av_packet_unref(&packet);
+	}
+	return true;
+}
+
+void RoundVideoRecorder::Private::restart(RoundVideoPartial partial) {
+	if (_format) {
+		return;
+	} else if (_maxDuration <= 0) {
+		notifyFinished();
+		return;
+	}
+	_previous = std::move(partial.video);
+	_minithumbs = std::move(_previous.minithumbs);
+	_minithumbsCount = _previous.minithumbsCount;
+	Assert(_minithumbSize == _previous.minithumbSize);
+	_maxDuration = kMaxDuration - _previous.duration;
+	_minithumbNextTimestamp = 0;
+	_finished = false;
+	initEncoding();
+	_timeoutTimer.callOnce(kInitTimeout);
+}
+
+void RoundVideoRecorder::Private::fail(Error error) {
+	deinitEncoding();
+	_updates.fire_error_copy(error);
+}
+
+void RoundVideoRecorder::Private::timeout() {
+	if (!_firstAudioChunkFinished) {
+		fail(Error::AudioTimeout);
+	} else if (!_firstVideoFrameTime) {
+		fail(Error::VideoTimeout);
+	}
+}
+
+void RoundVideoRecorder::Private::deinitEncoding() {
+	_swsContext = nullptr;
+	_videoCodec = nullptr;
+	_videoStream = nullptr;
+	_videoFrame = nullptr;
+	_swrContext = nullptr;
+	_audioCodec = nullptr;
+	_audioStream = nullptr;
+	_audioFrame = nullptr;
+	_format = nullptr;
+
+	_videoFirstTimestamp = -1;
+	_videoPts = 0;
+	_audioTail = QByteArray();
+	_audioPts = 0;
+	_audioChannels = 0;
+
+	_firstAudioChunkFinished = 0;
+	_firstVideoFrameTime = 0;
+
+	_result.offset = 0;
+
+	_maxLevelSinceLastUpdate = 0;
+	_lastUpdateDuration = 0;
+}
+
+void RoundVideoRecorder::Private::push(
+		int64 mcstimestamp,
+		const QImage &frame) {
+	if (!_format || _finished) {
+		return;
+	} else if (!_firstAudioChunkFinished) {
+		// Skip frames while we didn't start receiving audio.
+		return;
+	} else if (!_firstVideoFrameTime) {
+		_firstVideoFrameTime = crl::now();
+	}
+	encodeVideoFrame(mcstimestamp, frame);
+}
+
+void RoundVideoRecorder::Private::push(const Media::Capture::Chunk &chunk) {
+	if (!_format || _finished) {
+		return;
+	} else if (!_firstAudioChunkFinished || !_firstVideoFrameTime) {
+		_firstAudioChunkFinished = chunk.finished;
+		return;
+	}
+	// We get a chunk roughly every 50ms and need to encode it interleaved.
+	encodeAudioFrame(chunk);
+}
+
+void RoundVideoRecorder::Private::encodeVideoFrame(
+		int64 mcstimestamp,
+		const QImage &frame) {
+	Expects(!_finished);
+
+	if (_videoFirstTimestamp == -1) {
+		_videoFirstTimestamp = mcstimestamp;
+	}
+	const auto fwidth = frame.width();
+	const auto fheight = frame.height();
+	const auto fmin = std::min(fwidth, fheight);
+	const auto fx = (fwidth > fheight) ? (fwidth - fheight) / 2 : 0;
+	const auto fy = (fwidth < fheight) ? (fheight - fwidth) / 2 : 0;
+	const auto crop = QRect(fx, fy, fmin, fmin);
+
+	_swsContext = MakeSwscalePointer(
+		QSize(fmin, fmin),
+		AV_PIX_FMT_BGRA,
+		QSize(kSide, kSide),
+		AV_PIX_FMT_YUV420P,
+		&_swsContext);
+	if (!_swsContext) {
+		fail(Error::Encoding);
+		return;
+	}
+
+	const auto cdata = frame.constBits()
+		+ (frame.bytesPerLine() * fy)
+		+ (fx * frame.depth() / 8);
+
+	const uint8_t *srcSlice[1] = { cdata };
+	int srcStride[1] = { int(frame.bytesPerLine()) };
+
+	sws_scale(
+		_swsContext.get(),
+		srcSlice,
+		srcStride,
+		0,
+		fmin,
+		_videoFrame->data,
+		_videoFrame->linesize);
+
+	mirrorYUV420P(_videoFrame.get());
+	drawLogoOnYUV420P(_videoFrame.get());
+
+	_videoFrame->pts = mcstimestamp - _videoFirstTimestamp;
+	maybeSaveMinithumb(_videoFrame.get(), frame, crop);
+	if (_videoFrame->pts >= _maxDuration * int64(1000)) {
+		notifyFinished();
+		return;
+	} else if (!writeFrame(_videoFrame, _videoCodec, _videoStream)) {
+		return;
+	}
+}
+
+void RoundVideoRecorder::Private::maybeSaveMinithumb(
+		not_null<AVFrame*> frame,
+		const QImage &original,
+		QRect crop) {
+	if (frame->pts < _minithumbNextTimestamp * 1000) {
+		return;
+	}
+	_minithumbNextTimestamp += crl::time(1000) / kMinithumbsPerSecond;
+	const auto perline = original.bytesPerLine();
+	const auto perpixel = original.depth() / 8;
+	const auto cropped = QImage(
+		original.constBits() + (crop.y() * perline) + (crop.x() * perpixel),
+		crop.width(),
+		crop.height(),
+		perline,
+		original.format()
+	).scaled(
+		_minithumbSize,
+		_minithumbSize,
+		Qt::IgnoreAspectRatio,
+		Qt::SmoothTransformation);
+
+	const auto row = _minithumbsCount / kMinithumbsInRow;
+	const auto column = _minithumbsCount % kMinithumbsInRow;
+	const auto fromPerLine = cropped.bytesPerLine();
+	auto from = cropped.constBits();
+	const auto toPerLine = _minithumbs.bytesPerLine();
+	const auto toPerPixel = _minithumbs.depth() / 8;
+	auto to = _minithumbs.bits()
+		+ (row * _minithumbSize * toPerLine)
+		+ (column * _minithumbSize * toPerPixel);
+
+	Assert(toPerPixel == perpixel);
+	for (auto y = 0; y != _minithumbSize; ++y) {
+		Assert(to + toPerLine - _minithumbs.constBits()
+			<= _minithumbs.bytesPerLine() * _minithumbs.height());
+		memcpy(to, from, _minithumbSize * toPerPixel);
+		from += fromPerLine;
+		to += toPerLine;
+	}
+	++_minithumbsCount;
+}
+
+void RoundVideoRecorder::Private::initCircleMask() {
+	const auto width = kSide;
+	const auto height = kSide;
+	const auto centerX = width / 2;
+	const auto centerY = height / 2;
+	const auto radius = std::min(centerX, centerY) + 3; // Add some padding.
+	const auto radiusSquared = radius * radius;
+
+	_circleMask.resize(width * height);
+	auto index = 0;
+	for (auto y = 0; y != height; ++y) {
+		for (auto x = 0; x != width; ++x) {
+			const auto dx = x - centerX;
+			const auto dy = y - centerY;
+			_circleMask[index++] = (dx * dx + dy * dy > radiusSquared);
+		}
+	}
+}
+
+void RoundVideoRecorder::Private::initCircularTextImage() {
+	constexpr auto kCircularTextRadius = kSide / 2 + 17;
+	constexpr auto kCircularTextStartAngle = 125;
+	constexpr auto kCircularTextEndAngle = 145;
+	_circularTextImage = CircularTextImage(
+		u"Telegram"_q.toUpper(),
+		kSide,
+		kSide,
+		kCircularTextRadius,
+		kCircularTextStartAngle,
+		kCircularTextEndAngle,
+		Qt::white,
+		Qt::transparent,
+		st::roundVideoFont,
+		true);
+}
+
+void RoundVideoRecorder::Private::initMinithumbsCanvas() {
+	const auto width = kMinithumbsInRow * _minithumbSize;
+	const auto seconds = (kMaxDuration + 999) / 1000;
+	const auto persecond = kMinithumbsPerSecond;
+	const auto frames = (seconds + persecond - 1) * persecond;
+	const auto rows = (frames + kMinithumbsInRow - 1) / kMinithumbsInRow;
+	const auto height = rows * _minithumbSize;
+	_minithumbs = QImage(width, height, QImage::Format_ARGB32_Premultiplied);
+}
+
+void RoundVideoRecorder::Private::mirrorYUV420P(not_null<AVFrame*> frame) {
+	for (auto p = 0; p < 3; ++p) {
+		const auto size = p ? (kSide / 2) : kSide;
+		const auto linesize = _videoFrame->linesize[p];
+		auto data = _videoFrame->data[p];
+		for (auto y = 0; y != size; ++y) {
+			auto left = data + y * linesize;
+			auto right = left + size - 1;
+			while (left < right) {
+				std::swap(*left++, *right--);
+			}
+		}
+	}
+}
+
+void RoundVideoRecorder::Private::drawLogoOnYUV420P(
+		not_null<AVFrame*> frame) {
+	const auto width = frame->width;
+	const auto height = frame->height;
+
+	const auto logoBottom = height - kLogoSize + kLogoYShift;
+	const auto logoStartX = kLogoXShift;
+	const auto logoEndX = logoStartX + kLogoSize;
+	const auto logoStartY = logoBottom;
+	const auto logoEndY = logoBottom + kLogoSize;
+
+	const auto &currentLogo = PrecomputedLogos()[_logoFrameCounter];
+	_logoFrameCounter = (_logoFrameCounter + 1) % kPlainLogoFrames.size();
+
+	auto yData = frame->data[0];
+	const auto ySkip = frame->linesize[0] - width;
+
+	const auto uvWidth = width / 2;
+	auto uData = frame->data[1];
+	auto vData = frame->data[2];
+	const auto uvSkip = frame->linesize[1] - uvWidth;
+	auto yMaskIndex = 0;
+
+	for (auto y = 0; y < height; ++y) {
+		for (auto x = 0; x < width; ++x) {
+			if (_circleMask[yMaskIndex]) {
+				*yData = static_cast<uint8_t>(*yData * kOverlayOpacity
+					+ 16 * kOverlayOpaque);
+			}
+
+			if ((x >= logoStartX && x < logoEndX)
+				&& (y >= logoStartY && y < logoEndY)) {
+				const auto logoX = x - kLogoXShift;
+				const auto logoY = y - logoBottom;
+
+				const auto blendedValue = currentLogo[logoX][logoY];
+				if (blendedValue > 0) {
+					const auto logoFactor = blendedValue / 255.0f;
+					*yData = static_cast<uint8_t>(*yData * (1 - logoFactor)
+						+ 255 * logoFactor);
+				}
+			}
+
+			const auto textAlpha = qAlpha(_circularTextImage.pixel(x, y))
+				/ 255.;
+			*yData = std::min(
+				*yData + static_cast<uint8_t>(textAlpha * 100),
+				255);
+
+			++yData;
+			++yMaskIndex;
+		}
+		yData += ySkip;
+
+		if (y % 2 == 0) {
+			for (auto x = 0; x < uvWidth; ++x) {
+				if (_circleMask[(y * width) + (x * 2)]) {
+					*uData = static_cast<uint8_t>(*uData * kOverlayOpacity
+						+ kOverlayUVOpaque);
+					*vData = static_cast<uint8_t>(*vData * kOverlayOpacity
+						+ kOverlayUVOpaque);
+				}
+				++uData;
+				++vData;
+			}
+			uData += uvSkip;
+			vData += uvSkip;
+		}
+	}
+}
+
+void RoundVideoRecorder::Private::encodeAudioFrame(
+		const Media::Capture::Chunk &chunk) {
+	Expects(!_finished);
+
+	updateMaxLevel(chunk);
+
+	if (_audioTail.isEmpty()) {
+		_audioTail = chunk.samples;
+	} else {
+		_audioTail.append(chunk.samples);
+	}
+
+	const auto inSamples = int(_audioTail.size() / sizeof(int16_t));
+	const auto inData = reinterpret_cast<const uint8_t*>(
+		_audioTail.constData());
+	auto samplesProcessed = 0;
+
+	while (samplesProcessed + _audioCodec->frame_size <= inSamples) {
+		const auto remainingSamples = inSamples - samplesProcessed;
+		auto outSamples = int(av_rescale_rnd(
+			swr_get_delay(_swrContext.get(), kAudioFrequency) + remainingSamples,
+			_audioCodec->sample_rate,
+			kAudioFrequency,
+			AV_ROUND_UP));
+
+		// Ensure we don't exceed the frame's capacity
+		outSamples = std::min(outSamples, _audioCodec->frame_size);
+
+		const auto process = std::min(remainingSamples, outSamples);
+		auto dataptr = inData + samplesProcessed * sizeof(int16_t);
+		auto error = AvErrorWrap(swr_convert(
+			_swrContext.get(),
+			_audioFrame->data,
+			outSamples,
+			&dataptr,
+			process));
+
+		if (error) {
+			LogError("swr_convert", error);
+			fail(Error::Encoding);
+			return;
+		}
+
+		// Update the actual number of samples in the frame
+		_audioFrame->nb_samples = error.code();
+
+		_audioFrame->pts = _audioPts;
+		_audioPts += _audioFrame->nb_samples;
+		if (_audioPts >= _maxDuration * int64(kAudioFrequency) / 1000) {
+			notifyFinished();
+			return;
+		} else if (!writeFrame(_audioFrame, _audioCodec, _audioStream)) {
+			return;
+		}
+
+		samplesProcessed += process;
+	}
+	const auto left = inSamples - samplesProcessed;
+	if (left > 0) {
+		memmove(_audioTail.data(), _audioTail.data() + samplesProcessed * sizeof(int16_t), left * sizeof(int16_t));
+		_audioTail.resize(left * sizeof(int16_t));
+	} else {
+		_audioTail.clear();
+	}
+}
+
+void RoundVideoRecorder::Private::notifyFinished() {
+	_finished = true;
+	_updates.fire({
+		.samples = int((_previous.duration + _resultDuration) * 48),
+		.level = base::take(_maxLevelSinceLastUpdate),
+		.finished = true,
+	});
+}
+
+bool RoundVideoRecorder::Private::writeFrame(
+		const FramePointer &frame,
+		const CodecPointer &codec,
+		AVStream *stream) {
+	_timeoutTimer.cancel();
+
+	if (frame) {
+		updateResultDuration(frame->pts, codec->time_base);
+	}
+
+	auto error = AvErrorWrap(avcodec_send_frame(codec.get(), frame.get()));
+	if (error) {
+		LogError("avcodec_send_frame", error);
+		fail(Error::Encoding);
+		return false;
+	}
+
+	auto pkt = av_packet_alloc();
+	const auto guard = gsl::finally([&] {
+		av_packet_free(&pkt);
+	});
+	while (true) {
+		error = AvErrorWrap(avcodec_receive_packet(codec.get(), pkt));
+		if (error.code() == AVERROR(EAGAIN)) {
+			return true; // Need more input
+		} else if (error.code() == AVERROR_EOF) {
+			return true; // Encoding finished
+		} else if (error) {
+			LogError("avcodec_receive_packet", error);
+			fail(Error::Encoding);
+			return false;
+		}
+
+		pkt->stream_index = stream->index;
+		av_packet_rescale_ts(pkt, codec->time_base, stream->time_base);
+
+		updateResultDuration(pkt->pts, stream->time_base);
+
+		error = AvErrorWrap(av_interleaved_write_frame(_format.get(), pkt));
+		if (error) {
+			LogError("av_interleaved_write_frame", error);
+			fail(Error::Encoding);
+			return false;
+		}
+	}
+
+	return true;
+}
+
+void RoundVideoRecorder::Private::updateMaxLevel(
+		const Media::Capture::Chunk &chunk) {
+	const auto &list = chunk.samples;
+	const auto samples = int(list.size() / sizeof(ushort));
+	const auto data = reinterpret_cast<const ushort*>(list.constData());
+	for (const auto value : gsl::make_span(data, samples)) {
+		accumulate_max(_maxLevelSinceLastUpdate, value);
+	}
+}
+
+void RoundVideoRecorder::Private::updateResultDuration(
+		int64 pts,
+		AVRational timeBase) {
+	accumulate_max(_resultDuration, PtsToTimeCeil(pts, timeBase));
+
+	const auto initial = !_lastUpdateDuration;
+	if (initial) {
+		accumulate_max(_resultDuration, crl::time(1));
+	}
+	if (initial || (_lastUpdateDuration + kUpdateEach < _resultDuration)) {
+		_lastUpdateDuration = _resultDuration;
+		_updates.fire({
+			.samples = int((_previous.duration + _resultDuration) * 48),
+			.level = base::take(_maxLevelSinceLastUpdate),
+		});
+	}
+}
+
+RoundVideoRecorder::RoundVideoRecorder(
+	RoundVideoRecorderDescriptor &&descriptor)
+: _descriptor(std::move(descriptor))
+, _gradientBg(QColor(255, 255, 255, 0))
+, _gradientFg(QColor(255, 255, 255, 48))
+, _gradient(
+	_gradientBg.color(),
+	_gradientFg.color(),
+	[=] { _preview->update(); })
+, _preview(std::make_unique<RpWidget>(_descriptor.container))
+, _private(MinithumbSize()) {
+	setup();
+}
+
+RoundVideoRecorder::~RoundVideoRecorder() = default;
+
+Fn<void(Media::Capture::Chunk)> RoundVideoRecorder::audioChunkProcessor() {
+	return [weak = _private.weak()](Media::Capture::Chunk chunk) {
+		weak.with([copy = std::move(chunk)](Private &that) {
+			that.push(copy);
+		});
+	};
+}
+
+rpl::producer<QImage> RoundVideoRecorder::placeholderUpdates() const {
+	return _placeholderUpdates.events();
+}
+
+int RoundVideoRecorder::previewSize() const {
+	return _side;
+}
+
+auto RoundVideoRecorder::updated() -> rpl::producer<Update, Error> {
+	return _private.producer_on_main([](const Private &that) {
+		return that.updated();
+	}) | rpl::before_next(crl::guard(this, [=](const Update &update) {
+		const auto progress = (update.samples * crl::time(1000))
+			/ float64(kAudioFrequency * kMaxDuration);
+		progressTo(progress);
+	}));
+}
+
+void RoundVideoRecorder::hide(Fn<void(RoundVideoResult)> done) {
+	if (const auto onstack = _descriptor.hiding) {
+		onstack(this);
+	}
+	pause(std::move(done));
+	fade(false);
+}
+
+void RoundVideoRecorder::progressTo(float64 progress) {
+	if (_progress == progress || _paused) {
+		return;
+	} else if (_progressReceived) {
+		_progressAnimation.start(
+			[=] { _preview->update(); },
+			_progress,
+			progress,
+			kUpdateEach * 1.1);
+	} else {
+		_progressReceived = true;
+		_fadeContentAnimation.start(
+			[=] { _preview->update(); },
+			0.,
+			1.,
+			kFadeDuration);
+	}
+	_progress = progress;
+	_preview->update();
+}
+
+void RoundVideoRecorder::preparePlaceholder(const QImage &placeholder) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto full = QSize(_side, _side) * ratio;
+	_framePlaceholder = Images::Circle(
+		(placeholder.isNull()
+			? QImage(u":/gui/art/round_placeholder.jpg"_q)
+			: placeholder).scaled(
+				full,
+				Qt::KeepAspectRatio,
+				Qt::SmoothTransformation));
+	_framePlaceholder.setDevicePixelRatio(ratio);
+}
+
+void RoundVideoRecorder::prepareFrame(bool blurred) {
+	if (_frameOriginal.isNull()) {
+		return;
+	} else if (!blurred) {
+		if (_preparedIndex == _lastAddedIndex) {
+			return;
+		}
+		_preparedIndex = _lastAddedIndex;
+	}
+
+	const auto owidth = _frameOriginal.width();
+	const auto oheight = _frameOriginal.height();
+	const auto omin = std::min(owidth, oheight);
+	const auto ox = (owidth > oheight) ? (owidth - oheight) / 2 : 0;
+	const auto oy = (owidth < oheight) ? (oheight - owidth) / 2 : 0;
+	const auto from = QRect(ox, oy, omin, omin);
+	const auto bytesPerLine = _frameOriginal.bytesPerLine();
+	const auto depth = _frameOriginal.depth() / 8;
+	const auto shift = (bytesPerLine * from.y()) + (from.x() * depth);
+	auto copy = QImage(
+		_frameOriginal.constBits() + shift,
+		omin, omin,
+		bytesPerLine,
+		_frameOriginal.format());
+
+	const auto ratio = style::DevicePixelRatio();
+	if (blurred) {
+		static constexpr auto kRadius = 16;
+		auto image = Images::BlurLargeImage(
+			copy.scaled(
+				QSize(kBlurredSize, kBlurredSize),
+				Qt::KeepAspectRatio,
+				Qt::FastTransformation),
+			kRadius).mirrored(true, false);
+		preparePlaceholder(image);
+		_placeholderUpdates.fire(std::move(image));
+	} else {
+		auto scaled = copy.scaled(
+			QSize(_side, _side) * ratio,
+			Qt::KeepAspectRatio,
+			Qt::SmoothTransformation).mirrored(true, false);
+		_framePrepared = Images::Circle(std::move(scaled));
+		_framePrepared.setDevicePixelRatio(ratio);
+	}
+}
+
+void RoundVideoRecorder::createImages() {
+	const auto ratio = style::DevicePixelRatio();
+	preparePlaceholder(_descriptor.placeholder);
+
+	const auto side = _side + 2 * _extent;
+	_shadow = QImage(
+		QSize(side, side) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	_shadow.fill(Qt::transparent);
+	_shadow.setDevicePixelRatio(ratio);
+
+	auto sp = QPainter(&_shadow);
+	auto shq = PainterHighQualityEnabler(sp);
+
+	QRadialGradient gradient(
+		QPointF(_extent + _side / 2, _extent + _side / 2),
+		_side / 2 + _extent);
+	gradient.setColorAt(0, QColor(0, 0, 0, 128));
+	gradient.setColorAt(0.8, QColor(0, 0, 0, 64));
+	gradient.setColorAt(1, QColor(0, 0, 0, 0));
+
+	sp.setPen(Qt::NoPen);
+	sp.fillRect(0, 0, side, side, gradient);
+	sp.end();
+}
+
+void RoundVideoRecorder::setup() {
+	const auto raw = _preview.get();
+
+	_side = style::ConvertScale(kSide * 3 / 4);
+	_progressStroke = st::radialLine;
+	_extent = _progressStroke * 8;
+	createImages();
+
+	_descriptor.container->sizeValue(
+	) | rpl::on_next([=](QSize outer) {
+		const auto side = _side + 2 * _extent;
+		raw->setGeometry(
+			style::centerrect(
+				QRect(QPoint(), outer),
+				QRect(0, 0, side, side)));
+	}, raw->lifetime());
+
+	const auto paintPlaceholder = [=](QPainter &p, QRect inner) {
+		p.drawImage(inner, _framePlaceholder);
+		if (_paused) {
+			return;
+		}
+
+		_gradient.startFrame(
+			0,
+			raw->width(),
+			raw->width() * 2 / 3);
+		_gradient.paint([&](const Ui::PathShiftGradient::Background &b) {
+			if (!v::is<QLinearGradient*>(b)) {
+				return true;
+			}
+			auto hq = PainterHighQualityEnabler(p);
+			const auto gradient = v::get<QLinearGradient*>(b);
+
+			auto copy = *gradient;
+			auto stops = copy.stops();
+			for (auto &pair : stops) {
+				if (pair.second.alpha() > 0) {
+					pair.second.setAlpha(255);
+				}
+			}
+			copy.setStops(stops);
+
+			const auto stroke = style::ConvertScaleExact(1.);
+			const auto sub = stroke / 2.;
+			p.setPen(QPen(QBrush(copy), stroke));
+
+			p.setBrush(*gradient);
+			const auto innerf = QRectF(inner);
+			p.drawEllipse(innerf.marginsRemoved({ sub, sub, sub, sub }));
+			return true;
+		});
+	};
+
+	raw->paintRequest() | rpl::on_next([=] {
+		prepareFrame();
+
+		auto p = QPainter(raw);
+		const auto faded = _fadeAnimation.value(_visible ? 1. : 0.);
+		if (_fadeAnimation.animating()) {
+			p.setOpacity(faded * faded);
+
+			const auto center = raw->rect().center();
+			p.translate(center);
+			const auto scale = kMinScale + (1. - kMinScale) * faded;
+			p.scale(scale, scale);
+			p.translate(-center);
+		} else if (!_visible) {
+			return;
+		}
+
+		p.drawImage(raw->rect(), _shadow);
+		const auto inner = QRect(_extent, _extent, _side, _side);
+		const auto fading = _fadeContentAnimation.animating();
+		if (!_progressReceived && !fading) {
+			paintPlaceholder(p, inner);
+		} else {
+			if (fading) {
+				paintPlaceholder(p, inner);
+
+				const auto to = _progressReceived ? 1. : 0.;
+				p.setOpacity(faded * _fadeContentAnimation.value(to));
+			}
+			p.drawImage(inner, _framePrepared);
+
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(QPen(
+				Qt::white,
+				_progressStroke,
+				Qt::SolidLine,
+				Qt::RoundCap));
+			p.setBrush(Qt::NoBrush);
+			const auto add = _progressStroke * 3 / 2.;
+			const auto full = arc::kFullLength;
+			const auto length = int(base::SafeRound(
+				_progressAnimation.value(_progress) * full));
+			p.drawArc(
+				QRectF(inner).marginsAdded({ add, add, add, add }),
+				(full / 4) - length,
+				length);
+		}
+
+		const auto preview = _fadePreviewAnimation.value(
+			_silentPreview ? 1. : 0.);
+		const auto frame = _silentPreview
+			? lookupPreviewFrame()
+			: _cachedPreviewFrame;
+		if (preview > 0. && !frame.image.isNull()) {
+			p.setOpacity(preview);
+			p.drawImage(inner, frame.image);
+			if (frame.silent) {
+				const auto iconSize = st::historyVideoMessageMuteSize;
+				const auto iconRect = style::rtlrect(
+					inner.x() + (inner.width() - iconSize) / 2,
+					inner.y() + st::msgDateImgDelta,
+					iconSize,
+					iconSize,
+					raw->width());
+				p.setPen(Qt::NoPen);
+				p.setBrush(st::msgDateImgBg);
+				auto hq = PainterHighQualityEnabler(p);
+				p.drawEllipse(iconRect);
+				st::historyVideoMessageMute.paintInCenter(p, iconRect);
+			}
+		}
+	}, raw->lifetime());
+
+	// Skip some frames, they are sometimes black :(
+	_skipFrames = kSkipFrames;
+	_descriptor.track->setState(Webrtc::VideoState::Active);
+
+	_descriptor.track->renderNextFrame() | rpl::on_next([=] {
+		const auto info = _descriptor.track->frameWithInfo(true);
+		if (!info.original.isNull() && _lastAddedIndex != info.index) {
+			_lastAddedIndex = info.index;
+			if (_skipFrames > 0) {
+				--_skipFrames;
+			} else {
+				_frameOriginal = info.original;
+				const auto ts = info.mcstimestamp;
+				_private.with([copy = info.original, ts](Private &that) {
+					that.push(ts, copy);
+				});
+			}
+		}
+		_descriptor.track->markFrameShown();
+		raw->update();
+	}, raw->lifetime());
+	_descriptor.track->markFrameShown();
+
+	fade(true);
+
+	raw->show();
+	raw->raise();
+}
+
+void RoundVideoRecorder::fade(bool visible) {
+	if (_visible == visible) {
+		return;
+	}
+	_visible = visible;
+	const auto from = visible ? 0. : 1.;
+	const auto to = visible ? 1. : 0.;
+	_fadeAnimation.start([=] {
+		if (_fadeAnimation.animating() || _visible) {
+			_preview->update();
+		} else {
+			_preview->hide();
+			if (const auto onstack = _descriptor.hidden) {
+				onstack(this);
+			}
+		}
+	}, from, to, kFadeDuration);
+}
+
+auto RoundVideoRecorder::lookupPreviewFrame() const -> PreviewFrame {
+	auto sounded = _soundedPreview
+		? _soundedPreview->image(_side)
+		: QImage();
+	const auto silent = (_silentPreview && sounded.isNull());
+	return {
+		.image = silent ? _silentPreview->image(_side) : std::move(sounded),
+		.silent = silent,
+	};
+}
+
+Fn<void()> RoundVideoRecorder::updater() const {
+	return [=] {
+		_preview->update();
+	};
+}
+
+void RoundVideoRecorder::pause(Fn<void(RoundVideoResult)> done) {
+	if (_paused) {
+		return;
+	} else if (done) {
+		_private.with([done = std::move(done)](Private &that) {
+			done(that.finish());
+		});
+	}
+	_paused = true;
+	prepareFrame(true);
+	_progressReceived = false;
+	_fadeContentAnimation.start(updater(), 1., 0., kFadeDuration);
+	_descriptor.track->setState(Webrtc::VideoState::Inactive);
+	_preview->update();
+}
+
+void RoundVideoRecorder::showPreview(
+		std::shared_ptr<Ui::DynamicImage> silent,
+		std::shared_ptr<Ui::DynamicImage> sounded) {
+	_silentPreview = std::move(silent);
+	_soundedPreview = std::move(sounded);
+	_silentPreview->subscribeToUpdates(updater());
+	_soundedPreview->subscribeToUpdates(updater());
+	_fadePreviewAnimation.start(updater(), 0., 1., kFadeDuration);
+	_preview->update();
+}
+
+void RoundVideoRecorder::resume(RoundVideoPartial partial) {
+	if (!_paused) {
+		return;
+	}
+	_private.with([partial = std::move(partial)](Private &that) mutable {
+		that.restart(std::move(partial));
+	});
+	_paused = false;
+	_cachedPreviewFrame = lookupPreviewFrame();
+	if (const auto preview = base::take(_silentPreview)) {
+		preview->subscribeToUpdates(nullptr);
+	}
+	if (const auto preview = base::take(_soundedPreview)) {
+		preview->subscribeToUpdates(nullptr);
+	}
+	if (!_cachedPreviewFrame.image.isNull()) {
+		_fadePreviewAnimation.start(updater(), 1., 0., kFadeDuration);
+	}
+	// Skip some frames, they are sometimes black :(
+	_skipFrames = kSkipFrames;
+	_descriptor.track->setState(Webrtc::VideoState::Active);
+	_preview->update();
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder.h b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
new file mode 100644
index 00000000000000..e919c223ac589c
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder.h
@@ -0,0 +1,131 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/weak_ptr.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/path_shift_gradient.h"
+
+#include <crl/crl_object_on_queue.h>
+
+namespace Media::Capture {
+struct Chunk;
+struct Update;
+enum class Error : uchar;
+} // namespace Media::Capture
+
+namespace tgcalls {
+class VideoCaptureInterface;
+} // namespace tgcalls
+
+namespace Webrtc {
+class VideoTrack;
+} // namespace Webrtc
+
+namespace Ui {
+
+class RpWidget;
+class DynamicImage;
+class RoundVideoRecorder;
+
+struct RoundVideoRecorderDescriptor {
+	not_null<RpWidget*> container;
+	Fn<void(not_null<RoundVideoRecorder*>)> hiding;
+	Fn<void(not_null<RoundVideoRecorder*>)> hidden;
+	std::shared_ptr<tgcalls::VideoCaptureInterface> capturer;
+	std::shared_ptr<Webrtc::VideoTrack> track;
+	QImage placeholder;
+};
+
+struct RoundVideoResult {
+	QByteArray content;
+	QVector<signed char> waveform;
+	crl::time duration = 0;
+	QImage minithumbs;
+	int minithumbsCount = 0;
+	int minithumbSize = 0;
+};
+
+struct RoundVideoPartial {
+	RoundVideoResult video;
+	crl::time from = 0;
+	crl::time till = 0;
+};
+
+class RoundVideoRecorder final : public base::has_weak_ptr {
+public:
+	explicit RoundVideoRecorder(RoundVideoRecorderDescriptor &&descriptor);
+	~RoundVideoRecorder();
+
+	[[nodiscard]] int previewSize() const;
+	[[nodiscard]] Fn<void(Media::Capture::Chunk)> audioChunkProcessor();
+	[[nodiscard]] rpl::producer<QImage> placeholderUpdates() const;
+
+	void pause(Fn<void(RoundVideoResult)> done = nullptr);
+	void resume(RoundVideoPartial partial);
+	void hide(Fn<void(RoundVideoResult)> done = nullptr);
+
+	void showPreview(
+		std::shared_ptr<Ui::DynamicImage> silent,
+		std::shared_ptr<Ui::DynamicImage> sounded);
+
+	using Update = Media::Capture::Update;
+	using Error = Media::Capture::Error;
+	[[nodiscard]] rpl::producer<Update, Error> updated();
+
+private:
+	class Private;
+	struct PreviewFrame {
+		QImage image;
+		bool silent = false;
+	};
+
+	void setup();
+	void prepareFrame(bool blurred = false);
+	void preparePlaceholder(const QImage &placeholder);
+	void createImages();
+	void progressTo(float64 progress);
+	void fade(bool visible);
+
+	[[nodiscard]] Fn<void()> updater() const;
+	[[nodiscard]] PreviewFrame lookupPreviewFrame() const;
+
+	const RoundVideoRecorderDescriptor _descriptor;
+	style::owned_color _gradientBg;
+	style::owned_color _gradientFg;
+	PathShiftGradient _gradient;
+	std::unique_ptr<RpWidget> _preview;
+	crl::object_on_queue<Private> _private;
+	Ui::Animations::Simple _progressAnimation;
+	Ui::Animations::Simple _fadeAnimation;
+	Ui::Animations::Simple _fadeContentAnimation;
+	rpl::event_stream<QImage> _placeholderUpdates;
+
+	std::shared_ptr<Ui::DynamicImage> _silentPreview;
+	std::shared_ptr<Ui::DynamicImage> _soundedPreview;
+	Ui::Animations::Simple _fadePreviewAnimation;
+	PreviewFrame _cachedPreviewFrame;
+
+	float64 _progress = 0.;
+	QImage _frameOriginal;
+	QImage _framePlaceholder;
+	QImage _framePrepared;
+	QImage _shadow;
+	int _lastAddedIndex = 0;
+	int _preparedIndex = 0;
+	int _side = 0;
+	int _progressStroke = 0;
+	int _extent = 0;
+	int _skipFrames = 0;
+	bool _progressReceived = false;
+	bool _visible = false;
+	bool _paused = false;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/round_video_recorder_data.h b/Telegram/SourceFiles/ui/controls/round_video_recorder_data.h
new file mode 100644
index 00000000000000..8a5496f7e6a56b
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/round_video_recorder_data.h
@@ -0,0 +1,69 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace RoundVideoData {
+
+constexpr auto kLogoSize = 80;
+
+struct LogoRLENode final {
+	uint16_t count;
+	uint8_t value;
+};
+using LogoRLEFrame = std::vector<LogoRLENode>;
+
+void DecompressLogoRLEFrame(
+		const std::vector<LogoRLENode> &rleFrame,
+		uint8_t outFrame[kLogoSize][kLogoSize]) {
+	auto pos = size_t(0);
+	for (const auto &node : rleFrame) {
+		for (auto i = uint16_t(0); i < node.count; ++i) {
+			if (pos >= kLogoSize * kLogoSize) {
+				break;
+			}
+			const auto y = int(pos / kLogoSize);
+			const auto x = int(pos % kLogoSize);
+			outFrame[y][x] = node.value;
+			pos++;
+		}
+	}
+}
+
+const auto kLogoFrames = std::array<LogoRLEFrame, 27>{ {
+
+	LogoRLEFrame{ { 997, 0 }, { 1, 9 }, { 1, 4 }, { 77, 0 }, { 1, 1 }, { 1, 27 }, { 78, 0 }, { 1, 32 }, { 1, 11 }, { 77, 0 }, { 1, 14 }, { 1, 44 }, { 77, 0 }, { 1, 2 }, { 1, 54 }, { 1, 17 }, { 77, 0 }, { 1, 33 }, { 1, 47 }, { 77, 0 }, { 1, 9 }, { 1, 61 }, { 1, 13 }, { 77, 0 }, { 1, 45 }, { 1, 40 }, { 77, 0 }, { 1, 19 }, { 1, 60 }, { 1, 6 }, { 76, 0 }, { 1, 2 }, { 1, 54 }, { 1, 31 }, { 77, 0 }, { 1, 27 }, { 1, 54 }, { 1, 2 }, { 76, 0 }, { 1, 1 }, { 1, 55 }, { 1, 15 }, { 9, 0 }, { 1, 53 }, { 1, 196 }, { 1, 65 }, { 65, 0 }, { 1, 24 }, { 1, 35 }, { 9, 0 }, { 1, 32 }, { 1, 238 }, { 1, 255 }, { 1, 115 }, { 65, 0 }, { 1, 41 }, { 1, 2 }, { 8, 0 }, { 1, 4 }, { 1, 199 }, { 2, 255 }, { 1, 121 }, { 20, 0 }, { 1, 2 }, { 1, 4 }, { 42, 0 }, { 1, 16 }, { 1, 9 }, { 9, 0 }, { 1, 135 }, { 3, 255 }, { 1, 98 }, { 19, 0 }, { 2, 19 }, { 43, 0 }, { 1, 7 }, { 9, 0 }, { 1, 68 }, { 1, 253 }, { 3, 255 }, { 1, 65 }, { 17, 0 }, { 1, 8 }, { 1, 43 }, { 1, 20 }, { 53, 0 }, { 1, 22 }, { 1, 231 }, { 3, 255 }, { 1, 217 }, { 1, 3 }, { 16, 0 }, { 1, 30 }, { 1, 56 }, { 1, 15 }, { 53, 0 }, { 1, 1 }, { 1, 183 }, { 3, 255 }, { 1, 250 }, { 1, 67 }, { 15, 0 }, { 1, 8 }, { 1, 48 }, { 1, 52 }, { 1, 10 }, { 54, 0 }, { 1, 115 }, { 4, 255 }, { 1, 91 }, { 15, 0 }, { 1, 23 }, { 1, 59 }, { 1, 39 }, { 1, 2 }, { 54, 0 }, { 1, 52 }, { 1, 250 }, { 3, 255 }, { 1, 114 }, { 14, 0 }, { 1, 4 }, { 1, 41 }, { 1, 60 }, { 1, 22 }, { 55, 0 }, { 1, 13 }, { 1, 219 }, { 3, 255 }, { 1, 139 }, { 14, 0 }, { 1, 10 }, { 1, 54 }, { 1, 51 }, { 1, 9 }, { 56, 0 }, { 1, 164 }, { 3, 255 }, { 1, 162 }, { 1, 1 }, { 1, 0 }, { 1, 102 }, { 1, 222 }, { 1, 236 }, { 1, 85 }, { 8, 0 }, { 1, 15 }, { 1, 54 }, { 1, 27 }, { 57, 0 }, { 1, 95 }, { 3, 255 }, { 1, 183 }, { 1, 5 }, { 1, 2 }, { 1, 152 }, { 3, 255 }, { 1, 164 }, { 7, 0 }, { 1, 22 }, { 1, 36 }, { 1, 4 }, { 57, 0 }, { 1, 38 }, { 1, 243 }, { 2, 255 }, { 1, 201 }, { 1, 11 }, { 1, 7 }, { 1, 172 }, { 4, 255 }, { 1, 188 }, { 6, 0 }, { 1, 16 }, { 1, 12 }, { 58, 0 }, { 1, 6 }, { 1, 206 }, { 2, 255 }, { 1, 217 }, { 1, 20 }, { 1, 14 }, { 1, 190 }, { 5, 255 }, { 1, 213 }, { 5, 0 }, { 1, 1 }, { 60, 0 }, { 1, 144 }, { 2, 255 }, { 1, 230 }, { 1, 32 }, { 1, 23 }, { 1, 207 }, { 6, 255 }, { 1, 238 }, { 65, 0 }, { 1, 76 }, { 2, 255 }, { 1, 240 }, { 1, 46 }, { 1, 35 }, { 1, 220 }, { 8, 255 }, { 1, 8 }, { 63, 0 }, { 1, 26 }, { 1, 235 }, { 1, 255 }, { 1, 248 }, { 1, 64 }, { 1, 48 }, { 1, 232 }, { 9, 255 }, { 1, 31 }, { 62, 0 }, { 1, 2 }, { 1, 191 }, { 1, 255 }, { 1, 253 }, { 1, 83 }, { 1, 64 }, { 1, 241 }, { 10, 255 }, { 1, 56 }, { 62, 0 }, { 1, 124 }, { 2, 255 }, { 1, 106 }, { 1, 83 }, { 1, 248 }, { 11, 255 }, { 1, 81 }, { 61, 0 }, { 1, 59 }, { 1, 252 }, { 1, 255 }, { 1, 130 }, { 1, 103 }, { 1, 253 }, { 12, 255 }, { 1, 105 }, { 60, 0 }, { 1, 17 }, { 1, 225 }, { 1, 255 }, { 1, 226 }, { 1, 143 }, { 14, 255 }, { 1, 103 }, { 60, 0 }, { 1, 173 }, { 17, 255 }, { 1, 223 }, { 1, 12 }, { 59, 0 }, { 1, 105 }, { 17, 255 }, { 1, 206 }, { 1, 30 }, { 59, 0 }, { 1, 44 }, { 1, 247 }, { 15, 255 }, { 1, 204 }, { 1, 95 }, { 1, 4 }, { 59, 0 }, { 1, 9 }, { 1, 213 }, { 12, 255 }, { 1, 252 }, { 1, 191 }, { 1, 110 }, { 1, 30 }, { 62, 0 }, { 1, 154 }, { 10, 255 }, { 1, 247 }, { 1, 178 }, { 1, 97 }, { 1, 20 }, { 64, 0 }, { 1, 85 }, { 8, 255 }, { 1, 240 }, { 1, 165 }, { 1, 84 }, { 1, 12 }, { 66, 0 }, { 1, 32 }, { 1, 240 }, { 5, 255 }, { 1, 232 }, { 1, 153 }, { 1, 71 }, { 1, 6 }, { 68, 0 }, { 1, 1 }, { 1, 196 }, { 3, 255 }, { 1, 221 }, { 1, 140 }, { 1, 59 }, { 1, 2 }, { 71, 0 }, { 1, 49 }, { 1, 253 }, { 1, 207 }, { 1, 127 }, { 1, 46 }, { 76, 0 }, { 1, 6 }, { 508, 0 }, { 1, 6 }, { 1, 1 }, { 76, 0 }, { 1, 7 }, { 1, 29 }, { 1, 9 }, { 75, 0 }, { 1, 6 }, { 1, 36 }, { 1, 41 }, { 1, 3 }, { 74, 0 }, { 1, 1 }, { 1, 31 }, { 1, 59 }, { 1, 29 }, { 75, 0 }, { 1, 17 }, { 1, 53 }, { 1, 51 }, { 1, 13 }, { 74, 0 }, { 1, 6 }, { 1, 42 }, { 1, 60 }, { 1, 29 }, { 75, 0 }, { 1, 25 }, { 1, 60 }, { 1, 47 }, { 1, 9 }, { 74, 0 }, { 1, 3 }, { 1, 41 }, { 1, 52 }, { 1, 21 }, { 75, 0 }, { 1, 12 }, { 1, 43 }, { 1, 21 }, { 76, 0 }, { 1, 15 }, { 1, 18 }, { 77, 0 }, { 1, 1 }, { 843, 0 } }, 
+	LogoRLEFrame{ { 600, 0 }, { 1, 1 }, { 79, 0 }, { 1, 7 }, { 78, 0 }, { 1, 14 }, { 1, 1 }, { 77, 0 }, { 1, 7 }, { 1, 16 }, { 77, 0 }, { 1, 1 }, { 1, 26 }, { 1, 3 }, { 77, 0 }, { 1, 18 }, { 1, 19 }, { 77, 0 }, { 1, 6 }, { 1, 29 }, { 1, 3 }, { 77, 0 }, { 1, 24 }, { 1, 16 }, { 77, 0 }, { 1, 12 }, { 1, 28 }, { 1, 1 }, { 76, 0 }, { 1, 2 }, { 1, 28 }, { 1, 12 }, { 77, 0 }, { 1, 17 }, { 1, 25 }, { 77, 0 }, { 1, 3 }, { 1, 29 }, { 1, 7 }, { 77, 0 }, { 1, 16 }, { 1, 17 }, { 77, 0 }, { 1, 1 }, { 1, 24 }, { 1, 1 }, { 77, 0 }, { 1, 13 }, { 1, 5 }, { 77, 0 }, { 1, 1 }, { 1, 8 }, { 78, 0 }, { 1, 1 }, { 90, 0 }, { 1, 14 }, { 1, 167 }, { 1, 127 }, { 76, 0 }, { 1, 2 }, { 1, 189 }, { 1, 255 }, { 1, 196 }, { 76, 0 }, { 1, 124 }, { 2, 255 }, { 1, 204 }, { 75, 0 }, { 1, 58 }, { 1, 252 }, { 2, 255 }, { 1, 185 }, { 74, 0 }, { 1, 16 }, { 1, 224 }, { 3, 255 }, { 1, 155 }, { 74, 0 }, { 1, 171 }, { 4, 255 }, { 1, 64 }, { 73, 0 }, { 1, 101 }, { 4, 255 }, { 1, 167 }, { 73, 0 }, { 1, 42 }, { 1, 245 }, { 3, 255 }, { 1, 192 }, { 1, 7 }, { 72, 0 }, { 1, 8 }, { 1, 210 }, { 3, 255 }, { 1, 209 }, { 1, 15 }, { 57, 0 }, { 1, 5 }, { 15, 0 }, { 1, 148 }, { 3, 255 }, { 1, 223 }, { 1, 25 }, { 57, 0 }, { 1, 14 }, { 1, 1 }, { 14, 0 }, { 1, 80 }, { 3, 255 }, { 1, 235 }, { 1, 38 }, { 1, 0 }, { 1, 26 }, { 1, 159 }, { 1, 214 }, { 1, 142 }, { 52, 0 }, { 1, 4 }, { 1, 20 }, { 14, 0 }, { 1, 28 }, { 1, 237 }, { 2, 255 }, { 1, 245 }, { 1, 54 }, { 1, 0 }, { 1, 48 }, { 1, 231 }, { 3, 255 }, { 1, 7 }, { 51, 0 }, { 1, 29 }, { 1, 5 }, { 13, 0 }, { 1, 3 }, { 1, 193 }, { 2, 255 }, { 1, 251 }, { 1, 74 }, { 1, 0 }, { 1, 64 }, { 1, 241 }, { 4, 255 }, { 1, 32 }, { 50, 0 }, { 1, 14 }, { 1, 30 }, { 14, 0 }, { 1, 126 }, { 3, 255 }, { 1, 95 }, { 1, 0 }, { 1, 83 }, { 1, 248 }, { 5, 255 }, { 1, 59 }, { 49, 0 }, { 1, 1 }, { 1, 37 }, { 1, 12 }, { 13, 0 }, { 1, 60 }, { 1, 252 }, { 2, 255 }, { 1, 119 }, { 1, 0 }, { 1, 105 }, { 1, 253 }, { 6, 255 }, { 1, 85 }, { 49, 0 }, { 1, 21 }, { 1, 32 }, { 13, 0 }, { 1, 17 }, { 1, 225 }, { 2, 255 }, { 1, 144 }, { 1, 0 }, { 1, 128 }, { 8, 255 }, { 1, 111 }, { 48, 0 }, { 1, 3 }, { 1, 40 }, { 1, 11 }, { 13, 0 }, { 1, 173 }, { 2, 255 }, { 1, 167 }, { 1, 4 }, { 1, 152 }, { 9, 255 }, { 1, 138 }, { 48, 0 }, { 1, 25 }, { 1, 31 }, { 13, 0 }, { 1, 104 }, { 2, 255 }, { 1, 188 }, { 1, 14 }, { 1, 174 }, { 10, 255 }, { 1, 164 }, { 47, 0 }, { 1, 6 }, { 1, 41 }, { 1, 9 }, { 12, 0 }, { 1, 43 }, { 1, 246 }, { 1, 255 }, { 1, 206 }, { 1, 29 }, { 1, 192 }, { 11, 255 }, { 1, 191 }, { 47, 0 }, { 1, 28 }, { 1, 29 }, { 12, 0 }, { 1, 9 }, { 1, 211 }, { 1, 255 }, { 1, 221 }, { 1, 49 }, { 1, 209 }, { 12, 255 }, { 1, 218 }, { 46, 0 }, { 1, 5 }, { 1, 40 }, { 1, 5 }, { 12, 0 }, { 1, 151 }, { 2, 255 }, { 1, 125 }, { 1, 223 }, { 13, 255 }, { 1, 223 }, { 46, 0 }, { 1, 22 }, { 1, 20 }, { 12, 0 }, { 1, 82 }, { 18, 255 }, { 1, 121 }, { 45, 0 }, { 1, 1 }, { 1, 32 }, { 12, 0 }, { 1, 30 }, { 1, 238 }, { 17, 255 }, { 1, 139 }, { 1, 2 }, { 45, 0 }, { 1, 15 }, { 1, 8 }, { 11, 0 }, { 1, 3 }, { 1, 195 }, { 15, 255 }, { 1, 253 }, { 1, 186 }, { 1, 63 }, { 47, 0 }, { 1, 11 }, { 12, 0 }, { 1, 128 }, { 13, 255 }, { 1, 247 }, { 1, 179 }, { 1, 99 }, { 1, 22 }, { 48, 0 }, { 1, 1 }, { 12, 0 }, { 1, 62 }, { 1, 252 }, { 10, 255 }, { 1, 238 }, { 1, 163 }, { 1, 83 }, { 1, 12 }, { 63, 0 }, { 1, 18 }, { 1, 227 }, { 8, 255 }, { 1, 226 }, { 1, 146 }, { 1, 66 }, { 1, 4 }, { 66, 0 }, { 1, 175 }, { 6, 255 }, { 1, 209 }, { 1, 130 }, { 1, 50 }, { 69, 0 }, { 1, 100 }, { 3, 255 }, { 1, 252 }, { 1, 193 }, { 1, 113 }, { 1, 34 }, { 72, 0 }, { 1, 216 }, { 1, 246 }, { 1, 176 }, { 1, 97 }, { 1, 21 }, { 75, 0 }, { 1, 17 }, { 1, 4 }, { 349, 0 }, { 1, 18 }, { 1, 13 }, { 76, 0 }, { 1, 19 }, { 1, 42 }, { 1, 11 }, { 75, 0 }, { 1, 15 }, { 1, 49 }, { 1, 43 }, { 1, 3 }, { 74, 0 }, { 1, 5 }, { 1, 40 }, { 1, 59 }, { 1, 27 }, { 75, 0 }, { 1, 26 }, { 1, 59 }, { 1, 45 }, { 1, 7 }, { 74, 0 }, { 1, 12 }, { 1, 50 }, { 1, 57 }, { 1, 22 }, { 75, 0 }, { 1, 27 }, { 1, 60 }, { 1, 38 }, { 1, 4 }, { 74, 0 }, { 1, 4 }, { 1, 42 }, { 1, 38 }, { 1, 8 }, { 75, 0 }, { 1, 12 }, { 1, 29 }, { 1, 7 }, { 76, 0 }, { 1, 2 }, { 1, 5 }, { 999, 0 } }, 
+	LogoRLEFrame{ { 2042, 0 }, { 1, 2 }, { 1, 144 }, { 1, 220 }, { 1, 25 }, { 1, 4 }, { 75, 0 }, { 1, 132 }, { 2, 255 }, { 1, 64 }, { 75, 0 }, { 1, 62 }, { 1, 253 }, { 2, 255 }, { 1, 55 }, { 74, 0 }, { 1, 16 }, { 1, 225 }, { 3, 255 }, { 1, 43 }, { 74, 0 }, { 1, 169 }, { 4, 255 }, { 1, 19 }, { 55, 0 }, { 2, 5 }, { 16, 0 }, { 1, 96 }, { 4, 255 }, { 1, 201 }, { 56, 0 }, { 1, 26 }, { 16, 0 }, { 1, 35 }, { 1, 243 }, { 3, 255 }, { 1, 252 }, { 1, 66 }, { 55, 0 }, { 1, 20 }, { 1, 21 }, { 15, 0 }, { 1, 4 }, { 1, 201 }, { 4, 255 }, { 1, 105 }, { 55, 0 }, { 1, 3 }, { 1, 50 }, { 1, 1 }, { 15, 0 }, { 1, 132 }, { 4, 255 }, { 1, 134 }, { 56, 0 }, { 1, 37 }, { 1, 32 }, { 15, 0 }, { 1, 62 }, { 1, 253 }, { 3, 255 }, { 1, 160 }, { 56, 0 }, { 1, 12 }, { 1, 60 }, { 1, 6 }, { 14, 0 }, { 1, 16 }, { 1, 225 }, { 3, 255 }, { 1, 183 }, { 1, 4 }, { 1, 0 }, { 1, 28 }, { 1, 132 }, { 1, 143 }, { 1, 31 }, { 51, 0 }, { 1, 46 }, { 1, 34 }, { 15, 0 }, { 1, 169 }, { 3, 255 }, { 1, 202 }, { 1, 11 }, { 1, 0 }, { 1, 73 }, { 1, 243 }, { 2, 255 }, { 1, 165 }, { 50, 0 }, { 1, 17 }, { 1, 59 }, { 1, 5 }, { 14, 0 }, { 1, 95 }, { 3, 255 }, { 1, 219 }, { 1, 21 }, { 1, 0 }, { 1, 94 }, { 1, 251 }, { 3, 255 }, { 1, 197 }, { 50, 0 }, { 1, 51 }, { 1, 32 }, { 14, 0 }, { 1, 35 }, { 1, 242 }, { 2, 255 }, { 1, 232 }, { 1, 34 }, { 1, 0 }, { 1, 118 }, { 5, 255 }, { 1, 229 }, { 49, 0 }, { 1, 24 }, { 1, 58 }, { 1, 3 }, { 13, 0 }, { 1, 4 }, { 1, 200 }, { 2, 255 }, { 1, 243 }, { 1, 51 }, { 1, 1 }, { 1, 143 }, { 7, 255 }, { 1, 7 }, { 48, 0 }, { 1, 55 }, { 1, 29 }, { 14, 0 }, { 1, 132 }, { 2, 255 }, { 1, 250 }, { 1, 70 }, { 1, 6 }, { 1, 167 }, { 8, 255 }, { 1, 38 }, { 47, 0 }, { 1, 20 }, { 1, 52 }, { 1, 1 }, { 13, 0 }, { 1, 61 }, { 1, 253 }, { 2, 255 }, { 1, 93 }, { 1, 13 }, { 1, 187 }, { 9, 255 }, { 1, 70 }, { 47, 0 }, { 1, 47 }, { 1, 15 }, { 13, 0 }, { 1, 16 }, { 1, 225 }, { 2, 255 }, { 1, 118 }, { 1, 23 }, { 1, 205 }, { 10, 255 }, { 1, 102 }, { 46, 0 }, { 1, 11 }, { 1, 37 }, { 14, 0 }, { 1, 168 }, { 2, 255 }, { 1, 145 }, { 1, 36 }, { 1, 221 }, { 11, 255 }, { 1, 134 }, { 46, 0 }, { 1, 29 }, { 1, 2 }, { 13, 0 }, { 1, 95 }, { 2, 255 }, { 1, 170 }, { 1, 53 }, { 1, 233 }, { 12, 255 }, { 1, 166 }, { 45, 0 }, { 1, 3 }, { 1, 10 }, { 13, 0 }, { 1, 35 }, { 1, 242 }, { 1, 255 }, { 1, 226 }, { 1, 89 }, { 1, 243 }, { 13, 255 }, { 1, 187 }, { 59, 0 }, { 1, 4 }, { 1, 200 }, { 18, 255 }, { 1, 136 }, { 59, 0 }, { 1, 131 }, { 18, 255 }, { 1, 190 }, { 1, 9 }, { 58, 0 }, { 1, 61 }, { 1, 253 }, { 16, 255 }, { 1, 237 }, { 1, 125 }, { 1, 4 }, { 58, 0 }, { 1, 16 }, { 1, 225 }, { 14, 255 }, { 1, 235 }, { 1, 161 }, { 1, 84 }, { 1, 11 }, { 60, 0 }, { 1, 168 }, { 12, 255 }, { 1, 213 }, { 1, 136 }, { 1, 59 }, { 1, 2 }, { 62, 0 }, { 1, 94 }, { 9, 255 }, { 1, 250 }, { 1, 188 }, { 1, 111 }, { 1, 34 }, { 65, 0 }, { 1, 34 }, { 1, 242 }, { 6, 255 }, { 1, 236 }, { 1, 162 }, { 1, 85 }, { 1, 14 }, { 67, 0 }, { 1, 1 }, { 1, 198 }, { 4, 255 }, { 1, 214 }, { 1, 137 }, { 1, 60 }, { 1, 3 }, { 70, 0 }, { 1, 67 }, { 1, 255 }, { 1, 251 }, { 1, 189 }, { 1, 112 }, { 1, 35 }, { 74, 0 }, { 1, 9 }, { 1, 57 }, { 1, 14 }, { 111, 0 }, { 1, 6 }, { 1, 11 }, { 76, 0 }, { 1, 5 }, { 1, 32 }, { 1, 20 }, { 75, 0 }, { 1, 4 }, { 1, 33 }, { 1, 51 }, { 1, 11 }, { 75, 0 }, { 1, 24 }, { 1, 57 }, { 1, 42 }, { 1, 3 }, { 74, 0 }, { 1, 11 }, { 1, 48 }, { 1, 56 }, { 1, 20 }, { 74, 0 }, { 1, 3 }, { 1, 35 }, { 1, 61 }, { 1, 38 }, { 1, 3 }, { 74, 0 }, { 1, 14 }, { 1, 55 }, { 1, 53 }, { 1, 15 }, { 75, 0 }, { 1, 28 }, { 1, 52 }, { 1, 24 }, { 75, 0 }, { 1, 4 }, { 1, 34 }, { 1, 23 }, { 76, 0 }, { 1, 4 }, { 1, 15 }, { 1156, 0 } }, 
+	LogoRLEFrame{ { 1807, 0 }, { 2, 3 }, { 77, 0 }, { 1, 5 }, { 1, 34 }, { 74, 0 }, { 1, 15 }, { 1, 88 }, { 1, 9 }, { 1, 7 }, { 1, 52 }, { 1, 10 }, { 73, 0 }, { 1, 14 }, { 1, 210 }, { 1, 255 }, { 1, 94 }, { 1, 51 }, { 1, 33 }, { 57, 0 }, { 1, 2 }, { 16, 0 }, { 1, 160 }, { 2, 255 }, { 1, 151 }, { 1, 47 }, { 57, 0 }, { 1, 13 }, { 1, 1 }, { 15, 0 }, { 1, 80 }, { 3, 255 }, { 1, 178 }, { 1, 5 }, { 56, 0 }, { 1, 2 }, { 1, 27 }, { 15, 0 }, { 1, 21 }, { 1, 233 }, { 3, 255 }, { 1, 157 }, { 57, 0 }, { 1, 35 }, { 1, 9 }, { 15, 0 }, { 1, 175 }, { 4, 255 }, { 1, 143 }, { 56, 0 }, { 1, 13 }, { 1, 45 }, { 15, 0 }, { 1, 94 }, { 5, 255 }, { 1, 73 }, { 55, 0 }, { 1, 1 }, { 1, 52 }, { 1, 20 }, { 14, 0 }, { 1, 29 }, { 1, 240 }, { 4, 255 }, { 1, 199 }, { 1, 1 }, { 55, 0 }, { 1, 26 }, { 1, 52 }, { 14, 0 }, { 1, 1 }, { 1, 189 }, { 4, 255 }, { 1, 227 }, { 1, 24 }, { 55, 0 }, { 1, 3 }, { 1, 57 }, { 1, 20 }, { 14, 0 }, { 1, 109 }, { 4, 255 }, { 1, 241 }, { 1, 46 }, { 56, 0 }, { 1, 32 }, { 1, 50 }, { 14, 0 }, { 1, 39 }, { 1, 246 }, { 3, 255 }, { 1, 250 }, { 1, 68 }, { 56, 0 }, { 1, 6 }, { 1, 60 }, { 1, 18 }, { 13, 0 }, { 1, 3 }, { 1, 201 }, { 4, 255 }, { 1, 93 }, { 2, 0 }, { 1, 24 }, { 1, 97 }, { 1, 81 }, { 1, 1 }, { 51, 0 }, { 1, 38 }, { 1, 48 }, { 14, 0 }, { 1, 124 }, { 4, 255 }, { 1, 122 }, { 2, 0 }, { 1, 83 }, { 1, 240 }, { 2, 255 }, { 1, 113 }, { 50, 0 }, { 1, 7 }, { 1, 61 }, { 1, 14 }, { 13, 0 }, { 1, 50 }, { 1, 250 }, { 3, 255 }, { 1, 153 }, { 2, 0 }, { 1, 109 }, { 1, 253 }, { 3, 255 }, { 1, 164 }, { 50, 0 }, { 1, 33 }, { 1, 37 }, { 13, 0 }, { 1, 7 }, { 1, 212 }, { 3, 255 }, { 1, 180 }, { 1, 3 }, { 1, 1 }, { 1, 136 }, { 5, 255 }, { 1, 206 }, { 49, 0 }, { 1, 2 }, { 1, 52 }, { 1, 4 }, { 13, 0 }, { 1, 139 }, { 3, 255 }, { 1, 203 }, { 1, 11 }, { 1, 5 }, { 1, 163 }, { 6, 255 }, { 1, 247 }, { 1, 2 }, { 48, 0 }, { 1, 24 }, { 1, 20 }, { 13, 0 }, { 1, 61 }, { 1, 253 }, { 2, 255 }, { 1, 221 }, { 1, 22 }, { 1, 12 }, { 1, 186 }, { 8, 255 }, { 1, 35 }, { 48, 0 }, { 1, 27 }, { 13, 0 }, { 1, 12 }, { 1, 222 }, { 2, 255 }, { 1, 236 }, { 1, 38 }, { 1, 23 }, { 1, 205 }, { 9, 255 }, { 1, 78 }, { 47, 0 }, { 1, 6 }, { 1, 2 }, { 13, 0 }, { 1, 154 }, { 2, 255 }, { 1, 247 }, { 1, 58 }, { 1, 37 }, { 1, 222 }, { 10, 255 }, { 1, 120 }, { 61, 0 }, { 1, 74 }, { 2, 255 }, { 1, 253 }, { 1, 82 }, { 1, 55 }, { 1, 235 }, { 11, 255 }, { 1, 162 }, { 60, 0 }, { 1, 19 }, { 1, 230 }, { 2, 255 }, { 1, 110 }, { 1, 75 }, { 1, 245 }, { 12, 255 }, { 1, 205 }, { 60, 0 }, { 1, 169 }, { 2, 255 }, { 1, 180 }, { 1, 103 }, { 1, 251 }, { 13, 255 }, { 1, 242 }, { 59, 0 }, { 1, 89 }, { 19, 255 }, { 1, 232 }, { 58, 0 }, { 1, 26 }, { 1, 238 }, { 19, 255 }, { 1, 87 }, { 58, 0 }, { 1, 183 }, { 18, 255 }, { 1, 233 }, { 1, 78 }, { 58, 0 }, { 1, 104 }, { 16, 255 }, { 1, 243 }, { 1, 176 }, { 1, 98 }, { 1, 8 }, { 58, 0 }, { 1, 35 }, { 1, 244 }, { 13, 255 }, { 1, 209 }, { 1, 136 }, { 1, 64 }, { 1, 6 }, { 60, 0 }, { 1, 2 }, { 1, 196 }, { 10, 255 }, { 1, 238 }, { 1, 169 }, { 1, 97 }, { 1, 26 }, { 64, 0 }, { 1, 119 }, { 7, 255 }, { 1, 253 }, { 1, 201 }, { 1, 129 }, { 1, 57 }, { 1, 3 }, { 66, 0 }, { 1, 39 }, { 1, 249 }, { 4, 255 }, { 1, 232 }, { 1, 161 }, { 1, 89 }, { 1, 20 }, { 70, 0 }, { 1, 139 }, { 1, 255 }, { 1, 251 }, { 1, 193 }, { 1, 121 }, { 1, 49 }, { 1, 1 }, { 31, 0 }, { 1, 7 }, { 41, 0 }, { 1, 23 }, { 1, 62 }, { 1, 14 }, { 33, 0 }, { 1, 18 }, { 1, 24 }, { 1, 1 }, { 75, 0 }, { 1, 16 }, { 1, 46 }, { 1, 22 }, { 75, 0 }, { 1, 10 }, { 1, 46 }, { 1, 53 }, { 1, 11 }, { 74, 0 }, { 1, 2 }, { 1, 33 }, { 1, 60 }, { 1, 35 }, { 1, 2 }, { 74, 0 }, { 1, 19 }, { 1, 55 }, { 1, 51 }, { 1, 13 }, { 74, 0 }, { 1, 5 }, { 1, 43 }, { 1, 61 }, { 1, 30 }, { 1, 1 }, { 74, 0 }, { 1, 15 }, { 1, 55 }, { 1, 40 }, { 1, 9 }, { 75, 0 }, { 1, 29 }, { 1, 38 }, { 1, 9 }, { 75, 0 }, { 1, 4 }, { 1, 22 }, { 1, 8 }, { 77, 0 }, { 1, 2 }, { 1234, 0 } }, 
+	LogoRLEFrame{ { 1649, 0 }, { 1, 23 }, { 1, 2 }, { 77, 0 }, { 1, 33 }, { 1, 24 }, { 77, 0 }, { 1, 33 }, { 1, 48 }, { 56, 0 }, { 2, 2 }, { 15, 0 }, { 1, 17 }, { 3, 0 }, { 1, 24 }, { 1, 59 }, { 1, 9 }, { 56, 0 }, { 1, 18 }, { 15, 0 }, { 1, 152 }, { 1, 255 }, { 1, 98 }, { 1, 0 }, { 1, 15 }, { 1, 61 }, { 1, 19 }, { 56, 0 }, { 1, 12 }, { 1, 20 }, { 14, 0 }, { 1, 98 }, { 2, 255 }, { 1, 169 }, { 1, 5 }, { 1, 58 }, { 1, 32 }, { 57, 0 }, { 1, 45 }, { 1, 1 }, { 13, 0 }, { 1, 24 }, { 1, 239 }, { 2, 255 }, { 1, 216 }, { 1, 43 }, { 1, 39 }, { 57, 0 }, { 1, 29 }, { 1, 33 }, { 14, 0 }, { 1, 173 }, { 3, 255 }, { 1, 250 }, { 1, 36 }, { 57, 0 }, { 1, 8 }, { 1, 59 }, { 1, 8 }, { 13, 0 }, { 1, 82 }, { 5, 255 }, { 1, 2 }, { 57, 0 }, { 1, 41 }, { 1, 39 }, { 13, 0 }, { 1, 16 }, { 1, 230 }, { 5, 255 }, { 1, 7 }, { 56, 0 }, { 1, 12 }, { 1, 61 }, { 1, 7 }, { 13, 0 }, { 1, 156 }, { 5, 255 }, { 1, 198 }, { 57, 0 }, { 1, 47 }, { 1, 36 }, { 13, 0 }, { 1, 66 }, { 6, 255 }, { 1, 85 }, { 56, 0 }, { 1, 18 }, { 1, 60 }, { 1, 6 }, { 12, 0 }, { 1, 10 }, { 1, 221 }, { 5, 255 }, { 1, 152 }, { 57, 0 }, { 1, 52 }, { 1, 34 }, { 13, 0 }, { 1, 140 }, { 5, 255 }, { 1, 192 }, { 1, 6 }, { 56, 0 }, { 1, 19 }, { 1, 57 }, { 1, 4 }, { 12, 0 }, { 1, 52 }, { 1, 252 }, { 4, 255 }, { 1, 216 }, { 1, 17 }, { 57, 0 }, { 1, 46 }, { 1, 22 }, { 12, 0 }, { 1, 5 }, { 1, 209 }, { 4, 255 }, { 1, 235 }, { 1, 35 }, { 3, 0 }, { 1, 23 }, { 1, 7 }, { 52, 0 }, { 1, 10 }, { 1, 46 }, { 13, 0 }, { 1, 123 }, { 4, 255 }, { 1, 247 }, { 1, 58 }, { 2, 0 }, { 1, 48 }, { 1, 206 }, { 1, 255 }, { 1, 246 }, { 1, 77 }, { 51, 0 }, { 1, 33 }, { 1, 7 }, { 12, 0 }, { 1, 40 }, { 1, 248 }, { 4, 255 }, { 1, 87 }, { 2, 0 }, { 1, 73 }, { 1, 244 }, { 3, 255 }, { 1, 173 }, { 50, 0 }, { 1, 4 }, { 1, 18 }, { 12, 0 }, { 1, 1 }, { 1, 196 }, { 4, 255 }, { 1, 121 }, { 2, 0 }, { 1, 100 }, { 1, 251 }, { 4, 255 }, { 1, 233 }, { 50, 0 }, { 1, 5 }, { 13, 0 }, { 1, 107 }, { 4, 255 }, { 1, 157 }, { 2, 0 }, { 1, 131 }, { 7, 255 }, { 1, 36 }, { 62, 0 }, { 1, 29 }, { 1, 242 }, { 3, 255 }, { 1, 188 }, { 2, 5 }, { 1, 160 }, { 8, 255 }, { 1, 95 }, { 62, 0 }, { 1, 181 }, { 3, 255 }, { 1, 213 }, { 1, 15 }, { 1, 14 }, { 1, 187 }, { 9, 255 }, { 1, 154 }, { 61, 0 }, { 1, 90 }, { 3, 255 }, { 1, 232 }, { 1, 32 }, { 1, 27 }, { 1, 209 }, { 10, 255 }, { 1, 214 }, { 60, 0 }, { 1, 20 }, { 1, 235 }, { 2, 255 }, { 1, 246 }, { 1, 54 }, { 1, 44 }, { 1, 227 }, { 12, 255 }, { 1, 18 }, { 59, 0 }, { 1, 165 }, { 3, 255 }, { 1, 82 }, { 1, 65 }, { 1, 240 }, { 13, 255 }, { 1, 76 }, { 58, 0 }, { 1, 74 }, { 3, 255 }, { 1, 166 }, { 1, 94 }, { 1, 249 }, { 14, 255 }, { 1, 134 }, { 57, 0 }, { 1, 13 }, { 1, 226 }, { 20, 255 }, { 1, 165 }, { 57, 0 }, { 1, 148 }, { 21, 255 }, { 1, 89 }, { 56, 0 }, { 1, 60 }, { 21, 255 }, { 1, 137 }, { 56, 0 }, { 1, 7 }, { 1, 215 }, { 18, 255 }, { 1, 252 }, { 1, 185 }, { 1, 68 }, { 57, 0 }, { 1, 132 }, { 15, 255 }, { 1, 253 }, { 1, 205 }, { 1, 140 }, { 1, 75 }, { 1, 14 }, { 58, 0 }, { 1, 46 }, { 1, 250 }, { 12, 255 }, { 1, 209 }, { 1, 144 }, { 1, 79 }, { 1, 17 }, { 61, 0 }, { 1, 3 }, { 1, 203 }, { 9, 255 }, { 1, 212 }, { 1, 148 }, { 1, 83 }, { 1, 20 }, { 26, 0 }, { 1, 1 }, { 38, 0 }, { 1, 105 }, { 6, 255 }, { 1, 216 }, { 1, 151 }, { 1, 86 }, { 1, 22 }, { 28, 0 }, { 1, 5 }, { 1, 21 }, { 1, 4 }, { 38, 0 }, { 1, 183 }, { 2, 255 }, { 1, 220 }, { 1, 155 }, { 1, 90 }, { 1, 26 }, { 30, 0 }, { 1, 3 }, { 1, 32 }, { 1, 33 }, { 1, 1 }, { 39, 0 }, { 1, 33 }, { 1, 74 }, { 1, 29 }, { 32, 0 }, { 1, 1 }, { 1, 29 }, { 1, 56 }, { 1, 22 }, { 75, 0 }, { 1, 17 }, { 1, 53 }, { 1, 50 }, { 1, 10 }, { 74, 0 }, { 1, 6 }, { 1, 42 }, { 1, 60 }, { 1, 28 }, { 75, 0 }, { 1, 28 }, { 1, 59 }, { 1, 45 }, { 1, 8 }, { 74, 0 }, { 1, 6 }, { 1, 46 }, { 1, 55 }, { 1, 22 }, { 75, 0 }, { 1, 16 }, { 1, 49 }, { 1, 24 }, { 1, 1 }, { 75, 0 }, { 2, 23 }, { 77, 0 }, { 1, 8 }, { 1391, 0 } }, 
+	LogoRLEFrame{ { 1411, 0 }, { 1, 8 }, { 1, 2 }, { 77, 0 }, { 1, 11 }, { 1, 33 }, { 77, 0 }, { 1, 13 }, { 1, 55 }, { 1, 5 }, { 55, 0 }, { 1, 6 }, { 20, 0 }, { 1, 7 }, { 1, 57 }, { 1, 24 }, { 56, 0 }, { 1, 21 }, { 19, 0 }, { 1, 3 }, { 1, 51 }, { 1, 39 }, { 56, 0 }, { 1, 27 }, { 1, 9 }, { 19, 0 }, { 1, 44 }, { 1, 50 }, { 1, 1 }, { 55, 0 }, { 1, 7 }, { 1, 43 }, { 15, 0 }, { 1, 8 }, { 3, 0 }, { 1, 26 }, { 1, 57 }, { 1, 7 }, { 56, 0 }, { 1, 45 }, { 1, 20 }, { 13, 0 }, { 1, 15 }, { 1, 200 }, { 1, 249 }, { 1, 54 }, { 1, 0 }, { 1, 7 }, { 1, 52 }, { 1, 9 }, { 56, 0 }, { 1, 21 }, { 1, 55 }, { 14, 0 }, { 1, 158 }, { 2, 255 }, { 1, 150 }, { 1, 0 }, { 1, 36 }, { 1, 7 }, { 56, 0 }, { 1, 1 }, { 1, 54 }, { 1, 24 }, { 13, 0 }, { 1, 55 }, { 3, 255 }, { 1, 216 }, { 1, 13 }, { 1, 5 }, { 57, 0 }, { 1, 27 }, { 1, 53 }, { 13, 0 }, { 1, 2 }, { 1, 203 }, { 4, 255 }, { 1, 25 }, { 57, 0 }, { 1, 3 }, { 1, 58 }, { 1, 22 }, { 13, 0 }, { 1, 100 }, { 5, 255 }, { 1, 60 }, { 57, 0 }, { 1, 33 }, { 1, 51 }, { 13, 0 }, { 1, 17 }, { 1, 235 }, { 5, 255 }, { 1, 88 }, { 56, 0 }, { 1, 6 }, { 1, 60 }, { 1, 19 }, { 13, 0 }, { 1, 147 }, { 6, 255 }, { 1, 109 }, { 56, 0 }, { 1, 32 }, { 1, 45 }, { 13, 0 }, { 1, 46 }, { 1, 252 }, { 6, 255 }, { 1, 54 }, { 55, 0 }, { 1, 1 }, { 1, 55 }, { 1, 8 }, { 13, 0 }, { 1, 193 }, { 6, 255 }, { 1, 211 }, { 1, 1 }, { 55, 0 }, { 1, 23 }, { 1, 29 }, { 13, 0 }, { 1, 90 }, { 6, 255 }, { 1, 251 }, { 1, 50 }, { 56, 0 }, { 1, 36 }, { 13, 0 }, { 1, 12 }, { 1, 229 }, { 6, 255 }, { 1, 106 }, { 56, 0 }, { 1, 11 }, { 1, 7 }, { 13, 0 }, { 1, 137 }, { 6, 255 }, { 1, 148 }, { 57, 0 }, { 1, 2 }, { 13, 0 }, { 1, 38 }, { 1, 249 }, { 5, 255 }, { 1, 187 }, { 1, 4 }, { 71, 0 }, { 1, 183 }, { 5, 255 }, { 1, 217 }, { 1, 16 }, { 2, 0 }, { 1, 4 }, { 1, 109 }, { 1, 172 }, { 1, 145 }, { 1, 26 }, { 64, 0 }, { 1, 79 }, { 5, 255 }, { 1, 238 }, { 1, 37 }, { 2, 0 }, { 1, 22 }, { 1, 199 }, { 3, 255 }, { 1, 194 }, { 63, 0 }, { 1, 8 }, { 1, 222 }, { 4, 255 }, { 1, 251 }, { 1, 67 }, { 2, 0 }, { 1, 41 }, { 1, 222 }, { 4, 255 }, { 1, 253 }, { 1, 22 }, { 62, 0 }, { 1, 126 }, { 5, 255 }, { 1, 106 }, { 2, 0 }, { 1, 67 }, { 1, 240 }, { 6, 255 }, { 1, 100 }, { 61, 0 }, { 1, 31 }, { 1, 246 }, { 4, 255 }, { 1, 148 }, { 2, 0 }, { 1, 99 }, { 1, 250 }, { 7, 255 }, { 1, 181 }, { 61, 0 }, { 1, 173 }, { 4, 255 }, { 1, 187 }, { 1, 4 }, { 1, 1 }, { 1, 136 }, { 9, 255 }, { 1, 249 }, { 1, 13 }, { 59, 0 }, { 1, 69 }, { 4, 255 }, { 1, 217 }, { 1, 16 }, { 1, 9 }, { 1, 171 }, { 11, 255 }, { 1, 87 }, { 58, 0 }, { 1, 5 }, { 1, 215 }, { 3, 255 }, { 1, 238 }, { 1, 37 }, { 1, 22 }, { 1, 200 }, { 12, 255 }, { 1, 168 }, { 58, 0 }, { 1, 115 }, { 3, 255 }, { 1, 251 }, { 1, 67 }, { 1, 42 }, { 1, 223 }, { 13, 255 }, { 1, 242 }, { 1, 7 }, { 56, 0 }, { 1, 24 }, { 1, 242 }, { 3, 255 }, { 1, 173 }, { 1, 72 }, { 1, 240 }, { 15, 255 }, { 1, 74 }, { 56, 0 }, { 1, 162 }, { 22, 255 }, { 1, 144 }, { 55, 0 }, { 1, 59 }, { 23, 255 }, { 1, 164 }, { 54, 0 }, { 1, 2 }, { 1, 206 }, { 22, 255 }, { 1, 251 }, { 1, 54 }, { 54, 0 }, { 1, 105 }, { 22, 255 }, { 1, 236 }, { 1, 69 }, { 54, 0 }, { 1, 19 }, { 1, 237 }, { 19, 255 }, { 1, 224 }, { 1, 168 }, { 1, 98 }, { 1, 9 }, { 16, 0 }, { 1, 12 }, { 1, 4 }, { 37, 0 }, { 1, 151 }, { 15, 255 }, { 1, 243 }, { 1, 190 }, { 1, 134 }, { 1, 79 }, { 1, 24 }, { 18, 0 }, { 1, 15 }, { 1, 34 }, { 1, 7 }, { 37, 0 }, { 1, 49 }, { 1, 253 }, { 10, 255 }, { 1, 253 }, { 1, 211 }, { 1, 155 }, { 1, 100 }, { 1, 45 }, { 1, 2 }, { 20, 0 }, { 1, 13 }, { 1, 46 }, { 1, 37 }, { 1, 1 }, { 38, 0 }, { 1, 179 }, { 7, 255 }, { 1, 232 }, { 1, 177 }, { 1, 121 }, { 1, 66 }, { 1, 13 }, { 4, 0 }, { 1, 2 }, { 1, 8 }, { 17, 0 }, { 1, 5 }, { 1, 39 }, { 1, 59 }, { 1, 23 }, { 40, 0 }, { 1, 223 }, { 2, 255 }, { 1, 248 }, { 1, 198 }, { 1, 142 }, { 1, 87 }, { 1, 32 }, { 8, 0 }, { 1, 9 }, { 1, 20 }, { 17, 0 }, { 1, 26 }, { 1, 59 }, { 1, 43 }, { 1, 6 }, { 41, 0 }, { 1, 39 }, { 1, 88 }, { 1, 53 }, { 1, 6 }, { 11, 0 }, { 1, 21 }, { 1, 25 }, { 16, 0 }, { 1, 13 }, { 1, 50 }, { 1, 56 }, { 1, 20 }, { 56, 0 }, { 1, 5 }, { 1, 32 }, { 1, 26 }, { 16, 0 }, { 1, 32 }, { 1, 62 }, { 1, 38 }, { 1, 3 }, { 56, 0 }, { 1, 10 }, { 1, 38 }, { 1, 24 }, { 15, 0 }, { 1, 6 }, { 1, 47 }, { 1, 41 }, { 1, 11 }, { 57, 0 }, { 1, 17 }, { 1, 40 }, { 1, 18 }, { 15, 0 }, { 1, 17 }, { 1, 35 }, { 1, 10 }, { 58, 0 }, { 1, 24 }, { 1, 40 }, { 1, 12 }, { 15, 0 }, { 1, 11 }, { 1, 9 }, { 58, 0 }, { 1, 1 }, { 1, 31 }, { 1, 37 }, { 1, 8 }, { 75, 0 }, { 1, 2 }, { 1, 32 }, { 1, 31 }, { 1, 4 }, { 75, 0 }, { 1, 2 }, { 1, 31 }, { 1, 20 }, { 76, 0 }, { 1, 2 }, { 1, 25 }, { 1, 9 }, { 76, 0 }, { 1, 1 }, { 1, 11 }, { 1171, 0 } }, 
+	LogoRLEFrame{ { 1174, 0 }, { 1, 1 }, { 78, 0 }, { 1, 29 }, { 77, 0 }, { 1, 1 }, { 1, 43 }, { 1, 17 }, { 55, 0 }, { 1, 11 }, { 21, 0 }, { 1, 43 }, { 1, 42 }, { 55, 0 }, { 1, 7 }, { 1, 18 }, { 20, 0 }, { 1, 33 }, { 1, 54 }, { 1, 4 }, { 55, 0 }, { 1, 38 }, { 1, 1 }, { 19, 0 }, { 1, 24 }, { 1, 60 }, { 1, 12 }, { 55, 0 }, { 1, 21 }, { 1, 33 }, { 19, 0 }, { 1, 11 }, { 1, 61 }, { 1, 23 }, { 55, 0 }, { 1, 4 }, { 1, 57 }, { 1, 8 }, { 19, 0 }, { 1, 50 }, { 1, 29 }, { 56, 0 }, { 1, 36 }, { 1, 42 }, { 19, 0 }, { 1, 29 }, { 1, 25 }, { 56, 0 }, { 1, 9 }, { 1, 61 }, { 1, 10 }, { 13, 0 }, { 1, 44 }, { 1, 19 }, { 3, 0 }, { 1, 9 }, { 1, 20 }, { 57, 0 }, { 1, 42 }, { 1, 40 }, { 13, 0 }, { 1, 125 }, { 1, 255 }, { 1, 232 }, { 1, 19 }, { 2, 0 }, { 1, 5 }, { 57, 0 }, { 1, 14 }, { 1, 61 }, { 1, 9 }, { 12, 0 }, { 1, 38 }, { 1, 251 }, { 2, 255 }, { 1, 107 }, { 60, 0 }, { 1, 48 }, { 1, 38 }, { 13, 0 }, { 1, 170 }, { 3, 255 }, { 1, 191 }, { 59, 0 }, { 1, 17 }, { 1, 60 }, { 1, 7 }, { 12, 0 }, { 1, 51 }, { 4, 255 }, { 1, 252 }, { 1, 22 }, { 58, 0 }, { 1, 45 }, { 1, 30 }, { 13, 0 }, { 1, 186 }, { 5, 255 }, { 1, 85 }, { 57, 0 }, { 1, 9 }, { 1, 52 }, { 1, 1 }, { 12, 0 }, { 1, 66 }, { 6, 255 }, { 1, 132 }, { 57, 0 }, { 1, 35 }, { 1, 14 }, { 13, 0 }, { 1, 202 }, { 6, 255 }, { 1, 180 }, { 56, 0 }, { 1, 3 }, { 1, 29 }, { 13, 0 }, { 1, 83 }, { 7, 255 }, { 1, 210 }, { 56, 0 }, { 1, 14 }, { 13, 0 }, { 1, 3 }, { 1, 216 }, { 7, 255 }, { 1, 167 }, { 70, 0 }, { 1, 99 }, { 8, 255 }, { 1, 86 }, { 69, 0 }, { 1, 8 }, { 1, 227 }, { 7, 255 }, { 1, 192 }, { 70, 0 }, { 1, 116 }, { 7, 255 }, { 1, 235 }, { 1, 31 }, { 69, 0 }, { 1, 15 }, { 1, 237 }, { 6, 255 }, { 1, 251 }, { 1, 66 }, { 70, 0 }, { 1, 132 }, { 7, 255 }, { 1, 112 }, { 70, 0 }, { 1, 24 }, { 1, 244 }, { 6, 255 }, { 1, 163 }, { 4, 0 }, { 1, 7 }, { 1, 45 }, { 1, 27 }, { 64, 0 }, { 1, 149 }, { 6, 255 }, { 1, 205 }, { 1, 9 }, { 3, 0 }, { 1, 81 }, { 1, 231 }, { 2, 255 }, { 1, 173 }, { 1, 2 }, { 61, 0 }, { 1, 35 }, { 1, 250 }, { 5, 255 }, { 1, 234 }, { 1, 30 }, { 2, 0 }, { 1, 1 }, { 1, 129 }, { 5, 255 }, { 1, 76 }, { 61, 0 }, { 1, 165 }, { 5, 255 }, { 1, 251 }, { 1, 64 }, { 2, 0 }, { 1, 11 }, { 1, 173 }, { 6, 255 }, { 1, 184 }, { 60, 0 }, { 1, 47 }, { 6, 255 }, { 1, 110 }, { 2, 0 }, { 1, 31 }, { 1, 208 }, { 8, 255 }, { 1, 37 }, { 59, 0 }, { 1, 181 }, { 5, 255 }, { 1, 161 }, { 2, 0 }, { 1, 60 }, { 1, 234 }, { 9, 255 }, { 1, 143 }, { 58, 0 }, { 1, 62 }, { 5, 255 }, { 1, 204 }, { 1, 8 }, { 1, 0 }, { 1, 99 }, { 1, 249 }, { 10, 255 }, { 1, 240 }, { 1, 11 }, { 57, 0 }, { 1, 198 }, { 4, 255 }, { 1, 233 }, { 1, 29 }, { 1, 3 }, { 1, 145 }, { 13, 255 }, { 1, 102 }, { 56, 0 }, { 1, 78 }, { 4, 255 }, { 1, 251 }, { 1, 63 }, { 1, 17 }, { 1, 186 }, { 14, 255 }, { 1, 210 }, { 55, 0 }, { 1, 2 }, { 1, 212 }, { 4, 255 }, { 1, 209 }, { 1, 49 }, { 1, 218 }, { 16, 255 }, { 1, 61 }, { 54, 0 }, { 1, 95 }, { 24, 255 }, { 1, 169 }, { 53, 0 }, { 1, 7 }, { 1, 224 }, { 24, 255 }, { 1, 250 }, { 1, 12 }, { 14, 0 }, { 1, 3 }, { 1, 2 }, { 36, 0 }, { 1, 111 }, { 25, 255 }, { 1, 237 }, { 1, 8 }, { 12, 0 }, { 1, 3 }, { 1, 26 }, { 1, 13 }, { 36, 0 }, { 1, 13 }, { 1, 234 }, { 25, 255 }, { 1, 109 }, { 11, 0 }, { 1, 2 }, { 1, 29 }, { 1, 45 }, { 1, 7 }, { 37, 0 }, { 1, 128 }, { 24, 255 }, { 1, 222 }, { 1, 92 }, { 11, 0 }, { 1, 24 }, { 1, 57 }, { 1, 37 }, { 1, 1 }, { 37, 0 }, { 1, 21 }, { 1, 243 }, { 19, 255 }, { 1, 240 }, { 1, 195 }, { 1, 150 }, { 1, 105 }, { 1, 57 }, { 1, 1 }, { 10, 0 }, { 1, 11 }, { 1, 48 }, { 1, 55 }, { 1, 18 }, { 39, 0 }, { 1, 144 }, { 14, 255 }, { 1, 250 }, { 1, 211 }, { 1, 183 }, { 1, 139 }, { 1, 74 }, { 1, 29 }, { 14, 0 }, { 1, 3 }, { 1, 35 }, { 1, 61 }, { 1, 36 }, { 1, 3 }, { 39, 0 }, { 1, 2 }, { 1, 239 }, { 9, 255 }, { 1, 225 }, { 1, 180 }, { 1, 134 }, { 1, 89 }, { 1, 44 }, { 1, 23 }, { 1, 59 }, { 1, 31 }, { 16, 0 }, { 1, 18 }, { 1, 56 }, { 1, 52 }, { 1, 14 }, { 41, 0 }, { 1, 3 }, { 1, 231 }, { 3, 255 }, { 1, 240 }, { 1, 195 }, { 1, 149 }, { 1, 104 }, { 1, 59 }, { 1, 15 }, { 4, 0 }, { 1, 31 }, { 1, 61 }, { 1, 22 }, { 15, 0 }, { 1, 1 }, { 1, 34 }, { 1, 56 }, { 1, 27 }, { 1, 1 }, { 43, 0 }, { 1, 30 }, { 1, 92 }, { 1, 74 }, { 1, 29 }, { 8, 0 }, { 1, 2 }, { 1, 42 }, { 1, 58 }, { 1, 15 }, { 15, 0 }, { 1, 7 }, { 1, 42 }, { 1, 26 }, { 1, 1 }, { 56, 0 }, { 1, 2 }, { 1, 47 }, { 1, 52 }, { 1, 9 }, { 15, 0 }, { 1, 12 }, { 1, 21 }, { 1, 1 }, { 57, 0 }, { 1, 2 }, { 1, 47 }, { 1, 38 }, { 1, 2 }, { 16, 0 }, { 1, 1 }, { 58, 0 }, { 1, 3 }, { 1, 44 }, { 1, 21 }, { 76, 0 }, { 1, 3 }, { 1, 27 }, { 1, 5 }, { 77, 0 }, { 1, 4 }, { 1407, 0 } }, 
+	LogoRLEFrame{ { 1015, 0 }, { 1, 6 }, { 1, 1 }, { 54, 0 }, { 1, 1 }, { 22, 0 }, { 1, 9 }, { 1, 14 }, { 55, 0 }, { 1, 14 }, { 21, 0 }, { 1, 10 }, { 1, 26 }, { 1, 1 }, { 54, 0 }, { 1, 19 }, { 1, 9 }, { 20, 0 }, { 1, 7 }, { 1, 29 }, { 1, 8 }, { 54, 0 }, { 1, 3 }, { 1, 39 }, { 20, 0 }, { 1, 3 }, { 1, 28 }, { 1, 14 }, { 55, 0 }, { 1, 38 }, { 1, 20 }, { 19, 0 }, { 1, 1 }, { 1, 25 }, { 1, 21 }, { 55, 0 }, { 1, 15 }, { 1, 56 }, { 20, 0 }, { 1, 17 }, { 1, 24 }, { 1, 1 }, { 55, 0 }, { 1, 50 }, { 1, 28 }, { 19, 0 }, { 1, 6 }, { 1, 23 }, { 1, 1 }, { 55, 0 }, { 1, 22 }, { 1, 56 }, { 1, 2 }, { 19, 0 }, { 1, 17 }, { 1, 1 }, { 55, 0 }, { 1, 1 }, { 1, 55 }, { 1, 26 }, { 19, 0 }, { 1, 6 }, { 57, 0 }, { 1, 29 }, { 1, 55 }, { 1, 1 }, { 76, 0 }, { 1, 4 }, { 1, 58 }, { 1, 23 }, { 11, 0 }, { 1, 53 }, { 1, 218 }, { 1, 196 }, { 1, 20 }, { 62, 0 }, { 1, 31 }, { 1, 51 }, { 11, 0 }, { 1, 2 }, { 1, 217 }, { 2, 255 }, { 1, 155 }, { 61, 0 }, { 1, 1 }, { 1, 56 }, { 1, 14 }, { 11, 0 }, { 1, 87 }, { 3, 255 }, { 1, 243 }, { 1, 12 }, { 60, 0 }, { 1, 22 }, { 1, 37 }, { 12, 0 }, { 1, 207 }, { 4, 255 }, { 1, 99 }, { 60, 0 }, { 1, 42 }, { 1, 4 }, { 11, 0 }, { 1, 73 }, { 5, 255 }, { 1, 198 }, { 59, 0 }, { 1, 13 }, { 1, 15 }, { 12, 0 }, { 1, 194 }, { 6, 255 }, { 1, 20 }, { 58, 0 }, { 1, 10 }, { 12, 0 }, { 1, 59 }, { 7, 255 }, { 1, 82 }, { 71, 0 }, { 1, 180 }, { 7, 255 }, { 1, 146 }, { 70, 0 }, { 1, 47 }, { 8, 255 }, { 1, 206 }, { 70, 0 }, { 1, 167 }, { 8, 255 }, { 1, 198 }, { 69, 0 }, { 1, 35 }, { 1, 252 }, { 8, 255 }, { 1, 162 }, { 69, 0 }, { 1, 153 }, { 9, 255 }, { 1, 53 }, { 68, 0 }, { 1, 25 }, { 1, 248 }, { 8, 255 }, { 1, 167 }, { 69, 0 }, { 1, 139 }, { 8, 255 }, { 1, 218 }, { 1, 14 }, { 68, 0 }, { 1, 17 }, { 1, 243 }, { 7, 255 }, { 1, 246 }, { 1, 46 }, { 69, 0 }, { 1, 126 }, { 8, 255 }, { 1, 95 }, { 69, 0 }, { 1, 11 }, { 1, 236 }, { 7, 255 }, { 1, 154 }, { 5, 0 }, { 1, 20 }, { 1, 50 }, { 1, 15 }, { 62, 0 }, { 1, 112 }, { 7, 255 }, { 1, 204 }, { 1, 7 }, { 3, 0 }, { 1, 8 }, { 1, 144 }, { 1, 252 }, { 1, 255 }, { 1, 253 }, { 1, 148 }, { 60, 0 }, { 1, 6 }, { 1, 227 }, { 6, 255 }, { 1, 238 }, { 1, 33 }, { 3, 0 }, { 1, 31 }, { 1, 204 }, { 5, 255 }, { 1, 83 }, { 59, 0 }, { 1, 98 }, { 7, 255 }, { 1, 76 }, { 3, 0 }, { 1, 69 }, { 1, 236 }, { 6, 255 }, { 1, 215 }, { 1, 3 }, { 57, 0 }, { 1, 2 }, { 1, 217 }, { 6, 255 }, { 1, 133 }, { 2, 0 }, { 1, 1 }, { 1, 121 }, { 1, 253 }, { 8, 255 }, { 1, 97 }, { 57, 0 }, { 1, 85 }, { 6, 255 }, { 1, 189 }, { 1, 3 }, { 1, 0 }, { 1, 14 }, { 1, 175 }, { 10, 255 }, { 1, 225 }, { 1, 7 }, { 56, 0 }, { 1, 205 }, { 5, 255 }, { 1, 229 }, { 1, 22 }, { 1, 0 }, { 1, 42 }, { 1, 217 }, { 12, 255 }, { 1, 111 }, { 55, 0 }, { 1, 71 }, { 5, 255 }, { 1, 251 }, { 1, 59 }, { 1, 0 }, { 1, 86 }, { 1, 243 }, { 13, 255 }, { 1, 234 }, { 1, 12 }, { 54, 0 }, { 1, 192 }, { 5, 255 }, { 1, 150 }, { 1, 4 }, { 1, 141 }, { 16, 255 }, { 1, 125 }, { 53, 0 }, { 1, 58 }, { 6, 255 }, { 1, 228 }, { 1, 202 }, { 17, 255 }, { 1, 241 }, { 1, 19 }, { 52, 0 }, { 1, 179 }, { 26, 255 }, { 1, 140 }, { 51, 0 }, { 1, 45 }, { 27, 255 }, { 1, 245 }, { 1, 13 }, { 50, 0 }, { 1, 165 }, { 28, 255 }, { 1, 25 }, { 49, 0 }, { 1, 34 }, { 1, 252 }, { 27, 255 }, { 1, 179 }, { 50, 0 }, { 1, 151 }, { 27, 255 }, { 1, 170 }, { 1, 11 }, { 49, 0 }, { 1, 24 }, { 1, 248 }, { 21, 255 }, { 1, 248 }, { 1, 214 }, { 1, 178 }, { 1, 142 }, { 1, 105 }, { 1, 31 }, { 51, 0 }, { 1, 111 }, { 15, 255 }, { 1, 248 }, { 1, 219 }, { 1, 176 }, { 1, 139 }, { 1, 103 }, { 1, 67 }, { 1, 31 }, { 1, 2 }, { 56, 0 }, { 1, 127 }, { 8, 255 }, { 1, 245 }, { 1, 209 }, { 1, 173 }, { 1, 137 }, { 1, 101 }, { 1, 66 }, { 1, 69 }, { 1, 29 }, { 63, 0 }, { 1, 24 }, { 1, 184 }, { 1, 227 }, { 1, 207 }, { 1, 171 }, { 1, 134 }, { 1, 98 }, { 1, 62 }, { 1, 26 }, { 4, 0 }, { 1, 3 }, { 1, 36 }, { 1, 12 }, { 76, 0 }, { 1, 1 }, { 1, 15 }, { 1722, 0 } }, 
+	LogoRLEFrame{ { 833, 0 }, { 1, 1 }, { 78, 0 }, { 1, 1 }, { 1, 7 }, { 78, 0 }, { 1, 15 }, { 78, 0 }, { 1, 7 }, { 1, 16 }, { 78, 0 }, { 1, 25 }, { 1, 3 }, { 77, 0 }, { 1, 15 }, { 1, 22 }, { 77, 0 }, { 1, 3 }, { 1, 29 }, { 1, 6 }, { 77, 0 }, { 1, 18 }, { 1, 21 }, { 77, 0 }, { 1, 5 }, { 1, 30 }, { 1, 5 }, { 77, 0 }, { 1, 21 }, { 1, 20 }, { 77, 0 }, { 1, 7 }, { 1, 30 }, { 1, 4 }, { 77, 0 }, { 1, 22 }, { 1, 18 }, { 77, 0 }, { 1, 4 }, { 1, 27 }, { 1, 1 }, { 9, 0 }, { 1, 104 }, { 1, 242 }, { 1, 191 }, { 1, 15 }, { 64, 0 }, { 1, 17 }, { 1, 10 }, { 9, 0 }, { 1, 23 }, { 1, 249 }, { 2, 255 }, { 1, 156 }, { 63, 0 }, { 1, 1 }, { 1, 19 }, { 10, 0 }, { 1, 126 }, { 3, 255 }, { 1, 248 }, { 1, 22 }, { 62, 0 }, { 1, 9 }, { 1, 2 }, { 9, 0 }, { 1, 4 }, { 1, 229 }, { 4, 255 }, { 1, 125 }, { 62, 0 }, { 1, 3 }, { 10, 0 }, { 1, 86 }, { 5, 255 }, { 1, 230 }, { 1, 5 }, { 72, 0 }, { 1, 194 }, { 6, 255 }, { 1, 82 }, { 71, 0 }, { 1, 47 }, { 7, 255 }, { 1, 158 }, { 71, 0 }, { 1, 155 }, { 7, 255 }, { 1, 233 }, { 1, 1 }, { 69, 0 }, { 1, 17 }, { 1, 246 }, { 8, 255 }, { 1, 53 }, { 69, 0 }, { 1, 115 }, { 9, 255 }, { 1, 117 }, { 68, 0 }, { 1, 2 }, { 1, 221 }, { 9, 255 }, { 1, 114 }, { 68, 0 }, { 1, 76 }, { 10, 255 }, { 1, 90 }, { 68, 0 }, { 1, 184 }, { 9, 255 }, { 1, 236 }, { 1, 9 }, { 67, 0 }, { 1, 38 }, { 10, 255 }, { 1, 119 }, { 68, 0 }, { 1, 145 }, { 9, 255 }, { 1, 190 }, { 1, 2 }, { 51, 0 }, { 1, 7 }, { 1, 4 }, { 14, 0 }, { 1, 12 }, { 1, 241 }, { 8, 255 }, { 1, 234 }, { 1, 25 }, { 52, 0 }, { 1, 27 }, { 15, 0 }, { 1, 105 }, { 9, 255 }, { 1, 72 }, { 52, 0 }, { 1, 12 }, { 1, 29 }, { 15, 0 }, { 1, 213 }, { 8, 255 }, { 1, 138 }, { 53, 0 }, { 1, 31 }, { 1, 18 }, { 14, 0 }, { 1, 66 }, { 8, 255 }, { 1, 200 }, { 1, 5 }, { 4, 0 }, { 1, 27 }, { 1, 158 }, { 1, 209 }, { 1, 192 }, { 1, 113 }, { 1, 5 }, { 42, 0 }, { 1, 6 }, { 1, 41 }, { 1, 3 }, { 14, 0 }, { 1, 174 }, { 7, 255 }, { 1, 240 }, { 1, 32 }, { 4, 0 }, { 1, 80 }, { 1, 239 }, { 4, 255 }, { 1, 163 }, { 42, 0 }, { 1, 23 }, { 1, 29 }, { 14, 0 }, { 1, 30 }, { 1, 252 }, { 7, 255 }, { 1, 84 }, { 3, 0 }, { 1, 5 }, { 1, 142 }, { 7, 255 }, { 1, 68 }, { 40, 0 }, { 1, 1 }, { 1, 39 }, { 1, 14 }, { 14, 0 }, { 1, 134 }, { 7, 255 }, { 1, 150 }, { 3, 0 }, { 1, 31 }, { 1, 200 }, { 8, 255 }, { 1, 219 }, { 1, 8 }, { 2, 0 }, { 1, 4 }, { 36, 0 }, { 1, 10 }, { 1, 37 }, { 1, 1 }, { 13, 0 }, { 1, 8 }, { 1, 235 }, { 6, 255 }, { 1, 209 }, { 1, 8 }, { 2, 0 }, { 1, 77 }, { 1, 238 }, { 10, 255 }, { 1, 131 }, { 1, 8 }, { 1, 25 }, { 37, 0 }, { 1, 22 }, { 1, 15 }, { 14, 0 }, { 1, 95 }, { 6, 255 }, { 1, 244 }, { 1, 40 }, { 1, 0 }, { 1, 4 }, { 1, 139 }, { 12, 255 }, { 1, 250 }, { 1, 72 }, { 38, 0 }, { 1, 26 }, { 15, 0 }, { 1, 204 }, { 6, 255 }, { 1, 96 }, { 1, 0 }, { 1, 29 }, { 1, 197 }, { 14, 255 }, { 1, 195 }, { 1, 1 }, { 36, 0 }, { 1, 3 }, { 1, 11 }, { 14, 0 }, { 1, 56 }, { 6, 255 }, { 1, 228 }, { 1, 0 }, { 1, 74 }, { 1, 236 }, { 16, 255 }, { 1, 99 }, { 36, 0 }, { 1, 4 }, { 15, 0 }, { 1, 164 }, { 7, 255 }, { 1, 196 }, { 18, 255 }, { 1, 238 }, { 1, 22 }, { 50, 0 }, { 1, 23 }, { 1, 249 }, { 27, 255 }, { 1, 163 }, { 50, 0 }, { 1, 124 }, { 29, 255 }, { 1, 61 }, { 48, 0 }, { 1, 4 }, { 1, 228 }, { 29, 255 }, { 1, 154 }, { 48, 0 }, { 1, 85 }, { 30, 255 }, { 1, 112 }, { 48, 0 }, { 1, 193 }, { 29, 255 }, { 1, 204 }, { 1, 17 }, { 47, 0 }, { 1, 45 }, { 27, 255 }, { 1, 247 }, { 1, 205 }, { 1, 119 }, { 1, 11 }, { 48, 0 }, { 1, 107 }, { 19, 255 }, { 1, 231 }, { 1, 201 }, { 1, 171 }, { 1, 141 }, { 1, 111 }, { 1, 81 }, { 1, 51 }, { 1, 21 }, { 52, 0 }, { 1, 84 }, { 10, 255 }, { 1, 245 }, { 1, 215 }, { 1, 185 }, { 1, 155 }, { 1, 125 }, { 1, 95 }, { 1, 65 }, { 1, 35 }, { 1, 7 }, { 60, 0 }, { 1, 3 }, { 1, 140 }, { 1, 224 }, { 1, 228 }, { 1, 198 }, { 1, 168 }, { 1, 138 }, { 1, 108 }, { 1, 78 }, { 1, 48 }, { 1, 19 }, { 1805, 0 } }, 
+	LogoRLEFrame{ { 1717, 0 }, { 1, 74 }, { 1, 216 }, { 1, 178 }, { 1, 22 }, { 75, 0 }, { 1, 6 }, { 1, 234 }, { 2, 255 }, { 1, 190 }, { 75, 0 }, { 1, 84 }, { 4, 255 }, { 1, 62 }, { 74, 0 }, { 1, 182 }, { 4, 255 }, { 1, 182 }, { 73, 0 }, { 1, 28 }, { 1, 253 }, { 5, 255 }, { 1, 48 }, { 72, 0 }, { 1, 123 }, { 6, 255 }, { 1, 165 }, { 71, 0 }, { 1, 1 }, { 1, 220 }, { 6, 255 }, { 1, 247 }, { 1, 12 }, { 70, 0 }, { 1, 63 }, { 8, 255 }, { 1, 88 }, { 70, 0 }, { 1, 161 }, { 8, 255 }, { 1, 174 }, { 69, 0 }, { 1, 14 }, { 1, 245 }, { 8, 255 }, { 1, 247 }, { 1, 12 }, { 68, 0 }, { 1, 101 }, { 10, 255 }, { 1, 58 }, { 68, 0 }, { 1, 200 }, { 10, 255 }, { 1, 58 }, { 52, 0 }, { 1, 17 }, { 14, 0 }, { 1, 42 }, { 11, 255 }, { 1, 33 }, { 51, 0 }, { 1, 8 }, { 1, 31 }, { 14, 0 }, { 1, 140 }, { 10, 255 }, { 1, 191 }, { 52, 0 }, { 1, 42 }, { 1, 17 }, { 13, 0 }, { 1, 5 }, { 1, 233 }, { 10, 255 }, { 1, 68 }, { 51, 0 }, { 1, 9 }, { 1, 61 }, { 1, 3 }, { 13, 0 }, { 1, 80 }, { 10, 255 }, { 1, 142 }, { 52, 0 }, { 1, 34 }, { 1, 42 }, { 14, 0 }, { 1, 178 }, { 9, 255 }, { 1, 209 }, { 1, 7 }, { 51, 0 }, { 1, 1 }, { 1, 58 }, { 1, 19 }, { 13, 0 }, { 1, 25 }, { 1, 252 }, { 8, 255 }, { 1, 247 }, { 1, 43 }, { 52, 0 }, { 1, 22 }, { 1, 58 }, { 1, 1 }, { 13, 0 }, { 1, 118 }, { 9, 255 }, { 1, 108 }, { 53, 0 }, { 1, 41 }, { 1, 33 }, { 14, 0 }, { 1, 216 }, { 8, 255 }, { 1, 182 }, { 5, 0 }, { 1, 2 }, { 1, 102 }, { 1, 171 }, { 1, 174 }, { 1, 118 }, { 1, 13 }, { 7, 0 }, { 1, 4 }, { 1, 15 }, { 34, 0 }, { 1, 53 }, { 1, 3 }, { 13, 0 }, { 1, 59 }, { 8, 255 }, { 1, 233 }, { 1, 23 }, { 4, 0 }, { 1, 29 }, { 1, 194 }, { 4, 255 }, { 1, 226 }, { 1, 20 }, { 5, 0 }, { 1, 15 }, { 1, 32 }, { 34, 0 }, { 1, 13 }, { 1, 28 }, { 14, 0 }, { 1, 157 }, { 8, 255 }, { 1, 75 }, { 4, 0 }, { 1, 80 }, { 1, 237 }, { 6, 255 }, { 1, 175 }, { 3, 0 }, { 1, 1 }, { 1, 34 }, { 1, 39 }, { 35, 0 }, { 1, 22 }, { 1, 1 }, { 13, 0 }, { 1, 12 }, { 1, 243 }, { 7, 255 }, { 1, 148 }, { 3, 0 }, { 1, 8 }, { 1, 148 }, { 9, 255 }, { 1, 99 }, { 1, 0 }, { 1, 8 }, { 1, 50 }, { 1, 40 }, { 36, 0 }, { 1, 7 }, { 14, 0 }, { 1, 97 }, { 7, 255 }, { 1, 214 }, { 1, 9 }, { 2, 0 }, { 1, 40 }, { 1, 209 }, { 10, 255 }, { 1, 244 }, { 1, 48 }, { 1, 58 }, { 1, 35 }, { 52, 0 }, { 1, 195 }, { 6, 255 }, { 1, 249 }, { 1, 48 }, { 2, 0 }, { 1, 98 }, { 1, 245 }, { 12, 255 }, { 1, 212 }, { 1, 29 }, { 52, 0 }, { 1, 38 }, { 7, 255 }, { 1, 117 }, { 1, 0 }, { 1, 14 }, { 1, 167 }, { 15, 255 }, { 1, 128 }, { 52, 0 }, { 1, 135 }, { 7, 255 }, { 1, 58 }, { 1, 54 }, { 1, 221 }, { 16, 255 }, { 1, 252 }, { 1, 56 }, { 50, 0 }, { 1, 3 }, { 1, 230 }, { 7, 255 }, { 1, 242 }, { 1, 252 }, { 18, 255 }, { 1, 220 }, { 1, 12 }, { 49, 0 }, { 1, 76 }, { 29, 255 }, { 1, 156 }, { 49, 0 }, { 1, 174 }, { 30, 255 }, { 1, 75 }, { 47, 0 }, { 1, 22 }, { 1, 250 }, { 30, 255 }, { 1, 189 }, { 47, 0 }, { 1, 114 }, { 31, 255 }, { 1, 180 }, { 47, 0 }, { 1, 212 }, { 30, 255 }, { 1, 250 }, { 1, 73 }, { 46, 0 }, { 1, 48 }, { 29, 255 }, { 1, 252 }, { 1, 189 }, { 1, 67 }, { 47, 0 }, { 1, 82 }, { 20, 255 }, { 1, 251 }, { 1, 226 }, { 1, 200 }, { 1, 174 }, { 1, 147 }, { 1, 121 }, { 1, 95 }, { 1, 68 }, { 1, 42 }, { 1, 14 }, { 49, 0 }, { 1, 24 }, { 1, 248 }, { 10, 255 }, { 1, 233 }, { 1, 207 }, { 1, 180 }, { 1, 154 }, { 1, 128 }, { 1, 101 }, { 1, 75 }, { 1, 49 }, { 1, 23 }, { 1, 2 }, { 59, 0 }, { 1, 62 }, { 1, 187 }, { 1, 208 }, { 1, 187 }, { 1, 161 }, { 1, 135 }, { 1, 108 }, { 1, 82 }, { 1, 56 }, { 1, 29 }, { 1, 5 }, { 1804, 0 } }, 
+	LogoRLEFrame{ { 1717, 0 }, { 1, 16 }, { 1, 160 }, { 1, 162 }, { 1, 39 }, { 76, 0 }, { 1, 154 }, { 2, 255 }, { 1, 226 }, { 1, 19 }, { 74, 0 }, { 1, 9 }, { 1, 242 }, { 3, 255 }, { 1, 134 }, { 74, 0 }, { 1, 86 }, { 4, 255 }, { 1, 242 }, { 1, 18 }, { 73, 0 }, { 1, 177 }, { 5, 255 }, { 1, 132 }, { 72, 0 }, { 1, 18 }, { 1, 249 }, { 5, 255 }, { 1, 241 }, { 1, 17 }, { 71, 0 }, { 1, 102 }, { 7, 255 }, { 1, 115 }, { 71, 0 }, { 1, 193 }, { 7, 255 }, { 1, 206 }, { 54, 0 }, { 1, 2 }, { 1, 12 }, { 14, 0 }, { 1, 29 }, { 9, 255 }, { 1, 43 }, { 53, 0 }, { 1, 31 }, { 1, 6 }, { 14, 0 }, { 1, 118 }, { 9, 255 }, { 1, 134 }, { 52, 0 }, { 1, 6 }, { 1, 52 }, { 15, 0 }, { 1, 209 }, { 9, 255 }, { 1, 222 }, { 52, 0 }, { 1, 34 }, { 1, 39 }, { 14, 0 }, { 1, 44 }, { 10, 255 }, { 1, 250 }, { 51, 0 }, { 1, 1 }, { 1, 57 }, { 1, 17 }, { 14, 0 }, { 1, 135 }, { 11, 255 }, { 1, 3 }, { 50, 0 }, { 1, 22 }, { 1, 56 }, { 14, 0 }, { 1, 1 }, { 1, 224 }, { 10, 255 }, { 1, 205 }, { 51, 0 }, { 1, 47 }, { 1, 34 }, { 14, 0 }, { 1, 60 }, { 11, 255 }, { 1, 113 }, { 50, 0 }, { 1, 4 }, { 1, 61 }, { 1, 9 }, { 14, 0 }, { 1, 151 }, { 10, 255 }, { 1, 215 }, { 1, 8 }, { 19, 0 }, { 1, 5 }, { 30, 0 }, { 1, 21 }, { 1, 37 }, { 14, 0 }, { 1, 5 }, { 1, 236 }, { 9, 255 }, { 1, 251 }, { 1, 52 }, { 18, 0 }, { 1, 9 }, { 1, 27 }, { 31, 0 }, { 1, 35 }, { 1, 5 }, { 14, 0 }, { 1, 76 }, { 10, 255 }, { 1, 127 }, { 18, 0 }, { 1, 24 }, { 1, 37 }, { 32, 0 }, { 1, 24 }, { 15, 0 }, { 1, 167 }, { 9, 255 }, { 1, 203 }, { 1, 4 }, { 16, 0 }, { 1, 4 }, { 1, 43 }, { 1, 40 }, { 32, 0 }, { 1, 4 }, { 1, 2 }, { 14, 0 }, { 1, 12 }, { 1, 245 }, { 8, 255 }, { 1, 246 }, { 1, 40 }, { 16, 0 }, { 1, 11 }, { 1, 55 }, { 1, 39 }, { 49, 0 }, { 1, 93 }, { 9, 255 }, { 1, 110 }, { 5, 0 }, { 1, 11 }, { 1, 140 }, { 1, 216 }, { 1, 227 }, { 1, 181 }, { 1, 69 }, { 5, 0 }, { 1, 20 }, { 1, 59 }, { 1, 31 }, { 50, 0 }, { 1, 183 }, { 8, 255 }, { 1, 189 }, { 1, 1 }, { 4, 0 }, { 1, 52 }, { 1, 218 }, { 5, 255 }, { 1, 96 }, { 3, 0 }, { 1, 31 }, { 1, 60 }, { 1, 22 }, { 50, 0 }, { 1, 22 }, { 1, 251 }, { 7, 255 }, { 1, 240 }, { 1, 30 }, { 3, 0 }, { 1, 1 }, { 1, 117 }, { 1, 250 }, { 6, 255 }, { 1, 246 }, { 1, 45 }, { 1, 2 }, { 1, 42 }, { 1, 58 }, { 1, 14 }, { 51, 0 }, { 1, 109 }, { 8, 255 }, { 1, 94 }, { 3, 0 }, { 1, 25 }, { 1, 187 }, { 9, 255 }, { 1, 217 }, { 1, 57 }, { 1, 51 }, { 1, 8 }, { 52, 0 }, { 1, 199 }, { 7, 255 }, { 1, 174 }, { 3, 0 }, { 1, 76 }, { 1, 235 }, { 11, 255 }, { 1, 180 }, { 53, 0 }, { 1, 35 }, { 7, 255 }, { 1, 233 }, { 1, 21 }, { 1, 0 }, { 1, 8 }, { 1, 147 }, { 14, 255 }, { 1, 107 }, { 52, 0 }, { 1, 125 }, { 7, 255 }, { 1, 99 }, { 1, 0 }, { 1, 43 }, { 1, 210 }, { 15, 255 }, { 1, 249 }, { 1, 53 }, { 51, 0 }, { 1, 215 }, { 7, 255 }, { 1, 159 }, { 1, 112 }, { 1, 246 }, { 17, 255 }, { 1, 224 }, { 1, 17 }, { 49, 0 }, { 1, 50 }, { 29, 255 }, { 1, 179 }, { 1, 1 }, { 48, 0 }, { 1, 141 }, { 30, 255 }, { 1, 119 }, { 47, 0 }, { 1, 2 }, { 1, 229 }, { 30, 255 }, { 1, 252 }, { 1, 45 }, { 46, 0 }, { 1, 67 }, { 32, 255 }, { 1, 139 }, { 46, 0 }, { 1, 157 }, { 32, 255 }, { 1, 108 }, { 45, 0 }, { 1, 7 }, { 1, 240 }, { 31, 255 }, { 1, 212 }, { 1, 21 }, { 45, 0 }, { 1, 58 }, { 29, 255 }, { 1, 244 }, { 1, 208 }, { 1, 127 }, { 1, 17 }, { 46, 0 }, { 1, 57 }, { 19, 255 }, { 1, 238 }, { 1, 213 }, { 1, 188 }, { 1, 163 }, { 1, 138 }, { 1, 113 }, { 1, 88 }, { 1, 63 }, { 1, 38 }, { 1, 13 }, { 51, 0 }, { 1, 191 }, { 7, 255 }, { 1, 253 }, { 1, 232 }, { 1, 207 }, { 1, 182 }, { 1, 157 }, { 1, 132 }, { 1, 107 }, { 1, 82 }, { 1, 57 }, { 1, 32 }, { 1, 8 }, { 61, 0 }, { 1, 6 }, { 1, 103 }, { 1, 139 }, { 1, 126 }, { 1, 101 }, { 1, 76 }, { 1, 51 }, { 1, 26 }, { 1, 3 }, { 1725, 0 } }, 
+	LogoRLEFrame{ { 1718, 0 }, { 1, 88 }, { 1, 155 }, { 1, 71 }, { 76, 0 }, { 1, 47 }, { 1, 252 }, { 2, 255 }, { 1, 85 }, { 75, 0 }, { 1, 140 }, { 3, 255 }, { 1, 230 }, { 1, 9 }, { 74, 0 }, { 1, 225 }, { 4, 255 }, { 1, 115 }, { 57, 0 }, { 1, 14 }, { 15, 0 }, { 1, 55 }, { 5, 255 }, { 1, 234 }, { 1, 12 }, { 55, 0 }, { 1, 1 }, { 1, 35 }, { 15, 0 }, { 1, 141 }, { 6, 255 }, { 1, 121 }, { 55, 0 }, { 1, 28 }, { 1, 29 }, { 14, 0 }, { 1, 1 }, { 1, 226 }, { 6, 255 }, { 1, 236 }, { 1, 7 }, { 53, 0 }, { 1, 1 }, { 1, 57 }, { 1, 14 }, { 14, 0 }, { 1, 56 }, { 8, 255 }, { 1, 84 }, { 53, 0 }, { 1, 21 }, { 1, 54 }, { 15, 0 }, { 1, 142 }, { 8, 255 }, { 1, 181 }, { 53, 0 }, { 1, 47 }, { 1, 32 }, { 14, 0 }, { 1, 1 }, { 1, 227 }, { 8, 255 }, { 1, 252 }, { 1, 25 }, { 51, 0 }, { 1, 9 }, { 1, 62 }, { 1, 9 }, { 14, 0 }, { 1, 57 }, { 10, 255 }, { 1, 118 }, { 51, 0 }, { 1, 29 }, { 1, 46 }, { 15, 0 }, { 1, 143 }, { 10, 255 }, { 1, 170 }, { 51, 0 }, { 1, 46 }, { 1, 13 }, { 14, 0 }, { 1, 1 }, { 1, 227 }, { 10, 255 }, { 1, 185 }, { 21, 0 }, { 1, 4 }, { 1, 17 }, { 27, 0 }, { 1, 2 }, { 1, 40 }, { 15, 0 }, { 1, 58 }, { 11, 255 }, { 1, 167 }, { 20, 0 }, { 1, 16 }, { 1, 33 }, { 28, 0 }, { 1, 17 }, { 1, 8 }, { 15, 0 }, { 1, 144 }, { 11, 255 }, { 1, 84 }, { 18, 0 }, { 1, 1 }, { 1, 34 }, { 1, 40 }, { 29, 0 }, { 1, 9 }, { 15, 0 }, { 1, 1 }, { 1, 228 }, { 10, 255 }, { 1, 219 }, { 1, 8 }, { 17, 0 }, { 1, 8 }, { 1, 51 }, { 1, 40 }, { 46, 0 }, { 1, 59 }, { 10, 255 }, { 1, 253 }, { 1, 60 }, { 17, 0 }, { 1, 16 }, { 1, 58 }, { 1, 35 }, { 47, 0 }, { 1, 145 }, { 10, 255 }, { 1, 141 }, { 17, 0 }, { 1, 27 }, { 1, 61 }, { 1, 26 }, { 47, 0 }, { 1, 1 }, { 1, 229 }, { 9, 255 }, { 1, 217 }, { 1, 9 }, { 15, 0 }, { 1, 1 }, { 1, 38 }, { 1, 59 }, { 1, 18 }, { 48, 0 }, { 1, 60 }, { 9, 255 }, { 1, 253 }, { 1, 57 }, { 15, 0 }, { 1, 2 }, { 1, 47 }, { 1, 55 }, { 1, 11 }, { 49, 0 }, { 1, 146 }, { 9, 255 }, { 1, 137 }, { 6, 0 }, { 1, 42 }, { 1, 108 }, { 1, 118 }, { 1, 73 }, { 1, 3 }, { 4, 0 }, { 1, 2 }, { 1, 47 }, { 1, 44 }, { 1, 4 }, { 49, 0 }, { 1, 2 }, { 1, 229 }, { 8, 255 }, { 1, 214 }, { 1, 7 }, { 4, 0 }, { 1, 4 }, { 1, 129 }, { 1, 251 }, { 3, 255 }, { 1, 215 }, { 1, 35 }, { 2, 0 }, { 1, 3 }, { 1, 46 }, { 1, 27 }, { 51, 0 }, { 1, 61 }, { 8, 255 }, { 1, 252 }, { 1, 53 }, { 4, 0 }, { 1, 33 }, { 1, 198 }, { 6, 255 }, { 1, 211 }, { 1, 12 }, { 1, 3 }, { 1, 34 }, { 1, 10 }, { 52, 0 }, { 1, 147 }, { 8, 255 }, { 1, 133 }, { 4, 0 }, { 1, 90 }, { 1, 241 }, { 8, 255 }, { 1, 172 }, { 1, 10 }, { 53, 0 }, { 1, 2 }, { 1, 230 }, { 7, 255 }, { 1, 211 }, { 1, 6 }, { 2, 0 }, { 1, 13 }, { 1, 162 }, { 11, 255 }, { 1, 121 }, { 53, 0 }, { 1, 62 }, { 7, 255 }, { 1, 251 }, { 1, 50 }, { 2, 0 }, { 1, 54 }, { 1, 220 }, { 12, 255 }, { 1, 253 }, { 1, 73 }, { 52, 0 }, { 1, 148 }, { 7, 255 }, { 1, 133 }, { 1, 0 }, { 1, 2 }, { 1, 121 }, { 1, 251 }, { 14, 255 }, { 1, 239 }, { 1, 36 }, { 50, 0 }, { 1, 2 }, { 1, 231 }, { 7, 255 }, { 1, 100 }, { 1, 28 }, { 1, 191 }, { 17, 255 }, { 1, 212 }, { 1, 12 }, { 49, 0 }, { 1, 63 }, { 8, 255 }, { 1, 249 }, { 1, 245 }, { 19, 255 }, { 1, 172 }, { 1, 1 }, { 48, 0 }, { 1, 149 }, { 30, 255 }, { 1, 122 }, { 47, 0 }, { 1, 2 }, { 1, 232 }, { 30, 255 }, { 1, 253 }, { 1, 68 }, { 46, 0 }, { 1, 64 }, { 32, 255 }, { 1, 205 }, { 46, 0 }, { 1, 150 }, { 32, 255 }, { 1, 229 }, { 45, 0 }, { 1, 3 }, { 1, 232 }, { 32, 255 }, { 1, 150 }, { 45, 0 }, { 1, 58 }, { 31, 255 }, { 1, 248 }, { 1, 154 }, { 1, 5 }, { 45, 0 }, { 1, 77 }, { 23, 255 }, { 1, 249 }, { 1, 224 }, { 1, 199 }, { 1, 174 }, { 1, 149 }, { 1, 124 }, { 1, 99 }, { 1, 72 }, { 1, 13 }, { 47, 0 }, { 1, 18 }, { 1, 241 }, { 12, 255 }, { 1, 244 }, { 1, 219 }, { 1, 194 }, { 1, 169 }, { 1, 144 }, { 1, 118 }, { 1, 93 }, { 1, 68 }, { 1, 43 }, { 1, 18 }, { 57, 0 }, { 1, 63 }, { 1, 213 }, { 1, 250 }, { 1, 239 }, { 1, 214 }, { 1, 188 }, { 1, 163 }, { 1, 138 }, { 1, 113 }, { 1, 88 }, { 1, 63 }, { 1, 38 }, { 1, 13 }, { 490, 0 }, { 1, 1 }, { 1, 20 }, { 1, 4 }, { 75, 0 }, { 1, 1 }, { 1, 24 }, { 1, 45 }, { 1, 8 }, { 75, 0 }, { 1, 15 }, { 1, 53 }, { 1, 46 }, { 1, 4 }, { 74, 0 }, { 1, 4 }, { 1, 39 }, { 1, 60 }, { 1, 26 }, { 75, 0 }, { 1, 17 }, { 1, 57 }, { 1, 47 }, { 1, 8 }, { 75, 0 }, { 1, 28 }, { 1, 50 }, { 1, 21 }, { 75, 0 }, { 1, 1 }, { 1, 24 }, { 1, 17 }, { 77, 0 }, { 1, 2 }, { 678, 0 } }, 
+	LogoRLEFrame{ { 1637, 0 }, { 1, 4 }, { 1, 151 }, { 1, 183 }, { 1, 74 }, { 61, 0 }, { 1, 12 }, { 14, 0 }, { 1, 111 }, { 2, 255 }, { 1, 251 }, { 1, 68 }, { 59, 0 }, { 1, 17 }, { 1, 18 }, { 14, 0 }, { 1, 199 }, { 3, 255 }, { 1, 212 }, { 1, 2 }, { 58, 0 }, { 1, 51 }, { 1, 4 }, { 13, 0 }, { 1, 27 }, { 5, 255 }, { 1, 92 }, { 57, 0 }, { 1, 21 }, { 1, 51 }, { 14, 0 }, { 1, 109 }, { 5, 255 }, { 1, 221 }, { 1, 5 }, { 56, 0 }, { 1, 47 }, { 1, 30 }, { 14, 0 }, { 1, 191 }, { 6, 255 }, { 1, 104 }, { 55, 0 }, { 1, 9 }, { 1, 62 }, { 1, 7 }, { 13, 0 }, { 1, 21 }, { 1, 252 }, { 6, 255 }, { 1, 224 }, { 1, 2 }, { 54, 0 }, { 1, 34 }, { 1, 46 }, { 14, 0 }, { 1, 100 }, { 8, 255 }, { 1, 70 }, { 54, 0 }, { 1, 55 }, { 1, 21 }, { 14, 0 }, { 1, 183 }, { 8, 255 }, { 1, 169 }, { 53, 0 }, { 1, 9 }, { 1, 50 }, { 14, 0 }, { 1, 16 }, { 1, 250 }, { 8, 255 }, { 1, 249 }, { 1, 19 }, { 52, 0 }, { 1, 26 }, { 1, 17 }, { 14, 0 }, { 1, 92 }, { 10, 255 }, { 1, 111 }, { 52, 0 }, { 1, 27 }, { 15, 0 }, { 1, 175 }, { 10, 255 }, { 1, 162 }, { 52, 0 }, { 1, 8 }, { 14, 0 }, { 1, 11 }, { 1, 246 }, { 10, 255 }, { 1, 180 }, { 67, 0 }, { 1, 84 }, { 11, 255 }, { 1, 161 }, { 67, 0 }, { 1, 167 }, { 11, 255 }, { 1, 79 }, { 66, 0 }, { 1, 7 }, { 1, 242 }, { 10, 255 }, { 1, 215 }, { 1, 7 }, { 66, 0 }, { 1, 76 }, { 10, 255 }, { 1, 253 }, { 1, 57 }, { 67, 0 }, { 1, 158 }, { 10, 255 }, { 1, 141 }, { 67, 0 }, { 1, 4 }, { 1, 237 }, { 9, 255 }, { 1, 219 }, { 1, 9 }, { 67, 0 }, { 1, 68 }, { 10, 255 }, { 1, 61 }, { 68, 0 }, { 1, 150 }, { 9, 255 }, { 1, 147 }, { 6, 0 }, { 1, 36 }, { 1, 110 }, { 1, 128 }, { 1, 88 }, { 1, 10 }, { 57, 0 }, { 1, 2 }, { 1, 231 }, { 8, 255 }, { 1, 222 }, { 1, 11 }, { 4, 0 }, { 1, 1 }, { 1, 112 }, { 1, 247 }, { 3, 255 }, { 1, 233 }, { 1, 64 }, { 56, 0 }, { 1, 59 }, { 9, 255 }, { 1, 66 }, { 4, 0 }, { 1, 22 }, { 1, 183 }, { 6, 255 }, { 1, 237 }, { 1, 34 }, { 55, 0 }, { 1, 142 }, { 8, 255 }, { 1, 152 }, { 4, 0 }, { 1, 72 }, { 1, 232 }, { 8, 255 }, { 1, 212 }, { 1, 13 }, { 54, 0 }, { 1, 224 }, { 7, 255 }, { 1, 226 }, { 1, 14 }, { 2, 0 }, { 1, 6 }, { 1, 142 }, { 11, 255 }, { 1, 177 }, { 1, 1 }, { 52, 0 }, { 1, 51 }, { 8, 255 }, { 1, 72 }, { 2, 0 }, { 1, 40 }, { 1, 207 }, { 13, 255 }, { 1, 132 }, { 52, 0 }, { 1, 134 }, { 7, 255 }, { 1, 162 }, { 2, 0 }, { 1, 101 }, { 1, 245 }, { 15, 255 }, { 1, 88 }, { 51, 0 }, { 1, 217 }, { 7, 255 }, { 1, 137 }, { 1, 17 }, { 1, 172 }, { 17, 255 }, { 1, 246 }, { 1, 51 }, { 49, 0 }, { 1, 43 }, { 9, 255 }, { 1, 242 }, { 19, 255 }, { 1, 227 }, { 1, 24 }, { 48, 0 }, { 1, 126 }, { 30, 255 }, { 1, 198 }, { 1, 7 }, { 47, 0 }, { 1, 208 }, { 31, 255 }, { 1, 151 }, { 46, 0 }, { 1, 35 }, { 33, 255 }, { 1, 34 }, { 45, 0 }, { 1, 118 }, { 33, 255 }, { 1, 50 }, { 45, 0 }, { 1, 200 }, { 32, 255 }, { 1, 219 }, { 1, 2 }, { 44, 0 }, { 1, 22 }, { 31, 255 }, { 1, 252 }, { 1, 184 }, { 1, 25 }, { 45, 0 }, { 1, 39 }, { 23, 255 }, { 1, 247 }, { 1, 221 }, { 1, 195 }, { 1, 169 }, { 1, 143 }, { 1, 117 }, { 1, 91 }, { 1, 66 }, { 1, 20 }, { 47, 0 }, { 1, 4 }, { 1, 219 }, { 12, 255 }, { 1, 250 }, { 1, 225 }, { 1, 199 }, { 1, 173 }, { 1, 147 }, { 1, 121 }, { 1, 95 }, { 1, 69 }, { 1, 43 }, { 1, 17 }, { 57, 0 }, { 1, 45 }, { 1, 206 }, { 1, 253 }, { 1, 252 }, { 1, 228 }, { 1, 202 }, { 1, 176 }, { 1, 150 }, { 1, 125 }, { 1, 99 }, { 1, 73 }, { 1, 47 }, { 1, 21 }, { 1, 1 }, { 68, 0 }, { 1, 5 }, { 1, 2 }, { 343, 0 }, { 1, 6 }, { 77, 0 }, { 1, 13 }, { 1, 35 }, { 1, 7 }, { 75, 0 }, { 1, 10 }, { 1, 44 }, { 1, 46 }, { 1, 3 }, { 74, 0 }, { 1, 1 }, { 1, 31 }, { 1, 60 }, { 1, 32 }, { 75, 0 }, { 1, 15 }, { 1, 53 }, { 1, 52 }, { 1, 12 }, { 75, 0 }, { 1, 28 }, { 1, 58 }, { 1, 31 }, { 1, 1 }, { 74, 0 }, { 1, 1 }, { 1, 34 }, { 1, 30 }, { 1, 3 }, { 76, 0 }, { 1, 13 }, { 1, 2 }, { 834, 0 } }, 
+	LogoRLEFrame{ { 1383, 0 }, { 1, 8 }, { 1, 2 }, { 78, 0 }, { 1, 35 }, { 78, 0 }, { 1, 15 }, { 1, 41 }, { 13, 0 }, { 1, 16 }, { 1, 183 }, { 1, 198 }, { 1, 75 }, { 61, 0 }, { 1, 46 }, { 1, 26 }, { 13, 0 }, { 1, 142 }, { 2, 255 }, { 1, 250 }, { 1, 59 }, { 59, 0 }, { 1, 9 }, { 1, 61 }, { 1, 5 }, { 13, 0 }, { 1, 226 }, { 3, 255 }, { 1, 200 }, { 59, 0 }, { 1, 34 }, { 1, 44 }, { 13, 0 }, { 1, 53 }, { 5, 255 }, { 1, 80 }, { 57, 0 }, { 1, 1 }, { 1, 58 }, { 1, 21 }, { 13, 0 }, { 1, 135 }, { 5, 255 }, { 1, 213 }, { 1, 3 }, { 56, 0 }, { 1, 17 }, { 1, 57 }, { 1, 1 }, { 13, 0 }, { 1, 216 }, { 6, 255 }, { 1, 95 }, { 56, 0 }, { 1, 35 }, { 1, 27 }, { 13, 0 }, { 1, 42 }, { 7, 255 }, { 1, 216 }, { 56, 0 }, { 1, 43 }, { 1, 1 }, { 13, 0 }, { 1, 124 }, { 8, 255 }, { 1, 60 }, { 54, 0 }, { 1, 6 }, { 1, 21 }, { 14, 0 }, { 1, 205 }, { 8, 255 }, { 1, 161 }, { 54, 0 }, { 1, 10 }, { 14, 0 }, { 1, 32 }, { 9, 255 }, { 1, 246 }, { 1, 16 }, { 68, 0 }, { 1, 113 }, { 10, 255 }, { 1, 105 }, { 68, 0 }, { 1, 194 }, { 10, 255 }, { 1, 147 }, { 67, 0 }, { 1, 23 }, { 1, 253 }, { 10, 255 }, { 1, 165 }, { 67, 0 }, { 1, 102 }, { 11, 255 }, { 1, 135 }, { 67, 0 }, { 1, 183 }, { 11, 255 }, { 1, 54 }, { 66, 0 }, { 1, 15 }, { 1, 250 }, { 10, 255 }, { 1, 188 }, { 67, 0 }, { 1, 91 }, { 10, 255 }, { 1, 244 }, { 1, 33 }, { 67, 0 }, { 1, 173 }, { 10, 255 }, { 1, 109 }, { 67, 0 }, { 1, 9 }, { 1, 245 }, { 9, 255 }, { 1, 196 }, { 1, 2 }, { 67, 0 }, { 1, 80 }, { 9, 255 }, { 1, 247 }, { 1, 39 }, { 68, 0 }, { 1, 162 }, { 9, 255 }, { 1, 119 }, { 6, 0 }, { 1, 68 }, { 1, 147 }, { 1, 163 }, { 1, 123 }, { 1, 28 }, { 57, 0 }, { 1, 5 }, { 1, 238 }, { 8, 255 }, { 1, 204 }, { 1, 3 }, { 4, 0 }, { 1, 9 }, { 1, 152 }, { 4, 255 }, { 1, 248 }, { 1, 83 }, { 56, 0 }, { 1, 69 }, { 8, 255 }, { 1, 250 }, { 1, 46 }, { 4, 0 }, { 1, 45 }, { 1, 213 }, { 6, 255 }, { 1, 245 }, { 1, 49 }, { 55, 0 }, { 1, 151 }, { 8, 255 }, { 1, 129 }, { 4, 0 }, { 1, 105 }, { 1, 247 }, { 8, 255 }, { 1, 226 }, { 1, 23 }, { 53, 0 }, { 1, 1 }, { 1, 230 }, { 7, 255 }, { 1, 211 }, { 1, 6 }, { 2, 0 }, { 1, 18 }, { 1, 175 }, { 11, 255 }, { 1, 198 }, { 1, 7 }, { 52, 0 }, { 1, 58 }, { 7, 255 }, { 1, 252 }, { 1, 53 }, { 2, 0 }, { 1, 62 }, { 1, 226 }, { 13, 255 }, { 1, 160 }, { 52, 0 }, { 1, 140 }, { 7, 255 }, { 1, 146 }, { 1, 0 }, { 1, 3 }, { 1, 128 }, { 1, 252 }, { 15, 255 }, { 1, 116 }, { 51, 0 }, { 1, 221 }, { 7, 255 }, { 1, 144 }, { 1, 29 }, { 1, 194 }, { 17, 255 }, { 1, 253 }, { 1, 75 }, { 49, 0 }, { 1, 47 }, { 9, 255 }, { 1, 252 }, { 19, 255 }, { 1, 241 }, { 1, 42 }, { 48, 0 }, { 1, 129 }, { 30, 255 }, { 1, 220 }, { 1, 18 }, { 47, 0 }, { 1, 211 }, { 31, 255 }, { 1, 180 }, { 46, 0 }, { 1, 37 }, { 33, 255 }, { 1, 44 }, { 45, 0 }, { 1, 118 }, { 33, 255 }, { 1, 36 }, { 45, 0 }, { 1, 200 }, { 32, 255 }, { 1, 188 }, { 45, 0 }, { 1, 20 }, { 31, 255 }, { 1, 227 }, { 1, 138 }, { 1, 8 }, { 45, 0 }, { 1, 34 }, { 22, 255 }, { 1, 239 }, { 1, 212 }, { 1, 185 }, { 1, 158 }, { 1, 131 }, { 1, 104 }, { 1, 77 }, { 1, 50 }, { 1, 23 }, { 1, 1 }, { 47, 0 }, { 1, 2 }, { 1, 211 }, { 11, 255 }, { 1, 250 }, { 1, 225 }, { 1, 198 }, { 1, 171 }, { 1, 144 }, { 1, 117 }, { 1, 91 }, { 1, 64 }, { 1, 37 }, { 1, 10 }, { 58, 0 }, { 1, 36 }, { 1, 190 }, { 1, 243 }, { 1, 239 }, { 1, 212 }, { 1, 185 }, { 1, 158 }, { 1, 131 }, { 1, 104 }, { 1, 77 }, { 1, 50 }, { 1, 23 }, { 1, 1 }, { 415, 0 }, { 1, 5 }, { 1, 23 }, { 1, 2 }, { 75, 0 }, { 1, 4 }, { 1, 33 }, { 1, 42 }, { 1, 3 }, { 75, 0 }, { 1, 25 }, { 1, 58 }, { 1, 35 }, { 75, 0 }, { 1, 10 }, { 1, 48 }, { 1, 55 }, { 1, 16 }, { 75, 0 }, { 1, 27 }, { 1, 61 }, { 1, 38 }, { 1, 3 }, { 74, 0 }, { 1, 1 }, { 1, 38 }, { 1, 42 }, { 1, 12 }, { 75, 0 }, { 1, 4 }, { 1, 25 }, { 1, 9 }, { 77, 0 }, { 1, 1 }, { 913, 0 } }, 
+	LogoRLEFrame{ { 1478, 0 }, { 1, 38 }, { 1, 100 }, { 1, 33 }, { 76, 0 }, { 1, 17 }, { 1, 233 }, { 1, 255 }, { 1, 246 }, { 1, 62 }, { 75, 0 }, { 1, 102 }, { 3, 255 }, { 1, 223 }, { 1, 6 }, { 74, 0 }, { 1, 184 }, { 4, 255 }, { 1, 107 }, { 73, 0 }, { 1, 16 }, { 1, 250 }, { 4, 255 }, { 1, 231 }, { 1, 10 }, { 72, 0 }, { 1, 94 }, { 6, 255 }, { 1, 121 }, { 72, 0 }, { 1, 176 }, { 6, 255 }, { 1, 239 }, { 1, 11 }, { 70, 0 }, { 1, 12 }, { 1, 247 }, { 7, 255 }, { 1, 96 }, { 70, 0 }, { 1, 86 }, { 8, 255 }, { 1, 196 }, { 70, 0 }, { 1, 169 }, { 9, 255 }, { 1, 40 }, { 68, 0 }, { 1, 8 }, { 1, 243 }, { 9, 255 }, { 1, 138 }, { 68, 0 }, { 1, 78 }, { 10, 255 }, { 1, 206 }, { 68, 0 }, { 1, 161 }, { 10, 255 }, { 1, 223 }, { 67, 0 }, { 1, 5 }, { 1, 238 }, { 10, 255 }, { 1, 218 }, { 67, 0 }, { 1, 70 }, { 11, 255 }, { 1, 142 }, { 67, 0 }, { 1, 153 }, { 10, 255 }, { 1, 251 }, { 1, 46 }, { 66, 0 }, { 1, 2 }, { 1, 233 }, { 10, 255 }, { 1, 134 }, { 67, 0 }, { 1, 62 }, { 10, 255 }, { 1, 215 }, { 1, 7 }, { 67, 0 }, { 1, 145 }, { 9, 255 }, { 1, 253 }, { 1, 57 }, { 67, 0 }, { 1, 1 }, { 1, 226 }, { 9, 255 }, { 1, 142 }, { 68, 0 }, { 1, 54 }, { 9, 255 }, { 1, 221 }, { 1, 10 }, { 5, 0 }, { 1, 10 }, { 1, 76 }, { 1, 103 }, { 1, 70 }, { 1, 7 }, { 58, 0 }, { 1, 137 }, { 9, 255 }, { 1, 65 }, { 5, 0 }, { 1, 55 }, { 1, 218 }, { 3, 255 }, { 1, 228 }, { 1, 70 }, { 57, 0 }, { 1, 219 }, { 8, 255 }, { 1, 151 }, { 4, 0 }, { 1, 1 }, { 1, 118 }, { 1, 251 }, { 5, 255 }, { 1, 241 }, { 1, 41 }, { 55, 0 }, { 1, 46 }, { 8, 255 }, { 1, 226 }, { 1, 13 }, { 3, 0 }, { 1, 22 }, { 1, 184 }, { 8, 255 }, { 1, 219 }, { 1, 17 }, { 54, 0 }, { 1, 129 }, { 8, 255 }, { 1, 72 }, { 3, 0 }, { 1, 68 }, { 1, 231 }, { 10, 255 }, { 1, 186 }, { 1, 3 }, { 46, 0 }, { 1, 5 }, { 6, 0 }, { 1, 211 }, { 7, 255 }, { 1, 160 }, { 2, 0 }, { 1, 4 }, { 1, 133 }, { 1, 253 }, { 12, 255 }, { 1, 142 }, { 45, 0 }, { 1, 1 }, { 1, 7 }, { 5, 0 }, { 1, 38 }, { 7, 255 }, { 1, 231 }, { 1, 17 }, { 1, 0 }, { 1, 30 }, { 1, 197 }, { 15, 255 }, { 1, 96 }, { 44, 0 }, { 1, 12 }, { 1, 1 }, { 5, 0 }, { 1, 121 }, { 7, 255 }, { 1, 165 }, { 1, 0 }, { 1, 82 }, { 1, 238 }, { 16, 255 }, { 1, 248 }, { 1, 57 }, { 42, 0 }, { 1, 4 }, { 1, 14 }, { 6, 0 }, { 1, 204 }, { 7, 255 }, { 1, 250 }, { 1, 187 }, { 19, 255 }, { 1, 231 }, { 1, 28 }, { 41, 0 }, { 1, 16 }, { 1, 7 }, { 5, 0 }, { 1, 31 }, { 30, 255 }, { 1, 203 }, { 1, 9 }, { 39, 0 }, { 1, 6 }, { 1, 18 }, { 6, 0 }, { 1, 113 }, { 31, 255 }, { 1, 159 }, { 39, 0 }, { 1, 17 }, { 1, 9 }, { 6, 0 }, { 1, 196 }, { 32, 255 }, { 1, 44 }, { 37, 0 }, { 1, 7 }, { 1, 19 }, { 6, 0 }, { 1, 24 }, { 1, 253 }, { 32, 255 }, { 1, 66 }, { 37, 0 }, { 1, 17 }, { 1, 10 }, { 6, 0 }, { 1, 105 }, { 32, 255 }, { 1, 232 }, { 1, 9 }, { 36, 0 }, { 1, 7 }, { 1, 19 }, { 1, 1 }, { 6, 0 }, { 1, 187 }, { 31, 255 }, { 1, 203 }, { 1, 37 }, { 37, 0 }, { 1, 16 }, { 1, 10 }, { 7, 0 }, { 1, 226 }, { 23, 255 }, { 1, 251 }, { 1, 224 }, { 1, 196 }, { 1, 168 }, { 1, 140 }, { 1, 112 }, { 1, 84 }, { 1, 36 }, { 38, 0 }, { 1, 4 }, { 1, 18 }, { 8, 0 }, { 1, 194 }, { 14, 255 }, { 1, 248 }, { 1, 220 }, { 1, 192 }, { 1, 164 }, { 1, 136 }, { 1, 108 }, { 1, 80 }, { 1, 52 }, { 1, 24 }, { 1, 2 }, { 45, 0 }, { 1, 12 }, { 1, 5 }, { 8, 0 }, { 1, 50 }, { 1, 230 }, { 4, 255 }, { 1, 245 }, { 1, 216 }, { 1, 188 }, { 1, 160 }, { 1, 132 }, { 1, 104 }, { 1, 76 }, { 1, 48 }, { 1, 20 }, { 55, 0 }, { 1, 12 }, { 10, 0 }, { 1, 15 }, { 1, 64 }, { 1, 72 }, { 1, 44 }, { 1, 16 }, { 63, 0 }, { 1, 6 }, { 1, 2 }, { 78, 0 }, { 1, 3 }, { 122, 0 }, { 1, 8 }, { 77, 0 }, { 1, 22 }, { 1, 35 }, { 1, 3 }, { 75, 0 }, { 1, 17 }, { 1, 52 }, { 1, 36 }, { 75, 0 }, { 1, 5 }, { 1, 41 }, { 1, 58 }, { 1, 22 }, { 75, 0 }, { 1, 24 }, { 1, 58 }, { 1, 43 }, { 1, 6 }, { 74, 0 }, { 1, 1 }, { 1, 38 }, { 1, 53 }, { 1, 22 }, { 75, 0 }, { 1, 5 }, { 1, 36 }, { 1, 21 }, { 77, 0 }, { 1, 11 }, { 1070, 0 } }, 
+	LogoRLEFrame{ { 1479, 0 }, { 1, 41 }, { 1, 68 }, { 1, 5 }, { 76, 0 }, { 1, 52 }, { 1, 251 }, { 1, 255 }, { 1, 199 }, { 1, 11 }, { 75, 0 }, { 1, 164 }, { 3, 255 }, { 1, 137 }, { 74, 0 }, { 1, 8 }, { 1, 242 }, { 3, 255 }, { 1, 245 }, { 1, 24 }, { 73, 0 }, { 1, 80 }, { 5, 255 }, { 1, 145 }, { 73, 0 }, { 1, 166 }, { 5, 255 }, { 1, 248 }, { 1, 29 }, { 71, 0 }, { 1, 8 }, { 1, 243 }, { 6, 255 }, { 1, 147 }, { 71, 0 }, { 1, 81 }, { 7, 255 }, { 1, 239 }, { 1, 8 }, { 70, 0 }, { 1, 167 }, { 8, 255 }, { 1, 87 }, { 69, 0 }, { 1, 9 }, { 1, 244 }, { 8, 255 }, { 1, 184 }, { 69, 0 }, { 1, 83 }, { 9, 255 }, { 1, 253 }, { 1, 28 }, { 68, 0 }, { 1, 169 }, { 10, 255 }, { 1, 82 }, { 67, 0 }, { 1, 10 }, { 1, 244 }, { 10, 255 }, { 1, 95 }, { 67, 0 }, { 1, 84 }, { 11, 255 }, { 1, 77 }, { 67, 0 }, { 1, 170 }, { 10, 255 }, { 1, 240 }, { 1, 7 }, { 66, 0 }, { 1, 11 }, { 1, 245 }, { 10, 255 }, { 1, 133 }, { 67, 0 }, { 1, 86 }, { 10, 255 }, { 1, 212 }, { 1, 7 }, { 67, 0 }, { 1, 172 }, { 9, 255 }, { 1, 252 }, { 1, 53 }, { 67, 0 }, { 1, 12 }, { 1, 246 }, { 9, 255 }, { 1, 135 }, { 62, 0 }, { 1, 2 }, { 5, 0 }, { 1, 88 }, { 9, 255 }, { 1, 214 }, { 1, 7 }, { 61, 0 }, { 1, 5 }, { 1, 9 }, { 5, 0 }, { 1, 173 }, { 8, 255 }, { 1, 252 }, { 1, 55 }, { 5, 0 }, { 1, 11 }, { 1, 117 }, { 1, 162 }, { 1, 144 }, { 1, 77 }, { 52, 0 }, { 1, 29 }, { 5, 0 }, { 1, 12 }, { 1, 247 }, { 8, 255 }, { 1, 137 }, { 5, 0 }, { 1, 54 }, { 1, 221 }, { 4, 255 }, { 1, 182 }, { 1, 3 }, { 49, 0 }, { 1, 13 }, { 1, 29 }, { 5, 0 }, { 1, 89 }, { 8, 255 }, { 1, 215 }, { 1, 8 }, { 4, 0 }, { 1, 113 }, { 1, 250 }, { 6, 255 }, { 1, 137 }, { 49, 0 }, { 1, 49 }, { 1, 7 }, { 5, 0 }, { 1, 175 }, { 7, 255 }, { 1, 253 }, { 1, 56 }, { 3, 0 }, { 1, 18 }, { 1, 178 }, { 9, 255 }, { 1, 84 }, { 47, 0 }, { 1, 24 }, { 1, 46 }, { 5, 0 }, { 1, 13 }, { 1, 247 }, { 7, 255 }, { 1, 139 }, { 3, 0 }, { 1, 58 }, { 1, 225 }, { 10, 255 }, { 1, 243 }, { 1, 42 }, { 45, 0 }, { 1, 1 }, { 1, 56 }, { 1, 19 }, { 5, 0 }, { 1, 91 }, { 7, 255 }, { 1, 216 }, { 1, 8 }, { 1, 0 }, { 1, 1 }, { 1, 118 }, { 1, 251 }, { 12, 255 }, { 1, 217 }, { 1, 14 }, { 44, 0 }, { 1, 26 }, { 1, 52 }, { 6, 0 }, { 1, 177 }, { 6, 255 }, { 1, 253 }, { 1, 57 }, { 1, 0 }, { 1, 20 }, { 1, 182 }, { 15, 255 }, { 1, 176 }, { 1, 1 }, { 42, 0 }, { 1, 1 }, { 1, 56 }, { 1, 23 }, { 5, 0 }, { 1, 14 }, { 1, 248 }, { 6, 255 }, { 1, 243 }, { 1, 8 }, { 1, 62 }, { 1, 228 }, { 17, 255 }, { 1, 123 }, { 42, 0 }, { 1, 27 }, { 1, 55 }, { 6, 0 }, { 1, 92 }, { 8, 255 }, { 1, 222 }, { 1, 252 }, { 18, 255 }, { 1, 253 }, { 1, 72 }, { 40, 0 }, { 1, 2 }, { 1, 56 }, { 1, 26 }, { 6, 0 }, { 1, 178 }, { 29, 255 }, { 1, 238 }, { 1, 34 }, { 39, 0 }, { 1, 25 }, { 1, 55 }, { 1, 1 }, { 5, 0 }, { 1, 15 }, { 1, 249 }, { 30, 255 }, { 1, 203 }, { 1, 2 }, { 38, 0 }, { 1, 49 }, { 1, 19 }, { 6, 0 }, { 1, 94 }, { 32, 255 }, { 1, 64 }, { 37, 0 }, { 1, 11 }, { 1, 43 }, { 7, 0 }, { 1, 180 }, { 32, 255 }, { 1, 49 }, { 37, 0 }, { 1, 33 }, { 1, 7 }, { 6, 0 }, { 1, 16 }, { 1, 249 }, { 31, 255 }, { 1, 193 }, { 1, 1 }, { 36, 0 }, { 1, 1 }, { 1, 24 }, { 7, 0 }, { 1, 94 }, { 30, 255 }, { 1, 226 }, { 1, 137 }, { 1, 9 }, { 37, 0 }, { 1, 10 }, { 8, 0 }, { 1, 129 }, { 21, 255 }, { 1, 251 }, { 1, 225 }, { 1, 196 }, { 1, 167 }, { 1, 138 }, { 1, 109 }, { 1, 80 }, { 1, 51 }, { 1, 22 }, { 49, 0 }, { 1, 87 }, { 12, 255 }, { 1, 253 }, { 1, 230 }, { 1, 201 }, { 1, 172 }, { 1, 143 }, { 1, 114 }, { 1, 85 }, { 1, 56 }, { 1, 27 }, { 1, 2 }, { 57, 0 }, { 1, 1 }, { 1, 151 }, { 3, 255 }, { 1, 235 }, { 1, 206 }, { 1, 177 }, { 1, 148 }, { 1, 119 }, { 1, 90 }, { 1, 61 }, { 1, 32 }, { 1, 5 }, { 68, 0 }, { 1, 14 }, { 1, 32 }, { 1, 9 }, { 188, 0 }, { 1, 11 }, { 1, 23 }, { 1, 1 }, { 75, 0 }, { 1, 10 }, { 1, 42 }, { 1, 35 }, { 75, 0 }, { 1, 2 }, { 1, 34 }, { 1, 59 }, { 1, 25 }, { 75, 0 }, { 1, 18 }, { 1, 55 }, { 1, 48 }, { 1, 9 }, { 74, 0 }, { 1, 1 }, { 1, 37 }, { 1, 60 }, { 1, 28 }, { 75, 0 }, { 1, 5 }, { 1, 44 }, { 1, 33 }, { 1, 5 }, { 75, 0 }, { 1, 7 }, { 1, 22 }, { 1, 3 }, { 1226, 0 } }, 
+	LogoRLEFrame{ { 1479, 0 }, { 1, 67 }, { 1, 135 }, { 1, 53 }, { 76, 0 }, { 1, 37 }, { 1, 247 }, { 1, 255 }, { 1, 248 }, { 1, 59 }, { 75, 0 }, { 1, 135 }, { 3, 255 }, { 1, 204 }, { 74, 0 }, { 1, 1 }, { 1, 224 }, { 4, 255 }, { 1, 75 }, { 73, 0 }, { 1, 61 }, { 5, 255 }, { 1, 203 }, { 73, 0 }, { 1, 152 }, { 6, 255 }, { 1, 74 }, { 71, 0 }, { 1, 6 }, { 1, 237 }, { 6, 255 }, { 1, 184 }, { 71, 0 }, { 1, 79 }, { 7, 255 }, { 1, 252 }, { 1, 23 }, { 70, 0 }, { 1, 170 }, { 8, 255 }, { 1, 110 }, { 69, 0 }, { 1, 14 }, { 1, 247 }, { 8, 255 }, { 1, 202 }, { 69, 0 }, { 1, 96 }, { 10, 255 }, { 1, 27 }, { 68, 0 }, { 1, 187 }, { 10, 255 }, { 1, 41 }, { 67, 0 }, { 1, 25 }, { 1, 253 }, { 10, 255 }, { 1, 40 }, { 67, 0 }, { 1, 114 }, { 10, 255 }, { 1, 221 }, { 62, 0 }, { 1, 2 }, { 5, 0 }, { 1, 205 }, { 10, 255 }, { 1, 121 }, { 62, 0 }, { 1, 15 }, { 4, 0 }, { 1, 40 }, { 10, 255 }, { 1, 210 }, { 1, 6 }, { 61, 0 }, { 1, 13 }, { 1, 15 }, { 4, 0 }, { 1, 131 }, { 9, 255 }, { 1, 250 }, { 1, 48 }, { 62, 0 }, { 1, 42 }, { 5, 0 }, { 1, 221 }, { 9, 255 }, { 1, 125 }, { 62, 0 }, { 1, 25 }, { 1, 32 }, { 4, 0 }, { 1, 57 }, { 9, 255 }, { 1, 203 }, { 1, 4 }, { 61, 0 }, { 1, 4 }, { 1, 57 }, { 1, 9 }, { 4, 0 }, { 1, 148 }, { 8, 255 }, { 1, 248 }, { 1, 42 }, { 5, 0 }, { 1, 18 }, { 1, 85 }, { 1, 104 }, { 1, 63 }, { 1, 1 }, { 52, 0 }, { 1, 32 }, { 1, 45 }, { 4, 0 }, { 1, 4 }, { 1, 235 }, { 8, 255 }, { 1, 116 }, { 5, 0 }, { 1, 76 }, { 1, 232 }, { 3, 255 }, { 1, 208 }, { 1, 27 }, { 50, 0 }, { 1, 4 }, { 1, 59 }, { 1, 15 }, { 4, 0 }, { 1, 75 }, { 8, 255 }, { 1, 196 }, { 1, 2 }, { 3, 0 }, { 1, 4 }, { 1, 137 }, { 6, 255 }, { 1, 194 }, { 1, 3 }, { 49, 0 }, { 1, 32 }, { 1, 48 }, { 5, 0 }, { 1, 166 }, { 7, 255 }, { 1, 245 }, { 1, 36 }, { 3, 0 }, { 1, 26 }, { 1, 194 }, { 8, 255 }, { 1, 131 }, { 48, 0 }, { 1, 4 }, { 1, 59 }, { 1, 18 }, { 4, 0 }, { 1, 12 }, { 1, 245 }, { 7, 255 }, { 1, 107 }, { 3, 0 }, { 1, 69 }, { 1, 234 }, { 9, 255 }, { 1, 253 }, { 1, 68 }, { 47, 0 }, { 1, 33 }, { 1, 51 }, { 5, 0 }, { 1, 92 }, { 7, 255 }, { 1, 188 }, { 1, 1 }, { 1, 0 }, { 1, 2 }, { 1, 128 }, { 1, 253 }, { 11, 255 }, { 1, 232 }, { 1, 24 }, { 45, 0 }, { 1, 2 }, { 1, 59 }, { 1, 20 }, { 5, 0 }, { 1, 183 }, { 6, 255 }, { 1, 241 }, { 1, 30 }, { 1, 0 }, { 1, 22 }, { 1, 187 }, { 14, 255 }, { 1, 188 }, { 1, 2 }, { 44, 0 }, { 1, 24 }, { 1, 44 }, { 5, 0 }, { 1, 22 }, { 1, 252 }, { 6, 255 }, { 1, 130 }, { 1, 0 }, { 1, 61 }, { 1, 229 }, { 16, 255 }, { 1, 124 }, { 44, 0 }, { 1, 46 }, { 1, 8 }, { 5, 0 }, { 1, 110 }, { 7, 255 }, { 1, 207 }, { 1, 134 }, { 1, 252 }, { 17, 255 }, { 1, 252 }, { 1, 63 }, { 42, 0 }, { 1, 10 }, { 1, 30 }, { 6, 0 }, { 1, 201 }, { 28, 255 }, { 1, 229 }, { 1, 21 }, { 41, 0 }, { 1, 24 }, { 1, 1 }, { 5, 0 }, { 1, 36 }, { 30, 255 }, { 1, 180 }, { 40, 0 }, { 1, 1 }, { 1, 10 }, { 6, 0 }, { 1, 127 }, { 31, 255 }, { 1, 56 }, { 47, 0 }, { 1, 218 }, { 31, 255 }, { 1, 69 }, { 46, 0 }, { 1, 54 }, { 31, 255 }, { 1, 226 }, { 1, 7 }, { 46, 0 }, { 1, 145 }, { 30, 255 }, { 1, 190 }, { 1, 29 }, { 47, 0 }, { 1, 216 }, { 23, 255 }, { 1, 232 }, { 1, 202 }, { 1, 171 }, { 1, 140 }, { 1, 109 }, { 1, 79 }, { 1, 28 }, { 49, 0 }, { 1, 220 }, { 14, 255 }, { 1, 251 }, { 1, 223 }, { 1, 192 }, { 1, 161 }, { 1, 130 }, { 1, 99 }, { 1, 69 }, { 1, 38 }, { 1, 8 }, { 56, 0 }, { 1, 104 }, { 6, 255 }, { 1, 244 }, { 1, 213 }, { 1, 182 }, { 1, 151 }, { 1, 120 }, { 1, 90 }, { 1, 59 }, { 1, 28 }, { 1, 2 }, { 65, 0 }, { 1, 61 }, { 1, 116 }, { 1, 111 }, { 1, 80 }, { 1, 49 }, { 1, 18 }, { 109, 0 }, { 1, 3 }, { 1, 9 }, { 76, 0 }, { 1, 3 }, { 2, 31 }, { 76, 0 }, { 1, 26 }, { 1, 57 }, { 1, 26 }, { 75, 0 }, { 1, 12 }, { 1, 49 }, { 1, 53 }, { 1, 14 }, { 74, 0 }, { 1, 1 }, { 1, 34 }, { 1, 61 }, { 1, 34 }, { 1, 1 }, { 74, 0 }, { 1, 5 }, { 1, 47 }, { 1, 46 }, { 1, 14 }, { 75, 0 }, { 1, 11 }, { 1, 35 }, { 1, 13 }, { 76, 0 }, { 1, 1 }, { 1, 7 }, { 1305, 0 } }, 
+	LogoRLEFrame{ { 1400, 0 }, { 1, 1 }, { 77, 0 }, { 1, 1 }, { 1, 167 }, { 1, 246 }, { 1, 150 }, { 1, 1 }, { 75, 0 }, { 1, 82 }, { 3, 255 }, { 1, 102 }, { 75, 0 }, { 1, 182 }, { 3, 255 }, { 1, 222 }, { 1, 3 }, { 73, 0 }, { 1, 27 }, { 1, 252 }, { 4, 255 }, { 1, 89 }, { 73, 0 }, { 1, 123 }, { 5, 255 }, { 1, 209 }, { 72, 0 }, { 1, 1 }, { 1, 221 }, { 6, 255 }, { 1, 65 }, { 71, 0 }, { 1, 65 }, { 7, 255 }, { 1, 151 }, { 71, 0 }, { 1, 164 }, { 7, 255 }, { 1, 233 }, { 1, 3 }, { 69, 0 }, { 1, 16 }, { 1, 247 }, { 8, 255 }, { 1, 65 }, { 65, 0 }, { 1, 2 }, { 3, 0 }, { 1, 106 }, { 9, 255 }, { 1, 142 }, { 64, 0 }, { 1, 11 }, { 1, 3 }, { 3, 0 }, { 1, 205 }, { 9, 255 }, { 1, 152 }, { 64, 0 }, { 1, 28 }, { 3, 0 }, { 1, 48 }, { 10, 255 }, { 1, 143 }, { 63, 0 }, { 1, 25 }, { 1, 18 }, { 3, 0 }, { 1, 147 }, { 10, 255 }, { 1, 61 }, { 62, 0 }, { 1, 4 }, { 1, 52 }, { 3, 0 }, { 1, 7 }, { 1, 238 }, { 9, 255 }, { 1, 206 }, { 63, 0 }, { 1, 36 }, { 1, 35 }, { 3, 0 }, { 1, 89 }, { 9, 255 }, { 1, 249 }, { 1, 46 }, { 62, 0 }, { 1, 8 }, { 1, 61 }, { 1, 9 }, { 3, 0 }, { 1, 188 }, { 9, 255 }, { 1, 116 }, { 63, 0 }, { 1, 38 }, { 1, 41 }, { 3, 0 }, { 1, 32 }, { 9, 255 }, { 1, 192 }, { 1, 2 }, { 62, 0 }, { 1, 8 }, { 1, 61 }, { 1, 11 }, { 3, 0 }, { 1, 129 }, { 8, 255 }, { 1, 240 }, { 1, 30 }, { 63, 0 }, { 1, 39 }, { 1, 44 }, { 3, 0 }, { 1, 2 }, { 1, 226 }, { 8, 255 }, { 1, 92 }, { 5, 0 }, { 1, 48 }, { 1, 144 }, { 1, 166 }, { 1, 125 }, { 1, 23 }, { 53, 0 }, { 1, 8 }, { 1, 61 }, { 1, 15 }, { 3, 0 }, { 1, 71 }, { 8, 255 }, { 1, 169 }, { 4, 0 }, { 1, 1 }, { 1, 119 }, { 1, 251 }, { 3, 255 }, { 1, 241 }, { 1, 38 }, { 52, 0 }, { 1, 36 }, { 1, 46 }, { 4, 0 }, { 1, 170 }, { 7, 255 }, { 1, 228 }, { 1, 17 }, { 3, 0 }, { 1, 15 }, { 1, 176 }, { 6, 255 }, { 1, 200 }, { 1, 3 }, { 50, 0 }, { 1, 2 }, { 1, 58 }, { 1, 11 }, { 3, 0 }, { 1, 20 }, { 1, 249 }, { 7, 255 }, { 1, 68 }, { 3, 0 }, { 1, 45 }, { 1, 219 }, { 8, 255 }, { 1, 121 }, { 50, 0 }, { 1, 23 }, { 1, 37 }, { 4, 0 }, { 1, 112 }, { 7, 255 }, { 1, 144 }, { 3, 0 }, { 1, 92 }, { 1, 245 }, { 9, 255 }, { 1, 249 }, { 1, 47 }, { 49, 0 }, { 1, 43 }, { 1, 5 }, { 4, 0 }, { 1, 211 }, { 6, 255 }, { 1, 213 }, { 1, 8 }, { 1, 0 }, { 1, 6 }, { 1, 149 }, { 12, 255 }, { 1, 209 }, { 1, 6 }, { 47, 0 }, { 1, 9 }, { 1, 21 }, { 4, 0 }, { 1, 54 }, { 6, 255 }, { 1, 250 }, { 1, 49 }, { 1, 0 }, { 1, 29 }, { 1, 200 }, { 14, 255 }, { 1, 133 }, { 47, 0 }, { 1, 14 }, { 5, 0 }, { 1, 153 }, { 6, 255 }, { 1, 144 }, { 1, 0 }, { 1, 68 }, { 1, 235 }, { 15, 255 }, { 1, 252 }, { 1, 56 }, { 51, 0 }, { 1, 10 }, { 1, 241 }, { 6, 255 }, { 1, 204 }, { 1, 136 }, { 1, 253 }, { 17, 255 }, { 1, 217 }, { 1, 9 }, { 50, 0 }, { 1, 95 }, { 28, 255 }, { 1, 145 }, { 50, 0 }, { 1, 194 }, { 29, 255 }, { 1, 57 }, { 48, 0 }, { 1, 37 }, { 30, 255 }, { 1, 156 }, { 48, 0 }, { 1, 136 }, { 30, 255 }, { 1, 124 }, { 47, 0 }, { 1, 3 }, { 1, 230 }, { 29, 255 }, { 1, 221 }, { 1, 27 }, { 47, 0 }, { 1, 77 }, { 28, 255 }, { 1, 231 }, { 1, 143 }, { 1, 24 }, { 48, 0 }, { 1, 161 }, { 20, 255 }, { 1, 251 }, { 1, 220 }, { 1, 186 }, { 1, 153 }, { 1, 119 }, { 1, 85 }, { 1, 51 }, { 1, 18 }, { 51, 0 }, { 1, 180 }, { 13, 255 }, { 1, 234 }, { 1, 200 }, { 1, 167 }, { 1, 133 }, { 1, 99 }, { 1, 65 }, { 1, 32 }, { 1, 3 }, { 58, 0 }, { 1, 79 }, { 1, 252 }, { 4, 255 }, { 1, 247 }, { 1, 214 }, { 1, 181 }, { 1, 147 }, { 1, 113 }, { 1, 79 }, { 1, 46 }, { 1, 13 }, { 67, 0 }, { 1, 48 }, { 1, 102 }, { 1, 93 }, { 1, 59 }, { 1, 26 }, { 1, 1 }, { 112, 0 }, { 1, 19 }, { 1, 22 }, { 76, 0 }, { 1, 18 }, { 1, 49 }, { 1, 25 }, { 75, 0 }, { 1, 7 }, { 1, 43 }, { 1, 56 }, { 1, 16 }, { 75, 0 }, { 1, 27 }, { 1, 59 }, { 1, 40 }, { 1, 4 }, { 74, 0 }, { 1, 4 }, { 1, 47 }, { 1, 56 }, { 1, 19 }, { 56, 0 }, { 1, 1 }, { 1, 7 }, { 1, 1 }, { 16, 0 }, { 1, 11 }, { 1, 46 }, { 1, 25 }, { 1, 1 }, { 56, 0 }, { 1, 8 }, { 1, 12 }, { 17, 0 }, { 1, 9 }, { 1, 19 }, { 57, 0 }, { 1, 5 }, { 1, 17 }, { 1, 11 }, { 76, 0 }, { 1, 11 }, { 1, 19 }, { 1, 7 }, { 75, 0 }, { 1, 4 }, { 1, 17 }, { 1, 16 }, { 1, 3 }, { 75, 0 }, { 1, 10 }, { 1, 20 }, { 1, 11 }, { 75, 0 }, { 1, 2 }, { 1, 16 }, { 1, 18 }, { 1, 5 }, { 75, 0 }, { 1, 4 }, { 1, 18 }, { 1, 10 }, { 1, 1 }, { 75, 0 }, { 1, 7 }, { 1, 12 }, { 1, 2 }, { 76, 0 }, { 1, 5 }, { 1, 4 }, { 852, 0 } }, 
+	LogoRLEFrame{ { 1479, 0 }, { 1, 2 }, { 1, 131 }, { 1, 159 }, { 1, 33 }, { 76, 0 }, { 1, 115 }, { 2, 255 }, { 1, 209 }, { 1, 1 }, { 74, 0 }, { 1, 4 }, { 1, 227 }, { 3, 255 }, { 1, 75 }, { 74, 0 }, { 1, 84 }, { 4, 255 }, { 1, 186 }, { 69, 0 }, { 1, 2 }, { 4, 0 }, { 1, 193 }, { 5, 255 }, { 1, 43 }, { 68, 0 }, { 1, 14 }, { 3, 0 }, { 1, 46 }, { 6, 255 }, { 1, 143 }, { 67, 0 }, { 1, 23 }, { 1, 5 }, { 3, 0 }, { 1, 155 }, { 6, 255 }, { 1, 219 }, { 66, 0 }, { 1, 3 }, { 1, 39 }, { 3, 0 }, { 1, 18 }, { 1, 246 }, { 7, 255 }, { 1, 38 }, { 65, 0 }, { 1, 36 }, { 1, 21 }, { 3, 0 }, { 1, 118 }, { 8, 255 }, { 1, 113 }, { 64, 0 }, { 1, 11 }, { 1, 58 }, { 1, 2 }, { 2, 0 }, { 1, 2 }, { 1, 224 }, { 8, 255 }, { 1, 161 }, { 64, 0 }, { 1, 44 }, { 1, 34 }, { 3, 0 }, { 1, 80 }, { 9, 255 }, { 1, 146 }, { 63, 0 }, { 1, 12 }, { 1, 61 }, { 1, 6 }, { 3, 0 }, { 1, 189 }, { 9, 255 }, { 1, 100 }, { 63, 0 }, { 1, 44 }, { 1, 37 }, { 3, 0 }, { 1, 42 }, { 9, 255 }, { 1, 234 }, { 1, 8 }, { 62, 0 }, { 1, 13 }, { 1, 61 }, { 1, 8 }, { 3, 0 }, { 1, 151 }, { 9, 255 }, { 1, 100 }, { 63, 0 }, { 1, 45 }, { 1, 40 }, { 3, 0 }, { 1, 15 }, { 1, 244 }, { 8, 255 }, { 1, 170 }, { 63, 0 }, { 1, 11 }, { 1, 62 }, { 1, 10 }, { 3, 0 }, { 1, 113 }, { 8, 255 }, { 1, 225 }, { 1, 16 }, { 63, 0 }, { 2, 36 }, { 3, 0 }, { 1, 1 }, { 1, 220 }, { 7, 255 }, { 1, 252 }, { 1, 59 }, { 63, 0 }, { 1, 1 }, { 1, 54 }, { 1, 4 }, { 3, 0 }, { 1, 75 }, { 8, 255 }, { 1, 127 }, { 5, 0 }, { 1, 54 }, { 1, 111 }, { 1, 96 }, { 1, 26 }, { 55, 0 }, { 1, 22 }, { 1, 26 }, { 4, 0 }, { 1, 184 }, { 7, 255 }, { 1, 194 }, { 1, 3 }, { 3, 0 }, { 1, 7 }, { 1, 153 }, { 3, 255 }, { 1, 244 }, { 1, 73 }, { 54, 0 }, { 1, 31 }, { 4, 0 }, { 1, 38 }, { 7, 255 }, { 1, 238 }, { 1, 29 }, { 3, 0 }, { 1, 27 }, { 1, 201 }, { 5, 255 }, { 1, 224 }, { 1, 10 }, { 52, 0 }, { 1, 5 }, { 1, 8 }, { 4, 0 }, { 1, 146 }, { 7, 255 }, { 1, 83 }, { 3, 0 }, { 1, 59 }, { 1, 231 }, { 7, 255 }, { 1, 131 }, { 57, 0 }, { 1, 13 }, { 1, 242 }, { 6, 255 }, { 1, 154 }, { 3, 0 }, { 1, 103 }, { 1, 250 }, { 8, 255 }, { 1, 248 }, { 1, 37 }, { 56, 0 }, { 1, 108 }, { 6, 255 }, { 1, 214 }, { 1, 10 }, { 1, 0 }, { 1, 6 }, { 1, 153 }, { 11, 255 }, { 1, 184 }, { 55, 0 }, { 1, 1 }, { 1, 216 }, { 5, 255 }, { 1, 248 }, { 1, 47 }, { 1, 0 }, { 1, 24 }, { 1, 197 }, { 13, 255 }, { 1, 80 }, { 54, 0 }, { 1, 70 }, { 6, 255 }, { 1, 110 }, { 1, 0 }, { 1, 55 }, { 1, 229 }, { 14, 255 }, { 1, 224 }, { 1, 10 }, { 53, 0 }, { 1, 179 }, { 5, 255 }, { 1, 250 }, { 1, 6 }, { 1, 99 }, { 1, 248 }, { 16, 255 }, { 1, 131 }, { 52, 0 }, { 1, 34 }, { 1, 253 }, { 6, 255 }, { 1, 228 }, { 18, 255 }, { 1, 248 }, { 1, 37 }, { 51, 0 }, { 1, 141 }, { 27, 255 }, { 1, 181 }, { 50, 0 }, { 1, 11 }, { 1, 239 }, { 28, 255 }, { 1, 33 }, { 49, 0 }, { 1, 103 }, { 28, 255 }, { 1, 249 }, { 1, 18 }, { 49, 0 }, { 1, 212 }, { 28, 255 }, { 1, 142 }, { 49, 0 }, { 1, 66 }, { 27, 255 }, { 1, 221 }, { 1, 110 }, { 50, 0 }, { 1, 175 }, { 21, 255 }, { 1, 231 }, { 1, 192 }, { 1, 154 }, { 1, 116 }, { 1, 77 }, { 1, 39 }, { 1, 1 }, { 50, 0 }, { 1, 2 }, { 1, 249 }, { 14, 255 }, { 1, 243 }, { 1, 205 }, { 1, 167 }, { 1, 128 }, { 1, 90 }, { 1, 51 }, { 1, 14 }, { 57, 0 }, { 1, 7 }, { 1, 241 }, { 7, 255 }, { 1, 251 }, { 1, 218 }, { 1, 179 }, { 1, 141 }, { 1, 102 }, { 1, 64 }, { 1, 26 }, { 65, 0 }, { 1, 83 }, { 1, 215 }, { 1, 225 }, { 1, 192 }, { 1, 153 }, { 1, 115 }, { 1, 77 }, { 1, 38 }, { 1, 5 }, { 33, 0 }, { 1, 4 }, { 1, 3 }, { 76, 0 }, { 1, 4 }, { 1, 18 }, { 1, 11 }, { 75, 0 }, { 1, 1 }, { 1, 17 }, { 1, 28 }, { 1, 8 }, { 56, 0 }, { 1, 11 }, { 1, 1 }, { 17, 0 }, { 1, 9 }, { 1, 27 }, { 1, 22 }, { 1, 3 }, { 55, 0 }, { 1, 10 }, { 1, 31 }, { 1, 5 }, { 16, 0 }, { 1, 2 }, { 1, 21 }, { 1, 29 }, { 1, 12 }, { 55, 0 }, { 1, 3 }, { 1, 35 }, { 1, 41 }, { 1, 2 }, { 16, 0 }, { 1, 5 }, { 1, 25 }, { 1, 19 }, { 1, 3 }, { 55, 0 }, { 1, 20 }, { 1, 57 }, { 1, 34 }, { 17, 0 }, { 1, 8 }, { 1, 15 }, { 1, 3 }, { 55, 0 }, { 1, 4 }, { 1, 41 }, { 1, 58 }, { 1, 20 }, { 17, 0 }, { 1, 1 }, { 1, 2 }, { 56, 0 }, { 1, 18 }, { 1, 56 }, { 1, 47 }, { 1, 7 }, { 74, 0 }, { 1, 2 }, { 1, 38 }, { 1, 61 }, { 1, 30 }, { 75, 0 }, { 1, 6 }, { 2, 50 }, { 1, 13 }, { 75, 0 }, { 1, 13 }, { 1, 49 }, { 1, 23 }, { 76, 0 }, { 1, 18 }, { 1, 29 }, { 1, 2 }, { 76, 0 }, { 1, 8 }, { 1, 6 }, { 1088, 0 } }, 
+	LogoRLEFrame{ { 1396, 0 }, { 1, 1 }, { 78, 0 }, { 1, 14 }, { 78, 0 }, { 1, 3 }, { 1, 25 }, { 5, 0 }, { 1, 82 }, { 1, 174 }, { 1, 71 }, { 70, 0 }, { 1, 35 }, { 1, 7 }, { 4, 0 }, { 1, 43 }, { 1, 250 }, { 1, 255 }, { 1, 243 }, { 1, 18 }, { 68, 0 }, { 1, 11 }, { 1, 46 }, { 5, 0 }, { 1, 164 }, { 3, 255 }, { 1, 109 }, { 68, 0 }, { 1, 47 }, { 1, 24 }, { 4, 0 }, { 1, 33 }, { 1, 252 }, { 3, 255 }, { 1, 209 }, { 67, 0 }, { 1, 18 }, { 1, 57 }, { 1, 2 }, { 4, 0 }, { 1, 151 }, { 5, 255 }, { 1, 51 }, { 66, 0 }, { 1, 49 }, { 1, 30 }, { 4, 0 }, { 1, 24 }, { 1, 248 }, { 5, 255 }, { 1, 124 }, { 65, 0 }, { 1, 18 }, { 1, 59 }, { 1, 3 }, { 4, 0 }, { 1, 138 }, { 6, 255 }, { 1, 187 }, { 65, 0 }, { 1, 49 }, { 1, 33 }, { 4, 0 }, { 1, 16 }, { 1, 242 }, { 6, 255 }, { 1, 245 }, { 1, 5 }, { 63, 0 }, { 1, 18 }, { 1, 60 }, { 1, 5 }, { 4, 0 }, { 1, 124 }, { 8, 255 }, { 1, 40 }, { 63, 0 }, { 1, 48 }, { 1, 34 }, { 4, 0 }, { 1, 10 }, { 1, 235 }, { 8, 255 }, { 1, 15 }, { 62, 0 }, { 1, 9 }, { 1, 56 }, { 1, 3 }, { 4, 0 }, { 1, 111 }, { 8, 255 }, { 1, 214 }, { 63, 0 }, { 1, 34 }, { 1, 20 }, { 4, 0 }, { 1, 5 }, { 1, 226 }, { 8, 255 }, { 1, 85 }, { 62, 0 }, { 1, 1 }, { 1, 39 }, { 5, 0 }, { 1, 98 }, { 8, 255 }, { 1, 182 }, { 1, 1 }, { 62, 0 }, { 1, 17 }, { 1, 8 }, { 4, 0 }, { 1, 2 }, { 1, 217 }, { 7, 255 }, { 1, 227 }, { 1, 20 }, { 63, 0 }, { 1, 11 }, { 5, 0 }, { 1, 84 }, { 7, 255 }, { 1, 251 }, { 1, 60 }, { 70, 0 }, { 1, 205 }, { 7, 255 }, { 1, 119 }, { 70, 0 }, { 1, 71 }, { 7, 255 }, { 1, 182 }, { 1, 1 }, { 3, 0 }, { 1, 22 }, { 1, 153 }, { 1, 209 }, { 1, 187 }, { 1, 82 }, { 62, 0 }, { 1, 192 }, { 6, 255 }, { 1, 227 }, { 1, 20 }, { 3, 0 }, { 1, 56 }, { 1, 232 }, { 4, 255 }, { 1, 58 }, { 60, 0 }, { 1, 58 }, { 6, 255 }, { 1, 251 }, { 1, 60 }, { 3, 0 }, { 1, 91 }, { 1, 248 }, { 5, 255 }, { 1, 187 }, { 60, 0 }, { 1, 179 }, { 6, 255 }, { 1, 119 }, { 2, 0 }, { 1, 1 }, { 1, 133 }, { 8, 255 }, { 1, 62 }, { 58, 0 }, { 1, 46 }, { 6, 255 }, { 1, 182 }, { 1, 1 }, { 1, 0 }, { 1, 11 }, { 1, 174 }, { 9, 255 }, { 1, 192 }, { 58, 0 }, { 1, 166 }, { 5, 255 }, { 1, 227 }, { 1, 20 }, { 1, 0 }, { 1, 28 }, { 1, 207 }, { 11, 255 }, { 1, 65 }, { 56, 0 }, { 1, 34 }, { 1, 252 }, { 4, 255 }, { 1, 251 }, { 1, 59 }, { 1, 0 }, { 1, 55 }, { 1, 231 }, { 12, 255 }, { 1, 195 }, { 56, 0 }, { 1, 152 }, { 5, 255 }, { 1, 119 }, { 1, 0 }, { 1, 89 }, { 1, 247 }, { 14, 255 }, { 1, 68 }, { 54, 0 }, { 1, 25 }, { 1, 248 }, { 4, 255 }, { 1, 227 }, { 1, 2 }, { 1, 131 }, { 16, 255 }, { 1, 198 }, { 54, 0 }, { 1, 139 }, { 6, 255 }, { 1, 216 }, { 18, 255 }, { 1, 71 }, { 52, 0 }, { 1, 17 }, { 1, 243 }, { 25, 255 }, { 1, 196 }, { 52, 0 }, { 1, 126 }, { 26, 255 }, { 1, 239 }, { 51, 0 }, { 1, 11 }, { 1, 236 }, { 26, 255 }, { 1, 153 }, { 51, 0 }, { 1, 112 }, { 26, 255 }, { 1, 183 }, { 1, 11 }, { 50, 0 }, { 1, 6 }, { 1, 228 }, { 22, 255 }, { 1, 246 }, { 1, 203 }, { 1, 155 }, { 1, 65 }, { 1, 1 }, { 51, 0 }, { 1, 99 }, { 17, 255 }, { 1, 253 }, { 1, 218 }, { 1, 173 }, { 1, 128 }, { 1, 83 }, { 1, 37 }, { 1, 2 }, { 55, 0 }, { 1, 202 }, { 12, 255 }, { 1, 233 }, { 1, 188 }, { 1, 142 }, { 1, 97 }, { 1, 52 }, { 1, 10 }, { 61, 0 }, { 1, 232 }, { 6, 255 }, { 1, 246 }, { 1, 202 }, { 1, 157 }, { 1, 112 }, { 1, 67 }, { 1, 22 }, { 10, 0 }, { 1, 1 }, { 56, 0 }, { 1, 94 }, { 1, 219 }, { 1, 214 }, { 1, 172 }, { 1, 127 }, { 1, 82 }, { 1, 37 }, { 1, 2 }, { 13, 0 }, { 1, 1 }, { 1, 20 }, { 1, 6 }, { 76, 0 }, { 1, 18 }, { 1, 39 }, { 1, 5 }, { 75, 0 }, { 1, 9 }, { 1, 44 }, { 1, 42 }, { 1, 2 }, { 75, 0 }, { 1, 27 }, { 1, 60 }, { 1, 32 }, { 75, 0 }, { 1, 7 }, { 1, 46 }, { 1, 56 }, { 1, 16 }, { 75, 0 }, { 1, 24 }, { 1, 59 }, { 1, 43 }, { 1, 4 }, { 74, 0 }, { 1, 2 }, { 1, 42 }, { 1, 60 }, { 1, 25 }, { 75, 0 }, { 1, 6 }, { 1, 50 }, { 1, 41 }, { 1, 8 }, { 75, 0 }, { 1, 13 }, { 1, 43 }, { 1, 14 }, { 76, 0 }, { 1, 14 }, { 1, 19 }, { 77, 0 }, { 2, 1 }, { 1324, 0 } }, 
+	LogoRLEFrame{ { 998, 0 }, { 1, 2 }, { 78, 0 }, { 1, 3 }, { 1, 10 }, { 78, 0 }, { 1, 28 }, { 78, 0 }, { 1, 11 }, { 1, 32 }, { 78, 0 }, { 1, 47 }, { 1, 10 }, { 77, 0 }, { 1, 21 }, { 1, 49 }, { 78, 0 }, { 1, 54 }, { 1, 22 }, { 77, 0 }, { 1, 23 }, { 1, 54 }, { 78, 0 }, { 1, 54 }, { 1, 26 }, { 6, 0 }, { 1, 21 }, { 1, 145 }, { 1, 100 }, { 68, 0 }, { 1, 24 }, { 1, 57 }, { 1, 1 }, { 6, 0 }, { 1, 192 }, { 2, 255 }, { 1, 46 }, { 66, 0 }, { 1, 1 }, { 1, 54 }, { 1, 29 }, { 6, 0 }, { 1, 79 }, { 3, 255 }, { 1, 133 }, { 66, 0 }, { 1, 22 }, { 1, 57 }, { 1, 3 }, { 5, 0 }, { 1, 2 }, { 1, 211 }, { 3, 255 }, { 1, 217 }, { 66, 0 }, { 1, 47 }, { 1, 22 }, { 6, 0 }, { 1, 93 }, { 5, 255 }, { 1, 38 }, { 64, 0 }, { 1, 8 }, { 1, 46 }, { 6, 0 }, { 1, 5 }, { 1, 222 }, { 5, 255 }, { 1, 87 }, { 64, 0 }, { 1, 31 }, { 1, 9 }, { 6, 0 }, { 1, 107 }, { 6, 255 }, { 1, 133 }, { 64, 0 }, { 1, 25 }, { 6, 0 }, { 1, 10 }, { 1, 231 }, { 6, 255 }, { 1, 174 }, { 63, 0 }, { 1, 9 }, { 1, 1 }, { 6, 0 }, { 1, 120 }, { 7, 255 }, { 1, 142 }, { 70, 0 }, { 1, 16 }, { 1, 238 }, { 7, 255 }, { 1, 74 }, { 70, 0 }, { 1, 134 }, { 7, 255 }, { 1, 185 }, { 70, 0 }, { 1, 24 }, { 1, 245 }, { 6, 255 }, { 1, 237 }, { 1, 32 }, { 70, 0 }, { 1, 148 }, { 6, 255 }, { 1, 253 }, { 1, 73 }, { 70, 0 }, { 1, 32 }, { 1, 249 }, { 6, 255 }, { 1, 127 }, { 71, 0 }, { 1, 161 }, { 6, 255 }, { 1, 182 }, { 1, 1 }, { 3, 0 }, { 1, 15 }, { 1, 54 }, { 1, 23 }, { 64, 0 }, { 1, 43 }, { 1, 253 }, { 5, 255 }, { 1, 222 }, { 1, 17 }, { 3, 0 }, { 1, 108 }, { 1, 245 }, { 1, 255 }, { 1, 253 }, { 1, 122 }, { 63, 0 }, { 1, 175 }, { 5, 255 }, { 1, 247 }, { 1, 49 }, { 2, 0 }, { 1, 3 }, { 1, 151 }, { 4, 255 }, { 1, 246 }, { 1, 17 }, { 61, 0 }, { 1, 55 }, { 6, 255 }, { 1, 96 }, { 2, 0 }, { 1, 12 }, { 1, 182 }, { 6, 255 }, { 1, 112 }, { 61, 0 }, { 1, 189 }, { 5, 255 }, { 1, 152 }, { 2, 0 }, { 1, 27 }, { 1, 207 }, { 7, 255 }, { 1, 216 }, { 60, 0 }, { 1, 67 }, { 5, 255 }, { 1, 202 }, { 1, 7 }, { 1, 0 }, { 1, 46 }, { 1, 227 }, { 9, 255 }, { 1, 65 }, { 59, 0 }, { 1, 201 }, { 4, 255 }, { 1, 235 }, { 1, 30 }, { 1, 0 }, { 1, 71 }, { 1, 242 }, { 10, 255 }, { 1, 169 }, { 58, 0 }, { 1, 81 }, { 4, 255 }, { 1, 253 }, { 1, 69 }, { 1, 0 }, { 1, 101 }, { 1, 251 }, { 11, 255 }, { 1, 250 }, { 1, 23 }, { 56, 0 }, { 1, 2 }, { 1, 213 }, { 4, 255 }, { 1, 122 }, { 1, 1 }, { 1, 135 }, { 14, 255 }, { 1, 122 }, { 56, 0 }, { 1, 95 }, { 4, 255 }, { 1, 199 }, { 1, 9 }, { 1, 168 }, { 15, 255 }, { 1, 224 }, { 1, 2 }, { 54, 0 }, { 1, 6 }, { 1, 223 }, { 4, 255 }, { 1, 239 }, { 1, 212 }, { 17, 255 }, { 1, 75 }, { 54, 0 }, { 1, 108 }, { 24, 255 }, { 1, 158 }, { 53, 0 }, { 1, 11 }, { 1, 232 }, { 24, 255 }, { 1, 113 }, { 53, 0 }, { 1, 122 }, { 24, 255 }, { 1, 200 }, { 1, 11 }, { 52, 0 }, { 1, 17 }, { 1, 239 }, { 22, 255 }, { 1, 237 }, { 1, 137 }, { 1, 9 }, { 53, 0 }, { 1, 136 }, { 19, 255 }, { 1, 216 }, { 1, 163 }, { 1, 110 }, { 1, 56 }, { 1, 7 }, { 1, 0 }, { 1, 8 }, { 1, 2 }, { 51, 0 }, { 1, 25 }, { 1, 245 }, { 14, 255 }, { 1, 227 }, { 1, 174 }, { 1, 120 }, { 1, 67 }, { 1, 15 }, { 4, 0 }, { 1, 4 }, { 1, 29 }, { 1, 9 }, { 52, 0 }, { 1, 144 }, { 10, 255 }, { 1, 237 }, { 1, 184 }, { 1, 131 }, { 1, 78 }, { 1, 25 }, { 8, 0 }, { 1, 27 }, { 1, 45 }, { 1, 5 }, { 53, 0 }, { 1, 215 }, { 5, 255 }, { 1, 245 }, { 1, 195 }, { 1, 142 }, { 1, 88 }, { 1, 35 }, { 11, 0 }, { 1, 13 }, { 1, 51 }, { 1, 43 }, { 1, 2 }, { 54, 0 }, { 1, 117 }, { 1, 227 }, { 1, 205 }, { 1, 152 }, { 1, 99 }, { 1, 46 }, { 1, 3 }, { 13, 0 }, { 1, 1 }, { 1, 32 }, { 1, 60 }, { 1, 29 }, { 75, 0 }, { 1, 11 }, { 1, 50 }, { 1, 53 }, { 1, 13 }, { 75, 0 }, { 1, 29 }, { 1, 61 }, { 1, 38 }, { 1, 2 }, { 74, 0 }, { 1, 2 }, { 1, 42 }, { 1, 57 }, { 1, 20 }, { 75, 0 }, { 1, 7 }, { 1, 50 }, { 1, 36 }, { 1, 3 }, { 75, 0 }, { 1, 14 }, { 1, 39 }, { 1, 12 }, { 76, 0 }, { 1, 7 }, { 1, 13 }, { 1639, 0 } }, 
+	LogoRLEFrame{ { 680, 0 }, { 1, 7 }, { 78, 0 }, { 1, 5 }, { 1, 8 }, { 78, 0 }, { 1, 20 }, { 78, 0 }, { 1, 10 }, { 1, 17 }, { 77, 0 }, { 1, 1 }, { 1, 27 }, { 1, 6 }, { 77, 0 }, { 1, 14 }, { 1, 23 }, { 77, 0 }, { 1, 1 }, { 1, 28 }, { 1, 9 }, { 77, 0 }, { 1, 14 }, { 1, 25 }, { 77, 0 }, { 1, 1 }, { 1, 28 }, { 1, 10 }, { 77, 0 }, { 1, 15 }, { 1, 26 }, { 78, 0 }, { 1, 28 }, { 1, 11 }, { 77, 0 }, { 1, 10 }, { 1, 23 }, { 78, 0 }, { 1, 21 }, { 1, 5 }, { 7, 0 }, { 1, 85 }, { 1, 118 }, { 1, 1 }, { 67, 0 }, { 1, 3 }, { 1, 16 }, { 7, 0 }, { 1, 93 }, { 2, 255 }, { 1, 79 }, { 67, 0 }, { 1, 11 }, { 1, 1 }, { 6, 0 }, { 1, 16 }, { 1, 235 }, { 2, 255 }, { 1, 149 }, { 67, 0 }, { 1, 5 }, { 7, 0 }, { 1, 144 }, { 3, 255 }, { 1, 216 }, { 74, 0 }, { 1, 41 }, { 1, 251 }, { 4, 255 }, { 1, 10 }, { 73, 0 }, { 1, 185 }, { 5, 255 }, { 1, 38 }, { 72, 0 }, { 1, 78 }, { 6, 255 }, { 1, 67 }, { 71, 0 }, { 1, 6 }, { 1, 219 }, { 6, 255 }, { 1, 37 }, { 71, 0 }, { 1, 119 }, { 6, 255 }, { 1, 212 }, { 71, 0 }, { 1, 24 }, { 1, 242 }, { 5, 255 }, { 1, 253 }, { 1, 60 }, { 71, 0 }, { 1, 160 }, { 6, 255 }, { 1, 129 }, { 71, 0 }, { 1, 54 }, { 6, 255 }, { 1, 177 }, { 1, 1 }, { 70, 0 }, { 1, 1 }, { 1, 200 }, { 5, 255 }, { 1, 214 }, { 1, 13 }, { 71, 0 }, { 1, 93 }, { 5, 255 }, { 1, 239 }, { 1, 37 }, { 3, 0 }, { 1, 77 }, { 1, 130 }, { 1, 91 }, { 1, 2 }, { 64, 0 }, { 1, 12 }, { 1, 229 }, { 4, 255 }, { 1, 253 }, { 1, 72 }, { 2, 0 }, { 1, 11 }, { 1, 177 }, { 3, 255 }, { 1, 131 }, { 64, 0 }, { 1, 134 }, { 5, 255 }, { 1, 118 }, { 2, 0 }, { 1, 22 }, { 1, 203 }, { 4, 255 }, { 1, 217 }, { 63, 0 }, { 1, 34 }, { 1, 248 }, { 4, 255 }, { 1, 167 }, { 2, 0 }, { 1, 36 }, { 1, 220 }, { 6, 255 }, { 1, 42 }, { 62, 0 }, { 1, 175 }, { 4, 255 }, { 1, 206 }, { 1, 9 }, { 1, 0 }, { 1, 53 }, { 1, 234 }, { 7, 255 }, { 1, 123 }, { 51, 0 }, { 1, 4 }, { 9, 0 }, { 1, 68 }, { 4, 255 }, { 1, 234 }, { 1, 30 }, { 1, 0 }, { 1, 74 }, { 1, 244 }, { 8, 255 }, { 1, 204 }, { 50, 0 }, { 1, 1 }, { 1, 9 }, { 8, 0 }, { 1, 4 }, { 1, 212 }, { 3, 255 }, { 1, 250 }, { 1, 62 }, { 1, 0 }, { 1, 98 }, { 1, 251 }, { 10, 255 }, { 1, 30 }, { 49, 0 }, { 1, 13 }, { 1, 2 }, { 8, 0 }, { 1, 109 }, { 4, 255 }, { 1, 106 }, { 1, 0 }, { 1, 125 }, { 12, 255 }, { 1, 110 }, { 48, 0 }, { 1, 7 }, { 1, 13 }, { 8, 0 }, { 1, 19 }, { 1, 238 }, { 3, 255 }, { 1, 155 }, { 1, 3 }, { 1, 153 }, { 13, 255 }, { 1, 191 }, { 47, 0 }, { 1, 2 }, { 1, 19 }, { 1, 4 }, { 8, 0 }, { 1, 150 }, { 3, 255 }, { 1, 204 }, { 1, 16 }, { 1, 177 }, { 14, 255 }, { 1, 252 }, { 1, 20 }, { 46, 0 }, { 2, 13 }, { 8, 0 }, { 1, 46 }, { 1, 252 }, { 3, 255 }, { 1, 213 }, { 1, 206 }, { 16, 255 }, { 1, 89 }, { 45, 0 }, { 1, 4 }, { 1, 20 }, { 1, 2 }, { 8, 0 }, { 1, 190 }, { 22, 255 }, { 1, 116 }, { 45, 0 }, { 1, 17 }, { 1, 11 }, { 8, 0 }, { 1, 83 }, { 22, 255 }, { 1, 243 }, { 1, 24 }, { 44, 0 }, { 1, 8 }, { 1, 19 }, { 1, 1 }, { 7, 0 }, { 1, 8 }, { 1, 223 }, { 21, 255 }, { 1, 231 }, { 1, 53 }, { 5, 0 }, { 1, 16 }, { 1, 8 }, { 37, 0 }, { 1, 1 }, { 1, 19 }, { 1, 8 }, { 8, 0 }, { 1, 124 }, { 19, 255 }, { 1, 247 }, { 1, 191 }, { 1, 108 }, { 1, 11 }, { 4, 0 }, { 1, 10 }, { 1, 38 }, { 1, 10 }, { 38, 0 }, { 1, 10 }, { 1, 16 }, { 8, 0 }, { 1, 28 }, { 1, 245 }, { 15, 255 }, { 1, 241 }, { 1, 182 }, { 1, 120 }, { 1, 59 }, { 1, 6 }, { 5, 0 }, { 1, 3 }, { 1, 35 }, { 1, 49 }, { 1, 6 }, { 38, 0 }, { 1, 1 }, { 1, 18 }, { 1, 3 }, { 8, 0 }, { 1, 165 }, { 12, 255 }, { 1, 234 }, { 1, 173 }, { 1, 111 }, { 1, 50 }, { 1, 3 }, { 8, 0 }, { 1, 17 }, { 1, 56 }, { 1, 42 }, { 1, 2 }, { 39, 0 }, { 2, 9 }, { 8, 0 }, { 1, 58 }, { 9, 255 }, { 1, 226 }, { 1, 164 }, { 1, 102 }, { 1, 40 }, { 11, 0 }, { 1, 2 }, { 1, 37 }, { 1, 60 }, { 1, 25 }, { 41, 0 }, { 1, 12 }, { 9, 0 }, { 1, 168 }, { 5, 255 }, { 1, 216 }, { 1, 155 }, { 1, 93 }, { 1, 31 }, { 14, 0 }, { 1, 15 }, { 1, 54 }, { 1, 50 }, { 1, 9 }, { 41, 0 }, { 1, 5 }, { 1, 1 }, { 9, 0 }, { 1, 133 }, { 1, 243 }, { 1, 207 }, { 1, 146 }, { 1, 84 }, { 1, 23 }, { 17, 0 }, { 1, 32 }, { 1, 62 }, { 1, 34 }, { 1, 1 }, { 42, 0 }, { 1, 1 }, { 31, 0 }, { 1, 2 }, { 1, 43 }, { 1, 49 }, { 1, 14 }, { 75, 0 }, { 1, 7 }, { 1, 43 }, { 1, 22 }, { 76, 0 }, { 1, 10 }, { 1, 24 }, { 1, 1 }, { 77, 0 }, { 1, 3 }, { 1875, 0 } }, 
+	LogoRLEFrame{ { 1643, 0 }, { 1, 62 }, { 1, 116 }, { 1, 1 }, { 76, 0 }, { 1, 66 }, { 1, 251 }, { 1, 255 }, { 1, 64 }, { 75, 0 }, { 1, 10 }, { 1, 223 }, { 2, 255 }, { 1, 116 }, { 75, 0 }, { 1, 138 }, { 3, 255 }, { 1, 165 }, { 74, 0 }, { 1, 47 }, { 1, 251 }, { 3, 255 }, { 1, 184 }, { 73, 0 }, { 1, 2 }, { 1, 200 }, { 4, 255 }, { 1, 195 }, { 73, 0 }, { 1, 107 }, { 5, 255 }, { 1, 180 }, { 72, 0 }, { 1, 26 }, { 1, 241 }, { 5, 255 }, { 1, 93 }, { 72, 0 }, { 1, 173 }, { 5, 255 }, { 1, 194 }, { 1, 3 }, { 71, 0 }, { 1, 77 }, { 5, 255 }, { 1, 231 }, { 1, 26 }, { 71, 0 }, { 1, 12 }, { 1, 226 }, { 4, 255 }, { 1, 247 }, { 1, 54 }, { 72, 0 }, { 1, 143 }, { 5, 255 }, { 1, 89 }, { 72, 0 }, { 1, 50 }, { 1, 252 }, { 4, 255 }, { 1, 129 }, { 2, 0 }, { 1, 3 }, { 1, 102 }, { 1, 161 }, { 1, 117 }, { 1, 5 }, { 56, 0 }, { 1, 5 }, { 8, 0 }, { 1, 3 }, { 1, 204 }, { 4, 255 }, { 1, 170 }, { 1, 1 }, { 1, 0 }, { 1, 17 }, { 1, 194 }, { 3, 255 }, { 1, 100 }, { 55, 0 }, { 1, 4 }, { 1, 16 }, { 8, 0 }, { 1, 112 }, { 4, 255 }, { 1, 204 }, { 1, 9 }, { 1, 0 }, { 1, 27 }, { 1, 212 }, { 4, 255 }, { 1, 161 }, { 55, 0 }, { 1, 34 }, { 8, 0 }, { 1, 29 }, { 1, 243 }, { 3, 255 }, { 1, 229 }, { 1, 26 }, { 1, 0 }, { 1, 40 }, { 1, 225 }, { 5, 255 }, { 1, 223 }, { 54, 0 }, { 1, 22 }, { 1, 28 }, { 8, 0 }, { 1, 178 }, { 3, 255 }, { 1, 246 }, { 1, 52 }, { 1, 0 }, { 1, 56 }, { 1, 236 }, { 7, 255 }, { 1, 29 }, { 52, 0 }, { 1, 7 }, { 1, 55 }, { 1, 3 }, { 7, 0 }, { 1, 82 }, { 4, 255 }, { 1, 85 }, { 1, 0 }, { 1, 74 }, { 1, 245 }, { 8, 255 }, { 1, 90 }, { 52, 0 }, { 1, 45 }, { 1, 34 }, { 7, 0 }, { 1, 14 }, { 1, 229 }, { 3, 255 }, { 1, 125 }, { 1, 0 }, { 1, 94 }, { 1, 251 }, { 9, 255 }, { 1, 152 }, { 51, 0 }, { 1, 20 }, { 1, 58 }, { 1, 4 }, { 7, 0 }, { 1, 148 }, { 3, 255 }, { 1, 167 }, { 1, 0 }, { 1, 117 }, { 11, 255 }, { 1, 213 }, { 50, 0 }, { 1, 2 }, { 1, 55 }, { 1, 26 }, { 7, 0 }, { 1, 55 }, { 1, 253 }, { 2, 255 }, { 1, 201 }, { 1, 10 }, { 1, 141 }, { 13, 255 }, { 1, 20 }, { 49, 0 }, { 1, 31 }, { 1, 53 }, { 7, 0 }, { 1, 4 }, { 1, 208 }, { 2, 255 }, { 1, 227 }, { 1, 30 }, { 1, 164 }, { 14, 255 }, { 1, 80 }, { 48, 0 }, { 1, 8 }, { 1, 61 }, { 1, 18 }, { 7, 0 }, { 1, 117 }, { 3, 255 }, { 1, 177 }, { 1, 187 }, { 15, 255 }, { 1, 129 }, { 11, 0 }, { 1, 4 }, { 1, 3 }, { 35, 0 }, { 1, 42 }, { 1, 46 }, { 7, 0 }, { 1, 32 }, { 1, 245 }, { 20, 255 }, { 1, 116 }, { 9, 0 }, { 1, 1 }, { 1, 25 }, { 1, 14 }, { 35, 0 }, { 1, 10 }, { 1, 59 }, { 1, 8 }, { 7, 0 }, { 1, 183 }, { 20, 255 }, { 1, 212 }, { 1, 9 }, { 8, 0 }, { 1, 18 }, { 1, 46 }, { 1, 11 }, { 36, 0 }, { 1, 40 }, { 1, 26 }, { 7, 0 }, { 1, 87 }, { 20, 255 }, { 1, 171 }, { 1, 15 }, { 7, 0 }, { 1, 6 }, { 1, 44 }, { 1, 50 }, { 1, 6 }, { 36, 0 }, { 1, 7 }, { 1, 45 }, { 7, 0 }, { 1, 16 }, { 1, 231 }, { 16, 255 }, { 1, 251 }, { 1, 195 }, { 1, 126 }, { 1, 40 }, { 8, 0 }, { 1, 23 }, { 1, 58 }, { 1, 38 }, { 1, 2 }, { 37, 0 }, { 1, 30 }, { 1, 5 }, { 7, 0 }, { 1, 153 }, { 14, 255 }, { 1, 217 }, { 1, 147 }, { 1, 78 }, { 1, 14 }, { 9, 0 }, { 1, 5 }, { 1, 43 }, { 1, 58 }, { 1, 20 }, { 38, 0 }, { 1, 4 }, { 1, 12 }, { 7, 0 }, { 1, 59 }, { 11, 255 }, { 1, 236 }, { 1, 168 }, { 1, 99 }, { 1, 30 }, { 12, 0 }, { 1, 19 }, { 1, 57 }, { 1, 47 }, { 1, 7 }, { 39, 0 }, { 1, 1 }, { 7, 0 }, { 1, 5 }, { 1, 212 }, { 7, 255 }, { 1, 249 }, { 1, 190 }, { 1, 120 }, { 1, 51 }, { 1, 2 }, { 14, 0 }, { 1, 33 }, { 1, 60 }, { 1, 29 }, { 49, 0 }, { 1, 106 }, { 5, 255 }, { 1, 211 }, { 1, 141 }, { 1, 72 }, { 1, 10 }, { 16, 0 }, { 1, 2 }, { 1, 43 }, { 1, 39 }, { 1, 6 }, { 50, 0 }, { 1, 156 }, { 1, 255 }, { 1, 231 }, { 1, 163 }, { 1, 93 }, { 1, 25 }, { 19, 0 }, { 1, 7 }, { 1, 36 }, { 1, 12 }, { 52, 0 }, { 1, 4 }, { 1, 24 }, { 22, 0 }, { 1, 5 }, { 1, 14 }, { 2190, 0 } }, 
+	LogoRLEFrame{ { 1724, 0 }, { 1, 99 }, { 1, 81 }, { 77, 0 }, { 1, 129 }, { 1, 255 }, { 1, 228 }, { 76, 0 }, { 1, 57 }, { 1, 253 }, { 2, 255 }, { 1, 9 }, { 74, 0 }, { 1, 8 }, { 1, 216 }, { 3, 255 }, { 1, 35 }, { 74, 0 }, { 1, 140 }, { 4, 255 }, { 1, 31 }, { 73, 0 }, { 1, 58 }, { 1, 253 }, { 4, 255 }, { 1, 23 }, { 72, 0 }, { 1, 9 }, { 1, 217 }, { 4, 255 }, { 1, 201 }, { 73, 0 }, { 1, 141 }, { 5, 255 }, { 1, 72 }, { 61, 0 }, { 2, 5 }, { 9, 0 }, { 1, 58 }, { 1, 253 }, { 4, 255 }, { 1, 123 }, { 62, 0 }, { 1, 25 }, { 9, 0 }, { 1, 9 }, { 1, 217 }, { 4, 255 }, { 1, 162 }, { 62, 0 }, { 1, 24 }, { 1, 16 }, { 9, 0 }, { 1, 142 }, { 4, 255 }, { 1, 192 }, { 1, 6 }, { 61, 0 }, { 1, 8 }, { 1, 47 }, { 9, 0 }, { 1, 59 }, { 1, 253 }, { 3, 255 }, { 1, 216 }, { 1, 17 }, { 2, 0 }, { 1, 78 }, { 1, 131 }, { 1, 73 }, { 57, 0 }, { 1, 47 }, { 1, 23 }, { 8, 0 }, { 1, 9 }, { 1, 218 }, { 3, 255 }, { 1, 235 }, { 1, 35 }, { 1, 0 }, { 1, 10 }, { 1, 178 }, { 3, 255 }, { 1, 39 }, { 55, 0 }, { 1, 25 }, { 1, 53 }, { 1, 1 }, { 8, 0 }, { 1, 143 }, { 3, 255 }, { 1, 248 }, { 1, 58 }, { 1, 0 }, { 1, 18 }, { 1, 199 }, { 4, 255 }, { 1, 87 }, { 54, 0 }, { 1, 4 }, { 1, 58 }, { 1, 19 }, { 8, 0 }, { 1, 60 }, { 1, 253 }, { 3, 255 }, { 1, 88 }, { 1, 0 }, { 1, 28 }, { 1, 213 }, { 5, 255 }, { 1, 133 }, { 54, 0 }, { 1, 37 }, { 1, 47 }, { 8, 0 }, { 1, 10 }, { 1, 219 }, { 3, 255 }, { 1, 121 }, { 1, 0 }, { 1, 40 }, { 1, 225 }, { 6, 255 }, { 1, 180 }, { 1, 0 }, { 1, 18 }, { 1, 5 }, { 50, 0 }, { 1, 12 }, { 1, 61 }, { 1, 12 }, { 8, 0 }, { 1, 144 }, { 3, 255 }, { 1, 157 }, { 1, 0 }, { 1, 54 }, { 1, 235 }, { 7, 255 }, { 1, 227 }, { 1, 38 }, { 1, 6 }, { 51, 0 }, { 1, 49 }, { 1, 39 }, { 8, 0 }, { 1, 61 }, { 3, 255 }, { 1, 188 }, { 1, 5 }, { 1, 69 }, { 1, 243 }, { 9, 255 }, { 1, 20 }, { 51, 0 }, { 1, 21 }, { 1, 59 }, { 1, 6 }, { 7, 0 }, { 1, 10 }, { 1, 220 }, { 2, 255 }, { 1, 214 }, { 1, 16 }, { 1, 87 }, { 1, 249 }, { 10, 255 }, { 1, 63 }, { 16, 0 }, { 1, 11 }, { 1, 10 }, { 33, 0 }, { 1, 50 }, { 1, 23 }, { 8, 0 }, { 1, 145 }, { 2, 255 }, { 1, 233 }, { 1, 32 }, { 1, 107 }, { 1, 253 }, { 11, 255 }, { 1, 110 }, { 14, 0 }, { 1, 4 }, { 1, 34 }, { 1, 17 }, { 33, 0 }, { 1, 17 }, { 1, 44 }, { 8, 0 }, { 1, 62 }, { 2, 255 }, { 1, 246 }, { 1, 55 }, { 1, 128 }, { 13, 255 }, { 1, 157 }, { 13, 0 }, { 1, 27 }, { 1, 51 }, { 1, 11 }, { 34, 0 }, { 1, 42 }, { 1, 6 }, { 7, 0 }, { 1, 11 }, { 1, 221 }, { 2, 255 }, { 1, 124 }, { 1, 150 }, { 14, 255 }, { 1, 193 }, { 11, 0 }, { 1, 10 }, { 1, 49 }, { 1, 50 }, { 1, 6 }, { 34, 0 }, { 1, 13 }, { 1, 15 }, { 8, 0 }, { 1, 147 }, { 19, 255 }, { 1, 171 }, { 10, 0 }, { 1, 28 }, { 1, 60 }, { 1, 34 }, { 1, 1 }, { 35, 0 }, { 1, 11 }, { 8, 0 }, { 1, 63 }, { 19, 255 }, { 1, 232 }, { 1, 33 }, { 8, 0 }, { 1, 8 }, { 1, 47 }, { 1, 56 }, { 1, 16 }, { 45, 0 }, { 1, 11 }, { 1, 221 }, { 18, 255 }, { 1, 189 }, { 1, 29 }, { 8, 0 }, { 1, 22 }, { 1, 59 }, { 1, 43 }, { 1, 4 }, { 46, 0 }, { 1, 148 }, { 16, 255 }, { 1, 214 }, { 1, 139 }, { 1, 53 }, { 9, 0 }, { 1, 33 }, { 1, 55 }, { 1, 22 }, { 47, 0 }, { 1, 64 }, { 13, 255 }, { 1, 247 }, { 1, 182 }, { 1, 107 }, { 1, 33 }, { 10, 0 }, { 1, 2 }, { 1, 40 }, { 1, 30 }, { 1, 2 }, { 47, 0 }, { 1, 11 }, { 1, 222 }, { 10, 255 }, { 1, 226 }, { 1, 151 }, { 1, 76 }, { 1, 10 }, { 12, 0 }, { 1, 7 }, { 1, 26 }, { 1, 5 }, { 49, 0 }, { 1, 149 }, { 7, 255 }, { 1, 252 }, { 1, 195 }, { 1, 120 }, { 1, 45 }, { 16, 0 }, { 1, 5 }, { 50, 0 }, { 1, 61 }, { 5, 255 }, { 1, 236 }, { 1, 163 }, { 1, 89 }, { 1, 18 }, { 70, 0 }, { 1, 173 }, { 2, 255 }, { 1, 207 }, { 1, 132 }, { 1, 57 }, { 1, 2 }, { 73, 0 }, { 1, 55 }, { 1, 86 }, { 1, 27 }, { 2213, 0 } }, 
+	LogoRLEFrame{ { 1804, 0 }, { 1, 34 }, { 1, 136 }, { 1, 20 }, { 76, 0 }, { 1, 26 }, { 1, 229 }, { 1, 255 }, { 1, 94 }, { 63, 0 }, { 1, 1 }, { 11, 0 }, { 1, 1 }, { 1, 185 }, { 2, 255 }, { 1, 116 }, { 63, 0 }, { 1, 14 }, { 11, 0 }, { 1, 108 }, { 3, 255 }, { 1, 124 }, { 62, 0 }, { 1, 23 }, { 1, 6 }, { 10, 0 }, { 1, 40 }, { 1, 246 }, { 3, 255 }, { 1, 104 }, { 61, 0 }, { 1, 8 }, { 1, 36 }, { 10, 0 }, { 1, 5 }, { 1, 204 }, { 4, 255 }, { 1, 67 }, { 61, 0 }, { 1, 48 }, { 1, 11 }, { 10, 0 }, { 1, 132 }, { 4, 255 }, { 1, 209 }, { 61, 0 }, { 1, 29 }, { 1, 46 }, { 10, 0 }, { 1, 58 }, { 1, 252 }, { 3, 255 }, { 1, 241 }, { 1, 44 }, { 60, 0 }, { 1, 7 }, { 1, 60 }, { 1, 13 }, { 9, 0 }, { 1, 12 }, { 1, 221 }, { 3, 255 }, { 1, 251 }, { 1, 71 }, { 61, 0 }, { 1, 42 }, { 1, 41 }, { 10, 0 }, { 1, 157 }, { 4, 255 }, { 1, 98 }, { 61, 0 }, { 1, 17 }, { 1, 60 }, { 1, 7 }, { 9, 0 }, { 1, 79 }, { 4, 255 }, { 1, 128 }, { 2, 0 }, { 1, 6 }, { 1, 38 }, { 1, 6 }, { 56, 0 }, { 1, 1 }, { 1, 53 }, { 1, 32 }, { 9, 0 }, { 1, 23 }, { 1, 234 }, { 3, 255 }, { 1, 158 }, { 2, 0 }, { 1, 85 }, { 1, 235 }, { 1, 255 }, { 1, 221 }, { 1, 4 }, { 5, 0 }, { 1, 9 }, { 1, 3 }, { 48, 0 }, { 1, 28 }, { 1, 57 }, { 1, 3 }, { 9, 0 }, { 1, 180 }, { 3, 255 }, { 1, 185 }, { 1, 4 }, { 1, 0 }, { 1, 114 }, { 4, 255 }, { 1, 35 }, { 3, 0 }, { 1, 4 }, { 1, 30 }, { 1, 10 }, { 48, 0 }, { 1, 2 }, { 1, 58 }, { 1, 22 }, { 9, 0 }, { 1, 104 }, { 3, 255 }, { 1, 207 }, { 1, 13 }, { 1, 0 }, { 1, 136 }, { 5, 255 }, { 1, 71 }, { 2, 0 }, { 1, 23 }, { 1, 47 }, { 1, 7 }, { 17, 0 }, { 1, 1 }, { 1, 2 }, { 30, 0 }, { 1, 27 }, { 1, 43 }, { 9, 0 }, { 1, 37 }, { 1, 245 }, { 2, 255 }, { 1, 225 }, { 1, 25 }, { 1, 3 }, { 1, 157 }, { 6, 255 }, { 1, 107 }, { 1, 8 }, { 1, 47 }, { 1, 48 }, { 1, 4 }, { 17, 0 }, { 2, 9 }, { 30, 0 }, { 1, 1 }, { 1, 51 }, { 1, 5 }, { 8, 0 }, { 1, 4 }, { 1, 201 }, { 2, 255 }, { 1, 239 }, { 1, 42 }, { 1, 8 }, { 1, 176 }, { 7, 255 }, { 1, 152 }, { 1, 59 }, { 1, 36 }, { 1, 1 }, { 16, 0 }, { 1, 5 }, { 1, 21 }, { 1, 9 }, { 31, 0 }, { 1, 24 }, { 1, 18 }, { 9, 0 }, { 1, 128 }, { 2, 255 }, { 1, 249 }, { 1, 64 }, { 1, 15 }, { 1, 193 }, { 8, 255 }, { 1, 195 }, { 1, 20 }, { 16, 0 }, { 1, 1 }, { 1, 17 }, { 1, 27 }, { 1, 5 }, { 32, 0 }, { 1, 23 }, { 9, 0 }, { 1, 55 }, { 1, 251 }, { 2, 255 }, { 1, 89 }, { 1, 24 }, { 1, 208 }, { 9, 255 }, { 1, 215 }, { 16, 0 }, { 1, 7 }, { 1, 26 }, { 1, 23 }, { 1, 3 }, { 32, 0 }, { 1, 4 }, { 9, 0 }, { 1, 11 }, { 1, 218 }, { 2, 255 }, { 1, 118 }, { 1, 35 }, { 1, 221 }, { 10, 255 }, { 1, 248 }, { 1, 2 }, { 14, 0 }, { 1, 16 }, { 1, 30 }, { 1, 14 }, { 44, 0 }, { 1, 152 }, { 2, 255 }, { 1, 149 }, { 1, 48 }, { 1, 232 }, { 12, 255 }, { 1, 29 }, { 12, 0 }, { 1, 6 }, { 1, 25 }, { 1, 26 }, { 1, 6 }, { 44, 0 }, { 1, 76 }, { 2, 255 }, { 1, 178 }, { 1, 66 }, { 1, 241 }, { 13, 255 }, { 1, 62 }, { 11, 0 }, { 1, 11 }, { 1, 30 }, { 1, 19 }, { 1, 1 }, { 44, 0 }, { 1, 21 }, { 1, 232 }, { 2, 255 }, { 1, 185 }, { 1, 248 }, { 14, 255 }, { 1, 59 }, { 10, 0 }, { 1, 16 }, { 1, 23 }, { 1, 6 }, { 46, 0 }, { 1, 176 }, { 18, 255 }, { 1, 184 }, { 9, 0 }, { 1, 1 }, { 1, 17 }, { 1, 10 }, { 47, 0 }, { 1, 99 }, { 18, 255 }, { 1, 168 }, { 1, 10 }, { 8, 0 }, { 1, 1 }, { 1, 8 }, { 48, 0 }, { 1, 34 }, { 1, 243 }, { 15, 255 }, { 1, 242 }, { 1, 169 }, { 1, 59 }, { 59, 0 }, { 1, 3 }, { 1, 198 }, { 13, 255 }, { 1, 227 }, { 1, 149 }, { 1, 71 }, { 1, 6 }, { 61, 0 }, { 1, 123 }, { 11, 255 }, { 1, 206 }, { 1, 128 }, { 1, 50 }, { 64, 0 }, { 1, 51 }, { 1, 250 }, { 7, 255 }, { 1, 250 }, { 1, 185 }, { 1, 107 }, { 1, 30 }, { 66, 0 }, { 1, 9 }, { 1, 215 }, { 5, 255 }, { 1, 238 }, { 1, 164 }, { 1, 86 }, { 1, 14 }, { 69, 0 }, { 1, 131 }, { 3, 255 }, { 1, 222 }, { 1, 143 }, { 1, 65 }, { 1, 4 }, { 72, 0 }, { 1, 155 }, { 1, 191 }, { 1, 122 }, { 1, 44 }, { 2212, 0 } }, 
+	LogoRLEFrame{ { 1633, 0 }, { 1, 4 }, { 78, 0 }, { 1, 18 }, { 78, 0 }, { 1, 9 }, { 1, 25 }, { 78, 0 }, { 1, 45 }, { 1, 3 }, { 10, 0 }, { 1, 9 }, { 1, 171 }, { 1, 197 }, { 64, 0 }, { 1, 31 }, { 1, 34 }, { 11, 0 }, { 1, 167 }, { 1, 255 }, { 1, 248 }, { 63, 0 }, { 1, 11 }, { 1, 60 }, { 1, 7 }, { 10, 0 }, { 1, 96 }, { 3, 255 }, { 1, 3 }, { 62, 0 }, { 1, 47 }, { 1, 34 }, { 10, 0 }, { 1, 37 }, { 1, 243 }, { 2, 255 }, { 1, 240 }, { 62, 0 }, { 1, 22 }, { 1, 57 }, { 1, 3 }, { 9, 0 }, { 1, 5 }, { 1, 203 }, { 3, 255 }, { 1, 211 }, { 61, 0 }, { 1, 3 }, { 1, 56 }, { 1, 26 }, { 10, 0 }, { 1, 136 }, { 4, 255 }, { 1, 115 }, { 61, 0 }, { 1, 34 }, { 1, 52 }, { 10, 0 }, { 1, 66 }, { 1, 253 }, { 3, 255 }, { 1, 208 }, { 1, 9 }, { 60, 0 }, { 1, 9 }, { 1, 61 }, { 1, 18 }, { 9, 0 }, { 1, 19 }, { 1, 229 }, { 3, 255 }, { 1, 225 }, { 1, 26 }, { 13, 0 }, { 1, 2 }, { 47, 0 }, { 1, 38 }, { 1, 41 }, { 10, 0 }, { 1, 176 }, { 3, 255 }, { 1, 238 }, { 1, 41 }, { 13, 0 }, { 1, 19 }, { 1, 12 }, { 46, 0 }, { 1, 6 }, { 1, 55 }, { 1, 4 }, { 9, 0 }, { 1, 104 }, { 3, 255 }, { 1, 247 }, { 1, 59 }, { 12, 0 }, { 1, 10 }, { 1, 41 }, { 1, 13 }, { 47, 0 }, { 1, 34 }, { 1, 19 }, { 9, 0 }, { 1, 42 }, { 1, 246 }, { 2, 255 }, { 1, 253 }, { 1, 80 }, { 1, 0 }, { 1, 10 }, { 1, 136 }, { 1, 221 }, { 1, 194 }, { 1, 24 }, { 5, 0 }, { 1, 2 }, { 1, 33 }, { 1, 52 }, { 1, 8 }, { 47, 0 }, { 1, 4 }, { 1, 32 }, { 9, 0 }, { 1, 7 }, { 1, 209 }, { 3, 255 }, { 1, 104 }, { 1, 0 }, { 1, 19 }, { 1, 200 }, { 3, 255 }, { 1, 85 }, { 4, 0 }, { 1, 12 }, { 1, 52 }, { 1, 47 }, { 1, 5 }, { 48, 0 }, { 1, 17 }, { 1, 1 }, { 9, 0 }, { 1, 144 }, { 3, 255 }, { 1, 131 }, { 1, 0 }, { 1, 29 }, { 1, 214 }, { 4, 255 }, { 1, 113 }, { 3, 0 }, { 1, 29 }, { 1, 60 }, { 1, 32 }, { 50, 0 }, { 1, 2 }, { 9, 0 }, { 1, 74 }, { 3, 255 }, { 1, 157 }, { 1, 0 }, { 1, 41 }, { 1, 226 }, { 5, 255 }, { 1, 142 }, { 1, 0 }, { 1, 7 }, { 1, 47 }, { 1, 57 }, { 1, 16 }, { 60, 0 }, { 1, 23 }, { 1, 233 }, { 2, 255 }, { 1, 181 }, { 1, 4 }, { 1, 55 }, { 1, 236 }, { 6, 255 }, { 1, 171 }, { 1, 16 }, { 1, 58 }, { 1, 46 }, { 1, 5 }, { 60, 0 }, { 1, 1 }, { 1, 184 }, { 2, 255 }, { 1, 201 }, { 1, 10 }, { 1, 71 }, { 1, 244 }, { 7, 255 }, { 1, 204 }, { 1, 56 }, { 1, 24 }, { 62, 0 }, { 1, 113 }, { 2, 255 }, { 1, 218 }, { 1, 20 }, { 1, 90 }, { 1, 250 }, { 8, 255 }, { 1, 231 }, { 1, 3 }, { 62, 0 }, { 1, 48 }, { 1, 249 }, { 1, 255 }, { 1, 232 }, { 1, 33 }, { 1, 110 }, { 10, 255 }, { 1, 253 }, { 1, 4 }, { 61, 0 }, { 1, 10 }, { 1, 215 }, { 1, 255 }, { 1, 243 }, { 1, 50 }, { 1, 132 }, { 12, 255 }, { 1, 29 }, { 61, 0 }, { 1, 153 }, { 1, 255 }, { 1, 250 }, { 1, 72 }, { 1, 154 }, { 13, 255 }, { 1, 58 }, { 60, 0 }, { 1, 82 }, { 2, 255 }, { 2, 175 }, { 14, 255 }, { 1, 64 }, { 59, 0 }, { 1, 28 }, { 1, 237 }, { 17, 255 }, { 1, 209 }, { 1, 5 }, { 58, 0 }, { 1, 2 }, { 1, 191 }, { 17, 255 }, { 1, 204 }, { 1, 28 }, { 59, 0 }, { 1, 121 }, { 16, 255 }, { 1, 219 }, { 1, 106 }, { 1, 7 }, { 59, 0 }, { 1, 54 }, { 1, 251 }, { 13, 255 }, { 1, 205 }, { 1, 125 }, { 1, 45 }, { 61, 0 }, { 1, 13 }, { 1, 220 }, { 10, 255 }, { 1, 252 }, { 1, 190 }, { 1, 110 }, { 1, 30 }, { 64, 0 }, { 1, 162 }, { 8, 255 }, { 1, 246 }, { 1, 175 }, { 1, 95 }, { 1, 19 }, { 66, 0 }, { 1, 90 }, { 6, 255 }, { 1, 237 }, { 1, 160 }, { 1, 80 }, { 1, 10 }, { 68, 0 }, { 1, 27 }, { 1, 241 }, { 3, 255 }, { 1, 225 }, { 1, 145 }, { 1, 65 }, { 1, 4 }, { 71, 0 }, { 1, 126 }, { 1, 255 }, { 1, 211 }, { 1, 130 }, { 1, 50 }, { 75, 0 }, { 1, 7 }, { 1, 19 }, { 2135, 0 } }, 
+	LogoRLEFrame{ { 1315, 0 }, { 1, 8 }, { 78, 0 }, { 1, 10 }, { 1, 13 }, { 77, 0 }, { 1, 1 }, { 1, 38 }, { 78, 0 }, { 1, 32 }, { 1, 22 }, { 77, 0 }, { 1, 13 }, { 1, 55 }, { 1, 1 }, { 77, 0 }, { 1, 52 }, { 1, 27 }, { 77, 0 }, { 1, 28 }, { 1, 53 }, { 1, 1 }, { 76, 0 }, { 1, 5 }, { 1, 59 }, { 1, 19 }, { 9, 0 }, { 1, 4 }, { 1, 141 }, { 1, 147 }, { 65, 0 }, { 1, 39 }, { 1, 47 }, { 10, 0 }, { 1, 153 }, { 1, 255 }, { 1, 224 }, { 64, 0 }, { 1, 14 }, { 1, 62 }, { 1, 12 }, { 9, 0 }, { 1, 86 }, { 2, 255 }, { 1, 232 }, { 64, 0 }, { 1, 48 }, { 1, 38 }, { 9, 0 }, { 1, 32 }, { 1, 240 }, { 2, 255 }, { 1, 212 }, { 63, 0 }, { 1, 15 }, { 1, 56 }, { 1, 3 }, { 8, 0 }, { 1, 4 }, { 1, 199 }, { 3, 255 }, { 1, 179 }, { 63, 0 }, { 1, 45 }, { 1, 17 }, { 9, 0 }, { 1, 135 }, { 4, 255 }, { 1, 83 }, { 16, 0 }, { 2, 9 }, { 44, 0 }, { 1, 12 }, { 1, 37 }, { 9, 0 }, { 1, 67 }, { 1, 253 }, { 3, 255 }, { 1, 182 }, { 15, 0 }, { 1, 2 }, { 1, 31 }, { 1, 18 }, { 45, 0 }, { 1, 29 }, { 1, 1 }, { 8, 0 }, { 1, 21 }, { 1, 230 }, { 3, 255 }, { 1, 201 }, { 1, 11 }, { 14, 0 }, { 1, 20 }, { 1, 51 }, { 1, 14 }, { 45, 0 }, { 1, 5 }, { 1, 7 }, { 8, 0 }, { 1, 1 }, { 1, 182 }, { 3, 255 }, { 1, 217 }, { 1, 20 }, { 13, 0 }, { 1, 4 }, { 1, 43 }, { 1, 55 }, { 1, 10 }, { 56, 0 }, { 1, 114 }, { 3, 255 }, { 1, 230 }, { 1, 32 }, { 13, 0 }, { 1, 17 }, { 1, 56 }, { 1, 43 }, { 1, 4 }, { 56, 0 }, { 1, 51 }, { 1, 249 }, { 2, 255 }, { 1, 241 }, { 1, 47 }, { 1, 0 }, { 1, 27 }, { 1, 167 }, { 1, 230 }, { 1, 169 }, { 1, 2 }, { 6, 0 }, { 1, 1 }, { 1, 35 }, { 1, 61 }, { 1, 27 }, { 57, 0 }, { 1, 12 }, { 1, 218 }, { 2, 255 }, { 1, 248 }, { 1, 64 }, { 1, 0 }, { 1, 46 }, { 1, 230 }, { 3, 255 }, { 1, 23 }, { 5, 0 }, { 1, 10 }, { 1, 52 }, { 1, 54 }, { 1, 12 }, { 58, 0 }, { 1, 162 }, { 2, 255 }, { 1, 253 }, { 1, 85 }, { 1, 0 }, { 1, 62 }, { 1, 240 }, { 4, 255 }, { 1, 48 }, { 4, 0 }, { 1, 16 }, { 1, 58 }, { 1, 38 }, { 1, 3 }, { 58, 0 }, { 1, 93 }, { 3, 255 }, { 1, 108 }, { 1, 0 }, { 1, 79 }, { 1, 247 }, { 5, 255 }, { 1, 73 }, { 3, 0 }, { 1, 24 }, { 1, 47 }, { 1, 12 }, { 59, 0 }, { 1, 36 }, { 1, 243 }, { 2, 255 }, { 1, 133 }, { 1, 0 }, { 1, 100 }, { 1, 252 }, { 6, 255 }, { 1, 98 }, { 2, 0 }, { 1, 26 }, { 1, 22 }, { 60, 0 }, { 1, 6 }, { 1, 204 }, { 2, 255 }, { 1, 158 }, { 1, 0 }, { 1, 123 }, { 8, 255 }, { 1, 123 }, { 1, 0 }, { 1, 11 }, { 1, 2 }, { 61, 0 }, { 1, 141 }, { 2, 255 }, { 1, 180 }, { 1, 6 }, { 1, 146 }, { 9, 255 }, { 1, 148 }, { 63, 0 }, { 1, 73 }, { 2, 255 }, { 1, 199 }, { 1, 16 }, { 1, 167 }, { 10, 255 }, { 1, 174 }, { 62, 0 }, { 1, 24 }, { 1, 234 }, { 1, 255 }, { 1, 215 }, { 1, 31 }, { 1, 186 }, { 11, 255 }, { 1, 199 }, { 61, 0 }, { 1, 1 }, { 1, 187 }, { 1, 255 }, { 1, 229 }, { 1, 52 }, { 1, 203 }, { 12, 255 }, { 1, 223 }, { 61, 0 }, { 1, 120 }, { 2, 255 }, { 1, 138 }, { 1, 217 }, { 13, 255 }, { 1, 225 }, { 60, 0 }, { 1, 56 }, { 1, 251 }, { 17, 255 }, { 1, 111 }, { 59, 0 }, { 1, 15 }, { 1, 222 }, { 16, 255 }, { 1, 253 }, { 1, 122 }, { 60, 0 }, { 1, 168 }, { 15, 255 }, { 1, 247 }, { 1, 168 }, { 1, 47 }, { 60, 0 }, { 1, 99 }, { 13, 255 }, { 1, 240 }, { 1, 164 }, { 1, 83 }, { 1, 11 }, { 61, 0 }, { 1, 40 }, { 1, 245 }, { 10, 255 }, { 1, 230 }, { 1, 151 }, { 1, 70 }, { 1, 5 }, { 63, 0 }, { 1, 8 }, { 1, 209 }, { 8, 255 }, { 1, 219 }, { 1, 138 }, { 1, 57 }, { 1, 1 }, { 66, 0 }, { 1, 147 }, { 6, 255 }, { 1, 206 }, { 1, 125 }, { 1, 44 }, { 69, 0 }, { 1, 73 }, { 3, 255 }, { 1, 252 }, { 1, 193 }, { 1, 112 }, { 1, 32 }, { 72, 0 }, { 1, 190 }, { 1, 247 }, { 1, 180 }, { 1, 99 }, { 1, 21 }, { 75, 0 }, { 1, 13 }, { 1, 5 }, { 664, 0 }, { 1, 7 }, { 1, 1 }, { 76, 0 }, { 1, 11 }, { 1, 16 }, { 1, 1 }, { 75, 0 }, { 1, 10 }, { 1, 25 }, { 1, 14 }, { 75, 0 }, { 1, 5 }, { 1, 23 }, { 1, 27 }, { 1, 7 }, { 74, 0 }, { 1, 1 }, { 1, 16 }, { 1, 30 }, { 1, 18 }, { 1, 1 }, { 74, 0 }, { 1, 9 }, { 1, 27 }, { 1, 25 }, { 1, 7 }, { 74, 0 }, { 1, 1 }, { 1, 19 }, { 1, 30 }, { 1, 15 }, { 75, 0 }, { 1, 5 }, { 1, 25 }, { 1, 17 }, { 1, 3 }, { 75, 0 }, { 1, 11 }, { 1, 16 }, { 1, 3 }, { 76, 0 }, { 1, 6 }, { 1, 2 }, { 764, 0 } }, 
+
+} };
+	
+} // namespace RoundVideoData
diff --git a/Telegram/SourceFiles/ui/controls/send_as_button.cpp b/Telegram/SourceFiles/ui/controls/send_as_button.cpp
index 2ffbe77900d320..b6062f73c9d73e 100644
--- a/Telegram/SourceFiles/ui/controls/send_as_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/send_as_button.cpp
@@ -9,7 +9,7 @@ For license and copyright information please follow this link:
 
 #include "ui/effects/cross_animation.h"
 #include "ui/painter.h"
-#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 
 namespace Ui {
 
diff --git a/Telegram/SourceFiles/ui/controls/send_button.cpp b/Telegram/SourceFiles/ui/controls/send_button.cpp
index 639c2a75fcd5eb..6d148049bd381c 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/send_button.cpp
@@ -7,62 +7,149 @@ For license and copyright information please follow this link:
 */
 #include "ui/controls/send_button.h"
 
+#include "lang/lang_tag.h"
+#include "lottie/lottie_icon.h"
 #include "ui/effects/ripple_animation.h"
+#include "ui/text/text_utilities.h"
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
+#include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h"
+#include "lang/lang_keys.h"
+#include "ui/text/format_values.h"
 
 namespace Ui {
 namespace {
 
-constexpr int kWideScale = 5;
+constexpr auto kWideScale = 5;
+constexpr auto kVoiceToRoundIndex = 0;
+constexpr auto kRoundToVoiceIndex = 1;
+constexpr auto kForbiddenOpacity = 0.5;
 
 } // namespace
 
 SendButton::SendButton(QWidget *parent, const style::SendButton &st)
 : RippleButton(parent, st.inner.ripple)
-, _st(st) {
-	resize(_st.inner.width, _st.inner.height);
+, _st(st)
+, _lastRippleShape(currentRippleShape()) {
+	updateSize();
 }
 
-void SendButton::setType(Type type) {
-	Expects(isSlowmode() || type != Type::Slowmode);
+SendButton::~SendButton() = default;
 
-	if (isSlowmode() && type != Type::Slowmode) {
-		_afterSlowmodeType = type;
+void SendButton::setState(State state) {
+	if (_state == state) {
 		return;
 	}
-	if (_type != type) {
+
+	const auto previousType = _state.type;
+	const auto newType = state.type;
+	const auto voiceRoundTransition = isVoiceRoundTransition(
+		previousType,
+		newType);
+
+	const auto hasSlowmode = (_state.slowmodeDelay > 0);
+	const auto hasSlowmodeChanged = hasSlowmode != (state.slowmodeDelay > 0);
+	auto withSameSlowmode = state;
+	withSameSlowmode.slowmodeDelay = _state.slowmodeDelay;
+	const auto animate = hasSlowmodeChanged
+		|| (!hasSlowmode && withSameSlowmode != _state);
+
+	if (animate && !voiceRoundTransition) {
 		_contentFrom = grabContent();
-		_type = type;
-		_a_typeChanged.stop();
+	}
+
+	if (_voiceRoundAnimating && !voiceRoundTransition) {
+		_voiceRoundAnimating = false;
+	}
+
+	if (_state.slowmodeDelay != state.slowmodeDelay) {
+		const auto seconds = state.slowmodeDelay;
+		const auto minutes = seconds / 60;
+		_slowmodeDelayText = seconds
+			? u"%1:%2"_q.arg(minutes).arg(seconds % 60, 2, 10, QChar('0'))
+			: QString();
+	}
+	if (!state.starsToSend || state.type != Type::Send) {
+		_starsToSendText = Text::String();
+	} else if (_starsToSendText.isEmpty()
+		|| _state.starsToSend != state.starsToSend) {
+		_starsToSendText.setMarkedText(
+			_st.stars.style,
+			Text::IconEmoji(&st::starIconEmoji).append(
+				Lang::FormatCountToShort(state.starsToSend).string),
+			kMarkupTextOptions);
+	}
+	_state = state;
+
+	const auto newShape = currentRippleShape();
+	if (_lastRippleShape != newShape) {
+		_lastRippleShape = newShape;
+		RippleButton::finishAnimating();
+	}
+
+	setAccessibleName([&] {
+		switch (_state.type) {
+		case Type::Send: return tr::lng_send_button(tr::now);
+		case Type::Record:
+			return tr::lng_shortcuts_record_voice_message(tr::now);
+		case Type::Round:
+			return tr::lng_shortcuts_record_round_message(tr::now);
+		case Type::Cancel: return tr::lng_cancel(tr::now);
+		case Type::Save: return tr::lng_settings_save(tr::now);
+		case Type::Slowmode:
+			return tr::lng_slowmode_enabled(
+				tr::now,
+				lt_left,
+				Ui::FormatDurationWordsSlowmode(_state.slowmodeDelay));
+		case Type::Schedule: return tr::lng_schedule_button(tr::now);
+		case Type::EditPrice:
+			return tr::lng_suggest_menu_edit_price(tr::now);
+		}
+		Unexpected("Send button type.");
+	}());
+
+	if (voiceRoundTransition) {
+		_voiceRoundAnimating = true;
+
+		const auto toRound = (newType == Type::Round);
+		const auto index = toRound ? kVoiceToRoundIndex : kRoundToVoiceIndex;
+		auto &icon = _voiceRoundIcons[index];
+		if (!icon) {
+			initVoiceRoundIcon(index);
+		}
+		icon->animate([=, raw = icon.get()] {
+			update();
+			if (!raw->animating()) {
+				_voiceRoundAnimating = false;
+			}
+		}, 0, icon->framesCount() - 1);
+		auto &after = _voiceRoundIcons[1 - index];
+		if (!after) {
+			initVoiceRoundIcon(1 - index);
+		} else if (after->frameIndex() != 0) {
+			after->jumpTo(0, nullptr);
+		}
+	} else if (animate) {
+		_stateChangeFromWidth = width();
+		_stateChangeAnimation.stop();
+		updateSize();
 		_contentTo = grabContent();
-		_a_typeChanged.start(
-			[=] { update(); },
+		_stateChangeAnimation.start(
+			[=] { updateSize(); update(); },
 			0.,
 			1.,
 			st::universalDuration);
-		setPointerCursor(_type != Type::Slowmode);
-		update();
+		setPointerCursor(_state.type != Type::Slowmode);
+		updateSize();
 	}
-}
-
-void SendButton::setSlowmodeDelay(int seconds) {
-	Expects(seconds >= 0 && seconds < kSlowmodeDelayLimit);
-
-	if (_slowmodeDelay == seconds) {
-		return;
-	}
-	_slowmodeDelay = seconds;
-	_slowmodeDelayText = isSlowmode()
-		? u"%1:%2"_q.arg(seconds / 60).arg(seconds % 60, 2, 10, QChar('0'))
-		: QString();
-	setType(isSlowmode() ? Type::Slowmode : _afterSlowmodeType);
 	update();
 }
 
 void SendButton::finishAnimating() {
-	_a_typeChanged.stop();
+	_stateChangeAnimation.stop();
+	updateSize();
 	update();
 }
 
@@ -70,45 +157,127 @@ void SendButton::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
 	auto over = (isDown() || isOver());
-	auto changed = _a_typeChanged.value(1.);
+
+	if (_voiceRoundAnimating) {
+		paintVoiceRoundIcon(p, over);
+		return;
+	}
+
+	auto changed = _stateChangeAnimation.value(1.);
 	if (changed < 1.) {
 		PainterHighQualityEnabler hq(p);
+		const auto ratio = style::DevicePixelRatio();
+
 		p.setOpacity(1. - changed);
-		auto targetRect = QRect((1 - kWideScale) / 2 * width(), (1 - kWideScale) / 2 * height(), kWideScale * width(), kWideScale * height());
-		auto hiddenWidth = anim::interpolate(0, (1 - kWideScale) / 2 * width(), changed);
-		auto hiddenHeight = anim::interpolate(0, (1 - kWideScale) / 2 * height(), changed);
-		p.drawPixmap(targetRect.marginsAdded(QMargins(hiddenWidth, hiddenHeight, hiddenWidth, hiddenHeight)), _contentFrom);
+		const auto fromSize = _contentFrom.size() / (kWideScale * ratio);
+		const auto fromShift = QPoint(
+			(width() - fromSize.width()) / 2,
+			(height() - fromSize.height()) / 2);
+		auto fromRect = QRect(
+			(1 - kWideScale) / 2 * fromSize.width(),
+			(1 - kWideScale) / 2 * fromSize.height(),
+			kWideScale * fromSize.width(),
+			kWideScale * fromSize.height()
+		).translated(fromShift);
+		auto hiddenWidth = anim::interpolate(0, (1 - kWideScale) / 2 * fromSize.width(), changed);
+		auto hiddenHeight = anim::interpolate(0, (1 - kWideScale) / 2 * fromSize.height(), changed);
+		p.drawPixmap(
+			fromRect.marginsAdded(
+				{ hiddenWidth, hiddenHeight, hiddenWidth, hiddenHeight }),
+			_contentFrom);
+
 		p.setOpacity(changed);
+		const auto toSize = _contentTo.size() / (kWideScale * ratio);
+		const auto toShift = QPoint(
+			(width() - toSize.width()) / 2,
+			(height() - toSize.height()) / 2);
+		auto toRect = QRect(
+			(1 - kWideScale) / 2 * toSize.width(),
+			(1 - kWideScale) / 2 * toSize.height(),
+			kWideScale * toSize.width(),
+			kWideScale * toSize.height()
+		).translated(toShift);
 		auto shownWidth = anim::interpolate((1 - kWideScale) / 2 * width(), 0, changed);
-		auto shownHeight = anim::interpolate((1 - kWideScale) / 2 * height(), 0, changed);
-		p.drawPixmap(targetRect.marginsAdded(QMargins(shownWidth, shownHeight, shownWidth, shownHeight)), _contentTo);
+		auto shownHeight = anim::interpolate((1 - kWideScale) / 2 * toSize.height(), 0, changed);
+		p.drawPixmap(
+			toRect.marginsAdded(
+				{ shownWidth, shownHeight, shownWidth, shownHeight }),
+			_contentTo);
 		return;
 	}
-	switch (_type) {
+	switch (_state.type) {
 	case Type::Record: paintRecord(p, over); break;
+	case Type::Round: paintRound(p, over); break;
 	case Type::Save: paintSave(p, over); break;
 	case Type::Cancel: paintCancel(p, over); break;
-	case Type::Send: paintSend(p, over); break;
+	case Type::Send:
+		if (_starsToSendText.isEmpty()) {
+			paintSend(p, over);
+		} else {
+			paintStarsToSend(p, over);
+		}
+		break;
 	case Type::Schedule: paintSchedule(p, over); break;
 	case Type::Slowmode: paintSlowmode(p); break;
+	case Type::EditPrice: break;
 	}
 }
 
 void SendButton::paintRecord(QPainter &p, bool over) {
-	if (!isDisabled()) {
+	if (!isDisabled() && !_state.forbidden) {
+		paintRipple(
+			p,
+			(width() - _st.inner.rippleAreaSize) / 2,
+			_st.inner.rippleAreaPosition.y());
+	}
+	if (_state.forbidden) {
+		p.setOpacity(kForbiddenOpacity);
+	}
+	paintLottieIcon(p, kVoiceToRoundIndex, over);
+	if (_state.forbidden) {
+		p.setOpacity(1.);
+	}
+}
+
+void SendButton::paintRound(QPainter &p, bool over) {
+	if (!isDisabled() && !_state.forbidden) {
 		paintRipple(
 			p,
 			(width() - _st.inner.rippleAreaSize) / 2,
 			_st.inner.rippleAreaPosition.y());
 	}
+	if (_state.forbidden) {
+		p.setOpacity(kForbiddenOpacity);
+	}
+	paintLottieIcon(p, kRoundToVoiceIndex, over);
+	if (_state.forbidden) {
+		p.setOpacity(1.);
+	}
+}
 
-	const auto &icon = (isDisabled() || !over)
-		? _st.record
-		: _st.recordOver;
-	icon.paintInCenter(p, rect());
+void SendButton::paintLottieIcon(QPainter &p, int index, bool over) {
+	auto &icon = _voiceRoundIcons[index];
+	if (!icon) {
+		initVoiceRoundIcon(index);
+	} else if (!_voiceRoundAnimating && icon->frameIndex() != 0) {
+		icon->jumpTo(0, [=] { update(); });
+	}
+	const auto color = (isDisabled() || !over)
+		? st::historyRecordVoiceFg->c
+		: st::historyRecordVoiceFgOver->c;
+	icon->paintInCenter(p, rect(), color);
 }
 
 void SendButton::paintSave(QPainter &p, bool over) {
+	if (!isDisabled()) {
+		auto color = _st.sendIconFg->c;
+		color.setAlpha(25);
+		paintRipple(
+			p,
+			(width() - _st.inner.rippleAreaSize) / 2,
+			_st.inner.rippleAreaPosition.y(),
+			&color);
+	}
 	const auto &saveIcon = over
 		? st::historyEditSaveIconOver
 		: st::historyEditSaveIcon;
@@ -129,24 +298,78 @@ void SendButton::paintCancel(QPainter &p, bool over) {
 
 void SendButton::paintSend(QPainter &p, bool over) {
 	const auto &sendIcon = over ? _st.inner.iconOver : _st.inner.icon;
+	if (const auto padding = _st.sendIconFillPadding; padding > 0) {
+		const auto ellipse = sendEllipseRect();
+		{
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			if (_state.fillBgOverride.isValid()) {
+				p.setBrush(_state.fillBgOverride);
+			} else {
+				p.setBrush(st::windowBgActive);
+			}
+			p.drawEllipse(ellipse);
+		}
+		if (!isDisabled()) {
+			auto color = _st.sendIconFg->c;
+			color.setAlpha(25);
+			paintRipple(p, ellipse.topLeft(), &color);
+		}
+	} else if (!isDisabled()) {
+		auto color = _st.sendIconFg->c;
+		color.setAlpha(25);
+		paintRipple(
+			p,
+			(width() - _st.inner.rippleAreaSize) / 2,
+			_st.inner.rippleAreaPosition.y(),
+			&color);
+	}
 	if (isDisabled()) {
 		const auto color = st::historyRecordVoiceFg->c;
-		sendIcon.paint(p, st::historySendIconPosition, width(), color);
+		sendIcon.paint(p, _st.sendIconPosition, width(), color);
 	} else {
-		sendIcon.paint(p, st::historySendIconPosition, width());
+		sendIcon.paint(p, _st.sendIconPosition, width());
 	}
 }
 
+void SendButton::paintStarsToSend(QPainter &p, bool over) {
+	const auto geometry = starsGeometry();
+	{
+		PainterHighQualityEnabler hq(p);
+		p.setPen(Qt::NoPen);
+		if (_state.fillBgOverride.isValid()) {
+			p.setBrush(_state.fillBgOverride);
+		} else {
+			p.setBrush(over ? _st.stars.textBgOver : _st.stars.textBg);
+		}
+		const auto radius = geometry.rounded.height() / 2;
+		p.drawRoundedRect(geometry.rounded, radius, radius);
+	}
+	if (!isDisabled()) {
+		auto color = _st.stars.textFg->c;
+		color.setAlpha(25);
+		paintRipple(p, geometry.rounded.topLeft(), &color);
+	}
+	p.setPen(over ? _st.stars.textFgOver : _st.stars.textFg);
+	_starsToSendText.draw(p, {
+		.position = geometry.inner.topLeft(),
+		.outerWidth = width(),
+		.availableWidth = geometry.inner.width(),
+	});
+}
+
 void SendButton::paintSchedule(QPainter &p, bool over) {
+	const auto ellipse = scheduleEllipseRect();
 	{
 		PainterHighQualityEnabler hq(p);
 		p.setPen(Qt::NoPen);
 		p.setBrush(over ? st::historySendIconFgOver : st::historySendIconFg);
-		p.drawEllipse(
-			st::historyScheduleIconPosition.x(),
-			st::historyScheduleIconPosition.y(),
-			st::historyScheduleIcon.width(),
-			st::historyScheduleIcon.height());
+		p.drawEllipse(ellipse);
+	}
+	if (!isDisabled()) {
+		auto color = st::historyComposeAreaBg->c;
+		color.setAlpha(25);
+		paintRipple(p, ellipse.topLeft(), &color);
 	}
 	st::historyScheduleIcon.paint(
 		p,
@@ -163,8 +386,81 @@ void SendButton::paintSlowmode(QPainter &p) {
 		style::al_center);
 }
 
-bool SendButton::isSlowmode() const {
-	return (_slowmodeDelay > 0);
+SendButton::StarsGeometry SendButton::starsGeometry() const {
+	const auto &st = _st.stars;
+	const auto inner = QRect(
+		0,
+		0,
+		_starsToSendText.maxWidth(),
+		st.style.font->height);
+	const auto rounded = inner.marginsAdded(QMargins(
+		st.padding.left() - st.width / 2,
+		st.padding.top() + st.textTop,
+		st.padding.right() - st.width / 2,
+		st.height - st.padding.top() - st.textTop - st.style.font->height));
+	const auto add = (_st.inner.height - rounded.height()) / 2;
+	const auto outer = rounded.marginsAdded(QMargins(
+		add,
+		add,
+		add,
+		_st.inner.height - add - rounded.height()));
+	const auto shift = -outer.topLeft();
+	return {
+		.inner = inner.translated(shift),
+		.rounded = rounded.translated(shift),
+		.outer = outer.translated(shift),
+	};
+}
+
+SendButton::RippleShape SendButton::currentRippleShape() const {
+	switch (_state.type) {
+	case Type::Send:
+		if (!_starsToSendText.isEmpty()) {
+			return RippleShape::StarsRoundRect;
+		} else if (_st.sendIconFillPadding > 0) {
+			return RippleShape::SendEllipse;
+		}
+		return RippleShape::InnerEllipse;
+	case Type::Schedule:
+		return RippleShape::ScheduleEllipse;
+	case Type::Save:
+	case Type::Record:
+	case Type::Round:
+	case Type::Cancel:
+	case Type::Slowmode:
+	case Type::EditPrice:
+		return RippleShape::InnerEllipse;
+	}
+	Unexpected("Type in SendButton::currentRippleShape.");
+}
+
+QRect SendButton::sendEllipseRect() const {
+	const auto &sendIcon = _st.inner.icon;
+	const auto padding = _st.sendIconFillPadding;
+	return QRect(_st.sendIconPosition, sendIcon.size()).marginsAdded(
+		{ padding, padding, padding, padding });
+}
+
+QRect SendButton::scheduleEllipseRect() const {
+	return QRect(
+		st::historyScheduleIconPosition,
+		QSize(
+			st::historyScheduleIcon.width(),
+			st::historyScheduleIcon.height()));
+}
+
+void SendButton::updateSize() {
+	if (_state.type == Type::EditPrice) {
+		resize(0, _st.inner.height);
+		return;
+	}
+	const auto finalWidth = _starsToSendText.isEmpty()
+		? _st.inner.width
+		: starsGeometry().outer.width();
+	const auto progress = _stateChangeAnimation.value(1.);
+	resize(
+		anim::interpolate(_stateChangeFromWidth, finalWidth, progress),
+		_st.inner.height);
 }
 
 QPixmap SendButton::grabContent() {
@@ -180,19 +476,202 @@ QPixmap SendButton::grabContent() {
 			(kWideScale - 1) / 2 * height(),
 			GrabWidget(this));
 	}
-	return Ui::PixmapFromImage(std::move(result));
+	return PixmapFromImage(std::move(result));
 }
 
 QImage SendButton::prepareRippleMask() const {
-	const auto size = _st.inner.rippleAreaSize;
-	return RippleAnimation::EllipseMask(QSize(size, size));
+	switch (_lastRippleShape) {
+	case RippleShape::InnerEllipse: {
+		const auto size = _st.inner.rippleAreaSize;
+		return RippleAnimation::EllipseMask(QSize(size, size));
+	}
+	case RippleShape::SendEllipse: {
+		const auto r = sendEllipseRect();
+		return RippleAnimation::EllipseMask(r.size());
+	}
+	case RippleShape::StarsRoundRect: {
+		const auto r = starsGeometry().rounded;
+		const auto radius = r.height() / 2;
+		return RippleAnimation::RoundRectMask(r.size(), radius);
+	}
+	case RippleShape::ScheduleEllipse: {
+		const auto r = scheduleEllipseRect();
+		return RippleAnimation::EllipseMask(r.size());
+	}
+	}
+	Unexpected("RippleShape in SendButton::prepareRippleMask.");
 }
 
 QPoint SendButton::prepareRippleStartPosition() const {
 	const auto real = mapFromGlobal(QCursor::pos());
-	const auto size = _st.inner.rippleAreaSize;
-	const auto y = (height() - _st.inner.rippleAreaSize) / 2;
-	return real - QPoint((width() - size) / 2, y);
+	switch (_lastRippleShape) {
+	case RippleShape::InnerEllipse: {
+		const auto size = _st.inner.rippleAreaSize;
+		const auto y = (height() - size) / 2;
+		return real - QPoint((width() - size) / 2, y);
+	}
+	case RippleShape::SendEllipse:
+		return real - sendEllipseRect().topLeft();
+	case RippleShape::StarsRoundRect:
+		return real - starsGeometry().rounded.topLeft();
+	case RippleShape::ScheduleEllipse:
+		return real - scheduleEllipseRect().topLeft();
+	}
+	Unexpected("RippleShape in SendButton::prepareRippleStartPosition.");
+}
+
+void SendButton::initVoiceRoundIcon(int index) {
+	Expects(index >= 0 && index < 2);
+
+	_voiceRoundIcons[index] = Lottie::MakeIcon({
+		.path = ((index == kVoiceToRoundIndex)
+			? u":/animations/chat/voice_to_video.tgs"_q
+			: u":/animations/chat/video_to_voice.tgs"_q),
+		.sizeOverride = _st.recordSize,
+		.colorizeUsingAlpha = true,
+	});
+}
+
+void SendButton::paintVoiceRoundIcon(QPainter &p, bool over) {
+	if (!isDisabled() && !_state.forbidden) {
+		paintRipple(
+			p,
+			(width() - _st.inner.rippleAreaSize) / 2,
+			_st.inner.rippleAreaPosition.y());
+	}
+
+	if (_state.forbidden) {
+		p.setOpacity(kForbiddenOpacity);
+	}
+	const auto color = (isDisabled() || !over)
+		? st::historyRecordVoiceFg->c
+		: st::historyRecordVoiceFgOver->c;
+	const auto toVideo = (_state.type == Type::Round);
+	const auto index = toVideo ? kVoiceToRoundIndex : kRoundToVoiceIndex;
+	_voiceRoundIcons[index]->paintInCenter(p, rect(), color);
+	if (_state.forbidden) {
+		p.setOpacity(1.);
+	}
+}
+
+bool SendButton::isVoiceRoundTransition(Type from, Type to) {
+	return (from == Type::Record && to == Type::Round)
+		|| (from == Type::Round && to == Type::Record);
+}
+
+SendStarButton::SendStarButton(
+	QWidget *parent,
+	const style::IconButton &st,
+	const style::RoundButton &counterSt,
+	rpl::producer<SendStarButtonState> state)
+: RippleButton(parent, st.ripple)
+, _st(st)
+, _counterSt(counterSt) {
+	resize(_st.width, _st.height);
+
+	std::move(state) | rpl::on_next([=](SendStarButtonState value) {
+		setCount(value.count);
+		highlight(value.highlight);
+	}, lifetime());
+}
+
+void SendStarButton::paintEvent(QPaintEvent *e) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto fullSize = size() * ratio;
+	if (_frame.size() != fullSize) {
+		_frame = QImage(fullSize, QImage::Format_ARGB32_Premultiplied);
+		_frame.setDevicePixelRatio(ratio);
+	}
+	_frame.fill(Qt::transparent);
+
+	auto p = QPainter(&_frame);
+
+	const auto highlighted = _highlight.value(_highlighted ? 1. : 0.);
+	p.setPen(Qt::NoPen);
+	p.setBrush(_counterSt.textBg);
+	p.drawEllipse(rect());
+	paintRipple(p, QPoint());
+	if (highlighted > 0.) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(st::creditsBg3);
+		p.setOpacity(highlighted);
+		p.drawEllipse(rect());
+		p.setOpacity(1.);
+	}
+
+	st::starIconEmoji.icon.paintInCenter(p, rect(), st::premiumButtonFg->c);
+
+	if (!_starsText.isEmpty()) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setCompositionMode(QPainter::CompositionMode_Source);
+		auto pen = st::transparent->p;
+		pen.setWidthF(_counterSt.numbersSkip);
+		p.setPen(pen);
+		p.setBrush(
+			anim::brush(_counterSt.textBg, st::creditsBg3, highlighted));
+		const auto size = QSize(
+			_starsText.maxWidth(),
+			_counterSt.style.font->height);
+		const auto larger = size.grownBy(_counterSt.padding);
+		const auto left = (width() - larger.width());
+		const auto top = 0;
+		const auto r = larger.height() / 2.;
+		p.drawRoundedRect(left, top, larger.width(), larger.height(), r, r);
+		p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		p.setPen(
+			anim::pen(_counterSt.textFg, st::premiumButtonFg, highlighted));
+		_starsText.draw(p, {
+			.position = QPoint(
+				left + _counterSt.padding.left(),
+				top + _counterSt.padding.top()),
+			.availableWidth = _starsText.maxWidth(),
+		});
+	}
+
+	QPainter(this).drawImage(0, 0, _frame);
+}
+
+void SendStarButton::setCount(int count) {
+	if (_count == count) {
+		return;
+	}
+	_count = count;
+	if (_count) {
+		_starsText.setText(
+			_counterSt.style,
+			Lang::FormatCountDecimal(_count));
+		const auto sub = _counterSt.padding.left()
+			+ _counterSt.padding.right();
+		if (_starsText.maxWidth() > width() - sub) {
+			_starsText.setText(
+				_counterSt.style,
+				Lang::FormatCountToShort(_count).string);
+		}
+	} else {
+		_starsText = Text::String();
+	}
+	update();
+}
+
+void SendStarButton::highlight(bool enabled) {
+	if (_highlighted == enabled) {
+		return;
+	}
+	_highlighted = enabled;
+	_highlight.start(
+		[=] { update(); },
+		enabled ? 0. : 1.,
+		enabled ? 1. : 0.,
+		360,
+		anim::easeOutCirc);
+}
+
+QImage SendStarButton::prepareRippleMask() const {
+	return RippleAnimation::EllipseMask(size());
+}
+
+QPoint SendStarButton::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos());
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/send_button.h b/Telegram/SourceFiles/ui/controls/send_button.h
index 5b3cc104d2dca7..c4ab503a86cfe5 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.h
+++ b/Telegram/SourceFiles/ui/controls/send_button.h
@@ -9,8 +9,16 @@ For license and copyright information please follow this link:
 
 #include "ui/widgets/buttons.h"
 
+#include <memory>
+
+namespace Lottie {
+class Icon;
+} // namespace Lottie
+
 namespace style {
 struct SendButton;
+struct IconButton;
+struct RoundButton;
 } // namespace style
 
 namespace Ui {
@@ -18,6 +26,7 @@ namespace Ui {
 class SendButton final : public RippleButton {
 public:
 	SendButton(QWidget *parent, const style::SendButton &st);
+	~SendButton();
 
 	static constexpr auto kSlowmodeDelayLimit = 100 * 60;
 
@@ -26,14 +35,27 @@ class SendButton final : public RippleButton {
 		Schedule,
 		Save,
 		Record,
+		Round,
 		Cancel,
 		Slowmode,
+		EditPrice,
+	};
+	struct State {
+		Type type = Type::Send;
+		QColor fillBgOverride;
+		int slowmodeDelay = 0;
+		int starsToSend = 0;
+		bool forbidden = false;
+
+		friend inline bool operator==(State, State) = default;
 	};
 	[[nodiscard]] Type type() const {
-		return _type;
+		return _state.type;
+	}
+	[[nodiscard]] State state() const {
+		return _state;
 	}
-	void setType(Type state);
-	void setSlowmodeDelay(int seconds);
+	void setState(State state);
 	void finishAnimating();
 
 protected:
@@ -43,26 +65,89 @@ class SendButton final : public RippleButton {
 	QPoint prepareRippleStartPosition() const override;
 
 private:
+	struct StarsGeometry {
+		QRect inner;
+		QRect rounded;
+		QRect outer;
+	};
+	enum class RippleShape : uchar {
+		InnerEllipse,
+		SendEllipse,
+		StarsRoundRect,
+		ScheduleEllipse,
+	};
+
 	[[nodiscard]] QPixmap grabContent();
-	[[nodiscard]] bool isSlowmode() const;
+	void updateSize();
+
+	[[nodiscard]] StarsGeometry starsGeometry() const;
+
+	[[nodiscard]] RippleShape currentRippleShape() const;
+	[[nodiscard]] QRect sendEllipseRect() const;
+	[[nodiscard]] QRect scheduleEllipseRect() const;
 
 	void paintRecord(QPainter &p, bool over);
+	void paintRound(QPainter &p, bool over);
 	void paintSave(QPainter &p, bool over);
 	void paintCancel(QPainter &p, bool over);
 	void paintSend(QPainter &p, bool over);
 	void paintSchedule(QPainter &p, bool over);
 	void paintSlowmode(QPainter &p);
+	void paintStarsToSend(QPainter &p, bool over);
+
+	void initVoiceRoundIcon(int index);
+	void paintVoiceRoundIcon(QPainter &p, bool over);
+	[[nodiscard]] static bool isVoiceRoundTransition(Type from, Type to);
+	void paintLottieIcon(QPainter &p, int index, bool over);
 
 	const style::SendButton &_st;
 
-	Type _type = Type::Send;
-	Type _afterSlowmodeType = Type::Send;
+	State _state;
 	QPixmap _contentFrom, _contentTo;
 
-	Ui::Animations::Simple _a_typeChanged;
+	Ui::Animations::Simple _stateChangeAnimation;
+	int _stateChangeFromWidth = 0;
 
-	int _slowmodeDelay = 0;
 	QString _slowmodeDelayText;
+	Ui::Text::String _starsToSendText;
+
+	std::array<std::unique_ptr<Lottie::Icon>, 2> _voiceRoundIcons;
+	bool _voiceRoundAnimating = false;
+	RippleShape _lastRippleShape = RippleShape::SendEllipse;
+
+};
+
+struct SendStarButtonState {
+	int count = 0;
+	bool highlight = false;
+};
+
+class SendStarButton final : public RippleButton {
+public:
+	SendStarButton(
+		QWidget *parent,
+		const style::IconButton &st,
+		const style::RoundButton &counterSt,
+		rpl::producer<SendStarButtonState> state);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+private:
+	void setCount(int count);
+	void highlight(bool enabled);
+
+	const style::IconButton &_st;
+	const style::RoundButton &_counterSt;
+
+	QImage _frame;
+	Ui::Text::String _starsText;
+	Ui::Animations::Simple _highlight;
+	int _count = 0;
+	bool _highlighted = false;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/controls/silent_toggle.cpp b/Telegram/SourceFiles/ui/controls/silent_toggle.cpp
index 5fb1f4658eab1f..d1ed8751cfb486 100644
--- a/Telegram/SourceFiles/ui/controls/silent_toggle.cpp
+++ b/Telegram/SourceFiles/ui/controls/silent_toggle.cpp
@@ -28,9 +28,10 @@ SilentToggle::SilentToggle(QWidget *parent, not_null<ChannelData*> channel)
 	resize(_st.width, _st.height);
 
 	setMouseTracking(true);
+	setAccessibleName(tr::lng_broadcast_silent(tr::now));
 
 	clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		setChecked(!_checked);
 		Ui::Tooltip::Show(0, this);
 		_channel->owner().notifySettings().update(_channel, {}, _checked);
@@ -65,6 +66,7 @@ void SilentToggle::setChecked(bool checked) {
 	if (_checked != checked) {
 		_checked = checked;
 		update();
+        accessibilityStateChanged({ .checked = true });
 		// _crossLineAnimation.start(
 		// 	[=] { update(); },
 		// 	_checked ? 0. : 1.,
@@ -106,4 +108,12 @@ QImage SilentToggle::prepareRippleMask() const {
 		QSize(_st.rippleAreaSize, _st.rippleAreaSize));
 }
 
+QAccessible::Role SilentToggle::accessibilityRole() {
+    return QAccessible::Role::CheckBox;
+}
+
+Ui::AccessibilityState SilentToggle::accessibilityState() const {
+	return { .checkable = true, .checked = _checked };
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/silent_toggle.h b/Telegram/SourceFiles/ui/controls/silent_toggle.h
index e38d52facb6d6b..22995beda336a8 100644
--- a/Telegram/SourceFiles/ui/controls/silent_toggle.h
+++ b/Telegram/SourceFiles/ui/controls/silent_toggle.h
@@ -27,6 +27,8 @@ class SilentToggle final
 	QString tooltipText() const override;
 	QPoint tooltipPos() const override;
 	bool tooltipWindowActive() const override;
+	[[nodiscard]] QAccessible::Role accessibilityRole() override;
+	[[nodiscard]] AccessibilityState accessibilityState() const override;
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
new file mode 100644
index 00000000000000..4850b0d34af090
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -0,0 +1,553 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/stars_rating.h"
+
+#include "base/unixtime.h"
+#include "lang/lang_keys.h"
+#include "ui/controls/feature_list.h"
+#include "ui/effects/premium_bubble.h"
+#include "ui/effects/premium_graphics.h"
+#include "ui/layers/generic_box.h"
+#include "ui/layers/show.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "ui/text/custom_emoji_text_badge.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/rp_widget.h"
+#include "ui/ui_utility.h"
+#include "styles/style_chat.h" // textMoreIconEmoji
+#include "styles/style_info.h"
+#include "styles/style_info_levels.h"
+#include "styles/style_layers.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
+#include "styles/style_media_view.h"
+#include "styles/style_menu_icons.h"
+
+namespace Ui {
+namespace {
+
+using Counters = Data::StarsRating;
+
+[[nodiscard]] Counters AdjustByReached(Counters data) {
+	if (data.stars < 0) {
+		return data;
+	}
+	const auto reached = !data.nextLevelStars;
+	if (reached) {
+		--data.level;
+		data.stars = data.nextLevelStars = std::max({
+			data.stars,
+			data.thisLevelStars,
+			1
+		});
+		data.thisLevelStars = 0;
+	} else {
+		data.stars = std::max(data.thisLevelStars, data.stars);
+		data.nextLevelStars = std::max(
+			data.nextLevelStars,
+			data.stars + 1);
+	}
+	return data;
+}
+
+[[nodiscard]] Fn<Premium::BubbleText(int)> BubbleTextFactory(
+		int countForScale,
+		int nextLevelCounter) {
+	return [=](int count) {
+		const auto counter = [&](int count) {
+			return (countForScale < 10'000)
+				? Lang::FormatCountDecimal(count)
+				: (countForScale < 10'000'000)
+				? (Lang::FormatCountDecimal((count / 100) / 10.) + 'K')
+				: (Lang::FormatCountDecimal((count / 100'000) / 10.) + 'M');
+		};
+		return Premium::BubbleText{
+			.counter = counter(count),
+			.additional = (nextLevelCounter
+				? (u"/"_q + counter(nextLevelCounter))
+				: QString()),
+		};
+	};
+}
+
+void FillRatingLimit(
+		rpl::producer<> showFinished,
+		not_null<VerticalLayout*> container,
+		rpl::producer<Counters> data,
+		Premium::BubbleType type,
+		style::margins limitLinePadding,
+		int starsForScale,
+		int nextLevelStars,
+		bool hideCount) {
+	const auto addSkip = [&](int skip) {
+		container->add(object_ptr<FixedHeightWidget>(container, skip));
+	};
+
+	const auto negative = (type == Premium::BubbleType::NegativeRating);
+	const auto ratio = [=](Counters rating) {
+		if (negative) {
+			return 0.5;
+		}
+		const auto min = rating.thisLevelStars;
+		const auto max = rating.nextLevelStars;
+
+		Assert(rating.stars >= min && rating.stars <= max);
+		const auto count = (max - min);
+		const auto index = (rating.stars - min);
+		if (!index) {
+			return 0.;
+		} else if (index == count) {
+			return 1.;
+		} else if (count == 2) {
+			return 0.5;
+		}
+		const auto available = st::boxWideWidth
+			- st::boxPadding.left()
+			- st::boxPadding.right();
+		const auto average = available / float64(count);
+		const auto levelWidth = [&](int add) {
+			return st::normalFont->width(
+				tr::lng_boost_level(
+					tr::now,
+					lt_count,
+					rating.level + add));
+		};
+		const auto paddings = 2 * st::premiumLineTextSkip;
+		const auto labelLeftWidth = paddings + levelWidth(0);
+		const auto labelRightWidth = paddings + levelWidth(1);
+		const auto first = std::max(average, labelLeftWidth * 1.);
+		const auto last = std::max(average, labelRightWidth * 1.);
+		const auto other = (available - first - last) / (count - 2);
+		return (first + (index - 1) * other) / available;
+	};
+
+	auto adjustedData = rpl::duplicate(data) | rpl::map(AdjustByReached);
+
+	auto bubbleRowState = rpl::duplicate(
+		adjustedData
+	) | rpl::combine_previous(
+		Counters()
+	) | rpl::map([=](Counters previous, Counters counters) {
+		return Premium::BubbleRowState{
+			.counter = counters.stars,
+			.ratio = ratio(counters),
+			.animateFromZero = (counters.level != previous.level),
+			.dynamic = true,
+		};
+	});
+	Premium::AddBubbleRow(
+		container,
+		(hideCount ? st::iconOnlyPremiumBubble : st::starRatingBubble),
+		std::move(showFinished),
+		rpl::duplicate(bubbleRowState),
+		type,
+		(hideCount
+			? [](int) { return Premium::BubbleText(); }
+			: BubbleTextFactory(starsForScale, nextLevelStars)),
+		negative ? &st::levelNegativeBubble : &st::infoStarsCrown,
+		limitLinePadding);
+	addSkip(st::premiumLineTextSkip);
+
+	const auto level = [](int level) {
+		return tr::lng_boost_level(tr::now, lt_count, level);
+	};
+	auto limitState = std::move(
+		bubbleRowState
+	) | rpl::map([negative](const Premium::BubbleRowState &state) {
+		return Premium::LimitRowState{
+			.ratio = negative ? 0.5 : state.ratio,
+			.animateFromZero = !negative && state.animateFromZero,
+			.dynamic = state.dynamic
+		};
+	});
+	auto left = rpl::duplicate(
+		adjustedData
+	) | rpl::map([=](Counters counters) {
+		return (counters.level < 0) ? QString() : level(counters.level);
+	});
+	auto right = rpl::duplicate(
+		adjustedData
+	) | rpl::map([=](Counters counters) {
+		return (counters.level < 0)
+			? tr::lng_stars_rating_negative_label(tr::now)
+			: level(counters.level + 1);
+	});
+	Premium::AddLimitRow(
+		container,
+		(negative ? st::negativeStarsLimits : st::boostLimits),
+		Premium::LimitRowLabels{
+			.leftLabel = std::move(left),
+			.rightLabel = std::move(right),
+			.activeLineBg = [=] { return negative
+				? st::attentionButtonFg->b
+				: st::windowBgActive->b;
+			},
+		},
+		std::move(limitState),
+		limitLinePadding);
+}
+
+void AboutRatingBox(
+		not_null<GenericBox*> box,
+		const QString &name,
+		Counters data,
+		Data::StarsRatingPending pending) {
+	box->setWidth(st::boxWideWidth);
+	box->setStyle(st::boostBox);
+
+	struct State {
+		rpl::variable<Counters> data;
+		rpl::variable<bool> pending;
+		rpl::variable<bool> full;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	state->data = data;
+
+	FillRatingLimit(
+		BoxShowFinishes(box),
+		box->verticalLayout(),
+		state->data.value(),
+		(data.level < 0
+			? Premium::BubbleType::NegativeRating
+			: Premium::BubbleType::StarRating),
+		st::boxRowPadding,
+		data.stars,
+		data.nextLevelStars,
+		(data.level < 0 && !data.stars));
+
+	box->setMaxHeight(st::boostBoxMaxHeight);
+
+	auto title = rpl::conditional(
+		state->pending.value(),
+		tr::lng_stars_rating_future(),
+		tr::lng_stars_rating_title());
+
+	auto text = !name.isEmpty()
+		? tr::lng_stars_rating_about(
+			lt_name,
+			rpl::single(TextWithEntities{ name }),
+			tr::rich) | rpl::type_erased
+		: tr::lng_stars_rating_about_your(
+			tr::rich) | rpl::type_erased;
+
+	if (data.level < 0) {
+		auto text = (data.stars < 0)
+			? tr::lng_stars_rating_negative_your(
+				lt_count_decimal,
+				rpl::single(-data.stars * 1.),
+				tr::rich)
+			: tr::lng_stars_rating_negative(
+				lt_name,
+				rpl::single(TextWithEntities{ name }),
+				tr::rich);
+		box->addRow(
+			object_ptr<FlatLabel>(
+				box,
+				std::move(text),
+				st::boostTextNegative),
+			(st::boxRowPadding
+				+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)),
+			style::al_top
+		)->setTryMakeSimilarLines(true);
+	}
+
+	box->addRow(
+		object_ptr<FlatLabel>(box, std::move(title), st::infoStarsTitle),
+		st::boxRowPadding + QMargins(0, st::boostTitleSkip / 2, 0, 0),
+		style::al_top);
+
+	if (pending) {
+		const auto now = base::unixtime::now();
+		const auto days = std::max((pending.date - now + 43200) / 86400, 1);
+		auto text = state->pending.value(
+		) | rpl::map([=](bool value) {
+			return tr::lng_stars_rating_pending(
+				tr::now,
+				lt_count_decimal,
+				pending.value.stars - data.stars,
+				lt_when,
+				TextWithEntities{
+					tr::lng_stars_rating_updates(tr::now, lt_count, days),
+				},
+				lt_link,
+				Text::Link((value
+					? tr::lng_stars_rating_pending_back
+					: tr::lng_stars_rating_pending_preview)(
+						tr::now,
+						lt_arrow,
+						Text::IconEmoji(&st::textMoreIconEmoji),
+						tr::marked)),
+				tr::rich);
+		});
+		const auto aboutPending = box->addRow(
+			object_ptr<FlatLabel>(
+				box,
+				std::move(text),
+				st::boostTextPending),
+			(st::boxRowPadding
+				+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)),
+			style::al_top);
+		aboutPending->setTryMakeSimilarLines(true);
+		aboutPending->setClickHandlerFilter([=](const auto &...) {
+			state->pending = !state->pending.current();
+			state->data = state->pending.current()
+				? pending.value
+				: data;
+			box->verticalLayout()->resizeToWidth(box->width());
+			return false;
+		});
+	}
+
+	box->addRow(
+		object_ptr<FlatLabel>(
+			box,
+			std::move(text),
+			st::boostText),
+		(st::boxRowPadding
+			+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)),
+		style::al_top
+	)->setTryMakeSimilarLines(true);
+
+	auto helper = Text::CustomEmojiHelper();
+	const auto makeBadge = [&](
+			const QString &text,
+			const style::RoundButton &st) {
+		return helper.paletteDependent(
+			Text::CustomEmojiTextBadge(text.toUpper(), st));
+	};
+	const auto makeActive = [&](const QString &text) {
+		return makeBadge(text, st::customEmojiTextBadge);
+	};
+	const auto makeInactive = [&](const QString &text) {
+		return makeBadge(text, st::infoRatingDeductedBadge);
+	};
+	const auto features = std::vector<FeatureListEntry>{
+		{
+			st::menuIconRatingGifts,
+			tr::lng_stars_title_gifts_telegram(tr::now),
+			tr::lng_stars_about_gifts_telegram(
+				tr::now,
+				lt_emoji,
+				makeActive(tr::lng_stars_rating_added(tr::now)),
+				tr::rich),
+		},
+		{
+			st::menuIconRatingUsers,
+			tr::lng_stars_title_gifts_users(tr::now),
+			tr::lng_stars_about_gifts_users(
+				tr::now,
+				lt_emoji,
+				makeActive(tr::lng_stars_rating_added(tr::now)),
+				tr::rich),
+		},
+		{
+			st::menuIconRatingRefund,
+			tr::lng_stars_title_refunds(tr::now),
+			tr::lng_stars_about_refunds(
+				tr::now,
+				lt_emoji,
+				makeInactive(tr::lng_stars_rating_deducted(tr::now)),
+				tr::rich),
+		},
+	};
+	const auto context = helper.context();
+	for (const auto &feature : features) {
+		box->addRow(MakeFeatureListEntry(box, feature, context));
+	}
+	box->addButton(rpl::single(QString()), [=] {
+		box->closeBox();
+	})->setText(rpl::single(Text::IconEmoji(
+		&st::infoStarsUnderstood
+	).append(' ').append(tr::lng_stars_rating_understood(tr::now))));
+}
+
+[[nodiscard]] not_null<const style::LevelShape*> SelectShape(int level) {
+	if (level < 0) {
+		return &st::levelNegative;
+	}
+	struct Shape {
+		int level = 0;
+		not_null<const style::LevelShape*> shape;
+	};
+	const auto list = std::vector<Shape>{
+		{ 1, &st::level1 },
+		{ 2, &st::level2 },
+		{ 3, &st::level3 },
+		{ 4, &st::level4 },
+		{ 5, &st::level5 },
+		{ 6, &st::level6 },
+		{ 7, &st::level7 },
+		{ 8, &st::level8 },
+		{ 9, &st::level9 },
+		{ 10, &st::level10 },
+		{ 20, &st::level20 },
+		{ 30, &st::level30 },
+		{ 40, &st::level40 },
+		{ 50, &st::level50 },
+		{ 60, &st::level60 },
+		{ 70, &st::level70 },
+		{ 80, &st::level80 },
+		{ 90, &st::level90 },
+	};
+	const auto i = ranges::lower_bound(
+		list,
+		level + 1,
+		ranges::less(),
+		&Shape::level);
+	return (i != begin(list)) ? (i - 1)->shape : list.front().shape;
+}
+
+} // namespace
+
+StarsRating::StarsRating(
+	QWidget *parent,
+	std::shared_ptr<Show> show,
+	const QString &name,
+	rpl::producer<Counters> value,
+	Fn<Data::StarsRatingPending()> pending)
+: _widget(std::make_unique<AbstractButton>(parent))
+, _show(std::move(show))
+, _name(name)
+, _value(std::move(value))
+, _pending(std::move(pending)) {
+	init();
+}
+
+StarsRating::~StarsRating() = default;
+
+void StarsRating::init() {
+	_widget->setPointerCursor(true);
+
+	_widget->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(_widget.get());
+		paint(p);
+	}, lifetime());
+
+	_widget->setClickedCallback([=] {
+		if (!_value.current()) {
+			return;
+		}
+		_show->show(Box(AboutRatingBox, _name, _value.current(), _pending
+			? _pending()
+			: Data::StarsRatingPending()));
+	});
+
+	_widget->resize(_widget->width(), st::level1.icon.height());
+
+	_value.value() | rpl::on_next([=](Counters rating) {
+		updateData(rating);
+	}, lifetime());
+}
+
+void StarsRating::updateData(Data::StarsRating rating) {
+	if (!rating) {
+		_shape = nullptr;
+		_widthValue = 0;
+		_currentLevel = 0;
+	} else {
+		_shape = SelectShape(rating.level);
+		_collapsedText = (rating.level < 0
+			? QString()
+			: Lang::FormatCountDecimal(rating.level));
+		const auto &margin = st::levelMargin;
+		_widthValue = _shape->icon.width() + margin.right() - margin.left();
+		_currentLevel = rating.level;
+	}
+	updateWidth();
+	_widget->setAccessibleName(tr::lng_boost_level(tr::now, lt_count, rating.level));
+}
+
+void StarsRating::updateWidth() {
+	if (const auto widthToRight = _widthValue.current()) {
+		const auto &margin = st::levelMargin;
+		_widget->resize(margin.left() + widthToRight, _widget->height());
+		_widget->update();
+	} else {
+		_widget->resize(0, _widget->height());
+	}
+}
+
+void StarsRating::raise() {
+	_widget->raise();
+}
+
+void StarsRating::moveTo(int x, int y) {
+	_widget->move(x - st::levelMargin.left(), y - st::levelMargin.top());
+}
+
+void StarsRating::setOpacity(float64 opacity) {
+	_opacity = opacity;
+	_widget->update();
+}
+
+void StarsRating::setCustomColors(
+		std::optional<QColor> textColor,
+		std::optional<QColor> shapeColor) {
+	_customTextColor = textColor;
+	_customShapeColor = shapeColor;
+	_cachedLevel = std::numeric_limits<int>::min();
+	_widget->update();
+}
+
+void StarsRating::paint(QPainter &p) {
+	p.setOpacity(_opacity);
+	if (!_shape) {
+		return;
+	}
+
+	if (_cachedLevel != _currentLevel) {
+		const auto ratio = style::DevicePixelRatio();
+		const auto size = _widget->size() * ratio;
+		_cache = QImage(size, QImage::Format_ARGB32_Premultiplied);
+		_cache.setDevicePixelRatio(ratio);
+		_cache.fill(Qt::transparent);
+
+		auto q = QPainter(&_cache);
+		if (_customShapeColor) {
+			_shape->icon.paint(q, 0, 0, _widget->width(), *_customShapeColor);
+		} else {
+			_shape->icon.paint(q, 0, 0, _widget->width());
+		}
+
+		if (!_collapsedText.isEmpty()) {
+			q.setPen(_customTextColor
+				? *_customTextColor
+				: st::levelTextFg->c);
+			q.setFont(st::levelStyle.font);
+			q.drawText(
+				Rect(_shape->icon.size()),
+				Qt::AlignCenter,
+				_collapsedText);
+		}
+
+		_cachedLevel = _currentLevel;
+	}
+
+	p.setOpacity(_opacity);
+	p.drawImage(0, 0, _cache);
+}
+
+rpl::producer<int> StarsRating::widthValue() const {
+	return _widthValue.value();
+}
+
+int StarsRating::width() const {
+	return _widthValue.current();
+}
+
+rpl::lifetime &StarsRating::lifetime() {
+	return _widget->lifetime();
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.h b/Telegram/SourceFiles/ui/controls/stars_rating.h
new file mode 100644
index 00000000000000..80a100f00ff0ce
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.h
@@ -0,0 +1,79 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/weak_ptr.h"
+#include "data/data_peer_common.h"
+
+namespace style {
+struct Toast;
+struct LevelShape;
+} // namespace style
+
+namespace Ui::Toast {
+class Instance;
+} // namespace Ui::Toast
+
+namespace Ui {
+
+class ImportantTooltip;
+class AbstractButton;
+class FlatLabel;
+class Show;
+
+class StarsRating final {
+public:
+	StarsRating(
+		QWidget *parent,
+		std::shared_ptr<Ui::Show> show,
+		const QString &name,
+		rpl::producer<Data::StarsRating> value,
+		Fn<Data::StarsRatingPending()> pending);
+	~StarsRating();
+
+	void raise();
+	void moveTo(int x, int y);
+	void setOpacity(float64 opacity);
+	void setCustomColors(
+		std::optional<QColor> textColor,
+		std::optional<QColor> shapeColor);
+
+	[[nodiscard]] rpl::producer<int> widthValue() const;
+	[[nodiscard]] int width() const;
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
+private:
+	void init();
+	void paint(QPainter &p);
+	void updateData(Data::StarsRating rating);
+	void updateWidth();
+
+	const std::unique_ptr<Ui::AbstractButton> _widget;
+	const std::shared_ptr<Ui::Show> _show;
+	const QString _name;
+
+	QString _collapsedText;
+
+	rpl::variable<Data::StarsRating> _value;
+	Fn<Data::StarsRatingPending()> _pending;
+	rpl::variable<int> _widthValue;
+	const style::LevelShape *_shape = nullptr;
+
+	QImage _cache;
+	int _cachedLevel = std::numeric_limits<int>::min();
+
+	int _currentLevel = 0;
+	float64 _opacity = 1.;
+
+	std::optional<QColor> _customTextColor;
+	std::optional<QColor> _customShapeColor;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/sub_tabs.cpp b/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
new file mode 100644
index 00000000000000..0f7294c7482cad
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
@@ -0,0 +1,674 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/sub_tabs.h"
+
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "ui/effects/animation_value_f.h"
+#include "styles/style_basic.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h"
+#include "styles/style_info.h"
+
+#include <QApplication>
+
+namespace Ui {
+
+SubTabs::SubTabs(
+	QWidget *parent,
+	const style::SubTabs &st,
+	Options options,
+	std::vector<Tab> tabs,
+	Text::MarkedContext context)
+: RpWidget(parent)
+, _st(st)
+, _centered(options.centered) {
+	setMouseTracking(true);
+	_reorderScrollAnimation.init([this] { updateScrollCallback(); });
+	setTabs(std::move(tabs), context);
+	if (!options.selected.isEmpty()) {
+		setActiveTab(options.selected);
+	}
+}
+
+void SubTabs::setTabs(
+		std::vector<Tab> tabs,
+		Text::MarkedContext context) {
+	auto x = st::giftBoxTabsMargin.left();
+	auto y = st::giftBoxTabsMargin.top();
+
+	setSelected(-1);
+	_buttons.resize(tabs.size());
+	const auto padding = st::giftBoxTabPadding;
+	auto activeId = (_active >= 0
+		&& ranges::contains(tabs, _buttons[_active].tab.id, &Tab::id))
+		? _buttons[_active].tab.id
+		: QString();
+	_active = -1;
+	context.repaint = [=] { update(); };
+	for (auto i = 0, count = int(tabs.size()); i != count; ++i) {
+		auto &tab = tabs[i];
+		Assert(!tab.id.isEmpty());
+
+		auto &button = _buttons[i];
+		button.active = (tab.id == activeId);
+		if (button.tab != tab) {
+			button.text = Text::String();
+			button.text.setMarkedText(
+				st::semiboldTextStyle,
+				tab.text,
+				kMarkupTextOptions,
+				context);
+			button.tab = std::move(tab);
+		}
+		if (button.active) {
+			_active = i;
+		}
+		const auto width = button.text.maxWidth();
+		const auto height = st::giftBoxTabStyle.font->height;
+		const auto r = QRect(0, 0, width, height).marginsAdded(padding);
+		button.geometry = QRect(QPoint(x, y), r.size());
+		x += r.width() + st::giftBoxTabSkip;
+	}
+	const auto width = x
+		- st::giftBoxTabSkip
+		+ st::giftBoxTabsMargin.right();
+	_fullWidth = width;
+	resizeToWidth(this->width());
+	update();
+}
+
+void SubTabs::setActiveTab(const QString &id) {
+	if (id.isEmpty()) {
+		setActive(-1);
+		return;
+	}
+	const auto i = ranges::find(
+		_buttons,
+		id,
+		[](const Button &button) { return button.tab.id; });
+	Assert(i != end(_buttons));
+	setActive(i - begin(_buttons));
+}
+
+rpl::producer<QString> SubTabs::activated() const {
+	return _activated.events();
+}
+
+rpl::producer<QString> SubTabs::contextMenuRequests() const {
+	return _contextMenuRequests.events();
+}
+
+rpl::producer<SubTabs::ReorderUpdate> SubTabs::reorderUpdates() const {
+	return _reorderUpdates.events();
+}
+
+void SubTabs::setReorderEnabled(bool enabled) {
+	_reorderEnable = enabled;
+	if (enabled) {
+		_shakeAnimation.init([=] { update(); });
+		_shakeAnimation.start();
+	} else {
+		_shakeAnimation.stop();
+		update();
+	}
+}
+
+bool SubTabs::reorderEnabled() const {
+	return _reorderEnable;
+}
+
+void SubTabs::setPinnedInterval(int from, int to) {
+	_pinnedIntervals.push_back({ from, to });
+}
+
+void SubTabs::clearPinnedIntervals() {
+	_pinnedIntervals.clear();
+}
+
+bool SubTabs::isIndexPinned(int index) const {
+	for (const auto &interval : _pinnedIntervals) {
+		if (index >= interval.from && index < interval.to) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void SubTabs::setSelected(int index) {
+	const auto was = (_selected >= 0);
+	const auto now = (index >= 0);
+	_selected = index;
+	if (was != now) {
+		setCursor(now ? style::cur_pointer : style::cur_default);
+	}
+}
+
+void SubTabs::setActive(int index) {
+	const auto was = _active;
+	if (was == index) {
+		return;
+	}
+	if (was >= 0 && was < _buttons.size()) {
+		_buttons[was].active = false;
+	}
+	_active = index;
+	_buttons[index].active = true;
+	const auto geometry = _buttons[index].geometry;
+	if (width() > 0
+		&& _fullWidth > width()
+		&& _scrollMax > 0
+		&& !geometry.isEmpty()) {
+		const auto added = std::max(
+			std::min(width() / 8, (width() - geometry.width()) / 2),
+			0);
+		const auto visibleFrom = int(base::SafeRound(_scroll));
+		const auto visibleTill = visibleFrom + width();
+		if ((visibleTill < geometry.x() + geometry.width() + added)
+			|| (visibleFrom + added > geometry.x())) {
+			_scrollTo = std::clamp(
+				geometry.x() + (geometry.width() / 2) - (width() / 2),
+				0,
+				_scrollMax);
+			_scrollAnimation.start([=] {
+				_scroll = _scrollAnimation.value(_scrollTo);
+				update();
+			}, _scroll, _scrollTo, crl::time(150), anim::easeOutCirc);
+		}
+	}
+	update();
+}
+
+int SubTabs::resizeGetHeight(int newWidth) {
+	if (_centered) {
+		update();
+		const auto fullWidth = _fullWidth;
+		_fullShift = (fullWidth < newWidth) ? (newWidth - fullWidth) / 2 : 0;
+	}
+	_scrollMax = (_fullWidth > newWidth) ? (_fullWidth - newWidth) : 0;
+	return _buttons.empty()
+		? 0
+		: (st::giftBoxTabsMargin.top()
+			+ _buttons.back().geometry.height()
+			+ st::giftBoxTabsMargin.bottom());
+}
+
+bool SubTabs::eventHook(QEvent *e) {
+	if (e->type() == QEvent::Leave) {
+		setSelected(-1);
+	}
+	return RpWidget::eventHook(e);
+}
+
+void SubTabs::mouseMoveEvent(QMouseEvent *e) {
+	const auto mousex = e->pos().x();
+	const auto drag = QApplication::startDragDistance();
+
+	if (_reorderEnable && _reorderIndex >= 0) {
+		if (_reorderState != SubTabsReorderUpdate::State::Started) {
+			const auto shift = e->globalPos().x() - _reorderStart;
+			if (std::abs(shift) > drag) {
+				_reorderState = SubTabsReorderUpdate::State::Started;
+				_reorderStart += (shift > 0) ? drag : -drag;
+				_reorderDesiredIndex = _reorderIndex;
+				_reorderUpdates.fire({
+					_buttons[_reorderIndex].tab.id,
+					_reorderIndex,
+					_reorderIndex,
+					_reorderState
+				});
+			}
+		} else {
+			updateReorder(e->globalPos());
+		}
+		return;
+	}
+
+	if (!_reorderEnable) {
+		if (_dragx > 0) {
+			_scrollAnimation.stop();
+			_scroll = std::clamp(
+				_dragscroll + _dragx - mousex,
+				0.,
+				_scrollMax * 1.);
+			update();
+			return;
+		} else if (_pressx > 0 && std::abs(_pressx - mousex) > drag) {
+			_dragx = _pressx;
+			_dragscroll = _scroll;
+		}
+	}
+	auto selected = -1;
+	const auto position = e->pos() + scroll();
+	for (auto i = 0, c = int(_buttons.size()); i != c; ++i) {
+		if (_buttons[i].geometry.contains(position)) {
+			selected = i;
+			break;
+		}
+	}
+	setSelected(selected);
+}
+
+void SubTabs::wheelEvent(QWheelEvent *e) {
+	if (_reorderEnable) {
+		e->ignore();
+		return;
+	}
+	const auto delta = ScrollDeltaF(e);
+
+	const auto phase = e->phase();
+	const auto horizontal = (std::abs(delta.x()) > std::abs(delta.y()));
+	if (phase == Qt::NoScrollPhase) {
+		_locked = std::nullopt;
+	} else if (phase == Qt::ScrollBegin) {
+		_locked = std::nullopt;
+	} else if (!_locked) {
+		_locked = horizontal ? Qt::Horizontal : Qt::Vertical;
+	}
+	if (horizontal) {
+		if (_locked == Qt::Vertical) {
+			return;
+		}
+		e->accept();
+	} else {
+		if (_locked == Qt::Horizontal) {
+			e->accept();
+		} else {
+			e->ignore();
+		}
+		return;
+	}
+	_scrollAnimation.stop();
+	_scroll = std::clamp(_scroll - delta.x(), 0., _scrollMax * 1.);
+	update();
+}
+
+void SubTabs::mousePressEvent(QMouseEvent *e) {
+	if (e->button() != Qt::LeftButton) {
+		return;
+	}
+	_pressed = _selected;
+	_pressx = e->pos().x();
+
+	if (_reorderEnable && _selected >= 0 && !isIndexPinned(_selected)) {
+		startReorder(_selected, e->globalPos());
+	}
+}
+
+void SubTabs::mouseReleaseEvent(QMouseEvent *e) {
+	if (e->button() != Qt::LeftButton) {
+		return;
+	}
+
+	if (_reorderEnable && _reorderIndex >= 0) {
+		finishReorder();
+		return;
+	}
+
+	const auto dragx = std::exchange(_dragx, 0);
+	const auto pressed = std::exchange(_pressed, -1);
+	_pressx = 0;
+	if (!dragx
+		&& pressed >= 0
+		&& _selected == pressed
+		&& pressed < _buttons.size()) {
+		_activated.fire_copy(_buttons[pressed].tab.id);
+	}
+}
+
+void SubTabs::contextMenuEvent(QContextMenuEvent *e) {
+	if (_selected >= 0 && _selected < _buttons.size()) {
+		_contextMenuRequests.fire_copy(_buttons[_selected].tab.id);
+	}
+}
+
+void SubTabs::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	auto hq = PainterHighQualityEnabler(p);
+	const auto padding = st::giftBoxTabPadding;
+	const auto shift = -scroll();
+	const auto now = crl::now();
+	const auto hasShake = _shakeAnimation.animating();
+	for (auto i = 0; i < _buttons.size(); ++i) {
+		const auto &button = _buttons[i];
+		const auto geometry = button.geometry.translated(shift);
+
+		if (hasShake && _reorderEnable && !isIndexPinned(i)) {
+			shakeTransform(p, i, geometry.topLeft(), now);
+		}
+
+		const auto shiftedGeometry = geometry.translated(
+			base::SafeRound(button.shift),
+			0);
+		if (button.active) {
+			p.setBrush(st::giftBoxTabBgActive);
+			p.setPen(Qt::NoPen);
+			const auto radius = shiftedGeometry.height() / 2.;
+			p.drawRoundedRect(shiftedGeometry, radius, radius);
+			p.setPen(st::giftBoxTabFgActive);
+		} else {
+			p.setPen(st::giftBoxTabFg);
+		}
+		button.text.draw(p, {
+			.position = shiftedGeometry.marginsRemoved(padding).topLeft(),
+			.availableWidth = button.text.maxWidth(),
+		});
+
+		if (hasShake && _reorderEnable && !isIndexPinned(i)) {
+			p.resetTransform();
+		}
+	}
+	if (_fullWidth > width()) {
+		const auto &icon = st::defaultEmojiSuggestions;
+		const auto w = icon.fadeRight.width();
+		const auto &c = _st.bg->c;
+		const auto r = QRect(0, 0, w, height());
+		const auto s = std::abs(float64(shift.x()));
+		constexpr auto kF = 0.5;
+		const auto opacityRight = (_scrollMax - s)
+			/ (icon.fadeRight.width() * kF);
+		p.setOpacity(std::clamp(std::abs(opacityRight), 0., 1.));
+		icon.fadeRight.fill(p, r.translated(width() - w, 0), c);
+
+		const auto opacityLeft = s / (icon.fadeLeft.width() * kF);
+		p.setOpacity(std::clamp(std::abs(opacityLeft), 0., 1.));
+		icon.fadeLeft.fill(p, r, c);
+	}
+
+}
+
+QPoint SubTabs::scroll() const {
+	return QPoint(int(base::SafeRound(_scroll)) - _fullShift, 0);
+}
+
+void SubTabs::startReorder(int index, QPoint globalPos) {
+	cancelReorder();
+	_reorderIndex = index;
+	_reorderStart = globalPos.x();
+	_reorderState = SubTabsReorderUpdate::State::Cancelled;
+}
+
+void SubTabs::updateReorder(QPoint globalPos) {
+	if (_reorderIndex < 0 || isIndexPinned(_reorderIndex)) {
+		return;
+	}
+
+	_reorderMousePos = mapFromGlobal(globalPos);
+	const auto shift = globalPos.x() - _reorderStart;
+	auto &current = _buttons[_reorderIndex];
+	current.shiftAnimation.stop();
+	current.shift = current.finalShift = shift;
+
+	checkForScrollAnimation();
+
+	const auto count = _buttons.size();
+	const auto currentWidth = current.geometry.width();
+	const auto currentMiddle = current.geometry.x()
+		+ shift
+		+ currentWidth / 2;
+	_reorderDesiredIndex = _reorderIndex;
+
+	if (shift > 0) {
+		for (auto next = _reorderIndex + 1; next < count; ++next) {
+			if (isIndexPinned(next)) {
+				break;
+			}
+			const auto &e = _buttons[next];
+			if (currentMiddle < e.geometry.x() + e.geometry.width() / 2) {
+				moveToShift(next, 0);
+			} else {
+				_reorderDesiredIndex = next;
+				moveToShift(next, -currentWidth);
+			}
+		}
+		for (auto prev = _reorderIndex - 1; prev >= 0; --prev) {
+			moveToShift(prev, 0);
+		}
+	} else {
+		for (auto next = _reorderIndex + 1; next < count; ++next) {
+			moveToShift(next, 0);
+		}
+		for (auto prev = _reorderIndex - 1; prev >= 0; --prev) {
+			if (isIndexPinned(prev)) {
+				break;
+			}
+			const auto &e = _buttons[prev];
+			if (currentMiddle >= e.geometry.x() + e.geometry.width() / 2) {
+				moveToShift(prev, 0);
+			} else {
+				_reorderDesiredIndex = prev;
+				moveToShift(prev, currentWidth);
+			}
+		}
+	}
+	update();
+}
+
+void SubTabs::finishReorder() {
+	_reorderScrollAnimation.stop();
+	if (_reorderIndex < 0) {
+		return;
+	}
+
+	const auto index = _reorderIndex;
+	const auto result = _reorderDesiredIndex;
+	const auto id = _buttons[index].tab.id;
+
+	if (result == index
+		|| _reorderState != SubTabsReorderUpdate::State::Started) {
+		cancelReorder();
+		return;
+	}
+
+	_reorderState = SubTabsReorderUpdate::State::Applied;
+	_reorderIndex = -1;
+	_dragx = 0;
+	_pressx = 0;
+	_dragscroll = 0.;
+
+	auto &current = _buttons[index];
+	const auto width = current.geometry.width();
+
+	if (index < result) {
+		auto sum = 0;
+		for (auto i = index; i < result; ++i) {
+			auto &entry = _buttons[i + 1];
+			entry.deltaShift += width;
+			updateShift(i + 1);
+			sum += entry.geometry.width();
+		}
+		current.finalShift -= sum;
+	} else if (index > result) {
+		auto sum = 0;
+		for (auto i = result; i < index; ++i) {
+			auto &entry = _buttons[i];
+			entry.deltaShift -= width;
+			updateShift(i);
+			sum += entry.geometry.width();
+		}
+		current.finalShift += sum;
+	}
+
+	if (!(current.finalShift + current.deltaShift)) {
+		current.shift = 0;
+	}
+
+	base::reorder(_buttons, index, result);
+
+	auto x = st::giftBoxTabsMargin.left();
+	const auto y = st::giftBoxTabsMargin.top();
+	const auto padding = st::giftBoxTabPadding;
+	for (auto i = 0; i < _buttons.size(); ++i) {
+		auto &button = _buttons[i];
+		const auto width = button.text.maxWidth();
+		const auto height = st::giftBoxTabStyle.font->height;
+		const auto r = QRect(0, 0, width, height).marginsAdded(padding);
+		button.geometry = QRect(QPoint(x, y), r.size());
+		x += r.width() + st::giftBoxTabSkip;
+	}
+
+	for (auto i = 0; i < _buttons.size(); ++i) {
+		moveToShift(i, 0);
+	}
+
+	_reorderUpdates.fire(
+		{ id, index, result, ReorderUpdate::State::Applied });
+}
+
+void SubTabs::cancelReorder() {
+	_reorderScrollAnimation.stop();
+	if (_reorderIndex < 0) {
+		return;
+	}
+
+	const auto index = _reorderIndex;
+	const auto id = _buttons[index].tab.id;
+
+	if (_reorderState == SubTabsReorderUpdate::State::Started) {
+		_reorderState = SubTabsReorderUpdate::State::Cancelled;
+		_reorderUpdates.fire({ id, index, index, _reorderState });
+	}
+
+	_reorderIndex = -1;
+	_dragx = 0;
+	_pressx = 0;
+	_dragscroll = 0.;
+	for (auto i = 0; i < _buttons.size(); ++i) {
+		moveToShift(i, 0);
+	}
+}
+
+void SubTabs::moveToShift(int index, float64 shift) {
+	if (index < 0 || index >= _buttons.size()) {
+		return;
+	}
+
+	auto &entry = _buttons[index];
+	if (entry.finalShift + entry.deltaShift == shift) {
+		return;
+	}
+
+	entry.shiftAnimation.start(
+		[=, this] { updateShift(index); },
+		entry.finalShift,
+		shift - entry.deltaShift,
+		150);
+	entry.finalShift = shift - entry.deltaShift;
+}
+
+void SubTabs::updateShift(int index) {
+	if (index < 0 || index >= _buttons.size()) {
+		return;
+	}
+
+	auto &entry = _buttons[index];
+	entry.shift = entry.shiftAnimation.value(entry.finalShift)
+		+ entry.deltaShift;
+
+	if (entry.deltaShift && !entry.shiftAnimation.animating()) {
+		entry.finalShift += entry.deltaShift;
+		entry.deltaShift = 0;
+	}
+
+	update();
+}
+
+void SubTabs::shakeTransform(
+		QPainter &p,
+		int index,
+		QPoint position,
+		crl::time now) const {
+	constexpr auto kShakeADuration = crl::time(400);
+	constexpr auto kShakeXDuration = crl::time(kShakeADuration * 1.2);
+	constexpr auto kShakeYDuration = kShakeADuration;
+	const auto diff = ((index % 2) ? 0 : kShakeYDuration / 2)
+		+ (now - _shakeAnimation.started());
+	const auto pX = (diff % kShakeXDuration)
+		/ float64(kShakeXDuration);
+	const auto pY = (diff % kShakeYDuration)
+		/ float64(kShakeYDuration);
+
+	constexpr auto kMaxTranslation = .5;
+	constexpr auto kXStep = 1. / 5;
+	constexpr auto kYStep = 1. / 4;
+
+	// 0, kMaxTranslation, 0, -kMaxTranslation, 0.
+	const auto x = (pX < kXStep)
+		? anim::interpolateF(0., kMaxTranslation, pX / kXStep)
+		: (pX < kXStep * 2.)
+		? anim::interpolateF(kMaxTranslation, 0, (pX - kXStep) / kXStep)
+		: (pX < kXStep * 3.)
+		? anim::interpolateF(0, -kMaxTranslation, (pX - kXStep * 2.) / kXStep)
+		: (pX < kXStep * 4.)
+		? anim::interpolateF(-kMaxTranslation, 0, (pX - kXStep * 3.) / kXStep)
+		: anim::interpolateF(0, 0., (pX - kXStep * 4.) / kXStep);
+
+	// 0, kMaxTranslation, -kMaxTranslation, 0.
+	const auto y = (pY < kYStep)
+		? anim::interpolateF(0., kMaxTranslation, pY / kYStep)
+		: (pY < kYStep * 2.)
+		? anim::interpolateF(kMaxTranslation, 0, (pY - kYStep) / kYStep)
+		: (pY < kYStep * 3.)
+		? anim::interpolateF(0, -kMaxTranslation, (pY - kYStep * 2.) / kYStep)
+		: anim::interpolateF(-kMaxTranslation, 0, (pY - kYStep * 3) / kYStep);
+
+	p.translate(x, y);
+}
+
+void SubTabs::checkForScrollAnimation() {
+	if (_reorderIndex < 0
+		|| !deltaFromEdge()
+		|| _reorderScrollAnimation.animating()) {
+		return;
+	}
+	_reorderScrollAnimation.start();
+}
+
+void SubTabs::updateScrollCallback() {
+	const auto delta = deltaFromEdge();
+	if (!delta) {
+		return;
+	}
+
+	const auto oldScroll = _scroll;
+	_scroll = std::clamp(_scroll + delta * 0.1, 0., float64(_scrollMax));
+
+	const auto scrollDelta = oldScroll - _scroll;
+	_reorderStart += scrollDelta;
+
+	if (_reorderIndex >= 0) {
+		auto &current = _buttons[_reorderIndex];
+		current.shift = current.finalShift -= scrollDelta;
+	}
+
+	if (_scroll == 0. || _scroll == _scrollMax) {
+		_reorderScrollAnimation.stop();
+	}
+	update();
+}
+
+int SubTabs::deltaFromEdge() {
+	if (_reorderIndex < 0) {
+		return 0;
+	}
+
+	const auto mouseX = _reorderMousePos.x();
+	const auto isLeftEdge = (mouseX < 0);
+	const auto isRightEdge = (mouseX > width());
+
+	if (!isLeftEdge && !isRightEdge) {
+		_reorderScrollAnimation.stop();
+		return 0;
+	}
+
+	const auto delta = isRightEdge ? (mouseX - width()) : mouseX;
+	return std::clamp(delta, -50, 50);
+}
+
+} // namespace Ui
+
diff --git a/Telegram/SourceFiles/ui/controls/sub_tabs.h b/Telegram/SourceFiles/ui/controls/sub_tabs.h
new file mode 100644
index 00000000000000..e03db622f5568d
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/sub_tabs.h
@@ -0,0 +1,149 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/effects/animations.h"
+
+namespace style {
+struct SubTabs;
+} // namespace style
+
+namespace Ui {
+
+struct SubTabsOptions {
+	QString selected;
+	bool centered = false;
+};
+
+struct SubTabsTab {
+	QString id;
+	TextWithEntities text;
+
+	friend inline bool operator==(
+		const SubTabsTab &,
+		const SubTabsTab &) = default;
+};
+
+struct SubTabsReorderUpdate {
+	QString id;
+	int oldPosition = 0;
+	int newPosition = 0;
+	enum class State : uchar {
+		Started,
+		Applied,
+		Cancelled,
+	} state = State::Started;
+};
+
+class SubTabs : public RpWidget {
+public:
+	using Options = SubTabsOptions;
+	using Tab = SubTabsTab;
+
+	explicit SubTabs(
+		QWidget *parent,
+		const style::SubTabs &st,
+		Options options = {},
+		std::vector<Tab> tabs = {},
+		Text::MarkedContext context = {});
+
+	void setTabs(
+		std::vector<Tab> tabs,
+		Text::MarkedContext context = {});
+
+	void setActiveTab(const QString &id);
+
+	void setReorderEnabled(bool enabled);
+	[[nodiscard]] bool reorderEnabled() const;
+
+	void setPinnedInterval(int from, int to);
+	void clearPinnedIntervals();
+
+	[[nodiscard]] rpl::producer<QString> activated() const;
+	[[nodiscard]] rpl::producer<QString> contextMenuRequests() const;
+
+	using ReorderUpdate = SubTabsReorderUpdate;
+	[[nodiscard]] rpl::producer<ReorderUpdate> reorderUpdates() const;
+
+private:
+	struct Button {
+		Tab tab;
+		QRect geometry;
+		Text::String text;
+		bool active = false;
+		Ui::Animations::Simple shiftAnimation;
+		float64 shift = 0.;
+		float64 finalShift = 0.;
+		float64 deltaShift = 0.;
+	};
+
+	int resizeGetHeight(int newWidth) override;
+	void wheelEvent(QWheelEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void contextMenuEvent(QContextMenuEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+	bool eventHook(QEvent *e) override;
+
+	void setSelected(int index);
+	void setActive(int index);
+	[[nodiscard]] QPoint scroll() const;
+	void shakeTransform(QPainter &p, int index, QPoint position, crl::time now) const;
+	[[nodiscard]] bool isIndexPinned(int index) const;
+
+	void startReorder(int index, QPoint globalPos);
+	void updateReorder(QPoint globalPos);
+	void finishReorder();
+	void cancelReorder();
+	void moveToShift(int index, float64 shift);
+	void updateShift(int index);
+
+	void checkForScrollAnimation();
+	void updateScrollCallback();
+	[[nodiscard]] int deltaFromEdge();
+
+	const style::SubTabs &_st;
+	std::vector<Button> _buttons;
+	rpl::event_stream<QString> _activated;
+	rpl::event_stream<QString> _contextMenuRequests;
+	rpl::event_stream<ReorderUpdate> _reorderUpdates;
+	std::optional<Qt::Orientation> _locked;
+	int _dragx = 0;
+	int _pressx = 0;
+	float64 _dragscroll = 0.;
+	float64 _scroll = 0.;
+	float64 _scrollTo = 0.;
+	Ui::Animations::Simple _scrollAnimation;
+	Ui::Animations::Basic _reorderScrollAnimation;
+	int _scrollMax = 0;
+	int _fullShift = 0;
+	int _fullWidth = 0;
+	int _selected = -1;
+	int _pressed = -1;
+	int _active = -1;
+	bool _centered = false;
+	bool _reorderEnable = false;
+	Ui::Animations::Basic _shakeAnimation;
+	struct PinnedInterval {
+		int from;
+		int to;
+	};
+	std::vector<PinnedInterval> _pinnedIntervals;
+
+	int _reorderIndex = -1;
+	float64 _reorderStart = 0.;
+	int _reorderDesiredIndex = 0;
+	SubTabsReorderUpdate::State _reorderState
+		= SubTabsReorderUpdate::State::Cancelled;
+	QPoint _reorderMousePos;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.cpp b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.cpp
new file mode 100644
index 00000000000000..dbe1e7b3a28872
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.cpp
@@ -0,0 +1,1042 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/subsection_tabs_slider.h"
+
+#include "dialogs/dialogs_three_state_icon.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/dynamic_image.h"
+#include "ui/unread_badge_paint.h"
+#include "ui/unread_counter_format.h"
+#include "ui/painter.h"
+#include "ui/round_rect.h"
+#include "styles/style_chat.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_filter_icons.h"
+#include "styles/style_layers.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kMaxNameLines = 3;
+constexpr auto kVerticalScale = 0.6;
+constexpr auto kHorizontalScale = 0.5;
+
+void PaintPinnedIcon(
+		QPainter &p,
+		int width,
+		int backgroundMargin,
+		float64 scale = kVerticalScale,
+		bool isHorizontal = false) {
+	constexpr auto kOffset = 5;
+	p.scale(scale, scale);
+	if (isHorizontal) {
+		p.translate(
+			st::lineWidth * kOffset,
+			st::lineWidth * kOffset + backgroundMargin);
+	} else {
+		p.translate(
+			st::lineWidth * kOffset + backgroundMargin,
+			st::lineWidth * kOffset);
+	}
+	st::dialogsPinnedIcon.icon.paint(p, 0, 0, width);
+}
+
+class VerticalButton final : public SubsectionButton {
+public:
+	VerticalButton(
+		not_null<QWidget*> parent,
+		not_null<SubsectionButtonDelegate*> delegate,
+		SubsectionTab &&data);
+	~VerticalButton();
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	void dataUpdatedHook() override;
+	void invalidateCache() override;
+	QImage prepareRippleMask() const override final {
+		return isPinned()
+			? _rippleMask
+			: Ui::RippleButton::prepareRippleMask();
+	}
+
+	void updateSize();
+	void paintPinnedBackground(QPainter &p, const QRect &bgRect);
+	QPainterPath createClipPath(const QRect &rect) const;
+	[[nodiscard]] const QPainterPath &cachedClipPath(const QRect &rect);
+
+	const style::ChatTabsVertical &_st;
+	Text::String _text;
+	bool _subscribed = false;
+	RoundRect _roundRect;
+	QImage _rippleMask;
+	QPainterPath _clipPathCache;
+	QRect _clipPathRect;
+	bool _clipPathValid = false;
+
+};
+
+class HorizontalButton final : public SubsectionButton {
+public:
+	HorizontalButton(
+		not_null<QWidget*> parent,
+		const style::SettingsSlider &st,
+		not_null<SubsectionButtonDelegate*> delegate,
+		SubsectionTab &&data);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	void dataUpdatedHook() override;
+	void invalidateCache() override;
+	QImage prepareRippleMask() const override final {
+		return isPinned()
+			? _rippleMask
+			: Ui::RippleButton::prepareRippleMask();
+	}
+	void updateSize();
+	void paintPinnedBackground(QPainter &p, const QRect &bgRect);
+	QPainterPath createClipPath(const QRect &rect) const;
+	[[nodiscard]] const QPainterPath &cachedClipPath(const QRect &rect);
+
+	const style::SettingsSlider &_st;
+	Text::String _text;
+	RoundRect _roundRect;
+	QImage _rippleMask;
+	QPainterPath _clipPathCache;
+	QRect _clipPathRect;
+	bool _clipPathValid = false;
+
+};
+
+VerticalButton::VerticalButton(
+	not_null<QWidget*> parent,
+	not_null<SubsectionButtonDelegate*> delegate,
+	SubsectionTab &&data)
+: SubsectionButton(parent, delegate, std::move(data))
+, _st(st::chatTabsVertical)
+, _text(_st.nameStyle, _data.text, kDefaultTextOptions, _st.nameWidth)
+, _roundRect(st::boxRadius, st::windowBgOver) {
+	updateSize();
+}
+
+VerticalButton::~VerticalButton() {
+	if (_subscribed) {
+		_data.userpic->subscribeToUpdates(nullptr);
+	}
+}
+
+void VerticalButton::dataUpdatedHook() {
+	_text.setMarkedText(_st.nameStyle, _data.text, kDefaultTextOptions);
+	updateSize();
+}
+
+void VerticalButton::invalidateCache() {
+	_roundRect.setColor(st::white);
+	if (isPinned()) {
+		const auto bgRect = rect()
+			- QMargins(_backgroundMargin, 0, _backgroundMargin, 0);
+		const auto ratio = style::DevicePixelRatio();
+		_rippleMask = QImage(
+			bgRect.size() * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		_rippleMask.setDevicePixelRatio(ratio);
+		_rippleMask.fill(Qt::transparent);
+		{
+			auto p = QPainter(&_rippleMask);
+			_roundRect.paintSomeRounded(p, QRect(QPoint(), bgRect.size()), 0);
+		}
+	} else {
+		_rippleMask = QImage();
+	}
+	_roundRect.setColor(st::shadowFg);
+	_clipPathValid = false;
+}
+
+void VerticalButton::updateSize() {
+	resize(_st.width, _st.baseHeight + std::min(
+		_st.nameStyle.font->height * kMaxNameLines,
+		_text.countHeight(_st.nameWidth, true)));
+	_clipPathValid = false;
+}
+
+void VerticalButton::paintPinnedBackground(QPainter &p, const QRect &bgRect) {
+	if (isFirstPinned() && isLastPinned()) {
+		_roundRect.paint(p, bgRect);
+	} else if (isFirstPinned()) {
+		_roundRect.paintSomeRounded(
+			p,
+			bgRect,
+			RectPart::TopLeft | RectPart::TopRight);
+	} else if (isLastPinned()) {
+		_roundRect.paintSomeRounded(
+			p,
+			bgRect,
+			RectPart::BottomLeft | RectPart::BottomRight);
+	} else {
+		_roundRect.paintSomeRounded(p, bgRect, 0);
+	}
+}
+
+QPainterPath VerticalButton::createClipPath(const QRect &rect) const {
+	QPainterPath path;
+	path.setFillRule(Qt::WindingFill);
+	const auto radius = st::boxRadius;
+	if (isFirstPinned() && isLastPinned()) {
+		path.addRoundedRect(rect, radius, radius);
+	} else if (isFirstPinned()) {
+		path.addRoundedRect(rect, radius, radius);
+		path.addRect(rect.adjusted(0, rect.height() / 2, 0, 0));
+	} else if (isLastPinned()) {
+		path.addRoundedRect(rect, radius, radius);
+		path.addRect(rect.adjusted(0, 0, 0, -rect.height() / 2));
+	}
+	return path;
+}
+
+const QPainterPath &VerticalButton::cachedClipPath(const QRect &rect) {
+	if (!_clipPathValid || _clipPathRect != rect) {
+		_clipPathCache = createClipPath(rect);
+		_clipPathRect = rect;
+		_clipPathValid = true;
+	}
+	return _clipPathCache;
+}
+
+void VerticalButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	const auto active = _delegate->buttonActive(this);
+	const auto color = anim::color(
+		_st.rippleBg,
+		_st.rippleBgActive,
+		active);
+
+	if (isPinned()) {
+		const auto bgRect = rect()
+			- QMargins(_backgroundMargin, 0, _backgroundMargin, 0);
+		if (isFirstPinned() || isLastPinned()) {
+			p.setClipPath(cachedClipPath(bgRect));
+		}
+		paintPinnedBackground(p, bgRect);
+		paintRipple(p, QPoint(_backgroundMargin, 0), &color);
+	} else {
+		paintRipple(p, QPoint(0, 0), &color);
+	}
+
+	if (!_subscribed) {
+		_subscribed = true;
+		_data.userpic->subscribeToUpdates([=] { update(); });
+	}
+	const auto &image = _data.userpic->image(_st.userpicSize);
+	const auto userpicLeft = (width() - _st.userpicSize) / 2;
+	p.drawImage(userpicLeft, _st.userpicTop, image);
+	p.setPen(anim::pen(_st.nameFg, _st.nameFgActive, active));
+
+	const auto textLeft = (width() - _st.nameWidth) / 2;
+	_text.draw(p, {
+		.position = QPoint(textLeft, _st.nameTop),
+		.outerWidth = width(),
+		.availableWidth = _st.nameWidth,
+		.align = style::al_top,
+		.paused = _delegate->buttonPaused(),
+		.elisionLines = kMaxNameLines,
+	});
+
+	const auto &state = _data.badges;
+	const auto top = _st.userpicTop / 2;
+	auto right = width() - textLeft;
+	UnreadBadgeStyle st;
+	if (state.unread) {
+		st.muted = state.unreadMuted;
+		const auto counter = FormatUnreadCounter(
+			state.unreadCounter,
+			state.mention || state.reaction,
+			true);
+		const auto badge = PaintUnreadBadge(p, counter, right, top, st);
+		right -= badge.width() + st.padding;
+	}
+	if (state.mention || state.reaction) {
+		const auto muted = state.mention
+			? state.mentionMuted
+			: state.reactionMuted;
+		const auto &icon = state.mention
+			? (muted
+				? st::dialogsUnreadMentionMuted.icon
+				: st::dialogsUnreadMention.icon)
+			: (muted
+				? st::dialogsUnreadReactionMuted.icon
+				: st::dialogsUnreadReaction.icon);
+		icon.paint(p, right - icon.width(), top, width());
+		right -= icon.width() + st::dialogsUnreadPadding;
+	}
+	if (isPinned() && isFirstPinned()) {
+		PaintPinnedIcon(p, width(), _backgroundMargin);
+	}
+}
+
+HorizontalButton::HorizontalButton(
+	not_null<QWidget*> parent,
+	const style::SettingsSlider &st,
+	not_null<SubsectionButtonDelegate*> delegate,
+	SubsectionTab &&data)
+: SubsectionButton(parent, delegate, std::move(data))
+, _st(st)
+, _roundRect(st::boxRadius, st::windowBgOver) {
+	dataUpdatedHook();
+}
+
+void HorizontalButton::updateSize() {
+	auto width = _st.strictSkip + _text.maxWidth();
+
+	const auto &state = _data.badges;
+	UnreadBadgeStyle st;
+	if (state.unread) {
+		const auto counter = FormatUnreadCounter(
+			state.unreadCounter,
+			false,
+			false);
+		const auto badge = CountUnreadBadgeSize(counter, st);
+		width += badge.width() + st.padding;
+	}
+	if (state.mention || state.reaction) {
+		st.sizeId = state.mention
+			? UnreadBadgeSize::Dialogs
+			: UnreadBadgeSize::ReactionInDialogs;
+		st.padding = 0;
+		st.textTop = 0;
+		const auto counter = QString();
+		const auto badge = CountUnreadBadgeSize(counter, st);
+		width += badge.width() + st.padding + st::dialogsUnreadPadding;
+	}
+	resize(width, _st.height);
+	_clipPathValid = false;
+}
+
+void HorizontalButton::paintPinnedBackground(
+		QPainter &p,
+		const QRect &bgRect) {
+	if (isFirstPinned() && isLastPinned()) {
+		_roundRect.paint(p, bgRect);
+	} else if (isFirstPinned()) {
+		_roundRect.paintSomeRounded(
+			p,
+			bgRect,
+			RectPart::TopLeft | RectPart::BottomLeft);
+	} else if (isLastPinned()) {
+		_roundRect.paintSomeRounded(
+			p,
+			bgRect,
+			RectPart::TopRight | RectPart::BottomRight);
+	} else {
+		_roundRect.paintSomeRounded(p, bgRect, 0);
+	}
+}
+
+QPainterPath HorizontalButton::createClipPath(const QRect &rect) const {
+	QPainterPath path;
+	path.setFillRule(Qt::WindingFill);
+	const auto radius = st::boxRadius;
+	if (isFirstPinned() && isLastPinned()) {
+		path.addRoundedRect(rect, radius, radius);
+	} else if (isFirstPinned()) {
+		path.addRoundedRect(rect, radius, radius);
+		path.addRect(rect.adjusted(rect.width() / 2, 0, 0, 0));
+	} else if (isLastPinned()) {
+		path.addRoundedRect(rect, radius, radius);
+		path.addRect(rect.adjusted(0, 0, -rect.width() / 2, 0));
+	}
+	return path;
+}
+
+const QPainterPath &HorizontalButton::cachedClipPath(const QRect &rect) {
+	if (!_clipPathValid || _clipPathRect != rect) {
+		_clipPathCache = createClipPath(rect);
+		_clipPathRect = rect;
+		_clipPathValid = true;
+	}
+	return _clipPathCache;
+}
+
+void HorizontalButton::dataUpdatedHook() {
+	auto context = _delegate->buttonContext();
+	context.repaint = [=] { update(); };
+	_text.setMarkedText(
+		_st.labelStyle,
+		_data.text,
+		kDefaultTextOptions,
+		context);
+	updateSize();
+}
+
+void HorizontalButton::invalidateCache() {
+	_roundRect.setColor(st::white);
+	if (isPinned()) {
+		const auto bgRect = rect()
+			- QMargins(0, _backgroundMargin, 0, _backgroundMargin);
+		const auto ratio = style::DevicePixelRatio();
+		_rippleMask = QImage(
+			bgRect.size() * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		_rippleMask.setDevicePixelRatio(ratio);
+		_rippleMask.fill(Qt::transparent);
+		{
+			auto p = QPainter(&_rippleMask);
+			_roundRect.paintSomeRounded(p, QRect(QPoint(), bgRect.size()), 0);
+		}
+	} else {
+		_rippleMask = QImage();
+	}
+	_roundRect.setColor(st::shadowFg);
+	_clipPathValid = false;
+}
+
+void HorizontalButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	const auto active = _delegate->buttonActive(this);
+
+	const auto color = anim::color(
+		_st.rippleBg,
+		_st.rippleBgActive,
+		active);
+
+	if (isPinned()) {
+		const auto bgRect = rect()
+			- QMargins(0, _backgroundMargin, 0, _backgroundMargin);
+		if (isFirstPinned() || isLastPinned()) {
+			p.setClipPath(cachedClipPath(bgRect));
+		}
+		paintPinnedBackground(p, bgRect);
+		paintRipple(p, QPoint(0, _backgroundMargin), &color);
+	} else {
+		paintRipple(p, QPoint(0, 0), &color);
+	}
+
+	p.setPen(anim::pen(_st.labelFg, _st.labelFgActive, active));
+	_text.draw(p, {
+		.position = QPoint(_st.strictSkip / 2, _st.labelTop),
+		.outerWidth = width(),
+		.availableWidth = _text.maxWidth(),
+		.paused = _delegate->buttonPaused(),
+	});
+
+	auto right = width() - _st.strictSkip + (_st.strictSkip / 2);
+	UnreadBadgeStyle st;
+	const auto &state = _data.badges;
+	const auto badgeTop = (height() - st.size) / 2;
+	if (state.unread) {
+		st.muted = state.unreadMuted;
+		const auto counter = FormatUnreadCounter(
+			state.unreadCounter,
+			false,
+			false);
+		const auto badge = PaintUnreadBadge(p, counter, right, badgeTop, st);
+		right -= badge.width() + st.padding;
+	}
+	if (state.mention || state.reaction) {
+		const auto muted = state.mention
+			? state.mentionMuted
+			: state.reactionMuted;
+		const auto &icon = state.mention
+			? (muted
+				? st::dialogsUnreadMentionMuted.icon
+				: st::dialogsUnreadMention.icon)
+			: (muted
+				? st::dialogsUnreadReactionMuted.icon
+				: st::dialogsUnreadReaction.icon);
+		icon.paint(p, right - icon.width(), badgeTop, width());
+		right -= icon.width() + st::dialogsUnreadPadding;
+	}
+
+	if (isPinned() && isFirstPinned()) {
+		PaintPinnedIcon(
+			p,
+			width(),
+			_backgroundMargin,
+			kHorizontalScale,
+			true);
+	}
+}
+
+} // namespace
+
+SubsectionButton::SubsectionButton(
+	not_null<QWidget*> parent,
+	not_null<SubsectionButtonDelegate*> delegate,
+	SubsectionTab &&data)
+: RippleButton(parent, st::defaultRippleAnimationBgOver)
+, _delegate(delegate)
+, _data(std::move(data)) {
+}
+
+SubsectionButton::~SubsectionButton() = default;
+
+void SubsectionButton::setData(SubsectionTab &&data) {
+	Expects(_data.userpic.get() == data.userpic.get());
+
+	_data = std::move(data);
+	RippleButton::finishAnimating();
+	dataUpdatedHook();
+	update();
+}
+
+DynamicImage *SubsectionButton::userpic() const {
+	return _data.userpic.get();
+}
+
+void SubsectionButton::setActiveShown(float64 activeShown) {
+	if (_activeShown != activeShown) {
+		_activeShown = activeShown;
+		update();
+	}
+}
+
+void SubsectionButton::setIsPinned(bool pinned) {
+	if (_isPinned != pinned) {
+		_isPinned = pinned;
+		invalidateCache();
+		update();
+	}
+}
+
+bool SubsectionButton::isPinned() const {
+	return _isPinned;
+}
+
+void SubsectionButton::setPinnedPosition(bool isFirst, bool isLast) {
+	if (_isFirstPinned != isFirst || _isLastPinned != isLast) {
+		_isFirstPinned = isFirst;
+		_isLastPinned = isLast;
+		invalidateCache();
+		update();
+	}
+}
+
+bool SubsectionButton::isFirstPinned() const {
+	return _isFirstPinned;
+}
+
+bool SubsectionButton::isLastPinned() const {
+	return _isLastPinned;
+}
+
+void SubsectionButton::setBackgroundMargin(int margin) {
+	_backgroundMargin = margin;
+	invalidateCache();
+}
+
+void SubsectionButton::setShift(int shift) {
+	_shift = shift;
+}
+
+void SubsectionButton::contextMenuEvent(QContextMenuEvent *e) {
+	_delegate->buttonContextMenu(this, e);
+}
+
+SubsectionSlider::SubsectionSlider(not_null<QWidget*> parent, bool vertical)
+: RpWidget(parent)
+, _vertical(vertical)
+, _barSt(vertical
+	? st::chatTabsOutlineVertical
+	: st::chatTabsOutlineHorizontal)
+, _bar(CreateChild<RpWidget>(this))
+, _barRect(_barSt.radius, _barSt.fg) {
+	setupBar();
+}
+
+SubsectionSlider::~SubsectionSlider() = default;
+
+void SubsectionSlider::setupBar() {
+	_bar->setAttribute(Qt::WA_TransparentForMouseEvents);
+	sizeValue() | rpl::on_next([=](QSize size) {
+		const auto thickness = _barSt.stroke - (_barSt.stroke / 2);
+		_bar->setGeometry(
+			0,
+			_vertical ? 0 : (size.height() - thickness),
+			_vertical ? thickness : size.width(),
+			_vertical ? size.height() : thickness);
+	}, _bar->lifetime());
+	_bar->paintRequest() | rpl::on_next([=](QRect clip) {
+		const auto start = -_barSt.stroke / 2;
+		const auto currentRange = getCurrentActiveRange();
+		const auto from = currentRange.from + _barSt.skip;
+		const auto size = currentRange.size - 2 * _barSt.skip;
+		if (size <= 0) {
+			return;
+		}
+		const auto rect = myrtlrect(
+			_vertical ? start : from,
+			_vertical ? from : 0,
+			_vertical ? _barSt.stroke : size,
+			_vertical ? size : _barSt.stroke);
+		if (rect.intersects(clip)) {
+			auto p = QPainter(_bar);
+			_barRect.paint(p, rect);
+		}
+	}, _bar->lifetime());
+}
+
+void SubsectionSlider::setSections(
+		SubsectionTabs sections,
+		Fn<bool()> paused) {
+	Expects(!sections.tabs.empty());
+
+	_context = sections.context;
+	_paused = std::move(paused);
+	_fixedCount = sections.fixed;
+	_pinnedCount = sections.pinned;
+	_reorderAllowed = sections.reorder;
+
+	auto old = base::take(_tabs);
+	_tabs.reserve(sections.tabs.size());
+
+	auto size = 0;
+	for (auto &data : sections.tabs) {
+		const auto i = data.userpic
+			? ranges::find(
+				old,
+				data.userpic.get(),
+				&SubsectionButton::userpic)
+			: old.empty()
+			? end(old)
+			: (end(old) - 1);
+		if (i != end(old)) {
+			_tabs.push_back(std::move(*i));
+			old.erase(i);
+			_tabs.back()->setData(std::move(data));
+		} else {
+			_tabs.push_back(makeButton(std::move(data)));
+			_tabs.back()->show();
+		}
+		_tabs.back()->setBackgroundMargin(_barSt.radius);
+		_tabs.back()->move(_vertical ? 0 : size, _vertical ? size : 0);
+
+		const auto index = int(_tabs.size()) - 1;
+		const auto isPinned = (index >= _fixedCount)
+			&& (index < _fixedCount + _pinnedCount);
+		_tabs.back()->setIsPinned(isPinned);
+		if (isPinned) {
+			const auto isFirst = (index == _fixedCount);
+			const auto isLast = (index == _fixedCount + _pinnedCount - 1);
+			_tabs.back()->setPinnedPosition(isFirst, isLast);
+		}
+		_tabs.back()->setClickedCallback([=, raw = _tabs.back().get()] {
+			if (_tabsReorderedOnce) {
+				const auto i = ranges::find(
+					_tabs,
+					raw,
+					&std::unique_ptr<SubsectionButton>::get);
+				if (i != end(_tabs)) {
+					activate(int(i - begin(_tabs)));
+				}
+			} else {
+				activate(index);
+			}
+		});
+		size += _vertical ? _tabs.back()->height() : _tabs.back()->width();
+	}
+
+	for (auto i = 0; i < int(_tabs.size()); ++i) {
+		const auto isPinned = (i >= _fixedCount)
+			&& (i < _fixedCount + _pinnedCount);
+		if (isPinned) {
+			const auto isFirst = (i == _fixedCount);
+			const auto isLast = (i == _fixedCount + _pinnedCount - 1);
+			_tabs[i]->setPinnedPosition(isFirst, isLast);
+		}
+	}
+
+	if (!_tabs.empty()) {
+		resize(
+			_vertical ? _tabs.front()->width() : size,
+			_vertical ? size : _tabs.front()->height());
+	}
+
+	_bar->raise();
+}
+
+void SubsectionSlider::activate(int index) {
+	if (_isReorderingCallback && _isReorderingCallback()) {
+		return;
+	}
+	const auto old = _active;
+	const auto was = getFinalActiveRange();
+	_active = index;
+	const auto now = getFinalActiveRange();
+	const auto callback = [=] {
+		_bar->update();
+		for (auto i = std::min(old, index); i != std::max(old, index); ++i) {
+			if (i >= 0 && i < int(_tabs.size())) {
+				_tabs[i]->update();
+			}
+		}
+	};
+	const auto weak = base::make_weak(_bar);
+	_sectionActivated.fire_copy(index);
+	if (weak) {
+		const auto duration = st::chatTabsSlider.duration;
+		_activeFrom.start(callback, was.from, now.from, duration);
+		_activeSize.start(callback, was.size, now.size, duration);
+		_requestShown.fire_copy({ now.from, now.from + now.size });
+	}
+}
+
+void SubsectionSlider::setActiveSectionFast(int active, bool ignoreScroll) {
+	Expects(active < int(_tabs.size()));
+
+	if (_active == active) {
+		return;
+	}
+	_active = active;
+	_activeFrom.stop();
+	_activeSize.stop();
+	if (_active >= 0 && !ignoreScroll) {
+		const auto now = getFinalActiveRange();
+		_requestShown.fire({ now.from, now.from + now.size });
+	}
+	_bar->update();
+}
+
+rpl::producer<ScrollToRequest> SubsectionSlider::requestShown() const {
+	return _requestShown.events();
+}
+
+void SubsectionSlider::setIsReorderingCallback(Fn<bool()> callback) {
+	_isReorderingCallback = std::move(callback);
+}
+
+int SubsectionSlider::sectionsCount() const {
+	return int(_tabs.size());
+}
+
+rpl::producer<int> SubsectionSlider::sectionActivated() const {
+	return _sectionActivated.events();
+}
+
+rpl::producer<int> SubsectionSlider::sectionContextMenu() const {
+	return _sectionContextMenu.events();
+}
+
+int SubsectionSlider::lookupSectionPosition(int index) const {
+	Expects(!_tabs.empty());
+	Expects(index >= 0 && index < _tabs.size());
+
+	return _vertical ? _tabs[index]->y() : _tabs[index]->x();
+}
+
+void SubsectionSlider::paintEvent(QPaintEvent *e) {
+}
+
+int SubsectionSlider::lookupSectionIndex(QPoint position) const {
+	Expects(!_tabs.empty());
+
+	const auto count = sectionsCount();
+	if (_vertical) {
+		for (auto i = 0; i != count; ++i) {
+			const auto tab = _tabs[i].get();
+			if (position.y() < tab->y() + tab->height()) {
+				return i;
+			}
+		}
+	} else {
+		for (auto i = 0; i != count; ++i) {
+			const auto tab = _tabs[i].get();
+			if (position.x() < tab->x() + tab->width()) {
+				return i;
+			}
+		}
+	}
+	return count - 1;
+}
+
+SubsectionSlider::Range SubsectionSlider::getFinalActiveRange() const {
+	if (_active < 0 || _active >= _tabs.size()) {
+		return {};
+	}
+	const auto tab = _tabs[_active].get();
+	return Range{
+		.from = _vertical ? tab->y() : tab->x(),
+		.size = _vertical ? tab->height() : tab->width(),
+	};
+}
+
+SubsectionSlider::Range SubsectionSlider::getCurrentActiveRange() const {
+	const auto finalRange = getFinalActiveRange();
+	return {
+		.from = int(base::SafeRound(_activeFrom.value(finalRange.from))),
+		.size = int(base::SafeRound(_activeSize.value(finalRange.size))),
+	};
+}
+
+bool SubsectionSlider::buttonPaused() {
+	return _paused && _paused();
+}
+
+float64 SubsectionSlider::buttonActive(not_null<SubsectionButton*> button) {
+	const auto currentRange = getCurrentActiveRange();
+	const auto from = _vertical ? button->y() : button->x();
+	const auto size = _vertical ? button->height() : button->width();
+	const auto checkSize = std::min(size, currentRange.size);
+	return (checkSize > 0)
+		? (1. - (std::abs(currentRange.from - from) / float64(checkSize)))
+		: 0.;
+}
+
+void SubsectionSlider::buttonContextMenu(
+		not_null<SubsectionButton*> button,
+		not_null<QContextMenuEvent*> e) {
+	const auto i = ranges::find(
+		_tabs,
+		button.get(),
+		&std::unique_ptr<SubsectionButton>::get);
+	Assert(i != end(_tabs));
+
+	_sectionContextMenu.fire(int(i - begin(_tabs)));
+	e->accept();
+}
+
+Text::MarkedContext SubsectionSlider::buttonContext() {
+	return _context;
+}
+
+not_null<SubsectionButton*> SubsectionSlider::buttonAt(int index) {
+	Expects(index >= 0 && index < _tabs.size());
+
+	return _tabs[index].get();
+}
+
+void SubsectionSlider::setButtonShift(int index, int shift) {
+	Expects(index >= 0 && index < _tabs.size());
+
+	auto position = 0;
+	for (auto i = 0; i < index; ++i) {
+		position += _vertical ? _tabs[i]->height() : _tabs[i]->width();
+	}
+
+	const auto targetPos = position + shift;
+
+	_tabs[index]->move(
+		_vertical ? 0 : targetPos,
+		_vertical ? targetPos : 0);
+	recalculatePinnedPositionsByUI();
+}
+
+void SubsectionSlider::reorderButtons(int from, int to) {
+	Expects(from >= 0 && from < _tabs.size());
+	Expects(to >= 0 && to < _tabs.size());
+	if (from == to) {
+		return;
+	}
+
+	_active = base::reorder_index(_active, from, to);
+	base::reorder(_tabs, from, to);
+
+	auto position = 0;
+	for (auto i = 0; i < int(_tabs.size()); ++i) {
+		_tabs[i]->move(_vertical ? 0 : position, _vertical ? position : 0);
+		position += _vertical ? _tabs[i]->height() : _tabs[i]->width();
+	}
+	_tabsReorderedOnce = true;
+}
+
+void SubsectionSlider::recalculatePinnedPositions() {
+	for (auto i = 0; i < int(_tabs.size()); ++i) {
+		const auto isPinned = (i >= _fixedCount)
+			&& (i < _fixedCount + _pinnedCount);
+		_tabs[i]->setIsPinned(isPinned);
+		if (isPinned) {
+			const auto isFirst = (i == _fixedCount);
+			const auto isLast = (i == _fixedCount + _pinnedCount - 1);
+			_tabs[i]->setPinnedPosition(isFirst, isLast);
+		}
+	}
+}
+
+void SubsectionSlider::recalculatePinnedPositionsByUI() {
+	if (_pinnedCount == 0) {
+		return;
+	}
+
+	auto pinnedIndices = std::vector<int>();
+	for (auto i = 0; i < int(_tabs.size()); ++i) {
+		if (_tabs[i]->isPinned()) {
+			pinnedIndices.push_back(i);
+		}
+	}
+
+	if (pinnedIndices.empty()) {
+		return;
+	}
+
+	ranges::sort(pinnedIndices, [&](int a, int b) {
+		const auto posA = _vertical ? _tabs[a]->y() : _tabs[a]->x();
+		const auto posB = _vertical ? _tabs[b]->y() : _tabs[b]->x();
+		return posA < posB;
+	});
+
+	for (auto i = 0; i < int(pinnedIndices.size()); ++i) {
+		const auto index = pinnedIndices[i];
+		const auto isFirst = (i == 0);
+		const auto isLast = (i == int(pinnedIndices.size()) - 1);
+		_tabs[index]->setPinnedPosition(isFirst, isLast);
+	}
+}
+
+VerticalSlider::VerticalSlider(not_null<QWidget*> parent)
+: SubsectionSlider(parent, true) {
+}
+
+VerticalSlider::~VerticalSlider() = default;
+
+std::unique_ptr<SubsectionButton> VerticalSlider::makeButton(
+		SubsectionTab &&data) {
+	return std::make_unique<VerticalButton>(
+		this,
+		static_cast<SubsectionButtonDelegate*>(this),
+		std::move(data));
+}
+
+HorizontalSlider::HorizontalSlider(not_null<QWidget*> parent)
+: SubsectionSlider(parent, false)
+, _st(st::chatTabsSlider) {
+}
+
+HorizontalSlider::~HorizontalSlider() = default;
+
+std::unique_ptr<SubsectionButton> HorizontalSlider::makeButton(
+		SubsectionTab &&data) {
+	return std::make_unique<HorizontalButton>(
+		this,
+		_st,
+		static_cast<SubsectionButtonDelegate*>(this),
+		std::move(data));
+}
+
+std::shared_ptr<DynamicImage> MakeIconSubsectionsThumbnail(
+		const style::icon &icon,
+		Fn<QColor()> textColor,
+		std::optional<QMargins> invertedPadding = {}) {
+	class Image final : public DynamicImage {
+	public:
+		Image(
+			const style::icon &icon,
+			Fn<QColor()> textColor,
+			std::optional<QMargins> invertedPadding)
+		: _icon(icon)
+		, _textColor(std::move(textColor))
+		, _invertedPadding(invertedPadding) {
+			Expects(_textColor != nullptr);
+		}
+
+		std::shared_ptr<DynamicImage> clone() override {
+			return std::make_shared<Image>(
+				_icon,
+				_textColor,
+				_invertedPadding);
+		}
+
+		QImage image(int size) override {
+			const auto ratio = style::DevicePixelRatio();
+			const auto full = size * ratio;
+			const auto color = _textColor();
+			if (_cache.size() != QSize(full, full)) {
+				_cache = QImage(
+					QSize(full, full),
+					QImage::Format_ARGB32_Premultiplied);
+				_cache.setDevicePixelRatio(ratio);
+			} else if (_color == color) {
+				return _cache;
+			}
+			_color = color;
+			if (_invertedPadding) {
+				_cache.fill(Qt::transparent);
+				auto p = QPainter(&_cache);
+				const auto fill = QRect(QPoint(), _icon.size()).marginsAdded(
+					*_invertedPadding).size();
+				const auto inner = QRect(
+					(size - fill.width()) / 2,
+					(size - fill.height()) / 2,
+					fill.width(),
+					fill.height());
+				auto hq = PainterHighQualityEnabler(p);
+				const auto radius = fill.width() / 6.;
+				p.setPen(Qt::NoPen);
+				p.setBrush(color);
+				p.drawRoundedRect(inner, radius, radius);
+				_icon.paint(
+					p,
+					(inner.topLeft()
+						+ QPoint(
+							_invertedPadding->left(),
+							_invertedPadding->top())),
+					size);
+				return _cache;
+			}
+
+			if (_mask.isNull()) {
+				_mask = _icon.instance(QColor(255, 255, 255));
+			}
+			const auto position = ratio * QPoint(
+				(size - (_mask.width() / ratio)) / 2,
+				(size - (_mask.height() / ratio)) / 2);
+			if (_mask.width() <= full && _mask.height() <= full) {
+				style::colorizeImage(
+					_mask,
+					color,
+					&_cache,
+					QRect(),
+					position);
+			} else {
+				_cache = style::colorizeImage(_mask, color).scaled(
+					full,
+					full,
+					Qt::IgnoreAspectRatio,
+					Qt::SmoothTransformation);
+				_cache.setDevicePixelRatio(ratio);
+			}
+			return _cache;
+		}
+		void subscribeToUpdates(Fn<void()> callback) override {
+			if (!callback) {
+				_cache = QImage();
+				_mask = QImage();
+			}
+		}
+
+	private:
+		const style::icon &_icon;
+		Fn<QColor()> _textColor;
+		QImage _mask;
+		QImage _cache;
+		QColor _color;
+		std::optional<QMargins> _invertedPadding;
+
+	};
+	return std::make_shared<Image>(
+		icon,
+		std::move(textColor),
+		invertedPadding);
+}
+
+std::shared_ptr<DynamicImage> MakeAllSubsectionsThumbnail(
+		Fn<QColor()> textColor) {
+	return MakeIconSubsectionsThumbnail(
+		st::foldersAll,
+		std::move(textColor));
+}
+
+std::shared_ptr<DynamicImage> MakeNewChatSubsectionsThumbnail(
+		Fn<QColor()> textColor) {
+	return MakeIconSubsectionsThumbnail(
+		st::newChatIcon,
+		std::move(textColor),
+		st::newChatIconPadding);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.h b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.h
new file mode 100644
index 00000000000000..742bb1eb9d9756
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.h
@@ -0,0 +1,202 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "dialogs/dialogs_common.h"
+#include "ui/round_rect.h"
+#include "ui/rp_widget.h"
+#include "ui/widgets/buttons.h"
+
+namespace style {
+struct ChatTabsVertical;
+struct ChatTabsOutline;
+} // namespace style
+
+namespace Ui {
+
+class DynamicImage;
+class RippleAnimation;
+class SubsectionButton;
+struct ScrollToRequest;
+
+struct SubsectionTab {
+	TextWithEntities text;
+	std::shared_ptr<DynamicImage> userpic;
+	Dialogs::BadgesState badges;
+};
+
+struct SubsectionTabs {
+	std::vector<SubsectionTab> tabs;
+	Text::MarkedContext context;
+	int fixed = 0;
+	int pinned = 0;
+	bool reorder = false;
+};
+
+class SubsectionButtonDelegate {
+public:
+	virtual bool buttonPaused() = 0;
+	virtual float64 buttonActive(not_null<SubsectionButton*> button) = 0;
+	virtual Text::MarkedContext buttonContext() = 0;
+	virtual void buttonContextMenu(
+		not_null<SubsectionButton*> button,
+		not_null<QContextMenuEvent*> e) = 0;
+};
+
+class SubsectionButton : public RippleButton {
+public:
+	SubsectionButton(
+		not_null<QWidget*> parent,
+		not_null<SubsectionButtonDelegate*> delegate,
+		SubsectionTab &&data);
+	~SubsectionButton();
+
+	void setData(SubsectionTab &&data);
+	[[nodiscard]] DynamicImage *userpic() const;
+
+	void setActiveShown(float64 activeShown);
+	void setIsPinned(bool pinned);
+	[[nodiscard]] bool isPinned() const;
+	void setPinnedPosition(bool isFirst, bool isLast);
+	[[nodiscard]] bool isFirstPinned() const;
+	[[nodiscard]] bool isLastPinned() const;
+	virtual void setBackgroundMargin(int margin);
+	void setShift(int shift);
+
+protected:
+	virtual void dataUpdatedHook() = 0;
+	virtual void invalidateCache() = 0;
+
+	void contextMenuEvent(QContextMenuEvent *e) override;
+
+	const not_null<SubsectionButtonDelegate*> _delegate;
+	SubsectionTab _data;
+	float64 _activeShown = 0.;
+	bool _isPinned = false;
+	bool _isFirstPinned = false;
+	bool _isLastPinned = false;
+	int _backgroundMargin = 0;
+	int _shift = 0;
+
+};
+
+class SubsectionSlider
+	: public RpWidget
+	, public SubsectionButtonDelegate {
+public:
+	~SubsectionSlider();
+
+	void setSections(
+		SubsectionTabs sections,
+		Fn<bool()> paused);
+	void setActiveSectionFast(int active, bool ignoreScroll = false);
+
+	[[nodiscard]] int sectionsCount() const;
+	[[nodiscard]] rpl::producer<int> sectionActivated() const;
+	[[nodiscard]] rpl::producer<int> sectionContextMenu() const;
+	[[nodiscard]] int lookupSectionPosition(int index) const;
+
+	bool buttonPaused() override;
+	float64 buttonActive(not_null<SubsectionButton*> button) override;
+	void buttonContextMenu(
+		not_null<SubsectionButton*> button,
+		not_null<QContextMenuEvent*> e) override;
+	Text::MarkedContext buttonContext() override;
+	[[nodiscard]] not_null<SubsectionButton*> buttonAt(int index);
+	void setButtonShift(int index, int shift);
+	void reorderButtons(int from, int to);
+	void recalculatePinnedPositions();
+	void recalculatePinnedPositionsByUI();
+
+	[[nodiscard]] rpl::producer<ScrollToRequest> requestShown() const;
+
+	void setIsReorderingCallback(Fn<bool()> callback);
+
+	[[nodiscard]] bool isVertical() const {
+		return _vertical;
+	}
+
+protected:
+	struct Range {
+		int from = 0;
+		int size = 0;
+	};
+
+	SubsectionSlider(not_null<QWidget*> parent, bool vertical);
+	void setupBar();
+
+	void paintEvent(QPaintEvent *e) override;
+
+	[[nodiscard]] int lookupSectionIndex(QPoint position) const;
+	[[nodiscard]] Range getFinalActiveRange() const;
+	[[nodiscard]] Range getCurrentActiveRange() const;
+	void activate(int index);
+
+	[[nodiscard]] virtual std::unique_ptr<SubsectionButton> makeButton(
+		SubsectionTab &&data) = 0;
+
+	const bool _vertical = false;
+
+	const style::ChatTabsOutline &_barSt;
+	RpWidget *_bar = nullptr;
+	RoundRect _barRect;
+
+	std::vector<std::unique_ptr<SubsectionButton>> _tabs;
+	bool _tabsReorderedOnce = false;
+	int _active = -1;
+	int _pressed = -1;
+	Animations::Simple _activeFrom;
+	Animations::Simple _activeSize;
+
+	//int _buttonIndexHint = 0;
+
+	Text::MarkedContext _context;
+	int _fixedCount = 0;
+	int _pinnedCount = 0;
+	bool _reorderAllowed = false;
+
+	rpl::event_stream<int> _sectionActivated;
+	rpl::event_stream<int> _sectionContextMenu;
+	Fn<bool()> _paused;
+
+	rpl::event_stream<ScrollToRequest> _requestShown;
+
+	Fn<bool()> _isReorderingCallback;
+
+};
+
+class VerticalSlider final : public SubsectionSlider {
+public:
+	explicit VerticalSlider(not_null<QWidget*> parent);
+	~VerticalSlider();
+
+private:
+	std::unique_ptr<SubsectionButton> makeButton(
+		SubsectionTab &&data) override;
+
+};
+
+class HorizontalSlider final : public SubsectionSlider {
+public:
+	explicit HorizontalSlider(not_null<QWidget*> parent);
+	~HorizontalSlider();
+
+private:
+	std::unique_ptr<SubsectionButton> makeButton(
+		SubsectionTab &&data) override;
+
+	const style::SettingsSlider &_st;
+
+};
+
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeAllSubsectionsThumbnail(
+	Fn<QColor()> textColor);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeNewChatSubsectionsThumbnail(
+	Fn<QColor()> textColor);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/subsection_tabs_slider_reorder.cpp b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider_reorder.cpp
new file mode 100644
index 00000000000000..f5f6915b3695dd
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider_reorder.cpp
@@ -0,0 +1,400 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/subsection_tabs_slider_reorder.h"
+
+#include "ui/controls/subsection_tabs_slider.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/controls/subsection_tabs_slider.h"
+#include "styles/style_basic.h"
+
+#include <QtWidgets/QApplication>
+
+namespace Ui {
+
+namespace {
+
+constexpr auto kScrollFactor = 0.05;
+
+} // namespace
+
+SubsectionSliderReorder::SubsectionSliderReorder(
+	not_null<SubsectionSlider*> slider,
+	not_null<ScrollArea*> scroll)
+: _slider(slider)
+, _scroll(scroll)
+, _scrollAnimation([=] { updateScrollCallback(); }) {
+}
+
+SubsectionSliderReorder::SubsectionSliderReorder(
+	not_null<SubsectionSlider*> slider)
+: _slider(slider) {
+}
+
+SubsectionSliderReorder::~SubsectionSliderReorder() {
+	cancel();
+}
+
+void SubsectionSliderReorder::cancel() {
+	if (_currentButton) {
+		cancelCurrent(indexOf(_currentButton));
+	}
+	_lifetime.destroy();
+	_entries.clear();
+}
+
+void SubsectionSliderReorder::start() {
+	const auto count = _slider->sectionsCount();
+	if (count < 2) {
+		return;
+	}
+	for (auto i = 0; i != count; ++i) {
+		const auto button = _slider->buttonAt(i);
+		const auto eventsProducer = _proxyButtonCallback
+			? _proxyButtonCallback(i)
+			: button;
+		eventsProducer->events(
+		) | rpl::on_next_done([=](not_null<QEvent*> e) {
+			switch (e->type()) {
+			case QEvent::MouseMove:
+				mouseMove(
+					button,
+					static_cast<QMouseEvent*>(e.get())->globalPos());
+				break;
+			case QEvent::MouseButtonPress: {
+				const auto event = static_cast<QMouseEvent*>(e.get());
+				mousePress(button, event->button(), event->globalPos());
+				break;
+			}
+			case QEvent::MouseButtonRelease:
+				mouseRelease(static_cast<QMouseEvent*>(e.get())->button());
+				break;
+			}
+		}, [=] {
+			cancel();
+		}, _lifetime);
+		_entries.push_back({ button });
+	}
+}
+
+void SubsectionSliderReorder::addPinnedInterval(int from, int length) {
+	_pinnedIntervals.push_back({ from, length });
+}
+
+void SubsectionSliderReorder::clearPinnedIntervals() {
+	_pinnedIntervals.clear();
+}
+
+void SubsectionSliderReorder::setMouseEventProxy(ProxyCallback callback) {
+	_proxyButtonCallback = std::move(callback);
+}
+
+bool SubsectionSliderReorder::Interval::isIn(int index) const {
+	return (index >= from) && (index < (from + length));
+}
+
+bool SubsectionSliderReorder::isIndexPinned(int index) const {
+	return ranges::any_of(_pinnedIntervals, [&](const Interval &i) {
+		return i.isIn(index);
+	});
+}
+
+void SubsectionSliderReorder::mouseMove(
+		not_null<SubsectionButton*> button,
+		QPoint position) {
+	if (_currentButton != button) {
+		return;
+	} else if (_currentState != State::Started) {
+		checkForStart(position);
+	} else {
+		updateOrder(indexOf(_currentButton), position);
+
+		checkForScrollAnimation();
+	}
+}
+
+void SubsectionSliderReorder::checkForStart(QPoint position) {
+	const auto shift = _slider->isVertical()
+		? (position.y() - _currentStart)
+		: (position.x() - _currentStart);
+	const auto delta = QApplication::startDragDistance();
+	if (std::abs(shift) <= delta) {
+		return;
+	}
+	_currentButton->raise();
+	_currentState = State::Started;
+	_currentStart += (shift > 0) ? delta : -delta;
+
+	const auto index = indexOf(_currentButton);
+	_currentDesiredIndex = index;
+	_updates.fire({ _currentButton, index, index, _currentState });
+
+	updateOrder(index, position);
+}
+
+void SubsectionSliderReorder::updateOrder(int index, QPoint position) {
+	if (isIndexPinned(index)) {
+		return;
+	}
+	const auto shift = _slider->isVertical()
+		? (position.y() - _currentStart)
+		: (position.x() - _currentStart);
+	auto &current = _entries[index];
+	current.shiftAnimation.stop();
+	current.shift = current.finalShift = shift;
+	_slider->setButtonShift(index, shift);
+
+	const auto count = _entries.size();
+	const auto currentSize = _slider->isVertical()
+		? _currentButton->height()
+		: _currentButton->width();
+	const auto currentMiddle = _slider->isVertical()
+		? (_currentButton->y() + currentSize / 2)
+		: (_currentButton->x() + currentSize / 2);
+	_currentDesiredIndex = index;
+	if (shift > 0) {
+		auto top = _slider->isVertical()
+			? (_currentButton->y() - shift)
+			: (_currentButton->x() - shift);
+		for (auto next = index + 1; next != count; ++next) {
+			if (isIndexPinned(next)) {
+				return;
+			}
+			const auto &entry = _entries[next];
+			top += _slider->isVertical()
+				? entry.button->height()
+				: entry.button->width();
+			if (currentMiddle < top) {
+				moveToShift(next, 0);
+			} else {
+				_currentDesiredIndex = next;
+				moveToShift(next, -currentSize);
+			}
+		}
+		for (auto prev = index - 1; prev >= 0; --prev) {
+			moveToShift(prev, 0);
+		}
+	} else {
+		for (auto next = index + 1; next != count; ++next) {
+			moveToShift(next, 0);
+		}
+		for (auto prev = index - 1; prev >= 0; --prev) {
+			if (isIndexPinned(prev)) {
+				return;
+			}
+			const auto &entry = _entries[prev];
+			const auto entryPos = _slider->isVertical()
+				? (entry.button->y() - entry.shift)
+				: (entry.button->x() - entry.shift);
+			if (currentMiddle >= entryPos + currentSize) {
+				moveToShift(prev, 0);
+			} else {
+				_currentDesiredIndex = prev;
+				moveToShift(prev, currentSize);
+			}
+		}
+	}
+}
+
+void SubsectionSliderReorder::mousePress(
+		not_null<SubsectionButton*> button,
+		Qt::MouseButton btn,
+		QPoint position) {
+	if (btn != Qt::LeftButton) {
+		return;
+	}
+	cancelCurrent();
+	_currentButton = button;
+	_currentStart = _slider->isVertical() ? position.y() : position.x();
+}
+
+void SubsectionSliderReorder::mouseRelease(Qt::MouseButton button) {
+	if (button != Qt::LeftButton) {
+		return;
+	}
+	finishReordering();
+}
+
+void SubsectionSliderReorder::cancelCurrent() {
+	if (_currentButton) {
+		cancelCurrent(indexOf(_currentButton));
+	}
+}
+
+void SubsectionSliderReorder::cancelCurrent(int index) {
+	Expects(_currentButton != nullptr);
+
+	if (_currentState == State::Started) {
+		_currentState = State::Cancelled;
+		_updates.fire({ _currentButton, index, index, _currentState });
+	}
+	_currentButton = nullptr;
+	for (auto i = 0, count = int(_entries.size()); i != count; ++i) {
+		moveToShift(i, 0);
+	}
+}
+
+void SubsectionSliderReorder::finishReordering() {
+	if (_scroll) {
+		_scrollAnimation.stop();
+	}
+	finishCurrent();
+}
+
+void SubsectionSliderReorder::finishCurrent() {
+	if (!_currentButton) {
+		return;
+	}
+	const auto index = indexOf(_currentButton);
+	if (_currentDesiredIndex == index || _currentState != State::Started) {
+		cancelCurrent(index);
+		return;
+	}
+	const auto result = _currentDesiredIndex;
+	const auto button = _currentButton;
+	_currentState = State::Cancelled;
+	_currentButton = nullptr;
+
+	auto &current = _entries[index];
+	const auto size = _slider->isVertical()
+		? button->height()
+		: button->width();
+	if (index < result) {
+		auto sum = 0;
+		for (auto i = index; i != result; ++i) {
+			auto &entry = _entries[i + 1];
+			const auto btn = entry.button;
+			entry.deltaShift += size;
+			updateShift(btn, i + 1);
+			sum += _slider->isVertical() ? btn->height() : btn->width();
+		}
+		current.finalShift -= sum;
+	} else if (index > result) {
+		auto sum = 0;
+		for (auto i = result; i != index; ++i) {
+			auto &entry = _entries[i];
+			const auto btn = entry.button;
+			entry.deltaShift -= size;
+			updateShift(btn, i);
+			sum += _slider->isVertical() ? btn->height() : btn->width();
+		}
+		current.finalShift += sum;
+	}
+	if (!(current.finalShift + current.deltaShift)) {
+		current.shift = 0;
+		_slider->setButtonShift(index, 0);
+	}
+	base::reorder(_entries, index, result);
+	_slider->reorderButtons(index, result);
+	for (auto i = 0, count = int(_entries.size()); i != count; ++i) {
+		moveToShift(i, 0);
+	}
+
+	_updates.fire({ button, index, result, State::Applied });
+}
+
+void SubsectionSliderReorder::moveToShift(int index, int shift) {
+	auto &entry = _entries[index];
+	if (entry.finalShift + entry.deltaShift == shift) {
+		return;
+	}
+	const auto button = entry.button;
+	entry.shiftAnimation.start(
+		[=] { updateShift(button, index); },
+		entry.finalShift,
+		shift - entry.deltaShift,
+		st::slideWrapDuration);
+	entry.finalShift = shift - entry.deltaShift;
+}
+
+void SubsectionSliderReorder::updateShift(
+		not_null<SubsectionButton*> button,
+		int indexHint) {
+	Expects(indexHint >= 0 && indexHint < _entries.size());
+
+	const auto index = (_entries[indexHint].button == button)
+		? indexHint
+		: indexOf(button);
+	auto &entry = _entries[index];
+	entry.shift = base::SafeRound(
+		entry.shiftAnimation.value(entry.finalShift)
+	) + entry.deltaShift;
+	if (entry.deltaShift && !entry.shiftAnimation.animating()) {
+		entry.finalShift += entry.deltaShift;
+		entry.deltaShift = 0;
+	}
+	_slider->setButtonShift(index, entry.shift);
+}
+
+auto SubsectionSliderReorder::updates() const
+-> rpl::producer<SubsectionSliderReorder::Single> {
+	return _updates.events();
+}
+
+int SubsectionSliderReorder::indexOf(
+		not_null<SubsectionButton*> button) const {
+	const auto i = ranges::find(_entries, button, &Entry::button);
+	Assert(i != end(_entries));
+	return i - begin(_entries);
+}
+
+void SubsectionSliderReorder::updateScrollCallback() {
+	if (!_scroll) {
+		return;
+	}
+	const auto delta = deltaFromEdge();
+	if (_slider->isVertical()) {
+		const auto oldTop = _scroll->scrollTop();
+		_scroll->scrollToY(oldTop + delta);
+		const auto newTop = _scroll->scrollTop();
+		_currentStart += oldTop - newTop;
+		if (newTop == 0 || newTop == _scroll->scrollTopMax()) {
+			_scrollAnimation.stop();
+		}
+	} else {
+		const auto oldLeft = _scroll->scrollLeft();
+		_scroll->scrollToX(oldLeft + delta);
+		const auto newLeft = _scroll->scrollLeft();
+		_currentStart += oldLeft - newLeft;
+		if (newLeft == 0 || newLeft == _scroll->scrollLeftMax()) {
+			_scrollAnimation.stop();
+		}
+	}
+}
+
+void SubsectionSliderReorder::checkForScrollAnimation() {
+	if (!_scroll || !deltaFromEdge() || _scrollAnimation.animating()) {
+		return;
+	}
+	_scrollAnimation.start();
+}
+
+int SubsectionSliderReorder::deltaFromEdge() {
+	Expects(_currentButton != nullptr);
+	Expects(_scroll);
+
+	const auto globalPosition = _currentButton->mapToGlobal(QPoint(0, 0));
+	const auto localPos = _scroll->mapFromGlobal(globalPosition);
+	const auto localTop = _slider->isVertical() ? localPos.y() : localPos.x();
+	const auto buttonSize = _slider->isVertical()
+		? _currentButton->height()
+		: _currentButton->width();
+	const auto scrollSize = _slider->isVertical()
+		? _scroll->height()
+		: _scroll->width();
+	const auto localBottom = localTop + buttonSize - scrollSize;
+
+	const auto isTopEdge = (localTop < 0);
+	const auto isBottomEdge = (localBottom > 0);
+	if (!isTopEdge && !isBottomEdge) {
+		_scrollAnimation.stop();
+		return 0;
+	}
+	return int((isBottomEdge ? localBottom : localTop) * kScrollFactor);
+}
+
+} // namespace Ui
\ No newline at end of file
diff --git a/Telegram/SourceFiles/ui/controls/subsection_tabs_slider_reorder.h b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider_reorder.h
new file mode 100644
index 00000000000000..ca24681b11f804
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider_reorder.h
@@ -0,0 +1,103 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/animations.h"
+
+namespace Ui {
+
+class RpWidget;
+class ScrollArea;
+class SubsectionButton;
+class SubsectionSlider;
+
+class SubsectionSliderReorder final {
+public:
+	using ProxyCallback = Fn<not_null<Ui::RpWidget*>(int)>;
+	enum class State : uchar {
+		Started,
+		Applied,
+		Cancelled,
+	};
+	struct Single {
+		not_null<SubsectionButton*> widget;
+		int oldPosition = 0;
+		int newPosition = 0;
+		State state = State::Started;
+	};
+
+	SubsectionSliderReorder(
+		not_null<SubsectionSlider*> slider,
+		not_null<ScrollArea*> scroll);
+	SubsectionSliderReorder(not_null<SubsectionSlider*> slider);
+	~SubsectionSliderReorder();
+
+	void start();
+	void cancel();
+	void finishReordering();
+	void addPinnedInterval(int from, int length);
+	void clearPinnedIntervals();
+	void setMouseEventProxy(ProxyCallback callback);
+	[[nodiscard]] rpl::producer<Single> updates() const;
+
+private:
+	struct Entry {
+		not_null<SubsectionButton*> button;
+		Ui::Animations::Simple shiftAnimation;
+		int shift = 0;
+		int finalShift = 0;
+		int deltaShift = 0;
+	};
+	struct Interval {
+		[[nodiscard]] bool isIn(int index) const;
+		int from = 0;
+		int length = 0;
+	};
+
+	void mouseMove(not_null<SubsectionButton*> button, QPoint position);
+	void mousePress(
+		not_null<SubsectionButton*> button,
+		Qt::MouseButton mouseButton,
+		QPoint position);
+	void mouseRelease(Qt::MouseButton button);
+
+	void checkForStart(QPoint position);
+	void updateOrder(int index, QPoint position);
+	void cancelCurrent();
+	void finishCurrent();
+	void cancelCurrent(int index);
+
+	[[nodiscard]] int indexOf(not_null<SubsectionButton*> button) const;
+	void moveToShift(int index, int shift);
+	void updateShift(not_null<SubsectionButton*> button, int indexHint);
+
+	void updateScrollCallback();
+	void checkForScrollAnimation();
+	[[nodiscard]] int deltaFromEdge();
+
+	[[nodiscard]] bool isIndexPinned(int index) const;
+
+	const not_null<Ui::SubsectionSlider*> _slider;
+	Ui::ScrollArea *_scroll = nullptr;
+
+	Ui::Animations::Basic _scrollAnimation;
+
+	std::vector<Interval> _pinnedIntervals;
+
+	ProxyCallback _proxyButtonCallback = nullptr;
+
+	SubsectionButton *_currentButton = nullptr;
+	int _currentStart = 0;
+	int _currentDesiredIndex = 0;
+	State _currentState = State::Cancelled;
+	std::vector<Entry> _entries;
+	rpl::event_stream<Single> _updates;
+	rpl::lifetime _lifetime;
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/swipe_handler.cpp b/Telegram/SourceFiles/ui/controls/swipe_handler.cpp
new file mode 100644
index 00000000000000..5cf25f0a7b1b01
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/swipe_handler.cpp
@@ -0,0 +1,533 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/swipe_handler.h"
+
+#include "base/platform/base_platform_haptic.h"
+#include "base/platform/base_platform_info.h"
+#include "base/qt/qt_common_adapters.h"
+#include "base/event_filter.h"
+#include "ui/chat/chat_style.h"
+#include "ui/controls/swipe_handler_data.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/ui_utility.h"
+#include "ui/widgets/elastic_scroll.h"
+#include "ui/widgets/scroll_area.h"
+#include "styles/style_chat.h"
+
+#include <QtWidgets/QApplication>
+
+namespace Ui::Controls {
+namespace {
+
+constexpr auto kSwipeSlow = 0.2;
+
+constexpr auto kMsgBareIdSwipeBack = std::numeric_limits<int64>::max() - 77;
+constexpr auto kSwipedBackSpeedRatio = 0.35;
+
+float64 InterpolationRatio(float64 from, float64 to, float64 result) {
+	return (result - from) / (to - from);
+};
+
+class RatioRange final {
+public:
+	[[nodiscard]] float64 calcRatio(float64 value) {
+		if (value < _min) {
+			const auto shift = _min - value;
+			_min -= shift;
+			_max -= shift;
+			_max = _min + 1;
+		} else if (value > _max) {
+			const auto shift = value - _max;
+			_min += shift;
+			_max += shift;
+			_max = _min + 1;
+		}
+		return InterpolationRatio(_min, _max, value);
+	}
+
+private:
+	float64 _min = 0;
+	float64 _max = 1;
+
+};
+
+} // namespace
+
+void SetupSwipeHandler(SwipeHandlerArgs &&args) {
+	static constexpr auto kThresholdWidth = 50;
+	static constexpr auto kMaxRatio = 1.5;
+
+	const auto widget = std::move(args.widget);
+	const auto scroll = std::move(args.scroll);
+	const auto update = std::move(args.update);
+	const auto skipWheelEvent = std::move(args.skipWheelEvent);
+
+	struct UpdateArgs {
+		QPoint globalCursor;
+		QPointF position;
+		QPointF delta;
+		bool touch = false;
+	};
+	struct State {
+		base::unique_qptr<QObject> filter;
+		Ui::Animations::Simple animationReach;
+		Ui::Animations::Simple animationEnd;
+		SwipeContextData data;
+		SwipeHandlerFinishData finishByTopData;
+		std::optional<Qt::Orientation> orientation;
+		std::optional<Qt::LayoutDirection> direction;
+		float64 threshold = style::ConvertFloatScale(kThresholdWidth);
+		RatioRange ratioRange;
+		int directionInt = 1.;
+		QPointF startAt;
+		QPointF delta;
+		QPoint cursorPosition;
+		bool dontStart = false;
+		bool started = false;
+		bool reached = false;
+		bool touch = false;
+
+		rpl::lifetime lifetime;
+	};
+	auto &useLifetime = args.onLifetime
+		? *(args.onLifetime)
+		: args.widget->lifetime();
+	const auto state = useLifetime.make_state<State>();
+	if (args.dontStart) {
+		std::move(
+			args.dontStart
+		) | rpl::on_next([=](bool dontStart) {
+			state->dontStart = dontStart;
+		}, state->lifetime);
+	} else {
+		v::match(scroll, [](v::null_t) {
+		}, [&](const auto &scroll) {
+			scroll->touchMaybePressing(
+			) | rpl::on_next([=](bool maybePressing) {
+				state->dontStart = maybePressing;
+			}, state->lifetime);
+		});
+	}
+
+	const auto updateRatio = [=](float64 ratio) {
+		ratio = std::max(ratio, 0.);
+		state->data.ratio = ratio;
+		const auto overscrollRatio = std::max(ratio - 1., 0.);
+		const auto translation = int(
+			base::SafeRound(-std::min(ratio, 1.) * state->threshold)
+		) + Ui::OverscrollFromAccumulated(int(
+			base::SafeRound(-overscrollRatio * state->threshold)
+		));
+		state->data.msgBareId = state->finishByTopData.msgBareId;
+		state->data.translation = translation
+			* state->directionInt;
+		state->data.cursorTop = state->cursorPosition.y();
+		update(state->data);
+	};
+	const auto setOrientation = [=](std::optional<Qt::Orientation> o) {
+		state->orientation = o;
+		const auto isHorizontal = (o == Qt::Horizontal);
+		v::match(scroll, [](v::null_t) {
+		}, [&](const auto &scroll) {
+			if (const auto viewport = scroll->viewport()) {
+				if (viewport != widget) {
+					viewport->setAttribute(
+						Qt::WA_AcceptTouchEvents,
+						!isHorizontal);
+				}
+			}
+			scroll->disableScroll(isHorizontal);
+		});
+	};
+	const auto processEnd = [=](std::optional<QPointF> delta = {}) {
+		if (state->orientation == Qt::Horizontal) {
+			const auto rawRatio = delta.value_or(state->delta).x()
+				/ state->threshold
+				* state->directionInt;
+			const auto ratio = std::clamp(
+				state->finishByTopData.keepRatioWithinRange
+					? state->ratioRange.calcRatio(rawRatio)
+					: rawRatio,
+				0.,
+				kMaxRatio);
+			if ((ratio >= 1) && state->finishByTopData.callback) {
+				Ui::PostponeCall(
+					widget,
+					state->finishByTopData.callback);
+			}
+			state->animationEnd.stop();
+			state->animationEnd.start(
+				updateRatio,
+				ratio,
+				0.,
+				std::min(1., ratio) * st::slideWrapDuration);
+		}
+		setOrientation(std::nullopt);
+		state->started = false;
+		state->reached = false;
+		state->direction = std::nullopt;
+		state->startAt = {};
+		state->delta = {};
+	};
+	v::match(scroll, [](v::null_t) {
+	}, [&](const auto &scroll) {
+		scroll->scrolls() | rpl::on_next([=] {
+			if (state->orientation != Qt::Vertical) {
+				processEnd();
+			}
+		}, state->lifetime);
+	});
+	const auto animationReachCallback = [=](float64 value) {
+		state->data.reachRatio = value;
+		update(state->data);
+	};
+	const auto updateWith = [=, generateFinish = args.init](UpdateArgs args) {
+		const auto fillFinishByTop = [&] {
+			if (!args.delta.x()) {
+				return;
+			}
+			state->direction = (args.delta.x() < 0)
+				? Qt::RightToLeft
+				: Qt::LeftToRight;
+			state->directionInt = (state->direction == Qt::LeftToRight)
+				? 1
+				: -1;
+			state->finishByTopData = generateFinish({
+				.cursorPosition = state->cursorPosition,
+				.direction = *state->direction,
+			});
+			state->threshold = style::ConvertFloatScale(kThresholdWidth)
+				* state->finishByTopData.speedRatio;
+			if (!state->finishByTopData.callback
+				|| (state->finishByTopData.msgBareId == kMsgBareIdSwipeBack
+					&& !base::Platform::IsSwipeBackEnabled())) {
+				setOrientation(Qt::Vertical);
+			}
+		};
+		if (!state->started || state->touch != args.touch) {
+			state->started = true;
+			state->data.reachRatio = 0.;
+			state->touch = args.touch;
+			state->startAt = args.position;
+			state->cursorPosition = widget->mapFromGlobal(args.globalCursor);
+			if (!state->touch) {
+				// args.delta already is valid.
+				fillFinishByTop();
+			} else {
+				// args.delta depends on state->startAt, so it's invalid.
+				state->direction = std::nullopt;
+			}
+			state->delta = QPointF();
+		} else if (!state->direction) {
+			fillFinishByTop();
+		} else if (!state->orientation) {
+			state->delta = args.delta;
+			const auto diffXtoY = std::abs(args.delta.x())
+				- std::abs(args.delta.y());
+			constexpr auto kOrientationThreshold = 1.;
+			if (diffXtoY > kOrientationThreshold) {
+				if (!state->dontStart) {
+					setOrientation(Qt::Horizontal);
+				}
+			} else if (diffXtoY < -kOrientationThreshold) {
+				setOrientation(Qt::Vertical);
+			} else {
+				setOrientation(std::nullopt);
+			}
+		} else if (*state->orientation == Qt::Horizontal) {
+			state->delta = args.delta;
+			const auto rawRatio = 0
+				+ args.delta.x() * state->directionInt / state->threshold;
+			const auto ratio = state->finishByTopData.keepRatioWithinRange
+				? state->ratioRange.calcRatio(rawRatio)
+				: rawRatio;
+			updateRatio(ratio);
+			constexpr auto kResetReachedOn = 0.95;
+			constexpr auto kBounceDuration = crl::time(500);
+			if (!state->reached && ratio >= 1.) {
+				state->reached = true;
+				state->animationReach.stop();
+				state->animationReach.start(
+					animationReachCallback,
+					0.,
+					1.,
+					state->finishByTopData.reachRatioDuration
+						? state->finishByTopData.reachRatioDuration
+						: kBounceDuration);
+				base::Platform::Haptic();
+			} else if (state->reached
+				&& ratio < kResetReachedOn) {
+				if (state->finishByTopData.provideReachOutRatio) {
+					state->animationReach.stop();
+					state->animationReach.start(
+						animationReachCallback,
+						1.,
+						0.,
+						state->finishByTopData.reachRatioDuration
+							? state->finishByTopData.reachRatioDuration
+							: kBounceDuration);
+				}
+				state->reached = false;
+			}
+		}
+	};
+	const auto filter = [=](not_null<QEvent*> e) {
+		if (!widget->testAttribute(Qt::WA_AcceptTouchEvents)) {
+			[[maybe_unused]] int a = 0;
+		}
+		const auto type = e->type();
+		switch (type) {
+		case QEvent::Leave: {
+			if (state->orientation == Qt::Horizontal) {
+				processEnd();
+			}
+		} break;
+		case QEvent::MouseMove: {
+			if (state->orientation == Qt::Horizontal) {
+				const auto m = static_cast<QMouseEvent*>(e.get());
+				if (std::abs(m->pos().y() - state->cursorPosition.y())
+					> QApplication::startDragDistance()) {
+					processEnd();
+				}
+			}
+		} break;
+		case QEvent::TouchBegin:
+		case QEvent::TouchUpdate:
+		case QEvent::TouchEnd:
+		case QEvent::TouchCancel: {
+			const auto t = static_cast<QTouchEvent*>(e.get());
+			const auto touchscreen = t->device()
+				&& (t->device()->type() == base::TouchDevice::TouchScreen);
+			if (!touchscreen && type != QEvent::TouchCancel) {
+				break;
+			} else if (type == QEvent::TouchBegin) {
+				// Reset state in case we lost some TouchEnd.
+				processEnd();
+			}
+			const auto &touches = t->touchPoints();
+			const auto released = [&](int index) {
+				return (touches.size() > index)
+					&& (int(touches.at(index).state())
+						& int(Qt::TouchPointReleased));
+			};
+			const auto cancel = released(0)
+				|| released(1)
+				|| (touches.size() != (touchscreen ? 1 : 2))
+				|| (type == QEvent::TouchEnd)
+				|| (type == QEvent::TouchCancel);
+			if (cancel) {
+				processEnd(touches.empty()
+					? std::optional<QPointF>()
+					: (state->startAt - touches[0].pos()));
+			} else {
+				const auto args = UpdateArgs{
+					.globalCursor = (touchscreen
+						? touches[0].screenPos().toPoint()
+						: QCursor::pos()),
+					.position = touches[0].pos(),
+					.delta = state->startAt - touches[0].pos(),
+					.touch = true,
+				};
+				updateWith(args);
+			}
+			return (touchscreen && state->orientation != Qt::Horizontal)
+				? base::EventFilterResult::Continue
+				: base::EventFilterResult::Cancel;
+		} break;
+		case QEvent::Wheel: {
+			const auto w = static_cast<QWheelEvent*>(e.get());
+			if (skipWheelEvent && skipWheelEvent(w)) {
+				processEnd();
+				break;
+			}
+			const auto phase = w->phase();
+			if (phase == Qt::NoScrollPhase) {
+				break;
+			} else if (phase == Qt::ScrollBegin) {
+				// Reset state in case we lost some TouchEnd.
+				processEnd();
+			}
+			const auto cancel = w->buttons()
+				|| (phase == Qt::ScrollEnd)
+				|| (phase == Qt::ScrollMomentum);
+			if (cancel) {
+				processEnd();
+			} else {
+				const auto invert = (w->inverted() ? -1 : 1);
+				const auto delta = Ui::ScrollDeltaF(w) * invert;
+				updateWith({
+					.globalCursor = w->globalPosition().toPoint(),
+					.position = QPointF(),
+					.delta = state->delta + delta * kSwipeSlow,
+					.touch = false,
+				});
+			}
+		} break;
+		}
+		return base::EventFilterResult::Continue;
+	};
+	widget->setAttribute(Qt::WA_AcceptTouchEvents);
+	state->filter = base::unique_qptr<QObject>(
+		base::install_event_filter(widget, filter));
+}
+
+SwipeBackResult SetupSwipeBack(
+		not_null<Ui::RpWidget*> widget,
+		Fn<std::pair<QColor, QColor>()> colors,
+		bool mirrored,
+		bool iconMirrored,
+		Fn<int()> centerY) {
+	struct State {
+		base::unique_qptr<Ui::RpWidget> back;
+		SwipeContextData data;
+	};
+
+	constexpr auto kMaxInnerOffset = 0.5;
+	constexpr auto kMaxOuterOffset = 0.8;
+	constexpr auto kIdealSize = 100;
+	const auto maxOffset = st::swipeBackSize * kMaxInnerOffset;
+	const auto sizeRatio = st::swipeBackSize
+		/ style::ConvertFloatScale(kIdealSize);
+
+	auto lifetime = rpl::lifetime();
+	const auto state = lifetime.make_state<State>();
+
+	const auto paintCallback = [=] {
+		const auto [bg, fg] = colors();
+		const auto arrowPen = QPen(
+			fg,
+			st::lineWidth * 3 * sizeRatio,
+			Qt::SolidLine,
+			Qt::RoundCap);
+		return [=] {
+			auto p = QPainter(state->back);
+
+			constexpr auto kBouncePart = 0.25;
+			constexpr auto kStrokeWidth = 2.;
+			constexpr auto kWaveWidth = 10.;
+			const auto ratio = std::min(state->data.ratio, 1.);
+			const auto reachRatio = state->data.reachRatio;
+			const auto rect = state->back->rect()
+				- Margins(state->back->width() / 4);
+			const auto center = rect::center(rect);
+			const auto strokeWidth = style::ConvertFloatScale(kStrokeWidth)
+				* sizeRatio;
+
+			const auto reachScale = std::clamp(
+				(reachRatio > kBouncePart)
+					? (kBouncePart * 2 - reachRatio)
+					: reachRatio,
+				0.,
+				1.);
+			auto pen = QPen(bg);
+			pen.setWidthF(strokeWidth - (1. * (reachScale / kBouncePart)));
+			const auto arcRect = rect - Margins(strokeWidth);
+			auto hq = PainterHighQualityEnabler(p);
+			p.setOpacity(ratio);
+			if (reachScale || mirrored) {
+				const auto scale = (1. + 1. * reachScale);
+				p.translate(center);
+				p.scale(scale * (mirrored ? -1 : 1), scale);
+				p.translate(-center);
+			}
+			{
+				p.setPen(Qt::NoPen);
+				p.setBrush(bg);
+				p.drawEllipse(rect);
+				p.drawEllipse(rect);
+				p.setPen(arrowPen);
+				p.setBrush(Qt::NoBrush);
+				const auto halfSize = rect.width() / 2;
+				const auto arrowSize = halfSize / 2;
+				const auto arrowHalf = arrowSize / 2;
+				const auto arrowX = st::swipeBackSize / 8
+					+ rect.x()
+					+ halfSize;
+				const auto arrowY = rect.y() + halfSize;
+
+				auto arrowPath = QPainterPath();
+				const auto direction = iconMirrored ? -1 : 1;
+
+				arrowPath.moveTo(arrowX + direction * arrowSize, arrowY);
+				arrowPath.lineTo(arrowX, arrowY);
+				arrowPath.lineTo(
+					arrowX + direction * arrowHalf,
+					arrowY - arrowHalf);
+				arrowPath.moveTo(arrowX, arrowY);
+				arrowPath.lineTo(
+					arrowX + direction * arrowHalf,
+					arrowY + arrowHalf);
+				arrowPath.translate(-direction * arrowHalf, 0);
+				p.drawPath(arrowPath);
+			}
+			if (reachRatio) {
+				p.setPen(pen);
+				p.setBrush(Qt::NoBrush);
+				const auto w = style::ConvertFloatScale(kWaveWidth)
+					* sizeRatio;
+				p.setOpacity(ratio - reachRatio);
+				p.drawArc(
+					arcRect + Margins(reachRatio * reachRatio * w),
+					arc::kQuarterLength,
+					arc::kFullLength);
+			}
+		};
+	};
+
+	const auto callback = ([=](SwipeContextData data) {
+		const auto ratio = std::min(1.0, data.ratio);
+		state->data = std::move(data);
+		if (ratio > 0) {
+			if (!state->back) {
+				state->back = base::make_unique_q<Ui::RpWidget>(widget);
+				const auto raw = state->back.get();
+				raw->paintRequest(
+				) | rpl::on_next(paintCallback(), raw->lifetime());
+				raw->setAttribute(Qt::WA_TransparentForMouseEvents);
+				raw->resize(Size(st::swipeBackSize));
+				raw->show();
+				raw->raise();
+			}
+			const auto top = centerY
+				? (centerY() - state->back->height() / 2)
+				: ((widget->height() - state->back->height()) / 2);
+			if (!mirrored) {
+				state->back->moveToLeft(
+					anim::interpolate(
+						-st::swipeBackSize * kMaxOuterOffset,
+						maxOffset - st::swipeBackSize,
+						ratio),
+					top);
+			} else {
+				state->back->moveToLeft(
+					anim::interpolate(
+						widget->width() + st::swipeBackSize * kMaxOuterOffset,
+						widget->width() - maxOffset,
+						ratio),
+					top);
+			}
+			state->back->update();
+		} else if (state->back) {
+			state->back = nullptr;
+		}
+	});
+	return { std::move(lifetime), std::move(callback) };
+}
+
+SwipeHandlerFinishData DefaultSwipeBackHandlerFinishData(
+		Fn<void(void)> callback) {
+	return {
+		.callback = std::move(callback),
+		.msgBareId = kMsgBareIdSwipeBack,
+		.speedRatio = kSwipedBackSpeedRatio,
+		.keepRatioWithinRange = true,
+	};
+}
+
+} // namespace Ui::Controls
diff --git a/Telegram/SourceFiles/ui/controls/swipe_handler.h b/Telegram/SourceFiles/ui/controls/swipe_handler.h
new file mode 100644
index 00000000000000..841d2d6e526249
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/swipe_handler.h
@@ -0,0 +1,60 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class QWheelEvent;
+
+namespace Ui {
+class ElasticScroll;
+class RpWidget;
+class ScrollArea;
+} // namespace Ui
+
+namespace Ui::Controls {
+
+struct SwipeContextData;
+struct SwipeBackResult;
+struct SwipeHandlerInitData;
+
+struct SwipeHandlerFinishData {
+	Fn<void(void)> callback;
+	int64 msgBareId = 0;
+	float64 speedRatio = 1.0;
+	crl::time reachRatioDuration = 0;
+	bool keepRatioWithinRange = false;
+	bool provideReachOutRatio = false;
+};
+
+using Scroll = std::variant<
+	v::null_t,
+	not_null<Ui::ScrollArea*>,
+	not_null<Ui::ElasticScroll*>>;
+
+struct SwipeHandlerArgs {
+	not_null<Ui::RpWidget*> widget;
+	Scroll scroll;
+	Fn<void(SwipeContextData)> update;
+	Fn<SwipeHandlerFinishData(SwipeHandlerInitData)> init;
+	rpl::producer<bool> dontStart = nullptr;
+	Fn<bool(not_null<QWheelEvent*>)> skipWheelEvent;
+	rpl::lifetime *onLifetime = nullptr;
+};
+
+void SetupSwipeHandler(SwipeHandlerArgs &&args);
+
+[[nodiscard]] SwipeBackResult SetupSwipeBack(
+	not_null<Ui::RpWidget*> widget,
+	Fn<std::pair<QColor, QColor>()> colors,
+	bool mirrored = false,
+	bool iconMirrored = false,
+	Fn<int()> centerY = nullptr);
+
+[[nodiscard]] SwipeHandlerFinishData DefaultSwipeBackHandlerFinishData(
+	Fn<void(void)> callback);
+
+} // namespace Ui::Controls
diff --git a/Telegram/SourceFiles/ui/controls/swipe_handler_data.h b/Telegram/SourceFiles/ui/controls/swipe_handler_data.h
new file mode 100644
index 00000000000000..c96c6b65e5c41a
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/swipe_handler_data.h
@@ -0,0 +1,40 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui::Controls {
+
+struct SwipeContextData final {
+	[[nodiscard]] bool empty() const {
+		return !ratio
+			&& !reachRatio
+			&& !translation
+			&& !cursorTop;
+	}
+	[[nodiscard]] explicit operator bool() const {
+		return !empty();
+	}
+
+	float64 ratio = 0.;
+	float64 reachRatio = 0.;
+	int64 msgBareId = 0;
+	int translation = 0;
+	int cursorTop = 0;
+};
+
+struct SwipeHandlerInitData final {
+	QPoint cursorPosition;
+	Qt::LayoutDirection direction = Qt::LeftToRight;
+};
+
+struct SwipeBackResult final {
+	rpl::lifetime lifetime;
+	Fn<void(SwipeContextData)> callback;
+};
+
+} // namespace Ui::Controls
diff --git a/Telegram/SourceFiles/ui/controls/tabbed_search.cpp b/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
index 59a1f6cf02d724..77c36e15142dda 100644
--- a/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
+++ b/Telegram/SourceFiles/ui/controls/tabbed_search.cpp
@@ -14,6 +14,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/buttons.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/text_custom_emoji.h"
 #include "ui/ui_utility.h"
 #include "styles/style_chat_helpers.h"
 
@@ -80,7 +81,7 @@ class GroupsStrip final : public RpWidget {
 };
 
 [[nodiscard]] std::vector<QString> FieldQuery(not_null<InputField*> field) {
-	if (const auto last = field->getLastText(); !last.isEmpty()) {
+	if (const auto last = field->getLastText().trimmed(); !last.isEmpty()) {
 		return { last };
 	}
 	return {};
@@ -114,7 +115,7 @@ void GroupsStrip::clearChosen() {
 void GroupsStrip::init(rpl::producer<std::vector<EmojiGroup>> groups) {
 	std::move(
 		groups
-	) | rpl::start_with_next([=](std::vector<EmojiGroup> &&list) {
+	) | rpl::on_next([=](std::vector<EmojiGroup> &&list) {
 		set(std::move(list));
 	}, lifetime());
 
@@ -146,10 +147,10 @@ void GroupsStrip::set(std::vector<EmojiGroup> list) {
 			const auto stopAtLastFrame = true;
 			_buttons.push_back({
 				.iconId = group.iconId,
-				.icon = std::make_unique<Text::LimitedLoopsEmoji>(
+				.icon = MakeWrappedEmoji<Text::LimitedLoopsEmoji>(
 					_factory(
 						group.iconId,
-						updater(group.iconId)),
+						{ .repaint = updater(group.iconId) }),
 					loopCount,
 					stopAtLastFrame),
 			});
@@ -314,7 +315,7 @@ anim::type SearchWithGroups::animated() const {
 
 void SearchWithGroups::initField() {
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto last = FieldQuery(_field);
 		_query = last;
 		const auto empty = last.empty();
@@ -341,7 +342,7 @@ void SearchWithGroups::initField() {
 	_debouncedQuery = last;
 	_fieldEmpty = last.empty();
 	_fieldEmpty.value(
-	) | rpl::start_with_next([=](bool empty) {
+	) | rpl::on_next([=](bool empty) {
 		_cancel->toggle(!empty, animated());
 		_groups->toggle(empty, animated());
 		resizeToWidth(width());
@@ -358,12 +359,12 @@ void SearchWithGroups::initGroups() {
 	widget->widthValue(
 	) | rpl::filter([=] {
 		return (width() > 0);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		resizeToWidth(width());
 	}, widget->lifetime());
 
 	widget->chosen(
-	) | rpl::start_with_next([=](const GroupsStrip::Chosen &chosen) {
+	) | rpl::on_next([=](const GroupsStrip::Chosen &chosen) {
 		_chosenGroup = chosen.group->iconId;
 		_query = (chosen.group->type == EmojiGroupType::Premium)
 			? std::vector{ PremiumGroupFakeEmoticon() }
@@ -374,14 +375,14 @@ void SearchWithGroups::initGroups() {
 	}, lifetime());
 
 	widget->moveRequests(
-	) | rpl::start_with_next([=](int delta) {
+	) | rpl::on_next([=](int delta) {
 		moveGroupsBy(width(), delta);
 	}, lifetime());
 
 	_chosenGroup.value(
 	) | rpl::map([=](const QString &id) {
 		return id.isEmpty();
-	}) | rpl::start_with_next([=](bool empty) {
+	}) | rpl::on_next([=](bool empty) {
 		_search->toggle(empty, animated());
 		_back->toggle(!empty, animated());
 		if (empty) {
@@ -428,7 +429,7 @@ void SearchWithGroups::scrollGroupsTo(int left) {
 }
 
 void SearchWithGroups::initEdges() {
-	paintRequest() | rpl::start_with_next([=](QRect clip) {
+	paintRequest() | rpl::on_next([=](QRect clip) {
 		QPainter(this).fillRect(clip, _st.bg);
 	}, lifetime());
 
@@ -441,12 +442,12 @@ void SearchWithGroups::initEdges() {
 			edge->move(0, 0);
 		} else {
 			widthValue(
-			) | rpl::start_with_next([=](int width) {
+			) | rpl::on_next([=](int width) {
 				edge->move(width - edge->width(), 0);
 			}, edge->lifetime());
 		}
 		edge->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			const auto ratio = edge->devicePixelRatioF();
 			ensureRounding(height(), ratio);
 			const auto size = _rounding.height();
@@ -461,12 +462,12 @@ void SearchWithGroups::initEdges() {
 	makeEdge(false);
 
 	_fadeOpacity.changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_fade->update();
 	}, _fade->lifetime());
 
 	_fade->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(_fade);
 		p.setOpacity(_fadeOpacity.current());
 		const auto fill = QRect(0, 0, _fadeLeftStart, _st.height);
@@ -485,7 +486,7 @@ void SearchWithGroups::initEdges() {
 	_fade->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_rounding = QImage();
 	}, lifetime());
 }
@@ -503,7 +504,7 @@ void SearchWithGroups::initButtons() {
 		scrollGroupsToStart();
 	});
 	_field->focusedChanges(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		scrollGroupsToStart();
 	}, _field->lifetime());
 	_field->raise();
@@ -646,7 +647,7 @@ TabbedSearch::TabbedSearch(
 	_search.move(_st.searchMargin.left(), _st.searchMargin.top());
 
 	parent->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_search.resizeToWidth(width - rect::m::sum::h(_st.searchMargin));
 	}, _search.lifetime());
 }
diff --git a/Telegram/SourceFiles/ui/controls/table_rows.cpp b/Telegram/SourceFiles/ui/controls/table_rows.cpp
new file mode 100644
index 00000000000000..40692d96ea0fad
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/table_rows.cpp
@@ -0,0 +1,403 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/table_rows.h"
+
+#include "base/event_filter.h"
+#include "base/timer_rpl.h"
+#include "boxes/peers/prepare_short_info_box.h"
+#include "chat_helpers/compose/compose_show.h"
+#include "data/data_session.h"
+#include "data/data_peer.h"
+#include "info/profile/info_profile_badge.h"
+#include "info/profile/info_profile_values.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/wrap/table_layout.h"
+#include "ui/empty_userpic.h"
+#include "ui/rect.h"
+#include "ui/rp_widget.h"
+#include "ui/ui_utility.h"
+#include "styles/style_boxes.h"
+#include "styles/style_credits.h"
+#include "styles/style_giveaway.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kTooltipDuration = 6 * crl::time(1000);
+
+} // namespace
+
+void AddTableRow(
+		not_null<TableLayout*> table,
+		rpl::producer<QString> label,
+		object_ptr<RpWidget> value,
+		style::margins valueMargins) {
+	table->addRow(
+		(label
+			? object_ptr<FlatLabel>(
+				table,
+				std::move(label),
+				table->st().defaultLabel)
+			: object_ptr<FlatLabel>(nullptr)),
+		std::move(value),
+		st::giveawayGiftCodeLabelMargin,
+		valueMargins);
+}
+
+not_null<FlatLabel*> AddTableRow(
+		not_null<TableLayout*> table,
+		rpl::producer<QString> label,
+		rpl::producer<TextWithEntities> value,
+		const Text::MarkedContext &context) {
+	auto widget = object_ptr<FlatLabel>(
+		table,
+		std::move(value),
+		table->st().defaultValue,
+		st::defaultPopupMenu,
+		context);
+	const auto result = widget.data();
+	AddTableRow(table, std::move(label), std::move(widget));
+	return result;
+}
+
+void AddTableRow(
+		not_null<TableLayout*> table,
+		rpl::producer<QString> label,
+		std::shared_ptr<ChatHelpers::Show> show,
+		PeerId id) {
+	if (!id) {
+		return;
+	}
+	AddTableRow(
+		table,
+		std::move(label),
+		MakePeerTableValue(table, show, id),
+		st::giveawayGiftCodePeerMargin);
+}
+
+ValueWithSmallButton MakeValueWithSmallButton(
+		not_null<TableLayout*> table,
+		not_null<RpWidget*> value,
+		rpl::producer<QString> buttonText,
+		Fn<void(not_null<RpWidget*> button)> handler,
+		int topSkip) {
+	class MarginedWidget final : public RpWidget {
+	public:
+		using RpWidget::RpWidget;
+		QMargins getMargins() const override {
+			return { 0, 0, 0, st::giveawayGiftCodePeerMargin.bottom() };
+		}
+	};
+	auto result = object_ptr<MarginedWidget>(table);
+	const auto raw = result.data();
+
+	value->setParent(raw);
+	value->show();
+
+	const auto button = CreateChild<RoundButton>(
+		raw,
+		std::move(buttonText),
+		table->st().smallButton);
+	if (handler) {
+		button->setClickedCallback([button, handler = std::move(handler)] {
+			handler(button);
+		});
+	} else {
+		button->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
+	rpl::combine(
+		raw->widthValue(),
+		button->widthValue(),
+		value->naturalWidthValue()
+	) | rpl::on_next([=](int width, int buttonWidth, int) {
+		const auto buttonSkip = st::normalFont->spacew + buttonWidth;
+		value->resizeToNaturalWidth(width - buttonSkip);
+		value->moveToLeft(0, 0, width);
+		button->moveToLeft(
+			rect::right(value) + st::normalFont->spacew,
+			(topSkip
+				+ (table->st().defaultValue.style.font->ascent
+					- table->st().smallButton.style.font->ascent)),
+			width);
+	}, value->lifetime());
+
+	value->heightValue() | rpl::on_next([=](int height) {
+		const auto bottom = st::giveawayGiftCodePeerMargin.bottom();
+		raw->resize(raw->width(), height + bottom);
+	}, raw->lifetime());
+
+	return {
+		.widget = std::move(result),
+		.button = button,
+	};
+}
+
+object_ptr<RpWidget> MakePeerTableValue(
+		not_null<TableLayout*> table,
+		std::shared_ptr<ChatHelpers::Show> show,
+		PeerId id,
+		rpl::producer<QString> button,
+		Fn<void()> handler) {
+	auto result = object_ptr<AbstractButton>(table);
+	const auto raw = result.data();
+
+	const auto &st = st::giveawayGiftCodeUserpic;
+	raw->resize(raw->width(), st.photoSize);
+
+	const auto peer = show->session().data().peer(id);
+	const auto userpic = CreateChild<UserpicButton>(raw, peer, st);
+	const auto label = CreateChild<FlatLabel>(
+		raw,
+		(button && handler) ? peer->shortName() : peer->name(),
+		table->st().defaultValue);
+
+	raw->widthValue() | rpl::on_next([=](int width) {
+		const auto position = st::giveawayGiftCodeNamePosition;
+		label->resizeToNaturalWidth(width - position.x());
+		label->moveToLeft(position.x(), position.y(), width);
+		const auto top = (raw->height() - userpic->height()) / 2;
+		userpic->moveToLeft(0, top, width);
+	}, label->lifetime());
+
+	label->naturalWidthValue() | rpl::on_next([=](int width) {
+		raw->setNaturalWidth(st::giveawayGiftCodeNamePosition.x() + width);
+	}, label->lifetime());
+	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	rpl::single(
+		rpl::empty_value()
+	) | rpl::then(style::PaletteChanged()) | rpl::on_next([=] {
+		label->setTextColorOverride(
+			table->st().defaultValue.palette.linkFg->c);
+	}, label->lifetime());
+
+	raw->setClickedCallback([=] {
+		show->showBox(PrepareShortInfoBox(peer, show));
+	});
+
+	if (!button || !handler) {
+		return result;
+	}
+	return MakeValueWithSmallButton(
+		table,
+		result.release(),
+		std::move(button),
+		[=](not_null<RpWidget*> button) { handler(); },
+		st::giveawayGiftCodeNamePosition.y()).widget;
+}
+
+object_ptr<RpWidget> MakePeerWithStatusValue(
+		not_null<TableLayout*> table,
+		std::shared_ptr<ChatHelpers::Show> show,
+		PeerId id,
+		Fn<void(not_null<RpWidget*>, EmojiStatusId)> pushStatusId) {
+	auto result = object_ptr<RpWidget>(table);
+	const auto raw = result.data();
+
+	const auto peerLabel = MakePeerTableValue(table, show, id).release();
+	peerLabel->setParent(raw);
+	peerLabel->show();
+
+	raw->resize(raw->width(), peerLabel->height());
+
+	using namespace Info::Profile;
+	struct State {
+		rpl::variable<Badge::Content> content;
+	};
+	const auto peer = show->session().data().peer(id);
+	const auto state = peerLabel->lifetime().make_state<State>();
+	state->content = EmojiStatusIdValue(
+		peer
+	) | rpl::map([=](EmojiStatusId emojiStatusId) {
+		if (!peer->session().premium()
+			|| (!peer->isSelf() && !emojiStatusId)) {
+			return Badge::Content();
+		}
+		return Badge::Content{
+			.badge = BadgeType::Premium,
+			.emojiStatusId = emojiStatusId,
+		};
+	});
+	const auto badge = peerLabel->lifetime().make_state<Badge>(
+		raw,
+		st::infoPeerBadge,
+		&peer->session(),
+		state->content.value(),
+		nullptr,
+		[=] { return show->paused(ChatHelpers::PauseReason::Layer); });
+	state->content.value(
+	) | rpl::on_next([=](const Badge::Content &content) {
+		if (const auto widget = badge->widget()) {
+			pushStatusId(widget, content.emojiStatusId);
+		}
+	}, raw->lifetime());
+
+	rpl::combine(
+		raw->widthValue(),
+		rpl::single(rpl::empty) | rpl::then(badge->updated())
+	) | rpl::on_next([=](int width, const auto &) {
+		const auto badgeWidget = badge->widget();
+		const auto badgeSkip = badgeWidget
+			? (st::normalFont->spacew + badgeWidget->width())
+			: 0;
+		peerLabel->resizeToNaturalWidth(width - badgeSkip);
+		peerLabel->moveToLeft(0, 0, width);
+		if (badgeWidget) {
+			badgeWidget->moveToLeft(
+				peerLabel->width() + st::normalFont->spacew,
+				st::giftBoxByStarsStarTop,
+				width);
+		}
+	}, raw->lifetime());
+
+	return result;
+}
+
+object_ptr<RpWidget> MakeHiddenPeerTableValue(
+		not_null<TableLayout*> table) {
+	auto result = object_ptr<RpWidget>(table);
+	const auto raw = result.data();
+
+	const auto &st = st::giveawayGiftCodeUserpic;
+	raw->resize(raw->width(), st.photoSize);
+
+	const auto userpic = CreateChild<RpWidget>(raw);
+	const auto usize = st.photoSize;
+	userpic->resize(usize, usize);
+	userpic->paintRequest() | rpl::on_next([=] {
+		auto p = QPainter(userpic);
+		EmptyUserpic::PaintHiddenAuthor(p, 0, 0, usize, usize);
+	}, userpic->lifetime());
+
+	const auto label = CreateChild<FlatLabel>(
+		raw,
+		tr::lng_gift_from_hidden(),
+		table->st().defaultValue);
+	raw->widthValue(
+	) | rpl::on_next([=](int width) {
+		const auto position = st::giveawayGiftCodeNamePosition;
+		label->resizeToNaturalWidth(width - position.x());
+		label->moveToLeft(position.x(), position.y(), width);
+		const auto top = (raw->height() - userpic->height()) / 2;
+		userpic->moveToLeft(0, top, width);
+	}, label->lifetime());
+
+	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+	rpl::single(
+		rpl::empty_value()
+	) | rpl::then(style::PaletteChanged()) | rpl::on_next([=] {
+		label->setTextColorOverride(st::windowFg->c);
+	}, label->lifetime());
+
+	return result;
+}
+
+void ShowTableRowTooltip(
+		std::shared_ptr<TableRowTooltipData> data,
+		not_null<QWidget*> target,
+		rpl::producer<TextWithEntities> text,
+		int duration,
+		const Text::MarkedContext &context) {
+	if (data->raw) {
+		data->raw->toggleAnimated(false);
+	}
+	const auto parent = data->parent;
+	const auto tooltip = CreateChild<ImportantTooltip>(
+		parent,
+		MakeNiceTooltipLabel(
+			parent,
+			std::move(text),
+			st::boxWideWidth,
+			st::defaultImportantTooltipLabel,
+			st::defaultPopupMenu,
+			context),
+		st::defaultImportantTooltip);
+	tooltip->toggleFast(false);
+
+	base::install_event_filter(tooltip, qApp, [=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::MouseButtonPress) {
+			tooltip->toggleAnimated(false);
+		}
+		return base::EventFilterResult::Continue;
+	});
+
+	const auto update = [=] {
+		const auto geometry = MapFrom(parent, target, target->rect());
+		const auto countPosition = [=](QSize size) {
+			const auto left = geometry.x()
+				+ (geometry.width() - size.width()) / 2;
+			const auto right = parent->width()
+				- st::normalFont->spacew;
+			return QPoint(
+				std::max(std::min(left, right - size.width()), 0),
+				geometry.y() - size.height() - st::normalFont->descent);
+		};
+		tooltip->pointAt(geometry, RectPart::Top, countPosition);
+	};
+	parent->widthValue(
+	) | rpl::on_next(update, tooltip->lifetime());
+
+	update();
+	tooltip->toggleAnimated(true);
+
+	data->raw = tooltip;
+	tooltip->shownValue() | rpl::filter(
+		!rpl::mappers::_1
+	) | rpl::on_next([=] {
+		crl::on_main(tooltip, [=] {
+			if (tooltip->isHidden()) {
+				if (data->raw == tooltip) {
+					data->raw = nullptr;
+				}
+				delete tooltip;
+			}
+		});
+	}, tooltip->lifetime());
+
+	base::timer_once(
+		duration
+	) | rpl::on_next([=] {
+		tooltip->toggleAnimated(false);
+	}, tooltip->lifetime());
+}
+
+ValueWithSmallButton MakeTableValueWithTooltip(
+		not_null<TableLayout*> table,
+		std::shared_ptr<TableRowTooltipData> data,
+		TextWithEntities price,
+		TextWithEntities tooltip,
+		const Text::MarkedContext &context) {
+	const auto label = CreateChild<FlatLabel>(
+		table,
+		rpl::single(price),
+		table->st().defaultValue,
+		st::defaultPopupMenu,
+		context);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	const auto handler = [=](not_null<RpWidget*> button) {
+		ShowTableRowTooltip(
+			data,
+			button,
+			rpl::single(tooltip),
+			kTooltipDuration,
+			context);
+	};
+	auto text = rpl::single(u"?"_q);
+	return MakeValueWithSmallButton(table, label, std::move(text), handler);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/table_rows.h b/Telegram/SourceFiles/ui/controls/table_rows.h
new file mode 100644
index 00000000000000..7d27697828ff35
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/table_rows.h
@@ -0,0 +1,90 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+
+namespace st {
+extern const style::margins &giveawayGiftCodeLabelMargin;
+extern const style::margins &giveawayGiftCodeValueMargin;
+} // namespace st
+
+namespace ChatHelpers {
+class Show;
+} // namespace ChatHelpers
+
+namespace Ui {
+
+class RpWidget;
+class TableLayout;
+class FlatLabel;
+class RoundButton;
+class ImportantTooltip;
+
+void AddTableRow(
+	not_null<TableLayout*> table,
+	rpl::producer<QString> label,
+	object_ptr<RpWidget> value,
+	style::margins valueMargins = st::giveawayGiftCodeValueMargin);
+
+not_null<FlatLabel*> AddTableRow(
+	not_null<TableLayout*> table,
+	rpl::producer<QString> label,
+	rpl::producer<TextWithEntities> value,
+	const Text::MarkedContext &context = {});
+
+void AddTableRow(
+	not_null<TableLayout*> table,
+	rpl::producer<QString> label,
+	std::shared_ptr<ChatHelpers::Show> show,
+	PeerId id);
+
+
+struct ValueWithSmallButton {
+	object_ptr<RpWidget> widget;
+	not_null<RoundButton*> button;
+};
+[[nodiscard]] ValueWithSmallButton MakeValueWithSmallButton(
+	not_null<TableLayout*> table,
+	not_null<RpWidget*> value,
+	rpl::producer<QString> buttonText,
+	Fn<void(not_null<RpWidget*> button)> handler = nullptr,
+	int topSkip = 0);
+[[nodiscard]] object_ptr<RpWidget> MakePeerTableValue(
+	not_null<TableLayout*> table,
+	std::shared_ptr<ChatHelpers::Show> show,
+	PeerId id,
+	rpl::producer<QString> button = nullptr,
+	Fn<void()> handler = nullptr);
+[[nodiscard]] object_ptr<RpWidget> MakePeerWithStatusValue(
+	not_null<TableLayout*> table,
+	std::shared_ptr<ChatHelpers::Show> show,
+	PeerId id,
+	Fn<void(not_null<RpWidget*>, EmojiStatusId)> pushStatusId);
+[[nodiscard]] object_ptr<RpWidget> MakeHiddenPeerTableValue(
+	not_null<TableLayout*> table);
+
+struct TableRowTooltipData {
+	not_null<RpWidget*> parent;
+	ImportantTooltip *raw = nullptr;
+};
+void ShowTableRowTooltip(
+	std::shared_ptr<TableRowTooltipData> data,
+	not_null<QWidget*> target,
+	rpl::producer<TextWithEntities> text,
+	int duration,
+	const Text::MarkedContext &context = {});
+
+[[nodiscard]] ValueWithSmallButton MakeTableValueWithTooltip(
+	not_null<TableLayout*> table,
+	std::shared_ptr<TableRowTooltipData> data,
+	TextWithEntities price,
+	TextWithEntities tooltip,
+	const Text::MarkedContext &context = {});
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/ton_common.cpp b/Telegram/SourceFiles/ui/controls/ton_common.cpp
new file mode 100644
index 00000000000000..3cdd28c98b446c
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/ton_common.cpp
@@ -0,0 +1,240 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/ton_common.h"
+
+#include "base/qthelp_url.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/ui_utility.h"
+#include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+//#include "styles/style_wallet.h"
+
+#include <QtCore/QLocale>
+
+namespace Ui {
+namespace {
+
+constexpr auto kOneTon = kNanosInOne;
+constexpr auto kNanoDigits = 9;
+
+struct FixedAmount {
+	QString text;
+	int position = 0;
+};
+
+std::optional<int64> ParseAmountTons(const QString &trimmed) {
+	auto ok = false;
+	const auto grams = int64(trimmed.toLongLong(&ok));
+	return (ok
+		&& (grams <= std::numeric_limits<int64>::max() / kOneTon)
+		&& (grams >= std::numeric_limits<int64>::min() / kOneTon))
+		? std::make_optional(grams * kOneTon)
+		: std::nullopt;
+}
+
+std::optional<int64> ParseAmountNano(QString trimmed) {
+	while (trimmed.size() < kNanoDigits) {
+		trimmed.append('0');
+	}
+	auto zeros = 0;
+	for (const auto ch : trimmed) {
+		if (ch == '0') {
+			++zeros;
+		} else {
+			break;
+		}
+	}
+	if (zeros == trimmed.size()) {
+		return 0;
+	} else if (trimmed.size() > kNanoDigits) {
+		return std::nullopt;
+	}
+	auto ok = false;
+	const auto value = trimmed.mid(zeros).toLongLong(&ok);
+	return (ok && value > 0 && value < kOneTon)
+		? std::make_optional(value)
+		: std::nullopt;
+}
+
+[[nodiscard]] FixedAmount FixTonAmountInput(
+		const QString &was,
+		const QString &text,
+		int position) {
+	constexpr auto kMaxDigitsCount = 9;
+	const auto separator = FormatTonAmount(1).separator;
+
+	auto result = FixedAmount{ text, position };
+	if (text.isEmpty()) {
+		return result;
+	} else if (text.startsWith('.')
+		|| text.startsWith(',')
+		|| text.startsWith(separator)) {
+		result.text.prepend('0');
+		++result.position;
+	}
+	auto separatorFound = false;
+	auto digitsCount = 0;
+	for (auto i = 0; i != result.text.size();) {
+		const auto ch = result.text[i];
+		const auto atSeparator = QStringView(result.text).mid(i).startsWith(separator);
+		if (ch >= '0' && ch <= '9' && digitsCount < kMaxDigitsCount) {
+			++i;
+			++digitsCount;
+			continue;
+		} else if (!separatorFound
+			&& (atSeparator || ch == '.' || ch == ',')) {
+			separatorFound = true;
+			if (!atSeparator) {
+				result.text.replace(i, 1, separator);
+			}
+			digitsCount = 0;
+			i += separator.size();
+			continue;
+		}
+		result.text.remove(i, 1);
+		if (result.position > i) {
+			--result.position;
+		}
+	}
+	if (result.text == "0" && result.position > 0) {
+		if (was.startsWith('0')) {
+			result.text = QString();
+			result.position = 0;
+		} else {
+			result.text += separator;
+			result.position += separator.size();
+		}
+	}
+	return result;
+}
+
+} // namespace
+
+FormattedTonAmount FormatTonAmount(int64 amount, TonFormatFlags flags) {
+	auto result = FormattedTonAmount();
+	const auto grams = amount / kOneTon;
+	const auto preciseNanos = std::abs(amount) % kOneTon;
+	auto roundedNanos = preciseNanos;
+	if (flags & TonFormatFlag::Rounded) {
+		if (std::abs(grams) >= 1'000'000 && (roundedNanos % 1'000'000)) {
+			roundedNanos -= (roundedNanos % 1'000'000);
+		} else if (std::abs(grams) >= 1'000 && (roundedNanos % 1'000)) {
+			roundedNanos -= (roundedNanos % 1'000);
+		}
+	}
+	const auto precise = (roundedNanos == preciseNanos);
+	auto nanos = preciseNanos;
+	auto zeros = 0;
+	while (zeros < kNanoDigits && nanos % 10 == 0) {
+		nanos /= 10;
+		++zeros;
+	}
+	const auto system = QLocale::system();
+	const auto locale = (flags & TonFormatFlag::Simple)
+		? QLocale::c()
+		: system;
+	const auto separator = system.decimalPoint();
+
+	result.wholeString = locale.toString(grams);
+	if ((flags & TonFormatFlag::Signed) && amount > 0) {
+		result.wholeString = locale.positiveSign() + result.wholeString;
+	} else if (amount < 0 && grams == 0) {
+		result.wholeString = locale.negativeSign() + result.wholeString;
+	}
+	result.full = result.wholeString;
+	if (zeros < kNanoDigits) {
+		result.separator = separator;
+		result.nanoString = QString("%1"
+		).arg(nanos, kNanoDigits - zeros, 10, QChar('0'));
+		if (!precise) {
+			const auto nanoLength = (std::abs(grams) >= 1'000'000)
+				? 3
+				: (std::abs(grams) >= 1'000)
+				? 6
+				: 9;
+			result.nanoString = result.nanoString.mid(0, nanoLength);
+		}
+		result.full += separator + result.nanoString;
+	}
+	return result;
+}
+
+std::optional<int64> ParseTonAmountString(const QString &amount) {
+	const auto trimmed = amount.trimmed();
+	const auto separator = QString(QLocale::system().decimalPoint());
+	const auto index1 = trimmed.indexOf('.');
+	const auto index2 = trimmed.indexOf(',');
+	const auto index3 = (separator == "." || separator == ",")
+		? -1
+		: trimmed.indexOf(separator);
+	const auto found = (index1 >= 0 ? 1 : 0)
+		+ (index2 >= 0 ? 1 : 0)
+		+ (index3 >= 0 ? 1 : 0);
+	if (found > 1) {
+		return std::nullopt;
+	}
+	const auto index = (index1 >= 0)
+		? index1
+		: (index2 >= 0)
+		? index2
+		: index3;
+	const auto used = (index1 >= 0)
+		? "."
+		: (index2 >= 0)
+		? ","
+		: separator;
+	const auto grams = ParseAmountTons(trimmed.mid(0, index));
+	const auto nano = ParseAmountNano(trimmed.mid(index + used.size()));
+	if (index < 0 || index == trimmed.size() - used.size()) {
+		return grams;
+	} else if (index == 0) {
+		return nano;
+	} else if (!nano || !grams) {
+		return std::nullopt;
+	}
+	return *grams + (*grams < 0 ? (-*nano) : (*nano));
+}
+
+QString TonAmountSeparator() {
+	return FormatTonAmount(1).separator;
+}
+
+not_null<Ui::InputField*> CreateTonAmountInput(
+		not_null<QWidget*> parent,
+		rpl::producer<QString> placeholder,
+		int64 amount) {
+	const auto result = Ui::CreateChild<Ui::InputField>(
+		parent.get(),
+		st::editTagField,
+		Ui::InputField::Mode::SingleLine,
+		std::move(placeholder),
+		(amount > 0
+			? FormatTonAmount(amount, TonFormatFlag::Simple).full
+			: QString()));
+	const auto lastAmountValue = std::make_shared<QString>();
+	result->changes() | rpl::on_next([=] {
+		Ui::PostponeCall(result, [=] {
+			const auto position = result->textCursor().position();
+			const auto now = result->getLastText();
+			const auto fixed = FixTonAmountInput(
+				*lastAmountValue,
+				now,
+				position);
+			*lastAmountValue = fixed.text;
+			if (fixed.text == now) {
+				return;
+			}
+			result->setText(fixed.text);
+			result->setFocusFast();
+			result->setCursorPosition(fixed.position);
+		});
+	}, result->lifetime());
+	return result;
+}
+
+} // namespace Wallet
diff --git a/Telegram/SourceFiles/ui/controls/ton_common.h b/Telegram/SourceFiles/ui/controls/ton_common.h
new file mode 100644
index 00000000000000..189a793d8be617
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/ton_common.h
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/flags.h"
+
+namespace Ui {
+
+class InputField;
+
+inline constexpr auto kNanosInOne = 1'000'000'000LL;
+
+struct FormattedTonAmount {
+	QString wholeString;
+	QString separator;
+	QString nanoString;
+	QString full;
+};
+
+enum class TonFormatFlag {
+	Signed = 0x01,
+	Rounded = 0x02,
+	Simple = 0x04,
+};
+constexpr bool is_flag_type(TonFormatFlag) { return true; };
+using TonFormatFlags = base::flags<TonFormatFlag>;
+
+[[nodiscard]] FormattedTonAmount FormatTonAmount(
+	int64 amount,
+	TonFormatFlags flags = TonFormatFlags());
+[[nodiscard]] std::optional<int64> ParseTonAmountString(
+	const QString &amount);
+
+[[nodiscard]] QString TonAmountSeparator();
+
+[[nodiscard]] not_null<Ui::InputField*> CreateTonAmountInput(
+	not_null<QWidget*> parent,
+	rpl::producer<QString> placeholder,
+	int64 amount = 0);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.cpp b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
index ea0bfa937cbe4d..b114c15cfe6b99 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
@@ -7,7 +7,12 @@ For license and copyright information please follow this link:
 */
 #include "ui/controls/userpic_button.h"
 
+#include "apiwrap.h"
+#include "api/api_peer_photo.h"
+#include "ui/effects/upload_progress_overlay.h"
+#include "api/api_user_privacy.h"
 #include "base/call_delayed.h"
+#include "boxes/edit_privacy_box.h"
 #include "boxes/peers/edit_peer_info_box.h" // EditPeerInfoBox::Available.
 #include "ui/effects/ripple_animation.h"
 #include "ui/empty_userpic.h"
@@ -27,6 +32,7 @@ For license and copyright information please follow this link:
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/menu/menu_action.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/ui_utility.h"
 #include "editor/photo_editor_common.h"
 #include "editor/photo_editor_layer_widget.h"
@@ -35,7 +41,8 @@ For license and copyright information please follow this link:
 #include "media/streaming/media_streaming_instance.h"
 #include "media/streaming/media_streaming_player.h"
 #include "media/streaming/media_streaming_document.h"
-#include "settings/settings_calls.h" // Calls::AddCameraSubsection.
+#include "settings/sections/settings_calls.h" // AddCameraSubsection.
+#include "settings/settings_privacy_controllers.h"
 #include "webrtc/webrtc_environment.h"
 #include "webrtc/webrtc_video_track.h"
 #include "ui/widgets/popup_menu.h"
@@ -50,6 +57,9 @@ For license and copyright information please follow this link:
 #include "styles/style_menu_icons.h"
 #include "styles/style_premium.h"
 
+#include <QtGui/QClipboard>
+#include <QtGui/QGuiApplication>
+
 namespace Ui {
 namespace {
 
@@ -67,7 +77,7 @@ void CameraBox(
 		Fn<void(QImage &&image)> &&doneCallback) {
 	using namespace Webrtc;
 
-	const auto track = Settings::Calls::AddCameraSubsection(
+	const auto track = Settings::AddCameraSubsection(
 		box->uiShow(),
 		box->verticalLayout(),
 		false);
@@ -76,7 +86,7 @@ void CameraBox(
 		return;
 	}
 	track->stateValue(
-	) | rpl::start_with_next([=](const VideoState &state) {
+	) | rpl::on_next([=](const VideoState &state) {
 		if (state == VideoState::Inactive) {
 			box->closeBox();
 		}
@@ -89,7 +99,7 @@ void CameraBox(
 			done(std::move(image));
 		};
 		const auto useForumShape = forceForumShape
-			|| (peer && peer->isForum());
+			|| (peer && peer->isForum() && !peer->isBot());
 		PrepareProfilePhoto(
 			box,
 			controller,
@@ -132,7 +142,7 @@ void SetupSubButtonBackground(
 
 	background->resize(size);
 	background->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(background);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setBrush(st::boxBg);
@@ -141,11 +151,20 @@ void SetupSubButtonBackground(
 	}, background->lifetime());
 
 	upload->positionValue(
-	) | rpl::start_with_next([=](QPoint position) {
+	) | rpl::on_next([=](QPoint position) {
 		background->move(position - QPoint(border, border));
 	}, background->lifetime());
 }
 
+[[nodiscard]] QBrush CreateDefaultGradientBrush(int size) {
+	auto gradient = QLinearGradient(0, 0, 0, size);
+	gradient.setStops({
+		{ 0.0, st::historyPeer4UserpicBg->c },
+		{ 1.0, st::historyPeer4UserpicBg2->c },
+	});
+	return QBrush(std::move(gradient));
+}
+
 } // namespace
 
 UserpicButton::UserpicButton(
@@ -153,12 +172,12 @@ UserpicButton::UserpicButton(
 	not_null<Window::Controller*> window,
 	Role role,
 	const style::UserpicButton &st,
-	bool forceForumShape)
+	PeerUserpicShape shape)
 : RippleButton(parent, st.changeButton.ripple)
 , _st(st)
 , _controller(window->sessionController())
 , _window(window)
-, _forceForumShape(forceForumShape)
+, _shape(shape)
 , _role(role) {
 	Expects(_role == Role::ChangePhoto || _role == Role::ChoosePhoto);
 
@@ -173,12 +192,14 @@ UserpicButton::UserpicButton(
 	not_null<PeerData*> peer,
 	Role role,
 	Source source,
-	const style::UserpicButton &st)
+	const style::UserpicButton &st,
+	PeerUserpicShape shape)
 : RippleButton(parent, st.changeButton.ripple)
 , _st(st)
 , _controller(controller)
 , _window(&controller->window())
 , _peer(peer)
+, _shape(shape)
 , _role(role)
 , _source(source) {
 	if (_source == Source::Custom) {
@@ -193,10 +214,12 @@ UserpicButton::UserpicButton(
 UserpicButton::UserpicButton(
 	QWidget *parent,
 	not_null<PeerData*> peer,
-	const style::UserpicButton &st)
+	const style::UserpicButton &st,
+	PeerUserpicShape shape)
 : RippleButton(parent, st.changeButton.ripple)
 , _st(st)
 , _peer(peer)
+, _shape(shape)
 , _role(Role::Custom)
 , _source(Source::PeerPhoto) {
 	Expects(_role != Role::OpenPhoto);
@@ -210,16 +233,23 @@ UserpicButton::~UserpicButton() = default;
 
 void UserpicButton::prepare() {
 	resize(_st.size);
+	setNaturalWidth(_st.size.width());
 	_notShownYet = _waiting;
 	if (!_waiting) {
 		prepareUserpicPixmap();
 	}
 	setClickHandlerByRole();
+
+	if (_role == Role::OpenPhoto) {
+		setAccessibleName(tr::lng_mediaview_profile_photo(tr::now));
+	} else if (_role == Role::ChangePhoto || _role == Role::ChoosePhoto) {
+		setAccessibleName(tr::lng_profile_set_photo_for(tr::now));
+	}
 }
 
 void UserpicButton::showCustomOnChosen() {
 	chosenImages(
-	) | rpl::start_with_next([=](ChosenImage &&chosen) {
+	) | rpl::on_next([=](ChosenImage &&chosen) {
 		showCustom(std::move(chosen.image));
 	}, lifetime());
 }
@@ -240,6 +270,7 @@ bool UserpicButton::canSuggestPhoto(not_null<UserData*> user) const {
 	// Server allows suggesting photos only in non-empty chats.
 	return !user->isSelf()
 		&& !user->isBot()
+		&& !user->starsPerMessageChecked()
 		&& (user->owner().history(user)->lastServerMessage() != nullptr);
 }
 
@@ -266,51 +297,61 @@ void UserpicButton::setClickHandlerByRole() {
 }
 
 void UserpicButton::choosePhotoLocally() {
+	if (_uploadOverlay && _uploadOverlay->uploading()) {
+		_peer->session().api().peerPhoto().cancelUpload(_peer);
+		return;
+	}
 	if (!_window) {
 		return;
+	} else if (const auto controller = _window->sessionController()) {
+		if (controller->showFrozenError()) {
+			return;
+		}
 	}
 	const auto callback = [=](ChosenType type) {
 		return [=](QImage &&image) {
 			_chosenImages.fire({ std::move(image), type });
 		};
 	};
-	const auto chooseFile = [=](ChosenType type = ChosenType::Set) {
+	const auto editorData = [=](ChosenType type) {
+		const auto user = _peer ? _peer->asUser() : nullptr;
+		const auto name = (user && !user->firstName.isEmpty())
+			? user->firstName
+			: _peer
+			? _peer->name()
+			: QString();
+		const auto phrase = (type == ChosenType::Suggest)
+			? &tr::lng_profile_suggest_sure
+			: (user && EditPeerInfoBox::Available(user))
+			? nullptr
+			: (user && !user->isSelf())
+			? &tr::lng_profile_set_personal_sure
+			: nullptr;
+		return Editor::EditorData{
+			.about = (phrase
+				? (*phrase)(
+					tr::now,
+					lt_user,
+					tr::bold(name),
+					tr::marked)
+				: TextWithEntities()),
+			.confirm = ((type == ChosenType::Suggest)
+				? tr::lng_profile_suggest_button(tr::now)
+				: tr::lng_profile_set_photo_button(tr::now)),
+			.cropType = (useForumShape()
+				? Editor::EditorData::CropType::RoundedRect
+				: Editor::EditorData::CropType::Ellipse),
+			.keepAspectRatio = true,
+		};
+	};
+	const auto chooseFile = [=](ChosenType type) {
 		base::call_delayed(
 			_st.changeButton.ripple.hideDuration,
 			crl::guard(this, [=] {
-				using namespace Editor;
-				const auto user = _peer ? _peer->asUser() : nullptr;
-				const auto name = (user && !user->firstName.isEmpty())
-					? user->firstName
-					: _peer
-					? _peer->name()
-					: QString();
-				const auto phrase = (type == ChosenType::Suggest)
-					? &tr::lng_profile_suggest_sure
-					: (user && EditPeerInfoBox::Available(user))
-					? nullptr
-					: (user && !user->isSelf())
-					? &tr::lng_profile_set_personal_sure
-					: nullptr;
 				PrepareProfilePhotoFromFile(
 					this,
 					_window,
-					{
-						.about = (phrase
-							? (*phrase)(
-								tr::now,
-								lt_user,
-								Ui::Text::Bold(name),
-								Ui::Text::WithEntities)
-							: TextWithEntities()),
-						.confirm = ((type == ChosenType::Suggest)
-							? tr::lng_profile_suggest_button(tr::now)
-							: tr::lng_profile_set_photo_button(tr::now)),
-						.cropType = (useForumShape()
-							? EditorData::CropType::RoundedRect
-							: EditorData::CropType::Ellipse),
-						.keepAspectRatio = true,
-					},
+					editorData(type),
 					callback(type));
 			}));
 	};
@@ -332,7 +373,25 @@ void UserpicButton::choosePhotoLocally() {
 				? Api::PeerPhoto::EmojiListType::Profile
 				: Api::PeerPhoto::EmojiListType::Group),
 			done,
-			_peer ? _peer->isForum() : false);
+			_peer ? (_peer->isForum() && !_peer->isBot()) : false);
+	};
+	const auto addFromClipboard = [=](ChosenType type, tr::phrase<> text) {
+		if (const auto data = QGuiApplication::clipboard()->mimeData()) {
+			if (data->hasImage()) {
+				auto openEditor = crl::guard(this, [=, this] {
+					Editor::PrepareProfilePhoto(
+						this,
+						_window,
+						editorData(type),
+						callback(type),
+						qvariant_cast<QImage>(data->imageData()));
+				});
+				_menu->addAction(
+					std::move(text)(tr::now),
+					std::move(openEditor),
+					&st::menuIconPhoto);
+			}
+		}
 	};
 	_menu = base::make_unique_q<Ui::PopupMenu>(
 		this,
@@ -340,13 +399,19 @@ void UserpicButton::choosePhotoLocally() {
 	if (user && !user->isSelf()) {
 		_menu->addAction(
 			tr::lng_profile_set_photo_for(tr::now),
-			[=] { chooseFile(); },
+			[=] { chooseFile(ChosenType::Set); },
 			&st::menuIconPhotoSet);
+		addFromClipboard(
+			ChosenType::Set,
+			tr::lng_profile_set_photo_for_from_clipboard);
 		if (canSuggestPhoto(user)) {
 			_menu->addAction(
 				tr::lng_profile_suggest_photo(tr::now),
 				[=] { chooseFile(ChosenType::Suggest); },
 				&st::menuIconPhotoSuggest);
+			addFromClipboard(
+				ChosenType::Suggest,
+				tr::lng_profile_suggest_photo_from_clipboard);
 		}
 		addUserpicBuilder(ChosenType::Set);
 		if (hasPersonalPhotoLocally()) {
@@ -357,7 +422,7 @@ void UserpicButton::choosePhotoLocally() {
 		const auto hasCamera = IsCameraAvailable();
 		if (hasCamera || _controller) {
 			_menu->addAction(tr::lng_attach_file(tr::now), [=] {
-				chooseFile();
+				chooseFile(ChosenType::Set);
 			}, &st::menuIconPhoto);
 			if (hasCamera) {
 				_menu->addAction(tr::lng_attach_camera(tr::now), [=] {
@@ -365,22 +430,48 @@ void UserpicButton::choosePhotoLocally() {
 						CameraBox,
 						_window,
 						_peer,
-						_forceForumShape,
+						(_shape == PeerUserpicShape::Forum),
 						callback(ChosenType::Set)));
 				}, &st::menuIconPhotoSet);
 			}
+			addFromClipboard(
+				ChosenType::Set,
+				tr::lng_profile_photo_from_clipboard);
 			addUserpicBuilder(ChosenType::Set);
 		} else {
-			chooseFile();
+			chooseFile(ChosenType::Set);
+		}
+		if (user && user->isSelf()) {
+			const auto key = Api::UserPrivacy::Key::ProfilePhoto;
+			const auto text = tr::lng_edit_privacy_profile_photo_public_set(
+				tr::now);
+			user->session().api().userPrivacy().reload(key);
+			_menu->addAction(std::move(text), [=] {
+				using namespace Api;
+				user->session().api().userPrivacy().value(
+					key
+				) | rpl::take(
+					1
+				) | rpl::on_next([=](const UserPrivacy::Rule &value) {
+					using namespace Settings;
+					_window->show(Box<EditPrivacyBox>(
+						_window->sessionController(),
+						std::make_unique<ProfilePhotoPrivacyController>(),
+						value));
+				}, _menu->lifetime());
+			}, &st::menuIconProfile);
 		}
 	}
-	_menu->popup(QCursor::pos());
+	const auto position = rect().contains(mapFromGlobal(QCursor::pos()))
+		? QCursor::pos()
+		: mapToGlobal(rect().center());
+	_menu->popup(position);
 }
 
 auto UserpicButton::makeResetToOriginalAction()
 -> base::unique_qptr<Menu::ItemBase> {
 	auto item = base::make_unique_q<Menu::Action>(
-		_menu.get(),
+		_menu->menu(),
 		_menu->st().menu,
 		Menu::CreateAction(
 			_menu.get(),
@@ -406,10 +497,19 @@ auto UserpicButton::makeResetToOriginalAction()
 	return item;
 }
 
+PopupMenu *UserpicButton::showChangePhotoMenu() {
+	choosePhotoLocally();
+	return _menu.get();
+}
+
 void UserpicButton::openPeerPhoto() {
 	Expects(_peer != nullptr);
 	Expects(_controller != nullptr);
 
+	if (_uploadOverlay && _uploadOverlay->uploading()) {
+		_peer->session().api().peerPhoto().cancelUpload(_peer);
+		return;
+	}
 	if (_changeOverlayEnabled && _cursorInChangeOverlay) {
 		choosePhotoLocally();
 		return;
@@ -439,7 +539,7 @@ void UserpicButton::setupPeerViewers() {
 				user->hasPersonalPhoto());
 		}) | rpl::distinct_until_changed() | rpl::skip(
 			1
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			processNewPeerPhoto();
 			update();
 		}, _sourceLifetime);
@@ -450,7 +550,7 @@ void UserpicButton::setupPeerViewers() {
 		_peer->session().changes().peerUpdates(
 			_peer,
 			Data::PeerUpdate::Flag::Photo
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			processNewPeerPhoto();
 			update();
 		}, _sourceLifetime);
@@ -458,7 +558,7 @@ void UserpicButton::setupPeerViewers() {
 	_peer->session().downloaderTaskFinished(
 	) | rpl::filter([=] {
 		return _waiting;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		const auto loading = _showPeerUserpic
 			? Ui::PeerUserpicLoading(_userpicView)
 			: (_nonPersonalView && !_nonPersonalView->loaded());
@@ -495,6 +595,20 @@ void UserpicButton::paintEvent(QPaintEvent *e) {
 			photoPosition.y(),
 			width(),
 			_st.photoSize);
+	} else if (showMyNotes()) {
+		Ui::EmptyUserpic::PaintMyNotes(
+			p,
+			photoPosition.x(),
+			photoPosition.y(),
+			width(),
+			_st.photoSize);
+	} else if (showAuthorHidden()) {
+		Ui::EmptyUserpic::PaintHiddenAuthor(
+			p,
+			photoPosition.x(),
+			photoPosition.y(),
+			width(),
+			_st.photoSize);
 	} else {
 		if (_a_appearance.animating()) {
 			p.drawPixmapLeft(photoPosition, width(), _oldUserpic);
@@ -503,26 +617,23 @@ void UserpicButton::paintEvent(QPaintEvent *e) {
 		paintUserpicFrame(p, photoPosition);
 	}
 
-	const auto fillTranslatedShape = [&](const style::color &color) {
+	const auto fillTranslatedShape = [&](QBrush brush) {
 		p.translate(photoLeft, photoTop);
-		fillShape(p, color);
+		fillShape(p, std::move(brush));
 		p.translate(-photoLeft, -photoTop);
 	};
 
-	if (_role == Role::ChangePhoto || _role == Role::ChoosePhoto) {
+	const auto uploadShown = _uploadOverlay
+		&& _uploadOverlay->shown();
+	if (!uploadShown
+		&& (_role == Role::ChangePhoto || _role == Role::ChoosePhoto)) {
 		auto over = isOver() || isDown();
 		if (over) {
 			fillTranslatedShape(_userpicHasImage
-				? st::msgDateImgBg
-				: _st.changeButton.textBgOver);
+				? st::msgDateImgBg->b
+				: st::shadowFg->b);
 		}
-		paintRipple(
-			p,
-			photoLeft,
-			photoTop,
-			(_userpicHasImage
-				? &st::shadowFg->c
-				: &_st.changeButton.ripple.color->c));
+		paintRipple(p, photoLeft, photoTop, &st::shadowFg->c);
 		if (over || !_userpicHasImage) {
 			auto iconLeft = (_st.changeIconPosition.x() < 0)
 				? (_st.photoSize - _st.changeIcon.width()) / 2
@@ -536,7 +647,7 @@ void UserpicButton::paintEvent(QPaintEvent *e) {
 				photoTop + iconTop,
 				width());
 		}
-	} else if (_changeOverlayEnabled) {
+	} else if (!uploadShown && _changeOverlayEnabled) {
 		auto current = _changeOverlayShown.value(
 			(isOver() || isDown()) ? 1. : 0.);
 		auto barHeight = anim::interpolate(
@@ -568,6 +679,18 @@ void UserpicButton::paintEvent(QPaintEvent *e) {
 			}
 		}
 	}
+	if (uploadShown) {
+		_uploadOverlay->paint(p, QRect(photoPosition, Size(_st.photoSize)), {
+			.lineWidth = _st.uploadProgressLine,
+			.margin = _st.uploadProgressMargin,
+			.progressFg = st::historyFileThumbRadialFg,
+			.overlayFg = st::songCoverOverlayFg,
+			.cancelIcon = &st::userpicUploadCancel,
+			.roundRadius = useForumShape()
+				? (_st.photoSize * ForumUserpicRadiusMultiplier())
+				: 0.,
+		});
+	}
 }
 
 void UserpicButton::paintUserpicFrame(Painter &p, QPoint photoPosition) {
@@ -583,7 +706,8 @@ void UserpicButton::paintUserpicFrame(Painter &p, QPoint photoPosition) {
 		auto size = QSize{ _st.photoSize, _st.photoSize };
 		const auto ratio = style::DevicePixelRatio();
 		request.outer = request.resize = size * ratio;
-		if (useForumShape()) {
+		if (_shape == PeerUserpicShape::Monoforum) {
+		} else if (useForumShape()) {
 			const auto radius = int(_st.photoSize
 				* Ui::ForumUserpicRadiusMultiplier());
 			if (_roundingCorners[0].width() != radius * ratio) {
@@ -596,7 +720,24 @@ void UserpicButton::paintUserpicFrame(Painter &p, QPoint photoPosition) {
 			}
 			request.mask = _ellipseMask;
 		}
-		p.drawImage(QRect(photoPosition, size), _streamed->frame(request));
+		auto frame = _streamed->frame(request);
+
+		if (_shape == PeerUserpicShape::Monoforum) {
+			if (_monoforumMask.isNull()) {
+				_monoforumMask = MonoforumShapeMask(request.resize);
+			}
+			constexpr auto format = QImage::Format_ARGB32_Premultiplied;
+			if (frame.format() != format) {
+				frame = std::move(frame).convertToFormat(format);
+			}
+			auto q = QPainter(&frame);
+			q.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+			q.drawImage(
+				QRect(QPoint(), frame.size() / frame.devicePixelRatio()),
+				_monoforumMask);
+			q.end();
+		}
+		p.drawImage(QRect(photoPosition, size), frame);
 		if (!paused) {
 			_streamed->markFrameShown();
 		}
@@ -691,7 +832,7 @@ bool UserpicButton::createStreamingObjects(not_null<PhotoData*> photo) {
 		nullptr);
 	_streamed->lockPlayer();
 	_streamed->player().updates(
-	) | rpl::start_with_next_error([=](Update &&update) {
+	) | rpl::on_next_error([=](Update &&update) {
 		handleStreamingUpdate(std::move(update));
 	}, [=](Error &&error) {
 		handleStreamingError(std::move(error));
@@ -716,14 +857,15 @@ void UserpicButton::handleStreamingUpdate(Media::Streaming::Update &&update) {
 
 	v::match(update.data, [&](Information &update) {
 		streamingReady(std::move(update));
-	}, [&](const PreloadedVideo &update) {
-	}, [&](const UpdateVideo &update) {
+	}, [](PreloadedVideo) {
+	}, [&](UpdateVideo) {
 		this->update();
-	}, [&](const PreloadedAudio &update) {
-	}, [&](const UpdateAudio &update) {
-	}, [&](const WaitingForData &update) {
-	}, [&](MutedByOther) {
-	}, [&](Finished) {
+	}, [](PreloadedAudio) {
+	}, [](UpdateAudio) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
+	}, [](Finished) {
 	});
 }
 
@@ -826,7 +968,11 @@ void UserpicButton::processNewPeerPhoto() {
 }
 
 bool UserpicButton::useForumShape() const {
-	return _forceForumShape || (_peer && _peer->isForum());
+	return (_shape == PeerUserpicShape::Forum)
+		|| (_peer
+			&& _peer->isForum()
+			&& _shape == PeerUserpicShape::Auto
+			&& !_peer->isBot());
 }
 
 void UserpicButton::grabOldUserpic() {
@@ -869,7 +1015,7 @@ void UserpicButton::switchChangePhotoOverlay(
 			updateCursorInChangeOverlay(
 				mapFromGlobal(QCursor::pos()));
 			if (chosen) {
-				chosenImages() | rpl::start_with_next(chosen, lifetime());
+				chosenImages() | rpl::on_next(chosen, lifetime());
 			}
 		} else {
 			_changeOverlayShown.stop();
@@ -878,8 +1024,8 @@ void UserpicButton::switchChangePhotoOverlay(
 	}
 }
 
-void UserpicButton::forceForumShape(bool force) {
-	_forceForumShape = force;
+void UserpicButton::overrideShape(PeerUserpicShape shape) {
+	_shape = shape;
 	prepare();
 }
 
@@ -890,6 +1036,13 @@ void UserpicButton::showSavedMessagesOnSelf(bool enabled) {
 	}
 }
 
+void UserpicButton::showMyNotesOnSelf(bool enabled) {
+	if (_showMyNotesOnSelf != enabled) {
+		_showMyNotesOnSelf = enabled;
+		update();
+	}
+}
+
 bool UserpicButton::showSavedMessages() const {
 	return _showSavedMessagesOnSelf && _peer && _peer->isSelf();
 }
@@ -898,6 +1051,14 @@ bool UserpicButton::showRepliesMessages() const {
 	return _showSavedMessagesOnSelf && _peer && _peer->isRepliesChat();
 }
 
+bool UserpicButton::showMyNotes() const {
+	return _showMyNotesOnSelf && _peer && _peer->isSelf();
+}
+
+bool UserpicButton::showAuthorHidden() const {
+	return _showMyNotesOnSelf && _peer && _peer->isSavedHiddenAuthor();
+}
+
 void UserpicButton::startChangeOverlayAnimation() {
 	auto over = isOver() || isDown();
 	_changeOverlayShown.start(
@@ -920,6 +1081,14 @@ void UserpicButton::onStateChanged(
 			startChangeOverlayAnimation();
 		}
 	}
+	if (_uploadOverlay && _uploadOverlay->uploading()) {
+		const auto over = isOver() || isDown();
+		const auto wasOver = (was & StateFlag::Over)
+			|| (was & StateFlag::Down);
+		if (over != wasOver) {
+			_uploadOverlay->setOver(over);
+		}
+	}
 }
 
 void UserpicButton::showCustom(QImage &&image) {
@@ -946,7 +1115,7 @@ void UserpicButton::showCustom(QImage &&image) {
 			: Images::Circle(std::move(small)));
 	} else {
 		_userpic = CreateSquarePixmap(_st.photoSize, [&](Painter &p) {
-			fillShape(p, _st.changeButton.textBg);
+			fillShape(p, CreateDefaultGradientBrush(_st.photoSize));
 		});
 	}
 	_userpic.setDevicePixelRatio(style::DevicePixelRatio());
@@ -987,10 +1156,44 @@ rpl::producer<> UserpicButton::resetPersonalRequests() const {
 	return _resetPersonalRequests.events();
 }
 
-void UserpicButton::fillShape(QPainter &p, const style::color &color) const {
+void UserpicButton::showUploadProgress() {
+	if (_uploadOverlay && _uploadOverlay->uploading()) {
+		return;
+	}
+	Expects(_peer != nullptr);
+
+	_uploadOverlay = std::make_unique<UploadProgressOverlay>(
+		this,
+		[=] { update(); });
+	_uploadOverlay->start();
+
+	_peer->session().api().peerPhoto().subscribeToUpload(
+		_peer,
+		_uploadLifetime,
+		{
+			.progress = [=](float64 value) {
+				_uploadOverlay->setProgress(value);
+			},
+			.done = [=] {
+				_uploadOverlay->stop([=] {
+					_uploadLifetime.destroy();
+					_uploadOverlay = nullptr;
+				});
+			},
+			.failed = [=] {
+				_uploadOverlay->fail([=] {
+					_uploadLifetime.destroy();
+					_uploadOverlay = nullptr;
+					showSource(Source::PeerPhoto);
+				});
+			},
+		});
+}
+
+void UserpicButton::fillShape(QPainter &p, QBrush brush) const {
 	PainterHighQualityEnabler hq(p);
 	p.setPen(Qt::NoPen);
-	p.setBrush(color);
+	p.setBrush(brush);
 	const auto size = _st.photoSize;
 	if (useForumShape()) {
 		const auto radius = size * Ui::ForumUserpicRadiusMultiplier();
@@ -1015,28 +1218,11 @@ void UserpicButton::prepareUserpicPixmap() {
 	_userpic = CreateSquarePixmap(size, [&](Painter &p) {
 		if (_userpicHasImage) {
 			if (_showPeerUserpic) {
-				if (useForumShape()) {
-					const auto ratio = style::DevicePixelRatio();
-					if (const auto cloud = _peer->userpicCloudImage(_userpicView)) {
-						Ui::ValidateUserpicCache(
-							_userpicView,
-							cloud,
-							nullptr,
-							size * ratio,
-							true);
-						p.drawImage(QRect(0, 0, size, size), _userpicView.cached);
-					} else {
-						const auto empty = PeerData::GenerateUserpicImage(
-							_peer,
-							_userpicView,
-							size * ratio,
-							(size * ratio)
-								* Ui::ForumUserpicRadiusMultiplier());
-						p.drawImage(QRect(0, 0, size, size), empty);
-					}
-				} else {
-					_peer->paintUserpic(p, _userpicView, 0, 0, size);
-				}
+				_peer->paintUserpic(p, _userpicView, {
+					.position = QPoint(),
+					.size = size,
+					.shape = _shape,
+				});
 			} else if (_nonPersonalView) {
 				using Size = Data::PhotoSize;
 				if (const auto full = _nonPersonalView->image(Size::Large)) {
@@ -1074,7 +1260,7 @@ void UserpicButton::prepareUserpicPixmap() {
 				}
 			}
 		} else {
-			fillShape(p, _st.changeButton.textBg);
+			fillShape(p, CreateDefaultGradientBrush(_st.photoSize));
 		}
 	});
 	_userpicUniqueKey = _userpicHasImage
diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.h b/Telegram/SourceFiles/ui/controls/userpic_button.h
index 07abeec1a22c5e..a23b65c96ef6e4 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.h
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.h
@@ -40,6 +40,8 @@ class ItemBase;
 
 namespace Ui {
 
+class UploadProgressOverlay;
+
 class PopupMenu;
 
 class UserpicButton final : public RippleButton {
@@ -62,18 +64,20 @@ class UserpicButton final : public RippleButton {
 		not_null<::Window::Controller*> window,
 		Role role,
 		const style::UserpicButton &st,
-		bool forceForumShape = false);
+		PeerUserpicShape shape = PeerUserpicShape::Auto);
 	UserpicButton(
 		QWidget *parent,
 		not_null<::Window::SessionController*> controller,
 		not_null<PeerData*> peer,
 		Role role,
 		Source source,
-		const style::UserpicButton &st);
+		const style::UserpicButton &st,
+		PeerUserpicShape shape = PeerUserpicShape::Auto);
 	UserpicButton(
 		QWidget *parent,
 		not_null<PeerData*> peer, // Role::Custom, Source::PeerPhoto
-		const style::UserpicButton &st);
+		const style::UserpicButton &st,
+		PeerUserpicShape shape = PeerUserpicShape::Auto);
 	~UserpicButton();
 
 	enum class ChosenType {
@@ -94,7 +98,8 @@ class UserpicButton final : public RippleButton {
 		bool enabled,
 		Fn<void(ChosenImage)> chosen);
 	void showSavedMessagesOnSelf(bool enabled);
-	void forceForumShape(bool force);
+	void showMyNotesOnSelf(bool enabled);
+	void overrideShape(PeerUserpicShape shape);
 
 	// Role::ChoosePhoto or Role::ChangePhoto
 	[[nodiscard]] rpl::producer<ChosenImage> chosenImages() const {
@@ -108,6 +113,10 @@ class UserpicButton final : public RippleButton {
 	void showSource(Source source);
 	void showCustomOnChosen();
 
+	void showUploadProgress();
+
+	[[nodiscard]] PopupMenu *showChangePhotoMenu();
+
 	void overrideHasPersonalPhoto(bool has);
 	[[nodiscard]] rpl::producer<> resetPersonalRequests() const;
 
@@ -129,7 +138,7 @@ class UserpicButton final : public RippleButton {
 	void processNewPeerPhoto();
 	void startNewPhotoShowing();
 	void prepareUserpicPixmap();
-	void fillShape(QPainter &p, const style::color &color) const;
+	void fillShape(QPainter &p, QBrush brush) const;
 	[[nodiscard]] QPoint countPhotoPosition() const;
 	void startChangeOverlayAnimation();
 	void updateCursorInChangeOverlay(QPoint localPos);
@@ -138,6 +147,8 @@ class UserpicButton final : public RippleButton {
 	void updateVideo();
 	[[nodiscard]] bool showSavedMessages() const;
 	[[nodiscard]] bool showRepliesMessages() const;
+	[[nodiscard]] bool showMyNotes() const;
+	[[nodiscard]] bool showAuthorHidden() const;
 	void checkStreamedIsStarted();
 	bool createStreamingObjects(not_null<PhotoData*> photo);
 	void clearStreaming();
@@ -161,8 +172,9 @@ class UserpicButton final : public RippleButton {
 	::Window::SessionController *_controller = nullptr;
 	::Window::Controller *_window = nullptr;
 	PeerData *_peer = nullptr;
-	bool _forceForumShape = false;
+	PeerUserpicShape _shape = PeerUserpicShape::Auto;
 	PeerUserpicView _userpicView;
+	QImage _monoforumMask;
 	std::shared_ptr<Data::PhotoMedia> _nonPersonalView;
 	Role _role = Role::ChangePhoto;
 	bool _notShownYet = true;
@@ -181,6 +193,7 @@ class UserpicButton final : public RippleButton {
 	base::unique_qptr<PopupMenu> _menu;
 
 	bool _showSavedMessagesOnSelf = false;
+	bool _showMyNotesOnSelf = false;
 	bool _canOpenPhoto = false;
 	bool _cursorInChangeOverlay = false;
 	bool _changeOverlayEnabled = false;
@@ -193,6 +206,9 @@ class UserpicButton final : public RippleButton {
 	rpl::event_stream<> _resetPersonalRequests;
 	rpl::lifetime _sourceLifetime;
 
+	std::unique_ptr<UploadProgressOverlay> _uploadOverlay;
+	rpl::lifetime _uploadLifetime;
+
 };
 
 [[nodiscard]] not_null<Ui::UserpicButton*> CreateUploadSubButton(
diff --git a/Telegram/SourceFiles/ui/controls/warning_tooltip.cpp b/Telegram/SourceFiles/ui/controls/warning_tooltip.cpp
new file mode 100644
index 00000000000000..0e98199f7095d5
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/warning_tooltip.cpp
@@ -0,0 +1,112 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/warning_tooltip.h"
+
+#include "base/timer_rpl.h"
+#include "ui/effects/animation_value.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/ui_utility.h"
+
+#include "styles/style_layers.h"
+#include "styles/style_widgets.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kDefaultWarningTooltipDuration = crl::time(2000);
+
+} // namespace
+
+WarningTooltip::WarningTooltip() = default;
+
+WarningTooltip::~WarningTooltip() {
+	hide(anim::type::instant);
+}
+
+void WarningTooltip::show(Args &&args) {
+	const auto duration = args.duration
+		? args.duration
+		: kDefaultWarningTooltipDuration;
+	const auto maxWidth = args.maxWidth
+		? args.maxWidth
+		: st::boxWideWidth;
+	const auto &tooltipSt = args.st
+		? *args.st
+		: st::defaultImportantTooltip;
+	const auto &labelSt = args.labelSt
+		? *args.labelSt
+		: st::defaultImportantTooltipLabel;
+
+	const auto parent = args.parent.get();
+	const auto target = args.target;
+	const auto side = args.side;
+	auto countPosition = std::move(args.countPosition);
+	const auto tooltip = CreateChild<ImportantTooltip>(
+		parent,
+		MakeNiceTooltipLabel(
+			parent,
+			std::move(args.text),
+			maxWidth,
+			labelSt),
+		tooltipSt);
+	tooltip->toggleFast(false);
+
+	const auto update = [=] {
+		tooltip->pointAt(
+			MapFrom(parent, target, target->rect()),
+			side,
+			countPosition);
+	};
+	parent->widthValue(
+	) | rpl::on_next(update, tooltip->lifetime());
+	update();
+	tooltip->toggleAnimated(true);
+
+	tooltip->shownValue(
+	) | rpl::filter(
+		!rpl::mappers::_1
+	) | rpl::on_next([=] {
+		crl::on_main(tooltip, [=] {
+			if (tooltip->isHidden()) {
+				delete tooltip;
+			}
+		});
+	}, tooltip->lifetime());
+
+	base::timer_once(
+		duration
+	) | rpl::on_next([=] {
+		tooltip->toggleAnimated(false);
+	}, tooltip->lifetime());
+
+	if (_current && _current->tooltip) {
+		_current->tooltip->toggleAnimated(false);
+	}
+	auto entry = std::make_unique<Entry>();
+	entry->tooltip = tooltip;
+	_current = std::move(entry);
+}
+
+void WarningTooltip::hide(anim::type animated) {
+	if (!_current) {
+		return;
+	}
+	const auto raw = _current->tooltip.data();
+	_current.reset();
+	if (!raw) {
+		return;
+	}
+	if (animated == anim::type::instant) {
+		delete raw;
+	} else {
+		raw->toggleAnimated(false);
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/warning_tooltip.h b/Telegram/SourceFiles/ui/controls/warning_tooltip.h
new file mode 100644
index 00000000000000..1787dcd9ffd0e9
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/warning_tooltip.h
@@ -0,0 +1,58 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+#include "ui/rect_part.h"
+#include "ui/text/text_entity.h"
+
+#include <QtCore/QPointer>
+
+namespace style {
+struct ImportantTooltip;
+struct FlatLabel;
+} // namespace style
+
+namespace anim {
+enum class type : uchar;
+} // namespace anim
+
+namespace Ui {
+
+class ImportantTooltip;
+class RpWidget;
+
+class WarningTooltip final {
+public:
+	struct Args {
+		not_null<RpWidget*> parent;
+		not_null<QWidget*> target;
+		rpl::producer<TextWithEntities> text;
+		RectParts side = RectPart::Top;
+		int maxWidth = 0;
+		Fn<QPoint(QSize)> countPosition;
+		crl::time duration = 0;
+		const style::ImportantTooltip *st = nullptr;
+		const style::FlatLabel *labelSt = nullptr;
+	};
+
+	WarningTooltip();
+	~WarningTooltip();
+
+	void show(Args &&args);
+	void hide(anim::type animated);
+
+private:
+	struct Entry {
+		QPointer<ImportantTooltip> tooltip;
+	};
+	std::unique_ptr<Entry> _current;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
index 37a15de627d415..bb659f5e5ad7f8 100644
--- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
+++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.cpp
@@ -12,14 +12,21 @@ For license and copyright information please follow this link:
 #include "ui/widgets/popup_menu.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/chat/group_call_userpics.h"
+#include "ui/image/image_prepare.h"
+#include "ui/round_rect.h"
 #include "ui/text/text_custom_emoji.h"
+#include "ui/emoji_config.h"
 #include "ui/painter.h"
+#include "ui/power_saving.h"
 #include "ui/ui_utility.h"
 #include "lang/lang_keys.h"
+#include "styles/style_basic.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
 
+#include <QtCore/QLocale>
+
 namespace Lang {
 namespace {
 
@@ -82,7 +89,8 @@ class Action final : public Menu::ItemBase {
 		rpl::producer<WhoReadContent> content,
 		CustomEmojiFactory factory,
 		Fn<void(WhoReadParticipant)> participantChosen,
-		Fn<void()> showAllChosen);
+		Fn<void()> showAllChosen,
+		Fn<void(WhoReadParticipant)> moderateReactionChosen);
 
 	bool isEnabled() const override;
 	not_null<QAction*> action() const override;
@@ -108,6 +116,7 @@ class Action final : public Menu::ItemBase {
 	const not_null<QAction*> _dummyAction;
 	const Fn<void(WhoReadParticipant)> _participantChosen;
 	const Fn<void()> _showAllChosen;
+	const Fn<void(WhoReadParticipant)> _moderateReactionChosen;
 	const std::unique_ptr<GroupCallUserpics> _userpics;
 	const style::Menu &_st;
 	const CustomEmojiFactory _customEmojiFactory;
@@ -171,6 +180,83 @@ TextParseOptions MenuTextOptions = {
 	Qt::LayoutDirectionAuto, // dir
 };
 
+struct CloseBadgeCache {
+	QImage badge;
+	QImage mask;
+};
+
+[[nodiscard]] QPainterPath WhoReactedCloseBadgePath(const QRect &rect) {
+	return Ui::ComplexRoundedRectPath(
+		rect,
+		0,
+		0,
+		st::whoReadCloseVisibleRadius,
+		0);
+}
+
+[[nodiscard]] QPoint WhoReactedCloseIconPosition(
+		const QRect &rect,
+		const style::icon &icon) {
+	auto position = st::whoReadClose.iconPosition;
+	if (position.x() < 0) {
+		position.setX((rect.width() - icon.width()) / 2);
+	}
+	if (position.y() < 0) {
+		position.setY((rect.height() - icon.height()) / 2);
+	}
+	return rect.topLeft() + position;
+}
+
+[[nodiscard]] CloseBadgeCache GenerateWhoReactedCloseBadgeCache(
+		QSize closeSize,
+		const style::color &fill,
+		const style::color &shadowColor) {
+	if (closeSize.isEmpty()) {
+		return {};
+	}
+	const auto blur = st::whoReadCloseBlurPadding;
+	const auto ratio = style::DevicePixelRatio();
+	const auto badgeRect = QRect(QPoint(blur, blur), closeSize);
+	const auto maskRect = QRect(QPoint(), closeSize);
+	const auto outer = badgeRect.marginsAdded(QMargins(blur, blur, blur, blur));
+
+	auto badge = QImage(
+		outer.size() * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	badge.setDevicePixelRatio(ratio);
+	badge.fill(Qt::transparent);
+	{
+		Painter p(&badge);
+		auto hq = PainterHighQualityEnabler(p);
+		auto shadow = shadowColor->c;
+		shadow.setAlphaF(shadow.alphaF() * 0.18);
+		p.setPen(Qt::NoPen);
+		p.setBrush(shadow);
+		p.drawPath(WhoReactedCloseBadgePath(badgeRect));
+	}
+	badge = Images::Blur(std::move(badge), true);
+	badge.setDevicePixelRatio(ratio);
+	{
+		Painter p(&badge);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(fill);
+		p.drawPath(WhoReactedCloseBadgePath(badgeRect));
+	}
+	auto mask = Ui::RippleAnimation::MaskByDrawer(
+		closeSize,
+		false,
+		[&](QPainter &p) {
+			p.setPen(Qt::NoPen);
+			p.setBrush(Qt::white);
+			p.drawPath(WhoReactedCloseBadgePath(maskRect));
+		});
+	return {
+		.badge = std::move(badge),
+		.mask = std::move(mask),
+	};
+}
+
 [[nodiscard]] QString FormatReactedString(int reacted, int seen) {
 	const auto projection = [&](const QString &text) {
 		return Lang::StringWithReacted{ text, seen };
@@ -183,39 +269,51 @@ TextParseOptions MenuTextOptions = {
 	).text;
 }
 
+[[nodiscard]] QString FormatReactionsCountString(int count) {
+	return tr::lng_context_seen_reactions_count(
+		tr::now,
+		lt_count_short,
+		count);
+}
+
 Action::Action(
 	not_null<PopupMenu*> parentMenu,
 	rpl::producer<WhoReadContent> content,
 	Text::CustomEmojiFactory factory,
 	Fn<void(WhoReadParticipant)> participantChosen,
-	Fn<void()> showAllChosen)
+	Fn<void()> showAllChosen,
+	Fn<void(WhoReadParticipant)> moderateReactionChosen)
 : ItemBase(parentMenu->menu(), parentMenu->menu()->st())
 , _parentMenu(parentMenu)
 , _dummyAction(CreateChild<QAction>(parentMenu->menu().get()))
 , _participantChosen(std::move(participantChosen))
 , _showAllChosen(std::move(showAllChosen))
+, _moderateReactionChosen(std::move(moderateReactionChosen))
 , _userpics(std::make_unique<GroupCallUserpics>(
 	st::defaultWhoRead.userpics,
 	rpl::never<bool>(),
 	[=] { update(); }))
 , _st(parentMenu->menu()->st())
 , _customEmojiFactory(std::move(factory))
-, _submenu(_customEmojiFactory, _participantChosen, _showAllChosen)
+, _submenu(
+	_customEmojiFactory,
+	_participantChosen,
+	_showAllChosen,
+	_moderateReactionChosen)
 , _height(st::defaultWhoRead.itemPadding.top()
 		+ _st.itemStyle.font->height
 		+ st::defaultWhoRead.itemPadding.bottom()) {
-	const auto parent = parentMenu->menu();
 	const auto delay = anim::Disabled() ? 0 : parentMenu->st().duration;
 	const auto checkAppeared = [=, now = crl::now()](bool force = false) {
 		_appeared = force || ((crl::now() - now) >= delay);
 	};
 
 	setAcceptBoth(true);
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 
 	std::move(
 		content
-	) | rpl::start_with_next([=](WhoReadContent &&content) {
+	) | rpl::on_next([=](WhoReadContent &&content) {
 		checkAppeared();
 		const auto changed = (_content.participants != content.participants)
 			|| (_content.state != content.state);
@@ -237,20 +335,20 @@ Action::Action(
 	resolveMinWidth();
 
 	_userpics->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_userpicsWidth = width;
 		refreshDimensions();
 		update();
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
 
 	clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_content.participants.size() == 1) {
 			if (const auto onstack = _participantChosen) {
 				onstack(_content.participants.front());
@@ -292,7 +390,15 @@ void Action::resolveMinWidth() {
 				lt_count_short,
 				_content.fullReactionsCount))
 		: QString();
-	const auto maxTextWidth = std::max(width(maxText), width(maxReacted));
+	const auto maxReactionsCount = (_content.fullReactionsCount
+			> _content.fullReadCount)
+		? FormatReactionsCountString(_content.fullReactionsCount)
+		: QString();
+	const auto maxTextWidth = std::max({
+		width(maxText),
+		width(maxReacted),
+		width(maxReactionsCount),
+	});
 	const auto maxWidth = st::defaultWhoRead.itemPadding.left()
 		+ maxIconWidth
 		+ maxTextWidth
@@ -356,7 +462,7 @@ void Action::paint(Painter &p) {
 	if (!_custom && !_content.singleCustomEntityData.isEmpty()) {
 		_custom = _customEmojiFactory(
 			_content.singleCustomEntityData,
-			[=] { update(); });
+			{ .repaint = [=] { update(); } });
 	}
 	if (_custom) {
 		const auto ratio = style::DevicePixelRatio();
@@ -365,10 +471,12 @@ void Action::paint(Painter &p) {
 		const auto x = st::defaultWhoRead.iconPosition.x()
 			+ (st::whoReadChecks.width() - adjusted) / 2;
 		const auto y = (_height - adjusted) / 2;
+		const auto inactive = !window()->isActiveWindow();
 		_custom->paint(p, {
 			.textColor = (selected ? _st.itemFgOver : _st.itemFg)->c,
 			.now = crl::now(),
 			.position = { x, y },
+			.paused = inactive || On(PowerSaving::kEmojiChat),
 		});
 	} else {
 		const auto &icon = (_content.fullReactionsCount)
@@ -432,10 +540,12 @@ void Action::refreshText() {
 				|| (count > 0 && _content.fullReactionsCount > usersCount)
 				|| (count > 0 && onlySeenCount == 0))
 			? (count
-				? tr::lng_context_seen_reacted(
-					tr::now,
-					lt_count_short,
-					count)
+				? ((_content.fullReactionsCount > _content.fullReadCount)
+					? FormatReactionsCountString(_content.fullReactionsCount)
+					: tr::lng_context_seen_reacted(
+						tr::now,
+						lt_count_short,
+						count))
 				: tr::lng_context_seen_reacted_none(tr::now))
 			: (_content.type == WhoReadType::Watched)
 			? (count
@@ -513,14 +623,12 @@ WhenAction::WhenAction(
 , _height(st::whenReadPadding.top()
 		+ st::whenReadStyle.font->height
 		+ st::whenReadPadding.bottom()) {
-	const auto parent = parentMenu->menu();
-
 	setAcceptBoth(true);
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 
 	std::move(
 		content
-	) | rpl::start_with_next([=](WhoReadContent &&content) {
+	) | rpl::on_next([=](WhoReadContent &&content) {
 		_content = content;
 		refreshText();
 		refreshDimensions();
@@ -536,13 +644,13 @@ WhenAction::WhenAction(
 	refreshDimensions();
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Painter p(this);
 		paint(p);
 	}, lifetime());
 
 	clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_content.state == WhoReadState::MyHidden) {
 			if (const auto onstack = _showOrPremium) {
 				onstack();
@@ -597,7 +705,11 @@ void WhenAction::paint(Painter &p) {
 		p.fillRect(0, 0, width(), _height, _st.itemBg);
 	}
 	p.fillRect(0, 0, width(), _height, _st.itemBg);
-	const auto &icon = loading
+	const auto &icon = (_content.type == WhoReadType::Edited)
+		? (selected ? st::whenEditedOver : st::whenEdited)
+		: (_content.type == WhoReadType::Original)
+		? (selected ? st::whenOriginalOver : st::whenOriginal)
+		: loading
 		? st::whoReadChecksDisabled
 		: selected
 		? st::whoReadChecksOver
@@ -717,7 +829,7 @@ int WhenAction::contentHeight() const {
 } // namespace
 
 WhoReactedEntryAction::WhoReactedEntryAction(
-	not_null<RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	CustomEmojiFactory customEmojiFactory,
 	const style::Menu &st,
 	Data &&data)
@@ -728,15 +840,40 @@ WhoReactedEntryAction::WhoReactedEntryAction(
 , _height(st::defaultWhoRead.photoSkip * 2 + st::defaultWhoRead.photoSize) {
 	setAcceptBoth(true);
 
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 	setData(std::move(data));
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		paint(Painter(this));
 	}, lifetime());
 
 	enableMouseSelecting();
+	selects(
+	) | rpl::on_next([=](const auto &) {
+		refreshCloseMouseTracking();
+		updateCloseHovered(QCursor::pos());
+	}, lifetime());
+
+	style::PaletteChanged() | rpl::on_next([=] {
+		invalidateCloseCache();
+		update();
+	}, lifetime());
+
+	events() | rpl::on_next([=](not_null<QEvent*> e) {
+		if (e->type() != QEvent::Leave) {
+			return;
+		}
+		if (!_closeHovered && !_closePressed) {
+			return;
+		}
+		_closeHovered = false;
+		_closePressed = false;
+		_closeRippleActive = false;
+		finishAnimating();
+		invalidateCloseCache();
+		update();
+	}, lifetime());
 }
 
 not_null<QAction*> WhoReactedEntryAction::action() const {
@@ -751,8 +888,165 @@ int WhoReactedEntryAction::contentHeight() const {
 	return _height;
 }
 
+void WhoReactedEntryAction::mousePressEvent(QMouseEvent *e) {
+	updateCloseHovered(e->globalPos());
+	const auto menu = static_cast<Menu::Menu*>(parentWidget());
+	if (!menu->hasMouseMoved(e->globalPos())) {
+		return;
+	}
+	const auto closePressed = closeAffordanceActive()
+		&& (e->button() == Qt::LeftButton)
+		&& _closeRect.contains(e->pos());
+	if (!closePressed) {
+		_closePressed = false;
+		_closeRippleActive = false;
+		ItemBase::mousePressEvent(e);
+		return;
+	}
+	if (!_closeHovered) {
+		_closeHovered = true;
+		finishAnimating();
+		invalidateCloseCache();
+		update();
+	}
+	_closePressed = true;
+	_closeRippleActive = true;
+	RippleButton::mousePressEvent(e);
+}
+
+void WhoReactedEntryAction::mouseMoveEvent(QMouseEvent *e) {
+	if (_closePressed) {
+		const auto menu = static_cast<Menu::Menu*>(parentWidget());
+		menu->mouseMoved();
+		if (!menu->hasMouseMoved(e->globalPos())) {
+			return;
+		}
+		RippleButton::mouseMoveEvent(e);
+		updateCloseHovered(e->globalPos());
+		return;
+	}
+	ItemBase::mouseMoveEvent(e);
+	updateCloseHovered(e->globalPos());
+}
+
+void WhoReactedEntryAction::mouseReleaseEvent(QMouseEvent *e) {
+	const auto menu = static_cast<Menu::Menu*>(parentWidget());
+	if (!menu->hasMouseMoved(e->globalPos())) {
+		return;
+	}
+	if (!base::take(_closePressed)) {
+		const auto weak = base::make_weak(this);
+		ItemBase::mouseReleaseEvent(e);
+		if (weak) {
+			updateCloseHovered(e->globalPos());
+		}
+		return;
+	}
+	const auto overRow = rect().contains(e->pos());
+	const auto overClose = closeAffordanceActive()
+		&& overRow
+		&& _closeRect.contains(e->pos());
+	if (isOver()) {
+		setOver(false, StateChangeSource::ByPress);
+	}
+	if (isDown()) {
+		setDown(
+			false,
+			StateChangeSource::ByPress,
+			e->modifiers(),
+			e->button());
+	}
+	if (overRow) {
+		setOver(true, StateChangeSource::ByHover);
+	}
+	updateCloseHovered(e->globalPos());
+	if (overClose && _closeCallback) {
+		_closeCallback();
+	}
+}
+
+void WhoReactedEntryAction::resizeEvent(QResizeEvent *e) {
+	ItemBase::resizeEvent(e);
+	refreshCloseGeometry();
+	invalidateCloseCache();
+	updateCloseHovered(QCursor::pos());
+}
+
+QPoint WhoReactedEntryAction::prepareRippleStartPosition() const {
+	const auto result = mapFromGlobal(QCursor::pos());
+	return (_closeRippleActive && !_closeRect.isEmpty())
+		? (result - _closeRect.topLeft())
+		: result;
+}
+
+QImage WhoReactedEntryAction::prepareRippleMask() const {
+	if (!_closeRippleActive || _closeRect.isEmpty()) {
+		return Ui::RippleAnimation::RectMask(size());
+	}
+	if (_closeBadgeMask.isNull()) {
+		auto cache = GenerateWhoReactedCloseBadgeCache(
+			_closeRect.size(),
+			_st.itemBgOver,
+			_st.itemBgOver);
+		_closeBadgeMask = std::move(cache.mask);
+	}
+	return _closeBadgeMask;
+}
+
+bool WhoReactedEntryAction::closeAffordanceActive() const {
+	return _closeCallback
+		&& isSelected()
+		&& (lastTriggeredSource() == Menu::TriggeredSource::Mouse);
+}
+
+void WhoReactedEntryAction::refreshCloseMouseTracking() {
+	setMouseTracking(bool(_closeCallback) || !isSelected());
+}
+
+void WhoReactedEntryAction::refreshCloseGeometry() {
+	if (!_closeCallback) {
+		_closeRect = QRect();
+		return;
+	}
+	_closeRect = QRect(
+		width() - st::whoReadClose.width,
+		0,
+		st::whoReadClose.width,
+		st::whoReadClose.height);
+}
+
+void WhoReactedEntryAction::updateCloseHovered(QPoint globalPosition) {
+	const auto hovered = closeAffordanceActive()
+		&& _closeRect.contains(mapFromGlobal(globalPosition));
+	if (_closeHovered == hovered) {
+		return;
+	}
+	_closeHovered = hovered;
+	finishAnimating();
+	invalidateCloseCache();
+	update();
+}
+
+void WhoReactedEntryAction::clearCloseState() {
+	_closeHovered = false;
+	_closePressed = false;
+	_closeRippleActive = false;
+	finishAnimating();
+}
+
+void WhoReactedEntryAction::invalidateCloseCache() {
+	_closeBadge = QImage();
+	_closeBadgeMask = QImage();
+}
+
 void WhoReactedEntryAction::setData(Data &&data) {
-	setClickedCallback(std::move(data.callback));
+	setActionTriggered(std::move(data.callback));
+	clearCloseState();
+	_closeCallback = std::move(data.closeCallback);
+	if (!_closeCallback) {
+		_closeRect = QRect();
+		invalidateCloseCache();
+	}
 	_userpic = std::move(data.userpic);
 	_text.setMarkedText(_st.itemStyle, { data.text }, MenuTextOptions);
 	if (data.date.isEmpty()) {
@@ -765,7 +1059,9 @@ void WhoReactedEntryAction::setData(Data &&data) {
 	}
 	_type = data.type;
 	_custom = _customEmojiFactory
-		? _customEmojiFactory(data.customEntityData, [=] { update(); })
+		? _customEmojiFactory(
+			data.customEntityData,
+			{ .repaint = [=] { update(); } })
 		: nullptr;
 	const auto ratio = style::DevicePixelRatio();
 	const auto size = Emoji::GetSizeNormal() / ratio;
@@ -782,17 +1078,24 @@ void WhoReactedEntryAction::setData(Data &&data) {
 	const auto w = std::clamp(goodWidth, _st.widthMin, _st.widthMax);
 	_textWidth = w - (goodWidth - textWidth);
 	setMinWidth(w);
+	refreshCloseGeometry();
+	refreshCloseMouseTracking();
+	invalidateCloseCache();
+	updateCloseHovered(QCursor::pos());
 	update();
 }
 
 void WhoReactedEntryAction::paint(Painter &&p) {
 	const auto enabled = isEnabled();
-	const auto selected = isSelected();
+	const auto badgeShown = closeAffordanceActive();
+	const auto closeHovered = badgeShown && _closeHovered;
+	const auto selected = isSelected() && !closeHovered;
 	if (selected && _st.itemBgOver->c.alpha() < 255) {
 		p.fillRect(0, 0, width(), _height, _st.itemBg);
 	}
-	p.fillRect(0, 0, width(), _height, selected ? _st.itemBgOver : _st.itemBg);
-	if (enabled) {
+	const auto bg = selected ? _st.itemBgOver : _st.itemBg;
+	p.fillRect(0, 0, width(), _height, bg);
+	if (enabled && (!_closeRippleActive || _closeRect.isEmpty())) {
 		paintRipple(p, 0, 0);
 	}
 	const auto photoSize = st::defaultWhoRead.photoSize;
@@ -812,6 +1115,18 @@ void WhoReactedEntryAction::paint(Painter &&p) {
 		p.drawEllipse(photoLeft, photoTop, photoSize, photoSize);
 	} else if (!_userpic.isNull()) {
 		p.drawImage(photoLeft, photoTop, _userpic);
+		if (_type == WhoReactedType::RefRecipientNow) {
+			auto hq = PainterHighQualityEnabler(p);
+			p.setBrush(Qt::NoBrush);
+			auto bgPen = bg->p;
+			bgPen.setWidthF(st::lineWidth * 6.);
+			p.setPen(bgPen);
+			p.drawEllipse(photoLeft, photoTop, photoSize, photoSize);
+			auto fgPen = st::windowBgActive->p;
+			fgPen.setWidthF(st::lineWidth * 2.);
+			p.setPen(fgPen);
+			p.drawEllipse(photoLeft, photoTop, photoSize, photoSize);
+		}
 	} else if (!_custom) {
 		st::menuIconReactions.paintInCenter(
 			p,
@@ -847,7 +1162,16 @@ void WhoReactedEntryAction::paint(Painter &&p) {
 			_textWidth,
 			width());
 	}
-	if (withDate) {
+	if (_type == WhoReactedType::RefRecipient
+		|| _type == WhoReactedType::RefRecipientNow) {
+		p.setPen(selected ? _st.itemFgShortcutOver : _st.itemFgShortcut);
+		_date.drawLeftElided(
+			p,
+			st::defaultWhoRead.nameLeft,
+			st::whoReadDateTop,
+			_textWidth,
+			width());
+	} else if (withDate) {
 		const auto iconPosition = QPoint(
 			st::defaultWhoRead.nameLeft,
 			st::whoReadDateTop) + st::whoReadDateChecksPosition;
@@ -885,20 +1209,49 @@ void WhoReactedEntryAction::paint(Painter &&p) {
 		const auto ratio = style::DevicePixelRatio();
 		const auto size = Emoji::GetSizeNormal() / ratio;
 		const auto skip = (size - _customSize) / 2;
+		const auto inactive = !window()->isActiveWindow();
 		_custom->paint(p, {
 			.textColor = (selected ? _st.itemFgOver : _st.itemFg)->c,
 			.now = crl::now(),
 			.position = QPoint(
 				width() - _st.itemPadding.right() - size + skip,
 				(height() - _customSize) / 2),
+			.paused = inactive || On(PowerSaving::kEmojiChat),
 		});
 	}
+	if (badgeShown && !_closeRect.isEmpty()) {
+		if (_closeBadge.isNull()) {
+			auto cache = GenerateWhoReactedCloseBadgeCache(
+				_closeRect.size(),
+				_st.itemBgOver,
+				_st.itemBgOver);
+			_closeBadge = std::move(cache.badge);
+			_closeBadgeMask = std::move(cache.mask);
+		}
+		const auto blur = st::whoReadCloseBlurPadding;
+		p.drawImage(
+			_closeRect.topLeft() - QPoint(blur, blur),
+			_closeBadge);
+		if (enabled && _closeRippleActive) {
+			paintRipple(p, _closeRect.topLeft());
+		}
+		const auto &icon = closeHovered
+			? st::whoReadClose.iconOver
+			: st::whoReadClose.icon;
+		icon.paint(
+			p,
+			WhoReactedCloseIconPosition(_closeRect, icon),
+			width());
+	}
 }
 
 bool operator==(const WhoReadParticipant &a, const WhoReadParticipant &b) {
 	return (a.id == b.id)
 		&& (a.name == b.name)
 		&& (a.date == b.date)
+		&& (a.self == b.self)
+		&& (a.customEntityData == b.customEntityData)
+		&& (a.reaction == b.reaction)
 		&& (a.userpicKey == b.userpicKey);
 }
 
@@ -911,13 +1264,15 @@ base::unique_qptr<Menu::ItemBase> WhoReactedContextAction(
 		rpl::producer<WhoReadContent> content,
 		CustomEmojiFactory factory,
 		Fn<void(WhoReadParticipant)> participantChosen,
-		Fn<void()> showAllChosen) {
+		Fn<void()> showAllChosen,
+		Fn<void(WhoReadParticipant)> moderateReactionChosen) {
 	return base::make_unique_q<Action>(
 		menu,
 		std::move(content),
 		std::move(factory),
 		std::move(participantChosen),
-		std::move(showAllChosen));
+		std::move(showAllChosen),
+		std::move(moderateReactionChosen));
 }
 
 base::unique_qptr<Menu::ItemBase> WhenReadContextAction(
@@ -933,10 +1288,12 @@ base::unique_qptr<Menu::ItemBase> WhenReadContextAction(
 WhoReactedListMenu::WhoReactedListMenu(
 	CustomEmojiFactory factory,
 	Fn<void(WhoReadParticipant)> participantChosen,
-	Fn<void()> showAllChosen)
+	Fn<void()> showAllChosen,
+	Fn<void(WhoReadParticipant)> moderateReactionChosen)
 : _customEmojiFactory(std::move(factory))
 , _participantChosen(std::move(participantChosen))
-, _showAllChosen(std::move(showAllChosen)) {
+, _showAllChosen(std::move(showAllChosen))
+, _moderateReactionChosen(std::move(moderateReactionChosen)) {
 }
 
 void WhoReactedListMenu::clear() {
@@ -987,6 +1344,13 @@ void WhoReactedListMenu::populate(
 		const auto chosen = [call = _participantChosen, participant] {
 			call(participant);
 		};
+		const auto closeChosen = (!participant.customEntityData.isEmpty()
+			&& _moderateReactionChosen
+			&& !participant.self)
+			? Fn<void()>([
+				call = _moderateReactionChosen,
+				participant] { call(participant); })
+			: Fn<void()>();
 		append({
 			.text = participant.name,
 			.date = participant.date,
@@ -996,6 +1360,7 @@ void WhoReactedListMenu::populate(
 			.customEntityData = participant.customEntityData,
 			.userpic = participant.userpicLarge,
 			.callback = chosen,
+			.closeCallback = std::move(closeChosen),
 		});
 	}
 	if (addShowAll) {
diff --git a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h
index 74e3f0d5440d17..cd3cbf7877db4c 100644
--- a/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h
+++ b/Telegram/SourceFiles/ui/controls/who_reacted_context_action.h
@@ -8,8 +8,9 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "base/unique_qptr.h"
-#include "ui/text/text_block.h"
 #include "ui/widgets/menu/menu_item_base.h"
+#include "ui/text/text_custom_emoji.h"
+#include "data/data_message_reaction_id.h"
 
 namespace Ui {
 
@@ -19,7 +20,9 @@ struct WhoReadParticipant {
 	QString name;
 	QString date;
 	bool dateReacted = false;
+	bool self = false;
 	QString customEntityData;
+	Data::ReactionId reaction;
 	QImage userpicSmall;
 	QImage userpicLarge;
 	std::pair<uint64, uint64> userpicKey = {};
@@ -36,6 +39,8 @@ enum class WhoReadType {
 	Listened,
 	Watched,
 	Reacted,
+	Edited,
+	Original,
 };
 
 enum class WhoReadState : uchar {
@@ -60,12 +65,13 @@ struct WhoReadContent {
 	rpl::producer<WhoReadContent> content,
 	Text::CustomEmojiFactory factory,
 	Fn<void(WhoReadParticipant)> participantChosen,
-	Fn<void()> showAllChosen);
+	Fn<void()> showAllChosen,
+	Fn<void(WhoReadParticipant)> moderateReactionChosen = nullptr);
 
 [[nodiscard]] base::unique_qptr<Menu::ItemBase> WhenReadContextAction(
 	not_null<PopupMenu*> menu,
 	rpl::producer<WhoReadContent> content,
-	Fn<void()> showOrPremium);
+	Fn<void()> showOrPremium = nullptr);
 
 enum class WhoReactedType : uchar {
 	Viewed,
@@ -73,6 +79,8 @@ enum class WhoReactedType : uchar {
 	Reposted,
 	Forwarded,
 	Preloader,
+	RefRecipient,
+	RefRecipientNow,
 };
 
 struct WhoReactedEntryData {
@@ -82,6 +90,7 @@ struct WhoReactedEntryData {
 	QString customEntityData;
 	QImage userpic;
 	Fn<void()> callback;
+	Fn<void()> closeCallback;
 };
 
 class WhoReactedEntryAction final : public Menu::ItemBase {
@@ -89,7 +98,7 @@ class WhoReactedEntryAction final : public Menu::ItemBase {
 	using Data = WhoReactedEntryData;
 
 	WhoReactedEntryAction(
-		not_null<RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		Text::CustomEmojiFactory factory,
 		const style::Menu &st,
 		Data &&data);
@@ -101,8 +110,20 @@ class WhoReactedEntryAction final : public Menu::ItemBase {
 
 private:
 	int contentHeight() const override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+	QPoint prepareRippleStartPosition() const override;
+	QImage prepareRippleMask() const override;
 
 	void paint(Painter &&p);
+	[[nodiscard]] bool closeAffordanceActive() const;
+	void refreshCloseMouseTracking();
+	void refreshCloseGeometry();
+	void updateCloseHovered(QPoint globalPosition);
+	void clearCloseState();
+	void invalidateCloseCache();
 
 	const not_null<QAction*> _dummyAction;
 	const Text::CustomEmojiFactory _customEmojiFactory;
@@ -116,6 +137,13 @@ class WhoReactedEntryAction final : public Menu::ItemBase {
 	int _textWidth = 0;
 	int _customSize = 0;
 	WhoReactedType _type = WhoReactedType::Viewed;
+	Fn<void()> _closeCallback;
+	QRect _closeRect;
+	bool _closeHovered = false;
+	bool _closePressed = false;
+	bool _closeRippleActive = false;
+	mutable QImage _closeBadge;
+	mutable QImage _closeBadgeMask;
 
 };
 
@@ -124,7 +152,8 @@ class WhoReactedListMenu final {
 	WhoReactedListMenu(
 		Text::CustomEmojiFactory factory,
 		Fn<void(WhoReadParticipant)> participantChosen,
-		Fn<void()> showAllChosen);
+		Fn<void()> showAllChosen,
+		Fn<void(WhoReadParticipant)> moderateReactionChosen = nullptr);
 
 	void clear();
 	void populate(
@@ -138,6 +167,7 @@ class WhoReactedListMenu final {
 	const Text::CustomEmojiFactory _customEmojiFactory;
 	const Fn<void(WhoReadParticipant)> _participantChosen;
 	const Fn<void()> _showAllChosen;
+	const Fn<void(WhoReadParticipant)> _moderateReactionChosen;
 
 	std::vector<not_null<WhoReactedEntryAction*>> _actions;
 
diff --git a/Telegram/SourceFiles/ui/controls/window_outdated_bar.cpp b/Telegram/SourceFiles/ui/controls/window_outdated_bar.cpp
index 69c38d049d0fe2..bc65141e0d79be 100644
--- a/Telegram/SourceFiles/ui/controls/window_outdated_bar.cpp
+++ b/Telegram/SourceFiles/ui/controls/window_outdated_bar.cpp
@@ -10,7 +10,6 @@ For license and copyright information please follow this link:
 #include "ui/widgets/labels.h" // Ui::FlatLabel
 #include "ui/widgets/buttons.h" // Ui::IconButton
 #include "ui/wrap/slide_wrap.h" // Ui::SlideWrap
-#include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "base/platform/base_platform_info.h"
 #include "lang/lang_keys.h"
 #include "styles/style_window.h"
@@ -47,15 +46,15 @@ class Bar final : public RpWidget {
 [[nodiscard]] rpl::producer<QString> OutdatedReasonPhrase() {
 	const auto why = Platform::WhySystemBecomesOutdated();
 	return (why == Platform::OutdateReason::Is32Bit)
-		? tr::lng_outdated_title_bits()
-		: tr::lng_outdated_title();
+		? tr::lng_outdated_title_bits(tr::upper)
+		: tr::lng_outdated_title(tr::upper);
 }
 
 Bar::Bar(not_null<QWidget*> parent, QDate date)
 : _date(date)
 , _title(
 	this,
-	OutdatedReasonPhrase() | Text::ToUpper(),
+	OutdatedReasonPhrase(),
 	st::windowOutdatedTitle)
 , _details(this,
 	QString(),
@@ -166,7 +165,7 @@ object_ptr<RpWidget> CreateOutdatedBar(
 	const auto wrap = result.data();
 
 	wrap->entity()->hideClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		wrap->toggle(false, anim::type::normal);
 		Closed(workingPath);
 	}, wrap->lifetime());
diff --git a/Telegram/SourceFiles/ui/controls/window_screen_reader_bar.cpp b/Telegram/SourceFiles/ui/controls/window_screen_reader_bar.cpp
new file mode 100644
index 00000000000000..8920ecff58c4ab
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/window_screen_reader_bar.cpp
@@ -0,0 +1,218 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/window_screen_reader_bar.h"
+
+#include "lang/lang_keys.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/painter.h"
+#include "ui/rp_widget.h"
+#include "ui/screen_reader_mode.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/slide_wrap.h"
+#include "styles/style_window.h"
+
+namespace Ui {
+namespace {
+
+class DisableButton final : public RippleButton {
+public:
+	explicit DisableButton(QWidget *parent);
+
+	QAccessible::Role accessibilityRole() override;
+	QString accessibilityName() override;
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+	QString _text;
+	int _textWidth = 0;
+
+};
+
+class InaccessibleLabel final : public FlatLabel {
+public:
+	using FlatLabel::FlatLabel;
+
+	QAccessible::Role accessibilityRole() override;
+	QString accessibilityName() override;
+
+};
+
+class Bar final : public RpWidget {
+public:
+	explicit Bar(not_null<QWidget*> parent);
+
+	QAccessible::Role accessibilityRole() override;
+	QString accessibilityName() override;
+
+	int resizeGetHeight(int newWidth) override;
+
+	[[nodiscard]] rpl::producer<> disableClicks() const;
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	int accessibilityChildCount() const override;
+
+	object_ptr<InaccessibleLabel> _label;
+	object_ptr<DisableButton> _disable;
+
+};
+
+DisableButton::DisableButton(QWidget *parent)
+: RippleButton(parent, st::windowScreenReaderButtonRipple) {
+	_text = tr::lng_screen_reader_bar_disable(tr::now);
+	_textWidth = st::windowScreenReaderDisableTextStyle.font->width(_text);
+	const auto padding = st::windowScreenReaderButtonPadding;
+	setFixedSize(
+		padding.left() + _textWidth + padding.right(),
+		st::windowScreenReaderButtonHeight);
+}
+
+void DisableButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	p.fillRect(e->rect(), st::activeButtonBg);
+	paintRipple(p, 0, 0);
+
+	auto hq = PainterHighQualityEnabler(p);
+	const auto border = st::windowScreenReaderButtonBorderWidth;
+	const auto half = border / 2.;
+	const auto radius = st::windowScreenReaderButtonRadius;
+
+	p.setPen(QPen(st::activeButtonFg, border));
+	p.setBrush(Qt::NoBrush);
+	p.drawRoundedRect(
+		QRectF(rect()).marginsRemoved(QMarginsF(half, half, half, half)),
+		radius,
+		radius);
+
+	const auto &font = st::windowScreenReaderDisableTextStyle.font;
+	p.setFont(font);
+	p.setPen(st::activeButtonFg);
+	p.drawText(
+		(width() - _textWidth) / 2,
+		(height() - font->height) / 2 + font->ascent,
+		_text);
+}
+
+QImage DisableButton::prepareRippleMask() const {
+	return RippleAnimation::RoundRectMask(
+		size(),
+		st::windowScreenReaderButtonRadius);
+}
+
+QPoint DisableButton::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos());
+}
+
+QAccessible::Role DisableButton::accessibilityRole() {
+	return QAccessible::NoRole;
+}
+
+QString DisableButton::accessibilityName() {
+	return QString();
+}
+
+QAccessible::Role InaccessibleLabel::accessibilityRole() {
+	return QAccessible::Role::NoRole;
+}
+
+QString InaccessibleLabel::accessibilityName() {
+	return QString();
+}
+
+Bar::Bar(not_null<QWidget*> parent)
+: RpWidget(parent)
+, _label(
+	this,
+	tr::lng_screen_reader_bar_text(),
+	st::windowScreenReaderLabel)
+, _disable(object_ptr<DisableButton>(this)) {
+}
+
+int Bar::resizeGetHeight(int newWidth) {
+	const auto padding = st::windowScreenReaderPadding;
+	const auto available = newWidth
+		- padding.left()
+		- padding.right()
+		- _disable->width()
+		- padding.left();
+
+	_label->resizeToWidth(available);
+
+	const auto contentHeight = std::max(
+		_label->height(),
+		_disable->height());
+	const auto height = contentHeight + padding.top() + padding.bottom();
+
+	_label->moveToLeft(
+		padding.left(),
+		padding.top() + (contentHeight - _label->height()) / 2,
+		newWidth);
+
+	_disable->moveToRight(
+		padding.right(),
+		padding.top() + (contentHeight - _disable->height()) / 2,
+		newWidth);
+
+	return height;
+}
+
+void Bar::paintEvent(QPaintEvent *e) {
+	QPainter(this).fillRect(e->rect(), st::activeButtonBg);
+}
+
+rpl::producer<> Bar::disableClicks() const {
+	return _disable->clicks() | rpl::to_empty;
+}
+
+QAccessible::Role Bar::accessibilityRole() {
+	return QAccessible::NoRole;
+}
+
+QString Bar::accessibilityName() {
+	return QString();
+}
+
+int Bar::accessibilityChildCount() const {
+	return 0;
+}
+
+} // namespace
+
+object_ptr<RpWidget> CreateScreenReaderBar(
+		not_null<QWidget*> parent,
+		Fn<void()> disableCallback) {
+	auto result = object_ptr<SlideWrap<Bar>>(
+		parent.get(),
+		object_ptr<Bar>(parent.get()));
+	const auto wrap = result.data();
+
+	wrap->entity()->disableClicks(
+	) | rpl::on_next([=] {
+		if (disableCallback) {
+			disableCallback();
+		}
+	}, wrap->lifetime());
+
+	Ui::ScreenReaderModeActiveValue(
+	) | rpl::on_next([=](bool active) {
+		wrap->toggle(active, anim::type::normal);
+	}, wrap->lifetime());
+
+	wrap->toggle(Ui::ScreenReaderModeActive(), anim::type::instant);
+
+	wrap->entity()->resizeToWidth(st::windowMinWidth);
+
+	return result;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/window_screen_reader_bar.h b/Telegram/SourceFiles/ui/controls/window_screen_reader_bar.h
new file mode 100644
index 00000000000000..83605a66e58418
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/window_screen_reader_bar.h
@@ -0,0 +1,19 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+
+namespace Ui {
+class RpWidget;
+
+[[nodiscard]] object_ptr<RpWidget> CreateScreenReaderBar(
+	not_null<QWidget*> parent,
+	Fn<void()> disableCallback);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp
index bdf77d1c186989..52c1d4625c7302 100644
--- a/Telegram/SourceFiles/ui/countryinput.cpp
+++ b/Telegram/SourceFiles/ui/countryinput.cpp
@@ -29,6 +29,7 @@ CountryInput::CountryInput(
 , _st(st)
 , _text(tr::lng_country_code(tr::now)) {
 	resize(_st.width, _st.heightMin);
+	setFocusPolicy(Qt::StrongFocus);
 }
 
 void CountryInput::paintEvent(QPaintEvent *e) {
@@ -72,10 +73,10 @@ void CountryInput::mousePressEvent(QMouseEvent *e) {
 	mouseMoveEvent(e);
 	if (_active) {
 		auto object = Box<Ui::CountrySelectBox>();
-		const auto box = Ui::MakeWeak(object.data());
+		const auto box = base::make_weak(object.data());
 		_show->showBox(std::move(object), Ui::LayerOption::CloseOther);
 		box->entryChosen(
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const Ui::CountrySelectBox::Entry &entry) {
 			if (box) {
 				box->closeBox();
@@ -103,6 +104,42 @@ void CountryInput::mousePressEvent(QMouseEvent *e) {
 	}
 }
 
+void CountryInput::keyPressEvent(QKeyEvent* e) {
+	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return || e->key() == Qt::Key_Space) {
+		auto object = Box<Ui::CountrySelectBox>();
+		const auto box = base::make_weak(object.data());
+		_show->showBox(std::move(object), Ui::LayerOption::CloseOther);
+		box->entryChosen(
+		) | rpl::on_next([=](
+			const Ui::CountrySelectBox::Entry& entry) {
+				if (box) {
+					box->closeBox();
+				}
+
+				const auto& list = Countries::Instance().list();
+				const auto infoIt = ranges::find(
+					list,
+					entry.iso2,
+					&Countries::Info::iso2);
+				if (infoIt == end(list)) {
+					return;
+				}
+				const auto info = *infoIt;
+				const auto it = ranges::find(
+					info.codes,
+					entry.code,
+					&Countries::CallingCodeInfo::callingCode);
+				if (it != end(info.codes)) {
+					chooseCountry(
+						&info,
+						std::distance(begin(info.codes), it));
+				}
+			}, lifetime());
+	} else {
+		RpWidget::keyPressEvent(e);
+	}
+}
+
 void CountryInput::enterEventHook(QEnterEvent *e) {
 	setMouseTracking(true);
 }
@@ -162,4 +199,5 @@ void CountryInput::setText(const QString &newText) {
 	_text = _st.style.font->elided(
 		newText,
 		width() - _st.textMargins.left() - _st.textMargins.right());
+	accessibilityNameChanged();
 }
diff --git a/Telegram/SourceFiles/ui/countryinput.h b/Telegram/SourceFiles/ui/countryinput.h
index 3ce0f04c6c079c..76068dcc761fd3 100644
--- a/Telegram/SourceFiles/ui/countryinput.h
+++ b/Telegram/SourceFiles/ui/countryinput.h
@@ -28,6 +28,13 @@ class CountryInput : public Ui::RpWidget {
 		std::shared_ptr<Ui::Show> show,
 		const style::InputField &st);
 
+	QAccessible::Role accessibilityRole() override {
+		return QAccessible::Role::PushButton;
+	}
+	QString accessibilityName() override {
+		return _text;
+	}
+
 	[[nodiscard]] QString iso() const {
 		return _chosenIso;
 	}
@@ -41,6 +48,7 @@ class CountryInput : public Ui::RpWidget {
 	void paintEvent(QPaintEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
+	void keyPressEvent(QKeyEvent* e) override;
 	void enterEventHook(QEnterEvent *e) override;
 	void leaveEventHook(QEvent *e) override;
 
diff --git a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
index 868e95cb549752..ad584c12c05ad4 100644
--- a/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
+++ b/Telegram/SourceFiles/ui/dynamic_thumbnails.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "ui/dynamic_thumbnails.h"
 
 #include "data/data_changes.h"
+#include "data/data_cloud_file.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_file_origin.h"
@@ -17,15 +18,26 @@ For license and copyright information please follow this link:
 #include "data/data_session.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_story.h"
+#include "layout/layout_document_generic_preview.h"
 #include "main/main_session.h"
 #include "ui/empty_userpic.h"
 #include "ui/dynamic_image.h"
+#include "ui/image/image_prepare.h"
 #include "ui/painter.h"
+#include "ui/text/text_custom_emoji.h"
 #include "ui/userpic_view.h"
+#include "styles/style_chat.h"
+#include "styles/style_overview.h"
 
 namespace Ui {
 namespace {
 
+enum class MediaThumbnailMode {
+	Crop,
+	CenterCrop,
+	Fit,
+};
+
 class PeerUserpic final : public DynamicImage {
 public:
 	PeerUserpic(not_null<PeerData*> peer, bool forceRound);
@@ -59,9 +71,12 @@ class PeerUserpic final : public DynamicImage {
 
 };
 
-class StoryThumbnail : public DynamicImage {
+class MediaThumbnail : public DynamicImage {
 public:
-	explicit StoryThumbnail(FullStoryId id);
+	explicit MediaThumbnail(
+		Data::FileOrigin origin,
+		bool forceRound,
+		MediaThumbnailMode mode);
 
 	QImage image(int size) override;
 	void subscribeToUpdates(Fn<void()> callback) override;
@@ -72,14 +87,18 @@ class StoryThumbnail : public DynamicImage {
 		bool blurred = false;
 	};
 
-	[[nodiscard]] FullStoryId id() const;
+	[[nodiscard]] Data::FileOrigin origin() const;
+	[[nodiscard]] bool forceRound() const;
+	[[nodiscard]] MediaThumbnailMode mode() const;
 
 	[[nodiscard]] virtual Main::Session &session() = 0;
-	[[nodiscard]] virtual Thumb loaded(FullStoryId id) = 0;
+	[[nodiscard]] virtual Thumb loaded(Data::FileOrigin origin) = 0;
 	virtual void clear() = 0;
 
 private:
-	const FullStoryId _id;
+	const Data::FileOrigin _origin;
+	const bool _forceRound;
+	const MediaThumbnailMode _mode;
 	QImage _full;
 	rpl::lifetime _subscription;
 	QImage _prepared;
@@ -87,15 +106,19 @@ class StoryThumbnail : public DynamicImage {
 
 };
 
-class PhotoThumbnail final : public StoryThumbnail {
+class PhotoThumbnail final : public MediaThumbnail {
 public:
-	PhotoThumbnail(not_null<PhotoData*> photo, FullStoryId id);
+	PhotoThumbnail(
+		not_null<PhotoData*> photo,
+		Data::FileOrigin origin,
+		bool forceRound,
+		MediaThumbnailMode mode);
 
 	std::shared_ptr<DynamicImage> clone() override;
 
 private:
 	Main::Session &session() override;
-	Thumb loaded(FullStoryId id) override;
+	Thumb loaded(Data::FileOrigin origin) override;
 	void clear() override;
 
 	const not_null<PhotoData*> _photo;
@@ -103,15 +126,19 @@ class PhotoThumbnail final : public StoryThumbnail {
 
 };
 
-class VideoThumbnail final : public StoryThumbnail {
+class VideoThumbnail final : public MediaThumbnail {
 public:
-	VideoThumbnail(not_null<DocumentData*> video, FullStoryId id);
+	VideoThumbnail(
+		not_null<DocumentData*> video,
+		Data::FileOrigin origin,
+		bool forceRound,
+		MediaThumbnailMode mode);
 
 	std::shared_ptr<DynamicImage> clone() override;
 
 private:
 	Main::Session &session() override;
-	Thumb loaded(FullStoryId id) override;
+	Thumb loaded(Data::FileOrigin origin) override;
 	void clear() override;
 
 	const not_null<DocumentData*> _video;
@@ -119,6 +146,20 @@ class VideoThumbnail final : public StoryThumbnail {
 
 };
 
+class CallThumbnail final : public DynamicImage {
+public:
+	CallThumbnail();
+
+	std::shared_ptr<DynamicImage> clone() override;
+
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	QImage _prepared;
+
+};
+
 class EmptyThumbnail final : public DynamicImage {
 public:
 	std::shared_ptr<DynamicImage> clone() override;
@@ -188,7 +229,12 @@ class IconThumbnail final : public DynamicImage {
 
 class EmojiThumbnail final : public DynamicImage {
 public:
-	EmojiThumbnail(not_null<Data::Session*> owner, const QString &data);
+	EmojiThumbnail(
+		not_null<Data::Session*> owner,
+		const QString &data,
+		int loopLimit,
+		Fn<bool()> paused,
+		Fn<QColor()> textColor);
 
 	std::shared_ptr<DynamicImage> clone() override;
 
@@ -198,11 +244,65 @@ class EmojiThumbnail final : public DynamicImage {
 private:
 	const not_null<Data::Session*> _owner;
 	const QString _data;
+	const int _loopLimit = 0;
 	std::unique_ptr<Ui::Text::CustomEmoji> _emoji;
+	Fn<bool()> _paused;
+	Fn<QColor()> _textColor;
 	QImage _frame;
 
 };
 
+class GeoThumbnail final : public DynamicImage {
+public:
+	GeoThumbnail(
+		not_null<Data::CloudImage*> data,
+		not_null<Main::Session*> session,
+		Data::FileOrigin origin,
+		bool drawPin);
+
+	std::shared_ptr<DynamicImage> clone() override;
+
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	const not_null<Data::CloudImage*> _data;
+	const not_null<Main::Session*> _session;
+	const Data::FileOrigin _origin;
+	const bool _drawPin;
+	std::shared_ptr<QImage> _view;
+	QImage _prepared;
+	int _paletteVersion = 0;
+	rpl::lifetime _subscription;
+
+};
+
+class DocumentFilePreviewThumbnail final : public DynamicImage {
+public:
+	DocumentFilePreviewThumbnail(
+		not_null<DocumentData*> document,
+		Data::FileOrigin origin);
+
+	std::shared_ptr<DynamicImage> clone() override;
+
+	QImage image(int size) override;
+	void subscribeToUpdates(Fn<void()> callback) override;
+
+private:
+	[[nodiscard]] QImage prepareThumbImage(int size);
+	[[nodiscard]] QImage prepareGenericImage(int size);
+
+	const not_null<DocumentData*> _document;
+	const Data::FileOrigin _origin;
+	const ::Layout::DocumentGenericPreview _generic;
+	std::shared_ptr<Data::DocumentMedia> _media;
+	QImage _prepared;
+	bool _thumbLoaded = false;
+	int _paletteVersion = 0;
+	rpl::lifetime _subscription;
+
+};
+
 PeerUserpic::PeerUserpic(not_null<PeerData*> peer, bool forceRound)
 : _peer(peer)
 , _forceRound(forceRound) {
@@ -236,22 +336,13 @@ QImage PeerUserpic::image(int size) {
 
 		auto p = Painter(&_frame);
 		auto &view = _subscribed->view;
-		if (!_forceRound) {
-			_peer->paintUserpic(p, view, 0, 0, size);
-		} else if (const auto cloud = _peer->userpicCloudImage(view)) {
-			const auto full = size * style::DevicePixelRatio();
-			Ui::ValidateUserpicCache(view, cloud, nullptr, full, false);
-			p.drawImage(QRect(0, 0, size, size), view.cached);
-		} else {
-			const auto full = size * style::DevicePixelRatio();
-			const auto r = full / 2.;
-			const auto empty = PeerData::GenerateUserpicImage(
-				_peer,
-				view,
-				full,
-				r);
-			p.drawImage(QRect(0, 0, size, size), empty);
-		}
+		_peer->paintUserpic(p, view, {
+			.position = QPoint(),
+			.size = size,
+			.shape = (_forceRound
+				? Ui::PeerUserpicShape::Circle
+				: Ui::PeerUserpicShape::Auto),
+		});
 	}
 	return _frame;
 }
@@ -272,7 +363,7 @@ void PeerUserpic::subscribeToUpdates(Fn<void()> callback) {
 	_peer->session().changes().peerUpdates(
 		_peer,
 		Data::PeerUpdate::Flag::Photo
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_subscribed->callback();
 		processNewPhoto();
 	}, _subscribed->photoLifetime);
@@ -290,39 +381,76 @@ void PeerUserpic::processNewPhoto() {
 	_peer->session().downloaderTaskFinished(
 	) | rpl::filter([=] {
 		return !waitingUserpicLoad();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		_subscribed->callback();
 		_subscribed->downloadLifetime.destroy();
 	}, _subscribed->downloadLifetime);
 }
 
-StoryThumbnail::StoryThumbnail(FullStoryId id)
-: _id(id) {
+MediaThumbnail::MediaThumbnail(
+		Data::FileOrigin origin,
+		bool forceRound,
+		MediaThumbnailMode mode)
+: _origin(origin)
+, _forceRound(forceRound)
+, _mode(mode) {
 }
 
-QImage StoryThumbnail::image(int size) {
+QImage MediaThumbnail::image(int size) {
 	const auto ratio = style::DevicePixelRatio();
 	if (_prepared.width() != size * ratio) {
+		const auto full = QSize(size, size) * ratio;
 		if (_full.isNull()) {
 			_prepared = QImage(
-				QSize(size, size) * ratio,
+				full,
 				QImage::Format_ARGB32_Premultiplied);
-			_prepared.fill(Qt::black);
+			_prepared.setDevicePixelRatio(ratio);
+			_prepared.fill(_mode == MediaThumbnailMode::Fit
+				? Qt::transparent
+				: Qt::black);
+		} else if (_mode == MediaThumbnailMode::Fit) {
+			auto scaled = _full.scaled(
+				full,
+				Qt::KeepAspectRatio,
+				Qt::SmoothTransformation);
+			const auto scaledSize = QSizeF(scaled.size()) / ratio;
+			scaled.setDevicePixelRatio(ratio);
+			_prepared = QImage(full, QImage::Format_ARGB32_Premultiplied);
+			_prepared.setDevicePixelRatio(ratio);
+			_prepared.fill(Qt::transparent);
+
+			auto p = QPainter(&_prepared);
+			p.drawImage(
+				QPointF(
+					(size - scaledSize.width()) / 2.,
+					(size - scaledSize.height()) / 2.),
+				scaled);
 		} else {
-			const auto width = _full.width();
-			const auto skip = std::max((_full.height() - width) / 2, 0);
-			_prepared = _full.copy(0, skip, width, width).scaled(
+			auto source = QRect();
+			if (_mode == MediaThumbnailMode::CenterCrop) {
+				const auto side = std::min(_full.width(), _full.height());
+				const auto x = (_full.width() - side) / 2;
+				const auto y = (_full.height() - side) / 2;
+				source = QRect(x, y, side, side);
+			} else {
+				const auto width = _full.width();
+				const auto skip = std::max((_full.height() - width) / 2, 0);
+				source = QRect(0, skip, width, width);
+			}
+			_prepared = _full.copy(source).scaled(
 				QSize(size, size) * ratio,
 				Qt::IgnoreAspectRatio,
 				Qt::SmoothTransformation);
 		}
-		_prepared = Images::Circle(std::move(_prepared));
+		if (_forceRound) {
+			_prepared = Images::Circle(std::move(_prepared));
+		}
 		_prepared.setDevicePixelRatio(ratio);
 	}
 	return _prepared;
 }
 
-void StoryThumbnail::subscribeToUpdates(Fn<void()> callback) {
+void MediaThumbnail::subscribeToUpdates(Fn<void()> callback) {
 	_subscription.destroy();
 	if (!callback) {
 		clear();
@@ -330,7 +458,7 @@ void StoryThumbnail::subscribeToUpdates(Fn<void()> callback) {
 	} else if (!_full.isNull() && !_blurred) {
 		return;
 	}
-	const auto thumbnail = loaded(_id);
+	const auto thumbnail = loaded(_origin);
 	if (const auto image = thumbnail.image) {
 		_full = image->original();
 	}
@@ -340,7 +468,7 @@ void StoryThumbnail::subscribeToUpdates(Fn<void()> callback) {
 	} else {
 		_subscription = session().downloaderTaskFinished(
 		) | rpl::filter([=] {
-			const auto thumbnail = loaded(_id);
+			const auto thumbnail = loaded(_origin);
 			if (!thumbnail.blurred) {
 				_full = thumbnail.image->original();
 				_prepared = QImage();
@@ -348,31 +476,47 @@ void StoryThumbnail::subscribeToUpdates(Fn<void()> callback) {
 				return true;
 			}
 			return false;
-		}) | rpl::take(1) | rpl::start_with_next(callback);
+		}) | rpl::take(1) | rpl::on_next(callback);
 	}
 }
 
-FullStoryId StoryThumbnail::id() const {
-	return _id;
+Data::FileOrigin MediaThumbnail::origin() const {
+	return _origin;
 }
 
-PhotoThumbnail::PhotoThumbnail(not_null<PhotoData*> photo, FullStoryId id)
-: StoryThumbnail(id)
+bool MediaThumbnail::forceRound() const {
+	return _forceRound;
+}
+
+MediaThumbnailMode MediaThumbnail::mode() const {
+	return _mode;
+}
+
+PhotoThumbnail::PhotoThumbnail(
+	not_null<PhotoData*> photo,
+	Data::FileOrigin origin,
+	bool forceRound,
+	MediaThumbnailMode mode)
+: MediaThumbnail(origin, forceRound, mode)
 , _photo(photo) {
 }
 
 std::shared_ptr<DynamicImage> PhotoThumbnail::clone() {
-	return std::make_shared<PhotoThumbnail>(_photo, id());
+	return std::make_shared<PhotoThumbnail>(
+		_photo,
+		origin(),
+		forceRound(),
+		mode());
 }
 
 Main::Session &PhotoThumbnail::session() {
 	return _photo->session();
 }
 
-StoryThumbnail::Thumb PhotoThumbnail::loaded(FullStoryId id) {
+MediaThumbnail::Thumb PhotoThumbnail::loaded(Data::FileOrigin origin) {
 	if (!_media) {
 		_media = _photo->createMediaView();
-		_media->wanted(Data::PhotoSize::Small, id);
+		_media->wanted(Data::PhotoSize::Small, origin);
 	}
 	if (const auto small = _media->image(Data::PhotoSize::Small)) {
 		return { .image = small };
@@ -386,23 +530,29 @@ void PhotoThumbnail::clear() {
 
 VideoThumbnail::VideoThumbnail(
 	not_null<DocumentData*> video,
-	FullStoryId id)
-: StoryThumbnail(id)
+	Data::FileOrigin origin,
+	bool forceRound,
+	MediaThumbnailMode mode)
+: MediaThumbnail(origin, forceRound, mode)
 , _video(video) {
 }
 
 std::shared_ptr<DynamicImage> VideoThumbnail::clone() {
-	return std::make_shared<VideoThumbnail>(_video, id());
+	return std::make_shared<VideoThumbnail>(
+		_video,
+		origin(),
+		forceRound(),
+		mode());
 }
 
 Main::Session &VideoThumbnail::session() {
 	return _video->session();
 }
 
-StoryThumbnail::Thumb VideoThumbnail::loaded(FullStoryId id) {
+MediaThumbnail::Thumb VideoThumbnail::loaded(Data::FileOrigin origin) {
 	if (!_media) {
 		_media = _video->createMediaView();
-		_media->thumbnailWanted(id);
+		_media->thumbnailWanted(origin);
 	}
 	if (const auto small = _media->thumbnail()) {
 		return { .image = small };
@@ -414,6 +564,28 @@ void VideoThumbnail::clear() {
 	_media = nullptr;
 }
 
+CallThumbnail::CallThumbnail() = default;
+
+std::shared_ptr<DynamicImage> CallThumbnail::clone() {
+	return std::make_shared<CallThumbnail>();
+}
+
+QImage CallThumbnail::image(int size) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto full = QSize(size, size) * ratio;
+	if (_prepared.size() != full) {
+		_prepared = QImage(full, QImage::Format_ARGB32_Premultiplied);
+		_prepared.fill(Qt::black);
+		_prepared.setDevicePixelRatio(ratio);
+
+		_prepared = Images::Circle(std::move(_prepared));
+	}
+	return _prepared;
+}
+
+void CallThumbnail::subscribeToUpdates(Fn<void()> callback) {
+}
+
 std::shared_ptr<DynamicImage> EmptyThumbnail::clone() {
 	return std::make_shared<EmptyThumbnail>();
 }
@@ -562,9 +734,15 @@ void IconThumbnail::subscribeToUpdates(Fn<void()> callback) {
 
 EmojiThumbnail::EmojiThumbnail(
 	not_null<Data::Session*> owner,
-	const QString &data)
+	const QString &data,
+	int loopLimit,
+	Fn<bool()> paused,
+	Fn<QColor()> textColor)
 : _owner(owner)
-, _data(data) {
+, _data(data)
+, _loopLimit(loopLimit)
+, _paused(std::move(paused))
+, _textColor(std::move(textColor)) {
 }
 
 void EmojiThumbnail::subscribeToUpdates(Fn<void()> callback) {
@@ -572,18 +750,30 @@ void EmojiThumbnail::subscribeToUpdates(Fn<void()> callback) {
 		_emoji = nullptr;
 		return;
 	}
-	_emoji = _owner->customEmojiManager().create(
+	auto emoji = _owner->customEmojiManager().create(
 		_data,
 		std::move(callback),
 		Data::CustomEmojiSizeTag::Large);
+	_emoji = (_loopLimit > 0)
+		? MakeWrappedEmoji<Ui::Text::LimitedLoopsEmoji>(
+			std::move(emoji),
+			_loopLimit)
+		: std::move(emoji);
 }
 
 std::shared_ptr<DynamicImage> EmojiThumbnail::clone() {
-	return std::make_shared<EmojiThumbnail>(_owner, _data);
+	return std::make_shared<EmojiThumbnail>(
+		_owner,
+		_data,
+		_loopLimit,
+		_paused,
+		_textColor);
 }
 
 QImage EmojiThumbnail::image(int size) {
-	Expects(_emoji != nullptr);
+	if (!_emoji) {
+		return QImage();
+	}
 
 	const auto ratio = style::DevicePixelRatio();
 	const auto good = (_frame.width() == size * _frame.devicePixelRatio());
@@ -595,18 +785,278 @@ QImage EmojiThumbnail::image(int size) {
 	}
 	_frame.fill(Qt::transparent);
 
+	const auto esize = Text::AdjustCustomEmojiSize(
+		Emoji::GetSizeLarge() / style::DevicePixelRatio());
+	const auto eskip = (size - esize) / 2;
+
 	auto p = Painter(&_frame);
 	_emoji->paint(p, {
-		.textColor = st::windowBoldFg->c,
+		.textColor = _textColor ? _textColor() : st::windowBoldFg->c,
 		.now = crl::now(),
-		.position = QPoint(0, 0),
-		.paused = false,
+		.position = QPoint(eskip, eskip),
+		.paused = _paused && _paused(),
 	});
 	p.end();
 
 	return _frame;
 }
 
+GeoThumbnail::GeoThumbnail(
+	not_null<Data::CloudImage*> data,
+	not_null<Main::Session*> session,
+	Data::FileOrigin origin,
+	bool drawPin)
+: _data(data)
+, _session(session)
+, _origin(origin)
+, _drawPin(drawPin) {
+}
+
+std::shared_ptr<DynamicImage> GeoThumbnail::clone() {
+	return std::make_shared<GeoThumbnail>(
+		_data,
+		_session,
+		_origin,
+		_drawPin);
+}
+
+QImage GeoThumbnail::image(int size) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto full = QSize(size, size) * ratio;
+	const auto paletteVersion = style::PaletteVersion();
+	if (_prepared.size() == full && _paletteVersion == paletteVersion) {
+		return _prepared;
+	}
+	_paletteVersion = paletteVersion;
+
+	const auto loaded = _view ? *_view : QImage();
+	if (loaded.isNull()) {
+		_prepared = QImage(full, QImage::Format_ARGB32_Premultiplied);
+		_prepared.fill(Qt::black);
+	} else {
+		const auto w = loaded.width();
+		const auto h = loaded.height();
+		const auto side = std::min(w, h);
+		const auto x = (w - side) / 2;
+		const auto y = (h - side) / 2;
+		_prepared = loaded.copy(x, y, side, side).scaled(
+			full,
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation);
+	}
+	_prepared = Images::Round(
+		std::move(_prepared),
+		ImageRoundRadius::Small);
+	_prepared.setDevicePixelRatio(ratio);
+	if (_drawPin && !loaded.isNull()) {
+		auto p = Painter(&_prepared);
+		auto hq = PainterHighQualityEnabler(p);
+		const auto pinScale = std::min(
+			1.0,
+			size / (st::historyMapPoint.height() * 2.5));
+		const auto center = QPointF(size / 2.0, size / 2.0);
+		p.translate(center);
+		p.scale(pinScale, pinScale);
+		p.translate(-center);
+		const auto paintMarker = [&](const style::icon &icon) {
+			icon.paint(
+				p,
+				(size - icon.width()) / 2,
+				(size / 2) - icon.height(),
+				size);
+		};
+		paintMarker(st::historyMapPoint);
+		paintMarker(st::historyMapPointInner);
+	}
+	return _prepared;
+}
+
+void GeoThumbnail::subscribeToUpdates(Fn<void()> callback) {
+	_subscription.destroy();
+	if (!callback) {
+		_view = nullptr;
+		_prepared = QImage();
+		return;
+	}
+	_view = _data->createView();
+	_data->load(_session, _origin);
+	if (!_view->isNull()) {
+		return;
+	}
+	_subscription = _session->downloaderTaskFinished(
+	) | rpl::filter([=] {
+		return !_view->isNull();
+	}) | rpl::take(1) | rpl::on_next([=] {
+		_prepared = QImage();
+		callback();
+	});
+}
+
+DocumentFilePreviewThumbnail::DocumentFilePreviewThumbnail(
+	not_null<DocumentData*> document,
+	Data::FileOrigin origin)
+: _document(document)
+, _origin(origin)
+, _generic(::Layout::DocumentGenericPreview::Create(document)) {
+}
+
+std::shared_ptr<DynamicImage> DocumentFilePreviewThumbnail::clone() {
+	return std::make_shared<DocumentFilePreviewThumbnail>(
+		_document,
+		_origin);
+}
+
+QImage DocumentFilePreviewThumbnail::image(int size) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto paletteVersion = style::PaletteVersion();
+	const auto good = (_prepared.width() == size * ratio);
+	if (good && _paletteVersion == paletteVersion) {
+		return _prepared;
+	}
+	_paletteVersion = paletteVersion;
+
+	if (_media) {
+		const auto thumbnail = _media->thumbnail();
+		const auto blurred = _media->thumbnailInline();
+		if (thumbnail || blurred) {
+			_prepared = prepareThumbImage(size);
+			if (!_prepared.isNull()) {
+				return _prepared;
+			}
+		}
+	}
+	_prepared = prepareGenericImage(size);
+	return _prepared;
+}
+
+QImage DocumentFilePreviewThumbnail::prepareThumbImage(int size) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto thumbnail = _media->thumbnail();
+	const auto blurred = _media->thumbnailInline();
+	const auto image = thumbnail ? thumbnail : blurred;
+	if (!image) {
+		return {};
+	}
+	auto full = image->original();
+	const auto side = std::min(full.width(), full.height());
+	const auto x = (full.width() - side) / 2;
+	const auto y = (full.height() - side) / 2;
+	auto result = full.copy(x, y, side, side).scaled(
+		QSize(size, size) * ratio,
+		Qt::IgnoreAspectRatio,
+		Qt::SmoothTransformation);
+	result = Images::Round(
+		std::move(result),
+		ImageRoundRadius::Small);
+	result.setDevicePixelRatio(ratio);
+	return result;
+}
+
+QImage DocumentFilePreviewThumbnail::prepareGenericImage(int size) {
+	const auto ratio = style::DevicePixelRatio();
+	auto result = QImage(
+		QSize(size, size) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	result.fill(Qt::transparent);
+	result.setDevicePixelRatio(ratio);
+
+	const auto radius = size / 6;
+	const auto foldSize = size / 4;
+
+	auto p = QPainter(&result);
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+
+	// Rounded rect with top-right corner cut for fold.
+	auto path = QPainterPath();
+	path.moveTo(radius, 0);
+	path.lineTo(size - foldSize, 0);
+	path.lineTo(size, foldSize);
+	path.lineTo(size, size - radius);
+	path.arcTo(
+		size - 2 * radius,
+		size - 2 * radius,
+		2 * radius,
+		2 * radius,
+		0,
+		-90);
+	path.lineTo(radius, size);
+	path.arcTo(0, size - 2 * radius, 2 * radius, 2 * radius, 270, -90);
+	path.lineTo(0, radius);
+	path.arcTo(0, 0, 2 * radius, 2 * radius, 180, -90);
+	path.closeSubpath();
+
+	p.setBrush(_generic.color);
+	p.drawPath(path);
+
+	// Fold triangle.
+	auto fold = QPainterPath();
+	fold.moveTo(size - foldSize, 0);
+	fold.lineTo(size, foldSize);
+	fold.lineTo(size - foldSize, foldSize);
+	fold.closeSubpath();
+	p.setBrush(_generic.dark);
+	p.drawPath(fold);
+
+	if (!_generic.ext.isEmpty()) {
+		// Reference: overview uses 18px font in a 70px square.
+		const auto refSize = st::overviewFileLayout.fileThumbSize;
+		const auto fontSize = std::max(
+			size * st::overviewFileExtFont->f.pixelSize() / refSize,
+			8);
+		const auto font = style::font(
+			fontSize,
+			st::overviewFileExtFont->flags(),
+			st::overviewFileExtFont->family());
+		const auto padding = size * st::overviewFileExtPadding / refSize;
+		const auto maxw = size - padding * 2;
+		auto ext = _generic.ext;
+		auto extw = font->width(ext);
+		if (extw > maxw) {
+			ext = font->elided(ext, maxw, Qt::ElideMiddle);
+			extw = font->width(ext);
+		}
+		p.setFont(font);
+		p.setPen(st::overviewFileExtFg);
+		p.drawText(
+			(size - extw) / 2,
+			(size - font->height) / 2 + font->ascent,
+			ext);
+	}
+	p.end();
+	return result;
+}
+
+void DocumentFilePreviewThumbnail::subscribeToUpdates(Fn<void()> callback) {
+	_subscription.destroy();
+	if (!callback) {
+		_media = nullptr;
+		_prepared = QImage();
+		return;
+	}
+	if (!_document->hasThumbnail()) {
+		return;
+	}
+	if (!_media) {
+		_media = _document->createMediaView();
+		_media->thumbnailWanted(_origin);
+	}
+	if (_media->thumbnail()) {
+		_thumbLoaded = true;
+		return;
+	}
+	if (!_thumbLoaded) {
+		_subscription = _document->session().downloaderTaskFinished(
+		) | rpl::filter([=] {
+			return _media && _media->thumbnail();
+		}) | rpl::take(1) | rpl::on_next([=] {
+			_thumbLoaded = true;
+			_prepared = QImage();
+			callback();
+		});
+	}
+}
+
 } // namespace
 
 std::shared_ptr<DynamicImage> MakeUserpicThumbnail(
@@ -633,10 +1083,20 @@ std::shared_ptr<DynamicImage> MakeStoryThumbnail(
 	const auto id = story->fullId();
 	return v::match(story->media().data, [](v::null_t) -> Result {
 		return std::make_shared<EmptyThumbnail>();
+	}, [](const std::shared_ptr<Data::GroupCall> &call) -> Result {
+		return std::make_shared<CallThumbnail>();
 	}, [&](not_null<PhotoData*> photo) -> Result {
-		return std::make_shared<PhotoThumbnail>(photo, id);
+		return std::make_shared<PhotoThumbnail>(
+			photo,
+			id,
+			true,
+			MediaThumbnailMode::Crop);
 	}, [&](not_null<DocumentData*> video) -> Result {
-		return std::make_shared<VideoThumbnail>(video, id);
+		return std::make_shared<VideoThumbnail>(
+			video,
+			id,
+			true,
+			MediaThumbnailMode::Crop);
 	});
 }
 
@@ -646,8 +1106,106 @@ std::shared_ptr<DynamicImage> MakeIconThumbnail(const style::icon &icon) {
 
 std::shared_ptr<DynamicImage> MakeEmojiThumbnail(
 		not_null<Data::Session*> owner,
-		const QString &data) {
-	return std::make_shared<EmojiThumbnail>(owner, data);
+		const QString &data,
+		Fn<bool()> paused,
+		Fn<QColor()> textColor,
+		int loopLimit) {
+	return std::make_shared<EmojiThumbnail>(
+		owner,
+		data,
+		loopLimit,
+		std::move(paused),
+		std::move(textColor));
+}
+
+std::shared_ptr<DynamicImage> MakePhotoThumbnail(
+		not_null<PhotoData*> photo,
+		FullMsgId fullId) {
+	return std::make_shared<PhotoThumbnail>(
+		photo,
+		fullId,
+		false,
+		MediaThumbnailMode::Crop);
+}
+
+std::shared_ptr<DynamicImage> MakePhotoThumbnailCenterCrop(
+		not_null<PhotoData*> photo,
+		FullMsgId fullId) {
+	return std::make_shared<PhotoThumbnail>(
+		photo,
+		fullId,
+		false,
+		MediaThumbnailMode::CenterCrop);
+}
+
+std::shared_ptr<DynamicImage> MakeDocumentThumbnail(
+		not_null<DocumentData*> document,
+		FullMsgId fullId) {
+	return std::make_shared<VideoThumbnail>(
+		document,
+		fullId,
+		false,
+		MediaThumbnailMode::Crop);
+}
+
+std::shared_ptr<DynamicImage> MakeDocumentThumbnail(
+		not_null<DocumentData*> document,
+		Data::FileOrigin origin) {
+	return std::make_shared<VideoThumbnail>(
+		document,
+		origin,
+		false,
+		MediaThumbnailMode::Crop);
+}
+
+std::shared_ptr<DynamicImage> MakeDocumentThumbnailFit(
+		not_null<DocumentData*> document,
+		Data::FileOrigin origin) {
+	return std::make_shared<VideoThumbnail>(
+		document,
+		origin,
+		false,
+		MediaThumbnailMode::Fit);
+}
+
+std::shared_ptr<DynamicImage> MakeDocumentThumbnailCenterCrop(
+		not_null<DocumentData*> document,
+		FullMsgId fullId) {
+	return std::make_shared<VideoThumbnail>(
+		document,
+		fullId,
+		false,
+		MediaThumbnailMode::CenterCrop);
+}
+
+std::shared_ptr<DynamicImage> MakeDocumentFilePreviewThumbnail(
+		not_null<DocumentData*> document,
+		FullMsgId fullId) {
+	return std::make_shared<DocumentFilePreviewThumbnail>(
+		document,
+		fullId);
+}
+
+std::shared_ptr<DynamicImage> MakeGeoThumbnail(
+		not_null<Data::CloudImage*> data,
+		not_null<Main::Session*> session,
+		Data::FileOrigin origin) {
+	return std::make_shared<GeoThumbnail>(
+		data,
+		session,
+		std::move(origin),
+		false);
+}
+
+std::shared_ptr<DynamicImage> MakeGeoThumbnailWithPin(
+		not_null<Data::CloudImage*> data,
+		not_null<Main::Session*> session,
+		Data::FileOrigin origin) {
+	return std::make_shared<GeoThumbnail>(
+		data,
+		session,
+		std::move(origin),
+		true);
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/dynamic_thumbnails.h b/Telegram/SourceFiles/ui/dynamic_thumbnails.h
index 9876d3df8dac74..5ebff97a9a2769 100644
--- a/Telegram/SourceFiles/ui/dynamic_thumbnails.h
+++ b/Telegram/SourceFiles/ui/dynamic_thumbnails.h
@@ -7,11 +7,19 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+class DocumentData;
 class PeerData;
+class PhotoData;
+
+namespace Main {
+class Session;
+} // namespace Main
 
 namespace Data {
+class CloudImage;
 class Story;
 class Session;
+struct FileOrigin;
 } // namespace Data
 
 namespace Ui {
@@ -30,6 +38,38 @@ class DynamicImage;
 	const style::icon &icon);
 [[nodiscard]] std::shared_ptr<DynamicImage> MakeEmojiThumbnail(
 	not_null<Data::Session*> owner,
-	const QString &data);
+	const QString &data,
+	Fn<bool()> paused = nullptr,
+	Fn<QColor()> textColor = nullptr,
+	int loopLimit = 0);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakePhotoThumbnail(
+	not_null<PhotoData*> photo,
+	FullMsgId fullId);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakePhotoThumbnailCenterCrop(
+	not_null<PhotoData*> photo,
+	FullMsgId fullId);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeDocumentThumbnail(
+	not_null<DocumentData*> document,
+	FullMsgId fullId);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeDocumentThumbnail(
+	not_null<DocumentData*> document,
+	Data::FileOrigin origin);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeDocumentThumbnailFit(
+	not_null<DocumentData*> document,
+	Data::FileOrigin origin);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeDocumentThumbnailCenterCrop(
+	not_null<DocumentData*> document,
+	FullMsgId fullId);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeDocumentFilePreviewThumbnail(
+	not_null<DocumentData*> document,
+	FullMsgId fullId);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeGeoThumbnail(
+	not_null<Data::CloudImage*> data,
+	not_null<Main::Session*> session,
+	Data::FileOrigin origin);
+[[nodiscard]] std::shared_ptr<DynamicImage> MakeGeoThumbnailWithPin(
+	not_null<Data::CloudImage*> data,
+	not_null<Main::Session*> session,
+	Data::FileOrigin origin);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/animated_string.cpp b/Telegram/SourceFiles/ui/effects/animated_string.cpp
new file mode 100644
index 00000000000000..1a75767e8ff795
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/animated_string.cpp
@@ -0,0 +1,485 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/animated_string.h"
+
+#include "ui/painter.h"
+
+namespace Ui {
+namespace {
+
+enum class RegionType {
+	Equal,
+	New,
+	Old,
+};
+
+struct Region {
+	RegionType type = RegionType::Equal;
+	QString text;
+};
+
+[[nodiscard]] std::vector<QString> Tokenize(
+		const QString &text,
+		bool splitByWords) {
+	auto result = std::vector<QString>();
+	const auto length = int(text.size());
+	if (!splitByWords) {
+		result.reserve(length);
+		for (auto i = 0; i != length; ++i) {
+			result.push_back(text.mid(i, 1));
+		}
+		return result;
+	}
+	auto start = 0;
+	for (auto i = 0; i <= length; ++i) {
+		if (i == length || text[i] == QChar(' ')) {
+			result.push_back(
+				text.mid(start, i - start + (i < length ? 1 : 0)));
+			start = i + 1;
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] QString Join(
+		const std::vector<QString> &tokens,
+		int from,
+		int to) {
+	auto result = QString();
+	for (auto i = from; i != to; ++i) {
+		result += tokens[i];
+	}
+	return result;
+}
+
+void AppendPart(
+		std::vector<Region> &regions,
+		RegionType type,
+		const QString &text,
+		bool enforceByLetter) {
+	if (enforceByLetter && text.size() > 1) {
+		for (auto i = 0; i != int(text.size()); ++i) {
+			regions.push_back({ type, text.mid(i, 1) });
+		}
+	} else {
+		regions.push_back({ type, text });
+	}
+}
+
+[[nodiscard]] std::vector<Region> Diff(
+		const std::vector<QString> &oldTokens,
+		const std::vector<QString> &newTokens,
+		const AnimatedString::Options &options) {
+	auto regions = std::vector<Region>();
+	const auto oldLength = int(oldTokens.size());
+	const auto newLength = int(newTokens.size());
+	const auto equals = [&](int newIndex, int oldIndex) {
+		return (newIndex >= 0)
+			&& (oldIndex >= 0)
+			&& (newIndex < newLength)
+			&& (oldIndex < oldLength)
+			&& (newTokens[newIndex] == oldTokens[oldIndex]);
+	};
+	const auto enforceByLetter = options.enforceByLetter;
+
+	const auto minLength = std::min(newLength, oldLength);
+	if (!options.preserveIndex) {
+		auto astart = 0;
+		auto bstart = 0;
+		auto equal = true;
+		auto a = 0;
+		auto b = 0;
+		for (; a <= minLength; ++a) {
+			const auto thisEqual = (a < minLength) && equals(a, b);
+			if (equal != thisEqual || a == minLength) {
+				if (a == minLength) {
+					a = newLength;
+					b = oldLength;
+				}
+				const auto alen = a - astart;
+				const auto blen = b - bstart;
+				if (alen > 0 || blen > 0) {
+					if (alen == blen && equal) {
+						regions.push_back({
+							RegionType::Equal,
+							Join(newTokens, astart, a),
+						});
+					} else {
+						if (alen > 0) {
+							AppendPart(
+								regions,
+								RegionType::New,
+								Join(newTokens, astart, a),
+								enforceByLetter);
+						}
+						if (blen > 0) {
+							AppendPart(
+								regions,
+								RegionType::Old,
+								Join(oldTokens, bstart, b),
+								enforceByLetter);
+						}
+					}
+				}
+				equal = thisEqual;
+				astart = a;
+				bstart = b;
+			}
+			if (thisEqual) {
+				++b;
+			}
+		}
+		return regions;
+	}
+
+	if (options.startFromEnd) {
+		auto indexes = std::vector<int>();
+		auto equal = true;
+		auto start = 0;
+		auto eq = true;
+		for (auto i = 0; i <= minLength; ++i) {
+			const auto a = newLength - i - 1;
+			const auto b = oldLength - i - 1;
+			const auto thisEqual = (a >= 0) && (b >= 0) && equals(a, b);
+			if (equal != thisEqual || i == minLength) {
+				if (i - start > 0) {
+					if (indexes.empty()) {
+						eq = equal;
+					}
+					indexes.push_back(i - start);
+				}
+				equal = thisEqual;
+				start = i;
+			}
+		}
+		auto a = newLength - minLength;
+		auto b = oldLength - minLength;
+		if (a > 0) {
+			AppendPart(
+				regions,
+				RegionType::New,
+				Join(newTokens, 0, a),
+				enforceByLetter);
+		}
+		if (b > 0) {
+			AppendPart(
+				regions,
+				RegionType::Old,
+				Join(oldTokens, 0, b),
+				enforceByLetter);
+		}
+		for (auto i = int(indexes.size()) - 1; i >= 0; --i) {
+			const auto count = indexes[i];
+			if (((i % 2) == 0) == eq) {
+				regions.push_back({
+					RegionType::Equal,
+					(newLength > oldLength)
+						? Join(newTokens, a, a + count)
+						: Join(oldTokens, b, b + count),
+				});
+			} else {
+				AppendPart(
+					regions,
+					RegionType::New,
+					Join(newTokens, a, a + count),
+					enforceByLetter);
+				AppendPart(
+					regions,
+					RegionType::Old,
+					Join(oldTokens, b, b + count),
+					enforceByLetter);
+			}
+			a += count;
+			b += count;
+		}
+		return regions;
+	}
+
+	auto equal = true;
+	auto start = 0;
+	for (auto i = 0; i <= minLength; ++i) {
+		const auto thisEqual = (i < minLength) && equals(i, i);
+		if (equal != thisEqual || i == minLength) {
+			if (i - start > 0) {
+				if (equal) {
+					AppendPart(
+						regions,
+						RegionType::Equal,
+						Join(newTokens, start, i),
+						enforceByLetter);
+				} else {
+					AppendPart(
+						regions,
+						RegionType::New,
+						Join(newTokens, start, i),
+						enforceByLetter);
+					AppendPart(
+						regions,
+						RegionType::Old,
+						Join(oldTokens, start, i),
+						enforceByLetter);
+				}
+			}
+			equal = thisEqual;
+			start = i;
+		}
+	}
+	if (newLength - minLength > 0) {
+		AppendPart(
+			regions,
+			RegionType::New,
+			Join(newTokens, minLength, newLength),
+			enforceByLetter);
+	}
+	if (oldLength - minLength > 0) {
+		AppendPart(
+			regions,
+			RegionType::Old,
+			Join(oldTokens, minLength, oldLength),
+			enforceByLetter);
+	}
+	return regions;
+}
+
+} // namespace
+
+AnimatedString::AnimatedString(
+	const style::font &font,
+	Fn<void()> update)
+: AnimatedString(font, std::move(update), Options()) {
+}
+
+AnimatedString::AnimatedString(
+	const style::font &font,
+	Fn<void()> update,
+	Options options)
+: _font(font)
+, _update(std::move(update))
+, _options(std::move(options)) {
+}
+
+const QString &AnimatedString::text() const {
+	return _currentText;
+}
+
+void AnimatedString::setText(const QString &text, bool animated) {
+	if (!_started) {
+		animated = false;
+	}
+	_started = true;
+	if (!animated) {
+		_scheduled.reset();
+		_animation.stop();
+		setInstant(text);
+		if (_update) {
+			_update();
+		}
+		return;
+	} else if (text == _currentText) {
+		return;
+	} else if (_animation.animating()) {
+		_scheduled = text;
+		return;
+	}
+	realSetText(text);
+}
+
+void AnimatedString::setInstant(const QString &text) {
+	_currentText = text;
+	_oldText = QString();
+	_currentParts.clear();
+	_oldParts.clear();
+	_oldWidth = 0.;
+	if (text.isEmpty()) {
+		_currentWidth = 0.;
+	} else {
+		const auto width = float64(_font->width(text));
+		_currentParts.push_back({ text, 0., width, -1 });
+		_currentWidth = width;
+	}
+}
+
+void AnimatedString::realSetText(const QString &text) {
+	_scheduled.reset();
+	_oldText = _currentText;
+	_currentText = text;
+
+	const auto regions = Diff(
+		Tokenize(_oldText, _options.splitByWords),
+		Tokenize(_currentText, _options.splitByWords),
+		_options);
+
+	_currentParts.clear();
+	_oldParts.clear();
+	_currentWidth = _oldWidth = 0.;
+	for (const auto &region : regions) {
+		const auto width = float64(_font->width(region.text));
+		if (region.type == RegionType::Equal) {
+			const auto currentIndex = int(_currentParts.size());
+			const auto oldIndex = int(_oldParts.size());
+			_currentParts.push_back({
+				region.text,
+				_currentWidth,
+				width,
+				oldIndex,
+			});
+			_oldParts.push_back({
+				region.text,
+				_oldWidth,
+				width,
+				currentIndex,
+			});
+			_currentWidth += width;
+			_oldWidth += width;
+		} else if (region.type == RegionType::New) {
+			_currentParts.push_back({
+				region.text,
+				_currentWidth,
+				width,
+				-1,
+			});
+			_currentWidth += width;
+		} else {
+			_oldParts.push_back({ region.text, _oldWidth, width, -1 });
+			_oldWidth += width;
+		}
+	}
+
+	_animation.start(
+		[=] { animationCallback(); },
+		0.,
+		1.,
+		_options.duration,
+		_options.transition);
+}
+
+void AnimatedString::animationCallback() {
+	if (_update) {
+		_update();
+	}
+	if (!_animation.animating()) {
+		_oldParts.clear();
+		_oldText = QString();
+		_oldWidth = 0.;
+		if (_scheduled) {
+			const auto next = *_scheduled;
+			_scheduled.reset();
+			if (next != _currentText) {
+				realSetText(next);
+			}
+		}
+	}
+}
+
+void AnimatedString::drawPart(
+		QPainter &p,
+		float64 x,
+		float64 baseline,
+		const QString &text,
+		float64 opacity) const {
+	if (opacity <= 0. || text.isEmpty()) {
+		return;
+	}
+	p.setOpacity(std::clamp(opacity, 0., 1.));
+	p.drawText(QPointF(x, baseline), text);
+}
+
+void AnimatedString::draw(
+		QPainter &p,
+		int x,
+		int y,
+		const QColor &color,
+		float64 opacity) const {
+	if (_currentParts.empty() && _oldParts.empty()) {
+		return;
+	}
+	const auto t = _animation.value(1.);
+	const auto crossfade = _animation.animating() && !_oldParts.empty();
+	const auto initial = p.opacity();
+	p.setFont(_font);
+	p.setPen(color);
+	const auto baseline = y + _font->ascent;
+	if (!crossfade) {
+		for (const auto &part : _currentParts) {
+			drawPart(
+				p,
+				x + part.offset,
+				baseline,
+				part.text,
+				initial * opacity);
+		}
+		p.setOpacity(initial);
+		return;
+	}
+
+	const auto amplitude = _font->height * _options.moveAmplitude;
+	const auto direction = _options.moveDown ? 1. : -1.;
+	for (const auto &part : _currentParts) {
+		const auto opposite = part.opposite;
+		if (opposite >= 0) {
+			const auto &old = _oldParts[opposite];
+			const auto px = old.offset + (part.offset - old.offset) * t;
+			drawPart(p, x + px, baseline, part.text, initial * opacity);
+		} else {
+			const auto py = -amplitude * (1. - t) * direction;
+			drawPart(
+				p,
+				x + part.offset,
+				baseline + py,
+				part.text,
+				initial * opacity * t);
+		}
+	}
+	for (const auto &part : _oldParts) {
+		if (part.opposite >= 0) {
+			continue;
+		}
+		const auto py = amplitude * t * direction;
+		drawPart(
+			p,
+			x + part.offset,
+			baseline + py,
+			part.text,
+			initial * opacity * (1. - t));
+	}
+	p.setOpacity(initial);
+}
+
+float64 AnimatedString::currentWidth() const {
+	if (!_oldParts.empty() && _animation.animating()) {
+		const auto t = _animation.value(1.);
+		return _oldWidth + (_currentWidth - _oldWidth) * t;
+	}
+	return _currentWidth;
+}
+
+float64 AnimatedString::width() const {
+	return _currentWidth;
+}
+
+int AnimatedString::height() const {
+	return _font->height;
+}
+
+bool AnimatedString::animating() const {
+	return _animation.animating();
+}
+
+void AnimatedString::finishAnimating() {
+	if (_scheduled) {
+		const auto next = *_scheduled;
+		_scheduled.reset();
+		setInstant(next);
+	}
+	_animation.stop();
+	_oldParts.clear();
+	_oldText = QString();
+	_oldWidth = 0.;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/animated_string.h b/Telegram/SourceFiles/ui/effects/animated_string.h
new file mode 100644
index 00000000000000..0c9306f8d66c74
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/animated_string.h
@@ -0,0 +1,88 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/animations.h"
+#include "ui/style/style_core.h"
+
+namespace Ui {
+
+class AnimatedString final {
+public:
+	struct Options {
+		bool splitByWords = false;
+		bool preserveIndex = false;
+		bool startFromEnd = false;
+		bool enforceByLetter = false;
+		bool moveDown = true;
+		float64 moveAmplitude = 0.3;
+		crl::time duration = 320;
+		anim::transition transition = anim::easeOutQuint;
+	};
+
+	AnimatedString(
+		const style::font &font,
+		Fn<void()> update);
+	AnimatedString(
+		const style::font &font,
+		Fn<void()> update,
+		Options options);
+
+	void setText(const QString &text, bool animated = true);
+	[[nodiscard]] const QString &text() const;
+
+	void draw(
+		QPainter &p,
+		int x,
+		int y,
+		const QColor &color,
+		float64 opacity = 1.) const;
+
+	[[nodiscard]] float64 currentWidth() const;
+	[[nodiscard]] float64 width() const;
+	[[nodiscard]] int height() const;
+	[[nodiscard]] bool animating() const;
+	void finishAnimating();
+
+private:
+	struct Part {
+		QString text;
+		float64 offset = 0.;
+		float64 width = 0.;
+		int opposite = -1;
+	};
+
+	void setInstant(const QString &text);
+	void realSetText(const QString &text);
+	void animationCallback();
+	void drawPart(
+		QPainter &p,
+		float64 x,
+		float64 baseline,
+		const QString &text,
+		float64 opacity) const;
+
+	const style::font &_font;
+	Fn<void()> _update;
+	Options _options;
+
+	QString _currentText;
+	QString _oldText;
+	std::vector<Part> _currentParts;
+	std::vector<Part> _oldParts;
+	float64 _currentWidth = 0.;
+	float64 _oldWidth = 0.;
+
+	std::optional<QString> _scheduled;
+	bool _started = false;
+
+	Ui::Animations::Simple _animation;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index b0861a8dca680c..1e1c66ecdf57b9 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -11,16 +11,31 @@ using "ui/widgets/widgets.style";
 using "ui/effects/premium.style";
 using "settings/settings.style";
 
+creditsSettingsBigBalanceButton: RoundButton(defaultActiveButton) {
+	width: 240px;
+	height: 40px;
+	textTop: 11px;
+	style: semiboldTextStyle;
+}
+
 creditsPremiumCover: PremiumCover(defaultPremiumCover) {
+	starTopSkip: 39px;
+	titleFont: font(15px semibold);
 	about: FlatLabel(userPremiumCoverAbout) {
 		textFg: boxTitleFg;
 	}
+	aboutMaxWidth: 236px;
+	additionalShadowForDarkThemes: false;
 }
 creditsLowBalancePremiumCover: PremiumCover(creditsPremiumCover) {
 	starSize: size(64px, 62px);
 	starTopSkip: 30px;
+	about: FlatLabel(userPremiumCoverAbout) {
+		textFg: boxTitleFg;
+		minWidth: 200px;
+	}
 }
-creditsLowBalancePremiumCoverHeight: 180px;
+creditsLowBalancePremiumCoverHeight: 162px;
 creditsTopupButton: SettingsButton(settingsButton) {
 	style: semiboldTextStyle;
 }
@@ -44,11 +59,56 @@ creditsBoxAboutDivider: FlatLabel(boxDividerLabel) {
 creditsBoxButtonLabel: FlatLabel(defaultFlatLabel) {
 	style: semiboldTextStyle;
 }
+creditsReleasedByLabel: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+}
+
+starIconEmoji: IconEmoji {
+	icon: icon{{ "payments/premium_emoji", creditsBg1 }};
+	padding: margins(4px, 1px, 4px, 0px);
+}
+starIconEmojiColored: IconEmoji(starIconEmoji) {
+	useIconColor: true;
+}
+starIconEmojiSmall: IconEmoji {
+	icon: icon{{ "chat/mini_stars", creditsBg1 }};
+	padding: margins(0px, 4px, 0px, 0px);
+}
+starIconEmojiLarge: IconEmoji {
+	icon: icon {{ "settings/premium/star", settingsIconFg }};
+	padding: margins(0px, -2px, 0px, 0px);
+}
+starIconEmojiInline: IconEmoji(starIconEmojiSmall) {
+	padding: margins(0px, 3px, 0px, 0px);
+}
+starIconEmojiMiniFont: IconEmoji(starIconEmojiSmall) {
+	padding: margins(0px, 5px, 0px, 0px);
+}
+buttonStarIconEmoji: IconEmoji(starIconEmoji) {
+	padding: margins(4px, 2px, 4px, 0px);
+}
 
-starIconSmall: icon{{ "payments/small_star", windowFg }};
-starIconSmallPadding: margins(0px, -3px, 0px, 0px);
+tonIconEmoji: IconEmoji {
+	icon: icon{{ "chat/mini_ton_bold", currencyFg }};
+	padding: margins(1px, 2px, 1px, 0px);
+}
+tonIconEmojiLarge: IconEmoji {
+	icon: icon{{ "payments/ton_emoji-18x18", currencyFg }};
+	padding: margins(0px, 1px, 0px, 0px);
+}
+tonIconEmojiInSmall: IconEmoji(tonIconEmoji) {
+	padding: margins(0px, 2px, 0px, 0px);
+}
+tonIconEmojiOnSale: IconEmoji(tonIconEmojiInSmall) {
+	icon: icon{{ "chat/mini_ton_bold-14x14", currencyFg }};
+	padding: margins(1px, 3px, 1px, 0px);
+}
+buttonTonIconEmoji: IconEmoji(tonIconEmoji) {
+	padding: margins(1px, 3px, 1px, 0px);
+}
 
 creditsHistoryEntryTypeAds: icon {{ "folders/folders_channels", premiumButtonFg }};
+creditsHistorySearchPostsIcon: icon {{ "box_search", historyPeerUserpicFg }};
 
 creditsHistoryEntryGiftStickerSkip: -20px;
 creditsHistoryEntryGiftStickerSize: 150px;
@@ -63,14 +123,23 @@ creditsGiftBox: Box(defaultBox) {
 }
 
 giftBox: Box(defaultBox) {
-	buttonPadding: margins(22px, 11px, 22px, 22px);
+	buttonPadding: margins(22px, 11px, 22px, 12px);
 	buttonHeight: 42px;
+	buttonWide: true;
 	button: RoundButton(defaultActiveButton) {
 		height: 42px;
 		textTop: 12px;
 		style: semiboldTextStyle;
 	}
 }
+giftLimitedBox: Box(giftBox) {
+	buttonPadding: margins(22px, 48px, 22px, 12px);
+}
+giftCraftBox: Box(giftBox) {
+	buttonPadding: margins(0px, 0px, 0px, 0px);
+	buttonHeight: 0px;
+}
+giftLimitedPadding: margins(8px, 4px, 8px, 4px);
 giftBoxSubtitle: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(defaultTextStyle) {
 		font: boxTitleFont;
@@ -92,21 +161,70 @@ giftBoxTabStyle: semiboldTextStyle;
 giftBoxTabFg: windowSubTextFg;
 giftBoxTabFgActive: windowBoldFg;
 giftBoxTabBgActive: windowBgRipple;
-giftBoxPadding: margins(20px, 4px, 20px, 24px);
+giftBoxPillTabs: PillTabs(defaultPillTabs) {
+	borderWidth: 6px;
+	fg: windowSubTextFg;
+	fgActive: windowBoldFg;
+	bgActive: windowBgRipple;
+}
+giftBoxResaleTabsMargin: margins(11px, 10px, 11px, 8px);
+giftBoxResaleTabSkip: 8px;
+giftBoxResaleTabsDropdown: IconEmoji {
+	icon: icon{{ "intro_country_dropdown", lightButtonFg }};
+	padding: margins(4px, 6px, 0px, 0px);
+}
+giftBoxResaleMiniNumber: IconEmoji {
+	icon: icon{{ "settings/mini_gift_order_number-16x16", lightButtonFg }};
+	padding: margins(0px, 2px, 4px, 0px);
+}
+giftBoxResaleMiniPrice: IconEmoji {
+	icon: icon{{ "settings/mini_gift_order_price-16x16", lightButtonFg }};
+	padding: margins(0px, 2px, 4px, 0px);
+}
+giftBoxResaleMiniDate: IconEmoji {
+	icon: icon{{ "settings/mini_gift_order_date-16x16", lightButtonFg }};
+	padding: margins(0px, 2px, 4px, 0px);
+}
+giftBoxResaleFilter: PopupMenu(popupMenuWithIcons) {
+	menu: Menu(menuWithIcons) {
+		itemPadding: margins(54px, 8px, 48px, 8px);
+		itemRightSkip: 12px;
+	}
+	maxHeight: 320px;
+}
+giftBoxResaleColorSize: 18px;
+giftBoxResaleColorTop: 1px;
+giftBoxPadding: margins(11px, 4px, 11px, 24px);
 giftBoxGiftSkip: point(10px, 8px);
 giftBoxGiftHeight: 164px;
+giftBoxGiftSmall: 108px;
+giftBoxGiftTiny: 72px;
 giftBoxGiftRadius: 12px;
-giftBoxPremiumIconSize: 64px;
-giftBoxPremiumIconTop: 10px;
+giftBoxGiftBadgeFont: font(10px semibold);
+giftBoxByStarsStyle: TextStyle(defaultTextStyle) {
+	font: font(10px);
+}
+giftBoxByStarsSkip: 2px;
+giftBoxByStarsStarTop: 3px;
 giftBoxPremiumTextTop: 84px;
+giftBoxPremiumTextTopByStars: 78px;
+giftBoxButtonBottomSmall: 4px;
 giftBoxButtonBottom: 12px;
+giftBoxButtonBottomByStars: 18px;
 giftBoxButtonPadding: margins(8px, 4px, 8px, 4px);
 giftBoxPreviewStickerPadding: margins(10px, 12px, 10px, 16px);
 giftBoxPreviewTitlePadding: margins(12px, 4px, 12px, 4px);
-giftBoxPreviewTextPadding: margins(12px, 4px, 12px, 24px);
+giftBoxReleasedByMargin: margins(6px, 1px, 6px, 2px);
+giftBoxPreviewTextPadding: margins(12px, 4px, 12px, 4px);
+giftBoxButtonMargin: margins(12px, 8px, 12px, 12px);
 giftBoxStickerTop: 0px;
 giftBoxStickerStarTop: 24px;
+giftBoxStickerUniqueTop: 32px;
+giftBoxSmallStickerTop: 16px;
+giftBoxStickerTopByStars: -4px;
 giftBoxStickerSize: size(80px, 80px);
+giftBoxStickerTiny: size(48px, 48px);
+giftBoxSelectSkip: 5px;
 giftBoxUserpicSize: 24px;
 giftBoxUserpicSkip: 2px;
 giftBoxTextField: InputField(defaultInputField) {
@@ -129,13 +247,419 @@ giftBoxTextField: InputField(defaultInputField) {
 	style: defaultTextStyle;
 }
 giftBoxTextPadding: margins(20px, 15px, 20px, 11px);
-giftBoxHiddenMark: icon{{ "menu/stealth", premiumButtonFg }};
+giftBoxHiddenMark: icon{{ "chat/mini_gift_hidden", premiumButtonFg, margins(4px, 4px, 4px, 4px) }};
 giftListAbout: FlatLabel(defaultFlatLabel) {
 	minWidth: 240px;
-	textFg: membersAboutLimitFg;
+	textFg: windowSubTextFg;
 	align: align(top);
 	style: boxLabelStyle;
 }
 giftListAboutMargin: margins(12px, 24px, 12px, 24px);
+giftListAboutToggle: FlatLabel(giftListAbout) {
+	style: semiboldTextStyle;
+}
+giftListAboutToggleSkip: 4px;
 giftBoxEmojiToggleTop: 7px;
 giftBoxLimitTop: 28px;
+giftBoxLock: IconEmoji {
+	icon: icon {{ "emoji/premium_lock", placeholderFgActive }};
+	padding: margins(-2px, 1px, 0px, 0px);
+}
+giftBoxPinIcon: icon {{ "dialogs/dialogs_pinned", premiumButtonFg }};
+giftBoxLockIcon: icon{{ "limits/mini_gift_lock-18x18", attentionButtonFg }};
+giftBoxLockIconPosition: point(4px, 4px);
+
+giftBoxGiftEmptyLabel: FlatLabel(defaultFlatLabel) {
+	minWidth: 156px;
+	align: align(top);
+}
+
+creditsHistoryEntriesList: PeerList(defaultPeerList) {
+	padding: margins(0px, 7px, 0px, 7px);
+	item: PeerListItem(defaultPeerListItem) {
+		height: 72px;
+		photoPosition: point(18px, 7px);
+		namePosition: point(70px, 6px);
+		statusPosition: point(70px, 46px);
+		photoSize: 42px;
+	}
+}
+
+subscriptionCreditsBadgePadding: margins(10px, 1px, 8px, 3px);
+
+uniqueGiftModelTop: 20px;
+uniqueGiftPretitle: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+	margin: margins(12px, 4px, 12px, 4px);
+}
+uniqueGiftTitle: FlatLabel(boxTitle) {
+	align: align(top);
+}
+uniqueGiftNumber: FlatLabel(uniqueGiftTitle) {
+	style: TextStyle(defaultTextStyle) {
+		font: semiboldFont;
+	}
+}
+uniqueGiftResalePrice: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+}
+uniqueGiftTitleTop: 140px;
+uniqueGiftSubtitle: FlatLabel(defaultFlatLabel) {
+	minWidth: 64px;
+	align: align(top);
+}
+uniqueGiftReleasedBy: FlatLabel(uniqueGiftSubtitle) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(10px);
+	}
+}
+uniqueGiftOnSale: FlatLabel(uniqueGiftSubtitle) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(10px semibold);
+	}
+}
+uniqueGiftSubtitleTop: 170px;
+uniqueGiftUserpicTop: 48px;
+uniqueGiftUserpicSize: 80px;
+uniqueGiftBottom: 20px;
+uniqueCloseButton: IconButton(boxTitleClose) {
+	icon: icon {{ "box_button_close", videoPlayIconFg }};
+	iconOver: icon {{ "box_button_close", videoPlayIconFg }};
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: shadowFg;
+	}
+}
+uniqueMenuButton: IconButton(uniqueCloseButton) {
+	width: 40px;
+	rippleAreaPosition: point(0px, 4px);
+
+	icon: icon {{ "title_menu_dots", videoPlayIconFg }};
+	iconOver: icon {{ "title_menu_dots", videoPlayIconFg }};
+}
+uniqueCraftButton: IconButton(uniqueMenuButton) {
+	icon: icon{{ "chat/filled_forge-24x24", videoPlayIconFg }};
+	iconOver: icon{{ "chat/filled_forge-24x24", videoPlayIconFg }};
+}
+uniqueGiftSenderBadge: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+	palette: TextPalette(defaultTextPalette) {
+		linkFg: radialFg;
+		monoFg: radialFg;
+	}
+	margin: margins(12px, 3px, 12px, 4px);
+	minWidth: 128px;
+	align: align(top);
+	textFg: radialFg;
+}
+
+uniqueAttributeTop: 10px;
+uniqueAttributePadding: margins(6px, 8px, 6px, 8px);
+uniqueAttributeName: TextStyle(semiboldTextStyle) {
+	font: font(12px semibold);
+}
+uniqueAttributeType: TextStyle(defaultTextStyle) {
+	font: font(12px);
+}
+uniqueAttributePercent: uniqueAttributeType;
+uniqueAttributePercentPadding: margins(4px, 0px, 4px, 0px);
+uniqueAttributeModel: RoundButton(defaultLightButton) {
+	textFg: windowBoldFg;
+	textFgOver: windowBoldFg;
+	textBg: windowBgOver;
+	textBgOver: windowBgOver;
+	ripple: defaultRippleAnimation;
+	radius: 8px;
+
+	width: 107px;
+	height: 34px;
+	textTop: 7px;
+	style: defaultBoxButtonTextStyle;
+	icon: icon {{ "menu/unique", windowBoldFg }};
+	iconOver: icon {{ "menu/unique", windowBoldFg }};
+	iconPosition: point(-1px, 4px);
+}
+uniqueAttributeModelActive: icon{{ "menu/unique", activeButtonFg }};
+uniqueAttributeBackdrop: RoundButton(uniqueAttributeModel) {
+	icon: icon {{ "menu/palette", windowBoldFg }};
+	iconOver: icon {{ "menu/palette", windowBoldFg }};
+}
+uniqueAttributeBackdropActive: icon{{ "menu/palette", activeButtonFg }};
+uniqueAttributeSymbol: RoundButton(uniqueAttributeModel) {
+	icon: icon {{ "menu/all_media", windowBoldFg }};
+	iconOver: icon {{ "menu/all_media", windowBoldFg }};
+}
+uniqueAttributeSymbolActive: icon{{ "menu/all_media", activeButtonFg }};
+uniqueAttributesBox: Box(giftBox) {
+	buttonWide: false;
+	buttonHeight: 34px;
+	buttonPadding: margins(10px, 10px, 11px, 10px);
+}
+uniqueAttributeStickerSize: size(64px, 64px);
+upgradeGiftBox: Box(giftBox) {
+	buttonPadding: margins(22px, 3px, 22px, 22px);
+}
+upgradeGiftWithPricesBox: Box(giftBox) {
+	buttonPadding: margins(22px, 3px, 22px, 46px);
+}
+upgradeGiftSubtext: FlatLabel(boxDividerLabel) {
+	minWidth: 200px;
+}
+darkUpgradeGiftTitle: FlatLabel(uniqueGiftTitle) {
+	textFg: groupCallMembersFg;
+}
+darkUpgradeGiftSubtitle: FlatLabel(uniqueGiftSubtitle) {
+	textFg: groupCallMembersFg;
+}
+darkUpgradeGiftBox: Box(upgradeGiftBox) {
+	bg: groupCallMembersBg;
+	title: darkUpgradeGiftTitle;
+	titleAdditionalFg: groupCallMemberNotJoinedStatus;
+}
+darkUpgradeGiftRadiant: icon{{ "menu/unique", groupCallMembersFg }};
+darkUpgradeGiftProfile: icon{{ "settings/premium/features/feature_profile_cover", groupCallMembersFg }};
+darkUpgradeGiftProof: icon{{ "menu/factcheck", groupCallMembersFg }};
+darkUpgradeGiftInfoTitle: FlatLabel(defaultFlatLabel) {
+	textFg: groupCallMembersFg;
+}
+darkUpgradeGiftInfoAbout: FlatLabel(upgradeGiftSubtext) {
+	textFg: groupCallMemberNotJoinedStatus;
+}
+
+giftTooManyPinnedBox: Box(giftBox) {
+	buttonPadding: margins(11px, 11px, 11px, 11px);
+}
+giftTooManyPinnedChoose: FlatLabel(giftBoxAbout) {
+	textFg: windowSubTextFg;
+}
+
+creditsHistoryTabsSlider: SettingsSlider(defaultTabsSlider) {
+	height: 39px;
+	labelTop: 7px;
+	barTop: 36px;
+	barSkip: 0px;
+	rippleBottomSkip: 0px;
+}
+creditsHistoryTabsSliderPadding: margins(14px, 0px, 24px, 0px);
+creditsHistoryRowDescriptionSkip: 20px;
+creditsHistoryRowRightTop: 16px;
+creditsHistoryRowRightMinorTop: 18px;
+creditsHistoryRowRightStyle: TextStyle(defaultTextStyle) {
+	font: font(fsize);
+}
+resaleButtonTitle: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+	textFg: activeButtonFg;
+	maxHeight: 20px;
+}
+resaleButtonSubtitle: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px semibold);
+	}
+	textFg: activeButtonFg;
+	maxHeight: 20px;
+}
+resalePriceTableLink: FlatLabel(defaultFlatLabel) {
+	minWidth: 200px;
+	align: align(top);
+}
+resalePriceAbout: FlatLabel(boxLabel) {
+	textFg: windowSubTextFg;
+	align: align(top);
+}
+
+resaleConfirmTonOnly: FlatLabel(boxLabel) {
+	textFg: windowSubTextFg;
+}
+resaleConfirmTonOnlyMargin: margins(0px, 12px, 0px, 12px);
+
+offerValuePadding: margins(0px, 8px, 0px, 0px);
+offerValueGood: FlatLabel(boxLabel) {
+	minWidth: 120px;
+	textFg: windowSubTextFg;
+	align: align(top);
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+}
+offerValueBad: FlatLabel(offerValueGood) {
+	textFg: attentionButtonFg;
+}
+
+uniqueGiftValuePrice: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(20px semibold);
+	}
+	margin: margins(12px, 6px, 12px, 6px);
+	textFg: windowFgActive;
+}
+uniqueGiftValueAbout: FlatLabel(defaultFlatLabel) {
+	minWidth: 128px;
+	align: align(top);
+}
+uniqueGiftValueAvailableLink: FlatLabel(boxLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(14px);
+	}
+}
+uniqueGiftValueAvailableMargin: margins(0px, 4px, 0px, 4px);
+
+videoStreamTopupRipple: RippleAnimation(defaultRippleAnimation) {
+	color: groupCallMembersBgRipple;
+}
+videoStreamTopupButton: SettingsButton(creditsTopupButton) {
+	textFg: groupCallMemberNotJoinedStatus;
+	textFgOver: groupCallMemberNotJoinedStatus;
+	textBg: groupCallMembersBg;
+	textBgOver: groupCallMembersBgOver;
+	ripple: videoStreamTopupRipple;
+}
+videoStreamTopupPrice: FlatLabel(creditsTopupPrice) {
+	textFg: groupCallMemberNotJoinedStatus;
+}
+videoStreamShowMoreButton: SettingsButton(defaultSettingsButton) {
+	textFg: groupCallActiveFg;
+	textFgOver: groupCallActiveFg;
+	textBg: groupCallMembersBg;
+	textBgOver: groupCallMembersBgOver;
+
+	padding: margins(70px, 10px, 22px, 8px);
+
+	ripple: videoStreamTopupRipple;
+}
+videoStreamStarsCover: PremiumCover(creditsLowBalancePremiumCover) {
+	bg: groupCallMembersBg;
+	titleFg: groupCallMembersFg;
+	about: FlatLabel(defaultFlatLabel) {
+		style: premiumAboutTextStyle;
+		palette: TextPalette(defaultTextPalette) {
+			linkFg: groupCallMembersFg;
+		}
+		align: align(top);
+		textFg: groupCallMembersFg;
+		minWidth: 190px;
+	}
+}
+
+auctionInfoTableMargin: margins(0px, 12px, 0px, 12px);
+auctionInfoValueMultiline: FlatLabel(defaultTableValue) {
+	minWidth: 96px;
+	maxHeight: 96px;
+}
+auctionBidEmoji: IconEmoji {
+	icon: icon {{ "settings/button_auction", windowFg }};
+	padding: margins(-4px, -2px, -4px, 0px);
+}
+auctionBidToast: Toast(defaultToast) {
+	padding: margins(19px, 13px, 19px, 12px);
+}
+auctionBidToastIcon: icon {{ "toast/auction", toastFg }};
+auctionAboutLogo: icon {{ "settings/large_auctions", windowFgActive }};
+auctionAboutLogoPadding: margins(8px, 8px, 8px, 8px);
+auctionAboutTextPadding: margins(0px, 6px, 0px, 8px);
+auctionCenteredSubtitle: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	style: TextStyle(defaultTextStyle) {
+		font: font(10px);
+	}
+}
+auctionChangeRecipientPadding: margins(0px, 0px, 0px, 10px);
+
+auctionBidPlace: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+	textFg: windowActiveTextFg;
+}
+auctionBidUserpic: UserpicButton(defaultUserpicButton) {
+	size: size(28px, 36px);
+	photoSize: 28px;
+	photoPosition: point(0px, 4px);
+}
+auctionBidName: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+}
+auctionBidStars: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+}
+auctionBidSkip: 10px;
+
+auctionListEntrySkip: 12px;
+auctionListTitle: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(15px semibold);
+	}
+	textFg: windowBoldFg;
+}
+auctionListTitlePadding: margins(50px, 0px, 0px, 0px);
+auctionListText: FlatLabel(defaultFlatLabel) {
+}
+auctionListTextPadding: margins(50px, 4px, 0px, 0px);
+auctionListRaise: RoundButton(defaultActiveButton) {
+	width: 0px;
+}
+auctionListRaisePadding: margins(0px, 8px, 0px, 0px);
+
+CraftRadialPercent {
+	stroke: pixels;
+	font: font;
+}
+
+craftTitleMargin: margins(64px, 16px, 64px, 4px);
+craftAbout: FlatLabel(defaultFlatLabel) {
+	align: align(top);
+	minWidth: 128px;
+}
+craftAboutMargin: margins(24px, 12px, 24px, 4px);
+craftChance: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+	textFg: attentionButtonFg;
+	margin: margins(8px, 4px, 8px, 4px);
+}
+craftPattern: IconEmoji {
+	icon: icon{{ "chat/filled_forge-36x36", windowFg }};
+	padding: margins(0px, 0px, 0px, 0px);
+}
+craftAddIcon: icon {{ "settings/plus", windowFgActive }};
+craftReplaceIcon: icon {{ "mini_replace-12x12", windowFgActive }};
+craftPreviewPadding: margins(24px, 8px, 40px, 8px);
+craftBoxButtonPadding: margins(22px, 12px, 22px, 22px);
+craftAttributesMargin: margins(22px, 12px, 22px, 16px);
+craftPreviewAllPadding: margins(6px, 4px, 6px, 4px);
+craftPreviewAllMargin: margins(22px, 0px, 22px, 8px);
+craftProgressTitleMargin: margins(0px, 12px, 0px, 16px);
+craftProgressAboutMargin: margins(0px, 4px, 0px, 16px);
+craftProgressWarningMargin: margins(0px, 4px, 0px, 16px);
+craftProgressChanceMargin: margins(0px, 40px, 0px, 16px);
+craftProgressIconSize: size(24px, 24px);
+craftProgressIconSkip: 4px;
+craftFailureThumbsTop: 36px;
+craftFailureTitleMargin: margins(0px, 88px, 0px, 12px);
+craftFailureAboutMargin: margins(0px, 0px, 0px, 16px);
+
+craftForge: icon{{ "chat/filled_forge-48x48", windowFg }};
+craftFailLottieSize: size(36px, 36px);
+craftForgePadding: 12px;
+craftForgePercent: CraftRadialPercent {
+	stroke: 4px;
+	font: font(14px semibold);
+}
+craftForgeLoading: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) {
+	color: windowFgActive;
+	thickness: 4px;
+}
+craftPercentLabel: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(11px semibold);
+	}
+	margin: margins(5px, 2px, 5px, 2px);
+}
+craftAttributeSkip: 12px;
+craftAttributePadding: 7px;
+craftAttributeSize: 48px;
+craftAttributePercent: CraftRadialPercent {
+	stroke: 3px;
+	font: font(10px semibold);
+}
+craftAttributeRowSkip: 8px;
+craftYourListEmpty: FlatLabel(defaultFlatLabel) {
+	minWidth: 128px;
+	align: align(top);
+}
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
index c855fac0de1a9b..81561c6364e1d6 100644
--- a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
@@ -17,6 +17,7 @@ For license and copyright information please follow this link:
 #include "data/data_photo_media.h"
 #include "data/data_session.h"
 #include "history/view/media/history_view_sticker_player.h"
+#include "info/bot/starref/info_bot_starref_common.h"
 #include "info/userpic/info_userpic_emoji_builder_preview.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
@@ -25,10 +26,14 @@ For license and copyright information please follow this link:
 #include "ui/empty_userpic.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/custom_emoji_instance.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/fields/number_input.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "styles/style_channel_earn.h"
+#include "styles/style_color_indices.h"
 #include "styles/style_credits.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_intro.h" // introFragmentIcon.
@@ -75,7 +80,7 @@ PaintRoundImageCallback MultiThumbnail(
 		q.setBrush(st::shadowFg);
 		q.drawRoundedRect(QRect(0, shift, smaller, smaller), radius, radius);
 		q.setPen(st::toastFg);
-		q.setFont(style::font(smaller / 2, style::FontFlag::Semibold, 0));
+		q.setFont(style::font(smaller / 2, style::FontFlag::Bold, 0));
 		q.drawText(
 			QRect(0, shift, smaller, smaller),
 			QString::number(totalCount),
@@ -152,7 +157,7 @@ not_null<RpWidget*> CreateSingleStarWidget(
 	const auto image = GenerateStars(height, 1);
 	widget->resize(image.size() / style::DevicePixelRatio());
 	widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(widget);
 		p.drawImage(0, 0, image);
 	}, widget->lifetime());
@@ -162,29 +167,33 @@ not_null<RpWidget*> CreateSingleStarWidget(
 
 not_null<MaskedInputField*> AddInputFieldForCredits(
 		not_null<VerticalLayout*> container,
-		rpl::producer<uint64> value) {
+		rpl::producer<CreditsAmount> value) {
 	const auto &st = st::botEarnInputField;
 	const auto inputContainer = container->add(
 		CreateSkipWidget(container, st.heightMin));
-	const auto currentValue = rpl::variable<uint64>(
+	const auto currentValue = rpl::variable<CreditsAmount>(
 		rpl::duplicate(value));
 	const auto input = CreateChild<NumberInput>(
 		inputContainer,
 		st,
-		tr::lng_bot_earn_out_ph(),
-		QString::number(currentValue.current()),
-		currentValue.current());
+		tr::lng_bot_earn_out_ph_max(
+			lt_amount,
+			currentValue.value() | rpl::map([](CreditsAmount amount) {
+				return QString::number(amount.whole());
+			})),
+		QString::number(currentValue.current().whole()),
+		currentValue.current().whole());
 	rpl::duplicate(
 		value
-	) | rpl::start_with_next([=](uint64 v) {
-		input->changeLimit(v);
-		input->setText(QString::number(v));
+	) | rpl::on_next([=](CreditsAmount v) {
+		input->changeLimit(v.whole());
+		input->setText(QString::number(v.whole()));
 	}, input->lifetime());
 	const auto icon = CreateSingleStarWidget(
 		inputContainer,
 		st.style.font->height);
 	inputContainer->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		input->resize(
 			size.width() - rect::m::sum::h(st::boxRowPadding),
 			st.heightMin);
@@ -215,9 +224,17 @@ PaintRoundImageCallback GenerateCreditsPaintUserpicCallback(
 		};
 	}
 	const auto bg = [&]() -> EmptyUserpic::BgColors {
+		if (entry.postsSearch) {
+			return {
+				st::historyPeerSavedMessagesBg,
+				st::historyPeerSavedMessagesBg2,
+			};
+		}
 		switch (entry.peerType) {
+		case Data::CreditsHistoryEntry::PeerType::API:
+			return { st::historyPeer2UserpicBg, st::historyPeer2UserpicBg2 };
 		case Data::CreditsHistoryEntry::PeerType::Peer:
-			return EmptyUserpic::UserpicColor(0);
+			return EmptyUserpic::UserpicColor(st::colorIndexRed);
 		case Data::CreditsHistoryEntry::PeerType::AppStore:
 			return { st::historyPeer7UserpicBg, st::historyPeer7UserpicBg2 };
 		case Data::CreditsHistoryEntry::PeerType::PlayMarket:
@@ -237,10 +254,68 @@ PaintRoundImageCallback GenerateCreditsPaintUserpicCallback(
 		Unexpected("Unknown peer type.");
 	}();
 	const auto userpic = std::make_shared<EmptyUserpic>(bg, QString());
+	if (entry.peerType == PeerType::API) {
+		const auto svg = std::make_shared<QSvgRenderer>(Ui::Premium::Svg());
+		const auto image = std::make_shared<QImage>();
+		return [=](Painter &p, int x, int y, int outer, int size) mutable {
+			userpic->paintCircle(p, x, y, outer, size);
+			if (image->isNull()) {
+				*image = QImage(
+					Size(size) * style::DevicePixelRatio(),
+					QImage::Format_ARGB32_Premultiplied);
+				image->setDevicePixelRatio(style::DevicePixelRatio());
+				image->fill(Qt::transparent);
+				constexpr auto kSize = 126.;
+				constexpr auto kBubbleRatio = kSize / ((kSize - 70) / 2.);
+				const auto rect = QRectF(0, 0, size, size)
+					- Margins(size / kBubbleRatio);
+
+				auto q = QPainter(image.get());
+				const auto hq = PainterHighQualityEnabler(q);
+				q.setPen(Qt::NoPen);
+				q.setBrush(st::historyPeerUserpicFg);
+				q.drawEllipse(rect);
+				constexpr auto kTailX1 = 4;
+				constexpr auto kTailY1 = 8;
+				constexpr auto kTailX2 = 2;
+				constexpr auto kTailY2 = 0;
+				constexpr auto kTailX3 = 9;
+				constexpr auto kTailY3 = 4;
+				auto path = QPainterPath();
+				path.moveTo(
+					st::lineWidth * kTailX1,
+					rect.height() - st::lineWidth * kTailY1);
+				path.lineTo(
+					st::lineWidth * kTailX2,
+					rect.height() - st::lineWidth * kTailY2);
+				path.lineTo(
+					st::lineWidth * kTailX3,
+					rect.height() - st::lineWidth * kTailY3);
+				path.translate(rect.x(), rect.y());
+				q.strokePath(
+					path,
+					QPen(
+						st::historyPeerUserpicFg,
+						st::lineWidth * 2,
+						Qt::SolidLine,
+						Qt::RoundCap,
+						Qt::RoundJoin));
+				q.fillPath(path, st::historyPeerUserpicFg);
+				q.setCompositionMode(QPainter::CompositionMode_Clear);
+				constexpr auto kStarRatio = kSize / ((kSize - 44) / 2.);
+				svg->render(
+					&q,
+					QRectF(0, 0, size, size) - Margins(size / kStarRatio));
+			}
+			p.drawImage(x, y, *image);
+		};
+	}
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
 		userpic->paintCircle(p, x, y, outerWidth, size);
 		const auto rect = QRect(x, y, size, size);
-		((entry.peerType == PeerType::AppStore)
+		(entry.postsSearch
+			? st::creditsHistorySearchPostsIcon
+			: (entry.peerType == PeerType::AppStore)
 			? st::sessionIconiPhone
 			: (entry.peerType == PeerType::PlayMarket)
 			? st::sessionIconAndroid
@@ -267,8 +342,8 @@ PaintRoundImageCallback GenerateCreditsPaintEntryCallback(
 	photo->load(Data::PhotoSize::Large, {});
 
 	rpl::single(rpl::empty_value()) | rpl::then(
-		photo->owner().session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+		photo->session().downloaderTaskFinished()
+	) | rpl::on_next([=] {
 		using Size = Data::PhotoSize;
 		if (const auto large = state->view->image(Size::Large)) {
 			state->imagePtr = large;
@@ -317,8 +392,8 @@ PaintRoundImageCallback GenerateCreditsPaintEntryCallback(
 	video->loadThumbnail({});
 
 	rpl::single(rpl::empty_value()) | rpl::then(
-		video->owner().session().downloaderTaskFinished()
-	) | rpl::start_with_next([=] {
+		video->session().downloaderTaskFinished()
+	) | rpl::on_next([=] {
 		if (const auto thumbnail = state->view->thumbnail()) {
 			state->imagePtr = thumbnail;
 		}
@@ -475,7 +550,7 @@ Fn<PaintRoundImageCallback(Fn<void()>)> PaintPreviewCallback(
 				extended,
 				std::move(update));
 		};
-	} else if (entry.photoId) {
+	} else if (entry.photoId && entry.subscriptionUntil.isNull()) {
 		const auto photo = session->data().photo(entry.photoId);
 		return [=](Fn<void()> update) {
 			return GenerateCreditsPaintEntryCallback(
@@ -487,13 +562,43 @@ Fn<PaintRoundImageCallback(Fn<void()>)> PaintPreviewCallback(
 }
 
 TextWithEntities GenerateEntryName(const Data::CreditsHistoryEntry &entry) {
-	return (entry.reaction
+	return (entry.starrefCommission && !entry.starrefAmount)
+		? tr::lng_credits_commission(
+			tr::now,
+			lt_amount,
+			TextWithEntities{
+				Info::BotStarRef::FormatCommission(entry.starrefCommission)
+			},
+			TextWithEntities::Simple)
+		: entry.isLiveStoryReaction()
+		? tr::lng_credits_paid_messages_fee_live_reaction(
+			tr::now,
+			TextWithEntities::Simple)
+		: entry.paidMessagesCount
+		? tr::lng_credits_paid_messages_fee(
+			tr::now,
+			lt_count,
+			entry.paidMessagesCount,
+			TextWithEntities::Simple)
+		: (entry.premiumMonthsForStars
+		? tr::lng_premium_summary_title
+		: entry.floodSkip
+		? tr::lng_credits_box_history_entry_api
+		: entry.reaction
 		? tr::lng_credits_box_history_entry_reaction_name
+		: entry.giftOffer
+		? tr::lng_credits_box_history_entry_gift_offer
+		: entry.giftResale
+		? (entry.in
+			? tr::lng_credits_box_history_entry_gift_sold
+			: tr::lng_credits_box_history_entry_gift_bought)
 		: entry.bareGiveawayMsgId
 		? tr::lng_credits_box_history_entry_giveaway_name
 		: entry.converted
 		? tr::lng_credits_box_history_entry_gift_converted
-		: entry.convertStars
+		: (entry.gift && !entry.in && entry.uniqueGift)
+		? tr::lng_credits_box_history_entry_gift_transfer
+		: (entry.starsConverted || (entry.gift && !entry.in))
 		? tr::lng_credits_box_history_entry_gift_sent
 		: entry.gift
 		? tr::lng_credits_box_history_entry_gift_name
@@ -597,4 +702,26 @@ QImage CreditsWhiteDoubledIcon(int size, float64 outlineRatio) {
 	return result;
 }
 
+std::unique_ptr<Ui::Text::CustomEmoji> MakeCreditsIconEmoji(
+		int height,
+		int count) {
+	return std::make_unique<Ui::CustomEmoji::Internal>(
+		u"credits_icon:%1:%2"_q.arg(height).arg(count),
+		GenerateStars(height, count));
+}
+
+Ui::Text::MarkedContext MakeCreditsIconContext(int height, int count) {
+	auto customEmojiFactory = [=](
+		QStringView data,
+		const Ui::Text::MarkedContext &context
+	) -> std::unique_ptr<Ui::Text::CustomEmoji> {
+		return MakeCreditsIconEmoji(height, count);
+	};
+	return { .customEmojiFactory = std::move(customEmojiFactory) };
+}
+
+TextWithEntities MakeCreditsIconEntity() {
+	return Ui::Text::SingleCustomEmoji(Ui::kCreditsCurrency);
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.h b/Telegram/SourceFiles/ui/effects/credits_graphics.h
index d2a6ef7b8291b7..08496856d1fa4f 100644
--- a/Telegram/SourceFiles/ui/effects/credits_graphics.h
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.h
@@ -19,6 +19,11 @@ namespace Main {
 class Session;
 } // namespace Main
 
+namespace Ui::Text {
+class CustomEmoji;
+struct MarkedContext;
+} // namespace Ui::Text
+
 namespace Ui {
 
 class MaskedInputField;
@@ -40,7 +45,7 @@ using PaintRoundImageCallback = Fn<void(
 
 [[nodiscard]] not_null<Ui::MaskedInputField*> AddInputFieldForCredits(
 	not_null<Ui::VerticalLayout*> container,
-	rpl::producer<uint64> value);
+	rpl::producer<CreditsAmount> value);
 
 PaintRoundImageCallback GenerateCreditsPaintUserpicCallback(
 	const Data::CreditsHistoryEntry &entry);
@@ -82,4 +87,12 @@ Fn<void(QPainter &)> PaintOutlinedColoredCreditsIconCallback(
 
 [[nodiscard]] QImage CreditsWhiteDoubledIcon(int size, float64 outlineRatio);
 
+[[nodiscard]] std::unique_ptr<Ui::Text::CustomEmoji> MakeCreditsIconEmoji(
+	int height,
+	int count);
+[[nodiscard]] Ui::Text::MarkedContext MakeCreditsIconContext(
+	int height,
+	int count);
+[[nodiscard]] TextWithEntities MakeCreditsIconEntity();
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
index 0552994f09d7c0..e89d7863d40dca 100644
--- a/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/emoji_fly_animation.cpp
@@ -45,12 +45,12 @@ EmojiFlyAnimation::EmojiFlyAnimation(
 	_flySize,
 	tag)
 , _layer(body) {
-	body->sizeValue() | rpl::start_with_next([=](QSize size) {
+	body->sizeValue() | rpl::on_next([=](QSize size) {
 		_layer.setGeometry(QRect(QPoint(), size));
 	}, _layer.lifetime());
 
 	_layer.paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		const auto target = _target.data();
 		if (!target || !target->isVisible()) {
 			return;
diff --git a/Telegram/SourceFiles/ui/effects/fireworks_animation.cpp b/Telegram/SourceFiles/ui/effects/fireworks_animation.cpp
index f9eb099a2278c8..a3ccc059efb4ad 100644
--- a/Telegram/SourceFiles/ui/effects/fireworks_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/fireworks_animation.cpp
@@ -19,30 +19,17 @@ constexpr auto kFirstUpdateTime = crl::time(16);
 constexpr auto kFireworkWidth = 480;
 constexpr auto kFireworkHeight = 320;
 
-QBrush Brush(int color) {
-	return QBrush{ QColor(
-		color & 0xFF,
-		(color >> 8) & 0xFF,
-		(color >> 16) & 0xFF)
-	};
-}
-
 std::vector<QBrush> PrepareBrushes() {
 	return {
-		Brush(0xff2CBCE8),
-		Brush(0xff9E04D0),
-		Brush(0xffFECB02),
-		Brush(0xffFD2357),
-		Brush(0xff278CFE),
-		Brush(0xff59B86C),
+		QBrush{ Ui::ColorFromSerialized(0xE8BC2C) },
+		QBrush{ Ui::ColorFromSerialized(0xD0049E) },
+		QBrush{ Ui::ColorFromSerialized(0x02CBFE) },
+		QBrush{ Ui::ColorFromSerialized(0x5723FD) },
+		QBrush{ Ui::ColorFromSerialized(0xFE8C27) },
+		QBrush{ Ui::ColorFromSerialized(0x6CB859) },
 	};
 }
 
-[[nodiscard]] float64 RandomFloat01() {
-	return base::RandomValue<uint32>()
-		/ float64(std::numeric_limits<uint32>::max());
-}
-
 } // namespace
 
 FireworksAnimation::FireworksAnimation(Fn<void()> repaint)
@@ -187,33 +174,43 @@ void FireworksAnimation::startFall() {
 
 void FireworksAnimation::initParticle(Particle &particle, bool falling) {
 	using Type = Particle::Type;
-	using base::RandomIndex;
 
-	particle.color = RandomIndex(_brushes.size());
-	particle.type = RandomIndex(2) ? Type::Rectangle : Type::Circle;
-	particle.right = (RandomIndex(2) == 1);
-	particle.finishedStart = 1 + RandomIndex(2);
+	constexpr auto kRandomPerParticle = 10;
+	auto random = std::array<uint32, kRandomPerParticle>();
+	base::RandomFill(random.data(), random.size() * sizeof(uint32));
+	auto index = 0;
+	const auto nextIndex = [&](int count) {
+		return int(random[index++] % count);
+	};
+	const auto nextFloat = [&] {
+		return random[index++] / float64(std::numeric_limits<uint32>::max());
+	};
+
+	particle.color = nextIndex(_brushes.size());
+	particle.type = nextIndex(2) ? Type::Rectangle : Type::Circle;
+	particle.right = (nextIndex(2) == 1);
+	particle.finishedStart = 1 + nextIndex(2);
 	if (particle.type == Type::Circle) {
-		particle.size = style::ConvertScale(6 + RandomFloat01() * 3);
+		particle.size = style::ConvertScale(6 + nextFloat() * 3);
 	} else {
-		particle.size = style::ConvertScale(6 + RandomFloat01() * 6);
-		particle.rotation = RandomIndex(360);
+		particle.size = style::ConvertScale(6 + nextFloat() * 6);
+		particle.rotation = nextIndex(360);
 	}
 	if (falling) {
-		particle.y = -RandomFloat01() * kFireworkHeight * 1.2f;
-		particle.x = 5 + RandomIndex(kFireworkWidth - 10);
+		particle.y = -nextFloat() * kFireworkHeight * 1.2f;
+		particle.x = 5 + nextIndex(kFireworkWidth - 10);
 		particle.xFinished = particle.finishedStart;
 	} else {
-		const auto xOffset = 4 + RandomIndex(10);
+		const auto xOffset = 4 + nextIndex(10);
 		const auto yOffset = kFireworkHeight / 4;
 		if (particle.right) {
 			particle.x = kFireworkWidth + xOffset;
 		} else {
 			particle.x = -xOffset;
 		}
-		particle.moveX = (particle.right ? -1 : 1) * (1.2 + RandomFloat01() * 4);
-		particle.moveY = -(4 + RandomFloat01() * 4);
-		particle.y = yOffset / 2 + RandomIndex(yOffset * 2);
+		particle.moveX = (particle.right ? -1 : 1) * (1.2 + nextFloat() * 4);
+		particle.moveY = -(4 + nextFloat() * 4);
+		particle.y = yOffset / 2 + nextIndex(yOffset * 2);
 	}
 }
 
diff --git a/Telegram/SourceFiles/ui/effects/loading_element.cpp b/Telegram/SourceFiles/ui/effects/loading_element.cpp
index 5cc2e5e90903b5..9d917684116cc6 100644
--- a/Telegram/SourceFiles/ui/effects/loading_element.cpp
+++ b/Telegram/SourceFiles/ui/effects/loading_element.cpp
@@ -31,21 +31,21 @@ class LoadingElement {
 
 class LoadingText final : public LoadingElement {
 public:
-	LoadingText(const style::FlatLabel &st);
+	LoadingText(const style::TextStyle &st);
 
 	[[nodiscard]] int height() const override;
 	void paint(QPainter &p, int width) override;
 
 private:
-	const style::FlatLabel &_st;
+	const style::TextStyle &_st;
 
 };
 
-LoadingText::LoadingText(const style::FlatLabel &st) : _st(st) {
+LoadingText::LoadingText(const style::TextStyle &st) : _st(st) {
 }
 
 int LoadingText::height() const {
-	return _st.style.lineHeight;
+	return _st.lineHeight;
 }
 
 void LoadingText::paint(QPainter &p, int width) {
@@ -54,10 +54,10 @@ void LoadingText::paint(QPainter &p, int width) {
 	p.setPen(Qt::NoPen);
 
 	p.setBrush(st::windowBgOver);
-	const auto h = _st.style.font->ascent;
+	const auto h = _st.font->ascent;
 	p.drawRoundedRect(
 		0,
-		height() - h - (height() - _st.style.font->height),
+		height() - h - (height() - _st.font->height),
 		width,
 		h,
 		h / 2,
@@ -68,6 +68,9 @@ void LoadingText::paint(QPainter &p, int width) {
 		rpl::lifetime &lifetime,
 		const style::DialogRow &st) {
 	using namespace style;
+	const auto button = lifetime.make_state<OutlineButton>(OutlineButton{
+		.textBgOver = st::windowBgOver,
+	});
 	const auto item = lifetime.make_state<PeerListItem>(PeerListItem{
 		.height = st.height,
 		.photoPosition = QPoint(st.padding.left(), st.padding.top()),
@@ -75,6 +78,7 @@ void LoadingText::paint(QPainter &p, int width) {
 		.nameStyle = st::semiboldTextStyle,
 		.statusPosition = QPoint(st.textLeft, st.textTop),
 		.photoSize = st.photoSize,
+		.button = { *button },
 	});
 	return *item;
 }
@@ -98,7 +102,7 @@ class LoadingPeerListItem final : public LoadingElement {
 			- (style.lineHeight - style.font->height);
 
 		p.setPen(Qt::NoPen);
-		p.setBrush(st::windowBgOver);
+		p.setBrush(_st.button.textBgOver);
 
 		p.drawEllipse(
 			_st.photoPosition.x(),
@@ -142,6 +146,7 @@ template <typename Element, typename ...ElementArgs>
 object_ptr<Ui::RpWidget> CreateLoadingElementWidget(
 		not_null<Ui::RpWidget*> parent,
 		int lines,
+		QColor bg,
 		rpl::producer<bool> rtl,
 		ElementArgs &&...args) {
 	auto widget = object_ptr<Ui::RpWidget>(parent);
@@ -157,7 +162,7 @@ object_ptr<Ui::RpWidget> CreateLoadingElementWidget(
 	const auto state = widget->lifetime().make_state<State>();
 	state->rtl = std::move(rtl);
 	state->rtl.value(
-	) | rpl::start_with_next([=] { raw->update(); }, raw->lifetime());
+	) | rpl::on_next([=] { raw->update(); }, raw->lifetime());
 	raw->resize(
 		raw->width(),
 		Element(std::forward<ElementArgs>(args)...).height() * lines);
@@ -186,7 +191,7 @@ object_ptr<Ui::RpWidget> CreateLoadingElementWidget(
 	};
 
 	widget->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		auto p = QPainter(raw);
 		if (state->rtl.current()) {
 			const auto r = raw->rect();
@@ -200,10 +205,10 @@ object_ptr<Ui::RpWidget> CreateLoadingElementWidget(
 	constexpr auto kTimeout = crl::time(1000);
 	constexpr auto kDuration = crl::time(1000);
 	widget->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		state->glare.width = width;
 		state->glare.validate(
-			st::dialogsBg->c,
+			bg,
 			[=] { raw->update(); },
 			kTimeout,
 			kDuration);
@@ -219,12 +224,13 @@ object_ptr<Ui::RpWidget> CreateLoadingElementWidget(
 
 object_ptr<Ui::RpWidget> CreateLoadingTextWidget(
 		not_null<Ui::RpWidget*> parent,
-		const style::FlatLabel &st,
+		const style::TextStyle &st,
 		int lines,
 		rpl::producer<bool> rtl) {
 	return CreateLoadingElementWidget<LoadingText>(
 		parent,
 		lines,
+		st::dialogsBg->c,
 		std::move(rtl),
 		st);
 }
@@ -232,10 +238,12 @@ object_ptr<Ui::RpWidget> CreateLoadingTextWidget(
 object_ptr<Ui::RpWidget> CreateLoadingPeerListItemWidget(
 		not_null<Ui::RpWidget*> parent,
 		const style::PeerListItem &st,
-		int lines) {
+		int lines,
+		std::optional<QColor> bgOverride) {
 	return CreateLoadingElementWidget<LoadingPeerListItem>(
 		parent,
 		lines,
+		bgOverride.value_or(st::dialogsBg->c),
 		rpl::single(false),
 		st);
 }
@@ -247,6 +255,7 @@ object_ptr<Ui::RpWidget> CreateLoadingDialogRowWidget(
 	return CreateLoadingElementWidget<LoadingPeerListItem>(
 		parent,
 		lines,
+		st::dialogsBg->c,
 		rpl::single(false),
 		st);
 }
diff --git a/Telegram/SourceFiles/ui/effects/loading_element.h b/Telegram/SourceFiles/ui/effects/loading_element.h
index 757250f0a9bce1..3faa3a187ad881 100644
--- a/Telegram/SourceFiles/ui/effects/loading_element.h
+++ b/Telegram/SourceFiles/ui/effects/loading_element.h
@@ -11,7 +11,7 @@ template <typename Object>
 class object_ptr;
 
 namespace style {
-struct FlatLabel;
+struct TextStyle;
 struct PeerListItem;
 struct DialogRow;
 } // namespace style
@@ -22,14 +22,15 @@ class RpWidget;
 
 object_ptr<Ui::RpWidget> CreateLoadingTextWidget(
 	not_null<Ui::RpWidget*> parent,
-	const style::FlatLabel &st,
+	const style::TextStyle &st,
 	int lines,
 	rpl::producer<bool> rtl);
 
 object_ptr<Ui::RpWidget> CreateLoadingPeerListItemWidget(
 	not_null<Ui::RpWidget*> parent,
 	const style::PeerListItem &st,
-	int lines);
+	int lines,
+	std::optional<QColor> bgOverride);
 
 object_ptr<Ui::RpWidget> CreateLoadingDialogRowWidget(
 	not_null<Ui::RpWidget*> parent,
diff --git a/Telegram/SourceFiles/ui/effects/message_sending_animation_common.h b/Telegram/SourceFiles/ui/effects/message_sending_animation_common.h
index a3877b615b4e10..a64b9fcbcfdf98 100644
--- a/Telegram/SourceFiles/ui/effects/message_sending_animation_common.h
+++ b/Telegram/SourceFiles/ui/effects/message_sending_animation_common.h
@@ -15,6 +15,7 @@ struct MessageSendingAnimationFrom {
 		Sticker,
 		Gif,
 		Emoji,
+		Text,
 	};
 	Type type = Type::None;
 	std::optional<MsgId> localId;
diff --git a/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp b/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp
index 552f464122ee12..07015b4540ccc5 100644
--- a/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp
+++ b/Telegram/SourceFiles/ui/effects/message_sending_animation_controller.cpp
@@ -11,7 +11,6 @@ For license and copyright information please follow this link:
 #include "data/data_session.h"
 #include "history/history_item.h"
 #include "history/view/history_view_element.h"
-#include "history/view/history_view_list_widget.h" // kItemRevealDuration
 #include "history/view/media/history_view_media.h"
 #include "main/main_session.h"
 #include "mainwidget.h"
@@ -21,7 +20,10 @@ For license and copyright information please follow this link:
 #include "ui/effects/animation_value_f.h"
 #include "ui/effects/animations.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/rp_widget.h"
+#include "ui/power_saving.h"
+#include "ui/text/text_isolated_emoji.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
 
@@ -58,6 +60,7 @@ class Content final : public RpWidget {
 
 	const not_null<Window::SessionController*> _controller;
 	const bool _crop;
+	const bool _isText;
 	MessageSendingAnimationController::SendingInfoTo _toInfo;
 	QRect _from;
 	QPoint _to;
@@ -84,10 +87,18 @@ Content::Content(
 : RpWidget(parent)
 , _controller(controller)
 , _crop(fromInfo.crop)
+, _isText(fromInfo.type == MessageSendingAnimationFrom::Type::Text)
 , _toInfo(std::move(to))
 , _from(parent->mapFromGlobal(fromInfo.globalStartGeometry))
-, _innerContentRect(maybeView()->media()->contentRectForReactions())
-, _minScale(float64(_from.height()) / _innerContentRect.height()) {
+, _innerContentRect(_isText
+	? [&] {
+		const auto g = maybeView()->innerGeometry();
+		return Rect(g.size()) + QMargins(0, g.top(), 0, 0);
+	}()
+	: maybeView()->media()->contentRectForReactions())
+, _minScale(!_isText
+	? float64(_from.height()) / _innerContentRect.height()
+	: 1.) {
 	Expects(_toInfo.view != nullptr);
 	Expects(_toInfo.paintContext != nullptr);
 
@@ -98,7 +109,7 @@ Content::Content(
 	base::take(
 		_toInfo.globalEndTopLeft
 	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](const std::optional<QPoint> &p) {
+	) | rpl::on_next([=](const std::optional<QPoint> &p) {
 		if (p) {
 			_to = parent->mapFromGlobal(*p);
 		} else {
@@ -107,7 +118,7 @@ Content::Content(
 	}, lifetime());
 
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
@@ -117,24 +128,42 @@ Content::Content(
 
 	auto animationCallback = [=](float64 value) {
 		auto resultFrom = rect();
-		resultFrom.moveCenter(_from.center());
+		if (_isText) {
+			resultFrom.moveTo(
+				style::RightToLeft()
+					? (rect::right(_from) - resultFrom.width())
+					: _from.left(),
+				_from.y());
+			// Calculating relative values for all possible cases
+			// is too complex, so we manually set the position
+			// for the simplest case.
+			resultFrom.translate(st::messageSendingAnimationTextFromOffset);
+		} else {
+			resultFrom.moveCenter(_from.center());
+		}
 
-		const auto resultTo = _to
-			+ innerGeometry.topLeft()
-			+ _innerContentRect.topLeft();
-		const auto x = anim::interpolate(resultFrom.x(), resultTo.x(), value);
+		const auto resultTo = _isText
+			? _to + innerGeometry.topLeft()
+			: _to + innerGeometry.topLeft() + _innerContentRect.topLeft();
+		const auto xEase = anim::easeOutQuint(1.0, value);
+		const auto x = anim::interpolate(resultFrom.x(), resultTo.x(), xEase);
 		const auto y = anim::interpolate(resultFrom.y(), resultTo.y(), value);
-		moveToLeft(x, y);
-		update();
+		if (!_isText) {
+			// Text-only messages are drawing only in _bubble.widget.
+			moveToLeft(x, y);
+			update();
+		} else {
+			setUpdatesEnabled(false);
+		}
 
-		if ((value > kSurroundingProgress)
+		if ((value > kSurroundingProgress || _isText)
 			&& !_surrounding
 			&& !_bubble.widget) {
 			const auto currentView = maybeView();
 			if (!checkView(currentView)) {
 				return;
 			}
-			if (currentView->hasBubble()) {
+			if (_isText || currentView->hasBubble()) {
 				createBubble();
 			} else {
 				createSurrounding();
@@ -166,7 +195,8 @@ Content::Content(
 		std::move(animationCallback),
 		0.,
 		1.,
-		HistoryView::ListWidget::kItemRevealDuration);
+		st::itemRevealDuration,
+		anim::easeOutQuint);
 }
 
 HistoryView::Element *Content::maybeView() const {
@@ -268,7 +298,7 @@ void Content::createSurrounding() {
 	stackUnder(_surrounding.get());
 
 	_surrounding->paintRequest(
-	) | rpl::start_with_next([=, size = surroundingSize](const QRect &r) {
+	) | rpl::on_next([=, size = surroundingSize](const QRect &r) {
 		Painter p(_surrounding);
 
 		p.fillRect(r, Qt::transparent);
@@ -280,12 +310,12 @@ void Content::createSurrounding() {
 		const auto alpha = (divider - revProgress) / divider;
 		p.setOpacity(alpha);
 
-	 	const auto scale = anim::interpolateF(_minScale, 1., progress);
+		const auto scale = anim::interpolateF(_minScale, 1., progress);
 
-	 	p.translate(
-	 		revProgress * OffsetMid(size.width() + offset.x(), _minScale),
-	 		revProgress * OffsetMid(size.height() + offset.y(), _minScale));
-	 	p.scale(scale, scale);
+		p.translate(
+			revProgress * OffsetMid(size.width() + offset.x(), _minScale),
+			revProgress * OffsetMid(size.height() + offset.y(), _minScale));
+		p.scale(scale, scale);
 
 		const auto currentView = maybeView();
 		if (!checkView(currentView)) {
@@ -312,7 +342,11 @@ void Content::createBubble() {
 
 	const auto tailWidth = st::historyBubbleTailOutLeft.width();
 	_bubble.offsetFromContent = QPoint(
-		currentView->hasOutLayout() ? 0 : tailWidth,
+		(currentView->hasOutLayout()
+			&& (currentView->delegate()->elementChatMode()
+				!= HistoryView::ElementChatMode::Wide))
+			? 0
+			: tailWidth,
 		innerGeometry.y());
 
 	const auto scaleOffset = QPoint(0, innerGeometry.y());
@@ -323,22 +357,26 @@ void Content::createBubble() {
 		|| currentView->data()->externalReply();
 	_bubble.widget->resize(innerGeometry.size()
 		+ QSize(
-			currentView->hasOutLayout() ? tailWidth : 0,
-			hasCommentsButton ? innerGeometry.y() : 0));
+			(currentView->hasOutLayout() ? tailWidth : 0)
+				+ (_isText && currentView->data()->isPost()
+					? rect::m::sum::h(st::msgPadding)
+						+ st::historyFastShareSize
+					: 0),
+			(hasCommentsButton || _isText) ? innerGeometry.y() : 0));
 	_bubble.widget->show();
 
 	_bubble.widget->stackUnder(this);
 
 	_bubble.widget->paintRequest(
-	) | rpl::start_with_next([=](const QRect &r) {
-		Painter p(_bubble.widget);
+	) | rpl::on_next([=, raw = _bubble.widget.get()](const QRect &r) {
+		auto p = Painter(raw);
 
 		p.fillRect(r, Qt::transparent);
 
 		const auto progress = _animation.value(0.);
 		const auto revProgress = 1. - progress;
 
-		const auto divider = 1. - kSurroundingProgress;
+		const auto divider = 1. - (_isText ? 0. : kSurroundingProgress);
 		const auto alpha = (divider - revProgress) / divider;
 		p.setOpacity(alpha);
 
@@ -358,10 +396,24 @@ void Content::createBubble() {
 		context.skipDrawingParts = Context::SkipDrawingParts::Content;
 		context.outbg = currentView->hasOutLayout();
 
-		context.translate(paintOffsetLeft, 0);
+		const auto diff = context.viewport.height() - raw->height();
+		auto bottom = anim::interpolate(_from.y(), _to.y(), progress);
+		if (bottom > diff) {
+			bottom = diff;
+		}
+		if (bottom < raw->height()) {
+			bottom = raw->height();
+		}
+		context.translate(paintOffsetLeft, -context.viewport.y() - bottom);
 		p.translate(-paintOffsetLeft, 0);
 
 		currentView->draw(p, context);
+		if (_isText) {
+			p.setOpacity(1.);
+			p.setClipRect(QRect(0, 0, 0, 0));
+			context.skipDrawingParts = Context::SkipDrawingParts::Bubble;
+			currentView->draw(p, context);
+		}
 	}, _bubble.widget->lifetime());
 }
 
@@ -375,12 +427,12 @@ MessageSendingAnimationController::MessageSendingAnimationController(
 
 void MessageSendingAnimationController::subscribeToDestructions() {
 	_controller->session().data().itemIdChanged(
-	) | rpl::start_with_next([=](Data::Session::IdChange change) {
+	) | rpl::on_next([=](Data::Session::IdChange change) {
 		_itemSendPending.remove(change.oldId);
 	}, _lifetime);
 
 	_controller->session().data().itemRemoved(
-	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+	) | rpl::on_next([=](not_null<const HistoryItem*> item) {
 		_itemSendPending.remove(item->id);
 		_processing.remove(item);
 	}, _lifetime);
@@ -397,11 +449,13 @@ void MessageSendingAnimationController::appendSending(
 }
 
 void MessageSendingAnimationController::startAnimation(SendingInfoTo &&to) {
-	if (anim::Disabled()) {
+	if (anim::Disabled()
+		|| PowerSaving::On(PowerSaving::Flag::kChatEffects)) {
 		return;
 	}
 	const auto container = _controller->content();
-	const auto item = to.view()->data();
+	const auto view = to.view();
+	const auto item = view->data();
 
 	const auto it = _itemSendPending.find(item->fullId().msg);
 	if (it == end(_itemSendPending)) {
@@ -410,6 +464,10 @@ void MessageSendingAnimationController::startAnimation(SendingInfoTo &&to) {
 	auto from = std::move(it->second);
 	_itemSendPending.erase(it);
 
+	if (view->isolatedEmoji() || view->onlyCustomEmoji()) {
+		return;
+	}
+
 	auto content = base::make_unique_q<Content>(
 		container,
 		_controller,
@@ -417,7 +475,7 @@ void MessageSendingAnimationController::startAnimation(SendingInfoTo &&to) {
 		std::move(to));
 
 	content->destroyRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_processing.erase(item);
 	}, content->lifetime());
 
@@ -443,6 +501,7 @@ bool MessageSendingAnimationController::checkExpectedType(
 	const auto type = it->second.type;
 	const auto isSticker = type == MessageSendingAnimationFrom::Type::Sticker;
 	const auto isGif = type == MessageSendingAnimationFrom::Type::Gif;
+	const auto isText = type == MessageSendingAnimationFrom::Type::Text;
 	if (isSticker || isGif) {
 		if (item->emptyText()) {
 			if (const auto media = item->media()) {
@@ -454,6 +513,8 @@ bool MessageSendingAnimationController::checkExpectedType(
 				}
 			}
 		}
+	} else if (isText && !item->media()) {
+		return true;
 	}
 	_itemSendPending.erase(it);
 	return false;
diff --git a/Telegram/SourceFiles/ui/effects/ministar_particles.cpp b/Telegram/SourceFiles/ui/effects/ministar_particles.cpp
new file mode 100644
index 00000000000000..59fd7c49c68129
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/ministar_particles.cpp
@@ -0,0 +1,225 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/ministar_particles.h"
+
+#include "ui/painter.h"
+#include "ui/color_int_conversion.h"
+#include "base/random.h"
+
+#include <QtGui/QPainterPath>
+#include <QtMath>
+
+namespace Ui {
+
+StarParticles::StarParticles(Type type, int count, int size)
+: _type(type)
+, _count(count)
+, _starSize(size) {
+	generate();
+}
+
+void StarParticles::setSpeed(float speed) {
+	_speed = speed;
+}
+
+void StarParticles::setVisible(float visible) {
+	_visible = visible;
+}
+
+void StarParticles::setColor(const QColor &color) {
+	setColors({ color });
+}
+
+void StarParticles::setColors(std::vector<QColor> colors) {
+	Expects(!colors.empty());
+
+	const auto was = int(_colors.size());
+	_colors = std::move(colors);
+	const auto now = int(_colors.size());
+
+	_paintedCaches.clear();
+
+	if (now != was) {
+		if (now > 1) {
+			auto buffered = base::BufferedRandom<uint32>(_particles.size());
+			for (auto &p : _particles) {
+				p.colorIndex = base::RandomIndex(now, buffered);
+			}
+		} else {
+			for (auto &p : _particles) {
+				p.colorIndex = 0;
+			}
+		}
+
+	}
+}
+
+QImage StarParticles::generateStarCache(int size, QColor color) {
+	const auto ratio = style::DevicePixelRatio();
+	auto image = QImage(
+		size * ratio,
+		size * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(ratio);
+	image.fill(Qt::transparent);
+
+	auto p = QPainter(&image);
+	auto hq = PainterHighQualityEnabler(p);
+	p.setBrush(color);
+	p.setPen(Qt::NoPen);
+
+	auto star = QPainterPath();
+	const auto center = size / 2.;
+	const auto outerRadius = size / 2.;
+	const auto innerRadius = size / 5.;
+	const auto points = 4;
+
+	for (auto i = 0; i < points * 2; ++i) {
+		const auto angle = M_PI * i / points - M_PI / 2;
+		const auto radius = (i % 2 == 0) ? outerRadius : innerRadius;
+		const auto x = center + radius * std::cos(angle);
+		const auto y = center + radius * std::sin(angle);
+		if (i == 0) {
+			star.moveTo(x, y);
+		} else {
+			star.lineTo(x, y);
+		}
+	}
+	star.closeSubpath();
+	p.drawPath(star);
+
+	return image;
+}
+
+void StarParticles::generate() {
+	_particles.clear();
+	_particles.reserve(_count);
+
+	constexpr auto kRandomPerParticle = 13;
+	auto random = bytes::vector(_count * kRandomPerParticle);
+	base::RandomFill(random.data(), random.size());
+	auto idx = 0;
+	const auto next = [&] { return uchar(random[idx++]) / 255.; };
+
+	const auto colors = int(_colors.size());
+
+	for (auto i = 0; i < _count; ++i) {
+		auto p = Particle();
+		p.x = next();
+		p.y = next();
+		p.size = 0.3 + next() * 0.7;
+		p.rotation = next() * 360.;
+		p.vrotation = (next() - 0.5) * 180.;
+		p.alpha = 0.3 + next() * 0.7;
+
+		if (_type == Type::Right) {
+			p.vx = 0.5 + next() * 1.5;
+			p.vy = (next() - 0.5) * 1.5;
+		} else if (_type == Type::Radial) {
+			const auto angle = next() * 2 * M_PI;
+			const auto speed = 0.5 + next();
+			p.vx = std::cos(angle) * speed;
+			p.vy = std::sin(angle) * speed;
+		} else {
+			const auto angle = next() * 2 * M_PI;
+			const auto speed = 0.3 + next() * 0.5;
+			p.vx = -std::cos(angle) * speed;
+			p.vy = -std::sin(angle) * speed;
+		}
+
+		if (colors > 1) {
+			p.colorIndex = int(base::SafeRound(next() * (colors - 1)));
+		}
+
+		_particles.push_back(p);
+	}
+}
+
+void StarParticles::paint(
+		QPainter &p,
+		const QRect &rect,
+		crl::time now,
+		bool paused) {
+	if (_lastTime == 0) {
+		_lastTime = now;
+		return;
+	}
+
+	if (paused) {
+		if (!_pausedAt) {
+			_pausedAt = now;
+		}
+		now = _pausedAt - _pauseOffset;
+	} else {
+		if (_pausedAt) {
+			_pauseOffset += now - _pausedAt;
+			_pausedAt = 0;
+		}
+		now = now - _pauseOffset;
+	}
+
+	const auto validate = [&](int colorIndex) {
+		Expects(colorIndex >= 0 && colorIndex < _colors.size());
+
+		if (_paintedCaches.empty()) {
+			_paintedCaches.resize(_colors.size());
+		} else if (const auto result = _paintedCaches[colorIndex]
+			; !result.isNull()) {
+			return result;
+		}
+		const auto &color = _colors[colorIndex];
+		const auto colorKey = color.rgba();
+		const auto i = _starCache.find(colorKey);
+		const auto &cache = (i != end(_starCache))
+			? i->second
+			: _starCache.emplace(
+				colorKey,
+				generateStarCache(_starSize, color)).first->second;
+		_paintedCaches[colorIndex] = cache;
+		return cache;
+	};
+
+	const auto dt = (now - _lastTime) / 1000.;
+	_lastTime = now;
+
+	const auto visibleCount = int(_count * _visible);
+	for (auto i = 0; i < visibleCount; ++i) {
+		auto &particle = _particles[i];
+
+		particle.x += particle.vx * _speed * dt;
+		particle.y += particle.vy * _speed * dt;
+		particle.rotation += particle.vrotation * dt;
+
+		if (particle.x < -0.1 || particle.x > 1.1
+			|| particle.y < -0.1 || particle.y > 1.1) {
+			auto random = bytes::vector(1);
+			base::RandomFill(random.data(), random.size());
+			particle.x = (_type == Type::Right) ? 0. : 0.5;
+			particle.y = (_type == Type::Right)
+				? (uchar(random[0]) / 255.)
+				: 0.5;
+		}
+
+		const auto x = rect.x() + particle.x * rect.width();
+		const auto y = rect.y() + particle.y * rect.height();
+		const auto cache = validate(particle.colorIndex);
+		const auto size = cache.width()
+			/ cache.devicePixelRatio() * particle.size;
+
+		p.save();
+		p.setOpacity(particle.alpha);
+		p.translate(x, y);
+		p.rotate(particle.rotation);
+		p.drawImage(
+			QRectF(-size / 2, -size / 2, size, size),
+			cache);
+		p.restore();
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/ministar_particles.h b/Telegram/SourceFiles/ui/effects/ministar_particles.h
new file mode 100644
index 00000000000000..3394693b34611e
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/ministar_particles.h
@@ -0,0 +1,62 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+
+namespace Ui {
+
+class StarParticles final {
+public:
+	enum class Type {
+		Right,
+		Radial,
+		RadialInside,
+	};
+
+	StarParticles(Type type, int count, int size);
+
+	void setSpeed(float speed);
+	void setVisible(float visible);
+	void setColor(const QColor &color);
+	void setColors(std::vector<QColor> colors);
+	void paint(QPainter &p, const QRect &rect, crl::time now, bool paused);
+
+private:
+	struct Particle {
+		int colorIndex = 0;
+		float x = 0.;
+		float y = 0.;
+		float vx = 0.;
+		float vy = 0.;
+		float rotation = 0.;
+		float vrotation = 0.;
+		float size = 0.;
+		float alpha = 0.;
+		crl::time born = 0;
+	};
+
+	void generate();
+	[[nodiscard]] QImage generateStarCache(int size, QColor color);
+
+	Type _type;
+	int _count = 0;
+	int _starSize = 0;
+	float _speed = 1.f;
+	float _visible = 1.f;
+	std::vector<QColor> _colors = { QColor(255, 200, 70) };
+	std::vector<QImage> _paintedCaches;
+	std::vector<Particle> _particles;
+	base::flat_map<QRgb, QImage> _starCache;
+	crl::time _lastTime = 0;
+
+	crl::time _pausedAt = 0;
+	crl::time _pauseOffset = 0;
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/outline_segments.cpp b/Telegram/SourceFiles/ui/effects/outline_segments.cpp
index 7d4dd47facc196..21a7b1ce8e2bc1 100644
--- a/Telegram/SourceFiles/ui/effects/outline_segments.cpp
+++ b/Telegram/SourceFiles/ui/effects/outline_segments.cpp
@@ -69,13 +69,36 @@ void PaintOutlineSegments(
 	}
 }
 
-QLinearGradient UnreadStoryOutlineGradient(QRectF rect) {
+void PaintOutlineSegments(
+		QPainter &p,
+		QRectF rect,
+		float64 radius,
+		const std::vector<OutlineSegment> &segments) {
+	Expects(!segments.empty());
+
+	p.setBrush(Qt::NoBrush);
+	const auto count = std::min(int(segments.size()), kOutlineSegmentsMax);
+	if (count == 1 || true) {
+		p.setPen(QPen(segments.back().brush, segments.back().width));
+		p.drawRoundedRect(rect, radius, radius);
+		return;
+	}
+}
+
+QLinearGradient UnreadStoryOutlineGradient(
+		QRectF rect,
+		const QColor &c1,
+		const QColor &c2) {
 	auto result = QLinearGradient(rect.topRight(), rect.bottomLeft());
-	result.setStops({
-		{ 0., st::groupCallLive1->c },
-		{ 1., st::groupCallMuted1->c },
-	});
+	result.setStops({ { 0., c1 }, { 1., c2 } });
 	return result;
 }
 
+QLinearGradient UnreadStoryOutlineGradient(QRectF rect) {
+	return UnreadStoryOutlineGradient(
+		std::move(rect),
+		st::groupCallLive1->c,
+		st::groupCallMuted1->c);
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/outline_segments.h b/Telegram/SourceFiles/ui/effects/outline_segments.h
index 9a38cf9ce68d75..db50620b9041e7 100644
--- a/Telegram/SourceFiles/ui/effects/outline_segments.h
+++ b/Telegram/SourceFiles/ui/effects/outline_segments.h
@@ -22,6 +22,16 @@ void PaintOutlineSegments(
 	const std::vector<OutlineSegment> &segments,
 	float64 fromFullProgress = 1.);
 
+void PaintOutlineSegments(
+	QPainter &p,
+	QRectF rect,
+	float64 radius,
+	const std::vector<OutlineSegment> &segments);
+
+[[nodiscard]] QLinearGradient UnreadStoryOutlineGradient(
+	QRectF rect,
+	const QColor &c1,
+	const QColor &c2);
 [[nodiscard]] QLinearGradient UnreadStoryOutlineGradient(QRectF rect = {});
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/premium.style b/Telegram/SourceFiles/ui/effects/premium.style
index 7cbe72f68fe0dc..f5267ad4cd0ba4 100644
--- a/Telegram/SourceFiles/ui/effects/premium.style
+++ b/Telegram/SourceFiles/ui/effects/premium.style
@@ -25,6 +25,10 @@ PremiumBubble {
 	textSkip: pixels;
 	tailSize: size;
 	font: font;
+	additionalStyle: TextStyle;
+	additionalSkip: pixels;
+	subtextStyle: TextStyle;
+	subtextPadding: margins;
 }
 PremiumCover {
 	bg: color;
@@ -32,7 +36,9 @@ PremiumCover {
 	starTopSkip: pixels;
 	titlePadding: margins;
 	titleFont: font;
+	titleFg: color;
 	about: FlatLabel;
+	aboutMaxWidth: pixels;
 	additionalShadowForDarkThemes: bool;
 }
 ComposePremiumRequired {
@@ -55,6 +61,7 @@ defaultPremiumCover: PremiumCover {
 	starTopSkip: 37px;
 	titlePadding: margins(0px, 18px, 0px, 11px);
 	titleFont: boxTitleFont;
+	titleFg: windowBoldFg;
 	about: FlatLabel(defaultFlatLabel) {
 		style: premiumAboutTextStyle;
 		palette: TextPalette(defaultTextPalette) {
@@ -64,6 +71,7 @@ defaultPremiumCover: PremiumCover {
 		textFg: premiumButtonFg;
 		minWidth: 190px;
 	}
+	aboutMaxWidth: 0px;
 	additionalShadowForDarkThemes: true;
 }
 userPremiumCoverAbout: FlatLabel(boxDividerLabel) {
@@ -116,6 +124,9 @@ premiumPreviewAbout: FlatLabel(defaultFlatLabel) {
 	minWidth: 240px;
 	textFg: membersAboutLimitFg;
 	align: align(top);
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
 }
 premiumPreviewAboutPadding: margins(18px, 8px, 18px, 8px);
 premiumPreviewButtonLabel: FlatLabel(defaultFlatLabel) {
@@ -222,18 +233,6 @@ premiumGiftOption: PremiumOption {
 	badgeMargins: margins(5px, 1px, 5px, 0px);
 }
 
-premiumGiftUserpicPadding: margins(10px, 27px, 18px, 13px);
-premiumGiftTitlePadding: margins(18px, 0px, 18px, 0px);
-premiumGiftAboutPadding: margins(18px, 5px, 18px, 23px);
-premiumGiftTermsPadding: margins(18px, 27px, 18px, 0px);
-premiumGiftTerms: FlatLabel(defaultFlatLabel) {
-	minWidth: 256px;
-	align: align(top);
-	textFg: windowSubTextFg;
-	style: TextStyle(defaultTextStyle) {
-		font: font(11px);
-	}
-}
 premiumGiftBox: Box(premiumPreviewBox) {
 	buttonPadding: margins(12px, 12px, 12px, 12px);
 }
@@ -243,16 +242,18 @@ premiumGiftsUserpicButton: UserpicButton(defaultUserpicButton) {
 	photoSize: 66px;
 	photoPosition: point(-1px, -1px);
 }
-premiumGiftsUserpicBadgeSize: size(26px, 26px);
-premiumGiftsUserpicBadgeInner: 2px;
-premiumGiftsUserpicBadgeFont: font(14px bold);
-premiumGiftsBoostIcon: icon{{ "stories/boost_mini", windowBgActive }};
 
 boostSkipTop: 37px;
 boostLimits: PremiumLimits(defaultPremiumLimits) {
 	gradientFromLeft: true;
 	nonPremiumBg: windowBgRipple;
 }
+negativeStarsLimits: PremiumLimits(boostLimits) {
+	gradientFromLeft: false;
+}
+upgradePriceLimits: PremiumLimits(boostLimits) {
+	gradientFromLeft: false;
+}
 boostBubble: PremiumBubble(defaultPremiumBubble) {
 	height: 32px;
 	padding: margins(7px, 0px, 11px, 0px);
@@ -260,6 +261,21 @@ boostBubble: PremiumBubble(defaultPremiumBubble) {
 	textSkip: 2px;
 	tailSize: size(14px, 6px);
 	font: font(16px);
+	additionalStyle: TextStyle(defaultTextStyle) {
+		font: font(14px semibold);
+	}
+	additionalSkip: 2px;
+	subtextStyle: TextStyle(defaultTextStyle) {
+		font: font(10px);
+	}
+	subtextPadding: margins(11px, -5px, 11px, 0px);
+}
+starRatingBubble: PremiumBubble(boostBubble) {
+	font: font(16px semibold);
+}
+iconOnlyPremiumBubble: PremiumBubble(boostBubble) {
+	padding: margins(7px, 0px, 7px, 0px);
+	textSkip: 0px;
 }
 boostTitleSkip: 32px;
 boostTitle: FlatLabel(defaultFlatLabel) {
@@ -279,11 +295,23 @@ boostTitleBadgeSkip: 6px;
 boostCenteredTitle: FlatLabel(boostTitle) {
 	align: align(top);
 }
+darkEditStarsCenteredTitle: FlatLabel(boostCenteredTitle) {
+	textFg: groupCallMembersFg;
+}
 boostTextSkip: 5px;
 boostText: FlatLabel(defaultFlatLabel) {
 	minWidth: 40px;
 	align: align(top);
 }
+darkEditStarsText: FlatLabel(boostText) {
+	textFg: groupCallMembersFg;
+}
+boostTextPending: FlatLabel(boostText) {
+	textFg: windowSubTextFg;
+}
+boostTextNegative: FlatLabel(boostText) {
+	textFg: attentionButtonFg;
+}
 boostReassignText: FlatLabel(defaultFlatLabel) {
 	minWidth: 40px;
 	align: align(top);
@@ -292,12 +320,20 @@ boostBottomSkip: 6px;
 boostBox: Box(premiumPreviewDoubledLimitsBox) {
 	buttonPadding: margins(16px, 12px, 16px, 12px);
 	buttonHeight: 42px;
+	buttonWide: true;
 	button: RoundButton(defaultActiveButton) {
 		height: 42px;
 		textTop: 12px;
 		style: semiboldTextStyle;
 	}
 }
+darkEditStarsClose: IconButton(boxTitleClose) {
+	icon: icon {{ "box_button_close", groupCallMemberInactiveIcon }};
+	iconOver: icon {{ "box_button_close", groupCallMemberInactiveIcon }};
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: groupCallMembersBgOver;
+	}
+}
 
 boostReplaceUserpicsPadding: margins(0px, 18px, 0px, 20px);
 boostReplaceUserpicsSkip: 42px;
@@ -307,16 +343,20 @@ boostReplaceUserpic: UserpicButton(defaultUserpicButton) {
 	photoSize: 60px;
 }
 boostReplaceIcon: icon{{ "stories/boost_mini", premiumButtonFg }};
+guardBotReplaceIcon: icon{{ "chat/mini_shield_lock", premiumButtonFg }};
 boostReplaceIconSkip: 3px;
 boostReplaceIconOutline: 2px;
 boostReplaceIconAdd: point(4px, 2px);
 boostReplaceArrow: icon{{ "mediaview/next", windowSubTextFg }};
+boostReplaceUserpicsRow: UserpicsRow {
+	button: boostReplaceUserpic;
+	bg: windowBg;
+	shift: boostReplaceUserpicsShift;
+	stroke: boostReplaceIconOutline;
+	complex: true;
+}
 
-showOrIconLastSeen: icon{{ "settings/premium/large_lastseen", windowFgActive }};
-showOrIconReadTime: icon{{ "settings/premium/large_readtime", windowFgActive }};
-showOrIconBg: windowBgActive;
-showOrIconPadding: margins(12px, 12px, 12px, 12px);
-showOrIconMargin: margins(0px, 28px, 0px, 12px);
+showOrTitleIconMargin: 8px;
 showOrTitlePadding: margins(0px, 0px, 0px, 5px);
 showOrAboutPadding: margins(0px, 0px, 0px, 16px);
 showOrShowButton: RoundButton(defaultActiveButton) {
@@ -364,29 +404,48 @@ boostFeatureLink: icon{{ "settings/premium/features/feature_links", windowBgActi
 boostFeatureName: icon{{ "settings/premium/features/feature_color_names", windowBgActive }};
 boostFeatureStories: icon{{ "settings/premium/features/feature_stories", windowBgActive }};
 boostFeatureTranscribe: icon{{ "settings/premium/features/feature_voice", windowBgActive }};
+boostFeatureAutoTranslate: icon{{ "menu/translate", windowBgActive }};
 boostFeatureOffSponsored: icon{{ "settings/premium/features/feature_off_sponsored", windowBgActive }};
+boostFeatureProfileColor: icon{{ "settings/premium/features/feature_color_profile", windowBgActive }};
+boostFeatureProfileIcon: icon{{ "settings/premium/features/feature_profile_cover", windowBgActive }};
 
 paidReactBox: Box(boostBox) {
 	buttonPadding: margins(22px, 22px, 22px, 22px);
-	buttonHeight: 42px;
 	button: RoundButton(defaultActiveButton) {
 		height: 42px;
 		textTop: 12px;
 		style: semiboldTextStyle;
 	}
 }
+paidReactBoxCheckbox: Checkbox(defaultCheckbox) {
+	width: 0px;
+}
+darkEditStarsBox: Box(paidReactBox) {
+	bg: groupCallMembersBg;
+	title: FlatLabel(boxTitle) {
+		textFg: groupCallMembersFg;
+		align: align(top);
+	}
+}
 paidReactBubbleIcon: icon{{ "settings/premium/star", premiumButtonFg }};
 paidReactBubbleTop: 5px;
 paidReactSliderTop: 5px;
 paidReactSlider: MediaSlider(defaultContinuousSlider) {
-	activeFg: creditsBg3;
-	inactiveFg: creditsBg2;
-	activeFgOver: creditsBg3;
-	inactiveFgOver: creditsBg2;
-	activeFgDisabled: creditsBg3;
-	inactiveFgDisabled: creditsBg2;
-	width: 6px;
+	activeFg: windowBgOver;
+	inactiveFg: windowBgOver;
+	activeFgOver: windowBgOver;
+	inactiveFgOver: windowBgOver;
+	activeFgDisabled: windowBgOver;
+	inactiveFgDisabled: windowBgOver;
+	width: 16px;
 	seekSize: size(16px, 16px);
+	borderFg: creditsBg3;
+	borderWidth: 2px;
+}
+darkEditStarsSlider: MediaSlider(paidReactSlider) {
+	inactiveFg: groupCallMembersBgOver;
+	inactiveFgOver: groupCallMembersBgOver;
+	inactiveFgDisabled: groupCallMembersBgOver;
 }
 paidReactTitleSkip: 23px;
 paidReactTopTitleMargin: margins(10px, 26px, 10px, 12px);
@@ -394,16 +453,138 @@ paidReactTopMargin: margins(0px, 12px, 0px, 11px);
 paidReactTopUserpic: 42px;
 paidReactTopNameSkip: 47px;
 paidReactTopBadgeSkip: 32px;
+paidReactCrown: icon{{ "calls/filled_stream_crown-24x24", premiumButtonFg }};
+paidReactCrownTop: 7px;
+paidReactCrownSkip: 12px;
+paidReactCrownOutline: 1px;
+paidReactCrownSmall: icon{{ "calls/filled_stream_crown-20x20", premiumButtonFg }};
+paidReactCrownSmallTop: 4px;
+paidReactCrownMargin: margins(0px, 0px, 0px, 0px);
 paidReactToastLabel: FlatLabel(defaultFlatLabel) {
 	textFg: toastFg;
 	palette: defaultToastPalette;
 }
 paidReactTopStarIcon: icon{{ "chat/mini_stars", premiumButtonFg }};
-paidReactTopStarIconPosition: point(0px, 1px);
 paidReactTopStarSkip: 4px;
+paidReactChannelArrow: icon{{ "intro_country_dropdown", activeButtonFg }};
+paidReactChannelMenu: PopupMenu(popupMenuWithIcons) {
+	menu: Menu(menuWithIcons) {
+		widthMax: 240px;
+	}
+	maxHeight: 345px;
+}
 
 toastUndoStroke: 2px;
 toastUndoSpace: 8px;
 toastUndoDiameter: 20px;
 toastUndoSkip: 20px;
 toastUndoFont: font(12px bold);
+
+starrefCover: PremiumCover(userPremiumCover) {
+	bg: windowBgOver;
+	starTopSkip: 24px;
+	titlePadding: margins(0px, 12px, 0px, 11px);
+}
+starrefCoverHeight: 180px;
+starrefFooterButton: RoundButton(defaultActiveButton) {
+	height: 42px;
+	textTop: 12px;
+	style: semiboldTextStyle;
+}
+starrefFooterBox: Box(defaultBox) {
+	buttonPadding: margins(22px, 11px, 22px, 54px);
+	buttonHeight: 42px;
+	buttonWide: true;
+	button: starrefFooterButton;
+	shadowIgnoreTopSkip: true;
+}
+starrefCopyButton: RoundButton(starrefFooterButton) {
+	icon: icon {{ "info/edit/links_copy", activeButtonFg }};
+	iconOver: icon {{ "info/edit/links_copy", activeButtonFgOver }};
+	iconPosition: point(-1px, 5px);
+}
+
+starrefJoinIcon: icon{{ "payments/small_star", premiumButtonFg }};
+starrefJoinUserpicsPadding: margins(0px, 32px, 0px, 10px);
+starrefJoinTitlePadding: margins(0px, 0px, 0px, 12px);
+starrefCenteredText: FlatLabel(defaultFlatLabel) {
+	align: align(top);
+	minWidth: 40px;
+}
+starrefJoinFooter: FlatLabel(starrefCenteredText) {
+	textFg: windowSubTextFg;
+}
+starrefRevenueText: FlatLabel(starrefCenteredText) {
+	palette: TextPalette(defaultTextPalette) {
+		linkFg: creditsBg1;
+	}
+}
+
+starrefInfoIconPosition: point(16px, 8px);
+starrefBottomButton: RoundButton(defaultActiveButton) {
+	height: 44px;
+	textTop: 12px;
+	style: semiboldTextStyle;
+}
+starrefButtonMargin: margins(12px, 6px, 12px, 4px);
+starrefBottomButtonLabel: FlatLabel(defaultFlatLabel) {
+	textFg: windowFgActive;
+	style: semiboldTextStyle;
+	minWidth: 0px;
+}
+starrefBottomButtonSublabel: FlatLabel(starrefBottomButtonLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(11px semibold);
+	}
+}
+starrefBottomButtonLabelTop: 5px;
+starrefBottomButtonSublabelTop: 23px;
+starrefEndBulletSize: 6px;
+starrefEndBulletTop: 8px;
+starrefLinkThumbOuter: 64px;
+starrefLinkThumbInner: 48px;
+starrefLinkCountAdd: 6px;
+starrefLinkCountIcon: icon{{ "chat/mini_subscribers", historyPeerUserpicFg }};
+starrefLinkCountIconPosition: point(0px, 1px);
+starrefLinkCountFont: font(10px bold);
+starrefLinkCountPadding: margins(2px, 0px, 3px, 1px);
+starrefRecipientArrow: icon{{ "intro_country_dropdown", lightButtonFg }};
+starrefCommissionFont: font(10px semibold);
+starrefCommissionPadding: margins(3px, 0px, 3px, 0px);
+starrefLinkBadge: 16px;
+starrefLinkBadgeSkip: 1px;
+
+starrefAddForBotIcon: icon {{ "menu/bot_add", lightButtonFg }};
+starrefAddForBotIconPosition: point(23px, 2px);
+
+starrefPopupMenu: PopupMenu(defaultPopupMenu) {
+	maxHeight: 320px;
+	menu: Menu(defaultMenu) {
+		widthMin: 156px;
+		widthMax: 200px;
+	}
+}
+
+starSelectInfoPadding: margins(12px, 8px, 12px, 8px);
+starSelectInfoTitle: FlatLabel(defaultFlatLabel) {
+	minWidth: 40px;
+	textFg: windowBoldFg;
+	align: align(top);
+	style: TextStyle(boxTextStyle) {
+		font: font(18px semibold);
+	}
+}
+starSelectInfoSubtext: FlatLabel(defaultFlatLabel) {
+	minWidth: 40px;
+	textFg: windowFg;
+	align: align(top);
+	style: TextStyle(defaultTextStyle) {
+		font: font(10px);
+	}
+}
+videoStreamInfoTitle: FlatLabel(starSelectInfoTitle) {
+	textFg: groupCallMembersFg;
+}
+videoStreamInfoSubtext: FlatLabel(starSelectInfoSubtext) {
+	textFg: groupCallMembersFg;
+}
diff --git a/Telegram/SourceFiles/ui/effects/premium_3d_cover.cpp b/Telegram/SourceFiles/ui/effects/premium_3d_cover.cpp
new file mode 100644
index 00000000000000..0978a8a4f7627b
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_3d_cover.cpp
@@ -0,0 +1,431 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/premium_3d_cover.h"
+
+#include "ui/effects/premium_3d_support.h"
+#include "ui/gl/gl_surface.h"
+#include "base/random.h"
+#include "base/debug_log.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+#include <QRhiWidget>
+#endif // Qt >= 6.7
+
+namespace Ui::Premium {
+namespace {
+
+constexpr auto kDragYaw = 0.5;
+constexpr auto kDragPitch = 0.05;
+constexpr auto kMaxFrameDelta = crl::time(66);
+constexpr auto kMsInSecond = 1000.;
+constexpr auto kBackDuration = crl::time(600);
+constexpr auto kTapInDuration = crl::time(220);
+constexpr auto kTapBase = 40;
+constexpr auto kTapRandom = 30;
+constexpr auto kTapMaxMove = 4;
+constexpr auto kOvershootTension = 2.;
+
+} // namespace
+
+Object3dCover::Object3dCover(QWidget *parent, Descriptor descriptor)
+: RpWidget(parent)
+, _descriptor(descriptor)
+, _animation([=] { frame(); }) {
+}
+
+Object3dCover::~Object3dCover() = default;
+
+bool Object3dCover::Supported() {
+	return Object3dSupported();
+}
+
+void Object3dCover::setShownProgress(float64 progress) {
+	progress = std::clamp(progress, 0., 1.);
+	if (_opacity == progress) {
+		return;
+	}
+	_opacity = progress;
+	if (!_animation.animating()) {
+		pushState();
+		if (const auto w = surfaceWidget()) {
+			w->update();
+		}
+	}
+}
+
+void Object3dCover::setPaused(bool paused) {
+	if (_paused == paused) {
+		return;
+	}
+	_paused = paused;
+	if (_paused) {
+		freeze();
+	} else {
+		unfreeze();
+	}
+}
+
+void Object3dCover::freeze() {
+	stopAnimation();
+	_pausedAt = crl::now();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	const auto w = surfaceWidget();
+	if (!w || w->isHidden()) {
+		return;
+	}
+	const auto rhi = qobject_cast<QRhiWidget*>(w);
+	auto image = rhi ? rhi->grabFramebuffer() : QImage();
+	if (image.isNull()) {
+		return;
+	}
+	_frozen = std::move(image);
+	pushState();
+	w->update();
+	update();
+#endif // Qt >= 6.7
+}
+
+void Object3dCover::unfreeze() {
+	if (!_frozen.isNull()) {
+		_frozen = QImage();
+		update();
+	}
+	if (_pausedAt) {
+		const auto delta = crl::now() - _pausedAt;
+		if (_gesture) {
+			_gesture->start += delta;
+		}
+		if (_idleAt) {
+			_idleAt += delta;
+		}
+		_pausedAt = 0;
+	}
+	if (!isHidden()) {
+		startAnimation();
+	}
+}
+
+void Object3dCover::setNight(bool night) {
+	if (_night == night) {
+		return;
+	}
+	_night = night;
+	if (!_animation.animating()) {
+		pushState();
+		if (const auto w = surfaceWidget()) {
+			w->update();
+		}
+	}
+}
+
+rpl::producer<float64> Object3dCover::flungStrength() const {
+	return _flung.events();
+}
+
+QWidget *Object3dCover::surfaceWidget() const {
+	return _surface ? _surface->rpWidget() : nullptr;
+}
+
+void Object3dCover::ensureSurface() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (_surface) {
+		return;
+	}
+	_surface = GL::CreateSurface(
+		this,
+		GL::ChosenRenderer{
+			.renderer = createRenderer(),
+			.backend = GL::Backend::QRhi,
+		});
+	if (const auto w = surfaceWidget()) {
+		if (const auto rhiWidget = qobject_cast<QRhiWidget*>(w)) {
+			rhiWidget->setSampleCount(_descriptor.sampleCount);
+		} else {
+			LOG(("Premium3dCover: surface is not a QRhiWidget, skip MSAA."));
+		}
+		w->setAttribute(Qt::WA_TransparentForMouseEvents);
+		w->setAttribute(Qt::WA_AlwaysStackOnTop);
+		w->setGeometry(rect());
+		w->hide();
+	}
+#endif // Qt >= 6.7
+}
+
+void Object3dCover::startAnimation() {
+	if (_paused || _animation.animating()) {
+		return;
+	}
+	_lastFrame = crl::now();
+	_animation.start();
+}
+
+void Object3dCover::stopAnimation() {
+	_animation.stop();
+}
+
+void Object3dCover::advance(float64 dt) {
+	_time += dt;
+	_time -= _descriptor.period * std::floor(_time / _descriptor.period);
+}
+
+void Object3dCover::applyChannel(Channel channel, float64 value) {
+	switch (channel) {
+	case Channel::Yaw: _yaw = value; break;
+	case Channel::Pitch: _pitch = value; break;
+	}
+}
+
+void Object3dCover::tick(crl::time now) {
+	const auto ease = [](Easing easing, float64 t) -> float64 {
+		switch (easing) {
+		case Easing::Linear:
+			return t;
+		case Easing::EaseOutQuint:
+			return CubicBezier(0.23, 1., 0.32, 1., t);
+		case Easing::Overshoot: {
+			const auto u = t - 1.;
+			return u * u * ((kOvershootTension + 1.) * u + kOvershootTension)
+				+ 1.;
+		}
+		}
+		return t;
+	};
+	const auto valueAt = [](const Track &track, float64 eased) -> float64 {
+		const auto last = int(track.values.size()) - 1;
+		if (last <= 0) {
+			return track.values.empty() ? 0. : track.values.front();
+		} else if (last == 1) {
+			return track.values[0]
+				+ eased * (track.values[1] - track.values[0]);
+		}
+		const auto position = eased * last;
+		const auto segment = std::clamp(
+			int(std::floor(position)),
+			0,
+			last - 1);
+		const auto local = position - segment;
+		return track.values[segment]
+			+ local * (track.values[segment + 1] - track.values[segment]);
+	};
+
+	if (_gesture) {
+		const auto elapsed = now - _gesture->start;
+		for (const auto &track : _gesture->tracks) {
+			if (elapsed < track.delay) {
+				continue;
+			}
+			const auto local = std::min(
+				elapsed - track.delay,
+				track.duration);
+			const auto fraction = (track.duration > 0)
+				? (local / float64(track.duration))
+				: 1.;
+			applyChannel(
+				track.channel,
+				valueAt(track, ease(track.easing, fraction)));
+		}
+		if (elapsed >= _gesture->total) {
+			_yaw = 0.;
+			_gesture.reset();
+			scheduleIdle(_descriptor.respinDelay);
+		}
+	} else if (_idleAt && now >= _idleAt && !_dragging) {
+		_idleAt = 0;
+		startSpin();
+	}
+}
+
+void Object3dCover::pushState() {
+	applyState(
+		float(_yaw),
+		float(_pitch),
+		float(_time),
+		_paused ? 0.f : float(_opacity),
+		_night);
+}
+
+void Object3dCover::frame() {
+	const auto now = crl::now();
+	const auto delta = std::clamp(
+		now - _lastFrame,
+		crl::time(1),
+		kMaxFrameDelta);
+	_lastFrame = now;
+	advance(delta / kMsInSecond);
+	tick(now);
+	pushState();
+	if (const auto w = surfaceWidget()) {
+		w->update();
+	}
+}
+
+void Object3dCover::play(Gesture gesture) {
+	gesture.start = crl::now();
+	gesture.total = 0;
+	for (const auto &track : gesture.tracks) {
+		gesture.total = std::max(gesture.total, track.delay + track.duration);
+	}
+	cancelIdle();
+	_gesture = std::move(gesture);
+}
+
+void Object3dCover::scheduleIdle(crl::time delay) {
+	_idleAt = crl::now() + delay;
+}
+
+void Object3dCover::cancelIdle() {
+	_idleAt = 0;
+}
+
+void Object3dCover::startSpin() {
+	auto gesture = Gesture();
+	gesture.tracks.push_back({
+		.channel = Channel::Yaw,
+		.values = { 0., 360. },
+		.duration = _descriptor.spinDuration,
+		.easing = _descriptor.spinEaseOut
+			? Easing::EaseOutQuint
+			: Easing::Linear,
+	});
+	play(std::move(gesture));
+}
+
+void Object3dCover::startBackSpring() {
+	const auto fromYaw = _yaw;
+	const auto fromPitch = _pitch;
+	auto gesture = Gesture();
+	gesture.tracks.push_back({
+		.channel = Channel::Yaw,
+		.values = { fromYaw, 0. },
+		.duration = kBackDuration,
+		.easing = Easing::Overshoot,
+	});
+	gesture.tracks.push_back({
+		.channel = Channel::Pitch,
+		.values = { fromPitch, 0. },
+		.duration = kBackDuration,
+		.easing = Easing::Overshoot,
+	});
+	play(std::move(gesture));
+	const auto magnitude = std::abs(fromYaw + fromPitch);
+	if (magnitude > 0.) {
+		_flung.fire_copy(magnitude);
+	}
+	scheduleIdle(_descriptor.respinDelay);
+}
+
+void Object3dCover::startTapTilt(QPoint position) {
+	const auto radius = std::max(width(), 1) / 2.;
+	const auto toYaw = (kTapBase + base::RandomIndex(kTapRandom))
+		* (radius - position.x()) / radius;
+	const auto toPitch = (kTapBase + base::RandomIndex(kTapRandom))
+		* (radius - position.y()) / radius;
+	auto gesture = Gesture();
+	gesture.tracks.push_back({
+		.channel = Channel::Yaw,
+		.values = { 0., toYaw },
+		.duration = kTapInDuration,
+		.easing = Easing::EaseOutQuint,
+	});
+	gesture.tracks.push_back({
+		.channel = Channel::Yaw,
+		.values = { toYaw, 0. },
+		.delay = kTapInDuration,
+		.duration = kBackDuration,
+		.easing = Easing::Overshoot,
+	});
+	gesture.tracks.push_back({
+		.channel = Channel::Pitch,
+		.values = { 0., toPitch },
+		.duration = kTapInDuration,
+		.easing = Easing::EaseOutQuint,
+	});
+	gesture.tracks.push_back({
+		.channel = Channel::Pitch,
+		.values = { toPitch, 0. },
+		.delay = kTapInDuration,
+		.duration = kBackDuration,
+		.easing = Easing::Overshoot,
+	});
+	play(std::move(gesture));
+}
+
+void Object3dCover::paintEvent(QPaintEvent *e) {
+	if (_frozen.isNull()) {
+		return;
+	}
+	auto p = QPainter(this);
+	p.drawImage(rect(), _frozen);
+}
+
+void Object3dCover::resizeEvent(QResizeEvent *e) {
+	if (const auto w = surfaceWidget()) {
+		w->setGeometry(rect());
+	}
+}
+
+void Object3dCover::showEvent(QShowEvent *e) {
+	ensureSurface();
+	if (const auto w = surfaceWidget()) {
+		w->show();
+	}
+	if (!_entered) {
+		_entered = true;
+		_yaw = _pitch = 0.;
+		_gesture.reset();
+		scheduleIdle(0);
+	}
+	startAnimation();
+}
+
+void Object3dCover::hideEvent(QHideEvent *e) {
+	stopAnimation();
+	if (_entered) {
+		return;
+	}
+	_gesture.reset();
+	cancelIdle();
+	_yaw = _pitch = 0.;
+}
+
+void Object3dCover::mousePressEvent(QMouseEvent *e) {
+	_dragging = true;
+	_moved = false;
+	_pressPos = e->pos();
+	_lastDragPos = e->pos();
+	_gesture.reset();
+	cancelIdle();
+}
+
+void Object3dCover::mouseMoveEvent(QMouseEvent *e) {
+	if (!_dragging) {
+		return;
+	}
+	const auto pos = e->pos();
+	if ((pos - _pressPos).manhattanLength() > kTapMaxMove) {
+		_moved = true;
+	}
+	const auto shift = pos - _lastDragPos;
+	_yaw += -shift.x() * kDragYaw;
+	_pitch += -shift.y() * kDragPitch;
+	_lastDragPos = pos;
+}
+
+void Object3dCover::mouseReleaseEvent(QMouseEvent *e) {
+	if (!_dragging) {
+		return;
+	}
+	_dragging = false;
+	if (_moved) {
+		startBackSpring();
+	} else {
+		startTapTilt(_pressPos);
+	}
+}
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_3d_cover.h b/Telegram/SourceFiles/ui/effects/premium_3d_cover.h
new file mode 100644
index 00000000000000..60ba3137a1fa73
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_3d_cover.h
@@ -0,0 +1,128 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/effects/animations.h"
+
+namespace Ui::GL {
+class Renderer;
+} // namespace Ui::GL
+
+namespace Ui::Premium {
+
+class Object3dCover : public RpWidget {
+public:
+	struct Descriptor {
+		crl::time spinDuration = 0;
+		crl::time respinDelay = 0;
+		float64 period = 0.;
+		bool spinEaseOut = false;
+		int sampleCount = 4;
+	};
+
+	[[nodiscard]] static bool Supported();
+
+	void setShownProgress(float64 progress);
+	void setPaused(bool paused);
+	void setNight(bool night);
+
+	[[nodiscard]] rpl::producer<float64> flungStrength() const;
+
+protected:
+	Object3dCover(QWidget *parent, Descriptor descriptor);
+	~Object3dCover();
+
+	[[nodiscard]] virtual std::unique_ptr<Ui::GL::Renderer> createRenderer()
+		= 0;
+	virtual void applyState(
+		float yaw,
+		float pitch,
+		float time,
+		float alpha,
+		bool night) = 0;
+
+	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+	void showEvent(QShowEvent *e) override;
+	void hideEvent(QHideEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+
+private:
+	enum class Channel {
+		Yaw,
+		Pitch,
+	};
+	enum class Easing {
+		Linear,
+		EaseOutQuint,
+		Overshoot,
+	};
+	struct Track {
+		Channel channel = Channel::Yaw;
+		std::vector<float64> values;
+		crl::time delay = 0;
+		crl::time duration = 0;
+		Easing easing = Easing::Linear;
+	};
+	struct Gesture {
+		std::vector<Track> tracks;
+		crl::time start = 0;
+		crl::time total = 0;
+	};
+
+	void ensureSurface();
+	[[nodiscard]] QWidget *surfaceWidget() const;
+	void freeze();
+	void unfreeze();
+	void startAnimation();
+	void stopAnimation();
+	void frame();
+	void advance(float64 dt);
+	void tick(crl::time now);
+	void pushState();
+
+	void applyChannel(Channel channel, float64 value);
+	void play(Gesture gesture);
+	void scheduleIdle(crl::time delay);
+	void cancelIdle();
+	void startSpin();
+	void startBackSpring();
+	void startTapTilt(QPoint position);
+
+	const Descriptor _descriptor;
+	std::unique_ptr<RpWidgetWrap> _surface;
+	QImage _frozen;
+	Ui::Animations::Basic _animation;
+	crl::time _lastFrame = 0;
+
+	float64 _yaw = 0.;
+	float64 _pitch = 0.;
+	float64 _time = 0.;
+	float64 _opacity = 1.;
+	bool _night = false;
+
+	std::optional<Gesture> _gesture;
+	crl::time _idleAt = 0;
+
+	bool _dragging = false;
+	bool _moved = false;
+	QPoint _pressPos;
+	QPoint _lastDragPos;
+
+	rpl::event_stream<float64> _flung;
+
+	bool _paused = false;
+	bool _entered = false;
+	crl::time _pausedAt = 0;
+
+};
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_3d_mesh.cpp b/Telegram/SourceFiles/ui/effects/premium_3d_mesh.cpp
new file mode 100644
index 00000000000000..b8541b310714f1
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_3d_mesh.cpp
@@ -0,0 +1,138 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/premium_3d_mesh.h"
+
+#include <QtCore/QFile>
+#include <QtCore/QDataStream>
+#include <QtGui/QImage>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+#include "ui/rhi/rhi_shader.h"
+#include <rhi/qrhi.h>
+#endif // Qt >= 6.7
+
+namespace Ui::Premium {
+namespace {
+
+[[nodiscard]] std::vector<float> ReadFloats(QDataStream &stream, int count) {
+	auto result = std::vector<float>(count);
+	for (auto i = 0; i != count; ++i) {
+		stream >> result[i];
+	}
+	return result;
+}
+
+} // namespace
+
+Object3dMesh LoadObject3dMesh(
+		const QString &path,
+		float scale,
+		bool withUv) {
+	auto file = QFile(path);
+	if (!file.open(QIODevice::ReadOnly)) {
+		return {};
+	}
+	auto stream = QDataStream(&file);
+	stream.setByteOrder(QDataStream::BigEndian);
+	stream.setFloatingPointPrecision(QDataStream::SinglePrecision);
+
+	const auto readCount = [&]() -> int {
+		auto value = qint32(0);
+		stream >> value;
+		return (stream.status() == QDataStream::Ok && value >= 0)
+			? value
+			: -1;
+	};
+
+	const auto positionFloats = readCount();
+	if (positionFloats < 0) {
+		return {};
+	}
+	const auto positions = ReadFloats(stream, positionFloats);
+
+	const auto uvFloats = readCount();
+	if (uvFloats < 0) {
+		return {};
+	}
+	const auto uvs = ReadFloats(stream, uvFloats);
+
+	const auto normalFloats = readCount();
+	if (normalFloats < 0) {
+		return {};
+	}
+	const auto normals = ReadFloats(stream, normalFloats);
+
+	const auto faceCount = readCount();
+	if (faceCount < 0 || stream.status() != QDataStream::Ok) {
+		return {};
+	}
+
+	const auto floatsPerVertex = withUv ? 8 : 6;
+	auto result = Object3dMesh();
+	result.vertices.reserve(faceCount * floatsPerVertex);
+	for (auto i = 0; i != faceCount; ++i) {
+		auto positionIndex = qint32(0);
+		auto uvIndex = qint32(0);
+		auto normalIndex = qint32(0);
+		stream >> positionIndex >> uvIndex >> normalIndex;
+		if (stream.status() != QDataStream::Ok) {
+			return {};
+		}
+
+		const auto position = qint64(positionIndex) * 3;
+		const auto normal = qint64(normalIndex) * 3;
+		if (position < 0
+			|| position + 2 >= positionFloats
+			|| normal < 0
+			|| normal + 2 >= normalFloats) {
+			return {};
+		}
+		result.vertices.push_back(positions[position + 0] * scale);
+		result.vertices.push_back(positions[position + 1] * scale);
+		result.vertices.push_back(positions[position + 2] * scale);
+
+		result.vertices.push_back(normals[normal + 0]);
+		result.vertices.push_back(normals[normal + 1]);
+		result.vertices.push_back(normals[normal + 2]);
+
+		if (withUv) {
+			const auto uv = qint64(uvIndex) * 2;
+			const auto valid = (uv >= 0) && (uv + 1 < uvFloats);
+			result.vertices.push_back(valid ? uvs[uv] : 0.f);
+			result.vertices.push_back(valid ? (1.f - uvs[uv + 1]) : 0.f);
+		}
+	}
+	result.vertexCount = faceCount;
+	return result;
+}
+
+Object3dModel LoadObject3dModel(
+		const std::vector<QString> &paths,
+		float scale,
+		bool withUv) {
+	auto result = Object3dModel();
+	result.shells.reserve(paths.size());
+	for (const auto &path : paths) {
+		result.shells.push_back(LoadObject3dMesh(path, scale, withUv));
+	}
+	return result;
+}
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+QShader LoadObject3dShader(const QString &name) {
+	return Rhi::ShaderFromFile(u":/shaders/"_q + name + u".qsb"_q);
+}
+#endif // Qt >= 6.7
+
+QImage LoadObject3dFlecksTexture() {
+	return QImage(
+		u":/gui/art/premium/flecks.png"_q
+	).convertToFormat(QImage::Format_RGBA8888);
+}
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_3d_mesh.h b/Telegram/SourceFiles/ui/effects/premium_3d_mesh.h
new file mode 100644
index 00000000000000..386ae62247cbfa
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_3d_mesh.h
@@ -0,0 +1,52 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include <vector>
+
+class QString;
+class QShader;
+class QImage;
+
+namespace Ui::Premium {
+
+struct Object3dMesh {
+	std::vector<float> vertices;
+	int vertexCount = 0;
+};
+
+[[nodiscard]] Object3dMesh LoadObject3dMesh(
+	const QString &path,
+	float scale,
+	bool withUv);
+
+struct Object3dModel {
+	std::vector<Object3dMesh> shells;
+
+	[[nodiscard]] bool isNull() const {
+		if (shells.empty()) {
+			return true;
+		}
+		for (const auto &shell : shells) {
+			if (shell.vertices.empty()) {
+				return true;
+			}
+		}
+		return false;
+	}
+};
+
+[[nodiscard]] Object3dModel LoadObject3dModel(
+	const std::vector<QString> &paths,
+	float scale,
+	bool withUv);
+
+[[nodiscard]] QShader LoadObject3dShader(const QString &name);
+[[nodiscard]] QImage LoadObject3dFlecksTexture();
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_3d_support.cpp b/Telegram/SourceFiles/ui/effects/premium_3d_support.cpp
new file mode 100644
index 00000000000000..46f06f76160cf5
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_3d_support.cpp
@@ -0,0 +1,65 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/premium_3d_support.h"
+
+#include "ui/gl/gl_detection.h"
+#include "ui/power_saving.h"
+
+namespace Ui::Premium {
+namespace {
+
+constexpr auto kBezierIterations = 40;
+constexpr auto kBezierEpsilon = 0.00001;
+
+} // namespace
+
+float64 CubicBezier(
+		float64 x1,
+		float64 y1,
+		float64 x2,
+		float64 y2,
+		float64 x) {
+	const auto curve = [](float64 t, float64 a, float64 b) {
+		return (((1. - 3. * b + 3. * a) * t
+			+ (3. * b - 6. * a)) * t
+			+ (3. * a)) * t;
+	};
+	if (x <= 0.) {
+		return 0.;
+	} else if (x >= 1.) {
+		return 1.;
+	}
+	auto start = 0.;
+	auto end = 1.;
+	auto t = x;
+	for (auto i = 0; i != kBezierIterations; ++i) {
+		t = (start + end) / 2.;
+		const auto estimate = curve(t, x1, x2);
+		if (std::abs(x - estimate) < kBezierEpsilon) {
+			break;
+		} else if (estimate < x) {
+			start = t;
+		} else {
+			end = t;
+		}
+	}
+	return curve(t, y1, y2);
+}
+
+bool Object3dSupported() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (PowerSaving::On(PowerSaving::kAnimations)) {
+		return false;
+	}
+	return GL::WidgetsRhiSupported();
+#else
+	return false;
+#endif
+}
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_3d_support.h b/Telegram/SourceFiles/ui/effects/premium_3d_support.h
new file mode 100644
index 00000000000000..4e5a047697126c
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_3d_support.h
@@ -0,0 +1,21 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui::Premium {
+
+[[nodiscard]] float64 CubicBezier(
+	float64 x1,
+	float64 y1,
+	float64 x2,
+	float64 y2,
+	float64 x);
+
+[[nodiscard]] bool Object3dSupported();
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
index 5a3698e179ead4..91f61bf70d7baf 100644
--- a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
@@ -11,10 +11,12 @@ For license and copyright information please follow this link:
 #include "base/object_ptr.h"
 #include "lang/lang_keys.h"
 #include "ui/effects/gradient.h"
+#include "ui/effects/ministar_particles.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/painter.h"
+#include "styles/style_info_levels.h"
 #include "styles/style_layers.h"
 #include "styles/style_premium.h"
 
@@ -34,8 +36,12 @@ constexpr auto kSlideDuration = crl::time(1000);
 TextFactory ProcessTextFactory(
 		std::optional<tr::phrase<lngtag_count>> phrase) {
 	return phrase
-		? TextFactory([=](int n) { return (*phrase)(tr::now, lt_count, n); })
-		: TextFactory([=](int n) { return QString::number(n); });
+		? TextFactory([=](int n) -> BubbleText {
+			return { (*phrase)(tr::now, lt_count, n) };
+		})
+		: TextFactory([=](int n) -> BubbleText {
+			return { QString::number(n) };
+		});
 }
 
 Bubble::Bubble(
@@ -50,21 +56,24 @@ Bubble::Bubble(
 , _icon(icon)
 , _numberAnimation(_st.font, _updateCallback)
 , _height(_st.height + _st.tailSize.height())
-, _textTop((_height - _st.tailSize.height() - _st.font->height) / 2)
 , _hasTail(hasTail) {
 	_numberAnimation.setDisabledMonospace(true);
 	_numberAnimation.setWidthChangedCallback([=] {
 		_widthChanges.fire({});
 	});
-	_numberAnimation.setText(_textFactory(0), 0);
+	const auto texts = _textFactory(0);
+	_numberAnimation.setText(texts.counter, 0);
 	_numberAnimation.finishAnimating();
+	if (!texts.additional.isEmpty()) {
+		_additional.setText(_st.additionalStyle, texts.additional);
+	}
 }
 
 crl::time Bubble::SlideNoDeflectionDuration() {
 	return kSlideDuration * kStepBeforeDeflection;
 }
 
-int Bubble::counter() const {
+std::optional<int> Bubble::counter() const {
 	return _counter;
 }
 
@@ -73,7 +82,7 @@ int Bubble::height() const {
 }
 
 int Bubble::bubbleRadius() const {
-	return (_height - _st.tailSize.height()) / 2 - kBubbleRadiusSubtractor;
+	return (_st.height / 2) - kBubbleRadiusSubtractor;
 }
 
 int Bubble::filledWidth() const {
@@ -83,24 +92,50 @@ int Bubble::filledWidth() const {
 		+ _st.padding.right();
 }
 
+int Bubble::topTextWidth() const {
+	return filledWidth()
+		+ _numberAnimation.countWidth()
+		+ (_additional.isEmpty()
+			? 0
+			: (_st.additionalSkip + _additional.maxWidth()));
+}
+
+int Bubble::bottomTextWidth() const {
+	return _subtext.isEmpty()
+		? 0
+		: (_st.subtextPadding.left()
+			+ _subtext.maxWidth()
+			+ _st.subtextPadding.right());
+}
+
 int Bubble::width() const {
-	return filledWidth() + _numberAnimation.countWidth();
+	return std::max(topTextWidth(), bottomTextWidth());
 }
 
-int Bubble::countMaxWidth(int maxPossibleCounter) const {
+int Bubble::countTargetWidth(int targetCounter) const {
 	auto numbers = Ui::NumbersAnimation(_st.font, [] {});
 	numbers.setDisabledMonospace(true);
 	numbers.setDuration(0);
-	numbers.setText(_textFactory(0), 0);
-	numbers.setText(_textFactory(maxPossibleCounter), maxPossibleCounter);
+	const auto texts = _textFactory(targetCounter);
+	numbers.setText(texts.counter, targetCounter);
 	numbers.finishAnimating();
-	return filledWidth() + numbers.maxWidth();
+	const auto top = filledWidth()
+		+ numbers.maxWidth()
+		+ (_additional.isEmpty()
+			? 0
+			: (_st.additionalSkip
+				+ _st.additionalStyle.font->width(texts.additional)));
+	return std::max(top, bottomTextWidth());
 }
 
 void Bubble::setCounter(int value) {
 	if (_counter != value) {
 		_counter = value;
-		_numberAnimation.setText(_textFactory(_counter), _counter);
+		const auto texts = _textFactory(value);
+		_numberAnimation.setText(texts.counter, value);
+		if (!texts.additional.isEmpty()) {
+			_additional.setText(_st.additionalStyle, texts.additional);
+		}
 	}
 }
 
@@ -112,53 +147,88 @@ void Bubble::setFlipHorizontal(bool value) {
 	_flipHorizontal = value;
 }
 
-void Bubble::paintBubble(QPainter &p, const QRect &r, const QBrush &brush) {
-	if (_counter < 0) {
-		return;
-	}
-
+QRect Bubble::bubbleGeometry(const QRect &r) const {
 	const auto penWidth = _st.penWidth;
 	const auto penWidthHalf = penWidth / 2;
-	const auto bubbleRect = r - style::margins(
+	return r - style::margins(
 		penWidthHalf,
 		penWidthHalf,
 		penWidthHalf,
 		_st.tailSize.height() + penWidthHalf);
-	{
-		const auto radius = bubbleRadius();
-		auto pathTail = QPainterPath();
-
-		const auto tailWHalf = _st.tailSize.width() / 2.;
-		const auto progress = _tailEdge;
-
-		const auto tailTop = bubbleRect.y() + bubbleRect.height();
-		const auto tailLeftFull = bubbleRect.x()
-			+ (bubbleRect.width() * 0.5)
-			- tailWHalf;
-		const auto tailLeft = bubbleRect.x()
-			+ (bubbleRect.width() * 0.5 * (progress + 1.))
-			- tailWHalf;
-		const auto tailCenter = tailLeft + tailWHalf;
-		const auto tailRight = [&] {
-			const auto max = bubbleRect.x() + bubbleRect.width();
-			const auto right = tailLeft + _st.tailSize.width();
-			const auto bottomMax = max - radius;
-			return (right > bottomMax)
-				? std::max(float64(tailCenter), float64(bottomMax))
-				: right;
-		}();
-		if (_hasTail) {
-			pathTail.moveTo(tailLeftFull, tailTop);
-			pathTail.lineTo(tailLeft, tailTop);
-			pathTail.lineTo(tailCenter, tailTop + _st.tailSize.height());
-			pathTail.lineTo(tailRight, tailTop);
-			pathTail.lineTo(tailRight, tailTop - radius);
-			pathTail.moveTo(tailLeftFull, tailTop);
-		}
-		auto pathBubble = QPainterPath();
-		pathBubble.setFillRule(Qt::WindingFill);
-		pathBubble.addRoundedRect(bubbleRect, radius, radius);
+}
+
+QPainterPath Bubble::bubblePath(const QRect &r) const {
+	const auto bubbleRect = bubbleGeometry(r);
+	const auto radius = bubbleRadius();
+	auto pathTail = QPainterPath();
+
+	const auto tailWHalf = _st.tailSize.width() / 2.;
+	const auto progress = _tailEdge;
+
+	const auto tailTop = bubbleRect.y() + bubbleRect.height();
+	const auto tailLeftFull = bubbleRect.x()
+		+ (bubbleRect.width() * 0.5)
+		- tailWHalf;
+	const auto tailLeft = bubbleRect.x()
+		+ (bubbleRect.width() * 0.5 * (progress + 1.))
+		- tailWHalf;
+	const auto tailCenter = tailLeft + tailWHalf;
+	const auto tailRight = [&] {
+		const auto max = bubbleRect.x() + bubbleRect.width();
+		const auto right = tailLeft + _st.tailSize.width();
+		const auto bottomMax = max - radius;
+		return (right > bottomMax)
+			? std::max(float64(tailCenter), float64(bottomMax))
+			: right;
+	}();
+	if (_hasTail) {
+		pathTail.moveTo(tailLeftFull, tailTop);
+		pathTail.lineTo(tailLeft, tailTop);
+		pathTail.lineTo(tailCenter, tailTop + _st.tailSize.height());
+		pathTail.lineTo(tailRight, tailTop);
+		pathTail.lineTo(tailRight, tailTop - radius);
+		pathTail.moveTo(tailLeftFull, tailTop);
+	}
+	auto pathBubble = QPainterPath();
+	pathBubble.setFillRule(Qt::WindingFill);
+	pathBubble.addRoundedRect(bubbleRect, radius, radius);
+
+	auto result = pathTail + pathBubble;
+	if (_flipHorizontal) {
+		auto m = QTransform();
+		const auto center = QRectF(bubbleRect).center();
+		m.translate(center.x(), center.y());
+		m.scale(-1., 1.);
+		m.translate(-center.x(), -center.y());
+		return m.map(result);
+	}
+	return result;
+}
+
+void Bubble::setSubtext(QString subtext) {
+	if (_subtext.toString() == subtext) {
+		return;
+	} else if (subtext.isEmpty()) {
+		_subtext = {};
+	} else {
+		_subtext.setText(_st.subtextStyle, subtext);
+	}
+	_widthChanges.fire({});
+	_updateCallback();
+}
+
+void Bubble::finishAnimating() {
+	_numberAnimation.finishAnimating();
+}
+
+void Bubble::paintBubble(QPainter &p, const QRect &r, const QBrush &brush) {
+	if (!_counter.has_value()) {
+		return;
+	}
 
+	const auto bubbleRect = bubbleGeometry(r);
+	const auto penWidth = _st.penWidth;
+	{
 		auto hq = PainterHighQualityEnabler(p);
 		p.setPen(QPen(
 			brush,
@@ -167,30 +237,58 @@ void Bubble::paintBubble(QPainter &p, const QRect &r, const QBrush &brush) {
 			Qt::RoundCap,
 			Qt::RoundJoin));
 		p.setBrush(brush);
-		if (_flipHorizontal) {
-			auto m = QTransform();
-			const auto center = QRectF(bubbleRect).center();
-			m.translate(center.x(), center.y());
-			m.scale(-1., 1.);
-			m.translate(-center.x(), -center.y());
-			p.drawPath(m.map(pathTail + pathBubble));
-		} else {
-			p.drawPath(pathTail + pathBubble);
-		}
+		p.drawPath(bubblePath(r));
 	}
 	p.setPen(st::activeButtonFg);
-	p.setFont(_st.font);
-	const auto iconLeft = r.x() + _st.padding.left();
-	_icon->paint(
-		p,
-		iconLeft,
-		bubbleRect.y() + (bubbleRect.height() - _icon->height()) / 2,
-		bubbleRect.width());
-	_numberAnimation.paint(
-		p,
-		iconLeft + _icon->width() + _st.textSkip,
-		r.y() + _textTop,
-		width() / 2);
+	const auto withSubtext = !_subtext.isEmpty();
+	const auto height = withSubtext
+		? (_st.font->height
+			+ _st.subtextPadding.top()
+			+ _st.subtextStyle.font->height)
+		: _st.font->height;
+	const auto topWidth = withSubtext ? topTextWidth() : 0;
+	const auto bottomWidth = withSubtext ? bottomTextWidth() : 0;
+	const auto iconShift = (topWidth >= bottomWidth)
+		? 0
+		: (bottomWidth - topWidth) / 2;
+	const auto iconLeft = r.x() + _st.padding.left() + iconShift;
+	const auto topShift = (_st.font->height - height) / 2;
+	const auto iconTop = bubbleRect.y()
+		+ topShift
+		+ (bubbleRect.height() - _icon->height()) / 2;
+	_icon->paint(p, iconLeft, iconTop, bubbleRect.width());
+	const auto numberLeft = iconLeft + _icon->width() + _st.textSkip;
+	const auto numberTop = r.y() + (_st.height - height) / 2;
+	_numberAnimation.paint(p, numberLeft, numberTop, width());
+	if (!_additional.isEmpty()) {
+		p.setOpacity(0.7);
+		const auto additionalLeft = numberLeft
+			+ _numberAnimation.countWidth()
+			+ _st.additionalSkip;
+		const auto additionalTop = numberTop
+			+ _st.font->ascent
+			- _st.additionalStyle.font->ascent;
+		_additional.draw(p, {
+			.position = { additionalLeft, additionalTop },
+			.availableWidth = _additional.maxWidth(),
+		});
+	}
+	if (withSubtext) {
+		p.setOpacity(1.);
+		const auto subtextShift = (bottomWidth >= topWidth)
+			? 0
+			: (topWidth - bottomWidth) / 2;
+		const auto subtextLeft = r.x()
+			+ _st.subtextPadding.left()
+			+ subtextShift;
+		const auto subtextTop = numberTop
+			+ _st.font->height
+			+ _st.subtextPadding.top();
+		_subtext.draw(p, {
+			.position = { subtextLeft, subtextTop },
+			.availableWidth = _subtext.maxWidth(),
+		});
+	}
 }
 
 rpl::producer<> Bubble::widthChanges() const {
@@ -206,7 +304,7 @@ BubbleWidget::BubbleWidget(
 	rpl::producer<> showFinishes,
 	const style::icon *icon,
 	const style::margins &outerPadding)
-: RpWidget(parent)
+: AbstractButton(parent)
 , _st(st)
 , _state(std::move(state))
 , _bubble(
@@ -220,6 +318,9 @@ BubbleWidget::BubbleWidget(
 , _deflection(kDeflection)
 , _stepBeforeDeflection(kStepBeforeDeflection)
 , _stepAfterDeflection(kStepAfterDeflection) {
+	if (_type == BubbleType::Credits) {
+		setupParticles(parent);
+	}
 	const auto resizeTo = [=](int w, int h) {
 		_deflection = (w > _st.widthLimit)
 			? kDeflectionSmall
@@ -230,27 +331,115 @@ BubbleWidget::BubbleWidget(
 
 	resizeTo(_bubble.width(), _bubble.height());
 	_bubble.widthChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		resizeTo(_bubble.width(), _bubble.height());
 	}, lifetime());
 
+	const auto instant = !showFinishes;
+	if (instant) {
+		showFinishes = rpl::single(rpl::empty);
+	}
 	std::move(
 		showFinishes
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		_state.value(
-		) | rpl::start_with_next([=](BubbleRowState state) {
+		) | rpl::on_next([=](BubbleRowState state) {
 			animateTo(state);
 		}, lifetime());
+		if (instant) {
+			_appearanceAnimation.stop();
+			if (const auto onstack = base::take(_appearanceCallback)) {
+				onstack(1.);
+			}
+			_bubble.finishAnimating();
+		}
+
+		parent->widthValue() | rpl::on_next([=](int w) {
+			if (!_appearanceAnimation.animating()) {
+				const auto available = w
+					- _outerPadding.left()
+					- _outerPadding.right();
+				const auto x = (available * _animatingFromResultRatio);
+				moveToLeft(-_spaceForDeflection.width()
+					+ std::max(
+						int(base::SafeRound(x
+							- (_bubble.width() / 2)
+							+ _outerPadding.left())),
+						0),
+					0);
+			}
+		}, lifetime());
+	}, lifetime());
+}
+
+void BubbleWidget::setupParticles(not_null<Ui::RpWidget*> parent) {
+	_particles.emplace(StarParticles::Type::Radial, 50, st::lineWidth * 4);
+	_particles->setSpeed(0.1);
+
+	_particlesWidget = Ui::CreateChild<Ui::RpWidget>(parent);
+	_particlesWidget->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_particlesWidget->show();
+	_particlesWidget->raise();
+
+	_particlesAnimation.init([=] { _particlesWidget->update(); });
+
+	_particlesWidget->paintRequest() | rpl::on_next([=] {
+		if (!_particlesAnimation.animating()) {
+			_particlesAnimation.start();
+		}
+		auto p = QPainter(_particlesWidget);
+		auto hq = PainterHighQualityEnabler(p);
+
+		const auto offset = QPoint(
+			(_particlesWidget->width() - width()) / 2,
+			(_particlesWidget->height() - height()) / 2);
+		const auto bubbleRect = rect().translated(offset)
+			- QMargins(
+				_spaceForDeflection.width(),
+				_spaceForDeflection.height(),
+				_spaceForDeflection.width(),
+				_spaceForDeflection.height());
+
+		p.save();
+		p.translate(offset);
+		const auto bubblePath = _bubble.bubblePath(bubbleRect);
+		p.restore();
+
+		auto fullRect = QPainterPath();
+		fullRect.addRect(QRectF(_particlesWidget->rect()));
+
+		p.setClipPath(bubblePath);
+		_particles->setColor(st::premiumButtonFg->c);
+		_particles->paint(p, _particlesWidget->rect(), crl::now(), false);
+		p.setClipping(false);
+
+		p.setClipPath(fullRect.subtracted(bubblePath));
+		_particles->setColor(_brushOverride
+			? st::groupCallMemberInactiveIcon->c
+			: st::creditsBg3->c);
+		_particles->paint(p, _particlesWidget->rect(), crl::now(), false);
+	}, _particlesWidget->lifetime());
+
+	geometryValue() | rpl::on_next([=](QRect geometry) {
+		const auto particlesSize = QSize(
+			int(geometry.width() * 1.5),
+			int(geometry.height() * 1.5));
+		const auto center = geometry.center();
+		_particlesWidget->setGeometry(
+			center.x() - particlesSize.width() / 2,
+			center.y() - particlesSize.height() / 2,
+			particlesSize.width(),
+			particlesSize.height());
 	}, lifetime());
 }
 
 void BubbleWidget::animateTo(BubbleRowState state) {
-	_maxBubbleWidth = _bubble.countMaxWidth(state.counter);
+	const auto targetWidth = _bubble.countTargetWidth(state.counter);
 	const auto parent = parentWidget();
 	const auto available = parent->width()
 		- _outerPadding.left()
 		- _outerPadding.right();
-	const auto halfWidth = (_maxBubbleWidth / 2);
+	const auto halfWidth = (targetWidth / 2);
 	const auto computeLeft = [=](float64 pointRatio, float64 animProgress) {
 		const auto delta = (pointRatio - _animatingFromResultRatio);
 		const auto center = available
@@ -259,9 +448,7 @@ void BubbleWidget::animateTo(BubbleRowState state) {
 	};
 	const auto moveEndPoint = state.ratio;
 	const auto computeRightEdge = [=] {
-		return parent->width()
-			- _outerPadding.right()
-			- _maxBubbleWidth;
+		return parent->width() - _outerPadding.right() - targetWidth;
 	};
 	struct Edge final {
 		float64 goodPointRatio = 0.;
@@ -314,11 +501,12 @@ void BubbleWidget::animateTo(BubbleRowState state) {
 		_animatingFromResultRatio = 0.;
 		_animatingFromBubbleEdge = 0.;
 	}
-	_appearanceAnimation.start([=](float64 value) {
+	_appearanceCallback = [=](float64 value) {
 		if (!_appearanceAnimation.animating()) {
 			_animatingFrom = state;
 			_animatingFromResultRatio = resultMoveEndPoint;
 			_animatingFromBubbleEdge = finalEdge;
+			_appearanceCallback = nullptr;
 		}
 		value = std::abs(value);
 		const auto moveProgress = std::clamp(
@@ -342,18 +530,34 @@ void BubbleWidget::animateTo(BubbleRowState state) {
 			+ counterProgress * (state.counter - _animatingFrom.counter);
 		_bubble.setCounter(int(base::SafeRound(now)));
 
+		if (_particles) {
+			const auto progress = now / float(state.counter);
+			_particles->setSpeed(0.01 + progress * 0.25);
+		}
+
 		_bubble.setFlipHorizontal(nowBubbleEdge < 0);
 		_bubble.setTailEdge(std::abs(nowBubbleEdge));
 		update();
-	},
-	0.,
-	(state.ratio >= _animatingFrom.ratio) ? 1. : -1.,
-	duration,
-	anim::easeOutCirc);
+	};
+	_appearanceAnimation.start(
+		_appearanceCallback,
+		0.,
+		(state.ratio >= _animatingFrom.ratio) ? 1. : -1.,
+		duration,
+		anim::easeOutCirc);
+}
+
+void BubbleWidget::setBrushOverride(std::optional<QBrush> brushOverride) {
+	_brushOverride = std::move(brushOverride);
+	update();
+}
+
+void BubbleWidget::setSubtext(QString subtext) {
+	_bubble.setSubtext(subtext);
 }
 
 void BubbleWidget::paintEvent(QPaintEvent *e) {
-	if (_bubble.counter() < 0) {
+	if (!_bubble.counter().has_value()) {
 		return;
 	}
 
@@ -410,8 +614,14 @@ void BubbleWidget::paintEvent(QPaintEvent *e) {
 
 
 	_bubble.paintBubble(p, bubbleRect, [&] {
+		if (_brushOverride) {
+			return *_brushOverride;
+		}
 		switch (_type) {
-		case BubbleType::NoPremium: return st::windowBgActive->b;
+		case BubbleType::NoPremium:
+		case BubbleType::UpgradePrice:
+		case BubbleType::StarRating: return st::windowBgActive->b;
+		case BubbleType::NegativeRating: return st::attentionButtonFg->b;
 		case BubbleType::Premium: return QBrush(_cachedGradient);
 		case BubbleType::Credits: return st::creditsBg3->b;
 		}
@@ -419,7 +629,11 @@ void BubbleWidget::paintEvent(QPaintEvent *e) {
 	}());
 }
 
-void AddBubbleRow(
+void BubbleWidget::resizeEvent(QResizeEvent *e) {
+	RpWidget::resizeEvent(e);
+}
+
+not_null<BubbleWidget*> AddBubbleRow(
 		not_null<Ui::VerticalLayout*> parent,
 		const style::PremiumBubble &st,
 		rpl::producer<> showFinishes,
@@ -429,7 +643,7 @@ void AddBubbleRow(
 		BubbleType type,
 		std::optional<tr::phrase<lngtag_count>> phrase,
 		const style::icon *icon) {
-	AddBubbleRow(
+	return AddBubbleRow(
 		parent,
 		st,
 		std::move(showFinishes),
@@ -443,17 +657,19 @@ void AddBubbleRow(
 		st::boxRowPadding);
 }
 
-void AddBubbleRow(
+not_null<BubbleWidget*> AddBubbleRow(
 		not_null<Ui::VerticalLayout*> parent,
 		const style::PremiumBubble &st,
 		rpl::producer<> showFinishes,
 		rpl::producer<BubbleRowState> state,
 		BubbleType type,
-		Fn<QString(int)> text,
+		TextFactory text,
 		const style::icon *icon,
 		const style::margins &outerPadding) {
 	const auto container = parent->add(
 		object_ptr<Ui::FixedHeightWidget>(parent, 0));
+	container->show();
+
 	const auto bubble = Ui::CreateChild<BubbleWidget>(
 		container,
 		st,
@@ -463,13 +679,15 @@ void AddBubbleRow(
 		std::move(showFinishes),
 		icon,
 		outerPadding);
+	bubble->setAttribute(Qt::WA_TransparentForMouseEvents);
 	rpl::combine(
 		container->sizeValue(),
 		bubble->sizeValue()
-	) | rpl::start_with_next([=](const QSize &parentSize, const QSize &size) {
+	) | rpl::on_next([=](const QSize &parentSize, const QSize &size) {
 		container->resize(parentSize.width(), size.height());
 	}, bubble->lifetime());
 	bubble->show();
+	return bubble;
 }
 
 } // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_bubble.h b/Telegram/SourceFiles/ui/effects/premium_bubble.h
index 88e37771d0b083..5ecf2325470d4f 100644
--- a/Telegram/SourceFiles/ui/effects/premium_bubble.h
+++ b/Telegram/SourceFiles/ui/effects/premium_bubble.h
@@ -8,6 +8,8 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "ui/effects/numbers_animation.h"
+#include "ui/effects/ministar_particles.h"
+#include "ui/abstract_button.h"
 #include "ui/rp_widget.h"
 
 enum lngtag_count : int;
@@ -27,7 +29,12 @@ class VerticalLayout;
 
 namespace Ui::Premium {
 
-using TextFactory = Fn<QString(int)>;
+struct BubbleText {
+	QString counter;
+	QString additional;
+};
+
+using TextFactory = Fn<BubbleText(int)>;
 
 [[nodiscard]] TextFactory ProcessTextFactory(
 	std::optional<tr::phrase<lngtag_count>> phrase);
@@ -45,21 +52,28 @@ class Bubble final {
 
 	[[nodiscard]] static crl::time SlideNoDeflectionDuration();
 
-	[[nodiscard]] int counter() const;
+	[[nodiscard]] std::optional<int> counter() const;
 	[[nodiscard]] int height() const;
 	[[nodiscard]] int width() const;
 	[[nodiscard]] int bubbleRadius() const;
-	[[nodiscard]] int countMaxWidth(int maxPossibleCounter) const;
+	[[nodiscard]] int countTargetWidth(int targetCounter) const;
+	[[nodiscard]] QRect bubbleGeometry(const QRect &r) const;
 
 	void setCounter(int value);
 	void setTailEdge(EdgeProgress edge);
 	void setFlipHorizontal(bool value);
 	void paintBubble(QPainter &p, const QRect &r, const QBrush &brush);
+	[[nodiscard]] QPainterPath bubblePath(const QRect &r) const;
+	void setSubtext(QString subtext);
+
+	void finishAnimating();
 
 	[[nodiscard]] rpl::producer<> widthChanges() const;
 
 private:
 	[[nodiscard]] int filledWidth() const;
+	[[nodiscard]] int topTextWidth() const;
+	[[nodiscard]] int bottomTextWidth() const;
 
 	const style::PremiumBubble &_st;
 
@@ -68,11 +82,12 @@ class Bubble final {
 
 	const style::icon *_icon;
 	NumbersAnimation _numberAnimation;
+	Text::String _additional;
+	Text::String _subtext;
 	const int _height;
-	const int _textTop;
 	const bool _hasTail;
 
-	int _counter = -1;
+	std::optional<int> _counter;
 	EdgeProgress _tailEdge = 0.;
 	bool _flipHorizontal = false;
 
@@ -88,12 +103,15 @@ struct BubbleRowState {
 };
 
 enum class BubbleType : uchar {
+	UpgradePrice,
+	StarRating,
+	NegativeRating,
 	NoPremium,
 	Premium,
 	Credits,
 };
 
-class BubbleWidget final : public Ui::RpWidget {
+class BubbleWidget final : public Ui::AbstractButton {
 public:
 	BubbleWidget(
 		not_null<Ui::RpWidget*> parent,
@@ -105,10 +123,16 @@ class BubbleWidget final : public Ui::RpWidget {
 		const style::icon *icon,
 		const style::margins &outerPadding);
 
+	void setBrushOverride(std::optional<QBrush> brushOverride);
+	void setSubtext(QString subtext);
+
 protected:
 	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
 
 private:
+	void setupParticles(not_null<Ui::RpWidget*> parent);
+
 	struct GradientParams {
 		int left = 0;
 		int width = 0;
@@ -126,11 +150,12 @@ class BubbleWidget final : public Ui::RpWidget {
 	float64 _animatingFromBubbleEdge = 0.;
 	rpl::variable<BubbleRowState> _state;
 	Bubble _bubble;
-	int _maxBubbleWidth = 0;
+	std::optional<QBrush> _brushOverride;
 	const BubbleType _type;
 	const style::margins _outerPadding;
 
 	Ui::Animations::Simple _appearanceAnimation;
+	Fn<void(float64)> _appearanceCallback;
 	QSize _spaceForDeflection;
 
 	QLinearGradient _cachedGradient;
@@ -142,9 +167,13 @@ class BubbleWidget final : public Ui::RpWidget {
 	float64 _stepBeforeDeflection;
 	float64 _stepAfterDeflection;
 
+	RpWidget *_particlesWidget = nullptr;
+	std::optional<StarParticles> _particles;
+	Ui::Animations::Basic _particlesAnimation;
+
 };
 
-void AddBubbleRow(
+not_null<BubbleWidget*> AddBubbleRow(
 	not_null<Ui::VerticalLayout*> parent,
 	const style::PremiumBubble &st,
 	rpl::producer<> showFinishes,
@@ -155,13 +184,13 @@ void AddBubbleRow(
 	std::optional<tr::phrase<lngtag_count>> phrase,
 	const style::icon *icon);
 
-void AddBubbleRow(
+not_null<BubbleWidget*> AddBubbleRow(
 	not_null<Ui::VerticalLayout*> parent,
 	const style::PremiumBubble &st,
 	rpl::producer<> showFinishes,
 	rpl::producer<BubbleRowState> state,
 	BubbleType type,
-	Fn<QString(int)> text,
+	TextFactory text,
 	const style::icon *icon,
 	const style::margins &outerPadding);
 
diff --git a/Telegram/SourceFiles/ui/effects/premium_coin.cpp b/Telegram/SourceFiles/ui/effects/premium_coin.cpp
new file mode 100644
index 00000000000000..1d5883e01cd208
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_coin.cpp
@@ -0,0 +1,63 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/premium_coin.h"
+
+#include "ui/effects/premium_coin_renderer.h"
+
+namespace Ui::Premium {
+namespace {
+
+constexpr auto kSpinDuration = crl::time(3000);
+constexpr auto kRespinDelay = crl::time(2000);
+constexpr auto kFlecksPeriod = 50.;
+constexpr auto kSampleCount = 4; // MSAA — smooths the silhouette edge.
+
+} // namespace
+
+Coin::Coin(QWidget *parent)
+: Object3dCover(parent, {
+	.spinDuration = kSpinDuration,
+	.respinDelay = kRespinDelay,
+	.period = kFlecksPeriod,
+	.spinEaseOut = true,
+	.sampleCount = kSampleCount,
+}) {
+}
+
+Coin::~Coin() = default;
+
+std::unique_ptr<Ui::GL::Renderer> Coin::createRenderer() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	auto renderer = std::make_unique<CoinRenderer>();
+	_renderer = renderer.get();
+	return renderer;
+#else // Qt >= 6.7
+	return nullptr;
+#endif // Qt < 6.7
+}
+
+void Coin::applyState(
+		float yaw,
+		float pitch,
+		float time,
+		float alpha,
+		bool night) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (_renderer) {
+		_renderer->setState({
+			.yaw = yaw,
+			.pitch = pitch,
+			.time = time,
+			.alpha = alpha,
+			.night = night,
+		});
+	}
+#endif // Qt >= 6.7
+}
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_coin.h b/Telegram/SourceFiles/ui/effects/premium_coin.h
new file mode 100644
index 00000000000000..55554992939a2e
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_coin.h
@@ -0,0 +1,35 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/premium_3d_cover.h"
+
+namespace Ui::Premium {
+
+class CoinRenderer;
+
+class Coin final : public Object3dCover {
+public:
+	explicit Coin(QWidget *parent);
+	~Coin();
+
+protected:
+	std::unique_ptr<Ui::GL::Renderer> createRenderer() override;
+	void applyState(
+		float yaw,
+		float pitch,
+		float time,
+		float alpha,
+		bool night) override;
+
+private:
+	CoinRenderer *_renderer = nullptr;
+
+};
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_coin_renderer.cpp b/Telegram/SourceFiles/ui/effects/premium_coin_renderer.cpp
new file mode 100644
index 00000000000000..38fffe9b207eae
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_coin_renderer.cpp
@@ -0,0 +1,347 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/premium_coin_renderer.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+#include "ui/effects/premium_3d_mesh.h"
+#include "base/debug_log.h"
+
+#include <rhi/qrhi.h>
+#include <QtGui/QImage>
+#include <QtGui/QMatrix4x4>
+#include <QtGui/QVector3D>
+
+namespace Ui::Premium {
+namespace {
+
+constexpr auto kFloatsPerVertex = 8;
+constexpr auto kModelScale = 1.f;
+constexpr auto kFieldOfView = 53.13f;
+constexpr auto kNearPlane = 1.f;
+constexpr auto kFarPlane = 200.f;
+constexpr auto kCameraDistance = 100.f;
+
+struct alignas(16) SharedUniforms {
+	float mvp[16];
+	float world[16];
+	float resolution[4];
+	float misc[4]; // time, night, alpha, _
+};
+static_assert(sizeof(SharedUniforms) == 160);
+static_assert(sizeof(SharedUniforms) % 16 == 0);
+
+[[nodiscard]] QImage LoadBorderTexture() {
+	return QImage(
+		u":/gui/art/premium/coin_border.png"_q
+	).convertToFormat(QImage::Format_RGBA8888);
+}
+
+} // namespace
+
+CoinRenderer::CoinRenderer() = default;
+
+CoinRenderer::~CoinRenderer() {
+	releaseResources();
+}
+
+void CoinRenderer::setState(State state) {
+	_state = state;
+}
+
+void CoinRenderer::initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (_initialized && _rhi == rhi) {
+		return;
+	}
+	if (_rhi != rhi) {
+		_creationFailed = false;
+	}
+	releaseResources();
+	if (_creationFailed) {
+		return;
+	}
+	_rhi = rhi;
+
+	const auto model = LoadObject3dModel({
+		u":/gui/art/premium/coin_outer.binobj"_q,
+		u":/gui/art/premium/coin_inner.binobj"_q,
+		u":/gui/art/premium/coin_logo.binobj"_q,
+		u":/gui/art/premium/coin_stars.binobj"_q,
+	}, kModelScale, true);
+	if (model.isNull()) {
+		LOG(("PremiumCoin: failed to load model"));
+		_creationFailed = true;
+		return;
+	}
+
+	for (auto i = 0; i != kShellCount; ++i) {
+		const auto &shell = model.shells[i];
+		_vertexCounts[i] = shell.vertexCount;
+		_vertexBuffers[i] = rhi->newBuffer(
+			QRhiBuffer::Immutable,
+			QRhiBuffer::VertexBuffer,
+			shell.vertices.size() * sizeof(float));
+		if (!_vertexBuffers[i]->create()) {
+			LOG(("PremiumCoin: vertex buffer creation failed"));
+			_creationFailed = true;
+			releaseResources();
+			return;
+		}
+	}
+
+	_sharedUniform = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::UniformBuffer,
+		sizeof(SharedUniforms));
+	if (!_sharedUniform->create()) {
+		_creationFailed = true;
+		releaseResources();
+		return;
+	}
+
+	const auto align = std::max<quint32>(rhi->ubufAlignment(), 1);
+	const auto slotBytes = quint32(4 * sizeof(float));
+	_drawStride = ((slotBytes + align - 1) / align) * align;
+	_drawUniform = rhi->newBuffer(
+		QRhiBuffer::Immutable,
+		QRhiBuffer::UniformBuffer,
+		kShellCount * _drawStride);
+	if (!_drawUniform->create()) {
+		_creationFailed = true;
+		releaseResources();
+		return;
+	}
+
+	const auto border = LoadBorderTexture();
+	_borderTexture = rhi->newTexture(QRhiTexture::RGBA8, border.size());
+	_borderTexture->create();
+	_borderSampler = rhi->newSampler(
+		QRhiSampler::Linear,
+		QRhiSampler::Linear,
+		QRhiSampler::None,
+		QRhiSampler::ClampToEdge,
+		QRhiSampler::ClampToEdge);
+	_borderSampler->create();
+
+	const auto flecks = LoadObject3dFlecksTexture();
+	_flecksTexture = rhi->newTexture(QRhiTexture::RGBA8, flecks.size());
+	_flecksTexture->create();
+	_flecksSampler = rhi->newSampler(
+		QRhiSampler::Linear,
+		QRhiSampler::Linear,
+		QRhiSampler::None,
+		QRhiSampler::Repeat,
+		QRhiSampler::Repeat);
+	_flecksSampler->create();
+
+	if (!createPipeline(rt)) {
+		LOG(("PremiumCoin: pipeline creation failed, disabling effect"));
+		_creationFailed = true;
+		releaseResources();
+		return;
+	}
+
+	const auto slotFloats = _drawStride / sizeof(float);
+	auto drawData = std::vector<float>(kShellCount * slotFloats, 0.f);
+	for (auto i = 0; i != kShellCount; ++i) {
+		drawData[i * slotFloats + 0] = float(i);
+	}
+
+	auto *rub = rhi->nextResourceUpdateBatch();
+	for (auto i = 0; i != kShellCount; ++i) {
+		rub->uploadStaticBuffer(
+			_vertexBuffers[i],
+			model.shells[i].vertices.data());
+	}
+	rub->uploadStaticBuffer(_drawUniform, drawData.data());
+	rub->uploadTexture(_borderTexture, border);
+	rub->uploadTexture(_flecksTexture, flecks);
+	cb->resourceUpdate(rub);
+
+	_initialized = true;
+
+	LOG(("PremiumCoin: initialized, backend=%1 device=%2")
+		.arg(rhi->backendName())
+		.arg(rhi->driverInfo().deviceName));
+}
+
+bool CoinRenderer::createPipeline(QRhiRenderTarget *rt) {
+	const auto vertShader = LoadObject3dShader(u"premium_coin.vert"_q);
+	const auto fragShader = LoadObject3dShader(u"premium_coin.frag"_q);
+	if (!vertShader.isValid() || !fragShader.isValid()) {
+		return false;
+	}
+
+	for (auto i = 0; i != kShellCount; ++i) {
+		_srb[i] = _rhi->newShaderResourceBindings();
+		_srb[i]->setBindings({
+			QRhiShaderResourceBinding::uniformBuffer(
+				0,
+				QRhiShaderResourceBinding::VertexStage
+					| QRhiShaderResourceBinding::FragmentStage,
+				_sharedUniform),
+			QRhiShaderResourceBinding::uniformBuffer(
+				1,
+				QRhiShaderResourceBinding::FragmentStage,
+				_drawUniform,
+				i * _drawStride,
+				quint32(4 * sizeof(float))),
+			QRhiShaderResourceBinding::sampledTexture(
+				2,
+				QRhiShaderResourceBinding::FragmentStage,
+				_borderTexture,
+				_borderSampler),
+			QRhiShaderResourceBinding::sampledTexture(
+				3,
+				QRhiShaderResourceBinding::FragmentStage,
+				_flecksTexture,
+				_flecksSampler),
+		});
+		if (!_srb[i]->create()) {
+			return false;
+		}
+	}
+
+	auto inputLayout = QRhiVertexInputLayout();
+	inputLayout.setBindings({
+		{ quint32(kFloatsPerVertex * sizeof(float)) },
+	});
+	inputLayout.setAttributes({
+		{ 0, 0, QRhiVertexInputAttribute::Float3, 0 },
+		{ 0, 1, QRhiVertexInputAttribute::Float3, 3 * sizeof(float) },
+		{ 0, 2, QRhiVertexInputAttribute::Float2, 6 * sizeof(float) },
+	});
+
+	auto blend = QRhiGraphicsPipeline::TargetBlend();
+	blend.enable = true;
+	blend.srcColor = QRhiGraphicsPipeline::One;
+	blend.dstColor = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+	blend.srcAlpha = QRhiGraphicsPipeline::One;
+	blend.dstAlpha = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+
+	_pipeline = _rhi->newGraphicsPipeline();
+	_pipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, vertShader },
+		{ QRhiShaderStage::Fragment, fragShader },
+	});
+	_pipeline->setVertexInputLayout(inputLayout);
+	_pipeline->setTargetBlends({ blend });
+	_pipeline->setTopology(QRhiGraphicsPipeline::Triangles);
+	_pipeline->setCullMode(QRhiGraphicsPipeline::None);
+	_pipeline->setDepthTest(true);
+	_pipeline->setDepthWrite(true);
+	_pipeline->setSampleCount(rt->sampleCount());
+	_pipeline->setShaderResourceBindings(_srb[0]);
+	_pipeline->setRenderPassDescriptor(rt->renderPassDescriptor());
+	return _pipeline->create();
+}
+
+void CoinRenderer::render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (rhi->isDeviceLost()) {
+		releaseResources();
+		return;
+	}
+	if (!_initialized) {
+		cb->beginPass(rt, QColor(0, 0, 0, 0), { 1.0f, 0 });
+		cb->endPass();
+		return;
+	}
+	_rhi = rhi;
+
+	const auto pixelSize = rt->pixelSize();
+	if (pixelSize.isEmpty()) {
+		return;
+	}
+	const auto aspect = float(pixelSize.width()) / float(pixelSize.height());
+
+	auto projection = QMatrix4x4();
+	projection.perspective(kFieldOfView, aspect, kNearPlane, kFarPlane);
+
+	auto view = QMatrix4x4();
+	view.lookAt(
+		QVector3D(0.f, 0.f, kCameraDistance),
+		QVector3D(0.f, 0.f, 0.f),
+		QVector3D(0.f, 1.f, 0.f));
+
+	auto world = QMatrix4x4();
+	world.rotate(-_state.pitch, 1.f, 0.f, 0.f);
+	world.rotate(-_state.yaw, 0.f, 1.f, 0.f);
+
+	const auto mvp = rhi->clipSpaceCorrMatrix() * projection * view * world;
+
+	auto shared = SharedUniforms();
+	memcpy(shared.mvp, mvp.constData(), sizeof(shared.mvp));
+	memcpy(shared.world, world.constData(), sizeof(shared.world));
+	shared.resolution[0] = float(pixelSize.width());
+	shared.resolution[1] = float(pixelSize.height());
+	shared.misc[0] = _state.time;
+	shared.misc[1] = _state.night ? 1.f : 0.f;
+	shared.misc[2] = _state.alpha;
+
+	auto *rub = rhi->nextResourceUpdateBatch();
+	rub->updateDynamicBuffer(_sharedUniform, 0, sizeof(shared), &shared);
+
+	cb->beginPass(rt, QColor(0, 0, 0, 0), { 1.0f, 0 }, rub);
+	cb->setGraphicsPipeline(_pipeline);
+	cb->setViewport({
+		0.f,
+		0.f,
+		float(pixelSize.width()),
+		float(pixelSize.height()) });
+	for (auto i = 0; i != kShellCount; ++i) {
+		cb->setShaderResources(_srb[i]);
+		const QRhiCommandBuffer::VertexInput vbuf[] = {
+			{ _vertexBuffers[i], 0 },
+		};
+		cb->setVertexInput(0, 1, vbuf);
+		cb->draw(_vertexCounts[i]);
+	}
+	cb->endPass();
+}
+
+void CoinRenderer::releaseResources() {
+	if (!_rhi) {
+		return;
+	}
+	delete _pipeline;
+	_pipeline = nullptr;
+	for (auto i = 0; i != kShellCount; ++i) {
+		delete _srb[i];
+		_srb[i] = nullptr;
+	}
+	delete _flecksSampler;
+	_flecksSampler = nullptr;
+	delete _flecksTexture;
+	_flecksTexture = nullptr;
+	delete _borderSampler;
+	_borderSampler = nullptr;
+	delete _borderTexture;
+	_borderTexture = nullptr;
+	delete _drawUniform;
+	_drawUniform = nullptr;
+	delete _sharedUniform;
+	_sharedUniform = nullptr;
+	for (auto i = 0; i != kShellCount; ++i) {
+		delete _vertexBuffers[i];
+		_vertexBuffers[i] = nullptr;
+		_vertexCounts[i] = 0;
+	}
+
+	_initialized = false;
+	_rhi = nullptr;
+}
+
+} // namespace Ui::Premium
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/ui/effects/premium_coin_renderer.h b/Telegram/SourceFiles/ui/effects/premium_coin_renderer.h
new file mode 100644
index 00000000000000..478c5440f2ee75
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_coin_renderer.h
@@ -0,0 +1,89 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rhi/rhi_renderer.h"
+#include "ui/gl/gl_surface.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+class QRhi;
+class QRhiBuffer;
+class QRhiTexture;
+class QRhiSampler;
+class QRhiGraphicsPipeline;
+class QRhiShaderResourceBindings;
+class QRhiRenderTarget;
+class QRhiCommandBuffer;
+
+namespace Ui::Premium {
+
+class CoinRenderer final
+	: public GL::Renderer
+	, public Rhi::Renderer {
+public:
+	CoinRenderer();
+	~CoinRenderer();
+
+	struct State {
+		float yaw = 0.f;
+		float pitch = 0.f;
+		float time = 0.f;
+		float alpha = 1.f;
+		bool night = false;
+	};
+	void setState(State state);
+
+	void initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void releaseResources() override;
+
+	QColor rhiClearColor() override {
+		return QColor(0, 0, 0, 0);
+	}
+
+	std::optional<QColor> clearColor() override {
+		return QColor(0, 0, 0, 0);
+	}
+
+private:
+	// [0] coin_outer, [1] coin_inner, [2] coin_logo, [3] coin_stars.
+	static constexpr auto kShellCount = 4;
+
+	[[nodiscard]] bool createPipeline(QRhiRenderTarget *rt);
+
+	QRhi *_rhi = nullptr;
+
+	std::array<QRhiBuffer*, kShellCount> _vertexBuffers = { {} };
+	std::array<int, kShellCount> _vertexCounts = { {} };
+	QRhiBuffer *_sharedUniform = nullptr;
+	QRhiBuffer *_drawUniform = nullptr;
+	quint32 _drawStride = 0;
+	std::array<QRhiShaderResourceBindings*, kShellCount> _srb = { {} };
+	QRhiGraphicsPipeline *_pipeline = nullptr;
+	QRhiTexture *_borderTexture = nullptr;
+	QRhiSampler *_borderSampler = nullptr;
+	QRhiTexture *_flecksTexture = nullptr;
+	QRhiSampler *_flecksSampler = nullptr;
+
+	State _state;
+
+	bool _initialized = false;
+	bool _creationFailed = false;
+
+};
+
+} // namespace Ui::Premium
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/ui/effects/premium_diamond.cpp b/Telegram/SourceFiles/ui/effects/premium_diamond.cpp
new file mode 100644
index 00000000000000..b4cb9d4271e8a6
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_diamond.cpp
@@ -0,0 +1,63 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/premium_diamond.h"
+
+#include "ui/effects/premium_diamond_renderer.h"
+
+namespace Ui::Premium {
+namespace {
+
+constexpr auto kSpinDuration = crl::time(12000);
+constexpr auto kRespinDelay = crl::time(0);
+constexpr auto kSparklePeriod = 9.;
+constexpr auto kSampleCount = 4; // MSAA — smooths the faceted silhouette.
+
+} // namespace
+
+Diamond::Diamond(QWidget *parent)
+: Object3dCover(parent, {
+	.spinDuration = kSpinDuration,
+	.respinDelay = kRespinDelay,
+	.period = kSparklePeriod,
+	.spinEaseOut = false,
+	.sampleCount = kSampleCount,
+}) {
+}
+
+Diamond::~Diamond() = default;
+
+std::unique_ptr<Ui::GL::Renderer> Diamond::createRenderer() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	auto renderer = std::make_unique<DiamondRenderer>();
+	_renderer = renderer.get();
+	return renderer;
+#else // Qt >= 6.7
+	return nullptr;
+#endif // Qt < 6.7
+}
+
+void Diamond::applyState(
+		float yaw,
+		float pitch,
+		float time,
+		float alpha,
+		bool night) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (_renderer) {
+		_renderer->setState({
+			.yaw = yaw,
+			.pitch = pitch,
+			.time = time,
+			.alpha = alpha,
+			.night = night,
+		});
+	}
+#endif // Qt >= 6.7
+}
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_diamond.h b/Telegram/SourceFiles/ui/effects/premium_diamond.h
new file mode 100644
index 00000000000000..46406fe8b00e2a
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_diamond.h
@@ -0,0 +1,35 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/premium_3d_cover.h"
+
+namespace Ui::Premium {
+
+class DiamondRenderer;
+
+class Diamond final : public Object3dCover {
+public:
+	explicit Diamond(QWidget *parent);
+	~Diamond();
+
+protected:
+	std::unique_ptr<Ui::GL::Renderer> createRenderer() override;
+	void applyState(
+		float yaw,
+		float pitch,
+		float time,
+		float alpha,
+		bool night) override;
+
+private:
+	DiamondRenderer *_renderer = nullptr;
+
+};
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_diamond_renderer.cpp b/Telegram/SourceFiles/ui/effects/premium_diamond_renderer.cpp
new file mode 100644
index 00000000000000..4775a579078020
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_diamond_renderer.cpp
@@ -0,0 +1,315 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/premium_diamond_renderer.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+#include "ui/effects/premium_3d_mesh.h"
+#include "base/debug_log.h"
+
+#include <rhi/qrhi.h>
+#include <QtGui/QMatrix4x4>
+#include <QtGui/QVector3D>
+
+namespace Ui::Premium {
+namespace {
+
+constexpr auto kFloatsPerVertex = 6;
+constexpr auto kModelScale = 8.f;
+constexpr auto kFieldOfView = 12.f;
+constexpr auto kNearPlane = 1.f;
+constexpr auto kFarPlane = 200.f;
+constexpr auto kCameraHeight = 40.f;
+constexpr auto kCameraDistance = 100.f;
+
+struct alignas(16) SharedUniforms {
+	float mvp[16];
+	float world[16];
+	float resolution[4];
+	float misc[4]; // time, night, alpha, _
+};
+static_assert(sizeof(SharedUniforms) == 160);
+static_assert(sizeof(SharedUniforms) % 16 == 0);
+
+} // namespace
+
+DiamondRenderer::DiamondRenderer() = default;
+
+DiamondRenderer::~DiamondRenderer() {
+	releaseResources();
+}
+
+void DiamondRenderer::setState(State state) {
+	_state = state;
+}
+
+void DiamondRenderer::initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (_initialized && _rhi == rhi) {
+		return;
+	}
+	if (_rhi != rhi) {
+		_creationFailed = false;
+	}
+	releaseResources();
+	if (_creationFailed) {
+		return;
+	}
+	_rhi = rhi;
+
+	const auto model = LoadObject3dModel({
+		u":/gui/art/premium/diamond_outer_2.binobj"_q,
+		u":/gui/art/premium/diamond_outer.binobj"_q,
+		u":/gui/art/premium/diamond.binobj"_q,
+	}, kModelScale, false);
+	if (model.isNull()) {
+		LOG(("PremiumDiamond: failed to load model"));
+		_creationFailed = true;
+		return;
+	}
+
+	for (auto i = 0; i != kShellCount; ++i) {
+		const auto &shell = model.shells[i];
+		_vertexCounts[i] = shell.vertexCount;
+		_vertexBuffers[i] = rhi->newBuffer(
+			QRhiBuffer::Immutable,
+			QRhiBuffer::VertexBuffer,
+			shell.vertices.size() * sizeof(float));
+		if (!_vertexBuffers[i]->create()) {
+			LOG(("PremiumDiamond: vertex buffer creation failed"));
+			_creationFailed = true;
+			releaseResources();
+			return;
+		}
+	}
+
+	_sharedUniform = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::UniformBuffer,
+		sizeof(SharedUniforms));
+	if (!_sharedUniform->create()) {
+		_creationFailed = true;
+		releaseResources();
+		return;
+	}
+
+	const auto align = std::max<quint32>(rhi->ubufAlignment(), 1);
+	const auto slotBytes = quint32(4 * sizeof(float));
+	_drawStride = ((slotBytes + align - 1) / align) * align;
+	_drawUniform = rhi->newBuffer(
+		QRhiBuffer::Immutable,
+		QRhiBuffer::UniformBuffer,
+		kDrawCount * _drawStride);
+	if (!_drawUniform->create()) {
+		_creationFailed = true;
+		releaseResources();
+		return;
+	}
+
+	if (!createPipelines(rt)) {
+		LOG(("PremiumDiamond: pipeline creation failed, disabling effect"));
+		_creationFailed = true;
+		releaseResources();
+		return;
+	}
+
+	const auto slotFloats = _drawStride / sizeof(float);
+	auto drawData = std::vector<float>(kDrawCount * slotFloats, 0.f);
+	for (auto i = 0; i != kDrawCount; ++i) {
+		const auto base = i * slotFloats;
+		drawData[base + 0] = float(kDrawSlots[i].shell);
+		drawData[base + 1] = kDrawSlots[i].behind ? 1.f : 0.f;
+	}
+
+	auto *rub = rhi->nextResourceUpdateBatch();
+	for (auto i = 0; i != kShellCount; ++i) {
+		rub->uploadStaticBuffer(
+			_vertexBuffers[i],
+			model.shells[i].vertices.data());
+	}
+	rub->uploadStaticBuffer(_drawUniform, drawData.data());
+	cb->resourceUpdate(rub);
+
+	_initialized = true;
+
+	LOG(("PremiumDiamond: initialized, backend=%1 device=%2")
+		.arg(rhi->backendName())
+		.arg(rhi->driverInfo().deviceName));
+}
+
+bool DiamondRenderer::createPipelines(QRhiRenderTarget *rt) {
+	const auto vertShader = LoadObject3dShader(u"premium_diamond.vert"_q);
+	const auto fragShader = LoadObject3dShader(u"premium_diamond.frag"_q);
+	if (!vertShader.isValid() || !fragShader.isValid()) {
+		return false;
+	}
+
+	for (auto i = 0; i != kDrawCount; ++i) {
+		_srb[i] = _rhi->newShaderResourceBindings();
+		_srb[i]->setBindings({
+			QRhiShaderResourceBinding::uniformBuffer(
+				0,
+				QRhiShaderResourceBinding::VertexStage
+					| QRhiShaderResourceBinding::FragmentStage,
+				_sharedUniform),
+			QRhiShaderResourceBinding::uniformBuffer(
+				1,
+				QRhiShaderResourceBinding::FragmentStage,
+				_drawUniform,
+				i * _drawStride,
+				quint32(4 * sizeof(float))),
+		});
+		if (!_srb[i]->create()) {
+			return false;
+		}
+	}
+
+	auto inputLayout = QRhiVertexInputLayout();
+	inputLayout.setBindings({
+		{ quint32(kFloatsPerVertex * sizeof(float)) },
+	});
+	inputLayout.setAttributes({
+		{ 0, 0, QRhiVertexInputAttribute::Float3, 0 },
+		{ 0, 1, QRhiVertexInputAttribute::Float3, 3 * sizeof(float) },
+	});
+
+	auto blend = QRhiGraphicsPipeline::TargetBlend();
+	blend.enable = true;
+	blend.srcColor = QRhiGraphicsPipeline::One;
+	blend.dstColor = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+	blend.srcAlpha = QRhiGraphicsPipeline::One;
+	blend.dstAlpha = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+
+	const auto makePipeline = [&](bool depth) -> QRhiGraphicsPipeline* {
+		auto pipeline = _rhi->newGraphicsPipeline();
+		pipeline->setShaderStages({
+			{ QRhiShaderStage::Vertex, vertShader },
+			{ QRhiShaderStage::Fragment, fragShader },
+		});
+		pipeline->setVertexInputLayout(inputLayout);
+		pipeline->setTargetBlends({ blend });
+		pipeline->setTopology(QRhiGraphicsPipeline::Triangles);
+		pipeline->setCullMode(QRhiGraphicsPipeline::Back);
+		pipeline->setDepthTest(depth);
+		pipeline->setDepthWrite(depth);
+		pipeline->setSampleCount(rt->sampleCount());
+		pipeline->setShaderResourceBindings(_srb[0]);
+		pipeline->setRenderPassDescriptor(rt->renderPassDescriptor());
+		if (!pipeline->create()) {
+			delete pipeline;
+			return nullptr;
+		}
+		return pipeline;
+	};
+
+	_behindPipeline = makePipeline(false);
+	_frontPipeline = makePipeline(true);
+	return (_behindPipeline != nullptr) && (_frontPipeline != nullptr);
+}
+
+void DiamondRenderer::render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (rhi->isDeviceLost()) {
+		releaseResources();
+		return;
+	}
+	if (!_initialized) {
+		cb->beginPass(rt, QColor(0, 0, 0, 0), { 1.0f, 0 });
+		cb->endPass();
+		return;
+	}
+	_rhi = rhi;
+
+	const auto pixelSize = rt->pixelSize();
+	if (pixelSize.isEmpty()) {
+		return;
+	}
+	const auto aspect = float(pixelSize.width()) / float(pixelSize.height());
+
+	auto projection = QMatrix4x4();
+	projection.perspective(kFieldOfView, aspect, kNearPlane, kFarPlane);
+
+	auto view = QMatrix4x4();
+	view.lookAt(
+		QVector3D(0.f, kCameraHeight, kCameraDistance),
+		QVector3D(0.f, 0.f, 0.f),
+		QVector3D(0.f, 1.f, 0.f));
+
+	auto world = QMatrix4x4();
+	world.rotate(-_state.pitch, 1.f, 0.f, 0.f);
+	world.rotate(-_state.yaw, 0.f, 1.f, 0.f);
+
+	const auto mvp = rhi->clipSpaceCorrMatrix() * projection * view * world;
+
+	auto shared = SharedUniforms();
+	memcpy(shared.mvp, mvp.constData(), sizeof(shared.mvp));
+	memcpy(shared.world, world.constData(), sizeof(shared.world));
+	shared.resolution[0] = float(pixelSize.width());
+	shared.resolution[1] = float(pixelSize.height());
+	shared.misc[0] = _state.time;
+	shared.misc[1] = _state.night ? 1.f : 0.f;
+	shared.misc[2] = _state.alpha;
+
+	auto *rub = rhi->nextResourceUpdateBatch();
+	rub->updateDynamicBuffer(_sharedUniform, 0, sizeof(shared), &shared);
+
+	cb->beginPass(rt, QColor(0, 0, 0, 0), { 1.0f, 0 }, rub);
+	const auto viewport = QRhiViewport(
+		0.f,
+		0.f,
+		float(pixelSize.width()),
+		float(pixelSize.height()));
+	for (auto i = 0; i != kDrawCount; ++i) {
+		const auto &slot = kDrawSlots[i];
+		cb->setGraphicsPipeline(slot.behind
+			? _behindPipeline
+			: _frontPipeline);
+		cb->setViewport(viewport);
+		cb->setShaderResources(_srb[i]);
+		const QRhiCommandBuffer::VertexInput vbuf[] = {
+			{ _vertexBuffers[slot.shell], 0 },
+		};
+		cb->setVertexInput(0, 1, vbuf);
+		cb->draw(_vertexCounts[slot.shell]);
+	}
+	cb->endPass();
+}
+
+void DiamondRenderer::releaseResources() {
+	if (!_rhi) {
+		return;
+	}
+	delete _behindPipeline;
+	_behindPipeline = nullptr;
+	delete _frontPipeline;
+	_frontPipeline = nullptr;
+	for (auto i = 0; i != kDrawCount; ++i) {
+		delete _srb[i];
+		_srb[i] = nullptr;
+	}
+	delete _drawUniform;
+	_drawUniform = nullptr;
+	delete _sharedUniform;
+	_sharedUniform = nullptr;
+	for (auto i = 0; i != kShellCount; ++i) {
+		delete _vertexBuffers[i];
+		_vertexBuffers[i] = nullptr;
+		_vertexCounts[i] = 0;
+	}
+
+	_initialized = false;
+	_rhi = nullptr;
+}
+
+} // namespace Ui::Premium
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/ui/effects/premium_diamond_renderer.h b/Telegram/SourceFiles/ui/effects/premium_diamond_renderer.h
new file mode 100644
index 00000000000000..e6302e0179771f
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_diamond_renderer.h
@@ -0,0 +1,96 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rhi/rhi_renderer.h"
+#include "ui/gl/gl_surface.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+class QRhi;
+class QRhiBuffer;
+class QRhiGraphicsPipeline;
+class QRhiShaderResourceBindings;
+class QRhiRenderTarget;
+class QRhiCommandBuffer;
+
+namespace Ui::Premium {
+
+class DiamondRenderer final
+	: public GL::Renderer
+	, public Rhi::Renderer {
+public:
+	DiamondRenderer();
+	~DiamondRenderer();
+
+	struct State {
+		float yaw = 0.f;
+		float pitch = 0.f;
+		float time = 0.f;
+		float alpha = 1.f;
+		bool night = false;
+	};
+	void setState(State state);
+
+	void initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void releaseResources() override;
+
+	QColor rhiClearColor() override {
+		return QColor(0, 0, 0, 0);
+	}
+
+	std::optional<QColor> clearColor() override {
+		return QColor(0, 0, 0, 0);
+	}
+
+private:
+	static constexpr auto kShellCount = 3;
+	static constexpr auto kDrawCount = 5;
+
+	struct DrawSlot {
+		int shell = 0;
+		bool behind = false;
+	};
+	static constexpr std::array<DrawSlot, kDrawCount> kDrawSlots = { {
+		{ 0, true },
+		{ 1, true },
+		{ 2, false },
+		{ 1, false },
+		{ 0, false },
+	} };
+
+	[[nodiscard]] bool createPipelines(QRhiRenderTarget *rt);
+
+	QRhi *_rhi = nullptr;
+
+	std::array<QRhiBuffer*, kShellCount> _vertexBuffers = { {} };
+	std::array<int, kShellCount> _vertexCounts = { {} };
+	QRhiBuffer *_sharedUniform = nullptr;
+	QRhiBuffer *_drawUniform = nullptr;
+	quint32 _drawStride = 0;
+	std::array<QRhiShaderResourceBindings*, kDrawCount> _srb = { {} };
+	QRhiGraphicsPipeline *_behindPipeline = nullptr;
+	QRhiGraphicsPipeline *_frontPipeline = nullptr;
+
+	State _state;
+
+	bool _initialized = false;
+	bool _creationFailed = false;
+
+};
+
+} // namespace Ui::Premium
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
index fb35336b3c949a..cb967aab2cfbe9 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "lang/lang_keys.h"
 #include "ui/abstract_button.h"
 #include "ui/effects/animations.h"
+#include "ui/effects/credits_graphics.h"
 #include "ui/effects/gradient.h"
 #include "ui/effects/numbers_animation.h"
 #include "ui/effects/premium_bubble.h"
@@ -201,8 +202,8 @@ Line::Line(
 : Line(
 	parent,
 	st,
-	max ? textFactory(max) : QString(),
-	min ? textFactory(min) : QString(),
+	max ? textFactory(max).counter : QString(),
+	min ? textFactory(min).counter : QString(),
 	ratio) {
 }
 
@@ -232,7 +233,7 @@ Line::Line(
 	const auto set = [&](
 			Ui::Text::String &label,
 			rpl::producer<QString> &text) {
-		std::move(text) | rpl::start_with_next([=, &label](QString text) {
+		std::move(text) | rpl::on_next([=, &label](QString text) {
 			label = { st::semiboldTextStyle, text };
 			_recaches.fire({});
 		}, lifetime());
@@ -242,7 +243,7 @@ Line::Line(
 	set(_rightLabel, labels.rightLabel);
 	set(_rightText, labels.rightCount);
 
-	std::move(state) | rpl::start_with_next([=](LimitRowState state) {
+	std::move(state) | rpl::on_next([=](LimitRowState state) {
 		_dynamic = state.dynamic;
 		if (width() > 0) {
 			const auto from = state.animateFromZero
@@ -262,7 +263,7 @@ Line::Line(
 		_recaches.events_starting_with({})
 	) | rpl::filter([](const QSize &size, int parentWidth, auto) {
 		return !size.isEmpty() && parentWidth;
-	}) | rpl::start_with_next([=](const QSize &size, auto, auto) {
+	}) | rpl::on_next([=](const QSize &size, auto, auto) {
 		recache(size);
 		update();
 	}, lifetime());
@@ -371,7 +372,6 @@ void Line::recache(const QSize &s) {
 		}
 	};
 	const auto textPadding = st::premiumLineTextSkip;
-	const auto textTop = (s.height() - _leftLabel.minHeight()) / 2;
 	const auto rwidth = _rightLabel.maxWidth();
 	const auto pen = [&](bool gradient) {
 		return gradient ? st::activeButtonFg : _st.nonPremiumFg;
@@ -384,8 +384,10 @@ void Line::recache(const QSize &s) {
 		if (_dynamic) {
 			p.setFont(st::normalFont);
 			p.setPen(pen(_st.gradientFromLeft));
-			_leftLabel.drawLeft(p, textPadding, textTop, width, width);
-			_rightLabel.drawRight(p, textPadding, textTop, rwidth, width);
+			const auto leftTop = (s.height() - _leftLabel.minHeight()) / 2;
+			_leftLabel.drawLeft(p, textPadding, leftTop, width, width);
+			const auto rightTop = (s.height() - _rightLabel.minHeight()) / 2;
+			_rightLabel.drawRight(p, textPadding, rightTop, rwidth, width);
 		}
 		_leftPixmap = std::move(leftPixmap);
 	}
@@ -397,8 +399,10 @@ void Line::recache(const QSize &s) {
 		if (_dynamic) {
 			p.setFont(st::normalFont);
 			p.setPen(pen(!_st.gradientFromLeft));
-			_leftLabel.drawLeft(p, textPadding, textTop, width, width);
-			_rightLabel.drawRight(p, textPadding, textTop, rwidth, width);
+			const auto leftTop = (s.height() - _leftLabel.minHeight()) / 2;
+			_leftLabel.drawLeft(p, textPadding, leftTop, width, width);
+			const auto rightTop = (s.height() - _rightLabel.minHeight()) / 2;
+			_rightLabel.drawRight(p, textPadding, rightTop, rwidth, width);
 		}
 		_rightPixmap = std::move(rightPixmap);
 	}
@@ -492,8 +496,8 @@ void AddLimitRow(
 	AddLimitRow(
 		parent,
 		st,
-		max ? factory(max) : QString(),
-		min ? factory(min) : QString(),
+		max ? factory(max).counter : QString(),
+		min ? factory(min).counter : QString(),
 		ratio);
 }
 
@@ -503,9 +507,17 @@ void AddLimitRow(
 		LimitRowLabels labels,
 		rpl::producer<LimitRowState> state,
 		const style::margins &padding) {
-	parent->add(
+	const auto color = std::move(labels.activeLineBg);
+	const auto line = parent->add(
 		object_ptr<Line>(parent, st, std::move(labels), std::move(state)),
 		padding);
+	if (color) {
+		line->setColorOverride(color());
+
+		style::PaletteChanged() | rpl::on_next([=] {
+			line->setColorOverride(color());
+		}, line->lifetime());
+	}
 }
 
 void AddAccountsRow(
@@ -581,7 +593,7 @@ void AddAccountsRow(
 			anim::type::instant);
 
 		widget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			Painter p(widget);
 			const auto width = widget->width();
 			const auto photoLeft = (width - (imageRadius * 2)) / 2;
@@ -618,7 +630,7 @@ void AddAccountsRow(
 	}
 
 	container->sizeValue(
-	) | rpl::start_with_next([=](const QSize &size) {
+	) | rpl::on_next([=](const QSize &size) {
 		const auto count = state->accounts.size();
 		const auto columnWidth = size.width() / count;
 		for (auto i = 0; i < count; i++) {
@@ -744,7 +756,7 @@ void ShowListBox(
 		const auto title = content->add(
 			object_ptr<Ui::FlatLabel>(
 				content,
-				base::take(entry.title) | Ui::Text::ToBold(),
+				base::take(entry.title) | rpl::map(tr::bold),
 				stLabel),
 			entry.icon ? iconTitlePadding : titlePadding);
 		content->add(
@@ -761,11 +773,11 @@ void ShowListBox(
 			icons->push_back(QColor());
 			const auto icon = Ui::CreateChild<Ui::RpWidget>(content.get());
 			icon->resize(outlined->size());
-			title->topValue() | rpl::start_with_next([=](int y) {
+			title->topValue() | rpl::on_next([=](int y) {
 				const auto shift = st::settingsPremiumPreviewIconPosition;
 				icon->move(QPoint(0, y) + shift);
 			}, icon->lifetime());
-			icon->paintRequest() | rpl::start_with_next([=] {
+			icon->paintRequest() | rpl::on_next([=] {
 				auto p = QPainter(icon);
 				outlined->paintInCenter(p, icon->rect(), (*icons)[index]);
 			}, icon->lifetime());
@@ -773,9 +785,9 @@ void ShowListBox(
 		if (entry.leftNumber || entry.rightNumber) {
 			auto factory = [=, text = ProcessTextFactory({})](int n) {
 				if (entry.customRightText && (n == entry.rightNumber)) {
-					return *entry.customRightText;
+					return Ui::Premium::BubbleText{ *entry.customRightText };
 				} else {
-					return text(n);
+					return Ui::Premium::BubbleText{ text(n) };
 				}
 			};
 			const auto limitRow = content->add(
@@ -889,7 +901,7 @@ void AddGiftOptions(
 		}
 
 		row->sizeValue(
-		) | rpl::start_with_next([=, margins = stCheckbox.margin](
+		) | rpl::on_next([=, margins = stCheckbox.margin](
 				const QSize &s) {
 			const auto radioHeight = radio->height()
 				- margins.top()
@@ -904,7 +916,7 @@ void AddGiftOptions(
 			row->paintRequest(
 			) | rpl::take(
 				1
-			) | rpl::start_with_next([=]() mutable {
+			) | rpl::on_next([=]() mutable {
 				const auto from = edges->top->y();
 				const auto to = edges->bottom->y() + edges->bottom->height();
 				auto partialGradient = PartialGradient(from, to, stops);
@@ -917,8 +929,62 @@ void AddGiftOptions(
 			}, *onceLifetime);
 		}
 
+		constexpr auto kStar = QChar(0x2B50);
+		const auto removedStar = [&](QString s) {
+			return s.replace(kStar, QChar());
+		};
+		const auto &costPerMonthFont = st::shareBoxListItem.nameStyle.font;
+		const auto &costPerYearFont = st::normalFont;
+		const auto costPerMonthIcon = info.costPerMonth.startsWith(kStar)
+			? GenerateStars(costPerMonthFont->height, 1)
+			: QImage();
+		auto leftText = TextWithEntities();
+		if (!info.costNoDiscount.isEmpty()) {
+			leftText.append(Ui::Text::Wrapped(
+				TextWithEntities{ info.costNoDiscount },
+				EntityType::StrikeOut));
+			leftText.append(' ');
+		}
+		leftText.append(costPerMonthIcon.isNull()
+			? info.costPerMonth
+			: removedStar(info.costPerMonth));
+		const auto costPerMonthLabel
+			= row->lifetime().make_state<Ui::Text::String>();
+		costPerMonthLabel->setMarkedText(
+			st::shareBoxListItem.nameStyle,
+			std::move(leftText));
+		const auto rightText = info.total.isEmpty()
+			? info.costPerYear
+			: info.total;
+
+		const auto costPerYearEntry = [&] {
+			if (!rightText.startsWith(kStar)) {
+				return QImage();
+			}
+			const auto text = removedStar(rightText);
+			const auto icon = GenerateStars(costPerYearFont->height, 1);
+			auto result = QImage(
+				QSize(costPerYearFont->spacew + costPerYearFont->width(text), 0)
+					* style::DevicePixelRatio()
+					+ icon.size(),
+				QImage::Format_ARGB32_Premultiplied);
+			result.setDevicePixelRatio(style::DevicePixelRatio());
+			result.fill(Qt::transparent);
+			{
+				auto p = QPainter(&result);
+				p.drawImage(0, 0, icon);
+				p.setPen(st::windowSubTextFg);
+				p.setFont(costPerYearFont);
+				p.drawText(
+					Rect(result.size() / style::DevicePixelRatio()),
+					text,
+					style::al_right);
+			}
+			return result;
+		}();
+
 		row->paintRequest(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			auto p = QPainter(row);
 			auto hq = PainterHighQualityEnabler(p);
 
@@ -979,7 +1045,11 @@ void AddGiftOptions(
 			if (st.borderWidth && (animation->nowIndex == index)) {
 				const auto progress = animation->animation.value(1.);
 				const auto w = row->width();
-				auto gradient = QLinearGradient(w - w * progress, 0, w * 2, 0);
+				auto gradient = QLinearGradient(
+					w - w * progress,
+					0,
+					w * 2,
+					0);
 				gradient.setSpread(QGradient::Spread::RepeatSpread);
 				gradient.setStops(stops);
 				const auto pen = QPen(
@@ -1004,13 +1074,42 @@ void AddGiftOptions(
 						: bottomLeftRect.width() + discountMargins.left(),
 					0);
 			p.setPen(st::windowSubTextFg);
-			p.setFont(st::shareBoxListItem.nameStyle.font);
-			p.drawText(perRect, info.costPerMonth, style::al_left);
+			p.setFont(costPerMonthFont);
+
+			{
+				const auto left = costPerMonthIcon.isNull()
+					? 0
+					: (costPerMonthFont->spacew
+						+ costPerMonthIcon.width()
+							/ style::DevicePixelRatio());
+				const auto costPerYearWidth = costPerYearFont->width(
+					rightText);
+				const auto pos = perRect.translated(left, 0).topLeft();
+				const auto availableWidth = row->width()
+					- pos.x()
+					- costPerYearWidth;
+				costPerMonthLabel->draw(p, {
+					.position = pos,
+					.outerWidth = availableWidth,
+					.availableWidth = availableWidth,
+					.elisionLines = 1,
+				});
+			}
+			p.drawImage(perRect.topLeft(), costPerMonthIcon);
 
 			const auto totalRect = row->rect()
 				- QMargins(0, 0, st.rowMargins.right(), 0);
-			p.setFont(st::normalFont);
-			p.drawText(totalRect, info.costTotal, style::al_right);
+			if (costPerYearEntry.isNull()) {
+				p.setFont(costPerYearFont);
+				p.drawText(totalRect, rightText, style::al_right);
+			} else {
+				const auto size = costPerYearEntry.size()
+					/ style::DevicePixelRatio();
+				p.drawImage(
+					totalRect.width() - size.width(),
+					(row->height() - size.height()) / 2,
+					costPerYearEntry);
+			}
 		}, row->lifetime());
 
 		row->setClickedCallback([=, duration = st::defaultCheck.duration] {
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.h b/Telegram/SourceFiles/ui/effects/premium_graphics.h
index 86b136457b3d5e..049788ddc0bf69 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.h
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.h
@@ -65,6 +65,7 @@ struct LimitRowLabels {
 	rpl::producer<QString> leftCount;
 	rpl::producer<QString> rightLabel;
 	rpl::producer<QString> rightCount;
+	Fn<QBrush()> activeLineBg;
 };
 
 struct LimitRowState {
diff --git a/Telegram/SourceFiles/ui/effects/premium_star.cpp b/Telegram/SourceFiles/ui/effects/premium_star.cpp
new file mode 100644
index 00000000000000..47d97acb2db533
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_star.cpp
@@ -0,0 +1,548 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/premium_star.h"
+
+#include "ui/effects/premium_star_renderer.h"
+#include "ui/effects/premium_3d_support.h"
+#include "ui/gl/gl_surface.h"
+#include "base/call_delayed.h"
+#include "base/random.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+#include <QRhiWidget>
+#endif // Qt >= 6.7
+
+namespace Ui::Premium {
+namespace {
+
+constexpr auto kShimmerSpeed = 0.03;
+constexpr auto kFadeInDuration = 0.22;
+constexpr auto kDragYaw = 0.5;
+constexpr auto kDragPitch = 0.3;
+constexpr auto kMaxPitch = 50.;
+constexpr auto kMaxFrameDelta = crl::time(66);
+constexpr auto kMsInSecond = 1000.;
+constexpr auto kEnterDelay = crl::time(200);
+constexpr auto kEnterYaw = -180.;
+constexpr auto kBackDuration = crl::time(600);
+constexpr auto kIdleDelay = crl::time(2000);
+constexpr auto kOvershootTension = 2.;
+
+} // namespace
+
+Star::Star(QWidget *parent)
+: RpWidget(parent)
+, _animation([=] { frame(); }) {
+}
+
+Star::~Star() = default;
+
+bool Star::Supported() {
+	return Object3dSupported();
+}
+
+void Star::setColors(QColor gradient1, QColor gradient2) {
+	_gradient1 = gradient1;
+	_gradient2 = gradient2;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (_renderer) {
+		_renderer->setColors(_gradient1, _gradient2);
+	}
+#endif
+}
+
+void Star::setGolden(bool golden) {
+	_golden = golden;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (_renderer) {
+		_renderer->setGolden(_golden);
+	}
+#endif
+}
+
+void Star::setShownProgress(float64 progress) {
+	progress = std::clamp(progress, 0., 1.);
+	if (_opacity == progress) {
+		return;
+	}
+	_opacity = progress;
+	if (!_animation.animating()) {
+		pushState();
+		if (const auto w = surfaceWidget()) {
+			w->update();
+		}
+	}
+}
+
+void Star::setPaused(bool paused) {
+	if (_paused == paused) {
+		return;
+	}
+	_paused = paused;
+	if (_paused) {
+		freeze();
+	} else {
+		unfreeze();
+	}
+}
+
+void Star::freeze() {
+	stopAnimation();
+	_pausedAt = crl::now();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	const auto w = surfaceWidget();
+	if (!w || w->isHidden()) {
+		return;
+	}
+	const auto rhi = qobject_cast<QRhiWidget*>(w);
+	auto image = rhi ? rhi->grabFramebuffer() : QImage();
+	if (image.isNull()) {
+		return;
+	}
+	_frozen = std::move(image);
+	pushState();
+	w->update();
+	update();
+#endif // Qt >= 6.7
+}
+
+void Star::unfreeze() {
+	if (!_frozen.isNull()) {
+		_frozen = QImage();
+		update();
+	}
+	if (_pausedAt) {
+		const auto delta = crl::now() - _pausedAt;
+		if (_gesture) {
+			_gesture->start += delta;
+		}
+		if (_idleAt) {
+			_idleAt += delta;
+		}
+		_pausedAt = 0;
+	}
+	if (!isHidden()) {
+		startAnimation();
+	}
+}
+
+rpl::producer<float64> Star::flungStrength() const {
+	return _flung.events();
+}
+
+QWidget *Star::surfaceWidget() const {
+	return _surface ? _surface->rpWidget() : nullptr;
+}
+
+void Star::ensureSurface() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (_surface) {
+		return;
+	}
+	auto renderer = std::make_unique<StarRenderer>();
+	_renderer = renderer.get();
+	_renderer->setGolden(_golden);
+	if (_gradient1.isValid() && _gradient2.isValid()) {
+		_renderer->setColors(_gradient1, _gradient2);
+	}
+	_surface = GL::CreateSurface(
+		this,
+		GL::ChosenRenderer{
+			.renderer = std::move(renderer),
+			.backend = GL::Backend::QRhi,
+		});
+	if (const auto w = surfaceWidget()) {
+		w->setAttribute(Qt::WA_TransparentForMouseEvents);
+		w->setAttribute(Qt::WA_AlwaysStackOnTop);
+		w->setGeometry(rect());
+		w->hide();
+	}
+#endif // Qt >= 6.7
+}
+
+void Star::startAnimation() {
+	if (_paused || _animation.animating()) {
+		return;
+	}
+	_lastFrame = crl::now();
+	_animation.start();
+}
+
+void Star::stopAnimation() {
+	_animation.stop();
+}
+
+void Star::advance(float64 dt) {
+	_shimmer += dt * kShimmerSpeed;
+	_shimmer -= std::floor(_shimmer);
+	if (_fadeIn < 1.) {
+		_fadeIn = std::min(1., _fadeIn + dt / kFadeInDuration);
+	}
+}
+
+void Star::applyChannel(Channel channel, float64 value) {
+	switch (channel) {
+	case Channel::Yaw: _yaw = value; break;
+	case Channel::Pitch: _pitch = value; break;
+	case Channel::Bob: _bob = value; break;
+	}
+}
+
+void Star::tick(crl::time now) {
+	const auto ease = [](Easing easing, float64 t) -> float64 {
+		switch (easing) {
+		case Easing::Linear:
+			return t;
+		case Easing::Default:
+			return CubicBezier(0.25, 0.1, 0.25, 1., t);
+		case Easing::EaseOut:
+			return CubicBezier(0., 0., 0.58, 1., t);
+		case Easing::EaseOutQuint:
+			return CubicBezier(0.23, 1., 0.32, 1., t);
+		case Easing::Overshoot: {
+			const auto u = t - 1.;
+			return u * u * ((kOvershootTension + 1.) * u + kOvershootTension)
+				+ 1.;
+		}
+		}
+		return t;
+	};
+	const auto valueAt = [](const Track &track, float64 eased) -> float64 {
+		const auto last = int(track.values.size()) - 1;
+		if (last <= 0) {
+			return track.values.empty() ? 0. : track.values.front();
+		} else if (last == 1) {
+			return track.values[0]
+				+ eased * (track.values[1] - track.values[0]);
+		}
+		const auto position = eased * last;
+		const auto segment = std::clamp(
+			int(std::floor(position)),
+			0,
+			last - 1);
+		const auto local = position - segment;
+		return track.values[segment]
+			+ local * (track.values[segment + 1] - track.values[segment]);
+	};
+
+	if (_gesture) {
+		const auto elapsed = now - _gesture->start;
+		for (const auto &track : _gesture->tracks) {
+			if (elapsed < track.delay) {
+				continue;
+			}
+			const auto local = std::min(
+				elapsed - track.delay,
+				track.duration);
+			const auto fraction = (track.duration > 0)
+				? (local / float64(track.duration))
+				: 1.;
+			applyChannel(
+				track.channel,
+				valueAt(track, ease(track.easing, fraction)));
+		}
+		if (elapsed >= _gesture->total) {
+			_yaw = 0.;
+			_gesture.reset();
+			scheduleIdle(kIdleDelay);
+		}
+	} else if (_idleAt && now >= _idleAt && !_dragging) {
+		_idleAt = 0;
+		startIdleGesture();
+	}
+}
+
+void Star::pushState() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (_renderer) {
+		_renderer->setState({
+			.yaw = float(_yaw),
+			.pitch = float(_pitch),
+			.bob = float(_bob),
+			.shimmer = float(_shimmer),
+			.alpha = _paused ? 0.f : float(_fadeIn * _opacity),
+		});
+	}
+#endif // Qt >= 6.7
+}
+
+void Star::frame() {
+	const auto now = crl::now();
+	const auto delta = std::clamp(
+		now - _lastFrame,
+		crl::time(1),
+		kMaxFrameDelta);
+	_lastFrame = now;
+	advance(delta / kMsInSecond);
+	tick(now);
+	pushState();
+	if (const auto w = surfaceWidget()) {
+		w->update();
+	}
+}
+
+void Star::play(Gesture gesture) {
+	gesture.start = crl::now();
+	gesture.total = 0;
+	for (const auto &track : gesture.tracks) {
+		gesture.total = std::max(gesture.total, track.delay + track.duration);
+	}
+	cancelIdle();
+	_gesture = std::move(gesture);
+}
+
+void Star::scheduleIdle(crl::time delay) {
+	_idleAt = crl::now() + delay;
+}
+
+void Star::cancelIdle() {
+	_idleAt = 0;
+}
+
+void Star::startIdleGesture() {
+	if (_idleBag.empty()) {
+		_idleBag = { 0, 1, 2, 3, 4 };
+		for (auto i = int(_idleBag.size()) - 1; i > 0; --i) {
+			std::swap(_idleBag[i], _idleBag[base::RandomIndex(i + 1)]);
+		}
+	}
+	const auto index = _idleBag.back();
+	_idleBag.pop_back();
+	switch (index) {
+	case 0: pullGesture(); break;
+	case 1: slowFlipGesture(); break;
+	case 2: sleepGesture(); break;
+	default: flipGesture(); break;
+	}
+}
+
+void Star::startBackSpring() {
+	const auto fromYaw = _yaw;
+	const auto fromPitch = _pitch;
+	const auto fromBob = _bob;
+	auto gesture = Gesture();
+	gesture.tracks.push_back({
+		.channel = Channel::Yaw,
+		.values = { fromYaw, 0. },
+		.duration = kBackDuration,
+		.easing = Easing::Overshoot,
+	});
+	gesture.tracks.push_back({
+		.channel = Channel::Pitch,
+		.values = { fromPitch, 0. },
+		.duration = kBackDuration,
+		.easing = Easing::Overshoot,
+	});
+	gesture.tracks.push_back({
+		.channel = Channel::Bob,
+		.values = { fromBob, 0. },
+		.duration = kBackDuration,
+		.easing = Easing::Overshoot,
+	});
+	play(std::move(gesture));
+	const auto magnitude = std::abs(fromYaw + fromPitch);
+	if (magnitude > 0.) {
+		_flung.fire_copy(magnitude);
+	}
+	scheduleIdle(kIdleDelay);
+}
+
+void Star::pullGesture() {
+	const auto variant = base::RandomIndex(4);
+	auto gesture = Gesture();
+	if (variant == 0) {
+		gesture.tracks.push_back({
+			.channel = Channel::Pitch,
+			.values = { 0., 48. },
+			.duration = crl::time(2300),
+			.easing = Easing::EaseOutQuint,
+		});
+		gesture.tracks.push_back({
+			.channel = Channel::Pitch,
+			.values = { 48., 0. },
+			.delay = crl::time(2300),
+			.duration = crl::time(500),
+			.easing = Easing::Overshoot,
+		});
+	} else {
+		const auto target = (variant == 2) ? -485. : 485.;
+		gesture.tracks.push_back({
+			.channel = Channel::Yaw,
+			.values = { 0., target },
+			.duration = crl::time(3000),
+			.easing = Easing::EaseOutQuint,
+		});
+		gesture.tracks.push_back({
+			.channel = Channel::Yaw,
+			.values = { target, 0. },
+			.delay = crl::time(3000),
+			.duration = crl::time(1000),
+			.easing = Easing::Overshoot,
+		});
+	}
+	play(std::move(gesture));
+}
+
+void Star::slowFlipGesture() {
+	auto gesture = Gesture();
+	gesture.tracks.push_back({
+		.channel = Channel::Yaw,
+		.values = { 0., 360. },
+		.duration = crl::time(8000),
+		.easing = Easing::Default,
+	});
+	play(std::move(gesture));
+}
+
+void Star::flipGesture() {
+	auto gesture = Gesture();
+	gesture.tracks.push_back({
+		.channel = Channel::Yaw,
+		.values = { 0., 180. },
+		.duration = crl::time(600),
+		.easing = Easing::Default,
+	});
+	gesture.tracks.push_back({
+		.channel = Channel::Yaw,
+		.values = { 180., 360. },
+		.delay = crl::time(2000),
+		.duration = crl::time(600),
+		.easing = Easing::Default,
+	});
+	play(std::move(gesture));
+}
+
+void Star::sleepGesture() {
+	auto gesture = Gesture();
+	gesture.tracks.push_back({
+		.channel = Channel::Yaw,
+		.values = { 0., 184. },
+		.duration = crl::time(600),
+		.easing = Easing::EaseOut,
+	});
+	gesture.tracks.push_back({
+		.channel = Channel::Pitch,
+		.values = { 0., 50. },
+		.duration = crl::time(600),
+		.easing = Easing::EaseOut,
+	});
+	gesture.tracks.push_back({
+		.channel = Channel::Yaw,
+		.values = { 180., 0. },
+		.delay = crl::time(10000),
+		.duration = crl::time(800),
+		.easing = Easing::Overshoot,
+	});
+	gesture.tracks.push_back({
+		.channel = Channel::Pitch,
+		.values = { 60., 0. },
+		.delay = crl::time(10000),
+		.duration = crl::time(800),
+		.easing = Easing::Overshoot,
+	});
+	gesture.tracks.push_back({
+		.channel = Channel::Bob,
+		.values = { 0., 2., -3., 2., -1., 2., -3., 2., -1., 0. },
+		.duration = crl::time(10000),
+		.easing = Easing::Linear,
+	});
+	play(std::move(gesture));
+}
+
+void Star::paintEvent(QPaintEvent *e) {
+	if (_frozen.isNull()) {
+		return;
+	}
+	auto p = QPainter(this);
+	p.drawImage(rect(), _frozen);
+}
+
+void Star::resizeEvent(QResizeEvent *e) {
+	if (const auto w = surfaceWidget()) {
+		w->setGeometry(rect());
+	}
+}
+
+void Star::startEnter() {
+	if (_entered) {
+		return;
+	}
+	_entered = true;
+	base::call_delayed(kEnterDelay, this, [=] {
+		if (isHidden()) {
+			return;
+		}
+		if (const auto w = surfaceWidget()) {
+			w->show();
+		}
+		_yaw = kEnterYaw;
+		_pitch = _bob = 0.;
+		startAnimation();
+		startBackSpring();
+	});
+}
+
+void Star::showEvent(QShowEvent *e) {
+	ensureSurface();
+	if (_entered) {
+		if (const auto w = surfaceWidget()) {
+			w->show();
+		}
+		startAnimation();
+		return;
+	}
+	_yaw = kEnterYaw;
+	_pitch = _bob = 0.;
+	_gesture.reset();
+	cancelIdle();
+	if (const auto w = surfaceWidget()) {
+		w->hide();
+	}
+	startAnimation();
+}
+
+void Star::hideEvent(QHideEvent *e) {
+	stopAnimation();
+	if (_entered) {
+		return;
+	}
+	_gesture.reset();
+	cancelIdle();
+	_yaw = _pitch = _bob = 0.;
+}
+
+void Star::mousePressEvent(QMouseEvent *e) {
+	_dragging = true;
+	_lastDragPos = e->pos();
+	_gesture.reset();
+	cancelIdle();
+}
+
+void Star::mouseMoveEvent(QMouseEvent *e) {
+	if (!_dragging) {
+		return;
+	}
+	const auto pos = e->pos();
+	const auto shift = pos - _lastDragPos;
+	_yaw += -shift.x() * kDragYaw;
+	_pitch = std::clamp(
+		_pitch - shift.y() * kDragPitch,
+		-kMaxPitch,
+		kMaxPitch);
+	_lastDragPos = pos;
+}
+
+void Star::mouseReleaseEvent(QMouseEvent *e) {
+	if (!_dragging) {
+		return;
+	}
+	_dragging = false;
+	startBackSpring();
+}
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_star.h b/Telegram/SourceFiles/ui/effects/premium_star.h
new file mode 100644
index 00000000000000..99bef90eda4f9d
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_star.h
@@ -0,0 +1,121 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/effects/animations.h"
+
+namespace Ui::Premium {
+
+class StarRenderer;
+
+class Star final : public RpWidget {
+public:
+	explicit Star(QWidget *parent);
+	~Star();
+
+	[[nodiscard]] static bool Supported();
+
+	void setColors(QColor gradient1, QColor gradient2);
+	void setGolden(bool golden);
+	void setShownProgress(float64 progress);
+	void setPaused(bool paused);
+	void startEnter();
+
+	[[nodiscard]] rpl::producer<float64> flungStrength() const;
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+	void showEvent(QShowEvent *e) override;
+	void hideEvent(QHideEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+
+private:
+	enum class Channel {
+		Yaw,
+		Pitch,
+		Bob,
+	};
+	enum class Easing {
+		Linear,
+		Default,
+		EaseOut,
+		EaseOutQuint,
+		Overshoot,
+	};
+	struct Track {
+		Channel channel = Channel::Yaw;
+		std::vector<float64> values;
+		crl::time delay = 0;
+		crl::time duration = 0;
+		Easing easing = Easing::Linear;
+	};
+	struct Gesture {
+		std::vector<Track> tracks;
+		crl::time start = 0;
+		crl::time total = 0;
+	};
+
+	void ensureSurface();
+	[[nodiscard]] QWidget *surfaceWidget() const;
+	void freeze();
+	void unfreeze();
+	void startAnimation();
+	void stopAnimation();
+	void frame();
+	void advance(float64 dt);
+	void tick(crl::time now);
+	void pushState();
+
+	void applyChannel(Channel channel, float64 value);
+	void play(Gesture gesture);
+	void scheduleIdle(crl::time delay);
+	void cancelIdle();
+	void startIdleGesture();
+	void startBackSpring();
+	void pullGesture();
+	void slowFlipGesture();
+	void flipGesture();
+	void sleepGesture();
+
+	StarRenderer *_renderer = nullptr;
+	std::unique_ptr<RpWidgetWrap> _surface;
+	QImage _frozen;
+	Ui::Animations::Basic _animation;
+	crl::time _lastFrame = 0;
+
+	QColor _gradient1;
+	QColor _gradient2;
+	bool _golden = false;
+
+	float64 _yaw = 0.;
+	float64 _pitch = 0.;
+	float64 _bob = 0.;
+	float64 _shimmer = 0.;
+	float64 _fadeIn = 0.;
+	float64 _opacity = 1.;
+
+	std::optional<Gesture> _gesture;
+	crl::time _idleAt = 0;
+	std::vector<int> _idleBag;
+
+	bool _dragging = false;
+	QPoint _lastDragPos;
+
+	rpl::event_stream<float64> _flung;
+
+	bool _paused = false;
+	bool _entered = false;
+	crl::time _pausedAt = 0;
+
+};
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_star_model.cpp b/Telegram/SourceFiles/ui/effects/premium_star_model.cpp
new file mode 100644
index 00000000000000..499d751aa9aff7
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_star_model.cpp
@@ -0,0 +1,27 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/premium_star_model.h"
+
+#include "ui/effects/premium_3d_mesh.h"
+
+#include <QtCore/QString>
+
+namespace Ui::Premium {
+
+StarModel LoadStarModel() {
+	auto mesh = LoadObject3dMesh(
+		u":/gui/art/premium/star.binobj"_q,
+		1.f,
+		true);
+	auto result = StarModel();
+	result.vertices = std::move(mesh.vertices);
+	result.vertexCount = mesh.vertexCount;
+	return result;
+}
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_star_model.h b/Telegram/SourceFiles/ui/effects/premium_star_model.h
new file mode 100644
index 00000000000000..1c508913ba71bf
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_star_model.h
@@ -0,0 +1,25 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include <vector>
+
+namespace Ui::Premium {
+
+struct StarModel {
+	std::vector<float> vertices;
+	int vertexCount = 0;
+
+	[[nodiscard]] bool isNull() const {
+		return vertices.empty();
+	}
+};
+
+[[nodiscard]] StarModel LoadStarModel();
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_star_particles.cpp b/Telegram/SourceFiles/ui/effects/premium_star_particles.cpp
new file mode 100644
index 00000000000000..9e73928267a30a
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_star_particles.cpp
@@ -0,0 +1,451 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/premium_star_particles.h"
+
+#include "base/algorithm.h"
+#include "ui/effects/animation_value.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/style/style_core.h"
+
+#include <QtMath>
+#include <QtSvg/QSvgRenderer>
+
+namespace Ui::Premium {
+namespace {
+
+constexpr auto kParticleCount = 100;
+constexpr auto kGlyphParticleCount = 75;
+constexpr auto kDollarParticleCount = 60;
+constexpr auto kDollarSpawnChance = 0.13; // Share of particles that are coins.
+constexpr auto kDollarSpeedScale = 2.5; // Coins fly outward faster than stars.
+constexpr auto kDollarLifeScale = 2.5; // ...and live longer, for longer trails.
+constexpr auto kDollarSpawnRadiusFactor = 0.2; // Coins start near the center.
+constexpr auto kDollarFlipPerSecond = 1.1; // Horizontal coin-flip frequency.
+constexpr auto kDollarSpriteAlpha = 255;
+constexpr auto kIdleLimit = 5;
+constexpr auto kMinDelta = crl::time(4);
+constexpr auto kMaxDelta = crl::time(50);
+constexpr auto kLifeMin = crl::time(2000);
+constexpr auto kLifeRand = 1000;
+constexpr auto kAppearMs = 200.;
+constexpr auto kFadeOutSpan = 150.;
+constexpr auto kRadiusResolution = 1000;
+constexpr auto kAngleSteps = 360;
+constexpr auto kAlphaBasePercent = 50;
+constexpr auto kAlphaRangePercent = 50;
+constexpr auto kFatness = 0.98;
+constexpr auto kSpriteAlpha = 200;
+constexpr auto kBoundsFactor = 1.6;
+constexpr auto kDriftDp = 4.;
+constexpr auto kDriftDivisor = 660.;
+constexpr auto kSoftScale = 0.66;
+constexpr auto kMinSoftRatio = 2;
+constexpr auto kRoundDp = 0.8;
+constexpr auto kMsPerSecond = 1000.;
+constexpr auto kDegreesToRadians = M_PI / 180.;
+constexpr auto k2Pi = 2. * M_PI;
+constexpr auto kRandomBuffer = 1024;
+constexpr auto kFlingRampUpMs = crl::time(600);
+constexpr auto kFlingTotalMs = crl::time(2000);
+constexpr auto kFlingThresholdLow = 60.;
+constexpr auto kFlingThresholdHigh = 180.;
+constexpr auto kFlingSpeedLow = 5.;
+constexpr auto kFlingSpeedMedium = 9.;
+constexpr auto kFlingSpeedHigh = 15.;
+
+constexpr auto kSizesDp = std::array{ 3., 8., 7. };
+constexpr auto kDollarSizesDp = std::array{ 16., 8., 7. };
+constexpr auto kRotationDegPerSec = std::array{ 9., 7.2, 6. };
+
+[[nodiscard]] QPainterPath StarPath(float64 size) {
+	const auto half = size / 2.;
+	const auto mid = half * kFatness;
+	auto path = QPainterPath();
+	path.moveTo(0., half);
+	path.lineTo(mid, mid);
+	path.lineTo(half, 0.);
+	path.lineTo(size - mid, mid);
+	path.lineTo(size, half);
+	path.lineTo(size - mid, size - mid);
+	path.lineTo(half, size);
+	path.lineTo(mid, size - mid);
+	path.closeSubpath();
+	return path;
+}
+
+[[nodiscard]] float64 Overshoot(float64 t) {
+	constexpr auto kTension = 2.;
+	const auto u = t - 1.;
+	return u * u * ((kTension + 1.) * u + kTension) + 1.;
+}
+
+} // namespace
+
+StarParticles::StarParticles(Fn<void(const QRect &)> update)
+: _update(std::move(update))
+, _animation([=](crl::time now) {
+	if (++_idleCounter >= kIdleLimit) {
+		_animation.stop();
+		return;
+	}
+	tick(now);
+	if (_rectToUpdate.isValid()) {
+		_update(base::take(_rectToUpdate));
+	}
+})
+, _random(kRandomBuffer) {
+}
+
+void StarParticles::setColor(QColor color) {
+	setColors(color, color);
+}
+
+void StarParticles::setColors(QColor color1, QColor color2) {
+	if (_color1 == color1 && _color2 == color2) {
+		return;
+	}
+	_color1 = color1;
+	_color2 = color2;
+	_spritesDirty = true;
+}
+
+void StarParticles::setGlyph(Glyph glyph) {
+	if (_glyph == glyph) {
+		return;
+	}
+	_glyph = glyph;
+	_spritesDirty = true;
+}
+
+void StarParticles::setPaused(bool paused) {
+	if (_paused == paused) {
+		return;
+	}
+	_paused = paused;
+	if (paused) {
+		_pausedAt = crl::now();
+		_animation.stop();
+	} else {
+		if (_pausedAt) {
+			const auto delta = crl::now() - _pausedAt;
+			for (auto &particle : _particles) {
+				particle.birthTime += delta;
+				particle.deathTime += delta;
+			}
+			if (_flingStart) {
+				_flingStart += delta;
+			}
+			_pausedAt = 0;
+		}
+		_lastTime = crl::now();
+	}
+}
+
+float64 StarParticles::driftStep(crl::time delta) const {
+	return style::ConvertScale(kDriftDp) * (delta / kDriftDivisor);
+}
+
+void StarParticles::fling(float64 strength) {
+	_flingMax = (strength < kFlingThresholdLow)
+		? kFlingSpeedLow
+		: (strength < kFlingThresholdHigh)
+		? kFlingSpeedMedium
+		: kFlingSpeedHigh;
+	const auto now = crl::now();
+	_flingStart = now;
+	_idleCounter = 0;
+	if (!_paused && !_animation.animating()) {
+		_lastTime = now;
+		_animation.start();
+	}
+}
+
+void StarParticles::updateSpeedScale(crl::time now) {
+	if (!_flingStart) {
+		_speedScale = 1.;
+		return;
+	}
+	const auto elapsed = std::max<crl::time>(0, now - _flingStart);
+	if (elapsed >= kFlingTotalMs) {
+		_flingStart = 0;
+		_speedScale = 1.;
+	} else if (elapsed < kFlingRampUpMs) {
+		_speedScale = 1.
+			+ (_flingMax - 1.) * (elapsed / float64(kFlingRampUpMs));
+	} else {
+		const auto progress = (elapsed - kFlingRampUpMs)
+			/ float64(kFlingTotalMs - kFlingRampUpMs);
+		_speedScale = _flingMax + (1. - _flingMax) * progress;
+	}
+}
+
+void StarParticles::createParticle(crl::time now, Particle &particle) {
+	if (_glyph == Glyph::Dollar) {
+		const auto roll = base::RandomIndex(kRadiusResolution, _random)
+			/ float64(kRadiusResolution);
+		particle.sizeIndex = (roll < kDollarSpawnChance)
+			? 0
+			: (1 + base::RandomIndex(int(_sprites.size()) - 1, _random));
+	} else {
+		particle.sizeIndex = base::RandomIndex(int(_sprites.size()), _random);
+	}
+	const auto dollar = (_glyph == Glyph::Dollar) && (particle.sizeIndex == 0);
+	particle.radiusFactor = base::RandomIndex(kRadiusResolution, _random)
+		/ float64(kRadiusResolution);
+	if (dollar) {
+		particle.radiusFactor *= kDollarSpawnRadiusFactor;
+	}
+	particle.angle = base::RandomIndex(kAngleSteps, _random)
+		* kDegreesToRadians;
+	particle.alpha = (kAlphaBasePercent
+		+ base::RandomIndex(kAlphaRangePercent, _random)) / 100.;
+	particle.colorIndex = base::RandomIndex(kColorSteps, _random);
+	particle.flipProgress = dollar
+		? (base::RandomIndex(kRadiusResolution, _random)
+			* 2. / kRadiusResolution)
+		: 0.;
+	particle.birthTime = now;
+	const auto life = kLifeMin + base::RandomIndex(kLifeRand, _random);
+	particle.deathTime = now
+		+ (dollar ? crl::time(life * kDollarLifeScale) : life);
+	particle.distance = 0.;
+}
+
+void StarParticles::ensureParticles() {
+	if (!_particles.empty()) {
+		return;
+	}
+	const auto now = crl::now();
+	const auto perMs = driftStep(crl::time(1));
+	_particles.resize((_glyph == Glyph::Dollar)
+		? kDollarParticleCount
+		: (_glyph == Glyph::Star)
+		? kGlyphParticleCount
+		: kParticleCount);
+	for (auto &particle : _particles) {
+		createParticle(now, particle);
+		const auto life = particle.deathTime - particle.birthTime;
+		const auto shift = base::RandomIndex(
+			int(std::max<crl::time>(life, 1)),
+			_random);
+		particle.birthTime = now - shift;
+		particle.deathTime = particle.birthTime + life;
+		particle.distance = perMs * shift;
+	}
+	_lastTime = now;
+}
+
+void StarParticles::tick(crl::time now) {
+	ensureParticles();
+	const auto delta = std::clamp(now - _lastTime, kMinDelta, kMaxDelta);
+	_lastTime = now;
+	updateSpeedScale(now);
+
+	const auto radius = _field.isEmpty()
+		? 0.
+		: std::min(_field.width(), _field.height()) / 2.;
+	const auto bound = radius * kBoundsFactor;
+	const auto step = driftStep(delta) * _speedScale;
+	const auto flipStep = (delta / kMsPerSecond)
+		* kDollarFlipPerSecond
+		* _speedScale;
+	for (auto &particle : _particles) {
+		if (now >= particle.deathTime) {
+			createParticle(now, particle);
+			continue;
+		}
+		const auto dollar = (_glyph == Glyph::Dollar) && (particle.sizeIndex == 0);
+		particle.distance += dollar ? (step * kDollarSpeedScale) : step;
+		if (dollar) {
+			particle.flipProgress += flipStep;
+		}
+		if (radius > 0.
+			&& (particle.radiusFactor * radius + particle.distance) > bound) {
+			createParticle(now, particle);
+		}
+	}
+	for (auto i = 0; i != int(_fieldAngle.size()); ++i) {
+		_fieldAngle[i] += kRotationDegPerSec[i]
+			* (delta / kMsPerSecond)
+			* kDegreesToRadians;
+		_fieldAngle[i] -= k2Pi * std::floor(_fieldAngle[i] / k2Pi);
+	}
+
+	if (radius > 0.) {
+		const auto center = rect::center(_field);
+		const auto margin = bound + _maxSpriteExtent;
+		_rectToUpdate |= QRectF(
+			center - QPointF(margin, margin),
+			Size(2. * margin)).toAlignedRect();
+	}
+}
+
+void StarParticles::rebuildSprites(int ratio) {
+	_spritesDirty = false;
+	_spritesRatio = ratio;
+	const auto round = style::ConvertScale(kRoundDp) * ratio;
+	const auto pad = int(base::SafeRound(round)) + ratio;
+	const auto bakePath = [&](int side, QColor fill) {
+		const auto full = side + 2 * pad;
+		auto image = QImage(full, full, QImage::Format_ARGB32_Premultiplied);
+		image.fill(Qt::transparent);
+		{
+			auto p = QPainter(&image);
+			auto hq = PainterHighQualityEnabler(p);
+			p.translate(pad, pad);
+			auto pen = QPen(fill);
+			pen.setWidthF(round * 2.);
+			pen.setJoinStyle(Qt::RoundJoin);
+			pen.setCapStyle(Qt::RoundCap);
+			p.setPen(pen);
+			p.setBrush(fill);
+			p.drawPath(StarPath(side));
+		}
+		const auto soft = std::max(
+			1,
+			int(base::SafeRound(full * kSoftScale)));
+		image = image.scaled(
+			soft,
+			soft,
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation
+		).scaled(
+			full,
+			full,
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation);
+		image.setDevicePixelRatio(ratio);
+		return Sprite{
+			.image = std::move(image),
+			.size = Size(full / float64(ratio)),
+		};
+	};
+	auto glyph = (_glyph == Glyph::Dollar)
+		? std::make_unique<QSvgRenderer>(
+			u":/gui/icons/settings/premium_dollar.svg"_q)
+		: (_glyph == Glyph::Star)
+		? std::make_unique<QSvgRenderer>(u":/gui/icons/settings/star.svg"_q)
+		: nullptr;
+	const auto bakeGlyph = [&](int side, QColor fill) {
+		const auto full = side + 2 * pad;
+		auto image = QImage(full, full, QImage::Format_ARGB32_Premultiplied);
+		image.fill(Qt::transparent);
+		{
+			auto p = QPainter(&image);
+			glyph->render(&p, QRectF(pad, pad, side, side));
+			p.setCompositionMode(QPainter::CompositionMode_SourceIn);
+			p.fillRect(QRectF(0, 0, full, full), fill);
+		}
+		image.setDevicePixelRatio(ratio);
+		return Sprite{
+			.image = std::move(image),
+			.size = Size(full / float64(ratio)),
+		};
+	};
+	const auto sizes = (_glyph == Glyph::Dollar)
+		? kDollarSizesDp
+		: (_glyph == Glyph::Star)
+		? std::array<float64, 3>{ { 8., 9., 10. } }
+		: kSizesDp;
+	_maxSpriteExtent = 0.;
+	for (auto i = 0; i != int(_sprites.size()); ++i) {
+		const auto side = std::max(
+			1,
+			int(base::SafeRound(style::ConvertScale(sizes[i]) * ratio)));
+		const auto useGlyph = (glyph != nullptr) && (i == 0);
+		for (auto j = 0; j != kColorSteps; ++j) {
+			const auto t = (kColorSteps > 1)
+				? (j / float64(kColorSteps - 1))
+				: 0.;
+			auto fill = anim::color(_color1, _color2, t);
+			fill.setAlpha((useGlyph && (_glyph == Glyph::Dollar))
+				? kDollarSpriteAlpha
+				: kSpriteAlpha);
+			_sprites[i][j] = useGlyph
+				? bakeGlyph(side, fill)
+				: bakePath(side, fill);
+		}
+		_maxSpriteExtent = std::max(
+			_maxSpriteExtent,
+			_sprites[i][0].size.width());
+	}
+}
+
+void StarParticles::paint(QPainter &p, const QRectF &field) {
+	if (!_color1.isValid() || field.isEmpty()) {
+		return;
+	}
+	ensureParticles();
+	_idleCounter = 0;
+	const auto ratio = std::max(
+		int(std::ceil(p.device()->devicePixelRatioF())),
+		kMinSoftRatio);
+	if (_spritesDirty || _spritesRatio != ratio) {
+		rebuildSprites(ratio);
+	}
+	if (!_paused && !_animation.animating()) {
+		_lastTime = crl::now();
+		_animation.start();
+	}
+	_field = field;
+
+	const auto center = rect::center(field);
+	const auto radius = std::min(field.width(), field.height()) / 2.;
+	const auto now = (_paused && _pausedAt) ? _pausedAt : crl::now();
+	const auto baseOpacity = p.opacity();
+	for (const auto &particle : _particles) {
+		const auto age = now - particle.birthTime;
+		const auto remaining = particle.deathTime - now;
+		if (age < 0 || remaining <= 0) {
+			continue;
+		}
+		const auto appear = std::clamp(age / kAppearMs, 0., 1.);
+		const auto scale = Overshoot(appear);
+		if (scale <= 0.) {
+			continue;
+		}
+		const auto fade = std::clamp(remaining / kFadeOutSpan, 0., 1.);
+		const auto alpha = particle.alpha * fade;
+		const auto radial = particle.radiusFactor * radius
+			+ particle.distance;
+		const auto theta = particle.angle
+			+ ((_glyph == Glyph::Dollar)
+				? 0.
+				: _fieldAngle[particle.sizeIndex]);
+		const auto position = QPointF(
+			center.x() + radial * std::cos(theta),
+			center.y() + radial * std::sin(theta));
+		const auto &sprite
+			= _sprites[particle.sizeIndex][particle.colorIndex];
+		const auto width = sprite.size.width() * scale;
+		const auto height = sprite.size.height() * scale;
+		p.setOpacity(baseOpacity * alpha);
+		if ((_glyph == Glyph::Dollar) && (particle.sizeIndex == 0)) {
+			const auto flip = std::cos(M_PI * particle.flipProgress);
+			p.save();
+			p.translate(position);
+			p.scale(flip, 1.);
+			p.drawImage(
+				QRectF(-width / 2., -height / 2., width, height),
+				sprite.image);
+			p.restore();
+		} else {
+			p.drawImage(
+				QRectF(
+					position.x() - width / 2.,
+					position.y() - height / 2.,
+					width,
+					height),
+				sprite.image);
+		}
+	}
+	p.setOpacity(baseOpacity);
+}
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_star_particles.h b/Telegram/SourceFiles/ui/effects/premium_star_particles.h
new file mode 100644
index 00000000000000..fd9e551801024d
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_star_particles.h
@@ -0,0 +1,88 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/animations.h"
+#include "base/random.h"
+
+namespace Ui::Premium {
+
+class StarParticles final {
+public:
+	enum class Glyph {
+		None,
+		Star,
+		Dollar,
+	};
+
+	explicit StarParticles(Fn<void(const QRect &)> update);
+
+	void setColor(QColor color);
+	void setColors(QColor color1, QColor color2);
+	void setGlyph(Glyph glyph);
+	void paint(QPainter &p, const QRectF &field);
+	void setPaused(bool paused);
+	void fling(float64 strength);
+
+private:
+	struct Particle {
+		crl::time birthTime = 0;
+		crl::time deathTime = 0;
+		float64 angle = 0.;
+		float64 radiusFactor = 0.;
+		float64 distance = 0.;
+		float64 alpha = 0.;
+		float64 flipProgress = 0.;
+		int sizeIndex = 0;
+		int colorIndex = 0;
+	};
+	struct Sprite {
+		QImage image;
+		QSizeF size;
+	};
+
+	void ensureParticles();
+	void createParticle(crl::time now, Particle &particle);
+	void rebuildSprites(int ratio);
+	void tick(crl::time now);
+	void updateSpeedScale(crl::time now);
+	[[nodiscard]] float64 driftStep(crl::time delta) const;
+
+	const Fn<void(const QRect &)> _update;
+
+	static constexpr int kColorSteps = 20;
+	std::array<std::array<Sprite, kColorSteps>, 3> _sprites;
+	std::vector<Particle> _particles;
+
+	Ui::Animations::Basic _animation;
+	base::BufferedRandom<uint32> _random;
+
+	QColor _color1;
+	QColor _color2;
+	Glyph _glyph = Glyph::None;
+	float64 _maxSpriteExtent = 0.;
+	bool _spritesDirty = true;
+	int _spritesRatio = 0;
+
+	std::array<float64, 3> _fieldAngle = { { 0., 0., 0. } };
+	QRectF _field;
+
+	float64 _speedScale = 1.;
+	float64 _flingMax = 1.;
+	crl::time _flingStart = 0;
+	crl::time _lastTime = 0;
+	crl::time _pausedAt = 0;
+
+	bool _paused = false;
+	uint8_t _idleCounter = 0;
+
+	QRect _rectToUpdate;
+
+};
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_star_renderer.cpp b/Telegram/SourceFiles/ui/effects/premium_star_renderer.cpp
new file mode 100644
index 00000000000000..f1a04861db07ea
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_star_renderer.cpp
@@ -0,0 +1,335 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/premium_star_renderer.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+#include "ui/effects/premium_star_model.h"
+#include "ui/effects/premium_3d_mesh.h"
+#include "base/debug_log.h"
+
+#include <rhi/qrhi.h>
+#include <QtGui/QImage>
+#include <QtGui/QMatrix4x4>
+#include <QtGui/QPainter>
+#include <QtGui/QVector3D>
+#include <QtSvg/QSvgRenderer>
+
+namespace Ui::Premium {
+namespace {
+
+constexpr auto kFloatsPerVertex = 8;
+constexpr auto kBorderTextureSize = 240;
+constexpr auto kSpec1 = 2.f;
+constexpr auto kSpec2 = 0.13f;
+constexpr auto kDiffuse = 0.8f;
+constexpr auto kNormalSpec = 0.2f;
+constexpr auto kFieldOfView = 53.13f;
+constexpr auto kNearPlane = 1.f;
+constexpr auto kFarPlane = 200.f;
+constexpr auto kCameraDistance = 100.f;
+
+struct alignas(16) StarUniforms {
+	float mvp[16];
+	float world[16];
+	float grad1[4];
+	float grad2[4];
+	float params[4];
+	float extra[4];
+};
+static_assert(sizeof(StarUniforms) == 192);
+static_assert(sizeof(StarUniforms) % 16 == 0);
+
+[[nodiscard]] QImage RenderBorderTexture() {
+	auto renderer = QSvgRenderer(u":/gui/art/premium/star_texture.svg"_q);
+	auto image = QImage(
+		kBorderTextureSize,
+		kBorderTextureSize,
+		QImage::Format_RGBA8888_Premultiplied);
+	image.fill(Qt::transparent);
+	auto p = QPainter(&image);
+	renderer.render(&p);
+	p.end();
+	return image;
+}
+
+} // namespace
+
+StarRenderer::StarRenderer() = default;
+
+StarRenderer::~StarRenderer() {
+	releaseResources();
+}
+
+void StarRenderer::setState(State state) {
+	_state = state;
+}
+
+void StarRenderer::setColors(QColor gradient1, QColor gradient2) {
+	_gradient1 = { {
+		float(gradient1.redF()),
+		float(gradient1.greenF()),
+		float(gradient1.blueF()),
+	} };
+	_gradient2 = { {
+		float(gradient2.redF()),
+		float(gradient2.greenF()),
+		float(gradient2.blueF()),
+	} };
+}
+
+void StarRenderer::setGolden(bool golden) {
+	_golden = golden;
+}
+
+void StarRenderer::initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (_initialized && _rhi == rhi) {
+		return;
+	}
+	if (_rhi != rhi) {
+		_creationFailed = false;
+	}
+	releaseResources();
+	if (_creationFailed) {
+		return;
+	}
+	_rhi = rhi;
+
+	const auto model = LoadStarModel();
+	if (model.isNull()) {
+		LOG(("PremiumStar: failed to load model"));
+		_creationFailed = true;
+		return;
+	}
+	_vertexCount = model.vertexCount;
+
+	_vertexBuffer = rhi->newBuffer(
+		QRhiBuffer::Immutable,
+		QRhiBuffer::VertexBuffer,
+		model.vertices.size() * sizeof(float));
+	_vertexBuffer->create();
+
+	_uniformBuffer = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::UniformBuffer,
+		sizeof(StarUniforms));
+	_uniformBuffer->create();
+
+	const auto border = RenderBorderTexture();
+	_borderTexture = rhi->newTexture(QRhiTexture::RGBA8, border.size());
+	_borderTexture->create();
+	_borderSampler = rhi->newSampler(
+		QRhiSampler::Linear,
+		QRhiSampler::Linear,
+		QRhiSampler::None,
+		QRhiSampler::ClampToEdge,
+		QRhiSampler::ClampToEdge);
+	_borderSampler->create();
+
+	const auto flecks = LoadObject3dFlecksTexture();
+	_flecksTexture = rhi->newTexture(QRhiTexture::RGBA8, flecks.size());
+	_flecksTexture->create();
+	_flecksSampler = rhi->newSampler(
+		QRhiSampler::Linear,
+		QRhiSampler::Linear,
+		QRhiSampler::None,
+		QRhiSampler::Repeat,
+		QRhiSampler::Repeat);
+	_flecksSampler->create();
+
+	if (!createPipeline(rt)) {
+		LOG(("PremiumStar: pipeline creation failed, disabling effect"));
+		_creationFailed = true;
+		releaseResources();
+		return;
+	}
+
+	auto *rub = rhi->nextResourceUpdateBatch();
+	rub->uploadStaticBuffer(_vertexBuffer, model.vertices.data());
+	rub->uploadTexture(_borderTexture, border);
+	rub->uploadTexture(_flecksTexture, flecks);
+	cb->resourceUpdate(rub);
+
+	_initialized = true;
+
+	LOG(("PremiumStar: initialized, vertices=%1 backend=%2 device=%3")
+		.arg(_vertexCount)
+		.arg(rhi->backendName())
+		.arg(rhi->driverInfo().deviceName));
+}
+
+bool StarRenderer::createPipeline(QRhiRenderTarget *rt) {
+	const auto vertShader = LoadObject3dShader(u"premium_star.vert"_q);
+	const auto fragShader = LoadObject3dShader(u"premium_star.frag"_q);
+	if (!vertShader.isValid() || !fragShader.isValid()) {
+		return false;
+	}
+
+	_srb = _rhi->newShaderResourceBindings();
+	_srb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage
+				| QRhiShaderResourceBinding::FragmentStage,
+			_uniformBuffer),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_borderTexture,
+			_borderSampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::FragmentStage,
+			_flecksTexture,
+			_flecksSampler),
+	});
+	if (!_srb->create()) {
+		return false;
+	}
+
+	_pipeline = _rhi->newGraphicsPipeline();
+	_pipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, vertShader },
+		{ QRhiShaderStage::Fragment, fragShader },
+	});
+
+	QRhiVertexInputLayout inputLayout;
+	inputLayout.setBindings({
+		{ quint32(kFloatsPerVertex * sizeof(float)) },
+	});
+	inputLayout.setAttributes({
+		{ 0, 0, QRhiVertexInputAttribute::Float3, 0 },
+		{ 0, 1, QRhiVertexInputAttribute::Float3, 3 * sizeof(float) },
+		{ 0, 2, QRhiVertexInputAttribute::Float2, 6 * sizeof(float) },
+	});
+	_pipeline->setVertexInputLayout(inputLayout);
+
+	QRhiGraphicsPipeline::TargetBlend blend;
+	blend.enable = true;
+	blend.srcColor = QRhiGraphicsPipeline::One;
+	blend.dstColor = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+	blend.srcAlpha = QRhiGraphicsPipeline::One;
+	blend.dstAlpha = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+	_pipeline->setTargetBlends({ blend });
+
+	_pipeline->setTopology(QRhiGraphicsPipeline::Triangles);
+	_pipeline->setCullMode(QRhiGraphicsPipeline::None);
+	_pipeline->setDepthTest(true);
+	_pipeline->setDepthWrite(true);
+	_pipeline->setSampleCount(rt->sampleCount());
+	_pipeline->setShaderResourceBindings(_srb);
+	_pipeline->setRenderPassDescriptor(rt->renderPassDescriptor());
+	return _pipeline->create();
+}
+
+void StarRenderer::render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (rhi->isDeviceLost()) {
+		releaseResources();
+		return;
+	}
+	if (!_initialized) {
+		cb->beginPass(rt, QColor(0, 0, 0, 0), { 1.0f, 0 });
+		cb->endPass();
+		return;
+	}
+	_rhi = rhi;
+
+	const auto pixelSize = rt->pixelSize();
+	if (pixelSize.isEmpty()) {
+		return;
+	}
+	const auto aspect = float(pixelSize.width()) / float(pixelSize.height());
+
+	auto projection = QMatrix4x4();
+	projection.perspective(kFieldOfView, aspect, kNearPlane, kFarPlane);
+
+	auto view = QMatrix4x4();
+	view.lookAt(
+		QVector3D(0.f, 0.f, kCameraDistance),
+		QVector3D(0.f, 0.f, 0.f),
+		QVector3D(0.f, 1.f, 0.f));
+
+	auto world = QMatrix4x4();
+	world.translate(0.f, _state.bob, 0.f);
+	world.rotate(-_state.pitch, 1.f, 0.f, 0.f);
+	world.rotate(-_state.yaw, 0.f, 1.f, 0.f);
+
+	const auto mvp = rhi->clipSpaceCorrMatrix() * projection * view * world;
+
+	auto uni = StarUniforms();
+	memcpy(uni.mvp, mvp.constData(), sizeof(uni.mvp));
+	memcpy(uni.world, world.constData(), sizeof(uni.world));
+	uni.grad1[0] = _gradient1[0];
+	uni.grad1[1] = _gradient1[1];
+	uni.grad1[2] = _gradient1[2];
+	uni.grad1[3] = 1.f;
+	uni.grad2[0] = _gradient2[0];
+	uni.grad2[1] = _gradient2[1];
+	uni.grad2[2] = _gradient2[2];
+	uni.grad2[3] = 1.f;
+	uni.params[0] = _state.shimmer;
+	uni.params[1] = kSpec1;
+	uni.params[2] = kSpec2;
+	uni.params[3] = kDiffuse;
+	uni.extra[0] = kNormalSpec;
+	uni.extra[1] = _state.alpha;
+	uni.extra[2] = _golden ? 1.f : 0.f;
+	uni.extra[3] = 0.f;
+
+	auto *rub = rhi->nextResourceUpdateBatch();
+	rub->updateDynamicBuffer(_uniformBuffer, 0, sizeof(uni), &uni);
+
+	cb->beginPass(rt, QColor(0, 0, 0, 0), { 1.0f, 0 }, rub);
+	cb->setGraphicsPipeline(_pipeline);
+	cb->setViewport({
+		0.f,
+		0.f,
+		float(pixelSize.width()),
+		float(pixelSize.height()) });
+	cb->setShaderResources(_srb);
+	const QRhiCommandBuffer::VertexInput vbuf[] = { { _vertexBuffer, 0 } };
+	cb->setVertexInput(0, 1, vbuf);
+	cb->draw(_vertexCount);
+	cb->endPass();
+}
+
+void StarRenderer::releaseResources() {
+	if (!_rhi) {
+		return;
+	}
+	delete _pipeline;
+	_pipeline = nullptr;
+	delete _srb;
+	_srb = nullptr;
+	delete _flecksSampler;
+	_flecksSampler = nullptr;
+	delete _flecksTexture;
+	_flecksTexture = nullptr;
+	delete _borderSampler;
+	_borderSampler = nullptr;
+	delete _borderTexture;
+	_borderTexture = nullptr;
+	delete _uniformBuffer;
+	_uniformBuffer = nullptr;
+	delete _vertexBuffer;
+	_vertexBuffer = nullptr;
+
+	_initialized = false;
+	_vertexCount = 0;
+	_rhi = nullptr;
+}
+
+} // namespace Ui::Premium
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/ui/effects/premium_star_renderer.h b/Telegram/SourceFiles/ui/effects/premium_star_renderer.h
new file mode 100644
index 00000000000000..aa3cf964abb1bb
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/premium_star_renderer.h
@@ -0,0 +1,91 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rhi/rhi_renderer.h"
+#include "ui/gl/gl_surface.h"
+
+#include <QtGui/QColor>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+class QRhi;
+class QRhiBuffer;
+class QRhiTexture;
+class QRhiSampler;
+class QRhiGraphicsPipeline;
+class QRhiShaderResourceBindings;
+class QRhiRenderTarget;
+class QRhiCommandBuffer;
+
+namespace Ui::Premium {
+
+class StarRenderer final
+	: public GL::Renderer
+	, public Rhi::Renderer {
+public:
+	StarRenderer();
+	~StarRenderer();
+
+	struct State {
+		float yaw = 0.;
+		float pitch = 0.;
+		float bob = 0.;
+		float shimmer = 0.;
+		float alpha = 1.;
+	};
+	void setState(State state);
+	void setColors(QColor gradient1, QColor gradient2);
+	void setGolden(bool golden);
+
+	void initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void releaseResources() override;
+
+	QColor rhiClearColor() override {
+		return QColor(0, 0, 0, 0);
+	}
+
+	std::optional<QColor> clearColor() override {
+		return QColor(0, 0, 0, 0);
+	}
+
+private:
+	[[nodiscard]] bool createPipeline(QRhiRenderTarget *rt);
+
+	QRhi *_rhi = nullptr;
+
+	QRhiBuffer *_vertexBuffer = nullptr;
+	QRhiBuffer *_uniformBuffer = nullptr;
+	QRhiTexture *_borderTexture = nullptr;
+	QRhiSampler *_borderSampler = nullptr;
+	QRhiTexture *_flecksTexture = nullptr;
+	QRhiSampler *_flecksSampler = nullptr;
+	QRhiShaderResourceBindings *_srb = nullptr;
+	QRhiGraphicsPipeline *_pipeline = nullptr;
+
+	int _vertexCount = 0;
+	State _state;
+	bool _golden = false;
+	std::array<float, 3> _gradient1 = { { 1.f, 1.f, 1.f } };
+	std::array<float, 3> _gradient2 = { { 0.8902f, 0.9255f, 0.9804f } };
+
+	bool _initialized = false;
+	bool _creationFailed = false;
+
+};
+
+} // namespace Ui::Premium
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/ui/effects/premium_stars.cpp b/Telegram/SourceFiles/ui/effects/premium_stars.cpp
index c63f700d76ad0a..4a664b6af9c4a5 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_stars.cpp
@@ -14,30 +14,52 @@ For license and copyright information please follow this link:
 
 namespace Ui {
 namespace Premium {
+namespace {
 
+using Type = MiniStarsType;
 constexpr auto kDeformationMax = 0.1;
+constexpr auto kIdleLimit = 5;
+
+} // namespace
 
 MiniStars::MiniStars(
 	Fn<void(const QRect &r)> updateCallback,
 	bool opaque,
 	Type type)
-: _availableAngles({
-	Interval{ -10, 40 },
-	Interval{ 180 + 10 - 40, 40 },
-	Interval{ 180 + 15, 50 },
-	Interval{ -15 - 50, 50 },
-})
-, _lifeLength({ 150 / 5, 200 / 5 })
-, _deathTime({ 1500, 2000 })
-, _size({ 5, 10 })
+: _availableAngles((type != Type::SlowStars && type != Type::SlowDiamondStars)
+	? std::vector<Interval>{
+		Interval{ -10, 40 },
+		Interval{ 180 + 10 - 40, 40 },
+		Interval{ 180 + 15, 50 },
+		Interval{ -15 - 50, 50 },
+	}
+	: std::vector<Interval>{ Interval{ -90, 180 }, Interval{ 90, 180 } })
+, _lifeLength((type != Type::SlowStars && type != Type::SlowDiamondStars)
+	? Interval{ 150 / 5, 200 / 5 }
+	: Interval{ 150 * 2, 200 * 2 })
+, _deathTime((type != Type::SlowStars && type != Type::SlowDiamondStars)
+	? Interval{ 1500, 2000 }
+	: Interval{ 1500 * 2, 2000 * 2 })
+, _size((type != Type::SlowStars)
+	? Interval{ 5, 10 }
+	: Interval{ 2, 4 })
 , _alpha({ opaque ? 100 : 40, opaque ? 100 : 60 })
 , _sinFactor({ 10, 190 })
 , _spritesCount({ 0, ((type == Type::MonoStars) ? 1 : 2) })
-, _appearProgressTill(0.2)
+, _appearProgressTill((type != Type::SlowStars
+		&& type != Type::SlowDiamondStars)
+	? 0.2
+	: 0.01)
 , _disappearProgressAfter(0.8)
 , _distanceProgressStart(0.5)
-, _sprite(u":/gui/icons/settings/starmini.svg"_q)
+, _sprite((type == Type::DiamondStars || type == Type::SlowDiamondStars)
+	? u":/gui/icons/settings/starmini.svg"_q
+	: u":/gui/icons/settings/star.svg"_q)
 , _animation([=](crl::time now) {
+	if (++_idleCounter >= kIdleLimit) {
+		_animation.stop();
+		return;
+	}
 	if (now > _nextBirthTime && !_paused) {
 		createStar(now);
 	}
@@ -58,8 +80,6 @@ MiniStars::MiniStars(
 			createStar(i);
 		}
 		updateCallback(_rectToUpdate);
-	} else {
-		_animation.start();
 	}
 }
 
@@ -74,6 +94,10 @@ crl::time MiniStars::timeNow() const {
 }
 
 void MiniStars::paint(QPainter &p, const QRectF &rect) {
+	_idleCounter = 0;
+	if (!_animation.animating()) {
+		_animation.start();
+	}
 	const auto center = rect.center();
 	const auto opacity = p.opacity();
 	const auto now = timeNow();
diff --git a/Telegram/SourceFiles/ui/effects/premium_stars.h b/Telegram/SourceFiles/ui/effects/premium_stars.h
index d224d818601ee7..06dc2a50fa5573 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars.h
+++ b/Telegram/SourceFiles/ui/effects/premium_stars.h
@@ -14,17 +14,20 @@ For license and copyright information please follow this link:
 namespace Ui {
 namespace Premium {
 
+enum class MiniStarsType {
+	MonoStars,
+	BiStars,
+	SlowStars,
+	DiamondStars,
+	SlowDiamondStars,
+};
+
 class MiniStars final {
 public:
-	enum class Type {
-		MonoStars,
-		BiStars,
-	};
-
 	MiniStars(
 		Fn<void(const QRect &r)> updateCallback,
 		bool opaque = false,
-		Type type = Type::MonoStars);
+		MiniStarsType type = MiniStarsType::MonoStars);
 
 	void paint(QPainter &p, const QRectF &rect);
 	void setPaused(bool paused);
@@ -74,6 +77,7 @@ class MiniStars final {
 
 	crl::time _nextBirthTime = 0;
 	bool _paused = false;
+	uint8_t _idleCounter : 3 = 0;
 
 	QRect _rectToUpdate;
 
diff --git a/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp b/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp
index 5e20cfd22f320a..73d76ef4efc762 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_stars_colored.cpp
@@ -7,16 +7,235 @@ For license and copyright information please follow this link:
 */
 #include "ui/effects/premium_stars_colored.h"
 
+#include "base/random.h"
 #include "ui/effects/premium_graphics.h" // GiftGradientStops.
+#include "ui/text/text_custom_emoji.h"
+#include "ui/painter.h"
 #include "ui/rp_widget.h"
 
-namespace Ui {
-namespace Premium {
+namespace Ui::Premium {
+namespace {
+
+constexpr auto kStarsCount = 16;
+constexpr auto kTravelMax = 0.5;
+constexpr auto kExcludeRadius = 0.7;
+constexpr auto kFading = crl::time(200);
+constexpr auto kLifetimeMin = crl::time(1000);
+constexpr auto kLifetimeMax = 3 * kLifetimeMin;
+constexpr auto kSizeMin = 0.1;
+constexpr auto kSizeMax = 0.15;
+constexpr auto kPauseOnNoPaints = 4;
+
+[[nodiscard]] crl::time ChooseLife(base::BufferedRandom<uint32> &random) {
+	return kLifetimeMin
+		+ base::RandomIndex(kLifetimeMax - kLifetimeMin, random);
+}
+
+class CollectibleEmoji final : public Text::CustomEmoji {
+public:
+	CollectibleEmoji(
+		QStringView entityData,
+		QColor centerColor,
+		QColor edgeColor,
+		std::unique_ptr<Ui::Text::CustomEmoji> inner,
+		Fn<void()> update,
+		int size);
+
+	int width() override;
+	QString entityData() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	struct Star {
+		QPointF start;
+		QPointF delta;
+		float64 size = 0.;
+		crl::time birthTime = 0;
+		crl::time deathTime = 0;
+	};
+
+	void fill();
+	void refill(Star &star, base::BufferedRandom<uint32> &random);
+	void prepareFrame();
+
+	QString _entityData;
+	QSvgRenderer _svg;
+	std::vector<Star> _stars;
+	QColor _centerColor;
+	QColor _edgeColor;
+	std::unique_ptr<Text::CustomEmoji> _inner;
+	Ui::Animations::Basic _animation;
+	QImage _frame;
+	int _skippedPaints = 0;
+	int _size = 0;
+
+};
+
+CollectibleEmoji::CollectibleEmoji(
+	QStringView entityData,
+	QColor centerColor,
+	QColor edgeColor,
+	std::unique_ptr<Ui::Text::CustomEmoji> inner,
+	Fn<void()> update,
+	int size)
+: _entityData(entityData.toString())
+, _svg(u":/gui/icons/settings/starmini.svg"_q)
+, _centerColor(centerColor)
+, _edgeColor(edgeColor)
+, _inner(std::move(inner))
+, _animation([=] {
+	if (++_skippedPaints > kPauseOnNoPaints) {
+		_animation.stop();
+	} else {
+		update();
+	}
+})
+, _size(size) {
+	fill();
+}
+
+void CollectibleEmoji::fill() {
+	_stars.reserve(kStarsCount);
+	const auto now = crl::now();
+	auto random = base::BufferedRandom<uint32>(kStarsCount * 12);
+	for (auto i = 0; i != kStarsCount; ++i) {
+		const auto life = ChooseLife(random);
+		const auto shift = base::RandomIndex(life - kFading, random);
+		_stars.push_back({
+			.birthTime = now - crl::time(shift),
+			.deathTime = now - crl::time(shift) + crl::time(life),
+		});
+		refill(_stars.back(), random);
+	}
+}
+
+void CollectibleEmoji::refill(
+		Star &star,
+		base::BufferedRandom<uint32> &random) {
+	const auto take = [&] {
+		return base::RandomIndex(_size * 16, random) / (_size * 15.);
+	};
+	const auto stake = [&] {
+		return take() * 2. - 1.;
+	};
+	const auto exclude = kExcludeRadius * kExcludeRadius;
+	auto square = 0.;
+	while (true) {
+		const auto start = QPointF(stake(), stake());
+		square = start.x() * start.x() + start.y() * start.y();
+		if (square > exclude) {
+			star.start = start * _size;
+			break;
+		}
+	}
+	square *= _size * _size;
+	while (true) {
+		const auto delta = QPointF(stake(), stake()) * kTravelMax * _size;
+		const auto end = star.start + delta;
+		if (end.x() * end.x() + end.y() * end.y() > square) {
+			star.delta = delta;
+			break;
+		}
+	}
+	star.start = (star.start + QPointF(_size, _size)) / 2.;
+	star.size = (kSizeMin + (kSizeMax - kSizeMin) * take()) * _size;
+}
+
+int CollectibleEmoji::width() {
+	return _inner->width();
+}
+
+QString CollectibleEmoji::entityData() {
+	return _entityData;
+}
+
+void CollectibleEmoji::prepareFrame() {
+	const auto clip = QSize(_size, _size);
+	if (_frame.isNull()) {
+		const auto ratio = style::DevicePixelRatio();
+		_frame = QImage(clip * ratio, QImage::Format_ARGB32_Premultiplied);
+		_frame.setDevicePixelRatio(ratio);
+	}
+	_frame.fill(Qt::transparent);
+	auto p = QPainter(&_frame);
+	auto hq = PainterHighQualityEnabler(p);
+	auto random = std::optional<base::BufferedRandom<uint32>>();
+	const auto now = crl::now();
+	for (auto &star : _stars) {
+		if (star.deathTime <= now) {
+			if (!random) {
+				random.emplace(kStarsCount * 10);
+			}
+			const auto life = ChooseLife(*random);
+			star.birthTime = now;
+			star.deathTime = now + crl::time(life);
+			refill(star, *random);
+		}
+		Assert(star.birthTime <= now && now <= star.deathTime);
+
+		const auto time = (now - star.birthTime)
+			/ float64(star.deathTime - star.birthTime);
+		const auto position = star.start + star.delta * time;
+		const auto scale = ((now - star.birthTime) < kFading)
+			? ((now - star.birthTime) / float64(kFading))
+			: ((star.deathTime - now) < kFading)
+			? ((star.deathTime - now) / float64(kFading))
+			: 1.;
+		if (scale > 0.) {
+			const auto size = star.size * scale;
+			const auto rect = QRectF(
+				position - QPointF(size, size),
+				QSizeF(size, size) * 2);
+			_svg.render(&p, rect);
+		}
+	}
+
+	p.setCompositionMode(QPainter::CompositionMode_SourceIn);
+	auto gradient = QRadialGradient(
+		QRect(QPoint(), clip).center(),
+		clip.height() / 2);
+	gradient.setStops({
+		{ 0., _centerColor },
+		{ 1., _edgeColor },
+	});
+	p.setBrush(gradient);
+	p.setPen(Qt::NoPen);
+	p.drawRect(QRect(QPoint(), clip));
+}
+
+void CollectibleEmoji::paint(QPainter &p, const Context &context) {
+	prepareFrame();
+	p.drawImage(context.position, _frame);
+	if (context.paused) {
+		_animation.stop();
+	} else if (!_animation.animating()) {
+		_animation.start();
+	}
+	_inner->paint(p, context);
+	_skippedPaints = 0;
+}
+
+void CollectibleEmoji::unload() {
+	_inner->unload();
+}
+
+bool CollectibleEmoji::ready() {
+	return _inner->ready();
+}
+
+bool CollectibleEmoji::readyInDefaultState() {
+	return _inner->readyInDefaultState();
+}
+
+} // namespace
 
 ColoredMiniStars::ColoredMiniStars(
 	not_null<Ui::RpWidget*> parent,
 	bool optimizeUpdate,
-	MiniStars::Type type)
+	MiniStarsType type)
 : _ministars(
 	optimizeUpdate
 		? Fn<void(const QRect &)>([=](const QRect &r) {
@@ -27,6 +246,12 @@ ColoredMiniStars::ColoredMiniStars(
 	type) {
 }
 
+ColoredMiniStars::ColoredMiniStars(
+	Fn<void(const QRect &)> update,
+	MiniStarsType type)
+: _ministars(update, true, type) {
+}
+
 void ColoredMiniStars::setSize(const QSize &size) {
 	_frame = QImage(
 		size * style::DevicePixelRatio(),
@@ -100,5 +325,20 @@ void ColoredMiniStars::setCenter(const QRect &rect) {
 	setSize(ministarsRect.size());
 }
 
-} // namespace Premium
-} // namespace Ui
+std::unique_ptr<Text::CustomEmoji> MakeCollectibleEmoji(
+		QStringView entityData,
+		QColor centerColor,
+		QColor edgeColor,
+		std::unique_ptr<Text::CustomEmoji> inner,
+		Fn<void()> update,
+		int size) {
+	return std::make_unique<CollectibleEmoji>(
+		entityData,
+		centerColor,
+		edgeColor,
+		std::move(inner),
+		std::move(update),
+		size);
+}
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_stars_colored.h b/Telegram/SourceFiles/ui/effects/premium_stars_colored.h
index d0ae77b007c551..42fff3cefd089a 100644
--- a/Telegram/SourceFiles/ui/effects/premium_stars_colored.h
+++ b/Telegram/SourceFiles/ui/effects/premium_stars_colored.h
@@ -11,8 +11,13 @@ For license and copyright information please follow this link:
 
 namespace Ui {
 class RpWidget;
+} // namespace Ui
+
+namespace Ui::Text {
+class CustomEmoji;
+} // namespace Ui::Text
 
-namespace Premium {
+namespace Ui::Premium {
 
 class ColoredMiniStars final {
 public:
@@ -20,7 +25,8 @@ class ColoredMiniStars final {
 	ColoredMiniStars(
 		not_null<Ui::RpWidget*> parent,
 		bool optimizeUpdate,
-		MiniStars::Type type = MiniStars::Type::MonoStars);
+		MiniStarsType type = MiniStarsType::MonoStars);
+	ColoredMiniStars(Fn<void(const QRect &)> update, MiniStarsType type);
 
 	void setSize(const QSize &size);
 	void setPosition(QPoint position);
@@ -31,7 +37,7 @@ class ColoredMiniStars final {
 	void setPaused(bool paused);
 
 private:
-	Ui::Premium::MiniStars _ministars;
+	MiniStars _ministars;
 	QRectF _ministarsRect;
 	QImage _frame;
 	QImage _mask;
@@ -41,5 +47,12 @@ class ColoredMiniStars final {
 
 };
 
-} // namespace Premium
-} // namespace Ui
+[[nodiscard]] std::unique_ptr<Text::CustomEmoji> MakeCollectibleEmoji(
+	QStringView entityData,
+	QColor centerColor,
+	QColor edgeColor,
+	std::unique_ptr<Text::CustomEmoji> inner,
+	Fn<void()> update,
+	int size);
+
+} // namespace Ui::Premium
diff --git a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
index e2b61927301f70..45d38771c7dead 100644
--- a/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_top_bar.cpp
@@ -7,14 +7,21 @@ For license and copyright information please follow this link:
 */
 #include "ui/effects/premium_top_bar.h"
 
+#include "lottie/lottie_icon.h"
 #include "ui/color_contrast.h"
 #include "ui/painter.h"
 #include "ui/effects/premium_graphics.h"
+#include "ui/effects/premium_star.h"
+#include "ui/effects/premium_star_particles.h"
+#include "ui/effects/premium_diamond.h"
+#include "ui/effects/premium_coin.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/fade_wrap.h"
+#include "ui/rect.h"
 #include "styles/style_layers.h"
 #include "styles/style_settings.h"
 #include "styles/style_premium.h"
+#include "styles/style_boxes.h"
 
 namespace Ui::Premium {
 namespace {
@@ -23,6 +30,12 @@ constexpr auto kBodyAnimationPart = 0.90;
 constexpr auto kTitleAdditionalScale = 0.15;
 constexpr auto kMinAcceptableContrast = 4.5; // 1.14;
 
+constexpr auto kStar3dScale = 2.;
+constexpr auto kDiamond3dScale = 1.58;
+constexpr auto kCoin3dScale = 1.85;
+
+constexpr auto kStarParticlesFieldScale = 3.;
+
 [[nodiscard]] QImage ScaleTo(QImage image) {
 	using namespace style;
 	const auto size = image.size();
@@ -107,11 +120,59 @@ TopBar::TopBar(
 , _logo(descriptor.logo)
 , _titleFont(st.titleFont)
 , _titlePadding(st.titlePadding)
+, _aboutMaxWidth(st.aboutMaxWidth)
 , _about(this, std::move(descriptor.about), st.about)
-, _ministars(this, descriptor.optimizeMinistars, MiniStars::Type::BiStars) {
+, _ministars(
+		this,
+		descriptor.optimizeMinistars,
+		(_logo == u"diamond"_q)
+			? MiniStarsType::DiamondStars
+			: MiniStarsType::BiStars) {
+	if (descriptor.use3dStar && Star::Supported()) {
+		_star3d = CreateChild<Star>(this);
+		_star3dGolden = descriptor.star3dGolden;
+		if (_star3dGolden) {
+			_star3d->setGolden(true);
+		}
+		_particles3d = std::make_unique<StarParticles>([=](
+				const QRect &area) {
+			update(area);
+		});
+		_star3d->flungStrength() | rpl::on_next([=](float64 strength) {
+			_particles3d->fling(strength);
+		}, lifetime());
+		if (descriptor.showFinished) {
+			std::move(
+				descriptor.showFinished
+			) | rpl::on_next([=] {
+				if (_star3d) {
+					_star3d->startEnter();
+				}
+			}, lifetime());
+		}
+	} else if (descriptor.use3dDiamond && Diamond::Supported()) {
+		_diamond3d = CreateChild<Diamond>(this);
+		_particles3d = std::make_unique<StarParticles>([=](
+				const QRect &area) {
+			update(area);
+		});
+		_diamond3d->flungStrength() | rpl::on_next([=](float64 strength) {
+			_particles3d->fling(strength);
+		}, lifetime());
+	} else if (descriptor.use3dCoin && Coin::Supported()) {
+		_coin3d = CreateChild<Coin>(this);
+		_particles3d = std::make_unique<StarParticles>([=](
+				const QRect &area) {
+			update(area);
+		});
+		_coin3d->flungStrength() | rpl::on_next([=](float64 strength) {
+			_particles3d->fling(strength);
+		}, lifetime());
+	}
+
 	std::move(
 		descriptor.title
-	) | rpl::start_with_next([=](QString text) {
+	) | rpl::on_next([=](QString text) {
 		_titlePath = QPainterPath();
 		_titlePath.addText(0, _titleFont->ascent, _titleFont, text);
 		update();
@@ -131,13 +192,31 @@ TopBar::TopBar(
 
 	rpl::single() | rpl::then(
 		style::PaletteChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=, starSize = st.starSize] {
 		TopBarAbstract::computeIsDark();
 
 		if (_logo == u"dollar"_q) {
 			_dollar = ScaleTo(QImage(u":/gui/art/business_logo.png"_q));
 			_ministars.setColorOverride(
 				QGradientStops{{ 0, st::premiumButtonFg->c }});
+		} else if (_logo == u"affiliate"_q) {
+			_dollar = ScaleTo(QImage(u":/gui/art/affiliate_logo.png"_q));
+			_ministars.setColorOverride(descriptor.gradientStops);
+		} else if (_logo == u"diamond"_q) {
+			if (!_diamond3d) {
+				_lottie = Lottie::MakeIcon({
+					.name = u"diamond"_q,
+					.sizeOverride = starSize,
+				});
+				_lottie->animate(
+					[=] {
+						update(_starRect.toRect() + Margins(st::lineWidth));
+					},
+					0,
+					_lottie->framesCount() - 1);
+			}
+			_ministars.setColorOverride(
+				QGradientStops{{ 0, st::windowActiveTextFg->c }});
 		} else if (!_light && !TopBarAbstract::isDark()) {
 			_star.load(Svg());
 			_ministars.setColorOverride(
@@ -148,6 +227,49 @@ TopBar::TopBar(
 				: Ui::Premium::ButtonGradientStops()));
 			_ministars.setColorOverride(descriptor.gradientStops);
 		}
+		if (_star3d) {
+			if (_star3dGolden) {
+				_star3d->setColors(
+					QColor(0xFE, 0xC8, 0x46),
+					QColor(0xEC, 0x92, 0x0A));
+				_particles3d->setColors(
+					QColor(0xFA, 0x54, 0x16),
+					QColor(0xFF, 0xC8, 0x37));
+				_particles3d->setGlyph(StarParticles::Glyph::Star);
+			} else if (!_light && !TopBarAbstract::isDark()) {
+				_star3d->setColors(
+					QColor(255, 255, 255),
+					QColor(0xE3, 0xEC, 0xFA));
+				_particles3d->setColor(QColor(255, 255, 255));
+			} else {
+				const auto stops = descriptor.gradientStops
+					? (*descriptor.gradientStops)
+					: Ui::Premium::ButtonGradientStops();
+				const auto middle = stops[stops.size() / 2].second;
+				_star3d->setColors(stops.front().second, middle);
+				_particles3d->setColor(middle);
+			}
+		}
+		if (_diamond3d) {
+			_diamond3d->setNight(TopBarAbstract::isDark());
+			_particles3d->setColor(st::windowActiveTextFg->c);
+		}
+		if (_coin3d) {
+			_coin3d->setNight(TopBarAbstract::isDark());
+			if (TopBarAbstract::isDark()) {
+				const auto stops = descriptor.gradientStops
+					? (*descriptor.gradientStops)
+					: Ui::Premium::ButtonGradientStops();
+				_particles3d->setColors(
+					stops.front().second,
+					stops.back().second);
+			} else {
+				_particles3d->setColors(
+					QColor(255, 255, 255),
+					QColor(0xC8, 0xC8, 0xD0));
+			}
+			_particles3d->setGlyph(StarParticles::Glyph::Dollar);
+		}
 		auto event = QResizeEvent(size(), size());
 		resizeEvent(&event);
 	}, lifetime());
@@ -156,7 +278,7 @@ TopBar::TopBar(
 		const auto smallTopShadow = CreateChild<FadeShadow>(this);
 		smallTopShadow->setDuration(st::fadeWrapDuration);
 		sizeValue(
-		) | rpl::start_with_next([=](QSize size) {
+		) | rpl::on_next([=](QSize size) {
 			smallTopShadow->resizeToWidth(size.width());
 			smallTopShadow->moveToLeft(
 				0,
@@ -171,6 +293,18 @@ TopBar::~TopBar() = default;
 
 void TopBar::setPaused(bool paused) {
 	_ministars.setPaused(paused);
+	if (_star3d) {
+		_star3d->setPaused(paused);
+	}
+	if (_diamond3d) {
+		_diamond3d->setPaused(paused);
+	}
+	if (_coin3d) {
+		_coin3d->setPaused(paused);
+	}
+	if (_particles3d) {
+		_particles3d->setPaused(paused);
+	}
 }
 
 void TopBar::setTextPosition(int x, int y) {
@@ -180,7 +314,7 @@ void TopBar::setTextPosition(int x, int y) {
 rpl::producer<int> TopBar::additionalHeight() const {
 	return _about->heightValue(
 	) | rpl::map([l = st().about.style.lineHeight](int height) {
-		return std::max(height - l * 2, 0);
+		return std::max(height - l, 0);
 	});
 }
 
@@ -200,17 +334,38 @@ void TopBar::resizeEvent(QResizeEvent *e) {
 
 	_starRect = starRect(_progress.top, _progress.body);
 
+	if (_star3d) {
+		auto enlarged = Rect(_starRect.size() * kStar3dScale);
+		enlarged.moveCenter(rect::center(_starRect));
+		_star3d->setGeometry(enlarged.toRect());
+		_star3d->setShownProgress(_progress.body);
+	}
+	if (_diamond3d) {
+		auto enlarged = Rect(_starRect.size() * kDiamond3dScale);
+		enlarged.moveCenter(rect::center(_starRect));
+		_diamond3d->setGeometry(enlarged.toRect());
+		_diamond3d->setShownProgress(_progress.body);
+	}
+	if (_coin3d) {
+		auto enlarged = Rect(_starRect.size() * kCoin3dScale);
+		enlarged.moveCenter(rect::center(_starRect));
+		_coin3d->setGeometry(enlarged.toRect());
+		_coin3d->setShownProgress(_progress.body);
+	}
+
 	const auto &padding = st::boxRowPadding;
 	const auto availableWidth = width() - padding.left() - padding.right();
-	const auto titleTop = _starRect.top()
-		+ _starRect.height()
+	const auto titleTop = rect::bottom(_starRect)
 		+ _titlePadding.top();
 	const auto titlePathRect = _titlePath.boundingRect();
 	const auto aboutTop = titleTop
 		+ titlePathRect.height()
 		+ _titlePadding.bottom();
-	_about->resizeToWidth(availableWidth);
-	_about->moveToLeft(padding.left(), aboutTop);
+	_about->resizeToWidth(_aboutMaxWidth ? _aboutMaxWidth : availableWidth);
+	_about->moveToLeft(
+		padding.left()
+			+ (_aboutMaxWidth ? (availableWidth - _about->width()) / 2 : 0),
+		aboutTop);
 	_about->setOpacity(_progress.body);
 
 	RpWidget::resizeEvent(e);
@@ -219,8 +374,6 @@ void TopBar::resizeEvent(QResizeEvent *e) {
 void TopBar::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
-	p.fillRect(e->rect(), Qt::transparent);
-
 	const auto r = rect();
 
 	if (!_light && !TopBarAbstract::isDark()) {
@@ -235,25 +388,50 @@ void TopBar::paintEvent(QPaintEvent *e) {
 		TopBarAbstract::paintEdges(p);
 	}
 
-	p.setOpacity(_progress.body);
-	p.translate(_starRect.center());
-	p.scale(_progress.body, _progress.body);
-	p.translate(-_starRect.center());
-	if (_progress.top) {
-		_ministars.paint(p);
+	if (_particles3d) {
+		if (_progress.top) {
+			auto field = Rect(_starRect.size() * kStarParticlesFieldScale);
+			field.moveCenter(rect::center(_starRect));
+			p.setOpacity(_progress.body);
+			_particles3d->paint(p, field);
+			p.setOpacity(1.);
+		}
+	} else {
+		p.setOpacity(_progress.body);
+		p.translate(rect::center(_starRect));
+		p.scale(_progress.body, _progress.body);
+		p.translate(-rect::center(_starRect));
+		if (_progress.top) {
+			_ministars.paint(p);
+		}
+		if (_lottie) {
+			_lottie->paint(
+				p,
+				_starRect.left()
+					+ (_starRect.width() - _lottie->width()) / 2
+					- st::lineWidth * 6,
+				_starRect.top());
+			if (!_lottie->animating() && _lottie->frameIndex() > 0) {
+				_lottie->animate(
+					[=] {
+						update(_starRect.toRect() + Margins(st::lineWidth));
+					},
+					0,
+					_lottie->framesCount() - 1);
+			}
+		}
+		p.resetTransform();
 	}
-	p.resetTransform();
 
-	if (!_dollar.isNull()) {
+
+	if (!_dollar.isNull() && !_coin3d) {
 		auto hq = PainterHighQualityEnabler(p);
 		p.drawImage(_starRect, _dollar);
-	} else {
+	} else if (!_star3d && !_diamond3d && !_coin3d) {
 		_star.render(&p, _starRect);
 	}
 
-	const auto color = _light
-		? st::settingsPremiumUserTitle.textFg
-		: st::premiumButtonFg;
+	const auto color = _light ? st().titleFg : st::premiumButtonFg;
 	p.setPen(color);
 
 	const auto titlePathRect = _titlePath.boundingRect();
@@ -273,9 +451,9 @@ void TopBar::paintEvent(QPaintEvent *e) {
 			_progress.title),
 		anim::interpolate(fullTitleTop, _titlePosition.y(), _progress.title));
 
-	p.translate(titlePathRect.center());
+	p.translate(rect::center(titlePathRect));
 	p.scale(_progress.scaleTitle, _progress.scaleTitle);
-	p.translate(-titlePathRect.center());
+	p.translate(-rect::center(titlePathRect));
 	p.fillPath(_titlePath, color);
 }
 
diff --git a/Telegram/SourceFiles/ui/effects/premium_top_bar.h b/Telegram/SourceFiles/ui/effects/premium_top_bar.h
index 1945270252492e..18df7ad5778422 100644
--- a/Telegram/SourceFiles/ui/effects/premium_top_bar.h
+++ b/Telegram/SourceFiles/ui/effects/premium_top_bar.h
@@ -23,8 +23,17 @@ namespace Ui {
 class FlatLabel;
 } // namespace Ui
 
+namespace Lottie {
+class Icon;
+} // namespace Lottie
+
 namespace Ui::Premium {
 
+class Star;
+class Diamond;
+class Coin;
+class StarParticles;
+
 class TopBarAbstract : public RpWidget {
 public:
 	TopBarAbstract(
@@ -67,7 +76,12 @@ struct TopBarDescriptor {
 	rpl::producer<TextWithEntities> about;
 	bool light = false;
 	bool optimizeMinistars = true;
+	bool use3dStar = false;
+	bool star3dGolden = false;
+	bool use3dDiamond = false;
+	bool use3dCoin = false;
 	std::optional<QGradientStops> gradientStops;
+	rpl::producer<> showFinished;
 };
 
 class TopBar final : public TopBarAbstract {
@@ -92,10 +106,17 @@ class TopBar final : public TopBarAbstract {
 	const QString _logo;
 	const style::font &_titleFont;
 	const style::margins &_titlePadding;
+	const int _aboutMaxWidth = 0;
 	object_ptr<FlatLabel> _about;
 	ColoredMiniStars _ministars;
 	QSvgRenderer _star;
 	QImage _dollar;
+	std::unique_ptr<Lottie::Icon> _lottie;
+	Star *_star3d = nullptr;
+	bool _star3dGolden = false;
+	Diamond *_diamond3d = nullptr;
+	Coin *_coin3d = nullptr;
+	std::unique_ptr<StarParticles> _particles3d;
 
 	struct {
 		float64 top = 0.;
diff --git a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
index a193bf32db219c..239a1e54565623 100644
--- a/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/reaction_fly_animation.cpp
@@ -385,10 +385,10 @@ int ReactionFlyAnimation::computeParabolicTop(
 
 void ReactionFlyAnimation::startAnimations() {
 	if (const auto center = _center.get()) {
-		_center->animate(callback());
+		center->animate(callback());
 	}
 	if (const auto effect = _effect.get()) {
-		_effect->animate(callback());
+		effect->animate(callback());
 	} else if (_scaleOutDuration > 0) {
 		_noEffectScaleStarted = true;
 		_noEffectScaleAnimation.start(callback(), 1, 0, _scaleOutDuration);
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
index fbd67b220f59e4..ff426e0e9aaa22 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
@@ -7,10 +7,13 @@ For license and copyright information please follow this link:
 */
 #include "ui/effects/round_checkbox.h"
 
+#include "lang/lang_keys.h"
 #include "ui/rp_widget.h"
 #include "ui/ui_utility.h"
 #include "ui/painter.h"
 #include "ui/effects/outline_segments.h"
+#include "styles/style_calls.h"
+#include "styles/style_dialogs.h"
 #include "styles/style_widgets.h"
 
 #include <QtCore/QCoreApplication>
@@ -31,7 +34,7 @@ class CheckCaches : public QObject {
 		Expects(parent != nullptr);
 
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_data.clear();
 		}, _lifetime);
 	}
@@ -308,6 +311,10 @@ void RoundCheckbox::setChecked(bool newChecked, anim::type animated) {
 	}
 }
 
+void RoundCheckbox::finishAnimating() {
+	_checkedProgress.stop();
+}
+
 void RoundCheckbox::invalidateCache() {
 	if (!_inactiveCacheBg.isNull() || !_inactiveCacheFg.isNull()) {
 		prepareInactiveCache();
@@ -372,13 +379,50 @@ RoundImageCheckbox::RoundImageCheckbox(RoundImageCheckbox&&) = default;
 
 RoundImageCheckbox::~RoundImageCheckbox() = default;
 
-void RoundImageCheckbox::paint(Painter &p, int x, int y, int outerWidth) const {
+void RoundImageCheckbox::paint(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth) const {
+	if (_liveBadge) {
+		const auto ratio = style::DevicePixelRatio();
+		const auto added = _st.selectWidth;
+		const auto cacheSize = (added + _st.imageRadius) * 2;
+		const auto fullCacheSize = cacheSize * ratio;
+		if (_liveBadgeCache.width() != fullCacheSize) {
+			_liveBadgeCache = QImage(
+				QSize(fullCacheSize, fullCacheSize),
+				QImage::Format_ARGB32_Premultiplied);
+			_liveBadgeCache.setDevicePixelRatio(ratio);
+		}
+		_liveBadgeCache.fill(Qt::transparent);
+		auto q = Painter(&_liveBadgeCache);
+		paintFrame(q, added, added, cacheSize);
+		q.end();
+
+		p.drawImage(x - added, y - added, _liveBadgeCache);
+	} else {
+		paintFrame(p, x, y, outerWidth);
+	}
+}
+
+void RoundImageCheckbox::paintFrame(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth) const {
 	auto selectionLevel = _selection.value(checked() ? 1. : 0.);
 	if (_selection.animating()) {
-		auto userpicRadius = qRound(kWideScale * (_st.imageRadius + (_st.imageSmallRadius - _st.imageRadius) * selectionLevel));
+		auto userpicRadius = qRound(kWideScale
+			* (_st.imageRadius + (_st.imageSmallRadius - _st.imageRadius)
+				* selectionLevel));
 		auto userpicShift = kWideScale * _st.imageRadius - userpicRadius;
-		auto userpicLeft = x - (kWideScale - 1) * _st.imageRadius + userpicShift;
-		auto userpicTop = y - (kWideScale - 1) * _st.imageRadius + userpicShift;
+		auto userpicLeft = x
+			- ((kWideScale - 1) * _st.imageRadius)
+			+ userpicShift;
+		auto userpicTop = y
+			- ((kWideScale - 1) * _st.imageRadius)
+			+ userpicShift;
 		auto to = QRect(userpicLeft, userpicTop, userpicRadius * 2, userpicRadius * 2);
 		auto from = QRect(QPoint(0, 0), _wideCache.size());
 
@@ -422,6 +466,11 @@ void RoundImageCheckbox::paint(Painter &p, int x, int y, int outerWidth) const {
 		} else {
 			PaintOutlineSegments(p, outline, _segments);
 		}
+
+		if (_liveBadge) {
+			PaintLiveBadge(p, x, y, _st.imageRadius * 2);
+		}
+
 		p.setOpacity(1.);
 	}
 	if (_st.check.size > 0) {
@@ -489,15 +538,59 @@ void RoundImageCheckbox::setColorOverride(std::optional<QBrush> fg) {
 	if (fg) {
 		setCustomizedSegments({
 			{ .brush = *fg, .width = float64(_st.selectWidth) }
-		});
+		}, false);
 	} else {
-		setCustomizedSegments({});
+		setCustomizedSegments({}, false);
 	}
 }
 
 void RoundImageCheckbox::setCustomizedSegments(
-		std::vector<Ui::OutlineSegment> segments) {
+		std::vector<Ui::OutlineSegment> segments,
+		bool liveBadge) {
 	_segments = std::move(segments);
+	_liveBadge = liveBadge;
+}
+
+void PaintLiveBadge(
+		QPainter &p,
+		int x,
+		int y,
+		int photoSize,
+		std::optional<QColor> outline) {
+	const auto &st = st::groupCallMessageBadge;
+	const auto text = tr::lng_video_stream_live(tr::now);
+	auto string = Ui::Text::String(st.style, text);
+	const auto size = QSize(string.maxWidth(), string.minHeight());
+
+	const auto full = QSize(
+		(st.width < 0) ? (size.width() - st.width) : st.width,
+		st.height);
+	const auto left = x + (photoSize - full.width()) / 2;
+	const auto top = y + photoSize - full.height();
+
+	const auto stroke = st::dialogsStories.lineTwice / 2.;
+	auto pen = QPen(outline.value_or(QColor(Qt::transparent)));
+	pen.setWidthF(stroke);
+
+	const auto half = stroke / 2.;
+	if (!outline) {
+		p.setCompositionMode(QPainter::CompositionMode_Source);
+	}
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(pen);
+	p.setBrush(st.textBg);
+
+	const auto r = st.radius + half;
+	const auto rect = QRectF(left, top, full.width(), full.height());
+	const auto sub = QMarginsF(half, half, half, half);
+	p.drawRoundedRect(rect.marginsAdded(sub), r, r);
+
+	if (!outline) {
+		p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+	}
+	const auto textLeft = (full.width() - size.width()) / 2;
+	p.setPen(st.textFg);
+	string.draw(p, { .position = { left + textLeft, top + st.textTop } });
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.h b/Telegram/SourceFiles/ui/effects/round_checkbox.h
index 49377c0ec43210..f2659180151d3d 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.h
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.h
@@ -34,6 +34,7 @@ class RoundCheckbox {
 	void setChecked(
 		bool newChecked,
 		anim::type animated = anim::type::normal);
+	void finishAnimating();
 
 	void invalidateCache();
 
@@ -53,7 +54,12 @@ class RoundCheckbox {
 
 class RoundImageCheckbox {
 public:
-	using PaintRoundImage = Fn<void(Painter &p, int x, int y, int outerWidth, int size)>;
+	using PaintRoundImage = Fn<void(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		int size)>;
 	RoundImageCheckbox(
 		const style::RoundImageCheckbox &st,
 		Fn<void()> updateCallback,
@@ -66,7 +72,9 @@ class RoundImageCheckbox {
 	float64 checkedAnimationRatio() const;
 
 	void setColorOverride(std::optional<QBrush> fg);
-	void setCustomizedSegments(std::vector<OutlineSegment> segments);
+	void setCustomizedSegments(
+		std::vector<OutlineSegment> segments,
+		bool liveBadge);
 
 	bool checked() const {
 		return _check.checked();
@@ -81,6 +89,7 @@ class RoundImageCheckbox {
 
 private:
 	void prepareWideCache();
+	void paintFrame(Painter &p, int x, int y, int outerWidth) const;
 
 	const style::RoundImageCheckbox &_st;
 	Fn<void()> _updateCallback;
@@ -95,6 +104,16 @@ class RoundImageCheckbox {
 	//std::optional<QBrush> _fgOverride;
 	std::vector<OutlineSegment> _segments;
 
+	mutable QImage _liveBadgeCache;
+	bool _liveBadge = false;
+
 };
 
+void PaintLiveBadge(
+	QPainter &p,
+	int x,
+	int y,
+	int photoSize,
+	std::optional<QColor> outline = std::nullopt);
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/scroll_content_shadow.cpp b/Telegram/SourceFiles/ui/effects/scroll_content_shadow.cpp
index 5bc42cb8dfd4fa..47d3ec64dae63b 100644
--- a/Telegram/SourceFiles/ui/effects/scroll_content_shadow.cpp
+++ b/Telegram/SourceFiles/ui/effects/scroll_content_shadow.cpp
@@ -23,7 +23,7 @@ void SetupShadowsToScrollContent(
 	const auto topShadow = Ui::CreateChild<Ui::FadeShadow>(parent.get());
 	const auto bottomShadow = Ui::CreateChild<Ui::FadeShadow>(parent.get());
 	scroll->geometryValue(
-	) | rpl::start_with_next_done([=](const QRect &geometry) {
+	) | rpl::on_next_done([=](const QRect &geometry) {
 		topShadow->resizeToWidth(geometry.width());
 		topShadow->move(
 			geometry.x(),
@@ -32,9 +32,9 @@ void SetupShadowsToScrollContent(
 		bottomShadow->move(
 			geometry.x(),
 			geometry.y() + geometry.height() - st::lineWidth);
-	}, [t = Ui::MakeWeak(topShadow), b = Ui::MakeWeak(bottomShadow)] {
-		Ui::DestroyChild(t.data());
-		Ui::DestroyChild(b.data());
+	}, [t = base::make_weak(topShadow), b = base::make_weak(bottomShadow)] {
+		Ui::DestroyChild(t.get());
+		Ui::DestroyChild(b.get());
 	}, topShadow->lifetime());
 
 	topShadow->toggleOn(scroll->scrollTopValue() | rpl::map(_1 > 0));
diff --git a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
index 3cee4338529326..694dad69a94069 100644
--- a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
+++ b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
@@ -20,6 +20,7 @@ namespace {
 constexpr int kTypingDotsCount = 3;
 constexpr int kRecordArcsCount = 4;
 constexpr int kUploadArrowsCount = 3;
+constexpr auto kRoundPeriod = 800;
 constexpr auto kSpeakingDuration = 3200;
 constexpr auto kSpeakingFadeDuration = 400;
 
@@ -228,6 +229,71 @@ void RecordAnimation::paint(
 	p.setOpacity(1.);
 }
 
+class RoundAnimation : public SendActionAnimation::Impl {
+public:
+	RoundAnimation() : Impl(kRoundPeriod) {
+	}
+
+	static const MetaData kMeta;
+	static std::unique_ptr<Impl> create() {
+		return std::make_unique<RoundAnimation>();
+	}
+	const MetaData *metaData() const override {
+		return &kMeta;
+	}
+
+	int width() const override {
+		return 2 * st::historySendActionRoundPosition.x()
+			+ 2 * st::historySendActionRoundRadius
+			+ 2 * st::lineWidth;
+	}
+
+	void paint(
+		QPainter &p,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth,
+		crl::time now) override;
+
+};
+
+const RoundAnimation::MetaData RoundAnimation::kMeta = {
+	0,
+	&RoundAnimation::create,
+};
+
+void RoundAnimation::paint(
+		QPainter &p,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth,
+		crl::time now) {
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(color);
+
+	const auto frameMs = frameTime(now);
+	const auto half = period() / 2;
+	const auto progress = anim::Disabled()
+		? 1.
+		: (frameMs < half)
+		? (frameMs / float64(half))
+		: (1. - (frameMs - half) / float64(half));
+
+	constexpr auto kMinOpacity = 55. / 255.;
+	p.setOpacity(kMinOpacity + (1. - kMinOpacity) * progress);
+
+	const auto radius = float64(st::historySendActionRoundRadius);
+	const auto center = QPointF(
+		x + st::historySendActionRoundPosition.x() + radius,
+		y + st::historySendActionRoundPosition.y());
+	p.drawEllipse(center, radius, radius);
+
+	p.setOpacity(1.);
+}
+
 class UploadAnimation : public SendActionAnimation::Impl {
 public:
 	UploadAnimation() : Impl(st::historySendActionUploadDuration) {
@@ -640,7 +706,6 @@ void CreateImplementationsMap() {
 	static constexpr auto kRecordTypes = {
 		Type::RecordVideo,
 		Type::RecordVoice,
-		Type::RecordRound,
 	};
 	for (const auto type : kRecordTypes) {
 		Implementations->insert(type, &RecordAnimation::kMeta);
@@ -650,11 +715,17 @@ void CreateImplementationsMap() {
 		Type::UploadPhoto,
 		Type::UploadVideo,
 		Type::UploadVoice,
-		Type::UploadRound,
 	};
 	for (const auto type : kUploadTypes) {
 		Implementations->insert(type, &UploadAnimation::kMeta);
 	}
+	static constexpr auto kRoundTypes = {
+		Type::RecordRound,
+		Type::UploadRound,
+	};
+	for (const auto type : kRoundTypes) {
+		Implementations->insert(type, &RoundAnimation::kMeta);
+	}
 	Implementations->insert(Type::Speaking, &SpeakingAnimation::kMeta);
 	Implementations->insert(
 		Type::ChooseSticker,
diff --git a/Telegram/SourceFiles/ui/effects/skeleton_animation.cpp b/Telegram/SourceFiles/ui/effects/skeleton_animation.cpp
new file mode 100644
index 00000000000000..7279c97f899fb0
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/skeleton_animation.cpp
@@ -0,0 +1,138 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/skeleton_animation.h"
+
+#include "ui/painter.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_widgets.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kSlideDuration = crl::time(1000);
+constexpr auto kWaitDuration = crl::time(1000);
+constexpr auto kFullDuration = kSlideDuration + kWaitDuration;
+constexpr auto kBaseAlpha = 0.5;
+constexpr auto kGradientAlpha = 0.2;
+
+[[nodiscard]] QColor ColorWithAlpha(
+		const style::color &color,
+		float64 alpha) {
+	auto result = color->c;
+	result.setAlphaF(result.alphaF() * alpha);
+	return result;
+}
+
+} // namespace
+
+SkeletonAnimation::SkeletonAnimation(not_null<FlatLabel*> label)
+: _label(label)
+, _animation([=] { _label->update(); }) {
+	base::install_event_filter(_label, _label, [=](not_null<QEvent*> e) {
+		return (_active && e->type() == QEvent::Paint)
+			? paint()
+			: base::EventFilterResult::Continue;
+	});
+	_label->sizeValue(
+	) | rpl::on_next([=](QSize) {
+		if (_active) {
+			recompute();
+		}
+	}, _lifetime);
+}
+
+void SkeletonAnimation::start() {
+	_active = true;
+	recompute();
+	_animation.start();
+	_label->update();
+}
+
+void SkeletonAnimation::stop() {
+	_active = false;
+	_animation.stop();
+	_label->update();
+}
+
+bool SkeletonAnimation::active() const {
+	return _active;
+}
+
+void SkeletonAnimation::recompute() {
+	_lineWidths = _label->countLineWidths();
+}
+
+base::EventFilterResult SkeletonAnimation::paint() {
+	if (_lineWidths.empty()) {
+		return base::EventFilterResult::Cancel;
+	}
+	auto p = QPainter(_label);
+	PainterHighQualityEnabler hq(p);
+
+	const auto &st = _label->st();
+	const auto lineHeight = st.style.lineHeight
+		? st.style.lineHeight
+		: st.style.font->height;
+	const auto thickness = st.style.font->height / 2;
+	const auto radius = thickness / 2.;
+	const auto left = st.margin.left();
+	const auto textWidth = _label->width()
+		- st.margin.left()
+		- st.margin.right();
+	const auto baseColor = ColorWithAlpha(
+		st::windowSubTextFg,
+		kBaseAlpha);
+
+	const auto now = crl::now();
+	const auto period = now % kFullDuration;
+	const auto gradientActive = (period < kSlideDuration);
+
+	p.setPen(Qt::NoPen);
+	if (gradientActive) {
+		const auto progress = period
+			/ float64(kSlideDuration);
+		const auto gradientWidth = textWidth;
+		const auto gradientStart = anim::interpolate(
+			left - gradientWidth,
+			left + textWidth,
+			progress);
+		auto gradient = QLinearGradient(
+			gradientStart,
+			0,
+			gradientStart + gradientWidth,
+			0);
+		const auto centerColor = ColorWithAlpha(
+			st::windowSubTextFg,
+			kGradientAlpha);
+		gradient.setStops({
+			{ 0., baseColor },
+			{ 0.5, centerColor },
+			{ 1., baseColor },
+		});
+		p.setBrush(gradient);
+	} else {
+		p.setBrush(baseColor);
+	}
+	auto lineTop = st.margin.top();
+	for (const auto lineWidth : _lineWidths) {
+		if (lineWidth <= 0) {
+			lineTop += lineHeight;
+			continue;
+		}
+		const auto rect = QRectF(
+			left,
+			lineTop + (lineHeight - thickness) / 2.,
+			lineWidth,
+			thickness);
+		p.drawRoundedRect(rect, radius, radius);
+		lineTop += lineHeight;
+	}
+	return base::EventFilterResult::Cancel;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/skeleton_animation.h b/Telegram/SourceFiles/ui/effects/skeleton_animation.h
new file mode 100644
index 00000000000000..c8f6ab210b41e3
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/skeleton_animation.h
@@ -0,0 +1,37 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/event_filter.h"
+#include "ui/effects/animations.h"
+
+namespace Ui {
+
+class FlatLabel;
+
+class SkeletonAnimation final {
+public:
+	explicit SkeletonAnimation(not_null<FlatLabel*> label);
+
+	void start();
+	void stop();
+	[[nodiscard]] bool active() const;
+
+private:
+	void recompute();
+	base::EventFilterResult paint();
+
+	const not_null<FlatLabel*> _label;
+	Ui::Animations::Basic _animation;
+	std::vector<int> _lineWidths;
+	bool _active = false;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/thanos_effect.cpp b/Telegram/SourceFiles/ui/effects/thanos_effect.cpp
new file mode 100644
index 00000000000000..868fe02c9f6dea
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/thanos_effect.cpp
@@ -0,0 +1,188 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/thanos_effect.h"
+
+#include "ui/effects/thanos_effect_renderer.h"
+#include "ui/gl/gl_detection.h"
+#include "ui/gl/gl_surface.h"
+#include "ui/power_saving.h"
+#include "ui/rp_widget.h"
+#include "ui/ui_utility.h"
+#include "base/qt_signal_producer.h"
+
+#include <QtGui/QWindow>
+
+namespace Ui {
+
+bool ThanosEffect::Supported() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (PowerSaving::On(PowerSaving::kChatEffects)
+		|| PowerSaving::On(PowerSaving::kAnimations)) {
+		return false;
+	}
+	if (!GL::WidgetsRhiEnabled()) {
+		return false;
+	}
+	return GL::CheckRhiCapabilities().compute;
+#else
+	return false;
+#endif
+}
+
+void ThanosEffect::WarmUp() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (PowerSaving::On(PowerSaving::kChatEffects)
+		|| PowerSaving::On(PowerSaving::kAnimations)) {
+		return;
+	}
+	if (!GL::WidgetsRhiEnabled()) {
+		return;
+	}
+	(void)GL::CheckRhiCapabilities();
+#endif
+}
+
+ThanosEffect::ThanosEffect(not_null<QWidget*> parent)
+: _parent(parent)
+, _animation([=] {
+	if (const auto w = surfaceWidget()) {
+		w->update();
+	}
+}) {
+}
+
+ThanosEffect::~ThanosEffect() = default;
+
+QWidget *ThanosEffect::surfaceWidget() const {
+	return _surface ? _surface->rpWidget() : nullptr;
+}
+
+void ThanosEffect::ensureSurface() {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	if (_surface) {
+		return;
+	}
+
+	auto devicePixelRatio = [&]() -> rpl::producer<float64> {
+		const auto initial = float64(_parent->devicePixelRatioF());
+		const auto handle = _parent->windowHandle();
+		if (!handle) {
+			return rpl::single(initial);
+		}
+		return rpl::single(
+			initial
+		) | rpl::then(base::qt_signal_producer(
+			handle,
+			&QWindow::screenChanged
+		) | rpl::map([parent = _parent](QScreen*) {
+			return float64(parent->devicePixelRatioF());
+		}));
+	}();
+
+	auto renderer = std::make_unique<ThanosEffectRenderer>(
+		std::move(devicePixelRatio));
+	_renderer = renderer.get();
+
+	_renderer->allDone() | rpl::on_next([weak = base::make_weak(this)] {
+		if (const auto strong = weak.get()) {
+			strong->_animation.stop();
+		}
+		crl::on_main(weak, [weak] {
+			if (const auto strong = weak.get()) {
+				strong->hideSurface();
+				strong->_allDone.fire({});
+			}
+		});
+	}, _lifetime);
+
+	_surface = GL::CreateSurface(
+		_parent,
+		GL::ChosenRenderer{
+			.renderer = std::move(renderer),
+			.backend = GL::Backend::QRhi,
+		});
+
+	if (const auto w = surfaceWidget()) {
+		w->setAttribute(Qt::WA_TransparentForMouseEvents);
+		w->setAttribute(Qt::WA_AlwaysStackOnTop);
+		w->setGeometry(_parent->rect());
+		w->hide();
+	}
+#endif
+}
+
+void ThanosEffect::showSurface() {
+	if (const auto w = surfaceWidget()) {
+		w->setGeometry(_parent->rect());
+		// Defer show until the current call stack returns to the event
+		// loop, so that all items from a batch deletion are added
+		// before the first render. Without this, w->show() triggers
+		// an immediate platform compositing pass with only the first
+		// item visible.
+		Ui::PostponeCall(w, [w] {
+			w->show();
+			w->raise();
+		});
+		_animation.start();
+	}
+}
+
+void ThanosEffect::hideSurface() {
+	_animation.stop();
+	if (const auto w = surfaceWidget()) {
+		w->hide();
+	}
+}
+
+void ThanosEffect::addItem(QImage snapshot, QRect rect) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	ensureSurface();
+	if (!_renderer) {
+		return;
+	}
+
+	const auto wasAnimating = _renderer->hasActiveItems();
+
+	_renderer->addItem({
+		.snapshot = std::move(snapshot),
+		.rect = QRectF(rect),
+	});
+
+	if (!wasAnimating) {
+		showSurface();
+	}
+#endif
+}
+
+bool ThanosEffect::animating() const {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+	return _renderer && _renderer->hasActiveItems();
+#else
+	return false;
+#endif
+}
+
+rpl::producer<> ThanosEffect::allDone() const {
+	return _allDone.events();
+}
+
+void ThanosEffect::setGeometry(QRect rect) {
+	if (const auto w = surfaceWidget()) {
+		if (w->isVisible()) {
+			w->setGeometry(rect);
+		}
+	}
+}
+
+void ThanosEffect::raise() {
+	if (const auto w = surfaceWidget()) {
+		w->raise();
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/thanos_effect.h b/Telegram/SourceFiles/ui/effects/thanos_effect.h
new file mode 100644
index 00000000000000..7bbbff71fef1f5
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/thanos_effect.h
@@ -0,0 +1,65 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/unique_qptr.h"
+#include "base/weak_ptr.h"
+#include "ui/effects/animations.h"
+
+#include <QImage>
+
+namespace Ui {
+class RpWidget;
+class RpWidgetWrap;
+} // namespace Ui
+
+namespace Ui {
+
+class ThanosEffectRenderer;
+
+class ThanosEffect final : public base::has_weak_ptr {
+public:
+	explicit ThanosEffect(not_null<QWidget*> parent);
+	~ThanosEffect();
+
+	void addItem(QImage snapshot, QRect rect);
+
+	[[nodiscard]] bool animating() const;
+
+	[[nodiscard]] rpl::producer<> allDone() const;
+
+	void setGeometry(QRect rect);
+	void raise();
+
+	[[nodiscard]] static bool Supported();
+	// Runs the (potentially slow, 10–300ms) QRhi capability probe
+	// synchronously on the main thread and caches the result. Safe to
+	// call multiple times. If not called, `Supported()` will lazily
+	// probe on first use — prefer warming it up during idle time so the
+	// first message deletion doesn't hitch.
+	static void WarmUp();
+
+private:
+	void ensureSurface();
+	void showSurface();
+	void hideSurface();
+	[[nodiscard]] QWidget *surfaceWidget() const;
+
+	const not_null<QWidget*> _parent;
+
+	std::unique_ptr<RpWidgetWrap> _surface;
+	[[maybe_unused]] ThanosEffectRenderer *_renderer = nullptr;
+
+	Ui::Animations::Basic _animation;
+
+	rpl::event_stream<> _allDone;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/thanos_effect_controller.cpp b/Telegram/SourceFiles/ui/effects/thanos_effect_controller.cpp
new file mode 100644
index 00000000000000..015304b260e916
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/thanos_effect_controller.cpp
@@ -0,0 +1,325 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/thanos_effect_controller.h"
+
+#include "ui/effects/thanos_effect.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/chat/chat_style.h"
+#include "ui/painter.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+#include "history/history_item.h"
+#include "history/view/history_view_element.h"
+#include "styles/style_basic.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kBaseDuration = crl::time(400);
+constexpr auto kPerPixelDuration = float64(0.15);
+constexpr auto kMaxDuration = crl::time(600);
+
+} // namespace
+
+ThanosEffectController::ThanosEffectController(
+	not_null<Main::Session*> session,
+	Delegate delegate,
+	rpl::lifetime &lifetime)
+: _session(session)
+, _delegate(std::move(delegate)) {
+	_session->data().itemsAboutToBeDestroyed(
+	) | rpl::on_next([=](const auto &items) {
+		captureItemsBatch(items);
+	}, lifetime);
+}
+
+ThanosEffectController::~ThanosEffectController() {
+	_collapseAnimation.stop();
+}
+
+void ThanosEffectController::captureItemsBatch(
+		const std::vector<not_null<HistoryItem*>> &items) {
+	if (!ThanosEffect::Supported()) {
+		return;
+	}
+	auto anyFound = false;
+	for (const auto &item : items) {
+		if (_delegate.viewForItem(item)) {
+			anyFound = true;
+			break;
+		}
+	}
+	if (!anyFound) {
+		return;
+	}
+	ensureScrollBaseline();
+	for (const auto &item : items) {
+		if (const auto view = _delegate.viewForItem(item)) {
+			const auto top = _delegate.itemTop(view);
+			const auto height = view->height();
+			if (captureView(view, height, top)) {
+				_preCaptured.emplace(item->fullId(), PreCapturedView{
+					.height = height,
+					.top = top,
+				});
+			}
+		}
+	}
+}
+
+void ThanosEffectController::clearPreCaptured() {
+	_preCaptured.clear();
+	_restoreScrollPending = false;
+	_wasAtBottom = false;
+}
+
+void ThanosEffectController::captureOnRemoval(
+		not_null<const HistoryItem*> item) {
+	if (!ThanosEffect::Supported()) {
+		return;
+	}
+	const auto view = _delegate.viewForItem(item);
+	if (!view) {
+		return;
+	}
+	if (const auto it = _preCaptured.find(item->fullId());
+		it != end(_preCaptured)) {
+		const auto saved = it->second;
+		_preCaptured.erase(it);
+		if (saved.top >= 0) {
+			startCollapseAnimation(saved.height, saved.top);
+		}
+		return;
+	}
+	const auto top = _delegate.itemTop(view);
+	const auto height = view->height();
+
+	if (!item->isRegular()
+		|| item->isService()
+		|| top < 0
+		|| height <= 0
+		|| _delegate.contentWidth() <= 0) {
+		return;
+	}
+	[[maybe_unused]] const auto dissolved = captureView(view, height, top);
+
+	ensureScrollBaseline();
+	startCollapseAnimation(height, top);
+}
+
+void ThanosEffectController::ensureScrollBaseline() {
+	if (!_restoreScrollPending) {
+		const auto scroll = _delegate.scrollArea();
+		_savedScrollTop = scroll->scrollTop();
+		_wasAtBottom = (_savedScrollTop >= scroll->scrollTopMax());
+		_restoreScrollPending = true;
+	}
+}
+
+bool ThanosEffectController::captureView(
+		not_null<const HistoryView::Element*> view,
+		int viewHeight,
+		int viewTop) {
+	const auto item = view->data();
+	if (!item->isRegular() || item->isService()) {
+		return false;
+	}
+	if (viewTop < 0) {
+		return false;
+	}
+	const auto viewWidth = _delegate.contentWidth();
+	if (viewWidth <= 0 || viewHeight <= 0) {
+		return false;
+	}
+	const auto visibleTop = _delegate.visibleAreaTop();
+	const auto visibleBottom = _delegate.visibleAreaBottom();
+	const auto visibleHeight = visibleBottom - visibleTop;
+	const auto screenTop = viewTop - visibleTop;
+	if (screenTop + viewHeight <= 0 || screenTop >= visibleHeight) {
+		return false;
+	}
+	auto gapOffset = 0;
+	for (const auto &gap : _renderGaps) {
+		if (gap.absY >= 0 && viewTop >= gap.absY) {
+			gapOffset += gap.height;
+		}
+	}
+	const auto adjustedScreenTop = screenTop + gapOffset;
+	const auto captureTop = std::clamp(-adjustedScreenTop, 0, viewHeight);
+	const auto captureBottom = std::clamp(
+		visibleHeight - adjustedScreenTop,
+		0,
+		viewHeight);
+	if (captureTop >= captureBottom) {
+		return false;
+	}
+	const auto captureHeight = captureBottom - captureTop;
+
+	const auto dpr = style::DevicePixelRatio();
+	auto image = QImage(
+		QSize(viewWidth, captureHeight) * dpr,
+		QImage::Format_RGBA8888_Premultiplied);
+	image.setDevicePixelRatio(dpr);
+	image.fill(Qt::transparent);
+	{
+		Painter p(&image);
+		p.translate(0, -captureTop);
+		auto clip = QRect(0, captureTop, viewWidth, captureHeight);
+		auto context = _delegate.preparePaintContext(clip);
+		const auto renderedTop = viewTop + gapOffset;
+		context.translate(0, -renderedTop);
+		context.clip = clip;
+		context.skipSelectionCheck = true;
+		context.outbg = view->hasOutLayout();
+		view->draw(p, context);
+	}
+
+	const auto topLevel = _delegate.window();
+	if (!topLevel) {
+		return false;
+	}
+
+	if (!_thanosEffect) {
+		_thanosEffect = std::make_unique<ThanosEffect>(topLevel);
+	}
+	_thanosEffect->setGeometry(QRect(QPoint(), topLevel->size()));
+	_thanosEffect->raise();
+
+	const auto scroll = _delegate.scrollArea();
+	const auto globalPos = scroll->mapTo(
+		topLevel,
+		QPoint(0, adjustedScreenTop + captureTop));
+	_thanosEffect->addItem(
+		std::move(image),
+		QRect(globalPos, QSize(viewWidth, captureHeight)));
+	return true;
+}
+
+void ThanosEffectController::startCollapseAnimation(
+		int height,
+		int itemTop) {
+	if (height <= 0) {
+		return;
+	}
+
+	const auto scroll = _delegate.scrollArea();
+	const auto scrollTop = scroll->scrollTop();
+	const auto scrollBottom = scrollTop + scroll->height();
+
+	if (itemTop >= scrollBottom) {
+		return;
+	}
+
+	if (_collapseAnimation.animating()) {
+		for (auto &gap : _collapseGaps) {
+			gap.startHeight = gap.currentHeight;
+		}
+	}
+
+	auto merged = false;
+	for (auto &gap : _collapseGaps) {
+		if (gap.absY + gap.originalHeight == itemTop
+			|| (gap.absY <= itemTop
+				&& itemTop <= gap.absY + gap.originalHeight)) {
+			gap.startHeight += height;
+			gap.currentHeight += height;
+			gap.originalHeight += height;
+			merged = true;
+			break;
+		}
+		if (itemTop + height == gap.absY) {
+			gap.absY = itemTop;
+			gap.startHeight += height;
+			gap.currentHeight += height;
+			gap.originalHeight += height;
+			merged = true;
+			break;
+		}
+	}
+	if (!merged) {
+		const auto it = std::lower_bound(
+			_collapseGaps.begin(),
+			_collapseGaps.end(),
+			itemTop,
+			[](const auto &gap, int top) { return gap.absY < top; });
+		_collapseGaps.insert(it, {
+			.absY = itemTop,
+			.startHeight = height,
+			.currentHeight = height,
+			.originalHeight = height,
+		});
+	}
+
+	syncCollapseGapsToHost();
+
+	auto totalHeight = 0;
+	for (const auto &gap : _collapseGaps) {
+		totalHeight += gap.currentHeight;
+	}
+	const auto duration = crl::time(std::clamp(
+		kBaseDuration + totalHeight * kPerPixelDuration,
+		float64(kBaseDuration),
+		float64(kMaxDuration)));
+
+	_collapseAnimation.start(
+		[=] { collapseAnimationCallback(); },
+		0.,
+		1.,
+		duration,
+		anim::halfSine);
+}
+
+void ThanosEffectController::collapseAnimationCallback() {
+	const auto progress = _collapseAnimation.value(1.);
+
+	auto sumOriginal = 0;
+	auto sumCurrent = 0;
+	for (auto &gap : _collapseGaps) {
+		gap.currentHeight = anim::interpolate(gap.startHeight, 0, progress);
+		sumOriginal += gap.originalHeight;
+		sumCurrent += gap.currentHeight;
+	}
+
+	if (!_collapseGaps.empty()) {
+		syncCollapseGapsToHost();
+
+		if (_wasAtBottom) {
+			_delegate.scrollToY(_delegate.scrollArea()->scrollTopMax());
+		} else {
+			const auto collapsed = sumOriginal - sumCurrent;
+			const auto target = std::max(_savedScrollTop - collapsed, 0);
+			_delegate.scrollToY(target);
+		}
+	}
+
+	if (!_collapseAnimation.animating()) {
+		_collapseGaps.clear();
+		_renderGaps.clear();
+		_delegate.setCollapseGaps({});
+		_collapseAnimation = {};
+		_restoreScrollPending = false;
+		_wasAtBottom = false;
+	}
+}
+
+void ThanosEffectController::syncCollapseGapsToHost() {
+	auto gaps = std::vector<CollapseGap>();
+	gaps.reserve(_collapseGaps.size());
+	auto cumulativeOriginal = 0;
+	for (const auto &g : _collapseGaps) {
+		gaps.push_back({
+			.absY = g.absY - cumulativeOriginal,
+			.height = g.currentHeight,
+		});
+		cumulativeOriginal += g.originalHeight;
+	}
+	_renderGaps = gaps;
+	_delegate.setCollapseGaps(std::move(gaps));
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/thanos_effect_controller.h b/Telegram/SourceFiles/ui/effects/thanos_effect_controller.h
new file mode 100644
index 00000000000000..b522bc45c941c8
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/thanos_effect_controller.h
@@ -0,0 +1,105 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/animations.h"
+#include "base/flat_map.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class ThanosEffect;
+class ScrollArea;
+struct ChatPaintContext;
+} // namespace Ui
+
+namespace HistoryView {
+class Element;
+} // namespace HistoryView
+
+class HistoryItem;
+
+namespace Ui {
+
+struct CollapseGap {
+	int absY = -1;
+	int height = 0;
+
+	friend bool operator==(const CollapseGap&, const CollapseGap&) = default;
+};
+
+class ThanosEffectController final {
+public:
+	struct Delegate {
+		Fn<HistoryView::Element*(not_null<const HistoryItem*>)> viewForItem;
+		Fn<int(not_null<const HistoryView::Element*>)> itemTop;
+		Fn<int()> visibleAreaTop;
+		Fn<int()> visibleAreaBottom;
+		Fn<int()> contentWidth;
+		Fn<ChatPaintContext(QRect)> preparePaintContext;
+		Fn<QWidget*()> window;
+		Fn<not_null<ScrollArea*>()> scrollArea;
+		Fn<void(int scrollTop)> scrollToY;
+		Fn<void(std::vector<CollapseGap>)> setCollapseGaps;
+	};
+
+	ThanosEffectController(
+		not_null<Main::Session*> session,
+		Delegate delegate,
+		rpl::lifetime &lifetime);
+	~ThanosEffectController();
+
+	void captureOnRemoval(not_null<const HistoryItem*> item);
+	void clearPreCaptured();
+
+	[[nodiscard]] const std::vector<CollapseGap> &renderGaps() const {
+		return _renderGaps;
+	}
+
+private:
+	struct PreCapturedView {
+		int height = 0;
+		int top = 0;
+	};
+
+	struct CollapseGapState {
+		int absY = -1;
+		int startHeight = 0;
+		int currentHeight = 0;
+		int originalHeight = 0;
+	};
+
+	void captureItemsBatch(
+		const std::vector<not_null<HistoryItem*>> &items);
+	[[nodiscard]] bool captureView(
+		not_null<const HistoryView::Element*> view,
+		int viewHeight,
+		int viewTop);
+	void startCollapseAnimation(int height, int itemTop);
+	void collapseAnimationCallback();
+	void syncCollapseGapsToHost();
+	void ensureScrollBaseline();
+
+	const not_null<Main::Session*> _session;
+	const Delegate _delegate;
+
+	std::unique_ptr<ThanosEffect> _thanosEffect;
+	base::flat_map<FullMsgId, PreCapturedView> _preCaptured;
+	std::vector<CollapseGap> _renderGaps;
+
+	std::vector<CollapseGapState> _collapseGaps;
+	Animations::Simple _collapseAnimation;
+
+	int _savedScrollTop = 0;
+	bool _restoreScrollPending = false;
+	bool _wasAtBottom = false;
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/thanos_effect_renderer.cpp b/Telegram/SourceFiles/ui/effects/thanos_effect_renderer.cpp
new file mode 100644
index 00000000000000..afd60af761b28d
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/thanos_effect_renderer.cpp
@@ -0,0 +1,801 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/thanos_effect_renderer.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+#include "ui/rhi/rhi_shader.h"
+#include "ui/rp_widget.h"
+#include "ui/painter.h"
+#include "styles/style_basic.h"
+#include "base/debug_log.h"
+
+#include <rhi/qrhi.h>
+
+namespace Ui {
+namespace {
+
+constexpr auto kQuadVertexCount = int(6);
+constexpr auto kQuadVertexStride = int(2 * sizeof(float));
+constexpr auto kComputeWorkgroupSize = int(64);
+constexpr auto kMaxPhaseDuration = float64(6.);
+constexpr auto kPhaseSpeed = float64(1.65);
+constexpr auto kTimeStepMultiplier = float64(1.65);
+constexpr auto kAccelerationStartPhase = float64(1.);
+constexpr auto kAccelerationRampPhase = float64(2.5);
+constexpr auto kAccelerationMaxMultiplier = float64(2.2);
+constexpr auto kDisappearStartPhase = kMaxPhaseDuration * 0.15;
+constexpr auto kDisappearDuration
+	= kMaxPhaseDuration - kDisappearStartPhase;
+constexpr auto kMaxParticleCount = uint32_t(120000);
+static_assert(kMaxParticleCount < (1u << 30));
+
+const float kQuadVertices[kQuadVertexCount * 2] = {
+	0.f, 0.f,
+	1.f, 0.f,
+	0.f, 1.f,
+	1.f, 0.f,
+	0.f, 1.f,
+	1.f, 1.f,
+};
+
+struct alignas(16) ComputeInitUniforms {
+	uint32_t particleCountX;
+	uint32_t particleCountY;
+	uint32_t seed;
+	uint32_t _pad;
+};
+static_assert(sizeof(ComputeInitUniforms) % 16 == 0);
+
+struct alignas(16) ComputeUpdateUniforms {
+	uint32_t particleCountX;
+	uint32_t particleCountY;
+	float phase;
+	float timeStep;
+};
+static_assert(sizeof(ComputeUpdateUniforms) % 16 == 0);
+
+struct alignas(16) RenderUniforms {
+	float rect[4];
+	float size[2];
+	uint32_t particleResolution[2];
+	float scale[4];
+};
+static_assert(sizeof(RenderUniforms) % 16 == 0);
+
+[[nodiscard]] float64 AnimationSpeedMultiplier(float64 phase) {
+	if (phase <= kAccelerationStartPhase) {
+		return 1.;
+	}
+	const auto t = std::clamp(
+		(phase - kAccelerationStartPhase) / kAccelerationRampPhase,
+		0.,
+		1.);
+	const auto smooth = t * t * t * (t * (t * 6. - 15.) + 10.);
+	return 1. + ((kAccelerationMaxMultiplier - 1.) * smooth);
+}
+
+[[nodiscard]] float64 DisappearProgress(float64 phase) {
+	const auto t = std::clamp(
+		(phase - kDisappearStartPhase) / kDisappearDuration,
+		0.,
+		1.);
+	const auto oneMinus = 1. - t;
+	return 1. - (oneMinus * oneMinus * oneMinus);
+}
+
+[[nodiscard]] QShader LoadShader(const QString &name) {
+	return Rhi::ShaderFromFile(u":/shaders/"_q + name + u".qsb"_q);
+}
+
+} // namespace
+
+ThanosEffectRenderer::ThanosEffectRenderer(
+		rpl::producer<float64> devicePixelRatio) {
+	std::move(
+		devicePixelRatio
+	) | rpl::on_next([=, this](float64 value) {
+		_factor = value;
+	}, _lifetime);
+}
+
+ThanosEffectRenderer::~ThanosEffectRenderer() {
+	releaseResources();
+}
+
+void ThanosEffectRenderer::initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (_initialized && _rhi == rhi) {
+		return;
+	}
+	// A different rhi instance (fresh setup or post device-lost recovery)
+	// is a chance to retry pipeline creation; only an in-place repeat with
+	// the same instance keeps the sticky failure.
+	if (_rhi != rhi) {
+		_creationFailed = false;
+	}
+	releaseResources();
+	if (_creationFailed) {
+		return;
+	}
+	_rhi = rhi;
+
+	if (!rhi->isFeatureSupported(QRhi::Compute)) {
+		LOG(("ThanosEffect: Compute shaders not supported, disabled"));
+		return;
+	}
+
+	_quadVertexBuffer = rhi->newBuffer(
+		QRhiBuffer::Immutable,
+		QRhiBuffer::VertexBuffer,
+		sizeof(kQuadVertices));
+	_quadVertexBuffer->create();
+
+	_computeInitUniformBuffer = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::UniformBuffer,
+		sizeof(ComputeInitUniforms));
+	_computeInitUniformBuffer->create();
+
+	_computeUpdateUniformBuffer = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::UniformBuffer,
+		sizeof(ComputeUpdateUniforms));
+	_computeUpdateUniformBuffer->create();
+
+	_renderUniformBuffer = rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::UniformBuffer,
+		sizeof(RenderUniforms));
+	_renderUniformBuffer->create();
+
+	_placeholderTexture = rhi->newTexture(
+		QRhiTexture::RGBA8,
+		QSize(1, 1));
+	_placeholderTexture->create();
+
+	_placeholderSampler = rhi->newSampler(
+		QRhiSampler::Linear,
+		QRhiSampler::Linear,
+		QRhiSampler::None,
+		QRhiSampler::ClampToEdge,
+		QRhiSampler::ClampToEdge);
+	_placeholderSampler->create();
+
+	_placeholderStateTexture = rhi->newTexture(
+		QRhiTexture::RGBA32F,
+		QSize(1, 1),
+		1,
+		QRhiTexture::UsedWithLoadStore);
+	_placeholderStateTexture->create();
+
+	_placeholderStateSampler = rhi->newSampler(
+		QRhiSampler::Nearest,
+		QRhiSampler::Nearest,
+		QRhiSampler::None,
+		QRhiSampler::ClampToEdge,
+		QRhiSampler::ClampToEdge);
+	_placeholderStateSampler->create();
+
+	if (!createPipelines(rt)) {
+		LOG(("ThanosEffect: pipeline creation failed, disabling effect"));
+		_creationFailed = true;
+		releaseResources();
+		return;
+	}
+
+	auto *rub = rhi->nextResourceUpdateBatch();
+	rub->uploadStaticBuffer(_quadVertexBuffer, kQuadVertices);
+	cb->resourceUpdate(rub);
+
+	_initialized = true;
+	_lastFrameTime = crl::now();
+
+	LOG(("ThanosEffect: initialized, backend=%1 device=%2")
+		.arg(rhi->backendName())
+		.arg(rhi->driverInfo().deviceName));
+}
+
+bool ThanosEffectRenderer::createPipelines(QRhiRenderTarget *rt) {
+	const auto initShader = LoadShader(u"thanos_init.comp"_q);
+	const auto updateShader = LoadShader(u"thanos_update.comp"_q);
+	const auto vertShader = LoadShader(u"thanos.vert"_q);
+	const auto fragShader = LoadShader(u"thanos.frag"_q);
+
+	_computeInitSrbLayout = _rhi->newShaderResourceBindings();
+	_computeInitSrbLayout->setBindings({
+		QRhiShaderResourceBinding::imageLoadStore(
+			0,
+			QRhiShaderResourceBinding::ComputeStage,
+			_placeholderStateTexture,
+			0),
+		QRhiShaderResourceBinding::uniformBuffer(
+			1,
+			QRhiShaderResourceBinding::ComputeStage,
+			_computeInitUniformBuffer),
+		QRhiShaderResourceBinding::imageLoadStore(
+			2,
+			QRhiShaderResourceBinding::ComputeStage,
+			_placeholderStateTexture,
+			0),
+	});
+	_computeInitSrbLayout->create();
+
+	_computeInitPipeline = _rhi->newComputePipeline();
+	_computeInitPipeline->setShaderStage(
+		{ QRhiShaderStage::Compute, initShader });
+	_computeInitPipeline->setShaderResourceBindings(_computeInitSrbLayout);
+	if (!_computeInitPipeline->create()) {
+		return false;
+	}
+
+	_computeUpdateSrbLayout = _rhi->newShaderResourceBindings();
+	_computeUpdateSrbLayout->setBindings({
+		QRhiShaderResourceBinding::imageLoadStore(
+			0,
+			QRhiShaderResourceBinding::ComputeStage,
+			_placeholderStateTexture,
+			0),
+		QRhiShaderResourceBinding::uniformBuffer(
+			1,
+			QRhiShaderResourceBinding::ComputeStage,
+			_computeUpdateUniformBuffer),
+		QRhiShaderResourceBinding::imageLoadStore(
+			2,
+			QRhiShaderResourceBinding::ComputeStage,
+			_placeholderStateTexture,
+			0),
+	});
+	_computeUpdateSrbLayout->create();
+
+	_computeUpdatePipeline = _rhi->newComputePipeline();
+	_computeUpdatePipeline->setShaderStage(
+		{ QRhiShaderStage::Compute, updateShader });
+	_computeUpdatePipeline->setShaderResourceBindings(
+		_computeUpdateSrbLayout);
+	if (!_computeUpdatePipeline->create()) {
+		return false;
+	}
+
+	_renderSrbLayout = _rhi->newShaderResourceBindings();
+	_renderSrbLayout->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage,
+			_renderUniformBuffer),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			_placeholderTexture,
+			_placeholderSampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::VertexStage,
+			_placeholderStateTexture,
+			_placeholderStateSampler),
+	});
+	_renderSrbLayout->create();
+
+	_renderPipeline = _rhi->newGraphicsPipeline();
+	_renderPipeline->setShaderStages({
+		{ QRhiShaderStage::Vertex, vertShader },
+		{ QRhiShaderStage::Fragment, fragShader },
+	});
+
+	QRhiVertexInputLayout inputLayout;
+	inputLayout.setBindings({
+		{ quint32(kQuadVertexStride) },
+	});
+	inputLayout.setAttributes({
+		{ 0, 0, QRhiVertexInputAttribute::Float2, 0 },
+	});
+	_renderPipeline->setVertexInputLayout(inputLayout);
+
+	QRhiGraphicsPipeline::TargetBlend blend;
+	blend.enable = true;
+	blend.srcColor = QRhiGraphicsPipeline::One;
+	blend.dstColor = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+	blend.srcAlpha = QRhiGraphicsPipeline::One;
+	blend.dstAlpha = QRhiGraphicsPipeline::OneMinusSrcAlpha;
+	_renderPipeline->setTargetBlends({ blend });
+
+	_renderPipeline->setTopology(QRhiGraphicsPipeline::Triangles);
+	_renderPipeline->setShaderResourceBindings(_renderSrbLayout);
+	_renderPipeline->setRenderPassDescriptor(
+		rt->renderPassDescriptor());
+	if (!_renderPipeline->create()) {
+		return false;
+	}
+	return true;
+}
+
+void ThanosEffectRenderer::render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) {
+	if (rhi->isDeviceLost()) {
+		_pendingItems.clear();
+		releaseResources();
+		return;
+	}
+	if (!_initialized || !rhi->isFeatureSupported(QRhi::Compute)) {
+		_pendingItems.clear();
+		return;
+	}
+	_rhi = rhi;
+
+	const auto now = crl::now();
+	// Cap to ~15 FPS so a single slow frame cannot teleport particles.
+	const auto dt = std::clamp(
+		now - _lastFrameTime,
+		crl::time(1),
+		crl::time(66)) / 1000.;
+	_lastFrameTime = now;
+
+	addPendingItems(cb);
+
+	if (_items.empty()) {
+		return;
+	}
+
+	const auto pixelSize = rt->pixelSize();
+	const auto viewW = float64(pixelSize.width()) / _factor;
+	const auto viewH = float64(pixelSize.height()) / _factor;
+
+	{
+		auto *rub = rhi->nextResourceUpdateBatch();
+		auto needsInit = false;
+
+		for (auto &item : _items) {
+			if (item.phase >= kMaxPhaseDuration) {
+				continue;
+			}
+			const auto animationTimeStep
+				= dt * AnimationSpeedMultiplier(item.phase);
+			item.phase += animationTimeStep * kPhaseSpeed;
+			if (!item.particlesInitialized) {
+				needsInit = true;
+				item.particlesInitialized = true;
+				item.needsInitDispatch = true;
+
+				ComputeInitUniforms uni;
+				uni.particleCountX = item.particleCountX;
+				uni.particleCountY = item.particleCountY;
+				uni.seed = _seedCounter++;
+				uni._pad = 0;
+				rub->updateDynamicBuffer(
+					item.computeInitUniformBuffer,
+					0,
+					sizeof(uni),
+					&uni);
+			}
+
+			ComputeUpdateUniforms updateUni;
+			updateUni.particleCountX = item.particleCountX;
+			updateUni.particleCountY = item.particleCountY;
+			updateUni.phase = float(item.phase);
+			updateUni.timeStep = float(
+				animationTimeStep * kTimeStepMultiplier);
+			rub->updateDynamicBuffer(
+				item.computeUpdateUniformBuffer,
+				0,
+				sizeof(updateUni),
+				&updateUni);
+		}
+
+		if (needsInit) {
+			cb->beginComputePass(rub);
+			rub = nullptr;
+			for (auto &item : _items) {
+				if (!item.needsInitDispatch) {
+					continue;
+				}
+				item.needsInitDispatch = false;
+				cb->setComputePipeline(_computeInitPipeline);
+				cb->setShaderResources(item.computeInitSrb);
+				const auto count =
+					item.particleCountX * item.particleCountY;
+				const auto groups =
+					(count + kComputeWorkgroupSize - 1)
+					/ kComputeWorkgroupSize;
+				cb->dispatch(int(groups), 1, 1);
+			}
+			cb->endComputePass();
+		}
+
+		cb->beginComputePass(rub);
+		for (auto &item : _items) {
+			if (item.phase >= kMaxPhaseDuration) {
+				continue;
+			}
+			cb->setComputePipeline(_computeUpdatePipeline);
+			cb->setShaderResources(item.computeUpdateSrb);
+			const auto count = item.particleCountX * item.particleCountY;
+			const auto groups = (count + kComputeWorkgroupSize - 1)
+				/ kComputeWorkgroupSize;
+			cb->dispatch(int(groups), 1, 1);
+		}
+		cb->endComputePass();
+	}
+
+	{
+		auto *renderRub = rhi->nextResourceUpdateBatch();
+		for (auto &item : _items) {
+			if (item.phase >= kMaxPhaseDuration) {
+				continue;
+			}
+			RenderUniforms uni;
+			uni.rect[0] = float(item.rect.x() / viewW);
+			uni.rect[1] = float(
+				(viewH - item.rect.y() - item.rect.height()) / viewH);
+			uni.rect[2] = float(item.rect.width() / viewW);
+			uni.rect[3] = float(item.rect.height() / viewH);
+			uni.size[0] = float(item.rect.width());
+			uni.size[1] = float(item.rect.height());
+			uni.particleResolution[0] = item.particleCountX;
+			uni.particleResolution[1] = item.particleCountY;
+			const auto inverseDisappear = float(
+				1. - DisappearProgress(item.phase));
+			uni.scale[0] = inverseDisappear;
+			uni.scale[1] = 0.;
+			uni.scale[2] = inverseDisappear;
+			uni.scale[3] = 0.;
+
+			renderRub->updateDynamicBuffer(
+				item.renderUniformBuffer,
+				0,
+				sizeof(uni),
+				&uni);
+		}
+
+		const auto bg = QColor(0, 0, 0, 0);
+		cb->beginPass(rt, bg, { 1.0f, 0 }, renderRub);
+
+		for (auto &item : _items) {
+			if (item.phase >= kMaxPhaseDuration) {
+				continue;
+			}
+			cb->setGraphicsPipeline(_renderPipeline);
+			cb->setShaderResources(item.renderSrb);
+			cb->setViewport({
+				0, 0,
+				float(pixelSize.width()),
+				float(pixelSize.height()) });
+
+			const QRhiCommandBuffer::VertexInput vbufs[] = {
+				{ _quadVertexBuffer, 0 },
+			};
+			cb->setVertexInput(0, 1, vbufs);
+
+			const auto instanceCount =
+				item.particleCountX * item.particleCountY;
+			cb->draw(kQuadVertexCount, instanceCount);
+		}
+
+		cb->endPass();
+	}
+
+	auto hadItems = !_items.empty();
+	_items.erase(
+		std::remove_if(_items.begin(), _items.end(), [&](auto &item) {
+			if (item.phase >= kMaxPhaseDuration) {
+				destroyAnimatingItem(item);
+				return true;
+			}
+			return false;
+		}),
+		_items.end());
+
+	if (hadItems && _items.empty()) {
+		_allDone.fire({});
+	}
+}
+
+void ThanosEffectRenderer::addItem(ThanosItem item) {
+	_pendingItems.push_back(std::move(item));
+}
+
+bool ThanosEffectRenderer::hasActiveItems() const {
+	return !_items.empty() || !_pendingItems.empty();
+}
+
+rpl::producer<> ThanosEffectRenderer::allDone() const {
+	return _allDone.events();
+}
+
+void ThanosEffectRenderer::addPendingItems(QRhiCommandBuffer *cb) {
+	if (_pendingItems.empty() || !_rhi) {
+		return;
+	}
+
+	auto *rub = _rhi->nextResourceUpdateBatch();
+
+	for (auto &pending : _pendingItems) {
+		auto animating = createAnimatingItem(std::move(pending));
+		if (animating.texture) {
+			auto image = animating.uploadImage;
+			if (!image.isNull()) {
+				rub->uploadTexture(
+					animating.texture,
+					QRhiTextureUploadDescription(
+						QRhiTextureUploadEntry(
+							0, 0,
+							QRhiTextureSubresourceUploadDescription(
+								image))));
+			}
+			animating.uploadImage = QImage();
+			_items.push_back(std::move(animating));
+		}
+	}
+	_pendingItems.clear();
+
+	cb->resourceUpdate(rub);
+}
+
+ThanosEffectRenderer::AnimatingItem ThanosEffectRenderer::createAnimatingItem(
+		ThanosItem &&item) {
+	AnimatingItem result;
+	result.rect = item.rect;
+
+	const auto w = int(item.rect.width());
+	const auto h = int(item.rect.height());
+	if (w <= 0 || h <= 0 || item.snapshot.isNull()) {
+		return result;
+	}
+
+	const auto totalPixels = uint32_t(w) * uint32_t(h);
+	if (totalPixels <= kMaxParticleCount) {
+		result.particleCountX = uint32_t(w);
+		result.particleCountY = uint32_t(h);
+	} else {
+		const auto aspectRatio = float64(w) / float64(h);
+		const auto maxParticles = float64(kMaxParticleCount);
+		result.particleCountY = std::max(
+			uint32_t(1),
+			uint32_t(std::sqrt(maxParticles / aspectRatio)));
+		result.particleCountX = std::max(
+			uint32_t(1),
+			uint32_t(maxParticles / float64(result.particleCountY)));
+	}
+
+	auto *tex = _rhi->newTexture(
+		QRhiTexture::RGBA8,
+		QSize(item.snapshot.width(), item.snapshot.height()));
+	if (!tex->create()) {
+		delete tex;
+		return result;
+	}
+	result.texture = tex;
+
+	result.uploadImage = item.snapshot.convertToFormat(
+		QImage::Format_RGBA8888_Premultiplied);
+
+	auto *sampler = _rhi->newSampler(
+		QRhiSampler::Linear,
+		QRhiSampler::Linear,
+		QRhiSampler::None,
+		QRhiSampler::ClampToEdge,
+		QRhiSampler::ClampToEdge);
+	if (!sampler->create()) {
+		delete sampler;
+		destroyAnimatingItem(result);
+		return result;
+	}
+	result.sampler = sampler;
+
+	auto *stateTex = _rhi->newTexture(
+		QRhiTexture::RGBA32F,
+		QSize(int(result.particleCountX), int(result.particleCountY)),
+		1,
+		QRhiTexture::UsedWithLoadStore);
+	if (!stateTex->create()) {
+		delete stateTex;
+		destroyAnimatingItem(result);
+		return result;
+	}
+	result.particleStateTexture = stateTex;
+
+	auto *velocityTex = _rhi->newTexture(
+		QRhiTexture::RGBA32F,
+		QSize(int(result.particleCountX), int(result.particleCountY)),
+		1,
+		QRhiTexture::UsedWithLoadStore);
+	if (!velocityTex->create()) {
+		delete velocityTex;
+		destroyAnimatingItem(result);
+		return result;
+	}
+	result.particleVelocityTexture = velocityTex;
+
+	auto *stateSampler = _rhi->newSampler(
+		QRhiSampler::Nearest,
+		QRhiSampler::Nearest,
+		QRhiSampler::None,
+		QRhiSampler::ClampToEdge,
+		QRhiSampler::ClampToEdge);
+	if (!stateSampler->create()) {
+		delete stateSampler;
+		destroyAnimatingItem(result);
+		return result;
+	}
+	result.particleStateSampler = stateSampler;
+
+	auto *initUbo = _rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::UniformBuffer,
+		sizeof(ComputeInitUniforms));
+	if (!initUbo->create()) {
+		delete initUbo;
+		destroyAnimatingItem(result);
+		return result;
+	}
+	result.computeInitUniformBuffer = initUbo;
+
+	auto *updateUbo = _rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::UniformBuffer,
+		sizeof(ComputeUpdateUniforms));
+	if (!updateUbo->create()) {
+		delete updateUbo;
+		destroyAnimatingItem(result);
+		return result;
+	}
+	result.computeUpdateUniformBuffer = updateUbo;
+
+	result.computeInitSrb = _rhi->newShaderResourceBindings();
+	result.computeInitSrb->setBindings({
+		QRhiShaderResourceBinding::imageLoadStore(
+			0,
+			QRhiShaderResourceBinding::ComputeStage,
+			stateTex,
+			0),
+		QRhiShaderResourceBinding::uniformBuffer(
+			1,
+			QRhiShaderResourceBinding::ComputeStage,
+			initUbo),
+		QRhiShaderResourceBinding::imageLoadStore(
+			2,
+			QRhiShaderResourceBinding::ComputeStage,
+			velocityTex,
+			0),
+	});
+	if (!result.computeInitSrb->create()) {
+		destroyAnimatingItem(result);
+		return result;
+	}
+
+	result.computeUpdateSrb = _rhi->newShaderResourceBindings();
+	result.computeUpdateSrb->setBindings({
+		QRhiShaderResourceBinding::imageLoadStore(
+			0,
+			QRhiShaderResourceBinding::ComputeStage,
+			stateTex,
+			0),
+		QRhiShaderResourceBinding::uniformBuffer(
+			1,
+			QRhiShaderResourceBinding::ComputeStage,
+			updateUbo),
+		QRhiShaderResourceBinding::imageLoadStore(
+			2,
+			QRhiShaderResourceBinding::ComputeStage,
+			velocityTex,
+			0),
+	});
+	if (!result.computeUpdateSrb->create()) {
+		destroyAnimatingItem(result);
+		return result;
+	}
+
+	auto *renderUbo = _rhi->newBuffer(
+		QRhiBuffer::Dynamic,
+		QRhiBuffer::UniformBuffer,
+		sizeof(RenderUniforms));
+	if (!renderUbo->create()) {
+		delete renderUbo;
+		destroyAnimatingItem(result);
+		return result;
+	}
+	result.renderUniformBuffer = renderUbo;
+
+	result.renderSrb = _rhi->newShaderResourceBindings();
+	result.renderSrb->setBindings({
+		QRhiShaderResourceBinding::uniformBuffer(
+			0,
+			QRhiShaderResourceBinding::VertexStage,
+			renderUbo),
+		QRhiShaderResourceBinding::sampledTexture(
+			1,
+			QRhiShaderResourceBinding::FragmentStage,
+			tex,
+			sampler),
+		QRhiShaderResourceBinding::sampledTexture(
+			2,
+			QRhiShaderResourceBinding::VertexStage,
+			stateTex,
+			stateSampler),
+	});
+	if (!result.renderSrb->create()) {
+		destroyAnimatingItem(result);
+		return result;
+	}
+
+	return result;
+}
+
+void ThanosEffectRenderer::destroyAnimatingItem(AnimatingItem &item) {
+	const auto deferDelete = [](auto *&resource) {
+		if (resource) {
+			resource->deleteLater();
+			resource = nullptr;
+		}
+	};
+	deferDelete(item.renderSrb);
+	deferDelete(item.computeUpdateSrb);
+	deferDelete(item.computeInitSrb);
+	deferDelete(item.renderUniformBuffer);
+	deferDelete(item.computeUpdateUniformBuffer);
+	deferDelete(item.computeInitUniformBuffer);
+	deferDelete(item.particleStateSampler);
+	deferDelete(item.particleVelocityTexture);
+	deferDelete(item.particleStateTexture);
+	deferDelete(item.sampler);
+	deferDelete(item.texture);
+	item = {};
+}
+
+void ThanosEffectRenderer::releaseResources() {
+	if (!_rhi) {
+		return;
+	}
+	for (auto &item : _items) {
+		destroyAnimatingItem(item);
+	}
+	_items.clear();
+	_pendingItems.clear();
+
+	delete _renderPipeline;
+	_renderPipeline = nullptr;
+	delete _renderSrbLayout;
+	_renderSrbLayout = nullptr;
+	delete _computeUpdatePipeline;
+	_computeUpdatePipeline = nullptr;
+	delete _computeUpdateSrbLayout;
+	_computeUpdateSrbLayout = nullptr;
+	delete _computeInitPipeline;
+	_computeInitPipeline = nullptr;
+	delete _computeInitSrbLayout;
+	_computeInitSrbLayout = nullptr;
+
+	delete _placeholderStateSampler;
+	_placeholderStateSampler = nullptr;
+	delete _placeholderStateTexture;
+	_placeholderStateTexture = nullptr;
+	delete _placeholderSampler;
+	_placeholderSampler = nullptr;
+	delete _placeholderTexture;
+	_placeholderTexture = nullptr;
+
+	delete _renderUniformBuffer;
+	_renderUniformBuffer = nullptr;
+	delete _computeUpdateUniformBuffer;
+	_computeUpdateUniformBuffer = nullptr;
+	delete _computeInitUniformBuffer;
+	_computeInitUniformBuffer = nullptr;
+	delete _quadVertexBuffer;
+	_quadVertexBuffer = nullptr;
+
+	_initialized = false;
+	_seedCounter = 0;
+	_rhi = nullptr;
+}
+
+} // namespace Ui
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/ui/effects/thanos_effect_renderer.h b/Telegram/SourceFiles/ui/effects/thanos_effect_renderer.h
new file mode 100644
index 00000000000000..9e17385d6c58a6
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/thanos_effect_renderer.h
@@ -0,0 +1,128 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rhi/rhi_renderer.h"
+#include "ui/gl/gl_surface.h"
+
+#include <QImage>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+
+class QRhi;
+class QRhiBuffer;
+class QRhiTexture;
+class QRhiSampler;
+class QRhiGraphicsPipeline;
+class QRhiComputePipeline;
+class QRhiShaderResourceBindings;
+class QRhiRenderTarget;
+class QRhiCommandBuffer;
+
+namespace Ui {
+
+struct ThanosItem {
+	QImage snapshot;
+	QRectF rect;
+};
+
+class ThanosEffectRenderer final
+	: public GL::Renderer
+	, public Rhi::Renderer {
+public:
+	explicit ThanosEffectRenderer(
+		rpl::producer<float64> devicePixelRatio);
+	~ThanosEffectRenderer();
+
+	void initialize(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void render(
+		QRhi *rhi,
+		QRhiRenderTarget *rt,
+		QRhiCommandBuffer *cb) override;
+	void releaseResources() override;
+
+	QColor rhiClearColor() override {
+		return QColor(0, 0, 0, 0);
+	}
+
+	std::optional<QColor> clearColor() override {
+		return QColor(0, 0, 0, 0);
+	}
+
+	void addItem(ThanosItem item);
+	[[nodiscard]] bool hasActiveItems() const;
+
+	rpl::producer<> allDone() const;
+
+private:
+	struct AnimatingItem {
+		QRhiTexture *texture = nullptr;
+		QRhiSampler *sampler = nullptr;
+		QRhiTexture *particleStateTexture = nullptr;
+		QRhiTexture *particleVelocityTexture = nullptr;
+		QRhiSampler *particleStateSampler = nullptr;
+		QRhiBuffer *computeInitUniformBuffer = nullptr;
+		QRhiBuffer *computeUpdateUniformBuffer = nullptr;
+		QRhiBuffer *renderUniformBuffer = nullptr;
+		QRhiShaderResourceBindings *computeInitSrb = nullptr;
+		QRhiShaderResourceBindings *computeUpdateSrb = nullptr;
+		QRhiShaderResourceBindings *renderSrb = nullptr;
+		QImage uploadImage;
+		QRectF rect;
+		uint32_t particleCountX = 0;
+		uint32_t particleCountY = 0;
+		float64 phase = 0.;
+		bool particlesInitialized = false;
+		bool needsInitDispatch = false;
+	};
+
+	[[nodiscard]] bool createPipelines(QRhiRenderTarget *rt);
+	void addPendingItems(QRhiCommandBuffer *cb);
+	AnimatingItem createAnimatingItem(ThanosItem &&item);
+	void destroyAnimatingItem(AnimatingItem &item);
+
+	QRhi *_rhi = nullptr;
+	float64 _factor = 1.;
+
+	QRhiBuffer *_quadVertexBuffer = nullptr;
+	QRhiBuffer *_computeInitUniformBuffer = nullptr;
+	QRhiBuffer *_computeUpdateUniformBuffer = nullptr;
+	QRhiBuffer *_renderUniformBuffer = nullptr;
+
+	QRhiTexture *_placeholderTexture = nullptr;
+	QRhiSampler *_placeholderSampler = nullptr;
+	QRhiTexture *_placeholderStateTexture = nullptr;
+	QRhiSampler *_placeholderStateSampler = nullptr;
+
+	QRhiShaderResourceBindings *_computeInitSrbLayout = nullptr;
+	QRhiShaderResourceBindings *_computeUpdateSrbLayout = nullptr;
+	QRhiShaderResourceBindings *_renderSrbLayout = nullptr;
+
+	QRhiComputePipeline *_computeInitPipeline = nullptr;
+	QRhiComputePipeline *_computeUpdatePipeline = nullptr;
+	QRhiGraphicsPipeline *_renderPipeline = nullptr;
+
+	std::vector<AnimatingItem> _items;
+	std::vector<ThanosItem> _pendingItems;
+
+	crl::time _lastFrameTime = 0;
+	bool _initialized = false;
+	bool _creationFailed = false;
+	uint32_t _seedCounter = 0;
+
+	rpl::event_stream<> _allDone;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Ui
+
+#endif // Qt >= 6.7
diff --git a/Telegram/SourceFiles/ui/effects/thanos_effect_session.cpp b/Telegram/SourceFiles/ui/effects/thanos_effect_session.cpp
new file mode 100644
index 00000000000000..258a8b41312ffa
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/thanos_effect_session.cpp
@@ -0,0 +1,32 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/thanos_effect_session.h"
+
+#include "ui/effects/thanos_effect.h"
+#include "data/data_folder.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+
+namespace Ui {
+
+void ScheduleThanosEffectWarmUp(
+		not_null<Main::Session*> session,
+		rpl::lifetime &lifetime) {
+	if (session->data().chatsListLoaded(nullptr)) {
+		ThanosEffect::WarmUp();
+		return;
+	}
+	session->data().chatsListLoadedEvents(
+	) | rpl::filter([](Data::Folder *folder) {
+		return !folder;
+	}) | rpl::take(1) | rpl::on_next([] {
+		ThanosEffect::WarmUp();
+	}, lifetime);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/thanos_effect_session.h b/Telegram/SourceFiles/ui/effects/thanos_effect_session.h
new file mode 100644
index 00000000000000..0ca99043ea8e2f
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/thanos_effect_session.h
@@ -0,0 +1,20 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+
+void ScheduleThanosEffectWarmUp(
+	not_null<Main::Session*> session,
+	rpl::lifetime &lifetime);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/toggle_arrow.cpp b/Telegram/SourceFiles/ui/effects/toggle_arrow.cpp
index 57e152ff1c522d..6e91c00d052521 100644
--- a/Telegram/SourceFiles/ui/effects/toggle_arrow.cpp
+++ b/Telegram/SourceFiles/ui/effects/toggle_arrow.cpp
@@ -7,6 +7,12 @@ For license and copyright information please follow this link:
 */
 #include "ui/effects/toggle_arrow.h"
 
+#include "ui/rp_widget.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "styles/style_statistics.h"
+#include "styles/style_window.h"
+
 #include <QtCore/QtMath>
 
 namespace Ui {
@@ -50,4 +56,24 @@ namespace Ui {
 	return path;
 }
 
+void AddToggleUpDownArrowToMoreButton(not_null<Ui::RpWidget*> parent) {
+	const auto arrow = Ui::CreateChild<Ui::RpWidget>(parent.get());
+	arrow->paintRequest() | rpl::on_next([=](const QRect &r) {
+		auto p = QPainter(arrow);
+
+		const auto path = ToggleUpDownArrowPath(
+			st::statisticsShowMoreButtonArrowSize,
+			st::statisticsShowMoreButtonArrowSize,
+			st::statisticsShowMoreButtonArrowSize,
+			st::mainMenuToggleFourStrokes,
+			0.);
+
+		auto hq = PainterHighQualityEnabler(p);
+		p.fillPath(path, st::lightButtonFg);
+	}, arrow->lifetime());
+	arrow->resize(Size(st::statisticsShowMoreButtonArrowSize * 2));
+	arrow->move(st::statisticsShowMoreButtonArrowPosition);
+	arrow->show();
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/toggle_arrow.h b/Telegram/SourceFiles/ui/effects/toggle_arrow.h
index 3a12c7e4de1afa..51cb1e089137d3 100644
--- a/Telegram/SourceFiles/ui/effects/toggle_arrow.h
+++ b/Telegram/SourceFiles/ui/effects/toggle_arrow.h
@@ -9,6 +9,8 @@ For license and copyright information please follow this link:
 
 namespace Ui {
 
+class RpWidget;
+
 [[nodiscard]] QPainterPath ToggleUpDownArrowPath(
 	float64 x,
 	float64 y,
@@ -16,4 +18,6 @@ namespace Ui {
 	float64 fourStrokes,
 	float64 progress);
 
+void AddToggleUpDownArrowToMoreButton(not_null<Ui::RpWidget*> parent);
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/ttl_icon.cpp b/Telegram/SourceFiles/ui/effects/ttl_icon.cpp
new file mode 100644
index 00000000000000..9ca59e77284ce4
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/ttl_icon.cpp
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/ttl_icon.h"
+
+#include "ui/arc_angles.h"
+#include "ui/painter.h"
+#include "styles/style_dialogs.h"
+
+namespace Ui {
+
+void PaintTimerIcon(
+		QPainter &p,
+		const QRect &innerRect,
+		const QString &text,
+		const QColor &color) {
+	p.setFont(st::dialogsScamFont);
+	p.setPen(color);
+	p.drawText(
+		innerRect,
+		(text.size() > 2) ? text.mid(0, 2) : text,
+		style::al_center);
+
+	constexpr auto kPenWidth = 1.5;
+	const auto penWidth = style::ConvertScaleExact(kPenWidth);
+	auto pen = QPen(color);
+	pen.setJoinStyle(Qt::RoundJoin);
+	pen.setCapStyle(Qt::RoundCap);
+	pen.setWidthF(penWidth);
+
+	p.setPen(pen);
+	p.setBrush(Qt::NoBrush);
+	p.drawArc(innerRect, arc::kQuarterLength, arc::kHalfLength);
+
+	p.setClipRect(innerRect
+		- QMargins(innerRect.width() / 2, -penWidth, -penWidth, -penWidth));
+	pen.setStyle(Qt::DotLine);
+	p.setPen(pen);
+	p.drawEllipse(innerRect);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/ttl_icon.h b/Telegram/SourceFiles/ui/effects/ttl_icon.h
new file mode 100644
index 00000000000000..e8b5083e2548a3
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/ttl_icon.h
@@ -0,0 +1,18 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+
+void PaintTimerIcon(
+	QPainter &p,
+	const QRect &innerRect,
+	const QString &text,
+	const QColor &color);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/upload_progress_overlay.cpp b/Telegram/SourceFiles/ui/effects/upload_progress_overlay.cpp
new file mode 100644
index 00000000000000..ecdcb1387c0350
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/upload_progress_overlay.cpp
@@ -0,0 +1,198 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/upload_progress_overlay.h"
+
+#include "base/call_delayed.h"
+#include "ui/effects/animation_value.h"
+#include "ui/painter.h"
+#include "styles/style_basic.h"
+
+namespace Ui {
+
+UploadProgressOverlay::UploadProgressOverlay(
+	not_null<QWidget*> parent,
+	Fn<void()> update)
+: _parent(parent)
+, _update(std::move(update))
+, _radial([=](crl::time now) { radialAnimationCallback(now); }) {
+}
+
+void UploadProgressOverlay::start() {
+	_uploading = true;
+	_stopping = false;
+	_startedAt = crl::now();
+	_progress = 0.;
+	_hiding.stop();
+	_hidingDone = nullptr;
+	_radial.start(_progress);
+	_update();
+}
+
+void UploadProgressOverlay::stop(Fn<void()> done) {
+	if (!_uploading) {
+		if (done) {
+			done();
+		}
+		return;
+	}
+	_hidingDone = std::move(done);
+	_stopping = true;
+	_progress = 1.;
+	_update();
+
+	const auto catchUp = st::radialDuration * 2;
+	base::call_delayed(catchUp, _parent, [=] {
+		if (!_stopping) {
+			return;
+		}
+		proceedWithStop();
+	});
+}
+
+void UploadProgressOverlay::fail(Fn<void()> done) {
+	if (!_uploading) {
+		if (done) {
+			done();
+		}
+		return;
+	}
+	_hidingDone = std::move(done);
+	_stopping = true;
+	_progress = 0.;
+	_update();
+
+	const auto catchUp = st::radialDuration * 2;
+	base::call_delayed(catchUp, _parent, [=] {
+		if (!_stopping) {
+			return;
+		}
+		proceedWithStop();
+	});
+}
+
+void UploadProgressOverlay::proceedWithStop() {
+	_stopping = false;
+	_uploading = false;
+
+	const auto elapsed = crl::now() - _startedAt;
+	const auto minDuration = st::radialDuration * 3;
+	const auto delay = std::max(minDuration - elapsed, crl::time(0));
+	base::call_delayed(delay, _parent, [=] {
+		if (_uploading) {
+			return;
+		}
+		_hiding.start(
+			_update,
+			1.,
+			0.,
+			st::radialDuration);
+		_hiding.setFinishedCallback([=] {
+			_radial.stop();
+			const auto callback = base::take(_hidingDone);
+			_update();
+			if (callback) {
+				callback();
+			}
+		});
+	});
+}
+
+void UploadProgressOverlay::finish(Fn<void()> done) {
+	_uploading = false;
+	_update();
+	if (done) {
+		done();
+	}
+}
+
+void UploadProgressOverlay::setProgress(float64 progress) {
+	_progress = progress;
+	_update();
+}
+
+void UploadProgressOverlay::setOver(bool over) {
+	_over = over;
+	if (!_uploading) {
+		return;
+	}
+	_cancelShown.start(
+		_update,
+		over ? 0. : 1.,
+		over ? 1. : 0.,
+		st::universalDuration);
+}
+
+bool UploadProgressOverlay::shown() const {
+	return _uploading
+		|| _radial.animating()
+		|| _hiding.animating()
+		|| _hidingDone;
+}
+
+bool UploadProgressOverlay::uploading() const {
+	return _uploading && !_stopping;
+}
+
+void UploadProgressOverlay::paint(
+		QPainter &p,
+		QRect rect,
+		const PaintArgs &args) {
+	const auto hideOpacity = _hiding.animating()
+		? _hiding.value(0.)
+		: (_uploading || _hidingDone) ? 1. : 0.;
+	if (hideOpacity <= 0.) {
+		return;
+	}
+
+	auto o = p.opacity();
+	if (hideOpacity < 1.) {
+		p.setOpacity(o * hideOpacity);
+	}
+
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(args.overlayFg);
+	if (args.roundRadius > 0.) {
+		p.drawRoundedRect(rect, args.roundRadius, args.roundRadius);
+	} else {
+		p.drawEllipse(rect);
+	}
+
+	if (_uploading) {
+		const auto cancelOpacity = _cancelShown.value(
+			_over ? 1. : 0.);
+		if (cancelOpacity > 0. && args.cancelIcon) {
+			p.setOpacity(o * hideOpacity * cancelOpacity);
+			args.cancelIcon->paintInCenter(p, rect);
+		}
+	}
+
+	p.setOpacity(o * hideOpacity);
+	const auto line = float64(args.lineWidth);
+	const auto margin = float64(args.margin);
+	const auto arc = QRectF(rect) - QMarginsF(
+		margin,
+		margin,
+		margin,
+		margin);
+	_radial.draw(p, arc, line, args.progressFg);
+
+	p.setOpacity(o);
+}
+
+void UploadProgressOverlay::radialAnimationCallback(crl::time now) {
+	const auto updated = _radial.update(
+		_progress,
+		!_uploading,
+		now);
+	if (!anim::Disabled() || updated || _radial.animating()) {
+		_update();
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/upload_progress_overlay.h b/Telegram/SourceFiles/ui/effects/upload_progress_overlay.h
new file mode 100644
index 00000000000000..7608b449b6265e
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/upload_progress_overlay.h
@@ -0,0 +1,60 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/radial_animation.h"
+#include "ui/effects/animations.h"
+
+namespace Ui {
+
+class UploadProgressOverlay final {
+public:
+	struct PaintArgs {
+		int lineWidth = 3;
+		int margin = 8;
+		style::color progressFg;
+		style::color overlayFg;
+		const style::icon *cancelIcon = nullptr;
+		float64 roundRadius = 0.;
+	};
+
+	UploadProgressOverlay(
+		not_null<QWidget*> parent,
+		Fn<void()> update);
+
+	void start();
+	void stop(Fn<void()> done = nullptr);
+	void fail(Fn<void()> done = nullptr);
+	void setProgress(float64 progress);
+	void setOver(bool over);
+
+	[[nodiscard]] bool shown() const;
+	[[nodiscard]] bool uploading() const;
+
+	void paint(QPainter &p, QRect rect, const PaintArgs &args);
+
+private:
+	void radialAnimationCallback(crl::time now);
+	void finish(Fn<void()> done);
+	void proceedWithStop();
+
+	const not_null<QWidget*> _parent;
+	const Fn<void()> _update;
+	RadialAnimation _radial;
+	Animations::Simple _cancelShown;
+	Animations::Simple _hiding;
+	Fn<void()> _hidingDone;
+	bool _uploading = false;
+	bool _stopping = false;
+	bool _over = false;
+	float64 _progress = 0.;
+	crl::time _startedAt = 0;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/voice_once_particles.cpp b/Telegram/SourceFiles/ui/effects/voice_once_particles.cpp
new file mode 100644
index 00000000000000..0563dca0971dd7
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/voice_once_particles.cpp
@@ -0,0 +1,154 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/effects/voice_once_particles.h"
+
+#include "ui/painter.h"
+#include "ui/style/style_core_scale.h"
+#include "base/random.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kMaxDelta = crl::time(20);
+
+} // namespace
+
+TimerParticles::TimerParticles(int count) : _count(count) {
+}
+
+void TimerParticles::update(crl::time dt) {
+	for (auto i = _particles.begin(); i != _particles.end();) {
+		if (i->currentTime >= i->lifeTime) {
+			i = _particles.erase(i);
+			continue;
+		}
+		const auto progress = i->currentTime / i->lifeTime;
+		i->alpha = (1. - progress) * (1. - progress);
+		i->x += i->vx * i->velocity * dt / 200.;
+		i->y += i->vy * i->velocity * dt / 200.;
+		i->currentTime += dt;
+		++i;
+	}
+}
+
+void TimerParticles::paint(
+		QPainter &p,
+		QPointF emit,
+		QPointF direction,
+		const QColor &color,
+		float64 alpha) {
+	const auto now = crl::now();
+	const auto dt = _lastTime ? std::min(kMaxDelta, now - _lastTime) : 0;
+	_lastTime = now;
+
+	constexpr auto kMaxPerFrame = 3;
+	constexpr auto kRandomPerParticle = 3;
+	const auto free = _count - int(_particles.size());
+	const auto count = std::min(std::clamp(free / 12, 1, kMaxPerFrame), free);
+	const auto dx = direction.x();
+	const auto dy = direction.y();
+	auto random = std::array<uchar, kMaxPerFrame * kRandomPerParticle>();
+	base::RandomFill(random.data(), count * kRandomPerParticle);
+	auto index = 0;
+	const auto next = [&] { return random[index++] / 256.; };
+	for (auto i = 0; i != count; ++i) {
+		const auto angle = (next() * 140. - 70.) * M_PI / 180.;
+		const auto c = std::cos(angle);
+		const auto s = std::sin(angle);
+		auto particle = Particle();
+		particle.x = emit.x();
+		particle.y = emit.y();
+		particle.vx = dx * c - dy * s;
+		particle.vy = dx * s + dy * c;
+		particle.alpha = 1.;
+		particle.currentTime = 0.;
+		particle.lifeTime = 400. + next() * 100.;
+		particle.velocity = style::ConvertScaleExact(20. + next() * 4.);
+		_particles.push_back(particle);
+	}
+
+	update(dt);
+
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	const auto radius = style::ConvertScaleExact(1.66) / 2.;
+	for (const auto &particle : _particles) {
+		auto c = color;
+		c.setAlphaF(color.alphaF() * particle.alpha * alpha);
+		p.setBrush(c);
+		p.drawEllipse(QPointF(particle.x, particle.y), radius, radius);
+	}
+}
+
+WaveformParticles::WaveformParticles(int count) : _count(count) {
+}
+
+void WaveformParticles::clear() {
+	_particles.clear();
+}
+
+void WaveformParticles::paint(
+		QPainter &p,
+		const QRectF &emitArea,
+		const QColor &color,
+		float64 alpha) {
+	const auto now = crl::now();
+	const auto dt = _lastTime ? std::min(kMaxDelta, now - _lastTime) : 0;
+	_lastTime = now;
+
+	const auto gravity = style::ConvertScaleExact(0.33);
+	for (auto i = _particles.begin(); i != _particles.end();) {
+		i->t -= dt / i->d;
+		if (i->t < 0.) {
+			i = _particles.erase(i);
+			continue;
+		}
+		i->x += i->vx * i->v * dt / 500.;
+		i->y += i->vy * i->v * dt / 500.;
+		i->vy -= gravity * dt / 500.;
+		++i;
+	}
+
+	constexpr auto kMaxPerFrame = 4;
+	constexpr auto kRandomPerParticle = 5;
+	const auto emit = emitArea.isNull()
+		? 0
+		: std::min(kMaxPerFrame, _count - int(_particles.size()));
+	if (emit > 0) {
+		auto random = std::array<uchar, kMaxPerFrame * kRandomPerParticle>();
+		base::RandomFill(random.data(), emit * kRandomPerParticle);
+		auto index = 0;
+		const auto next = [&] { return random[index++] / 256.; };
+		for (auto i = 0; i != emit; ++i) {
+			const auto angle = (next() * 200. - 125.) * M_PI / 180.;
+			const auto c = std::cos(angle);
+			const auto s = std::sin(angle);
+			auto particle = Particle();
+			particle.x = emitArea.left() + emitArea.width() * next();
+			particle.y = emitArea.top() + emitArea.height() * next();
+			particle.vx = (c - s) * 0.8;
+			particle.vy = (s + c) - 0.2;
+			particle.t = 1.;
+			particle.v = style::ConvertScaleExact(10. + next() * 7.);
+			particle.d = 420. + next() * (550. - 420.);
+			_particles.push_back(particle);
+		}
+	}
+
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	const auto radius = style::ConvertScaleExact(1.33) / 2.;
+	for (const auto &particle : _particles) {
+		auto c = color;
+		c.setAlphaF(color.alphaF() * alpha * particle.t);
+		p.setBrush(c);
+		p.drawEllipse(QPointF(particle.x, particle.y), radius, radius);
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/voice_once_particles.h b/Telegram/SourceFiles/ui/effects/voice_once_particles.h
new file mode 100644
index 00000000000000..9adbb0b0209ed2
--- /dev/null
+++ b/Telegram/SourceFiles/ui/effects/voice_once_particles.h
@@ -0,0 +1,78 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class QPainter;
+
+namespace Ui {
+
+class TimerParticles final {
+public:
+	explicit TimerParticles(int count = 40);
+
+	void paint(
+		QPainter &p,
+		QPointF emit,
+		QPointF direction,
+		const QColor &color,
+		float64 alpha);
+
+private:
+	struct Particle {
+		float64 x = 0.;
+		float64 y = 0.;
+		float64 vx = 0.;
+		float64 vy = 0.;
+		float64 velocity = 0.;
+		float64 alpha = 0.;
+		float64 lifeTime = 0.;
+		float64 currentTime = 0.;
+	};
+
+	void update(crl::time dt);
+
+	std::vector<Particle> _particles;
+	const int _count = 0;
+	crl::time _lastTime = 0;
+
+};
+
+class WaveformParticles final {
+public:
+	explicit WaveformParticles(int count = 250);
+
+	void paint(
+		QPainter &p,
+		const QRectF &emitArea,
+		const QColor &color,
+		float64 alpha);
+	void clear();
+
+private:
+	struct Particle {
+		float64 x = 0.;
+		float64 y = 0.;
+		float64 v = 0.;
+		float64 vx = 0.;
+		float64 vy = 0.;
+		float64 t = 0.;
+		float64 d = 0.;
+	};
+
+	std::vector<Particle> _particles;
+	const int _count = 0;
+	crl::time _lastTime = 0;
+
+};
+
+struct VoiceOnceParticles {
+	TimerParticles radial;
+	WaveformParticles waveform;
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/empty_userpic.cpp b/Telegram/SourceFiles/ui/empty_userpic.cpp
index 1eebf7a11bb26a..e731062b677979 100644
--- a/Telegram/SourceFiles/ui/empty_userpic.cpp
+++ b/Telegram/SourceFiles/ui/empty_userpic.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "ui/empty_userpic.h"
 
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "ui/chat/chat_style.h"
 #include "ui/effects/animation_value.h"
 #include "ui/emoji_config.h"
@@ -17,6 +18,9 @@ For license and copyright information please follow this link:
 #include "styles/style_widgets.h" // style::IconButton
 #include "styles/style_info.h" // st::topBarCall
 
+#include <QtCore/QMutex>
+#include <QtSvg/QSvgRenderer>
+
 namespace Ui {
 namespace {
 
@@ -183,6 +187,18 @@ void PaintMyNotesInner(
 		fg);
 }
 
+void PaintCurrencyInner(
+		QPainter &p,
+		int x,
+		int y,
+		int size,
+		const style::color &fg) {
+	auto svg = QSvgRenderer(Ui::Earn::CurrencySvgColored(fg->c));
+	const auto skip = size / 5;
+	svg.render(&p, QRect(x, y, size, size).marginsRemoved(
+		{ skip, skip, skip, skip }));
+}
+
 void PaintExternalMessagesInner(
 		QPainter &p,
 		int x,
@@ -351,6 +367,17 @@ void EmptyUserpic::paintSquare(
 	});
 }
 
+void EmptyUserpic::paintMonoforum(
+		QPainter &p,
+		int x,
+		int y,
+		int outerWidth,
+		int size) const {
+	paint(p, x, y, outerWidth, size, [&] {
+		PaintMonoforumShape(p, QRect(x, y, size, size));
+	});
+}
+
 void EmptyUserpic::PaintSavedMessages(
 		QPainter &p,
 		int x,
@@ -507,6 +534,45 @@ QImage EmptyUserpic::GenerateMyNotes(int size) {
 	});
 }
 
+void EmptyUserpic::PaintCurrency(
+		QPainter &p,
+		int x,
+		int y,
+		int outerWidth,
+		int size) {
+	auto bg = QLinearGradient(x, y, x, y + size);
+	bg.setStops({
+		{ 0., st::historyPeerSavedMessagesBg->c },
+		{ 1., st::historyPeerSavedMessagesBg2->c }
+	});
+	const auto &fg = st::historyPeerUserpicFg;
+	PaintCurrency(p, x, y, outerWidth, size, QBrush(bg), fg);
+}
+
+void EmptyUserpic::PaintCurrency(
+		QPainter &p,
+		int x,
+		int y,
+		int outerWidth,
+		int size,
+		QBrush bg,
+		const style::color &fg) {
+	x = style::RightToLeft() ? (outerWidth - x - size) : x;
+
+	PainterHighQualityEnabler hq(p);
+	p.setBrush(bg);
+	p.setPen(Qt::NoPen);
+	p.drawEllipse(x, y, size, size);
+
+	PaintCurrencyInner(p, x, y, size, fg);
+}
+
+QImage EmptyUserpic::GenerateCurrency(int size) {
+	return Generate(size, [&](QPainter &p) {
+		PaintCurrency(p, 0, 0, size, size);
+	});
+}
+
 std::pair<uint64, uint64> EmptyUserpic::uniqueKey() const {
 	const auto first = (uint64(0xFFFFFFFFU) << 32)
 		| anim::getPremultiplied(_colors.color1->c);
@@ -595,4 +661,86 @@ void EmptyUserpic::fillString(const QString &name) {
 
 EmptyUserpic::~EmptyUserpic() = default;
 
+void PaintMonoforumShape(QPainter &p, QRect rect) {
+	p.drawEllipse(rect);
+
+	auto path = QPainterPath();
+	path.moveTo(
+		rect.x() + rect.width() * 0.5,
+		rect.y() + rect.height() * 0.5);
+	path.arcTo(
+		QRectF(
+			rect.x() - rect.width() * 0.5,
+			rect.y(),
+			rect.width(),
+			rect.height()),
+		0,
+		-90);
+	path.arcTo(
+		QRectF(
+			rect.x() - rect.width() * 0.25,
+			rect.y() - rect.height() * 2,
+			rect.width() * 0.5,
+			rect.height() * 3),
+		-90,
+		45);
+	path.lineTo(
+		rect.x() + rect.width() * 0.5,
+		rect.y() + rect.height() * 0.5);
+	p.drawPath(path);
+}
+
+QImage MonoforumShapeMask(QSize size) {
+	auto result = QImage(size, QImage::Format_ARGB32_Premultiplied);
+	result.fill(Qt::transparent);
+
+	QPainter p(&result);
+	PainterHighQualityEnabler hq(p);
+	p.setBrush(Qt::white);
+	p.setPen(Qt::NoPen);
+
+	PaintMonoforumShape(p, QRect(QPoint(), size));
+
+	p.end();
+
+	return result;
+}
+
+const QImage &MonoforumShapeMaskCached(QSize size) {
+	const auto key = (uint64(uint32(size.width())) << 32)
+		| uint64(uint32(size.height()));
+
+	static auto Masks = base::flat_map<uint64, QImage>();
+	static auto Mutex = QMutex();
+	auto lock = QMutexLocker(&Mutex);
+	const auto i = Masks.find(key);
+	if (i != end(Masks)) {
+		return i->second;
+	}
+	lock.unlock();
+
+	auto mask = MonoforumShapeMask(size);
+
+	lock.relock();
+	return Masks.emplace(key, std::move(mask)).first->second;
+}
+
+QImage ApplyMonoforumShape(QImage image) {
+	const auto size = image.size();
+	auto mask = MonoforumShapeMaskCached(size);
+
+	constexpr auto format = QImage::Format_ARGB32_Premultiplied;
+	if (image.format() != format) {
+		image = std::move(image).convertToFormat(format);
+	}
+	auto p = QPainter(&image);
+	p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+	p.drawImage(
+		QRect(QPoint(), image.size() / image.devicePixelRatio()),
+		mask);
+	p.end();
+
+	return image;
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/empty_userpic.h b/Telegram/SourceFiles/ui/empty_userpic.h
index 7d293db54a0e05..6e2e903cecfb9b 100644
--- a/Telegram/SourceFiles/ui/empty_userpic.h
+++ b/Telegram/SourceFiles/ui/empty_userpic.h
@@ -46,6 +46,12 @@ class EmptyUserpic final : public base::has_weak_ptr {
 		int y,
 		int outerWidth,
 		int size) const;
+	void paintMonoforum(
+		QPainter &p,
+		int x,
+		int y,
+		int outerWidth,
+		int size) const;
 	[[nodiscard]] QPixmap generate(int size);
 	[[nodiscard]] std::pair<uint64, uint64> uniqueKey() const;
 
@@ -113,6 +119,22 @@ class EmptyUserpic final : public base::has_weak_ptr {
 		const style::color &fg);
 	[[nodiscard]] static QImage GenerateMyNotes(int size);
 
+	static void PaintCurrency(
+		QPainter &p,
+		int x,
+		int y,
+		int outerWidth,
+		int size);
+	static void PaintCurrency(
+		QPainter &p,
+		int x,
+		int y,
+		int outerWidth,
+		int size,
+		QBrush bg,
+		const style::color &fg);
+	[[nodiscard]] static QImage GenerateCurrency(int size);
+
 	~EmptyUserpic();
 
 private:
@@ -131,4 +153,9 @@ class EmptyUserpic final : public base::has_weak_ptr {
 
 };
 
+void PaintMonoforumShape(QPainter &p, QRect rect);
+[[nodiscard]] QImage MonoforumShapeMask(QSize size);
+[[nodiscard]] const QImage &MonoforumShapeMaskCached(QSize size);
+[[nodiscard]] QImage ApplyMonoforumShape(QImage image);
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/filter_icon_panel.cpp b/Telegram/SourceFiles/ui/filter_icon_panel.cpp
index 34299d15c38ee3..031146c127af07 100644
--- a/Telegram/SourceFiles/ui/filter_icon_panel.cpp
+++ b/Telegram/SourceFiles/ui/filter_icon_panel.cpp
@@ -71,7 +71,8 @@ constexpr auto kIcons = std::array{
 FilterIconPanel::FilterIconPanel(QWidget *parent)
 : RpWidget(parent)
 , _inner(Ui::CreateChild<Ui::RpWidget>(this))
-, _innerBg(ImageRoundRadius::Small, st::dialogsBg) {
+, _innerBg(ImageRoundRadius::Small, st::dialogsBg)
+, _shadow(st::emojiPanAnimation.shadow) {
 	setup();
 }
 
@@ -93,7 +94,7 @@ void FilterIconPanel::setup() {
 	macWindowDeactivateEvents(
 	) | rpl::filter([=] {
 		return !isHidden();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		hideAnimated();
 	}, lifetime());
 
@@ -116,7 +117,7 @@ void FilterIconPanel::setupInner() {
 	_inner->resize(full);
 
 	_inner->paintRequest(
-		) | rpl::start_with_next([=](QRect clip) {
+		) | rpl::on_next([=](QRect clip) {
 		auto p = Painter(_inner);
 		_innerBg.paint(p, _inner->rect());
 		p.setFont(st::emojiPanHeaderFont);
@@ -153,7 +154,7 @@ void FilterIconPanel::setupInner() {
 
 	_inner->setMouseTracking(true);
 	_inner->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		switch (e->type()) {
 		case QEvent::Leave: setSelected(-1); break;
 		case QEvent::MouseMove:
@@ -276,11 +277,7 @@ void FilterIconPanel::paintEvent(QPaintEvent *e) {
 		hideFinished();
 	} else {
 		if (!_cache.isNull()) _cache = QPixmap();
-		Ui::Shadow::paint(
-			p,
-			innerRect(),
-			width(),
-			st::emojiPanAnimation.shadow);
+		_shadow.paint(p, innerRect(), st::emojiPanRadius);
 	}
 }
 
@@ -296,7 +293,7 @@ void FilterIconPanel::leaveEventHook(QEvent *e) {
 	} else {
 		_hideTimer.callOnce(kHideTimeoutMs);
 	}
-	return TWidget::leaveEventHook(e);
+	return RpWidget::leaveEventHook(e);
 }
 
 void FilterIconPanel::otherEnter() {
@@ -381,7 +378,8 @@ void FilterIconPanel::startShowAnimation() {
 			std::move(image),
 			QRect(
 				inner.topLeft() * style::DevicePixelRatio(),
-				inner.size() * style::DevicePixelRatio()));
+				inner.size() * style::DevicePixelRatio()),
+			st::emojiPanRadius);
 		_showAnimation->setCornerMasks(Images::CornersMask(ImageRoundRadius::Small));
 		_showAnimation->start();
 	}
diff --git a/Telegram/SourceFiles/ui/filter_icon_panel.h b/Telegram/SourceFiles/ui/filter_icon_panel.h
index 99caea7a6903ac..774dce83345203 100644
--- a/Telegram/SourceFiles/ui/filter_icon_panel.h
+++ b/Telegram/SourceFiles/ui/filter_icon_panel.h
@@ -11,6 +11,7 @@ For license and copyright information please follow this link:
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
 #include "ui/round_rect.h"
+#include "ui/widgets/shadow.h"
 
 namespace Ui {
 
@@ -78,6 +79,7 @@ class FilterIconPanel final : public Ui::RpWidget {
 	std::unique_ptr<Ui::PanelAnimation> _showAnimation;
 	Ui::Animations::Simple _a_show;
 
+	Ui::BoxShadow _shadow;
 	bool _hiding = false;
 	QPixmap _cache;
 	Ui::Animations::Simple _a_opacity;
diff --git a/Telegram/SourceFiles/ui/image/image_location.cpp b/Telegram/SourceFiles/ui/image/image_location.cpp
index d1fdde5b64c445..1484a98dda5139 100644
--- a/Telegram/SourceFiles/ui/image/image_location.cpp
+++ b/Telegram/SourceFiles/ui/image/image_location.cpp
@@ -172,6 +172,8 @@ StorageFileLocation::StorageFileLocation(
 		data.vcall().match([&](const MTPDinputGroupCall &data) {
 			_id = data.vid().v;
 			_accessHash = data.vaccess_hash().v;
+		}, [](const auto &data) {
+			Unexpected("slug/msg in inputGroupCallStream.");
 		});
 		_volumeId = data.vtime_ms().v;
 		_localId = data.vscale().v;
diff --git a/Telegram/SourceFiles/ui/image/svg_preview.cpp b/Telegram/SourceFiles/ui/image/svg_preview.cpp
new file mode 100644
index 00000000000000..1e297962d81990
--- /dev/null
+++ b/Telegram/SourceFiles/ui/image/svg_preview.cpp
@@ -0,0 +1,206 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/image/svg_preview.h"
+
+#include "base/debug_log.h"
+
+#include <QtCore/QXmlStreamReader>
+#include <QtGui/QPainter>
+#include <QtSvg/QSvgRenderer>
+
+namespace Ui {
+namespace {
+
+constexpr auto kMaxSvgSize = 1 * 1024 * 1024;
+constexpr auto kMaxDefaultRenderSize = 4096;
+
+[[nodiscard]] bool IsName(const QString &value, const char *name) {
+	return (value.compare(QLatin1String(name), Qt::CaseInsensitive) == 0);
+}
+
+[[nodiscard]] bool IsDisallowedElement(const QString &name) {
+	return IsName(name, "script")
+		|| IsName(name, "foreignObject")
+		|| IsName(name, "iframe")
+		|| IsName(name, "object")
+		|| IsName(name, "embed")
+		|| IsName(name, "audio")
+		|| IsName(name, "video")
+		|| IsName(name, "animate")
+		|| IsName(name, "animateColor")
+		|| IsName(name, "animateMotion")
+		|| IsName(name, "animateTransform")
+		|| IsName(name, "set");
+}
+
+[[nodiscard]] QString TrimAndUnquote(QString value) {
+	value = value.trimmed();
+	if (value.size() < 2) {
+		return value;
+	}
+	const auto first = value.at(0);
+	const auto last = value.at(value.size() - 1);
+	if (((first == QLatin1Char('"')) && (last == QLatin1Char('"')))
+		|| ((first == QLatin1Char('\'')) && (last == QLatin1Char('\'')))) {
+		value = value.mid(1, value.size() - 2).trimmed();
+	}
+	return value;
+}
+
+[[nodiscard]] bool IsAllowedReference(QString value) {
+	value = TrimAndUnquote(value);
+	return !value.isEmpty() && value.startsWith(QLatin1Char('#'));
+}
+
+[[nodiscard]] bool HasDisallowedCss(const QString &text) {
+	if (text.contains(QLatin1String("@import"), Qt::CaseInsensitive)) {
+		return true;
+	}
+	if (text.contains(QLatin1String("@keyframes"), Qt::CaseInsensitive)
+		|| text.contains(QLatin1String("animation"), Qt::CaseInsensitive)) {
+		return true;
+	}
+	auto index = 0;
+	while (true) {
+		index = text.indexOf(
+			QLatin1String("url("),
+			index,
+			Qt::CaseInsensitive);
+		if (index < 0) {
+			return false;
+		}
+		const auto start = index + 4;
+		const auto end = text.indexOf(QLatin1Char(')'), start);
+		if (end < 0) {
+			return true;
+		}
+		if (!IsAllowedReference(text.mid(start, end - start))) {
+			return true;
+		}
+		index = end + 1;
+	}
+}
+
+[[nodiscard]] bool AttributesAreSafe(
+		const QXmlStreamAttributes &attributes) {
+	for (const auto &attribute : attributes) {
+		const auto name = attribute.name().toString();
+		const auto value = attribute.value().toString();
+		if (name.startsWith(QLatin1String("on"), Qt::CaseInsensitive)) {
+			return false;
+		}
+		if (IsName(name, "href") && !IsAllowedReference(value)) {
+			return false;
+		}
+		if (IsName(name, "style") && HasDisallowedCss(value)) {
+			return false;
+		}
+	}
+	return true;
+}
+
+[[nodiscard]] QByteArray SanitizeSvg(const QByteArray &bytes) {
+	auto reader = QXmlStreamReader(bytes);
+	auto hasRoot = false;
+	auto inStyle = 0;
+	while (!reader.atEnd()) {
+		switch (reader.readNext()) {
+		case QXmlStreamReader::StartElement: {
+			const auto name = reader.name().toString();
+			if (!hasRoot) {
+				hasRoot = true;
+				if (!IsName(name, "svg")) {
+					LOG(("Svg Sanitize: Invalid root element."));
+					return {};
+				}
+			}
+			if (IsDisallowedElement(name)
+				|| !AttributesAreSafe(reader.attributes())) {
+				LOG(("Svg Sanitize: Disallowed element or attribute."));
+				return {};
+			}
+			if (IsName(name, "style")) {
+				++inStyle;
+			}
+		} break;
+		case QXmlStreamReader::EndElement: {
+			if ((inStyle > 0) && IsName(reader.name().toString(), "style")) {
+				--inStyle;
+			}
+		} break;
+		case QXmlStreamReader::Characters: {
+			if ((inStyle > 0) && HasDisallowedCss(reader.text().toString())) {
+				LOG(("Svg Sanitize: Disallowed CSS."));
+				return {};
+			}
+		} break;
+		case QXmlStreamReader::DTD:
+		case QXmlStreamReader::EntityReference:
+		case QXmlStreamReader::ProcessingInstruction:
+		case QXmlStreamReader::Invalid:
+			LOG(("Svg Sanitize: Disallowed XML token."));
+			return {};
+		default: break;
+		}
+	}
+	if (reader.hasError() || !hasRoot) {
+		LOG(("Svg Sanitize: Parse error."));
+		return {};
+	}
+	return bytes;
+}
+
+} // namespace
+
+int SvgPreviewBytesLimit() {
+	return kMaxSvgSize;
+}
+
+QImage RenderSvgPreview(const QByteArray &bytes, QSize maxSize) {
+	if (bytes.isEmpty()) {
+		return {};
+	}
+	if (bytes.size() > kMaxSvgSize) {
+		LOG(("Svg Error: File too large (%1 bytes).").arg(bytes.size()));
+		return {};
+	}
+	const auto sanitized = SanitizeSvg(bytes);
+	if (sanitized.isEmpty()) {
+		return {};
+	}
+	auto renderer = QSvgRenderer();
+	if (!renderer.load(sanitized) || !renderer.isValid()) {
+		LOG(("Svg Error: Invalid data."));
+		return {};
+	}
+	auto size = renderer.defaultSize();
+	if (!maxSize.isEmpty()) {
+		size = size.scaled(maxSize, Qt::KeepAspectRatio);
+	} else if ((size.width() > kMaxDefaultRenderSize)
+		|| (size.height() > kMaxDefaultRenderSize)) {
+		size = size.scaled(
+			kMaxDefaultRenderSize,
+			kMaxDefaultRenderSize,
+			Qt::KeepAspectRatio);
+	}
+	if ((size.width() <= 0) || (size.height() <= 0)) {
+		LOG(("Svg Error: Bad size %1x%2."
+			).arg(renderer.defaultSize().width()
+			).arg(renderer.defaultSize().height()));
+		return {};
+	}
+	auto rendered = QImage(size, QImage::Format_ARGB32_Premultiplied);
+	rendered.fill(Qt::transparent);
+	{
+		QPainter p(&rendered);
+		renderer.render(&p, QRect(QPoint(), size));
+	}
+	return rendered;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/image/svg_preview.h b/Telegram/SourceFiles/ui/image/svg_preview.h
new file mode 100644
index 00000000000000..339efe5d7d6a63
--- /dev/null
+++ b/Telegram/SourceFiles/ui/image/svg_preview.h
@@ -0,0 +1,21 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include <QtCore/QByteArray>
+#include <QtCore/QSize>
+#include <QtGui/QImage>
+
+namespace Ui {
+
+[[nodiscard]] int SvgPreviewBytesLimit();
+[[nodiscard]] QImage RenderSvgPreview(
+	const QByteArray &bytes,
+	QSize maxSize);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/item_text_options.cpp b/Telegram/SourceFiles/ui/item_text_options.cpp
index 57ccc44c5f6520..eec63d2be0577b 100644
--- a/Telegram/SourceFiles/ui/item_text_options.cpp
+++ b/Telegram/SourceFiles/ui/item_text_options.cpp
@@ -24,11 +24,11 @@ bool UseBotTextOptions(
 			return true;
 		}
 	} else if (const auto chat = history->peer->asChat()) {
-		if (chat->botStatus >= 0) {
+		if (chat->botStatus != Data::BotStatus::NoBots) {
 			return true;
 		}
 	} else if (const auto group = history->peer->asMegagroup()) {
-		if (group->mgInfo->botStatus >= 0) {
+		if (group->mgInfo->botStatus != Data::BotStatus::NoBots) {
 			return true;
 		}
 	}
diff --git a/Telegram/SourceFiles/ui/layers/standalone_layer_stack.cpp b/Telegram/SourceFiles/ui/layers/standalone_layer_stack.cpp
new file mode 100644
index 00000000000000..0bec21d4a3bdab
--- /dev/null
+++ b/Telegram/SourceFiles/ui/layers/standalone_layer_stack.cpp
@@ -0,0 +1,223 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/layers/standalone_layer_stack.h"
+
+#include "base/event_filter.h"
+#include "ui/layers/box_content.h"
+#include "ui/layers/box_layer_widget.h"
+#include "ui/layers/show.h"
+#include "ui/widgets/separate_panel.h"
+#include "base/debug_log.h"
+#include "styles/style_layers.h"
+
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
+
+namespace Ui {
+namespace {
+
+class StandaloneShow final : public Show {
+public:
+	explicit StandaloneShow(base::weak_ptr<StandaloneLayerStack> weak);
+
+	void showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<BoxContent>,
+			std::unique_ptr<LayerWidget>> &&layer,
+		LayerOptions options,
+		anim::type animated) const override;
+	[[nodiscard]] not_null<QWidget*> toastParent() const override;
+	[[nodiscard]] bool valid() const override;
+	operator bool() const override;
+
+private:
+	const base::weak_ptr<StandaloneLayerStack> _stack;
+
+};
+
+StandaloneShow::StandaloneShow(base::weak_ptr<StandaloneLayerStack> weak)
+: _stack(std::move(weak)) {
+}
+
+void StandaloneShow::showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<BoxContent>,
+			std::unique_ptr<LayerWidget>> &&layer,
+		LayerOptions options,
+		anim::type animated) const {
+	using UniqueLayer = std::unique_ptr<LayerWidget>;
+	using ObjectBox = object_ptr<BoxContent>;
+	const auto stack = _stack.get();
+	if (!stack) {
+		return;
+	}
+	if (auto box = std::get_if<ObjectBox>(&layer)) {
+		stack->showBox(std::move(*box), options, animated);
+	} else if (std::get_if<UniqueLayer>(&layer)) {
+		LOG(("StandaloneLayerStack: showLayer(LayerWidget) "
+			"is not supported, ignoring."));
+	} else {
+		stack->hideLayers(animated);
+	}
+}
+
+not_null<QWidget*> StandaloneShow::toastParent() const {
+	const auto stack = _stack.get();
+	const auto parent = stack ? stack->currentPanel() : nullptr;
+	Ensures(parent != nullptr);
+	return parent;
+}
+
+bool StandaloneShow::valid() const {
+	return (_stack.get() != nullptr);
+}
+
+StandaloneShow::operator bool() const {
+	return valid();
+}
+
+} // namespace
+
+StandaloneLayerStack::StandaloneLayerStack() = default;
+
+StandaloneLayerStack::~StandaloneLayerStack() {
+	for (auto &entry : base::take(_entries)) {
+		if (entry.box) {
+			entry.box->setClosing();
+		}
+	}
+}
+
+void StandaloneLayerStack::showBox(
+		object_ptr<BoxContent> box,
+		LayerOptions options,
+		anim::type animated) {
+	if (options & LayerOption::CloseOther) {
+		hideLayers(anim::type::instant);
+	} else if (!_entries.empty()) {
+		_entries.back().panel->hideForStacking();
+	}
+	auto panel = base::make_unique_q<SeparatePanel>(SeparatePanelArgs{
+		.anchorGeometry = _anchorGeometry,
+		.transientParent = _transientParent,
+	});
+	panel->setWindowFlag(Qt::WindowStaysOnTopHint, false);
+	panel->setAttribute(Qt::WA_DeleteOnClose, false);
+	panel->setTitleHeight(0);
+	panel->setCloseAllowed(false);
+
+	const auto rawPanel = panel.get();
+	auto layerWidget = base::make_unique_q<BoxLayerWidget>(
+		rawPanel,
+		this,
+		std::move(box));
+	const auto rawBox = layerWidget.get();
+
+	rawPanel->setInnerSize(rawBox->size().isEmpty()
+		? QSize(st::boxWideWidth, 1)
+		: rawBox->size());
+
+	rawBox->sizeValue(
+	) | rpl::on_next([rawPanel](QSize size) {
+		if (!size.isEmpty()) {
+			rawPanel->setInnerSize(size);
+		}
+	}, rawBox->lifetime());
+
+	rawBox->setClosedCallback([=] {
+		closeEntry(rawPanel);
+	});
+	rawPanel->closeRequests(
+	) | rpl::on_next([=] {
+		closeEntry(rawPanel);
+	}, rawPanel->lifetime());
+	rawPanel->closeEvents(
+	) | rpl::on_next([=] {
+		closeEntry(rawPanel);
+	}, rawPanel->lifetime());
+
+	rawPanel->showInner(std::move(layerWidget));
+	rawPanel->showAndActivate();
+
+	_entries.push_back({ std::move(panel), rawBox });
+	_boxAdded.fire({});
+}
+
+void StandaloneLayerStack::hideLayers(anim::type animated) {
+	auto taken = base::take(_entries);
+	for (auto &entry : taken) {
+		if (entry.box) {
+			entry.box->setClosing();
+		}
+		entry.panel->hideGetDuration();
+		_boxClosed.fire({});
+	}
+}
+
+void StandaloneLayerStack::setAnchor(
+		std::optional<QRect> geometry,
+		std::optional<QSize> outerSize,
+		Platform::ForeignParent transientParent) {
+	_anchorGeometry = std::move(geometry);
+	_anchorOuterSize = std::move(outerSize);
+	_transientParent = std::move(transientParent);
+	for (const auto &entry : _entries) {
+		entry.panel->setAnchorData(_anchorGeometry, _transientParent);
+	}
+}
+
+ShowFactory StandaloneLayerStack::showFactory() {
+	const auto weak = base::make_weak(this);
+	return [weak]() -> ShowPtr {
+		return std::make_shared<StandaloneShow>(weak);
+	};
+}
+
+std::optional<QSize> StandaloneLayerStack::layerOuterSize() {
+	if (_anchorOuterSize) {
+		return _anchorOuterSize;
+	}
+	if (_anchorGeometry) {
+		return _anchorGeometry->size();
+	}
+	if (const auto screen = QGuiApplication::primaryScreen()) {
+		return screen->availableGeometry().size();
+	}
+	return std::nullopt;
+}
+
+QWidget *StandaloneLayerStack::currentPanel() const {
+	return _entries.empty() ? nullptr : _entries.back().panel.get();
+}
+
+void StandaloneLayerStack::closeEntry(SeparatePanel *panel) {
+	const auto i = ranges::find_if(_entries, [&](const Entry &entry) {
+		return entry.panel.get() == panel;
+	});
+	if (i == end(_entries)) {
+		return;
+	}
+	const auto wasTop = (i + 1 == end(_entries));
+	auto entry = std::move(*i);
+	_entries.erase(i);
+	if (entry.box) {
+		entry.box->setClosing();
+	}
+	entry.panel->hideGetDuration();
+	_boxClosed.fire({});
+	if (wasTop && !_entries.empty()) {
+		_entries.back().panel->setAnchorData(
+			_anchorGeometry,
+			_transientParent);
+		_entries.back().panel->showAndActivate();
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/layers/standalone_layer_stack.h b/Telegram/SourceFiles/ui/layers/standalone_layer_stack.h
new file mode 100644
index 00000000000000..2f61b988341c3c
--- /dev/null
+++ b/Telegram/SourceFiles/ui/layers/standalone_layer_stack.h
@@ -0,0 +1,89 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/object_ptr.h"
+#include "base/unique_qptr.h"
+#include "base/weak_ptr.h"
+#include "ui/platform/ui_platform_utility.h"
+#include "ui/layers/layer_widget.h"
+
+#include <QtCore/QRect>
+#include <QtCore/QSize>
+
+#include <optional>
+#include <vector>
+
+namespace anim {
+enum class type : uchar;
+} // namespace anim
+
+namespace Ui {
+
+class BoxContent;
+class BoxLayerWidget;
+class SeparatePanel;
+
+// Shows each BoxContent in its own top-level frameless SeparatePanel,
+// using BoxLayerWidget as the panel body. Behaves like a layer stack:
+// each new box hides the previous one, closing a box reveals the box
+// shown before it.
+class StandaloneLayerStack final
+	: public LayerStackDelegate
+	, public base::has_weak_ptr {
+public:
+	StandaloneLayerStack();
+	~StandaloneLayerStack();
+
+	void showBox(
+		object_ptr<BoxContent> box,
+		LayerOptions options,
+		anim::type animated) override;
+	void hideLayers(anim::type animated) override;
+	void setAnchor(
+		std::optional<QRect> geometry,
+		std::optional<QSize> outerSize,
+		Platform::ForeignParent transientParent);
+	ShowFactory showFactory() override;
+	std::optional<QSize> layerOuterSize() override;
+	bool centerWithinOuter() override {
+		return false;
+	}
+	bool dragByTitle() override {
+		return true;
+	}
+
+	// Top (currently visible) panel, if any. Used as toast parent.
+	[[nodiscard]] QWidget *currentPanel() const;
+
+	[[nodiscard]] rpl::producer<> boxAdded() const {
+		return _boxAdded.events();
+	}
+	[[nodiscard]] rpl::producer<> boxClosed() const {
+		return _boxClosed.events();
+	}
+
+private:
+	struct Entry {
+		base::unique_qptr<SeparatePanel> panel;
+		BoxLayerWidget *box = nullptr;
+	};
+
+	void closeEntry(SeparatePanel *panel);
+	void hideAllPanels();
+
+	std::vector<Entry> _entries;
+	std::optional<QRect> _anchorGeometry;
+	std::optional<QSize> _anchorOuterSize;
+	Platform::ForeignParent _transientParent;
+	rpl::event_stream<> _boxAdded;
+	rpl::event_stream<> _boxClosed;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 80a9ed4ad6a993..b30b62a5a177ad 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -12,6 +12,7 @@ menuIconReactions: icon {{ "menu/read_reactions", menuIconColor }};
 menuIconReply: icon {{ "menu/reply", menuIconColor }};
 menuIconViewReplies: icon {{ "menu/view_replies", menuIconColor }};
 menuIconEdit: icon {{ "menu/edit", menuIconColor }};
+menuIconDraw: icon {{ "mediaview/draw", menuIconColor, point(2px, 3px) }};
 menuIconPin: icon {{ "menu/pin", menuIconColor }};
 menuIconUnpin: icon {{ "menu/unpin", menuIconColor }};
 menuIconCopy: icon {{ "menu/copy", menuIconColor }};
@@ -23,6 +24,8 @@ menuIconStickers: icon {{ "menu/stickers", menuIconColor }};
 menuIconEmoji: icon {{ "menu/emoji", menuIconColor }};
 menuIconCancel: icon {{ "menu/cancel", menuIconColor }};
 menuIconShowInChat: icon {{ "menu/show_in_chat", menuIconColor }};
+menuIconStealth: icon {{ "menu/stealth", menuIconColor }};
+menuIconStealthLocked: icon {{ "menu/stealth_locked", menuIconColor }};
 menuIconGif: icon {{ "menu/gif", menuIconColor }};
 menuIconShowInFolder: icon {{ "menu/show_in_folder", menuIconColor }};
 menuIconDownload: icon {{ "menu/download", menuIconColor }};
@@ -41,7 +44,10 @@ menuIconAdmin: icon {{ "menu/admin", menuIconColor }};
 menuIconRemove: icon {{ "menu/remove", menuIconColor }};
 menuIconRetractVote: icon {{ "menu/retract_vote", menuIconColor }};
 menuIconPermissions: icon {{ "menu/permissions", menuIconColor }};
+menuIcon2SV: icon {{ "menu/2sv_on", menuIconColor }};
+//menuIconOff2SV: icon {{ "menu/2sv_off", menuIconColor }};
 menuIconShare: icon {{ "menu/share", menuIconColor }};
+menuIconSharing: icon {{ "menu/share2", menuIconColor }};
 menuIconArchive: icon {{ "menu/archive", menuIconColor }};
 menuIconUnarchive: icon {{ "menu/unarchive", menuIconColor }};
 menuIconMarkRead: icon {{ "menu/read", menuIconColor }};
@@ -54,10 +60,17 @@ menuIconDiscussion: icon {{ "menu/discussion", menuIconColor }};
 menuIconStats: icon {{ "menu/stats", menuIconColor }};
 menuIconBoosts: icon {{ "menu/boosts", menuIconColor }};
 menuIconEarn: icon {{ "menu/earn", menuIconColor }};
+menuIconCancelFee: icon {{ "menu/cancel_fee", menuIconColor }};
 menuIconCreatePoll: icon {{ "menu/create_poll", menuIconColor }};
+menuIconCreateTodoList: icon {{ "menu/select", menuIconColor }};
+/*
+menuIconArticle: icon {{ "/menu/article_rich-24x24", menuIconColor }};
+*/
 menuIconQrCode: icon {{ "menu/qr_code", menuIconColor }};
 menuIconExpand: icon {{ "menu/expand", menuIconColor }};
 menuIconCollapse: icon {{ "menu/collapse", menuIconColor }};
+menuIconZoomIn: icon {{ "/menu/zoom_in-24x24", menuIconColor }};
+menuIconZoomOut: icon {{ "/menu/zoom_out-24x24", menuIconColor }};
 menuIconToMainMenu: icon {{ "menu/move_to_menu", menuIconColor }};
 menuIconFromMainMenu: icon {{ "menu/move_from_menu", menuIconColor }};
 menuIconAddAccount: icon {{ "menu/add_account", menuIconColor }};
@@ -66,7 +79,6 @@ menuIconUnmute: icon {{ "menu/unmute", menuIconColor }};
 menuIconSchedule: icon {{ "menu/calendar", menuIconColor }};
 menuIconReschedule: icon {{ "menu/reschedule", menuIconColor }};
 menuIconSend: icon {{ "menu/send", menuIconColor }};
-menuIconFlip: icon {{ "menu/flip", menuIconColor }};
 menuIconWhenOnline: icon {{ "menu/send_when_online", menuIconColor }};
 menuIconPalette: icon {{ "menu/palette", menuIconColor }};
 menuIconImportTheme: icon {{ "menu/import_theme", menuIconColor }};
@@ -98,8 +110,7 @@ menuIconVideoChat: icon {{ "menu/video_chat", menuIconColor }};
 menuIconTranslate: icon {{ "menu/translate", menuIconColor }};
 menuIconReportAntiSpam: icon {{ "menu/false_positive", menuIconColor }};
 menuIconSpoiler: icon {{ "menu/spoiler_on", menuIconColor }};
-menuIconSpoilerOff: icon {{ "menu/spoiler_off", menuIconColor }};
-menuIconDisable: icon {{ "menu/disable", menuIconColor }};
+menuIconQualityHigh: icon {{ "menu/quality_hd", menuIconColor }};
 menuIconPhotoSet: icon {{ "menu/photo_set", menuIconColor }};
 menuIconPhotoSuggest: icon {{ "menu/photo_suggest", menuIconColor }};
 menuIconNewWindow: icon {{ "menu/new_window", menuIconColor }};
@@ -132,11 +143,11 @@ menuIconTopics: icon {{ "menu/topics", menuIconColor }};
 menuIconGroupReactions: icon {{ "menu/group_reactions", menuIconColor }};
 menuIconLinks: icon {{ "menu/links_profile", menuIconColor }};
 menuIconGroupLog: icon {{ "menu/group_log", menuIconColor }};
-menuIconGroupCreate: icon {{ "menu/groups_create", menuIconColor }};
 menuIconSigned: icon {{ "menu/signed", menuIconColor }};
 menuIconAntispam: icon {{ "menu/antispam", menuIconColor }};
 menuIconChatDiscuss: icon {{ "menu/chat_discuss", menuIconColor }};
 menuIconChats: icon {{ "menu/chats", menuIconColor }};
+menuIconBot: icon {{ "menu/bot", menuIconColor }};
 menuIconBotCommands: icon {{ "menu/bot_commands", menuIconColor }};
 menuIconPremium: icon {{ "menu/premium", menuIconColor }};
 menuIconShop: icon {{ "menu/shop", menuIconColor }};
@@ -146,12 +157,25 @@ menuIconShowAll: icon {{ "menu/all_media", menuIconColor }};
 menuIconReplace: icon {{ "chat/input_replace", menuIconColor }};
 menuIconAbove: icon {{ "menu/link_above", menuIconColor }};
 menuIconBelow: icon {{ "menu/link_below", menuIconColor }};
+menuIconTableColumnLeft: icon {{ "mini_forward-flip_horizontal", menuIconColor }};
+menuIconTableColumnRight: icon {{ "mini_forward", menuIconColor }};
+menuIconTableSubmenuRowAbove: menuIconAbove;
+menuIconTableSubmenuRowBelow: menuIconBelow;
+menuIconTableSubmenuColumnLeft: menuIconTableColumnLeft;
+menuIconTableSubmenuColumnRight: menuIconTableColumnRight;
+menuIconTableSubmenuDelete: menuIconDelete;
 menuIconEnlarge: icon {{ "menu/link_enlarge", menuIconColor }};
 menuIconShrink: icon {{ "menu/link_shrink", menuIconColor }};
+menuIconUserShow: icon {{ "menu/name_show", menuIconColor }};
+menuIconUserHide: icon {{ "menu/name_hide", menuIconColor }};
+menuIconCaptionShow: icon {{ "menu/caption_show", menuIconColor }};
+menuIconCaptionHide: icon {{ "menu/caption_hide", menuIconColor }};
 menuIconAsTopics: icon {{ "menu/mode_topics", menuIconColor }};
 menuIconAsMessages: icon {{ "menu/mode_messages", menuIconColor }};
 menuIconTagFilter: icon{{ "menu/tag_filter", menuIconColor }};
 menuIconTagRename: icon{{ "menu/tag_rename", menuIconColor }};
+menuIconTagRemove: icon {{ "menu/tag_remove", menuIconColor }};
+menuIconTagSell: icon {{ "menu/tag_sell", menuIconColor }};
 menuIconGroupsHide: icon {{ "menu/hide_members", menuIconColor }};
 menuIconFont: icon {{ "menu/fonts", menuIconColor }};
 menuIconFactcheck: icon {{ "menu/factcheck", menuIconColor }};
@@ -159,6 +183,41 @@ menuIconWinHello: icon {{ "menu/passcode_winhello", menuIconColor }};
 menuIconTouchID: icon {{ "menu/passcode_finger", menuIconColor }};
 menuIconAppleWatch: icon {{ "menu/passcode_watch", menuIconColor }};
 menuIconSystemPwd: menuIconPermissions;
+menuIconStarRefShare: icon {{ "menu/stars_share", menuIconColor }};
+menuIconStarRefLink: icon {{ "settings/premium/features/feature_links2", menuIconColor }};
+menuIconTransparent: icon {{ "menu/affiliate_transparent", menuIconColor }};
+menuIconLike: icon {{ "menu/affiliate_simple", menuIconColor }};
+menuIconTradable: icon {{ "menu/tradable", menuIconColor }};
+menuIconUnique: icon {{ "menu/unique", menuIconColor }};
+menuIconUniqueProfile: icon {{ "settings/premium/features/feature_profile_cover", menuIconColor }};
+menuIconNftWear: icon {{ "menu/nft_wear", menuIconColor }};
+menuIconNftTakeOff: icon {{ "menu/nft_takeoff", menuIconColor }};
+menuIconShortcut: icon {{ "menu/shortcut", menuIconColor }};
+menuIconHourglass: icon {{ "menu/hourglass", menuIconColor }};
+menuIconPayment: icon {{ "payments/payment_card", menuIconColor }};
+menuIconOrderPrice: icon {{ "menu/order_price", menuIconColor }};
+menuIconOrderDate: icon {{ "menu/order_date", menuIconColor }};
+menuIconOrderNumber: icon {{ "menu/order_number", menuIconColor }};
+menuIconAdd: icon {{ "menu/add", menuIconColor }};
+menuIconStickerCreate: icon {{ "menu/sticker_add", menuIconColor }};
+menuIconStickerAdd: icon {{ "menu/sticker_select", menuIconColor }};
+menuIconRatingGifts: icon {{ "menu/rating_gifts-24x24", menuIconColor }};
+menuIconRatingUsers: icon {{ "menu/users_stars-24x24", menuIconColor }};
+menuIconRatingRefund: icon {{ "menu/rating_refund-24x24", menuIconColor }};
+menuIconAuctionDrop: icon {{ "menu/auction_drop", menuIconColor }};
+menuIconStarsRefund: icon {{ "menu/auction_refund", menuIconColor }};
+menuIconStarsCarryover: icon {{ "menu/auction_carry", menuIconColor }};
+menuIconTon: icon{{ "payments/ton_emoji-18x18", windowActiveTextFg, point(3px, 2px) }};
+menuIconReorder: icon{{ "menu/reorder-24x24", menuIconColor }};
+menuIconCraftTraits: icon{{ "menu/craft_random-24x24", menuIconColor }};
+menuIconCraftChance: icon{{ "menu/craft_chance-24x24", menuIconColor }};
+menuIconCraft: icon{{ "menu/craft_start-24x24", menuIconColor }};
+menuIconTagAdd: icon{{ "menu/tag_add-24x24", menuIconColor }};
+menuIconTagEdit: icon{{ "menu/tag_edit-24x24", menuIconColor }};
+menuIconDownloadOff: icon {{ "menu/download_off-24x24", menuIconColor }};
+menuIconShareOff: icon {{ "menu/share_off-24x24", menuIconColor }};
+menuIconShareOn: icon {{ "menu/share_on-24x24", menuIconColor }};
+menuIconStar: icon {{ "menu/star", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);
@@ -174,15 +233,18 @@ menuBlueIconColorNames: icon{{ "settings/premium/features/feature_color_names",
 menuBlueIconWallpaper: icon{{ "settings/premium/features/feature_wallpaper", lightButtonFg }};
 menuBlueIconEmojiStatus: icon{{ "settings/premium/features/feature_status", lightButtonFg }};
 menuBlueIconEmojiPack: icon{{ "settings/premium/features/feature_emoji_pack", lightButtonFg }};
+menuBlueIconGroupCreate: icon {{ "menu/groups_create", lightButtonFg }};
 
 mediaMenuIconStickers: icon {{ "menu/stickers", mediaviewMenuFg }};
 mediaMenuIconCancel: icon {{ "menu/cancel", mediaviewMenuFg }};
+mediaMenuIconChannel: icon {{ "menu/channel", mediaviewMenuFg }};
 mediaMenuIconShowInChat: icon {{ "menu/show_in_chat", mediaviewMenuFg }};
 mediaMenuIconShowInFolder: icon {{ "menu/show_in_folder", mediaviewMenuFg }};
 mediaMenuIconDownload: icon {{ "menu/download", mediaviewMenuFg }};
 mediaMenuIconDownloadLocked: icon {{ "menu/download_locked", mediaviewMenuFg }};
 mediaMenuIconCopy: icon {{ "menu/copy", mediaviewMenuFg }};
 mediaMenuIconForward: icon {{ "menu/forward", mediaviewMenuFg }};
+mediaMenuIconShare: icon {{ "menu/share2", mediaviewMenuFg }};
 mediaMenuIconDelete: icon {{ "menu/delete", mediaviewMenuFg }};
 mediaMenuIconShowAll: icon {{ "menu/all_media", mediaviewMenuFg }};
 mediaMenuIconProfile: icon {{ "menu/profile", mediaviewMenuFg }};
@@ -192,10 +254,18 @@ mediaMenuIconArchiveStory: icon {{ "menu/stories_archive", mediaviewMenuFg }};
 mediaMenuIconStealthLocked: icon {{ "menu/stealth_locked", mediaviewMenuFg }};
 mediaMenuIconStealth: icon {{ "menu/stealth", mediaviewMenuFg }};
 mediaMenuIconStats: icon {{ "menu/stats", mediaviewMenuFg }};
+mediaMenuIconRemove: icon {{ "menu/remove", mediaviewMenuFg }};
+mediaMenuIconRetractVote: icon {{ "menu/retract_vote", mediaviewMenuFg }};
+mediaMenuIconStar: icon {{ "menu/star", mediaviewMenuFg }};
 
 mediaMenuIconInfo: icon {{ "menu/info", mediaviewMenuFg }};
 mediaMenuIconBlock: icon {{ "menu/block", mediaviewMenuFg }};
 
+mediaMenuIconFlip: icon {{ "menu/flip", mediaviewMenuFg }};
+mediaMenuIconTextStylePlain: icon {{ "menu/text_style_plain-22x22", mediaviewMenuFg, point(0px, 2px) }};
+mediaMenuIconTextStyleFramed: icon {{ "menu/text_style_framed-22x22", mediaviewMenuFg, point(0px, 2px) }};
+mediaMenuIconTextStyleSemiTransparent: icon {{ "menu/text_style_semi-22x22", mediaviewMenuFg, point(0px, 2px) }};
+
 menuIconDeleteAttention: icon {{ "menu/delete", menuIconAttentionColor }};
 menuIconLeaveAttention: icon {{ "menu/leave", menuIconAttentionColor }};
 menuIconDisableAttention: icon {{ "menu/disable", menuIconAttentionColor }};
@@ -204,9 +274,10 @@ menuIconRestoreAttention: icon {{ "menu/restore", menuIconAttentionColor }};
 menuIconTagRemoveAttention: icon {{ "menu/tag_remove", menuIconAttentionColor }};
 menuIconCancelAttention: icon {{ "menu/cancel", menuIconAttentionColor }};
 menuIconBlockAttention: icon {{ "menu/block", menuIconAttentionColor }};
+menuIconRemoveAttention: icon {{ "menu/remove", menuIconAttentionColor }};
 
 menuIconBlockSettings: icon {{ "menu/block", windowBgActive }};
-menuIconInviteSettings: icon {{ "menu/invite", windowBgActive }};
+menuIconInviteSettings: icon {{ "menu/invite", lightButtonFg }};
 
 playerSpeedSlow: icon {{ "player/speed/audiospeed_menu_0.5", menuIconColor }};
 playerSpeedSlowActive: icon {{ "player/speed/audiospeed_menu_0.5", mediaPlayerActiveFg }};
diff --git a/Telegram/SourceFiles/ui/new_badges.cpp b/Telegram/SourceFiles/ui/new_badges.cpp
index aa1cadafa36665..59e8697eb95812 100644
--- a/Telegram/SourceFiles/ui/new_badges.cpp
+++ b/Telegram/SourceFiles/ui/new_badges.cpp
@@ -14,9 +14,8 @@ For license and copyright information please follow this link:
 #include "styles/style_settings.h"
 
 namespace Ui::NewBadge {
-namespace {
 
-[[nodiscard]] not_null<Ui::RpWidget*> CreateNewBadge(
+not_null<Ui::RpWidget*> CreateNewBadge(
 		not_null<Ui::RpWidget*> parent,
 		rpl::producer<QString> text) {
 	const auto badge = Ui::CreateChild<Ui::PaddingWrap<Ui::FlatLabel>>(
@@ -26,8 +25,9 @@ namespace {
 			std::move(text),
 			st::settingsPremiumNewBadge),
 		st::settingsPremiumNewBadgePadding);
+	badge->show();
 	badge->setAttribute(Qt::WA_TransparentForMouseEvents);
-	badge->paintRequest() | rpl::start_with_next([=] {
+	badge->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(badge);
 		auto hq = PainterHighQualityEnabler(p);
 		p.setPen(Qt::NoPen);
@@ -38,13 +38,11 @@ namespace {
 	return badge;
 }
 
-} // namespace
-
 void AddToRight(not_null<Ui::RpWidget*> parent) {
 	const auto badge = CreateNewBadge(parent, tr::lng_bot_side_menu_new());
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		badge->moveToRight(
 			st::mainMenuButton.padding.right(),
 			(size.height() - badge->height()) / 2,
@@ -60,7 +58,7 @@ void AddAfterLabel(
 		tr::lng_premium_summary_new_badge());
 
 	label->geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
+	) | rpl::on_next([=](QRect geometry) {
 		badge->move(st::settingsPremiumNewBadgePosition
 			+ QPoint(label->x() + label->width(), label->y()));
 	}, badge->lifetime());
diff --git a/Telegram/SourceFiles/ui/new_badges.h b/Telegram/SourceFiles/ui/new_badges.h
index 0d2161251f657e..d1f99a21e1754b 100644
--- a/Telegram/SourceFiles/ui/new_badges.h
+++ b/Telegram/SourceFiles/ui/new_badges.h
@@ -13,6 +13,10 @@ class RpWidget;
 
 namespace Ui::NewBadge {
 
+[[nodiscard]] not_null<Ui::RpWidget*> CreateNewBadge(
+	not_null<Ui::RpWidget*> parent,
+	rpl::producer<QString> text);
+
 void AddToRight(not_null<Ui::RpWidget*> parent);
 void AddAfterLabel(
 	not_null<Ui::RpWidget*> parent,
diff --git a/Telegram/SourceFiles/ui/peer/color_sample.cpp b/Telegram/SourceFiles/ui/peer/color_sample.cpp
new file mode 100644
index 00000000000000..d11ac016c6e318
--- /dev/null
+++ b/Telegram/SourceFiles/ui/peer/color_sample.cpp
@@ -0,0 +1,458 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/peer/color_sample.h"
+
+#include "base/algorithm.h"
+#include "ui/chat/chat_style.h"
+#include "ui/color_contrast.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "styles/style_settings.h"
+
+#include <QtMath>
+
+namespace Ui {
+namespace {
+
+constexpr auto kSelectAnimationDuration = crl::time(150);
+constexpr auto kProfileColorIndexCount = uint8(8);
+
+} // namespace
+
+ColorSample::ColorSample(
+	not_null<QWidget*> parent,
+	Fn<Ui::Text::MarkedContext()> contextProvider,
+	Fn<TextWithEntities(uint64)> emojiProvider,
+	std::shared_ptr<Ui::ChatStyle> style,
+	rpl::producer<uint8> colorIndex,
+	rpl::producer<std::shared_ptr<Ui::ColorCollectible>> collectible,
+	rpl::producer<QString> name)
+: AbstractButton(parent)
+, _style(style) {
+	rpl::combine(
+		std::move(colorIndex),
+		std::move(collectible),
+		std::move(name)
+	) | rpl::on_next([=](
+			uint8 index,
+			std::shared_ptr<Ui::ColorCollectible> collectible,
+			const QString &nameValue) {
+		_index = index;
+		_collectible = std::move(collectible);
+		if (const auto raw = _collectible.get()) {
+			auto context = contextProvider();
+			context.repaint = [=] { update(); };
+			_name.setMarkedText(
+				st::semiboldTextStyle,
+				emojiProvider(raw->giftEmojiId),
+				kMarkupTextOptions,
+				std::move(context));
+		} else {
+			_name.setText(st::semiboldTextStyle, nameValue);
+		}
+		setNaturalWidth([&] {
+			if (_name.isEmpty() || _style->colorPatternIndex(_index)) {
+				return st::settingsColorSampleSize;
+			}
+			const auto padding = st::settingsColorSamplePadding;
+			return std::max(
+				padding.left() + _name.maxWidth() + padding.right(),
+				padding.top() + st::semiboldFont->height + padding.bottom());
+		}());
+		update();
+	}, lifetime());
+}
+
+ColorSample::ColorSample(
+	not_null<QWidget*> parent,
+	std::shared_ptr<Ui::ChatStyle> style,
+	uint8 colorIndex,
+	bool selected)
+: AbstractButton(parent)
+, _style(style)
+, _index(colorIndex)
+, _selected(selected)
+, _simple(true) {
+	setNaturalWidth(st::settingsColorSampleSize);
+}
+
+ColorSample::ColorSample(
+	not_null<QWidget*> parent,
+	Fn<Data::ColorProfileSet(uint8)> profileProvider,
+	uint8 colorIndex,
+	bool selected)
+: AbstractButton(parent)
+, _index(colorIndex)
+, _selected(selected)
+, _simple(true)
+, _profileProvider(std::move(profileProvider)) {
+	setNaturalWidth(st::settingsColorSampleSize);
+}
+
+void ColorSample::setSelected(bool selected) {
+	if (_selected == selected) {
+		return;
+	}
+	_selected = selected;
+	_selectAnimation.start(
+		[=] { update(); },
+		_selected ? 0. : 1.,
+		_selected ? 1. : 0.,
+		kSelectAnimationDuration);
+}
+
+void ColorSample::paintEvent(QPaintEvent *e) {
+	auto p = Painter(this);
+	auto hq = PainterHighQualityEnabler(p);
+
+	if (_profileProvider) {
+		const auto size = float64(width());
+		const auto half = size / 2.;
+		const auto full = QRectF(-half, -half, size, size);
+		p.translate(size / 2., size / 2.);
+		p.setPen(Qt::NoPen);
+
+		const auto profile = _profileProvider(_index);
+		if (!profile.palette.empty()) {
+			if (profile.palette.size() == 2) {
+				p.rotate(-45.);
+				p.setClipRect(-size, 0, 3 * size, size);
+				p.setBrush(profile.palette[1]);
+				p.drawEllipse(full);
+				p.setClipRect(-size, -size, 3 * size, size);
+			}
+			p.setBrush(profile.palette[0]);
+			p.drawEllipse(full);
+		}
+		p.setClipping(false);
+
+		const auto selected = _selectAnimation.value(_selected ? 1. : 0.);
+		if (selected > 0) {
+			const auto line = st::settingsColorRadioStroke * 1.;
+			const auto thickness = selected * line;
+			const auto skip = 1.5 * line;
+			const auto rect = full - Margins(skip);
+			if (_selectionCutout) {
+				p.save();
+				p.setCompositionMode(QPainter::CompositionMode_Clear);
+				auto pen = QPen(Qt::transparent, thickness);
+				p.setBrush(Qt::NoBrush);
+				p.setPen(pen);
+				p.drawEllipse(rect);
+				p.restore();
+			} else {
+				auto pen = st::boxBg->p;
+				pen.setWidthF(thickness);
+				p.setBrush(Qt::NoBrush);
+				p.setPen(pen);
+				p.drawEllipse(rect);
+			}
+		}
+		return;
+	}
+
+	const auto colors = _style->coloredValues(false, _index);
+	if (!_forceCircle && !_simple && !colors.outlines[1].alpha()) {
+		const auto radius = height() / 2;
+		p.setPen(Qt::NoPen);
+		if (const auto raw = _collectible.get()) {
+			const auto withBg = [&](const QColor &color) {
+				return Ui::CountContrast(st::windowBg->c, color);
+			};
+			const auto dark = (withBg({ 0, 0, 0 })
+				< withBg({ 255, 255, 255 }));
+			const auto name = (dark && raw->darkAccentColor.alpha() > 0)
+				? raw->darkAccentColor
+				: raw->accentColor;
+			auto bg = name;
+			bg.setAlpha(0.12 * 255);
+			p.setBrush(bg);
+		} else {
+			p.setBrush(colors.bg);
+		}
+		p.drawRoundedRect(rect(), radius, radius);
+
+		const auto padding = st::settingsColorSamplePadding;
+		p.setPen(colors.name);
+		p.setBrush(Qt::NoBrush);
+		p.setFont(st::semiboldFont);
+		_name.drawLeftElided(
+			p,
+			padding.left(),
+			padding.top(),
+			width() - padding.left() - padding.right(),
+			width(),
+			1,
+			style::al_top);
+	} else {
+		const auto size = float64(width());
+		const auto half = size / 2.;
+		const auto full = QRectF(-half, -half, size, size);
+		p.translate(size / 2., size / 2.);
+		p.setPen(Qt::NoPen);
+
+		auto combinedClip = QPainterPath();
+		if (_cutoutPadding > 0) {
+			combinedClip.addRect(QRectF(-half, -half, size, size));
+			auto cutout = QPainterPath();
+			const auto cutoutRadius = half;
+			const auto cutoutX = -half - _cutoutPadding;
+			const auto cutoutY = 0.0;
+			if (colors.outlines[1].alpha()) {
+				const auto angle = M_PI / (180. / 45.);
+				const auto rotatedX = cutoutX * std::cos(angle)
+					- cutoutY * std::sin(angle);
+				const auto rotatedY = cutoutX * std::sin(angle)
+					+ cutoutY * std::cos(angle);
+				cutout.addEllipse(
+					QPointF(rotatedX, rotatedY),
+					cutoutRadius,
+					cutoutRadius);
+			} else {
+				cutout.addEllipse(
+					QPointF(cutoutX, cutoutY),
+					cutoutRadius,
+					cutoutRadius);
+			}
+			combinedClip = combinedClip.subtracted(cutout);
+		}
+
+		if (colors.outlines[1].alpha()) {
+			p.rotate(-45.);
+			if (_cutoutPadding > 0) {
+				auto rectPath = QPainterPath();
+				rectPath.addRect(QRectF(-size, 0, 3 * size, size));
+				auto clipRect = combinedClip.intersected(rectPath);
+				p.setClipPath(clipRect);
+			} else {
+				p.setClipRect(-size, 0, 3 * size, size);
+			}
+			p.setBrush(colors.outlines[1]);
+			p.drawEllipse(full);
+			if (_cutoutPadding > 0) {
+				auto rectPath = QPainterPath();
+				rectPath.addRect(QRectF(-size, -size, 3 * size, size));
+				auto clipRect = combinedClip.intersected(rectPath);
+				p.setClipPath(clipRect);
+			} else {
+				p.setClipRect(-size, -size, 3 * size, size);
+			}
+		} else if (_cutoutPadding > 0) {
+			p.setClipPath(combinedClip);
+		}
+		p.setBrush(colors.outlines[0]);
+		p.drawEllipse(full);
+		p.setClipping(false);
+		if (colors.outlines[2].alpha()) {
+			const auto multiplier = size / st::settingsColorSampleSize;
+			const auto center = st::settingsColorSampleCenter * multiplier;
+			const auto radius = st::settingsColorSampleCenterRadius
+				* multiplier;
+			p.setBrush(colors.outlines[2]);
+			p.drawRoundedRect(
+				QRectF(-center / 2., -center / 2., center, center),
+				radius,
+				radius);
+		}
+		const auto selected = _selectAnimation.value(_selected ? 1. : 0.);
+		if (selected > 0) {
+			const auto line = st::settingsColorRadioStroke * 1.;
+			const auto thickness = selected * line;
+			const auto skip = 1.5 * line;
+			const auto rect = full - Margins(skip);
+			if (_selectionCutout) {
+				p.save();
+				p.setCompositionMode(QPainter::CompositionMode_Clear);
+				auto pen = QPen(Qt::transparent, thickness);
+				p.setBrush(Qt::NoBrush);
+				p.setPen(pen);
+				p.drawEllipse(rect);
+				p.restore();
+			} else {
+				auto pen = st::boxBg->p;
+				pen.setWidthF(thickness);
+				p.setBrush(Qt::NoBrush);
+				p.setPen(pen);
+				p.drawEllipse(rect);
+			}
+		}
+	}
+}
+
+uint8 ColorSample::index() const {
+	return _index;
+}
+
+void ColorSample::setCutoutPadding(int padding) {
+	if (_cutoutPadding == padding) {
+		return;
+	}
+	_cutoutPadding = padding;
+	update();
+}
+
+void ColorSample::setForceCircle(bool force) {
+	if (_forceCircle == force) {
+		return;
+	}
+	_forceCircle = force;
+	update();
+}
+
+void ColorSample::setSelectionCutout(bool cutout) {
+	if (_selectionCutout == cutout) {
+		return;
+	}
+	_selectionCutout = cutout;
+	setAttribute(Qt::WA_TranslucentBackground, cutout);
+	update();
+}
+
+ColorSelector::ColorSelector(
+	not_null<QWidget*> parent,
+	std::shared_ptr<ChatStyle> style,
+	rpl::producer<std::vector<uint8>> indices,
+	rpl::producer<uint8> index,
+	Fn<void(uint8)> callback)
+: RpWidget(parent)
+, _style(style)
+, _callback(std::move(callback))
+, _index(std::move(index))
+, _isProfileMode(false) {
+	std::move(
+		indices
+	) | rpl::on_next([=](std::vector<uint8> indices) {
+		fillFrom(std::move(indices));
+	}, lifetime());
+	setupSelectionTracking();
+}
+
+ColorSelector::ColorSelector(
+	not_null<QWidget*> parent,
+	const std::vector<uint8> &indices,
+	uint8 index,
+	Fn<void(uint8)> callback,
+	Fn<Data::ColorProfileSet(uint8)> profileProvider)
+: RpWidget(parent)
+, _callback(std::move(callback))
+, _index(index)
+, _profileProvider(std::move(profileProvider))
+, _isProfileMode(true) {
+	fillFrom(indices);
+}
+
+void ColorSelector::updateSelection(uint8 newIndex) {
+	if (_index.current() == newIndex) {
+		return;
+	}
+	for (const auto &sample : _samples) {
+		if (sample->index() == _index.current()) {
+			sample->setSelected(false);
+			break;
+		}
+	}
+	for (const auto &sample : _samples) {
+		if (sample->index() == newIndex) {
+			sample->setSelected(true);
+			break;
+		}
+	}
+	_index = newIndex;
+}
+
+void ColorSelector::fillFrom(std::vector<uint8> indices) {
+	auto samples = std::vector<std::unique_ptr<ColorSample>>();
+	const auto initial = _index.current();
+	const auto add = [&](uint8 index) {
+		auto i = ranges::find(_samples, index, &ColorSample::index);
+		if (i != end(_samples)) {
+			samples.push_back(std::move(*i));
+			_samples.erase(i);
+		} else {
+			if (_isProfileMode) {
+				samples.push_back(std::make_unique<ColorSample>(
+					this,
+					_profileProvider,
+					index,
+					index == initial));
+			} else {
+				samples.push_back(std::make_unique<ColorSample>(
+					this,
+					_style,
+					index,
+					index == initial));
+			}
+			samples.back()->show();
+			samples.back()->setClickedCallback([=] {
+				if (_isProfileMode) {
+					updateSelection(index);
+				}
+				_callback(index);
+			});
+		}
+	};
+	for (const auto index : indices) {
+		add(index);
+	}
+	if (!_isProfileMode
+			&& initial != 0xFF
+			&& !ranges::contains(indices, initial)) {
+		add(initial);
+	}
+	_samples = std::move(samples);
+	if (width() > 0) {
+		resizeToWidth(width());
+	}
+}
+
+void ColorSelector::setupSelectionTracking() {
+	if (_isProfileMode) {
+		return;
+	}
+	_index.value(
+	) | rpl::combine_previous(
+	) | rpl::on_next([=](uint8 was, uint8 now) {
+		const auto i = ranges::find(_samples, was, &ColorSample::index);
+		if (i != end(_samples)) {
+			i->get()->setSelected(false);
+		}
+		const auto j = ranges::find(_samples, now, &ColorSample::index);
+		if (j != end(_samples)) {
+			j->get()->setSelected(true);
+		}
+	}, lifetime());
+}
+
+int ColorSelector::resizeGetHeight(int newWidth) {
+	if (newWidth <= 0) {
+		return 0;
+	}
+	const auto count = int(_samples.size());
+	const auto columns = _isProfileMode
+		? kProfileColorIndexCount
+		: kSimpleColorIndexCount;
+	const auto skip = st::settingsColorRadioSkip;
+	const auto size = (newWidth - skip * (columns - 1)) / float64(columns);
+	const auto isize = int(base::SafeRound(size));
+	auto top = 0;
+	auto left = 0.;
+	for (auto i = 0; i != count; ++i) {
+		_samples[i]->resize(isize, isize);
+		_samples[i]->move(int(base::SafeRound(left)), top);
+		left += size + skip;
+		if (!((i + 1) % columns)) {
+			top += isize + skip;
+			left = 0.;
+		}
+	}
+	return (top - skip) + ((count % columns) ? (isize + skip) : 0);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/peer/color_sample.h b/Telegram/SourceFiles/ui/peer/color_sample.h
new file mode 100644
index 00000000000000..08a261c8e55d8c
--- /dev/null
+++ b/Telegram/SourceFiles/ui/peer/color_sample.h
@@ -0,0 +1,100 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/buttons.h"
+#include "ui/text/text.h"
+#include "ui/effects/animations.h"
+#include "ui/rp_widget.h"
+#include "data/data_peer_colors.h"
+
+namespace Ui {
+namespace Text {
+struct MarkedContext;
+} // namespace Text
+class ChatStyle;
+struct ColorCollectible;
+
+class ColorSample final : public AbstractButton {
+public:
+	ColorSample(
+		not_null<QWidget*> parent,
+		Fn<Ui::Text::MarkedContext()> contextProvider,
+		Fn<TextWithEntities(uint64)> emojiProvider,
+		std::shared_ptr<ChatStyle> style,
+		rpl::producer<uint8> colorIndex,
+		rpl::producer<std::shared_ptr<ColorCollectible>> collectible,
+		rpl::producer<QString> name);
+	ColorSample(
+		not_null<QWidget*> parent,
+		std::shared_ptr<ChatStyle> style,
+		uint8 colorIndex,
+		bool selected);
+	ColorSample(
+		not_null<QWidget*> parent,
+		Fn<Data::ColorProfileSet(uint8)> profileProvider,
+		uint8 colorIndex,
+		bool selected);
+
+	[[nodiscard]] uint8 index() const;
+
+	void setSelected(bool selected);
+	void setCutoutPadding(int padding);
+	void setForceCircle(bool force);
+	void setSelectionCutout(bool cutout);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+
+	std::shared_ptr<ChatStyle> _style;
+	Text::String _name;
+	uint8 _index = 0;
+	std::shared_ptr<ColorCollectible> _collectible;
+	Animations::Simple _selectAnimation;
+	bool _selected = false;
+	bool _simple = false;
+	Fn<Data::ColorProfileSet(uint8)> _profileProvider;
+	int _cutoutPadding = 0;
+	bool _forceCircle = false;
+	bool _selectionCutout = false;
+
+};
+
+class ColorSelector final : public RpWidget {
+public:
+	ColorSelector(
+		not_null<QWidget*> parent,
+		std::shared_ptr<ChatStyle> style,
+		rpl::producer<std::vector<uint8>> indices,
+		rpl::producer<uint8> index,
+		Fn<void(uint8)> callback);
+	ColorSelector(
+		not_null<QWidget*> parent,
+		const std::vector<uint8> &indices,
+		uint8 index,
+		Fn<void(uint8)> callback,
+		Fn<Data::ColorProfileSet(uint8)> profileProvider);
+
+	void updateSelection(uint8 newIndex);
+
+private:
+	void fillFrom(std::vector<uint8> indices);
+	void setupSelectionTracking();
+
+	int resizeGetHeight(int newWidth) override;
+
+	std::shared_ptr<ChatStyle> _style;
+	std::vector<std::unique_ptr<ColorSample>> _samples;
+	Fn<void(uint8)> _callback;
+	rpl::variable<uint8> _index;
+	Fn<Data::ColorProfileSet(uint8)> _profileProvider;
+	bool _isProfileMode = false;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/peer/video_userpic_player.cpp b/Telegram/SourceFiles/ui/peer/video_userpic_player.cpp
new file mode 100644
index 00000000000000..d2a5c728271056
--- /dev/null
+++ b/Telegram/SourceFiles/ui/peer/video_userpic_player.cpp
@@ -0,0 +1,172 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/peer/video_userpic_player.h"
+
+#include "data/data_peer.h"
+#include "data/data_photo.h"
+#include "data/data_session.h"
+#include "data/data_streaming.h"
+#include "data/data_file_origin.h"
+#include "media/streaming/media_streaming_instance.h"
+#include "media/streaming/media_streaming_player.h"
+#include "media/streaming/media_streaming_document.h"
+#include "ui/image/image_prepare.h"
+#include "ui/empty_userpic.h"
+#include "ui/painter.h"
+#include "styles/style_widgets.h"
+
+namespace Ui {
+
+VideoUserpicPlayer::VideoUserpicPlayer() = default;
+
+VideoUserpicPlayer::~VideoUserpicPlayer() = default;
+
+void VideoUserpicPlayer::setup(
+		not_null<PeerData*> peer,
+		not_null<PhotoData*> photo) {
+	if (_streamedPhoto == photo && _streamed && _peer == peer) {
+		return;
+	}
+	if (!createStreaming(peer, photo)) {
+		photo->setVideoPlaybackFailed();
+		return;
+	}
+	_streamedPhoto = photo;
+	_peer = peer;
+	checkStarted();
+}
+
+void VideoUserpicPlayer::clear() {
+	_streamed = nullptr;
+	_streamedPhoto = nullptr;
+	_peer = nullptr;
+}
+
+QImage VideoUserpicPlayer::frame(QSize size, not_null<PeerData*> peer) {
+	if (!_streamed
+		|| !_streamed->player().ready()
+		|| _streamed->player().videoSize().isEmpty()
+		|| !_streamedPhoto) {
+		return {};
+	}
+	auto request = ::Media::Streaming::FrameRequest();
+	const auto ratio = style::DevicePixelRatio();
+	request.outer = request.resize = size * ratio;
+
+	const auto broadcast = peer->monoforumBroadcast();
+
+	if (broadcast) {
+		if (_monoforumMask.isNull()) {
+			_monoforumMask = Ui::MonoforumShapeMask(request.resize);
+		}
+	} else if (peer->isForum()) {
+		const auto radius = int(
+			size.width() * Ui::ForumUserpicRadiusMultiplier());
+		if (_roundingCorners[0].width() != radius * ratio) {
+			_roundingCorners = Images::CornersMask(radius);
+		}
+		request.rounding = Images::CornersMaskRef(_roundingCorners);
+	} else {
+		if (_ellipseMask.size() != request.outer) {
+			_ellipseMask = Images::EllipseMask(size);
+		}
+		request.mask = _ellipseMask;
+	}
+
+	auto result = _streamed->frame(request);
+	if (broadcast) {
+		constexpr auto kFormat = QImage::Format_ARGB32_Premultiplied;
+		if (result.format() != kFormat) {
+			result = std::move(result).convertToFormat(kFormat);
+		}
+		auto q = QPainter(&result);
+		q.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+		q.drawImage(
+			QRect(QPoint(), result.size() / result.devicePixelRatio()),
+			_monoforumMask);
+		q.end();
+	}
+	_streamed->markFrameShown();
+	return result;
+}
+
+bool VideoUserpicPlayer::ready() const {
+	return _streamed
+		&& _streamed->player().ready()
+		&& !_streamed->player().videoSize().isEmpty();
+}
+
+bool VideoUserpicPlayer::createStreaming(
+		not_null<PeerData*> peer,
+		not_null<PhotoData*> photo) {
+	using namespace ::Media::Streaming;
+	const auto origin = peer->isUser()
+		? Data::FileOriginUserPhoto(peerToUser(peer->id), photo->id)
+		: Data::FileOrigin(Data::FileOriginPeerPhoto(peer->id));
+	_streamed = std::make_unique<Instance>(
+		photo->owner().streaming().sharedDocument(photo, origin),
+		nullptr);
+	_streamed->lockPlayer();
+	_streamed->player().updates(
+	) | rpl::on_next_error([=](Update &&update) {
+		handleUpdate(std::move(update));
+	}, [=](Error &&error) {
+		handleError(std::move(error));
+	}, _streamed->lifetime());
+	if (_streamed->ready()) {
+		streamingReady(base::duplicate(_streamed->info()));
+	}
+	if (!_streamed->valid()) {
+		clear();
+		return false;
+	}
+	return true;
+}
+
+void VideoUserpicPlayer::checkStarted() {
+	if (!_streamed) {
+		return;
+	} else if (_streamed->paused()) {
+		_streamed->resume();
+	}
+	if (_streamed && !_streamed->active() && !_streamed->failed()) {
+		const auto position = _streamedPhoto->videoStartPosition();
+		auto options = ::Media::Streaming::PlaybackOptions();
+		options.position = position;
+		options.mode = ::Media::Streaming::Mode::Video;
+		options.loop = true;
+		_streamed->play(options);
+	}
+}
+
+void VideoUserpicPlayer::handleUpdate(
+		::Media::Streaming::Update &&update) {
+	using namespace ::Media::Streaming;
+	v::match(update.data, [&](Information &update) {
+		streamingReady(std::move(update));
+	}, [](PreloadedVideo) {
+	}, [](UpdateVideo) {
+	}, [](PreloadedAudio) {
+	}, [](UpdateAudio) {
+	}, [](WaitingForData) {
+	}, [](SpeedEstimate) {
+	}, [](MutedByOther) {
+	}, [](Finished) {
+	});
+}
+
+void VideoUserpicPlayer::handleError(::Media::Streaming::Error &&error) {
+	_streamedPhoto->setVideoPlaybackFailed();
+	clear();
+}
+
+void VideoUserpicPlayer::streamingReady(
+		::Media::Streaming::Information &&info) {
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/peer/video_userpic_player.h b/Telegram/SourceFiles/ui/peer/video_userpic_player.h
new file mode 100644
index 00000000000000..4f7d1de4e67e2d
--- /dev/null
+++ b/Telegram/SourceFiles/ui/peer/video_userpic_player.h
@@ -0,0 +1,51 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Media::Streaming {
+class Instance;
+struct Update;
+struct Information;
+enum class Error;
+} // namespace Media::Streaming
+
+class PhotoData;
+class PeerData;
+
+namespace Ui {
+
+class VideoUserpicPlayer final {
+public:
+	VideoUserpicPlayer();
+	~VideoUserpicPlayer();
+
+	void setup(not_null<PeerData*> peer, not_null<PhotoData*> photo);
+	void clear();
+
+	[[nodiscard]] QImage frame(QSize size, not_null<PeerData*> peer);
+	[[nodiscard]] bool ready() const;
+
+private:
+	bool createStreaming(
+		not_null<PeerData*> peer,
+		not_null<PhotoData*> photo);
+	void checkStarted();
+	void handleUpdate(::Media::Streaming::Update &&update);
+	void handleError(::Media::Streaming::Error &&error);
+	void streamingReady(::Media::Streaming::Information &&info);
+
+	std::unique_ptr<::Media::Streaming::Instance> _streamed;
+	PhotoData *_streamedPhoto = nullptr;
+	QImage _ellipseMask;
+	QImage _monoforumMask;
+	std::array<QImage, 4> _roundingCorners;
+	PeerData *_peer = nullptr;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/resize_area.h b/Telegram/SourceFiles/ui/resize_area.h
index 84c7dea8ba131d..c711477929b202 100644
--- a/Telegram/SourceFiles/ui/resize_area.h
+++ b/Telegram/SourceFiles/ui/resize_area.h
@@ -23,7 +23,7 @@ class ResizeArea : public RpWidget {
 	template <typename Callback>
 	void addMoveLeftCallback(Callback &&callback) {
 		moveLeft(
-		) | rpl::start_with_next(
+		) | rpl::on_next(
 			std::forward<Callback>(callback),
 			lifetime());
 	}
@@ -34,7 +34,7 @@ class ResizeArea : public RpWidget {
 	template <typename Callback>
 	void addMoveFinishedCallback(Callback &&callback) {
 		moveFinished(
-		) | rpl::start_with_next(
+		) | rpl::on_next(
 			std::forward<Callback>(callback),
 			lifetime());
 	}
diff --git a/Telegram/SourceFiles/ui/search_field_controller.cpp b/Telegram/SourceFiles/ui/search_field_controller.cpp
index a26c59bbe618b8..a490972ad58b70 100644
--- a/Telegram/SourceFiles/ui/search_field_controller.cpp
+++ b/Telegram/SourceFiles/ui/search_field_controller.cpp
@@ -30,10 +30,6 @@ auto SearchFieldController::createRowView(
 
 	auto field = createField(wrap, st.field).release();
 	field->show();
-	field->cancelled(
-	) | rpl::start_with_next([=] {
-		field->setText(QString());
-	}, field->lifetime());
 
 	auto cancel = CreateChild<Ui::CrossButton>(
 		wrap,
@@ -44,8 +40,9 @@ auto SearchFieldController::createRowView(
 	queryValue(
 	) | rpl::map([](const QString &value) {
 		return !value.isEmpty();
-	}) | rpl::start_with_next([cancel](bool shown) {
+	}) | rpl::on_next([cancel](bool shown) {
 		cancel->toggle(shown, anim::type::normal);
+		cancel->setAccessibleName(tr::lng_sr_clear_search(tr::now));
 	}, cancel->lifetime());
 	cancel->finishAnimating();
 
@@ -53,7 +50,7 @@ auto SearchFieldController::createRowView(
 	shadow->show();
 
 	wrap->widthValue(
-	) | rpl::start_with_next([=, &st](int newWidth) {
+	) | rpl::on_next([=, &st](int newWidth) {
 		auto availableWidth = newWidth
 			- st.fieldIconSkip
 			- st.fieldCancelSkip;
@@ -70,7 +67,7 @@ auto SearchFieldController::createRowView(
 			st::lineWidth);
 	}, wrap->lifetime());
 	wrap->paintRequest(
-	) | rpl::start_with_next([=, &st] {
+	) | rpl::on_next([=, &st] {
 		auto p = QPainter(wrap);
 		st.fieldIcon.paint(
 			p,
@@ -96,6 +93,10 @@ rpl::producer<QString> SearchFieldController::queryChanges() const {
 	return _query.changes();
 }
 
+void SearchFieldController::setQuery(const QString &query) {
+	_query = query;
+}
+
 base::unique_qptr<Ui::InputField> SearchFieldController::createField(
 		QWidget *parent,
 		const style::InputField &st) {
@@ -106,7 +107,7 @@ base::unique_qptr<Ui::InputField> SearchFieldController::createField(
 		_query.current());
 	auto field = result.get();
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_query = field->getLastText();
 	}, field->lifetime());
 	_view.reset(field);
diff --git a/Telegram/SourceFiles/ui/search_field_controller.h b/Telegram/SourceFiles/ui/search_field_controller.h
index acae6f192b5b03..b471910cf03a17 100644
--- a/Telegram/SourceFiles/ui/search_field_controller.h
+++ b/Telegram/SourceFiles/ui/search_field_controller.h
@@ -40,6 +40,8 @@ class SearchFieldController {
 	rpl::producer<QString> queryValue() const;
 	rpl::producer<QString> queryChanges() const;
 
+	void setQuery(const QString &query);
+
 	rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
diff --git a/Telegram/SourceFiles/ui/text/format_song_document_name.cpp b/Telegram/SourceFiles/ui/text/format_song_document_name.cpp
index 82d2a99fef8563..d5a77025b392b8 100644
--- a/Telegram/SourceFiles/ui/text/format_song_document_name.cpp
+++ b/Telegram/SourceFiles/ui/text/format_song_document_name.cpp
@@ -7,9 +7,15 @@ For license and copyright information please follow this link:
 */
 #include "ui/text/format_song_document_name.h"
 
-#include "ui/text/text_utilities.h"
 #include "data/data_document.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "history/history_item_helpers.h"
+#include "history/history_item.h"
 #include "lang/lang_keys.h"
+#include "ui/text/text_utilities.h"
+
+#include <QtCore/QLocale>
 
 namespace Ui::Text {
 
@@ -39,4 +45,46 @@ TextWithEntities FormatDownloadsName(not_null<DocumentData*> document) {
 		: FormatSongNameFor(document).textWithEntities();
 }
 
+FormatSongName FormatVoiceName(
+		not_null<DocumentData*> document,
+		FullMsgId contextId) {
+	if (const auto item = document->owner().message(contextId)) {
+		const auto name = (!item->out() || item->isPost())
+			? item->fromOriginal()->name()
+			: tr::lng_from_you(tr::now);
+		const auto date = [item] {
+			const auto parsed = ItemDateTime(item);
+			const auto date = parsed.date();
+			const auto time = QLocale().toString(
+				parsed.time(),
+				QLocale::ShortFormat);
+			const auto today = QDateTime::currentDateTime().date();
+			if (date == today) {
+				return tr::lng_player_message_today(
+					tr::now,
+					lt_time,
+					time);
+			} else if (date.addDays(1) == today) {
+				return tr::lng_player_message_yesterday(
+					tr::now,
+					lt_time,
+					time);
+			}
+			return tr::lng_player_message_date(
+				tr::now,
+				lt_date,
+				langDayOfMonthFull(date),
+				lt_time,
+				time);
+		};
+		auto result = FormatSongName(QString(), date(), name);
+		result.setNoDash(true);
+		return result;
+	} else if (document->isVideoMessage()) {
+		return FormatSongName(QString(), tr::lng_media_round(tr::now), {});
+	} else {
+		return FormatSongName(QString(), tr::lng_media_audio(tr::now), {});
+	}
+}
+
 } // namespace Ui::Text
diff --git a/Telegram/SourceFiles/ui/text/format_song_document_name.h b/Telegram/SourceFiles/ui/text/format_song_document_name.h
index a1be4b699d7e03..edfed14dd82126 100644
--- a/Telegram/SourceFiles/ui/text/format_song_document_name.h
+++ b/Telegram/SourceFiles/ui/text/format_song_document_name.h
@@ -19,4 +19,8 @@ namespace Ui::Text {
 [[nodiscard]] TextWithEntities FormatDownloadsName(
 	not_null<DocumentData*> document);
 
+[[nodiscard]] FormatSongName FormatVoiceName(
+	not_null<DocumentData*> document,
+	FullMsgId contextId);
+
 } // namespace Ui::Text
diff --git a/Telegram/SourceFiles/ui/text/format_song_name.cpp b/Telegram/SourceFiles/ui/text/format_song_name.cpp
index c3f161de60879f..b28fb052a742b1 100644
--- a/Telegram/SourceFiles/ui/text/format_song_name.cpp
+++ b/Telegram/SourceFiles/ui/text/format_song_name.cpp
@@ -53,10 +53,16 @@ QString FormatSongName::string() const {
 	const auto &[title, performer] = _composedName;
 	const auto dash = (title.isEmpty() || performer.isEmpty())
 		? QString()
+		: _noDash
+		? QString(' ')
 		: QString::fromUtf8(" \xe2\x80\x93 ");
 	return performer + dash + title;
 }
 
+void FormatSongName::setNoDash(bool noDash) {
+	_noDash = noDash;
+}
+
 TextWithEntities FormatSongName::textWithEntities(
 		bool boldOnlyPerformer) const {
 	TextWithEntities result;
diff --git a/Telegram/SourceFiles/ui/text/format_song_name.h b/Telegram/SourceFiles/ui/text/format_song_name.h
index c87f100c6137e8..4f9bd82359097a 100644
--- a/Telegram/SourceFiles/ui/text/format_song_name.h
+++ b/Telegram/SourceFiles/ui/text/format_song_name.h
@@ -26,8 +26,11 @@ class FormatSongName final {
 	[[nodiscard]] TextWithEntities textWithEntities(
 		bool boldOnlyPerformer = false) const;
 
+	void setNoDash(bool noDash);
+
 private:
 	const ComposedName _composedName;
+	bool _noDash = false;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/text/format_values.cpp b/Telegram/SourceFiles/ui/text/format_values.cpp
index 564e5013f8d490..7b70065e1fd289 100644
--- a/Telegram/SourceFiles/ui/text/format_values.cpp
+++ b/Telegram/SourceFiles/ui/text/format_values.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "ui/text/format_values.h"
 
+#include "base/unixtime.h"
 #include "lang/lang_keys.h"
 #include "countries/countries_instance.h"
 
@@ -18,6 +19,8 @@ For license and copyright information please follow this link:
 namespace Ui {
 namespace {
 
+constexpr auto kSecondsInYear = 365 * 24 * 60 * 60; // 31536000
+
 [[nodiscard]] QString FormatTextWithReadyAndTotal(
 		tr::phrase<lngtag_ready, lngtag_total, lngtag_mb> phrase,
 		qint64 ready,
@@ -100,6 +103,37 @@ QString FormatDateTime(QDateTime date) {
 	}
 }
 
+QString FormatDateTimeSavedFrom(QDateTime dateTime) {
+	const auto current = QDate::currentDate();
+	const auto date = dateTime.date();
+	const auto timeStr = QLocale().toString(
+		dateTime.time(),
+		QLocale::ShortFormat);
+
+	if (date == current) {
+		return tr::lng_mediaview_today(tr::now, lt_time, timeStr);
+	} else if (date == current.addDays(-1)) {
+		return tr::lng_mediaview_yesterday(tr::now, lt_time, timeStr);
+	}
+	const auto diff = std::abs(
+		base::unixtime::now() - base::unixtime::serialize(dateTime));
+	const auto dateStr = (diff < kSecondsInYear)
+		? tr::lng_month_day(
+			tr::now,
+			lt_month,
+			Lang::MonthSmall(date.month())(tr::now),
+			lt_day,
+			QString::number(date.day()))
+		: langDayOfMonthFull(date);
+
+	return tr::lng_mediaview_date_time(
+		tr::now,
+		lt_date,
+		dateStr,
+		lt_time,
+		timeStr);
+}
+
 QString FormatDurationText(qint64 duration) {
 	qint64 hours = (duration / 3600), minutes = (duration % 3600) / 60, seconds = duration % 60;
 	return (hours ? QString::number(hours) + ':' : QString()) + (minutes >= 10 ? QString() : QString('0')) + QString::number(minutes) + ':' + (seconds >= 10 ? QString() : QString('0')) + QString::number(seconds);
@@ -414,7 +448,7 @@ QString FormatTTL(float64 ttl) {
 				+ ' '
 				+ tr::lng_days(tr::now, lt_count, int(days % 7));
 		}
-	} else if (ttl < (86400 * 31) * 12) {
+	} else if (ttl <= (86400 * 31) * 11) {
 		return tr::lng_months(tr::now, lt_count, int(ttl / (86400 * 31)));
 	} else {
 		return tr::lng_years({}, lt_count, std::round(ttl / (86400 * 365)));
diff --git a/Telegram/SourceFiles/ui/text/format_values.h b/Telegram/SourceFiles/ui/text/format_values.h
index e4294eed1526f8..ae7029e5716fc8 100644
--- a/Telegram/SourceFiles/ui/text/format_values.h
+++ b/Telegram/SourceFiles/ui/text/format_values.h
@@ -19,6 +19,7 @@ inline const QString kCreditsCurrency = u"XTR"_q;
 [[nodiscard]] QString FormatDownloadText(qint64 ready, qint64 total);
 [[nodiscard]] QString FormatProgressText(qint64 ready, qint64 total);
 [[nodiscard]] QString FormatDateTime(QDateTime date);
+[[nodiscard]] QString FormatDateTimeSavedFrom(QDateTime date);
 [[nodiscard]] QString FormatDurationText(qint64 duration);
 [[nodiscard]] QString FormatDurationWords(qint64 duration);
 [[nodiscard]] QString FormatDurationWordsSlowmode(qint64 duration);
diff --git a/Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.cpp b/Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.cpp
new file mode 100644
index 00000000000000..7791bfc2afb0a1
--- /dev/null
+++ b/Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.cpp
@@ -0,0 +1,122 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/text/text_lottie_custom_emoji.h"
+
+#include "lottie/lottie_icon.h"
+#include "ui/text/text_utilities.h"
+
+namespace Ui::Text {
+
+LottieCustomEmoji::LottieCustomEmoji(Lottie::IconDescriptor &&descriptor)
+: LottieCustomEmoji(std::move(descriptor), nullptr) {
+}
+
+LottieCustomEmoji::LottieCustomEmoji(
+	Lottie::IconDescriptor &&descriptor,
+	Fn<void()> repaint)
+: _entityData(!descriptor.name.isEmpty()
+	? descriptor.name
+	: !descriptor.path.isEmpty()
+	? descriptor.path
+	: (Unexpected("LottieCustomEmoji: descriptor.name or descriptor.path"),
+		QString()))
+, _width(descriptor.sizeOverride.width())
+, _icon(Lottie::MakeIcon(std::move(descriptor)))
+, _repaint(std::move(repaint)) {
+	if (!_width && _icon && _icon->valid()) {
+		_width = _icon->width();
+		startAnimation();
+	}
+}
+
+int LottieCustomEmoji::width() {
+	return _width;
+}
+
+QString LottieCustomEmoji::entityData() {
+	return _entityData;
+}
+
+void LottieCustomEmoji::paint(QPainter &p, const Context &context) {
+	if (!_icon || !_icon->valid()) {
+		return;
+	}
+
+	const auto paused = context.paused
+		|| context.internal.forceFirstFrame
+		|| context.internal.overrideFirstWithLastFrame;
+
+	if (paused) {
+		const auto frame = context.internal.forceLastFrame
+			? _icon->framesCount() - 1
+			: 0;
+		_icon->jumpTo(frame, _repaint);
+	} else if (!_icon->animating()) {
+		startAnimation();
+	}
+
+	_icon->paint(
+		p,
+		context.position.x(),
+		context.position.y(),
+		context.textColor);
+}
+
+void LottieCustomEmoji::unload() {
+	if (_icon) {
+		_icon->jumpTo(0, nullptr);
+	}
+}
+
+bool LottieCustomEmoji::ready() {
+	return _icon && _icon->valid();
+}
+
+bool LottieCustomEmoji::readyInDefaultState() {
+	return _icon && _icon->valid() && _icon->frameIndex() == 0;
+}
+
+void LottieCustomEmoji::startAnimation() {
+	if (!_icon || !_icon->valid() || _icon->framesCount() <= 1) {
+		return;
+	}
+
+	_icon->animate(
+		_repaint,
+		0,
+		_icon->framesCount() - 1);
+}
+
+QString LottieEmojiData(Lottie::IconDescriptor descriptor) {
+	return !descriptor.name.isEmpty()
+		? descriptor.name
+		: !descriptor.path.isEmpty()
+		? descriptor.path
+		: QString();
+}
+
+TextWithEntities LottieEmoji(Lottie::IconDescriptor descriptor) {
+	return SingleCustomEmoji(LottieEmojiData(std::move(descriptor)));
+}
+
+MarkedContext LottieEmojiContext(Lottie::IconDescriptor descriptor) {
+	auto customEmojiFactory = [descriptor = std::move(descriptor)](
+			QStringView data,
+			const MarkedContext &context
+		) mutable -> std::unique_ptr<CustomEmoji> {
+		if (data == LottieEmojiData(descriptor)) {
+			return std::make_unique<LottieCustomEmoji>(
+				std::move(descriptor),
+				context.repaint);
+		}
+		return nullptr;
+	};
+	return { .customEmojiFactory = std::move(customEmojiFactory) };
+}
+
+} // namespace Ui::Text
\ No newline at end of file
diff --git a/Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.h b/Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.h
new file mode 100644
index 00000000000000..c39e49958c77d2
--- /dev/null
+++ b/Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.h
@@ -0,0 +1,47 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/text/text_custom_emoji.h"
+
+namespace Lottie {
+struct IconDescriptor;
+class Icon;
+} // namespace Lottie
+
+namespace Ui::Text {
+
+class LottieCustomEmoji final : public CustomEmoji {
+public:
+	explicit LottieCustomEmoji(Lottie::IconDescriptor &&descriptor);
+	LottieCustomEmoji(
+		Lottie::IconDescriptor &&descriptor,
+		Fn<void()> repaint);
+
+	int width() override;
+	QString entityData() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	void startAnimation();
+
+	QString _entityData;
+	int _width = 0;
+	std::unique_ptr<Lottie::Icon> _icon;
+	Fn<void()> _repaint;
+
+};
+
+[[nodiscard]] QString LottieEmojiData(Lottie::IconDescriptor);
+[[nodiscard]] TextWithEntities LottieEmoji(Lottie::IconDescriptor);
+[[nodiscard]] MarkedContext LottieEmojiContext(Lottie::IconDescriptor);
+
+} // namespace Ui::Text
\ No newline at end of file
diff --git a/Telegram/SourceFiles/ui/top_background_gradient.cpp b/Telegram/SourceFiles/ui/top_background_gradient.cpp
new file mode 100644
index 00000000000000..ac39872dc7dcde
--- /dev/null
+++ b/Telegram/SourceFiles/ui/top_background_gradient.cpp
@@ -0,0 +1,284 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/top_background_gradient.h"
+
+#include "apiwrap.h"
+#include "api/api_peer_colors.h"
+#include "data/data_emoji_statuses.h"
+#include "data/data_credits.h"
+#include "data/data_peer.h"
+#include "data/data_star_gift.h"
+#include "data/stickers/data_custom_emoji.h"
+#include "main/main_session.h"
+#include "ui/image/image_prepare.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "styles/style_layers.h"
+#include "styles/style_chat_helpers.h"
+
+namespace Ui {
+namespace {
+
+void PrepareImage(
+		QImage &image,
+		not_null<Ui::Text::CustomEmoji*> emoji,
+		const PatternPoint &point,
+		const QColor &patternColor) {
+	if (!image.isNull() || !emoji->ready()) {
+		return;
+	}
+	const auto ratio = style::DevicePixelRatio();
+	const auto size = Emoji::GetSizeNormal() / ratio;
+	image = QImage(
+		2 * QSize(size, size) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(ratio);
+	image.fill(Qt::transparent);
+	auto p = QPainter(&image);
+	auto hq = PainterHighQualityEnabler(p);
+	p.setOpacity(point.opacity);
+	if (point.scale < 1.) {
+		p.translate(size, size);
+		p.scale(point.scale, point.scale);
+		p.translate(-size, -size);
+	}
+	const auto shift = (2 * size - (Emoji::GetSizeLarge() / ratio)) / 2;
+	emoji->paint(p, {
+		.textColor = patternColor,
+		.position = QPoint(shift, shift),
+		.paused = true,
+	});
+}
+
+} // namespace
+
+QImage CreateTopBgGradient(
+		QSize size,
+		QColor centerColor,
+		QColor edgeColor,
+		bool rounded,
+		QPoint offset) {
+	const auto ratio = style::DevicePixelRatio();
+	auto result = QImage(size * ratio, QImage::Format_ARGB32_Premultiplied);
+	if (!rounded) {
+		result.fill(Qt::transparent);
+	}
+	result.setDevicePixelRatio(ratio);
+
+	auto p = QPainter(&result);
+	auto hq = PainterHighQualityEnabler(p);
+	auto gradient = QRadialGradient(
+		rect::center(QRect(offset, size)),
+		size.height() / 2);
+	gradient.setStops({
+		{ 0., centerColor },
+		{ 1., edgeColor },
+	});
+	p.setBrush(gradient);
+	p.setPen(Qt::NoPen);
+	p.drawRect(Rect(size));
+	p.end();
+
+	if (rounded) {
+		const auto mask = Images::CornersMask(st::boxRadius);
+		return Images::Round(std::move(result), mask, RectPart::FullTop);
+	}
+	return result;
+}
+
+QImage CreateTopBgGradient(QSize size, const Data::UniqueGift &gift) {
+	return CreateTopBgGradient(size, gift.backdrop);
+}
+
+QImage CreateTopBgGradient(
+		QSize size,
+		const Data::UniqueGiftBackdrop &backdrop) {
+	return CreateTopBgGradient(
+		size,
+		backdrop.centerColor,
+		backdrop.edgeColor);
+}
+
+QImage CreateTopBgGradient(
+		QSize size,
+		not_null<PeerData*> peer,
+		QPoint offset) {
+	if (const auto collectible = peer->emojiStatusId().collectible) {
+		return CreateTopBgGradient(
+			size,
+			collectible->centerColor,
+			collectible->edgeColor,
+			false,
+			offset);
+	}
+	if (const auto color = peer->session().api().peerColors().colorProfileFor(
+			peer)) {
+		if (color->bg.size() > 1) {
+			return CreateTopBgGradient(
+				size,
+				color->bg[1],
+				color->bg[0],
+				false,
+				offset);
+		}
+	}
+	return QImage();
+}
+
+const std::vector<PatternPoint> &PatternBgPoints() {
+	static const auto kSmall = 0.7;
+	static const auto kFaded = 0.2;
+	static const auto kLarge = 0.85;
+	static const auto kOpaque = 0.3;
+	static const auto result = std::vector<PatternPoint>{
+		{ { 0.5, 0.066 }, kSmall, kFaded },
+
+		{ { 0.177, 0.168 }, kSmall, kFaded },
+		{ { 0.822, 0.168 }, kSmall, kFaded },
+
+		{ { 0.37, 0.168 }, kLarge, kOpaque },
+		{ { 0.63, 0.168 }, kLarge, kOpaque },
+
+		{ { 0.277, 0.308 }, kSmall, kOpaque },
+		{ { 0.723, 0.308 }, kSmall, kOpaque },
+
+		{ { 0.13, 0.42 }, kSmall, kFaded },
+		{ { 0.87, 0.42 }, kSmall, kFaded },
+
+		{ { 0.27, 0.533 }, kLarge, kOpaque },
+		{ { 0.73, 0.533 }, kLarge, kOpaque },
+
+		{ { 0.2, 0.73 }, kSmall, kFaded },
+		{ { 0.8, 0.73 }, kSmall, kFaded },
+
+		{ { 0.302, 0.825 }, kLarge, kOpaque },
+		{ { 0.698, 0.825 }, kLarge, kOpaque },
+
+		{ { 0.5, 0.876 }, kLarge, kFaded },
+
+		{ { 0.144, 0.936 }, kSmall, kFaded },
+		{ { 0.856, 0.936 }, kSmall, kFaded },
+	};
+	return result;
+}
+
+const std::vector<PatternPoint> &PatternBgPointsSmall() {
+	static const auto kSmall = 0.45;
+	static const auto kFaded = 0.2;
+	static const auto kLarge = 0.55;
+	static const auto kOpaque = 0.3;
+	static const auto result = std::vector<PatternPoint>{
+		{ { 0.5, 0.066 }, kSmall, kFaded },
+
+		{ { 0.177, 0.168 }, kSmall, kFaded },
+		{ { 0.822, 0.168 }, kSmall, kFaded },
+
+		{ { 0.37, 0.168 }, kLarge, kOpaque },
+		{ { 0.63, 0.168 }, kLarge, kOpaque },
+
+		{ { 0.277, 0.308 }, kSmall, kOpaque },
+		{ { 0.723, 0.308 }, kSmall, kOpaque },
+
+		{ { 0.13, 0.42 }, kSmall, kFaded },
+		{ { 0.87, 0.42 }, kSmall, kFaded },
+
+		{ { 0.27, 0.533 }, kLarge, kOpaque },
+		{ { 0.73, 0.533 }, kLarge, kOpaque },
+
+		{ { 0.2, 0.73 }, kSmall, kFaded },
+		{ { 0.8, 0.73 }, kSmall, kFaded },
+
+		{ { 0.302, 0.825 }, kLarge, kOpaque },
+		{ { 0.698, 0.825 }, kLarge, kOpaque },
+
+		{ { 0.5, 0.876 }, kLarge, kFaded },
+
+		{ { 0.144, 0.936 }, kSmall, kFaded },
+		{ { 0.856, 0.936 }, kSmall, kFaded },
+	};
+	return result;
+}
+
+void PaintBgPoints(
+		QPainter &p,
+		const std::vector<PatternPoint> &points,
+		base::flat_map<float64, QImage> &cache,
+		not_null<Ui::Text::CustomEmoji*> emoji,
+		const Data::UniqueGift &gift,
+		const QRect &rect,
+		float64 shown) {
+	PaintBgPoints(
+		p,
+		points,
+		cache,
+		emoji,
+		gift.backdrop,
+		rect,
+		shown);
+}
+
+void PaintBgPoints(
+		QPainter &p,
+		const std::vector<PatternPoint> &points,
+		base::flat_map<float64, QImage> &cache,
+		not_null<Ui::Text::CustomEmoji*> emoji,
+		const Data::UniqueGiftBackdrop &backdrop,
+		const QRect &rect,
+		float64 shown) {
+	PaintBgPoints(
+		p,
+		points,
+		cache,
+		emoji,
+		backdrop.patternColor,
+		rect,
+		shown);
+}
+
+void PaintBgPoints(
+		QPainter &p,
+		const std::vector<PatternPoint> &points,
+		base::flat_map<float64, QImage> &cache,
+		not_null<Ui::Text::CustomEmoji*> emoji,
+		const QColor &patternColor,
+		const QRect &rect,
+		float64 shown) {
+	const auto origin = rect.topLeft();
+	const auto width = rect.width();
+	const auto height = rect.height();
+	const auto ratio = style::DevicePixelRatio();
+	const auto paintPoint = [&](const PatternPoint &point) {
+		const auto key = (1. + point.opacity) * 10. + point.scale;
+		auto &image = cache[key];
+		PrepareImage(image, emoji, point, patternColor);
+		if (!image.isNull()) {
+			const auto position = origin + QPoint(
+				int(point.position.x() * width),
+				int(point.position.y() * height));
+			if (shown < 1.) {
+				p.save();
+				p.translate(position);
+				p.scale(shown, shown);
+				p.translate(-position);
+			}
+			const auto size = image.size() / ratio;
+			p.drawImage(
+				position - QPoint(size.width() / 2, size.height() / 2),
+				image);
+			if (shown < 1.) {
+				p.restore();
+			}
+		}
+	};
+	for (const auto &point : points) {
+		paintPoint(point);
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/top_background_gradient.h b/Telegram/SourceFiles/ui/top_background_gradient.h
new file mode 100644
index 00000000000000..9320a9c12c5e90
--- /dev/null
+++ b/Telegram/SourceFiles/ui/top_background_gradient.h
@@ -0,0 +1,79 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+struct UniqueGift;
+struct UniqueGiftBackdrop;
+} // namespace Data
+
+namespace Ui::Text {
+class CustomEmoji;
+} // namespace Ui::Text
+
+class PeerData;
+
+namespace Ui {
+
+struct PatternPoint {
+	QPointF position;
+	float64 scale = 1.;
+	float64 opacity = 1.;
+};
+
+[[nodiscard]] QImage CreateTopBgGradient(
+	QSize size,
+	const Data::UniqueGift &gift);
+
+[[nodiscard]] QImage CreateTopBgGradient(
+	QSize size,
+	const Data::UniqueGiftBackdrop &backdrop);
+
+[[nodiscard]] QImage CreateTopBgGradient(
+	QSize size,
+	QColor centerColor,
+	QColor edgeColor,
+	bool rounded = true,
+	QPoint offset = QPoint());
+
+[[nodiscard]] QImage CreateTopBgGradient(
+	QSize size,
+	not_null<PeerData*> peer,
+	QPoint offset = QPoint());
+
+[[nodiscard]] const std::vector<PatternPoint> &PatternBgPoints();
+[[nodiscard]] const std::vector<PatternPoint> &PatternBgPointsSmall();
+
+void PaintBgPoints(
+	QPainter &p,
+	const std::vector<PatternPoint> &points,
+	base::flat_map<float64, QImage> &cache,
+	not_null<Ui::Text::CustomEmoji*> emoji,
+	const Data::UniqueGift &gift,
+	const QRect &rect,
+	float64 shown = 1.);
+
+void PaintBgPoints(
+	QPainter &p,
+	const std::vector<PatternPoint> &points,
+	base::flat_map<float64, QImage> &cache,
+	not_null<Ui::Text::CustomEmoji*> emoji,
+	const Data::UniqueGiftBackdrop &backdrop,
+	const QRect &rect,
+	float64 shown = 1.);
+
+void PaintBgPoints(
+	QPainter &p,
+	const std::vector<PatternPoint> &points,
+	base::flat_map<float64, QImage> &cache,
+	not_null<Ui::Text::CustomEmoji*> emoji,
+	const QColor &patternColor,
+	const QRect &rect,
+	float64 shown = 1.);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/ui_pch.h b/Telegram/SourceFiles/ui/ui_pch.h
index 4536e665054365..4a06a8d9a2d121 100644
--- a/Telegram/SourceFiles/ui/ui_pch.h
+++ b/Telegram/SourceFiles/ui/ui_pch.h
@@ -33,10 +33,13 @@ For license and copyright information please follow this link:
 #include "base/basic_types.h"
 #include "base/flat_map.h"
 #include "base/flat_set.h"
+#include "base/weak_qptr.h"
+
+#include "core/credits_amount.h"
 
 #include "ui/arc_angles.h"
+#include "ui/color_int_conversion.h"
 #include "ui/text/text.h"
 #include "ui/effects/animations.h"
 #include "ui/qt_object_factory.h"
-#include "ui/qt_weak_factory.h"
 #include "styles/palette.h"
diff --git a/Telegram/SourceFiles/ui/unread_badge.cpp b/Telegram/SourceFiles/ui/unread_badge.cpp
index 375beb5c68d6c1..a53032a2754864 100644
--- a/Telegram/SourceFiles/ui/unread_badge.cpp
+++ b/Telegram/SourceFiles/ui/unread_badge.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "ui/unread_badge.h"
 
+#include "data/data_emoji_statuses.h"
 #include "data/data_peer.h"
 #include "data/data_user.h"
 #include "data/data_session.h"
@@ -14,7 +15,9 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "lang/lang_keys.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/power_saving.h"
+#include "ui/text/text_custom_emoji.h"
 #include "ui/unread_badge_paint.h"
 #include "styles/style_dialogs.h"
 
@@ -22,15 +25,107 @@ namespace Ui {
 namespace {
 
 constexpr auto kPlayStatusLimit = 2;
+constexpr auto kBotVerifiedScale = 0.88;
+
+class ScaledBotVerifiedEmoji final : public Ui::Text::CustomEmoji {
+public:
+	ScaledBotVerifiedEmoji(
+		std::unique_ptr<Ui::Text::CustomEmoji> wrapped,
+		int innerSize,
+		int outerSize);
+
+	int width() override;
+	QString entityData() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	const std::unique_ptr<Ui::Text::CustomEmoji> _wrapped;
+	const int _innerSize = 0;
+	const int _outerSize = 0;
+	QImage _frame;
+	QColor _frameColor;
+
+};
+
+ScaledBotVerifiedEmoji::ScaledBotVerifiedEmoji(
+	std::unique_ptr<Ui::Text::CustomEmoji> wrapped,
+	int innerSize,
+	int outerSize)
+: _wrapped(std::move(wrapped))
+, _innerSize(innerSize)
+, _outerSize(outerSize) {
+}
+
+int ScaledBotVerifiedEmoji::width() {
+	return _outerSize;
+}
+
+QString ScaledBotVerifiedEmoji::entityData() {
+	return _wrapped->entityData();
+}
+
+void ScaledBotVerifiedEmoji::paint(QPainter &p, const Context &context) {
+	if (_frame.isNull() || _frameColor != context.textColor) {
+		if (!_wrapped->ready()) {
+			return;
+		}
+		const auto ratio = style::DevicePixelRatio();
+		const auto sourcePx = Data::FrameSizeFromTag(
+			Data::CustomEmojiSizeTag::Isolated);
+		_frame = QImage(
+			QSize(sourcePx, sourcePx),
+			QImage::Format_ARGB32_Premultiplied);
+		_frame.setDevicePixelRatio(ratio);
+		_frame.fill(Qt::transparent);
+
+		auto painter = QPainter(&_frame);
+		painter.translate(-context.position);
+		const auto was = context.internal.forceFirstFrame;
+		context.internal.forceFirstFrame = true;
+		_wrapped->paint(painter, context);
+		context.internal.forceFirstFrame = was;
+		painter.end();
+
+		_frame = _frame.scaled(
+			QSize(_innerSize, _innerSize) * ratio,
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation);
+		_frameColor = context.textColor;
+	}
+	const auto skip = (_outerSize - _innerSize) / 2;
+	p.drawImage(context.position + QPoint(skip, skip), _frame);
+}
+
+void ScaledBotVerifiedEmoji::unload() {
+	_wrapped->unload();
+}
+
+bool ScaledBotVerifiedEmoji::ready() {
+	return !_frame.isNull() || _wrapped->ready();
+}
+
+bool ScaledBotVerifiedEmoji::readyInDefaultState() {
+	return !_frame.isNull() || _wrapped->ready();
+}
 
 } // namespace
 
 struct PeerBadge::EmojiStatus {
-	DocumentId id = 0;
+	EmojiStatusId id;
 	std::unique_ptr<Ui::Text::CustomEmoji> emoji;
+	QPoint lastPosition;
+	QColor lastColor;
 	int skip = 0;
 };
 
+struct PeerBadge::BotVerifiedData {
+	QImage cache;
+	std::unique_ptr<Text::CustomEmoji> icon;
+};
+
 void UnreadBadge::setText(const QString &text, bool active) {
 	_text = text;
 	_active = active;
@@ -65,10 +160,17 @@ void UnreadBadge::paintEvent(QPaintEvent *e) {
 		unreadSt);
 }
 
-QSize ScamBadgeSize(bool fake) {
-	const auto phrase = fake
-		? tr::lng_fake_badge(tr::now)
-		: tr::lng_scam_badge(tr::now);
+QString TextBadgeText(TextBadgeType type) {
+	switch (type) {
+	case TextBadgeType::Fake: return tr::lng_fake_badge(tr::now);
+	case TextBadgeType::Scam: return tr::lng_scam_badge(tr::now);
+	case TextBadgeType::Direct: return tr::lng_direct_badge(tr::now);
+	}
+	Unexpected("Type in TextBadgeText.");
+}
+
+QSize TextBadgeSize(TextBadgeType type) {
+	const auto phrase = TextBadgeText(type);
 	const auto phraseWidth = st::dialogsScamFont->width(phrase);
 	const auto width = st::dialogsScamPadding.left()
 		+ phraseWidth
@@ -79,7 +181,7 @@ QSize ScamBadgeSize(bool fake) {
 	return { width, height };
 }
 
-void DrawScamFakeBadge(
+void DrawTextBadge(
 		Painter &p,
 		QRect rect,
 		int outerWidth,
@@ -93,24 +195,33 @@ void DrawScamFakeBadge(
 	p.setBrush(Qt::NoBrush);
 	p.drawRoundedRect(rect, st::dialogsScamRadius, st::dialogsScamRadius);
 	p.setFont(st::dialogsScamFont);
-	p.drawTextLeft(
-		rect.x() + st::dialogsScamPadding.left(),
-		rect.y() + st::dialogsScamPadding.top(),
-		outerWidth,
-		phrase,
-		phraseWidth);
+	if (style::DevicePixelRatio() > 1) {
+		p.drawText(
+			QRect(
+				rect.x() + st::dialogsScamPadding.left(),
+				rect.y() + st::dialogsScamPadding.top(),
+				rect.width() - rect::m::sum::h(st::dialogsScamPadding),
+				rect.height() - rect::m::sum::v(st::dialogsScamPadding)),
+			Qt::AlignCenter,
+			phrase);
+	} else {
+		p.drawTextLeft(
+			rect.x() + st::dialogsScamPadding.left(),
+			rect.y() + st::dialogsScamPadding.top(),
+			outerWidth,
+			phrase,
+			phraseWidth);
+	}
 }
 
-void DrawScamBadge(
-		bool fake,
+void DrawTextBadge(
+		TextBadgeType type,
 		Painter &p,
 		QRect rect,
 		int outerWidth,
 		const style::color &color) {
-	const auto phrase = fake
-		? tr::lng_fake_badge(tr::now)
-		: tr::lng_scam_badge(tr::now);
-	DrawScamFakeBadge(
+	const auto phrase = TextBadgeText(type);
+	DrawTextBadge(
 		p,
 		rect,
 		outerWidth,
@@ -123,100 +234,240 @@ PeerBadge::PeerBadge() = default;
 
 PeerBadge::~PeerBadge() = default;
 
-int PeerBadge::drawGetWidth(
-		Painter &p,
-		QRect rectForName,
-		int nameWidth,
-		int outerWidth,
-		const Descriptor &descriptor) {
+int PeerBadge::drawGetWidth(Painter &p, Descriptor &&descriptor) {
 	Expects(descriptor.customEmojiRepaint != nullptr);
 
 	const auto peer = descriptor.peer;
-	if (descriptor.scam && (peer->isScam() || peer->isFake())) {
-		const auto phrase = peer->isScam()
-			? tr::lng_scam_badge(tr::now)
-			: tr::lng_fake_badge(tr::now);
-		const auto phraseWidth = st::dialogsScamFont->width(phrase);
-		const auto width = st::dialogsScamPadding.left()
-			+ phraseWidth
-			+ st::dialogsScamPadding.right();
-		const auto height = st::dialogsScamPadding.top()
-			+ st::dialogsScamFont->height
-			+ st::dialogsScamPadding.bottom();
-		const auto rect = QRect(
-			(rectForName.x()
-				+ qMin(
-					nameWidth + st::dialogsScamSkip,
-					rectForName.width() - width)),
-			rectForName.y() + (rectForName.height() - height) / 2,
-			width,
-			height);
-		DrawScamFakeBadge(
-			p,
-			rect,
-			outerWidth,
-			*descriptor.scam,
-			phrase,
-			phraseWidth);
-		return st::dialogsScamSkip + width;
-	} else if (descriptor.premium
+	if ((descriptor.scam && (peer->isScam() || peer->isFake()))
+		|| (descriptor.direct && peer->isMonoforum())) {
+		return drawTextBadge(p, descriptor);
+	}
+	const auto verifyCheck = descriptor.verified && peer->isVerified();
+	const auto premiumMark = descriptor.premium
+		&& peer->session().premiumBadgesShown();
+	const auto emojiStatus = premiumMark
 		&& peer->emojiStatusId()
-		&& (peer->isPremium() || peer->isChannel())
-		&& peer->session().premiumBadgesShown()) {
-		const auto id = peer->emojiStatusId();
-		const auto iconw = descriptor.premium->width();
-		const auto iconx = rectForName.x()
-			+ qMin(nameWidth, rectForName.width() - iconw);
-		const auto icony = rectForName.y();
-		if (!_emojiStatus) {
-			_emojiStatus = std::make_unique<EmojiStatus>();
-			const auto size = st::emojiSize;
-			const auto emoji = Ui::Text::AdjustCustomEmojiSize(size);
-			_emojiStatus->skip = (size - emoji) / 2;
+		&& (peer->isPremium() || peer->isChannel());
+	const auto premiumStar = premiumMark
+		&& !emojiStatus
+		&& peer->isPremium();
+
+	const auto paintVerify = verifyCheck
+		&& (descriptor.prioritizeVerification
+			|| descriptor.bothVerifyAndStatus
+			|| !emojiStatus);
+	const auto paintEmoji = emojiStatus
+		&& (!paintVerify || descriptor.bothVerifyAndStatus);
+	const auto paintStar = premiumStar && !paintVerify;
+
+	auto result = 0;
+	if (paintEmoji) {
+		auto &rectForName = descriptor.rectForName;
+		const auto verifyWidth = descriptor.verified->width();
+		if (paintVerify) {
+			rectForName.setWidth(rectForName.width() - verifyWidth);
 		}
-		if (_emojiStatus->id != id) {
-			using namespace Ui::Text;
-			auto &manager = peer->session().data().customEmojiManager();
-			_emojiStatus->id = id;
-			_emojiStatus->emoji = std::make_unique<LimitedLoopsEmoji>(
-				manager.create(
-					id,
-					descriptor.customEmojiRepaint),
-				kPlayStatusLimit);
+		result += drawPremiumEmojiStatus(p, descriptor);
+		if (!paintVerify) {
+			return result;
 		}
-		_emojiStatus->emoji->paint(p, {
-			.textColor = (*descriptor.premiumFg)->c,
-			.now = descriptor.now,
-			.position = QPoint(
-				iconx - 2 * _emojiStatus->skip,
-				icony + _emojiStatus->skip),
-			.paused = descriptor.paused || On(PowerSaving::kEmojiStatus),
-		});
-		return iconw - 4 * _emojiStatus->skip;
-	} else if (descriptor.verified && peer->isVerified()) {
-		const auto iconw = descriptor.verified->width();
-		descriptor.verified->paint(
-			p,
-			rectForName.x() + qMin(nameWidth, rectForName.width() - iconw),
-			rectForName.y(),
-			outerWidth);
-		return iconw;
-	} else if (descriptor.premium
-		&& peer->isPremium()
-		&& peer->session().premiumBadgesShown()) {
-		const auto iconw = descriptor.premium->width();
-		const auto iconx = rectForName.x()
-			+ qMin(nameWidth, rectForName.width() - iconw);
-		const auto icony = rectForName.y();
-		_emojiStatus = nullptr;
-		descriptor.premium->paint(p, iconx, icony, outerWidth);
-		return iconw;
+		rectForName.setWidth(rectForName.width() + verifyWidth);
+		descriptor.nameWidth += result;
+	}
+	if (paintVerify) {
+		result += drawVerifyCheck(p, descriptor);
+		return result;
+	} else if (paintStar) {
+		return drawPremiumStar(p, descriptor);
 	}
 	return 0;
 }
 
+int PeerBadge::drawTextBadge(Painter &p, const Descriptor &descriptor) {
+	const auto type = [&] {
+		if (descriptor.peer->isScam()) {
+			return TextBadgeType::Scam;
+		} else if (descriptor.peer->isFake()) {
+			return TextBadgeType::Fake;
+		}
+		return TextBadgeType::Direct;
+	}();
+	const auto phrase = TextBadgeText(type);
+	const auto phraseWidth = st::dialogsScamFont->width(phrase);
+	const auto width = st::dialogsScamPadding.left()
+		+ phraseWidth
+		+ st::dialogsScamPadding.right();
+	const auto height = st::dialogsScamPadding.top()
+		+ st::dialogsScamFont->height
+		+ st::dialogsScamPadding.bottom();
+	const auto rectForName = descriptor.rectForName;
+	const auto rect = QRect(
+		(rectForName.x()
+			+ qMin(
+				descriptor.nameWidth + st::dialogsScamSkip,
+				rectForName.width() - width)),
+		rectForName.y() + (rectForName.height() - height) / 2,
+		width,
+		height);
+	DrawTextBadge(
+		p,
+		rect,
+		descriptor.outerWidth,
+		*((type == TextBadgeType::Direct)
+			? descriptor.direct
+			: descriptor.scam),
+		phrase,
+		phraseWidth);
+	return st::dialogsScamSkip + width;
+}
+
+int PeerBadge::drawVerifyCheck(Painter &p, const Descriptor &descriptor) {
+	const auto iconw = descriptor.verified->width();
+	const auto rectForName = descriptor.rectForName;
+	const auto nameWidth = descriptor.nameWidth;
+	descriptor.verified->paint(
+		p,
+		rectForName.x() + qMin(nameWidth, rectForName.width() - iconw),
+		rectForName.y(),
+		descriptor.outerWidth);
+	return iconw;
+}
+
+int PeerBadge::drawPremiumEmojiStatus(
+		Painter &p,
+		const Descriptor &descriptor) {
+	const auto peer = descriptor.peer;
+	const auto id = peer->emojiStatusId();
+	const auto rectForName = descriptor.rectForName;
+	const auto iconw = descriptor.premium->width();
+	const auto iconx = rectForName.x()
+		+ qMin(descriptor.nameWidth, rectForName.width() - iconw);
+	const auto icony = rectForName.y();
+	if (!_emojiStatus) {
+		_emojiStatus = std::make_unique<EmojiStatus>();
+		const auto size = st::emojiSize;
+		const auto emoji = Ui::Text::AdjustCustomEmojiSize(size);
+		_emojiStatus->skip = (size - emoji) / 2;
+	}
+	if (_emojiStatus->id != id) {
+		using namespace Ui::Text;
+		auto &manager = peer->session().data().customEmojiManager();
+		_emojiStatus->id = id;
+		_emojiStatus->emoji = MakeWrappedEmoji<LimitedLoopsEmoji>(
+			manager.create(
+				Data::EmojiStatusCustomId(id),
+				descriptor.customEmojiRepaint),
+			kPlayStatusLimit);
+	}
+	if (!_emojiStatus->emoji) {
+		return 0;
+	}
+	_emojiStatus->lastPosition = QPoint(
+		iconx - 2 * _emojiStatus->skip,
+		icony + _emojiStatus->skip);
+	_emojiStatus->lastColor = (*descriptor.premiumFg)->c;
+	_emojiStatus->emoji->paint(p, {
+		.textColor = _emojiStatus->lastColor,
+		.now = descriptor.now,
+		.position = _emojiStatus->lastPosition,
+		.paused = descriptor.paused || On(PowerSaving::kEmojiStatus),
+	});
+	return iconw - 4 * _emojiStatus->skip;
+}
+
+int PeerBadge::drawPremiumStar(Painter &p, const Descriptor &descriptor) {
+	const auto rectForName = descriptor.rectForName;
+	const auto iconw = descriptor.premium->width();
+	const auto iconx = rectForName.x()
+		+ qMin(descriptor.nameWidth, rectForName.width() - iconw);
+	const auto icony = rectForName.y();
+	_emojiStatus = nullptr;
+	descriptor.premium->paint(p, iconx, icony, descriptor.outerWidth);
+	return iconw;
+}
+
+QRect PeerBadge::emojiStatusRect() const {
+	if (!_emojiStatus || !_emojiStatus->emoji) {
+		return QRect();
+	}
+	return QRect(
+		_emojiStatus->lastPosition,
+		Size(st::emojiSize - 2 * _emojiStatus->skip));
+}
+
+void PeerBadge::paintEmojiStatusFrame(
+		QPainter &p,
+		crl::time now,
+		bool paused) {
+	if (!_emojiStatus || !_emojiStatus->emoji) {
+		return;
+	}
+	_emojiStatus->emoji->paint(p, {
+		.textColor = _emojiStatus->lastColor,
+		.now = now,
+		.position = _emojiStatus->lastPosition,
+		.paused = paused || On(PowerSaving::kEmojiStatus),
+	});
+}
+
 void PeerBadge::unload() {
 	_emojiStatus = nullptr;
 }
 
+bool PeerBadge::ready(const BotVerifyDetails *details) const {
+	if (!details || !*details) {
+		_botVerifiedData = nullptr;
+		return true;
+	} else if (!_botVerifiedData) {
+		return false;
+	}
+	if (!details->iconId) {
+		_botVerifiedData->icon = nullptr;
+	} else if (!_botVerifiedData->icon
+		|| (_botVerifiedData->icon->entityData()
+			!= Data::SerializeCustomEmojiId(details->iconId))) {
+		return false;
+	}
+	return true;
+}
+
+void PeerBadge::set(
+		not_null<const BotVerifyDetails*> details,
+		Ui::Text::CustomEmojiFactory factory,
+		Fn<void()> repaint) {
+	if (!_botVerifiedData) {
+		_botVerifiedData = std::make_unique<BotVerifiedData>();
+	}
+	if (details->iconId) {
+		const auto outer = st::emojiSize;
+		const auto inner = int(base::SafeRound(
+			st::emojiSize * kBotVerifiedScale));
+		_botVerifiedData->icon = MakeWrappedEmoji<ScaledBotVerifiedEmoji>(
+			factory(
+				Data::SerializeCustomEmojiId(details->iconId),
+				{ .repaint = repaint }),
+			inner,
+			outer);
+	}
+}
+
+int PeerBadge::drawVerified(
+		QPainter &p,
+		QPoint position,
+		const style::VerifiedBadge &st) {
+	const auto data = _botVerifiedData.get();
+	if (!data) {
+		return 0;
+	}
+	if (const auto icon = data->icon.get()) {
+		icon->paint(p, {
+			.textColor = st.color->c,
+			.now = crl::now(),
+			.position = position + st.position,
+		});
+		return icon->width();
+	}
+	return 0;
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/unread_badge.h b/Telegram/SourceFiles/ui/unread_badge.h
index 4172330efe333a..4029b4b615d3b3 100644
--- a/Telegram/SourceFiles/ui/unread_badge.h
+++ b/Telegram/SourceFiles/ui/unread_badge.h
@@ -7,11 +7,12 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "ui/text/text_custom_emoji.h"
 #include "ui/rp_widget.h"
 
-namespace Ui::Text {
-class CustomEmoji;
-} // namespace Ui::Text
+namespace style {
+struct VerifiedBadge;
+} // namespace style
 
 namespace Ui {
 
@@ -31,6 +32,19 @@ class UnreadBadge : public RpWidget {
 
 };
 
+struct BotVerifyDetails {
+	UserId botId = 0;
+	DocumentId iconId = 0;
+	TextWithEntities description;
+
+	explicit operator bool() const {
+		return iconId != 0;
+	}
+	friend inline bool operator==(
+		const BotVerifyDetails &,
+		const BotVerifyDetails &) = default;
+};
+
 class PeerBadge {
 public:
 	PeerBadge();
@@ -38,31 +52,60 @@ class PeerBadge {
 
 	struct Descriptor {
 		not_null<PeerData*> peer;
+		QRect rectForName;
+		int nameWidth = 0;
+		int outerWidth = 0;
 		const style::icon *verified = nullptr;
 		const style::icon *premium = nullptr;
 		const style::color *scam = nullptr;
+		const style::color *direct = nullptr;
 		const style::color *premiumFg = nullptr;
 		Fn<void()> customEmojiRepaint;
 		crl::time now = 0;
+		bool prioritizeVerification = false;
+		bool bothVerifyAndStatus = false;
 		bool paused = false;
 	};
-	int drawGetWidth(
-		Painter &p,
-		QRect rectForName,
-		int nameWidth,
-		int outerWidth,
-		const Descriptor &descriptor);
+	int drawGetWidth(Painter &p, Descriptor &&descriptor);
+	[[nodiscard]] QRect emojiStatusRect() const;
+	void paintEmojiStatusFrame(QPainter &p, crl::time now, bool paused);
 	void unload();
 
+	[[nodiscard]] bool ready(const BotVerifyDetails *details) const;
+	void set(
+		not_null<const BotVerifyDetails*> details,
+		Text::CustomEmojiFactory factory,
+		Fn<void()> repaint);
+
+	// How much horizontal space the badge took.
+	int drawVerified(
+		QPainter &p,
+		QPoint position,
+		const style::VerifiedBadge &st);
+
 private:
 	struct EmojiStatus;
+	struct BotVerifiedData;
+
+	int drawTextBadge(Painter &p, const Descriptor &descriptor);
+	int drawVerifyCheck(Painter &p, const Descriptor &descriptor);
+	int drawPremiumEmojiStatus(Painter &p, const Descriptor &descriptor);
+	int drawPremiumStar(Painter &p, const Descriptor &descriptor);
+
 	std::unique_ptr<EmojiStatus> _emojiStatus;
+	mutable std::unique_ptr<BotVerifiedData> _botVerifiedData;
+
+};
 
+enum class TextBadgeType : uchar {
+	Scam,
+	Fake,
+	Direct,
 };
 
-QSize ScamBadgeSize(bool fake);
-void DrawScamBadge(
-	bool fake,
+QSize TextBadgeSize(TextBadgeType type);
+void DrawTextBadge(
+	TextBadgeType,
 	Painter &p,
 	QRect rect,
 	int outerWidth,
diff --git a/Telegram/SourceFiles/ui/unread_badge_paint.cpp b/Telegram/SourceFiles/ui/unread_badge_paint.cpp
index d6b150a08234c3..df0e6ac01ed2e1 100644
--- a/Telegram/SourceFiles/ui/unread_badge_paint.cpp
+++ b/Telegram/SourceFiles/ui/unread_badge_paint.cpp
@@ -38,12 +38,20 @@ class UnreadBadgeStyleData {
 		st::dialogsUnreadBgMutedOver,
 		st::dialogsUnreadBgMutedActive
 	};
+	style::color pollBg[6] = {
+		st::dialogsPollIconFg,
+		st::dialogsPollIconFg,
+		st::dialogsPollIconFg,
+		st::dialogsUnreadBgMuted,
+		st::dialogsUnreadBgMutedOver,
+		st::dialogsUnreadBgMutedActive
+	};
 	rpl::lifetime lifetime;
 };
 
 UnreadBadgeStyleData::UnreadBadgeStyleData() {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &data : sizes) {
 			for (auto &left : data.left) {
 				left = QPixmap();
@@ -100,6 +108,8 @@ void PaintUnreadBadge(QPainter &p, const QRect &rect, const UnreadBadgeStyle &st
 	}
 	const auto bg = (st.sizeId == UnreadBadgeSize::ReactionInDialogs)
 		? styles.reactionBg[index]
+		: (st.sizeId == UnreadBadgeSize::PollInDialogs)
+		? styles.pollBg[index]
 		: styles.bg[index];
 	if (badgeData->left[index].isNull()) {
 		const auto ratio = style::DevicePixelRatio();
diff --git a/Telegram/SourceFiles/ui/unread_badge_paint.h b/Telegram/SourceFiles/ui/unread_badge_paint.h
index 1631eca2fcc376..8738cfade66342 100644
--- a/Telegram/SourceFiles/ui/unread_badge_paint.h
+++ b/Telegram/SourceFiles/ui/unread_badge_paint.h
@@ -17,6 +17,7 @@ enum class UnreadBadgeSize {
 	StickersBox,
 	TouchBar,
 	ReactionInDialogs,
+	PollInDialogs,
 
 	kCount,
 };
diff --git a/Telegram/SourceFiles/ui/unread_counter_format.cpp b/Telegram/SourceFiles/ui/unread_counter_format.cpp
new file mode 100644
index 00000000000000..aba6cff3ae4446
--- /dev/null
+++ b/Telegram/SourceFiles/ui/unread_counter_format.cpp
@@ -0,0 +1,27 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/unread_counter_format.h"
+
+QString FormatUnreadCounter(
+		int unreadCounter,
+		bool hasMentionOrReaction,
+		bool narrow) {
+	if (unreadCounter <= 0) {
+		return QString();
+	}
+	if (!narrow) {
+		return QString::number(unreadCounter);
+	}
+	if (hasMentionOrReaction && (unreadCounter > 999)) {
+		return u"99+"_q;
+	}
+	if (unreadCounter > 999999) {
+		return u"99999+"_q;
+	}
+	return QString::number(unreadCounter);
+}
\ No newline at end of file
diff --git a/Telegram/SourceFiles/ui/unread_counter_format.h b/Telegram/SourceFiles/ui/unread_counter_format.h
new file mode 100644
index 00000000000000..f9d90a32b75a44
--- /dev/null
+++ b/Telegram/SourceFiles/ui/unread_counter_format.h
@@ -0,0 +1,13 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+[[nodiscard]] QString FormatUnreadCounter(
+	int unreadCounter,
+	bool hasMentionOrReaction,
+	bool narrow = false);
\ No newline at end of file
diff --git a/Telegram/SourceFiles/ui/userpic_view.cpp b/Telegram/SourceFiles/ui/userpic_view.cpp
index f14ac76e809fc2..ff5f336d42615a 100644
--- a/Telegram/SourceFiles/ui/userpic_view.cpp
+++ b/Telegram/SourceFiles/ui/userpic_view.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "ui/userpic_view.h"
 
 #include "ui/empty_userpic.h"
+#include "ui/painter.h"
 #include "ui/image/image_prepare.h"
 
 namespace Ui {
@@ -25,14 +26,14 @@ void ValidateUserpicCache(
 		const QImage *cloud,
 		const EmptyUserpic *empty,
 		int size,
-		bool forum) {
+		PeerUserpicShape shape) {
 	Expects(cloud != nullptr || empty != nullptr);
 
 	const auto full = QSize(size, size);
 	const auto version = style::PaletteVersion();
-	const auto forumValue = forum ? 1 : 0;
+	const auto shapeValue = static_cast<uint32>(shape) & 3;
 	const auto regenerate = (view.cached.size() != QSize(size, size))
-		|| (view.forum != forumValue)
+		|| (view.shape != shapeValue)
 		|| (cloud && !view.empty.null())
 		|| (empty && empty != view.empty.get())
 		|| (empty && view.paletteVersion != version);
@@ -40,7 +41,7 @@ void ValidateUserpicCache(
 		return;
 	}
 	view.empty = empty;
-	view.forum = forumValue;
+	view.shape = shapeValue;
 	view.paletteVersion = version;
 
 	if (cloud) {
@@ -48,7 +49,9 @@ void ValidateUserpicCache(
 			full,
 			Qt::IgnoreAspectRatio,
 			Qt::SmoothTransformation);
-		if (forum) {
+		if (shape == PeerUserpicShape::Monoforum) {
+			view.cached = Ui::ApplyMonoforumShape(std::move(view.cached));
+		} else if (shape == PeerUserpicShape::Forum) {
 			view.cached = Images::Round(
 				std::move(view.cached),
 				Images::CornersMask(size
@@ -64,7 +67,9 @@ void ValidateUserpicCache(
 		view.cached.fill(Qt::transparent);
 
 		auto p = QPainter(&view.cached);
-		if (forum) {
+		if (shape == PeerUserpicShape::Monoforum) {
+			empty->paintMonoforum(p, 0, 0, size, size);
+		} else if (shape == PeerUserpicShape::Forum) {
 			empty->paintRounded(
 				p,
 				0,
diff --git a/Telegram/SourceFiles/ui/userpic_view.h b/Telegram/SourceFiles/ui/userpic_view.h
index 6e50127d747b70..0bd9cbcedc9bb3 100644
--- a/Telegram/SourceFiles/ui/userpic_view.h
+++ b/Telegram/SourceFiles/ui/userpic_view.h
@@ -17,6 +17,13 @@ class EmptyUserpic;
 
 [[nodiscard]] float64 ForumUserpicRadiusMultiplier();
 
+enum class PeerUserpicShape : uint8 {
+	Auto,
+	Circle,
+	Forum,
+	Monoforum,
+};
+
 struct PeerUserpicView {
 	[[nodiscard]] bool null() const {
 		return cached.isNull() && !cloud && empty.null();
@@ -25,8 +32,8 @@ struct PeerUserpicView {
 	QImage cached;
 	std::shared_ptr<QImage> cloud;
 	base::weak_ptr<const EmptyUserpic> empty;
-	uint32 paletteVersion : 31 = 0;
-	uint32 forum : 1 = 0;
+	uint32 paletteVersion : 30 = 0;
+	uint32 shape : 2 = 0;
 };
 
 [[nodiscard]] bool PeerUserpicLoading(const PeerUserpicView &view);
@@ -36,6 +43,6 @@ void ValidateUserpicCache(
 	const QImage *cloud,
 	const EmptyUserpic *empty,
 	int size,
-	bool forum);
+	PeerUserpicShape shape);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/vertical_list.cpp b/Telegram/SourceFiles/ui/vertical_list.cpp
index 6666077dd22b68..fca730176564e4 100644
--- a/Telegram/SourceFiles/ui/vertical_list.cpp
+++ b/Telegram/SourceFiles/ui/vertical_list.cpp
@@ -7,7 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "ui/vertical_list.h"
 
-#include "ui/text/text_utilities.h"
+#include "lang/lang_text_entity.h"
 #include "ui/widgets/box_content_divider.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/padding_wrap.h"
@@ -24,19 +24,26 @@ void AddSkip(not_null<Ui::VerticalLayout*> container, int skip) {
 	container->add(object_ptr<Ui::FixedHeightWidget>(container, skip));
 }
 
-void AddDivider(not_null<Ui::VerticalLayout*> container) {
-	container->add(object_ptr<Ui::BoxContentDivider>(container));
+void AddDivider(
+		not_null<Ui::VerticalLayout*> container,
+		const style::DividerBar &st) {
+	container->add(object_ptr<Ui::BoxContentDivider>(
+		container,
+		st::boxDividerHeight,
+		st));
 }
 
 not_null<Ui::FlatLabel*> AddDividerText(
 		not_null<Ui::VerticalLayout*> container,
 		rpl::producer<QString> text,
 		const style::margins &margins,
+		const style::DividerLabel &st,
 		RectParts parts) {
 	return AddDividerText(
 		container,
-		std::move(text) | Ui::Text::ToWithEntities(),
+		std::move(text) | rpl::map(tr::marked),
 		margins,
+		st,
 		parts);
 }
 
@@ -44,16 +51,18 @@ not_null<Ui::FlatLabel*> AddDividerText(
 		not_null<Ui::VerticalLayout*> container,
 		rpl::producer<TextWithEntities> text,
 		const style::margins &margins,
+		const style::DividerLabel &st,
 		RectParts parts) {
 	auto label = object_ptr<Ui::FlatLabel>(
 		container,
 		std::move(text),
-		st::boxDividerLabel);
+		st.label);
 	const auto result = label.data();
 	container->add(object_ptr<Ui::DividerLabel>(
 		container,
 		std::move(label),
 		margins,
+		st.bar,
 		parts));
 	return result;
 }
diff --git a/Telegram/SourceFiles/ui/vertical_list.h b/Telegram/SourceFiles/ui/vertical_list.h
index 82934367f81f64..656e9cab1a1b56 100644
--- a/Telegram/SourceFiles/ui/vertical_list.h
+++ b/Telegram/SourceFiles/ui/vertical_list.h
@@ -11,10 +11,14 @@ For license and copyright information please follow this link:
 
 namespace style {
 struct FlatLabel;
+struct DividerBar;
+struct DividerLabel;
 } // namespace style
 
 namespace st {
 extern const style::margins &defaultBoxDividerLabelPadding;
+extern const style::DividerBar &defaultDividerBar;
+extern const style::DividerLabel &defaultDividerLabel;
 } // namespace st
 
 namespace Ui {
@@ -24,16 +28,20 @@ class VerticalLayout;
 
 void AddSkip(not_null<Ui::VerticalLayout*> container);
 void AddSkip(not_null<Ui::VerticalLayout*> container, int skip);
-void AddDivider(not_null<Ui::VerticalLayout*> container);
+void AddDivider(
+	not_null<Ui::VerticalLayout*> container,
+	const style::DividerBar &st = st::defaultDividerBar);
 not_null<Ui::FlatLabel*> AddDividerText(
 	not_null<Ui::VerticalLayout*> container,
 	rpl::producer<QString> text,
 	const style::margins &margins = st::defaultBoxDividerLabelPadding,
+	const style::DividerLabel &st = st::defaultDividerLabel,
 	RectParts parts = RectPart::Top | RectPart::Bottom);
 not_null<Ui::FlatLabel*> AddDividerText(
 	not_null<Ui::VerticalLayout*> container,
 	rpl::producer<TextWithEntities> text,
 	const style::margins &margins = st::defaultBoxDividerLabelPadding,
+	const style::DividerLabel &st = st::defaultDividerLabel,
 	RectParts parts = RectPart::Top | RectPart::Bottom);
 not_null<Ui::FlatLabel*> AddSubsectionTitle(
 	not_null<Ui::VerticalLayout*> container,
diff --git a/Telegram/SourceFiles/ui/webview_helpers.cpp b/Telegram/SourceFiles/ui/webview_helpers.cpp
index a0369421b0f48f..e68f19e857fc45 100644
--- a/Telegram/SourceFiles/ui/webview_helpers.cpp
+++ b/Telegram/SourceFiles/ui/webview_helpers.cpp
@@ -15,9 +15,9 @@ namespace {
 [[nodiscard]] QByteArray Serialize(const QColor &qt) {
 	if (qt.alpha() == 255) {
 		return '#'
-			+ QByteArray::number(qt.red(), 16).right(2)
-			+ QByteArray::number(qt.green(), 16).right(2)
-			+ QByteArray::number(qt.blue(), 16).right(2);
+			+ QByteArray::number(qt.red(), 16).rightJustified(2, '0')
+			+ QByteArray::number(qt.green(), 16).rightJustified(2, '0')
+			+ QByteArray::number(qt.blue(), 16).rightJustified(2, '0');
 	}
 	return "rgba("
 		+ QByteArray::number(qt.red()) + ","
@@ -101,9 +101,9 @@ QByteArray ComputeSemiTransparentOverStyle(
 	const auto gmina = mina(g0, g1);
 	const auto bmina = mina(b0, b1);
 	const auto a = std::max({ rmina, gmina, bmina });
-	const auto r = (r1 * 255 - r0 * (255 - a)) / a;
-	const auto g = (g1 * 255 - g0 * (255 - a)) / a;
-	const auto b = (b1 * 255 - b0 * (255 - a)) / a;
+	const auto r = (a > 0) ? ((r1 * 255 - r0 * (255 - a)) / a) : r0;
+	const auto g = (a > 0) ? ((g1 * 255 - g0 * (255 - a)) / a) : g0;
+	const auto b = (a > 0) ? ((b1 * 255 - b0 * (255 - a)) / a) : b0;
 	return result(QColor(r, g, b, a));
 }
 
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
new file mode 100644
index 00000000000000..c3390a14afb7b3
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.cpp
@@ -0,0 +1,452 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/widgets/chat_filters_tabs_slider.h"
+
+#include "ui/effects/ripple_animation.h"
+#include "ui/widgets/side_bar_button.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_widgets.h"
+
+#include <QScrollBar>
+
+namespace Ui {
+
+ChatsFiltersTabs::ChatsFiltersTabs(
+	not_null<Ui::RpWidget*> parent,
+	const style::SettingsSlider &st)
+: Ui::SettingsSlider(parent, st)
+, _st(st)
+, _unreadSt([&] {
+	auto st = Ui::UnreadBadgeStyle();
+	st.align = style::al_left;
+	return st;
+}())
+, _unreadMaxString(u"99+"_q)
+, _unreadSkip(st::lineWidth * 5) {
+	Expects(_st.barSnapToLabel && _st.strictSkip);
+	if (_st.barRadius > 0) {
+		_bar.emplace(_st.barRadius, _st.barFg);
+		_barActive.emplace(_st.barRadius, _st.barFgActive);
+	}
+	{
+		const auto one = Ui::CountUnreadBadgeSize(u"9"_q, _unreadSt, 1);
+		_cachedBadgeWidths = {
+			one.width(),
+			Ui::CountUnreadBadgeSize(u"99"_q, _unreadSt, 2).width(),
+			Ui::CountUnreadBadgeSize(u"999"_q, _unreadSt, 2).width(),
+		};
+		_cachedBadgeHeight = one.height();
+	}
+	style::PaletteChanged(
+	) | rpl::on_next([=] {
+		for (auto &[index, unread] : _unreadCounts) {
+			unread.cache = cacheUnreadCount(unread.count, unread.muted);
+		}
+		update();
+	}, lifetime());
+	Ui::DiscreteSlider::setSelectOnPress(false);
+}
+
+bool ChatsFiltersTabs::setSectionsAndCheckChanged(
+		std::vector<TextWithEntities> &&sections,
+		const Text::MarkedContext &context,
+		Fn<bool()> paused) {
+	const auto &was = sectionsRef();
+	const auto changed = [&] {
+		if (was.size() != sections.size()) {
+			return true;
+		}
+		for (auto i = 0; i < sections.size(); i++) {
+			if (was[i].label.toTextWithEntities() != sections[i]) {
+				return true;
+			}
+		}
+		return false;
+	}();
+	if (changed) {
+		Ui::DiscreteSlider::setSections(std::move(sections), context);
+	}
+	_emojiPaused = std::move(paused);
+	return changed;
+}
+
+void ChatsFiltersTabs::fitWidthToSections() {
+	SettingsSlider::fitWidthToSections();
+
+	_lockedFromX = calculateLockedFromX();
+
+	{
+		_sections.clear();
+		enumerateSections([&](Section &section) {
+			_sections.push_back({ not_null{ &section }, 0, false });
+			return true;
+		});
+	}
+}
+
+void ChatsFiltersTabs::setUnreadCount(int index, int unreadCount, bool mute) {
+	const auto it = _unreadCounts.find(index);
+	if (it == _unreadCounts.end()) {
+		if (unreadCount) {
+			_unreadCounts.emplace(index, Unread{
+				.cache = cacheUnreadCount(unreadCount, mute),
+				.count = ushort(std::clamp(
+					unreadCount,
+					0,
+					int(std::numeric_limits<ushort>::max()))),
+				.muted = mute,
+			});
+			update();
+		}
+	} else if (!unreadCount) {
+		_unreadCounts.erase(it);
+		update();
+	} else if (it->second.count != unreadCount || it->second.muted != mute) {
+		it->second.count = unreadCount;
+		it->second.muted = mute;
+		it->second.cache = cacheUnreadCount(unreadCount, mute);
+		update();
+	}
+	if (unreadCount) {
+		const auto widthIndex = (unreadCount < 10)
+			? 0
+			: (unreadCount < 100)
+			? 1
+			: 2;
+		setAdditionalContentWidthToSection(
+			index,
+			_cachedBadgeWidths[widthIndex] + _unreadSkip);
+	} else {
+		setAdditionalContentWidthToSection(index, 0);
+	}
+}
+
+int ChatsFiltersTabs::calculateLockedFromX() const {
+	if (!_lockedFrom) {
+		return std::numeric_limits<int>::max();
+	}
+	auto left = 0;
+	auto index = 0;
+	enumerateSections([&](const Section &section) {
+		const auto currentRight = section.left + section.width;
+		if (index == _lockedFrom) {
+			return false;
+		}
+		left = currentRight;
+		index++;
+		return true;
+	});
+	return left ? left : std::numeric_limits<int>::max();
+}
+
+void ChatsFiltersTabs::setLockedFrom(int index) {
+	_lockedFrom = index;
+	_lockedFromX = calculateLockedFromX();
+	if (!index) {
+		_paletteLifetime.destroy();
+		return;
+	}
+	_paletteLifetime = style::PaletteChanged(
+	) | rpl::on_next([this] {
+		_lockCache.emplace(Ui::SideBarLockIcon(_st.labelFg));
+	});
+}
+
+QImage ChatsFiltersTabs::cacheUnreadCount(int count, bool muted) const {
+	const auto widthIndex = (count < 10) ? 0 : (count < 100) ? 1 : 2;
+	auto image = QImage(
+		QSize(_cachedBadgeWidths[widthIndex], _cachedBadgeHeight)
+			* style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(style::DevicePixelRatio());
+	image.fill(Qt::transparent);
+	const auto string = (count > 999)
+		? _unreadMaxString
+		: QString::number(count);
+	{
+		auto p = QPainter(&image);
+		if (muted) {
+			auto copy = _unreadSt;
+			copy.muted = muted;
+			Ui::PaintUnreadBadge(p, string, 0, 0, copy, 0);
+		} else {
+			Ui::PaintUnreadBadge(p, string, 0, 0, _unreadSt, 0);
+		}
+	}
+	return image;
+}
+
+void ChatsFiltersTabs::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	const auto clip = e->rect();
+	const auto range = getCurrentActiveRange();
+	const auto activeIndex = activeSection();
+	const auto now = crl::now();
+
+	auto index = 0;
+	auto raisedIndex = -1;
+	auto activeHorizontalShift = 0;
+	const auto drawSection = [&](Section &section) {
+		// const auto activeWidth = _st.barSnapToLabel
+		// 	? section.contentWidth
+		// 	: section.width;
+
+		const auto horizontalShift = _sections[index].horizontalShift;
+		const auto shiftedLeft = section.left + horizontalShift;
+		if (_sections[index].raise) {
+			raisedIndex = index;
+		}
+		if (index == activeIndex) {
+			activeHorizontalShift = horizontalShift;
+		}
+
+		// const auto activeLeft = shiftedLeft
+		// 	+ (section.width - activeWidth) / 2;
+		// const auto active = 1.
+		// 	- std::clamp(
+		// 		std::abs(range.left - activeLeft) / float64(range.width),
+		// 		0.,
+		// 		1.);
+		const auto active = (index == activeIndex) ? 1. : 0.;
+		if (section.ripple) {
+			const auto color = anim::color(
+				_st.rippleBg,
+				_st.rippleBgActive,
+				active);
+			section.ripple->paint(p, shiftedLeft, 0, width(), &color);
+			if (section.ripple->empty()) {
+				section.ripple.reset();
+			}
+		}
+		const auto labelLeft = shiftedLeft
+			+ (section.width - section.contentWidth) / 2;
+		const auto rect = myrtlrect(
+			labelLeft,
+			_st.labelTop,
+			section.contentWidth,
+			_st.labelStyle.font->height);
+		if (rect.intersects(clip)) {
+			const auto locked = (_lockedFrom && (index >= _lockedFrom));
+			if (locked) {
+				constexpr auto kPremiumLockedOpacity = 0.6;
+				p.setOpacity(kPremiumLockedOpacity);
+			}
+			p.setPen(anim::pen(_st.labelFg, _st.labelFgActive, active));
+			section.label.draw(p, {
+				.position = QPoint(labelLeft, _st.labelTop),
+				.outerWidth = width(),
+				.availableWidth = section.label.maxWidth(),
+				.now = now,
+				.pausedEmoji = _emojiPaused && _emojiPaused(),
+			});
+			{
+				const auto it = _unreadCounts.find(index);
+				if (it != _unreadCounts.end()) {
+					p.drawImage(
+						labelLeft
+							+ _unreadSkip
+							+ section.label.maxWidth(),
+						_st.labelTop,
+						it->second.cache);
+				}
+			}
+			if (locked) {
+				if (!_lockCache) {
+					_lockCache.emplace(Ui::SideBarLockIcon(_st.labelFg));
+				}
+				const auto size = _lockCache->size()
+					/ style::DevicePixelRatio();
+				p.drawImage(
+					labelLeft + (section.label.maxWidth() - size.width()) / 2,
+					height() - size.height() - st::lineWidth,
+					*_lockCache);
+				p.setOpacity(1.0);
+			}
+		}
+		index++;
+		return true;
+	};
+	enumerateSections(drawSection);
+	if (raisedIndex >= 0) {
+		index = raisedIndex;
+		drawSection(*_sections[raisedIndex].section);
+	}
+	if (_st.barSnapToLabel) {
+		const auto drawRect = [&](QRect rect, bool active) {
+			const auto &bar = active ? _barActive : _bar;
+			if (bar) {
+				bar->paint(p, rect);
+			} else {
+				p.fillRect(rect, active ? _st.barFgActive : _st.barFg);
+			}
+		};
+		const auto add = _st.barStroke / 2;
+		const auto from = std::max(range.left - add, 0);
+		const auto till = std::min(range.left + range.width + add, width());
+		if (from < till) {
+			drawRect(
+				myrtlrect(
+					from,
+					_st.barTop,
+					till - from,
+					_st.barStroke).translated(activeHorizontalShift, 0),
+				true);
+		}
+	}
+}
+
+void ChatsFiltersTabs::mousePressEvent(QMouseEvent *e) {
+	const auto mouseButton = e->button();
+	if (mouseButton == Qt::MouseButton::LeftButton) {
+		_lockedPressed = (e->pos().x() >= _lockedFromX);
+		if (_lockedPressed) {
+			Ui::RpWidget::mousePressEvent(e);
+		} else {
+			Ui::SettingsSlider::mousePressEvent(e);
+		}
+	} else {
+		Ui::RpWidget::mousePressEvent(e);
+	}
+}
+
+void ChatsFiltersTabs::mouseMoveEvent(QMouseEvent *e) {
+	if (_reordering) {
+		Ui::RpWidget::mouseMoveEvent(e);
+	} else {
+		Ui::SettingsSlider::mouseMoveEvent(e);
+	}
+}
+
+void ChatsFiltersTabs::mouseReleaseEvent(QMouseEvent *e) {
+	const auto mouseButton = e->button();
+	if (mouseButton == Qt::MouseButton::LeftButton) {
+		if (base::take(_lockedPressed)) {
+			_lockedPressed = false;
+			_lockedClicked.fire({});
+		} else {
+			if (_reordering) {
+				for (const auto &section : _sections) {
+					if (section.section->ripple) {
+						section.section->ripple->lastStop();
+					}
+				}
+			} else {
+				Ui::SettingsSlider::mouseReleaseEvent(e);
+			}
+		}
+	} else {
+		Ui::RpWidget::mouseReleaseEvent(e);
+	}
+}
+
+void ChatsFiltersTabs::contextMenuEvent(QContextMenuEvent *e) {
+	const auto pos = e->pos();
+	if (pos.x() >= _lockedFromX) {
+		return;
+	}
+	auto left = 0;
+	auto index = 0;
+	enumerateSections([&](const Section &section) {
+		const auto currentRight = section.left + section.width;
+		if (pos.x() > left && pos.x() < currentRight) {
+			return false;
+		}
+		left = currentRight;
+		index++;
+		return true;
+	});
+	_contextMenuRequested.fire_copy(index);
+}
+
+rpl::producer<int> ChatsFiltersTabs::contextMenuRequested() const {
+	return _contextMenuRequested.events();
+}
+
+rpl::producer<> ChatsFiltersTabs::lockedClicked() const {
+	return _lockedClicked.events();
+}
+
+int ChatsFiltersTabs::count() const {
+	return _sections.size();
+}
+
+void ChatsFiltersTabs::setHorizontalShift(int index, int shift) {
+	Expects(index >= 0 && index < _sections.size());
+
+	auto &section = _sections[index];
+	if (shift - section.horizontalShift) {
+		section.horizontalShift = shift;
+		update();
+	}
+}
+
+void ChatsFiltersTabs::setRaised(int index) {
+	_sections[index].raise = true;
+	update();
+}
+
+void ChatsFiltersTabs::reorderSections(int oldIndex, int newIndex) {
+	Expects(oldIndex >= 0 && oldIndex < _sections.size());
+	Expects(newIndex >= 0 && newIndex < _sections.size());
+	// Expects(!_inResize);
+	auto lefts = std::vector<int>();
+	enumerateSections([&](Section &section) {
+		lefts.emplace_back(section.left);
+		return true;
+	});
+	const auto wasActive = activeSection();
+
+	{
+		auto unreadCounts = base::flat_map<Index, Unread>();
+		for (auto &[index, unread] : _unreadCounts) {
+			unreadCounts.emplace(
+				base::reorder_index(index, oldIndex, newIndex),
+				std::move(unread));
+		}
+		_unreadCounts = std::move(unreadCounts);
+	}
+
+	base::reorder(sectionsRef(), oldIndex, newIndex);
+	Ui::DiscreteSlider::setActiveSectionFast(
+		base::reorder_index(wasActive, oldIndex, newIndex));
+	Ui::DiscreteSlider::stopAnimation();
+
+	{
+		_sections.clear();
+		auto left = 0;
+		enumerateSections([&](Section &section) {
+			_sections.push_back({ not_null{ &section }, 0, false });
+			section.left = left;
+			left += section.width;
+			return true;
+		});
+	}
+	update();
+}
+
+not_null<Ui::DiscreteSlider::Section*> ChatsFiltersTabs::widgetAt(
+		int index) const {
+	Expects(index >= 0 && index < count());
+
+	return _sections[index].section;
+}
+
+void ChatsFiltersTabs::setReordering(int value) {
+	_reordering = value;
+}
+
+int ChatsFiltersTabs::reordering() const {
+	return _reordering;
+}
+
+void ChatsFiltersTabs::stopAnimation() {
+	Ui::DiscreteSlider::stopAnimation();
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
new file mode 100644
index 00000000000000..3e4ace259afe2c
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider.h
@@ -0,0 +1,104 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/unread_badge_paint.h"
+#include "ui/widgets/discrete_sliders.h"
+
+namespace style {
+struct SettingsSlider;
+} // namespace style
+
+namespace Ui {
+
+class RpWidget;
+class SettingsSlider;
+
+class ChatsFiltersTabsReorder;
+
+class ChatsFiltersTabs final : public Ui::SettingsSlider {
+public:
+	ChatsFiltersTabs(
+		not_null<Ui::RpWidget*> parent,
+		const style::SettingsSlider &st);
+
+	bool setSectionsAndCheckChanged(
+		std::vector<TextWithEntities> &&sections,
+		const Text::MarkedContext &context,
+		Fn<bool()> paused);
+
+	void fitWidthToSections() override;
+	void setUnreadCount(int index, int unreadCount, bool muted);
+	void setLockedFrom(int index);
+	[[nodiscard]] int lockedFrom() const {
+		return _lockedFrom;
+	}
+
+	[[nodiscard]] rpl::producer<int> contextMenuRequested() const;
+	[[nodiscard]] rpl::producer<> lockedClicked() const;
+
+	void setHorizontalShift(int index, int shift);
+	void setRaised(int index);
+	[[nodiscard]] int count() const;
+	void reorderSections(int oldIndex, int newIndex);
+	[[nodiscard]] not_null<DiscreteSlider::Section*> widgetAt(int i) const;
+	void setReordering(int value);
+	[[nodiscard]] int reordering() const;
+
+	void stopAnimation();
+
+protected:
+	struct ShiftedSection {
+		not_null<Ui::DiscreteSlider::Section*> section;
+		int horizontalShift = 0;
+		bool raise = false;
+	};
+	friend class ChatsFiltersTabsReorder;
+
+	void paintEvent(QPaintEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void contextMenuEvent(QContextMenuEvent *e) override;
+
+	std::vector<ShiftedSection> _sections;
+
+private:
+	[[nodiscard]] QImage cacheUnreadCount(int count, bool muted) const;
+	[[nodiscard]] int calculateLockedFromX() const;
+
+	using Index = int;
+	struct Unread final {
+		QImage cache;
+		ushort count = 0;
+		bool muted = false;
+	};
+	base::flat_map<Index, Unread> _unreadCounts;
+	const style::SettingsSlider &_st;
+	const UnreadBadgeStyle _unreadSt;
+	const QString _unreadMaxString;
+	const int _unreadSkip;
+	std::vector<int> _cachedBadgeWidths;
+	int _cachedBadgeHeight = 0;
+	int _lockedFrom = 0;
+	int _lockedFromX = 0;
+	bool _lockedPressed = false;
+	std::optional<Ui::RoundRect> _bar;
+	std::optional<Ui::RoundRect> _barActive;
+	std::optional<QImage> _lockCache;
+	Fn<bool()> _emojiPaused;
+
+	int _reordering = 0;
+
+	rpl::lifetime _paletteLifetime;
+	rpl::event_stream<int> _contextMenuRequested;
+	rpl::event_stream<> _lockedClicked;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp
new file mode 100644
index 00000000000000..891abb31dd6e98
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.cpp
@@ -0,0 +1,376 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/widgets/chat_filters_tabs_slider_reorder.h"
+
+#include "ui/widgets/scroll_area.h"
+#include "styles/style_basic.h"
+
+#include <QScrollBar>
+#include <QtGui/QtEvents>
+#include <QtWidgets/QApplication>
+
+namespace Ui {
+namespace {
+
+constexpr auto kScrollFactor = 0.05;
+
+} // namespace
+
+ChatsFiltersTabsReorder::ChatsFiltersTabsReorder(
+	not_null<ChatsFiltersTabs*> layout,
+	not_null<ScrollArea*> scroll)
+: _layout(layout)
+, _scroll(scroll)
+, _scrollAnimation([this] { updateScrollCallback(); }) {
+}
+
+ChatsFiltersTabsReorder::ChatsFiltersTabsReorder(
+	not_null<ChatsFiltersTabs*> layout)
+: _layout(layout) {
+}
+
+void ChatsFiltersTabsReorder::cancel() {
+	if (_currentWidget) {
+		cancelCurrent(indexOf(_currentWidget));
+	}
+	_lifetime.destroy();
+	for (auto i = 0, count = _layout->count(); i != count; ++i) {
+		_layout->setHorizontalShift(i, 0);
+	}
+	_entries.clear();
+}
+
+void ChatsFiltersTabsReorder::start() {
+	const auto count = _layout->count();
+	if (count < 2) {
+		return;
+	}
+	_layout->events()
+	| rpl::on_next_done([this](not_null<QEvent*> e) {
+		switch (e->type()) {
+		case QEvent::MouseMove:
+			mouseMove(static_cast<QMouseEvent*>(e.get())->globalPos());
+			break;
+		case QEvent::MouseButtonPress: {
+			const auto m = static_cast<QMouseEvent*>(e.get());
+			mousePress(m->button(), m->pos(), m->globalPos());
+			break;
+		}
+		case QEvent::MouseButtonRelease:
+			mouseRelease(static_cast<QMouseEvent*>(e.get())->button());
+			break;
+		}
+	}, [this] {
+		cancel();
+	}, _lifetime);
+
+	for (auto i = 0; i != count; ++i) {
+		const auto widget = _layout->widgetAt(i);
+		_entries.push_back({ widget });
+	}
+}
+
+void ChatsFiltersTabsReorder::addPinnedInterval(int from, int length) {
+	_pinnedIntervals.push_back({ from, length });
+}
+
+void ChatsFiltersTabsReorder::clearPinnedIntervals() {
+	_pinnedIntervals.clear();
+}
+
+bool ChatsFiltersTabsReorder::Interval::isIn(int index) const {
+	return (index >= from) && (index < (from + length));
+}
+
+bool ChatsFiltersTabsReorder::isIndexPinned(int index) const {
+	return ranges::any_of(_pinnedIntervals, [&](const Interval &i) {
+		return i.isIn(index);
+	});
+}
+
+void ChatsFiltersTabsReorder::checkForStart(QPoint position) {
+	const auto shift = position.x() - _currentStart;
+	const auto delta = QApplication::startDragDistance();
+	if (std::abs(shift) <= delta) {
+		return;
+	}
+	_currentState = State::Started;
+	_currentStart += (shift > 0) ? delta : -delta;
+
+	const auto index = indexOf(_currentWidget);
+	_layout->setRaised(index);
+	_currentDesiredIndex = index;
+	_updates.fire({ _currentWidget, index, index, _currentState });
+
+	updateOrder(index, position);
+}
+
+void ChatsFiltersTabsReorder::updateOrder(int index, QPoint position) {
+	if (isIndexPinned(index)) {
+		return;
+	}
+	const auto shift = position.x() - _currentStart;
+	auto &current = _entries[index];
+	current.shiftAnimation.stop();
+	current.shift = current.finalShift = shift;
+	_layout->setHorizontalShift(index, shift);
+
+	checkForScrollAnimation();
+
+	const auto count = _entries.size();
+	const auto currentWidth = current.widget->width;
+	const auto currentMiddle = current.widget->left
+		+ shift
+		+ currentWidth / 2;
+	_currentDesiredIndex = index;
+	if (shift > 0) {
+		for (auto next = index + 1; next != count; ++next) {
+			if (isIndexPinned(next)) {
+				return;
+			}
+			const auto &e = _entries[next];
+			if (currentMiddle < e.widget->left + e.widget->width / 2) {
+				moveToShift(next, 0);
+			} else {
+				_currentDesiredIndex = next;
+				moveToShift(next, -currentWidth);
+			}
+		}
+		for (auto prev = index - 1; prev >= 0; --prev) {
+			moveToShift(prev, 0);
+		}
+	} else {
+		for (auto next = index + 1; next != count; ++next) {
+			moveToShift(next, 0);
+		}
+		for (auto prev = index - 1; prev >= 0; --prev) {
+			if (isIndexPinned(prev)) {
+				return;
+			}
+			const auto &e = _entries[prev];
+			if (currentMiddle >= e.widget->left + e.widget->width / 2) {
+				moveToShift(prev, 0);
+			} else {
+				_currentDesiredIndex = prev;
+				moveToShift(prev, currentWidth);
+			}
+		}
+	}
+}
+
+void ChatsFiltersTabsReorder::mousePress(
+		Qt::MouseButton button,
+		QPoint position,
+		QPoint globalPosition) {
+	if (button != Qt::LeftButton) {
+		return;
+	}
+	auto widget = (ChatsFiltersTabs::ShiftedSection*)(nullptr);
+	for (auto i = 0; i != _layout->_sections.size(); ++i) {
+		auto &section = _layout->_sections[i];
+		if ((position.x() >= section.section->left)
+			&& (position.x() < (section.section->left + section.section->width))) {
+			widget = &section;
+			break;
+		}
+	}
+	cancelCurrent();
+	if (!widget) {
+		return;
+	}
+	_currentWidget = widget->section;
+	_currentShiftedWidget = widget;
+	_currentStart = globalPosition.x();
+}
+
+void ChatsFiltersTabsReorder::mouseMove(QPoint position) {
+	if (!_currentWidget) {
+	// if (_currentWidget != widget) {
+		return;
+	} else if (_currentState != State::Started) {
+		checkForStart(position);
+	} else {
+		updateOrder(indexOf(_currentWidget), position);
+	}
+}
+
+void ChatsFiltersTabsReorder::mouseRelease(Qt::MouseButton button) {
+	if (button != Qt::LeftButton) {
+		return;
+	}
+	finishReordering();
+}
+
+void ChatsFiltersTabsReorder::cancelCurrent() {
+	if (_currentWidget) {
+		cancelCurrent(indexOf(_currentWidget));
+	}
+}
+
+void ChatsFiltersTabsReorder::cancelCurrent(int index) {
+	Expects(_currentWidget != nullptr);
+
+	if (_currentState == State::Started) {
+		_currentState = State::Cancelled;
+		_updates.fire({ _currentWidget, index, index, _currentState });
+	}
+	_currentWidget = nullptr;
+	_currentShiftedWidget = nullptr;
+	for (auto i = 0, count = int(_entries.size()); i != count; ++i) {
+		moveToShift(i, 0);
+	}
+}
+
+void ChatsFiltersTabsReorder::finishReordering() {
+	if (_scroll) {
+		_scrollAnimation.stop();
+	}
+	finishCurrent();
+}
+
+void ChatsFiltersTabsReorder::finishCurrent() {
+	if (!_currentWidget) {
+		return;
+	}
+	const auto index = indexOf(_currentWidget);
+	if (_currentDesiredIndex == index || _currentState != State::Started) {
+		cancelCurrent(index);
+		return;
+	}
+	const auto result = _currentDesiredIndex;
+	const auto widget = _currentWidget;
+	_currentState = State::Cancelled;
+	_currentWidget = nullptr;
+	_currentShiftedWidget = nullptr;
+
+	auto &current = _entries[index];
+	const auto width = current.widget->width;
+	if (index < result) {
+		auto sum = 0;
+		for (auto i = index; i != result; ++i) {
+			auto &entry = _entries[i + 1];
+			const auto widget = entry.widget;
+			entry.deltaShift += width;
+			updateShift(widget, i + 1);
+			sum += widget->width;
+		}
+		current.finalShift -= sum;
+	} else if (index > result) {
+		auto sum = 0;
+		for (auto i = result; i != index; ++i) {
+			auto &entry = _entries[i];
+			const auto widget = entry.widget;
+			entry.deltaShift -= width;
+			updateShift(widget, i);
+			sum += widget->width;
+		}
+		current.finalShift += sum;
+	}
+	if (!(current.finalShift + current.deltaShift)) {
+		current.shift = 0;
+		_layout->setHorizontalShift(index, 0);
+	}
+	base::reorder(_entries, index, result);
+	_layout->reorderSections(index, _currentDesiredIndex);
+	for (auto i = 0; i != _layout->sectionsRef().size(); ++i) {
+		_entries[i].widget = &_layout->sectionsRef()[i];
+		moveToShift(i, 0);
+	}
+
+	_updates.fire({ widget, index, result, State::Applied });
+}
+
+void ChatsFiltersTabsReorder::moveToShift(int index, int shift) {
+	auto &entry = _entries[index];
+	if (entry.finalShift + entry.deltaShift == shift) {
+		return;
+	}
+	const auto widget = entry.widget;
+	entry.shiftAnimation.start(
+		[=, this] { updateShift(widget, index); },
+		entry.finalShift,
+		shift - entry.deltaShift,
+		st::slideWrapDuration);
+	entry.finalShift = shift - entry.deltaShift;
+}
+
+void ChatsFiltersTabsReorder::updateShift(
+		not_null<Section*> widget,
+		int indexHint) {
+	Expects(indexHint >= 0 && indexHint < _entries.size());
+
+	const auto index = (_entries[indexHint].widget == widget)
+		? indexHint
+		: indexOf(widget);
+	auto &entry = _entries[index];
+	entry.shift = base::SafeRound(
+		entry.shiftAnimation.value(entry.finalShift)
+	) + entry.deltaShift;
+	if (entry.deltaShift && !entry.shiftAnimation.animating()) {
+		entry.finalShift += entry.deltaShift;
+		entry.deltaShift = 0;
+	}
+	_layout->setHorizontalShift(index, entry.shift);
+}
+
+int ChatsFiltersTabsReorder::indexOf(not_null<Section*> widget) const {
+	const auto i = ranges::find(_entries, widget, &Entry::widget);
+	Assert(i != end(_entries));
+	return i - begin(_entries);
+}
+
+auto ChatsFiltersTabsReorder::updates() const -> rpl::producer<Single> {
+	return _updates.events();
+}
+
+void ChatsFiltersTabsReorder::updateScrollCallback() {
+	if (!_scroll) {
+		return;
+	}
+	const auto delta = deltaFromEdge();
+	const auto oldLeft = _scroll->scrollLeft();
+	_scroll->horizontalScrollBar()->setValue(oldLeft + delta);
+	const auto newLeft = _scroll->scrollLeft();
+
+	_currentStart += oldLeft - newLeft;
+	if (newLeft == 0 || newLeft == _scroll->scrollLeftMax()) {
+		_scrollAnimation.stop();
+	}
+}
+
+void ChatsFiltersTabsReorder::checkForScrollAnimation() {
+	if (!_scroll || !deltaFromEdge() || _scrollAnimation.animating()) {
+		return;
+	}
+	_scrollAnimation.start();
+}
+
+int ChatsFiltersTabsReorder::deltaFromEdge() {
+	Expects(_currentWidget != nullptr);
+	Expects(_currentShiftedWidget != nullptr);
+	Expects(_scroll);
+
+	const auto globalPosition = _layout->mapToGlobal(
+		QPoint(
+			_currentWidget->left + _currentShiftedWidget->horizontalShift,
+			0));
+	const auto localLeft = _scroll->mapFromGlobal(globalPosition).x();
+	const auto localRight = localLeft
+		+ _currentWidget->width
+		- _scroll->width();
+
+	const auto isLeftEdge = (localLeft < 0);
+	const auto isRightEdge = (localRight > 0);
+	if (!isLeftEdge && !isRightEdge) {
+		_scrollAnimation.stop();
+		return 0;
+	}
+	return int((isRightEdge ? localRight : localLeft) * kScrollFactor);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.h
new file mode 100644
index 00000000000000..4a167d3665b32f
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_slider_reorder.h
@@ -0,0 +1,98 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/animations.h"
+#include "ui/widgets/chat_filters_tabs_slider.h"
+
+namespace Ui {
+
+class ScrollArea;
+
+class ChatsFiltersTabsReorder final {
+public:
+	using Section = ChatsFiltersTabs::Section;
+	enum class State : uchar {
+		Started,
+		Applied,
+		Cancelled,
+	};
+
+	struct Single {
+		not_null<Section*> widget;
+		int oldPosition = 0;
+		int newPosition = 0;
+		State state = State::Started;
+	};
+
+	ChatsFiltersTabsReorder(
+		not_null<ChatsFiltersTabs*> layout,
+		not_null<ScrollArea*> scroll);
+	ChatsFiltersTabsReorder(not_null<ChatsFiltersTabs*> layout);
+
+	void start();
+	void cancel();
+	void finishReordering();
+	void addPinnedInterval(int from, int length);
+	void clearPinnedIntervals();
+	[[nodiscard]] rpl::producer<Single> updates() const;
+
+private:
+	struct Entry {
+		not_null<Section*> widget;
+		Ui::Animations::Simple shiftAnimation;
+		int shift = 0;
+		int finalShift = 0;
+		int deltaShift = 0;
+	};
+	struct Interval {
+		[[nodiscard]] bool isIn(int index) const;
+
+		int from = 0;
+		int length = 0;
+	};
+
+	void mousePress(Qt::MouseButton button, QPoint position, QPoint global);
+	void mouseMove(QPoint position);
+	void mouseRelease(Qt::MouseButton button);
+
+	void checkForStart(QPoint position);
+	void updateOrder(int index, QPoint position);
+	void cancelCurrent();
+	void finishCurrent();
+	void cancelCurrent(int index);
+
+	[[nodiscard]] int indexOf(not_null<Section*> widget) const;
+	void moveToShift(int index, int shift);
+	void updateShift(not_null<Section*> widget, int indexHint);
+
+	void updateScrollCallback();
+	void checkForScrollAnimation();
+	[[nodiscard]] int deltaFromEdge();
+
+	[[nodiscard]] bool isIndexPinned(int index) const;
+
+	const not_null<ChatsFiltersTabs*> _layout;
+	Ui::ScrollArea *_scroll = nullptr;
+
+	Ui::Animations::Basic _scrollAnimation;
+
+	std::vector<Interval> _pinnedIntervals;
+
+	Section *_currentWidget = nullptr;
+	ChatsFiltersTabs::ShiftedSection *_currentShiftedWidget = nullptr;
+	int _currentStart = 0;
+	int _currentDesiredIndex = 0;
+	State _currentState = State::Cancelled;
+	std::vector<Entry> _entries;
+	rpl::event_stream<Single> _updates;
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
new file mode 100644
index 00000000000000..d84b7d5eed2d56
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -0,0 +1,556 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/widgets/chat_filters_tabs_strip.h"
+
+#include "api/api_chat_filters_remove_manager.h"
+#include "boxes/choose_filter_box.h"
+#include "boxes/filters/edit_filter_box.h"
+#include "boxes/premium_limits_box.h"
+#include "core/application.h"
+#include "core/shortcuts.h"
+#include "core/ui_integration.h"
+#include "data/data_chat_filters.h"
+#include "data/data_peer_values.h" // Data::AmPremiumValue.
+#include "data/data_premium_limits.h"
+#include "data/data_session.h"
+#include "data/data_unread_value.h"
+#include "data/data_user.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "settings/sections/settings_folders.h"
+#include "ui/widgets/menu/menu_action.h"
+#include "ui/power_saving.h"
+#include "ui/ui_utility.h"
+#include "ui/widgets/chat_filters_tabs_slider_reorder.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/wrap/slide_wrap.h"
+#include "window/window_controller.h"
+#include "window/window_peer_menu.h"
+#include "window/window_session_controller.h"
+#include "styles/style_dialogs.h" // dialogsSearchTabs
+#include "styles/style_media_player.h" // mediaPlayerMenuCheck
+#include "styles/style_menu_icons.h"
+
+#include <QScrollBar>
+
+namespace Ui {
+namespace {
+
+struct State final {
+	Ui::Animations::Simple animation;
+	std::optional<FilterId> lastFilterId = std::nullopt;
+	rpl::lifetime rebuildLifetime;
+	rpl::lifetime reorderLifetime;
+	base::unique_qptr<Ui::PopupMenu> menu;
+
+	Api::RemoveComplexChatFilter removeApi;
+	bool waitingSuggested = false;
+
+	std::unique_ptr<Ui::ChatsFiltersTabsReorder> reorder;
+	bool ignoreRefresh = false;
+};
+
+void ShowMenu(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Window::SessionController*> controller,
+		not_null<State*> state,
+		int index) {
+	const auto session = &controller->session();
+
+	auto id = FilterId(0);
+	{
+		const auto &list = session->data().chatsFilters().list();
+		if (index < 0 || index >= list.size()) {
+			return;
+		}
+		id = list[index].id();
+	}
+	state->menu = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+	const auto addAction = Ui::Menu::CreateAddActionCallback(
+		state->menu.get());
+
+	if (id) {
+		addAction(
+			tr::lng_filters_context_edit(tr::now),
+			[=] { EditExistingFilter(controller, id); },
+			&st::menuIconEdit);
+
+		Window::MenuAddMarkAsReadChatListAction(
+			controller,
+			[=] { return session->data().chatsFilters().chatsList(id); },
+			addAction);
+
+		auto showRemoveBox = [=] {
+			state->removeApi.request(base::make_weak(parent), controller, id);
+		};
+		addAction({
+			.text = tr::lng_filters_context_remove(tr::now),
+			.handler = std::move(showRemoveBox),
+			.icon = &st::menuIconDeleteAttention,
+			.isAttention = true,
+		});
+	} else {
+		auto customUnreadState = [=] {
+			return Data::MainListMapUnreadState(
+				session,
+				session->data().chatsList()->unreadState());
+		};
+		Window::MenuAddMarkAsReadChatListAction(
+			controller,
+			[=] { return session->data().chatsList(); },
+			addAction,
+			std::move(customUnreadState));
+
+		auto openFiltersSettings = [=] {
+			const auto filters = &session->data().chatsFilters();
+			if (filters->suggestedLoaded()) {
+				controller->showSettings(Settings::FoldersId());
+			} else if (!state->waitingSuggested) {
+				state->waitingSuggested = true;
+				filters->requestSuggested();
+				filters->suggestedUpdated(
+				) | rpl::take(1) | rpl::on_next([=] {
+					controller->showSettings(Settings::FoldersId());
+				}, parent->lifetime());
+			}
+		};
+		addAction(
+			tr::lng_filters_setup_menu(tr::now),
+			std::move(openFiltersSettings),
+			&st::menuIconEdit);
+	}
+	if (state->menu->empty()) {
+		state->menu = nullptr;
+		return;
+	}
+	state->menu->popup(QCursor::pos());
+}
+
+void ShowFiltersListMenu(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Main::Session*> session,
+		not_null<State*> state,
+		int active,
+		Fn<void(int)> changeActive) {
+	const auto &list = session->data().chatsFilters().list();
+
+	state->menu = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::popupMenuWithIcons);
+
+	const auto reorderAll = session->user()->isPremium();
+	const auto maxLimit = (reorderAll ? 1 : 0)
+		+ Data::PremiumLimits(session).dialogFiltersCurrent();
+	const auto premiumFrom = (reorderAll ? 0 : 1) + maxLimit;
+
+	for (auto i = 0; i < list.size(); ++i) {
+		const auto title = list[i].title();
+		const auto text = title.text.empty()
+			? tr::lng_filters_all_short(tr::now)
+			: title.text.text;
+		const auto callback = [=] {
+			if (i != active) {
+				changeActive(i);
+			}
+		};
+		const auto icon = (i == active)
+			? &st::mediaPlayerMenuCheck
+			: nullptr;
+		const auto action = Ui::Menu::CreateAction(
+			state->menu->menu(),
+			text,
+			callback);
+		auto item = base::make_unique_q<Ui::Menu::Action>(
+			state->menu->menu(),
+			state->menu->st().menu,
+			action,
+			icon,
+			icon);
+		action->setEnabled(i < premiumFrom);
+		if (!title.text.empty()) {
+			const auto context = Core::TextContext({
+				.session = session,
+				.repaint = [raw = item.get()] { raw->update(); },
+				.customEmojiLoopLimit = title.isStatic ? -1 : 0,
+			});
+			item->setMarkedText(title.text, QString(), context);
+		}
+		state->menu->addAction(std::move(item));
+	}
+	session->data().chatsFilters().changed() | rpl::on_next([=] {
+		state->menu->hideMenu();
+	}, state->menu->lifetime());
+
+	if (state->menu->empty()) {
+		state->menu = nullptr;
+		return;
+	}
+	state->menu->popup(QCursor::pos());
+}
+
+} // namespace
+
+not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Main::Session*> session,
+		Fn<void(FilterId)> choose,
+		ChatHelpers::PauseReason pauseLevel,
+		Window::SessionController *controller,
+		bool trackActiveFilterAndUnreadAndReorder,
+		bool handleKeyboardSwitch) {
+
+	const auto wrap = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
+		parent,
+		object_ptr<Ui::RpWidget>(parent));
+	if (!controller) {
+		const auto window = Core::App().findWindow(parent);
+		controller = window ? window->sessionController() : nullptr;
+		if (!controller) {
+			return wrap;
+		}
+	}
+	const auto container = wrap->entity();
+	const auto scroll = Ui::CreateChild<Ui::ScrollArea>(
+		container,
+		st::dialogsTabsScroll,
+		true);
+	const auto slider = scroll->setOwnedWidget(
+		object_ptr<Ui::ChatsFiltersTabs>(
+			parent,
+			trackActiveFilterAndUnreadAndReorder
+				? st::dialogsSearchTabs
+				: st::chatsFiltersTabs));
+	const auto state = wrap->lifetime().make_state<State>();
+	const auto reassignUnreadValue = [=] {
+		state->reorderLifetime.destroy();
+		const auto &list = session->data().chatsFilters().list();
+		auto includeMuted = Data::IncludeMutedCounterFoldersValue();
+		for (auto i = 0; i < list.size(); i++) {
+			rpl::combine(
+				Data::UnreadStateValue(session, list[i].id()),
+				rpl::duplicate(includeMuted)
+			) | rpl::on_next([=](
+					const Dialogs::UnreadState &state,
+					bool includeMuted) {
+				const auto chats = state.chats;
+				const auto chatsMuted = state.chatsMuted;
+				const auto muted = (chatsMuted + state.marksMuted);
+				const auto count = (chats + state.marks)
+					- (includeMuted ? 0 : muted);
+				const auto isMuted = includeMuted && (count == muted);
+				slider->setUnreadCount(i, count, isMuted);
+				slider->fitWidthToSections();
+			}, state->reorderLifetime);
+		}
+	};
+	if (trackActiveFilterAndUnreadAndReorder) {
+		using Reorder = Ui::ChatsFiltersTabsReorder;
+		state->reorder = std::make_unique<Reorder>(slider, scroll);
+		const auto applyReorder = [=](
+				int oldPosition,
+				int newPosition) {
+			if (newPosition == oldPosition) {
+				return;
+			}
+
+			const auto filters = &session->data().chatsFilters();
+			const auto &list = filters->list();
+			if (!session->user()->isPremium()) {
+				if (list[0].id() != FilterId()) {
+					filters->moveAllToFront();
+				}
+			}
+			Assert(oldPosition >= 0 && oldPosition < list.size());
+			Assert(newPosition >= 0 && newPosition < list.size());
+
+			auto order = ranges::views::all(
+				list
+			) | ranges::views::transform(
+				&Data::ChatFilter::id
+			) | ranges::to_vector;
+			base::reorder(order, oldPosition, newPosition);
+
+			state->ignoreRefresh = true;
+			filters->saveOrder(order);
+			state->ignoreRefresh = false;
+		};
+
+		state->reorder->updates(
+		) | rpl::on_next([=](const Reorder::Single &data) {
+			if (data.state == Reorder::State::Started) {
+				slider->setReordering(slider->reordering() + 1);
+			} else {
+				Ui::PostponeCall(slider, [=] {
+					slider->setReordering(slider->reordering() - 1);
+				});
+				if (data.state == Reorder::State::Applied) {
+					applyReorder(data.oldPosition, data.newPosition);
+					reassignUnreadValue();
+				}
+			}
+		}, slider->lifetime());
+
+		SetupFilterDragAndDrop(
+			slider,
+			session,
+			[=](QPoint pos) -> std::optional<FilterId> {
+				const auto local = slider->mapFromGlobal(pos);
+				const auto x = local.x();
+				const auto count = slider->sectionsCount();
+				for (auto i = 0; i < count; ++i) {
+					const auto left = slider->lookupSectionLeft(i);
+					const auto right = (i + 1 < count)
+						? slider->lookupSectionLeft(i + 1)
+						: slider->width();
+					if (x >= left && x < right) {
+						const auto &list
+							= session->data().chatsFilters().list();
+						return (i < list.size())
+							? list[i].id()
+							: FilterId();
+					}
+				}
+				return std::nullopt;
+			},
+			[=] { return state->lastFilterId.value_or(FilterId()); },
+			[=](FilterId id) {
+				const auto &list = session->data().chatsFilters().list();
+				for (auto i = 0; i < list.size(); i++) {
+					if (list[i].id() == id) {
+						slider->selectSection(i);
+						return;
+					}
+				}
+				slider->selectSection(-1);
+			});
+	}
+	wrap->toggle(false, anim::type::instant);
+	scroll->setCustomWheelProcess([=](not_null<QWheelEvent*> e) {
+		const auto pixelDelta = e->pixelDelta();
+		const auto angleDelta = e->angleDelta();
+		if (std::abs(pixelDelta.x()) + std::abs(angleDelta.x())) {
+			return false;
+		}
+		const auto bar = scroll->horizontalScrollBar();
+		const auto y = pixelDelta.y() ? pixelDelta.y() : angleDelta.y();
+		bar->setValue(bar->value() - y);
+		return true;
+	});
+
+	const auto scrollToIndex = [=](int index, anim::type type) {
+		const auto to = index
+			? (slider->centerOfSection(index) - scroll->width() / 2)
+			: 0;
+		const auto bar = scroll->horizontalScrollBar();
+		state->animation.stop();
+		if (type == anim::type::instant) {
+			bar->setValue(to);
+		} else {
+			state->animation.start(
+				[=](float64 v) { bar->setValue(v); },
+				bar->value(),
+				std::min(to, bar->maximum()),
+				st::defaultTabsSlider.duration);
+		}
+	};
+
+	const auto applyFilter = [=](const Data::ChatFilter &filter) {
+		if (slider->reordering()) {
+			return;
+		}
+		choose(filter.id());
+	};
+
+	const auto filterByIndex = [=](int index) -> const Data::ChatFilter& {
+		const auto &list = session->data().chatsFilters().list();
+		Assert(index >= 0 && index < list.size());
+		return list[index];
+	};
+
+	const auto rebuild = [=] {
+		const auto &list = session->data().chatsFilters().list();
+		if ((list.size() <= 1 && !slider->width()) || state->ignoreRefresh) {
+			return;
+		}
+		const auto context = Core::TextContext({ .session = session });
+		const auto paused = [=] {
+			return On(PowerSaving::kEmojiChat)
+				|| controller->isGifPausedAtLeastFor(pauseLevel);
+		};
+		const auto sectionsChanged = slider->setSectionsAndCheckChanged(
+			ranges::views::all(
+				list
+			) | ranges::views::transform([](const Data::ChatFilter &filter) {
+				auto title = filter.title();
+				return title.text.empty()
+					? TextWithEntities{ tr::lng_filters_all_short(tr::now) }
+					: title.isStatic
+					? Data::ForceCustomEmojiStatic(title.text)
+					: title.text;
+			}) | ranges::to_vector, context, paused);
+		if (!sectionsChanged) {
+			return;
+		}
+		state->rebuildLifetime.destroy();
+		slider->fitWidthToSections();
+		{
+			const auto reorderAll = session->user()->isPremium();
+			const auto maxLimit = (reorderAll ? 1 : 0)
+				+ Data::PremiumLimits(session).dialogFiltersCurrent();
+			const auto premiumFrom = (reorderAll ? 0 : 1) + maxLimit;
+			slider->setLockedFrom((premiumFrom >= list.size())
+				? 0
+				: premiumFrom);
+			slider->lockedClicked() | rpl::on_next([=] {
+				controller->show(Box(FiltersLimitBox, session, std::nullopt));
+			}, state->rebuildLifetime);
+			if (state->reorder) {
+				state->reorder->cancel();
+				state->reorder->clearPinnedIntervals();
+				if (!reorderAll) {
+					state->reorder->addPinnedInterval(0, 1);
+				}
+				state->reorder->addPinnedInterval(
+					premiumFrom,
+					std::max(1, int(list.size()) - maxLimit));
+			}
+		}
+		if (trackActiveFilterAndUnreadAndReorder) {
+			reassignUnreadValue();
+		}
+		[&] {
+			const auto lookingId = state->lastFilterId.value_or(
+				trackActiveFilterAndUnreadAndReorder
+					? controller->activeChatsFilterCurrent()
+					: list[0].id());
+			for (auto i = 0; i < list.size(); i++) {
+				const auto &filter = list[i];
+				if (filter.id() == lookingId) {
+					const auto wasLast = !!state->lastFilterId;
+					state->lastFilterId = filter.id();
+					slider->setActiveSectionFast(i);
+					scrollToIndex(
+						i,
+						wasLast ? anim::type::normal : anim::type::instant);
+					if (wasLast || !trackActiveFilterAndUnreadAndReorder) {
+						applyFilter(filter);
+					}
+					return;
+				}
+			}
+			if (list.size()) {
+				const auto index = 0;
+				const auto &filter = filterByIndex(index);
+				state->lastFilterId = filter.id();
+				slider->setActiveSectionFast(index);
+				scrollToIndex(index, anim::type::instant);
+				applyFilter(filter);
+			}
+		}();
+		if (trackActiveFilterAndUnreadAndReorder) {
+			controller->activeChatsFilter(
+			) | rpl::on_next([=](FilterId id) {
+				const auto &list = session->data().chatsFilters().list();
+				for (auto i = 0; i < list.size(); ++i) {
+					if (list[i].id() == id) {
+						slider->setActiveSection(i);
+						scrollToIndex(i, anim::type::normal);
+						break;
+					}
+				}
+				state->reorder->finishReordering();
+			}, state->rebuildLifetime);
+		}
+		rpl::single(-1) | rpl::then(
+			slider->sectionActivated()
+		) | rpl::combine_previous(
+		) | rpl::on_next([=](int was, int index) {
+			if (slider->reordering()) {
+				return;
+			}
+			const auto &filter = filterByIndex(index);
+			if (was != index) {
+				state->lastFilterId = filter.id();
+				scrollToIndex(index, anim::type::normal);
+			}
+			applyFilter(filter);
+		}, state->rebuildLifetime);
+		slider->contextMenuRequested() | rpl::on_next([=](int index) {
+			if (trackActiveFilterAndUnreadAndReorder) {
+				ShowMenu(wrap, controller, state, index);
+			} else {
+				ShowFiltersListMenu(
+					wrap,
+					session,
+					state,
+					slider->activeSection(),
+					[=](int i) { slider->setActiveSection(i); });
+			}
+		}, state->rebuildLifetime);
+		wrap->toggle((list.size() > 1), anim::type::instant);
+
+		if (state->reorder) {
+			state->reorder->start();
+		}
+	};
+	rpl::combine(
+		session->data().chatsFilters().changed(),
+		Data::AmPremiumValue(session) | rpl::to_empty
+	) | rpl::on_next(rebuild, wrap->lifetime());
+	rebuild();
+
+	session->data().chatsFilters().isChatlistChanged(
+	) | rpl::on_next([=](FilterId id) {
+		if (!id || !state->lastFilterId || (id != state->lastFilterId)) {
+			return;
+		}
+		for (const auto &filter : session->data().chatsFilters().list()) {
+			if (filter.id() == id) {
+				applyFilter(filter);
+				return;
+			}
+		}
+	}, wrap->lifetime());
+
+	rpl::combine(
+		parent->widthValue() | rpl::filter(rpl::mappers::_1 > 0),
+		slider->heightValue() | rpl::filter(rpl::mappers::_1 > 0)
+	) | rpl::on_next([=](int w, int h) {
+		scroll->resize(w, h);
+		container->resize(w, h);
+		wrap->resize(w, h);
+	}, wrap->lifetime());
+
+	if (handleKeyboardSwitch) {
+		Shortcuts::ChatSwitchRequests(
+		) | rpl::filter([=](const Shortcuts::ChatSwitchRequest &request) {
+			return wrap->toggled()
+				&& ((request.action == Qt::Key_Tab)
+					|| (request.action == Qt::Key_Backtab));
+		}) | rpl::on_next([=](const Shortcuts::ChatSwitchRequest &request) {
+			const auto count = slider->sectionsCount();
+			const auto locked = slider->lockedFrom();
+			const auto limit = locked ? locked : count;
+			if (limit <= 1) {
+				return;
+			}
+			const auto back = (request.action == Qt::Key_Backtab);
+			const auto current = std::min(slider->activeSection(), limit - 1);
+			const auto next = (current + (back ? -1 : 1) + limit) % limit;
+			slider->setActiveSection(next);
+		}, wrap->lifetime());
+	}
+
+	return wrap;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
new file mode 100644
index 00000000000000..79165515dc7a0f
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.h
@@ -0,0 +1,37 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace ChatHelpers {
+enum class PauseReason;
+} // namespace ChatHelpers
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Ui {
+
+not_null<Ui::RpWidget*> AddChatFiltersTabsStrip(
+	not_null<Ui::RpWidget*> parent,
+	not_null<Main::Session*> session,
+	Fn<void(FilterId)> choose,
+	ChatHelpers::PauseReason pauseLevel,
+	Window::SessionController *controller = nullptr,
+	bool trackActiveFilterAndUnreadAndReorder = false,
+	bool handleKeyboardSwitch = false);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/color_editor.cpp b/Telegram/SourceFiles/ui/widgets/color_editor.cpp
index c8fc937f8b37b1..78a0e06d4cc484 100644
--- a/Telegram/SourceFiles/ui/widgets/color_editor.cpp
+++ b/Telegram/SourceFiles/ui/widgets/color_editor.cpp
@@ -17,7 +17,7 @@ For license and copyright information please follow this link:
 #include "styles/style_boxes.h"
 #include "styles/style_media_view.h"
 
-class ColorEditor::Picker : public TWidget {
+class ColorEditor::Picker : public Ui::RpWidget {
 public:
 	Picker(QWidget *parent, Mode mode, QColor color);
 
@@ -94,7 +94,7 @@ QCursor ColorEditor::Picker::generateCursor() {
 }
 
 ColorEditor::Picker::Picker(QWidget *parent, Mode mode, QColor color)
-: TWidget(parent)
+: RpWidget(parent)
 , _mode(mode) {
 	setCursor(generateCursor());
 
@@ -292,7 +292,7 @@ void ColorEditor::Picker::setFromColor(QColor color) {
 	}
 }
 
-class ColorEditor::Slider : public TWidget {
+class ColorEditor::Slider : public Ui::RpWidget {
 public:
 	enum class Direction {
 		Horizontal,
@@ -365,7 +365,7 @@ ColorEditor::Slider::Slider(
 	Direction direction,
 	Type type,
 	QColor color)
-: TWidget(parent)
+: RpWidget(parent)
 , _direction(direction)
 , _type(type)
 , _color(color.red(), color.green(), color.blue())
@@ -917,6 +917,7 @@ void ColorEditor::prepare() {
 	connect(_blueField, &Ui::MaskedInputField::submitted, submitted);
 	connect(_result, &Ui::MaskedInputField::submitted, submitted);
 
+	setNaturalWidth(st::colorEditWidth);
 	const auto height = st::colorEditSkip
 		+ st::colorPickerSize
 		+ st::colorEditSkip
@@ -929,7 +930,7 @@ void ColorEditor::prepare() {
 		(_hueSlider ? _hueSlider->changed() : rpl::never<>()),
 		(_opacitySlider ? _opacitySlider->changed() : rpl::never<>()),
 		(_lightnessSlider ? _lightnessSlider->changed() : rpl::never<>())
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateFromControls();
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp b/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp
index d400c12406d6e1..f879092b5673b3 100644
--- a/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp
+++ b/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/continuous_sliders.h"
 
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "base/timer.h"
 #include "base/platform/base_platform_info.h"
 #include "styles/style_widgets.h"
@@ -130,6 +131,55 @@ void ContinuousSlider::wheelEvent(QWheelEvent *e) {
 	_byWheelFinished->callOnce(kByWheelFinishedTimeout);
 }
 
+void ContinuousSlider::keyPressEvent(QKeyEvent *e) {
+	const auto changeBy = [&](float64 step) {
+		Expects(step != 0.);
+
+		auto steps = 0;
+		while (true) {
+			++steps;
+			auto result = _value + (steps * step);
+			const auto stopping = (result <= 0.) || (result >= 1.);
+			if (_adjustCallback) {
+				result = _adjustCallback(result);
+			}
+			result = std::clamp(result, 0., 1.);
+			if (result != _value || stopping) {
+				return result;
+			}
+		}
+	};
+
+	const auto newValue = [&] {
+		constexpr auto kSmallStep = 0.01;
+		constexpr auto kLargeStep = 0.10;
+		switch (e->key()) {
+		case Qt::Key_Right:
+		case Qt::Key_Up: return changeBy(kSmallStep);
+		case Qt::Key_Left:
+		case Qt::Key_Down: return changeBy(-kSmallStep);
+		case Qt::Key_PageUp: return changeBy(kLargeStep);
+		case Qt::Key_PageDown: return changeBy(-kLargeStep);
+		case Qt::Key_Home: return changeBy(-1.);
+		case Qt::Key_End: return changeBy(1.);
+		default: e->ignore();
+		}
+		return _value;
+	}();
+
+	if (_value == newValue) {
+		return;
+	}
+	setValue(newValue);
+	if (_changeProgressCallback) {
+		_changeProgressCallback(_value);
+	}
+	if (_changeFinishedCallback) {
+		_changeFinishedCallback(_value);
+	}
+	accessibilityValueChanged();
+}
+
 void ContinuousSlider::updateDownValueFromPos(const QPoint &pos) {
 	_downValue = computeValue(pos);
 	update();
@@ -219,10 +269,57 @@ void MediaSlider::disablePaint(bool disabled) {
 
 void MediaSlider::addDivider(float64 atValue, const QSize &size) {
 	_dividers.push_back(Divider{ atValue, size });
+	_dividerExclusionSize = QSize();
+}
+
+void MediaSlider::clearDividers() {
+	_dividers.clear();
+	_dividerExclusion = QRegion();
+	_dividerExclusionSize = QSize();
 }
 
-void MediaSlider::setActiveFgOverride(std::optional<QColor> color) {
-	_activeFgOverride = color;
+void MediaSlider::rebuildDividerExclusion() {
+	const auto currentSize = size();
+	if (_dividerExclusionSize == currentSize) {
+		return;
+	}
+	_dividerExclusionSize = currentSize;
+	_dividerExclusion = QRegion();
+	if (_dividers.empty()) {
+		return;
+	}
+	const auto horizontal = isHorizontal();
+	const auto from = 0;
+	const auto length = horizontal ? width() : height();
+	for (const auto &divider : _dividers) {
+		const auto dividerValue = horizontal
+			? divider.atValue
+			: (1. - divider.atValue);
+		const auto dividerMid = int(base::SafeRound(
+			from + dividerValue * length));
+		const auto &s = divider.size;
+		_dividerExclusion += horizontal
+			? QRect(
+				dividerMid - s.width() / 2,
+				(height() - s.height()) / 2,
+				s.width(),
+				s.height())
+			: QRect(
+				(width() - s.height()) / 2,
+				dividerMid - s.width() / 2,
+				s.height(),
+				s.width());
+	}
+}
+
+void MediaSlider::setDividerStyle(DividerStyle style) {
+	_dividerStyle = style;
+	_dividerExclusionSize = QSize();
+	update();
+}
+
+void MediaSlider::setColorOverrides(ColorOverrides overrides) {
+	_overrides = std::move(overrides);
 	update();
 }
 
@@ -237,6 +334,8 @@ void MediaSlider::paintEvent(QPaintEvent *e) {
 	p.setOpacity(fadeOpacity());
 
 	const auto horizontal = isHorizontal();
+	const auto borderWidth = _st.borderWidth;
+	const auto borderHalf = borderWidth / 2;
 	const auto radius = _st.width / 2;
 	const auto disabled = isDisabled();
 	const auto over = getCurrentOverFactor();
@@ -272,23 +371,57 @@ void MediaSlider::paintEvent(QPaintEvent *e) {
 	const auto end = from + length;
 	const auto activeFg = disabled
 		? _st.activeFgDisabled
-		: _activeFgOverride
-		? QBrush(*_activeFgOverride)
+		: _overrides.activeFg
+		? QBrush(*_overrides.activeFg)
 		: anim::brush(_st.activeFg, _st.activeFgOver, over);
 	const auto receivedTillFg = _st.receivedTillFg;
 	const auto inactiveFg = disabled
 		? _st.inactiveFgDisabled
+		: _overrides.inactiveFg
+		? QBrush(*_overrides.inactiveFg)
 		: anim::brush(_st.inactiveFg, _st.inactiveFgOver, over);
+	const auto borderFg = _st.borderFg;
+	const auto gapStyle = (_dividerStyle == DividerStyle::Gaps);
+	if (gapStyle) {
+		rebuildDividerExclusion();
+	}
+	const auto clip = [&](const QRect &rect) {
+		if (!gapStyle || _dividerExclusion.isEmpty()) {
+			p.setClipRect(rect);
+		} else {
+			p.setClipRegion(QRegion(rect) - _dividerExclusion);
+		}
+	};
 	if (mid > from) {
 		const auto fromClipRect = horizontal
 			? QRect(0, 0, mid, height())
 			: QRect(0, 0, width(), mid);
 		const auto till = std::min(mid + radius, end);
 		const auto fromRect = horizontal
-			? QRect(from, (height() - _st.width) / 2, till - from, _st.width)
-			: QRect((width() - _st.width) / 2, from, _st.width, till - from);
-		p.setClipRect(fromClipRect);
-		p.setBrush(horizontal ? activeFg : inactiveFg);
+			? QRect(
+				from + borderHalf,
+				(height() - _st.width) / 2 + borderHalf,
+				till - from - borderWidth,
+				_st.width - borderWidth)
+			: QRect(
+				(width() - _st.width) / 2 + borderHalf,
+				from + borderHalf,
+				_st.width - borderWidth,
+				till - from - borderWidth);
+		clip(fromClipRect);
+		if (borderWidth > 0) {
+			const auto borderPen = _overrides.activeBorder
+				? QPen(*_overrides.activeBorder, borderWidth)
+				: QPen(borderFg, borderWidth);
+			const auto bgBrush = _overrides.activeBg
+				? QBrush(*_overrides.activeBg)
+				: (horizontal ? borderFg : inactiveFg);
+			p.setPen(borderPen);
+			p.setBrush(bgBrush);
+		} else {
+			p.setPen(Qt::NoPen);
+			p.setBrush(horizontal ? activeFg : inactiveFg);
+		}
 		p.drawRoundedRect(fromRect, radius, radius);
 	}
 	if (till > mid) {
@@ -301,7 +434,7 @@ void MediaSlider::paintEvent(QPaintEvent *e) {
 			(height() - _st.width) / 2,
 			right - left,
 			_st.width);
-		p.setClipRect(clipRect);
+		clip(clipRect);
 		p.setBrush(receivedTillFg);
 		p.drawRoundedRect(rect, radius, radius);
 	}
@@ -312,20 +445,28 @@ void MediaSlider::paintEvent(QPaintEvent *e) {
 		const auto begin = std::max(till - radius, from);
 		const auto endRect = horizontal
 			? QRect(
-				begin,
-				(height() - _st.width) / 2,
-				end - begin,
-				_st.width)
+				begin + borderHalf,
+				(height() - _st.width) / 2 + borderHalf,
+				end - begin - borderWidth,
+				_st.width - borderWidth)
 			: QRect(
-				(width() - _st.width) / 2,
-				begin,
-				_st.width,
-				end - begin);
-		p.setClipRect(endClipRect);
+				(width() - _st.width) / 2 + borderHalf,
+				begin + borderHalf,
+				_st.width - borderWidth,
+				end - begin - borderWidth);
+		clip(endClipRect);
+		if (borderWidth > 0) {
+			const auto endBorderPen = _overrides.inactiveBorder
+				? QPen(*_overrides.inactiveBorder, borderWidth)
+				: QPen(borderFg, borderWidth);
+			p.setPen(endBorderPen);
+		} else {
+			p.setPen(Qt::NoPen);
+		}
 		p.setBrush(horizontal ? inactiveFg : activeFg);
 		p.drawRoundedRect(endRect, radius, radius);
 	}
-	if (!_dividers.empty()) {
+	if (!gapStyle && !_dividers.empty()) {
 		p.setClipRect(rect());
 		for (const auto &divider : _dividers) {
 			const auto dividerValue = horizontal
@@ -378,7 +519,19 @@ void MediaSlider::paintEvent(QPaintEvent *e) {
 			((1. - markerSizeRatio) * size) / 2.);
 		if (remove * 2 < size) {
 			p.setClipRect(rect());
-			p.setBrush(activeFg);
+			const auto seekFg = _overrides.seekFg
+				? QBrush(*_overrides.seekFg)
+				: activeFg;
+			if (borderWidth > 0) {
+				const auto seekBorderPen = _overrides.seekBorder
+					? QPen(*_overrides.seekBorder, borderWidth)
+					: QPen(borderFg, borderWidth);
+				p.setPen(seekBorderPen);
+				p.setBrush(seekFg);
+			} else {
+				p.setPen(Qt::NoPen);
+				p.setBrush(seekFg);
+			}
 			const auto xshift = horizontal
 				? std::max(
 					seekButton.x() + seekButton.width() - remove - width(),
@@ -389,9 +542,13 @@ void MediaSlider::paintEvent(QPaintEvent *e) {
 				: std::max(
 					seekButton.y() + seekButton.height() - remove - height(),
 					0) + std::min(seekButton.y() + remove, 0);
-			p.drawEllipse(seekButton.marginsRemoved(
-				QMargins(remove, remove, remove, remove)
-			).translated(-xshift, -yshift));
+			auto ellipseRect = (seekButton - Margins(remove)).translated(
+				-xshift,
+				-yshift);
+			if (borderWidth > 0) {
+				ellipseRect -= Margins(borderHalf);
+			}
+			p.drawEllipse(ellipseRect);
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/ui/widgets/continuous_sliders.h b/Telegram/SourceFiles/ui/widgets/continuous_sliders.h
index 97839b4b1c3abe..cb2a545a61dcd5 100644
--- a/Telegram/SourceFiles/ui/widgets/continuous_sliders.h
+++ b/Telegram/SourceFiles/ui/widgets/continuous_sliders.h
@@ -58,6 +58,15 @@ class ContinuousSlider : public RpWidget {
 
 	void setMoveByWheel(bool move);
 
+	QAccessible::Role accessibilityRole() override {
+		return QAccessible::Role::Slider;
+	}
+
+	QString accessibilityValue() const override {
+		const auto percent = std::clamp(qRound(_value * 100.), 0, 100);
+		return QString::number(percent) + '%';
+	}
+
 protected:
 	void mouseMoveEvent(QMouseEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
@@ -65,6 +74,7 @@ class ContinuousSlider : public RpWidget {
 	void wheelEvent(QWheelEvent *e) override;
 	void enterEventHook(QEnterEvent *e) override;
 	void leaveEventHook(QEvent *e) override;
+	void keyPressEvent(QKeyEvent *e) override;
 
 	float64 fadeOpacity() const {
 		return _fadeOpacity;
@@ -137,6 +147,16 @@ class FilledSlider : public ContinuousSlider {
 
 class MediaSlider : public ContinuousSlider {
 public:
+	struct ColorOverrides {
+		std::optional<QColor> activeFg;
+		std::optional<QColor> activeBg;
+		std::optional<QColor> activeBorder;
+		std::optional<QColor> seekFg;
+		std::optional<QColor> seekBorder;
+		std::optional<QColor> inactiveFg;
+		std::optional<QColor> inactiveBorder;
+	};
+
 	MediaSlider(QWidget *parent, const style::MediaSlider &st);
 
 	void setAlwaysDisplayMarker(bool alwaysDisplayMarker) {
@@ -156,7 +176,8 @@ class MediaSlider : public ContinuousSlider {
 			int valuesCount,
 			Convert &&convert,
 			Value current,
-			Progress &&progress) {
+			Progress &&progress,
+			int indexMin = 0) {
 		Expects(valuesCount > 1);
 
 		setAlwaysDisplayMarker(true);
@@ -171,10 +192,15 @@ class MediaSlider : public ContinuousSlider {
 			}
 		}
 		setAdjustCallback([=](float64 value) {
-			return base::SafeRound(value * sectionsCount) / sectionsCount;
+			return std::max(
+				base::SafeRound(value * sectionsCount),
+				indexMin * 1.
+			) / sectionsCount;
 		});
 		setChangeProgressCallback([=](float64 value) {
-			const auto index = int(base::SafeRound(value * sectionsCount));
+			const auto index = std::max(
+				int(base::SafeRound(value * sectionsCount)),
+				indexMin);
 			progress(convert(index));
 		});
 	}
@@ -193,21 +219,32 @@ class MediaSlider : public ContinuousSlider {
 			Convert &&convert,
 			Value current,
 			Progress &&progress,
-			Finished &&finished) {
+			Finished &&finished,
+			int indexMin = 0) {
 		setPseudoDiscrete(
 			valuesCount,
 			std::forward<Convert>(convert),
 			current,
-			std::forward<Progress>(progress));
+			std::forward<Progress>(progress),
+			indexMin);
 		setChangeFinishedCallback([=](float64 value) {
 			const auto sectionsCount = (valuesCount - 1);
-			const auto index = int(base::SafeRound(value * sectionsCount));
+			const auto index = std::max(
+				int(base::SafeRound(value * sectionsCount)),
+				indexMin);
 			finished(convert(index));
 		});
 	}
 
-	void setActiveFgOverride(std::optional<QColor> color);
+	enum class DividerStyle : uchar {
+		Marks,
+		Gaps,
+	};
+
+	void setColorOverrides(ColorOverrides overrides);
 	void addDivider(float64 atValue, const QSize &size);
+	void clearDividers();
+	void setDividerStyle(DividerStyle style);
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
@@ -220,13 +257,17 @@ class MediaSlider : public ContinuousSlider {
 
 	QSize getSeekDecreaseSize() const override;
 	float64 getOverDuration() const override;
+	void rebuildDividerExclusion();
 
 	const style::MediaSlider &_st;
 	bool _alwaysDisplayMarker = false;
 	bool _paintDisabled = false;
 
 	std::vector<Divider> _dividers;
-	std::optional<QColor> _activeFgOverride;
+	DividerStyle _dividerStyle = DividerStyle::Marks;
+	QRegion _dividerExclusion;
+	QSize _dividerExclusionSize;
+	ColorOverrides _overrides;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/widgets/cross_fade_label.cpp b/Telegram/SourceFiles/ui/widgets/cross_fade_label.cpp
new file mode 100644
index 00000000000000..fb094439ceebc0
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/cross_fade_label.cpp
@@ -0,0 +1,81 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/widgets/cross_fade_label.h"
+
+#include "styles/style_widgets.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kDuration = crl::time(200);
+
+} // namespace
+
+CrossFadeLabel::CrossFadeLabel(
+	QWidget *parent,
+	const style::LabelSimple &st)
+: RpWidget(parent)
+, _st(st) {
+}
+
+void CrossFadeLabel::setText(
+		const QString &text,
+		anim::type animated) {
+	if (_current == text) {
+		return;
+	}
+	_previous = _current;
+	_previousWidth = _currentWidth;
+	_current = text;
+	_currentWidth = _st.font->width(_current);
+	if (!height()) {
+		resize(width(), _st.font->height);
+	}
+	if (animated == anim::type::instant) {
+		_animation.stop();
+		update();
+		return;
+	}
+	_animation.start(
+		[=] { update(); },
+		0.,
+		1.,
+		kDuration,
+		anim::easeOutCubic);
+}
+
+void CrossFadeLabel::setDirection(int direction) {
+	_direction = direction;
+}
+
+void CrossFadeLabel::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	p.setPen(_st.textFg);
+	p.setFont(_st.font);
+	const auto slide = _st.font->height;
+	const auto progress = _animation.value(1.);
+	const auto y = _st.font->ascent;
+	if (progress < 1. && !_previous.isEmpty()) {
+		p.setOpacity(1. - progress);
+		const auto dx = int(slide * _direction * progress);
+		p.drawText(
+			(width() - _previousWidth) / 2 + dx,
+			y,
+			_previous);
+	}
+	if (!_current.isEmpty()) {
+		p.setOpacity(progress);
+		const auto dx = int(slide * -_direction * (1. - progress));
+		p.drawText(
+			(width() - _currentWidth) / 2 + dx,
+			y,
+			_current);
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/cross_fade_label.h b/Telegram/SourceFiles/ui/widgets/cross_fade_label.h
new file mode 100644
index 00000000000000..f2bf7e9ec54f12
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/cross_fade_label.h
@@ -0,0 +1,44 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/animations.h"
+#include "ui/rp_widget.h"
+
+namespace style {
+struct LabelSimple;
+} // namespace style
+
+namespace Ui {
+
+class CrossFadeLabel final : public RpWidget {
+public:
+	CrossFadeLabel(
+		QWidget *parent,
+		const style::LabelSimple &st);
+
+	void setText(const QString &text, anim::type animated = anim::type::normal);
+	void setDirection(int direction);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	const style::LabelSimple &_st;
+
+	QString _current;
+	QString _previous;
+	int _currentWidth = 0;
+	int _previousWidth = 0;
+	int _direction = 1;
+
+	Animations::Simple _animation;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
index 53dc4e3dd01882..702d760e33f26b 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
@@ -8,7 +8,7 @@ For license and copyright information please follow this link:
 #include "ui/widgets/discrete_sliders.h"
 
 #include "ui/effects/ripple_animation.h"
-#include "ui/painter.h"
+#include "styles/style_widgets.h"
 
 namespace Ui {
 
@@ -50,6 +50,7 @@ void DiscreteSlider::setActiveSectionFast(int index) {
 
 void DiscreteSlider::finishAnimating() {
 	_a_left.stop();
+	_a_width.stop();
 	update();
 	_callbackAfterMs = 0;
 	if (_timerId >= 0) {
@@ -57,10 +58,56 @@ void DiscreteSlider::finishAnimating() {
 	}
 }
 
+void DiscreteSlider::selectSection(int index) {
+	if (index < 0 || index >= _sections.size()) {
+		for (auto &other : _sections) {
+			if (other.ripple) {
+				other.ripple->lastStop();
+			}
+		}
+		return;
+	}
+	auto &section = _sections[index];
+	if (section.ripple && !section.ripple->empty()) {
+		return;
+	}
+	for (auto &other : _sections) {
+		if (other.ripple) {
+			other.ripple->lastStop();
+		}
+	}
+	startRipple(index);
+}
+
+void DiscreteSlider::setAdditionalContentWidthToSection(int index, int w) {
+	if (index >= 0 && index < _sections.size()) {
+		auto &section = _sections[index];
+		section.contentWidth = section.label.maxWidth() + w;
+	}
+}
+
+int DiscreteSlider::sectionsCount() const {
+	return int(_sections.size());
+}
+
+int DiscreteSlider::lookupSectionLeft(int index) const {
+	Expects(index >= 0 && index < _sections.size());
+
+	return _sections[index].left;
+}
+
 void DiscreteSlider::setSelectOnPress(bool selectOnPress) {
 	_selectOnPress = selectOnPress;
 }
 
+bool DiscreteSlider::paused() const {
+	return _paused && _paused();
+}
+
+std::vector<DiscreteSlider::Section> &DiscreteSlider::sectionsRef() {
+	return _sections;
+}
+
 void DiscreteSlider::addSection(const QString &label) {
 	_sections.push_back(Section(label, getLabelStyle()));
 	resizeToWidth(width());
@@ -68,7 +115,8 @@ void DiscreteSlider::addSection(const QString &label) {
 
 void DiscreteSlider::addSection(
 		const TextWithEntities &label,
-		const std::any &context) {
+		Text::MarkedContext context) {
+	context.repaint = [this] { update(); };
 	_sections.push_back(Section(label, getLabelStyle(), context));
 	resizeToWidth(width());
 }
@@ -85,13 +133,17 @@ void DiscreteSlider::setSections(const std::vector<QString> &labels) {
 
 void DiscreteSlider::setSections(
 		const std::vector<TextWithEntities> &labels,
-		const std::any &context) {
+		Text::MarkedContext context,
+		Fn<bool()> paused) {
 	Assert(!labels.empty());
 
+	context.repaint = [this] { update(); };
+
 	_sections.clear();
 	for (const auto &label : labels) {
 		_sections.push_back(Section(label, getLabelStyle(), context));
 	}
+	_paused = std::move(paused);
 	refresh();
 }
 
@@ -104,15 +156,18 @@ void DiscreteSlider::refresh() {
 		_selected = 0;
 	}
 	resizeToWidth(width());
+	update();
 }
 
 DiscreteSlider::Range DiscreteSlider::getFinalActiveRange() const {
-	const auto raw = _sections.empty() ? nullptr : &_sections[_selected];
+	const auto raw = (_sections.empty() || _selected < 0)
+		? nullptr
+		: &_sections[_selected];
 	if (!raw) {
 		return { 0, 0 };
 	}
 	const auto width = _snapToLabel
-		? std::min(raw->width, raw->label.maxWidth())
+		? std::min(raw->width, raw->contentWidth)
 		: raw->width;
 	return { raw->left + ((raw->width - width) / 2), width };
 }
@@ -125,8 +180,7 @@ DiscreteSlider::Range DiscreteSlider::getCurrentActiveRange() const {
 	};
 }
 
-template <typename Lambda>
-void DiscreteSlider::enumerateSections(Lambda callback) {
+void DiscreteSlider::enumerateSections(Fn<bool(Section&)> callback) {
 	for (auto &section : _sections) {
 		if (!callback(section)) {
 			return;
@@ -134,9 +188,9 @@ void DiscreteSlider::enumerateSections(Lambda callback) {
 	}
 }
 
-template <typename Lambda>
-void DiscreteSlider::enumerateSections(Lambda callback) const {
-	for (auto &section : _sections) {
+void DiscreteSlider::enumerateSections(
+		Fn<bool(const Section&)> callback) const {
+	for (const auto &section : _sections) {
 		if (!callback(section)) {
 			return;
 		}
@@ -144,7 +198,7 @@ void DiscreteSlider::enumerateSections(Lambda callback) const {
 }
 
 void DiscreteSlider::mousePressEvent(QMouseEvent *e) {
-	auto index = getIndexFromPosition(e->pos());
+	const auto index = getIndexFromPosition(e->pos());
 	if (_selectOnPress) {
 		setSelectedSection(index);
 	}
@@ -153,17 +207,21 @@ void DiscreteSlider::mousePressEvent(QMouseEvent *e) {
 }
 
 void DiscreteSlider::mouseMoveEvent(QMouseEvent *e) {
-	if (_pressed < 0) return;
+	if (_pressed < 0) {
+		return;
+	}
 	if (_selectOnPress) {
 		setSelectedSection(getIndexFromPosition(e->pos()));
 	}
 }
 
 void DiscreteSlider::mouseReleaseEvent(QMouseEvent *e) {
-	auto pressed = std::exchange(_pressed, -1);
-	if (pressed < 0) return;
+	const auto pressed = std::exchange(_pressed, -1);
+	if (pressed < 0) {
+		return;
+	}
 
-	auto index = getIndexFromPosition(e->pos());
+	const auto index = getIndexFromPosition(e->pos());
 	if (pressed < _sections.size()) {
 		if (_sections[pressed].ripple) {
 			_sections[pressed].ripple->lastStop();
@@ -175,14 +233,16 @@ void DiscreteSlider::mouseReleaseEvent(QMouseEvent *e) {
 }
 
 void DiscreteSlider::setSelectedSection(int index) {
-	if (index < 0 || index >= _sections.size()) return;
+	if (index >= int(_sections.size())) {
+		return;
+	}
 
 	if (_selected != index) {
 		const auto from = getFinalActiveRange();
 		_selected = index;
 		const auto to = getFinalActiveRange();
 		const auto duration = getAnimationDuration();
-		const auto updater = [=] { update(); };
+		const auto updater = [this] { update(); };
 		_a_left.start(updater, from.left, to.left, duration);
 		_a_width.start(updater, from.width, to.width, duration);
 		_callbackAfterMs = crl::now() + duration;
@@ -190,8 +250,8 @@ void DiscreteSlider::setSelectedSection(int index) {
 }
 
 int DiscreteSlider::getIndexFromPosition(QPoint pos) {
-	int count = _sections.size();
-	for (int i = 0; i != count; ++i) {
+	const auto count = _sections.size();
+	for (auto i = 0; i != count; ++i) {
 		if (_sections[i].left + _sections[i].width > pos.x()) {
 			return i;
 		}
@@ -202,14 +262,16 @@ int DiscreteSlider::getIndexFromPosition(QPoint pos) {
 DiscreteSlider::Section::Section(
 	const QString &label,
 	const style::TextStyle &st)
-: label(st, label) {
+: label(st, label)
+, contentWidth(Section::label.maxWidth()) {
 }
 
 DiscreteSlider::Section::Section(
 		const TextWithEntities &label,
 		const style::TextStyle &st,
-		const std::any &context) {
+		const Text::MarkedContext &context) {
 	this->label.setMarkedText(st, label, kMarkupTextOptions, context);
+	contentWidth = Section::label.maxWidth();
 }
 
 SettingsSlider::SettingsSlider(
@@ -224,6 +286,27 @@ SettingsSlider::SettingsSlider(
 	setSelectOnPress(_st.ripple.showDuration == 0);
 }
 
+const style::SettingsSlider &SettingsSlider::st() const {
+	return _st;
+}
+
+int SettingsSlider::centerOfSection(int section) const {
+	const auto widths = countSectionsWidths(0);
+	auto result = 0;
+	if (section >= 0 && section < widths.size()) {
+		for (auto i = 0; i < section; i++) {
+			result += widths[i];
+		}
+		result += widths[section] / 2;
+	}
+	return result;
+}
+
+void SettingsSlider::fitWidthToSections() {
+	const auto widths = countSectionsWidths(0);
+	resizeToWidth(ranges::accumulate(widths, .0) + _st.padding * 2);
+}
+
 void SettingsSlider::setRippleTopRoundRadius(int radius) {
 	_rippleTopRoundRadius = radius;
 }
@@ -237,13 +320,15 @@ int SettingsSlider::getAnimationDuration() const {
 }
 
 void SettingsSlider::resizeSections(int newWidth) {
-	auto count = getSectionsCount();
-	if (!count) return;
+	const auto count = getSectionsCount();
+	if (!count) {
+		return;
+	}
 
-	auto sectionWidths = countSectionsWidths(newWidth);
+	const auto sectionWidths = countSectionsWidths(newWidth);
 
 	auto skip = 0;
-	auto x = 0.;
+	auto x = _st.padding * 1.;
 	auto sectionWidth = sectionWidths.begin();
 	enumerateSections([&](Section &section) {
 		Expects(sectionWidth != sectionWidths.end());
@@ -258,18 +343,19 @@ void SettingsSlider::resizeSections(int newWidth) {
 	stopAnimation();
 }
 
-std::vector<float64> SettingsSlider::countSectionsWidths(
-		int newWidth) const {
-	auto count = getSectionsCount();
-	auto sectionsWidth = newWidth - (count - 1) * _st.barSkip;
-	auto sectionWidth = sectionsWidth / float64(count);
+std::vector<float64> SettingsSlider::countSectionsWidths(int newWidth) const {
+	const auto count = getSectionsCount();
+	const auto sectionsWidth = newWidth
+		- 2 * _st.padding
+		- (count - 1) * _st.barSkip;
+	const auto sectionWidth = sectionsWidth / float64(count);
 
 	auto result = std::vector<float64>(count, sectionWidth);
 	auto labelsWidth = 0;
 	auto commonWidth = true;
 	enumerateSections([&](const Section &section) {
-		labelsWidth += section.label.maxWidth();
-		if (section.label.maxWidth() >= sectionWidth) {
+		labelsWidth += section.contentWidth;
+		if (section.contentWidth >= sectionWidth) {
 			commonWidth = false;
 		}
 		return true;
@@ -283,7 +369,7 @@ std::vector<float64> SettingsSlider::countSectionsWidths(
 		enumerateSections([&](const Section &section) {
 			Expects(currentWidth != result.end());
 
-			*currentWidth = padding + section.label.maxWidth() + padding;
+			*currentWidth = padding + section.contentWidth + padding;
 			++currentWidth;
 			return true;
 		});
@@ -297,7 +383,9 @@ int SettingsSlider::resizeGetHeight(int newWidth) {
 }
 
 void SettingsSlider::startRipple(int sectionIndex) {
-	if (!_st.ripple.showDuration) return;
+	if (!_st.ripple.showDuration) {
+		return;
+	}
 	auto index = 0;
 	enumerateSections([this, &index, sectionIndex](Section &section) {
 		if (index++ == sectionIndex) {
@@ -319,13 +407,13 @@ void SettingsSlider::startRipple(int sectionIndex) {
 QImage SettingsSlider::prepareRippleMask(
 		int sectionIndex,
 		const Section &section) {
-	auto size = QSize(section.width, height() - _st.rippleBottomSkip);
+	const auto size = QSize(section.width, height() - _st.rippleBottomSkip);
 	if (!_rippleTopRoundRadius
 		|| (sectionIndex > 0 && sectionIndex + 1 < getSectionsCount())) {
 		return RippleAnimation::RectMask(size);
 	}
 	return RippleAnimation::MaskByDrawer(size, false, [&](QPainter &p) {
-		auto plusRadius = _rippleTopRoundRadius + 1;
+		const auto plusRadius = _rippleTopRoundRadius + 1;
 		p.drawRoundedRect(
 			0,
 			0,
@@ -347,10 +435,10 @@ QImage SettingsSlider::prepareRippleMask(
 }
 
 void SettingsSlider::paintEvent(QPaintEvent *e) {
-	Painter p(this);
+	auto p = QPainter(this);
 
-	auto clip = e->rect();
-	auto range = getCurrentActiveRange();
+	const auto clip = e->rect();
+	const auto range = DiscreteSlider::getCurrentActiveRange();
 
 	const auto drawRect = [&](QRect rect, bool active = false) {
 		const auto &bar = active ? _barActive : _bar;
@@ -362,32 +450,40 @@ void SettingsSlider::paintEvent(QPaintEvent *e) {
 	};
 	enumerateSections([&](Section &section) {
 		const auto activeWidth = _st.barSnapToLabel
-			? section.label.maxWidth()
+			? section.contentWidth
 			: section.width;
 		const auto activeLeft = section.left
 			+ (section.width - activeWidth) / 2;
-		auto active = 1.
+		const auto divider = std::max(std::min(activeWidth, range.width), 1);
+		const auto active = 1.
 			- std::clamp(
-				qAbs(range.left - activeLeft) / float64(range.width),
+				std::abs(range.left - activeLeft) / float64(divider),
 				0.,
 				1.);
 		if (section.ripple) {
-			auto color = anim::color(_st.rippleBg, _st.rippleBgActive, active);
+			const auto color = anim::color(
+				_st.rippleBg,
+				_st.rippleBgActive,
+				active);
 			section.ripple->paint(p, section.left, 0, width(), &color);
 			if (section.ripple->empty()) {
 				section.ripple.reset();
 			}
 		}
 		if (!_st.barSnapToLabel) {
-			auto from = activeLeft, tofill = activeWidth;
+			auto from = activeLeft;
+			auto tofill = activeWidth;
 			if (range.left > from) {
-				auto fill = qMin(tofill, range.left - from);
+				const auto fill = std::min(tofill, range.left - from);
 				drawRect(myrtlrect(from, _st.barTop, fill, _st.barStroke));
 				from += fill;
 				tofill -= fill;
 			}
 			if (range.left + activeWidth > from) {
-				if (auto fill = qMin(tofill, range.left + activeWidth - from)) {
+				const auto fill = std::min(
+					tofill,
+					range.left + activeWidth - from);
+				if (fill) {
 					drawRect(
 						myrtlrect(from, _st.barTop, fill, _st.barStroke),
 						true);
@@ -399,15 +495,21 @@ void SettingsSlider::paintEvent(QPaintEvent *e) {
 				drawRect(myrtlrect(from, _st.barTop, tofill, _st.barStroke));
 			}
 		}
-		const auto labelLeft = section.left + (section.width - section.label.maxWidth()) / 2;
-		if (myrtlrect(labelLeft, _st.labelTop, section.label.maxWidth(), _st.labelStyle.font->height).intersects(clip)) {
+		const auto labelLeft = section.left
+			+ (section.width - section.contentWidth) / 2;
+		const auto rect = myrtlrect(
+			labelLeft,
+			_st.labelTop,
+			section.contentWidth,
+			_st.labelStyle.font->height);
+		if (rect.intersects(clip)) {
 			p.setPen(anim::pen(_st.labelFg, _st.labelFgActive, active));
-			section.label.drawLeft(
-				p,
-				labelLeft,
-				_st.labelTop,
-				section.label.maxWidth(),
-				width());
+			section.label.draw(p, {
+				.position = QPoint(labelLeft, _st.labelTop),
+				.outerWidth = width(),
+				.availableWidth = section.label.maxWidth(),
+				.paused = paused(),
+			});
 		}
 		return true;
 	});
@@ -416,7 +518,9 @@ void SettingsSlider::paintEvent(QPaintEvent *e) {
 		const auto from = std::max(range.left - add, 0);
 		const auto till = std::min(range.left + range.width + add, width());
 		if (from < till) {
-			drawRect(myrtlrect(from, _st.barTop, till - from, _st.barStroke), true);
+			drawRect(
+				myrtlrect(from, _st.barTop, till - from, _st.barStroke),
+				true);
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
index 0cb930bf118619..bda6cc773574e1 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
@@ -10,7 +10,16 @@ For license and copyright information please follow this link:
 #include "ui/rp_widget.h"
 #include "ui/round_rect.h"
 #include "ui/effects/animations.h"
-#include "styles/style_widgets.h"
+#include "ui/text/text.h"
+
+namespace style {
+struct TextStyle;
+struct SettingsSlider;
+} // namespace style
+
+namespace st {
+extern const style::SettingsSlider &defaultSettingsSlider;
+} // namespace st
 
 namespace Ui {
 
@@ -24,22 +33,29 @@ class DiscreteSlider : public RpWidget {
 	void addSection(const QString &label);
 	void addSection(
 		const TextWithEntities &label,
-		const std::any &context = {});
+		Text::MarkedContext context = {});
 	void setSections(const std::vector<QString> &labels);
 	void setSections(
 		const std::vector<TextWithEntities> &labels,
-		const std::any &context = {});
+		Text::MarkedContext context = {},
+		Fn<bool()> paused = nullptr);
 	int activeSection() const {
 		return _activeIndex;
 	}
 	void setActiveSection(int index);
 	void setActiveSectionFast(int index);
 	void finishAnimating();
+	void selectSection(int index);
+
+	void setAdditionalContentWidthToSection(int index, int width);
 
 	[[nodiscard]] rpl::producer<int> sectionActivated() const {
 		return _sectionActivated.events();
 	}
 
+	[[nodiscard]] int sectionsCount() const;
+	[[nodiscard]] int lookupSectionLeft(int index) const;
+
 protected:
 	void timerEvent(QTimerEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
@@ -53,12 +69,13 @@ class DiscreteSlider : public RpWidget {
 		Section(
 			const TextWithEntities &label,
 			const style::TextStyle &st,
-			const std::any &context);
+			const Text::MarkedContext &context);
 
+		Text::String label;
+		std::unique_ptr<RippleAnimation> ripple;
 		int left = 0;
 		int width = 0;
-		Ui::Text::String label;
-		std::unique_ptr<RippleAnimation> ripple;
+		int contentWidth = 0;
 	};
 	struct Range {
 		int left = 0;
@@ -72,11 +89,8 @@ class DiscreteSlider : public RpWidget {
 		return _sections.size();
 	}
 
-	template <typename Lambda>
-	void enumerateSections(Lambda callback);
-
-	template <typename Lambda>
-	void enumerateSections(Lambda callback) const;
+	void enumerateSections(Fn<bool(Section&)> callback);
+	void enumerateSections(Fn<bool(const Section&)> callback) const;
 
 	virtual void startRipple(int sectionIndex) {
 	}
@@ -89,6 +103,10 @@ class DiscreteSlider : public RpWidget {
 
 	void setSelectOnPress(bool selectOnPress);
 
+	[[nodiscard]] std::vector<Section> &sectionsRef();
+
+	[[nodiscard]] bool paused() const;
+
 private:
 	void activateCallback();
 	virtual const style::TextStyle &getLabelStyle() const = 0;
@@ -98,6 +116,7 @@ class DiscreteSlider : public RpWidget {
 	void setSelectedSection(int index);
 
 	std::vector<Section> _sections;
+	Fn<bool()> _paused;
 	int _activeIndex = 0;
 	bool _selectOnPress = true;
 	bool _snapToLabel = false;
@@ -116,7 +135,14 @@ class DiscreteSlider : public RpWidget {
 
 class SettingsSlider : public DiscreteSlider {
 public:
-	SettingsSlider(QWidget *parent, const style::SettingsSlider &st = st::defaultSettingsSlider);
+	SettingsSlider(
+		QWidget *parent,
+		const style::SettingsSlider &st = st::defaultSettingsSlider);
+
+	[[nodiscard]] const style::SettingsSlider &st() const;
+
+	[[nodiscard]] int centerOfSection(int section) const;
+	virtual void fitWidthToSections();
 
 	void setRippleTopRoundRadius(int radius);
 
@@ -127,13 +153,14 @@ class SettingsSlider : public DiscreteSlider {
 
 	void startRipple(int sectionIndex) override;
 
+	std::vector<float64> countSectionsWidths(int newWidth) const;
+
 private:
 	const style::TextStyle &getLabelStyle() const override;
 	int getAnimationDuration() const override;
 	QImage prepareRippleMask(int sectionIndex, const Section &section);
 
 	void resizeSections(int newWidth);
-	std::vector<float64> countSectionsWidths(int newWidth) const;
 
 	const style::SettingsSlider &_st;
 	std::optional<Ui::RoundRect> _bar;
diff --git a/Telegram/SourceFiles/ui/widgets/expandable_peer_list.cpp b/Telegram/SourceFiles/ui/widgets/expandable_peer_list.cpp
index db09645b60aec2..f879f9a757b7b7 100644
--- a/Telegram/SourceFiles/ui/widgets/expandable_peer_list.cpp
+++ b/Telegram/SourceFiles/ui/widgets/expandable_peer_list.cpp
@@ -8,6 +8,8 @@ For license and copyright information please follow this link:
 #include "ui/widgets/expandable_peer_list.h"
 
 #include "data/data_peer.h"
+#include "info/profile/info_profile_values.h"
+#include "lang/lang_text_entity.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/rect.h"
 #include "ui/text/text_utilities.h"
@@ -20,49 +22,15 @@ For license and copyright information please follow this link:
 #include "styles/style_layers.h"
 #include "styles/style_widgets.h"
 
+#include <cstdlib>
+
 namespace Ui {
 namespace {
 
-class Button final : public Ui::RippleButton {
-public:
-	Button(not_null<QWidget*> parent, int count);
-
-	[[nodiscard]] not_null<Ui::AbstractCheckView*> checkView() const;
-
-private:
-	void paintEvent(QPaintEvent *event) override;
-	QImage prepareRippleMask() const override;
-	QPoint prepareRippleStartPosition() const override;
-
-	std::unique_ptr<Ui::AbstractCheckView> _view;
-
-};
-
-Button::Button(not_null<QWidget*> parent, int count)
-: Ui::RippleButton(parent, st::defaultRippleAnimation)
-, _view(std::make_unique<Ui::ParticipantsCheckView>(
-	count,
-	st::slideWrapDuration,
-	false,
-	[=] { update(); })) {
-}
-
-not_null<Ui::AbstractCheckView*> Button::checkView() const {
-	return _view.get();
-}
-
-QImage Button::prepareRippleMask() const {
-	return _view->prepareRippleMask();
-}
-
-QPoint Button::prepareRippleStartPosition() const {
-	return mapFromGlobal(QCursor::pos());
-}
-
-void Button::paintEvent(QPaintEvent *event) {
-	auto p = QPainter(this);
-	Ui::RippleButton::paintRipple(p, QPoint());
-	_view->paint(p, 0, 0, width());
+[[nodiscard]] TextWithEntities ParticipantsExpanderText(int count) {
+	return tr::marked()
+		.append(st::moderateBoxExpand)
+		.append(QString::number(std::abs(count)));
 }
 
 } // namespace
@@ -84,16 +52,19 @@ void AddExpandablePeerList(
 	}
 	const auto count = int(participants.size());
 	const auto button = !hideRightButton
-		? Ui::CreateChild<Button>(inner, count)
+		? Ui::CreateChild<Ui::ExpanderButton>(
+			inner,
+			ParticipantsExpanderText(count))
 		: nullptr;
 	if (button) {
-		button->resize(Ui::ParticipantsCheckView::ComputeSize(count));
+		button->resize(Ui::ExpanderButton::ComputeSize(
+			ParticipantsExpanderText(count)));
 	}
 
 	const auto overlay = Ui::CreateChild<Ui::AbstractButton>(inner);
 
 	checkbox->geometryValue(
-	) | rpl::start_with_next([=](const QRect &rect) {
+	) | rpl::on_next([=](const QRect &rect) {
 		overlay->setGeometry(rect);
 		overlay->raise();
 
@@ -107,7 +78,7 @@ void AddExpandablePeerList(
 	}, overlay->lifetime());
 
 	controller->toggleRequestsFromInner.events(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		checkbox->setChecked(toggled);
 	}, checkbox->lifetime());
 	if (button) {
@@ -131,7 +102,7 @@ void AddExpandablePeerList(
 		wrap->toggle(hideRightButton, anim::type::instant);
 
 		controller->toggleRequestsFromTop.events(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			wrap->toggle(toggled, anim::type::normal);
 		}, wrap->lifetime());
 
@@ -148,19 +119,36 @@ void AddExpandablePeerList(
 			const auto &st = st::moderateBoxUserpic;
 			line->resize(line->width(), st.size.height());
 
-			const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
-				line,
-				peer,
-				st);
+			using namespace Info::Profile;
+			auto name = controller->data.bold
+				? (NameValue(peer) | rpl::map(tr::bold) | rpl::type_erased)
+				: NameValue(peer) | rpl::map(tr::marked);
+			const auto userpic
+				= Ui::CreateChild<Ui::UserpicButton>(line, peer, st);
 			const auto checkbox = Ui::CreateChild<Ui::Checkbox>(
 				line,
-				controller->data.bold
-					? Ui::Text::Bold(peer->name())
-					: TextWithEntities{ .text = peer->name() },
-				ranges::contains(controller->data.checked, peer->id),
-				st::defaultBoxCheckbox);
-			line->widthValue(
-			) | rpl::start_with_next([=](int width) {
+				controller->data.messagesCounts
+				? rpl::combine(
+					std::move(name),
+					rpl::duplicate(controller->data.messagesCounts)
+				) | rpl::map([=](const auto &richName, const auto &map) {
+					const auto it = map.find(peer->id);
+					return (it == map.end() || !it->second)
+						? richName
+						: TextWithEntities{
+							(u"(%1) "_q).arg(it->second)
+						}.append(richName);
+				})
+				: std::move(name) | rpl::type_erased,
+				st::defaultBoxCheckbox,
+				std::make_unique<Ui::CheckView>(
+					st::defaultCheck,
+					ranges::contains(controller->data.checked, peer->id)));
+			checkbox->setCheckAlignment(style::al_left);
+			rpl::combine(
+				line->widthValue(),
+				checkbox->widthValue()
+			) | rpl::on_next([=](int width, int) {
 				userpic->moveToLeft(
 					st::boxRowPadding.left()
 						+ checkbox->checkRect().width()
@@ -189,7 +177,7 @@ void AddExpandablePeerList(
 		}) | ranges::to_vector;
 
 		clicks->events(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			controller->toggleRequestsFromInner.fire_copy(
 				checkTopOnAllInner
 				? ranges::all_of(checkboxes, &Ui::Checkbox::checked)
@@ -197,7 +185,7 @@ void AddExpandablePeerList(
 		}, container->lifetime());
 
 		controller->checkAllRequests.events(
-		) | rpl::start_with_next([=](bool checked) {
+		) | rpl::on_next([=](bool checked) {
 			for (const auto &c : checkboxes) {
 				c->setChecked(checked);
 			}
diff --git a/Telegram/SourceFiles/ui/widgets/expandable_peer_list.h b/Telegram/SourceFiles/ui/widgets/expandable_peer_list.h
index 3ff7e4ee19ec3e..983701f538ea1a 100644
--- a/Telegram/SourceFiles/ui/widgets/expandable_peer_list.h
+++ b/Telegram/SourceFiles/ui/widgets/expandable_peer_list.h
@@ -18,6 +18,7 @@ class VerticalLayout;
 
 struct ExpandablePeerListController final {
 	struct Data final {
+		rpl::producer<base::flat_map<PeerId, int>> messagesCounts = nullptr;
 		Participants participants;
 		std::vector<PeerId> checked;
 		bool skipSingle = false;
diff --git a/Telegram/SourceFiles/ui/widgets/fields/special_fields.cpp b/Telegram/SourceFiles/ui/widgets/fields/special_fields.cpp
index 0b7487caf12f61..e61562d96a01ce 100644
--- a/Telegram/SourceFiles/ui/widgets/fields/special_fields.cpp
+++ b/Telegram/SourceFiles/ui/widgets/fields/special_fields.cpp
@@ -50,6 +50,14 @@ void CountryCodeInput::codeSelected(const QString &code) {
 	changed();
 }
 
+void CountryCodeInput::keyPressEvent(QKeyEvent *e) {
+	if (e->key() == Qt::Key_Space) {
+		_spacePressed.fire({});
+	} else {
+		MaskedInputField::keyPressEvent(e);
+	}
+}
+
 void CountryCodeInput::correctValue(
 		const QString &was,
 		int wasCursor,
@@ -272,6 +280,10 @@ void UsernameInput::setLinkPlaceholder(const QString &placeholder) {
 	}
 }
 
+void UsernameInput::setMaxLength(int maxLength) {
+	_maxLength = maxLength;
+}
+
 void UsernameInput::paintAdditionalPlaceholder(QPainter &p) {
 	if (!_linkPlaceholder.isEmpty()) {
 		p.setFont(_st.style.font);
@@ -294,8 +306,11 @@ void UsernameInput::correctValue(
 		if (newPos > 0) --newPos;
 	}
 	len -= from;
-	if (len > kMaxUsernameLength) {
-		len = kMaxUsernameLength + (now.at(from) == '@' ? 1 : 0);
+	const auto maxLength = (_maxLength > 0)
+		? _maxLength
+		: kMaxUsernameLength;
+	if (len > maxLength) {
+		len = maxLength + (now.at(from) == '@' ? 1 : 0);
 	}
 	for (int32 to = from + len; to > from;) {
 		--to;
diff --git a/Telegram/SourceFiles/ui/widgets/fields/special_fields.h b/Telegram/SourceFiles/ui/widgets/fields/special_fields.h
index 6c000f80127913..f87a36c454d103 100644
--- a/Telegram/SourceFiles/ui/widgets/fields/special_fields.h
+++ b/Telegram/SourceFiles/ui/widgets/fields/special_fields.h
@@ -23,10 +23,14 @@ class CountryCodeInput : public MaskedInputField {
 	[[nodiscard]] rpl::producer<QString> codeChanged() const {
 		return _codeChanged.events();
 	}
+	[[nodiscard]] rpl::producer<> spacePressed() const {
+		return _spacePressed.events();
+	}
 
 	void codeSelected(const QString &code);
 
 protected:
+	void keyPressEvent(QKeyEvent *e) override;
 	void correctValue(
 		const QString &was,
 		int wasCursor,
@@ -37,6 +41,7 @@ class CountryCodeInput : public MaskedInputField {
 	bool _nosignal = false;
 	rpl::event_stream<QString> _addedToNumber;
 	rpl::event_stream<QString> _codeChanged;
+	rpl::event_stream<> _spacePressed;
 
 };
 
@@ -89,6 +94,7 @@ class UsernameInput : public MaskedInputField {
 		const QString &linkPlaceholder);
 
 	void setLinkPlaceholder(const QString &placeholder);
+	void setMaxLength(int maxLength);
 
 protected:
 	void correctValue(
@@ -100,6 +106,7 @@ class UsernameInput : public MaskedInputField {
 
 private:
 	QString _linkPlaceholder;
+	int _maxLength = 0;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/widgets/gradient_round_button.cpp b/Telegram/SourceFiles/ui/widgets/gradient_round_button.cpp
index f108d1646e9dfc..7ce0953dc72bed 100644
--- a/Telegram/SourceFiles/ui/widgets/gradient_round_button.cpp
+++ b/Telegram/SourceFiles/ui/widgets/gradient_round_button.cpp
@@ -7,7 +7,9 @@ For license and copyright information please follow this link:
 */
 #include "ui/widgets/gradient_round_button.h"
 
+#include "ui/effects/ripple_animation.h"
 #include "ui/image/image_prepare.h"
+#include "ui/painter.h"
 #include "styles/style_boxes.h"
 
 namespace Ui {
@@ -17,6 +19,22 @@ GradientButton::GradientButton(QWidget *widget, QGradientStops stops)
 , _stops(std::move(stops)) {
 }
 
+void GradientButton::setStops(QGradientStops stops) {
+	if (_stops != stops) {
+		_stops = std::move(stops);
+		_bg = {};
+		update();
+	}
+}
+
+void GradientButton::setFullRadius(bool enabled) {
+	if (_fullRadius != enabled) {
+		_fullRadius = enabled;
+		_bg = {};
+		update();
+	}
+}
+
 void GradientButton::paintEvent(QPaintEvent *e) {
 	QPainter p(this);
 
@@ -65,14 +83,27 @@ void GradientButton::validateBg() {
 	}
 	_bg = QImage(size() * factor, QImage::Format_ARGB32_Premultiplied);
 	_bg.setDevicePixelRatio(factor);
-
+	if (_fullRadius) {
+		_bg.fill(Qt::transparent);
+	}
 	auto p = QPainter(&_bg);
-	auto gradient = QLinearGradient(QPointF(0, 0), QPointF(width(), 0));
+	auto gradient = QLinearGradient(
+		QPointF(0, 0),
+		QPointF(width(), height()));
 	gradient.setStops(_stops);
-	p.fillRect(rect(), gradient);
+	if (_fullRadius) {
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(gradient);
+		p.drawRoundedRect(rect(), height() / 2., height() / 2.);
+	} else {
+		p.fillRect(rect(), gradient);
+	}
 	p.end();
 
-	_bg = Images::Round(std::move(_bg), ImageRoundRadius::Large);
+	if (!_fullRadius) {
+		_bg = Images::Round(std::move(_bg), ImageRoundRadius::Large);
+	}
 }
 
 void GradientButton::setGlarePaused(bool paused) {
@@ -87,6 +118,12 @@ void GradientButton::validateGlare() {
 		st::gradientButtonGlareDuration);
 }
 
+QImage GradientButton::prepareRippleMask() const {
+	return RippleAnimation::RoundRectMask(
+		size(),
+		_fullRadius ? height() / 2 : st::roundRadiusLarge);
+}
+
 void GradientButton::startGlareAnimation() {
 	validateGlare();
 }
diff --git a/Telegram/SourceFiles/ui/widgets/gradient_round_button.h b/Telegram/SourceFiles/ui/widgets/gradient_round_button.h
index aab2622ac7b71e..120f2b6d8a1481 100644
--- a/Telegram/SourceFiles/ui/widgets/gradient_round_button.h
+++ b/Telegram/SourceFiles/ui/widgets/gradient_round_button.h
@@ -16,19 +16,25 @@ class GradientButton final : public Ui::RippleButton {
 public:
 	GradientButton(QWidget *widget, QGradientStops stops);
 
+	void setStops(QGradientStops stops);
+	void setFullRadius(bool enabled);
+
 	void startGlareAnimation();
 	void setGlarePaused(bool paused);
 
 private:
-	void paintEvent(QPaintEvent *e);
+	void paintEvent(QPaintEvent *e) override;
 	void paintGlare(QPainter &p);
 	void validateBg();
 	void validateGlare();
 
+	QImage prepareRippleMask() const override;
+
 	QGradientStops _stops;
 	QImage _bg;
 
 	GlareEffect _glare;
+	bool _fullRadius = false;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/widgets/horizontal_fit_container.cpp b/Telegram/SourceFiles/ui/widgets/horizontal_fit_container.cpp
new file mode 100644
index 00000000000000..1b0ac35766359f
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/horizontal_fit_container.cpp
@@ -0,0 +1,56 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/widgets/horizontal_fit_container.h"
+
+#include "ui/widgets/buttons.h"
+
+namespace Ui {
+
+HorizontalFitContainer::HorizontalFitContainer(
+	not_null<RpWidget*> parent,
+	int spacing)
+: RpWidget(parent)
+, _spacing(spacing) {
+	sizeValue() | rpl::on_next([=](QSize size) {
+		updateLayout(size);
+	}, lifetime());
+}
+
+int HorizontalFitContainer::add(not_null<AbstractButton*> button) {
+	const auto id = _nextId++;
+	_buttons.emplace(id, base::unique_qptr<AbstractButton>{ button.get() });
+	button->setParent(this);
+	button->show();
+	updateLayout(size());
+	return id;
+}
+
+void HorizontalFitContainer::remove(int id) {
+	if (const auto it = _buttons.find(id); it != _buttons.end()) {
+		_buttons.erase(it);
+		updateLayout(size());
+	}
+}
+
+void HorizontalFitContainer::updateLayout(QSize size) {
+	_layoutLifetime.destroy();
+	if (_buttons.empty()) {
+		return;
+	}
+	const auto count = int(_buttons.size());
+	const auto totalSpacing = _spacing * (count - 1);
+	const auto buttonWidth = (size.width() - totalSpacing) / count;
+	const auto h = size.height();
+	auto x = 0;
+	for (const auto &[id, button] : _buttons) {
+		button->setGeometry(x, 0, buttonWidth, h);
+		x += buttonWidth + _spacing;
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/horizontal_fit_container.h b/Telegram/SourceFiles/ui/widgets/horizontal_fit_container.h
new file mode 100644
index 00000000000000..8aa51723c39df6
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/horizontal_fit_container.h
@@ -0,0 +1,36 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "base/unique_qptr.h"
+
+namespace Ui {
+
+class AbstractButton;
+
+class HorizontalFitContainer final : public RpWidget {
+public:
+	HorizontalFitContainer(
+		not_null<RpWidget*> parent,
+		int spacing);
+
+	int add(not_null<AbstractButton*> button);
+	void remove(int id);
+
+private:
+	void updateLayout(QSize size);
+
+	const int _spacing;
+	std::map<int, base::unique_qptr<AbstractButton>> _buttons;
+	int _nextId = 0;
+	rpl::lifetime _layoutLifetime;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.cpp b/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.cpp
deleted file mode 100644
index 4502d65531527a..00000000000000
--- a/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "ui/widgets/label_with_custom_emoji.h"
-
-#include "core/ui_integration.h"
-#include "ui/widgets/labels.h"
-#include "styles/style_widgets.h"
-
-namespace Ui {
-
-object_ptr<Ui::FlatLabel> CreateLabelWithCustomEmoji(
-		QWidget *parent,
-		rpl::producer<TextWithEntities> &&text,
-		Core::MarkedTextContext context,
-		const style::FlatLabel &st) {
-	auto label = object_ptr<Ui::FlatLabel>(parent, st);
-	const auto raw = label.data();
-	if (!context.customEmojiRepaint) {
-		context.customEmojiRepaint = [=] { raw->update(); };
-	}
-	std::move(text) | rpl::start_with_next([=](const TextWithEntities &text) {
-		raw->setMarkedText(text, context);
-	}, label->lifetime());
-	return label;
-}
-
-} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/middle_click_autoscroll.cpp b/Telegram/SourceFiles/ui/widgets/middle_click_autoscroll.cpp
new file mode 100644
index 00000000000000..fb8c2b89b6c500
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/middle_click_autoscroll.cpp
@@ -0,0 +1,244 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/widgets/middle_click_autoscroll.h"
+
+#include "styles/style_chat.h"
+#include "styles/style_widgets.h"
+#include "ui/effects/animation_value.h"
+#include "ui/rect.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kDelay = 15;
+constexpr auto kHoldToToggleThreshold = crl::time(220);
+
+[[nodiscard]] int Deadzone() {
+	return std::max(1, int(std::lround(style::ConvertFloatScale(6.))));
+}
+
+[[nodiscard]] QImage PaintCursorImage(
+		int size,
+		int factor,
+		bool drawOuter,
+		bool drawTopArrow,
+		bool drawBottomArrow,
+		const QColor &inner,
+		const QColor &indicator,
+		const QColor &topArrow,
+		const QColor &bottomArrow) {
+	auto image = QImage(
+		QSize(size, size) * factor,
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(factor);
+	image.fill(Qt::transparent);
+	auto p = QPainter(&image);
+	p.setRenderHint(QPainter::Antialiasing);
+	p.setPen(Qt::NoPen);
+
+	const auto outerRect = QRectF(QPointF(0.5, 0.5), Size(size - 1.));
+	if (drawOuter) {
+		const auto outerStroke = std::max(1., style::ConvertFloatScale(1.5));
+		auto pen = QPen(indicator);
+		pen.setWidthF(outerStroke);
+		p.setPen(pen);
+		p.setBrush(inner);
+		p.drawEllipse(outerRect.marginsRemoved(Margins(outerStroke * 0.5)));
+	}
+	p.setPen(Qt::NoPen);
+	const auto centerSkip = style::ConvertFloatScale(10.5);
+	const auto centerRect = outerRect - Margins(centerSkip);
+	p.setBrush(indicator);
+	p.drawEllipse(centerRect);
+
+	const auto middle = size * 0.5;
+	const auto arrowGap = style::ConvertFloatScale(5.);
+	const auto headHalfWidth = style::ConvertFloatScale(4.5);
+	const auto headHeight = style::ConvertFloatScale(3.5);
+	const auto stroke = std::max(1., style::ConvertFloatScale(2.));
+	const auto drawArrow = [&](bool up, const QColor &color) {
+		auto pen = QPen(color);
+		pen.setWidthF(stroke);
+		pen.setCapStyle(Qt::RoundCap);
+		pen.setJoinStyle(Qt::RoundJoin);
+		p.setPen(pen);
+		const auto dir = up ? -1. : 1.;
+		const auto tipY = middle + dir * (arrowGap + headHeight);
+		const auto neckY = tipY - dir * headHeight;
+		p.drawLine(
+			QPointF(middle, tipY),
+			QPointF(middle - headHalfWidth, neckY));
+		p.drawLine(
+			QPointF(middle, tipY),
+			QPointF(middle + headHalfWidth, neckY));
+	};
+	if (drawTopArrow) {
+		drawArrow(true, topArrow);
+	}
+	if (drawBottomArrow) {
+		drawArrow(false, bottomArrow);
+	}
+	return image;
+}
+
+} // namespace
+
+MiddleClickAutoscroll::MiddleClickAutoscroll(
+	Fn<void(int)> scrollBy,
+	Fn<void(const QCursor &)> applyCursor,
+	Fn<void()> restoreCursor,
+	Fn<bool()> shouldContinue)
+: _scrollBy(std::move(scrollBy))
+, _applyCursor(std::move(applyCursor))
+, _restoreCursor(std::move(restoreCursor))
+, _shouldContinue(std::move(shouldContinue))
+, _timer([=] { onTimer(); }) {
+}
+
+void MiddleClickAutoscroll::toggleOrBeginHold(const QPoint &globalPosition) {
+	if (_active) {
+		stop();
+		return;
+	}
+	_middlePressed = true;
+	_middlePressedAt = crl::now();
+	start(globalPosition);
+}
+
+bool MiddleClickAutoscroll::finishHold(Qt::MouseButton button) {
+	if (!_middlePressed || (button != Qt::MiddleButton)) {
+		return false;
+	}
+	_middlePressed = false;
+	if ((crl::now() - _middlePressedAt) >= kHoldToToggleThreshold) {
+		stop();
+	}
+	return true;
+}
+
+void MiddleClickAutoscroll::start(const QPoint &globalPosition) {
+	if (_active) {
+		stop();
+	}
+	_active = true;
+	_startPosition = globalPosition;
+	_time = crl::now();
+	updateCursor(QCursor::pos().y() - _startPosition.y());
+	_timer.callEach(kDelay);
+}
+
+void MiddleClickAutoscroll::stop() {
+	if (!_active) {
+		return;
+	}
+	_middlePressed = false;
+	_active = false;
+	_timer.cancel();
+	if (_restoreCursor) {
+		_restoreCursor();
+	}
+}
+
+void MiddleClickAutoscroll::updateCursor(int delta) {
+	if (!_applyCursor) {
+		return;
+	}
+	const auto mode = (std::abs(delta) <= Deadzone())
+		? CursorMode::Neutral
+		: (delta < 0)
+		? CursorMode::Up
+		: CursorMode::Down;
+	_applyCursor(makeCursor(mode));
+}
+
+QCursor MiddleClickAutoscroll::makeCursor(CursorMode mode) {
+	struct CachedCursor {
+		CursorMode mode = CursorMode::Neutral;
+		int size = 0;
+		int factor = 0;
+		QColor inner;
+		QColor indicator;
+		QCursor cursor;
+	};
+	const auto size = std::max(
+		1,
+		int(std::lround(style::ConvertFloatScale(27.))));
+	const auto factor = style::DevicePixelRatio();
+	const auto inner = anim::with_alpha(st::windowBg->c, (240. / 255.));
+	const auto active = anim::with_alpha(st::windowFg->c, (210. / 255.));
+	const auto passive = anim::with_alpha(
+		st::windowSubTextFg->c,
+		(210. / 255.));
+	const auto neutral = (mode == CursorMode::Neutral);
+	const auto indicator = neutral ? passive : active;
+	static auto cache = std::vector<CachedCursor>();
+	if (const auto i = ranges::find_if(
+			cache,
+			[&](const CachedCursor &entry) {
+				return (entry.mode == mode)
+					&& (entry.size == size)
+					&& (entry.factor == factor)
+					&& (entry.inner == inner)
+					&& (entry.indicator == indicator);
+			});
+		i != cache.end()) {
+		return i->cursor;
+	}
+	const auto image = PaintCursorImage(
+		size,
+		factor,
+		neutral,
+		mode != CursorMode::Down,
+		mode != CursorMode::Up,
+		inner,
+		indicator,
+		indicator,
+		indicator);
+	const auto hot = int(std::floor(size * 0.5));
+	auto cursor = QCursor(QPixmap::fromImage(image), hot, hot);
+	cache.push_back(CachedCursor{
+		.mode = mode,
+		.size = size,
+		.factor = factor,
+		.inner = inner,
+		.indicator = indicator,
+		.cursor = cursor,
+	});
+	return cursor;
+}
+
+void MiddleClickAutoscroll::onTimer() {
+	if (!_active) {
+		return;
+	} else if (_shouldContinue && !_shouldContinue()) {
+		stop();
+		return;
+	}
+	const auto now = crl::now();
+	const auto elapsed = std::max(now - _time, crl::time(1));
+	_time = now;
+	const auto delta = QCursor::pos().y() - _startPosition.y();
+	updateCursor(delta);
+	const auto absolute = std::abs(delta) - Deadzone();
+	if (absolute <= 0) {
+		return;
+	}
+	const auto speed = std::min(
+		absolute * float64(st::middleClickAutoscrollSpeedScale),
+		float64(st::middleClickAutoscrollMaxSpeed));
+	auto scroll = int(std::lround((speed * elapsed) / 1000.));
+	if (scroll <= 0) {
+		scroll = 1;
+	}
+	if (delta < 0) {
+		scroll = -scroll;
+	}
+	_scrollBy(scroll);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/middle_click_autoscroll.h b/Telegram/SourceFiles/ui/widgets/middle_click_autoscroll.h
new file mode 100644
index 00000000000000..a594e764b3b762
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/middle_click_autoscroll.h
@@ -0,0 +1,57 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+
+class QCursor;
+
+namespace Ui {
+
+class MiddleClickAutoscroll final {
+public:
+	explicit MiddleClickAutoscroll(
+		Fn<void(int)> scrollBy,
+		Fn<void(const QCursor &)> applyCursor = nullptr,
+		Fn<void()> restoreCursor = nullptr,
+		Fn<bool()> shouldContinue = nullptr);
+
+	[[nodiscard]] bool active() const {
+		return _active;
+	}
+
+	void toggleOrBeginHold(const QPoint &globalPosition);
+	[[nodiscard]] bool finishHold(Qt::MouseButton button);
+	void start(const QPoint &globalPosition);
+	void stop();
+
+private:
+	enum class CursorMode {
+		Neutral,
+		Up,
+		Down,
+	};
+
+	void updateCursor(int delta);
+	void onTimer();
+	[[nodiscard]] static QCursor makeCursor(CursorMode mode);
+
+	Fn<void(int)> _scrollBy;
+	Fn<void(const QCursor &)> _applyCursor;
+	Fn<void()> _restoreCursor;
+	Fn<bool()> _shouldContinue;
+	bool _active = false;
+	bool _middlePressed = false;
+	QPoint _startPosition;
+	crl::time _middlePressedAt = 0;
+	crl::time _time = 0;
+	base::Timer _timer;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.cpp b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
index 8c9649f375f817..33f4b8e382e99d 100644
--- a/Telegram/SourceFiles/ui/widgets/multi_select.cpp
+++ b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
@@ -409,7 +409,7 @@ void Item::setOver(bool over) {
 
 } // namespace
 
-class MultiSelect::Inner : public TWidget {
+class MultiSelect::Inner : public RpWidget {
 public:
 	using ScrollCallback = Fn<void(int activeTop, int activeBottom)>;
 	Inner(
@@ -652,28 +652,28 @@ MultiSelect::Inner::Inner(
 	rpl::producer<QString> placeholder,
 	const QString &query,
 	ScrollCallback callback)
-: TWidget(parent)
+: RpWidget(parent)
 , _st(st)
 , _scrollCallback(std::move(callback))
 , _field(this, _st.field, std::move(placeholder), query)
 , _cancel(this, _st.fieldCancel) {
 	_field->customUpDown(true);
 	_field->focusedChanges(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		fieldFocused();
 	}, _field->lifetime());
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		queryChanged();
 	}, _field->lifetime());
 	_field->submits(
-	) | rpl::start_with_next([=](Qt::KeyboardModifiers m) {
+	) | rpl::on_next([=](Qt::KeyboardModifiers m) {
 		if (_submittedCallback) {
 			_submittedCallback(m);
 		}
 	}, _field->lifetime());
 	_field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		cancelled();
 	}, _field->lifetime());
 	_cancel->setClickedCallback([=] {
@@ -790,6 +790,9 @@ void MultiSelect::Inner::setActiveItemNext() {
 }
 
 int MultiSelect::Inner::resizeGetHeight(int newWidth) {
+	if (newWidth <= 0) {
+		return height();
+	}
 	computeItemsGeometry(newWidth);
 	updateFieldGeometry();
 
diff --git a/Telegram/SourceFiles/ui/widgets/participants_check_view.cpp b/Telegram/SourceFiles/ui/widgets/participants_check_view.cpp
index 0a8aad5f245d72..d9a11127bace56 100644
--- a/Telegram/SourceFiles/ui/widgets/participants_check_view.cpp
+++ b/Telegram/SourceFiles/ui/widgets/participants_check_view.cpp
@@ -11,85 +11,130 @@ For license and copyright information please follow this link:
 #include "ui/effects/toggle_arrow.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/text.h"
 #include "styles/style_boxes.h"
 
 namespace Ui {
+namespace {
 
-ParticipantsCheckView::ParticipantsCheckView(
-	int count,
+void SetExpanderText(
+		Ui::Text::String &target,
+		const TextWithEntities &text,
+		Fn<void()> repaint = nullptr) {
+	target.setMarkedText(
+		st::moderateBoxExpandTextStyle,
+		text,
+		kMarkupTextOptions,
+		Ui::Text::MarkedContext{ .repaint = std::move(repaint) });
+}
+
+} // namespace
+
+ExpanderCheckView::ExpanderCheckView(
+	TextWithEntities text,
 	int duration,
 	bool checked,
 	Fn<void()> updateCallback)
 : Ui::AbstractCheckView(duration, checked, std::move(updateCallback))
-, _text(QString::number(std::abs(count)))
-, _count(count) {
+, _size(ComputeSize(text)) {
+	SetExpanderText(_text, text, [=] { update(); });
 }
 
-QSize ParticipantsCheckView::ComputeSize(int count) {
+QSize ExpanderCheckView::ComputeSize(const TextWithEntities &text) {
+	auto string = Ui::Text::String();
+	SetExpanderText(string, text);
 	return QSize(
 		st::moderateBoxExpandHeight
-			+ st::moderateBoxExpand.width()
 			+ st::moderateBoxExpandInnerSkip * 4
-			+ st::moderateBoxExpandFont->width(
-				QString::number(std::abs(count)))
+			+ string.maxWidth()
 			+ st::moderateBoxExpandToggleSize,
 		st::moderateBoxExpandHeight);
 }
 
-QSize ParticipantsCheckView::getSize() const {
-	return ComputeSize(_count);
+void ExpanderCheckView::setText(TextWithEntities text) {
+	SetExpanderText(_text, text, [=] { update(); });
+	update();
 }
 
-void ParticipantsCheckView::paint(
-		QPainter &p,
-		int left,
-		int top,
-		int outerWidth) {
-	auto hq = PainterHighQualityEnabler(p);
-	const auto size = getSize();
-	const auto radius = size.height() / 2;
-	p.setPen(Qt::NoPen);
-	st::moderateBoxExpand.paint(
-		p,
-		radius,
-		left + (size.height() - st::moderateBoxExpand.height()) / 2,
-		top + size.width());
+QSize ExpanderCheckView::getSize() const {
+	return _size;
+}
 
+void ExpanderCheckView::paint(QPainter &p, int left, int top, int outerWidth) {
+	auto hq = PainterHighQualityEnabler(p);
+	const auto radius = _size.height() / 2;
 	const auto innerSkip = st::moderateBoxExpandInnerSkip;
-
-	p.setBrush(Qt::NoBrush);
+	const auto textLeft = left + innerSkip + radius;
+	const auto textWidth = _size.width()
+		- st::moderateBoxExpandHeight
+		- st::moderateBoxExpandInnerSkip * 4
+		- st::moderateBoxExpandToggleSize;
 	p.setPen(st::boxTextFg);
-	p.setFont(st::moderateBoxExpandFont);
-	p.drawText(
-		QRect(
-			left + innerSkip + radius + st::moderateBoxExpand.width(),
-			top,
-			size.width(),
-			size.height()),
-		_text,
-		style::al_left);
+	_text.draw(p, {
+		.position = { textLeft, top + (_size.height() - _text.minHeight()) / 2 },
+		.outerWidth = outerWidth,
+		.availableWidth = textWidth,
+		.elisionLines = 1,
+	});
 
 	const auto path = Ui::ToggleUpDownArrowPath(
-		left + size.width() - st::moderateBoxExpandToggleSize - radius,
-		top + size.height() / 2,
+		left + _size.width() - st::moderateBoxExpandToggleSize - radius,
+		top + _size.height() / 2,
 		st::moderateBoxExpandToggleSize,
 		st::moderateBoxExpandToggleFourStrokes,
-		Ui::AbstractCheckView::currentAnimationValue());
+		currentAnimationValue());
 	p.fillPath(path, st::boxTextFg);
 }
 
-QImage ParticipantsCheckView::prepareRippleMask() const {
-	const auto size = getSize();
-	return Ui::RippleAnimation::RoundRectMask(size, size.height() / 2);
+QImage ExpanderCheckView::prepareRippleMask() const {
+	return Ui::RippleAnimation::RoundRectMask(_size, _size.height() / 2);
 }
 
-bool ParticipantsCheckView::checkRippleStartPosition(QPoint position) const {
-	return Rect(getSize()).contains(position);
+bool ExpanderCheckView::checkRippleStartPosition(QPoint position) const {
+	return Rect(_size).contains(position);
 }
 
-void ParticipantsCheckView::checkedChangedHook(anim::type animated) {
+void ExpanderCheckView::checkedChangedHook(anim::type) {
 }
 
-ParticipantsCheckView::~ParticipantsCheckView() = default;
+ExpanderCheckView::~ExpanderCheckView() = default;
+
+ExpanderButton::ExpanderButton(
+	not_null<QWidget*> parent,
+	TextWithEntities text)
+: Ui::RippleButton(parent, st::defaultRippleAnimation)
+, _view(std::make_unique<Ui::ExpanderCheckView>(
+	std::move(text),
+	st::slideWrapDuration,
+	false,
+	[=] { update(); })) {
+	resize(_view->getSize());
+}
+
+QSize ExpanderButton::ComputeSize(const TextWithEntities &text) {
+	return Ui::ExpanderCheckView::ComputeSize(text);
+}
+
+void ExpanderButton::setText(TextWithEntities text) {
+	_view->setText(std::move(text));
+}
+
+not_null<Ui::AbstractCheckView*> ExpanderButton::checkView() const {
+	return _view.get();
+}
+
+QImage ExpanderButton::prepareRippleMask() const {
+	return _view->prepareRippleMask();
+}
+
+QPoint ExpanderButton::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos());
+}
+
+void ExpanderButton::paintEvent(QPaintEvent *) {
+	auto p = QPainter(this);
+	Ui::RippleButton::paintRipple(p, QPoint());
+	_view->paint(p, 0, 0, width());
+}
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/participants_check_view.h b/Telegram/SourceFiles/ui/widgets/participants_check_view.h
index 5f59272aa8c924..7fbf7886f98683 100644
--- a/Telegram/SourceFiles/ui/widgets/participants_check_view.h
+++ b/Telegram/SourceFiles/ui/widgets/participants_check_view.h
@@ -7,19 +7,23 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "ui/text/text.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
 
 namespace Ui {
 
-class ParticipantsCheckView : public Ui::AbstractCheckView {
+class ExpanderCheckView final : public Ui::AbstractCheckView {
 public:
-	ParticipantsCheckView(
-		int count,
+	ExpanderCheckView(
+		TextWithEntities text,
 		int duration,
 		bool checked,
 		Fn<void()> updateCallback);
 
-	[[nodiscard]] static QSize ComputeSize(int count);
+	[[nodiscard]] static QSize ComputeSize(const TextWithEntities &text);
+
+	void setText(TextWithEntities text);
 
 	QSize getSize() const override;
 
@@ -27,13 +31,34 @@ class ParticipantsCheckView : public Ui::AbstractCheckView {
 	QImage prepareRippleMask() const override;
 	bool checkRippleStartPosition(QPoint position) const override;
 
-	~ParticipantsCheckView();
+	~ExpanderCheckView();
 
 private:
-	const QString _text;
-	const int _count;
 	void checkedChangedHook(anim::type animated) override;
 
+	Ui::Text::String _text;
+	QSize _size;
+
+};
+
+class ExpanderButton final : public Ui::RippleButton {
+public:
+	ExpanderButton(
+		not_null<QWidget*> parent,
+		TextWithEntities text);
+
+	[[nodiscard]] static QSize ComputeSize(const TextWithEntities &text);
+
+	void setText(TextWithEntities text);
+	[[nodiscard]] not_null<Ui::AbstractCheckView*> checkView() const;
+
+private:
+	void paintEvent(QPaintEvent *event) override;
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+	std::unique_ptr<Ui::ExpanderCheckView> _view;
+
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/peer_bubble.cpp b/Telegram/SourceFiles/ui/widgets/peer_bubble.cpp
new file mode 100644
index 00000000000000..ce18866d54ece4
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/peer_bubble.cpp
@@ -0,0 +1,72 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/widgets/peer_bubble.h"
+
+#include "data/data_peer.h"
+#include "info/profile/info_profile_values.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_boxes.h"
+#include "styles/style_channel_earn.h"
+#include "styles/style_chat.h"
+#include "styles/style_layers.h"
+
+namespace Ui {
+
+object_ptr<Ui::RpWidget> CreatePeerBubble(
+		not_null<Ui::RpWidget*> parent,
+		not_null<PeerData*> peer) {
+	auto owned = object_ptr<Ui::RpWidget>(parent);
+	const auto peerBubble = owned.data();
+	peerBubble->setAttribute(Qt::WA_TransparentForMouseEvents);
+	const auto left = Ui::CreateChild<Ui::UserpicButton>(
+		peerBubble,
+		peer,
+		st::uploadUserpicButton);
+	const auto right = Ui::CreateChild<Ui::FlatLabel>(
+		peerBubble,
+		Info::Profile::NameValue(peer),
+		st::channelEarnSemiboldLabel);
+	const auto padding = st::chatGiveawayPeerPadding
+		+ QMargins(st::chatGiveawayPeerPadding.left(), 0, 0, 0);
+	rpl::combine(
+		left->sizeValue(),
+		right->sizeValue()
+	) | rpl::on_next([=](
+			const QSize &leftSize,
+			const QSize &rightSize) {
+		peerBubble->setNaturalWidth(
+			leftSize.width() + rightSize.width() + rect::m::sum::h(padding));
+		peerBubble->resize(peerBubble->naturalWidth(), leftSize.height());
+		left->moveToLeft(0, 0);
+		right->moveToRight(padding.right() + st::lineWidth, padding.top());
+		const auto maxRightSize = parent->width()
+			- rect::m::sum::h(st::boxRowPadding)
+			- rect::m::sum::h(padding)
+			- leftSize.width();
+		if ((rightSize.width() > maxRightSize) && (maxRightSize > 0)) {
+			right->resizeToWidth(maxRightSize);
+		}
+	}, peerBubble->lifetime());
+	peerBubble->paintRequest(
+	) | rpl::on_next([=] {
+		auto p = QPainter(peerBubble);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::windowBgOver);
+		const auto rect = peerBubble->rect();
+		const auto radius = rect.height() / 2;
+		p.drawRoundedRect(rect, radius, radius);
+	}, peerBubble->lifetime());
+
+	return owned;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/peer_bubble.h b/Telegram/SourceFiles/ui/widgets/peer_bubble.h
new file mode 100644
index 00000000000000..9c0b657d94266e
--- /dev/null
+++ b/Telegram/SourceFiles/ui/widgets/peer_bubble.h
@@ -0,0 +1,26 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+template <typename Object>
+class object_ptr;
+
+class PeerData;
+
+namespace Ui {
+class RpWidget;
+class VerticalLayout;
+} // namespace Ui
+
+namespace Ui {
+
+[[nodiscard]] object_ptr<Ui::RpWidget> CreatePeerBubble(
+	not_null<Ui::RpWidget*> parent,
+	not_null<PeerData*> peer);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/sent_code_field.cpp b/Telegram/SourceFiles/ui/widgets/sent_code_field.cpp
index f5ba4b858b4703..2da4b633bef57d 100644
--- a/Telegram/SourceFiles/ui/widgets/sent_code_field.cpp
+++ b/Telegram/SourceFiles/ui/widgets/sent_code_field.cpp
@@ -19,7 +19,7 @@ SentCodeField::SentCodeField(
 	rpl::producer<QString> placeholder,
 	const QString &val)
 : Ui::InputField(parent, st, std::move(placeholder), val) {
-	changes() | rpl::start_with_next([=] { fix(); }, lifetime());
+	changes() | rpl::on_next([=] { fix(); }, lifetime());
 }
 
 void SentCodeField::setAutoSubmit(int length, Fn<void()> submitCallback) {
diff --git a/Telegram/SourceFiles/ui/widgets/slider_natural_width.h b/Telegram/SourceFiles/ui/widgets/slider_natural_width.h
index f2c52aa0a9ba72..b912f5261dcd08 100644
--- a/Telegram/SourceFiles/ui/widgets/slider_natural_width.h
+++ b/Telegram/SourceFiles/ui/widgets/slider_natural_width.h
@@ -14,15 +14,7 @@ namespace Ui {
 class CustomWidthSlider final : public SettingsSlider {
 public:
 	using Ui::SettingsSlider::SettingsSlider;
-	void setNaturalWidth(int w) {
-		_naturalWidth = w;
-	}
-	int naturalWidth() const override {
-		return _naturalWidth;
-	}
-
-private:
-	int _naturalWidth = 0;
+	using SettingsSlider::setNaturalWidth;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp b/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
index a414b56f5a9ed1..9481e97ac15781 100644
--- a/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
+++ b/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.cpp
@@ -10,14 +10,45 @@ For license and copyright information please follow this link:
 #include "ui/effects/animation_value_f.h"
 #include "ui/ui_utility.h"
 #include "styles/style_basic.h"
+#include "styles/style_widgets.h"
 
 namespace Ui {
 namespace {
 
 constexpr auto kAlmostIndex = float64(.99);
+constexpr auto kMinYScale = 0.2;
+
+using PaintItemCallback = VerticalDrumPicker::PaintItemCallback;
 
 } // namespace
 
+PaintItemCallback VerticalDrumPicker::DefaultPaintCallback(
+		const style::font &font,
+		int itemHeight,
+		Fn<void(QPainter&, QRectF, int)> paintContent) {
+	return [=](
+			QPainter &p,
+			int index,
+			float64 y,
+			float64 distanceFromCenter,
+			int outerWidth) {
+		const auto r = QRectF(0, y, outerWidth, itemHeight);
+		const auto progress = std::abs(distanceFromCenter);
+		const auto revProgress = 1. - progress;
+		p.save();
+		p.translate(r.center());
+		const auto yScale = kMinYScale
+			+ (1. - kMinYScale) * anim::easeOutCubic(1., revProgress);
+		p.scale(1., yScale);
+		p.translate(-r.center());
+		p.setOpacity(revProgress);
+		p.setFont(font);
+		p.setPen(st::defaultFlatLabel.textFg);
+		paintContent(p, r, index);
+		p.restore();
+	};
+}
+
 PickerAnimation::PickerAnimation() = default;
 
 void PickerAnimation::jumpToOffset(int offset) {
@@ -80,7 +111,7 @@ VerticalDrumPicker::VerticalDrumPicker(
 	Expects(_paintCallback != nullptr);
 
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		_itemsVisible.count = std::ceil(float64(s.height()) / _itemHeight);
 		_itemsVisible.centerOffset = _itemsVisible.count / 2;
 		if ((_pendingStartIndex >= 0) && _itemsVisible.count) {
@@ -98,7 +129,7 @@ VerticalDrumPicker::VerticalDrumPicker(
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(this);
 
 		const auto outerWidth = width();
@@ -120,7 +151,7 @@ VerticalDrumPicker::VerticalDrumPicker(
 	}, lifetime());
 
 	_animation.updates(
-	) | rpl::start_with_next([=](PickerAnimation::Shift shift) {
+	) | rpl::on_next([=](PickerAnimation::Shift shift) {
 		increaseShift(shift);
 	}, lifetime());
 }
diff --git a/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.h b/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.h
index 63c0cbc2a898f2..088c2916e753a4 100644
--- a/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.h
+++ b/Telegram/SourceFiles/ui/widgets/vertical_drum_picker.h
@@ -59,6 +59,11 @@ class VerticalDrumPicker final : public Ui::RpWidget {
 	void handleMouseEvent(not_null<QMouseEvent*> e);
 	void handleKeyEvent(not_null<QKeyEvent*> e);
 
+	static PaintItemCallback DefaultPaintCallback(
+		const style::font &font,
+		int itemHeight,
+		Fn<void(QPainter&, QRectF, int)> paintContent);
+
 protected:
 	void wheelEvent(QWheelEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 208ed561cdb8ef..5b11b2eaf41471 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -13,6 +13,7 @@ For license and copyright information please follow this link:
 #include "ui/platform/ui_platform_window.h"
 #include "platform/platform_window_title.h"
 #include "history/history.h"
+#include "info/media/info_media_widget.h" // SharedMediaTitle.
 #include "window/window_separate_id.h"
 #include "window/window_session_controller.h"
 #include "window/window_lock_widgets.h"
@@ -30,10 +31,13 @@ For license and copyright information please follow this link:
 #include "main/main_session_settings.h"
 #include "base/options.h"
 #include "base/crc32hash.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/shadow.h"
 #include "ui/controls/window_outdated_bar.h"
+#include "ui/controls/window_screen_reader_bar.h"
 #include "ui/painter.h"
+#include "ui/screen_reader_mode.h"
 #include "ui/ui_utility.h"
 #include "apiwrap.h"
 #include "mainwidget.h" // session->content()->windowShown().
@@ -41,6 +45,10 @@ For license and copyright information please follow this link:
 #include "styles/style_window.h"
 #include "styles/style_dialogs.h" // ChildSkip().x() for new child windows.
 
+#ifdef Q_OS_MAC
+#include "platform/mac/global_menu_mac.h"
+#endif // Q_OS_MAC
+
 #include <QtCore/QMimeData>
 #include <QtGui/QWindow>
 #include <QtGui/QScreen>
@@ -70,7 +78,7 @@ using Core::WindowPosition;
 
 base::options::toggle OptionNewWindowsSizeAsFirst({
 	.id = kOptionNewWindowsSizeAsFirst,
-	.name = "Adjust size of new chat windows.",
+	.name = "Adjust size of new chat windows",
 	.description = "Open new windows with a size of the main window.",
 });
 
@@ -87,7 +95,29 @@ base::options::toggle OptionDisableTouchbar({
 	.restartRequired = true,
 });
 
-} // namespace.
+[[nodiscard]] QString TitleFromSeparateSharedMedia(
+		const Core::WindowTitleContent &settings,
+		const SeparateId &id) {
+	if (id.type != SeparateType::SharedMedia) {
+		return QString();
+	}
+	const auto type = id.sharedMediaType;
+	const auto result = Info::Media::SharedMediaTitle(type)(tr::now);
+	if (settings.hideChatName) {
+		return result;
+	}
+	const auto thread = id.thread;
+	const auto topic = thread->asTopic();
+	const auto name = topic
+		? topic->title()
+		: thread->peer()->isSelf()
+		? tr::lng_saved_messages(tr::now)
+		: thread->peer()->name();
+	const auto wrapped = st::wrap_rtl(name);
+	return name + u" @ "_q + result;
+}
+
+} // namespace
 
 const char kOptionNewWindowsSizeAsFirst[] = "new-windows-size-as-first";
 const char kOptionDisableTouchbar[] = "touchbar-disabled";
@@ -179,7 +209,7 @@ QIcon CreateIcon(Main::Session *session, bool returnNullIfDefault) {
 	}
 
 	const auto iconFromTheme = QIcon::fromTheme(
-		base::IconName(),
+		Platform::ApplicationIconName(),
 		result);
 
 	result = QIcon();
@@ -220,8 +250,6 @@ QIcon CreateIcon(Main::Session *session, bool returnNullIfDefault) {
 }
 
 QImage GenerateCounterLayer(CounterLayerArgs &&args) {
-	// platform/linux/main_window_linux depends on count used the same
-	// way for all the same (count % 1000) values.
 	const auto count = args.count.value();
 	const auto text = (count < 1000)
 		? QString::number(count)
@@ -298,6 +326,8 @@ QImage GenerateCounterLayer(CounterLayerArgs &&args) {
 }
 
 QImage WithSmallCounter(QImage image, CounterLayerArgs &&args) {
+	// platform/linux/tray_linux depends on count used the same
+	// way for all the same (count % 100) values.
 	const auto count = args.count.value();
 	const auto text = (count < 100)
 		? QString::number(count)
@@ -345,21 +375,35 @@ MainWindow::MainWindow(not_null<Controller*> controller)
 : _controller(controller)
 , _positionUpdatedTimer([=] { savePosition(); })
 , _outdated(Ui::CreateOutdatedBar(body(), cWorkingDir()))
+, _screenReaderBar(Ui::CreateScreenReaderBar(body(), [=] {
+	controller->show(Ui::MakeConfirmBox({
+		.text = tr::lng_screen_reader_confirm_text(tr::now),
+		.confirmed = [=](Fn<void()> close) {
+			Core::App().settings().writePref<bool>(
+				Core::kScreenReaderModeDisabledKey,
+				true);
+			Core::App().saveSettingsDelayed();
+			Ui::SetScreenReaderModeDisabled(true);
+			close();
+		},
+		.confirmText = tr::lng_screen_reader_confirm_disable(),
+	}));
+}))
 , _body(body()) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updatePalette();
 	}, lifetime());
 
 	Core::App().unreadBadgeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateTitle();
 		unreadCounterChangedHook();
 		Core::App().tray().updateIconCounters();
 	}, lifetime());
 
 	Core::App().settings().workModeChanges(
-	) | rpl::start_with_next([=](Core::Settings::WorkMode mode) {
+	) | rpl::on_next([=](Core::Settings::WorkMode mode) {
 		workmodeUpdated(mode);
 	}, lifetime());
 
@@ -368,27 +412,27 @@ MainWindow::MainWindow(not_null<Controller*> controller)
 	}
 
 	windowActiveValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](bool active) {
+	) | rpl::skip(1) | rpl::on_next([=](bool active) {
 		InvokeQueued(this, [=] {
 			handleActiveChanged(active);
 		});
 	}, lifetime());
 
 	shownValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](bool visible) {
+	) | rpl::skip(1) | rpl::on_next([=](bool visible) {
 		InvokeQueued(this, [=] {
 			handleVisibleChanged(visible);
 		});
 	}, lifetime());
 
 	body()->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		updateControlsGeometry();
 	}, lifetime());
 
 	if (_outdated) {
 		_outdated->heightValue(
-		) | rpl::start_with_next([=](int height) {
+		) | rpl::on_next([=](int height) {
 			if (!height) {
 				crl::on_main(this, [=] { _outdated.destroy(); });
 			}
@@ -396,6 +440,13 @@ MainWindow::MainWindow(not_null<Controller*> controller)
 		}, _outdated->lifetime());
 	}
 
+	if (_screenReaderBar) {
+		_screenReaderBar->heightValue(
+		) | rpl::on_next([=](int height) {
+			updateControlsGeometry();
+		}, _screenReaderBar->lifetime());
+	}
+
 	Shortcuts::Listen(this);
 }
 
@@ -420,8 +471,8 @@ bool MainWindow::hideNoQuit() {
 		return false;
 	}
 	const auto workMode = Core::App().settings().workMode();
-	if (workMode == Core::Settings::WorkMode::TrayOnly
-		|| workMode == Core::Settings::WorkMode::WindowAndTray) {
+	using Mode = Core::Settings::WorkMode;
+	if (workMode == Mode::TrayOnly || workMode == Mode::WindowAndTray) {
 		if (minimizeToTray()) {
 			if (const auto controller = sessionController()) {
 				controller->clearSectionStack();
@@ -429,20 +480,23 @@ bool MainWindow::hideNoQuit() {
 			return true;
 		}
 	}
-	if (Platform::RunInBackground() || Core::App().settings().closeToTaskbar()) {
-		if (Platform::RunInBackground()) {
-			closeWithoutDestroy();
-		} else {
-			setWindowState(window()->windowState() | Qt::WindowMinimized);
-		}
-		controller().updateIsActiveBlur();
-		updateGlobalMenu();
-		if (const auto controller = sessionController()) {
-			controller->clearSectionStack();
-		}
-		return true;
+	using Behavior = Core::Settings::CloseBehavior;
+	const auto behavior = Platform::IsMac()
+		? Behavior::RunInBackground
+		: Core::App().settings().closeBehavior();
+	if (behavior == Behavior::RunInBackground) {
+		closeWithoutDestroy();
+	} else if (behavior == Behavior::CloseToTaskbar) {
+		setWindowState(window()->windowState() | Qt::WindowMinimized);
+	} else {
+		return false;
+	}
+	controller().updateIsActiveBlur();
+	updateGlobalMenu();
+	if (const auto controller = sessionController()) {
+		controller->clearSectionStack();
 	}
-	return false;
+	return true;
 }
 
 void MainWindow::clearWidgets() {
@@ -450,6 +504,14 @@ void MainWindow::clearWidgets() {
 	updateGlobalMenu();
 }
 
+void MainWindow::updateGlobalMenu() {
+#ifdef Q_OS_MAC
+	Platform::RequestUpdateGlobalMenu();
+#else // Q_OS_MAC
+	updateGlobalMenuHook();
+#endif // Q_OS_MAC
+}
+
 void MainWindow::updateIsActive() {
 	const auto isActive = computeIsActive();
 	if (_isActive != isActive) {
@@ -477,7 +539,7 @@ void MainWindow::init() {
 
 	if (Ui::Platform::NativeWindowFrameSupported()) {
 		Core::App().settings().nativeWindowFrameChanges(
-		) | rpl::start_with_next([=](bool native) {
+		) | rpl::on_next([=](bool native) {
 			refreshTitleWidget();
 			recountGeometryConstraints();
 		}, lifetime());
@@ -566,11 +628,6 @@ void MainWindow::updatePalette() {
 
 int MainWindow::computeMinWidth() const {
 	auto result = st::windowMinWidth;
-	if (const auto session = _controller->sessionController()) {
-		if (const auto add = session->filtersWidth()) {
-			result += add;
-		}
-	}
 	if (_rightColumn) {
 		result += _rightColumn->width();
 	}
@@ -585,7 +642,14 @@ int MainWindow::computeMinHeight() const {
 		_outdated->resizeToWidth(st::windowMinWidth);
 		return _outdated->height();
 	}();
-	return outdated + st::windowMinHeight;
+	const auto screenReader = [&] {
+		if (!_screenReaderBar) {
+			return 0;
+		}
+		_screenReaderBar->resizeToWidth(st::windowMinWidth);
+		return _screenReaderBar->height();
+	}();
+	return outdated + screenReader + st::windowMinHeight;
 }
 
 void MainWindow::refreshTitleWidget() {
@@ -679,111 +743,12 @@ QRect MainWindow::countInitialGeometry(WindowPosition position) {
 		.w = initialWidth,
 		.h = initialHeight,
 	};
-	return countInitialGeometry(
+	return CountInitialGeometry(
+		this,
 		position,
 		initial,
-		{ st::windowMinWidth, st::windowMinHeight });
-}
-
-QRect MainWindow::countInitialGeometry(
-		WindowPosition position,
-		WindowPosition initial,
-		QSize minSize) const {
-	if (!position.w || !position.h) {
-		return initial.rect();
-	}
-	const auto screen = [&]() -> QScreen* {
-		for (const auto screen : QGuiApplication::screens()) {
-			const auto sum = Platform::ScreenNameChecksum(screen->name());
-			if (position.moncrc == sum) {
-				return screen;
-			}
-		}
-		return nullptr;
-	}();
-	if (!screen) {
-		return initial.rect();
-	}
-	const auto frame = frameMargins();
-	const auto screenGeometry = screen->geometry();
-	const auto availableGeometry = screen->availableGeometry();
-	const auto spaceForInner = availableGeometry.marginsRemoved(frame);
-	DEBUG_LOG(("Window Pos: "
-		"Screen found, screen geometry: %1, %2, %3, %4, "
-		"available: %5, %6, %7, %8"
-		).arg(screenGeometry.x()
-		).arg(screenGeometry.y()
-		).arg(screenGeometry.width()
-		).arg(screenGeometry.height()
-		).arg(availableGeometry.x()
-		).arg(availableGeometry.y()
-		).arg(availableGeometry.width()
-		).arg(availableGeometry.height()));
-	DEBUG_LOG(("Window Pos: "
-		"Window frame margins: %1, %2, %3, %4, "
-		"available space for inner geometry: %5, %6, %7, %8"
-		).arg(frame.left()
-		).arg(frame.top()
-		).arg(frame.right()
-		).arg(frame.bottom()
-		).arg(spaceForInner.x()
-		).arg(spaceForInner.y()
-		).arg(spaceForInner.width()
-		).arg(spaceForInner.height()));
-
-	const auto x = spaceForInner.x() - screenGeometry.x();
-	const auto y = spaceForInner.y() - screenGeometry.y();
-	const auto w = spaceForInner.width();
-	const auto h = spaceForInner.height();
-	if (w < st::windowMinWidth || h < st::windowMinHeight) {
-		return initial.rect();
-	}
-	if (position.x < x) position.x = x;
-	if (position.y < y) position.y = y;
-	if (position.w > w) position.w = w;
-	if (position.h > h) position.h = h;
-	const auto rightPoint = position.x + position.w;
-	const auto screenRightPoint = x + w;
-	if (rightPoint > screenRightPoint) {
-		const auto distance = rightPoint - screenRightPoint;
-		const auto newXPos = position.x - distance;
-		if (newXPos >= x) {
-			position.x = newXPos;
-		} else {
-			position.x = x;
-			const auto newRightPoint = position.x + position.w;
-			const auto newDistance = newRightPoint - screenRightPoint;
-			position.w -= newDistance;
-		}
-	}
-	const auto bottomPoint = position.y + position.h;
-	const auto screenBottomPoint = y + h;
-	if (bottomPoint > screenBottomPoint) {
-		const auto distance = bottomPoint - screenBottomPoint;
-		const auto newYPos = position.y - distance;
-		if (newYPos >= y) {
-			position.y = newYPos;
-		} else {
-			position.y = y;
-			const auto newBottomPoint = position.y + position.h;
-			const auto newDistance = newBottomPoint - screenBottomPoint;
-			position.h -= newDistance;
-		}
-	}
-	position.x += screenGeometry.x();
-	position.y += screenGeometry.y();
-	if ((position.x + st::windowMinWidth
-		> screenGeometry.x() + screenGeometry.width())
-		|| (position.y + st::windowMinHeight
-			> screenGeometry.y() + screenGeometry.height())) {
-		return initial.rect();
-	}
-	DEBUG_LOG(("Window Pos: Resulting geometry is %1, %2, %3, %4"
-		).arg(position.x
-		).arg(position.y
-		).arg(position.w
-		).arg(position.h));
-	return position.rect();
+		{ st::windowMinWidth, st::windowMinHeight },
+		u"Window"_q);
 }
 
 void MainWindow::firstShow() {
@@ -840,6 +805,12 @@ void MainWindow::updateControlsGeometry() {
 		_outdated->moveToLeft(inner.x(), bodyTop);
 		bodyTop += _outdated->height();
 	}
+	if (_screenReaderBar) {
+		Ui::SendPendingMoveResizeEvents(_screenReaderBar.data());
+		_screenReaderBar->resizeToWidth(inner.width());
+		_screenReaderBar->moveToLeft(inner.x(), bodyTop);
+		bodyTop += _screenReaderBar->height();
+	}
 	if (_rightColumn) {
 		bodyWidth -= _rightColumn->width();
 		_rightColumn->setGeometry(bodyWidth, bodyTop, inner.width() - bodyWidth, inner.height() - (bodyTop - inner.y()));
@@ -864,6 +835,13 @@ void MainWindow::updateTitle() {
 		&& Core::App().domain().accountsAuthedCount() > 1)
 		? st::wrap_rtl(session->authedName())
 		: QString();
+	const auto separateSharedMediaTitle = session
+		? TitleFromSeparateSharedMedia(settings, session->windowId())
+		: QString();
+	if (!separateSharedMediaTitle.isEmpty()) {
+		setTitle(separateSharedMediaTitle);
+		return;
+	}
 	const auto key = (session && !settings.hideChatName)
 		? session->activeChatCurrent()
 		: Dialogs::Key();
@@ -953,7 +931,8 @@ WindowPosition MainWindow::withScreenInPosition(
 	return PositionWithScreen(
 		position,
 		this,
-		{ st::windowMinWidth, st::windowMinHeight });
+		{ st::windowMinWidth, st::windowMinHeight },
+		u"Window"_q);
 }
 
 bool MainWindow::minimizeToTray() {
@@ -967,7 +946,7 @@ bool MainWindow::minimizeToTray() {
 	return true;
 }
 
-void MainWindow::showRightColumn(object_ptr<TWidget> widget) {
+void MainWindow::showRightColumn(object_ptr<Ui::RpWidget> widget) {
 	const auto wasWidth = width();
 	const auto wasRightWidth = _rightColumn ? _rightColumn->width() : 0;
 	_rightColumn = std::move(widget);
@@ -1028,12 +1007,16 @@ int MainWindow::tryToExtendWidthBy(int addToWidth) {
 
 void MainWindow::launchDrag(
 		std::unique_ptr<QMimeData> data,
-		Fn<void()> &&callback) {
+		Fn<void()> &&callback,
+		QPixmap pixmap) {
 	// Qt destroys this QDrag automatically after the drag is finished
 	// We must not delete this at the end of this function, as this breaks DnD on Linux
 	auto drag = new QDrag(this);
 	KUrlMimeData::exportUrlsToPortal(data.get());
 	drag->setMimeData(data.release());
+	if (!pixmap.isNull()) {
+		drag->setPixmap(std::move(pixmap));
+	}
 	drag->exec(Qt::CopyAction);
 
 	// We don't receive mouseReleaseEvent when drag is finished.
@@ -1062,7 +1045,8 @@ int32 DefaultScreenNameChecksum(const QString &name) {
 WindowPosition PositionWithScreen(
 		WindowPosition position,
 		const QScreen *chosen,
-		QSize minimal) {
+		QSize minimal,
+		const QString &name) {
 	if (!chosen) {
 		return position;
 	}
@@ -1080,26 +1064,136 @@ WindowPosition PositionWithScreen(
 		position.y = available.y() + available.height() - position.h;
 	}
 	const auto geometry = chosen->geometry();
-	DEBUG_LOG(("Window Pos: Screen found, geometry: %1, %2, %3, %4"
+	DEBUG_LOG(("%1 Pos: Screen found, geometry: %2, %3, %4, %5"
+		).arg(name
 		).arg(geometry.x()
 		).arg(geometry.y()
 		).arg(geometry.width()
 		).arg(geometry.height()));
-	position.x -= geometry.x();
-	position.y -= geometry.y();
-	position.moncrc = Platform::ScreenNameChecksum(chosen->name());
 	return position;
 }
 
 WindowPosition PositionWithScreen(
 		WindowPosition position,
 		not_null<const QWidget*> widget,
-		QSize minimal) {
+		QSize minimal,
+		const QString &name) {
 	const auto screen = widget->screen();
 	return PositionWithScreen(
 		position,
 		screen ? screen : QGuiApplication::primaryScreen(),
-		minimal);
+		minimal,
+		name);
+}
+
+QRect CountInitialGeometry(
+		not_null<const Ui::RpWindow*> widget,
+		WindowPosition position,
+		WindowPosition initial,
+		QSize minSize,
+		const QString &name) {
+	if (!position.w || !position.h) {
+		return initial.rect();
+	}
+	const auto screen = [&]() -> QScreen* {
+		for (const auto screen : QGuiApplication::screens()) {
+			const auto sum = Platform::ScreenNameChecksum(screen->name());
+			if (position.moncrc == sum) {
+				return screen;
+			}
+		}
+		return QGuiApplication::screenAt(position.rect().center());
+	}();
+	if (!screen) {
+		return initial.rect();
+	}
+	const auto frame = widget->frameMargins();
+	const auto screenGeometry = screen->geometry();
+	const auto availableGeometry = screen->availableGeometry();
+	const auto spaceForInner = availableGeometry.marginsRemoved(frame);
+	DEBUG_LOG(("%1 Pos: "
+		"Screen found, screen geometry: %2, %3, %4, %5, "
+		"available: %6, %7, %8, %9"
+		).arg(name
+		).arg(screenGeometry.x()
+		).arg(screenGeometry.y()
+		).arg(screenGeometry.width()
+		).arg(screenGeometry.height()
+		).arg(availableGeometry.x()
+		).arg(availableGeometry.y()
+		).arg(availableGeometry.width()
+		).arg(availableGeometry.height()));
+	DEBUG_LOG(("%1 Pos: "
+		"Window frame margins: %2, %3, %4, %5, "
+		"available space for inner geometry: %6, %7, %8, %9"
+		).arg(name
+		).arg(frame.left()
+		).arg(frame.top()
+		).arg(frame.right()
+		).arg(frame.bottom()
+		).arg(spaceForInner.x()
+		).arg(spaceForInner.y()
+		).arg(spaceForInner.width()
+		).arg(spaceForInner.height()));
+
+	const auto x = spaceForInner.x()
+		- (position.moncrc ? screenGeometry.x() : 0);
+	const auto y = spaceForInner.y()
+		- (position.moncrc ? screenGeometry.y() : 0);
+	const auto w = spaceForInner.width();
+	const auto h = spaceForInner.height();
+	if (w < st::windowMinWidth || h < st::windowMinHeight) {
+		return initial.rect();
+	}
+	if (position.x < x) position.x = x;
+	if (position.y < y) position.y = y;
+	if (position.w > w) position.w = w;
+	if (position.h > h) position.h = h;
+	const auto rightPoint = position.x + position.w;
+	const auto screenRightPoint = x + w;
+	if (rightPoint > screenRightPoint) {
+		const auto distance = rightPoint - screenRightPoint;
+		const auto newXPos = position.x - distance;
+		if (newXPos >= x) {
+			position.x = newXPos;
+		} else {
+			position.x = x;
+			const auto newRightPoint = position.x + position.w;
+			const auto newDistance = newRightPoint - screenRightPoint;
+			position.w -= newDistance;
+		}
+	}
+	const auto bottomPoint = position.y + position.h;
+	const auto screenBottomPoint = y + h;
+	if (bottomPoint > screenBottomPoint) {
+		const auto distance = bottomPoint - screenBottomPoint;
+		const auto newYPos = position.y - distance;
+		if (newYPos >= y) {
+			position.y = newYPos;
+		} else {
+			position.y = y;
+			const auto newBottomPoint = position.y + position.h;
+			const auto newDistance = newBottomPoint - screenBottomPoint;
+			position.h -= newDistance;
+		}
+	}
+	if (position.moncrc) {
+		position.x += screenGeometry.x();
+		position.y += screenGeometry.y();
+	}
+	if ((position.x + st::windowMinWidth
+		> screenGeometry.x() + screenGeometry.width())
+		|| (position.y + st::windowMinHeight
+			> screenGeometry.y() + screenGeometry.height())) {
+		return initial.rect();
+	}
+	DEBUG_LOG(("%1 Pos: Resulting geometry is %2, %3, %4, %5"
+		).arg(name
+		).arg(position.x
+		).arg(position.y
+		).arg(position.w
+		).arg(position.h));
+	return position.rect();
 }
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/main_window.h b/Telegram/SourceFiles/window/main_window.h
index d0b5fedcef2142..f3005d21712b44 100644
--- a/Telegram/SourceFiles/window/main_window.h
+++ b/Telegram/SourceFiles/window/main_window.h
@@ -100,7 +100,7 @@ class MainWindow : public Ui::RpWindow {
 	}
 	void positionUpdated();
 
-	void showRightColumn(object_ptr<TWidget> widget);
+	void showRightColumn(object_ptr<Ui::RpWidget> widget);
 	int maximalExtendBy() const;
 	bool canExtendNoMove(int extendBy) const;
 
@@ -117,7 +117,10 @@ class MainWindow : public Ui::RpWindow {
 		return _body.data();
 	}
 
-	void launchDrag(std::unique_ptr<QMimeData> data, Fn<void()> &&callback);
+	void launchDrag(
+		std::unique_ptr<QMimeData> data,
+		Fn<void()> &&callback,
+		QPixmap pixmap = QPixmap());
 
 	[[nodiscard]] rpl::producer<> leaveEvents() const;
 	[[nodiscard]] rpl::producer<> imeCompositionStarts() const;
@@ -135,14 +138,7 @@ class MainWindow : public Ui::RpWindow {
 
 	void firstShow();
 	bool minimizeToTray();
-	void updateGlobalMenu() {
-		updateGlobalMenuHook();
-	}
-
-	[[nodiscard]] QRect countInitialGeometry(
-		Core::WindowPosition position,
-		Core::WindowPosition initial,
-		QSize minSize) const;
+	void updateGlobalMenu();
 
 	[[nodiscard]] virtual rpl::producer<QPoint> globalForceClicks() {
 		return rpl::never<QPoint>();
@@ -214,8 +210,9 @@ class MainWindow : public Ui::RpWindow {
 
 	object_ptr<Ui::PlainShadow> _titleShadow = { nullptr };
 	object_ptr<Ui::RpWidget> _outdated;
+	object_ptr<Ui::RpWidget> _screenReaderBar;
 	object_ptr<Ui::RpWidget> _body;
-	object_ptr<TWidget> _rightColumn = { nullptr };
+	object_ptr<Ui::RpWidget> _rightColumn = { nullptr };
 
 	bool _isActive = false;
 
@@ -237,10 +234,19 @@ class MainWindow : public Ui::RpWindow {
 [[nodiscard]] Core::WindowPosition PositionWithScreen(
 	Core::WindowPosition position,
 	const QScreen *chosen,
-	QSize minimal);
+	QSize minimal,
+	const QString &name);
 [[nodiscard]] Core::WindowPosition PositionWithScreen(
 	Core::WindowPosition position,
 	not_null<const QWidget*> widget,
-	QSize minimal);
+	QSize minimal,
+	const QString &name);
+
+[[nodiscard]] QRect CountInitialGeometry(
+	not_null<const Ui::RpWindow*> widget,
+	Core::WindowPosition position,
+	Core::WindowPosition initial,
+	QSize minSize,
+	const QString &name);
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index 40f8664f210942..1dc2c1ecca4f28 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -8,6 +8,8 @@ For license and copyright information please follow this link:
 #include "window/notifications_manager.h"
 
 #include "base/options.h"
+#include "base/platform/base_platform_info.h"
+#include "base/qt/qt_key_modifiers.h"
 #include "platform/platform_notifications_manager.h"
 #include "window/notifications_manager_default.h"
 #include "media/audio/media_audio_track.h"
@@ -15,11 +17,12 @@ For license and copyright information please follow this link:
 #include "mtproto/mtproto_config.h"
 #include "history/history.h"
 #include "history/history_item_components.h"
-#include "history/view/history_view_replies_section.h"
+#include "history/view/history_view_chat_section.h"
 #include "lang/lang_keys.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_document_media.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_channel.h"
 #include "data/data_forum_topic.h"
@@ -30,15 +33,21 @@ For license and copyright information please follow this link:
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
 #include "core/application.h"
+#include "core/version.h"
 #include "mainwindow.h"
+#include "api/api_reactions_notify_settings.h"
 #include "api/api_updates.h"
 #include "apiwrap.h"
 #include "main/main_account.h"
-#include "main/main_session.h"
 #include "main/main_domain.h"
+#include "main/main_session.h"
+#include "main/main_session_settings.h"
 #include "ui/text/text_utilities.h"
+#include "platform/platform_specific.h"
 
 #include <QtGui/QWindow>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
 
 #if __has_include(<gio/gio.hpp>)
 #include <gio/gio.hpp>
@@ -61,6 +70,37 @@ constexpr auto kSystemAlertDuration = crl::time(1000);
 constexpr auto kSystemAlertDuration = crl::time(0);
 #endif // Q_OS_MAC
 
+base::options::toggle OptionCustomNotification({
+	.id = kOptionCustomNotification,
+	.name = "Force non-native notifications availability",
+	.description = "Allow to disable native notifications"
+		" even if custom notifications are broken on this platform",
+	.scope = [] {
+		return Platform::Notifications::Enforced();
+	},
+});
+
+base::options::toggle OptionGNotification({
+	.id = kOptionGNotification,
+	.name = "GNotification",
+	.description = "Force enable GLib's GNotification."
+		" When disabled, autodetect is used.",
+	.scope = [] {
+#if __has_include(<gio/gio.hpp>)
+		using namespace gi::repository;
+		return bool(Gio::Application::get_default());
+#else // __has_include(<gio/gio.hpp>)
+		return false;
+#endif // __has_include(<gio/gio.hpp>)
+	},
+});
+
+base::options::toggle HideReplyButtonOption({
+	.id = kOptionHideReplyButton,
+	.name = "Hide reply button",
+	.description = "Hide reply button in notifications.",
+});
+
 [[nodiscard]] QString PlaceholderReactionText() {
 	static const auto result = QString::fromUtf8("\xf0\x9f\x92\xad");
 	return result;
@@ -107,29 +147,36 @@ constexpr auto kSystemAlertDuration = crl::time(0);
 	return {};
 }
 
+[[nodiscard]] std::optional<DocumentId> MaybeSoundFor(
+		not_null<Data::Thread*> thread,
+		PeerData *from) {
+	const auto notifySettings = &thread->owner().notifySettings();
+	const auto threadUnknown = notifySettings->muteUnknown(thread);
+	const auto threadAlert = !threadUnknown
+		&& !notifySettings->isMuted(thread);
+	const auto fromUnknown = (!from
+		|| notifySettings->muteUnknown(from));
+	const auto fromAlert = !fromUnknown
+		&& !notifySettings->isMuted(from);
+	const auto &sound = notifySettings->sound(thread);
+	return ((threadAlert || fromAlert) && !sound.none)
+		? sound.id
+		: std::optional<DocumentId>();
+}
+
+[[nodiscard]] bool AllowNotificationActions(not_null<PeerData*> peer) {
+	return Platform::IsMac() && peer->isNotificationsUser();
+}
+
 } // namespace
 
+const char kOptionCustomNotification[] = "custom-notification";
 const char kOptionGNotification[] = "gnotification";
-
-base::options::toggle OptionGNotification({
-	.id = kOptionGNotification,
-	.name = "GNotification",
-	.description = "Force enable GLib's GNotification."
-		" When disabled, autodetect is used.",
-	.scope = [] {
-#if __has_include(<gio/gio.hpp>)
-		using namespace gi::repository;
-		return bool(Gio::Application::get_default());
-#else // __has_include(<gio/gio.hpp>)
-		return false;
-#endif // __has_include(<gio/gio.hpp>)
-	},
-	.restartRequired = true,
-});
+const char kOptionHideReplyButton[] = "hide-reply-button";
 
 struct System::Waiter {
 	NotificationInHistoryKey key;
-	UserData *reactionSender = nullptr;
+	UserData *reactionOrVoteSender = nullptr;
 	Data::ItemNotificationType type = Data::ItemNotificationType::Message;
 	crl::time when = 0;
 };
@@ -151,7 +198,7 @@ System::System()
 , _waitForAllGroupedTimer([=] { showGrouped(); })
 , _manager(std::make_unique<DummyManager>(this)) {
 	settingsChanged(
-	) | rpl::start_with_next([=](ChangeType type) {
+	) | rpl::on_next([=](ChangeType type) {
 		if (type == ChangeType::DesktopEnabled) {
 			clearAll();
 		} else if (type == ChangeType::ViewParams) {
@@ -161,15 +208,47 @@ System::System()
 			Core::App().domain().notifyUnreadBadgeChanged();
 		}
 	}, lifetime());
+
+	rpl::merge(
+		OptionCustomNotification.changes(),
+		OptionGNotification.changes()
+	 ) | rpl::on_next([=] {
+		createManager();
+	}, lifetime());
 }
 
 void System::createManager() {
 	Platform::Notifications::Create(this);
 }
 
-void System::setManager(std::unique_ptr<Manager> manager) {
-	_manager = std::move(manager);
-	if (!_manager) {
+void System::setManager(Fn<std::unique_ptr<Manager>()> create) {
+	Expects(_manager != nullptr);
+	const auto oldManager = _manager.get();
+	const auto guard = gsl::finally([&] {
+		Ensures(_manager != nullptr);
+		if (oldManager != _manager.get()) {
+			_managerChanged.fire({});
+		}
+	});
+
+	if ((Core::App().settings().nativeNotifications()
+				|| nativeEnforced())
+			&& Platform::Notifications::Supported()) {
+		if (_manager->type() == ManagerType::Native) {
+			return;
+		}
+
+		if (auto manager = create()) {
+			_manager = std::move(manager);
+			return;
+		}
+	}
+
+	if (nativeEnforced()) {
+		if (_manager->type() != ManagerType::Dummy) {
+			_manager = std::make_unique<DummyManager>(this);
+		}
+	} else if (_manager->type() != ManagerType::Default) {
 		_manager = std::make_unique<Default::Manager>(this);
 	}
 }
@@ -179,6 +258,14 @@ Manager &System::manager() const {
 	return *_manager;
 }
 
+rpl::producer<> System::managerChanged() const {
+	return _managerChanged.events();
+}
+
+bool System::nativeEnforced() const {
+	return !OptionCustomNotification.value() && Platform::Notifications::Enforced();
+}
+
 Main::Session *System::findSession(uint64 sessionId) const {
 	for (const auto &[index, account] : Core::App().domain().accounts()) {
 		if (const auto session = account->maybeSession()) {
@@ -190,23 +277,23 @@ Main::Session *System::findSession(uint64 sessionId) const {
 	return nullptr;
 }
 
-bool System::skipReactionNotification(not_null<HistoryItem*> item) const {
-	const auto id = ReactionNotificationId{
+bool System::skipSentNotification(
+		not_null<HistoryItem*> item,
+		base::flat_map<SentNotificationId, crl::time> &already) const {
+	const auto id = SentNotificationId{
 		.itemId = item->fullId(),
 		.sessionId = item->history()->session().uniqueId(),
 	};
 	const auto now = crl::now();
 	const auto clearBefore = now - kReactionNotificationEach;
-	for (auto i = begin(_sentReactionNotifications)
-		; i != end(_sentReactionNotifications)
-		;) {
+	for (auto i = begin(already); i != end(already);) {
 		if (i->second <= clearBefore) {
-			i = _sentReactionNotifications.erase(i);
+			i = already.erase(i);
 		} else {
 			++i;
 		}
 	}
-	return !_sentReactionNotifications.emplace(id, now).second;
+	return !already.emplace(id, now).second;
 }
 
 System::SkipState System::skipNotification(
@@ -214,10 +301,14 @@ System::SkipState System::skipNotification(
 	const auto item = notification.item;
 	const auto type = notification.type;
 	const auto messageType = (type == Data::ItemNotificationType::Message);
-	if (!item->notificationThread()->currentNotification()
+	const auto thread = item->maybeNotificationThread();
+	if (!thread
+		|| !thread->currentNotification()
 		|| (messageType && item->skipNotification())
 		|| (type == Data::ItemNotificationType::Reaction
-			&& skipReactionNotification(item))) {
+			&& skipSentNotification(item, _sentReactionNotifications))
+		|| (type == Data::ItemNotificationType::PollVote
+			&& skipSentNotification(item, _sentPollVoteNotifications))) {
 		return { SkipState::Skip };
 	}
 	return computeSkipState(notification);
@@ -246,7 +337,7 @@ System::SkipState System::computeSkipState(
 		&& item->isFromScheduled();
 	const auto notifyBy = messageType
 		? item->specialNotificationPeer()
-		: notification.reactionSender;
+		: notification.reactionOrVoteSender;
 	if (Core::Quitting()) {
 		return { SkipState::Skip };
 	} else if (!Core::App().settings().notifyFromAll()
@@ -311,10 +402,19 @@ void System::registerThread(not_null<Data::Thread*> thread) {
 	if (const auto topic = thread->asTopic()) {
 		const auto &[i, ok] = _watchedTopics.emplace(topic, rpl::lifetime());
 		if (ok) {
-			topic->destroyed() | rpl::start_with_next([=] {
+			topic->destroyed() | rpl::on_next([=] {
 				clearFromTopic(topic);
 			}, i->second);
 		}
+	} else if (const auto sublist = thread->asSublist()) {
+		const auto &[i, ok] = _watchedSublists.emplace(
+			sublist,
+			rpl::lifetime());
+		if (ok) {
+			sublist->destroyed() | rpl::on_next([=] {
+				clearFromSublist(sublist);
+			}, i->second);
+		}
 	}
 }
 
@@ -332,7 +432,8 @@ void System::schedule(Data::ItemNotification notification) {
 	const auto ready = (skip.value != SkipState::Unknown)
 		&& item->notificationReady();
 
-	const auto minimalDelay = (type == Data::ItemNotificationType::Reaction)
+	const auto minimalDelay = (type == Data::ItemNotificationType::Reaction
+		|| type == Data::ItemNotificationType::PollVote)
 		? kMinimalDelay
 		: item->Has<HistoryMessageForwarded>()
 		? kMinimalForwardDelay
@@ -340,11 +441,17 @@ void System::schedule(Data::ItemNotification notification) {
 	const auto timing = countTiming(thread, minimalDelay);
 	const auto notifyBy = (type == Data::ItemNotificationType::Message)
 		? item->specialNotificationPeer()
-		: notification.reactionSender;
+		: notification.reactionOrVoteSender;
 	if (!skip.silent) {
 		registerThread(thread);
 		_whenAlerts[thread].emplace(timing.when, notifyBy);
 	}
+	if (const auto user = item->history()->peer->asUser()) {
+		if (user->hasStarsPerMessage()
+			&& !user->messageMoneyRestrictionsKnown()) {
+			user->updateFull();
+		}
+	}
 	if (Core::App().settings().desktopNotify()
 		&& !_manager->skipToast()) {
 		registerThread(thread);
@@ -359,7 +466,7 @@ void System::schedule(Data::ItemNotification notification) {
 		if (it == addTo.end() || it->second.when > timing.when) {
 			addTo.emplace(thread, Waiter{
 				.key = key,
-				.reactionSender = notification.reactionSender,
+				.reactionOrVoteSender = notification.reactionOrVoteSender,
 				.type = notification.type,
 				.when = timing.when,
 			});
@@ -386,6 +493,7 @@ void System::clearAll() {
 	_waiters.clear();
 	_settingWaiters.clear();
 	_watchedTopics.clear();
+	_watchedSublists.clear();
 }
 
 void System::clearFromTopic(not_null<Data::ForumTopic*> topic) {
@@ -405,6 +513,23 @@ void System::clearFromTopic(not_null<Data::ForumTopic*> topic) {
 	showNext();
 }
 
+void System::clearFromSublist(not_null<Data::SavedSublist*> sublist) {
+	if (_manager) {
+		_manager->clearFromSublist(sublist);
+	}
+
+	sublist->clearNotifications();
+	_whenMaps.remove(sublist);
+	_whenAlerts.remove(sublist);
+	_waiters.remove(sublist);
+	_settingWaiters.remove(sublist);
+
+	_watchedSublists.remove(sublist);
+
+	_waitTimer.cancel();
+	showNext();
+}
+
 void System::clearForThreadIf(Fn<bool(not_null<Data::Thread*>)> predicate) {
 	for (auto i = _whenMaps.begin(); i != _whenMaps.end();) {
 		const auto thread = i->first;
@@ -420,6 +545,8 @@ void System::clearForThreadIf(Fn<bool(not_null<Data::Thread*>)> predicate) {
 		_settingWaiters.remove(thread);
 		if (const auto topic = thread->asTopic()) {
 			_watchedTopics.remove(topic);
+		} else if (const auto sublist = thread->asSublist()) {
+			_watchedSublists.remove(sublist);
 		}
 	}
 	const auto clearFrom = [&](auto &map) {
@@ -428,6 +555,8 @@ void System::clearForThreadIf(Fn<bool(not_null<Data::Thread*>)> predicate) {
 			if (predicate(thread)) {
 				if (const auto topic = thread->asTopic()) {
 					_watchedTopics.remove(topic);
+				} else if (const auto sublist = thread->asSublist()) {
+					_watchedSublists.remove(sublist);
 				}
 				i = map.erase(i);
 			} else {
@@ -477,6 +606,15 @@ void System::clearIncomingFromTopic(not_null<Data::ForumTopic*> topic) {
 	_whenAlerts.remove(topic);
 }
 
+void System::clearIncomingFromSublist(
+		not_null<Data::SavedSublist*> sublist) {
+	if (_manager) {
+		_manager->clearFromSublist(sublist);
+	}
+	sublist->clearIncomingNotifications();
+	_whenAlerts.remove(sublist);
+}
+
 void System::clearFromItem(not_null<HistoryItem*> item) {
 	if (_manager) {
 		_manager->clearFromItem(item);
@@ -493,6 +631,7 @@ void System::clearAllFast() {
 	_waiters.clear();
 	_settingWaiters.clear();
 	_watchedTopics.clear();
+	_watchedSublists.clear();
 }
 
 void System::checkDelayed() {
@@ -507,7 +646,7 @@ void System::checkDelayed() {
 			}
 			const auto state = computeSkipState({
 				.item = item,
-				.reactionSender = i->second.reactionSender,
+				.reactionOrVoteSender = i->second.reactionOrVoteSender,
 				.type = i->second.type,
 			});
 			if (state.value == SkipState::Skip) {
@@ -538,10 +677,12 @@ void System::showGrouped() {
 			_manager->showNotification({
 				.item = lastItem,
 				.forwardedCount = _lastForwardedCount,
+				.soundId = _lastSoundId,
 			});
 			_lastForwardedCount = 0;
 			_lastHistoryItemId = FullMsgId();
 			_lastHistorySessionId = 0;
+			_lastSoundId = {};
 		}
 	}
 }
@@ -568,23 +709,16 @@ void System::showNext() {
 		}
 		return false;
 	};
-
 	auto ms = crl::now(), nextAlert = crl::time(0);
 	auto alertThread = (Data::Thread*)nullptr;
+	auto alertSoundId = std::optional<DocumentId>();
 	for (auto i = _whenAlerts.begin(); i != _whenAlerts.end();) {
 		while (!i->second.empty() && i->second.begin()->first <= ms) {
 			const auto thread = i->first;
-			const auto notifySettings = &thread->owner().notifySettings();
-			const auto threadUnknown = notifySettings->muteUnknown(thread);
-			const auto threadAlert = !threadUnknown
-				&& !notifySettings->isMuted(thread);
 			const auto from = i->second.begin()->second;
-			const auto fromUnknown = (!from
-				|| notifySettings->muteUnknown(from));
-			const auto fromAlert = !fromUnknown
-				&& !notifySettings->isMuted(from);
-			if (threadAlert || fromAlert) {
+			if (const auto soundId = MaybeSoundFor(thread, from)) {
 				alertThread = thread;
+				alertSoundId = soundId;
 			}
 			while (!i->second.empty()
 				&& i->second.begin()->first <= ms + kMinimalAlertDelay) {
@@ -618,16 +752,27 @@ void System::showNext() {
 		if (settings.soundNotify()) {
 			const auto owner = &alertThread->owner();
 			const auto id = owner->notifySettings().sound(alertThread).id;
+			auto volume
+				= owner->session().settings().ringtoneVolume(
+					alertThread->peer()->id,
+					alertThread->topicRootId(),
+					alertThread->monoforumPeerId());
+			if (!volume) {
+				volume = owner->session().settings().ringtoneVolume(
+					Data::DefaultNotifyType(alertThread->peer()));
+			}
 			_manager->maybePlaySound(crl::guard(&owner->session(), [=] {
 				const auto track = lookupSound(owner, id);
-				track->playOnce();
+				track->playOnce(volume ? volume * 0.01 : 0);
 				Media::Player::mixer()->suppressAll(track->getLengthMs());
 				Media::Player::mixer()->scheduleFaderCallback();
 			}));
 		}
 	}
 
-	if (_waiters.empty() || !settings.desktopNotify() || _manager->skipToast()) {
+	if (_waiters.empty()
+		|| !settings.desktopNotify()
+		|| _manager->skipToast()) {
 		if (nextAlert) {
 			_waitTimer.callOnce(nextAlert - ms);
 		}
@@ -683,6 +828,7 @@ void System::showNext() {
 			break;
 		}
 		const auto notifyItem = notify->item;
+		const auto notifySilent = computeSkipState(*notify).silent;
 		const auto messageType = (notify->type
 			== Data::ItemNotificationType::Message);
 		const auto isForwarded = messageType
@@ -759,6 +905,9 @@ void System::showNext() {
 		if (!_lastHistoryItemId && groupedItem) {
 			_lastHistorySessionId = groupedItem->history()->session().uniqueId();
 			_lastHistoryItemId = groupedItem->fullId();
+			_lastSoundId = notifySilent ? std::nullopt : MaybeSoundFor(
+				notifyThread,
+				groupedItem->specialNotificationPeer());
 		}
 
 		// If the current notification is grouped.
@@ -777,6 +926,9 @@ void System::showNext() {
 			_lastForwardedCount += forwardedCount;
 			_lastHistorySessionId = groupedItem->history()->session().uniqueId();
 			_lastHistoryItemId = groupedItem->fullId();
+			_lastSoundId = notifySilent ? std::nullopt : MaybeSoundFor(
+				notifyThread,
+				groupedItem->specialNotificationPeer());
 			_waitForAllGroupedTimer.callOnce(kWaitingForAllGroupedDelay);
 		} else {
 			// If the current notification is not grouped
@@ -785,15 +937,30 @@ void System::showNext() {
 			showGrouped();
 			const auto reactionNotification
 				= (notify->type == Data::ItemNotificationType::Reaction);
+			const auto pollVoteNotification
+				= (notify->type == Data::ItemNotificationType::PollVote);
 			const auto reaction = reactionNotification
-				? notify->item->lookupUnreadReaction(notify->reactionSender)
+				? notify->item->lookupUnreadReaction(notify->reactionOrVoteSender)
 				: Data::ReactionId();
-			if (!reactionNotification || !reaction.empty()) {
+			const auto pollVoteOption = pollVoteNotification
+				? notify->item->lookupUnreadPollVote(
+					notify->reactionOrVoteSender)
+				: QByteArray();
+			const auto soundFrom = (reactionNotification
+				|| pollVoteNotification)
+				? notify->reactionOrVoteSender
+				: notify->item->specialNotificationPeer();
+			if ((!reactionNotification || !reaction.empty())
+				&& (!pollVoteNotification || !pollVoteOption.isEmpty())) {
 				_manager->showNotification({
 					.item = notify->item,
 					.forwardedCount = forwardedCount,
-					.reactionFrom = notify->reactionSender,
+					.reactionFrom = notify->reactionOrVoteSender,
 					.reactionId = reaction,
+					.pollVoteOption = pollVoteOption,
+					.soundId = (notifySilent
+						? std::nullopt
+						: MaybeSoundFor(notifyThread, soundFrom)),
 				});
 			}
 		}
@@ -808,6 +975,25 @@ void System::showNext() {
 	}
 }
 
+QByteArray System::lookupSoundBytes(
+		not_null<Data::Session*> owner,
+		DocumentId id) {
+	if (id) {
+		const auto &notifySettings = owner->notifySettings();
+		const auto custom = notifySettings.lookupRingtone(id);
+		return custom ? ReadRingtoneBytes(custom) : QByteArray();
+	}
+	auto f = QFile(Core::App().settings().getSoundPath(u"msg_incoming"_q));
+	if (f.open(QIODevice::ReadOnly)) {
+		return f.readAll();
+	}
+	auto fallback = QFile(u":/sounds/msg_incoming.mp3"_q);
+	if (fallback.open(QIODevice::ReadOnly)) {
+		return fallback.readAll();
+	}
+	Unexpected("Embedded sound not found!");
+}
+
 not_null<Media::Audio::Track*> System::lookupSound(
 		not_null<Data::Session*> owner,
 		DocumentId id) {
@@ -819,17 +1005,14 @@ not_null<Media::Audio::Track*> System::lookupSound(
 	if (i != end(_customSoundTracks)) {
 		return i->second.get();
 	}
-	const auto &notifySettings = owner->notifySettings();
-	if (const auto custom = notifySettings.lookupRingtone(id)) {
-		const auto bytes = ReadRingtoneBytes(custom);
-		if (!bytes.isEmpty()) {
-			const auto j = _customSoundTracks.emplace(
-				id,
-				Media::Audio::Current().createTrack()
-			).first;
-			j->second->fillFromData(bytes::make_vector(bytes));
-			return j->second.get();
-		}
+	const auto bytes = lookupSoundBytes(owner, id);
+	if (!bytes.isEmpty()) {
+		const auto j = _customSoundTracks.emplace(
+			id,
+			Media::Audio::Current().createTrack()
+		).first;
+		j->second->fillFromData(bytes::make_vector(bytes));
+		return j->second.get();
 	}
 	ensureSoundCreated();
 	return _soundTrack.get();
@@ -859,8 +1042,29 @@ void System::notifySettingsChanged(ChangeType type) {
 	return _settingsChanged.fire(std::move(type));
 }
 
-void System::playSound(not_null<Main::Session*> session, DocumentId id) {
-	lookupSound(&session->data(), id)->playOnce();
+bool System::volumeSupported() const {
+	// Play through native notification system if toasts are enabled.
+	return Core::App().settings().soundNotify()
+		&& (!Core::App().settings().desktopNotify()
+			|| _manager->type() != ManagerType::Native
+			|| Platform::Notifications::VolumeSupported());
+}
+
+rpl::producer<bool> System::volumeSupportedValue() const {
+	return rpl::single(
+		rpl::empty_value()
+	) | rpl::then(
+		rpl::merge(settingsChanged() | rpl::to_empty, managerChanged())
+	) | rpl::map([=] {
+		return volumeSupported();
+	}) | rpl::distinct_until_changed();
+}
+
+void System::playSound(
+		not_null<Main::Session*> session,
+		DocumentId id,
+		float64 volumeOverride) {
+	lookupSound(&session->data(), id)->playOnce(volumeOverride);
 }
 
 Manager::DisplayOptions Manager::getNotificationOptions(
@@ -885,11 +1089,13 @@ Manager::DisplayOptions Manager::getNotificationOptions(
 		|| (!Data::CanSendTexts(peer)
 			&& (!topic || !Data::CanSendTexts(topic)))
 		|| peer->isBroadcast()
-		|| (peer->slowmodeSecondsLeft() > 0);
+		|| (peer->slowmodeSecondsLeft() > 0)
+		|| (peer->starsPerMessageChecked() > 0)
+		|| HideReplyButtonOption.value();
 	result.spoilerLoginCode = item
 		&& !item->out()
-		&& peer->isNotificationsUser()
-		&& Core::App().isSharingScreen();
+		&& (peer->isNotificationsUser()
+			|| peer->isVerifyCodes());
 	return result;
 }
 
@@ -927,7 +1133,7 @@ TextWithEntities Manager::ComposeReactionNotification(
 			tr::now,
 			lt_reaction,
 			reactionWithEntities,
-			Ui::Text::WithEntities);
+			tr::marked);
 	};
 	if (hideContent) {
 		return simple(tr::lng_reaction_notext);
@@ -940,7 +1146,7 @@ TextWithEntities Manager::ComposeReactionNotification(
 			reactionWithEntities,
 			lt_text,
 			item->notificationText(),
-			Ui::Text::WithEntities);
+			tr::marked);
 	};
 	if (!media || media->webpage()) {
 		return text();
@@ -961,8 +1167,8 @@ TextWithEntities Manager::ComposeReactionNotification(
 				lt_reaction,
 				reactionWithEntities,
 				lt_emoji,
-				Ui::Text::WithEntities(sticker->alt),
-				Ui::Text::WithEntities);
+				tr::marked(sticker->alt),
+				tr::marked);
 		}
 		return simple(tr::lng_reaction_document);
 	} else if (const auto contact = media->sharedContact()) {
@@ -981,8 +1187,8 @@ TextWithEntities Manager::ComposeReactionNotification(
 			lt_reaction,
 			reactionWithEntities,
 			lt_name,
-			Ui::Text::WithEntities(name),
-			Ui::Text::WithEntities);
+			tr::marked(name),
+			tr::marked);
 	} else if (media->location()) {
 		return simple(tr::lng_reaction_location);
 		// lng_reaction_live_location not used right now :(
@@ -995,7 +1201,7 @@ TextWithEntities Manager::ComposeReactionNotification(
 				reactionWithEntities,
 				lt_title,
 				poll->question,
-				Ui::Text::WithEntities);
+				tr::marked);
 	} else if (media->game()) {
 		return simple(tr::lng_reaction_game);
 	} else if (media->invoice()) {
@@ -1004,6 +1210,32 @@ TextWithEntities Manager::ComposeReactionNotification(
 	return text();
 }
 
+TextWithEntities Manager::ComposePollVoteNotification(
+		not_null<HistoryItem*> item,
+		const QByteArray &option,
+		bool hideContent) {
+	if (hideContent) {
+		return tr::lng_poll_vote_notext(tr::now, tr::marked);
+	}
+	const auto media = item->media();
+	const auto poll = media ? media->poll() : nullptr;
+	if (!poll) {
+		return tr::lng_poll_vote_notext(tr::now, tr::marked);
+	}
+	if (const auto answer = poll->answerByOption(option)) {
+		return tr::lng_poll_vote_option(
+			tr::now,
+			lt_option,
+			answer->text,
+			tr::marked);
+	}
+	return tr::lng_poll_vote(
+		tr::now,
+		lt_title,
+		poll->question,
+		tr::marked);
+}
+
 TextWithEntities Manager::addTargetAccountName(
 		TextWithEntities title,
 		not_null<Main::Session*> session) {
@@ -1038,77 +1270,136 @@ QString Manager::accountNameSeparator() {
 
 void Manager::notificationActivated(
 		NotificationId id,
-		const TextWithTags &reply) {
+		ActivateOptions &&options) {
 	onBeforeNotificationActivated(id);
 	if (const auto session = system()->findSession(id.contextId.sessionId)) {
-		if (session->windows().empty()) {
-			Core::App().domain().activate(&session->account());
-		}
-		if (!session->windows().empty()) {
-			const auto window = session->windows().front();
-			const auto history = session->data().history(
-				id.contextId.peerId);
-			const auto item = history->owner().message(
-				history->peer,
-				id.msgId);
-			const auto topic = item ? item->topic() : nullptr;
-			if (!reply.text.isEmpty()) {
-				const auto topicRootId = topic
-					? topic->rootId()
-					: id.contextId.topicRootId;
-				const auto replyToId = (id.msgId > 0
-					&& !history->peer->isUser()
-					&& id.msgId != topicRootId)
-					? FullMsgId(history->peer->id, id.msgId)
-					: FullMsgId();
-				auto draft = std::make_unique<Data::Draft>(
-					reply,
-					FullReplyTo{
-						.messageId = replyToId,
-						.topicRootId = topicRootId,
-					},
-					MessageCursor{
-						int(reply.text.size()),
-						int(reply.text.size()),
-						Ui::kQFixedMax,
-					},
-					Data::WebPageDraft());
-				history->setLocalDraft(std::move(draft));
-			}
-			window->widget()->showFromTray();
-			if (Core::App().passcodeLocked()) {
-				window->widget()->setInnerFocus();
-				system()->clearAll();
-			} else {
-				openNotificationMessage(history, id.msgId);
-			}
-			onAfterNotificationActivated(id, window);
+		const auto history = session->data().history(
+			id.contextId.peerId);
+		const auto item = history->owner().message(
+			history->peer,
+			id.msgId);
+		const auto topic = item ? item->topic() : nullptr;
+		const auto sublist = item ? item->savedSublist() : nullptr;
+		if (!options.draft.text.isEmpty()) {
+			const auto topicRootId = topic
+				? topic->rootId()
+				: id.contextId.topicRootId;
+			const auto monoforumPeerId = (sublist && sublist->parentChat())
+				? sublist->sublistPeer()->id
+				: id.contextId.monoforumPeerId;
+			const auto replyToId = (id.msgId > 0
+				&& !history->peer->isUser()
+				&& id.msgId != topicRootId)
+				? FullMsgId(history->peer->id, id.msgId)
+				: FullMsgId();
+			const auto length = int(options.draft.text.size());
+			auto draft = std::make_unique<Data::Draft>(
+				std::move(options.draft),
+				FullReplyTo{
+					.messageId = replyToId,
+					.topicRootId = topicRootId,
+					.monoforumPeerId = monoforumPeerId,
+				},
+				SuggestOptions(),
+				MessageCursor{
+					length,
+					length,
+					Ui::kQFixedMax,
+				},
+				Data::WebPageDraft());
+			history->setLocalDraft(std::move(draft));
 		}
+		const auto openSeparated = options.allowNewWindow
+			&& base::IsCtrlPressed();
+		const auto window = openNotificationMessage(
+			history,
+			id.msgId,
+			openSeparated);
+		onAfterNotificationActivated(id, window);
 	}
 }
 
-void Manager::openNotificationMessage(
+Window::SessionController *Manager::openNotificationMessage(
 		not_null<History*> history,
-		MsgId messageId) {
+		MsgId messageId,
+		bool openSeparated) {
+	if (Core::App().passcodeLocked()) {
+		const auto window = history->session().tryResolveWindow();
+		if (window) {
+			window->widget()->showFromTray();
+			window->widget()->setInnerFocus();
+			system()->clearAll();
+		}
+		return window;
+	}
 	const auto item = history->owner().message(history->peer, messageId);
 	const auto openExactlyMessage = !history->peer->isBroadcast()
 		&& item
 		&& item->isRegular()
 		&& (item->out() || (item->mentionsMe() && !history->peer->isUser()));
 	const auto topic = item ? item->topic() : nullptr;
-	const auto separate = Core::App().separateWindowFor(history->peer);
+	const auto sublist = item ? item->savedSublist() : nullptr;
+
+	const auto guard = gsl::finally([&] {
+		if (topic) {
+			system()->clearFromTopic(topic);
+		} else if (sublist && sublist->parentChat()) {
+			system()->clearFromSublist(sublist);
+		} else {
+			system()->clearFromHistory(history);
+		}
+	});
+
+	const auto separateId = !topic
+		? Window::SeparateId(history->peer)
+		: history->peer->useSubsectionTabs()
+		? Window::SeparateId(Window::SeparateType::Chat, topic)
+		: Window::SeparateId(Window::SeparateType::Forum, history);
+	const auto separate = Core::App().separateWindowFor(separateId);
+	const auto itemId = openExactlyMessage ? messageId : ShowAtUnreadMsgId;
+	if (openSeparated && !separate && !topic) {
+		// In case we're opening a chat history we first try to open it like
+		// it is done from the main window context menu (that checks if the
+		// chat isn't restricted and also closes the chat we're opening
+		// in the window itself). If this couldn't be done, we open normally.
+		const auto tryInExisting = [&](bool primary) {
+			for (const auto &window : history->session().windows()) {
+				if (primary && !window->window().id().primary()) {
+					continue;
+				} else if (!primary && !window->window().id().folder()) {
+					continue;
+				}
+				window->showInNewWindow(separateId, itemId);
+				const auto shown = Core::App().separateWindowFor(
+					separateId);
+				return shown ? shown->sessionController() : window.get();
+			}
+			return (Window::SessionController*)nullptr;
+		};
+		const auto shownPrimary = tryInExisting(true);
+		const auto shown = shownPrimary
+			? shownPrimary
+			: tryInExisting(false);
+		if (shown) {
+			return shown;
+		}
+	}
 	const auto window = separate
 		? separate->sessionController()
+		: openSeparated
+		? [&] {
+			const auto window = Core::App().ensureSeparateWindowFor(
+				separateId,
+				itemId);
+			return window ? window->sessionController() : nullptr;
+		}()
 		: history->session().tryResolveWindow();
-	const auto itemId = openExactlyMessage ? messageId : ShowAtUnreadMsgId;
 	if (window) {
+		window->widget()->showFromTray();
 		if (topic) {
-			window->showSection(
-				std::make_shared<HistoryView::RepliesMemento>(
-					history,
-					topic->rootId(),
-					itemId),
-				SectionShow::Way::Forward);
+			window->showTopic(topic, itemId, SectionShow::Way::Forward);
+		} else if (sublist) {
+			window->showSublist(sublist, itemId, SectionShow::Way::Forward);
 		} else {
 			window->showPeerHistory(
 				history->peer->id,
@@ -1116,11 +1407,7 @@ void Manager::openNotificationMessage(
 				itemId);
 		}
 	}
-	if (topic) {
-		system()->clearFromTopic(topic);
-	} else {
-		system()->clearFromHistory(history);
-	}
+	return window;
 }
 
 void Manager::notificationReplied(
@@ -1140,6 +1427,10 @@ void Manager::notificationReplied(
 	const auto topicRootId = topic
 		? topic->rootId()
 		: id.contextId.topicRootId;
+	const auto sublist = item ? item->savedSublist() : nullptr;
+	const auto monoforumPeerId = (sublist && sublist->parentChat())
+		? sublist->sublistPeer()->id
+		: id.contextId.monoforumPeerId;
 
 	auto message = Api::MessageToSend(Api::SendAction(history));
 	message.textWithTags = reply;
@@ -1152,6 +1443,7 @@ void Manager::notificationReplied(
 	message.action.replyTo = {
 		.messageId = { replyToId ? history->peer->id : 0, replyToId },
 		.topicRootId = topic ? topic->rootId() : 0,
+		.monoforumPeerId = monoforumPeerId,
 	};
 	message.action.clearDraft = false;
 	history->session().api().sendMessage(std::move(message));
@@ -1161,12 +1453,101 @@ void Manager::notificationReplied(
 	}
 }
 
+void Manager::notificationActionActivated(
+		NotificationId id,
+		const QString &actionId) {
+	if (actionId == u"markAsRead"_q) {
+		notificationReplied(id, {});
+		return;
+	}
+	if (!actionId.startsWith(u"callbackButton:"_q)) {
+		return;
+	}
+	const auto payload = QStringView(actionId).mid(15);
+	const auto sep = payload.indexOf(':');
+	if (sep < 0) {
+		return;
+	}
+	const auto row = payload.left(sep).toInt();
+	const auto column = payload.mid(sep + 1).toInt();
+	if (!id.contextId.sessionId || !id.contextId.peerId) {
+		return;
+	}
+	const auto session = system()->findSession(id.contextId.sessionId);
+	if (!session) {
+		return;
+	}
+	const auto history = session->data().history(id.contextId.peerId);
+	const auto item = history->owner().message(history->peer, id.msgId);
+	if (!item || !item->isRegular()) {
+		return;
+	}
+	const auto owner = &history->owner();
+	const auto fullId = item->fullId();
+	const auto button = HistoryMessageMarkupButton::Get(
+		owner,
+		fullId,
+		row,
+		column);
+	if (!button || button->requestId) {
+		return;
+	}
+	using ButtonType = HistoryMessageMarkupButton::Type;
+	if (button->type != ButtonType::Callback) {
+		return;
+	}
+	auto flags = MTPmessages_GetBotCallbackAnswer::Flags(0);
+	flags |= MTPmessages_GetBotCallbackAnswer::Flag::f_data;
+	const auto sendData = button->data;
+	button->requestId = session->api().request(
+		MTPmessages_GetBotCallbackAnswer(
+			MTP_flags(flags),
+			history->peer->input(),
+			MTP_int(item->id),
+			MTP_bytes(sendData),
+			MTP_inputCheckPasswordEmpty())
+	).done([=](const MTPmessages_BotCallbackAnswer &result) {
+		const auto item = owner->message(fullId);
+		if (!item) {
+			return;
+		}
+		if (const auto button = HistoryMessageMarkupButton::Get(
+				owner,
+				fullId,
+				row,
+				column)) {
+			button->requestId = 0;
+			owner->requestItemRepaint(item);
+		}
+	}).fail([=](const MTP::Error &error) {
+		const auto item = owner->message(fullId);
+		if (!item) {
+			return;
+		}
+		if (const auto button = HistoryMessageMarkupButton::Get(
+				owner,
+				fullId,
+				row,
+				column)) {
+			button->requestId = 0;
+		}
+	}).send();
+}
+
+void Manager::maybePlaySound(Fn<void()> playSound) {
+	if (_system->volumeSupported()) {
+		doMaybePlaySound(std::move(playSound));
+	}
+}
+
 void NativeManager::doShowNotification(NotificationFields &&fields) {
-	const auto options = getNotificationOptions(
-		fields.item,
-		(fields.reactionFrom
-			? Data::ItemNotificationType::Reaction
-			: Data::ItemNotificationType::Message));
+	const auto pollVote = !fields.pollVoteOption.isEmpty();
+	const auto type = fields.reactionFrom
+		? (pollVote
+			? Data::ItemNotificationType::PollVote
+			: Data::ItemNotificationType::Reaction)
+		: Data::ItemNotificationType::Message;
+	const auto options = getNotificationOptions(fields.item, type);
 	const auto item = fields.item;
 	const auto peer = item->history()->peer;
 	const auto reactionFrom = fields.reactionFrom;
@@ -1177,23 +1558,38 @@ void NativeManager::doShowNotification(NotificationFields &&fields) {
 		&& !reactionFrom
 		&& (item->out() || peer->isSelf())
 		&& item->isFromScheduled();
-	const auto topicWithChat = [&] {
+	const auto subWithChat = [&] {
 		const auto name = peer->name();
 		const auto topic = item->topic();
-		return topic ? (topic->title() + u" ("_q + name + ')') : name;
+		const auto sublist = item->savedSublist();
+		return topic
+			? (topic->title() + u" ("_q + name + ')')
+			: (sublist && sublist->parentChat())
+			? (sublist->sublistPeer()->shortName() + u" ("_q + name + ')')
+			: name;
 	};
 	const auto title = options.hideNameAndPhoto
 		? AppName.utf16()
 		: (scheduled && peer->isSelf())
 		? tr::lng_notification_reminder(tr::now)
-		: topicWithChat();
+		: subWithChat();
 	const auto fullTitle = addTargetAccountName(title, &peer->session());
+	const auto hideReactionSender = reactionFrom
+		&& !peer->session().api().reactionsNotifySettings()
+			.showPreviewsCurrent();
 	const auto subtitle = reactionFrom
-		? (reactionFrom != peer ? reactionFrom->name() : QString())
+		? ((!hideReactionSender && reactionFrom != peer)
+			? reactionFrom->name()
+			: QString())
 		: options.hideNameAndPhoto
 		? QString()
 		: item->notificationHeader();
-	const auto text = reactionFrom
+	const auto text = pollVote
+		? TextWithPermanentSpoiler(ComposePollVoteNotification(
+			item,
+			fields.pollVoteOption,
+			options.hideMessageText))
+		: reactionFrom
 		? TextWithPermanentSpoiler(ComposeReactionNotification(
 			item,
 			fields.reactionId,
@@ -1212,15 +1608,51 @@ void NativeManager::doShowNotification(NotificationFields &&fields) {
 
 	// #TODO optimize
 	auto userpicView = item->history()->peer->createUserpicView();
-	doShowNativeNotification(
-		item->history()->peer,
-		item->topicRootId(),
-		userpicView,
-		item->id,
-		scheduled ? WrapFromScheduled(fullTitle) : fullTitle,
-		subtitle,
-		text,
-		options);
+	const auto owner = &item->history()->owner();
+	const auto withSound = fields.soundId
+		&& Core::App().settings().soundNotify();
+	const auto sound = withSound ? [=, id = *fields.soundId] {
+		return _localSoundCache.sound(id, [=] {
+			return Core::App().notifications().lookupSoundBytes(owner, id);
+		}, [=] {
+			return Core::App().notifications().lookupSoundBytes(owner, 0);
+		});
+	} : Fn<NotificationSound()>();
+	auto actions = std::vector<NotificationAction>();
+	if (AllowNotificationActions(peer) && !options.hideMarkAsRead) {
+		if (const auto markup = item->inlineReplyMarkup()) {
+			using ButtonType = HistoryMessageMarkupButton::Type;
+			const auto &rows = markup->data.rows;
+			const auto rowsCount = int(rows.size());
+			for (auto row = 0; row != rowsCount; ++row) {
+				const auto &buttons = rows[row];
+				const auto colsCount = int(buttons.size());
+				for (auto col = 0; col != colsCount; ++col) {
+					const auto &button = buttons[col];
+					if (button.type == ButtonType::Callback) {
+						actions.push_back({
+							.id = u"callbackButton:%1:%2"_q.arg(row).arg(col),
+							.text = button.text,
+						});
+					}
+				}
+			}
+		}
+	}
+	doShowNativeNotification({
+		.peer = item->history()->peer,
+		.topicRootId = item->topicRootId(),
+		.monoforumPeerId = (item->history()->amMonoforumAdmin()
+			? item->sublistPeerId()
+			: PeerId()),
+		.itemId = item->id,
+		.title = scheduled ? WrapFromScheduled(fullTitle) : fullTitle,
+		.subtitle = subtitle,
+		.message = text,
+		.sound = sound,
+		.options = options,
+		.actions = std::move(actions),
+	}, userpicView);
 }
 
 bool NativeManager::forceHideDetails() const {
@@ -1233,5 +1665,27 @@ QString WrapFromScheduled(const QString &text) {
 	return QString::fromUtf8("\xF0\x9F\x93\x85 ") + text;
 }
 
+QRect NotificationDisplayRect(Window::Controller *controller) {
+	const auto displayChecksum
+		= Core::App().settings().notificationsDisplayChecksum();
+
+	auto screen = (QScreen*)(nullptr);
+	if (displayChecksum) {
+		using namespace Platform;
+		for (const auto candidateScreen : QGuiApplication::screens()) {
+			if (ScreenNameChecksum(candidateScreen) == displayChecksum) {
+				screen = candidateScreen;
+				break;
+			}
+		}
+	}
+
+	return screen
+		? screen->availableGeometry()
+		: controller
+		? controller->widget()->desktopRect()
+		: QGuiApplication::primaryScreen()->availableGeometry();
+}
+
 } // namespace Notifications
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/notifications_manager.h b/Telegram/SourceFiles/window/notifications_manager.h
index a8db13833efa86..a3fa992d958cb2 100644
--- a/Telegram/SourceFiles/window/notifications_manager.h
+++ b/Telegram/SourceFiles/window/notifications_manager.h
@@ -10,12 +10,14 @@ For license and copyright information please follow this link:
 #include "data/data_message_reaction_id.h"
 #include "base/timer.h"
 #include "base/type_traits.h"
+#include "media/audio/media_audio_local_cache.h"
 
 class History;
 
 namespace Data {
 class Session;
 class ForumTopic;
+class SavedSublist;
 class Thread;
 struct ItemNotification;
 enum class ItemNotificationType;
@@ -40,6 +42,7 @@ class Track;
 } // namespace Media::Audio
 
 namespace Window {
+class Controller;
 class SessionController;
 } // namespace Window
 
@@ -74,22 +77,19 @@ struct custom_is_fast_copy_type<Window::Notifications::ChangeType> : std::true_t
 
 } // namespace base
 
-namespace base::options {
-
-template <typename Type>
-class option;
-
-using toggle = option<bool>;
-
-} // namespace base::options
-
 namespace Window::Notifications {
 
+extern const char kOptionCustomNotification[];
 extern const char kOptionGNotification[];
-extern base::options::toggle OptionGNotification;
+extern const char kOptionHideReplyButton[];
 
 class Manager;
 
+struct ActivateOptions {
+	TextWithTags draft;
+	bool allowNewWindow = false;
+};
+
 class System final {
 public:
 	System();
@@ -98,14 +98,18 @@ class System final {
 	[[nodiscard]] Main::Session *findSession(uint64 sessionId) const;
 
 	void createManager();
-	void setManager(std::unique_ptr<Manager> manager);
+	void setManager(Fn<std::unique_ptr<Manager>()> create);
 	[[nodiscard]] Manager &manager() const;
+	[[nodiscard]] rpl::producer<> managerChanged() const;
+	[[nodiscard]] bool nativeEnforced() const;
 
 	void checkDelayed();
 	void schedule(Data::ItemNotification notification);
 	void clearFromTopic(not_null<Data::ForumTopic*> topic);
+	void clearFromSublist(not_null<Data::SavedSublist*> sublist);
 	void clearFromHistory(not_null<History*> history);
 	void clearIncomingFromTopic(not_null<Data::ForumTopic*> topic);
+	void clearIncomingFromSublist(not_null<Data::SavedSublist*> sublist);
 	void clearIncomingFromHistory(not_null<History*> history);
 	void clearFromSession(not_null<Main::Session*> session);
 	void clearFromItem(not_null<HistoryItem*> item);
@@ -116,7 +120,16 @@ class System final {
 	[[nodiscard]] rpl::producer<ChangeType> settingsChanged() const;
 	void notifySettingsChanged(ChangeType type);
 
-	void playSound(not_null<Main::Session*> session, DocumentId id);
+	[[nodiscard]] bool volumeSupported() const;
+	[[nodiscard]] rpl::producer<bool> volumeSupportedValue() const;
+
+	void playSound(
+		not_null<Main::Session*> session,
+		DocumentId id,
+		float64 volumeOverride = -1);
+	[[nodiscard]] QByteArray lookupSoundBytes(
+		not_null<Data::Session*> owner,
+		DocumentId id);
 
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
@@ -151,13 +164,13 @@ class System final {
 		crl::time delay = 0;
 		crl::time when = 0;
 	};
-	struct ReactionNotificationId {
+	struct SentNotificationId {
 		FullMsgId itemId;
 		uint64 sessionId = 0;
 
 		friend inline bool operator<(
-				ReactionNotificationId a,
-				ReactionNotificationId b) {
+				SentNotificationId a,
+				SentNotificationId b) {
 			return std::pair(a.itemId, a.sessionId)
 				< std::pair(b.itemId, b.sessionId);
 		}
@@ -172,8 +185,9 @@ class System final {
 	[[nodiscard]] Timing countTiming(
 		not_null<Data::Thread*> thread,
 		crl::time minimalDelay) const;
-	[[nodiscard]] bool skipReactionNotification(
-		not_null<HistoryItem*> item) const;
+	[[nodiscard]] bool skipSentNotification(
+		not_null<HistoryItem*> item,
+		base::flat_map<SentNotificationId, crl::time> &already) const;
 
 	void showNext();
 	void showGrouped();
@@ -198,10 +212,14 @@ class System final {
 		base::flat_map<crl::time, PeerData*>> _whenAlerts;
 
 	mutable base::flat_map<
-		ReactionNotificationId,
+		SentNotificationId,
 		crl::time> _sentReactionNotifications;
+	mutable base::flat_map<
+		SentNotificationId,
+		crl::time> _sentPollVoteNotifications;
 
 	std::unique_ptr<Manager> _manager;
+	rpl::event_stream<> _managerChanged;
 
 	rpl::event_stream<ChangeType> _settingsChanged;
 
@@ -213,10 +231,14 @@ class System final {
 	base::flat_map<
 		not_null<Data::ForumTopic*>,
 		rpl::lifetime> _watchedTopics;
+	base::flat_map<
+		not_null<Data::SavedSublist*>,
+		rpl::lifetime> _watchedSublists;
 
 	int _lastForwardedCount = 0;
 	uint64 _lastHistorySessionId = 0;
 	FullMsgId _lastHistoryItemId;
+	std::optional<DocumentId> _lastSoundId;
 
 	rpl::lifetime _lifetime;
 
@@ -228,26 +250,11 @@ class Manager {
 		uint64 sessionId = 0;
 		PeerId peerId = 0;
 		MsgId topicRootId = 0;
+		PeerId monoforumPeerId = 0;
 
 		friend inline auto operator<=>(
 			const ContextId&,
 			const ContextId&) = default;
-
-		[[nodiscard]] auto toAnyVector() const {
-			return std::vector<std::any>{
-				std::make_any<uint64>(sessionId),
-				std::make_any<uint64>(peerId.value),
-				std::make_any<int64>(topicRootId.bare),
-			};
-		}
-
-		[[nodiscard]] static auto FromAnyVector(const auto &vector) {
-			return ContextId{
-				std::any_cast<uint64>(vector[0]),
-				PeerIdHelper(std::any_cast<uint64>(vector[1])),
-				std::any_cast<int64>(vector[2]),
-			};
-		}
 	};
 	struct NotificationId {
 		ContextId contextId;
@@ -256,27 +263,14 @@ class Manager {
 		friend inline auto operator<=>(
 			const NotificationId&,
 			const NotificationId&) = default;
-
-		[[nodiscard]] auto toAnyVector() const {
-			return std::vector<std::any>{
-				std::make_any<std::vector<std::any>>(contextId.toAnyVector()),
-				std::make_any<int64>(msgId.bare),
-			};
-		}
-
-		[[nodiscard]] static auto FromAnyVector(const auto &vector) {
-			return NotificationId{
-				ContextId::FromAnyVector(
-					std::any_cast<std::vector<std::any>>(vector[0])),
-				std::any_cast<int64>(vector[1]),
-			};
-		}
 	};
 	struct NotificationFields {
 		not_null<HistoryItem*> item;
 		int forwardedCount = 0;
 		PeerData *reactionFrom = nullptr;
 		Data::ReactionId reactionId;
+		QByteArray pollVoteOption;
+		std::optional<DocumentId> soundId;
 	};
 
 	explicit Manager(not_null<System*> system) : _system(system) {
@@ -300,6 +294,9 @@ class Manager {
 	void clearFromTopic(not_null<Data::ForumTopic*> topic) {
 		doClearFromTopic(topic);
 	}
+	void clearFromSublist(not_null<Data::SavedSublist*> sublist) {
+		doClearFromSublist(sublist);
+	}
 	void clearFromHistory(not_null<History*> history) {
 		doClearFromHistory(history);
 	}
@@ -309,15 +306,18 @@ class Manager {
 
 	void notificationActivated(
 		NotificationId id,
-		const TextWithTags &draft = {});
+		ActivateOptions &&options = {});
 	void notificationReplied(NotificationId id, const TextWithTags &reply);
+	void notificationActionActivated(
+		NotificationId id,
+		const QString &actionId);
 
 	struct DisplayOptions {
-		bool hideNameAndPhoto = false;
-		bool hideMessageText = false;
-		bool hideMarkAsRead = false;
-		bool hideReplyButton = false;
-		bool spoilerLoginCode = false;
+		bool hideNameAndPhoto : 1 = false;
+		bool hideMessageText : 1 = false;
+		bool hideMarkAsRead : 1 = false;
+		bool hideReplyButton : 1 = false;
+		bool spoilerLoginCode : 1 = false;
 	};
 	[[nodiscard]] DisplayOptions getNotificationOptions(
 		HistoryItem *item,
@@ -329,6 +329,10 @@ class Manager {
 		not_null<HistoryItem*> item,
 		const Data::ReactionId &reaction,
 		bool hideContent);
+	[[nodiscard]] static TextWithEntities ComposePollVoteNotification(
+		not_null<HistoryItem*> item,
+		const QByteArray &option,
+		bool hideContent);
 
 	[[nodiscard]] TextWithEntities addTargetAccountName(
 		TextWithEntities title,
@@ -342,9 +346,7 @@ class Manager {
 	[[nodiscard]] bool skipToast() const {
 		return doSkipToast();
 	}
-	void maybePlaySound(Fn<void()> playSound) {
-		doMaybePlaySound(std::move(playSound));
-	}
+	void maybePlaySound(Fn<void()> playSound);
 	void maybeFlashBounce(Fn<void()> flashBounce) {
 		doMaybeFlashBounce(std::move(flashBounce));
 	}
@@ -362,6 +364,8 @@ class Manager {
 	virtual void doClearAllFast() = 0;
 	virtual void doClearFromItem(not_null<HistoryItem*> item) = 0;
 	virtual void doClearFromTopic(not_null<Data::ForumTopic*> topic) = 0;
+	virtual void doClearFromSublist(
+		not_null<Data::SavedSublist*> sublist) = 0;
 	virtual void doClearFromHistory(not_null<History*> history) = 0;
 	virtual void doClearFromSession(not_null<Main::Session*> session) = 0;
 	[[nodiscard]] virtual bool doSkipToast() const = 0;
@@ -379,9 +383,10 @@ class Manager {
 	[[nodiscard]] virtual QString accountNameSeparator();
 
 private:
-	void openNotificationMessage(
+	Window::SessionController *openNotificationMessage(
 		not_null<History*> history,
-		MsgId messageId);
+		MsgId messageId,
+		bool openSeparated);
 
 	const not_null<System*> _system;
 
@@ -393,6 +398,24 @@ class NativeManager : public Manager {
 		return ManagerType::Native;
 	}
 
+	using NotificationSound = Media::Audio::LocalSound;
+	struct NotificationAction {
+		QString id;
+		QString text;
+	};
+	struct NotificationInfo {
+		not_null<PeerData*> peer;
+		MsgId topicRootId = 0;
+		PeerId monoforumPeerId = 0;
+		MsgId itemId = 0;
+		QString title;
+		QString subtitle;
+		QString message;
+		Fn<NotificationSound()> sound;
+		DisplayOptions options;
+		std::vector<NotificationAction> actions;
+	};
+
 protected:
 	using Manager::Manager;
 
@@ -407,14 +430,11 @@ class NativeManager : public Manager {
 	bool forceHideDetails() const override;
 
 	virtual void doShowNativeNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options) = 0;
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView) = 0;
+
+private:
+	Media::Audio::LocalCache _localSoundCache;
 
 };
 
@@ -428,14 +448,8 @@ class DummyManager : public NativeManager {
 
 protected:
 	void doShowNativeNotification(
-		not_null<PeerData*> peer,
-		MsgId topicRootId,
-		Ui::PeerUserpicView &userpicView,
-		MsgId msgId,
-		const QString &title,
-		const QString &subtitle,
-		const QString &msg,
-		DisplayOptions options) override {
+		NotificationInfo &&info,
+		Ui::PeerUserpicView &userpicView) override {
 	}
 	void doClearAllFast() override {
 	}
@@ -443,6 +457,8 @@ class DummyManager : public NativeManager {
 	}
 	void doClearFromTopic(not_null<Data::ForumTopic*> topic) override {
 	}
+	void doClearFromSublist(not_null<Data::SavedSublist*> sublist) override {
+	}
 	void doClearFromHistory(not_null<History*> history) override {
 	}
 	void doClearFromSession(not_null<Main::Session*> session) override {
@@ -461,4 +477,6 @@ class DummyManager : public NativeManager {
 
 [[nodiscard]] QString WrapFromScheduled(const QString &text);
 
+[[nodiscard]] QRect NotificationDisplayRect(Window::Controller *controller);
+
 } // namespace Window::Notifications
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index 198418b585dbbf..1cc4d549f05976 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -23,6 +23,8 @@ For license and copyright information please follow this link:
 #include "ui/painter.h"
 #include "ui/power_saving.h"
 #include "ui/ui_utility.h"
+#include "data/data_premium_limits.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_forum_topic.h"
 #include "data/stickers/data_custom_emoji.h"
@@ -50,10 +52,7 @@ namespace {
 
 [[nodiscard]] QPoint notificationStartPosition() {
 	const auto corner = Core::App().settings().notificationsCorner();
-	const auto window = Core::App().activePrimaryWindow();
-	const auto r = window
-		? window->widget()->desktopRect()
-		: QGuiApplication::primaryScreen()->availableGeometry();
+	const auto r = NotificationDisplayRect(Core::App().activePrimaryWindow());
 	const auto isLeft = Core::Settings::IsLeftCorner(corner);
 	const auto isTop = Core::Settings::IsTopCorner(corner);
 	const auto x = (isLeft == rtl())
@@ -78,7 +77,7 @@ Manager::Manager(System *system)
 : Notifications::Manager(system)
 , _inputCheckTimer([=] { checkLastInput(); }) {
 	system->settingsChanged(
-	) | rpl::start_with_next([=](ChangeType change) {
+	) | rpl::on_next([=](ChangeType change) {
 		settingsChanged(change);
 	}, _lifetime);
 }
@@ -188,16 +187,10 @@ void Manager::checkLastInput() {
 
 void Manager::startAllHiding() {
 	if (!hasReplyingNotification()) {
-		int notHidingCount = 0;
 		for (const auto &notification : _notifications) {
-			if (notification->isShowing()) {
-				++notHidingCount;
-			} else {
-				notification->startHiding();
-			}
+			notification->startHiding();
 		}
-		notHidingCount += _queuedNotifications.size();
-		if (_hideAll && notHidingCount < 2) {
+		if (_hideAll && _queuedNotifications.size() < 2) {
 			_hideAll->startHiding();
 		}
 	}
@@ -242,6 +235,7 @@ void Manager::showNextFromQueue() {
 			this,
 			queued.history,
 			queued.topicRootId,
+			queued.monoforumPeerId,
 			queued.peer,
 			queued.author,
 			queued.item,
@@ -263,14 +257,14 @@ void Manager::subscribeToSession(not_null<Main::Session*> session) {
 	if (i == _subscriptions.end()) {
 		i = _subscriptions.emplace(session).first;
 		session->account().sessionChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_subscriptions.remove(session);
 		}, i->second.lifetime);
 	} else if (i->second.subscription) {
 		return;
 	}
 	session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto found = false;
 		for (const auto &notification : _notifications) {
 			if (const auto history = notification->maybeHistory()) {
@@ -389,7 +383,25 @@ void Manager::doClearFromTopic(not_null<Data::ForumTopic*> topic) {
 		}
 	}
 	for (const auto &notification : _notifications) {
-		if (notification->unlinkHistory(history, topicRootId)) {
+		if (notification->unlinkHistory(history, topicRootId, PeerId())) {
+			_positionsOutdated = true;
+		}
+	}
+	showNextFromQueue();
+}
+
+void Manager::doClearFromSublist(not_null<Data::SavedSublist*> sublist) {
+	const auto history = sublist->owningHistory();
+	const auto sublistPeerId = sublist->sublistPeer()->id;
+	for (auto i = _queuedNotifications.begin(); i != _queuedNotifications.cend();) {
+		if (i->history == history && i->monoforumPeerId == sublistPeerId) {
+			i = _queuedNotifications.erase(i);
+		} else {
+			++i;
+		}
+	}
+	for (const auto &notification : _notifications) {
+		if (notification->unlinkHistory(history, MsgId(), sublistPeerId)) {
 			_positionsOutdated = true;
 		}
 	}
@@ -500,7 +512,13 @@ void Widget::opacityAnimationCallback() {
 	updateOpacity();
 	update();
 	if (!_a_opacity.animating() && _hiding) {
-		manager()->removeWidget(this);
+		if (underMouse()) {
+			// The notification is leaving from under the cursor, but in such case leave hook is not
+			// triggered automatically. But we still want the manager to start hiding notifications
+			// (see #28813).
+			manager()->startAllHiding();
+		}
+		manager()->removeWidget(this);  // Deletes `this`
 	}
 }
 
@@ -549,6 +567,10 @@ void Widget::hideStop() {
 
 void Widget::hideAnimated(float64 duration, const anim::transition &func) {
 	_hiding = true;
+	// Stop the previous animation so as to make sure that the notification
+	// is fully restored before hiding it again.
+	// Relates to https://github.com/telegramdesktop/tdesktop/issues/28811.
+	_a_opacity.stop();
 	_a_opacity.start([this] { opacityAnimationCallback(); }, 1., 0., duration, func);
 }
 
@@ -597,7 +619,7 @@ QPoint Widget::computePosition(int height) const {
 	return QPoint(_startPosition.x(), _startPosition.y() + realShift);
 }
 
-Background::Background(QWidget *parent) : TWidget(parent) {
+Background::Background(QWidget *parent) : RpWidget(parent) {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 }
 
@@ -614,6 +636,7 @@ Notification::Notification(
 	not_null<Manager*> manager,
 	not_null<History*> history,
 	MsgId topicRootId,
+	PeerId monoforumPeerId,
 	not_null<PeerData*> peer,
 	const QString &author,
 	HistoryItem *item,
@@ -629,7 +652,9 @@ Notification::Notification(
 , _history(history)
 , _topic(history->peer->forumTopicFor(topicRootId))
 , _topicRootId(topicRootId)
-, _userpicView(_peer->createUserpicView())
+, _sublist(history->peer->monoforumSublistFor(monoforumPeerId))
+, _monoforumPeerId(monoforumPeerId)
+, _userpicView(_peer->userpicPaintingPeer()->createUserpicView())
 , _author(author)
 , _reaction(reaction)
 , _item(item)
@@ -637,14 +662,16 @@ Notification::Notification(
 , _fromScheduled(fromScheduled)
 , _close(this, st::notifyClose)
 , _reply(this, tr::lng_notification_reply(), st::defaultBoxButton) {
+	_reply->setTextTransform(Ui::RoundButtonTextTransform::ToUpper);
+
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
 	if (_topic) {
 		_topic->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			unlinkHistory();
 		}, lifetime());
 	}
@@ -675,7 +702,7 @@ Notification::Notification(
 	prepareActionsCache();
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateNotifyDisplay();
 		if (!_buttonsCache.isNull()) {
 			prepareActionsCache();
@@ -945,10 +972,10 @@ void Notification::updateNotifyDisplay() {
 				0,
 				Qt::LayoutDirectionAuto,
 			};
-			const auto context = Core::MarkedTextContext{
+			const auto context = Core::TextContext({
 				.session = &_history->session(),
-				.customEmojiRepaint = [=] { customEmojiCallback(); },
-			};
+				.repaint = [=] { customEmojiCallback(); },
+			});
 			_textCache.setMarkedText(
 				st::dialogsTextStyle,
 				text,
@@ -979,15 +1006,15 @@ void Notification::updateNotifyDisplay() {
 		auto title = options.hideNameAndPhoto
 			? TextWithEntities{ u"Telegram Desktop"_q }
 			: reminder
-			? tr::lng_notification_reminder(tr::now, Ui::Text::WithEntities)
+			? tr::lng_notification_reminder(tr::now, tr::marked)
 			: topicWithChat();
 		const auto fullTitle = manager()->addTargetAccountName(
 			std::move(title),
 			&_history->session());
-		const auto context = Core::MarkedTextContext{
+		const auto context = Core::TextContext({
 			.session = &_history->session(),
-			.customEmojiRepaint = [=] { customEmojiCallback(); },
-		};
+			.repaint = [=] { customEmojiCallback(); },
+		});
 		_titleCache.setMarkedText(
 			st::semiboldTextStyle,
 			fullTitle,
@@ -1089,7 +1116,8 @@ void Notification::showReplyField() {
 	_replyArea->moveToLeft(st::notifyBorderWidth, st::notifyMinHeight);
 	_replyArea->show();
 	_replyArea->setFocus();
-	_replyArea->setMaxLength(MaxMessageSize);
+	_replyArea->setMaxLength(
+		Data::PremiumLimits(&_item->history()->session()).messageLengthCurrent());
 	_replyArea->setSubmitSettings(Ui::InputField::SubmitSettings::Both);
 	InitMessageFieldHandlers({
 		.session = &_item->history()->session(),
@@ -1099,13 +1127,13 @@ void Notification::showReplyField() {
 	// Catch mouse press event to activate the window.
 	QCoreApplication::instance()->installEventFilter(this);
 	_replyArea->heightChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		replyResized();
 	}, _replyArea->lifetime());
 	_replyArea->submits(
-	) | rpl::start_with_next([=] { sendReply(); }, _replyArea->lifetime());
+	) | rpl::on_next([=] { sendReply(); }, _replyArea->lifetime());
 	_replyArea->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		replyCancel();
 	}, _replyArea->lifetime());
 
@@ -1145,10 +1173,14 @@ void Notification::changeHeight(int newHeight) {
 	manager()->changeNotificationHeight(this, newHeight);
 }
 
-bool Notification::unlinkHistory(History *history, MsgId topicRootId) {
+bool Notification::unlinkHistory(
+		History *history,
+		MsgId topicRootId,
+		PeerId monoforumPeerId) {
 	const auto unlink = _history
 		&& (history == _history || !history)
-		&& (topicRootId == _topicRootId || !topicRootId);
+		&& (topicRootId == _topicRootId || !topicRootId)
+		&& (monoforumPeerId == _monoforumPeerId || !monoforumPeerId);
 	if (unlink) {
 		hideFast();
 		_history = nullptr;
@@ -1198,7 +1230,9 @@ void Notification::mousePressEvent(QMouseEvent *e) {
 		unlinkHistoryInManager();
 	} else {
 		e->ignore();
-		manager()->notificationActivated(myId());
+		manager()->notificationActivated(myId(), {
+			.allowNewWindow = true,
+		});
 	}
 }
 
@@ -1232,7 +1266,7 @@ HideAllButton::HideAllButton(
 	updateGeometry(position.x(), position.y(), st::notifyWidth, st::notifyHideAllHeight);
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.h b/Telegram/SourceFiles/window/notifications_manager_default.h
index 5bd4344d8db4a5..7a2356101d1d08 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.h
+++ b/Telegram/SourceFiles/window/notifications_manager_default.h
@@ -70,6 +70,7 @@ class Manager final : public Notifications::Manager {
 	void doClearAll() override;
 	void doClearAllFast() override;
 	void doClearFromTopic(not_null<Data::ForumTopic*> topic) override;
+	void doClearFromSublist(not_null<Data::SavedSublist*> sublist) override;
 	void doClearFromHistory(not_null<History*> history) override;
 	void doClearFromSession(not_null<Main::Session*> session) override;
 	void doClearFromItem(not_null<HistoryItem*> item) override;
@@ -111,6 +112,7 @@ class Manager final : public Notifications::Manager {
 
 		not_null<History*> history;
 		MsgId topicRootId = 0;
+		PeerId monoforumPeerId = 0;
 		not_null<PeerData*> peer;
 		Data::ReactionId reaction;
 		QString author;
@@ -143,7 +145,7 @@ class Widget : public Ui::RpWidget {
 		int shift,
 		Direction shiftDirection);
 
-	bool isShowing() const {
+	bool isFadingIn() const {
 		return _a_opacity.animating() && !_hiding;
 	}
 
@@ -188,7 +190,7 @@ class Widget : public Ui::RpWidget {
 
 };
 
-class Background : public TWidget {
+class Background : public Ui::RpWidget {
 public:
 	Background(QWidget *parent);
 
@@ -203,6 +205,7 @@ class Notification final : public Widget {
 		not_null<Manager*> manager,
 		not_null<History*> history,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		not_null<PeerData*> peer,
 		const QString &author,
 		HistoryItem *item,
@@ -231,7 +234,10 @@ class Notification final : public Widget {
 
 	// Called only by Manager.
 	bool unlinkItem(HistoryItem *del);
-	bool unlinkHistory(History *history = nullptr, MsgId topicRootId = 0);
+	bool unlinkHistory(
+		History *history = nullptr,
+		MsgId topicRootId = 0,
+		PeerId monoforumPeerId = 0);
 	bool unlinkSession(not_null<Main::Session*> session);
 	bool checkLastInput(
 		bool hasReplyingNotifications,
@@ -285,6 +291,8 @@ class Notification final : public Widget {
 	History *_history = nullptr;
 	Data::ForumTopic *_topic = nullptr;
 	MsgId _topicRootId = 0;
+	Data::SavedSublist *_sublist = nullptr;
+	PeerId _monoforumPeerId = 0;
 	Ui::PeerUserpicView _userpicView;
 	QString _author;
 	Data::ReactionId _reaction;
diff --git a/Telegram/SourceFiles/window/section_memento.h b/Telegram/SourceFiles/window/section_memento.h
index e794d024ebb23e..d139928a9996a6 100644
--- a/Telegram/SourceFiles/window/section_memento.h
+++ b/Telegram/SourceFiles/window/section_memento.h
@@ -13,6 +13,7 @@ class LayerWidget;
 
 namespace Data {
 class ForumTopic;
+class SavedSublist;
 } // namespace Data
 
 namespace Window {
@@ -41,6 +42,10 @@ class SectionMemento {
 	[[nodiscard]] virtual Data::ForumTopic *topicForRemoveRequests() const {
 		return nullptr;
 	}
+	[[nodiscard]] virtual auto sublistForRemoveRequests() const
+	-> Data::SavedSublist* {
+		return nullptr;
+	}
 	[[nodiscard]] virtual rpl::producer<> removeRequests() const {
 		return rpl::never<>();
 	}
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index 5a72a69847c410..ed226f428d0c36 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -24,25 +24,33 @@ For license and copyright information please follow this link:
 #include "data/data_peer_values.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "settings/settings_premium.h"
+#include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "menu/menu_send.h"
+#include "settings/sections/settings_premium.h"
+#include "ui/text/text_custom_emoji.h"
+#include "ui/toast/toast.h"
 #include "window/section_memento.h"
 #include "window/window_slide_animation.h"
 #include "window/window_session_controller.h"
 #include "window/themes/window_theme.h"
 
+#include "styles/style_polls.h"
+
 #include <rpl/range.h>
 
 namespace Window {
 namespace {
 
-[[nodiscard]] rpl::producer<QString> PeerThemeEmojiValue(
+constexpr auto kReactionRestrictionToastDuration = 5 * crl::time(1000);
+
+[[nodiscard]] rpl::producer<QString> PeerThemeTokenValue(
 		not_null<PeerData*> peer) {
 	return peer->session().changes().peerFlagsValue(
 		peer,
-		Data::PeerUpdate::Flag::ChatThemeEmoji
+		Data::PeerUpdate::Flag::ChatThemeToken
 	) | rpl::map([=] {
-		return peer->themeEmoji();
+		return peer->themeToken();
 	});
 }
 
@@ -96,11 +104,11 @@ struct ResolvedPaper {
 [[nodiscard]] auto MaybeChatThemeDataValueFromPeer(
 	not_null<PeerData*> peer)
 -> rpl::producer<std::optional<Data::CloudTheme>> {
-	return PeerThemeEmojiValue(
+	return PeerThemeTokenValue(
 		peer
-	) | rpl::map([=](const QString &emoji)
+	) | rpl::map([=](const QString &token)
 	-> rpl::producer<std::optional<Data::CloudTheme>> {
-		return peer->owner().cloudThemes().themeForEmojiValue(emoji);
+		return peer->owner().cloudThemes().themeForTokenValue(token);
 	}) | rpl::flatten_latest();
 }
 
@@ -116,7 +124,7 @@ struct ResolvedPaper {
 
 		consumer.put_next_copy(rpl::empty);
 		style::PaletteChanged(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			if (state->scheduled) {
 				return;
 			}
@@ -232,7 +240,7 @@ AbstractSectionWidget::AbstractSectionWidget(
 				theme->repaintBackgroundRequests()
 			);
 		}) | rpl::flatten_latest();
-	}) | rpl::flatten_latest() | rpl::start_with_next([=] {
+	}) | rpl::flatten_latest() | rpl::on_next([=] {
 		update();
 	}, lifetime());
 }
@@ -241,6 +249,14 @@ Main::Session &AbstractSectionWidget::session() const {
 	return _controller->session();
 }
 
+SendMenu::Details AbstractSectionWidget::sendMenuDetails() const {
+	return {};
+}
+
+bool AbstractSectionWidget::processChosenSticker(ChatHelpers::FileChosen &&) {
+	return false;
+}
+
 SectionWidget::SectionWidget(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
@@ -264,7 +280,7 @@ void SectionWidget::setGeometryWithTopMoved(
 	_topDelta = topDelta;
 	bool willBeResized = (size() != newGeometry.size());
 	if (geometry() != newGeometry) {
-		auto weak = Ui::MakeWeak(this);
+		auto weak = base::make_weak(this);
 		setGeometry(newGeometry);
 		if (!weak) {
 			return;
@@ -279,6 +295,7 @@ void SectionWidget::setGeometryWithTopMoved(
 void SectionWidget::showAnimated(
 		SlideDirection direction,
 		const SectionSlideParams &params) {
+	validateSubsectionTabs();
 	if (_showAnimation) {
 		return;
 	}
@@ -309,6 +326,7 @@ std::shared_ptr<SectionMemento> SectionWidget::createMemento() {
 }
 
 void SectionWidget::showFast() {
+	validateSubsectionTabs();
 	show();
 	showFinished();
 }
@@ -323,12 +341,33 @@ void SectionWidget::PaintBackground(
 		not_null<Ui::ChatTheme*> theme,
 		not_null<QWidget*> widget,
 		QRect clip) {
+	if (const auto id = theme->background().giftId) {
+		const auto fillHeight = controller->content()->height();
+		const auto fill = QSize(widget->width(), fillHeight);
+		const auto &state = theme->backgroundState(fill);
+		const auto make = [&] {
+			return MakeWrappedEmoji<Ui::Text::LimitedLoopsEmoji>(
+				controller->session().data().customEmojiManager().create(
+					id,
+					crl::guard(widget, [=] { widget->update(); }),
+					Data::CustomEmojiSizeTag::Isolated),
+				1);
+		};
+		if (!state.was.gift) {
+			state.was.gift = make();
+		}
+		if (!state.now.gift) {
+			state.now.gift = make();
+		}
+	}
+
 	PaintBackground(
 		theme,
 		widget,
 		controller->content()->height(),
 		controller->content()->backgroundFromY(),
-		clip);
+		clip,
+		controller->isGifPausedAtLeastFor(GifPauseReason::Any));
 }
 
 void SectionWidget::PaintBackground(
@@ -336,37 +375,68 @@ void SectionWidget::PaintBackground(
 		not_null<QWidget*> widget,
 		int fillHeight,
 		int fromy,
-		QRect clip) {
+		QRect clip,
+		bool paused) {
 	auto p = QPainter(widget);
 	if (fromy) {
 		p.translate(0, fromy);
 		clip = clip.translated(0, -fromy);
 	}
-	PaintBackground(p, theme, QSize(widget->width(), fillHeight), clip);
+	const auto fill = QSize(widget->width(), fillHeight);
+	PaintBackground(p, theme, fill, clip, paused);
 }
 
 void SectionWidget::PaintBackground(
 		QPainter &p,
 		not_null<Ui::ChatTheme*> theme,
 		QSize fill,
-		QRect clip) {
+		QRect clip,
+		bool paused) {
 	const auto &background = theme->background();
 	if (background.colorForFill) {
 		p.fillRect(clip, *background.colorForFill);
 		return;
 	}
 	const auto &gradient = background.gradientForFill;
-	auto state = theme->backgroundState(fill);
+	const auto &state = theme->backgroundState(fill);
 	const auto paintCache = [&](const Ui::CachedBackground &cache) {
 		const auto to = QRect(
 			QPoint(cache.x, cache.y),
 			cache.pixmap.size() / style::DevicePixelRatio());
+		const auto paintGift = [&](QRect area) {
+			if (!cache.gift) {
+				return;
+			}
+			auto hq = PainterHighQualityEnabler(p);
+			const auto center = area.center();
+			const auto size = Data::FrameSizeFromTag(
+				Data::CustomEmojiSizeTag::Isolated
+			) / style::DevicePixelRatio();
+			p.save();
+			p.translate(center);
+			p.rotate(cache.giftRotation);
+			p.translate(-center);
+			p.setOpacity(0.5);
+			cache.gift->paint(p, {
+				.textColor = st::windowFg->c,
+				.size = QSize(size, size),
+				.now = crl::now(),
+				.scale = (area.width() / float64(size)),
+				.position = area.topLeft(),
+				.paused = paused,
+				.scaled = true,
+			});
+			p.restore();
+		};
 		if (cache.waitingForNegativePattern) {
 			// While we wait for pattern being loaded we paint just gradient.
 			// But in case of negative patter opacity we just fill-black.
 			p.fillRect(to, Qt::black);
 		} else if (cache.area == fill) {
 			p.drawPixmap(to, cache.pixmap);
+			if (background.giftId && !cache.giftArea.isEmpty()) {
+				paintGift(cache.giftArea.translated(to.topLeft()));
+			}
 		} else {
 			const auto sx = fill.width() / float64(cache.area.width());
 			const auto sy = fill.height() / float64(cache.area.height());
@@ -382,6 +452,13 @@ void SectionWidget::PaintBackground(
 				round((to.x() + to.width()) * sx) - sto.x(),
 				round((to.y() + to.height()) * sy) - sto.y(),
 				cache.pixmap);
+			if (background.giftId && !cache.giftArea.isEmpty()) {
+				paintGift(QRect(
+					(to.x() + cache.giftArea.x()) * sx,
+					(to.y() + cache.giftArea.y()) * sy,
+					cache.giftArea.width() * sx,
+					cache.giftArea.height() * sy));
+			}
 		}
 	};
 	const auto hasNow = !state.now.pixmap.isNull();
@@ -505,7 +582,7 @@ auto ChatThemeValueFromPeer(
 			std::shared_ptr<Ui::ChatTheme> &&cloud,
 			PeerThemeOverride &&overriden) {
 		return (overriden.peer == peer.get()
-			&& Ui::Emoji::Find(peer->themeEmoji()) != overriden.emoji)
+			&& peer->themeToken() != overriden.token)
 			? std::move(overriden.theme)
 			: std::move(cloud);
 	});
@@ -528,6 +605,15 @@ bool ShowSendPremiumError(
 	return true;
 }
 
+void ShowReactRestrictionToast(not_null<SessionController*> controller) {
+	controller->showToast({
+		.text = { tr::lng_restricted_send_reactions_click(tr::now) },
+		.iconLottie = u"ban"_q,
+		.iconLottieSize = st::pollToastIconSize,
+		.duration = kReactionRestrictionToastDuration,
+	});
+}
+
 bool ShowReactPremiumError(
 		not_null<SessionController*> controller,
 		not_null<HistoryItem*> item,
@@ -538,8 +624,14 @@ bool ShowReactPremiumError(
 		}
 		ShowPremiumPreviewBox(controller, PremiumFeature::TagsForMessages);
 		return true;
+	} else if (!item->canReact()) {
+		ShowReactRestrictionToast(controller);
+		return true;
 	} else if (controller->session().premium()
-		|| ranges::contains(item->chosenReactions(), id)
+		|| ranges::contains(
+			item->reactions(),
+			id,
+			&Data::MessageReaction::id)
 		|| item->history()->peer->isBroadcast()) {
 		return false;
 	} else if (!id.custom()) {
diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h
index c428c4d0f3778e..862ae3c9b3b18b 100644
--- a/Telegram/SourceFiles/window/section_widget.h
+++ b/Telegram/SourceFiles/window/section_widget.h
@@ -17,9 +17,14 @@ For license and copyright information please follow this link:
 class PeerData;
 
 namespace ChatHelpers {
+struct FileChosen;
 class Show;
 } // namespace ChatHelpers
 
+namespace SendMenu {
+struct Details;
+} // namespace SendMenu
+
 namespace Data {
 struct ReactionId;
 class ForumTopic;
@@ -72,6 +77,8 @@ class AbstractSectionWidget
 	virtual bool returnTabbedSelector() {
 		return false;
 	}
+	[[nodiscard]] virtual SendMenu::Details sendMenuDetails() const;
+	virtual bool processChosenSticker(ChatHelpers::FileChosen &&chosen);
 
 private:
 	const not_null<SessionController*> _controller;
@@ -138,6 +145,9 @@ class SectionWidget : public AbstractSectionWidget {
 	virtual bool showInternal(
 		not_null<SectionMemento*> memento,
 		const SectionShow &params) = 0;
+	virtual bool showBackInternal() {
+		return false;
+	}
 	virtual bool sameTypeAs(not_null<SectionMemento*> memento) {
 		return false;
 	}
@@ -148,7 +158,10 @@ class SectionWidget : public AbstractSectionWidget {
 			MsgId messageId) {
 		return false;
 	}
-	virtual bool searchInChatEmbedded(Dialogs::Key chat, QString query) {
+	virtual bool searchInChatEmbedded(
+			QString query,
+			Dialogs::Key chat,
+			PeerData *searchFrom = nullptr) {
 		return false;
 	}
 
@@ -191,6 +204,9 @@ class SectionWidget : public AbstractSectionWidget {
 		return nullptr;
 	}
 
+	virtual void validateSubsectionTabs() {
+	}
+
 	static void PaintBackground(
 		not_null<SessionController*> controller,
 		not_null<Ui::ChatTheme*> theme,
@@ -201,12 +217,14 @@ class SectionWidget : public AbstractSectionWidget {
 		not_null<QWidget*> widget,
 		int fillHeight,
 		int fromy,
-		QRect clip);
+		QRect clip,
+		bool paused = false);
 	static void PaintBackground(
 		QPainter &p,
 		not_null<Ui::ChatTheme*> theme,
 		QSize fill,
-		QRect clip);
+		QRect clip,
+		bool paused = false);
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
diff --git a/Telegram/SourceFiles/window/session/window_session_media.cpp b/Telegram/SourceFiles/window/session/window_session_media.cpp
new file mode 100644
index 00000000000000..dbb6cc43fbeb31
--- /dev/null
+++ b/Telegram/SourceFiles/window/session/window_session_media.cpp
@@ -0,0 +1,148 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "window/window_session_controller.h"
+
+#include "apiwrap.h"
+#include "boxes/send_files_box.h"
+#include "data/data_forum_topic.h"
+#include "data/data_peer.h"
+#include "data/data_saved_sublist.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/view/history_view_draw_to_reply.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "mainwidget.h"
+#include "data/data_session.h"
+#include "data/data_thread.h"
+#include "storage/localimageloader.h"
+#include "storage/storage_media_prepare.h"
+#include "styles/style_boxes.h"
+#include "window/window_separate_id.h"
+
+namespace Window {
+
+void SessionController::handleDrawToReplyRequest(
+		Data::DrawToReplyRequest request) {
+	if (content()->handleDrawToReplyRequest(request)) {
+		return;
+	}
+	auto image = HistoryView::ResolveDrawToReplyImage(
+		&session().data(),
+		request);
+	if (image.isNull()) {
+		return;
+	}
+	HistoryView::OpenDrawToReplyEditor(
+		this,
+		std::move(image),
+		crl::guard(this, [=](QImage &&result) {
+			if (result.isNull()) {
+				return;
+			}
+			const auto thread = resolveDrawToReplyThread(request);
+			if (!thread) {
+				return;
+			}
+			auto list = Storage::PrepareMediaFromImage(
+				std::move(result),
+				QByteArray(),
+				st::sendMediaPreviewSize);
+			showDrawToReplyFilesBox(
+				thread,
+				request.messageId,
+				std::move(list));
+		}));
+}
+
+Data::Thread *SessionController::resolveDrawToReplyThread(
+		const Data::DrawToReplyRequest &request) const {
+	if (const auto item = session().data().message(request.messageId)) {
+		if (const auto topic = item->topic()) {
+			return topic;
+		} else if (const auto sublist = item->savedSublist()) {
+			return sublist;
+		}
+		return item->history();
+	}
+	if (const auto thread = activeChatCurrent().thread()) {
+		if (thread->peer()->id == request.messageId.peer) {
+			return thread;
+		}
+	}
+	if (const auto thread = windowId().thread) {
+		if (thread->peer()->id == request.messageId.peer) {
+			return thread;
+		}
+	}
+	return session().data().historyLoaded(request.messageId.peer);
+}
+
+void SessionController::showDrawToReplyFilesBox(
+		not_null<Data::Thread*> thread,
+		FullMsgId replyTo,
+		Ui::PreparedList &&list) {
+	const auto weak = base::make_weak(thread);
+	const auto peer = thread->peer();
+	const auto show = uiShow();
+	show->show(Box<SendFilesBox>(SendFilesBoxDescriptor{
+		.show = show,
+		.list = std::move(list),
+		.caption = TextWithTags(),
+		.toPeer = peer,
+		.limits = DefaultLimitsForPeer(peer),
+		.check = DefaultCheckForPeer(show, peer),
+		.sendType = Api::SendType::Normal,
+		.confirmed = crl::guard(this, [=](
+				std::shared_ptr<Ui::PreparedBundle> bundle,
+				Api::SendOptions options,
+				FullReplyTo currentReplyTo) {
+			if (const auto thread = weak.get()) {
+				sendDrawToReplyFiles(
+					thread,
+					currentReplyTo.messageId,
+					std::move(bundle),
+					options);
+			}
+		}),
+	}));
+}
+
+void SessionController::sendDrawToReplyFiles(
+		not_null<Data::Thread*> thread,
+		FullMsgId replyTo,
+		std::shared_ptr<Ui::PreparedBundle> bundle,
+		Api::SendOptions options) {
+	if (!bundle) {
+		return;
+	}
+	const auto type = bundle->way.sendImagesAsPhotos()
+		? SendMediaType::Photo
+		: SendMediaType::File;
+	auto action = Api::SendAction(thread, options);
+	action.clearDraft = false;
+	action.replyTo = {
+		.messageId = replyTo,
+		.topicRootId = thread->topicRootId(),
+		.monoforumPeerId = thread->monoforumPeerId(),
+	};
+	auto &api = session().api();
+	auto sent = false;
+	for (auto &group : bundle->groups) {
+		const auto album = (group.type != Ui::AlbumType::None)
+			? std::make_shared<SendingAlbum>()
+			: nullptr;
+		api.sendFiles(std::move(group.list), type, album, action);
+		sent = true;
+	}
+	if (sent) {
+		showToast(tr::lng_stories_reply_sent(tr::now));
+	}
+}
+
+} // namespace Window
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index 899534d9e78a17..f6d7d8ace04dba 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -74,7 +74,8 @@ inline bool AreTestingTheme() {
 	return Ui::ReadBackgroundImage(
 		u":/gui/art/background.tgv"_q,
 		QByteArray(),
-		true);
+		true
+	).image;
 }
 
 [[nodiscard]] bool GoodImageFormatAndSize(const QImage &image) {
@@ -494,7 +495,11 @@ void ChatBackground::setThemeData(QImage &&themeImage, bool themeTile) {
 void ChatBackground::initialRead() {
 	if (started()) {
 		return;
-	} else if (!Local::readBackground()) {
+	}
+	if (_themeObject.pathAbsolute.isEmpty() && !nightMode()) {
+		applyDefaultThemeAccentColorizer();
+	}
+	if (!Local::readBackground()) {
 		set(Data::ThemeWallPaper());
 	}
 	if (_localStoredTileDayValue) {
@@ -509,7 +514,7 @@ void ChatBackground::start() {
 	saveAdjustableColors();
 
 	_updates.events(
-	) | rpl::start_with_next([=](const BackgroundUpdate &update) {
+	) | rpl::on_next([=](const BackgroundUpdate &update) {
 		refreshThemeWatcher();
 		if (update.paletteChanged()) {
 			style::NotifyPaletteChanged();
@@ -521,33 +526,68 @@ void ChatBackground::start() {
 	Core::App().domain().activeSessionValue(
 	) | rpl::filter([=](Main::Session *session) {
 		return session != _session;
-	}) | rpl::start_with_next([=](Main::Session *session) {
+	}) | rpl::on_next([=](Main::Session *session) {
 		_session = session;
 		checkUploadWallPaper();
 	}, _lifetime);
 
+	rpl::combine(
 #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+		rpl::single(
+			QGuiApplication::styleHints()->colorScheme()
+		) | rpl::then(
+			base::qt_signal_producer(
+				QGuiApplication::styleHints(),
+				&QStyleHints::colorSchemeChanged
+			)
+		),
+#endif // Qt >= 6.5.0
+		rpl::single(
+			QGuiApplication::palette()
+		) | rpl::then(
+			base::qt_signal_producer(
+				qApp,
+				&QGuiApplication::paletteChanged
+			)
+		)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+	) | rpl::map([](Qt::ColorScheme colorScheme, const QPalette &palette) {
+		return colorScheme != Qt::ColorScheme::Unknown
+			? colorScheme == Qt::ColorScheme::Dark
+#else // Qt >= 6.5.0
+	) | rpl::map([](const QPalette &palette) {
+		const auto dark = Platform::IsDarkMode();
+		return dark
+			? *dark
+#endif // Qt < 6.5.0
+			: palette.windowText().color().lightness()
+				> palette.window().color().lightness();
+	}) | rpl::distinct_until_changed(
+	) | rpl::on_next([](bool dark) {
+		Core::App().settings().setSystemDarkMode(dark);
+	}, _lifetime);
+
 	rpl::single(
-		QGuiApplication::styleHints()->colorScheme()
-	) | rpl::filter(
-		rpl::mappers::_1 != Qt::ColorScheme::Unknown
+		QGuiApplication::palette()
 	) | rpl::then(
 		base::qt_signal_producer(
-			QGuiApplication::styleHints(),
-			&QStyleHints::colorSchemeChanged
+			qApp,
+			&QGuiApplication::paletteChanged
 		)
-	) | rpl::map([](Qt::ColorScheme colorScheme) {
-		return colorScheme == Qt::ColorScheme::Unknown
-			? std::nullopt
-			: std::make_optional(colorScheme == Qt::ColorScheme::Dark);
-	}) | rpl::start_with_next([](std::optional<bool> dark) {
-		Core::App().settings().setSystemDarkMode(dark);
+	) | rpl::on_next([=] {
+		const auto &settings = Core::App().settings();
+		if (!settings.systemAccentColorEnabled()
+			|| _themeObject.cloud.id
+			|| editingTheme()) {
+			return;
+		}
+		const auto path = _themeObject.pathAbsolute;
+		if (!IsEmbeddedTheme(path)) {
+			return;
+		}
+		ApplyDefaultWithPath(path);
+		KeepApplied();
 	}, _lifetime);
-#else // Qt >= 6.5.0
-	if (const auto dark = Platform::IsDarkMode()) {
-		Core::App().settings().setSystemDarkMode(dark);
-	}
-#endif // Qt < 6.5.0
 }
 
 void ChatBackground::refreshThemeWatcher() {
@@ -598,7 +638,7 @@ void ChatBackground::checkUploadWallPaper() {
 		return;
 	}
 	_wallPaperUploadLifetime = _session->uploader().documentReady(
-	) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
+	) | rpl::on_next([=](const Storage::UploadedMedia &data) {
 		if (data.fullId != _wallPaperUploadId) {
 			return;
 		}
@@ -1050,8 +1090,7 @@ void ChatBackground::setTestingTheme(Instance &&theme) {
 }
 
 void ChatBackground::setTestingDefaultTheme() {
-	style::main_palette::reset(ColorizerForTheme(QString()));
-	saveAdjustableColors();
+	applyDefaultThemeAccentColorizer();
 
 	saveForRevert();
 	set(Data::details::TestingDefaultWallPaper());
@@ -1059,6 +1098,11 @@ void ChatBackground::setTestingDefaultTheme() {
 	_updates.fire({ BackgroundUpdate::Type::TestingTheme, tile() });
 }
 
+void ChatBackground::applyDefaultThemeAccentColorizer() {
+	style::main_palette::reset(ColorizerForTheme(QString()));
+	saveAdjustableColors();
+}
+
 void ChatBackground::keepApplied(const Object &object, bool write) {
 	setThemeObject(object);
 	if (Data::details::IsTestingEditorWallPaper(_paper)) {
@@ -1539,7 +1583,8 @@ bool ReadPaletteValues(const QByteArray &content, Fn<bool(QLatin1String name, QL
 			mix(bg.blue(), shadow.blue()))));
 	}
 	return {
-		.opaqueBg = st::windowBg->c,
+		.bodyBg = st::windowBg->c,
+		.titleBg = QColor(0, 0, 0, 0),
 		.scrollBg = st::scrollBg->c,
 		.scrollBgOver = st::scrollBgOver->c,
 		.scrollBarBg = st::scrollBarBg->c,
@@ -1634,7 +1679,7 @@ std::unique_ptr<Ui::ChatTheme> DefaultChatThemeOn(rpl::lifetime &lifetime) {
 
 	push();
 	Background()->updates(
-	) | rpl::start_with_next([=](const BackgroundUpdate &update) {
+	) | rpl::on_next([=](const BackgroundUpdate &update) {
 		if (update.type == BackgroundUpdate::Type::New
 			|| update.type == BackgroundUpdate::Type::Changed) {
 			push();
diff --git a/Telegram/SourceFiles/window/themes/window_theme.h b/Telegram/SourceFiles/window/themes/window_theme.h
index b0497fb0ccaa61..5485033d0b1332 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.h
+++ b/Telegram/SourceFiles/window/themes/window_theme.h
@@ -229,6 +229,7 @@ class ChatBackground final {
 	void setPaper(const Data::WallPaper &paper);
 
 	[[nodiscard]] bool adjustPaletteRequired();
+	void applyDefaultThemeAccentColorizer();
 	void adjustPaletteUsingBackground(const QImage &image);
 	void adjustPaletteUsingColors(const std::vector<QColor> &colors);
 	void adjustPaletteUsingColor(QColor color);
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
index e7baf9c612d420..beb665f224b359 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
@@ -401,25 +401,25 @@ Editor::Inner::Inner(QWidget *parent, const QString &path)
 	resize(st::windowMinWidth, st::windowMinHeight);
 
 	_context.resized.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		resizeToWidth(width());
 	}, lifetime());
 
 	using Context = EditorBlock::Context;
 	_context.pending.events(
-	) | rpl::start_with_next([=](const Context::EditionData &data) {
+	) | rpl::on_next([=](const Context::EditionData &data) {
 		applyEditing(data.name, data.copyOf, data.value);
 	}, lifetime());
 
 	_context.updated.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_context.name.isEmpty() && _focusCallback) {
 			_focusCallback();
 		}
 	}, lifetime());
 
 	_context.scroll.events(
-	) | rpl::start_with_next([=](const Context::ScrollData &data) {
+	) | rpl::on_next([=](const Context::ScrollData &data) {
 		if (_scrollCallback) {
 			auto top = (data.type == EditorBlock::Type::Existing
 				? _existingRows
@@ -430,7 +430,7 @@ Editor::Inner::Inner(QWidget *parent, const QString &path)
 	}, lifetime());
 
 	Background()->updates(
-	) | rpl::start_with_next([=](const BackgroundUpdate &update) {
+	) | rpl::on_next([=](const BackgroundUpdate &update) {
 		if (_applyingUpdate || !Background()->editingTheme()) {
 			return;
 		}
@@ -725,7 +725,7 @@ void Editor::showMenu() {
 	_menu = base::make_unique_q<Ui::DropdownMenu>(
 		this,
 		st::dropdownMenuWithIcons);
-	_menu->setHiddenCallback([weak = Ui::MakeWeak(this), menu = _menu.get()]{
+	_menu->setHiddenCallback([weak = base::make_weak(this), menu = _menu.get()]{
 		menu->deleteLater();
 		if (weak && weak->_menu == menu) {
 			weak->_menu = nullptr;
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.h b/Telegram/SourceFiles/window/themes/window_theme_editor.h
index c875e79dbdb167..4d1a03f4b85534 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor.h
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor.h
@@ -47,7 +47,7 @@ struct ParsedTheme {
 [[nodiscard]] Data::CloudTheme ReadCloudFromText(const QByteArray &text);
 [[nodiscard]] QByteArray StripCloudTextFields(const QByteArray &text);
 
-class Editor : public TWidget {
+class Editor : public Ui::RpWidget {
 public:
 	Editor(
 		QWidget*,
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
index cd5b5d84e40fb6..9312c90bae4e35 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
@@ -178,7 +178,7 @@ EditorBlock::EditorBlock(QWidget *parent, Type type, Context *context)
 	setMouseTracking(true);
 
 	_context->updated.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_mouseSelection) {
 			_lastGlobalPos = QCursor::pos();
 			updateSelected(mapFromGlobal(_lastGlobalPos));
@@ -188,7 +188,7 @@ EditorBlock::EditorBlock(QWidget *parent, Type type, Context *context)
 
 	if (_type == Type::Existing) {
 		_context->appended.events(
-		) | rpl::start_with_next([=](const Context::AppendData &added) {
+		) | rpl::on_next([=](const Context::AppendData &added) {
 			auto name = added.name;
 			auto value = added.value;
 			feed(name, value);
@@ -208,7 +208,7 @@ EditorBlock::EditorBlock(QWidget *parent, Type type, Context *context)
 		}, lifetime());
 	} else {
 		_context->changed.events(
-		) | rpl::start_with_next([=](const Context::ChangeData &data) {
+		) | rpl::on_next([=](const Context::ChangeData &data) {
 			checkCopiesChanged(0, data.names, data.value);
 		}, lifetime());
 	}
@@ -335,18 +335,18 @@ void EditorBlock::activateRow(const Row &row) {
 				saveEditing(editor->color());
 			});
 			box->boxClosing(
-			) | rpl::start_with_next(crl::guard(this, [=] {
+			) | rpl::on_next(crl::guard(this, [=] {
 				cancelEditing();
 			}), state->cancelLifetime);
 			editor->submitRequests(
-			) | rpl::start_with_next(save, editor->lifetime());
+			) | rpl::on_next(save, editor->lifetime());
 
 			box->setFocusCallback([=] {
 				editor->setInnerFocus();
 			});
 			box->addButton(tr::lng_settings_save(), save);
 			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
-			box->setTitle(rpl::single(name));
+			box->setTitle(name);
 			box->setWidth(editor->width());
 
 			_context->colorEditor.box = box;
@@ -637,7 +637,10 @@ void EditorBlock::checkCopiesChanged(int startIndex, QStringList names, QColor v
 }
 
 void EditorBlock::cancelEditing() {
-	if (_editing >= 0) {
+	// The only place we need to check for _editing < _data.size(),
+	// because we could remove the row that was edited in New block,
+	// and it could be the last row, making _editing inconsistent.
+	if (_editing >= 0 && _editing < _data.size()) {
 		updateRow(_data[_editing]);
 	}
 	_editing = -1;
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_block.h b/Telegram/SourceFiles/window/themes/window_theme_editor_block.h
index 3b3f256afea83d..b41e479c50f069 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_block.h
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_block.h
@@ -26,8 +26,8 @@ class EditorBlock final : public Ui::RpWidget {
 	};
 	struct Context {
 		struct {
-			QPointer<Ui::BoxContent> box;
-			QPointer<ColorEditor> editor;
+			base::weak_qptr<Ui::BoxContent> box;
+			base::weak_qptr<ColorEditor> editor;
 		} colorEditor;
 		QString name;
 		QString possibleCopyOf;
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
index c430b3e282d420..3c050bd5b68a3f 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp
@@ -563,7 +563,7 @@ Fn<void()> SavePreparedTheme(
 		session->uploader().documentReady(
 		) | rpl::filter([=](const UploadedMedia &data) {
 			return (data.fullId == state->id) && data.info.thumb.has_value();
-		}) | rpl::start_with_next([=](const UploadedMedia &data) {
+		}) | rpl::on_next([=](const UploadedMedia &data) {
 			uploadTheme(data);
 		}, state->lifetime);
 
@@ -665,8 +665,8 @@ void CreateForExistingBox(
 	const auto amCreator = window->account().sessionExists()
 		&& (window->account().session().userId() == cloud.createdBy);
 	box->setTitle(amCreator
-		? (rpl::single(cloud.title) | Ui::Text::ToWithEntities())
-		: tr::lng_theme_editor_create_title(Ui::Text::WithEntities));
+		? (rpl::single(cloud.title) | rpl::map(tr::marked))
+		: tr::lng_theme_editor_create_title(tr::marked));
 
 	box->addRow(object_ptr<Ui::FlatLabel>(
 		box,
@@ -790,7 +790,7 @@ void SaveThemeBox(
 		? GenerateName(collected.accent)
 		: cloud.title;
 
-	box->setTitle(tr::lng_theme_editor_save_title(Ui::Text::WithEntities));
+	box->setTitle(tr::lng_theme_editor_save_title(tr::marked));
 
 	const auto name = box->addRow(object_ptr<Ui::InputField>(
 		box,
@@ -811,12 +811,12 @@ void SaveThemeBox(
 		cloud.slug.isEmpty() ? GenerateSlug() : cloud.slug,
 		window->account().session().createInternalLink(QString()));
 	linkWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		link->resize(width, link->height());
 		link->moveToLeft(0, 0, width);
 	}, link->lifetime());
 	link->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		linkWrap->resize(linkWrap->width(), height);
 	}, link->lifetime());
 	link->setLinkPlaceholder(
diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
index 42f1abb3c2f058..0130e318a07ccb 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
@@ -9,6 +9,7 @@ For license and copyright information please follow this link:
 
 #include "dialogs/dialogs_three_state_icon.h"
 #include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
 #include "platform/platform_window_title.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
@@ -468,7 +469,8 @@ void Generator::paintHistoryBackground() {
 			background = Ui::ReadBackgroundImage(
 				u":/gui/art/background.tgv"_q,
 				QByteArray(),
-				true);
+				true
+			).image;
 			const auto paper = Data::DefaultWallPaper();
 			background = Ui::PreparePatternImage(
 				std::move(background),
@@ -564,7 +566,13 @@ void Generator::paintComposeArea() {
 		: st::historyAttach.iconPosition.y();
 	st::historyAttach.icon[_palette].paint(*_p, _composeArea.x() + attachIconLeft, controlsTop + attachIconTop, _rect.width());
 	auto right = st::historySendRight + st::historySendSize.width();
-	st::historyRecordVoice[_palette].paintInCenter(*_p, QRect(_composeArea.x() + _composeArea.width() - right, controlsTop, st::historySendSize.width(), st::historySendSize.height()));
+
+	const auto recordIcon = Lottie::MakeIcon({
+		.path = u":/animations/chat/voice_to_video.tgs"_q,
+		.sizeOverride = st::historySend.recordSize,
+		.colorizeUsingAlpha = true,
+	});
+	recordIcon->paintInCenter(*_p, QRect(_composeArea.x() + _composeArea.width() - right, controlsTop, st::historySendSize.width(), st::historySendSize.height()), st::historyRecordVoiceFg[_palette]->c);
 
 	const auto &emojiButton = st::historyAttachEmoji.inner;
 	const auto emojiIconLeft = (emojiButton.iconPosition.x() < 0)
diff --git a/Telegram/SourceFiles/window/themes/window_theme_warning.cpp b/Telegram/SourceFiles/window/themes/window_theme_warning.cpp
index 8323de02d3dc30..4de7a3b8c8300b 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_warning.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_warning.cpp
@@ -26,15 +26,12 @@ constexpr int kWaitBeforeRevertMs = 15999;
 } // namespace
 
 WarningWidget::WarningWidget(QWidget *parent)
-: TWidget(parent)
+: RpWidget(parent)
 , _timer([=] { handleTimer(); })
 , _secondsLeft(kWaitBeforeRevertMs / 1000)
 , _keepChanges(this, tr::lng_theme_keep_changes(), st::defaultBoxButton)
 , _revert(this, tr::lng_theme_revert(), st::defaultBoxButton) {
-	using TextTransform = Ui::RoundButton::TextTransform;
-	_keepChanges->setTextTransform(TextTransform::NoTransform);
 	_keepChanges->setClickedCallback([] { KeepApplied(); });
-	_revert->setTextTransform(TextTransform::NoTransform);
 	_revert->setClickedCallback([] { Revert(); });
 	updateText();
 }
diff --git a/Telegram/SourceFiles/window/themes/window_theme_warning.h b/Telegram/SourceFiles/window/themes/window_theme_warning.h
index ec35c349658bce..80b47bc0580221 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_warning.h
+++ b/Telegram/SourceFiles/window/themes/window_theme_warning.h
@@ -19,7 +19,7 @@ class RoundButton;
 namespace Window {
 namespace Theme {
 
-class WarningWidget : public TWidget {
+class WarningWidget : public Ui::RpWidget {
 public:
 	WarningWidget(QWidget *parent);
 
diff --git a/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp b/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
index 0971a1aef36d36..94de939669219f 100644
--- a/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
+++ b/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
@@ -30,6 +30,7 @@ For license and copyright information please follow this link:
 #include "styles/style_settings.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
 
 #include <QtGui/QGuiApplication>
@@ -357,12 +358,12 @@ void CloudList::setup() {
 		allShown()
 	) | rpl::map([=] {
 		return collectAll();
-	}) | rpl::start_with_next([=](std::vector<Data::CloudTheme> &&list) {
+	}) | rpl::on_next([=](std::vector<Data::CloudTheme> &&list) {
 		rebuildUsing(std::move(list));
 	}, _outer->lifetime());
 
 	_outer->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		updateGeometry();
 	}, _outer->lifetime());
 }
@@ -594,8 +595,11 @@ void CloudList::showMenu(Element &element) {
 		_contextMenu->addAction(tr::lng_theme_share(tr::now), [=] {
 			QGuiApplication::clipboard()->setText(
 				_window->session().createInternalLinkFull("addtheme/" + slug));
-			_window->window().showToast(
-				tr::lng_background_link_copied(tr::now));
+			_window->window().showToast({
+				.text = { tr::lng_background_link_copied(tr::now) },
+				.iconLottie = u"toast/voip_invite"_q,
+				.iconLottieSize = st::toastLottieIconSize,
+			});
 		}, &st::menuIconShare);
 	}
 	if (cloud.documentId
@@ -673,7 +677,7 @@ void CloudList::subscribeToDownloadFinished() {
 		return;
 	}
 	_window->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto &&waiting = _elements | ranges::views::filter(&Element::waiting);
 		const auto still = ranges::count_if(waiting, [&](Element &element) {
 			if (!element.media) {
diff --git a/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp b/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp
index 541534662d5c12..fa23ca23174df1 100644
--- a/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp
+++ b/Telegram/SourceFiles/window/themes/window_themes_embedded.cpp
@@ -7,12 +7,16 @@ For license and copyright information please follow this link:
 */
 #include "window/themes/window_themes_embedded.h"
 
-#include "window/themes/window_theme.h"
+#include "base/platform/base_platform_info.h"
 #include "lang/lang_keys.h"
 #include "storage/serialize_common.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "ui/style/style_palette_colorizer.h"
+#include "window/themes/window_theme.h"
+
+#include <QtGui/QGuiApplication>
+#include <QtGui/QPalette>
 
 namespace Window {
 namespace Theme {
@@ -175,6 +179,16 @@ style::colorizer ColorizerFrom(
 	return result;
 }
 
+std::optional<QColor> SystemAccentColor() {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+	if (Platform::IsWindows() && Platform::IsWindows8OrGreater()) {
+		return std::nullopt;
+	}
+#endif // Qt < 6.0.0
+	const auto accent = QPalette().color(QPalette::Highlight);
+	return accent.isValid() ? std::make_optional(accent) : std::nullopt;
+}
+
 style::colorizer ColorizerForTheme(const QString &absolutePath) {
 	if (!IsEmbeddedTheme(absolutePath)) {
 		return {};
@@ -187,7 +201,13 @@ style::colorizer ColorizerForTheme(const QString &absolutePath) {
 	if (i == end(schemes)) {
 		return {};
 	}
-	const auto &colors = Core::App().settings().themesAccentColors();
+	const auto &settings = Core::App().settings();
+	if (settings.systemAccentColorEnabled()) {
+		if (const auto accent = SystemAccentColor()) {
+			return ColorizerFrom(*i, *accent);
+		}
+	}
+	const auto &colors = settings.themesAccentColors();
 	if (const auto accent = colors.get(i->type)) {
 		return ColorizerFrom(*i, *accent);
 	}
diff --git a/Telegram/SourceFiles/window/themes/window_themes_embedded.h b/Telegram/SourceFiles/window/themes/window_themes_embedded.h
index cbef706e096b1c..fd0a9ba6f66952 100644
--- a/Telegram/SourceFiles/window/themes/window_themes_embedded.h
+++ b/Telegram/SourceFiles/window/themes/window_themes_embedded.h
@@ -50,6 +50,7 @@ class AccentColors final {
 [[nodiscard]] style::colorizer ColorizerFrom(
 	const EmbeddedScheme &scheme,
 	const QColor &color);
+[[nodiscard]] std::optional<QColor> SystemAccentColor();
 [[nodiscard]] style::colorizer ColorizerForTheme(const QString &absolutePath);
 
 void Colorize(
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 37654c990738f1..34b5e9cc3f3293 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -43,9 +43,7 @@ notifyClose: IconButton {
 
 	rippleAreaPosition: point(5px, 5px);
 	rippleAreaSize: 20px;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
+	ripple: defaultRippleAnimationBgOver;
 }
 notifyItemTop: 12px;
 notifyTextLeft: 12px;
@@ -85,7 +83,6 @@ notifySendReply: IconButton {
 notifyFadeRight: icon {{ "fade_horizontal", notificationBg }};
 
 titleUnreadCounterTop: 6px;
-titleUnreadCounterRight: 35px;
 
 mainMenuWidth: 274px;
 mainMenuCoverHeight: 134px;
@@ -210,6 +207,21 @@ windowOutdatedClose: IconButton(defaultIconButton) {
 	iconPosition: point(-1px, -1px);
 }
 
+windowScreenReaderLabel: FlatLabel(defaultFlatLabel) {
+	align: align(left);
+	textFg: activeButtonFg;
+	style: semiboldTextStyle;
+}
+windowScreenReaderPadding: margins(12px, 4px, 4px, 4px);
+windowScreenReaderDisableTextStyle: semiboldTextStyle;
+windowScreenReaderButtonPadding: margins(12px, 0px, 12px, 0px);
+windowScreenReaderButtonHeight: 28px;
+windowScreenReaderButtonBorderWidth: 2px;
+windowScreenReaderButtonRadius: 14px;
+windowScreenReaderButtonRipple: RippleAnimation(defaultRippleAnimation) {
+	color: activeButtonBgRipple;
+}
+
 createThemeImportButton: SettingsButton(defaultSettingsButton) {
 	textFg: lightButtonFg;
 	textFgOver: lightButtonFgOver;
@@ -285,10 +297,13 @@ windowFilterSmallRemove: IconButton(notifyClose) {
 }
 windowFilterSmallRemoveRight: 10px;
 windowFilterNameInput: InputField(defaultInputField) {
-	textMargins: margins(0px, 26px, 36px, 4px);
+	textMargins: margins(0px, 26px, 87px, 4px);
 }
+windowFilterNameEmojiPosition: point(-65px, 22px);
+windowFilterNameCharsLimitRightPosition: point(75px, 27px);
+windowFilterStaticTitlePosition: point(0px, 5px);
 windowFilterIconToggleSize: size(36px, 36px);
-windowFilterIconTogglePosition: point(-4px, 12px);
+windowFilterIconTogglePosition: point(-4px, 18px);
 windwoFilterIconPanelPosition: point(-2px, -1px);
 windowFilterIconSingle: size(44px, 42px);
 windowFilterIconPadding: margins(10px, 36px, 10px, 8px);
@@ -317,15 +332,73 @@ windowArchiveToast: Toast(defaultToast) {
 	maxWidth: boxWideWidth;
 }
 
-ivWidthMin: 380px;
+windowFeeItem: Menu(defaultMenu) {
+	itemPadding: margins(17px, 3px, 17px, 4px);
+	itemRightSkip: 0px;
+	itemStyle: whenReadStyle;
+	itemFgOver: windowFg;
+	itemFgDisabled: windowFg;
+}
+
+ivWidthMin: 384px;
 ivHeightMin: 480px;
 ivWidthDefault: 600px;
 ivHeightDefault: 800px;
 
+maxWidthSharedMediaWindow: 419px;
+
+chatSwitchMargins: margins(16px, 16px, 16px, 16px);
+chatSwitchPadding: margins(12px, 12px, 12px, 12px);
+chatSwitchSize: size(72px, 104px);
+chatSwitchUserpic: UserpicButton(defaultUserpicButton) {
+	size: size(56px, 56px);
+	photoSize: 56px;
+}
+chatSwitchUserpicSublist: UserpicButton(defaultUserpicButton) {
+	size: size(40px, 40px);
+	photoSize: 40px;
+}
+chatSwitchUserpicSmall: UserpicButton(defaultUserpicButton) {
+	size: size(24px, 24px);
+	photoSize: 24px;
+}
+chatSwitchUserpicTop: 8px;
+chatSwitchNameLabel: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(11px);
+	}
+	align: align(top);
+	minWidth: 56px;
+	maxHeight: 36px;
+}
+chatSwitchNameSkip: 6px;
+chatSwitchSelectLine: 3px;
+
+lockSetupEmailLabelMaxWidth: 256px + 24px + 24px;
+lockSetupEmailTitle: FlatLabel(defaultFlatLabel) {
+	minWidth: lockSetupEmailLabelMaxWidth;
+	style: TextStyle(defaultTextStyle) {
+		font: font(19px);
+	}
+}
+lockSetupEmailLabel: FlatLabel(defaultFlatLabel) {
+	minWidth: 256px;
+}
+lockSetupEmailLogOutPosition: point(10px, 10px);
+lockSetupEmailUserpicSmall: UserpicButton(defaultUserpicButton) {
+	size: size(22px, 22px);
+	photoSize: 22px;
+}
+
 // Windows specific
 
 winQuitIcon: icon {{ "win_quit", windowFg }};
 
+windowTaskbarThumbPrevious: icon {{ "player/player_backward", windowFg }};
+windowTaskbarThumbPlay: icon {{ "player/player_play", windowFg }};
+windowTaskbarThumbPause: icon {{ "player/player_pause", windowFg }};
+windowTaskbarThumbNext: icon {{ "player/player_forward", windowFg }};
+
 // Mac specific
 
 macAccessoryWidth: 450.;
diff --git a/Telegram/SourceFiles/window/window_chat_preview.cpp b/Telegram/SourceFiles/window/window_chat_preview.cpp
index 2a9607accbb4cd..c4c9ea9d2e5ec3 100644
--- a/Telegram/SourceFiles/window/window_chat_preview.cpp
+++ b/Telegram/SourceFiles/window/window_chat_preview.cpp
@@ -39,7 +39,7 @@ bool ChatPreviewManager::show(
 	cancelScheduled();
 	_topicLifetime.destroy();
 	if (const auto topic = row.key.topic()) {
-		_topicLifetime = topic->destroyed() | rpl::start_with_next([=] {
+		_topicLifetime = topic->destroyed() | rpl::on_next([=] {
 			_menu = nullptr;
 		});
 	} else if (!row.key) {
@@ -54,12 +54,12 @@ bool ChatPreviewManager::show(
 		return false;
 	}
 	_menu = std::move(preview.menu);
-	const auto weakMenu = Ui::MakeWeak(_menu.get());
+	const auto weakMenu = base::make_weak(_menu.get());
 	const auto weakThread = base::make_weak(row.key.entry()->asThread());
 	const auto weakController = base::make_weak(_controller);
 	std::move(
 		preview.actions
-	) | rpl::start_with_next([=](HistoryView::ChatPreviewAction action) {
+	) | rpl::on_next([=](HistoryView::ChatPreviewAction action) {
 		if (const auto controller = weakController.get()) {
 			if (const auto thread = weakThread.get()) {
 				const auto itemId = action.openItemId;
@@ -82,7 +82,7 @@ bool ChatPreviewManager::show(
 				}
 			}
 		}
-		if (const auto strong = weakMenu.data()) {
+		if (const auto strong = weakMenu.get()) {
 			strong->hideMenu();
 		}
 	}, _menu->lifetime());
@@ -109,7 +109,7 @@ bool ChatPreviewManager::schedule(
 	cancelScheduled();
 	_topicLifetime.destroy();
 	if (const auto topic = row.key.topic()) {
-		_topicLifetime = topic->destroyed() | rpl::start_with_next([=] {
+		_topicLifetime = topic->destroyed() | rpl::on_next([=] {
 			cancelScheduled();
 			_menu = nullptr;
 		});
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.cpp b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
new file mode 100644
index 00000000000000..1ae251a08ca74b
--- /dev/null
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
@@ -0,0 +1,496 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "window/window_chat_switch_process.h"
+
+#include "core/application.h"
+#include "core/shortcuts.h"
+#include "data/components/recent_peers.h"
+#include "data/data_forum_topic.h"
+#include "data/data_peer.h"
+#include "data/data_saved_sublist.h"
+#include "data/data_thread.h"
+#include "info/profile/info_profile_cover.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/painter.h"
+#include "ui/rp_widget.h"
+#include "window/window_separate_id.h"
+#include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+#include "styles/style_window.h"
+
+namespace Window {
+namespace {
+
+class Button final : public Ui::AbstractButton {
+public:
+	Button(
+		QWidget *parent,
+		not_null<Data::Thread*> thread,
+		base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> &userpics);
+
+	[[nodiscard]] rpl::producer<> selectRequests() const;
+
+	void setSelected(
+		bool selected,
+		anim::type animated = anim::type::normal);
+
+private:
+	void setup(
+		not_null<Data::Thread*> thread,
+		base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> &userpics);
+
+	void paintEvent(QPaintEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+
+	rpl::event_stream<> _selectRequests;
+	Ui::Animations::Simple _overAnimation;
+	bool _selected = false;
+
+};
+
+void CloseInWindows(not_null<Data::Thread*> thread) {
+	using WindowPointer = base::weak_ptr<Window::SessionController>;
+	auto closing = std::vector<WindowPointer>();
+	auto clearing = std::vector<WindowPointer>();
+	for (const auto &window : thread->session().windows()) {
+		if (window->windowId().chat() == thread) {
+			closing.push_back(base::make_weak(window));
+		} else if (window->activeChatCurrent().thread() == thread) {
+			clearing.push_back(base::make_weak(window));
+		}
+	}
+	for (const auto &window : closing) {
+		if (const auto strong = window.get()) {
+			Core::App().closeWindow(&strong->window());
+		}
+	}
+	for (const auto &window : clearing) {
+		if (const auto strong = window.get()) {
+			strong->clearSectionStack();
+		}
+	}
+}
+
+Button::Button(
+	QWidget *parent,
+	not_null<Data::Thread*> thread,
+	base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> &userpics)
+: AbstractButton(parent) {
+	setup(thread, userpics);
+}
+
+void Button::setup(
+		not_null<Data::Thread*> thread,
+		base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> &userpics) {
+	resize(st::chatSwitchSize);
+
+	auto userpicSt = &st::chatSwitchUserpic;
+	const auto userpicSize = userpicSt->size;
+	if (const auto topic = thread->asTopic()) {
+		using namespace Info::Profile;
+		const auto userpic = Ui::CreateChild<TopicIconButton>(
+			this,
+			topic,
+			[] { return true; }); // paused
+		userpic->show();
+		userpic->move(
+			((width() - userpic->width()) / 2),
+			st::chatSwitchUserpicTop);
+		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+		userpicSt = &st::chatSwitchUserpicSmall;
+	} else if (const auto sublist = thread->asSublist()) {
+		const auto sublistPeer = sublist->sublistPeer();
+		const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+			this,
+			sublistPeer,
+			st::chatSwitchUserpicSublist);
+		userpic->showMyNotesOnSelf(true);
+		userpic->show();
+		userpic->move(
+			((width() - userpicSize.width()) / 2),
+			st::chatSwitchUserpicTop);
+		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+		userpics.emplace(sublistPeer, sublistPeer->createUserpicView());
+
+		userpicSt = &st::chatSwitchUserpicSmall;
+	}
+	const auto peer = thread->peer();
+	const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+		this,
+		peer,
+		*userpicSt);
+	userpic->showSavedMessagesOnSelf(true);
+	userpic->show();
+	userpic->move(
+		(((width() - userpicSize.width()) / 2)
+			+ (userpicSize.width() - userpicSt->size.width())),
+		(st::chatSwitchUserpicTop
+			+ (userpicSize.height() - userpicSt->size.height())));
+	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+	userpics.emplace(peer, peer->createUserpicView());
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		this,
+		((thread->asHistory() && peer->isSelf())
+			? tr::lng_saved_messages(tr::now)
+			: thread->chatListName()),
+		st::chatSwitchNameLabel);
+	label->setBreakEverywhere(true);
+	label->show();
+	label->resizeToNaturalWidth(
+		width() - 2 * st::chatSwitchNameSkip);
+	label->move(
+		(width() - label->width()) / 2,
+		(height() + userpic->y() + userpic->height() - label->height()) / 2);
+
+	show();
+}
+
+rpl::producer<> Button::selectRequests() const {
+	return _selectRequests.events();
+}
+
+void Button::setSelected(bool selected, anim::type animated) {
+	if (_selected == selected) {
+		if (animated == anim::type::instant) {
+			_overAnimation.stop();
+		}
+		return;
+	}
+	_selected = selected;
+	if (animated == anim::type::instant) {
+		_overAnimation.stop();
+		update();
+	} else {
+		_overAnimation.start(
+			[=] { update(); },
+			selected ? 0. : 1.,
+			selected ? 1. : 0.,
+			st::slideWrapDuration);
+	}
+}
+
+void Button::paintEvent(QPaintEvent *e) {
+	const auto selected = _selected ? 1. : 0.;
+	const auto selection = _overAnimation.value(selected);
+	if (selection <= 0.) {
+		return;
+	}
+
+	auto p = QPainter(this);
+	auto hq = PainterHighQualityEnabler(p);
+	const auto radius = st::boxRadius;
+	const auto line = st::chatSwitchSelectLine;
+	auto pen = st::defaultRoundCheckbox.bgActive->p;
+	pen.setWidthF(line * selection);
+	p.setPen(pen);
+	const auto r = QRectF(rect()).marginsRemoved(
+		{ line / 2., line / 2., line / 2., line / 2. });
+	p.drawRoundedRect(r, radius, radius);
+}
+
+void Button::mouseMoveEvent(QMouseEvent *e) {
+	if (!_selected) {
+		_selectRequests.fire({});
+	}
+}
+
+} // namespace
+
+struct ChatSwitchProcess::Entry {
+	not_null<Data::Thread*> thread;
+	std::unique_ptr<Button> button;
+};
+
+ChatSwitchProcess::ChatSwitchProcess(
+	not_null<Ui::RpWidget*> geometry,
+	not_null<Main::Session*> session,
+	Data::Thread *opened)
+: _session(session)
+, _widget(std::make_unique<Ui::RpWidget>(
+	geometry->parentWidget() ? geometry->parentWidget() : geometry))
+, _view(Ui::CreateChild<Ui::RpWidget>(_widget.get()))
+, _bg(st::boxRadius, st::boxBg) {
+	setupWidget(geometry);
+	setupContent(opened);
+	setupView();
+}
+
+ChatSwitchProcess::~ChatSwitchProcess() {
+	_session->recentPeers().chatOpenKeepUserpics(std::move(_userpics));
+}
+
+rpl::producer<not_null<Data::Thread*>> ChatSwitchProcess::chosen() const {
+	return _chosen.events();
+}
+
+rpl::producer<> ChatSwitchProcess::closeRequests() const {
+	return _closeRequests.events();
+}
+
+void ChatSwitchProcess::process(const Request &request) {
+	Expects(_selected < _shownCount);
+
+	if (request.action == Qt::Key_Escape) {
+		_closeRequests.fire({});
+	} else if (request.action == Qt::Key_Enter) {
+		if (_selected >= 0) {
+			_chosen.fire_copy(_list[_selected]);
+		} else {
+			_closeRequests.fire({});
+		}
+	} else if (request.action == Qt::Key_Tab
+		|| request.action == Qt::Key_Right) {
+		if (_selected < 0 || _selected + 1 >= _shownCount) {
+			setSelected(0);
+		} else {
+			setSelected(_selected + 1);
+		}
+	} else if (request.action == Qt::Key_Backtab
+		|| request.action == Qt::Key_Left) {
+		if (_selected <= 0) {
+			setSelected(_shownCount - 1);
+		} else {
+			setSelected(_selected - 1);
+		}
+	} else if (request.action == Qt::Key_Up) {
+		const auto now = std::max(_selected, 0) - _shownPerRow;
+		const auto bound = (now < 0) ? (_shownCount + now) : now;
+		setSelected(bound);
+	} else if (request.action == Qt::Key_Down) {
+		const auto now = std::max(_selected, 0) + _shownPerRow;
+		const auto bound = (now >= _shownCount) ? (now - _shownCount) : now;
+		setSelected(bound);
+	} else if (request.action == Qt::Key_Q) {
+		if (_selected >= 0) {
+			const auto thread = _list[_selected];
+			thread->session().recentPeers().chatOpenRemove(thread);
+			remove(thread);
+			CloseInWindows(thread);
+		}
+	}
+}
+
+void ChatSwitchProcess::setSelected(int index) {
+	if (_selected == index || _list.size() < 2) {
+		return;
+	}
+	if (_selected >= 0) {
+		_entries[_selected].button->setSelected(false);
+	}
+	_selected = index;
+	if (_selected >= 0) {
+		_entries[_selected].button->setSelected(true);
+	}
+}
+
+void ChatSwitchProcess::setupWidget(not_null<Ui::RpWidget*> geometry) {
+	geometry->geometryValue(
+	) | rpl::on_next([=](QRect value) {
+		const auto parent = geometry->parentWidget();
+		_widget->setGeometry((parent == _widget->parentWidget())
+			? value
+			: QRect(QPoint(), value.size()));
+	}, _widget->lifetime());
+
+	_widget->events() | rpl::on_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::MouseButtonPress) {
+			crl::on_main(_widget.get(), [=] {
+				_closeRequests.fire({});
+			});
+		}
+	}, _widget->lifetime());
+
+	_widget->show();
+}
+
+void ChatSwitchProcess::setupContent(Data::Thread *opened) {
+	_list = _session->recentPeers().collectChatOpenHistory();
+	if (_list.size() < 2) {
+		return;
+	}
+
+	if (opened) {
+		const auto i = ranges::find(_list, not_null(opened));
+		if (i == end(_list)) {
+			_list.insert(begin(_list), opened);
+		} else if (i != begin(_list)) {
+			ranges::rotate(begin(_list), i, i + 1);
+		}
+		_selected = 0;
+	}
+
+	const auto find = [=](Button *button) {
+		return ranges::find(_entries, button, [](const Entry &entry) {
+			return entry.button.get();
+		});
+	};
+	for (const auto &thread : _list) {
+		auto button = std::make_unique<Button>(
+			_view.get(),
+			thread,
+			_userpics);
+		const auto raw = button.get();
+
+		raw->selectRequests() | rpl::on_next([=] {
+			const auto i = find(raw);
+			setSelected(int(i - begin(_entries)));
+		}, raw->lifetime());
+
+		raw->setClickedCallback([=] {
+			_chosen.fire_copy(thread);
+		});
+
+		_entries.push_back({ thread, std::move(button) });
+
+		auto destroyed = thread->asTopic()
+			? thread->asTopic()->destroyed()
+			: thread->asSublist()
+			? thread->asSublist()->destroyed()
+			: nullptr;
+		if (!destroyed) {
+			continue;
+		}
+		std::move(destroyed) | rpl::on_next([=] {
+			remove(thread);
+		}, raw->lifetime());
+	}
+}
+
+void ChatSwitchProcess::remove(not_null<Data::Thread*> thread) {
+	_list.erase(ranges::remove(_list, thread), end(_list));
+
+	const auto i = ranges::find(_entries, thread, &Entry::thread);
+	if (i != end(_entries)) {
+		const auto selected = _selected;
+		const auto index = int(i - begin(_entries));
+		if (_selected > index) {
+			--_selected;
+		} else if (_selected == index) {
+			_selected = -1;
+		}
+
+		_entries.erase(i);
+		const auto weak = base::make_weak(_widget.get());
+		layout(_widget->size());
+		if (weak && _selected < 0 && selected > 0) {
+			if (_entries.empty()) {
+				_closeRequests.fire({});
+			} else {
+				setSelected(std::min(selected - 1, _shownCount - 1));
+			}
+		}
+	}
+}
+
+void ChatSwitchProcess::setupView() {
+	_widget->sizeValue() | rpl::on_next([=](QSize size) {
+		layout(size);
+	}, _view->lifetime());
+	_view->show();
+
+	_view->paintRequest() | rpl::on_next([=](QRect clip) {
+		if (_outer.isEmpty()) {
+			return;
+		}
+		auto p = QPainter(_view);
+		p.translate(-_shadowed.topLeft());
+		Ui::Shadow::paint(p, _outer, _view->width(), st::boxRoundShadow);
+		_bg.paint(p, _outer);
+	}, _view->lifetime());
+
+	_view->events() | rpl::on_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::MouseButtonPress) {
+			e->accept();
+		}
+	}, _view->lifetime());
+}
+
+void ChatSwitchProcess::layout(QSize size) {
+	const auto full = QRect(QPoint(), size);
+	const auto outer = full.marginsRemoved(st::chatSwitchMargins);
+	auto inner = outer.marginsRemoved(st::chatSwitchPadding);
+	const auto available = inner.width();
+	const auto canPerRow = (available / st::chatSwitchSize.width());
+	const auto canRows = (canPerRow > 2 * 7)
+		? 1
+		: (canPerRow > 3 * 4)
+		? 2
+		: 3;
+	if (canPerRow < 1) {
+		return;
+	} else if (_list.size() < 2) {
+		_closeRequests.fire({});
+		return;
+	}
+	const auto count = int(_list.size());
+	_shownRows = std::min(canRows, (count + canPerRow - 1) / canPerRow);
+	_shownPerRow = std::min(count / _shownRows, canPerRow);
+	if (_shownRows > 2) {
+		if (_shownPerRow * 2 > _shownRows * 4) {
+			_shownRows = 2;
+		} else if (_shownPerRow > 4) {
+			_shownPerRow = 4;
+		}
+	}
+	if (_shownRows > 1) {
+		if (_shownPerRow > _shownRows * 7) {
+			_shownRows = 1;
+		} else if (_shownPerRow > 7) {
+			_shownPerRow = 7;
+		}
+	}
+	_shownCount = _shownPerRow * _shownRows;
+	if (_selected >= _shownCount) {
+		_selected = -1;
+	}
+
+	const auto width = _shownPerRow * st::chatSwitchSize.width();
+	const auto height = _shownRows * st::chatSwitchSize.height();
+
+	size = QSize(width, height);
+	_inner = QRect(
+		(full.width() - width) / 2,
+		(full.height() - height) / 2,
+		width,
+		height);
+	_outer = _inner.marginsAdded(st::chatSwitchPadding);
+
+	const auto padding = st::boxRoundShadow.extend + st::chatSwitchPadding;
+
+	auto index = 0;
+	auto top = padding.top();
+	for (auto row = 0; row != _shownRows; ++row) {
+		auto left = padding.left();
+		for (auto column = 0; column != _shownPerRow; ++column) {
+			auto &entry = _entries[index++];
+			entry.button->moveToLeft(left, top, _inner.width());
+			entry.button->show();
+			left += st::chatSwitchSize.width();
+		}
+		top += st::chatSwitchSize.height();
+	}
+	for (auto i = _shownRows * _shownPerRow; i < count; ++i) {
+		_entries[i].button->hide();
+	}
+
+	_shadowed = _outer.marginsAdded(st::boxRoundShadow.extend);
+	_view->setGeometry(_shadowed);
+}
+
+rpl::lifetime &ChatSwitchProcess::lifetime() {
+	return _lifetime;
+}
+
+} // namespace Window
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.h b/Telegram/SourceFiles/window/window_chat_switch_process.h
new file mode 100644
index 00000000000000..9a73c16e168246
--- /dev/null
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.h
@@ -0,0 +1,86 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/round_rect.h"
+#include "ui/userpic_view.h"
+
+namespace Data {
+class Thread;
+} // namespace Data
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Shortcuts {
+struct ChatSwitchRequest;
+} // namespace Shortcuts
+
+namespace Ui {
+class AbstractButton;
+class RpWidget;
+} // namespace Ui
+
+namespace Window {
+
+class ChatSwitchProcess final {
+public:
+	// Create widget in geometry->parentWidget() and geometry->geometry().
+	ChatSwitchProcess(
+		not_null<Ui::RpWidget*> geometry,
+		not_null<Main::Session*> session,
+		Data::Thread *opened);
+	~ChatSwitchProcess();
+
+	[[nodiscard]] rpl::producer<not_null<Data::Thread*>> chosen() const;
+	[[nodiscard]] rpl::producer<> closeRequests() const;
+
+	using Request = Shortcuts::ChatSwitchRequest;
+	void process(const Request &request);
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
+private:
+	struct Entry;
+
+	void setupWidget(not_null<Ui::RpWidget*> geometry);
+	void setupContent(Data::Thread *opened);
+	void setupView();
+
+	void layout(QSize size);
+	void remove(not_null<Data::Thread*> thread);
+
+	void setSelected(int index);
+
+	const not_null<Main::Session*> _session;
+	const std::unique_ptr<Ui::RpWidget> _widget;
+	const not_null<Ui::RpWidget*> _view;
+
+	QRect _shadowed;
+	QRect _outer;
+	QRect _inner;
+	Ui::RoundRect _bg;
+
+	base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> _userpics;
+	std::vector<not_null<Data::Thread*>> _list;
+	std::vector<Entry> _entries;
+
+	int _selected = -1;
+	int _shownRows = 0;
+	int _shownCount = 0;
+	int _shownPerRow = 0;
+
+	rpl::event_stream<not_null<Data::Thread*>> _chosen;
+	rpl::event_stream<> _closeRequests;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Window
diff --git a/Telegram/SourceFiles/window/window_connecting_widget.cpp b/Telegram/SourceFiles/window/window_connecting_widget.cpp
index 9940287fac0eef..ba50aef7f530d0 100644
--- a/Telegram/SourceFiles/window/window_connecting_widget.cpp
+++ b/Telegram/SourceFiles/window/window_connecting_widget.cpp
@@ -91,6 +91,10 @@ class ConnectionState::Widget : public Ui::AbstractButton {
 		not_null<Main::Account*> account,
 		const Layout &layout);
 
+	QAccessible::Role accessibilityRole() override {
+		return QAccessible::Role::StatusBar;
+	}
+
 	void refreshRetryLink(bool hasRetry);
 	void setLayout(const Layout &layout);
 	void setProgressVisibility(bool visible);
@@ -152,7 +156,7 @@ ConnectionState::Widget::ProxyIcon::ProxyIcon(QWidget *parent) : RpWidget(parent
 			st::connectingProxyOn.height()));
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshCacheImages();
 	}, lifetime());
 
@@ -206,6 +210,7 @@ void ConnectionState::Widget::ProxyIcon::paintEvent(QPaintEvent *e) {
 bool ConnectionState::State::operator==(const State &other) const {
 	return (type == other.type)
 		&& (useProxy == other.useProxy)
+		&& (exposed == other.exposed)
 		&& (underCursor == other.underCursor)
 		&& (updateReady == other.updateReady)
 		&& (waitTillRetry == other.waitTillRetry);
@@ -222,7 +227,7 @@ ConnectionState::ConnectionState(
 	rpl::combine(
 		std::move(shown),
 		visibility()
-	) | rpl::start_with_next([=](bool shown, float64 visible) {
+	) | rpl::on_next([=](bool shown, float64 visible) {
 		if (!shown || visible == 0.) {
 			_widget = nullptr;
 		} else if (!_widget) {
@@ -235,7 +240,7 @@ ConnectionState::ConnectionState(
 		rpl::merge(
 			rpl::single(rpl::empty),
 			checker.ready()
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			refreshState();
 		}, _lifetime);
 	}
@@ -243,7 +248,7 @@ ConnectionState::ConnectionState(
 	rpl::combine(
 		Core::App().settings().proxy().connectionTypeValue(),
 		rpl::single(QRect()) | rpl::then(_parent->paintRequest())
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshState();
 	}, _lifetime);
 }
@@ -258,7 +263,7 @@ void ConnectionState::createWidget() {
 		visibility(),
 		_parent->heightValue(),
 		_bottomSkip.value()
-	) | rpl::start_with_next([=](float64 visible, int height, int skip) {
+	) | rpl::on_next([=](float64 visible, int height, int skip) {
 		_widget->moveToLeft(0, anim::interpolate(
 			height - st::connectingMargin.top(),
 			height - _widget->height() - skip,
@@ -266,7 +271,7 @@ void ConnectionState::createWidget() {
 	}, _widget->lifetime());
 
 	_widget->refreshStateRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshState();
 	}, _widget->lifetime());
 }
@@ -305,7 +310,8 @@ void ConnectionState::refreshState() {
 		const auto exposed = _parent->window()->windowHandle()
 			&& _parent->window()->windowHandle()->isExposed();
 		const auto under = _widget && _widget->isOver();
-		const auto ready = (Checker().state() == Checker::State::Ready);
+		const auto ready = !Core::UpdaterDisabled()
+			&& (Checker().state() == Checker::State::Ready);
 		const auto state = _account->mtp().dcstate();
 		const auto proxy = Core::App().settings().proxy().isEnabled();
 		if (state == MTP::ConnectingState
@@ -505,7 +511,7 @@ ConnectionState::Widget::Widget(
 	});
 
 	_progress->animationStepRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_refreshStateRequests.fire({});
 	}, _progress->lifetime());
 }
@@ -618,6 +624,7 @@ void ConnectionState::Widget::setLayout(const Layout &layout) {
 	_currentLayout = layout;
 	_proxyIcon->setToggled(_currentLayout.proxyEnabled);
 	refreshRetryLink(_currentLayout.hasRetry);
+	setAccessibleName(_currentLayout.text);
 }
 
 void ConnectionState::Widget::setProgressVisibility(bool visible) {
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index ec9fa548e9610b..b866e2f086bf48 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -28,7 +28,9 @@ For license and copyright information please follow this link:
 #include "window/window_session_controller.h"
 #include "window/themes/window_theme_editor.h"
 #include "ui/boxes/confirm_box.h"
+#include "data/components/promo_suggestions.h"
 #include "data/data_thread.h"
+#include "settings/settings_common.h"
 #include "apiwrap.h" // ApiWrap::acceptTerms.
 #include "styles/style_layers.h"
 
@@ -143,10 +145,16 @@ void Controller::showAccount(
 		MsgId singlePeerShowAtMsgId) {
 	Expects(isPrimary() || _id.account == account);
 
+	const auto prevAccount = _id.account;
 	const auto prevSession = maybeSession();
 	const auto prevSessionUniqueId = prevSession
 		? prevSession->uniqueId()
 		: 0;
+	const auto accountBeforeIntro = (prevAccount
+		&& prevAccount != account
+		&& prevAccount->sessionExists())
+		? prevAccount
+		: nullptr;
 	_accountLifetime.destroy();
 	_id.account = account;
 	Core::App().checkWindowId(this);
@@ -167,13 +175,13 @@ void Controller::showAccount(
 
 	if (!isPrimary()) {
 		_id.account->sessionChanges(
-		) | rpl::start_with_next([=](Main::Session *session) {
+		) | rpl::on_next([=](Main::Session *session) {
 			Core::App().closeWindow(this);
 		}, _accountLifetime);
 	}
 
 	_id.account->sessionValue(
-	) | rpl::start_with_next([=](Main::Session *session) {
+	) | rpl::on_next([=](Main::Session *session) {
 		const auto was = base::take(_sessionController);
 		_sessionController = session
 			? std::make_unique<SessionController>(session, this)
@@ -189,12 +197,12 @@ void Controller::showAccount(
 			session->updates().isIdleValue(
 			) | rpl::filter([=](bool idle) {
 				return !idle;
-			}) | rpl::start_with_next([=] {
+			}) | rpl::on_next([=] {
 				widget()->checkActivation();
 			}, _sessionController->lifetime());
 
 			session->termsLockValue(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				checkLockByTerms();
 				_widget.updateGlobalMenu();
 			}, _sessionController->lifetime());
@@ -202,15 +210,20 @@ void Controller::showAccount(
 			widget()->setInnerFocus();
 
 			_sessionController->activeChatChanges(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_widget.updateTitle();
 			}, _sessionController->lifetime());
 			_widget.updateTitle();
 
+			if (session->promoSuggestions().setupEmailState()
+				!= Data::SetupEmailState::None) {
+				_widget.setupSetupEmailLock();
+			}
+
 			session->updates().updateOnline(crl::now());
 		} else {
 			sideBarChanged();
-			setupIntro(std::move(oldContentCache));
+			setupIntro(accountBeforeIntro, std::move(oldContentCache));
 			_widget.updateGlobalMenu();
 		}
 
@@ -225,11 +238,13 @@ void Controller::setupSideBar() {
 		return;
 	}
 	_sessionController->filtersMenuChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		sideBarChanged();
 	}, _sessionController->lifetime());
 
-	if (_sessionController->session().settings().dialogsFiltersEnabled()) {
+	if (_sessionController->session().settings().dialogsFiltersEnabled()
+		&& _sessionController->enoughSpaceForFilters()
+		&& !Core::App().settings().chatFiltersHorizontal()) {
 		_sessionController->toggleFiltersMenu(true);
 	} else {
 		sideBarChanged();
@@ -257,7 +272,7 @@ void Controller::checkLockByTerms() {
 
 	const auto id = data->id;
 	box->agreeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto mention = box ? box->lastClickedMention() : QString();
 		box->closeBox();
 		if (const auto session = account().maybeSession()) {
@@ -270,11 +285,11 @@ void Controller::checkLockByTerms() {
 	}, box->lifetime());
 
 	box->cancelClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		showTermsDecline();
 	}, box->lifetime());
 
-	QObject::connect(box, &QObject::destroyed, [=] {
+	QObject::connect(box.get(), &QObject::destroyed, [=] {
 		crl::on_main(widget(), [=] { checkLockByTerms(); });
 	});
 
@@ -289,7 +304,7 @@ void Controller::showTermsDecline() {
 		true));
 
 	box->agreeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (box) {
 			box->closeBox();
 		}
@@ -297,7 +312,7 @@ void Controller::showTermsDecline() {
 	}, box->lifetime());
 
 	box->cancelClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (box) {
 			box->closeBox();
 		}
@@ -344,7 +359,7 @@ auto Controller::sessionControllerChanges() const
 }
 
 bool Controller::locked() const {
-	if (Core::App().passcodeLocked()) {
+	if (Core::App().passcodeLocked()/* || Core::App().setupEmailLocked()*/) {
 		return true;
 	} else if (const auto controller = sessionController()) {
 		return controller->session().termsLocked().has_value();
@@ -372,11 +387,26 @@ void Controller::clearPasscodeLock() {
 	}
 }
 
-void Controller::setupIntro(QPixmap oldContentCache) {
+void Controller::setupSetupEmailLock() {
+	if (const auto &session = _sessionController) {
+		if (session->session().promoSuggestions().setupEmailState()
+			!= Data::SetupEmailState::None) {
+			_widget.setupSetupEmailLock();
+		}
+	}
+}
+
+void Controller::clearSetupEmailLock() {
+	_widget.clearSetupEmailLock();
+}
+
+void Controller::setupIntro(
+		Main::Account *accountBeforeIntro,
+		QPixmap oldContentCache) {
 	const auto point = Core::App().domain().maybeLastOrSomeAuthedAccount()
 		? Intro::EnterPoint::Qr
 		: Intro::EnterPoint::Start;
-	_widget.setupIntro(point, std::move(oldContentCache));
+	_widget.setupIntro(point, accountBeforeIntro, std::move(oldContentCache));
 }
 
 void Controller::setupMain(
@@ -429,7 +459,7 @@ void Controller::showBox(
 	_widget.showOrHideBoxOrLayer(std::move(content), options, animated);
 }
 
-void Controller::showRightColumn(object_ptr<TWidget> widget) {
+void Controller::showRightColumn(object_ptr<Ui::RpWidget> widget) {
 	_widget.showRightColumn(std::move(widget));
 }
 
@@ -441,10 +471,18 @@ void Controller::hideSettingsAndLayer(anim::type animated) {
 	_widget.ui_hideSettingsAndLayer(animated);
 }
 
+bool Controller::closeLayerByBackButton() {
+	return _widget.closeLayerByBackButton();
+}
+
 bool Controller::isLayerShown() const {
 	return _widget.ui_isLayerShown();
 }
 
+rpl::producer<bool> Controller::boxShownValue() const {
+	return _widget.ui_boxShownValue();
+}
+
 void Controller::sideBarChanged() {
 	_widget.recountGeometryConstraints();
 }
@@ -594,6 +632,35 @@ std::shared_ptr<Ui::Show> Controller::uiShow() {
 	return std::make_shared<Show>(this);
 }
 
+void Controller::setHighlightControlId(const QString &id) {
+	_highlightControlId = id;
+}
+
+QString Controller::highlightControlId() const {
+	return _highlightControlId;
+}
+
+bool Controller::takeHighlightControlId(const QString &id) {
+	if (_highlightControlId == id) {
+		_highlightControlId = QString();
+		return true;
+	}
+	return false;
+}
+
+void Controller::checkHighlightControl(
+		const QString &id,
+		QWidget *widget,
+		Settings::HighlightArgs &&args) {
+	if (widget && takeHighlightControlId(id)) {
+		Settings::HighlightWidget(widget, std::move(args));
+	}
+}
+
+void Controller::checkHighlightControl(const QString &id, QWidget *widget) {
+	checkHighlightControl(id, widget, {});
+}
+
 rpl::lifetime &Controller::lifetime() {
 	return _lifetime;
 }
diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h
index 3eb6184e9d7331..00d932ecef14d2 100644
--- a/Telegram/SourceFiles/window/window_controller.h
+++ b/Telegram/SourceFiles/window/window_controller.h
@@ -32,6 +32,10 @@ namespace Media::Player {
 class FloatDelegate;
 } // namespace Media::Player
 
+namespace Settings {
+struct HighlightArgs;
+} // namespace Settings
+
 namespace Window {
 
 class Controller final : public base::has_weak_ptr {
@@ -68,6 +72,8 @@ class Controller final : public base::has_weak_ptr {
 
 	void setupPasscodeLock();
 	void clearPasscodeLock();
+	void setupSetupEmailLock();
+	void clearSetupEmailLock();
 
 	void showLogoutConfirmation();
 
@@ -79,7 +85,7 @@ class Controller final : public base::has_weak_ptr {
 	void showToast(TextWithEntities &&text, crl::time duration = 0);
 	void showToast(const QString &text, crl::time duration = 0);
 
-	void showRightColumn(object_ptr<TWidget> widget);
+	void showRightColumn(object_ptr<Ui::RpWidget> widget);
 
 	void showBox(
 		object_ptr<Ui::BoxContent> content,
@@ -92,17 +98,19 @@ class Controller final : public base::has_weak_ptr {
 
 	void hideLayer(anim::type animated = anim::type::normal);
 	void hideSettingsAndLayer(anim::type animated = anim::type::normal);
+	bool closeLayerByBackButton();
 	[[nodiscard]] bool isLayerShown() const;
+	[[nodiscard]] rpl::producer<bool> boxShownValue() const;
 
 	template <
 		typename BoxType,
 		typename = std::enable_if_t<
 			std::is_base_of_v<Ui::BoxContent, BoxType>>>
-	QPointer<BoxType> show(
+		base::weak_qptr<BoxType> show(
 			object_ptr<BoxType> content,
 			Ui::LayerOptions options = Ui::LayerOption::KeepOther,
 			anim::type animated = anim::type()) {
-		auto result = QPointer<BoxType>(content.data());
+		auto result = base::weak_qptr<BoxType>(content.data());
 		showBox(std::move(content), options, animated);
 		return result;
 	}
@@ -140,6 +148,15 @@ class Controller final : public base::has_weak_ptr {
 
 	[[nodiscard]] std::shared_ptr<Ui::Show> uiShow();
 
+	void setHighlightControlId(const QString &id);
+	[[nodiscard]] QString highlightControlId() const;
+	[[nodiscard]] bool takeHighlightControlId(const QString &id);
+	void checkHighlightControl(
+		const QString &id,
+		QWidget *widget,
+		Settings::HighlightArgs &&args);
+	void checkHighlightControl(const QString &id, QWidget *widget);
+
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
@@ -148,7 +165,7 @@ class Controller final : public base::has_weak_ptr {
 	};
 	explicit Controller(CreateArgs &&args);
 
-	void setupIntro(QPixmap oldContentCache);
+	void setupIntro(Main::Account *accountBeforeIntro, QPixmap oldContentCache);
 	void setupMain(MsgId singlePeerShowAtMsgId, QPixmap oldContentCache);
 
 	void showAccount(
@@ -168,7 +185,7 @@ class Controller final : public base::has_weak_ptr {
 	const std::unique_ptr<Adaptive> _adaptive;
 	std::unique_ptr<SessionController> _sessionController;
 	rpl::variable<SessionController*> _sessionControllerValue;
-	QPointer<Ui::BoxContent> _termsBox;
+	base::weak_qptr<Ui::BoxContent> _termsBox;
 
 	rpl::event_stream<Media::View::OpenRequest> _openInMediaViewRequests;
 
@@ -176,6 +193,8 @@ class Controller final : public base::has_weak_ptr {
 	FloatDelegate *_replacementFloatPlayerDelegate = nullptr;
 	rpl::variable<FloatDelegate*> _floatPlayerDelegate = nullptr;
 
+	QString _highlightControlId;
+
 	rpl::lifetime _accountLifetime;
 	rpl::lifetime _lifetime;
 
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index daf217800879e1..d22390eaff42b4 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -13,25 +13,28 @@ For license and copyright information please follow this link:
 #include "window/window_main_menu.h"
 #include "window/window_peer_menu.h"
 #include "main/main_session.h"
-#include "core/application.h"
-#include "core/core_settings.h"
-#include "window/notifications_manager.h"
+#include "base/event_filter.h"
+#include "core/ui_integration.h"
 #include "data/data_session.h"
 #include "data/data_chat_filters.h"
-#include "data/data_folder.h"
 #include "data/data_user.h"
 #include "data/data_peer_values.h"
 #include "data/data_premium_limits.h"
+#include "data/data_unread_value.h"
 #include "lang/lang_keys.h"
 #include "ui/filter_icons.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/vertical_layout_reorder.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/power_saving.h"
+#include "ui/screen_reader_mode.h"
 #include "ui/ui_utility.h"
 #include "boxes/filters/edit_filter_box.h"
+#include "boxes/choose_filter_box.h"
 #include "boxes/premium_limits_box.h"
-#include "settings/settings_folders.h"
+#include "settings/sections/settings_folders.h"
 #include "storage/storage_media_prepare.h"
 #include "api/api_chat_filters.h"
 #include "apiwrap.h"
@@ -40,41 +43,50 @@ For license and copyright information please follow this link:
 #include "styles/style_layers.h" // attentionBoxButton
 #include "styles/style_menu_icons.h"
 
+#include <QtGui/QtEvents>
+
 namespace Window {
 namespace {
 
-[[nodiscard]] Dialogs::UnreadState MainListMapUnreadState(
-		not_null<Main::Session*> session,
-		const Dialogs::UnreadState &state) {
-	const auto folderId = Data::Folder::kId;
-	if (const auto folder = session->data().folderLoaded(folderId)) {
-		return state - folder->chatsList()->unreadState();
-	}
-	return state;
-}
-
-[[nodiscard]] rpl::producer<Dialogs::UnreadState> MainListUnreadState(
-		not_null<Dialogs::MainList*> list) {
-	return rpl::single(rpl::empty) | rpl::then(
-		list->unreadStateChanges() | rpl::to_empty
-	) | rpl::map([=] {
-		return list->unreadState();
-	});
-}
+// The folder tabs container, exposed as a list to screen readers.
+class TabListLayout final : public Ui::VerticalLayout {
+public:
+	using Ui::VerticalLayout::VerticalLayout;
 
-[[nodiscard]] rpl::producer<Dialogs::UnreadState> UnreadStateValue(
-		not_null<Main::Session*> session,
-		FilterId filterId) {
-	if (filterId > 0) {
-		const auto filters = &session->data().chatsFilters();
-		return MainListUnreadState(filters->chatsList(filterId));
+	QAccessible::Role accessibilityRole() override {
+		return QAccessible::List;
 	}
-	return MainListUnreadState(
-		session->data().chatsList()
-	) | rpl::map([=](const Dialogs::UnreadState &state) {
-		return MainListMapUnreadState(session, state);
-	});
-}
+	Qt::FocusPolicy accessibilityFocusPolicy() override {
+		// Let the accessibility layer decide focusability (like PopupMenu),
+		// exposing the list as focusable in screen-reader mode.
+		return Qt::ClickFocus;
+	}
+	std::optional<Qt::Orientation> accessibilityOrientation() const override {
+		// The folders strip is a vertically stacked list.
+		return Qt::Vertical;
+	}
+	bool accessibilitySelectionList() const override {
+		// Opt in to the single-selection list behaviour (selection interface +
+		// container focus forwarding to the active folder). Other List-role
+		// widgets (e.g. message history) must not get this.
+		return true;
+	}
+	std::vector<not_null<QWidget*>> accessibilityChildWidgets() const override {
+		// Report the tab buttons in visual (row) order, which can differ from
+		// the QObject child order after a drag-reorder. This override lives
+		// here, on the one VerticalLayout that exposes an accessibility role,
+		// rather than in the base class: a role-less VerticalLayout gets no
+		// custom accessible interface, so it would never call this anyway, and
+		// the widely-used base type keeps Qt's default child enumeration.
+		auto result = std::vector<not_null<QWidget*>>();
+		const auto rows = count();
+		result.reserve(rows);
+		for (auto i = 0; i != rows; ++i) {
+			result.push_back(widgetAt(i).get());
+		}
+		return result;
+	}
+};
 
 } // namespace
 
@@ -84,18 +96,11 @@ FiltersMenu::FiltersMenu(
 : _session(session)
 , _parent(parent)
 , _outer(_parent)
-, _menu(&_outer, QString(), st::windowFiltersMainMenu)
+, _menu(&_outer, TextWithEntities(), st::windowFiltersMainMenu)
 , _scroll(&_outer)
 , _container(
 	_scroll.setOwnedWidget(
-		object_ptr<Ui::VerticalLayout>(&_scroll)))
-, _includeMuted(Core::App().settings().includeMutedCounterFolders()) {
-	Core::App().notifications().settingsChanged(
-	) | rpl::filter(
-		rpl::mappers::_1 == Window::Notifications::ChangeType::IncludeMuted
-	) | rpl::start_with_next([=] {
-		_includeMuted = Core::App().settings().includeMutedCounterFolders();
-	}, _outer.lifetime());
+		object_ptr<Ui::VerticalLayout>(&_scroll))) {
 
 	_drag.timer.setCallback([=] {
 		if (_drag.filterId >= 0) {
@@ -108,12 +113,15 @@ FiltersMenu::FiltersMenu(
 FiltersMenu::~FiltersMenu() = default;
 
 void FiltersMenu::setup() {
+	setupDragAndDrop();
 	setupMainMenuIcon();
+	_menu.setIsMenuButton(true);
+	_menu.setAccessibleName(tr::lng_main_menu(tr::now));
 
 	_outer.setAttribute(Qt::WA_OpaquePaintEvent);
 	_outer.show();
 	_outer.paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(&_outer);
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::windowFiltersButton.textBg);
@@ -121,7 +129,7 @@ void FiltersMenu::setup() {
 	}, _outer.lifetime());
 
 	_parent->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		const auto width = st::windowFiltersWidth;
 		_outer.setGeometry({ 0, 0, width, height });
 		_menu.resizeToWidth(width);
@@ -138,7 +146,7 @@ void FiltersMenu::setup() {
 	rpl::combine(
 		rpl::single(rpl::empty) | rpl::then(filters->changed()),
 		std::move(premium)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refresh();
 	}, _outer.lifetime());
 
@@ -146,7 +154,7 @@ void FiltersMenu::setup() {
 	_session->activeChatsFilter(
 	) | rpl::filter([=](FilterId id) {
 		return (id != _activeFilterId);
-	}) | rpl::start_with_next([=](FilterId id) {
+	}) | rpl::on_next([=](FilterId id) {
 		if (!_list) {
 			_activeFilterId = id;
 			return;
@@ -169,10 +177,34 @@ void FiltersMenu::setup() {
 	});
 }
 
+void FiltersMenu::setupDragAndDrop() {
+	SetupFilterDragAndDrop(
+		&_outer,
+		&_session->session(),
+		[=](QPoint globalPos) -> std::optional<FilterId> {
+			if (!_list) {
+				return std::nullopt;
+			}
+			const auto localPos = _list->mapFromGlobal(globalPos);
+			for (const auto &[id, button] : _filters) {
+				if (button->geometry().contains(localPos)) {
+					return id;
+				}
+			}
+			return std::nullopt;
+		},
+		[=] { return _activeFilterId; },
+		[=](FilterId filterId) {
+			for (const auto &[id, button] : _filters) {
+				button->setForceRippled(id == filterId);
+			}
+		});
+}
+
 void FiltersMenu::setupMainMenuIcon() {
 	OtherAccountsUnreadState(
 		&_session->session().account()
-	) | rpl::start_with_next([=](const OthersUnreadState &state) {
+	) | rpl::on_next([=](const OthersUnreadState &state) {
 		const auto icon = !state.count
 			? nullptr
 			: !state.allMuted
@@ -208,6 +240,76 @@ void FiltersMenu::scrollToButton(not_null<Ui::RpWidget*> widget) {
 		anim::sineInOut);
 }
 
+void FiltersMenu::applyFilterAt(int start, int delta) {
+	const auto &list = _session->session().data().chatsFilters().list();
+	const auto count = int(list.size());
+	// Move focus to the folder at `start`, then in the `delta` direction,
+	// stopping at the bounds (no wrap). Arrow keys only move focus; activation
+	// (switching the chat list, or opening the Premium box for a locked folder)
+	// happens when the user presses Enter on the focused folder.
+	for (auto index = start; index >= 0 && index < count; index += delta) {
+		const auto i = _filters.find(list[index].id());
+		if (i != end(_filters)) {
+			const auto raw = i->second.get();
+			// Just move focus; the FocusIn handler makes this the list's single
+			// Tab-stop (setListTabStop). Arrows only move focus, so - unlike the
+			// old activate-on-arrow path - nothing scrolls the focused folder
+			// into view; do that explicitly.
+			raw->setFocus();
+			scrollToButton(raw);
+			return;
+		}
+	}
+}
+
+void FiltersMenu::moveToFilter(int delta) {
+	const auto &list = _session->session().data().chatsFilters().list();
+	const auto count = int(list.size());
+	// Move relative to the currently focused folder, so navigation continues
+	// from a locked one (which only takes focus, without becoming active); fall
+	// back to the active folder when nothing is focused.
+	auto current = 0;
+	for (auto i = 0; i != count; ++i) {
+		const auto it = _filters.find(list[i].id());
+		if (it != end(_filters) && it->second->hasFocus()) {
+			current = i;
+			break;
+		} else if (list[i].id() == _activeFilterId) {
+			current = i;
+		}
+	}
+	applyFilterAt(current + delta, delta);
+}
+
+void FiltersMenu::moveToFilterEdge(int delta) {
+	const auto count = int(
+		_session->session().data().chatsFilters().list().size());
+	applyFilterAt((delta > 0) ? 0 : (count - 1), delta);
+}
+
+void FiltersMenu::setListTabStop(not_null<Ui::SideBarButton*> stop) {
+	// Single source of truth for the list's roving Tab-stop, wired between the
+	// main menu and the edit button. Promote `stop` to the only TabFocus item
+	// and demote the previous one, so Tab/Shift+Tab always leave the list the
+	// same way regardless of which folder is focused.
+	if (const auto previous = _tabStop.get(); previous && previous != stop) {
+		previous->setFocusPolicy(Qt::ClickFocus);
+	}
+	stop->setFocusPolicy(Qt::TabFocus);
+	_tabStop = stop.get();
+	QWidget::setTabOrder(&_menu, stop.get());
+	QWidget::setTabOrder(stop.get(), _setup.get());
+}
+
+bool FiltersMenu::listFocused() const {
+	for (const auto &[id, button] : _filters) {
+		if (button->hasFocus()) {
+			return true;
+		}
+	}
+	return false;
+}
+
 void FiltersMenu::refresh() {
 	const auto filters = &_session->session().data().chatsFilters();
 	if (!filters->has() || _ignoreRefresh) {
@@ -231,6 +333,18 @@ void FiltersMenu::refresh() {
 		premiumFrom,
 		std::max(1, int(filters->list().size()) - maxLimit));
 
+	// Remember which folder holds keyboard focus so the roving Tab-stop can be
+	// re-established on its replacement after the rebuild: the new buttons are
+	// constructed while _filters still holds the old ones, so their own seeding
+	// can't see the focus and would leave the list with no Tab-stop.
+	auto focusedId = std::optional<FilterId>();
+	for (const auto &[id, button] : _filters) {
+		if (button->hasFocus()) {
+			focusedId = id;
+			break;
+		}
+	}
+
 	auto now = base::flat_map<int, base::unique_qptr<Ui::SideBarButton>>();
 	const auto &currentFilter = _session->activeChatsFilterCurrent();
 	for (const auto &filter : filters->list()) {
@@ -242,11 +356,33 @@ void FiltersMenu::refresh() {
 			_list,
 			filter.id(),
 			filter.title(),
-			Ui::ComputeFilterIcon(filter));
-		button->setLocked(nextIsLocked);
+			Ui::ComputeFilterIcon(filter),
+			nextIsLocked);
 		now.emplace(filter.id(), std::move(button));
 	}
 	_filters = std::move(now);
+	// Re-establish the list's Tab-stop on the folder that was focused (if it
+	// survived the rebuild), else on the active one, so a refresh - rename,
+	// deletion, Premium-state change - never leaves the list without a Tab-stop.
+	auto refocus = (Ui::SideBarButton*)nullptr;
+	if (Ui::ScreenReaderModeActive()) {
+		auto i = focusedId ? _filters.find(*focusedId) : end(_filters);
+		if (i == end(_filters)) {
+			i = _filters.find(_activeFilterId);
+		}
+		if (i != end(_filters)) {
+			setListTabStop(i->second.get());
+			// setListTabStop only fixes the Tab order; the std::move above
+			// destroyed the focused button, so Qt also dropped keyboard focus
+			// (to the menu, the edit button or nowhere). If a folder held it,
+			// restore focus to the replacement - or the active fallback - below,
+			// once the scroll is restored, so it lands focused and visible and a
+			// screen reader keeps reading a folder rather than where focus fell.
+			if (focusedId) {
+				refocus = i->second.get();
+			}
+		}
+	}
 	_reorder->start();
 
 	_container->resizeToWidth(_outer.width());
@@ -254,19 +390,25 @@ void FiltersMenu::refresh() {
 	// After the filters are refreshed, the scroll is reset,
 	// so we have to restore it.
 	_scroll.scrollToY(oldTop);
+
+	if (refocus) {
+		refocus->setFocus();
+		scrollToButton(refocus);
+	}
 }
 
 void FiltersMenu::setupList() {
-	_list = _container->add(object_ptr<Ui::VerticalLayout>(_container));
+	_list = _container->add(object_ptr<TabListLayout>(_container));
+	_list->setAccessibleName(tr::lng_filters_title(tr::now));
 	_setup = prepareButton(
 		_container,
 		-1,
-		tr::lng_filters_setup(tr::now),
+		{ TextWithEntities{ tr::lng_filters_setup(tr::now) } },
 		Ui::FilterIcon::Edit);
 	_reorder = std::make_unique<Ui::VerticalLayoutReorder>(_list, &_scroll);
 
 	_reorder->updates(
-		) | rpl::start_with_next([=](Ui::VerticalLayoutReorder::Single data) {
+	) | rpl::on_next([=](Ui::VerticalLayoutReorder::Single data) {
 		using State = Ui::VerticalLayoutReorder::State;
 		if (data.state == State::Started) {
 			++_reordering;
@@ -286,45 +428,140 @@ bool FiltersMenu::premium() const {
 }
 
 base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareAll() {
-	return prepareButton(_container, 0, {}, Ui::FilterIcon::All, true);
+	return prepareButton(
+		_container,
+		0,
+		{},
+		Ui::FilterIcon::All,
+		false,
+		true);
 }
 
 base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
 		not_null<Ui::VerticalLayout*> container,
 		FilterId id,
-		const QString &title,
+		Data::ChatFilterTitle title,
 		Ui::FilterIcon icon,
+		bool locked,
 		bool toBeginning) {
+	const auto isStatic = title.isStatic;
+	const auto paused = [=] {
+		return On(PowerSaving::kEmojiChat)
+			|| _session->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
+	};
+	// A real folder (id >= 0), locked or not, is a selectable list item; only
+	// the "Edit" button (id < 0) stays a plain button. Establish this before
+	// inserting the widget - insertion shows the child immediately, so
+	// configuring the role up front avoids a transient or separately-announced
+	// role change.
+	const auto listItem = (id >= 0);
 	auto prepared = object_ptr<Ui::SideBarButton>(
 		container,
-		id ? title : tr::lng_filters_all(tr::now),
-		st::windowFiltersButton);
+		id ? title.text : TextWithEntities{ tr::lng_filters_all(tr::now) },
+		st::windowFiltersButton,
+		Core::TextContext({
+			.session = &_session->session(),
+			.customEmojiLoopLimit = isStatic ? -1 : 0,
+		}),
+		paused);
+	prepared->setLocked(locked);
+	prepared->setIsListItem(listItem);
 	auto added = toBeginning
 		? container->insert(0, std::move(prepared))
 		: container->add(std::move(prepared));
 	auto button = base::unique_qptr<Ui::SideBarButton>(std::move(added));
 	const auto raw = button.get();
+	const auto nameText = id
+		? title.text.text
+		: tr::lng_filters_all(tr::now);
 	const auto &icons = Ui::LookupFilterIcon(id
 		? icon
 		: Ui::FilterIcon::All);
 	raw->setIconOverride(icons.normal, icons.active);
 	if (id >= 0) {
+		if (locked) {
+			// Surface a locked folder's premium-gated status and what pressing
+			// it does, which the visual lock glyph alone can't convey to a
+			// screen reader.
+			raw->setAccessibleName(
+				tr::lng_sr_folder_locked(tr::now, lt_text, nameText));
+			raw->setAccessibleDescription(
+				tr::lng_sr_folder_locked_about(tr::now));
+		}
 		rpl::combine(
-			UnreadStateValue(&_session->session(), id),
-			_includeMuted.value()
-		) | rpl::start_with_next([=](
+			Data::UnreadStateValue(&_session->session(), id),
+			Data::IncludeMutedCounterFoldersValue()
+		) | rpl::on_next([=](
 				const Dialogs::UnreadState &state,
 				bool includeMuted) {
-			const auto muted = (state.chatsMuted + state.marksMuted);
-			const auto count = (state.chats + state.marks)
+			const auto chats = state.chats;
+			const auto chatsMuted = state.chatsMuted;
+			const auto muted = (chatsMuted + state.marksMuted);
+			const auto count = (chats + state.marks)
 				- (includeMuted ? 0 : muted);
 			const auto string = !count
 				? QString()
-				: (count > 99)
+				: (count > 999)
 				? "99+"
 				: QString::number(count);
 			raw->setBadge(string, includeMuted && (count == muted));
+			if (!locked) {
+				raw->setAccessibleName(count
+					? tr::lng_filter_unread_chats(
+						tr::now,
+						lt_count,
+						count,
+						lt_text,
+						nameText)
+					: nameText);
+			}
+		}, raw->lifetime());
+	}
+	if (listItem) {
+		// The list has one roving Tab-stop and it follows keyboard focus (the
+		// FocusIn handler below makes the focused folder the single Tab-stop via
+		// setListTabStop). Here we only track screen-reader mode - which toggles
+		// whether the items are focusable at all - and seed the Tab-stop on the
+		// active folder, so Tab reaches the list there while nothing is focused.
+		rpl::combine(
+			Ui::ScreenReaderModeActiveValue(),
+			rpl::single(
+				_session->activeChatsFilterCurrent()
+			) | rpl::then(
+				_session->activeChatsFilter()
+			) | rpl::map([=](FilterId active) {
+				return (active == id);
+			}) | rpl::distinct_until_changed()
+		) | rpl::on_next([=](bool screenReaderActive, bool selected) {
+			if (!screenReaderActive) {
+				raw->setFocusPolicy(Qt::NoFocus);
+			} else if (selected && !listFocused()) {
+				setListTabStop(raw);
+			} else if (raw->focusPolicy() == Qt::NoFocus) {
+				raw->setFocusPolicy(Qt::ClickFocus);
+			}
 		}, raw->lifetime());
+		// Up/Down move focus to the previous/next folder, Home/End to the
+		// first/last one (the items are only focusable in screen-reader mode, so
+		// this is scoped to it). Activation - switching the chat list, or opening
+		// the Premium box for a locked folder - happens on Enter. Focusing an
+		// item (by arrow, mouse or UIA SetFocus) makes it the list's Tab-stop.
+		base::install_event_filter(raw, [=](not_null<QEvent*> event) {
+			if (event->type() == QEvent::FocusIn) {
+				setListTabStop(raw);
+				return base::EventFilterResult::Continue;
+			} else if (event->type() != QEvent::KeyPress) {
+				return base::EventFilterResult::Continue;
+			}
+			switch (static_cast<QKeyEvent*>(event.get())->key()) {
+			case Qt::Key_Up: moveToFilter(-1); break;
+			case Qt::Key_Down: moveToFilter(1); break;
+			case Qt::Key_Home: moveToFilterEdge(1); break;
+			case Qt::Key_End: moveToFilterEdge(-1); break;
+			default: return base::EventFilterResult::Continue;
+			}
+			return base::EventFilterResult::Cancel;
+		});
 	}
 	raw->setActive(_session->activeChatsFilterCurrent() == id);
 	raw->setClickedCallback([=] {
@@ -349,7 +586,7 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
 				|| e->type() == QEvent::DragEnter
 				|| e->type() == QEvent::DragMove
 				|| e->type() == QEvent::DragLeave;
-		}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		}) | rpl::on_next([=](not_null<QEvent*> e) {
 			if (raw->locked()) {
 				return;
 			}
@@ -379,13 +616,13 @@ base::unique_qptr<Ui::SideBarButton> FiltersMenu::prepareButton(
 void FiltersMenu::openFiltersSettings() {
 	const auto filters = &_session->session().data().chatsFilters();
 	if (filters->suggestedLoaded()) {
-		_session->showSettings(Settings::Folders::Id());
+		_session->showSettings(Settings::FoldersId());
 	} else if (!_waitingSuggested) {
 		_waitingSuggested = true;
 		filters->requestSuggested();
 		filters->suggestedUpdated(
-		) | rpl::take(1) | rpl::start_with_next([=] {
-			_session->showSettings(Settings::Folders::Id());
+		) | rpl::take(1) | rpl::on_next([=] {
+			_session->showSettings(Settings::FoldersId());
 		}, _outer.lifetime());
 	}
 }
@@ -402,18 +639,11 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 	_popupMenu = base::make_unique_q<Ui::PopupMenu>(
 		i->second.get(),
 		st::popupMenuWithIcons);
-	const auto addAction = Window::PeerMenuCallback([&](
-			Window::PeerMenuCallback::Args args) {
-		return _popupMenu->addAction(
-			args.text,
-			crl::guard(&_outer, std::move(args.handler)),
-			args.icon);
-	});
-
+	const auto addAction = Ui::Menu::CreateAddActionCallback(_popupMenu);
 	if (id) {
 		addAction(
 			tr::lng_filters_context_edit(tr::now),
-			[=] { showEditBox(id); },
+			crl::guard(&_outer, [=] { EditExistingFilter(_session, id); }),
 			&st::menuIconEdit);
 
 		auto filteredChats = [=] {
@@ -424,14 +654,18 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 			std::move(filteredChats),
 			addAction);
 
-		addAction(
-			tr::lng_filters_context_remove(tr::now),
-			[=] { showRemoveBox(id); },
-			&st::menuIconDelete);
+		addAction({
+			.text = tr::lng_filters_context_remove(tr::now),
+			.handler = crl::guard(&_outer, [=, this] {
+				_removeApi.request(base::make_weak(&_outer), _session, id);
+			}),
+			.icon = &st::menuIconDeleteAttention,
+			.isAttention = true,
+		});
 	} else {
 		auto customUnreadState = [=] {
 			const auto session = &_session->session();
-			return MainListMapUnreadState(
+			return Data::MainListMapUnreadState(
 				session,
 				session->data().chatsList()->unreadState());
 		};
@@ -443,7 +677,7 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 
 		addAction(
 			tr::lng_filters_setup_menu(tr::now),
-			[=] { openFiltersSettings(); },
+			crl::guard(&_outer, [=] { openFiltersSettings(); }),
 			&st::menuIconEdit);
 	}
 	if (_popupMenu->empty()) {
@@ -453,105 +687,6 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 	_popupMenu->popup(position);
 }
 
-void FiltersMenu::showEditBox(FilterId id) {
-	EditExistingFilter(_session, id);
-}
-
-void FiltersMenu::showRemoveBox(FilterId id) {
-	const auto session = &_session->session();
-	const auto &list = session->data().chatsFilters().list();
-	const auto i = ranges::find(list, id, &Data::ChatFilter::id);
-	const auto filter = (i != end(list)) ? *i : Data::ChatFilter();
-	const auto has = filter.hasMyLinks();
-	const auto confirm = [=](Fn<void()> action, bool onlyWhenHas = false) {
-		if (!has && onlyWhenHas) {
-			action();
-			return;
-		}
-		_session->window().show(Ui::MakeConfirmBox({
-			.text = (has
-				? tr::lng_filters_delete_sure()
-				: tr::lng_filters_remove_sure()),
-			.confirmed = [=](Fn<void()> &&close) { close(); action(); },
-			.confirmText = (has
-				? tr::lng_box_delete()
-				: tr::lng_filters_remove_yes()),
-			.confirmStyle = &st::attentionBoxButton,
-		}));
-	};
-	const auto simple = [=] {
-		confirm([=] { remove(id); });
-	};
-	const auto suggestRemoving = Api::ExtractSuggestRemoving(filter);
-	if (suggestRemoving.empty()) {
-		simple();
-		return;
-	} else if (_removingRequestId) {
-		if (_removingId == id) {
-			return;
-		}
-		session->api().request(_removingRequestId).cancel();
-	}
-	_removingId = id;
-	_removingRequestId = session->api().request(
-		MTPchatlists_GetLeaveChatlistSuggestions(
-			MTP_inputChatlistDialogFilter(
-				MTP_int(id)))
-	).done(crl::guard(&_outer, [=](const MTPVector<MTPPeer> &result) {
-		_removingRequestId = 0;
-		const auto suggestRemovePeers = ranges::views::all(
-			result.v
-		) | ranges::views::transform([=](const MTPPeer &peer) {
-			return session->data().peer(peerFromMTP(peer));
-		}) | ranges::to_vector;
-		const auto chosen = crl::guard(&_outer, [=](
-				std::vector<not_null<PeerData*>> peers) {
-			remove(id, std::move(peers));
-		});
-		confirm(crl::guard(&_outer, [=] {
-			Api::ProcessFilterRemove(
-				_session,
-				filter.title(),
-				filter.iconEmoji(),
-				suggestRemoving,
-				suggestRemovePeers,
-				chosen);
-		}), true);
-	})).fail(crl::guard(&_outer, [=] {
-		_removingRequestId = 0;
-		simple();
-	})).send();
-}
-
-void FiltersMenu::remove(
-		FilterId id,
-		std::vector<not_null<PeerData*>> leave) {
-	const auto session = &_session->session();
-	const auto api = &session->api();
-	session->data().chatsFilters().apply(MTP_updateDialogFilter(
-		MTP_flags(MTPDupdateDialogFilter::Flag(0)),
-		MTP_int(id),
-		MTPDialogFilter()));
-	if (leave.empty()) {
-		api->request(MTPmessages_UpdateDialogFilter(
-			MTP_flags(MTPmessages_UpdateDialogFilter::Flag(0)),
-			MTP_int(id),
-			MTPDialogFilter()
-		)).send();
-	} else {
-		api->request(MTPchatlists_LeaveChatlist(
-			MTP_inputChatlistDialogFilter(MTP_int(id)),
-			MTP_vector<MTPInputPeer>(ranges::views::all(
-				leave
-			) | ranges::views::transform([](not_null<PeerData*> peer) {
-				return MTPInputPeer(peer->input);
-			}) | ranges::to<QVector<MTPInputPeer>>())
-		)).done([=](const MTPUpdates &result) {
-			api->applyUpdates(result);
-		}).send();
-	}
-}
-
 void FiltersMenu::applyReorder(
 		not_null<Ui::RpWidget*> widget,
 		int oldPosition,
diff --git a/Telegram/SourceFiles/window/window_filters_menu.h b/Telegram/SourceFiles/window/window_filters_menu.h
index 54e3189c1e9975..0739c770e3266d 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.h
+++ b/Telegram/SourceFiles/window/window_filters_menu.h
@@ -7,11 +7,17 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "api/api_chat_filters_remove_manager.h"
 #include "base/timer.h"
+#include "base/weak_qptr.h"
 #include "ui/effects/animations.h"
 #include "ui/widgets/side_bar_button.h"
 #include "ui/widgets/scroll_area.h"
 
+namespace Data {
+struct ChatFilterTitle;
+} // namespace Data
+
 namespace Ui {
 class VerticalLayout;
 class VerticalLayoutReorder;
@@ -43,16 +49,20 @@ class FiltersMenu final {
 	[[nodiscard]] base::unique_qptr<Ui::SideBarButton> prepareButton(
 		not_null<Ui::VerticalLayout*> container,
 		FilterId id,
-		const QString &title,
+		Data::ChatFilterTitle title,
 		Ui::FilterIcon icon,
+		bool locked = false,
 		bool toBeginning = false);
 	void setupMainMenuIcon();
 	void showMenu(QPoint position, FilterId id);
-	void showEditBox(FilterId id);
-	void showRemoveBox(FilterId id);
-	void remove(FilterId id, std::vector<not_null<PeerData*>> leave = {});
 	void scrollToButton(not_null<Ui::RpWidget*> widget);
+	void applyFilterAt(int start, int delta);
+	void moveToFilter(int delta);
+	void moveToFilterEdge(int delta);
+	void setListTabStop(not_null<Ui::SideBarButton*> stop);
+	[[nodiscard]] bool listFocused() const;
 	void openFiltersSettings();
+	void setupDragAndDrop();
 
 	const not_null<SessionController*> _session;
 	const not_null<Ui::RpWidget*> _parent;
@@ -64,14 +74,14 @@ class FiltersMenu final {
 	std::unique_ptr<Ui::VerticalLayoutReorder> _reorder;
 	base::unique_qptr<Ui::SideBarButton> _setup;
 	base::flat_map<FilterId, base::unique_qptr<Ui::SideBarButton>> _filters;
+	base::weak_qptr<Ui::SideBarButton> _tabStop;
 	rpl::variable<bool> _includeMuted;
 	FilterId _activeFilterId = 0;
 	int _reordering = 0;
 	bool _ignoreRefresh = false;
 	bool _waitingSuggested = false;
 
-	FilterId _removingId = 0;
-	mtpRequestId _removingRequestId = 0;
+	Api::RemoveComplexChatFilter _removeApi;
 
 	base::unique_qptr<Ui::PopupMenu> _popupMenu;
 	struct {
diff --git a/Telegram/SourceFiles/window/window_history_hider.cpp b/Telegram/SourceFiles/window/window_history_hider.cpp
index 134bd45ee343cf..13972cfa5f1a50 100644
--- a/Telegram/SourceFiles/window/window_history_hider.cpp
+++ b/Telegram/SourceFiles/window/window_history_hider.cpp
@@ -21,7 +21,7 @@ HistoryHider::HistoryHider(QWidget *parent, const QString &text)
 : RpWidget(parent)
 , _text(text) {
 	Lang::Updated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshLang();
 	}, lifetime());
 
diff --git a/Telegram/SourceFiles/window/window_lock_widgets.cpp b/Telegram/SourceFiles/window/window_lock_widgets.cpp
index b674458d113aee..0ae535df969f58 100644
--- a/Telegram/SourceFiles/window/window_lock_widgets.cpp
+++ b/Telegram/SourceFiles/window/window_lock_widgets.cpp
@@ -102,8 +102,6 @@ PasscodeLockWidget::PasscodeLockWidget(
 , _logout(this, tr::lng_passcode_logout(tr::now)) {
 	connect(_passcode, &Ui::MaskedInputField::changed, [=] { changed(); });
 	connect(_passcode, &Ui::MaskedInputField::submitted, [=] { submit(); });
-
-	_submit->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	_submit->setClickedCallback([=] { submit(); });
 	_logout->setClickedCallback([=] {
 		window->showLogoutConfirmation();
@@ -150,7 +148,7 @@ void PasscodeLockWidget::setupSystemUnlockInfo() {
 		std::move(text),
 		st::passcodeSystemUnlockLater);
 	_logout->geometryValue(
-	) | rpl::start_with_next([=](QRect logout) {
+	) | rpl::on_next([=](QRect logout) {
 		info->resizeToWidth(width()
 			- st::boxRowPadding.left()
 			- st::boxRowPadding.right());
@@ -167,7 +165,7 @@ void PasscodeLockWidget::setupSystemUnlock() {
 		return active
 			&& !_systemUnlockSuggested
 			&& !_systemUnlockCooldown.isActive();
-	}) | rpl::start_with_next([=](bool) {
+	}) | rpl::on_next([=](bool) {
 		[[maybe_unused]] auto refresh = base::SystemUnlockStatus();
 		suggestSystemUnlock();
 	}, lifetime());
@@ -178,7 +176,7 @@ void PasscodeLockWidget::setupSystemUnlock() {
 	if (!Platform::IsWindows()) {
 		using namespace base;
 		_systemUnlockAllowed.value(
-		) | rpl::start_with_next([=](SystemUnlockType type) {
+		) | rpl::on_next([=](SystemUnlockType type) {
 			const auto icon = (type == SystemUnlockType::Biometrics)
 				? &st::passcodeSystemTouchID
 				: (type == SystemUnlockType::Companion)
@@ -189,7 +187,7 @@ void PasscodeLockWidget::setupSystemUnlock() {
 	}
 	button->showOn(_systemUnlockAllowed.value(
 	) | rpl::map(rpl::mappers::_1 != SystemUnlockType::None));
-	_passcode->sizeValue() | rpl::start_with_next([=](QSize size) {
+	_passcode->sizeValue() | rpl::on_next([=](QSize size) {
 		button->moveToRight(0, size.height() - button->height());
 	}, button->lifetime());
 	button->setClickedCallback([=] {
@@ -211,11 +209,11 @@ void PasscodeLockWidget::suggestSystemUnlock() {
 		_systemUnlockAllowed.value(
 		) | rpl::filter(
 			rpl::mappers::_1 != SystemUnlockType::None
-		) | rpl::take(1) | rpl::start_with_next([=] {
-			const auto weak = Ui::MakeWeak(this);
+		) | rpl::take(1) | rpl::on_next([=] {
+			const auto weak = base::make_weak(this);
 			const auto done = [weak](SystemUnlockResult result) {
 				crl::on_main([=] {
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->systemUnlockDone(result);
 					}
 				});
@@ -443,12 +441,12 @@ void TermsBox::prepare() {
 
 	if (age) {
 		age->entity()->checkedChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			toggleAgeError(false);
 		}, age->lifetime());
 
 		heightValue(
-		) | rpl::start_with_next([=](int height) {
+		) | rpl::on_next([=](int height) {
 			age->moveToLeft(0, height - age->height());
 		}, age->lifetime());
 	}
@@ -460,7 +458,7 @@ void TermsBox::prepare() {
 		content->heightValue(),
 		age ? age->heightValue() : rpl::single(0),
 		_1 + _2
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWideWidth, height);
 	}, content->lifetime());
 }
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 2f97454ddbcc50..89ecba366fdf56 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -8,22 +8,28 @@ For license and copyright information please follow this link:
 #include "window/window_main_menu.h"
 
 #include "apiwrap.h"
+#include "base/event_filter.h"
 #include "base/qt_signal_producer.h"
 #include "boxes/about_box.h"
 #include "boxes/peer_list_controllers.h"
 #include "boxes/premium_preview_box.h"
+#include "calls/group/calls_group_common.h"
 #include "calls/calls_box_controller.h"
+#include "calls/calls_instance.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
 #include "data/data_changes.h"
 #include "data/data_document_media.h"
 #include "data/data_folder.h"
+#include "data/data_group_call.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_user.h"
 #include "info/info_memento.h"
 #include "info/profile/info_profile_badge.h"
+#include "settings/settings_common.h"
 #include "info/profile/info_profile_emoji_status_panel.h"
+#include "info/profile/info_profile_icon.h"
 #include "info/stories/info_stories_widget.h"
 #include "lang/lang_keys.h"
 #include "main/main_account.h"
@@ -31,20 +37,24 @@ For license and copyright information please follow this link:
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "mtproto/mtproto_config.h"
-#include "settings/settings_advanced.h"
-#include "settings/settings_calls.h"
-#include "settings/settings_information.h"
+#include "settings/sections/settings_advanced.h"
+#include "settings/sections/settings_calls.h"
+#include "settings/sections/settings_information.h"
 #include "storage/localstorage.h"
 #include "storage/storage_account.h"
 #include "support/support_templates.h"
+#include "tde2e/tde2e_api.h"
+#include "tde2e/tde2e_integration.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/chat/chat_theme.h"
+#include "ui/controls/swipe_handler.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/snowflakes.h"
 #include "ui/effects/toggle_arrow.h"
 #include "ui/painter.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
+#include "ui/ui_utility.h"
 #include "ui/unread_badge_paint.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
@@ -89,89 +99,6 @@ constexpr auto kPlayStatusLimit = 2;
 		|| (now.month() == 1 && now.day() == 1);
 }
 
-void ShowCallsBox(not_null<Window::SessionController*> window) {
-	struct State {
-		State(not_null<Window::SessionController*> window)
-		: callsController(window)
-		, groupCallsController(window) {
-		}
-		Calls::BoxController callsController;
-		PeerListContentDelegateSimple callsDelegate;
-
-		Calls::GroupCalls::ListController groupCallsController;
-		PeerListContentDelegateSimple groupCallsDelegate;
-
-		base::unique_qptr<Ui::PopupMenu> menu;
-	};
-
-	window->show(Box([=](not_null<Ui::GenericBox*> box) {
-		const auto state = box->lifetime().make_state<State>(window);
-
-		const auto groupCalls = box->addRow(
-			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-				box,
-				object_ptr<Ui::VerticalLayout>(box)),
-			{});
-		groupCalls->hide(anim::type::instant);
-		groupCalls->toggleOn(state->groupCallsController.shownValue());
-
-		Ui::AddSubsectionTitle(
-			groupCalls->entity(),
-			tr::lng_call_box_groupcalls_subtitle());
-		state->groupCallsDelegate.setContent(groupCalls->entity()->add(
-			object_ptr<PeerListContent>(box, &state->groupCallsController),
-			{}));
-		state->groupCallsController.setDelegate(&state->groupCallsDelegate);
-		Ui::AddSkip(groupCalls->entity());
-		Ui::AddDivider(groupCalls->entity());
-		Ui::AddSkip(groupCalls->entity());
-
-		const auto content = box->addRow(
-			object_ptr<PeerListContent>(box, &state->callsController),
-			{});
-		state->callsDelegate.setContent(content);
-		state->callsController.setDelegate(&state->callsDelegate);
-
-		box->setWidth(state->callsController.contentWidth());
-		state->callsController.boxHeightValue(
-		) | rpl::start_with_next([=](int height) {
-			box->setMinHeight(height);
-		}, box->lifetime());
-		box->setTitle(tr::lng_call_box_title());
-		box->addButton(tr::lng_close(), [=] {
-			box->closeBox();
-		});
-		const auto menuButton = box->addTopButton(st::infoTopBarMenu);
-		menuButton->setClickedCallback([=] {
-			state->menu = base::make_unique_q<Ui::PopupMenu>(
-				menuButton,
-				st::popupMenuWithIcons);
-			const auto showSettings = [=] {
-				window->showSettings(
-					Settings::Calls::Id(),
-					Window::SectionShow(anim::type::instant));
-			};
-			const auto clearAll = crl::guard(box, [=] {
-				box->uiShow()->showBox(Box(Calls::ClearCallsBox, window));
-			});
-			state->menu->addAction(
-				tr::lng_settings_section_call_settings(tr::now),
-				showSettings,
-				&st::menuIconSettings);
-			if (state->callsDelegate.peerListFullRowsCount() > 0) {
-				Ui::Menu::CreateAddActionCallback(state->menu)({
-					.text = tr::lng_call_box_clear_all(tr::now),
-					.handler = clearAll,
-					.icon = &st::menuIconDeleteAttention,
-					.isAttention = true,
-				});
-			}
-			state->menu->popup(QCursor::pos());
-			return true;
-		});
-	}));
-}
-
 [[nodiscard]] rpl::producer<TextWithEntities> SetStatusLabel(
 		not_null<Main::Session*> session) {
 	const auto self = session->user();
@@ -179,10 +106,10 @@ void ShowCallsBox(not_null<Window::SessionController*> window) {
 		self,
 		Data::PeerUpdate::Flag::EmojiStatus
 	) | rpl::map([=] {
-		return (self->emojiStatusId() != 0);
+		return !!self->emojiStatusId();
 	}) | rpl::distinct_until_changed() | rpl::map([](bool has) {
 		const auto makeLink = [](const QString &text) {
-			return Ui::Text::Link(text);
+			return tr::link(text);
 		};
 		return (has
 			? tr::lng_menu_change_status
@@ -238,7 +165,7 @@ MainMenu::ToggleAccountsButton::ToggleAccountsButton(
 , _current(current) {
 	rpl::single(rpl::empty) | rpl::then(
 		Core::App().unreadBadgeChanges()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_unreadBadgeStale = true;
 		if (!_toggled) {
 			validateUnreadBadge();
@@ -254,7 +181,7 @@ MainMenu::ToggleAccountsButton::ToggleAccountsButton(
 	settings.mainMenuAccountsShownValue(
 	) | rpl::filter([=](bool value) {
 		return (_toggled != value);
-	}) | rpl::start_with_next([=](bool value) {
+	}) | rpl::on_next([=](bool value) {
 		_toggled = value;
 		_toggledAnimation.start(
 			[=] { update(); },
@@ -391,7 +318,8 @@ MainMenu::MainMenu(
 , _badge(std::make_unique<Info::Profile::Badge>(
 	this,
 	st::settingsInfoPeerBadge,
-	controller->session().user(),
+	&controller->session(),
+	Info::Profile::BadgeContentForPeer(controller->session().user()),
 	_emojiStatusPanel.get(),
 	[=] { return controller->isGifPausedAtLeastFor(GifPauseReason::Layer); },
 	kPlayStatusLimit,
@@ -425,7 +353,7 @@ MainMenu::MainMenu(
 
 	const auto shadow = Ui::CreateChild<Ui::PlainShadow>(this);
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto line = st::lineWidth;
 		shadow->setGeometry(0, st::mainMenuCoverHeight - line, width, line);
 	}, shadow->lifetime());
@@ -441,7 +369,7 @@ MainMenu::MainMenu(
 	});
 
 	_footer->heightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_telegram->moveToLeft(st::mainMenuFooterLeft, _footer->height() - st::mainMenuTelegramBottom - _telegram->height());
 		_version->moveToLeft(st::mainMenuFooterLeft, _footer->height() - st::mainMenuVersionBottom - _version->height());
 	}, _footer->lifetime());
@@ -449,18 +377,18 @@ MainMenu::MainMenu(
 	rpl::combine(
 		heightValue(),
 		_inner->heightValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateInnerControlsGeometry();
 	}, _inner->lifetime());
 
 	parentResized();
 
-	_telegram->setMarkedText(Ui::Text::Link(
+	_telegram->setMarkedText(tr::link(
 		u"Telegram Desktop"_q,
 		u"https://desktop.telegram.org"_q));
 	_telegram->setLinksTrusted();
 	_version->setMarkedText(
-		Ui::Text::Link(
+		tr::link(
 			tr::lng_settings_current_version(
 				tr::now,
 				lt_version,
@@ -469,20 +397,20 @@ MainMenu::MainMenu(
 		.append(QChar(' '))
 		.append(QChar(8211))
 		.append(QChar(' '))
-		.append(Ui::Text::Link(tr::lng_menu_about(tr::now), 2))); // Link 2.
+		.append(tr::link(tr::lng_menu_about(tr::now), 2))); // Link 2.
 	_version->setLink(
 		1,
 		std::make_shared<UrlClickHandler>(Core::App().changelogLink()));
 	_version->setLink(
 		2,
 		std::make_shared<LambdaClickHandler>([=] {
-			controller->show(Box<AboutBox>());
+			controller->show(Box(AboutBox));
 		}));
 
 	rpl::combine(
 		_toggleAccounts->rightSkipValue(),
 		rpl::single(rpl::empty) | rpl::then(_badge->updated())
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		moveBadge();
 	}, lifetime());
 	_badge->setPremiumClickCallback([=] {
@@ -490,7 +418,7 @@ MainMenu::MainMenu(
 	});
 
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
@@ -504,18 +432,18 @@ MainMenu::MainMenu(
 				[=](const QRect &r) { snowRaw->update(r); });
 			snow->setBrush(QColor(230, 230, 230));
 			_showFinished.value(
-			) | rpl::start_with_next([=](bool shown) {
+			) | rpl::on_next([=](bool shown) {
 				snow->setPaused(!shown);
 			}, snowRaw->lifetime());
 			snowRaw->paintRequest(
-			) | rpl::start_with_next([=](const QRect &r) {
+			) | rpl::on_next([=](const QRect &r) {
 				auto p = Painter(snowRaw);
 				p.fillRect(r, st::mainMenuBg);
 				drawName(p);
 				snow->paint(p, snowRaw->rect());
 			}, snowRaw->lifetime());
 			widthValue(
-			) | rpl::start_with_next([=](int width) {
+			) | rpl::on_next([=](int width) {
 				snowRaw->setGeometry(0, 0, width, st::mainMenuCoverHeight);
 			}, snowRaw->lifetime());
 			snowRaw->show();
@@ -524,13 +452,15 @@ MainMenu::MainMenu(
 			snowLifetime->add([=] { base::unique_qptr{ snowRaw }; });
 		};
 		Window::Theme::IsNightModeValue(
-		) | rpl::start_with_next([=](bool isNightMode) {
+		) | rpl::on_next([=](bool isNightMode) {
 			snowLifetime->destroy();
 			if (isNightMode) {
 				rebuild();
 			}
 		}, lifetime());
 	}
+
+	setupSwipe();
 }
 
 MainMenu::~MainMenu() = default;
@@ -594,7 +524,7 @@ void MainMenu::setupArchive() {
 		{ 0, st::mainMenuSkip, 0, st::mainMenuSkip });
 	button->setAcceptBoth(true);
 	button->clicks(
-	) | rpl::start_with_next([=](Qt::MouseButton which) {
+	) | rpl::on_next([=](Qt::MouseButton which) {
 		if (which == Qt::LeftButton) {
 			showArchive(button->clickModifiers());
 			return;
@@ -616,7 +546,7 @@ void MainMenu::setupArchive() {
 
 	const auto now = folder();
 	auto folderValue = now
-		? (rpl::single(now) | rpl::type_erased())
+		? (rpl::single(now) | rpl::type_erased)
 		: controller->session().data().chatsListChanges(
 		) | rpl::filter([](Data::Folder *folder) {
 			return folder && (folder->id() == Data::Folder::kId);
@@ -643,7 +573,7 @@ void MainMenu::setupArchive() {
 		controller->session().data().stories().sourcesChanged(
 			Data::StorySourcesList::Hidden
 		)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto isArchiveVisible = checkArchive();
 		wrap->toggle(isArchiveVisible, anim::type::normal);
 		if (!isArchiveVisible) {
@@ -674,7 +604,7 @@ void MainMenu::setupAccounts() {
 
 	std::move(
 		events.closeRequests
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeLayer();
 	}, inner->lifetime());
 
@@ -706,6 +636,14 @@ void MainMenu::parentResized() {
 
 void MainMenu::showFinished() {
 	_showFinished = true;
+
+	_controller->checkHighlightControl(
+		u"main-menu/emoji-status"_q,
+		_setEmojiStatus,
+		Settings::SubsectionTitleHighlight());
+	_controller->checkHighlightControl(
+		u"main-menu/night-mode"_q,
+		_nightThemeToggle);
 }
 
 void MainMenu::setupMenu() {
@@ -722,6 +660,23 @@ void MainMenu::setupMenu() {
 			std::move(descriptor));
 	};
 	if (!_controller->session().supportMode()) {
+		_menu->add(
+			CreateButtonWithIcon(
+				_menu,
+				tr::lng_menu_my_profile(),
+				st::mainMenuButton,
+				{ &st::menuIconProfile })
+		)->setClickedCallback([=] {
+			controller->showSection(
+				Info::Stories::Make(controller->session().user()));
+		});
+
+		SetupMenuBots(_menu, controller);
+
+		_menu->add(
+			object_ptr<Ui::PlainShadow>(_menu),
+			{ 0, st::mainMenuSkip, 0, st::mainMenuSkip });
+
 		AddMyChannelsBox(addAction(
 			tr::lng_create_group_title(),
 			{ &st::menuIconGroups }
@@ -740,40 +695,9 @@ void MainMenu::setupMenu() {
 			}
 		});
 
-		const auto wrap = _menu->add(
-			object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
-				_menu,
-				CreateButtonWithIcon(
-					_menu,
-					tr::lng_menu_my_stories(),
-					st::mainMenuButton,
-					IconDescriptor{ &st::menuIconStoriesSavedSection })));
-		const auto selfId = controller->session().userPeerId();
-		const auto stories = &controller->session().data().stories();
-		if (stories->archiveCount(selfId) > 0) {
-			wrap->toggle(true, anim::type::instant);
-		} else {
-			wrap->toggle(false, anim::type::instant);
-			if (!stories->archiveCountKnown(selfId)) {
-				stories->archiveLoadMore(selfId);
-				wrap->toggleOn(stories->archiveChanged(
-				) | rpl::filter(
-					rpl::mappers::_1 == selfId
-				) | rpl::map([=] {
-					return stories->archiveCount(selfId) > 0;
-				}) | rpl::filter(rpl::mappers::_1) | rpl::take(1));
-			}
-		}
-		wrap->entity()->setClickedCallback([=] {
-			controller->showSection(
-				Info::Stories::Make(controller->session().user()));
-		});
-
-		SetupMenuBots(_menu, controller);
-
 		addAction(
 			tr::lng_menu_contacts(),
-			{ &st::menuIconProfile }
+			{ &st::menuIconUserShow }
 		)->setClickedCallback([=] {
 			controller->show(PrepareContactsBox(controller));
 		});
@@ -781,7 +705,7 @@ void MainMenu::setupMenu() {
 			tr::lng_menu_calls(),
 			{ &st::menuIconPhone }
 		)->setClickedCallback([=] {
-			ShowCallsBox(controller);
+			::Calls::ShowCallsBox(controller);
 		});
 		addAction(
 			tr::lng_saved_messages(),
@@ -802,7 +726,7 @@ void MainMenu::setupMenu() {
 		)->toggleOn(rpl::single(
 			_controller->session().settings().supportFixChatsOrder()
 		))->toggledChanges(
-		) | rpl::start_with_next([=](bool fix) {
+		) | rpl::on_next([=](bool fix) {
 			_controller->session().settings().setSupportFixChatsOrder(fix);
 			_controller->session().saveSettings();
 		}, _menu->lifetime());
@@ -829,14 +753,14 @@ void MainMenu::setupMenu() {
 	_nightThemeToggle->toggledChanges(
 	) | rpl::filter([=](bool night) {
 		return (night != Window::Theme::IsNightMode());
-	}) | rpl::start_with_next([=](bool night) {
+	}) | rpl::on_next([=](bool night) {
 		if (Window::Theme::Background()->editingTheme()) {
 			_nightThemeSwitches.fire(!night);
 			controller->show(Ui::MakeInformBox(
 				tr::lng_theme_editor_cant_change_theme()));
 			return;
 		}
-		const auto weak = MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		const auto toggle = [=] {
 			if (!weak) {
 				Window::Theme::ToggleNightMode();
@@ -851,7 +775,7 @@ void MainMenu::setupMenu() {
 	}, _nightThemeToggle->lifetime());
 
 	Core::App().settings().systemDarkModeValue(
-	) | rpl::start_with_next([=](std::optional<bool> darkMode) {
+	) | rpl::on_next([=](std::optional<bool> darkMode) {
 		const auto darkModeEnabled
 			= Core::App().settings().systemDarkModeEnabled();
 		if (darkModeEnabled && darkMode.has_value()) {
@@ -902,13 +826,26 @@ void MainMenu::updateInnerControlsGeometry() {
 }
 
 void MainMenu::chooseEmojiStatus() {
-	if (const auto widget = _badge->widget()) {
+	if (_controller->showFrozenError()) {
+		return;
+	} else if (const auto widget = _badge->widget()) {
 		_emojiStatusPanel->show(_controller, widget, _badge->sizeTag());
 	} else {
 		ShowPremiumPreviewBox(_controller, PremiumFeature::EmojiStatus);
 	}
 }
 
+bool MainMenu::eventHook(QEvent *event) {
+	const auto type = event->type();
+	if (type == QEvent::TouchBegin
+		|| type == QEvent::TouchUpdate
+		|| type == QEvent::TouchEnd
+		|| type == QEvent::TouchCancel) {
+		QGuiApplication::sendEvent(_inner, event);
+	}
+	return RpWidget::eventHook(event);
+}
+
 void MainMenu::paintEvent(QPaintEvent *e) {
 	auto p = Painter(this);
 	const auto clip = e->rect();
@@ -963,7 +900,7 @@ void MainMenu::initResetScaleButton() {
 		return (available.width() >= st::windowMinWidth)
 			&& (available.height() >= st::windowMinHeight);
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool good) {
+	) | rpl::on_next([=](bool good) {
 		if (good) {
 			_resetScaleButton.destroy();
 		} else {
@@ -988,8 +925,8 @@ OthersUnreadState OtherAccountsUnreadStateCurrent(
 		if (account.get() == current) {
 			continue;
 		} else if (const auto session = account->maybeSession()) {
-			counter += session->data().unreadBadge();
-			if (!session->data().unreadBadgeMuted()) {
+			counter += session->data().unreadWithMentionsBadge();
+			if (!session->data().unreadWithMentionsBadgeMuted()) {
 				allMuted = false;
 			}
 		}
@@ -1009,4 +946,82 @@ rpl::producer<OthersUnreadState> OtherAccountsUnreadState(
 	});
 }
 
+base::EventFilterResult MainMenu::redirectToInnerChecked(not_null<QEvent*> e) {
+	if (_insideEventRedirect) {
+		return base::EventFilterResult::Continue;
+	}
+	const auto weak = base::make_weak(this);
+	_insideEventRedirect = true;
+	QGuiApplication::sendEvent(_inner, e);
+	if (weak) {
+		_insideEventRedirect = false;
+	}
+	return base::EventFilterResult::Cancel;
+}
+
+void MainMenu::setupSwipe() {
+	const auto outer = _controller->widget()->body();
+	base::install_event_filter(this, outer, [=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type == QEvent::TouchBegin
+			|| type == QEvent::TouchUpdate
+			|| type == QEvent::TouchEnd
+			|| type == QEvent::TouchCancel) {
+			return redirectToInnerChecked(e);
+		} else if (type == QEvent::Wheel) {
+			const auto w = static_cast<QWheelEvent*>(e.get());
+			const auto d = Ui::ScrollDeltaF(w);
+			if (std::abs(d.x()) > std::abs(d.y())) {
+				return redirectToInnerChecked(e);
+			}
+		}
+		return base::EventFilterResult::Continue;
+	});
+	const auto handles = outer->testAttribute(Qt::WA_AcceptTouchEvents);
+	if (!handles) {
+		outer->setAttribute(Qt::WA_AcceptTouchEvents);
+		lifetime().add([=] {
+			outer->setAttribute(Qt::WA_AcceptTouchEvents, false);
+		});
+	}
+
+	auto update = [=](Ui::Controls::SwipeContextData data) {
+		if (data.translation < 0) {
+			if (!_swipeBackData.callback) {
+				_swipeBackData = Ui::Controls::SetupSwipeBack(
+					this,
+					[=]() -> std::pair<QColor, QColor> {
+						return {
+							st::historyForwardChooseBg->c,
+							st::historyForwardChooseFg->c,
+						};
+					});
+			}
+			_swipeBackData.callback(data);
+			return;
+		} else if (_swipeBackData.lifetime) {
+			_swipeBackData = {};
+		}
+	};
+
+	auto init = [=](Ui::Controls::SwipeHandlerInitData data) {
+		if (data.direction != Qt::LeftToRight) {
+			return Ui::Controls::SwipeHandlerFinishData();
+		}
+		if (_emojiStatusPanel && _emojiStatusPanel->hasFocus()) {
+			return Ui::Controls::SwipeHandlerFinishData();
+		}
+		return Ui::Controls::DefaultSwipeBackHandlerFinishData([=] {
+			closeLayer();
+		});
+	};
+
+	Ui::Controls::SetupSwipeHandler({
+		.widget = _inner,
+		.scroll = _scroll.data(),
+		.update = std::move(update),
+		.init = std::move(init),
+	});
+}
+
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_main_menu.h b/Telegram/SourceFiles/window/window_main_menu.h
index 3089151e4f25b0..36a3087a0548be 100644
--- a/Telegram/SourceFiles/window/window_main_menu.h
+++ b/Telegram/SourceFiles/window/window_main_menu.h
@@ -12,8 +12,13 @@ For license and copyright information please follow this link:
 #include "base/binary_guard.h"
 #include "ui/rp_widget.h"
 #include "ui/unread_badge.h"
+#include "ui/controls/swipe_handler_data.h"
 #include "ui/layers/layer_widget.h"
 
+namespace base {
+enum class EventFilterResult;
+} // namespace base
+
 namespace Ui {
 class IconButton;
 class FlatLabel;
@@ -49,7 +54,11 @@ class MainMenu final : public Ui::LayerWidget {
 	void parentResized() override;
 	void showFinished() override;
 
-protected:
+private:
+	class ToggleAccountsButton;
+	class ResetScaleButton;
+
+	bool eventHook(QEvent *event) override;
 	void paintEvent(QPaintEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 
@@ -57,10 +66,6 @@ class MainMenu final : public Ui::LayerWidget {
 		setFocus();
 	}
 
-private:
-	class ToggleAccountsButton;
-	class ResetScaleButton;
-
 	void moveBadge();
 	void setupUserpicButton();
 	void setupAccounts();
@@ -73,6 +78,10 @@ class MainMenu final : public Ui::LayerWidget {
 	void initResetScaleButton();
 	void toggleAccounts();
 	void chooseEmojiStatus();
+	void setupSwipe();
+
+	[[nodiscard]] base::EventFilterResult redirectToInnerChecked(
+		not_null<QEvent*> e);
 
 	void drawName(Painter &p);
 
@@ -99,7 +108,10 @@ class MainMenu final : public Ui::LayerWidget {
 	base::Timer _nightThemeSwitch;
 	base::unique_qptr<Ui::PopupMenu> _contextMenu;
 
+	Ui::Controls::SwipeBackResult _swipeBackData;
+
 	rpl::variable<bool> _showFinished = false;
+	bool _insideEventRedirect = false;
 
 };
 
diff --git a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
index bf15aacba58d8e..7ee2c7b0d79e77 100644
--- a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
@@ -37,50 +37,21 @@ For license and copyright information please follow this link:
 #include "styles/style_window.h"
 
 namespace Window {
-namespace {
-
-class VersionLabel final
-	: public Ui::FlatLabel
-	, public Ui::AbstractTooltipShower {
-public:
-	using Ui::FlatLabel::FlatLabel;
-
-	void clickHandlerActiveChanged(
-			const ClickHandlerPtr &action,
-			bool active) override {
-		update();
-		if (active && action && !action->dragText().isEmpty()) {
-			Ui::Tooltip::Show(1000, this);
-		} else {
-			Ui::Tooltip::Hide();
-		}
-	}
-
-	QString tooltipText() const override {
-		return u"Build date: %1."_q.arg(__DATE__);
-	}
-
-	QPoint tooltipPos() const override {
-		return QCursor::pos();
-	}
-
-	bool tooltipWindowActive() const override {
-		return Ui::AppInFocus() && Ui::InFocusChain(window());
-	}
-
-};
-
-} // namespace
 
 [[nodiscard]] not_null<Ui::FlatLabel*> AddVersionLabel(
 		not_null<Ui::RpWidget*> parent) {
-	return (Platform::IsMacStoreBuild() || Platform::IsWindowsStoreBuild())
-		? Ui::CreateChild<Ui::FlatLabel>(
-			parent.get(),
-			st::mainMenuVersionLabel)
-		: Ui::CreateChild<VersionLabel>(
-			parent.get(),
-			st::mainMenuVersionLabel);
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		parent.get(),
+		st::mainMenuVersionLabel);
+	if constexpr (!Platform::IsMacStoreBuild()
+		&& !Platform::IsWindowsStoreBuild()) {
+		Ui::InstallTooltip(label, [] {
+			return u"Build date: %1.\nQt version: %2."_q
+				.arg(__DATE__)
+				.arg(QT_VERSION_STR);
+		});
+	}
+	return label;
 }
 
 not_null<Ui::SettingsButton*> AddMyChannelsBox(
@@ -112,7 +83,7 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 	const auto addIcon = [=](not_null<Ui::GenericBox*> box) {
 		const auto widget = box->addRow(object_ptr<Ui::RpWidget>(box));
 		widget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(widget);
 			p.setFont(st::boxTextFont);
 			p.setPen(st::windowSubTextFg);
@@ -139,7 +110,7 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 				const auto icon = owned.get();
 				widget->lifetime().add([kept = std::move(owned)]{});
 				widget->paintRequest(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					auto p = QPainter(widget);
 					icon->paint(p, (widget->width() - icon->width()) / 2, 0);
 				}, widget->lifetime());
@@ -165,43 +136,42 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 		st->photoSize = st::defaultPeerListItem.photoSize;
 		st->size = QSize(st->photoSize, st->photoSize);
 
-		class Button final : public Ui::SettingsButton {
-		public:
-			using Ui::SettingsButton::SettingsButton;
-
-			void setPeer(not_null<PeerData*> p) {
-				const auto c = p->asChannel();
-				const auto g = p->asChat();
-				_text.setText(
-					st::defaultPeerListItem.nameStyle,
-					((c && c->isMegagroup()) ? u"[s] "_q : QString())
-						+ p->name());
-				const auto count = c ? c->membersCount() : g->count;
-				_status.setText(
-					st::defaultTextStyle,
-					(g && !g->amIn())
-						? tr::lng_chat_status_unaccessible(tr::now)
-						: !p->username().isEmpty()
-						? ('@' + p->username())
-						: (count > 0)
-						? ((c && !c->isMegagroup())
-							? tr::lng_chat_status_subscribers
-							: tr::lng_chat_status_members)(
-								tr::now,
-								lt_count,
-								count)
-						: QString());
-			}
-
-			int resizeGetHeight(int) override {
-				return st::defaultPeerListItem.height;
-			}
-
-			void paintEvent(QPaintEvent *e) override {
-				Ui::SettingsButton::paintEvent(e);
-				auto p = Painter(this);
+		const auto megagroupMark = u"[s] "_q;
+		const auto add = [&](
+				not_null<PeerData*> peer,
+				not_null<Ui::VerticalLayout*> container) {
+			const auto row = container->add(
+				object_ptr<Ui::AbstractButton>::fromRaw(
+					Ui::CreateSimpleSettingsButton(
+						container,
+						st::defaultRippleAnimation,
+						st::defaultSettingsButton.textBgOver)));
+			row->resize(row->width(), st::defaultPeerListItem.height);
+			const auto c = peer->asChannel();
+			const auto g = peer->asChat();
+			const auto count = c ? c->membersCount() : g->count;
+			const auto text = std::make_shared<Ui::Text::String>(
+				st::defaultPeerListItem.nameStyle,
+				((c && c->isMegagroup()) ? megagroupMark : QString())
+					+ peer->name());
+			const auto status = std::make_shared<Ui::Text::String>(
+				st::defaultTextStyle,
+				(g && !g->amIn())
+					? tr::lng_chat_status_unaccessible(tr::now)
+					: !peer->username().isEmpty()
+					? ('@' + peer->username())
+					: (count > 0)
+					? ((c && !c->isMegagroup())
+						? tr::lng_chat_status_subscribers
+						: tr::lng_chat_status_members)(
+							tr::now,
+							lt_count,
+							count)
+					: QString());
+			row->paintRequest() | rpl::on_next([=] {
+				auto p = QPainter(row);
 				const auto &st = st::defaultPeerListItem;
-				const auto availableWidth = width()
+				const auto availableWidth = row->width()
 					- st::boxRowPadding.right()
 					- st.namePosition.x();
 				p.setPen(st.nameFg);
@@ -211,24 +181,11 @@ not_null<Ui::SettingsButton*> AddMyChannelsBox(
 					.availableWidth = availableWidth,
 					.elisionLines = 1,
 				};
-				_text.draw(p, context);
+				text->draw(p, context);
 				p.setPen(st.statusFg);
 				context.position = st.statusPosition;
-				_status.draw(p, context);
-			}
-
-		private:
-			Ui::Text::String _text;
-			Ui::Text::String _status;
-
-		};
-
-		const auto add = [&](
-				not_null<PeerData*> peer,
-				not_null<Ui::VerticalLayout*> container) {
-			const auto row = container->add(
-				object_ptr<Button>(container, rpl::single(QString())));
-			row->setPeer(peer);
+				status->draw(p, context);
+			}, row->lifetime());
 			row->setClickedCallback([=] {
 				controller->showPeerHistory(peer);
 			});
@@ -331,7 +288,7 @@ void SetupMenuBots(
 		rpl::empty
 	) | rpl::then(
 		bots->attachBotsUpdates()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto width = container->widthNoMargins();
 		wrap->clear();
 		for (const auto &bot : bots->attachBots()) {
@@ -342,7 +299,7 @@ void SetupMenuBots(
 				if (!*iconLoadLifetime) {
 					auto &session = user->session();
 					*iconLoadLifetime = session.downloaderTaskFinished(
-					) | rpl::start_with_next([=] {
+					) | rpl::on_next([=] {
 						if (media->loaded()) {
 							iconLoadLifetime->destroy();
 							bots->notifyBotIconLoaded();
@@ -362,16 +319,16 @@ void SetupMenuBots(
 				button,
 				bot.media);
 			button->heightValue(
-			) | rpl::start_with_next([=](int height) {
+			) | rpl::on_next([=](int height) {
 				icon->move(
 					st::mainMenuButton.iconLeft,
 					(height - icon->height()) / 2);
 			}, button->lifetime());
-			const auto weak = Ui::MakeWeak(container);
+			const auto weak = base::make_weak(container);
 			const auto show = controller->uiShow();
 			button->setAcceptBoth(true);
 			button->clicks(
-			) | rpl::start_with_next([=](Qt::MouseButton which) {
+			) | rpl::on_next([=](Qt::MouseButton which) {
 				if (which == Qt::LeftButton) {
 					bots->open({
 						.bot = user,
diff --git a/Telegram/SourceFiles/window/window_media_preview.cpp b/Telegram/SourceFiles/window/window_media_preview.cpp
index edbaab90b23d86..e81ece340a79b0 100644
--- a/Telegram/SourceFiles/window/window_media_preview.cpp
+++ b/Telegram/SourceFiles/window/window_media_preview.cpp
@@ -7,24 +7,26 @@ For license and copyright information please follow this link:
 */
 #include "window/window_media_preview.h"
 
-#include "chat_helpers/stickers_lottie.h"
 #include "chat_helpers/stickers_emoji_pack.h"
-#include "data/data_photo.h"
-#include "data/data_photo_media.h"
-#include "data/data_document.h"
+#include "chat_helpers/stickers_lottie.h"
 #include "data/data_document_media.h"
+#include "data/data_document.h"
+#include "data/data_photo_media.h"
+#include "data/data_photo.h"
 #include "data/data_session.h"
 #include "data/stickers/data_stickers.h"
 #include "history/view/media/history_view_sticker.h"
-#include "ui/image/image.h"
-#include "ui/emoji_config.h"
-#include "ui/ui_utility.h"
 #include "lottie/lottie_single_player.h"
 #include "main/main_session.h"
+#include "ui/emoji_config.h"
+#include "ui/image/image.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
+#include "ui/ui_utility.h"
 #include "window/window_session_controller.h"
-#include "styles/style_layers.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_chat.h"
+#include "styles/style_layers.h"
 
 namespace Window {
 namespace {
@@ -44,12 +46,12 @@ MediaPreviewWidget::MediaPreviewWidget(
 , _emojiSize(Ui::Emoji::GetSizeLarge() / style::DevicePixelRatio()) {
 	setAttribute(Qt::WA_TransparentForMouseEvents);
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (_document && _document->emojiUsesTextColor()) {
 			_cache = QPixmap();
 		}
@@ -60,11 +62,16 @@ QRect MediaPreviewWidget::updateArea() const {
 	const auto size = currentDimensions();
 	const auto position = QPoint(
 		(width() - size.width()) / 2,
-		(height() - size.height()) / 2);
+		(height() - size.height()) / 2 + _contentShiftY);
 	const auto premium = _document && _document->isPremiumSticker();
 	const auto adjusted = position
 		- (premium
-			? QPoint(size.width() - (size.width() / 2), size.height() / 2)
+			? QPoint(
+				size.width() - (size.width() / 2),
+				size.height() / 2)
+			: QPoint())
+		+ (!_customPadding.isNull()
+			? QPoint(0, _customPadding.top())
 			: QPoint());
 	return QRect(adjusted, size * (premium ? 2 : 1));
 }
@@ -72,6 +79,14 @@ QRect MediaPreviewWidget::updateArea() const {
 void MediaPreviewWidget::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
+	if (_customRadius > 0) {
+		auto hq = PainterHighQualityEnabler(p);
+		const auto r = rect() - _backgroundMargins;
+		auto path = QPainterPath();
+		path.addRoundedRect(r, _customRadius, _customRadius);
+		p.setClipPath(path);
+	}
+
 	const auto r = e->rect();
 	const auto factor = style::DevicePixelRatio();
 	const auto dimensions = currentDimensions();
@@ -94,20 +109,33 @@ void MediaPreviewWidget::paintEvent(QPaintEvent *e) {
 	//	: 1;
 	const auto pixmap = image.isNull() ? currentImage() : QPixmap();
 	const auto size = image.isNull() ? pixmap.size() : image.size();
-	int w = size.width() / factor, h = size.height() / factor;
-	auto shown = _a_shown.value(_hiding ? 0. : 1.);
+	const auto w = size.width() / factor;
+	const auto h = size.height() / factor;
+	const auto shown = _a_shown.value(_hiding ? 0. : 1.);
 	if (!_a_shown.animating()) {
 		if (_hiding) {
 			hide();
-			_controller->disableGifPauseReason(Window::GifPauseReason::MediaPreview);
+			_controller->disableGifPauseReason(
+				Window::GifPauseReason::MediaPreview);
 			return;
 		}
 	} else {
 		p.setOpacity(shown);
-//		w = qMax(qRound(w * (st::stickerPreviewMin + ((1. - st::stickerPreviewMin) * shown)) / 2.) * 2 + int(w % 2), 1);
-//		h = qMax(qRound(h * (st::stickerPreviewMin + ((1. - st::stickerPreviewMin) * shown)) / 2.) * 2 + int(h % 2), 1);
+//		w = qMax(qRound(w * (st::stickerPreviewMin
+//			+ ((1. - st::stickerPreviewMin) * shown)) / 2.) * 2
+//			+ int(w % 2), 1);
+//		h = qMax(qRound(h * (st::stickerPreviewMin
+//			+ ((1. - st::stickerPreviewMin) * shown)) / 2.) * 2
+//			+ int(h % 2), 1);
+	}
+	if (_backgroundMargins.isNull()) {
+		p.fillRect(r, st::stickerPreviewBg);
+	} else {
+		p.fillRect(rect() - _backgroundMargins, st::stickerPreviewBg);
+	}
+	if (!_customPadding.isNull()) {
+		p.translate(0, _customPadding.top());
 	}
-	p.fillRect(r, st::stickerPreviewBg);
 	const auto position = innerPosition({ w, h });
 	if (image.isNull()) {
 		p.drawPixmap(position, pixmap);
@@ -121,10 +149,11 @@ void MediaPreviewWidget::paintEvent(QPaintEvent *e) {
 	}
 	if (!_emojiList.empty()) {
 		const auto emojiCount = _emojiList.size();
-		const auto emojiWidth = (emojiCount * _emojiSize) + (emojiCount - 1) * st::stickerEmojiSkip;
+		const auto emojiWidth = (emojiCount * _emojiSize)
+			+ (emojiCount - 1) * st::stickerEmojiSkip;
 		auto emojiLeft = (width() - emojiWidth) / 2;
 		const auto esize = Ui::Emoji::GetSizeLarge();
-		for (const auto emoji : _emojiList) {
+		for (const auto &emoji : _emojiList) {
 			Ui::Emoji::Draw(
 				p,
 				emoji,
@@ -152,7 +181,7 @@ QPoint MediaPreviewWidget::innerPosition(QSize size) const {
 	if (!_document || !_document->isPremiumSticker()) {
 		return QPoint(
 			(width() - size.width()) / 2,
-			(height() - size.height()) / 2);
+			(height() - size.height()) / 2 + _contentShiftY);
 	}
 	const auto outer = size * kPremiumMultiplier;
 	const auto shift = size.width() * kPremiumShift;
@@ -166,7 +195,7 @@ QPoint MediaPreviewWidget::outerPosition(QSize size) const {
 	const auto outer = size * kPremiumMultiplier;
 	return QPoint(
 		(width() - outer.width()) / 2,
-		(height() - outer.height()) / 2);
+		(height() - outer.height()) / 2 + _contentShiftY);
 }
 
 void MediaPreviewWidget::showPreview(
@@ -210,10 +239,14 @@ void MediaPreviewWidget::startShow() {
 	if (isHidden() || _a_shown.animating()) {
 		if (isHidden()) {
 			show();
-			_controller->enableGifPauseReason(Window::GifPauseReason::MediaPreview);
+			_controller->enableGifPauseReason(
+				Window::GifPauseReason::MediaPreview);
 		}
 		_hiding = false;
-		_a_shown.start([=] { update(); }, 0., 1., st::stickerPreviewDuration);
+		const auto duration = _customDuration
+			? _customDuration
+			: st::stickerPreviewDuration;
+		_a_shown.start([=] { update(); }, 0., 1., duration);
 	} else {
 		update();
 	}
@@ -227,7 +260,10 @@ void MediaPreviewWidget::hidePreview() {
 		_cache = currentImage();
 	}
 	_hiding = true;
-	_a_shown.start([=] { update(); }, 1., 0., st::stickerPreviewDuration);
+	const auto duration = _customDuration
+		? _customDuration
+		: st::stickerPreviewDuration;
+	_a_shown.start([=] { update(); }, 1., 0., duration);
 	_photo = nullptr;
 	_photoMedia = nullptr;
 	_document = nullptr;
@@ -237,11 +273,12 @@ void MediaPreviewWidget::hidePreview() {
 
 void MediaPreviewWidget::fillEmojiString() {
 	_emojiList.clear();
-	if (_photo) {
+	if (_photo || _hideEmoji) {
 		return;
 	}
-	if (auto sticker = _document->sticker()) {
-		if (auto list = _document->owner().stickers().getEmojiListFromSet(_document)) {
+	if (const auto sticker = _document->sticker()) {
+		if (const auto list
+			= _document->owner().stickers().getEmojiListFromSet(_document)) {
 			_emojiList = std::move(*list);
 			while (_emojiList.size() > kStickerPreviewEmojiLimit) {
 				_emojiList.pop_back();
@@ -262,6 +299,44 @@ void MediaPreviewWidget::resetGifAndCache() {
 	_cachedSize = QSize();
 }
 
+void MediaPreviewWidget::setCustomPadding(const QMargins &padding) {
+	_customPadding = padding;
+	_cachedSize = QSize();
+	update();
+}
+
+void MediaPreviewWidget::setBackgroundMargins(const QMargins &margins) {
+	_backgroundMargins = margins;
+	update();
+}
+
+void MediaPreviewWidget::setCustomRadius(int radius) {
+	_customRadius = radius;
+	update();
+}
+
+void MediaPreviewWidget::setCustomDuration(crl::time duration) {
+	_customDuration = duration;
+}
+
+void MediaPreviewWidget::setHideEmoji(bool hide) {
+	_hideEmoji = hide;
+	if (hide) {
+		_emojiList.clear();
+	}
+}
+
+void MediaPreviewWidget::setContentShift(int y) {
+	_contentShiftY = y;
+	_cachedSize = QSize();
+	update();
+}
+
+int MediaPreviewWidget::contentBottom() const {
+	const auto s = currentDimensions();
+	return (height() + s.height()) / 2 + _contentShiftY;
+}
+
 QSize MediaPreviewWidget::currentDimensions() const {
 	if (!_cachedSize.isEmpty()) {
 		return _cachedSize;
@@ -271,15 +346,19 @@ QSize MediaPreviewWidget::currentDimensions() const {
 		return _cachedSize;
 	}
 
-	QSize result, box;
+	auto result = QSize();
+	auto box = QSize();
 	if (_photo) {
 		result = QSize(_photo->width(), _photo->height());
-		const auto skip = st::defaultBox.margin.top();
-		box = QSize(width() - 2 * skip, height() - 2 * skip);
+		const auto skip = st::mediaPreviewPhotoSkip;
+		const auto shiftSkip = 2 * std::abs(_contentShiftY);
+		box = QSize(width() - 2 * skip, height() - 2 * skip - shiftSkip);
 	} else {
 		result = _document->dimensions;
 		if (result.isEmpty()) {
-			const auto &gif = (_gif && _gif->ready()) ? _gif : _gifThumbnail;
+			const auto &gif = (_gif && _gif->ready())
+				? _gif
+				: _gifThumbnail;
 			if (gif && gif->ready()) {
 				result = QSize(gif->width(), gif->height());
 			}
@@ -293,15 +372,24 @@ QSize MediaPreviewWidget::currentDimensions() const {
 			box = QSize(2 * st::maxStickerSize, 2 * st::maxStickerSize);
 		}
 	}
-	result = QSize(qMax(style::ConvertScale(result.width()), 1), qMax(style::ConvertScale(result.height()), 1));
-	if (result.width() > box.width()) {
-		result.setHeight(qMax((box.width() * result.height()) / result.width(), 1));
-		result.setWidth(box.width());
-	}
-	if (result.height() > box.height()) {
-		result.setWidth(qMax((box.height() * result.width()) / result.height(), 1));
-		result.setHeight(box.height());
+	result = QSize(
+		std::max(style::ConvertScale(result.width()), 1),
+		std::max(style::ConvertScale(result.height()), 1));
+
+	if (!_customPadding.isNull()) {
+		const auto emojiHeight = _emojiList.empty() ? 0 : (_emojiSize * 3);
+		const auto widgetBox = QSize(
+			width() - rect::m::sum::h(_customPadding),
+			height() - rect::m::sum::v(_customPadding) - emojiHeight);
+		result = result.scaled(widgetBox, Qt::KeepAspectRatio);
+	} else {
+		result = result.scaled(box, Qt::KeepAspectRatio);
 	}
+
+	result = QSize(
+		std::max(result.width(), 1),
+		std::max(result.height(), 1));
+
 	if (_photo) {
 		_cachedSize = result;
 	}
@@ -344,7 +432,9 @@ void MediaPreviewWidget::setupLottie() {
 	} else {
 		const auto size = currentDimensions();
 		_lottie = std::make_unique<Lottie::SinglePlayer>(
-			Lottie::ReadContent(_documentMedia->bytes(), _document->filepath()),
+			Lottie::ReadContent(
+				_documentMedia->bytes(),
+				_document->filepath()),
 			Lottie::FrameRequest{ size * factor },
 			Lottie::Quality::High);
 	}
@@ -357,9 +447,9 @@ void MediaPreviewWidget::setupLottie() {
 		});
 	};
 
-	_lottie->updates() | rpl::start_with_next(handler, lifetime());
+	_lottie->updates() | rpl::on_next(handler, lifetime());
 	if (_effect) {
-		_effect->updates() | rpl::start_with_next(handler, lifetime());
+		_effect->updates() | rpl::on_next(handler, lifetime());
 	}
 }
 
@@ -374,14 +464,15 @@ QPixmap MediaPreviewWidget::currentImage() const {
 					_document);
 				if (_lottie && _lottie->ready()) {
 					return QPixmap();
-				} else if (const auto image = _documentMedia->getStickerLarge()) {
-					QSize s = currentDimensions();
+				} else if (const auto image
+						= _documentMedia->getStickerLarge()) {
+					const auto s = currentDimensions();
 					_cache = image->pix(s);
 					_cacheStatus = CacheLoaded;
 				} else if (_cacheStatus != CacheThumbLoaded
 					&& _document->hasThumbnail()
 					&& _documentMedia->thumbnail()) {
-					QSize s = currentDimensions();
+					const auto s = currentDimensions();
 					_cache = _documentMedia->thumbnail()->pix(s, blur);
 					if (_document && _document->emojiUsesTextColor()) {
 						_cache = Ui::PixmapFromImage(
@@ -400,18 +491,21 @@ QPixmap MediaPreviewWidget::currentImage() const {
 			if (gif && gif->started()) {
 				const auto paused = _controller->isGifPausedAtLeastFor(
 					Window::GifPauseReason::MediaPreview);
-				return QPixmap::fromImage(gif->current(
-					{ .frame = currentDimensions(), .keepAlpha = webm },
-					paused ? 0 : crl::now()), Qt::ColorOnly);
+				return QPixmap::fromImage(
+					gif->current(
+						{ .frame = currentDimensions(), .keepAlpha = webm },
+						paused ? 0 : crl::now()),
+					Qt::ColorOnly);
 			}
 			if (_cacheStatus != CacheThumbLoaded
 				&& _document->hasThumbnail()) {
-				QSize s = currentDimensions();
+				const auto s = currentDimensions();
 				const auto thumbnail = _documentMedia->thumbnail();
 				if (thumbnail) {
 					_cache = thumbnail->pix(s, blur);
 					_cacheStatus = CacheThumbLoaded;
-				} else if (const auto blurred = _documentMedia->thumbnailInline()) {
+				} else if (const auto blurred
+						= _documentMedia->thumbnailInline()) {
 					_cache = blurred->pix(s, blur);
 					_cacheStatus = CacheThumbLoaded;
 				}
@@ -420,22 +514,23 @@ QPixmap MediaPreviewWidget::currentImage() const {
 	} else if (_photo) {
 		if (_cacheStatus != CacheLoaded) {
 			if (_photoMedia->loaded()) {
-				QSize s = currentDimensions();
+				const auto s = currentDimensions();
 				_cache = _photoMedia->image(Data::PhotoSize::Large)->pix(s);
 				_cacheStatus = CacheLoaded;
 			} else {
 				_photo->load(_origin);
 				if (_cacheStatus != CacheThumbLoaded) {
-					QSize s = currentDimensions();
-					if (const auto thumbnail = _photoMedia->image(
-							Data::PhotoSize::Thumbnail)) {
-						_cache = thumbnail->pix(s, blur);
+					const auto s = currentDimensions();
+					if (const auto thumb
+							= _photoMedia->image(Data::PhotoSize::Thumbnail)) {
+						_cache = thumb->pix(s, blur);
 						_cacheStatus = CacheThumbLoaded;
-					} else if (const auto small = _photoMedia->image(
-							Data::PhotoSize::Small)) {
+					} else if (const auto small
+							= _photoMedia->image(Data::PhotoSize::Small)) {
 						_cache = small->pix(s, blur);
 						_cacheStatus = CacheThumbLoaded;
-					} else if (const auto blurred = _photoMedia->thumbnailInline()) {
+					} else if (const auto blurred
+							= _photoMedia->thumbnailInline()) {
 						_cache = blurred->pix(s, blur);
 						_cacheStatus = CacheThumbLoaded;
 					} else {
@@ -534,6 +629,10 @@ void MediaPreviewWidget::clipCallback(
 }
 
 MediaPreviewWidget::~MediaPreviewWidget() {
+	if (!isHidden()) {
+		_controller->disableGifPauseReason(
+			Window::GifPauseReason::MediaPreview);
+	}
 }
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_media_preview.h b/Telegram/SourceFiles/window/window_media_preview.h
index 686e7560f7b1b6..f7361d3fddade5 100644
--- a/Telegram/SourceFiles/window/window_media_preview.h
+++ b/Telegram/SourceFiles/window/window_media_preview.h
@@ -38,6 +38,13 @@ class MediaPreviewWidget final : public Ui::RpWidget {
 		Data::FileOrigin origin,
 		not_null<PhotoData*> photo);
 	void hidePreview();
+	void setCustomPadding(const QMargins &padding = QMargins());
+	void setBackgroundMargins(const QMargins &margins = QMargins());
+	void setCustomRadius(int radius);
+	void setCustomDuration(crl::time duration);
+	void setHideEmoji(bool hide);
+	void setContentShift(int y);
+	[[nodiscard]] int contentBottom() const;
 
 	~MediaPreviewWidget();
 
@@ -87,6 +94,12 @@ class MediaPreviewWidget final : public Ui::RpWidget {
 	mutable CacheStatus _cacheStatus = CacheNotLoaded;
 	mutable QPixmap _cache;
 	mutable QSize _cachedSize;
+	QMargins _customPadding;
+	QMargins _backgroundMargins;
+	int _customRadius = 0;
+	crl::time _customDuration = 0;
+	bool _hideEmoji = false;
+	int _contentShiftY = 0;
 
 };
 
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 4745fa37794b5c..2f9cf604aef042 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -7,28 +7,35 @@ For license and copyright information please follow this link:
 */
 #include "window/window_peer_menu.h"
 
-#include "api/api_report.h"
+#include "base/call_delayed.h"
 #include "menu/menu_check_item.h"
+#include "boxes/about_box.h"
 #include "boxes/share_box.h"
 #include "boxes/star_gift_box.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "chat_helpers/message_field.h"
 #include "chat_helpers/share_message_phrase_factory.h"
+#include "ui/basic_click_handlers.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/widgets/fields/input_field.h"
 #include "api/api_chat_participants.h"
+#include "api/api_global_privacy.h"
 #include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
 #include "ui/boxes/confirm_box.h"
 #include "base/random.h"
 #include "base/options.h"
 #include "base/unixtime.h"
+#include "base/unique_qptr.h"
 #include "base/qt/qt_key_modifiers.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/max_invite_box.h"
 #include "boxes/moderate_messages_box.h"
+#include "boxes/select_future_owner_box.h"
 #include "boxes/choose_filter_box.h"
 #include "boxes/create_poll_box.h"
+#include "boxes/edit_todo_list_box.h"
 #include "boxes/pin_messages_box.h"
 #include "boxes/premium_limits_box.h"
 #include "boxes/report_messages_box.h"
@@ -36,12 +43,13 @@ For license and copyright information please follow this link:
 #include "boxes/peers/add_participants_box.h"
 #include "boxes/peers/edit_forum_topic_box.h"
 #include "boxes/peers/edit_contact_box.h"
+#include "boxes/peers/prepare_short_info_box.h"
 #include "calls/calls_instance.h"
 #include "inline_bots/bot_attach_web_view.h" // InlineBots::PeerType.
-#include "ui/boxes/report_box_graphics.h"
 #include "ui/toast/toast.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
+#include "ui/widgets/chat_filters_tabs_strip.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/popup_menu.h"
@@ -49,7 +57,9 @@ For license and copyright information please follow this link:
 #include "ui/layers/generic_box.h"
 #include "ui/delayed_activation.h"
 #include "ui/vertical_list.h"
+#include "ui/controls/feature_list.h"
 #include "ui/ui_utility.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "menu/menu_mute.h"
@@ -59,26 +69,34 @@ For license and copyright information please follow this link:
 #include "api/api_blocked_peers.h"
 #include "api/api_chat_filters.h"
 #include "api/api_polls.h"
+#include "api/api_todo_lists.h"
 #include "api/api_updates.h"
 #include "mtproto/mtproto_config.h"
 #include "history/history.h"
-#include "history/history_item_helpers.h" // GetErrorTextForSending.
+#include "history/history_item_helpers.h" // GetErrorForSending.
+#include "history/history_item_components.h"
+#include "history/view/controls/history_view_forward_panel.h"
 #include "history/view/history_view_context_menu.h"
+#include "history/view/history_view_schedule_box.h"
 #include "window/window_separate_id.h"
 #include "window/window_session_controller.h"
 #include "window/window_controller.h"
-#include "settings/settings_advanced.h"
+#include "settings/sections/settings_advanced.h"
+#include "settings/sections/settings_premium.h"
+#include "settings/settings_common.h"
 #include "support/support_helper.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "info/channel_statistics/boosts/info_boosts_widget.h"
 #include "info/channel_statistics/earn/info_channel_earn_widget.h"
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "info/profile/info_profile_cover.h"
 #include "info/profile/info_profile_values.h"
 #include "info/statistics/info_statistics_widget.h"
 #include "info/stories/info_stories_widget.h"
 #include "data/components/scheduled_messages.h"
 #include "data/notify/data_notify_settings.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_changes.h"
 #include "data/data_session.h"
 #include "data/data_folder.h"
@@ -88,18 +106,27 @@ For license and copyright information please follow this link:
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
 #include "data/data_user.h"
+#include "data/data_saved_messages.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_histories.h"
 #include "data/data_chat_filters.h"
+#include "data/data_peer_values.h"
 #include "dialogs/dialogs_key.h"
 #include "core/application.h"
+#include "core/ui_integration.h"
 #include "export/export_manager.h"
+#include "boxes/peers/edit_participants_box.h"
 #include "boxes/peers/edit_peer_info_box.h"
+#include "boxes/premium_preview_box.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_window.h" // st::windowMinWidth
 #include "styles/style_menu_icons.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
 
 #include <QAction>
 #include <QtWidgets/QApplication>
@@ -131,20 +158,23 @@ void ShareBotGame(
 		randomId,
 		Data::Histories::PrepareMessage<MTPmessages_SendMedia>(
 			MTP_flags(flags),
-			history->peer->input,
+			history->peer->input(),
 			Data::Histories::ReplyToPlaceholder(),
 			MTP_inputMediaGame(
 				MTP_inputGameShortName(
-					bot->inputUser,
+					bot->inputUser(),
 					MTP_string(shortName))),
 			MTP_string(),
 			MTP_long(randomId),
 			MTPReplyMarkup(),
 			MTPVector<MTPMessageEntity>(),
-			MTP_int(0), // schedule_date
+			MTPint(), // schedule_date
+			MTPint(), // schedule_repeat_period
 			MTPInputPeer(), // send_as
 			MTPInputQuickReplyShortcut(),
-			MTPlong()
+			MTPlong(),
+			MTPlong(),
+			MTPSuggestedPost()
 		), [=](const MTPUpdates &, const MTP::Response &) {
 	}, [=](const MTP::Error &error, const MTP::Response &) {
 		history->session().api().sendMessageFail(error, history->peer);
@@ -161,17 +191,35 @@ namespace {
 constexpr auto kArchivedToastDuration = crl::time(5000);
 constexpr auto kMaxUnreadWithoutConfirmation = 1000;
 
+[[nodiscard]] QString LookupMemberRank(
+		not_null<PeerData*> peer,
+		not_null<UserData*> user) {
+	if (const auto chat = peer->asChat()) {
+		const auto i = chat->memberRanks.find(peerToUser(user->id));
+		return (i != chat->memberRanks.end()) ? i->second : QString();
+	} else if (const auto channel = peer->asChannel()) {
+		if (channel->mgInfo) {
+			const auto i = channel->mgInfo->memberRanks.find(
+				peerToUser(user->id));
+			return (i != channel->mgInfo->memberRanks.end())
+				? i->second
+				: QString();
+		}
+	}
+	return QString();
+}
+
 base::options::toggle ViewProfileInChatsListContextMenu({
 	.id = kOptionViewProfileInChatsListContextMenu,
 	.name = "Add \"View Profile\"",
-	.description = "Add \"View Profile\" to context menu in chats list",
+	.description = "Add \"View Profile\" to context menu in chat list",
 });
 
 void SetActionText(not_null<QAction*> action, rpl::producer<QString> &&text) {
 	const auto lifetime = Ui::CreateChild<rpl::lifetime>(action.get());
 	std::move(
 		text
-	) | rpl::start_with_next([=](const QString &actionText) {
+	) | rpl::on_next([=](const QString &actionText) {
 		action->setText(actionText);
 	}, *lifetime);
 }
@@ -224,32 +272,6 @@ void PeerMenuAddMuteSubmenuAction(
 	}
 }
 
-void ForwardToSelf(
-		std::shared_ptr<Main::SessionShow> show,
-		const Data::ForwardDraft &draft) {
-	const auto session = &show->session();
-	const auto history = session->data().history(session->user());
-	auto resolved = history->resolveForwardDraft(draft);
-	if (!resolved.items.empty()) {
-		const auto count = resolved.items.size();
-		auto action = Api::SendAction(history);
-		action.clearDraft = false;
-		action.generateLocal = false;
-		session->api().forwardMessages(
-			std::move(resolved),
-			action,
-			[=] {
-				auto phrase = rpl::variable<TextWithEntities>(
-					ChatHelpers::ForwardedMessagePhrase({
-					.toCount = 1,
-					.singleMessage = (count == 1),
-					.to1 = session->user(),
-				})).current();
-				show->showToast(std::move(phrase));
-			});
-	}
-}
-
 class Filler {
 public:
 	Filler(
@@ -269,6 +291,7 @@ class Filler {
 	void fillArchiveActions();
 	void fillSavedSublistActions();
 	void fillContextMenuActions();
+	void fillMonoforumPeerActions();
 
 	void addHidePromotion();
 	void addTogglePin();
@@ -276,7 +299,7 @@ class Filler {
 	void addSupportInfo();
 	void addInfo();
 	void addStoryArchive();
-	void addNewWindow();
+	void addNewWindow(bool addSeparator = true);
 	void addToggleFolder();
 	void addToggleUnreadMark();
 	void addToggleArchive();
@@ -288,9 +311,12 @@ class Filler {
 	void addManageTopic();
 	void addManageChat();
 	void addCreatePoll();
+	void addCreateTodoList();
 	void addThemeEdit();
+	void addToggleNoForwards();
 	void addBlockUser();
 	void addViewDiscussion();
+	void addDirectMessages();
 	void addToggleTopicClosed();
 	void addExportChat();
 	void addTranslate();
@@ -302,7 +328,7 @@ class Filler {
 	void addNewMembers();
 	void addDeleteContact();
 	void addTTLSubmenu(bool addSeparator);
-	void addGiftPremium();
+	void addSendGift();
 	void addCreateTopic();
 	void addViewAsMessages();
 	void addViewAsTopics();
@@ -311,6 +337,11 @@ class Filler {
 	void addVideoChat();
 	void addViewStatistics();
 	void addBoostChat();
+	void addToggleFee();
+	void addSetPersonalChannel();
+
+	[[nodiscard]] bool skipCreateActions() const;
+	[[nodiscard]] SendMenu::Details createSendMenuDetails() const;
 
 	not_null<SessionController*> _controller;
 	Dialogs::EntryState _request;
@@ -389,7 +420,8 @@ bool PinnedLimitReached(
 
 void TogglePinnedThread(
 		not_null<Window::SessionController*> controller,
-		not_null<Dialogs::Entry*> entry) {
+		not_null<Dialogs::Entry*> entry,
+		Fn<void()> onToggled) {
 	if (!entry->folderKnown()) {
 		return;
 	}
@@ -406,20 +438,27 @@ void TogglePinnedThread(
 			: MTPmessages_ToggleDialogPin::Flag(0);
 		owner->session().api().request(MTPmessages_ToggleDialogPin(
 			MTP_flags(flags),
-			MTP_inputDialogPeer(history->peer->input)
+			MTP_inputDialogPeer(history->peer->input())
 		)).done([=] {
 			owner->notifyPinnedDialogsOrderUpdated();
+			if (onToggled) {
+				onToggled();
+			}
 		}).send();
 		if (isPinned) {
 			controller->content()->dialogsToUp();
 		}
 	} else if (const auto topic = entry->asTopic()) {
-		owner->session().api().request(MTPchannels_UpdatePinnedForumTopic(
-			topic->channel()->inputChannel,
+		const auto peer = topic->peer();
+		owner->session().api().request(MTPmessages_UpdatePinnedForumTopic(
+			peer->input(),
 			MTP_int(topic->rootId()),
 			MTP_bool(isPinned)
 		)).done([=](const MTPUpdates &result) {
 			owner->session().api().applyUpdates(result);
+			if (onToggled) {
+				onToggled();
+			}
 		}).send();
 	} else if (const auto sublist = entry->asSublist()) {
 		const auto flags = isPinned
@@ -427,9 +466,12 @@ void TogglePinnedThread(
 			: MTPmessages_ToggleSavedDialogPin::Flag(0);
 		owner->session().api().request(MTPmessages_ToggleSavedDialogPin(
 			MTP_flags(flags),
-			MTP_inputDialogPeer(sublist->peer()->input)
+			MTP_inputDialogPeer(sublist->sublistPeer()->input())
 		)).done([=] {
 			owner->notifyPinnedDialogsOrderUpdated();
+			if (onToggled) {
+				onToggled();
+			}
 		}).send();
 		//if (isPinned) {
 		//	controller->content()->dialogsToUp();
@@ -437,40 +479,6 @@ void TogglePinnedThread(
 	}
 }
 
-void TogglePinnedThread(
-		not_null<Window::SessionController*> controller,
-		not_null<Dialogs::Entry*> entry,
-		FilterId filterId) {
-	if (!filterId) {
-		return TogglePinnedThread(controller, entry);
-	}
-	const auto history = entry->asHistory();
-	if (!history) {
-		return;
-	}
-	const auto owner = &history->owner();
-
-	// This can happen when you remove this filter from another client.
-	if (!ranges::contains(
-			(&owner->session())->data().chatsFilters().list(),
-			filterId,
-			&Data::ChatFilter::id)) {
-		controller->showToast(tr::lng_cant_do_this(tr::now));
-		return;
-	}
-
-	const auto isPinned = !history->isPinnedDialog(filterId);
-	if (isPinned && PinnedLimitReached(controller, history, filterId)) {
-		return;
-	}
-
-	owner->setChatPinned(history, filterId, isPinned);
-	Api::SaveNewFilterPinned(&owner->session(), filterId);
-	if (isPinned) {
-		controller->content()->dialogsToUp();
-	}
-}
-
 Filler::Filler(
 	not_null<SessionController*> controller,
 	Dialogs::EntryState request,
@@ -496,7 +504,7 @@ void Filler::addHidePromotion() {
 	_addAction(tr::lng_context_hide_psa(tr::now), [=] {
 		history->cacheTopPromotion(false, QString(), QString());
 		history->session().api().request(MTPhelp_HidePromoData(
-			history->peer->input
+			history->peer->input()
 		)).send();
 	}, &st::menuIconRemove);
 }
@@ -507,7 +515,10 @@ void Filler::addToggleTopicClosed() {
 	}
 	const auto closed = _topic->closed();
 	const auto weak = base::make_weak(_topic);
-	_addAction(closed ? tr::lng_forum_topic_reopen(tr::now) : tr::lng_forum_topic_close(tr::now), [=] {
+	const auto text = closed
+		? tr::lng_forum_topic_reopen(tr::now)
+		: tr::lng_forum_topic_close(tr::now);
+	_addAction(text, [=] {
 		if (const auto topic = weak.get()) {
 			topic->setClosedAndSave(!closed);
 		}
@@ -517,6 +528,12 @@ void Filler::addToggleTopicClosed() {
 void Filler::addTogglePin() {
 	if ((!_sublist && !_peer) || (_topic && !_topic->canTogglePinned())) {
 		return;
+	} else if (_request.section == Section::SubsectionTabsMenu
+		&& !_sublist
+		&& !_topic) {
+		return;
+	} else if (_sublist && !_peer->isSelf()) {
+		return;
 	}
 	const auto controller = _controller;
 	const auto filterId = _request.filterId;
@@ -532,7 +549,7 @@ void Filler::addTogglePin() {
 	const auto weak = base::make_weak(entry);
 	const auto pinToggle = [=] {
 		if (const auto strong = weak.get()) {
-			TogglePinnedThread(controller, strong, filterId);
+			TogglePinnedThread(controller, strong, filterId, nullptr);
 		}
 	};
 	_addAction(
@@ -544,7 +561,10 @@ void Filler::addTogglePin() {
 }
 
 void Filler::addToggleMuteSubmenu(bool addSeparator) {
-	if (!_thread || _thread->peer()->isSelf()) {
+	if (!_thread
+		|| _thread->peer()->isSelf()
+		|| _thread->asSublist()
+		|| (_thread->asHistory() && _thread->asHistory()->isForum())) {
 		return;
 	}
 	PeerMenuAddMuteSubmenuAction(_controller, _thread, _addAction);
@@ -568,16 +588,18 @@ void Filler::addSupportInfo() {
 }
 
 void Filler::addInfo() {
-	if (_peer
-		&& (_peer->isSelf()
-			|| _peer->isRepliesChat()
-			|| _peer->isVerifyCodes())) {
+	const auto sublist = _thread ? _thread->asSublist() : nullptr;
+	const auto infoPeer = sublist ? sublist->sublistPeer().get() : _peer;
+	if (infoPeer
+		&& (infoPeer->isSelf()
+			|| infoPeer->isRepliesChat()
+			|| infoPeer->isVerifyCodes())) {
 		return;
 	} else if (!_thread) {
 		return;
 	} else if (_controller->adaptive().isThreeColumn()) {
 		const auto thread = _controller->activeChatCurrent().thread();
-		if (thread && thread == _thread) {
+		if (thread && !thread->asSublist() && thread == _thread) {
 			if (Core::App().settings().thirdSectionInfoEnabled()
 				|| Core::App().settings().tabbedReplacedWithInfo()) {
 				return;
@@ -587,17 +609,24 @@ void Filler::addInfo() {
 	const auto controller = _controller;
 	const auto weak = base::make_weak(_thread);
 	const auto text = _thread->asTopic()
-		? tr::lng_context_view_topic(tr::now)
-		: (_peer->isChat() || _peer->isMegagroup())
+		? (_thread->peer()->isBot()
+			? tr::lng_context_view_thread(tr::now)
+			: tr::lng_context_view_topic(tr::now))
+		: (infoPeer->isChat() || infoPeer->isMegagroup())
 		? tr::lng_context_view_group(tr::now)
-		: _peer->isUser()
+		: infoPeer->isUser()
 		? tr::lng_context_view_profile(tr::now)
 		: tr::lng_context_view_channel(tr::now);
 	_addAction(text, [=] {
 		if (const auto strong = weak.get()) {
-			controller->showPeerInfo(strong);
+			if (base::IsCtrlPressed()) {
+				controller->uiShow()->showBox(
+					PrepareShortInfoBox(infoPeer, controller));
+			} else {
+				controller->showPeerInfo(strong);
+			}
 		}
-	}, _peer->isUser() ? &st::menuIconProfile : &st::menuIconInfo);
+	}, infoPeer->isUser() ? &st::menuIconProfile : &st::menuIconInfo);
 }
 
 void Filler::addStoryArchive() {
@@ -608,10 +637,10 @@ void Filler::addStoryArchive() {
 	const auto controller = _controller;
 	const auto weak = base::make_weak(_thread);
 	_addAction(tr::lng_stories_archive_button(tr::now), [=] {
-		if (const auto strong = weak.get()) {
+		if ([[maybe_unused]] const auto strong = weak.get()) {
 			controller->showSection(Info::Stories::Make(
 				channel,
-				Info::Stories::Tab::Archive));
+				Info::Stories::ArchiveId()));
 		}
 	}, &st::menuIconStoriesArchiveSection);
 }
@@ -619,7 +648,14 @@ void Filler::addStoryArchive() {
 void Filler::addToggleFolder() {
 	const auto controller = _controller;
 	const auto history = _request.key.history();
-	if (_topic || !history || !history->owner().chatsFilters().has()) {
+	if (_topic
+		|| !history
+		|| !history->owner().chatsFilters().has()
+		|| !history->inChatList()) {
+		return;
+	} else if (_request.section == Section::SubsectionTabsMenu
+		&& !_sublist
+		&& !_topic) {
 		return;
 	}
 	_addAction(PeerMenuCallback::Args{
@@ -629,17 +665,15 @@ void Filler::addToggleFolder() {
 		.fillSubmenu = [&](not_null<Ui::PopupMenu*> menu) {
 			FillChooseFilterMenu(controller, menu, history);
 		},
+		.submenuSt = &st::foldersMenu,
 	});
 }
 
 void Filler::addToggleUnreadMark() {
 	const auto peer = _peer;
-	const auto history = _request.key.history();
-	if (!_thread) {
-		return;
-	}
 	const auto unread = IsUnreadThread(_thread);
-	if ((_thread->asTopic() || peer->isForum()) && !unread) {
+	const auto history = _request.key.history();
+	if (!_thread || !_thread->canToggleUnread(unread)) {
 		return;
 	}
 	const auto weak = base::make_weak(_thread);
@@ -653,13 +687,15 @@ void Filler::addToggleUnreadMark() {
 		}
 		if (unread) {
 			MarkAsReadThread(thread);
+		} else if (const auto sublist = thread->asSublist()) {
+			peer->owner().histories().changeSublistUnreadMark(sublist, true);
 		} else if (history) {
 			peer->owner().histories().changeDialogUnreadMark(history, true);
 		}
 	}, (unread ? &st::menuIconMarkRead : &st::menuIconMarkUnread));
 }
 
-void Filler::addNewWindow() {
+void Filler::addNewWindow(bool addSeparator) {
 	const auto controller = _controller;
 	if (_folder) {
 		_addAction(tr::lng_context_new_window(tr::now), [=] {
@@ -668,19 +704,22 @@ void Filler::addNewWindow() {
 				SeparateType::Archive,
 				&controller->session()));
 		}, &st::menuIconNewWindow);
-		AddSeparatorAndShiftUp(_addAction);
+		if (addSeparator) {
+			AddSeparatorAndShiftUp(_addAction);
+		}
 		return;
 	} else if (const auto weak = base::make_weak(_sublist)) {
 		_addAction(tr::lng_context_new_window(tr::now), [=] {
 			Ui::PreventDelayedActivation();
 			if (const auto sublist = weak.get()) {
-				const auto peer = sublist->peer();
 				controller->showInNewWindow(SeparateId(
 					SeparateType::SavedSublist,
-					peer->owner().history(peer)));
+					sublist));
 			}
 		}, &st::menuIconNewWindow);
-		AddSeparatorAndShiftUp(_addAction);
+		if (addSeparator) {
+			AddSeparatorAndShiftUp(_addAction);
+		}
 		return;
 	}
 	const auto history = _request.key.history();
@@ -698,30 +737,32 @@ void Filler::addNewWindow() {
 	_addAction(tr::lng_context_new_window(tr::now), [=] {
 		Ui::PreventDelayedActivation();
 		if (const auto strong = weak.get()) {
-			const auto forum = !strong->asTopic() && peer->isForum();
+			const auto forum = !strong->asTopic()
+				&& peer->isForum()
+				&& !peer->useSubsectionTabs();
 			controller->showInNewWindow(SeparateId(
 				forum ? SeparateType::Forum : SeparateType::Chat,
 				strong));
 		}
 	}, &st::menuIconNewWindow);
-	AddSeparatorAndShiftUp(_addAction);
+	if (addSeparator) {
+		AddSeparatorAndShiftUp(_addAction);
+	}
 }
 
 void Filler::addToggleArchive() {
-	if (!_peer || _topic) {
+	if (!_peer
+		|| _topic
+		|| _request.section == Section::SubsectionTabsMenu) {
 		return;
 	}
 	const auto peer = _peer;
 	const auto history = _request.key.history();
-	if (history && history->useTopPromotion()) {
+	if (!CanArchive(history, peer)) {
 		return;
-	} else if (peer->isNotificationsUser() || peer->isSelf()) {
-		if (!history || !history->folder()) {
-			return;
-		}
 	}
 	const auto isArchived = [=] {
-		return (history->folder() != nullptr);
+		return IsArchived(history);
 	};
 	const auto label = [=] {
 		return isArchived()
@@ -744,7 +785,7 @@ void Filler::addToggleArchive() {
 }
 
 void Filler::addClearHistory() {
-	if (_topic) {
+	if (_topic || _peer->isMonoforum()) {
 		return;
 	}
 	const auto channel = _peer->asChannel();
@@ -764,14 +805,16 @@ void Filler::addClearHistory() {
 }
 
 void Filler::addDeleteChat() {
-	if (_topic || _peer->isChannel()) {
+	if (_topic || (!_sublist && _peer->isChannel())) {
 		return;
 	}
 	_addAction({
-		.text = (_peer->isUser()
+		.text = ((_peer->isUser() || _sublist)
 			? tr::lng_profile_delete_conversation(tr::now)
 			: tr::lng_profile_clear_and_exit(tr::now)),
-		.handler = DeleteAndLeaveHandler(_controller, _peer),
+		.handler = (_sublist
+			? DeleteSublistHandler(_controller, _sublist)
+			: DeleteAndLeaveHandler(_controller, _peer)),
 		.icon = &st::menuIconDeleteAttention,
 		.isAttention = true,
 	});
@@ -779,7 +822,7 @@ void Filler::addDeleteChat() {
 
 void Filler::addLeaveChat() {
 	const auto channel = _peer->asChannel();
-	if (_topic || !channel || !channel->amIn()) {
+	if (_topic || _sublist || !channel || !channel->amIn()) {
 		return;
 	}
 	_addAction({
@@ -814,7 +857,7 @@ void Filler::addBlockUser() {
 		|| user->isVerifyCodes()) {
 		return;
 	}
-	const auto window = &_controller->window();
+	const auto window = _controller;
 	const auto blockText = [](not_null<UserData*> user) {
 		return user->isBlocked()
 			? ((user->isBot() && !user->isSupport())
@@ -826,14 +869,16 @@ void Filler::addBlockUser() {
 	};
 	const auto blockAction = _addAction(blockText(user), [=] {
 		const auto show = window->uiShow();
-		if (user->isBlocked()) {
+		if (show->showFrozenError()) {
+			return;
+		} else if (user->isBlocked()) {
 			PeerMenuUnblockUserWithBotRestart(show, user);
 		} else if (user->isBot()) {
 			user->session().api().blockedPeers().block(user);
 		} else {
 			window->show(Box(
 				PeerMenuBlockUserBox,
-				window,
+				&window->window(),
 				user,
 				v::null,
 				v::null));
@@ -860,7 +905,7 @@ void Filler::addViewDiscussion() {
 	if (!channel) {
 		return;
 	}
-	const auto chat = channel->linkedChat();
+	const auto chat = channel->discussionLink();
 	if (!chat) {
 		return;
 	}
@@ -876,14 +921,40 @@ void Filler::addViewDiscussion() {
 	}, &st::menuIconDiscussion);
 }
 
+void Filler::addDirectMessages() {
+	const auto channel = _peer->asBroadcast();
+	if (!channel) {
+		return;
+	}
+	const auto monoforum = channel->broadcastMonoforum();
+	if (!monoforum || !monoforum->amMonoforumAdmin()) {
+		return;
+	}
+	const auto navigation = _controller;
+	_addAction(tr::lng_profile_direct_messages(tr::now), [=] {
+		navigation->showPeerHistory(
+			monoforum,
+			Window::SectionShow::Way::Forward);
+	}, &st::menuIconChatDiscuss);
+}
+
 void Filler::addExportChat() {
-	if (_thread->asTopic() || !_peer->canExportChatHistory()) {
+	if (!_peer->canExportChatHistory()) {
 		return;
 	}
 	const auto peer = _peer;
+	const auto navigation = _controller;
+	if (const auto topic = _thread->asTopic()) {
+		const auto topicRootId = topic->rootId();
+		_addAction(
+			tr::lng_profile_export_topic(tr::now),
+			[=] { PeerMenuExportTopic(navigation, peer, topicRootId); },
+			&st::menuIconExport);
+		return;
+	}
 	_addAction(
 		tr::lng_profile_export_chat(tr::now),
-		[=] { PeerMenuExportChat(peer); },
+		[=] { PeerMenuExportChat(navigation, peer); },
 		&st::menuIconExport);
 }
 
@@ -929,9 +1000,15 @@ void Filler::addNewContact() {
 		return;
 	}
 	const auto controller = _controller;
+	const auto edit = [=] {
+		if (controller->showFrozenError()) {
+			return;
+		}
+		controller->show(Box(EditContactBox, controller, user));
+	};
 	_addAction(
 		tr::lng_info_add_as_contact(tr::now),
-		[=] { controller->show(Box(EditContactBox, controller, user)); },
+		edit,
 		&st::menuIconInvite);
 }
 
@@ -953,9 +1030,15 @@ void Filler::addEditContact() {
 		return;
 	}
 	const auto controller = _controller;
+	const auto edit = [=] {
+		if (controller->showFrozenError()) {
+			return;
+		}
+		controller->show(Box(EditContactBox, controller, user));
+	};
 	_addAction(
 		tr::lng_info_edit_contact(tr::now),
-		[=] { controller->show(Box(EditContactBox, controller, user)); },
+		edit,
 		&st::menuIconEdit);
 }
 
@@ -966,7 +1049,7 @@ void Filler::addBotToGroup() {
 	}
 	[[maybe_unused]] const auto lifetime = Info::Profile::InviteToChatButton(
 		user
-	) | rpl::take(1) | rpl::start_with_next([=](QString label) {
+	) | rpl::take(1) | rpl::on_next([=](QString label) {
 		if (!label.isEmpty()) {
 			const auto controller = _controller;
 			_addAction(
@@ -1034,18 +1117,26 @@ void Filler::addTopicLink() {
 		return;
 	}
 	const auto channel = _topic->channel();
-	const auto id = _topic->rootId();
+	if (!channel) {
+		return;
+	}
 	const auto controller = _controller;
+	const auto weak = base::make_weak(_topic);
 	_addAction(tr::lng_context_copy_topic_link(tr::now), [=] {
-		const auto base = channel->hasUsername()
-			? channel->username()
-			: "c/" + QString::number(peerToChannel(channel->id).bare);
-		const auto query = base + '/' + QString::number(id.bare);
-		const auto link = channel->session().createInternalLinkFull(query);
-		QGuiApplication::clipboard()->setText(link);
-		controller->showToast(channel->hasUsername()
-			? tr::lng_channel_public_link_copied(tr::now)
-			: tr::lng_context_about_private_link(tr::now));
+		if (const auto strong = weak.get()) {
+			const auto link = Info::Profile::TopicLink(strong, true);
+			QGuiApplication::clipboard()->setText(link);
+			if (channel->hasUsername()) {
+				controller->showToast({
+					.text = { tr::lng_channel_public_link_copied(tr::now) },
+					.iconLottie = u"toast/voip_invite"_q,
+					.iconLottieSize = st::toastLottieIconSize,
+				});
+			} else {
+				controller->showToast(
+					tr::lng_context_about_private_link(tr::now));
+			}
+		}
 	}, &st::menuIconCopy);
 }
 
@@ -1056,7 +1147,10 @@ void Filler::addManageTopic() {
 	const auto history = _topic->history();
 	const auto rootId = _topic->rootId();
 	const auto navigation = _controller;
-	_addAction(tr::lng_forum_topic_edit(tr::now), [=] {
+	const auto text = _topic->forum()->peer()->isBot()
+		? tr::lng_bot_thread_edit(tr::now)
+		: tr::lng_forum_topic_edit(tr::now);
+	_addAction(text, [=] {
 		navigation->show(
 			Box(EditForumTopicBox, navigation, history, rootId));
 	}, &st::menuIconEdit);
@@ -1080,6 +1174,9 @@ void Filler::addManageChat() {
 
 void Filler::addBoostChat() {
 	if (const auto channel = _peer->asChannel()) {
+		if (channel->isMonoforum()) {
+			return;
+		}
 		const auto text = channel->isMegagroup()
 			? tr::lng_boost_group_button(tr::now)
 			: tr::lng_boost_channel_button(tr::now);
@@ -1094,6 +1191,9 @@ void Filler::addBoostChat() {
 
 void Filler::addViewStatistics() {
 	if (const auto channel = _peer->asChannel()) {
+		if (channel->isMonoforum()) {
+			return;
+		}
 		const auto controller = _controller;
 		const auto weak = base::make_weak(_thread);
 		const auto peer = _peer;
@@ -1104,7 +1204,7 @@ void Filler::addViewStatistics() {
 			= (channel->flags() & Flag::CanViewCreditsRevenue);
 		if (canGetStats) {
 			_addAction(tr::lng_stats_title(tr::now), [=] {
-				if (const auto strong = weak.get()) {
+				if ([[maybe_unused]] const auto strong = weak.get()) {
 					using namespace Info;
 					controller->showSection(Statistics::Make(peer, {}, {}));
 				}
@@ -1114,14 +1214,14 @@ void Filler::addViewStatistics() {
 			|| channel->amCreator()
 			|| channel->canPostStories()) {
 			_addAction(tr::lng_boosts_title(tr::now), [=] {
-				if (const auto strong = weak.get()) {
+				if ([[maybe_unused]] const auto strong = weak.get()) {
 					controller->showSection(Info::Boosts::Make(peer));
 				}
 			}, &st::menuIconBoosts);
 		}
 		if (canViewEarn || canViewCreditsEarn) {
 			_addAction(tr::lng_channel_earn_title(tr::now), [=] {
-				if (const auto strong = weak.get()) {
+				if ([[maybe_unused]] const auto strong = weak.get()) {
 					controller->showSection(Info::ChannelEarn::Make(peer));
 				}
 			}, &st::menuIconEarn);
@@ -1129,7 +1229,10 @@ void Filler::addViewStatistics() {
 	}
 }
 
-void Filler::addCreatePoll() {
+bool Filler::skipCreateActions() const {
+	if (_peer && _peer->isRepliesChat()) {
+		return true;
+	}
 	const auto isJoinChannel = [&] {
 		if (_request.section != Section::Replies) {
 			if (const auto c = _peer->asChannel(); c && !c->amIn()) {
@@ -1154,10 +1257,30 @@ void Filler::addCreatePoll() {
 	const auto isBlocked = [&] {
 		return _peer && _peer->isUser() && _peer->asUser()->isBlocked();
 	}();
-	if (isBlocked || isJoinChannel || isBotStart) {
+	return isBlocked || isJoinChannel || isBotStart;
+}
+
+SendMenu::Details Filler::createSendMenuDetails() const {
+	using Type = SendMenu::Type;
+
+	const auto type = (_request.section == Section::Scheduled)
+		? Type::Disabled
+		: (!_peer || _peer->starsPerMessageChecked())
+		? Type::SilentOnly
+		: (_request.section == Section::Replies)
+		? (_topic ? Type::Scheduled : Type::SilentOnly)
+		: _peer->isSelf()
+		? Type::Reminder
+		: HistoryView::CanScheduleUntilOnline(_peer)
+		? Type::ScheduledToUser
+		: Type::Scheduled;
+	return { .type = type };
+}
+
+void Filler::addCreatePoll() {
+	if (skipCreateActions()) {
 		return;
 	}
-
 	const auto can = _topic
 		? Data::CanSend(_topic, ChatRestriction::SendPolls)
 		: _peer->canCreatePolls();
@@ -1169,22 +1292,20 @@ void Filler::addCreatePoll() {
 	const auto source = (_request.section == Section::Scheduled)
 		? Api::SendType::Scheduled
 		: Api::SendType::Normal;
-	const auto sendMenuType = (_request.section == Section::Scheduled)
-		? SendMenu::Type::Disabled
-		: (_request.section == Section::Replies)
-		? SendMenu::Type::SilentOnly
-		: SendMenu::Type::Scheduled;
-	const auto flag = PollData::Flags();
 	const auto replyTo = _request.currentReplyTo;
+	const auto sendMenuDetails = createSendMenuDetails();
+	const auto suggest = _request.currentSuggest;
+	const auto chosen = kDefaultPollCreateFlags;
 	auto callback = [=] {
 		PeerMenuCreatePoll(
 			controller,
 			peer,
 			replyTo,
-			flag,
-			flag,
+			suggest,
+			chosen,
+			PollData::Flags(),
 			source,
-			{ sendMenuType });
+			sendMenuDetails);
 	};
 	_addAction(
 		tr::lng_polls_create(tr::now),
@@ -1192,9 +1313,49 @@ void Filler::addCreatePoll() {
 		&st::menuIconCreatePoll);
 }
 
+void Filler::addCreateTodoList() {
+	if (skipCreateActions()) {
+		return;
+	}
+	const auto can = _topic
+		? (_peer->session().premium()
+			&& Data::CanSend(_topic, ChatRestriction::SendPolls))
+		: _peer->canCreateTodoLists();
+	if (!can) {
+		return;
+	}
+	const auto peer = _peer;
+	const auto controller = _controller;
+	const auto source = (_request.section == Section::Scheduled)
+		? Api::SendType::Scheduled
+		: Api::SendType::Normal;
+	const auto replyTo = _request.currentReplyTo;
+	const auto sendMenuDetails = createSendMenuDetails();
+	const auto suggest = _request.currentSuggest;
+	auto callback = [=] {
+		PeerMenuCreateTodoList(
+			controller,
+			peer,
+			replyTo,
+			suggest,
+			source,
+			sendMenuDetails);
+	};
+	_addAction(
+		tr::lng_todo_create(tr::now),
+		std::move(callback),
+		&st::menuIconCreateTodoList);
+}
+
 void Filler::addThemeEdit() {
+	if (_peer->isVerifyCodes() || _peer->isRepliesChat()) {
+		return;
+	}
 	const auto user = _peer->asUser();
-	if (!user || user->isBot()) {
+	if (!user || user->isInaccessible()) {
+		return;
+	}
+	if (user->requiresPremiumToWrite() && !user->session().premium()) {
 		return;
 	}
 	const auto controller = _controller;
@@ -1204,8 +1365,172 @@ void Filler::addThemeEdit() {
 		&st::menuIconChangeColors);
 }
 
+void ShowDisableSharingBox(
+		not_null<SessionController*> controller,
+		not_null<PeerData*> peer,
+		Fn<void(bool)> toggleNoForwards) {
+	controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+		box->setStyle(st::showOrBox);
+		box->setWidth(st::boxWideWidth);
+		box->addTopButton(st::boxTitleClose, [=] {
+			box->closeBox();
+		});
+
+		const auto buttonPadding = QMargins(
+			st::showOrBox.buttonPadding.left(),
+			0,
+			st::showOrBox.buttonPadding.right(),
+			0);
+
+		auto icon = Settings::CreateLottieIcon(
+			box,
+			{
+				.name = u"stop"_q,
+				.sizeOverride = st::normalBoxLottieSize,
+			},
+			{});
+		box->verticalLayout()->add(
+			std::move(icon.widget),
+			st::disableSharingIconPadding,
+			style::al_top);
+
+		Ui::AddSkip(box->verticalLayout());
+
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_disable_sharing_title(),
+				st::boostCenteredTitle),
+			QMargins(0, 0, 0, st::showOrTitleIconMargin) + buttonPadding,
+			style::al_top);
+
+		const auto features = std::vector<Ui::FeatureListEntry>{
+			{
+				st::menuIconShareOff,
+				tr::lng_disable_sharing_no_forwarding(tr::now),
+				{ tr::lng_disable_sharing_no_forwarding_about(tr::now) },
+			},
+			{
+				st::menuIconDownloadOff,
+				tr::lng_disable_sharing_no_saving(tr::now),
+				{ tr::lng_disable_sharing_no_saving_about(tr::now) },
+			},
+		};
+		for (const auto &feature : features) {
+			box->addRow(
+				Ui::MakeFeatureListEntry(box, feature),
+				st::boxRowPadding);
+		}
+
+		const auto button = box->addButton(rpl::single(QString()), [=] {
+			if (peer->session().premium()) {
+				toggleNoForwards(true);
+				box->closeBox();
+			} else {
+				ShowPremiumPreviewBox(controller, PremiumFeature::NoForwards);
+			}
+		});
+		button->setText(
+			Data::AmPremiumValue(&peer->session())
+			| rpl::map([](bool premium) {
+				if (premium) {
+					return TextWithEntities{
+						tr::lng_disable_sharing_button(tr::now) };
+				}
+				return Ui::Text::IconEmoji(
+					&st::disableSharingButtonLock
+				).append(
+					' ' + tr::lng_disable_sharing_unlock(tr::now));
+			}));
+
+		box->setShowFinishedCallback([animate = std::move(icon.animate)] {
+			animate(anim::repeat::once);
+		});
+	}));
+}
+
+void Filler::addToggleNoForwards() {
+	const auto user = _peer->asUser();
+	if (!user
+		|| user->isInaccessible()
+		|| user->isBot()
+		|| user->isServiceUser()
+		|| user->isSelf()) {
+		return;
+	}
+	const auto controller = _controller;
+	const auto peer = _peer;
+	const auto toggleNoForwards = [=](bool enabled) {
+		using Flag = MTPmessages_ToggleNoForwards::Flag;
+		peer->session().api().request(MTPmessages_ToggleNoForwards(
+			MTP_flags(Flag()),
+			peer->input(),
+			MTP_bool(enabled),
+			MTPint()
+		)).done([=](const MTPUpdates &result) {
+			peer->session().api().applyUpdates(result);
+			if (enabled) {
+				if (const auto user = peer->asUser()) {
+					peer->session().data().recordSharingDisabledTime(user);
+				}
+			}
+		}).fail([=](const MTP::Error &error) {
+			if (error.type() != u"CHAT_NOT_MODIFIED"_q) {
+				controller->showToast(error.type());
+			}
+		}).send();
+	};
+	const auto disabledNow = !user->allowsForwarding();
+	_addAction(disabledNow
+		? tr::lng_enable_sharing(tr::now)
+		: tr::lng_disable_sharing(tr::now), [=] {
+		if (controller->showFrozenError()) {
+			return;
+		} else if (disabledNow) {
+			const auto willBeRequest = true
+				&& (user->flags() & UserDataFlag::NoForwardsPeerEnabled)
+				&& !peer->session().data().sharingRecentlyDisabledByMe(user);
+			if (willBeRequest) {
+				controller->show(Ui::MakeConfirmBox({
+					.text = tr::lng_enable_sharing_request_text(
+						tr::now,
+						lt_name,
+						tr::marked(user->shortName()),
+						tr::rich),
+					.confirmed = [=](Fn<void()> close) {
+						toggleNoForwards(false);
+						controller->showPeerHistory(peer->id);
+						close();
+					},
+					.confirmText = tr::lng_enable_sharing_request_button(),
+					.title = tr::lng_enable_sharing_request_title(),
+				}));
+			} else {
+				toggleNoForwards(false);
+			}
+			return;
+		}
+		auto &settings = peer->session().settings();
+		if (!settings.shouldShowDisableSharingBox()) {
+#ifdef _DEBUG
+			settings.resetDisableSharingBoxShown();
+			peer->session().saveSettingsDelayed();
+#endif
+			if (peer->session().premium()) {
+				toggleNoForwards(true);
+			} else {
+				ShowPremiumPreviewBox(controller, PremiumFeature::NoForwards);
+			}
+			return;
+		}
+		settings.incrementDisableSharingBoxShown();
+		peer->session().saveSettingsDelayed();
+		ShowDisableSharingBox(controller, peer, toggleNoForwards);
+	}, disabledNow ? &st::menuIconShareOn : &st::menuIconShareOff);
+}
+
 void Filler::addTTLSubmenu(bool addSeparator) {
-	if (_thread->asTopic()) {
+	if (_thread->asTopic() || !_peer || _peer->isMonoforum()) {
 		return; // #TODO later forum
 	}
 	const auto validator = TTLMenu::TTLValidator(
@@ -1224,29 +1549,37 @@ void Filler::addTTLSubmenu(bool addSeparator) {
 	}
 }
 
-void Filler::addGiftPremium() {
+void Filler::addSendGift() {
 	const auto user = _peer->asUser();
-	if (!user
-		|| user->isInaccessible()
-		|| user->isSelf()
-		|| user->isBot()
-		|| user->isNotificationsUser()
-		|| user->isRepliesChat()
-		|| user->isVerifyCodes()
-		|| !user->session().premiumCanBuy()) {
+	const auto channel = _peer->asBroadcast();
+	if (!user && !channel) {
+		return;
+	} else if (user
+		&& (user->isInaccessible()
+			|| user->isSelf()
+			|| user->isBot()
+			|| user->isServiceUser()
+			|| user->isNotificationsUser()
+			|| user->isRepliesChat()
+			|| user->isVerifyCodes()
+			|| !user->session().premiumCanBuy())) {
+		return;
+	} else if (channel
+		&& (channel->isForbidden() || !channel->stargiftsAvailable())) {
 		return;
 	}
 
+	const auto peer = _peer;
 	const auto navigation = _controller;
 	_addAction(tr::lng_profile_gift_premium(tr::now), [=] {
-		Ui::ShowStarGiftBox(navigation, user);
+		Ui::ShowStarGiftBox(navigation, peer);
 	}, &st::menuIconGiftPremium);
 }
 
 void Filler::fill() {
 	if (_folder) {
 		fillArchiveActions();
-	} else if (_sublist) {
+	} else if (_sublist && _peer->isSelf()) {
 		fillSavedSublistActions();
 	} else switch (_request.section) {
 	case Section::ChatsList: fillChatsListActions(); break;
@@ -1254,13 +1587,15 @@ void Filler::fill() {
 	case Section::Profile: fillProfileActions(); break;
 	case Section::Replies: fillRepliesActions(); break;
 	case Section::Scheduled: fillScheduledActions(); break;
-	case Section::ContextMenu: fillContextMenuActions(); break;
+	case Section::ContextMenu:
+	case Section::SubsectionTabsMenu: fillContextMenuActions(); break;
+	case Section::SavedSublist: fillMonoforumPeerActions(); break;
 	default: Unexpected("_request.section in Filler::fill.");
 	}
 }
 
 void Filler::addCreateTopic() {
-	if (!_peer || !_peer->canCreateTopics()) {
+	if (!_peer || !_peer->canCreateTopics() || _peer->isBot()) {
 		return;
 	}
 	const auto peer = _peer;
@@ -1311,18 +1646,38 @@ void Filler::addViewAsMessages() {
 		controller->showPeerHistory(peer->id);
 	};
 	auto to_instant = rpl::map_to(anim::type::instant);
+	auto make = [=](not_null<Ui::PopupMenu*> popupMenu) {
+		auto owned = base::make_unique_q<Ui::Menu::Action>(
+			popupMenu->menu(),
+			popupMenu->menu()->st(),
+			Ui::Menu::CreateAction(
+				popupMenu->menu(),
+				tr::lng_forum_view_as_messages(tr::now),
+				[=, weak = base::make_weak(popupMenu)] {
+					if (filterOutChatPreview()) {
+					} else {
+						open();
+						if (const auto strong = weak.get()) {
+							strong->hideMenu(false);
+						}
+					}
+				}),
+			&st::menuIconAsMessages,
+			&st::menuIconAsMessages);
+		owned->setPreventClose(true);
+		return owned;
+	};
 	_addAction({
-		.text = tr::lng_forum_view_as_messages(tr::now),
-		.handler = open,
-		.icon = &st::menuIconAsMessages,
-		.triggerFilter = filterOutChatPreview,
-		.hideRequests = parentHideRequests->events() | to_instant
+		.make = std::move(make),
+		.hideRequests = parentHideRequests->events() | to_instant,
 	});
 }
 
 void Filler::addViewAsTopics() {
 	if (!_peer
 		|| !_peer->isForum()
+		|| !_peer->isChannel()
+		|| (_peer->asChannel()->flags() & ChannelDataFlag::ForumTabs)
 		|| !_controller->adaptive().isOneColumn()) {
 		return;
 	}
@@ -1361,6 +1716,7 @@ void Filler::fillChatsListActions() {
 	}
 	addManageChat();
 	addNewMembers();
+	addBoostChat();
 	addVideoChat();
 	_addAction(PeerMenuCallback::Args{ .isSeparator = true });
 	addReport();
@@ -1419,15 +1775,19 @@ void Filler::fillContextMenuActions() {
 
 void Filler::fillHistoryActions() {
 	addToggleMuteSubmenu(true);
+	addCreateTopic();
 	addInfo();
 	addViewAsTopics();
+	addManageChat();
 	addStoryArchive();
 	addSupportInfo();
-	addManageChat();
 	addBoostChat();
 	addCreatePoll();
+	addCreateTodoList();
 	addThemeEdit();
+	addToggleNoForwards();
 	addViewDiscussion();
+	addDirectMessages();
 	addExportChat();
 	addTranslate();
 	addReport();
@@ -1442,17 +1802,21 @@ void Filler::fillProfileActions() {
 	addNewContact();
 	addShareContact();
 	addEditContact();
-	addGiftPremium();
 	addBotToGroup();
 	addNewMembers();
+	addSendGift();
 	addViewStatistics();
 	addStoryArchive();
 	addManageChat();
+	addSetPersonalChannel();
 	addTopicLink();
 	addManageTopic();
 	addToggleTopicClosed();
 	addViewDiscussion();
+	addDirectMessages();
 	addExportChat();
+	addToggleNoForwards();
+	addToggleFolder();
 	addBlockUser();
 	addReport();
 	addLeaveChat();
@@ -1465,13 +1829,16 @@ void Filler::fillRepliesActions() {
 		addInfo();
 		addManageTopic();
 	}
+	addBoostChat();
 	addCreatePoll();
+	addCreateTodoList();
 	addToggleTopicClosed();
 	addDeleteTopic();
 }
 
 void Filler::fillScheduledActions() {
 	addCreatePoll();
+	addCreateTodoList();
 }
 
 void Filler::fillArchiveActions() {
@@ -1522,33 +1889,142 @@ void Filler::fillArchiveActions() {
 	_addAction({ .isSeparator = true });
 
 	Settings::PreloadArchiveSettings(&controller->session());
-	_addAction(tr::lng_context_archive_settings(tr::now), [=] {
+	const auto openSettings = [=] {
 		controller->show(Box(Settings::ArchiveSettingsBox, controller));
-	}, &st::menuIconManage);
+	};
+	_addAction(
+		tr::lng_context_archive_settings(tr::now),
+		openSettings,
+		&st::menuIconManage);
+	_addAction(tr::lng_context_archive_how_does_it_work(tr::now), [=] {
+		const auto unarchiveOnNewMessage = controller->session().api(
+			).globalPrivacy().unarchiveOnNewMessageCurrent();
+		controller->show(
+			Box(
+				ArchiveHintBox,
+				unarchiveOnNewMessage != Api::UnarchiveOnNewMessage::None,
+				openSettings),
+			Ui::LayerOption::CloseOther);
+	}, &st::menuIconFaq);
 }
 
 void Filler::fillSavedSublistActions() {
-	addNewWindow();
+	addNewWindow(false);
 	addTogglePin();
 }
 
-} // namespace
+void Filler::fillMonoforumPeerActions() {
+	Expects(_sublist != nullptr);
 
-void PeerMenuExportChat(not_null<PeerData*> peer) {
-	Core::App().exportManager().start(peer);
+	addToggleFee();
 }
 
-void PeerMenuDeleteContact(
-		not_null<Window::SessionController*> controller,
-		not_null<UserData*> user) {
-	const auto text = tr::lng_sure_delete_contact(
-		tr::now,
+void Filler::addToggleFee() {
+	const auto feeRemoved = _sublist->isFeeRemoved();
+	const auto text = feeRemoved
+		? tr::lng_context_charge_fee(tr::now)
+		: tr::lng_context_remove_fee(tr::now);
+	const auto navigation = _controller;
+	const auto parent = _sublist->parentChat();
+	const auto user = _sublist->sublistPeer()->asUser();
+	if (!parent || !user) {
+		return;
+	}
+	const auto paidAmount = std::make_shared<rpl::variable<int>>();
+	_addAction(text, [=] {
+		const auto removeFee = !feeRemoved;
+		PeerMenuConfirmToggleFee(
+			navigation,
+			paidAmount,
+			parent,
+			user,
+			removeFee);
+	}, feeRemoved ? &st::menuIconEarn : &st::menuIconCancelFee);
+	_addAction({ .isSeparator = true });
+	_addAction({ .make = [=](not_null<Ui::PopupMenu*> menuParent) {
+		const auto actionParent = menuParent->menu();
+		const auto text = feeRemoved
+			? tr::lng_context_fee_free(
+				tr::now,
+				lt_name,
+				TextWithEntities{ user->shortName() },
+				tr::marked)
+			: tr::lng_context_fee_now(
+				tr::now,
+				lt_name,
+				TextWithEntities{ user->shortName() },
+				lt_amount,
+				tr::marked().append(
+					st::starIconEmojiMiniFont
+				).append(Lang::FormatCountDecimal(
+					user->owner().commonStarsPerMessage(parent)
+				)),
+				tr::marked);
+		const auto action = Ui::CreateChild<QAction>(actionParent);
+		action->setDisabled(true);
+		auto result = base::make_unique_q<Ui::Menu::Action>(
+			actionParent,
+			st::windowFeeItem,
+			action,
+			nullptr,
+			nullptr);
+		result->setMarkedText(text, QString(), Core::TextContext({
+			.session = &user->session(),
+		}));
+		return result;
+	} });
+}
+
+void Filler::addSetPersonalChannel() {
+	const auto channel = _peer->asChannel();
+	if (!channel
+		|| _peer->session().user()->personalChannelId()
+		|| channel->isMegagroup()
+		|| !channel->amCreator()
+		|| !channel->isPublic()) {
+		return;
+	}
+	_addAction(tr::lng_edit_channel_personal_channel(tr::now), [=] {
+		UrlClickHandler::Open(u"internal:edit_personal_channel:"_q
+			+ QString::number(channel->id.value));
+	}, &st::menuIconProfile);
+}
+
+} // namespace
+
+void PeerMenuExportChat(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer) {
+	base::call_delayed(st::defaultPopupMenu.showDuration, [=] {
+		Core::App().exportManager().start(peer);
+	});
+}
+
+void PeerMenuExportTopic(
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		MsgId topicRootId) {
+	base::call_delayed(st::defaultPopupMenu.showDuration, [=] {
+		const auto topic = peer->forumTopicFor(topicRootId);
+		const auto topicTitle = topic ? topic->title() : QString();
+		Core::App().exportManager().startTopic(peer, topicRootId, topicTitle);
+	});
+}
+
+void PeerMenuDeleteContact(
+		not_null<Window::SessionController*> controller,
+		not_null<UserData*> user) {
+	if (controller->showFrozenError()) {
+		return;
+	}
+	const auto text = tr::lng_sure_delete_contact(
+		tr::now,
 		lt_contact,
 		user->name());
 	const auto deleteSure = [=](Fn<void()> &&close) {
 		close();
 		user->session().api().request(MTPcontacts_DeleteContacts(
-			MTP_vector<MTPInputUser>(1, user->inputUser)
+			MTP_vector<MTPInputUser>(1, user->inputUser())
 		)).done([=](const MTPUpdates &result) {
 			user->session().api().applyUpdates(result);
 		}).send();
@@ -1563,7 +2039,7 @@ void PeerMenuDeleteContact(
 				st::mainMenuUserpic),
 			Ui::CreateChild<Ui::FlatLabel>(
 				box,
-				tr::lng_info_delete_contact() | Ui::Text::ToBold(),
+				tr::lng_info_delete_contact(tr::bold),
 				box->getDelegate()->style().title));
 		Ui::ConfirmBox(box, {
 			.text = text,
@@ -1612,17 +2088,17 @@ void PeerMenuDeleteTopicWithConfirmation(
 
 void PeerMenuDeleteTopic(
 		not_null<Window::SessionNavigation*> navigation,
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		MsgId rootId) {
-	const auto api = &channel->session().api();
-	api->request(MTPchannels_DeleteTopicHistory(
-		channel->inputChannel,
+	const auto api = &peer->session().api();
+	api->request(MTPmessages_DeleteTopicHistory(
+		peer->input(),
 		MTP_int(rootId)
 	)).done([=](const MTPmessages_AffectedHistory &result) {
-		const auto offset = api->applyAffectedHistory(channel, result);
+		const auto offset = api->applyAffectedHistory(peer, result);
 		if (offset > 0) {
-			PeerMenuDeleteTopic(navigation, channel, rootId);
-		} else if (const auto forum = channel->forum()) {
+			PeerMenuDeleteTopic(navigation, peer, rootId);
+		} else if (const auto forum = peer->forum()) {
 			forum->applyTopicDeleted(rootId);
 		}
 	}).send();
@@ -1631,14 +2107,17 @@ void PeerMenuDeleteTopic(
 void PeerMenuDeleteTopic(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<Data::ForumTopic*> topic) {
-	PeerMenuDeleteTopic(navigation, topic->channel(), topic->rootId());
+	PeerMenuDeleteTopic(navigation, topic->peer(), topic->rootId());
 }
 
 void PeerMenuShareContactBox(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<UserData*> user) {
+	if (navigation->showFrozenError()) {
+		return;
+	}
 	// There is no async to make weak from controller.
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto callback = [=](not_null<Data::Thread*> thread) {
 		const auto peer = thread->peer();
 		if (!Data::CanSend(thread, ChatRestriction::SendOther)) {
@@ -1661,23 +2140,55 @@ void PeerMenuShareContactBox(
 		auto recipient = peer->isUser()
 			? title
 			: ('\xAB' + title + '\xBB');
-		const auto weak = base::make_weak(thread);
+		struct State {
+			base::weak_ptr<Data::Thread> weak;
+			Fn<void(Api::SendOptions)> share;
+			SendPaymentHelper sendPayment;
+		};
+		const auto state = std::make_shared<State>();
+		state->weak = thread;
+		state->share = [=](Api::SendOptions options) {
+			const auto strong = state->weak.get();
+			if (!strong) {
+				state->share = nullptr;
+				return;
+			}
+
+			auto action = Api::SendAction(strong, options);
+			action.clearDraft = false;
+
+			const auto withPaymentApproved = [=](int stars) {
+				if (const auto onstack = state->share) {
+					auto copy = options;
+					copy.starsApproved = stars;
+					onstack(copy);
+				}
+			};
+			const auto checked = state->sendPayment.check(
+				navigation,
+				peer,
+				action.options,
+				1,
+				withPaymentApproved);
+			if (!checked) {
+				return;
+			}
+			navigation->showThread(
+				strong,
+				ShowAtTheEndMsgId,
+				Window::SectionShow::Way::ClearStack);
+			strong->session().api().shareContact(user, action);
+			state->share = nullptr;
+		};
+
 		navigation->parentController()->show(
 			Ui::MakeConfirmBox({
 				.text = tr::lng_forward_share_contact(
 					tr::now,
 					lt_recipient,
 					recipient),
-				.confirmed = [weak, user, navigation](Fn<void()> &&close) {
-					if (const auto strong = weak.get()) {
-						navigation->showThread(
-							strong,
-							ShowAtTheEndMsgId,
-							Window::SectionShow::Way::ClearStack);
-						auto action = Api::SendAction(strong);
-						action.clearDraft = false;
-						strong->session().api().shareContact(user, action);
-					}
+				.confirmed = [state](Fn<void()> &&close) {
+					state->share({});
 					close();
 				},
 				.confirmText = tr::lng_forward_send(),
@@ -1689,7 +2200,7 @@ void PeerMenuShareContactBox(
 				ChooseRecipientArgs{
 					.session = &navigation->session(),
 					.callback = std::move(callback),
-					.premiumRequiredError = WritePremiumRequiredError,
+					.moneyRestrictionError = WriteMoneyRestrictionError,
 				}),
 			[](not_null<PeerListBox*> box) {
 				box->addButton(tr::lng_cancel(), [=] {
@@ -1702,6 +2213,7 @@ void PeerMenuCreatePoll(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer,
 		FullReplyTo replyTo,
+		SuggestOptions suggest,
 		PollData::Flags chosen,
 		PollData::Flags disabled,
 		Api::SendType sendType,
@@ -1709,37 +2221,261 @@ void PeerMenuCreatePoll(
 	if (peer->isChannel() && !peer->isMegagroup()) {
 		chosen &= ~PollData::Flag::PublicVotes;
 		disabled |= PollData::Flag::PublicVotes;
+		chosen &= ~PollData::Flag::OpenAnswers;
+		disabled |= PollData::Flag::OpenAnswers;
 	}
+	auto starsRequired = peer->session().changes().peerFlagsValue(
+		peer,
+		Data::PeerUpdate::Flag::FullInfo
+		| Data::PeerUpdate::Flag::StarsPerMessage
+	) | rpl::map([=] {
+		return peer->starsPerMessageChecked();
+	});
 	auto box = Box<CreatePollBox>(
 		controller,
+		peer,
 		chosen,
 		disabled,
+		std::move(starsRequired),
 		sendType,
 		sendMenuDetails);
-	const auto weak = Ui::MakeWeak(box.data());
-	const auto lock = box->lifetime().make_state<bool>(false);
-	box->submitRequests(
-	) | rpl::start_with_next([=](const CreatePollBox::Result &result) {
-		if (std::exchange(*lock, true)) {
+	struct State {
+		Fn<void(const CreatePollBox::Result &)> create;
+		SendPaymentHelper sendPayment;
+		bool lock = false;
+	};
+	const auto weak = base::make_weak(box);
+	const auto state = box->lifetime().make_state<State>();
+	state->create = [=](const CreatePollBox::Result &result) {
+		auto action = Api::SendAction(
+			peer->owner().history(peer),
+			result.options);
+		action.replyTo = replyTo;
+		action.options.suggest = suggest;
+
+		const auto withPaymentApproved = crl::guard(weak, [=](int stars) {
+			if (const auto onstack = state->create) {
+				auto copy = result;
+				copy.options.starsApproved = stars;
+				onstack(copy);
+			}
+		});
+		const auto checked = state->sendPayment.check(
+			controller,
+			peer,
+			action.options,
+			1,
+			withPaymentApproved);
+		if (!checked || std::exchange(state->lock, true)) {
 			return;
 		}
+
+		const auto local = action.history->localDraft(
+			replyTo.topicRootId,
+			replyTo.monoforumPeerId);
+		if (local) {
+			action.clearDraft = local->textWithTags.text.isEmpty();
+		} else {
+			action.clearDraft = false;
+		}
+		const auto api = &peer->session().api();
+		api->polls().create(
+			result.poll,
+			result.text,
+			action,
+			crl::guard(weak, [=] {
+				state->create = nullptr;
+				weak->closeBox();
+			}),
+			crl::guard(weak, [=](bool fileReferenceExpired) {
+				state->lock = false;
+				if (fileReferenceExpired) {
+					weak->submitMediaExpired();
+				} else {
+					weak->submitFailed(tr::lng_attach_failed(tr::now));
+				}
+			}));
+	};
+	box->submitRequests(
+	) | rpl::on_next(state->create, box->lifetime());
+	controller->show(std::move(box), Ui::LayerOption::CloseOther);
+}
+
+void PeerMenuTodoWantsPremium(TodoWantsPremium type) {
+	const auto window = Core::App().activeWindow();
+	if (!window) {
+		return;
+	}
+	const auto filter = [=](const auto &...) {
+		if (const auto controller = window->sessionController()) {
+			ShowPremiumPreviewBox(controller, PremiumFeature::TodoLists);
+			window->activate();
+		}
+		return false;
+	};
+	const auto link = tr::link(
+		tr::semibold(tr::lng_todo_premium_link(tr::now)));
+	const auto text = [&] {
+		switch (type) {
+		case TodoWantsPremium::Create: return tr::lng_todo_create_premium;
+		case TodoWantsPremium::Add: return tr::lng_todo_add_premium;
+		case TodoWantsPremium::Mark: return tr::lng_todo_mark_premium;
+		}
+		Unexpected("Type in PeerMenuTodoWantsPremium.");
+	}();
+	constexpr auto kToastDuration = crl::time(4000);
+	window->uiShow()->showToast(Ui::Toast::Config{
+		.text = text(
+			tr::now,
+			lt_link,
+			link,
+			tr::marked),
+		.filter = filter,
+		.duration = kToastDuration,
+	});
+}
+
+void PeerMenuCreateTodoList(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		FullReplyTo replyTo,
+		SuggestOptions suggest,
+		Api::SendType sendType,
+		SendMenu::Details sendMenuDetails) {
+	if (!peer->session().premium()) {
+		PeerMenuTodoWantsPremium(TodoWantsPremium::Create);
+		return;
+	}
+	auto starsRequired = peer->session().changes().peerFlagsValue(
+		peer,
+		Data::PeerUpdate::Flag::FullInfo
+		| Data::PeerUpdate::Flag::StarsPerMessage
+	) | rpl::map([=] {
+		return peer->starsPerMessageChecked();
+	});
+	auto box = Box<EditTodoListBox>(
+		controller,
+		std::move(starsRequired),
+		sendType,
+		sendMenuDetails);
+	struct State {
+		Fn<void(const EditTodoListBox::Result &)> create;
+		SendPaymentHelper sendPayment;
+		bool lock = false;
+	};
+	const auto weak = base::make_weak(box);
+	const auto state = box->lifetime().make_state<State>();
+	state->create = [=](const EditTodoListBox::Result &result) {
+		const auto withPaymentApproved = crl::guard(weak, [=](int stars) {
+			if (const auto onstack = state->create) {
+				auto copy = result;
+				copy.options.starsApproved = stars;
+				onstack(copy);
+			}
+		});
 		auto action = Api::SendAction(
 			peer->owner().history(peer),
 			result.options);
 		action.replyTo = replyTo;
-		const auto topicRootId = replyTo.topicRootId;
-		if (const auto local = action.history->localDraft(topicRootId)) {
+		action.options.suggest = suggest;
+
+		const auto checked = state->sendPayment.check(
+			controller,
+			peer,
+			action.options,
+			1,
+			withPaymentApproved);
+		if (!checked || std::exchange(state->lock, true)) {
+			return;
+		}
+
+		const auto local = action.history->localDraft(
+			replyTo.topicRootId,
+			replyTo.monoforumPeerId);
+		if (local) {
 			action.clearDraft = local->textWithTags.text.isEmpty();
 		} else {
 			action.clearDraft = false;
 		}
 		const auto api = &peer->session().api();
-		api->polls().create(result.poll, action, crl::guard(weak, [=] {
+		api->todoLists().create(result.todolist, action, crl::guard(weak, [=] {
+			state->create = nullptr;
 			weak->closeBox();
-		}), crl::guard(weak, [=] {
-			*lock = false;
-			weak->submitFailed(tr::lng_attach_failed(tr::now));
+		}), crl::guard(weak, [=](const QString &error) {
+			state->lock = false;
+			weak->submitFailed(error);
 		}));
+	};
+	box->submitRequests(
+	) | rpl::on_next(state->create, box->lifetime());
+	controller->show(std::move(box), Ui::LayerOption::CloseOther);
+}
+
+void PeerMenuEditTodoList(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item) {
+	const auto media = item->media();
+	const auto todolist = media ? media->todolist() : nullptr;
+	if (!todolist) {
+		return;
+	} else if (!item->history()->session().premium()) {
+		PeerMenuTodoWantsPremium(TodoWantsPremium::Add);
+		return;
+	}
+	auto box = Box<EditTodoListBox>(controller, item);
+	const auto weak = base::make_weak(box);
+	box->submitRequests(
+	) | rpl::on_next([=](const EditTodoListBox::Result &result) {
+		const auto api = &item->history()->session().api();
+		api->todoLists().edit(
+			item,
+			result.todolist,
+			result.options,
+			crl::guard(weak, [=] { weak->closeBox(); }),
+			crl::guard(weak, [=](const QString &error) {
+				weak->submitFailed(error);
+			}));
+	}, box->lifetime());
+	controller->show(std::move(box), Ui::LayerOption::CloseOther);
+}
+
+bool PeerMenuShowAddTodoListTasks(not_null<HistoryItem*> item) {
+	const auto media = item ? item->media() : nullptr;
+	const auto todolist = media ? media->todolist() : nullptr;
+	const auto appConfig = &item->history()->session().appConfig();
+	return item->isRegular()
+		&& !item->Has<HistoryMessageForwarded>()
+		&& todolist
+		&& (todolist->items.size() < appConfig->todoListItemsLimit())
+		&& (item->out()
+			|| item->history()->peer->isSelf()
+			|| todolist->othersCanAppend());
+}
+
+void PeerMenuAddTodoListTasks(
+		not_null<Window::SessionController*> controller,
+		not_null<HistoryItem*> item) {
+	const auto session = &item->history()->session();
+	if (!session->premium()) {
+		PeerMenuTodoWantsPremium(TodoWantsPremium::Add);
+		return;
+	}
+	const auto media = item->media();
+	const auto todolist = media ? media->todolist() : nullptr;
+	if (!todolist) {
+		return;
+	}
+	auto box = Box<AddTodoListTasksBox>(controller, item);
+	const auto raw = box.data();
+	box->submitRequests(
+	) | rpl::on_next([=](const AddTodoListTasksBox::Result &result) {
+		const auto show = raw->uiShow();
+		raw->closeBox();
+		session->api().todoLists().add(
+			item,
+			result.items,
+			[] {},
+			[=](const QString &error) { show->showToast(error); });
 	}, box->lifetime());
 	controller->show(std::move(box), Ui::LayerOption::CloseOther);
 }
@@ -1762,8 +2498,8 @@ void PeerMenuBlockUserBox(
 			box,
 			tr::lng_blocked_list_confirm_text(
 				lt_name,
-				rpl::single(Ui::Text::Bold(name)),
-				Ui::Text::WithEntities),
+				rpl::single(tr::bold(name)),
+				tr::marked),
 			st::blockUserConfirmation));
 
 		box->addSkip(st::boxMediumSkip);
@@ -1789,7 +2525,7 @@ void PeerMenuBlockUserBox(
 		: v::is<ClearReply>(suggestClear)
 		? box->addRow(object_ptr<Ui::Checkbox>(
 			box,
-			tr::lng_context_delete_msg(tr::now),
+			tr::lng_blocked_list_confirm_reply(tr::now),
 			true,
 			st::defaultBoxCheckbox))
 		: nullptr;
@@ -1799,11 +2535,11 @@ void PeerMenuBlockUserBox(
 	const auto allFromUser = v::is<ClearReply>(suggestClear)
 		? box->addRow(object_ptr<Ui::Checkbox>(
 			box,
-			tr::lng_delete_all_from_user(
+			tr::lng_blocked_list_confirm_reply_all(
 				tr::now,
 				lt_user,
-				Ui::Text::Bold(peer->name()),
-				Ui::Text::WithEntities),
+				tr::bold(peer->name()),
+				tr::marked),
 			true,
 			st::defaultBoxCheckbox))
 		: nullptr;
@@ -1837,7 +2573,7 @@ void PeerMenuBlockUserBox(
 			peer->session().api().blockedPeers().block(peer);
 			if (reportChecked) {
 				peer->session().api().request(MTPmessages_ReportSpam(
-					peer->input
+					peer->input()
 				)).send();
 			}
 			if (clearChecked) {
@@ -1882,13 +2618,95 @@ void BlockSenderFromRepliesBox(
 		Window::ClearReply{ id });
 }
 
-QPointer<Ui::BoxContent> ShowChooseRecipientBox(
-		not_null<Window::SessionNavigation*> navigation,
+object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
+		not_null<Main::Session*> session,
 		FnMut<bool(not_null<Data::Thread*>)> &&chosen,
 		rpl::producer<QString> titleOverride,
 		FnMut<void()> &&successCallback,
-		InlineBots::PeerTypes typesRestriction) {
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+		InlineBots::PeerTypes typesRestriction,
+		Fn<void(
+			std::vector<not_null<Data::Thread*>>,
+			Api::SendOptions)> sendMany) {
+	const auto weak = std::make_shared<base::weak_qptr<PeerListBox>>();
+	const auto selectable = (sendMany != nullptr);
+	class Controller final : public ChooseRecipientBoxController {
+	public:
+		using Chosen = not_null<Data::Thread*>;
+
+		Controller(
+			not_null<Main::Session*> session,
+			FnMut<void(Chosen)> callback,
+			Fn<bool(Chosen)> filter,
+			bool selectable)
+		: ChooseRecipientBoxController({
+			.session = session,
+			.callback = std::move(callback),
+			.filter = filter,
+			.moneyRestrictionError = WriteMoneyRestrictionError,
+		})
+		, _selectable(selectable) {
+		}
+
+		using PeerListController::setSearchNoResultsText;
+
+		void rowClicked(not_null<PeerListRow*> row) override final {
+			if (!_selectable) {
+				return ChooseRecipientBoxController::rowClicked(row);
+			}
+			const auto count = delegate()->peerListSelectedRowsCount();
+			const auto forum = row->peer()->isForum();
+			const auto monoforum = row->peer()->isMonoforum();
+			if (showLockedError(row) || (count && (forum || monoforum))) {
+				return;
+			} else if (forum || monoforum) {
+				ChooseRecipientBoxController::rowClicked(row);
+			} else {
+				delegate()->peerListSetRowChecked(row, !row->checked());
+				_selectionChanges.fire({});
+			}
+		}
+
+		base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+				QWidget *parent,
+				not_null<PeerListRow*> row) override final {
+			if (!_selectable) {
+				return ChooseRecipientBoxController::rowContextMenu(
+					parent,
+					row);
+			}
+			if (!row->checked()
+				&& !row->peer()->isForum()
+				&& !row->peer()->isMonoforum()) {
+				auto menu = base::make_unique_q<Ui::PopupMenu>(
+					parent,
+					st::popupMenuWithIcons);
+				menu->addAction(tr::lng_bot_choose_chat(tr::now), [=] {
+					delegate()->peerListSetRowChecked(row, true);
+					_selectionChanges.fire({});
+				}, &st::menuIconSelect);
+				return menu;
+			}
+			return nullptr;
+		}
+
+		[[nodiscard]] rpl::producer<> selectionChanges() const {
+			return _selectionChanges.events_starting_with({});
+		}
+		[[nodiscard]] bool hasSelected() const {
+			return delegate()->peerListSelectedRowsCount() > 0;
+		}
+
+		[[nodiscard]] rpl::producer<Chosen> singleChosen() const {
+			return _singleChosen.events();
+		}
+
+	private:
+		rpl::event_stream<Chosen> _singleChosen;
+		rpl::event_stream<> _selectionChanges;
+		bool _selectable = false;
+
+	};
+
 	auto callback = [
 		chosen = std::move(chosen),
 		success = std::move(successCallback),
@@ -1920,26 +2738,137 @@ QPointer<Ui::BoxContent> ShowChooseRecipientBox(
 			}
 		}
 		: Fn<bool(not_null<Data::Thread*>)>();
+	auto controller = std::make_unique<Controller>(
+		session,
+		std::move(callback),
+		std::move(filter),
+		selectable);
+	const auto raw = controller.get();
+
+	struct State {
+		Fn<void(Api::SendOptions)> submit;
+		rpl::variable<int> starsToSend;
+		Fn<void()> refreshStarsToSend;
+		rpl::lifetime submitLifetime;
+	};
+	const auto state = std::make_shared<State>();
 	auto initBox = [=](not_null<PeerListBox*> box) {
-		box->addButton(tr::lng_cancel(), [box] {
-			box->closeBox();
-		});
+		state->refreshStarsToSend = [=] {
+			auto perMessage = 0;
+			for (const auto &peer : box->collectSelectedRows()) {
+				perMessage += peer->starsPerMessageChecked();
+			}
+			state->starsToSend = perMessage;
+		};
+		raw->selectionChanges(
+		) | rpl::on_next([=] {
+			box->clearButtons();
+			state->refreshStarsToSend();
+			const auto shown = raw->hasSelected();
+			if (shown) {
+				const auto weak = base::make_weak(box);
+				state->submit = [=](Api::SendOptions options) {
+					state->submitLifetime.destroy();
+					const auto show = box->peerListUiShow();
+					const auto peers = box->collectSelectedRows();
+					const auto withPaymentApproved = crl::guard(weak, [=](
+							int approved) {
+						auto copy = options;
+						copy.starsApproved = approved;
+						if (const auto onstack = state->submit) {
+							onstack(copy);
+						}
+					});
+
+					const auto alreadyApproved = options.starsApproved;
+					auto paid = std::vector<not_null<PeerData*>>();
+					auto waiting = base::flat_set<not_null<PeerData*>>();
+					auto totalStars = 0;
+					for (const auto &peer : peers) {
+						const auto details = ComputePaymentDetails(peer, 1);
+						if (!details) {
+							waiting.emplace(peer);
+						} else if (details->stars > 0) {
+							totalStars += details->stars;
+							paid.push_back(peer);
+						}
+					}
+					if (!waiting.empty()) {
+						session->changes().peerUpdates(
+							Data::PeerUpdate::Flag::FullInfo
+						) | rpl::on_next([=](const Data::PeerUpdate &update) {
+							if (waiting.contains(update.peer)) {
+								withPaymentApproved(alreadyApproved);
+							}
+						}, state->submitLifetime);
+
+						if (!session->credits().loaded()) {
+							session->credits().loadedValue(
+							) | rpl::filter(
+								rpl::mappers::_1
+							) | rpl::take(1) | rpl::on_next([=] {
+								withPaymentApproved(alreadyApproved);
+							}, state->submitLifetime);
+						}
+						return;
+					} else if (totalStars > alreadyApproved) {
+						ShowSendPaidConfirm(show, paid, SendPaymentDetails{
+							.messages = 1,
+							.stars = totalStars,
+						}, [=] { withPaymentApproved(totalStars); });
+						return;
+					}
+					state->submit = nullptr;
+
+					sendMany(ranges::views::all(
+						peers
+					) | ranges::views::transform([&](
+						not_null<PeerData*> peer) -> Controller::Chosen {
+						return peer->owner().history(peer);
+					}) | ranges::to_vector, options);
+				};
+				const auto send = box->addButton(
+					tr::lng_send_button(),
+					[=] {
+						if (const auto onstack = state->submit) {
+							onstack({});
+						}
+					});
+				send->setText(PaidSendButtonText(
+					state->starsToSend.value(),
+					tr::lng_send_button()));
+			}
+			box->addButton(tr::lng_cancel(), [=] {
+				box->closeBox();
+			});
+		}, box->lifetime());
 		if (titleOverride) {
 			box->setTitle(std::move(titleOverride));
 		}
 	};
-	*weak = navigation->parentController()->show(Box<PeerListBox>(
-		std::make_unique<ChooseRecipientBoxController>(ChooseRecipientArgs{
-			.session = &navigation->session(),
-			.callback = std::move(callback),
-			.filter = std::move(filter),
-			.premiumRequiredError = WritePremiumRequiredError,
-		}),
-		std::move(initBox)));
-	return weak->data();
+	auto result = Box<PeerListBox>(
+		std::move(controller),
+		std::move(initBox));
+	*weak = result.data();
+
+	return result;
 }
 
-QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowChooseRecipientBox(
+		not_null<Window::SessionNavigation*> navigation,
+		FnMut<bool(not_null<Data::Thread*>)> &&chosen,
+		rpl::producer<QString> titleOverride,
+		FnMut<void()> &&successCallback,
+		InlineBots::PeerTypes typesRestriction) {
+	return navigation->parentController()->show(PrepareChooseRecipientBox(
+		&navigation->session(),
+		std::move(chosen),
+		std::move(titleOverride),
+		std::move(successCallback),
+		typesRestriction));
+}
+
+base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 		std::shared_ptr<ChatHelpers::Show> show,
 		Data::ForwardDraft &&draft,
 		Fn<void()> &&successCallback) {
@@ -1949,13 +2878,33 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 	const auto msgIds = owner->itemsToIds(itemsList);
 	const auto sendersCount = ItemsForwardSendersCount(itemsList);
 	const auto captionsCount = ItemsForwardCaptionsCount(itemsList);
+	const auto hasRichPage = HistoryView::Controls::HasRichPage(itemsList);
+	const auto hasOnlyForcedForwardedInfo = !captionsCount
+		&& HistoryView::Controls::HasOnlyForcedForwardedInfo(itemsList);
+	const auto showForwardOptions = !hasOnlyForcedForwardedInfo
+		&& (!hasRichPage
+			|| HistoryView::Controls::CanHideForwardAuthor(session, itemsList));
+	draft.options = HistoryView::Controls::NormalizeForwardOptions(
+		session,
+		itemsList,
+		draft.options);
 	if (msgIds.empty()) {
 		return nullptr;
 	}
 
 	class ListBox final : public PeerListBox {
 	public:
-		using PeerListBox::PeerListBox;
+		ListBox(
+			QWidget *parent,
+			std::unique_ptr<PeerListController> controller,
+			Fn<void(not_null<ListBox*>)> init)
+		: PeerListBox(
+			parent,
+			std::move(controller),
+			[=](not_null<PeerListBox*> box) {
+				init(static_cast<ListBox*>(box.get()));
+			}) {
+		}
 
 		void setBottomSkip(int bottomSkip) {
 			PeerListBox::setInnerBottomSkip(bottomSkip);
@@ -1980,9 +2929,21 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 			_forwardOptions = forwardOptions;
 		}
 
+		not_null<PeerListContent*> peerListContent() const {
+			return PeerListBox::content();
+		}
+
+		void setFilterId(FilterId filterId) {
+			_filterId = filterId;
+		}
+		[[nodiscard]] FilterId filterId() const {
+			return _filterId;
+		}
+
 	private:
 		rpl::event_stream<> _focusRequests;
 		Ui::ForwardOptions _forwardOptions;
+		FilterId _filterId = 0;
 
 	};
 
@@ -1996,43 +2957,55 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 			.callback = [=](Chosen thread) {
 				_singleChosen.fire_copy(thread);
 			},
-			.premiumRequiredError = WritePremiumRequiredError,
+			.moneyRestrictionError = WriteMoneyRestrictionError,
 		}) {
 		}
 
+		std::unique_ptr<PeerListRow> createRestoredRow(
+				not_null<PeerData*> peer) override final {
+			return ChooseRecipientBoxController::createRow(
+				peer->owner().history(peer));
+		}
+
+		using PeerListController::setSearchNoResultsText;
+
 		void rowClicked(not_null<PeerListRow*> row) override final {
 			const auto count = delegate()->peerListSelectedRowsCount();
-			if (showLockedError(row) || (count && row->peer()->isForum())) {
+			const auto forum = row->peer()->isForum();
+			const auto monoforum = row->peer()->isMonoforum();
+			if (showLockedError(row) || (count && (forum || monoforum))) {
 				return;
-			} else if (!count || row->peer()->isForum()) {
+			} else if (!count || forum || monoforum) {
 				ChooseRecipientBoxController::rowClicked(row);
 			} else if (count) {
 				delegate()->peerListSetRowChecked(row, !row->checked());
-				_hasSelectedChanges.fire(
-					delegate()->peerListSelectedRowsCount() > 0);
+				_selectionChanges.fire({});
 			}
 		}
 
 		base::unique_qptr<Ui::PopupMenu> rowContextMenu(
 				QWidget *parent,
 				not_null<PeerListRow*> row) override final {
-			const auto count = delegate()->peerListSelectedRowsCount();
-			if (!count && !row->peer()->isForum()) {
+			if (!row->checked()
+				&& !row->peer()->isForum()
+				&& !row->peer()->isMonoforum()) {
 				auto menu = base::make_unique_q<Ui::PopupMenu>(
 					parent,
 					st::popupMenuWithIcons);
 				menu->addAction(tr::lng_bot_choose_chat(tr::now), [=] {
-					delegate()->peerListSetRowChecked(row, !row->checked());
-					_hasSelectedChanges.fire(
-						delegate()->peerListSelectedRowsCount() > 0);
+					delegate()->peerListSetRowChecked(row, true);
+					_selectionChanges.fire({});
 				}, &st::menuIconSelect);
 				return menu;
 			}
 			return nullptr;
 		}
 
-		[[nodiscard]] rpl::producer<bool> hasSelectedChanges() const{
-			return _hasSelectedChanges.events_starting_with(false);
+		[[nodiscard]] rpl::producer<> selectionChanges() const {
+			return _selectionChanges.events_starting_with({});
+		}
+		[[nodiscard]] bool hasSelected() const {
+			return delegate()->peerListSelectedRowsCount() > 0;
 		}
 
 		[[nodiscard]] rpl::producer<Chosen> singleChosen() const{
@@ -2041,7 +3014,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 
 	private:
 		rpl::event_stream<Chosen> _singleChosen;
-		rpl::event_stream<bool> _hasSelectedChanges;
+		rpl::event_stream<> _selectionChanges;
 
 	};
 
@@ -2049,15 +3022,96 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		not_null<ListBox*> box;
 		not_null<Controller*> controller;
 		base::unique_qptr<Ui::PopupMenu> menu;
+		Fn<void(Api::SendOptions options)> submit;
+		rpl::variable<int> starsToSend;
+		Fn<void()> refreshStarsToSend;
+		rpl::lifetime submitLifetime;
 	};
+
+	const auto applyFilter = [=](not_null<ListBox*> box, FilterId id) {
+		box->scrollToY(0);
+		auto &filters = session->data().chatsFilters();
+		const auto &list = filters.list();
+		if (list.size() <= 1) {
+			return;
+		}
+		if (box->filterId() == id) {
+			return;
+		}
+		box->setFilterId(id);
+
+		using SavedState = PeerListController::SavedStateBase;
+		auto state = std::make_unique<PeerListState>();
+		state->controllerState = std::make_unique<SavedState>();
+
+		const auto addList = [&](auto chats) {
+			for (const auto &row : chats->all()) {
+				if (const auto history = row->history()) {
+					state->list.push_back(history->peer);
+				}
+			}
+		};
+
+		if (!id) {
+			state->list.push_back(session->user());
+			addList(session->data().chatsList()->indexed());
+			const auto folderId = Data::Folder::kId;
+			if (const auto folder = session->data().folderLoaded(folderId)) {
+				addList(folder->chatsList()->indexed());
+			}
+			addList(session->data().contactsNoChatsList());
+		} else {
+			addList(session->data().chatsFilters().chatsList(id)->indexed());
+		}
+		box->peerListContent()->restoreState(std::move(state));
+	};
+
 	const auto state = [&] {
 		auto controller = std::make_unique<Controller>(session);
 		const auto controllerRaw = controller.get();
-		auto box = Box<ListBox>(std::move(controller), nullptr);
+		auto init = [=](not_null<ListBox*> box) {
+			controllerRaw->setSearchNoResultsText(
+				tr::lng_bot_chats_not_found(tr::now));
+			const auto lastFilterId = box->lifetime().make_state<FilterId>(0);
+			const auto chatsFilters = Ui::AddChatFiltersTabsStrip(
+				box,
+				session,
+				[=](FilterId id) {
+					*lastFilterId = id;
+					applyFilter(box, id);
+				},
+				Window::GifPauseReason::Layer,
+				nullptr,
+				false,
+				true);
+			chatsFilters->lower();
+			rpl::combine(
+				chatsFilters->heightValue(),
+				rpl::producer<bool>([=](auto consumer) {
+					auto lifetime = rpl::lifetime();
+					consumer.put_next(false);
+					box->appendQueryChangedCallback([=](const QString &q) {
+						const auto hasQuery = !q.isEmpty();
+						applyFilter(box, hasQuery ? 0 : (*lastFilterId));
+						consumer.put_next_copy(hasQuery);
+					});
+					return lifetime;
+				})
+			) | rpl::on_next([box](int h, bool hasQuery) {
+				box->setAddedTopScrollSkip(hasQuery ? 0 : h);
+			}, box->lifetime());
+			box->multiSelectHeightValue() | rpl::on_next([=](int h) {
+				chatsFilters->moveToLeft(0, h);
+			}, chatsFilters->lifetime());
+		};
+		auto box = Box<ListBox>(std::move(controller), std::move(init));
 		const auto boxRaw = box.data();
 		boxRaw->setForwardOptions({
 			.sendersCount = sendersCount,
 			.captionsCount = captionsCount,
+			.dropNames = (draft.options != Data::ForwardOptions::PreserveInfo),
+			.dropCaptions = (draft.options
+				== Data::ForwardOptions::NoNamesAndCaptions),
 		});
 		show->showBox(std::move(box));
 		auto state = State{ boxRaw, controllerRaw };
@@ -2075,7 +3129,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 				return true;
 			}
 			const auto id = SeparateId(
-				(peer->isForum()
+				((peer->isForum() && !peer->useSubsectionTabs())
 					? SeparateType::Forum
 					: SeparateType::Chat),
 				thread);
@@ -2094,10 +3148,10 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		};
 		auto callback = [=, chosen = std::move(chosen)](
 				Controller::Chosen thread) mutable {
-			const auto weak = Ui::MakeWeak(state->box);
+			const auto weak = base::make_weak(state->box);
 			if (!chosen(thread)) {
 				return;
-			} else if (const auto strong = weak.data()) {
+			} else if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 			if (successCallback) {
@@ -2105,7 +3159,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 			}
 		};
 		state->controller->singleChosen(
-		) | rpl::start_with_next(std::move(callback), state->box->lifetime());
+		) | rpl::on_next(std::move(callback), state->box->lifetime());
 	}
 
 	const auto comment = Ui::CreateChild<Ui::SlideWrap<Ui::InputField>>(
@@ -2117,13 +3171,78 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 			tr::lng_photos_comment()),
 		st::shareCommentPadding);
 
+	const auto history = session->data().message(msgIds.front())->history();
 	const auto send = ShareBox::DefaultForwardCallback(
 		show,
-		session->data().message(msgIds.front())->history(),
+		history,
+		msgIds);
+	const auto countMessages = ShareBox::DefaultForwardCountMessages(
+		history,
 		msgIds);
 
-	const auto submit = [=](Api::SendOptions options) {
+	const auto weak = base::make_weak(state->box);
+	const auto field = comment->entity();
+	state->submit = [=](Api::SendOptions options) {
 		const auto peers = state->box->collectSelectedRows();
+		auto comment = field->getTextWithAppliedMarkdown();
+		const auto checkPaid = [=] {
+			const auto withPaymentApproved = crl::guard(weak, [=](
+					int approved) {
+				auto copy = options;
+				copy.starsApproved = approved;
+				if (const auto onstack = state->submit) {
+					onstack(copy);
+				}
+			});
+
+			const auto alreadyApproved = options.starsApproved;
+			const auto messagesCount = countMessages(comment);
+			auto paid = std::vector<not_null<PeerData*>>();
+			auto waiting = base::flat_set<not_null<PeerData*>>();
+			auto totalStars = 0;
+			for (const auto &peer : peers) {
+				const auto details = ComputePaymentDetails(
+					peer,
+					messagesCount);
+				if (!details) {
+					waiting.emplace(peer);
+				} else if (details->stars > 0) {
+					totalStars += details->stars;
+					paid.push_back(peer);
+				}
+			}
+			if (!waiting.empty()) {
+				session->changes().peerUpdates(
+					Data::PeerUpdate::Flag::FullInfo
+				) | rpl::on_next([=](const Data::PeerUpdate &update) {
+					if (waiting.contains(update.peer)) {
+						withPaymentApproved(alreadyApproved);
+					}
+				}, state->submitLifetime);
+
+				if (!session->credits().loaded()) {
+					session->credits().loadedValue(
+					) | rpl::filter(
+						rpl::mappers::_1
+					) | rpl::take(1) | rpl::on_next([=] {
+						withPaymentApproved(alreadyApproved);
+					}, state->submitLifetime);
+				}
+				return false;
+			} else if (totalStars > alreadyApproved) {
+				ShowSendPaidConfirm(show, paid, SendPaymentDetails{
+					.messages = messagesCount,
+					.stars = totalStars,
+				}, [=] { withPaymentApproved(totalStars); });
+				return false;
+			}
+			state->submit = nullptr;
+			return true;
+		};
+		auto forwardOptions = HistoryView::Controls::NormalizeForwardOptions(
+			session,
+			itemsList,
+			state->box->forwardOptionsData());
 		send(
 			ranges::views::all(
 				peers
@@ -2131,24 +3250,34 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 					not_null<PeerData*> peer) -> Controller::Chosen {
 				return peer->owner().history(peer);
 			}) | ranges::to_vector,
-			comment->entity()->getTextWithAppliedMarkdown(),
+			checkPaid,
+			std::move(comment),
 			options,
-			state->box->forwardOptionsData());
-		if (successCallback) {
+			forwardOptions);
+		if (!state->submit && successCallback) {
 			successCallback();
 		}
 	};
 
 	const auto sendMenuType = [=] {
 		const auto selected = state->box->collectSelectedRows();
-		return ranges::all_of(selected, HistoryView::CanScheduleUntilOnline)
+		const auto hasPaid = [&] {
+			for (const auto &peer : selected) {
+				if (peer->starsPerMessageChecked()) {
+					return true;
+				}
+			}
+			return false;
+		}();
+		return hasPaid
+			? SendMenu::Type::SilentOnly
+			: ranges::all_of(selected, HistoryView::CanScheduleUntilOnline)
 			? SendMenu::Type::ScheduledToUser
 			: ((selected.size() == 1) && selected.front()->isSelf())
 			? SendMenu::Type::Reminder
 			: SendMenu::Type::Scheduled;
 	};
 
-	const auto showForwardOptions = true;
 	const auto showMenu = [=](not_null<Ui::RpWidget*> parent) {
 		if (state->menu) {
 			state->menu = nullptr;
@@ -2168,7 +3297,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 					nullptr);
 				std::move(
 					text
-				) | rpl::start_with_next([action = item->action()](
+				) | rpl::on_next([action = item->action()](
 						QString text) {
 					action->setText(text);
 				}, item->lifetime());
@@ -2193,29 +3322,48 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 			state->menu.get(),
 			show,
 			SendMenu::Details{ sendMenuType() },
-			SendMenu::DefaultCallback(show, crl::guard(parent, submit)));
+			SendMenu::DefaultCallback(show, crl::guard(parent, [=](
+					Api::SendOptions options) {
+				if (const auto onstack = state->submit) {
+					onstack(options);
+				}
+			})));
 		if (showForwardOptions || !state->menu->empty()) {
 			state->menu->popup(QCursor::pos());
 		}
 	};
 
+	state->refreshStarsToSend = [=] {
+		auto perMessage = 0;
+		for (const auto &peer : state->box->collectSelectedRows()) {
+			perMessage += peer->starsPerMessageChecked();
+		}
+		state->starsToSend = perMessage
+			* countMessages(field->getTextWithTags());
+	};
+
 	comment->hide(anim::type::instant);
-	comment->toggleOn(state->controller->hasSelectedChanges());
+	comment->toggleOn(state->controller->selectionChanges(
+	) | rpl::map([=] {
+		return state->controller->hasSelected();
+	}));
 
 	rpl::combine(
 		state->box->sizeValue(),
 		comment->heightValue()
-	) | rpl::start_with_next([=](const QSize &size, int commentHeight) {
+	) | rpl::on_next([=](const QSize &size, int commentHeight) {
 		comment->moveToLeft(0, size.height() - commentHeight);
 		comment->resizeToWidth(size.width());
 
 		state->box->setBottomSkip(comment->isHidden() ? 0 : commentHeight);
 	}, comment->lifetime());
 
-	const auto field = comment->entity();
-
 	field->submits(
-	) | rpl::start_with_next([=] { submit({}); }, field->lifetime());
+	) | rpl::on_next([=] {
+		if (const auto onstack = state->submit) {
+			onstack({});
+		}
+	}, field->lifetime());
 	InitMessageFieldHandlers({
 		.session = session,
 		.show = show,
@@ -2225,40 +3373,53 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		},
 	});
 	field->setSubmitSettings(Core::App().settings().sendSubmitWay());
+	field->changes() | rpl::on_next([=] {
+		state->refreshStarsToSend();
+	}, field->lifetime());
 
 	Ui::SendPendingMoveResizeEvents(comment);
 
 	state->box->focusRequests(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!comment->isHidden()) {
 			comment->entity()->setFocusFast();
 		}
 	}, comment->lifetime());
 
-	state->controller->hasSelectedChanges(
-	) | rpl::start_with_next([=](bool shown) {
+	state->controller->selectionChanges(
+	) | rpl::on_next([=] {
+		const auto shown = state->controller->hasSelected();
+
 		state->box->clearButtons();
+		state->refreshStarsToSend();
 		if (shown) {
 			const auto send = state->box->addButton(
 				tr::lng_send_button(),
-				[=] { submit({}); });
+				[=] {
+					if (const auto onstack = state->submit) {
+						onstack({});
+					}
+				});
 			send->setAcceptBoth();
 			send->clicks(
-			) | rpl::start_with_next([=](Qt::MouseButton button) {
+			) | rpl::on_next([=](Qt::MouseButton button) {
 				if (button == Qt::RightButton) {
 					showMenu(send);
 				}
 			}, send->lifetime());
+			send->setText(PaidSendButtonText(
+				state->starsToSend.value(),
+				tr::lng_send_button()));
 		}
 		state->box->addButton(tr::lng_cancel(), [=] {
 			state->box->closeBox();
 		});
 	}, state->box->lifetime());
 
-	return QPointer<Ui::BoxContent>(state->box);
+	return base::make_weak(state->box);
 }
 
-QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 		not_null<Window::SessionNavigation*> navigation,
 		Data::ForwardDraft &&draft,
 		Fn<void()> &&successCallback) {
@@ -2268,7 +3429,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		std::move(successCallback));
 }
 
-QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 		not_null<Window::SessionNavigation*> navigation,
 		MessageIdsList &&items,
 		Fn<void()> &&successCallback) {
@@ -2278,13 +3439,13 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		std::move(successCallback));
 }
 
-QPointer<Ui::BoxContent> ShowShareGameBox(
+base::weak_qptr<Ui::BoxContent> ShowShareGameBox(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<UserData*> bot,
 		QString shortName) {
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto chosen = [=](not_null<Data::Thread*> thread) mutable {
-		const auto confirm = std::make_shared<QPointer<Ui::BoxContent>>();
+		const auto confirm = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 		auto send = crl::guard(thread, [=] {
 			ShareBotGame(bot, thread, shortName);
 			if (const auto strong = *weak) {
@@ -2328,26 +3489,26 @@ QPointer<Ui::BoxContent> ShowShareGameBox(
 			.session = &navigation->session(),
 			.callback = std::move(chosen),
 			.filter = std::move(filter),
-			.premiumRequiredError = WritePremiumRequiredError,
+			.moneyRestrictionError = WriteMoneyRestrictionError,
 		}),
 		std::move(initBox)));
-	return weak->data();
+	return weak->get();
 }
 
-QPointer<Ui::BoxContent> ShowDropMediaBox(
+base::weak_qptr<Ui::BoxContent> ShowDropMediaBox(
 		not_null<Window::SessionNavigation*> navigation,
 		std::shared_ptr<QMimeData> data,
 		not_null<Data::Forum*> forum,
 		FnMut<void()> &&successCallback) {
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto chosen = [
 		data = std::move(data),
 		callback = std::move(successCallback),
 		weak,
 		navigation
-	](not_null<Data::ForumTopic*> topic) mutable {
+	](not_null<Data::Thread*> thread) mutable {
 		const auto content = navigation->parentController()->content();
-		if (!content->filesOrForwardDrop(topic, data.get())) {
+		if (!content->filesOrForwardDrop(thread, data.get(), true)) {
 			return;
 		} else if (const auto strong = *weak) {
 			strong->closeBox();
@@ -2362,7 +3523,7 @@ QPointer<Ui::BoxContent> ShowDropMediaBox(
 		});
 
 		forum->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	};
@@ -2371,10 +3532,50 @@ QPointer<Ui::BoxContent> ShowDropMediaBox(
 			forum,
 			std::move(chosen)),
 		std::move(initBox)));
-	return weak->data();
+	return weak->get();
+}
+
+base::weak_qptr<Ui::BoxContent> ShowDropMediaBox(
+		not_null<Window::SessionNavigation*> navigation,
+		std::shared_ptr<QMimeData> data,
+		not_null<Data::SavedMessages*> monoforum,
+		FnMut<void()> &&successCallback) {
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
+	auto chosen = [
+		data = std::move(data),
+		callback = std::move(successCallback),
+		weak,
+		navigation
+	](not_null<Data::SavedSublist*> sublist) mutable {
+		const auto content = navigation->parentController()->content();
+		if (!content->filesOrForwardDrop(sublist, data.get(), true)) {
+			return;
+		} else if (const auto strong = *weak) {
+			strong->closeBox();
+		}
+		if (callback) {
+			callback();
+		}
+	};
+	auto initBox = [=](not_null<PeerListBox*> box) {
+		box->addButton(tr::lng_cancel(), [=] {
+			box->closeBox();
+		});
+
+		monoforum->destroyed(
+		) | rpl::on_next([=] {
+			box->closeBox();
+		}, box->lifetime());
+	};
+	*weak = navigation->parentController()->show(Box<PeerListBox>(
+		std::make_unique<ChooseSublistBoxController>(
+			monoforum,
+			std::move(chosen)),
+		std::move(initBox)));
+	return weak->get();
 }
 
-QPointer<Ui::BoxContent> ShowSendNowMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowSendNowMessagesBox(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<History*> history,
 		MessageIdsList &&items,
@@ -2385,11 +3586,11 @@ QPointer<Ui::BoxContent> ShowSendNowMessagesBox(
 		: tr::lng_scheduled_send_now(tr::now);
 
 	const auto list = session->data().idsToItems(items);
-	const auto error = GetErrorTextForSending(
+	const auto error = GetErrorForSending(
 		history->peer,
 		{ .forward = &list });
-	if (!error.isEmpty()) {
-		navigation->showToast(error);
+	if (error) {
+		Data::ShowSendErrorToast(navigation, history->peer, error);
 		return { nullptr };
 	}
 	auto done = [
@@ -2408,7 +3609,7 @@ QPointer<Ui::BoxContent> ShowSendNowMessagesBox(
 			}
 		}
 		session->api().request(MTPmessages_SendScheduledMessages(
-			history->peer->input,
+			history->peer->input(),
 			MTP_vector<MTPint>(ids)
 		)).done([=](const MTPUpdates &result) {
 			session->api().applyUpdates(result);
@@ -2423,7 +3624,7 @@ QPointer<Ui::BoxContent> ShowSendNowMessagesBox(
 		.text = text,
 		.confirmed = std::move(done),
 		.confirmText = tr::lng_send_button(),
-	})).data();
+	}));
 }
 
 void PeerMenuAddChannelMembers(
@@ -2477,7 +3678,7 @@ void ToggleMessagePinned(
 			close();
 			session->api().request(MTPmessages_UpdatePinnedMessage(
 				MTP_flags(MTPmessages_UpdatePinnedMessage::Flag::f_unpin),
-				peer->input,
+				peer->input(),
 				MTP_int(itemId.msg)
 			)).done([=](const MTPUpdates &result) {
 				session->api().applyUpdates(result);
@@ -2497,14 +3698,18 @@ void HidePinnedBar(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<PeerData*> peer,
 		MsgId topicRootId,
+		PeerId monoforumPeerId,
 		Fn<void()> onHidden) {
 	const auto callback = crl::guard(navigation, [=](Fn<void()> &&close) {
 		close();
 		auto &session = peer->session();
-		const auto migrated = topicRootId ? nullptr : peer->migrateFrom();
+		const auto migrated = (topicRootId || monoforumPeerId)
+			? nullptr
+			: peer->migrateFrom();
 		const auto top = Data::ResolveTopPinnedId(
 			peer,
 			topicRootId,
+			monoforumPeerId,
 			migrated);
 		const auto universal = !top
 			? MsgId(0)
@@ -2515,6 +3720,7 @@ void HidePinnedBar(
 			session.settings().setHiddenPinnedMessageId(
 				peer->id,
 				topicRootId,
+				monoforumPeerId,
 				universal);
 			session.saveSettingsDelayed();
 			if (onHidden) {
@@ -2547,18 +3753,22 @@ void UnpinAllMessages(
 		const auto sendRequest = [=](auto self) -> void {
 			const auto history = strong->owningHistory();
 			const auto topicRootId = strong->topicRootId();
+			const auto sublist = strong->asSublist();
+			const auto monoforumPeerId = strong->monoforumPeerId();
 			using Flag = MTPmessages_UnpinAllMessages::Flag;
 			api->request(MTPmessages_UnpinAllMessages(
-				MTP_flags(topicRootId ? Flag::f_top_msg_id : Flag()),
-				history->peer->input,
-				MTP_int(topicRootId.bare)
+				MTP_flags((topicRootId ? Flag::f_top_msg_id : Flag())
+					| (sublist ? Flag::f_saved_peer_id : Flag())),
+				history->peer->input(),
+				MTP_int(topicRootId.bare),
+				sublist ? sublist->sublistPeer()->input() : MTPInputPeer()
 			)).done([=](const MTPmessages_AffectedHistory &result) {
 				const auto peer = history->peer;
 				const auto offset = api->applyAffectedHistory(peer, result);
 				if (offset > 0) {
 					self(self);
 				} else {
-					history->unpinMessagesFor(topicRootId);
+					history->unpinMessagesFor(topicRootId, monoforumPeerId);
 				}
 			}).send();
 		};
@@ -2574,10 +3784,10 @@ void UnpinAllMessages(
 }
 
 void MenuAddMarkAsReadAllChatsAction(
-		not_null<Window::SessionController*> controller,
+		not_null<Main::Session*> session,
+		std::shared_ptr<Ui::Show> show,
 		const PeerMenuCallback &addAction) {
-	// There is no async to make weak from controller.
-	auto callback = [=, owner = &controller->session().data()] {
+	auto callback = [=, owner = &session->data()] {
 		auto boxCallback = [=](Fn<void()> &&close) {
 			close();
 
@@ -2586,10 +3796,37 @@ void MenuAddMarkAsReadAllChatsAction(
 				MarkAsReadChatList(folder->chatsList());
 			}
 		};
-		controller->show(
-			Ui::MakeConfirmBox({
-				tr::lng_context_mark_read_all_sure(),
-				std::move(boxCallback)
+		show->show(
+			Box([=](not_null<Ui::GenericBox*> box) {
+				Ui::AddSkip(box->verticalLayout());
+				Ui::AddSkip(box->verticalLayout());
+				const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+					box->verticalLayout(),
+					session->user(),
+					st::mainMenuUserpic);
+				Ui::IconWithTitle(
+					box->verticalLayout(),
+					userpic,
+					Ui::CreateChild<Ui::FlatLabel>(
+						box->verticalLayout(),
+						Info::Profile::NameValue(session->user()),
+						box->getDelegate()->style().title));
+				auto text = rpl::combine(
+					tr::lng_context_mark_read_all_sure(),
+					tr::lng_context_mark_read_all_sure_2(
+						tr::rich)
+				) | rpl::map([](QString t1, TextWithEntities t2) {
+					return TextWithEntities()
+						.append(std::move(t1))
+						.append('\n')
+						.append('\n')
+						.append(std::move(t2));
+				});
+				Ui::ConfirmBox(box, {
+					.text = std::move(text),
+					.confirmed = std::move(boxCallback),
+					.confirmStyle = &st::attentionBoxButton,
+				});
 			}),
 			Ui::LayerOption::CloseOther);
 	};
@@ -2643,6 +3880,10 @@ void ToggleHistoryArchived(
 			.text = { (archived
 				? tr::lng_archived_added(tr::now)
 				: tr::lng_archived_removed(tr::now)) },
+			.iconLottie = (archived
+				? u"toast/chats_archived"_q
+				: QString()),
+			.iconLottieSize = st::toastLottieIconSize,
 			.st = &st::windowArchiveToast,
 			.duration = (archived
 				? kArchivedToastDuration
@@ -2659,14 +3900,60 @@ Fn<void()> ClearHistoryHandler(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer) {
 	return [=] {
-		controller->show(Box<DeleteMessagesBox>(peer, true));
+		if (!controller->showFrozenError()) {
+			controller->show(Box<DeleteMessagesBox>(peer, true));
+		}
 	};
 }
 
 Fn<void()> DeleteAndLeaveHandler(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer) {
-	return [=] { controller->show(Box(DeleteChatBox, peer)); };
+	const auto isCreator = [&] {
+		if (const auto channel = peer->asChannel()) {
+			return channel->amCreator();
+		} else if (const auto chat = peer->asChat()) {
+			return chat->amCreator();
+		}
+		return false;
+	}();
+	if (isCreator) {
+		const auto requestId = std::make_shared<mtpRequestId>(0);
+		return [=] {
+			if (controller->showFrozenError() || (*requestId > 0)) {
+				return;
+			}
+			*requestId = peer->session().api().request(
+				MTPmessages_GetFutureChatCreatorAfterLeave(
+					peer->input()
+			)).done([=](const MTPUser &result) {
+				*requestId = 0;
+				const auto user = peer->owner().processUser(result);
+				controller->show(Box(SelectFutureOwnerbox, peer, user));
+			}).fail([=](const MTP::Error &error) {
+				*requestId = 0;
+				controller->show(Box(DeleteChatBox, peer));
+			}).send();
+		};
+	}
+	return [=] {
+		if (!controller->showFrozenError()) {
+			controller->show(Box(DeleteChatBox, peer));
+		}
+	};
+}
+
+Fn<void()> DeleteSublistHandler(
+		not_null<Window::SessionController*> controller,
+		not_null<Data::SavedSublist*> sublist) {
+	const auto weak = base::make_weak(sublist.get());
+	return [=] {
+		if (const auto strong = weak.get()) {
+			if (!controller->showFrozenError()) {
+				controller->show(Box(DeleteSublistBox, strong));
+			}
+		}
+	};
 }
 
 void FillDialogsEntryMenu(
@@ -2694,9 +3981,6 @@ bool FillVideoChatMenu(
 	const auto livestream = !peer->isMegagroup() && peer->isChannel();
 	const auto has = (peer->groupCall() != nullptr);
 	const auto manager = peer->canManageGroupCall();
-	const auto creator = peer->isChat()
-		? peer->asChat()->amCreator()
-		: peer->asChannel()->amCreator();
 	if (has) {
 		addAction(
 			tr::lng_menu_start_group_call_join(tr::now),
@@ -2708,9 +3992,9 @@ bool FillVideoChatMenu(
 				? tr::lng_menu_start_group_call_channel
 				: tr::lng_menu_start_group_call)(tr::now),
 			[=] { callback({}); },
-			creator ? &st::menuIconStartStream : &st::menuIconVideoChat);
+			&st::menuIconStartStream);
 	}
-	if (!has && creator) {
+	if (!has && manager) {
 		addAction(
 			(livestream
 				? tr::lng_menu_start_group_call_scheduled_channel
@@ -2727,6 +4011,160 @@ bool FillVideoChatMenu(
 	return has || manager;
 }
 
+void FillSenderUserpicMenu(
+		not_null<SessionController*> controller,
+		not_null<PeerData*> peer,
+		PeerData *groupPeer,
+		Ui::InputField *fieldForMention,
+		Dialogs::Key searchInEntry,
+		const PeerMenuCallback &addAction) {
+	const auto group = (peer->isChat() || peer->isMegagroup());
+	const auto channel = peer->isChannel();
+	const auto viewProfileText = group
+		? tr::lng_context_view_group(tr::now)
+		: channel
+		? tr::lng_context_view_channel(tr::now)
+		: tr::lng_context_view_profile(tr::now);
+	addAction(viewProfileText, [=] {
+		controller->showPeerInfo(peer, Window::SectionShow::Way::Forward);
+	}, channel ? &st::menuIconInfo : &st::menuIconProfile);
+
+	const auto showHistoryText = group
+		? tr::lng_context_open_group(tr::now)
+		: channel
+		? tr::lng_context_open_channel(tr::now)
+		: tr::lng_profile_send_message(tr::now);
+	addAction(showHistoryText, [=] {
+		controller->showPeerHistory(peer, Window::SectionShow::Way::Forward);
+	}, channel ? &st::menuIconChannel : &st::menuIconChatBubble);
+
+	const auto username = peer->username();
+	const auto mention = !username.isEmpty() || peer->isUser();
+	if (const auto guard = mention ? fieldForMention : nullptr) {
+		addAction(tr::lng_context_mention(tr::now), crl::guard(guard, [=] {
+			if (!username.isEmpty()) {
+				fieldForMention->insertTag('@' + username);
+			} else {
+				fieldForMention->insertTag(
+					peer->shortName(),
+					PrepareMentionTag(peer->asUser()));
+			}
+		}), &st::menuIconUsername);
+	}
+
+	if (searchInEntry) {
+		addAction(tr::lng_context_search_from(tr::now), [=] {
+			controller->searchInChat(searchInEntry, peer);
+		}, &st::menuIconSearch);
+	}
+
+	if (const auto user = peer->asUser()) {
+		if (groupPeer) {
+			// Discussion group users may not be members,
+			// so editing their tag is not available.
+			const auto groupChannel = groupPeer->asChannel();
+			const auto isDiscussionGroup = groupChannel
+				&& groupChannel->isMegagroup()
+				&& groupChannel->discussionLink();
+			const auto canEditTarget = [&] {
+				if (const auto chat = groupPeer->asChat()) {
+					if (peerToUser(user->id) == chat->creator) {
+						return chat->amCreator();
+					}
+					if (chat->admins.contains(user)) {
+						return chat->amCreator();
+					}
+					return true;
+				} else if (const auto channel = groupPeer->asChannel()) {
+					if (channel->mgInfo
+					&& (channel->mgInfo->lastAdmins.contains(user)
+						|| channel->mgInfo->creator == user)) {
+					return channel->canEditAdmin(user);
+				}
+				return true;
+				}
+				return false;
+			}();
+			if (!isDiscussionGroup
+				&& canEditTarget
+				&& groupPeer->canManageRanks()
+				&& !user->isSelf()) {
+				const auto currentRank = LookupMemberRank(
+					groupPeer,
+					user);
+				addAction(
+					(currentRank.isEmpty()
+						? tr::lng_context_add_member_tag(tr::now)
+						: tr::lng_context_edit_member_tag(tr::now)),
+					[=] {
+						controller->show(Box(
+							EditCustomRankBox,
+							controller->uiShow(),
+							groupPeer,
+							user,
+							currentRank,
+							false,
+							nullptr));
+					},
+					&st::menuIconEdit);
+			}
+		}
+	}
+}
+
+void AddSenderUserpicModerateAction(
+		not_null<SessionController*> controller,
+		HistoryItem *moderateItem,
+		const PeerMenuCallback &addAction) {
+	const auto moderateChannel = moderateItem
+		? moderateItem->history()->peer->asChannel()
+		: nullptr;
+	const auto moderateFrom = moderateItem
+		? moderateItem->from().get()
+		: nullptr;
+	const auto moderateUser = moderateFrom
+		? moderateFrom->asUser()
+		: nullptr;
+	const auto canDeleteAndBan = moderateItem
+		&& moderateChannel
+		&& moderateChannel->isMegagroup()
+		&& moderateFrom
+		&& (!moderateUser || !moderateChannel->isGroupAdmin(moderateUser))
+		&& moderateItem->suggestBanReport()
+		&& moderateItem->suggestDeleteAllReport()
+		&& CanCreateModerateMessagesBox(
+			HistoryItemsList{ not_null<HistoryItem*>(moderateItem) });
+	if (canDeleteAndBan) {
+		const auto itemId = moderateItem->fullId();
+		addAction({ .isSeparator = true });
+		addAction({
+			.text = tr::lng_context_delete_and_ban(tr::now),
+			.handler = [=] {
+				const auto item = controller->session().data().message(
+					itemId);
+				if (!item) {
+					return;
+				}
+				controller->show(Box(
+					CreateModerateMessagesBox,
+					ModerateMessagesBoxEntry{
+						.items = HistoryItemsList{
+							not_null<HistoryItem*>(item),
+						},
+					},
+					nullptr,
+					ModerateMessagesBoxOptions{
+						.reportSpam = true,
+						.deleteAll = true,
+						.banUser = true,
+					}));
+			},
+			.icon = &st::menuIconBlockAttention,
+			.isAttention = true,
+		});
+	}
+}
+
 bool IsUnreadThread(not_null<Data::Thread*> thread) {
 	return thread->chatListBadgesState().unread;
 }
@@ -2738,8 +4176,7 @@ void MarkAsReadThread(not_null<Data::Thread*> thread) {
 	if (!IsUnreadThread(thread)) {
 		return;
 	} else if (const auto forum = thread->asForum()) {
-		forum->enumerateTopics([](
-			not_null<Data::ForumTopic*> topic) {
+		forum->enumerateTopics([](not_null<Data::ForumTopic*> topic) {
 			MarkAsReadThread(topic);
 		});
 	} else if (const auto history = thread->asHistory()) {
@@ -2749,6 +4186,8 @@ void MarkAsReadThread(not_null<Data::Thread*> thread) {
 		}
 	} else if (const auto topic = thread->asTopic()) {
 		topic->readTillEnd();
+	} else if (const auto sublist = thread->asSublist()) {
+		sublist->readTillEnd();
 	}
 }
 
@@ -2767,4 +4206,166 @@ void AddSeparatorAndShiftUp(const PeerMenuCallback &addAction) {
 	addAction({ .addTopShift = -shift });
 }
 
+void TogglePinnedThread(
+		not_null<Window::SessionController*> controller,
+		not_null<Dialogs::Entry*> entry,
+		FilterId filterId,
+		Fn<void()> onToggled) {
+	if (!filterId) {
+		return TogglePinnedThread(controller, entry, onToggled);
+	}
+	const auto history = entry->asHistory();
+	if (!history) {
+		return;
+	}
+	const auto owner = &history->owner();
+
+	// This can happen when you remove this filter from another client.
+	if (!ranges::contains(
+			(&owner->session())->data().chatsFilters().list(),
+			filterId,
+			&Data::ChatFilter::id)) {
+		controller->showToast(tr::lng_cant_do_this(tr::now));
+		return;
+	}
+
+	const auto isPinned = !history->isPinnedDialog(filterId);
+	if (isPinned && PinnedLimitReached(controller, history, filterId)) {
+		return;
+	}
+
+	owner->setChatPinned(history, filterId, isPinned);
+	Api::SaveNewFilterPinned(&owner->session(), filterId);
+	if (isPinned) {
+		controller->content()->dialogsToUp();
+		if (onToggled) {
+			onToggled();
+		}
+	}
+}
+
+bool IsArchived(not_null<History*> history) {
+	return (history->folder() != nullptr);
+}
+
+bool CanArchive(History *history, PeerData *peer) {
+	if (history && history->useTopPromotion()) {
+		return false;
+	} else if (peer && (peer->isNotificationsUser() || peer->isSelf())) {
+		if (!history || !history->folder()) {
+			return false;
+		}
+	}
+	return true;
+}
+
+void PeerMenuConfirmToggleFee(
+		not_null<Window::SessionNavigation*> navigation,
+		std::shared_ptr<rpl::variable<int>> paidAmount,
+		not_null<PeerData*> peer,
+		not_null<UserData*> user,
+		bool removeFee) {
+	const auto parent = peer->isChannel() ? peer->asChannel() : nullptr;
+	const auto exception = [=](bool refund) {
+		using Flag = MTPaccount_ToggleNoPaidMessagesException::Flag;
+		const auto api = &user->session().api();
+		api->request(MTPaccount_ToggleNoPaidMessagesException(
+			MTP_flags((refund ? Flag::f_refund_charged : Flag())
+				| (removeFee ? Flag() : Flag::f_require_payment)
+				| (parent ? Flag::f_parent_peer : Flag())),
+			(parent ? parent->input() : MTPInputPeer()),
+			user->inputUser()
+		)).done([=] {
+			if (!parent) {
+				user->clearPaysPerMessage();
+			} else if (const auto monoforum = peer->monoforum()) {
+				if (const auto sublist = monoforum->sublistLoaded(user)) {
+					sublist->toggleFeeRemoved(removeFee);
+				}
+			}
+		}).send();
+	};
+	if (!removeFee) {
+		exception(false);
+		return;
+	}
+	navigation->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
+		const auto refund = std::make_shared<base::weak_qptr<Ui::Checkbox>>();
+		Ui::ConfirmBox(box, {
+			.text = tr::lng_payment_refund_text(
+				tr::now,
+				lt_name,
+				tr::bold(user->shortName()),
+				tr::marked),
+			.confirmed = [=](Fn<void()> close) {
+				exception(*refund && (*refund)->checked());
+				close();
+			},
+			.confirmText = tr::lng_payment_refund_confirm(tr::now),
+			.title = tr::lng_payment_refund_title(tr::now),
+		});
+		const auto paid = box->lifetime().make_state<
+			rpl::variable<int>
+		>();
+		*paid = paidAmount->value();
+		paid->value() | rpl::on_next([=](int already) {
+			if (!already) {
+				delete base::take(*refund).get();
+			} else if (!*refund) {
+				const auto skip = st::defaultCheckbox.margin.top();
+				*refund = box->addRow(
+					object_ptr<Ui::Checkbox>(
+						box,
+						tr::lng_payment_refund_also(
+							lt_count,
+							paid->value() | tr::to_count()),
+						false,
+						st::defaultCheckbox),
+					st::boxRowPadding + QMargins(0, skip, 0, skip));
+			}
+		}, box->lifetime());
+
+		using Flag = MTPaccount_GetPaidMessagesRevenue::Flag;
+		user->session().api().request(MTPaccount_GetPaidMessagesRevenue(
+			MTP_flags(parent ? Flag::f_parent_peer : Flag()),
+			parent ? parent->input() : MTPInputPeer(),
+			user->inputUser()
+		)).done([=](const MTPaccount_PaidMessagesRevenue &result) {
+			*paidAmount = result.data().vstars_amount().v;
+		}).send();
+	}));
+}
+
+void ForwardToSelf(
+		std::shared_ptr<Main::SessionShow> show,
+		const Data::ForwardDraft &draft) {
+	const auto session = &show->session();
+	const auto history = session->data().history(session->user());
+	auto resolved = history->resolveForwardDraft(draft);
+	if (!resolved.items.empty()) {
+		const auto count = resolved.items.size();
+		auto action = Api::SendAction(history);
+		action.clearDraft = false;
+		action.generateLocal = false;
+		session->api().forwardMessages(
+			std::move(resolved),
+			action,
+			[=] {
+				auto phrase = rpl::variable<TextWithEntities>(
+					ChatHelpers::ForwardedMessagePhrase({
+					.toCount = 1,
+					.singleMessage = (count == 1),
+					.to1 = session->user(),
+				})).current();
+				if (!phrase.empty()) {
+					show->showToast({
+						.text = std::move(phrase),
+						.filter = ChatHelpers::ForwardedToSavedMessagesFilter(
+							session),
+					});
+				}
+			});
+	}
+}
+
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index 4bf6c4d13fc358..8664c91dbbb9a7 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -8,11 +8,17 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "api/api_common.h"
+#include "base/object_ptr.h"
 #include "menu/menu_send.h"
 #include "data/data_poll.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
 
 class History;
+class HistoryItem;
+
+namespace Api {
+struct SendOptions;
+} // namespace Api
 
 namespace Ui {
 class RpWidget;
@@ -27,6 +33,8 @@ class Folder;
 class Session;
 struct ForwardDraft;
 class ForumTopic;
+class SavedMessages;
+class SavedSublist;
 class Thread;
 } // namespace Data
 
@@ -34,6 +42,8 @@ namespace Dialogs {
 class MainList;
 struct EntryState;
 struct UnreadState;
+class Key;
+class Entry;
 } // namespace Dialogs
 
 namespace ChatHelpers {
@@ -45,6 +55,10 @@ enum class PeerType : uint8;
 using PeerTypes = base::flags<PeerType>;
 } // namespace InlineBots
 
+namespace Main {
+class SessionShow;
+} // namespace Main
+
 namespace Window {
 
 class Controller;
@@ -64,8 +78,22 @@ bool FillVideoChatMenu(
 	Dialogs::EntryState request,
 	const PeerMenuCallback &addAction);
 
+void FillSenderUserpicMenu(
+	not_null<SessionController*> controller,
+	not_null<PeerData*> peer,
+	PeerData *groupPeer,
+	Ui::InputField *fieldForMention,
+	Dialogs::Key searchInEntry,
+	const PeerMenuCallback &addAction);
+
+void AddSenderUserpicModerateAction(
+	not_null<SessionController*> controller,
+	HistoryItem *moderateItem,
+	const PeerMenuCallback &addAction);
+
 void MenuAddMarkAsReadAllChatsAction(
-	not_null<Window::SessionController*> controller,
+	not_null<Main::Session*> session,
+	std::shared_ptr<Ui::Show> show,
 	const PeerMenuCallback &addAction);
 
 void MenuAddMarkAsReadChatListAction(
@@ -74,7 +102,13 @@ void MenuAddMarkAsReadChatListAction(
 	const PeerMenuCallback &addAction,
 	Fn<Dialogs::UnreadState()> customUnreadState = nullptr);
 
-void PeerMenuExportChat(not_null<PeerData*> peer);
+void PeerMenuExportChat(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> peer);
+void PeerMenuExportTopic(
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	MsgId topicRootId);
 void PeerMenuDeleteContact(
 	not_null<Window::SessionController*> controller,
 	not_null<UserData*> user);
@@ -88,10 +122,31 @@ void PeerMenuCreatePoll(
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer,
 	FullReplyTo replyTo = FullReplyTo(),
-	PollData::Flags chosen = PollData::Flags(),
+	SuggestOptions suggest = SuggestOptions(),
+	PollData::Flags chosen = kDefaultPollCreateFlags,
 	PollData::Flags disabled = PollData::Flags(),
 	Api::SendType sendType = Api::SendType::Normal,
 	SendMenu::Details sendMenuDetails = SendMenu::Details());
+enum class TodoWantsPremium {
+	Create,
+	Add,
+	Mark,
+};
+void PeerMenuTodoWantsPremium(TodoWantsPremium type);
+void PeerMenuCreateTodoList(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> peer,
+	FullReplyTo replyTo = FullReplyTo(),
+	SuggestOptions suggest = SuggestOptions(),
+	Api::SendType sendType = Api::SendType::Normal,
+	SendMenu::Details sendMenuDetails = SendMenu::Details());
+void PeerMenuEditTodoList(
+	not_null<Window::SessionController*> controller,
+	not_null<HistoryItem*> item);
+[[nodiscard]] bool PeerMenuShowAddTodoListTasks(not_null<HistoryItem*> item);
+void PeerMenuAddTodoListTasks(
+	not_null<Window::SessionController*> controller,
+	not_null<HistoryItem*> item);
 void PeerMenuDeleteTopicWithConfirmation(
 	not_null<Window::SessionNavigation*> navigation,
 	not_null<Data::ForumTopic*> topic);
@@ -129,41 +184,58 @@ Fn<void()> ClearHistoryHandler(
 Fn<void()> DeleteAndLeaveHandler(
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer);
+Fn<void()> DeleteSublistHandler(
+	not_null<Window::SessionController*> controller,
+	not_null<Data::SavedSublist*> sublist);
 
-QPointer<Ui::BoxContent> ShowChooseRecipientBox(
+object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
+	not_null<Main::Session*> session,
+	FnMut<bool(not_null<Data::Thread*>)> &&chosen,
+	rpl::producer<QString> titleOverride = nullptr,
+	FnMut<void()> &&successCallback = nullptr,
+	InlineBots::PeerTypes typesRestriction = 0,
+	Fn<void(
+		std::vector<not_null<Data::Thread*>>,
+		Api::SendOptions)> sendMany = nullptr);
+base::weak_qptr<Ui::BoxContent> ShowChooseRecipientBox(
 	not_null<Window::SessionNavigation*> navigation,
 	FnMut<bool(not_null<Data::Thread*>)> &&chosen,
 	rpl::producer<QString> titleOverride = nullptr,
 	FnMut<void()> &&successCallback = nullptr,
 	InlineBots::PeerTypes typesRestriction = 0);
-QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 	std::shared_ptr<ChatHelpers::Show> show,
 	Data::ForwardDraft &&draft,
 	Fn<void()> &&successCallback = nullptr);
-QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 	not_null<Window::SessionNavigation*> navigation,
 	Data::ForwardDraft &&draft,
 	Fn<void()> &&successCallback = nullptr);
-QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 	not_null<Window::SessionNavigation*> navigation,
 	MessageIdsList &&items,
 	Fn<void()> &&successCallback = nullptr);
-QPointer<Ui::BoxContent> ShowShareUrlBox(
+base::weak_qptr<Ui::BoxContent> ShowShareUrlBox(
 	not_null<Window::SessionNavigation*> navigation,
 	const QString &url,
 	const QString &text,
 	FnMut<void()> &&successCallback = nullptr);
-QPointer<Ui::BoxContent> ShowShareGameBox(
+base::weak_qptr<Ui::BoxContent> ShowShareGameBox(
 	not_null<Window::SessionNavigation*> navigation,
 	not_null<UserData*> bot,
 	QString shortName);
-QPointer<Ui::BoxContent> ShowDropMediaBox(
+base::weak_qptr<Ui::BoxContent> ShowDropMediaBox(
 	not_null<Window::SessionNavigation*> navigation,
 	std::shared_ptr<QMimeData> data,
 	not_null<Data::Forum*> forum,
 	FnMut<void()> &&successCallback = nullptr);
+base::weak_qptr<Ui::BoxContent> ShowDropMediaBox(
+	not_null<Window::SessionNavigation*> navigation,
+	std::shared_ptr<QMimeData> data,
+	not_null<Data::SavedMessages*> monoforum,
+	FnMut<void()> &&successCallback = nullptr);
 
-QPointer<Ui::BoxContent> ShowSendNowMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowSendNowMessagesBox(
 	not_null<Window::SessionNavigation*> navigation,
 	not_null<History*> history,
 	MessageIdsList &&items,
@@ -173,10 +245,16 @@ void ToggleMessagePinned(
 	not_null<Window::SessionNavigation*> navigation,
 	FullMsgId itemId,
 	bool pin);
+void TogglePinnedThread(
+	not_null<Window::SessionController*> controller,
+	not_null<Dialogs::Entry*> entry,
+	FilterId filterId,
+	Fn<void()> onToggled);
 void HidePinnedBar(
 	not_null<Window::SessionNavigation*> navigation,
 	not_null<PeerData*> peer,
 	MsgId topicRootId,
+	PeerId monoforumPeerId,
 	Fn<void()> onHidden);
 void UnpinAllMessages(
 	not_null<Window::SessionNavigation*> navigation,
@@ -187,4 +265,18 @@ void MarkAsReadThread(not_null<Data::Thread*> thread);
 
 void AddSeparatorAndShiftUp(const PeerMenuCallback &addAction);
 
+[[nodiscard]] bool IsArchived(not_null<History*> history);
+[[nodiscard]] bool CanArchive(History *history, PeerData *peer);
+
+void PeerMenuConfirmToggleFee(
+	not_null<Window::SessionNavigation*> navigation,
+	std::shared_ptr<rpl::variable<int>> paidAmount,
+	not_null<PeerData*> peer,
+	not_null<UserData*> user,
+	bool removeFee);
+
+void ForwardToSelf(
+	std::shared_ptr<Main::SessionShow> show,
+	const Data::ForwardDraft &draft);
+
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_separate_id.cpp b/Telegram/SourceFiles/window/window_separate_id.cpp
index f2ed89183915b6..f6ed9155fda1fc 100644
--- a/Telegram/SourceFiles/window/window_separate_id.cpp
+++ b/Telegram/SourceFiles/window/window_separate_id.cpp
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #include "window/window_separate_id.h"
 
+#include "data/data_channel.h"
 #include "data/data_folder.h"
 #include "data/data_peer.h"
 #include "data/data_saved_messages.h"
@@ -44,6 +45,15 @@ SeparateId::SeparateId(not_null<PeerData*> peer)
 : SeparateId(SeparateType::Chat, peer->owner().history(peer)) {
 }
 
+SeparateId::SeparateId(
+	not_null<Data::Thread*> thread,
+	Storage::SharedMediaType sharedMediaType)
+: type(SeparateType::SharedMedia)
+, sharedMediaType(sharedMediaType)
+, account(&thread->session().account())
+, thread(thread) {
+}
+
 bool SeparateId::primary() const {
 	return (type == SeparateType::Primary);
 }
@@ -63,9 +73,9 @@ Data::Folder *SeparateId::folder() const {
 }
 
 Data::SavedSublist *SeparateId::sublist() const {
-	return (type == SeparateType::SavedSublist)
-		? thread->owner().savedMessages().sublist(thread->peer()).get()
-		: nullptr;
+	return (type != SeparateType::SavedSublist)
+		? nullptr
+		: thread->asSublist();
 }
 
 bool SeparateId::hasChatsList() const {
diff --git a/Telegram/SourceFiles/window/window_separate_id.h b/Telegram/SourceFiles/window/window_separate_id.h
index bcbe728604339d..dbc79397a5b3a0 100644
--- a/Telegram/SourceFiles/window/window_separate_id.h
+++ b/Telegram/SourceFiles/window/window_separate_id.h
@@ -7,6 +7,7 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+class ChannelData;
 class PeerData;
 
 namespace Data {
@@ -21,6 +22,10 @@ class Account;
 class Session;
 } // namespace Main
 
+namespace Storage {
+enum class SharedMediaType : signed char;
+} // namespace Storage
+
 namespace Window {
 
 enum class SeparateType {
@@ -29,6 +34,12 @@ enum class SeparateType {
 	Chat,
 	Forum,
 	SavedSublist,
+	SharedMedia,
+};
+
+struct SeparateSharedMedia {
+	not_null<Data::Thread*> thread;
+	Storage::SharedMediaType type = {};
 };
 
 struct SeparateId {
@@ -38,11 +49,14 @@ struct SeparateId {
 	SeparateId(SeparateType type, not_null<Data::Thread*> thread);
 	SeparateId(not_null<Data::Thread*> thread);
 	SeparateId(not_null<PeerData*> peer);
+	SeparateId(
+		not_null<Data::Thread*> thread,
+		Storage::SharedMediaType sharedMediaType);
 
 	SeparateType type = SeparateType::Primary;
+	Storage::SharedMediaType sharedMediaType = {};
 	Main::Account *account = nullptr;
 	Data::Thread *thread = nullptr; // For types except Main and Archive.
-
 	[[nodiscard]] bool valid() const {
 		return account != nullptr;
 	}
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 1442bb90fe5f36..b178124dcfa8cb 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -7,17 +7,24 @@ For license and copyright information please follow this link:
 */
 #include "window/window_session_controller.h"
 
+#include "apiwrap.h"
+#include "api/api_cloud_password.h"
 #include "api/api_text_entities.h"
-#include "boxes/add_contact_box.h"
 #include "boxes/peers/add_bot_to_chat_box.h"
 #include "boxes/peers/edit_peer_info_box.h"
 #include "boxes/peers/replace_boost_box.h"
+#include "boxes/add_contact_box.h"
 #include "boxes/delete_messages_box.h"
+#include "boxes/star_gift_auction_box.h"
 #include "window/window_chat_preview.h"
+#include "window/window_chat_switch_process.h"
 #include "window/window_controller.h"
 #include "window/window_filters_menu.h"
+#include "window/section_widget.h"
 #include "window/window_separate_id.h"
 #include "info/channel_statistics/earn/info_channel_earn_list.h"
+#include "info/peer_gifts/info_peer_gifts_widget.h"
+#include "info/stories/info_stories_widget.h"
 #include "info/info_memento.h"
 #include "info/info_controller.h"
 #include "inline_bots/bot_attach_web_view.h"
@@ -25,23 +32,30 @@ For license and copyright information please follow this link:
 #include "history/history_item.h"
 #include "history/view/reactions/history_view_reactions.h"
 //#include "history/view/reactions/history_view_reactions_button.h"
-#include "history/view/history_view_replies_section.h"
+#include "history/view/history_view_chat_section.h"
 #include "history/view/history_view_scheduled_section.h"
-#include "history/view/history_view_sublist_section.h"
+#include "history/view/history_view_subsection_tabs.h"
 #include "media/player/media_player_instance.h"
 #include "media/view/media_view_open_common.h"
+#include "data/components/gift_auctions.h"
+#include "data/components/recent_peers.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_document_resolver.h"
 #include "data/data_download_manager.h"
 #include "data/data_saved_messages.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_session.h"
+#include "data/data_thread.h"
 #include "data/data_file_origin.h"
+#include "data/data_flags.h"
 #include "data/data_folder.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_user.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
+#include "data/data_file_click_handler.h"
+#include "data/data_photo_media.h"
 #include "data/data_changes.h"
 #include "data/data_group_call.h"
 #include "data/data_forum.h"
@@ -49,14 +63,21 @@ For license and copyright information please follow this link:
 #include "data/data_chat_filters.h"
 #include "data/data_replies_list.h"
 #include "data/data_peer_values.h"
+#include "data/data_premium_limits.h"
+#include "data/data_web_page.h"
+#include "data/data_search_calendar.h"
+#include "dialogs/ui/chat_search_in.h"
 #include "passport/passport_form_controller.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "chat_helpers/emoji_interactions.h"
 #include "core/shortcuts.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
+#include "core/file_utilities.h"
 #include "core/ui_integration.h"
+#include "base/options.h"
 #include "base/unixtime.h"
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/text/text_utilities.h"
 #include "ui/text/format_values.h" // Ui::FormatPhone.
@@ -69,6 +90,8 @@ For license and copyright information please follow this link:
 #include "ui/toast/toast.h"
 #include "calls/calls_instance.h" // Core::App().calls().inCall().
 #include "calls/group/calls_group_call.h"
+#include "calls/group/calls_group_common.h"
+#include "calls/group/calls_group_invite_controller.h"
 #include "ui/boxes/calendar_box.h"
 #include "ui/boxes/collectible_info_box.h"
 #include "ui/boxes/confirm_box.h"
@@ -84,15 +107,23 @@ For license and copyright information please follow this link:
 #include "api/api_chat_invite.h"
 #include "api/api_global_privacy.h"
 #include "api/api_blocked_peers.h"
+#include "api/api_premium.h"
+#include "boxes/star_gift_craft_box.h"
 #include "support/support_helper.h"
 #include "storage/file_upload.h"
 #include "storage/download_manager_mtproto.h"
+#include "storage/storage_account.h"
 #include "window/themes/window_theme.h"
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller_link_info.h"
-#include "settings/settings_main.h"
-#include "settings/settings_premium.h"
-#include "settings/settings_privacy_security.h"
+#include "settings/cloud_password/settings_cloud_password_input.h"
+#include "settings/cloud_password/settings_cloud_password_start.h"
+#include "settings/cloud_password/settings_cloud_password_email_confirm.h"
+#include "settings/sections/settings_main.h"
+#include "styles/style_chat.h"
+#include "settings/sections/settings_premium.h"
+#include "settings/sections/settings_privacy_security.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_window.h"
 #include "styles/style_boxes.h"
 #include "styles/style_dialogs.h"
@@ -104,6 +135,12 @@ namespace {
 constexpr auto kCustomThemesInMemory = 5;
 constexpr auto kMaxChatEntryHistorySize = 50;
 
+base::options::toggle OptionExternalMediaViewer({
+	.id = kOptionExternalMediaViewer,
+	.name = "External media viewer",
+	.description = "Use system media viewer instead of the internal one.",
+});
+
 class MainWindowShow final : public ChatHelpers::Show {
 public:
 	explicit MainWindowShow(not_null<SessionController*> controller);
@@ -167,26 +204,6 @@ class MainWindowShow final : public ChatHelpers::Show {
 	return false;
 }
 
-[[nodiscard]] Ui::CollectibleDetails PrepareCollectibleDetails(
-		not_null<Main::Session*> session) {
-	const auto makeContext = [=] {
-		return Core::MarkedTextContext{
-			.session = session,
-			.customEmojiRepaint = [] {},
-		};
-	};
-	return {
-		.tonEmoji = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				Info::ChannelEarn::IconCurrency(
-					st::collectibleInfo,
-					st::collectibleInfo.textFg->c),
-				st::collectibleInfoTonMargins,
-				true)),
-		.tonEmojiContext = makeContext,
-	};
-}
-
 [[nodiscard]] Ui::CollectibleInfo Parse(
 		const QString &entity,
 		not_null<PeerData*> owner,
@@ -282,6 +299,9 @@ SendMenu::Details MainWindowShow::sendMenuDetails() const {
 	if (!window) {
 		return SendMenu::Details();
 	}
+	if (const auto section = window->activeLayerSection()) {
+		return section->sendMenuDetails();
+	}
 	return window->content()->sendMenuDetails();
 }
 
@@ -303,13 +323,19 @@ void MainWindowShow::processChosenSticker(
 		ChatHelpers::FileChosen &&chosen) const {
 	if (const auto window = _window.get()) {
 		Ui::PostponeCall(window, [=, chosen = std::move(chosen)]() mutable {
-			window->stickerOrEmojiChosen(std::move(chosen));
+			if (const auto section = window->activeLayerSection()) {
+				section->processChosenSticker(std::move(chosen));
+			} else {
+				window->content()->processChosenSticker(std::move(chosen));
+			}
 		});
 	}
 }
 
 } // namespace
 
+const char kOptionExternalMediaViewer[] = "external-media-viewer";
+
 void ActivateWindow(not_null<SessionController*> controller) {
 	Ui::ActivateWindow(controller->widget());
 }
@@ -348,13 +374,48 @@ void DateClickHandler::onClick(ClickContext context) const {
 	const auto my = context.other.value<ClickHandlerContext>();
 	if (const auto window = my.sessionWindow.get()) {
 		if (!_chat.topic()) {
-			window->showCalendar(_chat, _date);
+			window->showCalendar({ _chat, _date, true, true });
 		} else if (const auto strong = _weak.get()) {
-			window->showCalendar(strong, _date);
+			window->showCalendar({ strong, _date, true, true });
+		}
+	}
+}
+
+ForumThreadClickHandler::ForumThreadClickHandler(not_null<HistoryItem*> item)
+: _thread(resolveThread(item)) {
+}
+
+void ForumThreadClickHandler::update(not_null<HistoryItem*> item) {
+	_thread = resolveThread(item);
+}
+
+void ForumThreadClickHandler::onClick(ClickContext context) const {
+	const auto my = context.other.value<ClickHandlerContext>();
+	if (const auto window = my.sessionWindow.get()) {
+		if (const auto strong = _thread.get()) {
+			window->showThread(strong, 0, SectionShow::Way::ClearStack);
 		}
 	}
 }
 
+base::weak_ptr<Data::Thread> ForumThreadClickHandler::resolveThread(
+		not_null<HistoryItem*> item) const {
+	if (const auto sublist = item->savedSublist()) {
+		return sublist;
+	} else if (const auto topic = item->topic()) {
+		return topic;
+	}
+	return nullptr;
+}
+
+MessageHighlightId SearchHighlightId(const QString &query) {
+	auto result = MessageHighlightId{ .quote = { query } };
+	if (!result.quote.empty()) {
+		result.quoteOffset = kSearchQueryOffsetHint;
+	}
+	return result;
+}
+
 SessionNavigation::SessionNavigation(not_null<Main::Session*> session)
 : _session(session)
 , _api(&_session->mtp()) {
@@ -366,6 +427,10 @@ Main::Session &SessionNavigation::session() const {
 	return *_session;
 }
 
+bool SessionNavigation::showFrozenError() {
+	return uiShow()->showFrozenError();
+}
+
 void SessionNavigation::showPeerByLink(const PeerByLinkInfo &info) {
 	Core::App().hideMediaView();
 	if (!info.phone.isEmpty()) {
@@ -391,7 +456,7 @@ void SessionNavigation::showPeerByLink(const PeerByLinkInfo &info) {
 			} else {
 				showPeerByLinkResolved(peer, info);
 			}
-		});
+		}, info.referral);
 	} else if (const auto id = std::get_if<ChannelId>(&info.usernameOrId)) {
 		resolveChannelById(*id, [=](not_null<ChannelData*> channel) {
 			showPeerByLinkResolved(channel, info);
@@ -399,6 +464,16 @@ void SessionNavigation::showPeerByLink(const PeerByLinkInfo &info) {
 	}
 }
 
+void SessionNavigation::fullInfoLoadedHook(not_null<PeerData*> peer) {
+	if (!_waitingDirectChannel || _waitingDirectChannel != peer) {
+		return;
+	}
+	_waitingDirectChannel = nullptr;
+	const auto monoforum = peer->broadcastMonoforum();
+	const auto open = monoforum ? monoforum : peer.get();
+	showPeerHistory(open, SectionShow::Way::Forward, ShowAtUnreadMsgId);
+}
+
 void SessionNavigation::resolvePhone(
 		const QString &phone,
 		Fn<void(not_null<PeerData*>)> done) {
@@ -453,19 +528,27 @@ void SessionNavigation::resolveChatLink(
 
 void SessionNavigation::resolveUsername(
 		const QString &username,
-		Fn<void(not_null<PeerData*>)> done) {
-	if (const auto peer = _session->data().peerByUsername(username)) {
-		done(peer);
-		return;
+		Fn<void(not_null<PeerData*>)> done,
+		const QString &referral) {
+	if (referral.isEmpty()) {
+		if (const auto peer = _session->data().peerByUsername(username)) {
+			done(peer);
+			return;
+		}
 	}
 	_api.request(base::take(_resolveRequestId)).cancel();
+	using Flag = MTPcontacts_ResolveUsername::Flag;
 	_resolveRequestId = _api.request(MTPcontacts_ResolveUsername(
-		MTP_string(username)
+		MTP_flags(referral.isEmpty() ? Flag() : Flag::f_referer),
+		MTP_string(username),
+		MTP_string(referral)
 	)).done([=](const MTPcontacts_ResolvedPeer &result) {
 		resolveDone(result, done);
 	}).fail([=](const MTP::Error &error) {
 		_resolveRequestId = 0;
-		if (error.code() == 400) {
+		if (error.type() == u"STARREF_EXPIRED"_q) {
+			parentController()->showToast(tr::lng_star_ref_stopped(tr::now));
+		} else if (error.code() == 400) {
 			parentController()->show(
 				Ui::MakeInformBox(
 					tr::lng_username_not_found(tr::now, lt_user, username)),
@@ -524,6 +607,7 @@ void SessionNavigation::showMessageByLinkResolved(
 	params.origin = SectionShow::OriginMessage{
 		info.clickFromMessageId
 	};
+	params.highlight.pollOption = info.pollOption;
 	const auto peer = item->history()->peer;
 	const auto topicId = peer->isForum() ? item->topicRootId() : 0;
 	if (topicId) {
@@ -543,6 +627,7 @@ void SessionNavigation::showPeerByLinkResolved(
 	params.origin = SectionShow::OriginMessage{
 		info.clickFromMessageId
 	};
+	params.highlight.pollOption = info.pollOption;
 	if (info.voicechatHash && peer->isChannel()) {
 		// First show the channel itself.
 		crl::on_main(this, [=] {
@@ -556,6 +641,14 @@ void SessionNavigation::showPeerByLinkResolved(
 	using Scope = AddBotToGroupBoxController::Scope;
 	const auto user = peer->asUser();
 	const auto bot = (user && user->isBot()) ? user : nullptr;
+	const auto applyBotStartToken = [&] {
+		if (bot && bot->botInfo->startToken != info.startToken) {
+			bot->botInfo->startToken = info.startToken;
+			bot->session().changes().peerUpdated(
+				bot,
+				Data::PeerUpdate::Flag::BotStartToken);
+		}
+	};
 
 	// t.me/username/012345 - we thought it was a channel post link, but
 	// after resolving the username we found out it is a bot.
@@ -565,52 +658,56 @@ void SessionNavigation::showPeerByLinkResolved(
 		? ResolveType::BotApp
 		: info.resolveType;
 
+	// Show specific posts only in channels / supergroups.
+	const auto useRequestedMessageId = peer->isChannel();
+	const auto msgId = useRequestedMessageId
+		? info.messageId
+		: info.startAutoSubmit
+		? ShowAndStartBotMsgId
+		: (bot && !info.startToken.isEmpty())
+		? ShowAndMaybeStartBotMsgId
+		: ShowAtUnreadMsgId;
+
 	const auto &replies = info.repliesInfo;
 	if (const auto threadId = std::get_if<ThreadId>(&replies)) {
-		showRepliesForMessage(
-			session().data().history(peer),
-			threadId->id,
-			info.messageId,
-			params);
+		const auto history = peer->owner().history(peer);
+		const auto controller = parentController();
+		if (const auto forum = peer->forum()) {
+			if (controller->windowId().hasChatsList()
+				&& !controller->adaptive().isOneColumn()
+				&& controller->shownForum().current() != forum
+				&& !forum->peer()->useSubsectionTabs()) {
+				controller->showForum(forum);
+			}
+		}
+		showRepliesForMessage(history, threadId->id, msgId, params);
 	} else if (const auto commentId = std::get_if<CommentId>(&replies)) {
-		showRepliesForMessage(
-			session().data().history(peer),
-			info.messageId,
-			commentId->id,
-			params);
+		const auto history = peer->owner().history(peer);
+		showRepliesForMessage(history, msgId, commentId->id, params);
 	} else if (resolveType == ResolveType::Profile) {
 		showPeerInfo(peer, params);
-	} else if (peer->isForum() && resolveType != ResolveType::Boost) {
-		const auto itemId = info.messageId;
-		if (!itemId) {
-			parentController()->showForum(peer->forum(), params);
-		} else if (const auto item = peer->owner().message(peer, itemId)) {
-			showMessageByLinkResolved(item, info);
-		} else {
-			const auto callback = crl::guard(this, [=] {
-				if (const auto item = peer->owner().message(peer, itemId)) {
-					showMessageByLinkResolved(item, info);
-				} else {
-					showPeerHistory(peer, params, itemId);
-				}
-			});
-			peer->session().api().requestMessageData(
-				peer,
-				info.messageId,
-				callback);
-		}
-	} else if (info.storyId) {
-		const auto storyId = FullStoryId{ peer->id, info.storyId };
-		peer->owner().stories().resolve(storyId, crl::guard(this, [=] {
-			if (peer->owner().stories().lookup(storyId)) {
-				parentController()->openPeerStory(
-					peer,
-					storyId.story,
-					Data::StoriesContext{ Data::StoriesContextSingle() });
+	} else if (resolveType == ResolveType::HashtagSearch) {
+		searchMessages(info.text, peer->owner().history(peer));
+	} else if (info.storyParam == u"live"_q) {
+		parentController()->openPeerStories(peer->id, std::nullopt, true);
+	} else if (const auto storyId = info.storyParam.toInt()) {
+		const auto id = FullStoryId{ peer->id, storyId };
+		const auto context = (info.storyAlbumId > 0)
+			? Data::StoriesContext{ Data::StoriesContextAlbum{
+				info.storyAlbumId,
+			} }
+			: Data::StoriesContext{ Data::StoriesContextSingle() };
+		peer->owner().stories().resolve(id, crl::guard(this, [=] {
+			if (peer->owner().stories().lookup(id)) {
+				parentController()->openPeerStory(peer, id.story, context);
 			} else {
 				showToast(tr::lng_stories_link_invalid(tr::now));
 			}
 		}));
+	} else if (info.storyAlbumId > 0) {
+		showSection(Info::Stories::Make(peer, info.storyAlbumId));
+	} else if (info.giftCollectionId > 0) {
+		showSection(Info::PeerGifts::Make(peer, info.giftCollectionId));
 	} else if (bot && resolveType == ResolveType::BotApp) {
 		const auto itemId = info.clickFromMessageId;
 		const auto item = _session->data().message(itemId);
@@ -626,6 +723,7 @@ void SessionNavigation::showPeerByLinkResolved(
 				.context = {
 					.controller = parentController(),
 					.action = action,
+					.fullscreen = info.botAppFullScreen,
 					.maySkipConfirmation = !info.botAppForceConfirmation,
 				},
 				.button = { .startCommand = info.startToken },
@@ -653,6 +751,24 @@ void SessionNavigation::showPeerByLinkResolved(
 			scope,
 			info.startToken,
 			info.startAdminRights);
+	} else if (resolveType == ResolveType::Boost && peer->isChannel()) {
+		resolveBoostState(peer->asChannel());
+	} else if (peer->isForum()) {
+		if (!msgId || !useRequestedMessageId) {
+			applyBotStartToken();
+			parentController()->showForum(peer->forum(), params, msgId);
+		} else if (const auto item = peer->owner().message(peer, msgId)) {
+			showMessageByLinkResolved(item, info);
+		} else {
+			const auto callback = crl::guard(this, [=] {
+				if (const auto item = peer->owner().message(peer, msgId)) {
+					showMessageByLinkResolved(item, info);
+				} else {
+					showPeerHistory(peer, params, msgId);
+				}
+			});
+			peer->session().api().requestMessageData(peer, msgId, callback);
+		}
 	} else if (resolveType == ResolveType::Mention) {
 		if (bot || peer->isChannel()) {
 			crl::on_main(this, [=] {
@@ -661,22 +777,16 @@ void SessionNavigation::showPeerByLinkResolved(
 		} else {
 			showPeerInfo(peer, params);
 		}
-	} else if (resolveType == ResolveType::Boost && peer->isChannel()) {
-		resolveBoostState(peer->asChannel());
+	} else if (resolveType == ResolveType::ChannelDirect
+		&& !peer->isFullLoaded()) {
+		_waitingDirectChannel = peer;
+		peer->updateFull();
+	} else if (const auto monoforum = peer->broadcastMonoforum()
+		; monoforum && resolveType == ResolveType::ChannelDirect) {
+		showPeerHistory(monoforum, params, ShowAtUnreadMsgId);
 	} else {
-		// Show specific posts only in channels / supergroups.
-		const auto msgId = peer->isChannel()
-			? info.messageId
-			: info.startAutoSubmit
-			? ShowAndStartBotMsgId
-			: ShowAtUnreadMsgId;
 		const auto attachBotUsername = info.attachBotUsername;
-		if (bot && bot->botInfo->startToken != info.startToken) {
-			bot->botInfo->startToken = info.startToken;
-			bot->session().changes().peerUpdated(
-				bot,
-				Data::PeerUpdate::Flag::BotStartToken);
-		}
+		applyBotStartToken();
 		if (!attachBotUsername.isEmpty()) {
 			crl::on_main(this, [=] {
 				const auto history = peer->owner().history(peer);
@@ -686,14 +796,19 @@ void SessionNavigation::showPeerByLinkResolved(
 					parentController(),
 					Api::SendAction(history),
 					attachBotUsername,
-					info.attachBotToggleCommand.value_or(QString()));
+					info.attachBotToggleCommand.value_or(QString()),
+					info.botAppFullScreen);
 			});
 		} else if (bot && info.attachBotMainOpen) {
 			const auto startCommand = info.attachBotToggleCommand.value_or(
 				QString());
 			bot->session().attachWebView().open({
 				.bot = bot,
-				.context = { .controller = parentController() },
+				.context = {
+					.controller = parentController(),
+					.fullscreen = info.botAppFullScreen,
+					.maySkipConfirmation = !info.botAppForceConfirmation,
+				},
 				.button = { .startCommand = startCommand },
 				.source = InlineBots::WebViewSourceLinkBotProfile{
 					.token = startCommand,
@@ -717,6 +832,7 @@ void SessionNavigation::showPeerByLinkResolved(
 						? Api::SendAction(
 							contextUser->owner().history(contextUser))
 						: std::optional<Api::SendAction>()),
+					.fullscreen = info.botAppFullScreen,
 				},
 				.button = { .startCommand = *info.attachBotToggleCommand },
 				.source = InlineBots::WebViewSourceLinkAttachMenu{
@@ -726,36 +842,69 @@ void SessionNavigation::showPeerByLinkResolved(
 			});
 		} else {
 			const auto draft = info.text;
+			const auto historyInNewWindow = info.historyInNewWindow;
+			params.videoTimestamp = info.videoTimestamp;
 			crl::on_main(this, [=] {
 				if (peer->isUser() && !draft.isEmpty()) {
 					Data::SetChatLinkDraft(peer, { draft });
 				}
-				showPeerHistory(peer, params, msgId);
+				if (historyInNewWindow) {
+					const auto window
+						= Core::App().ensureSeparateWindowFor(peer);
+					const auto controller = window
+						? window->sessionController()
+						: nullptr;
+					if (controller) {
+						controller->showPeerHistory(peer, params, msgId);
+					} else {
+						showPeerHistory(peer, params, msgId);
+					}
+				} else {
+					showPeerHistory(peer, params, msgId);
+				}
 			});
 		}
 	}
 }
 
-void SessionNavigation::resolveBoostState(not_null<ChannelData*> channel) {
+void SessionNavigation::resolveBoostState(
+		not_null<ChannelData*> channel,
+		int boostsToLift) {
+	_boostsToLift = boostsToLift;
 	if (_boostStateResolving == channel) {
 		return;
 	}
 	_boostStateResolving = channel;
 	_api.request(MTPpremium_GetBoostsStatus(
-		channel->input
+		channel->input()
 	)).done([=](const MTPpremium_BoostsStatus &result) {
-		_boostStateResolving = nullptr;
+		if (base::take(_boostStateResolving) != channel) {
+			return;
+		}
+		const auto boosted = std::make_shared<bool>();
 		channel->updateLevelHint(result.data().vlevel().v);
 		const auto submit = [=](Fn<void(Ui::BoostCounters)> done) {
-			applyBoost(channel, done);
+			applyBoost(channel, [=](Ui::BoostCounters counters) {
+				*boosted = true;
+				done(counters);
+			});
 		};
-		uiShow()->show(Box(Ui::BoostBox, Ui::BoostBoxData{
+		const auto lifting = base::take(_boostsToLift);
+		const auto box = uiShow()->show(Box(Ui::BoostBox, Ui::BoostBoxData{
 			.name = channel->name(),
 			.boost = ParseBoostCounters(result),
 			.features = LookupBoostFeatures(channel),
+			.lifting = lifting,
 			.allowMulti = (BoostsForGift(_session) > 0),
 			.group = channel->isMegagroup(),
 		}, submit));
+		if (lifting) {
+			box->boxClosing() | rpl::on_next([=] {
+				if (*boosted) {
+					channel->updateFullForced();
+				}
+			}, box->lifetime());
+		}
 	}).fail([=](const MTP::Error &error) {
 		_boostStateResolving = nullptr;
 		showToast(u"Error: "_q + error.type());
@@ -768,10 +917,9 @@ void SessionNavigation::resolveCollectible(
 		Fn<void(QString)> fail) {
 	if (_collectibleEntity == entity) {
 		return;
-	} else {
-		_api.request(base::take(_collectibleRequestId)).cancel();
 	}
 	_collectibleEntity = entity;
+	_api.request(base::take(_collectibleRequestId)).cancel();
 	_collectibleRequestId = _api.request(MTPfragment_GetCollectibleInfo(
 		((Ui::DetectCollectibleType(entity) == Ui::CollectibleType::Phone)
 			? MTP_inputCollectiblePhone(MTP_string(entity))
@@ -781,8 +929,7 @@ void SessionNavigation::resolveCollectible(
 		_collectibleRequestId = 0;
 		uiShow()->show(Box(
 			Ui::CollectibleInfoBox,
-			Parse(entity, _session->data().peer(ownerId), result),
-			PrepareCollectibleDetails(_session)));
+			Parse(entity, _session->data().peer(ownerId), result)));
 	}).fail([=](const MTP::Error &error) {
 		_collectibleEntity = QString();
 		_collectibleRequestId = 0;
@@ -792,6 +939,139 @@ void SessionNavigation::resolveCollectible(
 	}).send();
 }
 
+void SessionNavigation::resolveConferenceCall(
+		QString slug,
+		FullMsgId contextId) {
+	resolveConferenceCall(std::move(slug), 0, contextId);
+}
+
+void SessionNavigation::resolveConferenceCall(
+		MsgId inviteMsgId,
+		FullMsgId contextId) {
+	resolveConferenceCall({}, inviteMsgId, contextId);
+}
+
+[[nodiscard]] std::vector<not_null<UserData*>> ExtractParticipantsForInvite(
+		HistoryItem *item) {
+	if (!item) {
+		return {};
+	}
+	auto result = std::vector<not_null<UserData*>>();
+	const auto add = [&](not_null<PeerData*> peer) {
+		if (const auto user = peer->asUser()) {
+			if (!user->isSelf()
+				&& !ranges::contains(result, not_null(user))) {
+				result.push_back(user);
+			}
+		}
+	};
+	add(item->from());
+	const auto media = item->media();
+	if (const auto call = media ? media->call() : nullptr) {
+		for (const auto &peer : call->otherParticipants) {
+			add(peer);
+		}
+	}
+	return result;
+}
+
+void SessionNavigation::resolveConferenceCall(
+		QString slug,
+		MsgId inviteMsgId,
+		FullMsgId contextId) {
+	_conferenceCallResolveContextId = contextId;
+	if (_conferenceCallSlug == slug
+		&& _conferenceCallInviteMsgId == inviteMsgId) {
+		return;
+	}
+	_api.request(base::take(_conferenceCallRequestId)).cancel();
+	_conferenceCallSlug = slug;
+	_conferenceCallInviteMsgId = inviteMsgId;
+
+	const auto limit = 5;
+	_conferenceCallRequestId = _api.request(MTPphone_GetGroupCall(
+		(inviteMsgId
+			? MTP_inputGroupCallInviteMessage(MTP_int(inviteMsgId.bare))
+			: MTP_inputGroupCallSlug(MTP_string(slug))),
+		MTP_int(limit)
+	)).done([=](const MTPphone_GroupCall &result) {
+		_conferenceCallRequestId = 0;
+		const auto slug = base::take(_conferenceCallSlug);
+		const auto inviteMsgId = base::take(_conferenceCallInviteMsgId);
+		const auto contextId = base::take(_conferenceCallResolveContextId);
+		const auto context = session().data().message(contextId);
+		result.data().vcall().match([&](const MTPDgroupCall &data) {
+			const auto call = session().data().sharedConferenceCall(
+				data.vid().v,
+				data.vaccess_hash().v);
+			call->processFullCall(result);
+			const auto join = [=](Fn<void()> close) {
+				const auto &appConfig = call->session().appConfig();
+				const auto conferenceLimit = appConfig.confcallSizeLimit();
+				if (call->fullCount() >= conferenceLimit) {
+					showToast(tr::lng_confcall_participants_limit(tr::now));
+				} else {
+					//parentController()->window().openInMediaView(
+					//	Media::View::OpenRequest(
+					//		parentController(),
+					//		call,
+					//		slug,
+					//		inviteMsgId));
+					//AssertIsDebug();
+					Core::App().calls().startOrJoinConferenceCall({
+						.call = call,
+						.linkSlug = slug,
+						.joinMessageId = inviteMsgId,
+					});
+					close();
+				}
+			};
+			const auto inviter = context
+				? context->from()->asUser()
+				: nullptr;
+			if (inviteMsgId && call->participants().empty()) {
+				uiShow()->show(Calls::Group::PrepareInviteToEmptyBox(
+					call,
+					inviteMsgId,
+					ExtractParticipantsForInvite(context)));
+			} else {
+				uiShow()->show(Box(
+					Calls::Group::ConferenceCallJoinConfirm,
+					call,
+					(inviter && !inviter->isSelf()) ? inviter : nullptr,
+					join));
+			}
+		}, [&](const MTPDgroupCallDiscarded &data) {
+			if (inviteMsgId) {
+				uiShow()->show(
+					Calls::Group::PrepareCreateCallBox(
+						parentController(),
+						nullptr,
+						inviteMsgId,
+						ExtractParticipantsForInvite(context)));
+			} else {
+				showToast(tr::lng_confcall_link_inactive(tr::now));
+			}
+		});
+	}).fail([=] {
+		_conferenceCallRequestId = 0;
+		_conferenceCallSlug = QString();
+		const auto contextId = base::take(_conferenceCallResolveContextId);
+		const auto context = session().data().message(contextId);
+		const auto inviteMsgId = base::take(_conferenceCallInviteMsgId);
+		if (inviteMsgId) {
+			uiShow()->show(
+				Calls::Group::PrepareCreateCallBox(
+					parentController(),
+					nullptr,
+					inviteMsgId,
+					ExtractParticipantsForInvite(context)));
+		} else {
+			showToast(tr::lng_confcall_link_inactive(tr::now));
+		}
+	}).send();
+}
+
 void SessionNavigation::applyBoost(
 		not_null<ChannelData*> channel,
 		Fn<void(Ui::BoostCounters)> done) {
@@ -835,14 +1115,14 @@ void SessionNavigation::applyBoost(
 			}
 			done({});
 		} else {
-			const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+			const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 			const auto reassign = [=](
 					std::vector<int> slots,
 					int groups,
 					int channels) {
 				const auto count = int(slots.size());
 				const auto callback = [=](Ui::BoostCounters counters) {
-					if (const auto strong = weak->data()) {
+					if (const auto strong = weak->get()) {
 						strong->closeBox();
 					}
 					done(counters);
@@ -890,10 +1170,10 @@ void SessionNavigation::applyBoostsChecked(
 	_api.request(MTPpremium_ApplyBoost(
 		MTP_flags(MTPpremium_ApplyBoost::Flag::f_slots),
 		std::move(mtp),
-		channel->input
+		channel->input()
 	)).done([=](const MTPpremium_MyBoosts &result) {
 		_api.request(MTPpremium_GetBoostsStatus(
-			channel->input
+			channel->input()
 		)).done([=](const MTPpremium_BoostsStatus &result) {
 			channel->updateLevelHint(result.data().vlevel().v);
 			done(ParseBoostCounters(result));
@@ -918,7 +1198,7 @@ void SessionNavigation::joinVoiceChatFromLink(
 	const auto hash = *info.voicechatHash;
 	_api.request(base::take(_resolveRequestId)).cancel();
 	_resolveRequestId = _api.request(
-		MTPchannels_GetFullChannel(peer->asChannel()->inputChannel)
+		MTPchannels_GetFullChannel(peer->asChannel()->inputChannel())
 	).done([=](const MTPmessages_ChatFull &result) {
 		_session->api().processFullPeer(peer, result);
 		const auto call = peer->groupCall();
@@ -960,12 +1240,14 @@ void SessionNavigation::showRepliesForMessage(
 	if (const auto topic = history->peer->forumTopicFor(rootId)) {
 		auto replies = topic->replies();
 		if (replies->unreadCountKnown()) {
-			auto memento = std::make_shared<HistoryView::RepliesMemento>(
-				history,
-				rootId,
+			using namespace HistoryView;
+			auto memento = std::make_shared<ChatMemento>(
+				ChatViewId{
+					.history = history,
+					.repliesRootId = rootId,
+				},
 				commentId,
-				params.highlightPart,
-				params.highlightPartOffsetHint);
+				params.highlight);
 			memento->setFromTopic(topic);
 			showSection(std::move(memento), params);
 			return;
@@ -976,7 +1258,7 @@ void SessionNavigation::showRepliesForMessage(
 		&& _showingRepliesRootId == rootId) {
 		return;
 	} else if (!history->peer->asChannel()) {
-		// HistoryView::RepliesWidget right now handles only channels.
+		// HistoryView::ChatWidget replies right now handles only channels.
 		return;
 	}
 	_api.request(base::take(_showingRepliesRequestId)).cancel();
@@ -986,7 +1268,7 @@ void SessionNavigation::showRepliesForMessage(
 	_showingRepliesRootId = rootId;
 	_showingRepliesRequestId = _api.request(
 		MTPmessages_GetDiscussionMessage(
-			history->peer->input,
+			history->peer->input(),
 			MTP_int(rootId))
 	).done([=](const MTPmessages_DiscussionMessage &result) {
 		_showingRepliesRequestId = 0;
@@ -1031,14 +1313,16 @@ void SessionNavigation::showRepliesForMessage(
 				}
 			}
 			if (deleted || item) {
+				using namespace HistoryView;
 				auto memento = item
-					? std::make_shared<HistoryView::RepliesMemento>(
+					? std::make_shared<ChatMemento>(
+						ChatMemento::Comments(),
 						item,
 						commentId)
-					: std::make_shared<HistoryView::RepliesMemento>(
-						history,
-						rootId,
-						commentId);
+					: std::make_shared<ChatMemento>(ChatViewId{
+						.history = history,
+						.repliesRootId = rootId,
+					}, commentId);
 				memento->setReadInformation(
 					data.vread_inbox_max_id().value_or_empty(),
 					data.vunread_count().v,
@@ -1051,6 +1335,8 @@ void SessionNavigation::showRepliesForMessage(
 		if (error.type() == u"CHANNEL_PRIVATE"_q
 			|| error.type() == u"USER_BANNED_IN_CHANNEL"_q) {
 			showToast(tr::lng_group_not_accessible(tr::now));
+		} else if (error.type() == u"MSG_ID_INVALID"_q) {
+			showToast(tr::lng_message_not_found(tr::now));
 		}
 	}).send();
 }
@@ -1072,12 +1358,29 @@ void SessionNavigation::showTopic(
 		params);
 }
 
+void SessionNavigation::showSublist(
+		not_null<Data::SavedSublist*> sublist,
+		MsgId itemId,
+		const SectionShow &params) {
+	using namespace HistoryView;
+	auto memento = std::make_shared<ChatMemento>(
+		ChatViewId{
+			.history = sublist->owningHistory(),
+			.sublist = sublist,
+		},
+		itemId,
+		params.highlight);
+	showSection(std::move(memento), params);
+}
+
 void SessionNavigation::showThread(
 		not_null<Data::Thread*> thread,
 		MsgId itemId,
 		const SectionShow &params) {
 	if (const auto topic = thread->asTopic()) {
 		showTopic(topic, itemId, params);
+	} else if (const auto sublist = thread->asSublist()) {
+		showSublist(sublist, itemId, params);
 	} else {
 		showPeerHistory(thread->asHistory(), params, itemId);
 	}
@@ -1102,6 +1405,9 @@ void SessionNavigation::showPeerInfo(
 		const SectionShow &params) {
 	if (const auto topic = thread->asTopic()) {
 		showSection(std::make_shared<Info::Memento>(topic), params);
+	} else if (const auto sublist = thread->asSublist()
+		; sublist && sublist->parentChat()) {
+		showPeerInfo(sublist->sublistPeer()->id, params);
 	} else {
 		showPeerInfo(thread->peer()->id, params);
 	}
@@ -1143,9 +1449,25 @@ void SessionNavigation::showByInitialId(
 	case SeparateType::Chat:
 		showThread(id.thread, msgId, instant);
 		break;
+	case SeparateType::SharedMedia: {
+		clearSectionStack(instant);
+		const auto type = id.sharedMediaType;
+		const auto topic = id.thread->asTopic();
+		showSection(
+			(topic
+				? std::make_shared<Info::Memento>(topic, type)
+				: std::make_shared<Info::Memento>(id.thread->peer(), type)),
+			instant);
+		parent->widget()->setMaximumWidth(st::maxWidthSharedMediaWindow);
+		break;
+	}
 	case SeparateType::SavedSublist:
+		using namespace HistoryView;
 		showSection(
-			std::make_shared<HistoryView::SublistMemento>(id.sublist()),
+			std::make_shared<ChatMemento>(ChatViewId{
+				.history = id.sublist()->owningHistory(),
+				.sublist = id.sublist(),
+			}),
 			instant);
 		break;
 	}
@@ -1162,7 +1484,7 @@ void SessionNavigation::showSettings(
 }
 
 void SessionNavigation::showSettings(const SectionShow &params) {
-	showSettings(Settings::Main::Id(), params);
+	showSettings(Settings::MainId(), params);
 }
 
 void SessionNavigation::showPollResults(
@@ -1172,14 +1494,17 @@ void SessionNavigation::showPollResults(
 	showSection(std::make_shared<Info::Memento>(poll, contextId), params);
 }
 
-void SessionNavigation::searchInChat(Dialogs::Key inChat) {
-	searchMessages(QString(), inChat);
+void SessionNavigation::searchInChat(
+		Dialogs::Key inChat,
+		PeerData *searchFrom) {
+	searchMessages(QString(), inChat, searchFrom);
 }
 
 void SessionNavigation::searchMessages(
 		const QString &query,
-		Dialogs::Key inChat) {
-	parentController()->content()->searchMessages(query, inChat);
+		Dialogs::Key inChat,
+		PeerData *searchFrom) {
+	parentController()->content()->searchMessages(query, inChat, searchFrom);
 }
 
 auto SessionNavigation::showToast(Ui::Toast::Config &&config)
@@ -1218,6 +1543,8 @@ struct SessionController::CachedThemeKey {
 struct SessionController::CachedTheme {
 	std::weak_ptr<Ui::ChatTheme> theme;
 	std::shared_ptr<Data::DocumentMedia> media;
+	std::unique_ptr<Ui::Text::CustomEmoji> giftSymbol;
+	uint64 giftId = 0;
 	Data::WallPaper paper;
 	bool basedOnDark = false;
 	bool caching = false;
@@ -1253,14 +1580,14 @@ SessionController::SessionController(
 
 	pushDefaultChatBackground();
 	Theme::Background()->updates(
-	) | rpl::start_with_next([=](const Theme::BackgroundUpdate &update) {
+	) | rpl::on_next([=](const Theme::BackgroundUpdate &update) {
 		if (update.type == Theme::BackgroundUpdate::Type::New
 			|| update.type == Theme::BackgroundUpdate::Type::Changed) {
 			pushDefaultChatBackground();
 		}
 	}, _lifetime);
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &[key, value] : _customChatThemes) {
 			if (!key.theme.id) {
 				value.theme.reset();
@@ -1283,9 +1610,15 @@ SessionController::SessionController(
 				}
 			}
 		}
+		if (update.flags & Data::PeerUpdate::Flag::FullInfo) {
+			if (update.peer->isSelf()) {
+				Support::Helper::CheckIfLost(this);
+			}
+			fullInfoLoadedHook(update.peer);
+		}
 		return (update.flags & Data::PeerUpdate::Flag::FullInfo)
 			&& (update.peer == _showEditPeer);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		show(Box<EditPeerInfoBox>(this, base::take(_showEditPeer)));
 	}, lifetime());
 
@@ -1295,21 +1628,37 @@ SessionController::SessionController(
 			&& (folder == _openedFolder.current())
 			&& folder->chatsList()->indexed()->empty()
 			&& !folder->storiesCount();
-	}) | rpl::start_with_next([=](Data::Folder *folder) {
+	}) | rpl::on_next([=](Data::Folder *folder) {
 		folder->updateChatListSortPosition();
 		closeFolder();
 	}, lifetime());
 
-	session->data().chatsFilters().changed(
-	) | rpl::start_with_next([=] {
+	const auto processFiltersMenu = [this] {
+		if (SessionNavigation::session().data().chatsFilters().has()) {
+			const auto isHorizontal
+				= Core::App().settings().chatFiltersHorizontal()
+					|| !enoughSpaceForFilters();
+			content()->toggleFiltersMenu(isHorizontal);
+			toggleFiltersMenu(!isHorizontal);
+		} else {
+			content()->toggleFiltersMenu(false);
+			toggleFiltersMenu(false);
+		}
+	};
+	rpl::merge(
+		enoughSpaceForFiltersValue() | rpl::skip(1) | rpl::to_empty,
+		Core::App().settings().chatFiltersHorizontalChanges() | rpl::to_empty,
+		session->data().chatsFilters().changed()
+	) | rpl::on_next([=] {
+		if (!_filtersActivated) {
+			processFiltersMenu();
+		}
 		checkOpenedFilter();
-		crl::on_main(this, [=] {
-			refreshFiltersMenu();
-		});
+		crl::on_main(this, processFiltersMenu);
 	}, lifetime());
 
 	session->data().itemIdChanged(
-	) | rpl::start_with_next([=](Data::Session::IdChange change) {
+	) | rpl::on_next([=](Data::Session::IdChange change) {
 		const auto current = _activeChatEntry.current();
 		if (const auto topic = current.key.topic()) {
 			if (topic->rootId() == change.oldId) {
@@ -1329,8 +1678,29 @@ SessionController::SessionController(
 		}
 	}, lifetime());
 
+	session->data().documentLoadProgress(
+	) | rpl::filter([=](not_null<DocumentData*> document) {
+		return _pendingOpenDocumentId == document->id
+			&& !document->filepath().isEmpty();
+	}) | rpl::on_next([=](not_null<DocumentData*> document) {
+		_pendingOpenDocumentId = {};
+		File::Launch(document->filepath());
+	}, _lifetime);
+
+	session->downloaderTaskFinished(
+	) | rpl::filter([=] {
+		return _pendingOpenPhoto.media && _pendingOpenPhoto.media->loaded();
+	}) | rpl::on_next([=] {
+		if (_pendingOpenPhoto.media->saveToFile(_pendingOpenPhoto.filepath)) {
+			_pendingOpenPhoto.data->setLocation(
+				Core::FileLocation(_pendingOpenPhoto.filepath));
+			File::Launch(_pendingOpenPhoto.filepath);
+		}
+		_pendingOpenPhoto = {};
+	}, _lifetime);
+
 	session->api().globalPrivacy().suggestArchiveAndMute(
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		session->api().globalPrivacy().reload(crl::guard(this, [=] {
 			if (!session->api().globalPrivacy().archiveAndMuteCurrent()) {
 				suggestArchiveAndMute();
@@ -1339,12 +1709,12 @@ SessionController::SessionController(
 	}, _lifetime);
 
 	session->downloader().nonPremiumDelays(
-	) | rpl::start_with_next([=](DocumentId id) {
+	) | rpl::on_next([=](DocumentId id) {
 		checkNonPremiumLimitToastDownload(id);
 	}, _lifetime);
 
 	session->uploader().nonPremiumDelays(
-	) | rpl::start_with_next([=](FullMsgId id) {
+	) | rpl::on_next([=](FullMsgId id) {
 		checkNonPremiumLimitToastUpload(id);
 	}, _lifetime);
 
@@ -1354,6 +1724,50 @@ SessionController::SessionController(
 		activateFirstChatsFilter();
 		setupPremiumToast();
 	});
+
+#if _DEBUG // TEST: Auto-open craft box on startup
+	constexpr auto kGiftsCount = 4;
+	crl::on_main(this, [=] {
+		if (rand() % 2 >= 0) {
+			return;
+		}
+		const auto user = session->user();
+		session->api().request(MTPpayments_GetSavedStarGifts(
+			MTP_flags(MTPpayments_GetSavedStarGifts::Flag::f_exclude_unlimited),
+			user->input(),
+			MTP_int(0),
+			MTP_string(QString()),
+			MTP_int(50)
+		)).done([=](const MTPpayments_SavedStarGifts &result) {
+			const auto &data = result.data();
+			session->data().processUsers(data.vusers());
+			session->data().processChats(data.vchats());
+
+			auto craftableGifts = std::vector<Ui::GiftForCraftEntry>();
+			craftableGifts.reserve(kGiftsCount);
+
+			for (const auto &gift : data.vgifts().v) {
+				if (auto parsed = Api::FromTL(user, gift)) {
+					const auto unique = parsed->info.unique;
+					if (unique
+						&& unique->craftChancePermille > 0
+						&& unique->canCraftAt <= base::unixtime::now()) {
+						craftableGifts.push_back({
+							unique,
+							parsed->manageId,
+						});
+						if (craftableGifts.size() >= kGiftsCount) {
+							break;
+						}
+					}
+				}
+			}
+			if (!craftableGifts.empty()) {
+				Ui::ShowTestGiftCraftBox(this, std::move(craftableGifts));
+			}
+		}).send();
+	});
+#endif
 }
 
 bool SessionController::skipNonPremiumLimitToast(bool download) const {
@@ -1406,14 +1820,14 @@ void SessionController::suggestArchiveAndMute() {
 		box->setTitle(tr::lng_suggest_hide_new_title());
 		box->addRow(object_ptr<Ui::FlatLabel>(
 			box,
-			tr::lng_suggest_hide_new_about(Ui::Text::RichLangValue),
+			tr::lng_suggest_hide_new_about(tr::rich),
 			st::boxLabel));
 		box->addButton(tr::lng_suggest_hide_new_to_settings(), [=] {
-			showSettings(Settings::PrivacySecurity::Id());
+			showSettings(Settings::PrivacySecurityId());
 		});
 		box->setCloseByOutsideClick(false);
 		box->boxClosing(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			crl::on_main(weak, [=] {
 				auto &privacy = session().api().globalPrivacy();
 				privacy.dismissArchiveAndMuteSuggestion();
@@ -1437,6 +1851,10 @@ not_null<::MainWindow*> SessionController::widget() const {
 	return _window->widget();
 }
 
+rpl::producer<> SessionController::imeCompositionStarts() const {
+	return widget()->imeCompositionStarts();
+}
+
 auto SessionController::sendingAnimation() const
 -> Ui::MessageSendingAnimationController & {
 	return *_sendingAnimation;
@@ -1473,22 +1891,65 @@ void SessionController::init() {
 	if (session().supportMode()) {
 		session().supportHelper().registerWindow(this);
 	}
+	session().data().drawToReplyRequests(
+	) | rpl::on_next([=](Data::DrawToReplyRequest request) {
+		handleDrawToReplyRequest(std::move(request));
+	}, lifetime());
 	setupShortcuts();
 }
 
 void SessionController::setupShortcuts() {
-	Shortcuts::Requests(
+	using namespace Shortcuts;
+
+	ChatSwitchRequests(
+	) | rpl::filter([=](const ChatSwitchRequest &request) {
+		return !window().locked()
+			&& (_chatSwitchProcess
+				|| (request.started
+					&& (Core::App().activeWindow() == &window())
+					&& !isLayerShown()));
+	}) | rpl::on_next([=](const ChatSwitchRequest &request) {
+		if (!_chatSwitchProcess) {
+			_chatSwitchProcess = std::make_unique<ChatSwitchProcess>(
+				widget()->bodyWidget(),
+				&session(),
+				activeChatCurrent().thread());
+			const auto close = [this, raw = _chatSwitchProcess.get()] {
+				if (_chatSwitchProcess.get() == raw) {
+					base::take(_chatSwitchProcess);
+				}
+			};
+
+			_chatSwitchProcess->chosen(
+			) | rpl::on_next([=](not_null<Data::Thread*> thread) {
+				close();
+
+				const auto id = SeparateId(thread);
+				if (const auto window = Core::App().separateWindowFor(id)) {
+					window->activate();
+					return;
+				}
+				jumpToChatListEntry({ Dialogs::Key(thread), FullMsgId() });
+			}, _chatSwitchProcess->lifetime());
+
+			_chatSwitchProcess->closeRequests(
+			) | rpl::on_next(close, _chatSwitchProcess->lifetime());
+		}
+		_chatSwitchProcess->process(request);
+	}, _lifetime);
+
+	Requests(
 	) | rpl::filter([=] {
 		return (Core::App().activeWindow() == &window())
 			&& !isLayerShown()
 			&& !window().locked();
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
-		using C = Shortcuts::Command;
+	}) | rpl::on_next([=](not_null<Request*> request) {
+		using C = Command;
 
 		const auto app = &Core::App();
 		const auto accountsCount = int(app->domain().accounts().size());
 		auto &&accounts = ranges::views::zip(
-			Shortcuts::kShowAccount,
+			kShowAccount,
 			ranges::views::ints(0, accountsCount));
 		for (const auto &[command, index] : accounts) {
 			request->check(command) && request->handle([=] {
@@ -1535,10 +1996,6 @@ void SessionController::toggleFiltersMenu(bool enabled) {
 	_filtersMenuChanged.fire({});
 }
 
-void SessionController::refreshFiltersMenu() {
-	toggleFiltersMenu(session().data().chatsFilters().has());
-}
-
 rpl::producer<> SessionController::filtersMenuChanged() const {
 	return _filtersMenuChanged.events();
 }
@@ -1566,10 +2023,13 @@ void SessionController::activateFirstChatsFilter() {
 	setActiveChatsFilter(session().data().chatsFilters().defaultId());
 }
 
-bool SessionController::uniqueChatsInSearchResults() const {
+bool SessionController::uniqueChatsInSearchResults(
+		const Dialogs::SearchState &state) const {
+	const auto global = (state.tab == Dialogs::ChatSearchTab::MyMessages)
+		|| (state.tab == Dialogs::ChatSearchTab::PublicPosts);
 	return session().supportMode()
 		&& !session().settings().supportAllSearchResults()
-		&& !_searchInChat.current();
+		&& (global || !state.inChat);
 }
 
 bool SessionController::openFolderInDifferentWindow(
@@ -1612,12 +2072,13 @@ void SessionController::closeFolder() {
 
 bool SessionController::showForumInDifferentWindow(
 		not_null<Data::Forum*> forum,
-		const SectionShow &params) {
+		const SectionShow &params,
+		MsgId showAtMsgId) {
 	const auto window = Core::App().windowForShowingForum(forum);
 	if (window == _window) {
 		return false;
 	} else if (window) {
-		window->sessionController()->showForum(forum, params);
+		window->sessionController()->showForum(forum, params, showAtMsgId);
 		window->activate();
 		return true;
 	} else if (windowId().hasChatsList()) {
@@ -1630,7 +2091,7 @@ bool SessionController::showForumInDifferentWindow(
 		primary = Core::App().separateWindowFor(account);
 	}
 	if (primary && &primary->account() == account) {
-		primary->sessionController()->showForum(forum, params);
+		primary->sessionController()->showForum(forum, params, showAtMsgId);
 		primary->activate();
 	}
 	return true;
@@ -1638,8 +2099,20 @@ bool SessionController::showForumInDifferentWindow(
 
 void SessionController::showForum(
 		not_null<Data::Forum*> forum,
-		const SectionShow &params) {
-	if (showForumInDifferentWindow(forum, params)) {
+		const SectionShow &params,
+		MsgId showAtMsgId) {
+	const auto forced = params.forceTopicsList;
+	if (showForumInDifferentWindow(forum, params, showAtMsgId)) {
+		return;
+	} else if (!forced && forum->peer()->useSubsectionTabs()) {
+		const auto active = (showAtMsgId == ShowAtUnreadMsgId)
+			? forum->activeSubsectionThread()
+			: nullptr;
+		if (active) {
+			showThread(active, showAtMsgId, params);
+		} else {
+			showPeerHistory(forum->peer(), params, showAtMsgId);
+		}
 		return;
 	}
 	_shownForumLifetime.destroy();
@@ -1655,10 +2128,11 @@ void SessionController::showForum(
 	if (_shownForum.current() != forum) {
 		return;
 	}
-	forum->destroyed(
-	) | rpl::start_with_next([=, history = forum->history()] {
+	const auto history = forum->history();
+	const auto closeAndShowHistory = [=](bool showOnlyIfEmpty) {
 		const auto now = activeChatCurrent().owningHistory();
-		const auto showHistory = !now || (now == history);
+		const auto showHistory = !now
+			|| (!showOnlyIfEmpty && (now == history));
 		const auto weak = base::make_weak(this);
 		closeForum();
 		if (weak && showHistory) {
@@ -1668,8 +2142,29 @@ void SessionController::showForum(
 				anim::activation::background,
 			});
 		}
-	}, _shownForumLifetime);
+	};
 	content()->showForum(forum, params);
+	if (_shownForum.current() != forum) {
+		return;
+	}
+
+	forum->destroyed(
+	) | rpl::on_next([=] {
+		closeAndShowHistory(false);
+	}, _shownForumLifetime);
+	if (!forced) {
+		using FlagChange = Data::Flags<ChannelDataFlags>::Change;
+		if (const auto channel = forum->channel()) {
+			channel->flagsValue(
+			) | rpl::on_next([=](FlagChange change) {
+				if (change.diff & ChannelDataFlag::ForumTabs) {
+					if (HistoryView::SubsectionTabs::UsedFor(history)) {
+						closeAndShowHistory(true);
+					}
+				}
+			}, _shownForumLifetime);
+		}
+	}
 }
 
 void SessionController::closeForum() {
@@ -1704,9 +2199,11 @@ void SessionController::setupPremiumToast() {
 	) | rpl::filter([=](bool premium) {
 		session().mtp().requestConfig();
 		return premium;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		MainWindowShow(this).showToast({
 			.text = { tr::lng_premium_success(tr::now) },
+			.iconLottie = u"toast/star_premium_2"_q,
+			.iconLottieSize = st::toastLottieIconSize,
 			.adaptive = true,
 		});
 	}, _lifetime);
@@ -1721,31 +2218,41 @@ const rpl::variable<Data::Forum*> &SessionController::shownForum() const {
 }
 
 void SessionController::setActiveChatEntry(Dialogs::RowDescriptor row) {
-	const auto was = _activeChatEntry.current().key.history();
-	const auto now = row.key.history();
-	if (was && was != now) {
+	if (windowId().type == SeparateType::SharedMedia) {
+		return;
+	}
+	const auto was = _activeChatEntry.current();
+	if (was.key && was.key != row.key) {
+		session().api().saveCurrentDraftToCloud();
+	}
+	const auto wasHistory = was.key.history();
+	const auto nowHistory = row.key.history();
+	if (wasHistory && wasHistory != nowHistory) {
 		_activeHistoryLifetime.destroy();
-		was->setFakeUnreadWhileOpened(false);
+		wasHistory->setFakeUnreadWhileOpened(false);
 		_invitePeekTimer.cancel();
 	}
 	_activeChatEntry = row;
-	if (now) {
-		now->setFakeUnreadWhileOpened(true);
-		if (const auto channel = now->peer->asChannel()
+	if (nowHistory) {
+		nowHistory->setFakeUnreadWhileOpened(true);
+		if (const auto channel = nowHistory->peer->asChannel()
 			; channel && !channel->isForum()) {
 			Data::PeerFlagValue(
 				channel,
 				ChannelData::Flag::Forum
-			) | rpl::filter(
-				rpl::mappers::_1
-			) | rpl::start_with_next([=] {
+			) | rpl::filter([=](bool forum) {
+				return forum && !channel->useSubsectionTabs();
+			}) | rpl::on_next([=] {
 				clearSectionStack(
 					{ anim::type::normal, anim::activation::background });
 				showForum(channel->forum(),
 					{ anim::type::normal, anim::activation::background });
-			}, _shownForumLifetime);
+			}, _activeHistoryLifetime);
 		}
 	}
+	if (const auto thread = row.key.thread()) {
+		session().recentPeers().chatOpenPush(thread);
+	}
 	if (session().supportMode()) {
 		pushToChatEntryHistory(row);
 	}
@@ -1804,13 +2311,18 @@ bool SessionController::jumpToChatListEntry(Dialogs::RowDescriptor row) {
 	return false;
 }
 
-void SessionController::setCurrentDialogsEntryState(
+void SessionController::setDialogsEntryState(
 		Dialogs::EntryState state) {
-	_currentDialogsEntryState = state;
+	_dialogsEntryState = state;
 }
 
-Dialogs::EntryState SessionController::currentDialogsEntryState() const {
-	return _currentDialogsEntryState;
+Dialogs::EntryState SessionController::dialogsEntryStateCurrent() const {
+	return _dialogsEntryState.current();
+}
+
+auto SessionController::dialogsEntryStateValue() const
+-> rpl::producer<Dialogs::EntryState> {
+	return _dialogsEntryState.value();
 }
 
 bool SessionController::switchInlineQuery(
@@ -1837,9 +2349,17 @@ bool SessionController::switchInlineQuery(
 		int(textWithTags.text.size()),
 		Ui::kQFixedMax
 	};
+	if (to.currentReplyTo.messageId.msg == to.currentReplyTo.topicRootId
+		&& to.currentReplyTo.quote.empty()) {
+		to.currentReplyTo.messageId.msg = MsgId();
+	}
+	if (!history->suggestDraftAllowed()) {
+		to.currentSuggest = SuggestOptions();
+	}
 	auto draft = std::make_unique<Data::Draft>(
 		textWithTags,
 		to.currentReplyTo,
+		to.currentSuggest,
 		cursor,
 		Data::WebPageDraft());
 
@@ -1852,8 +2372,9 @@ bool SessionController::switchInlineQuery(
 			params);
 	} else {
 		const auto topicRootId = to.currentReplyTo.topicRootId;
+		const auto monoforumPeerId = to.currentReplyTo.monoforumPeerId;
 		history->setLocalDraft(std::move(draft));
-		history->clearLocalEditDraft(topicRootId);
+		history->clearLocalEditDraft(topicRootId, monoforumPeerId);
 		if (to.section == Section::Replies) {
 			const auto commentId = MsgId();
 			showRepliesForMessage(history, topicRootId, commentId, params);
@@ -2190,7 +2711,7 @@ void SessionController::showPeer(not_null<PeerData*> peer, MsgId msgId) {
 		if (!clickedChannel->isPublic()
 			&& !clickedChannel->amIn()
 			&& (!currentPeer->isChannel()
-				|| currentPeer->asChannel()->linkedChat()
+				|| currentPeer->asChannel()->discussionLink()
 					!= clickedChannel)) {
 			MainWindowShow(this).showToast(peer->isMegagroup()
 				? tr::lng_group_not_accessible(tr::now)
@@ -2213,8 +2734,11 @@ void SessionController::startOrJoinGroupCall(
 	Core::App().calls().startOrJoinGroupCall(uiShow(), peer, args);
 }
 
-void SessionController::showCalendar(Dialogs::Key chat, QDate requestedDate) {
+void SessionController::showCalendar(ShowCalendarDescriptor &&descriptor) {
+	const auto chat = descriptor.chat;
+	const auto requestedDate = descriptor.date;
 	const auto topic = chat.topic();
+	const auto sublist = chat.sublist();
 	const auto history = chat.owningHistory();
 	if (!history) {
 		return;
@@ -2288,6 +2812,7 @@ void SessionController::showCalendar(Dialogs::Key chat, QDate requestedDate) {
 		: !currentPeerDate.isNull()
 		? currentPeerDate
 		: QDate::currentDate();
+	const auto performJump = descriptor.customJump;
 	struct ButtonState {
 		enum class Type {
 			None,
@@ -2346,37 +2871,85 @@ void SessionController::showCalendar(Dialogs::Key chat, QDate requestedDate) {
 			button->setPointerCursor(false);
 		}
 	};
+	struct SearchCalendarResult {
+		Fn<void(QDate, Ui::CalendarImageSetter)> factory;
+		Fn<void(const QDate &, Fn<void()>)> customJump;
+	};
+	const auto searchCalendarResult = [&]() -> SearchCalendarResult {
+		using Factory = Fn<void(QDate, Ui::CalendarImageSetter)>;
+		using CustomJump = Fn<void(const QDate &, Fn<void()>)>;
+		if (!descriptor.mediaPhoto && !descriptor.mediaVideo) {
+			return {};
+		}
+		const auto search = std::make_shared<Api::SearchCalendarController>(
+			&session(),
+			history->peer->id,
+			(descriptor.mediaPhoto && descriptor.mediaVideo)
+				? Storage::SharedMediaType::PhotoVideo
+				: descriptor.mediaPhoto
+				? Storage::SharedMediaType::Photo
+				: Storage::SharedMediaType::Video);
+		const auto factory = [=](QDate date, Ui::CalendarImageSetter set) {
+			search->monthThumbnails(
+				base::unixtime::serialize(QDateTime(date, QTime())),
+				[=](const std::vector<Api::DayThumbnail> &thumbnails) {
+					for (const auto &thumb : thumbnails) {
+						set(
+							base::unixtime::parse(thumb.date).date(),
+							thumb.image);
+					}
+				});
+		};
+		auto customJump = CustomJump(nullptr);
+		if (const auto performJump = descriptor.customJump) {
+			customJump = [=](const QDate &d, Fn<void()> close) {
+				const auto date = base::unixtime::serialize(
+					QDateTime(d, QTime()));
+				if (const auto msgId = search->resolveMsgIdByDate(date)) {
+					performJump(FullMsgId(history->peer->id, *msgId), close);
+				}
+			};
+		}
+		return { Factory(factory), std::move(customJump) };
+	}();
 	const auto weak = base::make_weak(this);
-	const auto weakTopic = base::make_weak(topic);
-	const auto jump = [=](const QDate &date) {
+	const auto weakThread = base::make_weak(chat.thread());
+	const auto jump = [=](const QDate &date, Fn<void()> close) {
 		const auto open = [=](not_null<PeerData*> peer, MsgId id) {
 			if (const auto strong = weak.get()) {
-				if (!topic) {
+				if (performJump) {
+					performJump(FullMsgId(peer->id, id), close);
+				} else if (!topic && !sublist) {
 					strong->showPeerHistory(
 						peer,
 						SectionShow::Way::Forward,
 						id);
-				} else if (const auto strongTopic = weakTopic.get()) {
-					strong->showTopic(
-						strongTopic,
+				} else if (const auto strongThread = weakThread.get()) {
+					strong->showThread(
+						strongThread,
 						id,
 						SectionShow::Way::Forward);
 					strong->hideLayer(anim::type::normal);
 				}
 			}
 		};
-		if (!topic || weakTopic) {
+		if ((!topic && !sublist) || weakThread) {
 			session().api().resolveJumpToDate(chat, date, open);
 		}
 	};
+	const auto requireImage = !!searchCalendarResult.customJump;
 	show(Box<Ui::CalendarBox>(Ui::CalendarBoxArgs{
 		.month = highlighted,
 		.highlighted = highlighted,
-		.callback = [=](const QDate &date) { jump(date); },
+		.callback = searchCalendarResult.customJump
+			? std::move(searchCalendarResult.customJump)
+			: jump,
 		.minDate = minPeerDate,
 		.maxDate = maxPeerDate,
 		.allowsSelection = history->peer->isUser(),
 		.selectionChanged = selectionChanged,
+		.dynamicImageForDate = std::move(searchCalendarResult.factory),
+		.requireImage = requireImage,
 	}));
 }
 
@@ -2413,7 +2986,7 @@ void SessionController::showInNewWindow(
 	const auto active = activeChatCurrent();
 	// windows check active forum / active archive
 	const auto fromActive = active.thread()
-		? (active.thread() == id.thread)
+		? (active.thread() == id.thread && id.type == SeparateType::Chat)
 		: false;
 	const auto toSeparate = [=] {
 		Core::App().ensureSeparateWindowFor(id, msgId);
@@ -2430,7 +3003,10 @@ void SessionController::showInNewWindow(
 
 void SessionController::toggleChooseChatTheme(
 		not_null<PeerData*> peer,
-		std::optional<bool> show) const {
+		std::optional<bool> show) {
+	if (showFrozenError()) {
+		return;
+	}
 	content()->toggleChooseChatTheme(peer, show);
 }
 
@@ -2560,6 +3136,24 @@ bool SessionController::isLayerShown() const {
 	return _window->isLayerShown();
 }
 
+rpl::producer<bool> SessionController::boxShownValue() const {
+	return _window->boxShownValue();
+}
+
+void SessionController::registerActiveLayerSection(SectionWidget *section) {
+	_activeLayerSection = section;
+}
+
+void SessionController::unregisterActiveLayerSection(SectionWidget *section) {
+	if (_activeLayerSection == section) {
+		_activeLayerSection = nullptr;
+	}
+}
+
+SectionWidget *SessionController::activeLayerSection() const {
+	return _activeLayerSection.data();
+}
+
 not_null<MainWidget*> SessionController::content() const {
 	return widget()->sessionContent();
 }
@@ -2568,6 +3162,16 @@ int SessionController::filtersWidth() const {
 	return _filters ? st::windowFiltersWidth : 0;
 }
 
+bool SessionController::enoughSpaceForFilters() const {
+	return widget()->width() >= widget()->minimumWidth() + st::windowFiltersWidth;
+}
+
+rpl::producer<bool> SessionController::enoughSpaceForFiltersValue() const {
+	return widget()->widthValue() | rpl::map([=] {
+		return enoughSpaceForFilters();
+	}) | rpl::distinct_until_changed();
+}
+
 rpl::producer<FilterId> SessionController::activeChatsFilter() const {
 	return _activeChatsFilter.value();
 }
@@ -2629,7 +3233,7 @@ auto SessionController::stickerOrEmojiChosen() const
 	return _stickerOrEmojiChosen.events();
 }
 
-QPointer<Ui::BoxContent> SessionController::show(
+base::weak_qptr<Ui::BoxContent> SessionController::show(
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options,
 		anim::type animated) {
@@ -2640,6 +3244,37 @@ void SessionController::hideLayer(anim::type animated) {
 	_window->hideLayer(animated);
 }
 
+bool SessionController::openPhotoExternal(
+		not_null<PhotoData*> photo,
+		Data::FileOrigin origin) {
+	if (!OptionExternalMediaViewer.value()) {
+		return false;
+	}
+	const auto media = photo->createMediaView();
+	const auto existing = photo->location(true).name();
+	if (!existing.isEmpty()) {
+		File::Launch(existing);
+		return true;
+	}
+	const auto filepath = FileNameForSave(
+		&session(),
+		tr::lng_save_photo(tr::now),
+		u"JPEG Image (*.jpg);;"_q + FileDialog::AllFilesFilter(),
+		u"photo"_q,
+		u".jpg"_q,
+		false);
+	if (media->loaded()) {
+		if (media->saveToFile(filepath)) {
+			photo->setLocation(Core::FileLocation(filepath));
+			File::Launch(filepath);
+		}
+		return true;
+	}
+	_pendingOpenPhoto = { photo, media, filepath };
+	photo->load(origin, LoadFromCloudOrLocal, true);
+	return true;
+}
+
 void SessionController::openPhoto(
 		not_null<PhotoData*> photo,
 		MessageContext message,
@@ -2648,13 +3283,32 @@ void SessionController::openPhoto(
 	if (openSharedStory(item) || openFakeItemStory(message.id, stories)) {
 		return;
 	}
-	_window->openInMediaView(
-		Media::View::OpenRequest(this, photo, item, message.topicRootId));
+	const auto origin = item
+		? Data::FileOrigin(item->fullId())
+		: Data::FileOrigin();
+	if (openPhotoExternal(photo, origin)) {
+		return;
+	}
+	_window->openInMediaView(Media::View::OpenRequest(
+		this,
+		photo,
+		item,
+		message.topicRootId,
+		message.monoforumPeerId,
+		message.showDrawButton));
 }
 
 void SessionController::openPhoto(
 		not_null<PhotoData*> photo,
 		not_null<PeerData*> peer) {
+	const auto origin = peer->isUser()
+		? Data::FileOrigin(Data::FileOriginUserPhoto(
+			peerToUser(peer->id),
+			photo->id))
+		: Data::FileOrigin(Data::FileOriginPeerPhoto(peer->id));
+	if (openPhotoExternal(photo, origin)) {
+		return;
+	}
 	_window->openInMediaView(Media::View::OpenRequest(this, photo, peer));
 }
 
@@ -2662,19 +3316,56 @@ void SessionController::openDocument(
 		not_null<DocumentData*> document,
 		bool showInMediaView,
 		MessageContext message,
-		const Data::StoriesContext *stories) {
+		const Data::StoriesContext *stories,
+		std::optional<TimeId> videoTimestampOverride) {
 	const auto item = session().data().message(message.id);
 	if (openSharedStory(item) || openFakeItemStory(message.id, stories)) {
 		return;
 	} else if (showInMediaView) {
-		_window->openInMediaView(Media::View::OpenRequest(
+		if (OptionExternalMediaViewer.value() && !document->isTheme()) {
+			const auto filepath = document->filepath();
+			if (filepath.isEmpty()) {
+				if (document->loadedInMediaCache()) {
+					_pendingOpenDocumentId = document->id;
+				}
+				DocumentSaveClickHandler::Save(
+					message.id,
+					document,
+					DocumentSaveClickHandler::Mode::ToFile);
+				return;
+			}
+			File::Launch(filepath);
+			return;
+		}
+		using namespace Media::View;
+		const auto saved = session().local().mediaLastPlaybackPosition(
+			document->id);
+		const auto timestamp = item ? ExtractVideoTimestamp(item) : 0;
+		const auto usedTimestamp = videoTimestampOverride
+			? ((*videoTimestampOverride) * crl::time(1000))
+			: saved
+			? saved
+			: timestamp
+			? (timestamp * crl::time(1000))
+			: crl::time();
+		_window->openInMediaView(OpenRequest(
 			this,
 			document,
 			item,
-			message.topicRootId));
+			message.topicRootId,
+			message.monoforumPeerId,
+			false,
+			usedTimestamp,
+			message.showDrawButton));
 		return;
 	}
-	Data::ResolveDocument(this, document, item, message.topicRootId);
+	Data::ResolveDocument(
+		this,
+		document,
+		item,
+		message.topicRootId,
+		message.monoforumPeerId,
+		message.showDrawButton);
 }
 
 bool SessionController::openSharedStory(HistoryItem *item) {
@@ -2820,11 +3511,11 @@ void SessionController::clearCachedChatThemes() {
 void SessionController::overridePeerTheme(
 		not_null<PeerData*> peer,
 		std::shared_ptr<Ui::ChatTheme> theme,
-		EmojiPtr emoji) {
+		QString token) {
 	_peerThemeOverride = PeerThemeOverride{
 		peer,
 		theme ? theme : _defaultChatTheme,
-		emoji,
+		token,
 	};
 }
 
@@ -2866,11 +3557,33 @@ void SessionController::cacheChatTheme(
 	const auto &use = !paper.isNull() ? paper : *i->second.paper;
 	const auto document = use.document();
 	const auto media = document ? document->createMediaView() : nullptr;
+	const auto findGiftSymbols = (data.unique != nullptr);
+	const auto reportSymbolLoaded = [weak = base::make_weak(this)] {
+		// We must notify async here, because we destroy emoji in
+		// the handler and we can't destroy emoji in repaint callback.
+		crl::on_main([weak] {
+			if (const auto strong = weak.get()) {
+				strong->_giftSymbolLoaded.fire({});
+			}
+		});
+	};
+	auto giftSymbol = findGiftSymbols
+		? session().data().customEmojiManager().create(
+			data.unique->pattern.document,
+			reportSymbolLoaded,
+			Data::CustomEmojiSizeTag::Large)
+		: nullptr;
+	const auto giftId = findGiftSymbols
+		? data.unique->model.document->id
+		: uint64();
+	const auto giftSymbolReady = !giftSymbol || giftSymbol->ready();
 	use.loadDocument();
 	auto &theme = [&]() -> CachedTheme& {
 		const auto i = _customChatThemes.find(key);
 		if (i != end(_customChatThemes)) {
 			i->second.media = media;
+			i->second.giftSymbol = std::move(giftSymbol);
+			i->second.giftId = giftId;
 			i->second.paper = use;
 			i->second.basedOnDark = dark;
 			i->second.caching = true;
@@ -2880,6 +3593,8 @@ void SessionController::cacheChatTheme(
 			key,
 			CachedTheme{
 				.media = media,
+				.giftSymbol = std::move(giftSymbol),
+				.giftId = giftId,
 				.paper = use,
 				.basedOnDark = dark,
 				.caching = true,
@@ -2909,6 +3624,9 @@ void SessionController::cacheChatTheme(
 	});
 	if (media && media->loaded(true)) {
 		theme.media = nullptr;
+		if (giftSymbolReady) {
+			theme.giftSymbol = nullptr;
+		}
 	}
 }
 
@@ -2926,16 +3644,26 @@ void SessionController::cacheChatThemeDone(
 	}
 	i->second.caching = false;
 	i->second.theme = result;
-	if (i->second.media) {
-		if (i->second.media->loaded(true)) {
+	const auto media = i->second.media.get();
+	const auto giftSymbol = i->second.giftSymbol.get();
+	if (media || giftSymbol) {
+		if ((!media || media->loaded(true))
+			&& (!giftSymbol || giftSymbol->ready())) {
 			updateCustomThemeBackground(i->second);
 		} else {
-			session().downloaderTaskFinished(
+			rpl::merge(
+				session().downloaderTaskFinished(),
+				((giftSymbol && !giftSymbol->ready())
+					? (_giftSymbolLoaded.events() | rpl::type_erased)
+					: rpl::never<rpl::empty_value>())
 			) | rpl::filter([=] {
 				const auto i = _customChatThemes.find(key);
 				Assert(i != end(_customChatThemes));
-				return !i->second.media || i->second.media->loaded(true);
-			}) | rpl::start_with_next([=] {
+				const auto media = i->second.media.get();
+				const auto giftSymbol = i->second.giftSymbol.get();
+				return (!media || media->loaded(true))
+					&& (!giftSymbol || giftSymbol->ready());
+			}) | rpl::on_next([=] {
 				const auto i = _customChatThemes.find(key);
 				Assert(i != end(_customChatThemes));
 				updateCustomThemeBackground(i->second);
@@ -2949,9 +3677,15 @@ void SessionController::updateCustomThemeBackground(CachedTheme &theme) {
 	const auto guard = gsl::finally([&] {
 		theme.lifetime.destroy();
 		theme.media = nullptr;
+		theme.giftSymbol = nullptr;
 	});
 	const auto strong = theme.theme.lock();
-	if (!theme.media || !strong || !theme.media->loaded(true)) {
+	const auto media = theme.media.get();
+	const auto giftSymbol = theme.giftSymbol.get();
+	if (!strong
+		|| (!media && !giftSymbol)
+		|| (media && !media->loaded(true))
+		|| (giftSymbol && !giftSymbol->ready())) {
 		return;
 	}
 	const auto key = strong->key();
@@ -2992,6 +3726,8 @@ Ui::ChatThemeBackgroundData SessionController::backgroundData(
 		.key = paper.key(),
 		.path = paperPath,
 		.bytes = paperBytes,
+		.giftSymbolFrame = Ui::PrepareGiftSymbol(theme.giftSymbol),
+		.giftId = theme.giftId,
 		.gzipSvg = gzipSvg,
 		.colors = colors,
 		.isPattern = isPattern,
@@ -3026,7 +3762,9 @@ void SessionController::openPeerStory(
 
 void SessionController::openPeerStories(
 		PeerId peerId,
-		std::optional<Data::StorySourcesList> list) {
+		std::optional<Data::StorySourcesList> list,
+		bool onlyLive,
+		bool afterReload) {
 	using namespace Media::View;
 	using namespace Data;
 
@@ -3034,16 +3772,26 @@ void SessionController::openPeerStories(
 	auto &stories = session().data().stories();
 	if (const auto source = stories.source(peerId)) {
 		if (const auto idDates = source->toOpen()) {
+			if (onlyLive && !idDates.videoStream) {
+				showToast(tr::lng_stories_live_finished(tr::now));
+				return;
+			}
 			openPeerStory(
 				source->peer,
 				idDates.id,
 				(list
 					? StoriesContext{ *list }
 					: StoriesContext{ StoriesContextPeer() }));
+		} else if (onlyLive) {
+			showToast(tr::lng_stories_live_finished(tr::now));
+		}
+	} else if (afterReload) {
+		if (onlyLive) {
+			showToast(tr::lng_stories_live_finished(tr::now));
 		}
 	} else if (const auto peer = session().data().peerLoaded(peerId)) {
 		const auto done = crl::guard(&_storyOpenGuard, [=] {
-			openPeerStories(peerId, list);
+			openPeerStories(peerId, list, onlyLive, true);
 		});
 		stories.requestPeerStories(peer, done);
 	}
@@ -3053,6 +3801,11 @@ HistoryView::PaintContext SessionController::preparePaintContext(
 		Ui::ChatPaintContextArgs &&args) {
 	const auto visibleAreaTopLocal = content()->mapFromGlobal(
 		args.visibleAreaPositionGlobal).y();
+	const auto area = QRect(
+		0,
+		args.visibleAreaTop,
+		args.visibleAreaWidth,
+		args.visibleAreaHeight);
 	const auto viewport = QRect(
 		0,
 		args.visibleAreaTop - visibleAreaTopLocal,
@@ -3061,6 +3814,7 @@ HistoryView::PaintContext SessionController::preparePaintContext(
 	return args.theme->preparePaintContext(
 		_chatStyle.get(),
 		viewport,
+		area,
 		args.clip,
 		isGifPausedAtLeastFor(GifPauseReason::Any));
 }
@@ -3112,8 +3866,155 @@ std::shared_ptr<ChatHelpers::Show> SessionController::uiShow() {
 	return _cachedShow;
 }
 
+void SessionController::saveSubsectionTabs(
+		std::unique_ptr<HistoryView::SubsectionTabs> tabs) {
+	_savedSubsectionTabsLifetime.destroy();
+	_savedSubsectionTabs = std::move(tabs);
+	_savedSubsectionTabs->extractToParent(widget());
+	_savedSubsectionTabs->removeRequests() | rpl::on_next([=] {
+		_savedSubsectionTabs = nullptr;
+	}, _savedSubsectionTabsLifetime);
+}
+
+auto SessionController::restoreSubsectionTabsFor(
+	not_null<Ui::RpWidget*> parent,
+	not_null<Data::Thread*> thread)
+-> std::unique_ptr<HistoryView::SubsectionTabs> {
+	if (!_savedSubsectionTabs) {
+		return nullptr;
+	} else if (_savedSubsectionTabs->switchTo(thread, parent)) {
+		_savedSubsectionTabsLifetime.destroy();
+		return base::take(_savedSubsectionTabs);
+	}
+	return nullptr;
+}
+
+void SessionController::dropSubsectionTabs() {
+	_savedSubsectionTabsLifetime.destroy();
+	base::take(_savedSubsectionTabs);
+}
+
+void SessionController::showStarGiftAuction(const QString &slug) {
+	_starGiftAuctionLifetime.destroy();
+
+	const auto requesting = _starGiftAuctionLifetime.make_state<
+		base::has_weak_ptr
+	>();
+	const auto guard = base::make_weak(requesting);
+	const auto weak = base::make_weak(this);
+	session().giftAuctions().resolveSlug(slug, [=](uint64 giftId) {
+		if (!guard || !weak) {
+			return;
+		}
+		_starGiftAuctionLifetime.destroy();
+		if (giftId) {
+			showStarGiftAuction(giftId);
+		}
+	});
+}
+
+void SessionController::showStarGiftAuction(uint64 giftId) {
+	_starGiftAuctionLifetime.destroy();
+	_starGiftAuctionLifetime = Ui::ShowStarGiftAuction(
+		this,
+		nullptr,
+		giftId,
+		[] {},
+		[=] { _starGiftAuctionLifetime.destroy(); });
+}
+
+void SessionController::showCloudPassword(const QString &highlight) {
+	if (!highlight.isEmpty()) {
+		setHighlightControlId(highlight);
+	}
+	session().api().cloudPassword().reload();
+
+	enum class PasswordState {
+		Loading,
+		On,
+		Off,
+		Unconfirmed,
+	};
+	_showCloudPasswordLifetime = rpl::single(
+		PasswordState::Loading
+	) | rpl::then(session().api().cloudPassword().state(
+	) | rpl::map([](const Core::CloudPasswordState &state) {
+		return (!state.unconfirmedPattern.isEmpty())
+			? PasswordState::Unconfirmed
+			: state.hasPassword
+			? PasswordState::On
+			: PasswordState::Off;
+	})) | rpl::distinct_until_changed() | rpl::filter(
+		rpl::mappers::_1 != PasswordState::Loading
+	) | rpl::take(1) | rpl::on_next([=](PasswordState state) {
+		if (state == PasswordState::On) {
+			showSettings(Settings::CloudPasswordInputId());
+		} else if (state == PasswordState::Off) {
+			showSettings(Settings::CloudPasswordStartId());
+		} else if (state == PasswordState::Unconfirmed) {
+			showSettings(Settings::CloudPasswordEmailConfirmId());
+		}
+	});
+}
+
+void SessionController::setHighlightControlId(const QString &id) {
+	_window->setHighlightControlId(id);
+}
+
+QString SessionController::highlightControlId() const {
+	return _window->highlightControlId();
+}
+
+bool SessionController::takeHighlightControlId(const QString &id) {
+	return _window->takeHighlightControlId(id);
+}
+
+void SessionController::checkHighlightControl(
+		const QString &id,
+		QWidget *widget,
+		Settings::HighlightArgs &&args) {
+	_window->checkHighlightControl(id, widget, std::move(args));
+}
+
+void SessionController::checkHighlightControl(
+		const QString &id,
+		QWidget *widget) {
+	_window->checkHighlightControl(id, widget);
+}
+
 SessionController::~SessionController() {
 	resetFakeUnreadWhileOpened();
+	dropSubsectionTabs();
+}
+
+bool CheckAndJumpToNearChatsFilter(
+		not_null<SessionController*> controller,
+		bool isNext,
+		bool jump) {
+	const auto id = controller->activeChatsFilterCurrent();
+	const auto session = &controller->session();
+	const auto list = &session->data().chatsFilters().list();
+	const auto index = int(ranges::find(
+		*list,
+		id,
+		&Data::ChatFilter::id
+	) - begin(*list));
+	if (index == list->size() && id != 0) {
+		return false;
+	}
+	const auto changed = index + (isNext ? 1 : -1);
+	if (changed >= int(list->size()) || changed < 0) {
+		return false;
+	}
+	if (changed > Data::PremiumLimits(session).dialogFiltersCurrent()) {
+		return false;
+	}
+	if (jump) {
+		controller->setActiveChatsFilter((changed >= 0)
+			? (*list)[changed].id()
+			: 0);
+	}
+	return true;
 }
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 3da9eb291085ba..663f53ff32659a 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -16,6 +16,9 @@ For license and copyright information please follow this link:
 #include "settings/settings_type.h"
 #include "window/window_adaptive.h"
 
+#include <QtCore/QDate>
+#include <QtCore/QPointer>
+
 class PhotoData;
 class MainWidget;
 class MainWindow;
@@ -26,9 +29,15 @@ enum class WindowLayout;
 
 namespace Data {
 struct StoriesContext;
+struct DrawToReplyRequest;
+class SavedMessages;
 enum class StorySourcesList : uchar;
 } // namespace Data
 
+namespace Dialogs {
+struct SearchState;
+} // namespace Dialogs
+
 namespace ChatHelpers {
 class TabbedSelector;
 class EmojiInteractions;
@@ -65,38 +74,58 @@ struct ChatThemeBackgroundData;
 class MessageSendingAnimationController;
 struct BoostCounters;
 struct ChatPaintContextArgs;
+struct PreparedList;
+struct PreparedBundle;
 } // namespace Ui
 
+namespace Api {
+struct SendOptions;
+} // namespace Api
+
 namespace Data {
 struct CloudTheme;
 enum class CloudThemeType;
+class PhotoMedia;
 class Thread;
 class Forum;
 class ForumTopic;
+class SavedSublist;
 class WallPaper;
 } // namespace Data
 
+namespace HistoryView {
+class SubsectionTabs;
+} // namespace HistoryView
+
 namespace HistoryView::Reactions {
 class CachedIconFactory;
 } // namespace HistoryView::Reactions
 
+namespace Settings {
+struct HighlightArgs;
+} // namespace Settings
+
 namespace Window {
 
 using GifPauseReason = ChatHelpers::PauseReason;
 using GifPauseReasons = ChatHelpers::PauseReasons;
 
 class SectionMemento;
+class SectionWidget;
 class Controller;
 class FiltersMenu;
 class ChatPreviewManager;
+class ChatSwitchProcess;
 
 struct PeerByLinkInfo;
 struct SeparateId;
 
+extern const char kOptionExternalMediaViewer[];
+
 struct PeerThemeOverride {
 	PeerData *peer = nullptr;
 	std::shared_ptr<Ui::ChatTheme> theme;
-	EmojiPtr emoji = nullptr;
+	QString token;
 };
 bool operator==(const PeerThemeOverride &a, const PeerThemeOverride &b);
 bool operator!=(const PeerThemeOverride &a, const PeerThemeOverride &b);
@@ -115,6 +144,21 @@ class DateClickHandler : public ClickHandler {
 
 };
 
+class ForumThreadClickHandler : public ClickHandler {
+public:
+	explicit ForumThreadClickHandler(not_null<HistoryItem*> item);
+
+	void update(not_null<HistoryItem*> item);
+	void onClick(ClickContext context) const override;
+
+private:
+	[[nodiscard]] base::weak_ptr<Data::Thread> resolveThread(
+		not_null<HistoryItem*> item) const;
+
+	base::weak_ptr<Data::Thread> _thread;
+
+};
+
 struct SectionShow {
 	enum class Way {
 		Forward,
@@ -156,20 +200,28 @@ struct SectionShow {
 		return copy;
 	}
 
-	TextWithEntities highlightPart;
+	MessageHighlightId highlight;
 	int highlightPartOffsetHint = 0;
+	int highlightTodoItemId = 0;
+	std::optional<TimeId> videoTimestamp;
 	Way way = Way::Forward;
 	anim::type animated = anim::type::normal;
 	anim::activation activation = anim::activation::normal;
 	bool thirdColumn = false;
 	bool childColumn = false;
 	bool forbidLayer = false;
+	bool forceTopicsList = false;
+	bool preferCurrentWindow = false;
 	bool reapplyLocalDraft = false;
 	bool dropSameFromStack = false;
+	bool allowDuplicateInStack = false;
+	bool slideFromBottom = false;
 	Origin origin;
 
 };
 
+[[nodiscard]] MessageHighlightId SearchHighlightId(const QString &query);
+
 class SessionController;
 
 class SessionNavigation : public base::has_weak_ptr {
@@ -179,6 +231,8 @@ class SessionNavigation : public base::has_weak_ptr {
 
 	[[nodiscard]] Main::Session &session() const;
 
+	bool showFrozenError();
+
 	virtual void showSection(
 		std::shared_ptr<SectionMemento> memento,
 		const SectionShow &params = SectionShow()) = 0;
@@ -197,6 +251,10 @@ class SessionNavigation : public base::has_weak_ptr {
 		not_null<Data::ForumTopic*> topic,
 		MsgId itemId = 0,
 		const SectionShow &params = SectionShow());
+	void showSublist(
+		not_null<Data::SavedSublist*> sublist,
+		MsgId itemId = 0,
+		const SectionShow &params = SectionShow());
 	void showThread(
 		not_null<Data::Thread*> thread,
 		MsgId itemId = 0,
@@ -247,15 +305,26 @@ class SessionNavigation : public base::has_weak_ptr {
 		FullMsgId contextId,
 		const SectionShow &params = SectionShow());
 
-	void searchInChat(Dialogs::Key inChat);
-	void searchMessages(const QString &query, Dialogs::Key inChat);
+	void searchInChat(Dialogs::Key inChat, PeerData *searchFrom = nullptr);
+	void searchMessages(
+		const QString &query,
+		Dialogs::Key inChat,
+		PeerData *searchFrom = nullptr);
 
-	void resolveBoostState(not_null<ChannelData*> channel);
+	void resolveBoostState(
+		not_null<ChannelData*> channel,
+		int boostsToLift = 0);
 
 	void resolveCollectible(
 		PeerId ownerId,
 		const QString &entity,
 		Fn<void(QString)> fail = nullptr);
+	void resolveConferenceCall(
+		QString slug,
+		FullMsgId contextId);
+	void resolveConferenceCall(
+		MsgId inviteMsgId,
+		FullMsgId contextId);
 
 	base::weak_ptr<Ui::Toast::Instance> showToast(
 		Ui::Toast::Config &&config);
@@ -268,6 +337,9 @@ class SessionNavigation : public base::has_weak_ptr {
 
 	[[nodiscard]] virtual std::shared_ptr<ChatHelpers::Show> uiShow();
 
+protected:
+	void fullInfoLoadedHook(not_null<PeerData*> peer);
+
 private:
 	void resolvePhone(
 		const QString &phone,
@@ -277,10 +349,15 @@ class SessionNavigation : public base::has_weak_ptr {
 		Fn<void(not_null<PeerData*> peer, TextWithEntities draft)> done);
 	void resolveUsername(
 		const QString &username,
-		Fn<void(not_null<PeerData*>)> done);
+		Fn<void(not_null<PeerData*>)> done,
+		const QString &starref = QString());
 	void resolveChannelById(
 		ChannelId channelId,
 		Fn<void(not_null<ChannelData*>)> done);
+	void resolveConferenceCall(
+		QString slug,
+		MsgId inviteMsgId,
+		FullMsgId contextId);
 
 	void resolveDone(
 		const MTPcontacts_ResolvedPeer &result,
@@ -309,16 +386,23 @@ class SessionNavigation : public base::has_weak_ptr {
 	MTP::Sender _api;
 
 	mtpRequestId _resolveRequestId = 0;
+	PeerData *_waitingDirectChannel = nullptr;
 
 	History *_showingRepliesHistory = nullptr;
 	MsgId _showingRepliesRootId = 0;
 	mtpRequestId _showingRepliesRequestId = 0;
 
 	ChannelData *_boostStateResolving = nullptr;
+	int _boostsToLift = 0;
 
 	QString _collectibleEntity;
 	mtpRequestId _collectibleRequestId = 0;
 
+	QString _conferenceCallSlug;
+	MsgId _conferenceCallInviteMsgId;
+	FullMsgId _conferenceCallResolveContextId;
+	mtpRequestId _conferenceCallRequestId = 0;
+
 };
 
 class SessionController : public SessionNavigation {
@@ -334,6 +418,7 @@ class SessionController : public SessionNavigation {
 	[[nodiscard]] SeparateId windowId() const;
 	[[nodiscard]] bool isPrimary() const;
 	[[nodiscard]] not_null<::MainWindow*> widget() const;
+	[[nodiscard]] rpl::producer<> imeCompositionStarts() const;
 	[[nodiscard]] not_null<MainWidget*> content() const;
 	[[nodiscard]] Adaptive &adaptive() const;
 	[[nodiscard]] ChatHelpers::EmojiInteractions &emojiInteractions() const {
@@ -347,7 +432,7 @@ class SessionController : public SessionNavigation {
 	void stickerOrEmojiChosen(FileChosen chosen);
 	[[nodiscard]] rpl::producer<FileChosen> stickerOrEmojiChosen() const;
 
-	QPointer<Ui::BoxContent> show(
+	base::weak_qptr<Ui::BoxContent> show(
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options = Ui::LayerOption::KeepOther,
 		anim::type animated = anim::type::normal);
@@ -368,7 +453,7 @@ class SessionController : public SessionNavigation {
 	void setSearchInChat(Dialogs::Key value) {
 		_searchInChat = value;
 	}
-	bool uniqueChatsInSearchResults() const;
+	bool uniqueChatsInSearchResults(const Dialogs::SearchState &state) const;
 
 	void openFolder(not_null<Data::Folder*> folder);
 	void closeFolder();
@@ -376,7 +461,8 @@ class SessionController : public SessionNavigation {
 
 	void showForum(
 		not_null<Data::Forum*> forum,
-		const SectionShow &params = SectionShow::Way::ClearStack);
+		const SectionShow &params = SectionShow::Way::ClearStack,
+		MsgId showAtMsgId = ShowAtUnreadMsgId);
 	void closeForum();
 	const rpl::variable<Data::Forum*> &shownForum() const;
 
@@ -390,8 +476,10 @@ class SessionController : public SessionNavigation {
 	rpl::producer<Dialogs::Key> activeChatValue() const;
 	bool jumpToChatListEntry(Dialogs::RowDescriptor row);
 
-	void setCurrentDialogsEntryState(Dialogs::EntryState state);
-	[[nodiscard]] Dialogs::EntryState currentDialogsEntryState() const;
+	void setDialogsEntryState(Dialogs::EntryState state);
+	[[nodiscard]] Dialogs::EntryState dialogsEntryStateCurrent() const;
+	[[nodiscard]] auto dialogsEntryStateValue() const
+		-> rpl::producer<Dialogs::EntryState>;
 	bool switchInlineQuery(
 		Dialogs::EntryState to,
 		not_null<UserData*> bot,
@@ -471,10 +559,19 @@ class SessionController : public SessionNavigation {
 	}
 	void removeLayerBlackout();
 	[[nodiscard]] bool isLayerShown() const;
-
-	void showCalendar(
-		Dialogs::Key chat,
-		QDate requestedDate);
+	[[nodiscard]] rpl::producer<bool> boxShownValue() const;
+	void registerActiveLayerSection(SectionWidget *section);
+	void unregisterActiveLayerSection(SectionWidget *section);
+	[[nodiscard]] SectionWidget *activeLayerSection() const;
+
+	struct ShowCalendarDescriptor {
+		Dialogs::Key chat;
+		QDate date;
+		bool mediaPhoto = false;
+		bool mediaVideo = false;
+		Fn<void(FullMsgId, Fn<void()>)> customJump;
+	};
+	void showCalendar(ShowCalendarDescriptor &&descriptor);
 
 	void showAddContact();
 	void showNewGroup();
@@ -486,6 +583,8 @@ class SessionController : public SessionNavigation {
 	struct MessageContext {
 		FullMsgId id;
 		MsgId topicRootId;
+		PeerId monoforumPeerId;
+		bool showDrawButton = false;
 	};
 	void openPhoto(
 		not_null<PhotoData*> photo,
@@ -496,7 +595,8 @@ class SessionController : public SessionNavigation {
 		not_null<DocumentData*> document,
 		bool showInMediaView,
 		MessageContext message,
-		const Data::StoriesContext *stories = nullptr);
+		const Data::StoriesContext *stories = nullptr,
+		std::optional<TimeId> videoTimestampOverride = {});
 	bool openSharedStory(HistoryItem *item);
 	bool openFakeItemStory(
 		FullMsgId fakeItemId,
@@ -514,7 +614,7 @@ class SessionController : public SessionNavigation {
 
 	void toggleChooseChatTheme(
 		not_null<PeerData*> peer,
-		std::optional<bool> show = std::nullopt) const;
+		std::optional<bool> show = std::nullopt);
 	void finishChatThemeEdit(not_null<PeerData*> peer);
 
 	[[nodiscard]] bool mainSectionShown() const {
@@ -543,6 +643,8 @@ class SessionController : public SessionNavigation {
 	}
 
 	[[nodiscard]] int filtersWidth() const;
+	[[nodiscard]] bool enoughSpaceForFilters() const;
+	[[nodiscard]] rpl::producer<bool> enoughSpaceForFiltersValue() const;
 	[[nodiscard]] rpl::producer<FilterId> activeChatsFilter() const;
 	[[nodiscard]] FilterId activeChatsFilterCurrent() const;
 	void setActiveChatsFilter(
@@ -573,7 +675,7 @@ class SessionController : public SessionNavigation {
 	void overridePeerTheme(
 		not_null<PeerData*> peer,
 		std::shared_ptr<Ui::ChatTheme> theme,
-		EmojiPtr emoji);
+		QString token);
 	void clearPeerThemeOverride(not_null<PeerData*> peer);
 	[[nodiscard]] auto peerThemeOverrideValue() const
 		-> rpl::producer<PeerThemeOverride> {
@@ -586,7 +688,9 @@ class SessionController : public SessionNavigation {
 		Data::StoriesContext context);
 	void openPeerStories(
 		PeerId peerId,
-		std::optional<Data::StorySourcesList> list = std::nullopt);
+		std::optional<Data::StorySourcesList> list = std::nullopt,
+		bool onlyLive = false,
+		bool afterReload = false);
 
 	[[nodiscard]] Ui::ChatPaintContext preparePaintContext(
 		Ui::ChatPaintContextArgs &&args);
@@ -617,6 +721,28 @@ class SessionController : public SessionNavigation {
 
 	[[nodiscard]] std::shared_ptr<ChatHelpers::Show> uiShow() override;
 
+	void saveSubsectionTabs(
+		std::unique_ptr<HistoryView::SubsectionTabs> tabs);
+	[[nodiscard]] auto restoreSubsectionTabsFor(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Data::Thread*> thread)
+		-> std::unique_ptr<HistoryView::SubsectionTabs>;
+	void dropSubsectionTabs();
+
+	void showStarGiftAuction(const QString &slug);
+	void showStarGiftAuction(uint64 giftId);
+
+	void showCloudPassword(const QString &highlightId = QString());
+
+	void setHighlightControlId(const QString &id);
+	[[nodiscard]] QString highlightControlId() const;
+	[[nodiscard]] bool takeHighlightControlId(const QString &id);
+	void checkHighlightControl(
+		const QString &id,
+		QWidget *widget,
+		Settings::HighlightArgs &&args);
+	void checkHighlightControl(const QString &id, QWidget *widget);
+
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
@@ -627,7 +753,6 @@ class SessionController : public SessionNavigation {
 
 	void init();
 	void setupShortcuts();
-	void refreshFiltersMenu();
 	void checkOpenedFilter();
 	void suggestArchiveAndMute();
 	void activateFirstChatsFilter();
@@ -670,7 +795,24 @@ class SessionController : public SessionNavigation {
 	bool openFolderInDifferentWindow(not_null<Data::Folder*> folder);
 	bool showForumInDifferentWindow(
 		not_null<Data::Forum*> forum,
-		const SectionShow &params);
+		const SectionShow &params,
+		MsgId showAtMsgId);
+
+	[[nodiscard]] bool openPhotoExternal(
+		not_null<PhotoData*> photo,
+		Data::FileOrigin origin);
+	void handleDrawToReplyRequest(Data::DrawToReplyRequest request);
+	[[nodiscard]] Data::Thread *resolveDrawToReplyThread(
+		const Data::DrawToReplyRequest &request) const;
+	void showDrawToReplyFilesBox(
+		not_null<Data::Thread*> thread,
+		FullMsgId replyTo,
+		Ui::PreparedList &&list);
+	void sendDrawToReplyFiles(
+		not_null<Data::Thread*> thread,
+		FullMsgId replyTo,
+		std::shared_ptr<Ui::PreparedBundle> bundle,
+		Api::SendOptions options);
 
 	const not_null<Controller*> _window;
 	const std::unique_ptr<ChatHelpers::EmojiInteractions> _emojiInteractions;
@@ -703,7 +845,7 @@ class SessionController : public SessionNavigation {
 	int _chatEntryHistoryPosition = -1;
 	bool _filtersActivated = false;
 
-	Dialogs::EntryState _currentDialogsEntryState;
+	rpl::variable<Dialogs::EntryState> _dialogsEntryState;
 
 	base::Timer _invitePeekTimer;
 
@@ -712,6 +854,7 @@ class SessionController : public SessionNavigation {
 	rpl::variable<int> _connectingBottomSkip;
 
 	rpl::event_stream<ChatHelpers::FileChosen> _stickerOrEmojiChosen;
+	QPointer<SectionWidget> _activeLayerSection;
 
 	PeerData *_showEditPeer = nullptr;
 	rpl::variable<Data::Folder*> _openedFolder;
@@ -723,14 +866,29 @@ class SessionController : public SessionNavigation {
 	const std::shared_ptr<Ui::ChatTheme> _defaultChatTheme;
 	base::flat_map<CachedThemeKey, CachedTheme> _customChatThemes;
 	rpl::event_stream<std::shared_ptr<Ui::ChatTheme>> _cachedThemesStream;
+	rpl::event_stream<> _giftSymbolLoaded;
 	const std::unique_ptr<Ui::ChatStyle> _chatStyle;
 	std::weak_ptr<Ui::ChatTheme> _chatStyleTheme;
 	std::deque<std::shared_ptr<Ui::ChatTheme>> _lastUsedCustomChatThemes;
 	rpl::variable<PeerThemeOverride> _peerThemeOverride;
 
+	std::unique_ptr<ChatSwitchProcess> _chatSwitchProcess;
+
+	DocumentId _pendingOpenDocumentId = 0;
+	struct PendingOpenPhoto {
+		PhotoData *data = nullptr;
+		std::shared_ptr<Data::PhotoMedia> media;
+		QString filepath;
+	} _pendingOpenPhoto;
+
 	base::has_weak_ptr _storyOpenGuard;
 
 	QString _premiumRef;
+	std::unique_ptr<HistoryView::SubsectionTabs> _savedSubsectionTabs;
+	rpl::lifetime _savedSubsectionTabsLifetime;
+
+	rpl::lifetime _starGiftAuctionLifetime;
+	rpl::lifetime _showCloudPasswordLifetime;
 
 	rpl::lifetime _lifetime;
 
@@ -745,4 +903,9 @@ void ActivateWindow(not_null<SessionController*> controller);
 	not_null<SessionController*> controller,
 	GifPauseReason level);
 
+bool CheckAndJumpToNearChatsFilter(
+	not_null<SessionController*> controller,
+	bool isNext,
+	bool jump);
+
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_session_controller_link_info.h b/Telegram/SourceFiles/window/window_session_controller_link_info.h
index d64d82c5359a7c..a07a28508f9eb0 100644
--- a/Telegram/SourceFiles/window/window_session_controller_link_info.h
+++ b/Telegram/SourceFiles/window/window_session_controller_link_info.h
@@ -19,9 +19,11 @@ enum class ResolveType {
 	BotStart,
 	AddToGroup,
 	AddToChannel,
+	HashtagSearch,
 	ShareGame,
 	Mention,
 	Boost,
+	ChannelDirect,
 	Profile,
 };
 
@@ -38,16 +40,22 @@ struct PeerByLinkInfo {
 	QString phone;
 	QString chatLinkSlug;
 	MsgId messageId = ShowAtUnreadMsgId;
-	StoryId storyId = 0;
+	QByteArray pollOption;
+	QString storyParam;
+	int storyAlbumId = 0;
+	int giftCollectionId = 0;
+	std::optional<TimeId> videoTimestamp;
 	QString text;
 	RepliesByLinkInfo repliesInfo;
 	ResolveType resolveType = ResolveType::Default;
+	QString referral;
 	QString startToken;
 	ChatAdminRights startAdminRights;
 	bool startAutoSubmit = false;
 	bool joinChannel = false;
 	QString botAppName;
 	bool botAppForceConfirmation = false;
+	bool botAppFullScreen = false;
 	QString attachBotUsername;
 	std::optional<QString> attachBotToggleCommand;
 	bool attachBotMainOpen = false;
@@ -56,6 +64,7 @@ struct PeerByLinkInfo {
 	std::optional<QString> voicechatHash;
 	FullMsgId clickFromMessageId;
 	std::shared_ptr<InlineBots::WebViewContext> clickFromBotWebviewContext;
+	bool historyInNewWindow = false;
 };
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_setup_email.cpp b/Telegram/SourceFiles/window/window_setup_email.cpp
new file mode 100644
index 00000000000000..48b71a1258a44c
--- /dev/null
+++ b/Telegram/SourceFiles/window/window_setup_email.cpp
@@ -0,0 +1,664 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "window/window_setup_email.h"
+
+#include "api/api_cloud_password.h"
+#include "apiwrap.h"
+#include "base/call_delayed.h"
+#include "base/event_filter.h"
+#include "core/application.h"
+#include "data/components/promo_suggestions.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "intro/intro_code_input.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_account.h"
+#include "main/main_domain.h"
+#include "main/main_session.h"
+#include "settings/settings_common.h"
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/menu/menu_action.h"
+#include "ui/widgets/sent_code_field.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_controller.h"
+#include "window/window_slide_animation.h"
+#include "styles/style_boxes.h"
+#include "styles/style_info.h"
+#include "styles/style_intro.h"
+#include "styles/style_layers.h"
+#include "styles/style_settings.h"
+#include "styles/style_window.h"
+
+namespace Window {
+namespace {
+
+[[nodiscard]] Settings::LottieIcon CreateEmailIcon(
+		not_null<Ui::VerticalLayout*> container) {
+	return Settings::CreateLottieIcon(
+		container,
+		{
+			.name = u"cloud_password/email"_q,
+			.sizeOverride = st::normalBoxLottieSize,
+		},
+		{});
+}
+
+} // namespace
+
+SetupEmailLockWidget::SetupEmailLockWidget(
+	QWidget *parent,
+	not_null<Controller*> window)
+: LockWidget(parent, window)
+, _layout(this)
+, _confirmWidget(nullptr) {
+	const auto session = window->maybeSession();
+	const auto state = session
+		? session->promoSuggestions().setupEmailState()
+		: Data::SetupEmailState::Setup;
+
+	const auto noSkip = state == Data::SetupEmailState::SetupNoSkip;
+	const auto accountsCount = session
+		? session->domain().accountsAuthedCount()
+		: 0;
+
+	if (!window->isPrimary()) {
+	// if (state == Data::SetupEmailState::SettingUp
+	// 	|| state == Data::SetupEmailState::SettingUpNoSkip) {
+		auto icon = CreateEmailIcon(_layout);
+		_iconAnimate = std::move(icon.animate);
+		_layout->add(std::move(icon.widget));
+		base::call_delayed(st::slideDuration, crl::guard(this, [=] {
+			if (_iconAnimate) {
+				_iconAnimate(anim::repeat::once);
+			}
+		}));
+
+		Ui::AddSkip(_layout);
+		Ui::AddSkip(_layout);
+		Ui::AddSkip(_layout);
+
+		_layout->add(
+			object_ptr<Ui::FlatLabel>(
+				_layout,
+				tr::lng_settings_cloud_login_email_title(),
+				st::lockSetupEmailTitle),
+			st::boxRowPadding,
+			style::al_top);
+
+		Ui::AddSkip(_layout);
+		Ui::AddSkip(_layout);
+
+		_layout->add(
+			object_ptr<Ui::FlatLabel>(
+				_layout,
+				tr::lng_settings_cloud_login_email_busy(),
+				st::lockSetupEmailLabel),
+			st::boxRowPadding,
+			style::al_top);
+	} else {
+		if (!noSkip) {
+			_backButton = object_ptr<Ui::IconButton>(
+				this,
+				st::introBackButton);
+			if (session) {
+				session->promoSuggestions().setSetupEmailState(
+					Data::SetupEmailState::SettingUp);
+				_backButton->setClickedCallback([=] {
+					session->promoSuggestions().dismissSetupEmail([=] {
+					});
+				});
+			}
+		} else if (accountsCount <= 1) {
+			_logoutButton = object_ptr<Ui::RoundButton>(
+				this,
+				tr::lng_settings_logout(),
+				st::defaultBoxButton);
+			if (session) {
+				session->promoSuggestions().setSetupEmailState(
+					Data::SetupEmailState::SettingUpNoSkip);
+				_logoutButton->setClickedCallback([=] {
+					window->showLogoutConfirmation();
+				});
+			}
+		} else {
+			_backButton = object_ptr<Ui::IconButton>(
+				this,
+				st::introBackButton);
+			if (session) {
+				_backButton->setClickedCallback([=] {
+					showAccountsMenu();
+				});
+			}
+		}
+
+#ifdef _DEBUG
+		if (session->isTestMode()) {
+			_debugButton = object_ptr<Ui::RoundButton>(
+				this,
+				rpl::single(u"[DEBUG] Clear bio"_q),
+				st::defaultBoxButton);
+			_debugButton->setClickedCallback([=] {
+				session->api().saveSelfBio({});
+			});
+		}
+#endif
+
+		auto icon = CreateEmailIcon(_layout);
+		_iconAnimate = std::move(icon.animate);
+		_layout->add(std::move(icon.widget));
+		base::call_delayed(st::slideDuration, crl::guard(this, [=] {
+			if (_iconAnimate) {
+				_iconAnimate(anim::repeat::once);
+			}
+		}));
+
+		Ui::AddSkip(_layout);
+		Ui::AddSkip(_layout);
+		Ui::AddSkip(_layout);
+
+		_layout->add(
+			object_ptr<Ui::FlatLabel>(
+				_layout,
+				tr::lng_settings_cloud_login_email_title(),
+				st::lockSetupEmailTitle),
+			st::boxRowPadding,
+			style::al_top);
+
+		Ui::AddSkip(_layout);
+		Ui::AddSkip(_layout);
+
+		_layout->add(
+			object_ptr<Ui::FlatLabel>(
+				_layout,
+				tr::lng_settings_cloud_login_email_about(),
+				st::lockSetupEmailLabel),
+			st::boxRowPadding,
+			style::al_top);
+
+		Ui::AddSkip(_layout);
+		Ui::AddSkip(_layout);
+		Ui::AddSkip(_layout);
+		Ui::AddSkip(_layout);
+
+		auto emailInput = _layout->add(
+			object_ptr<Ui::InputField>(
+				_layout,
+				st::settingLocalPasscodeInputField,
+				tr::lng_settings_cloud_login_email_placeholder()),
+			st::boxRowPadding,
+			style::al_top);
+
+		Ui::AddSkip(_layout);
+		Ui::AddSkip(_layout);
+
+		auto errorLabel = _layout->add(
+			object_ptr<Ui::FlatLabel>(
+				_layout,
+				QString(),
+				st::lockSetupEmailLabel),
+			{},
+			style::al_top);
+		errorLabel->setTextColorOverride(st::boxTextFgError->c);
+		errorLabel->hide();
+
+		Ui::AddSkip(_layout);
+		Ui::AddSkip(_layout);
+		Ui::AddSkip(_layout);
+		Ui::AddSkip(_layout);
+
+		auto submit = _layout->add(
+			object_ptr<Ui::RoundButton>(
+				_layout,
+				tr::lng_settings_cloud_login_email_confirm(),
+				st::changePhoneButton),
+			st::boxRowPadding,
+			style::al_top);
+
+		_emailInput = emailInput;
+		_errorLabel = errorLabel;
+		_submit = submit;
+
+		submit->setClickedCallback([=] { this->submit(); });
+
+		emailInput->changes() | rpl::on_next([=] {
+			_error = QString();
+			errorLabel->hide();
+		}, emailInput->lifetime());
+
+		emailInput->submits() | rpl::on_next([=] {
+			this->submit();
+		}, emailInput->lifetime());
+	}
+}
+
+void SetupEmailLockWidget::paintContent(QPainter &p) {
+	if (_backAnimation) {
+		_backAnimation->paintContents(p);
+		return;
+	}
+
+	LockWidget::paintContent(p);
+}
+
+void SetupEmailLockWidget::submit() {
+	if (!_emailInput) {
+		return;
+	}
+	const auto email = _emailInput->getLastText().trimmed();
+	if (email.isEmpty()) {
+		_emailInput->setFocus();
+		_emailInput->showError();
+		return;
+	}
+
+	if (!email.contains('@') || !email.contains('.')) {
+		_error = tr::lng_cloud_password_bad_email(tr::now);
+		_errorLabel->setText(_error);
+		_errorLabel->show();
+		_emailInput->setFocus();
+		_emailInput->showError();
+		_emailInput->selectAll();
+		return;
+	}
+
+	const auto session = window()->maybeSession();
+	if (!session) {
+		showConfirmWidget(email, 6, QString());
+		return;
+	}
+
+	_api.emplace(&session->mtp());
+	const auto done = crl::guard(this, [=](
+			int length,
+			const QString &pattern) {
+		_api.reset();
+		showConfirmWidget(email, length, pattern);
+	});
+	const auto fail = crl::guard(this, [=](const QString &type) {
+		_api.reset();
+		if (MTP::IsFloodError(type)) {
+			_error = tr::lng_flood_error(tr::now);
+		} else if (type == u"EMAIL_INVALID"_q) {
+			_error = tr::lng_cloud_password_bad_email(tr::now);
+		} else {
+			_error = tr::lng_cloud_password_bad_email(tr::now);
+		}
+		_errorLabel->setText(_error);
+		_errorLabel->show();
+		_emailInput->setFocus();
+		_emailInput->showError();
+		_emailInput->selectAll();
+	});
+	Api::RequestLoginEmailCode(*_api, email, done, fail);
+}
+
+void SetupEmailLockWidget::showConfirmWidget(
+		const QString &email,
+		int codeLength,
+		const QString &emailPattern) {
+	_layout->hide();
+	auto oldContentCache = grabContent();
+
+	_confirmWidget = Ui::CreateChild<SetupEmailConfirmWidget>(
+		this,
+		window(),
+		email,
+		codeLength,
+		emailPattern);
+	_confirmWidget->resize(size());
+	_confirmWidget->show();
+	_confirmWidget->showAnimated(std::move(oldContentCache));
+	_confirmWidget->setFocus();
+
+	_confirmWidget->backRequests(
+	) | rpl::on_next([=] {
+		showEmailInput();
+	}, _confirmWidget->lifetime());
+
+	_confirmWidget->confirmations(
+	) | rpl::on_next([=, controller = window()] {
+		if (const auto session = controller->maybeSession()) {
+			session->promoSuggestions().setSetupEmailState(
+				Data::SetupEmailState::None);
+		}
+	}, _confirmWidget->lifetime());
+}
+
+void SetupEmailLockWidget::showEmailInput() {
+	if (!_confirmWidget) {
+		return;
+	}
+
+	auto oldContentCache = Ui::GrabWidget(_confirmWidget);
+	_confirmWidget->hide();
+	_confirmWidget->deleteLater();
+	_confirmWidget = nullptr;
+
+	if (_logoutButton) {
+		_logoutButton->show();
+	}
+	_layout->show();
+	auto newContentCache = grabContent();
+	if (_logoutButton) {
+		_logoutButton->hide();
+	}
+	_layout->hide();
+
+	_backAnimation = std::make_unique<SlideAnimation>();
+	_backAnimation->setDirection(SlideDirection::FromLeft);
+	_backAnimation->setRepaintCallback([=] { update(); });
+	_backAnimation->setFinishedCallback([=] {
+		_layout->show();
+		if (_logoutButton) {
+			_logoutButton->show();
+		}
+		_backAnimation.reset();
+		if (_iconAnimate) {
+			_iconAnimate(anim::repeat::once);
+		}
+	});
+	_backAnimation->setPixmaps(
+		std::move(oldContentCache),
+		std::move(newContentCache));
+	_backAnimation->start();
+
+	if (_emailInput) {
+		_emailInput->setFocus();
+	}
+}
+
+QPixmap SetupEmailLockWidget::grabContent() {
+	return Ui::GrabWidget(this);
+}
+
+void SetupEmailLockWidget::resizeEvent(QResizeEvent *e) {
+	const auto layoutWidth = std::min(
+		width(),
+		st::lockSetupEmailLabelMaxWidth);
+	_layout->resizeToWidth(layoutWidth);
+	_layout->moveToLeft(
+		(width() - layoutWidth) / 2,
+		st::infoLayerTopBarHeight);
+
+	if (_backButton) {
+		_backButton->moveToLeft(0, 0);
+	}
+
+	if (_logoutButton) {
+		_logoutButton->move(st::lockSetupEmailLogOutPosition);
+	}
+
+	if (_debugButton) {
+		_debugButton->moveToLeft(
+			st::lockSetupEmailLogOutPosition.x(),
+			height() - _debugButton->height()
+				- st::lockSetupEmailLogOutPosition.y());
+	}
+
+	if (_confirmWidget) {
+		_confirmWidget->resize(size());
+	}
+}
+
+void SetupEmailLockWidget::setInnerFocus() {
+	LockWidget::setInnerFocus();
+	if (_confirmWidget && _confirmWidget->isVisible()) {
+		_confirmWidget->setFocus();
+	} else if (_emailInput) {
+		_emailInput->setFocus();
+	}
+}
+
+SetupEmailConfirmWidget::SetupEmailConfirmWidget(
+	QWidget *parent,
+	not_null<Controller*> window,
+	const QString &email,
+	int codeLength,
+	const QString &emailPattern)
+: Ui::RpWidget(parent)
+, _window(window)
+, _email(email)
+, _emailPattern(emailPattern)
+, _backButton(this, st::introBackButton)
+, _layout(this) {
+	auto icon = CreateEmailIcon(_layout);
+	_iconAnimate = std::move(icon.animate);
+	_layout->add(std::move(icon.widget));
+
+	Ui::AddSkip(_layout);
+	Ui::AddSkip(_layout);
+	Ui::AddSkip(_layout);
+
+	_layout->add(
+		object_ptr<Ui::FlatLabel>(
+			_layout,
+			tr::lng_settings_cloud_login_email_code_title(),
+			st::lockSetupEmailTitle),
+		st::boxRowPadding,
+		style::al_top);
+
+	Ui::AddSkip(_layout);
+	Ui::AddSkip(_layout);
+
+	_layout->add(
+		object_ptr<Ui::FlatLabel>(
+			_layout,
+			tr::lng_settings_cloud_login_email_code_about(
+				tr::now,
+				lt_email,
+				_emailPattern.isEmpty() ? _email : _emailPattern),
+			st::lockSetupEmailLabel),
+		st::boxRowPadding,
+		style::al_top);
+
+	Ui::AddSkip(_layout);
+	Ui::AddSkip(_layout);
+	Ui::AddSkip(_layout);
+	Ui::AddSkip(_layout);
+
+	auto codeInput = _layout->add(
+		object_ptr<Ui::CodeInput>(_layout),
+		style::al_top);
+	codeInput->setDigitsCountMax(codeLength > 0 ? codeLength : 6);
+
+	Ui::AddSkip(_layout);
+	Ui::AddSkip(_layout);
+
+	auto errorLabel = _layout->add(
+		object_ptr<Ui::FlatLabel>(
+			_layout,
+			QString(),
+			st::lockSetupEmailLabel),
+		st::boxRowPadding,
+		style::al_top);
+	errorLabel->setTextColorOverride(st::boxTextFgError->c);
+	errorLabel->hide();
+
+	_codeInput = codeInput;
+	_errorLabel = errorLabel;
+
+	_backButton->clicks(
+	) | rpl::to_empty | rpl::start_to_stream(_backRequests, lifetime());
+
+	base::install_event_filter(codeInput, [=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::KeyPress) {
+			const auto k = static_cast<QKeyEvent*>(e.get());
+			if (k->key() == Qt::Key_Escape) {
+				_backRequests.fire({});
+				return base::EventFilterResult::Cancel;
+			}
+		}
+		return base::EventFilterResult::Continue;
+	});
+
+	codeInput->codeCollected(
+	) | rpl::on_next([=](const QString &code) {
+		verifyCode(code);
+	}, codeInput->lifetime());
+}
+
+rpl::producer<> SetupEmailConfirmWidget::backRequests() const {
+	return _backRequests.events();
+}
+
+rpl::producer<> SetupEmailConfirmWidget::confirmations() const {
+	return _confirmations.events();
+}
+
+void SetupEmailConfirmWidget::paintEvent(QPaintEvent *e) {
+	auto p = Painter(this);
+
+	if (_showAnimation) {
+		_showAnimation->paintContents(p);
+		return;
+	}
+
+	p.fillRect(rect(), st::windowBg);
+}
+
+void SetupEmailConfirmWidget::showAnimated(QPixmap oldContentCache) {
+	_showAnimation = nullptr;
+
+	showChildren();
+	auto newContentCache = Ui::GrabWidget(this);
+	hideChildren();
+
+	_showAnimation = std::make_unique<SlideAnimation>();
+	_showAnimation->setDirection(SlideDirection::FromRight);
+	_showAnimation->setRepaintCallback([=] { update(); });
+	_showAnimation->setFinishedCallback([=] {
+		showChildren();
+		_showAnimation.reset();
+		if (_iconAnimate) {
+			_iconAnimate(anim::repeat::once);
+		}
+		if (_codeInput) {
+			_codeInput->setFocus();
+		}
+	});
+	_showAnimation->setPixmaps(
+		std::move(oldContentCache),
+		std::move(newContentCache));
+	_showAnimation->start();
+}
+
+void SetupEmailConfirmWidget::resizeEvent(QResizeEvent *e) {
+	const auto layoutWidth = std::min(
+		width(),
+		st::lockSetupEmailLabelMaxWidth);
+	_layout->resizeToWidth(layoutWidth);
+	_layout->move((width() - layoutWidth) / 2, st::infoLayerTopBarHeight);
+	_backButton->move(0, 0);
+}
+
+void SetupEmailConfirmWidget::keyPressEvent(QKeyEvent *e) {
+	if (e->key() == Qt::Key_Escape) {
+		_backRequests.fire({});
+		return;
+	}
+	Ui::RpWidget::keyPressEvent(e);
+}
+
+void SetupEmailConfirmWidget::verifyCode(const QString &code) {
+	const auto session = _window->maybeSession();
+	if (!session) {
+		_confirmations.fire({});
+		return;
+	}
+
+	_api.emplace(&session->mtp());
+	const auto done = crl::guard(this, [=] {
+#ifdef _DEBUG
+		if (session->isTestMode()) {
+			session->api().saveSelfBio({});
+		}
+#endif
+		_window->uiShow()->showToast(
+			tr::lng_settings_cloud_login_email_set_success(tr::now));
+		_api.reset();
+		_confirmations.fire({});
+	});
+	const auto fail = crl::guard(this, [=](const QString &type) {
+		_api.reset();
+		if (type.isEmpty()) {
+			_confirmations.fire({});
+			return;
+		}
+		if (MTP::IsFloodError(type)) {
+			_error = tr::lng_flood_error(tr::now);
+		} else if (type == u"EMAIL_NOT_ALLOWED"_q) {
+			_error = tr::lng_settings_error_email_not_alowed(tr::now);
+		} else if (type == u"CODE_INVALID"_q) {
+			_error = tr::lng_signin_wrong_code(tr::now);
+		} else if (type == u"CODE_EXPIRED"_q
+			|| type == u"EMAIL_HASH_EXPIRED"_q) {
+			_error = Lang::Hard::EmailConfirmationExpired();
+		} else {
+			_error = Lang::Hard::ServerError();
+		}
+		_errorLabel->setText(_error);
+		_errorLabel->show();
+		_codeInput->setFocus();
+		_codeInput->showError();
+	});
+	Api::VerifyLoginEmail(*_api, code, done, fail);
+}
+
+void SetupEmailLockWidget::showAccountsMenu() {
+	const auto session = window()->maybeSession();
+	if (!session) {
+		return;
+	}
+
+	const auto &st = st::popupMenuWithIcons;
+
+	_accountsMenu = base::make_unique_q<Ui::PopupMenu>(this, st);
+	const auto accounts = session->domain().orderedAccounts();
+
+	for (const auto &account : accounts) {
+		if (!account->sessionExists()) {
+			continue;
+		}
+		const auto user = account->session().user();
+		if (user == session->user()) {
+			continue;
+		}
+		const auto action = new QAction(user->name(), _accountsMenu);
+		QObject::connect(action, &QAction::triggered, [=] {
+			Core::App().domain().maybeActivate(account);
+		});
+		auto owned = base::make_unique_q<Ui::Menu::Action>(
+			_accountsMenu->menu(),
+			_accountsMenu->menu()->st(),
+			action,
+			nullptr,
+			nullptr);
+		const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+			owned.get(),
+			user,
+			st::lockSetupEmailUserpicSmall);
+		userpic->move(st.menu.itemIconPosition);
+		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+		_accountsMenu->addAction(std::move(owned));
+	}
+
+	_accountsMenu->setForcedOrigin(Ui::PanelAnimation::Origin::TopLeft);
+	_accountsMenu->popup(_backButton
+		? mapToGlobal(QPoint(_backButton->x(), _backButton->height()))
+		: QCursor::pos());
+}
+
+} // namespace Window
diff --git a/Telegram/SourceFiles/window/window_setup_email.h b/Telegram/SourceFiles/window/window_setup_email.h
new file mode 100644
index 00000000000000..4dbde05f6dce99
--- /dev/null
+++ b/Telegram/SourceFiles/window/window_setup_email.h
@@ -0,0 +1,106 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "mtproto/sender.h"
+#include "window/window_lock_widgets.h"
+
+namespace Ui {
+class InputField;
+class CodeInput;
+class RoundButton;
+class IconButton;
+class FlatLabel;
+class VerticalLayout;
+} // namespace Ui
+
+namespace Window {
+
+class SlideAnimation;
+
+class SetupEmailConfirmWidget : public Ui::RpWidget {
+
+public:
+	SetupEmailConfirmWidget(
+		QWidget *parent,
+		not_null<Controller*> window,
+		const QString &email,
+		int codeLength,
+		const QString &emailPattern);
+
+	rpl::producer<> backRequests() const;
+	rpl::producer<> confirmations() const;
+
+	void showAnimated(QPixmap oldContentCache);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+	void keyPressEvent(QKeyEvent *e) override;
+
+private:
+	void verifyCode(const QString &code);
+
+	not_null<Controller*> _window;
+	QString _email;
+	QString _emailPattern;
+	QString _error;
+	rpl::lifetime _requestLifetime;
+	std::optional<::MTP::Sender> _api;
+	object_ptr<Ui::IconButton> _backButton;
+	object_ptr<Ui::VerticalLayout> _layout;
+	Ui::CodeInput *_codeInput = nullptr;
+	Ui::FlatLabel *_errorLabel = nullptr;
+
+	rpl::event_stream<> _backRequests;
+	rpl::event_stream<> _confirmations;
+
+	std::unique_ptr<SlideAnimation> _showAnimation;
+	Fn<void(anim::repeat)> _iconAnimate;
+
+};
+
+class SetupEmailLockWidget : public LockWidget {
+public:
+	SetupEmailLockWidget(QWidget *parent, not_null<Controller*> window);
+
+	void setInnerFocus() override;
+
+protected:
+	void resizeEvent(QResizeEvent *e) override;
+
+private:
+	void paintContent(QPainter &p) override;
+	void submit();
+	void showConfirmWidget(
+		const QString &email,
+		int codeLength,
+		const QString &emailPattern);
+	void showEmailInput();
+	void showAccountsMenu();
+	QPixmap grabContent();
+
+	object_ptr<Ui::VerticalLayout> _layout;
+	SetupEmailConfirmWidget *_confirmWidget;
+	rpl::lifetime _requestLifetime;
+	std::optional<::MTP::Sender> _api;
+	object_ptr<Ui::IconButton> _backButton = { nullptr };
+	object_ptr<Ui::RoundButton> _logoutButton = { nullptr };
+	object_ptr<Ui::RoundButton> _debugButton = { nullptr };
+	base::unique_qptr<Ui::PopupMenu> _accountsMenu;
+	Ui::InputField *_emailInput = nullptr;
+	Ui::RoundButton *_submit = nullptr;
+	Ui::FlatLabel *_errorLabel = nullptr;
+	QString _error;
+
+	std::unique_ptr<SlideAnimation> _backAnimation;
+	Fn<void(anim::repeat)> _iconAnimate;
+
+};
+
+} // namespace Window
diff --git a/Telegram/SourceFiles/window/window_slide_animation.cpp b/Telegram/SourceFiles/window/window_slide_animation.cpp
index 54a843559dd603..0b394ee0db07d6 100644
--- a/Telegram/SourceFiles/window/window_slide_animation.cpp
+++ b/Telegram/SourceFiles/window/window_slide_animation.cpp
@@ -101,6 +101,17 @@ void SlideAnimation::paintContents(QPainter &p) const {
 				rightWidth * retina,
 				_cacheOver.height() - _topSkip * retina);
 		}
+	} else if (_direction == SlideDirection::FromBottom) {
+		const auto height = _cacheOver.height() / retina;
+		const auto offset = anim::interpolate(0, height, progress);
+		p.drawPixmap(
+			QRect(QPoint(0, -offset), _cacheUnder.size() / retina),
+			_cacheUnder,
+			QRect(QPoint(), _cacheUnder.size()));
+		p.drawPixmap(
+			QRect(QPoint(0, height - offset), _cacheOver.size() / retina),
+			_cacheOver,
+			QRect(QPoint(), _cacheOver.size()));
 	} else {
 		const auto coordUnder = anim::interpolate(
 			0,
@@ -188,17 +199,26 @@ void SlideAnimation::start() {
 	if (fromLeft) {
 		std::swap(_cacheUnder, _cacheOver);
 	}
+	const auto fromBottom = (_direction == SlideDirection::FromBottom);
+	const auto curve = fromBottom ? anim::easeOutQuint : transition();
+	const auto duration = fromBottom
+		? (st::slideDuration * 2)
+		: st::slideDuration;
 	_animation.start(
 		[this] { animationCallback(); },
 		fromLeft ? 1. : 0.,
 		fromLeft ? 0. : 1.,
-		st::slideDuration,
-		transition());
-	_repaintCallback();
+		duration,
+		curve);
+	if (const auto onstack = _repaintCallback) {
+		onstack();
+	}
 }
 
 void SlideAnimation::animationCallback() {
-	_repaintCallback();
+	if (const auto onstack = _repaintCallback) {
+		onstack();
+	}
 	if (!_animation.animating()) {
 		if (const auto onstack = _finishedCallback) {
 			onstack();
diff --git a/Telegram/SourceFiles/window/window_slide_animation.h b/Telegram/SourceFiles/window/window_slide_animation.h
index ae9661719fdce4..8931aa40781220 100644
--- a/Telegram/SourceFiles/window/window_slide_animation.h
+++ b/Telegram/SourceFiles/window/window_slide_animation.h
@@ -14,6 +14,7 @@ namespace Window {
 enum class SlideDirection {
 	FromRight,
 	FromLeft,
+	FromBottom,
 };
 
 class SlideAnimation {
diff --git a/Telegram/SourceFiles/window/window_top_bar_wrap.h b/Telegram/SourceFiles/window/window_top_bar_wrap.h
index be19dac1ce719a..8c4239e9cf9e95 100644
--- a/Telegram/SourceFiles/window/window_top_bar_wrap.h
+++ b/Telegram/SourceFiles/window/window_top_bar_wrap.h
@@ -22,13 +22,13 @@ class TopBarWrapWidget : public Ui::SlideWrap<Inner> {
 		rpl::producer<bool> oneColumnValue)
 	: Parent(parent, std::move(inner)) {
 		this->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
+		) | rpl::on_next([=](const QSize &size) {
 			updateShadowGeometry(size);
 		}, this->lifetime());
 
 		std::move(
 			oneColumnValue
-		) | rpl::start_with_next([=](bool oneColumn) {
+		) | rpl::on_next([=](bool oneColumn) {
 			_isOneColumn = oneColumn;
 		}, this->lifetime());
 	}
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 72913e85e2edd5..a30fb5ac6e6944 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -42,6 +42,21 @@
 			</array>
 		</dict>
 	</array>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeName</key>
+			<string>Any File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSHandlerRank</key>
+			<string>Alternate</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>public.data</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>@desktop_app_version_string@</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/Contents.json b/Telegram/Telegram/Images.xcassets/Icon.appiconset/Contents.json
similarity index 100%
rename from Telegram/Telegram/Images.xcassets/AppIcon.appiconset/Contents.json
rename to Telegram/Telegram/Images.xcassets/Icon.appiconset/Contents.json
diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128.png b/Telegram/Telegram/Images.xcassets/Icon.appiconset/icon128.png
similarity index 100%
rename from Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128.png
rename to Telegram/Telegram/Images.xcassets/Icon.appiconset/icon128.png
diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128@2x.png b/Telegram/Telegram/Images.xcassets/Icon.appiconset/icon128@2x.png
similarity index 100%
rename from Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128@2x.png
rename to Telegram/Telegram/Images.xcassets/Icon.appiconset/icon128@2x.png
diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16.png b/Telegram/Telegram/Images.xcassets/Icon.appiconset/icon16.png
similarity index 100%
rename from Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16.png
rename to Telegram/Telegram/Images.xcassets/Icon.appiconset/icon16.png
diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16@2x.png b/Telegram/Telegram/Images.xcassets/Icon.appiconset/icon16@2x.png
similarity index 100%
rename from Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16@2x.png
rename to Telegram/Telegram/Images.xcassets/Icon.appiconset/icon16@2x.png
diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256.png b/Telegram/Telegram/Images.xcassets/Icon.appiconset/icon256.png
similarity index 100%
rename from Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256.png
rename to Telegram/Telegram/Images.xcassets/Icon.appiconset/icon256.png
diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256@2x.png b/Telegram/Telegram/Images.xcassets/Icon.appiconset/icon256@2x.png
similarity index 100%
rename from Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256@2x.png
rename to Telegram/Telegram/Images.xcassets/Icon.appiconset/icon256@2x.png
diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32.png b/Telegram/Telegram/Images.xcassets/Icon.appiconset/icon32.png
similarity index 100%
rename from Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32.png
rename to Telegram/Telegram/Images.xcassets/Icon.appiconset/icon32.png
diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32@2x.png b/Telegram/Telegram/Images.xcassets/Icon.appiconset/icon32@2x.png
similarity index 100%
rename from Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32@2x.png
rename to Telegram/Telegram/Images.xcassets/Icon.appiconset/icon32@2x.png
diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512.png b/Telegram/Telegram/Images.xcassets/Icon.appiconset/icon512.png
similarity index 100%
rename from Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512.png
rename to Telegram/Telegram/Images.xcassets/Icon.appiconset/icon512.png
diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512@2x.png b/Telegram/Telegram/Images.xcassets/Icon.appiconset/icon512@2x.png
similarity index 100%
rename from Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512@2x.png
rename to Telegram/Telegram/Images.xcassets/Icon.appiconset/icon512@2x.png
diff --git a/Telegram/ThirdParty/GSL b/Telegram/ThirdParty/GSL
index 09938e870420b6..87f9d768866548 160000
--- a/Telegram/ThirdParty/GSL
+++ b/Telegram/ThirdParty/GSL
@@ -1 +1 @@
-Subproject commit 09938e870420b69a01f55c755207c871bc20b4e5
+Subproject commit 87f9d768866548b5b86e72be66c60c5abd4d9b37
diff --git a/Telegram/ThirdParty/MicroTeX b/Telegram/ThirdParty/MicroTeX
new file mode 160000
index 00000000000000..55b801cb475fa9
--- /dev/null
+++ b/Telegram/ThirdParty/MicroTeX
@@ -0,0 +1 @@
+Subproject commit 55b801cb475fa9c3b623761ac6fcbb6f4c2d61e8
diff --git a/Telegram/ThirdParty/TooManyCooks b/Telegram/ThirdParty/TooManyCooks
new file mode 160000
index 00000000000000..d63f8785a1f1d1
--- /dev/null
+++ b/Telegram/ThirdParty/TooManyCooks
@@ -0,0 +1 @@
+Subproject commit d63f8785a1f1d170b3416708906fcfc42d006e91
diff --git a/Telegram/ThirdParty/cmark-gfm b/Telegram/ThirdParty/cmark-gfm
new file mode 160000
index 00000000000000..587a12bb54d95a
--- /dev/null
+++ b/Telegram/ThirdParty/cmark-gfm
@@ -0,0 +1 @@
+Subproject commit 587a12bb54d95ac37241377e6ddc93ea0e45439b
diff --git a/Telegram/ThirdParty/dispatch b/Telegram/ThirdParty/dispatch
deleted file mode 160000
index 542b7f32311680..00000000000000
--- a/Telegram/ThirdParty/dispatch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 542b7f32311680b11b6fc8fcb2576955460ba7da
diff --git a/Telegram/ThirdParty/jemalloc b/Telegram/ThirdParty/jemalloc
deleted file mode 160000
index 54eaed1d8b56b1..00000000000000
--- a/Telegram/ThirdParty/jemalloc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 54eaed1d8b56b1aa528be3bdd1877e59c56fa90c
diff --git a/Telegram/ThirdParty/kimageformats b/Telegram/ThirdParty/kimageformats
index 106279d32ec4b9..df82311a1081e5 160000
--- a/Telegram/ThirdParty/kimageformats
+++ b/Telegram/ThirdParty/kimageformats
@@ -1 +1 @@
-Subproject commit 106279d32ec4b93ccf5e29a92616e0f0cc8d2382
+Subproject commit df82311a1081e576c4ac020204578bb8a81b21ec
diff --git a/Telegram/ThirdParty/libtgvoip b/Telegram/ThirdParty/libtgvoip
deleted file mode 160000
index 2d2592860478e6..00000000000000
--- a/Telegram/ThirdParty/libtgvoip
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2d2592860478e60d972b96e67ee034b8a71bb57a
diff --git a/Telegram/ThirdParty/minizip/crypt.h b/Telegram/ThirdParty/minizip/crypt.h
deleted file mode 100644
index f4b93b78dc31cc..00000000000000
--- a/Telegram/ThirdParty/minizip/crypt.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* crypt.h -- base code for crypt/uncrypt ZIPfile
-
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   This code is a modified version of crypting code in Infozip distribution
-
-   The encryption/decryption parts of this source code (as opposed to the
-   non-echoing password parts) were originally written in Europe.  The
-   whole source package can be freely distributed, including from the USA.
-   (Prior to January 2000, re-export from the US was a violation of US law.)
-
-   This encryption code is a direct transcription of the algorithm from
-   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-   file (appnote.txt) is distributed with the PKZIP program (even in the
-   version without encryption capabilities).
-
-   If you don't need crypting in your application, just define symbols
-   NOCRYPT and NOUNCRYPT.
-
-   This code support the "Traditional PKWARE Encryption".
-
-   The new AES encryption added on Zip format by Winzip (see the page
-   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
-   Encryption is not supported.
-*/
-
-#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
-
-/***********************************************************************
- * Return the next byte in the pseudo-random sequence
- */
-static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab) {
-    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
-                     * unpredictable manner on 16-bit systems; not a problem
-                     * with any known compiler so far, though */
-
-    (void)pcrc_32_tab;
-    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
-    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
-}
-
-/***********************************************************************
- * Update the encryption keys with the next byte of plain text
- */
-static int update_keys(unsigned long* pkeys, const z_crc_t* pcrc_32_tab, int c) {
-    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
-    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
-    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
-    {
-      register int keyshift = (int)((*(pkeys+1)) >> 24);
-      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
-    }
-    return c;
-}
-
-
-/***********************************************************************
- * Initialize the encryption keys and the random header according to
- * the given password.
- */
-static void init_keys(const char* passwd, unsigned long* pkeys, const z_crc_t* pcrc_32_tab) {
-    *(pkeys+0) = 305419896L;
-    *(pkeys+1) = 591751049L;
-    *(pkeys+2) = 878082192L;
-    while (*passwd != '\0') {
-        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
-        passwd++;
-    }
-}
-
-#define zdecode(pkeys,pcrc_32_tab,c) \
-    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
-
-#define zencode(pkeys,pcrc_32_tab,c,t) \
-    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), (Byte)t^(c))
-
-#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-
-#define RAND_HEAD_LEN  12
-   /* "last resort" source for second part of crypt seed pattern */
-#  ifndef ZCR_SEED2
-#    define ZCR_SEED2 3141592654UL      /* use PI as default pattern */
-#  endif
-
-static unsigned crypthead(const char* passwd,       /* password string */
-                          unsigned char* buf,       /* where to write header */
-                          int bufSize,
-                          unsigned long* pkeys,
-                          const z_crc_t* pcrc_32_tab,
-                          unsigned long crcForCrypting) {
-    unsigned n;                  /* index in random header */
-    int t;                       /* temporary */
-    int c;                       /* random byte */
-    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
-    static unsigned calls = 0;   /* ensure different random header each time */
-
-    if (bufSize<RAND_HEAD_LEN)
-      return 0;
-
-    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
-     * output of rand() to get less predictability, since rand() is
-     * often poorly implemented.
-     */
-    if (++calls == 1)
-    {
-        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
-    }
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        c = (rand() >> 7) & 0xff;
-        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
-    }
-    /* Encrypt random header (last two bytes is high word of crc) */
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
-    }
-    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
-    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
-    return n;
-}
-
-#endif
diff --git a/Telegram/ThirdParty/minizip/ioapi.c b/Telegram/ThirdParty/minizip/ioapi.c
deleted file mode 100644
index 782d32469ae5d5..00000000000000
--- a/Telegram/ThirdParty/minizip/ioapi.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-*/
-
-#if defined(_WIN32) && (!(defined(_CRT_SECURE_NO_WARNINGS)))
-        #define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64)
-// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
-#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
-#define FTELLO_FUNC(stream) ftello(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
-#else
-#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
-#define FTELLO_FUNC(stream) ftello64(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
-#endif
-
-
-#include "ioapi.h"
-
-voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc, const void*filename, int mode) {
-    if (pfilefunc->zfile_func64.zopen64_file != NULL)
-        return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
-    else
-    {
-        return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
-    }
-}
-
-long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin) {
-    if (pfilefunc->zfile_func64.zseek64_file != NULL)
-        return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
-    else
-    {
-        uLong offsetTruncated = (uLong)offset;
-        if (offsetTruncated != offset)
-            return -1;
-        else
-            return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
-    }
-}
-
-ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc, voidpf filestream) {
-    if (pfilefunc->zfile_func64.zseek64_file != NULL)
-        return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
-    else
-    {
-        uLong tell_uLong = (uLong)(*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
-        if ((tell_uLong) == MAXU32)
-            return (ZPOS64_T)-1;
-        else
-            return tell_uLong;
-    }
-}
-
-void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32, const zlib_filefunc_def* p_filefunc32) {
-    p_filefunc64_32->zfile_func64.zopen64_file = NULL;
-    p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
-    p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
-    p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
-    p_filefunc64_32->zfile_func64.ztell64_file = NULL;
-    p_filefunc64_32->zfile_func64.zseek64_file = NULL;
-    p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
-    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
-    p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
-    p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
-    p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
-}
-
-
-
-static voidpf ZCALLBACK fopen_file_func(voidpf opaque, const char* filename, int mode) {
-    FILE* file = NULL;
-    const char* mode_fopen = NULL;
-    (void)opaque;
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
-        mode_fopen = "rb";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-        mode_fopen = "r+b";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-        mode_fopen = "wb";
-
-    if ((filename!=NULL) && (mode_fopen != NULL))
-        file = fopen(filename, mode_fopen);
-    return file;
-}
-
-static voidpf ZCALLBACK fopen64_file_func(voidpf opaque, const void* filename, int mode) {
-    FILE* file = NULL;
-    const char* mode_fopen = NULL;
-    (void)opaque;
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
-        mode_fopen = "rb";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-        mode_fopen = "r+b";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-        mode_fopen = "wb";
-
-    if ((filename!=NULL) && (mode_fopen != NULL))
-        file = FOPEN_FUNC((const char*)filename, mode_fopen);
-    return file;
-}
-
-
-static uLong ZCALLBACK fread_file_func(voidpf opaque, voidpf stream, void* buf, uLong size) {
-    uLong ret;
-    (void)opaque;
-    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
-}
-
-static uLong ZCALLBACK fwrite_file_func(voidpf opaque, voidpf stream, const void* buf, uLong size) {
-    uLong ret;
-    (void)opaque;
-    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
-}
-
-static long ZCALLBACK ftell_file_func(voidpf opaque, voidpf stream) {
-    long ret;
-    (void)opaque;
-    ret = ftell((FILE *)stream);
-    return ret;
-}
-
-
-static ZPOS64_T ZCALLBACK ftell64_file_func(voidpf opaque, voidpf stream) {
-    ZPOS64_T ret;
-    (void)opaque;
-    ret = (ZPOS64_T)FTELLO_FUNC((FILE *)stream);
-    return ret;
-}
-
-static long ZCALLBACK fseek_file_func(voidpf opaque, voidpf stream, uLong offset, int origin) {
-    int fseek_origin=0;
-    long ret;
-    (void)opaque;
-    switch (origin)
-    {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        fseek_origin = SEEK_CUR;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        fseek_origin = SEEK_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        fseek_origin = SEEK_SET;
-        break;
-    default: return -1;
-    }
-    ret = 0;
-    if (fseek((FILE *)stream, (long)offset, fseek_origin) != 0)
-        ret = -1;
-    return ret;
-}
-
-static long ZCALLBACK fseek64_file_func(voidpf opaque, voidpf stream, ZPOS64_T offset, int origin) {
-    int fseek_origin=0;
-    long ret;
-    (void)opaque;
-    switch (origin)
-    {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        fseek_origin = SEEK_CUR;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        fseek_origin = SEEK_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        fseek_origin = SEEK_SET;
-        break;
-    default: return -1;
-    }
-    ret = 0;
-
-    if(FSEEKO_FUNC((FILE *)stream, (z_off64_t)offset, fseek_origin) != 0)
-                        ret = -1;
-
-    return ret;
-}
-
-
-static int ZCALLBACK fclose_file_func(voidpf opaque, voidpf stream) {
-    int ret;
-    (void)opaque;
-    ret = fclose((FILE *)stream);
-    return ret;
-}
-
-static int ZCALLBACK ferror_file_func(voidpf opaque, voidpf stream) {
-    int ret;
-    (void)opaque;
-    ret = ferror((FILE *)stream);
-    return ret;
-}
-
-void fill_fopen_filefunc(zlib_filefunc_def* pzlib_filefunc_def) {
-    pzlib_filefunc_def->zopen_file = fopen_file_func;
-    pzlib_filefunc_def->zread_file = fread_file_func;
-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
-    pzlib_filefunc_def->ztell_file = ftell_file_func;
-    pzlib_filefunc_def->zseek_file = fseek_file_func;
-    pzlib_filefunc_def->zclose_file = fclose_file_func;
-    pzlib_filefunc_def->zerror_file = ferror_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
-void fill_fopen64_filefunc(zlib_filefunc64_def* pzlib_filefunc_def) {
-    pzlib_filefunc_def->zopen64_file = fopen64_file_func;
-    pzlib_filefunc_def->zread_file = fread_file_func;
-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
-    pzlib_filefunc_def->ztell64_file = ftell64_file_func;
-    pzlib_filefunc_def->zseek64_file = fseek64_file_func;
-    pzlib_filefunc_def->zclose_file = fclose_file_func;
-    pzlib_filefunc_def->zerror_file = ferror_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
diff --git a/Telegram/ThirdParty/minizip/ioapi.h b/Telegram/ThirdParty/minizip/ioapi.h
deleted file mode 100644
index a2d2e6e60d9250..00000000000000
--- a/Telegram/ThirdParty/minizip/ioapi.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-         Changes
-
-    Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
-    Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
-               More if/def section may be needed to support other platforms
-    Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
-                          (but you should use iowin32.c for windows instead)
-
-*/
-
-#ifndef _ZLIBIOAPI64_H
-#define _ZLIBIOAPI64_H
-
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
-
-  // Linux needs this to support file operation on files larger then 4+GB
-  // But might need better if/def to select just the platforms that needs them.
-
-        #ifndef __USE_FILE_OFFSET64
-                #define __USE_FILE_OFFSET64
-        #endif
-        #ifndef __USE_LARGEFILE64
-                #define __USE_LARGEFILE64
-        #endif
-        #ifndef _LARGEFILE64_SOURCE
-                #define _LARGEFILE64_SOURCE
-        #endif
-        #ifndef _FILE_OFFSET_BIT
-                #define _FILE_OFFSET_BIT 64
-        #endif
-
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "zlib.h"
-
-#if defined(USE_FILE32API)
-#define fopen64 fopen
-#define ftello64 ftell
-#define fseeko64 fseek
-#else
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__HAIKU__) || defined(MINIZIP_FOPEN_NO_64)
-#define fopen64 fopen
-#define ftello64 ftello
-#define fseeko64 fseeko
-#endif
-#ifdef _MSC_VER
- #define fopen64 fopen
- #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
-  #define ftello64 _ftelli64
-  #define fseeko64 _fseeki64
- #else // old MSC
-  #define ftello64 ftell
-  #define fseeko64 fseek
- #endif
-#endif
-#endif
-
-/*
-#ifndef ZPOS64_T
-  #ifdef _WIN32
-                #define ZPOS64_T fpos_t
-  #else
-    #include <stdint.h>
-    #define ZPOS64_T uint64_t
-  #endif
-#endif
-*/
-
-#ifdef HAVE_MINIZIP64_CONF_H
-#include "mz64conf.h"
-#endif
-
-/* a type chosen by DEFINE */
-#ifdef HAVE_64BIT_INT_CUSTOM
-typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
-#else
-#ifdef HAS_STDINT_H
-#include "stdint.h"
-typedef uint64_t ZPOS64_T;
-#else
-
-
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-typedef unsigned __int64 ZPOS64_T;
-#else
-typedef unsigned long long int ZPOS64_T;
-#endif
-#endif
-#endif
-
-/* Maximum unsigned 32-bit value used as placeholder for zip64 */
-#ifndef MAXU32
-#define MAXU32 (0xffffffff)
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define ZLIB_FILEFUNC_SEEK_CUR (1)
-#define ZLIB_FILEFUNC_SEEK_END (2)
-#define ZLIB_FILEFUNC_SEEK_SET (0)
-
-#define ZLIB_FILEFUNC_MODE_READ      (1)
-#define ZLIB_FILEFUNC_MODE_WRITE     (2)
-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
-
-#define ZLIB_FILEFUNC_MODE_EXISTING (4)
-#define ZLIB_FILEFUNC_MODE_CREATE   (8)
-
-
-#ifndef ZCALLBACK
- #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-   #define ZCALLBACK CALLBACK
- #else
-   #define ZCALLBACK
- #endif
-#endif
-
-
-
-
-typedef voidpf   (ZCALLBACK *open_file_func)      (voidpf opaque, const char* filename, int mode);
-typedef uLong    (ZCALLBACK *read_file_func)      (voidpf opaque, voidpf stream, void* buf, uLong size);
-typedef uLong    (ZCALLBACK *write_file_func)     (voidpf opaque, voidpf stream, const void* buf, uLong size);
-typedef int      (ZCALLBACK *close_file_func)     (voidpf opaque, voidpf stream);
-typedef int      (ZCALLBACK *testerror_file_func) (voidpf opaque, voidpf stream);
-
-typedef long     (ZCALLBACK *tell_file_func)      (voidpf opaque, voidpf stream);
-typedef long     (ZCALLBACK *seek_file_func)      (voidpf opaque, voidpf stream, uLong offset, int origin);
-
-
-/* here is the "old" 32 bits structure */
-typedef struct zlib_filefunc_def_s
-{
-    open_file_func      zopen_file;
-    read_file_func      zread_file;
-    write_file_func     zwrite_file;
-    tell_file_func      ztell_file;
-    seek_file_func      zseek_file;
-    close_file_func     zclose_file;
-    testerror_file_func zerror_file;
-    voidpf              opaque;
-} zlib_filefunc_def;
-
-typedef ZPOS64_T (ZCALLBACK *tell64_file_func)    (voidpf opaque, voidpf stream);
-typedef long     (ZCALLBACK *seek64_file_func)    (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin);
-typedef voidpf   (ZCALLBACK *open64_file_func)    (voidpf opaque, const void* filename, int mode);
-
-typedef struct zlib_filefunc64_def_s
-{
-    open64_file_func    zopen64_file;
-    read_file_func      zread_file;
-    write_file_func     zwrite_file;
-    tell64_file_func    ztell64_file;
-    seek64_file_func    zseek64_file;
-    close_file_func     zclose_file;
-    testerror_file_func zerror_file;
-    voidpf              opaque;
-} zlib_filefunc64_def;
-
-void fill_fopen64_filefunc(zlib_filefunc64_def* pzlib_filefunc_def);
-void fill_fopen_filefunc(zlib_filefunc_def* pzlib_filefunc_def);
-
-/* now internal definition, only for zip.c and unzip.h */
-typedef struct zlib_filefunc64_32_def_s
-{
-    zlib_filefunc64_def zfile_func64;
-    open_file_func      zopen32_file;
-    tell_file_func      ztell32_file;
-    seek_file_func      zseek32_file;
-} zlib_filefunc64_32_def;
-
-
-#define ZREAD64(filefunc,filestream,buf,size)     ((*((filefunc).zfile_func64.zread_file))   ((filefunc).zfile_func64.opaque,filestream,buf,size))
-#define ZWRITE64(filefunc,filestream,buf,size)    ((*((filefunc).zfile_func64.zwrite_file))  ((filefunc).zfile_func64.opaque,filestream,buf,size))
-//#define ZTELL64(filefunc,filestream)            ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
-//#define ZSEEK64(filefunc,filestream,pos,mode)   ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
-#define ZCLOSE64(filefunc,filestream)             ((*((filefunc).zfile_func64.zclose_file))  ((filefunc).zfile_func64.opaque,filestream))
-#define ZERROR64(filefunc,filestream)             ((*((filefunc).zfile_func64.zerror_file))  ((filefunc).zfile_func64.opaque,filestream))
-
-voidpf call_zopen64(const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode);
-long call_zseek64(const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin);
-ZPOS64_T call_ztell64(const zlib_filefunc64_32_def* pfilefunc,voidpf filestream);
-
-void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
-
-#define ZOPEN64(filefunc,filename,mode)         (call_zopen64((&(filefunc)),(filename),(mode)))
-#define ZTELL64(filefunc,filestream)            (call_ztell64((&(filefunc)),(filestream)))
-#define ZSEEK64(filefunc,filestream,pos,mode)   (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Telegram/ThirdParty/minizip/unzip.c b/Telegram/ThirdParty/minizip/unzip.c
deleted file mode 100644
index ed763f89f1f87d..00000000000000
--- a/Telegram/ThirdParty/minizip/unzip.c
+++ /dev/null
@@ -1,1985 +0,0 @@
-/* unzip.c -- IO for uncompress .zip files using zlib
-   Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications of Unzip for Zip64
-         Copyright (C) 2007-2008 Even Rouault
-
-         Modifications for Zip64 support on both zip and unzip
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-
-  ------------------------------------------------------------------------------------
-  Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
-  compatibility with older software. The following is from the original crypt.c.
-  Code woven in by Terry Thorsen 1/2003.
-
-  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
-
-  See the accompanying file LICENSE, version 2000-Apr-09 or later
-  (the contents of which are also included in zip.h) for terms of use.
-  If, for some reason, all these files are missing, the Info-ZIP license
-  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
-
-        crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
-
-  The encryption/decryption parts of this source code (as opposed to the
-  non-echoing password parts) were originally written in Europe.  The
-  whole source package can be freely distributed, including from the USA.
-  (Prior to January 2000, re-export from the US was a violation of US law.)
-
-        This encryption code is a direct transcription of the algorithm from
-  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-  file (appnote.txt) is distributed with the PKZIP program (even in the
-  version without encryption capabilities).
-
-        ------------------------------------------------------------------------------------
-
-        Changes in unzip.c
-
-        2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
-  2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz*
-  2007-2008 - Even Rouault - Remove old C style function prototypes
-  2007-2008 - Even Rouault - Add unzip support for ZIP64
-
-        Copyright (C) 2007-2008 Even Rouault
-
-
-  Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
-  Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
-                                should only read the compressed/uncompressed size from the Zip64 format if
-                                the size from normal header was 0xFFFFFFFF
-  Oct-2009 - Mathias Svensson - Applied some bug fixes from patches received from Gilles Vollant
-  Oct-2009 - Mathias Svensson - Applied support to unzip files with compression method BZIP2 (bzip2 lib is required)
-                                Patch created by Daniel Borca
-
-  Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
-
-  Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
-
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef NOUNCRYPT
-        #define NOUNCRYPT
-#endif
-
-#include "zlib.h"
-#include "unzip.h"
-
-#ifdef STDC
-#  include <stddef.h>
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include <errno.h>
-#endif
-
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-
-#ifndef CASESENSITIVITYDEFAULT_NO
-#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
-#    define CASESENSITIVITYDEFAULT_NO
-#  endif
-#endif
-
-
-#ifndef UNZ_BUFSIZE
-#define UNZ_BUFSIZE (16384)
-#endif
-
-#ifndef UNZ_MAXFILENAMEINZIP
-#define UNZ_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-
-
-const char unz_copyright[] =
-   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
-typedef struct unz_file_info64_internal_s
-{
-    ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
-} unz_file_info64_internal;
-
-
-/* file_in_zip_read_info_s contain internal information about a file in zipfile,
-    when reading and decompress it */
-typedef struct
-{
-    char  *read_buffer;         /* internal buffer for compressed data */
-    z_stream stream;            /* zLib stream structure for inflate */
-
-#ifdef HAVE_BZIP2
-    bz_stream bstream;          /* bzLib stream structure for bziped */
-#endif
-
-    ZPOS64_T pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
-    uLong stream_initialised;   /* flag set if stream structure is initialised*/
-
-    ZPOS64_T offset_local_extrafield;/* offset of the local extra field */
-    uInt  size_local_extrafield;/* size of the local extra field */
-    ZPOS64_T pos_local_extrafield;   /* position in the local extra field in read*/
-    ZPOS64_T total_out_64;
-
-    uLong crc32;                /* crc32 of all data uncompressed */
-    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
-    ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */
-    ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/
-    zlib_filefunc64_32_def z_filefunc;
-    voidpf filestream;        /* io structure of the zipfile */
-    uLong compression_method;   /* compression method (0==store) */
-    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    int   raw;
-} file_in_zip64_read_info_s;
-
-
-/* unz64_s contain internal information about the zipfile
-*/
-typedef struct
-{
-    zlib_filefunc64_32_def z_filefunc;
-    int is64bitOpenFunction;
-    voidpf filestream;        /* io structure of the zipfile */
-    unz_global_info64 gi;       /* public global information */
-    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    ZPOS64_T num_file;             /* number of the current file in the zipfile*/
-    ZPOS64_T pos_in_central_dir;   /* pos of the current file in the central dir*/
-    ZPOS64_T current_file_ok;      /* flag about the usability of the current file*/
-    ZPOS64_T central_pos;          /* position of the beginning of the central dir*/
-
-    ZPOS64_T size_central_dir;     /* size of the central directory  */
-    ZPOS64_T offset_central_dir;   /* offset of start of central directory with
-                                   respect to the starting disk number */
-
-    unz_file_info64 cur_file_info; /* public info about the current file in zip*/
-    unz_file_info64_internal cur_file_info_internal; /* private info about it*/
-    file_in_zip64_read_info_s* pfile_in_zip_read; /* structure about the current
-                                        file if we are decompressing it */
-    int encrypted;
-
-    int isZip64;
-
-#    ifndef NOUNCRYPT
-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const z_crc_t* pcrc_32_tab;
-#    endif
-} unz64_s;
-
-
-#ifndef NOUNCRYPT
-#include "crypt.h"
-#endif
-
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets
-*/
-
-local int unz64local_getShort(const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                              voidpf filestream,
-                              uLong *pX) {
-    unsigned char c[2];
-    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,c,2);
-    if (err==2)
-    {
-        *pX = c[0] | ((uLong)c[1] << 8);
-        return UNZ_OK;
-    }
-    else
-    {
-        *pX = 0;
-        if (ZERROR64(*pzlib_filefunc_def,filestream))
-            return UNZ_ERRNO;
-        else
-            return UNZ_EOF;
-    }
-}
-
-local int unz64local_getLong(const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                             voidpf filestream,
-                             uLong *pX) {
-    unsigned char c[4];
-    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,c,4);
-    if (err==4)
-    {
-        *pX = c[0] | ((uLong)c[1] << 8) | ((uLong)c[2] << 16) | ((uLong)c[3] << 24);
-        return UNZ_OK;
-    }
-    else
-    {
-        *pX = 0;
-        if (ZERROR64(*pzlib_filefunc_def,filestream))
-            return UNZ_ERRNO;
-        else
-            return UNZ_EOF;
-    }
-}
-
-
-local int unz64local_getLong64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                               voidpf filestream,
-                               ZPOS64_T *pX) {
-    unsigned char c[8];
-    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,c,8);
-    if (err==8)
-    {
-        *pX = c[0] | ((ZPOS64_T)c[1] << 8) | ((ZPOS64_T)c[2] << 16) | ((ZPOS64_T)c[3] << 24)
-            | ((ZPOS64_T)c[4] << 32) | ((ZPOS64_T)c[5] << 40) | ((ZPOS64_T)c[6] << 48) | ((ZPOS64_T)c[7] << 56);
-        return UNZ_OK;
-    }
-    else
-    {
-        *pX = 0;
-        if (ZERROR64(*pzlib_filefunc_def,filestream))
-            return UNZ_ERRNO;
-        else
-            return UNZ_EOF;
-    }
-}
-
-/* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal(const char* fileName1, const char* fileName2) {
-    for (;;)
-    {
-        char c1=*(fileName1++);
-        char c2=*(fileName2++);
-        if ((c1>='a') && (c1<='z'))
-            c1 -= 0x20;
-        if ((c2>='a') && (c2<='z'))
-            c2 -= 0x20;
-        if (c1=='\0')
-            return ((c2=='\0') ? 0 : -1);
-        if (c2=='\0')
-            return 1;
-        if (c1<c2)
-            return -1;
-        if (c1>c2)
-            return 1;
-    }
-}
-
-
-#ifdef  CASESENSITIVITYDEFAULT_NO
-#define CASESENSITIVITYDEFAULTVALUE 2
-#else
-#define CASESENSITIVITYDEFAULTVALUE 1
-#endif
-
-#ifndef STRCMPCASENOSENTIVEFUNCTION
-#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
-#endif
-
-/*
-   Compare two filenames (fileName1,fileName2).
-   If iCaseSensitivity = 1, comparison is case sensitive (like strcmp)
-   If iCaseSensitivity = 2, comparison is not case sensitive (like strcmpi
-                                                                or strcasecmp)
-   If iCaseSensitivity = 0, case sensitivity is default of your operating system
-        (like 1 on Unix, 2 on Windows)
-
-*/
-extern int ZEXPORT unzStringFileNameCompare (const char*  fileName1,
-                                             const char*  fileName2,
-                                             int iCaseSensitivity) {
-    if (iCaseSensitivity==0)
-        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
-
-    if (iCaseSensitivity==1)
-        return strcmp(fileName1,fileName2);
-
-    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-
-#ifndef CENTRALDIRINVALID
-#define CENTRALDIRINVALID ((ZPOS64_T)(-1))
-#endif
-
-/*
-  Locate the Central directory of a zipfile (at the end, just before
-    the global comment)
-*/
-local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream) {
-    unsigned char* buf;
-    ZPOS64_T uSizeFile;
-    ZPOS64_T uBackRead;
-    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-    ZPOS64_T uPosFound=CENTRALDIRINVALID;
-
-    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return CENTRALDIRINVALID;
-
-
-    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
-    if (uMaxBack>uSizeFile)
-        uMaxBack = uSizeFile;
-
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-    if (buf==NULL)
-        return CENTRALDIRINVALID;
-
-    uBackRead = 4;
-    while (uBackRead<uMaxBack)
-    {
-        uLong uReadSize;
-        ZPOS64_T uReadPos ;
-        int i;
-        if (uBackRead+BUFREADCOMMENT>uMaxBack)
-            uBackRead = uMaxBack;
-        else
-            uBackRead+=BUFREADCOMMENT;
-        uReadPos = uSizeFile-uBackRead ;
-
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
-        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            break;
-
-        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-            break;
-
-        for (i=(int)uReadSize-3; (i--)>0;)
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-            {
-                uPosFound = uReadPos+(unsigned)i;
-                break;
-            }
-
-        if (uPosFound!=CENTRALDIRINVALID)
-            break;
-    }
-    free(buf);
-    return uPosFound;
-}
-
-
-/*
-  Locate the Central directory 64 of a zipfile (at the end, just before
-    the global comment)
-*/
-local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                                             voidpf filestream) {
-    unsigned char* buf;
-    ZPOS64_T uSizeFile;
-    ZPOS64_T uBackRead;
-    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-    ZPOS64_T uPosFound=CENTRALDIRINVALID;
-    uLong uL;
-                ZPOS64_T relativeOffset;
-
-    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return CENTRALDIRINVALID;
-
-
-    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
-    if (uMaxBack>uSizeFile)
-        uMaxBack = uSizeFile;
-
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-    if (buf==NULL)
-        return CENTRALDIRINVALID;
-
-    uBackRead = 4;
-    while (uBackRead<uMaxBack)
-    {
-        uLong uReadSize;
-        ZPOS64_T uReadPos;
-        int i;
-        if (uBackRead+BUFREADCOMMENT>uMaxBack)
-            uBackRead = uMaxBack;
-        else
-            uBackRead+=BUFREADCOMMENT;
-        uReadPos = uSizeFile-uBackRead ;
-
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
-        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            break;
-
-        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-            break;
-
-        for (i=(int)uReadSize-3; (i--)>0;)
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-                ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
-            {
-                uPosFound = uReadPos+(unsigned)i;
-                break;
-            }
-
-        if (uPosFound!=CENTRALDIRINVALID)
-            break;
-    }
-    free(buf);
-    if (uPosFound == CENTRALDIRINVALID)
-        return CENTRALDIRINVALID;
-
-    /* Zip64 end of central directory locator */
-    if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return CENTRALDIRINVALID;
-
-    /* the signature, already checked */
-    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return CENTRALDIRINVALID;
-
-    /* number of the disk with the start of the zip64 end of  central directory */
-    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return CENTRALDIRINVALID;
-    if (uL != 0)
-        return CENTRALDIRINVALID;
-
-    /* relative offset of the zip64 end of central directory record */
-    if (unz64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=UNZ_OK)
-        return CENTRALDIRINVALID;
-
-    /* total number of disks */
-    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return CENTRALDIRINVALID;
-    if (uL != 1)
-        return CENTRALDIRINVALID;
-
-    /* Goto end of central directory record */
-    if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return CENTRALDIRINVALID;
-
-     /* the signature */
-    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return CENTRALDIRINVALID;
-
-    if (uL != 0x06064b50)
-        return CENTRALDIRINVALID;
-
-    return relativeOffset;
-}
-
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
-     "zlib/zlib114.zip".
-     If the zipfile cannot be opened (file doesn't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-*/
-local unzFile unzOpenInternal(const void *path,
-                              zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
-                              int is64bitOpenFunction) {
-    unz64_s us;
-    unz64_s *s;
-    ZPOS64_T central_pos;
-    uLong   uL;
-
-    uLong number_disk;          /* number of the current dist, used for
-                                   spanning ZIP, unsupported, always 0*/
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used
-                                   for spanning ZIP, unsupported, always 0*/
-    ZPOS64_T number_entry_CD;      /* total number of entries in
-                                   the central dir
-                                   (same than number_entry on nospan) */
-
-    int err=UNZ_OK;
-
-    if (unz_copyright[0]!=' ')
-        return NULL;
-
-    us.z_filefunc.zseek32_file = NULL;
-    us.z_filefunc.ztell32_file = NULL;
-    if (pzlib_filefunc64_32_def==NULL)
-        fill_fopen64_filefunc(&us.z_filefunc.zfile_func64);
-    else
-        us.z_filefunc = *pzlib_filefunc64_32_def;
-    us.is64bitOpenFunction = is64bitOpenFunction;
-
-
-
-    us.filestream = ZOPEN64(us.z_filefunc,
-                                                 path,
-                                                 ZLIB_FILEFUNC_MODE_READ |
-                                                 ZLIB_FILEFUNC_MODE_EXISTING);
-    if (us.filestream==NULL)
-        return NULL;
-
-    central_pos = unz64local_SearchCentralDir64(&us.z_filefunc,us.filestream);
-    if (central_pos!=CENTRALDIRINVALID)
-    {
-        uLong uS;
-        ZPOS64_T uL64;
-
-        us.isZip64 = 1;
-
-        if (ZSEEK64(us.z_filefunc, us.filestream,
-                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-        /* the signature, already checked */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* size of zip64 end of central directory record */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&uL64)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* version made by */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* version needed to extract */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* number of this disk */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* number of the disk with the start of the central directory */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* total number of entries in the central directory on this disk */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* total number of entries in the central directory */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        if ((number_entry_CD!=us.gi.number_entry) ||
-            (number_disk_with_CD!=0) ||
-            (number_disk!=0))
-            err=UNZ_BADZIPFILE;
-
-        /* size of the central directory */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* offset of start of central directory with respect to the
-          starting disk number */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        us.gi.size_comment = 0;
-    }
-    else
-    {
-        central_pos = unz64local_SearchCentralDir(&us.z_filefunc,us.filestream);
-        if (central_pos==CENTRALDIRINVALID)
-            err=UNZ_ERRNO;
-
-        us.isZip64 = 0;
-
-        if (ZSEEK64(us.z_filefunc, us.filestream,
-                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err=UNZ_ERRNO;
-
-        /* the signature, already checked */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* number of this disk */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* number of the disk with the start of the central directory */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* total number of entries in the central dir on this disk */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-        us.gi.number_entry = uL;
-
-        /* total number of entries in the central dir */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-        number_entry_CD = uL;
-
-        if ((number_entry_CD!=us.gi.number_entry) ||
-            (number_disk_with_CD!=0) ||
-            (number_disk!=0))
-            err=UNZ_BADZIPFILE;
-
-        /* size of the central directory */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-        us.size_central_dir = uL;
-
-        /* offset of start of central directory with respect to the
-            starting disk number */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-        us.offset_central_dir = uL;
-
-        /* zipfile comment length */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
-            err=UNZ_ERRNO;
-    }
-
-    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
-        (err==UNZ_OK))
-        err=UNZ_BADZIPFILE;
-
-    if (err!=UNZ_OK)
-    {
-        ZCLOSE64(us.z_filefunc, us.filestream);
-        return NULL;
-    }
-
-    us.byte_before_the_zipfile = central_pos -
-                            (us.offset_central_dir+us.size_central_dir);
-    us.central_pos = central_pos;
-    us.pfile_in_zip_read = NULL;
-    us.encrypted = 0;
-
-
-    s=(unz64_s*)ALLOC(sizeof(unz64_s));
-    if( s != NULL)
-    {
-        *s=us;
-        unzGoToFirstFile((unzFile)s);
-    }
-    return (unzFile)s;
-}
-
-
-extern unzFile ZEXPORT unzOpen2(const char *path,
-                                zlib_filefunc_def* pzlib_filefunc32_def) {
-    if (pzlib_filefunc32_def != NULL)
-    {
-        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
-        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
-        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 0);
-    }
-    else
-        return unzOpenInternal(path, NULL, 0);
-}
-
-extern unzFile ZEXPORT unzOpen2_64(const void *path,
-                                   zlib_filefunc64_def* pzlib_filefunc_def) {
-    if (pzlib_filefunc_def != NULL)
-    {
-        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
-        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
-        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
-        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
-        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 1);
-    }
-    else
-        return unzOpenInternal(path, NULL, 1);
-}
-
-extern unzFile ZEXPORT unzOpen(const char *path) {
-    return unzOpenInternal(path, NULL, 0);
-}
-
-extern unzFile ZEXPORT unzOpen64(const void *path) {
-    return unzOpenInternal(path, NULL, 1);
-}
-
-/*
-  Close a ZipFile opened with unzOpen.
-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-    these files MUST be closed with unzCloseCurrentFile before call unzClose.
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzClose(unzFile file) {
-    unz64_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-
-    if (s->pfile_in_zip_read!=NULL)
-        unzCloseCurrentFile(file);
-
-    ZCLOSE64(s->z_filefunc, s->filestream);
-    free(s);
-    return UNZ_OK;
-}
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzGetGlobalInfo64(unzFile file, unz_global_info64* pglobal_info) {
-    unz64_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    *pglobal_info=s->gi;
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzGetGlobalInfo(unzFile file, unz_global_info* pglobal_info32) {
-    unz64_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    /* to do : check if number_entry is not truncated */
-    pglobal_info32->number_entry = (uLong)s->gi.number_entry;
-    pglobal_info32->size_comment = s->gi.size_comment;
-    return UNZ_OK;
-}
-/*
-   Translate date/time from Dos format to tm_unz (readable more easily)
-*/
-local void unz64local_DosDateToTmuDate(ZPOS64_T ulDosDate, tm_unz* ptm) {
-    ZPOS64_T uDate;
-    uDate = (ZPOS64_T)(ulDosDate>>16);
-    ptm->tm_mday = (int)(uDate&0x1f) ;
-    ptm->tm_mon =  (int)((((uDate)&0x1E0)/0x20)-1) ;
-    ptm->tm_year = (int)(((uDate&0x0FE00)/0x0200)+1980) ;
-
-    ptm->tm_hour = (int) ((ulDosDate &0xF800)/0x800);
-    ptm->tm_min =  (int) ((ulDosDate&0x7E0)/0x20) ;
-    ptm->tm_sec =  (int) (2*(ulDosDate&0x1f)) ;
-}
-
-/*
-  Get Info about the current file in the zipfile, with internal only info
-*/
-local int unz64local_GetCurrentFileInfoInternal(unzFile file,
-                                                unz_file_info64 *pfile_info,
-                                                unz_file_info64_internal
-                                                *pfile_info_internal,
-                                                char *szFileName,
-                                                uLong fileNameBufferSize,
-                                                void *extraField,
-                                                uLong extraFieldBufferSize,
-                                                char *szComment,
-                                                uLong commentBufferSize) {
-    unz64_s* s;
-    unz_file_info64 file_info;
-    unz_file_info64_internal file_info_internal;
-    int err=UNZ_OK;
-    uLong uMagic;
-    long lSeek=0;
-    uLong uL;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (ZSEEK64(s->z_filefunc, s->filestream,
-              s->pos_in_central_dir+s->byte_before_the_zipfile,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-
-    /* we check the magic */
-    if (err==UNZ_OK)
-    {
-        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x02014b50)
-            err=UNZ_BADZIPFILE;
-    }
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    unz64local_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-        err=UNZ_ERRNO;
-    file_info.compressed_size = uL;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-        err=UNZ_ERRNO;
-    file_info.uncompressed_size = uL;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-                // relative offset of local header
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-        err=UNZ_ERRNO;
-    file_info_internal.offset_curfile = uL;
-
-    lSeek+=file_info.size_filename;
-    if ((err==UNZ_OK) && (szFileName!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_filename<fileNameBufferSize)
-        {
-            *(szFileName+file_info.size_filename)='\0';
-            uSizeRead = file_info.size_filename;
-        }
-        else
-            uSizeRead = fileNameBufferSize;
-
-        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
-            if (ZREAD64(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek -= uSizeRead;
-    }
-
-    // Read extrafield
-    if ((err==UNZ_OK) && (extraField!=NULL))
-    {
-        ZPOS64_T uSizeRead ;
-        if (file_info.size_file_extra<extraFieldBufferSize)
-            uSizeRead = file_info.size_file_extra;
-        else
-            uSizeRead = extraFieldBufferSize;
-
-        if (lSeek!=0)
-        {
-            if (ZSEEK64(s->z_filefunc, s->filestream,(ZPOS64_T)lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        }
-
-        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
-            if (ZREAD64(s->z_filefunc, s->filestream,extraField,(uLong)uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-
-        lSeek += file_info.size_file_extra - (uLong)uSizeRead;
-    }
-    else
-        lSeek += file_info.size_file_extra;
-
-
-    if ((err==UNZ_OK) && (file_info.size_file_extra != 0))
-    {
-                                uLong acc = 0;
-
-        // since lSeek now points to after the extra field we need to move back
-        lSeek -= file_info.size_file_extra;
-
-        if (lSeek!=0)
-        {
-            if (ZSEEK64(s->z_filefunc, s->filestream,(ZPOS64_T)lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        }
-
-        while(acc < file_info.size_file_extra)
-        {
-            uLong headerId;
-                                                uLong dataSize;
-
-            if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK)
-                err=UNZ_ERRNO;
-
-            if (unz64local_getShort(&s->z_filefunc, s->filestream,&dataSize) != UNZ_OK)
-                err=UNZ_ERRNO;
-
-            /* ZIP64 extra fields */
-            if (headerId == 0x0001)
-            {
-                if(file_info.uncompressed_size == MAXU32)
-                {
-                    if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
-                        err=UNZ_ERRNO;
-                }
-
-                if(file_info.compressed_size == MAXU32)
-                {
-                    if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
-                        err=UNZ_ERRNO;
-                }
-
-                if(file_info_internal.offset_curfile == MAXU32)
-                {
-                    /* Relative Header offset */
-                    if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
-                        err=UNZ_ERRNO;
-                }
-
-                if(file_info.disk_num_start == 0xffff)
-                {
-                    /* Disk Start Number */
-                    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
-                        err=UNZ_ERRNO;
-                }
-
-            }
-            else
-            {
-                if (ZSEEK64(s->z_filefunc, s->filestream,dataSize,ZLIB_FILEFUNC_SEEK_CUR)!=0)
-                    err=UNZ_ERRNO;
-            }
-
-            acc += 2 + 2 + dataSize;
-        }
-    }
-
-    if ((err==UNZ_OK) && (szComment!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_file_comment<commentBufferSize)
-        {
-            *(szComment+file_info.size_file_comment)='\0';
-            uSizeRead = file_info.size_file_comment;
-        }
-        else
-            uSizeRead = commentBufferSize;
-
-        if (lSeek!=0)
-        {
-            if (ZSEEK64(s->z_filefunc, s->filestream,(ZPOS64_T)lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        }
-
-        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
-            if (ZREAD64(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek+=file_info.size_file_comment - uSizeRead;
-    }
-    else
-        lSeek+=file_info.size_file_comment;
-
-
-    if ((err==UNZ_OK) && (pfile_info!=NULL))
-        *pfile_info=file_info;
-
-    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
-        *pfile_info_internal=file_info_internal;
-
-    return err;
-}
-
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem.
-*/
-extern int ZEXPORT unzGetCurrentFileInfo64(unzFile file,
-                                           unz_file_info64 * pfile_info,
-                                           char * szFileName, uLong fileNameBufferSize,
-                                           void *extraField, uLong extraFieldBufferSize,
-                                           char* szComment,  uLong commentBufferSize) {
-    return unz64local_GetCurrentFileInfoInternal(file,pfile_info,NULL,
-                                                 szFileName,fileNameBufferSize,
-                                                 extraField,extraFieldBufferSize,
-                                                 szComment,commentBufferSize);
-}
-
-extern int ZEXPORT unzGetCurrentFileInfo(unzFile file,
-                                         unz_file_info * pfile_info,
-                                         char * szFileName, uLong fileNameBufferSize,
-                                         void *extraField, uLong extraFieldBufferSize,
-                                         char* szComment,  uLong commentBufferSize) {
-    int err;
-    unz_file_info64 file_info64;
-    err = unz64local_GetCurrentFileInfoInternal(file,&file_info64,NULL,
-                                                szFileName,fileNameBufferSize,
-                                                extraField,extraFieldBufferSize,
-                                                szComment,commentBufferSize);
-    if ((err==UNZ_OK) && (pfile_info != NULL))
-    {
-        pfile_info->version = file_info64.version;
-        pfile_info->version_needed = file_info64.version_needed;
-        pfile_info->flag = file_info64.flag;
-        pfile_info->compression_method = file_info64.compression_method;
-        pfile_info->dosDate = file_info64.dosDate;
-        pfile_info->crc = file_info64.crc;
-
-        pfile_info->size_filename = file_info64.size_filename;
-        pfile_info->size_file_extra = file_info64.size_file_extra;
-        pfile_info->size_file_comment = file_info64.size_file_comment;
-
-        pfile_info->disk_num_start = file_info64.disk_num_start;
-        pfile_info->internal_fa = file_info64.internal_fa;
-        pfile_info->external_fa = file_info64.external_fa;
-
-        pfile_info->tmu_date = file_info64.tmu_date;
-
-
-        pfile_info->compressed_size = (uLong)file_info64.compressed_size;
-        pfile_info->uncompressed_size = (uLong)file_info64.uncompressed_size;
-
-    }
-    return err;
-}
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-extern int ZEXPORT unzGoToFirstFile(unzFile file) {
-    int err=UNZ_OK;
-    unz64_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    s->pos_in_central_dir=s->offset_central_dir;
-    s->num_file=0;
-    err=unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                             &s->cur_file_info_internal,
-                                             NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-extern int ZEXPORT unzGoToNextFile(unzFile file) {
-    unz64_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
-      if (s->num_file+1==s->gi.number_entry)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
-            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
-    s->num_file++;
-    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-extern int ZEXPORT unzLocateFile(unzFile file, const char *szFileName, int iCaseSensitivity) {
-    unz64_s* s;
-    int err;
-
-    /* We remember the 'current' position in the file so that we can jump
-     * back there if we fail.
-     */
-    unz_file_info64 cur_file_infoSaved;
-    unz_file_info64_internal cur_file_info_internalSaved;
-    ZPOS64_T num_fileSaved;
-    ZPOS64_T pos_in_central_dirSaved;
-
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-
-    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
-        return UNZ_PARAMERROR;
-
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    /* Save the current state */
-    num_fileSaved = s->num_file;
-    pos_in_central_dirSaved = s->pos_in_central_dir;
-    cur_file_infoSaved = s->cur_file_info;
-    cur_file_info_internalSaved = s->cur_file_info_internal;
-
-    err = unzGoToFirstFile(file);
-
-    while (err == UNZ_OK)
-    {
-        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
-        err = unzGetCurrentFileInfo64(file,NULL,
-                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
-                                    NULL,0,NULL,0);
-        if (err == UNZ_OK)
-        {
-            if (unzStringFileNameCompare(szCurrentFileName,
-                                            szFileName,iCaseSensitivity)==0)
-                return UNZ_OK;
-            err = unzGoToNextFile(file);
-        }
-    }
-
-    /* We failed, so restore the state of the 'current file' to where we
-     * were.
-     */
-    s->num_file = num_fileSaved ;
-    s->pos_in_central_dir = pos_in_central_dirSaved ;
-    s->cur_file_info = cur_file_infoSaved;
-    s->cur_file_info_internal = cur_file_info_internalSaved;
-    return err;
-}
-
-
-/*
-///////////////////////////////////////////
-// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
-// I need random access
-//
-// Further optimization could be realized by adding an ability
-// to cache the directory in memory. The goal being a single
-// comprehensive file read to put the file I need in a memory.
-*/
-
-/*
-typedef struct unz_file_pos_s
-{
-    ZPOS64_T pos_in_zip_directory;   // offset in file
-    ZPOS64_T num_of_file;            // # of file
-} unz_file_pos;
-*/
-
-extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos* file_pos) {
-    unz64_s* s;
-
-    if (file==NULL || file_pos==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
-    file_pos->num_of_file           = s->num_file;
-
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzGetFilePos(unzFile file, unz_file_pos* file_pos) {
-    unz64_file_pos file_pos64;
-    int err = unzGetFilePos64(file,&file_pos64);
-    if (err==UNZ_OK)
-    {
-        file_pos->pos_in_zip_directory = (uLong)file_pos64.pos_in_zip_directory;
-        file_pos->num_of_file = (uLong)file_pos64.num_of_file;
-    }
-    return err;
-}
-
-extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos) {
-    unz64_s* s;
-    int err;
-
-    if (file==NULL || file_pos==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-
-    /* jump to the right spot */
-    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
-    s->num_file           = file_pos->num_of_file;
-
-    /* set the current file */
-    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    /* return results */
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-extern int ZEXPORT unzGoToFilePos(unzFile file, unz_file_pos* file_pos) {
-    unz64_file_pos file_pos64;
-    if (file_pos == NULL)
-        return UNZ_PARAMERROR;
-
-    file_pos64.pos_in_zip_directory = file_pos->pos_in_zip_directory;
-    file_pos64.num_of_file = file_pos->num_of_file;
-    return unzGoToFilePos64(file,&file_pos64);
-}
-
-/*
-// Unzip Helper Functions - should be here?
-///////////////////////////////////////////
-*/
-
-/*
-  Read the local header of the current zipfile
-  Check the coherency of the local header and info in the end of central
-        directory about this file
-  store in *piSizeVar the size of extra info in local header
-        (filename and size of extra field data)
-*/
-local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar,
-                                                     ZPOS64_T * poffset_local_extrafield,
-                                                     uInt  * psize_local_extrafield) {
-    uLong uMagic,uData,uFlags;
-    uLong size_filename;
-    uLong size_extra_field;
-    int err=UNZ_OK;
-
-    *piSizeVar = 0;
-    *poffset_local_extrafield = 0;
-    *psize_local_extrafield = 0;
-
-    if (ZSEEK64(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
-                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-
-    if (err==UNZ_OK)
-    {
-        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x04034b50)
-            err=UNZ_BADZIPFILE;
-    }
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-/*
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
-        err=UNZ_BADZIPFILE;
-*/
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
-        err=UNZ_BADZIPFILE;
-
-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
-/* #ifdef HAVE_BZIP2 */
-                         (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
-/* #endif */
-                         (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
-        err=UNZ_ERRNO;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
-        err=UNZ_ERRNO;
-    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
-        err=UNZ_ERRNO;
-    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
-        err=UNZ_BADZIPFILE;
-
-    *piSizeVar += (uInt)size_filename;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
-        err=UNZ_ERRNO;
-    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
-                                    SIZEZIPLOCALHEADER + size_filename;
-    *psize_local_extrafield = (uInt)size_extra_field;
-
-    *piSizeVar += (uInt)size_extra_field;
-
-    return err;
-}
-
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error and the file is opened, the return value is UNZ_OK.
-*/
-extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int* method,
-                                       int* level, int raw, const char* password) {
-    int err=UNZ_OK;
-    uInt iSizeVar;
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    ZPOS64_T offset_local_extrafield;  /* offset of the local extra field */
-    uInt  size_local_extrafield;    /* size of the local extra field */
-#    ifndef NOUNCRYPT
-    char source[12];
-#    else
-    if (password != NULL)
-        return UNZ_PARAMERROR;
-#    endif
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_PARAMERROR;
-
-    if (s->pfile_in_zip_read != NULL)
-        unzCloseCurrentFile(file);
-
-    if (unz64local_CheckCurrentFileCoherencyHeader(s,&iSizeVar, &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
-        return UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info = (file_in_zip64_read_info_s*)ALLOC(sizeof(file_in_zip64_read_info_s));
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_INTERNALERROR;
-
-    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
-    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
-    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
-    pfile_in_zip_read_info->pos_local_extrafield=0;
-    pfile_in_zip_read_info->raw=raw;
-
-    if (pfile_in_zip_read_info->read_buffer==NULL)
-    {
-        free(pfile_in_zip_read_info);
-        return UNZ_INTERNALERROR;
-    }
-
-    pfile_in_zip_read_info->stream_initialised=0;
-
-    if (method!=NULL)
-        *method = (int)s->cur_file_info.compression_method;
-
-    if (level!=NULL)
-    {
-        *level = 6;
-        switch (s->cur_file_info.flag & 0x06)
-        {
-          case 6 : *level = 1; break;
-          case 4 : *level = 2; break;
-          case 2 : *level = 9; break;
-        }
-    }
-
-    if ((s->cur_file_info.compression_method!=0) &&
-/* #ifdef HAVE_BZIP2 */
-        (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
-/* #endif */
-        (s->cur_file_info.compression_method!=Z_DEFLATED))
-
-        err=UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
-    pfile_in_zip_read_info->crc32=0;
-    pfile_in_zip_read_info->total_out_64=0;
-    pfile_in_zip_read_info->compression_method = s->cur_file_info.compression_method;
-    pfile_in_zip_read_info->filestream=s->filestream;
-    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
-    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
-
-    pfile_in_zip_read_info->stream.total_out = 0;
-
-    if ((s->cur_file_info.compression_method==Z_BZIP2ED) && (!raw))
-    {
-#ifdef HAVE_BZIP2
-      pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0;
-      pfile_in_zip_read_info->bstream.bzfree = (free_func)0;
-      pfile_in_zip_read_info->bstream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->bstream.state = (voidpf)0;
-
-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-      pfile_in_zip_read_info->stream.zfree = (free_func)0;
-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
-      pfile_in_zip_read_info->stream.avail_in = 0;
-
-      err=BZ2_bzDecompressInit(&pfile_in_zip_read_info->bstream, 0, 0);
-      if (err == Z_OK)
-        pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED;
-      else
-      {
-        free(pfile_in_zip_read_info->read_buffer);
-        free(pfile_in_zip_read_info);
-        return err;
-      }
-#else
-      pfile_in_zip_read_info->raw=1;
-#endif
-    }
-    else if ((s->cur_file_info.compression_method==Z_DEFLATED) && (!raw))
-    {
-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-      pfile_in_zip_read_info->stream.zfree = (free_func)0;
-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->stream.next_in = 0;
-      pfile_in_zip_read_info->stream.avail_in = 0;
-
-      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
-      if (err == Z_OK)
-        pfile_in_zip_read_info->stream_initialised=Z_DEFLATED;
-      else
-      {
-        free(pfile_in_zip_read_info->read_buffer);
-        free(pfile_in_zip_read_info);
-        return err;
-      }
-        /* windowBits is passed < 0 to tell that there is no zlib header.
-         * Note that in this case inflate *requires* an extra "dummy" byte
-         * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END.
-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
-         * size of both compressed and uncompressed data
-         */
-    }
-    pfile_in_zip_read_info->rest_read_compressed =
-            s->cur_file_info.compressed_size ;
-    pfile_in_zip_read_info->rest_read_uncompressed =
-            s->cur_file_info.uncompressed_size ;
-
-
-    pfile_in_zip_read_info->pos_in_zipfile =
-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
-              iSizeVar;
-
-    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
-
-    s->pfile_in_zip_read = pfile_in_zip_read_info;
-                s->encrypted = 0;
-
-#    ifndef NOUNCRYPT
-    if (password != NULL)
-    {
-        int i;
-        s->pcrc_32_tab = get_crc_table();
-        init_keys(password,s->keys,s->pcrc_32_tab);
-        if (ZSEEK64(s->z_filefunc, s->filestream,
-                  s->pfile_in_zip_read->pos_in_zipfile +
-                     s->pfile_in_zip_read->byte_before_the_zipfile,
-                  SEEK_SET)!=0)
-            return UNZ_INTERNALERROR;
-        if(ZREAD64(s->z_filefunc, s->filestream,source, 12)<12)
-            return UNZ_INTERNALERROR;
-
-        for (i = 0; i<12; i++)
-            zdecode(s->keys,s->pcrc_32_tab,source[i]);
-
-        s->pfile_in_zip_read->pos_in_zipfile+=12;
-        s->encrypted=1;
-    }
-#    endif
-
-
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzOpenCurrentFile(unzFile file) {
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
-}
-
-extern int ZEXPORT unzOpenCurrentFilePassword(unzFile file, const char* password) {
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
-}
-
-extern int ZEXPORT unzOpenCurrentFile2(unzFile file, int* method, int* level, int raw) {
-    return unzOpenCurrentFile3(file, method, level, raw, NULL);
-}
-
-/** Addition for GDAL : START */
-
-extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64(unzFile file) {
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    s=(unz64_s*)file;
-    if (file==NULL)
-        return 0; //UNZ_PARAMERROR;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-    if (pfile_in_zip_read_info==NULL)
-        return 0; //UNZ_PARAMERROR;
-    return pfile_in_zip_read_info->pos_in_zipfile +
-                         pfile_in_zip_read_info->byte_before_the_zipfile;
-}
-
-/** Addition for GDAL : END */
-
-/*
-  Read bytes from the current file.
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if some bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-extern int ZEXPORT unzReadCurrentFile(unzFile file, voidp buf, unsigned len) {
-    int err=UNZ_OK;
-    uInt iRead = 0;
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-
-    if (pfile_in_zip_read_info->read_buffer == NULL)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (len==0)
-        return 0;
-
-    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
-
-    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
-
-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
-        (!(pfile_in_zip_read_info->raw)))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
-
-    if ((len>pfile_in_zip_read_info->rest_read_compressed+
-           pfile_in_zip_read_info->stream.avail_in) &&
-         (pfile_in_zip_read_info->raw))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_compressed+
-            pfile_in_zip_read_info->stream.avail_in;
-
-    while (pfile_in_zip_read_info->stream.avail_out>0)
-    {
-        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
-            (pfile_in_zip_read_info->rest_read_compressed>0))
-        {
-            uInt uReadThis = UNZ_BUFSIZE;
-            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
-                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
-            if (uReadThis == 0)
-                return UNZ_EOF;
-            if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->pos_in_zipfile +
-                         pfile_in_zip_read_info->byte_before_the_zipfile,
-                         ZLIB_FILEFUNC_SEEK_SET)!=0)
-                return UNZ_ERRNO;
-            if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->read_buffer,
-                      uReadThis)!=uReadThis)
-                return UNZ_ERRNO;
-
-
-#            ifndef NOUNCRYPT
-            if(s->encrypted)
-            {
-                uInt i;
-                for(i=0;i<uReadThis;i++)
-                  pfile_in_zip_read_info->read_buffer[i] =
-                      zdecode(s->keys,s->pcrc_32_tab,
-                              pfile_in_zip_read_info->read_buffer[i]);
-            }
-#            endif
-
-
-            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
-
-            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
-
-            pfile_in_zip_read_info->stream.next_in =
-                (Bytef*)pfile_in_zip_read_info->read_buffer;
-            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
-        }
-
-        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
-        {
-            uInt uDoCopy,i ;
-
-            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                return (iRead==0) ? UNZ_EOF : (int)iRead;
-
-            if (pfile_in_zip_read_info->stream.avail_out <
-                            pfile_in_zip_read_info->stream.avail_in)
-                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
-            else
-                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
-
-            for (i=0;i<uDoCopy;i++)
-                *(pfile_in_zip_read_info->stream.next_out+i) =
-                        *(pfile_in_zip_read_info->stream.next_in+i);
-
-            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uDoCopy;
-
-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
-                                pfile_in_zip_read_info->stream.next_out,
-                                uDoCopy);
-            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
-            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
-            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
-            pfile_in_zip_read_info->stream.next_out += uDoCopy;
-            pfile_in_zip_read_info->stream.next_in += uDoCopy;
-            pfile_in_zip_read_info->stream.total_out += uDoCopy;
-            iRead += uDoCopy;
-        }
-        else if (pfile_in_zip_read_info->compression_method==Z_BZIP2ED)
-        {
-#ifdef HAVE_BZIP2
-            uLong uTotalOutBefore,uTotalOutAfter;
-            const Bytef *bufBefore;
-            uLong uOutThis;
-
-            pfile_in_zip_read_info->bstream.next_in        = (char*)pfile_in_zip_read_info->stream.next_in;
-            pfile_in_zip_read_info->bstream.avail_in       = pfile_in_zip_read_info->stream.avail_in;
-            pfile_in_zip_read_info->bstream.total_in_lo32  = pfile_in_zip_read_info->stream.total_in;
-            pfile_in_zip_read_info->bstream.total_in_hi32  = 0;
-            pfile_in_zip_read_info->bstream.next_out       = (char*)pfile_in_zip_read_info->stream.next_out;
-            pfile_in_zip_read_info->bstream.avail_out      = pfile_in_zip_read_info->stream.avail_out;
-            pfile_in_zip_read_info->bstream.total_out_lo32 = pfile_in_zip_read_info->stream.total_out;
-            pfile_in_zip_read_info->bstream.total_out_hi32 = 0;
-
-            uTotalOutBefore = pfile_in_zip_read_info->bstream.total_out_lo32;
-            bufBefore = (const Bytef *)pfile_in_zip_read_info->bstream.next_out;
-
-            err=BZ2_bzDecompress(&pfile_in_zip_read_info->bstream);
-
-            uTotalOutAfter = pfile_in_zip_read_info->bstream.total_out_lo32;
-            uOutThis = uTotalOutAfter-uTotalOutBefore;
-
-            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
-
-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,bufBefore, (uInt)(uOutThis));
-            pfile_in_zip_read_info->rest_read_uncompressed -= uOutThis;
-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-
-            pfile_in_zip_read_info->stream.next_in   = (Bytef*)pfile_in_zip_read_info->bstream.next_in;
-            pfile_in_zip_read_info->stream.avail_in  = pfile_in_zip_read_info->bstream.avail_in;
-            pfile_in_zip_read_info->stream.total_in  = pfile_in_zip_read_info->bstream.total_in_lo32;
-            pfile_in_zip_read_info->stream.next_out  = (Bytef*)pfile_in_zip_read_info->bstream.next_out;
-            pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->bstream.avail_out;
-            pfile_in_zip_read_info->stream.total_out = pfile_in_zip_read_info->bstream.total_out_lo32;
-
-            if (err==BZ_STREAM_END)
-              return (iRead==0) ? UNZ_EOF : iRead;
-            if (err!=BZ_OK)
-              break;
-#endif
-        } // end Z_BZIP2ED
-        else
-        {
-            ZPOS64_T uTotalOutBefore,uTotalOutAfter;
-            const Bytef *bufBefore;
-            ZPOS64_T uOutThis;
-            int flush=Z_SYNC_FLUSH;
-
-            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
-            bufBefore = pfile_in_zip_read_info->stream.next_out;
-
-            /*
-            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
-                     pfile_in_zip_read_info->stream.avail_out) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                flush = Z_FINISH;
-            */
-            err=inflate(&pfile_in_zip_read_info->stream,flush);
-
-            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
-              err = Z_DATA_ERROR;
-
-            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
-            /* Detect overflow, because z_stream.total_out is uLong (32 bits) */
-            if (uTotalOutAfter<uTotalOutBefore)
-                uTotalOutAfter += 1LL << 32; /* Add maximum value of uLong + 1 */
-            uOutThis = uTotalOutAfter-uTotalOutBefore;
-
-            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
-
-            pfile_in_zip_read_info->crc32 =
-                crc32(pfile_in_zip_read_info->crc32,bufBefore,
-                        (uInt)(uOutThis));
-
-            pfile_in_zip_read_info->rest_read_uncompressed -=
-                uOutThis;
-
-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-
-            if (err==Z_STREAM_END)
-                return (iRead==0) ? UNZ_EOF : (int)iRead;
-            if (err!=Z_OK)
-                break;
-        }
-    }
-
-    if (err==Z_OK)
-        return (int)iRead;
-    return err;
-}
-
-
-/*
-  Give the current position in uncompressed data
-*/
-extern z_off_t ZEXPORT unztell(unzFile file) {
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
-}
-
-extern ZPOS64_T ZEXPORT unztell64(unzFile file) {
-
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return (ZPOS64_T)-1;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return (ZPOS64_T)-1;
-
-    return pfile_in_zip_read_info->total_out_64;
-}
-
-
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-extern int ZEXPORT unzeof(unzFile file) {
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-        return 1;
-    else
-        return 0;
-}
-
-
-
-/*
-Read extra field from the current file (opened by unzOpenCurrentFile)
-This is the local-header version of the extra field (sometimes, there is
-more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field that can be read
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-extern int ZEXPORT unzGetLocalExtrafield(unzFile file, voidp buf, unsigned len) {
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    uInt read_now;
-    ZPOS64_T size_to_read;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
-                pfile_in_zip_read_info->pos_local_extrafield);
-
-    if (buf==NULL)
-        return (int)size_to_read;
-
-    if (len>size_to_read)
-        read_now = (uInt)size_to_read;
-    else
-        read_now = (uInt)len ;
-
-    if (read_now==0)
-        return 0;
-
-    if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              pfile_in_zip_read_info->offset_local_extrafield +
-              pfile_in_zip_read_info->pos_local_extrafield,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-    if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              buf,read_now)!=read_now)
-        return UNZ_ERRNO;
-
-    return (int)read_now;
-}
-
-/*
-  Close the file in zip opened with unzOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-extern int ZEXPORT unzCloseCurrentFile(unzFile file) {
-    int err=UNZ_OK;
-
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-
-    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
-        (!pfile_in_zip_read_info->raw))
-    {
-        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
-            err=UNZ_CRCERROR;
-    }
-
-
-    free(pfile_in_zip_read_info->read_buffer);
-    pfile_in_zip_read_info->read_buffer = NULL;
-    if (pfile_in_zip_read_info->stream_initialised == Z_DEFLATED)
-        inflateEnd(&pfile_in_zip_read_info->stream);
-#ifdef HAVE_BZIP2
-    else if (pfile_in_zip_read_info->stream_initialised == Z_BZIP2ED)
-        BZ2_bzDecompressEnd(&pfile_in_zip_read_info->bstream);
-#endif
-
-
-    pfile_in_zip_read_info->stream_initialised = 0;
-    free(pfile_in_zip_read_info);
-
-    s->pfile_in_zip_read=NULL;
-
-    return err;
-}
-
-
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-extern int ZEXPORT unzGetGlobalComment(unzFile file, char * szComment, uLong uSizeBuf) {
-    unz64_s* s;
-    uLong uReadThis ;
-    if (file==NULL)
-        return (int)UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-
-    uReadThis = uSizeBuf;
-    if (uReadThis>s->gi.size_comment)
-        uReadThis = s->gi.size_comment;
-
-    if (ZSEEK64(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-    if (uReadThis>0)
-    {
-      *szComment='\0';
-      if (ZREAD64(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
-        return UNZ_ERRNO;
-    }
-
-    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
-        *(szComment+s->gi.size_comment)='\0';
-    return (int)uReadThis;
-}
-
-/* Additions by RX '2004 */
-extern ZPOS64_T ZEXPORT unzGetOffset64(unzFile file) {
-    unz64_s* s;
-
-    if (file==NULL)
-          return 0; //UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-      return 0;
-    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
-      if (s->num_file==s->gi.number_entry)
-         return 0;
-    return s->pos_in_central_dir;
-}
-
-extern uLong ZEXPORT unzGetOffset(unzFile file) {
-    ZPOS64_T offset64;
-
-    if (file==NULL)
-          return 0; //UNZ_PARAMERROR;
-    offset64 = unzGetOffset64(file);
-    return (uLong)offset64;
-}
-
-extern int ZEXPORT unzSetOffset64(unzFile file, ZPOS64_T pos) {
-    unz64_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-
-    s->pos_in_central_dir = pos;
-    s->num_file = s->gi.number_entry;      /* hack */
-    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                              &s->cur_file_info_internal,
-                                              NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos) {
-    return unzSetOffset64(file,pos);
-}
diff --git a/Telegram/ThirdParty/minizip/unzip.h b/Telegram/ThirdParty/minizip/unzip.h
deleted file mode 100644
index 14105840f6d247..00000000000000
--- a/Telegram/ThirdParty/minizip/unzip.h
+++ /dev/null
@@ -1,437 +0,0 @@
-/* unzip.h -- IO for uncompress .zip files using zlib
-   Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications of Unzip for Zip64
-         Copyright (C) 2007-2008 Even Rouault
-
-         Modifications for Zip64 support on both zip and unzip
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-         ---------------------------------------------------------------------------------
-
-        Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  ---------------------------------------------------------------------------------
-
-        Changes
-
-        See header of unzip64.c
-
-*/
-
-#ifndef _unz64_H
-#define _unz64_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef  _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#ifdef HAVE_BZIP2
-#include "bzlib.h"
-#endif
-
-#define Z_BZIP2ED 12
-
-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__;
-typedef unzFile__ *unzFile;
-#else
-typedef voidp unzFile;
-#endif
-
-
-#define UNZ_OK                          (0)
-#define UNZ_END_OF_LIST_OF_FILE         (-100)
-#define UNZ_ERRNO                       (Z_ERRNO)
-#define UNZ_EOF                         (0)
-#define UNZ_PARAMERROR                  (-102)
-#define UNZ_BADZIPFILE                  (-103)
-#define UNZ_INTERNALERROR               (-104)
-#define UNZ_CRCERROR                    (-105)
-
-/* tm_unz contain date/time info */
-typedef struct tm_unz_s
-{
-    int tm_sec;             /* seconds after the minute - [0,59] */
-    int tm_min;             /* minutes after the hour - [0,59] */
-    int tm_hour;            /* hours since midnight - [0,23] */
-    int tm_mday;            /* day of the month - [1,31] */
-    int tm_mon;             /* months since January - [0,11] */
-    int tm_year;            /* years - [1980..2044] */
-} tm_unz;
-
-/* unz_global_info structure contain global data about the ZIPfile
-   These data comes from the end of central dir */
-typedef struct unz_global_info64_s
-{
-    ZPOS64_T number_entry;         /* total number of entries in
-                                     the central dir on this disk */
-    uLong size_comment;         /* size of the global comment of the zipfile */
-} unz_global_info64;
-
-typedef struct unz_global_info_s
-{
-    uLong number_entry;         /* total number of entries in
-                                     the central dir on this disk */
-    uLong size_comment;         /* size of the global comment of the zipfile */
-} unz_global_info;
-
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_info64_s
-{
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    ZPOS64_T compressed_size;   /* compressed size                 8 bytes */
-    ZPOS64_T uncompressed_size; /* uncompressed size               8 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
-} unz_file_info64;
-
-typedef struct unz_file_info_s
-{
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    uLong compressed_size;      /* compressed size                 4 bytes */
-    uLong uncompressed_size;    /* uncompressed size               4 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
-} unz_file_info;
-
-extern int ZEXPORT unzStringFileNameCompare(const char* fileName1,
-                                            const char* fileName2,
-                                            int iCaseSensitivity);
-/*
-   Compare two filenames (fileName1,fileName2).
-   If iCaseSensitivity = 1, comparison is case sensitive (like strcmp)
-   If iCaseSensitivity = 2, comparison is not case sensitive (like strcmpi
-                                or strcasecmp)
-   If iCaseSensitivity = 0, case sensitivity is default of your operating system
-    (like 1 on Unix, 2 on Windows)
-*/
-
-
-extern unzFile ZEXPORT unzOpen(const char *path);
-extern unzFile ZEXPORT unzOpen64(const void *path);
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
-     "zlib/zlib113.zip".
-     If the zipfile cannot be opened (file don't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-     the "64" function take a const void* pointer, because the path is just the
-       value passed to the open64_file_func callback.
-     Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path
-       is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char*
-       does not describe the reality
-*/
-
-
-extern unzFile ZEXPORT unzOpen2(const char *path,
-                                zlib_filefunc_def* pzlib_filefunc_def);
-/*
-   Open a Zip file, like unzOpen, but provide a set of file low level API
-      for read/write the zip file (see ioapi.h)
-*/
-
-extern unzFile ZEXPORT unzOpen2_64(const void *path,
-                                   zlib_filefunc64_def* pzlib_filefunc_def);
-/*
-   Open a Zip file, like unz64Open, but provide a set of file low level API
-      for read/write the zip file (see ioapi.h)
-*/
-
-extern int ZEXPORT unzClose(unzFile file);
-/*
-  Close a ZipFile opened with unzOpen.
-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-    these files MUST be closed with unzCloseCurrentFile before call unzClose.
-  return UNZ_OK if there is no problem. */
-
-extern int ZEXPORT unzGetGlobalInfo(unzFile file,
-                                    unz_global_info *pglobal_info);
-
-extern int ZEXPORT unzGetGlobalInfo64(unzFile file,
-                                      unz_global_info64 *pglobal_info);
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-
-
-extern int ZEXPORT unzGetGlobalComment(unzFile file,
-                                       char *szComment,
-                                       uLong uSizeBuf);
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-
-
-/***************************************************************************/
-/* Unzip package allow you browse the directory of the zipfile */
-
-extern int ZEXPORT unzGoToFirstFile(unzFile file);
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-
-extern int ZEXPORT unzGoToNextFile(unzFile file);
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-
-extern int ZEXPORT unzLocateFile(unzFile file,
-                                 const char *szFileName,
-                                 int iCaseSensitivity);
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-
-
-/* ****************************************** */
-/* Ryan supplied functions */
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_pos_s
-{
-    uLong pos_in_zip_directory;   /* offset in zip file directory */
-    uLong num_of_file;            /* # of file */
-} unz_file_pos;
-
-extern int ZEXPORT unzGetFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-extern int ZEXPORT unzGoToFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-typedef struct unz64_file_pos_s
-{
-    ZPOS64_T pos_in_zip_directory;   /* offset in zip file directory */
-    ZPOS64_T num_of_file;            /* # of file */
-} unz64_file_pos;
-
-extern int ZEXPORT unzGetFilePos64(
-    unzFile file,
-    unz64_file_pos* file_pos);
-
-extern int ZEXPORT unzGoToFilePos64(
-    unzFile file,
-    const unz64_file_pos* file_pos);
-
-/* ****************************************** */
-
-extern int ZEXPORT unzGetCurrentFileInfo64(unzFile file,
-                                           unz_file_info64 *pfile_info,
-                                           char *szFileName,
-                                           uLong fileNameBufferSize,
-                                           void *extraField,
-                                           uLong extraFieldBufferSize,
-                                           char *szComment,
-                                           uLong commentBufferSize);
-
-extern int ZEXPORT unzGetCurrentFileInfo(unzFile file,
-                                         unz_file_info *pfile_info,
-                                         char *szFileName,
-                                         uLong fileNameBufferSize,
-                                         void *extraField,
-                                         uLong extraFieldBufferSize,
-                                         char *szComment,
-                                         uLong commentBufferSize);
-/*
-  Get Info about the current file
-  if pfile_info!=NULL, the *pfile_info structure will contain some info about
-        the current file
-  if szFileName!=NULL, the filemane string will be copied in szFileName
-            (fileNameBufferSize is the size of the buffer)
-  if extraField!=NULL, the extra field information will be copied in extraField
-            (extraFieldBufferSize is the size of the buffer).
-            This is the Central-header version of the extra field
-  if szComment!=NULL, the comment string of the file will be copied in szComment
-            (commentBufferSize is the size of the buffer)
-*/
-
-
-/** Addition for GDAL : START */
-
-extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64(unzFile file);
-
-/** Addition for GDAL : END */
-
-
-/***************************************************************************/
-/* for reading the content of the current zipfile, you can open it, read data
-   from it, and close it (you can close it before reading all the file)
-   */
-
-extern int ZEXPORT unzOpenCurrentFile(unzFile file);
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFilePassword(unzFile file,
-                                              const char* password);
-/*
-  Open for reading data the current file in the zipfile.
-  password is a crypting password
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFile2(unzFile file,
-                                       int* method,
-                                       int* level,
-                                       int raw);
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-extern int ZEXPORT unzOpenCurrentFile3(unzFile file,
-                                       int* method,
-                                       int* level,
-                                       int raw,
-                                       const char* password);
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-
-extern int ZEXPORT unzCloseCurrentFile(unzFile file);
-/*
-  Close the file in zip opened with unzOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-
-extern int ZEXPORT unzReadCurrentFile(unzFile file,
-                                      voidp buf,
-                                      unsigned len);
-/*
-  Read bytes from the current file (opened by unzOpenCurrentFile)
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if some bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-
-extern z_off_t ZEXPORT unztell(unzFile file);
-
-extern ZPOS64_T ZEXPORT unztell64(unzFile file);
-/*
-  Give the current position in uncompressed data
-*/
-
-extern int ZEXPORT unzeof(unzFile file);
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-
-extern int ZEXPORT unzGetLocalExtrafield(unzFile file,
-                                         voidp buf,
-                                         unsigned len);
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-
-/***************************************************************************/
-
-/* Get the current file offset */
-extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);
-extern uLong ZEXPORT unzGetOffset (unzFile file);
-
-/* Set the current file offset */
-extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _unz64_H */
diff --git a/Telegram/ThirdParty/minizip/zip.c b/Telegram/ThirdParty/minizip/zip.c
deleted file mode 100644
index e2e9da07c5f307..00000000000000
--- a/Telegram/ThirdParty/minizip/zip.c
+++ /dev/null
@@ -1,1956 +0,0 @@
-/* zip.c -- IO on .zip files using zlib
-   Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-         Changes
-   Oct-2009 - Mathias Svensson - Remove old C style function prototypes
-   Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
-   Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
-   Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
-                                 It is used when recreating zip archive with RAW when deleting items from a zip.
-                                 ZIP64 data is automatically added to items that needs it, and existing ZIP64 data need to be removed.
-   Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
-   Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
-
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-#include <time.h>
-#include "zlib.h"
-#include "zip.h"
-
-#ifdef STDC
-#  include <stddef.h>
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include <errno.h>
-#endif
-
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-#ifndef VERSIONMADEBY
-# define VERSIONMADEBY   (0x0) /* platform dependent */
-#endif
-
-#ifndef Z_BUFSIZE
-#define Z_BUFSIZE (64*1024) //(16384)
-#endif
-
-#ifndef Z_MAXFILENAMEINZIP
-#define Z_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-
-/*
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-*/
-
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-
-
-// NOT sure that this work on ALL platform
-#define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
-
-#ifndef SEEK_CUR
-#define SEEK_CUR    1
-#endif
-
-#ifndef SEEK_END
-#define SEEK_END    2
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET    0
-#endif
-
-#ifndef DEF_MEM_LEVEL
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-#endif
-const char zip_copyright[] =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-
-#define SIZEDATA_INDATABLOCK (4096-(4*4))
-
-#define LOCALHEADERMAGIC    (0x04034b50)
-#define CENTRALHEADERMAGIC  (0x02014b50)
-#define ENDHEADERMAGIC      (0x06054b50)
-#define ZIP64ENDHEADERMAGIC      (0x6064b50)
-#define ZIP64ENDLOCHEADERMAGIC   (0x7064b50)
-
-#define FLAG_LOCALHEADER_OFFSET (0x06)
-#define CRC_LOCALHEADER_OFFSET  (0x0e)
-
-#define SIZECENTRALHEADER (0x2e) /* 46 */
-
-typedef struct linkedlist_datablock_internal_s
-{
-  struct linkedlist_datablock_internal_s* next_datablock;
-  uLong  avail_in_this_block;
-  uLong  filled_in_this_block;
-  uLong  unused; /* for future use and alignment */
-  unsigned char data[SIZEDATA_INDATABLOCK];
-} linkedlist_datablock_internal;
-
-typedef struct linkedlist_data_s
-{
-    linkedlist_datablock_internal* first_block;
-    linkedlist_datablock_internal* last_block;
-} linkedlist_data;
-
-
-typedef struct
-{
-    z_stream stream;            /* zLib stream structure for inflate */
-#ifdef HAVE_BZIP2
-    bz_stream bstream;          /* bzLib stream structure for bziped */
-#endif
-
-    int  stream_initialised;    /* 1 is stream is initialised */
-    uInt pos_in_buffered_data;  /* last written byte in buffered_data */
-
-    ZPOS64_T pos_local_header;     /* offset of the local header of the file
-                                     currently writing */
-    char* central_header;       /* central header data for the current file */
-    uLong size_centralExtra;
-    uLong size_centralheader;   /* size of the central header for cur file */
-    uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */
-    uLong flag;                 /* flag of the file currently writing */
-
-    int  method;                /* compression method of file currently wr.*/
-    int  raw;                   /* 1 for directly writing raw data */
-    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
-    uLong dosDate;
-    uLong crc32;
-    int  encrypt;
-    int  zip64;               /* Add ZIP64 extended information in the extra field */
-    ZPOS64_T pos_zip64extrainfo;
-    ZPOS64_T totalCompressedData;
-    ZPOS64_T totalUncompressedData;
-#ifndef NOCRYPT
-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const z_crc_t* pcrc_32_tab;
-    unsigned crypt_header_size;
-#endif
-} curfile64_info;
-
-typedef struct
-{
-    zlib_filefunc64_32_def z_filefunc;
-    voidpf filestream;        /* io structure of the zipfile */
-    linkedlist_data central_dir;/* datablock with central dir in construction*/
-    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
-    curfile64_info ci;            /* info on the file currently writing */
-
-    ZPOS64_T begin_pos;            /* position of the beginning of the zipfile */
-    ZPOS64_T add_position_when_writing_offset;
-    ZPOS64_T number_entry;
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-    char *globalcomment;
-#endif
-
-} zip64_internal;
-
-
-#ifndef NOCRYPT
-#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-#include "crypt.h"
-#endif
-
-local linkedlist_datablock_internal* allocate_new_datablock(void) {
-    linkedlist_datablock_internal* ldi;
-    ldi = (linkedlist_datablock_internal*)
-                 ALLOC(sizeof(linkedlist_datablock_internal));
-    if (ldi!=NULL)
-    {
-        ldi->next_datablock = NULL ;
-        ldi->filled_in_this_block = 0 ;
-        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
-    }
-    return ldi;
-}
-
-local void free_datablock(linkedlist_datablock_internal* ldi) {
-    while (ldi!=NULL)
-    {
-        linkedlist_datablock_internal* ldinext = ldi->next_datablock;
-        free(ldi);
-        ldi = ldinext;
-    }
-}
-
-local void init_linkedlist(linkedlist_data* ll) {
-    ll->first_block = ll->last_block = NULL;
-}
-
-local void free_linkedlist(linkedlist_data* ll) {
-    free_datablock(ll->first_block);
-    ll->first_block = ll->last_block = NULL;
-}
-
-
-local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len) {
-    linkedlist_datablock_internal* ldi;
-    const unsigned char* from_copy;
-
-    if (ll==NULL)
-        return ZIP_INTERNALERROR;
-
-    if (ll->last_block == NULL)
-    {
-        ll->first_block = ll->last_block = allocate_new_datablock();
-        if (ll->first_block == NULL)
-            return ZIP_INTERNALERROR;
-    }
-
-    ldi = ll->last_block;
-    from_copy = (const unsigned char*)buf;
-
-    while (len>0)
-    {
-        uInt copy_this;
-        uInt i;
-        unsigned char* to_copy;
-
-        if (ldi->avail_in_this_block==0)
-        {
-            ldi->next_datablock = allocate_new_datablock();
-            if (ldi->next_datablock == NULL)
-                return ZIP_INTERNALERROR;
-            ldi = ldi->next_datablock ;
-            ll->last_block = ldi;
-        }
-
-        if (ldi->avail_in_this_block < len)
-            copy_this = (uInt)ldi->avail_in_this_block;
-        else
-            copy_this = (uInt)len;
-
-        to_copy = &(ldi->data[ldi->filled_in_this_block]);
-
-        for (i=0;i<copy_this;i++)
-            *(to_copy+i)=*(from_copy+i);
-
-        ldi->filled_in_this_block += copy_this;
-        ldi->avail_in_this_block -= copy_this;
-        from_copy += copy_this ;
-        len -= copy_this;
-    }
-    return ZIP_OK;
-}
-
-
-
-/****************************************************************************/
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-/* ===========================================================================
-   Inputs a long in LSB order to the given file
-   nbByte == 1, 2 ,4 or 8 (byte, short or long, ZPOS64_T)
-*/
-
-local int zip64local_putValue(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte) {
-    unsigned char buf[8];
-    int n;
-    for (n = 0; n < nbByte; n++)
-    {
-        buf[n] = (unsigned char)(x & 0xff);
-        x >>= 8;
-    }
-    if (x != 0)
-      {     /* data overflow - hack for ZIP64 (X Roche) */
-      for (n = 0; n < nbByte; n++)
-        {
-          buf[n] = 0xff;
-        }
-      }
-
-    if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,(uLong)nbByte)!=(uLong)nbByte)
-        return ZIP_ERRNO;
-    else
-        return ZIP_OK;
-}
-
-local void zip64local_putValue_inmemory (void* dest, ZPOS64_T x, int nbByte) {
-    unsigned char* buf=(unsigned char*)dest;
-    int n;
-    for (n = 0; n < nbByte; n++) {
-        buf[n] = (unsigned char)(x & 0xff);
-        x >>= 8;
-    }
-
-    if (x != 0)
-    {     /* data overflow - hack for ZIP64 */
-       for (n = 0; n < nbByte; n++)
-       {
-          buf[n] = 0xff;
-       }
-    }
-}
-
-/****************************************************************************/
-
-
-local uLong zip64local_TmzDateToDosDate(const tm_zip* ptm) {
-    uLong year = (uLong)ptm->tm_year;
-    if (year>=1980)
-        year-=1980;
-    else if (year>=80)
-        year-=80;
-    return
-      (uLong) (((uLong)(ptm->tm_mday) + (32 * (uLong)(ptm->tm_mon+1)) + (512 * year)) << 16) |
-        (((uLong)ptm->tm_sec/2) + (32 * (uLong)ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
-}
-
-
-/****************************************************************************/
-
-local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int* pi) {
-    unsigned char c;
-    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
-    if (err==1)
-    {
-        *pi = (int)c;
-        return ZIP_OK;
-    }
-    else
-    {
-        if (ZERROR64(*pzlib_filefunc_def,filestream))
-            return ZIP_ERRNO;
-        else
-            return ZIP_EOF;
-    }
-}
-
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int zip64local_getShort(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX) {
-    uLong x ;
-    int i = 0;
-    int err;
-
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==ZIP_OK)
-        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==ZIP_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int zip64local_getLong(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX) {
-    uLong x ;
-    int i = 0;
-    int err;
-
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==ZIP_OK)
-        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==ZIP_OK)
-        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<16;
-
-    if (err==ZIP_OK)
-        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<24;
-
-    if (err==ZIP_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-
-local int zip64local_getLong64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX) {
-  ZPOS64_T x;
-  int i = 0;
-  int err;
-
-  err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x = (ZPOS64_T)i;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<8;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<16;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<24;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<32;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<40;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<48;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<56;
-
-  if (err==ZIP_OK)
-    *pX = x;
-  else
-    *pX = 0;
-
-  return err;
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-/*
-  Locate the Central directory of a zipfile (at the end, just before
-    the global comment)
-*/
-local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream) {
-  unsigned char* buf;
-  ZPOS64_T uSizeFile;
-  ZPOS64_T uBackRead;
-  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-  ZPOS64_T uPosFound=0;
-
-  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-    return 0;
-
-
-  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
-  if (uMaxBack>uSizeFile)
-    uMaxBack = uSizeFile;
-
-  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-  if (buf==NULL)
-    return 0;
-
-  uBackRead = 4;
-  while (uBackRead<uMaxBack)
-  {
-    uLong uReadSize;
-    ZPOS64_T uReadPos ;
-    int i;
-    if (uBackRead+BUFREADCOMMENT>uMaxBack)
-      uBackRead = uMaxBack;
-    else
-      uBackRead+=BUFREADCOMMENT;
-    uReadPos = uSizeFile-uBackRead ;
-
-    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
-    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-      break;
-
-    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-      break;
-
-    for (i=(int)uReadSize-3; (i--)>0;)
-      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-        ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-      {
-        uPosFound = uReadPos+(unsigned)i;
-        break;
-      }
-
-    if (uPosFound!=0)
-      break;
-  }
-  free(buf);
-  return uPosFound;
-}
-
-/*
-Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
-the global comment)
-*/
-local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream) {
-  unsigned char* buf;
-  ZPOS64_T uSizeFile;
-  ZPOS64_T uBackRead;
-  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-  ZPOS64_T uPosFound=0;
-  uLong uL;
-  ZPOS64_T relativeOffset;
-
-  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-    return 0;
-
-  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
-  if (uMaxBack>uSizeFile)
-    uMaxBack = uSizeFile;
-
-  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-  if (buf==NULL)
-    return 0;
-
-  uBackRead = 4;
-  while (uBackRead<uMaxBack)
-  {
-    uLong uReadSize;
-    ZPOS64_T uReadPos;
-    int i;
-    if (uBackRead+BUFREADCOMMENT>uMaxBack)
-      uBackRead = uMaxBack;
-    else
-      uBackRead+=BUFREADCOMMENT;
-    uReadPos = uSizeFile-uBackRead ;
-
-    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
-    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-      break;
-
-    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-      break;
-
-    for (i=(int)uReadSize-3; (i--)>0;)
-    {
-      // Signature "0x07064b50" Zip64 end of central directory locater
-      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
-      {
-        uPosFound = uReadPos+(unsigned)i;
-        break;
-      }
-    }
-
-      if (uPosFound!=0)
-        break;
-  }
-
-  free(buf);
-  if (uPosFound == 0)
-    return 0;
-
-  /* Zip64 end of central directory locator */
-  if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
-    return 0;
-
-  /* the signature, already checked */
-  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
-    return 0;
-
-  /* number of the disk with the start of the zip64 end of  central directory */
-  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
-    return 0;
-  if (uL != 0)
-    return 0;
-
-  /* relative offset of the zip64 end of central directory record */
-  if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
-    return 0;
-
-  /* total number of disks */
-  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
-    return 0;
-  if (uL != 1)
-    return 0;
-
-  /* Goto Zip64 end of central directory record */
-  if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
-    return 0;
-
-  /* the signature */
-  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
-    return 0;
-
-  if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
-    return 0;
-
-  return relativeOffset;
-}
-
-local int LoadCentralDirectoryRecord(zip64_internal* pziinit) {
-  int err=ZIP_OK;
-  ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-
-  ZPOS64_T size_central_dir;     /* size of the central directory  */
-  ZPOS64_T offset_central_dir;   /* offset of start of central directory */
-  ZPOS64_T central_pos;
-  uLong uL;
-
-  uLong number_disk;          /* number of the current disk, used for
-                              spanning ZIP, unsupported, always 0*/
-  uLong number_disk_with_CD;  /* number of the disk with central dir, used
-                              for spanning ZIP, unsupported, always 0*/
-  ZPOS64_T number_entry;
-  ZPOS64_T number_entry_CD;      /* total number of entries in
-                                the central dir
-                                (same than number_entry on nospan) */
-  uLong VersionMadeBy;
-  uLong VersionNeeded;
-  uLong size_comment;
-
-  int hasZIP64Record = 0;
-
-  // check first if we find a ZIP64 record
-  central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
-  if(central_pos > 0)
-  {
-    hasZIP64Record = 1;
-  }
-  else if(central_pos == 0)
-  {
-    central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
-  }
-
-/* disable to allow appending to empty ZIP archive
-        if (central_pos==0)
-            err=ZIP_ERRNO;
-*/
-
-  if(hasZIP64Record)
-  {
-    ZPOS64_T sizeEndOfCentralDirectory;
-    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
-      err=ZIP_ERRNO;
-
-    /* the signature, already checked */
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* size of zip64 end of central directory record */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* version made by */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* version needed to extract */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* number of this disk */
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* number of the disk with the start of the central directory */
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* total number of entries in the central directory on this disk */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* total number of entries in the central directory */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
-      err=ZIP_BADZIPFILE;
-
-    /* size of the central directory */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* offset of start of central directory with respect to the
-    starting disk number */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    // TODO..
-    // read the comment from the standard central header.
-    size_comment = 0;
-  }
-  else
-  {
-    // Read End of central Directory info
-    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-      err=ZIP_ERRNO;
-
-    /* the signature, already checked */
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* number of this disk */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* number of the disk with the start of the central directory */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* total number of entries in the central dir on this disk */
-    number_entry = 0;
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-    else
-      number_entry = uL;
-
-    /* total number of entries in the central dir */
-    number_entry_CD = 0;
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-    else
-      number_entry_CD = uL;
-
-    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
-      err=ZIP_BADZIPFILE;
-
-    /* size of the central directory */
-    size_central_dir = 0;
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-    else
-      size_central_dir = uL;
-
-    /* offset of start of central directory with respect to the starting disk number */
-    offset_central_dir = 0;
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-    else
-      offset_central_dir = uL;
-
-
-    /* zipfile global comment length */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
-      err=ZIP_ERRNO;
-  }
-
-  if ((central_pos<offset_central_dir+size_central_dir) &&
-    (err==ZIP_OK))
-    err=ZIP_BADZIPFILE;
-
-  if (err!=ZIP_OK)
-  {
-    ZCLOSE64(pziinit->z_filefunc, pziinit->filestream);
-    return ZIP_ERRNO;
-  }
-
-  if (size_comment>0)
-  {
-    pziinit->globalcomment = (char*)ALLOC(size_comment+1);
-    if (pziinit->globalcomment)
-    {
-      size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
-      pziinit->globalcomment[size_comment]=0;
-    }
-  }
-
-  byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
-  pziinit->add_position_when_writing_offset = byte_before_the_zipfile;
-
-  {
-    ZPOS64_T size_central_dir_to_read = size_central_dir;
-    size_t buf_size = SIZEDATA_INDATABLOCK;
-    void* buf_read = (void*)ALLOC(buf_size);
-    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
-      err=ZIP_ERRNO;
-
-    while ((size_central_dir_to_read>0) && (err==ZIP_OK))
-    {
-      ZPOS64_T read_this = SIZEDATA_INDATABLOCK;
-      if (read_this > size_central_dir_to_read)
-        read_this = size_central_dir_to_read;
-
-      if (ZREAD64(pziinit->z_filefunc, pziinit->filestream,buf_read,(uLong)read_this) != read_this)
-        err=ZIP_ERRNO;
-
-      if (err==ZIP_OK)
-        err = add_data_in_datablock(&pziinit->central_dir,buf_read, (uLong)read_this);
-
-      size_central_dir_to_read-=read_this;
-    }
-    free(buf_read);
-  }
-  pziinit->begin_pos = byte_before_the_zipfile;
-  pziinit->number_entry = number_entry_CD;
-
-  if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
-    err=ZIP_ERRNO;
-
-  return err;
-}
-
-
-#endif /* !NO_ADDFILEINEXISTINGZIP*/
-
-
-/************************************************************/
-extern zipFile ZEXPORT zipOpen3(const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def) {
-    zip64_internal ziinit;
-    zip64_internal* zi;
-    int err=ZIP_OK;
-
-    ziinit.z_filefunc.zseek32_file = NULL;
-    ziinit.z_filefunc.ztell32_file = NULL;
-    if (pzlib_filefunc64_32_def==NULL)
-        fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
-    else
-        ziinit.z_filefunc = *pzlib_filefunc64_32_def;
-
-    ziinit.filestream = ZOPEN64(ziinit.z_filefunc,
-                  pathname,
-                  (append == APPEND_STATUS_CREATE) ?
-                  (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
-                    (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
-
-    if (ziinit.filestream == NULL)
-        return NULL;
-
-    if (append == APPEND_STATUS_CREATEAFTER)
-        ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
-
-    ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
-    ziinit.in_opened_file_inzip = 0;
-    ziinit.ci.stream_initialised = 0;
-    ziinit.number_entry = 0;
-    ziinit.add_position_when_writing_offset = 0;
-    init_linkedlist(&(ziinit.central_dir));
-
-
-
-    zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
-    if (zi==NULL)
-    {
-        ZCLOSE64(ziinit.z_filefunc,ziinit.filestream);
-        return NULL;
-    }
-
-    /* now we add file in a zipfile */
-#    ifndef NO_ADDFILEINEXISTINGZIP
-    ziinit.globalcomment = NULL;
-    if (append == APPEND_STATUS_ADDINZIP)
-    {
-      // Read and Cache Central Directory Records
-      err = LoadCentralDirectoryRecord(&ziinit);
-    }
-
-    if (globalcomment)
-    {
-      *globalcomment = ziinit.globalcomment;
-    }
-#    endif /* !NO_ADDFILEINEXISTINGZIP*/
-
-    if (err != ZIP_OK)
-    {
-#    ifndef NO_ADDFILEINEXISTINGZIP
-        free(ziinit.globalcomment);
-#    endif /* !NO_ADDFILEINEXISTINGZIP*/
-        free(zi);
-        return NULL;
-    }
-    else
-    {
-        *zi = ziinit;
-        return (zipFile)zi;
-    }
-}
-
-extern zipFile ZEXPORT zipOpen2(const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def) {
-    if (pzlib_filefunc32_def != NULL)
-    {
-        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
-        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
-        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
-    }
-    else
-        return zipOpen3(pathname, append, globalcomment, NULL);
-}
-
-extern zipFile ZEXPORT zipOpen2_64(const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def) {
-    if (pzlib_filefunc_def != NULL)
-    {
-        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
-        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
-        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
-        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
-        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
-    }
-    else
-        return zipOpen3(pathname, append, globalcomment, NULL);
-}
-
-
-
-extern zipFile ZEXPORT zipOpen(const char* pathname, int append) {
-    return zipOpen3((const void*)pathname,append,NULL,NULL);
-}
-
-extern zipFile ZEXPORT zipOpen64(const void* pathname, int append) {
-    return zipOpen3(pathname,append,NULL,NULL);
-}
-
-local int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local) {
-  /* write the local header */
-  int err;
-  uInt size_filename = (uInt)strlen(filename);
-  uInt size_extrafield = size_extrafield_local;
-
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC, 4);
-
-  if (err==ZIP_OK)
-  {
-    if(zi->ci.zip64)
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
-  }
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
-
-  // CRC / Compressed size / Uncompressed size will be filled in later and rewritten later
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
-  if (err==ZIP_OK)
-  {
-    if(zi->ci.zip64)
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* compressed size, unknown */
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
-  }
-  if (err==ZIP_OK)
-  {
-    if(zi->ci.zip64)
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* uncompressed size, unknown */
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
-  }
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
-
-  if(zi->ci.zip64)
-  {
-    size_extrafield += 20;
-  }
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield,2);
-
-  if ((err==ZIP_OK) && (size_filename > 0))
-  {
-    if (ZWRITE64(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
-      err = ZIP_ERRNO;
-  }
-
-  if ((err==ZIP_OK) && (size_extrafield_local > 0))
-  {
-    if (ZWRITE64(zi->z_filefunc, zi->filestream, extrafield_local, size_extrafield_local) != size_extrafield_local)
-      err = ZIP_ERRNO;
-  }
-
-
-  if ((err==ZIP_OK) && (zi->ci.zip64))
-  {
-      // write the Zip64 extended info
-      short HeaderID = 1;
-      short DataSize = 16;
-      ZPOS64_T CompressedSize = 0;
-      ZPOS64_T UncompressedSize = 0;
-
-      // Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file)
-      zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
-
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)HeaderID,2);
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)DataSize,2);
-
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
-  }
-
-  return err;
-}
-
-/*
- NOTE.
- When writing RAW the ZIP64 extended information in extrafield_local and extrafield_global needs to be stripped
- before calling this function it can be done with zipRemoveExtraInfoBlock
-
- It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize
- unnecessary allocations.
- */
-extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                           const void* extrafield_local, uInt size_extrafield_local,
-                                           const void* extrafield_global, uInt size_extrafield_global,
-                                           const char* comment, int method, int level, int raw,
-                                           int windowBits,int memLevel, int strategy,
-                                           const char* password, uLong crcForCrypting,
-                                           uLong versionMadeBy, uLong flagBase, int zip64) {
-    zip64_internal* zi;
-    uInt size_filename;
-    uInt size_comment;
-    uInt i;
-    int err = ZIP_OK;
-
-#    ifdef NOCRYPT
-    (crcForCrypting);
-    if (password != NULL)
-        return ZIP_PARAMERROR;
-#    endif
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-
-#ifdef HAVE_BZIP2
-    if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
-      return ZIP_PARAMERROR;
-#else
-    if ((method!=0) && (method!=Z_DEFLATED))
-      return ZIP_PARAMERROR;
-#endif
-
-    // The filename and comment length must fit in 16 bits.
-    if ((filename!=NULL) && (strlen(filename)>0xffff))
-        return ZIP_PARAMERROR;
-    if ((comment!=NULL) && (strlen(comment)>0xffff))
-        return ZIP_PARAMERROR;
-    // The extra field length must fit in 16 bits. If the member also requires
-    // a Zip64 extra block, that will also need to fit within that 16-bit
-    // length, but that will be checked for later.
-    if ((size_extrafield_local>0xffff) || (size_extrafield_global>0xffff))
-        return ZIP_PARAMERROR;
-
-    zi = (zip64_internal*)file;
-
-    if (zi->in_opened_file_inzip == 1)
-    {
-        err = zipCloseFileInZip (file);
-        if (err != ZIP_OK)
-            return err;
-    }
-
-    if (filename==NULL)
-        filename="-";
-
-    if (comment==NULL)
-        size_comment = 0;
-    else
-        size_comment = (uInt)strlen(comment);
-
-    size_filename = (uInt)strlen(filename);
-
-    if (zipfi == NULL)
-        zi->ci.dosDate = 0;
-    else
-    {
-        if (zipfi->dosDate != 0)
-            zi->ci.dosDate = zipfi->dosDate;
-        else
-          zi->ci.dosDate = zip64local_TmzDateToDosDate(&zipfi->tmz_date);
-    }
-
-    zi->ci.flag = flagBase;
-    if ((level==8) || (level==9))
-      zi->ci.flag |= 2;
-    if (level==2)
-      zi->ci.flag |= 4;
-    if (level==1)
-      zi->ci.flag |= 6;
-    if (password != NULL)
-      zi->ci.flag |= 1;
-
-    zi->ci.crc32 = 0;
-    zi->ci.method = method;
-    zi->ci.encrypt = 0;
-    zi->ci.stream_initialised = 0;
-    zi->ci.pos_in_buffered_data = 0;
-    zi->ci.raw = raw;
-    zi->ci.pos_local_header = ZTELL64(zi->z_filefunc,zi->filestream);
-
-    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + size_extrafield_global + size_comment;
-    zi->ci.size_centralExtraFree = 32; // Extra space we have reserved in case we need to add ZIP64 extra info data
-
-    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader + zi->ci.size_centralExtraFree);
-
-    zi->ci.size_centralExtra = size_extrafield_global;
-    zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
-    /* version info */
-    zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
-    zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
-    zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
-    zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
-    zip64local_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
-
-    if (zipfi==NULL)
-        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
-    else
-        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
-
-    if (zipfi==NULL)
-        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
-    else
-        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
-
-    if(zi->ci.pos_local_header >= 0xffffffff)
-      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
-    else
-      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writing_offset,4);
-
-    for (i=0;i<size_filename;i++)
-        *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
-
-    for (i=0;i<size_extrafield_global;i++)
-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
-              *(((const char*)extrafield_global)+i);
-
-    for (i=0;i<size_comment;i++)
-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
-              size_extrafield_global+i) = *(comment+i);
-    if (zi->ci.central_header == NULL)
-        return ZIP_INTERNALERROR;
-
-    zi->ci.zip64 = zip64;
-    zi->ci.totalCompressedData = 0;
-    zi->ci.totalUncompressedData = 0;
-    zi->ci.pos_zip64extrainfo = 0;
-
-    err = Write_LocalFileHeader(zi, filename, size_extrafield_local, extrafield_local);
-
-#ifdef HAVE_BZIP2
-    zi->ci.bstream.avail_in = (uInt)0;
-    zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
-    zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
-    zi->ci.bstream.total_in_hi32 = 0;
-    zi->ci.bstream.total_in_lo32 = 0;
-    zi->ci.bstream.total_out_hi32 = 0;
-    zi->ci.bstream.total_out_lo32 = 0;
-#endif
-
-    zi->ci.stream.avail_in = (uInt)0;
-    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-    zi->ci.stream.next_out = zi->ci.buffered_data;
-    zi->ci.stream.total_in = 0;
-    zi->ci.stream.total_out = 0;
-    zi->ci.stream.data_type = Z_BINARY;
-
-#ifdef HAVE_BZIP2
-    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED || zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-#else
-    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-#endif
-    {
-        if(zi->ci.method == Z_DEFLATED)
-        {
-          zi->ci.stream.zalloc = (alloc_func)0;
-          zi->ci.stream.zfree = (free_func)0;
-          zi->ci.stream.opaque = (voidpf)0;
-
-          if (windowBits>0)
-              windowBits = -windowBits;
-
-          err = deflateInit2(&zi->ci.stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
-
-          if (err==Z_OK)
-              zi->ci.stream_initialised = Z_DEFLATED;
-        }
-        else if(zi->ci.method == Z_BZIP2ED)
-        {
-#ifdef HAVE_BZIP2
-            // Init BZip stuff here
-          zi->ci.bstream.bzalloc = 0;
-          zi->ci.bstream.bzfree = 0;
-          zi->ci.bstream.opaque = (voidpf)0;
-
-          err = BZ2_bzCompressInit(&zi->ci.bstream, level, 0,35);
-          if(err == BZ_OK)
-            zi->ci.stream_initialised = Z_BZIP2ED;
-#endif
-        }
-
-    }
-
-#    ifndef NOCRYPT
-    zi->ci.crypt_header_size = 0;
-    if ((err==Z_OK) && (password != NULL))
-    {
-        unsigned char bufHead[RAND_HEAD_LEN];
-        unsigned int sizeHead;
-        zi->ci.encrypt = 1;
-        zi->ci.pcrc_32_tab = get_crc_table();
-        /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
-
-        sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
-        zi->ci.crypt_header_size = sizeHead;
-
-        if (ZWRITE64(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
-                err = ZIP_ERRNO;
-    }
-#    endif
-
-    if (err==Z_OK)
-        zi->in_opened_file_inzip = 1;
-    return err;
-}
-
-extern int ZEXPORT zipOpenNewFileInZip4(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                        const void* extrafield_local, uInt size_extrafield_local,
-                                        const void* extrafield_global, uInt size_extrafield_global,
-                                        const char* comment, int method, int level, int raw,
-                                        int windowBits,int memLevel, int strategy,
-                                        const char* password, uLong crcForCrypting,
-                                        uLong versionMadeBy, uLong flagBase) {
-    return zipOpenNewFileInZip4_64(file, filename, zipfi,
-                                   extrafield_local, size_extrafield_local,
-                                   extrafield_global, size_extrafield_global,
-                                   comment, method, level, raw,
-                                   windowBits, memLevel, strategy,
-                                   password, crcForCrypting, versionMadeBy, flagBase, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip3(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                        const void* extrafield_local, uInt size_extrafield_local,
-                                        const void* extrafield_global, uInt size_extrafield_global,
-                                        const char* comment, int method, int level, int raw,
-                                        int windowBits,int memLevel, int strategy,
-                                        const char* password, uLong crcForCrypting) {
-    return zipOpenNewFileInZip4_64(file, filename, zipfi,
-                                   extrafield_local, size_extrafield_local,
-                                   extrafield_global, size_extrafield_global,
-                                   comment, method, level, raw,
-                                   windowBits, memLevel, strategy,
-                                   password, crcForCrypting, VERSIONMADEBY, 0, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                         const void* extrafield_local, uInt size_extrafield_local,
-                                         const void* extrafield_global, uInt size_extrafield_global,
-                                         const char* comment, int method, int level, int raw,
-                                         int windowBits,int memLevel, int strategy,
-                                         const char* password, uLong crcForCrypting, int zip64) {
-    return zipOpenNewFileInZip4_64(file, filename, zipfi,
-                                   extrafield_local, size_extrafield_local,
-                                   extrafield_global, size_extrafield_global,
-                                   comment, method, level, raw,
-                                   windowBits, memLevel, strategy,
-                                   password, crcForCrypting, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                        const void* extrafield_local, uInt size_extrafield_local,
-                                        const void* extrafield_global, uInt size_extrafield_global,
-                                        const char* comment, int method, int level, int raw) {
-    return zipOpenNewFileInZip4_64(file, filename, zipfi,
-                                   extrafield_local, size_extrafield_local,
-                                   extrafield_global, size_extrafield_global,
-                                   comment, method, level, raw,
-                                   -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                   NULL, 0, VERSIONMADEBY, 0, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                           const void* extrafield_local, uInt size_extrafield_local,
-                                           const void* extrafield_global, uInt size_extrafield_global,
-                                           const char* comment, int method, int level, int raw, int zip64) {
-    return zipOpenNewFileInZip4_64(file, filename, zipfi,
-                                   extrafield_local, size_extrafield_local,
-                                   extrafield_global, size_extrafield_global,
-                                   comment, method, level, raw,
-                                   -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                   NULL, 0, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                         const void* extrafield_local, uInt size_extrafield_local,
-                                         const void*extrafield_global, uInt size_extrafield_global,
-                                         const char* comment, int method, int level, int zip64) {
-    return zipOpenNewFileInZip4_64(file, filename, zipfi,
-                                   extrafield_local, size_extrafield_local,
-                                   extrafield_global, size_extrafield_global,
-                                   comment, method, level, 0,
-                                   -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                   NULL, 0, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                       const void* extrafield_local, uInt size_extrafield_local,
-                                       const void*extrafield_global, uInt size_extrafield_global,
-                                       const char* comment, int method, int level) {
-    return zipOpenNewFileInZip4_64(file, filename, zipfi,
-                                   extrafield_local, size_extrafield_local,
-                                   extrafield_global, size_extrafield_global,
-                                   comment, method, level, 0,
-                                   -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                   NULL, 0, VERSIONMADEBY, 0, 0);
-}
-
-local int zip64FlushWriteBuffer(zip64_internal* zi) {
-    int err=ZIP_OK;
-
-    if (zi->ci.encrypt != 0)
-    {
-#ifndef NOCRYPT
-        uInt i;
-        int t;
-        for (i=0;i<zi->ci.pos_in_buffered_data;i++)
-            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
-#endif
-    }
-
-    if (ZWRITE64(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data) != zi->ci.pos_in_buffered_data)
-      err = ZIP_ERRNO;
-
-    zi->ci.totalCompressedData += zi->ci.pos_in_buffered_data;
-
-#ifdef HAVE_BZIP2
-    if(zi->ci.method == Z_BZIP2ED)
-    {
-      zi->ci.totalUncompressedData += zi->ci.bstream.total_in_lo32;
-      zi->ci.bstream.total_in_lo32 = 0;
-      zi->ci.bstream.total_in_hi32 = 0;
-    }
-    else
-#endif
-    {
-      zi->ci.totalUncompressedData += zi->ci.stream.total_in;
-      zi->ci.stream.total_in = 0;
-    }
-
-
-    zi->ci.pos_in_buffered_data = 0;
-
-    return err;
-}
-
-extern int ZEXPORT zipWriteInFileInZip(zipFile file, const void* buf, unsigned int len) {
-    zip64_internal* zi;
-    int err=ZIP_OK;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    zi = (zip64_internal*)file;
-
-    if (zi->in_opened_file_inzip == 0)
-        return ZIP_PARAMERROR;
-
-    zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len);
-
-#ifdef HAVE_BZIP2
-    if(zi->ci.method == Z_BZIP2ED && (!zi->ci.raw))
-    {
-      zi->ci.bstream.next_in = (void*)buf;
-      zi->ci.bstream.avail_in = len;
-      err = BZ_RUN_OK;
-
-      while ((err==BZ_RUN_OK) && (zi->ci.bstream.avail_in>0))
-      {
-        if (zi->ci.bstream.avail_out == 0)
-        {
-          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
-            err = ZIP_ERRNO;
-          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
-          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
-        }
-
-
-        if(err != BZ_RUN_OK)
-          break;
-
-        if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-        {
-          uLong uTotalOutBefore_lo = zi->ci.bstream.total_out_lo32;
-//          uLong uTotalOutBefore_hi = zi->ci.bstream.total_out_hi32;
-          err=BZ2_bzCompress(&zi->ci.bstream,  BZ_RUN);
-
-          zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore_lo) ;
-        }
-      }
-
-      if(err == BZ_RUN_OK)
-        err = ZIP_OK;
-    }
-    else
-#endif
-    {
-      zi->ci.stream.next_in = (Bytef*)(uintptr_t)buf;
-      zi->ci.stream.avail_in = len;
-
-      while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
-      {
-          if (zi->ci.stream.avail_out == 0)
-          {
-              if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
-                  err = ZIP_ERRNO;
-              zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-              zi->ci.stream.next_out = zi->ci.buffered_data;
-          }
-
-
-          if(err != ZIP_OK)
-              break;
-
-          if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-          {
-              uLong uTotalOutBefore = zi->ci.stream.total_out;
-              err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
-
-              zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
-          }
-          else
-          {
-              uInt copy_this,i;
-              if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
-                  copy_this = zi->ci.stream.avail_in;
-              else
-                  copy_this = zi->ci.stream.avail_out;
-
-              for (i = 0; i < copy_this; i++)
-                  *(((char*)zi->ci.stream.next_out)+i) =
-                      *(((const char*)zi->ci.stream.next_in)+i);
-              {
-                  zi->ci.stream.avail_in -= copy_this;
-                  zi->ci.stream.avail_out-= copy_this;
-                  zi->ci.stream.next_in+= copy_this;
-                  zi->ci.stream.next_out+= copy_this;
-                  zi->ci.stream.total_in+= copy_this;
-                  zi->ci.stream.total_out+= copy_this;
-                  zi->ci.pos_in_buffered_data += copy_this;
-              }
-          }
-      }// while(...)
-    }
-
-    return err;
-}
-
-extern int ZEXPORT zipCloseFileInZipRaw(zipFile file, uLong uncompressed_size, uLong crc32) {
-    return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
-}
-
-extern int ZEXPORT zipCloseFileInZipRaw64(zipFile file, ZPOS64_T uncompressed_size, uLong crc32) {
-    zip64_internal* zi;
-    ZPOS64_T compressed_size;
-    uLong invalidValue = 0xffffffff;
-    unsigned datasize = 0;
-    int err=ZIP_OK;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    zi = (zip64_internal*)file;
-
-    if (zi->in_opened_file_inzip == 0)
-        return ZIP_PARAMERROR;
-    zi->ci.stream.avail_in = 0;
-
-    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-                {
-                        while (err==ZIP_OK)
-                        {
-                                uLong uTotalOutBefore;
-                                if (zi->ci.stream.avail_out == 0)
-                                {
-                                        if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
-                                                err = ZIP_ERRNO;
-                                        zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-                                        zi->ci.stream.next_out = zi->ci.buffered_data;
-                                }
-                                uTotalOutBefore = zi->ci.stream.total_out;
-                                err=deflate(&zi->ci.stream,  Z_FINISH);
-                                zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
-                        }
-                }
-    else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-    {
-#ifdef HAVE_BZIP2
-      err = BZ_FINISH_OK;
-      while (err==BZ_FINISH_OK)
-      {
-        uLong uTotalOutBefore;
-        if (zi->ci.bstream.avail_out == 0)
-        {
-          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
-            err = ZIP_ERRNO;
-          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
-          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
-        }
-        uTotalOutBefore = zi->ci.bstream.total_out_lo32;
-        err=BZ2_bzCompress(&zi->ci.bstream,  BZ_FINISH);
-        if(err == BZ_STREAM_END)
-          err = Z_STREAM_END;
-
-        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
-      }
-
-      if(err == BZ_FINISH_OK)
-        err = ZIP_OK;
-#endif
-    }
-
-    if (err==Z_STREAM_END)
-        err=ZIP_OK; /* this is normal */
-
-    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
-                {
-        if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
-            err = ZIP_ERRNO;
-                }
-
-    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-    {
-        int tmp_err = deflateEnd(&zi->ci.stream);
-        if (err == ZIP_OK)
-            err = tmp_err;
-        zi->ci.stream_initialised = 0;
-    }
-#ifdef HAVE_BZIP2
-    else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-    {
-      int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
-                        if (err==ZIP_OK)
-                                err = tmperr;
-                        zi->ci.stream_initialised = 0;
-    }
-#endif
-
-    if (!zi->ci.raw)
-    {
-        crc32 = (uLong)zi->ci.crc32;
-        uncompressed_size = zi->ci.totalUncompressedData;
-    }
-    compressed_size = zi->ci.totalCompressedData;
-
-#    ifndef NOCRYPT
-    compressed_size += zi->ci.crypt_header_size;
-#    endif
-
-    // update Current Item crc and sizes,
-    if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
-    {
-      /*version Made by*/
-      zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
-      /*version needed*/
-      zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
-
-    }
-
-    zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
-
-
-    if(compressed_size >= 0xffffffff)
-      zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
-    else
-      zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
-
-    /// set internal file attributes field
-    if (zi->ci.stream.data_type == Z_ASCII)
-        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
-
-    if(uncompressed_size >= 0xffffffff)
-      zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
-    else
-      zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
-
-    // Add ZIP64 extra info field for uncompressed size
-    if(uncompressed_size >= 0xffffffff)
-      datasize += 8;
-
-    // Add ZIP64 extra info field for compressed size
-    if(compressed_size >= 0xffffffff)
-      datasize += 8;
-
-    // Add ZIP64 extra info field for relative offset to local file header of current file
-    if(zi->ci.pos_local_header >= 0xffffffff)
-      datasize += 8;
-
-    if(datasize > 0)
-    {
-      char* p = NULL;
-
-      if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
-      {
-        // we can not write more data to the buffer that we have room for.
-        return ZIP_BADZIPFILE;
-      }
-
-      p = zi->ci.central_header + zi->ci.size_centralheader;
-
-      // Add Extra Information Header for 'ZIP64 information'
-      zip64local_putValue_inmemory(p, 0x0001, 2); // HeaderID
-      p += 2;
-      zip64local_putValue_inmemory(p, datasize, 2); // DataSize
-      p += 2;
-
-      if(uncompressed_size >= 0xffffffff)
-      {
-        zip64local_putValue_inmemory(p, uncompressed_size, 8);
-        p += 8;
-      }
-
-      if(compressed_size >= 0xffffffff)
-      {
-        zip64local_putValue_inmemory(p, compressed_size, 8);
-        p += 8;
-      }
-
-      if(zi->ci.pos_local_header >= 0xffffffff)
-      {
-        zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
-        p += 8;
-      }
-
-      // Update how much extra free space we got in the memory buffer
-      // and increase the centralheader size so the new ZIP64 fields are included
-      // ( 4 below is the size of HeaderID and DataSize field )
-      zi->ci.size_centralExtraFree -= datasize + 4;
-      zi->ci.size_centralheader += datasize + 4;
-
-      // Update the extra info size field
-      zi->ci.size_centralExtra += datasize + 4;
-      zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
-    }
-
-    if (err==ZIP_OK)
-        err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
-
-    free(zi->ci.central_header);
-
-    if (err==ZIP_OK)
-    {
-        // Update the LocalFileHeader with the new values.
-
-        ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
-
-        if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err = ZIP_ERRNO;
-
-        if (err==ZIP_OK)
-            err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
-
-        if(uncompressed_size >= 0xffffffff || compressed_size >= 0xffffffff )
-        {
-          if(zi->ci.pos_zip64extrainfo > 0)
-          {
-            // Update the size in the ZIP64 extended field.
-            if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
-              err = ZIP_ERRNO;
-
-            if (err==ZIP_OK) /* compressed size, unknown */
-              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
-
-            if (err==ZIP_OK) /* uncompressed size, unknown */
-              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
-          }
-          else
-              err = ZIP_BADZIPFILE; // Caller passed zip64 = 0, so no room for zip64 info -> fatal
-        }
-        else
-        {
-          if (err==ZIP_OK) /* compressed size, unknown */
-              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
-
-          if (err==ZIP_OK) /* uncompressed size, unknown */
-              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
-        }
-
-        if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err = ZIP_ERRNO;
-    }
-
-    zi->number_entry ++;
-    zi->in_opened_file_inzip = 0;
-
-    return err;
-}
-
-extern int ZEXPORT zipCloseFileInZip(zipFile file) {
-    return zipCloseFileInZipRaw (file,0,0);
-}
-
-local int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip) {
-  int err = ZIP_OK;
-  ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writing_offset;
-
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
-
-  /*num disks*/
-    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
-  /*relative offset*/
-    if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
-
-  /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
-    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
-
-    return err;
-}
-
-local int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip) {
-  int err = ZIP_OK;
-
-  uLong Zip64DataSize = 44;
-
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
-
-  if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); // why ZPOS64_T of this ?
-
-  if (err==ZIP_OK) /* version made by */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
-
-  if (err==ZIP_OK) /* version needed */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
-
-  if (err==ZIP_OK) /* number of this disk */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
-  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
-  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
-    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
-
-  if (err==ZIP_OK) /* total number of entries in the central dir */
-    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
-
-  if (err==ZIP_OK) /* size of the central directory */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
-
-  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
-  {
-    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
-  }
-  return err;
-}
-
-local int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip) {
-  int err = ZIP_OK;
-
-  /*signature*/
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
-
-  if (err==ZIP_OK) /* number of this disk */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
-
-  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
-
-  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
-  {
-    {
-      if(zi->number_entry >= 0xFFFF)
-        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
-      else
-        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
-    }
-  }
-
-  if (err==ZIP_OK) /* total number of entries in the central dir */
-  {
-    if(zi->number_entry >= 0xFFFF)
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
-  }
-
-  if (err==ZIP_OK) /* size of the central directory */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
-
-  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
-  {
-    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
-    if(pos >= 0xffffffff)
-    {
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
-    }
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writing_offset),4);
-  }
-
-   return err;
-}
-
-local int Write_GlobalComment(zip64_internal* zi, const char* global_comment) {
-  int err = ZIP_OK;
-  uInt size_global_comment = 0;
-
-  if(global_comment != NULL)
-    size_global_comment = (uInt)strlen(global_comment);
-
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
-
-  if (err == ZIP_OK && size_global_comment > 0)
-  {
-    if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
-      err = ZIP_ERRNO;
-  }
-  return err;
-}
-
-extern int ZEXPORT zipClose(zipFile file, const char* global_comment) {
-    zip64_internal* zi;
-    int err = 0;
-    uLong size_centraldir = 0;
-    ZPOS64_T centraldir_pos_inzip;
-    ZPOS64_T pos;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-
-    zi = (zip64_internal*)file;
-
-    if (zi->in_opened_file_inzip == 1)
-    {
-        err = zipCloseFileInZip (file);
-    }
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-    if (global_comment==NULL)
-        global_comment = zi->globalcomment;
-#endif
-
-    centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
-
-    if (err==ZIP_OK)
-    {
-        linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
-        while (ldi!=NULL)
-        {
-            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
-            {
-                if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
-                    err = ZIP_ERRNO;
-            }
-
-            size_centraldir += ldi->filled_in_this_block;
-            ldi = ldi->next_datablock;
-        }
-    }
-    free_linkedlist(&(zi->central_dir));
-
-    pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
-    if(pos >= 0xffffffff || zi->number_entry >= 0xFFFF)
-    {
-      ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
-      Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
-
-      Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
-    }
-
-    if (err==ZIP_OK)
-      err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
-
-    if(err == ZIP_OK)
-      err = Write_GlobalComment(zi, global_comment);
-
-    if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0)
-        if (err == ZIP_OK)
-            err = ZIP_ERRNO;
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-    free(zi->globalcomment);
-#endif
-    free(zi);
-
-    return err;
-}
-
-extern int ZEXPORT zipRemoveExtraInfoBlock(char* pData, int* dataLen, short sHeader) {
-  char* p = pData;
-  int size = 0;
-  char* pNewHeader;
-  char* pTmp;
-  short header;
-  short dataSize;
-
-  int retVal = ZIP_OK;
-
-  if(pData == NULL || dataLen == NULL || *dataLen < 4)
-    return ZIP_PARAMERROR;
-
-  pNewHeader = (char*)ALLOC((unsigned)*dataLen);
-  pTmp = pNewHeader;
-
-  while(p < (pData + *dataLen))
-  {
-    header = *(short*)p;
-    dataSize = *(((short*)p)+1);
-
-    if( header == sHeader ) // Header found.
-    {
-      p += dataSize + 4; // skip it. do not copy to temp buffer
-    }
-    else
-    {
-      // Extra Info block should not be removed, So copy it to the temp buffer.
-      memcpy(pTmp, p, dataSize + 4);
-      p += dataSize + 4;
-      size += dataSize + 4;
-    }
-
-  }
-
-  if(size < *dataLen)
-  {
-    // clean old extra info block.
-    memset(pData,0, *dataLen);
-
-    // copy the new extra info block over the old
-    if(size > 0)
-      memcpy(pData, pNewHeader, size);
-
-    // set the new extra info size
-    *dataLen = size;
-
-    retVal = ZIP_OK;
-  }
-  else
-    retVal = ZIP_ERRNO;
-
-  free(pNewHeader);
-
-  return retVal;
-}
diff --git a/Telegram/ThirdParty/minizip/zip.h b/Telegram/ThirdParty/minizip/zip.h
deleted file mode 100644
index 3e230d3405f603..00000000000000
--- a/Telegram/ThirdParty/minizip/zip.h
+++ /dev/null
@@ -1,364 +0,0 @@
-/* zip.h -- IO on .zip files using zlib
-   Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-         ---------------------------------------------------------------------------
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-        ---------------------------------------------------------------------------
-
-        Changes
-
-        See header of zip.h
-
-*/
-
-#ifndef _zip12_H
-#define _zip12_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//#define HAVE_BZIP2
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#ifdef HAVE_BZIP2
-#include "bzlib.h"
-#endif
-
-#define Z_BZIP2ED 12
-
-#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagzipFile__ { int unused; } zipFile__;
-typedef zipFile__ *zipFile;
-#else
-typedef voidp zipFile;
-#endif
-
-#define ZIP_OK                          (0)
-#define ZIP_EOF                         (0)
-#define ZIP_ERRNO                       (Z_ERRNO)
-#define ZIP_PARAMERROR                  (-102)
-#define ZIP_BADZIPFILE                  (-103)
-#define ZIP_INTERNALERROR               (-104)
-
-#ifndef DEF_MEM_LEVEL
-#  if MAX_MEM_LEVEL >= 8
-#    define DEF_MEM_LEVEL 8
-#  else
-#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#  endif
-#endif
-/* default memLevel */
-
-/* tm_zip contain date/time info */
-typedef struct tm_zip_s
-{
-    int tm_sec;             /* seconds after the minute - [0,59] */
-    int tm_min;             /* minutes after the hour - [0,59] */
-    int tm_hour;            /* hours since midnight - [0,23] */
-    int tm_mday;            /* day of the month - [1,31] */
-    int tm_mon;             /* months since January - [0,11] */
-    int tm_year;            /* years - [1980..2044] */
-} tm_zip;
-
-typedef struct
-{
-    tm_zip      tmz_date;       /* date in understandable format           */
-    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */
-/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */
-
-    uLong       internal_fa;    /* internal file attributes        2 bytes */
-    uLong       external_fa;    /* external file attributes        4 bytes */
-} zip_fileinfo;
-
-typedef const char* zipcharpc;
-
-
-#define APPEND_STATUS_CREATE        (0)
-#define APPEND_STATUS_CREATEAFTER   (1)
-#define APPEND_STATUS_ADDINZIP      (2)
-
-extern zipFile ZEXPORT zipOpen(const char *pathname, int append);
-extern zipFile ZEXPORT zipOpen64(const void *pathname, int append);
-/*
-  Create a zipfile.
-     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
-       an Unix computer "zlib/zlib113.zip".
-     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
-       will be created at the end of the file.
-         (useful if the file contain a self extractor code)
-     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
-       add files in existing zip (be sure you don't add file that doesn't exist)
-     If the zipfile cannot be opened, the return value is NULL.
-     Else, the return value is a zipFile Handle, usable with other function
-       of this zip package.
-*/
-
-/* Note : there is no delete function into a zipfile.
-   If you want delete file into a zipfile, you must open a zipfile, and create another
-   Of course, you can use RAW reading and writing to copy the file you did not want delete
-*/
-
-extern zipFile ZEXPORT zipOpen2(const char *pathname,
-                                int append,
-                                zipcharpc* globalcomment,
-                                zlib_filefunc_def* pzlib_filefunc_def);
-
-extern zipFile ZEXPORT zipOpen2_64(const void *pathname,
-                                   int append,
-                                   zipcharpc* globalcomment,
-                                   zlib_filefunc64_def* pzlib_filefunc_def);
-
-extern zipFile ZEXPORT zipOpen3(const void *pathname,
-                                int append,
-                                zipcharpc* globalcomment,
-                                zlib_filefunc64_32_def* pzlib_filefunc64_32_def);
-
-extern int ZEXPORT zipOpenNewFileInZip(zipFile file,
-                                       const char* filename,
-                                       const zip_fileinfo* zipfi,
-                                       const void* extrafield_local,
-                                       uInt size_extrafield_local,
-                                       const void* extrafield_global,
-                                       uInt size_extrafield_global,
-                                       const char* comment,
-                                       int method,
-                                       int level);
-
-extern int ZEXPORT zipOpenNewFileInZip64(zipFile file,
-                                         const char* filename,
-                                         const zip_fileinfo* zipfi,
-                                         const void* extrafield_local,
-                                         uInt size_extrafield_local,
-                                         const void* extrafield_global,
-                                         uInt size_extrafield_global,
-                                         const char* comment,
-                                         int method,
-                                         int level,
-                                         int zip64);
-
-/*
-  Open a file in the ZIP for writing.
-  filename : the filename in zip (if NULL, '-' without quote will be used
-  *zipfi contain supplemental information
-  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
-    contains the extrafield data for the local header
-  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
-    contains the extrafield data for the global header
-  if comment != NULL, comment contain the comment string
-  method contain the compression method (0 for store, Z_DEFLATED for deflate)
-  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
-  zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
-                    this MUST be '1' if the uncompressed size is >= 0xffffffff.
-
-*/
-
-
-extern int ZEXPORT zipOpenNewFileInZip2(zipFile file,
-                                        const char* filename,
-                                        const zip_fileinfo* zipfi,
-                                        const void* extrafield_local,
-                                        uInt size_extrafield_local,
-                                        const void* extrafield_global,
-                                        uInt size_extrafield_global,
-                                        const char* comment,
-                                        int method,
-                                        int level,
-                                        int raw);
-
-
-extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file,
-                                           const char* filename,
-                                           const zip_fileinfo* zipfi,
-                                           const void* extrafield_local,
-                                           uInt size_extrafield_local,
-                                           const void* extrafield_global,
-                                           uInt size_extrafield_global,
-                                           const char* comment,
-                                           int method,
-                                           int level,
-                                           int raw,
-                                           int zip64);
-/*
-  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
- */
-
-extern int ZEXPORT zipOpenNewFileInZip3(zipFile file,
-                                        const char* filename,
-                                        const zip_fileinfo* zipfi,
-                                        const void* extrafield_local,
-                                        uInt size_extrafield_local,
-                                        const void* extrafield_global,
-                                        uInt size_extrafield_global,
-                                        const char* comment,
-                                        int method,
-                                        int level,
-                                        int raw,
-                                        int windowBits,
-                                        int memLevel,
-                                        int strategy,
-                                        const char* password,
-                                        uLong crcForCrypting);
-
-extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file,
-                                           const char* filename,
-                                           const zip_fileinfo* zipfi,
-                                           const void* extrafield_local,
-                                           uInt size_extrafield_local,
-                                           const void* extrafield_global,
-                                           uInt size_extrafield_global,
-                                           const char* comment,
-                                           int method,
-                                           int level,
-                                           int raw,
-                                           int windowBits,
-                                           int memLevel,
-                                           int strategy,
-                                           const char* password,
-                                           uLong crcForCrypting,
-                                           int zip64);
-
-/*
-  Same than zipOpenNewFileInZip2, except
-    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
-    password : crypting password (NULL for no crypting)
-    crcForCrypting : crc of file to compress (needed for crypting)
- */
-
-extern int ZEXPORT zipOpenNewFileInZip4(zipFile file,
-                                        const char* filename,
-                                        const zip_fileinfo* zipfi,
-                                        const void* extrafield_local,
-                                        uInt size_extrafield_local,
-                                        const void* extrafield_global,
-                                        uInt size_extrafield_global,
-                                        const char* comment,
-                                        int method,
-                                        int level,
-                                        int raw,
-                                        int windowBits,
-                                        int memLevel,
-                                        int strategy,
-                                        const char* password,
-                                        uLong crcForCrypting,
-                                        uLong versionMadeBy,
-                                        uLong flagBase);
-
-
-extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file,
-                                           const char* filename,
-                                           const zip_fileinfo* zipfi,
-                                           const void* extrafield_local,
-                                           uInt size_extrafield_local,
-                                           const void* extrafield_global,
-                                           uInt size_extrafield_global,
-                                           const char* comment,
-                                           int method,
-                                           int level,
-                                           int raw,
-                                           int windowBits,
-                                           int memLevel,
-                                           int strategy,
-                                           const char* password,
-                                           uLong crcForCrypting,
-                                           uLong versionMadeBy,
-                                           uLong flagBase,
-                                           int zip64);
-/*
-  Same than zipOpenNewFileInZip4, except
-    versionMadeBy : value for Version made by field
-    flag : value for flag field (compression level info will be added)
- */
-
-
-extern int ZEXPORT zipWriteInFileInZip(zipFile file,
-                                       const void* buf,
-                                       unsigned len);
-/*
-  Write data in the zipfile
-*/
-
-extern int ZEXPORT zipCloseFileInZip(zipFile file);
-/*
-  Close the current file in the zipfile
-*/
-
-extern int ZEXPORT zipCloseFileInZipRaw(zipFile file,
-                                        uLong uncompressed_size,
-                                        uLong crc32);
-
-extern int ZEXPORT zipCloseFileInZipRaw64(zipFile file,
-                                          ZPOS64_T uncompressed_size,
-                                          uLong crc32);
-
-/*
-  Close the current file in the zipfile, for file opened with
-    parameter raw=1 in zipOpenNewFileInZip2
-  uncompressed_size and crc32 are value for the uncompressed size
-*/
-
-extern int ZEXPORT zipClose(zipFile file,
-                            const char* global_comment);
-/*
-  Close the zipfile
-*/
-
-
-extern int ZEXPORT zipRemoveExtraInfoBlock(char* pData, int* dataLen, short sHeader);
-/*
-  zipRemoveExtraInfoBlock -  Added by Mathias Svensson
-
-  Remove extra information block from a extra information data for the local file header or central directory header
-
-  It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode.
-
-  0x0001 is the signature header for the ZIP64 extra information blocks
-
-  usage.
-                        Remove ZIP64 Extra information from a central director extra field data
-              zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001);
-
-                        Remove ZIP64 Extra information from a Local File Header extra field data
-        zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001);
-*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _zip64_H */
diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index 9bf4065ea00cbe..616810f1539e3f 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit 9bf4065ea00cbed5e63cec348457ed13143459d0
+Subproject commit 616810f1539e3f5ee917fff42557c5eeb8b4be40
diff --git a/Telegram/ThirdParty/xdg-desktop-portal b/Telegram/ThirdParty/xdg-desktop-portal
index 11c8a96b147aea..23a76c392170db 160000
--- a/Telegram/ThirdParty/xdg-desktop-portal
+++ b/Telegram/ThirdParty/xdg-desktop-portal
@@ -1 +1 @@
-Subproject commit 11c8a96b147aeae70e3f770313f93b367d53fedd
+Subproject commit 23a76c392170dbbd26230f85ef56c3a57e52b857
diff --git a/Telegram/build/build.bat b/Telegram/build/build.bat
index 6dc539c61ecfc5..5c26c723731de8 100644
--- a/Telegram/build/build.bat
+++ b/Telegram/build/build.bat
@@ -186,7 +186,7 @@ if %AlphaVersion% neq 0 (
 
 cd "%HomePath%"
 
-call configure.bat
+call configure.bat -DDESKTOP_APP_ENABLE_LTO=ON
 if %errorlevel% neq 0 goto error
 
 cd "%SolutionPath%"
@@ -279,7 +279,9 @@ echo Done!
 if %BuildUWP% neq 0 (
   cd "%HomePath%"
 
-  mkdir "%ReleasePath%\AppX\modules\%Platform%\d3d"
+  if %BuildARM% equ 0 (
+    mkdir "%ReleasePath%\AppX\modules\%Platform%\d3d"
+  )
   xcopy "Resources\uwp\AppX\*" "%ReleasePath%\AppX\" /E
   set "ResourcePath=%ReleasePath%\AppX\AppxManifest.xml"
   call :repl "Argument= (ProcessorArchitecture=)&quot;ARCHITECTURE&quot;/ $1&quot;%Platform%&quot;" "Filename=!ResourcePath!" || goto error
@@ -288,7 +290,9 @@ if %BuildUWP% neq 0 (
 
   xcopy "%ReleasePath%\%BinaryName%.exe" "%ReleasePath%\AppX\"
   xcopy "%ReleasePath%\StartupTask.exe" "%ReleasePath%\AppX\"
-  xcopy "%ReleasePath%\modules\%Platform%\d3d\d3dcompiler_47.dll" "%ReleasePath%\AppX\modules\%Platform%\d3d\"
+  if %BuildARM% equ 0 (
+    xcopy "%ReleasePath%\modules\%Platform%\d3d\d3dcompiler_47.dll" "%ReleasePath%\AppX\modules\%Platform%\d3d\"
+  )
 
   MakeAppx.exe pack /d "%ReleasePath%\AppX" /l /p ..\out\Release\%BinaryName%.%Platform%.appx
   if %errorlevel% neq 0 goto error
diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh
index aa2dcc1ecf40bd..eb1ed0fa10066f 100755
--- a/Telegram/build/build.sh
+++ b/Telegram/build/build.sh
@@ -255,7 +255,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "macstore" ]; then
       rm -rf "$ReleasePath/$BinaryName.app/Contents/_CodeSignature"
       rm -rf "$ReleasePath/Updater"
 
-      ./configure.sh -D DESKTOP_APP_MAC_ARCH="arm64;x86_64"
+      ./configure.sh -D DESKTOP_APP_MAC_ARCH="arm64;x86_64" -DDESKTOP_APP_ENABLE_LTO=ON
 
       cd $ProjectPath
       cmake --build . --config Release --target Telegram
@@ -280,7 +280,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "macstore" ]; then
     fi
     cd $ReleasePath
   fi
-  if [ "$NotarizeRequestId" == "" ]; then
+  if [ "$NotarizeRequestId" == "" ] || [ "$NotarizeRequestId" == "go" ]; then
     if [ "$BuildTarget" == "mac" ]; then
       if [ ! -f "$ReleasePath/$BundleName/Contents/Frameworks/Updater" ]; then
         Error "Updater not found!"
@@ -358,7 +358,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "macstore" ]; then
   if [ "$BuildTarget" == "mac" ]; then
     cd "$ReleasePath"
 
-    if [ "$NotarizeRequestId" == "" ]; then
+    if [ "$NotarizeRequestId" == "" ] || [ "$NotarizeRequestId" == "go" ]; then
       if [ "$AlphaVersion" == "0" ]; then
         cp -f tsetup_template.dmg tsetup.temp.dmg
         TempDiskPath=`hdiutil attach -nobrowse -noautoopenrw -readwrite tsetup.temp.dmg | awk -F "\t" 'END {print $3}'`
@@ -391,7 +391,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "macstore" ]; then
         SetupFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
       fi
 
-      if [ "$NotarizeRequestId" == "" ]; then
+      if [ "$NotarizeRequestId" == "" ] || [ "$NotarizeRequestId" == "go" ]; then
         rm -rf "$ReleasePath/AlphaTemp"
         mkdir "$ReleasePath/AlphaTemp"
         mkdir "$ReleasePath/AlphaTemp/$BinaryName"
diff --git a/Telegram/build/changelog2appdata.py b/Telegram/build/changelog2appstream.py
similarity index 86%
rename from Telegram/build/changelog2appdata.py
rename to Telegram/build/changelog2appstream.py
index bbcd950329be6c..9879db98074a13 100755
--- a/Telegram/build/changelog2appdata.py
+++ b/Telegram/build/changelog2appstream.py
@@ -52,24 +52,24 @@ def get_changelog_xml(changelog, max_items=None):
         releases.append(release)
     return releases
 
-def update_appdata(appdata_path, changelog, max_items=None):
-    appdata = ET.parse(appdata_path)
-    root = appdata.getroot()
+def update_metadata(metadata_path, changelog, max_items=None):
+    metadata = ET.parse(metadata_path)
+    root = metadata.getroot()
     releases = root.find("releases")
     if releases is not None:
         root.remove(releases)
     root.append(
         get_changelog_xml(changelog, max_items)
     )
-    appdata.write(appdata_path, encoding="utf-8", xml_declaration=True)
+    metadata.write(metadata_path, encoding="utf-8", xml_declaration=True)
 
 def main():
     ap = argparse.ArgumentParser("Parse Telegram changelog")
     ap.add_argument("-c", "--changelog-path", default="changelog.txt")
-    ap.add_argument("-a", "--appdata-path", default="lib/xdg/org.telegram.desktop.metainfo.xml")
+    ap.add_argument("-m", "--metadata-path", default="lib/xdg/org.telegram.desktop.metainfo.xml")
     ap.add_argument("-n", "--num-releases", type=int, default=None)
     args = ap.parse_args()
-    update_appdata(args.appdata_path,
+    update_metadata(args.metadata_path,
                    parse_changelog(args.changelog_path),
                    max_items=args.num_releases)
 
diff --git a/Telegram/build/deploy.sh b/Telegram/build/deploy.sh
index e3217ca40973ee..90618ea558edc8 100755
--- a/Telegram/build/deploy.sh
+++ b/Telegram/build/deploy.sh
@@ -70,9 +70,9 @@ else
   DeployMac="1"
   DeployWin="1"
   DeployWin64="1"
-  DeployWinArm="0"
+  DeployWinArm="1"
   DeployLinux="1"
-  echo "Deploying four versions of $AppVersionStrFull: for Windows 32 bit, Windows 64 bit, macOS and Linux 64 bit.."
+  echo "Deploying five versions of $AppVersionStrFull: for Windows 32 bit / 64 bit / on ARM, macOS and Linux 64 bit.."
 fi
 if [ "$BuildTarget" == "mac" ]; then
   BackupPath="$HOME/Projects/backup/tdesktop"
@@ -102,7 +102,7 @@ Win64RemoteFolder="tx64"
 WinArmDeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull/tarm64"
 WinArmUpdateFile="tarm64upd$AppVersion"
 WinArmSetupFile="tsetup-arm64.$AppVersionStrFull.exe"
-WinArmPortablefile="tportable-arm64.$AppVersionStrFull.zip"
+WinArmPortableFile="tportable-arm64.$AppVersionStrFull.zip"
 WinArmRemoteFolder="tarm64"
 LinuxDeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull/tlinux"
 LinuxUpdateFile="tlinuxupd$AppVersion"
@@ -138,7 +138,7 @@ if [ "$AlphaVersion" != "0" ]; then
   Win64UpdateFile="${Win64UpdateFile}_${AlphaSignature}"
   Win64PortableFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
   WinArmUpdateFile="${WinArmUpdateFile}_${AlphaSignature}"
-  WinArmPortablefile="talpha${AlphaVersion}_${AlphaSignature}.zip"
+  WinArmPortableFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
   LinuxUpdateFile="${LinuxUpdateFile}_${AlphaSignature}"
   LinuxSetupFile="talpha${AlphaVersion}_${AlphaSignature}.tar.xz"
 fi
diff --git a/Telegram/build/docker/build.sh b/Telegram/build/docker/build.sh
index 4d84f0da69ad09..786f114a29d01b 100755
--- a/Telegram/build/docker/build.sh
+++ b/Telegram/build/docker/build.sh
@@ -22,11 +22,11 @@ ProjectPath="$HomePath/../out"
 ReleasePath="$ProjectPath/Release"
 BinaryName="Telegram"
 
-if [ ! -f "/usr/bin/cmake" ]; then
+if ! command -v cmake >/dev/null 2>&1; then
   ln -s cmake3 /usr/bin/cmake
 fi
 
-./configure.sh
+./configure.sh -DDESKTOP_APP_ENABLE_LTO=ON
 
 cd $ProjectPath
 cmake --build . --config Release --target Telegram
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 89ca76a96f6d6d..de86536cd73311 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -1,866 +1,1029 @@
-{%- set GIT = "https://github.com" -%}
-{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
-{%- set GIT_UPDATE_M4 = "git submodule set-url m4 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 && git config -f .gitmodules submodule.m4.shallow true && git submodule init && git submodule update" -%}
-{%- set QT = "6.8.0" -%}
-{%- set QT_TAG = "v" ~ QT -%}
-{%- set CFLAGS_DEBUG = "$CFLAGS -O0 -fno-lto -U_FORTIFY_SOURCE" -%}
-{%- set LibrariesPath = "/usr/src/Libraries" -%}
-
 # syntax=docker/dockerfile:1
 
 FROM rockylinux:8 AS builder
-ENV LANG C.UTF-8
-ENV LIBRARY_PATH /usr/local/lib64:/usr/local/lib:/lib64:/lib:/usr/lib64:/usr/lib
-ENV LD_LIBRARY_PATH $LIBRARY_PATH
-ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig
-
-RUN dnf -y install epel-release \
-	&& dnf config-manager --set-enabled powertools \
-	&& dnf -y install cmake autoconf automake libtool pkgconfig make patch git \
-		python3.11-pip python3.11-devel gperf flex bison clang lld nasm yasm \
-		file which perl-open perl-XML-Parser perl-IPC-Cmd xorg-x11-util-macros \
-		gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-binutils \
-		gcc-toolset-12-libasan-devel libffi-devel fontconfig-devel freetype-devel \
-		libX11-devel alsa-lib-devel pulseaudio-libs-devel mesa-libGL-devel \
-		mesa-libEGL-devel mesa-libgbm-devel libdrm-devel vulkan-devel libva-devel \
-		libvdpau-devel glib2-devel at-spi2-core-devel gtk3-devel boost1.78-devel fmt-devel \
-	&& dnf clean all
-
-SHELL [ "bash", "-c", ". /opt/rh/gcc-toolset-12/enable; exec bash -c \"$@\"", "-s"]
-
-WORKDIR {{ LibrariesPath }}
-
-RUN python3 -m pip install meson ninja
-
-ENV AR gcc-ar
-ENV RANLIB gcc-ranlib
-ENV NM gcc-nm
-ENV CFLAGS {% if DEBUG %}-g{% endif %} -O3 {% if LTO %}-flto=auto -ffat-lto-objects{% endif %} -pipe -fPIC -fno-strict-aliasing -fexceptions -fasynchronous-unwind-tables -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fstack-protector-strong -fstack-clash-protection -fcf-protection -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS
-ENV CXXFLAGS $CFLAGS
+SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
+
+ENV LANG=C.UTF-8
+ENV TOOLSET=gcc-toolset-15
+ENV PATH=/opt/rh/$TOOLSET/root/usr/bin:$PATH
+ENV LIBRARY_PATH=/opt/rh/$TOOLSET/root/usr/lib64:/opt/rh/$TOOLSET/root/usr/lib:/usr/local/lib64:/usr/local/lib:/lib64:/lib:/usr/lib64:/usr/lib
+ENV LD_LIBRARY_PATH=$LIBRARY_PATH
+ENV PKG_CONFIG_PATH=/opt/rh/$TOOLSET/root/usr/lib64/pkgconfig:/opt/rh/$TOOLSET/root/usr/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig
+
+RUN --mount=type=cache,target=/var/cache/dnf <<EOF
+dnf -y install epel-release
+dnf config-manager --set-enabled powertools
+dnf -y install autoconf automake libtool pkgconfig make patch git \
+	python3.11-pip python3.11-devel gperf flex bison clang-tools-extra \
+	lld ccache nasm file which wget perl-open perl-XML-Parser perl-IPC-Cmd \
+	xorg-x11-util-macros $TOOLSET-gcc $TOOLSET-gcc-c++ $TOOLSET-binutils \
+	$TOOLSET-gdb $TOOLSET-libasan-devel libffi-devel fontconfig-devel \
+	freetype-devel libX11-devel wayland-devel alsa-lib-devel \
+	pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel mesa-libgbm-devel \
+	libdrm-devel vulkan-devel libva-devel libvdpau-devel libselinux-devel \
+	libmount-devel systemd-devel glib2-devel gobject-introspection-devel \
+	at-spi2-core-devel gtk3-devel
+EOF
+
+RUN <<EOF
+alternatives --set python3 /usr/bin/python3.11
+python3 -m pip install cmake meson ninja
+EOF
+
+RUN <<EOF
+cat <<CAT > /usr/local/bin/pkg-config
+#!/bin/sh
+for i in "\$@"; do
+	[ "\$i" = "--version" ] && exec /usr/bin/pkg-config "\$i"
+done
+exec /usr/bin/pkg-config --static "\$@"
+CAT
+chmod +x /usr/local/bin/pkg-config
+
+CMAKE_ROOT="$(cmake --system-information | sed -n 's/^CMAKE_ROOT "\([^"]*\)"$/\1/p')"
+test -n "$CMAKE_ROOT"
+sed -i '/CMAKE_${lang}_FLAGS_DEBUG_INIT/s/")/ -O0 {% if LTO %}-fno-lto -fno-use-linker-plugin{% endif %} -fuse-ld=lld")/' "$CMAKE_ROOT/Modules/Compiler/GNU.cmake"
+sed -i '/__gcc_hints/d' "$CMAKE_ROOT/Modules/Compiler/GNU-FindBinUtils.cmake"
+sed -i '1i set(_CMAKE_TOOLCHAIN_LOCATION "")' "$CMAKE_ROOT/Modules/CMakeFindBinUtils.cmake"
+sed -i 's/NO_DEFAULT_PATH//g; s/PKG_CONFIG_ALLOW_SYSTEM_LIBS/PKG_CONFIG_IS_DUMB/g' "$CMAKE_ROOT/Modules/FindPkgConfig.cmake"
+sed -i '/Requires.private: valgrind/d' /usr/lib64/pkgconfig/libdrm.pc
+sed -i '/Requires.private: gl/s/gl/opengl glx/' /usr/lib64/pkgconfig/epoxy.pc
+sed -i 's/-lharfbuzz//' /usr/lib64/pkgconfig/harfbuzz.pc
+sed -i 's/-lpng16//' /usr/lib64/pkgconfig/libpng16.pc
+
+rm /etc/profile.d/ccache.*
+echo set debuginfod enabled on > /opt/rh/$TOOLSET/root/etc/gdbinit.d/00-debuginfod.gdb
+adduser user
+EOF
+
+WORKDIR /usr/src
+ENV CC="ccache gcc"
+ENV CXX="ccache g++"
+ENV AR=gcc-ar
+ENV RANLIB=gcc-ranlib
+ENV NM=gcc-nm
+ENV CFLAGS='{% if DEBUG %}-g -gdwarf64 -gz{% endif %} {% if MINSIZE %}-Os{% else %}-O3{% endif %} {% if LTO %}-flto=auto -ffat-lto-objects{% endif %} -pipe -fPIC -fno-strict-aliasing -fexceptions -fasynchronous-unwind-tables -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fhardened -Wno-hardened'
+ENV CXXFLAGS=$CFLAGS
+ENV LDFLAGS='-static-libstdc++ -static-libgcc -static-libasan -pthread -Wl,--push-state,--no-as-needed,-ldl,--pop-state -Wl,--as-needed -Wl,-z,muldefs'
+
+ENV CCACHE_DIR=/var/cache/ccache
+ENV CCACHE_UMASK=002
+ENV CCACHE_COMPRESS=1
+ENV CCACHE_MAXSIZE=20G
+
+ENV CMAKE_GENERATOR=Ninja
+ENV CMAKE_BUILD_TYPE=None
+ENV CMAKE_BUILD_PARALLEL_LEVEL='{{ JOBS }}'
+
+ENV SOURCE_DATE_EPOCH=1
+
+RUN <<EOF
+git init Implib.so
+cd Implib.so
+git remote add origin https://github.com/yugr/Implib.so.git
+git fetch --depth=1 origin ecf7bb51a92a0fb16834c5b698570ab25f9f1d21
+git reset --hard FETCH_HEAD
+
+mkdir build
+cd build
+
+implib() {
+	LIBFILE=$(basename $1)
+	LIBNAME=$(basename $1 .so)
+	../implib-gen.py -q $1
+	gcc $CFLAGS -g0 -c -o $LIBFILE.tramp.o $LIBFILE.tramp.S
+	gcc $CFLAGS -c -o $LIBFILE.init.o $LIBFILE.init.c
+	ar rcs /usr/local/lib64/$LIBNAME.a $LIBFILE.tramp.o $LIBFILE.init.o
+}
+
+implib /usr/lib64/libgtk-3.so
+implib /usr/lib64/libgdk-3.so
+implib /usr/lib64/libgdk_pixbuf-2.0.so
+implib /usr/lib64/libpango-1.0.so
+implib /usr/lib64/libvdpau.so
+implib /usr/lib64/libva-x11.so
+implib /usr/lib64/libva-drm.so
+implib /usr/lib64/libva.so
+implib /usr/lib64/libEGL.so
+implib /usr/lib64/libGLX.so
+implib /usr/lib64/libOpenGL.so
+implib /usr/lib64/libGL.so
+implib /usr/lib64/libdrm.so
+implib /usr/lib64/libwayland-egl.so
+implib /usr/lib64/libwayland-cursor.so
+implib /usr/lib64/libwayland-client.so
+implib /usr/lib64/libwayland-server.so
+implib /usr/lib64/libX11-xcb.so
+implib /usr/lib64/libxcb.so
+
+cd ../..
+rm -rf Implib.so
+EOF
 
 FROM builder AS patches
-RUN git init patches \
-	&& cd patches \
-	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin e47e7ed0d383b8ca5622a58a5ffa0c8d5f00651f \
-	&& git reset --hard FETCH_HEAD \
-	&& rm -rf .git
+RUN <<EOF
+git init patches
+cd patches
+git remote add origin https://github.com/desktop-app/patches.git
+git fetch --depth=1 origin 701cfb4b3d6612188d168f198c842114fd64726f
+git reset --hard FETCH_HEAD
+rm -rf .git
+EOF
 
 FROM builder AS zlib
-RUN git init zlib \
-	&& cd zlib \
-	&& git remote add origin {{ GIT }}/madler/zlib.git \
-	&& git fetch --depth=1 origin 643e17b7498d12ab8d15565662880579692f769d \
-	&& git reset --hard FETCH_HEAD \
-	&& ./configure \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/zlib-cache" install \
-	&& cd .. \
-	&& rm -rf zlib
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git init zlib
+cd zlib
+git remote add origin https://github.com/madler/zlib.git
+git fetch --depth=1 origin e3dc0a85b7032e98380dec011bc8f2c2ee0d8fca
+git reset --hard FETCH_HEAD
+sed -i 's/Bool/BOOL/;s/ZLIB::ZLIBSTATIC/MINIZIP::minizipstatic/;s/ZLIB::ZLIB/MINIZIP::minizip/' \
+	contrib/minizip/minizipConfig.cmake.in
+sed -i '/DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"/s@}@}/minizip@' contrib/minizip/CMakeLists.txt
+cmake -B build . \
+	-DZLIB_BUILD_SHARED=OFF \
+	-DZLIB_BUILD_TESTING=OFF \
+	-DZLIB_BUILD_MINIZIP=ON \
+	-DZLIB_MINIZIP_BUILD_SHARED=OFF \
+	-DZLIB_MINIZIP_BUILD_TESTING=OFF
+cmake --build build
+DESTDIR=/usr/src/zlib-cache cmake --install build
+cd ..
+rm -rf zlib
+EOF
 
 FROM builder AS xz
-RUN git clone -b v5.4.4 --depth=1 {{ GIT }}/tukaani-project/xz.git \
-	&& cd xz \
-	&& cmake -B build . -DCMAKE_BUILD_TYPE=None \
-	&& cmake --build build -j$(nproc) \
-	&& DESTDIR="{{ LibrariesPath }}/xz-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf xz
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v5.8.1 --depth=1 https://github.com/tukaani-project/xz.git
+cd xz
+cmake -B build .
+cmake --build build
+DESTDIR=/usr/src/xz-cache cmake --install build
+cd ..
+rm -rf xz
+EOF
 
 FROM builder AS protobuf
-RUN git clone -b v21.9 --depth=1 --recursive --shallow-submodules {{ GIT }}/protocolbuffers/protobuf.git \
-	&& cd protobuf \
-	&& git init third_party/abseil-cpp \
-	&& cd third_party/abseil-cpp \
-	&& git remote add origin {{ GIT }}/abseil/abseil-cpp.git \
-	&& git fetch --depth=1 origin 273292d1cfc0a94a65082ee350509af1d113344d \
-	&& git reset --hard FETCH_HEAD \
-	&& cd ../.. \
-	&& cmake -GNinja -B build . \
-		-DCMAKE_BUILD_TYPE=None \
-		-Dprotobuf_BUILD_TESTS=OFF \
-		-Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \
-		-Dprotobuf_BUILD_LIBPROTOC=ON \
-		-Dprotobuf_WITH_ZLIB=OFF \
-	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/protobuf-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf protobuf
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v30.2 --depth=1 --recursive --shallow-submodules \
+	https://github.com/protocolbuffers/protobuf.git
+cd protobuf
+cmake -B build . \
+	-Dprotobuf_BUILD_TESTS=OFF \
+	-Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \
+	-Dprotobuf_BUILD_LIBPROTOC=ON \
+	-Dprotobuf_WITH_ZLIB=OFF
+cmake --build build
+DESTDIR=/usr/src/protobuf-cache cmake --install build
+cd ..
+rm -rf protobuf
+EOF
 
 FROM builder AS lcms2
-RUN git clone -b lcms2.15 --depth=1 {{ GIT }}/mm2/Little-CMS.git \
-	&& cd Little-CMS \
-	&& meson build \
-		--buildtype=plain \
-		--default-library=both \
-	&& meson compile -C build \
-	&& DESTDIR="{{ LibrariesPath }}/lcms2-cache" meson install -C build \
-	&& cd .. \
-	&& rm -rf Little-CMS
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b lcms2.15 --depth=1 https://github.com/mm2/Little-CMS.git
+cd Little-CMS
+meson build --buildtype=plain --default-library=static
+meson compile -C build
+DESTDIR=/usr/src/lcms2-cache meson install -C build
+cd ..
+rm -rf Little-CMS
+EOF
 
 FROM builder AS brotli
-RUN git clone -b v1.1.0 --depth=1 {{ GIT }}/google/brotli.git \
-	&& cd brotli \
-	&& cmake -GNinja -B build . \
-		-DCMAKE_BUILD_TYPE=None \
-		-DBUILD_SHARED_LIBS=OFF \
-		-DBROTLI_DISABLE_TESTS=ON \
-	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/brotli-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf brotli
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v1.1.0 --depth=1 https://github.com/google/brotli.git
+cd brotli
+cmake -B build . -DBUILD_SHARED_LIBS=OFF -DBROTLI_DISABLE_TESTS=ON
+cmake --build build
+DESTDIR=/usr/src/brotli-cache cmake --install build
+cd ..
+rm -rf brotli
+EOF
 
 FROM builder AS highway
-RUN git clone -b 1.0.7 --depth=1 {{ GIT }}/google/highway.git \
-	&& cd highway \
-	&& cmake -GNinja -B build . \
-		-DCMAKE_BUILD_TYPE=None \
-		-DBUILD_TESTING=OFF \
-		-DHWY_ENABLE_CONTRIB=OFF \
-		-DHWY_ENABLE_EXAMPLES=OFF \
-	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/highway-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf highway
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b 1.0.7 --depth=1 https://github.com/google/highway.git
+cd highway
+cmake -B build . -DBUILD_TESTING=OFF -DHWY_ENABLE_CONTRIB=OFF -DHWY_ENABLE_EXAMPLES=OFF
+cmake --build build
+DESTDIR=/usr/src/highway-cache cmake --install build
+cd ..
+rm -rf highway
+EOF
+
+FROM builder AS mozjpeg
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v4.1.5 --depth=1 https://github.com/mozilla/mozjpeg.git
+cd mozjpeg
+cmake -B build . \
+	-DCMAKE_INSTALL_PREFIX=/usr/local \
+	-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+	-DENABLE_SHARED=OFF \
+	-DWITH_JPEG8=ON \
+	-DPNG_SUPPORTED=OFF
+cmake --build build --parallel
+DESTDIR=/usr/src/mozjpeg-cache cmake --install build
+cd ..
+rm -rf mozjpeg
+EOF
 
 FROM builder AS opus
-RUN git clone -b v1.4 --depth=1 {{ GIT }}/xiph/opus.git \
-	&& cd opus \
-	&& ./autogen.sh \
-	&& ./configure \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/opus-cache" install \
-	&& cd .. \
-	&& rm -rf opus
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v1.5.2 --depth=1 https://github.com/xiph/opus.git
+cd opus
+cmake -B build .
+cmake --build build
+DESTDIR=/usr/src/opus-cache cmake --install build
+cd ..
+rm -rf opus
+EOF
 
 FROM builder AS dav1d
-RUN git clone -b 1.4.1 --depth=1 {{ GIT }}/videolan/dav1d.git \
-	&& cd dav1d \
-	&& meson build \
-		--buildtype=plain \
-		--default-library=both \
-		-Denable_tools=false \
-		-Denable_tests=false \
-	&& meson compile -C build \
-	&& DESTDIR="{{ LibrariesPath }}/dav1d-cache" meson install -C build \
-	&& cd .. \
-	&& rm -rf dav1d
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b 1.5.3 --depth=1 https://github.com/videolan/dav1d.git
+cd dav1d
+meson build \
+	--buildtype=plain \
+	--default-library=static \
+	-Denable_tools=false \
+	-Denable_tests=false
+meson compile -C build
+DESTDIR=/usr/src/dav1d-cache meson install -C build
+cd ..
+rm -rf dav1d
+EOF
 
 FROM builder AS openh264
-RUN git clone -b v2.4.1 --depth=1 {{ GIT }}/cisco/openh264.git \
-	&& cd openh264 \
-	&& meson build \
-		--buildtype=plain \
-		--default-library=both \
-	&& meson compile -C build \
-	&& DESTDIR="{{ LibrariesPath }}/openh264-cache" meson install -C build \
-	&& cd .. \
-	&& rm -rf openh264
-
-FROM builder AS libde265
-RUN git clone -b v1.0.15 --depth=1 {{ GIT }}/strukturag/libde265.git \
-	&& cd libde265 \
-	&& cmake -GNinja . \
-		-DCMAKE_BUILD_TYPE=None \
-		-DBUILD_SHARED_LIBS=OFF \
-		-DENABLE_DECODER=OFF \
-		-DENABLE_SDL=OFF \
-	&& cmake --build . --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/libde265-cache" cmake --install . \
-	&& cd .. \
-	&& rm -rf libde265
-
-FROM builder AS libvpx
-RUN git init libvpx \
-	&& cd libvpx \
-	&& git remote add origin {{ GIT }}/webmproject/libvpx.git \
-	&& git fetch --depth=1 origin 12f3a2ac603e8f10742105519e0cd03c3b8f71dd \
-	&& git reset --hard FETCH_HEAD \
-	&& CFLAGS="$CFLAGS -fno-lto" CXXFLAGS="$CXXFLAGS -fno-lto" ./configure \
-		--disable-examples \
-		--disable-unit-tests \
-		--disable-tools \
-		--disable-docs \
-		--enable-vp8 \
-		--enable-vp9 \
-		--enable-webm-io \
-		--size-limit=4096x4096 \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/libvpx-cache" install \
-	&& cd .. \
-	&& rm -rf libvpx
-
-FROM builder AS libwebp
-RUN git clone -b chrome-m116-5845 --depth=1 {{ GIT }}/webmproject/libwebp.git \
-	&& cd libwebp \
-	&& cmake -GNinja -B build . \
-		-DCMAKE_BUILD_TYPE=None \
-		-DWEBP_BUILD_ANIM_UTILS=OFF \
-		-DWEBP_BUILD_CWEBP=OFF \
-		-DWEBP_BUILD_DWEBP=OFF \
-		-DWEBP_BUILD_GIF2WEBP=OFF \
-		-DWEBP_BUILD_IMG2WEBP=OFF \
-		-DWEBP_BUILD_VWEBP=OFF \
-		-DWEBP_BUILD_WEBPMUX=OFF \
-		-DWEBP_BUILD_WEBPINFO=OFF \
-		-DWEBP_BUILD_EXTRAS=OFF \
-	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/libwebp-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf libwebp
-
-FROM builder AS libavif
-COPY --link --from=dav1d {{ LibrariesPath }}/dav1d-cache /
-
-RUN git clone -b v1.0.4 --depth=1 {{ GIT }}/AOMediaCodec/libavif.git \
-	&& cd libavif \
-	&& cmake -GNinja -B build . \
-		-DCMAKE_BUILD_TYPE=None \
-		-DBUILD_SHARED_LIBS=OFF \
-		-DAVIF_CODEC_DAV1D=ON \
-	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/libavif-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf libavif
-
-FROM builder AS libheif
-COPY --link --from=libde265 {{ LibrariesPath }}/libde265-cache /
-
-RUN git clone -b v1.17.6 --depth=1 {{ GIT }}/strukturag/libheif.git \
-	&& cd libheif \
-	&& cmake -GNinja -B build . \
-		-DCMAKE_BUILD_TYPE=None \
-		-DBUILD_SHARED_LIBS=OFF \
-		-DBUILD_TESTING=OFF \
-		-DENABLE_PLUGIN_LOADING=OFF \
-		-DWITH_X265=OFF \
-		-DWITH_AOM_DECODER=OFF \
-		-DWITH_AOM_ENCODER=OFF \
-		-DWITH_RAV1E=OFF \
-		-DWITH_RAV1E_PLUGIN=OFF \
-		-DWITH_SvtEnc=OFF \
-		-DWITH_SvtEnc_PLUGIN=OFF \
-		-DWITH_DAV1D=OFF \
-		-DWITH_EXAMPLES=OFF \
-	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/libheif-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf libheif
-
-FROM patches AS libjxl
-COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
-COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache /
-COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
-
-RUN git clone -b v0.10.3 --depth=1 {{ GIT }}/libjxl/libjxl.git \
-	&& cd libjxl \
-	&& git apply ../patches/libjxl.patch \
-	&& git submodule update --init --recursive --depth=1 third_party/libjpeg-turbo \
-	&& cmake -GNinja -B build . \
-		-DCMAKE_BUILD_TYPE=None \
-		-DBUILD_SHARED_LIBS=OFF \
-		-DBUILD_TESTING=OFF \
-		-DJPEGXL_ENABLE_DEVTOOLS=OFF \
-		-DJPEGXL_ENABLE_TOOLS=OFF \
-		-DJPEGXL_INSTALL_JPEGLI_LIBJPEG=ON \
-		-DJPEGXL_ENABLE_DOXYGEN=OFF \
-		-DJPEGXL_ENABLE_MANPAGES=OFF \
-		-DJPEGXL_ENABLE_BENCHMARK=OFF \
-		-DJPEGXL_ENABLE_EXAMPLES=OFF \
-		-DJPEGXL_ENABLE_JNI=OFF \
-		-DJPEGXL_ENABLE_SJPEG=OFF \
-		-DJPEGXL_ENABLE_OPENEXR=OFF \
-		-DJPEGXL_ENABLE_SKCMS=OFF \
-	&& cmake --build build --parallel \
-	&& export DESTDIR="{{ LibrariesPath }}/libjxl-cache" \
-	&& cmake --install build \
-	&& cp build/lib/libjpegli-static.a $DESTDIR/usr/local/lib64/libjpeg.a \
-	&& ar rcs $DESTDIR/usr/local/lib64/libjpeg.a build/lib/CMakeFiles/jpegli-libjpeg-obj.dir/jpegli/libjpeg_wrapper.cc.o \
-	&& cd .. \
-	&& rm -rf libjxl
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v2.6.0 --depth=1 https://github.com/cisco/openh264.git
+cd openh264
+meson build --buildtype=plain --default-library=static
+meson compile -C build
+DESTDIR=/usr/src/openh264-cache meson install -C build
+cd ..
+rm -rf openh264
+EOF
+
+FROM builder AS de265
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v1.0.16 --depth=1 https://github.com/strukturag/libde265.git
+cd libde265
+cmake -B build . \
+	-DCMAKE_BUILD_TYPE=None \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DENABLE_DECODER=OFF \
+	-DENABLE_SDL=OFF
+cmake --build build
+DESTDIR=/usr/src/de265-cache cmake --install build
+cd ..
+rm -rf libde265
+EOF
+
+FROM builder AS vpx
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git init libvpx
+cd libvpx
+git remote add origin https://github.com/webmproject/libvpx.git
+git fetch --depth=1 origin 12f3a2ac603e8f10742105519e0cd03c3b8f71dd
+git reset --hard FETCH_HEAD
+CFLAGS="$CFLAGS -fno-lto" CXXFLAGS="$CXXFLAGS -fno-lto" ./configure \
+	--disable-examples \
+	--disable-unit-tests \
+	--disable-tools \
+	--disable-docs \
+	--enable-vp8 \
+	--enable-vp9 \
+	--enable-webm-io \
+	--size-limit=4096x4096
+make HAVE_GNU_STRIP=no -j$(nproc)
+make DESTDIR=/usr/src/vpx-cache install
+cd ..
+rm -rf libvpx
+EOF
+
+FROM builder AS webp
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v1.6.0 --depth=1 https://github.com/webmproject/libwebp.git
+cd libwebp
+cmake -B build . \
+	-DWEBP_BUILD_ANIM_UTILS=OFF \
+	-DWEBP_BUILD_CWEBP=OFF \
+	-DWEBP_BUILD_DWEBP=OFF \
+	-DWEBP_BUILD_GIF2WEBP=OFF \
+	-DWEBP_BUILD_IMG2WEBP=OFF \
+	-DWEBP_BUILD_VWEBP=OFF \
+	-DWEBP_BUILD_WEBPMUX=OFF \
+	-DWEBP_BUILD_WEBPINFO=OFF \
+	-DWEBP_BUILD_EXTRAS=OFF
+cmake --build build
+DESTDIR=/usr/src/webp-cache cmake --install build
+cd ..
+rm -rf libwebp
+EOF
+
+FROM builder AS avif
+COPY --link --from=dav1d /usr/src/dav1d-cache /
+
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v1.3.0 --depth=1 https://github.com/AOMediaCodec/libavif.git
+cd libavif
+cmake -B build . -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_DAV1D=SYSTEM -DAVIF_LIBYUV=OFF
+cmake --build build
+DESTDIR=/usr/src/avif-cache cmake --install build
+cd ..
+rm -rf libavif
+EOF
+
+FROM builder AS heif
+COPY --link --from=de265 /usr/src/de265-cache /
+
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v1.21.2 --depth=1 https://github.com/strukturag/libheif.git
+cd libheif
+cmake -B build . \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
+	-DBUILD_TESTING=OFF \
+	-DENABLE_PLUGIN_LOADING=OFF \
+	-DWITH_X265=OFF \
+	-DWITH_AOM_DECODER=OFF \
+	-DWITH_AOM_ENCODER=OFF \
+	-DWITH_X264=OFF \
+	-DWITH_OpenH264_DECODER=OFF \
+	-DWITH_RAV1E=OFF \
+	-DWITH_RAV1E_PLUGIN=OFF \
+	-DWITH_SvtEnc=OFF \
+	-DWITH_SvtEnc_PLUGIN=OFF \
+	-DWITH_DAV1D=OFF \
+	-DWITH_LIBSHARPYUV=OFF \
+	-DWITH_EXAMPLES=OFF
+cmake --build build
+DESTDIR=/usr/src/heif-cache cmake --install build
+cd ..
+rm -rf libheif
+EOF
+
+FROM builder AS jxl
+COPY --link --from=lcms2 /usr/src/lcms2-cache /
+COPY --link --from=brotli /usr/src/brotli-cache /
+COPY --link --from=highway /usr/src/highway-cache /
+
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v0.11.2 --depth=1 https://github.com/libjxl/libjxl.git
+cd libjxl
+cmake -B build . \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DBUILD_TESTING=OFF \
+	-DJPEGXL_ENABLE_DEVTOOLS=OFF \
+	-DJPEGXL_ENABLE_TOOLS=OFF \
+	-DJPEGXL_ENABLE_DOXYGEN=OFF \
+	-DJPEGXL_ENABLE_MANPAGES=OFF \
+	-DJPEGXL_ENABLE_BENCHMARK=OFF \
+	-DJPEGXL_ENABLE_EXAMPLES=OFF \
+	-DJPEGXL_ENABLE_JNI=OFF \
+	-DJPEGXL_ENABLE_SJPEG=OFF \
+	-DJPEGXL_ENABLE_OPENEXR=OFF \
+	-DJPEGXL_ENABLE_SKCMS=OFF
+cmake --build build
+export DESTDIR=/usr/src/jxl-cache
+cmake --install build
+sed -i 's/-lstdc++//' $DESTDIR/usr/local/lib64/pkgconfig/libjxl*.pc
+cd ..
+rm -rf libjxl
+EOF
 
 FROM builder AS rnnoise
-RUN git clone -b master --depth=1 {{ GIT }}/desktop-app/rnnoise.git \
-	&& cd rnnoise \
-	&& cmake -GNinja -B build . -DCMAKE_BUILD_TYPE=None \
-	&& cmake --build build --parallel \
-	&& mkdir -p "{{ LibrariesPath }}/rnnoise-cache/usr/local/include" \
-	&& cp "include/rnnoise.h" "{{ LibrariesPath }}/rnnoise-cache/usr/local/include/" \
-	&& mkdir -p "{{ LibrariesPath }}/rnnoise-cache/usr/local/lib" \
-	&& cp "build/librnnoise.a" "{{ LibrariesPath }}/rnnoise-cache/usr/local/lib/" \
-	&& cd .. \
-	&& rm -rf rnnoise
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v0.2 --depth=1 https://github.com/xiph/rnnoise.git
+cd rnnoise
+./autogen.sh
+./configure --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/rnnoise-cache install
+cd ..
+rm -rf rnnoise
+EOF
 
 FROM builder AS xcb-proto
-RUN git clone -b xcb-proto-1.16.0 --depth=1 {{ GIT_FREEDESKTOP }}/xcbproto.git \
-	&& cd xcbproto \
-	&& ./autogen.sh \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/xcb-proto-cache" install \
-	&& cd .. \
-	&& rm -rf xcbproto
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b xcb-proto-1.16.0 --depth=1 https://github.com/gitlab-freedesktop-mirrors/xcbproto.git
+cd xcbproto
+./autogen.sh
+make -j$(nproc)
+make DESTDIR=/usr/src/xcb-proto-cache install
+cd ..
+rm -rf xcbproto
+EOF
 
 FROM builder AS xcb
-COPY --link --from=xcb-proto {{ LibrariesPath }}/xcb-proto-cache /
-
-RUN git clone -b libxcb-1.16 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb.git \
-	&& cd libxcb \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/xcb-cache" install \
-	&& cd .. \
-	&& rm -rf libxcb
+COPY --link --from=xcb-proto /usr/src/xcb-proto-cache /
+
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b libxcb-1.16 --depth=1 https://github.com/gitlab-freedesktop-mirrors/libxcb.git
+cd libxcb
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+export DESTDIR=/usr/src/xcb-cache
+make install
+rm $DESTDIR/usr/local/lib/{libxcb.{,l}a,pkgconfig/xcb.pc}
+cd ..
+rm -rf libxcb
+EOF
 
 FROM builder AS xcb-wm
-RUN git clone -b xcb-util-wm-0.4.2 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-wm.git \
-	&& cd libxcb-wm \
-	&& {{ GIT_UPDATE_M4 }} \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/xcb-wm-cache" install \
-	&& cd .. \
-	&& rm -rf libxcb-wm
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b xcb-util-wm-0.4.2 --depth=1 --recursive --shallow-submodules \
+	https://github.com/gitlab-freedesktop-mirrors/libxcb-wm.git
+cd libxcb-wm
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/xcb-wm-cache install
+cd ..
+rm -rf libxcb-wm
+EOF
 
 FROM builder AS xcb-util
-RUN git clone -b xcb-util-0.4.1 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-util.git \
-	&& cd libxcb-util \
-	&& {{ GIT_UPDATE_M4 }} \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/xcb-util-cache" install \
-	&& cd .. \
-	&& rm -rf libxcb-util
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b xcb-util-0.4.1-gitlab --depth=1 --recursive --shallow-submodules \
+	https://github.com/gitlab-freedesktop-mirrors/libxcb-util.git
+cd libxcb-util
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/xcb-util-cache install
+cd ..
+rm -rf libxcb-util
+EOF
 
 FROM builder AS xcb-image
-COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
-
-RUN git clone -b xcb-util-image-0.4.1 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-image.git \
-	&& cd libxcb-image \
-	&& {{ GIT_UPDATE_M4 }} \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/xcb-image-cache" install \
-	&& cd .. \
-	&& rm -rf libxcb-image
+COPY --link --from=xcb-util /usr/src/xcb-util-cache /
+
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b xcb-util-image-0.4.1-gitlab --depth=1 --recursive --shallow-submodules \
+	https://github.com/gitlab-freedesktop-mirrors/libxcb-image.git
+cd libxcb-image
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/xcb-image-cache install
+cd ..
+rm -rf libxcb-image
+EOF
 
 FROM builder AS xcb-keysyms
-RUN git clone -b xcb-util-keysyms-0.4.1 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-keysyms.git \
-	&& cd libxcb-keysyms \
-	&& {{ GIT_UPDATE_M4 }} \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/xcb-keysyms-cache" install \
-	&& cd .. \
-	&& rm -rf libxcb-keysyms
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git init libxcb-keysyms
+cd libxcb-keysyms
+git remote add origin https://github.com/gitlab-freedesktop-mirrors/libxcb-keysyms.git
+git fetch --depth=1 origin ef5cb393d27511ba511c68a54f8ff7b9aab4a384
+git reset --hard FETCH_HEAD
+git submodule update --init --recursive --depth=1
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/xcb-keysyms-cache install
+cd ..
+rm -rf libxcb-keysyms
+EOF
 
 FROM builder AS xcb-render-util
-RUN git clone -b xcb-util-renderutil-0.3.10 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-render-util.git \
-	&& cd libxcb-render-util \
-	&& {{ GIT_UPDATE_M4 }} \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/xcb-render-util-cache" install \
-	&& cd .. \
-	&& rm -rf libxcb-render-util
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git init libxcb-render-util
+cd libxcb-render-util
+git remote add origin https://github.com/gitlab-freedesktop-mirrors/libxcb-render-util.git
+git fetch --depth=1 origin 5ad9853d6ddcac394d42dd2d4e34436b5db9da39
+git reset --hard FETCH_HEAD
+git submodule update --init --recursive --depth=1
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/xcb-render-util-cache install
+cd ..
+rm -rf libxcb-render-util
+EOF
 
 FROM builder AS xcb-cursor
-COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
-COPY --link --from=xcb-image {{ LibrariesPath }}/xcb-image-cache /
-COPY --link --from=xcb-render-util {{ LibrariesPath }}/xcb-render-util-cache /
-
-RUN git clone -b xcb-util-cursor-0.1.4 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-cursor.git \
-	&& cd libxcb-cursor \
-	&& {{ GIT_UPDATE_M4 }} \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/xcb-cursor-cache" install \
-	&& cd .. \
-	&& rm -rf libxcb-cursor
-
-FROM builder AS libXext
-RUN git clone -b libXext-1.3.5 --depth=1 {{ GIT_FREEDESKTOP }}/libxext.git \
-	&& cd libxext \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/libXext-cache" install \
-	&& cd .. \
-	&& rm -rf libxext
-
-FROM builder AS libXtst
-RUN git clone -b libXtst-1.2.4 --depth=1 {{ GIT_FREEDESKTOP }}/libxtst.git \
-	&& cd libxtst \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/libXtst-cache" install \
-	&& cd .. \
-	&& rm -rf libxtst
-
-FROM builder AS libXfixes
-RUN git clone -b libXfixes-5.0.3 --depth=1 {{ GIT_FREEDESKTOP }}/libxfixes.git \
-	&& cd libxfixes \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/libXfixes-cache" install \
-	&& cd .. \
-	&& rm -rf libxfixes
-
-FROM builder AS libXv
-COPY --link --from=libXext {{ LibrariesPath }}/libXext-cache /
-
-RUN git clone -b libXv-1.0.12 --depth=1 {{ GIT_FREEDESKTOP }}/libxv.git \
-	&& cd libxv \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/libXv-cache" install \
-	&& cd .. \
-	&& rm -rf libxv
-
-FROM builder AS libXrandr
-RUN git clone -b libXrandr-1.5.3 --depth=1 {{ GIT_FREEDESKTOP }}/libxrandr.git \
-	&& cd libxrandr \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/libXrandr-cache" install \
-	&& cd .. \
-	&& rm -rf libxrandr
-
-FROM builder AS libXrender
-RUN git clone -b libXrender-0.9.11 --depth=1 {{ GIT_FREEDESKTOP }}/libxrender.git \
-	&& cd libxrender \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/libXrender-cache" install \
-	&& cd .. \
-	&& rm -rf libxrender
-
-FROM builder AS libXdamage
-RUN git clone -b libXdamage-1.1.6 --depth=1 {{ GIT_FREEDESKTOP }}/libxdamage.git \
-	&& cd libxdamage \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/libXdamage-cache" install \
-	&& cd .. \
-	&& rm -rf libxdamage
-
-FROM builder AS libXcomposite
-RUN git clone -b libXcomposite-0.4.6 --depth=1 {{ GIT_FREEDESKTOP }}/libxcomposite.git \
-	&& cd libxcomposite \
-	&& ./autogen.sh --enable-static \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/libXcomposite-cache" install \
-	&& cd .. \
-	&& rm -rf libxcomposite
-
-FROM builder AS wayland
-RUN git clone -b 1.19.0 --depth=1 {{ GIT_FREEDESKTOP }}/wayland.git \
-	&& cd wayland \
-	&& sed -i "/subdir('tests')/d" meson.build \
-	&& meson build \
-		--buildtype=plain \
-		--default-library=both \
-		-Ddocumentation=false \
-		-Ddtd_validation=false \
-		-Dicon_directory=/usr/share/icons \
-	&& meson compile -C build \
-	&& DESTDIR="{{ LibrariesPath }}/wayland-cache" meson install -C build \
-	&& cd .. \
-	&& rm -rf wayland
+COPY --link --from=xcb-util /usr/src/xcb-util-cache /
+COPY --link --from=xcb-image /usr/src/xcb-image-cache /
+COPY --link --from=xcb-render-util /usr/src/xcb-render-util-cache /
+
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git init libxcb-cursor
+cd libxcb-cursor
+git remote add origin https://github.com/gitlab-freedesktop-mirrors/libxcb-cursor.git
+git fetch --depth=1 origin 4929f6051658ba5424b41703a1fb63f9db896065
+git reset --hard FETCH_HEAD
+git submodule update --init --recursive --depth=1
+./autogen.sh \
+	--enable-static \
+	--disable-shared \
+	--with-cursorpath='~/.local/share/icons:~/.icons:/usr/share/icons:/usr/share/pixmaps'
+make -j$(nproc)
+make DESTDIR=/usr/src/xcb-cursor-cache install
+cd ..
+rm -rf libxcb-cursor
+EOF
+
+FROM builder AS xext
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b libXext-1.3.5 --depth=1 https://github.com/gitlab-freedesktop-mirrors/libxext.git
+cd libxext
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/xext-cache install
+cd ..
+rm -rf libxext
+EOF
+
+FROM builder AS xtst
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b libXtst-1.2.4 --depth=1 https://github.com/gitlab-freedesktop-mirrors/libxtst.git
+cd libxtst
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/xtst-cache install
+cd ..
+rm -rf libxtst
+EOF
+
+FROM builder AS xfixes
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b libXfixes-5.0.3 --depth=1 https://github.com/gitlab-freedesktop-mirrors/libxfixes.git
+cd libxfixes
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/xfixes-cache install
+cd ..
+rm -rf libxfixes
+EOF
+
+FROM builder AS xv
+COPY --link --from=xext /usr/src/xext-cache /
+
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b libXv-1.0.12 --depth=1 https://github.com/gitlab-freedesktop-mirrors/libxv.git
+cd libxv
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/xv-cache install
+cd ..
+rm -rf libxv
+EOF
+
+FROM builder AS xrandr
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b libXrandr-1.5.3 --depth=1 https://github.com/gitlab-freedesktop-mirrors/libxrandr.git
+cd libxrandr
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/xrandr-cache install
+cd ..
+rm -rf libxrandr
+EOF
+
+FROM builder AS xrender
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b libXrender-0.9.11 --depth=1 https://github.com/gitlab-freedesktop-mirrors/libxrender.git
+cd libxrender
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/xrender-cache install
+cd ..
+rm -rf libxrender
+EOF
+
+FROM builder AS xdamage
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b libXdamage-1.1.6 --depth=1 https://github.com/gitlab-freedesktop-mirrors/libxdamage.git
+cd libxdamage
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/xdamage-cache install
+cd ..
+rm -rf libxdamage
+EOF
+
+FROM builder AS xcomposite
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b libXcomposite-0.4.6 --depth=1 \
+	https://github.com/gitlab-freedesktop-mirrors/libxcomposite.git
+cd libxcomposite
+./autogen.sh --enable-static --disable-shared
+make -j$(nproc)
+make DESTDIR=/usr/src/xcomposite-cache install
+cd ..
+rm -rf libxcomposite
+EOF
 
 FROM builder AS nv-codec-headers
-RUN git clone -b n12.1.14.0 --depth=1 {{ GIT }}/FFmpeg/nv-codec-headers.git \
-	&& DESTDIR="{{ LibrariesPath }}/nv-codec-headers-cache" make -C nv-codec-headers install \
-	&& rm -rf nv-codec-headers
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b n12.1.14.0 --depth=1 https://github.com/FFmpeg/nv-codec-headers.git
+make -C nv-codec-headers DESTDIR=/usr/src/nv-codec-headers-cache install
+rm -rf nv-codec-headers
+EOF
 
 FROM builder AS ffmpeg
-COPY --link --from=opus {{ LibrariesPath }}/opus-cache /
-COPY --link --from=dav1d {{ LibrariesPath }}/dav1d-cache /
-COPY --link --from=libvpx {{ LibrariesPath }}/libvpx-cache /
-COPY --link --from=libXext {{ LibrariesPath }}/libXext-cache /
-COPY --link --from=libXv {{ LibrariesPath }}/libXv-cache /
-COPY --link --from=nv-codec-headers {{ LibrariesPath }}/nv-codec-headers-cache /
-
-RUN git clone -b n6.1.1 --depth=1 {{ GIT }}/FFmpeg/FFmpeg.git \
-	&& cd FFmpeg \
-	&& ./configure \
-		--extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \
-		--extra-cxxflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \
-		--disable-debug \
-		--disable-optimizations \
-		--disable-inline-asm \
-		--disable-programs \
-		--disable-doc \
-		--disable-network \
-		--disable-autodetect \
-		--disable-everything \
-		--enable-libdav1d \
-		--enable-libopus \
-		--enable-libvpx \
-		--enable-vaapi \
-		--enable-vdpau \
-		--enable-xlib \
-		--enable-libdrm \
-		--enable-ffnvcodec \
-		--enable-nvdec \
-		--enable-cuvid \
-		--enable-protocol=file \
-		--enable-hwaccel=av1_vaapi \
-		--enable-hwaccel=av1_nvdec \
-		--enable-hwaccel=h264_vaapi \
-		--enable-hwaccel=h264_vdpau \
-		--enable-hwaccel=h264_nvdec \
-		--enable-hwaccel=hevc_vaapi \
-		--enable-hwaccel=hevc_vdpau \
-		--enable-hwaccel=hevc_nvdec \
-		--enable-hwaccel=mpeg2_vaapi \
-		--enable-hwaccel=mpeg2_vdpau \
-		--enable-hwaccel=mpeg2_nvdec \
-		--enable-hwaccel=mpeg4_vaapi \
-		--enable-hwaccel=mpeg4_vdpau \
-		--enable-hwaccel=mpeg4_nvdec \
-		--enable-hwaccel=vp8_vaapi \
-		--enable-hwaccel=vp8_nvdec \
-		--enable-decoder=aac \
-		--enable-decoder=aac_fixed \
-		--enable-decoder=aac_latm \
-		--enable-decoder=aasc \
-		--enable-decoder=ac3 \
-		--enable-decoder=alac \
-		--enable-decoder=av1 \
-		--enable-decoder=av1_cuvid \
-		--enable-decoder=eac3 \
-		--enable-decoder=flac \
-		--enable-decoder=gif \
-		--enable-decoder=h264 \
-		--enable-decoder=hevc \
-		--enable-decoder=libdav1d \
-		--enable-decoder=libvpx_vp8 \
-		--enable-decoder=libvpx_vp9 \
-		--enable-decoder=mp1 \
-		--enable-decoder=mp1float \
-		--enable-decoder=mp2 \
-		--enable-decoder=mp2float \
-		--enable-decoder=mp3 \
-		--enable-decoder=mp3adu \
-		--enable-decoder=mp3adufloat \
-		--enable-decoder=mp3float \
-		--enable-decoder=mp3on4 \
-		--enable-decoder=mp3on4float \
-		--enable-decoder=mpeg4 \
-		--enable-decoder=msmpeg4v2 \
-		--enable-decoder=msmpeg4v3 \
-		--enable-decoder=opus \
-		--enable-decoder=pcm_alaw \
-		--enable-decoder=pcm_f32be \
-		--enable-decoder=pcm_f32le \
-		--enable-decoder=pcm_f64be \
-		--enable-decoder=pcm_f64le \
-		--enable-decoder=pcm_lxf \
-		--enable-decoder=pcm_mulaw \
-		--enable-decoder=pcm_s16be \
-		--enable-decoder=pcm_s16be_planar \
-		--enable-decoder=pcm_s16le \
-		--enable-decoder=pcm_s16le_planar \
-		--enable-decoder=pcm_s24be \
-		--enable-decoder=pcm_s24daud \
-		--enable-decoder=pcm_s24le \
-		--enable-decoder=pcm_s24le_planar \
-		--enable-decoder=pcm_s32be \
-		--enable-decoder=pcm_s32le \
-		--enable-decoder=pcm_s32le_planar \
-		--enable-decoder=pcm_s64be \
-		--enable-decoder=pcm_s64le \
-		--enable-decoder=pcm_s8 \
-		--enable-decoder=pcm_s8_planar \
-		--enable-decoder=pcm_u16be \
-		--enable-decoder=pcm_u16le \
-		--enable-decoder=pcm_u24be \
-		--enable-decoder=pcm_u24le \
-		--enable-decoder=pcm_u32be \
-		--enable-decoder=pcm_u32le \
-		--enable-decoder=pcm_u8 \
-		--enable-decoder=pcm_zork \
-		--enable-decoder=vorbis \
-		--enable-decoder=vp8 \
-		--enable-decoder=wavpack \
-		--enable-decoder=wmalossless \
-		--enable-decoder=wmapro \
-		--enable-decoder=wmav1 \
-		--enable-decoder=wmav2 \
-		--enable-decoder=wmavoice \
-		--enable-encoder=libopus \
-		--enable-filter=atempo \
-		--enable-parser=aac \
-		--enable-parser=aac_latm \
-		--enable-parser=flac \
-		--enable-parser=gif \
-		--enable-parser=h264 \
-		--enable-parser=hevc \
-		--enable-parser=mpeg4video \
-		--enable-parser=mpegaudio \
-		--enable-parser=opus \
-		--enable-parser=vorbis \
-		--enable-demuxer=aac \
-		--enable-demuxer=flac \
-		--enable-demuxer=gif \
-		--enable-demuxer=h264 \
-		--enable-demuxer=hevc \
-		--enable-demuxer=matroska \
-		--enable-demuxer=m4v \
-		--enable-demuxer=mov \
-		--enable-demuxer=mp3 \
-		--enable-demuxer=ogg \
-		--enable-demuxer=wav \
-		--enable-muxer=ogg \
-		--enable-muxer=opus \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/ffmpeg-cache" install \
-	&& cd .. \
-	&& rm -rf ffmpeg
+COPY --link --from=opus /usr/src/opus-cache /
+COPY --link --from=openh264 /usr/src/openh264-cache /
+COPY --link --from=dav1d /usr/src/dav1d-cache /
+COPY --link --from=vpx /usr/src/vpx-cache /
+COPY --link --from=xext /usr/src/xext-cache /
+COPY --link --from=xv /usr/src/xv-cache /
+COPY --link --from=nv-codec-headers /usr/src/nv-codec-headers-cache /
+
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b n6.1.1 --depth=1 https://github.com/FFmpeg/FFmpeg.git
+cd FFmpeg
+./configure \
+	--extra-cflags="-fno-lto -DCONFIG_SAFE_BITSTREAM_READER=1" \
+	--extra-cxxflags="-fno-lto -DCONFIG_SAFE_BITSTREAM_READER=1" \
+	--extra-ldflags="-Wl,--push-state,--no-as-needed,-lstdc++,--pop-state" \
+	--disable-debug \
+	--disable-programs \
+	--disable-doc \
+	--disable-network \
+	--disable-autodetect \
+	--disable-everything \
+{%- if MINSIZE %}
+	--enable-small \
+{%- endif %}
+	--enable-libdav1d \
+	--enable-libopenh264 \
+	--enable-libopus \
+	--enable-libvpx \
+	--enable-vaapi \
+	--enable-vdpau \
+	--enable-xlib \
+	--enable-libdrm \
+	--enable-ffnvcodec \
+	--enable-nvdec \
+	--enable-cuvid \
+	--enable-protocol=file \
+	--enable-hwaccel=av1_vaapi \
+	--enable-hwaccel=av1_nvdec \
+	--enable-hwaccel=h264_vaapi \
+	--enable-hwaccel=h264_vdpau \
+	--enable-hwaccel=h264_nvdec \
+	--enable-hwaccel=hevc_vaapi \
+	--enable-hwaccel=hevc_vdpau \
+	--enable-hwaccel=hevc_nvdec \
+	--enable-hwaccel=mpeg2_vaapi \
+	--enable-hwaccel=mpeg2_vdpau \
+	--enable-hwaccel=mpeg2_nvdec \
+	--enable-hwaccel=mpeg4_vaapi \
+	--enable-hwaccel=mpeg4_vdpau \
+	--enable-hwaccel=mpeg4_nvdec \
+	--enable-hwaccel=vp8_vaapi \
+	--enable-hwaccel=vp8_nvdec \
+	--enable-decoder=aac \
+	--enable-decoder=aac_fixed \
+	--enable-decoder=aac_latm \
+	--enable-decoder=aasc \
+	--enable-decoder=ac3 \
+	--enable-decoder=alac \
+	--enable-decoder=av1 \
+	--enable-decoder=av1_cuvid \
+	--enable-decoder=eac3 \
+	--enable-decoder=flac \
+	--enable-decoder=gif \
+	--enable-decoder=h264 \
+	--enable-decoder=hevc \
+	--enable-decoder=libdav1d \
+	--enable-decoder=libvpx_vp8 \
+	--enable-decoder=libvpx_vp9 \
+	--enable-decoder=mp1 \
+	--enable-decoder=mp1float \
+	--enable-decoder=mp2 \
+	--enable-decoder=mp2float \
+	--enable-decoder=mp3 \
+	--enable-decoder=mp3adu \
+	--enable-decoder=mp3adufloat \
+	--enable-decoder=mp3float \
+	--enable-decoder=mp3on4 \
+	--enable-decoder=mp3on4float \
+	--enable-decoder=mpeg4 \
+	--enable-decoder=msmpeg4v2 \
+	--enable-decoder=msmpeg4v3 \
+	--enable-decoder=opus \
+	--enable-decoder=pcm_alaw \
+	--enable-decoder=pcm_f32be \
+	--enable-decoder=pcm_f32le \
+	--enable-decoder=pcm_f64be \
+	--enable-decoder=pcm_f64le \
+	--enable-decoder=pcm_lxf \
+	--enable-decoder=pcm_mulaw \
+	--enable-decoder=pcm_s16be \
+	--enable-decoder=pcm_s16be_planar \
+	--enable-decoder=pcm_s16le \
+	--enable-decoder=pcm_s16le_planar \
+	--enable-decoder=pcm_s24be \
+	--enable-decoder=pcm_s24daud \
+	--enable-decoder=pcm_s24le \
+	--enable-decoder=pcm_s24le_planar \
+	--enable-decoder=pcm_s32be \
+	--enable-decoder=pcm_s32le \
+	--enable-decoder=pcm_s32le_planar \
+	--enable-decoder=pcm_s64be \
+	--enable-decoder=pcm_s64le \
+	--enable-decoder=pcm_s8 \
+	--enable-decoder=pcm_s8_planar \
+	--enable-decoder=pcm_u16be \
+	--enable-decoder=pcm_u16le \
+	--enable-decoder=pcm_u24be \
+	--enable-decoder=pcm_u24le \
+	--enable-decoder=pcm_u32be \
+	--enable-decoder=pcm_u32le \
+	--enable-decoder=pcm_u8 \
+	--enable-decoder=pcm_zork \
+	--enable-decoder=vorbis \
+	--enable-decoder=vp8 \
+	--enable-decoder=wavpack \
+	--enable-decoder=wmalossless \
+	--enable-decoder=wmapro \
+	--enable-decoder=wmav1 \
+	--enable-decoder=wmav2 \
+	--enable-decoder=wmavoice \
+	--enable-encoder=aac \
+	--enable-encoder=libopenh264 \
+	--enable-encoder=libopus \
+	--enable-encoder=pcm_s16le \
+	--enable-filter=atempo \
+	--enable-parser=aac \
+	--enable-parser=aac_latm \
+	--enable-parser=flac \
+	--enable-parser=gif \
+	--enable-parser=h264 \
+	--enable-parser=hevc \
+	--enable-parser=mpeg4video \
+	--enable-parser=mpegaudio \
+	--enable-parser=opus \
+	--enable-parser=vorbis \
+	--enable-demuxer=aac \
+	--enable-demuxer=flac \
+	--enable-demuxer=gif \
+	--enable-demuxer=h264 \
+	--enable-demuxer=hevc \
+	--enable-demuxer=matroska \
+	--enable-demuxer=m4v \
+	--enable-demuxer=mov \
+	--enable-demuxer=mp3 \
+	--enable-demuxer=ogg \
+	--enable-demuxer=wav \
+	--enable-muxer=mp4 \
+	--enable-muxer=ogg \
+	--enable-muxer=opus \
+	--enable-muxer=wav
+make -j$(nproc)
+make DESTDIR=/usr/src/ffmpeg-cache install
+cd ..
+rm -rf ffmpeg
+EOF
 
 FROM builder AS pipewire
-RUN git clone -b 0.3.62 --depth=1 {{ GIT }}/PipeWire/pipewire.git \
-	&& cd pipewire \
-	&& meson build \
-		--buildtype=plain \
-		-Dtests=disabled \
-		-Dexamples=disabled \
-		-Dsession-managers=media-session \
-		-Dspa-plugins=disabled \
-	&& meson compile -C build \
-	&& DESTDIR="{{ LibrariesPath }}/pipewire-cache" meson install -C build \
-	&& cd .. \
-	&& rm -rf pipewire
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b 0.3.62 --depth=1 https://github.com/PipeWire/pipewire.git
+cd pipewire
+meson build \
+	--buildtype=plain \
+	-Dtests=disabled \
+	-Dexamples=disabled \
+	-Dspa-plugins=disabled \
+	-Dsession-managers=
+meson compile -C build
+DESTDIR=/usr/src/pipewire-cache meson install -C build
+cd ..
+rm -rf pipewire
+EOF
 
 FROM builder AS openal
-COPY --link --from=pipewire {{ LibrariesPath }}/pipewire-cache /
-
-RUN git clone -b 1.23.1 --depth=1 {{ GIT }}/kcat/openal-soft.git \
-	&& cd openal-soft \
-	&& cmake -GNinja -B build . \
-		-DCMAKE_BUILD_TYPE=None \
-		-DLIBTYPE:STRING=STATIC \
-		-DALSOFT_EXAMPLES=OFF \
-		-DALSOFT_UTILS=OFF \
-		-DALSOFT_INSTALL_CONFIG=OFF \
-	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/openal-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf openal-soft
+COPY --link --from=pipewire /usr/src/pipewire-cache /
+
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b 1.24.3 --depth=1 https://github.com/kcat/openal-soft.git
+cd openal-soft
+cmake -B build . \
+	-DLIBTYPE:STRING=STATIC \
+	-DALSOFT_EXAMPLES=OFF \
+	-DALSOFT_UTILS=OFF \
+	-DALSOFT_INSTALL_CONFIG=OFF
+cmake --build build
+DESTDIR=/usr/src/openal-cache cmake --install build
+cd ..
+rm -rf openal-soft
+EOF
 
 FROM builder AS openssl
-RUN git clone -b openssl-3.2.1 --depth=1 {{ GIT }}/openssl/openssl.git \
-	&& cd openssl \
-	&& ./config \
-		--openssldir=/etc/ssl \
-		no-tests \
-		no-dso \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/openssl-cache" install_sw \
-	&& cd .. \
-	&& rm -rf openssl
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b openssl-3.2.1 --depth=1 https://github.com/openssl/openssl.git
+cd openssl
+sed -i 's/$cmd $cmdflags -c -o/$cmd $cmdflags -g0 -c -o/' Configurations/unix-Makefile.tmpl
+./config --openssldir=/etc/ssl no-shared no-tests no-dso
+make -j$(nproc)
+make DESTDIR=/usr/src/openssl-cache install_sw
+cd ..
+rm -rf openssl
+EOF
 
 FROM builder AS xkbcommon
-COPY --link --from=xcb {{ LibrariesPath }}/xcb-cache /
-
-RUN git clone -b xkbcommon-1.6.0 --depth=1 {{ GIT }}/xkbcommon/libxkbcommon.git \
-	&& cd libxkbcommon \
-	&& meson build \
-		--buildtype=plain \
-		--default-library=both \
-		-Denable-docs=false \
-		-Denable-wayland=false \
-		-Denable-xkbregistry=false \
-		-Dxkb-config-root=/usr/share/X11/xkb \
-		-Dxkb-config-extra-path=/etc/xkb \
-		-Dx-locale-root=/usr/share/X11/locale \
-	&& meson compile -C build \
-	&& DESTDIR="{{ LibrariesPath }}/xkbcommon-cache" meson install -C build \
-	&& cd .. \
-	&& rm -rf libxkbcommon
-
-FROM builder AS glib
-RUN git clone -b 2.78.1 --depth=1 {{ GIT }}/GNOME/glib.git \
-	&& cd glib \
-	&& meson build \
-		--buildtype=plain \
-		--default-library=both \
-		-Dtests=false \
-		-Dmm-common:use-network=true \
-	&& meson compile -C build \
-	&& DESTDIR="{{ LibrariesPath }}/glib-cache" meson install -C build \
-	&& cd .. \
-	&& rm -rf glib
-
-FROM builder AS gobject-introspection
-COPY --link --from=glib {{ LibrariesPath }}/glib-cache /
-
-RUN git clone -b 1.78.1 --depth=1 {{ GIT }}/GNOME/gobject-introspection.git \
-	&& cd gobject-introspection \
-	&& meson build --buildtype=plain \
-	&& meson compile -C build \
-	&& DESTDIR="{{ LibrariesPath }}/gobject-introspection-cache" meson install -C build \
-	&& cd .. \
-	&& rm -rf gobject-introspection
+COPY --link --from=xcb /usr/src/xcb-cache /
+
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b xkbcommon-1.6.0 --depth=1 https://github.com/xkbcommon/libxkbcommon.git
+cd libxkbcommon
+meson build \
+	--buildtype=plain \
+	--default-library=static \
+	-Denable-docs=false \
+	-Denable-wayland=false \
+	-Denable-xkbregistry=false \
+	-Dxkb-config-root=/usr/share/X11/xkb \
+	-Dxkb-config-extra-path=/etc/xkb \
+	-Dx-locale-root=/usr/share/X11/locale
+meson compile -C build
+DESTDIR=/usr/src/xkbcommon-cache meson install -C build
+cd ..
+rm -rf libxkbcommon
+EOF
 
 FROM patches AS qt
-COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache /
-COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
-COPY --link --from=libjxl {{ LibrariesPath }}/libjxl-cache /
-COPY --link --from=xcb {{ LibrariesPath }}/xcb-cache /
-COPY --link --from=xcb-wm {{ LibrariesPath }}/xcb-wm-cache /
-COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
-COPY --link --from=xcb-image {{ LibrariesPath }}/xcb-image-cache /
-COPY --link --from=xcb-keysyms {{ LibrariesPath }}/xcb-keysyms-cache /
-COPY --link --from=xcb-render-util {{ LibrariesPath }}/xcb-render-util-cache /
-COPY --link --from=xcb-cursor {{ LibrariesPath }}/xcb-cursor-cache /
-COPY --link --from=wayland {{ LibrariesPath }}/wayland-cache /
-COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
-COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache /
-COPY --link --from=libwebp {{ LibrariesPath }}/libwebp-cache /
-
-RUN git clone -b {{ QT_TAG }} --depth=1 {{ GIT }}/qt/qt5.git \
-	&& cd qt5 \
-	&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \
-	&& cd qtbase \
-	&& find ../../patches/qtbase_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
-	&& cd ../qtwayland \
-	&& find ../../patches/qtwayland_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
-	&& cd .. \
-	&& cmake -GNinja -B build . \
-		-DCMAKE_BUILD_TYPE=None \
-		-DBUILD_SHARED_LIBS=OFF \
-		-DINPUT_libpng=qt \
-		-DINPUT_harfbuzz=qt \
-		-DINPUT_pcre=qt \
-		-DFEATURE_icu=OFF \
-		-DFEATURE_xcb_sm=OFF \
-		-DINPUT_dbus=runtime \
-		-DINPUT_openssl=linked \
-	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/qt-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf qt5
+COPY --link --from=zlib /usr/src/zlib-cache /
+COPY --link --from=lcms2 /usr/src/lcms2-cache /
+COPY --link --from=mozjpeg /usr/src/mozjpeg-cache /
+COPY --link --from=webp /usr/src/webp-cache /
+COPY --link --from=xcb /usr/src/xcb-cache /
+COPY --link --from=xcb-wm /usr/src/xcb-wm-cache /
+COPY --link --from=xcb-util /usr/src/xcb-util-cache /
+COPY --link --from=xcb-image /usr/src/xcb-image-cache /
+COPY --link --from=xcb-keysyms /usr/src/xcb-keysyms-cache /
+COPY --link --from=xcb-render-util /usr/src/xcb-render-util-cache /
+COPY --link --from=xcb-cursor /usr/src/xcb-cursor-cache /
+COPY --link --from=openssl /usr/src/openssl-cache /
+COPY --link --from=xkbcommon /usr/src/xkbcommon-cache /
+
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+QT=6.11.1
+git clone -b v$QT --depth=1 https://github.com/qt/qt5.git
+cd qt5
+git submodule update --init --recursive --depth=1 \
+	qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools
+find $PWD/../patches/qtbase_$QT -type f -print0 | sort -z | xargs -r0 git -C qtbase apply
+find $PWD/../patches/qtwayland_$QT -type f -print0 | sort -z | xargs -r0 git -C qtwayland apply
+cmake -B build . \
+	-DCMAKE_INSTALL_PREFIX=/usr/local \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DBUILD_WITH_PCH=OFF \
+{%- if ASAN %}
+	-DFEATURE_sanitize_address=ON \
+{%- endif %}
+	-DQT_QPA_PLATFORMS="wayland;xcb" \
+	-DINPUT_libpng=qt \
+	-DINPUT_harfbuzz=qt \
+	-DINPUT_pcre=qt \
+	-DFEATURE_icu=OFF \
+	-DFEATURE_xcb_sm=OFF \
+	-DFEATURE_eglfs=OFF \
+	-DINPUT_dbus=runtime \
+	-DINPUT_openssl=linked
+cmake --build build
+DESTDIR=/usr/src/qt-cache cmake --install build
+cd ..
+rm -rf qt5
+EOF
+
+FROM builder AS boost
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+curl -sSL https://archives.boost.io/release/1.90.0/source/boost_1_90_0.tar.gz | tar -xz
+cd boost_*
+./bootstrap.sh --prefix=/usr/src/boost-cache/usr/local --with-libraries=regex
+./b2 release link=static cflags="$CFLAGS" cxxflags="$CXXFLAGS" linkflags="$LDFLAGS" -j$(nproc) install
+cd ..
+rm -rf boost_*
+EOF
 
 FROM builder AS breakpad
-RUN git clone -b v2023.06.01 --depth=1 https://chromium.googlesource.com/breakpad/breakpad.git \
-	&& cd breakpad \
-	&& git clone -b v2022.10.12 --depth=1 https://chromium.googlesource.com/linux-syscall-support.git src/third_party/lss \
-	&& env -u CFLAGS -u CXXFLAGS ./configure \
-	&& make -j$(nproc) \
-	&& make DESTDIR="{{ LibrariesPath }}/breakpad-cache" install \
-	&& cd .. \
-	&& rm -rf breakpad
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v2024.02.16 --depth=1 https://chromium.googlesource.com/breakpad/breakpad.git
+cd breakpad
+git clone -b v2024.02.01 --depth=1 \
+	https://chromium.googlesource.com/linux-syscall-support.git src/third_party/lss
+CFLAGS="$CFLAGS -fno-lto" CXXFLAGS="$CXXFLAGS -fno-lto" ./configure
+make -j$(nproc)
+make DESTDIR=/usr/src/breakpad-cache install
+cd ..
+rm -rf breakpad
+EOF
 
 FROM builder AS webrtc
-COPY --link --from=opus {{ LibrariesPath }}/opus-cache /
-COPY --link --from=openh264 {{ LibrariesPath }}/openh264-cache /
-COPY --link --from=libvpx {{ LibrariesPath }}/libvpx-cache /
-COPY --link --from=libjxl {{ LibrariesPath }}/libjxl-cache /
-COPY --link --from=ffmpeg {{ LibrariesPath }}/ffmpeg-cache /
-COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
-COPY --link --from=libXtst {{ LibrariesPath }}/libXtst-cache /
-COPY --link --from=pipewire {{ LibrariesPath }}/pipewire-cache /
+COPY --link --from=zlib /usr/src/zlib-cache /
+COPY --link --from=mozjpeg /usr/src/mozjpeg-cache /
+COPY --link --from=opus /usr/src/opus-cache /
+COPY --link --from=openh264 /usr/src/openh264-cache /
+COPY --link --from=dav1d /usr/src/dav1d-cache /
+COPY --link --from=vpx /usr/src/vpx-cache /
+COPY --link --from=ffmpeg /usr/src/ffmpeg-cache /
+COPY --link --from=openssl /usr/src/openssl-cache /
+COPY --link --from=xext /usr/src/xext-cache /
+COPY --link --from=xfixes /usr/src/xfixes-cache /
+COPY --link --from=xtst /usr/src/xtst-cache /
+COPY --link --from=xrandr /usr/src/xrandr-cache /
+COPY --link --from=xrender /usr/src/xrender-cache /
+COPY --link --from=xdamage /usr/src/xdamage-cache /
+COPY --link --from=xcomposite /usr/src/xcomposite-cache /
+COPY --link --from=pipewire /usr/src/pipewire-cache /
 
 # Shallow clone on a specific commit.
-RUN git init tg_owt \
-	&& cd tg_owt \
-	&& git remote add origin {{ GIT }}/desktop-app/tg_owt.git \
-	&& git fetch --depth=1 origin 4a60ce1ab9fdb962004c6a959f682ace3db50cbd \
-	&& git reset --hard FETCH_HEAD \
-	&& git submodule update --init --recursive --depth=1 \
-	&& rm -rf .git \
-	&& env -u CFLAGS -u CXXFLAGS cmake -G"Ninja Multi-Config" -B out . \
-		-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-		-DCMAKE_C_FLAGS_DEBUG="{{ CFLAGS_DEBUG }}" \
-		-DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
-		-DCMAKE_CXX_FLAGS_DEBUG="{{ CFLAGS_DEBUG }}" \
-		-DTG_OWT_SPECIAL_TARGET=linux \
-		-DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
-		-DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/include \
-		-DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
-		-DTG_OWT_LIBVPX_INCLUDE_PATH=/usr/local/include \
-		-DTG_OWT_OPENH264_INCLUDE_PATH=/usr/local/include \
-		-DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include
-
-WORKDIR tg_owt
-
-FROM webrtc AS webrtc_release
-RUN cmake --build out --config Release --parallel \
-	&& find out -mindepth 1 -maxdepth 1 ! -name Release -exec rm -rf {} \;
-
-{%- if DEBUG %}
-
-FROM webrtc AS webrtc_debug
-RUN cmake --build out --config Debug --parallel \
-	&& find out -mindepth 1 -maxdepth 1 ! -name Debug -exec rm -rf {} \;
-{%- endif %}
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git init tg_owt
+cd tg_owt
+git remote add origin https://github.com/desktop-app/tg_owt.git
+git fetch --depth=1 origin 5c5c71258777d0196dbb3a09cc37d2f56ead28ab
+git reset --hard FETCH_HEAD
+git submodule update --init --recursive --depth=1
+cmake -B build . -DTG_OWT_DLOPEN_PIPEWIRE=ON
+cmake --build build
+DESTDIR=/usr/src/webrtc-cache cmake --install build
+cd ..
+rm -rf tg_owt
+EOF
 
 FROM builder AS ada
-RUN git clone -b v2.9.0 --depth=1 {{ GIT }}/ada-url/ada.git \
-	&& cd ada \
-	&& cmake -GNinja -B build . \
-		-D CMAKE_BUILD_TYPE=None \
-        -D ADA_TESTING=OFF \
-        -D ADA_TOOLS=OFF \
-	&& cmake --build build --parallel \
-	&& DESTDIR="{{ LibrariesPath }}/ada-cache" cmake --install build \
-	&& cd .. \
-	&& rm -rf ada
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git clone -b v3.2.4 --depth=1 https://github.com/ada-url/ada.git
+cd ada
+cmake -B build . -DADA_TESTING=OFF -DADA_TOOLS=OFF -DADA_INCLUDE_URL_PATTERN=OFF
+cmake --build build
+DESTDIR=/usr/src/ada-cache cmake --install build
+cd ..
+rm -rf ada
+EOF
+
+FROM builder AS tde2e
+COPY --link --from=zlib /usr/src/zlib-cache /
+COPY --link --from=openssl /usr/src/openssl-cache /
 
-FROM builder
-COPY --link --from=zlib {{ LibrariesPath }}/zlib-cache /
-COPY --link --from=xz {{ LibrariesPath }}/xz-cache /
-COPY --link --from=protobuf {{ LibrariesPath }}/protobuf-cache /
-COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
-COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache /
-COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
-COPY --link --from=opus {{ LibrariesPath }}/opus-cache /
-COPY --link --from=dav1d {{ LibrariesPath }}/dav1d-cache /
-COPY --link --from=openh264 {{ LibrariesPath }}/openh264-cache /
-COPY --link --from=libde265 {{ LibrariesPath }}/libde265-cache /
-COPY --link --from=libvpx {{ LibrariesPath }}/libvpx-cache /
-COPY --link --from=libavif {{ LibrariesPath }}/libavif-cache /
-COPY --link --from=libheif {{ LibrariesPath }}/libheif-cache /
-COPY --link --from=libjxl {{ LibrariesPath }}/libjxl-cache /
-COPY --link --from=rnnoise {{ LibrariesPath }}/rnnoise-cache /
-COPY --link --from=xcb {{ LibrariesPath }}/xcb-cache /
-COPY --link --from=xcb-wm {{ LibrariesPath }}/xcb-wm-cache /
-COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
-COPY --link --from=xcb-image {{ LibrariesPath }}/xcb-image-cache /
-COPY --link --from=xcb-keysyms {{ LibrariesPath }}/xcb-keysyms-cache /
-COPY --link --from=xcb-render-util {{ LibrariesPath }}/xcb-render-util-cache /
-COPY --link --from=xcb-cursor {{ LibrariesPath }}/xcb-cursor-cache /
-COPY --link --from=libXext {{ LibrariesPath }}/libXext-cache /
-COPY --link --from=libXfixes {{ LibrariesPath }}/libXfixes-cache /
-COPY --link --from=libXv {{ LibrariesPath }}/libXv-cache /
-COPY --link --from=libXtst {{ LibrariesPath }}/libXtst-cache /
-COPY --link --from=libXrandr {{ LibrariesPath }}/libXrandr-cache /
-COPY --link --from=libXrender {{ LibrariesPath }}/libXrender-cache /
-COPY --link --from=libXdamage {{ LibrariesPath }}/libXdamage-cache /
-COPY --link --from=libXcomposite {{ LibrariesPath }}/libXcomposite-cache /
-COPY --link --from=wayland {{ LibrariesPath }}/wayland-cache /
-COPY --link --from=ffmpeg {{ LibrariesPath }}/ffmpeg-cache /
-COPY --link --from=openal {{ LibrariesPath }}/openal-cache /
-COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache /
-COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache /
-COPY --link --from=glib {{ LibrariesPath }}/glib-cache /
-COPY --link --from=gobject-introspection {{ LibrariesPath }}/gobject-introspection-cache /
-COPY --link --from=qt {{ LibrariesPath }}/qt-cache /
-COPY --link --from=breakpad {{ LibrariesPath }}/breakpad-cache /
-COPY --link --from=webrtc {{ LibrariesPath }}/tg_owt tg_owt
-COPY --link --from=webrtc_release {{ LibrariesPath }}/tg_owt/out/Release tg_owt/out/Release
-COPY --link --from=libwebp {{ LibrariesPath }}/libwebp-cache /
-COPY --link --from=ada {{ LibrariesPath }}/ada-cache /
-
-{%- if DEBUG %}
-COPY --link --from=webrtc_debug {{ LibrariesPath }}/tg_owt/out/Debug tg_owt/out/Debug
-{%- endif %}
-
-WORKDIR ../tdesktop
-ENV QT {{ QT }}
-ENV BOOST_INCLUDEDIR /usr/include/boost1.78
-ENV BOOST_LIBRARYDIR /usr/lib64/boost1.78
+# Shallow clone on a specific commit.
+RUN --mount=type=cache,target=/var/cache/ccache <<EOF
+git init tde2e
+cd tde2e
+git remote add origin https://github.com/tdlib/td.git
+git fetch --depth=1 origin 51743dfd01dff6179e2d8f7095729caa4e2222e9
+git reset --hard FETCH_HEAD
+cmake -B build . -DTD_E2E_ONLY=ON
+cmake --build build
+DESTDIR=/usr/src/tde2e-cache cmake --install build
+cd ..
+rm -rf tde2e
+EOF
 
+FROM builder
+COPY --link --from=zlib /usr/src/zlib-cache /
+COPY --link --from=xz /usr/src/xz-cache /
+COPY --link --from=protobuf /usr/src/protobuf-cache /
+COPY --link --from=lcms2 /usr/src/lcms2-cache /
+COPY --link --from=brotli /usr/src/brotli-cache /
+COPY --link --from=highway /usr/src/highway-cache /
+COPY --link --from=mozjpeg /usr/src/mozjpeg-cache /
+COPY --link --from=opus /usr/src/opus-cache /
+COPY --link --from=dav1d /usr/src/dav1d-cache /
+COPY --link --from=openh264 /usr/src/openh264-cache /
+COPY --link --from=de265 /usr/src/de265-cache /
+COPY --link --from=vpx /usr/src/vpx-cache /
+COPY --link --from=webp /usr/src/webp-cache /
+COPY --link --from=avif /usr/src/avif-cache /
+COPY --link --from=heif /usr/src/heif-cache /
+COPY --link --from=jxl /usr/src/jxl-cache /
+COPY --link --from=rnnoise /usr/src/rnnoise-cache /
+COPY --link --from=xcb /usr/src/xcb-cache /
+COPY --link --from=xcb-wm /usr/src/xcb-wm-cache /
+COPY --link --from=xcb-util /usr/src/xcb-util-cache /
+COPY --link --from=xcb-image /usr/src/xcb-image-cache /
+COPY --link --from=xcb-keysyms /usr/src/xcb-keysyms-cache /
+COPY --link --from=xcb-render-util /usr/src/xcb-render-util-cache /
+COPY --link --from=xcb-cursor /usr/src/xcb-cursor-cache /
+COPY --link --from=xext /usr/src/xext-cache /
+COPY --link --from=xfixes /usr/src/xfixes-cache /
+COPY --link --from=xv /usr/src/xv-cache /
+COPY --link --from=xtst /usr/src/xtst-cache /
+COPY --link --from=xrandr /usr/src/xrandr-cache /
+COPY --link --from=xrender /usr/src/xrender-cache /
+COPY --link --from=xdamage /usr/src/xdamage-cache /
+COPY --link --from=xcomposite /usr/src/xcomposite-cache /
+COPY --link --from=ffmpeg /usr/src/ffmpeg-cache /
+COPY --link --from=openal /usr/src/openal-cache /
+COPY --link --from=openssl /usr/src/openssl-cache /
+COPY --link --from=xkbcommon /usr/src/xkbcommon-cache /
+COPY --link --from=qt /usr/src/qt-cache /
+COPY --link --from=boost /usr/src/boost-cache /
+COPY --link --from=breakpad /usr/src/breakpad-cache /
+COPY --link --from=webrtc /usr/src/webrtc-cache /
+COPY --link --from=ada /usr/src/ada-cache /
+COPY --link --from=tde2e /usr/src/tde2e-cache /
+
+COPY --link --from=patches /usr/src/patches patches
+RUN <<EOF
+patch -p1 -d /usr/lib64/gobject-introspection -i $PWD/patches/gobject-introspection.patch
+rm -rf patches
+EOF
+
+ENV CCACHE_DISABLE=true
+WORKDIR /usr/src/tdesktop
+USER user
 VOLUME [ "/usr/src/tdesktop" ]
-ENTRYPOINT [ "scl", "enable", "gcc-toolset-12", "--" ]
 CMD [ "/usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh" ]
diff --git a/Telegram/build/docker/centos_env/build.sh b/Telegram/build/docker/centos_env/build.sh
index e7a34e6aef6b3a..dfa475955f21e3 100755
--- a/Telegram/build/docker/centos_env/build.sh
+++ b/Telegram/build/docker/centos_env/build.sh
@@ -3,4 +3,4 @@ set -e
 
 cd Telegram
 ./configure.sh "$@"
-cmake --build ../out --config "${CONFIG:-Release}" --parallel
+cmake --build ../out --config "${CONFIG:-Release}"
diff --git a/Telegram/build/docker/centos_env/build_debug.sh b/Telegram/build/docker/centos_env/build_debug.sh
new file mode 100755
index 00000000000000..af661189c5d756
--- /dev/null
+++ b/Telegram/build/docker/centos_env/build_debug.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+FullExecPath=$PWD
+pushd `dirname $0` > /dev/null
+FullScriptPath=`pwd`
+popd > /dev/null
+
+"$FullScriptPath/run.sh" bash -lc "cd /usr/src/tdesktop && cmake --build out --config Debug --target Telegram"
+cd "$FullExecPath"
diff --git a/Telegram/build/docker/centos_env/gen_dockerfile.py b/Telegram/build/docker/centos_env/gen_dockerfile.py
index 997b784cafc08f..86d27c96e1f732 100755
--- a/Telegram/build/docker/centos_env/gen_dockerfile.py
+++ b/Telegram/build/docker/centos_env/gen_dockerfile.py
@@ -4,12 +4,17 @@
 from jinja2 import Environment, FileSystemLoader
 
 def checkEnv(envName, defaultValue):
-    return bool(len(environ[envName])) if envName in environ else defaultValue
+    if isinstance(defaultValue, bool):
+        return bool(len(environ[envName])) if envName in environ else defaultValue
+    return environ[envName] if envName in environ else defaultValue
 
 def main():
     print(Environment(loader=FileSystemLoader(dirname(__file__))).get_template("Dockerfile").render(
         DEBUG=checkEnv("DEBUG", True),
+        MINSIZE=checkEnv("MINSIZE", False),
         LTO=checkEnv("LTO", True),
+        ASAN=checkEnv("ASAN", False),
+        JOBS=checkEnv("JOBS", ""),
     ))
 
 if __name__ == '__main__':
diff --git a/Telegram/build/docker/centos_env/poetry.lock b/Telegram/build/docker/centos_env/poetry.lock
index 5ad561c7161149..3d25367d8f8e65 100644
--- a/Telegram/build/docker/centos_env/poetry.lock
+++ b/Telegram/build/docker/centos_env/poetry.lock
@@ -1,14 +1,15 @@
-# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand.
 
 [[package]]
 name = "jinja2"
-version = "3.1.4"
+version = "3.1.6"
 description = "A very fast and expressive template engine."
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
-    {file = "jinja2-3.1.4-py3-none-any.whl", hash = "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"},
-    {file = "jinja2-3.1.4.tar.gz", hash = "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369"},
+    {file = "jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67"},
+    {file = "jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d"},
 ]
 
 [package.dependencies]
@@ -23,6 +24,7 @@ version = "2.1.1"
 description = "Safely add untrusted strings to HTML/XML markup."
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
     {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
@@ -67,6 +69,6 @@ files = [
 ]
 
 [metadata]
-lock-version = "2.0"
+lock-version = "2.1"
 python-versions = "^3.7"
-content-hash = "dcdc36798334f1f85051cf78d7f8a7242a480509eb34135934d9f092d2da5c33"
+content-hash = "375b9a134584d381be4e5f1a5a3a6935f2ff7852fdf3fef8b128d3d1e89263f8"
diff --git a/Telegram/build/docker/centos_env/pyproject.toml b/Telegram/build/docker/centos_env/pyproject.toml
index d20d3d1d4e2448..8f43692fb217f0 100644
--- a/Telegram/build/docker/centos_env/pyproject.toml
+++ b/Telegram/build/docker/centos_env/pyproject.toml
@@ -6,7 +6,7 @@ authors = []
 
 [tool.poetry.dependencies]
 python = "^3.7"
-Jinja2 = "^3.1.4"
+Jinja2 = "^3.1.6"
 
 [tool.poetry.dev-dependencies]
 
diff --git a/Telegram/build/docker/centos_env/run.sh b/Telegram/build/docker/centos_env/run.sh
index 4be3f8f03b0e30..8e9e56c7087851 100755
--- a/Telegram/build/docker/centos_env/run.sh
+++ b/Telegram/build/docker/centos_env/run.sh
@@ -13,9 +13,13 @@ if [ ! -d "$FullScriptPath/../../../../../DesktopPrivate" ]; then
   exit
 fi
 
-Command="$1"
-if [ "$Command" == "" ]; then
-  Command="bash"
+if [ "$#" == "0" ]; then
+  set -- bash
 fi
 
-docker run -it --rm --cpus=8 --memory=22g -v $HOME/Telegram/DesktopPrivate:/usr/src/DesktopPrivate -v $HOME/Telegram/tdesktop:/usr/src/tdesktop tdesktop:centos_env $Command
+CpuCount=$(nproc)
+DockerCpus=$((CpuCount > 4 ? CpuCount - 2 : CpuCount))
+MemTotalGb=$(($(grep MemTotal /proc/meminfo | awk '{print $2}') / 1048576))
+DockerMemoryGb=$((MemTotalGb > 12 ? MemTotalGb - 4 : MemTotalGb))
+
+docker run -it --rm --cpus=$DockerCpus --memory=${DockerMemoryGb}g -u $(id -u) -v $HOME/Telegram/DesktopPrivate:/usr/src/DesktopPrivate -v $HOME/Telegram/tdesktop:/usr/src/tdesktop tdesktop:centos_env "$@"
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index c5932cb8ad3e43..45e64be63f3b29 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -84,12 +84,9 @@ def nativeToolsError():
 pathPrefixes = [
     'ThirdParty\\msys64\\mingw64\\bin',
     'ThirdParty\\jom',
-    'ThirdParty\\cmake\\bin',
     'ThirdParty\\gyp',
 ] if win else [
     'ThirdParty/gyp',
-    'ThirdParty/yasm',
-    'ThirdParty/depot_tools',
 ]
 pathPrefix = ''
 for singlePrefix in pathPrefixes:
@@ -101,24 +98,22 @@ def nativeToolsError():
     'LIBS_DIR': libsDir,
     'THIRDPARTY_DIR': thirdPartyDir,
     'PATH_PREFIX': pathPrefix,
+    'CMAKE_GENERATOR': 'Ninja Multi-Config',
 }
 if (win32):
     environment.update({
         'SPECIAL_TARGET': 'win',
         'X8664': 'x86',
-        'WIN32X64': 'Win32',
     })
 elif (win64):
     environment.update({
         'SPECIAL_TARGET': 'win64',
         'X8664': 'x64',
-        'WIN32X64': 'x64',
     })
 elif (winarm):
     environment.update({
         'SPECIAL_TARGET': 'winarm',
         'X8664': 'ARM64',
-        'WIN32X64': 'ARM64',
     })
 elif (mac):
     environment.update({
@@ -127,6 +122,7 @@ def nativeToolsError():
         'MACOSX_DEPLOYMENT_TARGET': '10.13',
         'UNGUARDED': '-Werror=unguarded-availability-new',
         'MIN_VER': '-mmacosx-version-min=10.13',
+        'CMAKE_GENERATOR': 'Ninja',
     })
 
 ignoreInCacheForThirdParty = [
@@ -134,7 +130,6 @@ def nativeToolsError():
     'LIBS_DIR',
     'SPECIAL_TARGET',
     'X8664',
-    'WIN32X64',
 ]
 
 environmentKeyString = ''
@@ -150,6 +145,8 @@ def nativeToolsError():
 modifiedEnv = os.environ.copy()
 for key in environment:
     modifiedEnv[key] = environment[key]
+if win and 'NoDefaultCurrentDirectoryInExePath' in modifiedEnv:
+    del modifiedEnv['NoDefaultCurrentDirectoryInExePath']
 
 modifiedEnv['PATH'] = environment['PATH_PREFIX'] + modifiedEnv['PATH']
 
@@ -316,8 +313,9 @@ def run(commands):
         if os.path.exists("command.bat"):
             os.remove("command.bat")
         with open("command.bat", 'w') as file:
-            file.write('@echo OFF\r\n' + winFailOnEach(commands))
-        result = subprocess.run("command.bat", shell=True, env=modifiedEnv).returncode == 0
+            file.write('@echo OFF\r\nset "NoDefaultCurrentDirectoryInExePath="\r\n' + winFailOnEach(commands))
+        batPath = os.path.abspath("command.bat")
+        result = subprocess.run(batPath, shell=True, env=modifiedEnv).returncode == 0
         if result and os.path.exists("command.bat"):
             os.remove("command.bat")
         return result
@@ -447,7 +445,7 @@ def runStages():
             with tempfile.NamedTemporaryFile(mode='w', delete=False) as tmp_zshrc:
                 tmp_zshrc.write(f'export PS1="{prompt}"\n')
                 tmp_zshrc_path = tmp_zshrc.name
-            subprocess.run(['zsh', '--rcs', tmp_zshrc_path], env=modifiedEnv)
+            subprocess.run(['zsh', '--rcs', tmp_zshrc_path], shell=True, env=modifiedEnv)
             os.remove(tmp_zshrc_path)
     elif not run(' '.join(runCommand) + '\n'):
         print('FAILED :(')
@@ -457,25 +455,31 @@ def runStages():
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 412f65c296
+    git checkout 94441c000324599430fa126be92ff63b17a4e409
+mac:
+    git clone https://github.com/desktop-app/qt6_highsierra_patches.git qt6_highsierra
+    cd qt6_highsierra
+    git checkout 4aae812a405f47553e001faf566de572d3eccd16
 """)
 
 stage('msys64', """
 win:
-    SET PATH_BACKUP_=%PATH%
-    SET PATH=%ROOT_DIR%\\ThirdParty\\msys64\\usr\\bin;%PATH%
-
+    SET PATH=%THIRDPARTY_DIR%\\msys64\\usr\\bin;%PATH%
     SET CHERE_INVOKING=enabled_from_arguments
     SET MSYS2_PATH_TYPE=inherit
 
-    powershell -Command "iwr -OutFile ./msys64.exe https://github.com/msys2/msys2-installer/releases/download/2024-05-07/msys2-base-x86_64-20240507.sfx.exe"
+    powershell -Command "iwr -OutFile ./msys64.exe https://github.com/msys2/msys2-installer/releases/download/2025-08-30/msys2-base-x86_64-20250830.sfx.exe"
     msys64.exe
     del msys64.exe
 
     bash -c "pacman-key --init; pacman-key --populate; pacman -Syu --noconfirm"
-    pacman -Syu --noconfirm mingw-w64-x86_64-perl mingw-w64-x86_64-nasm mingw-w64-x86_64-yasm mingw-w64-x86_64-ninja msys/make diffutils pkg-config
-
-    SET PATH=%PATH_BACKUP_%
+    pacman -Syu --noconfirm ^
+        make ^
+        mingw-w64-x86_64-diffutils ^
+        mingw-w64-x86_64-gperf ^
+        mingw-w64-x86_64-nasm ^
+        mingw-w64-x86_64-perl ^
+        mingw-w64-x86_64-pkgconf
 """, 'ThirdParty')
 
 stage('python', """
@@ -500,42 +504,30 @@ def runStages():
     del jom.zip
 """, 'ThirdParty')
 
-stage('depot_tools', """
-mac:
-    git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
-    cd depot_tools
-    ./update_depot_tools
-""", 'ThirdParty')
-
 if not mac or 'build-stackwalk' in options:
     stage('gyp', """
 win:
     git clone https://github.com/desktop-app/gyp.git
     cd gyp
-    git checkout 618958fdbe
+    git checkout 5e2425c47b
 mac:
     python3 -m pip install \\
         --ignore-installed \\
         --target=$THIRDPARTY_DIR/gyp \\
-        git+https://chromium.googlesource.com/external/gyp@master
-""", 'ThirdParty')
-
-stage('yasm', """
-mac:
-    git clone https://github.com/yasm/yasm.git
-    cd yasm
-    git checkout 41762bea
-    ./autogen.sh
-    make $MAKE_THREADS_CNT
+        git+https://chromium.googlesource.com/external/gyp@master six
 """, 'ThirdParty')
 
 stage('lzma', """
 win:
     git clone https://github.com/desktop-app/lzma.git
     cd lzma\\C\\Util\\LzmaLib
-    msbuild -m LzmaLib.sln /property:Configuration=Debug /property:Platform="$X8664"
+    SET "ToolsetProp="
+winarm:
+    SET "ToolsetProp=/property:PlatformToolset=v145"
+win:
+    msbuild -m LzmaLib.sln /property:Configuration=Debug /property:Platform="$X8664" %ToolsetProp%
 release:
-    msbuild -m LzmaLib.sln /property:Configuration=Release /property:Platform="$X8664"
+    msbuild -m LzmaLib.sln /property:Configuration=Release /property:Platform="$X8664" %ToolsetProp%
 """)
 
 stage('xz', """
@@ -544,27 +536,28 @@ def runStages():
     cd xz
     sed -i '' '\\@check_symbol_exists(futimens "sys/types.h;sys/stat.h" HAVE_FUTIMENS)@d' CMakeLists.txt
     CFLAGS="$UNGUARDED" CPPFLAGS="$UNGUARDED" cmake -B build . \\
-        -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\
         -D CMAKE_OSX_ARCHITECTURES="x86_64;arm64" \\
         -D CMAKE_INSTALL_PREFIX:STRING=$USED_PREFIX
-    cmake --build build $MAKE_THREADS_CNT
+    cmake --build build
     cmake --install build
 """)
 
 stage('zlib', """
     git clone https://github.com/madler/zlib.git
     cd zlib
-    git checkout 643e17b749
+    git checkout e3dc0a85b7032e98380dec011bc8f2c2ee0d8fca
 win:
     cmake . ^
-        -A %WIN32X64% ^
         -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-        -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-        -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
-        -DCMAKE_C_FLAGS="/DZLIB_WINAPI"
-    cmake --build . --config Debug --parallel
+        -DCMAKE_C_FLAGS="/DZLIB_WINAPI" ^
+        -DZLIB_BUILD_SHARED=OFF ^
+        -DZLIB_BUILD_TESTING=OFF ^
+        -DZLIB_BUILD_MINIZIP=ON ^
+        -DZLIB_MINIZIP_BUILD_SHARED=OFF ^
+        -DZLIB_MINIZIP_BUILD_TESTING=OFF
+    cmake --build . --config Debug
 release:
-    cmake --build . --config Release --parallel
+    cmake --build . --config Release
 mac:
     CFLAGS="$MIN_VER $UNGUARDED" LDFLAGS="$MIN_VER" ./configure \\
         --static \\
@@ -572,6 +565,19 @@ def runStages():
         --archs="-arch x86_64 -arch arm64"
     make $MAKE_THREADS_CNT
     make install
+    cd contrib/minizip
+    autoreconf -fi
+    CFLAGS="$MIN_VER $UNGUARDED -arch arm64" CPPFLAGS="$MIN_VER $UNGUARDED -arch arm64" LDFLAGS="$MIN_VER" ./configure --enable-static --disable-shared --host=arm --prefix=$USED_PREFIX
+    make $MAKE_THREADS_CNT
+    mkdir out.arm64
+    mv .libs/libminizip.a out.arm64
+    make clean
+    CFLAGS="$MIN_VER $UNGUARDED -arch x86_64" CPPFLAGS="$MIN_VER $UNGUARDED -arch x86_64" LDFLAGS="$MIN_VER" ./configure --enable-static --disable-shared --host=x86_64 --prefix=$USED_PREFIX
+    make $MAKE_THREADS_CNT
+    mkdir out.x86_64
+    mv .libs/libminizip.a out.x86_64
+    lipo -create out.arm64/libminizip.a out.x86_64/libminizip.a -output .libs/libminizip.a
+    make install
 """)
 
 stage('mozjpeg', """
@@ -579,33 +585,33 @@ def runStages():
     cd mozjpeg
 win:
     cmake . ^
-        -A %WIN32X64% ^
+        -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ^
         -DWITH_JPEG8=ON ^
         -DPNG_SUPPORTED=OFF
-    cmake --build . --config Debug --parallel
+    cmake --build . --config Debug
 release:
-    cmake --build . --config Release --parallel
+    cmake --build . --config Release
 mac:
     CFLAGS="-arch arm64" cmake -B build.arm64 . \\
+        -D CMAKE_POLICY_VERSION_MINIMUM=3.5 \\
         -D CMAKE_SYSTEM_NAME=Darwin \\
         -D CMAKE_SYSTEM_PROCESSOR=arm64 \\
         -D CMAKE_BUILD_TYPE=Release \\
         -D CMAKE_INSTALL_PREFIX=$USED_PREFIX \\
-        -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\
         -D WITH_JPEG8=ON \\
         -D ENABLE_SHARED=OFF \\
         -D PNG_SUPPORTED=OFF
-    cmake --build build.arm64 $MAKE_THREADS_CNT
+    cmake --build build.arm64
     CFLAGS="-arch x86_64" cmake -B build . \\
+        -D CMAKE_POLICY_VERSION_MINIMUM=3.5 \\
         -D CMAKE_SYSTEM_NAME=Darwin \\
         -D CMAKE_SYSTEM_PROCESSOR=x86_64 \\
         -D CMAKE_BUILD_TYPE=Release \\
         -D CMAKE_INSTALL_PREFIX=$USED_PREFIX \\
-        -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\
         -D WITH_JPEG8=ON \\
         -D ENABLE_SHARED=OFF \\
         -D PNG_SUPPORTED=OFF
-    cmake --build build $MAKE_THREADS_CNT
+    cmake --build build
     lipo -create build.arm64/libjpeg.a build/libjpeg.a -output build/libjpeg.a
     lipo -create build.arm64/libturbojpeg.a build/libturbojpeg.a -output build/libturbojpeg.a
     cmake --install build
@@ -659,61 +665,56 @@ def runStages():
 """)
 
 stage('opus', """
-    git clone -b v1.3.1 https://github.com/xiph/opus.git
+    git clone -b v1.5.2 https://github.com/xiph/opus.git
     cd opus
-    git cherry-pick 927de8453c
 win:
     cmake -B out . ^
-        -A %WIN32X64% ^
         -DCMAKE_INSTALL_PREFIX=%LIBS_DIR%/local ^
-        -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-        -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-        -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"
-    cmake --build out --config Debug --parallel
-    cmake --build out --config Release --parallel
+        -DOPUS_STATIC_RUNTIME=ON
+    cmake --build out --config Debug
+    cmake --build out --config Release
     cmake --install out --config Release
 mac:
     CFLAGS="$UNGUARDED" CPPFLAGS="$UNGUARDED" cmake -B build . \\
-        -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\
         -D CMAKE_OSX_ARCHITECTURES="x86_64;arm64" \\
         -D CMAKE_INSTALL_PREFIX:STRING=$USED_PREFIX
-    cmake --build build $MAKE_THREADS_CNT
+    cmake --build build
     cmake --install build
 """)
 
 stage('rnnoise', """
     git clone https://github.com/desktop-app/rnnoise.git
     cd rnnoise
-    git checkout fe37e57d09
+    git checkout d8ea2b0
     mkdir out
     cd out
 win:
-    cmake -A %WIN32X64% ..
-    cmake --build . --config Debug --parallel
+    cmake .. -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>"
+    cmake --build . --config Debug
 release:
-    cmake --build . --config Release --parallel
+    cmake --build . --config Release
 !win:
     mkdir Debug
     cd Debug
-    cmake -G Ninja ../.. \\
+    cmake ../.. \\
         -D CMAKE_BUILD_TYPE=Debug \\
         -D CMAKE_OSX_ARCHITECTURES="x86_64;arm64"
-    ninja
+    cmake --build .
 release:
     cd ..
     mkdir Release
     cd Release
-    cmake -G Ninja ../.. \\
+    cmake ../.. \\
         -D CMAKE_BUILD_TYPE=Release \\
         -D CMAKE_OSX_ARCHITECTURES="x86_64;arm64"
-    ninja
+    cmake --build .
 """)
 
 stage('libiconv', """
 mac:
-    VERSION=1.17
+    VERSION=1.18
     rm -f libiconv.tar.gz
-    wget -O libiconv.tar.gz ftp://ftp.gnu.org/gnu/libiconv/libiconv-$VERSION.tar.gz
+    wget --timeout=30 --tries=2 -O libiconv.tar.gz ftp://ftp.gnu.org/gnu/libiconv/libiconv-$VERSION.tar.gz || wget -O libiconv.tar.gz https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$VERSION.tar.gz
     rm -rf libiconv-$VERSION
     tar -xvzf libiconv.tar.gz
     rm libiconv.tar.gz
@@ -742,7 +743,7 @@ def runStages():
 
 # Somehow in x86 Debug build dav1d crashes on AV1 10bpc videos.
 stage('dav1d', """
-    git clone -b 1.4.1 https://code.videolan.org/videolan/dav1d.git
+    git clone -b 1.5.3 https://code.videolan.org/videolan/dav1d.git
     cd dav1d
 win32:
     SET "TARGET=x86"
@@ -753,7 +754,6 @@ def runStages():
 winarm:
     SET "TARGET=aarch64"
     SET "DAV1D_ASM_DISABLE="
-    SET "PATH_BACKUP_=%PATH%"
     SET "PATH=%LIBS_DIR%\\gas-preprocessor;%PATH%"
     echo armasm64 fails with 'syntax error in expression: tbnz x14, #4, 8f' as if this instruction is unknown/unsupported.
     git revert --no-edit d503bb0ccaf104b2f13da0f092e09cc9411b3297
@@ -782,8 +782,6 @@ def runStages():
 win:
     copy %LIBS_DIR%\\local\\lib\\libdav1d.a %LIBS_DIR%\\local\\lib\\dav1d.lib
     deactivate
-winarm:
-    SET "PATH=%PATH_BACKUP_%"
 mac:
     buildOneArch() {
         arch=$1
@@ -810,7 +808,7 @@ def runStages():
 """)
 
 stage('openh264', """
-    git clone -b v2.4.1 https://github.com/cisco/openh264.git
+    git clone -b v2.6.0 https://github.com/cisco/openh264.git
     cd openh264
 win32:
     SET "TARGET=x86"
@@ -818,7 +816,6 @@ def runStages():
     SET "TARGET=x86_64"
 winarm:
     SET "TARGET=aarch64"
-    SET "PATH_BACKUP_=%PATH%"
     SET "PATH=%LIBS_DIR%\\gas-preprocessor;%PATH%"
 win:
     set FILE=cross-file.txt
@@ -845,8 +842,6 @@ def runStages():
 win:
     copy %LIBS_DIR%\\local\\lib\\libopenh264.a %LIBS_DIR%\\local\\lib\\openh264.lib
     deactivate
-winarm:
-    SET "PATH=%PATH_BACKUP_%"
 mac:
     buildOneArch() {
         arch=$1
@@ -871,75 +866,68 @@ def runStages():
 """)
 
 stage('libavif', """
-    git clone -b v1.0.4 https://github.com/AOMediaCodec/libavif.git
+    git clone -b v1.3.0 https://github.com/AOMediaCodec/libavif.git
     cd libavif
 win:
     cmake . ^
-        -A %WIN32X64% ^
         -DCMAKE_INSTALL_PREFIX=%LIBS_DIR%/local ^
         -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-        -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-        -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
+        -DCMAKE_POLICY_DEFAULT_CMP0091=NEW ^
         -DBUILD_SHARED_LIBS=OFF ^
         -DAVIF_ENABLE_WERROR=OFF ^
-        -DAVIF_CODEC_DAV1D=ON
-    cmake --build . --config Debug --parallel
+        -DAVIF_CODEC_DAV1D=SYSTEM ^
+        -DAVIF_LIBYUV=OFF
+    cmake --build . --config Debug
     cmake --install . --config Debug
 release:
-    cmake --build . --config Release --parallel
+    cmake --build . --config Release
     cmake --install . --config Release
 mac:
     cmake . \\
         -D CMAKE_OSX_ARCHITECTURES="x86_64;arm64" \\
-        -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\
         -D CMAKE_INSTALL_PREFIX:STRING=$USED_PREFIX \\
         -D BUILD_SHARED_LIBS=OFF \\
         -D AVIF_ENABLE_WERROR=OFF \\
-        -D AVIF_CODEC_DAV1D=ON \\
-        -D CMAKE_DISABLE_FIND_PACKAGE_libsharpyuv=ON
-    cmake --build . --config MinSizeRel $MAKE_THREADS_CNT
+        -D AVIF_CODEC_DAV1D=SYSTEM \\
+        -D AVIF_LIBYUV=OFF
+    cmake --build . --config MinSizeRel
     cmake --install . --config MinSizeRel
 """)
 
 stage('libde265', """
-    git clone -b v1.0.15 https://github.com/strukturag/libde265.git
+    git clone -b v1.0.16 https://github.com/strukturag/libde265.git
     cd libde265
 win:
     cmake . ^
-        -A %WIN32X64% ^
         -DCMAKE_INSTALL_PREFIX=%LIBS_DIR%/local ^
         -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
+        -DCMAKE_POLICY_DEFAULT_CMP0091=NEW ^
         -DCMAKE_C_FLAGS="/DLIBDE265_STATIC_BUILD" ^
         -DCMAKE_CXX_FLAGS="/DLIBDE265_STATIC_BUILD" ^
-        -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-        -DCMAKE_CXX_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-        -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
-        -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
         -DENABLE_SDL=OFF ^
         -DBUILD_SHARED_LIBS=OFF ^
         -DENABLE_DECODER=OFF ^
         -DENABLE_ENCODER=OFF
-    cmake --build . --config Debug --parallel
+    cmake --build . --config Debug
     cmake --install . --config Debug
 release:
-    cmake --build . --config Release --parallel
+    cmake --build . --config Release
     cmake --install . --config Release
 mac:
     cmake . \\
         -D CMAKE_OSX_ARCHITECTURES="x86_64;arm64" \\
-        -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\
         -D CMAKE_INSTALL_PREFIX:STRING=$USED_PREFIX \\
         -D DISABLE_SSE=ON \\
         -D ENABLE_SDL=OFF \\
         -D BUILD_SHARED_LIBS=OFF \\
         -D ENABLE_DECODER=ON \\
         -D ENABLE_ENCODER=OFF
-    cmake --build . --config MinSizeRel $MAKE_THREADS_CNT
+    cmake --build . --config MinSizeRel
     cmake --install . --config MinSizeRel
 """)
 
 stage('libwebp', """
-    git clone -b v1.4.0 https://github.com/webmproject/libwebp.git
+    git clone -b v1.6.0 https://github.com/webmproject/libwebp.git
     cd libwebp
 win:
     nmake /f Makefile.vc CFG=debug-static OBJDIR=out RTLIBCFG=static all
@@ -952,10 +940,9 @@ def runStages():
         arch=$1
         folder=$2
 
-        CFLAGS=$UNGUARDED cmake -B $folder -G Ninja . \\
+        CFLAGS=$UNGUARDED cmake -B $folder . \\
             -D CMAKE_BUILD_TYPE=Release \\
             -D CMAKE_INSTALL_PREFIX=$USED_PREFIX \\
-            -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\
             -D CMAKE_OSX_ARCHITECTURES=$arch \\
             -D WEBP_BUILD_ANIM_UTILS=OFF \\
             -D WEBP_BUILD_CWEBP=OFF \\
@@ -966,7 +953,7 @@ def runStages():
             -D WEBP_BUILD_WEBPMUX=OFF \\
             -D WEBP_BUILD_WEBPINFO=OFF \\
             -D WEBP_BUILD_EXTRAS=OFF
-        cmake --build $folder $MAKE_THREADS_CNT
+        cmake --build $folder
     }
     buildOneArch arm64 build.arm64
     buildOneArch x86_64 build
@@ -979,59 +966,67 @@ def runStages():
 """)
 
 stage('libheif', """
-    git clone -b v1.17.6 https://github.com/strukturag/libheif.git
+    git clone -b v1.21.2 https://github.com/strukturag/libheif.git
     cd libheif
 win:
     %THIRDPARTY_DIR%\\msys64\\usr\\bin\\sed.exe -i 's/LIBHEIF_EXPORTS/LIBDE265_STATIC_BUILD/g' libheif/CMakeLists.txt
     %THIRDPARTY_DIR%\\msys64\\usr\\bin\\sed.exe -i 's/HAVE_VISIBILITY/LIBHEIF_STATIC_BUILD/g' libheif/CMakeLists.txt
+    %THIRDPARTY_DIR%\\msys64\\usr\\bin\\sed.exe -i 's/LIBHEIF_EXPORTS/LIBDE265_STATIC_BUILD/g' heifio/CMakeLists.txt
+    %THIRDPARTY_DIR%\\msys64\\usr\\bin\\sed.exe -i 's/HAVE_VISIBILITY/LIBHEIF_STATIC_BUILD/g' heifio/CMakeLists.txt
     cmake . ^
-        -A %WIN32X64% ^
         -DCMAKE_INSTALL_PREFIX=%LIBS_DIR%/local ^
         -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-        -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-        -DCMAKE_CXX_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-        -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
-        -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
         -DBUILD_SHARED_LIBS=OFF ^
+        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ^
         -DBUILD_TESTING=OFF ^
         -DENABLE_PLUGIN_LOADING=OFF ^
         -DWITH_LIBDE265=ON ^
+        -DWITH_X264=OFF ^
+        -DWITH_OpenH264_DECODER=OFF ^
         -DWITH_SvtEnc=OFF ^
         -DWITH_SvtEnc_PLUGIN=OFF ^
         -DWITH_RAV1E=OFF ^
         -DWITH_RAV1E_PLUGIN=OFF ^
+        -DWITH_LIBSHARPYUV=OFF ^
+        -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE ^
+        -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE ^
+        -DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE ^
         -DWITH_EXAMPLES=OFF
-    cmake --build . --config Debug --parallel
+    cmake --build . --config Debug
     cmake --install . --config Debug
 release:
-    cmake --build . --config Release --parallel
+    cmake --build . --config Release
     cmake --install . --config Release
 mac:
     cmake . \\
         -D CMAKE_OSX_ARCHITECTURES="x86_64;arm64" \\
-        -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\
         -D CMAKE_INSTALL_PREFIX:STRING=$USED_PREFIX \\
         -D BUILD_SHARED_LIBS=OFF \\
+        -D CMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \\
         -D BUILD_TESTING=OFF \\
         -D ENABLE_PLUGIN_LOADING=OFF \\
         -D WITH_AOM_ENCODER=OFF \\
         -D WITH_AOM_DECODER=OFF \\
         -D WITH_X265=OFF \\
+        -D WITH_X264=OFF \\
+        -D WITH_OpenH264_DECODER=OFF \\
         -D WITH_SvtEnc=OFF \\
         -D WITH_RAV1E=OFF \\
         -D WITH_DAV1D=ON \\
         -D WITH_LIBDE265=ON \\
         -D LIBDE265_INCLUDE_DIR=$USED_PREFIX/include/ \\
         -D LIBDE265_LIBRARY=$USED_PREFIX/lib/libde265.a \\
-        -D LIBSHARPYUV_INCLUDE_DIR=$USED_PREFIX/include/webp/ \\
-        -D LIBSHARPYUV_LIBRARY=$USED_PREFIX/lib/libsharpyuv.a \\
+        -D WITH_LIBSHARPYUV=OFF \\
+        -D CMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE \\
+        -D CMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE \\
+        -D CMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE \\
         -D WITH_EXAMPLES=OFF
-    cmake --build . --config MinSizeRel $MAKE_THREADS_CNT
+    cmake --build . --config MinSizeRel
     cmake --install . --config MinSizeRel
 """)
 
 stage('libjxl', """
-    git clone -b v0.10.3 --recursive --shallow-submodules https://github.com/libjxl/libjxl.git
+    git clone -b v0.11.2 --recursive --shallow-submodules https://github.com/libjxl/libjxl.git
     cd libjxl
 """ + setVar("cmake_defines", """
     -DBUILD_SHARED_LIBS=OFF
@@ -1055,28 +1050,22 @@ def runStages():
 """) + """
 win:
     cmake . ^
-        -A %WIN32X64% ^
         -DCMAKE_INSTALL_PREFIX=%LIBS_DIR%/local ^
         -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
         -DCMAKE_C_FLAGS="/DJXL_STATIC_DEFINE /DJXL_THREADS_STATIC_DEFINE /DJXL_CMS_STATIC_DEFINE" ^
         -DCMAKE_CXX_FLAGS="/DJXL_STATIC_DEFINE /DJXL_THREADS_STATIC_DEFINE /DJXL_CMS_STATIC_DEFINE" ^
-        -DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-        -DCMAKE_CXX_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-        -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
-        -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
         %cmake_defines%
-    cmake --build . --config Debug --parallel
+    cmake --build . --config Debug
     cmake --install . --config Debug
 release:
-    cmake --build . --config Release --parallel
+    cmake --build . --config Release
     cmake --install . --config Release
 mac:
     cmake . \\
         -D CMAKE_OSX_ARCHITECTURES="x86_64;arm64" \\
-        -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\
         -D CMAKE_INSTALL_PREFIX:STRING=$USED_PREFIX \\
         ${cmake_defines}
-    cmake --build . --config MinSizeRel $MAKE_THREADS_CNT
+    cmake --build . --config MinSizeRel
     cmake --install . --config MinSizeRel
 """)
 
@@ -1088,9 +1077,7 @@ def runStages():
 win:
     for /r %%i in (..\\patches\\libvpx\\*) do git apply %%i
 
-    SET PATH_BACKUP_=%PATH%
-    SET PATH=%ROOT_DIR%\\ThirdParty\\msys64\\usr\\bin;%PATH%
-
+    SET PATH=%THIRDPARTY_DIR%\\msys64\\usr\\bin;%PATH%
     SET CHERE_INVOKING=enabled_from_arguments
     SET MSYS2_PATH_TYPE=inherit
 
@@ -1099,16 +1086,13 @@ def runStages():
 win64:
     SET "TOOLCHAIN=x86_64-win64-vs17"
 winarm:
-    SET "TOOLCHAIN=arm64-win64-vs17"
+    SET "TOOLCHAIN=arm64-win64-vs17-v145"
 win:
 depends:patches/build_libvpx_win.sh
     bash --login ../patches/build_libvpx_win.sh
-
-    SET PATH=%PATH_BACKUP_%
 mac:
     find ../patches/libvpx -type f -print0 | sort -z | xargs -0 git apply
 
-depends:yasm/yasm
     ./configure --prefix=$USED_PREFIX \
     --target=arm64-darwin20-gcc \
     --disable-examples \
@@ -1148,10 +1132,17 @@ def runStages():
 """)
 
 stage('liblcms2', """
-mac:
     git clone -b lcms2.16 https://github.com/mm2/Little-CMS.git liblcms2
     cd liblcms2
-
+win:
+depends:python/Scripts/activate.bat
+    %THIRDPARTY_DIR%\\python\\Scripts\\activate.bat
+    meson setup --default-library=static --buildtype=debug -Db_vscrt=mtd out/Debug
+    meson compile -C out/Debug
+    meson setup --default-library=static --buildtype=release -Db_vscrt=mt out/Release
+    meson compile -C out/Release
+    deactivate
+mac:
     buildOneArch() {
         arch=$1
         folder=`pwd`/$2
@@ -1190,9 +1181,7 @@ def runStages():
 depends:patches/ffmpeg.patch
     git apply ../patches/ffmpeg.patch
 
-    SET PATH_BACKUP_=%PATH%
-    SET PATH=%ROOT_DIR%\\ThirdParty\\msys64\\usr\\bin;%PATH%
-
+    SET PATH=%THIRDPARTY_DIR%\\msys64\\usr\\bin;%PATH%
     SET CHERE_INVOKING=enabled_from_arguments
     SET MSYS2_PATH_TYPE=inherit
 
@@ -1202,11 +1191,8 @@ def runStages():
 win:
 depends:patches/build_ffmpeg_win.sh
     bash --login ../patches/build_ffmpeg_win.sh
-
-    SET PATH=%PATH_BACKUP_%
 mac:
     export PKG_CONFIG_PATH=$USED_PREFIX/lib/pkgconfig
-depends:yasm/yasm
 
     configureFFmpeg() {
         arch=$1
@@ -1217,13 +1203,14 @@ def runStages():
         --arch="$arch" \
         --extra-cflags="$MIN_VER -arch $arch $UNGUARDED -DCONFIG_SAFE_BITSTREAM_READER=1 -I$USED_PREFIX/include" \
         --extra-cxxflags="$MIN_VER -arch $arch $UNGUARDED -DCONFIG_SAFE_BITSTREAM_READER=1 -I$USED_PREFIX/include" \
-        --extra-ldflags="$MIN_VER -arch $arch $USED_PREFIX/lib/libopus.a" \
+        --extra-ldflags="$MIN_VER -arch $arch $USED_PREFIX/lib/libopus.a -lc++" \
         --disable-programs \
         --disable-doc \
         --disable-network \
         --disable-everything \
         --enable-protocol=file \
         --enable-libdav1d \
+        --enable-libopenh264 \
         --enable-libopus \
         --enable-libvpx \
         --enable-hwaccel=h264_videotoolbox \
@@ -1301,7 +1288,10 @@ def runStages():
         --enable-decoder=wmav1 \
         --enable-decoder=wmav2 \
         --enable-decoder=wmavoice \
+        --enable-encoder=aac \
         --enable-encoder=libopus \
+        --enable-encoder=libopenh264 \
+        --enable-encoder=pcm_s16le \
         --enable-filter=atempo \
         --enable-parser=aac \
         --enable-parser=aac_latm \
@@ -1324,8 +1314,10 @@ def runStages():
         --enable-demuxer=mp3 \
         --enable-demuxer=ogg \
         --enable-demuxer=wav \
+        --enable-muxer=mp4 \
         --enable-muxer=ogg \
-        --enable-muxer=opus
+        --enable-muxer=opus \
+        --enable-muxer=wav
     }
 
     configureFFmpeg arm64
@@ -1363,29 +1355,30 @@ def runStages():
 """)
 
 stage('openal-soft', """
-version: 3
-win:
-    git clone -b wasapi_exact_device_time https://github.com/telegramdesktop/openal-soft.git
+    git clone https://github.com/telegramdesktop/openal-soft.git
     cd openal-soft
+win:
+    git checkout 291c0fdbbd
     cmake -B build . ^
-        -A %WIN32X64% ^
         -D LIBTYPE:STRING=STATIC ^
-        -D FORCE_STATIC_VCRT=ON
-    cmake --build build --config Debug --parallel
+        -D FORCE_STATIC_VCRT=ON ^
+        -D ALSOFT_UTILS=OFF ^
+        -D ALSOFT_EXAMPLES=OFF ^
+        -D ALSOFT_TESTS=OFF
+    cmake --build build --config Debug
 release:
-    cmake --build build --config RelWithDebInfo --parallel
+    cmake --build build --config RelWithDebInfo
 mac:
-    git clone -b coreaudio_device_uid https://github.com/telegramdesktop/openal-soft.git
-    cd openal-soft
+    git checkout coreaudio_device_uid
     CFLAGS=$UNGUARDED CPPFLAGS=$UNGUARDED cmake -B build . \\
         -D CMAKE_BUILD_TYPE=RelWithDebInfo \\
         -D CMAKE_INSTALL_PREFIX:PATH=$USED_PREFIX \\
         -D ALSOFT_EXAMPLES=OFF \\
         -D ALSOFT_UTILS=OFF \\
+        -D ALSOFT_TESTS=OFF \\
         -D LIBTYPE:STRING=STATIC \\
-        -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\
         -D CMAKE_OSX_ARCHITECTURES="x86_64;arm64"
-    cmake --build build $MAKE_THREADS_CNT
+    cmake --build build
     cmake --install build
 """)
 
@@ -1417,10 +1410,12 @@ def runStages():
 win:
     SET "PYTHONUTF8=1"
     SET "FolderPostfix="
+    SET "ToolsetProp="
 win64:
     SET "FolderPostfix=_x64"
 winarm:
     SET "FolderPostfix=_ARM64"
+    SET "ToolsetProp=/property:PlatformToolset=v145"
 win:
 depends:python/Scripts/activate.bat
     %THIRDPARTY_DIR%\\python\\Scripts\\activate.bat
@@ -1432,7 +1427,7 @@ def runStages():
     ninja -C out/Release%FolderPostfix% common crash_generation_client exception_handler
     cd tools\\windows\\dump_syms
     gyp dump_syms.gyp --format=msvs
-    msbuild -m dump_syms.vcxproj /property:Configuration=Release /property:Platform="x64"
+    msbuild -m dump_syms.vcxproj /property:Configuration=Release /property:Platform="x64" %ToolsetProp%
 win:
     deactivate
 mac:
@@ -1461,23 +1456,23 @@ def runStages():
     cd out
     mkdir Debug.x86_64
     cd Debug.x86_64
-    cmake -G Ninja \
+    cmake \
         -DCMAKE_BUILD_TYPE=Debug \
         -DCMAKE_OSX_ARCHITECTURES=x86_64 \
         -DCRASHPAD_SPECIAL_TARGET=$SPECIAL_TARGET \
         -DCRASHPAD_ZLIB_INCLUDE_PATH=$ZLIB_PATH \
         -DCRASHPAD_ZLIB_LIB_PATH=$ZLIB_LIB ../..
-    ninja
+    cmake --build .
     cd ..
     mkdir Debug.arm64
     cd Debug.arm64
-    cmake -G Ninja \
+    cmake \
         -DCMAKE_BUILD_TYPE=Debug \
         -DCMAKE_OSX_ARCHITECTURES=arm64 \
         -DCRASHPAD_SPECIAL_TARGET=$SPECIAL_TARGET \
         -DCRASHPAD_ZLIB_INCLUDE_PATH=$ZLIB_PATH \
         -DCRASHPAD_ZLIB_LIB_PATH=$ZLIB_LIB ../..
-    ninja
+    cmake --build .
     cd ..
     mkdir Debug
     lipo -create Debug.arm64/crashpad_handler Debug.x86_64/crashpad_handler -output Debug/crashpad_handler
@@ -1485,23 +1480,23 @@ def runStages():
 release:
     mkdir Release.x86_64
     cd Release.x86_64
-    cmake -G Ninja \
+    cmake \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_OSX_ARCHITECTURES=x86_64 \
         -DCRASHPAD_SPECIAL_TARGET=$SPECIAL_TARGET \
         -DCRASHPAD_ZLIB_INCLUDE_PATH=$ZLIB_PATH \
         -DCRASHPAD_ZLIB_LIB_PATH=$ZLIB_LIB ../..
-    ninja
+    cmake --build .
     cd ..
     mkdir Release.arm64
     cd Release.arm64
-    cmake -G Ninja \
+    cmake \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_OSX_ARCHITECTURES=arm64 \
         -DCRASHPAD_SPECIAL_TARGET=$SPECIAL_TARGET \
         -DCRASHPAD_ZLIB_INCLUDE_PATH=$ZLIB_PATH \
         -DCRASHPAD_ZLIB_LIB_PATH=$ZLIB_LIB ../..
-    ninja
+    cmake --build .
     cd ..
     mkdir Release
     lipo -create Release.arm64/crashpad_handler Release.x86_64/crashpad_handler -output Release/crashpad_handler
@@ -1514,26 +1509,13 @@ def runStages():
 win:
     git clone https://github.com/desktop-app/tg_angle.git
     cd tg_angle
-    git checkout e3f59e8d0c
-    mkdir out
-    cd out
-    mkdir Debug
-    cd Debug
-    cmake -G Ninja ^
-        -DCMAKE_BUILD_TYPE=Debug ^
+    git checkout d4c3606e47
+    cmake -B out ^
         -DTG_ANGLE_SPECIAL_TARGET=%SPECIAL_TARGET% ^
-        -DTG_ANGLE_ZLIB_INCLUDE_PATH=%LIBS_DIR%/zlib ../..
-    ninja
+        -DTG_ANGLE_ZLIB_INCLUDE_PATH=%LIBS_DIR%/zlib
+    cmake --build out --config Debug
 release:
-    cd ..
-    mkdir Release
-    cd Release
-    cmake -G Ninja ^
-        -DCMAKE_BUILD_TYPE=Release ^
-        -DTG_ANGLE_SPECIAL_TARGET=%SPECIAL_TARGET% ^
-        -DTG_ANGLE_ZLIB_INCLUDE_PATH=%LIBS_DIR%/zlib ../..
-    ninja
-    cd ..\\..\\..
+    cmake --build out --config Release
 """)
 
     stage('qt_' + qt, """
@@ -1541,9 +1523,8 @@ def runStages():
     cd qt_$QT
     git submodule update --init --recursive --progress qtbase qtimageformats qtsvg
 depends:patches/qtbase_""" + qt + """/*.patch
-    cd qtbase
 win:
-    git revert --no-edit 6ad56dce34
+    cd qtbase
     setlocal enabledelayedexpansion
     for /r %%i in (..\\..\\patches\\qtbase_%QT%\\*) do (
         git apply %%i -v
@@ -1552,7 +1533,6 @@ def runStages():
             exit /b 1
         )
     )
-
     cd ..
 
     SET CONFIGURATIONS=-debug
@@ -1578,11 +1558,11 @@ def runStages():
         -I "%ANGLE_DIR%\\include" ^
         -D "KHRONOS_STATIC=" ^
         -D "DESKTOP_APP_QT_STATIC_ANGLE=" ^
-        QMAKE_LIBS_OPENGL_ES2_DEBUG="%ANGLE_LIBS_DIR%\\Debug\\tg_angle.lib %ZLIB_LIBS_DIR%\\Debug\\zlibstaticd.lib d3d9.lib dxgi.lib dxguid.lib" ^
-        QMAKE_LIBS_OPENGL_ES2_RELEASE="%ANGLE_LIBS_DIR%\\Release\\tg_angle.lib %ZLIB_LIBS_DIR%\\Release\\zlibstatic.lib d3d9.lib dxgi.lib dxguid.lib" ^
+        QMAKE_LIBS_OPENGL_ES2_DEBUG="%ANGLE_LIBS_DIR%\\Debug\\tg_angle.lib %ZLIB_LIBS_DIR%\\Debug\\libzsd.lib d3d9.lib dxgi.lib dxguid.lib" ^
+        QMAKE_LIBS_OPENGL_ES2_RELEASE="%ANGLE_LIBS_DIR%\\Release\\tg_angle.lib %ZLIB_LIBS_DIR%\\Release\\libzs.lib d3d9.lib dxgi.lib dxguid.lib" ^
         -egl ^
-        QMAKE_LIBS_EGL_DEBUG="%ANGLE_LIBS_DIR%\\Debug\\tg_angle.lib %ZLIB_LIBS_DIR%\\Debug\\zlibstaticd.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^
-        QMAKE_LIBS_EGL_RELEASE="%ANGLE_LIBS_DIR%\\Release\\tg_angle.lib %ZLIB_LIBS_DIR%\\Release\\zlibstatic.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^
+        QMAKE_LIBS_EGL_DEBUG="%ANGLE_LIBS_DIR%\\Debug\\tg_angle.lib %ZLIB_LIBS_DIR%\\Debug\\libzsd.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^
+        QMAKE_LIBS_EGL_RELEASE="%ANGLE_LIBS_DIR%\\Release\\tg_angle.lib %ZLIB_LIBS_DIR%\\Release\\libzs.lib d3d9.lib dxgi.lib dxguid.lib Gdi32.lib User32.lib" ^
         -openssl-linked ^
         -I "%OPENSSL_DIR%\\include" ^
         OPENSSL_LIBS_DEBUG="%OPENSSL_LIBS_DIR%.dbg\\libssl.lib %OPENSSL_LIBS_DIR%.dbg\\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
@@ -1599,46 +1579,24 @@ def runStages():
         -nomake tests ^
         -platform win32-msvc
 
-    jom -j%NUMBER_OF_PROCESSORS%
+    rem jom -jN occasionally fails to create the shared mkspecs\modules-inst
+    rem directory due to a race in qmake's mkpath under parallel builds; the
+    rem build is incremental, so simply retrying picks up where it stopped.
+    jom -j%NUMBER_OF_PROCESSORS% || jom -j%NUMBER_OF_PROCESSORS%
     jom -j%NUMBER_OF_PROCESSORS% install
-mac:
-    find ../../patches/qtbase_$QT -type f -print0 | sort -z | xargs -0 git apply
-    cd ..
-
-    CONFIGURATIONS=-debug
-release:
-    CONFIGURATIONS=-debug-and-release
-mac:
-    ./configure -prefix "$USED_PREFIX/Qt-$QT" \
-        $CONFIGURATIONS \
-        -force-debug-info \
-        -opensource \
-        -confirm-license \
-        -static \
-        -opengl desktop \
-        -no-openssl \
-        -securetransport \
-        -I "$USED_PREFIX/include" \
-        LIBJPEG_LIBS="$USED_PREFIX/lib/libjpeg.a" \
-        ZLIB_LIBS="$USED_PREFIX/lib/libz.a" \
-        -nomake examples \
-        -nomake tests \
-        -platform macx-clang
-
-    make $MAKE_THREADS_CNT
-    make install
 """)
 else: # qt > '6'
-    branch = 'v$QT' + ('-lts-lgpl' if qt < '6.3' else '')
+    branch = 'v$QT' + ('-lts-lgpl' if qt.startswith('6.2.') else '')
     stage('qt_' + qt, """
     git clone -b """ + branch + """ https://github.com/qt/qt5.git qt_$QT
     cd qt_$QT
-    git submodule update --init --recursive qtbase qtimageformats qtsvg
+    git submodule update --init --recursive --progress qtbase qtimageformats qtshadertools qtsvg
 depends:patches/qtbase_""" + qt + """/*.patch
-    cd qtbase
 mac:
-    find ../../patches/qtbase_$QT -type f -print0 | sort -z | xargs -0 git apply -v
-    cd ..
+    if [ -d "../patches/qt6_highsierra" ]; then
+        find "$PWD/../patches/qt6_highsierra" -maxdepth 1 -name "*.patch" -print0 | sort -z | xargs -0 git -C qtbase apply -v
+    fi
+    find $PWD/../patches/qtbase_$QT -type f -print0 | sort -z | xargs -0 git -C qtbase apply -v
     sed -i.bak 's/tqtc-//' {qtimageformats,qtsvg}/dependencies.yaml
 
     CONFIGURATIONS=-debug
@@ -1651,6 +1609,7 @@ def runStages():
         -opensource \
         -confirm-license \
         -static \
+        -no-framework \
         -opengl desktop \
         -no-openssl \
         -securetransport \
@@ -1658,16 +1617,25 @@ def runStages():
         -I "$USED_PREFIX/include" \
         -no-feature-futimens \
         -no-feature-brotli \
-        -nomake examples \
-        -nomake tests \
+        -no-feature-cxx17_filesystem \
         -platform macx-clang -- \
         -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
-        -DCMAKE_PREFIX_PATH="$USED_PREFIX"
+        -DCMAKE_PREFIX_PATH="$USED_PREFIX" \
+        -DQT_NO_HANDLE_APPLE_SINGLE_ARCH_CROSS_COMPILING=ON \
+        -DQT_SYNC_HEADERS_AT_CONFIGURE_TIME=ON
 
-    ninja
-    ninja install
+    cmake --build .
+    cmake --install .
 win:
-    for /r %%i in (..\\..\\patches\\qtbase_%QT%\\*) do git apply %%i -v
+    cd qtbase
+    setlocal enabledelayedexpansion
+    for /r %%i in (..\\..\\patches\\qtbase_%QT%\\*) do (
+        git apply %%i -v
+        if errorlevel 1 (
+            echo ERROR: Applying patch %%~nxi failed!
+            exit /b 1
+        )
+    )
     cd ..
 
     SET CONFIGURATIONS=-debug
@@ -1680,6 +1648,7 @@ def runStages():
     SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
     SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib
     SET WEBP_DIR=%LIBS_DIR%\\libwebp
+    SET LCMS2_DIR=%LIBS_DIR%\\liblcms2
     configure -prefix "%LIBS_DIR%\\Qt-%QT%" ^
         %CONFIGURATIONS% ^
         -force-debug-info ^
@@ -1692,8 +1661,6 @@ def runStages():
         -system-webp ^
         -system-zlib ^
         -system-libjpeg ^
-        -nomake examples ^
-        -nomake tests ^
         -platform win32-msvc ^
         -D ZLIB_WINAPI ^
         -- ^
@@ -1709,27 +1676,29 @@ def runStages():
         -D JPEG_LIBRARY_RELEASE="%MOZJPEG_DIR%\\Release\\jpeg-static.lib" ^
         -D ZLIB_FOUND=1 ^
         -D ZLIB_INCLUDE_DIR="%ZLIB_LIBS_DIR%" ^
-        -D ZLIB_LIBRARY_DEBUG="%ZLIB_LIBS_DIR%\\Debug\\zlibstaticd.lib" ^
-        -D ZLIB_LIBRARY_RELEASE="%ZLIB_LIBS_DIR%\\Release\\zlibstatic.lib" ^
+        -D ZLIB_LIBRARY_DEBUG="%ZLIB_LIBS_DIR%\\Debug\\libzsd.lib" ^
+        -D ZLIB_LIBRARY_RELEASE="%ZLIB_LIBS_DIR%\\Release\\libzs.lib" ^
         -D WebP_INCLUDE_DIR="%WEBP_DIR%\\src" ^
         -D WebP_demux_INCLUDE_DIR="%WEBP_DIR%\\src" ^
         -D WebP_mux_INCLUDE_DIR="%WEBP_DIR%\\src" ^
         -D WebP_LIBRARY="%WEBP_DIR%\\out\\release-static\\$X8664\\lib\\webp.lib" ^
         -D WebP_demux_LIBRARY="%WEBP_DIR%\\out\\release-static\\$X8664\\lib\\webpdemux.lib" ^
-        -D WebP_mux_LIBRARY="%WEBP_DIR%\\out\\release-static\\$X8664\\lib\\webpmux.lib"
+        -D WebP_mux_LIBRARY="%WEBP_DIR%\\out\\release-static\\$X8664\\lib\\webpmux.lib" ^
+        -D LCMS2_FOUND=1 ^
+        -D LCMS2_INCLUDE_DIR="%LCMS2_DIR%\\include" ^
+        -D LCMS2_LIBRARIES="%LCMS2_DIR%\\out\\Release\\src\\liblcms2.a"
 
-    cmake --build . --config Debug --parallel
+    cmake --build . --config Debug
     cmake --install . --config Debug
-    cmake --build . --parallel
+    cmake --build .
     cmake --install .
 """)
 
 stage('tg_owt', """
     git clone https://github.com/desktop-app/tg_owt.git
     cd tg_owt
-    git checkout 4a60ce1ab9
-    git submodule init
-    git submodule update
+    git checkout 89df288dd6ba5b2ec95b3c5eaf1e7e0c3a870fc4
+    git submodule update --init --recursive
 win:
     SET MOZJPEG_PATH=$LIBS_DIR/mozjpeg
     SET OPUS_PATH=$USED_PREFIX/include/opus
@@ -1737,12 +1706,8 @@ def runStages():
     SET LIBVPX_PATH=$USED_PREFIX/include
     SET OPENH264_PATH=$USED_PREFIX/include
     SET FFMPEG_PATH=$LIBS_DIR/ffmpeg
-    mkdir out
-    cd out
-    mkdir Debug
-    cd Debug
-    cmake -G Ninja \
-        -DCMAKE_BUILD_TYPE=Debug \
+    cmake -B out \
+        -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" \
         -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \
         -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \
         -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \
@@ -1750,23 +1715,10 @@ def runStages():
         -DTG_OWT_OPUS_INCLUDE_PATH=$OPUS_PATH \
         -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \
         -DTG_OWT_OPENH264_INCLUDE_PATH=$OPENH264_PATH \
-        -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../..
-    ninja
+        -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH
+    cmake --build out --config Debug
 release:
-    cd ..
-    mkdir Release
-    cd Release
-    cmake -G Ninja \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \
-        -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \
-        -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \
-        -DTG_OWT_OPENSSL_INCLUDE_PATH=$OPENSSL_PATH \
-        -DTG_OWT_OPUS_INCLUDE_PATH=$OPUS_PATH \
-        -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \
-        -DTG_OWT_OPENH264_INCLUDE_PATH=$OPENH264_PATH \
-        -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../..
-    ninja
+    cmake --build out --config Release
 mac:
     MOZJPEG_PATH=$USED_PREFIX/include
     OPUS_PATH=$USED_PREFIX/include/opus
@@ -1777,7 +1729,7 @@ def runStages():
     cd out
     mkdir Debug.x86_64
     cd Debug.x86_64
-    cmake -G Ninja \
+    cmake \
         -DCMAKE_BUILD_TYPE=Debug \
         -DCMAKE_OSX_ARCHITECTURES=x86_64 \
         -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \
@@ -1788,11 +1740,11 @@ def runStages():
         -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \
         -DTG_OWT_OPENH264_INCLUDE_PATH=$OPENH264_PATH \
         -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../..
-    ninja
+    cmake --build .
     cd ..
     mkdir Debug.arm64
     cd Debug.arm64
-    cmake -G Ninja \
+    cmake \
         -DCMAKE_BUILD_TYPE=Debug \
         -DCMAKE_OSX_ARCHITECTURES=arm64 \
         -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \
@@ -1803,14 +1755,14 @@ def runStages():
         -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \
         -DTG_OWT_OPENH264_INCLUDE_PATH=$OPENH264_PATH \
         -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../..
-    ninja
+    cmake --build .
     cd ..
     mkdir Debug
     lipo -create Debug.arm64/libtg_owt.a Debug.x86_64/libtg_owt.a -output Debug/libtg_owt.a
 release:
     mkdir Release.x86_64
     cd Release.x86_64
-    cmake -G Ninja \
+    cmake \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_OSX_ARCHITECTURES=x86_64 \
         -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \
@@ -1820,11 +1772,11 @@ def runStages():
         -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \
         -DTG_OWT_OPENH264_INCLUDE_PATH=$OPENH264_PATH \
         -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../..
-    ninja
+    cmake --build .
     cd ..
     mkdir Release.arm64
     cd Release.arm64
-    cmake -G Ninja \
+    cmake \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_OSX_ARCHITECTURES=arm64 \
         -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \
@@ -1834,33 +1786,30 @@ def runStages():
         -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \
         -DTG_OWT_OPENH264_INCLUDE_PATH=$OPENH264_PATH \
         -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../..
-    ninja
+    cmake --build .
     cd ..
     mkdir Release
     lipo -create Release.arm64/libtg_owt.a Release.x86_64/libtg_owt.a -output Release/libtg_owt.a
 """)
 
 stage('ada', """
-    git clone -b v2.9.0 https://github.com/ada-url/ada.git
+    git clone -b v3.2.4 https://github.com/ada-url/ada.git
     cd ada
 win:
     cmake -B out . ^
-        -A %WIN32X64% ^
         -D ADA_TESTING=OFF ^
         -D ADA_TOOLS=OFF ^
-        -D CMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-        -D CMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-        -D CMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"
-    cmake --build out --config Debug --parallel
-    cmake --build out --config Release --parallel
+        -D ADA_INCLUDE_URL_PATTERN=OFF ^
+        -D CMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>"
+    cmake --build out --config Debug
+    cmake --build out --config Release
 mac:
     CFLAGS="$UNGUARDED" CPPFLAGS="$UNGUARDED" cmake -B build . \\
         -D ADA_TESTING=OFF \\
         -D ADA_TOOLS=OFF \\
-        -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \\
         -D CMAKE_OSX_ARCHITECTURES="x86_64;arm64" \\
         -D CMAKE_INSTALL_PREFIX:STRING=$USED_PREFIX
-    cmake --build build $MAKE_THREADS_CNT
+    cmake --build build
     cmake --install build
 """)
 
@@ -1875,14 +1824,13 @@ def runStages():
     mkdir build
     cd build
     cmake .. ^
-        -A %WIN32X64% ^
         -Dprotobuf_BUILD_TESTS=OFF ^
         -Dprotobuf_BUILD_PROTOBUF_BINARIES=ON ^
         -Dprotobuf_BUILD_LIBPROTOC=ON ^
         -Dprotobuf_WITH_ZLIB_DEFAULT=OFF ^
         -Dprotobuf_DEBUG_POSTFIX=""
-    cmake --build . --config Release --parallel
-    cmake --build . --config Debug --parallel
+    cmake --build . --config Release
+    cmake --build . --config Debug
 """)
 # mac:
 #     git clone --recursive -b v21.9 https://github.com/protocolbuffers/protobuf
@@ -1894,12 +1842,89 @@ def runStages():
 #     mkdir build
 #     cd build
 #     CFLAGS="$UNGUARDED" CPPFLAGS="$UNGUARDED" cmake .. \
-#         -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \
 #         -Dprotobuf_BUILD_TESTS=OFF \
 #         -Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \
 #         -Dprotobuf_BUILD_LIBPROTOC=ON \
 #         -Dprotobuf_WITH_ZLIB_DEFAULT=OFF
-#     cmake --build . $MAKE_THREADS_CNT
+#     cmake --build .
+
+stage('tde2e', """
+    git clone https://github.com/tdlib/td.git tde2e
+    cd tde2e
+    git checkout 51743df
+win:
+    SET OPENSSL_DIR=%LIBS_DIR%\\openssl3
+    SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
+    SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib
+    %THIRDPARTY_DIR%\\msys64\\usr\\bin\\sed -i "s/STREQUAL/MATCHES/" td/generate/CMakeLists.txt
+    mkdir out
+    cd out
+    mkdir Debug
+    cd Debug
+    cmake ^
+        -DOPENSSL_FOUND=1 ^
+        -DOPENSSL_INCLUDE_DIR=%OPENSSL_DIR%\\include ^
+        -DOPENSSL_CRYPTO_LIBRARY="%OPENSSL_LIBS_DIR%.dbg\\libcrypto.lib" ^
+        -DZLIB_FOUND=1 ^
+        -DZLIB_INCLUDE_DIR=%ZLIB_LIBS_DIR% ^
+        -DZLIB_LIBRARIES="%ZLIB_LIBS_DIR%\\Debug\\libzsd.lib" ^
+        -DCMAKE_CONFIGURATION_TYPES=Debug ^
+        -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
+        -DCMAKE_POLICY_DEFAULT_CMP0091=NEW ^
+        -DCMAKE_C_FLAGS="/DZLIB_WINAPI" ^
+        -DCMAKE_CXX_FLAGS="/DZLIB_WINAPI" ^
+        -DCMAKE_EXE_LINKER_FLAGS="/SAFESEH:NO Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib %OPENSSL_LIBS_DIR%.dbg\\libssl.lib" ^
+        -DCMAKE_SHARED_LINKER_FLAGS="/SAFESEH:NO Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib %OPENSSL_LIBS_DIR%.dbg\\libssl.lib" ^
+        -DTD_ENABLE_MULTI_PROCESSOR_COMPILATION=ON ^
+        -DTD_E2E_ONLY=ON ^
+        ../..
+    cmake --build . --config Debug
+release:
+    cd ..
+    mkdir Release
+    cd Release
+    cmake ^
+        -DOPENSSL_FOUND=1 ^
+        -DOPENSSL_INCLUDE_DIR=%OPENSSL_DIR%\\include ^
+        -DOPENSSL_CRYPTO_LIBRARY="%OPENSSL_LIBS_DIR%\\libcrypto.lib" ^
+        -DZLIB_FOUND=1 ^
+        -DZLIB_INCLUDE_DIR=%ZLIB_LIBS_DIR% ^
+        -DZLIB_LIBRARIES="%ZLIB_LIBS_DIR%\\Release\\libzs.lib" ^
+        -DCMAKE_CONFIGURATION_TYPES=Release ^
+        -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
+        -DCMAKE_POLICY_DEFAULT_CMP0091=NEW ^
+        -DCMAKE_C_FLAGS="/DZLIB_WINAPI" ^
+        -DCMAKE_CXX_FLAGS="/DZLIB_WINAPI" ^
+        -DCMAKE_EXE_LINKER_FLAGS="/SAFESEH:NO Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib %OPENSSL_LIBS_DIR%\\libssl.lib" ^
+        -DCMAKE_SHARED_LINKER_FLAGS="/SAFESEH:NO Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib %OPENSSL_LIBS_DIR%\\libssl.lib" ^
+        -DTD_ENABLE_MULTI_PROCESSOR_COMPILATION=ON ^
+        -DTD_E2E_ONLY=ON ^
+        ../..
+    cmake --build . --config Release
+mac:
+    buildTd() {
+        BUILD_CONFIG=$1
+        mkdir -p out/$BUILD_CONFIG
+        cd out/$BUILD_CONFIG
+        cmake \
+            -DCMAKE_BUILD_TYPE=$BUILD_CONFIG \
+            -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
+            -DOPENSSL_FOUND=1 \
+            -DOPENSSL_INCLUDE_DIR=$LIBS_DIR/openssl3/include \
+            -DOPENSSL_SSL_LIBRARY=$LIBS_DIR/openssl3/libssl.a \
+            -DOPENSSL_CRYPTO_LIBRARY=$LIBS_DIR/openssl3/libcrypto.a \
+            -DZLIB_FOUND=1 \
+            -DZLIB_LIBRARIES=$USED_PREFIX/lib/libz.a \
+            -DTD_E2E_ONLY=ON \
+            ../..
+        cmake --build .
+        cd ../..
+    }
+
+    buildTd Debug
+release:
+    buildTd Release
+""")
 
 if win:
     currentCodePage = subprocess.run('chcp', capture_output=True, shell=True, text=True, env=modifiedEnv).stdout.strip().split()[-1]
diff --git a/Telegram/build/qt_version.py b/Telegram/build/qt_version.py
index 42f729049b97ec..caba8014073451 100644
--- a/Telegram/build/qt_version.py
+++ b/Telegram/build/qt_version.py
@@ -2,15 +2,12 @@
 
 def resolve(arch):
     if sys.platform == 'darwin':
-        os.environ['QT'] = '6.2.9'
+        os.environ['QT'] = '6.11.1'
     elif sys.platform == 'win32':
         if arch == 'arm' or 'qt6' in sys.argv:
             print('Choosing Qt 6.')
-            os.environ['QT'] = '6.8.0'
-        elif os.environ.get('QT') is None:
+            os.environ['QT'] = '6.11.1'
+        else:
             print('Choosing Qt 5.')
-            os.environ['QT'] = '5.15.15'
-    elif os.environ.get('QT') is None:
-        return False
-    print('Choosing Qt ' + os.environ.get('QT'))
+            os.environ['QT'] = '5.15.19'
     return True
diff --git a/Telegram/build/setup.iss b/Telegram/build/setup.iss
index b0dd43f6571179..5c304b57296f86 100644
--- a/Telegram/build/setup.iss
+++ b/Telegram/build/setup.iss
@@ -42,8 +42,8 @@ SignTool=sha256
   #define ArchModulesFolder "arm64"
   AppVerName={#MyAppName} {#MyAppVersion} arm64
 #elif MyBuildTarget == "win64"
-  ArchitecturesAllowed="x64 arm64"
-  ArchitecturesInstallIn64BitMode="x64 arm64"
+  ArchitecturesAllowed="x64compatible"
+  ArchitecturesInstallIn64BitMode="x64compatible"
   OutputBaseFilename=tsetup-x64.{#MyAppVersionFull}
   #define ArchModulesFolder "x64"
   AppVerName={#MyAppName} {#MyAppVersion} 64bit
@@ -68,7 +68,6 @@ Name: "ua";      MessagesFile: "compiler:Languages\Ukrainian.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; OnlyBelowVersion: 0,6.1
 
 [Files]
 Source: "{#ReleasePath}\Telegram.exe"; DestDir: "{app}"; Flags: ignoreversion
@@ -82,7 +81,6 @@ Source: "{#ReleasePath}\{#ModulesFolder}\d3d\d3dcompiler_47.dll"; DestDir: "{app
 Name: "{group}\{#MyAppShortName}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{group}\{cm:UninstallProgram,{#MyAppShortName}}"; Filename: "{uninstallexe}"
 Name: "{userdesktop}\{#MyAppShortName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppShortName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppShortName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
diff --git a/Telegram/build/update_dictionaries.py b/Telegram/build/update_dictionaries.py
new file mode 100644
index 00000000000000..f87ec627ff087f
--- /dev/null
+++ b/Telegram/build/update_dictionaries.py
@@ -0,0 +1,649 @@
+#!/usr/bin/env python3
+# This file is part of Telegram Desktop,
+# the official desktop application for the Telegram messaging service.
+#
+# For license and copyright information please follow this link:
+# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+"""
+Update the Hunspell dictionaries manifest consumed by Telegram Desktop.
+
+One end-to-end run:
+  1. Shallow-clone Chromium's hunspell_dictionaries repo into --cache-dir.
+  2. If --manifest-post-id is not provided, send an empty placeholder
+     message and use its id (printed so you can hardcode it in the client).
+  3. For each language: read raw .dic and .aff, recode to UTF-8 if needed
+     (rewriting the SET line), zip them under the Qt-side locale name,
+     upload via Bot API `sendDocument` to --channel.
+  4. Build a JSON manifest (each entry carries `location` =
+     "<blobs-channel>#<message_id>") and write it into the manifest post
+     via `editMessageText`.
+  5. Delete --cache-dir unless --keep-cache is passed.
+
+State file tracks sha256 of the UTF-8 dic/aff pair per language so
+subsequent runs re-upload only changed dictionaries.
+
+Usage:
+  # Full one-shot run on a fresh channel: creates the manifest post,
+  # uploads every dictionary to the same channel, edits the post, and
+  # deletes the chromium clone.
+  python3 update_dictionaries.py \\
+      --bot-token $TG_BOT_TOKEN \\
+      --channel @my_test_channel \\
+      --state-file ./dict_state.json
+
+  # Manifest and blobs in separate channels. Blobs go to @my_blobs_channel
+  # (where clients will fetch them), the JSON manifest lives in the
+  # private coordination channel -100...1438.
+  python3 update_dictionaries.py \\
+      --bot-token $TG_BOT_TOKEN \\
+      --channel @my_test_channel \\
+      --blobs-channel @my_blobs_channel \\
+      --state-file ./dict_state.json
+
+  # Re-run against an existing manifest post (incremental if state file
+  # matches; unchanged languages are carried over without re-upload).
+  python3 update_dictionaries.py \\
+      --bot-token $TG_BOT_TOKEN \\
+      --channel @my_test_channel \\
+      --manifest-post-id 1234 \\
+      --state-file ./dict_state.json
+
+  # Subset / troubleshooting; keep the chromium clone between runs.
+  python3 update_dictionaries.py \\
+      --bot-token $TG_BOT_TOKEN \\
+      --channel @my_test_channel \\
+      --manifest-post-id 1234 \\
+      --languages en_US,ru_RU \\
+      --keep-cache
+
+  # Preview: fetch, recode and zip locally; no network upload, no
+  # manifest edit, no cache cleanup.
+  python3 update_dictionaries.py \\
+      --channel @anything \\
+      --dry-run \\
+      --languages en_US,sr
+
+Flags:
+  --channel <id|@name>         where the manifest post lives
+                               (sendMessage / editMessageText target).
+  --blobs-channel <@name>      where blob zips go (sendDocument target);
+                               defaults to --channel. Must be @username
+                               since the client resolves blob locations
+                               by public username.
+  --manifest-post-id <N>       reuse an existing manifest post; omit to
+                               create a new placeholder automatically.
+  --cache-dir <path>           where the shallow chromium clone lives
+                               (default: .chromium_hunspell_cache).
+  --keep-cache                 keep --cache-dir after completion
+                               (default: delete it).
+  --state-file <path>          sha256/post_id/size per language for
+                               incremental uploads.
+
+The bot must be admin (with post/edit rights) in both --channel and
+--blobs-channel. When they coincide, one admin suffices.
+"""
+
+from __future__ import annotations
+
+import argparse
+import hashlib
+import io
+import json
+import os
+import re
+import shutil
+import subprocess
+import sys
+import time
+import zipfile
+from pathlib import Path
+from typing import Optional
+
+import requests
+
+CHROMIUM_REPO = (
+    "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries"
+)
+BOT_API = "https://api.telegram.org/bot{token}/{method}"
+
+# QLocale::Language values (stable across Qt 5/6, confirmed against
+# qtbase/src/corelib/text/qlocale.h for Qt 6.2 and 6.11).
+LANG = {
+    "Afrikaans":        4,
+    "Albanian":         9,
+    "Armenian":        17,
+    "Bulgarian":       45,
+    "Catalan":         48,
+    "Croatian":        66,
+    "Czech":           67,
+    "Danish":          68,
+    "Dutch":           72,
+    "English":         75,
+    "Estonian":        78,
+    "Faroese":         81,
+    "French":          85,
+    "Galician":        90,
+    "German":          94,
+    "Greek":           96,
+    "Hebrew":         103,
+    "Hindi":          105,
+    "Hungarian":      107,
+    "Indonesian":     112,
+    "Italian":        119,
+    "Korean":         142,
+    "Latvian":        155,
+    "Lithuanian":     160,
+    "NorwegianBokmal":209,
+    "Persian":        228,
+    "Polish":         230,
+    "Portuguese":     231,
+    "Romanian":       235,
+    "Russian":        239,
+    "Serbian":        252,
+    "Slovak":         262,
+    "Slovenian":      263,
+    "Spanish":        270,
+    "Swedish":        275,
+    "Tajik":          282,
+    "Tamil":          283,
+    "Turkish":        298,
+    "Ukrainian":      303,
+    "Vietnamese":     310,
+    "Welsh":          316,
+}
+
+# QLocale::Country values.
+COUNTRY = {
+    "Australia":       15,
+    "Brazil":          32,
+    "Canada":          41,
+    "Portugal":       188,
+    "UnitedKingdom":  246,
+    "UnitedStates":   248,
+}
+
+# Matches LWC() in spellchecker_common.cpp: default country collapses to
+# the bare language id; otherwise language*1000 + country.
+_DEFAULT_COUNTRIES = {COUNTRY["UnitedStates"], COUNTRY["Brazil"]}
+
+
+def lwc(language: int, country: int) -> int:
+    return language if country in _DEFAULT_COUNTRIES else language * 1000 + country
+
+
+# Each entry: (chromium_stem, id, qt_name, display_name)
+# - chromium_stem: the filename in chromium/deps/hunspell_dictionaries (without ext)
+# - id: primary key used by settings / UI (QLocale::Language or LWC())
+# - qt_name: must equal QLocale(id).name() at runtime — this is what the
+#   client uses for both the unpack folder and the <qt_name>.dic/.aff
+#   lookups. Double-check when adding new entries.
+# - display_name: shown in "Manage dictionaries" UI.
+LANGUAGES = [
+    ("en_US", LANG["English"],                            "en_US",      "English"),
+    ("bg_BG", LANG["Bulgarian"],                          "bg_BG",      "\u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"),
+    ("ca_ES", LANG["Catalan"],                            "ca_ES",      "Catal\u00e0"),
+    ("cs_CZ", LANG["Czech"],                              "cs_CZ",      "\u010ce\u0161tina"),
+    ("cy_GB", LANG["Welsh"],                              "cy_GB",      "Cymraeg"),
+    ("da_DK", LANG["Danish"],                             "da_DK",      "Dansk"),
+    ("de_DE", LANG["German"],                             "de_DE",      "Deutsch"),
+    ("el_GR", LANG["Greek"],                              "el_GR",      "\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"),
+    ("en_AU", lwc(LANG["English"], COUNTRY["Australia"]),      "en_AU", "English (Australia)"),
+    ("en_CA", lwc(LANG["English"], COUNTRY["Canada"]),         "en_CA", "English (Canada)"),
+    ("en_GB", lwc(LANG["English"], COUNTRY["UnitedKingdom"]),  "en_GB", "English (United Kingdom)"),
+    ("es_ES", LANG["Spanish"],                            "es_ES",      "Espa\u00f1ol"),
+    ("et_EE", LANG["Estonian"],                           "et_EE",      "Eesti"),
+    ("fa_IR", LANG["Persian"],                            "fa_IR",      "\u0641\u0627\u0631\u0633\u06cc"),
+    ("fr_FR", LANG["French"],                             "fr_FR",      "Fran\u00e7ais"),
+    ("he_IL", LANG["Hebrew"],                             "he_IL",      "\u05e2\u05d1\u05e8\u05d9\u05ea"),
+    ("hi_IN", LANG["Hindi"],                              "hi_IN",      "\u0939\u093f\u0928\u094d\u0926\u0940"),
+    ("hr_HR", LANG["Croatian"],                           "hr_HR",      "Hrvatski"),
+    ("hu-HU", LANG["Hungarian"],                          "hu_HU",      "Magyar"),
+    ("hy",    LANG["Armenian"],                           "hy_AM",      "\u0540\u0561\u0575\u0565\u0580\u0565\u0576"),
+    ("id_ID", LANG["Indonesian"],                         "id_ID",      "Indonesia"),
+    ("it_IT", LANG["Italian"],                            "it_IT",      "Italiano"),
+    ("ko",    LANG["Korean"],                             "ko_KR",      "\ud55c\uad6d\uc5b4"),
+    ("lt_LT", LANG["Lithuanian"],                         "lt_LT",      "Lietuvi\u0173"),
+    ("lv_LV", LANG["Latvian"],                            "lv_LV",      "Latvie\u0161u"),
+    ("nb_NO", LANG["NorwegianBokmal"],                    "nb_NO",      "Norsk"),
+    ("nl_NL", LANG["Dutch"],                              "nl_NL",      "Nederlands"),
+    ("pl_PL", LANG["Polish"],                             "pl_PL",      "Polski"),
+    ("pt_BR", LANG["Portuguese"],                         "pt_BR",      "Portugu\u00eas (Brazil)"),
+    ("pt_PT", lwc(LANG["Portuguese"], COUNTRY["Portugal"]),    "pt_PT", "Portugu\u00eas"),
+    ("ro_RO", LANG["Romanian"],                           "ro_RO",      "Rom\u00e2n\u0103"),
+    ("ru_RU", LANG["Russian"],                            "ru_RU",      "\u0420\u0443\u0441\u0441\u043a\u0438\u0439"),
+    ("sk_SK", LANG["Slovak"],                             "sk_SK",      "Sloven\u010dina"),
+    ("sl_SI", LANG["Slovenian"],                          "sl_SI",      "Sloven\u0161\u010dina"),
+    ("sq",    LANG["Albanian"],                           "sq_AL",      "Shqip"),
+    ("sv_SE", LANG["Swedish"],                            "sv_SE",      "Svenska"),
+    ("ta_IN", LANG["Tamil"],                              "ta_IN",      "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd"),
+    ("tg_TG", LANG["Tajik"],                              "tg_TJ",      "\u0422\u043e\u04b7\u0438\u043a\u04e3"),
+    ("tr",    LANG["Turkish"],                            "tr_TR",      "T\u00fcrk\u00e7e"),
+    ("uk_UA", LANG["Ukrainian"],                          "uk_UA",      "\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430"),
+    ("vi_VN", LANG["Vietnamese"],                         "vi_VN",      "Ti\u1ebfng Vi\u1ec7t"),
+    ("gl",    LANG["Galician"],                           "gl_ES",      "Galego"),
+    ("sr",    LANG["Serbian"],                            "sr_Cyrl_RS", "\u0421\u0440\u043f\u0441\u043a\u0438"),
+    # Afrikaans (af-ZA) and Faroese (fo-FO) are shipped by Chromium only
+    # as compiled .bdic — raw .dic/.aff are not checked in. Add them when
+    # an upstream Hunspell source is picked (LibreOffice, etc.).
+]
+
+
+def ensure_chromium_clone(cache_dir: Path) -> Path:
+    """Return path to a fresh shallow clone of Chromium's hunspell repo."""
+    clone = cache_dir / "hunspell_dictionaries"
+    if clone.exists() and (clone / ".git").exists():
+        print(f"  using existing clone at {clone}", flush=True)
+        try:
+            subprocess.run(
+                ["git", "-C", str(clone), "fetch", "--depth=1", "origin", "main"],
+                check=True, capture_output=True, text=True,
+            )
+            subprocess.run(
+                ["git", "-C", str(clone), "reset", "--hard", "FETCH_HEAD"],
+                check=True, capture_output=True, text=True,
+            )
+            return clone
+        except subprocess.CalledProcessError as e:
+            print(f"  refresh failed ({e.stderr.strip()}), recloning",
+                  flush=True)
+            shutil.rmtree(clone)
+    cache_dir.mkdir(parents=True, exist_ok=True)
+    print(f"  cloning {CHROMIUM_REPO} (shallow) → {clone}", flush=True)
+    subprocess.run(
+        ["git", "clone", "--depth=1", CHROMIUM_REPO, str(clone)],
+        check=True,
+    )
+    return clone
+
+
+def read_chromium_file(clone: Path, stem: str, ext: str) -> bytes:
+    path = clone / f"{stem}.{ext}"
+    if not path.exists():
+        raise FileNotFoundError(f"{stem}.{ext} not found at chromium")
+    return path.read_bytes()
+
+
+# Chromium SET names → Python codec names when they differ.
+_PY_CODEC_ALIAS = {
+    "windows-1251": "cp1251",
+    "windows-1252": "cp1252",
+}
+
+
+def _parse_aff_charset(aff: bytes) -> str:
+    """Return the SET charset declared in an .aff file. Default per Hunspell
+    docs is ISO-8859-1 when SET is absent."""
+    for raw in aff.splitlines():
+        line = raw.strip()
+        if line.startswith(b"\xef\xbb\xbf"):  # BOM
+            line = line[3:].strip()
+        if line.startswith(b"SET "):
+            return line[4:].strip().decode("ascii", errors="replace").strip()
+    return "ISO-8859-1"
+
+
+def _normalize_charset_name(name: str) -> str:
+    return name.upper().replace("_", "-").replace(" ", "")
+
+
+def normalize_to_utf8(dic: bytes, aff: bytes) -> tuple[bytes, bytes]:
+    """Decode dic/aff using the .aff SET charset and re-emit both as UTF-8,
+    rewriting (or inserting) the SET line so Hunspell reports utf-8 at runtime.
+    Idempotent when input is already UTF-8."""
+    charset = _parse_aff_charset(aff)
+    normalized = _normalize_charset_name(charset)
+    if normalized in ("UTF-8", "UTF8"):
+        return dic, aff
+    codec = _PY_CODEC_ALIAS.get(charset, charset)
+    try:
+        dic_text = dic.decode(codec)
+        aff_text = aff.decode(codec)
+    except (LookupError, UnicodeDecodeError) as e:
+        raise RuntimeError(
+            f"cannot decode dictionary as {charset!r}: {e}") from None
+
+    pattern = re.compile(r"^SET\s+\S+\s*$", re.MULTILINE)
+    if pattern.search(aff_text):
+        aff_text = pattern.sub("SET UTF-8", aff_text, count=1)
+    else:
+        aff_text = "SET UTF-8\n" + aff_text
+    return dic_text.encode("utf-8"), aff_text.encode("utf-8")
+
+
+def make_zip(qt_name: str, dic: bytes, aff: bytes) -> bytes:
+    buf = io.BytesIO()
+    with zipfile.ZipFile(buf, "w", zipfile.ZIP_DEFLATED) as z:
+        z.writestr(f"{qt_name}.dic", dic)
+        z.writestr(f"{qt_name}.aff", aff)
+    return buf.getvalue()
+
+
+def sha256_pair(dic: bytes, aff: bytes) -> str:
+    h = hashlib.sha256()
+    h.update(b"dic:")
+    h.update(dic)
+    h.update(b"aff:")
+    h.update(aff)
+    return h.hexdigest()
+
+
+def bot_call(token: str, method: str, *, data=None, files=None, json_body=None):
+    url = BOT_API.format(token=token, method=method)
+    for attempt in range(5):
+        if json_body is not None:
+            r = requests.post(url, json=json_body, timeout=120)
+        else:
+            r = requests.post(url, data=data, files=files, timeout=300)
+        if r.status_code == 429:
+            wait = r.json().get("parameters", {}).get("retry_after", 5)
+            print(f"  rate-limited, sleeping {wait}s", flush=True)
+            time.sleep(wait + 1)
+            continue
+        try:
+            body = r.json()
+        except ValueError:
+            r.raise_for_status()
+            raise
+        if r.ok and body.get("ok"):
+            return body["result"]
+        raise RuntimeError(
+            f"Bot API {method} failed ({r.status_code}): {body}"
+        )
+    raise RuntimeError(f"Bot API {method}: too many retries")
+
+
+def bot_send_document(token, chat_id, filename, blob):
+    result = bot_call(
+        token,
+        "sendDocument",
+        data={"chat_id": chat_id, "disable_notification": "true"},
+        files={"document": (filename, blob, "application/zip")},
+    )
+    return result["message_id"], result["document"]["file_size"]
+
+
+def bot_edit_message_text(token, chat_id, message_id, text):
+    try:
+        bot_call(
+            token,
+            "editMessageText",
+            json_body={
+                "chat_id": chat_id,
+                "message_id": message_id,
+                "text": text,
+            },
+        )
+    except RuntimeError as e:
+        if "message is not modified" in str(e):
+            print("manifest post unchanged, skip edit", flush=True)
+            return
+        raise
+
+
+def bot_send_placeholder(token, chat_id):
+    result = bot_call(
+        token,
+        "sendMessage",
+        json_body={
+            "chat_id": chat_id,
+            "text": "{}",
+            "disable_notification": True,
+        },
+    )
+    return result["message_id"]
+
+
+def load_state(path: Optional[Path]) -> dict:
+    if path and path.exists():
+        return json.loads(path.read_text())
+    return {}
+
+
+def save_state(path: Optional[Path], state: dict) -> None:
+    if not path:
+        return
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.write_text(json.dumps(state, ensure_ascii=False, indent=2) + "\n")
+
+
+_DEFAULT_CLIENT_SOURCE = (
+    Path(__file__).resolve().parent.parent
+    / "SourceFiles" / "chat_helpers" / "spellchecker_common.cpp"
+)
+
+
+def _client_channel_username(channel: str) -> Optional[str]:
+    stripped = str(channel).lstrip("@").lstrip("+")
+    if not stripped or stripped[0] == "-" or stripped.isdigit():
+        return None
+    return stripped
+
+
+def patch_client_source(
+    path: Path,
+    channel_username: Optional[str],
+    post_id: int,
+) -> None:
+    text = path.read_text(encoding="utf-8")
+    original = text
+    if channel_username is not None:
+        text, n = re.subn(
+            r'(constexpr auto kDictionariesManifestChannel\s*=\s*)'
+            r'"[^"]*"(_cs\s*;)',
+            lambda m: f'{m.group(1)}"{channel_username}"{m.group(2)}',
+            text,
+            count=1,
+        )
+        if n == 0:
+            raise RuntimeError(
+                f"patch: kDictionariesManifestChannel not found in {path}")
+    text, n = re.subn(
+        r'(constexpr auto kDictionariesManifestPostId\s*=\s*)\d+(\s*;)',
+        lambda m: f'{m.group(1)}{post_id}{m.group(2)}',
+        text,
+        count=1,
+    )
+    if n == 0:
+        raise RuntimeError(
+            f"patch: kDictionariesManifestPostId not found in {path}")
+    if text == original:
+        print(f"  {path}: constants already up to date", flush=True)
+        return
+    path.write_text(text, encoding="utf-8")
+    parts = [f"postId={post_id}"]
+    if channel_username is not None:
+        parts.append(f"channel={channel_username}")
+    print(f"  patched {path}: {', '.join(parts)}", flush=True)
+
+
+def format_manifest(entries: list[dict]) -> str:
+    # One entry per line for readable diffs and to keep message size small
+    # enough for editMessageText (4096-char limit).
+    lines = ['{"version":1,"dictionaries":[']
+    for i, e in enumerate(entries):
+        sep = "" if i == len(entries) - 1 else ","
+        lines.append(json.dumps(e, ensure_ascii=False, sort_keys=True) + sep)
+    lines.append("]}")
+    return "\n".join(lines)
+
+
+def main():
+    ap = argparse.ArgumentParser()
+    ap.add_argument("--bot-token", default=os.environ.get("TG_BOT_TOKEN"),
+                    help="Bot API token (or via TG_BOT_TOKEN env)")
+    ap.add_argument("--channel", required=True,
+                    help="@username or numeric chat_id of the channel"
+                         " that holds the manifest post (sendMessage /"
+                         " editMessageText target)")
+    ap.add_argument("--blobs-channel", default=None,
+                    help="@username of the channel blobs are uploaded"
+                         " into via sendDocument; defaults to --channel"
+                         " with any leading @ stripped. Must be a public"
+                         " username — clients resolve locations by it")
+    ap.add_argument("--manifest-post-id", type=int, default=None,
+                    help="reuse this message_id; if omitted, sends a new"
+                         " placeholder first and uses its id (prints so"
+                         " you can hardcode it in the client)")
+    ap.add_argument("--state-file", type=Path, default=None,
+                    help="path to persist sha/post_id/size per language"
+                         " for incremental re-uploads")
+    ap.add_argument("--languages", default="",
+                    help="comma-separated chromium stems to restrict to")
+    ap.add_argument("--dry-run", action="store_true",
+                    help="fetch and zip but do not upload, edit, or clean")
+    ap.add_argument("--cache-dir", type=Path,
+                    default=Path(".chromium_hunspell_cache"),
+                    help="directory for the shallow chromium clone")
+    ap.add_argument("--keep-cache", action="store_true",
+                    help="keep --cache-dir after completion (default:"
+                         " delete the chromium clone when done)")
+    ap.add_argument("--client-source", type=Path,
+                    default=_DEFAULT_CLIENT_SOURCE,
+                    help="path to spellchecker_common.cpp; after a"
+                         " successful manifest edit the script rewrites"
+                         " kDictionariesManifestChannel and"
+                         " kDictionariesManifestPostId in place")
+    ap.add_argument("--skip-client-patch", action="store_true",
+                    help="do not rewrite manifest constants in"
+                         " --client-source")
+    args = ap.parse_args()
+
+    if not args.dry_run and not args.bot_token:
+        sys.exit("error: --bot-token or TG_BOT_TOKEN env required")
+
+    blobs_target = args.blobs_channel or args.channel
+    blobs_username = str(blobs_target).lstrip("@").lstrip("+")
+    if not blobs_username or blobs_username.startswith("-"):
+        sys.exit("error: blobs channel must be @username (clients resolve"
+                 " locations by public username, not chat_id). Pass"
+                 " --blobs-channel @name when --channel is numeric.")
+
+    manifest_post_id = args.manifest_post_id
+    if manifest_post_id is None and not args.dry_run:
+        manifest_post_id = bot_send_placeholder(
+            args.bot_token, args.channel)
+        print(f"created manifest placeholder, message_id="
+              f"{manifest_post_id}", flush=True)
+        print(f"hardcode in client: kDictionariesManifestPostId = "
+              f"{manifest_post_id}", flush=True)
+
+    def location(post_id: int) -> str:
+        return f"{blobs_username}#{post_id}"
+
+    # Bot uploads go to --blobs-channel (the @username derived above),
+    # which may or may not equal --channel. Use the args.blobs-channel
+    # value if supplied, otherwise fall back to --channel as-is.
+    blobs_chat = args.blobs_channel or args.channel
+
+    filter_set = {s for s in args.languages.split(",") if s}
+    state = load_state(args.state_file)
+    manifest_entries = []
+
+    clone = ensure_chromium_clone(args.cache_dir)
+
+    for stem, lang_id, qt_name, display in LANGUAGES:
+        if filter_set and stem not in filter_set:
+            prev = state.get(stem)
+            if prev:
+                manifest_entries.append({
+                    "id": lang_id,
+                    "name": display,
+                    "location": location(prev["post_id"]),
+                    "size": prev["size"],
+                })
+            continue
+
+        print(f"[{stem} → {qt_name}]", flush=True)
+        try:
+            dic_raw = read_chromium_file(clone, stem, "dic")
+            aff_raw = read_chromium_file(clone, stem, "aff")
+        except FileNotFoundError as e:
+            print(f"  skip: {e}", flush=True)
+            continue
+        try:
+            dic, aff = normalize_to_utf8(dic_raw, aff_raw)
+        except RuntimeError as e:
+            print(f"  skip: {e}", flush=True)
+            continue
+        if dic is not dic_raw:
+            print(f"  recoded to UTF-8 from "
+                  f"{_parse_aff_charset(aff_raw)}", flush=True)
+        digest = sha256_pair(dic, aff)
+
+        prev = state.get(stem)
+        if (prev
+                and prev.get("sha256") == digest
+                and prev.get("qt_name") == qt_name
+                and not args.dry_run):
+            print(f"  unchanged (sha {digest[:8]}), carrying postId="
+                  f"{prev['post_id']}", flush=True)
+            manifest_entries.append({
+                "id": lang_id,
+                "name": display,
+                "location": location(prev["post_id"]),
+                "size": prev["size"],
+            })
+            continue
+
+        blob = make_zip(qt_name, dic, aff)
+        print(f"  zipped: dic={len(dic):,}  aff={len(aff):,}  "
+              f"zip={len(blob):,}", flush=True)
+
+        if args.dry_run:
+            manifest_entries.append({
+                "id": lang_id,
+                "name": display,
+                "location": location(prev["post_id"] if prev else 0),
+                "size": len(blob),
+            })
+            continue
+
+        post_id, size = bot_send_document(
+            args.bot_token, blobs_chat, qt_name, blob)
+        print(f"  uploaded: postId={post_id} size={size}", flush=True)
+
+        state[stem] = {
+            "sha256": digest,
+            "post_id": post_id,
+            "size": size,
+            "qt_name": qt_name,
+        }
+        manifest_entries.append({
+            "id": lang_id,
+            "name": display,
+            "location": location(post_id),
+            "size": size,
+        })
+
+    manifest_text = format_manifest(manifest_entries)
+    print(f"\nmanifest: {len(manifest_entries)} entries, "
+          f"{len(manifest_text):,} chars", flush=True)
+
+    if args.dry_run:
+        print("--- manifest (dry-run) ---")
+        print(manifest_text)
+        return
+
+    bot_edit_message_text(
+        args.bot_token, args.channel,
+        manifest_post_id, manifest_text)
+    print(f"manifest post {manifest_post_id} updated", flush=True)
+
+    if not args.skip_client_patch:
+        channel_username = _client_channel_username(args.channel)
+        if channel_username is None:
+            print(f"  --channel {args.channel!r} is not a @username;"
+                  f" updating only kDictionariesManifestPostId in"
+                  f" {args.client_source}", flush=True)
+        patch_client_source(
+            args.client_source, channel_username, manifest_post_id)
+
+    save_state(args.state_file, state)
+
+    if not args.keep_cache and args.cache_dir.exists():
+        print(f"removing {args.cache_dir}", flush=True)
+        shutil.rmtree(args.cache_dir)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/Telegram/build/updates.py b/Telegram/build/updates.py
index f6f701eda70f71..2fef05505efba6 100644
--- a/Telegram/build/updates.py
+++ b/Telegram/build/updates.py
@@ -89,8 +89,6 @@ def finish(code, error = ''):
             finish(1, 'Updater not found.')
         elif not os.path.exists('Telegram.app/Contents/Helpers/crashpad_handler'):
             finish(1, 'crashpad_handler not found.')
-        elif not os.path.exists('Telegram.app/Contents/Resources/Icon.icns'):
-            finish(1, 'Icon not found.')
         elif not os.path.exists('Telegram.app/Contents/_CodeSignature'):
             finish(1, 'Signature not found.')
 
diff --git a/Telegram/build/version b/Telegram/build/version
index 877b2bf3dccf34..a71fe49ecd363a 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5006003
-AppVersionStrMajor 5.6
-AppVersionStrSmall 5.6.3
-AppVersionStr      5.6.3
+AppVersion         6009003
+AppVersionStrMajor 6.9
+AppVersionStrSmall 6.9.3
+AppVersionStr      6.9.3
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.6.3
+AppVersionOriginal 6.9.3
diff --git a/Telegram/cmake/binobj2obj.py b/Telegram/cmake/binobj2obj.py
new file mode 100644
index 00000000000000..3683a6dd3a7270
--- /dev/null
+++ b/Telegram/cmake/binobj2obj.py
@@ -0,0 +1,86 @@
+'''
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+'''
+
+# Decodes a compact .binobj mesh (the format used by Telegram for Android, see
+# obj2binobj.py for the layout) back into a human-readable Wavefront .obj.
+#
+# This is a developer tool, not part of the build: it is handy when porting a
+# new 3D model from the Telegram for Android assets. Convert the .binobj to a
+# text .obj, commit the .obj, and let generate_models.cmake bake it back at
+# build time. The round-trip is byte-identical (obj2binobj.py <-> binobj2obj.py).
+#
+# Usage: binobj2obj.py <input.binobj> <output.obj>
+#
+# UVs are written raw (the runtime loader flips V); float values use %.9g, the
+# shortest decimal that round-trips a 32-bit float exactly.
+
+import struct
+import sys
+
+
+def main():
+    if len(sys.argv) != 3:
+        sys.stderr.write('Usage: binobj2obj.py <input.binobj> <output.obj>\n')
+        return 1
+
+    data = open(sys.argv[1], 'rb').read()
+    offset = 0
+
+    def read_int():
+        nonlocal offset
+        value = struct.unpack_from('>i', data, offset)[0]
+        offset += 4
+        return value
+
+    def read_floats(count):
+        nonlocal offset
+        values = struct.unpack_from('>%df' % count, data, offset)
+        offset += 4 * count
+        return values
+
+    positions = read_floats(read_int())
+    uvs = read_floats(read_int())
+    normals = read_floats(read_int())
+    corner_count = read_int()
+    corners = [struct.unpack_from('>3i', data, offset + 12 * i)
+        for i in range(corner_count)]
+    offset += 12 * corner_count
+    if offset != len(data):
+        sys.stderr.write('binobj2obj.py: trailing bytes, format mismatch\n')
+        return 1
+
+    g = lambda x: '%.9g' % x
+    with open(sys.argv[2], 'w') as out:
+        out.write('# 3D mesh decoded from .binobj (source of truth; baked back'
+            ' to .binobj at build time).\n')
+        out.write('# UVs are stored raw here; the V coordinate is flipped (1-v)'
+            ' at load time.\n')
+        for i in range(len(positions) // 3):
+            out.write('v %s %s %s\n' % (
+                g(positions[3 * i]),
+                g(positions[3 * i + 1]),
+                g(positions[3 * i + 2])))
+        for i in range(len(uvs) // 2):
+            out.write('vt %s %s\n' % (g(uvs[2 * i]), g(uvs[2 * i + 1])))
+        for i in range(len(normals) // 3):
+            out.write('vn %s %s %s\n' % (
+                g(normals[3 * i]),
+                g(normals[3 * i + 1]),
+                g(normals[3 * i + 2])))
+        for t in range(corner_count // 3):
+            a, b, c = corners[3 * t], corners[3 * t + 1], corners[3 * t + 2]
+            out.write('f %d/%d/%d %d/%d/%d %d/%d/%d\n' % (
+                a[0] + 1, a[1] + 1, a[2] + 1,
+                b[0] + 1, b[1] + 1, b[2] + 1,
+                c[0] + 1, c[1] + 1, c[2] + 1))
+
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/Telegram/cmake/generate_appdata_changelog.cmake b/Telegram/cmake/generate_appstream_changelog.cmake
similarity index 54%
rename from Telegram/cmake/generate_appdata_changelog.cmake
rename to Telegram/cmake/generate_appstream_changelog.cmake
index 2d1ac0bbcd62b9..fe0694e647c014 100644
--- a/Telegram/cmake/generate_appdata_changelog.cmake
+++ b/Telegram/cmake/generate_appstream_changelog.cmake
@@ -4,31 +4,31 @@
 # For license and copyright information please follow this link:
 # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
-function(generate_appdata_changelog target_name changelog_path appdata_path)
+function(generate_appstream_changelog target_name changelog_path metadata_path)
     find_package(Python3 REQUIRED)
 
     set(gen_dst ${CMAKE_CURRENT_BINARY_DIR}/gen)
     file(MAKE_DIRECTORY ${gen_dst})
 
-    set(gen_timestamp ${gen_dst}/${target_name}_appdata_changelog.timestamp)
-    set(gen_files ${appdata_path})
+    set(gen_timestamp ${gen_dst}/${target_name}_appstream_changelog.timestamp)
+    set(gen_files ${metadata_path})
 
     add_custom_command(
     OUTPUT
         ${gen_timestamp}
     COMMAND
         ${Python3_EXECUTABLE}
-        ${submodules_loc}/build/changelog2appdata.py
+        ${submodules_loc}/build/changelog2appstream.py
         -c "${changelog_path}"
-        -a "${appdata_path}"
+        -m "${metadata_path}"
         -n 10
     COMMAND
         echo 1> ${gen_timestamp}
-    COMMENT "Generating AppData changelog (${target_name})"
+    COMMENT "Generating AppStream changelog (${target_name})"
     DEPENDS
-        ${submodules_loc}/build/changelog2appdata.py
+        ${submodules_loc}/build/changelog2appstream.py
         ${changelog_path}
-        ${appdata_path}
+        ${metadata_path}
     )
-    generate_target(${target_name} appdata_changelog ${gen_timestamp} "${gen_files}" ${gen_dst})
+    generate_target(${target_name} appstream_changelog ${gen_timestamp} "${gen_files}" ${gen_dst})
 endfunction()
diff --git a/Telegram/cmake/generate_models.cmake b/Telegram/cmake/generate_models.cmake
new file mode 100644
index 00000000000000..3ca55eb8cd875a
--- /dev/null
+++ b/Telegram/cmake/generate_models.cmake
@@ -0,0 +1,65 @@
+# This file is part of Telegram Desktop,
+# the official desktop application for the Telegram messaging service.
+#
+# For license and copyright information please follow this link:
+# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+
+# Bake 3D meshes (.obj -> .binobj) at build time, so the repository stores the
+# human-readable source meshes instead of binary blobs. Every *.obj found under
+# Resources/art is baked and exposed under the same :/gui/<relative>.binobj path,
+# so new models just need to be dropped in next to the existing ones.
+#
+# Usage: include(cmake/generate_models.cmake)
+# Requires: target "Telegram" and function "nice_target_sources" to exist.
+
+set(_models_art_dir "${CMAKE_CURRENT_SOURCE_DIR}/Resources/art")
+file(GLOB_RECURSE _model_sources "${_models_art_dir}/*.obj")
+
+if (_model_sources STREQUAL "")
+    return()
+endif()
+
+find_package(Python3 REQUIRED)
+
+set(_models_script "${CMAKE_CURRENT_SOURCE_DIR}/cmake/obj2binobj.py")
+set(_models_out_dir "${CMAKE_CURRENT_BINARY_DIR}/models")
+set(_model_outputs)
+set(_qrc_entries)
+foreach(_src ${_model_sources})
+    file(RELATIVE_PATH _rel "${_models_art_dir}" "${_src}")
+    string(REGEX REPLACE "\\.obj$" ".binobj" _rel_bin "${_rel}")
+    set(_out "${_models_out_dir}/${_rel_bin}")
+    get_filename_component(_out_subdir "${_out}" DIRECTORY)
+    file(MAKE_DIRECTORY ${_out_subdir})
+
+    add_custom_command(
+        OUTPUT ${_out}
+        COMMAND ${Python3_EXECUTABLE} ${_models_script} ${_src} ${_out}
+        DEPENDS ${_models_script} ${_src}
+        COMMENT "Baking model: ${_rel} -> ${_rel_bin}"
+        VERBATIM)
+    list(APPEND _model_outputs ${_out})
+    list(APPEND _qrc_entries "        <file alias=\"art/${_rel_bin}\">${_rel_bin}</file>")
+endforeach()
+
+# Write models.qrc at configure time (so AUTORCC can scan its inputs), only
+# touching it when content changes — matching cmake/qrhi_shaders.cmake.
+list(SORT _qrc_entries)
+list(JOIN _qrc_entries "\n" _qrc_body)
+set(_qrc_path "${_models_out_dir}/models.qrc")
+set(_qrc_new "<RCC>\n    <qresource prefix=\"/gui\">\n${_qrc_body}\n    </qresource>\n</RCC>\n")
+set(_qrc_old "")
+if (EXISTS "${_qrc_path}")
+    file(READ "${_qrc_path}" _qrc_old)
+endif()
+if (NOT "${_qrc_new}" STREQUAL "${_qrc_old}")
+    file(WRITE "${_qrc_path}" "${_qrc_new}")
+endif()
+
+add_custom_target(bake_models DEPENDS ${_model_outputs})
+nice_target_sources(Telegram ${_models_out_dir}
+PRIVATE
+    models.qrc
+)
+add_dependencies(Telegram bake_models)
+message(STATUS "Models: will bake ${_models_art_dir}/**/*.obj -> .binobj")
diff --git a/Telegram/cmake/lib_ffmpeg.cmake b/Telegram/cmake/lib_ffmpeg.cmake
index 7416fa873924e3..0da37cb09676cb 100644
--- a/Telegram/cmake/lib_ffmpeg.cmake
+++ b/Telegram/cmake/lib_ffmpeg.cmake
@@ -12,6 +12,7 @@ nice_target_sources(lib_ffmpeg ${src_loc}
 PRIVATE
     ffmpeg/ffmpeg_frame_generator.cpp
     ffmpeg/ffmpeg_frame_generator.h
+    ffmpeg/ffmpeg_bytes_io_wrap.h
     ffmpeg/ffmpeg_utility.cpp
     ffmpeg/ffmpeg_utility.h
 )
diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake
index 44539b54b3845a..4ffa3b5b131ea4 100644
--- a/Telegram/cmake/lib_tgcalls.cmake
+++ b/Telegram/cmake/lib_tgcalls.cmake
@@ -76,6 +76,8 @@ PRIVATE
     v2/InstanceV2Impl.h
     v2/NativeNetworkingImpl.cpp
     v2/NativeNetworkingImpl.h
+    v2/RawTcpSocket.cpp
+    v2/RawTcpSocket.h
     v2/ReflectorPort.cpp
     v2/ReflectorPort.h
     v2/ReflectorRelayPortFactory.cpp
@@ -144,10 +146,6 @@ PRIVATE
     platform/darwin/DesktopSharingCapturer.mm
     platform/darwin/ExtractCVPixelBuffer.h
     platform/darwin/ExtractCVPixelBuffer.mm
-    platform/darwin/GLVideoView.h
-    platform/darwin/GLVideoView.mm
-    platform/darwin/GLVideoViewMac.h
-    platform/darwin/GLVideoViewMac.mm
     platform/darwin/h265_nalu_rewriter.cc
     platform/darwin/h265_nalu_rewriter.h
     platform/darwin/objc_video_encoder_factory.h
@@ -225,17 +223,12 @@ PRIVATE
     RTC_ENABLE_VP9
 )
 
-if (WIN32)
-elseif (APPLE)
+if (APPLE)
     target_compile_options(lib_tgcalls
     PRIVATE
         -fobjc-arc
     )
     remove_target_sources(lib_tgcalls ${tgcalls_loc}
-        platform/darwin/GLVideoView.h
-        platform/darwin/GLVideoView.mm
-        platform/darwin/GLVideoViewMac.h
-        platform/darwin/GLVideoViewMac.mm
         platform/darwin/VideoCameraCapturer.h
         platform/darwin/VideoCameraCapturer.mm
         platform/darwin/VideoMetalView.h
@@ -253,14 +246,16 @@ elseif (APPLE)
     )
 endif()
 
-target_compile_options_if_exists(lib_tgcalls
-PRIVATE
-    -Wno-deprecated-volatile
-    -Wno-ambiguous-reversed-operator
-    -Wno-deprecated-declarations
-    -Wno-unqualified-std-cast-call
-    -Wno-unused-function
-)
+if (NOT MSVC)
+    target_compile_options_if_exists(lib_tgcalls
+    PRIVATE
+        -Wno-deprecated-volatile
+        -Wno-ambiguous-reversed-operator
+        -Wno-deprecated-declarations
+        -Wno-unqualified-std-cast-call
+        -Wno-unused-function
+    )
+endif()
 
 remove_target_sources(lib_tgcalls ${tgcalls_loc}
     platform/android/AndroidContext.cpp
@@ -281,26 +276,3 @@ PUBLIC
 PRIVATE
     ${tgcalls_loc}
 )
-
-add_library(lib_tgcalls_legacy STATIC)
-init_target(lib_tgcalls_legacy)
-
-add_library(tdesktop::lib_tgcalls_legacy ALIAS lib_tgcalls_legacy)
-
-nice_target_sources(lib_tgcalls_legacy ${tgcalls_loc}
-PRIVATE
-    legacy/InstanceImplLegacy.cpp
-    legacy/InstanceImplLegacy.h
-)
-
-target_include_directories(lib_tgcalls_legacy
-PRIVATE
-    ${tgcalls_loc}
-)
-
-target_link_libraries(lib_tgcalls_legacy
-PRIVATE
-    tdesktop::lib_tgcalls
-    tdesktop::lib_tgvoip
-    desktop-app::external_openssl
-)
diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake
deleted file mode 100644
index fbae7096608487..00000000000000
--- a/Telegram/cmake/lib_tgvoip.cmake
+++ /dev/null
@@ -1,220 +0,0 @@
-# This file is part of Telegram Desktop,
-# the official desktop application for the Telegram messaging service.
-#
-# For license and copyright information please follow this link:
-# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-
-add_library(lib_tgvoip INTERFACE IMPORTED GLOBAL)
-add_library(tdesktop::lib_tgvoip ALIAS lib_tgvoip)
-
-if (DESKTOP_APP_USE_PACKAGED)
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(TGVOIP IMPORTED_TARGET tgvoip)
-
-    if (TGVOIP_FOUND)
-        target_link_libraries(lib_tgvoip INTERFACE PkgConfig::TGVOIP)
-        return()
-    endif()
-endif()
-
-include(CMakeDependentOption)
-
-add_library(lib_tgvoip_bundled STATIC)
-init_target(lib_tgvoip_bundled)
-
-cmake_dependent_option(LIBTGVOIP_DISABLE_ALSA "Disable libtgvoip's ALSA backend." OFF LINUX ON)
-cmake_dependent_option(LIBTGVOIP_DISABLE_PULSEAUDIO "Disable libtgvoip's PulseAudio backend." OFF LINUX ON)
-
-set(tgvoip_loc ${third_party_loc}/libtgvoip)
-
-nice_target_sources(lib_tgvoip_bundled ${tgvoip_loc}
-PRIVATE
-    BlockingQueue.cpp
-    BlockingQueue.h
-    Buffers.cpp
-    Buffers.h
-    CongestionControl.cpp
-    CongestionControl.h
-    EchoCanceller.cpp
-    EchoCanceller.h
-    JitterBuffer.cpp
-    JitterBuffer.h
-    logging.cpp
-    logging.h
-    MediaStreamItf.cpp
-    MediaStreamItf.h
-    OpusDecoder.cpp
-    OpusDecoder.h
-    OpusEncoder.cpp
-    OpusEncoder.h
-    threading.h
-    VoIPController.cpp
-    VoIPGroupController.cpp
-    VoIPController.h
-    PrivateDefines.h
-    VoIPServerConfig.cpp
-    VoIPServerConfig.h
-    audio/AudioInput.cpp
-    audio/AudioInput.h
-    audio/AudioOutput.cpp
-    audio/AudioOutput.h
-    audio/Resampler.cpp
-    audio/Resampler.h
-    NetworkSocket.cpp
-    NetworkSocket.h
-    PacketReassembler.cpp
-    PacketReassembler.h
-    MessageThread.cpp
-    MessageThread.h
-    audio/AudioIO.cpp
-    audio/AudioIO.h
-    video/ScreamCongestionController.cpp
-    video/ScreamCongestionController.h
-    video/VideoSource.cpp
-    video/VideoSource.h
-    video/VideoRenderer.cpp
-    video/VideoRenderer.h
-    json11.cpp
-    json11.hpp
-
-    # Windows
-    os/windows/NetworkSocketWinsock.cpp
-    os/windows/NetworkSocketWinsock.h
-    os/windows/AudioInputWave.cpp
-    os/windows/AudioInputWave.h
-    os/windows/AudioOutputWave.cpp
-    os/windows/AudioOutputWave.h
-    os/windows/AudioOutputWASAPI.cpp
-    os/windows/AudioOutputWASAPI.h
-    os/windows/AudioInputWASAPI.cpp
-    os/windows/AudioInputWASAPI.h
-    os/windows/MinGWSupport.h
-    os/windows/WindowsSpecific.cpp
-    os/windows/WindowsSpecific.h
-
-    # macOS
-    os/darwin/AudioInputAudioUnit.cpp
-    os/darwin/AudioInputAudioUnit.h
-    os/darwin/AudioOutputAudioUnit.cpp
-    os/darwin/AudioOutputAudioUnit.h
-    os/darwin/AudioInputAudioUnitOSX.cpp
-    os/darwin/AudioInputAudioUnitOSX.h
-    os/darwin/AudioOutputAudioUnitOSX.cpp
-    os/darwin/AudioOutputAudioUnitOSX.h
-    os/darwin/AudioUnitIO.cpp
-    os/darwin/AudioUnitIO.h
-    os/darwin/DarwinSpecific.mm
-    os/darwin/DarwinSpecific.h
-
-    # Linux
-    os/linux/AudioInputALSA.cpp
-    os/linux/AudioInputALSA.h
-    os/linux/AudioOutputALSA.cpp
-    os/linux/AudioOutputALSA.h
-    os/linux/AudioOutputPulse.cpp
-    os/linux/AudioOutputPulse.h
-    os/linux/AudioInputPulse.cpp
-    os/linux/AudioInputPulse.h
-    os/linux/AudioPulse.cpp
-    os/linux/AudioPulse.h
-
-    # POSIX
-    os/posix/NetworkSocketPosix.cpp
-    os/posix/NetworkSocketPosix.h
-)
-
-target_compile_definitions(lib_tgvoip_bundled
-PRIVATE
-    TGVOIP_USE_DESKTOP_DSP
-)
-
-target_compile_options_if_exists(lib_tgvoip_bundled
-PRIVATE
-    -Wno-unqualified-std-cast-call
-)
-
-if (WIN32)
-    target_compile_options_if_exists(lib_tgvoip_bundled
-    PRIVATE
-        /wd4005 # 'identifier' : macro redefinition
-        /wd4068 # unknown pragma
-        /wd4996 # deprecated
-        /wd5055 # operator '>' deprecated between enumerations and floating-point types
-    )
-elseif (APPLE)
-    target_compile_definitions(lib_tgvoip_bundled
-    PUBLIC
-        TARGET_OS_OSX
-        TARGET_OSX
-    )
-    if (build_macstore)
-        target_compile_definitions(lib_tgvoip_bundled
-        PUBLIC
-            TGVOIP_NO_OSX_PRIVATE_API
-        )
-    endif()
-else()
-    add_library(lib_tgvoip_bundled_options INTERFACE)
-    target_compile_options(lib_tgvoip_bundled_options
-    INTERFACE
-        -Wno-unused-variable
-        -Wno-unknown-pragmas
-        -Wno-error=sequence-point
-        -Wno-error=unused-result
-    )
-    if (CMAKE_SIZEOF_VOID_P EQUAL 4 AND CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*")
-        target_compile_options(lib_tgvoip_bundled_options INTERFACE -msse2)
-    endif()
-    target_link_libraries(lib_tgvoip_bundled
-    PRIVATE
-        lib_tgvoip_bundled_options
-    )
-endif()
-
-target_include_directories(lib_tgvoip_bundled
-PUBLIC
-    ${tgvoip_loc}
-)
-target_link_libraries(lib_tgvoip_bundled
-PRIVATE
-    desktop-app::external_webrtc
-    desktop-app::external_opus
-)
-
-if (LINUX)
-    if (NOT LIBTGVOIP_DISABLE_ALSA)
-        find_package(ALSA REQUIRED)
-        target_include_directories(lib_tgvoip_bundled SYSTEM PRIVATE ${ALSA_INCLUDE_DIRS})
-    else()
-        remove_target_sources(lib_tgvoip_bundled ${tgvoip_loc}
-            os/linux/AudioInputALSA.cpp
-            os/linux/AudioInputALSA.h
-            os/linux/AudioOutputALSA.cpp
-            os/linux/AudioOutputALSA.h
-        )
-
-        target_compile_definitions(lib_tgvoip_bundled PRIVATE WITHOUT_ALSA)
-    endif()
-
-    if (NOT LIBTGVOIP_DISABLE_PULSEAUDIO)
-        find_package(PkgConfig REQUIRED)
-        pkg_check_modules(PULSE REQUIRED libpulse)
-        target_include_directories(lib_tgvoip_bundled SYSTEM PRIVATE ${PULSE_INCLUDE_DIRS})
-    else()
-        remove_target_sources(lib_tgvoip_bundled ${tgvoip_loc}
-            os/linux/AudioOutputPulse.cpp
-            os/linux/AudioOutputPulse.h
-            os/linux/AudioInputPulse.cpp
-            os/linux/AudioInputPulse.h
-            os/linux/AudioPulse.cpp
-            os/linux/AudioPulse.h
-        )
-
-        target_compile_definitions(lib_tgvoip_bundled PRIVATE WITHOUT_PULSE)
-    endif()
-endif()
-
-target_link_libraries(lib_tgvoip
-INTERFACE
-    lib_tgvoip_bundled
-)
diff --git a/Telegram/cmake/obj2binobj.py b/Telegram/cmake/obj2binobj.py
new file mode 100644
index 00000000000000..c6c676c2f209cd
--- /dev/null
+++ b/Telegram/cmake/obj2binobj.py
@@ -0,0 +1,75 @@
+'''
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+'''
+
+# Converts a Wavefront .obj mesh into the compact .binobj format read at
+# runtime by Ui::Premium::LoadStarModel (ui/effects/premium_star_model.cpp).
+#
+# Usage: obj2binobj.py <input.obj> <output.binobj>
+#
+# Format (big-endian, 32-bit ints and floats):
+#   int32 positionFloatCount; float32[positionFloatCount]   # xyz triples
+#   int32 uvFloatCount;       float32[uvFloatCount]          # uv pairs
+#   int32 normalFloatCount;   float32[normalFloatCount]      # xyz triples
+#   int32 cornerCount;        { int32 posIdx, uvIdx, normIdx } x cornerCount
+# Indices are 0-based. UVs are stored raw; the loader flips V (1 - v).
+
+import struct
+import sys
+
+
+def main():
+    if len(sys.argv) != 3:
+        sys.stderr.write('Usage: obj2binobj.py <input.obj> <output.binobj>\n')
+        return 1
+
+    positions = []
+    uvs = []
+    normals = []
+    corners = []
+
+    with open(sys.argv[1], 'r') as source:
+        for line in source:
+            parts = line.split()
+            if not parts or parts[0].startswith('#'):
+                continue
+            tag = parts[0]
+            if tag == 'v':
+                positions += [float(parts[1]), float(parts[2]), float(parts[3])]
+            elif tag == 'vt':
+                uvs += [float(parts[1]), float(parts[2])]
+            elif tag == 'vn':
+                normals += [float(parts[1]), float(parts[2]), float(parts[3])]
+            elif tag == 'f':
+                face = []
+                for vertex in parts[1:]:
+                    fields = (vertex.split('/') + ['', ''])[:3]
+                    face.append([
+                        (int(fields[0]) - 1) if fields[0] else -1,
+                        (int(fields[1]) - 1) if fields[1] else -1,
+                        (int(fields[2]) - 1) if fields[2] else -1,
+                    ])
+                # Triangulate as a fan (a no-op for already-triangular faces).
+                for i in range(1, len(face) - 1):
+                    corners += [face[0], face[i], face[i + 1]]
+
+    with open(sys.argv[2], 'wb') as out:
+        out.write(struct.pack('>i', len(positions)))
+        out.write(struct.pack('>%df' % len(positions), *positions))
+        out.write(struct.pack('>i', len(uvs)))
+        out.write(struct.pack('>%df' % len(uvs), *uvs))
+        out.write(struct.pack('>i', len(normals)))
+        out.write(struct.pack('>%df' % len(normals), *normals))
+        out.write(struct.pack('>i', len(corners)))
+        for corner in corners:
+            out.write(struct.pack('>3i', corner[0], corner[1], corner[2]))
+
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/Telegram/cmake/qrhi_shaders.cmake b/Telegram/cmake/qrhi_shaders.cmake
new file mode 100644
index 00000000000000..1792f89f7a52a8
--- /dev/null
+++ b/Telegram/cmake/qrhi_shaders.cmake
@@ -0,0 +1,90 @@
+# Compile QRhi shaders (.vert/.frag/.comp -> .qsb) at build time.
+#
+# Usage: include(cmake/qrhi_shaders.cmake)
+# Requires: target "Telegram" and function "nice_target_sources" to exist.
+
+if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/shaders")
+    return()
+endif()
+
+if (QT_VERSION_MAJOR LESS 6)
+    return()
+endif()
+
+find_program(QSB_EXECUTABLE qsb
+    HINTS
+        "${QT_DIR}/../../../libexec"
+        "${QT_DIR}/../../../bin"
+        "${QT_DIR}/../../qt6/libexec"
+        "${QT_DIR}/../../qt6/bin"
+        "${QT_DIR}/../../../opt/qtshadertools/bin"
+    PATHS ENV PATH)
+
+if (NOT QSB_EXECUTABLE)
+    message(FATAL_ERROR
+        "QSB (Qt Shader Baker) was not found, but ${CMAKE_CURRENT_SOURCE_DIR}/shaders "
+        "is present and must be compiled. Install Qt's shader tools or extend "
+        "QSB_EXECUTABLE hints in cmake/qrhi_shaders.cmake.")
+endif()
+
+set(_shader_dir "${CMAKE_CURRENT_SOURCE_DIR}/shaders")
+set(_qsb_out_dir "${CMAKE_CURRENT_BINARY_DIR}/shaders")
+file(MAKE_DIRECTORY ${_qsb_out_dir})
+file(GLOB _shader_sources
+    "${_shader_dir}/*.vert"
+    "${_shader_dir}/*.frag"
+    "${_shader_dir}/*.comp")
+set(_qsb_outputs)
+set(_qrc_entries)
+foreach(_src ${_shader_sources})
+    get_filename_component(_name ${_src} NAME)
+    get_filename_component(_ext ${_src} LAST_EXT)
+    set(_qsb "${_qsb_out_dir}/${_name}.qsb")
+
+    if("${_ext}" STREQUAL ".comp")
+        set(_glsl_ver "310es,430")
+    else()
+        file(READ ${_src} _src_contents)
+        string(FIND "${_src_contents}" "texelFetch" _has_texelfetch)
+        if(NOT _has_texelfetch EQUAL -1)
+            set(_glsl_ver "300es,150")
+        else()
+            set(_glsl_ver "100es,120,150")
+        endif()
+    endif()
+
+    add_custom_command(
+        OUTPUT ${_qsb}
+        COMMAND ${QSB_EXECUTABLE}
+            --glsl "${_glsl_ver}"
+            --hlsl 50
+            --msl 12
+            -o ${_qsb}
+            ${_src}
+        DEPENDS ${_src}
+        COMMENT "QSB: ${_name}"
+        VERBATIM)
+    list(APPEND _qsb_outputs ${_qsb})
+    list(APPEND _qrc_entries "        <file>${_name}.qsb</file>")
+endforeach()
+list(SORT _qrc_entries)
+list(JOIN _qrc_entries "\n" _qrc_body)
+# Write shaders.qrc at configure time (so AUTORCC can scan its INPUTS) but
+# only touch the file when content actually changes — otherwise AUTORCC sees
+# a fresh mtime on every cmake re-generate and re-runs rcc unnecessarily.
+set(_qrc_path "${_qsb_out_dir}/shaders.qrc")
+set(_qrc_new "<RCC>\n    <qresource prefix=\"/shaders\">\n${_qrc_body}\n    </qresource>\n</RCC>\n")
+set(_qrc_old "")
+if (EXISTS "${_qrc_path}")
+    file(READ "${_qrc_path}" _qrc_old)
+endif()
+if (NOT "${_qrc_new}" STREQUAL "${_qrc_old}")
+    file(WRITE "${_qrc_path}" "${_qrc_new}")
+endif()
+add_custom_target(compile_shaders DEPENDS ${_qsb_outputs})
+nice_target_sources(Telegram ${_qsb_out_dir}
+PRIVATE
+    shaders.qrc
+)
+add_dependencies(Telegram compile_shaders)
+message(STATUS "QSB: found ${QSB_EXECUTABLE}, will compile ${_shader_dir}/*.vert/*.frag/*.comp")
diff --git a/Telegram/cmake/td_iv.cmake b/Telegram/cmake/td_iv.cmake
index 1d4edf9f5fb8bb..ab26dbf5337fc2 100644
--- a/Telegram/cmake/td_iv.cmake
+++ b/Telegram/cmake/td_iv.cmake
@@ -11,20 +11,100 @@ add_library(tdesktop::td_iv ALIAS td_iv)
 target_precompile_headers(td_iv PRIVATE ${src_loc}/iv/iv_pch.h)
 nice_target_sources(td_iv ${src_loc}
 PRIVATE
+#    iv/editor/iv_editor_box.cpp
+#    iv/editor/iv_editor_box.h
+#    iv/editor/iv_editor_clipboard.cpp
+#    iv/editor/iv_editor_clipboard.h
+#    iv/editor/iv_editor_state.cpp
+#    iv/editor/iv_editor_state.h
+#    iv/editor/iv_editor_text_entities.cpp
+#    iv/editor/iv_editor_text_entities.h
+#    iv/editor/iv_editor_widget.cpp
+#    iv/editor/iv_editor_widget.h
+#    iv/editor/iv_editor_window.cpp
+#    iv/editor/iv_editor_window.h
+
     iv/iv_controller.cpp
     iv/iv_controller.h
     iv/iv_data.cpp
     iv/iv_data.h
     iv/iv_delegate.h
     iv/iv_pch.h
-    iv/iv_prepare.cpp
-    iv/iv_prepare.h
+    iv/iv_zoom_controls.cpp
+    iv/iv_zoom_controls.h
+)
+
+nice_target_sources(td_iv ${src_loc}
+PRIVATE
+    iv/markdown/iv_markdown_common.cpp
+    iv/markdown/iv_markdown_common.h
+    iv/markdown/iv_markdown_article.cpp
+    iv/markdown/iv_markdown_article.h
+    iv/markdown/iv_markdown_article_layout_blocks.cpp
+    iv/markdown/iv_markdown_article_layout_blocks.h
+    iv/markdown/iv_markdown_article_layout_structure.cpp
+    iv/markdown/iv_markdown_article_layout_structure.h
+    iv/markdown/iv_markdown_article_paint.cpp
+    iv/markdown/iv_markdown_article_paint.h
+    iv/markdown/iv_markdown_article_selection.cpp
+    iv/markdown/iv_markdown_article_selection.h
+    iv/markdown/iv_markdown_article_text.cpp
+    iv/markdown/iv_markdown_article_text.h
+    iv/markdown/iv_markdown_controller.cpp
+    iv/markdown/iv_markdown_controller.h
+    iv/markdown/iv_markdown_document.cpp
+    iv/markdown/iv_markdown_document.h
+    iv/markdown/iv_markdown_embed_overlay.cpp
+    iv/markdown/iv_markdown_embed_overlay.h
+    iv/markdown/iv_markdown_history_view_media.cpp
+    iv/markdown/iv_markdown_history_view_media.h
+    iv/markdown/iv_markdown_math.cpp
+    iv/markdown/iv_markdown_math.h
+    iv/markdown/iv_markdown_math_renderer.cpp
+    iv/markdown/iv_markdown_math_renderer.h
+    iv/markdown/iv_markdown_microtex.cpp
+    iv/markdown/iv_markdown_microtex.h
+    iv/markdown/iv_markdown_parse.cpp
+    iv/markdown/iv_markdown_parse.h
+    iv/markdown/iv_markdown_parse_convert.cpp
+    iv/markdown/iv_markdown_parse_convert.h
+    iv/markdown/iv_markdown_parse_finalize.cpp
+    iv/markdown/iv_markdown_parse_finalize.h
+    iv/markdown/iv_markdown_parse_validate.cpp
+    iv/markdown/iv_markdown_parse_validate.h
+    iv/markdown/iv_markdown_media_block.cpp
+    iv/markdown/iv_markdown_media_block.h
+    iv/markdown/iv_markdown_media_reuse.cpp
+    iv/markdown/iv_markdown_media_reuse.h
+    iv/markdown/iv_markdown_prepare.cpp
+    iv/markdown/iv_markdown_prepare.h
+    iv/markdown/iv_markdown_prepare_blocks.cpp
+    iv/markdown/iv_markdown_prepare_blocks.h
+    iv/markdown/iv_markdown_prepare_formulas.cpp
+    iv/markdown/iv_markdown_prepare_formulas.h
+    iv/markdown/iv_markdown_prepare_inline.cpp
+    iv/markdown/iv_markdown_prepare_inline.h
+    iv/markdown/iv_markdown_prepare_links.cpp
+    iv/markdown/iv_markdown_prepare_links.h
+    iv/markdown/iv_markdown_prepare_native_blocks.cpp
+    iv/markdown/iv_markdown_prepare_native_blocks.h
+    iv/markdown/iv_markdown_prepare_native_richtext.cpp
+    iv/markdown/iv_markdown_prepare_native_richtext.h
+    iv/markdown/iv_markdown_prepare_serialize.cpp
+    iv/markdown/iv_markdown_prepare_serialize.h
+    iv/markdown/iv_markdown_prepare_state.cpp
+    iv/markdown/iv_markdown_prepare_state.h
+    iv/markdown/iv_markdown_view.cpp
+    iv/markdown/iv_markdown_view.h
+    iv/markdown/iv_markdown_view_widget.cpp
+    iv/markdown/iv_markdown_view_widget.h
 )
 
-nice_target_sources(td_iv ${res_loc}
+target_link_libraries(td_iv
 PRIVATE
-    iv_html/page.css
-    iv_html/page.js
+    desktop-app::external_cmark_gfm
+    desktop-app::external_microtex
+    desktop-app::lib_spellcheck
 )
 
 target_include_directories(td_iv
@@ -38,6 +118,7 @@ PUBLIC
     tdesktop::td_scheme
 PRIVATE
     desktop-app::lib_webview
+    desktop-app::lib_storage
     desktop-app::external_ada
     tdesktop::td_lang
     tdesktop::td_ui
diff --git a/Telegram/cmake/td_tde2e.cmake b/Telegram/cmake/td_tde2e.cmake
new file mode 100644
index 00000000000000..fe6dfe2d12a98c
--- /dev/null
+++ b/Telegram/cmake/td_tde2e.cmake
@@ -0,0 +1,30 @@
+# This file is part of Telegram Desktop,
+# the official desktop application for the Telegram messaging service.
+#
+# For license and copyright information please follow this link:
+# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+
+add_library(td_tde2e OBJECT)
+init_non_host_target(td_tde2e)
+add_library(tdesktop::td_tde2e ALIAS td_tde2e)
+
+nice_target_sources(td_tde2e ${src_loc}
+PRIVATE
+    tde2e/tde2e_api.cpp
+    tde2e/tde2e_api.h
+)
+
+target_include_directories(td_tde2e
+PUBLIC
+    ${src_loc}
+)
+
+target_link_libraries(td_tde2e
+PUBLIC
+    desktop-app::lib_base
+PRIVATE
+    desktop-app::external_tde2e
+)
+
+
+
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 7fd873fe6537e0..ace5c7db3ffd58 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -18,7 +18,9 @@ set(style_files
     ui/chat/chat.style
     ui/effects/credits.style
     ui/effects/premium.style
+    ui/color_indices.style
     boxes/boxes.style
+    boxes/polls.style
     dialogs/dialogs.style
     chat_helpers/chat_helpers.style
     calls/calls.style
@@ -26,10 +28,12 @@ set(style_files
     info/info.style
     info/channel_statistics/boosts/giveaway/giveaway.style
     info/channel_statistics/earn/channel_earn.style
+    info/profile/info_levels.style
     info/userpic/info_userpic_builder.style
     intro/intro.style
     iv/iv.style
     media/player/media_player.style
+    media/stories/media_stories.style
     passport/passport.style
     payments/ui/payments.style
     profile/profile.style
@@ -57,11 +61,20 @@ PRIVATE
 
     boxes/peers/edit_peer_history_visibility_box.cpp
     boxes/peers/edit_peer_history_visibility_box.h
+    boxes/peers/toggle_topics_box.cpp
+    boxes/peers/toggle_topics_box.h
+
+    boxes/url_auth_box_content.cpp
+    boxes/url_auth_box_content.h
+    boxes/translate_box_content.cpp
+    boxes/translate_box_content.h
 
     calls/group/ui/calls_group_recording_box.cpp
     calls/group/ui/calls_group_recording_box.h
     calls/group/ui/calls_group_scheduled_labels.cpp
     calls/group/ui/calls_group_scheduled_labels.h
+    calls/group/ui/calls_group_stars_coloring.cpp
+    calls/group/ui/calls_group_stars_coloring.h
     calls/group/ui/desktop_capture_choose_source.cpp
     calls/group/ui/desktop_capture_choose_source.h
     calls/ui/calls_device_menu.cpp
@@ -84,23 +97,34 @@ PRIVATE
 
     data/raw/raw_countries_bounds.cpp
     data/raw/raw_countries_bounds.h
+    data/data_authorization.h
     data/data_birthday.cpp
     data/data_birthday.h
     data/data_channel_earn.h
     data/data_credits.h
     data/data_credits_earn.h
+    data/data_passkey_deserialize.cpp
+    data/data_passkey_deserialize.h
+    data/data_peer_colors.h
     data/data_premium_subscription_option.h
     data/data_statistics_chart.cpp
     data/data_statistics_chart.h
     data/data_subscriptions.h
 
+    dialogs/dialogs_common.h
     dialogs/dialogs_three_state_icon.h
     dialogs/ui/chat_search_empty.cpp
     dialogs/ui/chat_search_empty.h
     dialogs/ui/chat_search_in.cpp
     dialogs/ui/chat_search_in.h
+    dialogs/ui/dialogs_quick_action_context.h
+    dialogs/ui/dialogs_quick_action.h
     dialogs/ui/dialogs_stories_list.cpp
     dialogs/ui/dialogs_stories_list.h
+    dialogs/ui/dialogs_top_bar_suggestion_content.cpp
+    dialogs/ui/dialogs_top_bar_suggestion_content.h
+    dialogs/ui/posts_search_intro.cpp
+    dialogs/ui/posts_search_intro.h
     dialogs/ui/top_peers_strip.cpp
     dialogs/ui/top_peers_strip.h
 
@@ -123,20 +147,33 @@ PRIVATE
     editor/scene/scene_item_image.h
     editor/scene/scene_item_line.cpp
     editor/scene/scene_item_line.h
+    editor/scene/scene_item_text.cpp
+    editor/scene/scene_item_text.h
+    editor/scene/scene_emoji_document.cpp
+    editor/scene/scene_emoji_document.h
+
+    ui/boxes/about_cocoon_box.h
+    ui/boxes/about_cocoon_box.cpp
 
     history/admin_log/history_admin_log_filter_value.h
     history/history_view_top_toast.cpp
     history/history_view_top_toast.h
-    history/history_view_swipe.cpp
-    history/history_view_swipe.h
-    history/history_view_swipe_data.h
     history/view/controls/history_view_characters_limit.cpp
     history/view/controls/history_view_characters_limit.h
     history/view/controls/history_view_voice_record_button.cpp
     history/view/controls/history_view_voice_record_button.h
 
+    info/info_flexible_scroll.cpp
+    info/info_flexible_scroll.h
+
     info/profile/info_profile_icon.cpp
     info/profile/info_profile_icon.h
+    info/profile/info_profile_music_button.cpp
+    info/profile/info_profile_music_button.h
+    info/profile/info_profile_text.cpp
+    info/profile/info_profile_text.h
+    info/profile/info_profile_top_bar_action_button.cpp
+    info/profile/info_profile_top_bar_action_button.h
     info/userpic/info_userpic_bubble_wrap.cpp
     info/userpic/info_userpic_bubble_wrap.h
     info/userpic/info_userpic_color_circle_button.cpp
@@ -153,6 +190,8 @@ PRIVATE
 
     info/channel_statistics/earn/earn_format.cpp
     info/channel_statistics/earn/earn_format.h
+    info/channel_statistics/earn/earn_icons.cpp
+    info/channel_statistics/earn/earn_icons.h
 
     intro/intro_code_input.cpp
     intro/intro_code_input.h
@@ -182,8 +221,19 @@ PRIVATE
 
     media/media_common.h
 
+    menu/gift_resale_filter.cpp
+    menu/gift_resale_filter.h
+    menu/menu_action_with_thumbnail.cpp
+    menu/menu_action_with_thumbnail.h
+    menu/menu_checked_action.cpp
+    menu/menu_checked_action.h
     menu/menu_check_item.cpp
     menu/menu_check_item.h
+    menu/menu_item_rate_transcribe.cpp
+    menu/menu_item_rate_transcribe.h
+    menu/menu_send_details.h
+    menu/menu_timecode_action.cpp
+    menu/menu_timecode_action.h
     menu/menu_ttl.cpp
     menu/menu_ttl.h
 
@@ -209,17 +259,27 @@ PRIVATE
 
     platform/linux/current_geo_location_linux.cpp
     platform/linux/current_geo_location_linux.h
+    platform/linux/text_recognition_linux.h
     platform/mac/file_bookmark_mac.h
     platform/mac/file_bookmark_mac.mm
     platform/mac/current_geo_location_mac.h
     platform/mac/current_geo_location_mac.mm
+    platform/mac/text_recognition_mac.h
+    platform/mac/text_recognition_mac.mm
     platform/win/current_geo_location_win.cpp
     platform/win/current_geo_location_win.h
+    platform/win/text_recognition_win.h
     platform/platform_file_bookmark.h
     platform/platform_current_geo_location.h
+    platform/platform_text_recognition.h
+
+    profile/profile_back_button.cpp
+    profile/profile_back_button.h
 
     settings/settings_common.cpp
     settings/settings_common.h
+    settings/cloud_password/settings_cloud_password_common.cpp
+    settings/cloud_password/settings_cloud_password_common.h
 
     statistics/chart_lines_filter_controller.cpp
     statistics/chart_lines_filter_controller.h
@@ -308,8 +368,14 @@ PRIVATE
     ui/chat/attach/attach_album_preview.h
     ui/chat/attach/attach_album_thumbnail.cpp
     ui/chat/attach/attach_album_thumbnail.h
+    ui/chat/attach/attach_bot_downloads.cpp
+    ui/chat/attach/attach_bot_downloads.h
     ui/chat/attach/attach_bot_webview.cpp
     ui/chat/attach/attach_bot_webview.h
+    ui/chat/attach/attach_bot_webview_linux_shell.cpp
+    ui/chat/attach/attach_bot_webview_linux_shell.h
+    ui/layers/standalone_layer_stack.cpp
+    ui/layers/standalone_layer_stack.h
     ui/chat/attach/attach_controls.cpp
     ui/chat/attach/attach_controls.h
     ui/chat/attach/attach_extensions.cpp
@@ -328,6 +394,8 @@ PRIVATE
     ui/chat/chat_style_radius.h
     ui/chat/chat_theme.cpp
     ui/chat/chat_theme.h
+    ui/chat/chats_filter_tag.cpp
+    ui/chat/chats_filter_tag.h
     ui/chat/continuous_scroll.cpp
     ui/chat/continuous_scroll.h
     ui/chat/forward_options_box.cpp
@@ -346,6 +414,8 @@ PRIVATE
     ui/chat/pinned_bar.h
     ui/chat/requests_bar.cpp
     ui/chat/requests_bar.h
+    ui/controls/button_labels.cpp
+    ui/controls/button_labels.h
     ui/controls/call_mute_button.cpp
     ui/controls/call_mute_button.h
     ui/controls/chat_service_checkbox.cpp
@@ -354,8 +424,12 @@ PRIVATE
     ui/controls/delete_message_context_action.h
     ui/controls/download_bar.cpp
     ui/controls/download_bar.h
+    ui/controls/dynamic_images_strip.cpp
+    ui/controls/dynamic_images_strip.h
     ui/controls/emoji_button.cpp
     ui/controls/emoji_button.h
+    ui/controls/feature_list.cpp
+    ui/controls/feature_list.h
     ui/controls/filter_link_header.cpp
     ui/controls/filter_link_header.h
     ui/controls/jump_down_button.cpp
@@ -364,31 +438,77 @@ PRIVATE
     ui/controls/invite_link_buttons.h
     ui/controls/invite_link_label.cpp
     ui/controls/invite_link_label.h
+    ui/controls/labeled_emoji_tabs.cpp
+    ui/controls/labeled_emoji_tabs.h
     ui/controls/peer_list_dummy.cpp
     ui/controls/peer_list_dummy.h
+    ui/controls/popup_selector.cpp
+    ui/controls/popup_selector.h
+    ui/controls/round_video_recorder_data.h
+    ui/controls/round_video_recorder.cpp
+    ui/controls/round_video_recorder.h
     ui/controls/send_as_button.cpp
     ui/controls/send_as_button.h
     ui/controls/send_button.cpp
     ui/controls/send_button.h
+    ui/controls/stars_rating.cpp
+    ui/controls/stars_rating.h
+    ui/controls/subsection_tabs_slider.cpp
+    ui/controls/subsection_tabs_slider.h
+    ui/controls/subsection_tabs_slider_reorder.cpp
+    ui/controls/subsection_tabs_slider_reorder.h
+    ui/controls/sub_tabs.cpp
+    ui/controls/sub_tabs.h
+    ui/controls/swipe_handler.cpp
+    ui/controls/swipe_handler.h
+    ui/controls/swipe_handler_data.h
     ui/controls/tabbed_search.cpp
     ui/controls/tabbed_search.h
+    ui/controls/ton_common.cpp
+    ui/controls/ton_common.h
     ui/controls/who_reacted_context_action.cpp
     ui/controls/who_reacted_context_action.h
     ui/controls/window_outdated_bar.cpp
     ui/controls/window_outdated_bar_dummy.cpp
     ui/controls/window_outdated_bar.h
+    ui/controls/window_screen_reader_bar.cpp
+    ui/controls/window_screen_reader_bar.h
     ui/effects/fireworks_animation.cpp
     ui/effects/fireworks_animation.h
     ui/effects/glare.cpp
     ui/effects/glare.h
     ui/effects/loading_element.cpp
     ui/effects/loading_element.h
+    ui/effects/ministar_particles.cpp
+    ui/effects/ministar_particles.h
     ui/effects/outline_segments.cpp
     ui/effects/outline_segments.h
+    ui/effects/premium_3d_cover.cpp
+    ui/effects/premium_3d_cover.h
+    ui/effects/premium_3d_mesh.cpp
+    ui/effects/premium_3d_mesh.h
+    ui/effects/premium_3d_support.cpp
+    ui/effects/premium_3d_support.h
     ui/effects/premium_bubble.cpp
     ui/effects/premium_bubble.h
+    ui/effects/premium_coin.cpp
+    ui/effects/premium_coin.h
+    ui/effects/premium_coin_renderer.cpp
+    ui/effects/premium_coin_renderer.h
+    ui/effects/premium_diamond.cpp
+    ui/effects/premium_diamond.h
+    ui/effects/premium_diamond_renderer.cpp
+    ui/effects/premium_diamond_renderer.h
     ui/effects/premium_graphics.cpp
     ui/effects/premium_graphics.h
+    ui/effects/premium_star.cpp
+    ui/effects/premium_star.h
+    ui/effects/premium_star_model.cpp
+    ui/effects/premium_star_model.h
+    ui/effects/premium_star_particles.cpp
+    ui/effects/premium_star_particles.h
+    ui/effects/premium_star_renderer.cpp
+    ui/effects/premium_star_renderer.h
     ui/effects/premium_stars.cpp
     ui/effects/premium_stars.h
     ui/effects/premium_stars_colored.cpp
@@ -399,24 +519,43 @@ PRIVATE
     ui/effects/round_checkbox.h
     ui/effects/scroll_content_shadow.cpp
     ui/effects/scroll_content_shadow.h
+    ui/effects/skeleton_animation.cpp
+    ui/effects/skeleton_animation.h
     ui/effects/shake_animation.cpp
     ui/effects/shake_animation.h
     ui/effects/snowflakes.cpp
     ui/effects/snowflakes.h
     ui/effects/toggle_arrow.cpp
     ui/effects/toggle_arrow.h
+    ui/effects/upload_progress_overlay.cpp
+    ui/effects/upload_progress_overlay.h
+    ui/effects/ttl_icon.cpp
+    ui/effects/ttl_icon.h
+    ui/search_field_controller.cpp
+    ui/search_field_controller.h
     ui/text/format_song_name.cpp
     ui/text/format_song_name.h
     ui/text/format_values.cpp
     ui/text/format_values.h
+    ui/text/text_lottie_custom_emoji.cpp
+    ui/text/text_lottie_custom_emoji.h
     ui/text/text_options.cpp
     ui/text/text_options.h
 
+    ui/image/svg_preview.cpp
+    ui/image/svg_preview.h
+
     ui/widgets/fields/special_fields.cpp
     ui/widgets/fields/special_fields.h
     ui/widgets/fields/time_part_input_with_placeholder.cpp
     ui/widgets/fields/time_part_input_with_placeholder.h
 
+    ui/widgets/chat_filters_tabs_slider.cpp
+    ui/widgets/chat_filters_tabs_slider.h
+    ui/widgets/chat_filters_tabs_slider_reorder.cpp
+    ui/widgets/chat_filters_tabs_slider_reorder.h
+    ui/widgets/cross_fade_label.cpp
+    ui/widgets/cross_fade_label.h
     ui/widgets/color_editor.cpp
     ui/widgets/color_editor.h
     ui/widgets/continuous_sliders.cpp
@@ -425,8 +564,12 @@ PRIVATE
     ui/widgets/discrete_sliders.h
     ui/widgets/gradient_round_button.cpp
     ui/widgets/gradient_round_button.h
+    ui/widgets/horizontal_fit_container.cpp
+    ui/widgets/horizontal_fit_container.h
     ui/widgets/level_meter.cpp
     ui/widgets/level_meter.h
+    ui/widgets/middle_click_autoscroll.cpp
+    ui/widgets/middle_click_autoscroll.h
     ui/widgets/multi_select.cpp
     ui/widgets/multi_select.h
     ui/widgets/sent_code_field.cpp
@@ -449,12 +592,16 @@ PRIVATE
     ui/grouped_layout.h
     ui/new_badges.cpp
     ui/new_badges.h
+    ui/peer/color_sample.cpp
+    ui/peer/color_sample.h
     ui/power_saving.cpp
     ui/power_saving.h
     ui/vertical_list.cpp
     ui/vertical_list.h
     ui/unread_badge_paint.cpp
     ui/unread_badge_paint.h
+    ui/unread_counter_format.cpp
+    ui/unread_counter_format.h
     ui/userpic_view.cpp
     ui/userpic_view.h
     ui/webview_helpers.cpp
@@ -468,10 +615,19 @@ PRIVATE
 
 nice_target_sources(td_ui ${res_loc}
 PRIVATE
+    bot_webview_shell_html/body.html
+    bot_webview_shell_html/page.css
+    bot_webview_shell_html/page.js
     picker_html/picker.css
     picker_html/picker.js
 )
 
+if (WIN32 OR APPLE)
+    remove_target_sources(td_ui ${src_loc}
+        ui/chat/attach/attach_bot_webview_linux_shell.cpp
+    )
+endif()
+
 if (DESKTOP_APP_SPECIAL_TARGET)
     remove_target_sources(td_ui ${src_loc}
         ui/controls/window_outdated_bar_dummy.cpp
@@ -500,4 +656,5 @@ PRIVATE
     desktop-app::lib_spellcheck
     desktop-app::lib_stripe
     desktop-app::external_kcoreaddons
+    desktop-app::external_webrtc
 )
diff --git a/Telegram/cmake/telegram_apple_swift_runtime.cmake b/Telegram/cmake/telegram_apple_swift_runtime.cmake
new file mode 100644
index 00000000000000..3b331a7b41a2b5
--- /dev/null
+++ b/Telegram/cmake/telegram_apple_swift_runtime.cmake
@@ -0,0 +1,37 @@
+# This file is part of Telegram Desktop,
+# the official desktop application for the Telegram messaging service.
+#
+# For license and copyright information please follow this link:
+# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+
+function(telegram_add_apple_swift_runtime target_name)
+    if (NOT APPLE)
+        return()
+    endif()
+
+    execute_process(
+        COMMAND xcode-select -p
+        OUTPUT_VARIABLE DEVELOPER_DIR
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    set(SWIFT_LIB_DIR
+        "${DEVELOPER_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx")
+
+    target_link_options(${target_name}
+    PRIVATE
+        "-L${SWIFT_LIB_DIR}"
+        "-Wl,-rpath,/usr/lib/swift"
+        "-Wl,-rpath,@executable_path/../Frameworks"
+    )
+
+    add_custom_command(TARGET ${target_name} POST_BUILD
+        COMMAND mkdir -p $<TARGET_FILE_DIR:${target_name}>/../Frameworks
+        COMMAND xcrun swift-stdlib-tool
+            --copy
+            --platform macosx
+            --scan-executable $<TARGET_FILE:${target_name}>
+            --destination $<TARGET_FILE_DIR:${target_name}>/../Frameworks
+        VERBATIM
+    )
+endfunction()
\ No newline at end of file
diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake
index 18fa73671ab20a..402040d7f03d04 100644
--- a/Telegram/cmake/telegram_options.cmake
+++ b/Telegram/cmake/telegram_options.cmake
@@ -51,3 +51,8 @@ endif()
 if (DESKTOP_APP_SPECIAL_TARGET)
     target_compile_definitions(Telegram PRIVATE TDESKTOP_ALLOW_CLOSED_ALPHA)
 endif()
+
+option(DESKTOP_APP_DISABLE_SWIFT6 "Disable local on-device translation (build without Swift 6 on macOS)." OFF)
+if (DESKTOP_APP_DISABLE_SWIFT6)
+    target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_SWIFT6)
+endif()
diff --git a/Telegram/codegen b/Telegram/codegen
index 4155b9ae2d4c5a..63ec3de7273566 160000
--- a/Telegram/codegen
+++ b/Telegram/codegen
@@ -1 +1 @@
-Subproject commit 4155b9ae2d4c5a37b9738afa8ef9fa20d8fdcb44
+Subproject commit 63ec3de7273566aee8c8b11a40c91f3880c217a7
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 21d1ac8bfcca03..efa171f4d184d0 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 21d1ac8bfcca03f67d7f6df75e265cd5597dc101
+Subproject commit efa171f4d184d0a316d57ccfd12336a517ff871f
diff --git a/Telegram/lib_crl b/Telegram/lib_crl
index c1d6b027365309..bc81a8ce1bcf1b 160000
--- a/Telegram/lib_crl
+++ b/Telegram/lib_crl
@@ -1 +1 @@
-Subproject commit c1d6b0273653095b10b4d0f4f7c30b614b690fd5
+Subproject commit bc81a8ce1bcf1b67d9c2b7ce2b52ae017df70a4f
diff --git a/Telegram/lib_lottie b/Telegram/lib_lottie
index 1a700e5a0d7c3e..49d67cf66d3573 160000
--- a/Telegram/lib_lottie
+++ b/Telegram/lib_lottie
@@ -1 +1 @@
-Subproject commit 1a700e5a0d7c3e2f617530354ff2a47c5c72bb4a
+Subproject commit 49d67cf66d3573cd71a3228af47a4ac59b64fc90
diff --git a/Telegram/lib_rpl b/Telegram/lib_rpl
index 8b1015d1bd57ef..c57cccffb01d85 160000
--- a/Telegram/lib_rpl
+++ b/Telegram/lib_rpl
@@ -1 +1 @@
-Subproject commit 8b1015d1bd57ef03fcd07a3eeddd3f5a9b688ade
+Subproject commit c57cccffb01d85570decd7fccb88419c9a682e63
diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck
index e76981e133a1d2..1f18c1e35b9969 160000
--- a/Telegram/lib_spellcheck
+++ b/Telegram/lib_spellcheck
@@ -1 +1 @@
-Subproject commit e76981e133a1d29f3ceb557f53850a8d822f439a
+Subproject commit 1f18c1e35b99697fe58d48d7f5a88e96c928128e
diff --git a/Telegram/lib_tl b/Telegram/lib_tl
index 237cbeb9d1c637..665160f91565ba 160000
--- a/Telegram/lib_tl
+++ b/Telegram/lib_tl
@@ -1 +1 @@
-Subproject commit 237cbeb9d1c637759f89a508c1d854caf16e1984
+Subproject commit 665160f91565bab00ecab65df3a17438e91e44ec
diff --git a/Telegram/lib_translate b/Telegram/lib_translate
new file mode 160000
index 00000000000000..09c10726220e68
--- /dev/null
+++ b/Telegram/lib_translate
@@ -0,0 +1 @@
+Subproject commit 09c10726220e6862ca91d39b5dec5119aa0177bc
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 887f5414302a1e..4ef4b13cdc13b4 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 887f5414302a1e8fd84cd880ef8454aa21b681da
+Subproject commit 4ef4b13cdc13b4dcf0a49ce40e185826c5943f9e
diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
index 8751e27d50d2f2..52636e86eaa493 160000
--- a/Telegram/lib_webrtc
+++ b/Telegram/lib_webrtc
@@ -1 +1 @@
-Subproject commit 8751e27d50d2f26b5d20673e5ddba38e90953570
+Subproject commit 52636e86eaa493de670daf71959d000b281bd153
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index e9e85a10e6864e..b1011367be1c6e 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit e9e85a10e6864e18ffd540df04d7965d0af39500
+Subproject commit b1011367be1c6effe15e0cd3ed53b5ffc33e84c3
diff --git a/Telegram/shaders/argb32.frag b/Telegram/shaders/argb32.frag
new file mode 100644
index 00000000000000..4b4deb01e408b5
--- /dev/null
+++ b/Telegram/shaders/argb32.frag
@@ -0,0 +1,10 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D s_texture;
+
+void main() {
+	fragColor = texture(s_texture, v_texcoord);
+}
diff --git a/Telegram/shaders/argb32.vert b/Telegram/shaders/argb32.vert
new file mode 100644
index 00000000000000..30a06038f5dfdf
--- /dev/null
+++ b/Telegram/shaders/argb32.vert
@@ -0,0 +1,18 @@
+#version 450
+
+layout(location = 0) in vec2 position;
+layout(location = 1) in vec2 v_texcoordIn;
+
+layout(location = 0) out vec2 v_texcoord;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+};
+
+void main() {
+	v_texcoord = v_texcoordIn;
+	gl_Position = vec4(
+		vec2(-1.0, -1.0) + 2.0 * position / viewport,
+		0.0,
+		1.0);
+}
diff --git a/Telegram/shaders/blur_h.frag b/Telegram/shaders/blur_h.frag
new file mode 100644
index 00000000000000..2c08805945a57b
--- /dev/null
+++ b/Telegram/shaders/blur_h.frag
@@ -0,0 +1,26 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D b_texture;
+
+layout(std140, binding = 0) uniform BlurParams {
+	float texelOffset;
+};
+
+const vec3 satLuminanceWeighting = vec3(0.2126, 0.7152, 0.0722);
+const int radius = 15;
+const int diameter = 2 * radius + 1;
+
+void main() {
+	vec4 sum = vec4(0.0);
+	for (int i = 0; i < diameter; i++) {
+		float offset = float(i - radius) * texelOffset;
+		vec4 sample_ = texture(b_texture, v_texcoord + vec2(offset, 0.0));
+		float luminance = dot(sample_.rgb, satLuminanceWeighting);
+		sample_.rgb = mix(vec3(luminance), sample_.rgb, 0.65);
+		sum += sample_;
+	}
+	fragColor = sum / float(diameter);
+}
diff --git a/Telegram/shaders/blur_v.frag b/Telegram/shaders/blur_v.frag
new file mode 100644
index 00000000000000..7db43f26501d5c
--- /dev/null
+++ b/Telegram/shaders/blur_v.frag
@@ -0,0 +1,22 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D b_texture;
+
+layout(std140, binding = 0) uniform BlurParams {
+	float texelOffset;
+};
+
+const int radius = 15;
+const int diameter = 2 * radius + 1;
+
+void main() {
+	vec4 sum = vec4(0.0);
+	for (int i = 0; i < diameter; i++) {
+		float offset = float(i - radius) * texelOffset;
+		sum += texture(b_texture, v_texcoord + vec2(0.0, offset));
+	}
+	fragColor = sum / float(diameter);
+}
diff --git a/Telegram/shaders/controls.frag b/Telegram/shaders/controls.frag
new file mode 100644
index 00000000000000..f1cb5457ce69f5
--- /dev/null
+++ b/Telegram/shaders/controls.frag
@@ -0,0 +1,16 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D s_texture;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	float g_opacity;
+};
+
+void main() {
+	vec4 result = texture(s_texture, v_texcoord);
+	fragColor = result * g_opacity;
+}
diff --git a/Telegram/shaders/fill.frag b/Telegram/shaders/fill.frag
new file mode 100644
index 00000000000000..172d68ccc05d82
--- /dev/null
+++ b/Telegram/shaders/fill.frag
@@ -0,0 +1,12 @@
+#version 450
+
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	vec4 s_color;
+};
+
+void main() {
+	fragColor = s_color;
+}
diff --git a/Telegram/shaders/fill.vert b/Telegram/shaders/fill.vert
new file mode 100644
index 00000000000000..47ea14404d56f1
--- /dev/null
+++ b/Telegram/shaders/fill.vert
@@ -0,0 +1,14 @@
+#version 450
+
+layout(location = 0) in vec2 position;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+};
+
+void main() {
+	gl_Position = vec4(
+		vec2(-1.0, -1.0) + 2.0 * position / viewport,
+		0.0,
+		1.0);
+}
diff --git a/Telegram/shaders/group_frame.frag b/Telegram/shaders/group_frame.frag
new file mode 100644
index 00000000000000..86dce81d2b5ce7
--- /dev/null
+++ b/Telegram/shaders/group_frame.frag
@@ -0,0 +1,75 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 1) in vec2 b_texcoord;
+layout(location = 2) in vec2 v_position;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D s_texture;
+layout(binding = 2) uniform sampler2D b_texture;
+layout(binding = 3) uniform sampler2D n_texture;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	vec4 frameBg;
+	vec4 shadow;
+	float paused;
+	vec4 roundRect;
+	vec2 radiusOutline;
+	vec4 roundBg;
+	vec4 outlineFg;
+};
+
+vec2 roundedCorner(vec2 fc) {
+	vec2 rectHalf = roundRect.zw / 2.0;
+	vec2 rectCenter = roundRect.xy + rectHalf;
+	vec2 fromRectCenter = abs(fc - rectCenter);
+	vec2 vectorRadius = radiusOutline.xx + vec2(0.5);
+	vec2 fromCenterWithRadius = fromRectCenter + vectorRadius;
+	vec2 fromRoundingCenter = max(fromCenterWithRadius, rectHalf) - rectHalf;
+	float rounded = length(fromRoundingCenter) - radiusOutline.x;
+	float outline = rounded + radiusOutline.y;
+	return vec2(
+		1.0 - smoothstep(0.0, 1.0, rounded),
+		1.0 - (smoothstep(0.0, 1.0, outline) * outlineFg.a));
+}
+
+float insideTexture() {
+	vec2 textureHalf = vec2(0.5, 0.5);
+	vec2 fromTextureCenter = abs(v_texcoord - textureHalf);
+	vec2 fromTextureEdge = max(fromTextureCenter, textureHalf) - textureHalf;
+	float outsideCheck = dot(fromTextureEdge, fromTextureEdge);
+	return step(outsideCheck, 0.0);
+}
+
+vec4 background() {
+	vec4 blur = texture(b_texture, b_texcoord);
+	float blurOpacity = shadow.w;
+	return mix(frameBg, blur, blurOpacity);
+}
+
+void main() {
+	vec2 fc = v_position;
+
+	float inside = insideTexture() * (1.0 - paused);
+	vec4 result;
+	float backgroundOpacity = shadow.w;
+	vec4 mainColor = texture(s_texture, v_texcoord);
+	result = mainColor * inside
+		+ (1.0 - inside) * (backgroundOpacity * background()
+			+ (1.0 - backgroundOpacity) * frameBg);
+
+	float shadowCoord = fc.y - roundRect.y;
+	float shadowValue = max(1.0 - (shadowCoord / shadow.x), 0.0);
+	float shadowShown = max(shadowValue * shadow.y, paused) * shadow.z;
+	result = vec4(result.rgb * (1.0 - shadowShown), result.a);
+
+	float noiseValue = texture(n_texture, fc / vec2(256.0)).r;
+	result.rgb += (noiseValue - 0.5) * 0.002;
+
+	vec2 roundOutline = roundedCorner(fc);
+	result = result * roundOutline.y
+		+ vec4(outlineFg.rgb, 1.0) * (1.0 - roundOutline.y);
+	result = result * roundOutline.x + roundBg * (1.0 - roundOutline.x);
+	fragColor = result;
+}
diff --git a/Telegram/shaders/group_frame.vert b/Telegram/shaders/group_frame.vert
new file mode 100644
index 00000000000000..0aa4d489d71596
--- /dev/null
+++ b/Telegram/shaders/group_frame.vert
@@ -0,0 +1,30 @@
+#version 450
+
+layout(location = 0) in vec2 position;
+layout(location = 1) in vec2 v_texcoordIn;
+layout(location = 2) in vec2 b_texcoordIn;
+
+layout(location = 0) out vec2 v_texcoord;
+layout(location = 1) out vec2 b_texcoord;
+layout(location = 2) out vec2 v_position;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	vec4 frameBg;
+	vec4 shadow;
+	float paused;
+	vec4 roundRect;
+	vec2 radiusOutline;
+	vec4 roundBg;
+	vec4 outlineFg;
+};
+
+void main() {
+	v_texcoord = v_texcoordIn;
+	b_texcoord = b_texcoordIn;
+	v_position = position;
+	gl_Position = vec4(
+		vec2(-1.0, -1.0) + 2.0 * position / viewport,
+		0.0,
+		1.0);
+}
diff --git a/Telegram/shaders/incoming_shadow.frag b/Telegram/shaders/incoming_shadow.frag
new file mode 100644
index 00000000000000..69c0907ef28b2a
--- /dev/null
+++ b/Telegram/shaders/incoming_shadow.frag
@@ -0,0 +1,20 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D s_texture;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	vec3 shadow;
+};
+
+void main() {
+	float fragY = viewport.y - gl_FragCoord.y;
+	vec4 result = texture(s_texture, v_texcoord);
+	float shadowCoord = shadow.y - fragY;
+	float shadowValue = clamp(shadowCoord / shadow.x, 0.0, 1.0);
+	float shadowShown = shadowValue * shadow.z;
+	fragColor = vec4(min(result.rgb, vec3(1.0)) * (1.0 - shadowShown), result.a);
+}
diff --git a/Telegram/shaders/incoming_yuv420.frag b/Telegram/shaders/incoming_yuv420.frag
new file mode 100644
index 00000000000000..53261422d52e72
--- /dev/null
+++ b/Telegram/shaders/incoming_yuv420.frag
@@ -0,0 +1,29 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D y_texture;
+layout(binding = 2) uniform sampler2D u_texture;
+layout(binding = 3) uniform sampler2D v_texture;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	vec3 shadow;
+};
+
+void main() {
+	float fragY = viewport.y - gl_FragCoord.y;
+	float y = texture(y_texture, v_texcoord).r - 0.0625;
+	float u = texture(u_texture, v_texcoord).r - 0.5;
+	float v = texture(v_texture, v_texcoord).r - 0.5;
+	vec4 result = vec4(
+		1.164 * y + 1.596 * v,
+		1.164 * y - 0.392 * u - 0.813 * v,
+		1.164 * y + 2.017 * u,
+		1.0);
+	float shadowCoord = shadow.y - fragY;
+	float shadowValue = clamp(shadowCoord / shadow.x, 0.0, 1.0);
+	float shadowShown = shadowValue * shadow.z;
+	fragColor = vec4(min(result.rgb, vec3(1.0)) * (1.0 - shadowShown), result.a);
+}
diff --git a/Telegram/shaders/noise.frag b/Telegram/shaders/noise.frag
new file mode 100644
index 00000000000000..cda60e7a553c85
--- /dev/null
+++ b/Telegram/shaders/noise.frag
@@ -0,0 +1,73 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+const float permTexUnit = 1.0 / 256.0;
+const float permTexUnitHalf = 0.5 / 256.0;
+const float grainsize = 1.3;
+const float noiseCoordRotation = 1.425;
+const vec2 dimensions = vec2(256.0, 256.0);
+
+layout(binding = 1) uniform sampler2D p_texture;
+
+vec4 rnm(vec2 tc) {
+	float noise = sin(dot(tc, vec2(12.9898, 78.233))) * 43758.5453;
+	float noiseR = fract(noise) * 2.0 - 1.0;
+	float noiseG = fract(noise * 1.2154) * 2.0 - 1.0;
+	float noiseB = fract(noise * 1.3453) * 2.0 - 1.0;
+	float noiseA = fract(noise * 1.4651) * 2.0 - 1.0;
+	return vec4(noiseR, noiseG, noiseB, noiseA);
+}
+
+float fade(float t) {
+	return t * t * t * (t * (t * 6.0 - 15.0) + 10.0);
+}
+
+float pnoise3D(vec3 p) {
+	vec3 pi = permTexUnit * floor(p) + permTexUnitHalf;
+	vec3 pf = fract(p);
+	float perm00 = rnm(pi.xy).a;
+	vec3 grad000 = rnm(vec2(perm00, pi.z)).rgb * 4.0 - 1.0;
+	float n000 = dot(grad000, pf);
+	vec3 grad001 = rnm(vec2(perm00, pi.z + permTexUnit)).rgb * 4.0 - 1.0;
+	float n001 = dot(grad001, pf - vec3(0.0, 0.0, 1.0));
+	float perm01 = rnm(pi.xy + vec2(0.0, permTexUnit)).a;
+	vec3 grad010 = rnm(vec2(perm01, pi.z)).rgb * 4.0 - 1.0;
+	float n010 = dot(grad010, pf - vec3(0.0, 1.0, 0.0));
+	vec3 grad011 = rnm(vec2(perm01, pi.z + permTexUnit)).rgb * 4.0 - 1.0;
+	float n011 = dot(grad011, pf - vec3(0.0, 1.0, 1.0));
+	float perm10 = rnm(pi.xy + vec2(permTexUnit, 0.0)).a;
+	vec3 grad100 = rnm(vec2(perm10, pi.z)).rgb * 4.0 - 1.0;
+	float n100 = dot(grad100, pf - vec3(1.0, 0.0, 0.0));
+	vec3 grad101 = rnm(vec2(perm10, pi.z + permTexUnit)).rgb * 4.0 - 1.0;
+	float n101 = dot(grad101, pf - vec3(1.0, 0.0, 1.0));
+	float perm11 = rnm(pi.xy + vec2(permTexUnit, permTexUnit)).a;
+	vec3 grad110 = rnm(vec2(perm11, pi.z)).rgb * 4.0 - 1.0;
+	float n110 = dot(grad110, pf - vec3(1.0, 1.0, 0.0));
+	vec3 grad111 = rnm(vec2(perm11, pi.z + permTexUnit)).rgb * 4.0 - 1.0;
+	float n111 = dot(grad111, pf - vec3(1.0, 1.0, 1.0));
+	vec4 n_x = mix(
+		vec4(n000, n001, n010, n011),
+		vec4(n100, n101, n110, n111),
+		fade(pf.x));
+	vec2 n_xy = mix(n_x.xy, n_x.zw, fade(pf.y));
+	float n_xyz = mix(n_xy.x, n_xy.y, fade(pf.z));
+	return n_xyz;
+}
+
+vec2 rotateTexCoords(vec2 tc, float angle) {
+	tc -= 0.5;
+	float s = sin(angle);
+	float c = cos(angle);
+	tc = mat2(c, -s, s, c) * tc;
+	tc += 0.5;
+	return tc;
+}
+
+void main() {
+	vec2 texCoord = v_texcoord * dimensions / grainsize;
+	vec2 rotated = rotateTexCoords(texCoord, noiseCoordRotation);
+	float noise = pnoise3D(vec3(rotated, 0.0));
+	fragColor = vec4(noise * 0.5 + 0.5);
+}
diff --git a/Telegram/shaders/nv12.frag b/Telegram/shaders/nv12.frag
new file mode 100644
index 00000000000000..0d2d3f0e663c33
--- /dev/null
+++ b/Telegram/shaders/nv12.frag
@@ -0,0 +1,19 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D y_texture;
+layout(binding = 2) uniform sampler2D uv_texture;
+
+void main() {
+	float y = texture(y_texture, v_texcoord).r - 0.0625;
+	vec2 uv = texture(uv_texture, v_texcoord).rg - vec2(0.5, 0.5);
+	float u = uv.x;
+	float v = uv.y;
+	fragColor = vec4(
+		1.164 * y + 1.596 * v,
+		1.164 * y - 0.392 * u - 0.813 * v,
+		1.164 * y + 2.017 * u,
+		1.0);
+}
diff --git a/Telegram/shaders/nv12_content.frag b/Telegram/shaders/nv12_content.frag
new file mode 100644
index 00000000000000..dee712d486f79e
--- /dev/null
+++ b/Telegram/shaders/nv12_content.frag
@@ -0,0 +1,61 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D y_texture;
+layout(binding = 2) uniform sampler2D uv_texture;
+layout(binding = 3) uniform sampler2D f_texture;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	vec4 shadowTopRect;
+	vec4 shadowBottomSkipOpacityFullFade;
+	vec4 roundRect;
+	float roundRadius;
+};
+
+float roundedCorner(vec2 fragCoord) {
+	vec2 rectHalf = roundRect.zw / 2.0;
+	vec2 rectCenter = roundRect.xy + rectHalf;
+	vec2 fromRectCenter = abs(fragCoord - rectCenter);
+	vec2 vectorRadius = vec2(roundRadius + 0.5);
+	vec2 fromCenterWithRadius = fromRectCenter + vectorRadius;
+	vec2 fromRoundingCenter = max(fromCenterWithRadius, rectHalf) - rectHalf;
+	float rounded = length(fromRoundingCenter) - roundRadius;
+	return 1.0 - smoothstep(0.0, 1.0, rounded);
+}
+
+void main() {
+	vec2 fragCoord = vec2(gl_FragCoord.x, viewport.y - gl_FragCoord.y);
+	float y = texture(y_texture, v_texcoord).r - 0.0625;
+	vec2 uv = texture(uv_texture, v_texcoord).rg - vec2(0.5, 0.5);
+	float u = uv.x;
+	float v = uv.y;
+	vec4 result = vec4(
+		1.164 * y + 1.596 * v,
+		1.164 * y - 0.392 * u - 0.813 * v,
+		1.164 * y + 2.017 * u,
+		1.0);
+
+	float topHeight = shadowTopRect.w;
+	float bottomHeight = shadowBottomSkipOpacityFullFade.x;
+	float bottomSkip = shadowBottomSkipOpacityFullFade.y;
+	float opacity = shadowBottomSkipOpacityFullFade.z;
+	float fullFade = shadowBottomSkipOpacityFullFade.w;
+	float viewportHeight = shadowTopRect.y + topHeight;
+	float fullHeight = topHeight + bottomHeight;
+	float topY = min(
+		(viewportHeight - fragCoord.y) / fullHeight,
+		topHeight / fullHeight);
+	float topX = (fragCoord.x - shadowTopRect.x) / shadowTopRect.z;
+	vec4 fadeTop = texture(f_texture, vec2(topX, topY)) * opacity;
+	float bottomY = max(bottomSkip + fullHeight - fragCoord.y, topHeight)
+		/ fullHeight;
+	vec4 fadeBottom = texture(f_texture, vec2(0.5, bottomY)) * opacity;
+	float fade = min((1.0 - fadeTop.a) * (1.0 - fadeBottom.a), fullFade);
+	result.rgb = result.rgb * fade;
+
+	result *= roundedCorner(fragCoord);
+	fragColor = result;
+}
diff --git a/Telegram/shaders/passthrough.vert b/Telegram/shaders/passthrough.vert
new file mode 100644
index 00000000000000..d3389cfde71449
--- /dev/null
+++ b/Telegram/shaders/passthrough.vert
@@ -0,0 +1,11 @@
+#version 450
+
+layout(location = 0) in vec2 position;
+layout(location = 1) in vec2 v_texcoordIn;
+
+layout(location = 0) out vec2 v_texcoord;
+
+void main() {
+	v_texcoord = v_texcoordIn;
+	gl_Position = vec4(position, 0.0, 1.0);
+}
diff --git a/Telegram/shaders/pip_argb32.frag b/Telegram/shaders/pip_argb32.frag
new file mode 100644
index 00000000000000..d4cff82266f3f8
--- /dev/null
+++ b/Telegram/shaders/pip_argb32.frag
@@ -0,0 +1,60 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D s_texture;
+layout(binding = 2) uniform sampler2D h_texture;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	vec4 roundRect;
+	float roundRadius;
+	vec4 fadeColor;
+	vec2 h_size;
+	vec4 h_extend;
+	vec4 h_components;
+};
+
+float roundedCorner(vec2 fc) {
+	vec2 rectHalf = roundRect.zw / 2.0;
+	vec2 rectCenter = roundRect.xy + rectHalf;
+	vec2 fromRectCenter = abs(fc - rectCenter);
+	vec2 vectorRadius = vec2(roundRadius + 0.5);
+	vec2 fromCenterWithRadius = fromRectCenter + vectorRadius;
+	vec2 fromRoundingCenter = max(fromCenterWithRadius, rectHalf) - rectHalf;
+	float rounded = length(fromRoundingCenter) - roundRadius;
+	return 1.0 - smoothstep(0.0, 1.0, rounded);
+}
+
+float shadow(vec2 fc) {
+	vec2 texcoord = fc - roundRect.xy + h_extend.xy;
+	vec2 total = roundRect.zw + h_extend.xy + h_extend.zw;
+	vec2 dividedTexcoord = texcoord / total;
+	float left = h_components.x / h_size.x;
+	float right = 1.0 - h_components.y / h_size.x;
+	float top = h_components.z / h_size.y;
+	float bottom = 1.0 - h_components.w / h_size.y;
+	float sampleX = dividedTexcoord.x < left
+		? dividedTexcoord.x * total.x / h_size.x
+		: dividedTexcoord.x > right
+			? 1.0 - (1.0 - dividedTexcoord.x) * total.x / h_size.x
+			: mix(left, right, (dividedTexcoord.x - left) / (right - left) * (h_size.x - h_components.x - h_components.y) / h_size.x + h_components.x / h_size.x);
+	float sampleY = dividedTexcoord.y < top
+		? dividedTexcoord.y * total.y / h_size.y
+		: dividedTexcoord.y > bottom
+			? 1.0 - (1.0 - dividedTexcoord.y) * total.y / h_size.y
+			: mix(top, bottom, (dividedTexcoord.y - top) / (bottom - top) * (h_size.y - h_components.z - h_components.w) / h_size.y + h_components.z / h_size.y);
+	return texture(h_texture, vec2(
+		clamp(sampleX, 0.0, 1.0),
+		clamp(sampleY, 0.0, 1.0))).a;
+}
+
+void main() {
+	vec2 fc = vec2(gl_FragCoord.x, viewport.y - gl_FragCoord.y);
+	vec4 result = texture(s_texture, v_texcoord);
+	result = result * (1.0 - fadeColor.a) + fadeColor;
+	float corner = roundedCorner(fc);
+	float shadowValue = shadow(fc);
+	fragColor = result * corner + vec4(0.0, 0.0, 0.0, shadowValue) * (1.0 - corner);
+}
diff --git a/Telegram/shaders/pip_controls.frag b/Telegram/shaders/pip_controls.frag
new file mode 100644
index 00000000000000..0f7dcb4ea6a1e2
--- /dev/null
+++ b/Telegram/shaders/pip_controls.frag
@@ -0,0 +1,20 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 1) in vec2 o_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D s_texture;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	float g_opacity;
+	float o_opacity;
+};
+
+void main() {
+	vec4 result = texture(s_texture, v_texcoord);
+	vec4 over = texture(s_texture, o_texcoord);
+	result = result * (1.0 - o_opacity) + over * o_opacity;
+	fragColor = result * g_opacity;
+}
diff --git a/Telegram/shaders/pip_controls.vert b/Telegram/shaders/pip_controls.vert
new file mode 100644
index 00000000000000..39899ff0cbc3db
--- /dev/null
+++ b/Telegram/shaders/pip_controls.vert
@@ -0,0 +1,23 @@
+#version 450
+
+layout(location = 0) in vec2 position;
+layout(location = 1) in vec2 v_texcoordIn;
+layout(location = 2) in vec2 o_texcoordIn;
+
+layout(location = 0) out vec2 v_texcoord;
+layout(location = 1) out vec2 o_texcoord;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	float g_opacity;
+	float o_opacity;
+};
+
+void main() {
+	v_texcoord = v_texcoordIn;
+	o_texcoord = o_texcoordIn;
+	gl_Position = vec4(
+		vec2(-1.0, -1.0) + 2.0 * position / viewport,
+		0.0,
+		1.0);
+}
diff --git a/Telegram/shaders/pip_nv12.frag b/Telegram/shaders/pip_nv12.frag
new file mode 100644
index 00000000000000..1c9265dd9b978d
--- /dev/null
+++ b/Telegram/shaders/pip_nv12.frag
@@ -0,0 +1,69 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D y_texture;
+layout(binding = 2) uniform sampler2D uv_texture;
+layout(binding = 3) uniform sampler2D h_texture;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	vec4 roundRect;
+	float roundRadius;
+	vec4 fadeColor;
+	vec2 h_size;
+	vec4 h_extend;
+	vec4 h_components;
+};
+
+float roundedCorner(vec2 fc) {
+	vec2 rectHalf = roundRect.zw / 2.0;
+	vec2 rectCenter = roundRect.xy + rectHalf;
+	vec2 fromRectCenter = abs(fc - rectCenter);
+	vec2 vectorRadius = vec2(roundRadius + 0.5);
+	vec2 fromCenterWithRadius = fromRectCenter + vectorRadius;
+	vec2 fromRoundingCenter = max(fromCenterWithRadius, rectHalf) - rectHalf;
+	float rounded = length(fromRoundingCenter) - roundRadius;
+	return 1.0 - smoothstep(0.0, 1.0, rounded);
+}
+
+float shadow(vec2 fc) {
+	vec2 texcoord = fc - roundRect.xy + h_extend.xy;
+	vec2 total = roundRect.zw + h_extend.xy + h_extend.zw;
+	vec2 dividedTexcoord = texcoord / total;
+	float left = h_components.x / h_size.x;
+	float right = 1.0 - h_components.y / h_size.x;
+	float top = h_components.z / h_size.y;
+	float bottom = 1.0 - h_components.w / h_size.y;
+	float sampleX = dividedTexcoord.x < left
+		? dividedTexcoord.x * total.x / h_size.x
+		: dividedTexcoord.x > right
+			? 1.0 - (1.0 - dividedTexcoord.x) * total.x / h_size.x
+			: mix(left, right, (dividedTexcoord.x - left) / (right - left) * (h_size.x - h_components.x - h_components.y) / h_size.x + h_components.x / h_size.x);
+	float sampleY = dividedTexcoord.y < top
+		? dividedTexcoord.y * total.y / h_size.y
+		: dividedTexcoord.y > bottom
+			? 1.0 - (1.0 - dividedTexcoord.y) * total.y / h_size.y
+			: mix(top, bottom, (dividedTexcoord.y - top) / (bottom - top) * (h_size.y - h_components.z - h_components.w) / h_size.y + h_components.z / h_size.y);
+	return texture(h_texture, vec2(
+		clamp(sampleX, 0.0, 1.0),
+		clamp(sampleY, 0.0, 1.0))).a;
+}
+
+void main() {
+	vec2 fc = vec2(gl_FragCoord.x, viewport.y - gl_FragCoord.y);
+	float y = texture(y_texture, v_texcoord).r - 0.0625;
+	vec2 uv = texture(uv_texture, v_texcoord).rg - vec2(0.5, 0.5);
+	float u = uv.x;
+	float v = uv.y;
+	vec4 result = vec4(
+		1.164 * y + 1.596 * v,
+		1.164 * y - 0.392 * u - 0.813 * v,
+		1.164 * y + 2.017 * u,
+		1.0);
+	result = result * (1.0 - fadeColor.a) + fadeColor;
+	float corner = roundedCorner(fc);
+	float shadowValue = shadow(fc);
+	fragColor = result * corner + vec4(0.0, 0.0, 0.0, shadowValue) * (1.0 - corner);
+}
diff --git a/Telegram/shaders/pip_yuv420.frag b/Telegram/shaders/pip_yuv420.frag
new file mode 100644
index 00000000000000..42823556edee93
--- /dev/null
+++ b/Telegram/shaders/pip_yuv420.frag
@@ -0,0 +1,69 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D y_texture;
+layout(binding = 2) uniform sampler2D u_texture;
+layout(binding = 3) uniform sampler2D v_texture;
+layout(binding = 4) uniform sampler2D h_texture;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	vec4 roundRect;
+	float roundRadius;
+	vec4 fadeColor;
+	vec2 h_size;
+	vec4 h_extend;
+	vec4 h_components;
+};
+
+float roundedCorner(vec2 fc) {
+	vec2 rectHalf = roundRect.zw / 2.0;
+	vec2 rectCenter = roundRect.xy + rectHalf;
+	vec2 fromRectCenter = abs(fc - rectCenter);
+	vec2 vectorRadius = vec2(roundRadius + 0.5);
+	vec2 fromCenterWithRadius = fromRectCenter + vectorRadius;
+	vec2 fromRoundingCenter = max(fromCenterWithRadius, rectHalf) - rectHalf;
+	float rounded = length(fromRoundingCenter) - roundRadius;
+	return 1.0 - smoothstep(0.0, 1.0, rounded);
+}
+
+float shadow(vec2 fc) {
+	vec2 texcoord = fc - roundRect.xy + h_extend.xy;
+	vec2 total = roundRect.zw + h_extend.xy + h_extend.zw;
+	vec2 dividedTexcoord = texcoord / total;
+	float left = h_components.x / h_size.x;
+	float right = 1.0 - h_components.y / h_size.x;
+	float top = h_components.z / h_size.y;
+	float bottom = 1.0 - h_components.w / h_size.y;
+	float sampleX = dividedTexcoord.x < left
+		? dividedTexcoord.x * total.x / h_size.x
+		: dividedTexcoord.x > right
+			? 1.0 - (1.0 - dividedTexcoord.x) * total.x / h_size.x
+			: mix(left, right, (dividedTexcoord.x - left) / (right - left) * (h_size.x - h_components.x - h_components.y) / h_size.x + h_components.x / h_size.x);
+	float sampleY = dividedTexcoord.y < top
+		? dividedTexcoord.y * total.y / h_size.y
+		: dividedTexcoord.y > bottom
+			? 1.0 - (1.0 - dividedTexcoord.y) * total.y / h_size.y
+			: mix(top, bottom, (dividedTexcoord.y - top) / (bottom - top) * (h_size.y - h_components.z - h_components.w) / h_size.y + h_components.z / h_size.y);
+	return texture(h_texture, vec2(
+		clamp(sampleX, 0.0, 1.0),
+		clamp(sampleY, 0.0, 1.0))).a;
+}
+
+void main() {
+	vec2 fc = vec2(gl_FragCoord.x, viewport.y - gl_FragCoord.y);
+	float y = texture(y_texture, v_texcoord).r - 0.0625;
+	float u = texture(u_texture, v_texcoord).r - 0.5;
+	float v = texture(v_texture, v_texcoord).r - 0.5;
+	vec4 result = vec4(
+		1.164 * y + 1.596 * v,
+		1.164 * y - 0.392 * u - 0.813 * v,
+		1.164 * y + 2.017 * u,
+		1.0);
+	result = result * (1.0 - fadeColor.a) + fadeColor;
+	float corner = roundedCorner(fc);
+	float shadowValue = shadow(fc);
+	fragColor = result * corner + vec4(0.0, 0.0, 0.0, shadowValue) * (1.0 - corner);
+}
diff --git a/Telegram/shaders/premium_coin.frag b/Telegram/shaders/premium_coin.frag
new file mode 100644
index 00000000000000..8cbdb580a4772d
--- /dev/null
+++ b/Telegram/shaders/premium_coin.frag
@@ -0,0 +1,109 @@
+#version 450
+
+layout(location = 0) in vec3 vNormal;
+layout(location = 1) in vec2 vUV;
+layout(location = 2) in vec3 vObjPos;
+
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 2) uniform sampler2D u_Texture;
+layout(binding = 3) uniform sampler2D u_NormalMap;
+
+layout(std140, binding = 0) uniform Shared {
+	mat4 mvp;
+	mat4 world;
+	vec4 resolution;
+	vec4 misc; // (time, night, alpha, _)
+};
+
+layout(std140, binding = 1) uniform Draw {
+	vec4 drawParams; // (modelIndex, _, _, _)
+};
+
+// Four nested shells make up the coin, keyed by modelIndex:
+//   0 coin_outer, 1 coin_inner, 2 coin_logo, 3 coin_stars.
+void main() {
+	float modelIndex = drawParams.x;
+	float time = misc.x;
+	bool night = (misc.y > 0.5);
+	float alpha = misc.z;
+
+	vec2 uv = vUV;
+	if (modelIndex > 1.5 && modelIndex < 2.5) {
+		uv *= 2.0;
+		uv = fract(uv);
+	}
+	uv.x = 1.0 - uv.x;
+
+	float diagonal = ((uv.x + uv.y) / 2.0 - 0.15) / 0.6;
+	vec3 baseColor;
+	if (modelIndex < 0.5) {
+		baseColor = mix(
+			vec3(0.95686, 0.47451, 0.93725),
+			vec3(0.46274, 0.49411, 0.99600),
+			diagonal);
+	} else if (modelIndex > 2.5) {
+		baseColor = mix(
+			vec3(0.95686, 0.47451, 0.93725),
+			vec3(0.46274, 0.49411, 0.99600),
+			diagonal);
+		baseColor = mix(baseColor, vec3(1.0), 0.3);
+	} else if (modelIndex < 1.5) {
+		baseColor = mix(
+			vec3(0.67059, 0.25490, 0.80000),
+			vec3(0.39608, 0.18824, 0.98039),
+			diagonal);
+	} else {
+		baseColor = mix(
+			vec3(0.91373, 0.62353, 0.99608),
+			vec3(0.67451, 0.58824, 1.00000),
+			clamp((uv.y - 0.1) / 0.8, 0.0, 1.0));
+		baseColor = mix(
+			baseColor,
+			vec3(1.0),
+			0.1 + 0.45 * texture(u_Texture, vUV).a);
+		if (night) {
+			baseColor = mix(baseColor, vec3(0.0), 0.06);
+		}
+	}
+
+	vec3 pos = vObjPos / 100.0 + 0.5;
+	vec3 norm = normalize(vec3(world * vec4(vNormal, 0.0)));
+
+	vec3 flecksLightDir = normalize(vec3(0.5) - pos);
+	vec3 flecksReflectDir = reflect(-flecksLightDir, norm);
+	float flecksSpec = pow(
+		max(dot(normalize(vec3(0.0) - pos), flecksReflectDir), 0.0),
+		8.0);
+	vec3 flecksNormal = normalize(texture(
+		u_NormalMap,
+		(uv * 1.3 + vec2(0.02, 0.06) * time) * 2.0).xyz * 2.0 - 1.0);
+	norm += flecksSpec * flecksNormal;
+	norm = normalize(norm);
+
+	vec3 lightPos = vec3(-3.0, -3.0, 20.0);
+	float diffuse = max(dot(norm, normalize(lightPos - pos)), 0.0);
+
+	float spec = 0.0;
+	lightPos = vec3(-3.0, -3.0, 0.5);
+	spec += 2.0 * pow(
+		max(dot(normalize(vec3(0.0) - pos),
+			reflect(-normalize(lightPos - pos), norm)), 0.0),
+		2.0);
+	lightPos = vec3(-3.0, 0.5, 30.0);
+	spec += ((modelIndex > 0.5 && modelIndex < 1.5) ? 1.5 : 0.5) * pow(
+		max(dot(normalize(vec3(0.0) - pos),
+			reflect(-normalize(lightPos - pos), norm)), 0.0),
+		32.0);
+
+	if (modelIndex >= 0.5) {
+		spec *= 0.25;
+	}
+
+	vec3 color = baseColor;
+	color *= 0.94 + 0.22 * diffuse;
+	color = mix(color, vec3(1.0), spec);
+
+	float a = alpha;
+	fragColor = vec4(color * a, a);
+}
diff --git a/Telegram/shaders/premium_coin.vert b/Telegram/shaders/premium_coin.vert
new file mode 100644
index 00000000000000..bf9b3b172e7d6e
--- /dev/null
+++ b/Telegram/shaders/premium_coin.vert
@@ -0,0 +1,23 @@
+#version 450
+
+layout(location = 0) in vec3 inPosition;
+layout(location = 1) in vec3 inNormal;
+layout(location = 2) in vec2 inUV;
+
+layout(std140, binding = 0) uniform Shared {
+	mat4 mvp;
+	mat4 world;
+	vec4 resolution;
+	vec4 misc; // (time, night, alpha, _)
+};
+
+layout(location = 0) out vec3 vNormal;
+layout(location = 1) out vec2 vUV;
+layout(location = 2) out vec3 vObjPos;
+
+void main() {
+	vNormal = inNormal;
+	vUV = inUV;
+	vObjPos = inPosition;
+	gl_Position = mvp * vec4(inPosition, 1.0);
+}
diff --git a/Telegram/shaders/premium_diamond.frag b/Telegram/shaders/premium_diamond.frag
new file mode 100644
index 00000000000000..ffdc3d52900a5c
--- /dev/null
+++ b/Telegram/shaders/premium_diamond.frag
@@ -0,0 +1,107 @@
+#version 450
+
+layout(location = 0) in vec3 vNormal;
+layout(location = 1) in vec3 objPos;
+
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform Shared {
+	mat4 mvp;
+	mat4 world;
+	vec4 resolution;
+	vec4 misc; // (time, night, alpha, _)
+};
+
+layout(std140, binding = 1) uniform Draw {
+	vec4 drawParams; // (modelIndex, behind, _, _)
+};
+
+vec3 grad3(
+		float x1, vec3 y1,
+		float x2, vec3 y2,
+		float x3, vec3 y3,
+		float t) {
+	if (t < x1) {
+		return y1;
+	} else if (t < x2) {
+		return mix(y1, y2, (t - x1) / (x2 - x1));
+	} else if (t < x3) {
+		return mix(y2, y3, (t - x2) / (x3 - x2));
+	}
+	return y3;
+}
+
+void main() {
+	float modelIndex = drawParams.x;
+	bool behind = (drawParams.y > 0.5);
+	float time = misc.x;
+	bool night = (misc.y > 0.5);
+	float alpha = misc.z;
+
+	vec3 col = vec3(0.0);
+	float a = 0.0;
+	if (modelIndex < 0.5) {
+		if (behind) {
+			col = night
+				? vec3(0.141, 0.341, 0.663)  // #2457A9
+				: vec3(0.118, 0.412, 0.910); // #1E69E8
+			a = 1.0;
+		} else {
+			// A single diagonal shine sweeping from lower-left to upper-right once
+			// per cycle. The original periodic band repeated more often than the
+			// quad is wide, so a stale stripe flashed at the far (upper-right) end
+			// on the first frames of every cycle; a single pass avoids that.
+			float phase = fract(time / 9.0);
+			float visible = 1.1 / 16.2;
+			if (phase > visible) {
+				discard;
+			}
+			float sweep = phase / visible;
+			vec2 pos = 3.0 * gl_FragCoord.xy / resolution.xy;
+			float diag = pos.x - pos.y;
+			float center = mix(-4.5, 4.5, sweep);
+			float dist = diag - center;
+			float body = (dist >= 0.0 && dist < 0.75) ? 0.4 : 0.0;
+			float lead = (dist >= 1.0 && dist < 1.25) ? 0.4 : 0.0;
+			a = max(body, lead);
+			col = vec3(1.0);
+		}
+	} else if (modelIndex < 1.5) {
+		vec3 p = objPos / 10.0 + 0.5;
+		vec3 n = normalize((world * vec4(vNormal, 0.0)).xyz);
+		if (behind) {
+			float d = max(dot(n, normalize(vec3(-3.0, 20.0, 20.0) - p)), 0.0);
+			col = mix(
+				vec3(0.35, 0.59, 0.94),
+				vec3(0.52, 0.70, 0.97),
+				clamp(d, 0.0, 1.0));
+			a = 1.0;
+		} else {
+			float s = 0.0;
+			s += 0.5 * pow(max(dot(normalize(-p),
+				reflect(-normalize(vec3(0.0, -100.0, 50.0) - p), n)), 0.0), 2.0);
+			s += 0.4 * pow(max(dot(normalize(-p),
+				reflect(-normalize(vec3(0.0) - p), n)), 0.0), 2.0);
+			if (!night) {
+				s *= 0.5;
+			}
+			col = vec3(1.0);
+			a = s;
+		}
+	} else {
+		vec3 p = objPos / 10.0 + 0.5;
+		vec3 n = normalize((world * vec4(vNormal, 0.0)).xyz);
+		float d = max(dot(n, normalize(vec3(-8.0, 12.0, 20.0) - p)), 0.0);
+		float s = 0.75 * pow(max(dot(normalize(-p),
+			reflect(-normalize(vec3(20.0, -150.0, 50.0) - p), n)), 0.0), 2.0);
+		col = grad3(
+			0.0, vec3(0.345, 0.659, 0.965),  // #58A8F6
+			0.58, vec3(0.557, 0.831, 0.984), // #8ED4FB
+			1.0, vec3(0.808, 0.910, 0.992),  // #CEE8FD
+			d);
+		col += vec3(0.773, 0.898, 0.988) * s; // #C5E5FC
+		a = 1.0;
+	}
+	a *= alpha;
+	fragColor = vec4(col * a, a);
+}
diff --git a/Telegram/shaders/premium_diamond.vert b/Telegram/shaders/premium_diamond.vert
new file mode 100644
index 00000000000000..f6a66902086f0b
--- /dev/null
+++ b/Telegram/shaders/premium_diamond.vert
@@ -0,0 +1,20 @@
+#version 450
+
+layout(location = 0) in vec3 inPosition;
+layout(location = 1) in vec3 inNormal;
+
+layout(std140, binding = 0) uniform Shared {
+	mat4 mvp;
+	mat4 world;
+	vec4 resolution;
+	vec4 misc; // (time, night, alpha, _)
+};
+
+layout(location = 0) out vec3 vNormal;
+layout(location = 1) out vec3 objPos;
+
+void main() {
+	vNormal = inNormal;
+	objPos = inPosition;
+	gl_Position = mvp * vec4(inPosition, 1.0);
+}
diff --git a/Telegram/shaders/premium_star.frag b/Telegram/shaders/premium_star.frag
new file mode 100644
index 00000000000000..17b81bc34584da
--- /dev/null
+++ b/Telegram/shaders/premium_star.frag
@@ -0,0 +1,134 @@
+#version 450
+
+layout(location = 0) in vec3 vNormal;
+layout(location = 1) in vec2 vUV;
+layout(location = 2) in vec3 vObjPos;
+
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D u_Texture;
+layout(binding = 2) uniform sampler2D u_NormalMap;
+
+layout(std140, binding = 0) uniform Params {
+	mat4 mvp;
+	mat4 world;
+	vec4 grad1;
+	vec4 grad2;
+	vec4 params;
+	vec4 extra;
+};
+
+float goldenSpec(vec3 lightPos, vec3 pos, vec3 norm, vec3 eyeDir, float k) {
+	vec3 refl = reflect(-normalize(lightPos - pos), norm);
+	return clamp(k * pow(max(dot(eyeDir, refl), 0.0), 2.0), 0.0, 1.0);
+}
+
+vec4 goldenStar() {
+	float f_xOffset = params.x;
+	float alpha = extra.y;
+	float white = extra.w;
+	vec3 gradientColor1 = grad1.rgb;
+	vec3 gradientColor2 = grad2.rgb;
+
+	vec3 pos = vObjPos / 100.0 + 0.5;
+	float specTexture = texture(u_Texture, vUV).y * clamp(vNormal.z, 0.0, 1.0);
+
+	float gradientMix = clamp(
+		distance(pos.xy, vec2(1.0, 1.0)) - 0.05 * specTexture,
+		0.0,
+		1.0);
+	vec4 color = vec4(mix(gradientColor1, gradientColor2, gradientMix), 1.0);
+
+	vec3 norm = normalize(vec3(world * vec4(vNormal, 0.0)));
+	vec3 flecksNormal = normalize(1.0 - texture(
+		u_NormalMap,
+		(vUV + 0.7 * vec2(-f_xOffset, f_xOffset)) * 2.0).xyz);
+	vec3 eyeDir = normalize(vec3(0.0) - pos);
+
+	float diffuse = max(dot(norm, normalize(vec3(-3.0, -3.0, 20.0) - pos)), 0.0);
+
+	float spec = 0.0;
+	spec += specTexture * goldenSpec(vec3(-1.0, 0.7, 0.2), pos, norm, eyeDir, 2.0) / 6.0;
+	spec += specTexture * goldenSpec(vec3(8.0, 0.7, 0.5), pos, norm, eyeDir, 2.0) / 6.0;
+	spec += goldenSpec(vec3(-3.0, -3.0, 0.5), pos, norm, eyeDir, 2.0) / 4.0;
+	spec += goldenSpec(vec3(4.0, 3.0, 2.5), pos, norm, eyeDir, 1.5) / 6.0;
+	spec += goldenSpec(vec3(-33.0, 0.5, 30.0), pos, norm, eyeDir, 2.0) / 12.0;
+	spec = clamp(spec, 0.0, 0.7);
+	spec += mix(0.8, 1.0, specTexture)
+		* goldenSpec(vec3(10.0, 0.5, 3.3), pos, norm, eyeDir, 2.0) / 8.0;
+	spec += mix(0.8, 1.0, specTexture)
+		* goldenSpec(vec3(-10.0, 0.5, 3.7), pos, norm, eyeDir, 2.0) / 8.0;
+	spec += mix(0.8, 1.0, specTexture)
+		* goldenSpec(vec3(0.5, 12.0, 1.5), pos, norm, eyeDir, 2.0) / 8.0;
+	spec = clamp(spec, 0.0, 0.9);
+
+	color = mix(vec4(vec3(0.0), 1.0), color, 0.8 + 0.3 * diffuse);
+	vec4 specColor = vec4(mix(1.8, 2.0, specTexture) * gradientColor1, 1.0);
+	color = mix(color, specColor, spec);
+
+	float flecksSpec = goldenSpec(vec3(1.2, -0.2, 0.5), pos, norm, eyeDir, 2.0);
+	color = mix(
+		color,
+		specColor,
+		clamp(flecksSpec * abs(vNormal.z) * flecksNormal.z, 0.2, 0.3) - 0.2);
+
+	return mix(color * alpha, vec4(1.0), white);
+}
+
+void main() {
+	if (extra.z > 0.5) {
+		fragColor = goldenStar();
+		return;
+	}
+
+	float f_xOffset = params.x;
+	float spec1 = params.y;
+	float spec2 = params.z;
+	float u_diffuse = params.w;
+	float normalSpec = extra.x;
+	float alpha = extra.y;
+	vec3 gradientColor1 = grad1.rgb;
+	vec3 gradientColor2 = grad2.rgb;
+	vec3 normalSpecColor = vec3(1.0);
+
+	vec3 cameraPosition = vec3(0.0, 0.0, 100.0);
+	vec3 vLightPosition2 = vec3(-400.0, 400.0, 400.0);
+	vec3 vLightPosition4 = vec3(0.0, 0.0, 100.0);
+	vec3 vLightPositionNormal = vec3(100.0, -200.0, 400.0);
+
+	vec3 vNormalW = normalize(vec3(world * vec4(vNormal, 0.0)));
+	vec3 vTextureNormal = normalize(
+		texture(u_NormalMap, (vUV + vec2(-f_xOffset, f_xOffset)) * 2.0).xyz
+			* 2.0 - 1.0);
+	vec3 finalNormal = normalize(vNormalW + vTextureNormal);
+
+	vec3 color = texture(u_Texture, vUV).xyz;
+	vec3 viewDirectionW = normalize(cameraPosition);
+
+	vec3 angleW = normalize(viewDirectionW + vLightPosition2);
+	float specComp2 = pow(max(0.0, dot(vNormalW, angleW)), 128.0) * spec1;
+
+	angleW = normalize(viewDirectionW + vLightPosition4);
+	float specComp3 = pow(max(0.0, dot(vNormalW, angleW)), 30.0) * spec2;
+
+	float diffuse = max(dot(vNormalW, viewDirectionW), 1.0 - u_diffuse);
+
+	float mixValue = distance(vUV, vec2(1.0, 0.0));
+	vec3 gradientColorFinal = mix(gradientColor1, gradientColor2, mixValue);
+
+	angleW = normalize(viewDirectionW + vLightPositionNormal);
+	float normalSpecComp = pow(max(0.0, dot(finalNormal, angleW)), 128.0)
+		* normalSpec;
+
+	angleW = normalize(viewDirectionW + vLightPosition2);
+	float normalSpecComp2 = pow(max(0.0, dot(finalNormal, angleW)), 128.0)
+		* normalSpec;
+
+	vec3 normalSpecFinal = normalSpecColor * (normalSpecComp + normalSpecComp2);
+	vec3 specFinal = color * (specComp2 + specComp3);
+
+	vec3 lit = gradientColorFinal + specFinal + normalSpecFinal;
+
+	float outAlpha = clamp(diffuse, 0.0, 1.0) * alpha;
+	fragColor = vec4(lit * outAlpha, outAlpha);
+}
diff --git a/Telegram/shaders/premium_star.vert b/Telegram/shaders/premium_star.vert
new file mode 100644
index 00000000000000..d3d6a4294d2fbb
--- /dev/null
+++ b/Telegram/shaders/premium_star.vert
@@ -0,0 +1,25 @@
+#version 450
+
+layout(location = 0) in vec3 inPosition;
+layout(location = 1) in vec3 inNormal;
+layout(location = 2) in vec2 inUV;
+
+layout(location = 0) out vec3 vNormal;
+layout(location = 1) out vec2 vUV;
+layout(location = 2) out vec3 vObjPos;
+
+layout(std140, binding = 0) uniform Params {
+	mat4 mvp;
+	mat4 world;
+	vec4 grad1;
+	vec4 grad2;
+	vec4 params;
+	vec4 extra;
+};
+
+void main() {
+	vNormal = inNormal;
+	vUV = inUV;
+	vObjPos = inPosition;
+	gl_Position = mvp * vec4(inPosition, 1.0);
+}
diff --git a/Telegram/shaders/rounded_corners.frag b/Telegram/shaders/rounded_corners.frag
new file mode 100644
index 00000000000000..c6b289d50a245c
--- /dev/null
+++ b/Telegram/shaders/rounded_corners.frag
@@ -0,0 +1,25 @@
+#version 450
+
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	vec4 roundRect;
+	float roundRadius;
+};
+
+float roundedCorner() {
+	vec2 fragCoord = vec2(gl_FragCoord.x, viewport.y - gl_FragCoord.y);
+	vec2 rectHalf = roundRect.zw / 2.0;
+	vec2 rectCenter = roundRect.xy + rectHalf;
+	vec2 fromRectCenter = abs(fragCoord - rectCenter);
+	vec2 vectorRadius = vec2(roundRadius + 0.5);
+	vec2 fromCenterWithRadius = fromRectCenter + vectorRadius;
+	vec2 fromRoundingCenter = max(fromCenterWithRadius, rectHalf) - rectHalf;
+	float rounded = length(fromRoundingCenter) - roundRadius;
+	return 1.0 - smoothstep(0.0, 1.0, rounded);
+}
+
+void main() {
+	fragColor = vec4(1.0) * roundedCorner();
+}
diff --git a/Telegram/shaders/static_content.frag b/Telegram/shaders/static_content.frag
new file mode 100644
index 00000000000000..8448348c55fdb3
--- /dev/null
+++ b/Telegram/shaders/static_content.frag
@@ -0,0 +1,52 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D s_texture;
+layout(binding = 2) uniform sampler2D f_texture;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	vec4 shadowTopRect;
+	vec4 shadowBottomSkipOpacityFullFade;
+	vec4 roundRect;
+	float roundRadius;
+};
+
+float roundedCorner(vec2 fragCoord) {
+	vec2 rectHalf = roundRect.zw / 2.0;
+	vec2 rectCenter = roundRect.xy + rectHalf;
+	vec2 fromRectCenter = abs(fragCoord - rectCenter);
+	vec2 vectorRadius = vec2(roundRadius + 0.5);
+	vec2 fromCenterWithRadius = fromRectCenter + vectorRadius;
+	vec2 fromRoundingCenter = max(fromCenterWithRadius, rectHalf) - rectHalf;
+	float rounded = length(fromRoundingCenter) - roundRadius;
+	return 1.0 - smoothstep(0.0, 1.0, rounded);
+}
+
+void main() {
+	vec2 fragCoord = vec2(gl_FragCoord.x, viewport.y - gl_FragCoord.y);
+	vec4 result = texture(s_texture, v_texcoord);
+
+	float topHeight = shadowTopRect.w;
+	float bottomHeight = shadowBottomSkipOpacityFullFade.x;
+	float bottomSkip = shadowBottomSkipOpacityFullFade.y;
+	float opacity = shadowBottomSkipOpacityFullFade.z;
+	float fullFade = shadowBottomSkipOpacityFullFade.w;
+	float viewportHeight = shadowTopRect.y + topHeight;
+	float fullHeight = topHeight + bottomHeight;
+	float topY = min(
+		(viewportHeight - fragCoord.y) / fullHeight,
+		topHeight / fullHeight);
+	float topX = (fragCoord.x - shadowTopRect.x) / shadowTopRect.z;
+	vec4 fadeTop = texture(f_texture, vec2(topX, topY)) * opacity;
+	float bottomY = max(bottomSkip + fullHeight - fragCoord.y, topHeight)
+		/ fullHeight;
+	vec4 fadeBottom = texture(f_texture, vec2(0.5, bottomY)) * opacity;
+	float fade = min((1.0 - fadeTop.a) * (1.0 - fadeBottom.a), fullFade);
+	result.rgb = result.rgb * fade;
+
+	result *= roundedCorner(fragCoord);
+	fragColor = result;
+}
diff --git a/Telegram/shaders/thanos.frag b/Telegram/shaders/thanos.frag
new file mode 100644
index 00000000000000..3510c87a1a144a
--- /dev/null
+++ b/Telegram/shaders/thanos.frag
@@ -0,0 +1,16 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 1) in float v_alpha;
+
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D tex;
+
+void main() {
+	if (v_alpha <= 0.0) {
+		discard;
+	}
+	vec4 color = texture(tex, vec2(v_texcoord.x, 1.0 - v_texcoord.y));
+	fragColor = color * v_alpha;
+}
diff --git a/Telegram/shaders/thanos.vert b/Telegram/shaders/thanos.vert
new file mode 100644
index 00000000000000..385cb1afdf9a21
--- /dev/null
+++ b/Telegram/shaders/thanos.vert
@@ -0,0 +1,49 @@
+#version 450
+
+layout(location = 0) in vec2 inQuadPos;
+
+layout(location = 0) out vec2 v_texcoord;
+layout(location = 1) out float v_alpha;
+
+layout(binding = 2) uniform sampler2D particleStateTex;
+
+layout(std140, binding = 0) uniform Params {
+	vec4 rect;
+	vec2 size;
+	uvec2 particleResolution;
+	vec4 scale;
+};
+
+void main() {
+	uint particleId = uint(gl_InstanceIndex);
+	uint pX = particleId % particleResolution.x;
+	uint pY = particleId / particleResolution.x;
+
+	vec4 state = texelFetch(
+		particleStateTex,
+		ivec2(int(pX), int(pY)),
+		0);
+	vec2 inOffset = state.xy;
+	float inLifetime = state.z;
+
+	vec2 particleSize = size / vec2(particleResolution);
+
+	vec2 topLeft = vec2(float(pX) * particleSize.x, float(pY) * particleSize.y);
+	v_texcoord = (topLeft + inQuadPos * particleSize) / size;
+
+	topLeft += inOffset;
+	float scaleFactor = scale.x;
+	vec2 center = topLeft + (particleSize * 0.5);
+	vec2 position
+		= center + ((inQuadPos - vec2(0.5)) * particleSize * scaleFactor);
+
+	vec2 ndc;
+	ndc.x = rect.x + position.x / size.x * rect.z;
+	ndc.y = rect.y + position.y / size.y * rect.w;
+	ndc.x = -1.0 + ndc.x * 2.0;
+	ndc.y = -1.0 + ndc.y * 2.0;
+
+	gl_Position = vec4(ndc, 0.0, 1.0);
+
+	v_alpha = clamp(inLifetime / 0.6, 0.0, 1.0) * scale.z;
+}
diff --git a/Telegram/shaders/thanos_init.comp b/Telegram/shaders/thanos_init.comp
new file mode 100644
index 00000000000000..e72f7fedc9a6e4
--- /dev/null
+++ b/Telegram/shaders/thanos_init.comp
@@ -0,0 +1,48 @@
+#version 450
+
+layout(local_size_x = 64) in;
+
+layout(rgba32f, binding = 0) uniform image2D particleStateImage;
+layout(rgba32f, binding = 2) uniform image2D particleVelocityImage;
+
+layout(std140, binding = 1) uniform Params {
+	uint particleCountX;
+	uint particleCountY;
+	uint seed;
+	uint _pad;
+};
+
+uint hash(uint x) {
+	x ^= x >> 16u;
+	x *= 0x45d9f3bu;
+	x ^= x >> 16u;
+	x *= 0x45d9f3bu;
+	x ^= x >> 16u;
+	return x;
+}
+
+float hashFloat(uint x) {
+	return float(hash(x)) / float(0xFFFFFFFFu);
+}
+
+void main() {
+	uint gid = gl_GlobalInvocationID.x;
+	uint count = particleCountX * particleCountY;
+	if (gid >= count) {
+		return;
+	}
+
+	uint s = gid * 3u + seed;
+
+	float direction = hashFloat(s) * (3.14159265 * 2.0);
+	float speed = (0.1 + hashFloat(s + 1u) * 0.1) * 320.0;
+
+	vec2 velocity = vec2(cos(direction) * speed, sin(direction) * speed);
+	float lifetime = 1.5 + hashFloat(s + 2u) * 1.5;
+
+	ivec2 coord = ivec2(
+		int(gid % particleCountX),
+		int(gid / particleCountX));
+	imageStore(particleStateImage, coord, vec4(0.0, 0.0, lifetime, 0.0));
+	imageStore(particleVelocityImage, coord, vec4(velocity, 0.0, 0.0));
+}
diff --git a/Telegram/shaders/thanos_update.comp b/Telegram/shaders/thanos_update.comp
new file mode 100644
index 00000000000000..de605b74906ac0
--- /dev/null
+++ b/Telegram/shaders/thanos_update.comp
@@ -0,0 +1,54 @@
+#version 450
+
+layout(local_size_x = 64) in;
+
+layout(rgba32f, binding = 0) uniform image2D particleStateImage;
+layout(rgba32f, binding = 2) uniform image2D particleVelocityImage;
+
+layout(std140, binding = 1) uniform Params {
+	uint particleCountX;
+	uint particleCountY;
+	float phase;
+	float timeStep;
+};
+
+float easeInWindow(float fraction, float t) {
+	float windowSize = 0.8;
+	float windowStart = -windowSize;
+	float windowEnd = 1.0;
+	float windowPos = (1.0 - fraction) * windowStart + fraction * windowEnd;
+	float windowT = clamp(t - windowPos, 0.0, windowSize) / windowSize;
+	return 1.0 - windowT;
+}
+
+void main() {
+	uint gid = gl_GlobalInvocationID.x;
+	uint count = particleCountX * particleCountY;
+	if (gid >= count) {
+		return;
+	}
+
+	float easeInDuration = 0.8;
+	float effectFraction = clamp(phase, 0.0, easeInDuration) / easeInDuration;
+
+	uint particleX = gid % particleCountX;
+	float particleXFraction = float(particleX) / float(particleCountX);
+	float particleFraction = easeInWindow(effectFraction, particleXFraction);
+
+	ivec2 coord = ivec2(
+		int(particleX),
+		int(gid / particleCountX));
+
+	vec4 state = imageLoad(particleStateImage, coord);
+	vec2 offset = state.xy;
+	float lifetime = state.z;
+
+	vec2 velocity = imageLoad(particleVelocityImage, coord).xy;
+
+	offset += velocity * timeStep * particleFraction;
+	velocity.y += 80.0 * timeStep * particleFraction;
+	lifetime = max(0.0, lifetime - 0.6 * timeStep * particleFraction);
+
+	imageStore(particleStateImage, coord, vec4(offset, lifetime, 0.0));
+	imageStore(particleVelocityImage, coord, vec4(velocity, 0.0, 0.0));
+}
diff --git a/Telegram/shaders/transparent_content.frag b/Telegram/shaders/transparent_content.frag
new file mode 100644
index 00000000000000..5014e00255c8fe
--- /dev/null
+++ b/Telegram/shaders/transparent_content.frag
@@ -0,0 +1,46 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D s_texture;
+layout(binding = 2) uniform sampler2D f_texture;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	vec4 shadowTopRect;
+	vec4 shadowBottomSkipOpacityFullFade;
+	vec4 transparentBg;
+	vec4 transparentFg;
+	float transparentSize;
+};
+
+void main() {
+	vec2 fragCoord = vec2(gl_FragCoord.x, viewport.y - gl_FragCoord.y);
+	vec4 result = texture(s_texture, v_texcoord);
+
+	vec2 checkboardLadder = floor(fragCoord / transparentSize);
+	float checkboard = mod(checkboardLadder.x + checkboardLadder.y, 2.0);
+	vec4 bg = mix(transparentBg, transparentFg, checkboard);
+	result = vec4(result.rgb * result.a + bg.rgb * (1.0 - result.a), 1.0);
+
+	float topHeight = shadowTopRect.w;
+	float bottomHeight = shadowBottomSkipOpacityFullFade.x;
+	float bottomSkip = shadowBottomSkipOpacityFullFade.y;
+	float opacity = shadowBottomSkipOpacityFullFade.z;
+	float fullFade = shadowBottomSkipOpacityFullFade.w;
+	float viewportHeight = shadowTopRect.y + topHeight;
+	float fullHeight = topHeight + bottomHeight;
+	float topY = min(
+		(viewportHeight - fragCoord.y) / fullHeight,
+		topHeight / fullHeight);
+	float topX = (fragCoord.x - shadowTopRect.x) / shadowTopRect.z;
+	vec4 fadeTop = texture(f_texture, vec2(topX, topY)) * opacity;
+	float bottomY = max(bottomSkip + fullHeight - fragCoord.y, topHeight)
+		/ fullHeight;
+	vec4 fadeBottom = texture(f_texture, vec2(0.5, bottomY)) * opacity;
+	float fade = min((1.0 - fadeTop.a) * (1.0 - fadeBottom.a), fullFade);
+	result.rgb = result.rgb * fade;
+
+	fragColor = result;
+}
diff --git a/Telegram/shaders/yuv420.frag b/Telegram/shaders/yuv420.frag
new file mode 100644
index 00000000000000..3a070a0de8cbc7
--- /dev/null
+++ b/Telegram/shaders/yuv420.frag
@@ -0,0 +1,19 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D y_texture;
+layout(binding = 2) uniform sampler2D u_texture;
+layout(binding = 3) uniform sampler2D v_texture;
+
+void main() {
+	float y = texture(y_texture, v_texcoord).r - 0.0625;
+	float u = texture(u_texture, v_texcoord).r - 0.5;
+	float v = texture(v_texture, v_texcoord).r - 0.5;
+	fragColor = vec4(
+		1.164 * y + 1.596 * v,
+		1.164 * y - 0.392 * u - 0.813 * v,
+		1.164 * y + 2.017 * u,
+		1.0);
+}
diff --git a/Telegram/shaders/yuv420_content.frag b/Telegram/shaders/yuv420_content.frag
new file mode 100644
index 00000000000000..ebe013e39ffe1a
--- /dev/null
+++ b/Telegram/shaders/yuv420_content.frag
@@ -0,0 +1,61 @@
+#version 450
+
+layout(location = 0) in vec2 v_texcoord;
+layout(location = 0) out vec4 fragColor;
+
+layout(binding = 1) uniform sampler2D y_texture;
+layout(binding = 2) uniform sampler2D u_texture;
+layout(binding = 3) uniform sampler2D v_texture;
+layout(binding = 4) uniform sampler2D f_texture;
+
+layout(std140, binding = 0) uniform Params {
+	vec2 viewport;
+	vec4 shadowTopRect;
+	vec4 shadowBottomSkipOpacityFullFade;
+	vec4 roundRect;
+	float roundRadius;
+};
+
+float roundedCorner(vec2 fragCoord) {
+	vec2 rectHalf = roundRect.zw / 2.0;
+	vec2 rectCenter = roundRect.xy + rectHalf;
+	vec2 fromRectCenter = abs(fragCoord - rectCenter);
+	vec2 vectorRadius = vec2(roundRadius + 0.5);
+	vec2 fromCenterWithRadius = fromRectCenter + vectorRadius;
+	vec2 fromRoundingCenter = max(fromCenterWithRadius, rectHalf) - rectHalf;
+	float rounded = length(fromRoundingCenter) - roundRadius;
+	return 1.0 - smoothstep(0.0, 1.0, rounded);
+}
+
+void main() {
+	vec2 fragCoord = vec2(gl_FragCoord.x, viewport.y - gl_FragCoord.y);
+	float y = texture(y_texture, v_texcoord).r - 0.0625;
+	float u = texture(u_texture, v_texcoord).r - 0.5;
+	float v = texture(v_texture, v_texcoord).r - 0.5;
+	vec4 result = vec4(
+		1.164 * y + 1.596 * v,
+		1.164 * y - 0.392 * u - 0.813 * v,
+		1.164 * y + 2.017 * u,
+		1.0);
+
+	float topHeight = shadowTopRect.w;
+	float bottomHeight = shadowBottomSkipOpacityFullFade.x;
+	float bottomSkip = shadowBottomSkipOpacityFullFade.y;
+	float opacity = shadowBottomSkipOpacityFullFade.z;
+	float fullFade = shadowBottomSkipOpacityFullFade.w;
+	float viewportHeight = shadowTopRect.y + topHeight;
+	float fullHeight = topHeight + bottomHeight;
+	float topY = min(
+		(viewportHeight - fragCoord.y) / fullHeight,
+		topHeight / fullHeight);
+	float topX = (fragCoord.x - shadowTopRect.x) / shadowTopRect.z;
+	vec4 fadeTop = texture(f_texture, vec2(topX, topY)) * opacity;
+	float bottomY = max(bottomSkip + fullHeight - fragCoord.y, topHeight)
+		/ fullHeight;
+	vec4 fadeBottom = texture(f_texture, vec2(0.5, bottomY)) * opacity;
+	float fade = min((1.0 - fadeTop.a) * (1.0 - fadeBottom.a), fullFade);
+	result.rgb = result.rgb * fade;
+
+	result *= roundedCorner(fragCoord);
+	fragColor = result;
+}
diff --git a/changelog.txt b/changelog.txt
index 776affea694905..6608e5f513364a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,753 @@
+6.9.3 (12.06.26)
+
+- Fix possible crash in formula parsing.
+- Fix field resize after Undo/Redo.
+- Fix OpenGL in Windows build.
+
+6.9.2 (10.06.26)
+
+- Fix possible crash in OpenGL init (Linux).
+- Fix possible crash in calls (Windows on ARM).
+- Fix working with system proxy (Windows).
+- Fix display of rich messages without text.
+- Fix display of rich messages in Recent Actions.
+- Replace dispatch with TooManyCooks (Linux).
+
+6.9.1 (09.06.26)
+
+- Fix sending several same custom emoji.
+- Fix some rich messages layout glitches.
+
+6.9 (09.06.26)
+
+- Rich Text Formatting for Bots.
+- Guardian Bots for Group Chats.
+- Links in Poll Options.
+- Viewer for Markdown files in .md format.
+- Instant View that's really instant.
+
+6.8.5 beta (04.06.26)
+
+- Animated 3D objects on settings covers (premium star, coin, diamond).
+- Particle effects for one-time voice message playback.
+- Birthday celebration effect on profile.
+- Poll votes graph in message statistics.
+- Separate send action animation for round video messages.
+- Open public channels from chat folder invite links.
+- Notify toggle and muted icon for silent scheduled messages.
+- Per-window Qt RHI renderer activation.
+- Fix empty chat list preview after deleting last message.
+- Fix shaking of pinned chats dragged past rows of other heights.
+- Fix scroll with keyboard in chat history.
+- Fix pause of animated reactions when opening their context menu.
+- Improve performance with RHI enabled.
+
+6.8.4 beta (27.05.26)
+
+- Drag-and-drop of photos into chats.
+- Testing Qt RHI renderer on macOS and Windows on ARM.
+- Native external webapp viewer on Linux by default.
+- Frequent contacts and search in gift recipient picker.
+- Fix passcode bypass via separate windows opened while locked.
+- Fix clickable timestamps in blockquote.
+- Fix never ending download progress in web apps.
+- Fix borders in Instant View tables.
+- Fix several possible crashes.
+
+6.8.3 beta (19.05.26)
+
+- In-app markdown file viewer.
+- Native Instant View support.
+- Native external webapp viewer on Linux.
+- Screen reader support for chat list and message list.
+- Fix Ctrl+Shift+V on non-English layouts.
+- Upgrade to Qt 6.11.1 on macOS and Linux.
+- Test QRhi for Thanos effect on Qt 6.11.1.
+
+6.8.2 (12.05.26)
+
+- Fix non-premium sending of existing custom reactions.
+- Fix sending reactions to groups you're not part of.
+- Fix viewing emoji packs from emoji search results.
+- Fix portrait 4K video playback.
+- Fix lost caption on forwarded polls.
+- Fix possible crash in reaction reports.
+- Fix possible crash in gift message display.
+- Return "Chatbots" to Telegram Business.
+- Separate badge background color keys for sidebar buttons.
+
+6.8.1 (08.05.26)
+
+- Fix crash in anonymous group admins messages.
+- Fix reactions sending in channels.
+
+6.8.0 (07.05.26)
+
+- Get answers from AI bots in any chat by tagging their @username.
+- Connect a bot to your profile with the new Chat Automation.
+- Custom AI styles in text editor with cloud-based tones and sharing.
+- Advanced emoji and stickers search by keywords.
+- Poll statistics chart and subscriber/country-based vote restrictions.
+- Delete specific reactions and restrict reactions in groups.
+- Image editor improvements: brush size, text style cycling, sticker quality.
+- Fix tg:// link handling on cold start and login widget window activation.
+- Copy and paste formatting to and from HTML.
+
+6.7.8 (24.04.26)
+
+- Proxy auto-rotation option.
+- Allow seeking in video messages.
+- Styled text items with emoji support in image editor.
+- Wheel zoom and middle-button panning in image editor.
+- Manage owned custom emoji packs and delete owned sticker sets.
+- Add-to-Sticker-Set and Add-to-Emoji-Set submenus for foreign packs.
+- Reply header with preview in send files box.
+- Bring back original video quality option.
+- Screen reader support for language list and country select box.
+- Fix screen reader false-positive reporting on X11.
+- Fix stories in albums with reorder enabled.
+- Fix crash in proxy sharing before auth.
+- Fix layout for RTL messages.
+
+6.7.7 beta (20.04.26)
+
+- Proxy auto-rotation option.
+- Allow seeking in video messages.
+- Styled text items with emoji support in image editor.
+- Wheel zoom and middle-button panning in image editor.
+- Reply header with preview in send files box.
+- Bring back original video quality option.
+- Delete owned sticker set from sticker set box.
+- Add-to-Sticker-Set and Add-to-Emoji-Set submenus for foreign packs.
+- Screen reader support for language list and country select box.
+- Fix stories in albums with reorder enabled.
+- Fix layout for RTL messages.
+
+6.7.6 (14.04.26)
+
+- Gradient-reveal animation for text appearing in messages.
+- Support draw-to-reply from shared media.
+- Frame-by-frame stepping and hold-to-speedup hotkeys in media view.
+- Fix loading stickers and emoji search results.
+- Custom emoji picker for premium quick reaction.
+- Search in section of pinned messages.
+- Recent search entries in settings search.
+- Hide phone number in main settings section.
+- Suggest sending large texts as files.
+- Allow creating polls with single answer option.
+- Bring menus and fullscreen media viewer to active space on macOS.
+- Fix several poll display and voting menu issues.
+- Fix possible crashes in chats list, url auth and others.
+
+6.7.5 (07.04.26)
+
+- Support for gradual appearing of bot reply messages.
+
+6.7.4 (07.04.26)
+
+- Add experimental option for "AI Tools" button.
+- Jump between markers with Alt+Arrows in video player.
+- Cocoon info button in AI Tools box.
+- Show warning for unofficial app builds.
+- Allow text emojify without selecting a style.
+- Accept also base64 (non-url) proxy secrets.
+- Use tg:// deeplinks for proxy share links.
+- Fix newbot deeplink parsing with trailing slash and unicode names.
+- Fix file reference refresh for user, group and channel photos.
+- Fix stale macOS tray icon colors after appearance switches.
+- Fix tooltip crash in top peers selector with small width.
+- Fix preserving markers after video quality switch in media view.
+
+6.7.3 (04.04.26)
+
+- Fix launch on older macOS versions.
+
+6.7.2 (03.04.26)
+
+- System audio capture for desktop sharing on macOS.
+- Split voice and audio playback speeds.
+- Unread media dot for voice messages in dialog list.
+- Add 'x' button to AI Tools promo toast.
+- Fix long forward messages preview in box.
+- Fix custom emoji reaction search by category.
+- Fix double context menu in photo sending confirmation.
+- Fix possible crash in middle-elision.
+- Fix possible crash in GIFs search.
+
+6.7.1 (01.04.26)
+
+- Fix crash in emoji panel animation.
+
+6.7 (01.04.26)
+
+- AI Text Editor for messages.
+- Enhanced Polls with media, locations and suggested options.
+- Bots can create and managed other Bots on your behalf.
+- Drawing tools in image editor (brush, marker, eraser, arrow).
+- Trim recorded voice messages.
+- Per-file captions when sending multiple files.
+- Audio sharing in calls on Linux.
+
+6.6.4 beta (16.03.26)
+
+- Fix launch on Linux.
+
+6.6.3 beta (12.03.26)
+
+- Drawing tools in image editor (brush, marker, eraser, arrow).
+- Draw-to-reply button in media viewer.
+- Trim recorded voice messages.
+- Per-file captions when sending multiple files.
+- Audio sharing in calls on Linux.
+- Ripple effects for reactions, send and reply buttons.
+- Fix saved music shuffled playing.
+
+6.6.2 (03.03.26)
+
+- Fix editing of media files.
+- Fix admin rights in legacy groups for tag editing.
+- Fix opening emoji packs from custom emoji click.
+
+6.6.1 (02.03.26)
+
+- Fix crash in legacy groups members list.
+- Fix display of member tags in legacy groups.
+- Make fast reply button appear instantly.
+- Allow hiding fast reply button.
+
+6.6 (01.03.26)
+
+- Member Tags in groups.
+- Disable Sharing in Private Chats.
+- Timestamps for Polls.
+- Log In With Telegram.
+- Time and Date Formatting.
+
+6.5.1 (09.02.26)
+
+- Drag-n-drop chats to folders.
+- Fix crash in adding Recommended folders.
+- Fix crash in crafting gifts selection layer.
+- Fix disappeared Login Email button in Settings.
+- Fix Tab focusing chats search when autocompleting hashtags or mentions.
+
+6.5 (06.02.26)
+
+- Leaving Groups to a New Admin.
+- Log In With Telegram.
+- Gift Crafting.
+- Colored Buttons for Bots.
+- Search in Settings.
+
+6.4.4 beta (29.01.26)
+
+- Fix crash in topic group opening.
+- Show correct profile colors preview when edit.
+- Strip quote entities in media viewer.
+
+6.4.3 beta (28.01.26)
+
+- Search in Settings.
+
+6.4.2 (08.01.26)
+
+- Fix non-closing popup menu items.
+- Fix crash in my profile section resize.
+- Fix some text glitches because of render optimizations.
+
+6.4.1 (05.01.26)
+
+- Fix context menu double activations.
+- Fix text rendering in animating bubbles.
+
+6.4 (03.01.26)
+
+- AI Summaries for posts in channels.
+
+6.3.10 beta (22.12.25)
+
+- Fix user info showing from large group messages.
+- Fix sent state of outgoing messages in forums.
+- Show who sent your unique collectible gifts.
+- Update Qt on all platforms.
+
+6.3.9 (15.12.25)
+
+- Fix possible crash in audio playback speed menu.
+- Fix possible crash in forum or bot topic deletion.
+
+6.3.8 (15.12.25)
+
+- Fix crash on older Linux.
+
+6.3.7 (12.12.25)
+
+- Fix login with passkey visibility on Windows.
+- Improve gift upgrading experience.
+
+6.3.6 (06.12.25)
+
+- Fix crash in media viewer.
+- Fix crash in experimental settings.
+
+6.3.5 (05.12.25)
+
+- Offer stars or TON for unique gifts.
+- Preview gift auctions before they start.
+- Support passkey login on Windows.
+
+6.3.4 (26.11.25)
+
+- Show active auctions above chats list.
+- Add star sending effects in live stories.
+- Fix back button in group member profile view.
+- Export separate topics message history.
+- Export audio files saved to profile.
+- Many different crash fixes.
+
+6.3.3 (21.11.25)
+
+- Some more improvements for gift auctions.
+
+6.3.2 (20.11.25)
+
+- Improved support for gift auctions.
+- Reorder stories in stories albums in My Profile.
+- Bug fixes in new profile cover design.
+- Add your Saved Music to data export.
+
+6.3.1 (17.11.25)
+
+- Reorder saved music in My Profile.
+- Fix new cover overlapping information in My Profile.
+- Fix opening stories from My Profile.
+- Fix media viewer breaking after viewing Live Stories.
+- Fix several possible crashes.
+
+6.3 (15.11.25)
+
+- Support for Gift auctions.
+- Support for Live stories.
+- New profile pages design.
+
+6.2.6 beta (07.11.25)
+
+- Bug fixes in the new profile page design.
+
+6.2.5 beta (28.10.25)
+
+- New profile pages design.
+- Qt 6.10 on Linux.
+
+6.2.4 (22.10.25)
+
+- Highlight links in contact notes.
+- Show menu with screen share controls in wide group call mode.
+- Fix possible crash in saved music removing.
+- Fix crash in theme editor.
+
+6.2.3 (12.10.25)
+
+- Fix crash when viewing messages with hidden senders.
+- Fix possible crash when editing contacts.
+- Fix layout of character count warning in contact notes.
+- Fix icons when editing contacts.
+- Fix color of sending messages animation in complex themes.
+- Fix crash in chat open on Flatpak build.
+
+6.2.2 (10.10.25)
+
+- Fix layer.
+
+6.2.1 (10.10.25)
+
+- Fix sending gifts.
+- Fix possible crash on Linux.
+
+6.2 (10.10.25)
+
+- Comments and reactions in group calls.
+- Notes for contacts.
+- Suggested birthdays.
+- Threads for AI bots.
+- Reorder gifts collections and stories albums.
+- Reorder gifts inside collections.
+- Apply tags instantly when forwarding to Saved Messages.
+- Choose which screen to show notifications on.
+- Nice text message sending animation.
+
+6.1.4 (06.10.25)
+
+- Allow add to folder from recent / top chats.
+- Fix clear history of group chats.
+- Fix several crashes.
+
+6.1.3 (06.09.25)
+
+- Fix dead keys / alt combinations / input methods issues.
+
+6.1.2 (02.09.25)
+
+- Close selected chat in Ctrl+Tab chat switch by 'Q'.
+- Auto-split pasted multiple lines to checklist task creation.
+- Fix color picker in userpic builder.
+
+6.1.1 (01.09.25)
+
+- Ctrl+Tab / Ctrl+Shift+Tab collect chats on every launch.
+- Fix Ctrl+Tab / Ctrl+Shift+Tab shortcut override.
+- Fix possible crashes in saved music.
+- Fix webview error label alignment.
+
+6.1 (31.08.25)
+
+- Music on Profiles.
+- Gift Themes.
+- Gift Value Information.
+- Upgrading Gifts for Other Users.
+
+6.0.3 beta (22.08.25)
+
+- Ctrl+Tab / Ctrl+Shift+Tab for last opened chats switching.
+- New topic dividers for groups with topics and tabs.
+- Adjust volume of notification sounds.
+- Show stars required for the next rating level.
+- IV support on Linux (in case WebView works).
+
+6.0.2 (01.08.25)
+
+- Improve design of profile stars rating.
+
+6.0.1 (01.08.25)
+
+- Fix crashing on Windows 7.
+
+6.0 (31.07.25)
+
+- Public Post Search.
+- Story Albums.
+- Gift Collections.
+- Profile Rating.
+
+5.16.6 (25.07.25)
+
+- Fix bad layout in box buttons.
+- Fix several problems in gift collections.
+
+5.16.5 (23.07.25)
+
+- Age verification support.
+
+5.16.4 (11.07.25)
+
+- Fix problem with negative unread counters.
+- Fix stars values display in statistics.
+- Fix crash in messages fee disabling.
+
+5.16.3 (08.07.25)
+
+- Allow removing / charging fee in channel direct messages.
+- Don't offer creating checklists in channels.
+- Support author channel in gifts.
+
+5.16.2 (04.07.25)
+
+- Fix crash in some checklists.
+- Fix problems with some private chats message sending.
+- Fix chats list preview for rejected/balance-low suggestions.
+
+5.16.1 (02.07.25)
+
+- Fix inline keyboard updating in bot messages.
+- Fix possible crash in fast chat switching.
+- Different minor fixes.
+
+5.16 (01.07.25)
+
+- Create private and group checklists.
+- Suggest Posts in Channels.
+- Monetizing via Suggested Posts.
+
+5.15.4 (12.06.25)
+
+- Fix updating messages in Saved Messages subchats.
+- Fix possible issues with mouse cursor on Linux.
+
+5.15.3 (09.06.25)
+
+- Fix new contact top bar appearance.
+- Remove change photo button for channel direct messages.
+
+5.15.2 (05.06.25)
+
+- Fix sending messages in new forum layout.
+- Add statistics for user stars.
+
+5.15.1 (05.06.25)
+
+- Fix launch on Windows 7.
+- Fix launch on older Linux distributions.
+- Fix crash in group chat message right click.
+- Fix unread counters in channel direct messages.
+- Don't generate "User joined" message in channel direct messages.
+- Fix some other glitches in new forums and channel direct messages.
+
+5.15 (04.06.25)
+
+- Send Direct Messages to Channels.
+- Enable New Tab Layout for Topics.
+- Create Polls with Up To 12 Options.
+
+5.14.3 (18.05.25)
+
+- Fix stale birthday suggestions removing.
+- Fix notification click opening a new window.
+
+5.14.2 (08.05.25)
+
+- Buy Rare Gifts in the Marketplace.
+- Sell Your Gifts for Stars.
+- Set Your Channel to Auto-Translate.
+
+5.14.1 (01.05.25)
+
+- Fix launching on Windows 7.
+
+5.14 (01.05.25)
+
+- Secure Group Calls Made Easy.
+- Automated Business Accounts.
+- New Gifts Settings.
+
+5.13.1 (26.03.25)
+
+- Fix crash in group/channel stories.
+
+5.13 (26.03.25)
+
+- Allow transferring my unique gifts from Send Gift section.
+- Edit type of gifts you accept in Settings > Privacy and Security.
+- Swipe navigation using swipe gesture on touchpads / touchscreens.
+- Choose chat list quick action for swipe or middle click.
+
+5.12.6 beta (20.03.25)
+
+- Allow customizing chats list swipe left action.
+- Fix custom emoji in poll results view.
+- Fix crash in main menu swipe closing.
+
+5.12.5 beta (14.03.25)
+
+- Support swipe navigation on touchscreens.
+- Close main menu by swipe navigation.
+
+5.12.4 beta (12.03.25)
+
+- Touchpad swipe back to go back in navigation history.
+- Touchpad swipe between folders if they're horizontal.
+- Out-of-the-box monochrome tray icon on Linux.
+- Icons telegram{,{,-attention,-mute}-panel} are renamed
+to org.telegram.desktop{,{,-attention,-mute}-symbolic} for
+unified icon lookup in multiple (sometimes sandboxed) builds
+and GTK icon recolorization support.
+- Snap package got icon theming support,
+the icon names are snap.telegram-desktop.{,{,-attention,-mute}-symbolic}
+(notice the name ends with a dot in case of no suffix!).
+
+5.12.3 (10.03.25)
+
+- Fix a couple more crashes.
+- Fix gift disappearing on unpin.
+- Fix country emoji for Fragment numbers.
+
+5.12.2 (09.03.25)
+
+- Fix some crashes.
+
+5.12.1 (08.03.25)
+
+- Fix a crash in some chat switchings.
+- Fix crashes in empty repaint callbacks.
+
+5.12 (07.03.25)
+
+- Set a fee for incoming messages from unknown users.
+- Set a fee for messages in groups or channel comments.
+- Show some information about who's messaging you.
+- Pin gifts on your profile.
+
+5.11.1 (13.02.25)
+
+- Fix arbitrary cropping support in the image editor.
+- Fix crash on round video message playback.
+- Fix complex custom keyboard shortcuts.
+
+5.11 (12.02.25)
+
+- Copy video links at current time.
+- Set custom video covers when posting to channels.
+- Send paid reactions from the name of your channels.
+
+5.10.8 beta (12.02.25)
+
+- Edit keyboard shortcuts in Settings > Chat Settings.
+- Hide controls in calls with incoming video.
+- Fix several crashes.
+
+5.10.7 (27.01.25)
+
+- Fix some phrases for collectible gifts.
+- Fix freeze in sound reencoding on macOS and Linux.
+
+5.10.6 (26.01.25)
+
+- Fix crash in opening users gifts section.
+- Fix unintended sound in reaction notifications.
+- Fix disabling notifications sound on macOS and Linux.
+
+5.10.5 (24.01.25)
+
+- Count all unread topics as a single chat in archive unread counter.
+- Fix common groups section in bots profiles.
+- Fix crash on scheduling messages from Share box.
+- Fix silent notifications on macOS.
+- Add support for 'sound-file' notification hint on Linux.
+
+5.10.4 (22.01.25)
+
+- Add messages search in channel comments.
+- Allow sending your unique gifts to blockchain.
+- Add option for running in backround on Linux.
+- Fix possible freeze on quit on macOS.
+
+5.10.3 (09.01.25)
+
+- Fix a crash in legacy group opening.
+
+5.10.2 (07.01.25)
+
+- Fix double verification badge in profiles.
+
+5.10.1 (06.01.25)
+
+- Show "Boost group the send messages" information.
+- Fix several gifts bugs and glitches.
+- Fix several crashes.
+
+5.10 (02.01.25)
+
+- Collectible Gifts.
+- Reactions for Service Messages.
+- Verification from Third Parties.
+- Custom Emoji in Folder Names.
+
+5.9.2 beta (24.12.24)
+
+- Fix some jump-to-message highlightings.
+- Fix some long round video messages sending.
+- Fix possible crash in global photos / videos.
+- Fix streaming starting for some large video files.
+- Fix possible drop of top peers / recent chats cache.
+- Fix possible crashes in audio on macOS (rollback OpenAL).
+
+5.9.1 beta (18.12.24)
+
+- Add global media overview tabs in chats search.
+- Add main menu "My Profile" with my stories and gifts access.
+- Highlight some of search query on result message open.
+- Fix highlighting quotes from bottom parts of long messages.
+- Allow forward and reply bars together.
+- Make gift price categories scrollable.
+- Auto-send deep-link /start in existing bot chats.
+
+5.9 (04.12.24)
+
+- Affiliate programs for bots.
+- Add option to show folder tags in chats list.
+
+5.8.5 beta (29.11.24)
+
+- Fix pinned chats in folders.
+- Fix emoji in folder tags.
+- Fix several crashes.
+
+5.8.4 beta (28.11.24)
+
+- Add option to show folder tags in chats list.
+- Count group with topics as one chat in folder unread counter.
+
+5.8.3 (23.11.24)
+
+- Ctrl+Click on Reply in groups to reply in another chat.
+- Fix freeze on forward messages box opening.
+- Improve phrases in bot subscriptions.
+- Several bugfixes.
+
+5.8.2 (19.11.24)
+
+- Improve bottom label color in mini apps.
+- Fix some fullscreen issues in mini apps.
+- Fix miss-order of archived chats in forward box.
+- Fix file dialog for Windows on ARM.
+- Fix emoji status pack view from profile regression.
+
+5.8.1 (17.11.24)
+
+- Fix several possible crashes.
+
+5.8 (17.11.24)
+
+- Updates in Mini Apps platform.
+- Chat folders in forward and share boxes.
+- Horizontal strip mode for chat folders.
+
+5.7.4 beta (15.11.24)
+
+- Enable auto night mode by default.
+- Use muted chats folder badge in horizontal strip.
+- Fix custom userpic context menu in comments and topics.
+- Fix scrolling of chats folders together with the list.
+- Fix chats folders list disappearing in some cases.
+- Fix topic groups in share box with chats folders.
+- Fix bot commands list in some groups.
+- Fix crash in channel short info box display.
+- Fix crash in bot monetization section opening.
+- Fix crash in bot sponsored messages destruction.
+
+5.7.3 beta (13.11.24)
+
+- Option to show folders above the chats list.
+- Folders on top of recipients list box.
+
+5.7.2 (05.11.24)
+
+- Fix recompressed video playback cutoff.
+- Fix video message recroding on macOS.
+
+5.7.1 (01.11.24)
+
+- Fix occasional redundant newlines before message timestamp.
+- Remove playback speed change on settings button click.
+- Fix video playback settings button on hidpi screens.
+- Fix return from Picture-in-Picture to media viewer.
+- Fix video quality auto-switching in Picture-in-Picture.
+- Add message link to channel stars transaction information.
+- Fix GIF playback in media viewer.
+- Fix several possible crashes.
+
+5.7 (31.10.24)
+
+- Sending video messages.
+- New video quality selection in channels.
+- Adding media to sent text messages via Edit.
+- Ads in bots with revenue sharing with bot developers.
+- Chat-specific hashtags.
+
+5.6.4 beta (24.10.24)
+
+- Add recording of video messages in case a camera is available.
+- Add "Respect the Focus settings" for custom notifications on Windows.
+
 5.6.3 (15.10.24)
 
 - Add ability to change page scale in Instant View pages.
diff --git a/cmake b/cmake
index 3ca8fb8c91fdf5..f95a64c05e0159 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 3ca8fb8c91fdf5b52565a8294f6cb33e8b6d6852
+Subproject commit f95a64c05e01595aa3bf247874aa001e0c873249
diff --git a/docs/assets/preview.png b/docs/assets/preview.png
index 20a6e91a28d9a0..808d016f34fe2d 100644
Binary files a/docs/assets/preview.png and b/docs/assets/preview.png differ
diff --git a/docs/assets/slide.01.jpg b/docs/assets/slide.01.jpg
new file mode 100644
index 00000000000000..07ed727d48e286
Binary files /dev/null and b/docs/assets/slide.01.jpg differ
diff --git a/docs/assets/slide.02.jpg b/docs/assets/slide.02.jpg
new file mode 100644
index 00000000000000..2a19cfdeb4a831
Binary files /dev/null and b/docs/assets/slide.02.jpg differ
diff --git a/docs/assets/slide.03.jpg b/docs/assets/slide.03.jpg
new file mode 100644
index 00000000000000..588f2950d5f6fd
Binary files /dev/null and b/docs/assets/slide.03.jpg differ
diff --git a/docs/assets/slide.04.jpg b/docs/assets/slide.04.jpg
new file mode 100644
index 00000000000000..d0598198b67a87
Binary files /dev/null and b/docs/assets/slide.04.jpg differ
diff --git a/docs/building-linux.md b/docs/building-linux.md
index e8a0b050b87b11..fbdf25355734f3 100644
--- a/docs/building-linux.md
+++ b/docs/building-linux.md
@@ -20,6 +20,7 @@ Install [poetry](https://python-poetry.org), go to ***BuildPath*** and run
 Go to ***BuildPath*/tdesktop** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
 
     docker run --rm -it \
+        -u $(id -u) \
         -v "$PWD:/usr/src/tdesktop" \
         tdesktop:centos_env \
         /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \
@@ -29,6 +30,7 @@ Go to ***BuildPath*/tdesktop** and run (using [your **api_id** and **api_hash**]
 Or, to create a debug build, run (also using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
 
     docker run --rm -it \
+        -u $(id -u) \
         -v "$PWD:/usr/src/tdesktop" \
         -e CONFIG=Debug \
         tdesktop:centos_env \
@@ -38,4 +40,21 @@ Or, to create a debug build, run (also using [your **api_id** and **api_hash**](
 
 The built files will be in the `out` directory.
 
+### Visual Studio Code integration
+
+Ensure you've followed the instruction up to the [**Clone source code and prepare libraries**](#clone-source-code-and-prepare-libraries) step at least.
+
+Open the repository in Visual Studio Code, install the [Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) extension and add the following to `.vscode/settings.json` (using [your **api_id** and **api_hash**](#obtain-your-api-credentials)):
+
+    {
+        "cmake.configureSettings": {
+            "TDESKTOP_API_ID": "YOUR_API_ID",
+            "TDESKTOP_API_HASH": "YOUR_API_HASH"
+        }
+    }
+
+After that, choose **Reopen in Container** via the menu triggered by the green button in bottom left corner and you're done.
+
+![Quick actions Status bar item](https://code.visualstudio.com/assets/docs/devcontainers/containers/remote-dev-status-bar.png)
+
 [api_credentials]: api_credentials.md
diff --git a/docs/building-mac.md b/docs/building-mac.md
index 605a5b51920ee7..b8c6b6bae95b87 100644
--- a/docs/building-mac.md
+++ b/docs/building-mac.md
@@ -4,6 +4,10 @@
 
 Choose a folder for the future build, for example **/Users/user/TBuild**. It will be named ***BuildPath*** in the rest of this document. All commands will be launched from Terminal.
 
+**Note about disk space:** The full build process will require approximately **55 GB** of free space. This includes:
+- **~35 GB** for libraries (when building for both x64 and arm64 architectures)
+- **~20 GB** for the compiled Telegram app (in the `out` folder)
+
 ### Obtain your API credentials
 
 You will require **api_id** and **api_hash** to access the Telegram API servers. To learn how to obtain them [click here][api_credentials].
@@ -13,7 +17,7 @@ You will require **api_id** and **api_hash** to access the Telegram API servers.
 Go to ***BuildPath*** and run
 
     /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-    brew install git automake cmake wget pkg-config gnu-tar ninja nasm meson
+    brew install git automake libtool cmake wget pkg-config gnu-tar ninja nasm meson
 
     sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
 
diff --git a/docs/building-win-x64.md b/docs/building-win-x64.md
deleted file mode 100644
index 476aaf11060253..00000000000000
--- a/docs/building-win-x64.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# Build instructions for Windows 64-bit
-
-- [Prepare folder](#prepare-folder)
-- [Install third party software](#install-third-party-software)
-- [Clone source code and prepare libraries](#clone-source-code-and-prepare-libraries)
-- [Build the project](#build-the-project)
-- [Qt Visual Studio Tools](#qt-visual-studio-tools)
-
-## Prepare folder
-
-The build is done in **Visual Studio 2022** with **10.0.22000.0** SDK version.
-
-Choose an empty folder for the future build, for example **D:\\TBuild**. It will be named ***BuildPath*** in the rest of this document. Create two folders there, ***BuildPath*\\ThirdParty** and ***BuildPath*\\Libraries**.
-
-All commands (if not stated otherwise) will be launched from **x64 Native Tools Command Prompt for VS 2022.bat** (should be in **Start Menu > Visual Studio 2022** menu folder). Pay attention not to use any other Command Prompt.
-
-### Obtain your API credentials
-
-You will require **api_id** and **api_hash** to access the Telegram API servers. To learn how to obtain them [click here][api_credentials].
-
-## Install third party software
-
-* Download **Python 3.10** installer from [https://www.python.org/downloads/](https://www.python.org/downloads/) and install it with adding to PATH.
-* Download **Git** installer from [https://git-scm.com/download/win](https://git-scm.com/download/win) and install it.
-
-## Clone source code and prepare libraries
-
-Open **x64 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run
-
-    git clone --recursive https://github.com/telegramdesktop/tdesktop.git
-    tdesktop\Telegram\build\prepare\win.bat
-
-## Build the project
-
-Go to ***BuildPath*\\tdesktop\\Telegram** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
-
-    configure.bat x64 -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH
-
-* Open ***BuildPath*\\tdesktop\\out\\Telegram.sln** in Visual Studio 2022
-* Select Telegram project and press Build > Build Telegram (Debug and Release configurations)
-* The result Telegram.exe will be located in **D:\TBuild\tdesktop\out\Debug** (and **Release**)
-
-### Qt Visual Studio Tools
-
-For better debugging you may want to install Qt Visual Studio Tools:
-
-* Open **Extensions** -> **Manage Extensions**
-* Go to **Online** tab
-* Search for **Qt**
-* Install **Qt Visual Studio Tools** extension
-
-[api_credentials]: api_credentials.md
diff --git a/docs/building-win.md b/docs/building-win.md
index 85d76ccae4f613..d333539fc0709b 100644
--- a/docs/building-win.md
+++ b/docs/building-win.md
@@ -2,17 +2,18 @@
 
 - [Prepare folder](#prepare-folder)
 - [Install third party software](#install-third-party-software)
+- [Choose architecture and initialize terminal](#choose-architecture-and-initialize-terminal)
 - [Clone source code and prepare libraries](#clone-source-code-and-prepare-libraries)
 - [Build the project](#build-the-project)
 - [Qt Visual Studio Tools](#qt-visual-studio-tools)
 
 ## Prepare folder
 
-The build is done in **Visual Studio 2022** with **10.0.22000.0** SDK version.
+The build is done in **Visual Studio 2026** with **10.0.26100.0** SDK version.
 
 Choose an empty folder for the future build, for example **D:\\TBuild**. It will be named ***BuildPath*** in the rest of this document. Create two folders there, ***BuildPath*\\ThirdParty** and ***BuildPath*\\Libraries**.
 
-All commands (if not stated otherwise) will be launched from **x86 Native Tools Command Prompt for VS 2022.bat** (should be in **Start Menu > Visual Studio 2022** menu folder). Pay attention not to use any other Command Prompt.
+The default modern toolset from Visual Studio 2026 (`v145`) does not support Windows 7, so for Telegram Desktop you must use `-vcvars_ver=14.44` (`v144.4`, based on `v143` with Windows 7 support).
 
 ### Obtain your API credentials
 
@@ -23,20 +24,41 @@ You will require **api_id** and **api_hash** to access the Telegram API servers.
 * Download **Python 3.10** installer from [https://www.python.org/downloads/](https://www.python.org/downloads/) and install it with adding to PATH.
 * Download **Git** installer from [https://git-scm.com/download/win](https://git-scm.com/download/win) and install it.
 
+## Choose architecture and initialize terminal
+
+Before preparing libraries and running build commands, initialize the Visual Studio environment for your target architecture.
+The default modern toolset from Visual Studio 2026 (`v145`) does not support Windows 7, so for Telegram Desktop you must use `-vcvars_ver=14.44` (`v144.4`, based on `v143` with Windows 7 support).
+
+For `win` (32-bit):
+
+    %comspec% /k "C:\Program Files\Microsoft Visual Studio\18\Community\VC\Auxiliary\Build\vcvars32.bat" -vcvars_ver=14.44
+
+For `win64` (64-bit):
+
+    %comspec% /k "C:\Program Files\Microsoft Visual Studio\18\Community\VC\Auxiliary\Build\vcvars64.bat" -vcvars_ver=14.44
+
+Run both `Clone source code and prepare libraries` and `Build the project` sections in the terminal initialized with one of the commands above.
+
 ## Clone source code and prepare libraries
 
-Open **x86 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run
+In the initialized terminal, go to ***BuildPath*** and run
 
     git clone --recursive https://github.com/telegramdesktop/tdesktop.git
     tdesktop\Telegram\build\prepare\win.bat
 
 ## Build the project
 
-Go to ***BuildPath*\\tdesktop\\Telegram** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
+Go to ***BuildPath*\\tdesktop\\Telegram** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials)):
+
+For `win` (32-bit):
 
     configure.bat -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH
 
-* Open ***BuildPath*\\tdesktop\\out\\Telegram.sln** in Visual Studio 2022
+For `win64` (64-bit):
+
+    configure.bat x64 -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH
+
+* Open ***BuildPath*\\tdesktop\\out\\Telegram.slnx** in Visual Studio 2026
 * Select Telegram project and press Build > Build Telegram (Debug and Release configurations)
 * The result Telegram.exe will be located in **D:\TBuild\tdesktop\out\Debug** (and **Release**)
 
diff --git a/lib/xdg/org.telegram.desktop.desktop b/lib/xdg/org.telegram.desktop.desktop
index 68a68915911f2e..73ca5cc2d5ff19 100644
--- a/lib/xdg/org.telegram.desktop.desktop
+++ b/lib/xdg/org.telegram.desktop.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Telegram Desktop
-Comment=Official desktop version of Telegram messaging app
-TryExec=telegram-desktop
-Exec=telegram-desktop -- %u
-Icon=telegram
+Name=Telegram
+Comment=New era of messaging
+TryExec=Telegram
+Exec=Telegram -- %U
+Icon=org.telegram.desktop
 Terminal=false
 StartupWMClass=TelegramDesktop
 Type=Application
@@ -17,6 +17,6 @@ X-GNOME-UsesNotifications=true
 X-GNOME-SingleWindow=true
 
 [Desktop Action quit]
-Exec=telegram-desktop -quit
+Exec=Telegram -quit
 Name=Quit Telegram
 Icon=application-exit
diff --git a/lib/xdg/org.telegram.desktop.metainfo.xml b/lib/xdg/org.telegram.desktop.metainfo.xml
index 01a1557622ad99..0fec02f1700134 100644
--- a/lib/xdg/org.telegram.desktop.metainfo.xml
+++ b/lib/xdg/org.telegram.desktop.metainfo.xml
@@ -3,8 +3,8 @@
     <id>org.telegram.desktop</id>
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-3.0</project_license>
-    <name>Telegram Desktop</name>
-    <summary>Fast. Secure. Powerful.</summary>
+    <name>Telegram</name>
+    <summary>New era of messaging</summary>
     <description>
         <p>Pure instant messaging — simple, fast, secure, and synced across all your devices. One of the world's top 10 most downloaded apps with over 500 million active users.</p>
         <p>FAST: Telegram is the fastest messaging app on the market, connecting people via a unique, distributed network of data centers around the globe.</p>
@@ -25,13 +25,35 @@
     </categories>
     <developer id="org.telegram"><name>Telegram FZ-LLC</name></developer>
     <url type="homepage">https://desktop.telegram.org/</url>
+    <url type="faq">https://telegram.org/faq</url>
     <url type="bugtracker">https://github.com/telegramdesktop/tdesktop/issues</url>
     <url type="translate">https://translations.telegram.org/</url>
+    <url type="vcs-browser">https://github.com/telegramdesktop/tdesktop</url>
     <url type="contribute">https://github.com/telegramdesktop/tdesktop/blob/dev/.github/CONTRIBUTING.md</url>
+    <branding>
+        <color type="primary" scheme_preference="light">#edf0f2</color>
+        <color type="primary" scheme_preference="dark">#2d363f</color>
+    </branding>
     <screenshots>
       <screenshot type="default">
         <image>https://raw.githubusercontent.com/telegramdesktop/tdesktop/dev/docs/assets/preview.png</image>
       </screenshot>
+      <screenshot>
+        <image>https://raw.githubusercontent.com/telegramdesktop/tdesktop/dev/docs/assets/slide.01.jpg</image>
+        <caption>A lightning-fast native app that seamlessly syncs with your other devices</caption>
+      </screenshot>
+      <screenshot>
+        <image>https://raw.githubusercontent.com/telegramdesktop/tdesktop/dev/docs/assets/slide.02.jpg</image>
+        <caption>A fully autonomous Telegram app, no phone connection required</caption>
+      </screenshot>
+      <screenshot>
+        <image>https://raw.githubusercontent.com/telegramdesktop/tdesktop/dev/docs/assets/slide.03.jpg</image>
+        <caption>A quick way to view photos, videos and files</caption>
+      </screenshot>
+      <screenshot>
+        <image>https://raw.githubusercontent.com/telegramdesktop/tdesktop/dev/docs/assets/slide.04.jpg</image>
+        <caption>Send and store unlimited media and files of any type</caption>
+      </screenshot>
     </screenshots>
     <keywords>
         <keyword>tg</keyword>
@@ -86,7 +108,7 @@
     </content_rating>
     <launchable type="desktop-id">org.telegram.desktop.desktop</launchable>
     <provides>
-        <binary>telegram-desktop</binary>
+        <binary>Telegram</binary>
         <dbus type="session">org.telegram.desktop</dbus>
         <mediatype>x-scheme-handler/tg</mediatype>
         <mediatype>x-scheme-handler/tonsite</mediatype>
diff --git a/lib/xdg/org.telegram.desktop.service b/lib/xdg/org.telegram.desktop.service
index 525cac208cf3a6..8935a4fa834df4 100644
--- a/lib/xdg/org.telegram.desktop.service
+++ b/lib/xdg/org.telegram.desktop.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.telegram.desktop
-Exec=@CMAKE_INSTALL_FULL_BINDIR@/telegram-desktop
+Exec=@CMAKE_INSTALL_FULL_BINDIR@/Telegram
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index a158f9c0f9abe3..b701255c56572a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -10,74 +10,26 @@ compression: lzo
 apps:
   telegram-desktop:
     command: usr/bin/telegram-desktop
-    command-chain:
-      - bin/desktop-launch
     common-id: org.telegram.desktop
     desktop: usr/share/applications/org.telegram.desktop.desktop
     autostart: telegram-desktop_telegram-desktop.desktop
+    extensions: [gnome]
     plugs:
-      - alsa
       - audio-playback
       - audio-record
       - camera
-      - desktop
-      - desktop-legacy
-      - gsettings
       - hardware-observe
       - home
       - network
       - network-bind
       - network-status
-      - opengl
       - removable-media
-      - unity7
-      - wayland
-      - x11
     slots:
       - mpris
 
-hooks:
-  configure:
-    command-chain:
-      - bin/hooks-configure-desktop
-    plugs:
-      - desktop
-
-plugs:
-  desktop:
-    mount-host-font-cache: false
-  # Support for common GTK themes
-  # https://forum.snapcraft.io/t/how-to-use-the-system-gtk-theme-via-the-gtk-common-themes-snap/6235
-  gtk-3-themes:
-    interface: content
-    target: $SNAP/data-dir/themes
-    default-provider: gtk-common-themes
-  icon-themes:
-    interface: content
-    target: $SNAP/data-dir/icons
-    default-provider: gtk-common-themes
-  sound-themes:
-    interface: content
-    target: $SNAP/data-dir/sounds
-    default-provider: gtk-common-themes
-
 layout:
-  /usr/share/alsa:
-    bind: $SNAP/usr/share/alsa
-  /usr/share/pipewire:
-    bind: $SNAP/usr/share/pipewire
-  /usr/share/X11:
-    bind: $SNAP/usr/share/X11
-  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0:
-    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0
-  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-4.0:
-    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-4.0
-  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pipewire-0.3:
-    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pipewire-0.3
-  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2:
-    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2
-  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkitgtk-6.0:
-    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkitgtk-6.0
+  /var/tmp:
+    type: tmpfs
 
 parts:
   telegram:
@@ -86,56 +38,23 @@ parts:
     source-type: git
     parse-info: [usr/share/metainfo/org.telegram.desktop.metainfo.xml]
     build-environment:
-      - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,--push-state,--no-as-needed,-ldav1d,--pop-state -s
+    build-snaps:
+      - cmake
     build-packages:
-      - clang
-      - libtool-bin
-      - python3
-      - protobuf-compiler
-      - libasound2-dev
-      - libavif-dev
       - libboost-regex-dev
-      - libfmt-dev
-      - libgirepository1.0-dev
-      - libglib2.0-dev
       - libheif-dev
-      - libopenal-dev
-      - libopus-dev
-      - libprotobuf-dev
-      - libpulse-dev
+      - libjxl-dev
       - libssl-dev
-      - libxcb1-dev
       - libxcb-keysyms1-dev
       - libxcb-record0-dev
       - libxcb-screensaver0-dev
-      - zlib1g-dev
-    stage-packages:
-      - libasound2t64
-      - libavif16
-      - libboost-regex1.83.0
-      - libglib2.0-0t64
-      - libheif1
-      - libopenal1
-      - libopus0
-      - libprotobuf-lite32t64
-      - libpulse0
-      - libssl3t64
-      - libwebkitgtk-6.0-4
-      - libxcb1
-      - libxcb-keysyms1
-      - libxcb-record0
-      - libxcb-screensaver0
-      - zlib1g
-      - glib-networking
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
       - -DTDESKTOP_API_ID=611335
       - -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
-      - -DDESKTOP_APP_USE_PACKAGED_LAZY=ON
     override-pull: |
       craftctl default
 
@@ -150,355 +69,420 @@ parts:
       version="${version}$(git describe --tags | sed 's,^v[^-]\+,,')"
 
       craftctl set version="$version"
-
-      sed -i 's|^Icon=telegram$|Icon=${SNAP}/meta/gui/icon.png|g' lib/xdg/org.telegram.desktop.desktop
     override-build: |
       craftctl default
-      rm -rf "$CRAFT_PART_INSTALL/usr/share/icons"
+      mv "$CRAFT_PART_INSTALL"/usr/bin/{Telegram,telegram-desktop}
+
+      APP_ID=org.telegram.desktop
+      sed -i "s/^Icon=$APP_ID$/Icon=snap.$CRAFT_PROJECT_NAME./g" "$CRAFT_PART_INSTALL/usr/share/applications/$APP_ID.desktop"
+      for i in $(find "$CRAFT_PART_INSTALL/usr/share/icons" -name "$APP_ID*.svg" -o -name "$APP_ID*.png"); do
+        PREFIXED="$(dirname "$i")/snap.$CRAFT_PROJECT_NAME.$(basename "$i" | sed "s/$APP_ID//")"
+        mv "$i" "$PREFIXED"
+        DEST="$(echo "$PREFIXED" | sed 's@usr/share@meta/gui@')"
+        DESTDIR="$(dirname "$DEST")"
+        mkdir -p "$DESTDIR"
+        RELATIVE="$(realpath -s --relative-to="$DESTDIR" "$PREFIXED")"
+        ln -sfn "$RELATIVE" "$DEST"
+      done
     after:
       - ada
+      - avif
       - ffmpeg
-      - libjxl
+      - minizip
+      - mozjpeg
+      - openal
+      - protobuf
       - qt
       - rnnoise
+      - tde2e
       - webrtc
 
+  pkgs:
+    plugin: nil
+    stage-packages:
+      - gstreamer1.0-fdkaac
+      - gstreamer1.0-plugins-bad
+      - libgeoclue-2-0
+      - libopenh264-7
+      - libxcb-cursor0
+      - libxcb-record0
+      - libxcb-screensaver0
+    stage:
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0/libgstde265.so
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0/libgstfdkaac.so
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0/libgstopenh264.so
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0/libgstsubenc.so
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0/libgstva.so
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0/libgstvideoparsersbad.so
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libfdk-aac.so*
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgeoclue-2.so*
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libopenh264.so*
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-cursor.so*
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-record.so*
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-screensaver.so*
+
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: e47e7ed0d383b8ca5622a58a5ffa0c8d5f00651f
-    plugin: dump
+    source-commit: 701cfb4b3d6612188d168f198c842114fd64726f
+    plugin: nil
     override-pull: |
       craftctl default
       cp -r . "$CRAFT_STAGE/patches"
     override-prime: |
       rm -rf patches
-    stage: [-./*]
-
-  desktop-qt:
-    source: https://github.com/desktop-app/snapcraft-desktop-helpers.git
-    source-depth: 1
-    source-subdir: qt
-    plugin: make
-    make-parameters: ["FLAVOR=qt5"]
-    build-environment:
-      - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-    build-packages:
-      - build-essential
-      - dpkg-dev
-      - gtk-update-icon-cache
-      - libglib2.0-bin
-      - libgtk-3-0t64
-    stage-packages:
-      - libc-bin
-      - libgdk-pixbuf-2.0-0
-      - libnvidia-egl-wayland1
-      - libxkbcommon0
-      - locales-all
-      - shared-mime-info
-      - xdg-user-dirs
-    override-prime: |
-      craftctl default
-      update-mime-database usr/share/mime
-      glib-compile-schemas usr/share/glib-2.0/schemas
-      for theme in usr/share/icons/*; do
-        if [ -f "$theme/index.theme" ] && [ ! -f "$theme/icon-theme.cache" ]; then
-          update-icon-caches "$theme"
-        fi
-      done
-      GTK_PATH=$PWD/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0 /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgtk-3-0t64/gtk-query-immodules-3.0 > usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0/3.0.0/immodules/immodules.cache
-    after:
-      - telegram
 
   ada:
     source: https://github.com/ada-url/ada.git
     source-depth: 1
-    source-tag: v2.9.0
+    source-tag: v3.2.4
     plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DADA_TESTING=OFF
       - -DADA_TOOLS=OFF
-    prime:
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
+      - -DADA_INCLUDE_URL_PATTERN=OFF
+    prime: [-./*]
+
+  avif:
+    source: https://github.com/AOMediaCodec/libavif.git
+    source-depth: 1
+    source-tag: v1.3.0
+    plugin: cmake
+    build-packages:
+      - libdav1d-dev
+    cmake-generator: Ninja
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DBUILD_SHARED_LIBS=OFF
+      - -DAVIF_CODEC_DAV1D=SYSTEM
+      - -DAVIF_LIBYUV=OFF
+    prime: [-./*]
 
   ffmpeg:
-    plugin: nil
+    source: https://github.com/FFmpeg/FFmpeg.git
+    source-depth: 1
+    source-branch: n6.1.1
+    plugin: autotools
     build-packages:
-      - libavcodec-dev
-      - libavfilter-dev
-      - libavformat-dev
-      - libavutil-dev
-      - libswresample-dev
-      - libswscale-dev
-    stage-packages:
-      - libavcodec60
-      - libavfilter9
-      - libavformat60
-      - libavutil58
-      - libswresample4
-      - libswscale7
-      - va-driver-all
-      - vdpau-driver-all
-    override-build: |
+      - nasm
+      - libdav1d-dev
+      - libopenh264-dev
+      - libopus-dev
+      - libvdpau-dev
+      - libvpx-dev
+      - libxv-dev
+    autotools-configure-parameters:
+      - --prefix=/usr
+      - --libdir=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+      - --extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1"
+      - --extra-cxxflags="-DCONFIG_SAFE_BITSTREAM_READER=1"
+      - --disable-debug
+      - --disable-programs
+      - --disable-doc
+      - --disable-network
+      - --disable-autodetect
+      - --disable-everything
+      - --enable-libdav1d
+      - --enable-libopenh264
+      - --enable-libopus
+      - --enable-libvpx
+      - --enable-vaapi
+      - --enable-vdpau
+      - --enable-xlib
+      - --enable-libdrm
+      - --enable-ffnvcodec
+      - --enable-nvdec
+      - --enable-cuvid
+      - --enable-protocol=file
+      - --enable-hwaccel=av1_vaapi
+      - --enable-hwaccel=av1_nvdec
+      - --enable-hwaccel=h264_vaapi
+      - --enable-hwaccel=h264_vdpau
+      - --enable-hwaccel=h264_nvdec
+      - --enable-hwaccel=hevc_vaapi
+      - --enable-hwaccel=hevc_vdpau
+      - --enable-hwaccel=hevc_nvdec
+      - --enable-hwaccel=mpeg2_vaapi
+      - --enable-hwaccel=mpeg2_vdpau
+      - --enable-hwaccel=mpeg2_nvdec
+      - --enable-hwaccel=mpeg4_vaapi
+      - --enable-hwaccel=mpeg4_vdpau
+      - --enable-hwaccel=mpeg4_nvdec
+      - --enable-hwaccel=vp8_vaapi
+      - --enable-hwaccel=vp8_nvdec
+      - --enable-decoder=aac
+      - --enable-decoder=aac_fixed
+      - --enable-decoder=aac_latm
+      - --enable-decoder=aasc
+      - --enable-decoder=ac3
+      - --enable-decoder=alac
+      - --enable-decoder=av1
+      - --enable-decoder=av1_cuvid
+      - --enable-decoder=eac3
+      - --enable-decoder=flac
+      - --enable-decoder=gif
+      - --enable-decoder=h264
+      - --enable-decoder=hevc
+      - --enable-decoder=libdav1d
+      - --enable-decoder=libvpx_vp8
+      - --enable-decoder=libvpx_vp9
+      - --enable-decoder=mp1
+      - --enable-decoder=mp1float
+      - --enable-decoder=mp2
+      - --enable-decoder=mp2float
+      - --enable-decoder=mp3
+      - --enable-decoder=mp3adu
+      - --enable-decoder=mp3adufloat
+      - --enable-decoder=mp3float
+      - --enable-decoder=mp3on4
+      - --enable-decoder=mp3on4float
+      - --enable-decoder=mpeg4
+      - --enable-decoder=msmpeg4v2
+      - --enable-decoder=msmpeg4v3
+      - --enable-decoder=opus
+      - --enable-decoder=pcm_alaw
+      - --enable-decoder=pcm_f32be
+      - --enable-decoder=pcm_f32le
+      - --enable-decoder=pcm_f64be
+      - --enable-decoder=pcm_f64le
+      - --enable-decoder=pcm_lxf
+      - --enable-decoder=pcm_mulaw
+      - --enable-decoder=pcm_s16be
+      - --enable-decoder=pcm_s16be_planar
+      - --enable-decoder=pcm_s16le
+      - --enable-decoder=pcm_s16le_planar
+      - --enable-decoder=pcm_s24be
+      - --enable-decoder=pcm_s24daud
+      - --enable-decoder=pcm_s24le
+      - --enable-decoder=pcm_s24le_planar
+      - --enable-decoder=pcm_s32be
+      - --enable-decoder=pcm_s32le
+      - --enable-decoder=pcm_s32le_planar
+      - --enable-decoder=pcm_s64be
+      - --enable-decoder=pcm_s64le
+      - --enable-decoder=pcm_s8
+      - --enable-decoder=pcm_s8_planar
+      - --enable-decoder=pcm_u16be
+      - --enable-decoder=pcm_u16le
+      - --enable-decoder=pcm_u24be
+      - --enable-decoder=pcm_u24le
+      - --enable-decoder=pcm_u32be
+      - --enable-decoder=pcm_u32le
+      - --enable-decoder=pcm_u8
+      - --enable-decoder=pcm_zork
+      - --enable-decoder=vorbis
+      - --enable-decoder=vp8
+      - --enable-decoder=wavpack
+      - --enable-decoder=wmalossless
+      - --enable-decoder=wmapro
+      - --enable-decoder=wmav1
+      - --enable-decoder=wmav2
+      - --enable-decoder=wmavoice
+      - --enable-encoder=aac
+      - --enable-encoder=libopenh264
+      - --enable-encoder=libopus
+      - --enable-encoder=pcm_s16le
+      - --enable-filter=atempo
+      - --enable-parser=aac
+      - --enable-parser=aac_latm
+      - --enable-parser=flac
+      - --enable-parser=gif
+      - --enable-parser=h264
+      - --enable-parser=hevc
+      - --enable-parser=mpeg4video
+      - --enable-parser=mpegaudio
+      - --enable-parser=opus
+      - --enable-parser=vorbis
+      - --enable-demuxer=aac
+      - --enable-demuxer=flac
+      - --enable-demuxer=gif
+      - --enable-demuxer=h264
+      - --enable-demuxer=hevc
+      - --enable-demuxer=matroska
+      - --enable-demuxer=m4v
+      - --enable-demuxer=mov
+      - --enable-demuxer=mp3
+      - --enable-demuxer=ogg
+      - --enable-demuxer=wav
+      - --enable-muxer=mp4
+      - --enable-muxer=ogg
+      - --enable-muxer=opus
+      - --enable-muxer=wav
+    override-pull: |
       craftctl default
-      mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
-      rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas"
-      mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
-      rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack"
+      sed -i 's/disable ffnvcodec cuvid nvdec nvenc/:/g' configure
+    prime: [-./*]
+    after:
+      - nv-codec-headers
 
-  libjxl:
-    source: https://github.com/libjxl/libjxl.git
+  minizip:
+    source: https://github.com/madler/zlib.git
     source-depth: 1
-    source-tag: v0.10.3
+    source-commit: e3dc0a85b7032e98380dec011bc8f2c2ee0d8fca
+    source-subdir: contrib/minizip
+    plugin: autotools
+    autotools-configure-parameters:
+      - --prefix=/usr
+      - --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+      - --disable-shared
+    prime: [-./*]
+
+  mozjpeg:
+    source: https://github.com/mozilla/mozjpeg.git
+    source-depth: 1
+    source-tag: v4.1.5
     plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DBUILD_TESTING=OFF
-      - -DJPEGXL_ENABLE_DEVTOOLS=OFF
-      - -DJPEGXL_ENABLE_TOOLS=OFF
-      - -DJPEGXL_INSTALL_JPEGLI_LIBJPEG=ON
-      - -DJPEGXL_ENABLE_DOXYGEN=OFF
-      - -DJPEGXL_ENABLE_MANPAGES=OFF
-      - -DJPEGXL_ENABLE_BENCHMARK=OFF
-      - -DJPEGXL_ENABLE_EXAMPLES=OFF
-      - -DJPEGXL_ENABLE_JNI=OFF
-      - -DJPEGXL_ENABLE_SJPEG=OFF
-      - -DJPEGXL_ENABLE_OPENEXR=OFF
-      - -DJPEGXL_ENABLE_SKCMS=OFF
-    override-pull: |
-      craftctl default
-      git apply $CRAFT_STAGE/patches/libjxl.patch
-    stage:
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libbrotli*
-    prime:
-      - -./usr/bin
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
-      - -./usr/share
-    after:
-      - patches
+      - -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+      - -DENABLE_SHARED=OFF
+      - -DWITH_JPEG8=ON
+      - -DPNG_SUPPORTED=OFF
+    prime: [-./*]
+
+  openal:
+    source: https://github.com/kcat/openal-soft.git
+    source-depth: 1
+    source-tag: 1.24.3
+    plugin: cmake
+    build-packages:
+      - libpipewire-0.3-dev
+    cmake-generator: Ninja
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DLIBTYPE=STATIC
+      - -DALSOFT_DLOPEN=OFF
+      - -DALSOFT_EXAMPLES=OFF
+      - -DALSOFT_UTILS=OFF
+      - -DALSOFT_INSTALL_CONFIG=OFF
+      - -DALSOFT_BACKEND_PIPEWIRE=OFF
+    prime: [-./*]
+
+  nv-codec-headers:
+    source: https://github.com/FFmpeg/nv-codec-headers.git
+    source-depth: 1
+    source-branch: n12.1.14.0
+    plugin: make
+    make-parameters:
+      - PREFIX=/usr
+      - LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+    prime: [-./*]
+
+  protobuf:
+    source: https://github.com/protocolbuffers/protobuf.git
+    source-depth: 1
+    source-tag: v30.2
+    plugin: cmake
+    cmake-generator: Ninja
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -Dprotobuf_BUILD_TESTS=OFF
+    prime: [-./*]
 
   qt:
-    plugin: nil
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
+    source: https://github.com/qt/qt5.git
+    source-depth: 1
+    source-tag: v6.11.1
+    source-submodules:
+      - qtbase
+      - qtdeclarative
+      - qtimageformats
+      - qtshadertools
+      - qtsvg
+      - qtwayland
+    plugin: cmake
     build-packages:
-      - libdbus-1-dev
-      - libegl-dev
-      - libfontconfig1-dev
-      - libfreetype-dev
-      - libglib2.0-dev
-      - libglx-dev
-      - libgtk-3-dev
-      - libharfbuzz-dev
-      - libice-dev
-      - libicu-dev
-      - liblcms2-dev
-      - libopengl-dev
-      - libpcre2-dev
-      - libpng-dev
-      - libsm-dev
       - libssl-dev
-      - libvulkan-dev
-      - libwayland-dev
-      - libx11-dev
-      - libx11-xcb-dev
-      - libxcb1-dev
       - libxcb-cursor-dev
       - libxcb-glx0-dev
       - libxcb-icccm4-dev
       - libxcb-image0-dev
       - libxcb-keysyms1-dev
       - libxcb-randr0-dev
-      - libxcb-render0-dev
       - libxcb-render-util0-dev
       - libxcb-shape0-dev
-      - libxcb-shm0-dev
       - libxcb-sync-dev
       - libxcb-util-dev
       - libxcb-xfixes0-dev
       - libxcb-xkb-dev
-      - libxkbcommon-dev
       - libxkbcommon-x11-dev
-      - zlib1g-dev
-    stage-packages:
-      - libdbus-1-3
-      - libegl1
-      - libfontconfig1
-      - libfreetype6
-      - libglib2.0-0t64
-      - libglx0
-      - libgtk-3-0t64
-      - libharfbuzz0b
-      - libice6
-      - libicu74
-      - liblcms2-2
-      - libopengl0
-      - libpcre2-16-0
-      - libpng16-16t64
-      - libsm6
-      - libssl3t64
-      - libvulkan1
-      - libwayland-client0
-      - libwayland-cursor0
-      - libwayland-egl1
-      - libwayland-server0
-      - libx11-6
-      - libx11-xcb1
-      - libxcb1
-      - libxcb-cursor0
-      - libxcb-glx0
-      - libxcb-icccm4
-      - libxcb-image0
-      - libxcb-keysyms1
-      - libxcb-randr0
-      - libxcb-render0
-      - libxcb-render-util0
-      - libxcb-shape0
-      - libxcb-shm0
-      - libxcb-sync1
-      - libxcb-util1
-      - libxcb-xfixes0
-      - libxcb-xkb1
-      - libxkbcommon0
-      - libxkbcommon-x11-0
-      - zlib1g
-      - mesa-vulkan-drivers
-      - xkb-data
+    cmake-generator: Ninja
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DINSTALL_LIBDIR=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+      - -DBUILD_SHARED_LIBS=OFF
+      - -DQT_QPA_PLATFORMS="wayland;xcb"
+      - -DFEATURE_eglfs=OFF
+      - -DINPUT_openssl=linked
     override-pull: |
-      QT=6.8.0
-
-      git clone -b v${QT} --depth=1 https://github.com/qt/qt5.git .
-      git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools
-
-      cd qtbase
-      find $CRAFT_STAGE/patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git apply
-      cd ../qtwayland
-      find $CRAFT_STAGE/patches/qtwayland_${QT} -type f -print0 | sort -z | xargs -r0 git apply
-      cd ..
-    override-build: |
-      cmake -GNinja -B $CRAFT_PART_BUILD \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr \
-        -DINSTALL_LIBDIR=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR \
-        -DINPUT_openssl=linked
-
-      cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT
-      DESTDIR="$CRAFT_PART_INSTALL" cmake --install .
-    prime:
-      - -./usr/bin
-      - -./usr/doc
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/metatypes
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
-      - -./usr/libexec
-      - -./usr/mkspecs
-      - -./usr/modules
+      craftctl default
+      QT="$(grep 'set(QT_REPO_MODULE_VERSION' qtbase/.cmake.conf | sed -r 's/.*"(.*)".*/\1/')"
+      find $CRAFT_STAGE/patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git -C qtbase apply
+      find $CRAFT_STAGE/patches/qtwayland_${QT} -type f -print0 | sort -z | xargs -r0 git -C qtwayland apply
+    prime: [-./*]
     after:
-      - libjxl
+      - mozjpeg
       - patches
 
   rnnoise:
-    source: https://gitlab.xiph.org/xiph/rnnoise.git
+    source: https://github.com/xiph/rnnoise.git
     source-depth: 1
-    source-commit: 7f449bf8bd3b933891d12c30112268c4090e4d59
+    source-tag: v0.2
     plugin: autotools
-    build-environment:
-      - CFLAGS: -O2 -s
+    build-packages:
+      - wget
     autotools-configure-parameters:
       - --prefix=/usr
       - --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
-      - --disable-static
+      - --disable-shared
       - --disable-examples
       - --disable-doc
-    prime:
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
-      - -./usr/share
+    override-pull: |
+      craftctl default
+      sed -i 's/os_support.h/common.h/g;s/OPUS_CLEAR/RNN_CLEAR/g' src/vec{,_neon}.h
+    prime: [-./*]
 
-  systemd:
-    plugin: nil
-    stage-packages:
-      - systemd
-    stage:
-      - ./usr/bin/systemd-detect-virt
+  tde2e:
+    source: https://github.com/tdlib/td.git
+    source-depth: 1
+    source-commit: 51743dfd01dff6179e2d8f7095729caa4e2222e9
+    plugin: cmake
+    build-packages:
+      - gperf
+      - libssl-dev
+    cmake-generator: Ninja
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+      - -DTD_E2E_ONLY=ON
+    prime: [-./*]
 
   webrtc:
     source: https://github.com/desktop-app/tg_owt.git
     source-depth: 1
-    source-commit: 4a60ce1ab9fdb962004c6a959f682ace3db50cbd
+    source-commit: 26068e29bfa8d74a9dc9c8f7f94172fafbc262b8
     plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     build-packages:
-      - yasm
-      - libdrm-dev
-      - libegl-dev
-      - libgbm-dev
-      - libgl-dev
-      - libglib2.0-dev
       - libopenh264-dev
       - libopus-dev
       - libpipewire-0.3-dev
       - libssl-dev
       - libvpx-dev
-      - libx11-dev
-      - libxcomposite-dev
-      - libxdamage-dev
-      - libxext-dev
-      - libxfixes-dev
-      - libxrender-dev
-      - libxrandr-dev
-      - libxtst-dev
-    stage-packages:
-      - libdrm2
-      - libegl1
-      - libgbm1
-      - libgl1
-      - libglib2.0-0t64
-      - libopenh264-7
-      - libopus0
-      - libssl3t64
-      - libvpx9
-      - libx11-6
-      - libxcomposite1
-      - libxdamage1
-      - libxext6
-      - libxfixes3
-      - libxrender1
-      - libxrandr2
-      - libxtst6
-      - pipewire
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
-    prime:
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
+    prime: [-./*]
     after:
       - ffmpeg
-      - libjxl
+      - mozjpeg